diff --git a/.ci.yaml b/.ci.yaml
index 096072b23cd3020a9ae209adebe27f20e14eab5c..181c70b00f491f8b48b5f39b609dde48cd6a6754 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -8,27 +8,15 @@
 enabled_branches:
   - main
   - flutter-\d+\.\d+-candidate\.\d+
-  - fuchsia_r\d+
+  - fuchsia_r\d+[a-z]*
 
 platform_properties:
   linux:
     properties:
-      build_host: "false"
-      build_fuchsia: "false"
-      build_android_debug: "false"
-      build_android_aot: "false"
-      build_android_vulkan: "false"
-      build_ios: "false"
-      build_android_jit_release: "false"
-      gcs_goldens_bucket: ""
-      ios_debug: "false"
-      ios_profile: "false"
-      ios_release: "false"
-      no_bitcode: "false"
-      # CIPD flutter_internal/java/openjdk/$platform
+      # CIPD flutter/java/openjdk/$platform
       dependencies: >-
         [
-          {"dependency": "open_jdk", "version": "version:1.8.0u202-b08"},
+          {"dependency": "open_jdk", "version": "version:17"},
           {"dependency": "gradle_cache", "version": "none"}
         ]
       device_type: none
@@ -36,260 +24,273 @@ platform_properties:
       cores: "8"
   mac:
     properties:
-      build_host: "false"
-      build_fuchsia: "false"
-      build_android_debug: "false"
-      build_android_aot: "false"
-      build_android_vulkan: "false"
-      build_ios: "false"
-      build_android_jit_release: "false"
-      gcs_goldens_bucket: ""
-      ios_debug: "false"
-      ios_profile: "false"
-      ios_release: "false"
-      no_bitcode: "false"
-      # CIPD flutter_internal/java/openjdk/$platform
+      # CIPD flutter/java/openjdk/$platform
       dependencies: >-
         [
-          {"dependency": "open_jdk", "version": "version:1.8.0u202-b08"}
+          {"dependency": "open_jdk", "version": "version:17"}
         ]
       device_type: none
-      cpu: x86
-      os: Mac-12
-      xcode: 14a5294e # xcode 14.0 beta 5
+      os: Mac-13
+      $flutter/osx_sdk : >-
+        {
+          "sdk_version": "15a240d"
+        }
   windows:
     properties:
-      build_host: "false"
-      build_fuchsia: "false"
-      build_android_debug: "false"
-      build_android_aot: "false"
-      build_android_vulkan: "false"
-      build_ios: "false"
-      build_android_jit_release: "false"
-      gcs_goldens_bucket: ""
-      ios_debug: "false"
-      ios_profile: "false"
-      ios_release: "false"
-      no_bitcode: "false"
-      # CIPD flutter_internal/java/openjdk/$platform
+      # CIPD flutter/java/openjdk/$platform
       dependencies: >-
         [
-          {"dependency": "open_jdk", "version": "version:1.8.0u202-b08"}
+          {"dependency": "open_jdk", "version": "version:17"}
         ]
       device_type: none
       os: Windows-10
 
+# The current android emulator config names can be found here:
+# https://chromium.googlesource.com/chromium/src.git/+/HEAD/tools/android/avd/proto
+# You may use those names for the android_virtual_device version.
 targets:
-  - name: Linux Android AOT Engine
-    recipe: engine/engine
+  - name: Linux linux_android_emulator_tests
+    enabled_branches:
+      - main
+    recipe: engine_v2/engine_v2
     properties:
-      add_recipes_cq: "true"
-      build_android_aot: "true"
-      android_sdk_license: \n24333f8a63b6825ea9c5514f83c2829b004d1fee
-      android_sdk_preview_license: \n84831b9409646a918e30573bab4c9c91346d8abd
-    timeout: 60
+      config_name: linux_android_emulator
+      dependencies: >-
+        [
+          {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
+        ]
+    timeout: 90
+    runIf:
+      - .ci.yaml
+      - ci/builders/linux_android_emulator.json
+      - DEPS
+      - lib/ui/**
+      - shell/platform/android/**
+      - testing/scenario_app/**
+      - testing/skia_gold_client/**
 
-  - name: Linux Android Debug Engine
-    recipe: engine/engine
+  - name: Linux linux_android_emulator_skia_tests
+    enabled_branches:
+      - main
+    recipe: engine_v2/engine_v2
     properties:
-      add_recipes_cq: "true"
-      build_android_debug: "true"
-      build_android_jit_release: "true"
-      build_android_vulkan: "true"
-      android_sdk_license: \n24333f8a63b6825ea9c5514f83c2829b004d1fee
-      android_sdk_preview_license: \n84831b9409646a918e30573bab4c9c91346d8abd
-    timeout: 60
+      config_name: linux_android_emulator_skia
+      dependencies: >-
+        [
+          {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
+        ]
+    timeout: 90
+    runIf:
+      - .ci.yaml
+      - ci/builders/linux_android_emulator.json
+      - DEPS
+      - lib/ui/**
+      - shell/platform/android/**
+      - testing/scenario_app/**
+      - testing/skia_gold_client/**
 
-  - name: Linux Android Emulator Tests
-    recipe: engine/scenarios
+# Task to run Linux linux_android_emulator_tests on AVDs running Android 33
+# instead of 34 for investigating https://github.com/flutter/flutter/issues/137947.
+  - name: Linux linux_android_emulator_tests_api_33
+    bringup: true
     enabled_branches:
       - main
-      - master
+    recipe: engine_v2/engine_v2
     properties:
+      config_name: linux_android_emulator_api_33
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "31"},
-          {"dependency": "goldctl", "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"}
+          {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
         ]
-      upload_packages: "true"
-      clobber: "true"
     timeout: 60
     runIf:
-      - DEPS
       - .ci.yaml
-      - testing/**
+      - ci/builders/linux_android_emulator_api_33.json
+      - DEPS
+      - lib/ui/**
       - shell/platform/android/**
+      - testing/scenario_app/**
+      - testing/skia_gold_client/**
 
-  - name: Linux Benchmarks
+  - name: Linux builder_cache
     enabled_branches:
       - main
-      - master
-    recipe: engine/engine_metrics
+    recipe: engine_v2/cache
     presubmit: false
     properties:
-      build_host: "true"
-      upload_metrics: "true"
-    timeout: 60
-
-  - name: Linux Benchmarks (no-upload)
-    recipe: engine/engine_metrics
-    properties:
-      build_host: "true"
-      upload_metrics: "false"
-    timeout: 60
-
-  - name: Linux Fuchsia
-    recipe: engine/engine
-    properties:
-      add_recipes_cq: "true"
-      build_fuchsia: "true"
-      fuchsia_ctl_version: version:0.0.27
-      # ensure files from pre-production Fuchsia SDK tests are purged from cache
-      clobber: "true"
-    timeout: 90
-
-  - name: Linux Fuchsia FEMU
-    recipe: engine/femu_test
-    properties:
-      add_recipes_cq: "true"
-      build_fuchsia: "true"
-      fuchsia_ctl_version: version:0.0.27
-      # ensure files from pre-production Fuchsia SDK tests are purged from cache
-      clobber: "true"
-      emulator_arch: "x64"
+      cache_name: "builder"
+      cache_paths: >-
+        [
+          "builder",
+          "git"
+        ]
+      gclient_variables: >-
+        {
+          "download_emsdk": "true",
+          "download_android_deps": "true"
+        }
     timeout: 60
 
-  - name: Linux Fuchsia arm64 FEMU
-    recipe: engine/femu_test
-    bringup: true
+  - name: Windows builder_cache
+    enabled_branches:
+      - main
+    recipe: engine_v2/cache
+    presubmit: false
     properties:
-      add_recipes_cq: "true"
-      build_fuchsia: "true"
-      fuchsia_ctl_version: version:0.0.27
-      # ensure files from pre-production Fuchsia SDK tests are purged from cache
-      clobber: "true"
-      emulator_arch: "arm64"
+      cache_name: "builder"
+      cache_paths: >-
+        [
+          "builder",
+          "git"
+        ]
+      gclient_variables: >-
+        {
+          "download_android_deps": "true"
+        }
     timeout: 60
 
-  - name: Linux Framework Smoke Tests
-    recipe: engine/framework_smoke
+  - name: Mac builder_cache
     enabled_branches:
       - main
-      - master
-    timeout: 60
-
-  - name: Linux Host Engine
-    recipe: engine/engine
+    recipe: engine_v2/cache
+    presubmit: false
     properties:
-      add_recipes_cq: "true"
-      build_host: "true"
+      cache_name: "builder"
+      cache_paths: >-
+        [
+          "builder",
+          "git"
+        ]
+      ignore_cache_paths: >-
+        [
+          "builder/src/flutter/prebuilts/SDKs",
+          "builder/src/flutter/prebuilts/Library"
+        ]
+      gclient_variables: >-
+        {
+          "download_android_deps": "true"
+        }
     timeout: 60
 
-  - name: Linux Unopt
-    recipe: engine/engine_unopt
+  - name: Linux linux_benchmarks
+    enabled_branches:
+      - main
+    recipe: engine_v2/builder
+    presubmit: false
     properties:
-      add_recipes_cq: "true"
-      clobber: "true"
+      config_name: linux_benchmarks
     timeout: 60
 
-  - name: Linux License
-    recipe: engine/engine_license
-    properties:
-      add_recipes_cq: "true"
-      clobber: "true"
+  - name: Linux linux_fuchsia
+    recipe: engine_v2/engine_v2
     timeout: 60
-
-  - name: Linux Host clang-tidy
-    recipe: engine/engine_lint
     properties:
-      add_recipes_cq: "true"
-      cores: "32"
-      lint_android: "false"
-      lint_host: "true"
-    timeout: 60
-    runIf:
-      - DEPS
-      - .ci.yaml
-      - tools/**
-      - ci/**
-      - "**.h"
-      - "**.c"
-      - "**.cc"
-      - "**.fbs"
-      - "**.frag"
-      - "**.vert"
-
-  - name: Linux Android clang-tidy
-    recipe: engine/engine_lint
+      release_build: "true"
+      config_name: linux_fuchsia
+    # Do not remove(https://github.com/flutter/flutter/issues/144644)
+    # Scheduler will fail to get the platform
+    drone_dimensions:
+      - os=Linux
+    dimensions:
+      kvm: "1"
+    # TODO(https://github.com/flutter/flutter/issues/138559): Re-enable/delete.
+    # runIfNot:
+    #   - lib/web_ui/**
+    #   - shell/platform/android/**
+    #   - shell/platform/darwin/**
+    #   - shell/platform/glfw/**
+    #   - shell/platform/linux/**
+    #   - shell/platform/windows/**
+    #   - web_sdk/**
+
+  - name: Linux linux_clang_tidy
+    recipe: engine_v2/engine_v2
+    timeout: 120
     properties:
-      add_recipes_cq: "true"
-      cores: "32"
-      lint_android: "true"
-      lint_host: "false"
-    timeout: 60
+      config_name: linux_clang_tidy
     runIf:
       - DEPS
       - .ci.yaml
-      - tools/**
-      - ci/**
+      - tools/clang_tidy/**
+      - ci/builders/**
+      - ci/clang_tidy.sh
       - "**.h"
       - "**.c"
       - "**.cc"
       - "**.fbs"
       - "**.frag"
       - "**.vert"
-      - "**.py" # Run pylint on the fastest clang-tidy builder.
-
-  - name: Linux Arm Host Engine
-    recipe: engine/engine_arm
-    properties:
-      add_recipes_cq: "true"
-      build_host: "true"
-    timeout: 90
 
   - name: Linux linux_arm_host_engine
     recipe: engine_v2/engine_v2
-    timeout: 60
+    timeout: 120
     properties:
+      add_recipes_cq: "true"
       release_build: "true"
       config_name: linux_arm_host_engine
+    drone_dimensions:
+      - os=Linux
 
   - name: Linux linux_host_engine
     recipe: engine_v2/engine_v2
-    timeout: 60
+    timeout: 120
     properties:
+      add_recipes_cq: "true"
       release_build: "true"
       config_name: linux_host_engine
+      dependencies: >-
+        [
+          {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
+        ]
+    drone_dimensions:
+      - os=Linux
+
+  - name: Linux linux_host_desktop_engine
+    recipe: engine_v2/engine_v2
+    timeout: 120
+    properties:
+      add_recipes_cq: "true"
+      release_build: "true"
+      config_name: linux_host_desktop_engine
+    drone_dimensions:
+      - os=Linux
 
   - name: Linux linux_android_aot_engine
     recipe: engine_v2/engine_v2
-    timeout: 60
+    timeout: 120
     properties:
+      add_recipes_cq: "true"
       release_build: "true"
       config_name: linux_android_aot_engine
+    drone_dimensions:
+      - os=Linux
 
   - name: Linux linux_android_debug_engine
     recipe: engine_v2/engine_v2
-    timeout: 60
+    timeout: 120
     properties:
+      add_recipes_cq: "true"
       release_build: "true"
       config_name: linux_android_debug_engine
+    drone_dimensions:
+      - os=Linux
 
-  - name: Linux Web Engine
-    recipe: engine/web_engine
+  - name: Linux linux_license
+    recipe: engine_v2/builder
+    timeout: 120
     properties:
       add_recipes_cq: "true"
-      cores: "32"
-      gcs_goldens_bucket: flutter_logs
-      gclient_variables: >-
-        {"download_emsdk": true}
-      dependencies: >-
-        [
-          {"dependency": "chrome_and_driver", "version": "version:107.0"},
-          {"dependency": "firefox", "version": "version:83.0"},
-          {"dependency": "goldctl", "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"}
-        ]
-    timeout: 60
+      config_name: linux_license
+      clobber: "true"
+
+  - name: Linux linux_web_engine
+    recipe: engine_v2/engine_v2
+    timeout: 120
+    properties:
+      release_build: "true"
+      config_name: linux_web_engine
+    drone_dimensions:
+      - os=Linux
     runIf:
       - DEPS
       - .ci.yaml
@@ -299,19 +300,29 @@ targets:
       - ci/**
       - flutter_frontend_server/**
 
+  - name: Linux linux_unopt
+    recipe: engine_v2/engine_v2
+    timeout: 120
+    properties:
+      config_name: linux_unopt
+
   - name: Linux Web Framework tests
     recipe: engine/web_engine_framework
     enabled_branches:
       - main
-      - master
     properties:
       add_recipes_cq: "true"
+      cores: "32"
+      gclient_variables: >-
+        {"download_emsdk": true}
       dependencies: >-
         [
-          {"dependency": "chrome_and_driver", "version": "version:96.2"},
+          {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
           {"dependency": "curl", "version": "version:7.64.0"}
         ]
-      framework: "true"
+      no_goma: "true"
+      drone_dimensions: >
+        ["device_type=none", "os=Linux"]
       shard: web_tests
       subshards: >-
               ["0", "1", "2", "3", "4", "5", "6", "7_last"]
@@ -325,64 +336,27 @@ targets:
       - ci/**
       - flutter_frontend_server/**
 
-  - name: Mac Android AOT Engine
-    recipe: engine/engine
-    properties:
-      android_sdk_license: \n24333f8a63b6825ea9c5514f83c2829b004d1fee
-      android_sdk_preview_license: \n84831b9409646a918e30573bab4c9c91346d8abd
-      build_android_aot: "true"
-      jazzy_version: "0.14.1"
-    timeout: 60
-
-  - name: Mac Host Engine
-    recipe: engine/engine
-    properties:
-      add_recipes_cq: "true"
-      build_host: "true"
-      jazzy_version: "0.14.1"
-    timeout: 75
-
-  - name: Mac mac_android_aot_engine
+  - name: Linux mac_android_aot_engine
     recipe: engine_v2/engine_v2
-    timeout: 60
+    timeout: 240
     properties:
+      add_recipes_cq: "true"
+      release_build: "true"
       config_name: mac_android_aot_engine
-      $flutter/osx_sdk : >-
-        { "sdk_version": "14a5294e" }
+    drone_dimensions:
+      - os=Linux
 
-  - name: Mac mac_host_engine
+  - name: Mac mac_clang_tidy
     recipe: engine_v2/engine_v2
-    timeout: 60
-    properties:
-      release_build: "true"
-      config_name: mac_host_engine
-      $flutter/osx_sdk : >-
-        { "sdk_version": "14a5294e" }
-
-  - name: Mac Unopt
-    recipe: engine/engine_unopt
-    properties:
-      add_recipes_cq: "true"
-      jazzy_version: "0.14.1"
-      runtime_versions: >-
-        [
-          "ios-16-0_14a5294e"
-        ]
-    timeout: 75
-
-  - name: Mac Host clang-tidy
-    recipe: engine/engine_lint
+    timeout: 120
     properties:
-      add_recipes_cq: "true"
-      jazzy_version: "0.14.1"
-      lint_host: "true"
-      lint_ios: "false"
-    timeout: 75
+      config_name: mac_clang_tidy
     runIf:
       - DEPS
       - .ci.yaml
-      - tools/**
-      - ci/**
+      - tools/clang_tidy/**
+      - ci/builders/**
+      - ci/clang_tidy.sh
       - "**.h"
       - "**.c"
       - "**.cc"
@@ -392,147 +366,95 @@ targets:
       - "**.m"
       - "**.mm"
 
-  - name: Mac iOS clang-tidy
-    recipe: engine/engine_lint
-    properties:
-      add_recipes_cq: "true"
-      jazzy_version: "0.14.1"
-      lint_host: "false"
-      lint_ios: "true"
-    timeout: 75
-    runIf:
-      - DEPS
-      - .ci.yaml
-      - tools/**
-      - ci/**
-      - "**.h"
-      - "**.c"
-      - "**.cc"
-      - "**.fbs"
-      - "**.frag"
-      - "**.vert"
-      - "**.m"
-      - "**.mm"
-
-  - name: Mac iOS Engine
-    recipe: engine/engine
-    properties:
-      add_recipes_cq: "true"
-      build_ios: "true"
-      ios_debug: "true"
-      jazzy_version: "0.14.1"
-    timeout: 60
-
-  - name: Mac Web Engine
-    recipe: engine/web_engine
+  - name: Mac mac_host_engine
+    recipe: engine_v2/engine_v2
+    timeout: 240
     properties:
       add_recipes_cq: "true"
-      gcs_goldens_bucket: flutter_logs
-      gclient_variables: >-
-        {"download_emsdk": true}
+      release_build: "true"
+      cpu: arm64
+      config_name: mac_host_engine
       dependencies: >-
         [
-          {"dependency": "goldctl", "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"}
+          {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
         ]
-    timeout: 60
-    runIf:
-      - DEPS
-      - .ci.yaml
-      - lib/web_ui/**
-      - web_sdk/**
-      - tools/**
-      - ci/**
-      - flutter_frontend_server/**
+      $flutter/osx_sdk : >-
+        {
+          "sdk_version": "15a240d"
+        }
+    drone_dimensions:
+      - os=Mac-13
+
+  - name: Mac mac_unopt
+    recipe: engine_v2/engine_v2
+    properties:
+      config_name: mac_unopt
+      add_recipes_cq: "true"
+    timeout: 120
 
   - name: Mac mac_ios_engine
     recipe: engine_v2/engine_v2
-    timeout: 60
+    timeout: 240
     properties:
+      add_recipes_cq: "true"
       release_build: "true"
       config_name: mac_ios_engine
       $flutter/osx_sdk : >-
-        { "sdk_version": "14a5294e" }
-      dependencies: >-
-        [
-          {"dependency": "jazzy", "version": "0.14.1"}
-        ]
-
-  - name: Windows Android AOT Engine
-    recipe: engine/engine
-    properties:
-      build_android_aot: "true"
-      android_sdk_license: \n24333f8a63b6825ea9c5514f83c2829b004d1fee
-      android_sdk_preview_license: \n84831b9409646a918e30573bab4c9c91346d8abd
-    timeout: 60
-
-  - name: Windows Host Engine
-    recipe: engine/engine
+        {
+          "sdk_version": "15a240d"
+        }
+    drone_dimensions:
+      - os=Mac-13
+      - cpu=x86
+
+  - name: Mac impeller-cmake-example
+    bringup: true
+    recipe: engine_v2/engine_v2
     timeout: 60
     properties:
-      add_recipes_cq: "true"
-      build_host: "true"
+      cpu: arm64
+      config_name: mac_impeller_cmake_example
 
   - name: Windows windows_android_aot_engine
     recipe: engine_v2/engine_v2
-    timeout: 60
+    timeout: 120
     properties:
+      add_recipes_cq: "true"
       release_build: "true"
       config_name: windows_android_aot_engine
+    drone_dimensions:
+      - os=Windows
 
   - name: Windows windows_host_engine
     recipe: engine_v2/engine_v2
-    timeout: 60
+    timeout: 120
     properties:
+      add_recipes_cq: "true"
       release_build: "true"
       config_name: windows_host_engine
+    drone_dimensions:
+      - os=Windows
 
-  - name: Windows Unopt
-    recipe: engine/engine_unopt
+  - name: Windows windows_arm_host_engine
+    recipe: engine_v2/engine_v2
+    timeout: 120
+    enabled_branches:
+      # Don't run this on release branches
+      - main
     properties:
       add_recipes_cq: "true"
-    timeout: 75
-
-  - name: Windows Web Engine
-    recipe: engine/web_engine
-    properties:
-      gclient_variables: >-
-        {"download_emsdk": true}
-      gcs_goldens_bucket: flutter_logs
-      dependencies: >-
-        [
-          {"dependency": "chrome_and_driver", "version": "version:107.0"}
-        ]
-    timeout: 60
-    runIf:
-      - DEPS
-      - .ci.yaml
-      - lib/web_ui/**
-      - web_sdk/**
+      config_name: windows_arm_host_engine
+    drone_dimensions:
+      - os=Windows
 
-  - name: Mac iOS Engine Profile
-    recipe: engine/engine
+  - name: Windows windows_unopt
+    recipe: engine_v2/builder
+    timeout: 120
     properties:
-      build_ios: "true"
-      ios_profile: "true"
-      jazzy_version: "0.14.1"
-    timeout: 90
-    runIf:
-      - DEPS
-      - .ci.yaml
-      - ci/**
-
-  - name: Mac iOS Engine Release
-    recipe: engine/engine
-    properties:
-      build_ios: "true"
-      ios_release: "true"
-      jazzy_version: "0.14.1"
-    timeout: 90
-    runIf:
-      - DEPS
-      - .ci.yaml
-      - ci/**
+      config_name: windows_unopt
 
   - name: Linux ci_yaml engine roller
     bringup: true
     recipe: infra/ci_yaml
+    properties:
+      backfill: "false"
diff --git a/.clang-tidy b/.clang-tidy
index abd87ed614c4fc3997f556716ebab89e572bb52b..b74be267bc42f08ebf9afe8eec5cbbfe75c5a1c9 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,39 +1,64 @@
+# A YAML format of https://clang.llvm.org/extra/clang-tidy/.
+
 # Prefix check with "-" to ignore.
-# Note: Some of the checks here are used as errors selectively, see
-# //ci/lint.sh
-Checks: "bugprone-use-after-move,\
-clang-analyzer-*,\
-clang-diagnostic-*,\
-darwin-*,\
-google-*,\
-modernize-use-default-member-init,\
-objc-*,\
--objc-nsinvocation-argument-lifetime,\
-readability-identifier-naming,\
--google-build-using-namespace,\
--google-default-arguments,\
--google-objc-global-variable-declaration,\
--google-objc-avoid-throwing-exception,\
--google-readability-casting,\
--clang-analyzer-nullability.NullPassedToNonnull,\
--clang-analyzer-nullability.NullablePassedToNonnull,\
--clang-analyzer-nullability.NullReturnedFromNonnull,\
--clang-analyzer-nullability.NullableReturnedFromNonnull,\
-performance-move-const-arg,\
-performance-unnecessary-value-param"
+Checks: >-
+  bugprone-argument-comment,
+  bugprone-use-after-move,
+  bugprone-unchecked-optional-access,
+  clang-analyzer-*,
+  clang-diagnostic-*,
+  darwin-*,
+  google-*,
+  modernize-use-default-member-init,
+  objc-*,
+  -objc-nsinvocation-argument-lifetime,
+  readability-identifier-naming,
+  -google-build-using-namespace,
+  -google-default-arguments,
+  -google-objc-global-variable-declaration,
+  -google-objc-avoid-throwing-exception,
+  -google-readability-casting,
+  -clang-analyzer-nullability.NullPassedToNonnull,
+  -clang-analyzer-nullability.NullablePassedToNonnull,
+  -clang-analyzer-nullability.NullReturnedFromNonnull,
+  -clang-analyzer-nullability.NullableReturnedFromNonnull,
+  -clang-analyzer-nullability.NullableDereferenced,
+  performance-for-range-copy,
+  performance-inefficient-vector-operation,
+  performance-move-const-arg,
+  performance-move-constructor-init,
+  performance-unnecessary-copy-initialization,
+  performance-unnecessary-value-param
 
 CheckOptions:
-  - key:    modernize-use-default-member-init.UseAssignment
-    value:  true
-  - key:    readability-identifier-naming.EnumConstantCase
-    value:  'CamelCase'
-  - key:    readability-identifier-naming.EnumConstantPrefix
-    value:  'k'
-  - key:    readability-identifier-naming.GlobalConstantCase
-    value:  'CamelCase'
-  - key:    readability-identifier-naming.GlobalConstantPrefix
-    value:  'k'
-  - key:    readability-identifier-naming.PrivateMemberCase
-    value:  'lower_case'
-  - key:    readability-identifier-naming.PrivateMemberSuffix
-    value:  '_'
+  - key: modernize-use-default-member-init.UseAssignment
+    value: true
+  - key: readability-identifier-naming.EnumConstantCase
+    value: "CamelCase"
+  - key: readability-identifier-naming.EnumConstantPrefix
+    value: "k"
+  - key: readability-identifier-naming.GlobalConstantCase
+    value: "CamelCase"
+  - key: readability-identifier-naming.GlobalConstantPrefix
+    value: "k"
+  - key: readability-identifier-naming.PrivateMemberCase
+    value: "lower_case"
+  - key: readability-identifier-naming.PrivateMemberSuffix
+    value: "_"
+
+# Intended to include (lint) all headers except:
+# ... those in ../../gen (generated files don't need to follow clang tidy)
+# ... those in flutter/third_party (we didn't author this code, it's a dep)
+#
+# Unfortunately Clang Tidy uses an ancient version of regular expressions
+# without lookaheads, so the next best thing is to write out every directory
+# except third_party.
+#
+# If we ever add a new root directory, we'll have to update this expression.
+#
+# See the test in ./tools/clang_tidy/test/header_filter_regex_test.dart which
+# should theoretically catch if new directories are added but this regex is not
+# updated.
+#
+# tl;dr: I'm sorry.
+HeaderFilterRegex: "[..\/]+\/flutter\/(assets|benchmarking|bin|build|ci|common|display_list|docs|examples|flow|flutter_frontend_server|flutter_vma|fml|impeller|lib|runtime|shell|skia|sky|testing|tools|vulkan|wasm|web_sdk)\/.*"
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index cacf41257f6b5775e8c0c33f8ca16e558e8443a6..c1c1d3d05f37b0e09155b32aceb6d2ec62ee464b 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -10,7 +10,7 @@
 - [ ] I read the [Tree Hygiene] wiki page, which explains my responsibilities.
 - [ ] I read and followed the [Flutter Style Guide] and the [C++, Objective-C, Java style guides].
 - [ ] I listed at least one issue that this PR fixes in the description above.
-- [ ] I added new tests to check the change I am making or feature I am adding, or Hixie said the PR is test-exempt. See [testing the engine] for instructions on writing and running engine tests.
+- [ ] I added new tests to check the change I am making or feature I am adding, or the PR is [test-exempt]. See [testing the engine] for instructions on writing and running engine tests.
 - [ ] I updated/added relevant documentation (doc comments with `///`).
 - [ ] I signed the [CLA].
 - [ ] All existing and new tests are passing.
@@ -20,6 +20,7 @@ If you need help, consider asking for advice on the #hackers-new channel on [Dis
 <!-- Links -->
 [Contributor Guide]: https://github.com/flutter/flutter/wiki/Tree-hygiene#overview
 [Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene
+[test-exempt]: https://github.com/flutter/flutter/wiki/Tree-hygiene#tests
 [Flutter Style Guide]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo
 [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
 [testing the engine]: https://github.com/flutter/flutter/wiki/Testing-the-engine
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 312793af9931b3076dda1cc9f3f21ee8430379f0..9688ddae25af122d7c17d9c27d887b84888f3619 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -7,5 +7,17 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+      time: "22:00" # 10 PM MTV
+      timezone: "America/Los_Angeles"
+    labels:
+      - "autosubmit"
+    ignore:
+      # ignore patch versions, just rely on minor in order to update fewer times
+      - dependency-name: "github/codeql-action"
+        update-types: ["version-update:semver-minor"]
+  - package-ecosystem: "pub"
+    directory: "/lib/web_ui"
+    schedule:
+      interval: "daily"
     labels:
       - "autosubmit"
diff --git a/.github/labeler.yml b/.github/labeler.yml
new file mode 100644
index 0000000000000000000000000000000000000000..ed7171a9638274d8f411b6bededec61feab15a7b
--- /dev/null
+++ b/.github/labeler.yml
@@ -0,0 +1,60 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# See https://github.com/actions/labeler/blob/main/README.md for docs.
+'affects: desktop':
+  - changed-files:
+    - any-glob-to-any-file:
+      - shell/platform/darwin/common/**/*
+      - shell/platform/darwin/macos/**/*
+      - shell/platform/linux/**/*
+      - shell/platform/windows/**/*
+
+embedder:
+  - changed-files:
+    - any-glob-to-any-file:
+      - shell/platform/embedder
+
+'e: impeller':
+  - changed-files:
+    - any-glob-to-any-file:
+      - impeller/**/*
+
+platform-android:
+  - changed-files:
+    - any-glob-to-any-file:
+      - shell/platform/android/**/*
+
+platform-ios:
+  - changed-files:
+    - any-glob-to-any-file:
+      - shell/platform/darwin/common/**/*
+      - shell/platform/darwin/ios/**/*
+
+platform-fuchsia:
+  - changed-files:
+    - any-glob-to-any-file:
+      - shell/platform/fuchsia/**/*
+
+platform-linux:
+  - changed-files:
+    - any-glob-to-any-file:
+      - shell/platform/linux/**/*
+
+platform-macos:
+  - changed-files:
+    - any-glob-to-any-file:
+      - shell/platform/darwin/common/**/*
+      - shell/platform/darwin/macos/**/*
+
+platform-web:
+  - changed-files:
+    - any-glob-to-any-file:
+      - lib/web_ui/**/*
+      - '**/web_sdk/**/*'
+
+platform-windows:
+  - changed-files:
+    - any-glob-to-any-file:
+      - shell/platform/windows/**/*
diff --git a/.github/release.yml b/.github/release.yml
new file mode 100644
index 0000000000000000000000000000000000000000..be245c915e7eb5377317cc6eb038442628071790
--- /dev/null
+++ b/.github/release.yml
@@ -0,0 +1,25 @@
+changelog:
+  exclude:
+    authors:
+      - skia-flutter-autoroll
+      - dependabot
+  categories:
+    - title: Impeller
+      labels:
+        - "e: impeller"
+    - title: Android
+      labels:
+        - platform-android
+    - title: iOS
+      labels:
+        - platform-ios
+    - title: Web
+      labels:
+        - platform-web
+    - title: Desktop
+      labels:
+        - platform-windows
+        - platform-macos
+    - title: Other Changes
+      labels:
+        - "*"
diff --git a/.github/workflows/engine-cp.yml b/.github/workflows/engine-cp.yml
new file mode 100644
index 0000000000000000000000000000000000000000..95a1d2bb6d8f5ab67a583bdc08640152d50ed050
--- /dev/null
+++ b/.github/workflows/engine-cp.yml
@@ -0,0 +1,86 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+name: Cherry-pick Labeled Engine PR to Release Branch
+
+on:
+  pull_request_target:
+    branches: main
+    types: [labeled]
+
+permissions: write-all
+
+jobs:
+  cherrypick_to_release:
+    name: cherrypick_to_release
+    runs-on: ubuntu-latest
+    if: |
+      (github.event.label.name == format('cp{0} beta', ':') || github.event.label.name == format('cp{0} stable', ':')) &&
+      (github.event.pull_request.merged == true)
+    steps:
+      - name: Get Release Channel
+        run: |
+          echo "CHANNEL=$(echo ${{ github.event.label.name }} | cut -d ':' -f 2 | xargs)" >> $GITHUB_ENV
+      - name: Get Release Candidate Branch
+        run: |
+          RELEASE_BRANCH=$(curl https://raw.githubusercontent.com/flutter/flutter/$CHANNEL/bin/internal/release-candidate-branch.version)
+          echo "RELEASE_BRANCH=$(echo $RELEASE_BRANCH | tr -d '\n')" >> $GITHUB_ENV
+      - name: Get Cherry Pick PR
+        run: |
+          echo "COMMIT_SHA=$(echo ${{ github.event.pull_request.merge_commit_sha }})" >> $GITHUB_ENV
+      - name: Checkout Flutter Engine Repo
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
+        with:
+          repository: flutteractionsbot/engine
+          path: engine
+          ref: main
+          persist-credentials: false
+          # Checkout all history commits on main branch, so that the cp commit is a known object
+          fetch-depth: 0
+      - name: Attempt CP
+        id: attempt-cp
+        working-directory: ./engine
+        run: |
+          git config user.name "GitHub Actions Bot"
+          git config user.email "<>"
+          git remote add upstream https://github.com/flutter/engine.git
+          git fetch upstream $RELEASE_BRANCH
+          git fetch upstream main
+          git checkout -b cp-engine-${CHANNEL}-${COMMIT_SHA} --track upstream/$RELEASE_BRANCH
+          git cherry-pick $COMMIT_SHA
+      # TODO(xilaizhang): remove this step once the template is available on release branches.
+      - name: Get CP Template
+        run: |
+          curl -o PULL_REQUEST_CP_TEMPLATE.md https://raw.githubusercontent.com/flutter/flutter/master/.github/PR_TEMPLATE/PULL_REQUEST_CP_TEMPLATE.md
+      - name: Create PR on CP success
+        if: ${{ steps.attempt-cp.conclusion == 'success' }}
+        working-directory: ./engine
+        id: create-pr
+        run: |
+          git push https://${{ env.GITHUB_TOKEN }}@github.com/flutteractionsbot/engine cp-engine-${CHANNEL}-${COMMIT_SHA}
+          {
+            echo 'PR_URL<<EOF'
+            gh pr create --title "[CP-${CHANNEL}]${PR_TITLE}" --body-file ../PULL_REQUEST_CP_TEMPLATE.md --base ${RELEASE_BRANCH} --label "cp: review" --repo flutter/engine --head flutteractionsbot:cp-engine-${CHANNEL}-${COMMIT_SHA}
+            echo EOF
+          } >> "$GITHUB_ENV"
+        env:
+          GITHUB_TOKEN: ${{ secrets.FLUTTERACTIONSBOT_CP_TOKEN }}
+          PR_TITLE: ${{ github.event.pull_request.title }}
+      - name: Leave Comment on CP success
+        if: ${{ steps.create-pr.conclusion == 'success' }}
+        run: |
+          echo $PR_URL
+          NEW_PR_NUMBER="${PR_URL##*/}"
+          SUCCESS_MSG=" @${{ github.actor }} please fill out the PR description above, afterwards the release team will review this request."
+          gh pr comment $NEW_PR_NUMBER -R flutter/engine -b "${SUCCESS_MSG}"
+        env:
+          GITHUB_TOKEN: ${{ secrets.FLUTTERACTIONSBOT_CP_TOKEN }}
+      - name: Leave Comment on CP failure
+        if: ${{ failure() && steps.attempt-cp.conclusion == 'failure' }}
+        run: |
+          FAILURE_MSG="Failed to create CP due to merge conflicts.<br>"
+          FAILURE_MSG+="You will need to create the PR manually. See [the cherrypick wiki](https://github.com/flutter/flutter/wiki/Flutter-Cherrypick-Process) for more info."
+          gh pr comment ${{ github.event.pull_request.number }} -R flutter/engine -b "${FAILURE_MSG}"
+        env:
+          GITHUB_TOKEN: ${{ secrets.FLUTTERACTIONSBOT_CP_TOKEN }}
diff --git a/.github/workflows/mirror.yml b/.github/workflows/labeler.yml
similarity index 47%
rename from .github/workflows/mirror.yml
rename to .github/workflows/labeler.yml
index c5e20e9cf3f9fce1bdc78ea7f3179bf6d18b885d..baa8a2d1112c452d9ee39fb2a58cbff4a02062f6 100644
--- a/.github/workflows/mirror.yml
+++ b/.github/workflows/labeler.yml
@@ -2,27 +2,19 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# Mirror master to main branches in the engine repository.
+name: "Pull Request Labeler"
 on:
-  push:
-    branches:
-      - 'main'
+- pull_request_target
 
 # Declare default permissions as read only.
 permissions: read-all
 
 jobs:
-  mirror_job:
+  triage:
+    if: ${{ github.repository == 'flutter/engine' }}
     permissions:
       pull-requests: write
     runs-on: ubuntu-latest
-    if: ${{ github.repository == 'flutter/engine' }}
-    name: Mirror main branch to master branch
     steps:
-      - name: Mirror action step
-        id: mirror
-        uses: google/mirror-branch-action@c6b07e441a7ffc5ae15860c1d0a8107a3a151db8
-        with:
-          github-token: ${{ secrets.FLUTTERMIRRORINGBOT_TOKEN }}
-          source: 'main'
-          dest: 'master'
+    # Source available at https://github.com/actions/labeler/blob/main/README.md
+    - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9
diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml
index 5bdab6cb3476d9830b8dd02c61336a7e4732632f..c0b267e7c8b3b6ea81266a9427d3fc1c9b82e377 100644
--- a/.github/workflows/scorecards-analysis.yml
+++ b/.github/workflows/scorecards-analysis.yml
@@ -9,22 +9,6 @@ on:
 permissions: read-all
 
 jobs:
-  vuln-scan:
-    name: Vulnerability scanning
-    runs-on: ubuntu-20.04
-    if: ${{ github.repository == 'flutter/engine' }}
-    steps:
-      - name: "Checkout code"
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
-        with:
-          persist-credentials: false
-      - name: "setup python"
-        uses: actions/setup-python@13ae5bb136fac2878aff31522b9efb785519f984
-        with:
-          python-version: '3.7.7' # install the python version needed
-      - name: "execute py script"
-        run: python ci/deps_parser.py
-
   scorecards:
     name: Scorecards analysis
     runs-on: ubuntu-latest
@@ -38,11 +22,11 @@ jobs:
       id-token: write
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
         with:
           persist-credentials: false
       - name: "Run analysis"
-        uses: ossf/scorecard-action@e363bfca00e752f91de7b7d2a77340e2e523cb18
+        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736
         with:
           results_file: results.sarif
           results_format: sarif
@@ -57,7 +41,7 @@ jobs:
 
       # Upload the results as artifacts (optional).
       - name: "Upload artifact"
-        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8
+        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
         with:
           name: SARIF file
           path: results.sarif
@@ -65,6 +49,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@c3b6fce4ee2ca25bc1066aa3bf73962fda0e8898
+        uses: github/codeql-action/upload-sarif@cdcdbb579706841c47f7063dda365e292e5cad7a
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/third_party_scan.yml b/.github/workflows/third_party_scan.yml
index 3e4a6b25cb3f7cdd4db4676ae3840827ab509013..46eead77c344b60cd671fc5c7eedbf86a8c2f18a 100644
--- a/.github/workflows/third_party_scan.yml
+++ b/.github/workflows/third_party_scan.yml
@@ -1,56 +1,55 @@
-name: Third party dependency scan
+name: Third party deps scan
 on:
   # Only the default branch is supported.
   branch_protection_rule:
+  push:
     branches: [ main ]
-    schedule:
-      - cron: "0 8 * * *" # runs daily at 08:00
-
+  pull_request:
+    types: [ labeled ]
 
 # Declare default permissions as read only.
 permissions: read-all
 
 jobs:
-  analysis:
-    name: Third party dependency scan
-    runs-on: ubuntu-latest
+  extract-deps:
+    name: Extract Dependencies
+    runs-on: ubuntu-20.04
+    if: ${{ (github.repository == 'flutter/engine' && github.event_name == 'push') || github.event.label.name == 'vulnerability scan' }}
     permissions:
-      # Needed to upload the results to code-scanning dashboard.
+      # Needed to upload the SARIF results to code-scanning dashboard.
       security-events: write
-      actions: read
       contents: read
-
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
         with:
           persist-credentials: false
-
-      - name: setup python
-        uses: actions/setup-python@98f2ad02fd48d057ee3b4d4f66525b231c3e52b6
+      - name: "setup python"
+        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c
         with:
           python-version: '3.7.7' # install the python version needed
-
-      - name: install dependency
-        run: pip install git+https://github.com/psf/requests.git@4d394574f5555a8ddcc38f707e0c9f57f55d9a3b
-
-      - name: execute py script
-        run: python ci/deps_parser.py 
-      
-      - name: parse deps_parser output.txt
-        run: python ci/scan_flattened_deps.py 
-
-      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
-      # format to the repository Actions tab.
-      - name: "Upload artifact"
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
+      - name: "extract deps, find commit hash, pass to osv-scanner"
+        run: python ci/scan_deps.py --output osv-lockfile-${{github.sha}}.json
+      - name: "upload osv-scanner deps"
+        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
         with:
-          name: SARIF file
-          path: osvReport.sarif
-          retention-days: 5
-
-      # Upload the results to GitHub's code scanning dashboard.
-      - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@a3a6c128d771b6b9bdebb1c9d0583ebd2728a108
-        with:
-          sarif_file: osvReport.sarif
+          # use github.ref in name to avoid duplicated artifacts
+          name: osv-lockfile-${{github.sha}}
+          path: osv-lockfile-${{github.sha}}.json
+          retention-days: 2
+  vuln-scan:
+    name: Vulnerability scanning
+    needs:
+      extract-deps
+    uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@v1.6.2-beta1"
+    with:
+      # Download the artifact uploaded in extract-deps step
+      download-artifact: osv-lockfile-${{github.sha}}
+      scan-args: |-
+        --lockfile=osv-scanner:osv-lockfile-${{github.sha}}.json
+      fail-on-vuln: false
+    # makes sure the osv-formatted vulns are uploaded
+    permissions:
+      # Needed to upload the SARIF results to code-scanning dashboard.
+      security-events: write
+      contents: read
diff --git a/.gitignore b/.gitignore
index c66ae6504bef8acbfdfd75d3530f57e297d3a3ff..10440a5444ad978e130920b62521a8bb7a87d68c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,16 +28,12 @@ pubspec.lock
 docs/doxygen/
 xcuserdata
 
-third_party/gn/
-third_party/ninja/ninja*
-
 # Miscellaneous
 *.class
 *.lock
 *.log
 *.pyc
 *.swp
-.DS_Store
 .atom/
 .buildlog/
 .history
@@ -79,7 +75,6 @@ unlinked_spec.ds
 **/android/gradlew
 **/android/gradlew.bat
 **/android/local.properties
-**/android/**/GeneratedPluginRegistrant.java
 **/android/key.properties
 *.jks
 
@@ -133,3 +128,20 @@ app.*.symbols
 
 # Prebuilt binaries.
 /prebuilts/
+
+# TODO(67373): This entry is temporarily disabled, but can be restored once the
+# buildmoot is completed.
+# GN build support for protobufs vended by Fuchsia.
+# /build/secondary/third_party/protobuf
+
+# Build tools vended from CIPD
+/buildtools
+
+# RBE support configurations and scripts vended from CIPD
+/build/rbe
+
+# The test-scripts from Chromium and managed by DEPS and gclient.
+/tools/fuchsia/test_scripts
+
+# The gn-sdk from Chromium and managed by DEPS and gclient.
+/tools/fuchsia/gn-sdk
diff --git a/.pylintrc b/.pylintrc
index 431b9e51c99f24f3fc3a85f08afbd3878d44c340..013763ac825d2e751a3e92b35987e2eec8997899 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -38,6 +38,7 @@ docstring-quote = double
 # multiple time (only on the command line, not in the configuration file where
 # it should appear only once).
 disable=
+    duplicate-code,
     exec-used,
     fixme,
     missing-class-docstring,
@@ -157,10 +158,10 @@ const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$
 class-rgx=[A-Z_][a-zA-Z0-9]+$
 
 # Regular expression which should only match correct function names
-function-rgx=[a-z_][a-z0-9_]{2,30}$
+function-rgx=[a-z_][a-z0-9_]{2,60}$
 
 # Regular expression which should only match correct method names
-method-rgx=[a-z_][a-z0-9_]{2,30}$
+method-rgx=[a-z_][a-z0-9_]{2,60}$
 
 # Regular expression which should only match correct instance attribute names
 attr-rgx=[a-z_][a-z0-9_]{2,30}$
diff --git a/.style.yapf b/.style.yapf
index 3c79e54c03a114a9dc9758683a16d679fa24ae2d..a52dc4c836349a84d112fa3ee973d53dfef7fc0a 100644
--- a/.style.yapf
+++ b/.style.yapf
@@ -9,3 +9,6 @@ blank_line_before_module_docstring = true
 dedent_closing_brackets = true
 coalesce_brackets = true
 each_dict_entry_on_separate_line = false
+# Match the number in .pylintrc at
+# https://github.com/flutter/engine/blob/main/.pylintrc#L135
+column_limit = 100
diff --git a/AUTHORS b/AUTHORS
index f3e9803d92f0483061aa3ea5bb8411863f2b1a15..5993e3044585621fde0df2750d281df271776042 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -23,3 +23,7 @@ Koutaro Mori <koutaro.mo@gmail.com>
 TheOneWithTheBraid <the-one@with-the-braid.cf>
 Twin Sun, LLC <google-contrib@twinsunsolutions.com>
 Qixing Cao <qixing.cao.83@gmail.com>
+LinXunFeng <linxunfeng@yeah.net>
+Amir Panahandeh <amirpanahandeh@gmail.com>
+Rulong Chen（陈汝龙）<rulong.crl@alibaba-inc.com>
+
diff --git a/BUILD.gn b/BUILD.gn
index 7a102d594bf570c401e4a55e5682fd014a56ab81..50a17bd38d052768fadf424870d8aca29c4c3909 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -8,7 +8,7 @@ import("//flutter/examples/examples.gni")
 import("//flutter/shell/platform/config.gni")
 import("//flutter/shell/platform/glfw/config.gni")
 import("//flutter/testing/testing.gni")
-import("//third_party/dart/build/dart/copy_tree.gni")
+import("$dart_src/build/dart/copy_tree.gni")
 
 # Whether to build the dartdevc sdk, libraries, and source files
 # required for the flutter web sdk.
@@ -19,12 +19,19 @@ declare_args() {
 }
 
 config("config") {
-  include_dirs = [ ".." ]
+  include_dirs = [
+    "..",
+    ".",
+  ]
+  cflags = []
   if (is_win) {
     if (current_cpu != "x86") {
-      cflags = [ "/WX" ]  # Treat warnings as errors.
+      cflags += [ "/WX" ]  # Treat warnings as errors.
     }
   }
+  if (is_clang) {
+    cflags += [ "-Wunreachable-code" ]
+  }
 }
 
 config("export_dynamic_symbols") {
@@ -46,6 +53,23 @@ config("export_dynamic_symbols") {
   }
 }
 
+config("export_dynamic_test_symbols") {
+  # See comment in :export_dynamic_symbols.
+  # This config exposes an additional symbol meant for flutter_tester.
+  if (is_linux || is_fuchsia) {
+    inputs = [ "//flutter/common/exported_test_symbols.sym" ]
+    ldflags = [ "-Wl,--dynamic-list=" + rebase_path(inputs[0], root_build_dir) ]
+  } else if (is_mac) {
+    inputs = [ "//flutter/common/exported_test_symbols_mac.sym" ]
+    ldflags = [
+      "-Xlinker",
+      "-exported_symbols_list",
+      "-Xlinker",
+      rebase_path(inputs[0], root_build_dir),
+    ]
+  }
+}
+
 group("flutter") {
   testonly = true
 
@@ -80,10 +104,7 @@ group("flutter") {
         # This must be listed explicitly for desktop cross-builds since
         # //flutter/lib/snapshot:generate_snapshot_bin will only build
         # gen_snapshot for the host and not the target.
-        "//third_party/dart/runtime/bin:gen_snapshot",
-
-        # Built alongside gen_snapshot for 64 bit targets
-        "//third_party/dart/runtime/bin:analyze_snapshot",
+        "$dart_src/runtime/bin:gen_snapshot",
 
         # Impeller artifacts - compiler and libtessellator
         "//flutter/impeller/compiler:impellerc",
@@ -93,6 +114,13 @@ group("flutter") {
         "//flutter/tools/path_ops",
       ]
 
+      if (host_os == "linux") {
+        public_deps += [
+          # Built alongside gen_snapshot for 64 bit targets
+          "$dart_src/runtime/bin:analyze_snapshot",
+        ]
+      }
+
       if (full_dart_sdk) {
         public_deps += [ "//flutter/web_sdk" ]
       }
@@ -101,9 +129,9 @@ group("flutter") {
 
   if (build_engine_artifacts) {
     public_deps += [
-      "//flutter/shell/testing($host_toolchain)",
+      # "//flutter/shell/testing($host_toolchain)",
       "//flutter/tools/const_finder",
-      "//flutter/tools/font-subset",
+      "//flutter/tools/font_subset",
     ]
   }
 
@@ -112,7 +140,10 @@ group("flutter") {
     public_deps += [
       "//flutter/display_list:display_list_benchmarks",
       "//flutter/display_list:display_list_builder_benchmarks",
+      "//flutter/display_list:display_list_region_benchmarks",
+      "//flutter/display_list:display_list_transform_benchmarks",
       "//flutter/fml:fml_benchmarks",
+      "//flutter/impeller/aiks:canvas_benchmarks",
       "//flutter/impeller/geometry:geometry_benchmarks",
       "//flutter/lib/ui:ui_benchmarks",
       "//flutter/shell/common:shell_benchmarks",
@@ -136,8 +167,21 @@ group("unittests") {
 
   public_deps = []
   if (is_android) {
-    public_deps +=
-        [ "//flutter/shell/platform/android:flutter_shell_native_unittests" ]
+    public_deps += [
+      "//flutter/impeller/toolkit/android:apk_unittests",
+      "//flutter/impeller/toolkit/android:unittests",
+      "//flutter/shell/platform/android:flutter_shell_native_unittests",
+    ]
+  }
+
+  if (is_ohos) {
+    public_deps += [
+      "//flutter/shell/platform/ohos:flutter_ohos_unittests",
+    ]
+  }
+
+  if (is_ios) {
+    public_deps += [ "//flutter/shell/platform/darwin/ios:ios_test_flutter" ]
   }
 
   # Compile all unittests targets if enabled.
@@ -146,6 +190,7 @@ group("unittests") {
       "//flutter/display_list:display_list_rendertests",
       "//flutter/display_list:display_list_unittests",
       "//flutter/flow:flow_unittests",
+      "//flutter/fml:fml_arc_unittests",
       "//flutter/fml:fml_unittests",
       "//flutter/lib/ui:ui_unittests",
       "//flutter/runtime:dart_plugin_registrant_unittests",
@@ -173,12 +218,20 @@ group("unittests") {
     }
 
     if (is_mac || is_linux || is_win) {
-      public_deps += [ "//flutter/impeller:impeller_unittests" ]
+      public_deps += [
+        "//flutter/impeller:impeller_dart_unittests",
+        "//flutter/impeller:impeller_unittests",
+      ]
     }
 
     if (is_mac) {
-      public_deps +=
-          [ "//flutter/shell/platform/darwin:flutter_channels_unittests" ]
+      public_deps += [
+        "//flutter/impeller/golden_tests:impeller_golden_tests",
+        "//flutter/shell/gpu:gpu_surface_metal_unittests",
+        "//flutter/shell/platform/darwin/common:availability_version_check_unittests",
+        "//flutter/shell/platform/darwin/common:framework_common_unittests",
+        "//flutter/third_party/spring_animation:spring_animation_unittests",
+      ]
     }
 
     if (!is_win && !is_fuchsia) {
@@ -257,8 +310,7 @@ if (is_fuchsia && enable_unittests) {
 # Dart tree, and is less ambiguous than specifying the binary to build since
 # we can specify the toolchain to use, too.
 if (host_os == "win") {
-  _gen_snapshot_target =
-      "//third_party/dart/runtime/bin:gen_snapshot($host_toolchain)"
+  _gen_snapshot_target = "$dart_src/runtime/bin:gen_snapshot($host_toolchain)"
   copy("gen_snapshot") {
     deps = [ _gen_snapshot_target ]
 
diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 0000000000000000000000000000000000000000..df68a330f4231a619ac38cb7fb0c7e0e17f1d8fd
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,5 @@
+# The following files define an Application Binary Interface (ABI) that must maintain
+# both forward and backward compatibility. Changes should be heavily
+# scrutinized as mistakes are irreversible.
+/shell/platform/embedder/embedder.h @cbracken @chinmaygarde
+/shell/platform/embedder/tests/embedder_frozen.h @cbracken @chinmaygarde @loic-sharma
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0ffb52ade03d9d193c781e463dca67d152dc80aa..15879dc40496ccf4c34b1e6db59339b56399a9aa 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,12 +1,8 @@
-Contributing to the Flutter engine
-==================================
-
-[![Build Status](https://api.cirrus-ci.com/github/flutter/engine.svg)][build_status]
+# Contributing to the Flutter engine
 
 _See also: [Flutter's code of conduct][code_of_conduct]_
 
-Welcome
--------
+## Welcome
 
 For an introduction to contributing to Flutter, see [our contributor
 guide][contrib_guide].
@@ -16,25 +12,25 @@ the Engine development environment][engine_dev_setup] on our wiki. Those
 instructions are part of the broader onboarding instructions described in the
 contributing guide.
 
-### Style
+## Style
 
 The Flutter engine follows Google style for the languages it uses:
+
 - [C++](https://google.github.io/styleguide/cppguide.html)
   - **Note**: The Linux embedding generally follows idiomatic GObject-based C
     style. Use of C++ is discouraged in that embedding to avoid creating hybrid
     code that feels unfamiliar to either developers used to working with
     `GObject` or C++ developers. For example, do not use STL collections or
     `std::string`. Exceptions:
-      - C-style casts are forbidden; use C++ casts.
-      - Use `nullptr` rather than `NULL`.
-      - Avoid `#define`; for internal constants use `static constexpr` instead.
+    - C-style casts are forbidden; use C++ casts.
+    - Use `nullptr` rather than `NULL`.
+    - Avoid `#define`; for internal constants use `static constexpr` instead.
 - [Objective-C][objc_style] (including [Objective-C++][objcc_style])
 - [Java][java_style]
 
 C/C++ and Objective-C/C++ files are formatted with `clang-format`, and GN files
 with `gn format`.
 
-[build_status]: https://cirrus-ci.com/github/flutter/engine
 [code_of_conduct]: https://github.com/flutter/flutter/blob/master/CODE_OF_CONDUCT.md
 [contrib_guide]: https://github.com/flutter/flutter/blob/master/CONTRIBUTING.md
 [engine_dev_setup]: https://github.com/flutter/flutter/wiki/Setting-up-the-Engine-development-environment
@@ -42,8 +38,94 @@ with `gn format`.
 [objcc_style]: https://google.github.io/styleguide/objcguide.html#objective-c
 [java_style]: https://google.github.io/styleguide/javaguide.html
 
+## Testing
+
+The testing policy for contributing to the flutter engine can be found at the
+[Tree Hygiene Wiki][tree_hygiene_wiki]. The summary is that all PR's to the
+engine should be tested or have an explicit test exemption.
+
+Because the engine targets multiple platforms the testing infrastructure is
+fairly complicated. Here are some more resources to help guide writing tests:
+
+- [Testing the engine wiki][testing_the_engine_wiki] - A guide on writing tests
+  for the engine including an overview of the different tests and the different
+  technologies the engine uses.
+- [`//testing`](./testing) - This is where the `run_tests.py` script is located.
+  All tests will have the ability to be executed with `run_tests.py`.
+- [`//ci/builders`](./ci/builders) - The JSON files that determine how tests are
+  executed on CI.
+
+Tests will be executed on CI, but some tests will be executed before PR's can be
+merged (presubmit) and others after they have been merged (postsubmit). Ideally
+everything would be presubmit but tests that take up more resources are executed
+in postsubmit.
+
+### Skia Gold
+
+The Flutter engine uses [Skia Gold][skia_gold] for image comparison tests which fail if:
+
+- The image is different from an accepted baseline.
+- An image is not uploaded but is expected to be (see
+  [`dir_contents_diff`][dir_contents_diff]).
+
+[skia_gold]: https://flutter-engine-gold.skia.org/
+[dir_contents_diff]: ./tools/dir_contents_diff/
+
+Any untriaged failures will block presubmit and postsubmit tests.
+
+### Example run_tests.py invocation
+
+```sh
+# Configure host build for macOS arm64 debug.
+$ flutter/tools/gn --runtime-mode=debug --unoptimized --no-lto --mac-cpu=arm64
+# Compile default targets (should cover all applicable run_tests.py requirements).
+$ ninja -j100 -C out/host_debug_unopt_arm64
+# Run all cross-platform C++ tests for the debug build arm64 variant.
+$ cd flutter/testing
+$ ./run_tests.py --variant=host_debug_unopt_arm64 --type=engine`
+```
+
+### Directory
+
+| Name                                     | run_tests.py type   | Description                                                     |
+| ---------------------------------------- | ------------------- | --------------------------------------------------------------- |
+| accessibility_unittests                  | engine              |                                                                 |
+| client_wrapper_glfw_unittests            | engine              |                                                                 |
+| client_wrapper_unittests                 | engine              |                                                                 |
+| common_cpp_core_unittests                | engine              |                                                                 |
+| common_cpp_unittests                     | engine              |                                                                 |
+| dart_plugin_registrant_unittests         | engine              |                                                                 |
+| display_list_rendertests                 | engine              |                                                                 |
+| display_list_unittests                   | engine              |                                                                 |
+| embedder_a11y_unittests                  | engine              |                                                                 |
+| embedder_proctable_unittests             | engine              |                                                                 |
+| embedder_unittests                       | engine              |                                                                 |
+| felt                                     | n/a                 | The test runner for flutter web. See //lib/web_ui               |
+| flow_unittests                           | engine              |                                                                 |
+| flutter_tester                           | dart                | Launcher for engine dart tests.                                 |
+| fml_arc_unittests                        | engine              |                                                                 |
+| fml_unittests                            | engine              | Unit tests for //fml                                            |
+| framework_common_unittests               | engine(mac)         |                                                                 |
+| gpu_surface_metal_unittests              | engine(mac)         |                                                                 |
+| impeller_dart_unittests                  | engine              |                                                                 |
+| impeller_golden_tests                    | engine(mac)         | Generates golden images for impeller (vulkan, metal, opengles). |
+| impeller_unittests                       | engine              | impeller unit tests and interactive tests                       |
+| ios_test_flutter                         | objc                | dynamic library of objc tests to be run with XCTest             |
+| jni_unittests                            | engine(not windows) |                                                                 |
+| no_dart_plugin_registrant_unittests      | engine              |                                                                 |
+| platform_view_android_delegate_unittests | engine(not windows) |                                                                 |
+| runtime_unittests                        | engine              |                                                                 |
+| shell_unittests                          | engine(not windows) |                                                                 |
+| scenario_app                             | android             | Integration and golden tests for Android, iOS                   |
+| testing_unittests                        | engine              |                                                                 |
+| tonic_unittests                          | engine              | Unit tests for //third_party/tonic                              |
+| txt_unittests                            | engine(linux)       |                                                                 |
+| ui_unittests                             | engine              |                                                                 |
+
+[tree_hygiene_wiki]: https://github.com/flutter/flutter/wiki/Tree-hygiene#tests
+[testing_the_engine_wiki]: https://github.com/flutter/flutter/wiki/Testing-the-engine
 
-### Fuchsia Contributions from Googlers
+## Fuchsia Contributions from Googlers
 
 Googlers contributing to Fuchsia should follow the additional steps at:
 go/flutter-fuchsia-pr-policy.
diff --git a/DEPS b/DEPS
index b98a7a467b3be8ad681a1b49d974449b622ef0c2..bcb562b2c87afef9b60449ca58e2b75777a2ca20 100644
--- a/DEPS
+++ b/DEPS
@@ -12,17 +12,13 @@ vars = {
   'swiftshader_git': 'https://swiftshader.googlesource.com',
   'dart_git': 'https://dart.googlesource.com',
   'flutter_git': 'https://flutter.googlesource.com',
-  'fuchsia_git': 'https://fuchsia.googlesource.com',
-  'github_git': 'https://github.com',
   'skia_git': 'https://skia.googlesource.com',
   'llvm_git': 'https://llvm.googlesource.com',
-  # OCMock is for testing only so there is no google clone
-  'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
-  'skia_revision': '7e1844439eaa3eb24d00c6314ddc81ca532fdd1b',
+  'skia_revision': 'c0e0b76d6d519c4d4d1be59e4723d415dd01f24e',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
-  'canvaskit_cipd_instance': 'ztaLvbs5GPmlAwUosC7VVp7EQnNVknRpNuKdv7vmzaAC',
+  'canvaskit_cipd_instance': '61aeJQ9laGfEFF_Vlc_u0MCkqB6xb2hAYHRBxKH-Uw4C',
 
   # Do not download the Emscripten SDK by default.
   # This prevents us from downloading the Emscripten toolchain for builds
@@ -34,13 +30,31 @@ vars = {
   # channels. This variable is being set when CI is checking out the repository.
   'release_candidate': False,
 
-
   # As Dart does, we use Fuchsia's GN and Clang toolchain. These revision
   # should be kept up to date with the revisions pulled by Dart.
+  #
   # The list of revisions for these tools comes from Fuchsia, here:
   # https://fuchsia.googlesource.com/integration/+/HEAD/toolchain
   # If there are problems with the toolchain, contact fuchsia-toolchain@.
-  'clang_version': 'git_revision:a93d03310e2c02fa5e24544df4706650f85788f7',
+  #
+  # Note, if you are *manually* rolling clang (i.e. the auto-roll is disabled)
+  # you'll need to run post-submits (i.e. for Clang Tidy) in order to test that
+  # updates to Clang Tidy will not turn the tree red.
+  #
+  # See https://github.com/flutter/flutter/wiki/Engine-pre‐submits-and-post‐submits#post-submit
+  'clang_version': 'git_revision:725656bdd885483c39f482a01ea25d67acf39c46',
+
+  # The goma version and the clang version can be tightly coupled. If goma
+  # stops working on a clang roll, this may need to be updated using the value
+  # from the 'integration' tag of
+  # https://chrome-infra-packages.appspot.com/p/fuchsia/third_party/goma/client
+  'goma_version': ' git_revision:41b3bcb64014144a844153fd5588c36411fffb56',
+
+  'reclient_version': 'git_revision:f61c232b70bc425f0b562480312b114c444d460d',
+
+  'gcloud_version': 'version:2@444.0.0.chromium.3',
+
+  'esbuild_version': '0.19.5',
 
   # When updating the Dart revision, ensure that all entries that are
   # dependencies of Dart are also updated to match the entries in the
@@ -48,31 +62,37 @@ 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': '5b8936496673a285bf8f37472119bc2afb38a295',
+  'dart_revision': 'a210745c4f35d47009c415ca9e087427ce19f85a',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
-  'dart_binaryen_rev': 'ec53f4b2d5b0d52ae703c5b696ecf052ad5fffbb',
-  'dart_boringssl_gen_rev': 'ced85ef0a00bbca77ce5a91261a5f2ae61b1e62f',
-  'dart_boringssl_rev': '87f316d7748268eb56f2dc147bd593254ae93198',
-  'dart_browser_launcher_rev': '5fa0bd6cddc33785f43c920576fc03dcee1c3caa',
-  'dart_clock_rev': '8a8231fa7912d84c7e99236b7800cfbef5ea7ae5',
-  'dart_collection_rev': 'efd709fc1760a595f8575f4137a1847de1b49d76',
-  'dart_devtools_rev': 'dd3fade2bd2ef74fc6102e56333a48f0efc594d3',
-  'dart_protobuf_rev': 'c181573c330ff0337db0bab5501deda3a42ba028',
-  'dart_pub_rev': '867ad175d81713c4e70473b1ab32107547cbdc3e',
-  'dart_root_certificates_rev': '692f6d6488af68e0121317a9c2c9eb393eb0ee50',
-  'dart_watcher_rev': '32591071a83f632478e702f67e29de6e54428ce9',
-  'dart_webdev_rev': '637b406f325669507b5c1048c19a7c0083c1bd6e',
-  'dart_webkit_inspection_protocol_rev': 'ddb624cd85954dd384056cc253a8fc2b9da5364d',
-  'dart_yaml_edit_rev': '299f74594ff9fda412c1da5c0b5d5231d0c6fc42',
-  'dart_zlib_rev': '27c2f474b71d0d20764f86f60ef8b00da1a16cda',
+  'dart_binaryen_rev': '9784f012848a7eb321c2037bdb363dfe0eab8bc9',
+  'dart_boringssl_gen_rev': '9c7294fd58261a79794f5afaa26598cf1442ad20',
+  'dart_boringssl_rev': 'd24a38200fef19150eef00cad35b138936c08767',
+  'dart_browser_launcher_rev': '79562306c86e5c087359a31a60309c8d65a699d3',
+  'dart_clock_rev': 'daf0fadabc5b3dc8e6e71bf3fb27ef9c3b79df5c',
+  'dart_collection_rev': 'fc616ff8fd7b732c07b2b19e31b6601e59900ccf',
+  'dart_devtools_rev': '7421a2d5d67cbcdec92f1a2ac993b8b64b28d7ca',
+  'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
+  'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
+  'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
+  'dart_protobuf_rev': 'b7613581d847e1e36e76f0e36db3a412d8fea5b1',
+  'dart_pub_rev': '3f0df78417f7c112b933fbcdc1c5c87bde680cb1',
+  'dart_tools_rev': 'f611290b530123ee2f0a3fda7c440d85dd080a30',
+  'dart_watcher_rev': '21858a41da1482922e03ee65cdf2169d01d59a67',
+  'dart_web_rev': 'c522718242d535d8040447b0cc1d47df7f2525a4',
+  'dart_webdev_rev': '51b5484348b4a8ede351e8dff0428b083495ba78',
+  'dart_webkit_inspection_protocol_rev': '153fea4fe5ac45bebf0c2e76bb3d76b0f1fcdaae',
+  'dart_yaml_edit_rev': '54884db790720ac0f7ca491cb9e6d7a0395ad4cb',
 
   'ocmock_rev': 'c4ec0e3a7a9f56cfdbd0aa01f4f97bb4b75c5ef8', # v3.7.1
 
   # Download a prebuilt Dart SDK by default
   'download_dart_sdk': True,
 
+  # Download a prebuilt esbuild by default
+  'download_esbuild': True,
+
   # Checkout Android dependencies only on platforms where we build for Android targets.
   'download_android_deps': 'host_os == "mac" or (host_os == "linux" and host_cpu == "x64")',
 
@@ -82,26 +102,54 @@ vars = {
   # Checkout Linux dependencies only when building on Linux.
   'download_linux_deps': 'host_os == "linux"',
 
+  # The minimum macOS SDK version. This must match the setting in
+  # //flutter/tools/gn.
+  'mac_sdk_min': '10.14',
+
+  # Checkout Fuchsia dependencies only on Linux. This is the umbrella flag which
+  # controls the behavior of all fuchsia related flags. I.e. any fuchsia related
+  # logic or condition may not work if this flag is False.
+  # TODO(zijiehe): Make this condition more strict to only download fuchsia
+  # dependencies when necessary: b/40935282
+  'download_fuchsia_deps': 'host_os == "linux"',
   # Downloads the fuchsia SDK as listed in fuchsia_sdk_path var. This variable
   # is currently only used for the Fuchsia LSC process and is not intended for
   # local development.
   'download_fuchsia_sdk': False,
   'fuchsia_sdk_path': '',
+  # Whether to download and run the Fuchsia emulator locally to test Fuchsia
+  # builds.
+  'run_fuchsia_emu': False,
 
   # An LLVM backend needs LLVM binaries and headers. To avoid build time
   # increases we can use prebuilts. We don't want to download this on every
   # CQ/CI bot nor do we want the average Dart developer to incur that cost.
-  # So by default we will not download prebuilts. This varible is needed in
+  # So by default we will not download prebuilts. This variable is needed in
   # the flutter engine to ensure that Dart gn has access to it as well.
   "checkout_llvm": False,
 
   # Setup Git hooks by default.
-  "setup_githooks": True,
+  'setup_githooks': True,
+
+  # When this is true, the goma client will be downloaded from cipd, and
+  # the engine build will prefer to use this client over a client that is
+  # specified by GOMA_DIR, or installed in the default goma install location.
+  'use_cipd_goma': False,
+
+  # When this is true, the Flutter Engine's configuration files and scripts for
+  # RBE will be downloaded from CIPD. This option is only usable by Googlers.
+  'use_rbe': False,
+
+  # This is not downloaded be default because it increases the
+  # `gclient sync` time by between 1 and 3 minutes. This option is enabled
+  # in flutter/ci/builders/mac_impeller_cmake_example.json, and is likely to
+  # only be useful locally when reproducing issues found by the bot.
+  'download_impeller_cmake_example': False,
 
   # Upstream URLs for third party dependencies, used in
   # determining common ancestor commit for vulnerability scanning
   # prefixed with 'upstream_' in order to be identified by parsing tool.
-  # The vulnerabiity database being used in this scan can be browsed
+  # The vulnerability database being used in this scan can be browsed
   # using this UI https://osv.dev/list
   # If a new dependency needs to be added, the upstream (non-mirrored)
   # git URL for that dependency should be added to this list
@@ -123,7 +171,6 @@ vars = {
   "upstream_cli_util": "https://github.com/dart-lang/cli_util.git",
   "upstream_clock": "https://github.com/dart-lang/clock.git",
   "upstream_collection": "https://github.com/dart-lang/collection.git",
-  "upstream_colorama": "https://github.com/tartley/colorama.git",
   "upstream_convert": "https://github.com/dart-lang/convert.git",
   "upstream_crypto": "https://github.com/dart-lang/crypto.git",
   "upstream_csslib": "https://github.com/dart-lang/csslib.git",
@@ -134,7 +181,6 @@ vars = {
   "upstream_file": "https://github.com/google/file.dart.git",
   "upstream_fixnum": "https://github.com/dart-lang/fixnum.git",
   "upstream_flatbuffers": "https://github.com/google/flatbuffers.git",
-  "upstream_fontconfig": "https://gitlab.freedesktop.org/fontconfig/fontconfig.git",
   "upstream_freetype2": "https://gitlab.freedesktop.org/freetype/freetype.git",
   "upstream_gcloud": "https://github.com/dart-lang/gcloud.git",
   "upstream_glfw": "https://github.com/glfw/glfw.git",
@@ -160,14 +206,12 @@ vars = {
   "upstream_libpng": "https://github.com/glennrp/libpng.git",
   "upstream_libtess2": "https://github.com/memononen/libtess2.git",
   "upstream_libwebp": "https://chromium.googlesource.com/webm/libwebp.git",
-  "upstream_libxml": "https://gitlab.gnome.org/GNOME/libxml2.git",
-  "upstream_linter": "https://github.com/dart-lang/linter.git",
+  "upstream_leak_tracker": "https://github.com/dart-lang/leak_tracker.git",
   "upstream_logging": "https://github.com/dart-lang/logging.git",
   "upstream_markdown": "https://github.com/dart-lang/markdown.git",
   "upstream_matcher": "https://github.com/dart-lang/matcher.git",
   "upstream_mime": "https://github.com/dart-lang/mime.git",
   "upstream_mockito": "https://github.com/dart-lang/mockito.git",
-  "upstream_oauth2": "https://github.com/dart-lang/oauth2.git",
   "upstream_ocmock": "https://github.com/erikdoe/ocmock.git",
   "upstream_package_config": "https://github.com/dart-lang/package_config.git",
   "upstream_packages": "https://github.com/flutter/packages.git",
@@ -182,7 +226,6 @@ vars = {
   "upstream_pyyaml": "https://github.com/yaml/pyyaml.git",
   "upstream_quiver-dart": "https://github.com/google/quiver-dart.git",
   "upstream_rapidjson": "https://github.com/Tencent/rapidjson.git",
-  "upstream_root_certificates": "https://github.com/dart-lang/root_certificates.git",
   "upstream_sdk": "https://github.com/dart-lang/sdk.git",
   "upstream_shaderc": "https://github.com/google/shaderc.git",
   "upstream_shelf": "https://github.com/dart-lang/shelf.git",
@@ -193,9 +236,11 @@ vars = {
   "upstream_sqlite": "https://github.com/sqlite/sqlite.git",
   "upstream_sse": "https://github.com/dart-lang/sse.git",
   "upstream_stack_trace": "https://github.com/dart-lang/stack_trace.git",
+  "upstream_stb": "https://github.com/nothings/stb.git",
   "upstream_stream_channel": "https://github.com/dart-lang/stream_channel.git",
   "upstream_string_scanner": "https://github.com/dart-lang/string_scanner.git",
   "upstream_SwiftShader": "https://swiftshader.googlesource.com/SwiftShader.git",
+  "upstream_tar": "https://github.com/simolus3/tar.git",
   "upstream_term_glyph": "https://github.com/dart-lang/term_glyph.git",
   "upstream_test_reflective_loader": "https://github.com/dart-lang/test_reflective_loader.git",
   "upstream_test": "https://github.com/dart-lang/test.git",
@@ -203,7 +248,6 @@ vars = {
   "upstream_typed_data": "https://github.com/dart-lang/typed_data.git",
   "upstream_usage": "https://github.com/dart-lang/usage.git",
   "upstream_vector_math": "https://github.com/google/vector_math.dart.git",
-  "upstream_Vulkan-Headers": "https://github.com/KhronosGroup/Vulkan-Headers.git",
   "upstream_VulkanMemoryAllocator": "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
   "upstream_watcher": "https://github.com/dart-lang/watcher.git",
   "upstream_web_socket_channel": "https://github.com/dart-lang/web_socket_channel.git",
@@ -214,6 +258,15 @@ vars = {
   "upstream_yaml": "https://github.com/dart-lang/yaml.git",
   "upstream_yapf": "https://github.com/google/yapf.git",
   "upstream_zlib": "https://github.com/madler/zlib.git",
+
+  # The version / instance id of the cipd:chromium/fuchsia/test-scripts which
+  # will be used altogether with fuchsia-sdk to setup the build / test
+  # environment.
+  'fuchsia_test_scripts_version': 'XtkBHdNTtIpWdxN_lUNf6VqnvPUhvGTYgPDqob1R65EC',
+
+  # The version / instance id of the cipd:chromium/fuchsia/gn-sdk which will be
+  # used altogether with fuchsia-sdk to generate gn based build rules.
+  'fuchsia_gn_sdk_version': 'RgErspyYHapUO2SpcW-vo2p8yaRUMUrq0eWjRVPfQjoC',
 }
 
 gclient_gn_args_file = 'src/third_party/dart/build/config/gclient_args.gni'
@@ -229,26 +282,22 @@ allowed_hosts = [
   'chromium.googlesource.com',
   'dart.googlesource.com',
   'flutter.googlesource.com',
-  'fuchsia.googlesource.com',
   'llvm.googlesource.com',
   'skia.googlesource.com',
   'swiftshader.googlesource.com',
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '8747bce41d0dc6d9dc45c4d1b46d2100bb9ee688',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'ba3ca696f4f95e998707523be755c15440c6bf3f',
 
-   # Fuchsia compatibility
-   #
-   # The dependencies in this section should match the layout in the Fuchsia gn
-   # build. Eventually, we'll manage these dependencies together with Fuchsia
-   # and not have to specific specific hashes.
+  'src/flutter/third_party/depot_tools':
+  Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7',
 
-  'src/third_party/rapidjson':
-   Var('fuchsia_git') + '/third_party/rapidjson' + '@' + 'ef3564c5c8824989393b87df25355baf35ff544b',
+  'src/flutter/third_party/rapidjson':
+   Var('flutter_git') + '/third_party/rapidjson' + '@' + 'ef3564c5c8824989393b87df25355baf35ff544b',
 
-  'src/third_party/harfbuzz':
-   Var('flutter_git') + '/third_party/harfbuzz' + '@' + 'd40d15e994ed60d32bcfc9ab87004dfb028dfbd6',
+  'src/flutter/third_party/harfbuzz':
+   Var('flutter_git') + '/third_party/harfbuzz' + '@' + 'ea8f97c615f0ba17dc25013ef67dbd6bfaaa76f2',
 
   'src/third_party/libcxx':
    Var('llvm_git') + '/llvm-project/libcxx' + '@' + '44079a4cc04cdeffb9cfe8067bfb3c276fb2bab0',
@@ -256,70 +305,78 @@ deps = {
   'src/third_party/libcxxabi':
    Var('llvm_git') + '/llvm-project/libcxxabi' + '@' + '2ce528fb5e0f92e57c97ec3ff53b75359d33af12',
 
-  'src/third_party/glfw':
-   Var('fuchsia_git') + '/third_party/glfw' + '@' + '78e6a0063d27ed44c2c4805606309744f6fb29fc',
-
-  'src/third_party/shaderc':
-   Var('github_git') + '/google/shaderc.git' + '@' + '7ea834ecc59258a5c13c3d3e6fa0582bdde7c543',
+  'src/flutter/third_party/glfw':
+   Var('flutter_git') + '/third_party/glfw' + '@' + 'dd8a678a66f1967372e5a5e3deac41ebf65ee127',
 
-  'src/third_party/vulkan-deps':
-   Var('chromium_git') + '/vulkan-deps' + '@' + 'afc444a0f49a09f67b3dc63ddcd14e2031466ffa',
+  'src/flutter/third_party/shaderc':
+   Var('chromium_git') + '/external/github.com/google/shaderc' + '@' + '37e25539ce199ecaf19fb7f7d27818716d36686d',
 
-  'src/third_party/flatbuffers':
-   Var('github_git') + '/google/flatbuffers.git' + '@' + '0a80646371179f8a7a5c1f42c31ee1d44dcf6709',
+  'src/flutter/third_party/vulkan-deps':
+   Var('chromium_git') + '/vulkan-deps' + '@' + '014f44e134a1de387791bffacc32ff9d8db71176',
 
-  'src/third_party/icu':
-   Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '1b7d391f0528fb3a4976b7541b387ee04f915f83',
+  'src/flutter/third_party/flatbuffers':
+   Var('chromium_git') + '/external/github.com/google/flatbuffers' + '@' + '0a80646371179f8a7a5c1f42c31ee1d44dcf6709',
 
-  'src/third_party/khronos':
-   Var('chromium_git') + '/chromium/src/third_party/khronos.git' + '@' + '676d544d2b8f48903b7da9fceffaa534a5613978',
+  'src/flutter/third_party/icu':
+   Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'a622de35ac311c5ad390a7af80724634e5dc61ed',
 
-   'src/third_party/gtest-parallel':
+   'src/flutter/third_party/gtest-parallel':
    Var('chromium_git') + '/external/github.com/google/gtest-parallel' + '@' + '38191e2733d7cbaeaef6a3f1a942ddeb38a2ad14',
 
-  'src/third_party/benchmark':
-   Var('github_git') + '/google/benchmark' + '@' + '431abd149fd76a072f821913c0340137cc755f36',
+  'src/flutter/third_party/benchmark':
+   Var('chromium_git') + '/external/github.com/google/benchmark' + '@' + '431abd149fd76a072f821913c0340137cc755f36',
 
-  'src/third_party/googletest':
-   Var('github_git') + '/google/googletest' + '@' + '054a986a8513149e8374fc669a5fe40117ca6b41',
+  'src/flutter/third_party/googletest':
+   Var('chromium_git') + '/external/github.com/google/googletest' + '@' + '7f036c5563af7d0329f20e8bb42effb04629f0c0',
 
-  'src/third_party/boringssl':
-   Var('github_git') + '/dart-lang/boringssl_gen.git' + '@' + Var('dart_boringssl_gen_rev'),
+  'src/flutter/third_party/boringssl':
+   Var('dart_git') + '/boringssl_gen.git' + '@' + Var('dart_boringssl_gen_rev'),
 
-  'src/third_party/yapf':
-  Var('github_git') + '/google/yapf' + '@' + '212c5b5ad8e172d2d914ae454c121c89cccbcb35',
+  'src/flutter/third_party/yapf':
+  Var('flutter_git') + '/third_party/yapf' + '@' + '212c5b5ad8e172d2d914ae454c121c89cccbcb35',
 
-  'src/third_party/boringssl/src':
+  'src/flutter/third_party/boringssl/src':
    'https://boringssl.googlesource.com/boringssl.git' + '@' + Var('dart_boringssl_rev'),
 
+  'src/flutter/third_party/perfetto':
+   Var('flutter_git') + "/third_party/perfetto" + '@' + Var('dart_perfetto_rev'),
+
+  'src/flutter/third_party/protobuf':
+   Var('flutter_git') + '/third_party/protobuf' + '@' + Var('dart_libprotobuf_rev'),
+
+  # TODO(67373): These are temporarily checked in, but this dep can be restored
+  # once the buildmoot is completed.
+  # 'src/flutter/build/secondary/third_party/protobuf':
+  #  Var('flutter_git') + '/third_party/protobuf-gn' + '@' + Var('dart_protobuf_gn_rev'),
+
   'src/third_party/dart':
    Var('dart_git') + '/sdk.git' + '@' + Var('dart_revision'),
 
   # WARNING: Unused Dart dependencies in the list below till "WARNING:" marker are removed automatically - see create_updated_flutter_deps.py.
 
   'src/third_party/dart/third_party/binaryen/src':
-   Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@ec53f4b2d5b0d52ae703c5b696ecf052ad5fffbb',
+   Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@9784f012848a7eb321c2037bdb363dfe0eab8bc9',
 
   'src/third_party/dart/third_party/devtools':
-   {'packages': [{'version': 'git_revision:dd3fade2bd2ef74fc6102e56333a48f0efc594d3', 'package': 'dart/third_party/flutter/devtools'}], 'dep_type': 'cipd'},
+   {'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:7421a2d5d67cbcdec92f1a2ac993b8b64b28d7ca'}]},
 
   'src/third_party/dart/third_party/pkg/args':
-   Var('dart_git') + '/args.git@da037acc018a8dd267d109eb634454490b7ff759',
+   Var('dart_git') + '/args.git@788d93541a578e49f066699e1584bc3ce591c376',
 
   'src/third_party/dart/third_party/pkg/async':
-   Var('dart_git') + '/async.git@c59c7c51cc2a1b1fc49a2d853d413bd3a92126e9',
+   Var('dart_git') + '/async.git@1556660ca5159d84bf28239825a25dca58f1fde3',
 
   'src/third_party/dart/third_party/pkg/bazel_worker':
-   Var('dart_git') + '/bazel_worker.git@9f21e1de12d1f7e7450e70b314c81631526c22d0',
+   Var('dart_git') + '/bazel_worker.git@8619b92baa9959e55b9fc49d2afcd6dda2ec1c10',
 
   'src/third_party/dart/third_party/pkg/boolean_selector':
-   Var('dart_git') + '/boolean_selector.git@5082b3debf97421c071be957063763d98412b2e2',
+   Var('dart_git') + '/boolean_selector.git@be88351e521648d381b96350bfe62c34abacee6d',
 
   'src/third_party/dart/third_party/pkg/browser_launcher':
    Var('dart_git') + '/browser_launcher.git' + '@' + Var('dart_browser_launcher_rev'),
 
   'src/third_party/dart/third_party/pkg/cli_util':
-   Var('dart_git') + '/cli_util.git@edcf1c357dfc92f760ea0f1bbdb94f9b72d26b71',
+   Var('dart_git') + '/cli_util.git@ffeb5d2869b44b28d1b9035b540d164af44f3f1c',
 
   'src/third_party/dart/third_party/pkg/clock':
    Var('dart_git') + '/clock.git' + '@' + Var('dart_clock_rev'),
@@ -328,76 +385,76 @@ deps = {
    Var('dart_git') + '/collection.git' + '@' + Var('dart_collection_rev'),
 
   'src/third_party/dart/third_party/pkg/convert':
-   Var('dart_git') + '/convert.git@4feeb10d2f26d22eab461469da0739a57d001edf',
+   Var('dart_git') + '/convert.git@d4d6368cffb8f4f25522875ef8e1d5f7d158bbad',
 
   'src/third_party/dart/third_party/pkg/crypto':
-   Var('dart_git') + '/crypto.git@bf0c33b42eb7e5991ee98429318884695e576c2b',
+   Var('dart_git') + '/crypto.git@69d13c9903d4134582ce1bbd9a31cfd8a510c22d',
 
   'src/third_party/dart/third_party/pkg/csslib':
-   Var('dart_git') + '/csslib.git@34203c09f073ed8267f5d6e333daddb02e6ff609',
+   Var('dart_git') + '/csslib.git@42165256befc3994db510695c17e718e617435c9',
 
   'src/third_party/dart/third_party/pkg/dart_style':
-   Var('dart_git') + '/dart_style.git@f79a9828ad07e50d6e8352ac154cc16eb4d78d5c',
+   Var('dart_git') + '/dart_style.git@a6ad7693555a9add6f98ad6fd94de80d35c89415',
 
   'src/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@dc502d0862fe1ba8451c9c57cd7ab70432634af3',
-
-  'src/third_party/dart/third_party/pkg/ffi':
-   Var('dart_git') + '/ffi.git@17a8142da8114a065e03200467c7657b5368a86d',
+   Var('dart_git') + '/dartdoc.git@79c1675956f74b4e3f44134879beeb230a84bcd1',
 
   'src/third_party/dart/third_party/pkg/file':
-   Var('dart_git') + '/external/github.com/google/file.dart@b768f79dcd104a5feabafab47101c4355b71cd8f',
+   Var('dart_git') + '/external/github.com/google/file.dart@3aa06490bf34bddf04c7ea964a50c177a4ca0de7',
 
   'src/third_party/dart/third_party/pkg/fixnum':
-   Var('dart_git') + '/fixnum.git@bca3816daf641397f7b5ab9cf865a6d10d30c625',
+   Var('dart_git') + '/fixnum.git@570b28adcfbfdd5b8a7230ea1d6ec0f9587493f1',
 
   'src/third_party/dart/third_party/pkg/glob':
-   Var('dart_git') + '/glob.git@7f97bf5be6bfe8c90a92283e4c590dba2a676083',
+   Var('dart_git') + '/glob.git@379d60c7cc5c0e9fe7d0d45549ad0b1ca51396c8',
 
   'src/third_party/dart/third_party/pkg/html':
-   Var('dart_git') + '/html.git@28fb8b97acf471bedcfa4eaf38899a0f65d5e30d',
+   Var('dart_git') + '/html.git@327e37a6a4dd46599737ee982f280d73a8f646f7',
 
   'src/third_party/dart/third_party/pkg/http':
-   Var('dart_git') + '/http.git@047d6ed015d397be169a7fb892d75141d9bfd58f',
+   Var('dart_git') + '/http.git@7949d6f4a60bb5e9158da52910aa6bacda6b9286',
 
   'src/third_party/dart/third_party/pkg/http_multi_server':
-   Var('dart_git') + '/http_multi_server.git@e31c6988e3869fb4019429254604066338f86095',
+   Var('dart_git') + '/http_multi_server.git@ba9d07f3596b24718ddf45c9e071d40879cca565',
 
   'src/third_party/dart/third_party/pkg/http_parser':
-   Var('dart_git') + '/http_parser.git@c73967535ce31120e218120f70ef98cc22688c82',
+   Var('dart_git') + '/http_parser.git@84db8b029d9b51859a0bb4966859af009f9442e3',
 
   'src/third_party/dart/third_party/pkg/intl':
-   Var('dart_git') + '/intl.git@a127902594a964f2090239fb454adadf7c1a77ef',
+   Var('dart_git') + '/intl.git@5d65e3808ce40e6282e40881492607df4e35669f',
 
   'src/third_party/dart/third_party/pkg/json_rpc_2':
-   Var('dart_git') + '/json_rpc_2.git@16fed53fbebd38edf170f58c1da1de2a325b2b98',
+   Var('dart_git') + '/json_rpc_2.git@639857be892050159f5164c749d7947694976a4a',
 
-  'src/third_party/dart/third_party/pkg/linter':
-   Var('dart_git') + '/linter.git@8bce8b8b06c22716219207eb9d52beb93932ea44',
+  'src/third_party/dart/third_party/pkg/leak_tracker':
+   Var('dart_git') + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c',
 
   'src/third_party/dart/third_party/pkg/logging':
-   Var('dart_git') + '/logging.git@f322480fb9d9e83e677c08db6d09067059f7ff74',
+   Var('dart_git') + '/logging.git@7a7bd5e31ddfe23e34d37ded82d6d0cd5706862c',
 
   'src/third_party/dart/third_party/pkg/markdown':
-   Var('dart_git') + '/markdown.git@ee3f4e976efcfed87c6ec78364bc2dd3c6e717b9',
+   Var('dart_git') + '/markdown.git@8d07abc6bce001b000097eca35c2f5e37538702a',
 
   'src/third_party/dart/third_party/pkg/matcher':
-   Var('dart_git') + '/matcher.git@15d4af21002ae9adee952110192a3face96307c7',
+   Var('dart_git') + '/matcher.git@d954c8d979579b4b46427b0ea1d9c721117c191e',
 
   'src/third_party/dart/third_party/pkg/mime':
-   Var('dart_git') + '/mime.git@c0c4c47a3d7bf696f1aa1959fb83d598baadb33c',
+   Var('dart_git') + '/mime.git@9a168712d6db610c3822617c132daea72d4fd2b5',
 
   'src/third_party/dart/third_party/pkg/mockito':
-   Var('dart_git') + '/mockito.git@347d3e4cc64752b2ff7b5d35fe5cd1b281b17413',
+   Var('dart_git') + '/mockito.git@3ef744f8749864f2a036eba60c4203cc8f638949',
+
+  'src/third_party/dart/third_party/pkg/native':
+   Var('dart_git') + '/native.git@71ada4b5c8001e6b8207ed40331d158e0912cd94',
 
   'src/third_party/dart/third_party/pkg/package_config':
-   Var('dart_git') + '/package_config.git@abb4aec904ab8c739b6dcec516d44f56d96c8115',
+   Var('dart_git') + '/package_config.git@3d90e6955ef19b7ce4f1b742a06a20ed4260700a',
 
   'src/third_party/dart/third_party/pkg/path':
-   Var('dart_git') + '/path.git@12ce876fdd8873128671acfec54c8ad88da361fa',
+   Var('dart_git') + '/path.git@a7b696071bd83d3ee0a0f1b57ac94d6b1f05cac4',
 
   'src/third_party/dart/third_party/pkg/pool':
-   Var('dart_git') + '/pool.git@1ea5b031cfda37786d305292cb8104dffb45d9ae',
+   Var('dart_git') + '/pool.git@c118f69d8a6441a8453bf7d455fd7c79d3ee1497',
 
   'src/third_party/dart/third_party/pkg/protobuf':
    Var('dart_git') + '/protobuf.git' + '@' + Var('dart_protobuf_rev'),
@@ -406,52 +463,61 @@ deps = {
    Var('dart_git') + '/pub.git' + '@' + Var('dart_pub_rev'),
 
   'src/third_party/dart/third_party/pkg/pub_semver':
-   Var('dart_git') + '/pub_semver.git@17231113f98c80285881cc4452863bcfd085d1a8',
+   Var('dart_git') + '/pub_semver.git@3175ba0a58a96fb23f8d68b5f5c44d1a5b30cc16',
 
   'src/third_party/dart/third_party/pkg/shelf':
-   Var('dart_git') + '/shelf.git@1c2104737973715426035c11ba840c7f23d8f186',
+   Var('dart_git') + '/shelf.git@1acbc673326e5b31280184744f2864a8f92c5b46',
 
   'src/third_party/dart/third_party/pkg/source_map_stack_trace':
-   Var('dart_git') + '/source_map_stack_trace.git@8d8078fcc81c8f7936805cd277198493e0b7fc62',
+   Var('dart_git') + '/source_map_stack_trace.git@c75649651d01826236e3ab7093d277a70756905a',
 
   'src/third_party/dart/third_party/pkg/source_maps':
-   Var('dart_git') + '/source_maps.git@b031e2cdbef5675ab9a92025202d323a5e7cc526',
+   Var('dart_git') + '/source_maps.git@55e92a4b0a8560d5b2b3bb7255249afdb8186ea6',
 
   'src/third_party/dart/third_party/pkg/source_span':
-   Var('dart_git') + '/source_span.git@d1d47e550b6f77ed9b4907339a8a5e430b9ca314',
+   Var('dart_git') + '/source_span.git@21a403a75b6887fbd811fb53b74b08c2cef67ab6',
 
   'src/third_party/dart/third_party/pkg/sse':
-   Var('dart_git') + '/sse.git@8d018dd606f1f8a957c51de16159d532ce664569',
+   Var('dart_git') + '/sse.git@b53ba14de4fe9823432ebfbb4ec04f23a620ec50',
 
   'src/third_party/dart/third_party/pkg/stack_trace':
-   Var('dart_git') + '/stack_trace.git@dce00134f6558086e8963e37d0b1ba0830862c01',
+   Var('dart_git') + '/stack_trace.git@155f12c51226d6372f6722f5e55c38ef39625006',
 
   'src/third_party/dart/third_party/pkg/stream_channel':
-   Var('dart_git') + '/stream_channel.git@914304769d036867b993bd7f9c111145f1ca4ab0',
+   Var('dart_git') + '/stream_channel.git@e02a5ddef804f0d546a405ab3917fb27788acaef',
 
   'src/third_party/dart/third_party/pkg/string_scanner':
-   Var('dart_git') + '/string_scanner.git@4a5cbc5c1127151ea507cc9da797b829857607e8',
+   Var('dart_git') + '/string_scanner.git@a2bcdb575f6bb30b944b4f632ea95d8dc4f914bd',
+
+  'src/third_party/dart/third_party/pkg/tar':
+   Var('dart_git') + '/external/github.com/simolus3/tar.git@6150a0c88d9bd17e3e961593a9a7a9564866e8b4',
 
   'src/third_party/dart/third_party/pkg/term_glyph':
-   Var('dart_git') + '/term_glyph.git@822cd5b3418615c6db715a796c2c9ba9acb63b0d',
+   Var('dart_git') + '/term_glyph.git@85a4aa6bf25cd6ecaa5c56a1b259b2d95264a439',
 
   'src/third_party/dart/third_party/pkg/test':
-   Var('dart_git') + '/test.git@b25dac9936c2ea9605b54a3418e0c956937da48f',
+   Var('dart_git') + '/test.git@6a4e75a6283b1366ea21067f9ced0b6c87745d4a',
 
   'src/third_party/dart/third_party/pkg/test_reflective_loader':
-   Var('dart_git') + '/test_reflective_loader.git@52b6753852661787208e003f9716b079026c7ac7',
+   Var('dart_git') + '/test_reflective_loader.git@9862703a3d14848376c8efde271c88022fba91eb',
+
+  'src/third_party/dart/third_party/pkg/tools':
+   Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'),
 
   'src/third_party/dart/third_party/pkg/typed_data':
-   Var('dart_git') + '/typed_data.git@1e838b8ec85699b5b99e793d004ae315e72fcbc0',
+   Var('dart_git') + '/typed_data.git@375efaa02a13dad0785cfbd9bdcb9f09aa8ef529',
 
   'src/third_party/dart/third_party/pkg/usage':
-   Var('dart_git') + '/usage.git@fee1d9d9c295362f6edebfeebb9f8187711c55ab',
+   Var('dart_git') + '/usage.git@67ecd7d1328347ec15cbf8d8a46918df75a66af8',
 
   'src/third_party/dart/third_party/pkg/watcher':
    Var('dart_git') + '/watcher.git' + '@' + Var('dart_watcher_rev'),
 
+  'src/third_party/dart/third_party/pkg/web':
+   Var('dart_git') + '/web.git' + '@' + Var('dart_web_rev'),
+
   'src/third_party/dart/third_party/pkg/web_socket_channel':
-   Var('dart_git') + '/web_socket_channel.git@1b0561cfec8ff7e9465896eb340ea3c382b59393',
+   Var('dart_git') + '/web_socket_channel.git@3db86bc0a09e1038a0fa418262c8a92211c5de69',
 
   'src/third_party/dart/third_party/pkg/webdev':
    Var('dart_git') + '/webdev.git' + '@' + Var('dart_webdev_rev'),
@@ -460,13 +526,13 @@ deps = {
    Var('dart_git') + '/external/github.com/google/webkit_inspection_protocol.dart.git' + '@' + Var('dart_webkit_inspection_protocol_rev'),
 
   'src/third_party/dart/third_party/pkg/yaml':
-   Var('dart_git') + '/yaml.git@f6992752da8883a4bd9b036063371dca552848cc',
+   Var('dart_git') + '/yaml.git@e5984433a2803d5c67ed0abac5891a55040381ee',
 
   'src/third_party/dart/third_party/pkg/yaml_edit':
    Var('dart_git') + '/yaml_edit.git' + '@' + Var('dart_yaml_edit_rev'),
 
-  'src/third_party/dart/tools/sdks':
-   {'packages': [{'version': 'version:2.19.0-374.0.dev', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'},
+  'src/third_party/dart/tools/sdks/dart-sdk':
+   {'dep_type': 'cipd', 'packages': [{'package': 'dart/dart-sdk/${{platform}}', 'version': 'version:3.4.0-247.0.dev'}]},
 
   # WARNING: end of dart dependencies list that is cleaned up automatically - see create_updated_flutter_deps.py.
 
@@ -532,124 +598,145 @@ deps = {
     'condition': 'host_os == "win" and download_dart_sdk and not release_candidate and host_cpu == "arm64"'
   },
 
-  'src/third_party/colorama/src':
-   Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8',
+  # esbuild download
+  'src/flutter/prebuilts/linux-x64/esbuild': {
+    'packages': [
+      {
+        'package': 'flutter/tools/esbuild/linux-amd64',
+        'version': Var('esbuild_version')
+      }
+    ],
+    'dep_type': 'cipd',
+    'condition': 'host_os == "linux" and download_esbuild'
+  },
+  'src/flutter/prebuilts/macos-x64/esbuild': {
+    'packages': [
+      {
+        'package': 'flutter/tools/esbuild/mac-amd64',
+        'version': Var('esbuild_version')
+      }
+    ],
+    'dep_type': 'cipd',
+    'condition': 'host_os == "mac" and download_esbuild'
+  },
+  'src/flutter/prebuilts/macos-arm64/esbuild': {
+    'packages': [
+      {
+        'package': 'flutter/tools/esbuild/mac-arm64',
+        'version': Var('esbuild_version')
+      }
+    ],
+    'dep_type': 'cipd',
+    'condition': 'host_os == "mac" and download_esbuild'
+  },
+  'src/flutter/prebuilts/windows-x64/esbuild': {
+    'packages': [
+      {
+        'package': 'flutter/tools/esbuild/windows-amd64',
+        'version': Var('esbuild_version')
+      }
+    ],
+    'dep_type': 'cipd',
+    'condition': 'host_os == "win" and download_esbuild'
+  },
 
-  'src/third_party/expat':
+  'src/flutter/third_party/expat':
    Var('chromium_git') + '/external/github.com/libexpat/libexpat.git' + '@' + '654d2de0da85662fcc7644a7acd7c2dd2cfb21f0',
 
-  'src/third_party/freetype2':
+  'src/flutter/third_party/freetype2':
    Var('flutter_git') + '/third_party/freetype2' + '@' + '3bea2761290a1cbe7d8f75c1c5a7ad727f826a66',
 
-  'src/third_party/root_certificates':
-   Var('dart_git') + '/root_certificates.git' + '@' + Var('dart_root_certificates_rev'),
-
-  'src/third_party/skia':
+  'src/flutter/third_party/skia':
    Var('skia_git') + '/skia.git' + '@' +  Var('skia_revision'),
 
-  'src/third_party/ocmock':
-   Var('ocmock_git') + '@' +  Var('ocmock_rev'),
+  'src/flutter/third_party/ocmock':
+   Var('flutter_git') + '/third_party/ocmock' + '@' +  Var('ocmock_rev'),
 
-  'src/third_party/libjpeg-turbo':
-   Var('fuchsia_git') + '/third_party/libjpeg-turbo' + '@' + '0fb821f3b2e570b2783a94ccd9a2fb1f4916ae9f',
+  'src/flutter/third_party/libjpeg-turbo/src':
+   Var('flutter_git') + '/third_party/libjpeg-turbo' + '@' + '0fb821f3b2e570b2783a94ccd9a2fb1f4916ae9f',
 
-  'src/third_party/libpng':
+  'src/flutter/third_party/libpng':
    Var('flutter_git') + '/third_party/libpng' + '@' + '9187b6e12756317f6d44fc669ac11dfc262bd192',
 
-  'src/third_party/libwebp':
-   Var('chromium_git') + '/webm/libwebp.git' + '@' + '7dfde712a477e420968732161539011e0fd446cf', # 1.2.0
+  'src/flutter/third_party/libwebp':
+   Var('chromium_git') + '/webm/libwebp.git' + '@' + 'ca332209cb5567c9b249c86788cb2dbf8847e760', # 1.3.2
 
-  'src/third_party/wuffs':
+  'src/flutter/third_party/wuffs':
    Var('skia_git') + '/external/github.com/google/wuffs-mirror-release-c.git' + '@' + '600cd96cf47788ee3a74b40a6028b035c9fd6a61',
 
-  'src/third_party/fontconfig/src':
-   Var('chromium_git') + '/external/fontconfig.git' + '@' + 'c336b8471877371f0190ba06f7547c54e2b890ba',
-
-  'src/third_party/fontconfig':
-   Var('flutter_git') + '/third_party/fontconfig' + '@' + '81c83d510ae3aa75589435ce32a5de05139aacb0',
-
-  'src/third_party/libxml':
-   Var('flutter_git') + '/third_party/libxml' + '@' + 'a143e452b5fc7d872813eeadc8db421694058098',
-
   'src/third_party/zlib':
-   Var('chromium_git') + '/chromium/src/third_party/zlib.git' + '@' + Var('dart_zlib_rev'),
+   Var('chromium_git') + '/chromium/src/third_party/zlib.git' + '@' + '14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f',
 
-  'src/third_party/inja':
+  'src/flutter/third_party/inja':
    Var('flutter_git') + '/third_party/inja' + '@' + '88bd6112575a80d004e551c98cf956f88ff4d445',
 
-  'src/third_party/libtess2':
+  'src/flutter/third_party/libtess2':
    Var('flutter_git') + '/third_party/libtess2' + '@' + '725e5e08ec8751477565f1d603fd7eb9058c277c',
 
-  'src/third_party/sqlite':
+  'src/flutter/third_party/sqlite':
    Var('flutter_git') + '/third_party/sqlite' + '@' + '0f61bd2023ba94423b4e4c8cfb1a23de1fe6a21c',
 
-  'src/third_party/pyyaml':
-   Var('fuchsia_git') + '/third_party/pyyaml.git' + '@' + '25e97546488eee166b1abb229a27856cecd8b7ac',
+  'src/flutter/third_party/pyyaml':
+   Var('flutter_git') + '/third_party/pyyaml.git' + '@' + '25e97546488eee166b1abb229a27856cecd8b7ac',
 
-   # Upstream Khronos Vulkan Headers are part of vulkan-deps
-   # Downstream Fuchsia Vulkan Headers (v1.2.198)
-  'src/third_party/fuchsia-vulkan':
-   Var('fuchsia_git') + '/third_party/Vulkan-Headers.git' + '@' + '32640ad82ef648768c706c9bf828b77123a09bc2',
+   'src/flutter/third_party/swiftshader':
+   Var('swiftshader_git') + '/SwiftShader.git' + '@' + '2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f',
 
-   'src/third_party/swiftshader':
-   Var('swiftshader_git') + '/SwiftShader.git' + '@' + 'bea8d2471bd912220ba59032e0738f3364632657',
+   'src/flutter/third_party/angle':
+   Var('chromium_git') + '/angle/angle.git' + '@' + '6a09e41ce6ea8c93524faae1a925eb01562f53b1',
 
-   'src/third_party/angle':
-   Var('chromium_git') + '/angle/angle.git' + '@' + '094b49db60cb48ee932a875898b57accbfa656de',
-
-   'src/third_party/vulkan_memory_allocator':
+   'src/flutter/third_party/vulkan_memory_allocator':
    Var('chromium_git') + '/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator' + '@' + '7de5cc00de50e71a3aab22dea52fbb7ff4efceb6',
 
-   'src/third_party/abseil-cpp':
-   Var('flutter_git') + '/third_party/abseil-cpp.git' + '@' + '61833f2c057a2b1993d871e8c51156aed1dd4354',
+   'src/flutter/third_party/abseil-cpp':
+   Var('flutter_git') + '/third_party/abseil-cpp.git' + '@' + 'ff6504dc527b25fef0f3c531e7dba0ed6b69c162',
 
    # Dart packages
-  'src/third_party/pkg/archive':
-  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
+  'src/flutter/third_party/pkg/archive':
+  Var('chromium_git') + '/external/github.com/brendan-duncan/archive.git' + '@' + '9de7a0544457c6aba755ccb65abb41b0dc1db70d', # 3.1.2
 
-  'src/third_party/pkg/file':
-  Var('dart_git') + '/external/github.com/google/file.dart.git' + '@' + 'b2e31cb6ef40b223701dbfa0b907fe58468484d7', # 6.1.4
+  'src/flutter/third_party/pkg/equatable':
+  Var('flutter_git') + '/third_party/equatable.git' + '@' + '2117551ff3054f8edb1a58f63ffe1832a8d25623', # 2.0.5
 
-  'src/third_party/pkg/flutter_packages':
-  Var('github_git') + '/flutter/packages.git' + '@' + '26990a2f75ab2028c3c77ffc869db11d6d866d18', # various
+  'src/flutter/third_party/pkg/flutter_packages':
+  Var('flutter_git') + '/mirrors/packages' + '@' + '25454e63851fe7933f04d025606e68c1eac4fe0f', # various
 
-  'src/third_party/pkg/gcloud':
-  Var('github_git') + '/dart-lang/gcloud.git' + '@' + 'a5276b85c4714378e84b1fb478b8feeeb686ac26', # 0.8.6-dev
+  'src/flutter/third_party/pkg/gcloud':
+  Var('flutter_git') + '/third_party/gcloud.git' + '@' + 'a5276b85c4714378e84b1fb478b8feeeb686ac26', # 0.8.6-dev
 
-  'src/third_party/pkg/googleapis':
-  Var('github_git') + '/google/googleapis.dart.git' + '@' + '07f01b7aa6985e4cafd0fd4b98724841bc9e85a1', # various
+  'src/flutter/third_party/pkg/googleapis':
+  Var('flutter_git') + '/third_party/googleapis.dart.git' + '@' + '526011f56d98eab183cc6075ee1392e8303e43e2', # various
 
-  'src/third_party/pkg/platform':
-  Var('github_git') + '/google/platform.dart.git' + '@' + '1ffad63428bbd1b3ecaa15926bacfb724023648c', # 3.1.0
+  'src/flutter/third_party/pkg/platform':
+  Var('dart_git') + '/platform.dart' + '@' + '1ffad63428bbd1b3ecaa15926bacfb724023648c', # 3.1.0
 
-  'src/third_party/pkg/process':
-  Var('github_git') + '/google/process.dart.git' + '@' + '0c9aeac86dcc4e3a6cf760b76fed507107e244d5', # 4.2.1
+  'src/flutter/third_party/pkg/process':
+  Var('dart_git') + '/process.dart' + '@' + '0c9aeac86dcc4e3a6cf760b76fed507107e244d5', # 4.2.1
 
-  'src/third_party/pkg/process_runner':
-  Var('github_git') + '/google/process_runner.git' + '@' + 'd632ea0bfd814d779fcc53a361ed33eaf3620a0b', # 4.0.1
+  'src/flutter/third_party/pkg/process_runner':
+  Var('flutter_git') + '/third_party/process_runner.git' + '@' + 'f24c69efdcaf109168f23d381fa281453d2bc9b1', # 4.1.2
 
-  'src/third_party/pkg/quiver':
-  Var('github_git') + '/google/quiver-dart.git' + '@' + '66f473cca1332496e34a783ba4527b04388fd561', # 2.1.5
-
-  'src/third_party/pkg/vector_math':
+  'src/flutter/third_party/pkg/vector_math':
   Var('dart_git') + '/external/github.com/google/vector_math.dart.git' + '@' + '0a5fd95449083d404df9768bc1b321b88a7d2eef', # 2.1.0
 
-  'src/third_party/imgui':
-  Var('github_git') + '/ocornut/imgui.git' + '@' + '29d462ebce0275345a6ce4621d8fff0ded57c9e5',
+  'src/flutter/third_party/imgui':
+  Var('flutter_git') + '/third_party/imgui.git' + '@' + '3ea0fad204e994d669f79ed29dcaf61cd5cb571d',
+
+  'src/flutter/third_party/tinygltf':
+  Var('flutter_git') + '/third_party/tinygltf.git' + '@' + '9bb5806df4055ac973b970ba5b3e27ce27d98148',
 
-  'src/third_party/tinygltf':
-  Var('github_git') + '/syoyo/tinygltf.git' + '@' + '9bb5806df4055ac973b970ba5b3e27ce27d98148',
+  'src/flutter/third_party/json':
+  Var('flutter_git') + '/third_party/json.git' + '@' + '17d9eacd248f58b73f4d1be518ef649fe2295642',
 
-  'src/third_party/json':
-  Var('github_git') + '/nlohmann/json.git' + '@' + '17d9eacd248f58b73f4d1be518ef649fe2295642',
+  'src/flutter/third_party/stb':
+  Var('flutter_git') + '/third_party/stb.git' + '@' + '5736b15f7ea0ffb08dd38af21067c314d6a3aae9',
 
   'src/third_party/gradle': {
     'packages': [
       {
-        'version': 'version:7.0.2',
+        # See tools/gradle/README.md for update instructions.
+        # Version here means the CIPD tag.
+        'version': 'version:8.3',
         'package': 'flutter/gradle'
       }
     ],
@@ -689,7 +776,7 @@ deps = {
      'packages': [
        {
         'package': 'flutter/android/sdk/all/${{platform}}',
-        'version': 'version:33v6'
+        'version': 'version:34v7'
        }
      ],
      'condition': 'download_android_deps',
@@ -700,7 +787,7 @@ deps = {
      'packages': [
        {
         'package': 'flutter/android/embedding_bundle',
-        'version': 'last_updated:2021-11-23T12:31:07-0800'
+        'version': 'last_updated:2023-08-11T11:35:44-0700'
        }
      ],
      'condition': 'download_android_deps',
@@ -721,7 +808,7 @@ deps = {
      'packages': [
        {
         'package': 'flutter/java/openjdk/${{platform}}',
-        'version': 'version:11'
+        'version': 'version:17'
        }
      ],
      'condition': 'download_android_deps',
@@ -741,20 +828,20 @@ deps = {
     'packages': [
       {
         'package': 'infra/3pp/tools/ninja/${{platform}}',
-        'version': 'version:2@1.8.2.chromium.3',
+        'version': 'version:2@1.11.1.chromium.4',
       }
     ],
     'dep_type': 'cipd',
   },
 
-  'src/buildtools/emsdk': {
-   'url': Var('skia_git') + '/external/github.com/emscripten-core/emsdk.git' + '@' + 'fc645b7626ebf86530dbd82fbece74d457e7ae07',
+  'src/flutter/prebuilts/emsdk': {
+   'url': Var('skia_git') + '/external/github.com/emscripten-core/emsdk.git' + '@' + 'a896e3d066448b3530dbcaa48869fafefd738f57',
    'condition': 'download_emsdk',
   },
 
   # Clang on mac and linux are expected to typically be the same revision.
   # They are separated out so that the autoroller can more easily manage them.
-  'src/buildtools/mac-x64/clang': {
+  'src/flutter/buildtools/mac-x64/clang': {
     'packages': [
       {
         'package': 'fuchsia/third_party/clang/mac-amd64',
@@ -765,7 +852,7 @@ deps = {
     'dep_type': 'cipd',
   },
 
-  'src/buildtools/mac-arm64/clang': {
+  'src/flutter/buildtools/mac-arm64/clang': {
     'packages': [
       {
         'package': 'fuchsia/third_party/clang/mac-arm64',
@@ -776,18 +863,18 @@ deps = {
     'dep_type': 'cipd',
   },
 
-  'src/buildtools/linux-x64/clang': {
+  'src/flutter/buildtools/linux-x64/clang': {
     'packages': [
       {
         'package': 'fuchsia/third_party/clang/linux-amd64',
         'version': Var('clang_version'),
       }
     ],
-    'condition': 'host_os == "linux" and host_cpu == "x64"',
+    'condition': 'host_os == "linux" or host_os == "mac"',
     'dep_type': 'cipd',
   },
 
-  'src/buildtools/linux-arm64/clang': {
+  'src/flutter/buildtools/linux-arm64/clang': {
     'packages': [
       {
         'package': 'fuchsia/third_party/clang/linux-arm64',
@@ -798,7 +885,7 @@ deps = {
     'dep_type': 'cipd',
   },
 
-  'src/buildtools/windows-x64/clang': {
+  'src/flutter/buildtools/windows-x64/clang': {
     'packages': [
       {
         'package': 'fuchsia/third_party/clang/windows-amd64',
@@ -809,33 +896,184 @@ deps = {
     'dep_type': 'cipd',
   },
 
-   # Get the SDK from https://chrome-infra-packages.appspot.com/p/fuchsia/sdk/core at the 'latest' tag
-   # Get the toolchain from https://chrome-infra-packages.appspot.com/p/fuchsia/clang at the 'goma' tag
+  # GOMA
+  'src/flutter/buildtools/mac-x64/goma': {
+    'packages': [
+      {
+        'package': 'fuchsia/third_party/goma/client/mac-amd64',
+        'version': Var('goma_version'),
+      }
+    ],
+    'condition': 'use_cipd_goma and host_os == "mac"',
+    'dep_type': 'cipd',
+  },
 
-   'src/fuchsia/sdk/mac': {
+  'src/flutter/buildtools/linux-x64/goma': {
+    'packages': [
+      {
+        'package': 'fuchsia/third_party/goma/client/linux-amd64',
+        'version': Var('goma_version'),
+      }
+    ],
+    'condition': 'use_cipd_goma and host_os == "linux"',
+    'dep_type': 'cipd',
+  },
+
+  'src/flutter/buildtools/windows-x64/goma': {
+    'packages': [
+      {
+        'package': 'fuchsia/third_party/goma/client/windows-amd64',
+        'version': Var('goma_version'),
+      }
+    ],
+    'condition': 'use_cipd_goma and download_windows_deps',
+    'dep_type': 'cipd',
+  },
+
+  # RBE binaries and configs.
+  'src/flutter/buildtools/linux-x64/reclient': {
+    'packages': [
+      {
+        'package': 'infra/rbe/client/${{platform}}',
+        'version': Var('reclient_version'),
+      }
+    ],
+    'condition': 'use_rbe and host_os == "linux" and host_cpu == "x64"',
+    'dep_type': 'cipd',
+  },
+
+  'src/flutter/buildtools/mac-arm64/reclient': {
+    'packages': [
+      {
+        'package': 'infra/rbe/client/${{platform}}',
+        'version': Var('reclient_version'),
+      }
+    ],
+    'condition': 'use_rbe and host_os == "mac" and host_cpu == "arm64"',
+    'dep_type': 'cipd',
+  },
+
+  'src/flutter/buildtools/mac-x64/reclient': {
+    'packages': [
+      {
+        'package': 'infra/rbe/client/${{platform}}',
+        'version': Var('reclient_version'),
+      }
+    ],
+    'condition': 'use_rbe and host_os == "mac" and host_cpu == "x64"',
+    'dep_type': 'cipd',
+  },
+
+  'src/flutter/buildtools/windows-x64/reclient': {
+    'packages': [
+      {
+        'package': 'infra/rbe/client/${{platform}}',
+        'version': Var('reclient_version'),
+      }
+    ],
+    'condition': 'use_rbe and download_windows_deps',
+    'dep_type': 'cipd',
+  },
+
+  'src/flutter/build/rbe': {
+    'packages': [
+      {
+        'package': 'flutter_internal/rbe/reclient_cfgs',
+        'version': 'ZuU_165luvP45DTYUP6WlEXb5EXyVxEuAm45ZB1c3zoC',
+      }
+    ],
+    'condition': 'use_rbe',
+    'dep_type': 'cipd',
+  },
+
+  # gcloud
+  'src/flutter/buildtools/linux-x64/gcloud': {
+    'packages': [
+      {
+        'package': 'infra/3pp/tools/gcloud/${{platform}}',
+        'version': Var('gcloud_version'),
+      }
+    ],
+    'condition': 'use_rbe and host_os == "linux" and host_cpu == "x64"',
+    'dep_type': 'cipd',
+  },
+
+  'src/flutter/buildtools/mac-arm64/gcloud': {
+    'packages': [
+      {
+        'package': 'infra/3pp/tools/gcloud/${{platform}}',
+        'version': Var('gcloud_version'),
+      }
+    ],
+    'condition': 'use_rbe and host_os == "mac" and host_cpu == "arm64"',
+    'dep_type': 'cipd',
+  },
+
+  # Get the SDK from https://chrome-infra-packages.appspot.com/p/fuchsia/sdk/core at the 'latest' tag
+  # Get the toolchain from https://chrome-infra-packages.appspot.com/p/fuchsia/clang at the 'goma' tag
+  'src/fuchsia/sdk/linux': {
      'packages': [
        {
-        'package': 'fuchsia/sdk/core/mac-amd64',
-        'version': 'hODX8Qi_7J5kwKp4SwpB-p81Ans71f3AUS-rmDlcx9UC'
+        'package': 'fuchsia/sdk/core/linux-amd64',
+        'version': 'uzI3wnbEGlZ_dtO0Zp5QFLl5WbvXoUiKu_gjI3PhSykC'
        }
      ],
-     'condition': 'host_os == "mac" and not download_fuchsia_sdk',
+     'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',
      'dep_type': 'cipd',
    },
-   'src/fuchsia/sdk/linux': {
+
+  'src/flutter/tools/fuchsia/test_scripts': {
      'packages': [
        {
-        'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'NlJGkMbtZqQ6_BCpu5Mif5-14birO7qsn-VP2ULJK8MC'
+        'package': 'chromium/fuchsia/test-scripts',
+        'version': Var('fuchsia_test_scripts_version'),
+       }
+     ],
+     'condition': 'download_fuchsia_deps',
+     'dep_type': 'cipd',
+   },
+
+  'src/flutter/tools/fuchsia/gn-sdk': {
+     'packages': [
+       {
+        'package': 'chromium/fuchsia/gn-sdk',
+        'version': Var('fuchsia_gn_sdk_version'),
        }
      ],
-     'condition': 'host_os == "linux" and not download_fuchsia_sdk',
+     'condition': 'download_fuchsia_deps',
      'dep_type': 'cipd',
    },
+
+  'src/third_party/impeller-cmake-example': {
+     'url': Var('flutter_git') + '/third_party/impeller-cmake-example.git' + '@' + 'c44e8093972c969acf171be72591e408a85fdc53',
+     'condition': 'download_impeller_cmake_example',
+  },
+
+  # cmake is only used by impeller-cmake-example.
+  'src/flutter/buildtools/mac-x64/cmake': {
+    'packages': [
+      {
+        'package': 'infra/3pp/tools/cmake/mac-amd64',
+        'version': 'CGpMvZoP962wdEINR9d4OEvEW7ZOv0MPrHNKbBUBS0sC',
+      }
+    ],
+    'condition': 'download_impeller_cmake_example and host_os == "mac"',
+    'dep_type': 'cipd',
+  },
+
+  'src/flutter/third_party/google_fonts_for_unit_tests': {
+      'packages': [
+        {
+          'package': 'flutter/flutter_font_fallbacks',
+          'version': '14d38cffa1a2c9d4380094957aa63aee811b613b0dc53fd909557f61f6a9068c'
+        }
+      ],
+      'dep_type': 'cipd',
+  }
 }
 
 recursedeps = [
-  'src/third_party/vulkan-deps',
+  'src/flutter/third_party/vulkan-deps',
 ]
 
 hooks = [
@@ -858,17 +1096,6 @@ hooks = [
     'pattern': '.',
     'action': ['python3', 'src/build/vs_toolchain.py', 'update'],
   },
-  {
-    # Ensure that we don't accidentally reference any .pyc files whose
-    # corresponding .py files have already been deleted.
-    'name': 'remove_stale_pyc_files',
-    'pattern': 'src/tools/.*\\.py',
-    'action': [
-        'python3',
-        'src/tools/remove_stale_pyc_files.py',
-        'src/tools',
-    ],
-  },
   {
     'name': 'dia_dll',
     'pattern': '.',
@@ -907,7 +1134,7 @@ hooks = [
   {
     'name': 'Download Fuchsia SDK',
     'pattern': '.',
-    'condition': 'download_fuchsia_sdk',
+    'condition': 'download_fuchsia_deps and download_fuchsia_sdk',
     'action': [
       'python3',
       'src/flutter/tools/download_fuchsia_sdk.py',
@@ -928,6 +1155,36 @@ hooks = [
       'src/flutter/tools/activate_emsdk.py',
     ]
   },
+  {
+    'name': 'Start compiler proxy',
+    'pattern': '.',
+    'condition': 'use_cipd_goma and host_os == "mac"',
+    'action': [
+      'python3',
+      'src/flutter/buildtools/mac-x64/goma/goma_ctl.py',
+      'ensure_start'
+    ]
+  },
+  {
+    'name': 'Start compiler proxy',
+    'pattern': '.',
+    'condition': 'use_cipd_goma and host_os == "linux"',
+    'action': [
+      'python3',
+      'src/flutter/buildtools/linux-x64/goma/goma_ctl.py',
+      'ensure_start'
+    ]
+  },
+  {
+    'name': 'Start compiler proxy',
+    'pattern': '.',
+    'condition': 'use_cipd_goma and download_windows_deps',
+    'action': [
+      'python3',
+      'src/flutter/buildtools/windows-x64/goma/goma_ctl.py',
+      'ensure_start'
+    ]
+  },
   {
     'name': 'Setup githooks',
     'pattern': '.',
@@ -937,6 +1194,68 @@ hooks = [
       'src/flutter/tools/githooks/setup.py',
     ]
   },
+  {
+    'name': 'impeller-cmake-example submodules',
+    'pattern': '.',
+    'condition': 'download_impeller_cmake_example',
+    'action': [
+      'python3',
+      'src/flutter/ci/impeller_cmake_build_test.py',
+      '--path',
+      'third_party/impeller-cmake-example',
+      '--setup',
+    ]
+  },
+  {
+    'name': 'Download Fuchsia system images',
+    'pattern': '.',
+    'condition': 'run_fuchsia_emu',
+    'action': [
+      'env',
+      'DOWNLOAD_FUCHSIA_SDK={download_fuchsia_sdk}',
+      'FUCHSIA_SDK_PATH={fuchsia_sdk_path}',
+      'python3',
+      'src/flutter/tools/fuchsia/with_envs.py',
+      'src/flutter/tools/fuchsia/test_scripts/update_product_bundles.py',
+      'terminal.x64,terminal.qemu-arm64',
+    ]
+  },
+  # The following two scripts check if they are running in the LUCI
+  # environment, and do nothing if so. This is because Xcode is not yet
+  # installed in CI when these hooks are run.
+  {
+    'name': 'Find the iOS device SDKs',
+    'pattern': '.',
+    'condition': 'host_os == "mac"',
+    'action': [
+      'python3',
+      'src/build/config/ios/ios_sdk.py',
+      # This cleans up entries under flutter/prebuilts for this script and the
+      # following script.
+      '--as-gclient-hook'
+    ]
+  },
+  {
+    'name': 'Find the macOS SDK',
+    'pattern': '.',
+    'condition': 'host_os == "mac"',
+    'action': [
+      'python3',
+      'src/build/mac/find_sdk.py',
+      '--as-gclient-hook',
+      Var('mac_sdk_min')
+    ]
+  },
+  {
+    'name': 'Generate Fuchsia GN build rules',
+    'pattern': '.',
+    'condition': 'download_fuchsia_deps',
+    'action': [
+      'python3',
+      'src/flutter/tools/fuchsia/with_envs.py',
+      'src/flutter/tools/fuchsia/test_scripts/gen_build_defs.py',
+    ],
+  },
   {
     # Generate the ohos compile environment
     'name': 'ohos_setup',
diff --git a/Doxyfile b/Doxyfile
index 0a8467d2e321c8b1702c1fc6d7014e09147f0557..e42725c465011f7f003073f5c4efd6049ca64321 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.15
+# Doxyfile 1.9.7
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -12,6 +12,16 @@
 # For lists, items can also be appended using:
 # TAG += value [value, ...]
 # Values that contain spaces should be placed between quotes (\" \").
+#
+# Note:
+#
+# Use doxygen to compare the used configuration file with the template
+# configuration file:
+# doxygen -x [configFile]
+# Use doxygen to compare the used configuration file with the template
+# configuration file without replacing the environment variables or CMake type
+# replacement variables:
+# doxygen -x_noenv [configFile]
 
 #---------------------------------------------------------------------------
 # Project related configuration options
@@ -60,16 +70,28 @@ PROJECT_LOGO           = ./docs/flutter_logo.png
 
 OUTPUT_DIRECTORY       = docs/doxygen
 
-# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
-# directories (in 2 levels) under the output directory of each output format and
-# will distribute the generated files over these directories. Enabling this
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096
+# sub-directories (in 2 levels) under the output directory of each output format
+# and will distribute the generated files over these directories. Enabling this
 # option can be useful when feeding doxygen a huge amount of source files, where
 # putting all generated files in the same directory would otherwise causes
-# performance problems for the file system.
+# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to
+# control the number of sub-directories.
 # The default value is: NO.
 
 CREATE_SUBDIRS         = NO
 
+# Controls the number of sub-directories that will be created when
+# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every
+# level increment doubles the number of directories, resulting in 4096
+# directories at level 8 which is the default and also the maximum value. The
+# sub-directories are organized in 2 levels, the first level always has a fixed
+# number of 16 directories.
+# Minimum value: 0, maximum value: 8, default value: 8.
+# This tag requires that the tag CREATE_SUBDIRS is set to YES.
+
+CREATE_SUBDIRS_LEVEL   = 8
+
 # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
 # characters to appear in the names of generated files. If set to NO, non-ASCII
 # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
@@ -81,26 +103,18 @@ ALLOW_UNICODE_NAMES    = NO
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all
 # documentation generated by doxygen is written. Doxygen will use this
 # information to generate all constant output in the proper language.
-# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
-# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
-# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
-# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
-# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
-# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
-# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
-# Ukrainian and Vietnamese.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian,
+# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English
+# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek,
+# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with
+# English messages), Korean, Korean-en (Korean with English messages), Latvian,
+# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese,
+# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish,
+# Swedish, Turkish, Ukrainian and Vietnamese.
 # The default value is: English.
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -197,6 +211,16 @@ SHORT_NAMES            = NO
 
 JAVADOC_AUTOBRIEF      = NO
 
+# If the JAVADOC_BANNER tag is set to YES then doxygen will interpret a line
+# such as
+# /***************
+# as being the beginning of a Javadoc-style comment "banner". If set to NO, the
+# Javadoc-style will behave just like regular comments and it will not be
+# interpreted by doxygen.
+# The default value is: NO.
+
+JAVADOC_BANNER         = NO
+
 # If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
 # line (until the first dot) of a Qt-style comment as the brief description. If
 # set to NO, the Qt-style will behave just like regular Qt-style comments (thus
@@ -217,6 +241,14 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -240,25 +272,19 @@ TAB_SIZE               = 4
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:\n"
+# "sideeffect=@par Side Effects:^^"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -299,19 +325,22 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # parses. With this tag you can assign which parser to use for a given
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
 # Note that for custom extensions you also need to set FILE_PATTERNS otherwise
-# the files are not read by doxygen.
+# the files are not read by doxygen. When specifying no_extension you should add
+# * to the FILE_PATTERNS.
+#
+# Note see also the list of default file extension mappings.
 
 EXTENSION_MAPPING      =
 
@@ -329,11 +358,22 @@ MARKDOWN_SUPPORT       = YES
 # to that level are automatically included in the table of contents, even if
 # they do not have an id attribute.
 # Note: This feature currently applies only to Markdown headings.
-# Minimum value: 0, maximum value: 99, default value: 0.
+# Minimum value: 0, maximum value: 99, default value: 5.
 # This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
 
 TOC_INCLUDE_HEADINGS   = 0
 
+# The MARKDOWN_ID_STYLE tag can be used to specify the algorithm used to
+# generate identifiers for the Markdown headings. Note: Every identifier is
+# unique.
+# Possible values are: DOXYGEN Use a fixed 'autotoc_md' string followed by a
+# sequence number starting at 0. and GITHUB Use the lower case version of title
+# with any whitespace replaced by '-' and punctations characters removed..
+# The default value is: DOXYGEN.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+MARKDOWN_ID_STYLE      = DOXYGEN
+
 # When enabled doxygen tries to link words that correspond to documented
 # classes, or namespaces to their corresponding documentation. Such a link can
 # be prevented in individual cases by putting a % sign in front of the word or
@@ -445,6 +485,27 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# than 0 to get more control over the balance between CPU load and processing
+# speed. At this moment only the input processing can be done using multiple
+# threads. Since this is still an experimental feature the default is set to 1,
+# which effectively disables parallel processing. Please report any issues you
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
+# If the TIMESTAMP tag is set different from NO then each generated page will
+# contain the date or date and time when the page was generated. Setting this to
+# NO can help when comparing the output of multiple runs.
+# Possible values are: YES, NO, DATETIME and DATE.
+# The default value is: NO.
+
+TIMESTAMP              = YES
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -465,6 +526,12 @@ EXTRACT_ALL            = YES
 
 EXTRACT_PRIVATE        = NO
 
+# If the EXTRACT_PRIV_VIRTUAL tag is set to YES, documented private virtual
+# methods of a class will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIV_VIRTUAL   = NO
+
 # If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
 # scope will be included in the documentation.
 # The default value is: NO.
@@ -502,6 +569,13 @@ EXTRACT_LOCAL_METHODS  = NO
 
 EXTRACT_ANON_NSPACES   = NO
 
+# If this flag is set to YES, the name of an unnamed parameter in a declaration
+# will be determined by the corresponding definition. By default unnamed
+# parameters remain unnamed in the output.
+# The default value is: YES.
+
+RESOLVE_UNNAMED_PARAMS = YES
+
 # If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
 # undocumented members inside documented classes or files. If set to NO these
 # members will be included in the various overviews, but no documentation
@@ -513,14 +587,15 @@ HIDE_UNDOC_MEMBERS     = NO
 # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
 # undocumented classes that are normally visible in the class hierarchy. If set
 # to NO, these classes will be included in the various overviews. This option
-# has no effect if EXTRACT_ALL is enabled.
+# will also hide undocumented C++ concepts if enabled. This option has no effect
+# if EXTRACT_ALL is enabled.
 # The default value is: NO.
 
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -539,12 +614,20 @@ HIDE_IN_BODY_DOCS      = NO
 
 INTERNAL_DOCS          = NO
 
-# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
-# names in lower-case letters. If set to YES, upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-# The default value is: system dependent.
+# With the correct setting of option CASE_SENSE_NAMES doxygen will better be
+# able to match the capabilities of the underlying filesystem. In case the
+# filesystem is case sensitive (i.e. it supports files in the same directory
+# whose names only differ in casing), the option must be set to YES to properly
+# deal with such files in case they appear in the input. For filesystems that
+# are not case sensitive the option should be set to NO to properly deal with
+# output files written for symbols that only differ in casing, such as for two
+# classes, one named CLASS and the other named Class, and to also support
+# references to files without having to specify the exact matching casing. On
+# Windows (including Cygwin) and MacOS, users should typically set this option
+# to NO, whereas on Linux or other Unix flavors it should typically be set to
+# YES.
+# Possible values are: SYSTEM, NO and YES.
+# The default value is: SYSTEM.
 
 CASE_SENSE_NAMES       = NO
 
@@ -562,6 +645,12 @@ HIDE_SCOPE_NAMES       = NO
 
 HIDE_COMPOUND_REFERENCE= NO
 
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
@@ -719,7 +808,8 @@ FILE_VERSION_FILTER    =
 # output files in an output format independent way. To create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
 #
 # Note that if you run doxygen from a directory containing a file called
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
@@ -765,24 +855,50 @@ WARNINGS               = YES
 WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
 
+# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about
+# undocumented enumeration values. If set to NO, doxygen will accept
+# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: NO.
+
+WARN_IF_UNDOC_ENUM_VAL = NO
+
 # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
-# a warning is encountered.
+# a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS
+# then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but
+# at the end of the doxygen process doxygen will return with a non-zero status.
+# If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS_PRINT then doxygen behaves
+# like FAIL_ON_WARNINGS but in case no WARN_LOGFILE is defined doxygen will not
+# write the warning messages in between other messages but write them at the end
+# of a run, in case a WARN_LOGFILE is defined the warning messages will be
+# besides being in the defined file also be shown at the end of a run, unless
+# the WARN_LOGFILE is defined as - i.e. standard output (stdout) in that case
+# the behavior will remain as with the setting FAIL_ON_WARNINGS.
+# Possible values are: NO, YES, FAIL_ON_WARNINGS and FAIL_ON_WARNINGS_PRINT.
 # The default value is: NO.
 
 WARN_AS_ERROR          = NO
@@ -793,13 +909,27 @@ WARN_AS_ERROR          = NO
 # and the warning text. Optionally the format may contain $version, which will
 # be replaced by the version of the file (if it could be obtained via
 # FILE_VERSION_FILTER)
+# See also: WARN_LINE_FORMAT
 # The default value is: $file:$line: $text.
 
 WARN_FORMAT            = "$file:$line: $text"
 
+# In the $text part of the WARN_FORMAT command it is possible that a reference
+# to a more specific place is given. To make it easier to jump to this place
+# (outside of doxygen) the user can define a custom "cut" / "paste" string.
+# Example:
+# WARN_LINE_FORMAT = "'vi $file +$line'"
+# See also: WARN_FORMAT
+# The default value is: at line $line of file $file.
+
+WARN_LINE_FORMAT       = "at line $line of file $file"
+
 # The WARN_LOGFILE tag can be used to specify a file to which warning and error
 # messages should be written. If left blank the output is written to standard
-# error (stderr).
+# error (stderr). In case the file specified cannot be opened for writing the
+# warning and error messages are written to standard error. When as file - is
+# specified the warning and error messages are written to standard output
+# (stdout).
 
 WARN_LOGFILE           =
 
@@ -815,17 +945,28 @@ WARN_LOGFILE           =
 
 INPUT                  = . \
                          ../third_party/skia/include \
-                         ../third_party/dart/runtime/include \
+                         ../third_party/dart/runtime/include
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
 # libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see: https://www.gnu.org/software/libiconv/) for the list of
-# possible encodings.
+# documentation (see:
+# https://www.gnu.org/software/libiconv/) for the list of possible encodings.
+# See also: INPUT_FILE_ENCODING
 # The default value is: UTF-8.
 
 INPUT_ENCODING         = UTF-8
 
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify
+# character encoding on a per file pattern basis. Doxygen will compare the file
+# name with each pattern and apply the encoding instead of the default
+# INPUT_ENCODING) if there is a match. The character encodings are a list of the
+# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding
+# "INPUT_ENCODING" for further information on supported encodings.
+
+INPUT_FILE_ENCODING    =
+
 # If the value of the INPUT tag contains directories, you can use the
 # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
 # *.h) to filter out the source-files in the directories.
@@ -834,13 +975,21 @@ INPUT_ENCODING         = UTF-8
 # need to set EXTENSION_MAPPING for the extension otherwise the files are not
 # read by doxygen.
 #
+# Note the list of default checked file patterns might differ from the list of
+# default file extension mappings.
+#
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
 
-FILE_PATTERNS          = *.h *.c *.cc *.m *.mm
+FILE_PATTERNS          = *.h \
+                         *.c \
+                         *.cc \
+                         *.m \
+                         *.mm
 
 # The RECURSIVE tag can be used to specify whether or not subdirectories should
 # be searched for input files as well.
@@ -877,10 +1026,7 @@ EXCLUDE_PATTERNS       =
 # (namespaces, classes, functions, etc.) that should be excluded from the
 # output. The symbol name can be a fully qualified name, a word, or if the
 # wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories use the pattern */test/*
+# ANamespace::AClass, ANamespace::*Test
 
 EXCLUDE_SYMBOLS        =
 
@@ -925,6 +1071,11 @@ IMAGE_PATH             =
 # code is scanned, but not when the output code is generated. If lines are added
 # or removed, the anchors will not be placed correctly.
 #
+# Note that doxygen will use the data processed and written to standard output
+# for further processing, therefore nothing else, like debug statements or used
+# commands (so in case of a Windows batch file always use @echo OFF), should be
+# written to standard output.
+#
 # Note that for custom extensions or not directly supported extensions you also
 # need to set EXTENSION_MAPPING for the extension otherwise the files are not
 # properly processed by doxygen.
@@ -966,6 +1117,15 @@ FILTER_SOURCE_PATTERNS =
 
 USE_MDFILE_AS_MAINPAGE = ./README.md
 
+# The Fortran standard specifies that for fixed formatted Fortran code all
+# characters from position 72 are to be considered as comment. A common
+# extension is to allow longer lines before the automatic comment starts. The
+# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can
+# be processed before the automatic comment starts.
+# Minimum value: 7, maximum value: 10000, default value: 72.
+
+FORTRAN_COMMENT_AFTER  = 72
+
 #---------------------------------------------------------------------------
 # Configuration options related to source browsing
 #---------------------------------------------------------------------------
@@ -1063,17 +1223,11 @@ VERBATIM_HEADERS       = YES
 
 ALPHABETICAL_INDEX     = YES
 
-# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
-# which the alphabetical index list will be split.
-# Minimum value: 1, maximum value: 20, default value: 5.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all classes will
-# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
-# can be used to specify a prefix (or a list of prefixes) that should be ignored
-# while generating the index headers.
+# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes)
+# that should be ignored while generating the index headers. The IGNORE_PREFIX
+# tag works for classes, function and member names. The entity will be placed in
+# the alphabetical list under the first letter of the entity name that remains
+# after removing the prefix.
 # This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
 
 IGNORE_PREFIX          =
@@ -1120,7 +1274,7 @@ HTML_FILE_EXTENSION    = .html
 # of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_HEADER            = ./docs/header.html
+HTML_HEADER            =
 
 # The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
 # generated HTML page. If the tag is left blank doxygen will generate a standard
@@ -1130,7 +1284,7 @@ HTML_HEADER            = ./docs/header.html
 # that doxygen normally uses.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_FOOTER            = ./docs/footer.html
+HTML_FOOTER            =
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
 # sheet that is used by each HTML page. It can be used to fine-tune the look of
@@ -1152,10 +1306,15 @@ HTML_STYLESHEET        =
 # Doxygen will copy the style sheet files to the output directory.
 # Note: The order of the extra style sheet files is of importance (e.g. the last
 # style sheet in the list overrules the setting of the previous ones in the
-# list). For an example see the documentation.
+# list).
+# Note: Since the styling of scrollbars can currently not be overruled in
+# Webkit/Chromium, the styling will be left out of the default doxygen.css if
+# one or more extra stylesheets have been specified. So if scrollbar
+# customization is desired it has to be added explicitly. For an example see the
+# documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_STYLESHEET  = ./docs/flutter-doxygen.css
+HTML_EXTRA_STYLESHEET  =
 
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note
@@ -1167,9 +1326,22 @@ HTML_EXTRA_STYLESHEET  = ./docs/flutter-doxygen.css
 
 HTML_EXTRA_FILES       =
 
+# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output
+# should be rendered with a dark or light theme.
+# Possible values are: LIGHT always generate light mode output, DARK always
+# generate dark mode output, AUTO_LIGHT automatically set the mode according to
+# the user preference, use light mode if no preference is set (the default),
+# AUTO_DARK automatically set the mode according to the user preference, use
+# dark mode if no preference is set and TOGGLE allow to user to switch between
+# light and dark mode via a button.
+# The default value is: AUTO_LIGHT.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE        = AUTO_LIGHT
+
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
+# this color. Hue is specified as an angle on a color-wheel, see
 # https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
@@ -1179,7 +1351,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 212
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1197,20 +1369,11 @@ HTML_COLORSTYLE_SAT    = 183
 
 HTML_COLORSTYLE_GAMMA  = 100
 
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting this
-# to YES can help to show when doxygen was last run and thus if the
-# documentation is up to date.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_TIMESTAMP         = YES
-
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
 # consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
 # like the Qt help browser.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1240,10 +1403,11 @@ HTML_INDEX_NUM_ENTRIES = 100
 
 # If the GENERATE_DOCSET tag is set to YES, additional index files will be
 # generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see: https://developer.apple.com/xcode/), introduced with OSX
-# 10.5 (Leopard). To create a documentation set, doxygen will generate a
-# Makefile in the HTML output directory. Running make will produce the docset in
-# that directory and running make install will install the docset in
+# environment (see:
+# https://developer.apple.com/xcode/), introduced with OSX 10.5 (Leopard). To
+# create a documentation set, doxygen will generate a Makefile in the HTML
+# output directory. Running make will produce the docset in that directory and
+# running make install will install the docset in
 # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
 # startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy
 # genXcode/_index.html for more information.
@@ -1260,6 +1424,13 @@ GENERATE_DOCSET        = YES
 
 DOCSET_FEEDNAME        = "Flutter Engine"
 
+# This tag determines the URL of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDURL         =
+
 # This tag specifies a string that should uniquely identify the documentation
 # set bundle. This should be a reverse domain-name style string, e.g.
 # com.mycompany.MyDocSet. Doxygen will append .docset to the name.
@@ -1285,8 +1456,12 @@ DOCSET_PUBLISHER_NAME  = Flutter
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see: https://www.microsoft.com/en-us/download/details.aspx?id=21138) on
-# Windows.
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1316,7 +1491,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1343,6 +1518,16 @@ BINARY_TOC             = NO
 
 TOC_EXPAND             = NO
 
+# The SITEMAP_URL tag is used to specify the full URL of the place where the
+# generated documentation will be placed on the server by the user during the
+# deployment of the documentation. The generated sitemap is called sitemap.xml
+# and placed on the directory specified by HTML_OUTPUT. In case no SITEMAP_URL
+# is specified no sitemap is generated. For information about the sitemap
+# protocol see https://www.sitemaps.org
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SITEMAP_URL            =
+
 # If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
 # QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
 # can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
@@ -1361,7 +1546,8 @@ QCH_FILE               =
 
 # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
 # Project output. For more information please see Qt Help Project / Namespace
-# (see: http://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace).
+# (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace).
 # The default value is: org.doxygen.Project.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
@@ -1369,8 +1555,8 @@ QHP_NAMESPACE          = io.flutter.engine
 
 # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
 # Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see: http://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-
-# folders).
+# Folders (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-folders).
 # The default value is: doc.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
@@ -1378,30 +1564,30 @@ QHP_VIRTUAL_FOLDER     = doc
 
 # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
 # filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-
-# filters).
+# Filters (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_CUST_FILTER_NAME   =
 
 # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
 # custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-
-# filters).
+# Filters (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_CUST_FILTER_ATTRS  =
 
 # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
 # project's filter section matches. Qt Help Project / Filter Attributes (see:
-# http://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes).
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_SECT_FILTER_ATTRS  =
 
-# The QHG_LOCATION tag can be used to specify the location of Qt's
-# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
-# generated .qhp file.
+# The QHG_LOCATION tag can be used to specify the location (absolute path
+# including file name) of Qt's qhelpgenerator. If non-empty doxygen will try to
+# run qhelpgenerator on the generated .qhp file.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHG_LOCATION           =
@@ -1444,16 +1630,28 @@ DISABLE_INDEX          = YES
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
 # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = YES
 
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATE_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
 #
@@ -1478,6 +1676,24 @@ TREEVIEW_WIDTH         = 250
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email
+# addresses.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+OBFUSCATE_EMAILS       = YES
+
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1487,19 +1703,14 @@ EXT_LINKS_IN_WINDOW    = NO
 
 FORMULA_FONTSIZE       = 10
 
-# Use the FORMULA_TRANSPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are not
-# supported properly for IE 6.0, but are supported on all modern browsers.
-#
-# Note that when changing this option you need to delete any form_*.png files in
-# the HTML output directory before the changes have effect.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
 
-FORMULA_TRANSPARENT    = YES
+FORMULA_MACROFILE      =
 
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1509,11 +1720,29 @@ FORMULA_TRANSPARENT    = YES
 
 USE_MATHJAX            = NO
 
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/latest/output.html) for more details.
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1526,22 +1755,29 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
 
 # The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
 # of code that will be used on startup of the MathJax code. See the MathJax site
-# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details. For an
 # example see the documentation.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1569,7 +1805,7 @@ MATHJAX_CODEFILE       =
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1588,7 +1824,8 @@ SERVER_BASED_SEARCH    = NO
 #
 # Doxygen ships with an example indexer (doxyindexer) and search engine
 # (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: https://xapian.org/).
+# Xapian (see:
+# https://xapian.org/).
 #
 # See the section "External Indexing and Searching" for details.
 # The default value is: NO.
@@ -1601,8 +1838,9 @@ EXTERNAL_SEARCH        = NO
 #
 # Doxygen ships with an example indexer (doxyindexer) and search engine
 # (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: https://xapian.org/). See the section "External Indexing and
-# Searching" for details.
+# Xapian (see:
+# https://xapian.org/). See the section "External Indexing and Searching" for
+# details.
 # This tag requires that the tag SEARCHENGINE is set to YES.
 
 SEARCHENGINE_URL       =
@@ -1711,29 +1949,31 @@ PAPER_TYPE             = a4
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
@@ -1766,18 +2006,26 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = YES
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 USE_PDFLATEX           = YES
 
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
-# command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
+# The LATEX_BATCHMODE tag ignals the behavior of LaTeX in case of an error.
+# Possible values are: NO same as ERROR_STOP, YES same as BATCH, BATCH In batch
+# mode nothing is printed on the terminal, errors are scrolled as if <return> is
+# hit at every error; missing files that TeX tries to input or request from
+# keyboard input (\read on a not open input stream) cause the job to abort,
+# NON_STOP In nonstop mode the diagnostic message will appear on the terminal,
+# but there is no possibility of user interaction just like in batch mode,
+# SCROLL In scroll mode, TeX will stop only for missing files to input or if
+# keyboard input is necessary and ERROR_STOP In errorstop mode, TeX will stop at
+# each error, asking for user intervention.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1790,16 +2038,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -1808,14 +2046,6 @@ LATEX_SOURCE_CODE      = NO
 
 LATEX_BIB_STYLE        = plain
 
-# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
-# page will contain the date and time when the page was generated. Setting this
-# to NO can help when comparing the output of multiple runs.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_TIMESTAMP        = NO
-
 # The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute)
 # path from which the emoji images will be read. If a relative path is entered,
 # it will be relative to the LATEX_OUTPUT directory. If left blank the
@@ -1880,16 +2110,6 @@ RTF_STYLESHEET_FILE    =
 
 RTF_EXTENSIONS_FILE    =
 
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -1986,21 +2206,12 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
 
 # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
-# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures
+# AutoGen Definitions (see https://autogen.sourceforge.net/) file that captures
 # the structure of the code including all documentation. Note that this feature
 # is still experimental and incomplete at the moment.
 # The default value is: NO.
@@ -2081,7 +2292,8 @@ SEARCH_INCLUDES        = YES
 
 # The INCLUDE_PATH tag can be used to specify one or more directories that
 # contain include files that are not input files but should be processed by the
-# preprocessor.
+# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of
+# RECURSIVE has no effect here.
 # This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
 INCLUDE_PATH           =
@@ -2169,41 +2381,10 @@ EXTERNAL_GROUPS        = YES
 
 EXTERNAL_PAGES         = YES
 
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of 'which perl').
-# The default file (with absolute path) is: /usr/bin/perl.
-
-PERL_PATH              = /usr/bin/perl
-
 #---------------------------------------------------------------------------
-# Configuration options related to the dot tool
+# Configuration options related to diagram generator tools
 #---------------------------------------------------------------------------
 
-# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
-# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
-# NO turns the diagrams off. Note that this option also works with HAVE_DOT
-# disabled, but it is recommended to install and use dot, since it yields more
-# powerful graphs.
-# The default value is: YES.
-
-CLASS_DIAGRAMS         = YES
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see:
-# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH            =
-
-# You can include diagrams made with dia in doxygen documentation. Doxygen will
-# then run dia to produce the diagram and insert it in the documentation. The
-# DIA_PATH tag allows you to specify the directory where the dia binary resides.
-# If left empty dia is assumed to be found in the default search path.
-
-DIA_PATH               =
-
 # If set to YES the inheritance and collaboration graphs will hide inheritance
 # and usage relations if the target is undocumented or is not a class.
 # The default value is: YES.
@@ -2212,7 +2393,7 @@ HIDE_UNDOC_RELATIONS   = YES
 
 # If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
 # available from the path. This tool is part of Graphviz (see:
-# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# https://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
 # Bell Labs. The other options in this section have no effect if this option is
 # set to NO
 # The default value is: NO.
@@ -2229,35 +2410,52 @@ HAVE_DOT               = NO
 
 DOT_NUM_THREADS        = 0
 
-# When you want a differently looking font in the dot files that doxygen
-# generates you can specify the font name using DOT_FONTNAME. You need to make
-# sure dot is able to find the font, which can be done by putting it in a
-# standard location or by setting the DOTFONTPATH environment variable or by
-# setting DOT_FONTPATH to the directory containing the font.
-# The default value is: Helvetica.
+# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of
+# subgraphs. When you want a differently looking font in the dot files that
+# doxygen generates you can specify fontname, fontcolor and fontsize attributes.
+# For details please see <a href=https://graphviz.org/doc/info/attrs.html>Node,
+# Edge and Graph Attributes specification</a> You need to make sure dot is able
+# to find the font, which can be done by putting it in a standard location or by
+# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
+# directory containing the font. Default graphviz fontsize is 14.
+# The default value is: fontname=Helvetica,fontsize=10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_COMMON_ATTR        = "fontname=Helvetica,fontsize=10"
+
+# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can
+# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. <a
+# href=https://graphviz.org/doc/info/arrows.html>Complete documentation about
+# arrows shapes.</a>
+# The default value is: labelfontname=Helvetica,labelfontsize=10.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_FONTNAME           = Helvetica
+DOT_EDGE_ATTR          = "labelfontname=Helvetica,labelfontsize=10"
 
-# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
-# dot graphs.
-# Minimum value: 4, maximum value: 24, default value: 10.
+# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes
+# around nodes set 'shape=plain' or 'shape=plaintext' <a
+# href=https://www.graphviz.org/doc/info/shapes.html>Shapes specification</a>
+# The default value is: shape=box,height=0.2,width=0.4.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_FONTSIZE           = 10
+DOT_NODE_ATTR          = "shape=box,height=0.2,width=0.4"
 
-# By default doxygen will tell dot to use the default font as specified with
-# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
-# the path where dot can find it using this tag.
+# You can set the path where dot can find font specified with fontname in
+# DOT_COMMON_ATTR and others dot attributes.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_FONTPATH           =
 
-# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
-# each documented class showing the direct and indirect inheritance relations.
-# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# If the CLASS_GRAPH tag is set to YES or GRAPH or BUILTIN then doxygen will
+# generate a graph for each documented class showing the direct and indirect
+# inheritance relations. In case the CLASS_GRAPH tag is set to YES or GRAPH and
+# HAVE_DOT is enabled as well, then dot will be used to draw the graph. In case
+# the CLASS_GRAPH tag is set to YES and HAVE_DOT is disabled or if the
+# CLASS_GRAPH tag is set to BUILTIN, then the built-in generator will be used.
+# If the CLASS_GRAPH tag is set to TEXT the direct and indirect inheritance
+# relations will be shown as texts / links.
+# Possible values are: NO, YES, TEXT, GRAPH and BUILTIN.
 # The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
 
 CLASS_GRAPH            = YES
 
@@ -2271,7 +2469,8 @@ CLASS_GRAPH            = YES
 COLLABORATION_GRAPH    = YES
 
 # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
-# groups, showing the direct groups dependencies.
+# groups, showing the direct groups dependencies. See also the chapter Grouping
+# in the manual.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
@@ -2294,10 +2493,32 @@ UML_LOOK               = NO
 # but if the number exceeds 15, the total amount of fields shown is limited to
 # 10.
 # Minimum value: 0, maximum value: 100, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
+# This tag requires that the tag UML_LOOK is set to YES.
 
 UML_LIMIT_NUM_FIELDS   = 10
 
+# If the DOT_UML_DETAILS tag is set to NO, doxygen will show attributes and
+# methods without types and arguments in the UML graphs. If the DOT_UML_DETAILS
+# tag is set to YES, doxygen will add type and arguments for attributes and
+# methods in the UML graphs. If the DOT_UML_DETAILS tag is set to NONE, doxygen
+# will not generate fields with class member information in the UML graphs. The
+# class diagrams will look similar to the default class diagrams but using UML
+# notation for the relationships.
+# Possible values are: NO, YES and NONE.
+# The default value is: NO.
+# This tag requires that the tag UML_LOOK is set to YES.
+
+DOT_UML_DETAILS        = NO
+
+# The DOT_WRAP_THRESHOLD tag can be used to set the maximum number of characters
+# to display on a single line. If the actual line length exceeds this threshold
+# significantly it will wrapped across multiple lines. Some heuristics are apply
+# to avoid ugly line breaks.
+# Minimum value: 0, maximum value: 1000, default value: 17.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_WRAP_THRESHOLD     = 17
+
 # If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
 # collaboration graphs will show the relations between templates and their
 # instances.
@@ -2364,10 +2585,17 @@ GRAPHICAL_HIERARCHY    = YES
 
 DIRECTORY_GRAPH        = YES
 
+# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels
+# of child directories generated in directory dependency graphs by dot.
+# Minimum value: 1, maximum value: 25, default value: 1.
+# This tag requires that the tag DIRECTORY_GRAPH is set to YES.
+
+DIR_GRAPH_MAX_DEPTH    = 1
+
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
 # generated by dot. For an explanation of the image formats see the section
 # output formats in the documentation of the dot tool (Graphviz (see:
-# http://www.graphviz.org/)).
+# https://www.graphviz.org/)).
 # Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
 # to make the SVG files visible in IE 9+ (other browsers do not have this
 # requirement).
@@ -2404,11 +2632,12 @@ DOT_PATH               =
 
 DOTFILE_DIRS           =
 
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the \mscfile
-# command).
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
 
-MSCFILE_DIRS           =
+DIA_PATH               =
 
 # The DIAFILE_DIRS tag can be used to specify one or more directories that
 # contain dia files that are included in the documentation (see the \diafile
@@ -2417,10 +2646,10 @@ MSCFILE_DIRS           =
 DIAFILE_DIRS           =
 
 # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
-# path where java can find the plantuml.jar file. If left blank, it is assumed
-# PlantUML is not used or called during a preprocessing step. Doxygen will
-# generate a warning when it encounters a \startuml command in this case and
-# will not generate output for the diagram.
+# path where java can find the plantuml.jar file or to the filename of jar file
+# to be used. If left blank, it is assumed PlantUML is not used or called during
+# a preprocessing step. Doxygen will generate a warning when it encounters a
+# \startuml command in this case and will not generate output for the diagram.
 
 PLANTUML_JAR_PATH      =
 
@@ -2458,18 +2687,6 @@ DOT_GRAPH_MAX_NODES    = 50
 
 MAX_DOT_GRAPH_DEPTH    = 0
 
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not seem
-# to support this out of the box.
-#
-# Warning: Depending on the platform used, enabling this option may lead to
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
-# read).
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_TRANSPARENT        = NO
-
 # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
 # files in one run (i.e. multiple -o and -T options on the command line). This
 # makes dot run faster, but since only newer versions of dot (>1.8.10) support
@@ -2482,14 +2699,34 @@ DOT_MULTI_TARGETS      = NO
 # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
 # explaining the meaning of the various boxes and arrows in the dot generated
 # graphs.
+# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal
+# graphical representation for inheritance and collaboration diagrams is used.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
 GENERATE_LEGEND        = YES
 
-# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
+#
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
 # The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_CLEANUP            = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. If the MSCGEN_TOOL tag is left empty (the default), then doxygen will
+# use a built-in version of mscgen tool to produce the charts. Alternatively,
+# the MSCGEN_TOOL tag can also specify the name an external tool. For instance,
+# specifying prog as the value, doxygen will call the tool as prog -T
+# <outfile_format> -o <outputfile> <inputfile>. The external tool should support
+# output file formats "png", "eps", "svg", and "ismap".
+
+MSCGEN_TOOL            =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           =
diff --git a/OAT.xml b/OAT.xml
index d1c59fbe8b2e35818aaa218487c0109c32300fcf..37b7254e6c3b9bbdbaadf7ccb15d72b65b55142e 100644
--- a/OAT.xml
+++ b/OAT.xml
@@ -96,6 +96,7 @@ used to filter file path.
                 <filteritem type="filename"
                     name="*.png|*.ico|*.jpg|*.ttf|*.enc|*.mp4|*.ttc|*.key|*.heic|*.res|*.gif|*.otf|*.compiled|*.webp"
                     desc="app resource files" />
+                <filteritem type="filename" name="*.tgz" desc="hvigor dependencies" />
                 <filteritem type="filepath" name="third_party/ninja/ninja_linux" desc="二进制，构建文件" />
                 <filteritem type="filepath" name="third_party/ninja/ninja_mac" desc="二进制，构建文件" />
                 <filteritem type="filepath" name="attachment/repos/.*" desc="git apply所需patch" />
diff --git a/README.en.md b/README.en.md
index 571606e841ab216d0059f77bddcd84949b22a9d6..1dc64acd90acfd579fc294b98de7151692ea1b9a 100644
--- a/README.en.md
+++ b/README.en.md
@@ -55,11 +55,10 @@ This warehouse is based on the extension of Flutter's official engine warehouse
 4. Download sdk: From [HarmonyOS Kit List]（ https://developer.harmonyos.com/deveco-developer-suite/enabling/kit?currentPage=1&pageSize=100 ）Download supporting development tools, currently not supporting packages downloaded from other channels
 
 ```sh
-#HarmonyOS SDK, extract the directory after sdk/xxSDK.zip from the development kit package
-export HOS_SDK_HOME=/home/<user>/ohos/sdk
-
-#Unzip the bin subdirectory after commandline/commandline tools xxxx.zip in the development kit package
-export PATH=$PATH:/home/<user>/ohos/command-line-tools/bin
+# Unzip file commandline/commandline_tools_xxxx.zip
+export HOS_SDK_HOME=/home/<user>/ohos/command-line-tools/sdk
+export PATH=/home/<user>/ohos/command-line-tools/bin:$PATH
+export PATH=/home/<user>/ohos/command-line-tools/tool/node/bin:$PATH
 ```
 
 5. Start building: In the engine directory, execute `./ohos` to start building the flutter engine that supports ohos devices.
@@ -96,13 +95,15 @@ export PATH=$PATH:/home/<user>/ohos/command-line-tools/bin
      nodejs.dir=<nodejs sdk directory>
      ```
 
-2. You need to copy the file `libflutter.so` to `shell/platform/ohos/flutter_embedding/libs/arm64-v8a/` 
+2. You need to copy file to `shell/platform/ohos/flutter_embedding/flutter/libs/arm64-v8a/` 
+   1. debug/release，copy `libflutter.so`
+   2. profile，copy `libflutter.so` and `libvmservice_snapshot.so`
 
 3. In the shell/platform/ohos/flutter_embedding directory, execute
 
      ```
      # The optional values for buildMode are: debug release profile
-     ./hvigorw --mode module -p module=flutter@default -p product=default -p buildMode=debug assembleHar --no-daemon
+     hvigorw --mode module -p module=flutter@default -p product=default -p buildMode=debug assembleHar --no-daemon
      ```
 
 
diff --git a/README.md b/README.md
index 909189f0d1aa75f3f2e2935d685db427a13235f1..be80d033fd9ffa0405ea1a3aa617856363d348a0 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,4 @@
-Flutter Engine
-==============
+# Flutter Engine
 
 原始仓来源：https://github.com/flutter/engine
 
@@ -56,11 +55,10 @@ Flutter Engine
 4. 下载sdk： 从[鸿蒙套件列表](https://developer.harmonyos.com/deveco-developer-suite/enabling/kit?currentPage=1&pageSize=100)下载配套开发工具，暂不支持非该渠道下载的套件
 
 ```sh
-# HarmonyOS SDK，解压开发套件包中 sdk/xxSDK.zip 之后的目录
-export HOS_SDK_HOME=/home/<user>/ohos/sdk
-
-# 解压开发套件包中 commandline/commandline-tools-xxxx.zip 之后 bin 子目录
-export PATH=$PATH:/home/<user>/ohos/command-line-tools/bin
+# 解压文件 commandline/commandline-tools-xxxx.zip
+export HOS_SDK_HOME=/home/<user>/ohos/command-line-tools/sdk
+export PATH=/home/<user>/ohos/command-line-tools/bin:$PATH
+export PATH=/home/<user>/ohos/command-line-tools/tool/node/bin:$PATH
 ```
 
 5. 开始构建：在engine目录，执行`./ohos`，即可开始构建支持ohos设备的flutter engine。
@@ -100,15 +98,19 @@ export PATH=$PATH:/home/<user>/ohos/command-line-tools/bin
     nodejs.dir=<nodejs的sdk目录>
     ```
 
-2. 你需要复制文件 `libflutter.so` 到 `shell/platform/ohos/flutter_embedding/libs/arm64-v8a/`
+2. 你需要复制文件到 `shell/platform/ohos/flutter_embedding/flutter/libs/arm64-v8a/`
+   1. debug/release，复制 `libflutter.so`
+   2. profile，复制 `libflutter.so` 和 `libvmservice_snapshot.so`
 
 3. 在shell/platform/ohos/flutter_embedding目录下，执行 
 
     ```
     # buildMode可选值为: debug release profile
-    ./hvigorw --mode module -p module=flutter@default -p product=default -p buildMode=debug assembleHar --no-daemon
+    hvigorw --mode module -p module=flutter@default -p product=default -p buildMode=debug assembleHar --no-daemon
     ```
 
-4. har文件输出路径为：shell/platform/ohos/flutter_embedding/flutter/build/default/outputs/default/flutter.har
+4. har文件输出路径为：`shell/platform/ohos/flutter_embedding/flutter/build/default/outputs/default/flutter.har`
+
+5. 获得 har 文件后，按 `flutter.har.BUILD_TYPE.API` 格式重命名文件，如 `flutter.har.debug.11`；替换 `flutter_flutter/packages/flutter_tools/templates/app_shared/ohos.tmpl/har/har_product.tmpl/` 目录下对应文件，重新运行项目工程即可生效。
 
 ps:如果你使用的是DevEco Studio的Beta版本，编译工程时遇到“must have required property 'compatibleSdkVersion', location: build-profile.json5:17:11"错误，请参考《DevEco Studio环境配置指导.docx》中的‘6 创建工程和运行Hello World’【配置插件】章节修改 shell/platform/ohos/flutter_embedding/hvigor/hvigor-config.json5文件。
diff --git a/analysis_options.yaml b/analysis_options.yaml
index de29de16689b880f7f69877352bbaa698d892cd1..d7c1e8b4dd9d50b26e67874e85625bbfbc9f7940 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,19 +1,20 @@
 # Specify analysis options.
 #
 # This file is a copy of analysis_options.yaml from flutter repo
-# as of 2022-07-27, but with some modifications marked with
+# as of 2023-12-18, but with some modifications marked with
 # "DIFFERENT FROM FLUTTER/FLUTTER" below.
 
 analyzer:
   language:
     strict-casts: true
+    strict-inference: true
     strict-raw-types: true
   errors:
-    # allow self-reference to deprecated members (we do this because otherwise we have
-    # to annotate every member in every test, assert, etc, when we deprecate something)
+    # allow deprecated members (we do this because otherwise we have to annotate
+    # every member in every test, assert, etc, when we or the Dart SDK deprecates
+    # something (https://github.com/flutter/flutter/issues/143312)
+    deprecated_member_use: ignore
     deprecated_member_use_from_same_package: ignore
-    # Turned off until null-safe rollout is complete.
-    unnecessary_null_comparison: ignore
   exclude: # DIFFERENT FROM FLUTTER/FLUTTER
     # Fixture depends on dart:ui and raises false positives.
     - flutter_frontend_server/test/fixtures/lib/main.dart
@@ -21,11 +22,10 @@ analyzer:
 linter:
   rules:
     # This list is derived from the list of all available lints located at
-    # https://github.com/dart-lang/linter/blob/master/example/all.yaml
+    # https://github.com/dart-lang/linter/blob/main/example/all.yaml
     - always_declare_return_types
     - always_put_control_body_on_new_line
     # - always_put_required_named_parameters_first # we prefer having parameters in the same order as fields https://github.com/flutter/flutter/issues/10219
-    - always_require_non_null_named_parameters
     - always_specify_types
     # - always_use_package_imports # we do this commonly
     - annotate_overrides
@@ -33,7 +33,7 @@ linter:
     - avoid_bool_literals_in_conditional_expressions
     # - avoid_catches_without_on_clauses # blocked on https://github.com/dart-lang/linter/issues/3023
     # - avoid_catching_errors # blocked on https://github.com/dart-lang/linter/issues/3023
-    - avoid_classes_with_only_static_members
+    # - avoid_classes_with_only_static_members # we do this commonly for `abstract final class`es
     - avoid_double_and_int_checks
     - avoid_dynamic_calls
     - avoid_empty_else
@@ -42,7 +42,7 @@ linter:
     - avoid_field_initializers_in_const_classes
     # - avoid_final_parameters # incompatible with prefer_final_parameters
     - avoid_function_literals_in_foreach_calls
-    - avoid_implementing_value_types
+    # - avoid_implementing_value_types # see https://github.com/dart-lang/linter/issues/4558
     - avoid_init_to_null
     - avoid_js_rounded_ints
     # - avoid_multiple_declarations_per_line # seems to be a stylistic choice we don't subscribe to
@@ -54,8 +54,6 @@ linter:
     - avoid_relative_lib_imports
     - avoid_renaming_method_parameters
     - avoid_return_types_on_setters
-    - avoid_returning_null
-    - avoid_returning_null_for_future
     - avoid_returning_null_for_void
     # - avoid_returning_this # there are enough valid reasons to return `this` that this lint ends up with too many false positives
     - avoid_setters_without_getters
@@ -76,17 +74,20 @@ linter:
     # - cascade_invocations # doesn't match the typical style of this repo
     - cast_nullable_to_non_nullable
     # - close_sinks # not reliable enough
+    - collection_methods_unrelated_type
     - combinators_ordering
     # - comment_references # blocked on https://github.com/dart-lang/linter/issues/1142
     - conditional_uri_does_not_exist
     # - constant_identifier_names # needs an opt-out https://github.com/dart-lang/linter/issues/204
     - control_flow_in_finally
     - curly_braces_in_flow_control_structures
+    - dangling_library_doc_comments
     - depend_on_referenced_packages
     - deprecated_consistency
+    # - deprecated_member_use_from_same_package # we allow self-references to deprecated members
     # - diagnostic_describe_all_properties # enabled only at the framework level (packages/flutter/lib)
     - directives_ordering
-    # - discarded_futures # not yet tested
+    # - discarded_futures # too many false positives, similar to unawaited_futures
     # - do_not_use_environment # there are appropriate times to use the environment, especially in our tests and build logic
     - empty_catches
     - empty_constructor_bodies
@@ -97,23 +98,29 @@ linter:
     - flutter_style_todos
     - hash_and_equals
     - implementation_imports
-    - iterable_contains_unrelated_type
+    - implicit_call_tearoffs
+    - implicit_reopen
+    - invalid_case_patterns
     # - join_return_with_assignment # not required by flutter style
     - leading_newlines_in_multiline_strings
+    - library_annotations
     - library_names
     - library_prefixes
     - library_private_types_in_public_api
     # - lines_longer_than_80_chars # not required by flutter style
-    - list_remove_unrelated_type
-    # - literal_only_boolean_expressions # too many false positives: https://github.com/dart-lang/linter/issues/453
+    - literal_only_boolean_expressions
+    # - matching_super_parameters # blocked on https://github.com/dart-lang/language/issues/2509
     # - missing_whitespace_between_adjacent_strings # DIFFERENT FROM FLUTTER/FLUTTER (too many false positives)
     - no_adjacent_strings_in_list
     - no_default_cases
     - no_duplicate_case_values
     - no_leading_underscores_for_library_prefixes
     - no_leading_underscores_for_local_identifiers
+    - no_literal_bool_comparisons
     - no_logic_in_create_state
     # - no_runtimeType_toString # ok in tests; we enable this only in packages/
+    - no_self_assignments
+    - no_wildcard_variable_uses
     - non_constant_identifier_names
     - noop_primitive_operations
     - null_check_on_nullable_type_parameter
@@ -138,12 +145,11 @@ linter:
     # - prefer_constructors_over_static_methods # far too many false positives
     - prefer_contains
     # - prefer_double_quotes # opposite of prefer_single_quotes
-    - prefer_equal_for_default_values
     # - prefer_expression_function_bodies # conflicts with https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo#consider-using--for-short-functions-and-methods
     - prefer_final_fields
     - prefer_final_in_for_each
     - prefer_final_locals
-    # - prefer_final_parameters # we should enable this one day when it can be auto-fixed (https://github.com/dart-lang/linter/issues/3104), see also parameter_assignments
+    # - prefer_final_parameters # adds too much verbosity
     - prefer_for_elements_to_map_fromIterable
     - prefer_foreach
     - prefer_function_declarations_over_variables
@@ -158,7 +164,7 @@ linter:
     - prefer_is_not_empty
     - prefer_is_not_operator
     - prefer_iterable_whereType
-    # - prefer_mixin # Has false positives, see https://github.com/dart-lang/linter/issues/3018
+    - prefer_mixin
     # - prefer_null_aware_method_calls # "call()" is confusing to people new to the language since it's not documented anywhere
     - prefer_null_aware_operators
     - prefer_relative_imports
@@ -169,10 +175,10 @@ linter:
     - provide_deprecation_message
     - public_member_api_docs # DIFFERENT FROM FLUTTER/FLUTTER
     - recursive_getters
-    # - require_trailing_commas # blocked on https://github.com/dart-lang/sdk/issues/47441
+    # - require_trailing_commas # would be nice, but requires a lot of manual work: 10,000+ code locations would need to be reformatted by hand after bulk fix is applied
     - secure_pubspec_urls
     - sized_box_for_whitespace
-    # - sized_box_shrink_expand # not yet tested
+    - sized_box_shrink_expand
     - slash_for_doc_comments
     - sort_child_properties_last
     - sort_constructors_first
@@ -183,15 +189,18 @@ linter:
     - tighten_type_of_initializing_formals
     # - type_annotate_public_apis # subset of always_specify_types
     - type_init_formals
+    - type_literal_in_constant_pattern
     # - unawaited_futures # too many false positives, especially with the way AnimationController works
     - unnecessary_await_in_return
     - unnecessary_brace_in_string_interps
+    - unnecessary_breaks
     - unnecessary_const
     - unnecessary_constructor_name
     # - unnecessary_final # conflicts with prefer_final_locals
     - unnecessary_getters_setters
     # - unnecessary_lambdas # has false positives: https://github.com/dart-lang/linter/issues/498
     - unnecessary_late
+    - unnecessary_library_directive
     - unnecessary_new
     - unnecessary_null_aware_assignments
     - unnecessary_null_aware_operator_on_extension_on_nullable
@@ -206,12 +215,13 @@ linter:
     - unnecessary_string_interpolations
     - unnecessary_this
     - unnecessary_to_list_in_spreads
+    - unreachable_from_main
     - unrelated_type_equality_checks
     - unsafe_html
     - use_build_context_synchronously
-    # - use_colored_box # not yet tested
-    # - use_decorated_box # not yet tested
-    # - use_enums # not yet tested
+    - use_colored_box
+    # - use_decorated_box # leads to bugs: DecoratedBox and Container are not equivalent (Container inserts extra padding)
+    - use_enums
     - use_full_hex_values_for_flutter_colors
     - use_function_type_syntax_for_parameters
     - use_if_null_to_convert_nulls_to_bools
@@ -223,6 +233,7 @@ linter:
     - use_rethrow_when_possible
     - use_setters_to_change_properties
     # - use_string_buffers # has false positives: https://github.com/dart-lang/sdk/issues/34182
+    # - use_string_in_part_of_directives # DIFFERENT FROM FLUTTER/FLUTTER (needs to be evaluated, dart:ui does this frequently)
     - use_super_parameters
     - use_test_throws_matchers
     # - use_to_and_as_if_applicable # has false positives, so we prefer to catch this by code-review
diff --git a/assets/asset_manager.cc b/assets/asset_manager.cc
index ecf97a4ce5e69208e2d6d5f6ae40b30d7c17e4d5..d18cf921f39750d39b5a24b6562f9c86469bcc6a 100644
--- a/assets/asset_manager.cc
+++ b/assets/asset_manager.cc
@@ -111,4 +111,21 @@ AssetResolver::AssetResolverType AssetManager::GetType() const {
   return AssetResolverType::kAssetManager;
 }
 
+bool AssetManager::operator==(const AssetResolver& other) const {
+  const AssetManager* other_manager = other.as_asset_manager();
+  if (!other_manager) {
+    return false;
+  }
+  if (resolvers_.size() != other_manager->resolvers_.size()) {
+    return false;
+  }
+
+  for (size_t i = 0; i < resolvers_.size(); i++) {
+    if (*resolvers_[i] != *other_manager->resolvers_[i]) {
+      return false;
+    }
+  }
+  return true;
+}
+
 }  // namespace flutter
diff --git a/assets/asset_manager.h b/assets/asset_manager.h
index b9e704d58a18f51101e668a8efd5cfeba6c41310..7292484f002522a0c48aa32d3bfe44a73c43729f 100644
--- a/assets/asset_manager.h
+++ b/assets/asset_manager.h
@@ -88,6 +88,12 @@ class AssetManager final : public AssetResolver {
       const std::string& asset_pattern,
       const std::optional<std::string>& subdir) const override;
 
+  // |AssetResolver|
+  bool operator==(const AssetResolver& other) const override;
+
+  // |AssetResolver|
+  const AssetManager* as_asset_manager() const override { return this; }
+
  private:
   std::deque<std::unique_ptr<AssetResolver>> resolvers_;
 
diff --git a/assets/asset_resolver.h b/assets/asset_resolver.h
index 4bf1eeb23e6f1baa0f07c68122d914d3fa85705e..0b1212f414dc0395963649b719fe83861ba196a0 100644
--- a/assets/asset_resolver.h
+++ b/assets/asset_resolver.h
@@ -14,6 +14,11 @@
 
 namespace flutter {
 
+class AssetManager;
+class APKAssetProvider;
+class DirectoryAssetBundle;
+class OHOSAssetProvider;
+
 class AssetResolver {
  public:
   AssetResolver() = default;
@@ -29,6 +34,17 @@ class AssetResolver {
     kDirectoryAssetBundle
   };
 
+  virtual const AssetManager* as_asset_manager() const { return nullptr; }
+  virtual const APKAssetProvider* as_apk_asset_provider() const {
+    return nullptr;
+  }
+  virtual const DirectoryAssetBundle* as_directory_asset_bundle() const {
+    return nullptr;
+  }
+  virtual const OHOSAssetProvider* as_ohos_asset_provider() const {
+    return nullptr;
+  }
+
   virtual bool IsValid() const = 0;
 
   //----------------------------------------------------------------------------
@@ -81,6 +97,12 @@ class AssetResolver {
     return {};
   };
 
+  virtual bool operator==(const AssetResolver& other) const = 0;
+
+  bool operator!=(const AssetResolver& other) const {
+    return !operator==(other);
+  }
+
  private:
   FML_DISALLOW_COPY_AND_ASSIGN(AssetResolver);
 };
diff --git a/assets/directory_asset_bundle.cc b/assets/directory_asset_bundle.cc
index 7896756614593bd4a5f9d52595cd6117413ccef2..3401db12583a33d0f2d6e707a76d893a8450ca1d 100644
--- a/assets/directory_asset_bundle.cc
+++ b/assets/directory_asset_bundle.cc
@@ -110,4 +110,14 @@ std::vector<std::unique_ptr<fml::Mapping>> DirectoryAssetBundle::GetAsMappings(
   return mappings;
 }
 
+bool DirectoryAssetBundle::operator==(const AssetResolver& other) const {
+  auto other_bundle = other.as_directory_asset_bundle();
+  if (!other_bundle) {
+    return false;
+  }
+  return is_valid_after_asset_manager_change_ ==
+             other_bundle->is_valid_after_asset_manager_change_ &&
+         descriptor_.get() == other_bundle->descriptor_.get();
+}
+
 }  // namespace flutter
diff --git a/assets/directory_asset_bundle.h b/assets/directory_asset_bundle.h
index 3621300f399543ce62f9c7974b9430756f72f254..c901c55557aed2ae1fed49aea22503155303aac5 100644
--- a/assets/directory_asset_bundle.h
+++ b/assets/directory_asset_bundle.h
@@ -43,6 +43,14 @@ class DirectoryAssetBundle : public AssetResolver {
       const std::string& asset_pattern,
       const std::optional<std::string>& subdir) const override;
 
+  // |AssetResolver|
+  bool operator==(const AssetResolver& other) const override;
+
+  // |AssetResolver|
+  const DirectoryAssetBundle* as_directory_asset_bundle() const override {
+    return this;
+  }
+
   FML_DISALLOW_COPY_AND_ASSIGN(DirectoryAssetBundle);
 };
 
diff --git a/attachment/repos/angle-3.22.patch b/attachment/repos/angle-3.22.patch
new file mode 100644
index 0000000000000000000000000000000000000000..13360322e2e37ec28f82678845ebae15431df072
--- /dev/null
+++ b/attachment/repos/angle-3.22.patch
@@ -0,0 +1,112 @@
+diff --git a/BUILD.gn b/BUILD.gn
+index 621a97bfb..7e9bb8964 100644
+--- a/BUILD.gn
++++ b/BUILD.gn
+@@ -103,7 +103,7 @@ if (angle_build_all) {
+       ":translator_fuzzer",
+       ":xxhash_fuzzer",
+       "$angle_root/samples:angle_samples",
+-      "$angle_root/src/tests:angle_tests",
++      #"$angle_root/src/tests:angle_tests",
+     ]
+     if (angle_enable_cl) {
+       deps += [ "$angle_root/src/libOpenCL:angle_cl" ]
+@@ -559,7 +559,8 @@ angle_static_library("angle_image_util") {
+   sources = libangle_image_util_sources
+   public_configs += [ ":angle_image_util_config" ]
+   public_deps = [ ":angle_image_util_headers" ]
+-
++  
++  angle_has_astc_encoder = false
+   if (angle_has_astc_encoder) {
+     public_deps += [ "third_party/astc-encoder:astcenc" ]
+     include_dirs = [ "third_party/astc-encoder/src/Source/" ]
+diff --git a/gni/angle.gni b/gni/angle.gni
+index 31fb784ed..8f5975ec5 100644
+--- a/gni/angle.gni
++++ b/gni/angle.gni
+@@ -63,7 +63,7 @@ if (angle_has_build) {
+ 
+   declare_args() {
+     angle_use_gbm = ozone_platform_gbm
+-    angle_use_x11 = ozone_platform_x11 && !is_ggp && (is_linux || is_chromeos)
++    angle_use_x11 = ozone_platform_x11 && !is_ggp && (is_linux || is_chromeos) && !is_castos
+     angle_use_wayland =
+         ozone_platform_wayland && !is_ggp && is_linux && !is_castos
+     angle_use_vulkan_display = (is_linux || is_chromeos) && !is_ggp
+@@ -197,7 +197,9 @@ declare_args() {
+ 
+ declare_args() {
+   # ASTC emulation is only built on standalone non-android builds
+-  angle_has_astc_encoder = angle_has_build && angle_standalone && !is_android
++  #angle_has_astc_encoder = angle_has_build && angle_standalone && !is_android
++  #for ohos
++  angle_has_astc_encoder = false
+ }
+ 
+ declare_args() {
+@@ -266,13 +268,13 @@ declare_args() {
+   angle_wayland_dir = "$angle_root/third_party/wayland"
+ 
+   angle_vulkan_headers_dir =
+-      "$angle_root/third_party/vulkan-deps/vulkan-headers/src"
++      "//flutter/third_party/vulkan-deps/vulkan-headers/src"
+   angle_vulkan_loader_dir =
+-      "$angle_root/third_party/vulkan-deps/vulkan-loader/src"
++      "//flutter/third_party/vulkan-deps/vulkan-loader/src"
+   angle_vulkan_tools_dir =
+-      "$angle_root/third_party/vulkan-deps/vulkan-tools/src"
++      "//flutter/third_party/vulkan-deps/vulkan-tools/src"
+   angle_vulkan_validation_layers_dir =
+-      "$angle_root/third_party/vulkan-deps/vulkan-validation-layers/src"
++      "//flutter/third_party/vulkan-deps/vulkan-validation-layers/src"
+ 
+   angle_build_vulkan_system_info = angle_has_build && !angle_is_winuwp
+ 
+diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h
+index 777e98558..23348f47a 100644
+--- a/include/EGL/eglplatform.h
++++ b/include/EGL/eglplatform.h
+@@ -111,13 +111,19 @@ typedef intptr_t EGLNativeWindowType;
+ 
+ #elif defined(USE_X11)
+ 
+-/* X11 (tentative)  */
+-#include <X11/Xlib.h>
+-#include <X11/Xutil.h>
++struct NativeWindow;
+ 
+-typedef Display *EGLNativeDisplayType;
+-typedef Pixmap   EGLNativePixmapType;
+-typedef Window   EGLNativeWindowType;
++typedef void*                   EGLNativeDisplayType;
++typedef void*                   EGLNativePixmapType;
++typedef struct NativeWindow*    EGLNativeWindowType;
++
++// /* X11 (tentative)  */
++// #include <X11/Xlib.h>
++// #include <X11/Xutil.h>
++
++// typedef Display *EGLNativeDisplayType;
++// typedef Pixmap   EGLNativePixmapType;
++// typedef Window   EGLNativeWindowType;
+ 
+ #elif defined(__unix__)
+ 
+diff --git a/src/common/angle_version.h b/src/common/angle_version.h
+index 488c65dfe..9a0b295d9 100644
+--- a/src/common/angle_version.h
++++ b/src/common/angle_version.h
+@@ -15,8 +15,12 @@
+ #define ANGLE_MINOR_VERSION 1
+ 
+ #ifndef ANGLE_REVISION
++#ifndef ANGLE_COMMIT_POSITION
++#    define ANGLE_REVISION 0
++#else
+ #    define ANGLE_REVISION ANGLE_COMMIT_POSITION
+ #endif
++#endif
+ 
+ #define ANGLE_STRINGIFY(x) #x
+ #define ANGLE_MACRO_STRINGIFY(x) ANGLE_STRINGIFY(x)
diff --git a/attachment/repos/bootstrap/auto_complie.py b/attachment/repos/bootstrap/auto_complie.py
new file mode 100644
index 0000000000000000000000000000000000000000..c50e4e476ba9392dc3ebcf8cbcf186168075d1e2
--- /dev/null
+++ b/attachment/repos/bootstrap/auto_complie.py
@@ -0,0 +1,210 @@
+#!/usr/bin/env python3
+#
+# Copyright (c) 2024 Hunan OpenValley Digital Industry Development Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import os
+import platform
+import subprocess
+import sys
+import traceback
+from obs import ObsClient, PutObjectHeader
+
+# 使用华为obs
+# pip install esdk-obs-python --trusted-host pypi.org
+
+OS_NAME = platform.system().lower()
+IS_WINDOWS = OS_NAME.startswith("win")
+IS_MAC = OS_NAME.startswith("darwin")
+FLUTTER_ENGINE_PATH = os.path.join(os.getcwd(), 'src', 'flutter')
+OHOS_ENGINE_TYPE_OUT = {'ohos-arm64' : 'ohos_debug_unopt_arm64',
+                        'ohos-arm64-profile' : 'ohos_profile_arm64',
+                        'ohos-arm64-release' : 'ohos_release_arm64',
+                        'ohos-x64' : 'ohos_debug_unopt_x64',
+                        'ohos-x64-profile' : 'ohos_profile_x64',
+                        'ohos-x64-release' : 'ohos_release_x64',
+                        }
+
+# OBS 环境变量配置key信息
+ACCESS_KEY = os.getenv("AccessKeyID")
+SECRET_KEY = os.getenv("SecretAccessKey")
+
+# 服务器地址 华南-广州
+SERVER = "https://obs.cn-south-1.myhuaweicloud.com"
+
+# OBS桶 
+FLUTTER_OHOS = 'flutter-ohos'
+
+def log(msg):
+    print(f'================{msg}============')
+
+def runGitCommand(command):
+    result = subprocess.run(command, capture_output=True, text=True, shell=True)
+    if result.returncode != 0:
+        raise Exception(f"Git command failed: {result.stderr}")
+    return result.stdout.strip()
+
+def runPyCommand(command):
+
+    if IS_WINDOWS:
+        proc = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+    else:
+        proc = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=False)
+
+    # 获取实时输出
+    for line in iter(proc.stdout.readline, b''):
+        print(line.decode('utf-8').strip())
+
+    # 等待命令执行完成
+    proc.wait()
+
+def getRemoteTags(repoPath, remoteName='origin'):
+
+    # 获取远程仓库的所有标签
+    tagsOutput = runGitCommand(f'git -C {repoPath} ls-remote --tags {remoteName}')
+
+    # 分割输出，每一行都是一个tag
+    tags = tagsOutput.split('\n')
+
+    # 去除空行和解析tag信息
+    parsedTags = [line.split()[0] for line in tags if line]
+
+    return parsedTags
+
+# 在指定目录及其子目录中查找指定的文件
+def findFile(directory, filename):
+    for root, dirs, files in os.walk(directory):
+        if filename in files:
+            return (os.path.join(root, filename))
+
+# 获取上传对象的进度
+def uploadCallback(transferredAmount, totalAmount, totalSeconds):
+    # 获取上传平均速率(KB/S)
+    speed = int(transferredAmount / totalSeconds / 1024)
+    # 获取上传进度百分比
+    progress = int(transferredAmount * 100.0 / totalAmount)
+    print("\r", end="")
+    print("Speed: {} KB/S progress: {}%: ".format(speed, progress), "▓" * (progress // 2), end="")
+    sys.stdout.flush()
+    if progress == 100:
+        print("")
+
+# 检查TAG版本
+def checkRemoteTagsUpdates():
+    # 获取远程TAG的最新提交哈希
+    remoteTags = getRemoteTags(FLUTTER_ENGINE_PATH)
+    remoteLatestTag = remoteTags[-1]
+
+    # 获取本地分支的最新提交哈希
+    localLatestCommit = runGitCommand(f'git -C {FLUTTER_ENGINE_PATH} rev-parse HEAD')
+
+    if remoteLatestTag != localLatestCommit:
+        log("Remote repository has updates.")
+        return True
+    else:
+        log("Local repository is up to date.")
+        return False
+
+# 检查分支更新
+def checkRemoteBranchUpdates(repoPath, remoteName='origin', branch='dev'):
+    # 切换到你的Git仓库目录
+    os.chdir(repoPath)
+
+    # 获取远程分支的最新提交哈希
+    remoteLatestCommit = runGitCommand(f'git -C {repoPath} rev-parse {remoteName}/{branch}')
+
+    # 获取本地分支的最新提交哈希
+    localLatestCommit = runGitCommand(f'git -C {repoPath} rev-parse HEAD')
+
+    if remoteLatestCommit != localLatestCommit:
+        log("Remote repository has updates.")
+        return True
+    else:
+        log("Local repository is up to date.")
+        return False
+
+
+# 获取编译产物
+def getCompileFiles(buildType):
+    zipfiles = ['artifacts.zip','linux-x64.zip','windows-x64.zip','darwin-x64.zip','symbols.zip']
+
+    files = []
+    for fileName in zipfiles:
+        if IS_WINDOWS and fileName != 'windows-x64.zip':
+            continue
+        if IS_MAC and fileName != 'darwin-x64.zip':
+            continue
+
+        files.append(findFile(os.path.join(os.getcwd(), 'src', 'out', buildType), fileName))
+
+    return files
+
+# 上传服务器
+def uploadServer(version, buildType, filePath):
+    try:
+        log(f'upload: {filePath}')
+
+        bucketName = FLUTTER_OHOS
+        obsClient = ObsClient(access_key_id=ACCESS_KEY, secret_access_key=SECRET_KEY, server=SERVER)
+        
+        # 上传对象的附加头域
+        headers = PutObjectHeader()
+        # 【可选】待上传对象的MIME类型
+        headers.contentType = 'text/plain'
+
+        # https://storage.flutter-io.cn/flutter_infra_release/flutter/cececddab019a56da828c41d55cb54484278e880/ohos-arm64-profile/linux-x64.zip
+        fileName = os.path.basename(filePath)
+        objectKey = f'flutter_infra_release/flutter/{version}/{buildType}/{fileName}'
+
+        # 待上传文件/文件夹的完整路径，如aa/bb.txt，或aa/
+        file_path = filePath
+
+        # 文件上传
+        resp = obsClient.putFile(bucketName, objectKey, file_path, headers=headers, progressCallback=uploadCallback)
+        # 返回码为2xx时，接口调用成功，否则接口调用失败
+        if resp.status < 300:
+            print('Put Content Succeeded')
+            print('requestId:', resp.requestId)
+            print('etag:', resp.body.etag)
+        else:
+            print('Put Content Failed')
+            print('requestId:', resp.requestId)
+            print('errorCode:', resp.errorCode)
+            print('errorMessage:', resp.errorMessage)
+
+    except:
+        log('Put Content Failed')          
+        log(traceback.format_exc())
+
+
+def main():
+    if checkRemoteTagsUpdates() :
+        localVersion = runGitCommand(f'git -C {FLUTTER_ENGINE_PATH} rev-parse HEAD')
+        log(localVersion)
+
+        # 获取编译产物
+        for buildType in OHOS_ENGINE_TYPE_OUT:
+            zipfiles = getCompileFiles(OHOS_ENGINE_TYPE_OUT[buildType])
+            for filePath in zipfiles:
+                if not filePath or not os.path.exists(filePath):
+                    continue
+                print(filePath)
+                uploadServer(localVersion, buildType, filePath)
+
+        log('上传完成')
+
+    else :
+        log("本地代码已经是最新")
+
+if __name__ == "__main__":
+    exit(main())
diff --git a/attachment/repos/bootstrap/ohos.py b/attachment/repos/bootstrap/ohos.py
index 8f1842fb3186d3d0e2b744a8c233b56d5e372513..1125f0e2d7fe2de28a568a87b21cfce8a189447d 100644
--- a/attachment/repos/bootstrap/ohos.py
+++ b/attachment/repos/bootstrap/ohos.py
@@ -40,199 +40,197 @@ logging.basicConfig(
 
 
 def safeGetPath(filePath, isDirectory=True):
-    createPath = (
-        filePath if isDirectory else os.path.abspath(os.path.join(filePath, os.pardir))
-    )
-    if not os.path.exists(createPath):
-        os.makedirs(createPath)
-    return os.path.abspath(filePath)
+  createPath = (filePath if isDirectory else os.path.abspath(os.path.join(filePath, os.pardir)))
+  if not os.path.exists(createPath):
+    os.makedirs(createPath)
+  return os.path.abspath(filePath)
 
 
 TIME_STR = datetime.now().strftime("%Y%m%d-%H%M")
-DIR_OUTPUTS = safeGetPath(
-    "%s/outputs/%s" % (DIR_ROOT, datetime.now().strftime("%Y%m%d"))
-)
+DIR_OUTPUTS = safeGetPath("%s/outputs/%s" % (DIR_ROOT, datetime.now().strftime("%Y%m%d")))
 DIR_LOG = safeGetPath("%s/logs" % DIR_OUTPUTS)
 
 
 class BuildInfo:
-    def __init__(
-        self,
-        buildType="release",
-        targetOS="ohos",
-        targetArch="arm64",
-        targetTriple="arm64-%s-ohos" % OS_NAME,
-    ):
-        self.buildType = buildType
-        self.targetOS = targetOS
-        self.targetArch = targetArch
-        self.targetTriple = targetTriple
-
-    def __repr__(self):
-        return "BuildInfo(buildType=%s)" % (self.buildType)
+
+  def __init__(
+      self,
+      buildType="release",
+      targetOS="ohos",
+      targetArch="arm64",
+      targetTriple="arm64-%s-ohos" % OS_NAME,
+      abi="arm64-v8a",
+  ):
+    self.buildType = buildType
+    self.targetOS = targetOS
+    self.targetArch = targetArch
+    self.targetTriple = targetTriple
+    self.abi = abi
+
+  def __repr__(self):
+    return "BuildInfo(buildType=%s)" % (self.buildType)
 
 
 # 执行命令
 def runCommand(command, checkCode=True, timeout=None):
-    logging.info("runCommand start, command = %s" % (command))
-    code = subprocess.Popen(command, shell=True).wait(timeout)
+  logging.info("runCommand start, command = %s" % (command))
+  code = subprocess.Popen(command, shell=True).wait(timeout)
 
-    if code != 0:
-        logging.error("runCommand error, code = %s, command = %s" % (code, command))
-        if checkCode:
-            exit(code)
-    else:
-        logging.info("runCommand finish, code = %s, command = %s" % (code, command))
+  if code != 0:
+    logging.error("runCommand error, code = %s, command = %s" % (code, command))
+    if checkCode:
+      exit(code)
+  else:
+    logging.info("runCommand finish, code = %s, command = %s" % (code, command))
 
 
 def getOutput(buildInfo):
-    buildType = buildInfo.buildType
-    outputName = "%s_%s%s_%s" % (
-        buildInfo.targetOS,
-        buildType,
-        "_unopt" if buildType == "debug" else "",
-        buildInfo.targetArch,
-    )
-    return outputName
+  buildType = buildInfo.buildType
+  outputName = "%s_%s%s_%s" % (
+      buildInfo.targetOS,
+      buildType,
+      "_unopt" if buildType == "debug" else "",
+      buildInfo.targetArch,
+  )
+  return outputName
 
 
 # 清理engine产物
 def engineClean(buildInfo):
-    target = os.path.join("src", "out", getOutput(buildInfo))
-    logging.info("Remove directory %s" % target)
-    if os.path.exists(target):
-        shutil.rmtree(target, ignore_errors=True)
+  target = os.path.join("src", "out", getOutput(buildInfo))
+  logging.info("Remove directory %s" % target)
+  if os.path.exists(target):
+    shutil.rmtree(target, ignore_errors=True)
 
 
 def findFile(path, search, results):
-    if not path or not os.path.exists(path):
-        return
-    for item in os.listdir(path):
-        cur_path = os.path.join(path, item)
-        if os.path.isdir(cur_path):
-            if cur_path.endswith(search):
-                results.append(os.path.abspath(cur_path))
-            findFile(cur_path, search, results)
+  if not path or not os.path.exists(path):
+    return
+  for item in os.listdir(path):
+    cur_path = os.path.join(path, item)
+    if os.path.isdir(cur_path):
+      if cur_path.endswith(search):
+        results.append(os.path.abspath(cur_path))
+      findFile(cur_path, search, results)
 
 
 def findNativeInCurrentDir():
-    os_dir = "mac" if OS_NAME == "darwin" else OS_NAME
-    dirs = []
-    findFile(os.path.join("ndk", os_dir), "native", dirs)
-    return dirs[0] if len(dirs) != 0 else ""
+  os_dir = "mac" if OS_NAME == "darwin" else OS_NAME
+  dirs = []
+  findFile(os.path.join("ndk", os_dir), "native", dirs)
+  return dirs[0] if len(dirs) != 0 else ""
 
 
 def getNdkHome():
-    OHOS_NDK_HOME = os.getenv("OHOS_NDK_HOME")
-    if not OHOS_NDK_HOME:
-        OHOS_NDK_HOME = findNativeInCurrentDir()
-    if not OHOS_NDK_HOME:
-        dirs = []
-        findFile(os.getenv("OHOS_SDK_HOME"), "native", dirs)
-        findFile(os.getenv("HOS_SDK_HOME"), "native", dirs)
-        dirs.sort(reverse=True)
-        for dir in dirs:
-            if isNdkValid(dir):
-                OHOS_NDK_HOME = dir
-                break;
-    logging.info("OHOS_NDK_HOME = %s" % OHOS_NDK_HOME)
-    if not isNdkValid(OHOS_NDK_HOME):
-        logging.error(
-            """
+  OHOS_NDK_HOME = os.getenv("OHOS_NDK_HOME")
+  if not OHOS_NDK_HOME:
+    OHOS_NDK_HOME = findNativeInCurrentDir()
+  if not OHOS_NDK_HOME:
+    dirs = []
+    findFile(os.getenv("OHOS_SDK_HOME"), "native", dirs)
+    findFile(os.getenv("HOS_SDK_HOME"), "native", dirs)
+    dirs.sort(reverse=True)
+    for dir in dirs:
+      if isNdkValid(dir):
+        OHOS_NDK_HOME = dir
+        break
+  logging.info("OHOS_NDK_HOME = %s" % OHOS_NDK_HOME)
+  if not isNdkValid(OHOS_NDK_HOME):
+    logging.error(
+        """
     Please set the environment variables for HarmonyOS SDK to "HOS_SDK_HOME" or "OHOS_SDK_HOME".
     We will use both native/llvm and native/sysroot.
     Please ensure that the file "native/llvm/bin/clang" exists and is executable."""
-        )
-        exit(10)
-    return OHOS_NDK_HOME
+    )
+    exit(10)
+  return OHOS_NDK_HOME
+
 
 # 校验 native
 def isNdkValid(path):
-    if not path:
-        return False
-    dirs = [
-        os.path.join(path),
-        os.path.join(path, 'sysroot'),
-        os.path.join(path, 'llvm', 'bin'),
-        os.path.join(path, 'build-tools', 'cmake', 'bin')
-    ]
-    for dir in dirs:
-        if not os.path.exists(dir):
-            return False
-    return True
+  if not path:
+    return False
+  dirs = [
+      os.path.join(path),
+      os.path.join(path, "sysroot"),
+      os.path.join(path, "llvm", "bin"),
+      os.path.join(path, "build-tools", "cmake", "bin"),
+  ]
+  for dir in dirs:
+    if not os.path.exists(dir):
+      return False
+  return True
 
 
 # 指定engine编译的配置参数
-def engineConfig(buildInfo, extraParam=""):
-    OHOS_NDK_HOME = getNdkHome()
-    # export PATH=$OHOS_NDK_HOME/build-tools/cmake/bin:$OHOS_NDK_HOME/llvm/bin:$PATH
-    lastPath = os.getenv("PATH")
-    os.environ["PATH"] = (
-        "%s%s" % (os.path.join(OHOS_NDK_HOME, "build-tools", "cmake", "bin"), PATH_SEP)
-        + "%s%s" % (os.path.join(OHOS_NDK_HOME, "build-tools", "llvm", "bin"), PATH_SEP)
-        + "%s%s" % (os.path.abspath("depot_tools"), PATH_SEP)
-        + lastPath
-    )
-    unixCommand = ""
-    if not IS_WINDOWS:
-        unixCommand = (
-            "--target-sysroot %s " % os.path.join(OHOS_NDK_HOME, "sysroot")
-            + "--target-toolchain %s " % os.path.join(OHOS_NDK_HOME, "llvm")
-            + "--target-triple %s " % buildInfo.targetTriple
-        )
-    OPT = "--unoptimized --no-lto " if buildInfo.buildType == "debug" else ""
-    runCommand(
-        "%s " % os.path.join("src", "flutter", "tools", "gn")
-        + "--ohos "
-        + "--ohos-cpu %s " % buildInfo.targetArch
-        + "--runtime-mode %s " % buildInfo.buildType
-        + OPT
-        + unixCommand
-        + "--no-goma "
-        + "--no-prebuilt-dart-sdk "
-        + "--embedder-for-target "
-        + "--disable-desktop-embeddings "
-        + "--no-build-embedder-examples "
-        + "--verbose "
-        + extraParam.replace("\\", ""),
-        checkCode=False,
-        timeout=600,
+def engineConfig(buildInfo, args):
+  OHOS_NDK_HOME = getNdkHome()
+  # export PATH=$OHOS_NDK_HOME/build-tools/cmake/bin:$OHOS_NDK_HOME/llvm/bin:$PATH
+  lastPath = os.getenv("PATH")
+  os.environ["PATH"] = (
+      "%s%s" % (os.path.join(OHOS_NDK_HOME, "build-tools", "cmake", "bin"), PATH_SEP) + "%s%s" %
+      (os.path.join(OHOS_NDK_HOME, "build-tools", "llvm", "bin"), PATH_SEP) + "%s%s" %
+      (os.path.abspath("depot_tools"), PATH_SEP) + lastPath
+  )
+  unixCommand = ""
+  if not IS_WINDOWS:
+    unixCommand = (
+        "--target-sysroot %s " % os.path.join(OHOS_NDK_HOME, "sysroot") +
+        "--target-toolchain %s " % os.path.join(OHOS_NDK_HOME, "llvm") +
+        "--target-triple %s " % buildInfo.targetTriple
     )
+  OPT = "--unoptimized --no-lto " if buildInfo.buildType == "debug" else ""
+  runCommand(
+      "%s " % os.path.join("src", "flutter", "tools", "gn") + "--ohos " +
+      "--ohos-cpu %s " % buildInfo.targetArch + "--runtime-mode %s " % buildInfo.buildType + OPT +
+      unixCommand + "--no-goma " + "--no-prebuilt-dart-sdk " + "--embedder-for-target " +
+      "--disable-desktop-embeddings " + "--no-build-embedder-examples " +
+      "--ohos-api-int %s " % args.ohos_api_int + "--verbose " +
+      args.gn_extra_param.replace("\\", ""),
+      checkCode=False,
+      timeout=600,
+  )
 
 
 # 执行engine编译操作
 def engineCompile(buildInfo):
-    runCommand("ninja -C %s" % os.path.join("src", "out", getOutput(buildInfo)))
+  command = "ninja -C %s default " % os.path.join("src", "out", getOutput(buildInfo))
+  if IS_WINDOWS and buildInfo.buildType != "debug":
+    command += "flutter/build/archives:archive_win_gen_snapshot "
+  runCommand(command)
 
 
 # 编译har文件
-def harBuild(buildInfo):
-    buildType = buildInfo.buildType
-    buildOut = getOutput(buildInfo)
-    runCommand(
-        "python3 ./src/build/ohos/ohos_create_flutter_har.py "
-        + "--embedding_src ./src/flutter/shell/platform/ohos/flutter_embedding "
-        + "--build_dir ./src/out/%s/obj/ohos/flutter_embedding " % buildOut
-        + "--build_type %s " % buildType
-        + "--output ./src/out/%s/flutter.har " % buildOut
-        + "--native_lib ./src/out/%s/libflutter.so " % buildOut
-        + "--ohos_abi %s " % "arm64-v8a"
-        + "--ohos_api_int %s " % 11
+def harBuild(buildInfo, args):
+  buildType = buildInfo.buildType
+  buildOut = getOutput(buildInfo)
+  command = "python3 ./src/flutter/attachment/scripts/ohos_create_flutter_har.py "
+  command += "--embedding_src ./src/flutter/shell/platform/ohos/flutter_embedding "
+  command += "--build_dir ./src/out/%s/obj/ohos/flutter_embedding " % buildOut
+  command += "--build_type %s " % buildType
+  command += "--output ./src/out/%s/flutter.har " % buildOut
+  command += "--native_lib ./src/out/%s/libflutter.so " % buildOut
+  if buildType == "profile":
+    command += (
+        "--native_lib ./src/out/%s/gen/flutter/shell/vmservice/ohos/libs/%s/libvmservice_snapshot.so "
+        % (buildOut, buildInfo.abi)
     )
-    
+  command += "--ohos_abi %s " % "arm64-v8a"
+  command += "--ohos_api_int %s " % args.ohos_api_int
+  runCommand(command)
 
 
 def isPathValid(filepath, filename, includes, excludes):
-    fileOrigin = filepath + os.path.sep + filename
-    for regex in includes:
-        if re.search(regex, fileOrigin):
-            return True
-    if includes != []:
-        return False
-    for regex in excludes:
-        if re.search(regex, fileOrigin):
-            return False
-    return True
+  fileOrigin = filepath + os.path.sep + filename
+  for regex in includes:
+    if re.search(regex, fileOrigin):
+      return True
+  if includes != []:
+    return False
+  for regex in excludes:
+    if re.search(regex, fileOrigin):
+      return False
+  return True
 
 
 def zipFileDir(
@@ -243,139 +241,164 @@ def zipFileDir(
     excludes=[],
     useZip2=False,
 ):
-    logging.info(
-        "fileIn= %s, fileName= %s, prefixInZip= %s, includes= %s, excludes= %s"
-        % (fileIn, fileName, prefixInZip, includes, excludes)
-    )
-    fileOut1 = os.path.abspath("%s/%s.zip" % (DIR_OUTPUTS, fileName))
-    fileOut2 = os.path.abspath("%s/%s-unstripped.zip" % (DIR_OUTPUTS, fileName))
-    with zipfile.ZipFile(fileOut1, "w", zipfile.ZIP_DEFLATED) as zip1:
-        with zipfile.ZipFile(fileOut2, "w", zipfile.ZIP_DEFLATED) as zip2:
-            for path, dirnames, filenames in os.walk(fileIn):
-                fpath = path.replace(fileIn, "")[1:]
-                pPath = prefixInZip + os.sep + fpath
-                for filename in filenames:
-                    path1 = os.path.join(path, filename)
-                    path2 = os.path.join(pPath, filename)
-                    if isPathValid(fpath, filename, includes, excludes):
-                        zip1.write(path1, path2)
-                    elif useZip2:
-                        zip2.write(path1, path2)
-
-    if not useZip2:
-        os.remove(fileOut2)
-
-
-def zipFiles(buildInfo, useZip2=False):
-    logging.info("zipFiles buildInfo=%s" % buildInfo)
-    sdkVer = ''
-    if ('openharmony' in getNdkHome()):
-        sdkVer = getNdkHome()[-9:-7]
-    else:
-        sdkVer = getNdkHome()[-30:-12]
-    outputName = getOutput(buildInfo)
-    fileIn = os.path.abspath("%s/src/out/%s" % (DIR_ROOT, outputName))
-    fileName = "ohos_%s_%s-%s-%s-%s" % (
-        sdkVer,
-        buildInfo.buildType,
-        OS_NAME,
-        platform.machine(),
-        TIME_STR,
-    )
-    prefixInZip = os.path.join("src", "out", outputName)
-    excludes = ["obj", "exe.unstripped", "so.unstripped"]
-    if IS_WINDOWS:
-        excludes.extend([".*\.ilk", ".*\.pdb"])
-    zipFileDir(fileIn, fileName, prefixInZip, excludes=excludes, useZip2=useZip2)
+  logging.info(
+      "fileIn= %s, fileName= %s, prefixInZip= %s, includes= %s, excludes= %s" %
+      (fileIn, fileName, prefixInZip, includes, excludes)
+  )
+  fileOut1 = os.path.abspath("%s/%s.zip" % (DIR_OUTPUTS, fileName))
+  fileOut2 = os.path.abspath("%s/%s-unstripped.zip" % (DIR_OUTPUTS, fileName))
+  with zipfile.ZipFile(fileOut1, "w", zipfile.ZIP_DEFLATED) as zip1:
+    with zipfile.ZipFile(fileOut2, "w", zipfile.ZIP_DEFLATED) as zip2:
+      for path, dirnames, filenames in os.walk(fileIn):
+        fpath = path.replace(fileIn, "")[1:]
+        pPath = prefixInZip + os.sep + fpath
+        for filename in filenames:
+          path1 = os.path.join(path, filename)
+          path2 = os.path.join(pPath, filename)
+          if isPathValid(fpath, filename, includes, excludes):
+            zip1.write(path1, path2)
+          elif useZip2:
+            zip2.write(path1, path2)
+
+  if not useZip2:
+    os.remove(fileOut2)
+
+
+def zipFiles(buildInfo, useZip2=False, args=any):
+  logging.info("zipFiles buildInfo=%s" % buildInfo)
+  outputName = getOutput(buildInfo)
+  fileIn = os.path.abspath("%s/src/out/%s" % (DIR_ROOT, outputName))
+  fileName = "ohos_%s_%s-%s-%s-%s" % (
+      args.ohos_api_int,
+      buildInfo.buildType,
+      OS_NAME,
+      platform.machine(),
+      TIME_STR,
+  )
+  prefixInZip = os.path.join("src", "out", outputName)
+  excludes = ["obj", "exe.unstripped", "so.unstripped"]
+  if IS_WINDOWS:
+    excludes.extend([".*\.ilk", ".*\.pdb"])
+  zipFileDir(fileIn, fileName, prefixInZip, excludes=excludes, useZip2=useZip2)
 
 
 def addParseParam(parser):
-    parser.add_argument(
-        "-n",
-        "--name",
-        nargs="+",
-        default=[],
-        choices=SUPPORT_BUILD_NAMES,
-        help="Provide build names.",
-    )
-    parser.add_argument(
-        "-t",
-        "--type",
-        nargs="+",
-        default=SUPPORT_BUILD_TYPES,
-        choices=SUPPORT_BUILD_TYPES,
-        help="Provide build types.",
-    )
-    parser.add_argument(
-        "-b",
-        "--branch",
-        help="Git branch name in src/flutter to update.",
-    )
-    parser.add_argument(
-        "-g",
-        "--gn-extra-param",
-        nargs="?",
-        default="",
-        help='Extra param to src/flutter/tools/gn. Such as: -g "\\--enable-unittests"',
-    )
+  parser.add_argument(
+      "-n",
+      "--name",
+      nargs="+",
+      default=[],
+      choices=SUPPORT_BUILD_NAMES,
+      help="Provide build names.",
+  )
+  parser.add_argument(
+      "-t",
+      "--type",
+      nargs="+",
+      default=SUPPORT_BUILD_TYPES,
+      choices=SUPPORT_BUILD_TYPES,
+      help="Provide build types.",
+  )
+  parser.add_argument(
+      "-b",
+      "--branch",
+      help="Git branch name in src/flutter to update.",
+  )
+  parser.add_argument(
+      "-g",
+      "--gn-extra-param",
+      nargs="?",
+      default="",
+      help='Extra param to src/flutter/tools/gn. Such as: -g "\\--enable-unittests"',
+  )
+  parser.add_argument(
+      "--ohos_api_int", type=int, choices=[11, 12], default=12, help="Ohos api int."
+  )
 
 
 def updateCode(args):
-    if args.branch:
-        dir = os.path.join("src", "flutter")
-        runCommand("git -C %s add -A" % dir)
-        runCommand("git -C %s stash save 'Auto stash save.'" % dir)
-        runCommand("git -C %s checkout %s" % (dir, args.branch))
-        runCommand("git -C %s pull --rebase" % dir, checkCode=False)
-        runCommand("git -C %s log -1" % dir)
-        runCommand("python3 src/flutter/attachment/scripts/ohos_setup.py")
+  if args.branch:
+    dir = os.path.join("src", "flutter")
+    runCommand("git -C %s add -A" % dir)
+    runCommand("git -C %s stash save 'Auto stash save.'" % dir)
+    runCommand("git -C %s checkout %s" % (dir, args.branch))
+    runCommand("git -C %s pull --rebase" % dir, checkCode=False)
+    runCommand("git -C %s log -1" % dir)
+    runCommand("python3 src/flutter/attachment/scripts/ohos_setup.py")
 
 
 def checkEnvironment():
-    if not os.path.exists("src/flutter"):
-        logging.error(
-            "You should place the current file 'ohos.py'"
-            + " in the root directory of the 'engine' compilation."
-        )
-        exit(1)
+  if not os.path.exists("src/flutter"):
+    logging.error(
+        "You should place the current file 'ohos.py'" +
+        " in the root directory of the 'engine' compilation."
+    )
+    exit(1)
+
+
+def buildLocalEngine(buildType, extraParam):
+  OPT = "--unoptimized --no-lto " if buildType == "debug" else ""
+  runCommand(
+      "%s " % os.path.join("src", "flutter", "tools", "gn") + "--runtime-mode %s " % buildType +
+      OPT + "--no-goma " + "--no-prebuilt-dart-sdk " + "--disable-desktop-embeddings " +
+      "--no-build-embedder-examples " + "--verbose " + extraParam.replace("\\", ""),
+      checkCode=False,
+      timeout=600,
+  )
+  outputName = "host_%s%s" % (buildType, "_unopt" if buildType != "profile" else "")
+  runCommand("ninja -C %s" % os.path.join("src", "out", outputName))
+
+
+def buildLocalEngine(buildType, extraParam):
+  OPT = "--unoptimized --no-lto " if buildType == "debug" else ""
+  runCommand(
+      "%s " % os.path.join("src", "flutter", "tools", "gn") + "--runtime-mode %s " % buildType +
+      OPT + "--no-goma " + "--no-prebuilt-dart-sdk " + "--disable-desktop-embeddings " +
+      "--no-build-embedder-examples " + "--verbose " + extraParam.replace("\\", ""),
+      checkCode=False,
+      timeout=600,
+  )
+  outputName = "host_%s%s" % (buildType, "_unopt" if buildType == "debug" else "")
+  runCommand("ninja -C %s" % os.path.join("src", "out", outputName))
 
 
 def buildByNameAndType(args):
-    buildNames = args.name if args.branch or args.name else ["config", "compile"]
-    buildTypes = args.type
-    for buildType in SUPPORT_BUILD_TYPES:
-        if not buildType in buildTypes:
-            continue
-        buildInfo = BuildInfo(buildType=buildType)
-        for buildName in SUPPORT_BUILD_NAMES:
-            if not buildName in buildNames:
-                continue
-            if "clean" == buildName:
-                engineClean(buildInfo)
-            elif "config" == buildName:
-                engineConfig(buildInfo, args.gn_extra_param)
-            elif "har" == buildName:
-                harBuild(buildInfo)
-            elif "compile" == buildName:
-                engineCompile(buildInfo)
-            elif "zip" == buildName:
-                zipFiles(buildInfo)
-            elif "zip2" == buildName:
-                zipFiles(buildInfo, True)
-            else:
-                logging.warning("Other name=%s" % buildName)
+  buildNames = args.name if args.branch or args.name else ["config", "compile"]
+  buildTypes = args.type
+  for buildType in SUPPORT_BUILD_TYPES:
+    if not buildType in buildTypes:
+      continue
+    buildInfo = BuildInfo(buildType=buildType)
+    for buildName in SUPPORT_BUILD_NAMES:
+      if not buildName in buildNames:
+        continue
+      if "clean" == buildName:
+        engineClean(buildInfo)
+      elif "config" == buildName:
+        engineConfig(buildInfo, args)
+      elif "har" == buildName:
+        harBuild(buildInfo)
+      elif "compile" == buildName:
+        engineCompile(buildInfo)
+      elif "zip" == buildName:
+        zipFiles(buildInfo)
+      elif "zip2" == buildName:
+        zipFiles(buildInfo, True)
+      else:
+        logging.warning("Other name=%s" % buildName)
+    buildLocalEngine(buildType, args.gn_extra_param)
 
 
 def ohos_main():
-    parser = argparse.ArgumentParser()
-    addParseParam(parser)
-    args = parser.parse_args()
-    checkEnvironment()
-    updateCode(args)
-    buildByNameAndType(args)
-    logging.info("ohos_main() finish.")
-    return 0
+  parser = argparse.ArgumentParser()
+  addParseParam(parser)
+  args = parser.parse_args()
+  checkEnvironment()
+  updateCode(args)
+  buildByNameAndType(args)
+  logging.info("ohos_main() finish.")
+  return 0
 
 
 if __name__ == "__main__":
-    exit(ohos_main())
+  exit(ohos_main())
diff --git a/attachment/repos/boringssl-3.22.patch b/attachment/repos/boringssl-3.22.patch
new file mode 100644
index 0000000000000000000000000000000000000000..1b5d1e65f956d81502bfb6ece49fb58d6b8f7ac7
--- /dev/null
+++ b/attachment/repos/boringssl-3.22.patch
@@ -0,0 +1,21 @@
+diff --git a/BUILD.gn b/BUILD.gn
+index 1ee6799..684f028 100644
+--- a/BUILD.gn
++++ b/BUILD.gn
+@@ -50,6 +50,7 @@ config("no_asm_config") {
+ 
+ # This has no sources on some platforms so must be a source_set.
+ source_set("boringssl_asm") {
++
+   visibility = [ ":*" ]  # Only targets in this file can depend on this.
+ 
+   defines = []
+@@ -57,7 +58,7 @@ source_set("boringssl_asm") {
+   include_dirs = [ "src/include" ]
+   asmflags = []
+ 
+-  if ((current_cpu == "arm" || current_cpu == "arm64") && is_android &&
++  if ((current_cpu == "arm" || current_cpu == "arm64") && (is_android || is_ohos) &&
+       is_clang) {
+     if (!bssl_use_clang_integrated_as) {
+       # Disable the integrated assembler and use the one shipped with the NDK.
diff --git a/attachment/repos/build-3.22.patch b/attachment/repos/build-3.22.patch
new file mode 100644
index 0000000000000000000000000000000000000000..c5aac94dbde07570b12fd9a9e3dc89960a85c081
--- /dev/null
+++ b/attachment/repos/build-3.22.patch
@@ -0,0 +1,991 @@
+diff --git a/build/config/BUILD.gn b/build/config/BUILD.gn
+index 4e62965..ea49a53 100644
+--- a/build/config/BUILD.gn
++++ b/build/config/BUILD.gn
+@@ -146,6 +146,8 @@ config("default_libs") {
+       "dl",
+       "m",
+     ]
++  } else if (is_ohos) {
++    libs = [ "dl","hilog_ndk.z" ]
+   } else if (is_linux) {
+     libs = [ "dl" ]
+   }
+diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
+index 87ea4c5..2dc5843 100644
+--- a/build/config/BUILDCONFIG.gn
++++ b/build/config/BUILDCONFIG.gn
+@@ -194,6 +194,7 @@ if (current_os == "win") {
+   is_fuchsia_host = false
+   is_ios = false
+   is_linux = false
++  is_ohos = false
+   is_mac = false
+   is_posix = false
+   is_win = true
+@@ -202,6 +203,7 @@ if (current_os == "win") {
+   is_android = false
+   is_chromeos = false
+   is_fuchsia = false
++  is_ohos = false
+   is_fuchsia_host = false
+   is_ios = false
+   is_linux = false
+@@ -216,6 +218,7 @@ if (current_os == "win") {
+   is_fuchsia_host = false
+   is_ios = false
+   is_linux = false
++  is_ohos = false
+   is_mac = false
+   is_posix = true
+   is_win = false
+@@ -227,6 +230,7 @@ if (current_os == "win") {
+   is_fuchsia_host = false
+   is_ios = false
+   is_linux = true
++  is_ohos = false
+   is_mac = false
+   is_posix = true
+   is_win = false
+@@ -241,6 +245,7 @@ if (current_os == "win") {
+   is_fuchsia_host = false
+   is_ios = false
+   is_linux = false
++  is_ohos = false
+   is_mac = false
+   is_posix = true
+   is_win = false
+@@ -252,6 +257,19 @@ if (current_os == "win") {
+   is_fuchsia_host = false
+   is_ios = true
+   is_linux = false
++  is_ohos = false
++  is_mac = false
++  is_posix = true
++  is_win = false
++  is_wasm = false
++} else if (current_os == "ohos") {
++  is_android = false
++  is_chromeos = false
++  is_fuchsia = false
++  is_fuchsia_host = false
++  is_ios = false
++  is_linux = false
++  is_ohos  = true
+   is_mac = false
+   is_posix = true
+   is_win = false
+@@ -263,6 +281,7 @@ if (current_os == "win") {
+   is_fuchsia_host = false
+   is_ios = false
+   is_linux = true
++  is_ohos = false
+   is_mac = false
+   is_posix = true
+   is_win = false
+@@ -274,6 +293,7 @@ if (current_os == "win") {
+   is_fuchsia_host = false
+   is_ios = false
+   is_linux = false
++  is_ohos = false
+   is_mac = false
+   is_posix = true
+   is_win = false
+@@ -285,6 +305,7 @@ if (current_os == "win") {
+   is_fuchsia_host = false
+   is_ios = false
+   is_linux = false
++  is_ohos = false
+   is_mac = false
+   is_posix = false
+   is_win = false
+@@ -324,7 +345,7 @@ if (!is_clang && using_sanitizer) {
+   is_clang = true
+ }
+ 
+-use_flutter_cxx = is_clang && (is_linux || is_android || is_mac || is_ios)
++use_flutter_cxx = is_clang && (is_linux || is_android || is_mac || is_ios || is_ohos )
+ 
+ if (is_msan && !is_linux) {
+   assert(false, "Memory sanitizer is only available on Linux.")
+@@ -376,7 +397,9 @@ if (is_posix) {
+   ]
+ }
+ 
+-if (is_linux) {
++if (is_ohos || (is_linux && host_os == "mac")) {
++  _native_compiler_configs += [ "//build/config/ohos:sdk" ]
++} else if (is_linux) {
+   _native_compiler_configs += [ "//build/config/linux:sdk" ]
+ } else if (is_mac) {
+   _native_compiler_configs += [ "//build/config/mac:sdk" ]
+@@ -523,8 +546,18 @@ shlib_toolchain = false
+ if (custom_toolchain != "") {
+   assert(custom_sysroot != "")
+   assert(custom_target_triple != "")
+-  host_toolchain = "//build/toolchain/linux:clang_$host_cpu"
+   set_default_toolchain("//build/toolchain/custom")
++  if (host_os == "linux") {
++    if (is_clang) {
++      host_toolchain = "//build/toolchain/linux:clang_$host_cpu"
++    } else {
++      host_toolchain = "//build/toolchain/linux:$host_cpu"
++    }
++  } else if (host_os == "mac") {
++    host_toolchain = "//build/toolchain/mac:clang_$host_cpu"
++  } else {
++    assert(false, "Unknown host for ohos cross compile")
++  }
+ } else if (is_win) {
+   assert(is_clang)
+   host_toolchain = "//build/toolchain/win:clang_$host_cpu"
+@@ -550,6 +583,19 @@ if (custom_toolchain != "") {
+   } else {
+     set_default_toolchain("//build/toolchain/android:$current_cpu")
+   }
++} else if (is_ohos) {
++  set_default_toolchain("//build/toolchain/custom")
++  if (host_os == "linux") {
++    if (is_clang) {
++      host_toolchain = "//build/toolchain/linux:clang_$host_cpu"
++    } else {
++      host_toolchain = "//build/toolchain/linux:$host_cpu"
++    }
++  } else if (host_os == "mac") {
++    host_toolchain = "//build/toolchain/mac:clang_$host_cpu"
++  } else {
++    assert(false, "Unknown host for ohos cross compile")
++  }
+ } else if (is_linux) {
+   if (is_clang) {
+     host_toolchain = "//build/toolchain/linux:clang_$host_cpu"
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index 51d0b97..08b5f08 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -206,10 +206,16 @@ config("compiler") {
+     # CPU architecture. We may or may not be doing a cross compile now, so for
+     # simplicity we always explicitly set the architecture.
+     if (current_cpu == "x64") {
+-      cflags += [
+-        "-m64",
+-        "-march=x86-64",
+-      ]
++      if (is_ohos) {
++        cflags += [
++          "-m64",
++        ]
++      } else {
++        cflags += [
++          "-m64",
++          "-march=x86-64",
++        ]
++      }
+       ldflags += [ "-m64" ]
+     } else if (current_cpu == "x86") {
+       cflags += [ "-m32" ]
+@@ -335,7 +341,7 @@ config("compiler") {
+ 
+   # Linux/Android common flags setup.
+   # ---------------------------------
+-  if (is_linux || is_android) {
++  if (is_linux || is_android || is_ohos) {
+     cflags += [
+       "-fPIC",
+       "-pipe",  # Use pipes for communicating between sub-processes. Faster.
+@@ -354,7 +360,16 @@ config("compiler") {
+ 
+   # Linux-specific compiler flags setup.
+   # ------------------------------------
+-  if (is_linux) {
++  if (is_ohos) {
++    cflags += [ "-pthread" ]
++    ldflags += [ "-pthread" ]
++
++    if (current_cpu == "arm64") {
++      cflags += [ "--target=aarch64-linux-ohos" ]
++      ldflags += [ "--target=aarch64-linux-ohos" ]
++      cflags += [ "-DBORINGSSL_CLANG_SUPPORTS_DOT_ARCH" ]
++    }
++  } else if (is_linux) {
+     cflags += [ "-pthread" ]
+     ldflags += [ "-pthread" ]
+ 
+@@ -532,9 +547,13 @@ config("runtime_library") {
+       ldflags += [ "-nostdlib++" ]
+     }
+     include_dirs = [
+-      "//third_party/libcxx/include",
+       "//third_party/libcxxabi/include",
+     ]
++    if (custom_toolchain != "") {
++      include_dirs += [ "$custom_toolchain/include/c++/v1" ]
++    } else {
++      include_dirs += [ "//third_party/libcxx/include" ]
++    }
+   }
+ 
+   # Android standard library setup.
+@@ -661,7 +680,7 @@ if (is_win) {
+     "-Wno-psabi",
+   ]
+ 
+-  if (!is_android) {
++  if (!is_android && !is_ohos) {
+     default_warning_flags += [
+       # Needed for nlohmann/json.
+       "-Wno-deprecated-literal-operator",
+diff --git a/build/config/ohos/BUILD.gn b/build/config/ohos/BUILD.gn
+new file mode 100644
+index 0000000..b2675d2
+--- /dev/null
++++ b/build/config/ohos/BUILD.gn
+@@ -0,0 +1,29 @@
++# Copyright (c) 2013 The Chromium Authors. All rights reserved.
++# Use of this source code is governed by a BSD-style license that can be
++# found in the LICENSE file.
++
++import("//build/config/ohos/config.gni")
++import("//build/config/ohos/pkg_config.gni")
++import("//build/config/features.gni")
++import("//build/config/sysroot.gni")
++import("//build/config/ui.gni")
++
++config("sdk") {
++  if (sysroot != "") {
++    cflags = [ "--sysroot=" + sysroot ]
++    ldflags = [ "--sysroot=" + sysroot ]
++
++    # Need to get some linker flags out of the sysroot.
++    ldflags += [ exec_script("sysroot_ld_path.py",
++                             [
++                               rebase_path("//build/ohos/sysroot_ld_path.sh",
++                                           root_build_dir),
++                               sysroot,
++                             ],
++                             "value") ]
++  }
++}
++
++config("fontconfig") {
++  libs = [  ]
++}
+diff --git a/build/config/ohos/config.gni b/build/config/ohos/config.gni
+new file mode 100644
+index 0000000..0022d70
+--- /dev/null
++++ b/build/config/ohos/config.gni
+@@ -0,0 +1,13 @@
++# Copyright 2014 The Chromium Authors. All rights reserved.
++# Use of this source code is governed by a BSD-style license that can be
++# found in the LICENSE file.
++
++# This file contains common system config stuff for the Ohos build.
++
++if (is_ohos) {
++  if (current_cpu == "arm64") {
++    ohos_app_abi = "arm64-v8a"
++  } else {
++    assert(false, "Unknown Ohos ABI: " + current_cpu)
++  }
++}
+diff --git a/build/config/ohos/pkg-config.py b/build/config/ohos/pkg-config.py
+new file mode 100644
+index 0000000..b4a6aff
+--- /dev/null
++++ b/build/config/ohos/pkg-config.py
+@@ -0,0 +1,249 @@
++#!/usr/bin/env python3
++#
++# Copyright (c) 2013 The Chromium Authors. All rights reserved.
++# Use of this source code is governed by a BSD-style license that can be
++# found in the LICENSE file.
++
++
++
++import json
++import os
++import subprocess
++import sys
++import re
++from optparse import OptionParser
++
++# This script runs pkg-config, optionally filtering out some results, and
++# returns the result.
++#
++# The result will be [ <includes>, <cflags>, <libs>, <lib_dirs>, <ldflags> ]
++# where each member is itself a list of strings.
++#
++# You can filter out matches using "-v <regexp>" where all results from
++# pkgconfig matching the given regular expression will be ignored. You can
++# specify more than one regular expression my specifying "-v" more than once.
++#
++# You can specify a sysroot using "-s <sysroot>" where sysroot is the absolute
++# system path to the sysroot used for compiling. This script will attempt to
++# generate correct paths for the sysroot.
++#
++# When using a sysroot, you must also specify the architecture via
++# "-a <arch>" where arch is either "x86" or "x64".
++#
++# CrOS systemroots place pkgconfig files at <systemroot>/usr/share/pkgconfig
++# and one of <systemroot>/usr/lib/pkgconfig or <systemroot>/usr/lib64/pkgconfig
++# depending on whether the systemroot is for a 32 or 64 bit architecture. They
++# specify the 'lib' or 'lib64' of the pkgconfig path by defining the
++# 'system_libdir' variable in the args.gn file. pkg_config.gni communicates this
++# variable to this script with the "--system_libdir <system_libdir>" flag. If no
++# flag is provided, then pkgconfig files are assumed to come from
++# <systemroot>/usr/lib/pkgconfig.
++#
++# Additionally, you can specify the option --atleast-version. This will skip
++# the normal outputting of a dictionary and instead print true or false,
++# depending on the return value of pkg-config for the given package.
++
++
++def SetConfigPath(options):
++  """Set the PKG_CONFIG_LIBDIR environment variable.
++
++  This takes into account any sysroot and architecture specification from the
++  options on the given command line.
++  """
++
++  sysroot = options.sysroot
++  assert sysroot
++
++  # Compute the library path name based on the architecture.
++  arch = options.arch
++  if sysroot and not arch:
++    print("You must specify an architecture via -a if using a sysroot.")
++    sys.exit(1)
++
++  libdir = sysroot + '/usr/' + options.system_libdir + '/pkgconfig'
++  libdir += ':' + sysroot + '/usr/share/pkgconfig'
++  os.environ['PKG_CONFIG_LIBDIR'] = libdir
++  return libdir
++
++
++def GetPkgConfigPrefixToStrip(options, args):
++  """Returns the prefix from pkg-config where packages are installed.
++
++  This returned prefix is the one that should be stripped from the beginning of
++  directory names to take into account sysroots.
++  """
++  # Some sysroots, like the Chromium OS ones, may generate paths that are not
++  # relative to the sysroot. For example,
++  # /path/to/chroot/build/x86-generic/usr/lib/pkgconfig/pkg.pc may have all
++  # paths relative to /path/to/chroot (i.e. prefix=/build/x86-generic/usr)
++  # instead of relative to /path/to/chroot/build/x86-generic (i.e prefix=/usr).
++  # To support this correctly, it's necessary to extract the prefix to strip
++  # from pkg-config's |prefix| variable.
++  prefix = subprocess.check_output([options.pkg_config,
++      "--variable=prefix"] + args, env=os.environ).decode('utf-8')
++  if prefix[-4] == '/usr':
++    return prefix[4:]
++  return prefix
++
++
++def MatchesAnyRegexp(flag, list_of_regexps):
++  """Returns true if the first argument matches any regular expression in the
++  given list."""
++  for regexp in list_of_regexps:
++    if regexp.search(flag) != None:
++      return True
++  return False
++
++
++def RewritePath(path, strip_prefix, sysroot):
++  """Rewrites a path by stripping the prefix and prepending the sysroot."""
++  if os.path.isabs(path) and not path.startswith(sysroot):
++    if path.startswith(strip_prefix):
++      path = path[len(strip_prefix):]
++    path = path.lstrip('/')
++    return os.path.join(sysroot, path)
++  else:
++    return path
++
++
++def main():
++  # If this is run on non-Linux platforms, just return nothing and indicate
++  # success. This allows us to "kind of emulate" a Linux build from other
++  # platforms.
++  if "linux" not in sys.platform:
++    print("[[],[],[],[],[]]")
++    return 0
++
++  parser = OptionParser()
++  parser.add_option('-d', '--debug', action='store_true')
++  parser.add_option('-p', action='store', dest='pkg_config', type='string',
++                    default='pkg-config')
++  parser.add_option('-v', action='append', dest='strip_out', type='string')
++  parser.add_option('-s', action='store', dest='sysroot', type='string')
++  parser.add_option('-a', action='store', dest='arch', type='string')
++  parser.add_option('--system_libdir', action='store', dest='system_libdir',
++                    type='string', default='lib')
++  parser.add_option('--atleast-version', action='store',
++                    dest='atleast_version', type='string')
++  parser.add_option('--libdir', action='store_true', dest='libdir')
++  parser.add_option('--dridriverdir', action='store_true', dest='dridriverdir')
++  parser.add_option('--version-as-components', action='store_true',
++                    dest='version_as_components')
++  (options, args) = parser.parse_args()
++
++  # Make a list of regular expressions to strip out.
++  strip_out = []
++  if options.strip_out != None:
++    for regexp in options.strip_out:
++      strip_out.append(re.compile(regexp))
++
++  if options.sysroot:
++    libdir = SetConfigPath(options)
++    if options.debug:
++      sys.stderr.write('PKG_CONFIG_LIBDIR=%s\n' % libdir)
++    prefix = GetPkgConfigPrefixToStrip(options, args)
++  else:
++    prefix = ''
++
++  if options.atleast_version:
++    # When asking for the return value, just run pkg-config and print the return
++    # value, no need to do other work.
++    if not subprocess.call([options.pkg_config,
++                            "--atleast-version=" + options.atleast_version] +
++                            args):
++      print("true")
++    else:
++      print("false")
++    return 0
++
++  if options.version_as_components:
++    cmd = [options.pkg_config, "--modversion"] + args
++    try:
++      version_string = subprocess.check_output(cmd).decode('utf-8')
++    except:
++      sys.stderr.write('Error from pkg-config.\n')
++      return 1
++    print(json.dumps(list(map(int, version_string.strip().split(".")))))
++    return 0
++
++
++  if options.libdir:
++    cmd = [options.pkg_config, "--variable=libdir"] + args
++    if options.debug:
++      sys.stderr.write('Running: %s\n' % cmd)
++    try:
++      libdir = subprocess.check_output(cmd).decode('utf-8')
++    except:
++      print("Error from pkg-config.")
++      return 1
++    sys.stdout.write(libdir.strip())
++    return 0
++
++  if options.dridriverdir:
++    cmd = [options.pkg_config, "--variable=dridriverdir"] + args
++    if options.debug:
++      sys.stderr.write('Running: %s\n' % cmd)
++    try:
++      dridriverdir = subprocess.check_output(cmd).decode('utf-8')
++    except:
++      print("Error from pkg-config.")
++      return 1
++    sys.stdout.write(dridriverdir.strip())
++    return
++
++  cmd = [options.pkg_config, "--cflags", "--libs"] + args
++  if options.debug:
++    sys.stderr.write('Running: %s\n' % ' '.join(cmd))
++
++  try:
++    flag_string = subprocess.check_output(cmd).decode('utf-8')
++  except:
++    sys.stderr.write('Could not run pkg-config.\n')
++    return 1
++
++  # For now just split on spaces to get the args out. This will break if
++  # pkgconfig returns quoted things with spaces in them, but that doesn't seem
++  # to happen in practice.
++  all_flags = flag_string.strip().split(' ')
++
++
++  sysroot = options.sysroot
++  if not sysroot:
++    sysroot = ''
++
++  includes = []
++  cflags = []
++  libs = []
++  lib_dirs = []
++
++  for flag in all_flags[:]:
++    if len(flag) == 0 or MatchesAnyRegexp(flag, strip_out):
++      continue;
++
++    if flag[:2] == '-l':
++      libs.append(RewritePath(flag[2:], prefix, sysroot))
++    elif flag[:2] == '-L':
++      lib_dirs.append(RewritePath(flag[2:], prefix, sysroot))
++    elif flag[:2] == '-I':
++      includes.append(RewritePath(flag[2:], prefix, sysroot))
++    elif flag[:3] == '-Wl':
++      # Don't allow libraries to control ld flags.  These should be specified
++      # only in build files.
++      pass
++    elif flag == '-pthread':
++      # Many libs specify "-pthread" which we don't need since we always include
++      # this anyway. Removing it here prevents a bunch of duplicate inclusions
++      # on the command line.
++      pass
++    else:
++      cflags.append(flag)
++
++  # Output a GN array, the first one is the cflags, the second are the libs. The
++  # JSON formatter prints GN compatible lists when everything is a list of
++  # strings.
++  print(json.dumps([includes, cflags, libs, lib_dirs]))
++  return 0
++
++
++if __name__ == '__main__':
++  sys.exit(main())
+diff --git a/build/config/ohos/pkg_config.gni b/build/config/ohos/pkg_config.gni
+new file mode 100644
+index 0000000..f970ac1
+--- /dev/null
++++ b/build/config/ohos/pkg_config.gni
+@@ -0,0 +1,131 @@
++# Copyright (c) 2013 The Chromium Authors. All rights reserved.
++# Use of this source code is governed by a BSD-style license that can be
++# found in the LICENSE file.
++
++import("//build/config/sysroot.gni")
++
++# Defines a config specifying the result of running pkg-config for the given
++# packages. Put the package names you want to query in the "packages" variable
++# inside the template invocation.
++#
++# You can also add defines via the "defines" variable. This can be useful to
++# add this to the config to pass defines that the library expects to get by
++# users of its headers.
++#
++# Example:
++#   pkg_config("mything") {
++#     packages = [ "mything1", "mything2" ]
++#     defines = [ "ENABLE_AWESOME" ]
++#   }
++#
++# You can also use "extra args" to filter out results (see pkg-config.py):
++#   extra_args = [ "-v, "foo" ]
++# To ignore libs and ldflags (only cflags/defines will be set, which is useful
++# when doing manual dynamic linking), set:
++#   ignore_libs = true
++
++declare_args() {
++  # A pkg-config wrapper to call instead of trying to find and call the right
++  # pkg-config directly. Wrappers like this are common in cross-compilation
++  # environments.
++  # Leaving it blank defaults to searching PATH for 'pkg-config' and relying on
++  # the sysroot mechanism to find the right .pc files.
++  pkg_config = ""
++
++  # A optional pkg-config wrapper to use for tools built on the host.
++  host_pkg_config = ""
++
++  # CrOS systemroots place pkgconfig files at <systemroot>/usr/share/pkgconfig
++  # and one of <systemroot>/usr/lib/pkgconfig or <systemroot>/usr/lib64/pkgconfig
++  # depending on whether the systemroot is for a 32 or 64 bit architecture.
++  #
++  # When build under GYP, CrOS board builds specify the 'system_libdir' variable
++  # as part of the GYP_DEFINES provided by the CrOS emerge build or simple
++  # chrome build scheme. This variable permits controlling this for GN builds
++  # in similar fashion by setting the `system_libdir` variable in the build's
++  # args.gn file to 'lib' or 'lib64' as appropriate for the target architecture.
++  system_libdir = "lib"
++}
++
++pkg_config_script = "//build/config/ohos/pkg-config.py"
++
++# Define the args we pass to the pkg-config script for other build files that
++# need to invoke it manually.
++pkg_config_args = []
++
++if (sysroot != "") {
++  # Pass the sysroot if we're using one (it requires the CPU arch also).
++  pkg_config_args += [
++    "-s",
++    rebase_path(sysroot),
++    "-a",
++    current_cpu,
++  ]
++}
++
++if (pkg_config != "") {
++  pkg_config_args += [
++    "-p",
++    pkg_config,
++  ]
++}
++
++# Only use the custom libdir when building with the target sysroot.
++if (target_sysroot != "" && sysroot == target_sysroot) {
++  pkg_config_args += [
++    "--system_libdir",
++    system_libdir,
++  ]
++}
++
++if (host_pkg_config != "") {
++  host_pkg_config_args = [
++    "-p",
++    host_pkg_config,
++  ]
++} else {
++  host_pkg_config_args = pkg_config_args
++}
++
++template("pkg_config") {
++  assert(defined(invoker.packages),
++         "Variable |packages| must be defined to be a list in pkg_config.")
++  config(target_name) {
++    if (host_toolchain == current_toolchain) {
++      args = host_pkg_config_args + invoker.packages
++    } else {
++      args = pkg_config_args + invoker.packages
++    }
++    if (defined(invoker.extra_args)) {
++      args += invoker.extra_args
++    }
++
++    pkgresult = exec_script(pkg_config_script, args, "value")
++    cflags = pkgresult[1]
++
++    foreach(include, pkgresult[0]) {
++      if (sysroot != "") {
++        # We want the system include paths to use -isystem instead of -I to
++        # suppress warnings in those headers.
++        include_relativized = rebase_path(include, root_build_dir)
++        cflags += [ "-isystem$include_relativized" ]
++      } else {
++        cflags += [ "-I$include" ]
++      }
++    }
++
++    if (!defined(invoker.ignore_libs) || !invoker.ignore_libs) {
++      libs = pkgresult[2]
++      lib_dirs = pkgresult[3]
++    }
++
++    forward_variables_from(invoker,
++                           [
++                             "defines",
++                             "visibility",
++                           ])
++  }
++}
++
++OHOS_NDK_ROOT = target_sysroot
++OHOS_NDK_LIB = "$OHOS_NDK_ROOT/usr/aarch64-linux-ohos"
+diff --git a/build/config/ohos/sysroot_ld_path.py b/build/config/ohos/sysroot_ld_path.py
+new file mode 100644
+index 0000000..2cde6e2
+--- /dev/null
++++ b/build/config/ohos/sysroot_ld_path.py
+@@ -0,0 +1,21 @@
++# Copyright (c) 2013 The Chromium Authors. All rights reserved.
++# Use of this source code is governed by a BSD-style license that can be
++# found in the LICENSE file.
++
++# This file takes two arguments, the relative location of the shell script that
++# does the checking, and the name of the sysroot.
++
++# TODO(brettw) the build/linux/sysroot_ld_path.sh script should be rewritten in
++# Python in this file.
++
++import subprocess
++import sys
++
++if len(sys.argv) != 3:
++  print("Need two arguments")
++  sys.exit(1)
++
++result = subprocess.check_output([sys.argv[1], sys.argv[2]],
++                                 universal_newlines=True).strip()
++
++print('"%s"' % result)
+diff --git a/build/config/sysroot.gni b/build/config/sysroot.gni
+index 727a6b1..9f68166 100644
+--- a/build/config/sysroot.gni
++++ b/build/config/sysroot.gni
+@@ -22,8 +22,10 @@ if (current_toolchain == default_toolchain && target_sysroot != "") {
+ } else if (is_android) {
+   import("//build/config/android/config.gni")
+   sysroot = rebase_path("$android_toolchain_root/sysroot", root_build_dir)
++} else if (is_ohos) {
++  sysroot = target_sysroot
+ } else if (is_linux && !is_chromeos) {
+-  if (use_default_linux_sysroot && !is_fuchsia) {
++  if (use_default_linux_sysroot) {
+     if (current_cpu == "x64") {
+       sysroot =
+           rebase_path("//build/linux/debian_sid_amd64-sysroot", root_build_dir)
+diff --git a/build/ohos/ohos_create_flutter_har.py b/build/ohos/ohos_create_flutter_har.py
+new file mode 100644
+index 0000000..fc46359
+--- /dev/null
++++ b/build/ohos/ohos_create_flutter_har.py
+@@ -0,0 +1,133 @@
++#!/usr/bin/env python3
++#
++# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd.
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++#     http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
++"""Create a HAR incorporating all the components required to build a Flutter application"""
++
++import argparse
++import logging
++import os
++import re
++import shutil
++import subprocess
++import sys
++
++
++HAR_CONFIG_TEMPLATE = """
++{
++  "app": {
++    "signingConfigs": [],
++    "products": [
++      {
++        "name": "default",
++        "signingConfig": "default",
++        "compileSdkVersion": "%s",
++        "compatibleSdkVersion": "%s",
++        "runtimeOS": "HarmonyOS",
++      }
++    ],
++    "buildModeSet": [
++      {
++        "name": "debug",
++      },
++      {
++        "name": "release"
++      },
++      {
++        "name": "profile"
++      },
++    ]
++  },
++  "modules": [
++    {
++      "name": "flutter",
++      "srcPath": "./flutter"
++    }
++  ]
++}
++"""
++
++
++# 更新har的配置文件，指定编译使用的api版本
++def updateConfig(buildDir, apiInt):
++    apiStr = "4.1.0(11)" if apiInt == 11 else "5.0.0(12)"
++    jsonFile = os.path.join(buildDir, "build-profile.json5")
++    with open(jsonFile, "w", encoding="utf-8") as file:
++        file.write(HAR_CONFIG_TEMPLATE % (apiStr, apiStr))
++
++
++# 执行命令
++def runCommand(command, checkCode=True, timeout=None):
++    logging.info("runCommand start, command = %s" % (command))
++    code = subprocess.Popen(command, shell=True).wait(timeout)
++    if code != 0:
++        logging.error("runCommand error, code = %s, command = %s" % (code, command))
++        if checkCode:
++            exit(code)
++    else:
++        logging.info("runCommand finish, code = %s, command = %s" % (code, command))
++
++
++# 编译har文件，通过hvigorw的命令行参数指定编译类型(debug/release/profile)
++def buildHar(buildDir, apiInt, buildType):
++    updateConfig(buildDir, apiInt)
++    runCommand(
++        "cd %s && hvigorw clean --mode module " % (buildDir)
++        + "-p module=flutter@default -p product=default -p buildMode=%s " % buildType
++        + "assembleHar --no-daemon"
++    )
++
++
++def main():
++    parser = argparse.ArgumentParser()
++    parser.add_argument("--embedding_src", help="Path of embedding source code.")
++    parser.add_argument("--build_dir", help="Path to build.")
++    parser.add_argument(
++        "--build_type",
++        choices=["debug", "release", "profile"],
++        help="Type to build har.",
++    )
++    parser.add_argument("--output", help="Path to output har.")
++    parser.add_argument("--native_lib", action="append", help="Native code library.")
++    parser.add_argument("--ohos_abi", help="Native code ABI.")
++    parser.add_argument(
++        "--ohos_api_int", type=int, choices=[11, 12], help="Ohos api int."
++    )
++    options = parser.parse_args()
++    # copy source code
++    if os.path.exists(options.build_dir):
++        shutil.rmtree(options.build_dir)
++    shutil.copytree(options.embedding_src, options.build_dir)
++
++    # copy so files
++    for file in options.native_lib:
++        dir_name, full_file_name = os.path.split(file)
++        targetDir = os.path.join(options.build_dir, "flutter/libs", options.ohos_abi)
++        if not os.path.exists(targetDir):
++            os.makedirs(targetDir)
++        shutil.copyfile(
++            file,
++            os.path.join(targetDir, full_file_name),
++        )
++    buildHar(options.build_dir, options.ohos_api_int, options.build_type)
++    shutil.copyfile(
++        os.path.join(
++            options.build_dir, "flutter/build/default/outputs/default/flutter.har"
++        ),
++        options.output,
++    )
++
++
++if __name__ == "__main__":
++    sys.exit(main())
+diff --git a/build/ohos/sysroot_ld_path.sh b/build/ohos/sysroot_ld_path.sh
+new file mode 100755
+index 0000000..4b8bf73
+--- /dev/null
++++ b/build/ohos/sysroot_ld_path.sh
+@@ -0,0 +1,100 @@
++#!/bin/sh
++# Copyright (c) 2013 The Chromium Authors. All rights reserved.
++# Use of this source code is governed by a BSD-style license that can be
++# found in the LICENSE file.
++
++# Reads etc/ld.so.conf and/or etc/ld.so.conf.d/*.conf and returns the
++# appropriate linker flags.
++#
++#  sysroot_ld_path.sh /abspath/to/sysroot
++#
++
++log_error_and_exit() {
++  echo $0: $@
++  exit 1
++}
++
++process_entry() {
++  if [ -z "$1" ] || [ -z "$2" ]; then
++    log_error_and_exit "bad arguments to process_entry()"
++  fi
++  local root="$1"
++  local localpath="$2"
++
++  echo $localpath | grep -qs '^/'
++  if [ $? -ne 0 ]; then
++    log_error_and_exit $localpath does not start with /
++  fi
++  local entry="$root$localpath"
++  echo -L$entry
++  echo -Wl,-rpath-link=$entry
++}
++
++process_ld_so_conf() {
++  if [ -z "$1" ] || [ -z "$2" ]; then
++    log_error_and_exit "bad arguments to process_ld_so_conf()"
++  fi
++  local root="$1"
++  local ld_so_conf="$2"
++
++  # ld.so.conf may include relative include paths. pushd is a bashism.
++  local saved_pwd=$(pwd)
++  cd $(dirname "$ld_so_conf")
++
++  cat "$ld_so_conf" | \
++    while read ENTRY; do
++      echo "$ENTRY" | grep -qs ^include
++      if [ $? -eq 0 ]; then
++        local included_files=$(echo "$ENTRY" | sed 's/^include //')
++        echo "$included_files" | grep -qs ^/
++        if [ $? -eq 0 ]; then
++          if ls $root$included_files >/dev/null 2>&1 ; then
++            for inc_file in $root$included_files; do
++              process_ld_so_conf "$root" "$inc_file"
++            done
++          fi
++        else
++          if ls $(pwd)/$included_files >/dev/null 2>&1 ; then
++            for inc_file in $(pwd)/$included_files; do
++              process_ld_so_conf "$root" "$inc_file"
++            done
++          fi
++        fi
++        continue
++      fi
++
++      echo "$ENTRY" | grep -qs ^/
++      if [ $? -eq 0 ]; then
++        process_entry "$root" "$ENTRY"
++      fi
++    done
++
++  # popd is a bashism
++  cd "$saved_pwd"
++}
++
++# Main
++
++if [ $# -ne 1 ]; then
++  echo Usage $0 /abspath/to/sysroot
++  exit 1
++fi
++
++echo $1 | grep -qs ' '
++if [ $? -eq 0 ]; then
++  log_error_and_exit $1 contains whitespace.
++fi
++
++LD_SO_CONF="$1/etc/ld.so.conf"
++LD_SO_CONF_D="$1/etc/ld.so.conf.d"
++
++if [ -e "$LD_SO_CONF" ]; then
++  process_ld_so_conf "$1" "$LD_SO_CONF" | xargs echo
++elif [ -e "$LD_SO_CONF_D" ]; then
++  find "$LD_SO_CONF_D" -maxdepth 1 -name '*.conf' -print -quit > /dev/null
++  if [ $? -eq 0 ]; then
++    for entry in $LD_SO_CONF_D/*.conf; do
++      process_ld_so_conf "$1" "$entry"
++    done | xargs echo
++  fi
++fi
+diff --git a/build/toolchain/custom/BUILD.gn b/build/toolchain/custom/BUILD.gn
+index 3da5f93..05de4d7 100644
+--- a/build/toolchain/custom/BUILD.gn
++++ b/build/toolchain/custom/BUILD.gn
+@@ -12,11 +12,11 @@ toolchain("custom") {
+   # these values in our scope.
+   cc = "${toolchain_bin}/clang"
+   cxx = "${toolchain_bin}/clang++"
+-  ar = "${toolchain_bin}/${custom_target_triple}-ar"
++  ar = "${toolchain_bin}/llvm-ar"
+   ld = "${toolchain_bin}/clang++"
+-  readelf = "${toolchain_bin}/${custom_target_triple}-readelf"
+-  nm = "${toolchain_bin}/${custom_target_triple}-nm"
+-  strip = "${toolchain_bin}/${custom_target_triple}-strip"
++  readelf = "${toolchain_bin}/llvm-readelf"
++  nm = "${toolchain_bin}/llvm-nm"
++  strip = "${toolchain_bin}/llvm-strip"
+ 
+   target_triple_flags = "--target=${custom_target_triple}"
+   sysroot_flags = "--sysroot ${custom_sysroot}"
diff --git a/attachment/repos/build.patch b/attachment/repos/build.patch
index 7dd52e5b16332809ddd85dcf3a179af9737c7778..bbe17f9809dd6752ee533c0b15c1ec6c84574e57 100644
--- a/attachment/repos/build.patch
+++ b/attachment/repos/build.patch
@@ -102,16 +102,16 @@ index b8d0f47..a3d1ed9 100644
 @@ -313,7 +334,7 @@ if (!is_clang && using_sanitizer) {
    is_clang = true
  }
- 
+
 -use_flutter_cxx = is_clang && (is_linux || is_android || is_mac || is_ios)
 +use_flutter_cxx = is_clang && (is_linux || is_android || is_mac || is_ios || is_ohos )
- 
+
  if (is_msan && !is_linux) {
    assert(false, "Memory sanitizer is only available on Linux.")
 @@ -365,7 +386,9 @@ if (is_posix) {
    ]
  }
- 
+
 -if (is_linux) {
 +if (is_ohos || (is_linux && host_os == "mac")) {
 +  _native_compiler_configs += [ "//build/config/ohos:sdk" ]
@@ -160,7 +160,7 @@ index b8d0f47..a3d1ed9 100644
    if (is_clang) {
      host_toolchain = "//build/toolchain/linux:clang_$host_cpu"
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index ba20010..67371f5 100644
+index ba20010..17e0487 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
 @@ -191,10 +191,16 @@ config("compiler") {
@@ -185,7 +185,7 @@ index ba20010..67371f5 100644
      } else if (current_cpu == "x86") {
        cflags += [ "-m32" ]
 @@ -315,7 +321,7 @@ config("compiler") {
- 
+
    # Linux/Android common flags setup.
    # ---------------------------------
 -  if (is_linux || is_android) {
@@ -194,7 +194,7 @@ index ba20010..67371f5 100644
        "-fPIC",
        "-pipe",  # Use pipes for communicating between sub-processes. Faster.
 @@ -334,7 +340,16 @@ config("compiler") {
- 
+
    # Linux-specific compiler flags setup.
    # ------------------------------------
 -  if (is_linux) {
@@ -210,7 +210,7 @@ index ba20010..67371f5 100644
 +  } else if (is_linux) {
      cflags += [ "-pthread" ]
      ldflags += [ "-pthread" ]
- 
+
 @@ -521,9 +536,13 @@ config("runtime_library") {
        ldflags += [ "-nostdlib++" ]
      }
@@ -224,8 +224,45 @@ index ba20010..67371f5 100644
 +      include_dirs += [ "//third_party/libcxx/include" ]
 +    }
    }
- 
+
    # Android standard library setup.
+@@ -860,17 +879,35 @@ config("optimize") {
+     cflags = [ "-Oz" ] + common_optimize_on_cflags  # Favor size over speed.
+   } else if (is_wasm) {
+     cflags = [ "-Oz" ]
++  } else if (is_ohos) {
++      cflags = [ "-O3" ] + common_optimize_on_cflags
+   } else {
+     cflags = [ "-O2" ] + common_optimize_on_cflags
+   }
+
+   lto_flags = []
+-  if (enable_lto && (is_ios || is_android || is_fuchsia || is_wasm)) {
++  if (enable_lto && (is_ios || is_android || is_fuchsia || is_wasm || is_ohos)) {
+     lto_flags += [ "-flto" ]
+   }
+
++  if (is_ohos) {
++    cflags += [
++      "-mcpu=tsv110",
++      "-fwhole-program-vtables",
++    ]
++  }
++
+   ldflags = common_optimize_on_ldflags + lto_flags
+   cflags += lto_flags
++
++  if (is_ohos) {
++    ldflags += [
++      "-Wl,--lto-O2",
++      "-Wl,--plugin-opt=-mcpu=tsv110",
++      "-Wl,-mllvm",
++      "-Wl,-wholeprogramdevirt-check=fallback",
++    ]
++  }
+ }
+
+ # Turn off optimizations.
 diff --git a/build/config/ohos/BUILD.gn b/build/config/ohos/BUILD.gn
 new file mode 100644
 index 0000000..b2675d2
@@ -715,145 +752,6 @@ index 7987e51..cd7b060 100644
      if (current_cpu == "x64") {
        sysroot = rebase_path("//build/linux/debian_sid_amd64-sysroot")
      } else {
-diff --git a/build/ohos/ohos_create_flutter_har.py b/build/ohos/ohos_create_flutter_har.py
-new file mode 100644
-index 0000000..fc46359
---- /dev/null
-+++ b/build/ohos/ohos_create_flutter_har.py
-@@ -0,0 +1,133 @@
-+#!/usr/bin/env python3
-+#
-+# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd.
-+# Licensed under the Apache License, Version 2.0 (the "License");
-+# you may not use this file except in compliance with the License.
-+# You may obtain a copy of the License at
-+#
-+#     http://www.apache.org/licenses/LICENSE-2.0
-+#
-+# Unless required by applicable law or agreed to in writing, software
-+# distributed under the License is distributed on an "AS IS" BASIS,
-+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+# See the License for the specific language governing permissions and
-+# limitations under the License.
-+
-+"""Create a HAR incorporating all the components required to build a Flutter application"""
-+
-+import argparse
-+import logging
-+import os
-+import re
-+import shutil
-+import subprocess
-+import sys
-+
-+
-+HAR_CONFIG_TEMPLATE = """
-+{
-+  "app": {
-+    "signingConfigs": [],
-+    "products": [
-+      {
-+        "name": "default",
-+        "signingConfig": "default",
-+        "compileSdkVersion": "%s",
-+        "compatibleSdkVersion": "%s",
-+        "runtimeOS": "HarmonyOS",
-+      }
-+    ],
-+    "buildModeSet": [
-+      {
-+        "name": "debug",
-+      },
-+      {
-+        "name": "release"
-+      },
-+      {
-+        "name": "profile"
-+      },
-+    ]
-+  },
-+  "modules": [
-+    {
-+      "name": "flutter",
-+      "srcPath": "./flutter"
-+    }
-+  ]
-+}
-+"""
-+
-+
-+# 更新har的配置文件，指定编译使用的api版本
-+def updateConfig(buildDir, apiInt):
-+    apiStr = "4.1.0(11)" if apiInt == 11 else "4.0.0(10)"
-+    jsonFile = os.path.join(buildDir, "build-profile.json5")
-+    with open(jsonFile, "w", encoding="utf-8") as file:
-+        file.write(HAR_CONFIG_TEMPLATE % (apiStr, apiStr))
-+
-+
-+# 执行命令
-+def runCommand(command, checkCode=True, timeout=None):
-+    logging.info("runCommand start, command = %s" % (command))
-+    code = subprocess.Popen(command, shell=True).wait(timeout)
-+    if code != 0:
-+        logging.error("runCommand error, code = %s, command = %s" % (code, command))
-+        if checkCode:
-+            exit(code)
-+    else:
-+        logging.info("runCommand finish, code = %s, command = %s" % (code, command))
-+
-+
-+# 编译har文件，通过hvigorw的命令行参数指定编译类型(debug/release/profile)
-+def buildHar(buildDir, apiInt, buildType):
-+    updateConfig(buildDir, apiInt)
-+    runCommand(
-+        "cd %s && .%shvigorw clean --mode module " % (buildDir, os.sep)
-+        + "-p module=flutter@default -p product=default -p buildMode=%s " % buildType
-+        + "assembleHar --no-daemon"
-+    )
-+
-+
-+def main():
-+    parser = argparse.ArgumentParser()
-+    parser.add_argument("--embedding_src", help="Path of embedding source code.")
-+    parser.add_argument("--build_dir", help="Path to build.")
-+    parser.add_argument(
-+        "--build_type",
-+        choices=["debug", "release", "profile"],
-+        help="Type to build har.",
-+    )
-+    parser.add_argument("--output", help="Path to output har.")
-+    parser.add_argument("--native_lib", action="append", help="Native code library.")
-+    parser.add_argument("--ohos_abi", help="Native code ABI.")
-+    parser.add_argument(
-+        "--ohos_api_int", type=int, choices=[10, 11], help="Ohos api int."
-+    )
-+    options = parser.parse_args()
-+    # copy source code
-+    if os.path.exists(options.build_dir):
-+        shutil.rmtree(options.build_dir)
-+    shutil.copytree(options.embedding_src, options.build_dir)
-+
-+    # copy so files
-+    for file in options.native_lib:
-+        dir_name, full_file_name = os.path.split(file)
-+        targetDir = os.path.join(options.build_dir, "flutter/libs", options.ohos_abi)
-+        if not os.path.exists(targetDir):
-+            os.makedirs(targetDir)
-+        shutil.copyfile(
-+            file,
-+            os.path.join(targetDir, full_file_name),
-+        )
-+    buildHar(options.build_dir, options.ohos_api_int, options.build_type)
-+    shutil.copyfile(
-+        os.path.join(
-+            options.build_dir, "flutter/build/default/outputs/default/flutter.har"
-+        ),
-+        options.output,
-+    )
-+
-+
-+if __name__ == "__main__":
-+    sys.exit(main())
 diff --git a/build/ohos/sysroot_ld_path.sh b/build/ohos/sysroot_ld_path.sh
 new file mode 100755
 index 0000000..4b8bf73
@@ -966,7 +864,7 @@ index cad6cbc..c17950b 100644
 +++ b/build/secondary/third_party/glfw/BUILD.gn
 @@ -47,6 +47,34 @@ source_set("glfw") {
      ]
- 
+
      defines = [ "_GLFW_WIN32" ]
 +  } else if (is_ohos) {
 +    sources += [
@@ -1016,6 +914,6 @@ index 65b1623..a89742a 100644
 +  readelf = "${toolchain_bin}/llvm-readelf"
 +  nm = "${toolchain_bin}/llvm-nm"
 +  strip = "${toolchain_bin}/llvm-strip"
- 
+
    target_triple_flags = "--target=${custom_target_triple}"
    sysroot_flags = "--sysroot ${custom_sysroot}"
diff --git a/attachment/repos/dart.3.4.0.patch b/attachment/repos/dart.3.4.0.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ced7b0b205dd283128f16bc7d27ec4f3ebe17828
--- /dev/null
+++ b/attachment/repos/dart.3.4.0.patch
@@ -0,0 +1,8463 @@
+diff --git a/BUILD.gn b/BUILD.gn
+index 22078180b94..e5aa4e0c8f0 100644
+--- a/BUILD.gn
++++ b/BUILD.gn
+@@ -70,7 +70,7 @@ group("runtime") {
+     ]
+   }
+ 
+-  if (is_linux || is_android) {
++  if (is_linux || is_android || is_ohos) {
+     deps += [ "runtime/bin:abstract_socket_test" ]
+   } else if (is_fuchsia) {
+     deps += [ ":fuchsia_test_package" ]
+@@ -88,7 +88,7 @@ group("runtime_precompiled") {
+     "runtime/bin:dart_precompiled_runtime",
+     "runtime/bin:process_test",
+   ]
+-  if (is_linux || is_android) {
++  if (is_linux || is_android || is_ohos) {
+     deps += [ "runtime/bin:abstract_socket_test" ]
+   }
+ }
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index 551817d5e32..d606a4a4a14 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -254,7 +254,7 @@ config("compiler") {
+ 
+   # Linux/Android common flags setup.
+   # ---------------------------------
+-  if (is_linux || is_android) {
++  if (is_linux || is_android || is_ohos) {
+     ldflags += [
+       "-Wl,-z,noexecstack",
+       "-Wl,-z,now",
+@@ -263,7 +263,7 @@ config("compiler") {
+     ]
+   }
+ 
+-  if (is_android || is_linux || is_mac || is_fuchsia) {
++  if (is_android || is_linux || is_mac || is_fuchsia || is_ohos) {
+     if (use_flutter_cxx) {
+       # shared_library_config isn't transitive, so we don't automatically get
+       # another versions of libcxx with and without -fPIC. Properly setting this
+@@ -281,7 +281,7 @@ config("compiler") {
+ 
+   # Linux-specific compiler flags setup.
+   # ------------------------------------
+-  if (is_linux) {
++  if (is_linux || is_ohos) {
+     if (is_clang) {
+       if (dart_sysroot == "alpine") {
+         # alpine linux target names can be found at:
+@@ -405,7 +405,7 @@ config("compiler") {
+   # changes since artifacts from an older version of the toolchain may or may
+   # not be compatible with newer ones. To achieve this, we insert a synthetic
+   # define into the compile line.
+-  if (is_clang && (is_linux || is_mac) && dart_sysroot != "alpine") {
++  if (is_clang && (is_linux || is_mac || is_ohos) && dart_sysroot != "alpine") {
+     if (is_linux && host_cpu == "arm64") {
+       toolchain_stamp_file =
+           "//buildtools/linux-arm64/clang/.versions/clang.cipd_version"
+@@ -586,6 +586,11 @@ config("runtime_library") {
+       "dl",
+       "pthread",
+     ]
++  } else if (is_ohos) {
++    libs += [
++      "dl",
++      "pthread",
++    ]
+   } else if (is_android) {
+     # Android standard library setup.
+ 
+@@ -682,7 +687,7 @@ if (is_win) {
+ 
+   # The Raspberry Pi 1 toolchain enables this warning, but Dart doesn't build
+   # cleanly with it.
+-  if (is_linux && !is_clang && current_cpu == "arm" && arm_version == 6) {
++  if ((is_linux || is_ohos) && !is_clang && current_cpu == "arm" && arm_version == 6) {
+     default_warning_flags += [ "-Wno-type-limits" ]
+   }
+ 
+diff --git a/build/config/sanitizers/sanitizers.gni b/build/config/sanitizers/sanitizers.gni
+index 2fcf3163f42..01eb25cb7c5 100644
+--- a/build/config/sanitizers/sanitizers.gni
++++ b/build/config/sanitizers/sanitizers.gni
+@@ -3,6 +3,12 @@
+ # found in the LICENSE file.
+ 
+ declare_args() {
++  # Use libc++ (buildtools/third_party/libc++ and
++  # buildtools/third_party/libc++abi) instead of stdlibc++ as standard library.
++  # This is intended to be used for instrumented builds.
++  use_custom_libcxx =
++      (is_asan && (is_linux || is_ohos)) || is_lsan || is_msan || is_tsan || is_ubsan
++
+   # Track where uninitialized memory originates from. From fastest to slowest:
+   # 0 - no tracking, 1 - track only the initial allocation site, 2 - track the
+   # chain of stores leading from allocation site to use site.
+diff --git a/build/config/sysroot.gni b/build/config/sysroot.gni
+index 2a6cab96af9..41a335fc8ec 100644
+--- a/build/config/sysroot.gni
++++ b/build/config/sysroot.gni
+@@ -15,7 +15,7 @@ declare_args() {
+   dart_sysroot = ""
+ }
+ 
+-if (is_linux) {
++if (is_linux || is_ohos) {
+   if (dart_sysroot == "alpine") {
+     if (current_cpu == "x86") {
+       target_sysroot =
+diff --git a/build/rust/rust.gni b/build/rust/rust.gni
+index 0a8cdc13970..8bdbf6a1ff5 100644
+--- a/build/rust/rust.gni
++++ b/build/rust/rust.gni
+@@ -27,6 +27,8 @@ template("rust_library") {
+   cargo_out_dir = target_out_dir
+   if (is_linux) {
+     rust_os = "unknown-linux-gnu"
++  } else if (is_ohos) {
++    rust_os = "unknown-linux-gnu"
+   } else if (is_mac) {
+     rust_os = "apple-darwin"
+   } else if (is_win) {
+diff --git a/build/sanitizers/BUILD.gn b/build/sanitizers/BUILD.gn
+index e9f8c7a55cd..b1df3aef772 100644
+--- a/build/sanitizers/BUILD.gn
++++ b/build/sanitizers/BUILD.gn
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+ 
+-if (is_linux && !is_chromeos) {
++if ((is_linux || is_ohos) && !is_chromeos) {
+   # TODO(GYP): Figure out which of these work and are needed on other platforms.
+   copy("copy_llvm_symbolizer") {
+     if (is_win) {
+diff --git a/pkg/analyzer/lib/src/test_utilities/mock_sdk.dart b/pkg/analyzer/lib/src/test_utilities/mock_sdk.dart
+index 1e8a0fbc5ef..0e000066c75 100644
+--- a/pkg/analyzer/lib/src/test_utilities/mock_sdk.dart
++++ b/pkg/analyzer/lib/src/test_utilities/mock_sdk.dart
+@@ -772,6 +772,8 @@ final class Double implements SizedNativeType {
+   Abi.androidIA32: Int32(),
+   Abi.androidX64: Int64(),
+   Abi.androidRiscv64: Int64(),
++  Abi.ohosArm: Int32(),
++  Abi.ohosArm64: Int64(),
+   Abi.fuchsiaArm64: Int64(),
+   Abi.fuchsiaX64: Int64(),
+   Abi.fuchsiaRiscv64: Int64(),
+@@ -923,12 +925,16 @@ final class Abi {
+   static const androidIA32 = _androidIA32;
+   static const linuxX64 = _linuxX64;
+   static const macosX64 = _macosX64;
++  static const ohosArm = _ohosArm;
++  static const ohosArm64 = _ohosArm64;
+ 
+   static const _androidArm = Abi._(_Architecture.arm, _OS.android);
+   static const _androidArm64 = Abi._(_Architecture.arm64, _OS.android);
+   static const _androidIA32 = Abi._(_Architecture.ia32, _OS.android);
+   static const _linuxX64 = Abi._(_Architecture.x64, _OS.linux);
+   static const _macosX64 = Abi._(_Architecture.x64, _OS.macos);
++  static const _ohosArm = Abi._(_Architecture.arm, _OS.ohos);
++  static const _ohosArm64 = Abi._(_Architecture.arm64, _OS.ohos);
+ 
+   final _OS _os;
+ 
+@@ -946,6 +952,7 @@ enum _Architecture {
+ 
+ enum _OS {
+   android,
++  ohos,
+   fuchsia,
+   ios,
+   linux,
+diff --git a/pkg/dds/lib/dds.dart b/pkg/dds/lib/dds.dart
+index ab4de82862f..afdca00be3a 100644
+--- a/pkg/dds/lib/dds.dart
++++ b/pkg/dds/lib/dds.dart
+@@ -45,7 +45,7 @@ abstract class DartDevelopmentService {
+   static Future<DartDevelopmentService> startDartDevelopmentService(
+     Uri remoteVmServiceUri, {
+     Uri? serviceUri,
+-    bool enableAuthCodes = true,
++    bool enableAuthCodes = false,
+     bool ipv6 = false,
+     bool enableServicePortFallback = false,
+     List<String> cachedUserTags = const [],
+diff --git a/pkg/dds/lib/src/dap/adapters/dart.dart b/pkg/dds/lib/src/dap/adapters/dart.dart
+index ae16fe10bb8..8b6fc77dedb 100644
+--- a/pkg/dds/lib/src/dap/adapters/dart.dart
++++ b/pkg/dds/lib/src/dap/adapters/dart.dart
+@@ -480,7 +480,7 @@ abstract class DartDebugAdapter<TL extends LaunchRequestArguments,
+     ByteStreamServerChannel channel, {
+     this.ipv6 = false,
+     this.enableDds = true,
+-    this.enableAuthCodes = true,
++    this.enableAuthCodes = false,
+     this.logger,
+     Function? onError,
+   }) : super(channel, onError: onError) {
+diff --git a/pkg/dds/lib/src/dap/server.dart b/pkg/dds/lib/src/dap/server.dart
+index ddf0843f3f4..084da2926ac 100644
+--- a/pkg/dds/lib/src/dap/server.dart
++++ b/pkg/dds/lib/src/dap/server.dart
+@@ -30,7 +30,7 @@ class DapServer {
+     StreamSink<List<int>> output, {
+     this.ipv6 = false,
+     this.enableDds = true,
+-    this.enableAuthCodes = true,
++    this.enableAuthCodes = false,
+     this.test = false,
+     this.logger,
+     Function? onError,
+diff --git a/pkg/dds/lib/src/dds_impl.dart b/pkg/dds/lib/src/dds_impl.dart
+index 90608678379..5f7f46a1381 100644
+--- a/pkg/dds/lib/src/dds_impl.dart
++++ b/pkg/dds/lib/src/dds_impl.dart
+@@ -72,7 +72,10 @@ class DartDevelopmentServiceImpl implements DartDevelopmentService {
+     _streamManager = StreamManager(this);
+     _packageUriConverter = PackageUriConverter(this);
+     _dapHandler = DapHandler(this);
+-    _authCode = _authCodesEnabled ? _makeAuthToken() : '';
++    _authCode =  _authCodesEnabled ? _makeAuthToken() : '';
++    //TODO 临时关闭
++    this._authCodesEnabled = false;
++    _authCode = "";//_authCodesEnabled ? _makeAuthToken() : '';
+   }
+ 
+   Future<void> startService() async {
+@@ -451,7 +454,7 @@ class DartDevelopmentServiceImpl implements DartDevelopmentService {
+ 
+   @override
+   bool get authCodesEnabled => _authCodesEnabled;
+-  final bool _authCodesEnabled;
++  bool _authCodesEnabled;
+   String? get authCode => _authCode;
+   String? _authCode;
+ 
+diff --git a/pkg/vm/lib/modular/transformations/ffi/abi.dart b/pkg/vm/lib/modular/transformations/ffi/abi.dart
+index 9ac7fc5d7a9..21fec27b961 100644
+--- a/pkg/vm/lib/modular/transformations/ffi/abi.dart
++++ b/pkg/vm/lib/modular/transformations/ffi/abi.dart
+@@ -33,6 +33,7 @@ extension on _Architecture {
+ /// The operating systems the Dart VM runs on.
+ enum _OS {
+   android,
++  ohos,
+   fuchsia,
+   ios,
+   linux,
+@@ -66,6 +67,10 @@ class Abi {
+   /// The application binary interface for Android on 64-bit RISC-V.
+   static const androidRiscv64 = _androidRiscv64;
+ 
++  static const ohosArm = _ohosArm;
++
++  static const ohosArm64 = _ohosArm64;
++
+   /// The application binary interface for Fuchsia on the Arm64 architecture.
+   static const fuchsiaArm64 = _fuchsiaArm64;
+ 
+@@ -134,6 +139,8 @@ class Abi {
+     androidIA32,
+     androidX64,
+     androidRiscv64,
++    ohosArm,
++    ohosArm64,
+     fuchsiaArm64,
+     fuchsiaX64,
+     fuchsiaRiscv64,
+@@ -178,6 +185,8 @@ class Abi {
+   static const _androidIA32 = Abi._(_Architecture.ia32, _OS.android);
+   static const _androidX64 = Abi._(_Architecture.x64, _OS.android);
+   static const _androidRiscv64 = Abi._(_Architecture.riscv64, _OS.android);
++  static const _ohosArm = Abi._(_Architecture.arm, _OS.ohos);
++  static const _ohosArm64 = Abi._(_Architecture.arm64, _OS.ohos);
+   static const _fuchsiaArm64 = Abi._(_Architecture.arm64, _OS.fuchsia);
+   static const _fuchsiaX64 = Abi._(_Architecture.x64, _OS.fuchsia);
+   static const _fuchsiaRiscv64 = Abi._(_Architecture.riscv64, _OS.fuchsia);
+@@ -204,6 +213,8 @@ const Map<Abi, String> abiNames = {
+   Abi.androidIA32: 'androidIA32',
+   Abi.androidX64: 'androidX64',
+   Abi.androidRiscv64: 'androidRiscv64',
++  Abi.ohosArm: 'ohosArm',
++  Abi.ohosArm64: 'ohosArm64',
+   Abi.fuchsiaArm64: 'fuchsiaArm64',
+   Abi.fuchsiaX64: 'fuchsiaX64',
+   Abi.fuchsiaRiscv64: 'fuchsiaRiscv64',
+@@ -245,6 +256,7 @@ final Map<Abi, int> wordSize =
+ const Map<Abi, Map<NativeType, int>> nonSizeAlignment = {
+   // _wordSize64
+   Abi.androidArm64: _wordSize64,
++  Abi.ohosArm64: _wordSize64,
+   Abi.androidX64: _wordSize64,
+   Abi.androidRiscv64: _wordSize64,
+   Abi.fuchsiaArm64: _wordSize64,
+@@ -265,6 +277,7 @@ const Map<Abi, Map<NativeType, int>> nonSizeAlignment = {
+   Abi.linuxIA32: _wordSize32Align32,
+   // _wordSize32Align64
+   Abi.androidArm: _wordSize32Align64,
++  Abi.ohosArm: _wordSize32Align64,
+   Abi.linuxArm: _wordSize32Align64,
+   Abi.linuxRiscv32: _wordSize32Align64,
+   Abi.windowsIA32: _wordSize32Align64,
+diff --git a/pkg/vm/testcases/transformations/ffi/abi_specific_int.dart b/pkg/vm/testcases/transformations/ffi/abi_specific_int.dart
+index 6d4e7b0871e..436f3d03301 100644
+--- a/pkg/vm/testcases/transformations/ffi/abi_specific_int.dart
++++ b/pkg/vm/testcases/transformations/ffi/abi_specific_int.dart
+@@ -10,6 +10,8 @@ import 'dart:ffi';
+   Abi.androidIA32: Uint32(),
+   Abi.androidX64: Uint32(),
+   Abi.androidRiscv64: Int32(),
++  Abi.ohosArm: Uint32(),
++  Abi.ohosArm64: Uint32(),
+   Abi.fuchsiaArm64: Uint32(),
+   Abi.fuchsiaX64: Uint32(),
+   Abi.fuchsiaRiscv64: Uint32(),
+diff --git a/runtime/BUILD.gn b/runtime/BUILD.gn
+index c2920b70289..f0f004534df 100644
+--- a/runtime/BUILD.gn
++++ b/runtime/BUILD.gn
+@@ -94,7 +94,7 @@ config("dart_precompiler_config") {
+ 
+ config("dart_os_config") {
+   defines = []
+-
++  print("DART  TARGET OS: "+target_os )
+   if (target_os == "android") {
+     defines += [ "DART_TARGET_OS_ANDROID" ]
+   } else if (target_os == "fuchsia") {
+@@ -104,6 +104,11 @@ config("dart_os_config") {
+     defines += [ "DART_TARGET_OS_MACOS_IOS" ]
+   } else if (target_os == "linux") {
+     defines += [ "DART_TARGET_OS_LINUX" ]
++  } else if (target_os == "ohos") {
++    defines += [ "DART_TARGET_OS_OHOS" ]
++    if (is_ohos) {
++      defines += [ "DART_RUNTIME_OS_OHOS" ]
++    }
+   } else if (target_os == "mac") {
+     defines += [ "DART_TARGET_OS_MACOS" ]
+   } else if (target_os == "win") {
+@@ -221,6 +226,7 @@ config("dart_config") {
+       "-ggdb3",
+       "-fno-rtti",
+       "-fno-exceptions",
++      "-Wno-sign-compare"
+     ]
+     if (is_clang) {
+       cflags += [
+@@ -249,6 +255,11 @@ config("dart_config") {
+       cflags += [ "-O${dart_default_optimization_level}" ]
+     }
+ 
++
++    if (is_ohos) {
++      ldflags += ["-lhilog_ndk.z"]
++    }
++
+     if (is_fuchsia) {
+       # safe-stack does not work with the interpreter.
+       cflags += [
+diff --git a/runtime/bin/BUILD.gn b/runtime/bin/BUILD.gn
+index 52b9bdba29e..08547c0029f 100644
+--- a/runtime/bin/BUILD.gn
++++ b/runtime/bin/BUILD.gn
+@@ -28,6 +28,16 @@ config("libdart_builtin_config") {
+       "log",
+     ]
+   }
++
++  if (is_linux && is_ohos) {
++    is_linux = false
++  }
++
++  if(is_ohos && !is_win){
++      libs +=[
++        "hilog_ndk.z"
++      ]
++  }
+ }
+ 
+ config("export_api_symbols") {
+@@ -450,7 +460,7 @@ template("dart_io") {
+       ]
+     }
+ 
+-    if (is_linux || is_win || is_fuchsia) {
++    if (is_linux || is_win || is_fuchsia || is_ohos) {
+       if (dart_use_fallback_root_certificates) {
+         deps += [ "../../third_party/fallback_root_certificates" ]
+       } else {
+@@ -1007,6 +1017,15 @@ shared_library("entrypoints_verification_test") {
+     # The only effect of DART_SHARED_LIB is to export the Dart API.
+     "DART_SHARED_LIB",
+   ]
++  if (is_linux || is_android || (is_ohos || !is_win)) {
++    cflags = [ "-fPIC" ]
++  }
++  if (is_win) {
++    # TODO(dartbug.com/40579): This wrongly links in dart.exe on precompiled.
++    libs = [ "dart.lib" ]
++    abs_root_out_dir = rebase_path(root_out_dir)
++    ldflags = [ "/LIBPATH:$abs_root_out_dir" ]
++  }
+ }
+ 
+ shared_library("ffi_test_dynamic_library") {
+@@ -1017,6 +1036,9 @@ shared_library("ffi_test_dynamic_library") {
+     # The only effect of DART_SHARED_LIB is to export the Dart API.
+     "DART_SHARED_LIB",
+   ]
++  if (is_linux || is_android || is_ohos) {
++    cflags = [ "-fPIC" ]
++  }
+ }
+ 
+ shared_library("ffi_test_functions") {
+@@ -1045,6 +1067,9 @@ shared_library("ffi_test_functions") {
+     # The only effect of DART_SHARED_LIB is to export the Dart API.
+     "DART_SHARED_LIB",
+   ]
++  if (is_linux || is_android || is_ohos) {
++    cflags = [ "-fPIC" ]
++  }
+   if (is_win) {
+     # TODO(dartbug.com/40579): This wrongly links in dart.exe on precompiled.
+     libs = [ "dart.lib" ]
+diff --git a/runtime/bin/abstract_socket_test.cc b/runtime/bin/abstract_socket_test.cc
+index f9841b8655e..153f966ba3d 100644
+--- a/runtime/bin/abstract_socket_test.cc
++++ b/runtime/bin/abstract_socket_test.cc
+@@ -8,7 +8,7 @@
+ // closes the connection and UNIX socket.
+ 
+ #include "platform/globals.h"
+-#if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID)
++#if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_OHOS)
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -101,4 +101,4 @@ int main() {
+   return -1;
+ }
+ 
+-#endif  // defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID)
++#endif  // defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_OHOS)
+diff --git a/runtime/bin/address_sanitizer.cc b/runtime/bin/address_sanitizer.cc
+index 4b8776df7a5..5f3b9ce4f2f 100644
+--- a/runtime/bin/address_sanitizer.cc
++++ b/runtime/bin/address_sanitizer.cc
+@@ -4,7 +4,7 @@
+ 
+ #include "platform/globals.h"
+ 
+-#if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_MACOSX)
++#if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_MACOSX) || defined(DART_HOST_OS_OHOS)
+ #if defined(__has_feature)
+ #if __has_feature(address_sanitizer)
+ #if !defined(GOOGLE3)
+@@ -25,4 +25,4 @@ __asan_default_options() {
+ #endif  // !defined(GOOGLE3)
+ #endif  // __has_feature(address_sanitizer)
+ #endif  // defined(__has_feature)
+-#endif  //  defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_MACOSX)
++#endif  //  defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_MACOSX) || defined(DART_HOST_OS_OHOS)
+diff --git a/runtime/bin/analyze_snapshot.cc b/runtime/bin/analyze_snapshot.cc
+index 6c38f9e589a..6320d28dbb7 100644
+--- a/runtime/bin/analyze_snapshot.cc
++++ b/runtime/bin/analyze_snapshot.cc
+@@ -10,7 +10,7 @@
+ #include "bin/platform.h"
+ 
+ #if defined(TARGET_ARCH_IS_64_BIT) && defined(DART_PRECOMPILED_RUNTIME) &&     \
+-    (defined(DART_TARGET_OS_ANDROID) || defined(DART_TARGET_OS_LINUX))
++    (defined(DART_TARGET_OS_ANDROID) || defined(DART_TARGET_OS_LINUX) || defined(DART_TARGET_OS_OHOS))
+ #define SUPPORT_ANALYZE_SNAPSHOT
+ #endif
+ 
+diff --git a/runtime/bin/builtin_impl_sources.gni b/runtime/bin/builtin_impl_sources.gni
+index 0db1b7655bc..0a3a7e4d2ed 100644
+--- a/runtime/bin/builtin_impl_sources.gni
++++ b/runtime/bin/builtin_impl_sources.gni
+@@ -13,12 +13,14 @@ builtin_impl_sources = [
+   "crypto_linux.cc",
+   "crypto_macos.cc",
+   "crypto_win.cc",
++  "crypto_ohos.cc",
+   "dartutils.cc",
+   "dartutils.h",
+   "directory.cc",
+   "directory.h",
+   "directory_fuchsia.cc",
+   "directory_linux.cc",
++  "directory_ohos.cc",
+   "directory_macos.cc",
+   "directory_win.cc",
+   "exe_utils.cc",
+@@ -27,10 +29,12 @@ builtin_impl_sources = [
+   "fdutils_fuchsia.cc",
+   "fdutils_linux.cc",
+   "fdutils_macos.cc",
++  "fdutils_ohos.cc",
+   "file.cc",
+   "file.h",
+   "file_fuchsia.cc",
+   "file_linux.cc",
++  "file_ohos.cc",
+   "file_macos.cc",
+   "file_support.cc",
+   "file_win.cc",
+@@ -51,9 +55,12 @@ builtin_impl_sources = [
+   "thread_macos.h",
+   "thread_win.cc",
+   "thread_win.h",
++  "thread_ohos.cc",
++  "thread_ohos.h",
+   "utils.cc",
+   "utils.h",
+   "utils_fuchsia.cc",
++  "utils_ohos.cc",
+   "utils_linux.cc",
+   "utils_macos.cc",
+   "utils_win.cc",
+diff --git a/runtime/bin/builtin_natives.cc b/runtime/bin/builtin_natives.cc
+index bd28a128a22..f5b2cb89618 100644
+--- a/runtime/bin/builtin_natives.cc
++++ b/runtime/bin/builtin_natives.cc
+@@ -18,6 +18,11 @@
+ #include "bin/io_natives.h"
+ #include "bin/platform.h"
+ 
++#ifdef  DART_HOST_OS_OHOS
++#include <hilog/log.h>
++#include <pthread.h>
++#endif
++
+ namespace dart {
+ namespace bin {
+ 
+@@ -108,6 +113,13 @@ void FUNCTION_NAME(Builtin_PrintString)(Dart_NativeArguments args) {
+         Dart_ServiceSendDataEvent("Stdout", "WriteEvent", chars, new_length);
+     ASSERT(res == nullptr);
+   }
++
++#ifdef  DART_HOST_OS_OHOS
++ {
++   pthread_t thread = pthread_self();
++   OH_LOG_Print(LOG_APP,LOG_INFO,LOG_DOMAIN,"XComDartVm","Thread:%{public}lu %{public}s",thread,chars);
++ }
++#endif
+ }
+ 
+ }  // namespace bin
+diff --git a/runtime/bin/console_posix.cc b/runtime/bin/console_posix.cc
+index f318ae1ef6a..59c2b6c6509 100644
+--- a/runtime/bin/console_posix.cc
++++ b/runtime/bin/console_posix.cc
+@@ -4,7 +4,7 @@
+ 
+ #include "platform/globals.h"
+ #if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_MACOS) ||              \
+-    defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_FUCHSIA)
++    defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_FUCHSIA) || defined(DART_HOST_OS_OHOS)
+ 
+ #include "bin/console.h"
+ 
+@@ -28,4 +28,4 @@ void Console::RestoreConfig() {
+ }  // namespace dart
+ 
+ #endif  // defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_MACOS) ||       \
+-        // defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_FUCHSIA)
++        // defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_FUCHSIA) || defined(DART_HOST_OS_OHOS)
+diff --git a/runtime/bin/crypto_ohos.cc b/runtime/bin/crypto_ohos.cc
+new file mode 100644
+index 00000000000..b7aca695fb7
+--- /dev/null
++++ b/runtime/bin/crypto_ohos.cc
+@@ -0,0 +1,44 @@
++// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
++// for details. All rights reserved. Use of this source code is governed by a
++// BSD-style license that can be found in the LICENSE file.
++
++#include "platform/globals.h"
++#if defined(DART_HOST_OS_OHOS)
++
++#include <errno.h>  // NOLINT
++#include <fcntl.h>  // NOLINT
++
++#include "bin/crypto.h"
++#include "bin/fdutils.h"
++#include "platform/signal_blocker.h"
++
++namespace dart {
++namespace bin {
++
++bool Crypto::GetRandomBytes(intptr_t count, uint8_t* buffer) {
++  ThreadSignalBlocker signal_blocker(SIGPROF);
++  intptr_t fd = TEMP_FAILURE_RETRY_NO_SIGNAL_BLOCKER(
++      open("/dev/urandom", O_RDONLY | O_CLOEXEC));
++  if (fd < 0) {
++    return false;
++  }
++  intptr_t bytes_read = 0;
++  do {
++    int res = TEMP_FAILURE_RETRY_NO_SIGNAL_BLOCKER(
++        read(fd, buffer + bytes_read, count - bytes_read));
++    if (res < 0) {
++      int err = errno;
++      close(fd);
++      errno = err;
++      return false;
++    }
++    bytes_read += res;
++  } while (bytes_read < count);
++  close(fd);
++  return true;
++}
++
++}  // namespace bin
++}  // namespace dart
++
++#endif  // defined(DART_HOST_OS_OHOS)
+diff --git a/runtime/bin/directory_ohos.cc b/runtime/bin/directory_ohos.cc
+new file mode 100644
+index 00000000000..66363324364
+--- /dev/null
++++ b/runtime/bin/directory_ohos.cc
+@@ -0,0 +1,513 @@
++// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
++// for details. All rights reserved. Use of this source code is governed by a
++// BSD-style license that can be found in the LICENSE file.
++
++#include "platform/globals.h"
++#if defined(DART_HOST_OS_OHOS)
++
++#include "bin/directory.h"
++
++#include <dirent.h>     // NOLINT
++#include <errno.h>      // NOLINT
++#include <fcntl.h>      // NOLINT
++#include <stdlib.h>     // NOLINT
++#include <string.h>     // NOLINT
++#include <sys/param.h>  // NOLINT
++#include <sys/stat.h>   // NOLINT
++#include <unistd.h>     // NOLINT
++
++#include "bin/crypto.h"
++#include "bin/dartutils.h"
++#include "bin/fdutils.h"
++#include "bin/file.h"
++#include "bin/namespace.h"
++#include "bin/platform.h"
++#include "platform/signal_blocker.h"
++
++namespace dart {
++namespace bin {
++
++PathBuffer::PathBuffer() : length_(0) {
++  data_ = calloc(PATH_MAX + 1, sizeof(char));  // NOLINT
++}
++
++PathBuffer::~PathBuffer() {
++  free(data_);
++}
++
++bool PathBuffer::AddW(const wchar_t* name) {
++  UNREACHABLE();
++  return false;
++}
++
++char* PathBuffer::AsString() const {
++  return reinterpret_cast<char*>(data_);
++}
++
++wchar_t* PathBuffer::AsStringW() const {
++  UNREACHABLE();
++  return NULL;
++}
++
++const char* PathBuffer::AsScopedString() const {
++  return DartUtils::ScopedCopyCString(AsString());
++}
++
++bool PathBuffer::Add(const char* name) {
++  char* data = AsString();
++  int written = snprintf(data + length_, PATH_MAX - length_, "%s", name);
++  data[PATH_MAX] = '\0';
++  if ((written <= PATH_MAX - length_) && (written >= 0) &&
++      (static_cast<size_t>(written) == strnlen(name, PATH_MAX + 1))) {
++    length_ += written;
++    return true;
++  } else {
++    errno = ENAMETOOLONG;
++    return false;
++  }
++}
++
++void PathBuffer::Reset(intptr_t new_length) {
++  length_ = new_length;
++  AsString()[length_] = '\0';
++}
++
++// A linked list of symbolic links, with their unique file system identifiers.
++// These are scanned to detect loops while doing a recursive directory listing.
++struct LinkList {
++  dev_t dev;
++  ino64_t ino;
++  LinkList* next;
++};
++
++ListType DirectoryListingEntry::Next(DirectoryListing* listing) {
++  if (done_) {
++    return kListDone;
++  }
++
++  if (fd_ == -1) {
++    ASSERT(lister_ == 0);
++    NamespaceScope ns(listing->namespc(), listing->path_buffer().AsString());
++    const int listingfd =
++        TEMP_FAILURE_RETRY(openat64(ns.fd(), ns.path(), O_DIRECTORY));
++    if (listingfd < 0) {
++      done_ = true;
++      return kListError;
++    }
++    fd_ = listingfd;
++  }
++
++  if (lister_ == 0) {
++    do {
++      lister_ = reinterpret_cast<intptr_t>(fdopendir(fd_));
++    } while ((lister_ == 0) && (errno == EINTR));
++    if (lister_ == 0) {
++      done_ = true;
++      return kListError;
++    }
++    if (parent_ != NULL) {
++      if (!listing->path_buffer().Add(File::PathSeparator())) {
++        return kListError;
++      }
++    }
++    path_length_ = listing->path_buffer().length();
++  }
++  // Reset.
++  listing->path_buffer().Reset(path_length_);
++  ResetLink();
++
++  // Iterate the directory and post the directories and files to the
++  // ports.
++  errno = 0;
++  dirent* entry = readdir(reinterpret_cast<DIR*>(lister_));
++  if (entry != NULL) {
++    if (!listing->path_buffer().Add(entry->d_name)) {
++      done_ = true;
++      return kListError;
++    }
++    switch (entry->d_type) {
++      case DT_DIR:
++        if ((strcmp(entry->d_name, ".") == 0) ||
++            (strcmp(entry->d_name, "..") == 0)) {
++          return Next(listing);
++        }
++        return kListDirectory;
++      case DT_BLK:
++      case DT_CHR:
++      case DT_FIFO:
++      case DT_SOCK:
++      case DT_REG:
++        return kListFile;
++      case DT_LNK:
++        if (!listing->follow_links()) {
++          return kListLink;
++        }
++        // Else fall through to next case.
++        FALL_THROUGH;
++      case DT_UNKNOWN: {
++        // On some file systems the entry type is not determined by
++        // readdir. For those and for links we use stat to determine
++        // the actual entry type. Notice that stat returns the type of
++        // the file pointed to.
++        NamespaceScope ns(listing->namespc(),
++                          listing->path_buffer().AsString());
++        struct stat64 entry_info;
++        int stat_success;
++        stat_success = TEMP_FAILURE_RETRY(
++            fstatat64(ns.fd(), ns.path(), &entry_info, AT_SYMLINK_NOFOLLOW));
++        if (stat_success == -1) {
++          return kListError;
++        }
++        if (listing->follow_links() && S_ISLNK(entry_info.st_mode)) {
++          // Check to see if we are in a loop created by a symbolic link.
++          LinkList current_link = {entry_info.st_dev, entry_info.st_ino, link_};
++          LinkList* previous = link_;
++          while (previous != NULL) {
++            if ((previous->dev == current_link.dev) &&
++                (previous->ino == current_link.ino)) {
++              // Report the looping link as a link, rather than following it.
++              return kListLink;
++            }
++            previous = previous->next;
++          }
++          stat_success =
++              TEMP_FAILURE_RETRY(fstatat64(ns.fd(), ns.path(), &entry_info, 0));
++          if (stat_success == -1 || (S_IFMT & entry_info.st_mode) == 0) {
++            // Report a broken link as a link, even if follow_links is true.
++            // A symbolic link can potentially point to an anon_inode. For
++            // example, an epoll file descriptor will have a symbolic link whose
++            // content is the string anon_inode:[eventpoll]. In this case, the
++            // target doesn't belong to any regular file catogory.
++            return kListLink;
++          }
++          if (S_ISDIR(entry_info.st_mode)) {
++            // Recurse into the subdirectory with current_link added to the
++            // linked list of seen file system links.
++            link_ = new LinkList(current_link);
++            if ((strcmp(entry->d_name, ".") == 0) ||
++                (strcmp(entry->d_name, "..") == 0)) {
++              return Next(listing);
++            }
++            return kListDirectory;
++          }
++        }
++        if (S_ISDIR(entry_info.st_mode)) {
++          if ((strcmp(entry->d_name, ".") == 0) ||
++              (strcmp(entry->d_name, "..") == 0)) {
++            return Next(listing);
++          }
++          return kListDirectory;
++        } else if (S_ISLNK(entry_info.st_mode)) {
++          return kListLink;
++        } else {
++          // Regular files, character devices, block devices, fifos, sockets and
++          // unknown types are all considered as files.
++          return kListFile;
++        }
++      }
++
++      default:
++        // We should have covered all the bases. If not, let's get an error.
++        FATAL("Unexpected d_type: %d\n", entry->d_type);
++        return kListError;
++    }
++  }
++  done_ = true;
++
++  if (errno != 0) {
++    return kListError;
++  }
++
++  return kListDone;
++}
++
++DirectoryListingEntry::~DirectoryListingEntry() {
++  ResetLink();
++  if (lister_ != 0) {
++    // This also closes fd_.
++    VOID_NO_RETRY_EXPECTED(closedir(reinterpret_cast<DIR*>(lister_)));
++  }
++}
++
++void DirectoryListingEntry::ResetLink() {
++  if ((link_ != NULL) && ((parent_ == NULL) || (parent_->link_ != link_))) {
++    delete link_;
++    link_ = NULL;
++  }
++  if (parent_ != NULL) {
++    link_ = parent_->link_;
++  }
++}
++
++static bool DeleteRecursively(int dirfd, PathBuffer* path);
++
++static bool DeleteFile(int dirfd, char* file_name, PathBuffer* path) {
++  return path->Add(file_name) &&
++         (NO_RETRY_EXPECTED(unlinkat(dirfd, path->AsString(), 0)) == 0);
++}
++
++static bool DeleteDir(int dirfd, char* dir_name, PathBuffer* path) {
++  if ((strcmp(dir_name, ".") == 0) || (strcmp(dir_name, "..") == 0)) {
++    return true;
++  }
++  return path->Add(dir_name) && DeleteRecursively(dirfd, path);
++}
++
++static bool DeleteRecursively(int dirfd, PathBuffer* path) {
++  // Do not recurse into links for deletion. Instead delete the link.
++  // If it's a file, delete it.
++  struct stat64 st;
++  if (TEMP_FAILURE_RETRY(
++          fstatat64(dirfd, path->AsString(), &st, AT_SYMLINK_NOFOLLOW)) == -1) {
++    return false;
++  } else if (!S_ISDIR(st.st_mode)) {
++    return (NO_RETRY_EXPECTED(unlinkat(dirfd, path->AsString(), 0)) == 0);
++  }
++
++  if (!path->Add(File::PathSeparator())) {
++    return false;
++  }
++
++  // Not a link. Attempt to open as a directory and recurse into the
++  // directory.
++  const int fd =
++      TEMP_FAILURE_RETRY(openat64(dirfd, path->AsString(), O_DIRECTORY));
++  if (fd < 0) {
++    return false;
++  }
++  DIR* dir_pointer;
++  do {
++    dir_pointer = fdopendir(fd);
++  } while ((dir_pointer == NULL) && (errno == EINTR));
++  if (dir_pointer == NULL) {
++    FDUtils::SaveErrorAndClose(fd);
++    return false;
++  }
++
++  // Iterate the directory and delete all files and directories.
++  int path_length = path->length();
++  while (true) {
++    // In case `readdir()` returns `NULL` we distinguish between end-of-stream
++    // and error by looking if `errno` was updated.
++    errno = 0;
++    // In glibc 2.24+, readdir_r is deprecated.
++    // According to the man page for readdir:
++    // "readdir(3) is not required to be thread-safe. However, in modern
++    // implementations (including the glibc implementation), concurrent calls to
++    // readdir(3) that specify different directory streams are thread-safe."
++    dirent* entry = readdir(dir_pointer);
++    if (entry == NULL) {
++      // Failed to read next directory entry.
++      if (errno != 0) {
++        break;
++      }
++      // End of directory.
++      int status = NO_RETRY_EXPECTED(closedir(dir_pointer));
++      if (status != 0) {
++        return false;
++      }
++      status =
++          NO_RETRY_EXPECTED(unlinkat(dirfd, path->AsString(), AT_REMOVEDIR));
++      return status == 0;
++    }
++    bool ok = false;
++    switch (entry->d_type) {
++      case DT_DIR:
++        ok = DeleteDir(dirfd, entry->d_name, path);
++        break;
++      case DT_BLK:
++      case DT_CHR:
++      case DT_FIFO:
++      case DT_SOCK:
++      case DT_REG:
++      case DT_LNK:
++        // Treat all links as files. This will delete the link which
++        // is what we want no matter if the link target is a file or a
++        // directory.
++        ok = DeleteFile(dirfd, entry->d_name, path);
++        break;
++      case DT_UNKNOWN: {
++        if (!path->Add(entry->d_name)) {
++          break;
++        }
++        // On some file systems the entry type is not determined by
++        // readdir. For those we use lstat to determine the entry
++        // type.
++        struct stat64 entry_info;
++        if (TEMP_FAILURE_RETRY(fstatat64(dirfd, path->AsString(), &entry_info,
++                                         AT_SYMLINK_NOFOLLOW)) == -1) {
++          break;
++        }
++        path->Reset(path_length);
++        if (S_ISDIR(entry_info.st_mode)) {
++          ok = DeleteDir(dirfd, entry->d_name, path);
++        } else {
++          // Treat links as files. This will delete the link which is
++          // what we want no matter if the link target is a file or a
++          // directory.
++          ok = DeleteFile(dirfd, entry->d_name, path);
++        }
++        break;
++      }
++      default:
++        // We should have covered all the bases. If not, let's get an error.
++        FATAL("Unexpected d_type: %d\n", entry->d_type);
++        break;
++    }
++    if (!ok) {
++      break;
++    }
++    path->Reset(path_length);
++  }
++  // Only happens if an error.
++  ASSERT(errno != 0);
++  int err = errno;
++  VOID_NO_RETRY_EXPECTED(closedir(dir_pointer));
++  errno = err;
++  return false;
++}
++
++Directory::ExistsResult Directory::Exists(Namespace* namespc,
++                                          const char* dir_name) {
++  NamespaceScope ns(namespc, dir_name);
++  struct stat64 entry_info;
++  int success =
++      TEMP_FAILURE_RETRY(fstatat64(ns.fd(), ns.path(), &entry_info, 0));
++  if (success == 0) {
++    if (S_ISDIR(entry_info.st_mode)) {
++      return EXISTS;
++    } else {
++      // An OSError may be constructed based on the return value of this
++      // function, so set errno to something that makes sense.
++      errno = ENOTDIR;
++      return DOES_NOT_EXIST;
++    }
++  } else {
++    if ((errno == EACCES) || (errno == EBADF) || (errno == EFAULT) ||
++        (errno == ENOMEM) || (errno == EOVERFLOW)) {
++      // Search permissions denied for one of the directories in the
++      // path or a low level error occurred. We do not know if the
++      // directory exists.
++      return UNKNOWN;
++    }
++    ASSERT((errno == ELOOP) || (errno == ENAMETOOLONG) || (errno == ENOENT) ||
++           (errno == ENOTDIR));
++    return DOES_NOT_EXIST;
++  }
++}
++
++char* Directory::CurrentNoScope() {
++  return getcwd(NULL, 0);
++}
++
++bool Directory::Create(Namespace* namespc, const char* dir_name) {
++  NamespaceScope ns(namespc, dir_name);
++  // Create the directory with the permissions specified by the
++  // process umask.
++  const int result = NO_RETRY_EXPECTED(mkdirat(ns.fd(), ns.path(), 0777));
++  // If the directory already exists, treat it as a success.
++  if ((result == -1) && (errno == EEXIST)) {
++    return (Exists(namespc, dir_name) == EXISTS);
++  }
++  return (result == 0);
++}
++
++const char* Directory::SystemTemp(Namespace* namespc) {
++  if (Directory::system_temp_path_override_ != NULL) {
++    return DartUtils::ScopedCopyCString(Directory::system_temp_path_override_);
++  }
++
++  PathBuffer path;
++  const char* temp_dir = getenv("TMPDIR");
++  if (temp_dir == NULL) {
++    temp_dir = getenv("TMP");
++  }
++  if (temp_dir == NULL) {
++    temp_dir = "/tmp";
++  }
++  NamespaceScope ns(namespc, temp_dir);
++  if (!path.Add(ns.path())) {
++    return NULL;
++  }
++
++  // Remove any trailing slash.
++  char* result = path.AsString();
++  int length = strlen(result);
++  if ((length > 1) && (result[length - 1] == '/')) {
++    result[length - 1] = '\0';
++  }
++  return path.AsScopedString();
++}
++
++// Returns a new, unused directory name, adding characters to the end
++// of prefix.  Creates the directory with the permissions specified
++// by the process umask.
++// The return value is Dart_ScopeAllocated.
++const char* Directory::CreateTemp(Namespace* namespc, const char* prefix) {
++  PathBuffer path;
++  const int firstchar = 'A';
++  const int numchars = 'Z' - 'A' + 1;
++  uint8_t random_bytes[7];
++
++  // mkdtemp doesn't have an "at" variant, so we have to simulate it.
++  if (!path.Add(prefix)) {
++    return NULL;
++  }
++  intptr_t prefix_length = path.length();
++  while (true) {
++    Crypto::GetRandomBytes(6, random_bytes);
++    for (intptr_t i = 0; i < 6; i++) {
++      random_bytes[i] = (random_bytes[i] % numchars) + firstchar;
++    }
++    random_bytes[6] = '\0';
++    if (!path.Add(reinterpret_cast<char*>(random_bytes))) {
++      return NULL;
++    }
++    NamespaceScope ns(namespc, path.AsString());
++    const int result = NO_RETRY_EXPECTED(mkdirat(ns.fd(), ns.path(), 0777));
++    if (result == 0) {
++      return path.AsScopedString();
++    } else if (errno == EEXIST) {
++      path.Reset(prefix_length);
++    } else {
++      return NULL;
++    }
++  }
++}
++
++bool Directory::Delete(Namespace* namespc,
++                       const char* dir_name,
++                       bool recursive) {
++  NamespaceScope ns(namespc, dir_name);
++  if (!recursive) {
++    if ((File::GetType(namespc, dir_name, false) == File::kIsLink) &&
++        (File::GetType(namespc, dir_name, true) == File::kIsDirectory)) {
++      return NO_RETRY_EXPECTED(unlinkat(ns.fd(), ns.path(), 0)) == 0;
++    }
++    return NO_RETRY_EXPECTED(unlinkat(ns.fd(), ns.path(), AT_REMOVEDIR)) == 0;
++  } else {
++    PathBuffer path;
++    if (!path.Add(ns.path())) {
++      return false;
++    }
++    return DeleteRecursively(ns.fd(), &path);
++  }
++}
++
++bool Directory::Rename(Namespace* namespc,
++                       const char* old_path,
++                       const char* new_path) {
++  ExistsResult exists = Exists(namespc, old_path);
++  if (exists != EXISTS) {
++    return false;
++  }
++  NamespaceScope oldns(namespc, old_path);
++  NamespaceScope newns(namespc, new_path);
++  return (NO_RETRY_EXPECTED(renameat(oldns.fd(), oldns.path(), newns.fd(),
++                                     newns.path())) == 0);
++}
++
++}  // namespace bin
++}  // namespace dart
++
++#endif  // defined(DART_HOST_OS_OHOS)
+diff --git a/runtime/bin/eventhandler.h b/runtime/bin/eventhandler.h
+index d35fc539ab1..b49bdbc705c 100644
+--- a/runtime/bin/eventhandler.h
++++ b/runtime/bin/eventhandler.h
+@@ -593,6 +593,8 @@ class DescriptorInfoMultipleMixin : public DI {
+ #include "bin/eventhandler_macos.h"
+ #elif defined(DART_HOST_OS_WINDOWS)
+ #include "bin/eventhandler_win.h"
++#elif defined(DART_HOST_OS_OHOS)
++#include "bin/eventhandler_ohos.h"
+ #else
+ #error Unknown target os.
+ #endif
+diff --git a/runtime/bin/eventhandler_ohos.cc b/runtime/bin/eventhandler_ohos.cc
+new file mode 100644
+index 00000000000..38d769d435b
+--- /dev/null
++++ b/runtime/bin/eventhandler_ohos.cc
+@@ -0,0 +1,443 @@
++// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
++// for details. All rights reserved. Use of this source code is governed by a
++// BSD-style license that can be found in the LICENSE file.
++
++#include "platform/globals.h"
++#if defined(DART_HOST_OS_OHOS)
++
++#include "bin/eventhandler.h"
++#include "bin/eventhandler_ohos.h"
++
++#include <errno.h>        // NOLINT
++#include <fcntl.h>        // NOLINT
++#include <pthread.h>      // NOLINT
++#include <stdio.h>        // NOLINT
++#include <string.h>       // NOLINT
++#include <sys/epoll.h>    // NOLINT
++#include <sys/stat.h>     // NOLINT
++#include <sys/timerfd.h>  // NOLINT
++#include <unistd.h>       // NOLINT
++
++#include "bin/dartutils.h"
++#include "bin/fdutils.h"
++#include "bin/lockers.h"
++#include "bin/process.h"
++#include "bin/socket.h"
++#include "bin/thread.h"
++#include "platform/syslog.h"
++#include "platform/utils.h"
++
++namespace dart {
++namespace bin {
++
++intptr_t DescriptorInfo::GetPollEvents() {
++  // Do not ask for EPOLLERR and EPOLLHUP explicitly as they are
++  // triggered anyway.
++  intptr_t events = 0;
++  if ((Mask() & (1 << kInEvent)) != 0) {
++    events |= EPOLLIN;
++  }
++  if ((Mask() & (1 << kOutEvent)) != 0) {
++    events |= EPOLLOUT;
++  }
++  return events;
++}
++
++// Unregister the file descriptor for a DescriptorInfo structure with
++// epoll.
++static void RemoveFromEpollInstance(intptr_t epoll_fd_, DescriptorInfo* di) {
++  VOID_NO_RETRY_EXPECTED(epoll_ctl(epoll_fd_, EPOLL_CTL_DEL, di->fd(), NULL));
++}
++
++static void AddToEpollInstance(intptr_t epoll_fd_, DescriptorInfo* di) {
++  struct epoll_event event;
++  event.events = EPOLLRDHUP | di->GetPollEvents();
++  if (!di->IsListeningSocket()) {
++    event.events |= EPOLLET;
++  }
++  event.data.ptr = di;
++  int status =
++      NO_RETRY_EXPECTED(epoll_ctl(epoll_fd_, EPOLL_CTL_ADD, di->fd(), &event));
++  if (status == -1) {
++    // TODO(dart:io): Verify that the dart end is handling this correctly.
++
++    // Epoll does not accept the file descriptor. It could be due to
++    // already closed file descriptor, or unuspported devices, such
++    // as /dev/null. In such case, mark the file descriptor as closed,
++    // so dart will handle it accordingly.
++    di->NotifyAllDartPorts(1 << kCloseEvent);
++  }
++}
++
++EventHandlerImplementation::EventHandlerImplementation()
++    : socket_map_(&SimpleHashMap::SamePointerValue, 16) {
++  intptr_t result;
++  result = NO_RETRY_EXPECTED(pipe(interrupt_fds_));
++  if (result != 0) {
++    FATAL("Pipe creation failed");
++  }
++  if (!FDUtils::SetNonBlocking(interrupt_fds_[0])) {
++    FATAL("Failed to set pipe fd non blocking\n");
++  }
++  if (!FDUtils::SetCloseOnExec(interrupt_fds_[0])) {
++    FATAL("Failed to set pipe fd close on exec\n");
++  }
++  if (!FDUtils::SetCloseOnExec(interrupt_fds_[1])) {
++    FATAL("Failed to set pipe fd close on exec\n");
++  }
++  shutdown_ = false;
++  // The initial size passed to epoll_create is ignore on newer (>=
++  // 2.6.8) Linux versions
++  static const int kEpollInitialSize = 64;
++  epoll_fd_ = NO_RETRY_EXPECTED(epoll_create(kEpollInitialSize));
++  if (epoll_fd_ == -1) {
++    FATAL("Failed creating epoll file descriptor: %i", errno);
++  }
++  if (!FDUtils::SetCloseOnExec(epoll_fd_)) {
++    FATAL("Failed to set epoll fd close on exec\n");
++  }
++  // Register the interrupt_fd with the epoll instance.
++  struct epoll_event event;
++  event.events = EPOLLIN;
++  event.data.ptr = NULL;
++  int status = NO_RETRY_EXPECTED(
++      epoll_ctl(epoll_fd_, EPOLL_CTL_ADD, interrupt_fds_[0], &event));
++  if (status == -1) {
++    FATAL("Failed adding interrupt fd to epoll instance");
++  }
++  timer_fd_ = NO_RETRY_EXPECTED(timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC));
++  if (timer_fd_ == -1) {
++    FATAL("Failed creating timerfd file descriptor: %i", errno);
++  }
++  // Register the timer_fd_ with the epoll instance.
++  event.events = EPOLLIN;
++  event.data.fd = timer_fd_;
++  status =
++      NO_RETRY_EXPECTED(epoll_ctl(epoll_fd_, EPOLL_CTL_ADD, timer_fd_, &event));
++  if (status == -1) {
++    FATAL("Failed adding timerfd fd(%i) to epoll instance: %i", timer_fd_,
++           errno);
++  }
++}
++
++static void DeleteDescriptorInfo(void* info) {
++  DescriptorInfo* di = reinterpret_cast<DescriptorInfo*>(info);
++  di->Close();
++  delete di;
++}
++
++EventHandlerImplementation::~EventHandlerImplementation() {
++  socket_map_.Clear(DeleteDescriptorInfo);
++  close(epoll_fd_);
++  close(timer_fd_);
++  close(interrupt_fds_[0]);
++  close(interrupt_fds_[1]);
++}
++
++void EventHandlerImplementation::UpdateEpollInstance(intptr_t old_mask,
++                                                     DescriptorInfo* di) {
++  intptr_t new_mask = di->Mask();
++  if ((old_mask != 0) && (new_mask == 0)) {
++    RemoveFromEpollInstance(epoll_fd_, di);
++  } else if ((old_mask == 0) && (new_mask != 0)) {
++    AddToEpollInstance(epoll_fd_, di);
++  } else if ((old_mask != 0) && (new_mask != 0) && (old_mask != new_mask)) {
++    ASSERT(!di->IsListeningSocket());
++    RemoveFromEpollInstance(epoll_fd_, di);
++    AddToEpollInstance(epoll_fd_, di);
++  }
++}
++
++DescriptorInfo* EventHandlerImplementation::GetDescriptorInfo(
++    intptr_t fd,
++    bool is_listening) {
++  ASSERT(fd >= 0);
++  SimpleHashMap::Entry* entry = socket_map_.Lookup(
++      GetHashmapKeyFromFd(fd), GetHashmapHashFromFd(fd), true);
++  ASSERT(entry != NULL);
++  DescriptorInfo* di = reinterpret_cast<DescriptorInfo*>(entry->value);
++  if (di == NULL) {
++    // If there is no data in the hash map for this file descriptor a
++    // new DescriptorInfo for the file descriptor is inserted.
++    if (is_listening) {
++      di = new DescriptorInfoMultiple(fd);
++    } else {
++      di = new DescriptorInfoSingle(fd);
++    }
++    entry->value = di;
++  }
++  ASSERT(fd == di->fd());
++  return di;
++}
++
++void EventHandlerImplementation::WakeupHandler(intptr_t id,
++                                               Dart_Port dart_port,
++                                               int64_t data) {
++  InterruptMessage msg;
++  msg.id = id;
++  msg.dart_port = dart_port;
++  msg.data = data;
++  // WriteToBlocking will write up to 512 bytes atomically, and since our msg
++  // is smaller than 512, we don't need a thread lock.
++  // See: http://linux.die.net/man/7/pipe, section 'Pipe_buf'.
++  ASSERT(kInterruptMessageSize < PIPE_BUF);
++  intptr_t result =
++      FDUtils::WriteToBlocking(interrupt_fds_[1], &msg, kInterruptMessageSize);
++  if (result != kInterruptMessageSize) {
++    if (result == -1) {
++      perror("Interrupt message failure:");
++    }
++    FATAL("Interrupt message failure. Wrote %" Pd " bytes.", result);
++  }
++}
++
++void EventHandlerImplementation::HandleInterruptFd() {
++  const intptr_t MAX_MESSAGES = kInterruptMessageSize;
++  InterruptMessage msg[MAX_MESSAGES];
++  ssize_t bytes = TEMP_FAILURE_RETRY_NO_SIGNAL_BLOCKER(
++      read(interrupt_fds_[0], msg, MAX_MESSAGES * kInterruptMessageSize));
++  for (ssize_t i = 0; i < bytes / kInterruptMessageSize; i++) {
++    if (msg[i].id == kTimerId) {
++      timeout_queue_.UpdateTimeout(msg[i].dart_port, msg[i].data);
++      UpdateTimerFd();
++    } else if (msg[i].id == kShutdownId) {
++      shutdown_ = true;
++    } else {
++      ASSERT((msg[i].data & COMMAND_MASK) != 0);
++      Socket* socket = reinterpret_cast<Socket*>(msg[i].id);
++      RefCntReleaseScope<Socket> rs(socket);
++      if (socket->fd() == -1) {
++        continue;
++      }
++      DescriptorInfo* di =
++          GetDescriptorInfo(socket->fd(), IS_LISTENING_SOCKET(msg[i].data));
++      if (IS_COMMAND(msg[i].data, kShutdownReadCommand)) {
++        ASSERT(!di->IsListeningSocket());
++        // Close the socket for reading.
++        VOID_NO_RETRY_EXPECTED(shutdown(di->fd(), SHUT_RD));
++      } else if (IS_COMMAND(msg[i].data, kShutdownWriteCommand)) {
++        ASSERT(!di->IsListeningSocket());
++        // Close the socket for writing.
++        VOID_NO_RETRY_EXPECTED(shutdown(di->fd(), SHUT_WR));
++      } else if (IS_COMMAND(msg[i].data, kCloseCommand)) {
++        // Close the socket and free system resources and move on to next
++        // message.
++        if (IS_SIGNAL_SOCKET(msg[i].data)) {
++          Process::ClearSignalHandlerByFd(di->fd(), socket->isolate_port());
++        }
++        intptr_t old_mask = di->Mask();
++        Dart_Port port = msg[i].dart_port;
++        if (port != ILLEGAL_PORT) {
++          di->RemovePort(port);
++        }
++        intptr_t new_mask = di->Mask();
++        UpdateEpollInstance(old_mask, di);
++
++        intptr_t fd = di->fd();
++        ASSERT(fd == socket->fd());
++        if (di->IsListeningSocket()) {
++          // We only close the socket file descriptor from the operating
++          // system if there are no other dart socket objects which
++          // are listening on the same (address, port) combination.
++          ListeningSocketRegistry* registry =
++              ListeningSocketRegistry::Instance();
++
++          MutexLocker locker(registry->mutex());
++
++          if (registry->CloseSafe(socket)) {
++            ASSERT(new_mask == 0);
++            socket_map_.Remove(GetHashmapKeyFromFd(fd),
++                               GetHashmapHashFromFd(fd));
++            di->Close();
++            delete di;
++          }
++          socket->CloseFd();
++        } else {
++          ASSERT(new_mask == 0);
++          socket_map_.Remove(GetHashmapKeyFromFd(fd), GetHashmapHashFromFd(fd));
++          di->Close();
++          delete di;
++          socket->CloseFd();
++        }
++        DartUtils::PostInt32(port, 1 << kDestroyedEvent);
++      } else if (IS_COMMAND(msg[i].data, kReturnTokenCommand)) {
++        int count = TOKEN_COUNT(msg[i].data);
++        intptr_t old_mask = di->Mask();
++        di->ReturnTokens(msg[i].dart_port, count);
++        UpdateEpollInstance(old_mask, di);
++      } else if (IS_COMMAND(msg[i].data, kSetEventMaskCommand)) {
++        // `events` can only have kInEvent/kOutEvent flags set.
++        intptr_t events = msg[i].data & EVENT_MASK;
++        ASSERT(0 == (events & ~(1 << kInEvent | 1 << kOutEvent)));
++
++        intptr_t old_mask = di->Mask();
++        di->SetPortAndMask(msg[i].dart_port, msg[i].data & EVENT_MASK);
++        UpdateEpollInstance(old_mask, di);
++      } else {
++        UNREACHABLE();
++      }
++    }
++  }
++}
++
++void EventHandlerImplementation::UpdateTimerFd() {
++  struct itimerspec it;
++  memset(&it, 0, sizeof(it));
++  if (timeout_queue_.HasTimeout()) {
++    int64_t millis = timeout_queue_.CurrentTimeout();
++    it.it_value.tv_sec = millis / 1000;
++    it.it_value.tv_nsec = (millis % 1000) * 1000000;
++  }
++  VOID_NO_RETRY_EXPECTED(
++      timerfd_settime(timer_fd_, TFD_TIMER_ABSTIME, &it, NULL));
++}
++
++#ifdef DEBUG_POLL
++static void PrintEventMask(intptr_t fd, intptr_t events) {
++  Syslog::Print("%d ", fd);
++  if ((events & EPOLLIN) != 0) {
++    Syslog::Print("EPOLLIN ");
++  }
++  if ((events & EPOLLPRI) != 0) {
++    Syslog::Print("EPOLLPRI ");
++  }
++  if ((events & EPOLLOUT) != 0) {
++    Syslog::Print("EPOLLOUT ");
++  }
++  if ((events & EPOLLERR) != 0) {
++    Syslog::Print("EPOLLERR ");
++  }
++  if ((events & EPOLLHUP) != 0) {
++    Syslog::Print("EPOLLHUP ");
++  }
++  if ((events & EPOLLRDHUP) != 0) {
++    Syslog::Print("EPOLLRDHUP ");
++  }
++  int all_events =
++      EPOLLIN | EPOLLPRI | EPOLLOUT | EPOLLERR | EPOLLHUP | EPOLLRDHUP;
++  if ((events & ~all_events) != 0) {
++    Syslog::Print("(and %08x) ", events & ~all_events);
++  }
++  Syslog::Print("(available %d) ", FDUtils::AvailableBytes(fd));
++
++  Syslog::Print("\n");
++}
++#endif
++
++intptr_t EventHandlerImplementation::GetPollEvents(intptr_t events,
++                                                   DescriptorInfo* di) {
++#ifdef DEBUG_POLL
++  PrintEventMask(di->fd(), events);
++#endif
++  if ((events & EPOLLERR) != 0) {
++    // Return error only if EPOLLIN is present.
++    return ((events & EPOLLIN) != 0) ? (1 << kErrorEvent) : 0;
++  }
++  intptr_t event_mask = 0;
++  if ((events & EPOLLIN) != 0) {
++    event_mask |= (1 << kInEvent);
++  }
++  if ((events & EPOLLOUT) != 0) {
++    event_mask |= (1 << kOutEvent);
++  }
++  if ((events & (EPOLLHUP | EPOLLRDHUP)) != 0) {
++    event_mask |= (1 << kCloseEvent);
++  }
++  return event_mask;
++}
++
++void EventHandlerImplementation::HandleEvents(struct epoll_event* events,
++                                              int size) {
++  bool interrupt_seen = false;
++  for (int i = 0; i < size; i++) {
++    if (events[i].data.ptr == NULL) {
++      interrupt_seen = true;
++    } else if (events[i].data.fd == timer_fd_) {
++      int64_t val;
++      VOID_TEMP_FAILURE_RETRY_NO_SIGNAL_BLOCKER(
++          read(timer_fd_, &val, sizeof(val)));
++      if (timeout_queue_.HasTimeout()) {
++        DartUtils::PostNull(timeout_queue_.CurrentPort());
++        timeout_queue_.RemoveCurrent();
++      }
++      UpdateTimerFd();
++    } else {
++      DescriptorInfo* di =
++          reinterpret_cast<DescriptorInfo*>(events[i].data.ptr);
++      const intptr_t old_mask = di->Mask();
++      const intptr_t event_mask = GetPollEvents(events[i].events, di);
++      if ((event_mask & (1 << kErrorEvent)) != 0) {
++        di->NotifyAllDartPorts(event_mask);
++        UpdateEpollInstance(old_mask, di);
++      } else if (event_mask != 0) {
++        Dart_Port port = di->NextNotifyDartPort(event_mask);
++        ASSERT(port != 0);
++        UpdateEpollInstance(old_mask, di);
++        DartUtils::PostInt32(port, event_mask);
++      }
++    }
++  }
++  if (interrupt_seen) {
++    // Handle after socket events, so we avoid closing a socket before we handle
++    // the current events.
++    HandleInterruptFd();
++  }
++}
++
++void EventHandlerImplementation::Poll(uword args) {
++  ThreadSignalBlocker signal_blocker(SIGPROF);
++  static const intptr_t kMaxEvents = 16;
++  struct epoll_event events[kMaxEvents];
++  EventHandler* handler = reinterpret_cast<EventHandler*>(args);
++  EventHandlerImplementation* handler_impl = &handler->delegate_;
++  ASSERT(handler_impl != NULL);
++
++  while (!handler_impl->shutdown_) {
++    intptr_t result = TEMP_FAILURE_RETRY_NO_SIGNAL_BLOCKER(
++        epoll_wait(handler_impl->epoll_fd_, events, kMaxEvents, -1));
++    ASSERT(EAGAIN == EWOULDBLOCK);
++    if (result <= 0) {
++      if (errno != EWOULDBLOCK) {
++        perror("Poll failed");
++      }
++    } else {
++      handler_impl->HandleEvents(events, result);
++    }
++  }
++  DEBUG_ASSERT(ReferenceCounted<Socket>::instances() == 0);
++  handler->NotifyShutdownDone();
++}
++
++void EventHandlerImplementation::Start(EventHandler* handler) {
++  int result =
++      Thread::Start("dart:io EventHandler", &EventHandlerImplementation::Poll,
++                    reinterpret_cast<uword>(handler));
++  if (result != 0) {
++    FATAL("Failed to start event handler thread %d", result);
++  }
++}
++
++void EventHandlerImplementation::Shutdown() {
++  SendData(kShutdownId, 0, 0);
++}
++
++void EventHandlerImplementation::SendData(intptr_t id,
++                                          Dart_Port dart_port,
++                                          int64_t data) {
++  WakeupHandler(id, dart_port, data);
++}
++
++void* EventHandlerImplementation::GetHashmapKeyFromFd(intptr_t fd) {
++  // The hashmap does not support keys with value 0.
++  return reinterpret_cast<void*>(fd + 1);
++}
++
++uint32_t EventHandlerImplementation::GetHashmapHashFromFd(intptr_t fd) {
++  // The hashmap does not support keys with value 0.
++  return dart::Utils::WordHash(fd + 1);
++}
++
++}  // namespace bin
++}  // namespace dart
++
++#endif  // defined(DART_HOST_OS_OHOS)
+diff --git a/runtime/bin/eventhandler_ohos.h b/runtime/bin/eventhandler_ohos.h
+new file mode 100644
+index 00000000000..0e4d84c8c12
+--- /dev/null
++++ b/runtime/bin/eventhandler_ohos.h
+@@ -0,0 +1,99 @@
++// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
++// for details. All rights reserved. Use of this source code is governed by a
++// BSD-style license that can be found in the LICENSE file.
++
++#ifndef RUNTIME_BIN_EVENTHANDLER_OHOS_H_
++#define RUNTIME_BIN_EVENTHANDLER_OHOS_H_
++
++#if !defined(RUNTIME_BIN_EVENTHANDLER_H_)
++#error Do not include eventhandler_linux.h directly; use eventhandler.h instead.
++#endif
++
++#include <errno.h>
++#include <sys/epoll.h>
++#include <sys/socket.h>
++#include <unistd.h>
++
++#include "platform/hashmap.h"
++#include "platform/signal_blocker.h"
++
++namespace dart {
++namespace bin {
++
++class DescriptorInfo : public DescriptorInfoBase {
++ public:
++  explicit DescriptorInfo(intptr_t fd) : DescriptorInfoBase(fd) {}
++
++  virtual ~DescriptorInfo() {}
++
++  intptr_t GetPollEvents();
++
++  virtual void Close() {
++    close(fd_);
++    fd_ = -1;
++  }
++
++ private:
++  DISALLOW_COPY_AND_ASSIGN(DescriptorInfo);
++};
++
++class DescriptorInfoSingle : public DescriptorInfoSingleMixin<DescriptorInfo> {
++ public:
++  explicit DescriptorInfoSingle(intptr_t fd)
++      : DescriptorInfoSingleMixin(fd, false) {}
++  virtual ~DescriptorInfoSingle() {}
++
++ private:
++  DISALLOW_COPY_AND_ASSIGN(DescriptorInfoSingle);
++};
++
++class DescriptorInfoMultiple
++    : public DescriptorInfoMultipleMixin<DescriptorInfo> {
++ public:
++  explicit DescriptorInfoMultiple(intptr_t fd)
++      : DescriptorInfoMultipleMixin(fd, false) {}
++  virtual ~DescriptorInfoMultiple() {}
++
++ private:
++  DISALLOW_COPY_AND_ASSIGN(DescriptorInfoMultiple);
++};
++
++class EventHandlerImplementation {
++ public:
++  EventHandlerImplementation();
++  ~EventHandlerImplementation();
++
++  void UpdateEpollInstance(intptr_t old_mask, DescriptorInfo* di);
++
++  // Gets the socket data structure for a given file
++  // descriptor. Creates a new one if one is not found.
++  DescriptorInfo* GetDescriptorInfo(intptr_t fd, bool is_listening);
++  void SendData(intptr_t id, Dart_Port dart_port, int64_t data);
++  void Start(EventHandler* handler);
++  void Shutdown();
++
++ private:
++  void HandleEvents(struct epoll_event* events, int size);
++  static void Poll(uword args);
++  void WakeupHandler(intptr_t id, Dart_Port dart_port, int64_t data);
++  void HandleInterruptFd();
++  void UpdateTimerFd();
++  void SetPort(intptr_t fd, Dart_Port dart_port, intptr_t mask);
++  intptr_t GetPollEvents(intptr_t events, DescriptorInfo* di);
++  static void* GetHashmapKeyFromFd(intptr_t fd);
++  static uint32_t GetHashmapHashFromFd(intptr_t fd);
++
++  SimpleHashMap socket_map_;
++  TimeoutQueue timeout_queue_;
++  bool shutdown_;
++  int interrupt_fds_[2];
++  int epoll_fd_;
++  int timer_fd_;
++
++  DISALLOW_COPY_AND_ASSIGN(EventHandlerImplementation);
++};
++
++}  // namespace bin
++}  // namespace dart
++
++#endif  // RUNTIME_BIN_EVENTHANDLER_OHOS_H_
+diff --git a/runtime/bin/fdutils_ohos.cc b/runtime/bin/fdutils_ohos.cc
+new file mode 100644
+index 00000000000..f7531006cbe
+--- /dev/null
++++ b/runtime/bin/fdutils_ohos.cc
+@@ -0,0 +1,142 @@
++// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
++// for details. All rights reserved. Use of this source code is governed by a
++// BSD-style license that can be found in the LICENSE file.
++
++#include "platform/globals.h"
++#if defined(DART_HOST_OS_OHOS)
++
++#include "bin/fdutils.h"
++
++#include <errno.h>      // NOLINT
++#include <fcntl.h>      // NOLINT
++#include <sys/ioctl.h>  // NOLINT
++#include <unistd.h>     // NOLINT
++
++#include "platform/signal_blocker.h"
++
++namespace dart {
++namespace bin {
++
++bool FDUtils::SetCloseOnExec(intptr_t fd) {
++  intptr_t status;
++  status = NO_RETRY_EXPECTED(fcntl(fd, F_GETFD));
++  if (status < 0) {
++    perror("fcntl(F_GETFD) failed");
++    return false;
++  }
++  status |= FD_CLOEXEC;
++  if (NO_RETRY_EXPECTED(fcntl(fd, F_SETFD, status)) < 0) {
++    perror("fcntl(F_SETFD, FD_CLOEXEC) failed");
++    return false;
++  }
++  return true;
++}
++
++static bool SetBlockingHelper(intptr_t fd, bool blocking) {
++  intptr_t status;
++  status = NO_RETRY_EXPECTED(fcntl(fd, F_GETFL));
++  if (status < 0) {
++    perror("fcntl(F_GETFL) failed");
++    return false;
++  }
++  status = blocking ? (status & ~O_NONBLOCK) : (status | O_NONBLOCK);
++  if (NO_RETRY_EXPECTED(fcntl(fd, F_SETFL, status)) < 0) {
++    perror("fcntl(F_SETFL, O_NONBLOCK) failed");
++    return false;
++  }
++  return true;
++}
++
++bool FDUtils::SetNonBlocking(intptr_t fd) {
++  return SetBlockingHelper(fd, false);
++}
++
++bool FDUtils::SetBlocking(intptr_t fd) {
++  return SetBlockingHelper(fd, true);
++}
++
++bool FDUtils::IsBlocking(intptr_t fd, bool* is_blocking) {
++  intptr_t status;
++  status = NO_RETRY_EXPECTED(fcntl(fd, F_GETFL));
++  if (status < 0) {
++    return false;
++  }
++  *is_blocking = (status & O_NONBLOCK) == 0;
++  return true;
++}
++
++intptr_t FDUtils::AvailableBytes(intptr_t fd) {
++  int available;  // ioctl for FIONREAD expects an 'int*' argument.
++  int result = NO_RETRY_EXPECTED(ioctl(fd, FIONREAD, &available));
++  if (result < 0) {
++    return result;
++  }
++  ASSERT(available >= 0);
++  return static_cast<intptr_t>(available);
++}
++
++ssize_t FDUtils::ReadFromBlocking(int fd, void* buffer, size_t count) {
++#ifdef DEBUG
++  bool is_blocking = false;
++  ASSERT(FDUtils::IsBlocking(fd, &is_blocking));
++  ASSERT(is_blocking);
++#endif
++  size_t remaining = count;
++  char* buffer_pos = reinterpret_cast<char*>(buffer);
++  while (remaining > 0) {
++    ssize_t bytes_read = TEMP_FAILURE_RETRY(read(fd, buffer_pos, remaining));
++    if (bytes_read == 0) {
++      return count - remaining;
++    } else if (bytes_read == -1) {
++      ASSERT(EAGAIN == EWOULDBLOCK);
++      // Error code EWOULDBLOCK should only happen for non blocking
++      // file descriptors.
++      ASSERT(errno != EWOULDBLOCK);
++      return -1;
++    } else {
++      ASSERT(bytes_read > 0);
++      remaining -= bytes_read;
++      buffer_pos += bytes_read;
++    }
++  }
++  return count;
++}
++
++ssize_t FDUtils::WriteToBlocking(int fd, const void* buffer, size_t count) {
++#ifdef DEBUG
++  bool is_blocking = false;
++  ASSERT(FDUtils::IsBlocking(fd, &is_blocking));
++  ASSERT(is_blocking);
++#endif
++  size_t remaining = count;
++  char* buffer_pos = const_cast<char*>(reinterpret_cast<const char*>(buffer));
++  while (remaining > 0) {
++    ssize_t bytes_written =
++        TEMP_FAILURE_RETRY(write(fd, buffer_pos, remaining));
++    if (bytes_written == 0) {
++      return count - remaining;
++    } else if (bytes_written == -1) {
++      ASSERT(EAGAIN == EWOULDBLOCK);
++      // Error code EWOULDBLOCK should only happen for non blocking
++      // file descriptors.
++      ASSERT(errno != EWOULDBLOCK);
++      return -1;
++    } else {
++      ASSERT(bytes_written > 0);
++      remaining -= bytes_written;
++      buffer_pos += bytes_written;
++    }
++  }
++  return count;
++}
++
++void FDUtils::SaveErrorAndClose(intptr_t fd) {
++  int err = errno;
++  close(fd);
++  errno = err;
++}
++
++}  // namespace bin
++}  // namespace dart
++
++#endif  // defined(DART_HOST_OS_OHOS)
+diff --git a/runtime/bin/ffi_test/ffi_test_functions_vmspecific.cc b/runtime/bin/ffi_test/ffi_test_functions_vmspecific.cc
+index a66574162f2..ff34aa04738 100644
+--- a/runtime/bin/ffi_test/ffi_test_functions_vmspecific.cc
++++ b/runtime/bin/ffi_test/ffi_test_functions_vmspecific.cc
+@@ -1295,7 +1295,7 @@ DART_EXPORT void WaitUntilNThreadsEnterBarrier(intptr_t num_threads) {
+ ////////////////////////////////////////////////////////////////////////////////
+ 
+ #if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID) ||            \
+-    defined(DART_HOST_OS_MACOS)
++    defined(DART_HOST_OS_MACOS) || defined(DART_HOST_OS_OHOS)
+ static bool Regress216834909_hang_at_exit = true;
+ 
+ static void Regress216834909_AtExit() {
+@@ -1317,7 +1317,7 @@ DART_EXPORT void Regress216834909_SetAtExit(int64_t install) {
+   }
+ }
+ #endif  // defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID) ||
+-        // defined(DART_HOST_OS_MACOS)
++        // defined(DART_HOST_OS_MACOS) || defined(DART_HOST_OS_OHOS)
+ 
+ DART_EXPORT bool IsNull(Dart_Handle object) {
+   return Dart_IsNull(object);
+diff --git a/runtime/bin/ffi_unit_test/BUILD.gn b/runtime/bin/ffi_unit_test/BUILD.gn
+index 430b908d86b..b3c1f15b9b9 100644
+--- a/runtime/bin/ffi_unit_test/BUILD.gn
++++ b/runtime/bin/ffi_unit_test/BUILD.gn
+@@ -73,6 +73,10 @@ config("define_target_os_linux") {
+   defines = [ "DART_TARGET_OS_LINUX" ]
+ }
+ 
++config("define_target_os_ohos") {
++  defines = [ "DART_TARGET_OS_OHOS" ]
++}
++
+ config("define_target_os_macos") {
+   defines = [ "DART_TARGET_OS_MACOS" ]
+ }
+diff --git a/runtime/bin/file_ohos.cc b/runtime/bin/file_ohos.cc
+new file mode 100644
+index 00000000000..225b1d62c67
+--- /dev/null
++++ b/runtime/bin/file_ohos.cc
+@@ -0,0 +1,786 @@
++// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
++// for details. All rights reserved. Use of this source code is governed by a
++// BSD-style license that can be found in the LICENSE file.
++
++#include "platform/globals.h"
++#if defined(DART_HOST_OS_OHOS)
++
++#include "bin/file.h"
++
++#include <errno.h>         // NOLINT
++#include <fcntl.h>         // NOLINT
++#include <libgen.h>        // NOLINT
++#include <sys/mman.h>      // NOLINT
++#include <sys/sendfile.h>  // NOLINT
++#include <sys/stat.h>      // NOLINT
++#include <sys/types.h>     // NOLINT
++#include <unistd.h>        // NOLINT
++#include <utime.h>         // NOLINT
++
++#include "bin/builtin.h"
++#include "bin/fdutils.h"
++#include "bin/namespace.h"
++#include "platform/signal_blocker.h"
++#include "platform/syslog.h"
++#include "platform/utils.h"
++
++namespace dart {
++namespace bin {
++
++class FileHandle {
++ public:
++  explicit FileHandle(int fd) : fd_(fd) {}
++  ~FileHandle() {}
++  int fd() const { return fd_; }
++  void set_fd(int fd) { fd_ = fd; }
++
++ private:
++  int fd_;
++
++  DISALLOW_COPY_AND_ASSIGN(FileHandle);
++};
++
++File::~File() {
++  if (!IsClosed() && (handle_->fd() != STDOUT_FILENO) &&
++      (handle_->fd() != STDERR_FILENO)) {
++    Close();
++  }
++  delete handle_;
++}
++
++void File::Close() {
++  ASSERT(handle_->fd() >= 0);
++  if (handle_->fd() == STDOUT_FILENO) {
++    // If stdout, redirect fd to /dev/null.
++    int null_fd = TEMP_FAILURE_RETRY(open("/dev/null", O_WRONLY));
++    ASSERT(null_fd >= 0);
++    VOID_TEMP_FAILURE_RETRY(dup2(null_fd, handle_->fd()));
++    close(null_fd);
++  } else {
++    int err = close(handle_->fd());
++    if (err != 0) {
++      const int kBufferSize = 1024;
++      char error_buf[kBufferSize];
++      Syslog::PrintErr("%s\n", Utils::StrError(errno, error_buf, kBufferSize));
++    }
++  }
++  handle_->set_fd(kClosedFd);
++}
++
++intptr_t File::GetFD() {
++  return handle_->fd();
++}
++
++bool File::IsClosed() {
++  return handle_->fd() == kClosedFd;
++}
++
++MappedMemory* File::Map(MapType type,
++                        int64_t position,
++                        int64_t length,
++                        void* start) {
++  ASSERT(handle_->fd() >= 0);
++  ASSERT(length > 0);
++  void* hint = nullptr;
++  int prot = PROT_NONE;
++  int flags = MAP_PRIVATE;
++  switch (type) {
++    case kReadOnly:
++      prot = PROT_READ;
++      break;
++    case kReadExecute:
++      // Try to allocate near the VM's binary.
++      hint = reinterpret_cast<void*>(&Dart_Initialize);
++      prot = PROT_READ | PROT_EXEC;
++      break;
++    case kReadWrite:
++      prot = PROT_READ | PROT_WRITE;
++      break;
++  }
++  if (start != nullptr) {
++    hint = start;
++    flags |= MAP_FIXED;
++  }
++  void* addr = mmap(hint, length, prot, flags, handle_->fd(), position);
++  if (addr == MAP_FAILED) {
++    return NULL;
++  }
++  return new MappedMemory(addr, length, /*should_unmap=*/start == nullptr);
++}
++
++void MappedMemory::Unmap() {
++  int result = munmap(address_, size_);
++  ASSERT(result == 0);
++  address_ = 0;
++  size_ = 0;
++}
++
++int64_t File::Read(void* buffer, int64_t num_bytes) {
++  ASSERT(handle_->fd() >= 0);
++  return TEMP_FAILURE_RETRY(read(handle_->fd(), buffer, num_bytes));
++}
++
++int64_t File::Write(const void* buffer, int64_t num_bytes) {
++  ASSERT(handle_->fd() >= 0);
++  return TEMP_FAILURE_RETRY(write(handle_->fd(), buffer, num_bytes));
++}
++
++bool File::VPrint(const char* format, va_list args) {
++  // Measure.
++  va_list measure_args;
++  va_copy(measure_args, args);
++  intptr_t len = vsnprintf(NULL, 0, format, measure_args);
++  va_end(measure_args);
++
++  char* buffer = reinterpret_cast<char*>(malloc(len + 1));
++
++  // Print.
++  va_list print_args;
++  va_copy(print_args, args);
++  vsnprintf(buffer, len + 1, format, print_args);
++  va_end(print_args);
++
++  bool result = WriteFully(buffer, len);
++  free(buffer);
++  return result;
++}
++
++int64_t File::Position() {
++  ASSERT(handle_->fd() >= 0);
++  return NO_RETRY_EXPECTED(lseek64(handle_->fd(), 0, SEEK_CUR));
++}
++
++bool File::SetPosition(int64_t position) {
++  ASSERT(handle_->fd() >= 0);
++  return NO_RETRY_EXPECTED(lseek64(handle_->fd(), position, SEEK_SET)) >= 0;
++}
++
++bool File::Truncate(int64_t length) {
++  ASSERT(handle_->fd() >= 0);
++  return TEMP_FAILURE_RETRY(ftruncate64(handle_->fd(), length) != -1);
++}
++
++bool File::Flush() {
++  ASSERT(handle_->fd() >= 0);
++  return NO_RETRY_EXPECTED(fsync(handle_->fd())) != -1;
++}
++
++bool File::Lock(File::LockType lock, int64_t start, int64_t end) {
++  ASSERT(handle_->fd() >= 0);
++  ASSERT((end == -1) || (end > start));
++  struct flock fl;
++  switch (lock) {
++    case File::kLockUnlock:
++      fl.l_type = F_UNLCK;
++      break;
++    case File::kLockShared:
++    case File::kLockBlockingShared:
++      fl.l_type = F_RDLCK;
++      break;
++    case File::kLockExclusive:
++    case File::kLockBlockingExclusive:
++      fl.l_type = F_WRLCK;
++      break;
++    default:
++      return false;
++  }
++  fl.l_whence = SEEK_SET;
++  fl.l_start = start;
++  fl.l_len = end == -1 ? 0 : end - start;
++  int cmd = F_SETLK;
++  if ((lock == File::kLockBlockingShared) ||
++      (lock == File::kLockBlockingExclusive)) {
++    cmd = F_SETLKW;
++  }
++  return TEMP_FAILURE_RETRY(fcntl(handle_->fd(), cmd, &fl)) != -1;
++}
++
++int64_t File::Length() {
++  ASSERT(handle_->fd() >= 0);
++  struct stat64 st;
++  if (TEMP_FAILURE_RETRY(fstat64(handle_->fd(), &st)) == 0) {
++    return st.st_size;
++  }
++  return -1;
++}
++
++File* File::FileOpenW(const wchar_t* system_name, FileOpenMode mode) {
++  UNREACHABLE();
++  return NULL;
++}
++
++File* File::OpenFD(int fd) {
++  return new File(new FileHandle(fd));
++}
++
++File* File::Open(Namespace* namespc, const char* name, FileOpenMode mode) {
++  NamespaceScope ns(namespc, name);
++  // Report errors for non-regular files.
++  struct stat64 st;
++  if (TEMP_FAILURE_RETRY(fstatat64(ns.fd(), ns.path(), &st, 0)) == 0) {
++    // Only accept regular files, character devices, and pipes.
++    if (!S_ISREG(st.st_mode) && !S_ISCHR(st.st_mode) && !S_ISFIFO(st.st_mode)) {
++      errno = (S_ISDIR(st.st_mode)) ? EISDIR : ENOENT;
++      return NULL;
++    }
++  }
++  int flags = O_RDONLY;
++  if ((mode & kWrite) != 0) {
++    ASSERT((mode & kWriteOnly) == 0);
++    flags = (O_RDWR | O_CREAT);
++  }
++  if ((mode & kWriteOnly) != 0) {
++    ASSERT((mode & kWrite) == 0);
++    flags = (O_WRONLY | O_CREAT);
++  }
++  if ((mode & kTruncate) != 0) {
++    flags = flags | O_TRUNC;
++  }
++  flags |= O_CLOEXEC;
++  const int fd = TEMP_FAILURE_RETRY(openat64(ns.fd(), ns.path(), flags, 0666));
++  if (fd < 0) {
++    return NULL;
++  }
++  if ((((mode & kWrite) != 0) && ((mode & kTruncate) == 0)) ||
++      (((mode & kWriteOnly) != 0) && ((mode & kTruncate) == 0))) {
++    int64_t position = NO_RETRY_EXPECTED(lseek64(fd, 0, SEEK_END));
++    if (position < 0) {
++      return NULL;
++    }
++  }
++  return OpenFD(fd);
++}
++
++Utils::CStringUniquePtr File::UriToPath(const char* uri) {
++  const char* path = (strlen(uri) >= 8 && strncmp(uri, "file:///", 8) == 0)
++      ? uri + 7 : uri;
++  UriDecoder uri_decoder(path);
++  if (uri_decoder.decoded() == nullptr) {
++    errno = EINVAL;
++    return Utils::CreateCStringUniquePtr(nullptr);
++  }
++  return Utils::CreateCStringUniquePtr(strdup(uri_decoder.decoded()));
++}
++
++File* File::OpenUri(Namespace* namespc, const char* uri, FileOpenMode mode) {
++  auto path = UriToPath(uri);
++  if (path == nullptr) {
++    return nullptr;
++  }
++  return File::Open(namespc, path.get(), mode);
++}
++
++File* File::OpenStdio(int fd) {
++  return new File(new FileHandle(fd));
++}
++
++bool File::Exists(Namespace* namespc, const char* name) {
++  NamespaceScope ns(namespc, name);
++  struct stat64 st;
++  if (TEMP_FAILURE_RETRY(fstatat64(ns.fd(), ns.path(), &st, 0)) == 0) {
++    // Everything but a directory and a link is a file to Dart.
++    return !S_ISDIR(st.st_mode) && !S_ISLNK(st.st_mode);
++  } else {
++    return false;
++  }
++}
++
++bool File::ExistsUri(Namespace* namespc, const char* uri) {
++  auto path = UriToPath(uri);
++  if (path == nullptr) {
++    return false;
++  }
++  return File::Exists(namespc, path.get());
++}
++
++bool File::Create(Namespace* namespc, const char* name, bool exclusive) {
++  NamespaceScope ns(namespc, name);
++  int flags = O_RDONLY | O_CREAT | O_CLOEXEC;
++  if (exclusive) {
++    flags |= O_EXCL;
++  }
++  const int fd = TEMP_FAILURE_RETRY(openat64(ns.fd(), ns.path(), flags, 0666));
++  if (fd < 0) {
++    return false;
++  }
++  // File.create returns a File, so we shouldn't be giving the illusion that the
++  // call has created a file or that a file already exists if there is already
++  // an entity at the same path that is a directory or a link.
++  bool is_file = true;
++  struct stat64 st;
++  if (TEMP_FAILURE_RETRY(fstat64(fd, &st)) == 0) {
++    if (S_ISDIR(st.st_mode)) {
++      errno = EISDIR;
++      is_file = false;
++    } else if (S_ISLNK(st.st_mode)) {
++      errno = ENOENT;
++      is_file = false;
++    }
++  }
++  FDUtils::SaveErrorAndClose(fd);
++  return is_file;
++}
++
++bool File::CreateLink(Namespace* namespc,
++                      const char* name,
++                      const char* target) {
++  NamespaceScope ns(namespc, name);
++  return NO_RETRY_EXPECTED(symlinkat(target, ns.fd(), ns.path())) == 0;
++}
++
++bool File::CreatePipe(Namespace* namespc, File** readPipe, File** writePipe) {
++  int pipe_fds[2];
++  int status = NO_RETRY_EXPECTED(pipe(pipe_fds));
++  if (status != 0) {
++    return false;
++  }
++  *readPipe = OpenFD(pipe_fds[0]);
++  *writePipe = OpenFD(pipe_fds[1]);
++  return true;
++}
++
++File::Type File::GetType(Namespace* namespc,
++                         const char* name,
++                         bool follow_links) {
++  NamespaceScope ns(namespc, name);
++  struct stat64 entry_info;
++  int stat_success;
++  if (follow_links) {
++    stat_success =
++        TEMP_FAILURE_RETRY(fstatat64(ns.fd(), ns.path(), &entry_info, 0));
++  } else {
++    stat_success = TEMP_FAILURE_RETRY(
++        fstatat64(ns.fd(), ns.path(), &entry_info, AT_SYMLINK_NOFOLLOW));
++  }
++  if (stat_success == -1) {
++    return File::kDoesNotExist;
++  }
++  if (S_ISDIR(entry_info.st_mode)) {
++    return File::kIsDirectory;
++  }
++  if (S_ISREG(entry_info.st_mode)) {
++    return File::kIsFile;
++  }
++  if (S_ISLNK(entry_info.st_mode)) {
++    return File::kIsLink;
++  }
++  if (S_ISSOCK(entry_info.st_mode)) {
++    return File::kIsSock;
++  }
++  if (S_ISFIFO(entry_info.st_mode)) {
++    return File::kIsPipe;
++  }
++  return File::kDoesNotExist;
++}
++
++static void SetErrno(File::Type type) {
++  switch (type) {
++    case File::kIsDirectory:
++      errno = EISDIR;
++      break;
++    case File::kDoesNotExist:
++      errno = ENOENT;
++      break;
++    default:
++      errno = EINVAL;
++      break;
++  }
++}
++
++static bool CheckTypeAndSetErrno(Namespace* namespc,
++                                 const char* name,
++                                 File::Type expected,
++                                 bool follow_links) {
++  File::Type actual = File::GetType(namespc, name, follow_links);
++  if (actual == expected) {
++    return true;
++  }
++  SetErrno(actual);
++  return false;
++}
++
++bool File::Delete(Namespace* namespc, const char* name) {
++  File::Type type = File::GetType(namespc, name, true);
++  if (type == kIsFile || type == kIsSock || type == kIsPipe) {
++    NamespaceScope ns(namespc, name);
++    return (NO_RETRY_EXPECTED(unlinkat(ns.fd(), ns.path(), 0)) == 0);
++  }
++  SetErrno(type);
++  return false;
++}
++
++bool File::DeleteLink(Namespace* namespc, const char* name) {
++  NamespaceScope ns(namespc, name);
++  return CheckTypeAndSetErrno(namespc, name, kIsLink, false) &&
++         (NO_RETRY_EXPECTED(unlinkat(ns.fd(), ns.path(), 0)) == 0);
++}
++
++bool File::Rename(Namespace* namespc,
++                  const char* old_path,
++                  const char* new_path) {
++  File::Type type = File::GetType(namespc, old_path, true);
++  if (type == kIsFile || type == kIsSock || type == kIsPipe) {
++    NamespaceScope oldns(namespc, old_path);
++    NamespaceScope newns(namespc, new_path);
++    return (NO_RETRY_EXPECTED(renameat(oldns.fd(), oldns.path(), newns.fd(),
++                                       newns.path())) == 0);
++  }
++  SetErrno(type);
++  return false;
++}
++
++bool File::RenameLink(Namespace* namespc,
++                      const char* old_path,
++                      const char* new_path) {
++  NamespaceScope oldns(namespc, old_path);
++  NamespaceScope newns(namespc, new_path);
++  return CheckTypeAndSetErrno(namespc, old_path, kIsLink, false) &&
++         (NO_RETRY_EXPECTED(renameat(oldns.fd(), oldns.path(), newns.fd(),
++                                     newns.path())) == 0);
++}
++
++bool File::Copy(Namespace* namespc,
++                const char* old_path,
++                const char* new_path) {
++  File::Type type = File::GetType(namespc, old_path, true);
++  if (type != kIsFile && type != kIsSock && type != kIsPipe) {
++    SetErrno(type);
++    return false;
++  }
++  NamespaceScope oldns(namespc, old_path);
++  struct stat64 st;
++  if (TEMP_FAILURE_RETRY(fstatat64(oldns.fd(), oldns.path(), &st, 0)) != 0) {
++    return false;
++  }
++  const int old_fd = TEMP_FAILURE_RETRY(
++      openat64(oldns.fd(), oldns.path(), O_RDONLY | O_CLOEXEC));
++  if (old_fd < 0) {
++    return false;
++  }
++  NamespaceScope newns(namespc, new_path);
++  const int new_fd = TEMP_FAILURE_RETRY(
++      openat64(newns.fd(), newns.path(),
++               O_WRONLY | O_TRUNC | O_CREAT | O_CLOEXEC, st.st_mode));
++  if (new_fd < 0) {
++    close(old_fd);
++    return false;
++  }
++  int64_t offset = 0;
++  intptr_t result = 1;
++  while (result > 0) {
++    // Loop to ensure we copy everything, and not only up to 2GB.
++    result = NO_RETRY_EXPECTED(sendfile64(new_fd, old_fd, &offset, kMaxUint32));
++  }
++  // From sendfile man pages:
++  //   Applications may wish to fall back to read(2)/write(2) in the case
++  //   where sendfile() fails with EINVAL or ENOSYS.
++  if ((result < 0) && ((errno == EINVAL) || (errno == ENOSYS))) {
++    const intptr_t kBufferSize = 8 * KB;
++    uint8_t* buffer = reinterpret_cast<uint8_t*>(malloc(kBufferSize));
++    while ((result = TEMP_FAILURE_RETRY(read(old_fd, buffer, kBufferSize))) >
++           0) {
++      int wrote = TEMP_FAILURE_RETRY(write(new_fd, buffer, result));
++      if (wrote != result) {
++        result = -1;
++        break;
++      }
++    }
++    free(buffer);
++  }
++  int e = errno;
++  close(old_fd);
++  close(new_fd);
++  if (result < 0) {
++    VOID_NO_RETRY_EXPECTED(unlinkat(newns.fd(), newns.path(), 0));
++    errno = e;
++    return false;
++  }
++  return true;
++}
++
++static bool StatHelper(Namespace* namespc,
++                       const char* name,
++                       struct stat64* st) {
++  NamespaceScope ns(namespc, name);
++  if (TEMP_FAILURE_RETRY(fstatat64(ns.fd(), ns.path(), st, 0)) != 0) {
++    return false;
++  }
++  // Signal an error if it's a directory.
++  if (S_ISDIR(st->st_mode)) {
++    errno = EISDIR;
++    return false;
++  }
++  // Otherwise assume the caller knows what it's doing.
++  return true;
++}
++
++int64_t File::LengthFromPath(Namespace* namespc, const char* name) {
++  struct stat64 st;
++  if (!StatHelper(namespc, name, &st)) {
++    return -1;
++  }
++  return st.st_size;
++}
++
++static int64_t TimespecToMilliseconds(const struct timespec& t) {
++  return static_cast<int64_t>(t.tv_sec) * 1000L +
++         static_cast<int64_t>(t.tv_nsec) / 1000000L;
++}
++
++static void MillisecondsToTimespec(int64_t millis, struct timespec* t) {
++  ASSERT(t != NULL);
++  t->tv_sec = millis / kMillisecondsPerSecond;
++  t->tv_nsec = (millis % kMillisecondsPerSecond) * 1000L;
++}
++
++void File::Stat(Namespace* namespc, const char* name, int64_t* data) {
++  NamespaceScope ns(namespc, name);
++  struct stat64 st;
++  if (TEMP_FAILURE_RETRY(fstatat64(ns.fd(), ns.path(), &st, 0)) == 0) {
++    if (S_ISREG(st.st_mode)) {
++      data[kType] = kIsFile;
++    } else if (S_ISDIR(st.st_mode)) {
++      data[kType] = kIsDirectory;
++    } else if (S_ISLNK(st.st_mode)) {
++      data[kType] = kIsLink;
++    } else if (S_ISSOCK(st.st_mode)) {
++      data[kType] = kIsSock;
++    } else if (S_ISFIFO(st.st_mode)) {
++      data[kType] = kIsPipe;
++    } else {
++      data[kType] = kDoesNotExist;
++    }
++    data[kCreatedTime] = TimespecToMilliseconds(st.st_ctim);
++    data[kModifiedTime] = TimespecToMilliseconds(st.st_mtim);
++    data[kAccessedTime] = TimespecToMilliseconds(st.st_atim);
++    data[kMode] = st.st_mode;
++    data[kSize] = st.st_size;
++  } else {
++    data[kType] = kDoesNotExist;
++  }
++}
++
++time_t File::LastModified(Namespace* namespc, const char* name) {
++  struct stat64 st;
++  if (!StatHelper(namespc, name, &st)) {
++    return -1;
++  }
++  return st.st_mtime;
++}
++
++time_t File::LastAccessed(Namespace* namespc, const char* name) {
++  struct stat64 st;
++  if (!StatHelper(namespc, name, &st)) {
++    return -1;
++  }
++  return st.st_atime;
++}
++
++bool File::SetLastAccessed(Namespace* namespc,
++                           const char* name,
++                           int64_t millis) {
++  // First get the current times.
++  struct stat64 st;
++  if (!StatHelper(namespc, name, &st)) {
++    return false;
++  }
++
++  // Set the new time:
++  NamespaceScope ns(namespc, name);
++  struct timespec times[2];
++  MillisecondsToTimespec(millis, &times[0]);
++  times[1] = st.st_mtim;
++  return utimensat(ns.fd(), ns.path(), times, 0) == 0;
++}
++
++bool File::SetLastModified(Namespace* namespc,
++                           const char* name,
++                           int64_t millis) {
++  // First get the current times.
++  struct stat64 st;
++  if (!StatHelper(namespc, name, &st)) {
++    return false;
++  }
++
++  // Set the new time:
++  NamespaceScope ns(namespc, name);
++  struct timespec times[2];
++  times[0] = st.st_atim;
++  MillisecondsToTimespec(millis, &times[1]);
++  return utimensat(ns.fd(), ns.path(), times, 0) == 0;
++}
++
++const char* File::LinkTarget(Namespace* namespc,
++                             const char* name,
++                             char* dest,
++                             int dest_size) {
++  NamespaceScope ns(namespc, name);
++  struct stat64 link_stats;
++  const int status = TEMP_FAILURE_RETRY(
++      fstatat64(ns.fd(), ns.path(), &link_stats, AT_SYMLINK_NOFOLLOW));
++  if (status != 0) {
++    return NULL;
++  }
++  if (!S_ISLNK(link_stats.st_mode)) {
++    errno = ENOENT;
++    return NULL;
++  }
++  // Don't rely on the link_stats.st_size for the size of the link
++  // target. For some filesystems, e.g. procfs, this value is always
++  // 0. Also the link might have changed before the readlink call.
++  const int kBufferSize = PATH_MAX + 1;
++  char target[kBufferSize];
++  const int target_size =
++      TEMP_FAILURE_RETRY(readlinkat(ns.fd(), ns.path(), target, kBufferSize));
++  if (target_size <= 0) {
++    return NULL;
++  }
++  if (dest == NULL) {
++    dest = DartUtils::ScopedCString(target_size + 1);
++  } else {
++    ASSERT(dest_size > 0);
++    if (dest_size <= target_size) {
++      return NULL;
++    }
++  }
++  memmove(dest, target, target_size);
++  dest[target_size] = '\0';
++  return dest;
++}
++
++bool File::IsAbsolutePath(const char* pathname) {
++  return (pathname != NULL) && (pathname[0] == '/');
++}
++
++intptr_t File::ReadLinkInto(const char* pathname,
++                            char* result,
++                            size_t result_size) {
++  ASSERT(pathname != NULL);
++  ASSERT(IsAbsolutePath(pathname));
++  struct stat64 link_stats;
++  if (TEMP_FAILURE_RETRY(lstat64(pathname, &link_stats)) != 0) {
++    return -1;
++  }
++  if (!S_ISLNK(link_stats.st_mode)) {
++    errno = ENOENT;
++    return -1;
++  }
++  size_t target_size =
++      TEMP_FAILURE_RETRY(readlink(pathname, result, result_size));
++  if (target_size <= 0) {
++    return -1;
++  }
++  // readlink returns non-zero terminated strings. Append.
++  if (target_size < result_size) {
++    result[target_size] = '\0';
++    target_size++;
++  }
++  return target_size;
++}
++
++const char* File::ReadLink(const char* pathname) {
++  // Don't rely on the link_stats.st_size for the size of the link
++  // target. For some filesystems, e.g. procfs, this value is always
++  // 0. Also the link might have changed before the readlink call.
++  const int kBufferSize = PATH_MAX + 1;
++  char target[kBufferSize];
++  size_t target_size = ReadLinkInto(pathname, target, kBufferSize);
++  if (target_size <= 0) {
++    return NULL;
++  }
++  char* target_name = DartUtils::ScopedCString(target_size);
++  ASSERT(target_name != NULL);
++  memmove(target_name, target, target_size);
++  return target_name;
++}
++
++const char* File::GetCanonicalPath(Namespace* namespc,
++                                   const char* name,
++                                   char* dest,
++                                   int dest_size) {
++  if (name == NULL) {
++    return NULL;
++  }
++  if (!Namespace::IsDefault(namespc)) {
++    // TODO(zra): There is no realpathat(). Also chasing a symlink might result
++    // in a path to something outside of the namespace, so canonicalizing paths
++    // would have to be done carefully. For now, don't do anything.
++    return name;
++  }
++  char* abs_path;
++  if (dest == NULL) {
++    dest = DartUtils::ScopedCString(PATH_MAX + 1);
++  } else {
++    ASSERT(dest_size >= PATH_MAX);
++  }
++  ASSERT(dest != NULL);
++  do {
++    abs_path = realpath(name, dest);
++  } while ((abs_path == NULL) && (errno == EINTR));
++  ASSERT(abs_path == NULL || IsAbsolutePath(abs_path));
++  ASSERT(abs_path == NULL || (abs_path == dest));
++  return abs_path;
++}
++
++const char* File::PathSeparator() {
++  return "/";
++}
++
++const char* File::StringEscapedPathSeparator() {
++  return "/";
++}
++
++File::StdioHandleType File::GetStdioHandleType(int fd) {
++  struct stat64 buf;
++  int result = TEMP_FAILURE_RETRY(fstat64(fd, &buf));
++  if (result == -1) {
++    return kTypeError;
++  }
++  if (S_ISCHR(buf.st_mode)) {
++    return kTerminal;
++  }
++  if (S_ISFIFO(buf.st_mode)) {
++    return kPipe;
++  }
++  if (S_ISSOCK(buf.st_mode)) {
++    return kSocket;
++  }
++  if (S_ISREG(buf.st_mode)) {
++    return kFile;
++  }
++  return kOther;
++}
++
++File::Identical File::AreIdentical(Namespace* namespc_1,
++                                   const char* file_1,
++                                   Namespace* namespc_2,
++                                   const char* file_2) {
++  struct stat64 file_1_info;
++  struct stat64 file_2_info;
++  int status;
++  {
++    NamespaceScope ns1(namespc_1, file_1);
++    status = TEMP_FAILURE_RETRY(
++        fstatat64(ns1.fd(), ns1.path(), &file_1_info, AT_SYMLINK_NOFOLLOW));
++    if (status == -1) {
++      return File::kError;
++    }
++  }
++  {
++    NamespaceScope ns2(namespc_2, file_2);
++    status = TEMP_FAILURE_RETRY(
++        fstatat64(ns2.fd(), ns2.path(), &file_2_info, AT_SYMLINK_NOFOLLOW));
++    if (status == -1) {
++      return File::kError;
++    }
++  }
++  return ((file_1_info.st_ino == file_2_info.st_ino) &&
++          (file_1_info.st_dev == file_2_info.st_dev))
++             ? File::kIdentical
++             : File::kDifferent;
++}
++
++}  // namespace bin
++}  // namespace dart
++
++#endif  // defined(DART_HOST_OS_OHOS)
+diff --git a/runtime/bin/file_system_watcher_ohos.cc b/runtime/bin/file_system_watcher_ohos.cc
+new file mode 100644
+index 00000000000..fa030a251e8
+--- /dev/null
++++ b/runtime/bin/file_system_watcher_ohos.cc
+@@ -0,0 +1,149 @@
++// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
++// for details. All rights reserved. Use of this source code is governed by a
++// BSD-style license that can be found in the LICENSE file.
++
++#include "platform/globals.h"
++#if defined(DART_HOST_OS_OHOS)
++
++#include "bin/file_system_watcher.h"
++
++#include <errno.h>        // NOLINT
++#include <sys/inotify.h>  // NOLINT
++
++#include "bin/fdutils.h"
++#include "bin/file.h"
++#include "bin/socket.h"
++#include "platform/signal_blocker.h"
++
++namespace dart {
++namespace bin {
++
++bool FileSystemWatcher::IsSupported() {
++  return true;
++}
++
++intptr_t FileSystemWatcher::Init() {
++  int id = NO_RETRY_EXPECTED(inotify_init1(IN_CLOEXEC));
++  if (id < 0) {
++    return -1;
++  }
++  // Some systems dosn't support setting this as non-blocking. Since watching
++  // internals are kept away from the user, we know it's possible to continue,
++  // even if setting non-blocking fails.
++  FDUtils::SetNonBlocking(id);
++  return id;
++}
++
++void FileSystemWatcher::Close(intptr_t id) {
++  USE(id);
++}
++
++intptr_t FileSystemWatcher::WatchPath(intptr_t id,
++                                      Namespace* namespc,
++                                      const char* path,
++                                      int events,
++                                      bool recursive) {
++  int list_events = IN_DELETE_SELF | IN_MOVE_SELF;
++  if ((events & kCreate) != 0) {
++    list_events |= IN_CREATE;
++  }
++  if ((events & kModifyContent) != 0) {
++    list_events |= IN_CLOSE_WRITE | IN_ATTRIB | IN_MODIFY;
++  }
++  if ((events & kDelete) != 0) {
++    list_events |= IN_DELETE;
++  }
++  if ((events & kMove) != 0) {
++    list_events |= IN_MOVE;
++  }
++  const char* resolved_path = File::GetCanonicalPath(namespc, path);
++  path = resolved_path != NULL ? resolved_path : path;
++  int path_id = NO_RETRY_EXPECTED(inotify_add_watch(id, path, list_events));
++  if (path_id < 0) {
++    return -1;
++  }
++  return path_id;
++}
++
++void FileSystemWatcher::UnwatchPath(intptr_t id, intptr_t path_id) {
++  VOID_NO_RETRY_EXPECTED(inotify_rm_watch(id, path_id));
++}
++
++intptr_t FileSystemWatcher::GetSocketId(intptr_t id, intptr_t path_id) {
++  USE(path_id);
++  return id;
++}
++
++static int InotifyEventToMask(struct inotify_event* e) {
++  int mask = 0;
++  if ((e->mask & IN_CLOSE_WRITE) != 0 || (e->mask & IN_MODIFY) != 0) {
++    mask |= FileSystemWatcher::kModifyContent;
++  }
++  if ((e->mask & IN_ATTRIB) != 0) {
++    mask |= FileSystemWatcher::kModifyAttribute;
++  }
++  if ((e->mask & IN_CREATE) != 0) {
++    mask |= FileSystemWatcher::kCreate;
++  }
++  if ((e->mask & IN_MOVE) != 0) {
++    mask |= FileSystemWatcher::kMove;
++  }
++  if ((e->mask & IN_DELETE) != 0) {
++    mask |= FileSystemWatcher::kDelete;
++  }
++  if ((e->mask & (IN_DELETE_SELF | IN_MOVE_SELF)) != 0) {
++    mask |= FileSystemWatcher::kDeleteSelf;
++  }
++  if ((e->mask & IN_ISDIR) != 0) {
++    mask |= FileSystemWatcher::kIsDir;
++  }
++  return mask;
++}
++
++Dart_Handle FileSystemWatcher::ReadEvents(intptr_t id, intptr_t path_id) {
++  USE(path_id);
++  const intptr_t kEventSize = sizeof(struct inotify_event);
++  const intptr_t kBufferSize = kEventSize + NAME_MAX + 1;
++  uint8_t buffer[kBufferSize];
++  intptr_t bytes =
++      SocketBase::Read(id, buffer, kBufferSize, SocketBase::kAsync);
++  if (bytes < 0) {
++    return DartUtils::NewDartOSError();
++  }
++  const intptr_t kMaxCount = bytes / kEventSize;
++  Dart_Handle events = Dart_NewList(kMaxCount);
++  intptr_t offset = 0;
++  intptr_t i = 0;
++  while (offset < bytes) {
++    struct inotify_event* e =
++        reinterpret_cast<struct inotify_event*>(buffer + offset);
++    if ((e->mask & IN_IGNORED) == 0) {
++      Dart_Handle event = Dart_NewList(5);
++      int mask = InotifyEventToMask(e);
++      Dart_ListSetAt(event, 0, Dart_NewInteger(mask));
++      Dart_ListSetAt(event, 1, Dart_NewInteger(e->cookie));
++      if (e->len > 0) {
++        Dart_Handle name = Dart_NewStringFromUTF8(
++            reinterpret_cast<uint8_t*>(e->name), strlen(e->name));
++        if (Dart_IsError(name)) {
++          return name;
++        }
++        Dart_ListSetAt(event, 2, name);
++      } else {
++        Dart_ListSetAt(event, 2, Dart_Null());
++      }
++      Dart_ListSetAt(event, 3, Dart_NewBoolean((e->mask & IN_MOVED_TO) != 0u));
++      Dart_ListSetAt(event, 4, Dart_NewInteger(e->wd));
++      Dart_ListSetAt(events, i, event);
++      i++;
++    }
++    offset += kEventSize + e->len;
++  }
++  ASSERT(offset == bytes);
++  return events;
++}
++
++}  // namespace bin
++}  // namespace dart
++
++#endif  // defined(DART_HOST_OS_OHOS)
+diff --git a/runtime/bin/io_impl_sources.gni b/runtime/bin/io_impl_sources.gni
+index d3ace672e9b..8367282a1ad 100644
+--- a/runtime/bin/io_impl_sources.gni
++++ b/runtime/bin/io_impl_sources.gni
+@@ -14,6 +14,8 @@ io_impl_sources = [
+   "eventhandler_fuchsia.h",
+   "eventhandler_linux.cc",
+   "eventhandler_linux.h",
++  "eventhandler_ohos.cc",
++  "eventhandler_ohos.h",
+   "eventhandler_macos.cc",
+   "eventhandler_macos.h",
+   "eventhandler_win.cc",
+@@ -22,6 +24,7 @@ io_impl_sources = [
+   "file_system_watcher.h",
+   "file_system_watcher_fuchsia.cc",
+   "file_system_watcher_linux.cc",
++  "file_system_watcher_ohos.cc",
+   "file_system_watcher_macos.cc",
+   "file_system_watcher_win.cc",
+   "filter.cc",
+@@ -37,6 +40,7 @@ io_impl_sources = [
+   "namespace_fuchsia.cc",
+   "namespace_fuchsia.h",
+   "namespace_linux.cc",
++  "namespace_ohos.cc",
+   "namespace_macos.cc",
+   "namespace_win.cc",
+   "platform.cc",
+@@ -50,6 +54,7 @@ io_impl_sources = [
+   "process.h",
+   "process_fuchsia.cc",
+   "process_linux.cc",
++  "process_ohos.cc",
+   "process_macos.cc",
+   "process_win.cc",
+   "reference_counting.h",
+@@ -63,6 +68,7 @@ io_impl_sources = [
+   "security_context.h",
+   "security_context_fuchsia.cc",
+   "security_context_linux.cc",
++  "security_context_ohos.cc",
+   "security_context_macos.cc",
+   "security_context_win.cc",
+   "socket.cc",
+@@ -80,18 +86,21 @@ io_impl_sources = [
+   "socket_base_win.h",
+   "socket_fuchsia.cc",
+   "socket_linux.cc",
++  "socket_ohos.cc",
+   "socket_macos.cc",
+   "socket_win.cc",
+   "stdio.cc",
+   "stdio.h",
+   "stdio_fuchsia.cc",
+   "stdio_linux.cc",
++  "stdio_ohos.cc",
+   "stdio_macos.cc",
+   "stdio_win.cc",
+   "sync_socket.cc",
+   "sync_socket.h",
+   "sync_socket_fuchsia.cc",
+   "sync_socket_linux.cc",
++  "sync_socket_ohos.cc",
+   "sync_socket_macos.cc",
+   "sync_socket_win.cc",
+   "typed_data_utils.cc",
+diff --git a/runtime/bin/main_options.cc b/runtime/bin/main_options.cc
+index 25d484c60c0..7e4ba510d9e 100644
+--- a/runtime/bin/main_options.cc
++++ b/runtime/bin/main_options.cc
+@@ -239,7 +239,7 @@ void Options::PrintUsage() {
+ "  use for secure socket connections.\n"
+ #if defined(DART_HOST_OS_LINUX) || \
+     defined(DART_HOST_OS_ANDROID) || \
+-    defined(DART_HOST_OS_FUCHSIA)
++    defined(DART_HOST_OS_FUCHSIA) || defined(DART_HOST_OS_OHOS)
+ "--namespace=<path>\n"
+ "  The path to a directory that dart:io calls will treat as the root of the\n"
+ "  filesystem.\n"
+diff --git a/runtime/bin/namespace_ohos.cc b/runtime/bin/namespace_ohos.cc
+new file mode 100644
+index 00000000000..71b68ca618d
+--- /dev/null
++++ b/runtime/bin/namespace_ohos.cc
+@@ -0,0 +1,159 @@
++// Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
++// for details. All rights reserved. Use of this source code is governed by a
++// BSD-style license that can be found in the LICENSE file.
++
++#include "platform/globals.h"
++#if defined(DART_HOST_OS_OHOS)
++
++#include "bin/namespace.h"
++
++#include <errno.h>
++#include <fcntl.h>
++
++#include "bin/file.h"
++#include "platform/signal_blocker.h"
++#include "platform/text_buffer.h"
++
++namespace dart {
++namespace bin {
++
++class NamespaceImpl {
++ public:
++  explicit NamespaceImpl(intptr_t rootfd) : rootfd_(rootfd), cwd_(strdup("/")) {
++    ASSERT(rootfd_ > 0);
++    cwdfd_ = dup(rootfd_);
++    ASSERT(cwdfd_ > 0);
++  }
++
++  explicit NamespaceImpl(const char* path)
++      : rootfd_(TEMP_FAILURE_RETRY(open64(path, O_DIRECTORY))),
++        cwd_(strdup("/")) {
++    ASSERT(rootfd_ > 0);
++    cwdfd_ = dup(rootfd_);
++    ASSERT(cwdfd_ > 0);
++  }
++
++  ~NamespaceImpl() {
++    NO_RETRY_EXPECTED(close(rootfd_));
++    free(cwd_);
++    NO_RETRY_EXPECTED(close(cwdfd_));
++  }
++
++  intptr_t rootfd() const { return rootfd_; }
++  char* cwd() const { return cwd_; }
++  intptr_t cwdfd() const { return cwdfd_; }
++
++  bool SetCwd(Namespace* namespc, const char* new_path) {
++    NamespaceScope ns(namespc, new_path);
++    const intptr_t new_cwdfd =
++        TEMP_FAILURE_RETRY(openat64(ns.fd(), ns.path(), O_DIRECTORY));
++    if (new_cwdfd < 0) {
++      return false;
++    }
++
++    TextBuffer tbuf(PATH_MAX);
++    if (!File::IsAbsolutePath(new_path)) {
++      tbuf.AddString(cwd_);
++    }
++    tbuf.AddString(File::PathSeparator());
++    tbuf.AddString(ns.path());
++
++    // Normalize it.
++    char result[PATH_MAX];
++    const intptr_t result_len =
++        File::CleanUnixPath(tbuf.buffer(), result, PATH_MAX);
++    if (result_len < 0) {
++      errno = ENAMETOOLONG;
++      return false;
++    }
++
++    free(cwd_);
++    cwd_ = strdup(result);
++    close(cwdfd_);
++    cwdfd_ = new_cwdfd;
++    return true;
++  }
++
++ private:
++  intptr_t rootfd_;  // dirfd for the namespace root.
++  char* cwd_;        // cwd relative to the namespace.
++  intptr_t cwdfd_;   // dirfd for the cwd.
++
++  DISALLOW_COPY_AND_ASSIGN(NamespaceImpl);
++};
++
++Namespace* Namespace::Create(intptr_t namespc) {
++  NamespaceImpl* namespc_impl = NULL;
++  if (namespc != kNone) {
++    namespc_impl = new NamespaceImpl(namespc);
++  }
++  return new Namespace(namespc_impl);
++}
++
++Namespace* Namespace::Create(const char* path) {
++  return new Namespace(new NamespaceImpl(path));
++}
++
++Namespace::~Namespace() {
++  delete namespc_;
++}
++
++intptr_t Namespace::Default() {
++  return kNone;
++}
++
++const char* Namespace::GetCurrent(Namespace* namespc) {
++  if (Namespace::IsDefault(namespc)) {
++    char buffer[PATH_MAX];
++    if (getcwd(buffer, PATH_MAX) == NULL) {
++      return NULL;
++    }
++    return DartUtils::ScopedCopyCString(buffer);
++  }
++  const char* cwd = namespc->namespc()->cwd();
++  return cwd;
++}
++
++bool Namespace::SetCurrent(Namespace* namespc, const char* path) {
++  if (Namespace::IsDefault(namespc)) {
++    return (NO_RETRY_EXPECTED(chdir(path)) == 0);
++  }
++  return namespc->namespc()->SetCwd(namespc, path);
++}
++
++void Namespace::ResolvePath(Namespace* namespc,
++                            const char* path,
++                            intptr_t* dirfd,
++                            const char** resolved_path) {
++  ASSERT(dirfd != NULL);
++  ASSERT(resolved_path != NULL);
++  if (Namespace::IsDefault(namespc)) {
++    *dirfd = AT_FDCWD;
++    *resolved_path = path;
++    return;
++  }
++  if (File::IsAbsolutePath(path)) {
++    *dirfd = namespc->namespc()->rootfd();
++    if (strcmp(path, File::PathSeparator()) == 0) {
++      // Change "/" to ".".
++      *resolved_path = ".";
++    } else {
++      // Otherwise strip off the leading "/".
++      *resolved_path = &path[1];
++    }
++  } else {
++    *dirfd = namespc->namespc()->cwdfd();
++    *resolved_path = path;
++  }
++}
++
++NamespaceScope::NamespaceScope(Namespace* namespc, const char* path) {
++  Namespace::ResolvePath(namespc, path, &fd_, &path_);
++}
++
++NamespaceScope::~NamespaceScope() {}
++
++}  // namespace bin
++}  // namespace dart
++
++#endif  // defined(DART_HOST_OS_OHOS)
+diff --git a/runtime/bin/platform_linux.cc b/runtime/bin/platform_linux.cc
+index 4fed598047c..fc53fda3deb 100644
+--- a/runtime/bin/platform_linux.cc
++++ b/runtime/bin/platform_linux.cc
+@@ -3,7 +3,7 @@
+ // BSD-style license that can be found in the LICENSE file.
+ 
+ #include "platform/globals.h"
+-#if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID)
++#if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_OHOS)
+ 
+ #include "bin/platform.h"
+ 
+diff --git a/runtime/bin/process.h b/runtime/bin/process.h
+index 9bd547c802b..6f9db260470 100644
+--- a/runtime/bin/process.h
++++ b/runtime/bin/process.h
+@@ -350,7 +350,7 @@ class BufferListBase {
+ };
+ 
+ #if defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_FUCHSIA) ||          \
+-    defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_MACOS)
++    defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_MACOS) || defined(DART_HOST_OS_OHOS)
+ class BufferList : public BufferListBase {
+  public:
+   BufferList() {}
+diff --git a/runtime/bin/process_ohos.cc b/runtime/bin/process_ohos.cc
+new file mode 100644
+index 00000000000..30c99dedae7
+--- /dev/null
++++ b/runtime/bin/process_ohos.cc
+@@ -0,0 +1,1165 @@
++// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
++// for details. All rights reserved. Use of this source code is governed by a
++// BSD-style license that can be found in the LICENSE file.
++
++#include "platform/globals.h"
++#if defined(DART_HOST_OS_OHOS)
++
++#include "bin/process.h"
++
++#include <errno.h>         // NOLINT
++#include <fcntl.h>         // NOLINT
++#include <poll.h>          // NOLINT
++#include <stdio.h>         // NOLINT
++#include <stdlib.h>        // NOLINT
++#include <string.h>        // NOLINT
++#include <sys/resource.h>  // NOLINT
++#include <sys/wait.h>      // NOLINT
++#include <unistd.h>        // NOLINT
++
++#include "bin/dartutils.h"
++#include "bin/directory.h"
++#include "bin/fdutils.h"
++#include "bin/file.h"
++#include "bin/lockers.h"
++#include "bin/reference_counting.h"
++#include "bin/thread.h"
++#include "platform/syslog.h"
++
++#include "platform/signal_blocker.h"
++#include "platform/utils.h"
++
++extern char** environ;
++
++namespace dart {
++namespace bin {
++
++int Process::global_exit_code_ = 0;
++Mutex* Process::global_exit_code_mutex_ = nullptr;
++Process::ExitHook Process::exit_hook_ = NULL;
++
++// ProcessInfo is used to map a process id to the file descriptor for
++// the pipe used to communicate the exit code of the process to Dart.
++// ProcessInfo objects are kept in the static singly-linked
++// ProcessInfoList.
++class ProcessInfo {
++ public:
++  ProcessInfo(pid_t pid, intptr_t fd) : pid_(pid), fd_(fd) {}
++  ~ProcessInfo() {
++    int closed = close(fd_);
++    if (closed != 0) {
++      FATAL("Failed to close process exit code pipe");
++    }
++  }
++  pid_t pid() { return pid_; }
++  intptr_t fd() { return fd_; }
++  ProcessInfo* next() { return next_; }
++  void set_next(ProcessInfo* info) { next_ = info; }
++
++ private:
++  pid_t pid_;
++  intptr_t fd_;
++  ProcessInfo* next_;
++
++  DISALLOW_COPY_AND_ASSIGN(ProcessInfo);
++};
++
++// Singly-linked list of ProcessInfo objects for all active processes
++// started from Dart.
++class ProcessInfoList {
++ public:
++  static void Init();
++  static void Cleanup();
++
++  static void AddProcess(pid_t pid, intptr_t fd) {
++    MutexLocker locker(mutex_);
++    ProcessInfo* info = new ProcessInfo(pid, fd);
++    info->set_next(active_processes_);
++    active_processes_ = info;
++  }
++
++  static intptr_t LookupProcessExitFd(pid_t pid) {
++    MutexLocker locker(mutex_);
++    ProcessInfo* current = active_processes_;
++    while (current != NULL) {
++      if (current->pid() == pid) {
++        return current->fd();
++      }
++      current = current->next();
++    }
++    return 0;
++  }
++
++  static void RemoveProcess(pid_t pid) {
++    MutexLocker locker(mutex_);
++    ProcessInfo* prev = NULL;
++    ProcessInfo* current = active_processes_;
++    while (current != NULL) {
++      if (current->pid() == pid) {
++        if (prev == NULL) {
++          active_processes_ = current->next();
++        } else {
++          prev->set_next(current->next());
++        }
++        delete current;
++        return;
++      }
++      prev = current;
++      current = current->next();
++    }
++  }
++
++ private:
++  // Linked list of ProcessInfo objects for all active processes
++  // started from Dart code.
++  static ProcessInfo* active_processes_;
++  // Mutex protecting all accesses to the linked list of active
++  // processes.
++  static Mutex* mutex_;
++
++  DISALLOW_ALLOCATION();
++  DISALLOW_IMPLICIT_CONSTRUCTORS(ProcessInfoList);
++};
++
++ProcessInfo* ProcessInfoList::active_processes_ = NULL;
++Mutex* ProcessInfoList::mutex_ = nullptr;
++
++// The exit code handler sets up a separate thread which waits for child
++// processes to terminate. That separate thread can then get the exit code from
++// processes that have exited and communicate it to Dart through the
++// event loop.
++class ExitCodeHandler {
++ public:
++  static void Init();
++  static void Cleanup();
++
++  // Notify the ExitCodeHandler that another process exists.
++  static void ProcessStarted() {
++    // Multiple isolates could be starting processes at the same
++    // time. Make sure that only one ExitCodeHandler thread exists.
++    MonitorLocker locker(monitor_);
++    process_count_++;
++
++    monitor_->Notify();
++
++    if (running_) {
++      return;
++    }
++
++    // Start thread that handles process exits when wait returns.
++    int result =
++        Thread::Start("dart:io Process.start", ExitCodeHandlerEntry, 0);
++    if (result != 0) {
++      FATAL("Failed to start exit code handler worker thread %d", result);
++    }
++
++    running_ = true;
++  }
++
++  static void TerminateExitCodeThread() {
++    MonitorLocker locker(monitor_);
++
++    if (!running_) {
++      return;
++    }
++
++    // Set terminate_done_ to false, so we can use it as a guard for our
++    // monitor.
++    running_ = false;
++
++    // Wake up the [ExitCodeHandler] thread which is blocked on `wait()` (see
++    // [ExitCodeHandlerEntry]).
++    if (TEMP_FAILURE_RETRY(fork()) == 0) {
++      // Avoid calling any atexit callbacks to prevent deadlocks.
++      _exit(0);
++    }
++
++    monitor_->Notify();
++
++    while (!terminate_done_) {
++      monitor_->Wait(Monitor::kNoTimeout);
++    }
++  }
++
++ private:
++  // Entry point for the separate exit code handler thread started by
++  // the ExitCodeHandler.
++  static void ExitCodeHandlerEntry(uword param) {
++    pid_t pid = 0;
++    int status = 0;
++    while (true) {
++      {
++        MonitorLocker locker(monitor_);
++        while (running_ && process_count_ == 0) {
++          monitor_->Wait(Monitor::kNoTimeout);
++        }
++        if (!running_) {
++          terminate_done_ = true;
++          monitor_->Notify();
++          return;
++        }
++      }
++
++      if ((pid = TEMP_FAILURE_RETRY(wait(&status))) > 0) {
++        int exit_code = 0;
++        int negative = 0;
++        if (WIFEXITED(status)) {
++          exit_code = WEXITSTATUS(status);
++        }
++        if (WIFSIGNALED(status)) {
++          exit_code = WTERMSIG(status);
++          negative = 1;
++        }
++        intptr_t exit_code_fd = ProcessInfoList::LookupProcessExitFd(pid);
++        if (exit_code_fd != 0) {
++          int message[2] = {exit_code, negative};
++          ssize_t result =
++              FDUtils::WriteToBlocking(exit_code_fd, &message, sizeof(message));
++          // If the process has been closed, the read end of the exit
++          // pipe has been closed. It is therefore not a problem that
++          // write fails with a broken pipe error. Other errors should
++          // not happen.
++          if ((result != -1) && (result != sizeof(message))) {
++            FATAL("Failed to write entire process exit message");
++          } else if ((result == -1) && (errno != EPIPE)) {
++            FATAL("Failed to write exit code: %d", errno);
++          }
++          ProcessInfoList::RemoveProcess(pid);
++          {
++            MonitorLocker locker(monitor_);
++            process_count_--;
++          }
++        }
++      } else if (pid < 0) {
++        FATAL("Wait for process exit failed: %d", errno);
++      }
++    }
++  }
++
++  static bool terminate_done_;
++  static int process_count_;
++  static bool running_;
++  static Monitor* monitor_;
++
++  DISALLOW_ALLOCATION();
++  DISALLOW_IMPLICIT_CONSTRUCTORS(ExitCodeHandler);
++};
++
++bool ExitCodeHandler::running_ = false;
++int ExitCodeHandler::process_count_ = 0;
++bool ExitCodeHandler::terminate_done_ = false;
++Monitor* ExitCodeHandler::monitor_ = nullptr;
++
++class ProcessStarter {
++ public:
++  ProcessStarter(Namespace* namespc,
++                 const char* path,
++                 char* arguments[],
++                 intptr_t arguments_length,
++                 const char* working_directory,
++                 char* environment[],
++                 intptr_t environment_length,
++                 ProcessStartMode mode,
++                 intptr_t* in,
++                 intptr_t* out,
++                 intptr_t* err,
++                 intptr_t* id,
++                 intptr_t* exit_event,
++                 char** os_error_message)
++      : namespc_(namespc),
++        path_(path),
++        working_directory_(working_directory),
++        mode_(mode),
++        in_(in),
++        out_(out),
++        err_(err),
++        id_(id),
++        exit_event_(exit_event),
++        os_error_message_(os_error_message) {
++    read_in_[0] = -1;
++    read_in_[1] = -1;
++    read_err_[0] = -1;
++    read_err_[1] = -1;
++    write_out_[0] = -1;
++    write_out_[1] = -1;
++    exec_control_[0] = -1;
++    exec_control_[1] = -1;
++
++    program_arguments_ = reinterpret_cast<char**>(Dart_ScopeAllocate(
++        (arguments_length + 2) * sizeof(*program_arguments_)));
++    program_arguments_[0] = const_cast<char*>(path_);
++    for (int i = 0; i < arguments_length; i++) {
++      program_arguments_[i + 1] = arguments[i];
++    }
++    program_arguments_[arguments_length + 1] = NULL;
++
++    program_environment_ = NULL;
++    if (environment != NULL) {
++      program_environment_ = reinterpret_cast<char**>(Dart_ScopeAllocate(
++          (environment_length + 1) * sizeof(*program_environment_)));
++      for (int i = 0; i < environment_length; i++) {
++        program_environment_[i] = environment[i];
++      }
++      program_environment_[environment_length] = NULL;
++    }
++  }
++
++  int Start() {
++    // Create pipes required.
++    int err = CreatePipes();
++    if (err != 0) {
++      return err;
++    }
++
++    // Fork to create the new process.
++    pid_t pid = TEMP_FAILURE_RETRY(fork());
++    if (pid < 0) {
++      // Failed to fork.
++      return CleanupAndReturnError();
++    } else if (pid == 0) {
++      // This runs in the new process.
++      NewProcess();
++    }
++
++    // This runs in the original process.
++
++    // If the child process is not started in detached mode, be sure to
++    // listen for exit-codes, now that we have a non detached child process
++    // and also Register this child process.
++    if (Process::ModeIsAttached(mode_)) {
++      ExitCodeHandler::ProcessStarted();
++      err = RegisterProcess(pid);
++      if (err != 0) {
++        return err;
++      }
++    }
++
++    // Notify child process to start. This is done to delay the call to exec
++    // until the process is registered above, and we are ready to receive the
++    // exit code.
++    char msg = '1';
++    int bytes_written =
++        FDUtils::WriteToBlocking(read_in_[1], &msg, sizeof(msg));
++    if (bytes_written != sizeof(msg)) {
++      return CleanupAndReturnError();
++    }
++
++    // Read the result of executing the child process.
++    close(exec_control_[1]);
++    exec_control_[1] = -1;
++    if (Process::ModeIsAttached(mode_)) {
++      err = ReadExecResult();
++    } else {
++      err = ReadDetachedExecResult(&pid);
++    }
++    close(exec_control_[0]);
++    exec_control_[0] = -1;
++
++    // Return error code if any failures.
++    if (err != 0) {
++      if (Process::ModeIsAttached(mode_)) {
++        // Since exec() failed, we're not interested in the exit code.
++        // We close the reading side of the exit code pipe here.
++        // GetProcessExitCodes will get a broken pipe error when it
++        // tries to write to the writing side of the pipe and it will
++        // ignore the error.
++        close(*exit_event_);
++        *exit_event_ = -1;
++      }
++      CloseAllPipes();
++      return err;
++    }
++
++    if (Process::ModeHasStdio(mode_)) {
++      // Connect stdio, stdout and stderr.
++      FDUtils::SetNonBlocking(read_in_[0]);
++      *in_ = read_in_[0];
++      close(read_in_[1]);
++      FDUtils::SetNonBlocking(write_out_[1]);
++      *out_ = write_out_[1];
++      close(write_out_[0]);
++      FDUtils::SetNonBlocking(read_err_[0]);
++      *err_ = read_err_[0];
++      close(read_err_[1]);
++    } else {
++      // Close all fds.
++      close(read_in_[0]);
++      close(read_in_[1]);
++      ASSERT(write_out_[0] == -1);
++      ASSERT(write_out_[1] == -1);
++      ASSERT(read_err_[0] == -1);
++      ASSERT(read_err_[1] == -1);
++    }
++    ASSERT(exec_control_[0] == -1);
++    ASSERT(exec_control_[1] == -1);
++
++    *id_ = pid;
++    return 0;
++  }
++
++ private:
++  static constexpr int kErrorBufferSize = 1024;
++
++  int CreatePipes() {
++    int result;
++    result = TEMP_FAILURE_RETRY(pipe2(exec_control_, O_CLOEXEC));
++    if (result < 0) {
++      return CleanupAndReturnError();
++    }
++
++    // For a detached process the pipe to connect stdout is still used for
++    // signaling when to do the first fork.
++    result = TEMP_FAILURE_RETRY(pipe2(read_in_, O_CLOEXEC));
++    if (result < 0) {
++      return CleanupAndReturnError();
++    }
++
++    // For detached processes the pipe to connect stderr and stdin are not used.
++    if (Process::ModeHasStdio(mode_)) {
++      result = TEMP_FAILURE_RETRY(pipe2(read_err_, O_CLOEXEC));
++      if (result < 0) {
++        return CleanupAndReturnError();
++      }
++
++      result = TEMP_FAILURE_RETRY(pipe2(write_out_, O_CLOEXEC));
++      if (result < 0) {
++        return CleanupAndReturnError();
++      }
++    }
++
++    return 0;
++  }
++
++  void NewProcess() {
++    // Wait for parent process before setting up the child process.
++    char msg;
++    int bytes_read = FDUtils::ReadFromBlocking(read_in_[0], &msg, sizeof(msg));
++    if (bytes_read != sizeof(msg)) {
++      perror("Failed receiving notification message");
++      _exit(1);
++    }
++    if (Process::ModeIsAttached(mode_)) {
++      ExecProcess();
++    } else {
++      ExecDetachedProcess();
++    }
++  }
++
++  // Tries to find path_ relative to the current namespace unless it should be
++  // searched in the PATH.
++  // The path that should be passed to exec is returned in realpath.
++  // Returns true on success, and false if there was an error that should
++  // be reported to the parent.
++  bool FindPathInNamespace(char* realpath, intptr_t realpath_size) {
++    // Perform a PATH search if there's no slash in the path.
++    if (strchr(path_, '/') == NULL) {
++      // TODO(zra): If there is a non-default namespace, the entries in PATH
++      // should be treated as relative to the namespace.
++      strncpy(realpath, path_, realpath_size);
++      realpath[realpath_size - 1] = '\0';
++      return true;
++    }
++    NamespaceScope ns(namespc_, path_);
++    const int fd =
++        TEMP_FAILURE_RETRY(openat64(ns.fd(), ns.path(), O_RDONLY | O_CLOEXEC));
++    if (fd == -1) {
++      return false;
++    }
++    char procpath[PATH_MAX];
++    snprintf(procpath, PATH_MAX, "/proc/self/fd/%d", fd);
++    const intptr_t length =
++        TEMP_FAILURE_RETRY(readlink(procpath, realpath, realpath_size));
++    if (length < 0) {
++      FDUtils::SaveErrorAndClose(fd);
++      return false;
++    }
++    realpath[length] = '\0';
++    FDUtils::SaveErrorAndClose(fd);
++    return true;
++  }
++
++  void ExecProcess() {
++    if (mode_ == kNormal) {
++      if (TEMP_FAILURE_RETRY(dup2(write_out_[0], STDIN_FILENO)) == -1) {
++        ReportChildError();
++      }
++
++      if (TEMP_FAILURE_RETRY(dup2(read_in_[1], STDOUT_FILENO)) == -1) {
++        ReportChildError();
++      }
++
++      if (TEMP_FAILURE_RETRY(dup2(read_err_[1], STDERR_FILENO)) == -1) {
++        ReportChildError();
++      }
++    } else {
++      ASSERT(mode_ == kInheritStdio);
++    }
++
++    if (working_directory_ != NULL &&
++        !Directory::SetCurrent(namespc_, working_directory_)) {
++      ReportChildError();
++    }
++
++    if (program_environment_ != NULL) {
++      environ = program_environment_;
++    }
++
++    char realpath[PATH_MAX];
++    if (!FindPathInNamespace(realpath, PATH_MAX)) {
++      ReportChildError();
++    }
++    // TODO(dart:io) Test for the existence of execveat, and use it instead.
++    execvp(realpath, const_cast<char* const*>(program_arguments_));
++    ReportChildError();
++  }
++
++  void ExecDetachedProcess() {
++    if (mode_ == kDetached) {
++      ASSERT(write_out_[0] == -1);
++      ASSERT(write_out_[1] == -1);
++      ASSERT(read_err_[0] == -1);
++      ASSERT(read_err_[1] == -1);
++      // For a detached process the pipe to connect stdout is only used for
++      // signaling when to do the first fork.
++      close(read_in_[0]);
++      read_in_[0] = -1;
++      close(read_in_[1]);
++      read_in_[1] = -1;
++    } else {
++      // Don't close any fds if keeping stdio open to the detached process.
++      ASSERT(mode_ == kDetachedWithStdio);
++    }
++    // Fork once more to start a new session.
++    pid_t pid = TEMP_FAILURE_RETRY(fork());
++    if (pid < 0) {
++      ReportChildError();
++    } else if (pid == 0) {
++      // Start a new session.
++      if (TEMP_FAILURE_RETRY(setsid()) == -1) {
++        ReportChildError();
++      } else {
++        // Do a final fork to not be the session leader.
++        pid = TEMP_FAILURE_RETRY(fork());
++        if (pid < 0) {
++          ReportChildError();
++        } else if (pid == 0) {
++          if (mode_ == kDetached) {
++            SetupDetached();
++          } else {
++            SetupDetachedWithStdio();
++          }
++
++          if ((working_directory_ != NULL) &&
++              !Directory::SetCurrent(namespc_, working_directory_)) {
++            ReportChildError();
++          }
++          if (program_environment_ != NULL) {
++            environ = program_environment_;
++          }
++
++          // Report the final PID and do the exec.
++          ReportPid(getpid());  // getpid cannot fail.
++          char realpath[PATH_MAX];
++          if (!FindPathInNamespace(realpath, PATH_MAX)) {
++            ReportChildError();
++          }
++          // TODO(dart:io) Test for the existence of execveat, and use it
++          // instead.
++          execvp(realpath, const_cast<char* const*>(program_arguments_));
++          ReportChildError();
++        } else {
++          // Exit the intermediate process. Avoid calling any atexit callbacks
++          // to avoid potential issues (e.g. deadlocks).
++          _exit(0);
++        }
++      }
++    } else {
++      // Exit the intermediate process. Avoid calling any atexit callbacks
++      // to avoid potential issues (e.g. deadlocks).
++      _exit(0);
++    }
++  }
++
++  int RegisterProcess(pid_t pid) {
++    int result;
++    int event_fds[2];
++    result = TEMP_FAILURE_RETRY(pipe2(event_fds, O_CLOEXEC));
++    if (result < 0) {
++      return CleanupAndReturnError();
++    }
++
++    ProcessInfoList::AddProcess(pid, event_fds[1]);
++    *exit_event_ = event_fds[0];
++    FDUtils::SetNonBlocking(event_fds[0]);
++    return 0;
++  }
++
++  int ReadExecResult() {
++    int child_errno;
++    int bytes_read = -1;
++    // Read exec result from child. If no data is returned the exec was
++    // successful and the exec call closed the pipe. Otherwise the errno
++    // is written to the pipe.
++    bytes_read = FDUtils::ReadFromBlocking(exec_control_[0], &child_errno,
++                                           sizeof(child_errno));
++    if (bytes_read == sizeof(child_errno)) {
++      ReadChildError();
++      return child_errno;
++    } else if (bytes_read == -1) {
++      return errno;
++    }
++    return 0;
++  }
++
++  int ReadDetachedExecResult(pid_t* pid) {
++    int child_errno;
++    int bytes_read = -1;
++    // Read exec result from child. If only pid data is returned the exec was
++    // successful and the exec call closed the pipe. Otherwise the errno
++    // is written to the pipe as well.
++    int result[2];
++    bytes_read =
++        FDUtils::ReadFromBlocking(exec_control_[0], result, sizeof(result));
++    if (bytes_read == sizeof(int)) {
++      *pid = result[0];
++    } else if (bytes_read == 2 * sizeof(int)) {
++      *pid = result[0];
++      child_errno = result[1];
++      ReadChildError();
++      return child_errno;
++    } else if (bytes_read == -1) {
++      return errno;
++    }
++    return 0;
++  }
++
++  void SetupDetached() {
++    ASSERT(mode_ == kDetached);
++
++    // Close all open file descriptors except for exec_control_[1].
++    int max_fds = sysconf(_SC_OPEN_MAX);
++    if (max_fds == -1) {
++      max_fds = _POSIX_OPEN_MAX;
++    }
++    for (int fd = 0; fd < max_fds; fd++) {
++      if (fd != exec_control_[1]) {
++        close(fd);
++      }
++    }
++
++    // Re-open stdin, stdout and stderr and connect them to /dev/null.
++    // The loop above should already have closed all of them, so
++    // creating new file descriptors should start at STDIN_FILENO.
++    int fd = TEMP_FAILURE_RETRY(open("/dev/null", O_RDWR));
++    if (fd != STDIN_FILENO) {
++      ReportChildError();
++    }
++    if (TEMP_FAILURE_RETRY(dup2(STDIN_FILENO, STDOUT_FILENO)) !=
++        STDOUT_FILENO) {
++      ReportChildError();
++    }
++    if (TEMP_FAILURE_RETRY(dup2(STDIN_FILENO, STDERR_FILENO)) !=
++        STDERR_FILENO) {
++      ReportChildError();
++    }
++  }
++
++  void SetupDetachedWithStdio() {
++    // Close all open file descriptors except for
++    // exec_control_[1], write_out_[0], read_in_[1] and
++    // read_err_[1].
++    int max_fds = sysconf(_SC_OPEN_MAX);
++    if (max_fds == -1) {
++      max_fds = _POSIX_OPEN_MAX;
++    }
++    for (int fd = 0; fd < max_fds; fd++) {
++      if ((fd != exec_control_[1]) && (fd != write_out_[0]) &&
++          (fd != read_in_[1]) && (fd != read_err_[1])) {
++        close(fd);
++      }
++    }
++
++    if (TEMP_FAILURE_RETRY(dup2(write_out_[0], STDIN_FILENO)) == -1) {
++      ReportChildError();
++    }
++    close(write_out_[0]);
++
++    if (TEMP_FAILURE_RETRY(dup2(read_in_[1], STDOUT_FILENO)) == -1) {
++      ReportChildError();
++    }
++    close(read_in_[1]);
++
++    if (TEMP_FAILURE_RETRY(dup2(read_err_[1], STDERR_FILENO)) == -1) {
++      ReportChildError();
++    }
++    close(read_err_[1]);
++  }
++
++  int CleanupAndReturnError() {
++    int actual_errno = errno;
++    // If CleanupAndReturnError is called without an actual errno make
++    // sure to return an error anyway.
++    if (actual_errno == 0) {
++      actual_errno = EPERM;
++    }
++    SetChildOsErrorMessage();
++    CloseAllPipes();
++    return actual_errno;
++  }
++
++  void SetChildOsErrorMessage() {
++    char* error_message = DartUtils::ScopedCString(kErrorBufferSize);
++    Utils::StrError(errno, error_message, kErrorBufferSize);
++    *os_error_message_ = error_message;
++  }
++
++  void ReportChildError() {
++    // In the case of failure in the child process write the errno and
++    // the OS error message to the exec control pipe and exit.
++    int child_errno = errno;
++    char error_buf[kErrorBufferSize];
++    char* os_error_message =
++        Utils::StrError(errno, error_buf, kErrorBufferSize);
++    int bytes_written = FDUtils::WriteToBlocking(exec_control_[1], &child_errno,
++                                                 sizeof(child_errno));
++    if (bytes_written == sizeof(child_errno)) {
++      FDUtils::WriteToBlocking(exec_control_[1], os_error_message,
++                               strlen(os_error_message) + 1);
++    }
++    close(exec_control_[1]);
++
++    // We avoid running through registered atexit() handlers because that is
++    // unnecessary work. It can also cause deadlocks on exit in the forked
++    // process.
++    _exit(1);
++  }
++
++  void ReportPid(int pid) {
++    // In the case of starting a detached process the actual pid of that process
++    // is communicated using the exec control pipe.
++    int bytes_written =
++        FDUtils::WriteToBlocking(exec_control_[1], &pid, sizeof(pid));
++    ASSERT(bytes_written == sizeof(int));
++    USE(bytes_written);
++  }
++
++  void ReadChildError() {
++    char* message = DartUtils::ScopedCString(kErrorBufferSize);
++    if (message != NULL) {
++      FDUtils::ReadFromBlocking(exec_control_[0], message, kErrorBufferSize);
++      message[kErrorBufferSize - 1] = '\0';
++      *os_error_message_ = message;
++    } else {
++      // Could not get error message. It will be NULL.
++      ASSERT(*os_error_message_ == NULL);
++    }
++  }
++
++  void ClosePipe(int* fds) {
++    for (int i = 0; i < 2; i++) {
++      if (fds[i] != -1) {
++        close(fds[i]);
++        fds[i] = -1;
++      }
++    }
++  }
++
++  void CloseAllPipes() {
++    ClosePipe(exec_control_);
++    ClosePipe(read_in_);
++    ClosePipe(read_err_);
++    ClosePipe(write_out_);
++  }
++
++  int read_in_[2];       // Pipe for stdout to child process.
++  int read_err_[2];      // Pipe for stderr to child process.
++  int write_out_[2];     // Pipe for stdin to child process.
++  int exec_control_[2];  // Pipe to get the result from exec.
++
++  char** program_arguments_;
++  char** program_environment_;
++
++  Namespace* namespc_;
++  const char* path_;
++  const char* working_directory_;
++  ProcessStartMode mode_;
++  intptr_t* in_;
++  intptr_t* out_;
++  intptr_t* err_;
++  intptr_t* id_;
++  intptr_t* exit_event_;
++  char** os_error_message_;
++
++  DISALLOW_ALLOCATION();
++  DISALLOW_IMPLICIT_CONSTRUCTORS(ProcessStarter);
++};
++
++int Process::Start(Namespace* namespc,
++                   const char* path,
++                   char* arguments[],
++                   intptr_t arguments_length,
++                   const char* working_directory,
++                   char* environment[],
++                   intptr_t environment_length,
++                   ProcessStartMode mode,
++                   intptr_t* in,
++                   intptr_t* out,
++                   intptr_t* err,
++                   intptr_t* id,
++                   intptr_t* exit_event,
++                   char** os_error_message) {
++  ProcessStarter starter(namespc, path, arguments, arguments_length,
++                         working_directory, environment, environment_length,
++                         mode, in, out, err, id, exit_event, os_error_message);
++  return starter.Start();
++}
++
++static bool CloseProcessBuffers(struct pollfd* fds, int alive) {
++  int e = errno;
++  for (int i = 0; i < alive; i++) {
++    close(fds[i].fd);
++  }
++  errno = e;
++  return false;
++}
++
++bool Process::Wait(intptr_t pid,
++                   intptr_t in,
++                   intptr_t out,
++                   intptr_t err,
++                   intptr_t exit_event,
++                   ProcessResult* result) {
++  // Close input to the process right away.
++  close(in);
++
++  // There is no return from this function using Dart_PropagateError
++  // as memory used by the buffer lists is freed through their
++  // destructors.
++  BufferList out_data;
++  BufferList err_data;
++  union {
++    uint8_t bytes[8];
++    int32_t ints[2];
++  } exit_code_data;
++
++  struct pollfd fds[3];
++  fds[0].fd = out;
++  fds[1].fd = err;
++  fds[2].fd = exit_event;
++
++  for (int i = 0; i < 3; i++) {
++    fds[i].events = POLLIN;
++  }
++
++  int alive = 3;
++  while (alive > 0) {
++    // Blocking call waiting for events from the child process.
++    if (TEMP_FAILURE_RETRY(poll(fds, alive, -1)) <= 0) {
++      return CloseProcessBuffers(fds, alive);
++    }
++
++    // Process incoming data.
++    for (int i = 0; i < alive; i++) {
++      if ((fds[i].revents & (POLLNVAL | POLLERR)) != 0) {
++        return CloseProcessBuffers(fds, alive);
++      }
++      if ((fds[i].revents & POLLIN) != 0) {
++        intptr_t avail = FDUtils::AvailableBytes(fds[i].fd);
++        if (fds[i].fd == out) {
++          if (!out_data.Read(out, avail)) {
++            return CloseProcessBuffers(fds, alive);
++          }
++        } else if (fds[i].fd == err) {
++          if (!err_data.Read(err, avail)) {
++            return CloseProcessBuffers(fds, alive);
++          }
++        } else if (fds[i].fd == exit_event) {
++          if (avail == 8) {
++            intptr_t b =
++                TEMP_FAILURE_RETRY(read(exit_event, exit_code_data.bytes, 8));
++            if (b != 8) {
++              return CloseProcessBuffers(fds, alive);
++            }
++          }
++        } else {
++          UNREACHABLE();
++        }
++      }
++      if ((fds[i].revents & POLLHUP) != 0) {
++        // Remove the pollfd from the list of pollfds.
++        close(fds[i].fd);
++        alive--;
++        if (i < alive) {
++          fds[i] = fds[alive];
++        }
++        // Process the same index again.
++        i--;
++        continue;
++      }
++    }
++  }
++
++  // All handles closed and all data read.
++  result->set_stdout_data(out_data.GetData());
++  result->set_stderr_data(err_data.GetData());
++  DEBUG_ASSERT(out_data.IsEmpty());
++  DEBUG_ASSERT(err_data.IsEmpty());
++
++  // Calculate the exit code.
++  intptr_t exit_code = exit_code_data.ints[0];
++  intptr_t negative = exit_code_data.ints[1];
++  if (negative != 0) {
++    exit_code = -exit_code;
++  }
++  result->set_exit_code(exit_code);
++
++  return true;
++}
++
++bool Process::Kill(intptr_t id, int signal) {
++  return (TEMP_FAILURE_RETRY(kill(id, signal)) != -1);
++}
++
++void Process::TerminateExitCodeHandler() {
++  ExitCodeHandler::TerminateExitCodeThread();
++}
++
++intptr_t Process::CurrentProcessId() {
++  return static_cast<intptr_t>(getpid());
++}
++
++static void SaveErrorAndClose(FILE* file) {
++  int actual_errno = errno;
++  fclose(file);
++  errno = actual_errno;
++}
++
++int64_t Process::CurrentRSS() {
++  // The second value in /proc/self/statm is the current RSS in pages.
++  // It is not possible to use getrusage() because the interested fields are not
++  // implemented by the linux kernel.
++  FILE* statm = fopen("/proc/self/statm", "r");
++  if (statm == NULL) {
++    return -1;
++  }
++  int64_t current_rss_pages = 0;
++  int matches = fscanf(statm, "%*s%" Pd64 "", &current_rss_pages);
++  if (matches != 1) {
++    SaveErrorAndClose(statm);
++    return -1;
++  }
++  fclose(statm);
++  return current_rss_pages * getpagesize();
++}
++
++int64_t Process::MaxRSS() {
++  struct rusage usage;
++  usage.ru_maxrss = 0;
++  int r = getrusage(RUSAGE_SELF, &usage);
++  if (r < 0) {
++    return -1;
++  }
++  return usage.ru_maxrss * KB;
++}
++
++static Mutex* signal_mutex = nullptr;
++static SignalInfo* signal_handlers = NULL;
++static const int kSignalsCount = 7;
++static const int kSignals[kSignalsCount] = {
++    SIGHUP, SIGINT, SIGTERM, SIGUSR1, SIGUSR2, SIGWINCH,
++    SIGQUIT  // Allow VMService to listen on SIGQUIT.
++};
++
++SignalInfo::~SignalInfo() {
++  close(fd_);
++}
++
++static void SignalHandler(int signal) {
++  MutexLocker lock(signal_mutex);
++  const SignalInfo* handler = signal_handlers;
++  while (handler != NULL) {
++    if (handler->signal() == signal) {
++      int value = 0;
++      VOID_TEMP_FAILURE_RETRY(write(handler->fd(), &value, 1));
++    }
++    handler = handler->next();
++  }
++}
++
++intptr_t Process::SetSignalHandler(intptr_t signal) {
++  bool found = false;
++  for (int i = 0; i < kSignalsCount; i++) {
++    if (kSignals[i] == signal) {
++      found = true;
++      break;
++    }
++  }
++  if (!found) {
++    return -1;
++  }
++  int fds[2];
++  if (NO_RETRY_EXPECTED(pipe2(fds, O_CLOEXEC)) != 0) {
++    return -1;
++  }
++  ThreadSignalBlocker blocker(kSignalsCount, kSignals);
++  MutexLocker lock(signal_mutex);
++  SignalInfo* handler = signal_handlers;
++  bool listen = true;
++  sa_handler_t oldact_handler = nullptr;
++  while (handler != NULL) {
++    if (handler->signal() == signal) {
++      oldact_handler = handler->oldact();
++      listen = false;
++      break;
++    }
++    handler = handler->next();
++  }
++  if (listen) {
++    struct sigaction act = {};
++    act.sa_handler = SignalHandler;
++    sigemptyset(&act.sa_mask);
++    for (int i = 0; i < kSignalsCount; i++) {
++      sigaddset(&act.sa_mask, kSignals[i]);
++    }
++    struct sigaction oldact = {};
++    int status = NO_RETRY_EXPECTED(sigaction(signal, &act, &oldact));
++    if (status < 0) {
++      int err = errno;
++      close(fds[0]);
++      close(fds[1]);
++      errno = err;
++      return -1;
++    }
++    oldact_handler = oldact.sa_handler;
++  }
++  signal_handlers =
++      new SignalInfo(fds[1], signal, oldact_handler, signal_handlers);
++  return fds[0];
++}
++
++void Process::ClearSignalHandler(intptr_t signal, Dart_Port port) {
++  ThreadSignalBlocker blocker(kSignalsCount, kSignals);
++  MutexLocker lock(signal_mutex);
++  SignalInfo* handler = signal_handlers;
++  sa_handler_t oldact_handler = SIG_DFL;
++  bool any_removed = false;
++  bool any_remaining = false;
++  while (handler != NULL) {
++    bool remove = false;
++    if (handler->signal() == signal) {
++      if ((port == ILLEGAL_PORT) || (handler->port() == port)) {
++        if (signal_handlers == handler) {
++          signal_handlers = handler->next();
++        }
++        handler->Unlink();
++        remove = true;
++        oldact_handler = handler->oldact();
++        any_removed = true;
++      } else {
++        any_remaining = true;
++      }
++    }
++    SignalInfo* next = handler->next();
++    if (remove) {
++      delete handler;
++    }
++    handler = next;
++  }
++  if (any_removed && !any_remaining) {
++    struct sigaction act = {};
++    act.sa_handler = oldact_handler;
++    VOID_NO_RETRY_EXPECTED(sigaction(signal, &act, NULL));
++  }
++}
++
++void Process::ClearSignalHandlerByFd(intptr_t fd, Dart_Port port) {
++  ThreadSignalBlocker blocker(kSignalsCount, kSignals);
++  MutexLocker lock(signal_mutex);
++  SignalInfo* handler = signal_handlers;
++  sa_handler_t oldact_handler = SIG_DFL;
++  bool any_remaining = false;
++  intptr_t signal = -1;
++  while (handler != NULL) {
++    bool remove = false;
++    if (handler->fd() == fd) {
++      if ((port == ILLEGAL_PORT) || (handler->port() == port)) {
++        if (signal_handlers == handler) {
++          signal_handlers = handler->next();
++        }
++        handler->Unlink();
++        remove = true;
++        signal = handler->signal();
++      } else {
++        any_remaining = true;
++      }
++    }
++    SignalInfo* next = handler->next();
++    if (remove) {
++      delete handler;
++    }
++    handler = next;
++  }
++  if ((signal != -1) && !any_remaining) {
++    struct sigaction act = {};
++    act.sa_handler = oldact_handler;
++    VOID_NO_RETRY_EXPECTED(sigaction(signal, &act, NULL));
++  }
++}
++
++void ProcessInfoList::Init() {
++  active_processes_ = NULL;
++  ASSERT(ProcessInfoList::mutex_ == nullptr);
++  ProcessInfoList::mutex_ = new Mutex();
++}
++
++void ProcessInfoList::Cleanup() {
++  ASSERT(ProcessInfoList::mutex_ != nullptr);
++  delete ProcessInfoList::mutex_;
++  ProcessInfoList::mutex_ = nullptr;
++}
++
++void ExitCodeHandler::Init() {
++  running_ = false;
++  process_count_ = 0;
++  terminate_done_ = false;
++  ASSERT(ExitCodeHandler::monitor_ == nullptr);
++  ExitCodeHandler::monitor_ = new Monitor();
++}
++
++void ExitCodeHandler::Cleanup() {
++  ASSERT(ExitCodeHandler::monitor_ != nullptr);
++  delete ExitCodeHandler::monitor_;
++  ExitCodeHandler::monitor_ = nullptr;
++}
++
++void Process::Init() {
++  ExitCodeHandler::Init();
++  ProcessInfoList::Init();
++
++  ASSERT(signal_mutex == nullptr);
++  signal_mutex = new Mutex();
++  signal_handlers = NULL;
++
++  ASSERT(Process::global_exit_code_mutex_ == nullptr);
++  Process::global_exit_code_mutex_ = new Mutex();
++}
++
++void Process::Cleanup() {
++  ClearAllSignalHandlers();
++
++  ASSERT(signal_mutex != nullptr);
++  delete signal_mutex;
++  signal_mutex = nullptr;
++
++  ASSERT(Process::global_exit_code_mutex_ != nullptr);
++  delete Process::global_exit_code_mutex_;
++  Process::global_exit_code_mutex_ = nullptr;
++
++  ProcessInfoList::Cleanup();
++  ExitCodeHandler::Cleanup();
++}
++
++}  // namespace bin
++}  // namespace dart
++
++#endif  // defined(DART_HOST_OS_OHOS)
+diff --git a/runtime/bin/security_context_ohos.cc b/runtime/bin/security_context_ohos.cc
+new file mode 100644
+index 00000000000..5d801a5b07b
+--- /dev/null
++++ b/runtime/bin/security_context_ohos.cc
+@@ -0,0 +1,69 @@
++// Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
++// for details. All rights reserved. Use of this source code is governed by a
++// BSD-style license that can be found in the LICENSE file.
++
++#if !defined(DART_IO_SECURE_SOCKET_DISABLED)
++
++#include "platform/globals.h"
++#if defined(DART_HOST_OS_OHOS)
++
++#include "bin/security_context.h"
++
++#include <openssl/bio.h>
++#include <openssl/ssl.h>
++#include <openssl/x509.h>
++
++#include "bin/directory.h"
++#include "bin/file.h"
++#include "bin/secure_socket_filter.h"
++#include "bin/secure_socket_utils.h"
++#include "platform/syslog.h"
++
++namespace dart {
++namespace bin {
++
++// The security context won't necessarily use the compiled-in root certificates,
++// but since there is no way to update the size of the allocation after creating
++// the weak persistent handle, we assume that it will. Note that when the
++// root certs aren't compiled in, |root_certificates_pem_length| is 0.
++const intptr_t SSLCertContext::kApproximateSize =
++    sizeof(SSLCertContext) + root_certificates_pem_length;
++
++void SSLCertContext::TrustBuiltinRoots() {
++  if (root_certs_file() != NULL) {
++    LoadRootCertFile(root_certs_file());
++    return;
++  }
++  if (root_certs_cache() != NULL) {
++    LoadRootCertCache(root_certs_cache());
++    return;
++  }
++
++  const char* bundle = "/etc/ssl/certs/cacert.pem";
++  const char* cachedir = "/etc/ssl/certs";
++  if (File::Exists(NULL, bundle)) {
++    LoadRootCertFile(bundle);
++    return;
++  }
++
++  if (Directory::Exists(NULL, cachedir) == Directory::EXISTS) {
++    LoadRootCertCache(cachedir);
++    return;
++  }
++}
++
++void SSLCertContext::RegisterCallbacks(SSL* ssl) {
++  // No callbacks to register for implementations using BoringSSL's built-in
++  // verification mechanism.
++}
++
++TrustEvaluateHandlerFunc SSLCertContext::GetTrustEvaluateHandler() const {
++  return nullptr;
++}
++
++}  // namespace bin
++}  // namespace dart
++
++#endif  // defined(DART_HOST_OS_OHOS)
++
++#endif  // !defined(DART_IO_SECURE_SOCKET_DISABLED)
+diff --git a/runtime/bin/socket.cc b/runtime/bin/socket.cc
+index f61a7372148..adb7f1dc25e 100644
+--- a/runtime/bin/socket.cc
++++ b/runtime/bin/socket.cc
+@@ -209,12 +209,12 @@ Dart_Handle ListeningSocketRegistry::CreateUnixDomainBindListen(
+     return result;
+   }
+ 
+-#if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID)
++#if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_OHOS)
+   // Abstract unix domain socket doesn't exist in file system.
+   if (File::Exists(namespc, addr.un.sun_path) && path[0] != '@') {
+ #else
+   if (File::Exists(namespc, addr.un.sun_path)) {
+-#endif  // defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID)
++#endif  // defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_OHOS)
+     if (unix_domain_sockets_ != nullptr) {
+       // If there is a socket listening on this file. Ensure
+       // that it was created with `shared` mode and current `shared`
+@@ -286,7 +286,7 @@ bool ListeningSocketRegistry::CloseOneSafe(OSSocket* os_socket,
+   }
+   // Unlink the socket file, if os_socket contains unix domain sockets.
+   if (os_socket->address.addr.sa_family == AF_UNIX) {
+-#if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID)
++#if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_OHOS)
+     // If the socket is abstract, which has a path starting with a null byte,
+     // unlink() is not necessary because the file doesn't exist.
+     if (os_socket->address.un.sun_path[0] != '\0') {
+@@ -294,7 +294,7 @@ bool ListeningSocketRegistry::CloseOneSafe(OSSocket* os_socket,
+     }
+ #else
+     Utils::Unlink(os_socket->address.un.sun_path);
+-#endif  // defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID)
++#endif  // defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_OHOS)
+     // Remove os_socket from unix_domain_sockets_ list.
+     OSSocket* prev = nullptr;
+     OSSocket* current = unix_domain_sockets_;
+diff --git a/runtime/bin/socket.h b/runtime/bin/socket.h
+index 4da25e5b6a5..8592fcd7a77 100644
+--- a/runtime/bin/socket.h
++++ b/runtime/bin/socket.h
+@@ -262,7 +262,7 @@ class ListeningSocketRegistry {
+                                  const char* path) {
+     while (current != nullptr) {
+       ASSERT(current->address.addr.sa_family == AF_UNIX);
+-#if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID)
++#if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_OHOS)
+       bool condition;
+       if (path[0] == '\0') {
+         condition = current->address.un.sun_path[0] == '\0' &&
+@@ -280,7 +280,7 @@ class ListeningSocketRegistry {
+                              namespc, path) == File::kIdentical) {
+         return current;
+       }
+-#endif  // defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID)
++#endif  // defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_OHOS)
+       current = current->next;
+     }
+     return nullptr;
+diff --git a/runtime/bin/socket_base.cc b/runtime/bin/socket_base.cc
+index 40357d0afaf..087d14aa615 100644
+--- a/runtime/bin/socket_base.cc
++++ b/runtime/bin/socket_base.cc
+@@ -130,7 +130,7 @@ void SocketAddress::GetSockAddr(Dart_Handle obj, RawAddr* addr) {
+ Dart_Handle SocketAddress::GetUnixDomainSockAddr(const char* path,
+                                                  Namespace* namespc,
+                                                  RawAddr* addr) {
+-#if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID)
++#if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_OHOS)
+   NamespaceScope ns(namespc, path);
+   path = ns.path();
+   bool is_abstract = (path[0] == '@');
+@@ -141,7 +141,7 @@ Dart_Handle SocketAddress::GetUnixDomainSockAddr(const char* path,
+     // connection will be rejected.
+     bzero(addr->un.sun_path, sizeof(addr->un.sun_path));
+   }
+-#endif  // defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID)
++#endif  // defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_OHOS)
+   if (sizeof(path) > sizeof(addr->un.sun_path)) {
+     OSError os_error(-1,
+                      "The length of path exceeds the limit. "
+@@ -151,12 +151,12 @@ Dart_Handle SocketAddress::GetUnixDomainSockAddr(const char* path,
+   }
+   addr->un.sun_family = AF_UNIX;
+   Utils::SNPrint(addr->un.sun_path, sizeof(addr->un.sun_path), "%s", path);
+-#if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID)
++#if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_OHOS)
+   // In case of abstract namespace, transfer the leading '@' into a null byte.
+   if (is_abstract) {
+     addr->un.sun_path[0] = '\0';
+   }
+-#endif  // defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID)
++#endif  // defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_OHOS)
+   return Dart_Null();
+ }
+ 
+diff --git a/runtime/bin/socket_base.h b/runtime/bin/socket_base.h
+index a72a8b6dcd4..99775010f12 100644
+--- a/runtime/bin/socket_base.h
++++ b/runtime/bin/socket_base.h
+@@ -9,7 +9,7 @@
+ // Declare the OS-specific types ahead of defining the generic class.
+ #if defined(DART_HOST_OS_FUCHSIA)
+ #include "bin/socket_base_fuchsia.h"
+-#elif defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID)
++#elif defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_OHOS)
+ #include "bin/socket_base_linux.h"
+ #elif defined(DART_HOST_OS_MACOS)
+ #include "bin/socket_base_macos.h"
+@@ -85,7 +85,7 @@ class SocketAddress {
+ 
+  private:
+ #if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_MACOS) ||              \
+-    defined(DART_HOST_OS_ANDROID)
++    defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_OHOS)
+   // Unix domain address is only on Linux, Mac OS and Android now.
+   // unix(7) require sun_path to be 108 bytes on Linux and Android, 104 bytes on
+   // Mac OS.
+@@ -95,7 +95,7 @@ class SocketAddress {
+ #else
+   char as_string_[INET6_ADDRSTRLEN];
+ #endif  // defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_MACOS) ||       \
+-        // defined(DART_HOST_OS_ANDROID)
++        // defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_OHOS)
+   RawAddr addr_;
+ 
+   DISALLOW_COPY_AND_ASSIGN(SocketAddress);
+diff --git a/runtime/bin/socket_base_linux.cc b/runtime/bin/socket_base_linux.cc
+index 570f03b23d2..f20c49c0d1a 100644
+--- a/runtime/bin/socket_base_linux.cc
++++ b/runtime/bin/socket_base_linux.cc
+@@ -3,7 +3,7 @@
+ // BSD-style license that can be found in the LICENSE file.
+ 
+ #include "platform/globals.h"
+-#if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID)
++#if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_OHOS)
+ 
+ #include "bin/socket_base.h"
+ 
+diff --git a/runtime/bin/socket_base_posix.cc b/runtime/bin/socket_base_posix.cc
+index 3838e6d11ee..e10127aa71a 100644
+--- a/runtime/bin/socket_base_posix.cc
++++ b/runtime/bin/socket_base_posix.cc
+@@ -3,8 +3,7 @@
+ // BSD-style license that can be found in the LICENSE file.
+ 
+ #include "platform/globals.h"
+-#if defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_LINUX) ||            \
+-    defined(DART_HOST_OS_MACOS)
++#if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_MACOS) || defined(DART_HOST_OS_OHOS)
+ #include "bin/socket_base.h"
+ 
+ #include <errno.h>        // NOLINT
+@@ -509,4 +508,4 @@ bool SocketBase::SetOption(intptr_t fd,
+ }  // namespace dart
+ 
+ #endif  // defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_LINUX) ||     \
+-        // defined(DART_HOST_OS_MACOS)
++        // defined(DART_HOST_OS_MACOS) || defined(DART_HOST_OS_OHOS)
+diff --git a/runtime/bin/socket_ohos.cc b/runtime/bin/socket_ohos.cc
+new file mode 100644
+index 00000000000..0d4386b14c6
+--- /dev/null
++++ b/runtime/bin/socket_ohos.cc
+@@ -0,0 +1,280 @@
++// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
++// for details. All rights reserved. Use of this source code is governed by a
++// BSD-style license that can be found in the LICENSE file.
++
++#include "platform/globals.h"
++#if defined(DART_HOST_OS_OHOS)
++
++#include "bin/socket.h"
++
++#include <errno.h>  // NOLINT
++
++#include "bin/fdutils.h"
++#include "platform/signal_blocker.h"
++#include "platform/syslog.h"
++#include "platform/utils.h"
++
++namespace dart {
++namespace bin {
++
++Socket::Socket(intptr_t fd)
++    : ReferenceCounted(),
++      fd_(fd),
++      isolate_port_(Dart_GetMainPortId()),
++      port_(ILLEGAL_PORT),
++      udp_receive_buffer_(NULL) {}
++
++void Socket::CloseFd() {
++  SetClosedFd();
++}
++
++void Socket::SetClosedFd() {
++  fd_ = kClosedFd;
++}
++
++static intptr_t Create(const RawAddr& addr) {
++  intptr_t fd;
++  intptr_t type = SOCK_STREAM | SOCK_NONBLOCK | SOCK_CLOEXEC;
++  fd = NO_RETRY_EXPECTED(socket(addr.ss.ss_family, type, 0));
++  if (fd < 0) {
++    return -1;
++  }
++  return fd;
++}
++
++static intptr_t Connect(intptr_t fd, const RawAddr& addr) {
++  intptr_t result = TEMP_FAILURE_RETRY(
++      connect(fd, &addr.addr, SocketAddress::GetAddrLength(addr)));
++  if ((result == 0) || (errno == EINPROGRESS)) {
++    return fd;
++  }
++  FDUtils::SaveErrorAndClose(fd);
++  return -1;
++}
++
++intptr_t Socket::CreateConnect(const RawAddr& addr) {
++  intptr_t fd = Create(addr);
++  if (fd < 0) {
++    return fd;
++  }
++  return Connect(fd, addr);
++}
++
++intptr_t Socket::CreateUnixDomainConnect(const RawAddr& addr) {
++  intptr_t fd = Create(addr);
++  if (fd < 0) {
++    return fd;
++  }
++  intptr_t result = TEMP_FAILURE_RETRY(connect(
++      fd, (struct sockaddr*)&addr.un, SocketAddress::GetAddrLength(addr)));
++  if (result == 0 || errno == EAGAIN) {
++    return fd;
++  }
++  FDUtils::SaveErrorAndClose(fd);
++  return -1;
++}
++
++intptr_t Socket::CreateBindConnect(const RawAddr& addr,
++                                   const RawAddr& source_addr) {
++  intptr_t fd = Create(addr);
++  if (fd < 0) {
++    return fd;
++  }
++
++  intptr_t result = TEMP_FAILURE_RETRY(
++      bind(fd, &source_addr.addr, SocketAddress::GetAddrLength(source_addr)));
++  if (result != 0) {
++    FDUtils::SaveErrorAndClose(fd);
++    return -1;
++  }
++
++  return Connect(fd, addr);
++}
++
++intptr_t Socket::CreateUnixDomainBindConnect(const RawAddr& addr,
++                                             const RawAddr& source_addr) {
++  intptr_t fd = Create(addr);
++  if (fd < 0) {
++    return fd;
++  }
++
++  intptr_t result = TEMP_FAILURE_RETRY(
++      bind(fd, &source_addr.addr, SocketAddress::GetAddrLength(source_addr)));
++  if (result != 0) {
++    FDUtils::SaveErrorAndClose(fd);
++    return -1;
++  }
++
++  result = TEMP_FAILURE_RETRY(connect(fd, (struct sockaddr*)&addr.un,
++                                      SocketAddress::GetAddrLength(addr)));
++  if (result == 0 || errno == EAGAIN) {
++    return fd;
++  }
++  FDUtils::SaveErrorAndClose(fd);
++  return -1;
++}
++
++intptr_t Socket::CreateBindDatagram(const RawAddr& addr,
++                                    bool reuseAddress,
++                                    bool reusePort,
++                                    int ttl) {
++  intptr_t fd;
++
++  fd = NO_RETRY_EXPECTED(socket(addr.addr.sa_family,
++                                SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK,
++                                IPPROTO_UDP));
++  if (fd < 0) {
++    return -1;
++  }
++
++  if (reuseAddress) {
++    int optval = 1;
++    VOID_NO_RETRY_EXPECTED(
++        setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)));
++  }
++
++  if (reusePort) {
++#ifdef SO_REUSEPORT  // Not all Linux versions support this.
++    int optval = 1;
++    int reuse_port_success =
++        setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &optval, sizeof(optval));
++    // Even if it's defined, we might be running on a kernel
++    // that doesn't support it at runtime.
++    if (reuse_port_success != 0) {
++      if (errno == EINTR) {
++        FATAL("Unexpected EINTR errno");
++      }
++      const int kBufferSize = 1024;
++      char error_buf[kBufferSize];
++      Syslog::PrintErr("Dart Socket ERROR: %s:%d: %s.", __FILE__, __LINE__,
++                       Utils::StrError(errno, error_buf, kBufferSize));
++    }
++#else   // !defined SO_REUSEPORT
++    Syslog::PrintErr(
++        "Dart Socket ERROR: %s:%d: `reusePort` not available on this Linux "
++        "version.",
++        __FILE__, __LINE__);
++#endif  // SO_REUSEPORT
++  }
++
++  if (!SocketBase::SetMulticastHops(fd,
++                                    addr.addr.sa_family == AF_INET
++                                        ? SocketAddress::TYPE_IPV4
++                                        : SocketAddress::TYPE_IPV6,
++                                    ttl)) {
++    FDUtils::SaveErrorAndClose(fd);
++    return -1;
++  }
++
++  if (NO_RETRY_EXPECTED(
++          bind(fd, &addr.addr, SocketAddress::GetAddrLength(addr))) < 0) {
++    FDUtils::SaveErrorAndClose(fd);
++    return -1;
++  }
++  return fd;
++}
++
++intptr_t ServerSocket::CreateBindListen(const RawAddr& addr,
++                                        intptr_t backlog,
++                                        bool v6_only) {
++  intptr_t fd;
++
++  fd = NO_RETRY_EXPECTED(
++      socket(addr.ss.ss_family, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0));
++  if (fd < 0) {
++    return -1;
++  }
++
++  int optval = 1;
++  VOID_NO_RETRY_EXPECTED(
++      setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)));
++
++  if (addr.ss.ss_family == AF_INET6) {
++    optval = v6_only ? 1 : 0;
++    VOID_NO_RETRY_EXPECTED(
++        setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &optval, sizeof(optval)));
++  }
++
++  if (NO_RETRY_EXPECTED(
++          bind(fd, &addr.addr, SocketAddress::GetAddrLength(addr))) < 0) {
++    FDUtils::SaveErrorAndClose(fd);
++    return -1;
++  }
++
++  // Test for invalid socket port 65535 (some browsers disallow it).
++  if ((SocketAddress::GetAddrPort(addr) == 0) &&
++      (SocketBase::GetPort(fd) == 65535)) {
++    // Don't close the socket until we have created a new socket, ensuring
++    // that we do not get the bad port number again.
++    intptr_t new_fd = CreateBindListen(addr, backlog, v6_only);
++    FDUtils::SaveErrorAndClose(fd);
++    return new_fd;
++  }
++
++  if (NO_RETRY_EXPECTED(listen(fd, backlog > 0 ? backlog : SOMAXCONN)) != 0) {
++    FDUtils::SaveErrorAndClose(fd);
++    return -1;
++  }
++
++  return fd;
++}
++
++intptr_t ServerSocket::CreateUnixDomainBindListen(const RawAddr& addr,
++                                                  intptr_t backlog) {
++  intptr_t fd = Create(addr);
++  if (NO_RETRY_EXPECTED(bind(fd, (struct sockaddr*)&addr.un,
++                             SocketAddress::GetAddrLength(addr))) < 0) {
++    FDUtils::SaveErrorAndClose(fd);
++    return -1;
++  }
++  if (NO_RETRY_EXPECTED(listen(fd, backlog > 0 ? backlog : SOMAXCONN)) != 0) {
++    FDUtils::SaveErrorAndClose(fd);
++    return -1;
++  }
++  return fd;
++}
++
++bool ServerSocket::StartAccept(intptr_t fd) {
++  USE(fd);
++  return true;
++}
++
++static bool IsTemporaryAcceptError(int error) {
++  // On Linux a number of protocol errors should be treated as EAGAIN.
++  // These are the ones for TCP/IP.
++  return (error == EAGAIN) || (error == ENETDOWN) || (error == EPROTO) ||
++         (error == ENOPROTOOPT) || (error == EHOSTDOWN) || (error == ENONET) ||
++         (error == EHOSTUNREACH) || (error == EOPNOTSUPP) ||
++         (error == ENETUNREACH);
++}
++
++intptr_t ServerSocket::Accept(intptr_t fd) {
++  intptr_t socket;
++  struct sockaddr clientaddr;
++  socklen_t addrlen = sizeof(clientaddr);
++  socket = TEMP_FAILURE_RETRY(accept(fd, &clientaddr, &addrlen));
++  if (socket == -1) {
++    if (IsTemporaryAcceptError(errno)) {
++      // We need to signal to the caller that this is actually not an
++      // error. We got woken up from the poll on the listening socket,
++      // but there is no connection ready to be accepted.
++      ASSERT(kTemporaryFailure != -1);
++      socket = kTemporaryFailure;
++    }
++  } else {
++    if (!FDUtils::SetCloseOnExec(socket)) {
++      FDUtils::SaveErrorAndClose(socket);
++      return -1;
++    }
++    if (!FDUtils::SetNonBlocking(socket)) {
++      FDUtils::SaveErrorAndClose(socket);
++      return -1;
++    }
++  }
++  return socket;
++}
++
++}  // namespace bin
++}  // namespace dart
++
++#endif  // defined(DART_HOST_OS_OHOS)
+diff --git a/runtime/bin/stdio_ohos.cc b/runtime/bin/stdio_ohos.cc
+new file mode 100644
+index 00000000000..8dd67b67b45
+--- /dev/null
++++ b/runtime/bin/stdio_ohos.cc
+@@ -0,0 +1,139 @@
++// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
++// for details. All rights reserved. Use of this source code is governed by a
++// BSD-style license that can be found in the LICENSE file.
++
++#include "platform/globals.h"
++#if defined(DART_HOST_OS_OHOS)
++
++#include "bin/stdio.h"
++
++#include <errno.h>      // NOLINT
++#include <sys/ioctl.h>  // NOLINT
++#include <termios.h>    // NOLINT
++
++#include "bin/fdutils.h"
++#include "platform/signal_blocker.h"
++
++namespace dart {
++namespace bin {
++
++bool Stdin::ReadByte(intptr_t fd, int* byte) {
++  unsigned char b;
++  ssize_t s = TEMP_FAILURE_RETRY(read(fd, &b, 1));
++  if (s < 0) {
++    return false;
++  }
++  *byte = (s == 0) ? -1 : b;
++  return true;
++}
++
++bool Stdin::GetEchoMode(intptr_t fd, bool* enabled) {
++  struct termios term;
++  int status = NO_RETRY_EXPECTED(tcgetattr(fd, &term));
++  if (status != 0) {
++    return false;
++  }
++  *enabled = ((term.c_lflag & ECHO) != 0);
++  return true;
++}
++
++bool Stdin::SetEchoMode(intptr_t fd, bool enabled) {
++  struct termios term;
++  int status = NO_RETRY_EXPECTED(tcgetattr(fd, &term));
++  if (status != 0) {
++    return false;
++  }
++  if (enabled) {
++    term.c_lflag |= ECHO;
++  } else {
++    term.c_lflag &= ~(ECHO);
++  }
++  status = NO_RETRY_EXPECTED(tcsetattr(fd, TCSANOW, &term));
++  return (status == 0);
++}
++
++bool Stdin::GetEchoNewlineMode(intptr_t fd, bool* enabled) {
++  struct termios term;
++  int status = NO_RETRY_EXPECTED(tcgetattr(fd, &term));
++  if (status != 0) {
++    return false;
++  }
++  *enabled = ((term.c_lflag & ECHONL) != 0);
++  return true;
++}
++
++bool Stdin::SetEchoNewlineMode(intptr_t fd, bool enabled) {
++  struct termios term;
++  int status = NO_RETRY_EXPECTED(tcgetattr(fd, &term));
++  if (status != 0) {
++    return false;
++  }
++  if (enabled) {
++    term.c_lflag |= ECHONL;
++  } else {
++    term.c_lflag &= ~(ECHONL);
++  }
++  status = NO_RETRY_EXPECTED(tcsetattr(fd, TCSANOW, &term));
++  return (status == 0);
++}
++
++bool Stdin::GetLineMode(intptr_t fd, bool* enabled) {
++  struct termios term;
++  int status = NO_RETRY_EXPECTED(tcgetattr(fd, &term));
++  if (status != 0) {
++    return false;
++  }
++  *enabled = ((term.c_lflag & ICANON) != 0);
++  return true;
++}
++
++bool Stdin::SetLineMode(intptr_t fd, bool enabled) {
++  struct termios term;
++  int status = NO_RETRY_EXPECTED(tcgetattr(fd, &term));
++  if (status != 0) {
++    return false;
++  }
++  if (enabled) {
++    term.c_lflag |= ICANON;
++  } else {
++    term.c_lflag &= ~(ICANON);
++  }
++  status = NO_RETRY_EXPECTED(tcsetattr(fd, TCSANOW, &term));
++  return (status == 0);
++}
++
++static bool TermIsKnownToSupportAnsi() {
++  const char* term = getenv("TERM");
++  if (term == NULL) {
++    return false;
++  }
++
++  return strstr(term, "xterm") != NULL || strstr(term, "screen") != NULL ||
++         strstr(term, "rxvt") != NULL;
++}
++
++bool Stdin::AnsiSupported(intptr_t fd, bool* supported) {
++  *supported = (isatty(fd) != 0) && TermIsKnownToSupportAnsi();
++  return true;
++}
++
++bool Stdout::GetTerminalSize(intptr_t fd, int size[2]) {
++  struct winsize w;
++  int status = NO_RETRY_EXPECTED(ioctl(fd, TIOCGWINSZ, &w));
++  if ((status == 0) && ((w.ws_col != 0) || (w.ws_row != 0))) {
++    size[0] = w.ws_col;
++    size[1] = w.ws_row;
++    return true;
++  }
++  return false;
++}
++
++bool Stdout::AnsiSupported(intptr_t fd, bool* supported) {
++  *supported = (isatty(fd) != 0) && TermIsKnownToSupportAnsi();
++  return true;
++}
++
++}  // namespace bin
++}  // namespace dart
++
++#endif  // defined(DART_HOST_OS_OHOS)
+diff --git a/runtime/bin/sync_socket_ohos.cc b/runtime/bin/sync_socket_ohos.cc
+new file mode 100644
+index 00000000000..be15707ba28
+--- /dev/null
++++ b/runtime/bin/sync_socket_ohos.cc
+@@ -0,0 +1,92 @@
++// Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
++// for details. All rights reserved. Use of this source code is governed by a
++// BSD-style license that can be found in the LICENSE file.
++
++#include "platform/globals.h"
++#if defined(DART_HOST_OS_OHOS)
++
++#include "bin/sync_socket.h"
++
++#include <errno.h>  // NOLINT
++
++#include "bin/fdutils.h"
++#include "bin/socket_base.h"
++#include "platform/signal_blocker.h"
++
++namespace dart {
++namespace bin {
++
++bool SynchronousSocket::Initialize() {
++  // Nothing to do on Ohos.
++  return true;
++}
++
++static intptr_t Create(const RawAddr& addr) {
++  intptr_t fd;
++  intptr_t type = SOCK_STREAM | SOCK_CLOEXEC;
++  fd = NO_RETRY_EXPECTED(socket(addr.ss.ss_family, type, 0));
++  if (fd < 0) {
++    return -1;
++  }
++  return fd;
++}
++
++static intptr_t Connect(intptr_t fd, const RawAddr& addr) {
++  intptr_t result = TEMP_FAILURE_RETRY(
++      connect(fd, &addr.addr, SocketAddress::GetAddrLength(addr)));
++  if (result == 0) {
++    return fd;
++  }
++  ASSERT(errno != EINPROGRESS);
++  FDUtils::SaveErrorAndClose(fd);
++  return -1;
++}
++
++intptr_t SynchronousSocket::CreateConnect(const RawAddr& addr) {
++  intptr_t fd = Create(addr);
++  if (fd < 0) {
++    return fd;
++  }
++  return Connect(fd, addr);
++}
++
++intptr_t SynchronousSocket::Available(intptr_t fd) {
++  return SocketBase::Available(fd);
++}
++
++intptr_t SynchronousSocket::GetPort(intptr_t fd) {
++  return SocketBase::GetPort(fd);
++}
++
++SocketAddress* SynchronousSocket::GetRemotePeer(intptr_t fd, intptr_t* port) {
++  return SocketBase::GetRemotePeer(fd, port);
++}
++
++intptr_t SynchronousSocket::Read(intptr_t fd,
++                                 void* buffer,
++                                 intptr_t num_bytes) {
++  return SocketBase::Read(fd, buffer, num_bytes, SocketBase::kSync);
++}
++
++intptr_t SynchronousSocket::Write(intptr_t fd,
++                                  const void* buffer,
++                                  intptr_t num_bytes) {
++  return SocketBase::Write(fd, buffer, num_bytes, SocketBase::kSync);
++}
++
++void SynchronousSocket::ShutdownRead(intptr_t fd) {
++  VOID_NO_RETRY_EXPECTED(shutdown(fd, SHUT_RD));
++}
++
++void SynchronousSocket::ShutdownWrite(intptr_t fd) {
++  VOID_NO_RETRY_EXPECTED(shutdown(fd, SHUT_WR));
++}
++
++void SynchronousSocket::Close(intptr_t fd) {
++  return SocketBase::Close(fd);
++}
++
++}  // namespace bin
++}  // namespace dart
++
++#endif  // defined(DART_HOST_OS_OHOS)
+diff --git a/runtime/bin/thread.h b/runtime/bin/thread.h
+index e41e8b620a5..c509f3daf17 100644
+--- a/runtime/bin/thread.h
++++ b/runtime/bin/thread.h
+@@ -22,6 +22,8 @@ class Monitor;
+ #include "bin/thread_fuchsia.h"
+ #elif defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID)
+ #include "bin/thread_linux.h"
++#elif defined(DART_HOST_OS_OHOS)
++#include "bin/thread_ohos.h"
+ #elif defined(DART_HOST_OS_MACOS)
+ #include "bin/thread_macos.h"
+ #elif defined(DART_HOST_OS_WINDOWS)
+diff --git a/runtime/bin/thread_absl.cc b/runtime/bin/thread_absl.cc
+index 23bc5e55a5c..3bb3084b6c6 100644
+--- a/runtime/bin/thread_absl.cc
++++ b/runtime/bin/thread_absl.cc
+@@ -71,7 +71,7 @@ static void* ThreadStart(void* data_ptr) {
+   uword parameter = data->parameter();
+   delete data;
+ 
+-#if defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_LINUX)
++#if defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_OHOS)
+   // Set the thread name. There is 16 bytes limit on the name (including \0).
+   // pthread_setname_np ignores names that are too long rather than truncating.
+   char truncated_name[16];
+diff --git a/runtime/bin/thread_ohos.cc b/runtime/bin/thread_ohos.cc
+new file mode 100644
+index 00000000000..33657a4f6c5
+--- /dev/null
++++ b/runtime/bin/thread_ohos.cc
+@@ -0,0 +1,280 @@
++// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
++// for details. All rights reserved. Use of this source code is governed by a
++// BSD-style license that can be found in the LICENSE file.
++
++#include "platform/globals.h"
++#if defined(DART_HOST_OS_OHOS) && !defined(DART_USE_ABSL)
++
++#include "bin/thread.h"
++#include "bin/thread_ohos.h"
++
++#include <errno.h>         // NOLINT
++#include <sys/resource.h>  // NOLINT
++#include <sys/time.h>      // NOLINT
++
++#include "platform/assert.h"
++#include "platform/utils.h"
++
++namespace dart {
++namespace bin {
++
++#define VALIDATE_PTHREAD_RESULT(result)                                        \
++  if (result != 0) {                                                           \
++    const int kBufferSize = 1024;                                              \
++    char error_buf[kBufferSize];                                               \
++    FATAL("pthread error: %d (%s)", result,                                   \
++           Utils::StrError(result, error_buf, kBufferSize));                   \
++  }
++
++#ifdef DEBUG
++#define RETURN_ON_PTHREAD_FAILURE(result)                                      \
++  if (result != 0) {                                                           \
++    const int kBufferSize = 1024;                                              \
++    char error_buf[kBufferSize];                                               \
++    fprintf(stderr, "%s:%d: pthread error: %d (%s)\n", __FILE__, __LINE__,     \
++            result, Utils::StrError(result, error_buf, kBufferSize));          \
++    return result;                                                             \
++  }
++#else
++#define RETURN_ON_PTHREAD_FAILURE(result)                                      \
++  if (result != 0) {                                                           \
++    return result;                                                             \
++  }
++#endif
++
++static void ComputeTimeSpecMicros(struct timespec* ts, int64_t micros) {
++  int64_t secs = micros / kMicrosecondsPerSecond;
++  int64_t nanos =
++      (micros - (secs * kMicrosecondsPerSecond)) * kNanosecondsPerMicrosecond;
++  int result = clock_gettime(CLOCK_MONOTONIC, ts);
++  ASSERT(result == 0);
++  ts->tv_sec += secs;
++  ts->tv_nsec += nanos;
++  if (ts->tv_nsec >= kNanosecondsPerSecond) {
++    ts->tv_sec += 1;
++    ts->tv_nsec -= kNanosecondsPerSecond;
++  }
++}
++
++class ThreadStartData {
++ public:
++  ThreadStartData(const char* name,
++                  Thread::ThreadStartFunction function,
++                  uword parameter)
++      : name_(name), function_(function), parameter_(parameter) {}
++
++  const char* name() const { return name_; }
++  Thread::ThreadStartFunction function() const { return function_; }
++  uword parameter() const { return parameter_; }
++
++ private:
++  const char* name_;
++  Thread::ThreadStartFunction function_;
++  uword parameter_;
++
++  DISALLOW_COPY_AND_ASSIGN(ThreadStartData);
++};
++
++// Dispatch to the thread start function provided by the caller. This trampoline
++// is used to ensure that the thread is properly destroyed if the thread just
++// exits.
++static void* ThreadStart(void* data_ptr) {
++  ThreadStartData* data = reinterpret_cast<ThreadStartData*>(data_ptr);
++
++  const char* name = data->name();
++  Thread::ThreadStartFunction function = data->function();
++  uword parameter = data->parameter();
++  delete data;
++
++  // Set the thread name. There is 16 bytes limit on the name (including \0).
++  // pthread_setname_np ignores names that are too long rather than truncating.
++  char truncated_name[16];
++  snprintf(truncated_name, sizeof(truncated_name), "%s", name);
++  pthread_setname_np(pthread_self(), truncated_name);
++
++  // Call the supplied thread start function handing it its parameters.
++  function(parameter);
++
++  return NULL;
++}
++
++int Thread::Start(const char* name,
++                  ThreadStartFunction function,
++                  uword parameter) {
++  pthread_attr_t attr;
++  int result = pthread_attr_init(&attr);
++  RETURN_ON_PTHREAD_FAILURE(result);
++
++  result = pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
++  RETURN_ON_PTHREAD_FAILURE(result);
++
++  result = pthread_attr_setstacksize(&attr, Thread::GetMaxStackSize());
++  RETURN_ON_PTHREAD_FAILURE(result);
++
++  ThreadStartData* data = new ThreadStartData(name, function, parameter);
++
++  pthread_t tid;
++  result = pthread_create(&tid, &attr, ThreadStart, data);
++  RETURN_ON_PTHREAD_FAILURE(result);
++
++  result = pthread_attr_destroy(&attr);
++  RETURN_ON_PTHREAD_FAILURE(result);
++
++  return 0;
++}
++
++const ThreadId Thread::kInvalidThreadId = static_cast<ThreadId>(0);
++
++intptr_t Thread::GetMaxStackSize() {
++  const int kStackSize = (128 * kWordSize * KB);
++  return kStackSize;
++}
++
++ThreadId Thread::GetCurrentThreadId() {
++  return pthread_self();
++}
++
++bool Thread::Compare(ThreadId a, ThreadId b) {
++  return (pthread_equal(a, b) != 0);
++}
++
++Mutex::Mutex() {
++  pthread_mutexattr_t attr;
++  int result = pthread_mutexattr_init(&attr);
++  VALIDATE_PTHREAD_RESULT(result);
++
++#if defined(DEBUG)
++  result = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK);
++  VALIDATE_PTHREAD_RESULT(result);
++#endif  // defined(DEBUG)
++
++  result = pthread_mutex_init(data_.mutex(), &attr);
++  // Verify that creating a pthread_mutex succeeded.
++  VALIDATE_PTHREAD_RESULT(result);
++
++  result = pthread_mutexattr_destroy(&attr);
++  VALIDATE_PTHREAD_RESULT(result);
++}
++
++Mutex::~Mutex() {
++  int result = pthread_mutex_destroy(data_.mutex());
++  // Verify that the pthread_mutex was destroyed.
++  VALIDATE_PTHREAD_RESULT(result);
++}
++
++void Mutex::Lock() {
++  int result = pthread_mutex_lock(data_.mutex());
++  // Specifically check for dead lock to help debugging.
++  ASSERT(result != EDEADLK);
++  ASSERT(result == 0);  // Verify no other errors.
++  // TODO(iposva): Do we need to track lock owners?
++}
++
++bool Mutex::TryLock() {
++  int result = pthread_mutex_trylock(data_.mutex());
++  // Return false if the lock is busy and locking failed.
++  if (result == EBUSY) {
++    return false;
++  }
++  ASSERT(result == 0);  // Verify no other errors.
++  // TODO(iposva): Do we need to track lock owners?
++  return true;
++}
++
++void Mutex::Unlock() {
++  // TODO(iposva): Do we need to track lock owners?
++  int result = pthread_mutex_unlock(data_.mutex());
++  // Specifically check for wrong thread unlocking to aid debugging.
++  ASSERT(result != EPERM);
++  ASSERT(result == 0);  // Verify no other errors.
++}
++
++Monitor::Monitor() {
++  pthread_mutexattr_t mutex_attr;
++  int result = pthread_mutexattr_init(&mutex_attr);
++  VALIDATE_PTHREAD_RESULT(result);
++
++#if defined(DEBUG)
++  result = pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_ERRORCHECK);
++  VALIDATE_PTHREAD_RESULT(result);
++#endif  // defined(DEBUG)
++
++  result = pthread_mutex_init(data_.mutex(), &mutex_attr);
++  VALIDATE_PTHREAD_RESULT(result);
++
++  result = pthread_mutexattr_destroy(&mutex_attr);
++  VALIDATE_PTHREAD_RESULT(result);
++
++  pthread_condattr_t cond_attr;
++  result = pthread_condattr_init(&cond_attr);
++  VALIDATE_PTHREAD_RESULT(result);
++
++  result = pthread_condattr_setclock(&cond_attr, CLOCK_MONOTONIC);
++  VALIDATE_PTHREAD_RESULT(result);
++
++  result = pthread_cond_init(data_.cond(), &cond_attr);
++  VALIDATE_PTHREAD_RESULT(result);
++
++  result = pthread_condattr_destroy(&cond_attr);
++  VALIDATE_PTHREAD_RESULT(result);
++}
++
++Monitor::~Monitor() {
++  int result = pthread_mutex_destroy(data_.mutex());
++  VALIDATE_PTHREAD_RESULT(result);
++
++  result = pthread_cond_destroy(data_.cond());
++  VALIDATE_PTHREAD_RESULT(result);
++}
++
++void Monitor::Enter() {
++  int result = pthread_mutex_lock(data_.mutex());
++  VALIDATE_PTHREAD_RESULT(result);
++  // TODO(iposva): Do we need to track lock owners?
++}
++
++void Monitor::Exit() {
++  // TODO(iposva): Do we need to track lock owners?
++  int result = pthread_mutex_unlock(data_.mutex());
++  VALIDATE_PTHREAD_RESULT(result);
++}
++
++Monitor::WaitResult Monitor::Wait(int64_t millis) {
++  return WaitMicros(millis * kMicrosecondsPerMillisecond);
++}
++
++Monitor::WaitResult Monitor::WaitMicros(int64_t micros) {
++  // TODO(iposva): Do we need to track lock owners?
++  Monitor::WaitResult retval = kNotified;
++  if (micros == kNoTimeout) {
++    // Wait forever.
++    int result = pthread_cond_wait(data_.cond(), data_.mutex());
++    VALIDATE_PTHREAD_RESULT(result);
++  } else {
++    struct timespec ts;
++    ComputeTimeSpecMicros(&ts, micros);
++    int result = pthread_cond_timedwait(data_.cond(), data_.mutex(), &ts);
++    ASSERT((result == 0) || (result == ETIMEDOUT));
++    if (result == ETIMEDOUT) {
++      retval = kTimedOut;
++    }
++  }
++  return retval;
++}
++
++void Monitor::Notify() {
++  // TODO(iposva): Do we need to track lock owners?
++  int result = pthread_cond_signal(data_.cond());
++  VALIDATE_PTHREAD_RESULT(result);
++}
++
++void Monitor::NotifyAll() {
++  // TODO(iposva): Do we need to track lock owners?
++  int result = pthread_cond_broadcast(data_.cond());
++  VALIDATE_PTHREAD_RESULT(result);
++}
++
++}  // namespace bin
++}  // namespace dart
++
++#endif  // defined(DART_HOST_OS_OHOS) && !defined(DART_USE_ABSL)
+diff --git a/runtime/bin/thread_ohos.h b/runtime/bin/thread_ohos.h
+new file mode 100644
+index 00000000000..c15799d45f7
+--- /dev/null
++++ b/runtime/bin/thread_ohos.h
+@@ -0,0 +1,57 @@
++// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
++// for details. All rights reserved. Use of this source code is governed by a
++// BSD-style license that can be found in the LICENSE file.
++
++#ifndef RUNTIME_BIN_THREAD_OHOS_H_
++#define RUNTIME_BIN_THREAD_OHOS_H_
++
++#if !defined(RUNTIME_BIN_THREAD_H_)
++#error Do not include thread_ohos.h directly; use thread.h instead.
++#endif
++
++#include <pthread.h>
++
++#include "platform/assert.h"
++#include "platform/globals.h"
++
++namespace dart {
++namespace bin {
++
++typedef pthread_t ThreadId;
++
++class MutexData {
++ private:
++  MutexData() {}
++  ~MutexData() {}
++
++  pthread_mutex_t* mutex() { return &mutex_; }
++
++  pthread_mutex_t mutex_;
++
++  friend class Mutex;
++
++  DISALLOW_ALLOCATION();
++  DISALLOW_COPY_AND_ASSIGN(MutexData);
++};
++
++class MonitorData {
++ private:
++  MonitorData() {}
++  ~MonitorData() {}
++
++  pthread_mutex_t* mutex() { return &mutex_; }
++  pthread_cond_t* cond() { return &cond_; }
++
++  pthread_mutex_t mutex_;
++  pthread_cond_t cond_;
++
++  friend class Monitor;
++
++  DISALLOW_ALLOCATION();
++  DISALLOW_COPY_AND_ASSIGN(MonitorData);
++};
++
++}  // namespace bin
++}  // namespace dart
++
++#endif  // RUNTIME_BIN_THREAD_OHOS_H_
+diff --git a/runtime/bin/utils_ohos.cc b/runtime/bin/utils_ohos.cc
+new file mode 100644
+index 00000000000..487e4f30199
+--- /dev/null
++++ b/runtime/bin/utils_ohos.cc
+@@ -0,0 +1,113 @@
++// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
++// for details. All rights reserved. Use of this source code is governed by a
++// BSD-style license that can be found in the LICENSE file.
++
++#include "platform/globals.h"
++#if defined(DART_HOST_OS_OHOS)
++
++#include <errno.h>     // NOLINT
++#include <netdb.h>     // NOLINT
++#include <sys/time.h>  // NOLINT
++#include <time.h>      // NOLINT
++
++#include "bin/utils.h"
++#include "platform/assert.h"
++#include "platform/utils.h"
++
++namespace dart {
++namespace bin {
++
++OSError::OSError() : sub_system_(kSystem), code_(0), message_(NULL) {
++  Reload();
++}
++
++void OSError::Reload() {
++  SetCodeAndMessage(kSystem, errno);
++}
++
++void OSError::SetCodeAndMessage(SubSystem sub_system, int code) {
++  set_sub_system(sub_system);
++  set_code(code);
++  if (sub_system == kSystem) {
++    const int kBufferSize = 1024;
++    char error_buf[kBufferSize];
++    SetMessage(Utils::StrError(code, error_buf, kBufferSize));
++  } else if (sub_system == kGetAddressInfo) {
++    SetMessage(gai_strerror(code));
++  } else {
++    UNREACHABLE();
++  }
++}
++
++const char* StringUtils::ConsoleStringToUtf8(const char* str,
++                                             intptr_t len,
++                                             intptr_t* result_len) {
++  return NULL;
++}
++
++const char* StringUtils::Utf8ToConsoleString(const char* utf8,
++                                             intptr_t len,
++                                             intptr_t* result_len) {
++  return NULL;
++}
++
++char* StringUtils::ConsoleStringToUtf8(char* str,
++                                       intptr_t len,
++                                       intptr_t* result_len) {
++  return NULL;
++}
++
++char* StringUtils::Utf8ToConsoleString(char* utf8,
++                                       intptr_t len,
++                                       intptr_t* result_len) {
++  return NULL;
++}
++
++bool ShellUtils::GetUtf8Argv(int argc, char** argv) {
++  return false;
++}
++
++void TimerUtils::InitOnce() {}
++
++int64_t TimerUtils::GetCurrentMonotonicMillis() {
++  return GetCurrentMonotonicMicros() / 1000;
++}
++
++int64_t TimerUtils::GetCurrentMonotonicMicros() {
++  struct timespec ts;
++  if (clock_gettime(CLOCK_MONOTONIC, &ts) != 0) {
++    UNREACHABLE();
++    return 0;
++  }
++  // Convert to microseconds.
++  int64_t result = ts.tv_sec;
++  result *= kMicrosecondsPerSecond;
++  result += (ts.tv_nsec / kNanosecondsPerMicrosecond);
++  return result;
++}
++
++void TimerUtils::Sleep(int64_t millis) {
++  struct timespec req;  // requested.
++  struct timespec rem;  // remainder.
++  int64_t micros = millis * kMicrosecondsPerMillisecond;
++  int64_t seconds = micros / kMicrosecondsPerSecond;
++  micros = micros - seconds * kMicrosecondsPerSecond;
++  int64_t nanos = micros * kNanosecondsPerMicrosecond;
++  req.tv_sec = seconds;
++  req.tv_nsec = nanos;
++  while (true) {
++    int r = nanosleep(&req, &rem);
++    if (r == 0) {
++      break;
++    }
++    // We should only ever see an interrupt error.
++    ASSERT(errno == EINTR);
++    // Copy remainder into requested and repeat.
++    req = rem;
++  }
++}
++
++}  // namespace bin
++}  // namespace dart
++
++#endif  // defined(DART_HOST_OS_OHOS)
+diff --git a/runtime/bin/virtual_memory_posix.cc b/runtime/bin/virtual_memory_posix.cc
+index b7f0eaf872c..fe6659cf32a 100644
+--- a/runtime/bin/virtual_memory_posix.cc
++++ b/runtime/bin/virtual_memory_posix.cc
+@@ -4,7 +4,7 @@
+ 
+ #include "platform/globals.h"
+ #if defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_LINUX) ||            \
+-    defined(DART_HOST_OS_MACOS)
++    defined(DART_HOST_OS_MACOS) || defined(DART_HOST_OS_OHOS)
+ 
+ #include "bin/virtual_memory.h"
+ 
+diff --git a/runtime/bin/vmservice_impl.cc b/runtime/bin/vmservice_impl.cc
+index 7b7559b8af6..f58bb029064 100644
+--- a/runtime/bin/vmservice_impl.cc
++++ b/runtime/bin/vmservice_impl.cc
+@@ -132,6 +132,9 @@ bool VmService::Setup(const char* server_ip,
+ 
+   Dart_Handle result;
+ 
++  //TODO 临时关闭验证
++   auth_codes_disabled=true;
++
+   // Prepare builtin and its dependent libraries for use to resolve URIs.
+   // Set up various closures, e.g: printing, timers etc.
+   // Set up 'package root' for URI resolution.
+diff --git a/runtime/lib/ffi_dynamic_library.cc b/runtime/lib/ffi_dynamic_library.cc
+index 2c6df520f71..cd9840afcae 100644
+--- a/runtime/lib/ffi_dynamic_library.cc
++++ b/runtime/lib/ffi_dynamic_library.cc
+@@ -23,7 +23,7 @@
+ #include "vm/zone_text_buffer.h"
+ 
+ #if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_MACOS) ||              \
+-    defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_FUCHSIA)
++    defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_FUCHSIA) || defined(DART_HOST_OS_OHOS)
+ #include <dlfcn.h>
+ #endif
+ 
+@@ -175,7 +175,7 @@ DEFINE_NATIVE_ENTRY(Ffi_dl_open, 0, 1) {
+ 
+ DEFINE_NATIVE_ENTRY(Ffi_dl_processLibrary, 0, 0) {
+ #if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_MACOS) ||              \
+-    defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_FUCHSIA)
++    defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_FUCHSIA) || defined(DART_HOST_OS_OHOS)
+   return DynamicLibrary::New(RTLD_DEFAULT, false);
+ #else
+   return DynamicLibrary::New(kWindowsDynamicLibraryProcessPtr, false);
+@@ -425,7 +425,7 @@ static void* FfiResolveAsset(Thread* const thread,
+     handle = LoadDynamicLibrary(path.ToCString(), error);
+   } else if (asset_type.Equals(Symbols::process())) {
+ #if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_MACOS) ||              \
+-    defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_FUCHSIA)
++    defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_FUCHSIA) || defined(DART_HOST_OS_OHOS)
+     handle = RTLD_DEFAULT;
+ #else
+     handle = kWindowsDynamicLibraryProcessPtr;
+diff --git a/runtime/platform/globals.h b/runtime/platform/globals.h
+index 29bbb969d1d..fb8c89e0aa7 100644
+--- a/runtime/platform/globals.h
++++ b/runtime/platform/globals.h
+@@ -109,6 +109,10 @@
+ // Check for Android first, to determine its difference from Linux.
+ #define DART_HOST_OS_ANDROID 1
+ 
++#elif defined(DART_TARGET_OS_OHOS) && defined(DART_RUNTIME_OS_OHOS)
++
++#define DART_HOST_OS_OHOS 1
++
+ #elif defined(__linux__) || defined(__FreeBSD__)
+ 
+ // Generic Linux.
+@@ -384,7 +388,8 @@ struct simd128_value_t {
+ 
+ #if !defined(DART_TARGET_OS_ANDROID) && !defined(DART_TARGET_OS_FUCHSIA) &&    \
+     !defined(DART_TARGET_OS_MACOS_IOS) && !defined(DART_TARGET_OS_LINUX) &&    \
+-    !defined(DART_TARGET_OS_MACOS) && !defined(DART_TARGET_OS_WINDOWS)
++    !defined(DART_TARGET_OS_MACOS) && !defined(DART_TARGET_OS_WINDOWS) &&      \
++    !defined(DART_TARGET_OS_OHOS)
+ // No target OS specified; pick the one matching the host OS.
+ #if defined(DART_HOST_OS_ANDROID)
+ #define DART_TARGET_OS_ANDROID 1
+@@ -395,6 +400,8 @@ struct simd128_value_t {
+ #define DART_TARGET_OS_MACOS_IOS 1
+ #elif defined(DART_HOST_OS_LINUX)
+ #define DART_TARGET_OS_LINUX 1
++#elif defined(DART_HOST_OS_OHOS)
++#define DART_TARGET_OS_OHOS 1
+ #elif defined(DART_HOST_OS_MACOS)
+ #define DART_TARGET_OS_MACOS 1
+ #elif defined(DART_HOST_OS_WINDOWS)
+@@ -741,6 +748,8 @@ DART_FORCE_INLINE D bit_copy(const S& source) {
+ #define kHostOperatingSystemName "macos"
+ #elif defined(DART_HOST_OS_WINDOWS)
+ #define kHostOperatingSystemName "windows"
++#elif defined(DART_HOST_OS_OHOS)
++#define kHostOperatingSystemName "ohos"
+ #else
+ #error Host operating system detection failed.
+ #endif
+@@ -785,6 +794,8 @@ DART_FORCE_INLINE D bit_copy(const S& source) {
+ #define kTargetOperatingSystemName "android"
+ #elif defined(DART_TARGET_OS_FUCHSIA)
+ #define kTargetOperatingSystemName "fuchsia"
++#elif defined(DART_TARGET_OS_OHOS)
++#define kTargetOperatingSystemName "ohos"
+ #elif defined(DART_TARGET_OS_LINUX)
+ #define kTargetOperatingSystemName "linux"
+ #elif defined(DART_TARGET_OS_MACOS_IOS)
+diff --git a/runtime/platform/platform_sources.gni b/runtime/platform/platform_sources.gni
+index e300478c7ea..2ed478e2ee3 100644
+--- a/runtime/platform/platform_sources.gni
++++ b/runtime/platform/platform_sources.gni
+@@ -25,6 +25,7 @@ platform_sources = [
+   "syslog_android.cc",
+   "syslog_fuchsia.cc",
+   "syslog_linux.cc",
++  "syslog_ohos.cc",
+   "syslog_macos.cc",
+   "syslog_win.cc",
+   "text_buffer.cc",
+@@ -40,6 +41,7 @@ platform_sources = [
+   "utils_android.cc",
+   "utils_fuchsia.cc",
+   "utils_linux.cc",
++  "utils_ohos.cc",
+   "utils_macos.cc",
+   "utils_win.cc",
+ ]
+diff --git a/runtime/platform/syslog_ohos.cc b/runtime/platform/syslog_ohos.cc
+new file mode 100644
+index 00000000000..139881f7271
+--- /dev/null
++++ b/runtime/platform/syslog_ohos.cc
+@@ -0,0 +1,46 @@
++// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
++// for details. All rights reserved. Use of this source code is governed by a
++// BSD-style license that can be found in the LICENSE file.
++
++#include "platform/globals.h"
++#if defined(DART_HOST_OS_OHOS)
++
++#include "platform/syslog.h"
++
++#include <hilog/log.h>    // NOLINT
++#include <stdio.h>        // NOLINT
++
++namespace dart {
++#define HILOG_LOG_DOMAIN 0x0000
++#define HILOG_LOG_TAG "Dart"
++
++void Syslog::VPrint(const char* format, va_list args) {
++
++  va_list stdio_args;
++  va_copy(stdio_args, args);
++  vprintf(format, stdio_args);
++  fflush(stdout);
++  va_end(stdio_args);
++
++  va_list log_args;
++  va_copy(log_args, args);
++  ((void)OH_LOG_Print(LOG_APP, LOG_INFO, HILOG_LOG_DOMAIN, \
++                      HILOG_LOG_TAG, format, log_args));
++  va_end(log_args);
++}
++
++void Syslog::VPrintErr(const char* format, va_list args) {
++  va_list stdio_args;
++  va_copy(stdio_args, args);
++  vprintf(format, stdio_args);
++  fflush(stdout);
++  va_end(stdio_args);
++  va_list log_args;
++  va_copy(log_args, args);
++  ((void)OH_LOG_Print(LOG_APP, LOG_ERROR, HILOG_LOG_DOMAIN, \
++                      HILOG_LOG_TAG, format, log_args));
++  va_end(log_args);
++}
++
++}  // namespace dart
++#endif  // defined(DART_HOST_OS_OHOS)
+diff --git a/runtime/platform/utils.cc b/runtime/platform/utils.cc
+index e7179ed8040..88e016482c1 100644
+--- a/runtime/platform/utils.cc
++++ b/runtime/platform/utils.cc
+@@ -8,7 +8,7 @@
+ #include "platform/globals.h"
+ 
+ #if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_MACOS) ||              \
+-    defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_FUCHSIA)
++    defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_FUCHSIA) || defined(DART_HOST_OS_OHOS)
+ #include <dlfcn.h>
+ #endif
+ 
+@@ -262,7 +262,7 @@ static void GetLastErrorAsString(char** error) {
+   if (error == nullptr) return;  // Nothing to do.
+ 
+ #if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_MACOS) ||              \
+-    defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_FUCHSIA)
++    defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_FUCHSIA) || defined(DART_HOST_OS_OHOS)
+   const char* status = dlerror();
+   *error = status != nullptr ? strdup(status) : nullptr;
+ #elif defined(DART_HOST_OS_WINDOWS)
+@@ -294,7 +294,7 @@ void* Utils::LoadDynamicLibrary(const char* library_path, char** error) {
+   void* handle = nullptr;
+ 
+ #if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_MACOS) ||              \
+-    defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_FUCHSIA)
++    defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_FUCHSIA) || defined(DART_HOST_OS_OHOS)
+   handle = dlopen(library_path, RTLD_LAZY);
+ #elif defined(DART_HOST_OS_WINDOWS)
+   SetLastError(0);  // Clear any errors.
+@@ -329,7 +329,7 @@ void* Utils::ResolveSymbolInDynamicLibrary(void* library_handle,
+   void* result = nullptr;
+ 
+ #if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_MACOS) ||              \
+-    defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_FUCHSIA)
++    defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_FUCHSIA) || defined(DART_HOST_OS_OHOS)
+   dlerror();  // Clear any errors.
+   result = dlsym(library_handle, symbol);
+   // Note: nullptr might be a valid return from dlsym. Must call dlerror
+@@ -353,7 +353,7 @@ void Utils::UnloadDynamicLibrary(void* library_handle, char** error) {
+   bool ok = false;
+ 
+ #if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_MACOS) ||              \
+-    defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_FUCHSIA)
++    defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_FUCHSIA) || defined(DART_HOST_OS_OHOS)
+   ok = dlclose(library_handle) == 0;
+ #elif defined(DART_HOST_OS_WINDOWS)
+   SetLastError(0);  // Clear any errors.
+diff --git a/runtime/platform/utils.h b/runtime/platform/utils.h
+index 18e83926d7c..250b29a0fb4 100644
+--- a/runtime/platform/utils.h
++++ b/runtime/platform/utils.h
+@@ -686,6 +686,8 @@ class Utils {
+ #include "platform/utils_fuchsia.h"
+ #elif defined(DART_HOST_OS_LINUX)
+ #include "platform/utils_linux.h"
++#elif defined(DART_HOST_OS_OHOS)
++#include "platform/utils_ohos.h"
+ #elif defined(DART_HOST_OS_MACOS)
+ #include "platform/utils_macos.h"
+ #elif defined(DART_HOST_OS_WINDOWS)
+diff --git a/runtime/platform/utils_ohos.cc b/runtime/platform/utils_ohos.cc
+new file mode 100644
+index 00000000000..3c768b4e9e7
+--- /dev/null
++++ b/runtime/platform/utils_ohos.cc
+@@ -0,0 +1,54 @@
++// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
++// for details. All rights reserved. Use of this source code is governed by a
++// BSD-style license that can be found in the LICENSE file.
++
++#include "platform/globals.h"
++#if defined(DART_HOST_OS_OHOS)
++
++#include "platform/utils.h"
++#include "platform/utils_ohos.h"
++
++namespace dart {
++
++char* Utils::StrNDup(const char* s, intptr_t n) {
++  return strndup(s, n);
++}
++
++char* Utils::StrDup(const char* s) {
++  return strdup(s);
++}
++
++intptr_t Utils::StrNLen(const char* s, intptr_t n) {
++  return strnlen(s, n);
++}
++
++int Utils::SNPrint(char* str, size_t size, const char* format, ...) {
++  va_list args;
++  va_start(args, format);
++  int retval = VSNPrint(str, size, format, args);
++  va_end(args);
++  return retval;
++}
++
++int Utils::VSNPrint(char* str, size_t size, const char* format, va_list args) {
++  MSAN_UNPOISON(str, size);
++  int retval = vsnprintf(str, size, format, args);
++  if (retval < 0) {
++    FATAL("Fatal error in Utils::VSNPrint with format '%s'", format);
++  }
++  return retval;
++}
++
++int Utils::Close(int fildes) {
++  return close(fildes);
++}
++size_t Utils::Read(int filedes, void* buf, size_t nbyte) {
++  return read(filedes, buf, nbyte);
++}
++int Utils::Unlink(const char* path) {
++  return unlink(path);
++}
++
++}  // namespace dart
++
++#endif  // defined(DART_HOST_OS_OHOS)
+diff --git a/runtime/platform/utils_ohos.h b/runtime/platform/utils_ohos.h
+new file mode 100644
+index 00000000000..abb486ed2d4
+--- /dev/null
++++ b/runtime/platform/utils_ohos.h
+@@ -0,0 +1,56 @@
++// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
++// for details. All rights reserved. Use of this source code is governed by a
++// BSD-style license that can be found in the LICENSE file.
++
++#ifndef RUNTIME_PLATFORM_UTILS_OHOS_H_
++#define RUNTIME_PLATFORM_UTILS_OHOS_H_
++
++#if !defined(RUNTIME_PLATFORM_UTILS_H_)
++#error Do not include utils_ohos.h directly; use utils.h instead.
++#endif
++
++#include <endian.h>  // NOLINT
++
++namespace dart {
++
++inline uint16_t Utils::HostToBigEndian16(uint16_t value) {
++  return htobe16(value);
++}
++
++inline uint32_t Utils::HostToBigEndian32(uint32_t value) {
++  return htobe32(value);
++}
++
++inline uint64_t Utils::HostToBigEndian64(uint64_t value) {
++  return htobe64(value);
++}
++
++inline uint16_t Utils::HostToLittleEndian16(uint16_t value) {
++  return htole16(value);
++}
++
++inline uint32_t Utils::HostToLittleEndian32(uint32_t value) {
++  return htole32(value);
++}
++
++inline uint64_t Utils::HostToLittleEndian64(uint64_t value) {
++  return htole64(value);
++}
++
++inline char* Utils::StrError(int err, char* buffer, size_t bufsize) {
++#if !defined(__GLIBC__) ||                                                     \
++    ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE)
++  // Use the XSI version.
++  if (strerror_r(err, buffer, bufsize) != 0) {
++    snprintf(buffer, bufsize, "%s", "strerror_r failed");
++  }
++  return buffer;
++#else
++  // Use the GNU specific version.
++  return strerror_r(err, buffer, bufsize);
++#endif
++}
++
++}  // namespace dart
++
++#endif  // RUNTIME_PLATFORM_UTILS_OHOS_H_
+diff --git a/runtime/runtime_args.gni b/runtime/runtime_args.gni
+index dc10b71b7d6..6a43ccad027 100644
+--- a/runtime/runtime_args.gni
++++ b/runtime/runtime_args.gni
+@@ -80,7 +80,7 @@ declare_args() {
+   # The analyze_snapshot tool is only supported on 64 bit AOT builds that use
+   # ELF.
+   build_analyze_snapshot =
+-      (target_os == "linux" || target_os == "android" ||
++      (target_os == "linux" || target_os == "android" || target_os == "ohos" ||
+        target_os == "fuchsia") &&
+       (dart_target_arch == "x64" || dart_target_arch == "arm64" ||
+        dart_target_arch == "riscv64")
+diff --git a/runtime/vm/compiler/ffi/abi.cc b/runtime/vm/compiler/ffi/abi.cc
+index 66fa5a8d564..243aca8daf3 100644
+--- a/runtime/vm/compiler/ffi/abi.cc
++++ b/runtime/vm/compiler/ffi/abi.cc
+@@ -31,7 +31,7 @@ static_assert(offsetof(AbiAlignmentUint64, i) == 8,
+               "FFI transformation alignment");
+ #elif (defined(HOST_ARCH_IA32) && /* NOLINT(whitespace/parens) */              \
+        (defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_MACOS) ||          \
+-        defined(DART_HOST_OS_ANDROID))) ||                                     \
++        defined(DART_HOST_OS_ANDROID)) || defined(DART_HOST_OS_OHOS)) ||                                     \
+     (defined(HOST_ARCH_ARM) && defined(DART_HOST_OS_IOS))
+ static_assert(offsetof(AbiAlignmentDouble, d) == 4,
+               "FFI transformation alignment");
+@@ -53,6 +53,8 @@ static_assert(offsetof(AbiAlignmentUint64, i) == 8,
+ #define DART_TARGET_OS_NAME Fuchsia
+ #elif defined(DART_TARGET_OS_LINUX)
+ #define DART_TARGET_OS_NAME Linux
++#elif defined(DART_TARGET_OS_OHOS)
++#define DART_TARGET_OS_NAME Ohos
+ #elif defined(DART_TARGET_OS_MACOS)
+ #if DART_TARGET_OS_MACOS_IOS
+ #define DART_TARGET_OS_NAME IOS
+diff --git a/runtime/vm/compiler/ffi/abi.h b/runtime/vm/compiler/ffi/abi.h
+index ff917bf55d1..e5161488782 100644
+--- a/runtime/vm/compiler/ffi/abi.h
++++ b/runtime/vm/compiler/ffi/abi.h
+@@ -25,6 +25,8 @@ enum class Abi {
+   kAndroidIA32,
+   kAndroidX64,
+   kAndroidRiscv64,
++  kOhosArm,
++  kOhosArm64,
+   kFuchsiaArm64,
+   kFuchsiaX64,
+   kFuchsiaRiscv64,
+@@ -51,9 +53,9 @@ const int64_t num_abis = static_cast<int64_t>(Abi::kWindowsX64) + 1;
+ // - runtime/vm/compiler/frontend/kernel_to_il.cc
+ static_assert(static_cast<int64_t>(Abi::kAndroidArm) == 0,
+               "Enum value unexpected.");
+-static_assert(static_cast<int64_t>(Abi::kWindowsX64) == 21,
++static_assert(static_cast<int64_t>(Abi::kWindowsX64) == 23,
+               "Enum value unexpected.");
+-static_assert(num_abis == 22, "Enum value unexpected.");
++static_assert(num_abis == 24, "Enum value unexpected.");
+ 
+ // The target ABI. Defines sizes and alignment of native types.
+ Abi TargetAbi();
+diff --git a/runtime/vm/compiler/ffi/native_calling_convention.cc b/runtime/vm/compiler/ffi/native_calling_convention.cc
+index 3914afe326d..b6da03881fb 100644
+--- a/runtime/vm/compiler/ffi/native_calling_convention.cc
++++ b/runtime/vm/compiler/ffi/native_calling_convention.cc
+@@ -37,7 +37,7 @@ static bool SoftFpAbi(bool has_varargs, bool is_result) {
+ }
+ #else  // !defined(FFI_UNIT_TESTS)
+ static bool SoftFpAbi(bool has_varargs, bool is_result) {
+-#if defined(TARGET_ARCH_ARM) && defined(DART_TARGET_OS_ANDROID)
++#if defined(TARGET_ARCH_ARM) && (defined(DART_TARGET_OS_ANDROID) || defined(DART_TARGET_OS_OHOS))
+   return true;
+ #elif defined(TARGET_ARCH_ARM)
+   return has_varargs;
+diff --git a/runtime/vm/compiler/ffi/native_calling_convention_test.cc b/runtime/vm/compiler/ffi/native_calling_convention_test.cc
+index 456a6936465..664642d1f5f 100644
+--- a/runtime/vm/compiler/ffi/native_calling_convention_test.cc
++++ b/runtime/vm/compiler/ffi/native_calling_convention_test.cc
+@@ -665,7 +665,7 @@ UNIT_TEST_CASE_WITH_ZONE(NativeCallingConvention_regress46127) {
+       RunSignatureTest(Z, "regress46127", arguments, struct_type);
+ 
+ #if defined(TARGET_ARCH_IA32) &&                                               \
+-    (defined(DART_TARGET_OS_ANDROID) || defined(DART_TARGET_OS_LINUX))
++    (defined(DART_TARGET_OS_ANDROID) || defined(DART_TARGET_OS_LINUX)) || defined(DART_TARGET_OS_OHOS)
+   // We must count the result pointer passed on the stack as well.
+   EXPECT_EQ(4, native_calling_convention.StackTopInBytes());
+ #else
+diff --git a/runtime/vm/cpu_arm.cc b/runtime/vm/cpu_arm.cc
+index d40147b2ea0..454ac3e4ff0 100644
+--- a/runtime/vm/cpu_arm.cc
++++ b/runtime/vm/cpu_arm.cc
+@@ -54,7 +54,7 @@ DEFINE_FLAG(bool,
+             "Use integer division instruction if supported");
+ 
+ #if defined(TARGET_HOST_MISMATCH)
+-#if defined(DART_TARGET_OS_ANDROID) || defined(DART_TARGET_OS_MACOS_IOS)
++#if defined(DART_TARGET_OS_ANDROID) || defined(DART_TARGET_OS_MACOS_IOS)  || defined(DART_TARGET_OS_OHOS)
+ DEFINE_FLAG(bool, sim_use_hardfp, false, "Use the hardfp ABI.");
+ #else
+ DEFINE_FLAG(bool, sim_use_hardfp, true, "Use the hardfp ABI.");
+@@ -80,7 +80,7 @@ void CPU::FlushICache(uword start, uword size) {
+ // https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man3/sys_icache_invalidate.3.html
+ #if defined(DART_HOST_OS_IOS)
+   sys_icache_invalidate(reinterpret_cast<void*>(start), size);
+-#elif defined(DART_HOST_OS_LINUX)
++#elif defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_OHOS)
+   char* beg = reinterpret_cast<char*>(start);
+   char* end = reinterpret_cast<char*>(start + size);
+   __builtin___clear_cache(beg, end);
+diff --git a/runtime/vm/cpu_arm64.cc b/runtime/vm/cpu_arm64.cc
+index b64a2ee9259..b195a8e82e3 100644
+--- a/runtime/vm/cpu_arm64.cc
++++ b/runtime/vm/cpu_arm64.cc
+@@ -40,7 +40,7 @@ void CPU::FlushICache(uword start, uword size) {
+ // https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man3/sys_icache_invalidate.3.html
+ #if defined(DART_HOST_OS_MACOS) || defined(DART_HOST_OS_IOS)
+   sys_icache_invalidate(reinterpret_cast<void*>(start), size);
+-#elif defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_LINUX)
++#elif defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_OHOS)
+   char* beg = reinterpret_cast<char*>(start);
+   char* end = reinterpret_cast<char*>(start + size);
+   __builtin___clear_cache(beg, end);
+diff --git a/runtime/vm/cpu_riscv.cc b/runtime/vm/cpu_riscv.cc
+index e1440a9d2ee..ddabbc4773b 100644
+--- a/runtime/vm/cpu_riscv.cc
++++ b/runtime/vm/cpu_riscv.cc
+@@ -36,7 +36,7 @@ void CPU::FlushICache(uword start, uword size) {
+ 
+ #if defined(DART_HOST_OS_MACOS) || defined(DART_HOST_OS_IOS)
+   sys_icache_invalidate(reinterpret_cast<void*>(start), size);
+-#elif defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_LINUX)
++#elif defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_OHOS)
+   char* beg = reinterpret_cast<char*>(start);
+   char* end = reinterpret_cast<char*>(start + size);
+   __builtin___clear_cache(beg, end);
+diff --git a/runtime/vm/cpuinfo_ohos.cc b/runtime/vm/cpuinfo_ohos.cc
+new file mode 100644
+index 00000000000..e5d90ac5dfb
+--- /dev/null
++++ b/runtime/vm/cpuinfo_ohos.cc
+@@ -0,0 +1,107 @@
++// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
++// for details. All rights reserved. Use of this source code is governed by a
++// BSD-style license that can be found in the LICENSE file.
++
++#include "vm/globals.h"
++#if defined(DART_HOST_OS_OHOS)
++
++#include "vm/cpuid.h"
++#include "vm/cpuinfo.h"
++#include "vm/proccpuinfo.h"
++
++#include "platform/assert.h"
++
++// As with Windows, on IA32 and X64, we use the cpuid instruction.
++// The analogous instruction is privileged on ARM, so we resort to
++// reading from /proc/cpuinfo.
++
++namespace dart {
++
++CpuInfoMethod CpuInfo::method_ = kCpuInfoDefault;
++const char* CpuInfo::fields_[kCpuInfoMax] = {0};
++
++void CpuInfo::Init() {
++#if defined(HOST_ARCH_IA32) || defined(HOST_ARCH_X64)
++  fields_[kCpuInfoProcessor] = "vendor_id";
++  fields_[kCpuInfoModel] = "model name";
++  fields_[kCpuInfoHardware] = "model name";
++  fields_[kCpuInfoFeatures] = "flags";
++  fields_[kCpuInfoArchitecture] = "CPU architecture";
++  method_ = kCpuInfoCpuId;
++  CpuId::Init();
++#elif defined(HOST_ARCH_ARM)
++  fields_[kCpuInfoProcessor] = "Processor";
++  fields_[kCpuInfoModel] = "model name";
++  fields_[kCpuInfoHardware] = "Hardware";
++  fields_[kCpuInfoFeatures] = "Features";
++  fields_[kCpuInfoArchitecture] = "CPU architecture";
++  method_ = kCpuInfoSystem;
++  ProcCpuInfo::Init();
++#elif defined(HOST_ARCH_ARM64)
++  fields_[kCpuInfoProcessor] = "Processor";
++  fields_[kCpuInfoModel] = "CPU implementer";
++  fields_[kCpuInfoHardware] = "CPU implementer";
++  fields_[kCpuInfoFeatures] = "Features";
++  fields_[kCpuInfoArchitecture] = "CPU architecture";
++  method_ = kCpuInfoSystem;
++  ProcCpuInfo::Init();
++#elif defined(HOST_ARCH_RISCV32) || defined(HOST_ARCH_RISCV64)
++  // We only rely on the base Linux configuration of IMAFDC, so don't need
++  // dynamic feature detection.
++  method_ = kCpuInfoNone;
++#else
++#error Unrecognized target architecture
++#endif
++}
++
++void CpuInfo::Cleanup() {
++  if (method_ == kCpuInfoCpuId) {
++    CpuId::Cleanup();
++  } else if (method_ == kCpuInfoSystem) {
++    ProcCpuInfo::Cleanup();
++  } else {
++    ASSERT(method_ == kCpuInfoNone);
++  }
++}
++
++bool CpuInfo::FieldContains(CpuInfoIndices idx, const char* search_string) {
++  if (method_ == kCpuInfoCpuId) {
++    const char* field = CpuId::field(idx);
++    bool contains = (strstr(field, search_string) != NULL);
++    free(const_cast<char*>(field));
++    return contains;
++  } else if (method_ == kCpuInfoSystem) {
++    return ProcCpuInfo::FieldContains(FieldName(idx), search_string);
++  } else {
++    UNREACHABLE();
++  }
++}
++
++const char* CpuInfo::ExtractField(CpuInfoIndices idx) {
++  if (method_ == kCpuInfoCpuId) {
++    return CpuId::field(idx);
++  } else if (method_ == kCpuInfoSystem) {
++    return ProcCpuInfo::ExtractField(FieldName(idx));
++  } else {
++    UNREACHABLE();
++  }
++}
++
++bool CpuInfo::HasField(const char* field) {
++  if (method_ == kCpuInfoCpuId) {
++    return (strcmp(field, fields_[kCpuInfoProcessor]) == 0) ||
++           (strcmp(field, fields_[kCpuInfoModel]) == 0) ||
++           (strcmp(field, fields_[kCpuInfoHardware]) == 0) ||
++           (strcmp(field, fields_[kCpuInfoFeatures]) == 0);
++  } else if (method_ == kCpuInfoSystem) {
++    return ProcCpuInfo::HasField(field);
++  } else if (method_ == kCpuInfoNone) {
++    return false;
++  } else {
++    UNREACHABLE();
++  }
++}
++
++}  // namespace dart
++
++#endif  // defined(DART_HOST_OS_OHOS)
+diff --git a/runtime/vm/dart.cc b/runtime/vm/dart.cc
+index 7fc13a1de68..bb2d7eb8250 100644
+--- a/runtime/vm/dart.cc
++++ b/runtime/vm/dart.cc
+@@ -1071,6 +1071,8 @@ char* Dart::FeaturesString(IsolateGroup* isolate_group,
+ #endif
+ #elif defined(DART_TARGET_OS_LINUX)
+     buffer.AddString(" linux");
++#elif defined(DART_TARGET_OS_OHOS)
++    buffer.AddString(" ohos");
+ #elif defined(DART_TARGET_OS_WINDOWS)
+     buffer.AddString(" windows");
+ #else
+diff --git a/runtime/vm/globals.h b/runtime/vm/globals.h
+index 7cf67f4e416..69c54277b03 100644
+--- a/runtime/vm/globals.h
++++ b/runtime/vm/globals.h
+@@ -116,7 +116,7 @@ const intptr_t kDefaultNewGenSemiMaxSize = (kWordSize <= 4) ? 8 : 16;
+ #if !defined(DART_DISABLE_TIMELINE) &&                                         \
+     (defined(DART_ENABLE_TIMELINE) || !defined(PRODUCT) ||                     \
+      defined(DART_HOST_OS_FUCHSIA) || defined(DART_TARGET_OS_FUCHSIA) ||       \
+-     defined(DART_TARGET_OS_ANDROID) || defined(DART_TARGET_OS_MACOS))
++     defined(DART_TARGET_OS_ANDROID) || defined(DART_TARGET_OS_MACOS) || defined(DART_TARGET_OS_OHOS))
+ #define SUPPORT_TIMELINE 1
+ #endif
+ 
+diff --git a/runtime/vm/image_snapshot.cc b/runtime/vm/image_snapshot.cc
+index b738e456eee..9e2081f4c19 100644
+--- a/runtime/vm/image_snapshot.cc
++++ b/runtime/vm/image_snapshot.cc
+@@ -1060,7 +1060,7 @@ class DwarfAssemblyStream : public DwarfWriteStream {
+ #if defined(DART_TARGET_OS_MACOS) || defined(DART_TARGET_OS_MACOS_IOS)
+     stream_->WriteString(".section __DWARF,__debug_abbrev,regular,debug\n");
+ #elif defined(DART_TARGET_OS_LINUX) || defined(DART_TARGET_OS_ANDROID) ||      \
+-    defined(DART_TARGET_OS_FUCHSIA)
++    defined(DART_TARGET_OS_FUCHSIA) || defined(DART_TARGET_OS_OHOS)
+     stream_->WriteString(".section .debug_abbrev,\"\"\n");
+ #else
+     UNIMPLEMENTED();
+@@ -1070,7 +1070,7 @@ class DwarfAssemblyStream : public DwarfWriteStream {
+ #if defined(DART_TARGET_OS_MACOS) || defined(DART_TARGET_OS_MACOS_IOS)
+     stream_->WriteString(".section __DWARF,__debug_info,regular,debug\n");
+ #elif defined(DART_TARGET_OS_LINUX) || defined(DART_TARGET_OS_ANDROID) ||      \
+-    defined(DART_TARGET_OS_FUCHSIA)
++    defined(DART_TARGET_OS_FUCHSIA) || defined(DART_TARGET_OS_OHOS)
+     stream_->WriteString(".section .debug_info,\"\"\n");
+ #else
+     UNIMPLEMENTED();
+@@ -1082,7 +1082,7 @@ class DwarfAssemblyStream : public DwarfWriteStream {
+ #if defined(DART_TARGET_OS_MACOS) || defined(DART_TARGET_OS_MACOS_IOS)
+     stream_->WriteString(".section __DWARF,__debug_line,regular,debug\n");
+ #elif defined(DART_TARGET_OS_LINUX) || defined(DART_TARGET_OS_ANDROID) ||      \
+-    defined(DART_TARGET_OS_FUCHSIA)
++    defined(DART_TARGET_OS_FUCHSIA) || defined(DART_TARGET_OS_OHOS)
+     stream_->WriteString(".section .debug_line,\"\"\n");
+ #else
+     UNIMPLEMENTED();
+@@ -1170,7 +1170,7 @@ void AssemblyImageWriter::Finalize() {
+   }
+ 
+ #if defined(DART_TARGET_OS_LINUX) || defined(DART_TARGET_OS_ANDROID) ||        \
+-    defined(DART_TARGET_OS_FUCHSIA)
++    defined(DART_TARGET_OS_FUCHSIA)  || defined(DART_TARGET_OS_OHOS)
+   // Non-executable stack.
+ #if defined(TARGET_ARCH_ARM)
+   assembly_stream_->WriteString(".section .note.GNU-stack,\"\",%progbits\n");
+@@ -1403,7 +1403,7 @@ void AssemblyImageWriter::WriteROData(NonStreamingWriteStream* clustered_stream,
+     WriteBytes(bytes + last_position, symbol.offset - last_position);
+     assembly_stream_->Printf("\"%s\":\n", symbol.name);
+ #if defined(DART_TARGET_OS_LINUX) || defined(DART_TARGET_OS_ANDROID) ||        \
+-    defined(DART_TARGET_OS_FUCHSIA)
++    defined(DART_TARGET_OS_FUCHSIA)  || defined(DART_TARGET_OS_OHOS)
+     // Output size and type of the read-only data symbol to the assembly stream.
+     assembly_stream_->Printf(".size \"%s\", %zu\n", symbol.name, symbol.size);
+     assembly_stream_->Printf(".type \"%s\", %%object\n", symbol.name);
+@@ -1445,7 +1445,7 @@ bool AssemblyImageWriter::EnterSection(ProgramSection section,
+       current_symbols_ =
+           new (zone_) ZoneGrowableArray<Elf::SymbolData>(zone_, 0);
+ #if defined(DART_TARGET_OS_LINUX) || defined(DART_TARGET_OS_ANDROID) ||        \
+-    defined(DART_TARGET_OS_FUCHSIA)
++    defined(DART_TARGET_OS_FUCHSIA)  || defined(DART_TARGET_OS_OHOS)
+       assembly_stream_->WriteString(".section .rodata\n");
+ #elif defined(DART_TARGET_OS_MACOS) || defined(DART_TARGET_OS_MACOS_IOS)
+       assembly_stream_->WriteString(".const\n");
+@@ -1502,7 +1502,7 @@ void AssemblyImageWriter::ExitSection(ProgramSection name,
+   // We should still be in the same section as the last EnterSection.
+   ASSERT_EQUAL(current_section_label_, SectionLabel(name, vm));
+ #if defined(DART_TARGET_OS_LINUX) || defined(DART_TARGET_OS_ANDROID) ||        \
+-    defined(DART_TARGET_OS_FUCHSIA)
++    defined(DART_TARGET_OS_FUCHSIA)  || defined(DART_TARGET_OS_OHOS)
+   // Output the size of the section symbol to the assembly stream.
+   assembly_stream_->Printf(".size %s, %zu\n", SectionSymbol(name, vm), size);
+   assembly_stream_->Printf(".type %s, %%object\n", SectionSymbol(name, vm));
+@@ -1597,7 +1597,7 @@ void AssemblyImageWriter::AddCodeSymbol(const Code& code,
+   }
+   assembly_stream_->Printf("\"%s\":\n", symbol);
+ #if defined(DART_TARGET_OS_LINUX) || defined(DART_TARGET_OS_ANDROID) ||        \
+-    defined(DART_TARGET_OS_FUCHSIA)
++    defined(DART_TARGET_OS_FUCHSIA) || defined(DART_TARGET_OS_OHOS)
+   // Output the size of the code symbol to the assembly stream.
+   assembly_stream_->Printf(".size \"%s\", %zu\n", symbol, code.Size());
+   assembly_stream_->Printf(".type \"%s\", %%function\n", symbol);
+diff --git a/runtime/vm/native_symbol_posix.cc b/runtime/vm/native_symbol_posix.cc
+index 458ecbc2929..32edcf8e708 100644
+--- a/runtime/vm/native_symbol_posix.cc
++++ b/runtime/vm/native_symbol_posix.cc
+@@ -4,7 +4,7 @@
+ 
+ #include "vm/globals.h"
+ #if defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_FUCHSIA) ||          \
+-    defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_MACOS)
++    defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_MACOS) || defined(DART_HOST_OS_OHOS)
+ 
+ #include "platform/memory_sanitizer.h"
+ #include "vm/native_symbol.h"
+diff --git a/runtime/vm/os_ohos.cc b/runtime/vm/os_ohos.cc
+new file mode 100644
+index 00000000000..e28cf5f1b9b
+--- /dev/null
++++ b/runtime/vm/os_ohos.cc
+@@ -0,0 +1,706 @@
++// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
++// for details. All rights reserved. Use of this source code is governed by a
++// BSD-style license that can be found in the LICENSE file.
++
++#include "vm/globals.h"
++#if defined(DART_HOST_OS_OHOS)
++
++#include "vm/os.h"
++
++#include <dlfcn.h>         // NOLINT
++#include <elf.h>           // NOLINT
++#include <errno.h>         // NOLINT
++#include <fcntl.h>         // NOLINT
++#include <limits.h>        // NOLINT
++#include <malloc.h>        // NOLINT
++#include <sys/mman.h>      // NOLINT
++#include <sys/resource.h>  // NOLINT
++#include <sys/stat.h>      // NOLINT
++#include <sys/syscall.h>   // NOLINT
++#include <sys/time.h>      // NOLINT
++#include <sys/types.h>     // NOLINT
++#include <time.h>          // NOLINT
++#include <unistd.h>        // NOLINT
++
++#include "platform/memory_sanitizer.h"
++#include "platform/utils.h"
++#include "vm/code_comments.h"
++#include "vm/code_observers.h"
++#include "vm/dart.h"
++#include "vm/flags.h"
++#include "vm/image_snapshot.h"
++#include "vm/isolate.h"
++#include "vm/lockers.h"
++#include "vm/os_thread.h"
++#include "vm/timeline.h"
++#include "vm/zone.h"
++
++#include <hilog/log.h>    // NOLINT
++namespace dart {
++
++// Used to choose between Elf32/Elf64 types based on host archotecture bitsize.
++#if defined(ARCH_IS_64_BIT)
++#define ElfW(Type) Elf64_##Type
++#else
++#define ElfW(Type) Elf32_##Type
++#endif
++
++// Missing from older versions of <elf.h>.
++#if !defined(EM_RISCV)
++#define EM_RISCV 243
++#endif
++
++#ifndef PRODUCT
++
++DEFINE_FLAG(bool,
++            generate_perf_events_symbols,
++            false,
++            "Generate events symbols for profiling with perf (disables dual "
++            "code mapping)");
++
++DEFINE_FLAG(bool,
++            generate_perf_jitdump,
++            false,
++            "Generate jitdump file to use with perf-inject (disables dual code "
++            "mapping)");
++
++DECLARE_FLAG(bool, write_protect_code);
++DECLARE_FLAG(bool, write_protect_vm_isolate);
++#if !defined(DART_PRECOMPILED_RUNTIME)
++DECLARE_FLAG(bool, code_comments);
++#endif
++
++// Linux CodeObservers.
++
++// Simple perf support: generate /tmp/perf-<pid>.map file that maps
++// memory ranges to symbol names for JIT generated code. This allows
++// perf-report to resolve addresses falling into JIT generated code.
++// However perf-annotate does not work in this mode because JIT code
++// is transient and does not exist anymore at the moment when you
++// invoke perf-report.
++class PerfCodeObserver : public CodeObserver {
++ public:
++  PerfCodeObserver() : out_file_(NULL) {
++    Dart_FileOpenCallback file_open = Dart::file_open_callback();
++    if (file_open == NULL) {
++      return;
++    }
++    intptr_t pid = getpid();
++    char* filename = OS::SCreate(NULL, "/tmp/perf-%" Pd ".map", pid);
++    out_file_ = (*file_open)(filename, true);
++    free(filename);
++  }
++
++  ~PerfCodeObserver() {
++    Dart_FileCloseCallback file_close = Dart::file_close_callback();
++    if ((file_close == NULL) || (out_file_ == NULL)) {
++      return;
++    }
++    (*file_close)(out_file_);
++  }
++
++  virtual bool IsActive() const {
++    return FLAG_generate_perf_events_symbols && (out_file_ != NULL);
++  }
++
++  virtual void Notify(const char* name,
++                      uword base,
++                      uword prologue_offset,
++                      uword size,
++                      bool optimized,
++                      const CodeComments* comments) {
++    Dart_FileWriteCallback file_write = Dart::file_write_callback();
++    if ((file_write == NULL) || (out_file_ == NULL)) {
++      return;
++    }
++    const char* marker = optimized ? "*" : "";
++    char* buffer =
++        OS::SCreate(Thread::Current()->zone(), "%" Px " %" Px " %s%s\n", base,
++                    size, marker, name);
++    {
++      MutexLocker ml(CodeObservers::mutex());
++      (*file_write)(buffer, strlen(buffer), out_file_);
++    }
++  }
++
++ private:
++  void* out_file_;
++
++  DISALLOW_COPY_AND_ASSIGN(PerfCodeObserver);
++};
++
++// Code observer that generates a JITDUMP[1] file that can be interpreted by
++// perf-inject to generate ELF images for JIT generated code objects, which
++// allows both perf-report and perf-annotate to recognize them.
++//
++// Usage:
++//
++//   $ perf record -k mono dart --generate-perf-jitdump benchmark.dart
++//   $ perf inject -j -i perf.data -o perf.data.jitted
++//   $ perf report -i perf.data.jitted
++//
++// [1] see linux/tools/perf/Documentation/jitdump-specification.txt for
++//     JITDUMP binary format.
++class JitDumpCodeObserver : public CodeObserver {
++ public:
++  JitDumpCodeObserver() : pid_(getpid()) {
++    char* const filename = OS::SCreate(nullptr, "/tmp/jit-%" Pd ".dump", pid_);
++    const int fd = open(filename, O_CREAT | O_TRUNC | O_RDWR, 0666);
++    free(filename);
++
++    if (fd == -1) {
++      return;
++    }
++
++    // Map JITDUMP file, this mapping will be recorded by perf. This allows
++    // perf-inject to find this file later.
++    const long page_size = sysconf(_SC_PAGESIZE);  // NOLINT(runtime/int)
++    if (page_size == -1) {
++      close(fd);
++      return;
++    }
++
++    mapped_ =
++        mmap(nullptr, page_size, PROT_READ | PROT_EXEC, MAP_PRIVATE, fd, 0);
++    if (mapped_ == nullptr) {
++      close(fd);
++      return;
++    }
++    mapped_size_ = page_size;
++
++    out_file_ = fdopen(fd, "w+");
++    if (out_file_ == nullptr) {
++      close(fd);
++      return;
++    }
++
++    // Buffer the output to avoid high IO overheads - we are going to be
++    // writing all JIT generated code out.
++    setvbuf(out_file_, nullptr, _IOFBF, 2 * MB);
++
++    // Disable code write protection and vm isolate write protection, because
++    // calling mprotect on the pages filled with JIT generated code objects
++    // confuses perf.
++    FLAG_write_protect_code = false;
++    FLAG_write_protect_vm_isolate = false;
++
++#if !defined(DART_PRECOMPILED_RUNTIME)
++    // Enable code comments.
++    FLAG_code_comments = true;
++#endif
++
++    // Write JITDUMP header.
++    WriteHeader();
++  }
++
++  ~JitDumpCodeObserver() {
++    if (mapped_ != nullptr) {
++      munmap(mapped_, mapped_size_);
++      mapped_ = nullptr;
++    }
++
++    if (out_file_ != nullptr) {
++      fclose(out_file_);
++      out_file_ = nullptr;
++    }
++  }
++
++  virtual bool IsActive() const {
++    return FLAG_generate_perf_jitdump && (out_file_ != nullptr);
++  }
++
++  virtual void Notify(const char* name,
++                      uword base,
++                      uword prologue_offset,
++                      uword size,
++                      bool optimized,
++                      const CodeComments* comments) {
++    MutexLocker ml(CodeObservers::mutex());
++
++    const char* marker = optimized ? "*" : "";
++    char* buffer = OS::SCreate(Thread::Current()->zone(), "%s%s", marker, name);
++    const size_t name_length = strlen(buffer);
++
++    WriteDebugInfo(base, comments);
++
++    CodeLoadEvent ev;
++    ev.event = BaseEvent::kLoad;
++    ev.size = sizeof(ev) + (name_length + 1) + size;
++    ev.time_stamp = OS::GetCurrentMonotonicTicks();
++    ev.process_id = getpid();
++    ev.thread_id = syscall(SYS_gettid);
++    ev.vma = base;
++    ev.code_address = base;
++    ev.code_size = size;
++    ev.code_id = code_id_++;
++
++    WriteFully(&ev, sizeof(ev));
++    WriteFully(buffer, name_length + 1);
++    WriteFully(reinterpret_cast<void*>(base), size);
++  }
++
++ private:
++  struct Header {
++    const uint32_t magic = 0x4A695444;
++    const uint32_t version = 1;
++    const uint32_t size = sizeof(Header);
++    uint32_t elf_mach_target;
++    const uint32_t reserved = 0xDEADBEEF;
++    uint32_t process_id;
++    uint64_t time_stamp;
++    const uint64_t flags = 0;
++  };
++
++  struct BaseEvent {
++    enum Event {
++      kLoad = 0,
++      kMove = 1,
++      kDebugInfo = 2,
++      kClose = 3,
++      kUnwindingInfo = 4
++    };
++
++    uint32_t event;
++    uint32_t size;
++    uint64_t time_stamp;
++  };
++
++  struct CodeLoadEvent : BaseEvent {
++    uint32_t process_id;
++    uint32_t thread_id;
++    uint64_t vma;
++    uint64_t code_address;
++    uint64_t code_size;
++    uint64_t code_id;
++  };
++
++  struct DebugInfoEvent : BaseEvent {
++    uint64_t address;
++    uint64_t entry_count;
++    // DebugInfoEntry entries[entry_count_];
++  };
++
++  struct DebugInfoEntry {
++    uint64_t address;
++    int32_t line_number;
++    int32_t column;
++    // Followed by nul-terminated name.
++  };
++
++  static uint32_t GetElfMachineArchitecture() {
++#if TARGET_ARCH_IA32
++    return EM_386;
++#elif TARGET_ARCH_X64
++    return EM_X86_64;
++#elif TARGET_ARCH_ARM
++    return EM_ARM;
++#elif TARGET_ARCH_ARM64
++    return EM_AARCH64;
++#elif TARGET_ARCH_RISCV32 || TARGET_ARCH_RISCV64
++    return EM_RISCV;
++#else
++    UNREACHABLE();
++    return 0;
++#endif
++  }
++
++#if ARCH_IS_64_BIT
++  static const int kElfHeaderSize = 0x40;
++#else
++  static const int kElfHeaderSize = 0x34;
++#endif
++
++  void WriteDebugInfo(uword base, const CodeComments* comments) {
++    if (comments == nullptr || comments->Length() == 0) {
++      return;
++    }
++
++    // Open the comments file for the given code object.
++    // Note: for some reason we can't emit all comments into a single file
++    // the mapping between PCs and lines goes out of sync (might be
++    // perf-annotate bug).
++    char* comments_file_name =
++        OS::SCreate(nullptr, "/tmp/jit-%" Pd "-%" Pd ".cmts", pid_, code_id_);
++    const intptr_t filename_length = strlen(comments_file_name);
++    FILE* comments_file = fopen(comments_file_name, "w");
++    setvbuf(comments_file, nullptr, _IOFBF, 2 * MB);
++
++    // Count the number of DebugInfoEntry we are going to emit: one
++    // per PC.
++    intptr_t entry_count = 0;
++    for (uint64_t i = 0, len = comments->Length(); i < len;) {
++      const intptr_t pc_offset = comments->PCOffsetAt(i);
++      while (i < len && comments->PCOffsetAt(i) == pc_offset) {
++        i++;
++      }
++      entry_count++;
++    }
++
++    DebugInfoEvent info;
++    info.event = BaseEvent::kDebugInfo;
++    info.time_stamp = OS::GetCurrentMonotonicTicks();
++    info.address = base;
++    info.entry_count = entry_count;
++    info.size = sizeof(info) +
++                entry_count * (sizeof(DebugInfoEntry) + filename_length + 1);
++    const int32_t padding = Utils::RoundUp(info.size, 8) - info.size;
++    info.size += padding;
++
++    // Write out DebugInfoEvent record followed by entry_count DebugInfoEntry
++    // records.
++    WriteFully(&info, sizeof(info));
++    intptr_t line_number = 0;  // Line number within comments_file.
++    for (intptr_t i = 0, len = comments->Length(); i < len;) {
++      const intptr_t pc_offset = comments->PCOffsetAt(i);
++      while (i < len && comments->PCOffsetAt(i) == pc_offset) {
++        line_number += WriteLn(comments_file, comments->CommentAt(i));
++        i++;
++      }
++      DebugInfoEntry entry;
++      entry.address = base + pc_offset + kElfHeaderSize;
++      entry.line_number = line_number;
++      entry.column = 0;
++      WriteFully(&entry, sizeof(entry));
++      WriteFully(comments_file_name, filename_length + 1);
++    }
++
++    // Write out the padding.
++    const char padding_bytes[8] = {0};
++    WriteFully(padding_bytes, padding);
++
++    fclose(comments_file);
++    free(comments_file_name);
++  }
++
++  void WriteHeader() {
++    Header header;
++    header.elf_mach_target = GetElfMachineArchitecture();
++    header.process_id = getpid();
++    header.time_stamp = OS::GetCurrentTimeMicros();
++    WriteFully(&header, sizeof(header));
++  }
++
++  // Returns number of new-lines written.
++  intptr_t WriteLn(FILE* f, const char* comment) {
++    fputs(comment, f);
++    fputc('\n', f);
++
++    intptr_t line_count = 1;
++    while ((comment = strstr(comment, "\n")) != nullptr) {
++      line_count++;
++    }
++    return line_count;
++  }
++
++  void WriteFully(const void* buffer, size_t size) {
++    const char* ptr = static_cast<const char*>(buffer);
++    while (size > 0) {
++      const size_t written = fwrite(ptr, 1, size, out_file_);
++      if (written == 0) {
++        UNREACHABLE();
++        break;
++      }
++      size -= written;
++      ptr += written;
++    }
++  }
++
++  const intptr_t pid_;
++
++  FILE* out_file_ = nullptr;
++  void* mapped_ = nullptr;
++  long mapped_size_ = 0;  // NOLINT(runtime/int)
++
++  intptr_t code_id_ = 0;
++
++  DISALLOW_COPY_AND_ASSIGN(JitDumpCodeObserver);
++};
++
++#endif  // !PRODUCT
++
++intptr_t OS::ProcessId() {
++  return static_cast<intptr_t>(getpid());
++}
++
++static bool LocalTime(int64_t seconds_since_epoch, tm* tm_result) {
++  time_t seconds = static_cast<time_t>(seconds_since_epoch);
++  if (seconds != seconds_since_epoch) return false;
++  struct tm* error_code = localtime_r(&seconds, tm_result);
++  return error_code != NULL;
++}
++
++const char* OS::GetTimeZoneName(int64_t seconds_since_epoch) {
++  tm decomposed;
++  bool succeeded = LocalTime(seconds_since_epoch, &decomposed);
++  // If unsuccessful, return an empty string like V8 does.
++  return (succeeded && (decomposed.tm_zone != NULL)) ? decomposed.tm_zone : "";
++}
++
++int OS::GetTimeZoneOffsetInSeconds(int64_t seconds_since_epoch) {
++  tm decomposed;
++  bool succeeded = LocalTime(seconds_since_epoch, &decomposed);
++  // Even if the offset was 24 hours it would still easily fit into 32 bits.
++  // If unsuccessful, return zero like V8 does.
++  return succeeded ? static_cast<int>(decomposed.tm_gmtoff) : 0;
++}
++
++int64_t OS::GetCurrentTimeMillis() {
++  return GetCurrentTimeMicros() / 1000;
++}
++
++int64_t OS::GetCurrentTimeMicros() {
++  // gettimeofday has microsecond resolution.
++  struct timeval tv;
++  if (gettimeofday(&tv, NULL) < 0) {
++    UNREACHABLE();
++    return 0;
++  }
++  return (static_cast<int64_t>(tv.tv_sec) * 1000000) + tv.tv_usec;
++}
++
++int64_t OS::GetCurrentMonotonicTicks() {
++  struct timespec ts;
++  if (clock_gettime(CLOCK_MONOTONIC, &ts) != 0) {
++    UNREACHABLE();
++    return 0;
++  }
++  // Convert to nanoseconds.
++  int64_t result = ts.tv_sec;
++  result *= kNanosecondsPerSecond;
++  result += ts.tv_nsec;
++  return result;
++}
++
++int64_t OS::GetCurrentMonotonicFrequency() {
++  return kNanosecondsPerSecond;
++}
++
++int64_t OS::GetCurrentMonotonicMicros() {
++  int64_t ticks = GetCurrentMonotonicTicks();
++  ASSERT(GetCurrentMonotonicFrequency() == kNanosecondsPerSecond);
++  return ticks / kNanosecondsPerMicrosecond;
++}
++
++int64_t OS::GetCurrentThreadCPUMicros() {
++  struct timespec ts;
++  if (clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts) != 0) {
++    UNREACHABLE();
++    return -1;
++  }
++  int64_t result = ts.tv_sec;
++  result *= kMicrosecondsPerSecond;
++  result += (ts.tv_nsec / kNanosecondsPerMicrosecond);
++  return result;
++}
++
++int64_t OS::GetCurrentMonotonicMicrosForTimeline() {
++#if defined(SUPPORT_TIMELINE)
++  if (Timeline::recorder_discards_clock_values()) return -1;
++  return GetCurrentMonotonicMicros();
++#else
++  return -1;
++#endif
++}
++
++// TODO(5411554):  May need to hoist these architecture dependent code
++// into a architecture specific file e.g: os_ia32_linux.cc
++intptr_t OS::ActivationFrameAlignment() {
++#if defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64) ||                   \
++    defined(TARGET_ARCH_ARM64) || defined(TARGET_ARCH_RISCV32) ||              \
++    defined(TARGET_ARCH_RISCV64)
++  const int kMinimumAlignment = 16;
++#elif defined(TARGET_ARCH_ARM)
++  const int kMinimumAlignment = 8;
++#else
++#error Unsupported architecture.
++#endif
++  intptr_t alignment = kMinimumAlignment;
++  // TODO(5411554): Allow overriding default stack alignment for
++  // testing purposes.
++  // Flags::DebugIsInt("stackalign", &alignment);
++  ASSERT(Utils::IsPowerOfTwo(alignment));
++  ASSERT(alignment >= kMinimumAlignment);
++  return alignment;
++}
++
++int OS::NumberOfAvailableProcessors() {
++  return sysconf(_SC_NPROCESSORS_ONLN);
++}
++
++void OS::Sleep(int64_t millis) {
++  int64_t micros = millis * kMicrosecondsPerMillisecond;
++  SleepMicros(micros);
++}
++
++void OS::SleepMicros(int64_t micros) {
++  struct timespec req;  // requested.
++  struct timespec rem;  // remainder.
++  int64_t seconds = micros / kMicrosecondsPerSecond;
++  micros = micros - seconds * kMicrosecondsPerSecond;
++  int64_t nanos = micros * kNanosecondsPerMicrosecond;
++  req.tv_sec = seconds;
++  req.tv_nsec = nanos;
++  while (true) {
++    int r = nanosleep(&req, &rem);
++    if (r == 0) {
++      break;
++    }
++    // We should only ever see an interrupt error.
++    ASSERT(errno == EINTR);
++    // Copy remainder into requested and repeat.
++    req = rem;
++  }
++}
++
++// TODO(regis): Function called only from the simulator.
++void OS::DebugBreak() {
++  __builtin_trap();
++}
++
++DART_NOINLINE uintptr_t OS::GetProgramCounter() {
++  return reinterpret_cast<uintptr_t>(
++      __builtin_extract_return_addr(__builtin_return_address(0)));
++}
++
++void OS::Print(const char* format, ...) {
++  va_list args;
++  va_start(args, format);
++  ((void)OH_LOG_Print(LOG_APP, LOG_INFO, 0x0000, "DartVM", format, args));
++  va_end(args);
++}
++
++void OS::VFPrint(FILE* stream, const char* format, va_list args) {
++  vfprintf(stream, format, args);
++  fflush(stream);
++}
++
++char* OS::SCreate(Zone* zone, const char* format, ...) {
++  va_list args;
++  va_start(args, format);
++  char* buffer = VSCreate(zone, format, args);
++  va_end(args);
++  return buffer;
++}
++
++char* OS::VSCreate(Zone* zone, const char* format, va_list args) {
++  // Measure.
++  va_list measure_args;
++  va_copy(measure_args, args);
++  intptr_t len = Utils::VSNPrint(NULL, 0, format, measure_args);
++  va_end(measure_args);
++
++  char* buffer;
++  if (zone != nullptr) {
++    buffer = zone->Alloc<char>(len + 1);
++  } else {
++    buffer = reinterpret_cast<char*>(malloc(len + 1));
++  }
++  ASSERT(buffer != NULL);
++
++  // Print.
++  va_list print_args;
++  va_copy(print_args, args);
++  Utils::VSNPrint(buffer, len + 1, format, print_args);
++  va_end(print_args);
++  return buffer;
++}
++
++bool OS::StringToInt64(const char* str, int64_t* value) {
++  ASSERT(str != NULL && strlen(str) > 0 && value != NULL);
++  int32_t base = 10;
++  char* endptr;
++  int i = 0;
++  if (str[0] == '-') {
++    i = 1;
++  } else if (str[0] == '+') {
++    i = 1;
++  }
++  if ((str[i] == '0') && (str[i + 1] == 'x' || str[i + 1] == 'X') &&
++      (str[i + 2] != '\0')) {
++    base = 16;
++  }
++  errno = 0;
++  if (base == 16) {
++    // Unsigned 64-bit hexadecimal integer literals are allowed but
++    // immediately interpreted as signed 64-bit integers.
++    *value = static_cast<int64_t>(strtoull(str, &endptr, base));
++  } else {
++    *value = strtoll(str, &endptr, base);
++  }
++  return ((errno == 0) && (endptr != str) && (*endptr == 0));
++}
++
++void OS::RegisterCodeObservers() {
++#ifndef PRODUCT
++  if (FLAG_generate_perf_events_symbols) {
++    CodeObservers::Register(new PerfCodeObserver);
++  }
++
++  if (FLAG_generate_perf_jitdump) {
++    CodeObservers::Register(new JitDumpCodeObserver);
++  }
++#endif  // !PRODUCT
++}
++
++void OS::PrintErr(const char* format, ...) {
++  va_list args;
++  va_start(args, format);
++  ((void)OH_LOG_Print(LOG_APP, LOG_ERROR, 0x0000, "DartVM", format, args));
++  va_end(args);
++}
++
++void OS::Init() {}
++
++void OS::Cleanup() {}
++
++void OS::PrepareToAbort() {}
++
++void OS::Abort() {
++  PrepareToAbort();
++  abort();
++}
++
++void OS::Exit(int code) {
++  exit(code);
++}
++
++OS::BuildId OS::GetAppBuildId(const uint8_t* snapshot_instructions) {
++  // First return the build ID information from the instructions image if
++  // available.
++  const Image instructions_image(snapshot_instructions);
++  if (auto* const image_build_id = instructions_image.build_id()) {
++    return {instructions_image.build_id_length(), image_build_id};
++  }
++  Dl_info snapshot_info;
++  if (dladdr(snapshot_instructions, &snapshot_info) == 0) {
++    return {0, nullptr};
++  }
++  const uint8_t* dso_base =
++      static_cast<const uint8_t*>(snapshot_info.dli_fbase);
++  const ElfW(Ehdr)& elf_header = *reinterpret_cast<const ElfW(Ehdr)*>(dso_base);
++  const ElfW(Phdr)* const phdr_array =
++      reinterpret_cast<const ElfW(Phdr)*>(dso_base + elf_header.e_phoff);
++  for (intptr_t i = 0; i < elf_header.e_phnum; i++) {
++    const ElfW(Phdr)& header = phdr_array[i];
++    if (header.p_type != PT_NOTE) continue;
++    if ((header.p_flags & PF_R) != PF_R) continue;
++    const uint8_t* const note_addr = dso_base + header.p_vaddr;
++    const Elf32_Nhdr& note_header =
++        *reinterpret_cast<const Elf32_Nhdr*>(note_addr);
++    if (note_header.n_type != NT_GNU_BUILD_ID) continue;
++    const char* const note_contents =
++        reinterpret_cast<const char*>(note_addr + sizeof(Elf32_Nhdr));
++    // The note name contains the null terminator as well.
++    if (note_header.n_namesz != strlen(ELF_NOTE_GNU) + 1) continue;
++    if (strncmp(ELF_NOTE_GNU, note_contents, note_header.n_namesz) == 0) {
++      return {static_cast<intptr_t>(note_header.n_descsz),
++              reinterpret_cast<const uint8_t*>(note_contents +
++                                               note_header.n_namesz)};
++    }
++  }
++  return {0, nullptr};
++}
++
++}  // namespace dart
++
++#endif  // defined(DART_HOST_OS_OHOS)
+diff --git a/runtime/vm/os_thread.h b/runtime/vm/os_thread.h
+index 0c768f6b23d..adb0aa62400 100644
+--- a/runtime/vm/os_thread.h
++++ b/runtime/vm/os_thread.h
+@@ -21,6 +21,8 @@
+ #include "vm/os_thread_fuchsia.h"
+ #elif defined(DART_HOST_OS_LINUX)
+ #include "vm/os_thread_linux.h"
++#elif defined(DART_HOST_OS_OHOS)
++#include "vm/os_thread_ohos.h"
+ #elif defined(DART_HOST_OS_MACOS)
+ #include "vm/os_thread_macos.h"
+ #elif defined(DART_HOST_OS_WINDOWS)
+diff --git a/runtime/vm/os_thread_absl.cc b/runtime/vm/os_thread_absl.cc
+index 8c4e7e2aecd..73cc2395238 100644
+--- a/runtime/vm/os_thread_absl.cc
++++ b/runtime/vm/os_thread_absl.cc
+@@ -110,7 +110,7 @@ static void UnblockSIGPROF() {
+ // is used to ensure that the thread is properly destroyed if the thread just
+ // exits.
+ static void* ThreadStart(void* data_ptr) {
+-#if defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_LINUX)
++#if defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_OHOS)
+   if (FLAG_worker_thread_priority != kMinInt) {
+     if (setpriority(PRIO_PROCESS, syscall(__NR_gettid),
+                     FLAG_worker_thread_priority) == -1) {
+@@ -145,7 +145,7 @@ static void* ThreadStart(void* data_ptr) {
+   // pthread_setname_np ignores names that are too long rather than truncating.
+   char truncated_name[16];
+   snprintf(truncated_name, ARRAY_SIZE(truncated_name), "%s", name);
+-#if defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_LINUX)
++#if defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_OHOS)
+   pthread_setname_np(pthread_self(), truncated_name);
+ #elif defined(DART_HOST_OS_MACOS)
+   // Set the thread name.
+@@ -224,7 +224,7 @@ ThreadId OSThread::GetCurrentThreadId() {
+ ThreadId OSThread::GetCurrentThreadTraceId() {
+ #if defined(DART_HOST_OS_ANDROID)
+   return GetCurrentThreadId();
+-#elif defined(DART_HOST_OS_LINUX)
++#elif defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_OHOS)
+   return syscall(__NR_gettid);
+ #elif defined(DART_HOST_OS_MACOS)
+   return ThreadIdFromIntPtr(pthread_mach_thread_np(pthread_self()));
+@@ -265,7 +265,7 @@ void OSThread::Join(ThreadJoinId id) {
+ 
+ intptr_t OSThread::ThreadIdToIntPtr(ThreadId id) {
+   COMPILE_ASSERT(sizeof(id) <= sizeof(intptr_t));
+-#if defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_LINUX)
++#if defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_OHOS)
+   return static_cast<intptr_t>(id);
+ #elif defined(DART_HOST_OS_MACOS)
+   return reinterpret_cast<intptr_t>(id);
+@@ -273,7 +273,7 @@ intptr_t OSThread::ThreadIdToIntPtr(ThreadId id) {
+ }
+ 
+ ThreadId OSThread::ThreadIdFromIntPtr(intptr_t id) {
+-#if defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_LINUX)
++#if defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_OHOS)
+   return static_cast<ThreadId>(id);
+ #elif defined(DART_HOST_OS_MACOS)
+   return reinterpret_cast<ThreadId>(id);
+@@ -285,7 +285,7 @@ bool OSThread::Compare(ThreadId a, ThreadId b) {
+ }
+ 
+ bool OSThread::GetCurrentStackBounds(uword* lower, uword* upper) {
+-#if defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_LINUX)
++#if defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_OHOS)
+   pthread_attr_t attr;
+   // May fail on the main thread.
+   if (pthread_getattr_np(pthread_self(), &attr) != 0) {
+diff --git a/runtime/vm/os_thread_ohos.cc b/runtime/vm/os_thread_ohos.cc
+new file mode 100644
+index 00000000000..d5fbff8f79e
+--- /dev/null
++++ b/runtime/vm/os_thread_ohos.cc
+@@ -0,0 +1,508 @@
++// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
++// for details. All rights reserved. Use of this source code is governed by a
++// BSD-style license that can be found in the LICENSE file.
++
++#include "platform/globals.h"  // NOLINT
++
++#if defined(DART_HOST_OS_OHOS) && !defined(DART_USE_ABSL)
++
++#include "vm/os_thread.h"
++
++#include <errno.h>  // NOLINT
++#include <stdio.h>
++#include <sys/prctl.h>
++#include <sys/resource.h>  // NOLINT
++#include <sys/syscall.h>   // NOLINT
++#include <sys/time.h>      // NOLINT
++
++#include "platform/address_sanitizer.h"
++#include "platform/assert.h"
++#include "platform/safe_stack.h"
++#include "platform/signal_blocker.h"
++#include "platform/utils.h"
++
++#include "vm/flags.h"
++
++namespace dart {
++
++DEFINE_FLAG(int,
++            worker_thread_priority,
++            kMinInt,
++            "The thread priority the VM should use for new worker threads.");
++
++#define VALIDATE_PTHREAD_RESULT(result)                                        \
++  if (result != 0) {                                                           \
++    const int kBufferSize = 1024;                                              \
++    char error_buf[kBufferSize];                                               \
++    FATAL("pthread error: %d (%s)", result,                                   \
++           Utils::StrError(result, error_buf, kBufferSize));                   \
++  }
++
++// Variation of VALIDATE_PTHREAD_RESULT for named objects.
++#if defined(PRODUCT)
++#define VALIDATE_PTHREAD_RESULT_NAMED(result) VALIDATE_PTHREAD_RESULT(result)
++#else
++#define VALIDATE_PTHREAD_RESULT_NAMED(result)                                  \
++  if (result != 0) {                                                           \
++    const int kBufferSize = 1024;                                              \
++    char error_buf[kBufferSize];                                               \
++    FATAL("[%s] pthread error: %d (%s)", name_, result,                       \
++           Utils::StrError(result, error_buf, kBufferSize));                   \
++  }
++#endif
++
++#if defined(DEBUG)
++#define ASSERT_PTHREAD_SUCCESS(result) VALIDATE_PTHREAD_RESULT(result)
++#else
++// NOTE: This (currently) expands to a no-op.
++#define ASSERT_PTHREAD_SUCCESS(result) ASSERT(result == 0)
++#endif
++
++#ifdef DEBUG
++#define RETURN_ON_PTHREAD_FAILURE(result)                                      \
++  if (result != 0) {                                                           \
++    const int kBufferSize = 1024;                                              \
++    char error_buf[kBufferSize];                                               \
++    fprintf(stderr, "%s:%d: pthread error: %d (%s)\n", __FILE__, __LINE__,     \
++            result, Utils::StrError(result, error_buf, kBufferSize));          \
++    return result;                                                             \
++  }
++#else
++#define RETURN_ON_PTHREAD_FAILURE(result)                                      \
++  if (result != 0) return result;
++#endif
++
++static void ComputeTimeSpecMicros(struct timespec* ts, int64_t micros) {
++  int64_t secs = micros / kMicrosecondsPerSecond;
++  int64_t nanos =
++      (micros - (secs * kMicrosecondsPerSecond)) * kNanosecondsPerMicrosecond;
++  int result = clock_gettime(CLOCK_MONOTONIC, ts);
++  ASSERT(result == 0);
++  ts->tv_sec += secs;
++  ts->tv_nsec += nanos;
++  if (ts->tv_nsec >= kNanosecondsPerSecond) {
++    ts->tv_sec += 1;
++    ts->tv_nsec -= kNanosecondsPerSecond;
++  }
++}
++
++class ThreadStartData {
++ public:
++  ThreadStartData(const char* name,
++                  OSThread::ThreadStartFunction function,
++                  uword parameter)
++      : name_(name), function_(function), parameter_(parameter) {}
++
++  const char* name() const { return name_; }
++  OSThread::ThreadStartFunction function() const { return function_; }
++  uword parameter() const { return parameter_; }
++
++ private:
++  const char* name_;
++  OSThread::ThreadStartFunction function_;
++  uword parameter_;
++
++  DISALLOW_COPY_AND_ASSIGN(ThreadStartData);
++};
++
++// TODO(bkonyi): remove this call once the prebuilt SDK is updated.
++// Spawned threads inherit their spawner's signal mask. We sometimes spawn
++// threads for running Dart code from a thread that is blocking SIGPROF.
++// This function explicitly unblocks SIGPROF so the profiler continues to
++// sample this thread.
++static void UnblockSIGPROF() {
++  sigset_t set;
++  sigemptyset(&set);
++  sigaddset(&set, SIGPROF);
++  int r = pthread_sigmask(SIG_UNBLOCK, &set, NULL);
++  USE(r);
++  ASSERT(r == 0);
++  ASSERT(!CHECK_IS_BLOCKING(SIGPROF));
++}
++
++// Dispatch to the thread start function provided by the caller. This trampoline
++// is used to ensure that the thread is properly destroyed if the thread just
++// exits.
++static void* ThreadStart(void* data_ptr) {
++  if (FLAG_worker_thread_priority != kMinInt) {
++    if (setpriority(PRIO_PROCESS, syscall(__NR_gettid),
++                    FLAG_worker_thread_priority) == -1) {
++      FATAL("Setting thread priority to %d failed: errno = %d\n",
++             FLAG_worker_thread_priority, errno);
++    }
++  }
++
++  ThreadStartData* data = reinterpret_cast<ThreadStartData*>(data_ptr);
++
++  const char* name = data->name();
++  OSThread::ThreadStartFunction function = data->function();
++  uword parameter = data->parameter();
++  delete data;
++
++  // Set the thread name. There is 16 bytes limit on the name (including \0).
++  // pthread_setname_np ignores names that are too long rather than truncating.
++  char truncated_name[16];
++  snprintf(truncated_name, ARRAY_SIZE(truncated_name), "%s", name);
++  pthread_setname_np(pthread_self(), truncated_name);
++
++  // Create new OSThread object and set as TLS for new thread.
++  OSThread* thread = OSThread::CreateOSThread();
++  if (thread != NULL) {
++    OSThread::SetCurrent(thread);
++    thread->SetName(name);
++    UnblockSIGPROF();
++    // Call the supplied thread start function handing it its parameters.
++    function(parameter);
++  }
++
++  return NULL;
++}
++
++int OSThread::Start(const char* name,
++                    ThreadStartFunction function,
++                    uword parameter) {
++  pthread_attr_t attr;
++  int result = pthread_attr_init(&attr);
++  RETURN_ON_PTHREAD_FAILURE(result);
++
++  result = pthread_attr_setstacksize(&attr, OSThread::GetMaxStackSize());
++  RETURN_ON_PTHREAD_FAILURE(result);
++
++  ThreadStartData* data = new ThreadStartData(name, function, parameter);
++
++  pthread_t tid;
++  result = pthread_create(&tid, &attr, ThreadStart, data);
++  RETURN_ON_PTHREAD_FAILURE(result);
++
++  result = pthread_attr_destroy(&attr);
++  RETURN_ON_PTHREAD_FAILURE(result);
++
++  return 0;
++}
++
++const ThreadId OSThread::kInvalidThreadId = static_cast<ThreadId>(0);
++const ThreadJoinId OSThread::kInvalidThreadJoinId =
++    static_cast<ThreadJoinId>(0);
++
++ThreadLocalKey OSThread::CreateThreadLocal(ThreadDestructor destructor) {
++  pthread_key_t key = kUnsetThreadLocalKey;
++  int result = pthread_key_create(&key, destructor);
++  VALIDATE_PTHREAD_RESULT(result);
++  ASSERT(key != kUnsetThreadLocalKey);
++  return key;
++}
++
++void OSThread::DeleteThreadLocal(ThreadLocalKey key) {
++  ASSERT(key != kUnsetThreadLocalKey);
++  int result = pthread_key_delete(key);
++  VALIDATE_PTHREAD_RESULT(result);
++}
++
++void OSThread::SetThreadLocal(ThreadLocalKey key, uword value) {
++  ASSERT(key != kUnsetThreadLocalKey);
++  int result = pthread_setspecific(key, reinterpret_cast<void*>(value));
++  VALIDATE_PTHREAD_RESULT(result);
++}
++
++intptr_t OSThread::GetMaxStackSize() {
++  const int kStackSize = (128 * kWordSize * KB);
++  return kStackSize;
++}
++
++ThreadId OSThread::GetCurrentThreadId() {
++  return pthread_self();
++}
++
++#ifdef SUPPORT_TIMELINE
++ThreadId OSThread::GetCurrentThreadTraceId() {
++  return syscall(__NR_gettid);
++}
++#endif  // SUPPORT_TIMELINE
++
++char* OSThread::GetCurrentThreadName() {
++  const intptr_t kNameBufferSize = 16;
++  char* name = static_cast<char*>(malloc(kNameBufferSize));
++  prctl(PR_GET_NAME, name);
++  return name;
++}
++
++ThreadJoinId OSThread::GetCurrentThreadJoinId(OSThread* thread) {
++  ASSERT(thread != NULL);
++  // Make sure we're filling in the join id for the current thread.
++  ASSERT(thread->id() == GetCurrentThreadId());
++  // Make sure the join_id_ hasn't been set, yet.
++  DEBUG_ASSERT(thread->join_id_ == kInvalidThreadJoinId);
++  pthread_t id = pthread_self();
++#if defined(DEBUG)
++  thread->join_id_ = id;
++#endif
++  return id;
++}
++
++void OSThread::Join(ThreadJoinId id) {
++  int result = pthread_join(id, NULL);
++  ASSERT(result == 0);
++}
++
++intptr_t OSThread::ThreadIdToIntPtr(ThreadId id) {
++  ASSERT(sizeof(id) == sizeof(intptr_t));
++  return static_cast<intptr_t>(id);
++}
++
++ThreadId OSThread::ThreadIdFromIntPtr(intptr_t id) {
++  return static_cast<ThreadId>(id);
++}
++
++bool OSThread::Compare(ThreadId a, ThreadId b) {
++  return pthread_equal(a, b) != 0;
++}
++
++bool OSThread::GetCurrentStackBounds(uword* lower, uword* upper) {
++  pthread_attr_t attr;
++  // May fail on the main thread.
++  if (pthread_getattr_np(pthread_self(), &attr) != 0) {
++    return false;
++  }
++
++  void* base;
++  size_t size;
++  int error = pthread_attr_getstack(&attr, &base, &size);
++  pthread_attr_destroy(&attr);
++  if (error != 0) {
++    return false;
++  }
++
++  *lower = reinterpret_cast<uword>(base);
++  *upper = *lower + size;
++  return true;
++}
++
++#if defined(USING_SAFE_STACK)
++NO_SANITIZE_ADDRESS
++NO_SANITIZE_SAFE_STACK
++uword OSThread::GetCurrentSafestackPointer() {
++#error "SAFE_STACK is unsupported on this platform"
++  return 0;
++}
++
++NO_SANITIZE_ADDRESS
++NO_SANITIZE_SAFE_STACK
++void OSThread::SetCurrentSafestackPointer(uword ssp) {
++#error "SAFE_STACK is unsupported on this platform"
++}
++#endif
++
++Mutex::Mutex(NOT_IN_PRODUCT(const char* name))
++#if !defined(PRODUCT)
++    : name_(name)
++#endif
++{
++  pthread_mutexattr_t attr;
++  int result = pthread_mutexattr_init(&attr);
++  VALIDATE_PTHREAD_RESULT_NAMED(result);
++
++#if defined(DEBUG)
++  result = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK);
++  VALIDATE_PTHREAD_RESULT_NAMED(result);
++#endif  // defined(DEBUG)
++
++  result = pthread_mutex_init(data_.mutex(), &attr);
++  // Verify that creating a pthread_mutex succeeded.
++  VALIDATE_PTHREAD_RESULT_NAMED(result);
++
++  result = pthread_mutexattr_destroy(&attr);
++  VALIDATE_PTHREAD_RESULT_NAMED(result);
++
++#if defined(DEBUG)
++  // When running with assertions enabled we track the owner.
++  owner_ = OSThread::kInvalidThreadId;
++#endif  // defined(DEBUG)
++}
++
++Mutex::~Mutex() {
++  int result = pthread_mutex_destroy(data_.mutex());
++  // Verify that the pthread_mutex was destroyed.
++  VALIDATE_PTHREAD_RESULT_NAMED(result);
++
++#if defined(DEBUG)
++  // When running with assertions enabled we track the owner.
++  ASSERT(owner_ == OSThread::kInvalidThreadId);
++#endif  // defined(DEBUG)
++}
++
++void Mutex::Lock() {
++  int result = pthread_mutex_lock(data_.mutex());
++  // Specifically check for dead lock to help debugging.
++  ASSERT(result != EDEADLK);
++  ASSERT_PTHREAD_SUCCESS(result);  // Verify no other errors.
++#if defined(DEBUG)
++  // When running with assertions enabled we track the owner.
++  owner_ = OSThread::GetCurrentThreadId();
++#endif  // defined(DEBUG)
++}
++
++bool Mutex::TryLock() {
++  int result = pthread_mutex_trylock(data_.mutex());
++  // Return false if the lock is busy and locking failed.
++  if (result == EBUSY) {
++    return false;
++  }
++  ASSERT_PTHREAD_SUCCESS(result);  // Verify no other errors.
++#if defined(DEBUG)
++  // When running with assertions enabled we track the owner.
++  owner_ = OSThread::GetCurrentThreadId();
++#endif  // defined(DEBUG)
++  return true;
++}
++
++void Mutex::Unlock() {
++#if defined(DEBUG)
++  // When running with assertions enabled we track the owner.
++  ASSERT(IsOwnedByCurrentThread());
++  owner_ = OSThread::kInvalidThreadId;
++#endif  // defined(DEBUG)
++  int result = pthread_mutex_unlock(data_.mutex());
++  // Specifically check for wrong thread unlocking to aid debugging.
++  ASSERT(result != EPERM);
++  ASSERT_PTHREAD_SUCCESS(result);  // Verify no other errors.
++}
++
++Monitor::Monitor() {
++  pthread_mutexattr_t mutex_attr;
++  int result = pthread_mutexattr_init(&mutex_attr);
++  VALIDATE_PTHREAD_RESULT(result);
++
++#if defined(DEBUG)
++  result = pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_ERRORCHECK);
++  VALIDATE_PTHREAD_RESULT(result);
++#endif  // defined(DEBUG)
++
++  result = pthread_mutex_init(data_.mutex(), &mutex_attr);
++  VALIDATE_PTHREAD_RESULT(result);
++
++  result = pthread_mutexattr_destroy(&mutex_attr);
++  VALIDATE_PTHREAD_RESULT(result);
++
++  pthread_condattr_t cond_attr;
++  result = pthread_condattr_init(&cond_attr);
++  VALIDATE_PTHREAD_RESULT(result);
++
++  result = pthread_condattr_setclock(&cond_attr, CLOCK_MONOTONIC);
++  VALIDATE_PTHREAD_RESULT(result);
++
++  result = pthread_cond_init(data_.cond(), &cond_attr);
++  VALIDATE_PTHREAD_RESULT(result);
++
++  result = pthread_condattr_destroy(&cond_attr);
++  VALIDATE_PTHREAD_RESULT(result);
++
++#if defined(DEBUG)
++  // When running with assertions enabled we track the owner.
++  owner_ = OSThread::kInvalidThreadId;
++#endif  // defined(DEBUG)
++}
++
++Monitor::~Monitor() {
++#if defined(DEBUG)
++  // When running with assertions enabled we track the owner.
++  ASSERT(owner_ == OSThread::kInvalidThreadId);
++#endif  // defined(DEBUG)
++
++  int result = pthread_mutex_destroy(data_.mutex());
++  VALIDATE_PTHREAD_RESULT(result);
++
++  result = pthread_cond_destroy(data_.cond());
++  VALIDATE_PTHREAD_RESULT(result);
++}
++
++bool Monitor::TryEnter() {
++  int result = pthread_mutex_trylock(data_.mutex());
++  // Return false if the lock is busy and locking failed.
++  if (result == EBUSY) {
++    return false;
++  }
++  ASSERT_PTHREAD_SUCCESS(result);  // Verify no other errors.
++#if defined(DEBUG)
++  // When running with assertions enabled we track the owner.
++  ASSERT(owner_ == OSThread::kInvalidThreadId);
++  owner_ = OSThread::GetCurrentThreadId();
++#endif  // defined(DEBUG)
++  return true;
++}
++
++void Monitor::Enter() {
++  int result = pthread_mutex_lock(data_.mutex());
++  VALIDATE_PTHREAD_RESULT(result);
++
++#if defined(DEBUG)
++  // When running with assertions enabled we track the owner.
++  ASSERT(owner_ == OSThread::kInvalidThreadId);
++  owner_ = OSThread::GetCurrentThreadId();
++#endif  // defined(DEBUG)
++}
++
++void Monitor::Exit() {
++#if defined(DEBUG)
++  // When running with assertions enabled we track the owner.
++  ASSERT(IsOwnedByCurrentThread());
++  owner_ = OSThread::kInvalidThreadId;
++#endif  // defined(DEBUG)
++
++  int result = pthread_mutex_unlock(data_.mutex());
++  VALIDATE_PTHREAD_RESULT(result);
++}
++
++Monitor::WaitResult Monitor::Wait(int64_t millis) {
++  Monitor::WaitResult retval = WaitMicros(millis * kMicrosecondsPerMillisecond);
++  return retval;
++}
++
++Monitor::WaitResult Monitor::WaitMicros(int64_t micros) {
++#if defined(DEBUG)
++  // When running with assertions enabled we track the owner.
++  ASSERT(IsOwnedByCurrentThread());
++  ThreadId saved_owner = owner_;
++  owner_ = OSThread::kInvalidThreadId;
++#endif  // defined(DEBUG)
++
++  Monitor::WaitResult retval = kNotified;
++  if (micros == kNoTimeout) {
++    // Wait forever.
++    int result = pthread_cond_wait(data_.cond(), data_.mutex());
++    VALIDATE_PTHREAD_RESULT(result);
++  } else {
++    struct timespec ts;
++    ComputeTimeSpecMicros(&ts, micros);
++    int result = pthread_cond_timedwait(data_.cond(), data_.mutex(), &ts);
++    ASSERT((result == 0) || (result == ETIMEDOUT));
++    if (result == ETIMEDOUT) {
++      retval = kTimedOut;
++    }
++  }
++
++#if defined(DEBUG)
++  // When running with assertions enabled we track the owner.
++  ASSERT(owner_ == OSThread::kInvalidThreadId);
++  owner_ = OSThread::GetCurrentThreadId();
++  ASSERT(owner_ == saved_owner);
++#endif  // defined(DEBUG)
++  return retval;
++}
++
++void Monitor::Notify() {
++  // When running with assertions enabled we track the owner.
++  ASSERT(IsOwnedByCurrentThread());
++  int result = pthread_cond_signal(data_.cond());
++  VALIDATE_PTHREAD_RESULT(result);
++}
++
++void Monitor::NotifyAll() {
++  // When running with assertions enabled we track the owner.
++  ASSERT(IsOwnedByCurrentThread());
++  int result = pthread_cond_broadcast(data_.cond());
++  VALIDATE_PTHREAD_RESULT(result);
++}
++
++}  // namespace dart
++
++#endif  // defined(DART_HOST_OS_OHOS) && !defined(DART_USE_ABSL)
+diff --git a/runtime/vm/os_thread_ohos.h b/runtime/vm/os_thread_ohos.h
+new file mode 100644
+index 00000000000..aaf490f9f77
+--- /dev/null
++++ b/runtime/vm/os_thread_ohos.h
+@@ -0,0 +1,76 @@
++// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
++// for details. All rights reserved. Use of this source code is governed by a
++// BSD-style license that can be found in the LICENSE file.
++
++#ifndef RUNTIME_VM_OS_THREAD_OHOS_H_
++#define RUNTIME_VM_OS_THREAD_OHOS_H_
++
++#if !defined(RUNTIME_VM_OS_THREAD_H_)
++#error Do not include os_thread_linux.h directly; use os_thread.h instead.
++#endif
++
++#include <pthread.h>
++
++#include "platform/assert.h"
++#include "platform/globals.h"
++
++namespace dart {
++
++typedef pthread_key_t ThreadLocalKey;
++typedef pthread_t ThreadId;
++typedef pthread_t ThreadJoinId;
++
++static const ThreadLocalKey kUnsetThreadLocalKey =
++    static_cast<pthread_key_t>(-1);
++
++class ThreadInlineImpl {
++ private:
++  ThreadInlineImpl() {}
++  ~ThreadInlineImpl() {}
++
++  static uword GetThreadLocal(ThreadLocalKey key) {
++    ASSERT(key != kUnsetThreadLocalKey);
++    return reinterpret_cast<uword>(pthread_getspecific(key));
++  }
++
++  friend class OSThread;
++
++  DISALLOW_ALLOCATION();
++  DISALLOW_COPY_AND_ASSIGN(ThreadInlineImpl);
++};
++
++class MutexData {
++ private:
++  MutexData() {}
++  ~MutexData() {}
++
++  pthread_mutex_t* mutex() { return &mutex_; }
++
++  pthread_mutex_t mutex_;
++
++  friend class Mutex;
++
++  DISALLOW_ALLOCATION();
++  DISALLOW_COPY_AND_ASSIGN(MutexData);
++};
++
++class MonitorData {
++ private:
++  MonitorData() {}
++  ~MonitorData() {}
++
++  pthread_mutex_t* mutex() { return &mutex_; }
++  pthread_cond_t* cond() { return &cond_; }
++
++  pthread_mutex_t mutex_;
++  pthread_cond_t cond_;
++
++  friend class Monitor;
++
++  DISALLOW_ALLOCATION();
++  DISALLOW_COPY_AND_ASSIGN(MonitorData);
++};
++
++}  // namespace dart
++
++#endif  // RUNTIME_VM_OS_THREAD_OHOS_H_
+diff --git a/runtime/vm/proccpuinfo.cc b/runtime/vm/proccpuinfo.cc
+index a6c1c250d1b..b955e6d7838 100644
+--- a/runtime/vm/proccpuinfo.cc
++++ b/runtime/vm/proccpuinfo.cc
+@@ -3,7 +3,7 @@
+ // BSD-style license that can be found in the LICENSE file.
+ 
+ #include "vm/globals.h"
+-#if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID)
++#if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_OHOS)
+ 
+ #include "vm/proccpuinfo.h"
+ 
+@@ -146,4 +146,4 @@ bool ProcCpuInfo::HasField(const char* field) {
+ 
+ }  // namespace dart
+ 
+-#endif  // defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID)
++#endif  // defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_OHOS)
+diff --git a/runtime/vm/proccpuinfo.h b/runtime/vm/proccpuinfo.h
+index ff249d42d2d..4c829f4ace6 100644
+--- a/runtime/vm/proccpuinfo.h
++++ b/runtime/vm/proccpuinfo.h
+@@ -6,7 +6,7 @@
+ #define RUNTIME_VM_PROCCPUINFO_H_
+ 
+ #include "vm/globals.h"
+-#if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID)
++#if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_OHOS)
+ 
+ #include "vm/allocation.h"
+ 
+@@ -29,6 +29,6 @@ class ProcCpuInfo : public AllStatic {
+ 
+ }  // namespace dart
+ 
+-#endif  // defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID)
++#endif  // defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_OHOS)
+ 
+ #endif  // RUNTIME_VM_PROCCPUINFO_H_
+diff --git a/runtime/vm/profiler.cc b/runtime/vm/profiler.cc
+index 6b64f4d4f5a..85a577b2c9e 100644
+--- a/runtime/vm/profiler.cc
++++ b/runtime/vm/profiler.cc
+@@ -435,7 +435,7 @@ void Profiler::DumpStackTrace(void* context) {
+     return;
+   }
+ #if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_MACOS) ||              \
+-    defined(DART_HOST_OS_ANDROID)
++    defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_OHOS)
+   ucontext_t* ucontext = reinterpret_cast<ucontext_t*>(context);
+   mcontext_t mcontext = ucontext->uc_mcontext;
+   uword pc = SignalHandler::GetProgramCounter(mcontext);
+diff --git a/runtime/vm/service.cc b/runtime/vm/service.cc
+index 3c5593ea4f9..ebb9f661591 100644
+--- a/runtime/vm/service.cc
++++ b/runtime/vm/service.cc
+@@ -4602,7 +4602,7 @@ static void RequestHeapSnapshot(Thread* thread, JSONStream* js) {
+   PrintSuccess(js);
+ }
+ 
+-#if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID)
++#if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_OHOS)
+ struct VMMapping {
+   char path[256];
+   size_t size;
+@@ -4810,7 +4810,7 @@ static intptr_t GetProcessMemoryUsageHelper(JSONStream* js) {
+     vm.AddProperty64("size", vm_size);
+   }
+ 
+-#if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID)
++#if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_OHOS)
+   AddVMMappings(&rss_children);
+ #endif
+   // TODO(46166): Implement for other operating systems.
+diff --git a/runtime/vm/signal_handler.h b/runtime/vm/signal_handler.h
+index bfcd982e915..fab0a1cea81 100644
+--- a/runtime/vm/signal_handler.h
++++ b/runtime/vm/signal_handler.h
+@@ -33,6 +33,9 @@ typedef struct ucontext {
+ struct siginfo_t;
+ struct mcontext_t;
+ struct sigset_t {};
++#elif defined(DART_HOST_OS_OHOS)
++#include <signal.h>    // NOLINT
++#include <ucontext.h>  // NOLINT
+ #elif defined(DART_HOST_OS_FUCHSIA)
+ #include <signal.h>    // NOLINT
+ #include <ucontext.h>  // NOLINT
+diff --git a/runtime/vm/signal_handler_ohos.cc b/runtime/vm/signal_handler_ohos.cc
+new file mode 100644
+index 00000000000..c64c9984606
+--- /dev/null
++++ b/runtime/vm/signal_handler_ohos.cc
+@@ -0,0 +1,136 @@
++// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
++// for details. All rights reserved. Use of this source code is governed by a
++// BSD-style license that can be found in the LICENSE file.
++
++#include "vm/globals.h"
++#include "vm/instructions.h"
++#include "vm/signal_handler.h"
++#include "vm/simulator.h"
++#if defined(DART_HOST_OS_OHOS)
++
++namespace dart {
++
++uintptr_t SignalHandler::GetProgramCounter(const mcontext_t& mcontext) {
++  uintptr_t pc = 0;
++
++#if defined(HOST_ARCH_IA32)
++  pc = static_cast<uintptr_t>(mcontext.gregs[REG_EIP]);
++#elif defined(HOST_ARCH_X64)
++  pc = static_cast<uintptr_t>(mcontext.gregs[REG_RIP]);
++#elif defined(HOST_ARCH_ARM)
++  pc = static_cast<uintptr_t>(mcontext.arm_pc);
++#elif defined(HOST_ARCH_ARM64)
++  pc = static_cast<uintptr_t>(mcontext.pc);
++#elif defined(HOST_ARCH_RISCV32)
++  pc = static_cast<uintptr_t>(mcontext.__gregs[REG_PC]);
++#elif defined(HOST_ARCH_RISCV64)
++  pc = static_cast<uintptr_t>(mcontext.__gregs[REG_PC]);
++#else
++#error Unsupported architecture.
++#endif  // HOST_ARCH_...
++  return pc;
++}
++
++uintptr_t SignalHandler::GetFramePointer(const mcontext_t& mcontext) {
++  uintptr_t fp = 0;
++
++#if defined(HOST_ARCH_IA32)
++  fp = static_cast<uintptr_t>(mcontext.gregs[REG_EBP]);
++#elif defined(HOST_ARCH_X64)
++  fp = static_cast<uintptr_t>(mcontext.gregs[REG_RBP]);
++#elif defined(HOST_ARCH_ARM)
++  // B1.3.3 Program Status Registers (PSRs)
++  if ((mcontext.arm_cpsr & (1 << 5)) != 0) {
++    // Thumb mode.
++    fp = static_cast<uintptr_t>(mcontext.arm_r7);
++  } else {
++    // ARM mode.
++    fp = static_cast<uintptr_t>(mcontext.arm_fp);
++  }
++#elif defined(HOST_ARCH_ARM64)
++  fp = static_cast<uintptr_t>(mcontext.regs[29]);
++#elif defined(HOST_ARCH_RISCV32)
++  fp = static_cast<uintptr_t>(mcontext.__gregs[REG_S0]);
++#elif defined(HOST_ARCH_RISCV64)
++  fp = static_cast<uintptr_t>(mcontext.__gregs[REG_S0]);
++#else
++#error Unsupported architecture.
++#endif  // HOST_ARCH_...
++
++  return fp;
++}
++
++uintptr_t SignalHandler::GetCStackPointer(const mcontext_t& mcontext) {
++  uintptr_t sp = 0;
++
++#if defined(HOST_ARCH_IA32)
++  sp = static_cast<uintptr_t>(mcontext.gregs[REG_ESP]);
++#elif defined(HOST_ARCH_X64)
++  sp = static_cast<uintptr_t>(mcontext.gregs[REG_RSP]);
++#elif defined(HOST_ARCH_ARM)
++  sp = static_cast<uintptr_t>(mcontext.arm_sp);
++#elif defined(HOST_ARCH_ARM64)
++  sp = static_cast<uintptr_t>(mcontext.sp);
++#elif defined(HOST_ARCH_RISCV32)
++  sp = static_cast<uintptr_t>(mcontext.__gregs[REG_SP]);
++#elif defined(HOST_ARCH_RISCV64)
++  sp = static_cast<uintptr_t>(mcontext.__gregs[REG_SP]);
++#else
++#error Unsupported architecture.
++#endif  // HOST_ARCH_...
++  return sp;
++}
++
++uintptr_t SignalHandler::GetDartStackPointer(const mcontext_t& mcontext) {
++#if defined(TARGET_ARCH_ARM64) && !defined(USING_SIMULATOR)
++  return static_cast<uintptr_t>(mcontext.regs[SPREG]);
++#else
++  return GetCStackPointer(mcontext);
++#endif
++}
++
++uintptr_t SignalHandler::GetLinkRegister(const mcontext_t& mcontext) {
++  uintptr_t lr = 0;
++
++#if defined(HOST_ARCH_IA32)
++  lr = 0;
++#elif defined(HOST_ARCH_X64)
++  lr = 0;
++#elif defined(HOST_ARCH_ARM)
++  lr = static_cast<uintptr_t>(mcontext.arm_lr);
++#elif defined(HOST_ARCH_ARM64)
++  lr = static_cast<uintptr_t>(mcontext.regs[30]);
++#elif defined(HOST_ARCH_RISCV32)
++  lr = static_cast<uintptr_t>(mcontext.__gregs[REG_RA]);
++#elif defined(HOST_ARCH_RISCV64)
++  lr = static_cast<uintptr_t>(mcontext.__gregs[REG_RA]);
++#else
++#error Unsupported architecture.
++#endif  // HOST_ARCH_...
++  return lr;
++}
++
++void SignalHandler::Install(SignalAction action) {
++  struct sigaction act = {};
++  act.sa_handler = NULL;
++  act.sa_sigaction = action;
++  sigemptyset(&act.sa_mask);
++  act.sa_flags = SA_RESTART | SA_SIGINFO;
++  int r = sigaction(SIGPROF, &act, NULL);
++  ASSERT(r == 0);
++}
++
++void SignalHandler::Remove() {
++  // Ignore future SIGPROF signals because by default SIGPROF will terminate
++  // the process and we may have some signals in flight.
++  struct sigaction act = {};
++  act.sa_handler = SIG_IGN;
++  sigemptyset(&act.sa_mask);
++  act.sa_flags = 0;
++  int r = sigaction(SIGPROF, &act, NULL);
++  ASSERT(r == 0);
++}
++
++}  // namespace dart
++
++#endif  // defined(DART_HOST_OS_OHOS)
+diff --git a/runtime/vm/thread_interrupter_ohos.cc b/runtime/vm/thread_interrupter_ohos.cc
+new file mode 100644
+index 00000000000..67c4a6545ec
+--- /dev/null
++++ b/runtime/vm/thread_interrupter_ohos.cc
+@@ -0,0 +1,69 @@
++// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
++// for details. All rights reserved. Use of this source code is governed by a
++// BSD-style license that can be found in the LICENSE file.
++
++#include "platform/globals.h"
++#if defined(DART_HOST_OS_OHOS)
++
++#include <errno.h>  // NOLINT
++
++#include "vm/flags.h"
++#include "vm/os.h"
++#include "vm/profiler.h"
++#include "vm/signal_handler.h"
++#include "vm/thread_interrupter.h"
++
++namespace dart {
++
++#ifndef PRODUCT
++
++DECLARE_FLAG(bool, trace_thread_interrupter);
++
++class ThreadInterrupterOhos : public AllStatic {
++ public:
++  static void ThreadInterruptSignalHandler(int signal,
++                                           siginfo_t* info,
++                                           void* context_) {
++    if (signal != SIGPROF) {
++      return;
++    }
++    Thread* thread = Thread::Current();
++    if (thread == NULL) {
++      return;
++    }
++    ThreadInterruptScope signal_handler_scope;
++    // Extract thread state.
++    ucontext_t* context = reinterpret_cast<ucontext_t*>(context_);
++    mcontext_t mcontext = context->uc_mcontext;
++    InterruptedThreadState its;
++    its.pc = SignalHandler::GetProgramCounter(mcontext);
++    its.fp = SignalHandler::GetFramePointer(mcontext);
++    its.csp = SignalHandler::GetCStackPointer(mcontext);
++    its.dsp = SignalHandler::GetDartStackPointer(mcontext);
++    its.lr = SignalHandler::GetLinkRegister(mcontext);
++    Profiler::SampleThread(thread, its);
++  }
++};
++
++void ThreadInterrupter::InterruptThread(OSThread* thread) {
++  if (FLAG_trace_thread_interrupter) {
++    OS::PrintErr("ThreadInterrupter interrupting %p\n",
++                 reinterpret_cast<void*>(thread->id()));
++  }
++  int result = pthread_kill(thread->id(), SIGPROF);
++  ASSERT((result == 0) || (result == ESRCH));
++}
++
++void ThreadInterrupter::InstallSignalHandler() {
++  SignalHandler::Install(&ThreadInterrupterOhos::ThreadInterruptSignalHandler);
++}
++
++void ThreadInterrupter::RemoveSignalHandler() {
++  SignalHandler::Remove();
++}
++
++#endif  // !PRODUCT
++
++}  // namespace dart
++
++#endif  // defined(DART_HOST_OS_OHOS)
+diff --git a/runtime/vm/timeline.cc b/runtime/vm/timeline.cc
+index 02855e2622b..d3cc6a54118 100644
+--- a/runtime/vm/timeline.cc
++++ b/runtime/vm/timeline.cc
+@@ -164,7 +164,7 @@ static TimelineEventRecorder* CreateTimelineRecorder() {
+ 
+   // Systrace recorder.
+   if (strcmp("systrace", flag) == 0) {
+-#if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID)
++#if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_OHOS)
+     return new TimelineEventSystraceRecorder();
+ #elif defined(DART_HOST_OS_MACOS)
+     return new TimelineEventMacosRecorder();
+diff --git a/runtime/vm/timeline.h b/runtime/vm/timeline.h
+index 51329aa632c..340378d040a 100644
+--- a/runtime/vm/timeline.h
++++ b/runtime/vm/timeline.h
+@@ -1215,7 +1215,7 @@ class TimelineEventFuchsiaRecorder : public TimelineEventPlatformRecorder {
+ };
+ #endif  // defined(DART_HOST_OS_FUCHSIA)
+ 
+-#if defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_LINUX)
++#if defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_OHOS)
+ // A recorder that writes events to Android Systrace. This class is exposed in
+ // this header file only so that PrintSystrace can be visible to
+ // timeline_test.cc.
+@@ -1236,7 +1236,7 @@ class TimelineEventSystraceRecorder : public TimelineEventPlatformRecorder {
+ 
+   int systrace_fd_;
+ };
+-#endif  // defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_LINUX)
++#endif  // defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_OHOS)
+ 
+ #if defined(DART_HOST_OS_MACOS)
+ // A recorder that sends events to macOS's tracing app. See:
+diff --git a/runtime/vm/timeline_ohos.cc b/runtime/vm/timeline_ohos.cc
+new file mode 100644
+index 00000000000..27f2e225e34
+--- /dev/null
++++ b/runtime/vm/timeline_ohos.cc
+@@ -0,0 +1,120 @@
++// Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
++// for details. All rights reserved. Use of this source code is governed by a
++// BSD-style license that can be found in the LICENSE file.
++
++#include "vm/globals.h"
++#if defined(DART_HOST_OS_OHOS) && defined(SUPPORT_TIMELINE)
++
++#include <errno.h>
++#include <fcntl.h>
++#include <cstdlib>
++
++#include "platform/atomic.h"
++#include "platform/signal_blocker.h"
++#include "vm/isolate.h"
++#include "vm/json_stream.h"
++#include "vm/lockers.h"
++#include "vm/log.h"
++#include "vm/object.h"
++#include "vm/service_event.h"
++#include "vm/thread.h"
++#include "vm/timeline.h"
++
++namespace dart {
++
++DECLARE_FLAG(bool, trace_timeline);
++
++static int OpenTraceFD() {
++  const char* kSystraceDebugPath = "/sys/kernel/debug/tracing/trace_marker";
++  const char* kSystracePath = "/sys/kernel/tracing/trace_marker";
++
++  int fd = TEMP_FAILURE_RETRY(::open(kSystracePath, O_WRONLY));
++  if (fd < 0) {
++    fd = TEMP_FAILURE_RETRY(::open(kSystraceDebugPath, O_WRONLY));
++  }
++
++  if (fd < 0 && FLAG_trace_timeline) {
++    OS::PrintErr("TimelineEventSystraceRecorder: Could not open `%s` or `%s`\n",
++                 kSystraceDebugPath, kSystracePath);
++  }
++  return fd;
++}
++
++TimelineEventSystraceRecorder::TimelineEventSystraceRecorder()
++    : TimelineEventPlatformRecorder(), systrace_fd_(OpenTraceFD()) {
++  Timeline::set_recorder_discards_clock_values(true);
++}
++
++TimelineEventSystraceRecorder::~TimelineEventSystraceRecorder() {
++  if (systrace_fd_ >= 0) {
++    close(systrace_fd_);
++  }
++}
++
++intptr_t TimelineEventSystraceRecorder::PrintSystrace(TimelineEvent* event,
++                                                      char* buffer,
++                                                      intptr_t buffer_size) {
++  ASSERT(buffer != NULL);
++  ASSERT(buffer_size > 0);
++  buffer[0] = '\0';
++  intptr_t length = 0;
++  int64_t pid = OS::ProcessId();
++  switch (event->event_type()) {
++    case TimelineEvent::kBegin: {
++      length = Utils::SNPrint(buffer, buffer_size, "B|%" Pd64 "|%s", pid,
++                              event->label());
++      break;
++    }
++    case TimelineEvent::kEnd: {
++      length = Utils::SNPrint(buffer, buffer_size, "E");
++      break;
++    }
++    case TimelineEvent::kCounter: {
++      if (event->arguments_length() > 0) {
++        // We only report the first counter value.
++        length = Utils::SNPrint(buffer, buffer_size, "C|%" Pd64 "|%s|%s", pid,
++                                event->label(), event->arguments()[0].value);
++      }
++      break;
++    }
++    case TimelineEvent::kAsyncBegin: {
++      length = Utils::SNPrint(buffer, buffer_size, "S|%" Pd64 "|%s|%" Pd64 "",
++                              pid, event->label(), event->Id());
++      break;
++    }
++    case TimelineEvent::kAsyncEnd: {
++      length = Utils::SNPrint(buffer, buffer_size, "F|%" Pd64 "|%s|%" Pd64 "",
++                              pid, event->label(), event->Id());
++      break;
++    }
++    default:
++      // Ignore event types that we cannot serialize to the Systrace format.
++      break;
++  }
++  return length;
++}
++
++void TimelineEventSystraceRecorder::OnEvent(TimelineEvent* event) {
++  if (event == NULL) {
++    return;
++  }
++  if (systrace_fd_ < 0) {
++    return;
++  }
++
++  // Serialize to the systrace format.
++  const intptr_t kBufferLength = 1024;
++  char buffer[kBufferLength];
++  const intptr_t event_length = PrintSystrace(event, &buffer[0], kBufferLength);
++  if (event_length > 0) {
++    ssize_t result;
++    // Repeatedly attempt the write while we are being interrupted.
++    do {
++      result = write(systrace_fd_, buffer, event_length);
++    } while ((result == -1L) && (errno == EINTR));
++  }
++}
++
++}  // namespace dart
++
++#endif  // defined(DART_HOST_OS_OHOS) && !defined(PRODUCT)
+diff --git a/runtime/vm/virtual_memory_posix.cc b/runtime/vm/virtual_memory_posix.cc
+index 07d4dd537dc..cf510df8146 100644
+--- a/runtime/vm/virtual_memory_posix.cc
++++ b/runtime/vm/virtual_memory_posix.cc
+@@ -4,7 +4,7 @@
+ 
+ #include "vm/globals.h"
+ #if defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_LINUX) ||            \
+-    defined(DART_HOST_OS_MACOS)
++    defined(DART_HOST_OS_MACOS) || defined(DART_HOST_OS_OHOS)
+ 
+ #include "vm/virtual_memory.h"
+ 
+@@ -188,7 +188,7 @@ void VirtualMemory::Init() {
+                                     compressed_heap_->size());
+ #endif  // defined(DART_COMPRESSED_POINTERS)
+ 
+-#if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID)
++#if defined(DART_HOST_OS_LINUX) || defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_OHOS)
+   FILE* fp = fopen("/proc/sys/vm/max_map_count", "r");
+   if (fp != nullptr) {
+     size_t max_map_count = 0;
+@@ -453,4 +453,4 @@ void VirtualMemory::DontNeed(void* address, intptr_t size) {
+ }  // namespace dart
+ 
+ #endif  // defined(DART_HOST_OS_ANDROID) || defined(DART_HOST_OS_LINUX) ||     \
+-        // defined(DART_HOST_OS_MACOS)
++        // defined(DART_HOST_OS_MACOS) || defined(DART_HOST_OS_OHOS)
+diff --git a/runtime/vm/vm_sources.gni b/runtime/vm/vm_sources.gni
+index b893dcb7f68..17f8fc9829c 100644
+--- a/runtime/vm/vm_sources.gni
++++ b/runtime/vm/vm_sources.gni
+@@ -69,6 +69,7 @@ vm_sources = [
+   "cpuinfo_android.cc",
+   "cpuinfo_fuchsia.cc",
+   "cpuinfo_linux.cc",
++  "cpuinfo_ohos.cc",
+   "cpuinfo_macos.cc",
+   "cpuinfo_win.cc",
+   "dart.cc",
+@@ -198,6 +199,7 @@ vm_sources = [
+   "os_android.cc",
+   "os_fuchsia.cc",
+   "os_linux.cc",
++  "os_ohos.cc",
+   "os_macos.cc",
+   "os_thread.cc",
+   "os_thread.h",
+@@ -213,6 +215,8 @@ vm_sources = [
+   "os_thread_macos.h",
+   "os_thread_win.cc",
+   "os_thread_win.h",
++  "os_thread_ohos.cc",
++  "os_thread_ohos.h",
+   "os_win.cc",
+   "parser.cc",
+   "parser.h",
+@@ -290,6 +294,7 @@ vm_sources = [
+   "signal_handler_android.cc",
+   "signal_handler_fuchsia.cc",
+   "signal_handler_linux.cc",
++  "signal_handler_ohos.cc",
+   "signal_handler_macos.cc",
+   "signal_handler_win.cc",
+   "simulator.h",
+@@ -329,6 +334,7 @@ vm_sources = [
+   "thread_interrupter_android.cc",
+   "thread_interrupter_fuchsia.cc",
+   "thread_interrupter_linux.cc",
++  "thread_interrupter_ohos.cc",
+   "thread_interrupter_macos.cc",
+   "thread_interrupter_win.cc",
+   "thread_pool.cc",
+@@ -344,6 +350,7 @@ vm_sources = [
+   "timeline_android.cc",
+   "timeline_fuchsia.cc",
+   "timeline_linux.cc",
++  "timeline_ohos.cc",
+   "timeline_macos.cc",
+   "timer.cc",
+   "timer.h",
+diff --git a/sdk/lib/_internal/vm/bin/vmservice_server.dart b/sdk/lib/_internal/vm/bin/vmservice_server.dart
+index 46b1461b0a9..41c82382eca 100644
+--- a/sdk/lib/_internal/vm/bin/vmservice_server.dart
++++ b/sdk/lib/_internal/vm/bin/vmservice_server.dart
+@@ -177,11 +177,11 @@ class Server {
+       this._service,
+       this._ip,
+       this._port,
+-      this._originCheckDisabled,
++      _originCheckDisabled,
+       bool authCodesDisabled,
+       this._serviceInfoFilename,
+       this._enableServicePortFallback)
+-      : _authCodesDisabled = (authCodesDisabled || Platform.isFuchsia);
++      : _authCodesDisabled = (authCodesDisabled || Platform.isFuchsia),this._originCheckDisabled=true;
+ 
+   bool _isAllowedOrigin(String origin) {
+     Uri uri;
+diff --git a/sdk/lib/_internal/vm/lib/ffi_patch.dart b/sdk/lib/_internal/vm/lib/ffi_patch.dart
+index d927f4fbd36..32648d41ec5 100644
+--- a/sdk/lib/_internal/vm/lib/ffi_patch.dart
++++ b/sdk/lib/_internal/vm/lib/ffi_patch.dart
+@@ -29,6 +29,8 @@ int get _intPtrSize => (const [
+       4, // androidIA32,
+       8, // androidX64,
+       8, // androidRiscv64,
++      4, // ohosArm,
++      8, // ohosArm64,
+       8, // fuchsiaArm64,
+       8, // fuchsiaX64,
+       8, // fuchsiaRiscv64,
+diff --git a/sdk/lib/ffi/abi.dart b/sdk/lib/ffi/abi.dart
+index 8450a551d4a..3f72dae5e6e 100644
+--- a/sdk/lib/ffi/abi.dart
++++ b/sdk/lib/ffi/abi.dart
+@@ -31,6 +31,10 @@ class Abi {
+   /// The application binary interface for Android on 64-bit RISC-V.
+   static const androidRiscv64 = _androidRiscv64;
+ 
++  static const ohosArm = _ohosArm;
++
++  static const ohosArm64 = _ohosArm64;
++
+   /// The application binary interface for Fuchsia on the Arm64 architecture.
+   static const fuchsiaArm64 = _fuchsiaArm64;
+ 
+@@ -94,6 +98,8 @@ class Abi {
+     androidIA32,
+     androidX64,
+     androidRiscv64,
++    ohosArm,
++    ohosArm64,
+     fuchsiaArm64,
+     fuchsiaX64,
+     fuchsiaRiscv64,
+@@ -138,6 +144,8 @@ class Abi {
+   static const _androidIA32 = Abi._(_Architecture.ia32, _OS.android);
+   static const _androidX64 = Abi._(_Architecture.x64, _OS.android);
+   static const _androidRiscv64 = Abi._(_Architecture.riscv64, _OS.android);
++  static const _ohosArm = Abi._(_Architecture.arm, _OS.ohos);
++  static const _ohosArm64 = Abi._(_Architecture.arm64, _OS.ohos);
+   static const _fuchsiaArm64 = Abi._(_Architecture.arm64, _OS.fuchsia);
+   static const _fuchsiaX64 = Abi._(_Architecture.x64, _OS.fuchsia);
+   static const _fuchsiaRiscv64 = Abi._(_Architecture.riscv64, _OS.fuchsia);
+@@ -170,6 +178,7 @@ enum _Architecture {
+ /// The operating systems the Dart VM runs on.
+ enum _OS {
+   android,
++  ohos,
+   fuchsia,
+   ios,
+   linux,
+diff --git a/sdk/lib/ffi/abi_specific.dart b/sdk/lib/ffi/abi_specific.dart
+index 22e12b6c50b..c23d920dca2 100644
+--- a/sdk/lib/ffi/abi_specific.dart
++++ b/sdk/lib/ffi/abi_specific.dart
+@@ -25,6 +25,8 @@ part of dart.ffi;
+ ///   Abi.androidIA32: Uint32(),
+ ///   Abi.androidX64: Uint64(),
+ ///   Abi.androidRiscv64: Uint64(),
++///   Abi.ohosArm: Uint32(),
++///   Abi.ohosArm64: Uint64(),
+ ///   Abi.fuchsiaArm64: Uint64(),
+ ///   Abi.fuchsiaX64: Uint64(),
+ ///   Abi.fuchsiaRiscv64: Uint64(),
+diff --git a/sdk/lib/ffi/c_type.dart b/sdk/lib/ffi/c_type.dart
+index dc31bc985c7..9de9faead72 100644
+--- a/sdk/lib/ffi/c_type.dart
++++ b/sdk/lib/ffi/c_type.dart
+@@ -28,6 +28,8 @@ part of dart.ffi;
+   Abi.androidIA32: Int8(),
+   Abi.androidX64: Int8(),
+   Abi.androidRiscv64: Uint8(),
++  Abi.ohosArm: Uint8(),
++  Abi.ohosArm64: Uint8(),
+   Abi.fuchsiaArm64: Uint8(),
+   Abi.fuchsiaX64: Int8(),
+   Abi.fuchsiaRiscv64: Uint8(),
+@@ -67,6 +69,8 @@ final class Char extends AbiSpecificInteger {
+   Abi.androidIA32: Int8(),
+   Abi.androidX64: Int8(),
+   Abi.androidRiscv64: Int8(),
++  Abi.ohosArm: Uint8(),
++  Abi.ohosArm64: Uint8(),
+   Abi.fuchsiaArm64: Int8(),
+   Abi.fuchsiaX64: Int8(),
+   Abi.fuchsiaRiscv64: Int8(),
+@@ -106,6 +110,8 @@ final class SignedChar extends AbiSpecificInteger {
+   Abi.androidIA32: Uint8(),
+   Abi.androidX64: Uint8(),
+   Abi.androidRiscv64: Uint8(),
++  Abi.ohosArm: Uint8(),
++  Abi.ohosArm64: Uint8(),
+   Abi.fuchsiaArm64: Uint8(),
+   Abi.fuchsiaX64: Uint8(),
+   Abi.fuchsiaRiscv64: Uint8(),
+@@ -145,6 +151,8 @@ final class UnsignedChar extends AbiSpecificInteger {
+   Abi.androidIA32: Int16(),
+   Abi.androidX64: Int16(),
+   Abi.androidRiscv64: Int16(),
++  Abi.ohosArm: Int16(),
++  Abi.ohosArm64: Int16(),
+   Abi.fuchsiaArm64: Int16(),
+   Abi.fuchsiaX64: Int16(),
+   Abi.fuchsiaRiscv64: Int16(),
+@@ -184,6 +192,8 @@ final class Short extends AbiSpecificInteger {
+   Abi.androidIA32: Uint16(),
+   Abi.androidX64: Uint16(),
+   Abi.androidRiscv64: Uint16(),
++  Abi.ohosArm: Int16(),
++  Abi.ohosArm64: Int16(),
+   Abi.fuchsiaArm64: Uint16(),
+   Abi.fuchsiaX64: Uint16(),
+   Abi.fuchsiaRiscv64: Uint16(),
+@@ -223,6 +233,8 @@ final class UnsignedShort extends AbiSpecificInteger {
+   Abi.androidIA32: Int32(),
+   Abi.androidX64: Int32(),
+   Abi.androidRiscv64: Int32(),
++  Abi.ohosArm: Int32(),
++  Abi.ohosArm64: Int32(),
+   Abi.fuchsiaArm64: Int32(),
+   Abi.fuchsiaX64: Int32(),
+   Abi.fuchsiaRiscv64: Int32(),
+@@ -262,6 +274,8 @@ final class Int extends AbiSpecificInteger {
+   Abi.androidIA32: Uint32(),
+   Abi.androidX64: Uint32(),
+   Abi.androidRiscv64: Uint32(),
++  Abi.ohosArm: Uint32(),
++  Abi.ohosArm64: Uint32(),
+   Abi.fuchsiaArm64: Uint32(),
+   Abi.fuchsiaX64: Uint32(),
+   Abi.fuchsiaRiscv64: Uint32(),
+@@ -302,6 +316,8 @@ final class UnsignedInt extends AbiSpecificInteger {
+   Abi.androidIA32: Int32(),
+   Abi.androidX64: Int64(),
+   Abi.androidRiscv64: Int64(),
++  Abi.ohosArm: Int32(),
++  Abi.ohosArm64: Int64(),
+   Abi.fuchsiaArm64: Int64(),
+   Abi.fuchsiaX64: Int64(),
+   Abi.fuchsiaRiscv64: Int64(),
+@@ -342,6 +358,8 @@ final class Long extends AbiSpecificInteger {
+   Abi.androidIA32: Uint32(),
+   Abi.androidX64: Uint64(),
+   Abi.androidRiscv64: Uint64(),
++  Abi.ohosArm: Uint32(),
++  Abi.ohosArm64: Uint64(),
+   Abi.fuchsiaArm64: Uint64(),
+   Abi.fuchsiaX64: Uint64(),
+   Abi.fuchsiaRiscv64: Uint64(),
+@@ -381,6 +399,8 @@ final class UnsignedLong extends AbiSpecificInteger {
+   Abi.androidIA32: Int64(),
+   Abi.androidX64: Int64(),
+   Abi.androidRiscv64: Int64(),
++  Abi.ohosArm: Int64(),
++  Abi.ohosArm64: Int64(),
+   Abi.fuchsiaArm64: Int64(),
+   Abi.fuchsiaX64: Int64(),
+   Abi.fuchsiaRiscv64: Int64(),
+@@ -420,6 +440,8 @@ final class LongLong extends AbiSpecificInteger {
+   Abi.androidIA32: Uint64(),
+   Abi.androidX64: Uint64(),
+   Abi.androidRiscv64: Uint64(),
++  Abi.ohosArm: Uint64(),
++  Abi.ohosArm64: Uint64(),
+   Abi.fuchsiaArm64: Uint64(),
+   Abi.fuchsiaX64: Uint64(),
+   Abi.fuchsiaRiscv64: Uint64(),
+@@ -454,6 +476,8 @@ final class UnsignedLongLong extends AbiSpecificInteger {
+   Abi.androidIA32: Int32(),
+   Abi.androidX64: Int64(),
+   Abi.androidRiscv64: Int64(),
++  Abi.ohosArm: Int32(),
++  Abi.ohosArm64: Int64(),
+   Abi.fuchsiaArm64: Int64(),
+   Abi.fuchsiaX64: Int64(),
+   Abi.fuchsiaRiscv64: Int64(),
+@@ -489,6 +513,8 @@ final class IntPtr extends AbiSpecificInteger {
+   Abi.androidIA32: Uint32(),
+   Abi.androidX64: Uint64(),
+   Abi.androidRiscv64: Uint64(),
++  Abi.ohosArm: Uint32(),
++  Abi.ohosArm64: Uint64(),
+   Abi.fuchsiaArm64: Uint64(),
+   Abi.fuchsiaX64: Uint64(),
+   Abi.fuchsiaRiscv64: Uint64(),
+@@ -524,6 +550,8 @@ final class UintPtr extends AbiSpecificInteger {
+   Abi.androidIA32: Uint32(),
+   Abi.androidX64: Uint64(),
+   Abi.androidRiscv64: Uint64(),
++  Abi.ohosArm: Uint32(),
++  Abi.ohosArm64: Uint64(),
+   Abi.fuchsiaArm64: Uint64(),
+   Abi.fuchsiaX64: Uint64(),
+   Abi.fuchsiaRiscv64: Uint64(),
+@@ -562,6 +590,8 @@ final class Size extends AbiSpecificInteger {
+   Abi.androidIA32: Uint32(),
+   Abi.androidX64: Uint32(),
+   Abi.androidRiscv64: Int32(),
++  Abi.ohosArm: Uint32(),
++  Abi.ohosArm64: Uint32(),
+   Abi.fuchsiaArm64: Uint32(),
+   Abi.fuchsiaX64: Int32(),
+   Abi.fuchsiaRiscv64: Int32(),
+diff --git a/sdk/lib/io/platform.dart b/sdk/lib/io/platform.dart
+index fdb965034f1..14d9607620a 100644
+--- a/sdk/lib/io/platform.dart
++++ b/sdk/lib/io/platform.dart
+@@ -165,6 +165,9 @@ final class Platform {
+   @pragma("vm:platform-const")
+   static final bool isFuchsia = (operatingSystem == "fuchsia");
+ 
++  /// Whether the operating system is a version of Ohos
++  static final bool isOhos = (operatingSystem == "ohos");
++
+   /// The environment for this process as a map from string key to string value.
+   ///
+   /// The map is unmodifiable,
+diff --git a/sdk_args.gni b/sdk_args.gni
+index b511f76d3e9..18c8c7e8bda 100644
+--- a/sdk_args.gni
++++ b/sdk_args.gni
+@@ -23,7 +23,8 @@ declare_args() {
+ 
+   # Whether to enable the SDK hash check that will prevent loading a kernel
+   # into a VM which was built with a different SDK.
+-  verify_sdk_hash = true
++  #verify_sdk_hash = true
++  verify_sdk_hash = false
+ 
+   # When verify_sdk_hash is true, this string is used as the verification hash
+   # instead of calculating one from the contents of the tree using the
+diff --git a/pkg/vm/lib/target_os.dart b/pkg/vm/lib/target_os.dart
+index 741c090aba4..d214e3d6991 100644
+--- a/pkg/vm/lib/target_os.dart
++++ b/pkg/vm/lib/target_os.dart
+@@ -7,6 +7,7 @@ enum TargetOS {
+   fuchsia('fuchsia', '/'),
+   iOS('ios', '/'),
+   linux('linux', '/'),
++  ohos('ohos', '/'),
+   macOS('macos', '/'),
+   windows('windows', '\\');
+
diff --git a/attachment/repos/native.patch b/attachment/repos/native.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ab802bbcada72aaf8acac9c02e8a1e828bee7684
--- /dev/null
+++ b/attachment/repos/native.patch
@@ -0,0 +1,129 @@
+diff --git a/pkgs/ffigen/example/libclang-example/custom_import.dart b/pkgs/ffigen/example/libclang-example/custom_import.dart
+index dd6196c1..90d60626 100644
+--- a/pkgs/ffigen/example/libclang-example/custom_import.dart
++++ b/pkgs/ffigen/example/libclang-example/custom_import.dart
+@@ -13,6 +13,8 @@ import 'dart:ffi';
+   Abi.androidArm64: Uint64(),
+   Abi.androidIA32: Uint32(),
+   Abi.androidX64: Uint64(),
++  Abi.ohosArm: Uint32(),
++  Abi.ohosArm64: Uint64(),
+   Abi.fuchsiaArm64: Uint64(),
+   Abi.fuchsiaX64: Uint64(),
+   Abi.iosArm: Uint32(),
+@@ -41,6 +43,8 @@ final class UintPtr extends AbiSpecificInteger {
+   Abi.androidArm64: Uint64(),
+   Abi.androidIA32: Uint32(),
+   Abi.androidX64: Uint64(),
++  Abi.ohosArm: Uint32(),
++  Abi.ohosArm64: Uint64(),
+   Abi.fuchsiaArm64: Uint64(),
+   Abi.fuchsiaX64: Uint64(),
+   Abi.iosArm: Uint32(),
+diff --git a/pkgs/native_assets_cli/lib/src/model/architecture.dart b/pkgs/native_assets_cli/lib/src/model/architecture.dart
+index 384eb548..9874d166 100644
+--- a/pkgs/native_assets_cli/lib/src/model/architecture.dart
++++ b/pkgs/native_assets_cli/lib/src/model/architecture.dart
+@@ -34,6 +34,8 @@ final class ArchitectureImpl implements Architecture {
+     Abi.androidIA32: ArchitectureImpl.ia32,
+     Abi.androidX64: ArchitectureImpl.x64,
+     Abi.androidRiscv64: ArchitectureImpl.riscv64,
++    Abi.ohosArm: ArchitectureImpl.arm,
++    Abi.ohosArm64: ArchitectureImpl.arm64,
+     Abi.fuchsiaArm64: ArchitectureImpl.arm64,
+     Abi.fuchsiaX64: ArchitectureImpl.x64,
+     Abi.iosArm: ArchitectureImpl.arm,
+diff --git a/pkgs/native_assets_cli/lib/src/model/os.dart b/pkgs/native_assets_cli/lib/src/model/os.dart
+index 73fd3ea0..e069fe70 100644
+--- a/pkgs/native_assets_cli/lib/src/model/os.dart
++++ b/pkgs/native_assets_cli/lib/src/model/os.dart
+@@ -13,6 +13,7 @@ final class OSImpl implements OS {
+   factory OSImpl.fromAbi(Abi abi) => _abiToOS[abi]!;
+ 
+   static const OSImpl android = OSImpl._('android');
++  static const OSImpl ohos = OSImpl._('ohos');
+   static const OSImpl fuchsia = OSImpl._('fuchsia');
+   static const OSImpl iOS = OSImpl._('ios');
+   static const OSImpl linux = OSImpl._('linux');
+@@ -21,6 +22,7 @@ final class OSImpl implements OS {
+ 
+   static const List<OSImpl> values = [
+     android,
++    ohos,
+     fuchsia,
+     iOS,
+     linux,
+@@ -34,6 +36,8 @@ final class OSImpl implements OS {
+     Abi.androidIA32: OSImpl.android,
+     Abi.androidX64: OSImpl.android,
+     Abi.androidRiscv64: OSImpl.android,
++    Abi.ohosArm: OSImpl.ohos,
++    Abi.ohosArm64: OSImpl.ohos,
+     Abi.fuchsiaArm64: OSImpl.fuchsia,
+     Abi.fuchsiaX64: OSImpl.fuchsia,
+     Abi.iosArm: OSImpl.iOS,
+@@ -60,6 +64,10 @@ final class OSImpl implements OS {
+       ArchitectureImpl.x64,
+       ArchitectureImpl.riscv64,
+     },
++    OSImpl.ohos: {
++      ArchitectureImpl.arm,
++      ArchitectureImpl.arm64,
++    },
+     OSImpl.fuchsia: {
+       ArchitectureImpl.arm64,
+       ArchitectureImpl.x64,
+@@ -130,6 +138,7 @@ final class OSImpl implements OS {
+   /// The default name prefix for dynamic libraries per [OSImpl].
+   static const _dylibPrefix = {
+     OSImpl.android: 'lib',
++    OSImpl.ohos: 'lib',
+     OSImpl.fuchsia: 'lib',
+     OSImpl.iOS: 'lib',
+     OSImpl.linux: 'lib',
+@@ -140,6 +149,7 @@ final class OSImpl implements OS {
+   /// The default extension for dynamic libraries per [OSImpl].
+   static const _dylibExtension = {
+     OSImpl.android: 'so',
++    OSImpl.ohos: 'so',
+     OSImpl.fuchsia: 'so',
+     OSImpl.iOS: 'dylib',
+     OSImpl.linux: 'so',
+@@ -153,6 +163,7 @@ final class OSImpl implements OS {
+   /// The default extension for static libraries per [OSImpl].
+   static const _staticlibExtension = {
+     OSImpl.android: 'a',
++    OSImpl.ohos: 'a',
+     OSImpl.fuchsia: 'a',
+     OSImpl.iOS: 'a',
+     OSImpl.linux: 'a',
+@@ -163,6 +174,7 @@ final class OSImpl implements OS {
+   /// The default extension for executables per [OSImpl].
+   static const _executableExtension = {
+     OSImpl.android: '',
++    OSImpl.ohos: '',
+     OSImpl.fuchsia: '',
+     OSImpl.iOS: '',
+     OSImpl.linux: '',
+diff --git a/pkgs/native_assets_cli/lib/src/model/target.dart b/pkgs/native_assets_cli/lib/src/model/target.dart
+index 18cdc977..4f9f3ea4 100644
+--- a/pkgs/native_assets_cli/lib/src/model/target.dart
++++ b/pkgs/native_assets_cli/lib/src/model/target.dart
+@@ -53,6 +53,8 @@ final class Target implements Comparable<Target> {
+   static const androidIA32 = Target._(Abi.androidIA32);
+   static const androidX64 = Target._(Abi.androidX64);
+   static const androidRiscv64 = Target._(Abi.androidRiscv64);
++  static const ohosArm = Target._(Abi.ohosArm);
++  static const ohosArm64 = Target._(Abi.ohosArm64);
+   static const fuchsiaArm64 = Target._(Abi.fuchsiaArm64);
+   static const fuchsiaX64 = Target._(Abi.fuchsiaX64);
+   static const iOSArm = Target._(Abi.iosArm);
+@@ -76,6 +78,8 @@ final class Target implements Comparable<Target> {
+     androidIA32,
+     androidX64,
+     androidRiscv64,
++    ohosArm,
++    ohosArm64,
+     fuchsiaArm64,
+     fuchsiaX64,
+     iOSArm,
diff --git a/attachment/repos/skia-3.22.patch b/attachment/repos/skia-3.22.patch
new file mode 100644
index 0000000000000000000000000000000000000000..fc5cb3d9b76eed4bd931a217cc47a10b2ea76e22
--- /dev/null
+++ b/attachment/repos/skia-3.22.patch
@@ -0,0 +1,3940 @@
+diff --git a/BUILD.gn b/BUILD.gn
+index c513271c34..73c378fbf6 100644
+--- a/BUILD.gn
++++ b/BUILD.gn
+@@ -25,7 +25,8 @@ import("gn/ios.gni")
+ 
+ # Skia public API, generally provided by :skia.
+ config("skia_public") {
+-  include_dirs = [ "." ]
++  include_dirs = [ ".", 
++    "//third_part/khronos/", ]
+ 
+   defines = [
+     "SK_CODEC_DECODES_BMP",
+@@ -35,11 +36,23 @@ config("skia_public") {
+   if (is_component_build) {
+     defines += [ "SKIA_DLL" ]
+   }
+-  if (is_fuchsia || is_linux) {
++  if (is_fuchsia || is_linux || is_ohos) {
+     defines += [ "SK_R32_SHIFT=16" ]
+   }
++
++  if( is_ohos && !is_win ) {
++    defines += [ 
++      "TARGET_OS_OHOS",
++      "SK_BUILD_FOR_OHOS"
++    ]
++  }
++  if (!skia_enable_gpu) {
++    defines += [ "SK_SUPPORT_GPU=0" ]
++  }
+   if (skia_enable_optimize_size) {
+-    defines += [ "SK_ENABLE_OPTIMIZE_SIZE" ]
++    defines += [
++      "SK_ENABLE_OPTIMIZE_SIZE",
++    ]
+   }
+   if (skia_enable_precompile) {
+     defines += [ "SK_ENABLE_PRECOMPILE" ]
+@@ -316,6 +329,46 @@ optional("fontmgr_android") {
+   sources_for_tests = [ "tests/FontMgrAndroidParserTest.cpp" ]
+ }
+ 
++optional("fontmgr_ohos") {
++  enabled = skia_enable_fontmgr_ohos
++  deps = [
++    ":typeface_freetype",
++    "//third_party/expat",
++    "//third_party/jsoncpp:jsoncpp",
++  ]
++  public = [
++    "src/ports/skia_ohos/FontConfig_ohos.h",
++    "src/ports/skia_ohos/FontInfo_ohos.h",
++    "src/ports/skia_ohos/SkFontMgr_ohos.h",
++    "src/ports/skia_ohos/SkFontStyleSet_ohos.h",
++    "src/ports/skia_ohos/SkTypeface_ohos.h",
++  ]
++  sources = [
++    "src/ports/skia_ohos/FontConfig_ohos.cpp",
++    "src/ports/skia_ohos/SkFontMgr_ohos.cpp",
++    "src/ports/skia_ohos/SkFontStyleSet_ohos.cpp",
++    "src/ports/skia_ohos/SkTypeface_ohos.cpp",
++    "//third_party/vulkan-deps/spirv-headers/src/tools/buildHeaders/jsoncpp/dist/jsoncpp.cpp",
++  ]
++  include_dirs = [
++    "//third_party/skia/include/private",
++    "//third_party/skia/include/private/base",
++    "//third_party/skia/include/ports",
++    "//third_party/skia/include/core",
++    "//third_party/skia/src/core",
++    "//third_party/skia/src/ports",
++    "//third_party/skia/src/ports/skia_ohos",
++    "//third_party/vulkan-deps/spirv-headers/src/tools/buildHeaders/jsoncpp/dist/",
++    "//third_party/skia/src/core/SkFontDescriptor.h"
++  ]
++}
++
++optional("fontmgr_ohos_factory") {
++  enabled = skia_enable_fontmgr_ohos
++  deps = [ ":fontmgr_ohos" ]
++  sources = [ "src/ports/skia_ohos/SkFontMgr_ohos_factory.cpp" ]
++}
++
+ optional("fontmgr_custom") {
+   enabled =
+       skia_enable_fontmgr_custom_directory ||
+@@ -593,7 +646,7 @@ if (skia_compile_modules) {
+       sources += [ "tools/SkGetExecutablePath_win.cpp" ]
+     } else if (is_mac || is_ios) {
+       sources += [ "tools/SkGetExecutablePath_mac.cpp" ]
+-    } else if (is_linux || is_android) {
++    } else if (is_linux || is_android || is_ohos) {
+       sources += [ "tools/SkGetExecutablePath_linux.cpp" ]
+     }
+     if (is_win) {
+@@ -721,7 +774,7 @@ if (skia_compile_sksl_tests) {
+       sources += [ "tools/SkGetExecutablePath_win.cpp" ]
+     } else if (is_mac || is_ios) {
+       sources += [ "tools/SkGetExecutablePath_mac.cpp" ]
+-    } else if (is_linux || is_android) {
++    } else if (is_linux || is_android || is_ohos) {
+       sources += [ "tools/SkGetExecutablePath_linux.cpp" ]
+     }
+     if (is_win) {
+@@ -994,7 +1047,7 @@ optional("gpu") {
+       }
+     } else if (skia_use_webgl) {
+       sources += [ "src/gpu/ganesh/gl/webgl/GrGLMakeNativeInterface_webgl.cpp" ]
+-    } else if (is_linux && skia_use_x11) {
++    } else if ((is_linux || is_ohos) && skia_use_x11) {
+       sources += [
+         "src/gpu/ganesh/gl/glx/GrGLMakeGLXInterface.cpp",
+         "src/gpu/ganesh/gl/glx/GrGLMakeNativeInterface_glx.cpp",
+@@ -1009,8 +1062,16 @@ optional("gpu") {
+       if (target_cpu != "arm64") {
+         libs += [ "OpenGL32.lib" ]
+       }
+-    } else {
+-      sources += [ "src/gpu/ganesh/gl/GrGLMakeNativeInterface_none.cpp" ]
++    } else if( is_ohos){
++      libs += [ "EGL" ,"GLESv3"]
++      sources += [
++        "src/gpu/ganesh/gl/egl/GrGLMakeEGLInterface.cpp",
++        "src/gpu/ganesh/gl/egl/GrGLMakeNativeInterface_egl.cpp",
++      ]
++    }else {
++         sources += [
++        "src/gpu/ganesh/gl/GrGLMakeNativeInterface_none.cpp",
++      ]
+     }
+     public += skia_gpu_gl_public
+     sources += skia_gpu_gl_private
+@@ -1454,6 +1515,7 @@ skia_component("skia") {
+     ":fontmgr_fuchsia",
+     ":fontmgr_mac_ct",
+     ":fontmgr_win",
++    ":fontmgr_ohos",
+     ":fontmgr_win_gdi",
+     ":gpu",
+     ":graphite",
+@@ -1545,6 +1607,7 @@ skia_component("skia") {
+     libs += [
+       "Ole32.lib",
+       "OleAut32.lib",
++      "OpenGL32.lib",
+     ]
+ 
+     if (!skia_enable_winuwp) {
+@@ -1575,6 +1638,15 @@ skia_component("skia") {
+     ]
+   }
+ 
++  if (is_ohos) {
++    sources += [ "src/ports/SkDebug_ohos.cpp" ]
++    libs += [
++      "EGL",
++      "GLESv3",
++      "hilog_ndk.z" 
++    ]
++  }
++
+   if (is_linux || is_wasm) {
+     sources += [ "src/ports/SkDebug_stdio.cpp" ]
+     if (skia_use_egl) {
+@@ -1992,7 +2064,7 @@ if (skia_enable_tools) {
+       if (is_android || skia_use_egl) {
+         sources += [ "tools/gpu/gl/egl/CreatePlatformGLTestContext_egl.cpp" ]
+         libs += [ "EGL" ]
+-      } else if (is_linux) {
++      } else if (is_linux || is_ohos) {
+         sources += [ "tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp" ]
+         libs += [
+           "GLU",
+@@ -2357,7 +2429,7 @@ if (skia_enable_tools) {
+     ]
+   }
+ 
+-  if (is_linux || is_mac || skia_enable_optimize_size) {
++  if (is_linux || is_mac || skia_enable_optimize_size || is_ohos) {
+     if (skia_enable_skottie) {
+       test_app("skottie_tool") {
+         deps = [ "modules/skottie:tool" ]
+@@ -2802,7 +2874,7 @@ if (skia_enable_tools) {
+         "tools/sk_app/android/surface_glue_android.h",
+       ]
+       libs += [ "android" ]
+-    } else if (is_linux) {
++    } else if (is_linux || is_ohos) {
+       sources += [
+         "tools/SkGetExecutablePath_linux.cpp",
+         "tools/sk_app/unix/Window_unix.cpp",
+@@ -2844,6 +2916,103 @@ if (skia_enable_tools) {
+       frameworks += [ "QuartzCore.framework" ]
+     }
+ 
++    if (skia_use_gl) {
++      sources += [ "tools/sk_app/GLWindowContext.cpp" ]
++      sources += [ "tools/sk_app/GLWindowContext.h" ]
++      if (is_android) {
++        sources += [ "tools/sk_app/android/GLWindowContext_android.cpp" ]
++      } else if (is_linux || is_ohos) {
++        sources += [ "tools/sk_app/unix/GLWindowContext_unix.cpp" ]
++      } else if (is_win) {
++        sources += [ "tools/sk_app/win/GLWindowContext_win.cpp" ]
++        if (skia_use_angle) {
++          sources += [ "tools/sk_app/win/ANGLEWindowContext_win.cpp" ]
++        }
++      } else if (is_mac) {
++        sources += [
++          "tools/sk_app/mac/GLWindowContext_mac.mm",
++          "tools/sk_app/mac/RasterWindowContext_mac.mm",
++        ]
++      } else if (is_ios) {
++        sources += [
++          "tools/sk_app/ios/GLWindowContext_ios.mm",
++          "tools/sk_app/ios/RasterWindowContext_ios.mm",
++        ]
++      }
++    }
++
++    if (skia_use_vulkan) {
++      sources += [ "tools/sk_app/VulkanWindowContext.cpp" ]
++      sources += [ "tools/sk_app/VulkanWindowContext.h" ]
++      if (is_android) {
++        sources += [ "tools/sk_app/android/VulkanWindowContext_android.cpp" ]
++      } else if (is_linux || is_ohos) {
++        sources += [ "tools/sk_app/unix/VulkanWindowContext_unix.cpp" ]
++        libs += [ "X11-xcb" ]
++      } else if (is_win) {
++        sources += [ "tools/sk_app/win/VulkanWindowContext_win.cpp" ]
++      }
++    }
++
++    if (skia_use_metal) {
++      sources += [ "tools/sk_app/MetalWindowContext.mm" ]
++      sources += [ "tools/sk_app/MetalWindowContext.h" ]
++      if (skia_enable_graphite) {
++        sources += [ "tools/sk_app/GraphiteMetalWindowContext.mm" ]
++        sources += [ "tools/sk_app/GraphiteMetalWindowContext.h" ]
++      }
++      if (is_mac) {
++        sources += [ "tools/sk_app/mac/MetalWindowContext_mac.mm" ]
++        if (skia_enable_graphite) {
++          sources += [ "tools/sk_app/mac/GraphiteMetalWindowContext_mac.mm" ]
++        }
++      } else if (is_ios) {
++        sources += [ "tools/sk_app/ios/MetalWindowContext_ios.mm" ]
++      }
++    }
++
++    if (skia_use_direct3d) {
++      sources += [ "tools/sk_app/win/D3D12WindowContext_win.cpp" ]
++    }
++
++    if (skia_use_dawn) {
++      sources += [ "tools/sk_app/DawnWindowContext.cpp" ]
++      sources += [ "tools/sk_app/DawnWindowContext.h" ]
++      if (is_linux || is_ohos) {
++        if (dawn_enable_vulkan) {
++          sources += [ "tools/sk_app/unix/DawnVulkanWindowContext_unix.cpp" ]
++          defines = [ "VK_USE_PLATFORM_XCB_KHR" ]
++          libs += [ "X11-xcb" ]
++          if (skia_enable_graphite) {
++            sources +=
++                [ "tools/sk_app/unix/GraphiteDawnVulkanWindowContext_unix.cpp" ]
++            sources += [ "tools/sk_app/GraphiteDawnWindowContext.cpp" ]
++            sources += [ "tools/sk_app/GraphiteDawnWindowContext.h" ]
++          }
++        }
++      } else if (is_win) {
++        if (dawn_enable_d3d12) {
++          sources += [ "tools/sk_app/win/DawnD3D12WindowContext_win.cpp" ]
++          if (skia_enable_graphite) {
++            sources +=
++                [ "tools/sk_app/win/GraphiteDawnD3D12WindowContext_win.cpp" ]
++            sources += [ "tools/sk_app/GraphiteDawnWindowContext.cpp" ]
++            sources += [ "tools/sk_app/GraphiteDawnWindowContext.h" ]
++          }
++        }
++      } else if (is_mac) {
++        if (dawn_enable_metal) {
++          sources += [ "tools/sk_app/mac/DawnMTLWindowContext_mac.mm" ]
++          if (skia_enable_graphite) {
++            sources +=
++                [ "tools/sk_app/mac/GraphiteDawnMetalWindowContext_mac.mm" ]
++            sources += [ "tools/sk_app/GraphiteDawnWindowContext.cpp" ]
++            sources += [ "tools/sk_app/GraphiteDawnWindowContext.h" ]
++          }
++        }
++      }
++    }
++
+     deps = [
+       ":tool_utils",
+       "tools/window",
+@@ -2856,7 +3025,7 @@ if (skia_enable_tools) {
+     }
+   }
+ 
+-  if (!skia_use_vulkan && (is_mac || is_linux || is_win)) {
++  if (!skia_use_vulkan && (is_mac || is_linux || is_win || is_ohos)) {
+     test_app("fiddle_examples") {
+       sources = [
+         "tools/fiddle/all_examples.cpp",
+@@ -3010,7 +3179,7 @@ if (skia_enable_tools) {
+     }
+   }
+ 
+-  if (skia_use_gl && !skia_use_angle && (is_linux || is_win || is_mac)) {
++  if (skia_use_gl && !skia_use_angle && (is_linux || is_win || is_mac || is_ohos)) {
+     test_app("HelloWorld") {
+       sources = [ "example/HelloWorld.cpp" ]
+       libs = []
+diff --git a/gn/BUILDCONFIG.gn b/gn/BUILDCONFIG.gn
+index f17c7d8d2f..c7522b9d5a 100644
+--- a/gn/BUILDCONFIG.gn
++++ b/gn/BUILDCONFIG.gn
+@@ -70,6 +70,7 @@ is_linux = current_os == "linux"
+ is_mac = current_os == "mac"
+ is_wasm = current_os == "wasm"
+ is_win = current_os == "win"
++is_ohos = current_os == "ohos"
+ 
+ # This is just to make the Dawn build files happy. Skia itself uses target_os = "linux"
+ # for ChromeOS, so this variable will not affect Skia proper.
+diff --git a/gn/skia.gni b/gn/skia.gni
+index 769d3240bd..623869386d 100644
+--- a/gn/skia.gni
++++ b/gn/skia.gni
+@@ -20,6 +20,8 @@ declare_args() {
+   skia_enable_fontmgr_fuchsia = is_fuchsia
+   skia_enable_fontmgr_win = is_win
+   skia_enable_gpu_debug_layers = is_skia_dev_build && is_debug
++  skia_enable_fontmgr_ohos = is_ohos
++  skia_enable_gpu = true
+   skia_enable_optimize_size = false
+   skia_enable_pdf = !is_wasm
+   skia_enable_precompile = true
+@@ -46,10 +48,10 @@ declare_args() {
+   skia_use_expat = !is_wasm
+   skia_use_ffmpeg = false
+   skia_use_fixed_gamma_text = is_android
+-  skia_use_fontconfig = is_linux
++  skia_use_fontconfig = is_linux || is_ohos
+   skia_use_fontations = false
+   skia_use_fonthost_mac = is_mac || is_ios
+-  skia_use_freetype = is_android || is_fuchsia || is_linux || is_wasm
++  skia_use_freetype = is_android || is_fuchsia || is_linux || is_wasm || is_ohos
+   skia_use_harfbuzz = true
+   skia_use_gl = !is_fuchsia
+   skia_use_icu = !is_fuchsia
+@@ -71,7 +73,7 @@ declare_args() {
+   skia_use_lua = is_skia_dev_build && !is_ios
+   skia_use_metal = false
+   skia_use_ndk_images = is_android && defined(ndk_api) && ndk_api >= 30
+-  skia_use_perfetto = is_linux || is_mac || is_android
++  skia_use_perfetto = is_linux || is_mac || is_android || is_ohos
+ 
+   # Currently only supported in Android framework
+   skia_android_framework_use_perfetto = false
+@@ -80,7 +82,7 @@ declare_args() {
+   skia_use_webgl = is_wasm
+   skia_use_webgpu = is_wasm
+   skia_use_wuffs = true
+-  skia_use_x11 = is_linux
++  skia_use_x11 = is_linux || is_ohos
+   skia_use_xps = true
+ 
+   # Use the safe mode for libcxx
+@@ -144,6 +146,8 @@ declare_args() {
+ }
+ 
+ declare_args() {
++#  skia_enable_fontmgr_ohos = is_ohos
++  skia_use_freetype2 = true
+   skia_enable_fontmgr_android = skia_use_expat && skia_use_freetype
+   skia_enable_fontmgr_custom_directory =
+       skia_use_freetype && !is_fuchsia && !is_wasm
+@@ -169,6 +173,33 @@ declare_args() {
+ 
+   # libgrapheme sources
+   skia_libgrapheme_third_party_dir = "//third_party/libgrapheme"
++  }
++  
++declare_args() {
++  # skia_fontmgr_factory should define SkFontMgr::Factory()
++  if (is_ohos) {
++    skia_fontmgr_factory = ":fontmgr_ohos_factory"
++  } else if (skia_enable_fontmgr_empty) {
++    skia_fontmgr_factory = ":fontmgr_empty_factory"
++  } else if (is_android && skia_enable_fontmgr_android) {
++    skia_fontmgr_factory = ":fontmgr_android_factory"
++  } else if (is_win && skia_enable_fontmgr_win) {
++    skia_fontmgr_factory = ":fontmgr_win_factory"
++  } else if ((is_mac || is_ios) && skia_use_fonthost_mac) {
++    skia_fontmgr_factory = ":fontmgr_mac_ct_factory"
++  } else if (skia_enable_fontmgr_fontconfig) {
++    skia_fontmgr_factory = ":fontmgr_fontconfig_factory"
++  } else if (skia_enable_fontmgr_custom_directory) {
++    skia_fontmgr_factory = ":fontmgr_custom_directory_factory"
++  } else if (skia_enable_fontmgr_custom_embedded) {
++    skia_fontmgr_factory = ":fontmgr_custom_embedded_factory"
++  } else if (skia_enable_fontmgr_custom_empty) {
++    skia_fontmgr_factory = ":fontmgr_custom_empty_factory"
++  } else {
++    #"src/ports/SkFontMgr_FontConfigInterface_factory.cpp" #WontFix
++    #"src/ports/SkFontMgr_win_gdi_factory.cpp" # WontFix
++    skia_fontmgr_factory = ":fontmgr_empty_factory"
++  }
+ }
+ 
+ assert(!skia_use_dawn || skia_enable_graphite)  # Dawn is Graphite-only
+diff --git a/gn/skia/BUILD.gn b/gn/skia/BUILD.gn
+index fc5c2ad4de..f82fdc36bd 100644
+--- a/gn/skia/BUILD.gn
++++ b/gn/skia/BUILD.gn
+@@ -256,7 +256,7 @@ config("default") {
+     }
+   }
+ 
+-  if (is_linux) {
++  if (is_linux || is_ohos) {
+     libs += [ "pthread" ]
+   }
+ 
+@@ -372,7 +372,7 @@ config("default") {
+       ldflags += [ "-fsanitize=$sanitizers" ]
+     }
+ 
+-    if (is_linux) {
++    if (is_linux || is_ohos) {
+       cflags_cc += [ "-stdlib=libc++" ]
+       ldflags += [ "-stdlib=libc++" ]
+     }
+@@ -749,7 +749,7 @@ config("executable") {
+     ]
+   } else if (is_mac) {
+     ldflags = [ "-Wl,-rpath,@loader_path/." ]
+-  } else if (is_linux) {
++  } else if (is_linux || is_ohos) {
+     ldflags = [
+       "-rdynamic",
+       "-Wl,-rpath,\$ORIGIN",
+diff --git a/include/ports/SkFontMgr_ohos_api.h b/include/ports/SkFontMgr_ohos_api.h
+new file mode 100644
+index 0000000000..4199b4ad96
+--- /dev/null
++++ b/include/ports/SkFontMgr_ohos_api.h
+@@ -0,0 +1,12 @@
++#ifndef SkFontMgr_ohos_api_DEFINED
++#define SkFontMgr_ohos_api_DEFINED
++
++#include "include/core/SkRefCnt.h"
++
++class SkFontMgr;
++class SkFontScanner;
++
++SK_API sk_sp<SkFontMgr> SkFontMgr_New_OHOS(const char* path);
++SK_API sk_sp<SkFontMgr> SkFontMgr_New_OHOS();
++
++#endif // SkFontMgr_ohos_api_DEFINED
+diff --git a/src/gpu/ganesh/gl/egl/gl2.h b/src/gpu/ganesh/gl/egl/gl2.h
+new file mode 100644
+index 0000000000..176023660e
+--- /dev/null
++++ b/src/gpu/ganesh/gl/egl/gl2.h
+@@ -0,0 +1,678 @@
++#ifndef __gles2_gl2_h_
++#define __gles2_gl2_h_ 1
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++/*
++** Copyright (c) 2013-2018 The Khronos Group Inc.
++**
++** Permission is hereby granted, free of charge, to any person obtaining a
++** copy of this software and/or associated documentation files (the
++** "Materials"), to deal in the Materials without restriction, including
++** without limitation the rights to use, copy, modify, merge, publish,
++** distribute, sublicense, and/or sell copies of the Materials, and to
++** permit persons to whom the Materials are furnished to do so, subject to
++** the following conditions:
++**
++** The above copyright notice and this permission notice shall be included
++** in all copies or substantial portions of the Materials.
++**
++** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
++** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
++** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
++** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
++*/
++/*
++** This header is generated from the Khronos OpenGL / OpenGL ES XML
++** API Registry. The current version of the Registry, generator scripts
++** used to make the header, and the header can be found at
++**   https://github.com/KhronosGroup/OpenGL-Registry
++*/
++
++/* Chromium-specific GLES2 declarations */
++// #include <GLES2/gl2chromium.h>
++
++#include "gl2platform.h"
++
++#ifndef GL_APIENTRYP
++#define GL_APIENTRYP GL_APIENTRY*
++#endif
++
++#ifndef GL_GLES_PROTOTYPES
++#define GL_GLES_PROTOTYPES 1
++#endif
++
++/* Generated on date 20190911 */
++
++/* Generated C header for:
++ * API: gles2
++ * Profile: common
++ * Versions considered: 2\.[0-9]
++ * Versions emitted: .*
++ * Default extensions included: None
++ * Additional extensions included: _nomatch_^
++ * Extensions removed: _nomatch_^
++ */
++
++#ifndef GL_ES_VERSION_2_0
++#define GL_ES_VERSION_2_0 1
++#include <KHR/khrplatform.h>
++typedef khronos_int8_t GLbyte;
++typedef khronos_float_t GLclampf;
++typedef khronos_int32_t GLfixed;
++typedef khronos_int16_t GLshort;
++typedef khronos_uint16_t GLushort;
++typedef void GLvoid;
++typedef struct __GLsync *GLsync;
++typedef khronos_int64_t GLint64;
++typedef khronos_uint64_t GLuint64;
++typedef unsigned int GLenum;
++typedef unsigned int GLuint;
++typedef char GLchar;
++typedef khronos_float_t GLfloat;
++typedef khronos_ssize_t GLsizeiptr;
++typedef khronos_intptr_t GLintptr;
++typedef unsigned int GLbitfield;
++typedef int GLint;
++typedef unsigned char GLboolean;
++typedef int GLsizei;
++typedef khronos_uint8_t GLubyte;
++#define GL_DEPTH_BUFFER_BIT               0x00000100
++#define GL_STENCIL_BUFFER_BIT             0x00000400
++#define GL_COLOR_BUFFER_BIT               0x00004000
++#define GL_FALSE                          0
++#define GL_TRUE                           1
++#define GL_POINTS                         0x0000
++#define GL_LINES                          0x0001
++#define GL_LINE_LOOP                      0x0002
++#define GL_LINE_STRIP                     0x0003
++#define GL_TRIANGLES                      0x0004
++#define GL_TRIANGLE_STRIP                 0x0005
++#define GL_TRIANGLE_FAN                   0x0006
++#define GL_ZERO                           0
++#define GL_ONE                            1
++#define GL_SRC_COLOR                      0x0300
++#define GL_ONE_MINUS_SRC_COLOR            0x0301
++#define GL_SRC_ALPHA                      0x0302
++#define GL_ONE_MINUS_SRC_ALPHA            0x0303
++#define GL_DST_ALPHA                      0x0304
++#define GL_ONE_MINUS_DST_ALPHA            0x0305
++#define GL_DST_COLOR                      0x0306
++#define GL_ONE_MINUS_DST_COLOR            0x0307
++#define GL_SRC_ALPHA_SATURATE             0x0308
++#define GL_FUNC_ADD                       0x8006
++#define GL_BLEND_EQUATION                 0x8009
++#define GL_BLEND_EQUATION_RGB             0x8009
++#define GL_BLEND_EQUATION_ALPHA           0x883D
++#define GL_FUNC_SUBTRACT                  0x800A
++#define GL_FUNC_REVERSE_SUBTRACT          0x800B
++#define GL_BLEND_DST_RGB                  0x80C8
++#define GL_BLEND_SRC_RGB                  0x80C9
++#define GL_BLEND_DST_ALPHA                0x80CA
++#define GL_BLEND_SRC_ALPHA                0x80CB
++#define GL_CONSTANT_COLOR                 0x8001
++#define GL_ONE_MINUS_CONSTANT_COLOR       0x8002
++#define GL_CONSTANT_ALPHA                 0x8003
++#define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
++#define GL_BLEND_COLOR                    0x8005
++#define GL_ARRAY_BUFFER                   0x8892
++#define GL_ELEMENT_ARRAY_BUFFER           0x8893
++#define GL_ARRAY_BUFFER_BINDING           0x8894
++#define GL_ELEMENT_ARRAY_BUFFER_BINDING   0x8895
++#define GL_STREAM_DRAW                    0x88E0
++#define GL_STATIC_DRAW                    0x88E4
++#define GL_DYNAMIC_DRAW                   0x88E8
++#define GL_BUFFER_SIZE                    0x8764
++#define GL_BUFFER_USAGE                   0x8765
++#define GL_CURRENT_VERTEX_ATTRIB          0x8626
++#define GL_FRONT                          0x0404
++#define GL_BACK                           0x0405
++#define GL_FRONT_AND_BACK                 0x0408
++#define GL_TEXTURE_2D                     0x0DE1
++#define GL_CULL_FACE                      0x0B44
++#define GL_BLEND                          0x0BE2
++#define GL_DITHER                         0x0BD0
++#define GL_STENCIL_TEST                   0x0B90
++#define GL_DEPTH_TEST                     0x0B71
++#define GL_SCISSOR_TEST                   0x0C11
++#define GL_POLYGON_OFFSET_FILL            0x8037
++#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
++#define GL_SAMPLE_COVERAGE                0x80A0
++#define GL_NO_ERROR                       0
++#define GL_INVALID_ENUM                   0x0500
++#define GL_INVALID_VALUE                  0x0501
++#define GL_INVALID_OPERATION              0x0502
++#define GL_OUT_OF_MEMORY                  0x0505
++#define GL_CW                             0x0900
++#define GL_CCW                            0x0901
++#define GL_LINE_WIDTH                     0x0B21
++#define GL_ALIASED_POINT_SIZE_RANGE       0x846D
++#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
++#define GL_CULL_FACE_MODE                 0x0B45
++#define GL_FRONT_FACE                     0x0B46
++#define GL_DEPTH_RANGE                    0x0B70
++#define GL_DEPTH_WRITEMASK                0x0B72
++#define GL_DEPTH_CLEAR_VALUE              0x0B73
++#define GL_DEPTH_FUNC                     0x0B74
++#define GL_STENCIL_CLEAR_VALUE            0x0B91
++#define GL_STENCIL_FUNC                   0x0B92
++#define GL_STENCIL_FAIL                   0x0B94
++#define GL_STENCIL_PASS_DEPTH_FAIL        0x0B95
++#define GL_STENCIL_PASS_DEPTH_PASS        0x0B96
++#define GL_STENCIL_REF                    0x0B97
++#define GL_STENCIL_VALUE_MASK             0x0B93
++#define GL_STENCIL_WRITEMASK              0x0B98
++#define GL_STENCIL_BACK_FUNC              0x8800
++#define GL_STENCIL_BACK_FAIL              0x8801
++#define GL_STENCIL_BACK_PASS_DEPTH_FAIL   0x8802
++#define GL_STENCIL_BACK_PASS_DEPTH_PASS   0x8803
++#define GL_STENCIL_BACK_REF               0x8CA3
++#define GL_STENCIL_BACK_VALUE_MASK        0x8CA4
++#define GL_STENCIL_BACK_WRITEMASK         0x8CA5
++#define GL_VIEWPORT                       0x0BA2
++#define GL_SCISSOR_BOX                    0x0C10
++#define GL_COLOR_CLEAR_VALUE              0x0C22
++#define GL_COLOR_WRITEMASK                0x0C23
++#define GL_UNPACK_ALIGNMENT               0x0CF5
++#define GL_PACK_ALIGNMENT                 0x0D05
++#define GL_MAX_TEXTURE_SIZE               0x0D33
++#define GL_MAX_VIEWPORT_DIMS              0x0D3A
++#define GL_SUBPIXEL_BITS                  0x0D50
++#define GL_RED_BITS                       0x0D52
++#define GL_GREEN_BITS                     0x0D53
++#define GL_BLUE_BITS                      0x0D54
++#define GL_ALPHA_BITS                     0x0D55
++#define GL_DEPTH_BITS                     0x0D56
++#define GL_STENCIL_BITS                   0x0D57
++#define GL_POLYGON_OFFSET_UNITS           0x2A00
++#define GL_POLYGON_OFFSET_FACTOR          0x8038
++#define GL_TEXTURE_BINDING_2D             0x8069
++#define GL_SAMPLE_BUFFERS                 0x80A8
++#define GL_SAMPLES                        0x80A9
++#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
++#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
++#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
++#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
++#define GL_DONT_CARE                      0x1100
++#define GL_FASTEST                        0x1101
++#define GL_NICEST                         0x1102
++#define GL_GENERATE_MIPMAP_HINT           0x8192
++#define GL_BYTE                           0x1400
++#define GL_UNSIGNED_BYTE                  0x1401
++#define GL_SHORT                          0x1402
++#define GL_UNSIGNED_SHORT                 0x1403
++#define GL_INT                            0x1404
++#define GL_UNSIGNED_INT                   0x1405
++#define GL_FLOAT                          0x1406
++#define GL_FIXED                          0x140C
++#define GL_DEPTH_COMPONENT                0x1902
++#define GL_ALPHA                          0x1906
++#define GL_RGB                            0x1907
++#define GL_RGBA                           0x1908
++#define GL_LUMINANCE                      0x1909
++#define GL_LUMINANCE_ALPHA                0x190A
++#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
++#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
++#define GL_UNSIGNED_SHORT_5_6_5           0x8363
++#define GL_FRAGMENT_SHADER                0x8B30
++#define GL_VERTEX_SHADER                  0x8B31
++#define GL_MAX_VERTEX_ATTRIBS             0x8869
++#define GL_MAX_VERTEX_UNIFORM_VECTORS     0x8DFB
++#define GL_MAX_VARYING_VECTORS            0x8DFC
++#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
++#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
++#define GL_MAX_TEXTURE_IMAGE_UNITS        0x8872
++#define GL_MAX_FRAGMENT_UNIFORM_VECTORS   0x8DFD
++#define GL_SHADER_TYPE                    0x8B4F
++#define GL_DELETE_STATUS                  0x8B80
++#define GL_LINK_STATUS                    0x8B82
++#define GL_VALIDATE_STATUS                0x8B83
++#define GL_ATTACHED_SHADERS               0x8B85
++#define GL_ACTIVE_UNIFORMS                0x8B86
++#define GL_ACTIVE_UNIFORM_MAX_LENGTH      0x8B87
++#define GL_ACTIVE_ATTRIBUTES              0x8B89
++#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH    0x8B8A
++#define GL_SHADING_LANGUAGE_VERSION       0x8B8C
++#define GL_CURRENT_PROGRAM                0x8B8D
++#define GL_NEVER                          0x0200
++#define GL_LESS                           0x0201
++#define GL_EQUAL                          0x0202
++#define GL_LEQUAL                         0x0203
++#define GL_GREATER                        0x0204
++#define GL_NOTEQUAL                       0x0205
++#define GL_GEQUAL                         0x0206
++#define GL_ALWAYS                         0x0207
++#define GL_KEEP                           0x1E00
++#define GL_REPLACE                        0x1E01
++#define GL_INCR                           0x1E02
++#define GL_DECR                           0x1E03
++#define GL_INVERT                         0x150A
++#define GL_INCR_WRAP                      0x8507
++#define GL_DECR_WRAP                      0x8508
++#define GL_VENDOR                         0x1F00
++#define GL_RENDERER                       0x1F01
++#define GL_VERSION                        0x1F02
++#define GL_EXTENSIONS                     0x1F03
++#define GL_NEAREST                        0x2600
++#define GL_LINEAR                         0x2601
++#define GL_NEAREST_MIPMAP_NEAREST         0x2700
++#define GL_LINEAR_MIPMAP_NEAREST          0x2701
++#define GL_NEAREST_MIPMAP_LINEAR          0x2702
++#define GL_LINEAR_MIPMAP_LINEAR           0x2703
++#define GL_TEXTURE_MAG_FILTER             0x2800
++#define GL_TEXTURE_MIN_FILTER             0x2801
++#define GL_TEXTURE_WRAP_S                 0x2802
++#define GL_TEXTURE_WRAP_T                 0x2803
++#define GL_TEXTURE                        0x1702
++#define GL_TEXTURE_CUBE_MAP               0x8513
++#define GL_TEXTURE_BINDING_CUBE_MAP       0x8514
++#define GL_TEXTURE_CUBE_MAP_POSITIVE_X    0x8515
++#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X    0x8516
++#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y    0x8517
++#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y    0x8518
++#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z    0x8519
++#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z    0x851A
++#define GL_MAX_CUBE_MAP_TEXTURE_SIZE      0x851C
++#define GL_TEXTURE0                       0x84C0
++#define GL_TEXTURE1                       0x84C1
++#define GL_TEXTURE2                       0x84C2
++#define GL_TEXTURE3                       0x84C3
++#define GL_TEXTURE4                       0x84C4
++#define GL_TEXTURE5                       0x84C5
++#define GL_TEXTURE6                       0x84C6
++#define GL_TEXTURE7                       0x84C7
++#define GL_TEXTURE8                       0x84C8
++#define GL_TEXTURE9                       0x84C9
++#define GL_TEXTURE10                      0x84CA
++#define GL_TEXTURE11                      0x84CB
++#define GL_TEXTURE12                      0x84CC
++#define GL_TEXTURE13                      0x84CD
++#define GL_TEXTURE14                      0x84CE
++#define GL_TEXTURE15                      0x84CF
++#define GL_TEXTURE16                      0x84D0
++#define GL_TEXTURE17                      0x84D1
++#define GL_TEXTURE18                      0x84D2
++#define GL_TEXTURE19                      0x84D3
++#define GL_TEXTURE20                      0x84D4
++#define GL_TEXTURE21                      0x84D5
++#define GL_TEXTURE22                      0x84D6
++#define GL_TEXTURE23                      0x84D7
++#define GL_TEXTURE24                      0x84D8
++#define GL_TEXTURE25                      0x84D9
++#define GL_TEXTURE26                      0x84DA
++#define GL_TEXTURE27                      0x84DB
++#define GL_TEXTURE28                      0x84DC
++#define GL_TEXTURE29                      0x84DD
++#define GL_TEXTURE30                      0x84DE
++#define GL_TEXTURE31                      0x84DF
++#define GL_ACTIVE_TEXTURE                 0x84E0
++#define GL_REPEAT                         0x2901
++#define GL_CLAMP_TO_EDGE                  0x812F
++#define GL_MIRRORED_REPEAT                0x8370
++#define GL_FLOAT_VEC2                     0x8B50
++#define GL_FLOAT_VEC3                     0x8B51
++#define GL_FLOAT_VEC4                     0x8B52
++#define GL_INT_VEC2                       0x8B53
++#define GL_INT_VEC3                       0x8B54
++#define GL_INT_VEC4                       0x8B55
++#define GL_BOOL                           0x8B56
++#define GL_BOOL_VEC2                      0x8B57
++#define GL_BOOL_VEC3                      0x8B58
++#define GL_BOOL_VEC4                      0x8B59
++#define GL_FLOAT_MAT2                     0x8B5A
++#define GL_FLOAT_MAT3                     0x8B5B
++#define GL_FLOAT_MAT4                     0x8B5C
++#define GL_SAMPLER_2D                     0x8B5E
++#define GL_SAMPLER_CUBE                   0x8B60
++#define GL_VERTEX_ATTRIB_ARRAY_ENABLED    0x8622
++#define GL_VERTEX_ATTRIB_ARRAY_SIZE       0x8623
++#define GL_VERTEX_ATTRIB_ARRAY_STRIDE     0x8624
++#define GL_VERTEX_ATTRIB_ARRAY_TYPE       0x8625
++#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
++#define GL_VERTEX_ATTRIB_ARRAY_POINTER    0x8645
++#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
++#define GL_IMPLEMENTATION_COLOR_READ_TYPE 0x8B9A
++#define GL_IMPLEMENTATION_COLOR_READ_FORMAT 0x8B9B
++#define GL_COMPILE_STATUS                 0x8B81
++#define GL_INFO_LOG_LENGTH                0x8B84
++#define GL_SHADER_SOURCE_LENGTH           0x8B88
++#define GL_SHADER_COMPILER                0x8DFA
++#define GL_SHADER_BINARY_FORMATS          0x8DF8
++#define GL_NUM_SHADER_BINARY_FORMATS      0x8DF9
++#define GL_LOW_FLOAT                      0x8DF0
++#define GL_MEDIUM_FLOAT                   0x8DF1
++#define GL_HIGH_FLOAT                     0x8DF2
++#define GL_LOW_INT                        0x8DF3
++#define GL_MEDIUM_INT                     0x8DF4
++#define GL_HIGH_INT                       0x8DF5
++#define GL_FRAMEBUFFER                    0x8D40
++#define GL_RENDERBUFFER                   0x8D41
++#define GL_RGBA4                          0x8056
++#define GL_RGB5_A1                        0x8057
++#define GL_RGB565                         0x8D62
++#define GL_DEPTH_COMPONENT16              0x81A5
++#define GL_STENCIL_INDEX8                 0x8D48
++#define GL_RENDERBUFFER_WIDTH             0x8D42
++#define GL_RENDERBUFFER_HEIGHT            0x8D43
++#define GL_RENDERBUFFER_INTERNAL_FORMAT   0x8D44
++#define GL_RENDERBUFFER_RED_SIZE          0x8D50
++#define GL_RENDERBUFFER_GREEN_SIZE        0x8D51
++#define GL_RENDERBUFFER_BLUE_SIZE         0x8D52
++#define GL_RENDERBUFFER_ALPHA_SIZE        0x8D53
++#define GL_RENDERBUFFER_DEPTH_SIZE        0x8D54
++#define GL_RENDERBUFFER_STENCIL_SIZE      0x8D55
++#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0
++#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1
++#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2
++#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3
++#define GL_COLOR_ATTACHMENT0              0x8CE0
++#define GL_DEPTH_ATTACHMENT               0x8D00
++#define GL_STENCIL_ATTACHMENT             0x8D20
++#define GL_NONE                           0
++#define GL_FRAMEBUFFER_COMPLETE           0x8CD5
++#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6
++#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7
++#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS 0x8CD9
++#define GL_FRAMEBUFFER_UNSUPPORTED        0x8CDD
++#define GL_FRAMEBUFFER_BINDING            0x8CA6
++#define GL_RENDERBUFFER_BINDING           0x8CA7
++#define GL_MAX_RENDERBUFFER_SIZE          0x84E8
++#define GL_INVALID_FRAMEBUFFER_OPERATION  0x0506
++typedef void (GL_APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
++typedef void (GL_APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
++typedef void (GL_APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar *name);
++typedef void (GL_APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
++typedef void (GL_APIENTRYP PFNGLBINDFRAMEBUFFERPROC) (GLenum target, GLuint framebuffer);
++typedef void (GL_APIENTRYP PFNGLBINDRENDERBUFFERPROC) (GLenum target, GLuint renderbuffer);
++typedef void (GL_APIENTRYP PFNGLBINDTEXTUREPROC) (GLenum target, GLuint texture);
++typedef void (GL_APIENTRYP PFNGLBLENDCOLORPROC) (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
++typedef void (GL_APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
++typedef void (GL_APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha);
++typedef void (GL_APIENTRYP PFNGLBLENDFUNCPROC) (GLenum sfactor, GLenum dfactor);
++typedef void (GL_APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
++typedef void (GL_APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const void *data, GLenum usage);
++typedef void (GL_APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const void *data);
++typedef GLenum (GL_APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSPROC) (GLenum target);
++typedef void (GL_APIENTRYP PFNGLCLEARPROC) (GLbitfield mask);
++typedef void (GL_APIENTRYP PFNGLCLEARCOLORPROC) (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
++typedef void (GL_APIENTRYP PFNGLCLEARDEPTHFPROC) (GLfloat d);
++typedef void (GL_APIENTRYP PFNGLCLEARSTENCILPROC) (GLint s);
++typedef void (GL_APIENTRYP PFNGLCOLORMASKPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
++typedef void (GL_APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader);
++typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
++typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
++typedef void (GL_APIENTRYP PFNGLCOPYTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
++typedef void (GL_APIENTRYP PFNGLCOPYTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
++typedef GLuint (GL_APIENTRYP PFNGLCREATEPROGRAMPROC) (void);
++typedef GLuint (GL_APIENTRYP PFNGLCREATESHADERPROC) (GLenum type);
++typedef void (GL_APIENTRYP PFNGLCULLFACEPROC) (GLenum mode);
++typedef void (GL_APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers);
++typedef void (GL_APIENTRYP PFNGLDELETEFRAMEBUFFERSPROC) (GLsizei n, const GLuint *framebuffers);
++typedef void (GL_APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program);
++typedef void (GL_APIENTRYP PFNGLDELETERENDERBUFFERSPROC) (GLsizei n, const GLuint *renderbuffers);
++typedef void (GL_APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader);
++typedef void (GL_APIENTRYP PFNGLDELETETEXTURESPROC) (GLsizei n, const GLuint *textures);
++typedef void (GL_APIENTRYP PFNGLDEPTHFUNCPROC) (GLenum func);
++typedef void (GL_APIENTRYP PFNGLDEPTHMASKPROC) (GLboolean flag);
++typedef void (GL_APIENTRYP PFNGLDEPTHRANGEFPROC) (GLfloat n, GLfloat f);
++typedef void (GL_APIENTRYP PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader);
++typedef void (GL_APIENTRYP PFNGLDISABLEPROC) (GLenum cap);
++typedef void (GL_APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index);
++typedef void (GL_APIENTRYP PFNGLDRAWARRAYSPROC) (GLenum mode, GLint first, GLsizei count);
++typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices);
++typedef void (GL_APIENTRYP PFNGLENABLEPROC) (GLenum cap);
++typedef void (GL_APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
++typedef void (GL_APIENTRYP PFNGLFINISHPROC) (void);
++typedef void (GL_APIENTRYP PFNGLFLUSHPROC) (void);
++typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFERPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
++typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
++typedef void (GL_APIENTRYP PFNGLFRONTFACEPROC) (GLenum mode);
++typedef void (GL_APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
++typedef void (GL_APIENTRYP PFNGLGENERATEMIPMAPPROC) (GLenum target);
++typedef void (GL_APIENTRYP PFNGLGENFRAMEBUFFERSPROC) (GLsizei n, GLuint *framebuffers);
++typedef void (GL_APIENTRYP PFNGLGENRENDERBUFFERSPROC) (GLsizei n, GLuint *renderbuffers);
++typedef void (GL_APIENTRYP PFNGLGENTEXTURESPROC) (GLsizei n, GLuint *textures);
++typedef void (GL_APIENTRYP PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
++typedef void (GL_APIENTRYP PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
++typedef void (GL_APIENTRYP PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *shaders);
++typedef GLint (GL_APIENTRYP PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name);
++typedef void (GL_APIENTRYP PFNGLGETBOOLEANVPROC) (GLenum pname, GLboolean *data);
++typedef void (GL_APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
++typedef GLenum (GL_APIENTRYP PFNGLGETERRORPROC) (void);
++typedef void (GL_APIENTRYP PFNGLGETFLOATVPROC) (GLenum pname, GLfloat *data);
++typedef void (GL_APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
++typedef void (GL_APIENTRYP PFNGLGETINTEGERVPROC) (GLenum pname, GLint *data);
++typedef void (GL_APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params);
++typedef void (GL_APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
++typedef void (GL_APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
++typedef void (GL_APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
++typedef void (GL_APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
++typedef void (GL_APIENTRYP PFNGLGETSHADERPRECISIONFORMATPROC) (GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision);
++typedef void (GL_APIENTRYP PFNGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
++typedef const GLubyte *(GL_APIENTRYP PFNGLGETSTRINGPROC) (GLenum name);
++typedef void (GL_APIENTRYP PFNGLGETTEXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
++typedef void (GL_APIENTRYP PFNGLGETTEXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
++typedef void (GL_APIENTRYP PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat *params);
++typedef void (GL_APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params);
++typedef GLint (GL_APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name);
++typedef void (GL_APIENTRYP PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat *params);
++typedef void (GL_APIENTRYP PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint *params);
++typedef void (GL_APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, void **pointer);
++typedef void (GL_APIENTRYP PFNGLHINTPROC) (GLenum target, GLenum mode);
++typedef GLboolean (GL_APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer);
++typedef GLboolean (GL_APIENTRYP PFNGLISENABLEDPROC) (GLenum cap);
++typedef GLboolean (GL_APIENTRYP PFNGLISFRAMEBUFFERPROC) (GLuint framebuffer);
++typedef GLboolean (GL_APIENTRYP PFNGLISPROGRAMPROC) (GLuint program);
++typedef GLboolean (GL_APIENTRYP PFNGLISRENDERBUFFERPROC) (GLuint renderbuffer);
++typedef GLboolean (GL_APIENTRYP PFNGLISSHADERPROC) (GLuint shader);
++typedef GLboolean (GL_APIENTRYP PFNGLISTEXTUREPROC) (GLuint texture);
++typedef void (GL_APIENTRYP PFNGLLINEWIDTHPROC) (GLfloat width);
++typedef void (GL_APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program);
++typedef void (GL_APIENTRYP PFNGLPIXELSTOREIPROC) (GLenum pname, GLint param);
++typedef void (GL_APIENTRYP PFNGLPOLYGONOFFSETPROC) (GLfloat factor, GLfloat units);
++typedef void (GL_APIENTRYP PFNGLREADPIXELSPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void *pixels);
++typedef void (GL_APIENTRYP PFNGLRELEASESHADERCOMPILERPROC) (void);
++typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
++typedef void (GL_APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLfloat value, GLboolean invert);
++typedef void (GL_APIENTRYP PFNGLSCISSORPROC) (GLint x, GLint y, GLsizei width, GLsizei height);
++typedef void (GL_APIENTRYP PFNGLSHADERBINARYPROC) (GLsizei count, const GLuint *shaders, GLenum binaryformat, const void *binary, GLsizei length);
++typedef void (GL_APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar *const*string, const GLint *length);
++typedef void (GL_APIENTRYP PFNGLSTENCILFUNCPROC) (GLenum func, GLint ref, GLuint mask);
++typedef void (GL_APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC) (GLenum face, GLenum func, GLint ref, GLuint mask);
++typedef void (GL_APIENTRYP PFNGLSTENCILMASKPROC) (GLuint mask);
++typedef void (GL_APIENTRYP PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask);
++typedef void (GL_APIENTRYP PFNGLSTENCILOPPROC) (GLenum fail, GLenum zfail, GLenum zpass);
++typedef void (GL_APIENTRYP PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
++typedef void (GL_APIENTRYP PFNGLTEXIMAGE2DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels);
++typedef void (GL_APIENTRYP PFNGLTEXPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat param);
++typedef void (GL_APIENTRYP PFNGLTEXPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
++typedef void (GL_APIENTRYP PFNGLTEXPARAMETERIPROC) (GLenum target, GLenum pname, GLint param);
++typedef void (GL_APIENTRYP PFNGLTEXPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
++typedef void (GL_APIENTRYP PFNGLTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
++typedef void (GL_APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
++typedef void (GL_APIENTRYP PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat *value);
++typedef void (GL_APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
++typedef void (GL_APIENTRYP PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint *value);
++typedef void (GL_APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1);
++typedef void (GL_APIENTRYP PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat *value);
++typedef void (GL_APIENTRYP PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1);
++typedef void (GL_APIENTRYP PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint *value);
++typedef void (GL_APIENTRYP PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
++typedef void (GL_APIENTRYP PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat *value);
++typedef void (GL_APIENTRYP PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2);
++typedef void (GL_APIENTRYP PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint *value);
++typedef void (GL_APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
++typedef void (GL_APIENTRYP PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat *value);
++typedef void (GL_APIENTRYP PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
++typedef void (GL_APIENTRYP PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint *value);
++typedef void (GL_APIENTRYP PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
++typedef void (GL_APIENTRYP PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
++typedef void (GL_APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
++typedef void (GL_APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program);
++typedef void (GL_APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program);
++typedef void (GL_APIENTRYP PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x);
++typedef void (GL_APIENTRYP PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat *v);
++typedef void (GL_APIENTRYP PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y);
++typedef void (GL_APIENTRYP PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat *v);
++typedef void (GL_APIENTRYP PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
++typedef void (GL_APIENTRYP PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat *v);
++typedef void (GL_APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
++typedef void (GL_APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v);
++typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer);
++typedef void (GL_APIENTRYP PFNGLVIEWPORTPROC) (GLint x, GLint y, GLsizei width, GLsizei height);
++#if GL_GLES_PROTOTYPES
++GL_APICALL void GL_APIENTRY glActiveTexture (GLenum texture);
++GL_APICALL void GL_APIENTRY glAttachShader (GLuint program, GLuint shader);
++GL_APICALL void GL_APIENTRY glBindAttribLocation (GLuint program, GLuint index, const GLchar *name);
++GL_APICALL void GL_APIENTRY glBindBuffer (GLenum target, GLuint buffer);
++GL_APICALL void GL_APIENTRY glBindFramebuffer (GLenum target, GLuint framebuffer);
++GL_APICALL void GL_APIENTRY glBindRenderbuffer (GLenum target, GLuint renderbuffer);
++GL_APICALL void GL_APIENTRY glBindTexture (GLenum target, GLuint texture);
++GL_APICALL void GL_APIENTRY glBlendColor (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
++GL_APICALL void GL_APIENTRY glBlendEquation (GLenum mode);
++GL_APICALL void GL_APIENTRY glBlendEquationSeparate (GLenum modeRGB, GLenum modeAlpha);
++GL_APICALL void GL_APIENTRY glBlendFunc (GLenum sfactor, GLenum dfactor);
++GL_APICALL void GL_APIENTRY glBlendFuncSeparate (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
++GL_APICALL void GL_APIENTRY glBufferData (GLenum target, GLsizeiptr size, const void *data, GLenum usage);
++GL_APICALL void GL_APIENTRY glBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, const void *data);
++GL_APICALL GLenum GL_APIENTRY glCheckFramebufferStatus (GLenum target);
++GL_APICALL void GL_APIENTRY glClear (GLbitfield mask);
++GL_APICALL void GL_APIENTRY glClearColor (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
++GL_APICALL void GL_APIENTRY glClearDepthf (GLfloat d);
++GL_APICALL void GL_APIENTRY glClearStencil (GLint s);
++GL_APICALL void GL_APIENTRY glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
++GL_APICALL void GL_APIENTRY glCompileShader (GLuint shader);
++GL_APICALL void GL_APIENTRY glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
++GL_APICALL void GL_APIENTRY glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
++GL_APICALL void GL_APIENTRY glCopyTexImage2D (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
++GL_APICALL void GL_APIENTRY glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
++GL_APICALL GLuint GL_APIENTRY glCreateProgram (void);
++GL_APICALL GLuint GL_APIENTRY glCreateShader (GLenum type);
++GL_APICALL void GL_APIENTRY glCullFace (GLenum mode);
++GL_APICALL void GL_APIENTRY glDeleteBuffers (GLsizei n, const GLuint *buffers);
++GL_APICALL void GL_APIENTRY glDeleteFramebuffers (GLsizei n, const GLuint *framebuffers);
++GL_APICALL void GL_APIENTRY glDeleteProgram (GLuint program);
++GL_APICALL void GL_APIENTRY glDeleteRenderbuffers (GLsizei n, const GLuint *renderbuffers);
++GL_APICALL void GL_APIENTRY glDeleteShader (GLuint shader);
++GL_APICALL void GL_APIENTRY glDeleteTextures (GLsizei n, const GLuint *textures);
++GL_APICALL void GL_APIENTRY glDepthFunc (GLenum func);
++GL_APICALL void GL_APIENTRY glDepthMask (GLboolean flag);
++GL_APICALL void GL_APIENTRY glDepthRangef (GLfloat n, GLfloat f);
++GL_APICALL void GL_APIENTRY glDetachShader (GLuint program, GLuint shader);
++GL_APICALL void GL_APIENTRY glDisable (GLenum cap);
++GL_APICALL void GL_APIENTRY glDisableVertexAttribArray (GLuint index);
++GL_APICALL void GL_APIENTRY glDrawArrays (GLenum mode, GLint first, GLsizei count);
++GL_APICALL void GL_APIENTRY glDrawElements (GLenum mode, GLsizei count, GLenum type, const void *indices);
++GL_APICALL void GL_APIENTRY glEnable (GLenum cap);
++GL_APICALL void GL_APIENTRY glEnableVertexAttribArray (GLuint index);
++GL_APICALL void GL_APIENTRY glFinish (void);
++GL_APICALL void GL_APIENTRY glFlush (void);
++GL_APICALL void GL_APIENTRY glFramebufferRenderbuffer (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
++GL_APICALL void GL_APIENTRY glFramebufferTexture2D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
++GL_APICALL void GL_APIENTRY glFrontFace (GLenum mode);
++GL_APICALL void GL_APIENTRY glGenBuffers (GLsizei n, GLuint *buffers);
++GL_APICALL void GL_APIENTRY glGenerateMipmap (GLenum target);
++GL_APICALL void GL_APIENTRY glGenFramebuffers (GLsizei n, GLuint *framebuffers);
++GL_APICALL void GL_APIENTRY glGenRenderbuffers (GLsizei n, GLuint *renderbuffers);
++GL_APICALL void GL_APIENTRY glGenTextures (GLsizei n, GLuint *textures);
++GL_APICALL void GL_APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
++GL_APICALL void GL_APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
++GL_APICALL void GL_APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *shaders);
++GL_APICALL GLint GL_APIENTRY glGetAttribLocation (GLuint program, const GLchar *name);
++GL_APICALL void GL_APIENTRY glGetBooleanv (GLenum pname, GLboolean *data);
++GL_APICALL void GL_APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint *params);
++GL_APICALL GLenum GL_APIENTRY glGetError (void);
++GL_APICALL void GL_APIENTRY glGetFloatv (GLenum pname, GLfloat *data);
++GL_APICALL void GL_APIENTRY glGetFramebufferAttachmentParameteriv (GLenum target, GLenum attachment, GLenum pname, GLint *params);
++GL_APICALL void GL_APIENTRY glGetIntegerv (GLenum pname, GLint *data);
++GL_APICALL void GL_APIENTRY glGetProgramiv (GLuint program, GLenum pname, GLint *params);
++GL_APICALL void GL_APIENTRY glGetProgramInfoLog (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
++GL_APICALL void GL_APIENTRY glGetRenderbufferParameteriv (GLenum target, GLenum pname, GLint *params);
++GL_APICALL void GL_APIENTRY glGetShaderiv (GLuint shader, GLenum pname, GLint *params);
++GL_APICALL void GL_APIENTRY glGetShaderInfoLog (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
++GL_APICALL void GL_APIENTRY glGetShaderPrecisionFormat (GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision);
++GL_APICALL void GL_APIENTRY glGetShaderSource (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
++GL_APICALL const GLubyte *GL_APIENTRY glGetString (GLenum name);
++GL_APICALL void GL_APIENTRY glGetTexParameterfv (GLenum target, GLenum pname, GLfloat *params);
++GL_APICALL void GL_APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint *params);
++GL_APICALL void GL_APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat *params);
++GL_APICALL void GL_APIENTRY glGetUniformiv (GLuint program, GLint location, GLint *params);
++GL_APICALL GLint GL_APIENTRY glGetUniformLocation (GLuint program, const GLchar *name);
++GL_APICALL void GL_APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat *params);
++GL_APICALL void GL_APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint *params);
++GL_APICALL void GL_APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, void **pointer);
++GL_APICALL void GL_APIENTRY glHint (GLenum target, GLenum mode);
++GL_APICALL GLboolean GL_APIENTRY glIsBuffer (GLuint buffer);
++GL_APICALL GLboolean GL_APIENTRY glIsEnabled (GLenum cap);
++GL_APICALL GLboolean GL_APIENTRY glIsFramebuffer (GLuint framebuffer);
++GL_APICALL GLboolean GL_APIENTRY glIsProgram (GLuint program);
++GL_APICALL GLboolean GL_APIENTRY glIsRenderbuffer (GLuint renderbuffer);
++GL_APICALL GLboolean GL_APIENTRY glIsShader (GLuint shader);
++GL_APICALL GLboolean GL_APIENTRY glIsTexture (GLuint texture);
++GL_APICALL void GL_APIENTRY glLineWidth (GLfloat width);
++GL_APICALL void GL_APIENTRY glLinkProgram (GLuint program);
++GL_APICALL void GL_APIENTRY glPixelStorei (GLenum pname, GLint param);
++GL_APICALL void GL_APIENTRY glPolygonOffset (GLfloat factor, GLfloat units);
++GL_APICALL void GL_APIENTRY glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void *pixels);
++GL_APICALL void GL_APIENTRY glReleaseShaderCompiler (void);
++GL_APICALL void GL_APIENTRY glRenderbufferStorage (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
++GL_APICALL void GL_APIENTRY glSampleCoverage (GLfloat value, GLboolean invert);
++GL_APICALL void GL_APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
++GL_APICALL void GL_APIENTRY glShaderBinary (GLsizei count, const GLuint *shaders, GLenum binaryformat, const void *binary, GLsizei length);
++GL_APICALL void GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar *const*string, const GLint *length);
++GL_APICALL void GL_APIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask);
++GL_APICALL void GL_APIENTRY glStencilFuncSeparate (GLenum face, GLenum func, GLint ref, GLuint mask);
++GL_APICALL void GL_APIENTRY glStencilMask (GLuint mask);
++GL_APICALL void GL_APIENTRY glStencilMaskSeparate (GLenum face, GLuint mask);
++GL_APICALL void GL_APIENTRY glStencilOp (GLenum fail, GLenum zfail, GLenum zpass);
++GL_APICALL void GL_APIENTRY glStencilOpSeparate (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
++GL_APICALL void GL_APIENTRY glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels);
++GL_APICALL void GL_APIENTRY glTexParameterf (GLenum target, GLenum pname, GLfloat param);
++GL_APICALL void GL_APIENTRY glTexParameterfv (GLenum target, GLenum pname, const GLfloat *params);
++GL_APICALL void GL_APIENTRY glTexParameteri (GLenum target, GLenum pname, GLint param);
++GL_APICALL void GL_APIENTRY glTexParameteriv (GLenum target, GLenum pname, const GLint *params);
++GL_APICALL void GL_APIENTRY glTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
++GL_APICALL void GL_APIENTRY glUniform1f (GLint location, GLfloat v0);
++GL_APICALL void GL_APIENTRY glUniform1fv (GLint location, GLsizei count, const GLfloat *value);
++GL_APICALL void GL_APIENTRY glUniform1i (GLint location, GLint v0);
++GL_APICALL void GL_APIENTRY glUniform1iv (GLint location, GLsizei count, const GLint *value);
++GL_APICALL void GL_APIENTRY glUniform2f (GLint location, GLfloat v0, GLfloat v1);
++GL_APICALL void GL_APIENTRY glUniform2fv (GLint location, GLsizei count, const GLfloat *value);
++GL_APICALL void GL_APIENTRY glUniform2i (GLint location, GLint v0, GLint v1);
++GL_APICALL void GL_APIENTRY glUniform2iv (GLint location, GLsizei count, const GLint *value);
++GL_APICALL void GL_APIENTRY glUniform3f (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
++GL_APICALL void GL_APIENTRY glUniform3fv (GLint location, GLsizei count, const GLfloat *value);
++GL_APICALL void GL_APIENTRY glUniform3i (GLint location, GLint v0, GLint v1, GLint v2);
++GL_APICALL void GL_APIENTRY glUniform3iv (GLint location, GLsizei count, const GLint *value);
++GL_APICALL void GL_APIENTRY glUniform4f (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
++GL_APICALL void GL_APIENTRY glUniform4fv (GLint location, GLsizei count, const GLfloat *value);
++GL_APICALL void GL_APIENTRY glUniform4i (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
++GL_APICALL void GL_APIENTRY glUniform4iv (GLint location, GLsizei count, const GLint *value);
++GL_APICALL void GL_APIENTRY glUniformMatrix2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
++GL_APICALL void GL_APIENTRY glUniformMatrix3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
++GL_APICALL void GL_APIENTRY glUniformMatrix4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
++GL_APICALL void GL_APIENTRY glUseProgram (GLuint program);
++GL_APICALL void GL_APIENTRY glValidateProgram (GLuint program);
++GL_APICALL void GL_APIENTRY glVertexAttrib1f (GLuint index, GLfloat x);
++GL_APICALL void GL_APIENTRY glVertexAttrib1fv (GLuint index, const GLfloat *v);
++GL_APICALL void GL_APIENTRY glVertexAttrib2f (GLuint index, GLfloat x, GLfloat y);
++GL_APICALL void GL_APIENTRY glVertexAttrib2fv (GLuint index, const GLfloat *v);
++GL_APICALL void GL_APIENTRY glVertexAttrib3f (GLuint index, GLfloat x, GLfloat y, GLfloat z);
++GL_APICALL void GL_APIENTRY glVertexAttrib3fv (GLuint index, const GLfloat *v);
++GL_APICALL void GL_APIENTRY glVertexAttrib4f (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
++GL_APICALL void GL_APIENTRY glVertexAttrib4fv (GLuint index, const GLfloat *v);
++GL_APICALL void GL_APIENTRY glVertexAttribPointer (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer);
++GL_APICALL void GL_APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height);
++#endif
++#endif /* GL_ES_VERSION_2_0 */
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
+diff --git a/src/gpu/ganesh/gl/egl/gl2platform.h b/src/gpu/ganesh/gl/egl/gl2platform.h
+new file mode 100644
+index 0000000000..eb318dc3a3
+--- /dev/null
++++ b/src/gpu/ganesh/gl/egl/gl2platform.h
+@@ -0,0 +1,38 @@
++#ifndef __gl2platform_h_
++#define __gl2platform_h_
++
++/*
++** Copyright (c) 2017 The Khronos Group Inc.
++**
++** Licensed under the Apache License, Version 2.0 (the "License");
++** you may not use this file except in compliance with the License.
++** You may obtain a copy of the License at
++**
++**     http://www.apache.org/licenses/LICENSE-2.0
++**
++** Unless required by applicable law or agreed to in writing, software
++** distributed under the License is distributed on an "AS IS" BASIS,
++** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++** See the License for the specific language governing permissions and
++** limitations under the License.
++*/
++
++/* Platform-specific types and definitions for OpenGL ES 2.X  gl2.h
++ *
++ * Adopters may modify khrplatform.h and this file to suit their platform.
++ * Please contribute modifications back to Khronos as pull requests on the
++ * public github repository:
++ *      https://github.com/KhronosGroup/OpenGL-Registry
++ */
++
++#include <KHR/khrplatform.h>
++
++#ifndef GL_APICALL
++#define GL_APICALL  KHRONOS_APICALL
++#endif
++
++#ifndef GL_APIENTRY
++#define GL_APIENTRY KHRONOS_APIENTRY
++#endif
++
++#endif /* __gl2platform_h_ */
+diff --git a/src/ports/SkDebug_ohos.cpp b/src/ports/SkDebug_ohos.cpp
+new file mode 100644
+index 0000000000..41093f6518
+--- /dev/null
++++ b/src/ports/SkDebug_ohos.cpp
+@@ -0,0 +1,50 @@
++/*
++ * Copyright 2006 The Android Open Source Project
++ *
++ * Use of this source code is governed by a BSD-style license that can be
++ * found in the LICENSE file.
++ */
++
++#include "include/private/base/SkDebug.h"
++#include "include/private/base/SkFeatures.h"
++
++#if defined(SK_BUILD_FOR_OHOS)
++
++#include <stdio.h>
++
++#ifdef LOG_TAG
++  #undef LOG_TAG
++#endif
++#define LOG_TAG "skia"
++#include <hilog/log.h>
++
++// Print debug output to stdout as well.  This is useful for command line
++// applications (e.g. skia_launcher).
++bool gSkDebugToStdOut = false;
++
++void SkDebugf(const char format[], ...) {
++    va_list args1, args2;
++    va_start(args1, format);
++
++    if (gSkDebugToStdOut) {
++        va_copy(args2, args1);
++        vprintf(format, args2);
++        va_end(args2);
++        fflush(stdout);
++    }
++
++
++    char buffer[1024];
++    int len = 0;
++    len = vsnprintf(buffer, sizeof(buffer) - 1, format, args1);
++    if (len <= 0) {
++      return;
++    }
++    buffer[len] = '\0';
++    OH_LOG_Print(LOG_APP, LOG_DEBUG, LOG_DOMAIN, LOG_TAG,
++                " %{public}s",buffer);
++
++    va_end(args1);
++}
++
++#endif  // defined(SK_BUILD_FOR_OHOS)
+diff --git a/src/ports/SkDebug_stdio.cpp b/src/ports/SkDebug_stdio.cpp
+index 6a58936900..004102aead 100644
+--- a/src/ports/SkDebug_stdio.cpp
++++ b/src/ports/SkDebug_stdio.cpp
+@@ -9,7 +9,7 @@
+ #include "include/private/base/SkFeatures.h"
+ #include "include/private/base/SkLoadUserConfig.h"
+ 
+-#if !defined(SK_BUILD_FOR_WIN) && !defined(SK_BUILD_FOR_ANDROID)
++#if !defined(SK_BUILD_FOR_WIN) && !defined(SK_BUILD_FOR_ANDROID) && !defined(SK_BUILD_FOR_OHOS)
+ 
+ #include <stdarg.h>
+ #include <stdio.h>
+diff --git a/src/ports/skia_ohos/FontConfig_ohos.cpp b/src/ports/skia_ohos/FontConfig_ohos.cpp
+new file mode 100644
+index 0000000000..6ee08c088a
+--- /dev/null
++++ b/src/ports/skia_ohos/FontConfig_ohos.cpp
+@@ -0,0 +1,1323 @@
++// Copyright (c) 2023 Huawei Device Co., Ltd. All rights reserved
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "FontConfig_ohos.h"
++
++#include<array>
++#include <dirent.h>
++#include <libgen.h>
++#include <sys/stat.h>
++#include <sys/types.h>
++#include <unistd.h>
++
++#include "SkFontStyle.h"
++#include "SkString.h"
++#include "include/private/base/SkDebug.h"
++
++using namespace ErrorCode;
++#if defined(SK_BUILD_FONT_MGR_FOR_PREVIEW_WIN) or defined(SK_BUILD_FONT_MGR_FOR_PREVIEW_MAC) or defined(SK_BUILD_FONT_MGR_FOR_PREVIEW_LINUX)
++static const char* OHOS_DEFAULT_CONFIG = "fontconfig.json";
++#else
++static const char* OHOS_DEFAULT_CONFIG = "/system/etc/fontconfig.json";
++#endif
++
++static const char* PRODUCT_DEFAULT_CONFIG = "/system/etc/productfontconfig.json";
++/*! Constructor
++ * \param fontScanner the scanner to get the font information from a font file
++ * \param fname the full name of system font configuration document.
++ *     \n The default value is '/system/etc/fontconfig.json', if fname is given null
++ */
++FontConfig_OHOS::FontConfig_OHOS(const SkFontScanner& fontScanner,
++    const char* fname)
++{
++    int err = checkProductFile(fname);
++    if (err != NO_ERROR) {
++        return;
++    }
++    scanFonts(fontScanner);
++    resetGenericValue();
++    resetFallbackValue();
++}
++
++/*! To get the fallbackForMap
++ *  \return The reference of fallbackForMap
++ */
++const FallbackForMap& FontConfig_OHOS::getFallbackForMap() const
++{
++    return fallbackForMap;
++}
++
++/*! To get the fallback set
++ *  \return The reference of fallbackSet
++ */
++const FallbackSet& FontConfig_OHOS::getFallbackSet() const
++{
++    return fallbackSet;
++}
++
++/*! To get the count of font style sets supported in the system
++ *  \return The count of font style sets in generic family
++ */
++int FontConfig_OHOS::getFamilyCount() const
++{
++    return genericFamilySet.size();
++}
++
++/*! To get the family name of the default font style set
++ *  \param[out] familyName a pointer of SkString object, to which the family value will be set.
++ *  \return The count of typeface in this font style set
++ *  \n Return -1, if there is no any font style set in the system.
++ */
++int FontConfig_OHOS::getDefaultFamily(SkString* familyName) const
++{
++    return getFamilyName(0, familyName);
++}
++
++/*! To get the family name of a font style set
++ * \param index the index of a font style set in generic family
++ * \param[out] familyName a pointer of SkString object, to which the family value will be set
++ * \return The count of typeface in the font style set
++ * \n      Return -1, if the 'index' is out of range
++ */
++int FontConfig_OHOS::getFamilyName(int index, SkString* familyName) const
++{
++    if (index < 0 || index >= this->getFamilyCount()) {
++        if (familyName) {
++            familyName->reset();
++        }
++        return -1;
++    }
++    if (familyName) {
++        *familyName = genericFamilySet[index]->familyName;
++    }
++    return genericFamilySet[index]->typefaceSet->size();
++}
++
++/*! To get the count of a font style set
++ * \param styleIndex the index of a font style set
++ * \param isFallback to indicate the font style set is from generic family or fallback family
++ * \n                 false , the font style set is from generic family list
++ * \n                 true, the font style set is from fallback family list
++ * \return The count of typeface in the font style set
++ */
++int FontConfig_OHOS::getTypefaceCount(int styleIndex, bool isFallback) const
++{
++    if (styleIndex < 0) {
++        return -1;
++    }
++    if (isFallback) {
++        if ((unsigned int)styleIndex < fallbackSet.size()) {
++            return fallbackSet[styleIndex]->typefaceSet->size();
++        }
++    } else {
++        if ((unsigned int)styleIndex < genericFamilySet.size()) {
++            return genericFamilySet[styleIndex]->typefaceSet->size();
++        }
++    }
++    return -1;
++}
++
++/*! To get a typeface
++ * \param styleIndex the index of a font style set
++ * \param index the index of a typeface in its style set
++ * \param isFallback false, the font style set is generic
++ * \n          true, the font style set is fallback
++ * \return The pointer of a typeface
++ * \n       Return null, if 'styleIndex' or 'index' is out of range
++ */
++sk_sp<SkTypeface_OHOS> FontConfig_OHOS::getTypeface(int styleIndex, int index,
++    bool isFallback) const
++{
++    if (styleIndex < 0 || index < 0 ||
++        (isFallback && (unsigned int)styleIndex >= fallbackSet.size()) ||
++        (!isFallback && (unsigned int)styleIndex >= genericFamilySet.size())) {
++        return nullptr;
++    }
++    if (isFallback) {
++        const TypefaceSet& tpSet = *(fallbackSet[styleIndex]->typefaceSet.get());
++        if ((unsigned int)index < tpSet.size()) {
++            return tpSet[index];
++        }
++    } else {
++        const TypefaceSet& tpSet = *(genericFamilySet[styleIndex]->typefaceSet.get());
++        if ((unsigned int)index < tpSet.size()) {
++            return tpSet[index];
++        }
++    }
++    return nullptr;
++}
++
++/*! To get a typeface
++ * \param styleIndex the index a font style set
++ * \param style the font style to be matching
++ * \param isFallback false, the font style set is generic
++ * \n                true, the font style set is fallback
++ * \return An object of typeface whose font style is the closest matching to 'style'
++ * \n      Return null, if 'styleIndex' is out of range
++ */
++sk_sp<SkTypeface_OHOS> FontConfig_OHOS::getTypeface(int styleIndex, const SkFontStyle& style,
++    bool isFallback) const
++{
++    if (styleIndex < 0 ||
++        (isFallback && (unsigned int)styleIndex >= fallbackSet.size()) ||
++        (!isFallback && (unsigned int)styleIndex >= genericFamilySet.size())) {
++        return nullptr;
++    }
++    const TypefaceSet* pSet = nullptr;
++    if (isFallback) {
++        pSet = fallbackSet[styleIndex]->typefaceSet.get();
++    } else {
++        pSet = genericFamilySet[styleIndex]->typefaceSet.get();
++    }
++    sk_sp<SkTypeface_OHOS> tp = matchFontStyle(*pSet, style);
++    return tp;
++}
++
++/*! To get the index of a font style set
++ *  \param familyName the family name of the font style set
++ *  \n     get the index of default font style set, if 'familyName' is null
++ *  \param[out] isFallback to tell if the family is from generic or fallback to the caller.
++ *  \n          isFallback is false, if the font style is from generic family list
++ *  \n          isFallback is true, if the font style is from fallback family list
++ *  \return The index of the font style set
++ *  \n      Return -1, if 'familyName' is not found in the system
++ */
++int FontConfig_OHOS::getStyleIndex(const char* familyName, bool& isFallback) const
++{
++    if (familyName == nullptr) {
++        isFallback = false;
++        return 0;
++    }
++    SkString fname(familyName);
++    int* p = genericNames.find(fname);
++    if (p) {
++        isFallback = false;
++        return *p;
++    } else {
++        p = fallbackNames.find(fname);
++        if (p) {
++            isFallback = true;
++            return *p;
++        }
++    }
++    return -1;
++}
++
++/*! Find the closest matching typeface
++ * \param typefaceSet a typeface set belonging to the same font style set
++ * \param pattern the font style to be matching
++ * \return The typeface object which is the closest matching to 'pattern'
++ * \n      Return null, if the count of typeface is 0
++ */
++sk_sp<SkTypeface_OHOS> FontConfig_OHOS::matchFontStyle(const TypefaceSet& typefaceSet,
++    const SkFontStyle& pattern)
++{
++    int count = typefaceSet.size();
++    if (count == 1) {
++        return typefaceSet[0];
++    }
++    sk_sp<SkTypeface_OHOS> res = nullptr;
++    uint32_t minDiff = 0xFFFFFFFF;
++    for (int i = 0; i < count; i++) {
++        const SkFontStyle& fontStyle = typefaceSet[i]->fontStyle();
++        uint32_t diff = getFontStyleDifference(pattern, fontStyle);
++        if (diff < minDiff) {
++            minDiff = diff;
++            res = typefaceSet[i];
++        }
++    }
++    return res;
++}
++
++/*! To get the difference between a font style and the matching font style
++ * \param dstStyle the style to be matching
++ * \param srcStyle a font style
++ * \return The difference value of a specified style with the matching style
++ */
++uint32_t FontConfig_OHOS::getFontStyleDifference(const SkFontStyle& dstStyle,
++    const SkFontStyle& srcStyle)
++{
++    int normalWidth = SkFontStyle::kNormal_Width;
++    int dstWidth = dstStyle.width();
++    int srcWidth = srcStyle.width();
++
++    uint32_t widthDiff = 0;
++    // The maximum font width is kUltraExpanded_Width i.e. '9'.
++    // If dstWidth <= kNormal_Width (5), first check narrower values, then wider values.
++    // If dstWidth > kNormal_Width, first check wider values, then narrower values.
++    // When dstWidth and srcWidth are at different side of kNormal_Width,
++    // the width difference between them should be more than 5 (9/2+1)
++    if (dstWidth <= normalWidth) {
++        if (srcWidth <= dstWidth) {
++            widthDiff = dstWidth - srcWidth;
++        } else {
++            widthDiff = srcWidth - dstWidth + 5;
++        }
++    } else {
++        if (srcWidth >= dstWidth) {
++            widthDiff = srcWidth - dstWidth;
++        } else {
++            widthDiff = dstWidth - srcWidth + 5;
++        }
++    }
++
++    int diffSlantValue[3][3] = {
++        {0, 2, 1},
++        {2, 0, 1},
++        {2, 1, 0}
++    };
++    uint32_t slantDiff = diffSlantValue[dstStyle.slant()][srcStyle.slant()];
++
++    int dstWeight = dstStyle.weight();
++    int srcWeight = srcStyle.weight();
++    uint32_t weightDiff = 0;
++
++    // The maximum weight is kExtraBlack_Weight (1000), when dstWeight and srcWeight are at the different
++    // side of kNormal_Weight, the weight difference between them should be more than 500 (1000/2)
++    if ((dstWeight == SkFontStyle::kNormal_Weight && srcWeight == SkFontStyle::kMedium_Weight) ||
++        (dstWeight == SkFontStyle::kMedium_Weight && srcWeight == SkFontStyle::kNormal_Weight)) {
++        weightDiff = 50;
++    } else if (dstWeight <= SkFontStyle::kNormal_Weight) {
++        if (srcWeight <= dstWeight) {
++            weightDiff = dstWeight - srcWeight;
++        } else {
++            weightDiff = srcWeight - dstWeight + 500;
++        }
++    } else if (dstWeight > SkFontStyle::kNormal_Weight) {
++        if (srcWeight >= dstWeight) {
++            weightDiff = srcWeight - dstWeight;
++        } else {
++            weightDiff = dstWeight - srcWeight + 500;
++        }
++    }
++    // The first 2 bytes to save weight difference, the third byte to save slant difference,
++    // and the fourth byte to save width difference
++    uint32_t diff = (widthDiff << 24) + (slantDiff << 16) + weightDiff;
++    return diff;
++}
++
++/*! To get the data of font configuration file
++ * \param fname the full name of the font configuration file
++ * \param[out] size the size of data returned to the caller
++ * \return The pointer of content of the file
++ * \note The returned pointer should be freed by the caller
++ */
++char* FontConfig_OHOS::getFileData(const char* fname, int& size)
++{
++    FILE* fp = fopen(fname, "r");
++    if (fp == nullptr) {
++        return nullptr;
++    }
++    fseek(fp, 0L, SEEK_END);
++    size = ftell(fp) + 1;
++    rewind(fp);
++    void* data = malloc(size);
++    if (data == nullptr) {
++        fclose(fp);
++        return nullptr;
++    }
++    memset(data, 0, size);
++    (void) fread(data, size, 1, fp);
++    fclose(fp);
++    return (char*)data;
++}
++
++/*! parse the system font configuration document
++ * \param fname the full name of the font configuration document
++ * \return NO_ERROR successful
++ * \return ERROR_CONFIG_NOT_FOUND config document is not found
++ * \return ERROR_CONFIG_FORMAT_NOT_SUPPORTED config document format is not supported
++ * \return ERROR_CONFIG_INVALID_VALUE_TYPE wrong type of value in the configuration
++ */
++int FontConfig_OHOS::parseConfig(const char* fname)
++{
++    if (fname == nullptr) {
++        fname = OHOS_DEFAULT_CONFIG;
++    }
++    Json::Value root;
++    int err = checkConfigFile(fname, root);
++    if (err != NO_ERROR) {
++        return err;
++    }
++    // "fontdir" - optional, the data type should be string
++    const char* key = "fontdir";
++    if (root.isMember(key)) {
++        if (root[key].isArray()) {
++            parseFontDir(root[key]);
++        } else {
++            return logErrInfo(ERROR_CONFIG_INVALID_VALUE_TYPE, key);
++        }
++    }
++    // "generic", "fallback" - necessary, the data type should be array
++    const char* keys[] = {"generic", "fallback", nullptr};
++    int index = 0;
++    while (true) {
++        if (keys[index] == nullptr) {
++            break;
++        }
++        key = keys[index++];
++        if (!root.isMember(key)) {
++            return logErrInfo(ERROR_CONFIG_MISSING_TAG, key);
++        } else if (!root[key].isArray()) {
++            return logErrInfo(ERROR_CONFIG_INVALID_VALUE_TYPE, key, Json::arrayValue, root[key].type());
++        }
++        const Json::Value& arr = root[key];
++        for (unsigned int i = 0; i < arr.size(); i++) {
++            if (arr[i].isObject()) {
++                if (!strcmp(key, "generic")) {
++                    parseGeneric(arr[i]);
++                } else if (!strcmp(key, "fallback")) {
++                    parseFallback(arr[i]);
++                }
++            } else {
++                SkString errKey;
++                errKey.appendf("%s#%d", key, i + 1);
++                (void) logErrInfo(ERROR_CONFIG_INVALID_VALUE_TYPE, errKey.c_str(),
++                    Json::objectValue, arr[i].type());
++            }
++        }
++    }
++    root.clear();
++    return NO_ERROR;
++}
++
++/*! check the system font configuration document
++ * \param fname the full name of the font configuration document
++ * \return NO_ERROR successful
++ * \return ERROR_CONFIG_NOT_FOUND config document is not found
++ * \return ERROR_CONFIG_FORMAT_NOT_SUPPORTED config document format is not supported
++ */
++int FontConfig_OHOS::checkConfigFile(const char* fname, Json::Value& root)
++{
++    int size = 0;
++    char* data = getFileData(fname, size);
++    if (data == nullptr) {
++        return logErrInfo(ERROR_CONFIG_NOT_FOUND, fname);
++    }
++    std::string errs;
++    Json::CharReaderBuilder charReaderBuilder;
++    std::unique_ptr<Json::CharReader> jsonReader(charReaderBuilder.newCharReader());
++    bool isJson = jsonReader->parse(data, data + size, &root, &errs);
++    free((void*)data);
++    data = nullptr;
++
++    if (!isJson || !errs.empty()) {
++        return logErrInfo(ERROR_CONFIG_FORMAT_NOT_SUPPORTED, fname);
++    }
++    return NO_ERROR;
++}
++#if ENABLE_DEBUG
++/*! To print out the font information
++ * \param font the font object to be printed
++ */
++void FontConfig_OHOS::dumpFont(const FontInfo& font) const
++{
++    LOGI("name=%s, family=%s, weight=%d, width=%d, slant=%d, index=%d",
++        font.fname.c_str(), font.familyName.c_str(), font.style.weight(), font.style.width(), font.style.slant(),
++        font.index);
++    int count = font.axisSet.axis.size();
++    if (count > 0) {
++        SkString str;
++        for (unsigned int i = 0; i < count; i++) {
++            str.appendU32(SkFixedFloorToInt(font.axisSet.axis[i]));
++            if (i < count - 1) {
++                str.append(",");
++            }
++        }
++        LOGI("axis={%s}\n", str.c_str());
++    }
++}
++
++/*! To print out the information of generic font style set
++ */
++void FontConfig_OHOS::dumpGeneric() const
++{
++    LOGI("\n");
++    for (unsigned int i = 0; i < genericFamilySet.size(); i++) {
++        LOGI("[%d] familyName : %s - %d\n", i, genericFamilySet[i]->familyName.c_str(),
++            static_cast<int>(genericFamilySet[i]->typefaceSet->size()));
++        for (int j = 0; j < genericFamilySet[i]->typefaceSet->size(); j++) {
++            if ((*(genericFamilySet[i]->typefaceSet))[j].get()) {
++                const FontInfo* font = (*(genericFamilySet[i]->typefaceSet))[j]->getFontInfo();
++                if (font) {
++                    dumpFont(*font);
++                } else {
++                    LOGE("font [%d] is null\n", j);
++                }
++            } else {
++                LOGE("typefeace [%d] is null\n", j);
++            }
++        }
++    }
++}
++
++/*! To print out the information of fallback font style set
++ */
++void FontConfig_OHOS::dumpFallback() const
++{
++    LOGI("\n");
++    int count = 0;
++    fallbackForMap.foreach([this, &count](const SkString& key,
++        const FallbackSetPos& setIndex) {
++        LOGI("[%d] family : %s - %d\n", count++, key.c_str(), setIndex.count);
++        for (unsigned int i = setIndex.index; i < setIndex.index + setIndex.count; i++) {
++            const TypefaceSet& tpSet = *(fallbackSet[i]->typefaceSet.get());
++            LOGI("[%s] - %d\n", fallbackSet[i]->familyName.c_str(), static_cast<int>(tpSet.size()));
++
++            for (unsigned int j = 0; j < tpSet.size(); j++) {
++                const FontInfo* font = tpSet[j]->getFontInfo();
++                if (font) {
++                    this->dumpFont(*font);
++                } else {
++                    LOGE("font [%d] is null\n", j);
++                }
++            }
++        }
++    });
++}
++#endif
++
++/*! To parse 'fontdir' attribute
++ * \param root the root node of 'fontdir'
++ * \return NO_ERROR successful
++ * \return ERROR_CONFIG_INVALID_VALUE_TYPE invalid value type
++ */
++int FontConfig_OHOS::parseFontDir(const Json::Value& root)
++{
++    for (unsigned int i = 0; i < root.size(); i++) {
++        if (root[i].isString()) {
++            const char* dir = root[i].asCString();
++            fontDirSet.emplace_back(SkString(dir));
++        } else {
++            SkString text;
++            text.appendf("fontdir#%d", i + 1);
++            return logErrInfo(ERROR_CONFIG_INVALID_VALUE_TYPE, text.c_str(), Json::stringValue, root[i].type());
++        }
++    }
++    return NO_ERROR;
++}
++
++/*! To parse an item of 'generic' family
++ * \param root the root node of an item in 'generic' list
++ * \return NO_ERROR successful
++ * \return ERROR_CONFIG_INVALID_VALUE_TYPE invalid value type for an attribute
++ * \return ERROR_CONFIG_MISSING_TAG missing tag of 'family' or 'alias'
++ */
++int FontConfig_OHOS::parseGeneric(const Json::Value& root)
++{
++    // "family" - necessary, the data type should be String
++    const char* key = "family";
++    if (!root.isMember(key)) {
++        return logErrInfo(ERROR_CONFIG_MISSING_TAG, key);
++    } else if (!root[key].isString()) {
++        return logErrInfo(ERROR_CONFIG_INVALID_VALUE_TYPE, key, Json::stringValue, root[key].type());
++    }
++    SkString familyName = SkString(root[key].asCString());
++    // "alias" - necessary, the data type should be Array
++    if (!root.isMember("alias")) {
++        return logErrInfo(ERROR_CONFIG_MISSING_TAG, "alias");
++    }
++    // "adjust", "variation" - optional
++    const char* tags[] = {"alias", "adjust", "variations", "index"};
++    std::vector<AliasInfo> aliasSet;
++    std::vector<AdjustInfo> adjustSet;
++    std::vector<VariationInfo> variationSet;
++    for (unsigned int i = 0; i < sizeof(tags) / sizeof(char*); i++) {
++        key = tags[i];
++        if (!root.isMember(key)) {
++            continue;
++        }
++        if (root[key].isArray()) {
++            if (!strcmp(key, "index")) {
++                parseTtcIndex(root[key], familyName);
++                continue;
++            }
++            const Json::Value& arr = root[key];
++            for (unsigned int j = 0; j < arr.size(); j++) {
++                if (arr[j].isObject()) {
++                    if (!strcmp(key, "alias")) {
++                        parseAlias(arr[j], aliasSet);
++                    } else if (!strcmp(key, "adjust")) {
++                        parseAdjust(arr[j], adjustSet);
++                    } else {
++                        parseVariation(arr[j], variationSet);
++                    }
++                } else {
++                    SkString text;
++                    text.appendf("%s#%d", key, j + 1);
++                    (void) logErrInfo(ERROR_CONFIG_INVALID_VALUE_TYPE, text.c_str(), Json::objectValue,
++                        arr[j].type());
++                }
++            }
++        } else {
++            (void) logErrInfo(ERROR_CONFIG_INVALID_VALUE_TYPE, key, Json::arrayValue, root[key].type());
++        }
++        if (root.size() == 2) {
++            break;
++        }
++    }
++    if (aliasSet.size()) {
++        aliasMap.set(SkString(familyName), aliasSet);
++    }
++    if (adjustSet.size()) {
++        adjustMap.set(SkString(familyName), adjustSet);
++    }
++    if (variationSet.size()) {
++        variationMap.set(SkString(familyName), variationSet);
++    }
++    return NO_ERROR;
++}
++
++/*! To parse an item of 'alias' attribute
++ * \param root the root node of an item in an 'alias' list
++ * \param[out] aliasSet the value of AliasInfo will be written to and returned to the caller
++ * \return NO_ERROR successful
++ * \return ERROR_CONFIG_INVALID_VALUE_TYPE invalid value type for an attribute
++ * \return ERROR_CONFIG_MISSING_TAG missing tag of alias name
++ */
++int FontConfig_OHOS::parseAlias(const Json::Value& root, std::vector<AliasInfo>& aliasSet)
++{
++    if (root.empty()) {
++        return logErrInfo(ERROR_CONFIG_MISSING_TAG, "generic-alias-name");
++    }
++    Json::Value::Members members = root.getMemberNames();
++    const char* key = members[0].c_str();
++    if (!root[key].isInt()) {
++        return logErrInfo(ERROR_CONFIG_INVALID_VALUE_TYPE, "generic-alias-weight",
++            Json::intValue, root[key].type());
++    }
++
++    SkString aliasName = SkString(key);
++    int weight = root[key].asInt();
++    std::unique_ptr<GenericFamily> genericFamily = std::make_unique<GenericFamily>();
++    genericFamily->familyName = SkString(key);
++    if (aliasSet.size() == 0 || weight > 0) {
++        genericFamily->typefaceSet = std::make_shared<TypefaceSet>();
++    } else {
++        int index = aliasSet[0].pos;
++        genericFamily->typefaceSet = genericFamilySet[index]->typefaceSet;
++    }
++    genericNames.set(SkString(genericFamily->familyName), genericFamilySet.size());
++
++    AliasInfo info = {static_cast<int>(genericFamilySet.size()), weight};
++    aliasSet.emplace_back(std::move(info));
++    genericFamilySet.emplace_back(std::move(genericFamily));
++    return NO_ERROR;
++}
++
++/*! To parse an item of 'adjust' attribute
++ * \param root the root node of an item in an 'adjust' list
++ * \param[out] adjustSet the value of AdjustInfo will be written to and returned to the caller
++ * \return NO_ERROR successful
++ * \return ERROR_CONFIG_INVALID_VALUE_TYPE invalid value type for an attribute
++ * \return ERROR_CONFIG_MISSING_TAG missing tag of 'weight' or 'to'
++ */
++int FontConfig_OHOS::parseAdjust(const Json::Value& root, std::vector<AdjustInfo>& adjustSet)
++{
++    const char* tags[] = {"weight", "to"};
++    int values[2]; // value[0] - to save 'weight', value[1] - to save 'to'
++    for (unsigned int i = 0; i < sizeof(tags) / sizeof(char*); i++) {
++        const char* key = tags[i];
++        if (!root.isMember(key)) {
++            return logErrInfo(ERROR_CONFIG_MISSING_TAG, key);
++        } else if (!root[key].isInt()) {
++            return logErrInfo(ERROR_CONFIG_INVALID_VALUE_TYPE, key,
++                Json::intValue, root[key].type());
++        } else {
++            values[i] = root[key].asInt();
++        }
++    }
++    AdjustInfo info = {values[0], values[1]};
++    adjustSet.push_back(info);
++    return NO_ERROR;
++}
++
++/*! To parse an item of 'fallback' attribute
++ * \param root the root node of an item in 'fallback' list
++ * \return NO_ERROR successful
++ * \return ERROR_CONFIG_INVALID_VALUE_TYPE invalid value type for an attribute
++ * \return ERROR_CONFIG_MISSING_TAG missing tag of fallbackFor
++ */
++int FontConfig_OHOS::parseFallback(const Json::Value& root)
++{
++    if (root.empty()) {
++        return logErrInfo(ERROR_CONFIG_MISSING_TAG, "fallback-fallbackFor");
++    }
++    Json::Value::Members members = root.getMemberNames();
++    const char* key = members[0].c_str();
++    if (!root[key].isArray()) {
++        return logErrInfo(ERROR_CONFIG_INVALID_VALUE_TYPE, "fallback-items",
++            Json::arrayValue, root[key].type());
++    }
++    unsigned int startPos = fallbackSet.size();
++    SkString fallbackFor = SkString(key);
++    const Json::Value& fallbackArr = root[key];
++    for (unsigned int i = 0; i < fallbackArr.size(); i++) {
++        if (!fallbackArr[i].isObject()) {
++            SkString text;
++            text.appendf("fallback-%s#%d", key, i + 1);
++            (void) logErrInfo(ERROR_CONFIG_INVALID_VALUE_TYPE, text.c_str(), Json::objectValue,
++                fallbackArr[i].type());
++            continue;
++        }
++        parseFallbackItem(fallbackArr[i]);
++    }
++    FallbackSetPos setPos = {startPos, (unsigned int)(fallbackSet.size() - startPos)};
++    fallbackForMap.set(fallbackFor, setPos);
++    return NO_ERROR;
++}
++
++/*! To parse an item of fallback family
++ * \param root the root node of a fallback item
++ * \return NO_ERROR successful
++ * \return ERROR_CONFIG_INVALID_VALUE_TYPE invalid value type for an attribute
++ * \return ERROR_CONFIG_MISSING_TAG missing tag of language
++ */
++int FontConfig_OHOS::parseFallbackItem(const Json::Value& root)
++{
++    if (root.empty()) {
++        return logErrInfo(ERROR_CONFIG_MISSING_TAG, "fallback-item-lang");
++    }
++    Json::Value::Members members = root.getMemberNames();
++    const char* key = nullptr;
++    bool hasIndex = false;
++    bool hasVariations = false;
++    for (unsigned int i = 0; i < members.size(); i++) {
++        if (members[i] == "variations") {
++            hasVariations = true;
++        } else if (members[i] == "index") {
++            hasIndex = true;
++        } else {
++            key = members[i].c_str();
++        }
++    }
++    if (key == nullptr) {
++        return logErrInfo(ERROR_CONFIG_MISSING_TAG, "fallback-item-lang");
++    }
++    if (!root[key].isString()) {
++        return logErrInfo(ERROR_CONFIG_INVALID_VALUE_TYPE, "fallback-item-family",
++            Json::stringValue, root[key].type());
++    }
++    SkString lang = SkString(key);
++    SkString familyName = SkString(root[key].asCString());
++    if (hasVariations) {
++        key = "variations";
++        if (root[key].isArray()) {
++            const Json::Value& varArr = root[key];
++            std::vector<VariationInfo> variationSet;
++            for (unsigned int i = 0; i < varArr.size(); i++) {
++                if (varArr[i].isObject()) {
++                    parseVariation(varArr[i], variationSet);
++                } else {
++                    SkString text = SkString("variations#");
++                    text.appendU32(i + 1);
++                    (void) logErrInfo(ERROR_CONFIG_INVALID_VALUE_TYPE, text.c_str(),
++                        Json::objectValue, varArr[i].type());
++                }
++            }
++            if (variationSet.size()) {
++                variationMap.set(SkString(familyName), variationSet);
++            }
++        } else {
++            (void) logErrInfo(ERROR_CONFIG_INVALID_VALUE_TYPE, key, Json::arrayValue,
++                root[key].type());
++        }
++    }
++    if (hasIndex) {
++        key = "index";
++        if (root[key].isArray()) {
++            parseTtcIndex(root[key], familyName);
++        } else {
++            (void) logErrInfo(ERROR_CONFIG_INVALID_VALUE_TYPE, key, Json::arrayValue, root[key].type());
++        }
++    }
++    std::unique_ptr<FallbackInfo> fallback = std::make_unique<FallbackInfo>();
++    fallback->familyName = familyName;
++    fallback->langs = lang;
++    fallback->typefaceSet = std::make_shared<TypefaceSet>();
++    fallbackNames.set(SkString(familyName), fallbackSet.size());
++    fallbackSet.emplace_back(std::move(fallback));
++    return NO_ERROR;
++}
++
++/*! To parse an item of 'variations' attribute
++ * \param root the root node of an item in 'variations' list
++ * \param[out] variationSet the value of VariationInfo is written to and returned to the caller
++ * \return NO_ERROR successful
++ * \return ERROR_CONFIG_INVALID_VALUE_TYPE invalid value type for an attribute
++ * \return ERROR_CONFIG_MISSING_TAG missing tag of 'weight' or 'wght'
++ */
++int FontConfig_OHOS::parseVariation(const Json::Value& root, std::vector<VariationInfo>& variationSet)
++{
++    const char* key = nullptr;
++    const char* tags[] = {"wght", "wdth", "slnt", "weight", "width", "slant"};
++    VariationInfo info;
++    for (unsigned int i = 0; i < sizeof(tags) / sizeof(char*); i++) {
++        key = tags[i];
++        if ((!strcmp(key, "wght") || !strcmp(key, "weight")) &&
++            !root.isMember(key)) {
++            return logErrInfo(ERROR_CONFIG_MISSING_TAG, key);
++        }
++        if (!root.isMember(key)) {
++            continue;
++        }
++        if (!strcmp(key, "weight")) {
++            if (!root[key].isInt()) {
++                return logErrInfo(ERROR_CONFIG_INVALID_VALUE_TYPE, key, Json::intValue, root[key].type());
++            }
++            info.weight = root[key].asInt();
++        } else if (!strcmp(key, "width")) {
++            if (!root[key].isInt()) {
++                return logErrInfo(ERROR_CONFIG_INVALID_VALUE_TYPE, key, Json::intValue, root[key].type());
++            }
++            info.width = root[key].asInt();
++        } else if (!strcmp(key, "slant")) {
++            if (!root[key].isString()) {
++                return logErrInfo(ERROR_CONFIG_INVALID_VALUE_TYPE, key, Json::stringValue, root[key].type());
++            }
++            const char* str = root[key].asCString();
++            if (!strcmp(str, "normal")) {
++                info.slant = static_cast<int>(SkFontStyle::kUpright_Slant);
++            } else if (!strcmp(str, "italic")) {
++                info.slant = static_cast<int>(SkFontStyle::kItalic_Slant);
++            } else if (!strcmp(str, "oblique")) {
++                info.slant = static_cast<int>(SkFontStyle::kOblique_Slant);
++            }
++        } else {
++            if (!root[key].isNumeric()) {
++                return logErrInfo(ERROR_CONFIG_INVALID_VALUE_TYPE, key, Json::realValue, root[key].type());
++            }
++            Coordinate axis;
++            axis.axis = SkSetFourByteTag(key[0], key[1], key[2], key[3]);
++            axis.value = root[key].asFloat();
++            info.axis.emplace_back(axis);
++        }
++    }
++    variationSet.emplace_back(info);
++    return NO_ERROR;
++}
++
++/*! To parse  'index' attribute
++ * \param root the root node of 'index' attribute
++ * \param familyName the name of the family which the root node belongs to
++ * \return NO_ERROR successful
++ * \return ERROR_CONFIG_INVALID_VALUE_TYPE invalid value type for an attribute
++ */
++int FontConfig_OHOS::parseTtcIndex(const Json::Value& root, const SkString& familyName)
++{
++    unsigned int keyCount = 2; // the value of 'index' is an array with 2 items.
++    if (root.size() == keyCount && root[0].isString() && root[1].isNumeric()) {
++        TtcIndexInfo item = { SkString(root[0].asCString()), root[1].asInt() };
++        if (item.ttcIndex != 0 && ttcIndexMap.find(item.familyName) == nullptr) {
++            ttcIndexMap.set(SkString(item.familyName), {SkString(item.familyName), 0});
++        }
++        ttcIndexMap.set(SkString(familyName), item);
++    } else {
++        int ret = ERROR_CONFIG_INVALID_VALUE_TYPE;
++        SkString text;
++        const char* key = "index";
++        if (root.size() != keyCount) {
++            text.appendf("%s#0", key);
++            errSet.emplace_back(ret, text.c_str());
++            LOGE("%s : '%s' size should be 2, but here it's %d\n", errToString(ret), key, root.size());
++            return ret;
++        } else if (!root[0].isString()) {
++            text.appendf("%s#1", key);
++            return logErrInfo(ret, text.c_str(), Json::stringValue, root[0].type());
++        } else {
++            text.appendf("%s#2", key);
++            return logErrInfo(ret, text.c_str(), Json::intValue, root[1].type());
++        }
++    }
++    return NO_ERROR;
++}
++
++/*! To get the axis value and set to 'font'
++ * \param axisDefs the axis ranges of a font
++ * \param variation the variation data from which axis values are generated
++ * \param[out] font the axis values will be written to and returned to the caller
++ */
++void FontConfig_OHOS::getAxisValues(const AxisDefinitions& axisDefs,
++    const VariationInfo& variation, FontInfo& font) const
++{
++    SkFontArguments::VariationPosition position;
++    position.coordinateCount = variation.axis.size();
++    position.coordinates = variation.axis.data();
++
++    int count = axisDefs.size();
++    SkFixed axisValues[count];
++    SkFontScanner_FreeType::computeAxisValues(axisDefs, position,
++        axisValues, font.familyName);
++    font.axisSet.axis.clear();
++    font.axisSet.range.clear();
++    for (int i = 0; i < count; i++) {
++        font.axisSet.axis.emplace_back(axisValues[i]);
++        font.axisSet.range.emplace_back(axisDefs[i]);
++    }
++}
++
++/*! To insert a ttc font into a font style set
++ * \param count the count of typeface in a ttc font
++ * \param font an object of the FontInfo with font information
++ * \return true, if the font is a ttc font and added to corresponding font style set
++ * \return false, if the font is not a ttc font
++ */
++bool FontConfig_OHOS::insertTtcFont(int count, FontInfo& font)
++{
++    bool ret = false;
++    ttcIndexMap.foreach([this, count, &font, &ret]
++        (const SkString& familyName, TtcIndexInfo* info) {
++        if (info->familyName == font.familyName && info->ttcIndex < count) {
++            SkString specifiedName;
++            TypefaceSet* tpSet = this->getTypefaceSet(familyName, specifiedName);
++            if (tpSet) {
++                FontInfo newFont(font);
++                newFont.familyName = familyName;
++                newFont.index = info->ttcIndex;
++                sk_sp<SkTypeface_OHOS> typeface = sk_make_sp<SkTypeface_OHOS>(specifiedName, newFont);
++                tpSet->push_back(std::move(typeface));
++                ret = true;
++            }
++        }
++    });
++    return ret;
++}
++
++/*! To insert a variable font into a font style set
++ * \param axisDefs the axis ranges of a variable font
++ * \param font an object of the FontInfo with font information
++ * \return true, if the font is a variable and some typefaces are added to the corresponding font style set
++ * \return false, if the font is not variable
++ */
++bool FontConfig_OHOS::insertVariableFont(const AxisDefinitions& axisDefs, FontInfo& font)
++{
++    const SkString& key = font.familyName;
++    if (variationMap.find(key) == nullptr || axisDefs.size() == 0) {
++        return false;
++    }
++    SkString specifiedName;
++    TypefaceSet* tpSet = getTypefaceSet(key, specifiedName);
++    if (tpSet == nullptr) {
++        return false;
++    }
++    const std::vector<VariationInfo>& variationSet = *(variationMap.find(key));
++    for (unsigned int i = 0; i < variationSet.size(); i++) {
++        FontInfo newFont(font);
++        getAxisValues(axisDefs, variationSet[i], newFont);
++        int width = font.style.width();
++        SkFontStyle::Slant slant = font.style.slant();
++        if (variationSet[i].width != -1) {
++            width = variationSet[i].width;
++        }
++        if (variationSet[i].slant != -1) {
++            slant = (SkFontStyle::Slant) variationSet[i].slant;
++        }
++        newFont.style = SkFontStyle(variationSet[i].weight, width, slant);
++        sk_sp<SkTypeface_OHOS> typeface = sk_make_sp<SkTypeface_OHOS>(specifiedName, newFont);
++        tpSet->push_back(std::move(typeface));
++    }
++    return true;
++}
++
++/*! To get the typeface set of a font style set
++ * \param familyName the family name of a font style set
++ * \param[out] specifiedName the specified family name of a font style set returned to the caller
++ * \return The object of typeface set
++ * \n      Return null, if the family name is not found in the system
++ */
++TypefaceSet* FontConfig_OHOS::getTypefaceSet(const SkString& familyName,
++    SkString& specifiedName) const
++{
++    if (aliasMap.find(familyName) != nullptr) {
++        const std::vector<AliasInfo>& aliasSet = *(aliasMap.find(familyName));
++        if (aliasSet.size()) {
++            int index = aliasSet[0].pos;
++            specifiedName = genericFamilySet[index]->familyName;
++            return genericFamilySet[index]->typefaceSet.get();
++        }
++    } else if (fallbackNames.find(familyName) != nullptr) {
++        int index = *(fallbackNames.find(familyName));
++        return fallbackSet[index]->typefaceSet.get();
++    }
++    return nullptr;
++}
++
++/*! To load font information from a font file
++ * \param scanner a scanner used to parse the font file
++ * \param fname the full name of a font file
++ * \return NO_ERROR successful
++ * \return ERROR_FONT_NOT_EXIST font file is not exist
++ * \return ERROR_FONT_INVALID_STREAM the stream is not recognized
++ */
++int FontConfig_OHOS::loadFont(const SkFontScanner& scanner, const char* fname)
++{
++    std::unique_ptr<SkStreamAsset> stream = SkStream::MakeFromFile(fname);
++    int count = 1;
++    SkFontScanner::AxisDefinitions axisDefs;
++    FontInfo font(fname, 0);
++    int ttcIndex = 0;
++    if (ttcIndexMap.find(font.familyName) != nullptr) {
++        ttcIndex = ttcIndexMap.find(font.familyName)->ttcIndex;
++    }
++    if (stream == nullptr ||
++        scanner.scanFile(stream.get(), &count) == false ||
++        scanner.scanInstance(
++            stream.get(),
++            ttcIndex,
++            0, 
++            &font.familyName, 
++            &font.style,
++            &font.isFixedWidth, 
++            &axisDefs) == false) {
++        int err = NO_ERROR;
++        if (stream == nullptr) {
++            err = ERROR_FONT_NOT_EXIST;
++        } else {
++            err = ERROR_FONT_INVALID_STREAM;
++        }
++        LOGE("load font %s : %s\n", errToString(err), fname);
++        char* fnameCopy = strdup(fname);
++        errSet.emplace_back(err, basename(fnameCopy));
++        free(fnameCopy);
++        return err;
++    }
++    // for adjustMap - update weight
++    if (adjustMap.find(font.familyName) != nullptr) {
++        const std::vector<AdjustInfo> adjustSet = *(adjustMap.find(font.familyName));
++        for (unsigned int i = 0; i < adjustSet.size(); i++) {
++            if (font.style.weight() == adjustSet[i].origValue) {
++                font.style = SkFontStyle(adjustSet[i].newValue, font.style.width(), font.style.slant());
++                break;
++            }
++        }
++    }
++    bool ret = false;
++    if (count > 1) {
++        ret = insertTtcFont(count, font);
++    } else if (axisDefs.size() > 0) {
++        ret = insertVariableFont(axisDefs, font);
++    }
++    if (!ret) {
++        SkString specifiedName;
++        TypefaceSet* tpSet = getTypefaceSet(font.familyName, specifiedName);
++        if (tpSet) {
++            sk_sp<SkTypeface_OHOS> typeface = sk_make_sp<SkTypeface_OHOS>(specifiedName, font);
++            tpSet->push_back(std::move(typeface));
++        }
++    }
++    return NO_ERROR;
++}
++
++/*! To scan the system font directories
++ * \param fontScanner the scanner used to parse a font file
++ * \return NO_ERROR success
++ * \return ERROR_DIR_NOT_FOUND a font directory is not exist
++ */
++int FontConfig_OHOS::scanFonts(const SkFontScanner& fontScanner)
++{
++    int err = NO_ERROR;
++    if (fontDirSet.size() == 0) {
++        fontDirSet.emplace_back(SkString("/system/fonts/"));
++    }
++    for (unsigned int i = 0; i < fontDirSet.size(); i++) {
++        DIR* dir = opendir(fontDirSet[i].c_str());
++        if (dir == nullptr) {
++            err = logErrInfo(ERROR_DIR_NOT_FOUND, fontDirSet[i].c_str());
++            continue;
++        }
++        struct dirent* node = nullptr;
++#if defined(SK_BUILD_FONT_MGR_FOR_PREVIEW_WIN)
++        struct stat filestat;
++#endif
++        while ((node = readdir(dir))) {
++#if defined(SK_BUILD_FONT_MGR_FOR_PREVIEW_WIN)
++            stat(node->d_name, &filestat);
++            if(S_ISDIR(filestat.st_mode)) {
++                continue;
++            }
++#else
++            if (node->d_type != DT_REG) {
++                continue;
++            }
++#endif
++            const char* fname = node->d_name;
++            int len = strlen(fname);
++            int suffixLen = strlen(".ttf");
++            if (len < suffixLen || (strncmp(fname + len - suffixLen, ".ttf", suffixLen) &&
++                strncmp(fname + len - suffixLen, ".otf", suffixLen) &&
++                strncmp(fname + len - suffixLen, ".ttc", suffixLen) &&
++                strncmp(fname + len - suffixLen, ".otc", suffixLen))) {
++                continue;
++            }
++            len += (fontDirSet[i].size() + 2); // 2 more characters for '/' and '\0'
++            char fullname[len];
++            memset(fullname,  0, len);
++            strncpy(fullname, fontDirSet[i].c_str(), fontDirSet[i].size());
++#if defined(SK_BUILD_FONT_MGR_FOR_PREVIEW_WIN)
++            if (fontDirSet[i][fontDirSet[i].size() - 1] != '\\') {
++                strcat(fullname, "\\");
++            }
++#else
++            if (fontDirSet[i][fontDirSet[i].size() - 1] != '/') {
++                strcat(fullname, "/");
++            }
++#endif
++            strcat(fullname, fname);
++            loadFont(fontScanner, fullname);
++        }
++        closedir(dir);
++    }
++    fontDirSet.clear();
++    return err;
++}
++
++/*! To reset the generic family
++ * \n 1. To sort the typefaces for each font style set in generic list
++ * \n 2. To build typeface set for those font style sets which have single weight value
++ */
++void FontConfig_OHOS::resetGenericValue()
++{
++    aliasMap.foreach([this](const std::pair<const SkString, std::vector<AliasInfo>>& pair) {
++        const std::vector<AliasInfo>& aliasSet = pair.second;
++        int index = aliasSet[0].pos;
++        if (genericFamilySet[index]->typefaceSet->size() == 0) {
++            SkDEBUGF("resetGenericValue ERROR_FAMILY_NOT_FOUND1 %s", pair.first.c_str());
++            this->logErrInfo(ERROR_FAMILY_NOT_FOUND, pair.first.c_str());
++        } else {
++            sortTypefaceSet(genericFamilySet[index]->typefaceSet);
++            for (unsigned int i = 1; i < aliasSet.size(); i++) {
++                if (aliasSet[i].weight == 0) {
++                    continue;
++                }
++                buildSubTypefaceSet(genericFamilySet[index]->typefaceSet,
++                    genericFamilySet[index + i]->typefaceSet,
++                    genericFamilySet[index + i]->familyName,
++                    aliasSet[i].weight);
++                if (genericFamilySet[index + i]->typefaceSet->size() == 0) {
++                    SkDEBUGF("resetGenericValue ERROR_FAMILY_NOT_FOUND2 %s", genericFamilySet[index + i]->familyName.c_str());
++                    this->logErrInfo(ERROR_FAMILY_NOT_FOUND,
++                        genericFamilySet[index + i]->familyName.c_str());
++                }
++            }
++        }
++    });
++
++    aliasMap.reset();
++    adjustMap.reset();
++    variationMap.reset();
++    ttcIndexMap.reset();
++}
++
++/*! To build a sub typeface set according to weight from a typeface set
++ * \param typefaceSet the parent typeface set
++ * \param[out] subSet the sub typeface set returned to the caller
++ * \param familyName the family name of the sub typeface set
++ * \param weight the weight of the sub typeface set
++ */
++void FontConfig_OHOS::buildSubTypefaceSet(const std::shared_ptr<TypefaceSet>& typefaceSet,
++    std::shared_ptr<TypefaceSet>& subSet, const SkString& familyName, int weight)
++{
++    if (typefaceSet->size() == 0) {
++        return;
++    }
++    for (unsigned int i = 0; i < typefaceSet->size(); i++) {
++        const SkTypeface_OHOS* typeface = (*typefaceSet)[i].get();
++        if (typeface && typeface->fontStyle().weight() == weight) {
++            const FontInfo* pFont = typeface->getFontInfo();
++            if (pFont == nullptr) {
++                continue;
++            }
++            FontInfo font(*pFont);
++            sk_sp<SkTypeface_OHOS> newTypeface = sk_make_sp<SkTypeface_OHOS>(familyName, font);
++            subSet->push_back(std::move(newTypeface));
++        }
++    }
++}
++
++/*! To reset the fallback value
++ * \n To sort the typefaces for each font style set in fallback list.
++ */
++void FontConfig_OHOS::resetFallbackValue()
++{
++    for (unsigned int i = 0; i < fallbackSet.size(); i++) {
++        if (fallbackSet[i]->typefaceSet->size() == 0) {
++                SkDEBUGF("resetFallbackValue ERROR_FAMILY_NOT_FOUND %s", fallbackSet[i]->familyName.c_str());
++
++            logErrInfo(ERROR_FAMILY_NOT_FOUND, fallbackSet[i]->familyName.c_str());
++        }
++        sortTypefaceSet(fallbackSet[i]->typefaceSet);
++    }
++}
++
++/*! To check if an error happened
++ * \param err the id of an error
++ * \param text the key to indicate the part with the error happened
++ * \return false, this kind of error did not happen
++ * \return true, the error happened
++ */
++bool FontConfig_OHOS::hasError(int err, const SkString& text) const
++{
++    for (unsigned int i = 0; i < errSet.size(); i++) {
++        if (errSet[i].err == err && errSet[i].text == text) {
++            return true;
++        }
++    }
++    return false;
++}
++
++/*! To get the total count of errors happened
++ * \return The count of errors
++ */
++int FontConfig_OHOS::getErrorCount() const
++{
++    return errSet.size();
++}
++
++/*! To sort the typeface set
++ * \param typefaceSet the typeface set to be sorted
++ */
++void FontConfig_OHOS::sortTypefaceSet(std::shared_ptr<TypefaceSet>& typefaceSet)
++{
++    if (typefaceSet.get() == nullptr || typefaceSet->size() <= 1) {
++        return;
++    }
++    TypefaceSet& tpSet = *(typefaceSet.get());
++    for (unsigned int i = 0; i < tpSet.size(); i++)
++    for (unsigned int j = 0; j < tpSet.size() - 1; j++) {
++        if ((tpSet[j]->fontStyle().weight() > tpSet[j + 1]->fontStyle().weight()) ||
++            (tpSet[j]->fontStyle().weight() == tpSet[j + 1]->fontStyle().weight() &&
++            tpSet[j]->fontStyle().slant() > tpSet[j + 1]->fontStyle().slant())) {
++            tpSet[j].swap(tpSet[j + 1]);
++        }
++    }
++}
++
++/*! To get the display text of an error
++ * \param err the id of an error
++ * \return The text to explain the error
++ */
++const char* FontConfig_OHOS::errToString(int err)
++{
++    const static std::array<const char*, ERROR_TYPE_COUNT> errToString{
++        "successful",                                                      // NO_ERROR = 0
++        "config file is not found",                              // ERROR_CONFIG_NOT_FOUND
++        "the format of config file is not supported", // ERROR_CONFIG_FORMAT_NOT_SUPPORTED
++        "missing tag",                                         // ERROR_CONFIG_MISSING_TAG
++        "invalid value type",                           // ERROR_CONFIG_INVALID_VALUE_TYPE
++        "font file is not exist",                                  // ERROR_FONT_NOT_EXIST
++        "invalid font stream",                                // ERROR_FONT_INVALID_STREAM
++        "no font stream",                                          // ERROR_FONT_NO_STREAM
++        "family is not found",                                   // ERROR_FAMILY_NOT_FOUND
++        "no available family in the system",                   //ERROR_NO_AVAILABLE_FAMILY
++        "no such directory"                                         // ERROR_DIR_NOT_FOUND
++    };
++    if (err >= 0 && err < ERROR_TYPE_COUNT) {
++        return errToString[err];
++    }
++    return "unknown error";
++}
++
++/*! To log the error information
++ * \param err the id of an error
++ * \param key the key which indicates the the part with the error
++ * \param expected the expected type of json node.
++ * \n     It's used only for err 'ERROR_CONFIG_INVALID_VALUE_TYPE'
++ * \param actual the actual type of json node.
++ * \n     It's used only for err 'ERROR_CONFIG_INVALID_VALUE_TYPE'
++ * \return err
++ */
++int FontConfig_OHOS::logErrInfo(int err, const char* key, Json::ValueType expected,
++    Json::ValueType actual)
++{
++    errSet.emplace_back(err, key);
++    if (err != ERROR_CONFIG_INVALID_VALUE_TYPE) {
++        LOGE("%s : %s\n", errToString(err), key);
++    } else {
++        const char* types[] = {
++            "null",
++            "int",
++            "unit",
++            "real",
++            "string",
++            "boolean",
++            "array",
++            "object",
++        };
++        int size = sizeof(types) / sizeof(char*);
++        if ((expected >= 0 && expected < size) &&
++            (actual >= 0 && actual < size)) {
++            LOGE("%s : '%s' should be '%s', but here it's '%s'\n",
++                errToString(err), key, types[expected], types[actual]);
++        } else {
++            LOGE("%s : %s\n", errToString(err), key);
++        }
++    }
++    return err;
++}
++
++bool FontConfig_OHOS::judgeFileExist()
++{
++    bool haveFile = false;
++    for (unsigned int i = 0; i < fontDirSet.size(); i++) {
++        DIR* dir = opendir(fontDirSet[i].c_str());
++        if (dir == nullptr) {
++            logErrInfo(ERROR_DIR_NOT_FOUND, fontDirSet[i].c_str());
++            continue;
++        }
++        struct dirent* node = nullptr;
++#if defined(SK_BUILD_FONT_MGR_FOR_PREVIEW_WIN)
++        struct stat fileStat;
++#endif
++        while ((node = readdir(dir))) {
++#if defined(SK_BUILD_FONT_MGR_FOR_PREVIEW_WIN)
++            stat(node->d_name, &fileStat);
++            if (S_ISDIR(fileStat.st_mode)) {
++                continue;
++            }
++#else
++            if (node->d_type != DT_REG) {
++                continue;
++            }
++#endif
++            const char* fileName = node->d_name;
++            int len = strlen(fileName);
++            int suffixLen = strlen(".ttf");
++            if (len < suffixLen || (strncmp(fileName + len - suffixLen, ".ttf", suffixLen) &&
++                strncmp(fileName + len - suffixLen, ".otf", suffixLen) &&
++                strncmp(fileName + len - suffixLen, ".ttc", suffixLen) &&
++                strncmp(fileName + len - suffixLen, ".otc", suffixLen))) {
++                continue;
++            }
++            haveFile = true;
++            break;
++        }
++        (void)closedir(dir);
++        if (haveFile) {
++            break;
++        }
++    }
++    return haveFile;
++}
++
++int FontConfig_OHOS::checkProductFile(const char* fname)
++{
++    int err = parseConfig(PRODUCT_DEFAULT_CONFIG);
++    SkDebugf("parse productfontconfig json file err = %d", err);
++    if ((err != NO_ERROR) || (!judgeFileExist())) {
++        SkDebugf("parse productfontconfig json file error");
++        fontDirSet.clear();
++        fallbackForMap.reset();
++        genericFamilySet.clear();
++        fallbackSet.clear();
++        genericNames.reset();
++        fallbackNames.reset();
++        errSet.clear();
++        aliasMap.reset();
++        adjustMap.reset();
++        variationMap.reset();
++        ttcIndexMap.reset();
++        err = parseConfig(fname);
++    }
++    return err;
++}
+diff --git a/src/ports/skia_ohos/FontConfig_ohos.h b/src/ports/skia_ohos/FontConfig_ohos.h
+new file mode 100644
+index 0000000000..14bea572bf
+--- /dev/null
++++ b/src/ports/skia_ohos/FontConfig_ohos.h
+@@ -0,0 +1,235 @@
++// Copyright (c) 2023 Huawei Device Co., Ltd. All rights reserved
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef FONTCONFIG_OHOS_H
++#define FONTCONFIG_OHOS_H
++
++#include <json/json.h>
++#include <vector>
++
++#include "SkFontDescriptor.h"
++#include "SkFontHost_FreeType_common.h"
++#include "SkFontStyle.h"
++#include "SkStream.h"
++#include "SkString.h"
++#include "SkTypes.h"
++#include "SkTHash.h"
++
++#include "FontInfo_ohos.h"
++#include "SkTypeface_ohos.h"
++
++#ifdef ENABLE_DEBUG
++
++#define LOGE(fmt, args...)        \
++    printf("E %s:%d  %s - " fmt, basename(__FILE__), __LINE__, __FUNCTION__, ##args)
++#define LOGI(fmt, args...)        \
++    printf("I %s:%d - " fmt,  __FUNCTION__, __LINE__, ##args)
++#define LOGW(fmt, args...)        \
++    printf("W %s:%d  %s - " fmt, basename(__FILE__), __LINE__, __FUNCTION__, ##args)
++
++#else
++
++#define LOGE        SkDEBUGF
++#define LOGI        SkDEBUGF
++#define LOGW        SkDEBUGF
++
++#endif
++
++struct FontInfo;
++struct FallbackInfo;
++struct GenericFamily;
++struct FallbackSetPos;
++
++using TypefaceSet = std::vector<sk_sp<SkTypeface_OHOS>>;
++using GenericFamilySet = std::vector<std::unique_ptr<GenericFamily>>;
++using FallbackSet = std::vector<std::unique_ptr<FallbackInfo>>;
++using FallbackForMap = skia_private::THashMap<SkString, FallbackSetPos>;
++using NamesMap = skia_private::THashMap<SkString, int>;
++using Coordinate = SkFontArguments::VariationPosition::Coordinate;
++using AxisDefinitions = SkFontScanner::AxisDefinitions;
++
++/*!
++ * Error code definition
++ */
++namespace ErrorCode {
++
++enum {
++    NO_ERROR = 0,                           // no error
++    ERROR_CONFIG_NOT_FOUND,                 // the configuration document is not found
++    ERROR_CONFIG_FORMAT_NOT_SUPPORTED,      // the formation of configuration is not supported
++    ERROR_CONFIG_MISSING_TAG,               // missing tag in the configuration
++    ERROR_CONFIG_INVALID_VALUE_TYPE,        // invalid value type in the configuration
++    ERROR_FONT_NOT_EXIST,                   // the font file is not exist
++    ERROR_FONT_INVALID_STREAM,              // the stream is not recognized
++    ERROR_FONT_NO_STREAM,                   // no stream in the font data
++    ERROR_FAMILY_NOT_FOUND,                 // the family name is not found in the system
++    ERROR_NO_AVAILABLE_FAMILY,              // no available family in the system
++    ERROR_DIR_NOT_FOUND,                    // the directory is not exist
++
++    ERROR_TYPE_COUNT,
++};
++
++} /* namespace ErrorCode */
++
++/*!
++ *  \brief To manage the related information of a 'fallbackFor' family name
++ */
++struct FallbackSetPos {
++    unsigned int index; // the index of the first font style set in the fallback set for a specified family name
++    unsigned int count; // the count of font style sets for a specified family name
++};
++
++/*!
++ * \brief To manage the information for a generic family item
++ */
++struct GenericFamily {
++    SkString familyName; // the specified family name of the font style set
++    std::shared_ptr<TypefaceSet> typefaceSet; // the typeface set of the font style set
++    virtual ~GenericFamily() = default;
++};
++
++/*!
++ * \brief To manage the information for a fallback family item
++ */
++struct FallbackInfo : GenericFamily {
++    SkString langs; // the language for which the font style set is
++};
++
++/*!
++ * \brief To parse the font configuration document and manage the system fonts
++ */
++class FontConfig_OHOS {
++public:
++    explicit FontConfig_OHOS(const SkFontScanner& fontScanner,
++        const char* fname = nullptr);
++    virtual ~FontConfig_OHOS() = default;
++    const FallbackForMap& getFallbackForMap() const;
++    const FallbackSet& getFallbackSet() const;
++    int getFamilyCount() const;
++    int getDefaultFamily(SkString* familyName) const;
++    int getFamilyName(int index, SkString* familyName) const;
++    int getTypefaceCount(int styleIndex, bool isFallback = false) const;
++    int getStyleIndex(const char* familyName, bool& isFallback) const;
++
++    sk_sp<SkTypeface_OHOS> getTypeface(int styleIndex, int index, bool isFallback = false) const;
++    sk_sp<SkTypeface_OHOS> getTypeface(int styleIndex, const SkFontStyle& style,
++        bool isFallback = false) const;
++
++#if ENABLE_DEBUG
++    void dumpFont(const FontInfo& font) const;
++    void dumpGeneric() const;
++    void dumpFallback() const;
++#endif
++    bool hasError(int err, const SkString& text) const;
++    int getErrorCount() const;
++
++    static sk_sp<SkTypeface_OHOS> matchFontStyle(const TypefaceSet& typefaceSet, const SkFontStyle& pattern);
++
++    static const char* errToString(int err);
++private:
++    struct AliasInfo;
++    struct AdjustInfo;
++    struct VariationInfo;
++    struct TtcIndexInfo;
++    using AliasMap = skia_private::THashMap<SkString, std::vector<AliasInfo>>;
++    using AjdustMap = skia_private::THashMap<SkString, std::vector<AdjustInfo>>;
++    using VariationMap = skia_private::THashMap<SkString, std::vector<VariationInfo>>;
++    using TtcIndexMap = skia_private::THashMap<SkString, TtcIndexInfo>;
++
++    /*!
++     * \brief To manage the adjust information
++     */
++    struct AdjustInfo {
++        int origValue; // the real value of the font weight
++        int newValue; // the specified value of weight for a font
++    };
++
++    /*!
++     * \brief To manage the alias information of
++     */
++    struct AliasInfo {
++        int pos; // the index of a font style set in generic family list.
++        int weight; // the weight of the font style set. 0 means no specified weight
++    };
++
++    /*!
++     * \brief To manage the variation information
++     */
++    struct VariationInfo {
++        VariationInfo() : weight(-1), width(-1), slant(-1){}
++        std::vector<Coordinate> axis; // the axis set such as 'wght', 'wdth' and 'slnt'.
++        int weight; // the value of mapping weight
++        int width;  // the value of mapping width
++        int slant; // the value of mapping slant
++    };
++
++    /*!
++     * \brief To manage the 'index' information for ttc fonts
++     */
++    struct TtcIndexInfo {
++        SkString familyName; // the family name of the first typeface in a ttc font
++        int ttcIndex; // the index of a typeface in a ttc font
++    };
++
++    /*!
++     * \brief To manage the information of errors happened
++     */
++    struct ErrorInfo {
++        ErrorInfo(int err, const char* text) : err(err), text(SkString(text)){}
++        ErrorInfo(int err, SkString& text) : err(err), text(std::move(text)){}
++        int err; // error id
++        SkString text; // the part with error
++    };
++
++    std::vector<SkString> fontDirSet; // the directories where the fonts are
++
++    FallbackForMap    fallbackForMap; // a hash table to save the fallbackFor pairs
++    GenericFamilySet genericFamilySet; // the font style set list of generic family
++    FallbackSet fallbackSet; // the font style set list of fallback family
++
++    NamesMap genericNames; // a map to store the index of a family for generic family
++    NamesMap fallbackNames; // a map to store the index of a family for fallback family
++
++    std::vector<ErrorInfo> errSet; // the errors happened
++    AliasMap aliasMap; // to save alias information temporarily
++    AjdustMap adjustMap; // to save adjust information temporarily
++    VariationMap variationMap; // to save variation information temporarily
++    TtcIndexMap ttcIndexMap; // to save 'index' information temporarily
++
++    int parseConfig(const char* fname);
++    int checkConfigFile(const char* fname, Json::Value& root);
++    int parseFontDir(const Json::Value& root);
++    int parseGeneric(const Json::Value& root);
++    int parseFallback(const Json::Value& root);
++    int parseFallbackItem(const Json::Value& root);
++    int parseAlias(const Json::Value& root, std::vector<AliasInfo>& aliasSet);
++    int parseAdjust(const Json::Value& root, std::vector<AdjustInfo>& adjustSet);
++    int parseVariation(const Json::Value& root, std::vector<VariationInfo>& variationSet);
++    int parseTtcIndex(const Json::Value& root, const SkString& familyName);
++    void getAxisValues(const AxisDefinitions& axisDefinitions,
++        const VariationInfo& variation, FontInfo& font) const;
++    bool insertTtcFont(int count, FontInfo& font);
++    bool insertVariableFont(const AxisDefinitions& axisDefinitions, FontInfo& font);
++    TypefaceSet* getTypefaceSet(const SkString& familyName, SkString& specifiedName) const;
++
++    int loadFont(const SkFontScanner& scanner, const char* fname);
++    int scanFonts(const SkFontScanner& fontScanner);
++    void resetGenericValue();
++    void buildSubTypefaceSet(const std::shared_ptr<TypefaceSet>& typefaceSet,
++        std::shared_ptr<TypefaceSet>& subSet, const SkString& familyName, int weight);
++    void resetFallbackValue();
++    int logErrInfo(int err, const char* key, Json::ValueType expected = Json::nullValue,
++        Json::ValueType actual = Json::nullValue);
++    static void sortTypefaceSet(std::shared_ptr<TypefaceSet>& typefaceSet);
++    static uint32_t getFontStyleDifference(const SkFontStyle& style1, const SkFontStyle& style2);
++    static char* getFileData(const char* fname, int& size);
++    FontConfig_OHOS(const FontConfig_OHOS&) = delete;
++    FontConfig_OHOS& operator = (const FontConfig_OHOS&) = delete;
++    FontConfig_OHOS(FontConfig_OHOS&&) = delete;
++    FontConfig_OHOS& operator = (FontConfig_OHOS&&) = delete;
++    int checkProductFile(const char* fname);
++    bool judgeFileExist();
++};
++
++#endif /* FONTCONFIG_OHOS_H */
+diff --git a/src/ports/skia_ohos/FontInfo_ohos.h b/src/ports/skia_ohos/FontInfo_ohos.h
+new file mode 100644
+index 0000000000..0292a58e92
+--- /dev/null
++++ b/src/ports/skia_ohos/FontInfo_ohos.h
+@@ -0,0 +1,148 @@
++// Copyright (c) 2023 Huawei Device Co., Ltd. All rights reserved
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef FONTINFO_OHOS_H
++#define FONTINFO_OHOS_H
++
++#include <vector>
++
++#include "SkFixed.h"
++#include "SkFontScanner.h"
++#include "SkFontDescriptor.h"
++#include "SkFontHost_FreeType_common.h"
++
++/*!
++ * \brief To manage the font information
++ */
++struct FontInfo {
++public:
++    /*! Constructor
++     *
++     */
++    FontInfo() : familyName(""), fname(""), index(0),
++        style(SkFontStyle::Normal()), isFixedWidth(false), stream(nullptr)
++    {
++        memset(&axisSet, 0, sizeof(AxisSet));
++    }
++    /*! Copy Constructor
++     * \param font an object of FontInfo
++     */
++    explicit FontInfo(const FontInfo& font)
++        : familyName(font.familyName), fname(font.fname), index(font.index),
++          style(font.style), isFixedWidth(font.isFixedWidth), stream(nullptr)
++    {
++        axisSet.axis = font.axisSet.axis;
++        axisSet.range = font.axisSet.range;
++        if (font.stream) {
++            stream = font.stream->duplicate();
++        }
++    }
++
++    /*! Move Constructor
++     * \param font an object of FontInfo
++     */
++    explicit FontInfo(FontInfo&& font)
++        : familyName(std::move(font.familyName)), fname(std::move(font.fname)), index(font.index),
++          style(font.style), isFixedWidth(font.isFixedWidth), stream(nullptr)
++    {
++        axisSet.axis = std::move(font.axisSet.axis);
++        axisSet.range = std::move(font.axisSet.range);
++        if (font.stream) {
++            stream = std::move(font.stream);
++        }
++    }
++
++    /*! Constructor
++     * \param fname the fullname of font file
++     * \param index the index of the typeface in the font file
++     */
++    FontInfo(const char* fname, int index)
++        : familyName(""), fname(""), index(index),
++          style(SkFontStyle::Normal()), isFixedWidth(false), stream(nullptr)
++    {
++        if (fname) {
++            this->fname.set(fname);
++        }
++        memset(&axisSet, 0, sizeof(axisSet));
++    }
++
++    /*! Destructor
++     *
++     */
++    virtual ~FontInfo() = default;
++
++    /*! Copy assignment operator
++     * \param font an object of FontInfo
++     */
++    FontInfo& operator = (const FontInfo& font)
++    {
++        if (this == &font) {
++            return *this;
++        }
++        familyName = font.familyName;
++        fname = font.fname;
++        index = font.index;
++        style = font.style;
++        isFixedWidth = font.isFixedWidth;
++        axisSet.axis = font.axisSet.axis;
++        axisSet.range = font.axisSet.range;
++        if (font.stream) {
++            stream = font.stream->duplicate();
++        }
++        return *this;
++    }
++
++    /*! The move assignment operator
++     * \param font an object of FontInfo
++     */
++    FontInfo& operator = (FontInfo&& font)
++    {
++        if (this == &font) {
++            return *this;
++        }
++        familyName = std::move(font.familyName);
++        fname = std::move(font.fname);
++        index = font.index;
++        style = font.style;
++        isFixedWidth = font.isFixedWidth;
++        axisSet.axis = std::move(font.axisSet.axis);
++        axisSet.range = std::move(font.axisSet.range);
++        if (font.stream) {
++            stream = std::move(font.stream);
++        }
++        return *this;
++    }
++
++    /*! To set axis values
++     * \param count the count of axis
++     * \param axis an array of SkFixed value
++     * \param range an array of AxisDefinition
++     */
++    void setAxisSet(int count, const SkFixed* axis,
++        const SkFontScanner::AxisDefinition* range)
++    {
++        axisSet.axis.clear();
++        axisSet.range.clear();
++        for (int i = 0; i < count; i++) {
++            axisSet.axis.emplace_back(axis[i]);
++            axisSet.range.emplace_back(range[i]);
++        }
++    }
++
++    SkString familyName;  // the real family name of the font
++    SkString fname; // the full name of font file
++    int index; // the index of the font in a ttc font
++    SkFontStyle style; // the font style
++    bool isFixedWidth; // the flag to indicate if the font has fixed width or not
++    /*!
++     * \brief To manage the axis values for variable font
++     */
++    struct AxisSet {
++        std::vector<SkFixed> axis;  // the axis values
++        std::vector<SkFontScanner::AxisDefinition> range; // the axis ranges
++    } axisSet; // the axis values for a variable font
++    std::unique_ptr<SkStreamAsset> stream; // the data stream of font file
++};
++
++#endif /* FONTINFO_OHOS_H */
+diff --git a/src/ports/skia_ohos/SkFontMgr_ohos.cpp b/src/ports/skia_ohos/SkFontMgr_ohos.cpp
+new file mode 100644
+index 0000000000..4863430366
+--- /dev/null
++++ b/src/ports/skia_ohos/SkFontMgr_ohos.cpp
+@@ -0,0 +1,432 @@
++// Copyright (c) 2023 Huawei Device Co., Ltd. All rights reserved
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "SkFontMgr_ohos.h"
++
++#include "SkTypeface_ohos.h"
++#include "SkRefCnt.h"
++#include "include/private/base/SkDebug.h"
++
++using namespace ErrorCode;
++
++/*! Constructor
++ * \param path the full path of system font configuration document
++ */
++SkFontMgr_OHOS::SkFontMgr_OHOS(const char* path)
++{
++    fontConfig = std::make_shared<FontConfig_OHOS>(fontScanner, path);
++    familyCount = fontConfig->getFamilyCount();
++}
++
++/*! To get the count of families
++ * \return The count of families in the system
++ */
++int SkFontMgr_OHOS::onCountFamilies() const
++{
++    return familyCount;
++}
++
++/*! To get the family name for a font style set
++ * \param index the index of a font style set
++ * \param[out] familyName the family name returned to the caller
++ * \n          The family name will be reset to "", if index is out of range
++ */
++void SkFontMgr_OHOS::onGetFamilyName(int index, SkString* familyName) const
++{
++    if (fontConfig == nullptr || familyName == nullptr) {
++        return;
++    }
++    fontConfig->getFamilyName(index, familyName);
++}
++
++/*! To create an object of SkFontStyleSet
++ * \param index the index of a font style set
++ * \return The pointer of SkFontStyleSet
++ * \n      Return null, if index is out of range
++ * \note   The caller must call unref() on the returned object if it's not null
++ */
++sk_sp<SkFontStyleSet> SkFontMgr_OHOS::onCreateStyleSet(int index) const
++{
++    if (fontConfig == nullptr) {
++        return nullptr;
++    }
++    if (index < 0 || index >= this->countFamilies()) {
++        return nullptr;
++    }
++    return sk_ref_sp(new SkFontStyleSet_OHOS(fontConfig, index));
++}
++
++/*! To get a matched object of SkFontStyleSet
++ * \param familyName the family name of a font style set
++ * \return The pointer of SkFontStyleSet
++ * \n      Return the default font style set, if family name is null
++ * \n      Return null, if family name is not found
++ * \note   The caller must call unref() on the returned object if it's not null
++ */
++sk_sp<SkFontStyleSet> SkFontMgr_OHOS::onMatchFamily(const char familyName[]) const
++{
++    if (fontConfig == nullptr) {
++        SkDEBUGF("onMatchFamily get null fontConfig");
++        return nullptr;
++    }
++    SkDEBUGF("onMatchFamily get familyName %s", familyName);
++    // return default system font when familyName is null
++    if (familyName == nullptr) {
++        SkDEBUGF("onMatchFamily get null familyName");
++        return sk_ref_sp(new SkFontStyleSet_OHOS(fontConfig, 0));
++    }
++
++    bool isFallback = false;
++    int index = fontConfig->getStyleIndex(familyName, isFallback);
++    if (index == -1) {
++        SkDEBUGF("onMatchFamily get -1 index");
++        return nullptr;
++    }
++    SkDEBUGF("onMatchFamily get index %d", index);
++    return sk_ref_sp(new SkFontStyleSet_OHOS(fontConfig, index, isFallback));
++}
++
++/*! To get a matched typeface
++ * \param familyName the family name of a font style set
++ * \param style the font style to be matched
++ * \return An object of typeface which is closest matching to 'style'
++ * \n      Return the typeface in the default font style set, if family name is null
++ * \n      Return null, if family name is not found
++ * \note   The caller must call unref() on the returned object if it's not null
++ */
++sk_sp<SkTypeface> SkFontMgr_OHOS::onMatchFamilyStyle(const char familyName[], const SkFontStyle& style) const
++{
++    if (fontConfig == nullptr) {
++        return nullptr;
++    }
++    bool isFallback = false;
++    int styleIndex = 0;
++    if (familyName) {
++        styleIndex = fontConfig->getStyleIndex(familyName, isFallback);
++    }
++    return fontConfig->getTypeface(styleIndex, style, isFallback);
++}
++
++/*! To get a matched typeface
++ * \n Use the system fallback to find a typeface for the given character.
++ * \param familyName the family name which the typeface is fallback For
++ * \param style the font style to be matched
++ * \param bcp47 an array of languages which indicate the language of 'character'
++ * \param bcp47Count the array size of bcp47
++ * \param character a UTF8 value to be matched
++ * \return An object of typeface which is for the given character
++ * \return Return the typeface in the default fallback set, if familyName is null
++ * \return Return null, if the typeface is not found for the given character
++ * \note The caller must call unref() on the returned object if it's not null
++ */
++sk_sp<SkTypeface> SkFontMgr_OHOS::onMatchFamilyStyleCharacter(const char familyName[], const SkFontStyle& style,
++    const char* bcp47[], int bcp47Count, SkUnichar character) const
++{
++    if (fontConfig == nullptr) {
++        return nullptr;
++    }
++    const FallbackForMap& fallbackForMap = fontConfig->getFallbackForMap();
++    const FallbackSet& fallbackSet = fontConfig->getFallbackSet();
++    SkString defaultFamily("");
++    SkString key = defaultFamily;
++    FallbackSetPos* item = nullptr;
++    if (familyName == nullptr) {
++        item = fallbackForMap.find(defaultFamily);
++    } else {
++        item = fallbackForMap.find(SkString(familyName));
++        if (item) {
++            key = SkString(familyName);
++        } else {
++            item = fallbackForMap.find(defaultFamily);
++        }
++    }
++    if (item == nullptr) {
++        LOGE("%s : '%s' must be a fallback key in the config file\n",
++            FontConfig_OHOS::errToString(ERROR_FAMILY_NOT_FOUND), defaultFamily.c_str());
++        return nullptr;
++    }
++    while (true) {
++        if (bcp47Count > 0) {
++            sk_sp<SkTypeface> retTp = findTypeface(*item, style, bcp47, bcp47Count, character);
++            if (retTp) {
++                return retTp;
++            }
++            if (key == defaultFamily) {
++                bcp47Count = 0;
++                continue;
++            }
++            item = fallbackForMap.find(defaultFamily);
++            key = defaultFamily;
++        } else {
++            for (unsigned int i = item->index; i < item->index + item->count && i < fallbackSet.size(); i++) {
++                const TypefaceSet& tpSet = *(fallbackSet[i]->typefaceSet.get());
++                if (tpSet.size() > 0 && tpSet[0]->unicharToGlyph(character) != 0) {
++                    sk_sp<SkTypeface> typeface = FontConfig_OHOS::matchFontStyle(tpSet, style);
++                    return typeface;
++                }
++            }
++            if (key == defaultFamily) {
++                break;
++            }
++            item = fallbackForMap.find(defaultFamily);
++            key = defaultFamily;
++        }
++    }
++    return nullptr;
++}
++
++/*! To find the matched typeface for the given parameters
++ * \n Use the system fallback to find a typeface for the given character.
++ * \param fallbackItem the fallback items in which to find the typeface
++ * \param style the font style to be matched
++ * \param bcp47 an array of languages which indicate the language of 'character'
++ * \param bcp47Count the array size of bcp47
++ * \param character a UTF8 value to be matched
++ * \return An object of typeface which is for the given character
++ * \return Return null, if the typeface is not found for the given character
++ */
++sk_sp<SkTypeface> SkFontMgr_OHOS::findTypeface(const FallbackSetPos& fallbackItem, const SkFontStyle& style,
++    const char* bcp47[], int bcp47Count, SkUnichar character) const
++{
++    if (bcp47Count == 0) {
++        return nullptr;
++    }
++
++    const FallbackSet& fallbackSet = fontConfig->getFallbackSet();
++    // example bcp47 code : 'zh-Hans' : ('zh' : iso639 code, 'Hans' : iso15924 code)
++    // iso639 code will be taken from bcp47 code, so that we can try to match
++    // bcp47 or only iso639. Therefore totalCount need to be 'bcp47Count * 2'
++    int totalCount = bcp47Count * 2;
++    int tps[totalCount];
++    for (int i = 0; i < totalCount; i++) {
++        tps[i] = -1;
++    }
++    // find the families matching the bcp47 list
++    for (unsigned int i = fallbackItem.index; i < fallbackItem.index + fallbackItem.count
++        && i < fallbackSet.size(); i++) {
++        int ret = compareLangs(fallbackSet[i]->langs, bcp47, bcp47Count, tps);
++        if (ret == -1) {
++            continue;
++        }
++        tps[ret] = i;
++    }
++    // match typeface in families
++    for (int i = bcp47Count - 1; i >= 0; i--) {
++        if (tps[i] == -1) {
++            continue;
++        }
++        const TypefaceSet& tpSet = *(fallbackSet[tps[i]]->typefaceSet.get());
++        if (tpSet.size() > 0 && tpSet[0]->unicharToGlyph(character) != 0) {
++            sk_sp<SkTypeface> typeface = FontConfig_OHOS::matchFontStyle(tpSet, style);
++            return typeface;
++        }
++    }
++    for (int i = totalCount - 1; i >= bcp47Count; i--) {
++        if (tps[i] == -1) {
++            continue;
++        }
++        const TypefaceSet& tpSet = *(fallbackSet[tps[i]]->typefaceSet.get());
++        if (tpSet.size() > 0 && tpSet[0]->unicharToGlyph(character) != 0) {
++            sk_sp<SkTypeface> typeface = FontConfig_OHOS::matchFontStyle(tpSet, style);
++            return typeface;
++        }
++    }
++    return nullptr;
++}
++
++/*! To compare the languages of an typeface with a bcp47 list
++ * \param langs the supported languages by an typeface
++ * \param bcp47 the array of bcp47 language to be matching
++ * \param bcp47Count the array size of bcp47
++ * \param tps an array of the index of typeface which is matching one value of bcp47
++ * \return The index of language in bcp47, if matching happens
++ * \n      Return -1, if no language matching happens
++ */
++int SkFontMgr_OHOS::compareLangs(const SkString& langs, const char* bcp47[],
++    int bcp47Count, const int tps[]) const
++{
++    /*
++     * zh-Hans : ('zh' : iso639 code, 'Hans' : iso15924 code)
++     */
++    if (bcp47 == nullptr || bcp47Count == 0) {
++        return -1;
++    }
++    for (int i = bcp47Count - 1; i >= 0; i--) {
++        if (tps[i] != -1) {
++            continue;
++        }
++        if (langs.find(bcp47[i]) != -1) {
++            return i;
++        } else {
++            const char* iso15924 = strrchr(bcp47[i], '-');
++            if (iso15924 == nullptr) {
++                continue;
++            }
++            iso15924++;
++            int len = iso15924 - 1 - bcp47[i];
++            SkString country(bcp47[i], len);
++            if (langs.find(iso15924) != -1 ||
++                (strncmp(bcp47[i], "und", strlen("und")) && langs.find(country.c_str()) != -1)) {
++                return i + bcp47Count;
++            }
++        }
++    }
++    return -1;
++}
++
++
++/*! To create a typeface from the specified data and TTC index
++ * \param data the data to be parsed
++ * \param index the index of typeface. 0 for none
++ * \return The object of typeface, if successful
++ * \n      Return null if the data is not recognized.
++ * \note The caller must call unref() on the returned object if it's not null
++ */
++sk_sp<SkTypeface> SkFontMgr_OHOS::onMakeFromData(sk_sp<SkData> data, int ttcIndex) const
++{
++    if (data == nullptr) {
++        return nullptr;
++    }
++    std::unique_ptr<SkMemoryStream> memoryStream = std::make_unique<SkMemoryStream>(data);
++    SkFontArguments args;
++    args.setCollectionIndex(ttcIndex);
++    return this->makeTypeface(std::move(memoryStream), args, nullptr);
++}
++
++/*! To create a typeface from the specified stream and TTC index
++ * \param data the stream to be parsed
++ * \param index the index of typeface. 0 for none
++ * \return The object of typeface, if successful
++ * \n      Return null if the stream is not recognized.
++ * \note The caller must call unref() on the returned object if it's not null
++ */
++sk_sp<SkTypeface> SkFontMgr_OHOS::onMakeFromStreamIndex(std::unique_ptr<SkStreamAsset> stream,
++    int ttcIndex) const
++{
++    if (stream == nullptr) {
++        return nullptr;
++    }
++    SkFontArguments args;
++    args.setCollectionIndex(ttcIndex);
++    return this->makeTypeface(std::move(stream), args, nullptr);
++}
++
++/*! To create a typeface from the specified stream and font arguments
++ * \param data the stream to be parsed
++ * \param args the arguments of font
++ * \return The object of typeface, if successful
++ * \n      Return null if the stream is not recognized.
++ * \note The caller must call unref() on the returned object if it's not null
++ */
++sk_sp<SkTypeface> SkFontMgr_OHOS::onMakeFromStreamArgs(std::unique_ptr<SkStreamAsset> stream,
++    const SkFontArguments& args) const
++{
++    if (stream == nullptr) {
++        return nullptr;
++    }
++
++    return this->makeTypeface(std::move(stream), args, nullptr);
++}
++
++/*! To create a typeface from the specified font file and TTC index
++ * \param path the full path of the given font file
++ * \param ttcIndex the index of typeface in a ttc font file. 0 means none.
++ * \return The object of typeface, if successful
++ * \n      Return null if the font file is not found or the content of file is not recognized.
++ * \note The caller must call unref() on the returned object if it's not null
++ */
++sk_sp<SkTypeface> SkFontMgr_OHOS::onMakeFromFile(const char path[], int ttcIndex) const
++{
++    if (fontConfig == nullptr) {
++        return nullptr;
++    }
++
++    std::unique_ptr<SkStreamAsset> stream = SkStreamAsset::MakeFromFile(path);
++    if (stream == nullptr) {
++        LOGE("%s : %s\n", FontConfig_OHOS::errToString(ERROR_FONT_NOT_EXIST), path);
++        return nullptr;
++    }
++    SkFontArguments args;
++    args.setCollectionIndex(ttcIndex);
++    return this->makeTypeface(std::move(stream), args, path);
++}
++
++/*! To get a typeface matching the specified family and style
++ * \param familyName the specified name to be matching
++ * \param style the specified style to be matching
++ * \return The object of typeface which is the closest matching 'style' when the familyName is found
++ * \return Return a typeface from the default family, if familyName is not found
++ * \return Return null, if there is no any typeface in the system
++ * \note The caller must caller unref() on the returned object is it's not null
++ */
++sk_sp<SkTypeface> SkFontMgr_OHOS::onLegacyMakeTypeface(const char familyName[], SkFontStyle style) const
++{
++    sk_sp<SkTypeface> typeface = this->onMatchFamilyStyle(familyName, style);
++    // if familyName is not found, then try the default family
++    if (typeface == nullptr && familyName != nullptr) {
++        typeface = this->onMatchFamilyStyle(nullptr, style);
++    }
++
++    if (typeface) {
++        return sk_sp<SkTypeface>(typeface);
++    }
++    LOGE("onLegacyMakeTypeface %s\n", FontConfig_OHOS::errToString(ERROR_NO_AVAILABLE_FAMILY));
++    return nullptr;
++}
++
++/*! To make a typeface from the specified stream and font arguments
++ * \param stream the specified stream to be parsed to get font information
++ * \param args the arguments of index or axis values
++ * \param path the fullname of font file
++ * \return The object of typeface if successful
++ * \n      Return null, if the stream is not recognized
++ */
++sk_sp<SkTypeface> SkFontMgr_OHOS::makeTypeface(std::unique_ptr<SkStreamAsset> stream,
++    const SkFontArguments& args, const char path[]) const
++{
++    FontInfo fontInfo;
++    int ttcIndex = args.getCollectionIndex();
++    int axisCount = args.getVariationDesignPosition().coordinateCount;
++
++    if (path) {
++        fontInfo.fname.set(path);
++    }
++    if (axisCount == 0) {
++        if (!fontScanner.scanInstance(stream.get(), ttcIndex, 0, &fontInfo.familyName, &fontInfo.style,
++            &fontInfo.isFixedWidth, nullptr)) {
++            LOGE("%s\n", FontConfig_OHOS::errToString(ERROR_FONT_INVALID_STREAM));
++            return nullptr;
++        }
++    } else {
++        AxisDefinitions axisDef;
++        if (!fontScanner.scanInstance(stream.get(), ttcIndex, 0, &fontInfo.familyName, &fontInfo.style,
++            &fontInfo.isFixedWidth, &axisDef)) {
++            LOGE("%s\n", FontConfig_OHOS::errToString(ERROR_FONT_INVALID_STREAM));
++            return nullptr;
++        }
++        if (axisDef.size() > 0) {
++            SkFixed axis[axisCount];
++            fontScanner.computeAxisValues(axisDef, args.getVariationDesignPosition(),
++                axis, fontInfo.familyName);
++            fontInfo.setAxisSet(axisCount, axis, axisDef.data());
++        }
++    }
++
++    fontInfo.stream = std::move(stream);
++    fontInfo.index = ttcIndex;
++    return sk_make_sp<SkTypeface_OHOS>(fontInfo);
++}
++
++/*! To create SkFontMgr object for Harmony platform
++ * \param fname the full name of system font configuration documents
++ * \return The object of SkFontMgr_OHOS
++ */
++sk_sp<SkFontMgr> SkFontMgr_New_OHOS(const char* fname)
++{
++    return sk_make_sp<SkFontMgr_OHOS>(fname);
++}
++
++sk_sp<SkFontMgr> SkFontMgr_New_OHOS() {;
++   return SkFontMgr_New_OHOS("/system/etc/fontconfig.json");
++}
+diff --git a/src/ports/skia_ohos/SkFontMgr_ohos.h b/src/ports/skia_ohos/SkFontMgr_ohos.h
+new file mode 100644
+index 0000000000..0d50fae9e9
+--- /dev/null
++++ b/src/ports/skia_ohos/SkFontMgr_ohos.h
+@@ -0,0 +1,65 @@
++/*
++ * Copyright 2015 Google Inc.
++ *
++ * Use of this source code is governed by a BSD-style license that can be
++ * found in the LICENSE file.
++ * 2023.4.23 SkFontMgr on ohos.
++ *           Copyright (c) 2023 Huawei Device Co., Ltd. All rights reserved.
++ */
++
++#ifndef SKFONTMGR_OHOS_H
++#define SKFONTMGR_OHOS_H
++
++#include "SkFontDescriptor.h"
++#include "SkFontMgr.h"
++
++#include "FontConfig_ohos.h"
++#include "SkFontStyleSet_ohos.h"
++
++#include "SkFontMgr_ohos_api.h"
++
++/*!
++ * \brief To implement the SkFontMgr for ohos platform
++ */
++class SkFontMgr_OHOS : public SkFontMgr {
++public:
++    explicit SkFontMgr_OHOS(const char* path = nullptr);
++    virtual ~SkFontMgr_OHOS() override = default;
++protected:
++    int onCountFamilies() const override;
++    void onGetFamilyName(int index, SkString* familyName) const override;
++    sk_sp<SkFontStyleSet> onCreateStyleSet(int index)const override;
++
++    sk_sp<SkFontStyleSet> onMatchFamily(const char familyName[]) const override;
++
++    sk_sp<SkTypeface> onMatchFamilyStyle(const char familyName[],
++                                           const SkFontStyle& style) const override;
++    sk_sp<SkTypeface> onMatchFamilyStyleCharacter(const char familyName[], const SkFontStyle& style,
++                                                    const char* bcp47[], int bcp47Count,
++                                                    SkUnichar character) const override;
++
++
++    sk_sp<SkTypeface> onMakeFromData(sk_sp<SkData> data, int ttcIndex) const override;
++    sk_sp<SkTypeface> onMakeFromStreamIndex(std::unique_ptr<SkStreamAsset> stream,
++                                                    int ttcIndex) const override;
++    sk_sp<SkTypeface> onMakeFromStreamArgs(std::unique_ptr<SkStreamAsset> stream,
++                                                   const SkFontArguments& args) const override;
++    sk_sp<SkTypeface> onMakeFromFile(const char path[], int ttcIndex) const override;
++
++    sk_sp<SkTypeface> onLegacyMakeTypeface(const char familyName[], SkFontStyle style) const override;
++
++private:
++    std::shared_ptr<FontConfig_OHOS> fontConfig = nullptr; // the pointer of FontConfig_OHOS
++    SkFontScanner_FreeType fontScanner; // the scanner to parse a font file
++    int familyCount = 0; // the count of font style sets in generic family list
++
++    int compareLangs(const SkString& langs, const char* bcp47[], int bcp47Count, const int tps[]) const;
++    sk_sp<SkTypeface> makeTypeface(std::unique_ptr<SkStreamAsset> stream,
++                                    const SkFontArguments& args, const char path[]) const;
++    sk_sp<SkTypeface> findTypeface(const FallbackSetPos& fallbackItem, const SkFontStyle& style,
++                             const char* bcp47[], int bcp47Count,
++                             SkUnichar character) const;
++};
++
++
++#endif /* SKFONTMGR_OHOS_H */
+diff --git a/src/ports/skia_ohos/SkFontMgr_ohos_factory.cpp b/src/ports/skia_ohos/SkFontMgr_ohos_factory.cpp
+new file mode 100644
+index 0000000000..b975ceddd4
+--- /dev/null
++++ b/src/ports/skia_ohos/SkFontMgr_ohos_factory.cpp
+@@ -0,0 +1,14 @@
++// Copyright (c) 2023 Huawei Device Co., Ltd. All rights reserved
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "include/core/SkFontMgr.h"
++SK_API sk_sp<SkFontMgr> SkFontMgr_New_OHOS(const char* path);
++
++/*! To implement the porting layer to return the default factory for Harmony platform
++ * \return the default font manager for Harmony platform
++ */
++sk_sp<SkFontMgr> SkFontMgr::Factory()
++{
++    return SkFontMgr_New_OHOS(nullptr);
++}
+diff --git a/src/ports/skia_ohos/SkFontStyleSet_ohos.cpp b/src/ports/skia_ohos/SkFontStyleSet_ohos.cpp
+new file mode 100644
+index 0000000000..d3027858bf
+--- /dev/null
++++ b/src/ports/skia_ohos/SkFontStyleSet_ohos.cpp
+@@ -0,0 +1,102 @@
++// Copyright (c) 2023 Huawei Device Co., Ltd. All rights reserved
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "SkFontStyleSet_ohos.h"
++
++/*! Constructor
++ * \param fontConfig the pointer of FontConfig_OHOS
++ * \param index the index of the font style set
++ * \param isFallback true - the font style is from fallback family
++ * \n                false - the font style is from generic family
++ */
++SkFontStyleSet_OHOS::SkFontStyleSet_OHOS(const std::shared_ptr<FontConfig_OHOS>& fontConfig,
++    int index, bool isFallback)
++    : fontConfig_(fontConfig), styleIndex(index), isFallback(isFallback)
++{
++    if (fontConfig) {
++        tpCount = fontConfig_->getTypefaceCount(styleIndex, isFallback);
++    }
++}
++
++/*! To get the count of typeface
++ * \return The count of typeface in this font style set
++ */
++int SkFontStyleSet_OHOS::count()
++{
++    return tpCount;
++}
++
++/*! To get the font style for the specified typeface
++ * \param the index of a typeface
++ * \param[out] style the style value returned to the caller
++ * \param[out] the style name returned to the caller
++ */
++void SkFontStyleSet_OHOS::getStyle(int index, SkFontStyle* style, SkString* styleName)
++{
++    if (index < 0 || index >= this->count() || fontConfig_ == nullptr) {
++        return;
++    }
++
++    sk_sp<SkTypeface_OHOS> typeface = fontConfig_->getTypeface(styleIndex, index, isFallback);
++    if (typeface == nullptr) {
++        return;
++    }
++
++    if (style) {
++        *style = typeface->fontStyle();
++    }
++    if (styleName) {
++        const char* names[] = {
++            "invisible",
++            "thin",
++            "extralight",
++            "light",
++            "normal",
++            "medium",
++            "semibold",
++            "bold",
++            "extrabold",
++            "black",
++            "extrablack"
++        };
++        // the value of font weight is between 0 ~ 1000 (refer to SkFontStyle::Weight)
++        // the weight is divided by 100 to get the matched name
++        unsigned int i = typeface->fontStyle().weight() / 100;
++        if (i < sizeof(names) / sizeof(char*)) {
++            styleName->set(names[i]);
++        } else {
++            styleName->reset();
++        }
++    }
++}
++
++/*! To create a typeface
++ * \param index the index of the typeface in this font style set
++ * \return The object of a typeface, if successful
++ * \n      Return null, if the 'index' is out of range
++ * \note The caller must call unref() on the returned object if it's not null
++ */
++sk_sp<SkTypeface> SkFontStyleSet_OHOS::createTypeface(int index)
++{
++    if (index < 0 || index >= this->count()) {
++        return nullptr;
++    }
++    if (fontConfig_) {
++        return fontConfig_->getTypeface(styleIndex, index, isFallback);
++    }
++    return nullptr;
++}
++
++/*! To get the closest matching typeface
++ * \param pattern the style value to be matching
++ * \return the object of a typeface which is the closest matching to 'pattern'
++ * \note The caller must call unref() on the returned object
++ */
++sk_sp<SkTypeface> SkFontStyleSet_OHOS::matchStyle(const SkFontStyle& pattern)
++{
++    if (fontConfig_) {
++        return fontConfig_->getTypeface(styleIndex, pattern, isFallback);
++    }
++    return nullptr;
++}
+diff --git a/src/ports/skia_ohos/SkFontStyleSet_ohos.h b/src/ports/skia_ohos/SkFontStyleSet_ohos.h
+new file mode 100644
+index 0000000000..032f0f3240
+--- /dev/null
++++ b/src/ports/skia_ohos/SkFontStyleSet_ohos.h
+@@ -0,0 +1,32 @@
++// Copyright (c) 2023 Huawei Device Co., Ltd. All rights reserved
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SKFONTSTYLESET_OHOS_H
++#define SKFONTSTYLESET_OHOS_H
++
++#include "SkFontMgr.h"
++
++#include "FontConfig_ohos.h"
++#include "SkTypeface_ohos.h"
++
++/*!
++ * \brief To implement SkFontStyleSet for ohos platform
++ */
++class SkFontStyleSet_OHOS : public SkFontStyleSet {
++public:
++    SkFontStyleSet_OHOS(const std::shared_ptr<FontConfig_OHOS>& fontConfig,
++        int index, bool isFallback = false);
++    virtual ~SkFontStyleSet_OHOS() override = default;
++    virtual int count() override;
++    virtual void getStyle(int index, SkFontStyle* style, SkString* styleName) override;
++    virtual sk_sp<SkTypeface> createTypeface(int index) override;
++    virtual sk_sp<SkTypeface> matchStyle(const SkFontStyle& pattern) override;
++private:
++    std::shared_ptr<FontConfig_OHOS> fontConfig_ = nullptr; // the object of FontConfig_OHOS
++    int styleIndex = 0; // the index of the font style set
++    bool isFallback = false; // the flag of font style set. False for fallback family, true for generic family.
++    int tpCount = -1; // the typeface count in the font style set
++};
++
++#endif /* SKFONTSTYLESET_OHOS_H */
+diff --git a/src/ports/skia_ohos/SkTypeface_ohos.cpp b/src/ports/skia_ohos/SkTypeface_ohos.cpp
+new file mode 100644
+index 0000000000..cea92889a8
+--- /dev/null
++++ b/src/ports/skia_ohos/SkTypeface_ohos.cpp
+@@ -0,0 +1,140 @@
++// Copyright (c) 2023 Huawei Device Co., Ltd. All rights reserved
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "SkTypeface_ohos.h"
++
++#include "SkDebug.h"
++#include "SkFontDescriptor.h"
++#include "SkFontHost_FreeType_common.h"
++#include "SkTArray.h"
++
++/*! Constructor
++ * \param familyName the specified family name for the typeface
++ * \param info the font information for the typeface
++ */
++SkTypeface_OHOS::SkTypeface_OHOS(const SkString& familyName, FontInfo& info)
++    : SkTypeface_FreeType(info.style, info.isFixedWidth),
++      specifiedName(familyName)
++{
++    fontInfo = std::make_unique<FontInfo>(std::move(info));
++}
++
++/*! Constructor
++ * \param info the font information for the typeface
++ */
++SkTypeface_OHOS::SkTypeface_OHOS(FontInfo& info)
++    : SkTypeface_FreeType(info.style, info.isFixedWidth)
++{
++    specifiedName.reset();
++    fontInfo = std::make_unique<FontInfo>(std::move(info));
++}
++
++/*! To get stream of the typeface
++ * \param[out] ttcIndex the index of the typeface in a ttc file returned to the caller
++ * \return The stream object of the typeface
++ */
++std::unique_ptr<SkStreamAsset> SkTypeface_OHOS::onOpenStream(int* ttcIndex) const
++{
++    if (fontInfo) {
++        if (ttcIndex) {
++            *ttcIndex = fontInfo->index;
++        }
++        if (fontInfo->stream == nullptr) {
++            fontInfo->stream = SkStream::MakeFromFile(fontInfo->fname.c_str());
++        }
++        if (fontInfo->stream) {
++            return fontInfo->stream->duplicate();
++        }
++    }
++    return nullptr;
++}
++
++/*! To make font data from the typeface
++ * \return The object of SkFontData
++ */
++std::unique_ptr<SkFontData> SkTypeface_OHOS::onMakeFontData() const
++{
++    if (fontInfo == nullptr) {
++        return nullptr;
++    }
++
++    if (fontInfo->stream.get() == nullptr) {
++        fontInfo->stream = SkStream::MakeFromFile(fontInfo->fname.c_str());
++    }
++    if (fontInfo->stream.get() == nullptr) {
++        return nullptr;
++    }
++    return std::make_unique<SkFontData>(fontInfo->stream->duplicate(), fontInfo->index, 0,
++               fontInfo->axisSet.axis.data(), fontInfo->axisSet.axis.size(), nullptr, 0);
++}
++
++/*! To get the font descriptor of the typeface
++ * \param[out] descriptor the font descriptor returned to the caller
++ * \param[out] isLocal the false to the caller
++ */
++void SkTypeface_OHOS::onGetFontDescriptor(SkFontDescriptor* descriptor, bool* isLocal) const
++{
++    if (isLocal) {
++        *isLocal = false;
++    }
++    if (descriptor) {
++        SkString familyName;
++        onGetFamilyName(&familyName);
++        descriptor->setFamilyName(familyName.c_str());
++        descriptor->setStyle(this->fontStyle());
++    }
++}
++
++/*! To get the family name of the typeface
++ * \param[out] familyName the family name returned to the caller
++ */
++void SkTypeface_OHOS::onGetFamilyName(SkString* familyName) const
++{
++    if (familyName == nullptr) {
++        return;
++    }
++    if (specifiedName.size() > 0) {
++        *familyName = specifiedName;
++    } else {
++        if (fontInfo) {
++            *familyName = fontInfo->familyName;
++        }
++    }
++}
++
++/*! To clone a typeface from this typeface
++ * \param args the specified font arguments from which the new typeface is created
++ * \return The object of a new typeface
++ * \note The caller must call unref() on the returned object
++ */
++sk_sp<SkTypeface> SkTypeface_OHOS::onMakeClone(const SkFontArguments& args) const
++{
++    FontInfo info(*(fontInfo.get()));
++    info.index = args.getCollectionIndex();
++    unsigned int count = args.getVariationDesignPosition().coordinateCount;
++    if (count > 0 && count == fontInfo->axisSet.range.size()) {
++        SkFontArguments::VariationPosition position = args.getVariationDesignPosition();
++        SkFontScanner::AxisDefinitions axisDefs;
++        for (unsigned int i = 0; i < count; i++) {
++            axisDefs.push_back(fontInfo->axisSet.range[i]);
++        }
++        SkFixed axisValues[count];
++        memset(axisValues, 0, sizeof(axisValues));
++        SkFontScanner_FreeType::computeAxisValues(axisDefs, position,
++            axisValues, fontInfo->familyName);
++        info.axisSet.axis.clear();
++        for (unsigned int i = 0; i < count; i++) {
++            info.axisSet.axis.emplace_back(axisValues[i]);
++        }
++    }
++    return sk_make_sp<SkTypeface_OHOS>(specifiedName, info);
++}
++
++/*! To get the font information of the typeface
++ * \return The object of FontInfo
++ */
++const FontInfo* SkTypeface_OHOS::getFontInfo() const
++{
++    return fontInfo.get();
++}
+diff --git a/src/ports/skia_ohos/SkTypeface_ohos.h b/src/ports/skia_ohos/SkTypeface_ohos.h
+new file mode 100644
+index 0000000000..66ee32960d
+--- /dev/null
++++ b/src/ports/skia_ohos/SkTypeface_ohos.h
+@@ -0,0 +1,34 @@
++// Copyright (c) 2023 Huawei Device Co., Ltd. All rights reserved
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SKTYPEFACE_OHOS_H
++#define SKTYPEFACE_OHOS_H
++
++#include "SkTypeface_FreeType.h"
++#include "SkFontStyle.h"
++#include "SkStream.h"
++
++#include "FontInfo_ohos.h"
++
++/*!
++ * \brief The implementation of SkTypeface for ohos platform
++ */
++class SkTypeface_OHOS : public SkTypeface_FreeType {
++public:
++    SkTypeface_OHOS(const SkString& specifiedName, FontInfo& info);
++    explicit SkTypeface_OHOS(FontInfo& info);
++    virtual ~SkTypeface_OHOS() override = default;
++    const FontInfo* getFontInfo() const;
++protected:
++    std::unique_ptr<SkStreamAsset> onOpenStream(int* ttcIndex) const override;
++    std::unique_ptr<SkFontData> onMakeFontData() const override;
++    void onGetFontDescriptor(SkFontDescriptor* descriptor, bool* isLocal) const override;
++    void onGetFamilyName(SkString* familyName) const override;
++    sk_sp<SkTypeface> onMakeClone(const SkFontArguments& args) const override;
++private:
++    SkString specifiedName; // specified family name which is defined in the configuration file
++    std::unique_ptr<FontInfo> fontInfo; // the font information of this typeface
++};
++
++#endif /* SKTYPEFACE_OHOS_H */
+diff --git a/src/ports/skia_ohos/config/fontconfig.json b/src/ports/skia_ohos/config/fontconfig.json
+new file mode 100644
+index 0000000000..ec225a188e
+--- /dev/null
++++ b/src/ports/skia_ohos/config/fontconfig.json
+@@ -0,0 +1,76 @@
++{
++  "fontdir": ["/system/fonts/"],
++  "generic": [
++    {
++      "family": "HarmonyOS Sans",
++      "alias": [
++        {
++          "HarmonyOS-Sans": 0
++        },
++        {
++          "HarmonyOS-Sans-Light": 100
++        },
++        {
++          "HarmonyOS-Sans-Regular": 400
++        },
++        {
++          "HarmonyOS-Sans-Medium": 700
++        },
++        {
++          "HarmonyOS-Sans-Bold": 900
++        }
++      ],
++      "adjust": [
++        {
++          "weight": 50, "to": 100
++        },
++        {
++          "weight": 80, "to": 400
++        },
++        {
++          "weight": 100, "to": 700
++        },
++        {
++          "weight": 200, "to": 900
++        }
++      ]
++    },
++    {
++      "family": "HarmonyOS Sans Condensed",
++      "alias": [
++        {
++          "HarmonyOS-Sans-Condensed": 0
++        }
++      ]
++    },
++    {
++      "family": "HarmonyOS Sans Digit",
++      "alias": [
++        {
++          "HarmonyOS-Sans-Digit": 0
++        }
++      ]
++    }
++  ],
++  "fallback": [
++    {
++      "": [
++        {
++          "zh-Hans": "HarmonyOS Sans SC"
++        },
++        {
++          "zh-Hant": "HarmonyOS Sans TC"
++        },
++        {
++          "und-Arab": "HarmonyOS Sans Naskh Arabic UI"
++        },
++        {
++          "ja": "Noto Sans JP"
++        },
++        {
++          "ko": "Noto Sans KR"
++        }
++      ]
++    }
++  ]
++}
+diff --git a/src/core/SkRRectPriv.h b/src/core/SkRRectPriv.h
+index cea579c901..baaeaff966 100644
+--- a/src/core/SkRRectPriv.h
++++ b/src/core/SkRRectPriv.h
+@@ -20,7 +20,7 @@ public:
+     }
+ 
+     static SkVector GetSimpleRadii(const SkRRect& rr) {
+-        SkASSERT(!rr.isComplex());
++        // SkASSERT(!rr.isComplex());
+         return rr.fRadii[0];
+     }
+ 
+-- 
\ No newline at end of file
diff --git a/attachment/repos/swiftshader-3.22.patch b/attachment/repos/swiftshader-3.22.patch
new file mode 100644
index 0000000000000000000000000000000000000000..de852c2432ad561bc2ae7eea40e0b29a000f1865
--- /dev/null
+++ b/attachment/repos/swiftshader-3.22.patch
@@ -0,0 +1,39 @@
+diff --git a/src/Reactor/BUILD.gn b/src/Reactor/BUILD.gn
+index 67dfeb0ec..a2b995813 100644
+--- a/src/Reactor/BUILD.gn
++++ b/src/Reactor/BUILD.gn
+@@ -337,6 +337,8 @@ if (supports_llvm) {
+       include_dirs += [ "$llvm_dir/configs/android/include/" ]
+     } else if (is_mac) {
+       include_dirs += [ "$llvm_dir/configs/darwin/include/" ]
++    } else if (is_ohos) {
++      include_dirs += [ "$llvm_dir/configs/android/include/" ]
+     } else {
+       assert(false, "llvm not configured for target platform")
+     }
+diff --git a/src/Reactor/reactor.gni b/src/Reactor/reactor.gni
+index 04fad6f81..324003e35 100644
+--- a/src/Reactor/reactor.gni
++++ b/src/Reactor/reactor.gni
+@@ -14,7 +14,7 @@ declare_args() {
+ }
+ 
+ declare_args() {
+-  supports_llvm = is_linux || is_chromeos || is_fuchsia || is_win || is_android
++  supports_llvm = is_linux || is_chromeos || is_fuchsia || is_win || is_android || is_ohos
+     # LLVM uses C++17 features which require macOS 10.12, while Chrome's minimum platform for x86 is 10.11.
+     # Don't build LLVM on Mac, unless we have to. This only happens on ARM64 devices, which launched with 11.0.
+     # TODO(b/174843857): Remove check for !supports_subzero once Chrome supports macOS 10.12
+diff --git a/third_party/llvm-10.0/BUILD.gn b/third_party/llvm-10.0/BUILD.gn
+index 59e52303c..9f59c7ff8 100644
+--- a/third_party/llvm-10.0/BUILD.gn
++++ b/third_party/llvm-10.0/BUILD.gn
+@@ -108,6 +108,8 @@ if (is_linux || is_chromeos) {
+   llvm_include_dirs += [ "configs/windows/include/" ]
+ } else if (is_android) {
+   llvm_include_dirs += [ "configs/android/include/" ]
++} else if (is_ohos) {
++  llvm_include_dirs += [ "configs/android/include/" ]
+ } else if (is_mac) {
+   llvm_include_dirs += [ "configs/darwin/include/" ]
+ } else {
diff --git a/attachment/scripts/config.json b/attachment/scripts/config.json
index a1bef3cb13fb30b7880531b49c9de2988e3c0316..0823ece773cf2b8a0c2124b2b5dde9cdf2ba4f19 100644
--- a/attachment/scripts/config.json
+++ b/attachment/scripts/config.json
@@ -5,46 +5,34 @@
         "type": "files"
     },
     {
-        "name": "dart0",
+        "name": "dart3.4",
         "target": "./src/third_party/dart",
         "type": "patch",
-        "file_path": "../../flutter/attachment/repos/dart.patch0"
-    },
-	{
-        "name": "dart1",
-        "target": "./src/third_party/dart",
-        "type": "patch",
-        "file_path": "../../flutter/attachment/repos/dart.patch1"
-    },
-    {
-        "name": "dart2",
-        "target": "./src/third_party/dart",
-        "type": "patch",
-        "file_path": "../../flutter/attachment/repos/dart.patch2"
+        "file_path": "../../flutter/attachment/repos/dart.3.4.0.patch"
     },
     {
         "name": "skia",
-        "target": "./src/third_party/skia",
+        "target": "./src/flutter/third_party/skia",
         "type": "patch",
-        "file_path": "../../flutter/attachment/repos/skia.patch"
+        "file_path": "../../../flutter/attachment/repos/skia-3.22.patch"
     },
     {
         "name": "spirv-headers",
-        "target": "./src/third_party/vulkan-deps/spirv-headers/src",
+        "target": "./src/flutter/third_party/vulkan-deps/spirv-headers/src",
         "type": "patch",
-        "file_path": "../../../../flutter/attachment/repos/spirv-headers.patch"
+        "file_path": "../../../../../flutter/attachment/repos/spirv-headers.patch"
     },
     {
         "name": "angle",
-        "target": "./src/third_party/angle",
+        "target": "./src/flutter/third_party/angle",
         "type": "patch",
-        "file_path": "../../flutter/attachment/repos/angle.patch"
+        "file_path": "../../../flutter/attachment/repos/angle-3.22.patch"
     },
     {
         "name": "build",
         "target": "./src/build",
         "type": "patch",
-        "file_path": "../flutter/attachment/repos/build.patch"
+        "file_path": "../flutter/attachment/repos/build-3.22.patch"
     },
     {
         "name": "zlib",
@@ -54,8 +42,20 @@
     },
 	{
         "name": "boringssl",
-        "target": "./src/third_party/boringssl",
+        "target": "./src/flutter/third_party/boringssl",
+        "type": "patch",
+        "file_path": "../../../flutter/attachment/repos/boringssl-3.22.patch"
+    },
+    {
+        "name": "swiftshader",
+        "target": "./src/flutter/third_party/swiftshader",
+        "type": "patch",
+        "file_path": "../../../flutter/attachment/repos/swiftshader-3.22.patch"
+    },
+    {
+        "name": "native",
+        "target": "./src/third_party/dart/third_party/pkg/native",
         "type": "patch",
-        "file_path": "../../flutter/attachment/repos/boringssl.patch"
+        "file_path": "../../../../../flutter/attachment/repos/native.patch"
     }
 ]
diff --git a/attachment/scripts/config_pre.json b/attachment/scripts/config_pre.json
index ff6eb88366609504dbc878349cf035e5ce950e13..0823ece773cf2b8a0c2124b2b5dde9cdf2ba4f19 100644
--- a/attachment/scripts/config_pre.json
+++ b/attachment/scripts/config_pre.json
@@ -5,46 +5,34 @@
         "type": "files"
     },
     {
-        "name": "dart0",
+        "name": "dart3.4",
         "target": "./src/third_party/dart",
         "type": "patch",
-        "file_path": "../../flutter/attachment/repos/dart.patch0"
-    },
-	{
-        "name": "dart1",
-        "target": "./src/third_party/dart",
-        "type": "patch",
-        "file_path": "../../flutter/attachment/repos/dart.patch1"
-    },
-    {
-        "name": "dart2",
-        "target": "./src/third_party/dart",
-        "type": "patch",
-        "file_path": "../../flutter/attachment/repos/dart.patch2"
+        "file_path": "../../flutter/attachment/repos/dart.3.4.0.patch"
     },
     {
         "name": "skia",
-        "target": "./src/third_party/skia",
+        "target": "./src/flutter/third_party/skia",
         "type": "patch",
-        "file_path": "../../flutter/attachment/repos/skia.patch"
+        "file_path": "../../../flutter/attachment/repos/skia-3.22.patch"
     },
     {
         "name": "spirv-headers",
-        "target": "./src/third_party/vulkan-deps/spirv-headers/src",
+        "target": "./src/flutter/third_party/vulkan-deps/spirv-headers/src",
         "type": "patch",
-        "file_path": "../../../../flutter/attachment/repos/spirv-headers.patch"
+        "file_path": "../../../../../flutter/attachment/repos/spirv-headers.patch"
     },
     {
         "name": "angle",
-        "target": "./src/third_party/angle",
+        "target": "./src/flutter/third_party/angle",
         "type": "patch",
-        "file_path": "../../flutter/attachment/repos/angle.patch"
+        "file_path": "../../../flutter/attachment/repos/angle-3.22.patch"
     },
     {
         "name": "build",
         "target": "./src/build",
         "type": "patch",
-        "file_path": "../flutter/attachment/repos/build.patch"
+        "file_path": "../flutter/attachment/repos/build-3.22.patch"
     },
     {
         "name": "zlib",
@@ -54,8 +42,20 @@
     },
 	{
         "name": "boringssl",
-        "target": "./src/third_party/boringssl",
+        "target": "./src/flutter/third_party/boringssl",
+        "type": "patch",
+        "file_path": "../../../flutter/attachment/repos/boringssl-3.22.patch"
+    },
+    {
+        "name": "swiftshader",
+        "target": "./src/flutter/third_party/swiftshader",
+        "type": "patch",
+        "file_path": "../../../flutter/attachment/repos/swiftshader-3.22.patch"
+    },
+    {
+        "name": "native",
+        "target": "./src/third_party/dart/third_party/pkg/native",
         "type": "patch",
-        "file_path": "../../flutter/attachment/repos/boringssl.patch"
+        "file_path": "../../../../../flutter/attachment/repos/native.patch"
     }
-]
\ No newline at end of file
+]
diff --git a/attachment/scripts/ohos_create_flutter_har.py b/attachment/scripts/ohos_create_flutter_har.py
new file mode 100644
index 0000000000000000000000000000000000000000..a70f33af01732264a5585865389abe30d0ce15b7
--- /dev/null
+++ b/attachment/scripts/ohos_create_flutter_har.py
@@ -0,0 +1,156 @@
+#!/usr/bin/env python3
+#
+# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Create a HAR incorporating all the components required to build a Flutter application"""
+
+import argparse
+import logging
+import os
+import re
+import shutil
+import subprocess
+import sys
+
+
+HAR_CONFIG_TEMPLATE = """
+{
+  "app": {
+    "signingConfigs": [],
+    "products": [
+      {
+        "name": "default",
+        "signingConfig": "default",
+        "compileSdkVersion": "%s",
+        "compatibleSdkVersion": "%s",
+        "runtimeOS": "HarmonyOS",
+      }
+    ],
+    "buildModeSet": [
+      {
+        "name": "debug",
+      },
+      {
+        "name": "release"
+      },
+      {
+        "name": "profile"
+      },
+    ]
+  },
+  "modules": [
+    {
+      "name": "flutter",
+      "srcPath": "./flutter"
+    }
+  ]
+}
+"""
+
+
+HVIGOR_CONFIG = """
+{
+  "modelVersion": "5.0.0",
+  "dependencies": {
+  }
+}
+"""
+
+
+# 更新har的配置文件，指定编译使用的api版本
+def updateConfig(buildDir, apiInt):
+    apiVersionMap = {
+        11: "4.1.0(11)",
+        12: "5.0.0(12)",
+    }
+    apiStr = apiVersionMap[apiInt]
+    with open(
+        os.path.join(buildDir, "build-profile.json5"), "w", encoding="utf-8"
+    ) as file:
+        file.write(HAR_CONFIG_TEMPLATE % (apiStr, apiStr))
+
+    if apiInt != 11:
+        with open(
+            os.path.join(buildDir, "hvigor", "hvigor-config.json5"),
+            "w",
+            encoding="utf-8",
+        ) as file:
+            file.write(HVIGOR_CONFIG)
+
+
+# 执行命令
+def runCommand(command, checkCode=True, timeout=None):
+    logging.info("runCommand start, command = %s" % (command))
+    code = subprocess.Popen(command, shell=True).wait(timeout)
+    if code != 0:
+        logging.error("runCommand error, code = %s, command = %s" % (code, command))
+        if checkCode:
+            exit(code)
+    else:
+        logging.info("runCommand finish, code = %s, command = %s" % (code, command))
+
+
+# 编译har文件，通过hvigorw的命令行参数指定编译类型(debug/release/profile)
+def buildHar(buildDir, apiInt, buildType):
+    updateConfig(buildDir, apiInt)
+    hvigorwCommand = "hvigorw" if apiInt != 11 else (".%shvigorw" % os.sep)
+    runCommand(
+        "cd %s && %s clean --mode module " % (buildDir, hvigorwCommand)
+        + "-p module=flutter@default -p product=default -p buildMode=%s " % buildType
+        + "assembleHar --no-daemon"
+    )
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--embedding_src", help="Path of embedding source code.")
+    parser.add_argument("--build_dir", help="Path to build.")
+    parser.add_argument(
+        "--build_type",
+        choices=["debug", "release", "profile"],
+        help="Type to build flutter.har.",
+    )
+    parser.add_argument("--output", help="Path to output flutter.har.")
+    parser.add_argument("--native_lib", action="append", help="Native code library.")
+    parser.add_argument("--ohos_abi", help="Native code ABI.")
+    parser.add_argument(
+        "--ohos_api_int", type=int, choices=[11, 12], help="Ohos api int."
+    )
+    options = parser.parse_args()
+    # copy source code
+    if os.path.exists(options.build_dir):
+        shutil.rmtree(options.build_dir)
+    shutil.copytree(options.embedding_src, options.build_dir)
+
+    # copy so files
+    for file in options.native_lib:
+        dir_name, full_file_name = os.path.split(file)
+        targetDir = os.path.join(options.build_dir, "flutter/libs", options.ohos_abi)
+        if not os.path.exists(targetDir):
+            os.makedirs(targetDir)
+        shutil.copyfile(
+            file,
+            os.path.join(targetDir, full_file_name),
+        )
+    buildHar(options.build_dir, options.ohos_api_int, options.build_type)
+    shutil.copyfile(
+        os.path.join(
+            options.build_dir, "flutter/build/default/outputs/default/flutter.har"
+        ),
+        options.output,
+    )
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/benchmarking/BUILD.gn b/benchmarking/BUILD.gn
index 08a33710fe06f4194939a3d8613022d7bdeffc66..50c208bdd6329514adbdce8ce2957eb5ac8c41a5 100644
--- a/benchmarking/BUILD.gn
+++ b/benchmarking/BUILD.gn
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 config("benchmark_config") {
-  include_dirs = [ "//third_party/benchmark:benchmark_config" ]
+  include_dirs = [ "//flutter/third_party/benchmark:benchmark_config" ]
 }
 
 source_set("benchmarking") {
@@ -16,7 +16,7 @@ source_set("benchmarking") {
 
   public_deps = [
     "//flutter/fml",
-    "//third_party/benchmark",
+    "//flutter/third_party/benchmark",
   ]
 
   public_configs = [
@@ -39,7 +39,7 @@ source_set("benchmarking_library") {
     "library.h",
   ]
 
-  public_deps = [ "//third_party/benchmark" ]
+  public_deps = [ "//flutter/third_party/benchmark" ]
 
   public_configs = [
     "//flutter:config",
diff --git a/bin/et b/bin/et
new file mode 100755
index 0000000000000000000000000000000000000000..a3c30df0241d955bf2c55a544b48657b1ec2285f
--- /dev/null
+++ b/bin/et
@@ -0,0 +1,66 @@
+#!/bin/bash
+#
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+set -e
+
+# Needed because if it is set, cd may print the path it changed to.
+unset CDPATH
+
+# On Mac OS, readlink -f doesn't work, so follow_links traverses the path one
+# link at a time, and then cds into the link destination and find out where it
+# ends up.
+#
+# The function is enclosed in a subshell to avoid changing the working directory
+# of the caller.
+function follow_links() (
+  cd -P "$(dirname -- "$1")"
+  file="$PWD/$(basename -- "$1")"
+  while [[ -h "$file" ]]; do
+    cd -P "$(dirname -- "$file")"
+    file="$(readlink -- "$file")"
+    cd -P "$(dirname -- "$file")"
+    file="$PWD/$(basename -- "$file")"
+  done
+  echo "$file"
+)
+
+SCRIPT_DIR=$(follow_links "$(dirname -- "${BASH_SOURCE[0]}")")
+ENGINE_DIR="$(cd "$SCRIPT_DIR/.."; pwd -P)"
+
+case "$(uname -s)" in
+  Linux)
+    OS="linux"
+    ;;
+  Darwin)
+    OS="macos"
+    ;;
+  *)
+    echo "The host platform is not supported by this tool"
+    exit 1
+esac
+
+case "$(uname -m)" in
+  arm64)
+    CPU="arm64"
+    ;;
+  x86_64)
+    CPU="x64"
+    ;;
+  *)
+    echo "The host platform is not supported by this tool"
+    exit 1
+esac
+
+PLATFORM="${OS}-${CPU}"
+DART_SDK_DIR="${ENGINE_DIR}/prebuilts/${PLATFORM}/dart-sdk"
+DART="${DART_SDK_DIR}/bin/dart"
+
+if [ ! -d "${ENGINE_DIR}/tools/engine_tool/.dart_tool" ]; then
+  echo "You must run 'gclient sync -D' before using this tool."
+  exit 1
+fi
+
+"${DART}" --disable-dart-dev "${ENGINE_DIR}/tools/engine_tool/bin/et.dart" "$@"
diff --git a/bin/et.bat b/bin/et.bat
new file mode 100644
index 0000000000000000000000000000000000000000..b1236e284f715e56c356f73eeebf3c8d77348212
--- /dev/null
+++ b/bin/et.bat
@@ -0,0 +1,40 @@
+@ECHO off
+REM Copyright 2013 The Flutter Authors. All rights reserved.
+REM Use of this source code is governed by a BSD-style license that can be
+REM found in the LICENSE file.
+
+REM ---------------------------------- NOTE ----------------------------------
+REM
+REM Please keep the logic in this file consistent with the logic in the
+REM `et` script in the same directory to ensure that it continues to
+REM work across all platforms!
+REM
+REM --------------------------------------------------------------------------
+
+SETLOCAL ENABLEDELAYEDEXPANSION
+
+FOR %%i IN ("%~dp0..\..") DO SET SRC_DIR=%%~fi
+
+REM Test if Git is available on the Host
+where /q git || ECHO Error: Unable to find git in your PATH. && EXIT /B 1
+
+SET repo_dir=%SRC_DIR%\flutter
+SET engine_tool_dir=%repo_dir%\tools\engine_tool
+
+REM Determine which platform we are on and use the right prebuilt Dart SDK
+IF "%PROCESSOR_ARCHITECTURE%"=="AMD64" (
+    SET dart_sdk_path=%SRC_DIR%\flutter\prebuilts\windows-x64\dart-sdk
+) ELSE IF "%PROCESSOR_ARCHITECTURE%"=="ARM64" (
+    SET dart_sdk_path=%SRC_DIR%\flutter\prebuilts\windows-arm64\dart-sdk
+) ELSE (
+    ECHO "Windows x86 (32-bit) is not supported" && EXIT /B 1
+)
+
+SET dart=%dart_sdk_path%\bin\dart.exe
+
+cd "%engine_tool_dir%"
+
+REM Do not use the CALL command in the next line to execute Dart. CALL causes
+REM Windows to re-read the line from disk after the CALL command has finished
+REM regardless of the ampersand chain.
+"%dart%" --disable-dart-dev bin\et.dart %* & exit /B !ERRORLEVEL!
diff --git a/build/archives/BUILD.gn b/build/archives/BUILD.gn
index dd4fbdc66517078e684b9062cc3b0a526219a797..8996fa93c1f9a2a0914ff072bf6e4dfb6e0cf9c8 100644
--- a/build/archives/BUILD.gn
+++ b/build/archives/BUILD.gn
@@ -16,6 +16,7 @@ generated_file("artifacts_entitlement_config") {
       "//flutter/impeller/compiler:impellerc",
       "//flutter/impeller/tessellator:tessellator_shared",
       "//flutter/shell/testing:testing",
+      "//flutter/tools/path_ops:path_ops",
     ]
   }
 }
@@ -23,27 +24,28 @@ generated_file("artifacts_entitlement_config") {
 if (build_engine_artifacts && !is_android && !is_ohos) {
   zip_bundle("artifacts") {
     deps = [
+      "$dart_src/runtime/bin:gen_snapshot",
       "//flutter/flutter_frontend_server:frontend_server",
       "//flutter/impeller/compiler:impellerc",
-      "//flutter/impeller/compiler:impellerc_license",
       "//flutter/impeller/tessellator:tessellator_shared",
       "//flutter/lib/snapshot:generate_snapshot_bin",
       "//flutter/shell/testing:testing",
       "//flutter/tools/path_ops:path_ops",
-      "//flutter/tools/path_ops:path_ops_license",
-      "//third_party/dart/runtime/bin:gen_snapshot",
     ]
     if (is_mac) {
       # TODO(godofredoc): Remove after paths are standardized flutter/flutter#105351.
       # Mac artifacts sometimes use mac and sometimes darwin. Standardizing the
       # names will require changes in the list of artifacts the tool is downloading.
-      prefix = "darwin-$target_cpu/"
+      if (flutter_runtime_mode == "debug") {
+        prefix = "darwin-$target_cpu/"
+      } else {
+        prefix = "darwin-$target_cpu-$flutter_runtime_mode/"
+      }
+    } else if (flutter_runtime_mode != "debug") {
+      prefix = "$full_target_platform_name-$flutter_runtime_mode/"
     } else {
       prefix = "$full_target_platform_name/"
     }
-    if (flutter_runtime_mode != "debug") {
-      prefix = "$full_platform_name-$flutter_runtime_mode/"
-    }
     output = "$prefix/artifacts.zip"
 
     exe = ""
@@ -70,23 +72,13 @@ if (build_engine_artifacts && !is_android && !is_ohos) {
       }
       files += [
         {
-          source = "//third_party/icu/flutter/icudtl.dat"
+          source = "//flutter/third_party/icu/flutter/icudtl.dat"
           destination = "icudtl.dat"
         },
         {
           source = "$root_out_dir/flutter_tester$exe"
           destination = "flutter_tester$exe"
         },
-        {
-          source =
-              "$root_out_dir/gen/flutter/impeller/compiler/LICENSE.impellerc.md"
-          destination = "LICENSE.impellerc.md"
-        },
-        {
-          source =
-              "$root_out_dir/gen/flutter/tools/path_ops/LICENSE.path_ops.md"
-          destination = "LICENSE.path_ops.md"
-        },
         {
           source = "$root_out_dir/impellerc$exe"
           destination = "impellerc$exe"
@@ -95,6 +87,10 @@ if (build_engine_artifacts && !is_android && !is_ohos) {
           source = "//flutter/impeller/compiler/shader_lib"
           destination = "shader_lib"
         },
+        {
+          source = "//flutter/lib/gpu"
+          destination = "flutter_gpu"
+        },
         {
           source = "$root_out_dir/${lib_prefix}path_ops$dll"
           destination = "${lib_prefix}path_ops$dll"
@@ -175,6 +171,7 @@ generated_file("dart_sdk_entitlement_config") {
     "dart-sdk/bin/dart",
     "dart-sdk/bin/dartaotruntime",
     "dart-sdk/bin/utils/gen_snapshot",
+    "dart-sdk/bin/utils/wasm-opt",
   ]
 
   deps = []
@@ -209,7 +206,7 @@ if (build_engine_artifacts && flutter_prebuilt_dart_sdk) {
 # If there is no prebuilt sdk, create the dart sdk archive from the built sdk.
 if (build_engine_artifacts && !flutter_prebuilt_dart_sdk) {
   zip_bundle_from_file("dart_sdk_archive") {
-    deps = [ "//third_party/dart:create_sdk" ]
+    deps = [ "$dart_src:create_sdk" ]
     output = "dart-sdk-$full_target_platform_name.zip"
     files = [
       {
@@ -233,8 +230,9 @@ if (build_engine_artifacts && !flutter_prebuilt_dart_sdk) {
 # Archives Flutter Windows Artifacts
 if (host_os == "win") {
   zip_bundle("windows_flutter") {
-    output = "$full_platform_name-$flutter_runtime_mode/$full_platform_name-flutter.zip"
+    output = "$full_target_platform_name-$flutter_runtime_mode/$full_target_platform_name-flutter.zip"
     deps = [
+      "//flutter:gen_snapshot",
       "//flutter/shell/platform/common:publish_headers",
       "//flutter/shell/platform/windows:flutter_windows",
       "//flutter/shell/platform/windows:publish_headers_windows",
@@ -264,25 +262,30 @@ if (host_os == "win") {
         source = "$root_out_dir/flutter_windows.dll"
         destination = "flutter_windows.dll"
       },
+      {
+        source = "$root_out_dir/flutter_windows.dll.exp"
+        destination = "flutter_windows.dll.exp"
+      },
+      {
+        source = "$root_out_dir/flutter_windows.dll.lib"
+        destination = "flutter_windows.dll.lib"
+      },
+      {
+        source = "$root_out_dir/flutter_windows.dll.pdb"
+        destination = "flutter_windows.dll.pdb"
+      },
+      {
+        source = "$root_out_dir/gen_snapshot/gen_snapshot.exe"
+        destination = "gen_snapshot.exe"
+      },
     ]
   }
 }
 
 # Archives Flutter Mac Artifacts
 if (is_mac) {
-  generated_file("snapshot_entitlement_config") {
-    outputs = [ "$target_gen_dir/snapshot_entitlements.txt" ]
-
-    data_keys = [ "snapshot_entitlement_file_path" ]
-
-    deps = [ "//flutter/lib/snapshot:create_macos_gen_snapshots" ]
-  }
-
   zip_bundle("archive_gen_snapshot") {
-    deps = [
-      ":snapshot_entitlement_config",
-      "//flutter/lib/snapshot:create_macos_gen_snapshots",
-    ]
+    deps = [ "//flutter/lib/snapshot:create_macos_gen_snapshots" ]
     suffix = "-$flutter_runtime_mode"
     if (flutter_runtime_mode == "debug") {
       suffix = ""
@@ -293,10 +296,6 @@ if (is_mac) {
         source = "$root_out_dir/gen_snapshot_$target_cpu"
         destination = "gen_snapshot_$target_cpu"
       },
-      {
-        source = "$target_gen_dir/snapshot_entitlements.txt"
-        destination = "entitlements.txt"
-      },
     ]
   }
 
diff --git a/build/bin_to_obj.gni b/build/bin_to_obj.gni
new file mode 100644
index 0000000000000000000000000000000000000000..a192719a41b9f3fde3242790c3906cc36a0ba64c
--- /dev/null
+++ b/build/bin_to_obj.gni
@@ -0,0 +1,105 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//flutter/build/dart/dart.gni")
+
+# Generates an assembly file defining a given symbol with the bytes from a
+# binary file. Places the symbol in a text section if 'executable' is true,
+# otherwise places the symbol in a read-only data section.
+template("bin_to_assembly") {
+  assert(defined(invoker.deps), "Must define deps")
+  assert(defined(invoker.input), "Must define input binary file")
+  assert(defined(invoker.symbol), "Must define symbol name")
+  assert(defined(invoker.executable), "Must define boolean executable")
+
+  action(target_name) {
+    deps = invoker.deps
+    script = "$dart_src/runtime/tools/bin_to_assembly.py"
+    output = "$target_gen_dir/${invoker.input}.S"
+    args = [
+      "--input",
+      rebase_path(invoker.input),
+      "--output",
+      rebase_path(output),
+      "--symbol_name",
+      invoker.symbol,
+      "--target_os",
+      current_os,
+    ]
+    if (defined(invoker.size_symbol)) {
+      args += [
+        "--size_symbol_name",
+        invoker.size_symbol,
+        "--target_arch",
+        current_cpu,
+      ]
+    }
+    if (invoker.executable) {
+      args += [ "--executable" ]
+    }
+    if (current_os != "win") {
+      args += [ "--incbin" ]
+    }
+    inputs = [
+      script,
+      invoker.input,
+    ]
+    outputs = [ output ]
+  }
+}
+
+# Generates an object file defining a given symbol with the bytes from a
+# binary file. Places the symbol in the read-only data section.
+template("bin_to_coff") {
+  assert(defined(invoker.deps), "Must define deps")
+  assert(defined(invoker.input), "Must define input binary file")
+  assert(defined(invoker.symbol), "Must define symbol name")
+  assert(defined(invoker.executable), "Must define executable")
+
+  action(target_name) {
+    deps = invoker.deps
+    script = "$dart_src/runtime/tools/bin_to_coff.py"
+    output = "$target_gen_dir/${invoker.input}.o"
+    args = [
+      "--input",
+      rebase_path(invoker.input),
+      "--output",
+      rebase_path(output),
+      "--symbol_name",
+      invoker.symbol,
+    ]
+
+    if (defined(invoker.size_symbol)) {
+      args += [
+        "--size_symbol_name",
+        invoker.size_symbol,
+      ]
+    }
+
+    if (invoker.executable) {
+      args += [ "--executable" ]
+    }
+
+    args += [ "--arch=$current_cpu" ]
+    inputs = [ invoker.input ]
+    outputs = [ output ]
+  }
+}
+
+# Generates a linkable output file defining the specified symbol with the bytes
+# from the binary file. Emits a COFF object file when targeting Windows,
+# otherwise assembly.
+template("bin_to_linkable") {
+  assert(defined(invoker.deps), "Must define deps")
+  assert(defined(invoker.input), "Must define input binary file")
+  assert(defined(invoker.symbol), "Must define symbol name")
+  target_type = "bin_to_assembly"
+  if (is_win) {
+    target_type = "bin_to_coff"
+  }
+
+  target(target_type, target_name) {
+    forward_variables_from(invoker, "*")
+  }
+}
diff --git a/build/config/fuchsia/gn_configs.gni b/build/config/fuchsia/gn_configs.gni
new file mode 100644
index 0000000000000000000000000000000000000000..e5a4da6414687c3fd2c647310f3a75ea85e26e4f
--- /dev/null
+++ b/build/config/fuchsia/gn_configs.gni
@@ -0,0 +1,60 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This file is copied from
+# https://crsrc.org/c/build/config/fuchsia/gn_configs.gni?q=gn_configs.gni
+# with some local modifications to match the flutter setup.
+
+declare_args() {
+  # Path to the fuchsia SDK. This is intended for use in other templates &
+  # rules to reference the contents of the fuchsia SDK.
+  fuchsia_sdk = "//fuchsia/sdk/$host_os"
+
+  # ID uniquely identifying the Fuchsia IDK build. This is exposed as a
+  # property so it can be used to locate images and packages on GCS and
+  # as a marker to indicate the "version" of the IDK.
+  # Defaults to the id found in the manifest.json file of the SDK.
+  fuchsia_sdk_id = ""
+}
+
+# TODO(zijiehe): Remove the override and move it into declare_args once the one
+# in //build/config/sdk.gni being removed. - b/40935282
+
+# The target API level for this repository. Embedders should override this
+# value to specify the API level the packages produced from this repository
+# should be targeting, e.g. in their top-level //.gn file. A value of -1
+# means that no API level will be passed to the tools that consumes it.
+fuchsia_target_api_level = 16
+
+# The SDK manifest file. This is useful to include as a dependency
+# for some targets in order to cause a rebuild when the version of the
+# SDK is changed.
+fuchsia_sdk_manifest_file = "${fuchsia_sdk}/meta/manifest.json"
+
+# fuchsia_tool_dir is used to specify the directory in the SDK to locate
+# tools for the host cpu architecture. If the host_cpu is not recognized,
+# then tool dir defaults to x64.
+fuchsia_tool_dir = "${fuchsia_sdk}/tools/${host_cpu}"
+
+if (fuchsia_sdk_id == "") {
+  # Note: If we need to expose more than just the id in the future,
+  # we should consider exposing the entire json object for the metadata vs.
+  # adding a bunch of variables.
+  _meta = read_file(fuchsia_sdk_manifest_file, "json")
+  fuchsia_sdk_id = _meta.id
+}
+
+declare_args() {
+  # Specify a readelf_exec path to use. If not specified, the host's system
+  # executable will be used. Passed to populate_build_id_dir.py and
+  # prepare_package_inputs.py via the --readelf-exec flag.
+  # Must be a GN path (not an absolute path) since it is adjusted with
+  # rebase_path().
+  if (!defined(fuchsia_sdk_readelf_exec)) {
+    fuchsia_sdk_readelf_exec = ""
+  }
+}
+
+# third_party/googletest is still using this condition.
+using_fuchsia_sdk = true
diff --git a/build/copy_info_plist.py b/build/copy_info_plist.py
index 37e60bef3b6e98fe48b8ffbbdc00886a995aab97..d812edacf06a148327fa71548efd4c9fcdb263a9 100644
--- a/build/copy_info_plist.py
+++ b/build/copy_info_plist.py
@@ -23,9 +23,7 @@ import git_revision
 
 def get_clang_version():
   clang_executable = str(
-      os.path.join(
-          '..', '..', 'buildtools', 'mac-x64', 'clang', 'bin', 'clang++'
-      )
+      os.path.join('..', '..', 'flutter', 'buildtools', 'mac-x64', 'clang', 'bin', 'clang++')
   )
   version = subprocess.check_output([clang_executable, '--version'])
   return version.splitlines()[0]
@@ -39,20 +37,12 @@ def main():
   )
 
   parser.add_argument(
-      '--source',
-      help='Path to Info.plist source template',
-      type=str,
-      required=True
+      '--source', help='Path to Info.plist source template', type=str, required=True
   )
   parser.add_argument(
-      '--destination',
-      help='Path to destination Info.plist',
-      type=str,
-      required=True
-  )
-  parser.add_argument(
-      '--minversion', help='Minimum device OS version like "9.0"', type=str
+      '--destination', help='Path to destination Info.plist', type=str, required=True
   )
+  parser.add_argument('--minversion', help='Minimum device OS version like "9.0"', type=str)
 
   args = parser.parse_args()
 
@@ -60,11 +50,7 @@ def main():
   engine_path = os.path.join(os.getcwd(), '..', '..', 'flutter')
   revision = git_revision.get_repository_version(engine_path)
   clang_version = get_clang_version()
-  text = text.format(
-      revision=revision,
-      clang_version=clang_version,
-      min_version=args.minversion
-  )
+  text = text.format(revision=revision, clang_version=clang_version, min_version=args.minversion)
 
   with open(args.destination, 'w') as outfile:
     outfile.write(text)
diff --git a/build/dart/BUILD.gn b/build/dart/BUILD.gn
index 304249ad86919f8e7ffb62821f39003582fb276a..4c4d57d06965d0fb0a94f4dc27cd5b5f4f3d6c5d 100644
--- a/build/dart/BUILD.gn
+++ b/build/dart/BUILD.gn
@@ -2,41 +2,41 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//flutter/build/concurrent_jobs.gni")
+import("//flutter/build/dart/dart.gni")
 import("//flutter/common/config.gni")
-import("//third_party/dart/build/dart/copy_tree.gni")
+
+import("$dart_src/build/dart/copy_tree.gni")
 
 declare_args() {
   # Maximum number of Dart processes to run in parallel.
   #
   # To avoid out-of-memory errors we explicitly reduce the number of jobs.
-  concurrent_dart_jobs = concurrent_jobs.dart
+  concurrent_dart_jobs = 1
 }
 
 pool("dart_pool") {
   depth = concurrent_dart_jobs
 }
 
-if (flutter_prebuilt_dart_sdk) {
-  copy_trees("_copy_trees") {
-    sources = [
-      {
-        target = "copy_dart_sdk"
-        visibility = [ ":dart_sdk" ]
-        source = prebuilt_dart_sdk
-        dest = "$root_out_dir/dart-sdk"
-        ignore_patterns = "{}"
-      },
-    ]
-  }
-}
-
 if (build_engine_artifacts) {
-  group("dart_sdk") {
-    if (flutter_prebuilt_dart_sdk) {
+  if (flutter_prebuilt_dart_sdk) {
+    copy_trees("_copy_trees") {
+      sources = [
+        {
+          target = "copy_dart_sdk"
+          visibility = [ ":dart_sdk" ]
+          source = prebuilt_dart_sdk
+          dest = "$root_out_dir/dart-sdk"
+          ignore_patterns = "{}"
+        },
+      ]
+    }
+    group("dart_sdk") {
       public_deps = [ ":copy_dart_sdk" ]
-    } else {
-      public_deps = [ "//third_party/dart:create_sdk" ]
+    }
+  } else {
+    group("dart_sdk") {
+      public_deps = [ "$dart_src:create_sdk" ]
     }
   }
 }
diff --git a/tools/fuchsia/fidl/toolchain.gni b/build/dart/dart.gni
similarity index 74%
rename from tools/fuchsia/fidl/toolchain.gni
rename to build/dart/dart.gni
index 503c5b668894f91f26e7feda9e8b8c69528b4806..4982d5889d5b5f9b3b226551edd96f95d15fb078 100644
--- a/tools/fuchsia/fidl/toolchain.gni
+++ b/build/dart/dart.gni
@@ -2,4 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-fidl_toolchain = "//flutter/tools/fuchsia/fidl:fidling"
+declare_args() {
+  dart_src = "//third_party/dart"
+}
diff --git a/build/dart/rules.gni b/build/dart/rules.gni
index d92acff60e6fc61214addbdd9089046f7dd3c281..7ddce71ee5c4a10ea448ee03c7b327a24f6b171f 100644
--- a/build/dart/rules.gni
+++ b/build/dart/rules.gni
@@ -6,25 +6,119 @@
 
 import("//build/compiled_action.gni")
 import("//build/module_args/dart.gni")
+import("//flutter/build/dart/dart.gni")
 import("//flutter/common/config.gni")
-import("//third_party/dart/build/dart/dart_action.gni")
-import("//third_party/dart/sdk_args.gni")
-
-frontend_server_files =
-    exec_script("//third_party/dart/tools/list_dart_files.py",
-                [
-                  "absolute",
-                  rebase_path("//flutter/flutter_frontend_server"),
-                ],
-                "list lines")
-
-frontend_server_files +=
-    exec_script("//third_party/dart/tools/list_dart_files.py",
-                [
-                  "absolute",
-                  rebase_path("//third_party/dart/pkg"),
-                ],
-                "list lines")
+
+import("$dart_src/build/dart/dart_action.gni")
+import("$dart_src/sdk_args.gni")
+
+# Generates a Dart kernel snapshot using flutter_frontend_server.
+#
+# Arguments
+#     main_dart (required):
+#       The Dart entrypoint file.
+#
+#     kernel_output (required):
+#       The path to the output kernel snapshot in the out directory.
+#
+#     package_config (optional):
+#       The path to the package_config.json file.
+#
+#     deps (optional):
+#       Additional dependencies. Dependencies on the frontend server and
+#       Flutter's platform.dill are included by default. This rule creates and
+#       uses a depfile, so listing all Dart sources is not necessary.
+#
+#     extra_args (optional):
+#       Additional frontend server command line arguments.
+template("flutter_frontend_server") {
+  assert(defined(invoker.main_dart), "The Dart test file must be specified.")
+  assert(defined(invoker.kernel_output),
+         "The Dart Kernel file location must be specified.")
+
+  kernel_output = invoker.kernel_output
+
+  common_deps = [ "//flutter/lib/snapshot:strong_platform" ]
+  if (defined(invoker.deps)) {
+    common_deps += invoker.deps
+  }
+
+  extra_args = []
+  if (defined(invoker.extra_args)) {
+    extra_args += invoker.extra_args
+  }
+
+  packages_args = []
+  if (defined(invoker.package_config)) {
+    packages_args += [
+      "--packages",
+      rebase_path(invoker.package_config, root_build_dir),
+    ]
+  }
+
+  snapshot_depfile = "$kernel_output.d"
+
+  common_vm_args = [ "--disable-dart-dev" ]
+
+  flutter_patched_sdk =
+      rebase_path("$root_out_dir/flutter_patched_sdk", root_build_dir)
+
+  common_args = extra_args + packages_args + [
+                  "--sdk-root",
+                  flutter_patched_sdk,
+                  "--target=flutter",
+                  "--depfile",
+                  rebase_path(snapshot_depfile, root_build_dir),
+                  "--output-dill",
+                  rebase_path(invoker.kernel_output, root_build_dir),
+                  rebase_path(invoker.main_dart, root_build_dir),
+                ]
+
+  if (flutter_prebuilt_dart_sdk) {
+    common_deps += [ "//flutter/flutter_frontend_server:frontend_server" ]
+    action(target_name) {
+      forward_variables_from(invoker,
+                             [
+                               "visibility",
+                               "testonly",
+                             ],
+                             [ "pool" ])
+      deps = common_deps
+      pool = "//flutter/build/dart:dart_pool"
+      script = "//build/gn_run_binary.py"
+      inputs = [ invoker.main_dart ]
+      outputs = [ invoker.kernel_output ]
+      depfile = snapshot_depfile
+
+      ext = ""
+      if (is_win) {
+        ext = ".exe"
+      }
+      dart = rebase_path("$host_prebuilt_dart_sdk/bin/dart$ext", root_out_dir)
+      frontend_server =
+          rebase_path("$root_gen_dir/frontend_server.dart.snapshot")
+
+      args = [ dart ] + common_vm_args + [ frontend_server ] + common_args
+    }
+  } else {
+    prebuilt_dart_action(target_name) {
+      forward_variables_from(invoker,
+                             [
+                               "visibility",
+                               "testonly",
+                             ],
+                             [ "pool" ])
+      deps = common_deps
+      pool = "//flutter/build/dart:dart_pool"
+      script = "$dart_src/pkg/frontend_server/bin/frontend_server_starter.dart"
+      inputs = [ invoker.main_dart ]
+      outputs = [ invoker.kernel_output ]
+      depfile = snapshot_depfile
+      vm_args = common_vm_args
+      args = common_args
+    }
+  }
+}
 
 # Creates a dart kernel (dill) file suitable for use with gen_snapshot, as well
 # as the app-jit, aot-elf, or aot-assembly snapshot for targeting Flutter on
@@ -48,61 +142,38 @@ template("flutter_snapshot") {
 
   kernel_output = "$target_gen_dir/kernel_blob.bin"
 
-  prebuilt_dart_action(kernel_target) {
-    script = "//flutter/flutter_frontend_server/bin/starter.dart"
-
-    main_dart = rebase_path(invoker.main_dart)
-    package_config = rebase_path(invoker.package_config)
-    flutter_patched_sdk = rebase_path("$root_out_dir/flutter_patched_sdk")
-
-    deps = [ "//flutter/lib/snapshot:strong_platform" ]
-
-    inputs = [
-               main_dart,
-               package_config,
-             ] + frontend_server_files
-
-    outputs = [ kernel_output ]
-
-    depfile = "$kernel_output.d"
-    abs_depfile = rebase_path(depfile)
-    vm_args = [ "--disable-dart-dev" ]
-
-    args = [
-      "--depfile=$abs_depfile",
-      "--packages=" + rebase_path(package_config),
-      "--target=flutter",
-      "--sdk-root=" + flutter_patched_sdk,
-      "--output-dill=" + rebase_path(kernel_output, root_build_dir),
+  extra_frontend_server_args = []
+  if (is_aot) {
+    extra_frontend_server_args += [
+      "--aot",
+      "--tfa",
     ]
+  } else {
+    # --no-link-platform is only valid when --aot isn't specified
+    extra_frontend_server_args += [ "--no-link-platform" ]
+  }
 
-    if (is_aot) {
-      args += [
-        "--aot",
-        "--tfa",
-      ]
-    } else {
-      # --no-link-platform is only valid when --aot isn't specified
-      args += [ "--no-link-platform" ]
-    }
-
-    if (defined(invoker.product) && invoker.product) {
-      # Setting this flag in a non-product release build for AOT (a "profile"
-      # build) causes the vm service isolate code to be tree-shaken from an app.
-      # See the pragma on the entrypoint here:
-      #
-      # https://github.com/dart-lang/sdk/blob/main/sdk/lib/_internal/vm/bin/vmservice_io.dart#L240
-      #
-      # Also, this define excludes debugging and profiling code from Flutter.
-      args += [ "-Ddart.vm.product=true" ]
-    } else {
-      if (flutter_runtime_mode == "profile") {
-        # The following define excludes debugging code from Flutter.
-        args += [ "-Ddart.vm.profile=true" ]
-      }
+  if (defined(invoker.product) && invoker.product) {
+    # Setting this flag in a non-product release build for AOT (a "profile"
+    # build) causes the vm service isolate code to be tree-shaken from an app.
+    # See the pragma on the entrypoint here:
+    #
+    # https://github.com/dart-lang/sdk/blob/main/sdk/lib/_internal/vm/bin/vmservice_io.dart#L240
+    #
+    # Also, this define excludes debugging and profiling code from Flutter.
+    extra_frontend_server_args += [ "-Ddart.vm.product=true" ]
+  } else {
+    if (flutter_runtime_mode == "profile") {
+      # The following define excludes debugging code from Flutter.
+      extra_frontend_server_args += [ "-Ddart.vm.profile=true" ]
     }
+  }
 
-    args += [ rebase_path(main_dart) ]
+  flutter_frontend_server(kernel_target) {
+    main_dart = invoker.main_dart
+    package_config = invoker.package_config
+    kernel_output = kernel_output
+    extra_args = extra_frontend_server_args
   }
 
   compiled_action(snapshot_target) {
@@ -110,10 +181,10 @@ template("flutter_snapshot") {
       # By default Dart will create a 32-bit gen_snapshot host binary if the target
       # platform is 32-bit.  Override this to create a 64-bit gen_snapshot for x86
       # targets because some host platforms may not support 32-bit binaries.
-      tool = "//third_party/dart/runtime/bin:gen_snapshot_host_targeting_host"
+      tool = "$dart_src/runtime/bin:gen_snapshot_host_targeting_host"
       toolchain = "//build/toolchain/$host_os:clang_x64"
     } else {
-      tool = "//third_party/dart/runtime/bin:gen_snapshot"
+      tool = "$dart_src/runtime/bin:gen_snapshot"
     }
 
     inputs = [ kernel_output ]
@@ -283,7 +354,7 @@ template("application_snapshot") {
   # Ensure the compiled appliation (e.g. frontend-server, ...) will use this
   # Dart SDK hash when consuming/producing kernel.
   #
-  # (Instead of ensuring every user of the "application_snapshot" passes it's
+  # (Instead of ensuring every user of the "application_snapshot" passes its
   # own)
   snapshot_vm_args += [ "-Dsdk_hash=$sdk_hash" ]
 
@@ -330,181 +401,3 @@ template("application_snapshot") {
     }
   }
 }
-
-template("_dart_pkg_helper") {
-  assert(defined(invoker.package_name))
-  package_name = invoker.package_name
-  pkg_directory = rebase_path("$root_gen_dir/dart-pkg")
-  package_root = rebase_path("$root_gen_dir/dart-pkg/packages")
-  stamp_file = "$root_gen_dir/dart-pkg/${package_name}.stamp"
-  entries_file = "$root_gen_dir/dart-pkg/${package_name}.entries"
-
-  assert(defined(invoker.sources) || defined(invoker.apps) ||
-         defined(invoker.libs) || defined(invoker.pkg_dir))
-
-  action(target_name) {
-    deps = []
-    if (defined(invoker.deps)) {
-      deps += invoker.deps
-    }
-
-    datadeps = []
-    if (defined(invoker.datadeps)) {
-      datadeps += invoker.datadeps
-    }
-
-    sdk_ext_directory = []
-    if (defined(invoker.sdk_ext_directory)) {
-      sdk_ext_directory += [ invoker.sdk_ext_directory ]
-    }
-
-    sdk_ext_files = []
-    if (defined(invoker.sdk_ext_files)) {
-      sdk_ext_files += invoker.sdk_ext_files
-    }
-
-    sdk_ext_mappings = []
-    if (defined(invoker.sdk_ext_mappings)) {
-      sdk_ext_mappings += invoker.sdk_ext_mappings
-    }
-
-    script = rebase_path("//flutter/build/dart/tools/dart_pkg.py", ".", "//")
-
-    entrypoints = []
-    if (defined(invoker.apps)) {
-      foreach(app, invoker.apps) {
-        entrypoints += [ app[1] ]
-      }
-    }
-    if (defined(invoker.libs)) {
-      entrypoints += invoker.libs
-    }
-
-    sources = entrypoints
-    extra_flags = []
-    if (defined(invoker.sources)) {
-      sources += invoker.sources
-    } else if (defined(invoker.pkg_dir)) {
-      list_script = rebase_path("//flutter/build/dart/tools/ls.py", ".", "//")
-      extra_flags += [ "--read_only" ]
-      ls_sources = exec_script(list_script,
-                               [
-                                 "--target-directory",
-                                 rebase_path(invoker.pkg_dir),
-                               ],
-                               "list lines")
-      sources += ls_sources
-    }
-
-    # We have to use foreach to set up outputs instead of rebase_path because
-    # GN doesn't like assignments to outputs that aren't obviously under
-    # $root_gen_dir somewhere.
-    outputs = [
-      "$root_gen_dir/dart-pkg/${package_name}",
-      "$root_gen_dir/dart-pkg/${package_name}/pubspec.yaml",
-      "$root_gen_dir/dart-pkg/packages/${package_name}",
-      stamp_file,
-    ]
-
-    inputs = [ script ] + rebase_path(sources)
-
-    args = [
-             "--package-name",
-             package_name,
-             "--dart-sdk",
-             rebase_path(dart_sdk_root),
-             "--pkg-directory",
-             pkg_directory,
-             "--package-root",
-             package_root,
-             "--stamp-file",
-             rebase_path(stamp_file),
-             "--entries-file",
-             rebase_path(entries_file),
-             "--package-sources",
-           ] + rebase_path(sources) + [ "--package-entrypoints" ] +
-           rebase_path(entrypoints) + [ "--sdk-ext-directories" ] +
-           rebase_path(sdk_ext_directory) + [ "--sdk-ext-files" ] +
-           rebase_path(sdk_ext_files) + [ "--sdk-ext-mappings" ] +
-           sdk_ext_mappings + extra_flags
-  }
-}
-
-template("dart_pkg") {
-  if (defined(invoker.pkg_dir)) {
-    pubspec_yaml_path = rebase_path("pubspec.yaml", "", invoker.pkg_dir)
-  } else {
-    pubspec_yaml_path = rebase_path("pubspec.yaml")
-  }
-  dart_package_name_script =
-      rebase_path("//flutter/build/dart/tools/dart_package_name.py", ".", "//")
-  dart_package_name = exec_script(dart_package_name_script,
-                                  [
-                                    "--pubspec",
-                                    pubspec_yaml_path,
-                                  ],
-                                  "trim string",
-                                  [ pubspec_yaml_path ])
-
-  dart_pkg_target_name = "${target_name}_pkg_helper"
-  _dart_pkg_helper(dart_pkg_target_name) {
-    package_name = dart_package_name
-    if (defined(invoker.sources)) {
-      sources = invoker.sources
-    }
-    if (defined(invoker.apps)) {
-      apps = invoker.apps
-    }
-    if (defined(invoker.libs)) {
-      libs = invoker.libs
-    }
-    if (defined(invoker.pkg_dir)) {
-      pkg_dir = invoker.pkg_dir
-    }
-    if (defined(invoker.deps)) {
-      deps = invoker.deps
-    }
-    if (defined(invoker.datadeps)) {
-      datadeps = invoker.datadeps
-    }
-    if (defined(invoker.sdk_ext_directory)) {
-      sdk_ext_directory = invoker.sdk_ext_directory
-    }
-    if (defined(invoker.sdk_ext_files)) {
-      sdk_ext_files = invoker.sdk_ext_files
-    }
-    if (defined(invoker.sdk_ext_mappings)) {
-      sdk_ext_mappings = invoker.sdk_ext_mappings
-    }
-  }
-
-  if (defined(invoker.apps)) {
-    pkg_helper_output_dir = "$root_gen_dir/dart-pkg/${dart_package_name}"
-    foreach(app, invoker.apps) {
-      app_name = app[0]
-      app_entrypoint = app[1]
-      dartx_output_name = app_name
-      dartx_application("${app_name}_dart_app") {
-        output_name = dartx_output_name
-        main_dart = rebase_path(app_entrypoint, "", pkg_helper_output_dir)
-        sources = [ "$root_gen_dir/dart-pkg/${dart_package_name}.stamp" ]
-        deps = [ ":$dart_pkg_target_name" ]
-        deps += invoker.deps
-        if (defined(invoker.strict)) {
-          strict = invoker.strict
-        }
-      }
-    }
-  }
-
-  group(target_name) {
-    public_deps = [ ":$dart_pkg_target_name" ]
-    if (defined(invoker.apps)) {
-      foreach(app, invoker.apps) {
-        app_name = app[0]
-        dartx_target_name = "${app_name}_dart_app"
-        deps += [ ":$dartx_target_name" ]
-      }
-    }
-  }
-}
diff --git a/build/dart/tools/dart_package_name.py b/build/dart/tools/dart_package_name.py
deleted file mode 100755
index 54446248d81133a2e574de9f87d14e58024bcb94..0000000000000000000000000000000000000000
--- a/build/dart/tools/dart_package_name.py
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright 2013 The Flutter Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""This script outputs the package name specified in the pubspec.yaml"""
-
-import argparse
-import sys
-
-
-# TODO(johnmccutchan): Use the yaml package to parse.
-def package_name(line):
-  assert line.startswith('name:')
-  return line.split(':')[1].strip()
-
-
-def main(pubspec_file):
-  source_file = open(pubspec_file, 'r')
-  for line in source_file:
-    if line.startswith('name:'):
-      print(package_name(line))
-      return 0
-  source_file.close()
-  # Couldn't find it.
-  return -1
-
-
-if __name__ == '__main__':
-  parser = argparse.ArgumentParser(
-      description='This script outputs the package name specified in the '
-      'pubspec.yaml'
-  )
-  parser.add_argument(
-      '--pubspec',
-      dest='pubspec_file',
-      metavar='<pubspec-file>',
-      type=str,
-      required=True,
-      help='Path to pubspec file'
-  )
-  args = parser.parse_args()
-  sys.exit(main(args.pubspec_file))
diff --git a/build/dart/tools/dart_pkg.py b/build/dart/tools/dart_pkg.py
index ef5eec91e0522a5a2ffa09da265220e437dcfce5..45f492fad750aeaa2cb5e4963f4336db50b31fdc 100755
--- a/build/dart/tools/dart_pkg.py
+++ b/build/dart/tools/dart_pkg.py
@@ -16,9 +16,7 @@ import sys
 
 USE_LINKS = sys.platform != 'win32'
 
-DART_ANALYZE = os.path.join(
-    os.path.dirname(os.path.abspath(__file__)), 'dart_analyze.py'
-)
+DART_ANALYZE = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'dart_analyze.py')
 
 
 def dart_filter(path):
@@ -164,10 +162,7 @@ def analyze_entrypoints(dart_sdk, package_root, entrypoints):
 def main():
   parser = argparse.ArgumentParser(description='Generate a dart-pkg')
   parser.add_argument(
-      '--dart-sdk',
-      action='store',
-      metavar='dart_sdk',
-      help='Path to the Dart SDK.'
+      '--dart-sdk', action='store', metavar='dart_sdk', help='Path to the Dart SDK.'
   )
   parser.add_argument(
       '--package-name',
@@ -183,28 +178,14 @@ def main():
       required=True
   )
   parser.add_argument(
-      '--package-root',
-      metavar='package_root',
-      help='packages/ directory',
-      required=True
-  )
-  parser.add_argument(
-      '--stamp-file',
-      metavar='stamp_file',
-      help='timestamp file',
-      required=True
+      '--package-root', metavar='package_root', help='packages/ directory', required=True
   )
+  parser.add_argument('--stamp-file', metavar='stamp_file', help='timestamp file', required=True)
   parser.add_argument(
-      '--entries-file',
-      metavar='entries_file',
-      help='script entries file',
-      required=True
+      '--entries-file', metavar='entries_file', help='script entries file', required=True
   )
   parser.add_argument(
-      '--package-sources',
-      metavar='package_sources',
-      help='Package sources',
-      nargs='+'
+      '--package-sources', metavar='package_sources', help='Package sources', nargs='+'
   )
   parser.add_argument(
       '--package-entrypoints',
@@ -259,16 +240,12 @@ def main():
   sdkext_path = os.path.join(lib_path, '_sdkext')
   if mappings:
     with open(sdkext_path, 'w') as stream:
-      json.dump(
-          mappings, stream, sort_keys=True, indent=2, separators=(',', ': ')
-      )
+      json.dump(mappings, stream, sort_keys=True, indent=2, separators=(',', ': '))
   else:
     remove_if_exists(sdkext_path)
 
   # Copy or symlink package sources into pkg directory.
-  common_source_prefix = os.path.dirname(
-      os.path.commonprefix(args.package_sources)
-  )
+  common_source_prefix = os.path.dirname(os.path.commonprefix(args.package_sources))
   for source in args.package_sources:
     relative_source = os.path.relpath(source, common_source_prefix)
     target = os.path.join(target_dir, relative_source)
@@ -291,9 +268,7 @@ def main():
       target = os.path.join(sdk_ext_dir, relative_source)
       copy_or_link(source, target)
 
-  common_source_prefix = os.path.dirname(
-      os.path.commonprefix(args.sdk_ext_files)
-  )
+  common_source_prefix = os.path.dirname(os.path.commonprefix(args.sdk_ext_files))
   for source in args.sdk_ext_files:
     relative_source = os.path.relpath(source, common_source_prefix)
     target = os.path.join(sdk_ext_dir, relative_source)
diff --git a/build/esbuild/esbuild.gni b/build/esbuild/esbuild.gni
new file mode 100644
index 0000000000000000000000000000000000000000..f20cdb3c8662dd3c5292cdddd665a62d2943f75a
--- /dev/null
+++ b/build/esbuild/esbuild.gni
@@ -0,0 +1,44 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//flutter/common/config.gni")
+
+template("esbuild") {
+  assert(defined(invoker.entry_point))
+  assert(defined(invoker.output_bundle))
+  action(target_name) {
+    forward_variables_from(invoker, [ "public_deps" ])
+    if (host_os == "win") {
+      executable_subpath = "esbuild.exe"
+    } else {
+      executable_subpath = "bin/esbuild"
+    }
+    esbuild = "$host_prebuilts_path/esbuild/$executable_subpath"
+
+    script = "//build/gn_run_binary.py"
+    inputs = [
+      esbuild,
+      invoker.entry_point,
+    ]
+    output_filename = get_path_info(invoker.entry_point, "file")
+    output_path = "${invoker.output_bundle}/$output_filename"
+    outputs = [ output_path ]
+    absolute_output = rebase_path(invoker.output_bundle)
+    args = [ rebase_path(esbuild, root_build_dir) ]
+    if (defined(invoker.bundle) && invoker.bundle) {
+      args += [ "--bundle" ]
+    }
+    if (defined(invoker.minify) && invoker.minify) {
+      args += [ "--minify" ]
+    }
+    if (defined(invoker.sourcemap) && invoker.sourcemap) {
+      args += [ "--sourcemap" ]
+      outputs += [ output_path + ".map" ]
+    }
+    args += [
+      "--outdir=$absolute_output",
+      rebase_path(invoker.entry_point),
+    ]
+  }
+}
diff --git a/build/generate_coverage.py b/build/generate_coverage.py
index 7cad08a76d3ec5ec116d3c96a1be9a5b8571f8d3..c537da40b25e2c07e8f3d095bfffd01baa987644 100755
--- a/build/generate_coverage.py
+++ b/build/generate_coverage.py
@@ -13,9 +13,7 @@ import shutil
 
 
 def get_llvm_bin_directory():
-  buildtool_dir = os.path.join(
-      os.path.dirname(os.path.realpath(__file__)), '../../buildtools'
-  )
+  buildtool_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), '../../buildtools')
   platform_dir = ''
   if sys.platform.startswith('linux'):
     platform_dir = 'linux-x64'
@@ -23,9 +21,7 @@ def get_llvm_bin_directory():
     platform_dir = 'mac-x64'
   else:
     raise Exception('Unknown/Unsupported platform.')
-  llvm_bin_dir = os.path.abspath(
-      os.path.join(buildtool_dir, platform_dir, 'clang/bin')
-  )
+  llvm_bin_dir = os.path.abspath(os.path.join(buildtool_dir, platform_dir, 'clang/bin'))
   if not os.path.exists(llvm_bin_dir):
     raise Exception('LLVM directory %s double not be located.' % llvm_bin_dir)
   return llvm_bin_dir
@@ -61,9 +57,7 @@ def collect_profiles(args):
       print('Path %s does not exist.' % absolute_test_path)
       return -1
 
-    unstripped_test_path = os.path.join(
-        absolute_test_dir, 'exe.unstripped', test_name
-    )
+    unstripped_test_path = os.path.join(absolute_test_dir, 'exe.unstripped', test_name)
 
     if os.path.exists(unstripped_test_path):
       binaries.append(unstripped_test_path)
@@ -74,10 +68,7 @@ def collect_profiles(args):
 
     remove_if_exists(raw_profile)
 
-    print(
-        'Running test %s to gather profile.' %
-        os.path.basename(absolute_test_path)
-    )
+    print('Running test %s to gather profile.' % os.path.basename(absolute_test_path))
 
     test_command = [absolute_test_path]
 
@@ -105,8 +96,7 @@ def merge_profiles(llvm_bin_dir, raw_profiles, output):
   print('Merging %d raw profile(s) into single profile.' % len(raw_profiles))
   merged_profile_path = os.path.join(output, 'all.profile')
   remove_if_exists(merged_profile_path)
-  merge_command = [profdata_binary, 'merge', '-sparse'
-                  ] + raw_profiles + ['-o', merged_profile_path]
+  merge_command = [profdata_binary, 'merge', '-sparse'] + raw_profiles + ['-o', merged_profile_path]
   subprocess.check_call(merge_command)
   print('Done.')
   return merged_profile_path
diff --git a/build/get_concurrent_jobs.py b/build/get_concurrent_jobs.py
deleted file mode 100755
index 3559073c66dce15de1b32927b01e804e3c535eb4..0000000000000000000000000000000000000000
--- a/build/get_concurrent_jobs.py
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2019 The Fuchsia Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This script computes the number of concurrent jobs that can run in the
-# build as a function of the machine. It accepts a set of key value pairs
-# given by repeated --memory-per-job arguments. For example:
-#
-# $ get_concurrent_jobs.py --memory-per-job dart=1GB
-#
-# The result is a json map printed to stdout that gives the number of
-# concurrent jobs allowed of each kind. For example:
-#
-# {"dart": 8}
-#
-# Some memory can be held out of the calculation with the --reserve-memory flag.
-
-import argparse
-import ctypes
-import json
-import multiprocessing
-import os
-import re
-import subprocess
-import sys
-
-UNITS = {'B': 1, 'KB': 2**10, 'MB': 2**20, 'GB': 2**30, 'TB': 2**40}
-
-
-# pylint: disable=line-too-long
-# See https://docs.microsoft.com/en-us/windows/win32/api/sysinfoapi/nf-sysinfoapi-globalmemorystatusex
-# and https://docs.microsoft.com/en-us/windows/win32/api/sysinfoapi/ns-sysinfoapi-memorystatusex
-# pylint: enable=line-too-long
-class MEMORYSTATUSEX(ctypes.Structure):
-  _fields_ = [
-      ('dwLength', ctypes.c_ulong),
-      ('dwMemoryLoad', ctypes.c_ulong),
-      ('ullTotalPhys', ctypes.c_ulonglong),
-      ('ullAvailPhys', ctypes.c_ulonglong),
-      ('ullTotalPageFile', ctypes.c_ulonglong),
-      ('ullAvailPageFile', ctypes.c_ulonglong),
-      ('ullTotalVirtual', ctypes.c_ulonglong),
-      ('ullAvailVirtual', ctypes.c_ulonglong),
-      ('sullAvailExtendedVirtual', ctypes.c_ulonglong),
-  ]
-
-
-def get_total_memory():
-  if sys.platform in ('win32', 'cygwin'):
-    stat = MEMORYSTATUSEX(dwLength=ctypes.sizeof(MEMORYSTATUSEX))
-    success = ctypes.windll.kernel32.GlobalMemoryStatusEx(ctypes.byref(stat))
-    return stat.ullTotalPhys if success else 0
-  if sys.platform.startswith('linux'):
-    if os.path.exists('/proc/meminfo'):
-      with open('/proc/meminfo') as meminfo:
-        memtotal_re = re.compile(r'^MemTotal:\s*(\d*)\s*kB')
-        for line in meminfo:
-          match = memtotal_re.match(line)
-          if match:
-            return float(match.group(1)) * 2**10
-  if sys.platform == 'darwin':
-    try:
-      return int(subprocess.check_output(['sysctl', '-n', 'hw.memsize']))
-    except:  # pylint: disable=bare-except
-      return 0
-  return 0
-
-
-def parse_size(string):
-  i = next(i for (i, c) in enumerate(string) if not c.isdigit())
-  number = string[:i].strip()
-  unit = string[i:].strip()
-  return int(float(number) * UNITS[unit])
-
-
-class ParseSizeAction(argparse.Action):
-
-  def __call__(self, parser, args, values, option_string=None):
-    sizes = getattr(args, self.dest, [])
-    for value in values:
-      (k, val) = value.split('=', 1)
-      sizes.append((k, parse_size(val)))
-    setattr(args, self.dest, sizes)
-
-
-def main():
-  parser = argparse.ArgumentParser()
-  parser.add_argument(
-      '--memory-per-job',
-      action=ParseSizeAction,
-      default=[],
-      nargs='*',
-      help='Key value pairings (dart=1GB) giving an estimate of the amount of '
-      'memory needed for the class of job.'
-  )
-  parser.add_argument(
-      '--reserve-memory',
-      type=parse_size,
-      default=0,
-      help='The amount of memory to be held out of the amount for jobs to use.'
-  )
-  args = parser.parse_args()
-
-  total_memory = get_total_memory()
-
-  # Ensure the total memory used in the calculation below is at least 0
-  mem_total_bytes = max(0, total_memory - args.reserve_memory)
-
-  # Ensure the number of cpus used in the calculation below is at least 1
-  try:
-    cpu_cap = multiprocessing.cpu_count()
-  except:  # pylint: disable=bare-except
-    cpu_cap = 1
-
-  concurrent_jobs = {}
-  for job, memory_per_job in args.memory_per_job:
-    # Calculate the number of jobs that will fit in memory. Ensure the
-    # value is at least 1.
-    num_concurrent_jobs = int(max(1, mem_total_bytes / memory_per_job))
-    # Cap the number of jobs by the number of cpus available.
-    concurrent_jobs[job] = min(num_concurrent_jobs, cpu_cap)
-
-  print(json.dumps(concurrent_jobs))
-
-  return 0
-
-
-if __name__ == '__main__':
-  sys.exit(main())
diff --git a/build/git_revision.py b/build/git_revision.py
index d84886d8b84279cbdaf32ba6d6dd1555c8205517..8f7759e51f0fa262efeedf394fce3c32ffbcf5e1 100755
--- a/build/git_revision.py
+++ b/build/git_revision.py
@@ -40,10 +40,7 @@ def main():
   parser = argparse.ArgumentParser()
 
   parser.add_argument(
-      '--repository',
-      action='store',
-      help='Path to the Git repository.',
-      required=True
+      '--repository', action='store', help='Path to the Git repository.', required=True
   )
 
   args = parser.parse_args()
diff --git a/build/secondary/flutter/third_party/benchmark/BUILD.gn b/build/secondary/flutter/third_party/benchmark/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..77011568cbfb40a610baadff6edbf535a2127872
--- /dev/null
+++ b/build/secondary/flutter/third_party/benchmark/BUILD.gn
@@ -0,0 +1,59 @@
+# Copyright 2016 The Fuchsia Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+config("benchmark_config") {
+  visibility = [ ":*" ]
+  include_dirs = [ "include" ]
+}
+static_library("benchmark") {
+  testonly = true
+
+  sources = [
+    "//flutter/third_party/benchmark/src/arraysize.h",
+    "//flutter/third_party/benchmark/src/benchmark.cc",
+    "//flutter/third_party/benchmark/src/benchmark_api_internal.cc",
+    "//flutter/third_party/benchmark/src/benchmark_api_internal.h",
+    "//flutter/third_party/benchmark/src/benchmark_main.cc",
+    "//flutter/third_party/benchmark/src/benchmark_name.cc",
+    "//flutter/third_party/benchmark/src/benchmark_register.cc",
+    "//flutter/third_party/benchmark/src/benchmark_register.h",
+    "//flutter/third_party/benchmark/src/benchmark_runner.cc",
+    "//flutter/third_party/benchmark/src/benchmark_runner.h",
+    "//flutter/third_party/benchmark/src/check.h",
+    "//flutter/third_party/benchmark/src/colorprint.cc",
+    "//flutter/third_party/benchmark/src/colorprint.h",
+    "//flutter/third_party/benchmark/src/commandlineflags.cc",
+    "//flutter/third_party/benchmark/src/commandlineflags.h",
+    "//flutter/third_party/benchmark/src/complexity.cc",
+    "//flutter/third_party/benchmark/src/complexity.h",
+    "//flutter/third_party/benchmark/src/console_reporter.cc",
+    "//flutter/third_party/benchmark/src/counter.cc",
+    "//flutter/third_party/benchmark/src/counter.h",
+    "//flutter/third_party/benchmark/src/csv_reporter.cc",
+    "//flutter/third_party/benchmark/src/cycleclock.h",
+    "//flutter/third_party/benchmark/src/internal_macros.h",
+    "//flutter/third_party/benchmark/src/json_reporter.cc",
+    "//flutter/third_party/benchmark/src/log.h",
+    "//flutter/third_party/benchmark/src/mutex.h",
+    "//flutter/third_party/benchmark/src/perf_counters.cc",
+    "//flutter/third_party/benchmark/src/perf_counters.h",
+    "//flutter/third_party/benchmark/src/re.h",
+    "//flutter/third_party/benchmark/src/reporter.cc",
+    "//flutter/third_party/benchmark/src/sleep.cc",
+    "//flutter/third_party/benchmark/src/sleep.h",
+    "//flutter/third_party/benchmark/src/statistics.cc",
+    "//flutter/third_party/benchmark/src/statistics.h",
+    "//flutter/third_party/benchmark/src/string_util.cc",
+    "//flutter/third_party/benchmark/src/string_util.h",
+    "//flutter/third_party/benchmark/src/sysinfo.cc",
+    "//flutter/third_party/benchmark/src/thread_manager.h",
+    "//flutter/third_party/benchmark/src/thread_timer.h",
+    "//flutter/third_party/benchmark/src/timers.cc",
+    "//flutter/third_party/benchmark/src/timers.h",
+  ]
+  public_configs = [ ":benchmark_config" ]
+  defines = [
+    "HAVE_STD_REGEX",
+    "HAVE_THREAD_SAFETY_ATTRIBUTES",
+  ]
+}
diff --git a/build/secondary/flutter/third_party/expat/BUILD.gn b/build/secondary/flutter/third_party/expat/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..3a4282ad22ef3a481a109ded31d64c33d01eeca8
--- /dev/null
+++ b/build/secondary/flutter/third_party/expat/BUILD.gn
@@ -0,0 +1,26 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+config("expat_config") {
+  include_dirs = [
+    "expat/lib",
+    "//flutter/build/secondary/flutter/third_party/expat/expat_config",
+  ]
+
+  defines = [
+    "XML_STATIC",
+    "XML_DEV_URANDOM",
+  ]
+}
+
+static_library("expat") {
+  sources = [
+    "expat/lib/expat.h",
+    "expat/lib/xmlparse.c",
+    "expat/lib/xmlrole.c",
+    "expat/lib/xmltok.c",
+  ]
+
+  public_configs = [ ":expat_config" ]
+}
diff --git a/build/secondary/flutter/third_party/expat/expat_config/expat_config.h b/build/secondary/flutter/third_party/expat/expat_config/expat_config.h
new file mode 100644
index 0000000000000000000000000000000000000000..d02d0f6005c0e849391ba344ed2461a425bc8c2f
--- /dev/null
+++ b/build/secondary/flutter/third_party/expat/expat_config/expat_config.h
@@ -0,0 +1,14 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#define BYTEORDER 1234
+#define HAVE_INTTYPES_H 1
+#define HAVE_MEMORY_H 1
+#define HAVE_STDINT_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STRING_H 1
+#define STDC_HEADERS 1
+#define XML_CONTEXT_BYTES 1024
+#define XML_DTD 1
+#define XML_NS 1
diff --git a/build/secondary/flutter/third_party/flatbuffers/BUILD.gn b/build/secondary/flutter/third_party/flatbuffers/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..a5aba290a338de91d6ce420bcc5ae22d750ab8b9
--- /dev/null
+++ b/build/secondary/flutter/third_party/flatbuffers/BUILD.gn
@@ -0,0 +1,100 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+_src_root = "//flutter/third_party/flatbuffers"
+
+config("flatbuffers_public_configs") {
+  include_dirs = [ "$_src_root/include" ]
+
+  cflags = [ "-Wno-newline-eof" ]
+}
+
+source_set("flatbuffers") {
+  sources = [
+    "$_src_root/include/flatbuffers/allocator.h",
+    "$_src_root/include/flatbuffers/array.h",
+    "$_src_root/include/flatbuffers/base.h",
+    "$_src_root/include/flatbuffers/bfbs_generator.h",
+    "$_src_root/include/flatbuffers/buffer.h",
+    "$_src_root/include/flatbuffers/buffer_ref.h",
+    "$_src_root/include/flatbuffers/default_allocator.h",
+    "$_src_root/include/flatbuffers/detached_buffer.h",
+    "$_src_root/include/flatbuffers/flatbuffer_builder.h",
+    "$_src_root/include/flatbuffers/flatbuffers.h",
+    "$_src_root/include/flatbuffers/flex_flat_util.h",
+    "$_src_root/include/flatbuffers/flexbuffers.h",
+    "$_src_root/include/flatbuffers/hash.h",
+    "$_src_root/include/flatbuffers/idl.h",
+    "$_src_root/include/flatbuffers/minireflect.h",
+    "$_src_root/include/flatbuffers/reflection.h",
+    "$_src_root/include/flatbuffers/reflection_generated.h",
+    "$_src_root/include/flatbuffers/registry.h",
+    "$_src_root/include/flatbuffers/stl_emulation.h",
+    "$_src_root/include/flatbuffers/string.h",
+    "$_src_root/include/flatbuffers/struct.h",
+    "$_src_root/include/flatbuffers/table.h",
+    "$_src_root/include/flatbuffers/util.h",
+    "$_src_root/include/flatbuffers/vector.h",
+    "$_src_root/include/flatbuffers/vector_downward.h",
+    "$_src_root/include/flatbuffers/verifier.h",
+    "$_src_root/src/idl_gen_text.cpp",
+    "$_src_root/src/idl_parser.cpp",
+    "$_src_root/src/reflection.cpp",
+    "$_src_root/src/util.cpp",
+  ]
+
+  public_configs = [ ":flatbuffers_public_configs" ]
+}
+
+executable("flatc") {
+  sources = [
+    "$_src_root/grpc/src/compiler/cpp_generator.cc",
+    "$_src_root/grpc/src/compiler/cpp_generator.h",
+    "$_src_root/grpc/src/compiler/go_generator.cc",
+    "$_src_root/grpc/src/compiler/go_generator.h",
+    "$_src_root/grpc/src/compiler/java_generator.cc",
+    "$_src_root/grpc/src/compiler/java_generator.h",
+    "$_src_root/grpc/src/compiler/python_generator.cc",
+    "$_src_root/grpc/src/compiler/python_generator.h",
+    "$_src_root/grpc/src/compiler/schema_interface.h",
+    "$_src_root/grpc/src/compiler/swift_generator.cc",
+    "$_src_root/grpc/src/compiler/swift_generator.h",
+    "$_src_root/grpc/src/compiler/ts_generator.cc",
+    "$_src_root/grpc/src/compiler/ts_generator.h",
+    "$_src_root/include/flatbuffers/code_generators.h",
+    "$_src_root/src/annotated_binary_text_gen.cpp",
+    "$_src_root/src/annotated_binary_text_gen.h",
+    "$_src_root/src/bfbs_gen.h",
+    "$_src_root/src/bfbs_gen_lua.cpp",
+    "$_src_root/src/bfbs_gen_lua.h",
+    "$_src_root/src/bfbs_namer.h",
+    "$_src_root/src/binary_annotator.cpp",
+    "$_src_root/src/binary_annotator.h",
+    "$_src_root/src/code_generators.cpp",
+    "$_src_root/src/flatc.cpp",
+    "$_src_root/src/flatc_main.cpp",
+    "$_src_root/src/idl_gen_cpp.cpp",
+    "$_src_root/src/idl_gen_csharp.cpp",
+    "$_src_root/src/idl_gen_dart.cpp",
+    "$_src_root/src/idl_gen_fbs.cpp",
+    "$_src_root/src/idl_gen_go.cpp",
+    "$_src_root/src/idl_gen_grpc.cpp",
+    "$_src_root/src/idl_gen_java.cpp",
+    "$_src_root/src/idl_gen_json_schema.cpp",
+    "$_src_root/src/idl_gen_kotlin.cpp",
+    "$_src_root/src/idl_gen_lobster.cpp",
+    "$_src_root/src/idl_gen_lua.cpp",
+    "$_src_root/src/idl_gen_php.cpp",
+    "$_src_root/src/idl_gen_python.cpp",
+    "$_src_root/src/idl_gen_rust.cpp",
+    "$_src_root/src/idl_gen_swift.cpp",
+    "$_src_root/src/idl_gen_ts.cpp",
+    "$_src_root/src/idl_namer.h",
+    "$_src_root/src/namer.h",
+  ]
+
+  include_dirs = [ "$_src_root/grpc" ]
+
+  deps = [ ":flatbuffers" ]
+}
diff --git a/build/secondary/flutter/third_party/flatbuffers/flatbuffers.gni b/build/secondary/flutter/third_party/flatbuffers/flatbuffers.gni
new file mode 100644
index 0000000000000000000000000000000000000000..3c5c503952f1991e888af7391546807db257d75b
--- /dev/null
+++ b/build/secondary/flutter/third_party/flatbuffers/flatbuffers.gni
@@ -0,0 +1,51 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/compiled_action.gni")
+
+template("flatbuffers") {
+  assert(defined(invoker.flatbuffers),
+         "Flatbuffer schema files must be specified.")
+
+  flatc_target_name = "flatc_$target_name"
+  compiled_action_foreach(flatc_target_name) {
+    tool = "//flutter/third_party/flatbuffers:flatc"
+    sources = invoker.flatbuffers
+    outputs = [ "$target_gen_dir/{{source_name_part}}_flatbuffers.h" ]
+    args = [
+      "--warnings-as-errors",
+      "--cpp",
+      "--cpp-std",
+      "c++17",
+      "--cpp-static-reflection",
+      "--gen-object-api",
+      "--filename-suffix",
+      "_flatbuffers",
+      "-o",
+      rebase_path(target_gen_dir, root_build_dir),
+      "{{source}}",
+    ]
+  }
+
+  source_set(target_name) {
+    forward_variables_from(invoker,
+                           "*",
+                           [
+                             "flatbuffers",
+                             "sources",
+                             "deps",
+                           ])
+    sources = get_target_outputs(":$flatc_target_name")
+    if (defined(invoker.sources)) {
+      sources += invoker.sources
+    }
+    deps = [
+      ":$flatc_target_name",
+      "//flutter/third_party/flatbuffers",
+    ]
+    if (defined(invoker.deps)) {
+      deps += invoker.deps
+    }
+  }
+}
diff --git a/build/secondary/flutter/third_party/glfw/BUILD.gn b/build/secondary/flutter/third_party/glfw/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..dfb13047224a0cb99a93dfeefbd85cfaf9267680
--- /dev/null
+++ b/build/secondary/flutter/third_party/glfw/BUILD.gn
@@ -0,0 +1,155 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("glfw_args.gni")
+
+_checkout_dir = "//flutter/third_party/glfw"
+
+config("relative_glfw_headers") {
+  include_dirs = [
+    "$_checkout_dir/include",
+    "$_checkout_dir/include/GLFW",
+  ]
+}
+
+source_set("glfw") {
+  public = [
+    "$_checkout_dir/include/GLFW/glfw3.h",
+    "$_checkout_dir/include/GLFW/glfw3native.h",
+  ]
+
+  sources = [
+    "$_checkout_dir/src/context.c",
+    "$_checkout_dir/src/egl_context.c",
+    "$_checkout_dir/src/init.c",
+    "$_checkout_dir/src/input.c",
+    "$_checkout_dir/src/monitor.c",
+    "$_checkout_dir/src/null_init.c",
+    "$_checkout_dir/src/null_joystick.c",
+    "$_checkout_dir/src/null_joystick.h",
+    "$_checkout_dir/src/null_monitor.c",
+    "$_checkout_dir/src/null_platform.h",
+    "$_checkout_dir/src/null_window.c",
+    "$_checkout_dir/src/osmesa_context.c",
+    "$_checkout_dir/src/platform.c",
+    "$_checkout_dir/src/vulkan.c",
+    "$_checkout_dir/src/window.c",
+  ]
+
+  include_dirs = [ "$_checkout_dir/src" ]
+
+  public_configs = [ ":relative_glfw_headers" ]
+
+  if (is_win) {
+    sources += [
+      "$_checkout_dir/src/wgl_context.c",
+      "$_checkout_dir/src/win32_init.c",
+      "$_checkout_dir/src/win32_joystick.c",
+      "$_checkout_dir/src/win32_joystick.h",
+      "$_checkout_dir/src/win32_module.c",
+      "$_checkout_dir/src/win32_monitor.c",
+      "$_checkout_dir/src/win32_platform.h",
+      "$_checkout_dir/src/win32_thread.c",
+      "$_checkout_dir/src/win32_time.c",
+      "$_checkout_dir/src/win32_window.c",
+    ]
+
+    libs = [ "Gdi32.lib" ]
+
+    defines = [ "_GLFW_WIN32" ]
+  } else if (is_ohos) {
+    sources += [
+      "$_checkout_dir/src/glx_context.c",
+      "$_checkout_dir/src/glx_context.h",
+      "$_checkout_dir/src/posix_time.c",
+      "$_checkout_dir/src/posix_time.h",
+      "$_checkout_dir/src/posix_thread.c",
+      "$_checkout_dir/src/posix_thread.h",
+      "$_checkout_dir/src/x11_init.c",
+      "$_checkout_dir/src/x11_monitor.c",
+      "$_checkout_dir/src/x11_platform.h",
+      "$_checkout_dir/src/x11_window.c",
+      "$_checkout_dir/src/xkb_unicode.c",
+      "$_checkout_dir/src/xkb_unicode.h",
+    ]
+
+    defines = [
+      "_GLFW_X11",
+      "_GLFW_HAS_XF86VM",
+    ]
+
+    libs = [
+      "X11",
+      "Xcursor",
+      "Xinerama",
+      "Xrandr",
+      "Xxf86vm",
+    ]
+  } else if (is_linux) {
+    sources += [
+      "$_checkout_dir/src/glx_context.c",
+      "$_checkout_dir/src/linux_joystick.c",
+      "$_checkout_dir/src/linux_joystick.h",
+      "$_checkout_dir/src/posix_module.c",
+      "$_checkout_dir/src/posix_poll.c",
+      "$_checkout_dir/src/posix_poll.h",
+      "$_checkout_dir/src/posix_thread.c",
+      "$_checkout_dir/src/posix_thread.h",
+      "$_checkout_dir/src/posix_time.c",
+      "$_checkout_dir/src/posix_time.h",
+      "$_checkout_dir/src/x11_init.c",
+      "$_checkout_dir/src/x11_monitor.c",
+      "$_checkout_dir/src/x11_platform.h",
+      "$_checkout_dir/src/x11_window.c",
+      "$_checkout_dir/src/xkb_unicode.c",
+      "$_checkout_dir/src/xkb_unicode.h",
+    ]
+
+    defines = [
+      "_GLFW_X11",
+      "_GLFW_HAS_XF86VM",
+    ]
+
+    libs = [
+      "X11",
+      "Xcursor",
+      "Xinerama",
+      "Xrandr",
+      "Xxf86vm",
+    ]
+  } else if (is_mac) {
+    sources += [
+      "$_checkout_dir/src/cocoa_init.m",
+      "$_checkout_dir/src/cocoa_joystick.h",
+      "$_checkout_dir/src/cocoa_joystick.m",
+      "$_checkout_dir/src/cocoa_monitor.m",
+      "$_checkout_dir/src/cocoa_platform.h",
+      "$_checkout_dir/src/cocoa_time.c",
+      "$_checkout_dir/src/cocoa_window.m",
+      "$_checkout_dir/src/nsgl_context.m",
+      "$_checkout_dir/src/posix_module.c",
+      "$_checkout_dir/src/posix_thread.c",
+      "$_checkout_dir/src/posix_thread.h",
+    ]
+
+    defines = [ "_GLFW_COCOA" ]
+
+    cflags = [
+      "-Wno-deprecated-declarations",
+      "-Wno-objc-multiple-method-names",
+    ]
+
+    frameworks = [
+      "CoreVideo.framework",
+      "IOKit.framework",
+    ]
+  }
+
+  if (glfw_vulkan_library != "") {
+    defines += [ "_GLFW_VULKAN_LIBRARY=" + glfw_vulkan_library ]
+  }
+
+  configs -= [ "//build/config/compiler:chromium_code" ]
+  configs += [ "//build/config/compiler:no_chromium_code" ]
+}
diff --git a/build/secondary/flutter/third_party/glfw/README b/build/secondary/flutter/third_party/glfw/README
new file mode 100644
index 0000000000000000000000000000000000000000..404ef3cae2eec7a7f3a2ed075b59636b083cce7c
--- /dev/null
+++ b/build/secondary/flutter/third_party/glfw/README
@@ -0,0 +1,13 @@
+Name: GLFW
+License: zlib/libpng (BSD-like)
+Upstream Git: https://github.com/glfw/glfw
+Version: 3.2.1
+Description:
+
+GLFW is an Open Source, multi-platform library for OpenGL, OpenGL ES and
+Vulkan development on the desktop.
+
+To update:
+- Advance the pinned hash in DEPS, which should map the repository to
+  //third_party/glfw
+- Update BUILD.gn if necessary for changes.
diff --git a/build/secondary/flutter/third_party/glfw/glfw_args.gni b/build/secondary/flutter/third_party/glfw/glfw_args.gni
new file mode 100644
index 0000000000000000000000000000000000000000..c5903ad2078c8393039f44242126851b240ea2a0
--- /dev/null
+++ b/build/secondary/flutter/third_party/glfw/glfw_args.gni
@@ -0,0 +1,7 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+declare_args() {
+  glfw_vulkan_library = ""
+}
diff --git a/build/secondary/flutter/third_party/googletest/BUILD.gn b/build/secondary/flutter/third_party/googletest/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..8f866e72b7dc3a04bbd5fba2cf792b99998c1ae0
--- /dev/null
+++ b/build/secondary/flutter/third_party/googletest/BUILD.gn
@@ -0,0 +1,96 @@
+# Copyright 2018 The Fuchsia Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+if (is_fuchsia) {
+  import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
+}
+
+config("gtest_private_config") {
+  visibility = [ ":*" ]
+  include_dirs = [ "googletest" ]
+}
+
+config("gtest_config") {
+  include_dirs = [ "googletest/include" ]
+}
+
+static_library("gtest") {
+  testonly = true
+  public = [
+    "googletest/include/gtest/gtest-spi.h",
+    "googletest/include/gtest/gtest.h",
+    "googletest/include/gtest/gtest_prod.h",
+  ]
+
+  # Only add the "*-all.cc" files (and no headers) to improve maintainability
+  # from upstream refactoring. The "*-all.cc" files include the respective
+  # source files.
+  sources = [ "googletest/src/gtest-all.cc" ]
+
+  public_configs = [ ":gtest_config" ]
+  configs += [ ":gtest_private_config" ]
+
+  if (is_fuchsia) {
+    if (using_fuchsia_sdk) {
+      deps = [
+        "${fuchsia_sdk}/pkg/fdio",
+        "${fuchsia_sdk}/pkg/zx",
+      ]
+    } else {
+      deps = [
+        "//zircon/public/lib/fdio",
+        "//zircon/public/lib/zx",
+      ]
+    }
+  }
+}
+
+# Library that defines the FRIEND_TEST macro.
+source_set("gtest_prod") {
+  testonly = false
+  public = [ "googletest/include/gtest/gtest_prod.h" ]
+  public_configs = [ ":gtest_config" ]
+}
+
+static_library("gtest_main") {
+  testonly = true
+  sources = [ "googletest/src/gtest_main.cc" ]
+  public_deps = [ ":gtest" ]
+}
+
+config("gmock_private_config") {
+  visibility = [ ":*" ]
+  include_dirs = [ "googlemock" ]
+}
+
+config("gmock_config") {
+  include_dirs = [ "googlemock/include" ]
+
+  cflags_cc = [
+    # The MOCK_METHODn() macros do not specify "override", which triggers this
+    # warning in users: "error: 'Method' overrides a member function but is not
+    # marked 'override' [-Werror,-Winconsistent-missing-override]". Suppress
+    # these warnings until https://github.com/google/googletest/issues/533 is
+    # fixed.
+    "-Wno-inconsistent-missing-override",
+  ]
+}
+
+static_library("gmock") {
+  testonly = true
+  public = [ "googlemock/include/gmock/gmock.h" ]
+  sources = [ "googlemock/src/gmock-all.cc" ]
+  public_configs = [ ":gmock_config" ]
+  configs += [ ":gmock_private_config" ]
+  deps = [ ":gtest" ]
+}
+
+static_library("gmock_main") {
+  testonly = true
+  sources = [ "googlemock/src/gmock_main.cc" ]
+  public_deps = [
+    ":gmock",
+    ":gtest",
+  ]
+}
diff --git a/build/secondary/flutter/third_party/imgui/BUILD.gn b/build/secondary/flutter/third_party/imgui/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..9a93a12eaf7191189754278014cf68c2989ea0e1
--- /dev/null
+++ b/build/secondary/flutter/third_party/imgui/BUILD.gn
@@ -0,0 +1,48 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_root = "//flutter/third_party/imgui"
+
+source_set("imgui") {
+  public = [
+    "$source_root/imgui.h",
+    "$source_root/imgui_internal.h",
+    "$source_root/imstb_rectpack.h",
+    "$source_root/imstb_textedit.h",
+    "$source_root/imstb_truetype.h",
+  ]
+
+  include_dirs = [ "$source_root" ]
+
+  sources = [
+    "$source_root/imgui.cpp",
+    "$source_root/imgui.h",
+    "$source_root/imgui_demo.cpp",
+    "$source_root/imgui_draw.cpp",
+    "$source_root/imgui_internal.h",
+    "$source_root/imgui_tables.cpp",
+    "$source_root/imgui_widgets.cpp",
+    "$source_root/imstb_rectpack.h",
+    "$source_root/imstb_textedit.h",
+    "$source_root/imstb_truetype.h",
+  ]
+}
+
+config("imgui_headers") {
+  include_dirs = [ "$source_root" ]
+}
+
+source_set("imgui_glfw") {
+  public_deps = [
+    ":imgui",
+    "//flutter/third_party/glfw",
+  ]
+
+  public_configs = [ ":imgui_headers" ]
+
+  sources = [
+    "$source_root/backends/imgui_impl_glfw.cpp",
+    "$source_root/backends/imgui_impl_glfw.h",
+  ]
+}
diff --git a/build/secondary/flutter/third_party/json/BUILD.gn b/build/secondary/flutter/third_party/json/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..cf3c9c1ca9186f426a44ce332fa4739a68ab6278
--- /dev/null
+++ b/build/secondary/flutter/third_party/json/BUILD.gn
@@ -0,0 +1,63 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_root = "//flutter/third_party/json"
+
+config("json_public_config") {
+  include_dirs = [ "$source_root/include" ]
+}
+
+source_set("json") {
+  public_configs = [ ":json_public_config" ]
+
+  public = [ "$source_root/include/nlohmann/json.hpp" ]
+
+  sources = [
+    "$source_root/include/nlohmann/adl_serializer.hpp",
+    "$source_root/include/nlohmann/byte_container_with_subtype.hpp",
+    "$source_root/include/nlohmann/detail/abi_macros.hpp",
+    "$source_root/include/nlohmann/detail/conversions/from_json.hpp",
+    "$source_root/include/nlohmann/detail/conversions/to_chars.hpp",
+    "$source_root/include/nlohmann/detail/conversions/to_json.hpp",
+    "$source_root/include/nlohmann/detail/exceptions.hpp",
+    "$source_root/include/nlohmann/detail/hash.hpp",
+    "$source_root/include/nlohmann/detail/input/binary_reader.hpp",
+    "$source_root/include/nlohmann/detail/input/input_adapters.hpp",
+    "$source_root/include/nlohmann/detail/input/json_sax.hpp",
+    "$source_root/include/nlohmann/detail/input/lexer.hpp",
+    "$source_root/include/nlohmann/detail/input/parser.hpp",
+    "$source_root/include/nlohmann/detail/input/position_t.hpp",
+    "$source_root/include/nlohmann/detail/iterators/internal_iterator.hpp",
+    "$source_root/include/nlohmann/detail/iterators/iter_impl.hpp",
+    "$source_root/include/nlohmann/detail/iterators/iteration_proxy.hpp",
+    "$source_root/include/nlohmann/detail/iterators/iterator_traits.hpp",
+    "$source_root/include/nlohmann/detail/iterators/json_reverse_iterator.hpp",
+    "$source_root/include/nlohmann/detail/iterators/primitive_iterator.hpp",
+    "$source_root/include/nlohmann/detail/json_custom_base_class.hpp",
+    "$source_root/include/nlohmann/detail/json_pointer.hpp",
+    "$source_root/include/nlohmann/detail/json_ref.hpp",
+    "$source_root/include/nlohmann/detail/macro_scope.hpp",
+    "$source_root/include/nlohmann/detail/macro_unscope.hpp",
+    "$source_root/include/nlohmann/detail/meta/call_std/begin.hpp",
+    "$source_root/include/nlohmann/detail/meta/call_std/end.hpp",
+    "$source_root/include/nlohmann/detail/meta/cpp_future.hpp",
+    "$source_root/include/nlohmann/detail/meta/detected.hpp",
+    "$source_root/include/nlohmann/detail/meta/identity_tag.hpp",
+    "$source_root/include/nlohmann/detail/meta/is_sax.hpp",
+    "$source_root/include/nlohmann/detail/meta/std_fs.hpp",
+    "$source_root/include/nlohmann/detail/meta/type_traits.hpp",
+    "$source_root/include/nlohmann/detail/meta/void_t.hpp",
+    "$source_root/include/nlohmann/detail/output/binary_writer.hpp",
+    "$source_root/include/nlohmann/detail/output/output_adapters.hpp",
+    "$source_root/include/nlohmann/detail/output/serializer.hpp",
+    "$source_root/include/nlohmann/detail/string_concat.hpp",
+    "$source_root/include/nlohmann/detail/string_escape.hpp",
+    "$source_root/include/nlohmann/detail/value_t.hpp",
+    "$source_root/include/nlohmann/json.hpp",
+    "$source_root/include/nlohmann/json_fwd.hpp",
+    "$source_root/include/nlohmann/ordered_map.hpp",
+    "$source_root/include/nlohmann/thirdparty/hedley/hedley.hpp",
+    "$source_root/include/nlohmann/thirdparty/hedley/hedley_undef.hpp",
+  ]
+}
diff --git a/build/secondary/flutter/third_party/libwebp/BUILD.gn b/build/secondary/flutter/third_party/libwebp/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..5753b66b8d866ea8c346583e2be0f77ee7c5fdea
--- /dev/null
+++ b/build/secondary/flutter/third_party/libwebp/BUILD.gn
@@ -0,0 +1,178 @@
+# Copyright 2017 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This file is based on:
+# https://skia.googlesource.com/skia/+/main/third_party/libwebp/BUILD.gn
+config("libwebp_config") {
+  include_dirs = [
+    "//flutter/third_party/libwebp/src",
+    "//flutter/third_party/libwebp",
+  ]
+}
+
+config("libwebp_defines") {
+  defines = [
+    # WebP naturally decodes to RGB_565, Skia with BGR_565.
+    # This makes WebP decode to BGR_565 when we ask for RGB_565.
+    # (It also swaps the color order for 4444, but we don't care today.)
+    "WEBP_SWAP_16BIT_CSP",
+
+    # Prevent WebP symbols from being exposed.
+    "WEBP_EXTERN=extern",
+  ]
+}
+
+source_set("libwebp_sse41") {
+  include_dirs = [
+    "//flutter/third_party/libwebp/src",
+    "//flutter/third_party/libwebp",
+  ]
+  configs += [ ":libwebp_defines" ]
+  sources = [
+    "//flutter/third_party/libwebp/src/dsp/alpha_processing_sse41.c",
+    "//flutter/third_party/libwebp/src/dsp/dec_sse41.c",
+    "//flutter/third_party/libwebp/src/dsp/enc_sse41.c",
+    "//flutter/third_party/libwebp/src/dsp/lossless_enc_sse41.c",
+    "//flutter/third_party/libwebp/src/dsp/lossless_sse41.c",
+    "//flutter/third_party/libwebp/src/dsp/upsampling_sse41.c",
+    "//flutter/third_party/libwebp/src/dsp/yuv_sse41.c",
+  ]
+  if ((current_cpu == "x86" || current_cpu == "x64") && (!is_win || is_clang)) {
+    cflags_c = [ "-msse4.1" ]
+  }
+}
+
+source_set("libwebp") {
+  public_configs = [ ":libwebp_config" ]
+  include_dirs = [
+    "//flutter/third_party/libwebp/src",
+    "//flutter/third_party/libwebp",
+  ]
+
+  deps = [ ":libwebp_sse41" ]
+
+  if (is_android) {
+    deps += [ "//third_party/cpu-features" ]
+  }
+
+  configs += [ ":libwebp_defines" ]
+
+  sources = [
+    "//flutter/third_party/libwebp/sharpyuv/sharpyuv.c",
+    "//flutter/third_party/libwebp/sharpyuv/sharpyuv_cpu.c",
+    "//flutter/third_party/libwebp/sharpyuv/sharpyuv_csp.c",
+    "//flutter/third_party/libwebp/sharpyuv/sharpyuv_dsp.c",
+    "//flutter/third_party/libwebp/sharpyuv/sharpyuv_gamma.c",
+    "//flutter/third_party/libwebp/sharpyuv/sharpyuv_neon.c",
+    "//flutter/third_party/libwebp/sharpyuv/sharpyuv_sse2.c",
+    "//flutter/third_party/libwebp/src/dec/alpha_dec.c",
+    "//flutter/third_party/libwebp/src/dec/buffer_dec.c",
+    "//flutter/third_party/libwebp/src/dec/frame_dec.c",
+    "//flutter/third_party/libwebp/src/dec/idec_dec.c",
+    "//flutter/third_party/libwebp/src/dec/io_dec.c",
+    "//flutter/third_party/libwebp/src/dec/quant_dec.c",
+    "//flutter/third_party/libwebp/src/dec/tree_dec.c",
+    "//flutter/third_party/libwebp/src/dec/vp8_dec.c",
+    "//flutter/third_party/libwebp/src/dec/vp8l_dec.c",
+    "//flutter/third_party/libwebp/src/dec/webp_dec.c",
+    "//flutter/third_party/libwebp/src/demux/anim_decode.c",
+    "//flutter/third_party/libwebp/src/demux/demux.c",
+    "//flutter/third_party/libwebp/src/dsp/alpha_processing.c",
+    "//flutter/third_party/libwebp/src/dsp/alpha_processing_mips_dsp_r2.c",
+    "//flutter/third_party/libwebp/src/dsp/alpha_processing_neon.c",
+    "//flutter/third_party/libwebp/src/dsp/alpha_processing_sse2.c",
+    "//flutter/third_party/libwebp/src/dsp/cost.c",
+    "//flutter/third_party/libwebp/src/dsp/cost_mips32.c",
+    "//flutter/third_party/libwebp/src/dsp/cost_mips_dsp_r2.c",
+    "//flutter/third_party/libwebp/src/dsp/cost_neon.c",
+    "//flutter/third_party/libwebp/src/dsp/cost_sse2.c",
+    "//flutter/third_party/libwebp/src/dsp/cpu.c",
+    "//flutter/third_party/libwebp/src/dsp/dec.c",
+    "//flutter/third_party/libwebp/src/dsp/dec_clip_tables.c",
+    "//flutter/third_party/libwebp/src/dsp/dec_mips32.c",
+    "//flutter/third_party/libwebp/src/dsp/dec_mips_dsp_r2.c",
+    "//flutter/third_party/libwebp/src/dsp/dec_msa.c",
+    "//flutter/third_party/libwebp/src/dsp/dec_neon.c",
+    "//flutter/third_party/libwebp/src/dsp/dec_sse2.c",
+    "//flutter/third_party/libwebp/src/dsp/enc.c",
+    "//flutter/third_party/libwebp/src/dsp/enc_mips32.c",
+    "//flutter/third_party/libwebp/src/dsp/enc_mips_dsp_r2.c",
+    "//flutter/third_party/libwebp/src/dsp/enc_msa.c",
+    "//flutter/third_party/libwebp/src/dsp/enc_neon.c",
+    "//flutter/third_party/libwebp/src/dsp/enc_sse2.c",
+    "//flutter/third_party/libwebp/src/dsp/filters.c",
+    "//flutter/third_party/libwebp/src/dsp/filters_mips_dsp_r2.c",
+    "//flutter/third_party/libwebp/src/dsp/filters_msa.c",
+    "//flutter/third_party/libwebp/src/dsp/filters_neon.c",
+    "//flutter/third_party/libwebp/src/dsp/filters_sse2.c",
+    "//flutter/third_party/libwebp/src/dsp/lossless.c",
+    "//flutter/third_party/libwebp/src/dsp/lossless_enc.c",
+    "//flutter/third_party/libwebp/src/dsp/lossless_enc_mips32.c",
+    "//flutter/third_party/libwebp/src/dsp/lossless_enc_mips_dsp_r2.c",
+    "//flutter/third_party/libwebp/src/dsp/lossless_enc_msa.c",
+    "//flutter/third_party/libwebp/src/dsp/lossless_enc_neon.c",
+    "//flutter/third_party/libwebp/src/dsp/lossless_enc_sse2.c",
+    "//flutter/third_party/libwebp/src/dsp/lossless_mips_dsp_r2.c",
+    "//flutter/third_party/libwebp/src/dsp/lossless_msa.c",
+    "//flutter/third_party/libwebp/src/dsp/lossless_neon.c",
+    "//flutter/third_party/libwebp/src/dsp/lossless_sse2.c",
+    "//flutter/third_party/libwebp/src/dsp/rescaler.c",
+    "//flutter/third_party/libwebp/src/dsp/rescaler_mips32.c",
+    "//flutter/third_party/libwebp/src/dsp/rescaler_mips_dsp_r2.c",
+    "//flutter/third_party/libwebp/src/dsp/rescaler_msa.c",
+    "//flutter/third_party/libwebp/src/dsp/rescaler_neon.c",
+    "//flutter/third_party/libwebp/src/dsp/rescaler_sse2.c",
+    "//flutter/third_party/libwebp/src/dsp/ssim.c",
+    "//flutter/third_party/libwebp/src/dsp/ssim_sse2.c",
+    "//flutter/third_party/libwebp/src/dsp/upsampling.c",
+    "//flutter/third_party/libwebp/src/dsp/upsampling_mips_dsp_r2.c",
+    "//flutter/third_party/libwebp/src/dsp/upsampling_msa.c",
+    "//flutter/third_party/libwebp/src/dsp/upsampling_neon.c",
+    "//flutter/third_party/libwebp/src/dsp/upsampling_sse2.c",
+    "//flutter/third_party/libwebp/src/dsp/yuv.c",
+    "//flutter/third_party/libwebp/src/dsp/yuv_mips32.c",
+    "//flutter/third_party/libwebp/src/dsp/yuv_mips_dsp_r2.c",
+    "//flutter/third_party/libwebp/src/dsp/yuv_neon.c",
+    "//flutter/third_party/libwebp/src/dsp/yuv_sse2.c",
+    "//flutter/third_party/libwebp/src/enc/alpha_enc.c",
+    "//flutter/third_party/libwebp/src/enc/analysis_enc.c",
+    "//flutter/third_party/libwebp/src/enc/backward_references_cost_enc.c",
+    "//flutter/third_party/libwebp/src/enc/backward_references_enc.c",
+    "//flutter/third_party/libwebp/src/enc/config_enc.c",
+    "//flutter/third_party/libwebp/src/enc/cost_enc.c",
+    "//flutter/third_party/libwebp/src/enc/filter_enc.c",
+    "//flutter/third_party/libwebp/src/enc/frame_enc.c",
+    "//flutter/third_party/libwebp/src/enc/histogram_enc.c",
+    "//flutter/third_party/libwebp/src/enc/iterator_enc.c",
+    "//flutter/third_party/libwebp/src/enc/near_lossless_enc.c",
+    "//flutter/third_party/libwebp/src/enc/picture_csp_enc.c",
+    "//flutter/third_party/libwebp/src/enc/picture_enc.c",
+    "//flutter/third_party/libwebp/src/enc/picture_psnr_enc.c",
+    "//flutter/third_party/libwebp/src/enc/picture_rescale_enc.c",
+    "//flutter/third_party/libwebp/src/enc/picture_tools_enc.c",
+    "//flutter/third_party/libwebp/src/enc/predictor_enc.c",
+    "//flutter/third_party/libwebp/src/enc/quant_enc.c",
+    "//flutter/third_party/libwebp/src/enc/syntax_enc.c",
+    "//flutter/third_party/libwebp/src/enc/token_enc.c",
+    "//flutter/third_party/libwebp/src/enc/tree_enc.c",
+    "//flutter/third_party/libwebp/src/enc/vp8l_enc.c",
+    "//flutter/third_party/libwebp/src/enc/webp_enc.c",
+    "//flutter/third_party/libwebp/src/mux/anim_encode.c",
+    "//flutter/third_party/libwebp/src/mux/muxedit.c",
+    "//flutter/third_party/libwebp/src/mux/muxinternal.c",
+    "//flutter/third_party/libwebp/src/mux/muxread.c",
+    "//flutter/third_party/libwebp/src/utils/bit_reader_utils.c",
+    "//flutter/third_party/libwebp/src/utils/bit_writer_utils.c",
+    "//flutter/third_party/libwebp/src/utils/color_cache_utils.c",
+    "//flutter/third_party/libwebp/src/utils/filters_utils.c",
+    "//flutter/third_party/libwebp/src/utils/huffman_encode_utils.c",
+    "//flutter/third_party/libwebp/src/utils/huffman_utils.c",
+    "//flutter/third_party/libwebp/src/utils/quant_levels_dec_utils.c",
+    "//flutter/third_party/libwebp/src/utils/quant_levels_utils.c",
+    "//flutter/third_party/libwebp/src/utils/random_utils.c",
+    "//flutter/third_party/libwebp/src/utils/rescaler_utils.c",
+    "//flutter/third_party/libwebp/src/utils/thread_utils.c",
+    "//flutter/third_party/libwebp/src/utils/utils.c",
+  ]
+}
diff --git a/build/secondary/flutter/third_party/ocmock/BUILD.gn b/build/secondary/flutter/third_party/ocmock/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..5f1a172b8b2553f84017eb0b6c0d784c448e03f2
--- /dev/null
+++ b/build/secondary/flutter/third_party/ocmock/BUILD.gn
@@ -0,0 +1,121 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+ocmock_path = "//flutter/third_party/ocmock/Source"
+
+# OCMock headers use `#import <OCMock/Foo.h>`.
+config("ocmock_config") {
+  include_dirs = [ "$ocmock_path" ]
+}
+
+# Target that compiles all sources to .o files but does not produce a static
+# library for use in macOS desktop tests.
+source_set("ocmock_src") {
+  configs -= [
+    "//build/config/compiler:chromium_code",
+    "//build/config/gcc:symbol_visibility_hidden",
+    "//build/config:symbol_visibility_hidden",
+  ]
+  all_dependent_configs = [ ":ocmock_config" ]
+  cflags = [
+    "-fvisibility=default",
+    "-Wno-misleading-indentation",
+  ]
+  if (is_ios) {
+    cflags += [ "-mios-simulator-version-min=$ios_testing_deployment_target" ]
+  }
+
+  sources = [
+    "$ocmock_path/OCMock/NSInvocation+OCMAdditions.h",
+    "$ocmock_path/OCMock/NSInvocation+OCMAdditions.m",
+    "$ocmock_path/OCMock/NSMethodSignature+OCMAdditions.h",
+    "$ocmock_path/OCMock/NSMethodSignature+OCMAdditions.m",
+    "$ocmock_path/OCMock/NSNotificationCenter+OCMAdditions.h",
+    "$ocmock_path/OCMock/NSNotificationCenter+OCMAdditions.m",
+    "$ocmock_path/OCMock/NSObject+OCMAdditions.h",
+    "$ocmock_path/OCMock/NSObject+OCMAdditions.m",
+    "$ocmock_path/OCMock/NSValue+OCMAdditions.h",
+    "$ocmock_path/OCMock/NSValue+OCMAdditions.m",
+    "$ocmock_path/OCMock/OCClassMockObject.h",
+    "$ocmock_path/OCMock/OCClassMockObject.m",
+    "$ocmock_path/OCMock/OCMArg.h",
+    "$ocmock_path/OCMock/OCMArg.m",
+    "$ocmock_path/OCMock/OCMArgAction.h",
+    "$ocmock_path/OCMock/OCMArgAction.m",
+    "$ocmock_path/OCMock/OCMBlockArgCaller.h",
+    "$ocmock_path/OCMock/OCMBlockArgCaller.m",
+    "$ocmock_path/OCMock/OCMBlockCaller.h",
+    "$ocmock_path/OCMock/OCMBlockCaller.m",
+    "$ocmock_path/OCMock/OCMBoxedReturnValueProvider.h",
+    "$ocmock_path/OCMock/OCMBoxedReturnValueProvider.m",
+    "$ocmock_path/OCMock/OCMConstraint.h",
+    "$ocmock_path/OCMock/OCMConstraint.m",
+    "$ocmock_path/OCMock/OCMExceptionReturnValueProvider.h",
+    "$ocmock_path/OCMock/OCMExceptionReturnValueProvider.m",
+    "$ocmock_path/OCMock/OCMExpectationRecorder.h",
+    "$ocmock_path/OCMock/OCMExpectationRecorder.m",
+    "$ocmock_path/OCMock/OCMFunctions.h",
+    "$ocmock_path/OCMock/OCMFunctions.m",
+    "$ocmock_path/OCMock/OCMFunctionsPrivate.h",
+    "$ocmock_path/OCMock/OCMIndirectReturnValueProvider.h",
+    "$ocmock_path/OCMock/OCMIndirectReturnValueProvider.m",
+    "$ocmock_path/OCMock/OCMInvocationExpectation.h",
+    "$ocmock_path/OCMock/OCMInvocationExpectation.m",
+    "$ocmock_path/OCMock/OCMInvocationMatcher.h",
+    "$ocmock_path/OCMock/OCMInvocationMatcher.m",
+    "$ocmock_path/OCMock/OCMInvocationStub.h",
+    "$ocmock_path/OCMock/OCMInvocationStub.m",
+    "$ocmock_path/OCMock/OCMLocation.h",
+    "$ocmock_path/OCMock/OCMLocation.m",
+    "$ocmock_path/OCMock/OCMMacroState.h",
+    "$ocmock_path/OCMock/OCMMacroState.m",
+    "$ocmock_path/OCMock/OCMNonRetainingObjectReturnValueProvider.h",
+    "$ocmock_path/OCMock/OCMNonRetainingObjectReturnValueProvider.m",
+    "$ocmock_path/OCMock/OCMNotificationPoster.h",
+    "$ocmock_path/OCMock/OCMNotificationPoster.m",
+    "$ocmock_path/OCMock/OCMObjectReturnValueProvider.h",
+    "$ocmock_path/OCMock/OCMObjectReturnValueProvider.m",
+    "$ocmock_path/OCMock/OCMObserverRecorder.h",
+    "$ocmock_path/OCMock/OCMObserverRecorder.m",
+    "$ocmock_path/OCMock/OCMPassByRefSetter.h",
+    "$ocmock_path/OCMock/OCMPassByRefSetter.m",
+    "$ocmock_path/OCMock/OCMQuantifier.h",
+    "$ocmock_path/OCMock/OCMQuantifier.m",
+    "$ocmock_path/OCMock/OCMRealObjectForwarder.h",
+    "$ocmock_path/OCMock/OCMRealObjectForwarder.m",
+    "$ocmock_path/OCMock/OCMRecorder.h",
+    "$ocmock_path/OCMock/OCMRecorder.m",
+    "$ocmock_path/OCMock/OCMStubRecorder.h",
+    "$ocmock_path/OCMock/OCMStubRecorder.m",
+    "$ocmock_path/OCMock/OCMVerifier.h",
+    "$ocmock_path/OCMock/OCMVerifier.m",
+    "$ocmock_path/OCMock/OCMock.h",
+    "$ocmock_path/OCMock/OCMockObject.h",
+    "$ocmock_path/OCMock/OCMockObject.m",
+    "$ocmock_path/OCMock/OCObserverMockObject.h",
+    "$ocmock_path/OCMock/OCObserverMockObject.m",
+    "$ocmock_path/OCMock/OCPartialMockObject.h",
+    "$ocmock_path/OCMock/OCPartialMockObject.m",
+    "$ocmock_path/OCMock/OCProtocolMockObject.h",
+    "$ocmock_path/OCMock/OCProtocolMockObject.m",
+  ]
+
+  frameworks = [ "Foundation.framework" ]
+}
+
+shared_library("ocmock_shared") {
+  deps = [ ":ocmock_src" ]
+  cflags = [ "-fvisibility=default" ]
+  ldflags = [ "-Wl,-install_name,@rpath/Frameworks/libocmock_shared.dylib" ]
+}
+
+# Generates a static library, used in iOS unit test targets
+static_library("ocmock") {
+  # Force the static lib to include code from dependencies
+  complete_static_lib = true
+  if (is_ios) {
+    cflags = [ "-mios-simulator-version-min=$ios_testing_deployment_target" ]
+  }
+  public_deps = [ ":ocmock_src" ]
+}
diff --git a/build/secondary/flutter/third_party/stb/BUILD.gn b/build/secondary/flutter/third_party/stb/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..f846b34918d09bb0ade280802480c3731ff19e80
--- /dev/null
+++ b/build/secondary/flutter/third_party/stb/BUILD.gn
@@ -0,0 +1,17 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_root = "//flutter/third_party/stb"
+
+source_set("stb_truetype") {
+  testonly = true
+
+  public = [ "$source_root/stb_truetype.h" ]
+
+  include_dirs = [ "$source_root" ]
+
+  sources = [
+    "//flutter/build/secondary/flutter/third_party/stb/stb_truetype_stub.cc",
+  ]
+}
diff --git a/build/secondary/flutter/third_party/stb/stb_truetype_stub.cc b/build/secondary/flutter/third_party/stb/stb_truetype_stub.cc
new file mode 100644
index 0000000000000000000000000000000000000000..e490b1048c573ac67004ac38254fc72887b258a6
--- /dev/null
+++ b/build/secondary/flutter/third_party/stb/stb_truetype_stub.cc
@@ -0,0 +1,6 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#define STB_TRUETYPE_IMPLEMENTATION
+#include "flutter/third_party/stb/stb_truetype.h"
diff --git a/build/secondary/flutter/third_party/tinygltf/BUILD.gn b/build/secondary/flutter/third_party/tinygltf/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..01dd40f247ce3c94c9f70cf9dcfac291b384c108
--- /dev/null
+++ b/build/secondary/flutter/third_party/tinygltf/BUILD.gn
@@ -0,0 +1,24 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_root = "//flutter/third_party/tinygltf"
+
+source_set("tinygltf") {
+  public = [ "$source_root/tiny_gltf.h" ]
+
+  if (is_clang) {
+    cflags_cc = [ "-Wno-sign-compare" ]
+  }
+
+  include_dirs = [
+    "$source_root",
+    "$source_root/third_party/include",
+  ]
+
+  sources = [
+    "//flutter/build/secondary/flutter/third_party/tinygltf/tinygltf_stub.cc",
+  ]
+
+  deps = [ "//flutter/third_party/json" ]
+}
diff --git a/build/secondary/flutter/third_party/tinygltf/tinygltf_stub.cc b/build/secondary/flutter/third_party/tinygltf/tinygltf_stub.cc
new file mode 100644
index 0000000000000000000000000000000000000000..3dc3df3c035c87cd9add8995fdbe58cb219324d5
--- /dev/null
+++ b/build/secondary/flutter/third_party/tinygltf/tinygltf_stub.cc
@@ -0,0 +1,11 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "nlohmann/json.hpp"
+
+#define TINYGLTF_IMPLEMENTATION
+#define TINYGLTF_NO_INCLUDE_JSON
+#define STB_IMAGE_IMPLEMENTATION
+#define STB_IMAGE_WRITE_IMPLEMENTATION
+#include "flutter/third_party/tinygltf/tiny_gltf.h"
diff --git a/build/secondary/flutter/third_party/vulkan_memory_allocator/BUILD.gn b/build/secondary/flutter/third_party/vulkan_memory_allocator/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..2cac60a4c9d118ded1c1f34346dc223c305b8c1c
--- /dev/null
+++ b/build/secondary/flutter/third_party/vulkan_memory_allocator/BUILD.gn
@@ -0,0 +1,40 @@
+# Copyright 2020 The ANGLE Project Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+#
+# Custom GN integration for VulkanMemoryAllocator.
+
+declare_args() {
+  vma_vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src"
+}
+
+config("vulkan_memory_allocator_config") {
+  include_dirs = [ "include" ]
+  if (is_clang) {
+    cflags_cc = [
+      "-Wno-c++98-compat-extra-semi",
+      "-Wno-deprecated-copy",
+      "-Wno-implicit-fallthrough",
+      "-Wno-nullability-completeness",
+      "-Wno-suggest-destructor-override",
+      "-Wno-suggest-override",
+      "-Wno-unused-private-field",
+      "-Wno-unused-variable",
+    ]
+  }
+  if (is_win && !is_clang) {
+    cflags_cc = [
+      "/wd4189",  # local variable is initialized but not referenced
+    ]
+  }
+  defines = [
+    "VMA_DYNAMIC_VULKAN_FUNCTIONS=0",
+    "VMA_STATIC_VULKAN_FUNCTIONS=0",
+  ]
+}
+
+source_set("vulkan_memory_allocator") {
+  sources = [ "include/vk_mem_alloc.h" ]
+  deps = [ "${vma_vulkan_headers_dir}:vulkan_headers" ]
+  public_configs = [ ":vulkan_memory_allocator_config" ]
+}
diff --git a/build/secondary/flutter/third_party/wuffs/BUILD.gn b/build/secondary/flutter/third_party/wuffs/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..a78200b1e8feb6478aa9f70827cbc71ade5a9004
--- /dev/null
+++ b/build/secondary/flutter/third_party/wuffs/BUILD.gn
@@ -0,0 +1,59 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+config("wuffs_public") {
+  include_dirs = [ "release/c" ]
+
+  cflags = []
+
+  if (is_clang) {
+    cflags += [
+      "-Wno-unused-function",
+      "-Wno-c++11-narrowing",
+    ]
+  }
+}
+
+source_set("wuffs") {
+  public_configs = [ ":wuffs_public" ]
+
+  defines = [
+    # Copy/pasting from "../externals/wuffs/release/c/wuffs-*.c":
+    #
+    # ----
+    #
+    # Wuffs ships as a "single file C library" or "header file library" as per
+    # https://github.com/nothings/stb/blob/master/docs/stb_howto.txt
+    #
+    # To use that single file as a "foo.c"-like implementation, instead of a
+    # "foo.h"-like header, #define WUFFS_IMPLEMENTATION before #include'ing or
+    # compiling it.
+    #
+    # ----
+    "WUFFS_IMPLEMENTATION",
+
+    # Continuing to copy/paste:
+    #
+    # ----
+    #
+    # Defining the WUFFS_CONFIG__MODULE* macros are optional, but it lets users
+    # of Wuffs' .c file explicitly include which parts of Wuffs to build. That
+    # file contains the entire Wuffs standard library, implementing a variety of
+    # codecs and file formats. Without this macro definition, an optimizing
+    # compiler or linker may very well discard Wuffs code for unused codecs,
+    # but listing the Wuffs modules we use makes that process explicit.
+    # Preprocessing means that such code simply isn't compiled.
+    #
+    # ----
+    #
+    # For Skia, we're only interested in particular image codes (e.g. GIF) and
+    # their dependencies (e.g. BASE, LZW).
+    "WUFFS_CONFIG__MODULES",
+    "WUFFS_CONFIG__MODULE__BASE",
+    "WUFFS_CONFIG__MODULE__GIF",
+    "WUFFS_CONFIG__MODULE__LZW",
+  ]
+
+  sources = [ "release/c/wuffs-v0.3.c" ]
+}
diff --git a/build/secondary/testing/gmock/BUILD.gn b/build/secondary/testing/gmock/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..ecf49f0ff7f6fa600eaa5611899816f7fad2768a
--- /dev/null
+++ b/build/secondary/testing/gmock/BUILD.gn
@@ -0,0 +1,50 @@
+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+config("gmock_config") {
+  # Gmock headers need to be able to find themselves.
+  include_dirs = [ "include" ]
+}
+
+static_library("gmock") {
+  # TODO http://crbug.com/412064 enable this flag all the time.
+  testonly = !is_component_build
+  sources = [
+    # Sources based on files in r173 of gmock.
+    "include/gmock/gmock-actions.h",
+    "include/gmock/gmock-cardinalities.h",
+    "include/gmock/gmock-generated-actions.h",
+    "include/gmock/gmock-generated-function-mockers.h",
+    "include/gmock/gmock-generated-matchers.h",
+    "include/gmock/gmock-generated-nice-strict.h",
+    "include/gmock/gmock-matchers.h",
+    "include/gmock/gmock-spec-builders.h",
+    "include/gmock/gmock.h",
+    "include/gmock/internal/gmock-generated-internal-utils.h",
+    "include/gmock/internal/gmock-internal-utils.h",
+    "include/gmock/internal/gmock-port.h",
+
+    #"src/gmock-all.cc",  # Not needed by our build.
+    "src/gmock-cardinalities.cc",
+    "src/gmock-internal-utils.cc",
+    "src/gmock-matchers.cc",
+    "src/gmock-spec-builders.cc",
+    "src/gmock.cc",
+  ]
+
+  # This project includes some stuff form gtest's guts.
+  include_dirs = [ "../gtest/include" ]
+
+  public_configs = [
+    ":gmock_config",
+    "//testing/gtest:gtest_config",
+  ]
+}
+
+static_library("gmock_main") {
+  # TODO http://crbug.com/412064 enable this flag all the time.
+  testonly = !is_component_build
+  sources = [ "src/gmock_main.cc" ]
+  deps = [ ":gmock" ]
+}
diff --git a/build/secondary/testing/gtest/BUILD.gn b/build/secondary/testing/gtest/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..dad1b7d697b32d79a07a47fabf7d68630cd2ad0e
--- /dev/null
+++ b/build/secondary/testing/gtest/BUILD.gn
@@ -0,0 +1,132 @@
+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+config("gtest_config") {
+  visibility = [
+    ":*",
+    "//testing/gmock:*",  # gmock also shares this config.
+  ]
+
+  defines = [
+    # In order to allow regex matches in gtest to be shared between Windows
+    # and other systems, we tell gtest to always use it's internal engine.
+    "GTEST_HAS_POSIX_RE=0",
+
+    # Chrome doesn't support / require C++11, yet.
+    "GTEST_LANG_CXX11=0",
+  ]
+
+  # Gtest headers need to be able to find themselves.
+  include_dirs = [ "include" ]
+
+  if (is_win) {
+    cflags = [ "/wd4800" ]  # Unused variable warning.
+  }
+
+  if (is_posix) {
+    defines += [
+      # gtest isn't able to figure out when RTTI is disabled for gcc
+      # versions older than 4.3.2, and assumes it's enabled.  Our Mac
+      # and Linux builds disable RTTI, and cannot guarantee that the
+      # compiler will be 4.3.2. or newer.  The Mac, for example, uses
+      # 4.2.1 as that is the latest available on that platform.  gtest
+      # must be instructed that RTTI is disabled here, and for any
+      # direct dependents that might include gtest headers.
+      "GTEST_HAS_RTTI=0",
+    ]
+  }
+
+  if (is_android) {
+    defines += [
+      # We want gtest features that use tr1::tuple, but we currently
+      # don't support the variadic templates used by libstdc++'s
+      # implementation. gtest supports this scenario by providing its
+      # own implementation but we must opt in to it.
+      "GTEST_USE_OWN_TR1_TUPLE=1",
+
+      # GTEST_USE_OWN_TR1_TUPLE only works if GTEST_HAS_TR1_TUPLE is set.
+      # gtest r625 made it so that GTEST_HAS_TR1_TUPLE is set to 0
+      # automatically on android, so it has to be set explicitly here.
+      "GTEST_HAS_TR1_TUPLE=1",
+    ]
+  }
+}
+
+config("gtest_direct_config") {
+  visibility = [ ":*" ]
+  defines = [ "UNIT_TEST" ]
+}
+
+config("gtest_warnings") {
+  visibility = [ ":*" ]
+  if (is_win && is_clang) {
+    # The Mutex constructor initializer list in gtest-port.cc is incorrectly
+    # ordered. See
+    # https://groups.google.com/d/msg/googletestframework/S5uSV8L2TX8/U1FaTDa6J6sJ.
+    cflags = [ "-Wno-reorder" ]
+  }
+}
+
+static_library("gtest") {
+  # TODO http://crbug.com/412064 enable this flag all the time.
+  testonly = !is_component_build
+  sources = [
+    "include/gtest/gtest-death-test.h",
+    "include/gtest/gtest-message.h",
+    "include/gtest/gtest-param-test.h",
+    "include/gtest/gtest-printers.h",
+    "include/gtest/gtest-spi.h",
+    "include/gtest/gtest-test-part.h",
+    "include/gtest/gtest-typed-test.h",
+    "include/gtest/gtest.h",
+    "include/gtest/gtest_pred_impl.h",
+    "include/gtest/internal/gtest-death-test-internal.h",
+    "include/gtest/internal/gtest-filepath.h",
+    "include/gtest/internal/gtest-internal.h",
+    "include/gtest/internal/gtest-linked_ptr.h",
+    "include/gtest/internal/gtest-param-util-generated.h",
+    "include/gtest/internal/gtest-param-util.h",
+    "include/gtest/internal/gtest-port.h",
+    "include/gtest/internal/gtest-string.h",
+    "include/gtest/internal/gtest-tuple.h",
+    "include/gtest/internal/gtest-type-util.h",
+
+    #"gtest/src/gtest-all.cc",  # Not needed by our build.
+    "../multiprocess_func_list.cc",
+    "../multiprocess_func_list.h",
+    "../platform_test.h",
+    "src/gtest-death-test.cc",
+    "src/gtest-filepath.cc",
+    "src/gtest-internal-inl.h",
+    "src/gtest-port.cc",
+    "src/gtest-printers.cc",
+    "src/gtest-test-part.cc",
+    "src/gtest-typed-test.cc",
+    "src/gtest.cc",
+  ]
+
+  if (is_mac) {
+    sources += [
+      "../gtest_mac.h",
+      "../gtest_mac.mm",
+      "../platform_test_mac.mm",
+    ]
+  }
+
+  include_dirs = [ "." ]
+
+  all_dependent_configs = [ ":gtest_config" ]
+  public_configs = [ ":gtest_direct_config" ]
+
+  configs -= [ "//build/config/compiler:chromium_code" ]
+  configs += [ "//build/config/compiler:no_chromium_code" ]
+  configs += [ ":gtest_warnings" ]
+}
+
+source_set("gtest_main") {
+  # TODO http://crbug.com/412064 enable this flag all the time.
+  testonly = !is_component_build
+  sources = [ "src/gtest_main.cc" ]
+  deps = [ ":gtest" ]
+}
diff --git a/build/secondary/testing/libfuzzer/fuzzer_test.gni b/build/secondary/testing/libfuzzer/fuzzer_test.gni
new file mode 100644
index 0000000000000000000000000000000000000000..8f8f3e750feec8d2eb57233280a775bfaa2e4edd
--- /dev/null
+++ b/build/secondary/testing/libfuzzer/fuzzer_test.gni
@@ -0,0 +1,11 @@
+# Copyright 2019 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This is a dummy implementation to satisfy the ANGLE build, using the no-op
+# implementation from the real (Chromium) fuzzer_test.gni.
+template("fuzzer_test") {
+  not_needed(invoker, "*")
+  group(target_name) {
+  }
+}
diff --git a/build/secondary/testing/test.gni b/build/secondary/testing/test.gni
new file mode 100644
index 0000000000000000000000000000000000000000..ff724df08962ace1b9a069169826ee90174e76cc
--- /dev/null
+++ b/build/secondary/testing/test.gni
@@ -0,0 +1,6 @@
+# Copyright 2019 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This is a dummy file to satisfy the ANGLE build. Flutter's use of ANGLE
+# doesn't actually require any of the real content.
diff --git a/build/secondary/third_party/BUILD.gn b/build/secondary/third_party/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..c44ca40e888325ccce2b870f9e4b08e11e39c278
--- /dev/null
+++ b/build/secondary/third_party/BUILD.gn
@@ -0,0 +1,9 @@
+# Copyright 2016 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("fontconfig") {
+  if (is_linux) {
+    libs = [ "fontconfig" ]
+  }
+}
diff --git a/build/secondary/third_party/android_ndk/BUILD.gn b/build/secondary/third_party/android_ndk/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..697d2873a5e399dc5d9749c6cd51cbefa582f4b4
--- /dev/null
+++ b/build/secondary/third_party/android_ndk/BUILD.gn
@@ -0,0 +1,8 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("cpu_features") {
+  public_configs = [ "//third_party/android_tools:cpu_features_include" ]
+  deps = [ "//third_party/android_tools:cpu_features" ]
+}
diff --git a/build/secondary/third_party/android_tools/BUILD.gn b/build/secondary/third_party/android_tools/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..574472afdb27ab20478cd34ceb363078b6a92d89
--- /dev/null
+++ b/build/secondary/third_party/android_tools/BUILD.gn
@@ -0,0 +1,19 @@
+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/android/rules.gni")
+
+config("cpu_features_include") {
+  include_dirs = [ "ndk/sources/android/cpufeatures" ]
+}
+
+# This is the GN version of
+# //build/android/ndk.gyp:cpu_features
+source_set("cpu_features") {
+  sources = [ "ndk/sources/android/cpufeatures/cpu-features.c" ]
+  public_configs = [ ":cpu_features_include" ]
+
+  configs -= [ "//build/config/compiler:chromium_code" ]
+  configs += [ "//build/config/compiler:no_chromium_code" ]
+}
diff --git a/build/secondary/third_party/boringssl/BUILD.gn b/build/secondary/third_party/boringssl/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..e0ff1b726974011ffc3df0f53d5955c984ec2cb8
--- /dev/null
+++ b/build/secondary/third_party/boringssl/BUILD.gn
@@ -0,0 +1,7 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+group("boringssl") {
+  public_deps = [ "//flutter/third_party/boringssl" ]
+}
diff --git a/build/secondary/third_party/cpu-features/BUILD.gn b/build/secondary/third_party/cpu-features/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..dadee56df8cffa4c34f6d54371b5ee36b71cce1f
--- /dev/null
+++ b/build/secondary/third_party/cpu-features/BUILD.gn
@@ -0,0 +1,8 @@
+# Copyright 2016 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("cpu-features") {
+  public_configs = [ "//third_party/android_tools:cpu_features_include" ]
+  deps = [ "//third_party/android_tools:cpu_features" ]
+}
diff --git a/build/secondary/third_party/dart/pkg/meta/BUILD.gn b/build/secondary/third_party/dart/pkg/meta/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..3ad0e03f66bbe294ed9d0902a7aa432d0e2b866e
--- /dev/null
+++ b/build/secondary/third_party/dart/pkg/meta/BUILD.gn
@@ -0,0 +1,26 @@
+# Copyright 2021 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# TODO(flutter/flutter#85356): This file was originally generated by the
+# fuchsia.git script: `package_importer.py`. The generated `BUILD.gn` files were
+# copied to the flutter repo to support `dart_library` targets used for
+# Flutter-Fuchsia integration tests. This file can be maintained by hand, but it
+# would be better to implement a script for Flutter, to either generate these
+# BUILD.gn files or dynamically generate the GN targets.
+
+import("//flutter/tools/fuchsia/dart/dart_library.gni")
+
+dart_library("meta") {
+  package_name = "meta"
+
+  language_version = "2.12"
+
+  deps = []
+
+  sources = [
+    "dart2js.dart",
+    "meta.dart",
+    "meta_meta.dart",
+  ]
+}
diff --git a/build/secondary/third_party/dart/third_party/pkg/args/BUILD.gn b/build/secondary/third_party/dart/third_party/pkg/args/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..e25404362f6a171a5099ad1542c4b8977472930a
--- /dev/null
+++ b/build/secondary/third_party/dart/third_party/pkg/args/BUILD.gn
@@ -0,0 +1,35 @@
+# Copyright 2021 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# TODO(flutter/flutter#85356): This file was originally generated by the
+# fuchsia.git script: `package_importer.py`. The generated `BUILD.gn` files were
+# copied to the flutter repo to support `dart_library` targets used for
+# Flutter-Fuchsia integration tests. This file can be maintained by hand, but it
+# would be better to implement a script for Flutter, to either generate these
+# BUILD.gn files or dynamically generate the GN targets.
+
+import("//flutter/tools/fuchsia/dart/dart_library.gni")
+
+dart_library("args") {
+  package_name = "args"
+
+  language_version = "2.12"
+
+  deps = []
+
+  sources = [
+    "args.dart",
+    "command_runner.dart",
+    "src/allow_anything_parser.dart",
+    "src/arg_parser.dart",
+    "src/arg_parser_exception.dart",
+    "src/arg_results.dart",
+    "src/help_command.dart",
+    "src/option.dart",
+    "src/parser.dart",
+    "src/usage.dart",
+    "src/usage_exception.dart",
+    "src/utils.dart",
+  ]
+}
diff --git a/build/secondary/third_party/dart/third_party/pkg/collection/BUILD.gn b/build/secondary/third_party/dart/third_party/pkg/collection/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..092624f4bed1a5c7166ff4b84521670a6d19c5ec
--- /dev/null
+++ b/build/secondary/third_party/dart/third_party/pkg/collection/BUILD.gn
@@ -0,0 +1,51 @@
+# Copyright 2021 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# TODO(flutter/flutter#85356): This file was originally generated by the
+# fuchsia.git script: `package_importer.py`. The generated `BUILD.gn` files were
+# copied to the flutter repo to support `dart_library` targets used for
+# Flutter-Fuchsia integration tests. This file can be maintained by hand, but it
+# would be better to implement a script for Flutter, to either generate these
+# BUILD.gn files or dynamically generate the GN targets.
+
+import("//flutter/tools/fuchsia/dart/dart_library.gni")
+
+dart_library("collection") {
+  package_name = "collection"
+
+  language_version = "2.12"
+
+  deps = []
+
+  sources = [
+    "algorithms.dart",
+    "collection.dart",
+    "equality.dart",
+    "iterable_zip.dart",
+    "priority_queue.dart",
+    "src/algorithms.dart",
+    "src/canonicalized_map.dart",
+    "src/combined_wrappers/combined_iterable.dart",
+    "src/combined_wrappers/combined_iterator.dart",
+    "src/combined_wrappers/combined_list.dart",
+    "src/combined_wrappers/combined_map.dart",
+    "src/comparators.dart",
+    "src/empty_unmodifiable_set.dart",
+    "src/equality.dart",
+    "src/equality_map.dart",
+    "src/equality_set.dart",
+    "src/functions.dart",
+    "src/iterable_extensions.dart",
+    "src/iterable_zip.dart",
+    "src/list_extensions.dart",
+    "src/priority_queue.dart",
+    "src/queue_list.dart",
+    "src/union_set.dart",
+    "src/union_set_controller.dart",
+    "src/unmodifiable_wrappers.dart",
+    "src/utils.dart",
+    "src/wrappers.dart",
+    "wrappers.dart",
+  ]
+}
diff --git a/build/secondary/third_party/dart/third_party/pkg/logging/BUILD.gn b/build/secondary/third_party/dart/third_party/pkg/logging/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..73baa07636161c4fa9813cb08ac7277580eea978
--- /dev/null
+++ b/build/secondary/third_party/dart/third_party/pkg/logging/BUILD.gn
@@ -0,0 +1,27 @@
+# Copyright 2021 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# TODO(flutter/flutter#85356): This file was originally generated by the
+# fuchsia.git script: `package_importer.py`. The generated `BUILD.gn` files were
+# copied to the flutter repo to support `dart_library` targets used for
+# Flutter-Fuchsia integration tests. This file can be maintained by hand, but it
+# would be better to implement a script for Flutter, to either generate these
+# BUILD.gn files or dynamically generate the GN targets.
+
+import("//flutter/tools/fuchsia/dart/dart_library.gni")
+
+dart_library("logging") {
+  package_name = "logging"
+
+  language_version = "2.12"
+
+  deps = []
+
+  sources = [
+    "logging.dart",
+    "src/level.dart",
+    "src/log_record.dart",
+    "src/logger.dart",
+  ]
+}
diff --git a/build/secondary/third_party/dart/third_party/pkg/matcher/BUILD.gn b/build/secondary/third_party/dart/third_party/pkg/matcher/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..5ed834571018f861dfc88daac564f42c25562452
--- /dev/null
+++ b/build/secondary/third_party/dart/third_party/pkg/matcher/BUILD.gn
@@ -0,0 +1,55 @@
+# Copyright 2021 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# TODO(flutter/flutter#85356): This file was originally generated by the
+# fuchsia.git script: `package_importer.py`. The generated `BUILD.gn` files were
+# copied to the flutter repo to support `dart_library` targets used for
+# Flutter-Fuchsia integration tests. This file can be maintained by hand, but it
+# would be better to implement a script for Flutter, to either generate these
+# BUILD.gn files or dynamically generate the GN targets.
+
+import("//flutter/tools/fuchsia/dart/dart_library.gni")
+
+dart_library("matcher") {
+  package_name = "matcher"
+
+  language_version = "2.12"
+
+  deps = [ "$dart_src/third_party/pkg/stack_trace" ]
+
+  sources = [
+    "expect.dart",
+    "matcher.dart",
+    "mirror_matchers.dart",
+    "src/core_matchers.dart",
+    "src/custom_matcher.dart",
+    "src/description.dart",
+    "src/equals_matcher.dart",
+    "src/error_matchers.dart",
+    "src/expect/async_matcher.dart",
+    "src/expect/expect.dart",
+    "src/expect/expect_async.dart",
+    "src/expect/future_matchers.dart",
+    "src/expect/never_called.dart",
+    "src/expect/prints_matcher.dart",
+    "src/expect/stream_matcher.dart",
+    "src/expect/stream_matchers.dart",
+    "src/expect/throws_matcher.dart",
+    "src/expect/throws_matchers.dart",
+    "src/expect/util/placeholder.dart",
+    "src/expect/util/pretty_print.dart",
+    "src/feature_matcher.dart",
+    "src/having_matcher.dart",
+    "src/interfaces.dart",
+    "src/iterable_matchers.dart",
+    "src/map_matchers.dart",
+    "src/numeric_matchers.dart",
+    "src/operator_matchers.dart",
+    "src/order_matchers.dart",
+    "src/pretty_print.dart",
+    "src/string_matchers.dart",
+    "src/type_matcher.dart",
+    "src/util.dart",
+  ]
+}
diff --git a/build/secondary/third_party/dart/third_party/pkg/path/BUILD.gn b/build/secondary/third_party/dart/third_party/pkg/path/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..2e692b66eb9207032b2a54801f0bf1150891697a
--- /dev/null
+++ b/build/secondary/third_party/dart/third_party/pkg/path/BUILD.gn
@@ -0,0 +1,36 @@
+# Copyright 2021 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# TODO(flutter/flutter#85356): This file was originally generated by the
+# fuchsia.git script: `package_importer.py`. The generated `BUILD.gn` files were
+# copied to the flutter repo to support `dart_library` targets used for
+# Flutter-Fuchsia integration tests. This file can be maintained by hand, but it
+# would be better to implement a script for Flutter, to either generate these
+# BUILD.gn files or dynamically generate the GN targets.
+
+import("//flutter/tools/fuchsia/dart/dart_library.gni")
+
+dart_library("path") {
+  package_name = "path"
+
+  language_version = "2.12"
+
+  deps = []
+
+  sources = [
+    "path.dart",
+    "src/characters.dart",
+    "src/context.dart",
+    "src/internal_style.dart",
+    "src/parsed_path.dart",
+    "src/path_exception.dart",
+    "src/path_map.dart",
+    "src/path_set.dart",
+    "src/style.dart",
+    "src/style/posix.dart",
+    "src/style/url.dart",
+    "src/style/windows.dart",
+    "src/utils.dart",
+  ]
+}
diff --git a/build/secondary/third_party/dart/third_party/pkg/stack_trace/BUILD.gn b/build/secondary/third_party/dart/third_party/pkg/stack_trace/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..52d8dd999cf838004ca262ec2d9cb24670786bc7
--- /dev/null
+++ b/build/secondary/third_party/dart/third_party/pkg/stack_trace/BUILD.gn
@@ -0,0 +1,33 @@
+# Copyright 2021 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# TODO(flutter/flutter#85356): This file was originally generated by the
+# fuchsia.git script: `package_importer.py`. The generated `BUILD.gn` files were
+# copied to the flutter repo to support `dart_library` targets used for
+# Flutter-Fuchsia integration tests. This file can be maintained by hand, but it
+# would be better to implement a script for Flutter, to either generate these
+# BUILD.gn files or dynamically generate the GN targets.
+
+import("//flutter/tools/fuchsia/dart/dart_library.gni")
+
+dart_library("stack_trace") {
+  package_name = "stack_trace"
+
+  language_version = "2.12"
+
+  deps = [ "$dart_src/third_party/pkg/path" ]
+
+  sources = [
+    "src/chain.dart",
+    "src/frame.dart",
+    "src/lazy_chain.dart",
+    "src/lazy_trace.dart",
+    "src/stack_zone_specification.dart",
+    "src/trace.dart",
+    "src/unparsed_frame.dart",
+    "src/utils.dart",
+    "src/vm_trace.dart",
+    "stack_trace.dart",
+  ]
+}
diff --git a/build/secondary/third_party/freetype2/BUILD.gn b/build/secondary/third_party/freetype2/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..630e75b95d39bdfaa7633046c17fe759ef5a7079
--- /dev/null
+++ b/build/secondary/third_party/freetype2/BUILD.gn
@@ -0,0 +1,7 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+group("freetype2") {
+  public_deps = [ "//flutter/third_party/freetype2" ]
+}
diff --git a/build/secondary/third_party/googletest/BUILD.gn b/build/secondary/third_party/googletest/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..67aca24c0703646eccfdf21262e07e047f653fba
--- /dev/null
+++ b/build/secondary/third_party/googletest/BUILD.gn
@@ -0,0 +1,13 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+group("gmock") {
+  testonly = true
+  public_deps = [ "//flutter/third_party/googletest:gmock" ]
+}
+
+group("gtest") {
+  testonly = true
+  public_deps = [ "//flutter/third_party/googletest:gtest" ]
+}
diff --git a/build/concurrent_jobs.gni b/build/secondary/third_party/harfbuzz/BUILD.gn
similarity index 45%
rename from build/concurrent_jobs.gni
rename to build/secondary/third_party/harfbuzz/BUILD.gn
index a930b255682767061d42a6256d39c8881b8940b5..1d71a76526226579e159ea8d5e93fb53821d9e85 100644
--- a/build/concurrent_jobs.gni
+++ b/build/secondary/third_party/harfbuzz/BUILD.gn
@@ -2,11 +2,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-_script = "//flutter/build/get_concurrent_jobs.py"
-_args = [
-  "--reserve-memory=1GB",
-  "--memory-per-job",
-  "dart=1GB",
-]
+group("harfbuzz") {
+  public_deps = [ "//flutter/third_party/harfbuzz" ]
+}
 
-concurrent_jobs = exec_script(_script, _args, "json", [ _script ])
+group("harfbuzz_subset") {
+  public_deps = [ "//flutter/third_party/harfbuzz:harfbuzz_subset" ]
+}
diff --git a/build/secondary/third_party/icu/BUILD.gn b/build/secondary/third_party/icu/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..bec3e35b2615561336eaa0453a7c44b0c13c20e7
--- /dev/null
+++ b/build/secondary/third_party/icu/BUILD.gn
@@ -0,0 +1,19 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+group("icui18n_hidden_visibility") {
+  public_deps = [ "//flutter/third_party/icu:icui18n_hidden_visibility" ]
+}
+
+group("icuuc_hidden_visibility") {
+  public_deps = [ "//flutter/third_party/icu:icuuc_hidden_visibility" ]
+}
+
+group("icui18n") {
+  public_deps = [ "//flutter/third_party/icu:icui18n" ]
+}
+
+group("icuuc") {
+  public_deps = [ "//flutter/third_party/icu:icuuc" ]
+}
diff --git a/build/secondary/third_party/inja/BUILD.gn b/build/secondary/third_party/inja/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..2ed3e67ad30f326075027e6e4610579e5c91443c
--- /dev/null
+++ b/build/secondary/third_party/inja/BUILD.gn
@@ -0,0 +1,43 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_root = "//flutter/third_party/inja"
+
+config("inja_public_config") {
+  include_dirs = [ "$source_root/include" ]
+
+  if (is_clang) {
+    cflags_cc = [
+      "-Wno-unused-variable",
+      "-Wno-newline-eof",
+    ]
+  }
+
+  defines = [ "INJA_NOEXCEPTION=1" ]
+}
+
+source_set("inja") {
+  public_configs = [ ":inja_public_config" ]
+
+  public = [ "$source_root/include/inja/inja.hpp" ]
+
+  sources = [
+    "$source_root/include/inja/config.hpp",
+    "$source_root/include/inja/environment.hpp",
+    "$source_root/include/inja/exceptions.hpp",
+    "$source_root/include/inja/function_storage.hpp",
+    "$source_root/include/inja/inja.hpp",
+    "$source_root/include/inja/lexer.hpp",
+    "$source_root/include/inja/node.hpp",
+    "$source_root/include/inja/parser.hpp",
+    "$source_root/include/inja/renderer.hpp",
+    "$source_root/include/inja/statistics.hpp",
+    "$source_root/include/inja/string_view.hpp",
+    "$source_root/include/inja/template.hpp",
+    "$source_root/include/inja/token.hpp",
+    "$source_root/include/inja/utils.hpp",
+  ]
+
+  public_deps = [ "//flutter/third_party/json" ]
+}
diff --git a/build/secondary/third_party/jsoncpp/BUILD.gn b/build/secondary/third_party/jsoncpp/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..ff255b0add118f78190b0be2ce8d5cfd9f45fc8d
--- /dev/null
+++ b/build/secondary/third_party/jsoncpp/BUILD.gn
@@ -0,0 +1,11 @@
+# Copyright 2019 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# The ANGLE build rules have a target that depends on jsoncpp, but the Flutter
+# engine never actually builds that target, so just this provides empty dummy
+# dependencies to satisfy the generation-time resolution.
+config("jsoncpp_config") {
+}
+group("jsoncpp") {
+}
diff --git a/build/secondary/third_party/libcxx/BUILD.gn b/build/secondary/third_party/libcxx/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..710ebe465d1b29307edef953cbc71242987714b4
--- /dev/null
+++ b/build/secondary/third_party/libcxx/BUILD.gn
@@ -0,0 +1,117 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+config("libcxx_config") {
+  defines = [ "_LIBCPP_DISABLE_AVAILABILITY=1" ]
+  include_dirs = [ "//flutter/build/secondary/third_party/libcxx/config" ]
+}
+
+config("src_include") {
+  include_dirs = [ "src" ]
+}
+
+source_set("libcxx") {
+  sources = [
+    "src/algorithm.cpp",
+    "src/any.cpp",
+    "src/bind.cpp",
+    "src/charconv.cpp",
+    "src/chrono.cpp",
+    "src/condition_variable.cpp",
+    "src/condition_variable_destructor.cpp",
+    "src/debug.cpp",
+    "src/exception.cpp",
+    "src/filesystem/directory_iterator.cpp",
+    "src/filesystem/filesystem_common.h",
+    "src/filesystem/int128_builtins.cpp",
+    "src/filesystem/operations.cpp",
+    "src/functional.cpp",
+    "src/future.cpp",
+    "src/hash.cpp",
+    "src/ios.cpp",
+    "src/ios.instantiations.cpp",
+    "src/iostream.cpp",
+    "src/locale.cpp",
+    "src/memory.cpp",
+    "src/mutex.cpp",
+    "src/mutex_destructor.cpp",
+    "src/new.cpp",
+    "src/optional.cpp",
+    "src/random.cpp",
+    "src/regex.cpp",
+    "src/ryu/d2fixed.cpp",
+    "src/ryu/d2s.cpp",
+    "src/ryu/f2s.cpp",
+    "src/shared_mutex.cpp",
+    "src/stdexcept.cpp",
+    "src/string.cpp",
+    "src/strstream.cpp",
+    "src/system_error.cpp",
+    "src/thread.cpp",
+    "src/typeinfo.cpp",
+    "src/utility.cpp",
+    "src/valarray.cpp",
+    "src/variant.cpp",
+    "src/vector.cpp",
+  ]
+
+  deps = [ "//third_party/libcxxabi" ]
+
+  # TODO(goderbauer): remove when all sources build with LTO for android_arm64 and android_x64.
+  if (is_android && (current_cpu == "arm64" || current_cpu == "x64")) {
+    sources -= [ "src/new.cpp" ]
+    deps += [ ":libcxx_nolto" ]
+  }
+
+  public_configs = [
+    ":libcxx_config",
+    "//third_party/libcxxabi:libcxxabi_config",
+  ]
+
+  defines = [
+    "_LIBCPP_NO_EXCEPTIONS",
+    "_LIBCPP_NO_RTTI",
+    "_LIBCPP_BUILDING_LIBRARY",
+    "LIBCXX_BUILDING_LIBCXXABI",
+  ]
+
+  # While no translation units in Flutter engine enable RTTI, it may be enabled
+  # in one of the third party dependencies. This mirrors the configuration in
+  # libcxxabi.
+  configs -= [ "//build/config/compiler:no_rtti" ]
+  configs += [ "//build/config/compiler:rtti" ]
+
+  # libcxx requires C++20
+  configs -= [ "//build/config/compiler:cxx_version_default" ]
+  configs += [ "//build/config/compiler:cxx_version_20" ]
+
+  configs += [ ":src_include" ]
+
+  if (is_clang) {
+    # shared_mutex.cpp and debug.cpp are purposefully in violation.
+    cflags_cc = [ "-Wno-thread-safety-analysis" ]
+  }
+}
+
+source_set("libcxx_nolto") {
+  visibility = [ ":*" ]
+
+  sources = [ "src/new.cpp" ]
+
+  cflags_cc = [ "-fno-lto" ]
+
+  deps = [ "//third_party/libcxxabi" ]
+
+  public_configs = [
+    ":libcxx_config",
+    "//third_party/libcxxabi:libcxxabi_config",
+  ]
+
+  defines = [
+    "_LIBCPP_NO_EXCEPTIONS",
+    "_LIBCPP_NO_RTTI",
+    "_LIBCPP_BUILDING_LIBRARY",
+    "LIBCXX_BUILDING_LIBCXXABI",
+  ]
+}
diff --git a/build/secondary/third_party/libcxx/config/__config_site b/build/secondary/third_party/libcxx/config/__config_site
new file mode 100644
index 0000000000000000000000000000000000000000..e1a46ff65e409b34de12fb3d82f2b08aee03b6cb
--- /dev/null
+++ b/build/secondary/third_party/libcxx/config/__config_site
@@ -0,0 +1,40 @@
+#ifndef _LIBCPP_CONFIG_SITE
+#define _LIBCPP_CONFIG_SITE
+
+#define _LIBCPP_ABI_VERSION 1
+#define _LIBCPP_ABI_NAMESPACE _fl
+
+/* #undef _LIBCPP_ABI_FORCE_ITANIUM */
+/* #undef _LIBCPP_ABI_FORCE_MICROSOFT */
+/* #undef _LIBCPP_HIDE_FROM_ABI_PER_TU_BY_DEFAULT */
+/* #undef _LIBCPP_HAS_NO_GLOBAL_FILESYSTEM_NAMESPACE */
+/* #undef _LIBCPP_HAS_NO_STDIN */
+/* #undef _LIBCPP_HAS_NO_STDOUT */
+/* #undef _LIBCPP_HAS_NO_THREADS */
+/* #undef _LIBCPP_HAS_NO_MONOTONIC_CLOCK */
+/* #undef _LIBCPP_HAS_NO_THREAD_UNSAFE_C_FUNCTIONS */
+/* #undef _LIBCPP_HAS_MUSL_LIBC */
+/* #undef _LIBCPP_HAS_THREAD_API_PTHREAD */
+/* #undef _LIBCPP_HAS_THREAD_API_EXTERNAL */
+/* #undef _LIBCPP_HAS_THREAD_API_WIN32 */
+/* #undef _LIBCPP_HAS_THREAD_LIBRARY_EXTERNAL */
+/* #undef _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS */
+#define _LIBCPP_HAS_NO_VENDOR_AVAILABILITY_ANNOTATIONS
+/* #undef _LIBCPP_NO_VCRUNTIME */
+/* #undef _LIBCPP_TYPEINFO_COMPARISON_IMPLEMENTATION */
+/* #undef _LIBCPP_ABI_NAMESPACE */
+/* #undef _LIBCPP_HAS_NO_FILESYSTEM_LIBRARY */
+/* #undef _LIBCPP_HAS_PARALLEL_ALGORITHMS */
+/* #undef _LIBCPP_HAS_NO_RANDOM_DEVICE */
+/* #undef _LIBCPP_HAS_NO_LOCALIZATION */
+
+#define _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
+
+// This is a workaround for BoringSSL, which is compiled in C11 mode
+// and includes stdatomic.h.  Defining this macro will cause stdatomic.h
+// to redirect to the next version of that header in the include path.
+#if !defined(__cplusplus) && defined(__clang__)
+#define _LIBCPP_COMPILER_CLANG_BASED
+#endif
+
+#endif // _LIBCPP_CONFIG_SITE
diff --git a/build/secondary/third_party/libcxxabi/BUILD.gn b/build/secondary/third_party/libcxxabi/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..f3b308d4ffe7248bd81ce1a9a0cdab56dfa7411e
--- /dev/null
+++ b/build/secondary/third_party/libcxxabi/BUILD.gn
@@ -0,0 +1,86 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+config("libcxxabi_config") {
+  common_cc_flags = [
+    "-nostdinc++",
+    "-fvisibility=hidden",
+  ]
+
+  cflags_cc = common_cc_flags
+  cflags_objcc = common_cc_flags
+
+  include_dirs = [ "include" ]
+
+  if (is_ios) {
+    ldflags = [ "-Wl,-unexported_symbols_list," +
+                rebase_path("lib/new-delete.exp", root_build_dir) ]
+  }
+}
+
+source_set("libcxxabi") {
+  visibility = [ "../libcxx:*" ]
+
+  public_configs = [ ":libcxxabi_config" ]
+
+  defines = [
+    "_LIBCPP_BUILDING_LIBRARY",
+    "_LIBCXXABI_BUILDING_LIBRARY",
+    "LIBCXXABI_SILENT_TERMINATE",
+    "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
+  ]
+
+  sources = []
+
+  # Compile libcxx ABI using C++11. This replicates the rule in the
+  # CMakeLists on the "cxx_abiobjects" target.
+  configs -= [ "//build/config/compiler:cxx_version_default" ]
+  configs += [ "//build/config/compiler:cxx_version_20" ]
+
+  configs += [ "//third_party/libcxx:src_include" ]
+
+  # No translation units in the engine are built with exceptions. But, using
+  # Objective-C exceptions requires some infrastructure setup for exceptions.
+  # Build support for the same in cxxabi on Darwin.
+  if (is_mac || is_ios) {
+    configs -= [ "//build/config/gcc:no_exceptions" ]
+    sources += [
+      "src/cxa_exception.cpp",
+      "src/cxa_personality.cpp",
+    ]
+  } else {
+    if (!is_tsan) {
+      sources += [ "src/cxa_noexception.cpp" ]
+    }
+  }
+
+  # Third party dependencies may depend on RTTI. Add support for the same in
+  # cxxabi.
+  configs -= [ "//build/config/compiler:no_rtti" ]
+  configs += [ "//build/config/compiler:rtti" ]
+
+  sources += [
+    "src/abort_message.cpp",
+    "src/cxa_aux_runtime.cpp",
+    "src/cxa_default_handlers.cpp",
+    "src/cxa_demangle.cpp",
+    "src/cxa_exception_storage.cpp",
+    "src/cxa_handlers.cpp",
+    "src/cxa_vector.cpp",
+    "src/cxa_virtual.cpp",
+    "src/fallback_malloc.cpp",
+    "src/private_typeinfo.cpp",
+    "src/stdlib_exception.cpp",
+    "src/stdlib_stdexcept.cpp",
+    "src/stdlib_typeinfo.cpp",
+  ]
+
+  if (!(is_tsan && is_linux)) {
+    sources += [ "src/cxa_guard.cpp" ]
+  }
+
+  if (is_fuchsia || (is_posix && !is_apple)) {
+    sources += [ "src/cxa_thread_atexit.cpp" ]
+  }
+}
diff --git a/lib/web_ui/BUILD.gn b/build/secondary/third_party/libpng/BUILD.gn
similarity index 44%
rename from lib/web_ui/BUILD.gn
rename to build/secondary/third_party/libpng/BUILD.gn
index 955753e35c29e828db5fcdc7ea3fbd9f0e1d3a01..44be77c9a394dfc53658b8d71de43f85eb75a394 100644
--- a/lib/web_ui/BUILD.gn
+++ b/build/secondary/third_party/libpng/BUILD.gn
@@ -1,7 +1,7 @@
-# Copyright 2022 The Flutter Authors. All rights reserved.
+# Copyright 2013 The Flutter Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-group("canvaskit") {
-  deps = [ "//third_party/skia/modules/canvaskit" ]
+group("libpng") {
+  public_deps = [ "//flutter/third_party/libpng" ]
 }
diff --git a/build/secondary/third_party/libsrtp/BUILD.gn b/build/secondary/third_party/libsrtp/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..0213aa275831971b418aa7cf6c75d948acf3f03c
--- /dev/null
+++ b/build/secondary/third_party/libsrtp/BUILD.gn
@@ -0,0 +1,345 @@
+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+declare_args() {
+  use_system_libsrtp = false
+  use_srtp_boringssl = true
+}
+
+config("libsrtp_config") {
+  defines = [
+    "HAVE_CONFIG_H",
+    "HAVE_STDLIB_H",
+    "HAVE_STRING_H",
+    "TESTAPP_SOURCE",
+  ]
+
+  include_dirs = [
+    "config",
+    "srtp/include",
+    "srtp/crypto/include",
+  ]
+
+  if (use_srtp_boringssl) {
+    defines += [ "OPENSSL" ]
+  }
+
+  if (is_posix) {
+    defines += [
+      "HAVE_INT16_T",
+      "HAVE_INT32_T",
+      "HAVE_INT8_T",
+      "HAVE_UINT16_T",
+      "HAVE_UINT32_T",
+      "HAVE_UINT64_T",
+      "HAVE_UINT8_T",
+      "HAVE_STDINT_H",
+      "HAVE_INTTYPES_H",
+      "HAVE_NETINET_IN_H",
+      "HAVE_ARPA_INET_H",
+      "HAVE_UNISTD_H",
+    ]
+    cflags = [ "-Wno-unused-variable" ]
+  }
+
+  if (is_win) {
+    defines += [
+      "HAVE_BYTESWAP_METHODS_H",
+
+      # All Windows architectures are this way.
+      "SIZEOF_UNSIGNED_LONG=4",
+      "SIZEOF_UNSIGNED_LONG_LONG=8",
+    ]
+  }
+
+  if (current_cpu == "x64" || current_cpu == "x86" || current_cpu == "arm") {
+    defines += [
+      # TODO(leozwang): CPU_RISC doesn"t work properly on android/arm
+      # platform for unknown reasons, need to investigate the root cause
+      # of it. CPU_RISC is used for optimization only, and CPU_CISC should
+      # just work just fine, it has been tested on android/arm with srtp
+      # test applications and libjingle.
+      "CPU_CISC",
+    ]
+  }
+}
+
+config("system_libsrtp_config") {
+  defines = [ "USE_SYSTEM_LIBSRTP" ]
+  include_dirs = [ "/usr/include/srtp" ]
+}
+
+if (use_system_libsrtp) {
+  group("libsrtp") {
+    public_configs = [
+      ":libsrtp_config",
+      ":system_libsrtp_config",
+    ]
+    libs = [ "-lsrtp" ]
+  }
+} else {
+  static_library("libsrtp") {
+    configs -= [ "//build/config/compiler:chromium_code" ]
+    configs += [ "//build/config/compiler:no_chromium_code" ]
+    public_configs = [ ":libsrtp_config" ]
+
+    sources = [
+      # includes
+      "srtp/include/ekt.h",
+      "srtp/include/getopt_s.h",
+      "srtp/include/rtp.h",
+      "srtp/include/rtp_priv.h",
+      "srtp/include/srtp.h",
+      "srtp/include/srtp_priv.h",
+      "srtp/include/ut_sim.h",
+
+      # headers
+      "srtp/crypto/include/aes.h",
+      "srtp/crypto/include/aes_cbc.h",
+      "srtp/crypto/include/aes_icm.h",
+      "srtp/crypto/include/alloc.h",
+      "srtp/crypto/include/auth.h",
+      "srtp/crypto/include/cipher.h",
+      "srtp/crypto/include/crypto.h",
+      "srtp/crypto/include/crypto_kernel.h",
+      "srtp/crypto/include/crypto_math.h",
+      "srtp/crypto/include/crypto_types.h",
+      "srtp/crypto/include/cryptoalg.h",
+      "srtp/crypto/include/datatypes.h",
+      "srtp/crypto/include/err.h",
+      "srtp/crypto/include/gf2_8.h",
+      "srtp/crypto/include/hmac.h",
+      "srtp/crypto/include/integers.h",
+      "srtp/crypto/include/kernel_compat.h",
+      "srtp/crypto/include/key.h",
+      "srtp/crypto/include/null_auth.h",
+      "srtp/crypto/include/null_cipher.h",
+      "srtp/crypto/include/prng.h",
+      "srtp/crypto/include/rand_source.h",
+      "srtp/crypto/include/rdb.h",
+      "srtp/crypto/include/rdbx.h",
+      "srtp/crypto/include/sha1.h",
+      "srtp/crypto/include/stat.h",
+      "srtp/crypto/include/xfm.h",
+
+      # sources
+      "srtp/crypto/cipher/aes.c",
+      "srtp/crypto/cipher/aes_cbc.c",
+      "srtp/crypto/cipher/aes_icm.c",
+      "srtp/crypto/cipher/cipher.c",
+      "srtp/crypto/cipher/null_cipher.c",
+      "srtp/crypto/hash/auth.c",
+      "srtp/crypto/hash/hmac.c",
+      "srtp/crypto/hash/null_auth.c",
+      "srtp/crypto/hash/sha1.c",
+      "srtp/crypto/kernel/alloc.c",
+      "srtp/crypto/kernel/crypto_kernel.c",
+      "srtp/crypto/kernel/err.c",
+      "srtp/crypto/kernel/key.c",
+      "srtp/crypto/math/datatypes.c",
+      "srtp/crypto/math/gf2_8.c",
+      "srtp/crypto/math/stat.c",
+      "srtp/crypto/replay/rdb.c",
+      "srtp/crypto/replay/rdbx.c",
+      "srtp/crypto/replay/ut_sim.c",
+      "srtp/crypto/rng/ctr_prng.c",
+      "srtp/crypto/rng/prng.c",
+      "srtp/crypto/rng/rand_source.c",
+      "srtp/srtp/ekt.c",
+      "srtp/srtp/srtp.c",
+    ]
+
+    if (is_clang) {
+      cflags = [ "-Wno-implicit-function-declaration" ]
+    }
+
+    if (use_srtp_boringssl) {
+      deps = [ "//flutter/third_party/boringssl:boringssl" ]
+      public_deps = [ "//flutter/third_party/boringssl:boringssl" ]
+      sources -= [
+        "srtp/crypto/cipher/aes_cbc.c",
+        "srtp/crypto/cipher/aes_icm.c",
+        "srtp/crypto/hash/hmac.c",
+        "srtp/crypto/hash/sha1.c",
+        "srtp/crypto/rng/ctr_prng.c",
+        "srtp/crypto/rng/prng.c",
+      ]
+      sources += [
+        "srtp/crypto/cipher/aes_gcm_ossl.c",
+        "srtp/crypto/cipher/aes_icm_ossl.c",
+        "srtp/crypto/hash/hmac_ossl.c",
+        "srtp/crypto/include/aes_gcm_ossl.h",
+        "srtp/crypto/include/aes_icm_ossl.h",
+      ]
+    }
+  }
+
+  # TODO(GYP): A bunch of these tests don't compile (in gyp either). They're
+  # not very broken, so could probably be made to work if it's useful.
+  if (!is_win) {
+    executable("rdbx_driver") {
+      configs -= [ "//build/config/compiler:chromium_code" ]
+      configs += [ "//build/config/compiler:no_chromium_code" ]
+      deps = [ ":libsrtp" ]
+      sources = [
+        "srtp/include/getopt_s.h",
+        "srtp/test/getopt_s.c",
+        "srtp/test/rdbx_driver.c",
+      ]
+    }
+
+    executable("srtp_driver") {
+      configs -= [ "//build/config/compiler:chromium_code" ]
+      configs += [ "//build/config/compiler:no_chromium_code" ]
+      deps = [ ":libsrtp" ]
+      sources = [
+        "srtp/include/getopt_s.h",
+        "srtp/include/srtp_priv.h",
+        "srtp/test/getopt_s.c",
+        "srtp/test/srtp_driver.c",
+      ]
+    }
+
+    executable("roc_driver") {
+      configs -= [ "//build/config/compiler:chromium_code" ]
+      configs += [ "//build/config/compiler:no_chromium_code" ]
+      deps = [ ":libsrtp" ]
+      sources = [
+        "srtp/crypto/include/rdbx.h",
+        "srtp/include/ut_sim.h",
+        "srtp/test/roc_driver.c",
+      ]
+    }
+
+    executable("replay_driver") {
+      configs -= [ "//build/config/compiler:chromium_code" ]
+      configs += [ "//build/config/compiler:no_chromium_code" ]
+      deps = [ ":libsrtp" ]
+      sources = [
+        "srtp/crypto/include/rdbx.h",
+        "srtp/include/ut_sim.h",
+        "srtp/test/replay_driver.c",
+      ]
+    }
+
+    executable("rtpw") {
+      configs -= [ "//build/config/compiler:chromium_code" ]
+      configs += [ "//build/config/compiler:no_chromium_code" ]
+      deps = [ ":libsrtp" ]
+      sources = [
+        "srtp/crypto/include/datatypes.h",
+        "srtp/include/getopt_s.h",
+        "srtp/include/rtp.h",
+        "srtp/include/srtp.h",
+        "srtp/test/getopt_s.c",
+        "srtp/test/rtp.c",
+        "srtp/test/rtpw.c",
+      ]
+      if (is_android) {
+        defines = [ "HAVE_SYS_SOCKET_H" ]
+      }
+      if (is_clang) {
+        cflags = [ "-Wno-implicit-function-declaration" ]
+      }
+    }
+
+    executable("srtp_test_cipher_driver") {
+      configs -= [ "//build/config/compiler:chromium_code" ]
+      configs += [ "//build/config/compiler:no_chromium_code" ]
+      deps = [ ":libsrtp" ]
+      sources = [
+        "srtp/crypto/test/cipher_driver.c",
+        "srtp/include/getopt_s.h",
+        "srtp/test/getopt_s.c",
+      ]
+    }
+
+    executable("srtp_test_datatypes_driver") {
+      configs -= [ "//build/config/compiler:chromium_code" ]
+      configs += [ "//build/config/compiler:no_chromium_code" ]
+      deps = [ ":libsrtp" ]
+      sources = [ "srtp/crypto/test/datatypes_driver.c" ]
+    }
+
+    executable("srtp_test_stat_driver") {
+      configs -= [ "//build/config/compiler:chromium_code" ]
+      configs += [ "//build/config/compiler:no_chromium_code" ]
+      deps = [ ":libsrtp" ]
+      sources = [ "srtp/crypto/test/stat_driver.c" ]
+    }
+
+    executable("srtp_test_sha1_driver") {
+      configs -= [ "//build/config/compiler:chromium_code" ]
+      configs += [ "//build/config/compiler:no_chromium_code" ]
+      deps = [ ":libsrtp" ]
+      sources = [ "srtp/crypto/test/sha1_driver.c" ]
+    }
+
+    executable("srtp_test_kernel_driver") {
+      configs -= [ "//build/config/compiler:chromium_code" ]
+      configs += [ "//build/config/compiler:no_chromium_code" ]
+      deps = [ ":libsrtp" ]
+      sources = [
+        "srtp/crypto/test/kernel_driver.c",
+        "srtp/include/getopt_s.h",
+        "srtp/test/getopt_s.c",
+      ]
+    }
+
+    executable("srtp_test_aes_calc") {
+      configs -= [ "//build/config/compiler:chromium_code" ]
+      configs += [ "//build/config/compiler:no_chromium_code" ]
+      deps = [ ":libsrtp" ]
+      sources = [ "srtp/crypto/test/aes_calc.c" ]
+    }
+
+    executable("srtp_test_rand_gen") {
+      configs -= [ "//build/config/compiler:chromium_code" ]
+      configs += [ "//build/config/compiler:no_chromium_code" ]
+      deps = [ ":libsrtp" ]
+      sources = [
+        "srtp/crypto/test/rand_gen.c",
+        "srtp/include/getopt_s.h",
+        "srtp/test/getopt_s.c",
+      ]
+    }
+
+    executable("srtp_test_rand_gen_soak") {
+      configs -= [ "//build/config/compiler:chromium_code" ]
+      configs += [ "//build/config/compiler:no_chromium_code" ]
+      deps = [ ":libsrtp" ]
+      sources = [
+        "srtp/crypto/test/rand_gen_soak.c",
+        "srtp/include/getopt_s.h",
+        "srtp/test/getopt_s.c",
+      ]
+    }
+
+    executable("srtp_test_env") {
+      configs -= [ "//build/config/compiler:chromium_code" ]
+      configs += [ "//build/config/compiler:no_chromium_code" ]
+      deps = [ ":libsrtp" ]
+      sources = [ "srtp/crypto/test/env.c" ]
+    }
+
+    group("srtp_runtest") {
+      deps = [
+        ":rdbx_driver",
+        ":replay_driver",
+        ":roc_driver",
+        ":rtpw",
+        ":srtp_driver",
+        ":srtp_test_aes_calc",
+        ":srtp_test_cipher_driver",
+        ":srtp_test_datatypes_driver",
+        ":srtp_test_env",
+        ":srtp_test_kernel_driver",
+        ":srtp_test_rand_gen",
+        ":srtp_test_rand_gen_soak",
+        ":srtp_test_sha1_driver",
+        ":srtp_test_stat_driver",
+      ]
+    }
+  }
+}
diff --git a/build/secondary/third_party/libtess2/BUILD.gn b/build/secondary/third_party/libtess2/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..f3f29614ddcc5db713d0b8ea8634de76a75bdd1e
--- /dev/null
+++ b/build/secondary/third_party/libtess2/BUILD.gn
@@ -0,0 +1,31 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_root = "//flutter/third_party/libtess2"
+
+source_set("libtess2") {
+  public = [ "$source_root/Include/tesselator.h" ]
+
+  include_dirs = [ "$source_root/Include/" ]
+
+  configs -= [ "//build/config/compiler:chromium_code" ]
+  configs += [ "//build/config/compiler:no_chromium_code" ]
+
+  sources = [
+    "$source_root/Source/bucketalloc.c",
+    "$source_root/Source/bucketalloc.h",
+    "$source_root/Source/dict.c",
+    "$source_root/Source/dict.h",
+    "$source_root/Source/geom.c",
+    "$source_root/Source/geom.h",
+    "$source_root/Source/mesh.c",
+    "$source_root/Source/mesh.h",
+    "$source_root/Source/priorityq.c",
+    "$source_root/Source/priorityq.h",
+    "$source_root/Source/sweep.c",
+    "$source_root/Source/sweep.h",
+    "$source_root/Source/tess.c",
+    "$source_root/Source/tess.h",
+  ]
+}
diff --git a/build/secondary/third_party/nss/BUILD.gn b/build/secondary/third_party/nss/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..95e6347c75305f2ab67d7473a51830ea8b4f6518
--- /dev/null
+++ b/build/secondary/third_party/nss/BUILD.gn
@@ -0,0 +1,1205 @@
+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/linux/pkg_config.gni")
+
+if (is_linux) {
+  # This is a dependency on NSS with no libssl. On Linux we use a built-in SSL
+  # library but the system NSS libraries. Non-Linux platforms using NSS use the
+  # hermetic one in //third_party/nss.
+  #
+  # Generally you should depend on //crypto:platform instead of using this
+  # config since that will properly pick up NSS or OpenSSL depending on
+  # platform and build config.
+  pkg_config("system_nss_no_ssl_config") {
+    packages = [ "nss" ]
+    extra_args = [
+      "-v",
+      "-lssl3",
+    ]
+  }
+} else {
+  include_nss_root_certs = is_ios
+  include_nss_libpkix = is_ios
+
+  config("nspr_config") {
+    defines = [ "NO_NSPR_10_SUPPORT" ]
+    include_dirs = [
+      "nspr/pr/include",
+      "nspr/lib/ds",
+      "nspr/lib/libc/include",
+    ]
+
+    if (component_mode != "shared_library") {
+      defines += [ "NSPR_STATIC" ]
+    }
+  }
+
+  component("nspr") {
+    output_name = "crnspr"
+    sources = [
+      "nspr/lib/ds/plarena.c",
+      "nspr/lib/ds/plarena.h",
+      "nspr/lib/ds/plarenas.h",
+      "nspr/lib/ds/plhash.c",
+      "nspr/lib/ds/plhash.h",
+      "nspr/lib/libc/include/plbase64.h",
+      "nspr/lib/libc/include/plerror.h",
+      "nspr/lib/libc/include/plgetopt.h",
+      "nspr/lib/libc/include/plstr.h",
+      "nspr/lib/libc/src/base64.c",
+      "nspr/lib/libc/src/plerror.c",
+      "nspr/lib/libc/src/plgetopt.c",
+      "nspr/lib/libc/src/strcase.c",
+      "nspr/lib/libc/src/strcat.c",
+      "nspr/lib/libc/src/strchr.c",
+      "nspr/lib/libc/src/strcmp.c",
+      "nspr/lib/libc/src/strcpy.c",
+      "nspr/lib/libc/src/strdup.c",
+      "nspr/lib/libc/src/strlen.c",
+      "nspr/lib/libc/src/strpbrk.c",
+      "nspr/lib/libc/src/strstr.c",
+      "nspr/lib/libc/src/strtok.c",
+      "nspr/pr/include/md/_darwin.cfg",
+      "nspr/pr/include/md/_darwin.h",
+      "nspr/pr/include/md/_pcos.h",
+      "nspr/pr/include/md/_pth.h",
+      "nspr/pr/include/md/_unix_errors.h",
+      "nspr/pr/include/md/_unixos.h",
+      "nspr/pr/include/md/_win32_errors.h",
+      "nspr/pr/include/md/_win95.cfg",
+      "nspr/pr/include/md/_win95.h",
+      "nspr/pr/include/md/prosdep.h",
+      "nspr/pr/include/nspr.h",
+      "nspr/pr/include/obsolete/pralarm.h",
+      "nspr/pr/include/obsolete/probslet.h",
+      "nspr/pr/include/obsolete/protypes.h",
+      "nspr/pr/include/obsolete/prsem.h",
+      "nspr/pr/include/pratom.h",
+      "nspr/pr/include/prbit.h",
+      "nspr/pr/include/prclist.h",
+      "nspr/pr/include/prcmon.h",
+      "nspr/pr/include/prcountr.h",
+      "nspr/pr/include/prcpucfg.h",
+      "nspr/pr/include/prcvar.h",
+      "nspr/pr/include/prdtoa.h",
+      "nspr/pr/include/prenv.h",
+      "nspr/pr/include/prerr.h",
+      "nspr/pr/include/prerror.h",
+      "nspr/pr/include/prinet.h",
+      "nspr/pr/include/prinit.h",
+      "nspr/pr/include/prinrval.h",
+      "nspr/pr/include/prio.h",
+      "nspr/pr/include/pripcsem.h",
+      "nspr/pr/include/private/pprio.h",
+      "nspr/pr/include/private/pprmwait.h",
+      "nspr/pr/include/private/pprthred.h",
+      "nspr/pr/include/private/primpl.h",
+      "nspr/pr/include/private/prpriv.h",
+      "nspr/pr/include/prlink.h",
+      "nspr/pr/include/prlock.h",
+      "nspr/pr/include/prlog.h",
+      "nspr/pr/include/prlong.h",
+      "nspr/pr/include/prmem.h",
+      "nspr/pr/include/prmon.h",
+      "nspr/pr/include/prmwait.h",
+      "nspr/pr/include/prnetdb.h",
+      "nspr/pr/include/prolock.h",
+      "nspr/pr/include/prpdce.h",
+      "nspr/pr/include/prprf.h",
+      "nspr/pr/include/prproces.h",
+      "nspr/pr/include/prrng.h",
+      "nspr/pr/include/prrwlock.h",
+      "nspr/pr/include/prshm.h",
+      "nspr/pr/include/prshma.h",
+      "nspr/pr/include/prsystem.h",
+      "nspr/pr/include/prthread.h",
+      "nspr/pr/include/prtime.h",
+      "nspr/pr/include/prtpool.h",
+      "nspr/pr/include/prtrace.h",
+      "nspr/pr/include/prtypes.h",
+      "nspr/pr/include/prvrsion.h",
+      "nspr/pr/include/prwin16.h",
+      "nspr/pr/src/io/prdir.c",
+      "nspr/pr/src/io/prfdcach.c",
+      "nspr/pr/src/io/prfile.c",
+      "nspr/pr/src/io/prio.c",
+      "nspr/pr/src/io/priometh.c",
+      "nspr/pr/src/io/pripv6.c",
+      "nspr/pr/src/io/prlayer.c",
+      "nspr/pr/src/io/prlog.c",
+      "nspr/pr/src/io/prmapopt.c",
+      "nspr/pr/src/io/prmmap.c",
+      "nspr/pr/src/io/prmwait.c",
+      "nspr/pr/src/io/prpolevt.c",
+      "nspr/pr/src/io/prprf.c",
+      "nspr/pr/src/io/prscanf.c",
+      "nspr/pr/src/io/prsocket.c",
+      "nspr/pr/src/io/prstdio.c",
+      "nspr/pr/src/linking/prlink.c",
+      "nspr/pr/src/malloc/prmalloc.c",
+      "nspr/pr/src/malloc/prmem.c",
+      "nspr/pr/src/md/prosdep.c",
+      "nspr/pr/src/md/unix/darwin.c",
+      "nspr/pr/src/md/unix/os_Darwin.s",
+      "nspr/pr/src/md/unix/unix.c",
+      "nspr/pr/src/md/unix/unix_errors.c",
+      "nspr/pr/src/md/unix/uxproces.c",
+      "nspr/pr/src/md/unix/uxrng.c",
+      "nspr/pr/src/md/unix/uxshm.c",
+      "nspr/pr/src/md/unix/uxwrap.c",
+      "nspr/pr/src/md/windows/ntgc.c",
+      "nspr/pr/src/md/windows/ntinrval.c",
+      "nspr/pr/src/md/windows/ntmisc.c",
+      "nspr/pr/src/md/windows/ntsec.c",
+      "nspr/pr/src/md/windows/ntsem.c",
+      "nspr/pr/src/md/windows/w32ipcsem.c",
+      "nspr/pr/src/md/windows/w32poll.c",
+      "nspr/pr/src/md/windows/w32rng.c",
+      "nspr/pr/src/md/windows/w32shm.c",
+      "nspr/pr/src/md/windows/w95cv.c",
+      "nspr/pr/src/md/windows/w95dllmain.c",
+      "nspr/pr/src/md/windows/w95io.c",
+      "nspr/pr/src/md/windows/w95sock.c",
+      "nspr/pr/src/md/windows/w95thred.c",
+      "nspr/pr/src/md/windows/win32_errors.c",
+      "nspr/pr/src/memory/prseg.c",
+      "nspr/pr/src/memory/prshm.c",
+      "nspr/pr/src/memory/prshma.c",
+      "nspr/pr/src/misc/pralarm.c",
+      "nspr/pr/src/misc/pratom.c",
+      "nspr/pr/src/misc/praton.c",
+      "nspr/pr/src/misc/prcountr.c",
+      "nspr/pr/src/misc/prdtoa.c",
+      "nspr/pr/src/misc/prenv.c",
+      "nspr/pr/src/misc/prerr.c",
+      "nspr/pr/src/misc/prerror.c",
+      "nspr/pr/src/misc/prerrortable.c",
+      "nspr/pr/src/misc/prinit.c",
+      "nspr/pr/src/misc/prinrval.c",
+      "nspr/pr/src/misc/pripc.c",
+      "nspr/pr/src/misc/pripcsem.c",
+      "nspr/pr/src/misc/prlog2.c",
+      "nspr/pr/src/misc/prlong.c",
+      "nspr/pr/src/misc/prnetdb.c",
+      "nspr/pr/src/misc/prolock.c",
+      "nspr/pr/src/misc/prrng.c",
+      "nspr/pr/src/misc/prsystem.c",
+      "nspr/pr/src/misc/prthinfo.c",
+      "nspr/pr/src/misc/prtime.c",
+      "nspr/pr/src/misc/prtpool.c",
+      "nspr/pr/src/misc/prtrace.c",
+      "nspr/pr/src/pthreads/ptio.c",
+      "nspr/pr/src/pthreads/ptmisc.c",
+      "nspr/pr/src/pthreads/ptsynch.c",
+      "nspr/pr/src/pthreads/ptthread.c",
+      "nspr/pr/src/threads/combined/prucpu.c",
+      "nspr/pr/src/threads/combined/prucv.c",
+      "nspr/pr/src/threads/combined/prulock.c",
+      "nspr/pr/src/threads/combined/prustack.c",
+      "nspr/pr/src/threads/combined/pruthr.c",
+      "nspr/pr/src/threads/prcmon.c",
+      "nspr/pr/src/threads/prcthr.c",
+      "nspr/pr/src/threads/prdump.c",
+      "nspr/pr/src/threads/prmon.c",
+      "nspr/pr/src/threads/prrwlock.c",
+      "nspr/pr/src/threads/prsem.c",
+      "nspr/pr/src/threads/prtpd.c",
+    ]
+
+    public_configs = [ ":nspr_config" ]
+
+    configs -= [ "//build/config/compiler:chromium_code" ]
+    if (is_win) {
+      configs -= [
+        "//build/config/win:unicode",  # Requires 8-bit mode.
+        "//build/config/win:lean_and_mean",  # Won"t compile with lean and mean.
+      ]
+    }
+    configs += [
+      "//build/config/compiler:no_chromium_code",
+      "//build/config/compiler:no_size_t_to_int_warning",
+    ]
+
+    cflags = []
+    defines = [
+      "_NSPR_BUILD_",
+      "FORCE_PR_LOG",
+    ]
+
+    include_dirs = [ "nspr/pr/include/private" ]
+
+    if (is_win) {
+      cflags = [ "/wd4554" ]  # Check precidence.
+      defines += [
+        "XP_PC",
+        "WIN32",
+        "WIN95",
+        "_PR_GLOBAL_THREADS_ONLY",
+        "_CRT_SECURE_NO_WARNINGS",
+      ]
+    } else {
+      sources -= [
+        "nspr/pr/src/md/windows/ntgc.c",
+        "nspr/pr/src/md/windows/ntinrval.c",
+        "nspr/pr/src/md/windows/ntmisc.c",
+        "nspr/pr/src/md/windows/ntsec.c",
+        "nspr/pr/src/md/windows/ntsem.c",
+        "nspr/pr/src/md/windows/w32ipcsem.c",
+        "nspr/pr/src/md/windows/w32poll.c",
+        "nspr/pr/src/md/windows/w32rng.c",
+        "nspr/pr/src/md/windows/w32shm.c",
+        "nspr/pr/src/md/windows/w95cv.c",
+        "nspr/pr/src/md/windows/w95dllmain.c",
+        "nspr/pr/src/md/windows/w95io.c",
+        "nspr/pr/src/md/windows/w95sock.c",
+        "nspr/pr/src/md/windows/w95thred.c",
+        "nspr/pr/src/md/windows/win32_errors.c",
+        "nspr/pr/src/threads/combined/prucpu.c",
+        "nspr/pr/src/threads/combined/prucv.c",
+        "nspr/pr/src/threads/combined/prulock.c",
+        "nspr/pr/src/threads/combined/prustack.c",
+        "nspr/pr/src/threads/combined/pruthr.c",
+      ]
+    }
+
+    if (!is_posix) {
+      sources -= [
+        "nspr/pr/src/md/unix/darwin.c",
+        "nspr/pr/src/md/unix/os_Darwin.s",
+        "nspr/pr/src/md/unix/unix.c",
+        "nspr/pr/src/md/unix/unix_errors.c",
+        "nspr/pr/src/md/unix/uxproces.c",
+        "nspr/pr/src/md/unix/uxrng.c",
+        "nspr/pr/src/md/unix/uxshm.c",
+        "nspr/pr/src/md/unix/uxwrap.c",
+        "nspr/pr/src/pthreads/ptio.c",
+        "nspr/pr/src/pthreads/ptmisc.c",
+        "nspr/pr/src/pthreads/ptsynch.c",
+        "nspr/pr/src/pthreads/ptthread.c",
+      ]
+    }
+
+    if (current_cpu == "x86") {
+      defines += [ "_X86_" ]
+    } else if (current_cpu == "x64") {
+      defines += [ "_AMD64_" ]
+    }
+
+    if (is_mac || is_ios) {
+      sources -= [
+        "nspr/pr/src/io/prdir.c",
+        "nspr/pr/src/io/prfile.c",
+        "nspr/pr/src/io/prio.c",
+        "nspr/pr/src/io/prsocket.c",
+        "nspr/pr/src/misc/pripcsem.c",
+        "nspr/pr/src/threads/prcthr.c",
+        "nspr/pr/src/threads/prdump.c",
+        "nspr/pr/src/threads/prmon.c",
+        "nspr/pr/src/threads/prsem.c",
+      ]
+      defines += [
+        "XP_UNIX",
+        "DARWIN",
+        "XP_MACOSX",
+        "_PR_PTHREADS",
+        "HAVE_BSD_FLOCK",
+        "HAVE_DLADDR",
+        "HAVE_LCHOWN",
+        "HAVE_SOCKLEN_T",
+        "HAVE_STRERROR",
+      ]
+    }
+
+    if (is_mac) {
+      defines += [ "HAVE_CRT_EXTERNS_H" ]
+      libs = [
+        "CoreFoundation.framework",
+        "CoreServices.framework",
+      ]
+    }
+
+    if (is_clang) {
+      cflags += [
+        # nspr uses a bunch of deprecated functions (NSLinkModule etc) in
+        # prlink.c on mac.
+        "-Wno-deprecated-declarations",
+
+        # nspr passes "const char*" through "void*".
+        "-Wno-incompatible-pointer-types",
+
+        # nspr passes "int*" through "unsigned int*".
+        "-Wno-pointer-sign",
+      ]
+
+      # nspr uses assert(!"foo") instead of assert(false && "foo").
+      configs -= [ "//build/config/clang:extra_warnings" ]
+    }
+  }
+
+  component("nss") {
+    output_name = "crnss"
+    sources = [
+      # Ensure at least one object file is produced, so that MSVC does not
+      # warn when creating the static/shared library. See the note for
+      # the "nssckbi" target for why the "nss" target was split as such.
+      "nss/lib/nss/nssver.c",
+    ]
+
+    public_deps = [ ":nss_static" ]
+
+    if (include_nss_root_certs) {
+      public_deps += [ ":nssckbi" ]
+    }
+
+    if (component_mode == "shared_library") {
+      if (is_mac) {
+        ldflags = [ "-all_load" ]
+      } else if (is_win) {
+        # Pass the def file to the linker.
+        ldflags =
+            [ "/DEF:" + rebase_path("nss/exports_win.def", root_build_dir) ]
+      }
+    }
+  }
+
+  config("nssckbi_config") {
+    include_dirs = [ "nss/lib/ckfw/builtins" ]
+  }
+
+  # This is really more of a pseudo-target to work around the fact that
+  # a single static_library target cannot contain two object files of the
+  # same name (hash.o / hash.obj). Logically, this is part of the
+  # "nss_static" target. By separating it out, it creates a possible
+  # circular dependency between "nss_static" and "nssckbi" when
+  # "exclude_nss_root_certs" is not specified, as "nss_static" depends on
+  # the "builtinsC_GetFunctionList" exported by this target. This is an
+  # artifact of how NSS is being statically built, which is not an
+  # officially supported configuration - normally, "nssckbi.dll/so" would
+  # depend on libnss3.dll/so, and the higher layer caller would instruct
+  # libnss3.dll to dynamically load nssckbi.dll, breaking the circle.
+  #
+  # TODO(rsleevi): http://crbug.com/128134 - Break the circular dependency
+  # without requiring nssckbi to be built as a shared library.
+  source_set("nssckbi") {
+    visibility = [ ":nss" ]  # This target is internal implementation detail.
+
+    sources = [
+      "nss/lib/ckfw/builtins/anchor.c",
+      "nss/lib/ckfw/builtins/bfind.c",
+      "nss/lib/ckfw/builtins/binst.c",
+      "nss/lib/ckfw/builtins/bobject.c",
+      "nss/lib/ckfw/builtins/bsession.c",
+      "nss/lib/ckfw/builtins/bslot.c",
+      "nss/lib/ckfw/builtins/btoken.c",
+      "nss/lib/ckfw/builtins/builtins.h",
+      "nss/lib/ckfw/builtins/certdata.c",
+      "nss/lib/ckfw/builtins/ckbiver.c",
+      "nss/lib/ckfw/builtins/constants.c",
+      "nss/lib/ckfw/builtins/nssckbi.h",
+      "nss/lib/ckfw/ck.h",
+      "nss/lib/ckfw/ckfw.h",
+      "nss/lib/ckfw/ckfwm.h",
+      "nss/lib/ckfw/ckfwtm.h",
+      "nss/lib/ckfw/ckmd.h",
+      "nss/lib/ckfw/ckt.h",
+      "nss/lib/ckfw/crypto.c",
+      "nss/lib/ckfw/find.c",
+      "nss/lib/ckfw/hash.c",
+      "nss/lib/ckfw/instance.c",
+      "nss/lib/ckfw/mechanism.c",
+      "nss/lib/ckfw/mutex.c",
+      "nss/lib/ckfw/nssck.api",
+      "nss/lib/ckfw/nssckepv.h",
+      "nss/lib/ckfw/nssckft.h",
+      "nss/lib/ckfw/nssckfw.h",
+      "nss/lib/ckfw/nssckfwc.h",
+      "nss/lib/ckfw/nssckfwt.h",
+      "nss/lib/ckfw/nssckg.h",
+      "nss/lib/ckfw/nssckmdt.h",
+      "nss/lib/ckfw/nssckt.h",
+      "nss/lib/ckfw/object.c",
+      "nss/lib/ckfw/session.c",
+      "nss/lib/ckfw/sessobj.c",
+      "nss/lib/ckfw/slot.c",
+      "nss/lib/ckfw/token.c",
+      "nss/lib/ckfw/wrap.c",
+    ]
+
+    configs -= [ "//build/config/compiler:chromium_code" ]
+
+    if (is_win) {
+      configs -= [ "//build/config/win:unicode" ]  # Requires 8-bit mode.
+    }
+    configs += [ "//build/config/compiler:no_chromium_code" ]
+
+    include_dirs = [ "nss/lib/ckfw" ]
+    public_configs = [ ":nssckbi_config" ]
+
+    public_deps = [ ":nss_static" ]
+  }
+
+  config("nss_static_config") {
+    defines = [
+      "NSS_STATIC",
+      "NSS_USE_STATIC_LIBS",
+      "USE_UTIL_DIRECTLY",
+    ]
+    if (is_win) {
+      defines += [ "_WINDOWS" ]
+    }
+    include_dirs = [
+      "nspr/pr/include",
+      "nspr/lib/ds",
+      "nspr/lib/libc/include",
+      "nss/lib/base",
+      "nss/lib/certdb",
+      "nss/lib/certhigh",
+      "nss/lib/cryptohi",
+      "nss/lib/dev",
+      "nss/lib/freebl",
+      "nss/lib/freebl/ecl",
+      "nss/lib/nss",
+      "nss/lib/pk11wrap",
+      "nss/lib/pkcs7",
+      "nss/lib/pki",
+      "nss/lib/smime",
+      "nss/lib/softoken",
+      "nss/lib/util",
+    ]
+  }
+
+  if (is_win && current_cpu == "x86") {
+    source_set("nss_static_avx") {
+      sources = [
+        "nss/lib/freebl/intel-gcm-wrap.c",
+        "nss/lib/freebl/intel-gcm-x86-masm.asm",
+        "nss/lib/freebl/intel-gcm.h",
+      ]
+      defines = [
+        "_WINDOWS",
+        "_X86_",
+        "INTEL_GCM",
+        "MP_API_COMPATIBLE",
+        "MP_ASSEMBLY_DIV_2DX1D",
+        "MP_ASSEMBLY_MULTIPLY",
+        "MP_ASSEMBLY_SQUARE",
+        "MP_NO_MP_WORD",
+        "MP_USE_UINT_DIGIT",
+        "NSS_DISABLE_DBM",
+        "NSS_STATIC",
+        "NSS_USE_STATIC_LIBS",
+        "NSS_X86",
+        "NSS_X86_OR_X64",
+        "RIJNDAEL_INCLUDE_TABLES",
+        "SHLIB_PREFIX=\"\"",
+        "SHLIB_SUFFIX=\"dll\"",
+        "SHLIB_VERSION=\"3\"",
+        "SOFTOKEN_LIB_NAME=\"softokn3.dll\"",
+        "SOFTOKEN_SHLIB_VERSION=\"3\"",
+        "USE_HW_AES",
+        "USE_UTIL_DIRECTLY",
+        "WIN32",
+        "WIN95",
+        "XP_PC",
+      ]
+      include_dirs = [
+        "nspr/pr/include",
+        "nspr/lib/ds",
+        "nspr/lib/libc/include",
+        "nss/lib/freebl/ecl",
+        "nss/lib/util",
+      ]
+    }
+  }
+
+  source_set("nss_static") {
+    visibility = [ ":*" ]  # Internal implementation detail.
+
+    sources = [
+      "nss/lib/base/arena.c",
+      "nss/lib/base/base.h",
+      "nss/lib/base/baset.h",
+      "nss/lib/base/error.c",
+      "nss/lib/base/errorval.c",
+      "nss/lib/base/hash.c",
+      "nss/lib/base/hashops.c",
+      "nss/lib/base/item.c",
+      "nss/lib/base/libc.c",
+      "nss/lib/base/list.c",
+      "nss/lib/base/nssbase.h",
+      "nss/lib/base/nssbaset.h",
+      "nss/lib/base/nssutf8.c",
+      "nss/lib/base/tracker.c",
+      "nss/lib/certdb/alg1485.c",
+      "nss/lib/certdb/cert.h",
+      "nss/lib/certdb/certdb.c",
+      "nss/lib/certdb/certdb.h",
+      "nss/lib/certdb/certi.h",
+      "nss/lib/certdb/certt.h",
+      "nss/lib/certdb/certv3.c",
+      "nss/lib/certdb/certxutl.c",
+      "nss/lib/certdb/certxutl.h",
+      "nss/lib/certdb/crl.c",
+      "nss/lib/certdb/genname.c",
+      "nss/lib/certdb/genname.h",
+      "nss/lib/certdb/polcyxtn.c",
+      "nss/lib/certdb/secname.c",
+      "nss/lib/certdb/stanpcertdb.c",
+      "nss/lib/certdb/xauthkid.c",
+      "nss/lib/certdb/xbsconst.c",
+      "nss/lib/certdb/xconst.c",
+      "nss/lib/certdb/xconst.h",
+      "nss/lib/certhigh/certhigh.c",
+      "nss/lib/certhigh/certhtml.c",
+      "nss/lib/certhigh/certreq.c",
+      "nss/lib/certhigh/certvfy.c",
+      "nss/lib/certhigh/crlv2.c",
+      "nss/lib/certhigh/ocsp.c",
+      "nss/lib/certhigh/ocsp.h",
+      "nss/lib/certhigh/ocspi.h",
+      "nss/lib/certhigh/ocspsig.c",
+      "nss/lib/certhigh/ocspt.h",
+      "nss/lib/certhigh/ocspti.h",
+      "nss/lib/certhigh/xcrldist.c",
+      "nss/lib/cryptohi/cryptohi.h",
+      "nss/lib/cryptohi/cryptoht.h",
+      "nss/lib/cryptohi/dsautil.c",
+      "nss/lib/cryptohi/key.h",
+      "nss/lib/cryptohi/keyhi.h",
+      "nss/lib/cryptohi/keyi.h",
+      "nss/lib/cryptohi/keyt.h",
+      "nss/lib/cryptohi/keythi.h",
+      "nss/lib/cryptohi/sechash.c",
+      "nss/lib/cryptohi/sechash.h",
+      "nss/lib/cryptohi/seckey.c",
+      "nss/lib/cryptohi/secsign.c",
+      "nss/lib/cryptohi/secvfy.c",
+      "nss/lib/dev/ckhelper.c",
+      "nss/lib/dev/ckhelper.h",
+      "nss/lib/dev/dev.h",
+      "nss/lib/dev/devm.h",
+      "nss/lib/dev/devslot.c",
+      "nss/lib/dev/devt.h",
+      "nss/lib/dev/devtm.h",
+      "nss/lib/dev/devtoken.c",
+      "nss/lib/dev/devutil.c",
+      "nss/lib/dev/nssdev.h",
+      "nss/lib/dev/nssdevt.h",
+      "nss/lib/freebl/aeskeywrap.c",
+      "nss/lib/freebl/alg2268.c",
+      "nss/lib/freebl/alghmac.c",
+      "nss/lib/freebl/alghmac.h",
+      "nss/lib/freebl/arcfive.c",
+      "nss/lib/freebl/arcfour.c",
+      "nss/lib/freebl/blapi.h",
+      "nss/lib/freebl/blapii.h",
+      "nss/lib/freebl/blapit.h",
+      "nss/lib/freebl/camellia.c",
+      "nss/lib/freebl/camellia.h",
+      "nss/lib/freebl/chacha20/chacha20.c",
+      "nss/lib/freebl/chacha20/chacha20.h",
+      "nss/lib/freebl/chacha20/chacha20_vec.c",
+      "nss/lib/freebl/chacha20poly1305.c",
+      "nss/lib/freebl/chacha20poly1305.h",
+      "nss/lib/freebl/ctr.c",
+      "nss/lib/freebl/ctr.h",
+      "nss/lib/freebl/cts.c",
+      "nss/lib/freebl/cts.h",
+      "nss/lib/freebl/des.c",
+      "nss/lib/freebl/des.h",
+      "nss/lib/freebl/desblapi.c",
+      "nss/lib/freebl/dh.c",
+      "nss/lib/freebl/drbg.c",
+      "nss/lib/freebl/dsa.c",
+      "nss/lib/freebl/ec.c",
+      "nss/lib/freebl/ec.h",
+      "nss/lib/freebl/ecdecode.c",
+      "nss/lib/freebl/ecl/ec2.h",
+      "nss/lib/freebl/ecl/ec_naf.c",
+      "nss/lib/freebl/ecl/ecl-curve.h",
+      "nss/lib/freebl/ecl/ecl-exp.h",
+      "nss/lib/freebl/ecl/ecl-priv.h",
+      "nss/lib/freebl/ecl/ecl.c",
+      "nss/lib/freebl/ecl/ecl.h",
+      "nss/lib/freebl/ecl/ecl_curve.c",
+      "nss/lib/freebl/ecl/ecl_gf.c",
+      "nss/lib/freebl/ecl/ecl_mult.c",
+      "nss/lib/freebl/ecl/ecp.h",
+      "nss/lib/freebl/ecl/ecp_256.c",
+      "nss/lib/freebl/ecl/ecp_256_32.c",
+      "nss/lib/freebl/ecl/ecp_384.c",
+      "nss/lib/freebl/ecl/ecp_521.c",
+      "nss/lib/freebl/ecl/ecp_aff.c",
+      "nss/lib/freebl/ecl/ecp_jac.c",
+      "nss/lib/freebl/ecl/ecp_jm.c",
+      "nss/lib/freebl/ecl/ecp_mont.c",
+      "nss/lib/freebl/gcm.c",
+      "nss/lib/freebl/gcm.h",
+      "nss/lib/freebl/hmacct.c",
+      "nss/lib/freebl/hmacct.h",
+      "nss/lib/freebl/intel-aes-x86-masm.asm",
+      "nss/lib/freebl/intel-aes.h",
+      "nss/lib/freebl/jpake.c",
+      "nss/lib/freebl/md2.c",
+      "nss/lib/freebl/md5.c",
+      "nss/lib/freebl/mpi/logtab.h",
+      "nss/lib/freebl/mpi/mp_gf2m-priv.h",
+      "nss/lib/freebl/mpi/mp_gf2m.c",
+      "nss/lib/freebl/mpi/mp_gf2m.h",
+      "nss/lib/freebl/mpi/mpcpucache.c",
+      "nss/lib/freebl/mpi/mpi-config.h",
+      "nss/lib/freebl/mpi/mpi-priv.h",
+      "nss/lib/freebl/mpi/mpi.c",
+      "nss/lib/freebl/mpi/mpi.h",
+      "nss/lib/freebl/mpi/mpi_amd64.c",
+      "nss/lib/freebl/mpi/mpi_arm.c",
+      "nss/lib/freebl/mpi/mpi_arm_mac.c",
+      "nss/lib/freebl/mpi/mpi_x86_asm.c",
+      "nss/lib/freebl/mpi/mplogic.c",
+      "nss/lib/freebl/mpi/mplogic.h",
+      "nss/lib/freebl/mpi/mpmontg.c",
+      "nss/lib/freebl/mpi/mpprime.c",
+      "nss/lib/freebl/mpi/mpprime.h",
+      "nss/lib/freebl/mpi/primes.c",
+      "nss/lib/freebl/nss_build_config_mac.h",
+      "nss/lib/freebl/poly1305/poly1305-donna-x64-sse2-incremental-source.c",
+      "nss/lib/freebl/poly1305/poly1305.c",
+      "nss/lib/freebl/poly1305/poly1305.h",
+      "nss/lib/freebl/pqg.c",
+      "nss/lib/freebl/pqg.h",
+      "nss/lib/freebl/rawhash.c",
+      "nss/lib/freebl/rijndael.c",
+      "nss/lib/freebl/rijndael.h",
+      "nss/lib/freebl/rijndael32.tab",
+      "nss/lib/freebl/rsa.c",
+      "nss/lib/freebl/rsapkcs.c",
+      "nss/lib/freebl/secmpi.h",
+      "nss/lib/freebl/secrng.h",
+      "nss/lib/freebl/seed.c",
+      "nss/lib/freebl/seed.h",
+      "nss/lib/freebl/sha256.h",
+      "nss/lib/freebl/sha512.c",
+      "nss/lib/freebl/sha_fast.c",
+      "nss/lib/freebl/sha_fast.h",
+      "nss/lib/freebl/shsign.h",
+      "nss/lib/freebl/shvfy.c",
+      "nss/lib/freebl/sysrand.c",
+      "nss/lib/freebl/tlsprfalg.c",
+      "nss/lib/freebl/unix_rand.c",
+      "nss/lib/freebl/win_rand.c",
+      "nss/lib/nss/nss.h",
+      "nss/lib/nss/nssinit.c",
+      "nss/lib/nss/nssrenam.h",
+      "nss/lib/nss/utilwrap.c",
+      "nss/lib/pk11wrap/debug_module.c",
+      "nss/lib/pk11wrap/dev3hack.c",
+      "nss/lib/pk11wrap/dev3hack.h",
+      "nss/lib/pk11wrap/pk11akey.c",
+      "nss/lib/pk11wrap/pk11auth.c",
+      "nss/lib/pk11wrap/pk11cert.c",
+      "nss/lib/pk11wrap/pk11cxt.c",
+      "nss/lib/pk11wrap/pk11err.c",
+      "nss/lib/pk11wrap/pk11func.h",
+      "nss/lib/pk11wrap/pk11kea.c",
+      "nss/lib/pk11wrap/pk11list.c",
+      "nss/lib/pk11wrap/pk11load.c",
+      "nss/lib/pk11wrap/pk11mech.c",
+      "nss/lib/pk11wrap/pk11merge.c",
+      "nss/lib/pk11wrap/pk11nobj.c",
+      "nss/lib/pk11wrap/pk11obj.c",
+      "nss/lib/pk11wrap/pk11pars.c",
+      "nss/lib/pk11wrap/pk11pbe.c",
+      "nss/lib/pk11wrap/pk11pk12.c",
+      "nss/lib/pk11wrap/pk11pqg.c",
+      "nss/lib/pk11wrap/pk11pqg.h",
+      "nss/lib/pk11wrap/pk11priv.h",
+      "nss/lib/pk11wrap/pk11pub.h",
+      "nss/lib/pk11wrap/pk11sdr.c",
+      "nss/lib/pk11wrap/pk11sdr.h",
+      "nss/lib/pk11wrap/pk11skey.c",
+      "nss/lib/pk11wrap/pk11slot.c",
+      "nss/lib/pk11wrap/pk11util.c",
+      "nss/lib/pk11wrap/secmod.h",
+      "nss/lib/pk11wrap/secmodi.h",
+      "nss/lib/pk11wrap/secmodt.h",
+      "nss/lib/pk11wrap/secmodti.h",
+      "nss/lib/pk11wrap/secpkcs5.h",
+      "nss/lib/pkcs7/certread.c",
+      "nss/lib/pkcs7/p7common.c",
+      "nss/lib/pkcs7/p7create.c",
+      "nss/lib/pkcs7/p7decode.c",
+      "nss/lib/pkcs7/p7encode.c",
+      "nss/lib/pkcs7/p7local.c",
+      "nss/lib/pkcs7/p7local.h",
+      "nss/lib/pkcs7/pkcs7t.h",
+      "nss/lib/pkcs7/secmime.c",
+      "nss/lib/pkcs7/secmime.h",
+      "nss/lib/pkcs7/secpkcs7.h",
+      "nss/lib/pki/asymmkey.c",
+      "nss/lib/pki/certdecode.c",
+      "nss/lib/pki/certificate.c",
+      "nss/lib/pki/cryptocontext.c",
+      "nss/lib/pki/nsspki.h",
+      "nss/lib/pki/nsspkit.h",
+      "nss/lib/pki/pki.h",
+      "nss/lib/pki/pki3hack.c",
+      "nss/lib/pki/pki3hack.h",
+      "nss/lib/pki/pkibase.c",
+      "nss/lib/pki/pkim.h",
+      "nss/lib/pki/pkistore.c",
+      "nss/lib/pki/pkistore.h",
+      "nss/lib/pki/pkit.h",
+      "nss/lib/pki/pkitm.h",
+      "nss/lib/pki/symmkey.c",
+      "nss/lib/pki/tdcache.c",
+      "nss/lib/pki/trustdomain.c",
+      "nss/lib/smime/cms.h",
+      "nss/lib/smime/cmslocal.h",
+      "nss/lib/smime/cmsreclist.h",
+      "nss/lib/smime/cmst.h",
+      "nss/lib/smime/smime.h",
+      "nss/lib/softoken/fipsaudt.c",
+      "nss/lib/softoken/fipstest.c",
+      "nss/lib/softoken/fipstokn.c",
+      "nss/lib/softoken/jpakesftk.c",
+      "nss/lib/softoken/lgglue.c",
+      "nss/lib/softoken/lgglue.h",
+      "nss/lib/softoken/lowkey.c",
+      "nss/lib/softoken/lowkeyi.h",
+      "nss/lib/softoken/lowkeyti.h",
+      "nss/lib/softoken/lowpbe.c",
+      "nss/lib/softoken/lowpbe.h",
+      "nss/lib/softoken/padbuf.c",
+      "nss/lib/softoken/pkcs11.c",
+      "nss/lib/softoken/pkcs11c.c",
+      "nss/lib/softoken/pkcs11i.h",
+      "nss/lib/softoken/pkcs11ni.h",
+      "nss/lib/softoken/pkcs11u.c",
+      "nss/lib/softoken/sdb.c",
+      "nss/lib/softoken/sdb.h",
+      "nss/lib/softoken/sftkdb.c",
+      "nss/lib/softoken/sftkdb.h",
+      "nss/lib/softoken/sftkdbt.h",
+      "nss/lib/softoken/sftkdbti.h",
+      "nss/lib/softoken/sftkhmac.c",
+      "nss/lib/softoken/sftkpars.c",
+      "nss/lib/softoken/sftkpars.h",
+      "nss/lib/softoken/sftkpwd.c",
+      "nss/lib/softoken/softkver.c",
+      "nss/lib/softoken/softkver.h",
+      "nss/lib/softoken/softoken.h",
+      "nss/lib/softoken/softoknt.h",
+      "nss/lib/softoken/tlsprf.c",
+      "nss/lib/ssl/sslerr.h",
+      "nss/lib/util/SECerrs.h",
+      "nss/lib/util/base64.h",
+      "nss/lib/util/ciferfam.h",
+      "nss/lib/util/derdec.c",
+      "nss/lib/util/derenc.c",
+      "nss/lib/util/dersubr.c",
+      "nss/lib/util/dertime.c",
+      "nss/lib/util/errstrs.c",
+      "nss/lib/util/hasht.h",
+      "nss/lib/util/nssb64.h",
+      "nss/lib/util/nssb64d.c",
+      "nss/lib/util/nssb64e.c",
+      "nss/lib/util/nssb64t.h",
+      "nss/lib/util/nssilckt.h",
+      "nss/lib/util/nssilock.c",
+      "nss/lib/util/nssilock.h",
+      "nss/lib/util/nsslocks.h",
+      "nss/lib/util/nssrwlk.c",
+      "nss/lib/util/nssrwlk.h",
+      "nss/lib/util/nssrwlkt.h",
+      "nss/lib/util/nssutil.h",
+      "nss/lib/util/oidstring.c",
+      "nss/lib/util/pkcs11.h",
+      "nss/lib/util/pkcs11f.h",
+      "nss/lib/util/pkcs11n.h",
+      "nss/lib/util/pkcs11p.h",
+      "nss/lib/util/pkcs11t.h",
+      "nss/lib/util/pkcs11u.h",
+      "nss/lib/util/pkcs1sig.c",
+      "nss/lib/util/pkcs1sig.h",
+      "nss/lib/util/portreg.c",
+      "nss/lib/util/portreg.h",
+      "nss/lib/util/quickder.c",
+      "nss/lib/util/secalgid.c",
+      "nss/lib/util/secasn1.h",
+      "nss/lib/util/secasn1d.c",
+      "nss/lib/util/secasn1e.c",
+      "nss/lib/util/secasn1t.h",
+      "nss/lib/util/secasn1u.c",
+      "nss/lib/util/seccomon.h",
+      "nss/lib/util/secder.h",
+      "nss/lib/util/secdert.h",
+      "nss/lib/util/secdig.c",
+      "nss/lib/util/secdig.h",
+      "nss/lib/util/secdigt.h",
+      "nss/lib/util/secerr.h",
+      "nss/lib/util/secitem.c",
+      "nss/lib/util/secitem.h",
+      "nss/lib/util/secoid.c",
+      "nss/lib/util/secoid.h",
+      "nss/lib/util/secoidt.h",
+      "nss/lib/util/secport.c",
+      "nss/lib/util/secport.h",
+      "nss/lib/util/sectime.c",
+      "nss/lib/util/templates.c",
+      "nss/lib/util/utf8.c",
+      "nss/lib/util/utilmod.c",
+      "nss/lib/util/utilmodt.h",
+      "nss/lib/util/utilpars.c",
+      "nss/lib/util/utilpars.h",
+      "nss/lib/util/utilparst.h",
+      "nss/lib/util/utilrename.h",
+    ]
+
+    sources -= [
+      # mpi_arm.c is included by mpi_arm_mac.c.
+      # NOTE: mpi_arm.c can be used directly on Linux. mpi_arm.c will need
+      # to be excluded conditionally if we start to build NSS on Linux.
+      "nss/lib/freebl/mpi/mpi_arm.c",
+
+      # primes.c is included by mpprime.c.
+      "nss/lib/freebl/mpi/primes.c",
+
+      # unix_rand.c and win_rand.c are included by sysrand.c.
+      "nss/lib/freebl/unix_rand.c",
+      "nss/lib/freebl/win_rand.c",
+
+      # debug_module.c is included by pk11load.c.
+      "nss/lib/pk11wrap/debug_module.c",
+    ]
+
+    configs -= [ "//build/config/compiler:chromium_code" ]
+    if (is_win) {
+      configs -= [ "//build/config/win:unicode" ]  # Requires 8-bit mode.
+    }
+    configs += [
+      "//build/config/compiler:no_chromium_code",
+      "//build/config/compiler:no_size_t_to_int_warning",
+    ]
+    public_configs = [ ":nss_static_config" ]
+
+    cflags = []
+
+    # Only need the defines and includes not in nss_static_config.
+    defines = [
+      "MP_API_COMPATIBLE",
+      "NSS_DISABLE_DBM",
+      "RIJNDAEL_INCLUDE_TABLES",
+      "SHLIB_VERSION=\"3\"",
+      "SOFTOKEN_SHLIB_VERSION=\"3\"",
+    ]
+    include_dirs = [
+      "nss/lib/freebl/mpi",
+      "nss/lib/ssl",
+    ]
+
+    if (is_win) {
+      cflags += [ "/wd4101" ]  # Unreferenced local variable.
+    }
+
+    if (include_nss_libpkix) {
+      sources += [
+        "nss/lib/certhigh/certvfypkix.c",
+        "nss/lib/certhigh/certvfypkixprint.c",
+        "nss/lib/libpkix/include/pkix.h",
+        "nss/lib/libpkix/include/pkix_certsel.h",
+        "nss/lib/libpkix/include/pkix_certstore.h",
+        "nss/lib/libpkix/include/pkix_checker.h",
+        "nss/lib/libpkix/include/pkix_crlsel.h",
+        "nss/lib/libpkix/include/pkix_errorstrings.h",
+        "nss/lib/libpkix/include/pkix_params.h",
+        "nss/lib/libpkix/include/pkix_pl_pki.h",
+        "nss/lib/libpkix/include/pkix_pl_system.h",
+        "nss/lib/libpkix/include/pkix_results.h",
+        "nss/lib/libpkix/include/pkix_revchecker.h",
+        "nss/lib/libpkix/include/pkix_sample_modules.h",
+        "nss/lib/libpkix/include/pkix_util.h",
+        "nss/lib/libpkix/include/pkixt.h",
+        "nss/lib/libpkix/pkix/certsel/pkix_certselector.c",
+        "nss/lib/libpkix/pkix/certsel/pkix_certselector.h",
+        "nss/lib/libpkix/pkix/certsel/pkix_comcertselparams.c",
+        "nss/lib/libpkix/pkix/certsel/pkix_comcertselparams.h",
+        "nss/lib/libpkix/pkix/checker/pkix_basicconstraintschecker.c",
+        "nss/lib/libpkix/pkix/checker/pkix_basicconstraintschecker.h",
+        "nss/lib/libpkix/pkix/checker/pkix_certchainchecker.c",
+        "nss/lib/libpkix/pkix/checker/pkix_certchainchecker.h",
+        "nss/lib/libpkix/pkix/checker/pkix_crlchecker.c",
+        "nss/lib/libpkix/pkix/checker/pkix_crlchecker.h",
+        "nss/lib/libpkix/pkix/checker/pkix_ekuchecker.c",
+        "nss/lib/libpkix/pkix/checker/pkix_ekuchecker.h",
+        "nss/lib/libpkix/pkix/checker/pkix_expirationchecker.c",
+        "nss/lib/libpkix/pkix/checker/pkix_expirationchecker.h",
+        "nss/lib/libpkix/pkix/checker/pkix_namechainingchecker.c",
+        "nss/lib/libpkix/pkix/checker/pkix_namechainingchecker.h",
+        "nss/lib/libpkix/pkix/checker/pkix_nameconstraintschecker.c",
+        "nss/lib/libpkix/pkix/checker/pkix_nameconstraintschecker.h",
+        "nss/lib/libpkix/pkix/checker/pkix_ocspchecker.c",
+        "nss/lib/libpkix/pkix/checker/pkix_ocspchecker.h",
+        "nss/lib/libpkix/pkix/checker/pkix_policychecker.c",
+        "nss/lib/libpkix/pkix/checker/pkix_policychecker.h",
+        "nss/lib/libpkix/pkix/checker/pkix_revocationchecker.c",
+        "nss/lib/libpkix/pkix/checker/pkix_revocationchecker.h",
+        "nss/lib/libpkix/pkix/checker/pkix_revocationmethod.c",
+        "nss/lib/libpkix/pkix/checker/pkix_revocationmethod.h",
+        "nss/lib/libpkix/pkix/checker/pkix_signaturechecker.c",
+        "nss/lib/libpkix/pkix/checker/pkix_signaturechecker.h",
+        "nss/lib/libpkix/pkix/checker/pkix_targetcertchecker.c",
+        "nss/lib/libpkix/pkix/checker/pkix_targetcertchecker.h",
+        "nss/lib/libpkix/pkix/crlsel/pkix_comcrlselparams.c",
+        "nss/lib/libpkix/pkix/crlsel/pkix_comcrlselparams.h",
+        "nss/lib/libpkix/pkix/crlsel/pkix_crlselector.c",
+        "nss/lib/libpkix/pkix/crlsel/pkix_crlselector.h",
+        "nss/lib/libpkix/pkix/params/pkix_procparams.c",
+        "nss/lib/libpkix/pkix/params/pkix_procparams.h",
+        "nss/lib/libpkix/pkix/params/pkix_resourcelimits.c",
+        "nss/lib/libpkix/pkix/params/pkix_resourcelimits.h",
+        "nss/lib/libpkix/pkix/params/pkix_trustanchor.c",
+        "nss/lib/libpkix/pkix/params/pkix_trustanchor.h",
+        "nss/lib/libpkix/pkix/params/pkix_valparams.c",
+        "nss/lib/libpkix/pkix/params/pkix_valparams.h",
+        "nss/lib/libpkix/pkix/results/pkix_buildresult.c",
+        "nss/lib/libpkix/pkix/results/pkix_buildresult.h",
+        "nss/lib/libpkix/pkix/results/pkix_policynode.c",
+        "nss/lib/libpkix/pkix/results/pkix_policynode.h",
+        "nss/lib/libpkix/pkix/results/pkix_valresult.c",
+        "nss/lib/libpkix/pkix/results/pkix_valresult.h",
+        "nss/lib/libpkix/pkix/results/pkix_verifynode.c",
+        "nss/lib/libpkix/pkix/results/pkix_verifynode.h",
+        "nss/lib/libpkix/pkix/store/pkix_store.c",
+        "nss/lib/libpkix/pkix/store/pkix_store.h",
+        "nss/lib/libpkix/pkix/top/pkix_build.c",
+        "nss/lib/libpkix/pkix/top/pkix_build.h",
+        "nss/lib/libpkix/pkix/top/pkix_lifecycle.c",
+        "nss/lib/libpkix/pkix/top/pkix_lifecycle.h",
+        "nss/lib/libpkix/pkix/top/pkix_validate.c",
+        "nss/lib/libpkix/pkix/top/pkix_validate.h",
+        "nss/lib/libpkix/pkix/util/pkix_error.c",
+        "nss/lib/libpkix/pkix/util/pkix_error.h",
+        "nss/lib/libpkix/pkix/util/pkix_errpaths.c",
+        "nss/lib/libpkix/pkix/util/pkix_list.c",
+        "nss/lib/libpkix/pkix/util/pkix_list.h",
+        "nss/lib/libpkix/pkix/util/pkix_logger.c",
+        "nss/lib/libpkix/pkix/util/pkix_logger.h",
+        "nss/lib/libpkix/pkix/util/pkix_tools.c",
+        "nss/lib/libpkix/pkix/util/pkix_tools.h",
+        "nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_aiamgr.c",
+        "nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_aiamgr.h",
+        "nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_colcertstore.c",
+        "nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_colcertstore.h",
+        "nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c",
+        "nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.h",
+        "nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpdefaultclient.c",
+        "nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpdefaultclient.h",
+        "nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_nsscontext.c",
+        "nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_nsscontext.h",
+        "nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_pk11certstore.c",
+        "nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_pk11certstore.h",
+        "nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c",
+        "nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.h",
+        "nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_basicconstraints.c",
+        "nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_basicconstraints.h",
+        "nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_cert.c",
+        "nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_cert.h",
+        "nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_certpolicyinfo.c",
+        "nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_certpolicyinfo.h",
+        "nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_certpolicymap.c",
+        "nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_certpolicymap.h",
+        "nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_certpolicyqualifier.c",
+        "nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_certpolicyqualifier.h",
+        "nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_crl.c",
+        "nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_crl.h",
+        "nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_crldp.c",
+        "nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_crldp.h",
+        "nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_crlentry.c",
+        "nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_crlentry.h",
+        "nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_date.c",
+        "nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_date.h",
+        "nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_generalname.c",
+        "nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_generalname.h",
+        "nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_infoaccess.c",
+        "nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_infoaccess.h",
+        "nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_nameconstraints.c",
+        "nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_nameconstraints.h",
+        "nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocspcertid.c",
+        "nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocspcertid.h",
+        "nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocsprequest.c",
+        "nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocsprequest.h",
+        "nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocspresponse.c",
+        "nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocspresponse.h",
+        "nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_publickey.c",
+        "nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_publickey.h",
+        "nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_x500name.c",
+        "nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_x500name.h",
+        "nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_bigint.c",
+        "nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_bigint.h",
+        "nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_bytearray.c",
+        "nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_bytearray.h",
+        "nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_common.c",
+        "nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_common.h",
+        "nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_error.c",
+        "nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_hashtable.c",
+        "nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_hashtable.h",
+        "nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_lifecycle.c",
+        "nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_lifecycle.h",
+        "nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_mem.c",
+        "nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_mem.h",
+        "nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_monitorlock.c",
+        "nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_monitorlock.h",
+        "nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_mutex.c",
+        "nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_mutex.h",
+        "nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_object.c",
+        "nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_object.h",
+        "nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_oid.c",
+        "nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_oid.h",
+        "nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_primhash.c",
+        "nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_primhash.h",
+        "nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_rwlock.c",
+        "nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_rwlock.h",
+        "nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_string.c",
+        "nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_string.h",
+      ]
+
+      # Disable the LDAP code in libpkix.
+      defines += [ "NSS_PKIX_NO_LDAP" ]
+
+      include_dirs += [
+        "nss/lib/libpkix/include",
+        "nss/lib/libpkix/pkix/certsel",
+        "nss/lib/libpkix/pkix/checker",
+        "nss/lib/libpkix/pkix/crlsel",
+        "nss/lib/libpkix/pkix/params",
+        "nss/lib/libpkix/pkix/results",
+        "nss/lib/libpkix/pkix/store",
+        "nss/lib/libpkix/pkix/top",
+        "nss/lib/libpkix/pkix/util",
+        "nss/lib/libpkix/pkix_pl_nss/module",
+        "nss/lib/libpkix/pkix_pl_nss/pki",
+        "nss/lib/libpkix/pkix_pl_nss/system",
+      ]
+    } else {
+      defines += [ "NSS_DISABLE_LIBPKIX" ]
+    }
+
+    if (!include_nss_root_certs) {
+      defines += [ "NSS_DISABLE_ROOT_CERTS" ]
+    }
+
+    if (current_cpu == "x64" && !is_win) {
+      sources -= [
+        "nss/lib/freebl/chacha20/chacha20.c",
+        "nss/lib/freebl/poly1305/poly1305.c",
+      ]
+    } else {
+      sources -= [
+        "nss/lib/freebl/chacha20/chacha20_vec.c",
+        "nss/lib/freebl/poly1305/poly1305-donna-x64-sse2-incremental-source.c",
+      ]
+    }
+
+    if (is_mac || is_ios) {
+      sources -= [ "nss/lib/freebl/mpi/mpi_amd64.c" ]
+      cflags += [
+        "-include",
+        rebase_path("//third_party/nss/nss/lib/freebl/nss_build_config_mac.h",
+                    root_build_dir),
+      ]
+      defines += [
+        "XP_UNIX",
+        "DARWIN",
+        "HAVE_STRERROR",
+        "HAVE_BSD_FLOCK",
+        "SHLIB_SUFFIX=\"dylib\"",
+        "SHLIB_PREFIX=\"lib\"",
+        "SOFTOKEN_LIB_NAME=\"libsoftokn3.dylib\"",
+      ]
+
+      configs -= [ "//build/config/gcc:symbol_visibility_hidden" ]
+    } else {
+      # Not Mac/iOS.
+      sources -= [ "nss/lib/freebl/mpi/mpi_arm_mac.c" ]
+    }
+
+    if (is_win) {
+      defines += [
+        "SHLIB_SUFFIX=\"dll\"",
+        "SHLIB_PREFIX=\"\"",
+        "SOFTOKEN_LIB_NAME=\"softokn3.dll\"",
+        "XP_PC",
+        "WIN32",
+        "WIN95",
+      ]
+
+      if (current_cpu == "x86") {
+        defines += [
+          "NSS_X86_OR_X64",
+          "NSS_X86",
+          "_X86_",
+          "MP_ASSEMBLY_MULTIPLY",
+          "MP_ASSEMBLY_SQUARE",
+          "MP_ASSEMBLY_DIV_2DX1D",
+          "MP_USE_UINT_DIGIT",
+          "MP_NO_MP_WORD",
+          "USE_HW_AES",
+          "INTEL_GCM",
+        ]
+        sources -= [ "nss/lib/freebl/mpi/mpi_amd64.c" ]
+      } else if (current_cpu == "x64") {
+        sources -= [
+          "nss/lib/freebl/intel-aes-x86-masm.asm",
+          "nss/lib/freebl/mpi/mpi_amd64.c",
+          "nss/lib/freebl/mpi/mpi_x86_asm.c",
+        ]
+        defines += [
+          "NSS_USE_64",
+          "NSS_X86_OR_X64",
+          "NSS_X64",
+          "_AMD64_",
+          "MP_CHAR_STORE_SLOW",
+          "MP_IS_LITTLE_ENDIAN",
+          "WIN64",
+        ]
+      }
+    } else {
+      # Not Windows.
+      sources -= [
+        # mpi_x86_asm.c contains MSVC inline assembly code.
+        "nss/lib/freebl/mpi/mpi_x86_asm.c",
+      ]
+    }
+
+    if (is_clang) {
+      cflags += [
+        # nss doesn"t explicitly cast between different enum types.
+        "-Wno-conversion",
+
+        # nss passes "const char*" through "void*".
+        "-Wno-incompatible-pointer-types",
+
+        # nss prefers `a && b || c` over `(a && b) || c`.
+        "-Wno-logical-op-parentheses",
+
+        # nss doesn"t use exhaustive switches on enums
+        "-Wno-switch",
+
+        # nss has some `unsigned < 0` checks.
+        "-Wno-tautological-compare",
+      ]
+    }
+
+    public_deps = [ ":nspr" ]
+    deps = [
+      ":nspr",
+      "//third_party/sqlite",
+    ]
+
+    if (is_win && current_cpu == "x86") {
+      deps += [ ":nss_static_avx" ]
+    }
+  }
+}  # Windows/Mac/iOS.
diff --git a/build/secondary/third_party/pkg/quiver/BUILD.gn b/build/secondary/third_party/pkg/quiver/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..c6af91294c0953bb91bae1f88a4e4df563cd6768
--- /dev/null
+++ b/build/secondary/third_party/pkg/quiver/BUILD.gn
@@ -0,0 +1,83 @@
+# Copyright 2021 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# TODO(flutter/flutter#85356): This file was originally generated by the
+# fuchsia.git script: `package_importer.py`. The generated `BUILD.gn` files were
+# copied to the flutter repo to support `dart_library` targets used for
+# Flutter-Fuchsia integration tests. This file can be maintained by hand, but it
+# would be better to implement a script for Flutter, to either generate these
+# BUILD.gn files or dynamically generate the GN targets.
+
+import("//flutter/tools/fuchsia/dart/dart_library.gni")
+
+dart_library("quiver") {
+  package_name = "quiver"
+
+  # The current version of this library is not null safe
+  language_version = "2.0"
+
+  deps = [
+    "$dart_src/pkg/meta",
+    "$dart_src/third_party/pkg/matcher",
+  ]
+
+  sources = [
+    "async.dart",
+    "cache.dart",
+    "check.dart",
+    "collection.dart",
+    "core.dart",
+    "io.dart",
+    "iterables.dart",
+    "mirrors.dart",
+    "pattern.dart",
+    "src/async/collect.dart",
+    "src/async/concat.dart",
+    "src/async/countdown_timer.dart",
+    "src/async/enumerate.dart",
+    "src/async/future_stream.dart",
+    "src/async/iteration.dart",
+    "src/async/metronome.dart",
+    "src/async/stream_buffer.dart",
+    "src/async/stream_router.dart",
+    "src/async/string.dart",
+    "src/cache/cache.dart",
+    "src/cache/map_cache.dart",
+    "src/collection/bimap.dart",
+    "src/collection/delegates/iterable.dart",
+    "src/collection/delegates/list.dart",
+    "src/collection/delegates/map.dart",
+    "src/collection/delegates/queue.dart",
+    "src/collection/delegates/set.dart",
+    "src/collection/lru_map.dart",
+    "src/collection/multimap.dart",
+    "src/collection/treeset.dart",
+    "src/core/hash.dart",
+    "src/core/optional.dart",
+    "src/iterables/concat.dart",
+    "src/iterables/count.dart",
+    "src/iterables/cycle.dart",
+    "src/iterables/enumerate.dart",
+    "src/iterables/generating_iterable.dart",
+    "src/iterables/infinite_iterable.dart",
+    "src/iterables/merge.dart",
+    "src/iterables/min_max.dart",
+    "src/iterables/partition.dart",
+    "src/iterables/range.dart",
+    "src/iterables/zip.dart",
+    "src/time/clock.dart",
+    "src/time/duration_unit_constants.dart",
+    "src/time/util.dart",
+    "strings.dart",
+    "testing/async.dart",
+    "testing/equality.dart",
+    "testing/runtime.dart",
+    "testing/src/async/fake_async.dart",
+    "testing/src/equality/equality.dart",
+    "testing/src/runtime/checked_mode.dart",
+    "testing/src/time/time.dart",
+    "testing/time.dart",
+    "time.dart",
+  ]
+}
diff --git a/build/secondary/third_party/protobuf/AUTHORS b/build/secondary/third_party/protobuf/AUTHORS
new file mode 100644
index 0000000000000000000000000000000000000000..92cbefe525edc1c78c9246e9c28da81f52cedf6a
--- /dev/null
+++ b/build/secondary/third_party/protobuf/AUTHORS
@@ -0,0 +1,8 @@
+# This is the list of Fuchsia Authors.
+
+# Names should be added to this file as one of
+#     Organization's name
+#     Individual's name <submission email address>
+#     Individual's name <submission email address> <email2> <emailN>
+
+Google LLC.
diff --git a/build/secondary/third_party/protobuf/BUILD.gn b/build/secondary/third_party/protobuf/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..fdea7ebe525373bcd23a32a67873644a691a8a64
--- /dev/null
+++ b/build/secondary/third_party/protobuf/BUILD.gn
@@ -0,0 +1,536 @@
+# THIS FILE IS GENERATED FROM BUILD.input.gn BY gen.py
+# EDIT BUILD.input.gn FIRST AND THEN RUN gen.py
+#
+#
+# Copyright 2017 The Fuchsia Authors. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import("//build/test.gni")
+import("//third_party/protobuf/proto_library.gni")
+
+config("protobuf_config") {
+  include_dirs = [ "//flutter/third_party/protobuf/src" ]
+  defines = [
+    "GOOGLE_PROTOBUF_NO_RTTI",
+    "HAVE_PTHREAD",
+  ]
+  cflags = []
+  if (is_clang) {
+    cflags += [
+      # Needed to support PROTOBUF_INTERNAL_CHECK_CLASS_SIZE in descriptor.h
+      "-Wno-c++98-compat-extra-semi",
+
+      # There are implicit conversions in parse_context.h
+      "-Wno-shorten-64-to-32",
+    ]
+  }
+}
+
+config("protobuf_warnings") {
+  cflags = []
+
+  if (is_clang) {
+    # These are all needed as of https://github.com/protocolbuffers/protobuf/releases/tag/v3.21.12
+    cflags += [
+      "-Wno-deprecated-pragma",
+      "-Wno-enum-enum-conversion",
+      "-Wno-extra-semi",
+      "-Wno-float-conversion",
+      "-Wno-implicit-float-conversion",
+      "-Wno-implicit-int-conversion",
+      "-Wno-implicit-int-float-conversion",
+      "-Wno-invalid-noreturn",
+      "-Wno-missing-field-initializers",
+      "-Wno-sign-compare",
+      "-Wno-unused-function",
+      "-Wno-unused-private-field",
+      "-Wno-deprecated-declarations", # Mac deprecated sprintf
+    ]
+  }
+}
+
+# This config should be applied to targets using generated code from the proto
+# compiler. It sets up the include directories properly.
+config("using_proto") {
+  include_dirs = [
+    "//flutter/third_party/protobuf/src",
+    "$root_gen_dir",
+  ]
+}
+
+static_library("protobuf_lite") {
+  sources = [
+    "//flutter/third_party/protobuf/src/google/protobuf/any_lite.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/arena.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/arenastring.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/arenaz_sampler.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/extension_set.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/generated_enum_util.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/generated_message_tctable_lite.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/generated_message_util.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/implicit_weak_message.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/inlined_string_field.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/io/coded_stream.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/io/io_win32.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/io/strtod.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/io/zero_copy_stream.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/io/zero_copy_stream_impl.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/map.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/message_lite.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/parse_context.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/repeated_field.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/repeated_ptr_field.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/bytestream.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/common.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/int128.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/status.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/statusor.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/stringpiece.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/stringprintf.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/structurally_valid.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/strutil.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/time.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/wire_format_lite.cc",
+  ]
+
+  # git ls-files -- ':!*/compiler/*' ':!*/testing/*' ':!*/util/*' 'src/google/protobuf/*.h' | sed 's/^/"/' | sed 's/$/",/'
+  public = [
+    "//flutter/third_party/protobuf/src/google/protobuf/any.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/any.pb.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/api.pb.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/arena.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/arena_impl.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/arena_test_util.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/arenastring.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/arenaz_sampler.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/descriptor.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/descriptor.pb.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/descriptor_database.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/duration.pb.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/dynamic_message.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/empty.pb.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/endian.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/explicitly_constructed.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/extension_set.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/extension_set_inl.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/field_access_listener.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/field_mask.pb.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/generated_enum_reflection.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/generated_enum_util.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/generated_message_bases.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/generated_message_reflection.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/generated_message_tctable_decl.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/generated_message_tctable_impl.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/generated_message_util.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/has_bits.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/implicit_weak_message.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/inlined_string_field.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/io/coded_stream.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/io/gzip_stream.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/io/io_win32.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/io/package_info.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/io/printer.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/io/strtod.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/io/tokenizer.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/io/zero_copy_stream.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/map.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/map_entry.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/map_entry_lite.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/map_field.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/map_field_inl.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/map_field_lite.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/map_lite_test_util.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/map_test_util.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/map_test_util_impl.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/map_type_handler.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/message.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/message_lite.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/metadata.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/metadata_lite.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/package_info.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/parse_context.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/port.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/reflection.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/reflection_internal.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/reflection_ops.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/reflection_tester.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/repeated_field.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/repeated_ptr_field.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/service.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/source_context.pb.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/string_member_robber.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/struct.pb.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/bytestream.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/callback.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/casts.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/common.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/hash.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/int128.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/logging.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/macros.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/map_util.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/mathutil.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/mutex.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/once.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/platform_macros.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/port.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/status.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/status_macros.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/statusor.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/stl_util.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/stringpiece.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/stringprintf.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/strutil.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/substitute.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/template_util.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/time.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/test_util.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/test_util2.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/test_util_lite.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/text_format.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/timestamp.pb.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/type.pb.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/unknown_field_set.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/wire_format.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/wire_format_lite.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/wrappers.pb.h",
+  ]
+  configs += [ ":protobuf_warnings" ]
+  public_configs = [ ":protobuf_config" ]
+}
+
+# This is the full, heavy protobuf lib that's needed for c++ .protos that don't
+# specify the LITE_RUNTIME option. The protocol compiler itself (protoc) falls
+# into that category.
+static_library("protobuf_full") {
+  sources = [
+    "//flutter/third_party/protobuf/src/google/protobuf/any.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/any.pb.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/api.pb.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/compiler/importer.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/compiler/parser.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/descriptor.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/descriptor.pb.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/descriptor_database.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/duration.pb.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/dynamic_message.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/empty.pb.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/extension_set_heavy.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/field_mask.pb.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/generated_message_bases.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/generated_message_reflection.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/generated_message_tctable_full.cc",
+
+    # gzip_stream.cc pulls in zlib, but it's not actually used by protoc, just
+    # by test code, so instead of compiling zlib for the host, let's just
+    # exclude this.
+    # "//flutter/third_party/protobuf/src/google/protobuf/io/gzip_stream.cc",
+
+    "//flutter/third_party/protobuf/src/google/protobuf/io/printer.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/io/tokenizer.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/map_field.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/message.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/reflection_ops.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/service.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/source_context.pb.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/struct.pb.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/substitute.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/text_format.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/timestamp.pb.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/type.pb.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/unknown_field_set.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/delimited_message_util.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/field_comparator.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/field_mask_util.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/internal/datapiece.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/internal/error_listener.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/internal/field_mask_utility.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/internal/json_escaping.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/internal/json_objectwriter.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/internal/json_stream_parser.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/internal/object_writer.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/internal/proto_writer.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/internal/protostream_objectsource.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/internal/type_info.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/internal/utility.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/json_util.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/message_differencer.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/time_util.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/type_resolver_util.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/wire_format.cc",
+    "//flutter/third_party/protobuf/src/google/protobuf/wrappers.pb.cc",
+  ]
+
+  # git ls-files -- ':!*/compiler/*' ':!*/testing/*' 'src/google/protobuf/*.h' | sed 's/^/"/' | sed 's/$/",/'
+  public = [
+    "//flutter/third_party/protobuf/src/google/protobuf/any.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/any.pb.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/api.pb.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/arena.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/arena_impl.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/arena_test_util.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/arenastring.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/arenaz_sampler.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/descriptor.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/descriptor.pb.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/descriptor_database.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/duration.pb.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/dynamic_message.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/empty.pb.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/endian.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/explicitly_constructed.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/extension_set.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/extension_set_inl.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/field_access_listener.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/field_mask.pb.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/generated_enum_reflection.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/generated_enum_util.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/generated_message_bases.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/generated_message_reflection.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/generated_message_tctable_decl.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/generated_message_tctable_impl.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/generated_message_util.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/has_bits.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/implicit_weak_message.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/inlined_string_field.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/io/coded_stream.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/io/gzip_stream.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/io/io_win32.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/io/package_info.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/io/printer.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/io/strtod.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/io/tokenizer.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/io/zero_copy_stream.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/map.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/map_entry.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/map_entry_lite.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/map_field.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/map_field_inl.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/map_field_lite.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/map_lite_test_util.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/map_test_util.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/map_test_util_impl.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/map_type_handler.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/message.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/message_lite.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/metadata.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/metadata_lite.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/package_info.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/parse_context.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/port.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/reflection.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/reflection_internal.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/reflection_ops.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/reflection_tester.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/repeated_field.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/repeated_ptr_field.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/service.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/source_context.pb.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/string_member_robber.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/struct.pb.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/bytestream.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/callback.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/casts.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/common.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/hash.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/int128.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/logging.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/macros.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/map_util.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/mathutil.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/mutex.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/once.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/platform_macros.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/port.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/status.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/status_macros.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/statusor.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/stl_util.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/stringpiece.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/stringprintf.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/strutil.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/substitute.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/template_util.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/stubs/time.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/test_util.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/test_util2.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/test_util_lite.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/text_format.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/timestamp.pb.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/type.pb.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/unknown_field_set.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/delimited_message_util.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/field_comparator.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/field_mask_util.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/internal/constants.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/internal/datapiece.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/internal/error_listener.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/internal/expecting_objectwriter.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/internal/field_mask_utility.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/internal/json_escaping.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/internal/json_objectwriter.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/internal/json_stream_parser.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/internal/location_tracker.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/internal/mock_error_listener.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/internal/object_location_tracker.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/internal/object_source.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/internal/object_writer.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/internal/proto_writer.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/internal/protostream_objectsource.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/internal/structured_objectwriter.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/internal/type_info.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/internal/type_info_test_helper.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/internal/utility.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/json_util.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/message_differencer.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/package_info.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/time_util.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/type_resolver.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/util/type_resolver_util.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/wire_format.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/wire_format_lite.h",
+    "//flutter/third_party/protobuf/src/google/protobuf/wrappers.pb.h",
+  ]
+  configs += [ ":protobuf_warnings" ]
+  public_configs = [ ":protobuf_config" ]
+  deps = [ ":protobuf_lite" ]
+}
+
+# Only compile the compiler for the host architecture.
+if (current_toolchain == host_toolchain) {
+  # protoc compiler is separated into protoc library and executable targets to
+  # support protoc plugins that need to link libprotoc, but not the main()
+  # itself. See src/google/protobuf/compiler/plugin.h
+  #
+  # git ls-files -- ':!*/main.cc' ':!*test*' ':!*mock*' 'src/google/protobuf/compiler/*.cc' | sed 's/^/"/' | sed 's/$/",/'
+  static_library("protoc_lib") {
+    sources = [
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/code_generator.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/command_line_interface.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/cpp/enum.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/cpp/enum_field.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/cpp/extension.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/cpp/field.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/cpp/file.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/cpp/generator.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/cpp/helpers.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/cpp/map_field.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/cpp/message.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/cpp/message_field.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/cpp/padding_optimizer.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/cpp/parse_function_generator.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/cpp/primitive_field.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/cpp/service.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/cpp/string_field.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_doc_comment.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_enum.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_enum_field.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_field_base.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_generator.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_helpers.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_map_field.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_message.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_message_field.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_primitive_field.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_reflection_class.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_repeated_message_field.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_source_generator_base.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_wrapper_field.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/importer.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/java/context.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/java/doc_comment.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/java/enum.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/java/enum_field.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/java/enum_field_lite.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/java/enum_lite.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/java/extension.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/java/extension_lite.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/java/field.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/java/file.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/java/generator.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/java/generator_factory.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/java/helpers.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/java/kotlin_generator.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/java/map_field.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/java/map_field_lite.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/java/message.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/java/message_builder.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/java/message_builder_lite.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/java/message_field.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/java/message_field_lite.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/java/message_lite.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/java/name_resolver.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/java/primitive_field.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/java/primitive_field_lite.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/java/service.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/java/shared_code_generator.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/java/string_field.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/java/string_field_lite.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_enum.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_enum_field.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_extension.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_field.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_file.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_generator.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_map_field.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_message.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_message_field.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_oneof.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_primitive_field.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/parser.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/php/php_generator.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/plugin.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/plugin.pb.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/python/generator.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/python/helpers.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/python/pyi_generator.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/ruby/ruby_generator.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/subprocess.cc",
+      "//flutter/third_party/protobuf/src/google/protobuf/compiler/zip_writer.cc",
+    ]
+    configs += [ ":protobuf_warnings" ]
+    public_deps = [ ":protobuf_full" ]
+  }
+
+  executable("protoc") {
+    sources = [ "//flutter/third_party/protobuf/src/google/protobuf/compiler/main.cc" ]
+    deps = [ ":protoc_lib" ]
+  }
+}
diff --git a/build/secondary/third_party/protobuf/BUILD.input.gn b/build/secondary/third_party/protobuf/BUILD.input.gn
new file mode 100644
index 0000000000000000000000000000000000000000..5afc49aa377224615cde2751eda6e29dc4b76c00
--- /dev/null
+++ b/build/secondary/third_party/protobuf/BUILD.input.gn
@@ -0,0 +1,211 @@
+# Copyright 2017 The Fuchsia Authors. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import("//build/test.gni")
+import("//third_party/protobuf/proto_library.gni")
+
+config("protobuf_config") {
+  include_dirs = [ "src" ]
+  defines = [
+    "GOOGLE_PROTOBUF_NO_RTTI",
+    "HAVE_PTHREAD",
+  ]
+  cflags = []
+  if (is_clang) {
+    cflags += [
+      # Needed to support PROTOBUF_INTERNAL_CHECK_CLASS_SIZE in descriptor.h
+      "-Wno-c++98-compat-extra-semi",
+
+      # There are implicit conversions in parse_context.h
+      "-Wno-shorten-64-to-32",
+    ]
+  }
+}
+
+config("protobuf_warnings") {
+  cflags = []
+
+  if (is_clang) {
+    # These are all needed as of https://github.com/protocolbuffers/protobuf/releases/tag/v3.21.12
+    cflags += [
+      "-Wno-deprecated-pragma",
+      "-Wno-enum-enum-conversion",
+      "-Wno-extra-semi",
+      "-Wno-float-conversion",
+      "-Wno-implicit-float-conversion",
+      "-Wno-implicit-int-conversion",
+      "-Wno-implicit-int-float-conversion",
+      "-Wno-invalid-noreturn",
+      "-Wno-missing-field-initializers",
+      "-Wno-sign-compare",
+      "-Wno-unused-function",
+      "-Wno-unused-private-field",
+    ]
+  }
+}
+
+# This config should be applied to targets using generated code from the proto
+# compiler. It sets up the include directories properly.
+config("using_proto") {
+  include_dirs = [
+    "src",
+    "$root_gen_dir",
+  ]
+}
+
+static_library("protobuf_lite") {
+  sources = [
+    "src/google/protobuf/any_lite.cc",
+    "src/google/protobuf/arena.cc",
+    "src/google/protobuf/arenastring.cc",
+    "src/google/protobuf/arenaz_sampler.cc",
+    "src/google/protobuf/extension_set.cc",
+    "src/google/protobuf/generated_enum_util.cc",
+    "src/google/protobuf/generated_message_tctable_lite.cc",
+    "src/google/protobuf/generated_message_util.cc",
+    "src/google/protobuf/implicit_weak_message.cc",
+    "src/google/protobuf/inlined_string_field.cc",
+    "src/google/protobuf/io/coded_stream.cc",
+    "src/google/protobuf/io/io_win32.cc",
+    "src/google/protobuf/io/strtod.cc",
+    "src/google/protobuf/io/zero_copy_stream.cc",
+    "src/google/protobuf/io/zero_copy_stream_impl.cc",
+    "src/google/protobuf/io/zero_copy_stream_impl_lite.cc",
+    "src/google/protobuf/map.cc",
+    "src/google/protobuf/message_lite.cc",
+    "src/google/protobuf/parse_context.cc",
+    "src/google/protobuf/repeated_field.cc",
+    "src/google/protobuf/repeated_ptr_field.cc",
+    "src/google/protobuf/stubs/bytestream.cc",
+    "src/google/protobuf/stubs/common.cc",
+    "src/google/protobuf/stubs/int128.cc",
+    "src/google/protobuf/stubs/status.cc",
+    "src/google/protobuf/stubs/statusor.cc",
+    "src/google/protobuf/stubs/stringpiece.cc",
+    "src/google/protobuf/stubs/stringprintf.cc",
+    "src/google/protobuf/stubs/structurally_valid.cc",
+    "src/google/protobuf/stubs/strutil.cc",
+    "src/google/protobuf/stubs/time.cc",
+    "src/google/protobuf/wire_format_lite.cc",
+  ]
+
+  # git ls-files -- ':!*/compiler/*' ':!*/testing/*' ':!*/util/*' 'src/google/protobuf/*.h' | sed 's/^/"/' | sed 's/$/",/'
+  public = [ PROTOBUF_LITE_PUBLIC ]
+  configs += [ ":protobuf_warnings" ]
+  public_configs = [ ":protobuf_config" ]
+}
+
+# This is the full, heavy protobuf lib that's needed for c++ .protos that don't
+# specify the LITE_RUNTIME option. The protocol compiler itself (protoc) falls
+# into that category.
+static_library("protobuf_full") {
+  sources = [
+    "src/google/protobuf/any.cc",
+    "src/google/protobuf/any.pb.cc",
+    "src/google/protobuf/api.pb.cc",
+    "src/google/protobuf/compiler/importer.cc",
+    "src/google/protobuf/compiler/parser.cc",
+    "src/google/protobuf/descriptor.cc",
+    "src/google/protobuf/descriptor.pb.cc",
+    "src/google/protobuf/descriptor_database.cc",
+    "src/google/protobuf/duration.pb.cc",
+    "src/google/protobuf/dynamic_message.cc",
+    "src/google/protobuf/empty.pb.cc",
+    "src/google/protobuf/extension_set_heavy.cc",
+    "src/google/protobuf/field_mask.pb.cc",
+    "src/google/protobuf/generated_message_bases.cc",
+    "src/google/protobuf/generated_message_reflection.cc",
+    "src/google/protobuf/generated_message_tctable_full.cc",
+
+    # gzip_stream.cc pulls in zlib, but it's not actually used by protoc, just
+    # by test code, so instead of compiling zlib for the host, let's just
+    # exclude this.
+    # "src/google/protobuf/io/gzip_stream.cc",
+
+    "src/google/protobuf/io/printer.cc",
+    "src/google/protobuf/io/tokenizer.cc",
+    "src/google/protobuf/map_field.cc",
+    "src/google/protobuf/message.cc",
+    "src/google/protobuf/reflection_ops.cc",
+    "src/google/protobuf/service.cc",
+    "src/google/protobuf/source_context.pb.cc",
+    "src/google/protobuf/struct.pb.cc",
+    "src/google/protobuf/stubs/substitute.cc",
+    "src/google/protobuf/text_format.cc",
+    "src/google/protobuf/timestamp.pb.cc",
+    "src/google/protobuf/type.pb.cc",
+    "src/google/protobuf/unknown_field_set.cc",
+    "src/google/protobuf/util/delimited_message_util.cc",
+    "src/google/protobuf/util/field_comparator.cc",
+    "src/google/protobuf/util/field_mask_util.cc",
+    "src/google/protobuf/util/internal/datapiece.cc",
+    "src/google/protobuf/util/internal/default_value_objectwriter.cc",
+    "src/google/protobuf/util/internal/error_listener.cc",
+    "src/google/protobuf/util/internal/field_mask_utility.cc",
+    "src/google/protobuf/util/internal/json_escaping.cc",
+    "src/google/protobuf/util/internal/json_objectwriter.cc",
+    "src/google/protobuf/util/internal/json_stream_parser.cc",
+    "src/google/protobuf/util/internal/object_writer.cc",
+    "src/google/protobuf/util/internal/proto_writer.cc",
+    "src/google/protobuf/util/internal/protostream_objectsource.cc",
+    "src/google/protobuf/util/internal/protostream_objectwriter.cc",
+    "src/google/protobuf/util/internal/type_info.cc",
+    "src/google/protobuf/util/internal/utility.cc",
+    "src/google/protobuf/util/json_util.cc",
+    "src/google/protobuf/util/message_differencer.cc",
+    "src/google/protobuf/util/time_util.cc",
+    "src/google/protobuf/util/type_resolver_util.cc",
+    "src/google/protobuf/wire_format.cc",
+    "src/google/protobuf/wrappers.pb.cc",
+  ]
+
+  # git ls-files -- ':!*/compiler/*' ':!*/testing/*' 'src/google/protobuf/*.h' | sed 's/^/"/' | sed 's/$/",/'
+  public = [ PROTOBUF_FULL_PUBLIC ]
+  configs += [ ":protobuf_warnings" ]
+  public_configs = [ ":protobuf_config" ]
+  deps = [ ":protobuf_lite" ]
+}
+
+# Only compile the compiler for the host architecture.
+if (current_toolchain == host_toolchain) {
+  # protoc compiler is separated into protoc library and executable targets to
+  # support protoc plugins that need to link libprotoc, but not the main()
+  # itself. See src/google/protobuf/compiler/plugin.h
+  #
+  # git ls-files -- ':!*/main.cc' ':!*test*' ':!*mock*' 'src/google/protobuf/compiler/*.cc' | sed 's/^/"/' | sed 's/$/",/'
+  static_library("protoc_lib") {
+    sources = [ PROTOC_LIB_SOURCES ]
+    configs += [ ":protobuf_warnings" ]
+    public_deps = [ ":protobuf_full" ]
+  }
+
+  executable("protoc") {
+    sources = [ "src/google/protobuf/compiler/main.cc" ]
+    deps = [ ":protoc_lib" ]
+  }
+}
diff --git a/build/secondary/third_party/protobuf/CONTRIBUTING.md b/build/secondary/third_party/protobuf/CONTRIBUTING.md
new file mode 100644
index 0000000000000000000000000000000000000000..981338139d199811d56d4c2e9bfe4b2020b5a68c
--- /dev/null
+++ b/build/secondary/third_party/protobuf/CONTRIBUTING.md
@@ -0,0 +1,34 @@
+# Contributing to Fuchsia
+
+Fuchsia lets anyone contribute to the project, regardless of their employer.
+The Fuchsia project reviews and encourages well-tested, high-quality
+contributions from anyone who wants to contribute to Fuchsia.
+
+## Contributor License Agreement
+
+Contributions to this project must be accompanied by a Contributor License
+Agreement (CLA).
+
+To see any Contributor License Agreements on file or to sign a CLA, go to <https://cla.developers.google.com/>.
+
+For more information about the Google CLA, see [Contributor License Agreements](https://cla.developers.google.com/about).
+
+## Contributing changes and submitting code reviews
+
+All changes require review, including changes by project members.
+
+For detailed instructions on how to contribute changes,
+see [Contribute changes](/docs/development/source_code/contribute_changes.md).
+
+## Community guidelines
+
+This project observes the following community guidelines:
+
+  * [Google's Open Source Community Guidelines](https://opensource.google/conduct/)
+
+  * [Fuchsia Code of Conduct](/docs/CODE_OF_CONDUCT.md)
+
+## Governance
+
+Review Fuchsia's [Governance](/docs/contribute/governance/governance.md)
+statement.
diff --git a/build/secondary/third_party/protobuf/LICENSE b/build/secondary/third_party/protobuf/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..e692756879962f0153a310efde58296fd9fe2f20
--- /dev/null
+++ b/build/secondary/third_party/protobuf/LICENSE
@@ -0,0 +1,24 @@
+// Copyright 2021 The Fuchsia Authors.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/build/secondary/third_party/protobuf/OWNERS b/build/secondary/third_party/protobuf/OWNERS
new file mode 100644
index 0000000000000000000000000000000000000000..a0e97cd23616bf65b11e7aa94c0c1d082fb6fca7
--- /dev/null
+++ b/build/secondary/third_party/protobuf/OWNERS
@@ -0,0 +1,5 @@
+azani@google.com
+camrdale@google.com
+frousseau@google.com
+stevefung@google.com
+zmbush@google.com
\ No newline at end of file
diff --git a/third_party/txt/PATENTS b/build/secondary/third_party/protobuf/PATENTS
similarity index 100%
rename from third_party/txt/PATENTS
rename to build/secondary/third_party/protobuf/PATENTS
diff --git a/build/secondary/third_party/protobuf/README.md b/build/secondary/third_party/protobuf/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..bf180d5a852980c41e8e0794768c3c5494038fdb
--- /dev/null
+++ b/build/secondary/third_party/protobuf/README.md
@@ -0,0 +1,17 @@
+# Protocol Buffers GN Build Support
+
+This repository contains
+[GN build system](https://gn.googlesource.com/gn/+/HEAD/) support for
+[Protocol Buffers](https://github.com/protocolbuffers/protobuf). It's in its own
+repository because it needs to be shared by
+[Fuchsia](https://fuchsia.googlesource.com/fuchsia/) and
+[Cobalt](https://fuchsia.googlesource.com/cobalt/).
+
+This repo should be checked out such that:
+
+* It is in `//build/secondary/third_party/protobuf`.
+* Protobuf is in `//third_party/protobuf`.
+* `//.gn` contains `secondary_source = "//build/secondary/"`
+
+See the
+[GN documentation on secondary_source](https://gn.googlesource.com/gn/+/master/docs/reference.md#other-help-topics-gn-file-variables).
diff --git a/build/secondary/third_party/protobuf/gen.py b/build/secondary/third_party/protobuf/gen.py
new file mode 100644
index 0000000000000000000000000000000000000000..df5a3473c9350841324aa9504048c4513c4cde83
--- /dev/null
+++ b/build/secondary/third_party/protobuf/gen.py
@@ -0,0 +1,44 @@
+import subprocess
+import os
+
+gn_in = open("BUILD.input.gn", "rb")
+gn_file = gn_in.read()
+gn_in.close()
+
+
+def get_files(path, exclude=[]):
+    cmd = ["git", "ls-files", "--"]
+    for ex in exclude:
+        cmd.append(":!%s" % ex)
+    cmd.append(path)
+    git_ls = subprocess.Popen(
+        cmd,
+        stdout=subprocess.PIPE,
+        cwd=os.path.join(os.environ["FUCHSIA_DIR"], "third_party", "protobuf"))
+    sed1 = subprocess.Popen(
+        ["sed", "s/^/\"/"], stdin=git_ls.stdout, stdout=subprocess.PIPE)
+    return subprocess.check_output(["sed", "s/$/\",/"], stdin=sed1.stdout)
+
+
+gn_file = gn_file.replace(
+    b"PROTOBUF_LITE_PUBLIC",
+    get_files(
+        "src/google/protobuf/*.h",
+        exclude=["*/compiler/*", "*/testing/*", "*/util/*"]))
+gn_file = gn_file.replace(
+    b"PROTOBUF_FULL_PUBLIC",
+    get_files(
+        "src/google/protobuf/*.h", exclude=["*/compiler/*", "*/testing/*"]))
+gn_file = gn_file.replace(
+    b"PROTOC_LIB_SOURCES",
+    get_files(
+        "src/google/protobuf/compiler/*.cc",
+        exclude=["*/main.cc", "*test*", "*mock*"]))
+
+gn_file = subprocess.check_output(["gn", "format", "--stdin"], input=gn_file)
+
+gn_out = open("BUILD.gn", "wb")
+gn_out.write(
+    b"# THIS FILE IS GENERATED FROM BUILD.input.gn BY gen.py\n# EDIT BUILD.input.gn FIRST AND THEN RUN gen.py\n#\n#\n"
+)
+gn_out.write(gn_file)
diff --git a/build/secondary/third_party/protobuf/proto_library.gni b/build/secondary/third_party/protobuf/proto_library.gni
new file mode 100644
index 0000000000000000000000000000000000000000..ad489717fced522209f1e2ac75b9e7a05835092d
--- /dev/null
+++ b/build/secondary/third_party/protobuf/proto_library.gni
@@ -0,0 +1,483 @@
+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Compile a protocol buffer.
+#
+# Protobuf parameters:
+#
+#   proto_in_dir (optional)
+#       Specifies the path relative to the current BUILD.gn file where
+#       proto files are located and the directory structure of
+#       this proto library starts.
+#
+#       This option can be calculated automatically but it will raise an
+#       assertion error if any nested directories are found.
+#
+#   proto_out_dir (optional)
+#       Specifies the path suffix that output files are generated under.
+#       This path will be appended to |root_gen_dir|, but for python stubs
+#       it will be appended to |root_build_dir|/pyproto.
+#
+#   generate_python (optional, default true)
+#       Generate Python protobuf stubs.
+#
+#   generate_cc (optional, default true)
+#       Generate C++ protobuf stubs.
+#
+#   generate_descriptor_set (optional, default false)
+#       Generate a descriptor set file at a default location
+#       "${target_out_dir}/${target_name}.desc.pb".
+#
+#   generate_descriptor (optional, default "")
+#       Generate a descriptor set file at a specific location rooted underneath
+#       the generated files directory.
+#       Cannot be used in combination with |generate_descriptor|.
+#
+#   generate_go (optional, default false)
+#       Generate Go protobuf stubs.
+#       Mutually exclusive with generate_go_grpc.
+#
+#   generate_go_grpc (optional, default false)
+#       Generate a Go gRPC protobuf stub, instead of a regular one.
+#       Mutually exclusive with generate_go.
+#
+#   cc_generator_options (optional)
+#       List of extra flags passed to the protocol compiler.  If you need to
+#       add an EXPORT macro to a protobuf's C++ header, set the
+#       'cc_generator_options' variable with the value:
+#       'dllexport_decl=FOO_EXPORT:' (note trailing colon).
+#
+#       It is likely you also need to #include a file for the above EXPORT
+#       macro to work (see cc_include) and set
+#       component_build_force_source_set = true.
+#
+#   cc_include (optional)
+#       String listing an extra include that should be passed.
+#       Example: cc_include = "foo/bar.h"
+#
+#   generator_plugin_label (optional)
+#       GN label for plugin executable which generates custom cc stubs.
+#       Don't specify a toolchain, host toolchain is assumed.
+#
+#   generator_plugin_script (optional)
+#       Path to plugin script. Mutually exclusive with |generator_plugin_label|.
+#
+#   generator_plugin_script_deps (optional)
+#       List of additional files required for generator plugin script.
+#
+#   generator_plugin_suffix[es] (required if using a plugin)
+#       Suffix (before extension) for generated .cc and .h files
+#       or list of suffixes for all files (with extensions).
+#
+#   generator_plugin_options (optional)
+#       Extra flags passed to the plugin. See cc_generator_options.
+#
+#   deps (optional)
+#       Additional dependencies.
+#
+#   use_protobuf_full (optional)
+#       If adding protobuf library would be required, adds protobuf_full to deps
+#       instead of protobuf_lite.
+#
+#   import_protobuf_full (optional)
+#       Allows .proto files to import .proto files from protobuf_full, without
+#       adding a dependency on all the C++ code in that library.
+#
+#   import_dirs (optional)
+#       A list of extra import directories to be passed to protoc compiler. The
+#       default case is just proto_in_dir.
+#       WARNING: This options should not be used in Chrome code until
+#       http://crbug.com/691451 is resolved.
+#
+# Parameters for compiling the generated code:
+#
+#   defines (optional)
+#       Defines to supply to the source set that compiles the generated source
+#       code.
+#
+#   extra_configs (optional)
+#       A list of config labels that will be appended to the configs applying
+#       to the source set.
+#
+# Example:
+#  proto_library("mylib") {
+#    sources = [
+#      "foo.proto",
+#    ]
+#  }
+
+if (host_os == "win") {
+  _host_executable_suffix = ".exe"
+} else {
+  _host_executable_suffix = ""
+}
+
+template("proto_library") {
+  assert(defined(invoker.sources), "Need sources for proto_library")
+  proto_sources = invoker.sources
+
+  forward_variables_from(invoker, [ "visibility" ])
+
+  if (defined(invoker.generate_cc)) {
+    generate_cc = invoker.generate_cc
+  } else {
+    generate_cc = true
+  }
+
+  if (defined(invoker.generate_python)) {
+    generate_python = invoker.generate_python
+  } else {
+    generate_python = true
+  }
+
+  generate_go = defined(invoker.generate_go) && invoker.generate_go
+  generate_go_grpc =
+      defined(invoker.generate_go_grpc) && invoker.generate_go_grpc
+
+  assert(!generate_go || !generate_go_grpc,
+         "Only one of generate_go or generate_go_grpc can be enabled!")
+
+  not_needed(invoker, ["propagate_imports_configs"])
+
+  if (defined(invoker.generator_plugin_label)) {
+    # Straightforward way to get the name of executable doesn't work because
+    # |root_out_dir| and |root_build_dir| may differ in cross-compilation and
+    # also Windows executables have .exe at the end.
+
+    plugin_host_label = invoker.generator_plugin_label + "($host_toolchain)"
+    plugin_path =
+        get_label_info(plugin_host_label, "root_out_dir") + "/" +
+        get_label_info(plugin_host_label, "name") + _host_executable_suffix
+    generate_with_plugin = true
+  } else if (defined(invoker.generator_plugin_script)) {
+    plugin_path = invoker.generator_plugin_script
+    generate_with_plugin = true
+  } else {
+    generate_with_plugin = false
+  }
+
+  if (generate_with_plugin) {
+    if (defined(invoker.generator_plugin_suffix)) {
+      generator_plugin_suffixes = [
+        "${invoker.generator_plugin_suffix}.h",
+        "${invoker.generator_plugin_suffix}.cc",
+      ]
+    } else {
+      generator_plugin_suffixes = invoker.generator_plugin_suffixes
+    }
+  }
+
+  if (defined(invoker.proto_in_dir)) {
+    proto_in_dir = invoker.proto_in_dir
+  } else {
+    proto_in_dir = get_path_info(proto_sources[0], "dir")
+
+    # Sanity check, |proto_in_dir| should be defined to allow sub-directories.
+    foreach(proto_source, proto_sources) {
+      assert(get_path_info(proto_source, "dir") == proto_in_dir,
+             "Please define |proto_in_dir| to allow nested directories.")
+    }
+  }
+
+  # Avoid absolute path because of the assumption that |proto_in_dir| is
+  # relative to the directory of current BUILD.gn file.
+  proto_in_dir = rebase_path(proto_in_dir, ".")
+
+  if (defined(invoker.proto_out_dir)) {
+    proto_out_dir = invoker.proto_out_dir
+  } else {
+    # Absolute path to the directory of current BUILD.gn file excluding "//".
+    proto_out_dir = rebase_path(".", "//")
+    if (proto_in_dir != ".") {
+      proto_out_dir += "/$proto_in_dir"
+    }
+  }
+
+  # We need both absolute path to use in GN statements and a relative one
+  # to pass to external script.
+  if (generate_cc || generate_with_plugin) {
+    cc_out_dir = "$root_gen_dir/" + proto_out_dir
+    rel_cc_out_dir = rebase_path(cc_out_dir, root_build_dir)
+  }
+  if (generate_python) {
+    py_out_dir = "$root_out_dir/pyproto/" + proto_out_dir
+    rel_py_out_dir = rebase_path(py_out_dir, root_build_dir)
+  }
+  if (generate_go || generate_go_grpc) {
+    go_out_dir = "$root_gen_dir/go-proto-gen/src/" + proto_out_dir
+    rel_go_out_dir = rebase_path(go_out_dir, root_build_dir)
+  }
+
+  protos = rebase_path(invoker.sources, proto_in_dir)
+  protogens = []
+
+  descriptor_set_path_ = ""
+  if (defined(invoker.generate_descriptor_set) &&
+      invoker.generate_descriptor_set) {
+    assert(!defined(invoker.generate_descriptor))
+    descriptor_set_path_ = "${target_out_dir}/${target_name}.desc.pb"
+  } else if (defined(invoker.generate_descriptor)) {
+    descriptor_set_path_ =
+        "$root_gen_dir/" + 
+        rebase_path(proto_out_dir, "//") +
+        invoker.generate_descriptor
+  }
+  if (descriptor_set_path_ != "") {
+    protogens += [ descriptor_set_path_ ]
+  }
+
+  # List output files.
+  foreach(proto, protos) {
+    proto_dir = get_path_info(proto, "dir")
+    proto_name = get_path_info(proto, "name")
+    proto_path = proto_dir + "/" + proto_name
+
+    if (generate_cc) {
+      protogens += [
+        "$cc_out_dir/$proto_path.pb.h",
+        "$cc_out_dir/$proto_path.pb.cc",
+      ]
+    }
+    if (generate_python) {
+      protogens += [ "$py_out_dir/${proto_path}_pb2.py" ]
+    }
+    if (generate_go) {
+      protogens += [ "$go_out_dir/${proto_path}.pb.go" ]
+    }
+    if (generate_go_grpc) {
+      protogens += [ "$go_out_dir/${proto_path}_grpc.pb.go" ]
+    }
+    if (generate_with_plugin) {
+      foreach(suffix, generator_plugin_suffixes) {
+        protogens += [ "$cc_out_dir/${proto_path}${suffix}" ]
+      }
+    }
+    if (descriptor_set_path_ != "") {
+      # Descriptor-only protobuf targets do not use |proto_path|
+      not_needed(["proto_path"])
+    }
+  }
+
+  generated_file("${target_name}_protoc_outputs") {
+    contents = rebase_path(protogens, root_build_dir)
+    outputs = [ "${target_gen_dir}/${target_name}.protoc_output_info" ]
+  }
+  protoc_output_info_target = ":${target_name}_protoc_outputs"
+
+  action_name = "${target_name}_gen"
+
+  # Generate protobuf stubs.
+  action(action_name) {
+    visibility = []
+    visibility = [ ":*" ]
+    script = "//build/secondary/third_party/protobuf/protoc_wrapper.py"
+    sources = proto_sources
+    outputs = protogens
+    args = protos
+
+    protoc_label = "//third_party/protobuf:protoc($host_toolchain)"
+    protoc_path = get_label_info(protoc_label, "root_out_dir") + "/protoc" +
+                  _host_executable_suffix
+
+    if (generate_go || generate_go_grpc) {
+      if (generate_go_grpc) {
+        protoc_gen_go_label = "//third_party/golibs/google.golang.org/grpc/cmd/protoc-gen-go-grpc($host_toolchain)"
+      } else {
+        protoc_gen_go_label = "//third_party/golibs/google.golang.org/protobuf/cmd/protoc-gen-go($host_toolchain)"
+      }
+      protoc_gen_go_path = get_label_info(protoc_gen_go_label, "root_out_dir") +
+                           "/" + get_label_info(protoc_gen_go_label, "name")
+    }
+
+    # Depfile information.
+    depfile = "${target_gen_dir}/${target_name}.d"
+    protoc_output_info_files = get_target_outputs(protoc_output_info_target)
+    protoc_output_info_file = protoc_output_info_files[0]
+    args += [
+      "--depfile",
+      rebase_path(depfile, root_build_dir),
+      "--depfile-outputs",
+      rebase_path(protoc_output_info_file, root_build_dir),
+    ]
+
+    args += [
+      # Wrapper should never pick a system protoc.
+      # Path should be rebased because |root_build_dir| for current toolchain
+      # may be different from |root_out_dir| of protoc built on host toolchain.
+      "--protoc",
+      "./" + rebase_path(protoc_path, root_build_dir),
+      "--proto-in-dir",
+      rebase_path(proto_in_dir, root_build_dir),
+    ]
+
+    if (generate_cc) {
+      args += [
+        "--cc-out-dir",
+        rel_cc_out_dir,
+      ]
+      if (defined(invoker.cc_generator_options)) {
+        args += [
+          "--cc-options",
+          invoker.cc_generator_options,
+        ]
+      }
+      if (defined(invoker.cc_include)) {
+        args += [
+          "--include",
+          invoker.cc_include,
+        ]
+      }
+    }
+
+    if (generate_python) {
+      args += [
+        "--py-out-dir",
+        rel_py_out_dir,
+      ]
+    }
+
+    if (descriptor_set_path_ != "") {
+      args += [
+        "--descriptor-set-out",
+        rebase_path(descriptor_set_path_, root_build_dir),
+      ]
+    }
+
+    if (generate_go || generate_go_grpc) {
+      args += [
+        "--plugin",
+        rebase_path(protoc_gen_go_path, root_build_dir),
+        "--plugin-out-dir",
+        rel_go_out_dir,
+        "--plugin-options",
+        "paths=source_relative",
+      ]
+    }
+
+    if (generate_with_plugin) {
+      args += [
+        "--plugin",
+        rebase_path(plugin_path, root_build_dir),
+        "--plugin-out-dir",
+        rel_cc_out_dir,
+      ]
+      if (defined(invoker.generator_plugin_options)) {
+        args += [
+          "--plugin-options",
+          invoker.generator_plugin_options,
+        ]
+      }
+    }
+
+    if (defined(invoker.import_dirs)) {
+      foreach(path, invoker.import_dirs) {
+        args += [ "--import-dir=" + rebase_path(path, root_build_dir) ]
+      }
+    }
+
+    if ((defined(invoker.use_protobuf_full) && invoker.use_protobuf_full) ||
+        (defined(invoker.import_protobuf_full) &&
+         invoker.import_protobuf_full)) {
+      args += [ "--import-dir=" +
+                rebase_path("//third_party/protobuf/src", root_build_dir) ]
+    }
+
+    # System protoc is not used so it's necessary to build one.
+    inputs = [
+      protoc_path,
+      protoc_output_info_file,
+    ]
+    deps = [
+      protoc_label,
+      protoc_output_info_target,
+    ]
+
+    if (generate_go || generate_go_grpc) {
+      deps += [ protoc_gen_go_label ]
+      inputs += [ protoc_gen_go_path ]
+    }
+
+    if (generate_with_plugin) {
+      inputs += [ plugin_path ]
+      if (defined(invoker.generator_plugin_script_deps)) {
+        # Additional scripts for plugin.
+        inputs += invoker.generator_plugin_script_deps
+      }
+      if (defined(plugin_host_label)) {
+        # Action depends on native generator plugin but for host toolchain only.
+        deps += [ plugin_host_label ]
+      }
+    }
+
+    if (defined(invoker.deps)) {
+      # The deps may have steps that have to run before running protoc.
+      deps += invoker.deps
+    }
+  }
+
+  # Option to disable building a library in component build.
+  if (defined(invoker.component_build_force_source_set) &&
+      invoker.component_build_force_source_set && is_component_build) {
+    link_target_type = "source_set"
+  }
+
+  # Build generated protobuf stubs as static libary.
+  _static_lib_deps = []
+  if (generate_cc || generate_python || generate_with_plugin) {
+    _static_lib_name = "${target_name}_static_lib"
+    _static_lib_deps = [ ":${_static_lib_name}" ]
+    static_library(_static_lib_name) {
+      forward_variables_from(invoker,
+                             [
+                               "defines",
+                               "deps",
+                               "testonly",
+                             ])
+      visibility = []
+      visibility = [ ":*" ]
+      output_name = target_name
+      sources = []
+      foreach(source, get_target_outputs(":${action_name}")) {
+        extension = get_path_info(source, "extension")
+        if (extension == "h" || extension == "cc") {
+          sources += [ source ]
+        }
+      }
+
+      if (defined(invoker.extra_configs)) {
+        configs += invoker.extra_configs
+      }
+
+      configs += [ "//third_party/protobuf:protobuf_warnings" ]
+      public_configs = [ "//third_party/protobuf:using_proto" ]
+
+      if (!defined(deps)) {
+        deps = []
+      }
+      deps += [ ":${action_name}" ]
+
+      if (generate_cc) {
+        # If using built-in cc generator, the resulting headers reference
+        # headers within protobuf_lite. Hence, dependencies require those
+        # headers too. If using generator plugin, extra deps should be
+        # resolved by the invoker.
+        if (defined(invoker.use_protobuf_full) &&
+            invoker.use_protobuf_full == true) {
+          public_deps = [ "//third_party/protobuf:protobuf_full" ]
+        } else {
+          public_deps = [ "//third_party/protobuf:protobuf_lite" ]
+        }
+
+        # Allows generated protobufs to use #include subpaths rooted from
+        # |proto_out_dir|.
+        include_dirs = [ "${root_gen_dir}/" +
+                         rebase_path(proto_out_dir, "//") ]
+      }
+    }
+  }
+
+  group(target_name) {
+    public_deps = [ ":${action_name}" ] + _static_lib_deps
+  }
+}
diff --git a/build/secondary/third_party/protobuf/protoc_wrapper.py b/build/secondary/third_party/protobuf/protoc_wrapper.py
new file mode 100755
index 0000000000000000000000000000000000000000..8dc4a4481d70fd65ec5b9874bd7cd0b0cbddee88
--- /dev/null
+++ b/build/secondary/third_party/protobuf/protoc_wrapper.py
@@ -0,0 +1,227 @@
+#!/usr/bin/env python3.8
+# Copyright 2012 Google Inc.  All Rights Reserved.
+
+"""
+A simple wrapper for protoc.
+Script for //third_party/protobuf/proto_library.gni .
+Features:
+- Inserts #include for extra header automatically.
+- Prevents bad proto names.
+"""
+
+from __future__ import print_function
+import argparse
+import os
+import os.path
+import re
+import subprocess
+import sys
+import tempfile
+
+PROTOC_INCLUDE_POINT = "// @@protoc_insertion_point(includes)"
+
+
+def FormatGeneratorOptions(options):
+  if not options:
+    return ""
+  if options.endswith(":"):
+    return options
+  return options + ":"
+
+
+def VerifyProtoNames(protos):
+  for filename in protos:
+    if "-" in filename:
+      raise RuntimeError("Proto file names must not contain hyphens "
+                         "(see http://crbug.com/386125 for more information).")
+
+
+def StripProtoExtension(filename):
+  if not filename.endswith(".proto"):
+    raise RuntimeError("Invalid proto filename extension: "
+                       "{0} .".format(filename))
+  return filename.rsplit(".", 1)[0]
+
+
+def WriteIncludes(headers, include):
+  for filename in headers:
+    include_point_found = False
+    contents = []
+    with open(filename) as f:
+      for line in f:
+        stripped_line = line.strip()
+        contents.append(stripped_line)
+        if stripped_line == PROTOC_INCLUDE_POINT:
+          if include_point_found:
+            raise RuntimeError("Multiple include points found.")
+          include_point_found = True
+          extra_statement = "#include \"{0}\"".format(include)
+          contents.append(extra_statement)
+
+      if not include_point_found:
+        raise RuntimeError("Include point not found in header: "
+                           "{0} .".format(filename))
+
+    with open(filename, "w") as f:
+      for line in contents:
+        print(line, file=f)
+
+
+def WriteDepfile(depfile, out_list, dep_list):
+  os.makedirs(os.path.dirname(depfile), exist_ok=True)
+  with open(depfile, 'w') as f:
+    print("{0}: {1}".format(" ".join(out_list), " ".join(dep_list)), file=f)
+
+
+def WritePluginDepfile(depfile, outputs, dependencies):
+  with open(outputs) as f:
+    outs = [line.strip() for line in f]
+  with open(dependencies) as f:
+    deps = [line.strip() for line in f]
+  WriteDepfile(depfile, outs, deps)
+
+
+def WriteProtocDepfile(depfile, outputs, deps_list):
+  with open(outputs) as f:
+    outs = [line.strip() for line in f]
+  WriteDepfile(depfile, outs, deps_list)
+
+
+def ExtractImports(proto, proto_dir, import_dirs):
+  filename = os.path.join(proto_dir, proto)
+  imports = set()
+
+  with open(filename) as f:
+    # Search the file for import.
+    for line in f:
+      match = re.match(r'^\s*import(?:\s+public)?\s+"([^"]+)"\s*;\s*$', line)
+      if match:
+        imported = match[1]
+
+        # Check import directories to find the imported file.
+        for candidate_dir in [proto_dir] + import_dirs:
+          candidate_path = os.path.join(candidate_dir, imported)
+          if os.path.exists(candidate_path):
+            imports.add(candidate_path)
+            # Transitively check imports.
+            imports.update(ExtractImports(imported, candidate_dir, import_dirs))
+            break
+
+  return imports
+
+
+def main(argv):
+  parser = argparse.ArgumentParser()
+  parser.add_argument("--protoc",
+                      help="Relative path to compiler.")
+
+  parser.add_argument("--proto-in-dir",
+                      help="Base directory with source protos.")
+  parser.add_argument("--cc-out-dir",
+                      help="Output directory for standard C++ generator.")
+  parser.add_argument("--py-out-dir",
+                      help="Output directory for standard Python generator.")
+  parser.add_argument("--plugin-out-dir",
+                      help="Output directory for custom generator plugin.")
+
+  parser.add_argument("--depfile",
+                      help="Output location for the protoc depfile.")
+  parser.add_argument("--depfile-outputs",
+                      help="File containing a list of files to be generated.")
+
+  parser.add_argument("--plugin",
+                      help="Relative path to custom generator plugin.")
+  parser.add_argument("--plugin-depfile",
+                      help="Output location for the plugin depfile.")
+  parser.add_argument("--plugin-depfile-deps",
+                      help="File containing plugin deps not set as other input.")
+  parser.add_argument("--plugin-depfile-outputs",
+                      help="File containing a list of files that will be generated.")
+  parser.add_argument("--plugin-options",
+                      help="Custom generator plugin options.")
+  parser.add_argument("--cc-options",
+                      help="Standard C++ generator options.")
+  parser.add_argument("--include",
+                      help="Name of include to insert into generated headers.")
+  parser.add_argument("--import-dir", action="append", default=[],
+                      help="Extra import directory for protos, can be repeated."
+  )
+  parser.add_argument("--descriptor-set-out",
+                      help="Passed through to protoc as --descriptor_set_out")
+
+  parser.add_argument("protos", nargs="+",
+                      help="Input protobuf definition file(s).")
+
+  options = parser.parse_args()
+
+  proto_dir = os.path.relpath(options.proto_in_dir)
+  protoc_cmd = [os.path.realpath(options.protoc)]
+
+  protos = options.protos
+  headers = []
+  VerifyProtoNames(protos)
+
+  if options.descriptor_set_out:
+    protoc_cmd += ["--descriptor_set_out", options.descriptor_set_out]
+
+  if options.py_out_dir:
+    protoc_cmd += ["--python_out", options.py_out_dir]
+
+  if options.cc_out_dir:
+    cc_out_dir = options.cc_out_dir
+    cc_options = FormatGeneratorOptions(options.cc_options)
+    protoc_cmd += ["--cpp_out", cc_options + cc_out_dir]
+    for filename in protos:
+      stripped_name = StripProtoExtension(filename)
+      headers.append(os.path.join(cc_out_dir, stripped_name + ".pb.h"))
+
+  if options.plugin_out_dir:
+    plugin_options = FormatGeneratorOptions(options.plugin_options)
+    protoc_cmd += [
+      "--plugin", "protoc-gen-plugin=" + os.path.relpath(options.plugin),
+      "--plugin_out", plugin_options + options.plugin_out_dir
+    ]
+
+  if options.plugin_depfile:
+    if not options.plugin_depfile_deps or not options.plugin_depfile_outputs:
+      raise RuntimeError("If plugin depfile is supplied, then the plugin "
+                         "depfile deps and outputs must be set.")
+    depfile = options.plugin_depfile
+    dep_info = options.plugin_depfile_deps
+    outputs = options.plugin_depfile_outputs
+    WritePluginDepfile(depfile, outputs, dep_info)
+
+  if options.depfile:
+    if not options.depfile_outputs:
+      raise RuntimeError("If depfile is supplied, depfile outputs must also"
+                         "be supplied.")
+
+    depfile = options.depfile
+    outputs = options.depfile_outputs
+    deps = set()
+
+    for proto in protos:
+      deps.update(ExtractImports(proto, proto_dir, options.import_dir))
+    WriteProtocDepfile(depfile, outputs, deps)
+
+  protoc_cmd += ["--proto_path", proto_dir]
+  for path in options.import_dir:
+    protoc_cmd += ["--proto_path", path]
+
+  protoc_cmd += [os.path.join(proto_dir, name) for name in protos]
+
+  ret = subprocess.call(protoc_cmd)
+  if ret != 0:
+    raise RuntimeError("Protoc has returned non-zero status: "
+                       "{0} .".format(ret))
+
+  if options.include:
+    WriteIncludes(headers, options.include)
+
+
+if __name__ == "__main__":
+  try:
+    main(sys.argv)
+  except RuntimeError as e:
+    print(e, file=sys.stderr)
+    sys.exit(1)
diff --git a/build/secondary/third_party/shaderc_flutter/BUILD.gn b/build/secondary/third_party/shaderc_flutter/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..aa448301d2e795561c25168b3ac02f0870636d26
--- /dev/null
+++ b/build/secondary/third_party/shaderc_flutter/BUILD.gn
@@ -0,0 +1,83 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+shaderc_base = "//flutter/third_party/shaderc"
+
+config("shaderc_util_config") {
+  include_dirs = [ "$shaderc_base/libshaderc_util/include/" ]
+}
+
+source_set("shaderc_util_flutter") {
+  public_configs = [ ":shaderc_util_config" ]
+
+  configs +=
+      [ "//flutter/third_party/vulkan-deps/spirv-tools/src:spvtools_public_config" ]
+
+  public_deps = [
+    "//flutter/third_party/vulkan-deps/glslang/src:glslang_sources",
+    "//flutter/third_party/vulkan-deps/spirv-tools/src:spvtools",
+  ]
+
+  defines = [ "ENABLE_HLSL=1" ]
+
+  if (is_clang) {
+    cflags_cc = [
+      "-Wno-deprecated-copy",
+      "-Wno-unknown-warning-option",
+    ]
+  }
+
+  sources = [
+    "$shaderc_base/libshaderc_util/include/libshaderc_util/counting_includer.h",
+    "$shaderc_base/libshaderc_util/include/libshaderc_util/exceptions.h",
+    "$shaderc_base/libshaderc_util/include/libshaderc_util/file_finder.h",
+    "$shaderc_base/libshaderc_util/include/libshaderc_util/format.h",
+    "$shaderc_base/libshaderc_util/include/libshaderc_util/io_shaderc.h",
+    "$shaderc_base/libshaderc_util/include/libshaderc_util/message.h",
+    "$shaderc_base/libshaderc_util/include/libshaderc_util/mutex.h",
+    "$shaderc_base/libshaderc_util/include/libshaderc_util/resources.h",
+    "$shaderc_base/libshaderc_util/include/libshaderc_util/spirv_tools_wrapper.h",
+    "$shaderc_base/libshaderc_util/include/libshaderc_util/string_piece.h",
+    "$shaderc_base/libshaderc_util/include/libshaderc_util/universal_unistd.h",
+    "$shaderc_base/libshaderc_util/include/libshaderc_util/version_profile.h",
+    "$shaderc_base/libshaderc_util/src/compiler.cc",
+    "$shaderc_base/libshaderc_util/src/file_finder.cc",
+    "$shaderc_base/libshaderc_util/src/io_shaderc.cc",
+    "$shaderc_base/libshaderc_util/src/message.cc",
+    "$shaderc_base/libshaderc_util/src/resources.cc",
+    "$shaderc_base/libshaderc_util/src/shader_stage.cc",
+    "$shaderc_base/libshaderc_util/src/spirv_tools_wrapper.cc",
+    "$shaderc_base/libshaderc_util/src/version_profile.cc",
+  ]
+}
+
+config("shaderc_config") {
+  include_dirs = [ "$shaderc_base/libshaderc/include/" ]
+}
+
+source_set("shaderc_flutter") {
+  defines = [ "SHADERC_IMPLEMENTATION" ]
+
+  public_configs = [ ":shaderc_config" ]
+
+  configs +=
+      [ "//flutter/third_party/vulkan-deps/spirv-tools/src:spvtools_public_config" ]
+
+  deps = [ ":shaderc_util_flutter" ]
+
+  public_deps = [
+    "//flutter/third_party/vulkan-deps/glslang/src:glslang_sources",
+    "//flutter/third_party/vulkan-deps/spirv-tools/src:spvtools",
+  ]
+
+  sources = [
+    "$shaderc_base/libshaderc/include/shaderc/env.h",
+    "$shaderc_base/libshaderc/include/shaderc/shaderc.h",
+    "$shaderc_base/libshaderc/include/shaderc/shaderc.hpp",
+    "$shaderc_base/libshaderc/include/shaderc/status.h",
+    "$shaderc_base/libshaderc/include/shaderc/visibility.h",
+    "$shaderc_base/libshaderc/src/shaderc.cc",
+    "$shaderc_base/libshaderc/src/shaderc_private.h",
+  ]
+}
diff --git a/build/secondary/third_party/spirv_cross_flutter/BUILD.gn b/build/secondary/third_party/spirv_cross_flutter/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..47427d21a0b2fb2dde5716333820b50c1dc2267c
--- /dev/null
+++ b/build/secondary/third_party/spirv_cross_flutter/BUILD.gn
@@ -0,0 +1,41 @@
+# Copyright 2016 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_root = "//flutter/third_party/vulkan-deps/spirv-cross/src"
+
+config("spirv_cross_public") {
+  include_dirs = [ source_root ]
+
+  defines = [ "SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS" ]
+}
+
+source_set("spirv_cross_flutter") {
+  public_configs = [ ":spirv_cross_public" ]
+
+  sources = [
+    "$source_root/GLSL.std.450.h",
+    "$source_root/spirv.hpp",
+    "$source_root/spirv_cfg.cpp",
+    "$source_root/spirv_cfg.hpp",
+    "$source_root/spirv_common.hpp",
+    "$source_root/spirv_cross.cpp",
+    "$source_root/spirv_cross.hpp",
+    "$source_root/spirv_cross_containers.hpp",
+    "$source_root/spirv_cross_error_handling.hpp",
+    "$source_root/spirv_cross_parsed_ir.cpp",
+    "$source_root/spirv_cross_parsed_ir.hpp",
+    "$source_root/spirv_cross_util.cpp",
+    "$source_root/spirv_cross_util.hpp",
+    "$source_root/spirv_glsl.cpp",
+    "$source_root/spirv_glsl.hpp",
+    "$source_root/spirv_hlsl.cpp",
+    "$source_root/spirv_hlsl.hpp",
+    "$source_root/spirv_msl.cpp",
+    "$source_root/spirv_msl.hpp",
+    "$source_root/spirv_parser.cpp",
+    "$source_root/spirv_parser.hpp",
+    "$source_root/spirv_reflect.cpp",
+    "$source_root/spirv_reflect.hpp",
+  ]
+}
diff --git a/build/secondary/third_party/vulkan_validation_layers/BUILD.gn b/build/secondary/third_party/vulkan_validation_layers/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..56d3ffaff84acd7a5f851abf71404f3bad2b86d6
--- /dev/null
+++ b/build/secondary/third_party/vulkan_validation_layers/BUILD.gn
@@ -0,0 +1,536 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build_overrides/vulkan_validation_layers.gni")
+
+_checkout_dir = "//flutter/third_party/vulkan-deps/vulkan-validation-layers/src"
+
+vulkan_undefine_configs = []
+if (is_win) {
+  vulkan_undefine_configs += [ "//build/config/win:unicode" ]
+}
+
+vulkan_gen_dir = "$target_gen_dir/$vulkan_gen_subdir"
+raw_vulkan_gen_dir = rebase_path(vulkan_gen_dir, root_build_dir)
+
+vulkan_data_dir = "$root_out_dir/$vulkan_data_subdir"
+raw_vulkan_data_dir = rebase_path(vulkan_data_dir, root_build_dir)
+
+raw_root_out_dir = rebase_path(root_out_dir, root_build_dir)
+
+# This special action is needed to remove old VVL objects that are now renamed.
+action("vulkan_clean_old_validation_layer_objects") {
+  script = "$_checkout_dir/scripts/gn/remove_files.py"
+
+  # inputs is a (random) new file since the vvl roll, used to ensure the cleanup is done only once
+  inputs = [ "$_checkout_dir/layers/gpu_validation/gpu_validation.cpp" ]
+  outputs = [ "$vulkan_gen_dir/old_vvl_files_are_removed" ]
+  args = [
+    "$raw_vulkan_gen_dir/old_vvl_files_are_removed",
+    "$raw_root_out_dir/libVkLayer*",
+    "$raw_root_out_dir/VkLayer*",
+    "$raw_vulkan_data_dir/VkLayer*.json",
+  ]
+}
+
+config("generated_layers_config") {
+  if (is_clang) {
+    cflags = [
+      "-Wno-conversion",
+      "-Wno-deprecated-copy",
+      "-Wno-extra-semi",
+      "-Wno-implicit-fallthrough",
+      "-Wno-missing-field-initializers",
+      "-Wno-newline-eof",
+      "-Wno-sign-compare",
+      "-Wno-unused-const-variable",
+    ]
+  }
+}
+
+config("vulkan_internal_config") {
+  defines = [ "VK_ENABLE_BETA_EXTENSIONS" ]
+
+  cflags = []
+  if (is_clang || !is_win) {
+    cflags += [ "-Wno-unused-function" ]
+  }
+  if (is_clang && is_mac) {
+    cflags += [ "-Wno-unguarded-availability-new" ]
+  }
+
+  # Suppress warnings the vulkan code doesn't comply with.
+  if (is_fuchsia) {
+    configs = [ "//build/config:Wno-unused-but-set-variable" ]
+  }
+  if (is_clang) {
+    cflags += [ "-Wno-extra-semi" ]
+  }
+}
+
+# The validation layers
+# ---------------------
+
+config("vulkan_layer_config") {
+  include_dirs = [
+    "$_checkout_dir/layers",
+    "$_checkout_dir/layers/external",
+    "$_checkout_dir/layers/vulkan",
+  ]
+  if (is_clang) {
+    cflags = [ "-Wno-extra-semi" ]
+  }
+}
+
+vvl_sources = [
+  "$_checkout_dir/layers/best_practices/best_practices_error_enums.h",
+  "$_checkout_dir/layers/best_practices/best_practices_utils.cpp",
+  "$_checkout_dir/layers/best_practices/best_practices_validation.h",
+  "$_checkout_dir/layers/best_practices/bp_buffer.cpp",
+  "$_checkout_dir/layers/best_practices/bp_cmd_buffer.cpp",
+  "$_checkout_dir/layers/best_practices/bp_cmd_buffer_nv.cpp",
+  "$_checkout_dir/layers/best_practices/bp_copy_blit_resolve.cpp",
+  "$_checkout_dir/layers/best_practices/bp_descriptor.cpp",
+  "$_checkout_dir/layers/best_practices/bp_device_memory.cpp",
+  "$_checkout_dir/layers/best_practices/bp_drawdispatch.cpp",
+  "$_checkout_dir/layers/best_practices/bp_framebuffer.cpp",
+  "$_checkout_dir/layers/best_practices/bp_image.cpp",
+  "$_checkout_dir/layers/best_practices/bp_instance_device.cpp",
+  "$_checkout_dir/layers/best_practices/bp_pipeline.cpp",
+  "$_checkout_dir/layers/best_practices/bp_ray_tracing.cpp",
+  "$_checkout_dir/layers/best_practices/bp_render_pass.cpp",
+  "$_checkout_dir/layers/best_practices/bp_synchronization.cpp",
+  "$_checkout_dir/layers/best_practices/bp_video.cpp",
+  "$_checkout_dir/layers/best_practices/bp_wsi.cpp",
+  "$_checkout_dir/layers/containers/qfo_transfer.h",
+  "$_checkout_dir/layers/containers/range_vector.h",
+  "$_checkout_dir/layers/containers/subresource_adapter.cpp",
+  "$_checkout_dir/layers/containers/subresource_adapter.h",
+  "$_checkout_dir/layers/core_checks/cc_android.cpp",
+  "$_checkout_dir/layers/core_checks/cc_buffer.cpp",
+  "$_checkout_dir/layers/core_checks/cc_buffer_address.h",
+  "$_checkout_dir/layers/core_checks/cc_cmd_buffer.cpp",
+  "$_checkout_dir/layers/core_checks/cc_cmd_buffer_dynamic.cpp",
+  "$_checkout_dir/layers/core_checks/cc_copy_blit_resolve.cpp",
+  "$_checkout_dir/layers/core_checks/cc_descriptor.cpp",
+  "$_checkout_dir/layers/core_checks/cc_device.cpp",
+  "$_checkout_dir/layers/core_checks/cc_device_memory.cpp",
+  "$_checkout_dir/layers/core_checks/cc_drawdispatch.cpp",
+  "$_checkout_dir/layers/core_checks/cc_external_object.cpp",
+  "$_checkout_dir/layers/core_checks/cc_image.cpp",
+  "$_checkout_dir/layers/core_checks/cc_image_layout.cpp",
+  "$_checkout_dir/layers/core_checks/cc_pipeline.cpp",
+  "$_checkout_dir/layers/core_checks/cc_pipeline_compute.cpp",
+  "$_checkout_dir/layers/core_checks/cc_pipeline_graphics.cpp",
+  "$_checkout_dir/layers/core_checks/cc_pipeline_ray_tracing.cpp",
+  "$_checkout_dir/layers/core_checks/cc_query.cpp",
+  "$_checkout_dir/layers/core_checks/cc_queue.cpp",
+  "$_checkout_dir/layers/core_checks/cc_ray_tracing.cpp",
+  "$_checkout_dir/layers/core_checks/cc_render_pass.cpp",
+  "$_checkout_dir/layers/core_checks/cc_shader_interface.cpp",
+  "$_checkout_dir/layers/core_checks/cc_shader_object.cpp",
+  "$_checkout_dir/layers/core_checks/cc_spirv.cpp",
+  "$_checkout_dir/layers/core_checks/cc_synchronization.cpp",
+  "$_checkout_dir/layers/core_checks/cc_video.cpp",
+  "$_checkout_dir/layers/core_checks/cc_wsi.cpp",
+  "$_checkout_dir/layers/core_checks/cc_ycbcr.cpp",
+  "$_checkout_dir/layers/core_checks/core_validation.h",
+  "$_checkout_dir/layers/drawdispatch/descriptor_validator.cpp",
+  "$_checkout_dir/layers/drawdispatch/descriptor_validator.h",
+  "$_checkout_dir/layers/drawdispatch/drawdispatch_vuids.cpp",
+  "$_checkout_dir/layers/drawdispatch/drawdispatch_vuids.h",
+  "$_checkout_dir/layers/external/vma/vk_mem_alloc.h",
+  "$_checkout_dir/layers/external/vma/vma.cpp",
+  "$_checkout_dir/layers/external/vma/vma.h",
+  "$_checkout_dir/layers/gpu_shaders/gpu_shaders_constants.h",
+  "$_checkout_dir/layers/gpu_validation/debug_printf.cpp",
+  "$_checkout_dir/layers/gpu_validation/debug_printf.h",
+  "$_checkout_dir/layers/gpu_validation/gpu_descriptor_set.cpp",
+  "$_checkout_dir/layers/gpu_validation/gpu_descriptor_set.h",
+  "$_checkout_dir/layers/gpu_validation/gpu_error_message.cpp",
+  "$_checkout_dir/layers/gpu_validation/gpu_error_message.h",
+  "$_checkout_dir/layers/gpu_validation/gpu_image_layout.cpp",
+  "$_checkout_dir/layers/gpu_validation/gpu_record.cpp",
+  "$_checkout_dir/layers/gpu_validation/gpu_settings.h",
+  "$_checkout_dir/layers/gpu_validation/gpu_settings.h",
+  "$_checkout_dir/layers/gpu_validation/gpu_setup.cpp",
+  "$_checkout_dir/layers/gpu_validation/gpu_state_tracker.cpp",
+  "$_checkout_dir/layers/gpu_validation/gpu_state_tracker.h",
+  "$_checkout_dir/layers/gpu_validation/gpu_subclasses.cpp",
+  "$_checkout_dir/layers/gpu_validation/gpu_subclasses.h",
+  "$_checkout_dir/layers/gpu_validation/gpu_validation.cpp",
+  "$_checkout_dir/layers/gpu_validation/gpu_validation.h",
+  "$_checkout_dir/layers/gpu_validation/gpu_vuids.cpp",
+  "$_checkout_dir/layers/gpu_validation/gpu_vuids.h",
+  "$_checkout_dir/layers/gpu_validation/spirv/bindless_descriptor_pass.cpp",
+  "$_checkout_dir/layers/gpu_validation/spirv/bindless_descriptor_pass.h",
+  "$_checkout_dir/layers/gpu_validation/spirv/buffer_device_address_pass.cpp",
+  "$_checkout_dir/layers/gpu_validation/spirv/buffer_device_address_pass.h",
+  "$_checkout_dir/layers/gpu_validation/spirv/function_basic_block.cpp",
+  "$_checkout_dir/layers/gpu_validation/spirv/function_basic_block.h",
+  "$_checkout_dir/layers/gpu_validation/spirv/instruction.cpp",
+  "$_checkout_dir/layers/gpu_validation/spirv/instruction.h",
+  "$_checkout_dir/layers/gpu_validation/spirv/link.h",
+  "$_checkout_dir/layers/gpu_validation/spirv/module.cpp",
+  "$_checkout_dir/layers/gpu_validation/spirv/module.h",
+  "$_checkout_dir/layers/gpu_validation/spirv/pass.cpp",
+  "$_checkout_dir/layers/gpu_validation/spirv/pass.h",
+  "$_checkout_dir/layers/gpu_validation/spirv/type_manager.cpp",
+  "$_checkout_dir/layers/gpu_validation/spirv/type_manager.h",
+  "$_checkout_dir/layers/layer_chassis_dispatch_manual.cpp",
+  "$_checkout_dir/layers/layer_options.cpp",
+  "$_checkout_dir/layers/layer_options.h",
+  "$_checkout_dir/layers/object_tracker/object_lifetime_validation.h",
+  "$_checkout_dir/layers/object_tracker/object_tracker_utils.cpp",
+  "$_checkout_dir/layers/state_tracker/buffer_state.cpp",
+  "$_checkout_dir/layers/state_tracker/buffer_state.h",
+  "$_checkout_dir/layers/state_tracker/cmd_buffer_state.cpp",
+  "$_checkout_dir/layers/state_tracker/cmd_buffer_state.h",
+  "$_checkout_dir/layers/state_tracker/descriptor_sets.cpp",
+  "$_checkout_dir/layers/state_tracker/descriptor_sets.h",
+  "$_checkout_dir/layers/state_tracker/device_memory_state.cpp",
+  "$_checkout_dir/layers/state_tracker/device_memory_state.h",
+  "$_checkout_dir/layers/state_tracker/device_state.h",
+  "$_checkout_dir/layers/state_tracker/fence_state.cpp",
+  "$_checkout_dir/layers/state_tracker/fence_state.h",
+  "$_checkout_dir/layers/state_tracker/image_layout_map.cpp",
+  "$_checkout_dir/layers/state_tracker/image_layout_map.h",
+  "$_checkout_dir/layers/state_tracker/image_state.cpp",
+  "$_checkout_dir/layers/state_tracker/image_state.h",
+  "$_checkout_dir/layers/state_tracker/pipeline_layout_state.cpp",
+  "$_checkout_dir/layers/state_tracker/pipeline_layout_state.h",
+  "$_checkout_dir/layers/state_tracker/pipeline_state.cpp",
+  "$_checkout_dir/layers/state_tracker/pipeline_state.h",
+  "$_checkout_dir/layers/state_tracker/pipeline_sub_state.cpp",
+  "$_checkout_dir/layers/state_tracker/pipeline_sub_state.h",
+  "$_checkout_dir/layers/state_tracker/query_state.h",
+  "$_checkout_dir/layers/state_tracker/queue_state.cpp",
+  "$_checkout_dir/layers/state_tracker/queue_state.h",
+  "$_checkout_dir/layers/state_tracker/ray_tracing_state.h",
+  "$_checkout_dir/layers/state_tracker/render_pass_state.cpp",
+  "$_checkout_dir/layers/state_tracker/render_pass_state.h",
+  "$_checkout_dir/layers/state_tracker/sampler_state.h",
+  "$_checkout_dir/layers/state_tracker/semaphore_state.cpp",
+  "$_checkout_dir/layers/state_tracker/semaphore_state.h",
+  "$_checkout_dir/layers/state_tracker/shader_instruction.cpp",
+  "$_checkout_dir/layers/state_tracker/shader_instruction.h",
+  "$_checkout_dir/layers/state_tracker/shader_module.cpp",
+  "$_checkout_dir/layers/state_tracker/shader_module.h",
+  "$_checkout_dir/layers/state_tracker/shader_object_state.cpp",
+  "$_checkout_dir/layers/state_tracker/shader_object_state.h",
+  "$_checkout_dir/layers/state_tracker/state_object.cpp",
+  "$_checkout_dir/layers/state_tracker/state_object.h",
+  "$_checkout_dir/layers/state_tracker/state_tracker.cpp",
+  "$_checkout_dir/layers/state_tracker/state_tracker.h",
+  "$_checkout_dir/layers/state_tracker/video_session_state.cpp",
+  "$_checkout_dir/layers/state_tracker/video_session_state.h",
+  "$_checkout_dir/layers/stateless/sl_buffer.cpp",
+  "$_checkout_dir/layers/stateless/sl_cmd_buffer.cpp",
+  "$_checkout_dir/layers/stateless/sl_cmd_buffer_dynamic.cpp",
+  "$_checkout_dir/layers/stateless/sl_descriptor.cpp",
+  "$_checkout_dir/layers/stateless/sl_device_memory.cpp",
+  "$_checkout_dir/layers/stateless/sl_external_object.cpp",
+  "$_checkout_dir/layers/stateless/sl_framebuffer.cpp",
+  "$_checkout_dir/layers/stateless/sl_image.cpp",
+  "$_checkout_dir/layers/stateless/sl_instance_device.cpp",
+  "$_checkout_dir/layers/stateless/sl_pipeline.cpp",
+  "$_checkout_dir/layers/stateless/sl_ray_tracing.cpp",
+  "$_checkout_dir/layers/stateless/sl_render_pass.cpp",
+  "$_checkout_dir/layers/stateless/sl_shader_object.cpp",
+  "$_checkout_dir/layers/stateless/sl_synchronization.cpp",
+  "$_checkout_dir/layers/stateless/sl_utils.cpp",
+  "$_checkout_dir/layers/stateless/sl_wsi.cpp",
+  "$_checkout_dir/layers/stateless/stateless_validation.h",
+  "$_checkout_dir/layers/sync/sync_access_context.cpp",
+  "$_checkout_dir/layers/sync/sync_access_context.h",
+  "$_checkout_dir/layers/sync/sync_access_state.cpp",
+  "$_checkout_dir/layers/sync/sync_access_state.h",
+  "$_checkout_dir/layers/sync/sync_commandbuffer.cpp",
+  "$_checkout_dir/layers/sync/sync_commandbuffer.h",
+  "$_checkout_dir/layers/sync/sync_common.cpp",
+  "$_checkout_dir/layers/sync/sync_common.h",
+  "$_checkout_dir/layers/sync/sync_op.cpp",
+  "$_checkout_dir/layers/sync/sync_op.h",
+  "$_checkout_dir/layers/sync/sync_renderpass.cpp",
+  "$_checkout_dir/layers/sync/sync_renderpass.h",
+  "$_checkout_dir/layers/sync/sync_submit.cpp",
+  "$_checkout_dir/layers/sync/sync_submit.h",
+  "$_checkout_dir/layers/sync/sync_utils.cpp",
+  "$_checkout_dir/layers/sync/sync_utils.h",
+  "$_checkout_dir/layers/sync/sync_validation.cpp",
+  "$_checkout_dir/layers/sync/sync_validation.h",
+  "$_checkout_dir/layers/sync/sync_vuid_maps.cpp",
+  "$_checkout_dir/layers/sync/sync_vuid_maps.h",
+  "$_checkout_dir/layers/thread_tracker/thread_safety_validation.cpp",
+  "$_checkout_dir/layers/thread_tracker/thread_safety_validation.h",
+  "$_checkout_dir/layers/utils/android_ndk_types.h",
+  "$_checkout_dir/layers/utils/convert_utils.cpp",
+  "$_checkout_dir/layers/utils/convert_utils.h",
+  "$_checkout_dir/layers/utils/image_layout_utils.cpp",
+  "$_checkout_dir/layers/utils/image_layout_utils.h",
+  "$_checkout_dir/layers/utils/shader_utils.cpp",
+  "$_checkout_dir/layers/utils/shader_utils.h",
+  "$_checkout_dir/layers/vulkan/generated/best_practices.cpp",
+  "$_checkout_dir/layers/vulkan/generated/best_practices.h",
+  "$_checkout_dir/layers/vulkan/generated/chassis.cpp",
+  "$_checkout_dir/layers/vulkan/generated/chassis.h",
+  "$_checkout_dir/layers/vulkan/generated/chassis_dispatch_helper.h",
+  "$_checkout_dir/layers/vulkan/generated/command_validation.cpp",
+  "$_checkout_dir/layers/vulkan/generated/dynamic_state_helper.cpp",
+  "$_checkout_dir/layers/vulkan/generated/dynamic_state_helper.h",
+  "$_checkout_dir/layers/vulkan/generated/enum_flag_bits.h",
+  "$_checkout_dir/layers/vulkan/generated/gpu_as_inspection_comp.h",
+  "$_checkout_dir/layers/vulkan/generated/gpu_inst_shader_hash.h",
+  "$_checkout_dir/layers/vulkan/generated/gpu_pre_copy_buffer_to_image_comp.h",
+  "$_checkout_dir/layers/vulkan/generated/gpu_pre_dispatch_comp.h",
+  "$_checkout_dir/layers/vulkan/generated/gpu_pre_draw_vert.h",
+  "$_checkout_dir/layers/vulkan/generated/gpu_pre_trace_rays_rgen.h",
+  "$_checkout_dir/layers/vulkan/generated/inst_bindless_descriptor_comp.h",
+  "$_checkout_dir/layers/vulkan/generated/inst_buffer_device_address_comp.h",
+  "$_checkout_dir/layers/vulkan/generated/layer_chassis_dispatch.cpp",
+  "$_checkout_dir/layers/vulkan/generated/layer_chassis_dispatch.h",
+  "$_checkout_dir/layers/vulkan/generated/object_tracker.cpp",
+  "$_checkout_dir/layers/vulkan/generated/object_tracker.h",
+  "$_checkout_dir/layers/vulkan/generated/spirv_grammar_helper.cpp",
+  "$_checkout_dir/layers/vulkan/generated/spirv_grammar_helper.h",
+  "$_checkout_dir/layers/vulkan/generated/spirv_tools_commit_id.h",
+  "$_checkout_dir/layers/vulkan/generated/spirv_validation_helper.cpp",
+  "$_checkout_dir/layers/vulkan/generated/state_tracker_helper.cpp",
+  "$_checkout_dir/layers/vulkan/generated/state_tracker_helper.h",
+  "$_checkout_dir/layers/vulkan/generated/stateless_validation_helper.cpp",
+  "$_checkout_dir/layers/vulkan/generated/stateless_validation_helper.h",
+  "$_checkout_dir/layers/vulkan/generated/sync_validation_types.cpp",
+  "$_checkout_dir/layers/vulkan/generated/sync_validation_types.h",
+  "$_checkout_dir/layers/vulkan/generated/thread_safety.cpp",
+  "$_checkout_dir/layers/vulkan/generated/thread_safety_commands.h",
+  "$_checkout_dir/layers/vulkan/generated/thread_safety_counter_bodies.h",
+  "$_checkout_dir/layers/vulkan/generated/thread_safety_counter_definitions.h",
+  "$_checkout_dir/layers/vulkan/generated/thread_safety_counter_instances.h",
+  "$_checkout_dir/layers/vulkan/generated/valid_enum_values.cpp",
+  "$_checkout_dir/layers/vulkan/generated/valid_enum_values.h",
+  "$_checkout_dir/layers/vulkan/generated/valid_flag_values.cpp",
+  "$_checkout_dir/layers/vulkan/generated/vk_api_version.h",
+  "$_checkout_dir/layers/vulkan/generated/vk_dispatch_table_helper.cpp",
+  "$_checkout_dir/layers/vulkan/generated/vk_dispatch_table_helper.h",
+  "$_checkout_dir/layers/vulkan/generated/vk_extension_helper.cpp",
+  "$_checkout_dir/layers/vulkan/generated/vk_extension_helper.h",
+  "$_checkout_dir/layers/vulkan/generated/vk_safe_struct_core.cpp",
+  "$_checkout_dir/layers/vulkan/generated/vk_safe_struct_ext.cpp",
+  "$_checkout_dir/layers/vulkan/generated/vk_safe_struct_khr.cpp",
+  "$_checkout_dir/layers/vulkan/generated/vk_safe_struct_utils.cpp",
+  "$_checkout_dir/layers/vulkan/generated/vk_safe_struct_vendor.cpp",
+  "$vulkan_headers_dir/include/vulkan/vk_layer.h",
+  "$vulkan_headers_dir/include/vulkan/vulkan.h",
+]
+
+layers = [ [
+      "khronos_validation",
+      vvl_sources,
+      [ ":vulkan_core_validation_glslang" ],
+      [],
+    ] ]
+
+if (!is_android) {
+  action("vulkan_gen_json_files") {
+    script = "$_checkout_dir/scripts/gn/generate_vulkan_layers_json.py"
+
+    deps = [ "$vulkan_headers_dir:vulkan_headers" ]
+    if (!is_fuchsia) {
+      # Make sure that the cleanup of old layer JSON files happens before the new ones are generated.
+      deps += [ ":vulkan_clean_old_validation_layer_objects" ]
+    }
+
+    sources = [ "$_checkout_dir/layers/VkLayer_khronos_validation.json.in" ]
+    outputs = [ "$vulkan_data_dir/VkLayer_khronos_validation.json" ]
+
+    if (is_linux) {
+      _platform = "Linux"
+    } else if (is_win) {
+      _platform = "Windows"
+    } else if (is_mac) {
+      _platform = "Darwin"
+    } else if (is_fuchsia) {
+      _platform = "Fuchsia"
+    } else {
+      _platform = "Other"
+    }
+
+    args = [
+             "--platform",
+             _platform,
+             rebase_path("$_checkout_dir/layers/", root_build_dir),
+             rebase_path(vulkan_data_dir, root_build_dir),
+           ] + rebase_path(sources, root_build_dir)
+    if (is_fuchsia) {
+      args += [ "--no-path-prefix" ]
+    }
+
+    # The layer JSON files are part of the necessary data deps.
+    data = outputs
+  }
+}
+
+config("vulkan_memory_allocator_config") {
+  if (is_clang) {
+    cflags_cc = [ "-Wno-nullability-completeness" ]
+  }
+}
+
+source_set("vulkan_layer_utils") {
+  include_dirs = [
+    "$_checkout_dir/layers",
+    "$_checkout_dir/layers/external",
+    "$_checkout_dir/layers/vulkan",
+  ]
+  sources = [
+    "$_checkout_dir/layers/containers/custom_containers.h",
+    "$_checkout_dir/layers/containers/sparse_containers.h",
+    "$_checkout_dir/layers/error_message/error_location.cpp",
+    "$_checkout_dir/layers/error_message/error_location.h",
+    "$_checkout_dir/layers/error_message/logging.cpp",
+    "$_checkout_dir/layers/error_message/logging.h",
+    "$_checkout_dir/layers/error_message/record_object.h",
+    "$_checkout_dir/layers/external/xxhash.h",
+    "$_checkout_dir/layers/utils/android_ndk_types.h",
+    "$_checkout_dir/layers/utils/cast_utils.h",
+    "$_checkout_dir/layers/utils/hash_util.cpp",
+    "$_checkout_dir/layers/utils/hash_util.h",
+    "$_checkout_dir/layers/utils/hash_vk_types.h",
+    "$_checkout_dir/layers/utils/ray_tracing_utils.cpp",
+    "$_checkout_dir/layers/utils/ray_tracing_utils.h",
+    "$_checkout_dir/layers/utils/vk_layer_extension_utils.cpp",
+    "$_checkout_dir/layers/utils/vk_layer_extension_utils.h",
+    "$_checkout_dir/layers/utils/vk_layer_utils.cpp",
+    "$_checkout_dir/layers/utils/vk_layer_utils.h",
+    "$_checkout_dir/layers/vk_layer_config.cpp",
+    "$_checkout_dir/layers/vk_layer_config.h",
+    "$_checkout_dir/layers/vulkan/generated/error_location_helper.cpp",
+    "$_checkout_dir/layers/vulkan/generated/error_location_helper.h",
+    "$_checkout_dir/layers/vulkan/generated/feature_requirements_helper.cpp",
+    "$_checkout_dir/layers/vulkan/generated/feature_requirements_helper.h",
+    "$_checkout_dir/layers/vulkan/generated/layer_chassis_dispatch.h",
+    "$_checkout_dir/layers/vulkan/generated/pnext_chain_extraction.cpp",
+    "$_checkout_dir/layers/vulkan/generated/pnext_chain_extraction.h",
+    "$_checkout_dir/layers/vulkan/generated/vk_api_version.h",
+    "$_checkout_dir/layers/vulkan/generated/vk_extension_helper.h",
+    "$_checkout_dir/layers/vulkan/generated/vk_layer_dispatch_table.h",
+    "$_checkout_dir/layers/vulkan/generated/vk_object_types.cpp",
+    "$_checkout_dir/layers/vulkan/generated/vk_object_types.h",
+    "$_checkout_dir/layers/vulkan/generated/vk_safe_struct.h",
+    "$_checkout_dir/layers/vulkan/generated/vk_validation_error_messages.h",
+    "$vulkan_headers_dir/include/vulkan/vk_layer.h",
+    "$vulkan_headers_dir/include/vulkan/vulkan.h",
+  ]
+  public_configs = [
+    ":vulkan_internal_config",
+    ":vulkan_memory_allocator_config",
+  ]
+  public_deps = [
+    "$vulkan_headers_dir:vulkan_headers",
+    "$vulkan_utility_libraries_dir:vulkan_layer_settings",
+  ]
+
+  configs -= vulkan_undefine_configs
+  if (!is_fuchsia) {
+    configs -= [ "//build/config/compiler:chromium_code" ]
+    configs += [ "//build/config/compiler:no_chromium_code" ]
+  }
+}
+
+config("vulkan_core_validation_config") {
+  include_dirs = [ "$vvl_glslang_dir" ]
+}
+
+source_set("vulkan_core_validation_glslang") {
+  public_deps = [
+    "${vvl_spirv_tools_dir}:spvtools",
+    "${vvl_spirv_tools_dir}:spvtools_link",
+    "${vvl_spirv_tools_dir}:spvtools_opt",
+    "${vvl_spirv_tools_dir}:spvtools_val",
+  ]
+  public_configs = [
+    "$vulkan_headers_dir:vulkan_headers_config",
+    ":vulkan_core_validation_config",
+  ]
+}
+
+config("vulkan_stateless_validation_config") {
+  if (is_clang) {
+    cflags_cc = [ "-Wno-unused-const-variable" ]
+  }
+}
+
+if (is_fuchsia) {
+  library_type = "loadable_module"
+} else {
+  library_type = "shared_library"
+}
+
+foreach(layer_info, layers) {
+  name = layer_info[0]
+  target(library_type, "VkLayer_$name") {
+    defines = []
+    ldflags = []
+    if (is_fuchsia) {
+      configs -= [ "//build/config:thread_safety_annotations" ]
+      ldflags += [ "-static-libstdc++" ]
+      configs += [ "//build/config:rtti" ]
+    } else {
+      configs -= [ "//build/config/compiler:chromium_code" ]
+      configs += [ "//build/config/compiler:no_chromium_code" ]
+      configs -= [ "//build/config/compiler:no_rtti" ]
+      configs += [ "//build/config/compiler:rtti" ]
+    }
+    configs -= vulkan_undefine_configs
+    configs += [ ":generated_layers_config" ]
+    public_configs = [ ":vulkan_layer_config" ]
+    deps = [
+      ":vulkan_layer_utils",
+      "$vulkan_utility_libraries_dir:vulkan_layer_settings",
+    ]
+    if (!is_fuchsia) {
+      deps += [
+        # Make sure the cleanup of old layers happen before the new ones are compiled.
+        ":vulkan_clean_old_validation_layer_objects",
+      ]
+    }
+    if (layer_info[2] != "") {
+      deps += layer_info[2]
+    }
+    sources = layer_info[1]
+    if (is_win) {
+      defines += [ "NOMINMAX" ]
+      sources += [ "$_checkout_dir/layers/VkLayer_$name.def" ]
+    }
+    if (defined(ozone_platform_x11) && ozone_platform_x11) {
+      defines += [ "VK_USE_PLATFORM_XLIB_KHR" ]
+    }
+    if (is_android) {
+      libs = [
+        "log",
+        "nativewindow",
+      ]
+      # Note: config edit removed by Flutter
+      # configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
+    }
+    defines += layer_info[3]
+  }
+}
+
+group("vulkan_validation_layers") {
+  public_deps = []
+  data_deps = []
+  foreach(layer_info, layers) {
+    name = layer_info[0]
+    if (is_fuchsia) {
+      public_deps += [ ":VkLayer_$name" ]
+    } else {
+      data_deps += [ ":VkLayer_$name" ]
+    }
+  }
+}
+
+group("tests") {
+  # TODO(fxbug.dev/13288)
+}
diff --git a/build/zip.py b/build/zip.py
index a6ce362d77f9058e3781355efae3059d0312f229..374c7ec0ef3b70cc49f73f18b22e88db9652fd35 100755
--- a/build/zip.py
+++ b/build/zip.py
@@ -25,14 +25,10 @@ def _zip_dir(path, zip_file, prefix):
     for file in files:
       if os.path.islink(os.path.join(root, file)):
         add_symlink(
-            zip_file, os.path.join(root, file),
-            os.path.join(root.replace(path, prefix), file)
+            zip_file, os.path.join(root, file), os.path.join(root.replace(path, prefix), file)
         )
         continue
-      zip_file.write(
-          os.path.join(root, file),
-          os.path.join(root.replace(path, prefix), file)
-      )
+      zip_file.write(os.path.join(root, file), os.path.join(root.replace(path, prefix), file))
 
 
 def add_symlink(zip_file, source, target):
@@ -80,12 +76,7 @@ def main(args):
 
 if __name__ == '__main__':
   parser = argparse.ArgumentParser(description='This script creates zip files.')
-  parser.add_argument(
-      '-o',
-      dest='output',
-      action='store',
-      help='The name of the output zip file.'
-  )
+  parser.add_argument('-o', dest='output', action='store', help='The name of the output zip file.')
   parser.add_argument(
       '-i',
       dest='input_pairs',
@@ -94,9 +85,6 @@ if __name__ == '__main__':
       help='The input file and its destination location in the zip archive.'
   )
   parser.add_argument(
-      '-f',
-      dest='source_file',
-      action='store',
-      help='The path to the file list to zip.'
+      '-f', dest='source_file', action='store', help='The path to the file list to zip.'
   )
   sys.exit(main(parser.parse_args()))
diff --git a/build/zip_bundle.gni b/build/zip_bundle.gni
index 034aaba76da452c79fe2c65f9458a927c8484c5f..cdc9b2d8129029d328e0f2d0f14adae2ed1afc11 100644
--- a/build/zip_bundle.gni
+++ b/build/zip_bundle.gni
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//flutter/common/config.gni")
+import("//flutter/shell/version/version.gni")
 
 if (flutter_runtime_mode == "jit_release") {
   android_zip_archive_dir = "android-$target_cpu-jit-release"
@@ -38,16 +39,41 @@ if (flutter_runtime_mode == "jit_release") {
 template("zip_bundle") {
   assert(defined(invoker.output), "output must be defined")
   assert(defined(invoker.files), "files must be defined as a list of scopes")
+
+  license_readme = "$target_gen_dir/LICENSE.$target_name.md"
+  license_target = "_${target_name}_license_md"
+
+  generated_file(license_target) {
+    source_path = rebase_path(".", "//flutter")
+    license_path =
+        rebase_path("//flutter/sky/packages/sky_engine/LICENSE", "//flutter")
+    git_url = "https://github.com/flutter/engine/tree/$engine_version"
+    sky_engine_url = "https://storage.googleapis.com/flutter_infra_release/flutter/$engine_version/sky_engine.zip"
+    outputs = [ license_readme ]
+    contents = [
+      "# $target_name",
+      "",
+      "This bundle is part of the the Flutter SDK.",
+      "",
+      "The source code is hosted at [flutter/engine/$source_path]($git_url/$source_path).",
+      "The license for this bundle is hosted at [flutter/engine/sky/packages/sky_engine/LICENSE]($git_url/$license_path) ",
+      "and [sky_engine.zip]($sky_engine_url).",
+    ]
+  }
+
   action(target_name) {
     script = "//flutter/build/zip.py"
     outputs = [ "$root_build_dir/zip_archives/${invoker.output}" ]
-    sources = []
+    sources = [ license_readme ]
     forward_variables_from(invoker, [ "visibility" ])
-    deps = invoker.deps
+    deps = [ ":$license_target" ] + invoker.deps
 
     args = [
       "-o",
       rebase_path(outputs[0]),
+      "-i",
+      rebase_path(license_readme),
+      "LICENSE.$target_name.md",
     ]
     foreach(input, invoker.files) {
       args += [
diff --git a/build_overrides/angle.gni b/build_overrides/angle.gni
new file mode 100644
index 0000000000000000000000000000000000000000..9fa8f46c0238ace4af6400016059eb554671be9e
--- /dev/null
+++ b/build_overrides/angle.gni
@@ -0,0 +1,39 @@
+# Copyright 2019 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Ensure use_xcode_clang is visibile to ANGLE.
+import("//build/toolchain/toolchain.gni")
+
+# The ANGLE build requires this file to point to the location of third-party
+# dependencies.
+angle_root = "//flutter/third_party/angle"
+
+angle_vma_version = 30000001
+
+# Flutter's buildroot looks enough like Chromium to satisfy Angle, and enough
+# to cause GN variable collisions if we don't set this.
+if (!is_fuchsia) {
+  angle_has_build = true
+}
+
+# Overrides for ANGLE's dependencies.
+angle_abseil_cpp_dir = "//flutter/third_party/abseil-cpp"
+angle_glslang_dir = "//flutter/third_party/vulkan-deps/glslang/src"
+angle_googletest_dir = "//third_party/googletest/googletest/src"
+
+# Note: This path doesn't actually exist; see
+# //build/secondary/third_party/jsoncpp/BUILD.gn
+angle_jsoncpp_dir = "//third_party/jsoncpp"
+angle_libjpeg_turbo_dir = "//third_party/libjpeg_turbo"
+angle_libpng_dir = "//flutter/third_party/libpng"
+angle_spirv_headers_dir = "//flutter/third_party/vulkan-deps/spirv-headers/src"
+angle_spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src"
+angle_spirv_cross_dir = "//flutter/third_party/vulkan-deps/spirv-cross/src"
+angle_spirv_headers_dir = "//flutter/third_party/vulkan-deps/spirv-headers/src"
+angle_vulkan_memory_allocator_dir =
+    "//flutter/third_party/vulkan_memory_allocator"
+
+# This is a general Chromium flag, but in the Flutter build only ANGLE needs it
+# so it is defined here.
+is_cfi = false
diff --git a/build_overrides/build.gni b/build_overrides/build.gni
new file mode 100644
index 0000000000000000000000000000000000000000..e7fdeb80d6f82ea106d2aebadd4ea3d3447a5488
--- /dev/null
+++ b/build_overrides/build.gni
@@ -0,0 +1,15 @@
+# Copyright 2019 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# The engine build uses some Chromium-sourced versions of third-party
+# dependencies (e.g, ANGLE, abseil) to use their GN build files, but we don't
+# want the Chromium-specific parts of the build.
+build_with_chromium = false
+
+# Perfetto targets fail to build without this variable. It is used by Perfetto
+# targets to distinguish embedder builds from Perfetto standalone builds, and
+# builds in the Android tree.
+perfetto_build_with_embedder = true
+
+perfetto_root_path = "//flutter/third_party/perfetto/"
diff --git a/build_overrides/glslang.gni b/build_overrides/glslang.gni
new file mode 100644
index 0000000000000000000000000000000000000000..cf25687630f3eb35e3dd3aeb5574b469a6a9b5a6
--- /dev/null
+++ b/build_overrides/glslang.gni
@@ -0,0 +1,6 @@
+# Copyright 2019 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+glslang_spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src"
+spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src"
diff --git a/build_overrides/spirv_tools.gni b/build_overrides/spirv_tools.gni
new file mode 100644
index 0000000000000000000000000000000000000000..1f1494927e92dfe3411ba83a619be2bcc141ed45
--- /dev/null
+++ b/build_overrides/spirv_tools.gni
@@ -0,0 +1,11 @@
+# Copyright 2019 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# We are building inside Flutter.
+spirv_tools_standalone = false
+
+# Paths to SPIRV-Tools dependencies in Flutter.
+spirv_tools_googletest_dir = "//third_party/googletest/googletest/src"
+spirv_tools_spirv_headers_dir =
+    "//flutter/third_party/vulkan-deps/spirv-headers/src"
diff --git a/build_overrides/swiftshader.gni b/build_overrides/swiftshader.gni
new file mode 100644
index 0000000000000000000000000000000000000000..466a5448747117929408e38c354718c66ccafdfc
--- /dev/null
+++ b/build_overrides/swiftshader.gni
@@ -0,0 +1,9 @@
+# Copyright 2019 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# We are building SwiftShader in Flutter.
+swiftshader_standalone = false
+
+# Path to SwiftShader.
+swiftshader_dir = "//flutter/third_party/swiftshader"
diff --git a/build_overrides/vulkan_headers.gni b/build_overrides/vulkan_headers.gni
new file mode 100644
index 0000000000000000000000000000000000000000..5efa8523449244f6a8b1ced4b1722abf06ee5448
--- /dev/null
+++ b/build_overrides/vulkan_headers.gni
@@ -0,0 +1,11 @@
+# Copyright 2020 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This file is needed by the vulkan-headers build, but doesn't need to actually
+# set anything.
+
+if (is_linux) {
+  vulkan_use_x11 = true
+  vulkan_use_wayland = true
+}
diff --git a/build_overrides/vulkan_loader.gni b/build_overrides/vulkan_loader.gni
new file mode 100644
index 0000000000000000000000000000000000000000..b828448e8b457eb7141bf1a8575552b2479f3365
--- /dev/null
+++ b/build_overrides/vulkan_loader.gni
@@ -0,0 +1,8 @@
+# Copyright 2020 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src"
+
+# Vulkan loader build options
+vulkan_loader_shared = true
diff --git a/build_overrides/vulkan_tools.gni b/build_overrides/vulkan_tools.gni
new file mode 100644
index 0000000000000000000000000000000000000000..a0fbede4053932900e466786cf71cdb88d2d3e34
--- /dev/null
+++ b/build_overrides/vulkan_tools.gni
@@ -0,0 +1,9 @@
+# Copyright 2020 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src"
+
+# Subdirectories for generated files
+vulkan_data_subdir = ""
+vulkan_gen_subdir = ""
diff --git a/build_overrides/vulkan_utility_libraries.gni b/build_overrides/vulkan_utility_libraries.gni
new file mode 100644
index 0000000000000000000000000000000000000000..245ffceecaa6bb9b4d3efdd46ee5ed9628e07817
--- /dev/null
+++ b/build_overrides/vulkan_utility_libraries.gni
@@ -0,0 +1,5 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src"
diff --git a/build_overrides/vulkan_validation_layers.gni b/build_overrides/vulkan_validation_layers.gni
new file mode 100644
index 0000000000000000000000000000000000000000..1378a5a9de7527dbd30a5472f7c8b02f452d8452
--- /dev/null
+++ b/build_overrides/vulkan_validation_layers.gni
@@ -0,0 +1,15 @@
+# Copyright 2020 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src"
+vulkan_utility_libraries_dir =
+    "//flutter/third_party/vulkan-deps/vulkan-utility-libraries/src"
+vvl_spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src"
+vvl_glslang_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src"
+
+# robin_hood_headers_dir = "//external/robin-hood-hashing/src/include"
+
+# Subdirectories for generated files
+vulkan_data_subdir = "vulkan-data"
+vulkan_gen_subdir = ""
diff --git a/build_overrides/wayland.gni b/build_overrides/wayland.gni
new file mode 100644
index 0000000000000000000000000000000000000000..d3d82c33c824ace3b4493b9c98d182c1cb5c7bb0
--- /dev/null
+++ b/build_overrides/wayland.gni
@@ -0,0 +1,8 @@
+# Copyright 2019 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# ANGLE expects this to be here.
+
+# Flutter has no wayland third-party dir
+wayland_gn_dir = ""
diff --git a/ci/analyze.sh b/ci/analyze.sh
index 907544bdc3b2a92df893b19375106635f7dadcd9..30946e7529f2856f14a67b1cf21af6cc1cf05220 100755
--- a/ci/analyze.sh
+++ b/ci/analyze.sh
@@ -30,7 +30,16 @@ function follow_links() (
 SCRIPT_DIR=$(follow_links "$(dirname -- "${BASH_SOURCE[0]}")")
 SRC_DIR="$(cd "$SCRIPT_DIR/../.."; pwd -P)"
 FLUTTER_DIR="$SRC_DIR/flutter"
+
+# This shell script takes one optional argument, the path to a dart-sdk/bin
+# directory. If not specified, we default to the build output for
+# host_debug_unopt.
+if [[ $# -eq 0 ]] ; then
 DART_BIN="$SRC_DIR/out/host_debug_unopt/dart-sdk/bin"
+else
+DART_BIN="$1"
+fi
+
 DART="$DART_BIN/dart"
 
 if [[ ! -f "$DART" ]]; then
@@ -46,31 +55,27 @@ echo "Using dart from $DART_BIN"
 "$DART" --version
 echo ""
 
-"$DART" analyze --fatal-infos --fatal-warnings "$FLUTTER_DIR/lib/ui"
-
-"$DART" analyze --fatal-infos --fatal-warnings "$FLUTTER_DIR/ci"
-
-"$DART" analyze --fatal-infos --fatal-warnings "$FLUTTER_DIR/flutter_frontend_server"
-
-(cd "$FLUTTER_DIR/tools/gen_web_locale_keymap"; "$DART" pub get)
-"$DART" analyze --fatal-infos --fatal-warnings "$FLUTTER_DIR/tools"
-
-(cd "$FLUTTER_DIR/testing/skia_gold_client"; "$DART" pub get)
-"$DART" analyze --fatal-infos --fatal-warnings "$FLUTTER_DIR/testing"
+"$DART" analyze --suppress-analytics --fatal-infos --fatal-warnings "$FLUTTER_DIR/ci"
+"$DART" analyze --suppress-analytics --fatal-infos --fatal-warnings "$FLUTTER_DIR/flutter_frontend_server"
+"$DART" analyze --suppress-analytics --fatal-infos --fatal-warnings "$FLUTTER_DIR/impeller/tessellator/dart"
+"$DART" analyze --suppress-analytics --fatal-infos --fatal-warnings "$FLUTTER_DIR/lib/gpu"
+"$DART" analyze --suppress-analytics --fatal-infos --fatal-warnings "$FLUTTER_DIR/lib/ui"
+"$DART" analyze --suppress-analytics --fatal-infos --fatal-warnings "$FLUTTER_DIR/testing"
+"$DART" analyze --suppress-analytics --fatal-infos --fatal-warnings "$FLUTTER_DIR/tools"
 
 echo ""
 
 # Check that dart libraries conform.
 echo "Checking the integrity of the Web SDK"
-(cd "$FLUTTER_DIR/web_sdk"; "$DART" pub get)
-(cd "$FLUTTER_DIR/web_sdk/web_test_utils"; "$DART" pub get)
-(cd "$FLUTTER_DIR/web_sdk/web_engine_tester"; "$DART" pub get)
+(cd "$FLUTTER_DIR/web_sdk"; "$DART" pub --suppress-analytics get)
+(cd "$FLUTTER_DIR/web_sdk/web_test_utils"; "$DART" pub --suppress-analytics get)
+(cd "$FLUTTER_DIR/web_sdk/web_engine_tester"; "$DART" pub --suppress-analytics get)
 
-"$DART" analyze --fatal-infos --fatal-warnings "$FLUTTER_DIR/web_sdk"
+"$DART" analyze --suppress-analytics --fatal-infos --fatal-warnings "$FLUTTER_DIR/web_sdk"
 
 WEB_SDK_TEST_FILES="$FLUTTER_DIR/web_sdk/test/*"
 for testFile in $WEB_SDK_TEST_FILES
 do
   echo "Running $testFile"
-  (cd "$FLUTTER_DIR"; FLUTTER_DIR="$FLUTTER_DIR" "$DART" --enable-asserts $testFile)
+  (cd "$FLUTTER_DIR"; FLUTTER_DIR="$FLUTTER_DIR" "$DART" --disable-dart-dev --enable-asserts $testFile)
 done
diff --git a/ci/ban_generated_plugin_registrant_java.sh b/ci/ban_generated_plugin_registrant_java.sh
new file mode 100755
index 0000000000000000000000000000000000000000..ac154b3b53f4fc1d80090f2c5f0a36755e1f0f7e
--- /dev/null
+++ b/ci/ban_generated_plugin_registrant_java.sh
@@ -0,0 +1,68 @@
+#!/bin/bash
+#
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+set -e
+
+# Needed because if it is set, cd may print the path it changed to.
+unset CDPATH
+
+# On Mac OS, readlink -f doesn't work, so follow_links traverses the path one
+# link at a time, and then cds into the link destination and find out where it
+# ends up.
+#
+# The function is enclosed in a subshell to avoid changing the working directory
+# of the caller.
+function follow_links() (
+  cd -P "$(dirname -- "$1")"
+  file="$PWD/$(basename -- "$1")"
+  while [[ -L "$file" ]]; do
+    cd -P "$(dirname -- "$file")"
+    file="$(readlink -- "$file")"
+    cd -P "$(dirname -- "$file")"
+    file="$PWD/$(basename -- "$file")"
+  done
+  echo "$file"
+)
+
+SCRIPT_DIR=$(follow_links "$(dirname -- "${BASH_SOURCE[0]}")")
+SRC_DIR="$(
+  cd "$SCRIPT_DIR/../.."
+  pwd -P
+)"
+
+# Check if a file named **/GeneratedPluginRegistrant.java exists in the project.
+# If it does, fail the build and print a message to the user pointing them to
+# the file and instructing them to remove it.
+#
+# See: https://github.com/flutter/flutter/issues/143782.
+
+# The expected path to the file. Any *other* path is unexpected.
+EXPECTED_PATHS=("./shell/platform/android/test/io/flutter/plugins/GeneratedPluginRegistrant.java")
+
+# Temporarily change the working directory to the root of the Flutter project.
+pushd "$SRC_DIR/flutter" >/dev/null
+
+# Change back to the original working directory.
+function cleanup() {
+  popd >/dev/null
+}
+
+trap cleanup EXIT
+
+# Find all files named GeneratedPluginRegistrant.java in the project.
+echo "Finding all files named GeneratedPluginRegistrant.java in the project..."
+GENERATED_PLUGIN_REGISTRANT_PATHS=$(find . -name "GeneratedPluginRegistrant.java")
+
+# Iterate over the found paths and check if they are expected.
+for path in $GENERATED_PLUGIN_REGISTRANT_PATHS; do
+  if [[ ! " ${EXPECTED_PATHS[@]} " =~ " ${path} " ]]; then
+    echo "ERROR: Found unexpected file named GeneratedPluginRegistrant.java at $path."
+    echo "Please remove this file from the project."
+    exit 1
+  fi
+done
+
+echo "Done."
diff --git a/ci/bin/format.dart b/ci/bin/format.dart
index 9f6674c1ef69a7774939e969a5d1c1b5cfa4b9be..84ebf55029ee6e1a903f9f07d6ad216dd444994d 100644
--- a/ci/bin/format.dart
+++ b/ci/bin/format.dart
@@ -6,9 +6,6 @@
 //
 // Run with --help for usage.
 
-// TODO(gspencergoog): Support clang formatting on Windows.
-// TODO(gspencergoog): Support Java formatting on Windows.
-
 import 'dart:io';
 
 import 'package:args/args.dart';
@@ -23,8 +20,6 @@ class FormattingException implements Exception {
   final String message;
   final ProcessResult? result;
 
-  int get exitCode => result?.exitCode ?? -1;
-
   @override
   String toString() {
     final StringBuffer output = StringBuffer(runtimeType.toString());
@@ -44,11 +39,13 @@ enum MessageType {
 }
 
 enum FormatCheck {
-  clang,
   gn,
   java,
   python,
   whitespace,
+  header,
+  // Run clang after the header check.
+  clang,
 }
 
 FormatCheck nameToFormatCheck(String name) {
@@ -63,6 +60,8 @@ FormatCheck nameToFormatCheck(String name) {
       return FormatCheck.python;
     case 'whitespace':
       return FormatCheck.whitespace;
+    case 'header':
+      return FormatCheck.header;
     default:
       throw FormattingException('Unknown FormatCheck type $name');
   }
@@ -80,18 +79,15 @@ String formatCheckToName(FormatCheck check) {
       return 'Python';
     case FormatCheck.whitespace:
       return 'Trailing whitespace';
+    case FormatCheck.header:
+      return 'Header guards';
   }
 }
 
 List<String> formatCheckNames() {
-  List<FormatCheck> allowed;
-  if (!Platform.isWindows) {
-    allowed = FormatCheck.values;
-  } else {
-    allowed = <FormatCheck>[FormatCheck.gn, FormatCheck.whitespace];
-  }
-  return allowed
-      .map<String>((FormatCheck check) => check.toString().replaceFirst('$FormatCheck.', ''))
+  return FormatCheck.values
+      .map<String>((FormatCheck check) =>
+          check.toString().replaceFirst('$FormatCheck.', ''))
       .toList();
 }
 
@@ -107,7 +103,7 @@ Future<String> _runGit(
   return result.stdout;
 }
 
-typedef MessageCallback = Function(String? message, {MessageType type});
+typedef MessageCallback = void Function(String? message, {MessageType type});
 
 /// Base class for format checkers.
 ///
@@ -117,7 +113,6 @@ abstract class FormatChecker {
     ProcessManager processManager = const LocalProcessManager(),
     required this.baseGitRef,
     required this.repoDir,
-    required this.srcDir,
     this.allFiles = false,
     this.messageCallback,
   }) : _processRunner = ProcessRunner(
@@ -150,7 +145,6 @@ abstract class FormatChecker {
           processManager: processManager,
           baseGitRef: baseGitRef,
           repoDir: repoDir,
-          srcDir: srcDir,
           allFiles: allFiles,
           messageCallback: messageCallback,
         );
@@ -168,7 +162,6 @@ abstract class FormatChecker {
           processManager: processManager,
           baseGitRef: baseGitRef,
           repoDir: repoDir,
-          srcDir: srcDir,
           allFiles: allFiles,
           messageCallback: messageCallback,
         );
@@ -177,7 +170,14 @@ abstract class FormatChecker {
           processManager: processManager,
           baseGitRef: baseGitRef,
           repoDir: repoDir,
-          srcDir: srcDir,
+          allFiles: allFiles,
+          messageCallback: messageCallback,
+        );
+      case FormatCheck.header:
+        return HeaderFormatChecker(
+          processManager: processManager,
+          baseGitRef: baseGitRef,
+          repoDir: repoDir,
           allFiles: allFiles,
           messageCallback: messageCallback,
         );
@@ -185,7 +185,6 @@ abstract class FormatChecker {
   }
 
   final ProcessRunner _processRunner;
-  final Directory srcDir;
   final Directory repoDir;
   final bool allFiles;
   MessageCallback? messageCallback;
@@ -226,7 +225,7 @@ abstract class FormatChecker {
     );
     final List<WorkerJob> jobs = patches.map<WorkerJob>((String patch) {
       return WorkerJob(
-        <String>['patch', '-p0'],
+        <String>['git', 'apply', '--ignore-space-change'],
         stdinRaw: codeUnitsAsStream(patch.codeUnits),
       );
     }).toList();
@@ -270,7 +269,9 @@ abstract class FormatChecker {
         ...types,
       ]);
     }
-    return output.split('\n').where((String line) => line.isNotEmpty).toList();
+    return output.split('\n').where(
+      (String line) => line.isNotEmpty && !line.contains('third_party')
+    ).toList();
   }
 
   /// Generates a reporting function to supply to ProcessRunner to use instead
@@ -286,7 +287,7 @@ abstract class FormatChecker {
       final String pendingStr = pending.toString().padLeft(3);
       final String failedStr = failed.toString().padLeft(3);
 
-      stderr.write('$name Jobs: $percent% done, '
+      stdout.write('$name Jobs: $percent% done, '
           '$completedStr/$totalStr completed, '
           '$inProgressStr in progress, '
           '$pendingStr pending, '
@@ -297,32 +298,27 @@ abstract class FormatChecker {
   /// Clears the last printed report line so garbage isn't left on the terminal.
   @protected
   void reportDone() {
-    stderr.write('\r${' ' * 100}\r');
+    stdout.write('\r${' ' * 100}\r');
   }
 }
 
 /// Checks and formats C++/ObjC/Shader files using clang-format.
 class ClangFormatChecker extends FormatChecker {
   ClangFormatChecker({
-    ProcessManager processManager = const LocalProcessManager(),
-    required String baseGitRef,
-    required Directory repoDir,
+    super.processManager,
+    required super.baseGitRef,
+    required super.repoDir,
     required Directory srcDir,
-    bool allFiles = false,
-    MessageCallback? messageCallback,
-  }) : super(
-          processManager: processManager,
-          baseGitRef: baseGitRef,
-          repoDir: repoDir,
-          srcDir: srcDir,
-          allFiles: allFiles,
-          messageCallback: messageCallback,
-        ) {
+    super.allFiles,
+    super.messageCallback,
+  }) {
     /*late*/ String clangOs;
     if (Platform.isLinux) {
       clangOs = 'linux-x64';
     } else if (Platform.isMacOS) {
       clangOs = 'mac-x64';
+    } else if (Platform.isWindows) {
+      clangOs = 'windows-x64';
     } else {
       throw FormattingException(
           "Unknown operating system: don't know how to run clang-format here.");
@@ -330,6 +326,7 @@ class ClangFormatChecker extends FormatChecker {
     clangFormat = File(
       path.join(
         srcDir.absolute.path,
+        'flutter',
         'buildtools',
         clangOs,
         'clang',
@@ -406,9 +403,23 @@ class ClangFormatChecker extends FormatChecker {
     await for (final WorkerJob completedJob in completedClangFormats) {
       if (completedJob.result.exitCode == 0) {
         diffJobs.add(
-          WorkerJob(<String>['diff', '-u', completedJob.command.last, '-'],
+          WorkerJob(<String>[
+            'git',
+            'diff',
+            '--no-index',
+            '--no-color',
+            '--ignore-cr-at-eol',
+            '--',
+            completedJob.command.last,
+            '-',
+          ],
               stdinRaw: codeUnitsAsStream(completedJob.result.stdoutRaw)),
         );
+      } else {
+        final String formatterCommand = completedJob.command.join(' ');
+        error("Formatter command '$formatterCommand' failed with exit code "
+            '${completedJob.result.exitCode}. Command output follows:\n\n'
+            '${completedJob.result.output}');
       }
     }
     final ProcessPool diffPool = ProcessPool(
@@ -428,11 +439,13 @@ class ClangFormatChecker extends FormatChecker {
       } else {
         error('Found ${failed.length} C++/ObjC/Shader file${plural ? 's' : ''}'
             ' which ${plural ? 'were' : 'was'} formatted incorrectly.');
-        stdout.writeln('To fix, run:');
+        stdout.writeln('To fix, run `et format` or:');
         stdout.writeln();
-        stdout.writeln('patch -p0 <<DONE');
+        stdout.writeln('git apply <<DONE');
         for (final WorkerJob job in failed) {
-          stdout.write(job.result.stdout);
+          stdout.write(job.result.stdout
+              .replaceFirst('b/-', 'b/${job.command[job.command.length - 2]}')
+              .replaceFirst('b/-', 'b/${job.command[job.command.length - 2]}'));
         }
         stdout.writeln('DONE');
         stdout.writeln();
@@ -441,7 +454,9 @@ class ClangFormatChecker extends FormatChecker {
       message('Completed checking ${diffJobs.length} C++/ObjC/Shader files with no formatting problems.');
     }
     return failed.map<String>((WorkerJob job) {
-      return job.result.stdout;
+      return job.result.stdout
+          .replaceFirst('b/-', 'b/${job.command[job.command.length - 2]}')
+          .replaceFirst('b/-', 'b/${job.command[job.command.length - 2]}');
     }).toList();
   }
 }
@@ -449,20 +464,13 @@ class ClangFormatChecker extends FormatChecker {
 /// Checks the format of Java files uing the Google Java format checker.
 class JavaFormatChecker extends FormatChecker {
   JavaFormatChecker({
-    ProcessManager processManager = const LocalProcessManager(),
-    required String baseGitRef,
-    required Directory repoDir,
+    super.processManager,
+    required super.baseGitRef,
+    required super.repoDir,
     required Directory srcDir,
-    bool allFiles = false,
-    MessageCallback? messageCallback,
-  }) : super(
-          processManager: processManager,
-          baseGitRef: baseGitRef,
-          repoDir: repoDir,
-          srcDir: srcDir,
-          allFiles: allFiles,
-          messageCallback: messageCallback,
-        ) {
+    super.allFiles,
+    super.messageCallback,
+  }) {
     googleJavaFormatJar = File(
       path.absolute(
         path.join(
@@ -546,16 +554,30 @@ class JavaFormatChecker extends FormatChecker {
       processRunner: _processRunner,
       printReport: namedReport('Java format'),
     );
-    final Stream<WorkerJob> completedClangFormats = formatPool.startWorkers(formatJobs);
+    final Stream<WorkerJob> completedJavaFormats = formatPool.startWorkers(formatJobs);
     final List<WorkerJob> diffJobs = <WorkerJob>[];
-    await for (final WorkerJob completedJob in completedClangFormats) {
+    await for (final WorkerJob completedJob in completedJavaFormats) {
       if (completedJob.result.exitCode == 0) {
         diffJobs.add(
           WorkerJob(
-            <String>['diff', '-u', completedJob.command.last, '-'],
+            <String>[
+              'git',
+              'diff',
+              '--no-index',
+              '--no-color',
+              '--ignore-cr-at-eol',
+              '--',
+              completedJob.command.last,
+              '-',
+            ],
             stdinRaw: codeUnitsAsStream(completedJob.result.stdoutRaw),
           ),
         );
+      } else {
+        final String formatterCommand = completedJob.command.join(' ');
+        error("Formatter command '$formatterCommand' failed with exit code "
+            '${completedJob.result.exitCode}. Command output follows:\n\n'
+            '${completedJob.result.output}');
       }
     }
     final ProcessPool diffPool = ProcessPool(
@@ -575,11 +597,13 @@ class JavaFormatChecker extends FormatChecker {
       } else {
         error('Found ${failed.length} Java file${plural ? 's' : ''}'
             ' which ${plural ? 'were' : 'was'} formatted incorrectly.');
-        stdout.writeln('To fix, run:');
+        stdout.writeln('To fix, run `et format` or:');
         stdout.writeln();
-        stdout.writeln('patch -p0 <<DONE');
+        stdout.writeln('git apply <<DONE');
         for (final WorkerJob job in failed) {
-          stdout.write(job.result.stdout);
+          stdout.write(job.result.stdout
+              .replaceFirst('b/-', 'b/${job.command[job.command.length - 2]}')
+              .replaceFirst('b/-', 'b/${job.command[job.command.length - 2]}'));
         }
         stdout.writeln('DONE');
         stdout.writeln();
@@ -588,7 +612,9 @@ class JavaFormatChecker extends FormatChecker {
       message('Completed checking ${diffJobs.length} Java files with no formatting problems.');
     }
     return failed.map<String>((WorkerJob job) {
-      return job.result.stdout;
+      return job.result.stdout
+          .replaceFirst('b/-', 'b/${job.command[job.command.length - 2]}')
+          .replaceFirst('b/-', 'b/${job.command[job.command.length - 2]}');
     }).toList();
   }
 }
@@ -596,19 +622,13 @@ class JavaFormatChecker extends FormatChecker {
 /// Checks the format of any BUILD.gn files using the "gn format" command.
 class GnFormatChecker extends FormatChecker {
   GnFormatChecker({
-    ProcessManager processManager = const LocalProcessManager(),
-    required String baseGitRef,
+    super.processManager,
+    required super.baseGitRef,
     required Directory repoDir,
-    required Directory srcDir,
-    bool allFiles = false,
-    MessageCallback? messageCallback,
+    super.allFiles,
+    super.messageCallback,
   }) : super(
-          processManager: processManager,
-          baseGitRef: baseGitRef,
           repoDir: repoDir,
-          srcDir: srcDir,
-          allFiles: allFiles,
-          messageCallback: messageCallback,
         ) {
     gnBinary = File(
       path.join(
@@ -642,69 +662,108 @@ class GnFormatChecker extends FormatChecker {
     final List<String> cmd = <String>[
       gnBinary.path,
       'format',
-      if (!fixing) '--dry-run',
+      if (!fixing) '--stdin',
     ];
     final List<WorkerJob> jobs = <WorkerJob>[];
     for (final String file in filesToCheck) {
-      jobs.add(WorkerJob(<String>[...cmd, file]));
+      if (fixing) {
+        jobs.add(WorkerJob(
+          <String>[...cmd, file],
+          name: <String>[...cmd, file].join(' '),
+        ));
+      } else {
+        final WorkerJob job = WorkerJob(
+          cmd,
+          stdinRaw: codeUnitsAsStream(
+            File(path.join(repoDir.absolute.path, file)).readAsBytesSync(),
+          ),
+          name: <String>[...cmd, file].join(' '),
+        );
+        jobs.add(job);
+      }
     }
     final ProcessPool gnPool = ProcessPool(
       processRunner: _processRunner,
       printReport: namedReport('gn format'),
     );
-    final List<WorkerJob> completedJobs = await gnPool.runToCompletion(jobs);
-    reportDone();
-    final List<String> incorrect = <String>[];
-    for (final WorkerJob job in completedJobs) {
-      if (job.result.exitCode == 2) {
-        incorrect.add('  ${job.command.last}');
-      }
-      if (job.result.exitCode == 1) {
-        // GN has exit code 1 if it had some problem formatting/checking the
-        // file.
-        throw FormattingException(
-          'Unable to format ${job.command.last}:\n${job.result.output}',
+    final Stream<WorkerJob> completedJobs = gnPool.startWorkers(jobs);
+    final List<WorkerJob> diffJobs = <WorkerJob>[];
+    await for (final WorkerJob completedJob in completedJobs) {
+      if (completedJob.result.exitCode == 0) {
+        diffJobs.add(
+          WorkerJob(
+            <String>[
+              'git',
+              'diff',
+              '--no-index',
+              '--no-color',
+              '--ignore-cr-at-eol',
+              '--',
+              completedJob.name.split(' ').last,
+              '-'
+            ],
+            stdinRaw: codeUnitsAsStream(completedJob.result.stdoutRaw),
+          ),
         );
+      } else {
+        final String formatterCommand = completedJob.command.join(' ');
+        error("Formatter command '$formatterCommand' failed with exit code "
+            '${completedJob.result.exitCode}. Command output follows:\n\n'
+            '${completedJob.result.output}');
       }
     }
-    if (incorrect.isNotEmpty) {
-      final bool plural = incorrect.length > 1;
+    final ProcessPool diffPool = ProcessPool(
+      processRunner: _processRunner,
+      printReport: namedReport('diff'),
+    );
+    final List<WorkerJob> completedDiffs =
+        await diffPool.runToCompletion(diffJobs);
+    final Iterable<WorkerJob> failed = completedDiffs.where((WorkerJob job) {
+      return job.result.exitCode != 0;
+    });
+    reportDone();
+    if (failed.isNotEmpty) {
+      final bool plural = failed.length > 1;
       if (fixing) {
-        message('Fixed ${incorrect.length} GN file${plural ? 's' : ''}'
+        message('Fixed ${failed.length} GN file${plural ? 's' : ''}'
             ' which ${plural ? 'were' : 'was'} formatted incorrectly.');
       } else {
-        error('Found ${incorrect.length} GN file${plural ? 's' : ''}'
-            ' which ${plural ? 'were' : 'was'} formatted incorrectly:');
-        incorrect.forEach(stderr.writeln);
+        error('Found ${failed.length} GN file${plural ? 's' : ''}'
+            ' which ${plural ? 'were' : 'was'} formatted incorrectly.');
+        stdout.writeln('To fix, run `et format` or:');
+        stdout.writeln();
+        stdout.writeln('git apply <<DONE');
+        for (final WorkerJob job in failed) {
+          stdout.write(job.result.stdout
+              .replaceFirst('b/-', 'b/${job.command[job.command.length - 2]}')
+              .replaceFirst('b/-', 'b/${job.command[job.command.length - 2]}'));
+        }
+        stdout.writeln('DONE');
+        stdout.writeln();
       }
     } else {
-      message('All GN files formatted correctly.');
+      message('Completed checking ${completedDiffs.length} GN files with no '
+          'formatting problems.');
     }
-    return incorrect.length;
+    return failed.length;
   }
 }
 
 /// Checks the format of any .py files using the "yapf" command.
 class PythonFormatChecker extends FormatChecker {
   PythonFormatChecker({
-    ProcessManager processManager = const LocalProcessManager(),
-    required String baseGitRef,
+    super.processManager,
+    required super.baseGitRef,
     required Directory repoDir,
-    required Directory srcDir,
-    bool allFiles = false,
-    MessageCallback? messageCallback,
+    super.allFiles,
+    super.messageCallback,
   }) : super(
-          processManager: processManager,
-          baseGitRef: baseGitRef,
           repoDir: repoDir,
-          srcDir: srcDir,
-          allFiles: allFiles,
-          messageCallback: messageCallback,
         ) {
     yapfBin = File(path.join(
       repoDir.absolute.path,
       'tools',
-      'yapf.sh',
+      Platform.isWindows ? 'yapf.bat' : 'yapf.sh',
     ));
     _yapfStyle = File(path.join(
       repoDir.absolute.path,
@@ -766,7 +825,12 @@ class PythonFormatChecker extends FormatChecker {
       } else {
         error('Found ${incorrect.length} python file${plural ? 's' : ''}'
             ' which ${plural ? 'were' : 'was'} formatted incorrectly:');
-        incorrect.forEach(stderr.writeln);
+        stdout.writeln('To fix, run `et format` or:');
+        stdout.writeln();
+        stdout.writeln('git apply <<DONE');
+        incorrect.forEach(stdout.writeln);
+        stdout.writeln('DONE');
+        stdout.writeln();
       }
     } else {
       message('All python files formatted correctly.');
@@ -787,20 +851,12 @@ class _GrepResult {
 /// Checks for trailing whitspace in Dart files.
 class WhitespaceFormatChecker extends FormatChecker {
   WhitespaceFormatChecker({
-    ProcessManager processManager = const LocalProcessManager(),
-    required String baseGitRef,
-    required Directory repoDir,
-    required Directory srcDir,
-    bool allFiles = false,
-    MessageCallback? messageCallback,
-  }) : super(
-          processManager: processManager,
-          baseGitRef: baseGitRef,
-          repoDir: repoDir,
-          srcDir: srcDir,
-          allFiles: allFiles,
-          messageCallback: messageCallback,
-        );
+    super.processManager,
+    required super.baseGitRef,
+    required super.repoDir,
+    super.allFiles,
+    super.messageCallback,
+  });
 
   @override
   Future<bool> checkFormatting() async {
@@ -910,6 +966,96 @@ class WhitespaceFormatChecker extends FormatChecker {
   }
 }
 
+final class HeaderFormatChecker extends FormatChecker {
+  HeaderFormatChecker({
+    required super.baseGitRef,
+    required super.repoDir,
+    super.processManager,
+    super.allFiles,
+    super.messageCallback,
+  });
+
+  // $ENGINE/third_party/dart/tools/sdks/dart-sdk/bin/dart
+  late final String _dartBin = path.join(
+    repoDir.absolute.parent.path,
+    'third_party',
+    'dart',
+    'tools',
+    'sdks',
+    'dart-sdk',
+    'bin',
+    'dart',
+  );
+
+  // $ENGINE/src/flutter/tools/bin/main.dart
+  late final String _headerGuardCheckBin = path.join(
+    repoDir.absolute.path,
+    'tools',
+    'header_guard_check',
+    'bin',
+    'main.dart',
+  );
+
+  @override
+  Future<bool> checkFormatting() async {
+    final List<String> include = <String>[];
+    if (!allFiles) {
+      include.addAll(await getFileList(<String>[
+        '*.h',
+      ]));
+      if (include.isEmpty) {
+        message('No header files with changes, skipping header guard check.');
+        return true;
+      }
+    }
+    final List<String> args = <String>[
+      _dartBin,
+      '--disable-dart-dev',
+      _headerGuardCheckBin,
+      ...include.map((String f) => '--include=$f'),
+    ];
+    // TIP: --exclude is encoded into the tool itself.
+    // see tools/header_guard_check/lib/header_guard_check.dart
+    final ProcessRunnerResult result = await _processRunner.runProcess(args);
+    if (result.exitCode != 0) {
+      error('Header check failed. The following files have incorrect header guards:');
+      message(result.stdout);
+      return false;
+    }
+    return true;
+  }
+
+  @override
+  Future<bool> fixFormatting() async {
+    final List<String> include = <String>[];
+    if (!allFiles) {
+      include.addAll(await getFileList(<String>[
+        '*.h',
+      ]));
+      if (include.isEmpty) {
+        message('No header files with changes, skipping header guard fix.');
+        return true;
+      }
+    }
+    final List<String> args = <String>[
+      _dartBin,
+      '--disable-dart-dev',
+      _headerGuardCheckBin,
+      '--fix',
+      ...include.map((String f) => '--include=$f'),
+    ];
+    // TIP: --exclude is encoded into the tool itself.
+    // see tools/header_guard_check/lib/header_guard_check.dart
+    final ProcessRunnerResult result = await _processRunner.runProcess(args);
+    if (result.exitCode != 0) {
+      error('Header check fix failed:');
+      message(result.stdout);
+      return false;
+    }
+    return true;
+  }
+}
+
 Future<String> _getDiffBaseRevision(ProcessManager processManager, Directory repoDir) async {
   final ProcessRunner processRunner = ProcessRunner(
     defaultWorkingDirectory: repoDir,
@@ -924,7 +1070,7 @@ Future<String> _getDiffBaseRevision(ProcessManager processManager, Directory rep
   if (upstreamUrl.isEmpty) {
     upstream = 'origin';
   }
-  await _runGit(<String>['fetch', upstream, 'main'], processRunner);
+  await _runGit(<String>['fetch', upstream, 'oh-3.22.0'], processRunner);
   String result = '';
   try {
     // This is the preferred command to use, but developer checkouts often do
@@ -964,8 +1110,7 @@ Future<int> main(List<String> arguments) async {
       allowed: formatCheckNames(),
       defaultsTo: formatCheckNames(),
       help: 'Specifies which checks will be performed. Defaults to all checks. '
-          'May be specified more than once to perform multiple types of checks. '
-          'On Windows, only whitespace and gn checks are currently supported.');
+          'May be specified more than once to perform multiple types of checks. ');
   parser.addFlag('verbose', help: 'Print verbose output.', defaultsTo: verbose);
 
   late final ArgResults options;
@@ -994,14 +1139,11 @@ Future<int> main(List<String> arguments) async {
     message ??= '';
     switch (type) {
       case MessageType.message:
-        stderr.writeln(message);
-        break;
+        stdout.writeln(message);
       case MessageType.error:
         stderr.writeln('ERROR: $message');
-        break;
       case MessageType.warning:
         stderr.writeln('WARNING: $message');
-        break;
     }
   }
 
@@ -1028,11 +1170,7 @@ Future<int> main(List<String> arguments) async {
           message('Unable to apply $humanCheckName format fixes.');
         }
       } else {
-        message('Performing $humanCheckName format check');
         stepResult = await checker.checkFormatting();
-        if (!stepResult) {
-          message('Found $humanCheckName format problems.');
-        }
       }
       result = result && stepResult;
     }
diff --git a/ci/binary_size_treemap.sh b/ci/binary_size_treemap.sh
new file mode 100755
index 0000000000000000000000000000000000000000..1cce49caad8be22c5e5501594bff0ac097df1aa0
--- /dev/null
+++ b/ci/binary_size_treemap.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+#
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Run a tool that generates a treemap showing the contribution of each
+# component to the size of a binary.
+#
+# Usage:
+#   binary_size_treemap.sh [binary_path] [output_dir]
+
+set -e
+
+INPUT_PATH="$(cd $(dirname "$1"); pwd -P)/$(basename "$1")"
+DEST_DIR="$(cd $(dirname "$2"); pwd -P)/$(basename "$2")"
+CI_DIRECTORY=$(cd $(dirname "${BASH_SOURCE[0]}"); pwd -P)
+ENGINE_BUILDROOT=$(cd "$CI_DIRECTORY/../.."; pwd -P)
+
+if [ "$(uname)" == "Darwin" ]; then
+  NDK_PLATFORM="darwin-x86_64"
+else
+  NDK_PLATFORM="linux-x86_64"
+fi
+ADDR2LINE="third_party/android_tools/ndk/toolchains/llvm/prebuilt/$NDK_PLATFORM/bin/llvm-addr2line"
+NM="third_party/android_tools/ndk/toolchains/llvm/prebuilt/$NDK_PLATFORM/bin/llvm-nm"
+
+# Run the binary size script from the buildroot directory so the treemap path
+# navigation will start from there.
+cd "$ENGINE_BUILDROOT"
+RUN_BINARY_SIZE_ANALYSIS="third_party/dart/third_party/binary_size/src/run_binary_size_analysis.py"
+python3 "$RUN_BINARY_SIZE_ANALYSIS" --library "$INPUT_PATH" --destdir "$DEST_DIR" --addr2line-binary "$ADDR2LINE" --nm-binary "$NM" --jobs 1 --no-check-support
diff --git a/ci/builders/README.md b/ci/builders/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..a1c532f427872a41774e4bc34011a6bca4e27473
--- /dev/null
+++ b/ci/builders/README.md
@@ -0,0 +1,639 @@
+# Flutter Engine Build Definition Language
+
+The ***Flutter Engine Build Definition Language*** describes a build on CI
+by defining a combination of *sub-builds*, *archives*, *generators* and *dependencies*. It
+makes it simple to shard sub-builds by mapping build inputs to workflows, and listing
+the sub-build-generated artifacts explicitly. The Build Definition Language, Engine
+Recipes V2 and the generation of artifacts using GN+Ninja set the groundwork
+for efficient builds with dependency reusability.
+
+**Author: Godofredo Contreras (godofredoc)**\
+**Go Link: flutter.dev/go/engine-build-definition-language**\
+**Created:** 01/2023   /  **Last updated:** 04/2023
+
+## Glossary
+
+* **[recipes](https://github.com/luci/recipes-py)** - domain specific
+language for specifying sequences of subprocess calls in a cross-platform and
+testable way.
+* **Generator** - scripts in Dart, python or bash that combine the output of
+sub-builds to generate artifacts.
+* **Builder** - a combination of configuration, recipes and a given commit to
+build and test artifacts.
+* **Build** - a builder running with specific properties, repository and
+commit.
+* **[GN](https://gn.googlesource.com/gn/)** - a meta-build system that
+generates build files for [Ninja](https://ninja-build.org/).
+* **[Ninja](https://ninja-build.org)** - Ninja is a small build system with a
+focus on speed.
+* **CAS** - a service that stores arbitrary binary blobs addressed by (hash of)
+their content. It is specialized for low latency, high volume query/read/write
+operations.
+
+## USAGE EXAMPLES
+
+Engine build definition files using the Build Definition Language can be found in the
+[flutter/engine/ci/builders](https://github.com/flutter/engine/tree/main/ci/builders) directory.
+
+The [engine orchestrator recipe](https://flutter.googlesource.com/recipes/+/refs/heads/main/recipes/engine_v2/)
+reads each file in that directory, shards their builds, collects artifacts and
+uploads them to the Google Cloud Storage bucket.
+
+The [.ci.yaml file](https://github.com/flutter/engine/blob/main/.ci.yaml) at the
+root of the `flutter/engine` repository puts all the components together.
+Builds are specified in that file using a property pointing to the build definition
+file to be used by engine\_v2 recipes. Full documentation of the `.ci.yaml` file format
+can be found [in the Cocoon repository here](https://github.com/flutter/cocoon/blob/main/CI_YAML.md).
+
+The following is a sample build configuration referencing
+[android\_aot\_engine.json](https://github.com/flutter/engine/blob/main/ci/builders/mac_android_aot_engine.json)
+in the `config_name` under `properties`:
+
+```yaml
+  - name: Mac mac_android_aot_engine
+    recipe: engine_v2/engine_v2
+    timeout: 60
+    properties:
+      config_name: mac_android_aot_engine
+      $flutter/osx_sdk : >-
+        { "sdk_version": "15a240d" }
+
+```
+
+## Build Definition Language Assumptions
+
+To keep the build definition language simple the following assumptions were
+made during its design:
+
+* A build can be expressed as a set of independent sub-builds.
+* A sub-build can be defined as a sequence of a `gn` configuration step,
+  a `ninja` build step, followed by self-contained test scripts, and self-contained
+  generator scripts. All the elements are optional allowing to use gn+ninja without
+  generators or generators without gn+ninja.
+* All the sub-builds required by a global generator are defined within the same
+configuration file.
+
+## Build configuration file
+
+The build configuration is a json file containing a list of builds, tests,
+generators and archives. The following is an example of an empty configuration
+file:
+
+```json
+{
+   "builds": [],
+   "tests": [],
+   "generators": {
+       "tasks": []
+   },
+   "archives": [
+   ]
+}
+```
+
+Note: tests, generators and archives can be omited if empty.
+
+Build configuration files have to be checked into the
+[engine_checkout/ci/builder](https://github.com/flutter/engine/tree/main/ci/builders)
+directory where engine v2 recipes will be reading them from.
+
+Configurations with a single build are supported. Single build configurations
+are located have to be checked into the
+[engine_checkout/ci/builder/standalone](https://github.com/flutter/engine/tree/main/ci/builders/standalone)
+
+A configuration file defines a top-level builder that will show up as a column
+in the
+[Flutter Dashboard](https://flutter-dashboard.appspot.com/#/build?repo=engine&branch=master).
+
+
+### Magic variables
+
+Magic variables are special environment variables that can be used as parameters
+for generators and test commands in the local and global contexts.
+
+Magic environment variables have the following limitations:
+only `${FLUTTER_LOGS_DIR}` is currently supported and it needs to be used
+alone within the parameter string(e.g. `["${FLUTTER_LOGS_DIR}"]` is OK
+but `["path=${FLUTTER_LOGS_DIR}"]` is not).
+
+The current list of supported magic variables is:
+
+* `${FLUTTER_LOGS_DIR}` - translated to the path of the temporary
+  folder where logs are being placed.
+* `${LUCI_WORKDIR}` - translated to the LUCI chroot working directory.
+* `${LUCI_CLEANUP}` - translated to the LUCI chroot temp directory.
+* `${REVISION}` - translated to the engine commit in postsubmit. In presubmit
+  it is translated to an empty string.
+
+### Build
+
+A build is a dictionary with a gn command, a ninja command, zero or more
+generator commands, zero or more local tests, zero or more local
+generators and zero or more output artifacts.
+
+The following is the high level structure of the build component:
+
+```json
+{
+           "archives": [],
+           "drone_dimensions": [],
+           "gclient_variables": {},
+           "gn": [],
+           "name": "host_debug",
+           "generators": [],
+           "ninja": {},
+           "tests": []
+}
+```
+
+Each build element will be translated to an independent sub-build and its
+entire out directory will be uploaded to CAS.
+
+`gn`, `ninja`, `generators` and `tests` properties are optional. Gn and
+ninja properties can be used without generators or tests. Generators with
+no gn and ninja properties is also supported.
+
+#### Archives
+
+An archive component is used to tell the recipes which artifacts are
+generated by the build and where to upload them.
+
+By default the build output is archived to CAS in order to be used
+as a dependency for global tests. If no CAS archive
+is required `cas_archive": false,` needs to be added to the
+configuration.
+
+```json
+{
+  "name": "host_debug",
+  "base_path": "out/host_debug/zip_archives/",
+  "type": "gcs",
+  "include_paths": [
+     "out/host_debug/zip_archives/linux-x64/artifacts.zip"
+  ],
+  "realm": "production"
+}
+```
+
+Description of the fields:
+
+* **name:** - by default the entire build output is uploaded to CAS.
+ `name` is used to associate the CAS hash to a value that can be referenced
+ later as a dependency of global tests. Name is also used to select the folder
+ from within src/out to upload to CAS. e.g if the build generates
+ src/out/host_debug name must be `host_debug`.
+* **base\_path:** - the portion of the path to remove from the full path before
+ uploading to its final destination. In the example the above the
+ base\_path **“out/host\_debug/zip\_archives”** will be removed from the
+ include path **"out/host\_debug/zip\_archives/linux-x64/artifacts.zip"**
+ before uploading to GCS, e.g.
+ &lt;bucket&gt;/flutter/&lt;commit>/linux-x64/artifacts.zip.
+* **Type:** - the type of storage to use. Currently only **“gcs”** and
+**“cas”** are supported. "gcs" uploads artifacts to GCS
+and "cas" to archive to CAS service. Cas value is used during development where
+we need to inspect the generated artifacts without worrying about location or
+cleanups. Gcs is expected for any artifacts being consumed by the flutter tool.
+* **Include\_paths:** - a list of strings with the paths to be uploaded to a
+given destination.
+* **cas_archive** - a boolean value indicating whether the build output will
+be archived to CAS or not. The default value is true.
+* **realm** - a string value of either `production` or `experimental`
+where production means the artifact will be uploaded to the location expected
+by the flutter tool and experimental will add an `experimental` prefix to the
+path to avoid interfering with production artifacts.
+
+#### Drone\_dimensions
+
+A list of strings with key value pairs separated by an equal sign. These
+dimensions are used to select the bot where the sub-build will be running.
+
+To find the list of valid keys and values you need to select a [bot from the
+swarming UI](https://chromium-swarm.appspot.com/botlist?c=id&c=task&c=os&c=status&d=asc&f=pool%3Aluci.flex.try&k=pool&s=id).
+On the `dimensions` section the left column contains the keys and
+the right column contains the allowed values. If multiple values are allowed
+for a key they are separated using `|` (pipe symbol).
+
+```json
+"drone_dimensions": [
+  "device_type=none",
+  "os=Linux"
+]
+```
+
+In the previous example, the build containing this drone\_dimensions component
+will run on a bot with a Linux OS that does not have any devices attached to it.
+
+Drone dimensions accept values separates by `|` to specify more than one value
+for the dimension. E.g. assuming the pool of bots have Ubuntu and Debian bots
+a dimension of `"os": "Debian|Ubuntu"` will resolve to use bots running either
+Debian or Ubuntu.
+
+#### Gclient\_variables
+
+A dictionary with variables passed to gclient during a gclient sync operation.
+They are usually used to add or remove gclient dependencies.
+
+```json
+"gclient_variables": {
+   "download_android_deps": false
+}
+```
+
+The example above is used to avoid downloading the
+[android sdk dependencies](https://cs.opensource.google/flutter/engine/+/main:DEPS;l=80)
+in builders that do not need it.
+
+#### GN
+
+A list of strings representing flags passed to the
+[tools/gn](https://github.com/flutter/engine/blob/main/tools/gn) script. The strings can be in the form of “--flag=value” or
+“--flag” followed by “value”.
+
+```json
+"gn": [
+      "--runtime-mode",
+      "debug",
+      "--prebuilt-dart-sdk",
+      "--build-embedder-examples"
+],
+```
+
+The previous example will prepare the configurations to build a host debug
+version using a prebuilt dart sdk and also build the embedder examples.
+
+#### Ninja
+
+A dictionary with two keys: “config” which references the configs created by gn
+and “target” which is a list of strings with the Ninja targets to build.
+
+```json
+"ninja": {
+    "config": "host_debug",
+    "targets": [
+        "flutter/build/archives:artifacts",
+        "flutter/build/archives:embedder",
+    ]
+},
+```
+
+In the example above the ninja command will use the configuration for
+host\_debug and will build artifacts and embedder targets as described
+by the
+[flutter/build/archives/BUILD.gn](https://github.com/flutter/engine/blob/main/build/archives/BUILD.gn)
+file.
+
+#### Tests
+
+This section of the build configuration is also known as local tests. It
+contains a list of dictionaries with configurations for scripts and
+parameters used to run tests inside the current build unit. These tests
+should not reference or use anything outside of the commit checkout or
+the outputs generated by running gn and ninja sections of the build
+configuration.
+
+```json
+"tests": [
+   {
+       "language": "python3",
+       "test_timeout_secs": 600,
+       "name": "Host Tests for host_debug_impeller_vulkan",
+       "parameters": [
+           "--variant",
+           "host_debug_impeller_vulkan",
+           "--type",
+           "impeller",
+           "--engine-capture-core-dump"
+       ],
+       "script": "flutter/testing/run_tests.py",
+       "contexts": ["android_virtual_device"]
+   }
+]
+```
+
+Description of the fields:
+
+* **language** - the executable used to run the script, e.g. python3, bash.
+In general any executable found in the path can be used as language. The
+default is empty which means no interpreter will be used to run the script
+and it is assumed the script is already an executable with the right
+permissions to run in the target platform.
+* **test_timeout_secs** - the timeout in seconds for the step running the test. This value overrides the
+default 1 hour timeout. When debugging, or if a third-party program is known to misbehave, it is recommended to add timeouts to allow LUCI services to collect logs.
+* **name** - the name of the step running the script.
+* **parameters** - flags or parameters passed to the script. Parameters
+accept magic environment variables(placeholders replaced before executing
+the test).
+* **Script** - the path to the script to execute relative to the checkout
+directory.
+* **contexts** - a list of available contexts to add to the text execution step.
+The list of supported contexts can be found [here](https://flutter.googlesource.com/recipes/+/refs/heads/main/recipe_modules/flutter_deps/api.py#687). As of 06/20/23 two contexts are supported:
+"android_virtual_device" and "metric_center_token".
+* **test_if** - a regex of what branches this test should run on. Defaults
+to everywhere.
+
+The test scripts will run in a deferred context (failing the step only after
+logs have been uploaded). Tester and builder recipes provide an environment
+variable called FLUTTER\_LOGS\_DIR pointing a temporary directory where the
+test runner can place any logs|artifacts needed to debug issues. At the end
+of the test execution the content of FLUTTER\_LOGS\_DIR will be uploaded to
+Google Cloud Storage before signaling the pass | fail test state.
+
+Contexts are free form python contexts that communicate with the test script
+through environment variables. E.g. metric_center_token saves an access token
+to an [environment variable "token_path"](https://flutter.googlesource.com/recipes/+/refs/heads/main/recipe_modules/token_util/api.py#14) for the test to access it.
+
+Note that to keep the recipes generic they don’t know anything about what
+the test script is doing and it is the responsibility of the test script to
+copy the relevant files to the FLUTTER\_LOGS\_DIR directory.
+
+#### Generators
+
+Generators are scripts used to generate artifacts combining the output of two
+or more sub-builds. The most common use case is to generate universal binaries for
+Mac/iOS artifacts.
+
+Generators can be written in any language but they are required to follow some
+guidelines to make them compatible with the engine build system.
+
+The guidelines are as follows:
+
+* Flags receiving paths to resources from multiple sub-builds need to use paths
+relative to the checkout (`src/`) directory. If there are global generators in a build
+configuration, the engine\_v2 recipes will download the full sub-build archives
+to the src/out/&lt;sub-build name> directory.
+* Flags receiving paths to output directories must use paths relative to the
+src/out folder. This is to be able to reference the artifacts in the global
+archives section.
+* The script is in charge of generating the final artifact, e.g. if the script
+generates multiple files that will be zipped later, then it is the responsibility
+of the script to generate the final zip.
+* If the generator is producing a Mac/iOS artifact, then it is the responsibility
+of the script to embed the signing metadata.
+
+Generators contain a single property “tasks” which is a list of tasks to be
+performed.
+
+```json
+"generators": {
+    "tasks": []
+ }
+```
+
+The example above represents a generator configuration with an empty list
+of tasks.
+
+##### Task
+
+A `task` is a dictionary describing the scripts to be executed.
+
+The property's description is as follows:
+
+* **Name** - the name of the step running the script.
+* **Parameters** - flags passed to the script. Both input and output paths must
+be relative to the checkout directory.
+* **Script**, the script path relative to the checkout repository.
+* **Language**, the script language executable to run the script. If empty it is assumed to be bash.
+
+```json
+{
+    "name": "Debug-FlutterMacOS.framework",
+    "parameters": [
+        "--dst",
+        "out/debug",
+        "--arm64-out-dir",
+        "out/ios_debug",
+        "--simulator-x64-out-dir",
+        "out/ios_debug_sim",
+        "--simulator-arm64-out-dir",
+        "out/ios_debug_sim_arm64"
+    ],
+    "script": "flutter/sky/tools/create_full_ios_framework.py",
+    "language": "python3"
+}
+```
+
+### Global Tests
+
+Tests in this section run on a separate bot as independent sub-builds.
+As opposed to tests running within builds, global tests have access to the
+the outputs of all the builds running in the same orchestrator build. A
+use case for global tests is to run flutter/framework tests using the
+artifacts generated by an specific engine build.
+
+Global tests currently support two different scenarios:
+
+* flutter/flutter tests with [tester](https://flutter.googlesource.com/recipes/+/refs/heads/main/recipes/engine_v2/tester.py)
+  recipe. This workflow checks out flutter/flutter to run any of the existing
+  sharded tests using the engine artifacts archived to GCS.
+* complicated engine tests that require the outputs from multiple subbuilds
+  with [tester_engine](https://flutter.googlesource.com/recipes/+/refs/heads/main/recipes/engine_v2/tester_engine.py).
+  This workflow checks out [flutter/engine] and operates over the dependencies passed to it using cas.
+
+Note: the supported scenarios can be later extended to support running devicelab tests although a
+[smart scheduler](https://github.com/flutter/flutter/issues/128294) is a prerequisite for
+it to be scalable(build/test separation model).
+
+Framework test example:
+
+```json
+{
+   "tests": [
+      {
+        "name": "web-tests-1",
+        "shard": "web_tests",
+        "subshard": "1",
+        "test_dependencies": [
+          {
+            "dependency": "chrome_and_driver",
+            "version": "version:111.0a"
+          }
+        ]
+      }
+    ]
+}
+```
+
+The property's description is as follows:
+
+* **name** the name that will be assigned to the sub-build.
+* **shard** the flutter/flutter shard test to run. The supported shard names can be found
+on the flutter framework [test.dart](https://github.com/flutter/flutter/blob/master/dev/bots/test.dart#L244).
+* **subshard** one of the accepted subshard values for shard. Sub-shards are defined as part
+of the shard implementation, please look at the corresponding shard implementation to find the
+accepted values.
+* **test_dependencies** a list of [dependencies](https://flutter.googlesource.com/recipes/+/refs/heads/main/recipe_modules/flutter_deps/api.py#75)
+  required for the test to run.
+
+Engine test example:
+
+```json
+{
+  "tests": [
+    {
+       "name": "test: clang_tidy android_debug_arm64",
+       "recipe": "engine_v2/tester_engine",
+       "drone_dimensions": [
+         "device_type=none",
+         "os=Linux"
+       ],
+       "dependencies": [
+         "host_debug",
+         "android_debug_arm64"
+       ],
+       "tasks": [
+         {
+            "name": "test: clang_tidy android_debug_arm64",
+            "parameters": [
+              "--variant",
+              "android_debug_arm64",
+              "--lint-all",
+              "--shard-id=0",
+              "--shard-variants=host_debug"
+            ],
+            "max_attempts": 1,
+            "script": "flutter/ci/clang_tidy.sh",
+            "test_timeout_secs": 600,
+         }
+       ]
+    }
+  ]
+}
+```
+
+The property's description is as follows:
+
+* **name** the name to assign to the sub-build.
+* **recipe** the recipe name to use if different than tester.
+* **drone_dimensions** a list of strings with key values to select the
+  bot where the test will run.
+* **dependencies** a list of build outputs required
+  by the test. These build outputs are referenced by the name of build
+  generating the output. This type of dependency is shared using CAS and
+  the contents are mounted in checkout/src/out. E.g. a build configuration
+  building the `host_engine` configuration will upload the content of
+  checkout/src/out/host_engine to CAS and a global test with a `host_engine`
+  dependency will mount the content of host engine in the same location of
+  the bot running the test.
+* **tasks** a list of dictionaries representing scripts and parameters to run them.
+
+Example task configuration:
+
+```json
+{
+    "name": "test: clang_tidy android_debug_arm64",
+    "parameters": [
+       "--variant",
+       "android_debug_arm64",
+       "--lint-all",
+       "--shard-id=0",
+       "--shard-variants=host_debug"
+    ],
+    "max_attempts": 1,
+    "script": "flutter/ci/clang_tidy.sh"
+}
+```
+
+The property's description is as follows:
+
+* **name** the name assigned to the step running the script.
+* **parameters** a list of parameters passed to the script execution.
+* **max_attempts** an integer with the maximum number of runs in case of failure.
+* **script** the path relative to checkout/src/ to run.
+* **test_timeout_secs** - the timeout in seconds for the step running the test. This value overrides the
+default 1 hour timeout. When debugging, or if a third-party program is known to misbehave, it is recommended to add timeouts to allow LUCI services to collect logs.
+
+### Global Generators
+
+Global generators follow the same format as local generators but defined at
+the build top level. The main difference is that global generators can create
+new artifacts combining outputs of multiple sub-builds.
+
+### Global Archives
+
+The archives component provides instructions to upload the artifacts generated
+by the global generators. Is a list of dictionaries with three keys: `source` and
+`destination`, and `realm`. `source` is a path relative to the checkout repository,
+`destination` is a relative path to &lt;bucket>/flutter/&lt;commit>, and `realm` is
+a string with either `production` or `experimental` value.
+
+The realm value is used to build the destination path of the artifacts.
+`production` will upload the artifacts to the location expected by the flutter
+tool and `experimental` will add experimental as a prefix to the path to avoid
+interfering with the production artifacts.
+
+```json
+"archives": [
+    {
+        "source": "out/debug/artifacts.zip",
+        "destination": "ios/artifacts.zip",
+        "realm": "production"
+    },
+]
+```
+
+The example above will cause the file &lt;checkout>/out/debug/artifacts.zip to
+be uploaded &lt;bucket>/flutter/&lt;commit>/ios/artifacts.zip.
+
+## Triaging global generators
+
+Global generators can run locally if all their sub-build dependencies are
+downloaded. This section explains how to triage a local generator.
+
+The instructions on this section can be used to triage problems with artifacts
+created by glocal generators(E.g.`Debug|Release|Profile-ios-Flutter.xcframework`)
+using the build outputs of CI subbuilds. During the migration to engine v2 we had
+a regression in the size of the flutter libraries, using this process we were able
+to inspect the files as they were generated by the CI, make changes to the generators
+and run the generators locally to validate the fixes.
+
+### Prerequisites (one time installation)
+
+#### Install CAS utility
+
+CAS client is required to download the sub-build artifacts. To install
+it in your machine run the following steps:
+
+* `mkdir $HOME/tools`
+* Download and unzip CAS binaries from
+  [https://chrome-infra-packages.appspot.com/p/infra/tools/luci/cas]
+* Add $HOME/tools to path and your ~/.bashrc
+
+#### Gclient engine checkout
+
+Create a gclient checkout following instructions from
+[Setting up the engine environment](https://github.com/flutter/flutter/wiki/Setting-up-the-Engine-development-environment).
+
+### Download sub-builds to the gclient checkout out folder
+
+CAS sub-build artifacts can be downloaded using information from a LUCI build.
+Using [https://ci.chromium.org/p/flutter/builders/prod/Mac%20mac_ios_engine/2818]
+as an example the execution details from steps 13 - 17 show the commands to
+download the archives. `-dir` parameter needs to be updated to point to the
+relative or full path to the out folder in your gclient checkout.
+
+These are the commands to execute for our example build:
+
+```bash
+pushd <gclient checkout>/src/out
+cas download -cas-instance projects/chromium-swarm/instances/default_instance -digest 39f15436deaed30f861bdd507ba6297f2f26a2ff13d45acfd8819dbcda346faa/88 -dir ./
+cas download -cas-instance projects/chromium-swarm/instances/default_instance -digest bdec3208e70ba5e50ee7bbedaaff4588d3f58167ad3d8b1c46d29c6ac3a18c00/94 -dir ./
+cas download -cas-instance projects/chromium-swarm/instances/default_instance -digest d19edb65072aa9d872872b55d3c270db40c6a626c8a851ffcb457a28974f3621/84 -dir ./
+cas download -cas-instance projects/chromium-swarm/instances/default_instance -digest ac6f08662d18502cfcd844771bae736f4354cb3fe209552fcf2181771e139e0b/86 -dir ./
+cas download -cas-instance projects/chromium-swarm/instances/default_instance -digest 1d4d1a3b93847451fe69c1939d7582c0d728b198a40abd06f43d845117ef3214/86 -dir ./
+```
+
+The previous commands will create the ios_debug, ios_debug_sim, ios_debug_sim_arm64,
+ios_profile, and ios_release folders with the artifacts generated by its
+corresponding sub-builds.
+
+Once the checkout and dependencies are available locally we can cd|pushd to the
+root of the client checkout and run the global generator. The command can be
+copied verbatim from the executions details of the build.
+
+The following example will run the generator to create the ios artifacts:
+
+```bash
+python3 flutter/sky/tools/create_full_ios_framework.py --dst out/release \
+--arm64-out-dir out/ios_release --simulator-x64-out-dir out/ios_debug_sim \
+--simulator-arm64-out-dir out/ios_debug_sim_arm64 --dsym --strip
+```
diff --git a/ci/builders/linux_android_aot_engine.json b/ci/builders/linux_android_aot_engine.json
index d28dfc1d8d4871e75781f0798f4064d7f642ae6f..d242283c719e4a8abd4ac433f76e663370f46cb9 100644
--- a/ci/builders/linux_android_aot_engine.json
+++ b/ci/builders/linux_android_aot_engine.json
@@ -11,22 +11,25 @@
                         "out/android_profile/zip_archives/android-arm-profile/linux-x64.zip",
                         "out/android_profile/zip_archives/android-arm-profile/symbols.zip",
                         "out/android_profile/zip_archives/download.flutter.io"
-                    ]
+                    ],
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
                 "device_type=none",
                 "os=Linux"
             ],
-            "gclient_custom_vars": {
-                "download_android_deps": false
+            "gclient_variables": {
+                "use_rbe": true
             },
             "gn": [
                 "--runtime-mode",
                 "profile",
                 "--android",
                 "--android-cpu",
-                "arm"
+                "arm",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "android_profile",
             "ninja": {
@@ -37,8 +40,7 @@
                     "flutter/shell/platform/android:embedding_jars",
                     "flutter/shell/platform/android:abi_jars"
                 ]
-            },
-            "tests": []
+            }
         },
         {
             "archives": [
@@ -51,22 +53,25 @@
                         "out/android_release/zip_archives/android-arm-release/linux-x64.zip",
                         "out/android_release/zip_archives/android-arm-release/symbols.zip",
                         "out/android_release/zip_archives/download.flutter.io"
-                    ]
+                    ],
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
                 "device_type=none",
                 "os=Linux"
             ],
-            "gclient_custom_vars": {
-                "download_android_deps": false
+            "gclient_variables": {
+                "use_rbe": true
             },
             "gn": [
                 "--runtime-mode",
                 "release",
                 "--android",
                 "--android-cpu",
-                "arm"
+                "arm",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "android_release",
             "ninja": {
@@ -77,8 +82,7 @@
                     "flutter/shell/platform/android:embedding_jars",
                     "flutter/shell/platform/android:abi_jars"
                 ]
-            },
-            "tests": []
+            }
         },
         {
             "archives": [
@@ -90,23 +94,27 @@
                         "out/android_release_arm64/zip_archives/android-arm64-release/artifacts.zip",
                         "out/android_release_arm64/zip_archives/android-arm64-release/linux-x64.zip",
                         "out/android_release_arm64/zip_archives/android-arm64-release/symbols.zip",
+                        "out/android_release_arm64/zip_archives/android-arm64-release/analyze-snapshot-linux-x64.zip",
                         "out/android_release_arm64/zip_archives/download.flutter.io"
-                    ]
+                    ],
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
                 "device_type=none",
                 "os=Linux"
             ],
-            "gclient_custom_vars": {
-                "download_android_deps": false
+            "gclient_variables": {
+                "use_rbe": true
             },
             "gn": [
                 "--runtime-mode",
                 "release",
                 "--android",
                 "--android-cpu",
-                "arm64"
+                "arm64",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "android_release_arm64",
             "ninja": {
@@ -114,10 +122,21 @@
                 "targets": [
                     "default",
                     "clang_x64/gen_snapshot",
-                    "flutter/shell/platform/android:abi_jars"
+                    "flutter/shell/platform/android:abi_jars",
+                    "flutter/shell/platform/android:analyze_snapshot"
                 ]
             },
-            "tests": []
+            "tests": [
+                {
+                    "name": "Generate treemap for android_release_arm64",
+                    "language": "bash",
+                    "script": "flutter/ci/binary_size_treemap.sh",
+                    "parameters": [
+                        "../../src/out/android_release_arm64/libflutter.so",
+                        "${FLUTTER_LOGS_DIR}"
+                    ]
+                }
+            ]
         },
         {
             "archives": [
@@ -128,34 +147,56 @@
                     "include_paths": [
                         "out/android_profile_arm64/zip_archives/android-arm64-profile/artifacts.zip",
                         "out/android_profile_arm64/zip_archives/android-arm64-profile/linux-x64.zip",
+                        "out/android_profile_arm64/zip_archives/android-arm64-profile/symbols.zip",
+                        "out/android_profile_arm64/zip_archives/android-arm64-profile/analyze-snapshot-linux-x64.zip",
                         "out/android_profile_arm64/zip_archives/download.flutter.io"
-                    ]
+                    ],
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
                 "device_type=none",
                 "os=Linux"
             ],
-            "gclient_custom_vars": {
-                "download_android_deps": false
+            "gclient_variables": {
+                "use_rbe": true
             },
             "gn": [
                 "--android",
                 "--runtime-mode",
                 "profile",
                 "--android-cpu",
-                "arm64"
+                "arm64",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "android_profile_arm64",
             "ninja": {
                 "config": "android_profile_arm64",
                 "targets": [
-                    "default",
                     "clang_x64/gen_snapshot",
-                    "flutter/shell/platform/android:abi_jars"
+                    "default",
+                    "flutter/testing/scenario_app/android",
+                    "flutter/shell/platform/android:abi_jars",
+                    "flutter/shell/platform/android:analyze_snapshot"
                 ]
             },
-            "tests": []
+            "tests": [
+                {
+                    "env": {
+                        "STORAGE_BUCKET": "gs://flutter_firebase_testlab_staging",
+                        "GCP_PROJECT": "flutter-infra-staging"
+                    },
+                    "name": "test: Android Firebase Test",
+                    "language": "python3",
+                    "script": "flutter/ci/firebase_testlab.py",
+                    "parameters": [
+                        "--variant",
+                        "android_profile_arm64"
+                    ],
+                    "test_if": "main"
+                }
+            ]
         },
         {
             "archives": [
@@ -167,23 +208,27 @@
                         "out/android_profile_x64/zip_archives/android-x64-profile/artifacts.zip",
                         "out/android_profile_x64/zip_archives/android-x64-profile/linux-x64.zip",
                         "out/android_profile_x64/zip_archives/android-x64-profile/symbols.zip",
+                        "out/android_profile_x64/zip_archives/android-x64-profile/analyze-snapshot-linux-x64.zip",
                         "out/android_profile_x64/zip_archives/download.flutter.io"
-                    ]
+                    ],
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
                 "device_type=none",
                 "os=Linux"
             ],
-            "gclient_custom_vars": {
-                "download_android_deps": false
+            "gclient_variables": {
+                "use_rbe": true
             },
             "gn": [
                 "--runtime-mode",
                 "profile",
                 "--android",
                 "--android-cpu",
-                "x64"
+                "x64",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "android_profile_x64",
             "ninja": {
@@ -191,10 +236,10 @@
                 "targets": [
                     "default",
                     "clang_x64/gen_snapshot",
-                    "flutter/shell/platform/android:abi_jars"
+                    "flutter/shell/platform/android:abi_jars",
+                    "flutter/shell/platform/android:analyze_snapshot"
                 ]
-            },
-            "tests": []
+            }
         },
         {
             "archives": [
@@ -206,23 +251,27 @@
                         "out/android_release_x64/zip_archives/android-x64-release/artifacts.zip",
                         "out/android_release_x64/zip_archives/android-x64-release/linux-x64.zip",
                         "out/android_release_x64/zip_archives/android-x64-release/symbols.zip",
+                        "out/android_release_x64/zip_archives/android-x64-release/analyze-snapshot-linux-x64.zip",
                         "out/android_release_x64/zip_archives/download.flutter.io"
-                    ]
+                    ],
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
                 "device_type=none",
                 "os=Linux"
             ],
-            "gclient_custom_vars": {
-                "download_android_deps": false
+            "gclient_variables": {
+                "use_rbe": true
             },
             "gn": [
                 "--runtime-mode",
                 "release",
                 "--android",
                 "--android-cpu",
-                "x64"
+                "x64",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "android_release_x64",
             "ninja": {
@@ -230,11 +279,22 @@
                 "targets": [
                     "default",
                     "clang_x64/gen_snapshot",
-                    "flutter/shell/platform/android:abi_jars"
+                    "flutter/shell/platform/android:abi_jars",
+                    "flutter/shell/platform/android:analyze_snapshot"
                 ]
-            },
-            "tests": []
+            }
         }
     ],
-    "tests": []
+    "generators": {
+        "tasks": [
+            {
+                "name": "Verify-export-symbols-release-binaries",
+                "parameters": [
+                    "src/out"
+                ],
+                "script": "flutter/testing/symbols/verify_exported.dart",
+                "language": "dart"
+            }
+        ]
+    }
 }
diff --git a/ci/builders/linux_android_debug_engine.json b/ci/builders/linux_android_debug_engine.json
index 07be90ab6c690f6464074cada457498f77914906..1959f62b5cc20327f482e22dcef419b707e65e90 100644
--- a/ci/builders/linux_android_debug_engine.json
+++ b/ci/builders/linux_android_debug_engine.json
@@ -9,17 +9,23 @@
                     "include_paths": [
                         "out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip",
                         "out/android_jit_release_x86/zip_archives/download.flutter.io"
-                    ]
+                    ],
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
                 "device_type=none",
                 "os=Linux"
             ],
+            "gclient_variables": {
+                "use_rbe": true
+            },
             "gn": [
                 "--android",
                 "--android-cpu=x86",
-                "--runtime-mode=jit_release"
+                "--runtime-mode=jit_release",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "android_jit_release_x86",
             "ninja": {
@@ -35,6 +41,7 @@
                 {
                     "language": "python3",
                     "name": "Host Tests for android_jit_release_x86",
+                    "script": "flutter/testing/run_tests.py",
                     "parameters": [
                         "--variant",
                         "android_jit_release_x86",
@@ -43,41 +50,10 @@
                         "--engine-capture-core-dump",
                         "--android-variant",
                         "android_jit_release_x86"
-                    ],
-                    "script": "flutter/testing/run_tests.py",
-                    "type": "local"
+                    ]
                 }
             ]
         },
-        {
-            "archives": [
-                {
-                    "name": "android_debug_unopt",
-                    "type": "gcs",
-                    "base_path": "out/android_release/zip_archives/",
-                    "include_paths": []
-                }
-            ],
-            "drone_dimensions": [
-                "device_type=none",
-                "os=Linux"
-            ],
-            "gclient_custom_vars": {
-                "download_android_deps": false
-            },
-            "gn": [
-                "--android",
-                "--unoptimized",
-                "--runtime-mode=debug",
-                "--no-lto"
-            ],
-            "name": "android_debug_unopt",
-            "ninja": {
-                "config": "android_debug_unopt",
-                "targets": []
-            },
-            "tests": []
-        },
         {
             "archives": [
                 {
@@ -90,17 +66,23 @@
                         "out/android_debug/zip_archives/download.flutter.io",
                         "out/android_debug/zip_archives/sky_engine.zip",
                         "out/android_debug/zip_archives/android-javadoc.zip"
-                    ]
+                    ],
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
                 "device_type=none",
                 "os=Linux"
             ],
+            "gclient_variables": {
+                "use_rbe": true
+            },
             "gn": [
                 "--android",
                 "--android-cpu=arm",
-                "--no-lto"
+                "--no-lto",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "android_debug",
             "ninja": {
@@ -117,6 +99,7 @@
                 {
                     "language": "python3",
                     "name": "Host Tests for android_debug",
+                    "script": "flutter/testing/run_tests.py",
                     "parameters": [
                         "--variant",
                         "android_debug",
@@ -125,9 +108,7 @@
                         "--engine-capture-core-dump",
                         "--android-variant",
                         "android_debug"
-                    ],
-                    "script": "flutter/testing/run_tests.py",
-                    "type": "local"
+                    ]
                 }
             ]
         },
@@ -141,20 +122,23 @@
                         "out/android_debug_arm64/zip_archives/android-arm64/artifacts.zip",
                         "out/android_debug_arm64/zip_archives/android-arm64/symbols.zip",
                         "out/android_debug_arm64/zip_archives/download.flutter.io"
-                    ]
+                    ],
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
                 "device_type=none",
                 "os=Linux"
             ],
-            "gclient_custom_vars": {
-                "download_android_deps": false
+            "gclient_variables": {
+                "use_rbe": true
             },
             "gn": [
                 "--android",
                 "--android-cpu=arm64",
-                "--no-lto"
+                "--no-lto",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "android_debug_arm64",
             "ninja": {
@@ -163,8 +147,7 @@
                     "flutter",
                     "flutter/shell/platform/android:abi_jars"
                 ]
-            },
-            "tests": []
+            }
         },
         {
             "archives": [
@@ -176,20 +159,23 @@
                         "out/android_debug_x86/zip_archives/android-x86/artifacts.zip",
                         "out/android_debug_x86/zip_archives/android-x86/symbols.zip",
                         "out/android_debug_x86/zip_archives/download.flutter.io"
-                    ]
+                    ],
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
                 "device_type=none",
                 "os=Linux"
             ],
-            "gclient_custom_vars": {
-                "download_android_deps": false
+            "gclient_variables": {
+                "use_rbe": true
             },
             "gn": [
                 "--android",
                 "--android-cpu=x86",
-                "--no-lto"
+                "--no-lto",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "android_debug_x86",
             "ninja": {
@@ -198,8 +184,7 @@
                     "flutter",
                     "flutter/shell/platform/android:abi_jars"
                 ]
-            },
-            "tests": []
+            }
         },
         {
             "archives": [
@@ -211,20 +196,23 @@
                         "out/android_debug_x64/zip_archives/android-x64/artifacts.zip",
                         "out/android_debug_x64/zip_archives/android-x64/symbols.zip",
                         "out/android_debug_x64/zip_archives/download.flutter.io"
-                    ]
+                    ],
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
                 "device_type=none",
                 "os=Linux"
             ],
-            "gclient_custom_vars": {
-                "download_android_deps": false
+            "gclient_variables": {
+                "use_rbe": true
             },
             "gn": [
                 "--android",
                 "--android-cpu=x64",
-                "--no-lto"
+                "--no-lto",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "android_debug_x64",
             "ninja": {
@@ -233,9 +221,19 @@
                     "flutter",
                     "flutter/shell/platform/android:abi_jars"
                 ]
-            },
-            "tests": []
+            }
         }
     ],
-    "tests": []
+    "generators": {
+        "tasks": [
+            {
+                "name": "Verify-export-symbols-release-binaries",
+                "parameters": [
+                    "src/out"
+                ],
+                "script": "flutter/testing/symbols/verify_exported.dart",
+                "language": "dart"
+            }
+        ]
+    }
 }
diff --git a/ci/builders/linux_android_emulator.json b/ci/builders/linux_android_emulator.json
new file mode 100644
index 0000000000000000000000000000000000000000..4d5bb00957997c2974abb284022cdde288be93f9
--- /dev/null
+++ b/ci/builders/linux_android_emulator.json
@@ -0,0 +1,157 @@
+{
+    "builds": [
+        {
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux",
+                "kvm=1",
+                "cores=8"
+            ],
+            "gclient_variables": {
+                "use_rbe": true
+            },
+            "gn": [
+                "--android",
+                "--android-cpu=x64",
+                "--no-lto",
+                "--rbe",
+                "--no-goma",
+                "--target-dir",
+                "android_emulator_debug_x64"
+            ],
+            "dependencies": [
+                {
+                    "dependency": "goldctl",
+                    "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+                }
+            ],
+            "name": "android_emulator_debug_x64",
+            "ninja": {
+                "config": "android_emulator_debug_x64",
+                "targets": [
+                    "flutter/impeller/toolkit/android:unittests",
+                    "flutter/shell/platform/android:flutter_shell_native_unittests",
+                    "flutter/testing/scenario_app"
+                ]
+            },
+            "tests": [
+                {
+                    "language": "python3",
+                    "name": "Android Unit Tests",
+                    "test_dependencies": [
+                        {
+                            "dependency": "android_virtual_device",
+                            "version": "android_34_google_apis_x64.textpb"
+                        },
+                        {
+                            "dependency": "avd_cipd_version",
+                            "version": "build_id:8759428741582061553"
+                        }
+                    ],
+                    "contexts": [
+                        "android_virtual_device"
+                    ],
+                    "script": "flutter/testing/run_tests.py",
+                    "parameters": [
+                            "--android-variant",
+                            "android_emulator_debug_x64",
+                            "--type",
+                            "android"
+                    ]
+                },
+                {
+                    "language": "dart",
+                    "name": "skia_gold_client/e2e_test",
+                    "script": "flutter/testing/skia_gold_client/tool/e2e_test.dart",
+                    "max_attempts": 1
+                },
+                {
+                    "language": "dart",
+                    "name": "Android Scenario App Integration Tests (Impeller/Vulkan)",
+                    "test_timeout_secs": 900,
+                    "max_attempts": 1,
+                    "test_dependencies": [
+                        {
+                            "dependency": "android_virtual_device",
+                            "version": "android_34_google_apis_x64.textpb"
+                        },
+                        {
+                            "dependency": "avd_cipd_version",
+                            "version": "build_id:8759428741582061553"
+                        }
+                    ],
+                    "contexts": [
+                        "android_virtual_device"
+                    ],
+                    "script": "flutter/testing/scenario_app/bin/run_android_tests.dart",
+                    "parameters": [
+                        "--out-dir=../out/android_emulator_debug_x64",
+                        "--enable-impeller",
+                        "--impeller-backend=vulkan"
+                    ]
+                }
+            ]
+        },
+        {
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux",
+                "kvm=1",
+                "cores=8"
+            ],
+            "gclient_variables": {
+                "use_rbe": true
+            },
+            "gn": [
+                "--android",
+                "--android-cpu=x86",
+                "--no-lto",
+                "--rbe",
+                "--no-goma",
+                "--target-dir",
+                "android_emulator_debug_x86"
+            ],
+            "dependencies": [
+                {
+                    "dependency": "goldctl",
+                    "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+                }
+            ],
+            "name": "android_emulator_debug_x86",
+            "ninja": {
+                "config": "android_emulator_debug_x86",
+                "targets": [
+                    "flutter/impeller/toolkit/android:unittests",
+                    "flutter/shell/platform/android:flutter_shell_native_unittests",
+                    "flutter/testing/scenario_app"
+                ]
+            },
+            "tests": [
+                {
+                    "language": "python3",
+                    "name": "Android Unit Tests (API 28)",
+                    "test_dependencies": [
+                        {
+                            "dependency": "android_virtual_device",
+                            "version": "android_28_google_apis_x86.textpb"
+                        },
+                        {
+                            "dependency": "avd_cipd_version",
+                            "version": "build_id:8759428741582061553"
+                        }
+                    ],
+                    "contexts": [
+                        "android_virtual_device"
+                    ],
+                    "script": "flutter/testing/run_tests.py",
+                    "parameters": [
+                            "--android-variant",
+                            "android_emulator_debug_x86",
+                            "--type",
+                            "android"
+                    ]
+                }
+            ]
+        }
+    ]
+}
diff --git a/ci/builders/linux_android_emulator_api_33.json b/ci/builders/linux_android_emulator_api_33.json
new file mode 100644
index 0000000000000000000000000000000000000000..7f02655523cdd271a456962390ea805b9ef013a6
--- /dev/null
+++ b/ci/builders/linux_android_emulator_api_33.json
@@ -0,0 +1,88 @@
+{
+    "builds": [
+        {
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux",
+                "kvm=1",
+                "cores=8"
+            ],
+            "gclient_variables": {
+                "use_rbe": true
+            },
+            "gn": [
+                "--android",
+                "--android-cpu=x64",
+                "--no-lto",
+                "--rbe",
+                "--no-goma",
+                "--target-dir",
+                "android_debug_api33_x64"
+            ],
+            "dependencies": [
+                {
+                    "dependency": "goldctl",
+                    "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+                }
+            ],
+            "name": "android_debug_api33_x64",
+            "ninja": {
+                "config": "android_debug_api33_x64",
+                "targets": [
+                    "flutter/impeller/toolkit/android:unittests",
+                    "flutter/shell/platform/android:flutter_shell_native_unittests",
+                    "flutter/testing/scenario_app"
+                ]
+            },
+            "tests": [
+                {
+                    "language": "python3",
+                    "name": "Android Unit Tests",
+                    "test_dependencies": [
+                        {
+                            "dependency": "android_virtual_device",
+                            "version": "android_33_google_apis_x64.textpb"
+                        },
+                        {
+                            "dependency": "avd_cipd_version",
+                            "version": "build_id:8759428741582061553"
+                        }
+                    ],
+                    "contexts": [
+                        "android_virtual_device"
+                    ],
+                    "script": "flutter/testing/run_tests.py",
+                    "parameters": [
+                        "--android-variant",
+                        "android_debug_api33_x64",
+                        "--type",
+                        "android"
+                    ]
+                },
+                {
+                    "language": "dart",
+                    "name": "Scenario App Integration Tests",
+                    "test_timeout_secs": 900,
+                    "max_attempts": 1,
+                    "test_dependencies": [
+                        {
+                            "dependency": "android_virtual_device",
+                            "version": "android_33_google_apis_x64.textpb"
+                        },
+                        {
+                            "dependency": "avd_cipd_version",
+                            "version": "build_id:8759428741582061553"
+                        }
+                    ],
+                    "contexts": [
+                        "android_virtual_device"
+                    ],
+                    "script": "flutter/testing/scenario_app/bin/run_android_tests.dart",
+                    "parameters": [
+                        "--out-dir=../out/android_debug_api33_x64"
+                    ]
+                }
+            ]
+        }
+    ]
+}
diff --git a/ci/builders/linux_android_emulator_skia.json b/ci/builders/linux_android_emulator_skia.json
new file mode 100644
index 0000000000000000000000000000000000000000..a1a4d0321b13321f62ca68d6ca17f3e511ca347a
--- /dev/null
+++ b/ci/builders/linux_android_emulator_skia.json
@@ -0,0 +1,90 @@
+{
+    "builds": [
+        {
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux",
+                "kvm=1",
+                "cores=8"
+            ],
+            "gclient_variables": {
+                "use_rbe": true
+            },
+            "gn": [
+                "--android",
+                "--android-cpu=x64",
+                "--no-lto",
+                "--rbe",
+                "--no-goma",
+                "--target-dir",
+                "android_emulator_skia_debug_x64"
+            ],
+            "dependencies": [
+                {
+                    "dependency": "goldctl",
+                    "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+                }
+            ],
+            "name": "android_emulator_skia_debug_x64",
+            "ninja": {
+                "config": "android_emulator_skia_debug_x64",
+                "targets": [
+                    "flutter/impeller/toolkit/android:unittests",
+                    "flutter/shell/platform/android:flutter_shell_native_unittests",
+                    "flutter/testing/scenario_app"
+                ]
+            },
+            "tests": [
+                {
+                    "language": "dart",
+                    "name": "Android Scenario App Integration Tests (Skia)",
+                    "test_timeout_secs": 900,
+                    "max_attempts": 1,
+                    "test_dependencies": [
+                        {
+                            "dependency": "android_virtual_device",
+                            "version": "android_34_google_apis_x64.textpb"
+                        },
+                        {
+                            "dependency": "avd_cipd_version",
+                            "version": "build_id:8759428741582061553"
+                        }
+                    ],
+                    "contexts": [
+                        "android_virtual_device"
+                    ],
+                    "script": "flutter/testing/scenario_app/bin/run_android_tests.dart",
+                    "parameters": [
+                        "--out-dir=../out/android_emulator_skia_debug_x64",
+                        "--no-enable-impeller"
+                    ]
+                },
+                {
+                    "language": "dart",
+                    "name": "Android Scenario App Integration Tests (Skia, SurfaceTexture)",
+                    "test_timeout_secs": 900,
+                    "max_attempts": 1,
+                    "test_dependencies": [
+                        {
+                            "dependency": "android_virtual_device",
+                            "version": "android_34_google_apis_x64.textpb"
+                        },
+                        {
+                            "dependency": "avd_cipd_version",
+                            "version": "build_id:8759428741582061553"
+                        }
+                    ],
+                    "contexts": [
+                        "android_virtual_device"
+                    ],
+                    "script": "flutter/testing/scenario_app/bin/run_android_tests.dart",
+                    "parameters": [
+                        "--out-dir=../out/android_emulator_skia_debug_x64",
+                        "--no-enable-impeller",
+                        "--force-surface-producer-surface-texture"
+                    ]
+                }
+            ]
+        }
+    ]
+}
diff --git a/ci/builders/linux_arm_host_engine.json b/ci/builders/linux_arm_host_engine.json
index 46cf1bd06d8fa557155b9fa55b0c970649f81ecb..a8a71846bfca816e0a29a08bd6390875c974d320 100644
--- a/ci/builders/linux_arm_host_engine.json
+++ b/ci/builders/linux_arm_host_engine.json
@@ -8,15 +8,17 @@
                     "base_path": "out/linux_profile_arm64/zip_archives/",
                     "include_paths": [
                         "out/linux_profile_arm64/zip_archives/linux-arm64-profile/linux-arm64-flutter-gtk.zip"
-                    ]
+                    ],
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
                 "device_type=none",
                 "os=Linux"
             ],
-            "gclient_custom_vars": {
-                "download_android_deps": false
+            "gclient_variables": {
+                "download_android_deps": false,
+                "use_rbe": true
             },
             "gn": [
                 "--runtime-mode",
@@ -24,7 +26,9 @@
                 "--no-lto",
                 "--target-os=linux",
                 "--linux-cpu=arm64",
-                "--prebuilt-dart-sdk"
+                "--prebuilt-dart-sdk",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "linux_profile_arm64",
             "ninja": {
@@ -32,8 +36,7 @@
                 "targets": [
                     "flutter/shell/platform/linux:flutter_gtk"
                 ]
-            },
-            "tests": []
+            }
         },
         {
             "archives": [
@@ -46,23 +49,26 @@
                         "out/linux_debug_arm64/zip_archives/linux-arm64/font-subset.zip",
                         "out/linux_debug_arm64/zip_archives/linux-arm64-debug/linux-arm64-flutter-gtk.zip",
                         "out/linux_debug_arm64/zip_archives/dart-sdk-linux-arm64.zip"
-                    ]
+                    ],
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
                 "device_type=none",
                 "os=Linux"
             ],
-            "gclient_custom_vars": {
-                "download_android_deps": false
+            "gclient_variables": {
+                "download_android_deps": false,
+                "use_rbe": true
             },
             "gn": [
                 "--runtime-mode",
                 "debug",
-                "--full-dart-sdk",
                 "--target-os=linux",
                 "--linux-cpu=arm64",
-                "--prebuilt-dart-sdk"
+                "--prebuilt-dart-sdk",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "linux_debug_arm64",
             "ninja": {
@@ -70,11 +76,10 @@
                 "targets": [
                     "flutter/build/archives:artifacts",
                     "flutter/build/archives:dart_sdk_archive",
-                    "flutter/tools/font-subset",
+                    "flutter/tools/font_subset",
                     "flutter/shell/platform/linux:flutter_gtk"
                 ]
-            },
-            "tests": []
+            }
         },
         {
             "archives": [
@@ -84,22 +89,26 @@
                     "base_path": "out/linux_release_arm64/zip_archives/",
                     "include_paths": [
                         "out/linux_release_arm64/zip_archives/linux-arm64-release/linux-arm64-flutter-gtk.zip"
-                    ]
+                    ],
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
                 "device_type=none",
                 "os=Linux"
             ],
-            "gclient_custom_vars": {
-                "download_android_deps": false
+            "gclient_variables": {
+                "download_android_deps": false,
+                "use_rbe": true
             },
             "gn": [
                 "--runtime-mode",
                 "release",
                 "--target-os=linux",
                 "--linux-cpu=arm64",
-                "--prebuilt-dart-sdk"
+                "--prebuilt-dart-sdk",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "linux_release_arm64",
             "ninja": {
@@ -107,9 +116,7 @@
                 "targets": [
                     "flutter/shell/platform/linux:flutter_gtk"
                 ]
-            },
-            "tests": []
+            }
         }
-    ],
-    "tests": []
+    ]
 }
diff --git a/ci/builders/linux_clang_tidy.json b/ci/builders/linux_clang_tidy.json
new file mode 100644
index 0000000000000000000000000000000000000000..b233e117d67c2274bbd3db281c63283c8862015b
--- /dev/null
+++ b/ci/builders/linux_clang_tidy.json
@@ -0,0 +1,202 @@
+{
+    "builds": [
+        {
+            "archives": [],
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux"
+            ],
+            "gclient_variables": {
+                "use_rbe": true
+            },
+            "gn": [
+                "--android",
+                "--android-cpu",
+                "arm64",
+                "--no-lto",
+                "--target-dir",
+                "android_debug_arm64_clang_tidy",
+                "--rbe",
+                "--no-goma"
+            ],
+            "name": "android_debug_arm64_clang_tidy",
+            "ninja": {
+                "config": "android_debug_arm64_clang_tidy"
+            }
+        },
+        {
+            "archives": [],
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux"
+            ],
+            "gclient_variables": {
+                "use_rbe": true
+            },
+            "gn": [
+                "--runtime-mode",
+                "debug",
+                "--prebuilt-dart-sdk",
+                "--no-lto",
+                "--target-dir",
+                "host_debug_clang_tidy",
+                "--rbe",
+                "--no-goma"
+            ],
+            "name": "host_debug_clang_tidy",
+            "ninja": {
+                "config": "host_debug_clang_tidy"
+            }
+        }
+    ],
+    "tests": [
+        {
+            "name": "test: lint host_debug 0",
+            "recipe": "engine_v2/tester_engine",
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux",
+                "cores=32"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false
+            },
+            "dependencies": [
+                "host_debug_clang_tidy"
+            ],
+            "tasks": [
+                {
+                    "name": "test: lint host_debug",
+                    "parameters": [
+                        "--verbose",
+                        "--variant",
+                        "host_debug_clang_tidy",
+                        "--lint-all",
+                        "--shard-id=0",
+                        "--shard-variants=host_debug_clang_tidy,host_debug_clang_tidy,host_debug_clang_tidy"
+                    ],
+                    "max_attempts": 1,
+                    "script": "flutter/ci/clang_tidy.sh"
+                }
+            ]
+        },
+        {
+            "name": "test: lint host_debug 1",
+            "recipe": "engine_v2/tester_engine",
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux",
+                "cores=32"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false
+            },
+            "dependencies": [
+                "host_debug_clang_tidy"
+            ],
+            "tasks": [
+                {
+                    "name": "test: lint host_debug",
+                    "parameters": [
+                        "--verbose",
+                        "--variant",
+                        "host_debug_clang_tidy",
+                        "--lint-all",
+                        "--shard-id=1",
+                        "--shard-variants=host_debug_clang_tidy,host_debug_clang_tidy,host_debug_clang_tidy"
+                    ],
+                    "max_attempts": 1,
+                    "script": "flutter/ci/clang_tidy.sh"
+                }
+            ]
+        },
+        {
+            "name": "test: lint host_debug 2",
+            "recipe": "engine_v2/tester_engine",
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux",
+                "cores=32"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false
+            },
+            "dependencies": [
+                "host_debug_clang_tidy"
+            ],
+            "tasks": [
+                {
+                    "name": "test: lint host_debug",
+                    "parameters": [
+                        "--verbose",
+                        "--variant",
+                        "host_debug_clang_tidy",
+                        "--lint-all",
+                        "--shard-id=2",
+                        "--shard-variants=host_debug_clang_tidy,host_debug_clang_tidy,host_debug_clang_tidy"
+                    ],
+                    "max_attempts": 1,
+                    "script": "flutter/ci/clang_tidy.sh"
+                }
+            ]
+        },
+        {
+            "name": "test: lint host_debug 3",
+            "recipe": "engine_v2/tester_engine",
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux",
+                "cores=32"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false
+            },
+            "dependencies": [
+                "host_debug_clang_tidy"
+            ],
+            "tasks": [
+                {
+                    "name": "test: lint host_debug",
+                    "parameters": [
+                        "--verbose",
+                        "--variant",
+                        "host_debug_clang_tidy",
+                        "--lint-all",
+                        "--shard-id=3",
+                        "--shard-variants=host_debug_clang_tidy,host_debug_clang_tidy,host_debug_clang_tidy"
+                    ],
+                    "max_attempts": 1,
+                    "script": "flutter/ci/clang_tidy.sh"
+                }
+            ]
+        },
+        {
+            "name": "test: lint android_debug_arm64",
+            "recipe": "engine_v2/tester_engine",
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux",
+                "cores=32"
+            ],
+            "dependencies": [
+                "host_debug_clang_tidy",
+                "android_debug_arm64_clang_tidy"
+            ],
+            "tasks": [
+                {
+                    "name": "test: lint android_debug_arm64",
+                    "parameters": [
+                        "--verbose",
+                        "--variant",
+                        "android_debug_arm64_clang_tidy",
+                        "--lint-all",
+                        "--shard-id=0",
+                        "--shard-variants=host_debug_clang_tidy,host_debug_clang_tidy,host_debug_clang_tidy,host_debug_clang_tidy"
+                    ],
+                    "max_attempts": 1,
+                    "script": "flutter/ci/clang_tidy.sh"
+                }
+            ]
+        }
+    ]
+}
diff --git a/ci/builders/linux_fuchsia.json b/ci/builders/linux_fuchsia.json
new file mode 100644
index 0000000000000000000000000000000000000000..ab96dfc260229f5f8dfb0911a01b78292dd90443
--- /dev/null
+++ b/ci/builders/linux_fuchsia.json
@@ -0,0 +1,518 @@
+{
+    "builds": [
+        {
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "use_rbe": true
+            },
+            "gn": [
+                "--fuchsia",
+                "--fuchsia-cpu",
+                "arm64",
+                "--runtime-mode",
+                "profile",
+                "--rbe",
+                "--no-goma"
+            ],
+            "name": "fuchsia_profile_arm64",
+            "ninja": {
+                "config": "fuchsia_profile_arm64",
+                "targets": [
+                    "flutter/shell/platform/fuchsia:fuchsia"
+                ]
+            }
+        },
+        {
+            "cas_archive": false,
+            "drone_dimensions": [
+                "device_type=none",
+                "kvm=1",
+                "os=Linux"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "run_fuchsia_emu": true,
+                "use_rbe": true
+            },
+            "gn": [
+                "--fuchsia",
+                "--fuchsia-cpu",
+                "arm64",
+                "--runtime-mode",
+                "profile",
+                "--no-lto",
+                "--rbe",
+                "--no-goma"
+            ],
+            "name": "fuchsia_profile_arm64_tester",
+            "ninja": {
+                "config": "fuchsia_profile_arm64",
+                "targets": [
+                    "flutter/shell/platform/fuchsia:fuchsia",
+                    "flutter/shell/platform/fuchsia/dart_runner:dart_runner_tests",
+                    "fuchsia_tests"
+                ]
+            },
+            "tests": [
+                {
+                    "name": "arm64 emulator based profile / aot tests",
+                    "language": "python3",
+                    "script": "flutter/tools/fuchsia/with_envs.py",
+                    "parameters": [
+                        "testing/fuchsia/run_tests.py",
+                        "fuchsia_profile_arm64"
+                    ]
+                }
+            ]
+        },
+        {
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "use_rbe": true
+            },
+            "gn": [
+                "--fuchsia",
+                "--fuchsia-cpu",
+                "arm64",
+                "--runtime-mode",
+                "release",
+                "--rbe",
+                "--no-goma"
+            ],
+            "name": "fuchsia_release_arm64",
+            "ninja": {
+                "config": "fuchsia_release_arm64",
+                "targets": [
+                    "flutter/shell/platform/fuchsia:fuchsia"
+                ]
+            }
+        },
+        {
+            "cas_archive": false,
+            "drone_dimensions": [
+                "device_type=none",
+                "kvm=1",
+                "os=Linux"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "run_fuchsia_emu": true,
+                "use_rbe": true
+            },
+            "gn": [
+                "--fuchsia",
+                "--fuchsia-cpu",
+                "arm64",
+                "--runtime-mode",
+                "release",
+                "--no-lto",
+                "--rbe",
+                "--no-goma"
+            ],
+            "name": "fuchsia_release_arm64_tester",
+            "ninja": {
+                "config": "fuchsia_release_arm64",
+                "targets": [
+                    "flutter/shell/platform/fuchsia:fuchsia",
+                    "flutter/shell/platform/fuchsia/dart_runner:dart_runner_tests",
+                    "fuchsia_tests"
+                ]
+            },
+            "tests": [
+                {
+                    "name": "arm64 emulator based release tests",
+                    "language": "python3",
+                    "script": "flutter/tools/fuchsia/with_envs.py",
+                    "parameters": [
+                        "testing/fuchsia/run_tests.py",
+                        "fuchsia_release_arm64"
+                    ]
+                }
+            ]
+        },
+        {
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "use_rbe": true
+            },
+            "gn": [
+                "--fuchsia",
+                "--fuchsia-cpu",
+                "arm64",
+                "--runtime-mode",
+                "debug",
+                "--no-lto",
+                "--rbe",
+                "--no-goma"
+            ],
+            "name": "fuchsia_debug_arm64",
+            "ninja": {
+                "config": "fuchsia_debug_arm64",
+                "targets": [
+                    "flutter/shell/platform/fuchsia:fuchsia"
+                ]
+            },
+            "tests": [
+                {
+                    "name": "Upload to Symbol Server for arch: arm64",
+                    "language": "python3",
+                    "contexts": ["depot_tools_on_path"],
+                    "script": "flutter/tools/fuchsia/upload_to_symbol_server.py",
+                    "parameters": [
+                        "--symbol-dir",
+                        "out/fuchsia_debug_arm64/.build-id",
+                        "--engine-version",
+                        "${REVISION}",
+                        "--upload"
+                    ]
+                }
+            ]
+        },
+        {
+            "cas_archive": false,
+            "drone_dimensions": [
+                "device_type=none",
+                "kvm=1",
+                "os=Linux"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "run_fuchsia_emu": true,
+                "use_rbe": true
+            },
+            "gn": [
+                "--fuchsia",
+                "--fuchsia-cpu",
+                "arm64",
+                "--runtime-mode",
+                "debug",
+                "--no-lto",
+                "--rbe",
+                "--no-goma"
+            ],
+            "name": "fuchsia_debug_arm64_tester",
+            "ninja": {
+                "config": "fuchsia_debug_arm64",
+                "targets": [
+                    "flutter/shell/platform/fuchsia:fuchsia",
+                    "flutter/shell/platform/fuchsia/dart_runner:dart_runner_tests",
+                    "fuchsia_tests"
+                ]
+            },
+            "tests": [
+                {
+                    "name": "arm64 emulator based debug tests",
+                    "language": "python3",
+                    "script": "flutter/tools/fuchsia/with_envs.py",
+                    "parameters": [
+                        "testing/fuchsia/run_tests.py",
+                        "fuchsia_debug_arm64"
+                    ]
+                }
+            ]
+        },
+        {
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "use_rbe": true
+            },
+            "gn": [
+                "--fuchsia",
+                "--fuchsia-cpu",
+                "x64",
+                "--runtime-mode",
+                "profile",
+                "--rbe",
+                "--no-goma"
+            ],
+            "name": "fuchsia_profile_x64",
+            "ninja": {
+                "config": "fuchsia_profile_x64",
+                "targets": [
+                    "flutter/shell/platform/fuchsia:fuchsia"
+                ]
+            }
+        },
+        {
+            "cas_archive": false,
+            "drone_dimensions": [
+                "device_type=none",
+                "kvm=1",
+                "os=Linux"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "run_fuchsia_emu": true,
+                "use_rbe": true
+            },
+            "gn": [
+                "--fuchsia",
+                "--fuchsia-cpu",
+                "x64",
+                "--runtime-mode",
+                "profile",
+                "--no-lto",
+                "--rbe",
+                "--no-goma"
+            ],
+            "name": "fuchsia_profile_x64_tester",
+            "ninja": {
+                "config": "fuchsia_profile_x64",
+                "targets": [
+                    "flutter/shell/platform/fuchsia:fuchsia",
+                    "flutter/shell/platform/fuchsia/dart_runner:dart_runner_tests",
+                    "fuchsia_tests"
+                ]
+            },
+            "tests": [
+                {
+                    "name": "x64 emulator based profile / aot tests",
+                    "language": "python3",
+                    "script": "flutter/tools/fuchsia/with_envs.py",
+                    "parameters": [
+                        "testing/fuchsia/run_tests.py",
+                        "fuchsia_profile_x64"
+                    ]
+                }
+            ]
+        },
+        {
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "run_fuchsia_emu": true,
+                "use_rbe": true
+            },
+            "gn": [
+                "--fuchsia",
+                "--fuchsia-cpu",
+                "x64",
+                "--runtime-mode",
+                "release",
+                "--rbe",
+                "--no-goma"
+            ],
+            "name": "fuchsia_release_x64",
+            "ninja": {
+                "config": "fuchsia_release_x64",
+                "targets": [
+                    "flutter/shell/platform/fuchsia:fuchsia"
+                ]
+            }
+        },
+        {
+            "cas_archive": false,
+            "drone_dimensions": [
+                "device_type=none",
+                "kvm=1",
+                "os=Linux"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "run_fuchsia_emu": true,
+                "use_rbe": true
+            },
+            "gn": [
+                "--fuchsia",
+                "--fuchsia-cpu",
+                "x64",
+                "--runtime-mode",
+                "release",
+                "--no-lto",
+                "--rbe",
+                "--no-goma"
+            ],
+            "name": "fuchsia_release_x64_tester",
+            "ninja": {
+                "config": "fuchsia_release_x64",
+                "targets": [
+                    "flutter/shell/platform/fuchsia:fuchsia",
+                    "flutter/shell/platform/fuchsia/dart_runner:dart_runner_tests",
+                    "fuchsia_tests"
+                ]
+            },
+            "tests": [
+                {
+                    "name": "x64 emulator based release tests",
+                    "language": "python3",
+                    "script": "flutter/tools/fuchsia/with_envs.py",
+                    "parameters": [
+                        "testing/fuchsia/run_tests.py",
+                        "fuchsia_release_x64"
+                    ]
+                }
+            ]
+        },
+        {
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "run_fuchsia_emu": true,
+                "use_rbe": true
+            },
+            "gn": [
+                "--fuchsia",
+                "--fuchsia-cpu",
+                "x64",
+                "--runtime-mode",
+                "debug",
+                "--no-lto",
+                "--rbe",
+                "--no-goma"
+            ],
+            "name": "fuchsia_debug_x64",
+            "ninja": {
+                "config": "fuchsia_debug_x64",
+                "targets": [
+                    "flutter/shell/platform/fuchsia:fuchsia"
+                ]
+            },
+            "tests": [
+                {
+                    "name": "Upload to Symbol Server for arch: x64",
+                    "language": "python3",
+                    "contexts": ["depot_tools_on_path"],
+                    "script": "flutter/tools/fuchsia/upload_to_symbol_server.py",
+                    "parameters": [
+                        "--symbol-dir",
+                        "out/fuchsia_debug_x64/.build-id",
+                        "--engine-version",
+                        "${REVISION}",
+                        "--upload"
+                    ]
+                }
+            ]
+        },
+        {
+            "cas_archive": false,
+            "drone_dimensions": [
+                "device_type=none",
+                "kvm=1",
+                "os=Linux"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "run_fuchsia_emu": true,
+                "use_rbe": true
+            },
+            "gn": [
+                "--fuchsia",
+                "--fuchsia-cpu",
+                "x64",
+                "--runtime-mode",
+                "debug",
+                "--no-lto",
+                "--rbe",
+                "--no-goma"
+            ],
+            "name": "fuchsia_debug_x64_tester",
+            "ninja": {
+                "config": "fuchsia_debug_x64",
+                "targets": [
+                    "flutter/shell/platform/fuchsia:fuchsia",
+                    "flutter/shell/platform/fuchsia/dart_runner:dart_runner_tests",
+                    "fuchsia_tests"
+                ]
+            },
+            "tests": [
+                {
+                    "name": "run_tests test",
+                    "script": "flutter/testing/fuchsia/run_tests_test.py"
+                },
+                {
+                    "name": "build_fuchsia_artifacts test",
+                    "script": "flutter/tools/fuchsia/build_fuchsia_artifacts_test.py"
+                },
+                {
+                    "name": "x64 emulator based debug tests",
+                    "language": "python3",
+                    "script": "flutter/tools/fuchsia/with_envs.py",
+                    "parameters": [
+                        "testing/fuchsia/run_tests.py"
+                    ]
+                }
+            ]
+        }
+    ],
+    "generators": {
+        "tasks": [
+            {
+                "name": "Upload fuchsia artifacts",
+                "parameters": [
+                    "--engine-version",
+                    "${REVISION}",
+                    "--skip-build",
+                    "--upload"
+                ],
+                "script": "flutter/tools/fuchsia/build_fuchsia_artifacts.py",
+                "language": "python3"
+            },
+            {
+                "name": "Upload to CIPD for arch: arm64",
+                "parameters": [
+                    "--engine-version",
+                    "${REVISION}",
+                    "--upload",
+                    "--target-arch",
+                    "arm64",
+                    "--out-dir",
+                    "${LUCI_CLEANUP}",
+                    "--symbol-dirs",
+                    "out/fuchsia_debug_arm64/.build-id",
+                    "out/fuchsia_profile_arm64/.build-id",
+                    "out/fuchsia_release_arm64/.build-id"
+                ],
+                "script": "flutter/tools/fuchsia/merge_and_upload_debug_symbols.py",
+                "language": "python3"
+            },
+            {
+                "name": "Upload to CIPD for arch: x64",
+                "parameters": [
+                    "--engine-version",
+                    "${REVISION}",
+                    "--upload",
+                    "--target-arch",
+                    "x64",
+                    "--out-dir",
+                    "${LUCI_CLEANUP}",
+                    "--symbol-dirs",
+                    "out/fuchsia_debug_x64/.build-id",
+                    "out/fuchsia_profile_x64/.build-id",
+                    "out/fuchsia_release_x64/.build-id"
+                ],
+                "script": "flutter/tools/fuchsia/merge_and_upload_debug_symbols.py",
+                "language": "python3"
+            },
+            {
+                "name": "Verify-export-symbols-release-binaries",
+                "parameters": [
+                    "src/out"
+                ],
+                "script": "flutter/testing/symbols/verify_exported.dart",
+                "language": "dart"
+            }
+        ]
+    }
+}
diff --git a/ci/builders/linux_host_desktop_engine.json b/ci/builders/linux_host_desktop_engine.json
new file mode 100644
index 0000000000000000000000000000000000000000..29393e3a6b976073edee869c2697c7a79e545ec9
--- /dev/null
+++ b/ci/builders/linux_host_desktop_engine.json
@@ -0,0 +1,119 @@
+{
+    "builds": [
+        {
+            "archives": [
+                {
+                    "name": "host_debug",
+                    "base_path": "out/host_debug_desktop/zip_archives/",
+                    "type": "gcs",
+                    "include_paths": [
+                        "out/host_debug_desktop/zip_archives/linux-x64-debug/linux-x64-flutter-gtk.zip"
+                    ],
+                    "realm": "production"
+                }
+            ],
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "use_rbe": true
+            },
+            "gn": [
+                "--runtime-mode",
+                "debug",
+                "--enable-fontconfig",
+                "--prebuilt-dart-sdk",
+                "--rbe",
+                "--no-goma",
+                "--target-dir",
+                "host_debug_desktop"
+            ],
+            "name": "host_debug_desktop",
+            "ninja": {
+                "config": "host_debug_desktop",
+                "targets": [
+                    "flutter/shell/platform/linux:flutter_gtk"
+                ]
+            }
+        },
+        {
+            "archives": [
+                {
+                    "name": "host_profile",
+                    "base_path": "out/host_profile_desktop/zip_archives/",
+                    "type": "gcs",
+                    "include_paths": [
+                        "out/host_profile_desktop/zip_archives/linux-x64-profile/linux-x64-flutter-gtk.zip"
+                    ],
+                    "realm": "production"
+                }
+            ],
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "use_rbe": true
+            },
+            "gn": [
+                "--runtime-mode",
+                "profile",
+                "--no-lto",
+                "--enable-fontconfig",
+                "--prebuilt-dart-sdk",
+                "--rbe",
+                "--no-goma",
+                "--target-dir",
+                "host_profile_desktop"
+            ],
+            "name": "host_profile_desktop",
+            "ninja": {
+                "config": "host_profile_desktop",
+                "targets": [
+                    "flutter/shell/platform/linux:flutter_gtk"
+                ]
+            }
+        },
+        {
+            "archives": [
+                {
+                    "name": "host_release",
+                    "base_path": "out/host_release_desktop/zip_archives/",
+                    "type": "gcs",
+                    "include_paths": [
+                        "out/host_release_desktop/zip_archives/linux-x64-release/linux-x64-flutter-gtk.zip"
+                    ],
+                    "realm": "production"
+                }
+            ],
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "use_rbe": true
+            },
+            "gn": [
+                "--runtime-mode",
+                "release",
+                "--enable-fontconfig",
+                "--prebuilt-dart-sdk",
+                "--rbe",
+                "--no-goma",
+                "--target-dir",
+                "host_release_desktop"
+            ],
+            "name": "host_release_desktop",
+            "ninja": {
+                "config": "host_release_desktop",
+                "targets": [
+                    "flutter/shell/platform/linux:flutter_gtk"
+                ]
+            }
+        }
+    ]
+}
diff --git a/ci/builders/linux_host_engine.json b/ci/builders/linux_host_engine.json
index 395b5ec9270adae43eb1b2a82e71f054f48a2b2f..a9e14038fc590f33356ab153375f354c434acaeb 100644
--- a/ci/builders/linux_host_engine.json
+++ b/ci/builders/linux_host_engine.json
@@ -1,73 +1,6 @@
 {
     "builds": [
         {
-            "archives": [],
-            "drone_dimensions": [
-                "device_type=none",
-                "os=Linux"
-            ],
-            "gclient_custom_vars": {
-                "download_android_deps": false
-            },
-            "gn": [
-                "--runtime-mode",
-                "debug",
-                "--unoptimized",
-                "--prebuilt-dart-sdk"
-            ],
-            "name": "host_debug_unopt",
-            "ninja": {
-                "config": "host_debug_unopt",
-                "targets": [
-                    "flutter",
-                    "flutter/sky/packages"
-                ]
-            },
-            "tests": []
-        },
-        {
-          "archives": [],
-          "drone_dimensions": [
-              "device_type=none",
-              "os=Linux"
-          ],
-          "gclient_custom_vars": {
-              "download_android_deps": false
-          },
-          "gn": [
-              "--runtime-mode",
-              "debug",
-              "--unoptimized",
-              "--prebuilt-dart-sdk",
-              "--enable-impeller-vulkan",
-              "--target-dir",
-              "host_debug_impeller_vulkan"
-          ],
-          "name": "host_debug_impeller_vulkan",
-          "ninja": {
-              "config": "host_debug_impeller_vulkan",
-              "targets": [
-                  "flutter",
-                  "flutter/sky/packages"
-              ]
-          },
-          "tests": [
-            {
-                "language": "python3",
-                "name": "Host Tests for host_debug_impeller_vulkan",
-                "parameters": [
-                    "--variant",
-                    "host_debug_impeller_vulkan",
-                    "--type",
-                    "impeller-vulkan",
-                    "--engine-capture-core-dump"
-                ],
-                "script": "flutter/testing/run_tests.py",
-                "type": "local"
-            }
-        ]
-      },
-      {
             "archives": [
                 {
                     "name": "host_debug",
@@ -78,40 +11,54 @@
                         "out/host_debug/zip_archives/linux-x64/linux-x64-embedder.zip",
                         "out/host_debug/zip_archives/linux-x64/font-subset.zip",
                         "out/host_debug/zip_archives/flutter_patched_sdk.zip",
-                        "out/host_debug/zip_archives/dart-sdk-linux-x64.zip",
-                        "out/host_debug/zip_archives/flutter-web-sdk-linux-x64.zip",
-                        "out/host_debug/zip_archives/linux-x64/linux-x64-flutter-gtk.zip"
-                    ]
+                        "out/host_debug/zip_archives/dart-sdk-linux-x64.zip"
+                    ],
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
                 "device_type=none",
                 "os=Linux"
             ],
-            "gclient_custom_vars": {
-                "download_android_deps": false
+            "gclient_variables": {
+                "download_android_deps": false,
+                "use_rbe": true
             },
             "gn": [
                 "--runtime-mode",
                 "debug",
-                "--full-dart-sdk",
                 "--prebuilt-dart-sdk",
-                "--build-embedder-examples"
+                "--build-embedder-examples",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "host_debug",
             "ninja": {
                 "config": "host_debug",
                 "targets": [
+                    "flutter:unittests",
                     "flutter/build/archives:artifacts",
+                    "flutter/build/archives:dart_sdk_archive",
                     "flutter/build/archives:embedder",
                     "flutter/build/archives:flutter_patched_sdk",
-                    "flutter/build/archives:dart_sdk_archive",
-                    "flutter/web_sdk",
-                    "flutter/tools/font-subset",
-                    "flutter/shell/platform/linux:flutter_gtk"
+                    "flutter/build/dart:copy_dart_sdk",
+                    "flutter/tools/font_subset"
                 ]
             },
-            "tests": []
+            "tests": [
+                {
+                    "language": "python3",
+                    "name": "Host Tests for host_debug",
+                    "script": "flutter/testing/run_tests.py",
+                    "parameters": [
+                        "--variant",
+                        "host_debug",
+                        "--type",
+                        "dart,dart-host",
+                        "--engine-capture-core-dump"
+                    ]
+                }
+            ]
         },
         {
             "archives": [
@@ -119,46 +66,48 @@
                     "name": "host_profile",
                     "base_path": "out/host_profile/zip_archives/",
                     "type": "gcs",
-                    "include_paths": [
-                        "out/host_profile/zip_archives/linux-x64-profile/linux-x64-flutter-gtk.zip"
-                    ]
+                    "include_paths": []
                 }
             ],
             "drone_dimensions": [
                 "device_type=none",
                 "os=Linux"
             ],
-            "gclient_custom_vars": {
-                "download_android_deps": false
+            "gclient_variables": {
+                "download_android_deps": false,
+                "use_rbe": true
             },
             "gn": [
                 "--runtime-mode",
                 "profile",
                 "--no-lto",
                 "--prebuilt-dart-sdk",
-                "--build-embedder-examples"
+                "--build-embedder-examples",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "host_profile",
             "ninja": {
                 "config": "host_profile",
                 "targets": [
-                    "flutter:unittests",
-                    "flutter/shell/platform/linux:flutter_gtk"
+                    "flutter/build/dart:copy_dart_sdk",
+                    "flutter/shell/testing",
+                    "flutter/tools/path_ops",
+                    "flutter:unittests"
                 ]
             },
             "tests": [
                 {
                     "language": "python3",
                     "name": "Host Tests for host_profile",
+                    "script": "flutter/testing/run_tests.py",
                     "parameters": [
                         "--variant",
                         "host_profile",
                         "--type",
-                        "engine",
+                        "dart,dart-host,engine",
                         "--engine-capture-core-dump"
-                    ],
-                    "script": "flutter/testing/run_tests.py",
-                    "type": "local"
+                    ]
                 }
             ]
         },
@@ -169,49 +118,127 @@
                     "base_path": "out/host_release/zip_archives/",
                     "type": "gcs",
                     "include_paths": [
-                        "out/host_release/zip_archives/flutter_patched_sdk_product.zip",
-                        "out/host_release/zip_archives/linux-x64-release/linux-x64-flutter-gtk.zip"
-                    ]
+                        "out/host_release/zip_archives/flutter_patched_sdk_product.zip"
+                    ],
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
                 "device_type=none",
                 "os=Linux"
             ],
-            "gclient_custom_vars": {
-                "download_android_deps": false
+            "dependencies": [
+                {
+                    "dependency": "goldctl",
+                    "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+                }
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "use_rbe": true
             },
             "gn": [
                 "--runtime-mode",
                 "release",
                 "--prebuilt-dart-sdk",
-                "--build-embedder-examples"
+                "--build-embedder-examples",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "host_release",
             "ninja": {
                 "config": "host_release",
                 "targets": [
-                    "flutter:unittests",
+                    "flutter/build/dart:copy_dart_sdk",
+                    "flutter/display_list:display_list_benchmarks",
+                    "flutter/display_list:display_list_builder_benchmarks",
+                    "flutter/display_list:display_list_region_benchmarks",
+                    "flutter/display_list:display_list_transform_benchmarks",
+                    "flutter/fml:fml_benchmarks",
+                    "flutter/impeller/geometry:geometry_benchmarks",
+                    "flutter/impeller/aiks:canvas_benchmarks",
+                    "flutter/lib/ui:ui_benchmarks",
+                    "flutter/shell/common:shell_benchmarks",
+                    "flutter/shell/testing",
+                    "flutter/third_party/txt:txt_benchmarks",
+                    "flutter/tools/path_ops",
                     "flutter/build/archives:flutter_patched_sdk",
-                    "flutter/shell/platform/linux:flutter_gtk"
+                    "flutter:unittests"
                 ]
             },
             "tests": [
                 {
                     "language": "python3",
                     "name": "Host Tests for host_release",
+                    "script": "flutter/testing/run_tests.py",
                     "parameters": [
                         "--variant",
                         "host_release",
                         "--type",
-                        "engine",
+                        "dart,dart-host,engine,benchmarks",
                         "--engine-capture-core-dump"
-                    ],
-                    "script": "flutter/testing/run_tests.py",
-                    "type": "local"
+                    ]
+                },
+                {
+                    "language": "bash",
+                    "name": "Generate metrics test",
+                    "script": "flutter/testing/benchmark/generate_metrics.sh"
+                },
+                {
+                    "language": "bash",
+                    "name": "Upload metrics dry-run",
+                    "script": "flutter/testing/benchmark/upload_metrics.sh",
+                    "parameters": [
+                        "--no-upload"
+                    ]
                 }
             ]
         }
     ],
-    "tests": []
+    "generators": {
+        "tasks": [
+            {
+                "name": "Verify-export-symbols-release-binaries",
+                "parameters": [
+                    "src/out"
+                ],
+                "script": "flutter/testing/symbols/verify_exported.dart",
+                "language": "dart"
+            },
+            {
+                "name": "api-documentation",
+                "parameters": [
+                    "out/docs"
+                ],
+                "script": "flutter/tools/gen_docs.py"
+            }
+        ]
+    },
+    "archives": [
+        {
+            "source": "out/docs/ios-docs.zip",
+            "destination": "ios-docs.zip",
+            "realm": "production"
+        },
+        {
+            "source": "out/docs/macos-docs.zip",
+            "destination": "macos-docs.zip",
+            "realm": "production"
+        },
+        {
+            "source": "out/docs/linux-docs.zip",
+            "destination": "linux-docs.zip",
+            "realm": "production"
+        },
+        {
+            "source": "out/docs/windows-docs.zip",
+            "destination": "windows-docs.zip",
+            "realm": "production"
+        },
+        {
+            "source": "out/docs/impeller-docs.zip",
+            "destination": "impeller-docs.zip",
+            "realm": "production"
+        }
+    ]
 }
diff --git a/ci/builders/linux_unopt.json b/ci/builders/linux_unopt.json
new file mode 100644
index 0000000000000000000000000000000000000000..4987afb3773ab4e9e07c61a9ec26af3c38a79cf6
--- /dev/null
+++ b/ci/builders/linux_unopt.json
@@ -0,0 +1,262 @@
+{
+    "builds": [
+        {
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux",
+                "cores=32"
+            ],
+            "gclient_variables": {
+                "use_rbe": true
+            },
+            "gn": [
+                "--runtime-mode",
+                "debug",
+                "--unoptimized",
+                "--prebuilt-dart-sdk",
+                "--asan",
+                "--lsan",
+                "--dart-debug",
+                "--rbe",
+                "--no-goma"
+            ],
+            "name": "host_debug_unopt",
+            "ninja": {
+                "config": "host_debug_unopt",
+                "targets": [
+                    "flutter/tools/font_subset",
+                    "flutter:unittests",
+                    "flutter/build/dart:copy_dart_sdk",
+                    "flutter/shell/platform/common/client_wrapper:client_wrapper_unittests",
+                    "flutter/shell/platform/common:common_cpp_core_unittests",
+                    "flutter/shell/platform/common:common_cpp_unittests",
+                    "flutter/shell/platform/glfw/client_wrapper:client_wrapper_glfw_unittests",
+                    "flutter/shell/testing",
+                    "sky_engine"
+                ]
+            },
+            "tests": [
+                {
+                    "name": "test: Check formatting",
+                    "script": "flutter/bin/et",
+                    "parameters": [
+                        "format",
+                        "--dry-run",
+                        "--all"
+                    ]
+                },
+                {
+                    "name": "ban GeneratedPluginRegistrant.java",
+                    "script": "flutter/ci/ban_generated_plugin_registrant_java.sh"
+                },
+                {
+                    "name": "ban_test GeneratedPluginRegistrant.java",
+                    "script": "flutter/ci/test/ban_generated_plugin_registrant_java_test.sh"
+                },
+                {
+                    "language": "python3",
+                    "name": "test: Host_Tests_for_host_debug_unopt",
+                    "script": "flutter/testing/run_tests.py",
+                    "parameters": [
+                        "--quiet",
+                        "--logs-dir",
+                        "${FLUTTER_LOGS_DIR}",
+                        "--variant",
+                        "host_debug_unopt",
+                        "--type",
+                        "dart,dart-host,engine",
+                        "--engine-capture-core-dump",
+                        "--use-sanitizer-suppressions"
+                    ]
+                },
+                {
+                    "name": "analyze_dart_ui",
+                    "script": "flutter/ci/analyze.sh"
+                },
+                {
+                    "name": "pylint",
+                    "script": "flutter/ci/pylint.sh"
+                },
+                {
+                    "language": "dart",
+                    "name": "test: observatory and service protocol",
+                    "script": "flutter/shell/testing/observatory/test.dart",
+                    "parameters": [
+                        "out/host_debug_unopt/flutter_tester",
+                        "flutter/shell/testing/observatory/empty_main.dart"
+                    ]
+                },
+                {
+                    "language": "dart",
+                    "name": "test: Lint android host",
+                    "script": "flutter/tools/android_lint/bin/main.dart"
+                },
+                {
+                    "name": "Check build configs",
+                    "script": "flutter/ci/check_build_configs.sh"
+                },
+                {
+                    "name": "Tests of tools/gn",
+                    "language": "python3",
+                    "script": "flutter/tools/gn_test.py"
+                }
+            ]
+        },
+        {
+            "archives": [],
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux",
+                "cores=32"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "use_rbe": true
+            },
+            "gn": [
+                "--runtime-mode",
+                "debug",
+                "--unoptimized",
+                "--prebuilt-dart-sdk",
+                "--target-dir",
+                "host_debug_unopt_impeller_tests",
+                "--rbe",
+                "--no-goma",
+                "--use-glfw-swiftshader"
+            ],
+            "name": "host_debug_unopt_impeller_tests",
+            "ninja": {
+                "config": "host_debug_unopt_impeller_tests",
+                "targets": [
+                    "flutter",
+                    "flutter/sky/packages"
+                ]
+            },
+            "tests": [
+                {
+                    "language": "python3",
+                    "name": "Host Tests for host_debug_unopt_impeller_tests",
+                    "script": "flutter/testing/run_tests.py",
+                    "parameters": [
+                        "--variant",
+                        "host_debug_unopt_impeller_tests",
+                        "--type",
+                        "impeller",
+                        "--engine-capture-core-dump"
+                    ]
+                }
+            ]
+        },
+        {
+            "cas_archive": false,
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux"
+            ],
+            "dependencies": [],
+            "gclient_variables": {
+                "use_rbe": true
+            },
+            "gn": [
+                "--android",
+                "--embedder-for-target",
+                "--target-dir",
+                "android_embedder_debug_unopt",
+                "--unoptimized",
+                "--rbe",
+                "--no-goma"
+            ],
+            "name": "android_embedder_debug_unopt",
+            "ninja": {
+                "config": "android_embedder_debug_unopt",
+                "targets": [
+                    "flutter/shell/platform/embedder:flutter_engine"
+                ]
+            }
+        },
+        {
+            "cas_archive": false,
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux"
+            ],
+            "gclient_variables": {
+                "use_rbe": true
+            },
+            "gn": [
+                "--android",
+                "--android-cpu=arm64",
+                "--no-lto",
+                "--enable-vulkan-validation-layers",
+                "--rbe",
+                "--no-goma"
+            ],
+            "name": "android_debug_arm64_validation_layers",
+            "ninja": {
+                "config": "android_debug_arm64",
+                "targets": [
+                    "flutter",
+                    "flutter/shell/platform/android:abi_jars"
+                ]
+            }
+        },
+        {
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux"
+            ],
+            "dependencies": [
+                {
+                    "dependency": "arm_tools",
+                    "version": "last_updated:2023-02-03T15:32:01-0800"
+                }
+            ],
+            "gclient_variables": {
+                "use_rbe": true
+            },
+            "gn": [
+                "--android",
+                "--unoptimized",
+                "--rbe",
+                "--no-goma"
+            ],
+            "name": "android_debug_unopt",
+            "ninja": {
+                "config": "android_debug_unopt",
+                "targets": [
+                    "flutter/impeller",
+                    "flutter/shell/platform/android:android_jar",
+                    "flutter/shell/platform/android:robolectric_tests"
+                ]
+            },
+            "tests": [
+                {
+                    "language": "python3",
+                    "name": "test: Host Tests for android_debug_unopt",
+                    "script": "flutter/testing/run_tests.py",
+                    "parameters": [
+                        "--variant",
+                        "android_debug_unopt",
+                        "--type",
+                        "java",
+                        "--engine-capture-core-dump",
+                        "--android-variant",
+                        "android_debug_unopt"
+                    ]
+                },
+                {
+                    "language": "python3",
+                    "name": "malioc diff",
+                    "script": "flutter/impeller/tools/malioc_diff.py",
+                    "parameters": [
+                        "--before-relative-to-src",
+                        "flutter/impeller/tools/malioc.json",
+                        "--after-relative-to-src",
+                        "out/android_debug_unopt/gen/malioc",
+                        "--print-diff"
+                    ]
+                }
+            ]
+        }
+    ]
+}
diff --git a/ci/builders/linux_web_engine.json b/ci/builders/linux_web_engine.json
new file mode 100644
index 0000000000000000000000000000000000000000..138e42565327bd1523deeb6f0e97b0970ade7059
--- /dev/null
+++ b/ci/builders/linux_web_engine.json
@@ -0,0 +1,1904 @@
+{
+  "_comment": "THIS IS A GENERATED FILE. Do not edit this file directly.",
+  "_comment2": "See `generate_builder_json.dart` for the generator code",
+  "builds": [
+    {
+      "name": "web_tests/artifacts",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux",
+        "cores=32"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false,
+        "download_emsdk": true
+      },
+      "gn": [
+        "--web",
+        "--runtime-mode=release",
+        "--no-goma"
+      ],
+      "ninja": {
+        "config": "wasm_release",
+        "targets": [
+          "flutter/web_sdk:flutter_web_sdk_archive"
+        ]
+      },
+      "archives": [
+        {
+          "name": "wasm_release",
+          "base_path": "out/wasm_release/zip_archives/",
+          "type": "gcs",
+          "include_paths": [
+            "out/wasm_release/zip_archives/flutter-web-sdk.zip"
+          ],
+          "realm": "production"
+        }
+      ],
+      "generators": {
+        "tasks": [
+          {
+            "name": "check licenses",
+            "parameters": [
+              "check-licenses"
+            ],
+            "scripts": [
+              "flutter/lib/web_ui/dev/felt"
+            ]
+          },
+          {
+            "name": "web engine analysis",
+            "parameters": [
+              "analyze"
+            ],
+            "scripts": [
+              "flutter/lib/web_ui/dev/felt"
+            ]
+          },
+          {
+            "name": "copy artifacts for web tests",
+            "parameters": [
+              "test",
+              "--copy-artifacts"
+            ],
+            "scripts": [
+              "flutter/lib/web_ui/dev/felt"
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "name": "web_tests/test_bundles/dart2js-html-engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+      ],
+      "generators": {
+        "tasks": [
+          {
+            "name": "compile bundle dart2js-html-engine",
+            "parameters": [
+              "test",
+              "--compile",
+              "--bundle=dart2js-html-engine"
+            ],
+            "scripts": [
+              "flutter/lib/web_ui/dev/felt"
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "name": "web_tests/test_bundles/dart2js-html-html",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+      ],
+      "generators": {
+        "tasks": [
+          {
+            "name": "compile bundle dart2js-html-html",
+            "parameters": [
+              "test",
+              "--compile",
+              "--bundle=dart2js-html-html"
+            ],
+            "scripts": [
+              "flutter/lib/web_ui/dev/felt"
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "name": "web_tests/test_bundles/dart2js-html-ui",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+      ],
+      "generators": {
+        "tasks": [
+          {
+            "name": "compile bundle dart2js-html-ui",
+            "parameters": [
+              "test",
+              "--compile",
+              "--bundle=dart2js-html-ui"
+            ],
+            "scripts": [
+              "flutter/lib/web_ui/dev/felt"
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "name": "web_tests/test_bundles/dart2js-canvaskit-canvaskit",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+      ],
+      "generators": {
+        "tasks": [
+          {
+            "name": "compile bundle dart2js-canvaskit-canvaskit",
+            "parameters": [
+              "test",
+              "--compile",
+              "--bundle=dart2js-canvaskit-canvaskit"
+            ],
+            "scripts": [
+              "flutter/lib/web_ui/dev/felt"
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "name": "web_tests/test_bundles/dart2js-canvaskit-ui",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+      ],
+      "generators": {
+        "tasks": [
+          {
+            "name": "compile bundle dart2js-canvaskit-ui",
+            "parameters": [
+              "test",
+              "--compile",
+              "--bundle=dart2js-canvaskit-ui"
+            ],
+            "scripts": [
+              "flutter/lib/web_ui/dev/felt"
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "name": "web_tests/test_bundles/dart2wasm-html-engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+      ],
+      "generators": {
+        "tasks": [
+          {
+            "name": "compile bundle dart2wasm-html-engine",
+            "parameters": [
+              "test",
+              "--compile",
+              "--bundle=dart2wasm-html-engine"
+            ],
+            "scripts": [
+              "flutter/lib/web_ui/dev/felt"
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "name": "web_tests/test_bundles/dart2wasm-html-html",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+      ],
+      "generators": {
+        "tasks": [
+          {
+            "name": "compile bundle dart2wasm-html-html",
+            "parameters": [
+              "test",
+              "--compile",
+              "--bundle=dart2wasm-html-html"
+            ],
+            "scripts": [
+              "flutter/lib/web_ui/dev/felt"
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "name": "web_tests/test_bundles/dart2wasm-html-ui",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+      ],
+      "generators": {
+        "tasks": [
+          {
+            "name": "compile bundle dart2wasm-html-ui",
+            "parameters": [
+              "test",
+              "--compile",
+              "--bundle=dart2wasm-html-ui"
+            ],
+            "scripts": [
+              "flutter/lib/web_ui/dev/felt"
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "name": "web_tests/test_bundles/dart2wasm-canvaskit-canvaskit",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+      ],
+      "generators": {
+        "tasks": [
+          {
+            "name": "compile bundle dart2wasm-canvaskit-canvaskit",
+            "parameters": [
+              "test",
+              "--compile",
+              "--bundle=dart2wasm-canvaskit-canvaskit"
+            ],
+            "scripts": [
+              "flutter/lib/web_ui/dev/felt"
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "name": "web_tests/test_bundles/dart2wasm-canvaskit-ui",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+      ],
+      "generators": {
+        "tasks": [
+          {
+            "name": "compile bundle dart2wasm-canvaskit-ui",
+            "parameters": [
+              "test",
+              "--compile",
+              "--bundle=dart2wasm-canvaskit-ui"
+            ],
+            "scripts": [
+              "flutter/lib/web_ui/dev/felt"
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "name": "web_tests/test_bundles/dart2wasm-skwasm-ui",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+      ],
+      "generators": {
+        "tasks": [
+          {
+            "name": "compile bundle dart2wasm-skwasm-ui",
+            "parameters": [
+              "test",
+              "--compile",
+              "--bundle=dart2wasm-skwasm-ui"
+            ],
+            "scripts": [
+              "flutter/lib/web_ui/dev/felt"
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "name": "web_tests/test_bundles/fallbacks",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+      ],
+      "generators": {
+        "tasks": [
+          {
+            "name": "compile bundle fallbacks",
+            "parameters": [
+              "test",
+              "--compile",
+              "--bundle=fallbacks"
+            ],
+            "scripts": [
+              "flutter/lib/web_ui/dev/felt"
+            ]
+          }
+        ]
+      }
+    }
+  ],
+  "tests": [
+    {
+      "name": "Linux run chrome-dart2js-html-engine suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2js-html-engine"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "119.0.6045.9"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-dart2js-html-engine",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-dart2js-html-engine"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Linux run chrome-dart2js-html-html suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2js-html-html"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "119.0.6045.9"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-dart2js-html-html",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-dart2js-html-html"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Linux run chrome-dart2js-html-ui suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2js-html-ui"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "119.0.6045.9"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-dart2js-html-ui",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-dart2js-html-ui"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Linux run chrome-dart2js-canvaskit-canvaskit suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2js-canvaskit-canvaskit"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "119.0.6045.9"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-dart2js-canvaskit-canvaskit",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-dart2js-canvaskit-canvaskit"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Linux run chrome-dart2js-canvaskit-ui suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2js-canvaskit-ui"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "119.0.6045.9"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-dart2js-canvaskit-ui",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-dart2js-canvaskit-ui"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Linux run chrome-full-dart2js-canvaskit-canvaskit suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2js-canvaskit-canvaskit"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "119.0.6045.9"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-full-dart2js-canvaskit-canvaskit",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-full-dart2js-canvaskit-canvaskit"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Linux run chrome-full-dart2js-canvaskit-ui suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2js-canvaskit-ui"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "119.0.6045.9"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-full-dart2js-canvaskit-ui",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-full-dart2js-canvaskit-ui"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Linux run firefox-dart2js-html-engine suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2js-html-engine"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "firefox",
+          "version": "version:106.0"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite firefox-dart2js-html-engine",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=firefox-dart2js-html-engine"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Linux run firefox-dart2js-html-html suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2js-html-html"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "firefox",
+          "version": "version:106.0"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite firefox-dart2js-html-html",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=firefox-dart2js-html-html"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Linux run firefox-dart2js-html-ui suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2js-html-ui"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "firefox",
+          "version": "version:106.0"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite firefox-dart2js-html-ui",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=firefox-dart2js-html-ui"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Linux run firefox-dart2js-canvaskit-canvaskit suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2js-canvaskit-canvaskit"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "firefox",
+          "version": "version:106.0"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite firefox-dart2js-canvaskit-canvaskit",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=firefox-dart2js-canvaskit-canvaskit"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Linux run firefox-dart2js-canvaskit-ui suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2js-canvaskit-ui"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "firefox",
+          "version": "version:106.0"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite firefox-dart2js-canvaskit-ui",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=firefox-dart2js-canvaskit-ui"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Linux run chrome-dart2wasm-html-engine suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2wasm-html-engine"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "119.0.6045.9"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-dart2wasm-html-engine",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-dart2wasm-html-engine"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Linux run chrome-dart2wasm-html-html suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2wasm-html-html"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "119.0.6045.9"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-dart2wasm-html-html",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-dart2wasm-html-html"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Linux run chrome-dart2wasm-html-ui suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2wasm-html-ui"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "119.0.6045.9"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-dart2wasm-html-ui",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-dart2wasm-html-ui"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Linux run chrome-dart2wasm-canvaskit-canvaskit suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2wasm-canvaskit-canvaskit"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "119.0.6045.9"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-dart2wasm-canvaskit-canvaskit",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-dart2wasm-canvaskit-canvaskit"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Linux run chrome-dart2wasm-canvaskit-ui suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2wasm-canvaskit-ui"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "119.0.6045.9"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-dart2wasm-canvaskit-ui",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-dart2wasm-canvaskit-ui"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Linux run chrome-dart2wasm-skwasm-ui suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2wasm-skwasm-ui"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "119.0.6045.9"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-dart2wasm-skwasm-ui",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-dart2wasm-skwasm-ui"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Linux run chrome-full-dart2wasm-canvaskit-canvaskit suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2wasm-canvaskit-canvaskit"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "119.0.6045.9"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-full-dart2wasm-canvaskit-canvaskit",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-full-dart2wasm-canvaskit-canvaskit"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Linux run chrome-full-dart2wasm-canvaskit-ui suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2wasm-canvaskit-ui"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "119.0.6045.9"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-full-dart2wasm-canvaskit-ui",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-full-dart2wasm-canvaskit-ui"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Linux run chrome-fallbacks suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/fallbacks"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "119.0.6045.9"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-fallbacks",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-fallbacks"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Linux run firefox-fallbacks suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/fallbacks"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "firefox",
+          "version": "version:106.0"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite firefox-fallbacks",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=firefox-fallbacks"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Mac run safari-dart2js-html-engine suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Mac-13",
+        "cpu=arm64"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2js-html-engine"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite safari-dart2js-html-engine",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=safari-dart2js-html-engine"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Mac run safari-dart2js-html-html suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Mac-13",
+        "cpu=arm64"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2js-html-html"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite safari-dart2js-html-html",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=safari-dart2js-html-html"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Mac run safari-dart2js-html-ui suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Mac-13",
+        "cpu=arm64"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2js-html-ui"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite safari-dart2js-html-ui",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=safari-dart2js-html-ui"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Mac run safari-dart2js-canvaskit-canvaskit suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Mac-13",
+        "cpu=arm64"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2js-canvaskit-canvaskit"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite safari-dart2js-canvaskit-canvaskit",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=safari-dart2js-canvaskit-canvaskit"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Mac run safari-dart2js-canvaskit-ui suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Mac-13",
+        "cpu=arm64"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2js-canvaskit-ui"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite safari-dart2js-canvaskit-ui",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=safari-dart2js-canvaskit-ui"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Mac run safari-fallbacks suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Mac-13",
+        "cpu=arm64"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/fallbacks"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite safari-fallbacks",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=safari-fallbacks"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Windows run chrome-dart2js-html-engine suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Windows"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2js-html-engine"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "119.0.6045.9"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-dart2js-html-engine",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-dart2js-html-engine"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Windows run chrome-dart2js-html-html suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Windows"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2js-html-html"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "119.0.6045.9"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-dart2js-html-html",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-dart2js-html-html"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Windows run chrome-dart2js-html-ui suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Windows"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2js-html-ui"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "119.0.6045.9"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-dart2js-html-ui",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-dart2js-html-ui"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Windows run chrome-dart2js-canvaskit-canvaskit suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Windows"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2js-canvaskit-canvaskit"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "119.0.6045.9"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-dart2js-canvaskit-canvaskit",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-dart2js-canvaskit-canvaskit"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Windows run chrome-dart2js-canvaskit-ui suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Windows"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2js-canvaskit-ui"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "119.0.6045.9"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-dart2js-canvaskit-ui",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-dart2js-canvaskit-ui"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Windows run chrome-full-dart2js-canvaskit-canvaskit suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Windows"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2js-canvaskit-canvaskit"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "119.0.6045.9"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-full-dart2js-canvaskit-canvaskit",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-full-dart2js-canvaskit-canvaskit"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Windows run chrome-full-dart2js-canvaskit-ui suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Windows"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2js-canvaskit-ui"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "119.0.6045.9"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-full-dart2js-canvaskit-ui",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-full-dart2js-canvaskit-ui"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Windows run chrome-dart2wasm-html-engine suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Windows"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2wasm-html-engine"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "119.0.6045.9"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-dart2wasm-html-engine",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-dart2wasm-html-engine"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Windows run chrome-dart2wasm-html-html suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Windows"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2wasm-html-html"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "119.0.6045.9"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-dart2wasm-html-html",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-dart2wasm-html-html"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Windows run chrome-dart2wasm-html-ui suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Windows"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2wasm-html-ui"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "119.0.6045.9"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-dart2wasm-html-ui",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-dart2wasm-html-ui"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Windows run chrome-dart2wasm-canvaskit-canvaskit suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Windows"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2wasm-canvaskit-canvaskit"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "119.0.6045.9"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-dart2wasm-canvaskit-canvaskit",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-dart2wasm-canvaskit-canvaskit"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Windows run chrome-dart2wasm-canvaskit-ui suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Windows"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2wasm-canvaskit-ui"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "119.0.6045.9"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-dart2wasm-canvaskit-ui",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-dart2wasm-canvaskit-ui"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Windows run chrome-dart2wasm-skwasm-ui suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Windows"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2wasm-skwasm-ui"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "119.0.6045.9"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-dart2wasm-skwasm-ui",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-dart2wasm-skwasm-ui"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Windows run chrome-full-dart2wasm-canvaskit-canvaskit suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Windows"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2wasm-canvaskit-canvaskit"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "119.0.6045.9"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-full-dart2wasm-canvaskit-canvaskit",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-full-dart2wasm-canvaskit-canvaskit"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Windows run chrome-full-dart2wasm-canvaskit-ui suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Windows"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2wasm-canvaskit-ui"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "119.0.6045.9"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-full-dart2wasm-canvaskit-ui",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-full-dart2wasm-canvaskit-ui"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Windows run chrome-fallbacks suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Windows"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/fallbacks"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "119.0.6045.9"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-fallbacks",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-fallbacks"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/ci/builders/local_engine.json b/ci/builders/local_engine.json
new file mode 100644
index 0000000000000000000000000000000000000000..0a27c7aee9810318eb470914568cac4152c2b720
--- /dev/null
+++ b/ci/builders/local_engine.json
@@ -0,0 +1,132 @@
+{
+  "builds": [
+    {
+      "drone_dimensions": [
+        "os=Mac-13",
+        "os=Linux"
+      ],
+      "gn": [
+        "--runtime-mode",
+        "debug",
+        "--android",
+        "--android-cpu=arm64",
+        "--no-stripped",
+        "--no-lto"
+      ],
+      "name": "android_debug_arm64",
+      "ninja": {
+        "config": "android_debug_arm64",
+        "targets": []
+      }
+    },
+    {
+      "drone_dimensions": [
+        "os=Mac-13",
+        "os=Linux"
+      ],
+      "gn": [
+        "--runtime-mode",
+        "debug",
+        "--unoptimized",
+        "--android",
+        "--android-cpu=arm64",
+        "--no-stripped",
+        "--no-lto"
+      ],
+      "name": "android_debug_unopt_arm64",
+      "ninja": {
+        "config": "android_debug_unopt_arm64",
+        "targets": []
+      }
+    },
+    {
+      "drone_dimensions": [
+        "os=Mac-13",
+        "os=Linux"
+      ],
+      "gn": [
+        "--runtime-mode",
+        "profile",
+        "--android",
+        "--android-cpu=arm64",
+        "--no-stripped",
+        "--no-lto"
+      ],
+      "name": "android_profile_arm64",
+      "ninja": {
+        "config": "android_profile_arm64",
+        "targets": []
+      }
+    },
+    {
+      "drone_dimensions": [
+        "os=Mac-13",
+        "os=Linux"
+      ],
+      "gn": [
+        "--runtime-mode",
+        "release",
+        "--android",
+        "--android-cpu=arm64",
+        "--no-stripped",
+        "--no-lto"
+      ],
+      "name": "android_release_arm64",
+      "ninja": {
+        "config": "android_release_arm64",
+        "targets": []
+      }
+    },
+    {
+      "drone_dimensions": [
+        "os=Mac-13",
+        "os=Linux"
+      ],
+      "gn": [
+        "--runtime-mode",
+        "debug",
+        "--no-stripped",
+        "--no-lto"
+      ],
+      "name": "host_debug",
+      "ninja": {
+        "config": "host_debug",
+        "targets": []
+      }
+    },
+    {
+      "drone_dimensions": [
+        "os=Mac-13",
+        "os=Linux"
+      ],
+      "gn": [
+        "--runtime-mode",
+        "profile",
+        "--no-stripped",
+        "--no-lto"
+      ],
+      "name": "host_profile",
+      "ninja": {
+        "config": "host_profile",
+        "targets": []
+      }
+    },
+    {
+      "drone_dimensions": [
+        "os=Mac-13",
+        "os=Linux"
+      ],
+      "gn": [
+        "--runtime-mode",
+        "release",
+        "--no-stripped",
+        "--no-lto"
+      ],
+      "name": "host_release",
+      "ninja": {
+        "config": "host_release",
+        "targets": []
+      }
+    }
+  ]
+}
diff --git a/ci/builders/mac_android_aot_engine.json b/ci/builders/mac_android_aot_engine.json
index 6bb034cc6744d9223bc6fa24663312959882fc78..b6889f57efdfe091dfc0859de29915d0aa55f8f6 100644
--- a/ci/builders/mac_android_aot_engine.json
+++ b/ci/builders/mac_android_aot_engine.json
@@ -8,15 +8,16 @@
                     "include_paths": [
                         "out/android_profile/zip_archives/android-arm-profile/darwin-x64.zip"
                     ],
-                    "name": "android_profile"
+                    "name": "android_profile",
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12",
+                "os=Mac-13",
                 "cpu=x86"
             ],
-            "gclient_custom_vars": {
+            "gclient_variables": {
                 "download_android_deps": false
             },
             "gn": [
@@ -32,7 +33,11 @@
                     "flutter/shell/platform/android:gen_snapshot"
                 ]
             },
-            "tests": []
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "15a240d"
+                }
+            }
         },
         {
             "archives": [
@@ -42,15 +47,16 @@
                     "include_paths": [
                         "out/android_profile_arm64/zip_archives/android-arm64-profile/darwin-x64.zip"
                     ],
-                    "name": "android_profile_arm64"
+                    "name": "android_profile_arm64",
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12",
+                "os=Mac-13",
                 "cpu=x86"
             ],
-            "gclient_custom_vars": {
+            "gclient_variables": {
                 "download_android_deps": false
             },
             "gn": [
@@ -67,7 +73,11 @@
                     "flutter/shell/platform/android:gen_snapshot"
                 ]
             },
-            "tests": []
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "15a240d"
+                }
+            }
         },
         {
             "archives": [
@@ -77,15 +87,16 @@
                     "include_paths": [
                         "out/android_profile_x64/zip_archives/android-x64-profile/darwin-x64.zip"
                     ],
-                    "name": "android_profile_x64"
+                    "name": "android_profile_x64",
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12",
+                "os=Mac-13",
                 "cpu=x86"
             ],
-            "gclient_custom_vars": {
+            "gclient_variables": {
                 "download_android_deps": false
             },
             "gn": [
@@ -102,7 +113,11 @@
                     "flutter/shell/platform/android:gen_snapshot"
                 ]
             },
-            "tests": []
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "15a240d"
+                }
+            }
         },
         {
             "archives": [
@@ -112,15 +127,16 @@
                     "include_paths": [
                         "out/android_release/zip_archives/android-arm-release/darwin-x64.zip"
                     ],
-                    "name": "android_release"
+                    "name": "android_release",
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12",
+                "os=Mac-13",
                 "cpu=x86"
             ],
-            "gclient_custom_vars": {
+            "gclient_variables": {
                 "download_android_deps": false
             },
             "gn": [
@@ -136,7 +152,11 @@
                     "flutter/shell/platform/android:gen_snapshot"
                 ]
             },
-            "tests": []
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "15a240d"
+                }
+            }
         },
         {
             "archives": [
@@ -146,15 +166,16 @@
                     "include_paths": [
                         "out/android_release_arm64/zip_archives/android-arm64-release/darwin-x64.zip"
                     ],
-                    "name": "android_release_arm64"
+                    "name": "android_release_arm64",
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12",
+                "os=Mac-13",
                 "cpu=x86"
             ],
-            "gclient_custom_vars": {
+            "gclient_variables": {
                 "download_android_deps": false
             },
             "gn": [
@@ -171,7 +192,11 @@
                     "flutter/shell/platform/android:gen_snapshot"
                 ]
             },
-            "tests": []
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "15a240d"
+                }
+            }
         },
         {
             "archives": [
@@ -181,15 +206,16 @@
                     "include_paths": [
                         "out/android_release_x64/zip_archives/android-x64-release/darwin-x64.zip"
                     ],
-                    "name": "android_release_x64"
+                    "name": "android_release_x64",
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12",
+                "os=Mac-13",
                 "cpu=x86"
             ],
-            "gclient_custom_vars": {
+            "gclient_variables": {
                 "download_android_deps": false
             },
             "gn": [
@@ -206,10 +232,13 @@
                     "flutter/shell/platform/android:gen_snapshot"
                 ]
             },
-            "tests": []
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "15a240d"
+                }
+            }
         }
     ],
-    "tests": [],
-    "generators": [],
+    "generators": {},
     "archives": []
 }
diff --git a/ci/builders/mac_clang_tidy.json b/ci/builders/mac_clang_tidy.json
new file mode 100644
index 0000000000000000000000000000000000000000..6f50c27f0e3500025e6a23c1239517bbae361436
--- /dev/null
+++ b/ci/builders/mac_clang_tidy.json
@@ -0,0 +1,330 @@
+{
+    "builds": [
+        {
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Mac-13",
+                "cpu=arm64"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "use_rbe": true
+            },
+            "gn": [
+                "--runtime-mode",
+                "debug",
+                "--prebuilt-dart-sdk",
+                "--no-lto",
+                "--force-mac-arm64",
+                "--target-dir",
+                "host_debug_clang_tidy",
+                "--rbe",
+                "--no-goma",
+                "--xcode-symlinks"
+            ],
+            "name": "host_debug_clang_tidy",
+            "ninja": {
+                "config": "host_debug_clang_tidy"
+            }
+        },
+        {
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Mac-13",
+                "cpu=arm64"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "use_rbe": true
+            },
+            "gn": [
+                "--ios",
+                "--runtime-mode",
+                "debug",
+                "--simulator",
+                "--no-lto",
+                "--force-mac-arm64",
+                "--target-dir",
+                "ios_debug_sim_clang_tidy",
+                "--rbe",
+                "--no-goma",
+                "--xcode-symlinks"
+            ],
+            "name": "ios_debug_sim_clang_tidy",
+            "ninja": {
+                "config": "ios_debug_sim_clang_tidy"
+            }
+        }
+    ],
+    "tests": [
+        {
+            "name": "test: lint host_debug 0",
+            "recipe": "engine_v2/tester_engine",
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Mac-13",
+                "cpu=arm64"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "use_rbe": true
+            },
+            "dependencies": [
+                "host_debug_clang_tidy"
+            ],
+            "contexts": [
+                "osx_sdk"
+            ],
+            "tasks": [
+                {
+                    "name": "gn for host_debug",
+                    "langauge": "python",
+                    "script": "flutter/tools/gn",
+                    "parameters": [
+                        "--runtime-mode",
+                        "debug",
+                        "--prebuilt-dart-sdk",
+                        "--no-lto",
+                        "--force-mac-arm64",
+                        "--target-dir",
+                        "host_debug_clang_tidy",
+                        "--rbe",
+                        "--no-goma",
+                        "--xcode-symlinks"
+                    ]
+                },
+                {
+                    "name": "test: lint host_debug",
+                    "parameters": [
+                        "--variant",
+                        "host_debug_clang_tidy",
+                        "--lint-all",
+                        "--shard-id=0",
+                        "--shard-variants=host_debug_clang_tidy,host_debug_clang_tidy,host_debug_clang_tidy"
+                    ],
+                    "max_attempts": 1,
+                    "script": "flutter/ci/clang_tidy.sh"
+                }
+            ]
+        },
+        {
+            "name": "test: lint host_debug 1",
+            "recipe": "engine_v2/tester_engine",
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Mac-13",
+                "cpu=arm64"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "use_rbe": true
+            },
+            "dependencies": [
+                "host_debug_clang_tidy"
+            ],
+            "contexts": [
+                "osx_sdk"
+            ],
+            "tasks": [
+                {
+                    "name": "gn for host_debug",
+                    "langauge": "python",
+                    "script": "flutter/tools/gn",
+                    "parameters": [
+                        "--runtime-mode",
+                        "debug",
+                        "--prebuilt-dart-sdk",
+                        "--no-lto",
+                        "--force-mac-arm64",
+                        "--target-dir",
+                        "host_debug_clang_tidy",
+                        "--rbe",
+                        "--no-goma",
+                        "--xcode-symlinks"
+                    ]
+                },
+                {
+                    "name": "test: lint host_debug",
+                    "parameters": [
+                        "--variant",
+                        "host_debug_clang_tidy",
+                        "--lint-all",
+                        "--shard-id=1",
+                        "--shard-variants=host_debug_clang_tidy,host_debug_clang_tidy,host_debug_clang_tidy"
+                    ],
+                    "max_attempts": 1,
+                    "script": "flutter/ci/clang_tidy.sh"
+                }
+            ]
+        },
+        {
+            "name": "test: lint host_debug 2",
+            "recipe": "engine_v2/tester_engine",
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Mac-13",
+                "cpu=arm64"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "use_rbe": true
+            },
+            "dependencies": [
+                "host_debug_clang_tidy"
+            ],
+            "contexts": [
+                "osx_sdk"
+            ],
+            "tasks": [
+                {
+                    "name": "gn for host_debug",
+                    "langauge": "python",
+                    "script": "flutter/tools/gn",
+                    "parameters": [
+                        "--runtime-mode",
+                        "debug",
+                        "--prebuilt-dart-sdk",
+                        "--no-lto",
+                        "--force-mac-arm64",
+                        "--target-dir",
+                        "host_debug_clang_tidy",
+                        "--rbe",
+                        "--no-goma",
+                        "--xcode-symlinks"
+                    ]
+                },
+                {
+                    "name": "test: lint host_debug",
+                    "parameters": [
+                        "--variant",
+                        "host_debug_clang_tidy",
+                        "--lint-all",
+                        "--shard-id=2",
+                        "--shard-variants=host_debug_clang_tidy,host_debug_clang_tidy,host_debug_clang_tidy"
+                    ],
+                    "max_attempts": 1,
+                    "script": "flutter/ci/clang_tidy.sh"
+                }
+            ]
+        },
+        {
+            "name": "test: lint host_debug 3",
+            "recipe": "engine_v2/tester_engine",
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Mac-13",
+                "cpu=arm64"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "use_rbe": true
+            },
+            "dependencies": [
+                "host_debug_clang_tidy"
+            ],
+            "contexts": [
+                "osx_sdk"
+            ],
+            "tasks": [
+                {
+                    "name": "gn for host_debug",
+                    "langauge": "python",
+                    "script": "flutter/tools/gn",
+                    "parameters": [
+                        "--runtime-mode",
+                        "debug",
+                        "--prebuilt-dart-sdk",
+                        "--no-lto",
+                        "--force-mac-arm64",
+                        "--target-dir",
+                        "host_debug_clang_tidy",
+                        "--rbe",
+                        "--no-goma",
+                        "--xcode-symlinks"
+                    ]
+                },
+                {
+                    "name": "test: lint host_debug",
+                    "parameters": [
+                        "--variant",
+                        "host_debug_clang_tidy",
+                        "--lint-all",
+                        "--shard-id=3",
+                        "--shard-variants=host_debug_clang_tidy,host_debug_clang_tidy,host_debug_clang_tidy"
+                    ],
+                    "max_attempts": 1,
+                    "script": "flutter/ci/clang_tidy.sh"
+                }
+            ]
+        },
+        {
+            "name": "test: lint ios_debug_sim",
+            "recipe": "engine_v2/tester_engine",
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Mac-13",
+                "cpu=arm64"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "use_rbe": true
+            },
+            "dependencies": [
+                "host_debug_clang_tidy",
+                "ios_debug_sim_clang_tidy"
+            ],
+            "contexts": [
+                "osx_sdk"
+            ],
+            "tasks": [
+                {
+                    "name": "gn for host_debug",
+                    "langauge": "python",
+                    "script": "flutter/tools/gn",
+                    "parameters": [
+                        "--runtime-mode",
+                        "debug",
+                        "--prebuilt-dart-sdk",
+                        "--no-lto",
+                        "--force-mac-arm64",
+                        "--target-dir",
+                        "host_debug_clang_tidy",
+                        "--rbe",
+                        "--no-goma",
+                        "--xcode-symlinks"
+                    ]
+                },
+                {
+                    "name": "gn for ios_debug_sim",
+                    "langauge": "python",
+                    "script": "flutter/tools/gn",
+                    "parameters": [
+                        "--ios",
+                        "--runtime-mode",
+                        "debug",
+                        "--simulator",
+                        "--no-lto",
+                        "--force-mac-arm64",
+                        "--target-dir",
+                        "ios_debug_sim_clang_tidy",
+                        "--rbe",
+                        "--no-goma",
+                        "--xcode-symlinks"
+                    ]
+                },
+                {
+                    "name": "test: lint ios_debug_sim",
+                    "parameters": [
+                        "--variant",
+                        "ios_debug_sim_clang_tidy",
+                        "--lint-all",
+                        "--shard-id=0",
+                        "--shard-variants=host_debug_clang_tidy"
+                    ],
+                    "max_attempts": 1,
+                    "script": "flutter/ci/clang_tidy.sh"
+                }
+            ]
+        }
+    ]
+}
diff --git a/ci/builders/mac_host_engine.json b/ci/builders/mac_host_engine.json
index 729ebf13f7c61606d39fa4bd9f9e802e73a7afb8..c12a0632a134df038fb47ef5f68c03a504f220a5 100644
--- a/ci/builders/mac_host_engine.json
+++ b/ci/builders/mac_host_engine.json
@@ -7,42 +7,62 @@
                     "type": "gcs",
                     "include_paths": [
                         "out/host_debug/zip_archives/darwin-x64/artifacts.zip",
-                        "out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip",
-                        "out/host_debug/zip_archives/dart-sdk-darwin-x64.zip",
-                        "out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip"
+                        "out/host_debug/zip_archives/dart-sdk-darwin-x64.zip"
                     ],
-                    "name": "host_debug"
+                    "name": "host_debug",
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12",
-                "cpu=x86"
+                "os=Mac-13",
+                "cpu=x86",
+                "mac_model=Macmini8,1"
             ],
-            "gclient_custom_vars": {
+            "gclient_variables": {
                 "download_android_deps": false
             },
             "gn": [
                 "--runtime-mode",
                 "debug",
                 "--no-lto",
-                "--full-dart-sdk",
                 "--prebuilt-dart-sdk",
-                "--build-embedder-examples"
+                "--build-embedder-examples",
+                "--use-glfw-swiftshader"
             ],
             "name": "host_debug",
             "ninja": {
                 "config": "host_debug",
                 "targets": [
-                    "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework",
+                    "flutter/build/archives:archive_gen_snapshot",
                     "flutter/build/archives:artifacts",
                     "flutter/build/archives:dart_sdk_archive",
-                    "flutter/web_sdk",
-                    "flutter/build/archives:archive_gen_snapshot",
-                    "flutter/build/archives:flutter_embedder_framework"
+                    "flutter/build/archives:flutter_embedder_framework",
+                    "flutter/build/dart:copy_dart_sdk",
+                    "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework",
+                    "flutter/tools/font_subset",
+                    "flutter:unittests"
                 ]
             },
-            "tests": []
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "15a240d"
+                }
+            },
+            "tests": [
+                {
+                    "language": "python3",
+                    "name": "Host Tests for host_debug",
+                    "script": "flutter/testing/run_tests.py",
+                    "parameters": [
+                        "--variant",
+                        "host_debug",
+                        "--type",
+                        "dart,dart-host,engine",
+                        "--engine-capture-core-dump"
+                    ]
+                }
+            ]
         },
         {
             "archives": [
@@ -52,15 +72,17 @@
                     "include_paths": [
                         "out/host_profile/zip_archives/darwin-x64-profile/artifacts.zip"
                     ],
-                    "name": "host_profile"
+                    "name": "host_profile",
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12",
-                "cpu=x86"
+                "os=Mac-13",
+                "cpu=x86",
+                "mac_model=Macmini8,1"
             ],
-            "gclient_custom_vars": {
+            "gclient_variables": {
                 "download_android_deps": false
             },
             "gn": [
@@ -74,25 +96,30 @@
             "ninja": {
                 "config": "host_profile",
                 "targets": [
-                    "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework",
+                    "flutter/build/dart:copy_dart_sdk",
                     "flutter/build/archives:archive_gen_snapshot",
                     "flutter/build/archives:artifacts",
+                    "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework",
                     "flutter:unittests"
                 ]
             },
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "15a240d"
+                }
+            },
             "tests": [
                 {
                     "language": "python3",
                     "name": "Host Tests for host_profile",
+                    "script": "flutter/testing/run_tests.py",
                     "parameters": [
                         "--variant",
                         "host_profile",
                         "--type",
-                        "engine",
+                        "dart,dart-host,engine",
                         "--engine-capture-core-dump"
-                    ],
-                    "script": "flutter/testing/run_tests.py",
-                    "type": "local"
+                    ]
                 }
             ]
         },
@@ -105,15 +132,23 @@
                         "out/host_release/zip_archives/darwin-x64-release/artifacts.zip",
                         "out/host_release/zip_archives/darwin-x64/font-subset.zip"
                     ],
-                    "name": "host_release"
+                    "name": "host_release",
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12",
-                "cpu=x86"
+                "os=Mac-13",
+                "cpu=x86",
+                "mac_model=Macmini8,1"
+            ],
+            "dependencies": [
+                {
+                    "dependency": "goldctl",
+                    "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+                }
             ],
-            "gclient_custom_vars": {
+            "gclient_variables": {
                 "download_android_deps": false
             },
             "gn": [
@@ -121,19 +156,40 @@
                 "release",
                 "--no-lto",
                 "--prebuilt-dart-sdk",
-                "--build-embedder-examples"
+                "--build-embedder-examples",
+                "--use-glfw-swiftshader"
             ],
             "name": "host_release",
             "ninja": {
                 "config": "host_release",
                 "targets": [
-                    "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework",
                     "flutter/build/archives:archive_gen_snapshot",
                     "flutter/build/archives:artifacts",
-                    "flutter/tools/font-subset"
+                    "flutter/build/dart:copy_dart_sdk",
+                    "flutter/impeller/golden_tests:impeller_golden_tests",
+                    "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework",
+                    "flutter/tools/font_subset",
+                    "flutter:unittests"
                 ]
             },
-            "tests": []
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "15a240d"
+                }
+            },
+            "tests": [
+                {
+                    "language": "python3",
+                    "name": "Impeller-golden, dart and engine tests for host_release",
+                    "script": "flutter/testing/run_tests.py",
+                    "parameters": [
+                        "--variant",
+                        "host_release",
+                        "--type",
+                        "dart,dart-host,engine,impeller-golden"
+                    ]
+                }
+            ]
         },
         {
             "archives": [
@@ -144,15 +200,16 @@
                         "out/mac_debug_arm64/zip_archives/darwin-arm64/artifacts.zip",
                         "out/mac_debug_arm64/zip_archives/dart-sdk-darwin-arm64.zip"
                     ],
-                    "name": "mac_debug_arm64"
+                    "name": "mac_debug_arm64",
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12",
+                "os=Mac-13",
                 "cpu=x86"
             ],
-            "gclient_custom_vars": {
+            "gclient_variables": {
                 "download_android_deps": false
             },
             "gn": [
@@ -162,36 +219,44 @@
                 "--runtime-mode",
                 "debug",
                 "--no-lto",
-                "--full-dart-sdk",
                 "--prebuilt-dart-sdk"
             ],
             "name": "mac_debug_arm64",
             "ninja": {
                 "config": "mac_debug_arm64",
                 "targets": [
-                    "flutter/build/archives:dart_sdk_archive",
+                    "flutter/tools/font_subset",
                     "flutter/build/archives:archive_gen_snapshot",
                     "flutter/build/archives:artifacts",
+                    "flutter/build/archives:dart_sdk_archive",
+                    "flutter/build/archives:flutter_embedder_framework",
                     "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework"
                 ]
             },
-            "tests": []
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "15a240d"
+                }
+            }
         },
         {
             "archives": [
                 {
                     "base_path": "out/mac_profile_arm64/zip_archives/",
                     "type": "gcs",
-                    "include_paths": [],
-                    "name": "mac_profile_arm64"
+                    "include_paths": [
+                        "out/mac_profile_arm64/zip_archives/darwin-arm64-profile/artifacts.zip"
+                    ],
+                    "name": "mac_profile_arm64",
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12",
+                "os=Mac-13",
                 "cpu=x86"
             ],
-            "gclient_custom_vars": {
+            "gclient_variables": {
                 "download_android_deps": false
             },
             "gn": [
@@ -207,11 +272,15 @@
             "ninja": {
                 "config": "mac_profile_arm64",
                 "targets": [
-                    "flutter/build/archives:archive_gen_snapshot",
+                    "flutter/build/archives:artifacts",
                     "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework"
                 ]
             },
-            "tests": []
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "15a240d"
+                }
+            }
         },
         {
             "archives": [
@@ -219,17 +288,19 @@
                     "base_path": "out/mac_release_arm64/zip_archives/",
                     "type": "gcs",
                     "include_paths": [
-                        "out/mac_release_arm64/zip_archives/darwin-arm64/font-subset.zip"
+                        "out/mac_release_arm64/zip_archives/darwin-arm64/font-subset.zip",
+                        "out/mac_release_arm64/zip_archives/darwin-arm64-release/artifacts.zip"
                     ],
-                    "name": "mac_release_arm64"
+                    "name": "mac_release_arm64",
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12",
+                "os=Mac-13",
                 "cpu=x86"
             ],
-            "gclient_custom_vars": {
+            "gclient_variables": {
                 "download_android_deps": false
             },
             "gn": [
@@ -245,17 +316,33 @@
             "ninja": {
                 "config": "mac_release_arm64",
                 "targets": [
-                    "flutter/build/archives:archive_gen_snapshot",
-                    "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework",
-                    "flutter/tools/font-subset"
+                    "flutter/tools/font_subset",
+                    "flutter/build/archives:artifacts",
+                    "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework"
                 ]
             },
-            "tests": []
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "15a240d"
+                }
+            }
         }
     ],
-    "tests": [],
     "generators": {
         "tasks": [
+            {
+                "name": "Debug-FlutterEmbedder.framework",
+                "parameters": [
+                    "--dst",
+                    "out/debug/framework",
+                    "--arm64-out-dir",
+                    "out/mac_debug_arm64",
+                    "--x64-out-dir",
+                    "out/host_debug",
+                    "--zip"
+                ],
+                "script": "flutter/sky/tools/create_embedder_framework.py"
+            },
             {
                 "name": "Release-FlutterMacOS.framework",
                 "parameters": [
@@ -347,33 +434,60 @@
         ]
     },
     "archives": [
+        {
+            "source": "out/debug/framework/FlutterEmbedder.framework.zip",
+            "destination": "darwin-x64/FlutterEmbedder.framework.zip",
+            "realm": "production"
+        },
         {
             "source": "out/release/framework/FlutterMacOS.dSYM.zip",
-            "destination": "darwin-x64-release/FlutterMacOS.dSYM.zip"
+            "destination": "darwin-x64-release/FlutterMacOS.dSYM.zip",
+            "realm": "production"
         },
         {
             "source": "out/debug/framework/FlutterMacOS.framework.zip",
-            "destination": "darwin-x64/FlutterMacOS.framework.zip"
+            "destination": "darwin-x64/FlutterMacOS.framework.zip",
+            "realm": "production"
         },
         {
             "source": "out/profile/framework/FlutterMacOS.framework.zip",
-            "destination": "darwin-x64-profile/FlutterMacOS.framework.zip"
+            "destination": "darwin-x64-profile/FlutterMacOS.framework.zip",
+            "realm": "production"
         },
         {
             "source": "out/release/framework/FlutterMacOS.framework.zip",
-            "destination": "darwin-x64-release/FlutterMacOS.framework.zip"
+            "destination": "darwin-x64-release/FlutterMacOS.framework.zip",
+            "realm": "production"
         },
         {
             "source": "out/debug/snapshot/gen_snapshot.zip",
-            "destination": "darwin-x64/gen_snapshot.zip"
+            "destination": "darwin-x64/gen_snapshot.zip",
+            "realm": "production"
         },
         {
             "source": "out/profile/snapshot/gen_snapshot.zip",
-            "destination": "darwin-x64-profile/gen_snapshot.zip"
+            "destination": "darwin-x64-profile/gen_snapshot.zip",
+            "realm": "production"
         },
         {
             "source": "out/release/snapshot/gen_snapshot.zip",
-            "destination": "darwin-x64-release/gen_snapshot.zip"
+            "destination": "darwin-x64-release/gen_snapshot.zip",
+            "realm": "production"
+        },
+        {
+            "source": "out/debug/framework/framework.zip",
+            "destination": "darwin-x64/framework.zip",
+            "realm": "production"
+        },
+        {
+            "source": "out/profile/framework/framework.zip",
+            "destination": "darwin-x64-profile/framework.zip",
+            "realm": "production"
+        },
+        {
+            "source": "out/release/framework/framework.zip",
+            "destination": "darwin-x64-release/framework.zip",
+            "realm": "production"
         }
     ]
 }
diff --git a/ci/builders/mac_impeller_cmake_example.json b/ci/builders/mac_impeller_cmake_example.json
new file mode 100644
index 0000000000000000000000000000000000000000..476697f28345701e30df777ea86477d900b34933
--- /dev/null
+++ b/ci/builders/mac_impeller_cmake_example.json
@@ -0,0 +1,26 @@
+{
+    "builds": [
+        {
+            "name": "impeller-cmake-example",
+            "archives": [],
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Mac-13",
+                "cpu=arm64"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "download_impeller_cmake_example": true
+            },
+            "gn": [
+               "--impeller-cmake-example",
+               "--xcode-symlinks"
+            ],
+            "ninja": {
+                "config": "impeller-cmake-example",
+                "targets": [
+                ]
+            }
+        }
+    ]
+}
diff --git a/ci/builders/mac_ios_engine.json b/ci/builders/mac_ios_engine.json
index 9ae1f41b812bbe79e9ed6167ad1cd98723576af3..a182ae332c041732dfc85255bb3ab067740102e1 100644
--- a/ci/builders/mac_ios_engine.json
+++ b/ci/builders/mac_ios_engine.json
@@ -1,11 +1,10 @@
 {
     "builds": [
         {
-            "archives": [],
             "drone_dimensions": [
                 "device_type=none",
-                "mac_model=Macmini8,1",
-                "os=Mac-12"
+                "os=Mac-13",
+                "cpu=x86"
             ],
             "gn": [
                 "--ios",
@@ -16,17 +15,18 @@
             ],
             "name": "ios_debug_sim",
             "ninja": {
-                "config": "ios_debug_sim",
-                "targets": []
+                "config": "ios_debug_sim"
             },
-            "tests": []
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "15a240d"
+                }
+            }
         },
         {
-            "archives": [],
             "drone_dimensions": [
                 "device_type=none",
-                "mac_model=Macmini8,1",
-                "os=Mac-12"
+                "os=Mac-13"
             ],
             "gn": [
                 "--ios",
@@ -38,23 +38,18 @@
             ],
             "name": "ios_debug_sim_arm64",
             "ninja": {
-                "config": "ios_debug_sim_arm64",
-                "targets": []
+                "config": "ios_debug_sim_arm64"
             },
-            "tests": []
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "15a240d"
+                }
+            }
         },
         {
-            "archives": [
-                {
-                    "base_path": "out/ios_debug/zip_archives/",
-                    "include_paths": [],
-                    "name": "ios_debug"
-                }
-            ],
             "drone_dimensions": [
                 "device_type=none",
-                "mac_model=Macmini8,1",
-                "os=Mac-12"
+                "os=Mac-13"
             ],
             "gn": [
                 "--ios",
@@ -68,14 +63,187 @@
                     "flutter/shell/platform/darwin/ios:flutter_framework"
                 ]
             },
-            "tests": []
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "15a240d"
+                }
+            }
+        },
+        {
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Mac-13"
+            ],
+            "gn": [
+                "--ios",
+                "--runtime-mode",
+                "profile"
+            ],
+            "name": "ios_profile",
+            "ninja": {
+                "config": "ios_profile",
+                "targets": [
+                    "flutter/shell/platform/darwin/ios:flutter_framework",
+                    "flutter/lib/snapshot:generate_snapshot_bin"
+                ]
+            },
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "15a240d"
+                }
+            }
+        },
+        {
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Mac-13"
+            ],
+            "gn": [
+                "--ios",
+                "--runtime-mode",
+                "release"
+            ],
+            "name": "ios_release",
+            "ninja": {
+                "config": "ios_release",
+                "targets": [
+                    "flutter/shell/platform/darwin/ios:flutter_framework",
+                    "flutter/lib/snapshot:generate_snapshot_bin"
+                ]
+            },
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "15a240d"
+                }
+            }
+        },
+        {
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Mac-13",
+                "cpu=x86"
+            ],
+            "gn": [
+                "--ios",
+                "--runtime-mode",
+                "debug",
+                "--simulator",
+                "--no-lto",
+                "--darwin-extension-safe"
+            ],
+            "name": "ios_debug_sim_extension_safe",
+            "ninja": {
+                "config": "ios_debug_sim_extension_safe"
+            },
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "15a240d"
+                }
+            }
+        },
+        {
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Mac-13"
+            ],
+            "gn": [
+                "--ios",
+                "--runtime-mode",
+                "debug",
+                "--simulator",
+                "--simulator-cpu=arm64",
+                "--no-lto",
+                "--darwin-extension-safe"
+            ],
+            "name": "ios_debug_sim_arm64_extension_safe",
+            "ninja": {
+                "config": "ios_debug_sim_arm64_extension_safe"
+            },
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "15a240d"
+                }
+            }
+        },
+        {
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Mac-13"
+            ],
+            "gn": [
+                "--ios",
+                "--runtime-mode",
+                "debug",
+                "--darwin-extension-safe"
+            ],
+            "name": "ios_debug_extension_safe",
+            "ninja": {
+                "config": "ios_debug_extension_safe",
+                "targets": [
+                    "flutter/shell/platform/darwin/ios:flutter_framework"
+                ]
+            },
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "15a240d"
+                }
+            }
+        },
+        {
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Mac-13"
+            ],
+            "gn": [
+                "--ios",
+                "--runtime-mode",
+                "profile",
+                "--darwin-extension-safe"
+            ],
+            "name": "ios_profile_extension_safe",
+            "ninja": {
+                "config": "ios_profile_extension_safe",
+                "targets": [
+                    "flutter/shell/platform/darwin/ios:flutter_framework",
+                    "flutter/lib/snapshot:generate_snapshot_bin"
+                ]
+            },
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "15a240d"
+                }
+            }
+        },
+        {
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Mac-13"
+            ],
+            "gn": [
+                "--ios",
+                "--runtime-mode",
+                "release",
+                "--darwin-extension-safe"
+            ],
+            "name": "ios_release_extension_safe",
+            "ninja": {
+                "config": "ios_release_extension_safe",
+                "targets": [
+                    "flutter/shell/platform/darwin/ios:flutter_framework",
+                    "flutter/lib/snapshot:generate_snapshot_bin"
+                ]
+            },
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "15a240d"
+                }
+            }
         }
     ],
-    "tests": [],
     "generators": {
         "tasks": [
             {
-                "name": "Debug-FlutterMacOS.framework",
+                "name": "Debug-ios-Flutter.xcframework",
                 "parameters": [
                     "--dst",
                     "out/debug",
@@ -90,22 +258,83 @@
                 "language": "python3"
             },
             {
-                "name": "obj-c-doc",
+                "name": "Profile-ios-Flutter.xcframework",
+                "parameters": [
+                    "--dst",
+                    "out/profile",
+                    "--arm64-out-dir",
+                    "out/ios_profile",
+                    "--simulator-x64-out-dir",
+                    "out/ios_debug_sim",
+                    "--simulator-arm64-out-dir",
+                    "out/ios_debug_sim_arm64"
+                ],
+                "script": "flutter/sky/tools/create_full_ios_framework.py",
+                "language": "python3"
+            },
+            {
+                "name": "Release-ios-Flutter.xcframework",
+                "parameters": [
+                    "--dst",
+                    "out/release",
+                    "--arm64-out-dir",
+                    "out/ios_release",
+                    "--simulator-x64-out-dir",
+                    "out/ios_debug_sim",
+                    "--simulator-arm64-out-dir",
+                    "out/ios_debug_sim_arm64",
+                    "--dsym",
+                    "--strip"
+                ],
+                "script": "flutter/sky/tools/create_full_ios_framework.py",
+                "language": "python3"
+            },
+            {
+                "name": "Release-macos-gen-snapshots",
                 "parameters": [
-                    "out/debug"
+                    "--dst",
+                    "out/release",
+                    "--arm64-out-dir",
+                    "out/ios_release"
                 ],
-                "script": "flutter/tools/gen_objcdoc.sh"
+                "script": "flutter/sky/tools/create_macos_gen_snapshots.py",
+                "language": "python3"
+            },
+            {
+                "name": "Verify-export-symbols-release-binaries",
+                "parameters": [
+                    "src/out"
+                ],
+                "script": "flutter/testing/symbols/verify_exported.dart",
+                "language": "dart"
             }
         ]
     },
     "archives": [
         {
             "source": "out/debug/artifacts.zip",
-            "destination": "ios/artifacts.zip"
+            "destination": "ios/artifacts.zip",
+            "realm": "production"
+        },
+        {
+            "source": "out/profile/artifacts.zip",
+            "destination": "ios-profile/artifacts.zip",
+            "realm": "production"
+        },
+        {
+            "source": "out/release/artifacts.zip",
+            "destination": "ios-release/artifacts.zip",
+            "realm": "production"
+        },
+        {
+            "source": "out/release/Flutter.dSYM.zip",
+            "destination": "ios-release/Flutter.dSYM.zip",
+            "realm": "production"
         },
         {
-            "source": "out/debug/ios-objcdoc.zip",
-            "destination": "ios-objcdoc.zip"
+            "source": "out/release/extension_safe_Flutter.dSYM.zip",
+            "destination": "ios-release/extension_safe_Flutter.dSYM.zip",
+            "realm": "production"
         }
     ]
 }
diff --git a/ci/builders/mac_unopt.json b/ci/builders/mac_unopt.json
new file mode 100644
index 0000000000000000000000000000000000000000..ed7a8da7d74080ff73e5197b16ed8d755ebae34d
--- /dev/null
+++ b/ci/builders/mac_unopt.json
@@ -0,0 +1,300 @@
+{
+    "builds": [
+        {
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Mac-13",
+                "cpu=x86",
+                "mac_model=Macmini8,1"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "use_rbe": true
+            },
+            "gn": [
+                "--runtime-mode",
+                "debug",
+                "--unoptimized",
+                "--no-lto",
+                "--prebuilt-dart-sdk",
+                "--enable-impeller-3d",
+                "--rbe",
+                "--no-goma",
+                "--xcode-symlinks"
+            ],
+            "name": "host_debug_unopt",
+            "ninja": {
+                "config": "host_debug_unopt",
+                "targets": []
+            },
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "15a240d"
+                }
+            },
+            "tests": [
+                {
+                    "language": "python3",
+                    "name": "Host Tests for host_debug_unopt",
+                    "script": "flutter/testing/run_tests.py",
+                    "parameters": [
+                        "--variant",
+                        "host_debug_unopt",
+                        "--type",
+                        "dart,dart-host,engine",
+                        "--engine-capture-core-dump"
+                    ]
+                },
+                {
+                    "name": "Tests of tools/gn",
+                    "language": "python3",
+                    "script": "flutter/tools/gn_test.py"
+                }
+            ]
+        },
+        {
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "runtime_versions": [
+                        "ios-17-0_15a240d"
+                    ],
+                    "sdk_version": "15a240d"
+                }
+            },
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Mac-13",
+                "cpu=x86"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "use_rbe": true
+            },
+            "gn": [
+                "--ios",
+                "--runtime-mode",
+                "debug",
+                "--simulator",
+                "--no-lto",
+                "--rbe",
+                "--no-goma",
+                "--xcode-symlinks",
+                "--target-dir",
+                "ios_debug_unopt_sim"
+            ],
+            "name": "ios_debug_unopt_sim",
+            "ninja": {
+                "config": "ios_debug_unopt_sim",
+                "targets": [
+                    "flutter/testing/scenario_app",
+                    "flutter/shell/platform/darwin/ios:ios_test_flutter"
+                ]
+            },
+            "tests": [
+                {
+                    "language": "python3",
+                    "name": "Tests for ios_debug_unopt_sim",
+                    "script": "flutter/testing/run_tests.py",
+                    "parameters": [
+                        "--variant",
+                        "ios_debug_unopt_sim",
+                        "--type",
+                        "objc",
+                        "--engine-capture-core-dump",
+                        "--ios-variant",
+                        "ios_debug_unopt_sim"
+                    ]
+                },
+                {
+                    "name": "Scenario App Integration Tests",
+                    "parameters": [
+                        "ios_debug_unopt_sim"
+                    ],
+                    "script": "flutter/testing/scenario_app/run_ios_tests.sh"
+                }
+            ]
+        },
+        {
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Mac-13",
+                "cpu=arm64"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "use_rbe": true
+            },
+            "gn": [
+               "--runtime-mode",
+               "debug",
+               "--unoptimized",
+               "--no-lto",
+               "--prebuilt-dart-sdk",
+               "--force-mac-arm64",
+               "--mac-cpu",
+               "arm64",
+               "--rbe",
+               "--no-goma",
+               "--xcode-symlinks",
+               "--use-glfw-swiftshader"
+            ],
+            "name": "host_debug_unopt_arm64",
+            "ninja": {
+                "config": "host_debug_unopt_arm64",
+                "targets": [
+                ]
+            },
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "15a240d"
+                }
+            },
+            "tests": [
+                {
+                    "language": "python3",
+                    "name": "Host Tests for host_debug_unopt_arm64",
+                    "script": "flutter/testing/run_tests.py",
+                    "parameters": [
+                        "--variant",
+                        "host_debug_unopt_arm64",
+                        "--type",
+                        "dart,dart-host,engine,impeller-golden",
+                        "--engine-capture-core-dump"
+                    ]
+                }
+            ]
+        },
+        {
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "runtime_versions": [
+                        "ios-17-0_15a240d"
+                    ],
+                    "sdk_version": "15a240d"
+                }
+            },
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Mac-13",
+                "cpu=arm64"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "use_rbe": true
+            },
+            "gn": [
+                "--ios",
+                "--runtime-mode",
+                "debug",
+                "--simulator",
+                "--no-lto",
+                "--force-mac-arm64",
+                "--simulator-cpu",
+                "arm64",
+                "--rbe",
+                "--no-goma",
+                "--xcode-symlinks",
+                "--target-dir",
+                "ios_debug_unopt_sim_arm64"
+            ],
+            "name": "ios_debug_unopt_sim_arm64",
+            "ninja": {
+                "config": "ios_debug_unopt_sim_arm64",
+                "targets": [
+                    "flutter/testing/scenario_app",
+                    "flutter/shell/platform/darwin/ios:ios_test_flutter"
+                ]
+            },
+            "tests": [
+                {
+                    "language": "python3",
+                    "name": "Tests for ios_debug_unopt_sim_arm64",
+                    "script": "flutter/testing/run_tests.py",
+                    "parameters": [
+                        "--variant",
+                        "ios_debug_unopt_sim_arm64",
+                        "--type",
+                        "objc",
+                        "--engine-capture-core-dump",
+                        "--ios-variant",
+                        "ios_debug_unopt_sim_arm64"
+                    ]
+                },
+                {
+                    "name": "Scenario App Integration Tests",
+                    "parameters": [
+                        "ios_debug_unopt_sim_arm64"
+                    ],
+                    "script": "flutter/testing/scenario_app/run_ios_tests.sh"
+                }
+
+            ]
+        },
+        {
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "runtime_versions": [
+                        "ios-17-0_15a240d"
+                    ],
+                    "sdk_version": "15a240d"
+                }
+            },
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Mac-13",
+                "cpu=arm64"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "use_rbe": true
+            },
+            "gn": [
+                "--ios",
+                "--runtime-mode",
+                "debug",
+                "--simulator",
+                "--no-lto",
+                "--force-mac-arm64",
+                "--simulator-cpu",
+                "arm64",
+                "--darwin-extension-safe",
+                "--rbe",
+                "--no-goma",
+                "--xcode-symlinks",
+                "--target-dir",
+                "ios_debug_unopt_sim_arm64_extension_safe"
+            ],
+            "name": "ios_debug_unopt_sim_arm64_extension_safe",
+            "ninja": {
+                "config": "ios_debug_unopt_sim_arm64_extension_safe",
+                "targets": [
+                    "flutter/testing/scenario_app",
+                    "flutter/shell/platform/darwin/ios:ios_test_flutter"
+                ]
+            },
+            "tests": [
+                {
+                    "language": "python3",
+                    "name": "Tests for ios_debug_unopt_sim_arm64_extension_safe",
+                    "script": "flutter/testing/run_tests.py",
+                    "parameters": [
+                        "--variant",
+                        "ios_debug_unopt_sim_arm64_extension_safe",
+                        "--type",
+                        "objc",
+                        "--engine-capture-core-dump",
+                        "--ios-variant",
+                        "ios_debug_unopt_sim_arm64_extension_safe"
+                    ]
+                },
+                {
+                    "name": "Scenario App Integration Tests",
+                    "parameters": [
+                        "ios_debug_unopt_sim_arm64_extension_safe"
+                    ],
+                    "script": "flutter/testing/scenario_app/run_ios_tests.sh"
+                }
+            ]
+        }
+    ]
+}
diff --git a/ci/builders/standalone/linux_benchmarks.json b/ci/builders/standalone/linux_benchmarks.json
new file mode 100644
index 0000000000000000000000000000000000000000..1f09c3c131a483739d194a679dc0ebd727fecd31
--- /dev/null
+++ b/ci/builders/standalone/linux_benchmarks.json
@@ -0,0 +1,54 @@
+{
+    "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+    ],
+    "gclient_variables": {
+        "download_android_deps": false,
+        "use_rbe": true
+    },
+    "gn": [
+        "--runtime-mode",
+        "release",
+        "--prebuilt-dart-sdk",
+        "--build-embedder-examples",
+        "--rbe",
+        "--no-goma"
+    ],
+    "name": "host_release",
+    "ninja": {
+        "config": "host_release",
+        "targets": [
+            "flutter/build/dart:copy_dart_sdk",
+            "flutter/display_list:display_list_benchmarks",
+            "flutter/display_list:display_list_builder_benchmarks",
+            "flutter/display_list:display_list_region_benchmarks",
+            "flutter/display_list:display_list_transform_benchmarks",
+            "flutter/fml:fml_benchmarks",
+            "flutter/impeller/geometry:geometry_benchmarks",
+            "flutter/impeller/aiks:canvas_benchmarks",
+            "flutter/lib/ui:ui_benchmarks",
+            "flutter/shell/common:shell_benchmarks",
+            "flutter/shell/testing",
+            "flutter/third_party/txt:txt_benchmarks",
+            "flutter/tools/path_ops",
+            "flutter/build/archives:flutter_patched_sdk",
+            "flutter:unittests"
+        ]
+    },
+    "tests": [
+        {
+            "language": "bash",
+            "name": "Generate metrics test",
+            "script": "flutter/testing/benchmark/generate_metrics.sh"
+        },
+        {
+            "contexts": [
+                "metric_center_token"
+            ],
+            "language": "bash",
+            "name": "Upload metrics",
+            "script": "flutter/testing/benchmark/upload_metrics.sh"
+        }
+    ]
+}
diff --git a/ci/builders/standalone/linux_license.json b/ci/builders/standalone/linux_license.json
new file mode 100644
index 0000000000000000000000000000000000000000..3013e3cd2f240818990509a7e8ab1596e511fab7
--- /dev/null
+++ b/ci/builders/standalone/linux_license.json
@@ -0,0 +1,15 @@
+{
+    "drone_dimensions": [
+        "device_type=none",
+        "os=Linux"
+    ],
+    "cas_archive": false,
+    "name": "licenses",
+    "tests": [
+        {
+            "name": "licenses check",
+            "max_attempts": 1,
+            "script": "flutter/ci/licenses.sh"
+        }
+    ]
+}
diff --git a/ci/builders/standalone/windows_unopt.json b/ci/builders/standalone/windows_unopt.json
new file mode 100644
index 0000000000000000000000000000000000000000..3af977a0ef960fc2e4fb6a76394f3cd84ea68ba0
--- /dev/null
+++ b/ci/builders/standalone/windows_unopt.json
@@ -0,0 +1,47 @@
+{
+    "drone_dimensions": [
+        "device_type=none",
+        "os=Windows-10"
+    ],
+    "gclient_variables": {
+        "download_android_deps": false,
+        "use_rbe": true
+    },
+    "dependencies": [
+        {
+            "dependency": "certs",
+            "version": "version:9563bb"
+        }
+    ],
+    "gn": [
+        "--runtime-mode",
+        "debug",
+        "--unoptimized",
+        "--prebuilt-dart-sdk",
+        "--rbe",
+        "--no-goma"
+    ],
+    "name": "host_debug_unopt",
+    "ninja": {
+        "config": "host_debug_unopt"
+    },
+    "tests": [
+        {
+            "language": "python3",
+            "name": "test: Host Tests for host_debug_unopt",
+            "script": "flutter/testing/run_tests.py",
+            "parameters": [
+                "--variant",
+                "host_debug_unopt",
+                "--type",
+                "engine",
+                "--engine-capture-core-dump"
+            ]
+        },
+        {
+            "name": "Tests of tools/gn",
+            "language": "python3",
+            "script": "flutter/tools/gn_test.py"
+        }
+    ]
+}
diff --git a/ci/builders/web_engine.json b/ci/builders/web_engine.json
deleted file mode 100644
index 1aa3d7331fd272ff0aff37d1daf99d454ed8cbb4..0000000000000000000000000000000000000000
--- a/ci/builders/web_engine.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-    "builds": [
-        {
-            "archives": [],
-            "drone_dimensions": [
-                "device_type=none",
-                "os=Windows-10"
-            ],
-            "gn": [
-                "--runtime-mode",
-                "debug",
-                "--unoptimized",
-                "--full-dart-sdk",
-                "--prebuilt-dart-sdk"
-            ],
-            "name": "windows_host_debug",
-            "ninja": {
-                "config": "host_debug_unopt",
-                "targets": []
-            },
-            "platform": "Windows",
-            "tests": []
-        },
-        {
-            "archives": [],
-            "drone_dimensions": [
-                "device_type=none",
-                "os=Linux"
-            ],
-            "generators": {
-                "pub_dirs": [
-                    "flutter/lib/web_ui/",
-                    "flutter/web_sdk/web_engine_tester/"
-                ],
-                "tasks": [
-                    {
-                        "name": "compile web_tests",
-                        "parameters": [
-                            "run",
-                            "compile_tests"
-                        ],
-                        "scripts": [
-                            "out/host_debug_unopt/dart-sdk/bin/dart",
-                            "flutter/lib/web_ui/dev/felt.dart"
-                        ]
-                    },
-                    {
-                        "name": "check licenses",
-                        "parameters": [
-                            "check-licenses"
-                        ],
-                        "scripts": [
-                            "out/host_debug_unopt/dart-sdk/bin/dart",
-                            "flutter/lib/web_ui/dev/felt.dart"
-                        ]
-                    },
-                    {
-                        "name": "web engine analysis",
-                        "parameters": [],
-                        "scripts": [
-                            "flutter/lib/web_ui/dev/web_engine_analysis.sh"
-                        ]
-                    }
-                ]
-            },
-            "gn": [
-                "--runtime-mode",
-                "debug",
-                "--unoptimized",
-                "--full-dart-sdk"
-            ],
-            "name": "linux_host_debug_unopt",
-            "ninja": {
-                "config": "host_debug_unopt",
-                "targets": []
-            },
-            "platform": "Linux",
-            "tests": []
-        },
-        {
-            "archives": [],
-            "drone_dimensions": [
-                "device_type=none",
-                "os=Mac"
-            ],
-            "gn": [
-                "--runtime-mode",
-                "debug",
-                "--unoptimized",
-                "--full-dart-sdk",
-                "--prebuilt-dart-sdk"
-            ],
-            "name": "mac_host_debug_unopt",
-            "ninja": {
-                "config": "host_debug_unopt",
-                "targets": []
-            },
-            "platform": "Mac",
-            "tests": []
-        }
-    ]
-}
diff --git a/ci/builders/windows_android_aot_engine.json b/ci/builders/windows_android_aot_engine.json
index ff73a29a05db13d75daa573b815a4f0a60108f56..a35dad5ea2777e8fd544b9b7fbec119a962c325e 100644
--- a/ci/builders/windows_android_aot_engine.json
+++ b/ci/builders/windows_android_aot_engine.json
@@ -8,14 +8,23 @@
                     "include_paths": [
                         "out/android_profile/zip_archives/android-arm-profile/windows-x64.zip"
                     ],
-                    "name": "android_profile"
+                    "name": "android_profile",
+                    "realm": "production"
                 }
             ],
-            "drone_dimensions": [],
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Windows-10"
+            ],
+            "gclient_variables": {
+                "use_rbe": true
+            },
             "gn": [
                 "--runtime-mode",
                 "profile",
-                "--android"
+                "--android",
+                "--no-goma",
+                "--rbe"
             ],
             "name": "android_profile",
             "ninja": {
@@ -33,15 +42,24 @@
                     "include_paths": [
                         "out/android_profile_arm64/zip_archives/android-arm64-profile/windows-x64.zip"
                     ],
-                    "name": "android_profile_arm64"
+                    "name": "android_profile_arm64",
+                    "realm": "production"
                 }
             ],
-            "drone_dimensions": [],
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Windows-10"
+            ],
+            "gclient_variables": {
+                "use_rbe": true
+            },
             "gn": [
                 "--runtime-mode",
                 "profile",
                 "--android",
-                "--android-cpu=arm64"
+                "--android-cpu=arm64",
+                "--no-goma",
+                "--rbe"
             ],
             "name": "android_profile_arm64",
             "ninja": {
@@ -59,15 +77,24 @@
                     "include_paths": [
                         "out/android_profile_x64/zip_archives/android-x64-profile/windows-x64.zip"
                     ],
-                    "name": "android_profile_x64"
+                    "name": "android_profile_x64",
+                    "realm": "production"
                 }
             ],
-            "drone_dimensions": [],
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Windows-10"
+            ],
+            "gclient_variables": {
+                "use_rbe": true
+            },
             "gn": [
                 "--runtime-mode",
                 "profile",
                 "--android",
-                "--android-cpu=x64"
+                "--android-cpu=x64",
+                "--no-goma",
+                "--rbe"
             ],
             "name": "android_profile_x64",
             "ninja": {
@@ -85,14 +112,23 @@
                     "include_paths": [
                         "out/android_release/zip_archives/android-arm-release/windows-x64.zip"
                     ],
-                    "name": "android_release"
+                    "name": "android_release",
+                    "realm": "production"
                 }
             ],
-            "drone_dimensions": [],
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Windows-10"
+            ],
+            "gclient_variables": {
+                "use_rbe": true
+            },
             "gn": [
                 "--runtime-mode",
                 "release",
-                "--android"
+                "--android",
+                "--no-goma",
+                "--rbe"
             ],
             "name": "android_release",
             "ninja": {
@@ -110,15 +146,24 @@
                     "include_paths": [
                         "out/android_release_arm64/zip_archives/android-arm64-release/windows-x64.zip"
                     ],
-                    "name": "android_release_arm64"
+                    "name": "android_release_arm64",
+                    "realm": "production"
                 }
             ],
-            "drone_dimensions": [],
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Windows-10"
+            ],
+            "gclient_variables": {
+                "use_rbe": true
+            },
             "gn": [
                 "--runtime-mode",
                 "release",
                 "--android",
-                "--android-cpu=arm64"
+                "--android-cpu=arm64",
+                "--no-goma",
+                "--rbe"
             ],
             "name": "android_release_arm64",
             "ninja": {
@@ -136,15 +181,24 @@
                     "include_paths": [
                         "out/android_release_x64/zip_archives/android-x64-release/windows-x64.zip"
                     ],
-                    "name": "android_release_x64"
+                    "name": "android_release_x64",
+                    "realm": "production"
                 }
             ],
-            "drone_dimensions": [],
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Windows-10"
+            ],
+            "gclient_variables": {
+                "use_rbe": true
+            },
             "gn": [
                 "--runtime-mode",
                 "release",
                 "--android",
-                "--android-cpu=x64"
+                "--android-cpu=x64",
+                "--no-goma",
+                "--rbe"
             ],
             "name": "android_release_x64",
             "ninja": {
diff --git a/ci/builders/windows_arm_host_engine.json b/ci/builders/windows_arm_host_engine.json
new file mode 100644
index 0000000000000000000000000000000000000000..8912dade7ef74df17b49defa133edd9e08f7af67
--- /dev/null
+++ b/ci/builders/windows_arm_host_engine.json
@@ -0,0 +1,130 @@
+{
+    "builds": [
+        {
+            "archives": [
+                {
+                    "base_path": "out/host_debug_arm64/zip_archives/",
+                    "type": "gcs",
+                    "include_paths": [
+                        "out/host_debug_arm64/zip_archives/windows-arm64/artifacts.zip",
+                        "out/host_debug_arm64/zip_archives/windows-arm64/windows-arm64-embedder.zip",
+                        "out/host_debug_arm64/zip_archives/windows-arm64/font-subset.zip",
+                        "out/host_debug_arm64/zip_archives/dart-sdk-windows-arm64.zip",
+                        "out/host_debug_arm64/zip_archives/windows-arm64-debug/windows-arm64-flutter.zip",
+                        "out/host_debug_arm64/zip_archives/windows-arm64/flutter-cpp-client-wrapper.zip"
+                    ],
+                    "name": "host_debug_arm64",
+                    "realm": "production"
+                }
+            ],
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Windows-10"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "use_rbe": true
+            },
+            "gn": [
+                "--runtime-mode",
+                "debug",
+                "--no-lto",
+                "--windows-cpu",
+                "arm64",
+                "--no-goma",
+                "--rbe"
+            ],
+            "name": "host_debug_arm64",
+            "ninja": {
+                "config": "host_debug_arm64",
+                "targets": [
+                    "flutter/build/archives:artifacts",
+                    "flutter/build/archives:embedder",
+                    "flutter/tools/font_subset",
+                    "flutter/build/archives:dart_sdk_archive",
+                    "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
+                    "flutter/build/archives:windows_flutter"
+                ]
+            }
+        },
+        {
+            "archives": [
+                {
+                    "base_path": "out/host_profile_arm64/zip_archives/",
+                    "type": "gcs",
+                    "include_paths": [
+                        "out/host_profile_arm64/zip_archives/windows-arm64-profile/windows-arm64-flutter.zip"
+                    ],
+                    "name": "host_profile_arm64",
+                    "realm": "production"
+                }
+            ],
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Windows-10"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "use_rbe": true
+            },
+            "gn": [
+                "--runtime-mode",
+                "profile",
+                "--no-lto",
+                "--windows-cpu",
+                "arm64",
+                "--no-goma",
+                "--rbe"
+            ],
+            "name": "host_profile_arm64",
+            "ninja": {
+                "config": "host_profile_arm64",
+                "targets": [
+                    "windows",
+                    "gen_snapshot",
+                    "flutter/build/archives:windows_flutter"
+                ]
+            }
+        },
+        {
+            "archives": [
+                {
+                    "base_path": "out/host_release_arm64/zip_archives/",
+                    "type": "gcs",
+                    "include_paths": [
+                        "out/host_release_arm64/zip_archives/windows-arm64-release/windows-arm64-flutter.zip"
+                    ],
+                    "name": "host_profile_arm64",
+                    "realm": "production"
+                }
+            ],
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Windows-10"
+            ],
+            "gclient_variables": {
+                "download_android_deps": false,
+                "use_rbe": true
+            },
+            "generators": {},
+            "gn": [
+                "--runtime-mode",
+                "release",
+                "--no-lto",
+                "--windows-cpu",
+                "arm64",
+                "--no-goma",
+                "--rbe"
+            ],
+            "name": "host_release_arm64",
+            "ninja": {
+                "config": "host_release_arm64",
+                "targets": [
+                    "windows",
+                    "gen_snapshot",
+                    "flutter/build/archives:windows_flutter"
+                ]
+            }
+        }
+    ]
+}
diff --git a/ci/builders/windows_host_engine.json b/ci/builders/windows_host_engine.json
index 3ca9c796c4fce05a5c325d572ddedbf6a47e27e3..bca555a9f44997e7b4a38867fca9c69b8045bcc2 100644
--- a/ci/builders/windows_host_engine.json
+++ b/ci/builders/windows_host_engine.json
@@ -11,24 +11,26 @@
                         "out/host_debug/zip_archives/windows-x64/font-subset.zip",
                         "out/host_debug/zip_archives/dart-sdk-windows-x64.zip",
                         "out/host_debug/zip_archives/windows-x64-debug/windows-x64-flutter.zip",
-                        "out/host_debug/zip_archives/windows-x64/flutter-cpp-client-wrapper.zip",
-                        "out/host_debug/zip_archives/flutter-web-sdk-windows-x64.zip"
+                        "out/host_debug/zip_archives/windows-x64/flutter-cpp-client-wrapper.zip"
                     ],
-                    "name": "host_debug"
+                    "name": "host_debug",
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
                 "device_type=none",
                 "os=Windows-10"
             ],
-            "gclient_custom_vars": {
-                "download_android_deps": false
+            "gclient_variables": {
+                "download_android_deps": false,
+                "use_rbe": true
             },
             "gn": [
                 "--runtime-mode",
                 "debug",
-                "--full-dart-sdk",
-                "--no-lto"
+                "--no-lto",
+                "--no-goma",
+                "--rbe"
             ],
             "name": "host_debug",
             "ninja": {
@@ -37,25 +39,23 @@
                     "flutter:unittests",
                     "flutter/build/archives:artifacts",
                     "flutter/build/archives:embedder",
-                    "flutter/tools/font-subset",
+                    "flutter/tools/font_subset",
                     "flutter/build/archives:dart_sdk_archive",
                     "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-                    "flutter/build/archives:windows_flutter",
-                    "flutter/web_sdk"
+                    "flutter/build/archives:windows_flutter"
                 ]
             },
             "tests": [
                 {
                     "language": "python3",
                     "name": "Host Tests for host_debug",
+                    "script": "flutter/testing/run_tests.py",
                     "parameters": [
                         "--variant",
                         "host_debug",
                         "--type",
                         "engine"
-                    ],
-                    "script": "flutter/testing/run_tests.py",
-                    "type": "local"
+                    ]
                 }
             ]
         },
@@ -67,20 +67,24 @@
                     "include_paths": [
                         "out/host_profile/zip_archives/windows-x64-profile/windows-x64-flutter.zip"
                     ],
-                    "name": "host_profile"
+                    "name": "host_profile",
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
                 "device_type=none",
                 "os=Windows-10"
             ],
-            "gclient_custom_vars": {
-                "download_android_deps": false
+            "gclient_variables": {
+                "download_android_deps": false,
+                "use_rbe": true
             },
             "gn": [
                 "--runtime-mode",
                 "profile",
-                "--no-lto"
+                "--no-lto",
+                "--no-goma",
+                "--rbe"
             ],
             "name": "host_profile",
             "ninja": {
@@ -90,8 +94,7 @@
                     "gen_snapshot",
                     "flutter/build/archives:windows_flutter"
                 ]
-            },
-            "tests": []
+            }
         },
         {
             "archives": [
@@ -101,21 +104,25 @@
                     "include_paths": [
                         "out/host_release/zip_archives/windows-x64-release/windows-x64-flutter.zip"
                     ],
-                    "name": "host_profile"
+                    "name": "host_release",
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
                 "device_type=none",
                 "os=Windows-10"
             ],
-            "gclient_custom_vars": {
-                "download_android_deps": false
+            "gclient_variables": {
+                "download_android_deps": false,
+                "use_rbe": true
             },
             "generators": {},
             "gn": [
                 "--runtime-mode",
                 "release",
-                "--no-lto"
+                "--no-lto",
+                "--no-goma",
+                "--rbe"
             ],
             "name": "host_release",
             "ninja": {
@@ -125,8 +132,7 @@
                     "gen_snapshot",
                     "flutter/build/archives:windows_flutter"
                 ]
-            },
-            "tests": []
+            }
         }
     ]
 }
diff --git a/testing/scenario_app/run_android_tests.sh b/ci/check_build_configs.sh
similarity index 41%
rename from testing/scenario_app/run_android_tests.sh
rename to ci/check_build_configs.sh
index eae473cf4cbdd0eeb5797292b3c7316b65d35e3a..1c5cff9992dc4048ed30690a2cb98703a5688aad 100755
--- a/testing/scenario_app/run_android_tests.sh
+++ b/ci/check_build_configs.sh
@@ -1,19 +1,14 @@
 #!/bin/bash
+#
 # Copyright 2013 The Flutter Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# Runs the Android scenario tests on a connected device.
-#   To run the test on a x64 emulator, build `android_debug_unopt_x64`, and then run
-#   `./run_android_tests.sh android_debug_unopt_x64`.
-
 set -e
 
 # Needed because if it is set, cd may print the path it changed to.
 unset CDPATH
 
-BUILD_VARIANT=$1
-
 # On Mac OS, readlink -f doesn't work, so follow_links traverses the path one
 # link at a time, and then cds into the link destination and find out where it
 # ends up.
@@ -23,7 +18,7 @@ BUILD_VARIANT=$1
 function follow_links() (
   cd -P "$(dirname -- "$1")"
   file="$PWD/$(basename -- "$1")"
-  while [[ -L "$file" ]]; do
+  while [[ -h "$file" ]]; do
     cd -P "$(dirname -- "$file")"
     file="$(readlink -- "$file")"
     cd -P "$(dirname -- "$file")"
@@ -32,37 +27,23 @@ function follow_links() (
   echo "$file"
 )
 
-SCRIPT_DIR=$(follow_links "$(dirname -- "${BASH_SOURCE[0]}")")
-SRC_DIR="$(cd "$SCRIPT_DIR/../../.."; pwd -P)"
-OUT_DIR="$SRC_DIR/out/$BUILD_VARIANT"
-
-# Dump the logcat and symbolize stack traces before exiting.
-function dumpLogcat {
-  ndkstack="windows-x86_64"
-  if [ "$(uname)" == "Darwin" ]; then
-    ndkstack="darwin-x86_64"
-  elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
-    ndkstack="linux-x86_64"
+function dart_bin() {
+  dart_path="$1/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+  if [[ ! -e "$dart_path" ]]; then
+    dart_path="$1/third_party/dart/tools/sdks/dart-sdk/bin"
   fi
-
-  echo "-> Symbolize stack traces"
-  "$SRC_DIR"/third_party/android_tools/ndk/prebuilt/"$ndkstack"/bin/ndk-stack \
-    -sym "$OUT_DIR" \
-    -dump "$OUT_DIR"/scenario_app/logcat.txt
-  echo "<- Done"
-
-  echo "-> Dump full logcat"
-  cat "$OUT_DIR"/scenario_app/logcat.txt
-  echo "<- Done"
+  echo "$dart_path"
 }
 
-trap dumpLogcat EXIT
-
-cd $SCRIPT_DIR
+SCRIPT_DIR=$(follow_links "$(dirname -- "${BASH_SOURCE[0]}")")
+SRC_DIR="$(cd "$SCRIPT_DIR/../.."; pwd -P)"
+FLUTTER_DIR="$(cd "$SCRIPT_DIR/.."; pwd -P)"
+DART_BIN=$(dart_bin "$SRC_DIR")
+DART="${DART_BIN}/dart"
 
-"$SRC_DIR"/third_party/dart/tools/sdks/dart-sdk/bin/dart pub get
+cd "$SCRIPT_DIR"
+"$DART" \
+  --disable-dart-dev \
+  "$SRC_DIR/flutter/tools/pkg/engine_build_configs/bin/check.dart" \
+  "$SRC_DIR"
 
-"$SRC_DIR"/third_party/dart/tools/sdks/dart-sdk/bin/dart run \
-  "$SCRIPT_DIR"/bin/android_integration_tests.dart \
-  --adb="$SRC_DIR"/third_party/android_tools/sdk/platform-tools/adb \
-  --out-dir="$OUT_DIR"
diff --git a/ci/check_gn_format.py b/ci/check_gn_format.py
deleted file mode 100755
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/ci/lint.sh b/ci/clang_tidy.sh
similarity index 76%
rename from ci/lint.sh
rename to ci/clang_tidy.sh
index ed7ced728409b8bede85b184254b6702540d38a8..aa0c0471d6a267afb225337e42af787c9577e9df 100755
--- a/ci/lint.sh
+++ b/ci/clang_tidy.sh
@@ -27,19 +27,36 @@ function follow_links() (
   echo "$file"
 )
 
+function dart_bin() {
+  dart_path="$1/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+  if [[ ! -e "$dart_path" ]]; then
+    dart_path="$1/third_party/dart/tools/sdks/dart-sdk/bin"
+  fi
+  echo "$dart_path"
+}
+
 SCRIPT_DIR=$(follow_links "$(dirname -- "${BASH_SOURCE[0]}")")
 SRC_DIR="$(cd "$SCRIPT_DIR/../.."; pwd -P)"
 FLUTTER_DIR="$(cd "$SCRIPT_DIR/.."; pwd -P)"
-DART_BIN="${SRC_DIR}/third_party/dart/tools/sdks/dart-sdk/bin"
+DART_BIN=$(dart_bin "$SRC_DIR")
 DART="${DART_BIN}/dart"
 
 # FLUTTER_LINT_PRINT_FIX will make it so that fix is executed and the generated
 # diff is printed to stdout if clang-tidy fails. This is helpful for enabling
 # new lints.
+
+# To run on CI, just uncomment the following line:
+# FLUTTER_LINT_PRINT_FIX=1
+
 if [[ -z "${FLUTTER_LINT_PRINT_FIX}" ]]; then
   fix_flag=""
 else
-  fix_flag="--fix"
+  fix_flag="--fix --lint-all"
+fi
+
+# Determine wether to use x64 or arm64.
+if command -v arch &> /dev/null && [[ $(arch) == "arm64" ]]; then
+  CLANG_TIDY_PATH="flutter/buildtools/mac-arm64/clang/bin/clang-tidy"
 fi
 
 COMPILE_COMMANDS="$SRC_DIR/out/host_debug/compile_commands.json"
@@ -54,6 +71,7 @@ cd "$SCRIPT_DIR"
   --disable-dart-dev \
   "$SRC_DIR/flutter/tools/clang_tidy/bin/main.dart" \
   --src-dir="$SRC_DIR" \
+  ${CLANG_TIDY_PATH:+--clang-tidy="$SRC_DIR/$CLANG_TIDY_PATH"} \
   $fix_flag \
   "$@" && true # errors ignored
 clang_tidy_return=$?
@@ -66,14 +84,3 @@ if [ $clang_tidy_return -ne 0 ]; then
   fi
   exit $clang_tidy_return
 fi
-
-echo "$(date +%T) Running pylint"
-
-cd "$FLUTTER_DIR"
-pylint-2.7 --rcfile=.pylintrc \
-  "build/" \
-  "ci/" \
-  "impeller/" \
-  "tools/gn"
-
-echo "$(date +%T) Linting complete"
diff --git a/ci/compatibility_helper.py b/ci/compatibility_helper.py
index 0d8231ca178e7ca7d27aea39d2c0ec24986bac78..f8c9481da99ebe0eaaf48af16c779b49d2b5f128 100644
--- a/ci/compatibility_helper.py
+++ b/ci/compatibility_helper.py
@@ -21,5 +21,4 @@ def byte_str_decode(str_or_bytes):
         the possible value changes depending on the version of python
         used.
     """
-  return str_or_bytes if isinstance(str_or_bytes,
-                                    str) else str_or_bytes.decode(ENCODING)
+  return str_or_bytes if isinstance(str_or_bytes, str) else str_or_bytes.decode(ENCODING)
diff --git a/ci/deps_parser_tests.py b/ci/deps_parser_tests.py
deleted file mode 100644
index dd96d163499f482291a42a678bfe2cfe24f9ce21..0000000000000000000000000000000000000000
--- a/ci/deps_parser_tests.py
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright 2013 The Flutter Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import os
-import sys
-import unittest
-from deps_parser import VarImpl
-
-SCRIPT_DIR = os.path.dirname(sys.argv[0])
-CHECKOUT_ROOT = os.path.realpath(os.path.join(SCRIPT_DIR, '..'))
-DEPS = os.path.join(CHECKOUT_ROOT, 'DEPS')
-UPSTREAM_PREFIX = 'upstream_'
-
-
-class TestDepsParserMethods(unittest.TestCase):
-  # Extract both mirrored dep names and URLs &
-  # upstream names and URLs from DEPs file.
-  def setUp(self):  # lower-camel-case for the python unittest framework
-    # Read the content.
-    with open(DEPS, 'r') as file:
-      deps_content = file.read()
-
-    local_scope_mirror = {}
-    var = VarImpl(local_scope_mirror)
-    global_scope_mirror = {
-        'Var': var.lookup,
-        'deps_os': {},
-    }
-
-    # Eval the content.
-    exec(deps_content, global_scope_mirror, local_scope_mirror)
-
-    # Extract the upstream URLs
-    # vars contains more than just upstream URLs
-    # however the upstream URLs are prefixed with 'upstream_'
-    upstream = local_scope_mirror.get('vars')
-    self.upstream_urls = upstream
-
-    # Extract the deps and filter.
-    deps = local_scope_mirror.get('deps', {})
-    filtered_deps = []
-    for _, dep in deps.items():
-      # We currently do not support packages or cipd which are represented
-      # as dictionaries.
-      if isinstance(dep, str):
-        filtered_deps.append(dep)
-    self.deps = filtered_deps
-
-  def test_each_dep_has_upstream_url(self):
-    # For each DEP in the deps file, check for an associated upstream URL in deps file.
-    for dep in self.deps:
-      dep_repo = dep.split('@')[0]
-      dep_name = dep_repo.split('/')[-1].split('.')[0]
-      # vulkan-deps and khronos do not have one upstream URL
-      # all other deps should have an associated upstream URL for vuln scanning purposes
-      if dep_name not in ('vulkan-deps', 'khronos'):
-        # Add the prefix on the dep name when searching for the upstream entry.
-        self.assertTrue(
-            UPSTREAM_PREFIX + dep_name in self.upstream_urls,
-            msg=dep_name + ' not found in upstream URL list. ' +
-            'Each dep in the "deps" section of DEPS file must have associated upstream URL'
-        )
-
-  def test_each_upstream_url_has_dep(self):
-    # Parse DEPS into dependency names.
-    deps_names = []
-    for dep in self.deps:
-      dep_repo = dep.split('@')[0]
-      dep_name = dep_repo.split('/')[-1].split('.')[0]
-      deps_names.append(dep_name)
-
-    # For each upstream URL dep, check it exists as in DEPS.
-    for upsream_dep in self.upstream_urls:
-      # Only test on upstream deps in vars section which start with the upstream prefix
-      if upsream_dep.startswith(UPSTREAM_PREFIX):
-        # Strip the prefix to check that it has a corresponding dependency in the DEPS file
-        self.assertTrue(
-            upsream_dep[len(UPSTREAM_PREFIX):] in deps_names,
-            msg=upsream_dep + ' from upstream list not found in DEPS. ' +
-            'Each upstream URL in DEPS file must have an associated dep in the "deps" section'
-        )
-
-
-if __name__ == '__main__':
-  unittest.main()
diff --git a/ci/docker/build/Dockerfile b/ci/docker/build/Dockerfile
deleted file mode 100644
index 81c23381dd861785c81203ca2827203f9c002e54..0000000000000000000000000000000000000000
--- a/ci/docker/build/Dockerfile
+++ /dev/null
@@ -1,102 +0,0 @@
-FROM ubuntu:bionic@sha256:512274f1739676880585e70eea6a883db7b6d92841b02647b6c92b478356572c
-
-ENV DEPOT_TOOLS_PATH $HOME/depot_tools
-ENV BUILDROOT_PATH $HOME/buildroot
-ENV ENGINE_PATH $HOME/engine
-ENV PATH $PATH:$DEPOT_TOOLS_PATH
-ARG DEBIAN_FRONTEND=noninteractive
-
-# Notes:
-# - libx11-dev is used by Flutter for desktop linux (see also install-build-deps-linux-desktop.sh)
-# - chrome is used by Flutter for web.
-
-# Updates the distribution.
-RUN apt-get update 
-
-# Install generic tools.
-RUN apt-get install -y ca-certificates gnupg wget curl lsb-release sudo apt-transport-https
-
-# Add additional repos.
-#   chrome stable
-RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
-RUN echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main' | tee /etc/apt/sources.list.d/google-chrome.list
-#   gcloud sdk
-RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | \
-    tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
-RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \
-    apt-key --keyring /usr/share/keyrings/cloud.google.gpg add -
-RUN apt-get update
-
-# Install basic tools and libraries
-RUN apt-get install -y \
-    acpica-tools       \
-    autoconf           \
-    automake           \
-    bison              \
-    build-essential    \
-    dejagnu            \
-    dosfstools         \
-    flex               \
-    g++-multilib       \
-    gettext            \
-    git                \
-    gperf              \
-    groff              \
-    ifupdown           \
-    libblkid-dev       \
-    libc6-dev-i386     \
-    libedit-dev        \
-    libfreetype6-dev   \
-    libglib2.0-dev     \
-    liblz4-tool        \
-    libncurses5-dev    \
-    libssl-dev         \
-    libtool            \
-    libxcursor-dev     \
-    libxinerama-dev    \
-    libxrandr-dev      \
-    libxxf86vm-dev     \
-    lsof               \
-    mtools             \
-    nasm               \
-    net-tools          \
-    pkg-config         \
-    python             \
-    python2.7-dev      \
-    tcpdump            \
-    texinfo            \
-    unzip              \
-    uuid-dev           \
-    vim                \
-    xz-utils           \
-    zip                \
-    zlib1g-dev
-
-# Install x/gui deps
-RUN apt-get install -y \
-    libegl1-mesa       \
-    libgles2-mesa-dev  \
-    libglu1-mesa-dev   \
-    libgtk-3-dev       \
-    libx11-dev         \
-    mesa-common-dev    \
-    xvfb
-
-# Install browsers
-RUN apt-get install -y \
-    google-chrome-stable
-
-# Install and config gcloud
-RUN apt-get update && apt-get install -y google-cloud-sdk && \
-    gcloud config set core/disable_usage_reporting true && \
-    gcloud config set component_manager/disable_update_check true
-
-# Clone depot_tools
-RUN git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git $DEPOT_TOOLS_PATH
-
-# Clone buildroot
-RUN git clone https://github.com/flutter/buildroot.git $BUILDROOT_PATH
-
-# Make engine path and start change directory to buildroot.
-RUN mkdir --parents $ENGINE_PATH && \
-    cd $BUILDROOT_PATH
diff --git a/ci/docker/build/README.md b/ci/docker/build/README.md
deleted file mode 100644
index 02a7fb345ed48dc9ca18c486ac11d898c6a93818..0000000000000000000000000000000000000000
--- a/ci/docker/build/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-This directory includes scripts to build the docker container image used for
-building flutter/engine in our CI system (currently [Cirrus](cirrus-ci.org)).
-
-In order to run the scripts, you have to set up `docker` and `gcloud`. Please
-refer to internal doc go/installdocker for how to set up `docker` on gLinux.
-
-Cirrus will build (and cache) a Docker image based on this `Dockerfile` for
-Linux tasks using its
-[Dockerfile as CI](https://cirrus-ci.org/guide/docker-builder-vm/) feature.
-Any change to the `Dockerfile` will cause a new task to be triggered to build
-and tag a new version of the Docker image which will be a dependency of the
-other Linux tasks. This task will instantiate a new GCP VM based on the image
-specified in the `.cirrus.yml` `builder_image_name` field.
-
-To test changes to the Linux `Dockerfile`, create a PR with the changes, and
-Cirrus will attempt to build a new image.
-
-To debug locally, you can build an image with `./build_docker.sh`, but pushing
-to the registry is no longer necessary.
diff --git a/ci/docker/build/build_docker.sh b/ci/docker/build/build_docker.sh
deleted file mode 100755
index 5eeb0fc83d5653df44bb5316822411f50063d8c3..0000000000000000000000000000000000000000
--- a/ci/docker/build/build_docker.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# pull to make sure we are not rebuilding for nothing
-docker pull gcr.io/flutter-cirrus/build-engine-image:latest
-
-docker build --tag gcr.io/flutter-cirrus/build-engine-image:latest .
-
diff --git a/ci/docker/build/engine_gclient b/ci/docker/build/engine_gclient
deleted file mode 100644
index d89fe98de2b57b2842cd6b31c77fceb35d2a015c..0000000000000000000000000000000000000000
--- a/ci/docker/build/engine_gclient
+++ /dev/null
@@ -1,7 +0,0 @@
-solutions = [{
-  "name"        : "src/flutter",
-  "url"         : "https://github.com/flutter/engine.git",
-  "deps_file"   : "DEPS",
-  "managed"     : False,
-  "safesync_url": "",
-}]
diff --git a/ci/docker/build/push_docker.sh b/ci/docker/build/push_docker.sh
deleted file mode 100755
index 80c79cb8d7c256e23f25e747bf1b0ae9fbf52d4a..0000000000000000000000000000000000000000
--- a/ci/docker/build/push_docker.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-docker push gcr.io/flutter-cirrus/build-engine-image:latest
-
diff --git a/ci/docker/windows_build/README.md b/ci/docker/windows_build/README.md
deleted file mode 100644
index 30298defa31665e0fa38445f16edb8c26a807957..0000000000000000000000000000000000000000
--- a/ci/docker/windows_build/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-This directory should include scripts to build the docker container image used
-for building flutter/engine in our CI system (currently [Cirrus](cirrus-ci.org))
-using Windows.
-
-So far we're still waiting GKE to have Kubernetes 1.14 and Windows containers.
-
-Before that, we use GCE Windows VMs for our CI tests. This directory includes
-scripts for preparing that VM.
diff --git a/ci/firebase_testlab.py b/ci/firebase_testlab.py
index 510f582e8b82dcb278ed05f4185ae65ba1d19942..d27277827a7202a04e31b0c40a2b10fbe3ba1acb 100755
--- a/ci/firebase_testlab.py
+++ b/ci/firebase_testlab.py
@@ -22,6 +22,12 @@ if 'GCP_PROJECT' not in os.environ:
   sys.exit(1)
 PROJECT = os.environ['GCP_PROJECT']
 
+# Exit codes returned by the FTL command that signal an infrastructure failure.
+FTL_INFRA_FAILURE_CODES = [1, 15, 20]
+
+# Maximum number of retries done if an infrastructure failure occurs.
+MAX_RETRY_ATTEMPTS = 2
+
 script_dir = os.path.dirname(os.path.realpath(__file__))
 buildroot_dir = os.path.abspath(os.path.join(script_dir, '..', '..'))
 out_dir = os.path.join(buildroot_dir, 'out')
@@ -54,7 +60,7 @@ def run_firebase_test(apk, results_dir):
           '--results-dir',
           results_dir,
           '--device',
-          'model=redfin,version=30',
+          'model=shiba,version=34',
       ],
       stdout=subprocess.PIPE,
       stderr=subprocess.STDOUT,
@@ -64,10 +70,7 @@ def run_firebase_test(apk, results_dir):
 
 
 def check_logcat(results_dir):
-  logcat = subprocess.check_output([
-      'gsutil', 'cat',
-      '%s/%s/*/logcat' % (BUCKET, results_dir)
-  ])
+  logcat = subprocess.check_output(['gsutil', 'cat', '%s/%s/*/logcat' % (BUCKET, results_dir)])
   logcat = byte_str_decode(logcat)
   if not logcat:
     sys.exit(1)
@@ -82,8 +85,7 @@ def check_logcat(results_dir):
 def check_timeline(results_dir):
   gsutil_du = subprocess.check_output([
       'gsutil', 'du',
-      '%s/%s/*/game_loop_results/results_scenario_0.json' %
-      (BUCKET, results_dir)
+      '%s/%s/*/game_loop_results/results_scenario_0.json' % (BUCKET, results_dir)
   ])
   gsutil_du = byte_str_decode(gsutil_du)
   gsutil_du = gsutil_du.strip()
@@ -110,39 +112,50 @@ def main():
   args = parser.parse_args()
 
   apks_dir = os.path.join(out_dir, args.variant, 'firebase_apks')
-  apks = glob.glob('%s/*.apk' % apks_dir)
+  apks = set(glob.glob('%s/*.apk' % apks_dir))
 
   if not apks:
     print('No APKs found at %s' % apks_dir)
     return 1
 
-  git_revision = subprocess.check_output(['git', 'rev-parse', 'HEAD'],
-                                         cwd=script_dir)
+  git_revision = subprocess.check_output(['git', 'rev-parse', 'HEAD'], cwd=script_dir)
   git_revision = byte_str_decode(git_revision)
   git_revision = git_revision.strip()
-  results = []
-  apk = None
-  for apk in apks:
-    results_dir = '%s/%s/%s' % (
-        os.path.basename(apk), git_revision, args.build_id
-    )
-    process = run_firebase_test(apk, results_dir)
-    results.append((results_dir, process))
-
-  for results_dir, process in results:
-    for line in iter(process.stdout.readline, ''):
-      print(line.strip())
-    return_code = process.wait()
-    if return_code != 0:
-      print('Firebase test failed with code: %s' % return_code)
-      sys.exit(return_code)
-
-    print('Checking logcat for %s' % results_dir)
-    check_logcat(results_dir)
-    # scenario_app produces a timeline, but the android image test does not.
-    if 'scenario' in apk:
-      print('Checking timeline for %s' % results_dir)
-      check_timeline(results_dir)
+
+  for retry in range(MAX_RETRY_ATTEMPTS):
+    if retry > 0:
+      print('Retrying %s' % apks)
+
+    results = []
+    for apk in sorted(apks):
+      results_dir = '%s/%s/%s' % (os.path.basename(apk), git_revision, args.build_id)
+      process = run_firebase_test(apk, results_dir)
+      results.append((apk, results_dir, process))
+
+    for apk, results_dir, process in results:
+      print('===== Test output for %s' % apk)
+      for line in iter(process.stdout.readline, ''):
+        print(line.strip())
+
+      return_code = process.wait()
+      if return_code in FTL_INFRA_FAILURE_CODES:
+        print('Firebase test %s failed with infrastructure error code: %s' % (apk, return_code))
+        continue
+      if return_code != 0:
+        print('Firebase test %s failed with code: %s' % (apk, return_code))
+        sys.exit(return_code)
+
+      print('Checking logcat for %s' % results_dir)
+      check_logcat(results_dir)
+      # scenario_app produces a timeline, but the android image test does not.
+      if 'scenario' in apk:
+        print('Checking timeline for %s' % results_dir)
+        check_timeline(results_dir)
+
+      apks.remove(apk)
+
+    if not apks:
+      break
 
   return 0
 
diff --git a/ci/format.bat b/ci/format.bat
index d82d64cec022103790856a43e6c7b74fcc06e46d..8a12f07833c797e7c5ec31bf2d640f7da72da51a 100644
--- a/ci/format.bat
+++ b/ci/format.bat
@@ -20,7 +20,16 @@ where /q git || ECHO Error: Unable to find git in your PATH. && EXIT /B 1
 
 SET repo_dir=%SRC_DIR%\flutter
 SET ci_dir=%repo_dir%\ci
-SET dart_sdk_path=%SRC_DIR%\third_party\dart\tools\sdks\dart-sdk
+
+REM Determine which platform we are on and use the right prebuilt Dart SDK
+IF "%PROCESSOR_ARCHITECTURE%"=="AMD64" (
+    SET dart_sdk_path=%SRC_DIR%\flutter\prebuilts\windows-x64\dart-sdk
+) ELSE IF "%PROCESSOR_ARCHITECTURE%"=="ARM64" (
+    SET dart_sdk_path=%SRC_DIR%\flutter\prebuilts\windows-arm64\dart-sdk
+) ELSE (
+    ECHO "Windows x86 (32-bit) is not supported" && EXIT /B 1
+)
+
 SET dart=%dart_sdk_path%\bin\dart.exe
 
 cd "%ci_dir%"
@@ -28,5 +37,4 @@ cd "%ci_dir%"
 REM Do not use the CALL command in the next line to execute Dart. CALL causes
 REM Windows to re-read the line from disk after the CALL command has finished
 REM regardless of the ampersand chain.
-REM TODO(gspencergoog): Remove --no-sound-null-safety once isolate package is null-safe.
-"%dart%" --no-sound-null-safety --disable-dart-dev bin\format.dart %* & exit /B !ERRORLEVEL!
+"%dart%" --disable-dart-dev bin\format.dart %* & exit /B !ERRORLEVEL!
diff --git a/ci/format.sh b/ci/format.sh
index 50475df4df3356607d18ff64ddd0edfe28266b02..bb5e72a216473892eddbe59c1834a9aa0245b3dc 100755
--- a/ci/format.sh
+++ b/ci/format.sh
@@ -27,15 +27,21 @@ function follow_links() (
   echo "$file"
 )
 
+function dart_bin() {
+  dart_path="$1/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+  if [[ ! -e "$dart_path" ]]; then
+    dart_path="$1/third_party/dart/tools/sdks/dart-sdk/bin"
+  fi
+  echo "$dart_path"
+}
+
 SCRIPT_DIR=$(follow_links "$(dirname -- "${BASH_SOURCE[0]}")")
 SRC_DIR="$(cd "$SCRIPT_DIR/../.."; pwd -P)"
-DART_SDK_DIR="${SRC_DIR}/third_party/dart/tools/sdks/dart-sdk"
-DART="${DART_SDK_DIR}/bin/dart"
+DART_BIN=$(dart_bin "$SRC_DIR")
+DART="${DART_BIN}/dart"
 
-# TODO(gspencergoog): Remove --no-sound-null-safety once isolate package is null-safe.
 cd "$SCRIPT_DIR"
 "$DART" \
   --disable-dart-dev \
-  --no-sound-null-safety \
   bin/format.dart \
   "$@"
diff --git a/ci/impeller_cmake_build_test.py b/ci/impeller_cmake_build_test.py
new file mode 100644
index 0000000000000000000000000000000000000000..077632be37c7de0aae68a145764c975960f4e48f
--- /dev/null
+++ b/ci/impeller_cmake_build_test.py
@@ -0,0 +1,149 @@
+#!/usr/bin/env vpython3
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import argparse
+import os
+import subprocess
+import sys
+
+# When passed the --setup flag, this script fetches git submodules and other
+# dependencies for the impeller-cmake-example. When passed the --cmake flag,
+# this script runs cmake on impeller-cmake-example. That will create
+# a build output directory for impeller-cmake-example under
+# out/impeller-cmake-example, so the build can then be performed with
+# e.g. ninja -C out/impeller-cmake-example-out.
+
+SRC_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+
+def parse_args(argv):
+  parser = argparse.ArgumentParser(
+      description='A script that tests the impeller-cmake-example build.',
+  )
+  parser.add_argument(
+      '--cmake',
+      '-c',
+      default=False,
+      action='store_true',
+      help='Run cmake for impeller-cmake-example.',
+  )
+  parser.add_argument(
+      '--goma-dir',
+      '-g',
+      type=str,
+      default=os.getenv('GOMA_DIR'),
+      help=(
+          'The path to the Goma install. Defaults to the value of the '
+          'GOMA_DIR environment variable.'
+      ),
+  )
+  parser.add_argument(
+      '--path',
+      '-p',
+      type=str,
+      help='The path to the impeller-cmake-example source.',
+  )
+  parser.add_argument(
+      '--setup',
+      '-s',
+      default=False,
+      action='store_true',
+      help='Clone the git submodules.',
+  )
+  parser.add_argument(
+      '--verbose',
+      '-v',
+      default=False,
+      action='store_true',
+      help='Emit verbose output.',
+  )
+  parser.add_argument(
+      '--xcode-symlinks',
+      default=False,
+      action='store_true',
+      help='Symlink the Xcode sysroot to help Goma be successful.',
+  )
+  return parser.parse_args(argv)
+
+
+def validate_args(args):
+  if not os.path.isdir(os.path.join(SRC_ROOT, args.path)):
+    print(
+        'The --path argument must be a valid directory relative to the '
+        'engine src/ directory.'
+    )
+    return False
+
+  return True
+
+
+def create_xcode_symlink():
+  find_sdk_command = [
+      'python3',
+      os.path.join(SRC_ROOT, 'build', 'mac', 'find_sdk.py'),
+      '--print_sdk_path',
+      '10.15',
+      '--symlink',
+      os.path.join(SRC_ROOT, 'out', 'impeller-cmake-example-xcode-sysroot'),
+  ]
+  find_sdk_output = subprocess.check_output(find_sdk_command).decode('utf-8')
+  return find_sdk_output.split('\n')[0]
+
+
+def main(argv):
+  args = parse_args(argv[1:])
+  if not validate_args(args):
+    return 1
+
+  impeller_cmake_dir = os.path.join(SRC_ROOT, args.path)
+
+  if args.setup:
+    git_command = [
+        'git',
+        '-C',
+        impeller_cmake_dir,
+        'submodule',
+        'update',
+        '--init',
+        '--recursive',
+        '--depth',
+        '1',
+        '--jobs',
+        str(os.cpu_count()),
+    ]
+    subprocess.check_call(git_command)
+
+    # Run the deps.sh shell script in the repo.
+    subprocess.check_call(['bash', 'deps.sh'], cwd=impeller_cmake_dir)
+    return 0
+
+  if args.cmake:
+    cmake_path = os.path.join(SRC_ROOT, 'buildtools', 'mac-x64', 'cmake', 'bin', 'cmake')
+    cmake_command = [
+        cmake_path,
+        '--preset',
+        'flutter-ci-mac-debug-x64',
+        '-B',
+        os.path.join(SRC_ROOT, 'out', 'impeller-cmake-example'),
+    ]
+    cmake_env = os.environ.copy()
+    ninja_path = os.path.join(SRC_ROOT, 'flutter', 'third_party', 'ninja')
+    cmake_env.update({
+        'PATH': os.environ['PATH'] + ':' + ninja_path,
+        'FLUTTER_ENGINE_SRC_DIR': SRC_ROOT,
+        'FLUTTER_GOMA_DIR': args.goma_dir,
+    })
+    if args.xcode_symlinks:
+      xcode_symlink_path = create_xcode_symlink()
+      cmake_env.update({
+          'FLUTTER_OSX_SYSROOT': xcode_symlink_path,
+      })
+    subprocess.check_call(cmake_command, env=cmake_env, cwd=impeller_cmake_dir)
+
+  return 0
+
+
+if __name__ == '__main__':
+  sys.exit(main(sys.argv))
diff --git a/ci/licenses.sh b/ci/licenses.sh
index 87125c9afdb28ac065a257fb7fb373f716fbd3a1..c971050b67cf4620eed1c14ccf8b39306743a407 100755
--- a/ci/licenses.sh
+++ b/ci/licenses.sh
@@ -4,7 +4,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-set -e
+# Do not exit when a non-zero return value is encountered to output all errors.
+# See: https://github.com/flutter/flutter/issues/131680
+# set -e
 shopt -s nullglob
 
 # Needed because if it is set, cd may print the path it changed to.
@@ -19,7 +21,7 @@ unset CDPATH
 function follow_links() (
   cd -P "$(dirname -- "$1")"
   file="$PWD/$(basename -- "$1")"
-  while [[ -h "$file" ]]; do
+  while [[ -L "$file" ]]; do
     cd -P "$(dirname -- "$file")"
     file="$(readlink -- "$file")"
     cd -P "$(dirname -- "$file")"
@@ -28,23 +30,41 @@ function follow_links() (
   echo "$file"
 )
 
+function dart_bin() {
+  dart_path="$1/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+  if [[ ! -e "$dart_path" ]]; then
+    dart_path="$1/third_party/dart/tools/sdks/dart-sdk/bin"
+  fi
+  echo "$dart_path"
+}
+
 SCRIPT_DIR=$(follow_links "$(dirname -- "${BASH_SOURCE[0]}")")
-SRC_DIR="$(cd "$SCRIPT_DIR/../.."; pwd -P)"
-DART_BIN="$SRC_DIR/third_party/dart/tools/sdks/dart-sdk/bin"
+SRC_DIR="$(
+  cd "$SCRIPT_DIR/../.."
+  pwd -P
+)"
+DART_BIN=$(dart_bin "$SRC_DIR")
 PATH="$DART_BIN:$PATH"
 
 # Use:
 #   env VERBOSE=1 ./ci/licenses.sh
-# to turn on verbose progress report printing.
+# to turn on verbose progress report printing. Set it to 2 to also output
+# information about which patterns are taking the most time.
 QUIET="--quiet"
 if [[ "${VERBOSE}" == "1" ]]; then
   QUIET=""
 fi
+if [[ "${VERBOSE}" == "2" ]]; then
+  QUIET="--verbose"
+fi
 
 echo "Verifying license script is still happy..."
-echo "Using pub from $(command -v pub), dart from $(command -v dart)"
+echo "Using dart from: $(command -v dart)"
 
-untracked_files="$(cd "$SRC_DIR/flutter"; git status --ignored --short | grep -E "^!" | awk "{print\$2}")"
+untracked_files="$(
+  cd "$SRC_DIR/flutter"
+  git status --ignored --short | grep -E "^!" | awk "{print\$2}"
+)"
 untracked_count="$(echo "$untracked_files" | wc -l)"
 if [[ $untracked_count -gt 0 ]]; then
   echo ""
@@ -58,13 +78,28 @@ fi
 
 dart --version
 
+# Runs the tests for the license script.
+function run_tests() (
+  cd "$SRC_DIR/flutter/tools/licenses"
+  find . -name "*_test.dart" | xargs -n 1 dart --disable-dart-dev --enable-asserts
+)
+
 # Collects the license information from the repo.
 # Runs in a subshell.
 function collect_licenses() (
   cd "$SRC_DIR/flutter/tools/licenses"
-  dart --enable-asserts lib/main.dart         \
-    --src ../../..                            \
-    --out ../../../out/license_script_output  \
+  # `--interpret_irregexp`` tells dart to use interpreter mode for running
+  # the regexp matching, rather than generating machine code for it.
+  # For very large RegExps that are currently used in license script using
+  # interpreter is faster than using unoptimized machine code, which has
+  # no chance of being optimized(due to its size).
+  dart \
+    --disable-dart-dev \
+    --enable-asserts \
+    --interpret_irregexp \
+    lib/main.dart \
+    --src ../../.. \
+    --out ../../../out/license_script_output \
     --golden ../../ci/licenses_golden \
     "${QUIET}"
 )
@@ -76,67 +111,85 @@ function verify_licenses() (
   cd "$SRC_DIR"
 
   # These files trip up the script on Mac OS X.
-  find . -name ".DS_Store" -exec rm {} \;
+  find . -name ".DS_Store" -exec rm -f {} \;
 
   collect_licenses
 
   for f in out/license_script_output/licenses_*; do
-      if ! cmp -s "flutter/ci/licenses_golden/$(basename "$f")" "$f"; then
-          echo "============================= ERROR ============================="
-          echo "License script got different results than expected for $f."
-          echo "Please rerun the licenses script locally to verify that it is"
-          echo "correctly catching any new licenses for anything you may have"
-          echo "changed, and then update this file:"
-          echo "  flutter/sky/packages/sky_engine/LICENSE"
-          echo "For more information, see the script in:"
-          echo "  https://github.com/flutter/engine/tree/main/tools/licenses"
-          echo ""
-          diff -U 6 "flutter/ci/licenses_golden/$(basename "$f")" "$f"
-          echo "================================================================="
-          echo ""
-          exitStatus=1
-      fi
-  done
-
-  echo "Verifying license tool signature..."
-  if ! cmp -s "flutter/ci/licenses_golden/tool_signature" "out/license_script_output/tool_signature"; then
+    if ! cmp -s "flutter/ci/licenses_golden/$(basename "$f")" "$f"; then
       echo "============================= ERROR ============================="
-      echo "The license tool signature has changed. This is expected when"
-      echo "there have been changes to the license tool itself. Licenses have"
-      echo "been re-computed for all components. If only the license script has"
-      echo "changed, no diffs are typically expected in the output of the"
-      echo "script. Verify the output, and if it looks correct, update the"
-      echo "license tool signature golden file:"
-      echo "  ci/licenses_golden/tool_signature"
+      echo "License script got different results than expected for $f."
+      echo "Please rerun the licenses script locally to verify that it is"
+      echo "correctly catching any new licenses for anything you may have"
+      echo "changed, and then update this file:"
+      echo "  flutter/sky/packages/sky_engine/LICENSE"
       echo "For more information, see the script in:"
       echo "  https://github.com/flutter/engine/tree/main/tools/licenses"
       echo ""
-      diff -U 6 "flutter/ci/licenses_golden/tool_signature" "out/license_script_output/tool_signature"
+      diff -U 6 "flutter/ci/licenses_golden/$(basename "$f")" "$f"
       echo "================================================================="
       echo ""
       exitStatus=1
+    fi
+  done
+
+  echo "Verifying license tool signature..."
+  if ! cmp -s "flutter/ci/licenses_golden/tool_signature" "out/license_script_output/tool_signature"; then
+    echo "============================= ERROR ============================="
+    echo "The license tool signature has changed. This is expected when"
+    echo "there have been changes to the license tool itself. Licenses have"
+    echo "been re-computed for all components. If only the license script has"
+    echo "changed, no diffs are typically expected in the output of the"
+    echo "script. Verify the output, and if it looks correct, update the"
+    echo "license tool signature golden file:"
+    echo "  ci/licenses_golden/tool_signature"
+    echo "For more information, see the script in:"
+    echo "  https://github.com/flutter/engine/tree/main/tools/licenses"
+    echo ""
+    diff -U 6 "flutter/ci/licenses_golden/tool_signature" "out/license_script_output/tool_signature"
+    echo "================================================================="
+    echo ""
+    exitStatus=1
+  fi
+
+  echo "Verifying excluded files list..."
+  if ! cmp -s "flutter/ci/licenses_golden/excluded_files" "out/license_script_output/excluded_files"; then
+    echo "============================= ERROR ============================="
+    echo "The license is excluding a different number of files than previously."
+    echo "This is only expected when new non-source files have been introduced."
+    echo "Verify that all the newly ignored files are definitely not shipped with"
+    echo "any binaries that we compile (including impellerc and Wasm)."
+    echo "If the changes look correct, update this file:"
+    echo "  ci/licenses_golden/excluded_files"
+    echo "For more information, see the script in:"
+    echo "  https://github.com/flutter/engine/tree/main/tools/licenses"
+    echo ""
+    diff -U 6 "flutter/ci/licenses_golden/excluded_files" "out/license_script_output/excluded_files"
+    echo "================================================================="
+    echo ""
+    exitStatus=1
   fi
 
   echo "Checking license count in licenses_flutter..."
 
   local actualLicenseCount
   actualLicenseCount="$(tail -n 1 flutter/ci/licenses_golden/licenses_flutter | tr -dc '0-9')"
-  local expectedLicenseCount=19 # When changing this number: Update the error message below as well describing all expected license types.
+  local expectedLicenseCount=879 # When changing this number: Update the error message below as well describing the newly expected license types.
 
   if [[ $actualLicenseCount -ne $expectedLicenseCount ]]; then
-      echo "=============================== ERROR ==============================="
-      echo "The total license count in flutter/ci/licenses_golden/licenses_flutter"
-      echo "changed from $expectedLicenseCount to $actualLicenseCount."
-      echo "It's very likely that this is an unintentional change. Please"
-      echo "double-check that all newly added files have a BSD-style license"
-      echo "header with the following copyright:"
-      echo "    Copyright 2013 The Flutter Authors. All rights reserved."
-      echo "Files in 'third_party/txt' may have an Apache license header instead."
-      echo "If you're absolutely sure that the change in license count is"
-      echo "intentional, update 'flutter/ci/licenses.sh' with the new count."
-      echo "================================================================="
-      echo ""
-      exitStatus=1
+    echo "=============================== ERROR ==============================="
+    echo "The total license count in flutter/ci/licenses_golden/licenses_flutter"
+    echo "changed from $expectedLicenseCount to $actualLicenseCount."
+    echo "It's very likely that this is an unintentional change. Please"
+    echo "double-check that all newly added files have a BSD-style license"
+    echo "header with the following copyright:"
+    echo "    Copyright 2013 The Flutter Authors. All rights reserved."
+    echo "Files in 'third_party/txt' may have an Apache license header instead."
+    echo "If you're absolutely sure that the change in license count is"
+    echo "intentional, update 'flutter/ci/licenses.sh' with the new count."
+    echo "================================================================="
+    echo ""
+    exitStatus=1
   fi
 
   if [[ $exitStatus -eq 0 ]]; then
@@ -145,4 +198,5 @@ function verify_licenses() (
   return $exitStatus
 )
 
+run_tests
 verify_licenses
diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files
new file mode 100644
index 0000000000000000000000000000000000000000..212e9095ac44067e9965c9ad7c71dd3a2f9c1dc2
--- /dev/null
+++ b/ci/licenses_golden/excluded_files
@@ -0,0 +1,3495 @@
+../../../.clang-format
+../../../.git
+../../../.gitattributes
+../../../.github
+../../../.gitignore
+../../../.gn
+../../../AUTHORS
+../../../CODEOWNERS
+../../../README.md
+../../../build
+../../../build_overrides
+../../../flutter/.ci.yaml
+../../../flutter/.clang-format
+../../../flutter/.clang-tidy
+../../../flutter/.git
+../../../flutter/.gitattributes
+../../../flutter/.github
+../../../flutter/.gitignore
+../../../flutter/.style.yapf
+../../../flutter/AUTHORS
+../../../flutter/CODEOWNERS
+../../../flutter/CONTRIBUTING.md
+../../../flutter/DEPS
+../../../flutter/Doxyfile
+../../../flutter/README.md
+../../../flutter/analysis_options.yaml
+../../../flutter/build
+../../../flutter/build_overrides
+../../../flutter/buildtools
+../../../flutter/ci
+../../../flutter/common/README.md
+../../../flutter/display_list/benchmarking/dl_complexity_unittests.cc
+../../../flutter/display_list/display_list_unittests.cc
+../../../flutter/display_list/dl_color_unittests.cc
+../../../flutter/display_list/dl_paint_unittests.cc
+../../../flutter/display_list/dl_vertices_unittests.cc
+../../../flutter/display_list/effects/dl_color_filter_unittests.cc
+../../../flutter/display_list/effects/dl_color_source_unittests.cc
+../../../flutter/display_list/effects/dl_image_filter_unittests.cc
+../../../flutter/display_list/effects/dl_mask_filter_unittests.cc
+../../../flutter/display_list/effects/dl_path_effect_unittests.cc
+../../../flutter/display_list/geometry/dl_region_unittests.cc
+../../../flutter/display_list/geometry/dl_rtree_unittests.cc
+../../../flutter/display_list/skia/dl_sk_conversions_unittests.cc
+../../../flutter/display_list/skia/dl_sk_paint_dispatcher_unittests.cc
+../../../flutter/display_list/testing
+../../../flutter/display_list/utils/dl_matrix_clip_tracker_unittests.cc
+../../../flutter/docs
+../../../flutter/examples
+../../../flutter/flow/README.md
+../../../flutter/flow/diff_context_unittests.cc
+../../../flutter/flow/embedded_view_params_unittests.cc
+../../../flutter/flow/flow_run_all_unittests.cc
+../../../flutter/flow/frame_timings_recorder_unittests.cc
+../../../flutter/flow/gl_context_switch_unittests.cc
+../../../flutter/flow/layers/backdrop_filter_layer_unittests.cc
+../../../flutter/flow/layers/checkerboard_layertree_unittests.cc
+../../../flutter/flow/layers/clip_path_layer_unittests.cc
+../../../flutter/flow/layers/clip_rect_layer_unittests.cc
+../../../flutter/flow/layers/clip_rrect_layer_unittests.cc
+../../../flutter/flow/layers/color_filter_layer_unittests.cc
+../../../flutter/flow/layers/container_layer_unittests.cc
+../../../flutter/flow/layers/display_list_layer_unittests.cc
+../../../flutter/flow/layers/image_filter_layer_unittests.cc
+../../../flutter/flow/layers/layer_state_stack_unittests.cc
+../../../flutter/flow/layers/layer_tree_unittests.cc
+../../../flutter/flow/layers/offscreen_surface_unittests.cc
+../../../flutter/flow/layers/opacity_layer_unittests.cc
+../../../flutter/flow/layers/performance_overlay_layer_unittests.cc
+../../../flutter/flow/layers/platform_view_layer_unittests.cc
+../../../flutter/flow/layers/shader_mask_layer_unittests.cc
+../../../flutter/flow/layers/texture_layer_unittests.cc
+../../../flutter/flow/layers/transform_layer_unittests.cc
+../../../flutter/flow/mutators_stack_unittests.cc
+../../../flutter/flow/raster_cache_unittests.cc
+../../../flutter/flow/skia_gpu_object_unittests.cc
+../../../flutter/flow/stopwatch_dl_unittests.cc
+../../../flutter/flow/stopwatch_unittests.cc
+../../../flutter/flow/surface_frame_unittests.cc
+../../../flutter/flow/testing
+../../../flutter/flow/texture_unittests.cc
+../../../flutter/flutter_frontend_server
+../../../flutter/fml/ascii_trie_unittests.cc
+../../../flutter/fml/backtrace_unittests.cc
+../../../flutter/fml/base32_unittest.cc
+../../../flutter/fml/closure_unittests.cc
+../../../flutter/fml/command_line_unittest.cc
+../../../flutter/fml/container_unittests.cc
+../../../flutter/fml/cpu_affinity_unittests.cc
+../../../flutter/fml/endianness_unittests.cc
+../../../flutter/fml/file_unittest.cc
+../../../flutter/fml/hash_combine_unittests.cc
+../../../flutter/fml/hex_codec_unittest.cc
+../../../flutter/fml/logging_unittests.cc
+../../../flutter/fml/mapping_unittests.cc
+../../../flutter/fml/math_unittests.cc
+../../../flutter/fml/memory/ref_counted_unittest.cc
+../../../flutter/fml/memory/task_runner_checker_unittest.cc
+../../../flutter/fml/memory/weak_ptr_unittest.cc
+../../../flutter/fml/message_loop_task_queues_merge_unmerge_unittests.cc
+../../../flutter/fml/message_loop_task_queues_unittests.cc
+../../../flutter/fml/message_loop_unittests.cc
+../../../flutter/fml/paths_unittests.cc
+../../../flutter/fml/platform/darwin/cf_utils_unittests.mm
+../../../flutter/fml/platform/darwin/scoped_nsobject_arc_unittests.mm
+../../../flutter/fml/platform/darwin/scoped_nsobject_unittests.mm
+../../../flutter/fml/platform/darwin/string_range_sanitization_unittests.mm
+../../../flutter/fml/platform/darwin/weak_nsobject_arc_unittests.mm
+../../../flutter/fml/platform/darwin/weak_nsobject_unittests.mm
+../../../flutter/fml/platform/fuchsia/log_interest_listener_unittests.cc
+../../../flutter/fml/platform/win/file_win_unittests.cc
+../../../flutter/fml/platform/win/wstring_conversion_unittests.cc
+../../../flutter/fml/raster_thread_merger_unittests.cc
+../../../flutter/fml/string_conversion_unittests.cc
+../../../flutter/fml/synchronization/count_down_latch_unittests.cc
+../../../flutter/fml/synchronization/semaphore_unittest.cc
+../../../flutter/fml/synchronization/sync_switch_unittest.cc
+../../../flutter/fml/synchronization/waitable_event_unittest.cc
+../../../flutter/fml/task_source_unittests.cc
+../../../flutter/fml/thread_unittests.cc
+../../../flutter/fml/time/time_delta_unittest.cc
+../../../flutter/fml/time/time_point_unittest.cc
+../../../flutter/fml/time/time_unittest.cc
+../../../flutter/impeller/.clang-format
+../../../flutter/impeller/.gitignore
+../../../flutter/impeller/README.md
+../../../flutter/impeller/aiks/aiks_blur_unittests.cc
+../../../flutter/impeller/aiks/aiks_gradient_unittests.cc
+../../../flutter/impeller/aiks/aiks_path_unittests.cc
+../../../flutter/impeller/aiks/aiks_unittests.cc
+../../../flutter/impeller/aiks/aiks_unittests.h
+../../../flutter/impeller/aiks/canvas_recorder_unittests.cc
+../../../flutter/impeller/aiks/canvas_unittests.cc
+../../../flutter/impeller/aiks/testing
+../../../flutter/impeller/aiks/trace_serializer_unittests.cc
+../../../flutter/impeller/base/README.md
+../../../flutter/impeller/base/base_unittests.cc
+../../../flutter/impeller/compiler/README.md
+../../../flutter/impeller/compiler/compiler_unittests.cc
+../../../flutter/impeller/compiler/shader_bundle_unittests.cc
+../../../flutter/impeller/compiler/switches_unittests.cc
+../../../flutter/impeller/core/allocator_unittests.cc
+../../../flutter/impeller/display_list/dl_unittests.cc
+../../../flutter/impeller/display_list/skia_conversions_unittests.cc
+../../../flutter/impeller/docs
+../../../flutter/impeller/entity/contents/checkerboard_contents_unittests.cc
+../../../flutter/impeller/entity/contents/content_context_unittests.cc
+../../../flutter/impeller/entity/contents/filters/gaussian_blur_filter_contents_unittests.cc
+../../../flutter/impeller/entity/contents/filters/inputs/filter_input_unittests.cc
+../../../flutter/impeller/entity/contents/host_buffer_unittests.cc
+../../../flutter/impeller/entity/contents/test
+../../../flutter/impeller/entity/contents/tiled_texture_contents_unittests.cc
+../../../flutter/impeller/entity/contents/vertices_contents_unittests.cc
+../../../flutter/impeller/entity/entity_pass_target_unittests.cc
+../../../flutter/impeller/entity/entity_pass_unittests.cc
+../../../flutter/impeller/entity/entity_unittests.cc
+../../../flutter/impeller/entity/geometry/geometry_unittests.cc
+../../../flutter/impeller/entity/render_target_cache_unittests.cc
+../../../flutter/impeller/fixtures
+../../../flutter/impeller/geometry/README.md
+../../../flutter/impeller/geometry/geometry_unittests.cc
+../../../flutter/impeller/geometry/matrix_unittests.cc
+../../../flutter/impeller/geometry/path_unittests.cc
+../../../flutter/impeller/geometry/rect_unittests.cc
+../../../flutter/impeller/geometry/saturated_math_unittests.cc
+../../../flutter/impeller/geometry/size_unittests.cc
+../../../flutter/impeller/geometry/trig_unittests.cc
+../../../flutter/impeller/golden_tests/README.md
+../../../flutter/impeller/playground
+../../../flutter/impeller/renderer/backend/gles/test
+../../../flutter/impeller/renderer/backend/metal/texture_mtl_unittests.mm
+../../../flutter/impeller/renderer/backend/vulkan/allocator_vk_unittests.cc
+../../../flutter/impeller/renderer/backend/vulkan/blit_command_vk_unittests.cc
+../../../flutter/impeller/renderer/backend/vulkan/command_encoder_vk_unittests.cc
+../../../flutter/impeller/renderer/backend/vulkan/command_pool_vk_unittests.cc
+../../../flutter/impeller/renderer/backend/vulkan/context_vk_unittests.cc
+../../../flutter/impeller/renderer/backend/vulkan/descriptor_pool_vk_unittests.cc
+../../../flutter/impeller/renderer/backend/vulkan/driver_info_vk_unittests.cc
+../../../flutter/impeller/renderer/backend/vulkan/fence_waiter_vk_unittests.cc
+../../../flutter/impeller/renderer/backend/vulkan/render_pass_builder_vk_unittests.cc
+../../../flutter/impeller/renderer/backend/vulkan/render_pass_cache_unittests.cc
+../../../flutter/impeller/renderer/backend/vulkan/resource_manager_vk_unittests.cc
+../../../flutter/impeller/renderer/backend/vulkan/swapchain/README.md
+../../../flutter/impeller/renderer/backend/vulkan/swapchain/khr/README.md
+../../../flutter/impeller/renderer/backend/vulkan/test
+../../../flutter/impeller/renderer/blit_pass_unittests.cc
+../../../flutter/impeller/renderer/capabilities_unittests.cc
+../../../flutter/impeller/renderer/compute_subgroup_unittests.cc
+../../../flutter/impeller/renderer/compute_unittests.cc
+../../../flutter/impeller/renderer/device_buffer_unittests.cc
+../../../flutter/impeller/renderer/pipeline_descriptor_unittests.cc
+../../../flutter/impeller/renderer/pool_unittests.cc
+../../../flutter/impeller/renderer/renderer_dart_unittests.cc
+../../../flutter/impeller/renderer/renderer_unittests.cc
+../../../flutter/impeller/renderer/testing
+../../../flutter/impeller/runtime_stage/runtime_stage_unittests.cc
+../../../flutter/impeller/scene/README.md
+../../../flutter/impeller/scene/importer/importer_unittests.cc
+../../../flutter/impeller/scene/scene_unittests.cc
+../../../flutter/impeller/shader_archive/shader_archive_unittests.cc
+../../../flutter/impeller/tessellator/dart/.dart_tool
+../../../flutter/impeller/tessellator/dart/pubspec.lock
+../../../flutter/impeller/tessellator/dart/pubspec.yaml
+../../../flutter/impeller/tessellator/tessellator_unittests.cc
+../../../flutter/impeller/toolkit/android/README.md
+../../../flutter/impeller/toolkit/android/toolkit_android_unittests.cc
+../../../flutter/impeller/tools/build_metal_library.py
+../../../flutter/impeller/tools/check_licenses.py
+../../../flutter/impeller/tools/malioc_cores.py
+../../../flutter/impeller/tools/malioc_diff.py
+../../../flutter/impeller/tools/xxd.py
+../../../flutter/impeller/typographer/typographer_unittests.cc
+../../../flutter/lib/gpu/analysis_options.yaml
+../../../flutter/lib/gpu/pubspec.yaml
+../../../flutter/lib/snapshot/libraries.json
+../../../flutter/lib/snapshot/libraries.yaml
+../../../flutter/lib/snapshot/pubspec.yaml
+../../../flutter/lib/ui/analysis_options.yaml
+../../../flutter/lib/ui/compositing/scene_builder_unittests.cc
+../../../flutter/lib/ui/fixtures
+../../../flutter/lib/ui/hooks_unittests.cc
+../../../flutter/lib/ui/painting/image_decoder_no_gl_unittests.cc
+../../../flutter/lib/ui/painting/image_decoder_no_gl_unittests.h
+../../../flutter/lib/ui/painting/image_decoder_unittests.cc
+../../../flutter/lib/ui/painting/image_dispose_unittests.cc
+../../../flutter/lib/ui/painting/image_encoding_unittests.cc
+../../../flutter/lib/ui/painting/image_generator_registry_unittests.cc
+../../../flutter/lib/ui/painting/paint_unittests.cc
+../../../flutter/lib/ui/painting/path_unittests.cc
+../../../flutter/lib/ui/painting/single_frame_codec_unittests.cc
+../../../flutter/lib/ui/semantics/semantics_update_builder_unittests.cc
+../../../flutter/lib/ui/window/platform_configuration_unittests.cc
+../../../flutter/lib/ui/window/platform_message_response_dart_port_unittests.cc
+../../../flutter/lib/ui/window/platform_message_response_dart_unittests.cc
+../../../flutter/lib/ui/window/pointer_data_packet_converter_unittests.cc
+../../../flutter/lib/ui/window/pointer_data_packet_unittests.cc
+../../../flutter/lib/web_ui/.gitignore
+../../../flutter/lib/web_ui/CODE_CONVENTIONS.md
+../../../flutter/lib/web_ui/README.md
+../../../flutter/lib/web_ui/analysis_options.yaml
+../../../flutter/lib/web_ui/dart_test_chrome.yaml
+../../../flutter/lib/web_ui/dart_test_edge.yaml
+../../../flutter/lib/web_ui/dart_test_firefox.yaml
+../../../flutter/lib/web_ui/dart_test_safari.yaml
+../../../flutter/lib/web_ui/dev
+../../../flutter/lib/web_ui/pubspec.yaml
+../../../flutter/lib/web_ui/test
+../../../flutter/prebuilts
+../../../flutter/runtime/dart_isolate_unittests.cc
+../../../flutter/runtime/dart_lifecycle_unittests.cc
+../../../flutter/runtime/dart_plugin_registrant_unittests.cc
+../../../flutter/runtime/dart_service_isolate_unittests.cc
+../../../flutter/runtime/dart_vm_unittests.cc
+../../../flutter/runtime/fixtures
+../../../flutter/runtime/no_dart_plugin_registrant_unittests.cc
+../../../flutter/runtime/platform_isolate_manager_unittests.cc
+../../../flutter/runtime/type_conversions_unittests.cc
+../../../flutter/shell/common/animator_unittests.cc
+../../../flutter/shell/common/base64_unittests.cc
+../../../flutter/shell/common/context_options_unittests.cc
+../../../flutter/shell/common/dl_op_spy_unittests.cc
+../../../flutter/shell/common/engine_animator_unittests.cc
+../../../flutter/shell/common/engine_unittests.cc
+../../../flutter/shell/common/fixtures
+../../../flutter/shell/common/input_events_unittests.cc
+../../../flutter/shell/common/persistent_cache_unittests.cc
+../../../flutter/shell/common/pipeline_unittests.cc
+../../../flutter/shell/common/rasterizer_unittests.cc
+../../../flutter/shell/common/resource_cache_limit_calculator_unittests.cc
+../../../flutter/shell/common/shell_fuchsia_unittests.cc
+../../../flutter/shell/common/shell_io_manager_unittests.cc
+../../../flutter/shell/common/shell_unittests.cc
+../../../flutter/shell/common/switches_unittests.cc
+../../../flutter/shell/common/variable_refresh_rate_display_unittests.cc
+../../../flutter/shell/common/vsync_waiter_unittests.cc
+../../../flutter/shell/gpu/gpu_surface_metal_impeller_unittests.mm
+../../../flutter/shell/platform/android/.gitignore
+../../../flutter/shell/platform/android/README.md
+../../../flutter/shell/platform/android/android_context_gl_impeller_unittests.cc
+../../../flutter/shell/platform/android/android_context_gl_unittests.cc
+../../../flutter/shell/platform/android/android_shell_holder_unittests.cc
+../../../flutter/shell/platform/android/apk_asset_provider_unittests.cc
+../../../flutter/shell/platform/android/build.gradle
+../../../flutter/shell/platform/android/external_view_embedder/external_view_embedder_unittests.cc
+../../../flutter/shell/platform/android/external_view_embedder/surface_pool_unittests.cc
+../../../flutter/shell/platform/android/flutter_shell_native_unittests.cc
+../../../flutter/shell/platform/android/gradle.properties
+../../../flutter/shell/platform/android/image_lru_unittests.cc
+../../../flutter/shell/platform/android/jni/jni_mock_unittest.cc
+../../../flutter/shell/platform/android/platform_view_android_delegate/platform_view_android_delegate_unittests.cc
+../../../flutter/shell/platform/android/platform_view_android_unittests.cc
+../../../flutter/shell/platform/android/test
+../../../flutter/shell/platform/android/test_runner
+../../../flutter/shell/platform/common/accessibility_bridge_unittests.cc
+../../../flutter/shell/platform/common/client_wrapper/README
+../../../flutter/shell/platform/common/client_wrapper/basic_message_channel_unittests.cc
+../../../flutter/shell/platform/common/client_wrapper/encodable_value_unittests.cc
+../../../flutter/shell/platform/common/client_wrapper/event_channel_unittests.cc
+../../../flutter/shell/platform/common/client_wrapper/method_call_unittests.cc
+../../../flutter/shell/platform/common/client_wrapper/method_channel_unittests.cc
+../../../flutter/shell/platform/common/client_wrapper/method_result_functions_unittests.cc
+../../../flutter/shell/platform/common/client_wrapper/plugin_registrar_unittests.cc
+../../../flutter/shell/platform/common/client_wrapper/standard_message_codec_unittests.cc
+../../../flutter/shell/platform/common/client_wrapper/standard_method_codec_unittests.cc
+../../../flutter/shell/platform/common/client_wrapper/testing
+../../../flutter/shell/platform/common/client_wrapper/texture_registrar_unittests.cc
+../../../flutter/shell/platform/common/engine_switches_unittests.cc
+../../../flutter/shell/platform/common/flutter_platform_node_delegate_unittests.cc
+../../../flutter/shell/platform/common/geometry_unittests.cc
+../../../flutter/shell/platform/common/incoming_message_dispatcher_unittests.cc
+../../../flutter/shell/platform/common/json_message_codec_unittests.cc
+../../../flutter/shell/platform/common/json_method_codec_unittests.cc
+../../../flutter/shell/platform/common/path_utils_unittests.cc
+../../../flutter/shell/platform/common/text_editing_delta_unittests.cc
+../../../flutter/shell/platform/common/text_input_model_unittests.cc
+../../../flutter/shell/platform/common/text_range_unittests.cc
+../../../flutter/shell/platform/darwin/Doxyfile
+../../../flutter/shell/platform/darwin/common/availability_version_check_unittests.cc
+../../../flutter/shell/platform/darwin/common/framework/Source/flutter_codecs_unittest.mm
+../../../flutter/shell/platform/darwin/common/framework/Source/flutter_standard_codec_unittest.mm
+../../../flutter/shell/platform/darwin/macos/README.md
+../../../flutter/shell/platform/darwin/macos/framework/Source/fixtures
+../../../flutter/shell/platform/embedder/fixtures
+../../../flutter/shell/platform/embedder/platform_view_embedder_unittests.cc
+../../../flutter/shell/platform/embedder/tests
+../../../flutter/shell/platform/fuchsia/dart-pkg/fuchsia/README.md
+../../../flutter/shell/platform/fuchsia/dart-pkg/fuchsia/analysis_options.yaml
+../../../flutter/shell/platform/fuchsia/dart-pkg/fuchsia/pubspec.yaml
+../../../flutter/shell/platform/fuchsia/dart-pkg/zircon/README.md
+../../../flutter/shell/platform/fuchsia/dart-pkg/zircon/analysis_options.yaml
+../../../flutter/shell/platform/fuchsia/dart-pkg/zircon/pubspec.yaml
+../../../flutter/shell/platform/fuchsia/dart-pkg/zircon/test
+../../../flutter/shell/platform/fuchsia/dart-pkg/zircon_ffi/pubspec.yaml
+../../../flutter/shell/platform/fuchsia/dart_runner/.gitignore
+../../../flutter/shell/platform/fuchsia/dart_runner/README.md
+../../../flutter/shell/platform/fuchsia/dart_runner/embedder/pubspec.yaml
+../../../flutter/shell/platform/fuchsia/dart_runner/kernel/libraries.json
+../../../flutter/shell/platform/fuchsia/dart_runner/kernel/libraries.yaml
+../../../flutter/shell/platform/fuchsia/dart_runner/tests
+../../../flutter/shell/platform/fuchsia/dart_runner/vmservice/analysis_options.yaml
+../../../flutter/shell/platform/fuchsia/dart_runner/vmservice/pubspec.yaml
+../../../flutter/shell/platform/fuchsia/flutter/README.md
+../../../flutter/shell/platform/fuchsia/flutter/accessibility_bridge_unittest.cc
+../../../flutter/shell/platform/fuchsia/flutter/build/asset_package.py
+../../../flutter/shell/platform/fuchsia/flutter/build/gen_debug_wrapper_main.py
+../../../flutter/shell/platform/fuchsia/flutter/canvas_spy_unittests.cc
+../../../flutter/shell/platform/fuchsia/flutter/component_v2_unittest.cc
+../../../flutter/shell/platform/fuchsia/flutter/focus_delegate_unittests.cc
+../../../flutter/shell/platform/fuchsia/flutter/fuchsia_intl_unittest.cc
+../../../flutter/shell/platform/fuchsia/flutter/kernel/analysis_options.yaml
+../../../flutter/shell/platform/fuchsia/flutter/kernel/libraries.json
+../../../flutter/shell/platform/fuchsia/flutter/kernel/libraries.yaml
+../../../flutter/shell/platform/fuchsia/flutter/kernel/pubspec.yaml
+../../../flutter/shell/platform/fuchsia/flutter/keyboard_unittest.cc
+../../../flutter/shell/platform/fuchsia/flutter/pointer_delegate_unittests.cc
+../../../flutter/shell/platform/fuchsia/flutter/pointer_injector_delegate_unittest.cc
+../../../flutter/shell/platform/fuchsia/flutter/rtree_unittests.cc
+../../../flutter/shell/platform/fuchsia/flutter/runner_tzdata_missing_unittest.cc
+../../../flutter/shell/platform/fuchsia/flutter/runner_tzdata_unittest.cc
+../../../flutter/shell/platform/fuchsia/flutter/tests
+../../../flutter/shell/platform/fuchsia/flutter/text_delegate_unittests.cc
+../../../flutter/shell/platform/fuchsia/flutter/vsync_waiter_unittest.cc
+../../../flutter/shell/platform/fuchsia/runtime/dart/profiler_symbols/analysis_options.yaml
+../../../flutter/shell/platform/fuchsia/runtime/dart/profiler_symbols/pubspec.yaml
+../../../flutter/shell/platform/fuchsia/runtime/dart/utils/build_info_unittests.cc
+../../../flutter/shell/platform/fuchsia/unit_tests.md
+../../../flutter/shell/platform/glfw/client_wrapper/flutter_engine_unittests.cc
+../../../flutter/shell/platform/glfw/client_wrapper/flutter_window_controller_unittests.cc
+../../../flutter/shell/platform/glfw/client_wrapper/flutter_window_unittests.cc
+../../../flutter/shell/platform/glfw/client_wrapper/plugin_registrar_glfw_unittests.cc
+../../../flutter/shell/platform/glfw/client_wrapper/testing
+../../../flutter/shell/platform/linux/testing
+../../../flutter/shell/platform/windows/README.md
+../../../flutter/shell/platform/windows/accessibility_bridge_windows_unittests.cc
+../../../flutter/shell/platform/windows/client_wrapper/dart_project_unittests.cc
+../../../flutter/shell/platform/windows/client_wrapper/flutter_engine_unittests.cc
+../../../flutter/shell/platform/windows/client_wrapper/flutter_view_controller_unittests.cc
+../../../flutter/shell/platform/windows/client_wrapper/flutter_view_unittests.cc
+../../../flutter/shell/platform/windows/client_wrapper/plugin_registrar_windows_unittests.cc
+../../../flutter/shell/platform/windows/client_wrapper/testing
+../../../flutter/shell/platform/windows/compositor_opengl_unittests.cc
+../../../flutter/shell/platform/windows/compositor_software_unittests.cc
+../../../flutter/shell/platform/windows/cursor_handler_unittests.cc
+../../../flutter/shell/platform/windows/direct_manipulation_unittests.cc
+../../../flutter/shell/platform/windows/dpi_utils_unittests.cc
+../../../flutter/shell/platform/windows/fixtures
+../../../flutter/shell/platform/windows/flutter_project_bundle_unittests.cc
+../../../flutter/shell/platform/windows/flutter_window_unittests.cc
+../../../flutter/shell/platform/windows/flutter_windows_engine_unittests.cc
+../../../flutter/shell/platform/windows/flutter_windows_texture_registrar_unittests.cc
+../../../flutter/shell/platform/windows/flutter_windows_unittests.cc
+../../../flutter/shell/platform/windows/flutter_windows_view_unittests.cc
+../../../flutter/shell/platform/windows/keyboard_key_channel_handler_unittests.cc
+../../../flutter/shell/platform/windows/keyboard_key_embedder_handler_unittests.cc
+../../../flutter/shell/platform/windows/keyboard_key_handler_unittests.cc
+../../../flutter/shell/platform/windows/keyboard_unittests.cc
+../../../flutter/shell/platform/windows/keyboard_utils_unittests.cc
+../../../flutter/shell/platform/windows/platform_handler_unittests.cc
+../../../flutter/shell/platform/windows/sequential_id_generator_unittests.cc
+../../../flutter/shell/platform/windows/settings_plugin_unittests.cc
+../../../flutter/shell/platform/windows/system_utils_unittests.cc
+../../../flutter/shell/platform/windows/task_runner_unittests.cc
+../../../flutter/shell/platform/windows/testing
+../../../flutter/shell/platform/windows/text_input_plugin_unittest.cc
+../../../flutter/shell/platform/windows/window_proc_delegate_manager_unittests.cc
+../../../flutter/shell/platform/windows/window_unittests.cc
+../../../flutter/shell/platform/windows/windows_lifecycle_manager_unittests.cc
+../../../flutter/shell/profiling/sampling_profiler_unittest.cc
+../../../flutter/shell/testing
+../../../flutter/shell/vmservice/.dart_tool
+../../../flutter/shell/vmservice/pubspec.lock
+../../../flutter/shell/vmservice/pubspec.yaml
+../../../flutter/sky/packages/sky_engine/.gitignore
+../../../flutter/sky/packages/sky_engine/LICENSE
+../../../flutter/sky/packages/sky_engine/README.md
+../../../flutter/sky/packages/sky_engine/lib/_embedder.yaml
+../../../flutter/sky/packages/sky_engine/pubspec.yaml
+../../../flutter/sky/tools/create_embedder_framework.py
+../../../flutter/sky/tools/create_full_ios_framework.py
+../../../flutter/sky/tools/create_ios_framework.py
+../../../flutter/sky/tools/create_macos_framework.py
+../../../flutter/sky/tools/create_macos_gen_snapshots.py
+../../../flutter/sky/tools/create_xcframework.py
+../../../flutter/sky/tools/dist_dart_pkg.py
+../../../flutter/sky/tools/install_framework_headers.py
+../../../flutter/testing
+../../../flutter/third_party/.clang-tidy
+../../../flutter/third_party/.gitignore
+../../../flutter/third_party/README.md
+../../../flutter/third_party/abseil-cpp/.git
+../../../flutter/third_party/abseil-cpp/.github
+../../../flutter/third_party/abseil-cpp/ABSEIL_ISSUE_TEMPLATE.md
+../../../flutter/third_party/abseil-cpp/AUTHORS
+../../../flutter/third_party/abseil-cpp/BUILD.bazel
+../../../flutter/third_party/abseil-cpp/CMake
+../../../flutter/third_party/abseil-cpp/CMakeLists.txt
+../../../flutter/third_party/abseil-cpp/CONTRIBUTING.md
+../../../flutter/third_party/abseil-cpp/DIR_METADATA
+../../../flutter/third_party/abseil-cpp/FAQ.md
+../../../flutter/third_party/abseil-cpp/OWNERS
+../../../flutter/third_party/abseil-cpp/README.chromium
+../../../flutter/third_party/abseil-cpp/README.md
+../../../flutter/third_party/abseil-cpp/UPGRADES.md
+../../../flutter/third_party/abseil-cpp/WORKSPACE
+../../../flutter/third_party/abseil-cpp/absl/BUILD.bazel
+../../../flutter/third_party/abseil-cpp/absl/CMakeLists.txt
+../../../flutter/third_party/abseil-cpp/absl/abseil.podspec.gen.py
+../../../flutter/third_party/abseil-cpp/absl/algorithm/BUILD.bazel
+../../../flutter/third_party/abseil-cpp/absl/algorithm/CMakeLists.txt
+../../../flutter/third_party/abseil-cpp/absl/algorithm/algorithm_test.cc
+../../../flutter/third_party/abseil-cpp/absl/algorithm/container_test.cc
+../../../flutter/third_party/abseil-cpp/absl/base/BUILD.bazel
+../../../flutter/third_party/abseil-cpp/absl/base/CMakeLists.txt
+../../../flutter/third_party/abseil-cpp/absl/base/bit_cast_test.cc
+../../../flutter/third_party/abseil-cpp/absl/base/call_once_test.cc
+../../../flutter/third_party/abseil-cpp/absl/base/config_test.cc
+../../../flutter/third_party/abseil-cpp/absl/base/exception_safety_testing_test.cc
+../../../flutter/third_party/abseil-cpp/absl/base/inline_variable_test.cc
+../../../flutter/third_party/abseil-cpp/absl/base/internal/atomic_hook_test.cc
+../../../flutter/third_party/abseil-cpp/absl/base/internal/cmake_thread_test.cc
+../../../flutter/third_party/abseil-cpp/absl/base/internal/endian_test.cc
+../../../flutter/third_party/abseil-cpp/absl/base/internal/errno_saver_test.cc
+../../../flutter/third_party/abseil-cpp/absl/base/internal/fast_type_id_test.cc
+../../../flutter/third_party/abseil-cpp/absl/base/internal/low_level_alloc_test.cc
+../../../flutter/third_party/abseil-cpp/absl/base/internal/scoped_set_env_test.cc
+../../../flutter/third_party/abseil-cpp/absl/base/internal/strerror_test.cc
+../../../flutter/third_party/abseil-cpp/absl/base/internal/sysinfo_test.cc
+../../../flutter/third_party/abseil-cpp/absl/base/internal/thread_identity_test.cc
+../../../flutter/third_party/abseil-cpp/absl/base/internal/unique_small_name_test.cc
+../../../flutter/third_party/abseil-cpp/absl/base/invoke_test.cc
+../../../flutter/third_party/abseil-cpp/absl/base/log_severity_test.cc
+../../../flutter/third_party/abseil-cpp/absl/base/no_destructor_test.cc
+../../../flutter/third_party/abseil-cpp/absl/base/nullability_test.cc
+../../../flutter/third_party/abseil-cpp/absl/base/optimization_test.cc
+../../../flutter/third_party/abseil-cpp/absl/base/prefetch_test.cc
+../../../flutter/third_party/abseil-cpp/absl/base/raw_logging_test.cc
+../../../flutter/third_party/abseil-cpp/absl/base/throw_delegate_test.cc
+../../../flutter/third_party/abseil-cpp/absl/cleanup/BUILD.bazel
+../../../flutter/third_party/abseil-cpp/absl/cleanup/CMakeLists.txt
+../../../flutter/third_party/abseil-cpp/absl/cleanup/cleanup_test.cc
+../../../flutter/third_party/abseil-cpp/absl/container/BUILD.bazel
+../../../flutter/third_party/abseil-cpp/absl/container/CMakeLists.txt
+../../../flutter/third_party/abseil-cpp/absl/container/btree_test.cc
+../../../flutter/third_party/abseil-cpp/absl/container/btree_test.h
+../../../flutter/third_party/abseil-cpp/absl/container/fixed_array_exception_safety_test.cc
+../../../flutter/third_party/abseil-cpp/absl/container/fixed_array_test.cc
+../../../flutter/third_party/abseil-cpp/absl/container/flat_hash_map_test.cc
+../../../flutter/third_party/abseil-cpp/absl/container/flat_hash_set_test.cc
+../../../flutter/third_party/abseil-cpp/absl/container/inlined_vector_exception_safety_test.cc
+../../../flutter/third_party/abseil-cpp/absl/container/inlined_vector_test.cc
+../../../flutter/third_party/abseil-cpp/absl/container/internal/common_policy_traits_test.cc
+../../../flutter/third_party/abseil-cpp/absl/container/internal/compressed_tuple_test.cc
+../../../flutter/third_party/abseil-cpp/absl/container/internal/container_memory_test.cc
+../../../flutter/third_party/abseil-cpp/absl/container/internal/hash_function_defaults_test.cc
+../../../flutter/third_party/abseil-cpp/absl/container/internal/hash_policy_testing_test.cc
+../../../flutter/third_party/abseil-cpp/absl/container/internal/hash_policy_traits_test.cc
+../../../flutter/third_party/abseil-cpp/absl/container/internal/hashtablez_sampler_test.cc
+../../../flutter/third_party/abseil-cpp/absl/container/internal/layout_test.cc
+../../../flutter/third_party/abseil-cpp/absl/container/internal/node_slot_policy_test.cc
+../../../flutter/third_party/abseil-cpp/absl/container/internal/raw_hash_set_allocator_test.cc
+../../../flutter/third_party/abseil-cpp/absl/container/internal/raw_hash_set_test.cc
+../../../flutter/third_party/abseil-cpp/absl/container/internal/test_instance_tracker_test.cc
+../../../flutter/third_party/abseil-cpp/absl/container/internal/unordered_map_constructor_test.h
+../../../flutter/third_party/abseil-cpp/absl/container/internal/unordered_map_lookup_test.h
+../../../flutter/third_party/abseil-cpp/absl/container/internal/unordered_map_members_test.h
+../../../flutter/third_party/abseil-cpp/absl/container/internal/unordered_map_modifiers_test.h
+../../../flutter/third_party/abseil-cpp/absl/container/internal/unordered_map_test.cc
+../../../flutter/third_party/abseil-cpp/absl/container/internal/unordered_set_constructor_test.h
+../../../flutter/third_party/abseil-cpp/absl/container/internal/unordered_set_lookup_test.h
+../../../flutter/third_party/abseil-cpp/absl/container/internal/unordered_set_members_test.h
+../../../flutter/third_party/abseil-cpp/absl/container/internal/unordered_set_modifiers_test.h
+../../../flutter/third_party/abseil-cpp/absl/container/internal/unordered_set_test.cc
+../../../flutter/third_party/abseil-cpp/absl/container/node_hash_map_test.cc
+../../../flutter/third_party/abseil-cpp/absl/container/node_hash_set_test.cc
+../../../flutter/third_party/abseil-cpp/absl/container/sample_element_size_test.cc
+../../../flutter/third_party/abseil-cpp/absl/copts/AbseilConfigureCopts.cmake
+../../../flutter/third_party/abseil-cpp/absl/copts/GENERATED_AbseilCopts.cmake
+../../../flutter/third_party/abseil-cpp/absl/copts/GENERATED_copts.bzl
+../../../flutter/third_party/abseil-cpp/absl/copts/configure_copts.bzl
+../../../flutter/third_party/abseil-cpp/absl/copts/copts.py
+../../../flutter/third_party/abseil-cpp/absl/copts/generate_copts.py
+../../../flutter/third_party/abseil-cpp/absl/crc/BUILD.bazel
+../../../flutter/third_party/abseil-cpp/absl/crc/CMakeLists.txt
+../../../flutter/third_party/abseil-cpp/absl/crc/crc32c_test.cc
+../../../flutter/third_party/abseil-cpp/absl/crc/internal/crc_cord_state_test.cc
+../../../flutter/third_party/abseil-cpp/absl/crc/internal/crc_memcpy_test.cc
+../../../flutter/third_party/abseil-cpp/absl/crc/internal/non_temporal_memcpy_test.cc
+../../../flutter/third_party/abseil-cpp/absl/debugging/BUILD.bazel
+../../../flutter/third_party/abseil-cpp/absl/debugging/CMakeLists.txt
+../../../flutter/third_party/abseil-cpp/absl/debugging/failure_signal_handler_test.cc
+../../../flutter/third_party/abseil-cpp/absl/debugging/internal/demangle_test.cc
+../../../flutter/third_party/abseil-cpp/absl/debugging/internal/stack_consumption_test.cc
+../../../flutter/third_party/abseil-cpp/absl/debugging/leak_check_fail_test.cc
+../../../flutter/third_party/abseil-cpp/absl/debugging/leak_check_test.cc
+../../../flutter/third_party/abseil-cpp/absl/debugging/stacktrace_test.cc
+../../../flutter/third_party/abseil-cpp/absl/debugging/symbolize_test.cc
+../../../flutter/third_party/abseil-cpp/absl/flags/BUILD.bazel
+../../../flutter/third_party/abseil-cpp/absl/flags/CMakeLists.txt
+../../../flutter/third_party/abseil-cpp/absl/flags/commandlineflag_test.cc
+../../../flutter/third_party/abseil-cpp/absl/flags/config_test.cc
+../../../flutter/third_party/abseil-cpp/absl/flags/flag_test.cc
+../../../flutter/third_party/abseil-cpp/absl/flags/internal/path_util_test.cc
+../../../flutter/third_party/abseil-cpp/absl/flags/internal/program_name_test.cc
+../../../flutter/third_party/abseil-cpp/absl/flags/internal/sequence_lock_test.cc
+../../../flutter/third_party/abseil-cpp/absl/flags/internal/usage_test.cc
+../../../flutter/third_party/abseil-cpp/absl/flags/marshalling_test.cc
+../../../flutter/third_party/abseil-cpp/absl/flags/parse_test.cc
+../../../flutter/third_party/abseil-cpp/absl/flags/reflection_test.cc
+../../../flutter/third_party/abseil-cpp/absl/flags/usage_config_test.cc
+../../../flutter/third_party/abseil-cpp/absl/functional/BUILD.bazel
+../../../flutter/third_party/abseil-cpp/absl/functional/CMakeLists.txt
+../../../flutter/third_party/abseil-cpp/absl/functional/any_invocable_test.cc
+../../../flutter/third_party/abseil-cpp/absl/functional/bind_front_test.cc
+../../../flutter/third_party/abseil-cpp/absl/functional/function_ref_test.cc
+../../../flutter/third_party/abseil-cpp/absl/functional/overload_test.cc
+../../../flutter/third_party/abseil-cpp/absl/hash/BUILD.bazel
+../../../flutter/third_party/abseil-cpp/absl/hash/CMakeLists.txt
+../../../flutter/third_party/abseil-cpp/absl/hash/hash_instantiated_test.cc
+../../../flutter/third_party/abseil-cpp/absl/hash/hash_test.cc
+../../../flutter/third_party/abseil-cpp/absl/hash/internal/city_test.cc
+../../../flutter/third_party/abseil-cpp/absl/hash/internal/hash_test.h
+../../../flutter/third_party/abseil-cpp/absl/hash/internal/low_level_hash_test.cc
+../../../flutter/third_party/abseil-cpp/absl/log/BUILD.bazel
+../../../flutter/third_party/abseil-cpp/absl/log/CMakeLists.txt
+../../../flutter/third_party/abseil-cpp/absl/log/absl_check_test.cc
+../../../flutter/third_party/abseil-cpp/absl/log/absl_log_basic_test.cc
+../../../flutter/third_party/abseil-cpp/absl/log/check_test.cc
+../../../flutter/third_party/abseil-cpp/absl/log/die_if_null_test.cc
+../../../flutter/third_party/abseil-cpp/absl/log/flags_test.cc
+../../../flutter/third_party/abseil-cpp/absl/log/globals_test.cc
+../../../flutter/third_party/abseil-cpp/absl/log/internal/BUILD.bazel
+../../../flutter/third_party/abseil-cpp/absl/log/internal/fnmatch_test.cc
+../../../flutter/third_party/abseil-cpp/absl/log/internal/stderr_log_sink_test.cc
+../../../flutter/third_party/abseil-cpp/absl/log/log_basic_test.cc
+../../../flutter/third_party/abseil-cpp/absl/log/log_entry_test.cc
+../../../flutter/third_party/abseil-cpp/absl/log/log_format_test.cc
+../../../flutter/third_party/abseil-cpp/absl/log/log_macro_hygiene_test.cc
+../../../flutter/third_party/abseil-cpp/absl/log/log_modifier_methods_test.cc
+../../../flutter/third_party/abseil-cpp/absl/log/log_sink_test.cc
+../../../flutter/third_party/abseil-cpp/absl/log/log_streamer_test.cc
+../../../flutter/third_party/abseil-cpp/absl/log/scoped_mock_log_test.cc
+../../../flutter/third_party/abseil-cpp/absl/log/stripping_test.cc
+../../../flutter/third_party/abseil-cpp/absl/log/structured_test.cc
+../../../flutter/third_party/abseil-cpp/absl/log/vlog_is_on_test.cc
+../../../flutter/third_party/abseil-cpp/absl/memory/BUILD.bazel
+../../../flutter/third_party/abseil-cpp/absl/memory/CMakeLists.txt
+../../../flutter/third_party/abseil-cpp/absl/memory/memory_test.cc
+../../../flutter/third_party/abseil-cpp/absl/meta/BUILD.bazel
+../../../flutter/third_party/abseil-cpp/absl/meta/CMakeLists.txt
+../../../flutter/third_party/abseil-cpp/absl/meta/type_traits_test.cc
+../../../flutter/third_party/abseil-cpp/absl/numeric/BUILD.bazel
+../../../flutter/third_party/abseil-cpp/absl/numeric/CMakeLists.txt
+../../../flutter/third_party/abseil-cpp/absl/numeric/bits_test.cc
+../../../flutter/third_party/abseil-cpp/absl/numeric/int128_stream_test.cc
+../../../flutter/third_party/abseil-cpp/absl/numeric/int128_test.cc
+../../../flutter/third_party/abseil-cpp/absl/profiling/BUILD.bazel
+../../../flutter/third_party/abseil-cpp/absl/profiling/CMakeLists.txt
+../../../flutter/third_party/abseil-cpp/absl/profiling/internal/exponential_biased_test.cc
+../../../flutter/third_party/abseil-cpp/absl/profiling/internal/periodic_sampler_test.cc
+../../../flutter/third_party/abseil-cpp/absl/profiling/internal/sample_recorder_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/BUILD.bazel
+../../../flutter/third_party/abseil-cpp/absl/random/CMakeLists.txt
+../../../flutter/third_party/abseil-cpp/absl/random/bernoulli_distribution_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/beta_distribution_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/bit_gen_ref_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/discrete_distribution_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/distributions_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/examples_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/exponential_distribution_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/gaussian_distribution_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/generators_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/internal/BUILD.bazel
+../../../flutter/third_party/abseil-cpp/absl/random/internal/chi_square_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/internal/distribution_test_util_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/internal/explicit_seed_seq_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/internal/fast_uniform_bits_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/internal/fastmath_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/internal/generate_real_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/internal/iostream_state_saver_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/internal/nanobenchmark_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/internal/nonsecure_base_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/internal/pcg_engine_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/internal/pool_urbg_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/internal/randen_engine_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/internal/randen_hwaes_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/internal/randen_slow_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/internal/randen_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/internal/salted_seed_seq_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/internal/seed_material_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/internal/traits_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/internal/uniform_helper_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/internal/wide_multiply_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/log_uniform_int_distribution_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/mock_distributions_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/mocking_bit_gen_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/poisson_distribution_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/seed_sequences_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/uniform_int_distribution_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/uniform_real_distribution_test.cc
+../../../flutter/third_party/abseil-cpp/absl/random/zipf_distribution_test.cc
+../../../flutter/third_party/abseil-cpp/absl/status/BUILD.bazel
+../../../flutter/third_party/abseil-cpp/absl/status/CMakeLists.txt
+../../../flutter/third_party/abseil-cpp/absl/status/status_test.cc
+../../../flutter/third_party/abseil-cpp/absl/status/statusor_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/BUILD.bazel
+../../../flutter/third_party/abseil-cpp/absl/strings/CMakeLists.txt
+../../../flutter/third_party/abseil-cpp/absl/strings/ascii_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/atod_manual_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/char_formatting_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/charconv_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/charset_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/cord_buffer_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/cord_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/cordz_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/escaping_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/has_absl_stringify_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/has_ostream_operator_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/internal/charconv_bigint_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/internal/charconv_parse_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_data_edge_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_navigator_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_reader_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_rep_crc_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/internal/cordz_functions_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/internal/cordz_handle_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/internal/cordz_info_statistics_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/internal/cordz_info_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/internal/cordz_sample_token_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/internal/cordz_update_scope_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/internal/cordz_update_tracker_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/internal/damerau_levenshtein_distance_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/internal/memutil_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/internal/ostringstream_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/internal/pow10_helper_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/internal/resize_uninitialized_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/arg_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/bind_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/checker_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/convert_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/extension_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/output_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/parser_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/internal/string_constant_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/internal/utf8_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/match_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/numbers_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/str_cat_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/str_format_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/str_join_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/str_replace_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/str_split_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/string_view_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/strip_test.cc
+../../../flutter/third_party/abseil-cpp/absl/strings/substitute_test.cc
+../../../flutter/third_party/abseil-cpp/absl/synchronization/BUILD.bazel
+../../../flutter/third_party/abseil-cpp/absl/synchronization/CMakeLists.txt
+../../../flutter/third_party/abseil-cpp/absl/synchronization/barrier_test.cc
+../../../flutter/third_party/abseil-cpp/absl/synchronization/blocking_counter_test.cc
+../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/graphcycles_test.cc
+../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/kernel_timeout_test.cc
+../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/per_thread_sem_test.cc
+../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/waiter_test.cc
+../../../flutter/third_party/abseil-cpp/absl/synchronization/lifetime_test.cc
+../../../flutter/third_party/abseil-cpp/absl/synchronization/mutex_method_pointer_test.cc
+../../../flutter/third_party/abseil-cpp/absl/synchronization/mutex_test.cc
+../../../flutter/third_party/abseil-cpp/absl/synchronization/notification_test.cc
+../../../flutter/third_party/abseil-cpp/absl/time/BUILD.bazel
+../../../flutter/third_party/abseil-cpp/absl/time/CMakeLists.txt
+../../../flutter/third_party/abseil-cpp/absl/time/civil_time_test.cc
+../../../flutter/third_party/abseil-cpp/absl/time/clock_test.cc
+../../../flutter/third_party/abseil-cpp/absl/time/duration_test.cc
+../../../flutter/third_party/abseil-cpp/absl/time/flag_test.cc
+../../../flutter/third_party/abseil-cpp/absl/time/format_test.cc
+../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/BUILD.bazel
+../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/civil_time_test.cc
+../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format_test.cc
+../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_lookup_test.cc
+../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/testdata
+../../../flutter/third_party/abseil-cpp/absl/time/time_test.cc
+../../../flutter/third_party/abseil-cpp/absl/time/time_zone_test.cc
+../../../flutter/third_party/abseil-cpp/absl/types/BUILD.bazel
+../../../flutter/third_party/abseil-cpp/absl/types/CMakeLists.txt
+../../../flutter/third_party/abseil-cpp/absl/types/any_exception_safety_test.cc
+../../../flutter/third_party/abseil-cpp/absl/types/any_test.cc
+../../../flutter/third_party/abseil-cpp/absl/types/compare_test.cc
+../../../flutter/third_party/abseil-cpp/absl/types/optional_exception_safety_test.cc
+../../../flutter/third_party/abseil-cpp/absl/types/optional_test.cc
+../../../flutter/third_party/abseil-cpp/absl/types/span_test.cc
+../../../flutter/third_party/abseil-cpp/absl/types/variant_exception_safety_test.cc
+../../../flutter/third_party/abseil-cpp/absl/types/variant_test.cc
+../../../flutter/third_party/abseil-cpp/absl/utility/BUILD.bazel
+../../../flutter/third_party/abseil-cpp/absl/utility/CMakeLists.txt
+../../../flutter/third_party/abseil-cpp/absl/utility/internal/if_constexpr_test.cc
+../../../flutter/third_party/abseil-cpp/absl/utility/utility_test.cc
+../../../flutter/third_party/abseil-cpp/absl_hardening_test.cc
+../../../flutter/third_party/abseil-cpp/conanfile.py
+../../../flutter/third_party/abseil-cpp/create_lts.py
+../../../flutter/third_party/abseil-cpp/generate_def_files.py
+../../../flutter/third_party/abseil-cpp/roll_abseil.py
+../../../flutter/third_party/accessibility/README.md
+../../../flutter/third_party/accessibility/ax/ax_enum_util_unittest.cc
+../../../flutter/third_party/accessibility/ax/ax_event_generator_unittest.cc
+../../../flutter/third_party/accessibility/ax/ax_node_data_unittest.cc
+../../../flutter/third_party/accessibility/ax/ax_node_position_unittest.cc
+../../../flutter/third_party/accessibility/ax/ax_range_unittest.cc
+../../../flutter/third_party/accessibility/ax/ax_role_properties_unittest.cc
+../../../flutter/third_party/accessibility/ax/ax_table_info_unittest.cc
+../../../flutter/third_party/accessibility/ax/ax_tree_unittest.cc
+../../../flutter/third_party/accessibility/ax/platform/ax_fragment_root_win_unittest.cc
+../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_base_unittest.cc
+../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_mac_unittest.h
+../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_mac_unittest.mm
+../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_textprovider_win_unittest.cc
+../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_textrangeprovider_win_unittest.cc
+../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_unittest.cc
+../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_unittest.h
+../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_win_unittest.cc
+../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_win_unittest.h
+../../../flutter/third_party/accessibility/ax/platform/ax_unique_id_unittest.cc
+../../../flutter/third_party/accessibility/base/logging_unittests.cc
+../../../flutter/third_party/accessibility/base/numerics/README.md
+../../../flutter/third_party/accessibility/base/string_utils_unittest.cc
+../../../flutter/third_party/accessibility/base/test
+../../../flutter/third_party/accessibility/base/win/display_unittest.cc
+../../../flutter/third_party/accessibility/base/win/enum_variant_unittest.cc
+../../../flutter/third_party/accessibility/base/win/scoped_bstr_unittest.cc
+../../../flutter/third_party/accessibility/base/win/scoped_safearray_unittest.cc
+../../../flutter/third_party/accessibility/base/win/scoped_variant_unittest.cc
+../../../flutter/third_party/accessibility/base/win/variant_vector_unittest.cc
+../../../flutter/third_party/accessibility/gfx/geometry/insets_unittest.cc
+../../../flutter/third_party/accessibility/gfx/geometry/point_unittest.cc
+../../../flutter/third_party/accessibility/gfx/geometry/rect_unittest.cc
+../../../flutter/third_party/accessibility/gfx/geometry/size_unittest.cc
+../../../flutter/third_party/accessibility/gfx/geometry/vector2d_unittest.cc
+../../../flutter/third_party/accessibility/gfx/range/range_unittest.cc
+../../../flutter/third_party/accessibility/gfx/test
+../../../flutter/third_party/angle/.clang-format
+../../../flutter/third_party/angle/.git
+../../../flutter/third_party/angle/.gitattributes
+../../../flutter/third_party/angle/.gitignore
+../../../flutter/third_party/angle/.gn
+../../../flutter/third_party/angle/.style.yapf
+../../../flutter/third_party/angle/.vpython
+../../../flutter/third_party/angle/.vpython3
+../../../flutter/third_party/angle/.yapfignore
+../../../flutter/third_party/angle/AUTHORS
+../../../flutter/third_party/angle/Android.mk
+../../../flutter/third_party/angle/CONTRIBUTORS
+../../../flutter/third_party/angle/DEPS
+../../../flutter/third_party/angle/DIR_METADATA
+../../../flutter/third_party/angle/OWNERS
+../../../flutter/third_party/angle/PRESUBMIT.py
+../../../flutter/third_party/angle/README.chromium
+../../../flutter/third_party/angle/README.md
+../../../flutter/third_party/angle/WATCHLISTS
+../../../flutter/third_party/angle/additional_readme_paths.json
+../../../flutter/third_party/angle/android
+../../../flutter/third_party/angle/codereview.settings
+../../../flutter/third_party/angle/doc
+../../../flutter/third_party/angle/extensions
+../../../flutter/third_party/angle/include/CL/.clang-format
+../../../flutter/third_party/angle/include/CL/README.md
+../../../flutter/third_party/angle/include/EGL/.clang-format
+../../../flutter/third_party/angle/include/GLES/.clang-format
+../../../flutter/third_party/angle/include/GLES/README.md
+../../../flutter/third_party/angle/include/GLES2/.clang-format
+../../../flutter/third_party/angle/include/GLES3/.clang-format
+../../../flutter/third_party/angle/include/GLX/.clang-format
+../../../flutter/third_party/angle/include/KHR/.clang-format
+../../../flutter/third_party/angle/include/WGL/.clang-format
+../../../flutter/third_party/angle/include/platform/autogen/.clang-format
+../../../flutter/third_party/angle/include/platform/gen_features.py
+../../../flutter/third_party/angle/infra
+../../../flutter/third_party/angle/samples
+../../../flutter/third_party/angle/scripts
+../../../flutter/third_party/angle/src/commit_id.py
+../../../flutter/third_party/angle/src/common/BinaryStream_unittest.cpp
+../../../flutter/third_party/angle/src/common/CircularBuffer_unittest.cpp
+../../../flutter/third_party/angle/src/common/FastVector_unittest.cpp
+../../../flutter/third_party/angle/src/common/FixedQueue_unittest.cpp
+../../../flutter/third_party/angle/src/common/FixedVector_unittest.cpp
+../../../flutter/third_party/angle/src/common/Float16ToFloat32.py
+../../../flutter/third_party/angle/src/common/Optional_unittest.cpp
+../../../flutter/third_party/angle/src/common/PoolAlloc_unittest.cpp
+../../../flutter/third_party/angle/src/common/WorkerThread_unittest.cpp
+../../../flutter/third_party/angle/src/common/aligned_memory_unittest.cpp
+../../../flutter/third_party/angle/src/common/angleutils_unittest.cpp
+../../../flutter/third_party/angle/src/common/base/README.angle
+../../../flutter/third_party/angle/src/common/base/anglebase/numerics/OWNERS
+../../../flutter/third_party/angle/src/common/bitset_utils_unittest.cpp
+../../../flutter/third_party/angle/src/common/fuchsia_egl/OWNERS
+../../../flutter/third_party/angle/src/common/gen_packed_gl_enums.py
+../../../flutter/third_party/angle/src/common/gen_uniform_type_table.py
+../../../flutter/third_party/angle/src/common/hash_utils_unittest.cpp
+../../../flutter/third_party/angle/src/common/mathutil_unittest.cpp
+../../../flutter/third_party/angle/src/common/matrix_utils_unittest.cpp
+../../../flutter/third_party/angle/src/common/serializer/JsonSerializer_unittest.cpp
+../../../flutter/third_party/angle/src/common/spirv/gen_spirv_builder_and_parser.py
+../../../flutter/third_party/angle/src/common/string_utils_unittest.cpp
+../../../flutter/third_party/angle/src/common/system_utils_unittest.cpp
+../../../flutter/third_party/angle/src/common/third_party/xxhash/README.chromium
+../../../flutter/third_party/angle/src/common/third_party/xxhash/README.md
+../../../flutter/third_party/angle/src/common/utilities_unittest.cpp
+../../../flutter/third_party/angle/src/common/vector_utils_unittest.cpp
+../../../flutter/third_party/angle/src/compiler/generate_parser_tools.py
+../../../flutter/third_party/angle/src/compiler/preprocessor/generate_parser.py
+../../../flutter/third_party/angle/src/compiler/translator/gen_builtin_symbols.py
+../../../flutter/third_party/angle/src/compiler/translator/generate_parser.py
+../../../flutter/third_party/angle/src/compiler/translator/hlsl/gen_emulated_builtin_function_tables.py
+../../../flutter/third_party/angle/src/compiler/translator/span_unittest.cpp
+../../../flutter/third_party/angle/src/feature_support_util/OWNERS
+../../../flutter/third_party/angle/src/feature_support_util/feature_support_util_unittest.cpp
+../../../flutter/third_party/angle/src/gpu_info_util/SystemInfo_unittest.cpp
+../../../flutter/third_party/angle/src/image_util/AstcDecompressor_unittest.cpp
+../../../flutter/third_party/angle/src/libANGLE/BlendStateExt_unittest.cpp
+../../../flutter/third_party/angle/src/libANGLE/BlobCache_unittest.cpp
+../../../flutter/third_party/angle/src/libANGLE/Config_unittest.cpp
+../../../flutter/third_party/angle/src/libANGLE/Fence_unittest.cpp
+../../../flutter/third_party/angle/src/libANGLE/GlobalMutex_unittest.cpp
+../../../flutter/third_party/angle/src/libANGLE/HandleAllocator_unittest.cpp
+../../../flutter/third_party/angle/src/libANGLE/ImageIndexIterator_unittest.cpp
+../../../flutter/third_party/angle/src/libANGLE/Image_unittest.cpp
+../../../flutter/third_party/angle/src/libANGLE/Observer_unittest.cpp
+../../../flutter/third_party/angle/src/libANGLE/Program_unittest.cpp
+../../../flutter/third_party/angle/src/libANGLE/ResourceManager_unittest.cpp
+../../../flutter/third_party/angle/src/libANGLE/ResourceMap_unittest.cpp
+../../../flutter/third_party/angle/src/libANGLE/SizedMRUCache_unittest.cpp
+../../../flutter/third_party/angle/src/libANGLE/Surface_unittest.cpp
+../../../flutter/third_party/angle/src/libANGLE/TransformFeedback_unittest.cpp
+../../../flutter/third_party/angle/src/libANGLE/UnlockedTailCall_unittest.cpp
+../../../flutter/third_party/angle/src/libANGLE/VaryingPacking_unittest.cpp
+../../../flutter/third_party/angle/src/libANGLE/VertexArray_unittest.cpp
+../../../flutter/third_party/angle/src/libANGLE/capture/OWNERS
+../../../flutter/third_party/angle/src/libANGLE/gen_copy_conversion_table.py
+../../../flutter/third_party/angle/src/libANGLE/gen_extensions.py
+../../../flutter/third_party/angle/src/libANGLE/gen_format_map.py
+../../../flutter/third_party/angle/src/libANGLE/gen_overlay_fonts.py
+../../../flutter/third_party/angle/src/libANGLE/gen_overlay_widgets.py
+../../../flutter/third_party/angle/src/libANGLE/renderer/README.md
+../../../flutter/third_party/angle/src/libANGLE/renderer/angle_format.py
+../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/OWNERS
+../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/FormatTables.md
+../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/UniformBlockToStructuredBufferTranslation.md
+../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/gen_blit11helper.py
+../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/gen_texture_format_table.py
+../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow_unittest.cpp
+../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow_unittest.cpp
+../../../flutter/third_party/angle/src/libANGLE/renderer/gen_angle_format_table.py
+../../../flutter/third_party/angle/src/libANGLE/renderer/gen_dxgi_format_table.py
+../../../flutter/third_party/angle/src/libANGLE/renderer/gen_dxgi_support_tables.py
+../../../flutter/third_party/angle/src/libANGLE/renderer/gen_load_functions_table.py
+../../../flutter/third_party/angle/src/libANGLE/renderer/gl/DisplayGL_unittest.cpp
+../../../flutter/third_party/angle/src/libANGLE/renderer/gl/FeatureSupportGL.md
+../../../flutter/third_party/angle/src/libANGLE/renderer/gl/OWNERS
+../../../flutter/third_party/angle/src/libANGLE/renderer/gl/generate_gl_dispatch_table.py
+../../../flutter/third_party/angle/src/libANGLE/renderer/metal/doc
+../../../flutter/third_party/angle/src/libANGLE/renderer/metal/gen_mtl_format_table.py
+../../../flutter/third_party/angle/src/libANGLE/renderer/metal/shaders/gen_mtl_internal_shaders.py
+../../../flutter/third_party/angle/src/libANGLE/renderer/serial_utils_unittest.cpp
+../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/OWNERS
+../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/README.md
+../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/doc
+../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/fuchsia/OWNERS
+../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/gen_vk_format_table.py
+../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/gen_vk_internal_shaders.py
+../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/gen_vk_mandatory_format_support_table.py
+../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/README.md
+../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/.clang-format
+../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/etc_decoder/README.chromium
+../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/ffx_spd/README.chromium
+../../../flutter/third_party/angle/src/program_serialize_data_version.py
+../../../flutter/third_party/angle/src/tests
+../../../flutter/third_party/angle/src/third_party/ceval/.clang-format
+../../../flutter/third_party/angle/src/third_party/ceval/README.chromium
+../../../flutter/third_party/angle/src/third_party/ceval/README.md
+../../../flutter/third_party/angle/src/third_party/ceval/package.json
+../../../flutter/third_party/angle/src/third_party/libXNVCtrl/README.chromium
+../../../flutter/third_party/angle/src/third_party/volk
+../../../flutter/third_party/angle/third_party
+../../../flutter/third_party/angle/tools
+../../../flutter/third_party/angle/util
+../../../flutter/third_party/benchmark
+../../../flutter/third_party/boringssl/.git
+../../../flutter/third_party/boringssl/.gitignore
+../../../flutter/third_party/boringssl/OWNERS
+../../../flutter/third_party/boringssl/README
+../../../flutter/third_party/boringssl/apple-aarch64/crypto/test
+../../../flutter/third_party/boringssl/apple-arm/crypto/test
+../../../flutter/third_party/boringssl/apple-x86/crypto/test
+../../../flutter/third_party/boringssl/apple-x86_64/crypto/test
+../../../flutter/third_party/boringssl/codereview.settings
+../../../flutter/third_party/boringssl/linux-aarch64/crypto/test
+../../../flutter/third_party/boringssl/linux-arm/crypto/test
+../../../flutter/third_party/boringssl/linux-x86/crypto/test
+../../../flutter/third_party/boringssl/linux-x86_64/crypto/test
+../../../flutter/third_party/boringssl/src/.clang-format
+../../../flutter/third_party/boringssl/src/.git
+../../../flutter/third_party/boringssl/src/.github
+../../../flutter/third_party/boringssl/src/.gitignore
+../../../flutter/third_party/boringssl/src/API-CONVENTIONS.md
+../../../flutter/third_party/boringssl/src/BREAKING-CHANGES.md
+../../../flutter/third_party/boringssl/src/BUILDING.md
+../../../flutter/third_party/boringssl/src/CMakeLists.txt
+../../../flutter/third_party/boringssl/src/CONTRIBUTING.md
+../../../flutter/third_party/boringssl/src/FUZZING.md
+../../../flutter/third_party/boringssl/src/INCORPORATING.md
+../../../flutter/third_party/boringssl/src/PORTING.md
+../../../flutter/third_party/boringssl/src/README.md
+../../../flutter/third_party/boringssl/src/SANDBOXING.md
+../../../flutter/third_party/boringssl/src/STYLE.md
+../../../flutter/third_party/boringssl/src/cmake
+../../../flutter/third_party/boringssl/src/codereview.settings
+../../../flutter/third_party/boringssl/src/crypto/CMakeLists.txt
+../../../flutter/third_party/boringssl/src/crypto/abi_self_test.cc
+../../../flutter/third_party/boringssl/src/crypto/asn1/asn1_test.cc
+../../../flutter/third_party/boringssl/src/crypto/base64/base64_test.cc
+../../../flutter/third_party/boringssl/src/crypto/bio/bio_test.cc
+../../../flutter/third_party/boringssl/src/crypto/blake2/blake2_test.cc
+../../../flutter/third_party/boringssl/src/crypto/buf/buf_test.cc
+../../../flutter/third_party/boringssl/src/crypto/bytestring/bytestring_test.cc
+../../../flutter/third_party/boringssl/src/crypto/chacha/chacha_test.cc
+../../../flutter/third_party/boringssl/src/crypto/cipher_extra/aead_test.cc
+../../../flutter/third_party/boringssl/src/crypto/cipher_extra/cipher_test.cc
+../../../flutter/third_party/boringssl/src/crypto/cipher_extra/test
+../../../flutter/third_party/boringssl/src/crypto/compiler_test.cc
+../../../flutter/third_party/boringssl/src/crypto/conf/conf_test.cc
+../../../flutter/third_party/boringssl/src/crypto/constant_time_test.cc
+../../../flutter/third_party/boringssl/src/crypto/cpu_arm_linux_test.cc
+../../../flutter/third_party/boringssl/src/crypto/crypto_test.cc
+../../../flutter/third_party/boringssl/src/crypto/curve25519/ed25519_test.cc
+../../../flutter/third_party/boringssl/src/crypto/curve25519/make_curve25519_tables.py
+../../../flutter/third_party/boringssl/src/crypto/curve25519/spake25519_test.cc
+../../../flutter/third_party/boringssl/src/crypto/curve25519/x25519_test.cc
+../../../flutter/third_party/boringssl/src/crypto/dh_extra/dh_test.cc
+../../../flutter/third_party/boringssl/src/crypto/digest_extra/digest_test.cc
+../../../flutter/third_party/boringssl/src/crypto/dsa/dsa_test.cc
+../../../flutter/third_party/boringssl/src/crypto/ecdh_extra/ecdh_test.cc
+../../../flutter/third_party/boringssl/src/crypto/err/err_data_generate.go
+../../../flutter/third_party/boringssl/src/crypto/err/err_test.cc
+../../../flutter/third_party/boringssl/src/crypto/evp/evp_extra_test.cc
+../../../flutter/third_party/boringssl/src/crypto/evp/evp_test.cc
+../../../flutter/third_party/boringssl/src/crypto/evp/pbkdf_test.cc
+../../../flutter/third_party/boringssl/src/crypto/evp/scrypt_test.cc
+../../../flutter/third_party/boringssl/src/crypto/fipsmodule/CMakeLists.txt
+../../../flutter/third_party/boringssl/src/crypto/fipsmodule/FIPS.md
+../../../flutter/third_party/boringssl/src/crypto/fipsmodule/aes/aes_test.cc
+../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/bn_test.cc
+../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/bn_test_to_fuzzer.go
+../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/check_bn_tests.go
+../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/test
+../../../flutter/third_party/boringssl/src/crypto/fipsmodule/cmac/cmac_test.cc
+../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/asm/p256_beeu-armv8-asm.pl
+../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/asm/p256_beeu-x86_64-asm.pl
+../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/ec_test.cc
+../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/make_ec_scalar_base_mult_tests.go
+../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/make_p256-nistz-tests.go
+../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/make_tables.go
+../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/p256-nistz_test.cc
+../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ecdsa/ecdsa_test.cc
+../../../flutter/third_party/boringssl/src/crypto/fipsmodule/hkdf/hkdf_test.cc
+../../../flutter/third_party/boringssl/src/crypto/fipsmodule/md5/md5_test.cc
+../../../flutter/third_party/boringssl/src/crypto/fipsmodule/modes/gcm_test.cc
+../../../flutter/third_party/boringssl/src/crypto/fipsmodule/rand/ctrdrbg_test.cc
+../../../flutter/third_party/boringssl/src/crypto/fipsmodule/rand/fork_detect_test.cc
+../../../flutter/third_party/boringssl/src/crypto/fipsmodule/rand/urandom_test.cc
+../../../flutter/third_party/boringssl/src/crypto/fipsmodule/service_indicator/service_indicator_test.cc
+../../../flutter/third_party/boringssl/src/crypto/fipsmodule/sha/sha_test.cc
+../../../flutter/third_party/boringssl/src/crypto/hmac_extra/hmac_test.cc
+../../../flutter/third_party/boringssl/src/crypto/hpke/hpke_test.cc
+../../../flutter/third_party/boringssl/src/crypto/hpke/translate_test_vectors.py
+../../../flutter/third_party/boringssl/src/crypto/hrss/hrss_test.cc
+../../../flutter/third_party/boringssl/src/crypto/impl_dispatch_test.cc
+../../../flutter/third_party/boringssl/src/crypto/kyber/kyber_test.cc
+../../../flutter/third_party/boringssl/src/crypto/lhash/lhash_test.cc
+../../../flutter/third_party/boringssl/src/crypto/obj/README
+../../../flutter/third_party/boringssl/src/crypto/obj/obj_test.cc
+../../../flutter/third_party/boringssl/src/crypto/pem/pem_test.cc
+../../../flutter/third_party/boringssl/src/crypto/perlasm/readme
+../../../flutter/third_party/boringssl/src/crypto/pkcs7/pkcs7_test.cc
+../../../flutter/third_party/boringssl/src/crypto/pkcs8/pkcs12_test.cc
+../../../flutter/third_party/boringssl/src/crypto/pkcs8/pkcs8_test.cc
+../../../flutter/third_party/boringssl/src/crypto/pkcs8/test
+../../../flutter/third_party/boringssl/src/crypto/poly1305/poly1305_test.cc
+../../../flutter/third_party/boringssl/src/crypto/pool/pool_test.cc
+../../../flutter/third_party/boringssl/src/crypto/rand_extra/getentropy_test.cc
+../../../flutter/third_party/boringssl/src/crypto/rand_extra/rand_test.cc
+../../../flutter/third_party/boringssl/src/crypto/refcount_test.cc
+../../../flutter/third_party/boringssl/src/crypto/rsa_extra/rsa_test.cc
+../../../flutter/third_party/boringssl/src/crypto/self_test.cc
+../../../flutter/third_party/boringssl/src/crypto/siphash/siphash_test.cc
+../../../flutter/third_party/boringssl/src/crypto/stack/stack_test.cc
+../../../flutter/third_party/boringssl/src/crypto/test
+../../../flutter/third_party/boringssl/src/crypto/thread_test.cc
+../../../flutter/third_party/boringssl/src/crypto/trust_token/trust_token_test.cc
+../../../flutter/third_party/boringssl/src/crypto/x509/test
+../../../flutter/third_party/boringssl/src/crypto/x509/x509_test.cc
+../../../flutter/third_party/boringssl/src/crypto/x509/x509_time_test.cc
+../../../flutter/third_party/boringssl/src/crypto/x509v3/tab_test.cc
+../../../flutter/third_party/boringssl/src/decrepit/CMakeLists.txt
+../../../flutter/third_party/boringssl/src/decrepit/blowfish/blowfish_test.cc
+../../../flutter/third_party/boringssl/src/decrepit/cast/cast_test.cc
+../../../flutter/third_party/boringssl/src/decrepit/cfb/cfb_test.cc
+../../../flutter/third_party/boringssl/src/decrepit/evp/evp_test.cc
+../../../flutter/third_party/boringssl/src/decrepit/ripemd/ripemd_test.cc
+../../../flutter/third_party/boringssl/src/decrepit/xts/xts_test.cc
+../../../flutter/third_party/boringssl/src/fuzz
+../../../flutter/third_party/boringssl/src/pki/README.md
+../../../flutter/third_party/boringssl/src/pki/cert_issuer_source_static_unittest.cc
+../../../flutter/third_party/boringssl/src/pki/cert_issuer_source_sync_unittest.h
+../../../flutter/third_party/boringssl/src/pki/certificate_policies_unittest.cc
+../../../flutter/third_party/boringssl/src/pki/crl_unittest.cc
+../../../flutter/third_party/boringssl/src/pki/encode_values_unittest.cc
+../../../flutter/third_party/boringssl/src/pki/extended_key_usage_unittest.cc
+../../../flutter/third_party/boringssl/src/pki/general_names_unittest.cc
+../../../flutter/third_party/boringssl/src/pki/input_unittest.cc
+../../../flutter/third_party/boringssl/src/pki/ip_util_unittest.cc
+../../../flutter/third_party/boringssl/src/pki/name_constraints_unittest.cc
+../../../flutter/third_party/boringssl/src/pki/nist_pkits_unittest.cc
+../../../flutter/third_party/boringssl/src/pki/nist_pkits_unittest.h
+../../../flutter/third_party/boringssl/src/pki/ocsp_unittest.cc
+../../../flutter/third_party/boringssl/src/pki/parse_certificate_unittest.cc
+../../../flutter/third_party/boringssl/src/pki/parse_name_unittest.cc
+../../../flutter/third_party/boringssl/src/pki/parse_values_unittest.cc
+../../../flutter/third_party/boringssl/src/pki/parsed_certificate_unittest.cc
+../../../flutter/third_party/boringssl/src/pki/parser_unittest.cc
+../../../flutter/third_party/boringssl/src/pki/path_builder_pkits_unittest.cc
+../../../flutter/third_party/boringssl/src/pki/path_builder_unittest.cc
+../../../flutter/third_party/boringssl/src/pki/path_builder_verify_certificate_chain_unittest.cc
+../../../flutter/third_party/boringssl/src/pki/signature_algorithm_unittest.cc
+../../../flutter/third_party/boringssl/src/pki/simple_path_builder_delegate_unittest.cc
+../../../flutter/third_party/boringssl/src/pki/string_util_unittest.cc
+../../../flutter/third_party/boringssl/src/pki/testdata
+../../../flutter/third_party/boringssl/src/pki/trust_store_collection_unittest.cc
+../../../flutter/third_party/boringssl/src/pki/verify_certificate_chain_pkits_unittest.cc
+../../../flutter/third_party/boringssl/src/pki/verify_certificate_chain_typed_unittest.h
+../../../flutter/third_party/boringssl/src/pki/verify_certificate_chain_unittest.cc
+../../../flutter/third_party/boringssl/src/pki/verify_name_match_unittest.cc
+../../../flutter/third_party/boringssl/src/pki/verify_signed_data_unittest.cc
+../../../flutter/third_party/boringssl/src/rust
+../../../flutter/third_party/boringssl/src/sources.cmake
+../../../flutter/third_party/boringssl/src/ssl/CMakeLists.txt
+../../../flutter/third_party/boringssl/src/ssl/span_test.cc
+../../../flutter/third_party/boringssl/src/ssl/ssl_c_test.c
+../../../flutter/third_party/boringssl/src/ssl/ssl_test.cc
+../../../flutter/third_party/boringssl/src/ssl/test
+../../../flutter/third_party/boringssl/src/third_party/fiat/METADATA
+../../../flutter/third_party/boringssl/src/third_party/fiat/README.chromium
+../../../flutter/third_party/boringssl/src/third_party/fiat/README.md
+../../../flutter/third_party/boringssl/src/third_party/googletest
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/METADATA
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/aead_aes_siv_cmac_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/aegis128L_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/aegis128_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/aegis256_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/aes_cbc_pkcs5_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/aes_cbc_pkcs5_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/aes_ccm_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/aes_cmac_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/aes_cmac_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/aes_eax_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/aes_gcm_siv_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/aes_gcm_siv_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/aes_gcm_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/aes_gcm_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/aes_siv_cmac_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/chacha20_poly1305_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/chacha20_poly1305_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/dsa_2048_224_sha224_p1363_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/dsa_2048_224_sha224_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/dsa_2048_224_sha256_p1363_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/dsa_2048_224_sha256_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/dsa_2048_256_sha256_p1363_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/dsa_2048_256_sha256_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/dsa_3072_256_sha256_p1363_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/dsa_3072_256_sha256_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/dsa_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/dsa_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_brainpoolP224r1_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_brainpoolP256r1_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_brainpoolP320r1_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_brainpoolP384r1_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_brainpoolP512r1_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_secp224r1_ecpoint_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_secp224r1_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_secp224r1_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_secp256k1_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_secp256r1_ecpoint_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_secp256r1_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_secp256r1_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_secp384r1_ecpoint_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_secp384r1_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_secp384r1_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_secp521r1_ecpoint_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_secp521r1_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_secp521r1_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_webcrypto_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_brainpoolP224r1_sha224_p1363_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_brainpoolP224r1_sha224_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_brainpoolP256r1_sha256_p1363_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_brainpoolP256r1_sha256_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_brainpoolP320r1_sha384_p1363_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_brainpoolP320r1_sha384_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_brainpoolP384r1_sha384_p1363_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_brainpoolP384r1_sha384_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_brainpoolP512r1_sha512_p1363_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_brainpoolP512r1_sha512_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp224r1_sha224_p1363_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp224r1_sha224_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp224r1_sha224_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp224r1_sha256_p1363_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp224r1_sha256_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp224r1_sha256_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp224r1_sha3_224_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp224r1_sha3_256_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp224r1_sha3_512_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp224r1_sha512_p1363_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp224r1_sha512_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp224r1_sha512_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp256k1_sha256_p1363_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp256k1_sha256_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp256k1_sha3_256_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp256k1_sha3_512_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp256k1_sha512_p1363_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp256k1_sha512_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp256r1_sha256_p1363_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp256r1_sha256_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp256r1_sha256_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp256r1_sha3_256_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp256r1_sha3_512_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp256r1_sha512_p1363_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp256r1_sha512_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp256r1_sha512_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp384r1_sha384_p1363_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp384r1_sha384_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp384r1_sha384_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp384r1_sha3_384_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp384r1_sha3_512_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp384r1_sha512_p1363_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp384r1_sha512_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp384r1_sha512_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp521r1_sha3_512_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp521r1_sha512_p1363_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp521r1_sha512_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp521r1_sha512_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_webcrypto_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/ed448_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/eddsa_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/eddsa_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/gmac_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/hkdf_sha1_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/hkdf_sha1_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/hkdf_sha256_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/hkdf_sha256_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/hkdf_sha384_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/hkdf_sha384_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/hkdf_sha512_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/hkdf_sha512_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/hmac_sha1_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/hmac_sha1_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/hmac_sha224_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/hmac_sha224_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/hmac_sha256_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/hmac_sha256_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/hmac_sha384_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/hmac_sha384_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/hmac_sha3_224_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/hmac_sha3_256_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/hmac_sha3_384_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/hmac_sha3_512_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/hmac_sha512_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/hmac_sha512_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/kw_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/kw_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/kwp_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/kwp_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/primality_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/primality_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha1_mgf1sha1_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha1_mgf1sha1_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha224_mgf1sha1_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha224_mgf1sha1_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha224_mgf1sha224_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha224_mgf1sha224_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha256_mgf1sha1_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha256_mgf1sha1_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha256_mgf1sha256_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha256_mgf1sha256_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha384_mgf1sha1_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha384_mgf1sha1_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha384_mgf1sha384_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha384_mgf1sha384_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha512_mgf1sha1_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha512_mgf1sha1_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha512_mgf1sha512_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha512_mgf1sha512_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_3072_sha256_mgf1sha1_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_3072_sha256_mgf1sha1_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_3072_sha256_mgf1sha256_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_3072_sha256_mgf1sha256_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_3072_sha512_mgf1sha1_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_3072_sha512_mgf1sha1_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_3072_sha512_mgf1sha512_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_3072_sha512_mgf1sha512_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_4096_sha256_mgf1sha1_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_4096_sha256_mgf1sha1_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_4096_sha256_mgf1sha256_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_4096_sha256_mgf1sha256_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_4096_sha512_mgf1sha1_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_4096_sha512_mgf1sha1_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_4096_sha512_mgf1sha512_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_4096_sha512_mgf1sha512_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_misc_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_misc_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_pkcs1_2048_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_pkcs1_2048_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_pkcs1_3072_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_pkcs1_3072_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_pkcs1_4096_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_pkcs1_4096_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_pss_2048_sha1_mgf1_20_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_pss_2048_sha1_mgf1_20_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_pss_2048_sha256_mgf1_0_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_pss_2048_sha256_mgf1_0_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_pss_2048_sha256_mgf1_32_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_pss_2048_sha256_mgf1_32_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_pss_2048_sha512_256_mgf1_28_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_pss_2048_sha512_256_mgf1_32_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_pss_3072_sha256_mgf1_32_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_pss_3072_sha256_mgf1_32_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_pss_4096_sha256_mgf1_32_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_pss_4096_sha256_mgf1_32_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_pss_4096_sha512_mgf1_32_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_pss_4096_sha512_mgf1_32_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_pss_misc_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_pss_misc_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_sig_gen_misc_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_sig_gen_misc_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_2048_sha224_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_2048_sha224_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_2048_sha256_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_2048_sha256_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_2048_sha384_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_2048_sha384_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_2048_sha3_224_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_2048_sha3_256_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_2048_sha3_384_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_2048_sha3_512_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_2048_sha512_224_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_2048_sha512_256_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_2048_sha512_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_2048_sha512_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_3072_sha256_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_3072_sha256_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_3072_sha384_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_3072_sha384_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_3072_sha3_256_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_3072_sha3_384_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_3072_sha3_512_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_3072_sha512_256_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_3072_sha512_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_3072_sha512_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_4096_sha384_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_4096_sha384_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_4096_sha512_256_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_4096_sha512_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_4096_sha512_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/vmac_128_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/vmac_64_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/x25519_asn_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/x25519_jwk_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/x25519_pem_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/x25519_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/x25519_test.txt
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/x448_asn_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/x448_jwk_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/x448_pem_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/x448_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/xchacha20_poly1305_test.json
+../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/xchacha20_poly1305_test.txt
+../../../flutter/third_party/boringssl/src/util
+../../../flutter/third_party/boringssl/win-aarch64/crypto/test
+../../../flutter/third_party/boringssl/win-x86/crypto/test
+../../../flutter/third_party/boringssl/win-x86_64/crypto/test
+../../../flutter/third_party/depot_tools
+../../../flutter/third_party/expat/.git
+../../../flutter/third_party/expat/.github
+../../../flutter/third_party/expat/.gitignore
+../../../flutter/third_party/expat/.mailmap
+../../../flutter/third_party/expat/Brewfile
+../../../flutter/third_party/expat/README.md
+../../../flutter/third_party/expat/appveyor.yml
+../../../flutter/third_party/expat/expat/.clang-format
+../../../flutter/third_party/expat/expat/.gitignore
+../../../flutter/third_party/expat/expat/AUTHORS
+../../../flutter/third_party/expat/expat/CMake.README
+../../../flutter/third_party/expat/expat/CMakeLists.txt
+../../../flutter/third_party/expat/expat/Changes
+../../../flutter/third_party/expat/expat/ConfigureChecks.cmake
+../../../flutter/third_party/expat/expat/README.md
+../../../flutter/third_party/expat/expat/acinclude.m4
+../../../flutter/third_party/expat/expat/cmake
+../../../flutter/third_party/expat/expat/configure-ac-style.md
+../../../flutter/third_party/expat/expat/conftools/.gitignore
+../../../flutter/third_party/expat/expat/conftools/ax-append-compile-flags.m4
+../../../flutter/third_party/expat/expat/conftools/ax-append-flag.m4
+../../../flutter/third_party/expat/expat/conftools/ax-append-link-flags.m4
+../../../flutter/third_party/expat/expat/conftools/ax-check-compile-flag.m4
+../../../flutter/third_party/expat/expat/conftools/ax-check-link-flag.m4
+../../../flutter/third_party/expat/expat/conftools/ax-require-defined.m4
+../../../flutter/third_party/expat/expat/conftools/expat.m4
+../../../flutter/third_party/expat/expat/conftools/expatcfg-compiler-supports-visibility.m4
+../../../flutter/third_party/expat/expat/doc
+../../../flutter/third_party/expat/expat/examples
+../../../flutter/third_party/expat/expat/expat.pc.cmake
+../../../flutter/third_party/expat/expat/expat_config.h.cmake
+../../../flutter/third_party/expat/expat/fuzz/.gitignore
+../../../flutter/third_party/expat/expat/gennmtab/.gitignore
+../../../flutter/third_party/expat/expat/lib/.gitignore
+../../../flutter/third_party/expat/expat/lib/libexpat.def.cmake
+../../../flutter/third_party/expat/expat/memory-sanitizer-blacklist.txt
+../../../flutter/third_party/expat/expat/tests
+../../../flutter/third_party/expat/expat/win32/.gitignore
+../../../flutter/third_party/expat/expat/win32/MANIFEST.txt
+../../../flutter/third_party/expat/expat/win32/README.txt
+../../../flutter/third_party/expat/expat/win32/expat.iss
+../../../flutter/third_party/expat/expat/xmlwf/.gitignore
+../../../flutter/third_party/expat/expat/xmlwf/xmlwf_helpgen.py
+../../../flutter/third_party/expat/testdata
+../../../flutter/third_party/flatbuffers/.bazelci
+../../../flutter/third_party/flatbuffers/.clang-format
+../../../flutter/third_party/flatbuffers/.editorconfig
+../../../flutter/third_party/flatbuffers/.eslintrc.js
+../../../flutter/third_party/flatbuffers/.git
+../../../flutter/third_party/flatbuffers/.gitattributes
+../../../flutter/third_party/flatbuffers/.github
+../../../flutter/third_party/flatbuffers/.gitignore
+../../../flutter/third_party/flatbuffers/.travis.yml
+../../../flutter/third_party/flatbuffers/.travis/check-sources.sh.py
+../../../flutter/third_party/flatbuffers/BUILD.bazel
+../../../flutter/third_party/flatbuffers/CMake
+../../../flutter/third_party/flatbuffers/CMakeLists.txt
+../../../flutter/third_party/flatbuffers/CONTRIBUTING.md
+../../../flutter/third_party/flatbuffers/Formatters.md
+../../../flutter/third_party/flatbuffers/SECURITY.md
+../../../flutter/third_party/flatbuffers/WORKSPACE
+../../../flutter/third_party/flatbuffers/android
+../../../flutter/third_party/flatbuffers/benchmarks
+../../../flutter/third_party/flatbuffers/build_defs.bzl
+../../../flutter/third_party/flatbuffers/conan/CMakeLists.txt
+../../../flutter/third_party/flatbuffers/conan/appveyor/build.py
+../../../flutter/third_party/flatbuffers/conan/appveyor/install.py
+../../../flutter/third_party/flatbuffers/conan/build.py
+../../../flutter/third_party/flatbuffers/conan/test_package/CMakeLists.txt
+../../../flutter/third_party/flatbuffers/conan/test_package/conanfile.py
+../../../flutter/third_party/flatbuffers/conanfile.py
+../../../flutter/third_party/flatbuffers/dart/CHANGELOG.md
+../../../flutter/third_party/flatbuffers/dart/README.md
+../../../flutter/third_party/flatbuffers/dart/analysis_options.yaml
+../../../flutter/third_party/flatbuffers/dart/example
+../../../flutter/third_party/flatbuffers/dart/pubspec.yaml
+../../../flutter/third_party/flatbuffers/dart/test
+../../../flutter/third_party/flatbuffers/docs
+../../../flutter/third_party/flatbuffers/go
+../../../flutter/third_party/flatbuffers/grpc/README.md
+../../../flutter/third_party/flatbuffers/grpc/examples
+../../../flutter/third_party/flatbuffers/grpc/flatbuffers-java-grpc/pom.xml
+../../../flutter/third_party/flatbuffers/grpc/pom.xml
+../../../flutter/third_party/flatbuffers/grpc/samples
+../../../flutter/third_party/flatbuffers/grpc/src/compiler/BUILD.bazel
+../../../flutter/third_party/flatbuffers/grpc/tests
+../../../flutter/third_party/flatbuffers/js/README.md
+../../../flutter/third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/jvmTest
+../../../flutter/third_party/flatbuffers/kotlin/gradle.properties
+../../../flutter/third_party/flatbuffers/mjs/README.md
+../../../flutter/third_party/flatbuffers/net
+../../../flutter/third_party/flatbuffers/package.json
+../../../flutter/third_party/flatbuffers/php
+../../../flutter/third_party/flatbuffers/pom.xml
+../../../flutter/third_party/flatbuffers/python
+../../../flutter/third_party/flatbuffers/readme.md
+../../../flutter/third_party/flatbuffers/reflection/BUILD.bazel
+../../../flutter/third_party/flatbuffers/rust
+../../../flutter/third_party/flatbuffers/samples
+../../../flutter/third_party/flatbuffers/scripts/check_generate_code.py
+../../../flutter/third_party/flatbuffers/scripts/generate_code.py
+../../../flutter/third_party/flatbuffers/snap/snapcraft.yaml
+../../../flutter/third_party/flatbuffers/src/BUILD.bazel
+../../../flutter/third_party/flatbuffers/swift.swiftformat
+../../../flutter/third_party/flatbuffers/swift/BUILD.bazel
+../../../flutter/third_party/flatbuffers/swift/README.md
+../../../flutter/third_party/flatbuffers/tests
+../../../flutter/third_party/flatbuffers/ts
+../../../flutter/third_party/flatbuffers/typescript.bzl
+../../../flutter/third_party/freetype2/.clang-format
+../../../flutter/third_party/freetype2/.git
+../../../flutter/third_party/freetype2/.gitignore
+../../../flutter/third_party/freetype2/.gitlab-ci.yml
+../../../flutter/third_party/freetype2/.gitmodules
+../../../flutter/third_party/freetype2/.mailmap
+../../../flutter/third_party/freetype2/CMakeLists.txt
+../../../flutter/third_party/freetype2/Makefile
+../../../flutter/third_party/freetype2/README
+../../../flutter/third_party/freetype2/README.git
+../../../flutter/third_party/freetype2/builds
+../../../flutter/third_party/freetype2/docs/.gitignore
+../../../flutter/third_party/freetype2/docs/CHANGES
+../../../flutter/third_party/freetype2/docs/CMAKE
+../../../flutter/third_party/freetype2/docs/CUSTOMIZE
+../../../flutter/third_party/freetype2/docs/DEBUG
+../../../flutter/third_party/freetype2/docs/DOCGUIDE
+../../../flutter/third_party/freetype2/docs/GPLv2.TXT
+../../../flutter/third_party/freetype2/docs/INSTALL
+../../../flutter/third_party/freetype2/docs/INSTALL.ANY
+../../../flutter/third_party/freetype2/docs/INSTALL.CROSS
+../../../flutter/third_party/freetype2/docs/INSTALL.GNU
+../../../flutter/third_party/freetype2/docs/INSTALL.MAC
+../../../flutter/third_party/freetype2/docs/INSTALL.UNIX
+../../../flutter/third_party/freetype2/docs/INSTALL.VMS
+../../../flutter/third_party/freetype2/docs/MAKEPP
+../../../flutter/third_party/freetype2/docs/PROBLEMS
+../../../flutter/third_party/freetype2/docs/README
+../../../flutter/third_party/freetype2/docs/TODO
+../../../flutter/third_party/freetype2/docs/VERSIONS.TXT
+../../../flutter/third_party/freetype2/docs/formats.txt
+../../../flutter/third_party/freetype2/docs/freetype-config.1
+../../../flutter/third_party/freetype2/docs/markdown
+../../../flutter/third_party/freetype2/docs/oldlogs
+../../../flutter/third_party/freetype2/docs/raster.txt
+../../../flutter/third_party/freetype2/docs/release
+../../../flutter/third_party/freetype2/meson.build
+../../../flutter/third_party/freetype2/objs/.gitignore
+../../../flutter/third_party/freetype2/objs/README
+../../../flutter/third_party/freetype2/src/autofit/module.mk
+../../../flutter/third_party/freetype2/src/autofit/rules.mk
+../../../flutter/third_party/freetype2/src/base/rules.mk
+../../../flutter/third_party/freetype2/src/bdf/README
+../../../flutter/third_party/freetype2/src/bdf/module.mk
+../../../flutter/third_party/freetype2/src/bdf/rules.mk
+../../../flutter/third_party/freetype2/src/bzip2/rules.mk
+../../../flutter/third_party/freetype2/src/cache/rules.mk
+../../../flutter/third_party/freetype2/src/cff/module.mk
+../../../flutter/third_party/freetype2/src/cff/rules.mk
+../../../flutter/third_party/freetype2/src/cid/module.mk
+../../../flutter/third_party/freetype2/src/cid/rules.mk
+../../../flutter/third_party/freetype2/src/dlg/rules.mk
+../../../flutter/third_party/freetype2/src/gxvalid/README
+../../../flutter/third_party/freetype2/src/gxvalid/module.mk
+../../../flutter/third_party/freetype2/src/gxvalid/rules.mk
+../../../flutter/third_party/freetype2/src/gzip/README.freetype
+../../../flutter/third_party/freetype2/src/gzip/rules.mk
+../../../flutter/third_party/freetype2/src/lzw/rules.mk
+../../../flutter/third_party/freetype2/src/otvalid/module.mk
+../../../flutter/third_party/freetype2/src/otvalid/rules.mk
+../../../flutter/third_party/freetype2/src/pcf/README
+../../../flutter/third_party/freetype2/src/pcf/module.mk
+../../../flutter/third_party/freetype2/src/pcf/rules.mk
+../../../flutter/third_party/freetype2/src/pfr/module.mk
+../../../flutter/third_party/freetype2/src/pfr/rules.mk
+../../../flutter/third_party/freetype2/src/psaux/module.mk
+../../../flutter/third_party/freetype2/src/psaux/rules.mk
+../../../flutter/third_party/freetype2/src/pshinter/module.mk
+../../../flutter/third_party/freetype2/src/pshinter/rules.mk
+../../../flutter/third_party/freetype2/src/psnames/module.mk
+../../../flutter/third_party/freetype2/src/psnames/rules.mk
+../../../flutter/third_party/freetype2/src/raster/module.mk
+../../../flutter/third_party/freetype2/src/raster/rules.mk
+../../../flutter/third_party/freetype2/src/sdf/module.mk
+../../../flutter/third_party/freetype2/src/sdf/rules.mk
+../../../flutter/third_party/freetype2/src/sfnt/module.mk
+../../../flutter/third_party/freetype2/src/sfnt/rules.mk
+../../../flutter/third_party/freetype2/src/smooth/module.mk
+../../../flutter/third_party/freetype2/src/smooth/rules.mk
+../../../flutter/third_party/freetype2/src/svg/module.mk
+../../../flutter/third_party/freetype2/src/svg/rules.mk
+../../../flutter/third_party/freetype2/src/tools
+../../../flutter/third_party/freetype2/src/truetype/module.mk
+../../../flutter/third_party/freetype2/src/truetype/rules.mk
+../../../flutter/third_party/freetype2/src/type1/module.mk
+../../../flutter/third_party/freetype2/src/type1/rules.mk
+../../../flutter/third_party/freetype2/src/type42/module.mk
+../../../flutter/third_party/freetype2/src/type42/rules.mk
+../../../flutter/third_party/freetype2/src/winfonts/module.mk
+../../../flutter/third_party/freetype2/src/winfonts/rules.mk
+../../../flutter/third_party/freetype2/tests
+../../../flutter/third_party/freetype2/vms_make.com
+../../../flutter/third_party/glfw/.appveyor.yml
+../../../flutter/third_party/glfw/.git
+../../../flutter/third_party/glfw/.gitattributes
+../../../flutter/third_party/glfw/.github
+../../../flutter/third_party/glfw/.gitignore
+../../../flutter/third_party/glfw/.mailmap
+../../../flutter/third_party/glfw/CMake
+../../../flutter/third_party/glfw/CMakeLists.txt
+../../../flutter/third_party/glfw/CONTRIBUTORS.md
+../../../flutter/third_party/glfw/README.md
+../../../flutter/third_party/glfw/deps
+../../../flutter/third_party/glfw/docs
+../../../flutter/third_party/glfw/examples
+../../../flutter/third_party/glfw/src/CMakeLists.txt
+../../../flutter/third_party/glfw/tests
+../../../flutter/third_party/gn
+../../../flutter/third_party/google_fonts_for_unit_tests
+../../../flutter/third_party/googletest
+../../../flutter/third_party/gtest-parallel/.git
+../../../flutter/third_party/gtest-parallel/.gitignore
+../../../flutter/third_party/gtest-parallel/CONTRIBUTING.md
+../../../flutter/third_party/gtest-parallel/README.md
+../../../flutter/third_party/gtest-parallel/gtest_parallel.py
+../../../flutter/third_party/gtest-parallel/gtest_parallel_mocks.py
+../../../flutter/third_party/gtest-parallel/gtest_parallel_tests.py
+../../../flutter/third_party/harfbuzz/.ci/requirements.txt
+../../../flutter/third_party/harfbuzz/.clang-format
+../../../flutter/third_party/harfbuzz/.editorconfig
+../../../flutter/third_party/harfbuzz/.git
+../../../flutter/third_party/harfbuzz/.github
+../../../flutter/third_party/harfbuzz/AUTHORS
+../../../flutter/third_party/harfbuzz/BUILD.md
+../../../flutter/third_party/harfbuzz/CMakeLists.txt
+../../../flutter/third_party/harfbuzz/CONFIG.md
+../../../flutter/third_party/harfbuzz/NEWS
+../../../flutter/third_party/harfbuzz/README
+../../../flutter/third_party/harfbuzz/README.md
+../../../flutter/third_party/harfbuzz/README.mingw.md
+../../../flutter/third_party/harfbuzz/README.python.md
+../../../flutter/third_party/harfbuzz/RELEASING.md
+../../../flutter/third_party/harfbuzz/SECURITY.md
+../../../flutter/third_party/harfbuzz/TESTING.md
+../../../flutter/third_party/harfbuzz/THANKS
+../../../flutter/third_party/harfbuzz/docs
+../../../flutter/third_party/harfbuzz/git.mk
+../../../flutter/third_party/harfbuzz/m4/ax_check_link_flag.m4
+../../../flutter/third_party/harfbuzz/m4/ax_code_coverage.m4
+../../../flutter/third_party/harfbuzz/m4/ax_cxx_compile_stdcxx.m4
+../../../flutter/third_party/harfbuzz/m4/ax_pthread.m4
+../../../flutter/third_party/harfbuzz/meson.build
+../../../flutter/third_party/harfbuzz/perf/README.md
+../../../flutter/third_party/harfbuzz/perf/meson.build
+../../../flutter/third_party/harfbuzz/replace-enum-strings.cmake
+../../../flutter/third_party/harfbuzz/src/Makefile.sources
+../../../flutter/third_party/harfbuzz/src/addTable.py
+../../../flutter/third_party/harfbuzz/src/check-c-linkage-decls.py
+../../../flutter/third_party/harfbuzz/src/check-externs.py
+../../../flutter/third_party/harfbuzz/src/check-header-guards.py
+../../../flutter/third_party/harfbuzz/src/check-includes.py
+../../../flutter/third_party/harfbuzz/src/check-libstdc++.py
+../../../flutter/third_party/harfbuzz/src/check-static-inits.py
+../../../flutter/third_party/harfbuzz/src/check-symbols.py
+../../../flutter/third_party/harfbuzz/src/fix_get_types.py
+../../../flutter/third_party/harfbuzz/src/gen-arabic-joining-list.py
+../../../flutter/third_party/harfbuzz/src/gen-arabic-pua.py
+../../../flutter/third_party/harfbuzz/src/gen-arabic-table.py
+../../../flutter/third_party/harfbuzz/src/gen-def.py
+../../../flutter/third_party/harfbuzz/src/gen-emoji-table.py
+../../../flutter/third_party/harfbuzz/src/gen-harfbuzzcc.py
+../../../flutter/third_party/harfbuzz/src/gen-hb-version.py
+../../../flutter/third_party/harfbuzz/src/gen-indic-table.py
+../../../flutter/third_party/harfbuzz/src/gen-os2-unicode-ranges.py
+../../../flutter/third_party/harfbuzz/src/gen-ragel-artifacts.py
+../../../flutter/third_party/harfbuzz/src/gen-tag-table.py
+../../../flutter/third_party/harfbuzz/src/gen-ucd-table.py
+../../../flutter/third_party/harfbuzz/src/gen-use-table.py
+../../../flutter/third_party/harfbuzz/src/gen-vowel-constraints.py
+../../../flutter/third_party/harfbuzz/src/justify.py
+../../../flutter/third_party/harfbuzz/src/meson.build
+../../../flutter/third_party/harfbuzz/src/relative_to.py
+../../../flutter/third_party/harfbuzz/src/sample.py
+../../../flutter/third_party/harfbuzz/src/wasm/graphite/Makefile
+../../../flutter/third_party/harfbuzz/src/wasm/sample/c/Makefile
+../../../flutter/third_party/harfbuzz/subprojects/.gitignore
+../../../flutter/third_party/harfbuzz/subprojects/packagefiles/ragel/meson.build
+../../../flutter/third_party/harfbuzz/test
+../../../flutter/third_party/harfbuzz/util
+../../../flutter/third_party/icu/.git
+../../../flutter/third_party/icu/DIR_METADATA
+../../../flutter/third_party/icu/OWNERS
+../../../flutter/third_party/icu/README.chromium
+../../../flutter/third_party/icu/README.fuchsia
+../../../flutter/third_party/icu/codereview.settings
+../../../flutter/third_party/icu/filters
+../../../flutter/third_party/icu/flutter/README.md
+../../../flutter/third_party/icu/fuzzers
+../../../flutter/third_party/icu/icu4c.css
+../../../flutter/third_party/icu/license.html
+../../../flutter/third_party/icu/readme.html
+../../../flutter/third_party/icu/scripts
+../../../flutter/third_party/icu/source/.clang-format
+../../../flutter/third_party/icu/source/Makefile.in
+../../../flutter/third_party/icu/source/acinclude.m4
+../../../flutter/third_party/icu/source/aclocal.m4
+../../../flutter/third_party/icu/source/common/BUILD.bazel
+../../../flutter/third_party/icu/source/common/Makefile.in
+../../../flutter/third_party/icu/source/common/rbbicst.pl
+../../../flutter/third_party/icu/source/common/sources.txt
+../../../flutter/third_party/icu/source/common/unicode/uvernum.h
+../../../flutter/third_party/icu/source/config
+../../../flutter/third_party/icu/source/data/BUILDRULES.py
+../../../flutter/third_party/icu/source/data/Makefile.in
+../../../flutter/third_party/icu/source/data/brkitr/LOCALE_DEPS.json
+../../../flutter/third_party/icu/source/data/brkitr/dictionaries/burmesedict.txt
+../../../flutter/third_party/icu/source/data/brkitr/dictionaries/cjdict.txt
+../../../flutter/third_party/icu/source/data/brkitr/dictionaries/laodict.txt
+../../../flutter/third_party/icu/source/data/brkitr/rules/README.md
+../../../flutter/third_party/icu/source/data/build.xml
+../../../flutter/third_party/icu/source/data/coll/LOCALE_DEPS.json
+../../../flutter/third_party/icu/source/data/curr/LOCALE_DEPS.json
+../../../flutter/third_party/icu/source/data/dtd
+../../../flutter/third_party/icu/source/data/lang/LOCALE_DEPS.json
+../../../flutter/third_party/icu/source/data/locales/LOCALE_DEPS.json
+../../../flutter/third_party/icu/source/data/mappings/ucmcore.mk
+../../../flutter/third_party/icu/source/data/mappings/ucmebcdic.mk
+../../../flutter/third_party/icu/source/data/mappings/ucmfiles.mk
+../../../flutter/third_party/icu/source/data/pkgdataMakefile.in
+../../../flutter/third_party/icu/source/data/rbnf/LOCALE_DEPS.json
+../../../flutter/third_party/icu/source/data/region/LOCALE_DEPS.json
+../../../flutter/third_party/icu/source/data/sprep/sprepfiles.mk
+../../../flutter/third_party/icu/source/data/unidata/norm2/BUILD.bazel
+../../../flutter/third_party/icu/source/data/unit/LOCALE_DEPS.json
+../../../flutter/third_party/icu/source/data/zone/LOCALE_DEPS.json
+../../../flutter/third_party/icu/source/extra/Makefile.in
+../../../flutter/third_party/icu/source/extra/scrptrun/Makefile.in
+../../../flutter/third_party/icu/source/extra/scrptrun/readme.html
+../../../flutter/third_party/icu/source/extra/scrptrun/sources.txt
+../../../flutter/third_party/icu/source/extra/uconv/Makefile.in
+../../../flutter/third_party/icu/source/extra/uconv/README
+../../../flutter/third_party/icu/source/extra/uconv/pkgdataMakefile.in
+../../../flutter/third_party/icu/source/extra/uconv/resfiles.mk
+../../../flutter/third_party/icu/source/extra/uconv/samples
+../../../flutter/third_party/icu/source/extra/uconv/sources.txt
+../../../flutter/third_party/icu/source/extra/uconv/uconv.1.in
+../../../flutter/third_party/icu/source/i18n/BUILD.bazel
+../../../flutter/third_party/icu/source/i18n/Makefile.in
+../../../flutter/third_party/icu/source/i18n/sources.txt
+../../../flutter/third_party/icu/source/io/Makefile.in
+../../../flutter/third_party/icu/source/io/sources.txt
+../../../flutter/third_party/icu/source/python/icutools/__init__.py
+../../../flutter/third_party/icu/source/python/icutools/databuilder/__init__.py
+../../../flutter/third_party/icu/source/python/icutools/databuilder/__main__.py
+../../../flutter/third_party/icu/source/python/icutools/databuilder/comment_stripper.py
+../../../flutter/third_party/icu/source/python/icutools/databuilder/filtration.py
+../../../flutter/third_party/icu/source/python/icutools/databuilder/renderers/__init__.py
+../../../flutter/third_party/icu/source/python/icutools/databuilder/renderers/common_exec.py
+../../../flutter/third_party/icu/source/python/icutools/databuilder/renderers/makefile.py
+../../../flutter/third_party/icu/source/python/icutools/databuilder/request_types.py
+../../../flutter/third_party/icu/source/python/icutools/databuilder/test
+../../../flutter/third_party/icu/source/python/icutools/databuilder/utils.py
+../../../flutter/third_party/icu/source/samples
+../../../flutter/third_party/icu/source/stubdata/BUILD.bazel
+../../../flutter/third_party/icu/source/stubdata/Makefile.in
+../../../flutter/third_party/icu/source/stubdata/sources.txt
+../../../flutter/third_party/icu/source/test
+../../../flutter/third_party/icu/source/tools/Makefile.in
+../../../flutter/third_party/icu/source/tools/ctestfw/Makefile.in
+../../../flutter/third_party/icu/source/tools/ctestfw/sources.txt
+../../../flutter/third_party/icu/source/tools/escapesrc/Makefile.in
+../../../flutter/third_party/icu/source/tools/genbrk/Makefile.in
+../../../flutter/third_party/icu/source/tools/genbrk/genbrk.1.in
+../../../flutter/third_party/icu/source/tools/genbrk/sources.txt
+../../../flutter/third_party/icu/source/tools/genccode/Makefile.in
+../../../flutter/third_party/icu/source/tools/genccode/genccode.8.in
+../../../flutter/third_party/icu/source/tools/genccode/sources.txt
+../../../flutter/third_party/icu/source/tools/gencfu/Makefile.in
+../../../flutter/third_party/icu/source/tools/gencfu/gencfu.1.in
+../../../flutter/third_party/icu/source/tools/gencfu/sources.txt
+../../../flutter/third_party/icu/source/tools/gencmn/Makefile.in
+../../../flutter/third_party/icu/source/tools/gencmn/gencmn.8.in
+../../../flutter/third_party/icu/source/tools/gencmn/sources.txt
+../../../flutter/third_party/icu/source/tools/gencnval/Makefile.in
+../../../flutter/third_party/icu/source/tools/gencnval/gencnval.1.in
+../../../flutter/third_party/icu/source/tools/gencnval/sources.txt
+../../../flutter/third_party/icu/source/tools/gencolusb/Makefile
+../../../flutter/third_party/icu/source/tools/gencolusb/README.md
+../../../flutter/third_party/icu/source/tools/gendict/Makefile.in
+../../../flutter/third_party/icu/source/tools/gendict/gendict.1.in
+../../../flutter/third_party/icu/source/tools/gendict/sources.txt
+../../../flutter/third_party/icu/source/tools/gennorm2/BUILD.bazel
+../../../flutter/third_party/icu/source/tools/gennorm2/Makefile.in
+../../../flutter/third_party/icu/source/tools/gennorm2/sources.txt
+../../../flutter/third_party/icu/source/tools/genrb/Makefile.in
+../../../flutter/third_party/icu/source/tools/genrb/derb.1.in
+../../../flutter/third_party/icu/source/tools/genrb/genrb.1.in
+../../../flutter/third_party/icu/source/tools/genrb/sources.txt
+../../../flutter/third_party/icu/source/tools/genren/Makefile
+../../../flutter/third_party/icu/source/tools/genren/README
+../../../flutter/third_party/icu/source/tools/gensprep/Makefile.in
+../../../flutter/third_party/icu/source/tools/gensprep/gensprep.8.in
+../../../flutter/third_party/icu/source/tools/gensprep/sources.txt
+../../../flutter/third_party/icu/source/tools/gentest/Makefile.in
+../../../flutter/third_party/icu/source/tools/gentest/sources.txt
+../../../flutter/third_party/icu/source/tools/icuexportdata/Makefile.in
+../../../flutter/third_party/icu/source/tools/icuexportdata/icuexportdata.1.in
+../../../flutter/third_party/icu/source/tools/icuexportdata/sources.txt
+../../../flutter/third_party/icu/source/tools/icuinfo/Makefile.in
+../../../flutter/third_party/icu/source/tools/icuinfo/sources.txt
+../../../flutter/third_party/icu/source/tools/icupkg/Makefile.in
+../../../flutter/third_party/icu/source/tools/icupkg/icupkg.8.in
+../../../flutter/third_party/icu/source/tools/icupkg/sources.txt
+../../../flutter/third_party/icu/source/tools/icuswap/Makefile.in
+../../../flutter/third_party/icu/source/tools/icuswap/sources.txt
+../../../flutter/third_party/icu/source/tools/makeconv/Makefile.in
+../../../flutter/third_party/icu/source/tools/makeconv/makeconv.1.in
+../../../flutter/third_party/icu/source/tools/makeconv/sources.txt
+../../../flutter/third_party/icu/source/tools/memcheck/ICUMemCheck.pl
+../../../flutter/third_party/icu/source/tools/pkgdata/Makefile.in
+../../../flutter/third_party/icu/source/tools/pkgdata/pkgdata.1.in
+../../../flutter/third_party/icu/source/tools/pkgdata/sources.txt
+../../../flutter/third_party/icu/source/tools/toolutil/BUILD.bazel
+../../../flutter/third_party/icu/source/tools/toolutil/Makefile.in
+../../../flutter/third_party/icu/source/tools/toolutil/sources.txt
+../../../flutter/third_party/icu/source/tools/tzcode/Makefile.in
+../../../flutter/third_party/icu/source/tools/tzcode/readme.txt
+../../../flutter/third_party/imgui
+../../../flutter/third_party/inja/.clang-format
+../../../flutter/third_party/inja/.git
+../../../flutter/third_party/inja/.github
+../../../flutter/third_party/inja/.gitignore
+../../../flutter/third_party/inja/CMakeLists.txt
+../../../flutter/third_party/inja/README.md
+../../../flutter/third_party/inja/cmake
+../../../flutter/third_party/inja/doc
+../../../flutter/third_party/inja/meson.build
+../../../flutter/third_party/inja/requirements.txt
+../../../flutter/third_party/inja/scripts/amalgamate_config.json
+../../../flutter/third_party/inja/test
+../../../flutter/third_party/inja/third_party/amalgamate
+../../../flutter/third_party/inja/third_party/include/doctest
+../../../flutter/third_party/json/.clang-format
+../../../flutter/third_party/json/.clang-tidy
+../../../flutter/third_party/json/.git
+../../../flutter/third_party/json/.github
+../../../flutter/third_party/json/.gitignore
+../../../flutter/third_party/json/.lgtm.yml
+../../../flutter/third_party/json/.reuse
+../../../flutter/third_party/json/BUILD.bazel
+../../../flutter/third_party/json/CITATION.cff
+../../../flutter/third_party/json/CMakeLists.txt
+../../../flutter/third_party/json/ChangeLog.md
+../../../flutter/third_party/json/Makefile
+../../../flutter/third_party/json/README.md
+../../../flutter/third_party/json/WORKSPACE.bazel
+../../../flutter/third_party/json/cmake
+../../../flutter/third_party/json/docs
+../../../flutter/third_party/json/meson.build
+../../../flutter/third_party/json/tests
+../../../flutter/third_party/json/tools/amalgamate/CHANGES.md
+../../../flutter/third_party/json/tools/amalgamate/README.md
+../../../flutter/third_party/json/tools/amalgamate/amalgamate.py
+../../../flutter/third_party/json/tools/gdb_pretty_printer/README.md
+../../../flutter/third_party/json/tools/gdb_pretty_printer/nlohmann-json.py
+../../../flutter/third_party/json/tools/generate_natvis/README.md
+../../../flutter/third_party/json/tools/generate_natvis/generate_natvis.py
+../../../flutter/third_party/json/tools/serve_header/README.md
+../../../flutter/third_party/json/tools/serve_header/requirements.txt
+../../../flutter/third_party/json/tools/serve_header/serve_header.py
+../../../flutter/third_party/libjpeg-turbo/src/.git
+../../../flutter/third_party/libjpeg-turbo/src/.gitignore
+../../../flutter/third_party/libjpeg-turbo/src/BUILDING.md
+../../../flutter/third_party/libjpeg-turbo/src/CMakeLists.txt
+../../../flutter/third_party/libjpeg-turbo/src/ChangeLog.md
+../../../flutter/third_party/libjpeg-turbo/src/README.fuchsia
+../../../flutter/third_party/libjpeg-turbo/src/README.md
+../../../flutter/third_party/libjpeg-turbo/src/acinclude.m4
+../../../flutter/third_party/libjpeg-turbo/src/change.log
+../../../flutter/third_party/libjpeg-turbo/src/cjpeg.1
+../../../flutter/third_party/libjpeg-turbo/src/coderules.txt
+../../../flutter/third_party/libjpeg-turbo/src/djpeg.1
+../../../flutter/third_party/libjpeg-turbo/src/doxygen-extra.css
+../../../flutter/third_party/libjpeg-turbo/src/doxygen.config
+../../../flutter/third_party/libjpeg-turbo/src/jpegtran.1
+../../../flutter/third_party/libjpeg-turbo/src/rdjpgcom.1
+../../../flutter/third_party/libjpeg-turbo/src/simd/CMakeLists.txt
+../../../flutter/third_party/libjpeg-turbo/src/structure.txt
+../../../flutter/third_party/libjpeg-turbo/src/wrjpgcom.1
+../../../flutter/third_party/libpng/.git
+../../../flutter/third_party/libpng/.travis.yml
+../../../flutter/third_party/libpng/ANNOUNCE
+../../../flutter/third_party/libpng/AUTHORS
+../../../flutter/third_party/libpng/CHANGES
+../../../flutter/third_party/libpng/CMakeLists.txt
+../../../flutter/third_party/libpng/INSTALL
+../../../flutter/third_party/libpng/Makefile.in
+../../../flutter/third_party/libpng/README
+../../../flutter/third_party/libpng/TODO
+../../../flutter/third_party/libpng/TRADEMARK
+../../../flutter/third_party/libpng/aclocal.m4
+../../../flutter/third_party/libpng/contrib
+../../../flutter/third_party/libpng/libpng-manual.txt
+../../../flutter/third_party/libpng/libpng.3
+../../../flutter/third_party/libpng/libpngpf.3
+../../../flutter/third_party/libpng/mips
+../../../flutter/third_party/libpng/png.5
+../../../flutter/third_party/libpng/powerpc
+../../../flutter/third_party/libpng/projects
+../../../flutter/third_party/libpng/scripts
+../../../flutter/third_party/libpng/tests
+../../../flutter/third_party/libtess2/.git
+../../../flutter/third_party/libtess2/.gitignore
+../../../flutter/third_party/libtess2/Contrib/nanosvg.c
+../../../flutter/third_party/libtess2/Contrib/nanosvg.h
+../../../flutter/third_party/libtess2/Example
+../../../flutter/third_party/libtess2/README.md
+../../../flutter/third_party/libtess2/alg_outline.md
+../../../flutter/third_party/libwebp/.cmake-format.py
+../../../flutter/third_party/libwebp/.git
+../../../flutter/third_party/libwebp/.gitattributes
+../../../flutter/third_party/libwebp/.gitignore
+../../../flutter/third_party/libwebp/.mailmap
+../../../flutter/third_party/libwebp/.style.yapf
+../../../flutter/third_party/libwebp/AUTHORS
+../../../flutter/third_party/libwebp/Android.mk
+../../../flutter/third_party/libwebp/CMakeLists.txt
+../../../flutter/third_party/libwebp/CONTRIBUTING.md
+../../../flutter/third_party/libwebp/ChangeLog
+../../../flutter/third_party/libwebp/Makefile.vc
+../../../flutter/third_party/libwebp/NEWS
+../../../flutter/third_party/libwebp/PATENTS
+../../../flutter/third_party/libwebp/PRESUBMIT.py
+../../../flutter/third_party/libwebp/README.md
+../../../flutter/third_party/libwebp/build.gradle
+../../../flutter/third_party/libwebp/cmake
+../../../flutter/third_party/libwebp/codereview.settings
+../../../flutter/third_party/libwebp/doc
+../../../flutter/third_party/libwebp/examples
+../../../flutter/third_party/libwebp/gradle
+../../../flutter/third_party/libwebp/gradle.properties
+../../../flutter/third_party/libwebp/imageio/Android.mk
+../../../flutter/third_party/libwebp/m4/.gitignore
+../../../flutter/third_party/libwebp/m4/ax_pthread.m4
+../../../flutter/third_party/libwebp/makefile.unix
+../../../flutter/third_party/libwebp/man/cwebp.1
+../../../flutter/third_party/libwebp/man/dwebp.1
+../../../flutter/third_party/libwebp/man/gif2webp.1
+../../../flutter/third_party/libwebp/man/img2webp.1
+../../../flutter/third_party/libwebp/man/vwebp.1
+../../../flutter/third_party/libwebp/man/webpinfo.1
+../../../flutter/third_party/libwebp/man/webpmux.1
+../../../flutter/third_party/libwebp/swig
+../../../flutter/third_party/libwebp/tests
+../../../flutter/third_party/libwebp/webp_js
+../../../flutter/third_party/ninja
+../../../flutter/third_party/ocmock
+../../../flutter/third_party/perfetto/.clang-format
+../../../flutter/third_party/perfetto/.clang-tidy
+../../../flutter/third_party/perfetto/.git
+../../../flutter/third_party/perfetto/.gitattributes
+../../../flutter/third_party/perfetto/.github
+../../../flutter/third_party/perfetto/.gitignore
+../../../flutter/third_party/perfetto/.gn
+../../../flutter/third_party/perfetto/.style.yapf
+../../../flutter/third_party/perfetto/CHANGELOG
+../../../flutter/third_party/perfetto/DIR_METADATA
+../../../flutter/third_party/perfetto/METADATA
+../../../flutter/third_party/perfetto/OWNERS
+../../../flutter/third_party/perfetto/PRESUBMIT.py
+../../../flutter/third_party/perfetto/README.chromium
+../../../flutter/third_party/perfetto/README.md
+../../../flutter/third_party/perfetto/WORKSPACE
+../../../flutter/third_party/perfetto/bazel/deps.bzl
+../../../flutter/third_party/perfetto/bazel/proto_gen.bzl
+../../../flutter/third_party/perfetto/bazel/rules.bzl
+../../../flutter/third_party/perfetto/bazel/standalone/README.md
+../../../flutter/third_party/perfetto/bazel/standalone/perfetto_cfg.bzl
+../../../flutter/third_party/perfetto/buildtools/.gitignore
+../../../flutter/third_party/perfetto/buildtools/README.md
+../../../flutter/third_party/perfetto/codereview.settings
+../../../flutter/third_party/perfetto/debian
+../../../flutter/third_party/perfetto/docs/.gitignore
+../../../flutter/third_party/perfetto/docs/README.md
+../../../flutter/third_party/perfetto/examples
+../../../flutter/third_party/perfetto/gn/standalone/build_tool_wrapper.py
+../../../flutter/third_party/perfetto/gn/standalone/cp.py
+../../../flutter/third_party/perfetto/gn/standalone/glob.py
+../../../flutter/third_party/perfetto/gn/standalone/protoc.py
+../../../flutter/third_party/perfetto/gn/standalone/toolchain/linux_find_llvm.py
+../../../flutter/third_party/perfetto/gn/standalone/toolchain/llvm-strip.py
+../../../flutter/third_party/perfetto/gn/standalone/toolchain/mac_find_llvm.py
+../../../flutter/third_party/perfetto/gn/standalone/toolchain/win_find_msvc.py
+../../../flutter/third_party/perfetto/gn/write_buildflag_header.py
+../../../flutter/third_party/perfetto/include/README.md
+../../../flutter/third_party/perfetto/include/perfetto/README.md
+../../../flutter/third_party/perfetto/include/perfetto/profiling/OWNERS
+../../../flutter/third_party/perfetto/include/perfetto/test
+../../../flutter/third_party/perfetto/include/perfetto/trace_processor/OWNERS
+../../../flutter/third_party/perfetto/include/perfetto/tracing/OWNERS
+../../../flutter/third_party/perfetto/infra
+../../../flutter/third_party/perfetto/meson.build
+../../../flutter/third_party/perfetto/protos
+../../../flutter/third_party/perfetto/python/README.md
+../../../flutter/third_party/perfetto/python/example.py
+../../../flutter/third_party/perfetto/python/generators/diff_tests/runner.py
+../../../flutter/third_party/perfetto/python/generators/diff_tests/testing.py
+../../../flutter/third_party/perfetto/python/generators/diff_tests/utils.py
+../../../flutter/third_party/perfetto/python/generators/sql_processing/docs_extractor.py
+../../../flutter/third_party/perfetto/python/generators/sql_processing/docs_parse.py
+../../../flutter/third_party/perfetto/python/generators/sql_processing/utils.py
+../../../flutter/third_party/perfetto/python/generators/trace_processor_table/public.py
+../../../flutter/third_party/perfetto/python/generators/trace_processor_table/serialize.py
+../../../flutter/third_party/perfetto/python/generators/trace_processor_table/util.py
+../../../flutter/third_party/perfetto/python/perfetto/batch_trace_processor/__init__.py
+../../../flutter/third_party/perfetto/python/perfetto/batch_trace_processor/api.py
+../../../flutter/third_party/perfetto/python/perfetto/batch_trace_processor/platform.py
+../../../flutter/third_party/perfetto/python/perfetto/common/repo_utils.py
+../../../flutter/third_party/perfetto/python/perfetto/experimental/slice_breakdown/__init__.py
+../../../flutter/third_party/perfetto/python/perfetto/experimental/slice_breakdown/breakdown.py
+../../../flutter/third_party/perfetto/python/perfetto/prebuilts/manifests/trace_processor_shell.py
+../../../flutter/third_party/perfetto/python/perfetto/prebuilts/manifests/tracebox.py
+../../../flutter/third_party/perfetto/python/perfetto/prebuilts/manifests/traceconv.py
+../../../flutter/third_party/perfetto/python/perfetto/prebuilts/perfetto_prebuilts.py
+../../../flutter/third_party/perfetto/python/perfetto/trace_processor
+../../../flutter/third_party/perfetto/python/perfetto/trace_uri_resolver/path.py
+../../../flutter/third_party/perfetto/python/perfetto/trace_uri_resolver/registry.py
+../../../flutter/third_party/perfetto/python/perfetto/trace_uri_resolver/resolver.py
+../../../flutter/third_party/perfetto/python/perfetto/trace_uri_resolver/util.py
+../../../flutter/third_party/perfetto/python/run_tests.py
+../../../flutter/third_party/perfetto/python/setup.py
+../../../flutter/third_party/perfetto/python/test
+../../../flutter/third_party/perfetto/python/tools/batch_trace_processor_shell.py
+../../../flutter/third_party/perfetto/python/tools/check_imports.py
+../../../flutter/third_party/perfetto/python/tools/cpu_profile.py
+../../../flutter/third_party/perfetto/python/tools/heap_profile.py
+../../../flutter/third_party/perfetto/python/tools/record_android_trace.py
+../../../flutter/third_party/perfetto/python/tools/slice_breakdown.py
+../../../flutter/third_party/perfetto/python/tools/trace_processor.py
+../../../flutter/third_party/perfetto/python/tools/tracebox.py
+../../../flutter/third_party/perfetto/python/tools/traceconv.py
+../../../flutter/third_party/perfetto/python/tools/update_permalink.py
+../../../flutter/third_party/perfetto/src/android_internal/README.md
+../../../flutter/third_party/perfetto/src/base/base64_unittest.cc
+../../../flutter/third_party/perfetto/src/base/circular_queue_unittest.cc
+../../../flutter/third_party/perfetto/src/base/flat_hash_map_unittest.cc
+../../../flutter/third_party/perfetto/src/base/flat_set_unittest.cc
+../../../flutter/third_party/perfetto/src/base/getopt_compat_unittest.cc
+../../../flutter/third_party/perfetto/src/base/hash_unittest.cc
+../../../flutter/third_party/perfetto/src/base/http/http_server_unittest.cc
+../../../flutter/third_party/perfetto/src/base/http/sha1_unittest.cc
+../../../flutter/third_party/perfetto/src/base/logging_unittest.cc
+../../../flutter/third_party/perfetto/src/base/metatrace_unittest.cc
+../../../flutter/third_party/perfetto/src/base/no_destructor_unittest.cc
+../../../flutter/third_party/perfetto/src/base/paged_memory_unittest.cc
+../../../flutter/third_party/perfetto/src/base/periodic_task_unittest.cc
+../../../flutter/third_party/perfetto/src/base/scoped_file_unittest.cc
+../../../flutter/third_party/perfetto/src/base/small_vector_unittest.cc
+../../../flutter/third_party/perfetto/src/base/status_or_unittest.cc
+../../../flutter/third_party/perfetto/src/base/status_unittest.cc
+../../../flutter/third_party/perfetto/src/base/string_splitter_unittest.cc
+../../../flutter/third_party/perfetto/src/base/string_utils_unittest.cc
+../../../flutter/third_party/perfetto/src/base/string_view_unittest.cc
+../../../flutter/third_party/perfetto/src/base/string_writer_unittest.cc
+../../../flutter/third_party/perfetto/src/base/subprocess_unittest.cc
+../../../flutter/third_party/perfetto/src/base/task_runner_unittest.cc
+../../../flutter/third_party/perfetto/src/base/temp_file_unittest.cc
+../../../flutter/third_party/perfetto/src/base/test
+../../../flutter/third_party/perfetto/src/base/thread_checker_unittest.cc
+../../../flutter/third_party/perfetto/src/base/thread_task_runner_unittest.cc
+../../../flutter/third_party/perfetto/src/base/threading/channel_unittest.cc
+../../../flutter/third_party/perfetto/src/base/threading/future_unittest.cc
+../../../flutter/third_party/perfetto/src/base/threading/spawn_unittest.cc
+../../../flutter/third_party/perfetto/src/base/threading/stream_unittest.cc
+../../../flutter/third_party/perfetto/src/base/threading/thread_pool_unittest.cc
+../../../flutter/third_party/perfetto/src/base/threading/util_unittest.cc
+../../../flutter/third_party/perfetto/src/base/time_unittest.cc
+../../../flutter/third_party/perfetto/src/base/unix_socket_unittest.cc
+../../../flutter/third_party/perfetto/src/base/utils_unittest.cc
+../../../flutter/third_party/perfetto/src/base/uuid_unittest.cc
+../../../flutter/third_party/perfetto/src/base/watchdog_posix_unittest.cc
+../../../flutter/third_party/perfetto/src/base/watchdog_unittest.cc
+../../../flutter/third_party/perfetto/src/base/weak_ptr_unittest.cc
+../../../flutter/third_party/perfetto/src/bigtrace/trace_processor_wrapper_unittest.cc
+../../../flutter/third_party/perfetto/src/ipc
+../../../flutter/third_party/perfetto/src/kallsyms/kernel_symbol_map_unittest.cc
+../../../flutter/third_party/perfetto/src/kallsyms/lazy_kernel_symbolizer_unittest.cc
+../../../flutter/third_party/perfetto/src/perfetto_cmd/config_unittest.cc
+../../../flutter/third_party/perfetto/src/perfetto_cmd/packet_writer_unittest.cc
+../../../flutter/third_party/perfetto/src/perfetto_cmd/pbtxt_to_pb_unittest.cc
+../../../flutter/third_party/perfetto/src/perfetto_cmd/rate_limiter_unittest.cc
+../../../flutter/third_party/perfetto/src/profiling/OWNERS
+../../../flutter/third_party/perfetto/src/profiling/common/interner_unittest.cc
+../../../flutter/third_party/perfetto/src/profiling/common/proc_cmdline_unittest.cc
+../../../flutter/third_party/perfetto/src/profiling/common/proc_utils_unittest.cc
+../../../flutter/third_party/perfetto/src/profiling/common/producer_support_unittest.cc
+../../../flutter/third_party/perfetto/src/profiling/common/profiler_guardrails_unittest.cc
+../../../flutter/third_party/perfetto/src/profiling/deobfuscator_unittest.cc
+../../../flutter/third_party/perfetto/src/profiling/memory
+../../../flutter/third_party/perfetto/src/profiling/perf/event_config_unittest.cc
+../../../flutter/third_party/perfetto/src/profiling/perf/perf_producer_unittest.cc
+../../../flutter/third_party/perfetto/src/profiling/perf/unwind_queue_unittest.cc
+../../../flutter/third_party/perfetto/src/profiling/symbolizer/breakpad_parser_unittest.cc
+../../../flutter/third_party/perfetto/src/profiling/symbolizer/breakpad_symbolizer_unittest.cc
+../../../flutter/third_party/perfetto/src/profiling/symbolizer/local_symbolizer_unittest.cc
+../../../flutter/third_party/perfetto/src/protozero/copyable_ptr_unittest.cc
+../../../flutter/third_party/perfetto/src/protozero/filtering/filter_bytecode_generator_unittest.cc
+../../../flutter/third_party/perfetto/src/protozero/filtering/filter_bytecode_parser_unittest.cc
+../../../flutter/third_party/perfetto/src/protozero/filtering/filter_util_unittest.cc
+../../../flutter/third_party/perfetto/src/protozero/filtering/message_filter_unittest.cc
+../../../flutter/third_party/perfetto/src/protozero/filtering/message_tokenizer_unittest.cc
+../../../flutter/third_party/perfetto/src/protozero/filtering/string_filter_unittest.cc
+../../../flutter/third_party/perfetto/src/protozero/message_arena_unittest.cc
+../../../flutter/third_party/perfetto/src/protozero/message_handle_unittest.cc
+../../../flutter/third_party/perfetto/src/protozero/message_unittest.cc
+../../../flutter/third_party/perfetto/src/protozero/proto_decoder_unittest.cc
+../../../flutter/third_party/perfetto/src/protozero/proto_ring_buffer_unittest.cc
+../../../flutter/third_party/perfetto/src/protozero/proto_utils_unittest.cc
+../../../flutter/third_party/perfetto/src/protozero/scattered_stream_writer_unittest.cc
+../../../flutter/third_party/perfetto/src/protozero/test
+../../../flutter/third_party/perfetto/src/shared_lib/intern_map_unittest.cc
+../../../flutter/third_party/perfetto/src/shared_lib/test
+../../../flutter/third_party/perfetto/src/tools
+../../../flutter/third_party/perfetto/src/trace_processor
+../../../flutter/third_party/perfetto/src/traceconv/trace_to_text_unittest.cc
+../../../flutter/third_party/perfetto/src/traced
+../../../flutter/third_party/perfetto/src/traced_relay/relay_service_unittest.cc
+../../../flutter/third_party/perfetto/src/traced_relay/socket_relay_handler_unittest.cc
+../../../flutter/third_party/perfetto/src/tracing
+../../../flutter/third_party/perfetto/test
+../../../flutter/third_party/perfetto/third_party/.gitignore
+../../../flutter/third_party/perfetto/tools/analyze_profiling_sampling_distribution.py
+../../../flutter/third_party/perfetto/tools/check_sql_metrics.py
+../../../flutter/third_party/perfetto/tools/check_sql_modules.py
+../../../flutter/third_party/perfetto/tools/compat.py
+../../../flutter/third_party/perfetto/tools/diff_test_trace_processor.py
+../../../flutter/third_party/perfetto/tools/download_changed_screenshots.py
+../../../flutter/third_party/perfetto/tools/export_power_profiles.py
+../../../flutter/third_party/perfetto/tools/find_scan_roots.py
+../../../flutter/third_party/perfetto/tools/gen_amalgamated_sql.py
+../../../flutter/third_party/perfetto/tools/gen_cc_proto_descriptor.py
+../../../flutter/third_party/perfetto/tools/gen_grpc_build_gn.py
+../../../flutter/third_party/perfetto/tools/gen_stdlib_docs_json.py
+../../../flutter/third_party/perfetto/tools/gen_tp_table_docs.py
+../../../flutter/third_party/perfetto/tools/gen_tp_table_headers.py
+../../../flutter/third_party/perfetto/tools/gn_utils.py
+../../../flutter/third_party/perfetto/tools/measure_tp_performance.py
+../../../flutter/third_party/perfetto/tools/print_descriptor.py
+../../../flutter/third_party/perfetto/tools/protoc_helper.py
+../../../flutter/third_party/perfetto/tools/pull_ftrace_format_files.py
+../../../flutter/third_party/perfetto/tools/run_buildtools_binary.py
+../../../flutter/third_party/perfetto/tools/serialize_test_trace.py
+../../../flutter/third_party/perfetto/tools/setup_all_configs.py
+../../../flutter/third_party/perfetto/tools/test_gen_amalgamated.py
+../../../flutter/third_party/perfetto/tools/touch_file.py
+../../../flutter/third_party/perfetto/tools/write_version_header.py
+../../../flutter/third_party/perfetto/ui/.clang-format
+../../../flutter/third_party/perfetto/ui/.eslintrc.js
+../../../flutter/third_party/perfetto/ui/.gitignore
+../../../flutter/third_party/perfetto/ui/OWNERS
+../../../flutter/third_party/perfetto/ui/PRESUBMIT.py
+../../../flutter/third_party/perfetto/ui/README.md
+../../../flutter/third_party/perfetto/ui/config/.gitignore
+../../../flutter/third_party/perfetto/ui/package.json
+../../../flutter/third_party/perfetto/ui/pnpm-lock.yaml
+../../../flutter/third_party/perfetto/ui/release/OWNERS
+../../../flutter/third_party/perfetto/ui/release/build_all_channels.py
+../../../flutter/third_party/perfetto/ui/release/roll_branch.py
+../../../flutter/third_party/perfetto/ui/src/assets/.gitignore
+../../../flutter/third_party/perfetto/ui/src/base/array_utils_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/base/bigint_math_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/base/binary_search_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/base/classnames_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/base/deferred_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/base/disposable_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/base/dom_utils_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/base/fuzzy_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/base/hotkeys_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/base/json_utils_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/base/object_utils_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/base/set_utils_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/base/string_utils_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/base/time_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/base/utils/package.json
+../../../flutter/third_party/perfetto/ui/src/base/validators_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/common/actions_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/common/canvas_utils_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/common/colorizer_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/common/dragndrop_logic_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/common/event_set_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/common/feature_flags_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/common/flamegraph_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/common/high_precision_time_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/common/metatracing_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/common/plugins_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/common/proto_ring_buffer_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/common/protos_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/common/query_result_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/common/query_utils_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/common/recordingV2/target_factories/android_websocket_target_factory_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/common/recordingV2/target_factories/chrome_target_factory_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/common/registry_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/common/schema_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/common/state_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/common/upload_utils_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/controller/area_selection_handler_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/controller/args_parser_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/controller/controller_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/controller/pivot_table_tree_builder_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/core/perf_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/frontend/base_slice_track_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/frontend/flamegraph_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/frontend/gridline_helper_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/frontend/query_table_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/frontend/router_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/frontend/sql_table/column_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/frontend/sql_table/state_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/frontend/sql_utils_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/frontend/store_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/frontend/task_tracker_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/frontend/time_scale_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/frontend/track_cache_unittest.ts
+../../../flutter/third_party/perfetto/ui/src/plugins/com.example.Skeleton/OWNERS
+../../../flutter/third_party/perfetto/ui/src/plugins/dev.perfetto.AndroidCujs/OWNERS
+../../../flutter/third_party/perfetto/ui/src/plugins/dev.perfetto.AndroidPerf/OWNERS
+../../../flutter/third_party/perfetto/ui/src/plugins/dev.perfetto.LargeScreensPerf/OWNERS
+../../../flutter/third_party/perfetto/ui/src/test
+../../../flutter/third_party/pkg/archive
+../../../flutter/third_party/pkg/equatable
+../../../flutter/third_party/pkg/flutter_packages
+../../../flutter/third_party/pkg/gcloud
+../../../flutter/third_party/pkg/googleapis
+../../../flutter/third_party/pkg/platform
+../../../flutter/third_party/pkg/process
+../../../flutter/third_party/pkg/process_runner
+../../../flutter/third_party/pkg/vector_math
+../../../flutter/third_party/protobuf
+../../../flutter/third_party/pyyaml
+../../../flutter/third_party/rapidjson/.git
+../../../flutter/third_party/rapidjson/.gitattributes
+../../../flutter/third_party/rapidjson/.gitignore
+../../../flutter/third_party/rapidjson/.gitmodules
+../../../flutter/third_party/rapidjson/.travis.yml
+../../../flutter/third_party/rapidjson/CHANGELOG.md
+../../../flutter/third_party/rapidjson/CMakeLists.txt
+../../../flutter/third_party/rapidjson/CMakeModules/FindGTestSrc.cmake
+../../../flutter/third_party/rapidjson/README.fuchsia
+../../../flutter/third_party/rapidjson/README.fuchsia.md
+../../../flutter/third_party/rapidjson/RapidJSON.pc.in
+../../../flutter/third_party/rapidjson/RapidJSONConfig.cmake.in
+../../../flutter/third_party/rapidjson/RapidJSONConfigVersion.cmake.in
+../../../flutter/third_party/rapidjson/appveyor.yml
+../../../flutter/third_party/rapidjson/contrib
+../../../flutter/third_party/rapidjson/doc
+../../../flutter/third_party/rapidjson/docker/debian/Dockerfile
+../../../flutter/third_party/rapidjson/example
+../../../flutter/third_party/rapidjson/include_dirs.js
+../../../flutter/third_party/rapidjson/library.json
+../../../flutter/third_party/rapidjson/package.json
+../../../flutter/third_party/rapidjson/rapidjson.autopkg
+../../../flutter/third_party/rapidjson/readme.md
+../../../flutter/third_party/rapidjson/readme.zh-cn.md
+../../../flutter/third_party/rapidjson/test
+../../../flutter/third_party/shaderc/.clang-format
+../../../flutter/third_party/shaderc/.git
+../../../flutter/third_party/shaderc/.github
+../../../flutter/third_party/shaderc/.gitignore
+../../../flutter/third_party/shaderc/AUTHORS
+../../../flutter/third_party/shaderc/Android.mk
+../../../flutter/third_party/shaderc/CHANGES
+../../../flutter/third_party/shaderc/CMakeLists.txt
+../../../flutter/third_party/shaderc/CONTRIBUTING.md
+../../../flutter/third_party/shaderc/CONTRIBUTORS
+../../../flutter/third_party/shaderc/DEPS
+../../../flutter/third_party/shaderc/Dockerfile
+../../../flutter/third_party/shaderc/README.md
+../../../flutter/third_party/shaderc/android_test/Android.mk
+../../../flutter/third_party/shaderc/android_test/jni/Android.mk
+../../../flutter/third_party/shaderc/android_test/jni/Application.mk
+../../../flutter/third_party/shaderc/cmake
+../../../flutter/third_party/shaderc/examples
+../../../flutter/third_party/shaderc/glslc/CMakeLists.txt
+../../../flutter/third_party/shaderc/glslc/README.asciidoc
+../../../flutter/third_party/shaderc/glslc/test
+../../../flutter/third_party/shaderc/libshaderc/Android.mk
+../../../flutter/third_party/shaderc/libshaderc/CMakeLists.txt
+../../../flutter/third_party/shaderc/libshaderc/README.md
+../../../flutter/third_party/shaderc/libshaderc_util/Android.mk
+../../../flutter/third_party/shaderc/libshaderc_util/CMakeLists.txt
+../../../flutter/third_party/shaderc/libshaderc_util/testdata
+../../../flutter/third_party/shaderc/license-checker.cfg
+../../../flutter/third_party/shaderc/third_party/Android.mk
+../../../flutter/third_party/shaderc/third_party/CMakeLists.txt
+../../../flutter/third_party/shaderc/third_party/LICENSE.glslang
+../../../flutter/third_party/shaderc/third_party/LICENSE.spirv-tools
+../../../flutter/third_party/shaderc/utils/add_copyright.py
+../../../flutter/third_party/shaderc/utils/remove-file-by-suffix.py
+../../../flutter/third_party/shaderc/utils/update_build_version.py
+../../../flutter/third_party/skia
+../../../flutter/third_party/skia/.bazelrc
+../../../flutter/third_party/skia/.bazelversion
+../../../flutter/third_party/skia/.clang-format
+../../../flutter/third_party/skia/.clang-tidy
+../../../flutter/third_party/skia/.git
+../../../flutter/third_party/skia/.gitignore
+../../../flutter/third_party/skia/.gn
+../../../flutter/third_party/skia/.vpython3
+../../../flutter/third_party/skia/AUTHORS
+../../../flutter/third_party/skia/BUILD.bazel
+../../../flutter/third_party/skia/CONTRIBUTING
+../../../flutter/third_party/skia/CQ_COMMITTERS
+../../../flutter/third_party/skia/DEPS
+../../../flutter/third_party/skia/DIR_METADATA
+../../../flutter/third_party/skia/OWNERS
+../../../flutter/third_party/skia/OWNERS.android
+../../../flutter/third_party/skia/PRESUBMIT.py
+../../../flutter/third_party/skia/PRESUBMIT_test.py
+../../../flutter/third_party/skia/PRESUBMIT_test_mocks.py
+../../../flutter/third_party/skia/README
+../../../flutter/third_party/skia/README.chromium
+../../../flutter/third_party/skia/WORKSPACE.bazel
+../../../flutter/third_party/skia/bazel
+../../../flutter/third_party/skia/bench
+../../../flutter/third_party/skia/codereview.settings
+../../../flutter/third_party/skia/defines.bzl
+../../../flutter/third_party/skia/demos.skia.org
+../../../flutter/third_party/skia/docker/Makefile
+../../../flutter/third_party/skia/docker/README.md
+../../../flutter/third_party/skia/docker/binary-size/Dockerfile
+../../../flutter/third_party/skia/docker/cmake-release/Dockerfile
+../../../flutter/third_party/skia/docker/skia-build-tools/Dockerfile
+../../../flutter/third_party/skia/docker/skia-release/Dockerfile
+../../../flutter/third_party/skia/docker/skia-wasm-release/Dockerfile
+../../../flutter/third_party/skia/docker/skia-with-swift-shader-base/Dockerfile
+../../../flutter/third_party/skia/docs
+../../../flutter/third_party/skia/example
+../../../flutter/third_party/skia/experimental
+../../../flutter/third_party/skia/fuzz/README.md
+../../../flutter/third_party/skia/gm/BUILD.bazel
+../../../flutter/third_party/skia/gm/png_codec.bzl
+../../../flutter/third_party/skia/gn/BUILD.bazel
+../../../flutter/third_party/skia/gn/__init__.py
+../../../flutter/third_party/skia/gn/bazel_build.py
+../../../flutter/third_party/skia/gn/call.py
+../../../flutter/third_party/skia/gn/checkdir.py
+../../../flutter/third_party/skia/gn/codesign_ios.py
+../../../flutter/third_party/skia/gn/compile_ib_files.py
+../../../flutter/third_party/skia/gn/compile_sksl_tests.py
+../../../flutter/third_party/skia/gn/copy_git_directory.py
+../../../flutter/third_party/skia/gn/cp.py
+../../../flutter/third_party/skia/gn/find_headers.py
+../../../flutter/third_party/skia/gn/find_msvc.py
+../../../flutter/third_party/skia/gn/find_xcode_sysroot.py
+../../../flutter/third_party/skia/gn/gn_meta_sln.py
+../../../flutter/third_party/skia/gn/gn_to_bp.py
+../../../flutter/third_party/skia/gn/gn_to_bp_utils.py
+../../../flutter/third_party/skia/gn/gn_to_cmake.py
+../../../flutter/third_party/skia/gn/highest_version_dir.py
+../../../flutter/third_party/skia/gn/is_clang.py
+../../../flutter/third_party/skia/gn/make_gm_gni.py
+../../../flutter/third_party/skia/gn/minify_sksl.py
+../../../flutter/third_party/skia/gn/minify_sksl_tests.py
+../../../flutter/third_party/skia/gn/push_to_android.py
+../../../flutter/third_party/skia/gn/rm.py
+../../../flutter/third_party/skia/gn/run_sksllex.py
+../../../flutter/third_party/skia/gn/skqp_gn_args.py
+../../../flutter/third_party/skia/gn/toolchain/num_cpus.py
+../../../flutter/third_party/skia/go_repositories.bzl
+../../../flutter/third_party/skia/include/BUILD.bazel
+../../../flutter/third_party/skia/include/OWNERS
+../../../flutter/third_party/skia/include/android/BUILD.bazel
+../../../flutter/third_party/skia/include/codec/BUILD.bazel
+../../../flutter/third_party/skia/include/config/BUILD.bazel
+../../../flutter/third_party/skia/include/config/OWNERS
+../../../flutter/third_party/skia/include/config/WORKSPACE.bazel
+../../../flutter/third_party/skia/include/config/copts.bzl
+../../../flutter/third_party/skia/include/config/linkopts.bzl
+../../../flutter/third_party/skia/include/core/BUILD.bazel
+../../../flutter/third_party/skia/include/docs/BUILD.bazel
+../../../flutter/third_party/skia/include/effects/BUILD.bazel
+../../../flutter/third_party/skia/include/encode/BUILD.bazel
+../../../flutter/third_party/skia/include/gpu/BUILD.bazel
+../../../flutter/third_party/skia/include/gpu/d3d/BUILD.bazel
+../../../flutter/third_party/skia/include/gpu/ganesh/BUILD.bazel
+../../../flutter/third_party/skia/include/gpu/ganesh/gl/BUILD.bazel
+../../../flutter/third_party/skia/include/gpu/ganesh/mtl/BUILD.bazel
+../../../flutter/third_party/skia/include/gpu/ganesh/vk/BUILD.bazel
+../../../flutter/third_party/skia/include/gpu/gl/BUILD.bazel
+../../../flutter/third_party/skia/include/gpu/gl/egl/BUILD.bazel
+../../../flutter/third_party/skia/include/gpu/gl/epoxy/BUILD.bazel
+../../../flutter/third_party/skia/include/gpu/gl/glx/BUILD.bazel
+../../../flutter/third_party/skia/include/gpu/graphite/mtl/BUILD.bazel
+../../../flutter/third_party/skia/include/gpu/mock/BUILD.bazel
+../../../flutter/third_party/skia/include/gpu/mtl/BUILD.bazel
+../../../flutter/third_party/skia/include/gpu/vk/BUILD.bazel
+../../../flutter/third_party/skia/include/pathops/BUILD.bazel
+../../../flutter/third_party/skia/include/ports/BUILD.bazel
+../../../flutter/third_party/skia/include/private/BUILD.bazel
+../../../flutter/third_party/skia/include/private/OWNERS
+../../../flutter/third_party/skia/include/private/base/BUILD.bazel
+../../../flutter/third_party/skia/include/private/base/README.md
+../../../flutter/third_party/skia/include/private/chromium/BUILD.bazel
+../../../flutter/third_party/skia/include/private/gpu/BUILD.bazel
+../../../flutter/third_party/skia/include/private/gpu/ganesh/BUILD.bazel
+../../../flutter/third_party/skia/include/private/gpu/vk/BUILD.bazel
+../../../flutter/third_party/skia/include/sksl/BUILD.bazel
+../../../flutter/third_party/skia/include/sksl/OWNERS
+../../../flutter/third_party/skia/include/svg/BUILD.bazel
+../../../flutter/third_party/skia/include/third_party/vulkan/BUILD.bazel
+../../../flutter/third_party/skia/include/utils/BUILD.bazel
+../../../flutter/third_party/skia/include/utils/mac/BUILD.bazel
+../../../flutter/third_party/skia/infra
+../../../flutter/third_party/skia/modules/bentleyottmann/BUILD.bazel
+../../../flutter/third_party/skia/modules/bentleyottmann/include/BUILD.bazel
+../../../flutter/third_party/skia/modules/bentleyottmann/src/BUILD.bazel
+../../../flutter/third_party/skia/modules/bentleyottmann/tests
+../../../flutter/third_party/skia/modules/canvaskit/.gitignore
+../../../flutter/third_party/skia/modules/canvaskit/BUILD.bazel
+../../../flutter/third_party/skia/modules/canvaskit/CHANGELOG.md
+../../../flutter/third_party/skia/modules/canvaskit/Makefile
+../../../flutter/third_party/skia/modules/canvaskit/README.md
+../../../flutter/third_party/skia/modules/canvaskit/external_test/.gitignore
+../../../flutter/third_party/skia/modules/canvaskit/external_test/Makefile
+../../../flutter/third_party/skia/modules/canvaskit/external_test/typescript_browser/package.json
+../../../flutter/third_party/skia/modules/canvaskit/external_test/typescript_browser_es6/package.json
+../../../flutter/third_party/skia/modules/canvaskit/fonts/README.md
+../../../flutter/third_party/skia/modules/canvaskit/go/gold_test_env
+../../../flutter/third_party/skia/modules/canvaskit/npm_build/.gitignore
+../../../flutter/third_party/skia/modules/canvaskit/npm_build/CODE_OF_CONDUCT.md
+../../../flutter/third_party/skia/modules/canvaskit/npm_build/CONTRIBUTING.md
+../../../flutter/third_party/skia/modules/canvaskit/npm_build/README.md
+../../../flutter/third_party/skia/modules/canvaskit/npm_build/example.html
+../../../flutter/third_party/skia/modules/canvaskit/npm_build/package.json
+../../../flutter/third_party/skia/modules/canvaskit/npm_build/types/README.md
+../../../flutter/third_party/skia/modules/canvaskit/package.json
+../../../flutter/third_party/skia/modules/canvaskit/tests
+../../../flutter/third_party/skia/modules/canvaskit/wasm_tools/SIMD/.gitignore
+../../../flutter/third_party/skia/modules/jetski/BUILD.bazel
+../../../flutter/third_party/skia/modules/jetski/README
+../../../flutter/third_party/skia/modules/pathkit/.gitignore
+../../../flutter/third_party/skia/modules/pathkit/BUILD.bazel
+../../../flutter/third_party/skia/modules/pathkit/CHANGELOG.md
+../../../flutter/third_party/skia/modules/pathkit/Makefile
+../../../flutter/third_party/skia/modules/pathkit/README.md
+../../../flutter/third_party/skia/modules/pathkit/npm-asmjs/CODE_OF_CONDUCT.md
+../../../flutter/third_party/skia/modules/pathkit/npm-asmjs/CONTRIBUTING.md
+../../../flutter/third_party/skia/modules/pathkit/npm-asmjs/README.md
+../../../flutter/third_party/skia/modules/pathkit/npm-asmjs/example.html
+../../../flutter/third_party/skia/modules/pathkit/npm-asmjs/package.json
+../../../flutter/third_party/skia/modules/pathkit/npm-wasm/CODE_OF_CONDUCT.md
+../../../flutter/third_party/skia/modules/pathkit/npm-wasm/CONTRIBUTING.md
+../../../flutter/third_party/skia/modules/pathkit/npm-wasm/README.md
+../../../flutter/third_party/skia/modules/pathkit/npm-wasm/example.html
+../../../flutter/third_party/skia/modules/pathkit/npm-wasm/package.json
+../../../flutter/third_party/skia/modules/pathkit/package.json
+../../../flutter/third_party/skia/modules/pathkit/tests
+../../../flutter/third_party/skia/modules/skcms/BUILD.bazel
+../../../flutter/third_party/skia/modules/skcms/OWNERS
+../../../flutter/third_party/skia/modules/skcms/README.chromium
+../../../flutter/third_party/skia/modules/skcms/version.sha1
+../../../flutter/third_party/skia/modules/skottie/BUILD.bazel
+../../../flutter/third_party/skia/modules/skottie/fuzz/BUILD.bazel
+../../../flutter/third_party/skia/modules/skottie/gm/BUILD.bazel
+../../../flutter/third_party/skia/modules/skottie/include/BUILD.bazel
+../../../flutter/third_party/skia/modules/skottie/src/BUILD.bazel
+../../../flutter/third_party/skia/modules/skottie/src/animator/BUILD.bazel
+../../../flutter/third_party/skia/modules/skottie/src/effects/BUILD.bazel
+../../../flutter/third_party/skia/modules/skottie/src/layers/BUILD.bazel
+../../../flutter/third_party/skia/modules/skottie/src/layers/shapelayer/BUILD.bazel
+../../../flutter/third_party/skia/modules/skottie/src/text/BUILD.bazel
+../../../flutter/third_party/skia/modules/skottie/tests
+../../../flutter/third_party/skia/modules/skottie/utils/BUILD.bazel
+../../../flutter/third_party/skia/modules/skparagraph/BUILD.bazel
+../../../flutter/third_party/skia/modules/skparagraph/bench/BUILD.bazel
+../../../flutter/third_party/skia/modules/skparagraph/gm/BUILD.bazel
+../../../flutter/third_party/skia/modules/skparagraph/include/BUILD.bazel
+../../../flutter/third_party/skia/modules/skparagraph/slides/BUILD.bazel
+../../../flutter/third_party/skia/modules/skparagraph/src/BUILD.bazel
+../../../flutter/third_party/skia/modules/skparagraph/tests
+../../../flutter/third_party/skia/modules/skparagraph/utils/BUILD.bazel
+../../../flutter/third_party/skia/modules/skplaintexteditor/README.md
+../../../flutter/third_party/skia/modules/skresources/BUILD.bazel
+../../../flutter/third_party/skia/modules/skresources/include/BUILD.bazel
+../../../flutter/third_party/skia/modules/skresources/src/BUILD.bazel
+../../../flutter/third_party/skia/modules/sksg/BUILD.bazel
+../../../flutter/third_party/skia/modules/sksg/include/BUILD.bazel
+../../../flutter/third_party/skia/modules/sksg/slides/BUILD.bazel
+../../../flutter/third_party/skia/modules/sksg/src/BUILD.bazel
+../../../flutter/third_party/skia/modules/sksg/tests
+../../../flutter/third_party/skia/modules/skshaper/BUILD.bazel
+../../../flutter/third_party/skia/modules/skshaper/include/BUILD.bazel
+../../../flutter/third_party/skia/modules/skshaper/src/BUILD.bazel
+../../../flutter/third_party/skia/modules/skshaper/tests
+../../../flutter/third_party/skia/modules/skunicode/BUILD.bazel
+../../../flutter/third_party/skia/modules/skunicode/include/BUILD.bazel
+../../../flutter/third_party/skia/modules/skunicode/src/BUILD.bazel
+../../../flutter/third_party/skia/modules/skunicode/tests
+../../../flutter/third_party/skia/modules/svg/include/BUILD.bazel
+../../../flutter/third_party/skia/modules/svg/src/BUILD.bazel
+../../../flutter/third_party/skia/modules/svg/tests
+../../../flutter/third_party/skia/modules/svg/utils/BUILD.bazel
+../../../flutter/third_party/skia/package.json
+../../../flutter/third_party/skia/platform_tools
+../../../flutter/third_party/skia/public.bzl
+../../../flutter/third_party/skia/relnotes/README.md
+../../../flutter/third_party/skia/requirements.txt
+../../../flutter/third_party/skia/resources
+../../../flutter/third_party/skia/site
+../../../flutter/third_party/skia/specs
+../../../flutter/third_party/skia/src/BUILD.bazel
+../../../flutter/third_party/skia/src/android/BUILD.bazel
+../../../flutter/third_party/skia/src/base/BUILD.bazel
+../../../flutter/third_party/skia/src/base/README.md
+../../../flutter/third_party/skia/src/codec/BUILD.bazel
+../../../flutter/third_party/skia/src/core/BUILD.bazel
+../../../flutter/third_party/skia/src/effects/BUILD.bazel
+../../../flutter/third_party/skia/src/effects/colorfilters/BUILD.bazel
+../../../flutter/third_party/skia/src/effects/imagefilters/BUILD.bazel
+../../../flutter/third_party/skia/src/encode/BUILD.bazel
+../../../flutter/third_party/skia/src/fonts/BUILD.bazel
+../../../flutter/third_party/skia/src/gpu/BUILD.bazel
+../../../flutter/third_party/skia/src/gpu/android/BUILD.bazel
+../../../flutter/third_party/skia/src/gpu/ganesh/BUILD.bazel
+../../../flutter/third_party/skia/src/gpu/ganesh/d3d/BUILD.bazel
+../../../flutter/third_party/skia/src/gpu/ganesh/effects/BUILD.bazel
+../../../flutter/third_party/skia/src/gpu/ganesh/geometry/BUILD.bazel
+../../../flutter/third_party/skia/src/gpu/ganesh/gl/BUILD.bazel
+../../../flutter/third_party/skia/src/gpu/ganesh/gl/android/BUILD.bazel
+../../../flutter/third_party/skia/src/gpu/ganesh/gl/builders/BUILD.bazel
+../../../flutter/third_party/skia/src/gpu/ganesh/gl/egl/BUILD.bazel
+../../../flutter/third_party/skia/src/gpu/ganesh/gl/epoxy/BUILD.bazel
+../../../flutter/third_party/skia/src/gpu/ganesh/gl/glx/BUILD.bazel
+../../../flutter/third_party/skia/src/gpu/ganesh/gl/iOS/BUILD.bazel
+../../../flutter/third_party/skia/src/gpu/ganesh/gl/mac/BUILD.bazel
+../../../flutter/third_party/skia/src/gpu/ganesh/gl/webgl/BUILD.bazel
+../../../flutter/third_party/skia/src/gpu/ganesh/gl/win/BUILD.bazel
+../../../flutter/third_party/skia/src/gpu/ganesh/glsl/BUILD.bazel
+../../../flutter/third_party/skia/src/gpu/ganesh/gradients/BUILD.bazel
+../../../flutter/third_party/skia/src/gpu/ganesh/gradients/README.md
+../../../flutter/third_party/skia/src/gpu/ganesh/image/BUILD.bazel
+../../../flutter/third_party/skia/src/gpu/ganesh/mock/BUILD.bazel
+../../../flutter/third_party/skia/src/gpu/ganesh/mtl/BUILD.bazel
+../../../flutter/third_party/skia/src/gpu/ganesh/ops/BUILD.bazel
+../../../flutter/third_party/skia/src/gpu/ganesh/surface/BUILD.bazel
+../../../flutter/third_party/skia/src/gpu/ganesh/tessellate/BUILD.bazel
+../../../flutter/third_party/skia/src/gpu/ganesh/text/BUILD.bazel
+../../../flutter/third_party/skia/src/gpu/ganesh/vk/BUILD.bazel
+../../../flutter/third_party/skia/src/gpu/mtl/BUILD.bazel
+../../../flutter/third_party/skia/src/gpu/tessellate/BUILD.bazel
+../../../flutter/third_party/skia/src/gpu/vk/BUILD.bazel
+../../../flutter/third_party/skia/src/gpu/vk/vulkanmemoryallocator/BUILD.bazel
+../../../flutter/third_party/skia/src/image/BUILD.bazel
+../../../flutter/third_party/skia/src/lazy/BUILD.bazel
+../../../flutter/third_party/skia/src/opts/BUILD.bazel
+../../../flutter/third_party/skia/src/pathops/BUILD.bazel
+../../../flutter/third_party/skia/src/pdf/BUILD.bazel
+../../../flutter/third_party/skia/src/ports/BUILD.bazel
+../../../flutter/third_party/skia/src/ports/fontations/BUILD.bazel
+../../../flutter/third_party/skia/src/sfnt/BUILD.bazel
+../../../flutter/third_party/skia/src/shaders/BUILD.bazel
+../../../flutter/third_party/skia/src/shaders/gradients/BUILD.bazel
+../../../flutter/third_party/skia/src/sksl/BUILD.bazel
+../../../flutter/third_party/skia/src/sksl/README.md
+../../../flutter/third_party/skia/src/sksl/analysis/BUILD.bazel
+../../../flutter/third_party/skia/src/sksl/codegen/BUILD.bazel
+../../../flutter/third_party/skia/src/sksl/ir/BUILD.bazel
+../../../flutter/third_party/skia/src/sksl/lex/BUILD.bazel
+../../../flutter/third_party/skia/src/sksl/tracing/BUILD.bazel
+../../../flutter/third_party/skia/src/sksl/transform/BUILD.bazel
+../../../flutter/third_party/skia/src/svg/BUILD.bazel
+../../../flutter/third_party/skia/src/text/BUILD.bazel
+../../../flutter/third_party/skia/src/text/gpu/BUILD.bazel
+../../../flutter/third_party/skia/src/utils/BUILD.bazel
+../../../flutter/third_party/skia/src/utils/mac/BUILD.bazel
+../../../flutter/third_party/skia/src/utils/win/BUILD.bazel
+../../../flutter/third_party/skia/src/xml/BUILD.bazel
+../../../flutter/third_party/skia/src/xps/BUILD.bazel
+../../../flutter/third_party/skia/tests
+../../../flutter/third_party/skia/third_party/README
+../../../flutter/third_party/skia/third_party/etc1/BUILD.bazel
+../../../flutter/third_party/skia/third_party/etc1/README.google
+../../../flutter/third_party/skia/third_party/freetype2
+../../../flutter/third_party/skia/third_party/harfbuzz/README
+../../../flutter/third_party/skia/third_party/icu
+../../../flutter/third_party/skia/third_party/libgrapheme/generate_headers.py
+../../../flutter/third_party/skia/third_party/libjpeg-turbo
+../../../flutter/third_party/skia/third_party/libpng
+../../../flutter/third_party/skia/third_party/lua
+../../../flutter/third_party/skia/third_party/vello
+../../../flutter/third_party/skia/third_party/vulkanmemoryallocator/BUILD.bazel
+../../../flutter/third_party/skia/toolchain/BUILD.bazel
+../../../flutter/third_party/skia/toolchain/android_trampolines/gen_trampolines/BUILD.bazel
+../../../flutter/third_party/skia/toolchain/clang_layering_check.bzl
+../../../flutter/third_party/skia/toolchain/download_linux_amd64_toolchain.bzl
+../../../flutter/third_party/skia/toolchain/download_mac_toolchain.bzl
+../../../flutter/third_party/skia/toolchain/download_ndk_linux_amd64_toolchain.bzl
+../../../flutter/third_party/skia/toolchain/download_toolchains.bzl
+../../../flutter/third_party/skia/toolchain/linux_amd64_toolchain_config.bzl
+../../../flutter/third_party/skia/toolchain/mac_toolchain_config.bzl
+../../../flutter/third_party/skia/toolchain/ndk_linux_arm64_toolchain_config.bzl
+../../../flutter/third_party/skia/toolchain/utils.bzl
+../../../flutter/third_party/skia/tools
+../../../flutter/third_party/spring_animation/README.md
+../../../flutter/third_party/sqlite/.git
+../../../flutter/third_party/sqlite/.gitignore
+../../../flutter/third_party/sqlite/GIT_REVISION
+../../../flutter/third_party/sqlite/LAST_UPDATE
+../../../flutter/third_party/sqlite/Makefile
+../../../flutter/third_party/sqlite/README.md
+../../../flutter/third_party/sqlite/VERSION
+../../../flutter/third_party/stb
+../../../flutter/third_party/swiftshader
+../../../flutter/third_party/test_shaders
+../../../flutter/third_party/tinygltf
+../../../flutter/third_party/tonic/.clang-format
+../../../flutter/third_party/tonic/AUTHORS
+../../../flutter/third_party/tonic/PATENTS
+../../../flutter/third_party/tonic/README.md
+../../../flutter/third_party/tonic/file_loader/file_loader_unittests.cc
+../../../flutter/third_party/tonic/filesystem/README.md
+../../../flutter/third_party/tonic/filesystem/tests
+../../../flutter/third_party/tonic/tests
+../../../flutter/third_party/txt/.clang-format
+../../../flutter/third_party/txt/.gitattributes
+../../../flutter/third_party/txt/.gitignore
+../../../flutter/third_party/txt/tests
+../../../flutter/third_party/txt/third_party/fonts
+../../../flutter/third_party/vulkan-deps/.git
+../../../flutter/third_party/vulkan-deps/.gitattributes
+../../../flutter/third_party/vulkan-deps/.gitignore
+../../../flutter/third_party/vulkan-deps/.gitmodules
+../../../flutter/third_party/vulkan-deps/DEPS
+../../../flutter/third_party/vulkan-deps/OWNERS
+../../../flutter/third_party/vulkan-deps/README.chromium
+../../../flutter/third_party/vulkan-deps/README.md
+../../../flutter/third_party/vulkan-deps/additional_readme_paths.json
+../../../flutter/third_party/vulkan-deps/glslang/DIR_METADATA
+../../../flutter/third_party/vulkan-deps/glslang/LICENSE
+../../../flutter/third_party/vulkan-deps/glslang/README.chromium
+../../../flutter/third_party/vulkan-deps/glslang/src/.clang-format
+../../../flutter/third_party/vulkan-deps/glslang/src/.git
+../../../flutter/third_party/vulkan-deps/glslang/src/.gitattributes
+../../../flutter/third_party/vulkan-deps/glslang/src/.github
+../../../flutter/third_party/vulkan-deps/glslang/src/.gitignore
+../../../flutter/third_party/vulkan-deps/glslang/src/.gn
+../../../flutter/third_party/vulkan-deps/glslang/src/.mailmap
+../../../flutter/third_party/vulkan-deps/glslang/src/Android.mk
+../../../flutter/third_party/vulkan-deps/glslang/src/CHANGES.md
+../../../flutter/third_party/vulkan-deps/glslang/src/CMakeLists.txt
+../../../flutter/third_party/vulkan-deps/glslang/src/CODE_OF_CONDUCT.md
+../../../flutter/third_party/vulkan-deps/glslang/src/DEPS
+../../../flutter/third_party/vulkan-deps/glslang/src/External/CMakeLists.txt
+../../../flutter/third_party/vulkan-deps/glslang/src/LICENSE.txt
+../../../flutter/third_party/vulkan-deps/glslang/src/README-spirv-remap.txt
+../../../flutter/third_party/vulkan-deps/glslang/src/README.md
+../../../flutter/third_party/vulkan-deps/glslang/src/SECURITY.md
+../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/CMakeLists.txt
+../../../flutter/third_party/vulkan-deps/glslang/src/StandAlone/CMakeLists.txt
+../../../flutter/third_party/vulkan-deps/glslang/src/Test
+../../../flutter/third_party/vulkan-deps/glslang/src/_config.yml
+../../../flutter/third_party/vulkan-deps/glslang/src/build_info.py
+../../../flutter/third_party/vulkan-deps/glslang/src/gen_extension_headers.py
+../../../flutter/third_party/vulkan-deps/glslang/src/glslang/CMakeLists.txt
+../../../flutter/third_party/vulkan-deps/glslang/src/glslang/OSDependent/Unix/CMakeLists.txt
+../../../flutter/third_party/vulkan-deps/glslang/src/glslang/OSDependent/Web
+../../../flutter/third_party/vulkan-deps/glslang/src/glslang/OSDependent/Windows/CMakeLists.txt
+../../../flutter/third_party/vulkan-deps/glslang/src/gtests/CMakeLists.txt
+../../../flutter/third_party/vulkan-deps/glslang/src/gtests/README.md
+../../../flutter/third_party/vulkan-deps/glslang/src/known_good.json
+../../../flutter/third_party/vulkan-deps/glslang/src/known_good_khr.json
+../../../flutter/third_party/vulkan-deps/glslang/src/kokoro
+../../../flutter/third_party/vulkan-deps/glslang/src/license-checker.cfg
+../../../flutter/third_party/vulkan-deps/glslang/src/ndk_test/Android.mk
+../../../flutter/third_party/vulkan-deps/glslang/src/ndk_test/jni/Application.mk
+../../../flutter/third_party/vulkan-deps/glslang/src/parse_version.cmake
+../../../flutter/third_party/vulkan-deps/glslang/src/update_glslang_sources.py
+../../../flutter/third_party/vulkan-deps/spirv-cross/DIR_METADATA
+../../../flutter/third_party/vulkan-deps/spirv-cross/README.chromium
+../../../flutter/third_party/vulkan-deps/spirv-cross/src/.clang-format
+../../../flutter/third_party/vulkan-deps/spirv-cross/src/.git
+../../../flutter/third_party/vulkan-deps/spirv-cross/src/.github
+../../../flutter/third_party/vulkan-deps/spirv-cross/src/.gitignore
+../../../flutter/third_party/vulkan-deps/spirv-cross/src/.reuse
+../../../flutter/third_party/vulkan-deps/spirv-cross/src/CMakeLists.txt
+../../../flutter/third_party/vulkan-deps/spirv-cross/src/CODE_OF_CONDUCT.adoc
+../../../flutter/third_party/vulkan-deps/spirv-cross/src/LICENSES
+../../../flutter/third_party/vulkan-deps/spirv-cross/src/Makefile
+../../../flutter/third_party/vulkan-deps/spirv-cross/src/README.md
+../../../flutter/third_party/vulkan-deps/spirv-cross/src/appveyor.yml
+../../../flutter/third_party/vulkan-deps/spirv-cross/src/cmake
+../../../flutter/third_party/vulkan-deps/spirv-cross/src/samples
+../../../flutter/third_party/vulkan-deps/spirv-cross/src/shaders
+../../../flutter/third_party/vulkan-deps/spirv-cross/src/shaders-hlsl
+../../../flutter/third_party/vulkan-deps/spirv-cross/src/shaders-hlsl-no-opt
+../../../flutter/third_party/vulkan-deps/spirv-cross/src/shaders-msl
+../../../flutter/third_party/vulkan-deps/spirv-cross/src/shaders-msl-no-opt
+../../../flutter/third_party/vulkan-deps/spirv-cross/src/shaders-no-opt
+../../../flutter/third_party/vulkan-deps/spirv-cross/src/shaders-other
+../../../flutter/third_party/vulkan-deps/spirv-cross/src/shaders-reflection
+../../../flutter/third_party/vulkan-deps/spirv-cross/src/shaders-ue4
+../../../flutter/third_party/vulkan-deps/spirv-cross/src/shaders-ue4-no-opt
+../../../flutter/third_party/vulkan-deps/spirv-cross/src/test_shaders.py
+../../../flutter/third_party/vulkan-deps/spirv-headers
+../../../flutter/third_party/vulkan-deps/spirv-tools
+../../../flutter/third_party/vulkan-deps/update-commit-message.py
+../../../flutter/third_party/vulkan-deps/vulkan-headers/DIR_METADATA
+../../../flutter/third_party/vulkan-deps/vulkan-headers/README.chromium
+../../../flutter/third_party/vulkan-deps/vulkan-headers/src/.git
+../../../flutter/third_party/vulkan-deps/vulkan-headers/src/.gitattributes
+../../../flutter/third_party/vulkan-deps/vulkan-headers/src/.github
+../../../flutter/third_party/vulkan-deps/vulkan-headers/src/.gitignore
+../../../flutter/third_party/vulkan-deps/vulkan-headers/src/.reuse
+../../../flutter/third_party/vulkan-deps/vulkan-headers/src/BUILD.md
+../../../flutter/third_party/vulkan-deps/vulkan-headers/src/CMakeLists.txt
+../../../flutter/third_party/vulkan-deps/vulkan-headers/src/CODE_OF_CONDUCT.adoc
+../../../flutter/third_party/vulkan-deps/vulkan-headers/src/CONTRIBUTING.md
+../../../flutter/third_party/vulkan-deps/vulkan-headers/src/LICENSE.md
+../../../flutter/third_party/vulkan-deps/vulkan-headers/src/README.md
+../../../flutter/third_party/vulkan-deps/vulkan-headers/src/SECURITY.md
+../../../flutter/third_party/vulkan-deps/vulkan-headers/src/registry
+../../../flutter/third_party/vulkan-deps/vulkan-headers/src/tests
+../../../flutter/third_party/vulkan-deps/vulkan-loader
+../../../flutter/third_party/vulkan-deps/vulkan-tools
+../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/README.chromium
+../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/.clang-format
+../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/.git
+../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/.gitattributes
+../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/.github
+../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/.gitignore
+../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/.reuse
+../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/BUILD.md
+../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/CMakeLists.txt
+../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/CODE_OF_CONDUCT.md
+../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/LICENSE.md
+../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/README.md
+../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/include/CMakeLists.txt
+../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/scripts/CMakeLists.txt
+../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/scripts/generate_source.py
+../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/scripts/generators/base_generator.py
+../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/scripts/generators/dispatch_table_generator.py
+../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/scripts/generators/enum_string_helper_generator.py
+../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/scripts/generators/format_utils_generator.py
+../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/scripts/generators/generator_utils.py
+../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/scripts/generators/struct_helper_generator.py
+../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/scripts/generators/vulkan_object.py
+../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/scripts/gn/DEPS
+../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/scripts/gn/gn.py
+../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/scripts/known_good.json
+../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/scripts/update_deps.py
+../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/src/CMakeLists.txt
+../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/src/layer/CMakeLists.txt
+../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/tests
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/README.chromium
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/.clang-format
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/.clang-tidy
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/.git
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/.gitattributes
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/.github
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/.gitignore
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/.mailmap
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/BUILD.md
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/CMakeLists.txt
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/CODE_OF_CONDUCT.md
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/CONTRIBUTING.md
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/README.md
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/docs
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/CMakeLists.txt
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_shaders/README.md
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/spirv/CMakeLists.txt
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/spirv/README.md
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/.clang-format
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/CMakeLists.txt
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/android.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/antialias_source.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/check_code_format.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/clang-format-diff.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/common_ci.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generate_source.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generate_spec_error_message.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generate_spirv.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/api_version_generator.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/base_generator.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/best_practices_generator.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/command_validation_generator.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/dispatch_table_helper_generator.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/dynamic_state_generator.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/enum_flag_bits_generator.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/error_location_helper_generator.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/extension_helper_generator.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/feature_requirements.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/function_pointers_generator.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/generator_utils.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/layer_chassis_dispatch_generator.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/layer_chassis_generator.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/layer_dispatch_table_generator.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/object_tracker_generator.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/object_types_generator.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/pnext_chain_extraction_generator.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/safe_struct_generator.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/spirv_grammar_generator.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/spirv_tool_commit_id_generator.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/spirv_validation_generator.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/state_tracker_helper_generator.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/stateless_validation_helper_generator.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/sync_validation_generator.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/thread_safety_generator.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/valid_enum_values_generator.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/valid_flag_values_generator.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/generators/vulkan_object.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/gn/DEPS
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/gn/commit_id.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/gn/generate_vulkan_layers_json.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/gn/gn.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/gn/remove_files.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/known_good.json
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/tests.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/update_deps.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/vk_validation_stats.py
+../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/tests
+../../../flutter/third_party/vulkan_memory_allocator/.git
+../../../flutter/third_party/vulkan_memory_allocator/.gitignore
+../../../flutter/third_party/vulkan_memory_allocator/.travis.yml
+../../../flutter/third_party/vulkan_memory_allocator/CHANGELOG.md
+../../../flutter/third_party/vulkan_memory_allocator/CMakeLists.txt
+../../../flutter/third_party/vulkan_memory_allocator/Doxyfile
+../../../flutter/third_party/vulkan_memory_allocator/README.md
+../../../flutter/third_party/vulkan_memory_allocator/bin
+../../../flutter/third_party/vulkan_memory_allocator/docs
+../../../flutter/third_party/vulkan_memory_allocator/media
+../../../flutter/third_party/vulkan_memory_allocator/src
+../../../flutter/third_party/vulkan_memory_allocator/tools
+../../../flutter/third_party/web_locale_keymap/CHANGELOG.md
+../../../flutter/third_party/web_locale_keymap/README.md
+../../../flutter/third_party/web_locale_keymap/pubspec.yaml
+../../../flutter/third_party/web_locale_keymap/test
+../../../flutter/third_party/web_test_fonts/pubspec.yaml
+../../../flutter/third_party/web_unicode/README.md
+../../../flutter/third_party/web_unicode/pubspec.yaml
+../../../flutter/third_party/wuffs/.git
+../../../flutter/third_party/wuffs/.github
+../../../flutter/third_party/wuffs/README.md
+../../../flutter/third_party/wuffs/docs
+../../../flutter/third_party/wuffs/release/c/README.md
+../../../flutter/third_party/wuffs/script
+../../../flutter/third_party/wuffs/sync.txt
+../../../flutter/third_party/yapf
+../../../flutter/tools
+../../../flutter/tools/licenses/.dart_tool
+../../../flutter/tools/licenses/.gitignore
+../../../flutter/tools/licenses/README.md
+../../../flutter/tools/licenses/analysis_options.yaml
+../../../flutter/tools/licenses/data
+../../../flutter/tools/licenses/lib/README
+../../../flutter/tools/licenses/pubspec.lock
+../../../flutter/tools/licenses/pubspec.yaml
+../../../flutter/tools/licenses/test
+../../../flutter/web_sdk
+../../../fuchsia/sdk/linux/.build-id
+../../../fuchsia/sdk/linux/.versions
+../../../fuchsia/sdk/linux/AUTHORS
+../../../fuchsia/sdk/linux/NOTICE.fuchsia
+../../../fuchsia/sdk/linux/PATENTS
+../../../fuchsia/sdk/linux/README.md
+../../../fuchsia/sdk/linux/arch/arm64/sysroot/dist/lib/asan/ld.so.1
+../../../fuchsia/sdk/linux/arch/arm64/sysroot/dist/lib/hwasan/ld.so.1
+../../../fuchsia/sdk/linux/arch/arm64/sysroot/dist/lib/ld.so.1
+../../../fuchsia/sdk/linux/arch/riscv64/sysroot/dist/lib/asan/ld.so.1
+../../../fuchsia/sdk/linux/arch/riscv64/sysroot/dist/lib/ld.so.1
+../../../fuchsia/sdk/linux/arch/x64/sysroot/dist/lib/asan/ld.so.1
+../../../fuchsia/sdk/linux/arch/x64/sysroot/dist/lib/ld.so.1
+../../../fuchsia/sdk/linux/bind/fuchsia.acpi/meta.json
+../../../fuchsia/sdk/linux/bind/fuchsia.adc/meta.json
+../../../fuchsia/sdk/linux/bind/fuchsia.amlogic.platform.a311d/meta.json
+../../../fuchsia/sdk/linux/bind/fuchsia.amlogic.platform.meson/meta.json
+../../../fuchsia/sdk/linux/bind/fuchsia.amlogic.platform/meta.json
+../../../fuchsia/sdk/linux/bind/fuchsia.arm.platform/meta.json
+../../../fuchsia/sdk/linux/bind/fuchsia.block/meta.json
+../../../fuchsia/sdk/linux/bind/fuchsia.broadcom.platform.sdio/meta.json
+../../../fuchsia/sdk/linux/bind/fuchsia.broadcom.platform/meta.json
+../../../fuchsia/sdk/linux/bind/fuchsia.clock/meta.json
+../../../fuchsia/sdk/linux/bind/fuchsia.designware.platform/meta.json
+../../../fuchsia/sdk/linux/bind/fuchsia.devicetree/meta.json
+../../../fuchsia/sdk/linux/bind/fuchsia.ethernet/meta.json
+../../../fuchsia/sdk/linux/bind/fuchsia.focaltech.platform/meta.json
+../../../fuchsia/sdk/linux/bind/fuchsia.google.platform/meta.json
+../../../fuchsia/sdk/linux/bind/fuchsia.gpio/meta.json
+../../../fuchsia/sdk/linux/bind/fuchsia.i2c/meta.json
+../../../fuchsia/sdk/linux/bind/fuchsia.khadas.platform/meta.json
+../../../fuchsia/sdk/linux/bind/fuchsia.nxp.platform/meta.json
+../../../fuchsia/sdk/linux/bind/fuchsia.pci/meta.json
+../../../fuchsia/sdk/linux/bind/fuchsia.platform/meta.json
+../../../fuchsia/sdk/linux/bind/fuchsia.power/meta.json
+../../../fuchsia/sdk/linux/bind/fuchsia.pwm/meta.json
+../../../fuchsia/sdk/linux/bind/fuchsia.realtek.platform/meta.json
+../../../fuchsia/sdk/linux/bind/fuchsia.register/meta.json
+../../../fuchsia/sdk/linux/bind/fuchsia.sdio/meta.json
+../../../fuchsia/sdk/linux/bind/fuchsia.serial/meta.json
+../../../fuchsia/sdk/linux/bind/fuchsia.sysmem/meta.json
+../../../fuchsia/sdk/linux/bind/fuchsia.test.platform/meta.json
+../../../fuchsia/sdk/linux/bind/fuchsia.test/meta.json
+../../../fuchsia/sdk/linux/bind/fuchsia.ti.platform/meta.json
+../../../fuchsia/sdk/linux/bind/fuchsia.usb.phy/meta.json
+../../../fuchsia/sdk/linux/bind/fuchsia.verisilicon.platform/meta.json
+../../../fuchsia/sdk/linux/bind/fuchsia/meta.json
+../../../fuchsia/sdk/linux/dart/sl4f/meta.json
+../../../fuchsia/sdk/linux/data/config/symbol_index/meta.json
+../../../fuchsia/sdk/linux/docs
+../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.gesture/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.semantics/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.tts/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.virtualkeyboard/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.audio.effects/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.auth.oldtokens/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.auth/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.a2dp/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.fastpair/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt2/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.hfp/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.le/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.sys/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.buildinfo.test/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.buildinfo/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.camera/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.camera2.hal/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.camera2/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.camera3/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.castauth/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.castconfig/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.castremotecontrol/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.castsetup/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.castsysteminfo/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.castwindow/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.component.config/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.component.resolution/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.component.runner/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.component.sandbox/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.component.test/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.component.types/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.component/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.data/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.debugdata/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.developer.tiles/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.device.fs/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics.types/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.driver.development/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.driver.framework/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.driver.legacy/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.driver.registrar/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.driver.test/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.element/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.factory.wlan/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.factory/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.fonts/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.gpu.agis/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.gpu.magma/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.adc/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.i2c/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.light/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.platform.device/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.power.sensor/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.power.statecontrol/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.power/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.radar/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.rtc/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.temperature/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.trippoint/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.hwinfo/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.images/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.images2/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.input.virtualkeyboard/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.input/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.inspect/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.intl/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.io/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.ldsvc/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.legacymetrics/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.lightsensor/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.location.namedplace/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.location.position/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.location.sensor/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.location/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.logger/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.bootstrap/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.device/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.thread/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.math/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.media.audio/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.media.drm/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.media.playback/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.media.sessions2/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.media.sounds/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.media.target/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.media/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.mediacodec/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.mediastreams/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.mem/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.memorypressure/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.metrics/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.migration/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.modular/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.net.http/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.net.interfaces/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.net.mdns/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.net.reachability/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.net.routes/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.net.stackmigrationdeprecated/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.net/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.power.clientlevel/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.power.profile/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.power.systemmode/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.process.lifecycle/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.process/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.recovery.ui/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.recovery/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.scenic.scheduling/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.session/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.settings.policy/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.settings/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.sys.test/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.sys/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.sysinfo/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem2/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.test/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.thermal/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.tracing.perfetto/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.tracing.provider/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.tracing/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.ui.activity.control/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.ui.activity/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.ui.app/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.ui.brightness/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.ui.composition/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.ui.display.singleton/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input3/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.ui.observation.geometry/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointer/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointerinjector/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.ui.policy/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.ui.scenic/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.ui.test.input/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.ui.test.scene/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.ui.types/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.ultrasound/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.unknown/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.update.channel/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.update.channelcontrol/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.update.config/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.update/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.url/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.version/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.weave/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.web/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.common/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.ieee80211/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.phyimpl/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.policy/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.product.deprecatedclient/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.product.deprecatedconfiguration/meta.json
+../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.softmac/meta.json
+../../../fuchsia/sdk/linux/fidl/zx/meta.json
+../../../fuchsia/sdk/linux/meta
+../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/dist/lib/asan/ld.so.1
+../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/dist/lib/hwasan/ld.so.1
+../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/dist/lib/ld.so.1
+../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/dist/lib/asan/ld.so.1
+../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/dist/lib/hwasan/ld.so.1
+../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/dist/lib/ld.so.1
+../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/dist/lib/asan/ld.so.1
+../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/dist/lib/hwasan/ld.so.1
+../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/dist/lib/ld.so.1
+../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/dist/lib/asan/ld.so.1
+../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/dist/lib/hwasan/ld.so.1
+../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/dist/lib/ld.so.1
+../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/dist/lib/asan/ld.so.1
+../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/dist/lib/hwasan/ld.so.1
+../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/dist/lib/ld.so.1
+../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/dist/lib/asan/ld.so.1
+../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/dist/lib/hwasan/ld.so.1
+../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/dist/lib/ld.so.1
+../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/dist/lib/asan/ld.so.1
+../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/dist/lib/hwasan/ld.so.1
+../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/dist/lib/ld.so.1
+../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/dist/lib/asan/ld.so.1
+../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/dist/lib/ld.so.1
+../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/dist/lib/asan/ld.so.1
+../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/dist/lib/ld.so.1
+../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/dist/lib/asan/ld.so.1
+../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/dist/lib/ld.so.1
+../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/dist/lib/asan/ld.so.1
+../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/dist/lib/ld.so.1
+../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/dist/lib/asan/ld.so.1
+../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/dist/lib/ld.so.1
+../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/dist/lib/asan/ld.so.1
+../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/dist/lib/ld.so.1
+../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/dist/lib/asan/ld.so.1
+../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/dist/lib/ld.so.1
+../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/dist/lib/asan/ld.so.1
+../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/dist/lib/ld.so.1
+../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/dist/lib/asan/ld.so.1
+../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/dist/lib/ld.so.1
+../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/dist/lib/asan/ld.so.1
+../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/dist/lib/ld.so.1
+../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/dist/lib/asan/ld.so.1
+../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/dist/lib/ld.so.1
+../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/dist/lib/asan/ld.so.1
+../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/dist/lib/ld.so.1
+../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/dist/lib/asan/ld.so.1
+../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/dist/lib/ld.so.1
+../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/dist/lib/asan/ld.so.1
+../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/dist/lib/ld.so.1
+../../../fuchsia/sdk/linux/packages/blobs
+../../../fuchsia/sdk/linux/packages/heapdump-collector/meta.json
+../../../fuchsia/sdk/linux/packages/magma_conformance_tests/meta.json
+../../../fuchsia/sdk/linux/packages/realm_builder_server/meta.json
+../../../fuchsia/sdk/linux/packages/vkreadback_test/meta.json
+../../../fuchsia/sdk/linux/pkg/async-cpp/meta.json
+../../../fuchsia/sdk/linux/pkg/async-default/meta.json
+../../../fuchsia/sdk/linux/pkg/async-loop-cpp/meta.json
+../../../fuchsia/sdk/linux/pkg/async-loop-default/meta.json
+../../../fuchsia/sdk/linux/pkg/async-loop-testing/include/lib/async-loop/testing
+../../../fuchsia/sdk/linux/pkg/async-loop-testing/meta.json
+../../../fuchsia/sdk/linux/pkg/async-loop/meta.json
+../../../fuchsia/sdk/linux/pkg/async-testing/meta.json
+../../../fuchsia/sdk/linux/pkg/async/meta.json
+../../../fuchsia/sdk/linux/pkg/async_patterns_cpp/meta.json
+../../../fuchsia/sdk/linux/pkg/async_patterns_testing_cpp/include/lib/async_patterns/testing
+../../../fuchsia/sdk/linux/pkg/async_patterns_testing_cpp/meta.json
+../../../fuchsia/sdk/linux/pkg/backend_fuchsia_globals/meta.json
+../../../fuchsia/sdk/linux/pkg/component_incoming_cpp/meta.json
+../../../fuchsia/sdk/linux/pkg/component_outgoing_cpp/meta.json
+../../../fuchsia/sdk/linux/pkg/driver_component_cpp/meta.json
+../../../fuchsia/sdk/linux/pkg/driver_devfs_cpp/meta.json
+../../../fuchsia/sdk/linux/pkg/driver_incoming_cpp/meta.json
+../../../fuchsia/sdk/linux/pkg/driver_logging_cpp/meta.json
+../../../fuchsia/sdk/linux/pkg/driver_outgoing_cpp/meta.json
+../../../fuchsia/sdk/linux/pkg/driver_runtime/meta.json
+../../../fuchsia/sdk/linux/pkg/driver_runtime_cpp/meta.json
+../../../fuchsia/sdk/linux/pkg/driver_runtime_env/meta.json
+../../../fuchsia/sdk/linux/pkg/driver_runtime_env_cpp/meta.json
+../../../fuchsia/sdk/linux/pkg/driver_runtime_shared_lib/meta.json
+../../../fuchsia/sdk/linux/pkg/driver_runtime_testing/meta.json
+../../../fuchsia/sdk/linux/pkg/driver_runtime_testing_cpp/include/lib/driver/runtime/testing
+../../../fuchsia/sdk/linux/pkg/driver_runtime_testing_cpp/meta.json
+../../../fuchsia/sdk/linux/pkg/driver_symbols/meta.json
+../../../fuchsia/sdk/linux/pkg/driver_testing_cpp/include/lib/driver/testing
+../../../fuchsia/sdk/linux/pkg/driver_testing_cpp/meta.json
+../../../fuchsia/sdk/linux/pkg/fdio/meta.json
+../../../fuchsia/sdk/linux/pkg/fidl/meta.json
+../../../fuchsia/sdk/linux/pkg/fidl_base/meta.json
+../../../fuchsia/sdk/linux/pkg/fidl_cpp/meta.json
+../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/meta.json
+../../../fuchsia/sdk/linux/pkg/fidl_cpp_base_v2/meta.json
+../../../fuchsia/sdk/linux/pkg/fidl_cpp_hlcpp_conversion/meta.json
+../../../fuchsia/sdk/linux/pkg/fidl_cpp_natural_ostream/meta.json
+../../../fuchsia/sdk/linux/pkg/fidl_cpp_sync/meta.json
+../../../fuchsia/sdk/linux/pkg/fidl_cpp_v2/meta.json
+../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/meta.json
+../../../fuchsia/sdk/linux/pkg/fidl_driver/meta.json
+../../../fuchsia/sdk/linux/pkg/fidl_driver_natural/meta.json
+../../../fuchsia/sdk/linux/pkg/fidl_driver_transport/meta.json
+../../../fuchsia/sdk/linux/pkg/fit-promise/meta.json
+../../../fuchsia/sdk/linux/pkg/fit/meta.json
+../../../fuchsia/sdk/linux/pkg/heapdump_instrumentation/meta.json
+../../../fuchsia/sdk/linux/pkg/images_cpp/meta.json
+../../../fuchsia/sdk/linux/pkg/input_report_reader/meta.json
+../../../fuchsia/sdk/linux/pkg/inspect/meta.json
+../../../fuchsia/sdk/linux/pkg/inspect_component_cpp/meta.json
+../../../fuchsia/sdk/linux/pkg/inspect_service_cpp/meta.json
+../../../fuchsia/sdk/linux/pkg/magma_client/meta.json
+../../../fuchsia/sdk/linux/pkg/magma_common/meta.json
+../../../fuchsia/sdk/linux/pkg/media_cpp/meta.json
+../../../fuchsia/sdk/linux/pkg/media_cpp_no_converters/meta.json
+../../../fuchsia/sdk/linux/pkg/scenic_cpp/meta.json
+../../../fuchsia/sdk/linux/pkg/scenic_cpp_testing/include/lib/ui/scenic/cpp/testing
+../../../fuchsia/sdk/linux/pkg/scenic_cpp_testing/meta.json
+../../../fuchsia/sdk/linux/pkg/stdcompat/meta.json
+../../../fuchsia/sdk/linux/pkg/svc/meta.json
+../../../fuchsia/sdk/linux/pkg/sync/meta.json
+../../../fuchsia/sdk/linux/pkg/sync_cpp/meta.json
+../../../fuchsia/sdk/linux/pkg/sys/testing
+../../../fuchsia/sdk/linux/pkg/sys_component_cpp_testing/include/lib/sys/component/cpp/testing
+../../../fuchsia/sdk/linux/pkg/sys_component_cpp_testing/meta.json
+../../../fuchsia/sdk/linux/pkg/sys_cpp/meta.json
+../../../fuchsia/sdk/linux/pkg/sys_cpp_testing/include/lib/sys/cpp/testing
+../../../fuchsia/sdk/linux/pkg/sys_cpp_testing/meta.json
+../../../fuchsia/sdk/linux/pkg/sys_inspect_cpp/meta.json
+../../../fuchsia/sdk/linux/pkg/sys_service_cpp/meta.json
+../../../fuchsia/sdk/linux/pkg/syslog/meta.json
+../../../fuchsia/sdk/linux/pkg/syslog_structured_backend/meta.json
+../../../fuchsia/sdk/linux/pkg/sysroot/meta.json
+../../../fuchsia/sdk/linux/pkg/trace-engine-headersonly/meta.json
+../../../fuchsia/sdk/linux/pkg/trace-engine/meta.json
+../../../fuchsia/sdk/linux/pkg/trace-headersonly/meta.json
+../../../fuchsia/sdk/linux/pkg/trace-provider-so/meta.json
+../../../fuchsia/sdk/linux/pkg/trace-vthread-headersonly/meta.json
+../../../fuchsia/sdk/linux/pkg/trace-vthread/meta.json
+../../../fuchsia/sdk/linux/pkg/trace/meta.json
+../../../fuchsia/sdk/linux/pkg/utf-utils/meta.json
+../../../fuchsia/sdk/linux/pkg/vfs_cpp/meta.json
+../../../fuchsia/sdk/linux/pkg/vfs_internal/meta.json
+../../../fuchsia/sdk/linux/pkg/virtgralloc_headers/meta.json
+../../../fuchsia/sdk/linux/pkg/vulkan/meta.json
+../../../fuchsia/sdk/linux/pkg/vulkan_layers/meta.json
+../../../fuchsia/sdk/linux/pkg/zx/meta.json
+../../../fuchsia/sdk/linux/python/rtc_conformance_test/meta.json
+../../../fuchsia/sdk/linux/tools
+../../../fuchsia/sdk/linux/version_history.json
+../../../out
+../../../third_party/android_embedding_dependencies
+../../../third_party/android_tools
+../../../third_party/dart
+../../../third_party/dart/.clang-format
+../../../third_party/dart/.dart_tool
+../../../third_party/dart/.git
+../../../third_party/dart/.gitattributes
+../../../third_party/dart/.gitconfig
+../../../third_party/dart/.github
+../../../third_party/dart/.gitignore
+../../../third_party/dart/.gn
+../../../third_party/dart/.mailmap
+../../../third_party/dart/.style.yapf
+../../../third_party/dart/AUTHORS
+../../../third_party/dart/CHANGELOG.md
+../../../third_party/dart/CONTRIBUTING.md
+../../../third_party/dart/DEPS
+../../../third_party/dart/OWNERS
+../../../third_party/dart/PATENT_GRANT
+../../../third_party/dart/PRESUBMIT.py
+../../../third_party/dart/README.dart-sdk
+../../../third_party/dart/README.md
+../../../third_party/dart/SECURITY.md
+../../../third_party/dart/WATCHLISTS
+../../../third_party/dart/benchmarks
+../../../third_party/dart/build
+../../../third_party/dart/codereview.settings
+../../../third_party/dart/docs
+../../../third_party/dart/pkg
+../../../third_party/dart/runtime/.clang-tidy
+../../../third_party/dart/runtime/.gitignore
+../../../third_party/dart/runtime/CPPLINT.cfg
+../../../third_party/dart/runtime/OWNERS
+../../../third_party/dart/runtime/PRESUBMIT.py
+../../../third_party/dart/runtime/bin/abstract_socket_test.cc
+../../../third_party/dart/runtime/bin/crypto_test.cc
+../../../third_party/dart/runtime/bin/directory_test.cc
+../../../third_party/dart/runtime/bin/entrypoints_verification_test.cc
+../../../third_party/dart/runtime/bin/eventhandler_test.cc
+../../../third_party/dart/runtime/bin/ffi_test
+../../../third_party/dart/runtime/bin/file_test.cc
+../../../third_party/dart/runtime/bin/hashmap_test.cc
+../../../third_party/dart/runtime/bin/priority_heap_test.cc
+../../../third_party/dart/runtime/bin/process_test.cc
+../../../third_party/dart/runtime/bin/secure_socket_utils_test.cc
+../../../third_party/dart/runtime/bin/snapshot_utils_test.cc
+../../../third_party/dart/runtime/codereview.settings
+../../../third_party/dart/runtime/docs
+../../../third_party/dart/runtime/observatory/.gitignore
+../../../third_party/dart/runtime/observatory/HACKING.md
+../../../third_party/dart/runtime/observatory/analysis_options.yaml
+../../../third_party/dart/runtime/observatory/lib/src/elements/css/shared.css
+../../../third_party/dart/runtime/observatory/pubspec.yaml
+../../../third_party/dart/runtime/observatory/tests
+../../../third_party/dart/runtime/observatory/update_sources.py
+../../../third_party/dart/runtime/observatory/web/third_party/README.md
+../../../third_party/dart/runtime/tests
+../../../third_party/dart/runtime/tools/.gitignore
+../../../third_party/dart/runtime/tools/android_finder.py
+../../../third_party/dart/runtime/tools/benchmark.py
+../../../third_party/dart/runtime/tools/bin_to_assembly.py
+../../../third_party/dart/runtime/tools/bin_to_coff.py
+../../../third_party/dart/runtime/tools/compiler_layering_check.py
+../../../third_party/dart/runtime/tools/create_archive.py
+../../../third_party/dart/runtime/tools/create_snapshot_bin.py
+../../../third_party/dart/runtime/tools/create_snapshot_file.py
+../../../third_party/dart/runtime/tools/create_string_literal.py
+../../../third_party/dart/runtime/tools/dart_codesign.py
+../../../third_party/dart/runtime/tools/dart_profiler_symbols.py
+../../../third_party/dart/runtime/tools/dartfuzz/README.md
+../../../third_party/dart/runtime/tools/dartfuzz/README_minimize.md
+../../../third_party/dart/runtime/tools/dartfuzz/analysis_options.yaml
+../../../third_party/dart/runtime/tools/dartfuzz/collect_data.py
+../../../third_party/dart/runtime/tools/dartfuzz/dartfuzz_test.dart
+../../../third_party/dart/runtime/tools/dartfuzz/minimize.py
+../../../third_party/dart/runtime/tools/dartfuzz/pubspec.yaml
+../../../third_party/dart/runtime/tools/dartfuzz/update_spreadsheet.py
+../../../third_party/dart/runtime/tools/embedder_layering_check.py
+../../../third_party/dart/runtime/tools/entitlements/README.md
+../../../third_party/dart/runtime/tools/gen_library_src_paths.py
+../../../third_party/dart/runtime/tools/graphexplorer/graphexplorer.css
+../../../third_party/dart/runtime/tools/heapsnapshot/CHANGELOG.md
+../../../third_party/dart/runtime/tools/heapsnapshot/README.md
+../../../third_party/dart/runtime/tools/heapsnapshot/pubspec.yaml
+../../../third_party/dart/runtime/tools/heapsnapshot/test
+../../../third_party/dart/runtime/tools/utils.py
+../../../third_party/dart/runtime/tools/valgrind.py
+../../../third_party/dart/runtime/tools/wiki/README.md
+../../../third_party/dart/runtime/tools/wiki/build/admonitions.py
+../../../third_party/dart/runtime/tools/wiki/build/build.py
+../../../third_party/dart/runtime/tools/wiki/build/cpp_indexer.py
+../../../third_party/dart/runtime/tools/wiki/build/xrefs.py
+../../../third_party/dart/runtime/vm/allocation_test.cc
+../../../third_party/dart/runtime/vm/ama_test.cc
+../../../third_party/dart/runtime/vm/assert_test.cc
+../../../third_party/dart/runtime/vm/atomic_test.cc
+../../../third_party/dart/runtime/vm/base64_test.cc
+../../../third_party/dart/runtime/vm/benchmark_test.cc
+../../../third_party/dart/runtime/vm/benchmark_test.h
+../../../third_party/dart/runtime/vm/bit_set_test.cc
+../../../third_party/dart/runtime/vm/bit_vector_test.cc
+../../../third_party/dart/runtime/vm/bitfield_test.cc
+../../../third_party/dart/runtime/vm/bitmap_test.cc
+../../../third_party/dart/runtime/vm/boolfield_test.cc
+../../../third_party/dart/runtime/vm/catch_entry_moves_test.cc
+../../../third_party/dart/runtime/vm/class_finalizer_test.cc
+../../../third_party/dart/runtime/vm/code_descriptors_test.cc
+../../../third_party/dart/runtime/vm/code_patcher_arm64_test.cc
+../../../third_party/dart/runtime/vm/code_patcher_arm_test.cc
+../../../third_party/dart/runtime/vm/code_patcher_ia32_test.cc
+../../../third_party/dart/runtime/vm/code_patcher_riscv_test.cc
+../../../third_party/dart/runtime/vm/code_patcher_x64_test.cc
+../../../third_party/dart/runtime/vm/compiler/README.md
+../../../third_party/dart/runtime/vm/compiler/asm_intrinsifier_test.cc
+../../../third_party/dart/runtime/vm/compiler/assembler/assembler_arm64_test.cc
+../../../third_party/dart/runtime/vm/compiler/assembler/assembler_arm_test.cc
+../../../third_party/dart/runtime/vm/compiler/assembler/assembler_ia32_test.cc
+../../../third_party/dart/runtime/vm/compiler/assembler/assembler_riscv_test.cc
+../../../third_party/dart/runtime/vm/compiler/assembler/assembler_test.cc
+../../../third_party/dart/runtime/vm/compiler/assembler/assembler_test.h
+../../../third_party/dart/runtime/vm/compiler/assembler/assembler_x64_test.cc
+../../../third_party/dart/runtime/vm/compiler/assembler/disassembler_test.cc
+../../../third_party/dart/runtime/vm/compiler/backend/bce_test.cc
+../../../third_party/dart/runtime/vm/compiler/backend/constant_propagator_test.cc
+../../../third_party/dart/runtime/vm/compiler/backend/flow_graph_test.cc
+../../../third_party/dart/runtime/vm/compiler/backend/il_test.cc
+../../../third_party/dart/runtime/vm/compiler/backend/inliner_test.cc
+../../../third_party/dart/runtime/vm/compiler/backend/locations_helpers_test.cc
+../../../third_party/dart/runtime/vm/compiler/backend/loops_test.cc
+../../../third_party/dart/runtime/vm/compiler/backend/memory_copy_test.cc
+../../../third_party/dart/runtime/vm/compiler/backend/range_analysis_test.cc
+../../../third_party/dart/runtime/vm/compiler/backend/reachability_fence_test.cc
+../../../third_party/dart/runtime/vm/compiler/backend/redundancy_elimination_test.cc
+../../../third_party/dart/runtime/vm/compiler/backend/slot_test.cc
+../../../third_party/dart/runtime/vm/compiler/backend/type_propagator_test.cc
+../../../third_party/dart/runtime/vm/compiler/backend/typed_data_aot_test.cc
+../../../third_party/dart/runtime/vm/compiler/backend/yield_position_test.cc
+../../../third_party/dart/runtime/vm/compiler/cha_test.cc
+../../../third_party/dart/runtime/vm/compiler/ffi/README.md
+../../../third_party/dart/runtime/vm/compiler/ffi/native_calling_convention_test.cc
+../../../third_party/dart/runtime/vm/compiler/ffi/native_location_test.cc
+../../../third_party/dart/runtime/vm/compiler/ffi/native_type_test.cc
+../../../third_party/dart/runtime/vm/compiler/ffi/native_type_vm_test.cc
+../../../third_party/dart/runtime/vm/compiler/ffi/unit_test.cc
+../../../third_party/dart/runtime/vm/compiler/ffi/unit_test.h
+../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests
+../../../third_party/dart/runtime/vm/compiler/frontend/kernel_binary_flowgraph_test.cc
+../../../third_party/dart/runtime/vm/compiler/relocation_test.cc
+../../../third_party/dart/runtime/vm/compiler/write_barrier_elimination_test.cc
+../../../third_party/dart/runtime/vm/compiler_test.cc
+../../../third_party/dart/runtime/vm/cpu_test.cc
+../../../third_party/dart/runtime/vm/cpuinfo_test.cc
+../../../third_party/dart/runtime/vm/custom_isolate_test.cc
+../../../third_party/dart/runtime/vm/dart_api_impl_test.cc
+../../../third_party/dart/runtime/vm/datastream_test.cc
+../../../third_party/dart/runtime/vm/debugger_api_impl_test.cc
+../../../third_party/dart/runtime/vm/debugger_api_impl_test.h
+../../../third_party/dart/runtime/vm/exceptions_test.cc
+../../../third_party/dart/runtime/vm/ffi_callback_metadata_test.cc
+../../../third_party/dart/runtime/vm/fixed_cache_test.cc
+../../../third_party/dart/runtime/vm/flags_test.cc
+../../../third_party/dart/runtime/vm/growable_array_test.cc
+../../../third_party/dart/runtime/vm/guard_field_test.cc
+../../../third_party/dart/runtime/vm/handles_test.cc
+../../../third_party/dart/runtime/vm/hash_map_test.cc
+../../../third_party/dart/runtime/vm/hash_table_test.cc
+../../../third_party/dart/runtime/vm/heap/become_test.cc
+../../../third_party/dart/runtime/vm/heap/freelist_test.cc
+../../../third_party/dart/runtime/vm/heap/heap_test.cc
+../../../third_party/dart/runtime/vm/heap/safepoint_test.cc
+../../../third_party/dart/runtime/vm/heap/weak_table_test.cc
+../../../third_party/dart/runtime/vm/instructions_arm64_test.cc
+../../../third_party/dart/runtime/vm/instructions_arm_test.cc
+../../../third_party/dart/runtime/vm/instructions_ia32_test.cc
+../../../third_party/dart/runtime/vm/instructions_riscv_test.cc
+../../../third_party/dart/runtime/vm/instructions_x64_test.cc
+../../../third_party/dart/runtime/vm/intrusive_dlist_test.cc
+../../../third_party/dart/runtime/vm/isolate_reload_test.cc
+../../../third_party/dart/runtime/vm/isolate_test.cc
+../../../third_party/dart/runtime/vm/json_test.cc
+../../../third_party/dart/runtime/vm/kernel_test.cc
+../../../third_party/dart/runtime/vm/libfuzzer/README.md
+../../../third_party/dart/runtime/vm/log_test.cc
+../../../third_party/dart/runtime/vm/longjump_test.cc
+../../../third_party/dart/runtime/vm/memory_region_test.cc
+../../../third_party/dart/runtime/vm/message_handler_test.cc
+../../../third_party/dart/runtime/vm/message_test.cc
+../../../third_party/dart/runtime/vm/metrics_test.cc
+../../../third_party/dart/runtime/vm/mixin_test.cc
+../../../third_party/dart/runtime/vm/native_entry_test.cc
+../../../third_party/dart/runtime/vm/native_entry_test.h
+../../../third_party/dart/runtime/vm/object_arm64_test.cc
+../../../third_party/dart/runtime/vm/object_arm_test.cc
+../../../third_party/dart/runtime/vm/object_graph_test.cc
+../../../third_party/dart/runtime/vm/object_ia32_test.cc
+../../../third_party/dart/runtime/vm/object_id_ring_test.cc
+../../../third_party/dart/runtime/vm/object_riscv_test.cc
+../../../third_party/dart/runtime/vm/object_store_test.cc
+../../../third_party/dart/runtime/vm/object_test.cc
+../../../third_party/dart/runtime/vm/object_x64_test.cc
+../../../third_party/dart/runtime/vm/os_test.cc
+../../../third_party/dart/runtime/vm/port_test.cc
+../../../third_party/dart/runtime/vm/profiler_test.cc
+../../../third_party/dart/runtime/vm/protos/.gitignore
+../../../third_party/dart/runtime/vm/regexp_test.cc
+../../../third_party/dart/runtime/vm/ring_buffer_test.cc
+../../../third_party/dart/runtime/vm/scopes_test.cc
+../../../third_party/dart/runtime/vm/service
+../../../third_party/dart/runtime/vm/service_test.cc
+../../../third_party/dart/runtime/vm/snapshot_test.cc
+../../../third_party/dart/runtime/vm/source_report_test.cc
+../../../third_party/dart/runtime/vm/stack_frame_test.cc
+../../../third_party/dart/runtime/vm/stub_code_arm64_test.cc
+../../../third_party/dart/runtime/vm/stub_code_arm_test.cc
+../../../third_party/dart/runtime/vm/stub_code_ia32_test.cc
+../../../third_party/dart/runtime/vm/stub_code_riscv_test.cc
+../../../third_party/dart/runtime/vm/stub_code_test.cc
+../../../third_party/dart/runtime/vm/stub_code_x64_test.cc
+../../../third_party/dart/runtime/vm/thread_barrier_test.cc
+../../../third_party/dart/runtime/vm/thread_pool_test.cc
+../../../third_party/dart/runtime/vm/thread_test.cc
+../../../third_party/dart/runtime/vm/timeline_test.cc
+../../../third_party/dart/runtime/vm/type_testing_stubs_test.cc
+../../../third_party/dart/runtime/vm/unicode_test.cc
+../../../third_party/dart/runtime/vm/unit_test.cc
+../../../third_party/dart/runtime/vm/unit_test.h
+../../../third_party/dart/runtime/vm/uri_test.cc
+../../../third_party/dart/runtime/vm/utils_test.cc
+../../../third_party/dart/runtime/vm/virtual_memory_test.cc
+../../../third_party/dart/runtime/vm/zone_test.cc
+../../../third_party/dart/samples
+../../../third_party/dart/sdk/.gitignore
+../../../third_party/dart/sdk/OWNERS
+../../../third_party/dart/sdk/api_readme.md
+../../../third_party/dart/sdk/lib/PRESUBMIT.py
+../../../third_party/dart/sdk/lib/_internal/allowed_experiments.json
+../../../third_party/dart/sdk/lib/_internal/fix_data.yaml
+../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/OWNERS
+../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/preambles/README
+../../../third_party/dart/sdk/lib/_internal/js_runtime/.packages
+../../../third_party/dart/sdk/lib/_internal/js_runtime/OWNERS
+../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/preambles/README
+../../../third_party/dart/sdk/lib/_internal/js_runtime/pubspec.yaml
+../../../third_party/dart/sdk/lib/_internal/sdk_library_metadata/pubspec.yaml
+../../../third_party/dart/sdk/lib/_internal/vm/OWNERS
+../../../third_party/dart/sdk/lib/_internal/wasm/OWNERS
+../../../third_party/dart/sdk/lib/_wasm/OWNERS
+../../../third_party/dart/sdk/lib/html/doc
+../../../third_party/dart/sdk/lib/libraries.json
+../../../third_party/dart/sdk/lib/libraries.yaml
+../../../third_party/dart/sdk/lib/svg/dart2js
+../../../third_party/dart/sdk/lib/vmservice_libraries.json
+../../../third_party/dart/sdk/lib/vmservice_libraries.yaml
+../../../third_party/dart/sdk/version
+../../../third_party/dart/sdk_packages.yaml
+../../../third_party/dart/tests
+../../../third_party/dart/third_party/.gitignore
+../../../third_party/dart/third_party/OWNERS
+../../../third_party/dart/third_party/binary_size
+../../../third_party/dart/third_party/binaryen
+../../../third_party/dart/third_party/clang.tar.gz.sha1
+../../../third_party/dart/third_party/cpu_features/OWNERS
+../../../third_party/dart/third_party/cpu_features/README.chromium
+../../../third_party/dart/third_party/d3
+../../../third_party/dart/third_party/d8
+../../../third_party/dart/third_party/devtools
+../../../third_party/dart/third_party/double-conversion/.gitignore
+../../../third_party/dart/third_party/double-conversion/AUTHORS
+../../../third_party/dart/third_party/double-conversion/Changelog
+../../../third_party/dart/third_party/double-conversion/OWNERS
+../../../third_party/dart/third_party/double-conversion/README.dart
+../../../third_party/dart/third_party/double-conversion/README.md
+../../../third_party/dart/third_party/fallback_root_certificates/OWNERS
+../../../third_party/dart/third_party/fallback_root_certificates/README.google
+../../../third_party/dart/third_party/fallback_root_certificates/certdata.pem
+../../../third_party/dart/third_party/fallback_root_certificates/certdata.txt
+../../../third_party/dart/third_party/firefox_jsshell
+../../../third_party/dart/third_party/jsc/README.google
+../../../third_party/dart/third_party/mdn/browser-compat-data/README.google
+../../../third_party/dart/third_party/pkg
+../../../third_party/dart/third_party/requirejs
+../../../third_party/dart/tools
+../../../third_party/dart/utils/OWNERS
+../../../third_party/dart/utils/compiler/.gitignore
+../../../third_party/dart/utils/dartanalyzer/.gitignore
+../../../third_party/gradle
+../../../third_party/java
+../../../third_party/libcxx/.clang-format
+../../../third_party/libcxx/.clang-tidy
+../../../third_party/libcxx/.git
+../../../third_party/libcxx/.gitignore
+../../../third_party/libcxx/CMakeLists.txt
+../../../third_party/libcxx/CREDITS.TXT
+../../../third_party/libcxx/TODO.TXT
+../../../third_party/libcxx/appveyor-reqs-install.cmd
+../../../third_party/libcxx/appveyor.yml
+../../../third_party/libcxx/benchmarks
+../../../third_party/libcxx/cmake
+../../../third_party/libcxx/docs
+../../../third_party/libcxx/include/CMakeLists.txt
+../../../third_party/libcxx/include/version
+../../../third_party/libcxx/lib/abi/CHANGELOG.TXT
+../../../third_party/libcxx/lib/abi/CMakeLists.txt
+../../../third_party/libcxx/lib/abi/README.TXT
+../../../third_party/libcxx/src/CMakeLists.txt
+../../../third_party/libcxx/src/ryu/README.txt
+../../../third_party/libcxx/src/support/solaris
+../../../third_party/libcxx/test
+../../../third_party/libcxx/utils
+../../../third_party/libcxxabi/.clang-format
+../../../third_party/libcxxabi/.git
+../../../third_party/libcxxabi/.gitignore
+../../../third_party/libcxxabi/CMakeLists.txt
+../../../third_party/libcxxabi/CREDITS.TXT
+../../../third_party/libcxxabi/cmake
+../../../third_party/libcxxabi/fuzz/CMakeLists.txt
+../../../third_party/libcxxabi/include/CMakeLists.txt
+../../../third_party/libcxxabi/src/CMakeLists.txt
+../../../third_party/libcxxabi/src/demangle/.clang-format
+../../../third_party/libcxxabi/src/demangle/README.txt
+../../../third_party/libcxxabi/test
+../../../third_party/libcxxabi/www
+../../../third_party/web_dependencies/canvaskit
+../../../third_party/zlib/.git
+../../../third_party/zlib/CMakeLists.txt
+../../../third_party/zlib/DIR_METADATA
+../../../third_party/zlib/OWNERS
+../../../third_party/zlib/README.chromium
+../../../third_party/zlib/contrib/bench/OWNERS
+../../../third_party/zlib/contrib/minizip/Makefile
+../../../third_party/zlib/contrib/minizip/README.chromium
+../../../third_party/zlib/contrib/minizip/miniunz.c
+../../../third_party/zlib/contrib/minizip/minizip.c
+../../../third_party/zlib/contrib/minizip/minizip.md
+../../../third_party/zlib/contrib/tests
+../../../third_party/zlib/google/DEPS
+../../../third_party/zlib/google/OWNERS
+../../../third_party/zlib/google/compression_utils_unittest.cc
+../../../third_party/zlib/google/test
+../../../third_party/zlib/google/zip_reader_unittest.cc
+../../../third_party/zlib/google/zip_unittest.cc
+../../../third_party/zlib/patches/README
+../../../third_party/zlib/zlib.3
+../../../tools
diff --git a/ci/licenses_golden/licenses_dart b/ci/licenses_golden/licenses_dart
new file mode 100644
index 0000000000000000000000000000000000000000..ece337df138dcb8d35ce7e769724d89fa2767cf0
--- /dev/null
+++ b/ci/licenses_golden/licenses_dart
@@ -0,0 +1,4745 @@
+Signature: 4f1220293023cdec5a6af5bd69bcb0ab
+
+====================================================================================================
+LIBRARY: dart
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/dart/runtime/vm/protos/perfetto/common/builtin_clock.proto
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/dart/runtime/vm/protos/perfetto/trace/clock_snapshot.proto
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/dart/runtime/vm/protos/perfetto/trace/interned_data/interned_data.proto
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/dart/runtime/vm/protos/perfetto/trace/profiling/profile_common.proto
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/dart/runtime/vm/protos/perfetto/trace/profiling/profile_packet.proto
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/dart/runtime/vm/protos/perfetto/trace/trace.proto
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/dart/runtime/vm/protos/perfetto/trace/trace_packet.proto
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/dart/runtime/vm/protos/perfetto/trace/track_event/debug_annotation.proto
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/dart/runtime/vm/protos/perfetto/trace/track_event/process_descriptor.proto
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/dart/runtime/vm/protos/perfetto/trace/track_event/thread_descriptor.proto
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/dart/runtime/vm/protos/perfetto/trace/track_event/track_descriptor.proto
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../third_party/dart/runtime/vm/protos/perfetto/trace/track_event/track_event.proto
+TYPE: LicenseType.apache
+FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/common/builtin_clock.proto
+FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/clock_snapshot.proto
+FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/interned_data/interned_data.proto
+FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/profiling/profile_common.proto
+FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/profiling/profile_packet.proto
+FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/trace.proto
+FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/trace_packet.proto
+FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/track_event/debug_annotation.proto
+FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/track_event/process_descriptor.proto
+FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/track_event/thread_descriptor.proto
+FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/track_event/track_descriptor.proto
+FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/track_event/track_event.proto
+----------------------------------------------------------------------------------------------------
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: dart
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/bigint_patch.dart
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/bigint_patch.dart
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm_shared/lib/bigint_patch.dart
+TYPE: LicenseType.mit
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/bigint_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/bigint_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm_shared/lib/bigint_patch.dart
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2003-2005  Tom Wu
+Copyright (c) 2012 Adam Singer (adam@solvr.io)
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+IN NO EVENT SHALL TOM WU BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER
+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF
+THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT
+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+In addition, the following condition applies:
+
+All redistributions must retain an intact copy of this copyright notice
+and disclaimer.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: dart
+ORIGIN: ../../../third_party/dart/runtime/platform/splay-tree-inl.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/splay-tree.h + ../../../third_party/dart/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../third_party/dart/runtime/platform/splay-tree-inl.h
+FILE: ../../../third_party/dart/runtime/platform/splay-tree.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2010, the Dart project authors.  Please see the AUTHORS file
+for details. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google LLC nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: dart
+ORIGIN: ../../../third_party/dart/runtime/bin/snapshot_empty.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/snapshot_in.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/include/dart_tools_api.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/lib/double.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/lib/math.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/lib/mirrors.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/lib/object.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/lib/string.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/bitfield.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/assembler/disassembler.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/assembler/disassembler.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/cpu_ia32.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/dart.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/dart_api_impl.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/dart_entry.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/dart_entry.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/debugger_arm.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/debugger_ia32.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/debugger_x64.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/double_conversion.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/double_conversion.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/exceptions.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/exceptions.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/handle_visitor.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/handles.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/heap/freelist.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/heap/marker.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/heap/marker.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/heap/pages.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/heap/scavenger.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/heap/sweeper.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/heap/sweeper.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/heap/verifier.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/longjump.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/memory_region.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/message.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/message.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/message_handler.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/message_handler.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/native_entry.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/native_entry.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/native_function.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/os.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/port.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/resolver.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/resolver.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/runtime_entry.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/runtime_entry.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/runtime_entry_arm.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/runtime_entry_ia32.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/runtime_entry_list.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/runtime_entry_x64.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/stack_frame.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/stub_code.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/timer.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/timer.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/token.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/unicode_data.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/visitor.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/collection/queue.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/comparable.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/date_time.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/duration.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/function.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/iterable.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/map.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/pattern.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/set.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/stopwatch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/string_buffer.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/html/html_common/device.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/html/html_common/filtered_element_list.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/html/html_common/lists.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/internal/iterable.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/internal/sort.dart + ../../../third_party/dart/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../third_party/dart/runtime/bin/snapshot_empty.cc
+FILE: ../../../third_party/dart/runtime/bin/snapshot_in.cc
+FILE: ../../../third_party/dart/runtime/include/dart_tools_api.h
+FILE: ../../../third_party/dart/runtime/lib/double.cc
+FILE: ../../../third_party/dart/runtime/lib/math.cc
+FILE: ../../../third_party/dart/runtime/lib/mirrors.h
+FILE: ../../../third_party/dart/runtime/lib/object.cc
+FILE: ../../../third_party/dart/runtime/lib/string.cc
+FILE: ../../../third_party/dart/runtime/vm/bitfield.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/disassembler.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/disassembler.h
+FILE: ../../../third_party/dart/runtime/vm/cpu_ia32.cc
+FILE: ../../../third_party/dart/runtime/vm/dart.h
+FILE: ../../../third_party/dart/runtime/vm/dart_api_impl.h
+FILE: ../../../third_party/dart/runtime/vm/dart_entry.cc
+FILE: ../../../third_party/dart/runtime/vm/dart_entry.h
+FILE: ../../../third_party/dart/runtime/vm/debugger_arm.cc
+FILE: ../../../third_party/dart/runtime/vm/debugger_ia32.cc
+FILE: ../../../third_party/dart/runtime/vm/debugger_x64.cc
+FILE: ../../../third_party/dart/runtime/vm/double_conversion.cc
+FILE: ../../../third_party/dart/runtime/vm/double_conversion.h
+FILE: ../../../third_party/dart/runtime/vm/exceptions.cc
+FILE: ../../../third_party/dart/runtime/vm/exceptions.h
+FILE: ../../../third_party/dart/runtime/vm/handle_visitor.h
+FILE: ../../../third_party/dart/runtime/vm/handles.h
+FILE: ../../../third_party/dart/runtime/vm/heap/freelist.cc
+FILE: ../../../third_party/dart/runtime/vm/heap/marker.cc
+FILE: ../../../third_party/dart/runtime/vm/heap/marker.h
+FILE: ../../../third_party/dart/runtime/vm/heap/pages.h
+FILE: ../../../third_party/dart/runtime/vm/heap/scavenger.cc
+FILE: ../../../third_party/dart/runtime/vm/heap/sweeper.cc
+FILE: ../../../third_party/dart/runtime/vm/heap/sweeper.h
+FILE: ../../../third_party/dart/runtime/vm/heap/verifier.h
+FILE: ../../../third_party/dart/runtime/vm/longjump.cc
+FILE: ../../../third_party/dart/runtime/vm/memory_region.cc
+FILE: ../../../third_party/dart/runtime/vm/message.cc
+FILE: ../../../third_party/dart/runtime/vm/message.h
+FILE: ../../../third_party/dart/runtime/vm/message_handler.cc
+FILE: ../../../third_party/dart/runtime/vm/message_handler.h
+FILE: ../../../third_party/dart/runtime/vm/native_entry.cc
+FILE: ../../../third_party/dart/runtime/vm/native_entry.h
+FILE: ../../../third_party/dart/runtime/vm/native_function.h
+FILE: ../../../third_party/dart/runtime/vm/os.h
+FILE: ../../../third_party/dart/runtime/vm/port.h
+FILE: ../../../third_party/dart/runtime/vm/resolver.cc
+FILE: ../../../third_party/dart/runtime/vm/resolver.h
+FILE: ../../../third_party/dart/runtime/vm/runtime_entry.cc
+FILE: ../../../third_party/dart/runtime/vm/runtime_entry.h
+FILE: ../../../third_party/dart/runtime/vm/runtime_entry_arm.cc
+FILE: ../../../third_party/dart/runtime/vm/runtime_entry_ia32.cc
+FILE: ../../../third_party/dart/runtime/vm/runtime_entry_list.h
+FILE: ../../../third_party/dart/runtime/vm/runtime_entry_x64.cc
+FILE: ../../../third_party/dart/runtime/vm/stack_frame.h
+FILE: ../../../third_party/dart/runtime/vm/stub_code.h
+FILE: ../../../third_party/dart/runtime/vm/timer.cc
+FILE: ../../../third_party/dart/runtime/vm/timer.h
+FILE: ../../../third_party/dart/runtime/vm/token.cc
+FILE: ../../../third_party/dart/runtime/vm/unicode_data.cc
+FILE: ../../../third_party/dart/runtime/vm/visitor.h
+FILE: ../../../third_party/dart/sdk/lib/collection/queue.dart
+FILE: ../../../third_party/dart/sdk/lib/core/comparable.dart
+FILE: ../../../third_party/dart/sdk/lib/core/date_time.dart
+FILE: ../../../third_party/dart/sdk/lib/core/duration.dart
+FILE: ../../../third_party/dart/sdk/lib/core/function.dart
+FILE: ../../../third_party/dart/sdk/lib/core/iterable.dart
+FILE: ../../../third_party/dart/sdk/lib/core/map.dart
+FILE: ../../../third_party/dart/sdk/lib/core/pattern.dart
+FILE: ../../../third_party/dart/sdk/lib/core/set.dart
+FILE: ../../../third_party/dart/sdk/lib/core/stopwatch.dart
+FILE: ../../../third_party/dart/sdk/lib/core/string_buffer.dart
+FILE: ../../../third_party/dart/sdk/lib/html/html_common/device.dart
+FILE: ../../../third_party/dart/sdk/lib/html/html_common/filtered_element_list.dart
+FILE: ../../../third_party/dart/sdk/lib/html/html_common/lists.dart
+FILE: ../../../third_party/dart/sdk/lib/internal/iterable.dart
+FILE: ../../../third_party/dart/sdk/lib/internal/sort.dart
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+for details. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google LLC nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: dart
+ORIGIN: ../../../third_party/dart/runtime/bin/builtin.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/builtin.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/builtin_gen_snapshot.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/builtin_in.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/builtin_natives.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/crashpad.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/crypto.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/crypto.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/crypto_linux.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/crypto_macos.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/crypto_win.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/dartutils.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/dartutils.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/directory.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/directory.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/directory_linux.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/directory_macos.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/directory_win.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/eventhandler.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/eventhandler.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/eventhandler_linux.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/eventhandler_linux.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/eventhandler_macos.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/eventhandler_macos.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/eventhandler_win.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/fdutils.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/fdutils_fuchsia.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/fdutils_linux.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/fdutils_macos.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/file_linux.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/file_macos.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/file_win.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/io_buffer.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/io_buffer.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/io_natives.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/isolate_data.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/lockers.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/main.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/main_impl.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/platform.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/platform.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/platform_linux.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/platform_macos.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/platform_win.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/process.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/process_linux.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/process_macos.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/process_win.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/run_vm_tests.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/secure_socket_unsupported.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/socket_base_linux.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/socket_base_macos.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/socket_base_win.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/thread.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/thread_linux.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/thread_linux.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/thread_macos.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/thread_macos.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/thread_win.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/thread_win.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/utils.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/utils_linux.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/utils_macos.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/utils_win.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/utils_win.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/include/dart_api.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/lib/array.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/lib/bool.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/lib/date.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/lib/errors.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/lib/function.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/lib/growable_array.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/lib/identical.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/lib/integers.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/lib/isolate.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/lib/mirrors.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/lib/regexp.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/lib/stopwatch.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/assert.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/assert.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/floating_point.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/floating_point_win.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/floating_point_win.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/globals.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/hashmap.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/hashmap.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/syslog.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/syslog_android.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/syslog_linux.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/syslog_macos.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/syslog_win.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/text_buffer.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/text_buffer.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/unicode.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/unicode.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/utils.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/utils.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/utils_android.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/utils_android.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/utils_linux.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/utils_linux.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/utils_macos.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/utils_macos.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/utils_win.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/utils_win.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/allocation.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/base_isolate.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/bit_set.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/bit_vector.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/bit_vector.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/bitmap.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/bitmap.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/boolfield.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/bootstrap.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/bootstrap.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/bootstrap_natives.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/bootstrap_natives.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/class_finalizer.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/class_table.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/class_table.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/code_descriptors.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/code_descriptors.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/code_observers.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/code_observers.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/code_patcher.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/code_patcher.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/code_patcher_ia32.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/code_patcher_x64.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/aot/aot_call_specializer.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_base.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/assembler/disassembler_x86.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/assembler/object_pool_builder.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/constant_propagator.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/flow_graph.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/flow_graph_compiler.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/il_printer.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/il_printer.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/inliner.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/cha.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/cha.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/frontend/flow_graph_builder.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/frontend/flow_graph_builder.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/intrinsifier.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/intrinsifier.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/jit/compiler.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/jit/compiler.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/cpu.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/cpu_arm.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/cpu_x64.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/cpuinfo_linux.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/cpuinfo_macos.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/dart_api_message.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/dart_api_state.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/datastream.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/debugger.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/debugger.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/double_internals.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/flag_list.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/flags.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/flags.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/globals.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/growable_array.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/handles.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/handles_impl.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/hash_map.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/heap/freelist.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/heap/heap.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/heap/heap.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/heap/pages.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/heap/pointer_block.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/heap/pointer_block.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/heap/scavenger.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/heap/verifier.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/instructions_ia32.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/instructions_ia32.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/instructions_x64.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/instructions_x64.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/lockers.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/megamorphic_cache_table.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/megamorphic_cache_table.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/memory_region.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/native_arguments.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/native_message_handler.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/native_message_handler.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/object.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/object.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/object_set.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/object_store.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/os_android.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/os_linux.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/os_macos.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/os_thread.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/os_thread_android.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/os_thread_android.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/os_thread_linux.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/os_thread_linux.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/os_thread_macos.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/os_thread_macos.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/os_thread_win.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/os_thread_win.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/os_win.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/parser.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/parser.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/port.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/proccpuinfo.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/proccpuinfo.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/raw_object.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/raw_object.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/scopes.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/scopes.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/snapshot.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/snapshot.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/stack_frame.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/stub_code.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/symbols.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/symbols.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/thread_pool.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/thread_pool.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/token.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/unicode.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/version.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/version_in.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/virtual_memory.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/virtual_memory.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/virtual_memory_posix.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/virtual_memory_win.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/zone.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/zone.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_http/crypto.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_http/http_date.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/async_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/bigint_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/core_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/isolate_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/math_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/foreign_helper.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/interceptors.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/isolate_helper.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_array.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_number.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_string.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/native_helper.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/regexp_helper.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/string_helper.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/async_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/bigint_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/constant_map.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/core_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/foreign_helper.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/interceptors.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/isolate_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/js_array.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/js_number.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/js_string.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/math_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/native_helper.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/regexp_helper.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/string_helper.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/sdk_library_metadata/lib/libraries.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/bin/builtin.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/bin/common_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/bin/directory_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/bin/eventhandler_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/bin/file_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/bin/platform_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/bin/secure_socket_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/array.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/double.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/double_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/empty_source.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/errors_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/expando_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/function_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/growable_array.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/identical_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/immutable_map.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/integers.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/invocation_mirror_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/isolate_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/math_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/mirrors_impl.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/mirrors_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/object_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/print_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/regexp_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/stopwatch_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/string_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/timer_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/type_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/weak_property.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm_shared/lib/array_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm_shared/lib/bool_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm_shared/lib/date_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm_shared/lib/integers_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm_shared/lib/map_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm_shared/lib/string_buffer_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/async/async.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/async/async_error.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/async/broadcast_stream_controller.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/async/future.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/async/future_impl.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/async/stream_controller.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/async/stream_impl.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/async/stream_pipe.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/async/timer.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/collection/collection.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/collection/iterable.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/collection/iterator.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/collection/maps.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/collection/splay_tree.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/bool.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/core.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/double.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/errors.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/exceptions.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/identical.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/int.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/invocation.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/iterator.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/list.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/num.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/object.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/print.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/regexp.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/string.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/type.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/uri.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/weak.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/html/dart2js/html_dart2js.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/html/dartium/nativewrappers.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/html/html_common/conversions.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/html/html_common/css_class_set.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/html/html_common/html_common_dart2js.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/html/html_common/metadata.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/internal/async_cast.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/internal/cast.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/internal/internal.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/io/common.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/io/directory.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/io/directory_impl.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/io/eventhandler.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/io/io.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/io/platform.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/io/platform_impl.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/io/secure_server_socket.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/isolate/isolate.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/math/math.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/math/random.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/web_audio/dart2js/web_audio_dart2js.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/web_sql/dart2js/web_sql_dart2js.dart + ../../../third_party/dart/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../third_party/dart/runtime/bin/builtin.cc
+FILE: ../../../third_party/dart/runtime/bin/builtin.h
+FILE: ../../../third_party/dart/runtime/bin/builtin_gen_snapshot.cc
+FILE: ../../../third_party/dart/runtime/bin/builtin_in.cc
+FILE: ../../../third_party/dart/runtime/bin/builtin_natives.cc
+FILE: ../../../third_party/dart/runtime/bin/crashpad.cc
+FILE: ../../../third_party/dart/runtime/bin/crypto.cc
+FILE: ../../../third_party/dart/runtime/bin/crypto.h
+FILE: ../../../third_party/dart/runtime/bin/crypto_linux.cc
+FILE: ../../../third_party/dart/runtime/bin/crypto_macos.cc
+FILE: ../../../third_party/dart/runtime/bin/crypto_win.cc
+FILE: ../../../third_party/dart/runtime/bin/dartutils.cc
+FILE: ../../../third_party/dart/runtime/bin/dartutils.h
+FILE: ../../../third_party/dart/runtime/bin/directory.cc
+FILE: ../../../third_party/dart/runtime/bin/directory.h
+FILE: ../../../third_party/dart/runtime/bin/directory_linux.cc
+FILE: ../../../third_party/dart/runtime/bin/directory_macos.cc
+FILE: ../../../third_party/dart/runtime/bin/directory_win.cc
+FILE: ../../../third_party/dart/runtime/bin/eventhandler.cc
+FILE: ../../../third_party/dart/runtime/bin/eventhandler.h
+FILE: ../../../third_party/dart/runtime/bin/eventhandler_linux.cc
+FILE: ../../../third_party/dart/runtime/bin/eventhandler_linux.h
+FILE: ../../../third_party/dart/runtime/bin/eventhandler_macos.cc
+FILE: ../../../third_party/dart/runtime/bin/eventhandler_macos.h
+FILE: ../../../third_party/dart/runtime/bin/eventhandler_win.h
+FILE: ../../../third_party/dart/runtime/bin/fdutils.h
+FILE: ../../../third_party/dart/runtime/bin/fdutils_fuchsia.cc
+FILE: ../../../third_party/dart/runtime/bin/fdutils_linux.cc
+FILE: ../../../third_party/dart/runtime/bin/fdutils_macos.cc
+FILE: ../../../third_party/dart/runtime/bin/file_linux.cc
+FILE: ../../../third_party/dart/runtime/bin/file_macos.cc
+FILE: ../../../third_party/dart/runtime/bin/file_win.cc
+FILE: ../../../third_party/dart/runtime/bin/io_buffer.cc
+FILE: ../../../third_party/dart/runtime/bin/io_buffer.h
+FILE: ../../../third_party/dart/runtime/bin/io_natives.h
+FILE: ../../../third_party/dart/runtime/bin/isolate_data.h
+FILE: ../../../third_party/dart/runtime/bin/lockers.h
+FILE: ../../../third_party/dart/runtime/bin/main.cc
+FILE: ../../../third_party/dart/runtime/bin/main_impl.cc
+FILE: ../../../third_party/dart/runtime/bin/platform.cc
+FILE: ../../../third_party/dart/runtime/bin/platform.h
+FILE: ../../../third_party/dart/runtime/bin/platform_linux.cc
+FILE: ../../../third_party/dart/runtime/bin/platform_macos.cc
+FILE: ../../../third_party/dart/runtime/bin/platform_win.cc
+FILE: ../../../third_party/dart/runtime/bin/process.h
+FILE: ../../../third_party/dart/runtime/bin/process_linux.cc
+FILE: ../../../third_party/dart/runtime/bin/process_macos.cc
+FILE: ../../../third_party/dart/runtime/bin/process_win.cc
+FILE: ../../../third_party/dart/runtime/bin/run_vm_tests.cc
+FILE: ../../../third_party/dart/runtime/bin/secure_socket_unsupported.cc
+FILE: ../../../third_party/dart/runtime/bin/socket_base_linux.h
+FILE: ../../../third_party/dart/runtime/bin/socket_base_macos.h
+FILE: ../../../third_party/dart/runtime/bin/socket_base_win.h
+FILE: ../../../third_party/dart/runtime/bin/thread.h
+FILE: ../../../third_party/dart/runtime/bin/thread_linux.cc
+FILE: ../../../third_party/dart/runtime/bin/thread_linux.h
+FILE: ../../../third_party/dart/runtime/bin/thread_macos.cc
+FILE: ../../../third_party/dart/runtime/bin/thread_macos.h
+FILE: ../../../third_party/dart/runtime/bin/thread_win.cc
+FILE: ../../../third_party/dart/runtime/bin/thread_win.h
+FILE: ../../../third_party/dart/runtime/bin/utils.h
+FILE: ../../../third_party/dart/runtime/bin/utils_linux.cc
+FILE: ../../../third_party/dart/runtime/bin/utils_macos.cc
+FILE: ../../../third_party/dart/runtime/bin/utils_win.cc
+FILE: ../../../third_party/dart/runtime/bin/utils_win.h
+FILE: ../../../third_party/dart/runtime/include/dart_api.h
+FILE: ../../../third_party/dart/runtime/lib/array.cc
+FILE: ../../../third_party/dart/runtime/lib/bool.cc
+FILE: ../../../third_party/dart/runtime/lib/date.cc
+FILE: ../../../third_party/dart/runtime/lib/errors.cc
+FILE: ../../../third_party/dart/runtime/lib/function.cc
+FILE: ../../../third_party/dart/runtime/lib/growable_array.cc
+FILE: ../../../third_party/dart/runtime/lib/identical.cc
+FILE: ../../../third_party/dart/runtime/lib/integers.cc
+FILE: ../../../third_party/dart/runtime/lib/isolate.cc
+FILE: ../../../third_party/dart/runtime/lib/mirrors.cc
+FILE: ../../../third_party/dart/runtime/lib/regexp.cc
+FILE: ../../../third_party/dart/runtime/lib/stopwatch.cc
+FILE: ../../../third_party/dart/runtime/platform/assert.cc
+FILE: ../../../third_party/dart/runtime/platform/assert.h
+FILE: ../../../third_party/dart/runtime/platform/floating_point.h
+FILE: ../../../third_party/dart/runtime/platform/floating_point_win.cc
+FILE: ../../../third_party/dart/runtime/platform/floating_point_win.h
+FILE: ../../../third_party/dart/runtime/platform/globals.h
+FILE: ../../../third_party/dart/runtime/platform/hashmap.cc
+FILE: ../../../third_party/dart/runtime/platform/hashmap.h
+FILE: ../../../third_party/dart/runtime/platform/syslog.h
+FILE: ../../../third_party/dart/runtime/platform/syslog_android.cc
+FILE: ../../../third_party/dart/runtime/platform/syslog_linux.cc
+FILE: ../../../third_party/dart/runtime/platform/syslog_macos.cc
+FILE: ../../../third_party/dart/runtime/platform/syslog_win.cc
+FILE: ../../../third_party/dart/runtime/platform/text_buffer.cc
+FILE: ../../../third_party/dart/runtime/platform/text_buffer.h
+FILE: ../../../third_party/dart/runtime/platform/unicode.cc
+FILE: ../../../third_party/dart/runtime/platform/unicode.h
+FILE: ../../../third_party/dart/runtime/platform/utils.cc
+FILE: ../../../third_party/dart/runtime/platform/utils.h
+FILE: ../../../third_party/dart/runtime/platform/utils_android.cc
+FILE: ../../../third_party/dart/runtime/platform/utils_android.h
+FILE: ../../../third_party/dart/runtime/platform/utils_linux.cc
+FILE: ../../../third_party/dart/runtime/platform/utils_linux.h
+FILE: ../../../third_party/dart/runtime/platform/utils_macos.cc
+FILE: ../../../third_party/dart/runtime/platform/utils_macos.h
+FILE: ../../../third_party/dart/runtime/platform/utils_win.cc
+FILE: ../../../third_party/dart/runtime/platform/utils_win.h
+FILE: ../../../third_party/dart/runtime/vm/allocation.cc
+FILE: ../../../third_party/dart/runtime/vm/base_isolate.h
+FILE: ../../../third_party/dart/runtime/vm/bit_set.h
+FILE: ../../../third_party/dart/runtime/vm/bit_vector.cc
+FILE: ../../../third_party/dart/runtime/vm/bit_vector.h
+FILE: ../../../third_party/dart/runtime/vm/bitmap.cc
+FILE: ../../../third_party/dart/runtime/vm/bitmap.h
+FILE: ../../../third_party/dart/runtime/vm/boolfield.h
+FILE: ../../../third_party/dart/runtime/vm/bootstrap.cc
+FILE: ../../../third_party/dart/runtime/vm/bootstrap.h
+FILE: ../../../third_party/dart/runtime/vm/bootstrap_natives.cc
+FILE: ../../../third_party/dart/runtime/vm/bootstrap_natives.h
+FILE: ../../../third_party/dart/runtime/vm/class_finalizer.h
+FILE: ../../../third_party/dart/runtime/vm/class_table.cc
+FILE: ../../../third_party/dart/runtime/vm/class_table.h
+FILE: ../../../third_party/dart/runtime/vm/code_descriptors.cc
+FILE: ../../../third_party/dart/runtime/vm/code_descriptors.h
+FILE: ../../../third_party/dart/runtime/vm/code_observers.cc
+FILE: ../../../third_party/dart/runtime/vm/code_observers.h
+FILE: ../../../third_party/dart/runtime/vm/code_patcher.cc
+FILE: ../../../third_party/dart/runtime/vm/code_patcher.h
+FILE: ../../../third_party/dart/runtime/vm/code_patcher_ia32.cc
+FILE: ../../../third_party/dart/runtime/vm/code_patcher_x64.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/aot/aot_call_specializer.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_base.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/disassembler_x86.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/object_pool_builder.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/constant_propagator.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/flow_graph.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/flow_graph_compiler.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/il_printer.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/il_printer.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/inliner.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/cha.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/cha.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/flow_graph_builder.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/flow_graph_builder.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/intrinsifier.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/intrinsifier.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/jit/compiler.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/jit/compiler.h
+FILE: ../../../third_party/dart/runtime/vm/cpu.h
+FILE: ../../../third_party/dart/runtime/vm/cpu_arm.cc
+FILE: ../../../third_party/dart/runtime/vm/cpu_x64.cc
+FILE: ../../../third_party/dart/runtime/vm/cpuinfo_linux.cc
+FILE: ../../../third_party/dart/runtime/vm/cpuinfo_macos.cc
+FILE: ../../../third_party/dart/runtime/vm/dart_api_message.h
+FILE: ../../../third_party/dart/runtime/vm/dart_api_state.h
+FILE: ../../../third_party/dart/runtime/vm/datastream.h
+FILE: ../../../third_party/dart/runtime/vm/debugger.cc
+FILE: ../../../third_party/dart/runtime/vm/debugger.h
+FILE: ../../../third_party/dart/runtime/vm/double_internals.h
+FILE: ../../../third_party/dart/runtime/vm/flag_list.h
+FILE: ../../../third_party/dart/runtime/vm/flags.cc
+FILE: ../../../third_party/dart/runtime/vm/flags.h
+FILE: ../../../third_party/dart/runtime/vm/globals.h
+FILE: ../../../third_party/dart/runtime/vm/growable_array.h
+FILE: ../../../third_party/dart/runtime/vm/handles.cc
+FILE: ../../../third_party/dart/runtime/vm/handles_impl.h
+FILE: ../../../third_party/dart/runtime/vm/hash_map.h
+FILE: ../../../third_party/dart/runtime/vm/heap/freelist.h
+FILE: ../../../third_party/dart/runtime/vm/heap/heap.cc
+FILE: ../../../third_party/dart/runtime/vm/heap/heap.h
+FILE: ../../../third_party/dart/runtime/vm/heap/pages.cc
+FILE: ../../../third_party/dart/runtime/vm/heap/pointer_block.cc
+FILE: ../../../third_party/dart/runtime/vm/heap/pointer_block.h
+FILE: ../../../third_party/dart/runtime/vm/heap/scavenger.h
+FILE: ../../../third_party/dart/runtime/vm/heap/verifier.cc
+FILE: ../../../third_party/dart/runtime/vm/instructions_ia32.cc
+FILE: ../../../third_party/dart/runtime/vm/instructions_ia32.h
+FILE: ../../../third_party/dart/runtime/vm/instructions_x64.cc
+FILE: ../../../third_party/dart/runtime/vm/instructions_x64.h
+FILE: ../../../third_party/dart/runtime/vm/lockers.h
+FILE: ../../../third_party/dart/runtime/vm/megamorphic_cache_table.cc
+FILE: ../../../third_party/dart/runtime/vm/megamorphic_cache_table.h
+FILE: ../../../third_party/dart/runtime/vm/memory_region.h
+FILE: ../../../third_party/dart/runtime/vm/native_arguments.h
+FILE: ../../../third_party/dart/runtime/vm/native_message_handler.cc
+FILE: ../../../third_party/dart/runtime/vm/native_message_handler.h
+FILE: ../../../third_party/dart/runtime/vm/object.cc
+FILE: ../../../third_party/dart/runtime/vm/object.h
+FILE: ../../../third_party/dart/runtime/vm/object_set.h
+FILE: ../../../third_party/dart/runtime/vm/object_store.h
+FILE: ../../../third_party/dart/runtime/vm/os_android.cc
+FILE: ../../../third_party/dart/runtime/vm/os_linux.cc
+FILE: ../../../third_party/dart/runtime/vm/os_macos.cc
+FILE: ../../../third_party/dart/runtime/vm/os_thread.h
+FILE: ../../../third_party/dart/runtime/vm/os_thread_android.cc
+FILE: ../../../third_party/dart/runtime/vm/os_thread_android.h
+FILE: ../../../third_party/dart/runtime/vm/os_thread_linux.cc
+FILE: ../../../third_party/dart/runtime/vm/os_thread_linux.h
+FILE: ../../../third_party/dart/runtime/vm/os_thread_macos.cc
+FILE: ../../../third_party/dart/runtime/vm/os_thread_macos.h
+FILE: ../../../third_party/dart/runtime/vm/os_thread_win.cc
+FILE: ../../../third_party/dart/runtime/vm/os_thread_win.h
+FILE: ../../../third_party/dart/runtime/vm/os_win.cc
+FILE: ../../../third_party/dart/runtime/vm/parser.cc
+FILE: ../../../third_party/dart/runtime/vm/parser.h
+FILE: ../../../third_party/dart/runtime/vm/port.cc
+FILE: ../../../third_party/dart/runtime/vm/proccpuinfo.cc
+FILE: ../../../third_party/dart/runtime/vm/proccpuinfo.h
+FILE: ../../../third_party/dart/runtime/vm/raw_object.cc
+FILE: ../../../third_party/dart/runtime/vm/raw_object.h
+FILE: ../../../third_party/dart/runtime/vm/scopes.cc
+FILE: ../../../third_party/dart/runtime/vm/scopes.h
+FILE: ../../../third_party/dart/runtime/vm/snapshot.cc
+FILE: ../../../third_party/dart/runtime/vm/snapshot.h
+FILE: ../../../third_party/dart/runtime/vm/stack_frame.cc
+FILE: ../../../third_party/dart/runtime/vm/stub_code.cc
+FILE: ../../../third_party/dart/runtime/vm/symbols.cc
+FILE: ../../../third_party/dart/runtime/vm/symbols.h
+FILE: ../../../third_party/dart/runtime/vm/thread_pool.cc
+FILE: ../../../third_party/dart/runtime/vm/thread_pool.h
+FILE: ../../../third_party/dart/runtime/vm/token.h
+FILE: ../../../third_party/dart/runtime/vm/unicode.cc
+FILE: ../../../third_party/dart/runtime/vm/version.h
+FILE: ../../../third_party/dart/runtime/vm/version_in.cc
+FILE: ../../../third_party/dart/runtime/vm/virtual_memory.cc
+FILE: ../../../third_party/dart/runtime/vm/virtual_memory.h
+FILE: ../../../third_party/dart/runtime/vm/virtual_memory_posix.cc
+FILE: ../../../third_party/dart/runtime/vm/virtual_memory_win.cc
+FILE: ../../../third_party/dart/runtime/vm/zone.cc
+FILE: ../../../third_party/dart/runtime/vm/zone.h
+FILE: ../../../third_party/dart/sdk/lib/_http/crypto.dart
+FILE: ../../../third_party/dart/sdk/lib/_http/http_date.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/async_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/bigint_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/core_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/isolate_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/math_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/foreign_helper.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/interceptors.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/isolate_helper.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_array.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_number.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_string.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/native_helper.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/regexp_helper.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/string_helper.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/async_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/bigint_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/constant_map.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/core_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/foreign_helper.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/interceptors.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/isolate_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/js_array.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/js_number.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/js_string.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/math_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/native_helper.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/regexp_helper.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/string_helper.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/sdk_library_metadata/lib/libraries.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/builtin.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/common_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/directory_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/eventhandler_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/file_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/platform_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/secure_socket_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/array.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/double.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/double_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/empty_source.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/errors_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/expando_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/function_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/growable_array.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/identical_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/immutable_map.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/integers.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/invocation_mirror_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/isolate_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/math_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/mirrors_impl.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/mirrors_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/object_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/print_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/regexp_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/stopwatch_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/string_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/timer_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/type_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/weak_property.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm_shared/lib/array_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm_shared/lib/bool_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm_shared/lib/date_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm_shared/lib/integers_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm_shared/lib/map_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm_shared/lib/string_buffer_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/async/async.dart
+FILE: ../../../third_party/dart/sdk/lib/async/async_error.dart
+FILE: ../../../third_party/dart/sdk/lib/async/broadcast_stream_controller.dart
+FILE: ../../../third_party/dart/sdk/lib/async/future.dart
+FILE: ../../../third_party/dart/sdk/lib/async/future_impl.dart
+FILE: ../../../third_party/dart/sdk/lib/async/stream_controller.dart
+FILE: ../../../third_party/dart/sdk/lib/async/stream_impl.dart
+FILE: ../../../third_party/dart/sdk/lib/async/stream_pipe.dart
+FILE: ../../../third_party/dart/sdk/lib/async/timer.dart
+FILE: ../../../third_party/dart/sdk/lib/collection/collection.dart
+FILE: ../../../third_party/dart/sdk/lib/collection/iterable.dart
+FILE: ../../../third_party/dart/sdk/lib/collection/iterator.dart
+FILE: ../../../third_party/dart/sdk/lib/collection/maps.dart
+FILE: ../../../third_party/dart/sdk/lib/collection/splay_tree.dart
+FILE: ../../../third_party/dart/sdk/lib/core/bool.dart
+FILE: ../../../third_party/dart/sdk/lib/core/core.dart
+FILE: ../../../third_party/dart/sdk/lib/core/double.dart
+FILE: ../../../third_party/dart/sdk/lib/core/errors.dart
+FILE: ../../../third_party/dart/sdk/lib/core/exceptions.dart
+FILE: ../../../third_party/dart/sdk/lib/core/identical.dart
+FILE: ../../../third_party/dart/sdk/lib/core/int.dart
+FILE: ../../../third_party/dart/sdk/lib/core/invocation.dart
+FILE: ../../../third_party/dart/sdk/lib/core/iterator.dart
+FILE: ../../../third_party/dart/sdk/lib/core/list.dart
+FILE: ../../../third_party/dart/sdk/lib/core/num.dart
+FILE: ../../../third_party/dart/sdk/lib/core/object.dart
+FILE: ../../../third_party/dart/sdk/lib/core/print.dart
+FILE: ../../../third_party/dart/sdk/lib/core/regexp.dart
+FILE: ../../../third_party/dart/sdk/lib/core/string.dart
+FILE: ../../../third_party/dart/sdk/lib/core/type.dart
+FILE: ../../../third_party/dart/sdk/lib/core/uri.dart
+FILE: ../../../third_party/dart/sdk/lib/core/weak.dart
+FILE: ../../../third_party/dart/sdk/lib/html/dart2js/html_dart2js.dart
+FILE: ../../../third_party/dart/sdk/lib/html/dartium/nativewrappers.dart
+FILE: ../../../third_party/dart/sdk/lib/html/html_common/conversions.dart
+FILE: ../../../third_party/dart/sdk/lib/html/html_common/css_class_set.dart
+FILE: ../../../third_party/dart/sdk/lib/html/html_common/html_common_dart2js.dart
+FILE: ../../../third_party/dart/sdk/lib/html/html_common/metadata.dart
+FILE: ../../../third_party/dart/sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart
+FILE: ../../../third_party/dart/sdk/lib/internal/async_cast.dart
+FILE: ../../../third_party/dart/sdk/lib/internal/cast.dart
+FILE: ../../../third_party/dart/sdk/lib/internal/internal.dart
+FILE: ../../../third_party/dart/sdk/lib/io/common.dart
+FILE: ../../../third_party/dart/sdk/lib/io/directory.dart
+FILE: ../../../third_party/dart/sdk/lib/io/directory_impl.dart
+FILE: ../../../third_party/dart/sdk/lib/io/eventhandler.dart
+FILE: ../../../third_party/dart/sdk/lib/io/io.dart
+FILE: ../../../third_party/dart/sdk/lib/io/platform.dart
+FILE: ../../../third_party/dart/sdk/lib/io/platform_impl.dart
+FILE: ../../../third_party/dart/sdk/lib/io/secure_server_socket.dart
+FILE: ../../../third_party/dart/sdk/lib/isolate/isolate.dart
+FILE: ../../../third_party/dart/sdk/lib/math/math.dart
+FILE: ../../../third_party/dart/sdk/lib/math/random.dart
+FILE: ../../../third_party/dart/sdk/lib/web_audio/dart2js/web_audio_dart2js.dart
+FILE: ../../../third_party/dart/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart
+FILE: ../../../third_party/dart/sdk/lib/web_sql/dart2js/web_sql_dart2js.dart
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
+for details. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google LLC nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: dart
+ORIGIN: ../../../third_party/dart/runtime/bin/eventhandler_win.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/file.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/file.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/file_system_watcher.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/file_system_watcher.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/file_system_watcher_linux.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/file_system_watcher_macos.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/file_system_watcher_win.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/filter.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/filter.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/gen_snapshot.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/io_natives.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/io_service.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/io_service.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/io_service_no_ssl.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/io_service_no_ssl.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/process.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/socket.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/socket.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/socket_base_linux.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/socket_base_macos.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/socket_base_win.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/socket_linux.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/socket_macos.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/socket_win.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/stdio.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/stdio.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/stdio_linux.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/stdio_macos.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/stdio_win.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/vmservice_impl.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/vmservice_impl.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/include/dart_native_api.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/lib/invocation_mirror.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/lib/libgen_in.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/lib/simd128.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/lib/stacktrace.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/lib/typed_data.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/lib/uri.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/app/application.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/app/location_manager.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/class_instances.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/class_ref.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/class_view.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/code_ref.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/code_view.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/context_ref.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/context_view.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/cpu_profile.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/cpu_profile/virtual_tree.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/cpu_profile_table.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/curly_block.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/error_view.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/eval_box.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/field_ref.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/field_view.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/flag_list.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/function_ref.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/function_view.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/heap_snapshot.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/helpers/any_ref.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/icdata_ref.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/icdata_view.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/instance_ref.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/instance_view.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/isolate_ref.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/isolate_view.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/json_view.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/library_ref.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/library_view.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/local_var_descriptors_ref.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/megamorphiccache_ref.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/native_memory_profiler.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/object_common.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/object_view.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/objectpool_ref.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/objectstore_view.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/observatory_application.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/pc_descriptors_ref.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/sample_buffer_control.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/script_inset.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/script_ref.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/script_view.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/sentinel_value.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/sentinel_view.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/source_inset.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/stack_trace_tree_config.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/type_arguments_ref.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/unknown_ref.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/vm_view.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/tracer.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/atomic.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/signal_blocker.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/allocation.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/class_finalizer.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/code_patcher_arm.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/aot/aot_call_specializer.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_arm.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_arm.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_ia32.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_ia32.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_x64.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_x64.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/assembler/disassembler_arm.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/block_scheduler.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/block_scheduler.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/constant_propagator.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/flow_graph.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/flow_graph_compiler.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/flow_graph_compiler_arm.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/flow_graph_compiler_ia32.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/flow_graph_compiler_x64.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/il.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/il.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/il_arm.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/il_ia32.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/il_x64.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/inliner.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/linearscan.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/linearscan.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/locations.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/locations.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/type_propagator.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/type_propagator.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/jit/jit_call_specializer.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/constants_arm.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/constants_ia32.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/constants_x64.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/dart.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/dart_api_impl.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/deferred_objects.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/deferred_objects.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/deopt_instructions.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/deopt_instructions.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/heap/weak_table.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/heap/weak_table.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/instructions.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/instructions_arm.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/instructions_arm.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/isolate.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/isolate.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/json_stream.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/json_stream.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/native_api_impl.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/native_symbol.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/native_symbol_posix.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/native_symbol_win.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/object_id_ring.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/object_id_ring.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/object_store.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/profiler.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/profiler.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/random.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/random.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/reusable_handles.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/service.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/service.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/service_isolate.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/signal_handler.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/signal_handler_android.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/signal_handler_linux.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/signal_handler_macos.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/signal_handler_win.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/simulator.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/simulator_arm.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/simulator_arm.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/stack_frame_arm.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/stack_frame_ia32.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/stack_frame_x64.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/tags.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/thread_interrupter.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/thread_interrupter.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/thread_interrupter_android.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/thread_interrupter_linux.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/thread_interrupter_macos.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/thread_interrupter_win.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_http/http.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_http/http_headers.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_http/http_impl.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_http/http_parser.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_http/http_session.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_http/websocket.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_http/websocket_impl.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/collection_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/convert_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/internal_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/io_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/typed_data_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/annotations.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_helper.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_primitives.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_rti.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/mirror_helper.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/native_typed_data.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/annotations.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/collection_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/convert_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/internal_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/io_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/js_helper.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/js_names.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/js_primitives.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/native_typed_data.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/typed_data_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/bin/file_system_entity_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/bin/filter_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/bin/io_service_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/bin/process_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/bin/socket_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/bin/stdio_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/bin/vmservice_io.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/bin/vmservice_server.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/core_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/function.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/internal_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/mirror_reference.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/schedule_microtask_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/stacktrace.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/symbol_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/timer_impl.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/typed_data_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/uri_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm_shared/lib/collection_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm_shared/lib/null_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/io_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/async/deferred_load.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/async/schedule_microtask.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/async/stream.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/async/stream_transformers.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/async/zone.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/collection/collections.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/collection/hash_map.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/collection/hash_set.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/collection/linked_hash_map.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/collection/linked_hash_set.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/collection/linked_list.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/collection/list.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/convert/ascii.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/convert/byte_conversion.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/convert/chunked_conversion.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/convert/codec.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/convert/convert.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/convert/converter.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/convert/encoding.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/convert/html_escape.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/convert/json.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/convert/latin1.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/convert/line_splitter.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/convert/string_conversion.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/convert/utf.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/annotations.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/null.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/stacktrace.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/string_sink.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/symbol.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/html/dart2js/html_dart2js.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/internal/bytes_builder.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/internal/list.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/internal/print.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/internal/symbol.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/io/data_transformer.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/io/file.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/io/file_impl.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/io/file_system_entity.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/io/io_service.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/io/io_sink.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/io/link.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/io/secure_socket.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/io/socket.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/io/stdio.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/io/string_transformer.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/js/js.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/math/point.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/math/rectangle.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/mirrors/mirrors.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/typed_data/typed_data.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/vmservice/client.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/vmservice/constants.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/vmservice/message.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/vmservice/message_router.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/vmservice/running_isolate.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/vmservice/running_isolates.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/utils/compiler/create_snapshot_entry.dart + ../../../third_party/dart/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../third_party/dart/runtime/bin/eventhandler_win.cc
+FILE: ../../../third_party/dart/runtime/bin/file.cc
+FILE: ../../../third_party/dart/runtime/bin/file.h
+FILE: ../../../third_party/dart/runtime/bin/file_system_watcher.cc
+FILE: ../../../third_party/dart/runtime/bin/file_system_watcher.h
+FILE: ../../../third_party/dart/runtime/bin/file_system_watcher_linux.cc
+FILE: ../../../third_party/dart/runtime/bin/file_system_watcher_macos.cc
+FILE: ../../../third_party/dart/runtime/bin/file_system_watcher_win.cc
+FILE: ../../../third_party/dart/runtime/bin/filter.cc
+FILE: ../../../third_party/dart/runtime/bin/filter.h
+FILE: ../../../third_party/dart/runtime/bin/gen_snapshot.cc
+FILE: ../../../third_party/dart/runtime/bin/io_natives.cc
+FILE: ../../../third_party/dart/runtime/bin/io_service.cc
+FILE: ../../../third_party/dart/runtime/bin/io_service.h
+FILE: ../../../third_party/dart/runtime/bin/io_service_no_ssl.cc
+FILE: ../../../third_party/dart/runtime/bin/io_service_no_ssl.h
+FILE: ../../../third_party/dart/runtime/bin/process.cc
+FILE: ../../../third_party/dart/runtime/bin/socket.cc
+FILE: ../../../third_party/dart/runtime/bin/socket.h
+FILE: ../../../third_party/dart/runtime/bin/socket_base_linux.cc
+FILE: ../../../third_party/dart/runtime/bin/socket_base_macos.cc
+FILE: ../../../third_party/dart/runtime/bin/socket_base_win.cc
+FILE: ../../../third_party/dart/runtime/bin/socket_linux.cc
+FILE: ../../../third_party/dart/runtime/bin/socket_macos.cc
+FILE: ../../../third_party/dart/runtime/bin/socket_win.cc
+FILE: ../../../third_party/dart/runtime/bin/stdio.cc
+FILE: ../../../third_party/dart/runtime/bin/stdio.h
+FILE: ../../../third_party/dart/runtime/bin/stdio_linux.cc
+FILE: ../../../third_party/dart/runtime/bin/stdio_macos.cc
+FILE: ../../../third_party/dart/runtime/bin/stdio_win.cc
+FILE: ../../../third_party/dart/runtime/bin/vmservice_impl.cc
+FILE: ../../../third_party/dart/runtime/bin/vmservice_impl.h
+FILE: ../../../third_party/dart/runtime/include/dart_native_api.h
+FILE: ../../../third_party/dart/runtime/lib/invocation_mirror.h
+FILE: ../../../third_party/dart/runtime/lib/libgen_in.cc
+FILE: ../../../third_party/dart/runtime/lib/simd128.cc
+FILE: ../../../third_party/dart/runtime/lib/stacktrace.cc
+FILE: ../../../third_party/dart/runtime/lib/typed_data.cc
+FILE: ../../../third_party/dart/runtime/lib/uri.cc
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/app/application.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/app/location_manager.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/class_instances.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/class_ref.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/class_view.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/code_ref.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/code_view.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/context_ref.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/context_view.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/cpu_profile.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/cpu_profile/virtual_tree.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/cpu_profile_table.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/curly_block.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/error_view.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/eval_box.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/field_ref.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/field_view.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/flag_list.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/function_ref.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/function_view.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/heap_snapshot.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/helpers/any_ref.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/icdata_ref.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/icdata_view.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/instance_ref.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/instance_view.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/isolate_ref.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/isolate_view.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/json_view.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/library_ref.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/library_view.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/local_var_descriptors_ref.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/megamorphiccache_ref.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/native_memory_profiler.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/object_common.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/object_view.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/objectpool_ref.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/objectstore_view.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/observatory_application.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/pc_descriptors_ref.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/sample_buffer_control.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/script_inset.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/script_ref.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/script_view.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/sentinel_value.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/sentinel_view.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/source_inset.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/stack_trace_tree_config.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/type_arguments_ref.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/unknown_ref.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/vm_view.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/tracer.dart
+FILE: ../../../third_party/dart/runtime/platform/atomic.h
+FILE: ../../../third_party/dart/runtime/platform/signal_blocker.h
+FILE: ../../../third_party/dart/runtime/vm/allocation.h
+FILE: ../../../third_party/dart/runtime/vm/class_finalizer.cc
+FILE: ../../../third_party/dart/runtime/vm/code_patcher_arm.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/aot/aot_call_specializer.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_arm.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_arm.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_ia32.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_ia32.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_x64.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_x64.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/disassembler_arm.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/block_scheduler.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/block_scheduler.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/constant_propagator.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/flow_graph.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/flow_graph_compiler.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/flow_graph_compiler_arm.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/flow_graph_compiler_ia32.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/flow_graph_compiler_x64.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/il.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/il.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/il_arm.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/il_ia32.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/il_x64.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/inliner.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/linearscan.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/linearscan.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/locations.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/locations.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/type_propagator.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/type_propagator.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/jit/jit_call_specializer.cc
+FILE: ../../../third_party/dart/runtime/vm/constants_arm.h
+FILE: ../../../third_party/dart/runtime/vm/constants_ia32.h
+FILE: ../../../third_party/dart/runtime/vm/constants_x64.h
+FILE: ../../../third_party/dart/runtime/vm/dart.cc
+FILE: ../../../third_party/dart/runtime/vm/dart_api_impl.cc
+FILE: ../../../third_party/dart/runtime/vm/deferred_objects.cc
+FILE: ../../../third_party/dart/runtime/vm/deferred_objects.h
+FILE: ../../../third_party/dart/runtime/vm/deopt_instructions.cc
+FILE: ../../../third_party/dart/runtime/vm/deopt_instructions.h
+FILE: ../../../third_party/dart/runtime/vm/heap/weak_table.cc
+FILE: ../../../third_party/dart/runtime/vm/heap/weak_table.h
+FILE: ../../../third_party/dart/runtime/vm/instructions.h
+FILE: ../../../third_party/dart/runtime/vm/instructions_arm.cc
+FILE: ../../../third_party/dart/runtime/vm/instructions_arm.h
+FILE: ../../../third_party/dart/runtime/vm/isolate.cc
+FILE: ../../../third_party/dart/runtime/vm/isolate.h
+FILE: ../../../third_party/dart/runtime/vm/json_stream.cc
+FILE: ../../../third_party/dart/runtime/vm/json_stream.h
+FILE: ../../../third_party/dart/runtime/vm/native_api_impl.cc
+FILE: ../../../third_party/dart/runtime/vm/native_symbol.h
+FILE: ../../../third_party/dart/runtime/vm/native_symbol_posix.cc
+FILE: ../../../third_party/dart/runtime/vm/native_symbol_win.cc
+FILE: ../../../third_party/dart/runtime/vm/object_id_ring.cc
+FILE: ../../../third_party/dart/runtime/vm/object_id_ring.h
+FILE: ../../../third_party/dart/runtime/vm/object_store.cc
+FILE: ../../../third_party/dart/runtime/vm/profiler.cc
+FILE: ../../../third_party/dart/runtime/vm/profiler.h
+FILE: ../../../third_party/dart/runtime/vm/random.cc
+FILE: ../../../third_party/dart/runtime/vm/random.h
+FILE: ../../../third_party/dart/runtime/vm/reusable_handles.h
+FILE: ../../../third_party/dart/runtime/vm/service.cc
+FILE: ../../../third_party/dart/runtime/vm/service.h
+FILE: ../../../third_party/dart/runtime/vm/service_isolate.h
+FILE: ../../../third_party/dart/runtime/vm/signal_handler.h
+FILE: ../../../third_party/dart/runtime/vm/signal_handler_android.cc
+FILE: ../../../third_party/dart/runtime/vm/signal_handler_linux.cc
+FILE: ../../../third_party/dart/runtime/vm/signal_handler_macos.cc
+FILE: ../../../third_party/dart/runtime/vm/signal_handler_win.cc
+FILE: ../../../third_party/dart/runtime/vm/simulator.h
+FILE: ../../../third_party/dart/runtime/vm/simulator_arm.cc
+FILE: ../../../third_party/dart/runtime/vm/simulator_arm.h
+FILE: ../../../third_party/dart/runtime/vm/stack_frame_arm.h
+FILE: ../../../third_party/dart/runtime/vm/stack_frame_ia32.h
+FILE: ../../../third_party/dart/runtime/vm/stack_frame_x64.h
+FILE: ../../../third_party/dart/runtime/vm/tags.h
+FILE: ../../../third_party/dart/runtime/vm/thread_interrupter.cc
+FILE: ../../../third_party/dart/runtime/vm/thread_interrupter.h
+FILE: ../../../third_party/dart/runtime/vm/thread_interrupter_android.cc
+FILE: ../../../third_party/dart/runtime/vm/thread_interrupter_linux.cc
+FILE: ../../../third_party/dart/runtime/vm/thread_interrupter_macos.cc
+FILE: ../../../third_party/dart/runtime/vm/thread_interrupter_win.cc
+FILE: ../../../third_party/dart/sdk/lib/_http/http.dart
+FILE: ../../../third_party/dart/sdk/lib/_http/http_headers.dart
+FILE: ../../../third_party/dart/sdk/lib/_http/http_impl.dart
+FILE: ../../../third_party/dart/sdk/lib/_http/http_parser.dart
+FILE: ../../../third_party/dart/sdk/lib/_http/http_session.dart
+FILE: ../../../third_party/dart/sdk/lib/_http/websocket.dart
+FILE: ../../../third_party/dart/sdk/lib/_http/websocket_impl.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/collection_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/convert_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/internal_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/io_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/typed_data_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/annotations.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_helper.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_primitives.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_rti.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/mirror_helper.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/native_typed_data.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/annotations.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/collection_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/convert_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/internal_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/io_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/js_helper.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/js_names.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/js_primitives.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/native_typed_data.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/typed_data_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/file_system_entity_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/filter_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/io_service_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/process_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/socket_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/stdio_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/vmservice_io.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/vmservice_server.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/core_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/function.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/internal_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/mirror_reference.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/schedule_microtask_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/stacktrace.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/symbol_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/timer_impl.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/typed_data_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/uri_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm_shared/lib/collection_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm_shared/lib/null_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/io_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/async/deferred_load.dart
+FILE: ../../../third_party/dart/sdk/lib/async/schedule_microtask.dart
+FILE: ../../../third_party/dart/sdk/lib/async/stream.dart
+FILE: ../../../third_party/dart/sdk/lib/async/stream_transformers.dart
+FILE: ../../../third_party/dart/sdk/lib/async/zone.dart
+FILE: ../../../third_party/dart/sdk/lib/collection/collections.dart
+FILE: ../../../third_party/dart/sdk/lib/collection/hash_map.dart
+FILE: ../../../third_party/dart/sdk/lib/collection/hash_set.dart
+FILE: ../../../third_party/dart/sdk/lib/collection/linked_hash_map.dart
+FILE: ../../../third_party/dart/sdk/lib/collection/linked_hash_set.dart
+FILE: ../../../third_party/dart/sdk/lib/collection/linked_list.dart
+FILE: ../../../third_party/dart/sdk/lib/collection/list.dart
+FILE: ../../../third_party/dart/sdk/lib/convert/ascii.dart
+FILE: ../../../third_party/dart/sdk/lib/convert/byte_conversion.dart
+FILE: ../../../third_party/dart/sdk/lib/convert/chunked_conversion.dart
+FILE: ../../../third_party/dart/sdk/lib/convert/codec.dart
+FILE: ../../../third_party/dart/sdk/lib/convert/convert.dart
+FILE: ../../../third_party/dart/sdk/lib/convert/converter.dart
+FILE: ../../../third_party/dart/sdk/lib/convert/encoding.dart
+FILE: ../../../third_party/dart/sdk/lib/convert/html_escape.dart
+FILE: ../../../third_party/dart/sdk/lib/convert/json.dart
+FILE: ../../../third_party/dart/sdk/lib/convert/latin1.dart
+FILE: ../../../third_party/dart/sdk/lib/convert/line_splitter.dart
+FILE: ../../../third_party/dart/sdk/lib/convert/string_conversion.dart
+FILE: ../../../third_party/dart/sdk/lib/convert/utf.dart
+FILE: ../../../third_party/dart/sdk/lib/core/annotations.dart
+FILE: ../../../third_party/dart/sdk/lib/core/null.dart
+FILE: ../../../third_party/dart/sdk/lib/core/stacktrace.dart
+FILE: ../../../third_party/dart/sdk/lib/core/string_sink.dart
+FILE: ../../../third_party/dart/sdk/lib/core/symbol.dart
+FILE: ../../../third_party/dart/sdk/lib/html/dart2js/html_dart2js.dart
+FILE: ../../../third_party/dart/sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart
+FILE: ../../../third_party/dart/sdk/lib/internal/bytes_builder.dart
+FILE: ../../../third_party/dart/sdk/lib/internal/list.dart
+FILE: ../../../third_party/dart/sdk/lib/internal/print.dart
+FILE: ../../../third_party/dart/sdk/lib/internal/symbol.dart
+FILE: ../../../third_party/dart/sdk/lib/io/data_transformer.dart
+FILE: ../../../third_party/dart/sdk/lib/io/file.dart
+FILE: ../../../third_party/dart/sdk/lib/io/file_impl.dart
+FILE: ../../../third_party/dart/sdk/lib/io/file_system_entity.dart
+FILE: ../../../third_party/dart/sdk/lib/io/io_service.dart
+FILE: ../../../third_party/dart/sdk/lib/io/io_sink.dart
+FILE: ../../../third_party/dart/sdk/lib/io/link.dart
+FILE: ../../../third_party/dart/sdk/lib/io/secure_socket.dart
+FILE: ../../../third_party/dart/sdk/lib/io/socket.dart
+FILE: ../../../third_party/dart/sdk/lib/io/stdio.dart
+FILE: ../../../third_party/dart/sdk/lib/io/string_transformer.dart
+FILE: ../../../third_party/dart/sdk/lib/js/js.dart
+FILE: ../../../third_party/dart/sdk/lib/math/point.dart
+FILE: ../../../third_party/dart/sdk/lib/math/rectangle.dart
+FILE: ../../../third_party/dart/sdk/lib/mirrors/mirrors.dart
+FILE: ../../../third_party/dart/sdk/lib/typed_data/typed_data.dart
+FILE: ../../../third_party/dart/sdk/lib/vmservice/client.dart
+FILE: ../../../third_party/dart/sdk/lib/vmservice/constants.dart
+FILE: ../../../third_party/dart/sdk/lib/vmservice/message.dart
+FILE: ../../../third_party/dart/sdk/lib/vmservice/message_router.dart
+FILE: ../../../third_party/dart/sdk/lib/vmservice/running_isolate.dart
+FILE: ../../../third_party/dart/sdk/lib/vmservice/running_isolates.dart
+FILE: ../../../third_party/dart/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart
+FILE: ../../../third_party/dart/utils/compiler/create_snapshot_entry.dart
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
+for details. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google LLC nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: dart
+ORIGIN: ../../../third_party/dart/runtime/observatory/web/third_party/webcomponents.min.js + http://polymer.github.io/LICENSE.txt referenced by ../../../third_party/dart/runtime/observatory/web/third_party/webcomponents.min.js
+TYPE: LicenseType.bsd
+FILE: ../../../third_party/dart/runtime/observatory/web/third_party/webcomponents.min.js
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: dart
+ORIGIN: ../../../third_party/dart/runtime/lib/profiler.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/bin/shell.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/app.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/object_graph.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/service.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/service_common.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/service_html.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/service_io.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/app/page.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/app/settings.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/app/view_model.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/allocation_profile.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/class_tree.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/debugger.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/heap_map.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/isolate_reconnect.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/metrics.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/vm_connect.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/service/object.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/utils.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/web/main.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/address_sanitizer.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/memory_sanitizer.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/safe_stack.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/tools/verbose_gc_to_bmu.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/code_patcher_arm64.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_arm64.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_arm64.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/assembler/disassembler_arm64.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/flow_graph_compiler_arm64.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/il_arm64.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/range_analysis.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/range_analysis.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/method_recognizer.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/method_recognizer.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/constants_arm64.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/cpu_arm.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/cpu_arm64.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/cpu_arm64.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/cpu_ia32.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/cpu_x64.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/cpuid.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/cpuid.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/cpuinfo.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/cpuinfo_android.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/cpuinfo_win.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/debugger_arm64.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/hash_table.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/heap/spaces.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/heap/weak_code.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/heap/weak_code.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/instructions_arm64.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/instructions_arm64.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/metrics.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/metrics.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/object_graph.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/object_graph.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/regexp.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/regexp.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/regexp_assembler.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/regexp_assembler.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/regexp_assembler_ir.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/regexp_assembler_ir.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/regexp_ast.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/regexp_ast.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/regexp_parser.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/regexp_parser.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/report.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/report.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/ring_buffer.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/runtime_entry_arm64.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/simulator_arm64.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/simulator_arm64.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/stack_frame_arm64.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/tags.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/unibrow-inl.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/unibrow.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/unibrow.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/preambles/d8.js + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/preambles/jsshell.js + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/linked_hash_map.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/synced/embedded_names.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/convert_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/lib_prefix.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/profiler.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/collection/set.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/sink.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/developer/profiler.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/io/process.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/io/service_object.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/isolate/capability.dart + ../../../third_party/dart/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../third_party/dart/runtime/lib/profiler.cc
+FILE: ../../../third_party/dart/runtime/observatory/bin/shell.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/app.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/object_graph.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/service.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/service_common.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/service_html.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/service_io.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/app/page.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/app/settings.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/app/view_model.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/allocation_profile.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/class_tree.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/debugger.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/heap_map.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/isolate_reconnect.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/metrics.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/vm_connect.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/service/object.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/utils.dart
+FILE: ../../../third_party/dart/runtime/observatory/web/main.dart
+FILE: ../../../third_party/dart/runtime/platform/address_sanitizer.h
+FILE: ../../../third_party/dart/runtime/platform/memory_sanitizer.h
+FILE: ../../../third_party/dart/runtime/platform/safe_stack.h
+FILE: ../../../third_party/dart/runtime/tools/verbose_gc_to_bmu.dart
+FILE: ../../../third_party/dart/runtime/vm/code_patcher_arm64.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_arm64.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_arm64.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/disassembler_arm64.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/flow_graph_compiler_arm64.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/il_arm64.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/range_analysis.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/range_analysis.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/method_recognizer.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/method_recognizer.h
+FILE: ../../../third_party/dart/runtime/vm/constants_arm64.h
+FILE: ../../../third_party/dart/runtime/vm/cpu_arm.h
+FILE: ../../../third_party/dart/runtime/vm/cpu_arm64.cc
+FILE: ../../../third_party/dart/runtime/vm/cpu_arm64.h
+FILE: ../../../third_party/dart/runtime/vm/cpu_ia32.h
+FILE: ../../../third_party/dart/runtime/vm/cpu_x64.h
+FILE: ../../../third_party/dart/runtime/vm/cpuid.cc
+FILE: ../../../third_party/dart/runtime/vm/cpuid.h
+FILE: ../../../third_party/dart/runtime/vm/cpuinfo.h
+FILE: ../../../third_party/dart/runtime/vm/cpuinfo_android.cc
+FILE: ../../../third_party/dart/runtime/vm/cpuinfo_win.cc
+FILE: ../../../third_party/dart/runtime/vm/debugger_arm64.cc
+FILE: ../../../third_party/dart/runtime/vm/hash_table.h
+FILE: ../../../third_party/dart/runtime/vm/heap/spaces.h
+FILE: ../../../third_party/dart/runtime/vm/heap/weak_code.cc
+FILE: ../../../third_party/dart/runtime/vm/heap/weak_code.h
+FILE: ../../../third_party/dart/runtime/vm/instructions_arm64.cc
+FILE: ../../../third_party/dart/runtime/vm/instructions_arm64.h
+FILE: ../../../third_party/dart/runtime/vm/metrics.cc
+FILE: ../../../third_party/dart/runtime/vm/metrics.h
+FILE: ../../../third_party/dart/runtime/vm/object_graph.cc
+FILE: ../../../third_party/dart/runtime/vm/object_graph.h
+FILE: ../../../third_party/dart/runtime/vm/regexp.cc
+FILE: ../../../third_party/dart/runtime/vm/regexp.h
+FILE: ../../../third_party/dart/runtime/vm/regexp_assembler.cc
+FILE: ../../../third_party/dart/runtime/vm/regexp_assembler.h
+FILE: ../../../third_party/dart/runtime/vm/regexp_assembler_ir.cc
+FILE: ../../../third_party/dart/runtime/vm/regexp_assembler_ir.h
+FILE: ../../../third_party/dart/runtime/vm/regexp_ast.cc
+FILE: ../../../third_party/dart/runtime/vm/regexp_ast.h
+FILE: ../../../third_party/dart/runtime/vm/regexp_parser.cc
+FILE: ../../../third_party/dart/runtime/vm/regexp_parser.h
+FILE: ../../../third_party/dart/runtime/vm/report.cc
+FILE: ../../../third_party/dart/runtime/vm/report.h
+FILE: ../../../third_party/dart/runtime/vm/ring_buffer.h
+FILE: ../../../third_party/dart/runtime/vm/runtime_entry_arm64.cc
+FILE: ../../../third_party/dart/runtime/vm/simulator_arm64.cc
+FILE: ../../../third_party/dart/runtime/vm/simulator_arm64.h
+FILE: ../../../third_party/dart/runtime/vm/stack_frame_arm64.h
+FILE: ../../../third_party/dart/runtime/vm/tags.cc
+FILE: ../../../third_party/dart/runtime/vm/unibrow-inl.h
+FILE: ../../../third_party/dart/runtime/vm/unibrow.cc
+FILE: ../../../third_party/dart/runtime/vm/unibrow.h
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/preambles/d8.js
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/preambles/jsshell.js
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/linked_hash_map.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/synced/embedded_names.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/convert_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/lib_prefix.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/profiler.dart
+FILE: ../../../third_party/dart/sdk/lib/collection/set.dart
+FILE: ../../../third_party/dart/sdk/lib/core/sink.dart
+FILE: ../../../third_party/dart/sdk/lib/developer/profiler.dart
+FILE: ../../../third_party/dart/sdk/lib/io/process.dart
+FILE: ../../../third_party/dart/sdk/lib/io/service_object.dart
+FILE: ../../../third_party/dart/sdk/lib/isolate/capability.dart
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
+for details. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google LLC nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: dart
+ORIGIN: ../../../third_party/dart/runtime/bin/address_sanitizer.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/dart_io_api_impl.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/observatory_assets_empty.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/include/bin/dart_io_api.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/lib/developer.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/lib/timeline.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/lib/vmservice.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/allocation_profile.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/cli.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/debugger.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/sample_profile.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/allocation_profile/allocation_profile.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/cli/command.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/debugger/debugger.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/debugger/debugger_location.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/heap_snapshot.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/logging.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/logging_list.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/megamorphiccache_view.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/objectpool_view.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/persistent_handles.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/ports.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/timeline_page.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/sample_profile/sample_profile.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/web/timeline.js + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/aot/precompiler.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/aot/precompiler.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/log.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/log.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/os_thread.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/profiler_service.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/profiler_service.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/program_visitor.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/program_visitor.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/regexp_assembler_bytecode.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/regexp_assembler_bytecode.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/regexp_assembler_bytecode_inl.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/regexp_bytecodes.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/regexp_interpreter.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/regexp_interpreter.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/scope_timer.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/service_event.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/service_event.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/service_isolate.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/source_report.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/source_report.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/thread.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/thread.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/thread_barrier.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/thread_registry.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/thread_registry.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/timeline.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/timeline.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/developer_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_runtime/classes.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_runtime/errors.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_runtime/operations.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_runtime/rtti.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_runtime/runtime.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_runtime/types.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_runtime/utils.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/debugger.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/developer_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/preambles/d8.js + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/preambles/jsshell.js + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/synced/async_status_codes.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/async_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/developer.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/timeline.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm_shared/lib/compact_hash.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/convert/base64.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/developer/developer.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/developer/extension.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/developer/timeline.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/io/io_resource_info.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/io/security_context.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/js/_js_annotations.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/vmservice/asset.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/vmservice/vmservice.dart + ../../../third_party/dart/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../third_party/dart/runtime/bin/address_sanitizer.cc
+FILE: ../../../third_party/dart/runtime/bin/dart_io_api_impl.cc
+FILE: ../../../third_party/dart/runtime/bin/observatory_assets_empty.cc
+FILE: ../../../third_party/dart/runtime/include/bin/dart_io_api.h
+FILE: ../../../third_party/dart/runtime/lib/developer.cc
+FILE: ../../../third_party/dart/runtime/lib/timeline.cc
+FILE: ../../../third_party/dart/runtime/lib/vmservice.cc
+FILE: ../../../third_party/dart/runtime/observatory/lib/allocation_profile.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/cli.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/debugger.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/sample_profile.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/allocation_profile/allocation_profile.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/cli/command.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/debugger/debugger.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/debugger/debugger_location.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/heap_snapshot.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/logging.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/logging_list.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/megamorphiccache_view.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/objectpool_view.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/persistent_handles.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/ports.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/timeline_page.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/sample_profile/sample_profile.dart
+FILE: ../../../third_party/dart/runtime/observatory/web/timeline.js
+FILE: ../../../third_party/dart/runtime/vm/compiler/aot/precompiler.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/aot/precompiler.h
+FILE: ../../../third_party/dart/runtime/vm/log.cc
+FILE: ../../../third_party/dart/runtime/vm/log.h
+FILE: ../../../third_party/dart/runtime/vm/os_thread.cc
+FILE: ../../../third_party/dart/runtime/vm/profiler_service.cc
+FILE: ../../../third_party/dart/runtime/vm/profiler_service.h
+FILE: ../../../third_party/dart/runtime/vm/program_visitor.cc
+FILE: ../../../third_party/dart/runtime/vm/program_visitor.h
+FILE: ../../../third_party/dart/runtime/vm/regexp_assembler_bytecode.cc
+FILE: ../../../third_party/dart/runtime/vm/regexp_assembler_bytecode.h
+FILE: ../../../third_party/dart/runtime/vm/regexp_assembler_bytecode_inl.h
+FILE: ../../../third_party/dart/runtime/vm/regexp_bytecodes.h
+FILE: ../../../third_party/dart/runtime/vm/regexp_interpreter.cc
+FILE: ../../../third_party/dart/runtime/vm/regexp_interpreter.h
+FILE: ../../../third_party/dart/runtime/vm/scope_timer.h
+FILE: ../../../third_party/dart/runtime/vm/service_event.cc
+FILE: ../../../third_party/dart/runtime/vm/service_event.h
+FILE: ../../../third_party/dart/runtime/vm/service_isolate.cc
+FILE: ../../../third_party/dart/runtime/vm/source_report.cc
+FILE: ../../../third_party/dart/runtime/vm/source_report.h
+FILE: ../../../third_party/dart/runtime/vm/thread.cc
+FILE: ../../../third_party/dart/runtime/vm/thread.h
+FILE: ../../../third_party/dart/runtime/vm/thread_barrier.h
+FILE: ../../../third_party/dart/runtime/vm/thread_registry.cc
+FILE: ../../../third_party/dart/runtime/vm/thread_registry.h
+FILE: ../../../third_party/dart/runtime/vm/timeline.cc
+FILE: ../../../third_party/dart/runtime/vm/timeline.h
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/developer_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_runtime/classes.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_runtime/errors.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_runtime/operations.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_runtime/rtti.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_runtime/runtime.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_runtime/types.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_runtime/utils.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/debugger.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/developer_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/preambles/d8.js
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/preambles/jsshell.js
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/synced/async_status_codes.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/async_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/developer.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/timeline.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm_shared/lib/compact_hash.dart
+FILE: ../../../third_party/dart/sdk/lib/convert/base64.dart
+FILE: ../../../third_party/dart/sdk/lib/developer/developer.dart
+FILE: ../../../third_party/dart/sdk/lib/developer/extension.dart
+FILE: ../../../third_party/dart/sdk/lib/developer/timeline.dart
+FILE: ../../../third_party/dart/sdk/lib/io/io_resource_info.dart
+FILE: ../../../third_party/dart/sdk/lib/io/security_context.dart
+FILE: ../../../third_party/dart/sdk/lib/js/_js_annotations.dart
+FILE: ../../../third_party/dart/sdk/lib/vmservice/asset.dart
+FILE: ../../../third_party/dart/sdk/lib/vmservice/vmservice.dart
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
+for details. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google LLC nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: dart
+ORIGIN: ../../../third_party/dart/runtime/bin/crypto_fuchsia.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/directory_fuchsia.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/eventhandler_fuchsia.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/eventhandler_fuchsia.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/file_fuchsia.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/file_support.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/file_system_watcher_fuchsia.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/loader.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/loader.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/platform_fuchsia.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/process_fuchsia.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/reference_counting.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/root_certificates_unsupported.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/socket_base_fuchsia.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/socket_base_fuchsia.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/socket_fuchsia.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/stdio_fuchsia.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/thread_fuchsia.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/thread_fuchsia.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/utils_fuchsia.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/lib/stacktrace.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/event.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/models.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/repositories.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/app/notification.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/class_allocation_profile.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/containers/virtual_collection.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/containers/virtual_tree.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/error_ref.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/general_error.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/helpers/custom_element.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/helpers/nav_bar.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/helpers/nav_menu.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/helpers/rendering_queue.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/helpers/rendering_scheduler.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/helpers/uris.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/inbound_references.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/isolate/counter_chart.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/isolate/location.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/isolate/run_state.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/isolate/shared_summary.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/isolate/summary.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/metric/details.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/metric/graph.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/nav/class_menu.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/nav/isolate_menu.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/nav/library_menu.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/nav/menu_item.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/nav/notify.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/nav/notify_event.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/nav/notify_exception.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/nav/refresh.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/nav/top_menu.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/nav/vm_menu.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/retaining_path.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/source_link.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/strongly_reachable_instances.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/vm_connect_target.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/exceptions.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/allocation_profile.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/breakpoint.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/class.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/code.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/context.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/error.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/event.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/extension_data.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/field.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/flag.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/frame.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/function.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/guarded.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/heap_space.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/icdata.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/inbound_references.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/instance.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/isolate.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/library.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/local_var_descriptors.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/map_association.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/megamorphiccache.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/metric.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/notification.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/object.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/objectpool.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/objectstore.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/pc_descriptors.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/persistent_handles.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/ports.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/retaining_path.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/sample_profile.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/script.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/sentinel.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/source_location.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/target.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/timeline_event.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/type_arguments.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/unknown.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/vm.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/allocation_profile.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/breakpoint.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/class.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/context.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/editor.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/eval.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/event.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/field.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/flag.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/function.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/heap_snapshot.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/icdata.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/inbound_references.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/instance.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/isolate.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/library.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/megamorphiccache.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/metric.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/notification.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/object.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/objectpool.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/objectstore.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/persistent_handles.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/ports.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/reachable_size.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/retained_size.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/retaining_path.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/sample_profile.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/script.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/strongly_reachable_instances.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/target.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/type_arguments.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/allocation_profile.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/breakpoint.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/class.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/context.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/editor.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/eval.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/event.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/field.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/flag.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/function.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/heap_snapshot.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/icdata.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/inbound_references.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/instance.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/isolate.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/library.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/megamorphiccache.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/metric.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/notification.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/object.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/objectpool.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/objectstore.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/persistent_handles.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/ports.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/reachable_size.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/retained_size.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/retaining_path.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/sample_profile.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/script.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/settings.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/strongly_reachable_instances.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/target.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/type_arguments.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/web/timeline_message_handler.js + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/syslog_fuchsia.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/utils_fuchsia.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/utils_fuchsia.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/app_snapshot.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/app_snapshot.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/canonical_tables.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/branch_optimizer.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/branch_optimizer.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/redundancy_elimination.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/redundancy_elimination.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/frontend/kernel_binary_flowgraph.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/frontend/kernel_to_il.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/frontend/kernel_to_il.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/cpuinfo_fuchsia.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/dart_api_state.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/heap/become.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/heap/become.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/heap/safepoint.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/heap/safepoint.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/isolate_reload.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/isolate_reload.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/kernel.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/kernel.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/kernel_binary.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/kernel_isolate.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/kernel_isolate.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/kernel_loader.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/kernel_loader.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/lockers.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/object_reload.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/object_service.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/os_fuchsia.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/os_thread_fuchsia.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/os_thread_fuchsia.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/signal_handler_fuchsia.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/thread_interrupter_fuchsia.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/token_position.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/token_position.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/uri.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/uri.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/virtual_memory_fuchsia.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/developer/service.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/js_util/js_util.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/vmservice/devfs.dart + ../../../third_party/dart/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../third_party/dart/runtime/bin/crypto_fuchsia.cc
+FILE: ../../../third_party/dart/runtime/bin/directory_fuchsia.cc
+FILE: ../../../third_party/dart/runtime/bin/eventhandler_fuchsia.cc
+FILE: ../../../third_party/dart/runtime/bin/eventhandler_fuchsia.h
+FILE: ../../../third_party/dart/runtime/bin/file_fuchsia.cc
+FILE: ../../../third_party/dart/runtime/bin/file_support.cc
+FILE: ../../../third_party/dart/runtime/bin/file_system_watcher_fuchsia.cc
+FILE: ../../../third_party/dart/runtime/bin/loader.cc
+FILE: ../../../third_party/dart/runtime/bin/loader.h
+FILE: ../../../third_party/dart/runtime/bin/platform_fuchsia.cc
+FILE: ../../../third_party/dart/runtime/bin/process_fuchsia.cc
+FILE: ../../../third_party/dart/runtime/bin/reference_counting.h
+FILE: ../../../third_party/dart/runtime/bin/root_certificates_unsupported.cc
+FILE: ../../../third_party/dart/runtime/bin/socket_base_fuchsia.cc
+FILE: ../../../third_party/dart/runtime/bin/socket_base_fuchsia.h
+FILE: ../../../third_party/dart/runtime/bin/socket_fuchsia.cc
+FILE: ../../../third_party/dart/runtime/bin/stdio_fuchsia.cc
+FILE: ../../../third_party/dart/runtime/bin/thread_fuchsia.cc
+FILE: ../../../third_party/dart/runtime/bin/thread_fuchsia.h
+FILE: ../../../third_party/dart/runtime/bin/utils_fuchsia.cc
+FILE: ../../../third_party/dart/runtime/lib/stacktrace.h
+FILE: ../../../third_party/dart/runtime/observatory/lib/event.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/models.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/repositories.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/app/notification.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/class_allocation_profile.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/containers/virtual_collection.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/containers/virtual_tree.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/error_ref.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/general_error.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/helpers/custom_element.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/helpers/nav_bar.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/helpers/nav_menu.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/helpers/rendering_queue.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/helpers/rendering_scheduler.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/helpers/uris.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/inbound_references.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/isolate/counter_chart.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/isolate/location.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/isolate/run_state.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/isolate/shared_summary.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/isolate/summary.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/metric/details.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/metric/graph.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/nav/class_menu.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/nav/isolate_menu.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/nav/library_menu.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/nav/menu_item.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/nav/notify.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/nav/notify_event.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/nav/notify_exception.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/nav/refresh.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/nav/top_menu.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/nav/vm_menu.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/retaining_path.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/source_link.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/strongly_reachable_instances.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/vm_connect_target.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/exceptions.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/allocation_profile.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/breakpoint.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/class.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/code.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/context.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/error.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/event.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/extension_data.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/field.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/flag.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/frame.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/function.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/guarded.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/heap_space.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/icdata.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/inbound_references.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/instance.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/isolate.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/library.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/local_var_descriptors.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/map_association.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/megamorphiccache.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/metric.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/notification.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/object.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/objectpool.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/objectstore.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/pc_descriptors.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/persistent_handles.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/ports.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/retaining_path.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/sample_profile.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/script.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/sentinel.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/source_location.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/target.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/timeline_event.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/type_arguments.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/unknown.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/vm.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/allocation_profile.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/breakpoint.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/class.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/context.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/editor.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/eval.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/event.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/field.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/flag.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/function.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/heap_snapshot.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/icdata.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/inbound_references.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/instance.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/isolate.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/library.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/megamorphiccache.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/metric.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/notification.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/object.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/objectpool.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/objectstore.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/persistent_handles.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/ports.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/reachable_size.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/retained_size.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/retaining_path.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/sample_profile.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/script.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/strongly_reachable_instances.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/target.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/type_arguments.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/allocation_profile.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/breakpoint.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/class.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/context.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/editor.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/eval.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/event.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/field.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/flag.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/function.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/heap_snapshot.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/icdata.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/inbound_references.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/instance.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/isolate.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/library.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/megamorphiccache.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/metric.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/notification.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/object.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/objectpool.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/objectstore.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/persistent_handles.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/ports.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/reachable_size.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/retained_size.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/retaining_path.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/sample_profile.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/script.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/settings.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/strongly_reachable_instances.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/target.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/type_arguments.dart
+FILE: ../../../third_party/dart/runtime/observatory/web/timeline_message_handler.js
+FILE: ../../../third_party/dart/runtime/platform/syslog_fuchsia.cc
+FILE: ../../../third_party/dart/runtime/platform/utils_fuchsia.cc
+FILE: ../../../third_party/dart/runtime/platform/utils_fuchsia.h
+FILE: ../../../third_party/dart/runtime/vm/app_snapshot.cc
+FILE: ../../../third_party/dart/runtime/vm/app_snapshot.h
+FILE: ../../../third_party/dart/runtime/vm/canonical_tables.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/branch_optimizer.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/branch_optimizer.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/redundancy_elimination.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/redundancy_elimination.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/kernel_binary_flowgraph.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/kernel_to_il.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/kernel_to_il.h
+FILE: ../../../third_party/dart/runtime/vm/cpuinfo_fuchsia.cc
+FILE: ../../../third_party/dart/runtime/vm/dart_api_state.cc
+FILE: ../../../third_party/dart/runtime/vm/heap/become.cc
+FILE: ../../../third_party/dart/runtime/vm/heap/become.h
+FILE: ../../../third_party/dart/runtime/vm/heap/safepoint.cc
+FILE: ../../../third_party/dart/runtime/vm/heap/safepoint.h
+FILE: ../../../third_party/dart/runtime/vm/isolate_reload.cc
+FILE: ../../../third_party/dart/runtime/vm/isolate_reload.h
+FILE: ../../../third_party/dart/runtime/vm/kernel.cc
+FILE: ../../../third_party/dart/runtime/vm/kernel.h
+FILE: ../../../third_party/dart/runtime/vm/kernel_binary.cc
+FILE: ../../../third_party/dart/runtime/vm/kernel_isolate.cc
+FILE: ../../../third_party/dart/runtime/vm/kernel_isolate.h
+FILE: ../../../third_party/dart/runtime/vm/kernel_loader.cc
+FILE: ../../../third_party/dart/runtime/vm/kernel_loader.h
+FILE: ../../../third_party/dart/runtime/vm/lockers.cc
+FILE: ../../../third_party/dart/runtime/vm/object_reload.cc
+FILE: ../../../third_party/dart/runtime/vm/object_service.cc
+FILE: ../../../third_party/dart/runtime/vm/os_fuchsia.cc
+FILE: ../../../third_party/dart/runtime/vm/os_thread_fuchsia.cc
+FILE: ../../../third_party/dart/runtime/vm/os_thread_fuchsia.h
+FILE: ../../../third_party/dart/runtime/vm/signal_handler_fuchsia.cc
+FILE: ../../../third_party/dart/runtime/vm/thread_interrupter_fuchsia.cc
+FILE: ../../../third_party/dart/runtime/vm/token_position.cc
+FILE: ../../../third_party/dart/runtime/vm/token_position.h
+FILE: ../../../third_party/dart/runtime/vm/uri.cc
+FILE: ../../../third_party/dart/runtime/vm/uri.h
+FILE: ../../../third_party/dart/runtime/vm/virtual_memory_fuchsia.cc
+FILE: ../../../third_party/dart/sdk/lib/developer/service.dart
+FILE: ../../../third_party/dart/sdk/lib/js_util/js_util.dart
+FILE: ../../../third_party/dart/sdk/lib/vmservice/devfs.dart
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
+for details. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google LLC nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: dart
+ORIGIN: ../../../third_party/dart/runtime/bin/dfe.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/dfe.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/error_exit.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/error_exit.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/gzip.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/gzip.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/isolate_data.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/main_options.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/main_options.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/namespace.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/namespace.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/namespace_fuchsia.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/namespace_linux.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/namespace_macos.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/namespace_win.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/options.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/options.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/secure_socket_filter.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/secure_socket_filter.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/secure_socket_utils.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/secure_socket_utils.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/security_context.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/security_context.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/security_context_fuchsia.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/security_context_linux.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/security_context_macos.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/security_context_win.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/snapshot_utils.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/snapshot_utils.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/socket_base.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/socket_base.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/sync_socket.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/sync_socket.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/sync_socket_fuchsia.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/sync_socket_linux.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/sync_socket_macos.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/sync_socket_win.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/lib/async.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/containers/search_bar.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/nav/reload.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/singletargetcache_ref.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/singletargetcache_view.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/subtypetestcache_ref.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/subtypetestcache_view.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/unlinkedcall_ref.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/unlinkedcall_view.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/service.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/single_target_cache.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/subtype_test_cache.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/timeline.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/unlinked_call.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/single_target_cache.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/subtype_test_cache.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/timeline.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/unlinked_call.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/vm.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/single_target_cache.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/subtype_test_cache.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/timeline.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/unlinked_call.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/vm.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/allocation.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/growable_array.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_riscv.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_riscv.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/assembler/disassembler_riscv.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/locations_helpers.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/locations_helpers_arm.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/call_specializer.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/call_specializer.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/frontend/kernel_binary_flowgraph.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/frontend/prologue_builder.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/frontend/prologue_builder.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/jit/jit_call_specializer.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/constants_riscv.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/constants_riscv.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/constants_x86.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/dwarf.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/dwarf.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/fixed_cache.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/gdb_helpers.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/heap/compactor.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/heap/compactor.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/image_snapshot.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/image_snapshot.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/json_writer.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/json_writer.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/kernel_binary.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/simulator_riscv.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/simulator_riscv.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/stack_trace.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/stack_trace.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/timeline_android.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/timeline_fuchsia.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/timeline_linux.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/zone_text_buffer.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/zone_text_buffer.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_http/overrides.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/custom_hash_map.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/identity_hash_map.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/linked_hash_map.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/profile.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/bin/namespace_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/bin/sync_socket_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/class_id_fasta.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm_shared/lib/bigint_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/cli/cli.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/bigint.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/internal/linked_list.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/internal/patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/io/embedder_config.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/io/namespace_impl.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/io/overrides.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/io/sync_socket.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/vmservice/named_lookup.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/utils/bazel/kernel_worker.dart + ../../../third_party/dart/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../third_party/dart/runtime/bin/dfe.cc
+FILE: ../../../third_party/dart/runtime/bin/dfe.h
+FILE: ../../../third_party/dart/runtime/bin/error_exit.cc
+FILE: ../../../third_party/dart/runtime/bin/error_exit.h
+FILE: ../../../third_party/dart/runtime/bin/gzip.cc
+FILE: ../../../third_party/dart/runtime/bin/gzip.h
+FILE: ../../../third_party/dart/runtime/bin/isolate_data.cc
+FILE: ../../../third_party/dart/runtime/bin/main_options.cc
+FILE: ../../../third_party/dart/runtime/bin/main_options.h
+FILE: ../../../third_party/dart/runtime/bin/namespace.cc
+FILE: ../../../third_party/dart/runtime/bin/namespace.h
+FILE: ../../../third_party/dart/runtime/bin/namespace_fuchsia.cc
+FILE: ../../../third_party/dart/runtime/bin/namespace_linux.cc
+FILE: ../../../third_party/dart/runtime/bin/namespace_macos.cc
+FILE: ../../../third_party/dart/runtime/bin/namespace_win.cc
+FILE: ../../../third_party/dart/runtime/bin/options.cc
+FILE: ../../../third_party/dart/runtime/bin/options.h
+FILE: ../../../third_party/dart/runtime/bin/secure_socket_filter.cc
+FILE: ../../../third_party/dart/runtime/bin/secure_socket_filter.h
+FILE: ../../../third_party/dart/runtime/bin/secure_socket_utils.cc
+FILE: ../../../third_party/dart/runtime/bin/secure_socket_utils.h
+FILE: ../../../third_party/dart/runtime/bin/security_context.cc
+FILE: ../../../third_party/dart/runtime/bin/security_context.h
+FILE: ../../../third_party/dart/runtime/bin/security_context_fuchsia.cc
+FILE: ../../../third_party/dart/runtime/bin/security_context_linux.cc
+FILE: ../../../third_party/dart/runtime/bin/security_context_macos.cc
+FILE: ../../../third_party/dart/runtime/bin/security_context_win.cc
+FILE: ../../../third_party/dart/runtime/bin/snapshot_utils.cc
+FILE: ../../../third_party/dart/runtime/bin/snapshot_utils.h
+FILE: ../../../third_party/dart/runtime/bin/socket_base.cc
+FILE: ../../../third_party/dart/runtime/bin/socket_base.h
+FILE: ../../../third_party/dart/runtime/bin/sync_socket.cc
+FILE: ../../../third_party/dart/runtime/bin/sync_socket.h
+FILE: ../../../third_party/dart/runtime/bin/sync_socket_fuchsia.cc
+FILE: ../../../third_party/dart/runtime/bin/sync_socket_linux.cc
+FILE: ../../../third_party/dart/runtime/bin/sync_socket_macos.cc
+FILE: ../../../third_party/dart/runtime/bin/sync_socket_win.cc
+FILE: ../../../third_party/dart/runtime/lib/async.cc
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/containers/search_bar.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/nav/reload.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/singletargetcache_ref.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/singletargetcache_view.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/subtypetestcache_ref.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/subtypetestcache_view.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/unlinkedcall_ref.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/unlinkedcall_view.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/service.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/single_target_cache.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/subtype_test_cache.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/timeline.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/unlinked_call.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/single_target_cache.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/subtype_test_cache.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/timeline.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/unlinked_call.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/vm.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/single_target_cache.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/subtype_test_cache.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/timeline.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/unlinked_call.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/vm.dart
+FILE: ../../../third_party/dart/runtime/platform/allocation.h
+FILE: ../../../third_party/dart/runtime/platform/growable_array.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_riscv.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_riscv.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/disassembler_riscv.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/locations_helpers.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/locations_helpers_arm.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/call_specializer.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/call_specializer.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/kernel_binary_flowgraph.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/prologue_builder.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/prologue_builder.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/jit/jit_call_specializer.h
+FILE: ../../../third_party/dart/runtime/vm/constants_riscv.cc
+FILE: ../../../third_party/dart/runtime/vm/constants_riscv.h
+FILE: ../../../third_party/dart/runtime/vm/constants_x86.h
+FILE: ../../../third_party/dart/runtime/vm/dwarf.cc
+FILE: ../../../third_party/dart/runtime/vm/dwarf.h
+FILE: ../../../third_party/dart/runtime/vm/fixed_cache.h
+FILE: ../../../third_party/dart/runtime/vm/gdb_helpers.cc
+FILE: ../../../third_party/dart/runtime/vm/heap/compactor.cc
+FILE: ../../../third_party/dart/runtime/vm/heap/compactor.h
+FILE: ../../../third_party/dart/runtime/vm/image_snapshot.cc
+FILE: ../../../third_party/dart/runtime/vm/image_snapshot.h
+FILE: ../../../third_party/dart/runtime/vm/json_writer.cc
+FILE: ../../../third_party/dart/runtime/vm/json_writer.h
+FILE: ../../../third_party/dart/runtime/vm/kernel_binary.h
+FILE: ../../../third_party/dart/runtime/vm/simulator_riscv.cc
+FILE: ../../../third_party/dart/runtime/vm/simulator_riscv.h
+FILE: ../../../third_party/dart/runtime/vm/stack_trace.cc
+FILE: ../../../third_party/dart/runtime/vm/stack_trace.h
+FILE: ../../../third_party/dart/runtime/vm/timeline_android.cc
+FILE: ../../../third_party/dart/runtime/vm/timeline_fuchsia.cc
+FILE: ../../../third_party/dart/runtime/vm/timeline_linux.cc
+FILE: ../../../third_party/dart/runtime/vm/zone_text_buffer.cc
+FILE: ../../../third_party/dart/runtime/vm/zone_text_buffer.h
+FILE: ../../../third_party/dart/sdk/lib/_http/overrides.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/custom_hash_map.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/identity_hash_map.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/linked_hash_map.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/profile.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/namespace_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/sync_socket_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/class_id_fasta.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm_shared/lib/bigint_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/cli/cli.dart
+FILE: ../../../third_party/dart/sdk/lib/core/bigint.dart
+FILE: ../../../third_party/dart/sdk/lib/internal/linked_list.dart
+FILE: ../../../third_party/dart/sdk/lib/internal/patch.dart
+FILE: ../../../third_party/dart/sdk/lib/io/embedder_config.dart
+FILE: ../../../third_party/dart/sdk/lib/io/namespace_impl.dart
+FILE: ../../../third_party/dart/sdk/lib/io/overrides.dart
+FILE: ../../../third_party/dart/sdk/lib/io/sync_socket.dart
+FILE: ../../../third_party/dart/sdk/lib/vmservice/named_lookup.dart
+FILE: ../../../third_party/dart/utils/bazel/kernel_worker.dart
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
+for details. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google LLC nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: dart
+ORIGIN: ../../../third_party/dart/runtime/bin/crashpad.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/dart_embedder_api_impl.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/typed_data_utils.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/typed_data_utils.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/include/dart_embedder_api.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/tools/dartfuzz/dartfuzz.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/base64.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/base64.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/code_statistics.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/code_statistics.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/compile_type.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/loops.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/loops.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/slot.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/slot.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/compiler_pass.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/compiler_pass.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/compiler_state.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/compiler_state.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/frontend/base_flow_graph_builder.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/frontend/base_flow_graph_builder.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/frontend/constant_reader.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/frontend/constant_reader.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/frontend/kernel_fingerprints.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/frontend/kernel_fingerprints.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/frontend/kernel_translation_helper.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/frontend/kernel_translation_helper.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/frontend/scope_builder.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/frontend/scope_builder.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/relocation.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/constants.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/datastream.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/finalizable_data.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/hash.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/raw_object_fields.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/raw_object_fields.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/reverse_pc_lookup_cache.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/reverse_pc_lookup_cache.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/type_testing_stubs.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/type_testing_stubs.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/v8_snapshot_writer.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/v8_snapshot_writer.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/instantiation.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/js/_js.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/js/_js_client.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/js/_js_server.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/typed_data/unmodifiable_typed_data.dart + ../../../third_party/dart/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../third_party/dart/runtime/bin/crashpad.h
+FILE: ../../../third_party/dart/runtime/bin/dart_embedder_api_impl.cc
+FILE: ../../../third_party/dart/runtime/bin/typed_data_utils.cc
+FILE: ../../../third_party/dart/runtime/bin/typed_data_utils.h
+FILE: ../../../third_party/dart/runtime/include/dart_embedder_api.h
+FILE: ../../../third_party/dart/runtime/tools/dartfuzz/dartfuzz.dart
+FILE: ../../../third_party/dart/runtime/vm/base64.cc
+FILE: ../../../third_party/dart/runtime/vm/base64.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/code_statistics.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/code_statistics.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/compile_type.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/loops.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/loops.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/slot.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/slot.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/compiler_pass.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/compiler_pass.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/compiler_state.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/compiler_state.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/base_flow_graph_builder.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/base_flow_graph_builder.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/constant_reader.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/constant_reader.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/kernel_fingerprints.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/kernel_fingerprints.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/kernel_translation_helper.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/kernel_translation_helper.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/scope_builder.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/scope_builder.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/relocation.h
+FILE: ../../../third_party/dart/runtime/vm/constants.h
+FILE: ../../../third_party/dart/runtime/vm/datastream.cc
+FILE: ../../../third_party/dart/runtime/vm/finalizable_data.h
+FILE: ../../../third_party/dart/runtime/vm/hash.h
+FILE: ../../../third_party/dart/runtime/vm/raw_object_fields.cc
+FILE: ../../../third_party/dart/runtime/vm/raw_object_fields.h
+FILE: ../../../third_party/dart/runtime/vm/reverse_pc_lookup_cache.cc
+FILE: ../../../third_party/dart/runtime/vm/reverse_pc_lookup_cache.h
+FILE: ../../../third_party/dart/runtime/vm/type_testing_stubs.cc
+FILE: ../../../third_party/dart/runtime/vm/type_testing_stubs.h
+FILE: ../../../third_party/dart/runtime/vm/v8_snapshot_writer.cc
+FILE: ../../../third_party/dart/runtime/vm/v8_snapshot_writer.h
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/instantiation.dart
+FILE: ../../../third_party/dart/sdk/lib/js/_js.dart
+FILE: ../../../third_party/dart/sdk/lib/js/_js_client.dart
+FILE: ../../../third_party/dart/sdk/lib/js/_js_server.dart
+FILE: ../../../third_party/dart/sdk/lib/typed_data/unmodifiable_typed_data.dart
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+for details. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google LLC nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: dart
+ORIGIN: ../../../third_party/dart/runtime/bin/console.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/console_posix.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/console_win.cc + ../../../third_party/dart/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../third_party/dart/runtime/bin/console.h
+FILE: ../../../third_party/dart/runtime/bin/console_posix.cc
+FILE: ../../../third_party/dart/runtime/bin/console_win.cc
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2018, the Dart project authors. Please see the AUTHORS file
+for details. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google LLC nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: dart
+ORIGIN: ../../../third_party/dart/runtime/bin/elf_loader.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/elf_loader.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/namespace_fuchsia.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/lib/ffi.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/lib/ffi_dynamic_library.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/tree_map.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/isolate_group.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/isolate_group.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/isolate_group.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/repositories/timeline_base.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/elf.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/thread_sanitizer.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/tools/dartfuzz/dartfuzz_api_table.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/tools/dartfuzz/dartfuzz_ffi_api.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/tools/dartfuzz/dartfuzz_type_table.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/tools/dartfuzz/gen_api_table.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/tools/dartfuzz/gen_type_table.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/tools/dartfuzz/gen_util.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/tools/ffi/sdk_lib_ffi_generator.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/tools/graphexplorer/graphexplorer.html + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/tools/graphexplorer/graphexplorer.js + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/tools/run_clang_tidy.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/bss_relocs.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/bss_relocs.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/class_id.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/code_comments.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/code_comments.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/code_entry_kind.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/asm_intrinsifier.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/asm_intrinsifier.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/asm_intrinsifier_arm.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/asm_intrinsifier_arm64.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/asm_intrinsifier_ia32.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/asm_intrinsifier_x64.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/block_builder.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/evaluator.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/evaluator.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/flow_graph_checker.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/flow_graph_checker.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/il_test_helper.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/il_test_helper.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/graph_intrinsifier.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/graph_intrinsifier.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/offsets_extractor.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/recognized_methods_list.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/relocation.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/runtime_api.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/runtime_api.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/runtime_offsets_extracted.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/runtime_offsets_list.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/stub_code_compiler.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/stub_code_compiler_arm.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/stub_code_compiler_arm64.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/stub_code_compiler_ia32.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/stub_code_compiler_x64.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/constants_arm.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/constants_arm64.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/constants_ia32.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/constants_x64.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/elf.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/elf.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/frame_layout.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/intrusive_dlist.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/libfuzzer/dart_libfuzzer.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/longjump.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/pointer_tagging.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/splay-tree.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/static_type_exactness_state.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/stub_code_list.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/thread_stack_resource.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/thread_stack_resource.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/thread_state.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/thread_state.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_shared/lib/rti.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_shared/lib/synced/recipe_syntax.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_dynamic_library_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_native_type_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/ffi/annotations.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/ffi/dynamic_library.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/ffi/ffi.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/ffi/native_type.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/ffi/struct.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/internal/errors.dart + ../../../third_party/dart/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../third_party/dart/runtime/bin/elf_loader.cc
+FILE: ../../../third_party/dart/runtime/bin/elf_loader.h
+FILE: ../../../third_party/dart/runtime/bin/namespace_fuchsia.h
+FILE: ../../../third_party/dart/runtime/lib/ffi.cc
+FILE: ../../../third_party/dart/runtime/lib/ffi_dynamic_library.cc
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/tree_map.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/isolate_group.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/isolate_group.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/isolate_group.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/timeline_base.dart
+FILE: ../../../third_party/dart/runtime/platform/elf.h
+FILE: ../../../third_party/dart/runtime/platform/thread_sanitizer.h
+FILE: ../../../third_party/dart/runtime/tools/dartfuzz/dartfuzz_api_table.dart
+FILE: ../../../third_party/dart/runtime/tools/dartfuzz/dartfuzz_ffi_api.dart
+FILE: ../../../third_party/dart/runtime/tools/dartfuzz/dartfuzz_type_table.dart
+FILE: ../../../third_party/dart/runtime/tools/dartfuzz/gen_api_table.dart
+FILE: ../../../third_party/dart/runtime/tools/dartfuzz/gen_type_table.dart
+FILE: ../../../third_party/dart/runtime/tools/dartfuzz/gen_util.dart
+FILE: ../../../third_party/dart/runtime/tools/ffi/sdk_lib_ffi_generator.dart
+FILE: ../../../third_party/dart/runtime/tools/graphexplorer/graphexplorer.html
+FILE: ../../../third_party/dart/runtime/tools/graphexplorer/graphexplorer.js
+FILE: ../../../third_party/dart/runtime/tools/run_clang_tidy.dart
+FILE: ../../../third_party/dart/runtime/vm/bss_relocs.cc
+FILE: ../../../third_party/dart/runtime/vm/bss_relocs.h
+FILE: ../../../third_party/dart/runtime/vm/class_id.h
+FILE: ../../../third_party/dart/runtime/vm/code_comments.cc
+FILE: ../../../third_party/dart/runtime/vm/code_comments.h
+FILE: ../../../third_party/dart/runtime/vm/code_entry_kind.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/asm_intrinsifier.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/asm_intrinsifier.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/asm_intrinsifier_arm.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/asm_intrinsifier_arm64.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/asm_intrinsifier_ia32.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/asm_intrinsifier_x64.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/block_builder.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/evaluator.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/evaluator.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/flow_graph_checker.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/flow_graph_checker.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/il_test_helper.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/il_test_helper.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/graph_intrinsifier.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/graph_intrinsifier.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/offsets_extractor.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/recognized_methods_list.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/relocation.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/runtime_api.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/runtime_api.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/runtime_offsets_extracted.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/runtime_offsets_list.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/stub_code_compiler.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/stub_code_compiler_arm.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/stub_code_compiler_arm64.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/stub_code_compiler_ia32.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/stub_code_compiler_x64.cc
+FILE: ../../../third_party/dart/runtime/vm/constants_arm.cc
+FILE: ../../../third_party/dart/runtime/vm/constants_arm64.cc
+FILE: ../../../third_party/dart/runtime/vm/constants_ia32.cc
+FILE: ../../../third_party/dart/runtime/vm/constants_x64.cc
+FILE: ../../../third_party/dart/runtime/vm/elf.cc
+FILE: ../../../third_party/dart/runtime/vm/elf.h
+FILE: ../../../third_party/dart/runtime/vm/frame_layout.h
+FILE: ../../../third_party/dart/runtime/vm/intrusive_dlist.h
+FILE: ../../../third_party/dart/runtime/vm/libfuzzer/dart_libfuzzer.cc
+FILE: ../../../third_party/dart/runtime/vm/longjump.h
+FILE: ../../../third_party/dart/runtime/vm/pointer_tagging.h
+FILE: ../../../third_party/dart/runtime/vm/splay-tree.h
+FILE: ../../../third_party/dart/runtime/vm/static_type_exactness_state.h
+FILE: ../../../third_party/dart/runtime/vm/stub_code_list.h
+FILE: ../../../third_party/dart/runtime/vm/thread_stack_resource.cc
+FILE: ../../../third_party/dart/runtime/vm/thread_stack_resource.h
+FILE: ../../../third_party/dart/runtime/vm/thread_state.cc
+FILE: ../../../third_party/dart/runtime/vm/thread_state.h
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_shared/lib/rti.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_shared/lib/synced/recipe_syntax.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_dynamic_library_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_native_type_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/ffi/annotations.dart
+FILE: ../../../third_party/dart/sdk/lib/ffi/dynamic_library.dart
+FILE: ../../../third_party/dart/sdk/lib/ffi/ffi.dart
+FILE: ../../../third_party/dart/sdk/lib/ffi/native_type.dart
+FILE: ../../../third_party/dart/sdk/lib/ffi/struct.dart
+FILE: ../../../third_party/dart/sdk/lib/internal/errors.dart
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
+for details. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google LLC nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: dart
+ORIGIN: ../../../third_party/dart/sdk/lib/io/network_profiling.dart + ../../../third_party/dart/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../third_party/dart/sdk/lib/io/network_profiling.dart
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2019, the Dart project authors. Please see the AUTHORS file
+for details. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google LLC nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: dart
+ORIGIN: ../../../third_party/dart/runtime/bin/dartdev_isolate.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/dartdev_isolate.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/exe_utils.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/exe_utils.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/ffi_unit_test/run_ffi_unit_tests.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/file_win.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/platform_macos.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/include/dart_api_dl.c + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/include/dart_api_dl.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/include/dart_version.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/include/internal/dart_api_dl_impl.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/bin/heap_snapshot.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/observatory/lib/src/elements/process_snapshot.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/allocation.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/leak_sanitizer.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/priority_queue.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/unaligned.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/undefined_behavior_sanitizer.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/canonical_tables.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/closure_functions_cache.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/closure_functions_cache.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/aot/dispatch_table_generator.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/aot/dispatch_table_generator.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/aot/precompiler_tracer.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/aot/precompiler_tracer.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/api/deopt_id.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/api/print_filter.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/api/print_filter.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/api/type_check_mode.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_base.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/ffi/abi.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/ffi/abi.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/ffi/callback.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/ffi/callback.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/ffi/frame_rebase.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/ffi/frame_rebase.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/ffi/marshaller.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/ffi/marshaller.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/ffi/native_calling_convention.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/ffi/native_calling_convention.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/ffi/native_location.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/ffi/native_location.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/ffi/native_type.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/ffi/native_type.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/ffi/recognized_method.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/ffi/recognized_method.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_test_custom_zone.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_test_custom_zone.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/stub_code_compiler.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/write_barrier_elimination.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/write_barrier_elimination.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/constants_base.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/dispatch_table.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/dispatch_table.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/experimental_features.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/experimental_features.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/field_table.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/field_table.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/port_set.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/tagged_pointer.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/timeline_macos.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/visitor.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_http/embedder_config.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/js_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/js_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_struct_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/internal/lowering.dart + ../../../third_party/dart/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../third_party/dart/runtime/bin/dartdev_isolate.cc
+FILE: ../../../third_party/dart/runtime/bin/dartdev_isolate.h
+FILE: ../../../third_party/dart/runtime/bin/exe_utils.cc
+FILE: ../../../third_party/dart/runtime/bin/exe_utils.h
+FILE: ../../../third_party/dart/runtime/bin/ffi_unit_test/run_ffi_unit_tests.cc
+FILE: ../../../third_party/dart/runtime/bin/file_win.h
+FILE: ../../../third_party/dart/runtime/bin/platform_macos.h
+FILE: ../../../third_party/dart/runtime/include/dart_api_dl.c
+FILE: ../../../third_party/dart/runtime/include/dart_api_dl.h
+FILE: ../../../third_party/dart/runtime/include/dart_version.h
+FILE: ../../../third_party/dart/runtime/include/internal/dart_api_dl_impl.h
+FILE: ../../../third_party/dart/runtime/observatory/bin/heap_snapshot.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/process_snapshot.dart
+FILE: ../../../third_party/dart/runtime/platform/allocation.cc
+FILE: ../../../third_party/dart/runtime/platform/leak_sanitizer.h
+FILE: ../../../third_party/dart/runtime/platform/priority_queue.h
+FILE: ../../../third_party/dart/runtime/platform/unaligned.h
+FILE: ../../../third_party/dart/runtime/platform/undefined_behavior_sanitizer.h
+FILE: ../../../third_party/dart/runtime/vm/canonical_tables.cc
+FILE: ../../../third_party/dart/runtime/vm/closure_functions_cache.cc
+FILE: ../../../third_party/dart/runtime/vm/closure_functions_cache.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/aot/dispatch_table_generator.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/aot/dispatch_table_generator.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/aot/precompiler_tracer.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/aot/precompiler_tracer.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/api/deopt_id.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/api/print_filter.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/api/print_filter.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/api/type_check_mode.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_base.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/abi.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/abi.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/callback.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/callback.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/frame_rebase.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/frame_rebase.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/marshaller.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/marshaller.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/native_calling_convention.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/native_calling_convention.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/native_location.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/native_location.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/native_type.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/native_type.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/recognized_method.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/recognized_method.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_test_custom_zone.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_test_custom_zone.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/stub_code_compiler.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/write_barrier_elimination.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/write_barrier_elimination.h
+FILE: ../../../third_party/dart/runtime/vm/constants_base.h
+FILE: ../../../third_party/dart/runtime/vm/dispatch_table.cc
+FILE: ../../../third_party/dart/runtime/vm/dispatch_table.h
+FILE: ../../../third_party/dart/runtime/vm/experimental_features.cc
+FILE: ../../../third_party/dart/runtime/vm/experimental_features.h
+FILE: ../../../third_party/dart/runtime/vm/field_table.cc
+FILE: ../../../third_party/dart/runtime/vm/field_table.h
+FILE: ../../../third_party/dart/runtime/vm/port_set.h
+FILE: ../../../third_party/dart/runtime/vm/tagged_pointer.h
+FILE: ../../../third_party/dart/runtime/vm/timeline_macos.cc
+FILE: ../../../third_party/dart/runtime/vm/visitor.cc
+FILE: ../../../third_party/dart/sdk/lib/_http/embedder_config.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/js_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/js_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_struct_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/internal/lowering.dart
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
+for details. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google LLC nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: dart
+ORIGIN: ../../../third_party/dart/runtime/bin/analyze_snapshot.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/platform_macos_cocoa.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/platform_macos_cocoa.mm + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/socket_base_posix.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/utils.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/virtual_memory.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/virtual_memory_fuchsia.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/virtual_memory_posix.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/virtual_memory_win.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/include/analyze_snapshot_api.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/analyze_snapshot_api_impl.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/code_patcher_riscv.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/asm_intrinsifier_riscv.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/flow_graph_compiler_riscv.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/il_riscv.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/compiler_timings.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/compiler_timings.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/ffi/range.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/stub_code_compiler_riscv.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/cpu_riscv.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/cpu_riscv.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/debugger_riscv.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/instructions_riscv.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/instructions_riscv.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/message_snapshot.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/message_snapshot.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/object_graph_copy.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/object_graph_copy.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/pending_deopts.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/pending_deopts.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/runtime_entry_riscv.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/stack_frame_riscv.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/thread_interrupter_android_arm.S + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/virtual_memory_compressed.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/virtual_memory_compressed.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/dart2js_runtime_metrics.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/late_helper.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_allocation_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/enum.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/ffi/abi.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/ffi/abi_specific.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/ffi/allocation.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/ffi/union.dart + ../../../third_party/dart/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../third_party/dart/runtime/bin/analyze_snapshot.cc
+FILE: ../../../third_party/dart/runtime/bin/platform_macos_cocoa.h
+FILE: ../../../third_party/dart/runtime/bin/platform_macos_cocoa.mm
+FILE: ../../../third_party/dart/runtime/bin/socket_base_posix.cc
+FILE: ../../../third_party/dart/runtime/bin/utils.cc
+FILE: ../../../third_party/dart/runtime/bin/virtual_memory.h
+FILE: ../../../third_party/dart/runtime/bin/virtual_memory_fuchsia.cc
+FILE: ../../../third_party/dart/runtime/bin/virtual_memory_posix.cc
+FILE: ../../../third_party/dart/runtime/bin/virtual_memory_win.cc
+FILE: ../../../third_party/dart/runtime/include/analyze_snapshot_api.h
+FILE: ../../../third_party/dart/runtime/vm/analyze_snapshot_api_impl.cc
+FILE: ../../../third_party/dart/runtime/vm/code_patcher_riscv.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/asm_intrinsifier_riscv.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/flow_graph_compiler_riscv.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/il_riscv.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/compiler_timings.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/compiler_timings.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/range.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/stub_code_compiler_riscv.cc
+FILE: ../../../third_party/dart/runtime/vm/cpu_riscv.cc
+FILE: ../../../third_party/dart/runtime/vm/cpu_riscv.h
+FILE: ../../../third_party/dart/runtime/vm/debugger_riscv.cc
+FILE: ../../../third_party/dart/runtime/vm/instructions_riscv.cc
+FILE: ../../../third_party/dart/runtime/vm/instructions_riscv.h
+FILE: ../../../third_party/dart/runtime/vm/message_snapshot.cc
+FILE: ../../../third_party/dart/runtime/vm/message_snapshot.h
+FILE: ../../../third_party/dart/runtime/vm/object_graph_copy.cc
+FILE: ../../../third_party/dart/runtime/vm/object_graph_copy.h
+FILE: ../../../third_party/dart/runtime/vm/pending_deopts.cc
+FILE: ../../../third_party/dart/runtime/vm/pending_deopts.h
+FILE: ../../../third_party/dart/runtime/vm/runtime_entry_riscv.cc
+FILE: ../../../third_party/dart/runtime/vm/stack_frame_riscv.h
+FILE: ../../../third_party/dart/runtime/vm/thread_interrupter_android_arm.S
+FILE: ../../../third_party/dart/runtime/vm/virtual_memory_compressed.cc
+FILE: ../../../third_party/dart/runtime/vm/virtual_memory_compressed.h
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/dart2js_runtime_metrics.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/late_helper.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_allocation_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/core/enum.dart
+FILE: ../../../third_party/dart/sdk/lib/ffi/abi.dart
+FILE: ../../../third_party/dart/sdk/lib/ffi/abi_specific.dart
+FILE: ../../../third_party/dart/sdk/lib/ffi/allocation.dart
+FILE: ../../../third_party/dart/sdk/lib/ffi/union.dart
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2021, the Dart project authors.  Please see the AUTHORS file
+for details. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google LLC nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: dart
+ORIGIN: ../../../third_party/dart/runtime/bin/test_utils.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/test_utils.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/thread_absl.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/thread_absl.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/lib/integers.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/mach_o.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/pe.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/tools/heapsnapshot/bin/download.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/tools/heapsnapshot/bin/explore.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/tools/heapsnapshot/lib/src/cli.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/tools/heapsnapshot/lib/src/completion.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/tools/heapsnapshot/lib/src/console.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/tools/heapsnapshot/lib/src/expression.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/tools/heapsnapshot/lib/src/load.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/il_serializer.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/il_serializer.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/heap/gc_shared.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/heap/gc_shared.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/heap/page.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/heap/page.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/heap/sampler.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/heap/sampler.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/instructions.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/os_thread_absl.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/os_thread_absl.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/simulator_x64.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/simulator_x64.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_http/http_testing.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_names.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/synced/load_library_priority.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_shared/lib/js_util_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_shared/lib/synced/embedded_names.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_native_finalizer_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/finalizer_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/hash_factories.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm/lib/record_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/bool.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/class_id.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/convert_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/core_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/deferred.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/double_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/errors_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/growable_list.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/hash_factories.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/identical_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/internal_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/isolate_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/js_helper.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/js_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/js_util_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/list.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/math_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/named_parameters.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/object_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/print_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/regexp_helper.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/regexp_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/simd_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/stack_trace_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/stopwatch_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/string_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/symbol_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/timer_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/type.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/typed_data_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/uri_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm_js_compatibility/lib/convert_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_wasm/wasm_types.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/core/record.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/ffi/c_type.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/ffi/native_finalizer.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/js/js_wasm.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/js_util/js_util_wasm.dart + ../../../third_party/dart/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../third_party/dart/runtime/bin/test_utils.cc
+FILE: ../../../third_party/dart/runtime/bin/test_utils.h
+FILE: ../../../third_party/dart/runtime/bin/thread_absl.cc
+FILE: ../../../third_party/dart/runtime/bin/thread_absl.h
+FILE: ../../../third_party/dart/runtime/lib/integers.h
+FILE: ../../../third_party/dart/runtime/platform/mach_o.h
+FILE: ../../../third_party/dart/runtime/platform/pe.h
+FILE: ../../../third_party/dart/runtime/tools/heapsnapshot/bin/download.dart
+FILE: ../../../third_party/dart/runtime/tools/heapsnapshot/bin/explore.dart
+FILE: ../../../third_party/dart/runtime/tools/heapsnapshot/lib/src/cli.dart
+FILE: ../../../third_party/dart/runtime/tools/heapsnapshot/lib/src/completion.dart
+FILE: ../../../third_party/dart/runtime/tools/heapsnapshot/lib/src/console.dart
+FILE: ../../../third_party/dart/runtime/tools/heapsnapshot/lib/src/expression.dart
+FILE: ../../../third_party/dart/runtime/tools/heapsnapshot/lib/src/load.dart
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/il_serializer.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/il_serializer.h
+FILE: ../../../third_party/dart/runtime/vm/heap/gc_shared.cc
+FILE: ../../../third_party/dart/runtime/vm/heap/gc_shared.h
+FILE: ../../../third_party/dart/runtime/vm/heap/page.cc
+FILE: ../../../third_party/dart/runtime/vm/heap/page.h
+FILE: ../../../third_party/dart/runtime/vm/heap/sampler.cc
+FILE: ../../../third_party/dart/runtime/vm/heap/sampler.h
+FILE: ../../../third_party/dart/runtime/vm/instructions.cc
+FILE: ../../../third_party/dart/runtime/vm/os_thread_absl.cc
+FILE: ../../../third_party/dart/runtime/vm/os_thread_absl.h
+FILE: ../../../third_party/dart/runtime/vm/simulator_x64.cc
+FILE: ../../../third_party/dart/runtime/vm/simulator_x64.h
+FILE: ../../../third_party/dart/sdk/lib/_http/http_testing.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_names.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/synced/load_library_priority.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_shared/lib/js_util_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_shared/lib/synced/embedded_names.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_native_finalizer_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/finalizer_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/hash_factories.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/record_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/bool.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/class_id.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/convert_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/core_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/deferred.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/double_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/errors_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/growable_list.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/hash_factories.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/identical_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/internal_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/isolate_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/js_helper.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/js_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/js_util_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/list.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/math_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/named_parameters.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/object_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/print_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/regexp_helper.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/regexp_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/simd_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/stack_trace_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/stopwatch_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/string_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/symbol_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/timer_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/type.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/typed_data_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/uri_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm_js_compatibility/lib/convert_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_wasm/wasm_types.dart
+FILE: ../../../third_party/dart/sdk/lib/core/record.dart
+FILE: ../../../third_party/dart/sdk/lib/ffi/c_type.dart
+FILE: ../../../third_party/dart/sdk/lib/ffi/native_finalizer.dart
+FILE: ../../../third_party/dart/sdk/lib/js/js_wasm.dart
+FILE: ../../../third_party/dart/sdk/lib/js_util/js_util_wasm.dart
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
+for details. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google LLC nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: dart
+ORIGIN: ../../../third_party/dart/runtime/bin/dart_precompiled_runtime_test_component.cml + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/dart_test_component.cml + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/main_impl.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/run_vm_tests_test_component.cml + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/lib/ffi_dynamic_library.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/unwinding_records.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/unwinding_records.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/platform/unwinding_records_win.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm-jit.shard.cml + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm.shard.cml + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/parallel_move_resolver.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/parallel_move_resolver.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/ffi/native_assets.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/ffi/native_assets.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/ffi_callback_metadata.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/ffi_callback_metadata.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/unwinding_records.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/unwinding_records.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/unwinding_records_win.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/js_allow_interop_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_runtime/debugger.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_runtime/records.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/js_allow_interop_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/preambles/seal_native_object.js + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/records.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_shared/lib/convert_utf_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_shared/lib/js_interop_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_shared/lib/js_interop_unsafe_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_shared/lib/js_types.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/boxed_double.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/boxed_int.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/boxed_int_to_string.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/closure.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/date_patch_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/error_utils.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/int_common_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/int_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/js_array.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/js_interop_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/js_interop_unsafe_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/js_string.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/js_string_convert.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/js_typed_array.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/js_types.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/object_helper.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/record_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/simd.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/string.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/string_buffer_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/string_helper.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/sync_star_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/typed_data.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/wasm_types_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/weak_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm_js_compatibility/lib/boxed_int_to_string.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm_js_compatibility/lib/int_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm_js_compatibility/lib/string_buffer_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm_js_compatibility/lib/string_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm_js_compatibility/lib/typed_data.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm_js_compatibility/lib/typed_data_patch.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/async/future_extensions.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/js_interop/js_interop.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/js_interop_unsafe/js_interop_unsafe.dart + ../../../third_party/dart/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../third_party/dart/runtime/bin/dart_precompiled_runtime_test_component.cml
+FILE: ../../../third_party/dart/runtime/bin/dart_test_component.cml
+FILE: ../../../third_party/dart/runtime/bin/main_impl.h
+FILE: ../../../third_party/dart/runtime/bin/run_vm_tests_test_component.cml
+FILE: ../../../third_party/dart/runtime/lib/ffi_dynamic_library.h
+FILE: ../../../third_party/dart/runtime/platform/unwinding_records.cc
+FILE: ../../../third_party/dart/runtime/platform/unwinding_records.h
+FILE: ../../../third_party/dart/runtime/platform/unwinding_records_win.cc
+FILE: ../../../third_party/dart/runtime/vm-jit.shard.cml
+FILE: ../../../third_party/dart/runtime/vm.shard.cml
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/parallel_move_resolver.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/parallel_move_resolver.h
+FILE: ../../../third_party/dart/runtime/vm/ffi/native_assets.cc
+FILE: ../../../third_party/dart/runtime/vm/ffi/native_assets.h
+FILE: ../../../third_party/dart/runtime/vm/ffi_callback_metadata.cc
+FILE: ../../../third_party/dart/runtime/vm/ffi_callback_metadata.h
+FILE: ../../../third_party/dart/runtime/vm/unwinding_records.cc
+FILE: ../../../third_party/dart/runtime/vm/unwinding_records.h
+FILE: ../../../third_party/dart/runtime/vm/unwinding_records_win.cc
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/js_allow_interop_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_runtime/debugger.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_runtime/records.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/js_allow_interop_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/preambles/seal_native_object.js
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/records.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_shared/lib/convert_utf_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_shared/lib/js_interop_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_shared/lib/js_interop_unsafe_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_shared/lib/js_types.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/boxed_double.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/boxed_int.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/boxed_int_to_string.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/closure.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/date_patch_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/error_utils.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/int_common_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/int_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/js_array.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/js_interop_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/js_interop_unsafe_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/js_string.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/js_string_convert.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/js_typed_array.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/js_types.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/object_helper.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/record_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/simd.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/string.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/string_buffer_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/string_helper.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/sync_star_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/typed_data.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/wasm_types_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/weak_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm_js_compatibility/lib/boxed_int_to_string.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm_js_compatibility/lib/int_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm_js_compatibility/lib/string_buffer_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm_js_compatibility/lib/string_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm_js_compatibility/lib/typed_data.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm_js_compatibility/lib/typed_data_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/async/future_extensions.dart
+FILE: ../../../third_party/dart/sdk/lib/js_interop/js_interop.dart
+FILE: ../../../third_party/dart/sdk/lib/js_interop_unsafe/js_interop_unsafe.dart
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2023, the Dart project authors.  Please see the AUTHORS file
+for details. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google LLC nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: dart
+ORIGIN: ../../../third_party/dart/runtime/vm/perfetto_utils.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/protos/perfetto/common/builtin_clock.pbzero.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/clock_snapshot.pbzero.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/interned_data/interned_data.pbzero.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/profiling/profile_common.pbzero.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/profiling/profile_packet.pbzero.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/trace.pbzero.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/trace_packet.pbzero.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/track_event/debug_annotation.pbzero.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/track_event/process_descriptor.pbzero.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/track_event/thread_descriptor.pbzero.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/track_event/track_descriptor.pbzero.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/track_event/track_event.pbzero.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/protos/tools/compile_perfetto_protos.dart + ../../../third_party/dart/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../third_party/dart/runtime/vm/perfetto_utils.h
+FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/common/builtin_clock.pbzero.h
+FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/clock_snapshot.pbzero.h
+FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/interned_data/interned_data.pbzero.h
+FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/profiling/profile_common.pbzero.h
+FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/profiling/profile_packet.pbzero.h
+FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/trace.pbzero.h
+FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/trace_packet.pbzero.h
+FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/track_event/debug_annotation.pbzero.h
+FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/track_event/process_descriptor.pbzero.h
+FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/track_event/thread_descriptor.pbzero.h
+FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/track_event/track_descriptor.pbzero.h
+FILE: ../../../third_party/dart/runtime/vm/protos/perfetto/trace/track_event/track_event.pbzero.h
+FILE: ../../../third_party/dart/runtime/vm/protos/tools/compile_perfetto_protos.dart
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2023, the Dart project authors. Please see the AUTHORS file
+for details. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google LLC nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: dart
+ORIGIN: ../../../third_party/dart/runtime/bin/ifaddrs.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/bin/ifaddrs.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/dart_calling_conventions.cc + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/runtime/vm/compiler/backend/dart_calling_conventions.h + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_only.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/dart2js_only.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/synced/invocation_mirror_constants.dart + ../../../third_party/dart/LICENSE
+ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/compact_hash.dart + ../../../third_party/dart/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../third_party/dart/runtime/bin/ifaddrs.cc
+FILE: ../../../third_party/dart/runtime/bin/ifaddrs.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/dart_calling_conventions.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/dart_calling_conventions.h
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_only.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/dart2js_only.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/synced/invocation_mirror_constants.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/compact_hash.dart
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2024, the Dart project authors.  Please see the AUTHORS file
+for details. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google LLC nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: dart
+ORIGIN: ../../../third_party/dart/sdk/lib/developer/http_profiling.dart + ../../../third_party/dart/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../third_party/dart/sdk/lib/developer/http_profiling.dart
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2024, the Dart project authors. Please see the AUTHORS file
+for details. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google LLC nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: double-conversion
+ORIGIN: ../../../third_party/dart/third_party/double-conversion/src/cached-powers.cc
+TYPE: LicenseType.bsd
+FILE: ../../../third_party/dart/third_party/double-conversion/src/cached-powers.cc
+----------------------------------------------------------------------------------------------------
+Copyright 2006-2008 the V8 project authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google Inc. nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: double-conversion
+ORIGIN: ../../../third_party/dart/third_party/double-conversion/src/bignum-dtoa.cc
+ORIGIN: ../../../third_party/dart/third_party/double-conversion/src/bignum-dtoa.h
+ORIGIN: ../../../third_party/dart/third_party/double-conversion/src/bignum.cc
+ORIGIN: ../../../third_party/dart/third_party/double-conversion/src/bignum.h
+ORIGIN: ../../../third_party/dart/third_party/double-conversion/src/cached-powers.h
+ORIGIN: ../../../third_party/dart/third_party/double-conversion/src/diy-fp.h
+ORIGIN: ../../../third_party/dart/third_party/double-conversion/src/double-to-string.cc
+ORIGIN: ../../../third_party/dart/third_party/double-conversion/src/fast-dtoa.h
+ORIGIN: ../../../third_party/dart/third_party/double-conversion/src/fixed-dtoa.cc
+ORIGIN: ../../../third_party/dart/third_party/double-conversion/src/fixed-dtoa.h
+ORIGIN: ../../../third_party/dart/third_party/double-conversion/src/string-to-double.cc
+ORIGIN: ../../../third_party/dart/third_party/double-conversion/src/strtod.cc
+ORIGIN: ../../../third_party/dart/third_party/double-conversion/src/strtod.h
+ORIGIN: ../../../third_party/dart/third_party/double-conversion/src/utils.h
+TYPE: LicenseType.bsd
+FILE: ../../../third_party/dart/third_party/double-conversion/src/bignum-dtoa.cc
+FILE: ../../../third_party/dart/third_party/double-conversion/src/bignum-dtoa.h
+FILE: ../../../third_party/dart/third_party/double-conversion/src/bignum.cc
+FILE: ../../../third_party/dart/third_party/double-conversion/src/bignum.h
+FILE: ../../../third_party/dart/third_party/double-conversion/src/cached-powers.h
+FILE: ../../../third_party/dart/third_party/double-conversion/src/diy-fp.h
+FILE: ../../../third_party/dart/third_party/double-conversion/src/double-to-string.cc
+FILE: ../../../third_party/dart/third_party/double-conversion/src/fast-dtoa.h
+FILE: ../../../third_party/dart/third_party/double-conversion/src/fixed-dtoa.cc
+FILE: ../../../third_party/dart/third_party/double-conversion/src/fixed-dtoa.h
+FILE: ../../../third_party/dart/third_party/double-conversion/src/string-to-double.cc
+FILE: ../../../third_party/dart/third_party/double-conversion/src/strtod.cc
+FILE: ../../../third_party/dart/third_party/double-conversion/src/strtod.h
+FILE: ../../../third_party/dart/third_party/double-conversion/src/utils.h
+----------------------------------------------------------------------------------------------------
+Copyright 2010 the V8 project authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google Inc. nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: double-conversion
+ORIGIN: ../../../third_party/dart/third_party/double-conversion/src/double-conversion.h
+ORIGIN: ../../../third_party/dart/third_party/double-conversion/src/double-to-string.h
+ORIGIN: ../../../third_party/dart/third_party/double-conversion/src/fast-dtoa.cc
+ORIGIN: ../../../third_party/dart/third_party/double-conversion/src/ieee.h
+ORIGIN: ../../../third_party/dart/third_party/double-conversion/src/string-to-double.h
+TYPE: LicenseType.bsd
+FILE: ../../../third_party/dart/third_party/double-conversion/src/double-conversion.h
+FILE: ../../../third_party/dart/third_party/double-conversion/src/double-to-string.h
+FILE: ../../../third_party/dart/third_party/double-conversion/src/fast-dtoa.cc
+FILE: ../../../third_party/dart/third_party/double-conversion/src/ieee.h
+FILE: ../../../third_party/dart/third_party/double-conversion/src/string-to-double.h
+----------------------------------------------------------------------------------------------------
+Copyright 2012 the V8 project authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google Inc. nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: dart
+ORIGIN: ../../../third_party/dart/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../third_party/dart/runtime/observatory/lib/elements.dart
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/img/chromium_icon.png
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/img/dart_icon.png
+FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/img/isolate_icon.png
+FILE: ../../../third_party/dart/runtime/observatory/web/favicon.ico
+FILE: ../../../third_party/dart/runtime/observatory/web/index.html
+FILE: ../../../third_party/dart/runtime/observatory/web/third_party/trace_viewer_full.html
+FILE: ../../../third_party/dart/runtime/observatory/web/timeline.html
+FILE: ../../../third_party/dart/runtime/tools/entitlements/dart.plist
+FILE: ../../../third_party/dart/runtime/tools/entitlements/dart_precompiled_runtime.plist
+FILE: ../../../third_party/dart/runtime/tools/entitlements/dart_precompiled_runtime_product.plist
+FILE: ../../../third_party/dart/runtime/tools/entitlements/gen_snapshot.plist
+FILE: ../../../third_party/dart/runtime/tools/entitlements/gen_snapshot_product.plist
+FILE: ../../../third_party/dart/runtime/tools/entitlements/run_vm_tests.plist
+FILE: ../../../third_party/dart/runtime/tools/wiki/styles/style.scss
+FILE: ../../../third_party/dart/runtime/tools/wiki/templates/includes/auto-refresh.html
+FILE: ../../../third_party/dart/runtime/tools/wiki/templates/page.html
+FILE: ../../../third_party/dart/sdk.code-workspace
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/async_patch.dart
+FILE: ../../../third_party/dart/sdk/lib/html/html_common/conversions_dart2js.dart
+FILE: ../../../third_party/dart/sdk/lib/html/html_common/html_common.dart
+----------------------------------------------------------------------------------------------------
+Copyright 2012, the Dart project authors.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google LLC nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: fallback_root_certificates
+ORIGIN: ../../../third_party/dart/third_party/fallback_root_certificates/LICENSE
+TYPE: LicenseType.mpl
+FILE: ../../../third_party/dart/third_party/fallback_root_certificates/root_certificates.cc
+----------------------------------------------------------------------------------------------------
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.
+
+You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/bb65648e20e29abc47acf3dd984518d29fd625c3
+/third_party/fallback_root_certificates/
+
+====================================================================================================
+
+Total license count: 27
diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter
index 9f9fb5324949d6837eddb83a9a87a3bad1f102ae..feb7ecc75b01c7362300e9f5ba4d4e1d17d69ab9 100644
--- a/ci/licenses_golden/licenses_flutter
+++ b/ci/licenses_golden/licenses_flutter
@@ -1,136 +1,311 @@
-UNUSED LICENSES:
+====================================================================================================
+LIBRARY: angle
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/preprocessor/preprocessor_tab_autogen.cpp
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/glslang_tab_autogen.cpp
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/glslang_tab_autogen.h
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/glslang_tab.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/glslang_tab.cpp.h
+TYPE: LicenseType.bison
+FILE: ../../../flutter/third_party/angle/src/compiler/preprocessor/preprocessor_tab_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/glslang_tab_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/glslang_tab_autogen.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/glslang_tab.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/glslang_tab.cpp.h
+----------------------------------------------------------------------------------------------------
+<THIS BLOCK INTENTIONALLY LEFT BLANK>
+====================================================================================================
 
 ====================================================================================================
-ORIGIN: ../../../flutter/third_party/web_locale_keymap/License.txt
-TYPE: LicenseType.mit
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/brkitr/dictionaries/thaidict.txt + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/dictionaries/thaidict.txt
+----------------------------------------------------------------------------------------------------
+#      Copyright (c) 2006-2015 International Business Machines Corporation,
+  #      Apple Inc., and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: vulkan-validation-layers
+ORIGIN: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/LICENSE.txt
+TYPE: LicenseType.apache
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/.git-blame-ignore-revs
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/GOVERNANCE.md
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/VkLayer_khronos_validation-android.map
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/VkLayer_khronos_validation.exp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/VkLayer_khronos_validation.json.in
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/VkLayer_khronos_validation.map
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_shaders/gpu_as_inspection.comp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vk_layer_settings.txt
 ----------------------------------------------------------------------------------------------------
-MIT License
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
 
-Copyright (c) 2015 - present Microsoft Corporation
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
 
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+
+File: layers/external/vma/vk_mem_alloc.h
+
+
+Copyright (c) 2017-2022 Advanced Micro Devices, Inc. All rights reserved.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
 ====================================================================================================
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-USED LICENSES:
 
 ====================================================================================================
-LIBRARY: txt
-ORIGIN: ../../../flutter/third_party/txt/LICENSE
+LIBRARY: flatbuffers
+ORIGIN: ../../../flutter/third_party/flatbuffers/dart/LICENSE
 TYPE: LicenseType.apache
-FILE: ../../../flutter/third_party/txt/benchmarks/paint_record_benchmarks.cc
-FILE: ../../../flutter/third_party/txt/benchmarks/paragraph_benchmarks.cc
-FILE: ../../../flutter/third_party/txt/benchmarks/paragraph_builder_benchmarks.cc
-FILE: ../../../flutter/third_party/txt/benchmarks/skparagraph_benchmarks.cc
-FILE: ../../../flutter/third_party/txt/benchmarks/txt_run_all_benchmarks.cc
-FILE: ../../../flutter/third_party/txt/src/log/log.cc
-FILE: ../../../flutter/third_party/txt/src/log/log.h
-FILE: ../../../flutter/third_party/txt/src/minikin/CmapCoverage.cpp
-FILE: ../../../flutter/third_party/txt/src/minikin/CmapCoverage.h
-FILE: ../../../flutter/third_party/txt/src/minikin/Emoji.cpp
-FILE: ../../../flutter/third_party/txt/src/minikin/Emoji.h
-FILE: ../../../flutter/third_party/txt/src/minikin/FontCollection.cpp
-FILE: ../../../flutter/third_party/txt/src/minikin/FontCollection.h
-FILE: ../../../flutter/third_party/txt/src/minikin/FontFamily.cpp
-FILE: ../../../flutter/third_party/txt/src/minikin/FontFamily.h
-FILE: ../../../flutter/third_party/txt/src/minikin/FontLanguage.cpp
-FILE: ../../../flutter/third_party/txt/src/minikin/FontLanguage.h
-FILE: ../../../flutter/third_party/txt/src/minikin/FontLanguageListCache.cpp
-FILE: ../../../flutter/third_party/txt/src/minikin/FontLanguageListCache.h
-FILE: ../../../flutter/third_party/txt/src/minikin/FontUtils.cpp
-FILE: ../../../flutter/third_party/txt/src/minikin/FontUtils.h
-FILE: ../../../flutter/third_party/txt/src/minikin/GraphemeBreak.cpp
-FILE: ../../../flutter/third_party/txt/src/minikin/GraphemeBreak.h
-FILE: ../../../flutter/third_party/txt/src/minikin/HbFontCache.cpp
-FILE: ../../../flutter/third_party/txt/src/minikin/HbFontCache.h
-FILE: ../../../flutter/third_party/txt/src/minikin/Hyphenator.cpp
-FILE: ../../../flutter/third_party/txt/src/minikin/Hyphenator.h
-FILE: ../../../flutter/third_party/txt/src/minikin/Layout.cpp
-FILE: ../../../flutter/third_party/txt/src/minikin/Layout.h
-FILE: ../../../flutter/third_party/txt/src/minikin/LayoutUtils.cpp
-FILE: ../../../flutter/third_party/txt/src/minikin/LayoutUtils.h
-FILE: ../../../flutter/third_party/txt/src/minikin/LineBreaker.cpp
-FILE: ../../../flutter/third_party/txt/src/minikin/LineBreaker.h
-FILE: ../../../flutter/third_party/txt/src/minikin/Measurement.cpp
-FILE: ../../../flutter/third_party/txt/src/minikin/Measurement.h
-FILE: ../../../flutter/third_party/txt/src/minikin/MinikinFont.cpp
-FILE: ../../../flutter/third_party/txt/src/minikin/MinikinFont.h
-FILE: ../../../flutter/third_party/txt/src/minikin/MinikinInternal.cpp
-FILE: ../../../flutter/third_party/txt/src/minikin/MinikinInternal.h
-FILE: ../../../flutter/third_party/txt/src/minikin/SparseBitSet.cpp
-FILE: ../../../flutter/third_party/txt/src/minikin/SparseBitSet.h
-FILE: ../../../flutter/third_party/txt/src/minikin/WordBreaker.cpp
-FILE: ../../../flutter/third_party/txt/src/minikin/WordBreaker.h
-FILE: ../../../flutter/third_party/txt/src/skia/paragraph_builder_skia.cc
-FILE: ../../../flutter/third_party/txt/src/skia/paragraph_builder_skia.h
-FILE: ../../../flutter/third_party/txt/src/skia/paragraph_skia.cc
-FILE: ../../../flutter/third_party/txt/src/skia/paragraph_skia.h
-FILE: ../../../flutter/third_party/txt/src/txt/asset_font_manager.cc
-FILE: ../../../flutter/third_party/txt/src/txt/asset_font_manager.h
-FILE: ../../../flutter/third_party/txt/src/txt/font_asset_provider.cc
-FILE: ../../../flutter/third_party/txt/src/txt/font_asset_provider.h
-FILE: ../../../flutter/third_party/txt/src/txt/font_collection.cc
-FILE: ../../../flutter/third_party/txt/src/txt/font_collection.h
-FILE: ../../../flutter/third_party/txt/src/txt/font_features.cc
-FILE: ../../../flutter/third_party/txt/src/txt/font_features.h
-FILE: ../../../flutter/third_party/txt/src/txt/font_skia.cc
-FILE: ../../../flutter/third_party/txt/src/txt/font_skia.h
-FILE: ../../../flutter/third_party/txt/src/txt/font_style.h
-FILE: ../../../flutter/third_party/txt/src/txt/font_weight.h
-FILE: ../../../flutter/third_party/txt/src/txt/line_metrics.h
-FILE: ../../../flutter/third_party/txt/src/txt/paint_record.cc
-FILE: ../../../flutter/third_party/txt/src/txt/paint_record.h
-FILE: ../../../flutter/third_party/txt/src/txt/paragraph.h
-FILE: ../../../flutter/third_party/txt/src/txt/paragraph_builder.cc
-FILE: ../../../flutter/third_party/txt/src/txt/paragraph_builder.h
-FILE: ../../../flutter/third_party/txt/src/txt/paragraph_builder_txt.cc
-FILE: ../../../flutter/third_party/txt/src/txt/paragraph_builder_txt.h
-FILE: ../../../flutter/third_party/txt/src/txt/paragraph_style.cc
-FILE: ../../../flutter/third_party/txt/src/txt/paragraph_style.h
-FILE: ../../../flutter/third_party/txt/src/txt/paragraph_txt.cc
-FILE: ../../../flutter/third_party/txt/src/txt/paragraph_txt.h
-FILE: ../../../flutter/third_party/txt/src/txt/placeholder_run.cc
-FILE: ../../../flutter/third_party/txt/src/txt/placeholder_run.h
-FILE: ../../../flutter/third_party/txt/src/txt/run_metrics.h
-FILE: ../../../flutter/third_party/txt/src/txt/styled_runs.cc
-FILE: ../../../flutter/third_party/txt/src/txt/styled_runs.h
-FILE: ../../../flutter/third_party/txt/src/txt/test_font_manager.cc
-FILE: ../../../flutter/third_party/txt/src/txt/test_font_manager.h
-FILE: ../../../flutter/third_party/txt/src/txt/text_baseline.h
-FILE: ../../../flutter/third_party/txt/src/txt/text_decoration.cc
-FILE: ../../../flutter/third_party/txt/src/txt/text_decoration.h
-FILE: ../../../flutter/third_party/txt/src/txt/text_shadow.cc
-FILE: ../../../flutter/third_party/txt/src/txt/text_shadow.h
-FILE: ../../../flutter/third_party/txt/src/txt/text_style.cc
-FILE: ../../../flutter/third_party/txt/src/txt/text_style.h
-FILE: ../../../flutter/third_party/txt/src/txt/typeface_font_asset_provider.cc
-FILE: ../../../flutter/third_party/txt/src/txt/typeface_font_asset_provider.h
-FILE: ../../../flutter/third_party/txt/src/utils/JenkinsHash.cpp
-FILE: ../../../flutter/third_party/txt/src/utils/JenkinsHash.h
-FILE: ../../../flutter/third_party/txt/src/utils/LinuxUtils.h
-FILE: ../../../flutter/third_party/txt/src/utils/LruCache.h
-FILE: ../../../flutter/third_party/txt/src/utils/MacUtils.h
-FILE: ../../../flutter/third_party/txt/src/utils/TypeHelpers.h
-FILE: ../../../flutter/third_party/txt/src/utils/WindowsUtils.h
+FILE: ../../../flutter/third_party/flatbuffers/dart/lib/flat_buffers.dart
+FILE: ../../../flutter/third_party/flatbuffers/dart/lib/flex_buffers.dart
+FILE: ../../../flutter/third_party/flatbuffers/dart/lib/src/builder.dart
+FILE: ../../../flutter/third_party/flatbuffers/dart/lib/src/reference.dart
+FILE: ../../../flutter/third_party/flatbuffers/dart/lib/src/types.dart
 ----------------------------------------------------------------------------------------------------
 Apache License
 Version 2.0, January 2004
-http://www.apache.org/licenses
+http://www.apache.org/licenses/
 
 TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -316,7 +491,7 @@ APPENDIX: How to apply the Apache License to your work.
    same "printed page" as the copyright notice for easier
    identification within third-party archives.
 
-Copyright [yyyy] [name of copyright owner]
+Copyright 2014 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -332,647 +507,41733 @@ limitations under the License.
 ====================================================================================================
 
 ====================================================================================================
-LIBRARY: accessibility
-ORIGIN: ../../../flutter/third_party/accessibility/gfx/geometry/insets.cc + ../../../LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../flutter/third_party/accessibility/gfx/geometry/insets.cc
-FILE: ../../../flutter/third_party/accessibility/gfx/geometry/insets_unittest.cc
+LIBRARY: abseil-cpp
+LIBRARY: angle
+LIBRARY: expat
+LIBRARY: flatbuffers
+LIBRARY: glslang
+LIBRARY: perfetto
+LIBRARY: shaderc
+LIBRARY: spirv-cross
+LIBRARY: txt
+LIBRARY: vulkan-headers
+LIBRARY: vulkan-utility-libraries
+LIBRARY: vulkan-validation-layers
+LIBRARY: wuffs
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/overlay/LICENSE.txt
+ORIGIN: ../../../flutter/third_party/flatbuffers/LICENSE.txt
+ORIGIN: ../../../flutter/third_party/flatbuffers/swift/LICENSE
+ORIGIN: ../../../flutter/third_party/shaderc/LICENSE
+ORIGIN: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/LICENSE
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/main.cpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cfg.cpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cfg.hpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_common.hpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cpp.cpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cpp.hpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cross.cpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cross.hpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cross.natvis
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cross_c.cpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cross_c.h
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cross_containers.hpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cross_error_handling.hpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cross_parsed_ir.cpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cross_parsed_ir.hpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cross_util.cpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cross_util.hpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_glsl.cpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_glsl.hpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_hlsl.cpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_hlsl.hpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_msl.cpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_msl.hpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_parser.cpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_parser.hpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_reflect.cpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_reflect.hpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan.cppm
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan.hpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_enums.hpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_extension_inspection.hpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_format_traits.hpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_funcs.hpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_handles.hpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_hash.hpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_hpp_macros.hpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_raii.hpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_shared.hpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_static_assertions.hpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_structs.hpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_to_string.hpp
+ORIGIN: Apache-2.0 OR MIT referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_video.hpp
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/angle/include/EGL/egl.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/angle/include/EGL/eglext.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/angle/include/EGL/eglplatform.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/angle/include/GLES2/gl2platform.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/angle/include/GLES3/gl3platform.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/Package.swift
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/include/spirv_cross/barrier.hpp
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/include/spirv_cross/external_interface.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/include/spirv_cross/image.hpp
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/include/spirv_cross/internal_interface.hpp
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/include/spirv_cross/sampler.hpp
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/include/spirv_cross/thread_group.hpp
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/pkg-config/spirv-cross-c-shared.pc.in
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/pkg-config/spirv-cross-c.pc.in
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vk_video/vulkan_video_codec_av1std.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vk_video/vulkan_video_codec_av1std_decode.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vk_video/vulkan_video_codec_h264std.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vk_video/vulkan_video_codec_h264std_decode.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vk_video/vulkan_video_codec_h264std_encode.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vk_video/vulkan_video_codec_h265std.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vk_video/vulkan_video_codec_h265std_decode.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vk_video/vulkan_video_codec_h265std_encode.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vk_video/vulkan_video_codecs_common.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vk_icd.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vk_layer.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vk_platform.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_android.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_beta.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_core.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_directfb.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_fuchsia.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_ggp.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_ios.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_macos.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_metal.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_screen.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_vi.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_wayland.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_win32.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_xcb.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_xlib.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_xlib_xrandr.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/docs/generated_code.md
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/docs/layer_configuration.md
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/include/vulkan/layer/vk_layer_settings.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/include/vulkan/layer/vk_layer_settings.hpp
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/include/vulkan/utility/vk_dispatch_table.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/include/vulkan/utility/vk_format_utils.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/include/vulkan/utility/vk_struct_helper.hpp
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/include/vulkan/vk_enum_string_helper.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/scripts/gn/stub.cpp
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/src/layer/layer_settings_manager.cpp
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/src/layer/layer_settings_manager.hpp
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/src/layer/layer_settings_util.cpp
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/src/layer/layer_settings_util.hpp
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/src/layer/vk_layer_settings.cpp
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/src/layer/vk_layer_settings_helper.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/include/CL/cl.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/include/CL/cl_d3d10.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/include/CL/cl_d3d11.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/include/CL/cl_dx9_media_sharing.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/include/CL/cl_dx9_media_sharing_intel.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/include/CL/cl_egl.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/include/CL/cl_ext.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/include/CL/cl_ext_intel.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/include/CL/cl_gl.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/include/CL/cl_gl_ext.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/include/CL/cl_half.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/include/CL/cl_icd.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/include/CL/cl_layer.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/include/CL/cl_platform.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/include/CL/cl_va_api_media_sharing_intel.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/include/CL/cl_version.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/include/CL/opencl.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/include/GLES/egl.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/include/GLES/glplatform.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/layout/fragment.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-af/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-am/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-ar/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-as/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-az/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-b+sr+Latn/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-be/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-bg/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-bn/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-bs/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-ca/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-cs/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-da/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-de/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-el/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-en-rAU/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-en-rCA/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-en-rGB/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-en-rIN/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-en-rXC/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-es-rUS/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-es/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-et/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-eu/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-fa/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-fi/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-fr-rCA/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-fr/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-gl/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-gu/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-hi/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-hr/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-hu/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-hy/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-in/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-is/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-it/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-iw/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-ja/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-ka/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-kk/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-km/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-kn/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-ko/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-ky/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-lo/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-lt/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-lv/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-mk/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-ml/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-mn/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-mr/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-ms/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-my/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-nb/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-ne/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-nl/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-or/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-pa/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-pl/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-pt-rPT/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-pt/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-ro/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-ru/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-si/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-sk/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-sl/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-sq/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-sr/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-sv/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-sw/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-ta/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-te/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-th/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-tl/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-tr/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-uk/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-ur/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-uz/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-vi/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-zh-rCN/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-zh-rHK/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-zh-rTW/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values-zu/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values/dimens.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values/drivers.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values/global_settings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values/intents.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values/preference_keys.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/values/strings.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/res/xml/main.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/src/com/android/angle/AndroidManifest.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/src/com/android/angle/EmptyMainActivity.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/src/com/android/angle/MainActivity.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/src/com/android/angle/common/GlobalSettings.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/src/com/android/angle/common/MainFragment.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/src/com/android/angle/common/Receiver.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/src/com/android/angle/common/SearchProvider.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/common/vulkan/vk_google_filtering_precision.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/libANGLE/Overlay_font_autogen.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/expat/expat/fuzz/xml_parse_fuzzer.c
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/expat/expat/fuzz/xml_parsebuffer_fuzzer.c
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/conan/test_package/test_package.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/grpc/flatbuffers-java-grpc/src/main/java/com/google/flatbuffers/grpc/FlatbuffersUtils.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/grpc/src/compiler/java_generator.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/grpc/src/compiler/java_generator.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/grpc/src/compiler/python_generator.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/grpc/src/compiler/python_generator.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/grpc/src/compiler/schema_interface.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/grpc/src/compiler/swift_generator.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/grpc/src/compiler/swift_generator.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/grpc/src/compiler/ts_generator.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/include/flatbuffers/allocator.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/include/flatbuffers/array.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/include/flatbuffers/bfbs_generator.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/include/flatbuffers/buffer.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/include/flatbuffers/buffer_ref.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/include/flatbuffers/code_generators.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/include/flatbuffers/default_allocator.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/include/flatbuffers/detached_buffer.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/include/flatbuffers/flatbuffer_builder.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/include/flatbuffers/flatbuffers.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/include/flatbuffers/flatc.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/include/flatbuffers/flex_flat_util.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/include/flatbuffers/flexbuffers.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/include/flatbuffers/grpc.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/include/flatbuffers/hash.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/include/flatbuffers/idl.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/include/flatbuffers/minireflect.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/include/flatbuffers/pch/flatc_pch.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/include/flatbuffers/pch/pch.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/include/flatbuffers/reflection.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/include/flatbuffers/registry.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/include/flatbuffers/stl_emulation.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/include/flatbuffers/string.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/include/flatbuffers/struct.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/include/flatbuffers/table.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/include/flatbuffers/util.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/include/flatbuffers/vector.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/include/flatbuffers/vector_downward.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/include/flatbuffers/verifier.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/BaseVector.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/BooleanVector.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/ByteBufferUtil.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/ByteVector.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/Constants.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/DoubleVector.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/FlatBufferBuilder.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/FlexBuffers.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/FlexBuffersBuilder.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/FloatVector.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/IntVector.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/LongVector.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/ShortVector.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/StringVector.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/Struct.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/Table.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/UnionVector.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/Utf8.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/Utf8Old.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/BaseVector.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/BooleanVector.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/ByteBufferUtil.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/ByteVector.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/Constants.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/DoubleVector.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/FlatBufferBuilder.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/FlexBuffers.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/FlexBuffersBuilder.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/FloatVector.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/IntVector.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/LongVector.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/ShortVector.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/StringVector.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/Struct.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/Table.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/UnionVector.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/Utf8.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/Utf8Old.java
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/kotlin/com/google/flatbuffers/kotlin/benchmark/FlexBuffersBenchmark.kt
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/kotlin/com/google/flatbuffers/kotlin/benchmark/JsonBenchmark.kt
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/kotlin/com/google/flatbuffers/kotlin/benchmark/UTF8Benchmark.kt
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/commonMain/kotlin/com/google/flatbuffers/kotlin/Buffers.kt
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/commonMain/kotlin/com/google/flatbuffers/kotlin/ByteArray.kt
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/commonMain/kotlin/com/google/flatbuffers/kotlin/FlexBuffers.kt
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/commonMain/kotlin/com/google/flatbuffers/kotlin/FlexBuffersBuilder.kt
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/commonMain/kotlin/com/google/flatbuffers/kotlin/FlexBuffersInternals.kt
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/commonMain/kotlin/com/google/flatbuffers/kotlin/JSON.kt
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/commonMain/kotlin/com/google/flatbuffers/kotlin/Utf8.kt
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/commonTest/kotlin/com/google/flatbuffers/kotlin/ByteArrayTest.kt
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/commonTest/kotlin/com/google/flatbuffers/kotlin/FlexBuffersTest.kt
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/commonTest/kotlin/com/google/flatbuffers/kotlin/JSONTest.kt
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/jsMain/kotlin/com/google/flatbuffers/kotlin/ByteArray.kt
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/jvmMain/kotlin/com/google/flatbuffers/kotlin/ByteArray.kt
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/nativeMain/kotlin/com/google/flatbuffers/kotlin/ByteArray.kt
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/kotlin/spotless/spotless.kt
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/lobster/flatbuffers.lobster
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/src/annotated_binary_text_gen.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/src/bfbs_gen.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/src/bfbs_gen_lua.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/src/bfbs_gen_lua.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/src/binary_annotator.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/src/code_generators.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/src/flatc.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/src/flatc_main.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/src/flathash.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/src/idl_gen_cpp.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/src/idl_gen_csharp.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/src/idl_gen_dart.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/src/idl_gen_fbs.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/src/idl_gen_go.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/src/idl_gen_grpc.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/src/idl_gen_java.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/src/idl_gen_json_schema.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/src/idl_gen_kotlin.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/src/idl_gen_lobster.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/src/idl_gen_lua.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/src/idl_gen_php.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/src/idl_gen_python.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/src/idl_gen_rust.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/src/idl_gen_swift.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/src/idl_gen_text.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/src/idl_gen_ts.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/src/idl_parser.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/src/reflection.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/src/util.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/swift/Package.swift
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/swift/Package@swift-5.5.swift
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/ByteBuffer.swift
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Constants.swift
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Enum.swift
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/FlatBufferBuilder.swift
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/FlatBufferObject.swift
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/FlatBuffersUtils.swift
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/FlatbuffersErrors.swift
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Int+extension.swift
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Message.swift
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Mutable.swift
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/NativeObject.swift
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Offset.swift
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Root.swift
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/String+extension.swift
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Struct.swift
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Table.swift
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/TableVerifier.swift
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/VeriferOptions.swift
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Verifiable.swift
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Verifier.swift
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/Android.bp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/BUILD
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/PerfettoIntegrationTests.xml
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/bazel/BUILD
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/bazel/jsoncpp.BUILD
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/bazel/linenoise.BUILD
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/bazel/llvm_demangle.BUILD
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/bazel/sqlite.BUILD
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/bazel/zlib.BUILD
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/buildtools/libbacktrace_config/backtrace-supported.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/buildtools/libbacktrace_config/config.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/buildtools/rustc-demangle-capi/rustc_demangle.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/gn/standalone/.emscripten
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/heapprofd.rc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/base/build_config.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/base/build_configs/android_tree/perfetto_build_flags.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/base/build_configs/bazel/perfetto_build_flags.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/base/compiler.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/base/export.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/base/flat_set.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/base/logging.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/base/platform_handle.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/base/proc_utils.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/base/status.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/base/task_runner.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/base/template_util.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/base/thread_utils.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/base/time.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/android_utils.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/base64.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/circular_queue.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/container_annotations.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/crash_keys.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/ctrl_c_handler.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/endian.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/event_fd.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/file_utils.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/flat_hash_map.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/getopt.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/getopt_compat.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/hash.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/http/http_server.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/http/sha1.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/metatrace.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/metatrace_events.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/no_destructor.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/paged_memory.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/periodic_task.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/pipe.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/platform.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/scoped_file.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/small_set.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/small_vector.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/status_or.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/string_splitter.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/string_utils.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/string_view.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/string_writer.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/subprocess.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/sys_types.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/temp_file.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/thread_annotations.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/thread_checker.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/thread_task_runner.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/threading/channel.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/threading/future.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/threading/future_combinators.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/threading/poll.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/threading/spawn.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/threading/stream.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/threading/stream_combinators.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/threading/thread_pool.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/threading/util.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/unix_socket.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/unix_task_runner.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/utils.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/uuid.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/version.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/waitable_event.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/watchdog.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/watchdog_noop.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/watchdog_posix.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/base/weak_ptr.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/bigtrace/environment.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/bigtrace/orchestrator.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/bigtrace/worker.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/ipc/async_result.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/ipc/basic_types.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/ipc/client.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/ipc/client_info.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/ipc/codegen_helpers.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/ipc/deferred.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/ipc/host.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/ipc/service.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/ipc/service_descriptor.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/ipc/service_proxy.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/trace_processor/demangle.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/trace_processor/export_json.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/trace_processor/importers/memory_tracker/graph.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/trace_processor/importers/memory_tracker/graph_processor.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/trace_processor/importers/memory_tracker/memory_allocator_node_id.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/trace_processor/importers/memory_tracker/memory_graph_edge.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/trace_processor/importers/memory_tracker/raw_memory_graph_node.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/trace_processor/importers/memory_tracker/raw_process_memory_node.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/trace_processor/rpc/query_result_serializer.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/traced/data_source_types.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/traced/sys_stats_counters.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/traced/traced.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/tracing/core/basic_types.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/tracing/core/commit_data_request.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/tracing/core/consumer.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/tracing/core/observable_events.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/tracing/core/producer.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/tracing/core/shared_memory.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/tracing/core/shared_memory_abi.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/tracing/core/shared_memory_arbiter.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/tracing/core/slice.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/tracing/core/trace_packet.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/tracing/core/trace_stats.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/tracing/core/trace_writer.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/tracing/core/tracing_service.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/tracing/ipc/consumer_ipc_client.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/tracing/ipc/default_socket.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/tracing/ipc/producer_ipc_client.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/ext/tracing/ipc/service_ipc_host.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/profiling/parse_smaps.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/profiling/pprof_builder.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/protozero/contiguous_memory_range.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/protozero/copyable_ptr.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/protozero/cpp_message_obj.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/protozero/field.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/protozero/field_writer.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/protozero/gen_field_helpers.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/protozero/message.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/protozero/message_arena.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/protozero/message_handle.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/protozero/packed_repeated_fields.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/protozero/proto_decoder.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/protozero/proto_utils.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/protozero/root_message.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/protozero/scattered_heap_buffer.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/protozero/scattered_stream_null_delegate.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/protozero/scattered_stream_writer.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/protozero/static_buffer.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/abi/atomic.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/abi/backend_type.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/abi/data_source_abi.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/abi/export.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/abi/heap_buffer.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/abi/pb_decoder_abi.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/abi/producer_abi.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/abi/stream_writer_abi.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/abi/thread_utils_abi.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/abi/tracing_session_abi.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/abi/track_event_abi.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/abi/track_event_hl_abi.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/abi/track_event_ll_abi.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/compiler.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/data_source.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/fnv1a.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/pb_decoder.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/pb_macros.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/pb_msg.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/pb_packed.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/pb_utils.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/producer.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/protos/common/builtin_clock.pzc.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/protos/common/data_source_descriptor.pzc.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/protos/config/data_source_config.pzc.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/protos/config/trace_config.pzc.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/protos/config/track_event/track_event_config.pzc.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/protos/trace/interned_data/interned_data.pzc.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/protos/trace/test_event.pzc.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/protos/trace/trace.pzc.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/protos/trace/trace_packet.pzc.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/protos/trace/track_event/counter_descriptor.pzc.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/protos/trace/track_event/debug_annotation.pzc.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/protos/trace/track_event/track_descriptor.pzc.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/protos/trace/track_event/track_event.pzc.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/protos/trace/trigger.pzc.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/stream_writer.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/te_category_macros.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/te_macros.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/thread_utils.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/tracing_session.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/public/track_event.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/trace_processor/basic_types.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/trace_processor/iterator.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/trace_processor/metatrace_config.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/trace_processor/read_trace.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/trace_processor/ref_counted.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/trace_processor/status.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/trace_processor/trace_blob.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/trace_processor/trace_blob_view.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/trace_processor/trace_processor.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/trace_processor/trace_processor_storage.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/backend_type.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/buffer_exhausted_policy.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/console_interceptor.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/core/chrome_config.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/core/data_source_config.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/core/data_source_descriptor.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/core/flush_flags.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/core/forward_decls.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/core/trace_config.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/core/tracing_service_capabilities.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/core/tracing_service_state.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/data_source.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/debug_annotation.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/event_context.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/interceptor.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/internal/basic_types.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/internal/checked_scope.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/internal/compile_time_hash.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/internal/data_source_internal.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/internal/in_process_tracing_backend.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/internal/interceptor_trace_writer.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/internal/system_tracing_backend.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/internal/tracing_backend_fake.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/internal/tracing_muxer.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/internal/tracing_tls.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/internal/track_event_data_source.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/internal/track_event_internal.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/internal/track_event_interned_fields.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/internal/track_event_legacy.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/internal/track_event_macros.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/internal/write_track_event_args.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/locked_handle.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/platform.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/string_helpers.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/trace_writer_base.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/traced_proto.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/traced_value.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/traced_value_forward.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/tracing.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/tracing_backend.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/tracing_policy.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/track.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/track_event.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/track_event_args.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/track_event_category_registry.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/track_event_interned_data_index.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/track_event_legacy.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/include/perfetto/tracing/track_event_state_tracker.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/perfetto.rc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/python/BUILD
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/android_internal/atrace_hal.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/android_internal/atrace_hal.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/android_internal/health_hal.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/android_internal/health_hal.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/android_internal/incident_service.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/android_internal/incident_service.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/android_internal/lazy_library_loader.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/android_internal/lazy_library_loader.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/android_internal/power_stats.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/android_internal/power_stats.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/android_internal/statsd.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/android_internal/statsd.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/android_internal/statsd_logging.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/android_internal/statsd_logging.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/android_internal/tracing_service_proxy.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/android_internal/tracing_service_proxy.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/android_stats/perfetto_atoms.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/android_stats/statsd_logging_helper.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/android_stats/statsd_logging_helper.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/android_utils.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/base64.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/crash_keys.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/ctrl_c_handler.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/debug_crash_stack_trace.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/default_platform.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/event_fd.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/file_utils.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/flat_hash_map_benchmark.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/flat_set_benchmark.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/getopt_compat.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/http/http_server.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/http/sha1.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/log_ring_buffer.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/logging.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/metatrace.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/paged_memory.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/periodic_task.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/pipe.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/status.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/string_splitter.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/string_utils.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/string_view.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/subprocess.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/subprocess_posix.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/subprocess_windows.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/temp_file.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/thread_checker.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/thread_task_runner.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/thread_utils.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/threading/spawn.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/threading/stream_combinators.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/threading/thread_pool.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/time.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/unix_socket.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/unix_task_runner.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/utils.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/uuid.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/version.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/virtual_destructors.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/vm_sockets.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/waitable_event.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/base/watchdog_posix.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/bigtrace/orchestrator_impl.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/bigtrace/orchestrator_impl.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/bigtrace/trace_processor_wrapper.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/bigtrace/trace_processor_wrapper.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/bigtrace/worker_impl.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/bigtrace/worker_impl.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/kallsyms/kernel_symbol_map.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/kallsyms/kernel_symbol_map.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/kallsyms/kernel_symbol_map_benchmark.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/kallsyms/lazy_kernel_symbolizer.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/kallsyms/lazy_kernel_symbolizer.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/kernel_utils/syscall_table.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/kernel_utils/syscall_table.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/kernel_utils/syscalls_aarch32.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/kernel_utils/syscalls_aarch64.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/kernel_utils/syscalls_armeabi.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/kernel_utils/syscalls_x86.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/kernel_utils/syscalls_x86_64.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/perfetto_cmd/bugreport_path.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/perfetto_cmd/config.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/perfetto_cmd/config.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/perfetto_cmd/main.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/perfetto_cmd/packet_writer.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/perfetto_cmd/packet_writer.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/perfetto_cmd/pbtxt_to_pb.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/perfetto_cmd/pbtxt_to_pb.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/perfetto_cmd/perfetto_cmd.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/perfetto_cmd/perfetto_cmd.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/perfetto_cmd/perfetto_cmd_android.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/perfetto_cmd/perfetto_cmd_state.proto
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/perfetto_cmd/rate_limiter.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/perfetto_cmd/rate_limiter.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/perfetto_cmd/trigger_perfetto.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/perfetto_cmd/trigger_perfetto_main.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/perfetto_cmd/trigger_producer.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/perfetto_cmd/trigger_producer.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/common/callstack_trie.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/common/callstack_trie.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/common/interner.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/common/interning_output.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/common/interning_output.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/common/proc_cmdline.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/common/proc_cmdline.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/common/proc_utils.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/common/proc_utils.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/common/producer_support.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/common/producer_support.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/common/profiler_guardrails.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/common/profiler_guardrails.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/common/unwind_support.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/common/unwind_support.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/deobfuscator.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/deobfuscator.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/perf/common_types.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/perf/event_config.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/perf/event_config.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/perf/event_reader.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/perf/event_reader.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/perf/main.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/perf/perf_producer.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/perf/perf_producer.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/perf/proc_descriptors.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/perf/proc_descriptors.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/perf/regs_parsing.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/perf/regs_parsing.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/perf/traced_perf.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/perf/traced_perf.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/perf/unwind_queue.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/perf/unwinding.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/perf/unwinding.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/symbolizer/breakpad_parser.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/symbolizer/breakpad_parser.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/symbolizer/breakpad_symbolizer.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/symbolizer/breakpad_symbolizer.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/symbolizer/elf.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/symbolizer/filesystem.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/symbolizer/filesystem_posix.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/symbolizer/filesystem_windows.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/symbolizer/local_symbolizer.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/symbolizer/local_symbolizer.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/symbolizer/scoped_read_mmap.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/symbolizer/scoped_read_mmap_posix.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/symbolizer/scoped_read_mmap_windows.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/symbolizer/subprocess.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/symbolizer/subprocess_posix.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/symbolizer/subprocess_windows.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/symbolizer/symbolize_database.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/symbolizer/symbolize_database.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/symbolizer/symbolizer.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/profiling/symbolizer/symbolizer.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/protozero/field.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/protozero/filtering/filter_bytecode_common.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/protozero/filtering/filter_bytecode_generator.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/protozero/filtering/filter_bytecode_generator.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/protozero/filtering/filter_bytecode_parser.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/protozero/filtering/filter_bytecode_parser.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/protozero/filtering/filter_bytecode_parser_fuzzer.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/protozero/filtering/filter_util.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/protozero/filtering/filter_util.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/protozero/filtering/message_filter.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/protozero/filtering/message_filter.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/protozero/filtering/message_filter_benchmark.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/protozero/filtering/message_filter_fuzzer.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/protozero/filtering/message_tokenizer.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/protozero/filtering/string_filter.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/protozero/filtering/string_filter.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/protozero/filtering/string_filter_benchmark.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/protozero/gen_field_helpers.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/protozero/message.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/protozero/message_arena.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/protozero/packed_repeated_fields.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/protozero/proto_decoder.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/protozero/proto_decoder_fuzzer.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/protozero/proto_ring_buffer.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/protozero/proto_ring_buffer.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/protozero/protoc_plugin/cppgen_plugin.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/protozero/protoc_plugin/protozero_c_plugin.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/protozero/protoc_plugin/protozero_plugin.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/protozero/scattered_heap_buffer.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/protozero/scattered_stream_null_delegate.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/protozero/scattered_stream_writer.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/protozero/static_buffer.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/protozero/virtual_destructors.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/shared_lib/data_source.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/shared_lib/heap_buffer.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/shared_lib/intern_map.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/shared_lib/intern_map.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/shared_lib/pb_decoder.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/shared_lib/producer.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/shared_lib/reset_for_testing.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/shared_lib/stream_writer.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/shared_lib/stream_writer.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/shared_lib/thread_utils.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/shared_lib/tracing_session.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/shared_lib/track_event.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/tracebox/tracebox.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/traceconv/deobfuscate_profile.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/traceconv/deobfuscate_profile.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/traceconv/lite_fallbacks.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/traceconv/main.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/traceconv/pprof_builder.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/traceconv/proto_full_utils.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/traceconv/proto_full_utils.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/traceconv/symbolize_profile.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/traceconv/symbolize_profile.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/traceconv/trace_to_hprof.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/traceconv/trace_to_hprof.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/traceconv/trace_to_json.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/traceconv/trace_to_json.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/traceconv/trace_to_profile.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/traceconv/trace_to_profile.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/traceconv/trace_to_systrace.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/traceconv/trace_to_systrace.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/traceconv/trace_to_text.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/traceconv/trace_to_text.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/traceconv/utils.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/traceconv/utils.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/traced_relay/relay_service.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/traced_relay/relay_service.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/traced_relay/relay_service_integrationtest.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/traced_relay/relay_service_main.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/traced_relay/socket_relay_handler.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/traced_relay/socket_relay_handler.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/websocket_bridge/websocket_bridge.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/websocket_bridge/websocket_bridge.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/src/websocket_bridge/websocket_bridge_main.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/traced_perf.rc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/build.js
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/config/integrationtest_env.js
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/config/integrationtest_setup.js
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/config/integrationtest_teardown.js
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/config/jest.integrationtest.config.js
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/config/jest.unittest.config.js
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/config/rollup.config.js
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/common.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/details.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/flags_page.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/fonts.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/home_page.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/metrics_page.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/modal.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/perfetto.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/query_page.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/record.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/sidebar.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/topbar.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/trace_info_page.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/viz_page.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/widgets/anchor.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/widgets/button.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/widgets/callout.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/widgets/checkbox.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/widgets/details_shell.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/widgets/details_table.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/widgets/editor.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/widgets/empty_state.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/widgets/error.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/widgets/form.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/widgets/grid_layout.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/widgets/hotkey.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/widgets/menu.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/widgets/multiselect.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/widgets/popup.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/widgets/section.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/widgets/select.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/widgets/spinner.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/widgets/switch.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/widgets/text_input.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/widgets/text_paragraph.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/widgets/theme.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/widgets/timestamp.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/widgets/vega_view.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/widgets/virtual_scroll_container.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/assets/widgets_page.scss
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/base/utils/index-browser.js
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/perfetto/ui/src/base/utils/index.js
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/android_test/test.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/glslc/src/dependency_info.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/glslc/src/dependency_info.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/glslc/src/file.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/glslc/src/file.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/glslc/src/file_compiler.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/glslc/src/file_compiler.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/glslc/src/file_includer.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/glslc/src/file_includer.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/glslc/src/file_test.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/glslc/src/main.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/glslc/src/resource_parse.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/glslc/src/resource_parse.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/glslc/src/resource_parse_test.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/glslc/src/shader_stage.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/glslc/src/shader_stage.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/glslc/src/stage_test.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/android-release/continuous_arm.cfg
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/android-release/continuous_x86.cfg
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/android-release/presubmit_arm.cfg
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/android-release/presubmit_x86.cfg
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/linux/continuous_clang_asan.cfg
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/linux/continuous_clang_debug.cfg
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/linux/continuous_clang_release.cfg
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/linux/continuous_gcc_debug.cfg
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/linux/continuous_gcc_debug_exception.cfg
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/linux/continuous_gcc_release.cfg
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/linux/continuous_license_check.cfg
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/linux/continuous_mingw_release.cfg
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/linux/presubmit_clang_asan.cfg
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/linux/presubmit_clang_debug.cfg
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/linux/presubmit_clang_release.cfg
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/linux/presubmit_gcc_debug.cfg
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/linux/presubmit_gcc_release.cfg
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/linux/presubmit_license_check.cfg
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/linux/presubmit_mingw_release.cfg
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/macos/continuous_clang_debug.cfg
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/macos/continuous_clang_release.cfg
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/macos/presubmit_clang_debug.cfg
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/macos/presubmit_clang_release.cfg
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/ndk-build/continuous_khronos.cfg
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/ndk-build/presubmit_khronos.cfg
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/windows/continuous_debug_2017.cfg
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/windows/continuous_debug_2019.cfg
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/windows/continuous_release_2017.cfg
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/windows/continuous_release_2019.cfg
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/windows/presubmit_debug_2017.cfg
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/windows/presubmit_debug_2019.cfg
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/windows/presubmit_release_2017.cfg
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/kokoro/windows/presubmit_release_2019.cfg
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc/include/shaderc/env.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc/include/shaderc/shaderc.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc/include/shaderc/shaderc.hpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc/include/shaderc/status.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc/include/shaderc/visibility.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc/src/common_shaders_for_test.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc/src/shaderc.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc/src/shaderc_c_smoke_test.c
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc/src/shaderc_cpp_test.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc/src/shaderc_private.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc/src/shaderc_private_test.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc/src/shaderc_test.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/include/libshaderc_util/args.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/include/libshaderc_util/compiler.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/include/libshaderc_util/counting_includer.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/include/libshaderc_util/exceptions.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/include/libshaderc_util/file_finder.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/include/libshaderc_util/format.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/include/libshaderc_util/io_shaderc.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/include/libshaderc_util/message.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/include/libshaderc_util/mutex.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/include/libshaderc_util/resources.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/include/libshaderc_util/resources.inc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/include/libshaderc_util/shader_stage.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/include/libshaderc_util/spirv_tools_wrapper.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/include/libshaderc_util/string_piece.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/include/libshaderc_util/universal_unistd.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/include/libshaderc_util/version_profile.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/src/args.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/src/compiler.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/src/compiler_test.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/src/counting_includer_test.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/src/death_test.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/src/file_finder.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/src/file_finder_test.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/src/format_test.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/src/io_shaderc.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/src/io_shaderc_test.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/src/message.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/src/message_test.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/src/mutex_test.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/src/resources.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/src/shader_stage.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/src/spirv_tools_wrapper.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/src/string_piece_test.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/src/version_profile.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/shaderc/libshaderc_util/src/version_profile_test.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/benchmarks/skparagraph_benchmarks.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/benchmarks/txt_run_all_benchmarks.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/src/skia/paragraph_builder_skia.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/src/skia/paragraph_builder_skia.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/src/skia/paragraph_skia.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/src/skia/paragraph_skia.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/src/txt/asset_font_manager.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/src/txt/asset_font_manager.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/src/txt/font_asset_provider.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/src/txt/font_asset_provider.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/src/txt/font_collection.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/src/txt/font_collection.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/src/txt/font_features.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/src/txt/font_features.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/src/txt/font_style.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/src/txt/font_weight.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/src/txt/line_metrics.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/src/txt/paragraph.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/src/txt/paragraph_builder.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/src/txt/paragraph_builder.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/src/txt/paragraph_style.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/src/txt/paragraph_style.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/src/txt/placeholder_run.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/src/txt/placeholder_run.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/src/txt/run_metrics.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/src/txt/test_font_manager.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/src/txt/test_font_manager.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/src/txt/text_baseline.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/src/txt/text_decoration.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/src/txt/text_decoration.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/src/txt/text_shadow.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/src/txt/text_shadow.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/src/txt/text_style.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/src/txt/text_style.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/src/txt/typeface_font_asset_provider.cc
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/txt/src/txt/typeface_font_asset_provider.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/bitutils.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/hex_float.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/Common.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/HexFloat.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/glslang/src/ndk_test/test.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/include/spirv_cross/barrier.hpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/include/spirv_cross/external_interface.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/include/spirv_cross/image.hpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/include/spirv_cross/internal_interface.hpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/include/spirv_cross/sampler.hpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/include/spirv_cross/thread_group.hpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/main.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cfg.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cfg.hpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_common.hpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cpp.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cpp.hpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cross.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cross.hpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cross.natvis
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cross_c.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cross_c.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cross_containers.hpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cross_error_handling.hpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cross_parsed_ir.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cross_parsed_ir.hpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cross_util.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cross_util.hpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_glsl.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_glsl.hpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_hlsl.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_hlsl.hpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_msl.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_msl.hpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_parser.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_parser.hpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_reflect.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_reflect.hpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/tests-other/small_vector.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/VkLayer_khronos_validation.def
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/best_practices_error_enums.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/best_practices_utils.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/best_practices_validation.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/bp_buffer.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/bp_cmd_buffer.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/bp_cmd_buffer_nv.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/bp_copy_blit_resolve.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/bp_descriptor.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/bp_device_memory.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/bp_drawdispatch.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/bp_framebuffer.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/bp_image.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/bp_instance_device.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/bp_pipeline.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/bp_ray_tracing.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/bp_render_pass.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/bp_synchronization.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/bp_video.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/bp_wsi.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/containers/custom_containers.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/containers/qfo_transfer.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/containers/range_vector.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/containers/sparse_containers.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/containers/subresource_adapter.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/containers/subresource_adapter.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_android.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_buffer.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_buffer_address.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_cmd_buffer.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_cmd_buffer_dynamic.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_copy_blit_resolve.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_descriptor.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_device.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_device_memory.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_drawdispatch.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_external_object.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_image.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_image_layout.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_pipeline.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_pipeline_compute.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_pipeline_graphics.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_pipeline_ray_tracing.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_query.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_queue.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_ray_tracing.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_render_pass.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_shader_interface.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_shader_object.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_spirv.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_synchronization.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_video.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_wsi.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_ycbcr.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/core_validation.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/drawdispatch/descriptor_validator.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/drawdispatch/descriptor_validator.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/drawdispatch/drawdispatch_vuids.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/drawdispatch/drawdispatch_vuids.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/error_message/error_location.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/error_message/error_location.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/error_message/logging.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/error_message/logging.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/error_message/record_object.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/error_message/unimplementable_validation.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vma.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vma.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_shaders/gpu_pre_action.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_shaders/gpu_pre_copy_buffer_to_image.comp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_shaders/gpu_pre_dispatch.comp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_shaders/gpu_pre_draw.vert
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_shaders/gpu_pre_trace_rays.rgen
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_shaders/gpu_shaders_constants.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_shaders/inst_bindless_descriptor.comp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_shaders/inst_buffer_device_address.comp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/debug_printf.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/debug_printf.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/gpu_descriptor_set.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/gpu_descriptor_set.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/gpu_error_message.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/gpu_error_message.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/gpu_image_layout.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/gpu_record.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/gpu_settings.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/gpu_setup.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/gpu_state_tracker.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/gpu_state_tracker.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/gpu_subclasses.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/gpu_subclasses.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/gpu_validation.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/gpu_validation.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/gpu_vuids.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/gpu_vuids.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/spirv/bindless_descriptor_pass.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/spirv/bindless_descriptor_pass.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/spirv/buffer_device_address_pass.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/spirv/buffer_device_address_pass.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/spirv/function_basic_block.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/spirv/function_basic_block.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/spirv/instruction.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/spirv/instruction.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/spirv/link.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/spirv/module.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/spirv/module.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/spirv/pass.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/spirv/pass.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/spirv/type_manager.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/spirv/type_manager.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/layer_chassis_dispatch_manual.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/layer_options.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/layer_options.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/object_tracker/object_lifetime_validation.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/object_tracker/object_tracker_utils.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/buffer_state.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/buffer_state.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/cmd_buffer_state.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/cmd_buffer_state.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/descriptor_sets.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/descriptor_sets.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/device_memory_state.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/device_memory_state.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/device_state.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/fence_state.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/fence_state.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/image_layout_map.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/image_layout_map.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/image_state.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/image_state.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/pipeline_layout_state.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/pipeline_layout_state.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/pipeline_state.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/pipeline_state.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/pipeline_sub_state.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/pipeline_sub_state.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/query_state.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/queue_state.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/queue_state.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/ray_tracing_state.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/render_pass_state.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/render_pass_state.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/sampler_state.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/semaphore_state.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/semaphore_state.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/shader_instruction.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/shader_instruction.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/shader_module.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/shader_module.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/shader_object_state.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/shader_object_state.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/state_object.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/state_object.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/state_tracker.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/state_tracker.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/video_session_state.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/video_session_state.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_buffer.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_cmd_buffer.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_cmd_buffer_dynamic.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_descriptor.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_device_memory.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_external_object.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_framebuffer.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_image.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_instance_device.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_pipeline.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_ray_tracing.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_render_pass.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_shader_object.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_synchronization.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_utils.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_wsi.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/stateless_validation.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_access_context.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_access_context.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_access_state.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_access_state.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_commandbuffer.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_commandbuffer.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_common.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_common.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_op.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_op.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_renderpass.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_renderpass.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_submit.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_submit.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_utils.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_utils.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_validation.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_validation.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_vuid_maps.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_vuid_maps.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/thread_tracker/thread_safety_validation.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/thread_tracker/thread_safety_validation.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/android_ndk_types.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/cast_utils.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/convert_utils.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/convert_utils.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/hash_util.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/hash_util.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/hash_vk_types.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/image_layout_utils.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/image_layout_utils.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/ray_tracing_utils.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/ray_tracing_utils.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/shader_utils.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/shader_utils.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/vk_layer_extension_utils.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/vk_layer_extension_utils.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/vk_layer_utils.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/vk_layer_utils.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vk_layer_config.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vk_layer_config.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/best_practices.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/best_practices.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/chassis.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/chassis.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/chassis_dispatch_helper.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/command_validation.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/dynamic_state_helper.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/dynamic_state_helper.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/enum_flag_bits.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/error_location_helper.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/error_location_helper.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/feature_requirements_helper.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/feature_requirements_helper.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/gpu_as_inspection_comp.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/gpu_inst_shader_hash.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/gpu_pre_copy_buffer_to_image_comp.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/gpu_pre_dispatch_comp.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/gpu_pre_draw_vert.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/gpu_pre_trace_rays_rgen.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/inst_bindless_descriptor_comp.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/inst_buffer_device_address_comp.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/layer_chassis_dispatch.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/layer_chassis_dispatch.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/object_tracker.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/object_tracker.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/pnext_chain_extraction.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/pnext_chain_extraction.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/spirv_grammar_helper.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/spirv_grammar_helper.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/spirv_tools_commit_id.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/spirv_validation_helper.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/state_tracker_helper.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/state_tracker_helper.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/stateless_validation_helper.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/stateless_validation_helper.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/sync_validation_types.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/sync_validation_types.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/thread_safety.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/thread_safety_commands.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/thread_safety_counter_bodies.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/thread_safety_counter_definitions.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/thread_safety_counter_instances.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/valid_enum_values.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/valid_enum_values.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/valid_flag_values.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_api_version.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_dispatch_table_helper.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_dispatch_table_helper.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_extension_helper.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_extension_helper.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_function_pointers.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_function_pointers.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_layer_dispatch_table.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_object_types.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_object_types.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_safe_struct.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_safe_struct_core.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_safe_struct_ext.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_safe_struct_khr.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_safe_struct_utils.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_safe_struct_vendor.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_validation_error_messages.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/MODULE.bazel
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/WORKSPACE.bzlmod
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/algorithm/algorithm.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/algorithm/container.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/attributes.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/call_once.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/casts.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/config.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/const_init.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/dynamic_annotations.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/inline_variable_test_a.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/inline_variable_test_b.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/atomic_hook.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/atomic_hook_test_helper.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/atomic_hook_test_helper.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/cycleclock.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/cycleclock.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/cycleclock_config.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/direct_mmap.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/endian.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/errno_saver.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/exception_safety_testing.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/exception_safety_testing.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/exception_testing.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/fast_type_id.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/hide_ptr.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/identity.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/inline_variable.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/inline_variable_testing.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/invoke.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/low_level_alloc.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/low_level_alloc.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/low_level_scheduling.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/nullability_impl.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/per_thread_tls.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/pretty_function.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/raw_logging.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/raw_logging.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/scheduling_mode.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/scoped_set_env.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/scoped_set_env.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/spinlock.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/spinlock.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/spinlock_akaros.inc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/spinlock_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/spinlock_linux.inc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/spinlock_posix.inc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/spinlock_wait.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/spinlock_wait.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/spinlock_win32.inc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/strerror.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/strerror.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/strerror_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/sysinfo.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/sysinfo.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/thread_identity.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/thread_identity.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/thread_identity_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/throw_delegate.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/throw_delegate.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/tsan_mutex_interface.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/unaligned_access.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/log_severity.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/log_severity.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/macros.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/no_destructor.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/no_destructor_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/nullability.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/optimization.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/options.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/policy_checks.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/port.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/prefetch.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/spinlock_test_common.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/base/thread_annotations.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/cleanup/cleanup.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/cleanup/internal/cleanup.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/btree_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/btree_map.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/btree_set.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/fixed_array.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/fixed_array_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/flat_hash_map.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/flat_hash_set.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/inlined_vector.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/inlined_vector_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/internal/btree.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/internal/btree_container.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/internal/common.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/internal/common_policy_traits.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/internal/compressed_tuple.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/internal/container_memory.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/internal/hash_function_defaults.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/internal/hash_generator_testing.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/internal/hash_generator_testing.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/internal/hash_policy_testing.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/internal/hash_policy_traits.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/internal/hashtable_debug.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/internal/hashtable_debug_hooks.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/internal/hashtablez_sampler.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/internal/hashtablez_sampler.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/internal/hashtablez_sampler_force_weak_definition.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/internal/inlined_vector.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/internal/layout.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/internal/layout_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/internal/node_slot_policy.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/internal/raw_hash_map.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/internal/raw_hash_set.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/internal/raw_hash_set.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/internal/raw_hash_set_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/internal/raw_hash_set_probe_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/internal/test_allocator.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/internal/test_instance_tracker.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/internal/test_instance_tracker.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/internal/tracked.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/node_hash_map.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/container/node_hash_set.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/crc/crc32c.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/crc/crc32c.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/crc/crc32c_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/crc/internal/cpu_detect.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/crc/internal/cpu_detect.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/crc/internal/crc.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/crc/internal/crc.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/crc/internal/crc32_x86_arm_combined_simd.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/crc/internal/crc32c.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/crc/internal/crc32c_inline.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/crc/internal/crc_cord_state.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/crc/internal/crc_cord_state.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/crc/internal/crc_internal.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/crc/internal/crc_memcpy.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/crc/internal/crc_memcpy_fallback.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/crc/internal/crc_memcpy_x86_arm_combined.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/crc/internal/crc_non_temporal_memcpy.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/crc/internal/crc_x86_arm_combined.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/crc/internal/non_temporal_arm_intrinsics.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/crc/internal/non_temporal_memcpy.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/failure_signal_handler.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/address_is_readable.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/address_is_readable.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/demangle.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/demangle.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/examine_stack.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/stack_consumption.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/stack_consumption.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/stacktrace_arm-inl.inc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/stacktrace_emscripten-inl.inc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/stacktrace_generic-inl.inc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/stacktrace_powerpc-inl.inc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/stacktrace_riscv-inl.inc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/stacktrace_win32-inl.inc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/stacktrace_x86-inl.inc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/symbolize.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/vdso_support.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/vdso_support.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/leak_check.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/leak_check.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/stacktrace.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/stacktrace.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/stacktrace_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/symbolize.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/symbolize.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/symbolize_darwin.inc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/symbolize_elf.inc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/symbolize_emscripten.inc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/symbolize_unimplemented.inc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/debugging/symbolize_win32.inc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/flags/commandlineflag.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/flags/commandlineflag.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/flags/config.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/flags/declare.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/flags/flag.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/flags/flag.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/flags/flag_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/flags/flag_test_defs.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/flags/internal/commandlineflag.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/flags/internal/commandlineflag.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/flags/internal/flag.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/flags/internal/flag.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/flags/internal/flag_msvc.inc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/flags/internal/parse.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/flags/internal/path_util.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/flags/internal/private_handle_accessor.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/flags/internal/private_handle_accessor.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/flags/internal/program_name.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/flags/internal/program_name.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/flags/internal/registry.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/flags/internal/sequence_lock.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/flags/internal/usage.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/flags/internal/usage.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/flags/marshalling.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/flags/marshalling.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/flags/parse.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/flags/parse.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/flags/reflection.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/flags/reflection.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/flags/usage.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/flags/usage.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/flags/usage_config.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/flags/usage_config.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/functional/any_invocable.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/functional/bind_front.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/functional/function_ref.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/functional/function_type_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/functional/internal/any_invocable.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/functional/internal/front_binder.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/functional/internal/function_ref.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/functional/overload.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/hash/hash.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/hash/hash_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/hash/hash_testing.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/hash/internal/city.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/hash/internal/city.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/hash/internal/hash.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/hash/internal/hash.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/hash/internal/low_level_hash.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/hash/internal/low_level_hash.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/hash/internal/print_hash_of.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/hash/internal/spy_hash_state.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/absl_check.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/absl_log.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/absl_vlog_is_on.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/check.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/check_test_impl.inc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/die_if_null.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/die_if_null.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/flags.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/flags.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/globals.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/globals.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/initialize.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/initialize.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/append_truncated.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/check_impl.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/check_op.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/check_op.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/conditions.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/conditions.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/config.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/flags.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/fnmatch.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/fnmatch.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/fnmatch_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/globals.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/globals.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/log_format.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/log_format.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/log_impl.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/log_message.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/log_message.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/log_sink_set.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/log_sink_set.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/nullguard.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/nullguard.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/nullstream.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/proto.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/proto.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/strip.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/structured.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/test_actions.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/test_actions.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/test_helpers.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/test_helpers.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/test_matchers.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/test_matchers.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/vlog_config.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/vlog_config.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/vlog_config_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/internal/voidify.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/log.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/log_basic_test_impl.inc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/log_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/log_entry.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/log_entry.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/log_sink.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/log_sink.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/log_sink_registry.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/log_streamer.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/scoped_mock_log.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/scoped_mock_log.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/structured.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/log/vlog_is_on.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/memory/memory.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/meta/type_traits.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/numeric/bits.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/numeric/bits_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/numeric/int128.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/numeric/int128.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/numeric/int128_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/numeric/int128_have_intrinsic.inc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/numeric/int128_no_intrinsic.inc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/numeric/internal/bits.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/numeric/internal/representation.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/profiling/internal/exponential_biased.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/profiling/internal/exponential_biased.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/profiling/internal/periodic_sampler.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/profiling/internal/periodic_sampler.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/profiling/internal/periodic_sampler_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/profiling/internal/sample_recorder.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/benchmarks.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/bernoulli_distribution.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/beta_distribution.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/bit_gen_ref.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/discrete_distribution.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/discrete_distribution.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/distributions.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/exponential_distribution.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/gaussian_distribution.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/chi_square.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/chi_square.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/distribution_caller.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/distribution_test_util.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/distribution_test_util.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/explicit_seed_seq.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/fast_uniform_bits.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/fastmath.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/gaussian_distribution_gentables.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/generate_real.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/iostream_state_saver.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/mock_helpers.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/mock_overload_set.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/nanobenchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/nanobenchmark.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/nonsecure_base.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/pcg_engine.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/platform.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/pool_urbg.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/pool_urbg.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/randen.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/randen.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/randen_benchmarks.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/randen_detect.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/randen_detect.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/randen_engine.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/randen_hwaes.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/randen_hwaes.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/randen_round_keys.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/randen_slow.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/randen_slow.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/randen_traits.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/salted_seed_seq.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/seed_material.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/seed_material.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/sequence_urbg.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/traits.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/uniform_helper.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/internal/wide_multiply.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/log_uniform_int_distribution.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/mock_distributions.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/mocking_bit_gen.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/poisson_distribution.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/random.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/seed_gen_exception.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/seed_gen_exception.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/seed_sequences.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/seed_sequences.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/uniform_int_distribution.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/uniform_real_distribution.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/random/zipf_distribution.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/status/internal/status_internal.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/status/internal/status_internal.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/status/internal/statusor_internal.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/status/status.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/status/status.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/status/status_payload_printer.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/status/status_payload_printer.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/status/statusor.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/status/statusor.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/ascii.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/ascii.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/ascii_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/charconv.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/charconv.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/charconv_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/charset.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/charset_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/cord.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/cord.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/cord_analysis.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/cord_analysis.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/cord_buffer.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/cord_buffer.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/cord_test_helpers.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/cordz_test_helpers.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/escaping.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/escaping.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/escaping_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/has_absl_stringify.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/has_ostream_operator.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/charconv_bigint.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/charconv_bigint.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/charconv_parse.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/charconv_parse.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_data_edge.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_internal.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_internal.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_rep_btree.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_rep_btree.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_navigator.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_navigator.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_reader.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_reader.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_rep_consume.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_rep_consume.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_rep_flat.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_rep_test_util.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cordz_functions.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cordz_functions.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cordz_handle.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cordz_handle.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cordz_info.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cordz_info.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cordz_sample_token.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cordz_sample_token.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cordz_statistics.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cordz_update_scope.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cordz_update_tracker.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/damerau_levenshtein_distance.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/damerau_levenshtein_distance.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/escaping.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/escaping.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/escaping_test_common.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/has_absl_stringify.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/memutil.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/memutil.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/memutil_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/numbers_test_common.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/ostringstream.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/ostringstream.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/ostringstream_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/pow10_helper.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/pow10_helper.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/resize_uninitialized.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/stl_type_traits.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/arg.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/arg.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/bind.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/bind.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/checker.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/constexpr_parser.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/extension.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/float_conversion.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/float_conversion.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/output.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/output.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/parser.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/parser.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_join_internal.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_split_internal.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/string_constant.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/stringify_sink.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/stringify_sink.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/utf8.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/internal/utf8.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/match.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/match.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/numbers.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/numbers.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/numbers_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/str_cat.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/str_cat.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/str_cat_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/str_format.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/str_join.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/str_join_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/str_replace.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/str_replace.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/str_replace_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/str_split.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/str_split.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/str_split_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/string_view.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/string_view.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/string_view_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/strip.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/substitute.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/strings/substitute.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/synchronization/barrier.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/synchronization/barrier.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/synchronization/blocking_counter.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/synchronization/blocking_counter.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/synchronization/blocking_counter_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/create_thread_identity.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/create_thread_identity.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/futex.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/futex_waiter.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/futex_waiter.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/graphcycles_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/kernel_timeout.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/kernel_timeout.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/per_thread_sem.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/per_thread_sem.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/pthread_waiter.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/pthread_waiter.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/sem_waiter.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/sem_waiter.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/stdcpp_waiter.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/stdcpp_waiter.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/thread_pool.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/waiter.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/waiter_base.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/waiter_base.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/win32_waiter.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/win32_waiter.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/synchronization/mutex.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/synchronization/mutex.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/synchronization/mutex_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/synchronization/notification.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/synchronization/notification.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/civil_time.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/civil_time.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/civil_time_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/clock.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/clock.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/clock_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/duration.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/duration_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/format.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/format_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/include/cctz/civil_time.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/include/cctz/civil_time_detail.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/include/cctz/time_zone.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/include/cctz/zone_info_source.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/cctz_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/civil_time_detail.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_fixed.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_fixed.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_if.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_if.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_impl.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_impl.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_info.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_info.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_libc.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_libc.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_lookup.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_posix.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_posix.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/zone_info_source.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/internal/get_current_time_chrono.inc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/internal/test_util.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/internal/test_util.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/time.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/time.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/time/time_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/types/any.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/types/bad_any_cast.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/types/bad_any_cast.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/types/bad_optional_access.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/types/bad_optional_access.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/types/bad_variant_access.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/types/bad_variant_access.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/types/compare.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/types/internal/optional.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/types/internal/span.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/types/internal/variant.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/types/optional.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/types/span.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/types/variant.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/types/variant_benchmark.cc
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/utility/internal/if_constexpr.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/absl/utility/utility.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/abseil-cpp/ci/absl_alternate_options.h
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/wuffs/release/c/wuffs-v0.2.c
+ORIGIN: https://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/wuffs/release/c/wuffs-v0.3.c
+TYPE: LicenseType.apache
+FILE: ../../../flutter/third_party/abseil-cpp/MODULE.bazel
+FILE: ../../../flutter/third_party/abseil-cpp/WORKSPACE.bzlmod
+FILE: ../../../flutter/third_party/abseil-cpp/absl/algorithm/algorithm.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/algorithm/container.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/attributes.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/call_once.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/casts.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/config.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/const_init.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/dynamic_annotations.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/inline_variable_test_a.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/inline_variable_test_b.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/atomic_hook.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/atomic_hook_test_helper.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/atomic_hook_test_helper.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/cycleclock.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/cycleclock.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/cycleclock_config.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/direct_mmap.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/endian.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/errno_saver.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/exception_safety_testing.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/exception_safety_testing.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/exception_testing.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/fast_type_id.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/hide_ptr.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/identity.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/inline_variable.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/inline_variable_testing.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/invoke.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/low_level_alloc.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/low_level_alloc.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/low_level_scheduling.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/nullability_impl.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/per_thread_tls.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/pretty_function.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/raw_logging.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/raw_logging.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/scheduling_mode.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/scoped_set_env.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/scoped_set_env.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/spinlock.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/spinlock.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/spinlock_akaros.inc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/spinlock_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/spinlock_linux.inc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/spinlock_posix.inc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/spinlock_wait.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/spinlock_wait.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/spinlock_win32.inc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/strerror.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/strerror.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/strerror_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/sysinfo.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/sysinfo.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/thread_identity.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/thread_identity.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/thread_identity_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/throw_delegate.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/throw_delegate.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/tsan_mutex_interface.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/unaligned_access.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/log_severity.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/log_severity.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/macros.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/no_destructor.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/no_destructor_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/nullability.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/optimization.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/options.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/policy_checks.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/port.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/prefetch.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/spinlock_test_common.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/base/thread_annotations.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/cleanup/cleanup.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/cleanup/internal/cleanup.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/btree_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/btree_map.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/btree_set.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/fixed_array.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/fixed_array_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/flat_hash_map.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/flat_hash_set.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/inlined_vector.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/inlined_vector_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/internal/btree.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/internal/btree_container.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/internal/common.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/internal/common_policy_traits.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/internal/compressed_tuple.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/internal/container_memory.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/internal/hash_function_defaults.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/internal/hash_generator_testing.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/internal/hash_generator_testing.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/internal/hash_policy_testing.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/internal/hash_policy_traits.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/internal/hashtable_debug.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/internal/hashtable_debug_hooks.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/internal/hashtablez_sampler.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/internal/hashtablez_sampler.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/internal/hashtablez_sampler_force_weak_definition.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/internal/inlined_vector.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/internal/layout.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/internal/layout_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/internal/node_slot_policy.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/internal/raw_hash_map.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/internal/raw_hash_set.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/internal/raw_hash_set.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/internal/raw_hash_set_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/internal/raw_hash_set_probe_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/internal/test_allocator.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/internal/test_instance_tracker.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/internal/test_instance_tracker.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/internal/tracked.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/node_hash_map.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/container/node_hash_set.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/crc/crc32c.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/crc/crc32c.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/crc/crc32c_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/crc/internal/cpu_detect.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/crc/internal/cpu_detect.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/crc/internal/crc.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/crc/internal/crc.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/crc/internal/crc32_x86_arm_combined_simd.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/crc/internal/crc32c.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/crc/internal/crc32c_inline.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/crc/internal/crc_cord_state.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/crc/internal/crc_cord_state.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/crc/internal/crc_internal.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/crc/internal/crc_memcpy.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/crc/internal/crc_memcpy_fallback.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/crc/internal/crc_memcpy_x86_arm_combined.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/crc/internal/crc_non_temporal_memcpy.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/crc/internal/crc_x86_arm_combined.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/crc/internal/non_temporal_arm_intrinsics.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/crc/internal/non_temporal_memcpy.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/failure_signal_handler.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/address_is_readable.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/address_is_readable.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/demangle.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/demangle.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/examine_stack.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/stack_consumption.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/stack_consumption.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/stacktrace_arm-inl.inc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/stacktrace_emscripten-inl.inc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/stacktrace_generic-inl.inc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/stacktrace_powerpc-inl.inc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/stacktrace_riscv-inl.inc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/stacktrace_win32-inl.inc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/stacktrace_x86-inl.inc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/symbolize.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/vdso_support.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/vdso_support.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/leak_check.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/leak_check.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/stacktrace.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/stacktrace.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/stacktrace_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/symbolize.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/symbolize.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/symbolize_darwin.inc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/symbolize_elf.inc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/symbolize_emscripten.inc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/symbolize_unimplemented.inc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/symbolize_win32.inc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/flags/commandlineflag.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/flags/commandlineflag.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/flags/config.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/flags/declare.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/flags/flag.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/flags/flag.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/flags/flag_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/flags/flag_test_defs.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/flags/internal/commandlineflag.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/flags/internal/commandlineflag.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/flags/internal/flag.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/flags/internal/flag.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/flags/internal/flag_msvc.inc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/flags/internal/parse.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/flags/internal/path_util.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/flags/internal/private_handle_accessor.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/flags/internal/private_handle_accessor.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/flags/internal/program_name.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/flags/internal/program_name.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/flags/internal/registry.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/flags/internal/sequence_lock.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/flags/internal/usage.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/flags/internal/usage.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/flags/marshalling.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/flags/marshalling.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/flags/parse.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/flags/parse.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/flags/reflection.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/flags/reflection.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/flags/usage.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/flags/usage.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/flags/usage_config.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/flags/usage_config.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/functional/any_invocable.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/functional/bind_front.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/functional/function_ref.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/functional/function_type_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/functional/internal/any_invocable.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/functional/internal/front_binder.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/functional/internal/function_ref.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/functional/overload.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/hash/hash.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/hash/hash_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/hash/hash_testing.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/hash/internal/city.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/hash/internal/city.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/hash/internal/hash.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/hash/internal/hash.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/hash/internal/low_level_hash.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/hash/internal/low_level_hash.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/hash/internal/print_hash_of.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/hash/internal/spy_hash_state.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/absl_check.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/absl_log.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/absl_vlog_is_on.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/check.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/check_test_impl.inc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/die_if_null.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/die_if_null.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/flags.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/flags.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/globals.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/globals.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/initialize.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/initialize.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/append_truncated.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/check_impl.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/check_op.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/check_op.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/conditions.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/conditions.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/config.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/flags.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/fnmatch.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/fnmatch.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/fnmatch_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/globals.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/globals.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/log_format.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/log_format.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/log_impl.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/log_message.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/log_message.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/log_sink_set.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/log_sink_set.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/nullguard.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/nullguard.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/nullstream.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/proto.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/proto.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/strip.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/structured.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/test_actions.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/test_actions.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/test_helpers.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/test_helpers.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/test_matchers.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/test_matchers.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/vlog_config.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/vlog_config.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/vlog_config_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/internal/voidify.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/log.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/log_basic_test_impl.inc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/log_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/log_entry.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/log_entry.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/log_sink.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/log_sink.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/log_sink_registry.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/log_streamer.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/scoped_mock_log.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/scoped_mock_log.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/structured.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/log/vlog_is_on.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/memory/memory.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/meta/type_traits.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/numeric/bits.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/numeric/bits_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/numeric/int128.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/numeric/int128.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/numeric/int128_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/numeric/int128_have_intrinsic.inc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/numeric/int128_no_intrinsic.inc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/numeric/internal/bits.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/numeric/internal/representation.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/profiling/internal/exponential_biased.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/profiling/internal/exponential_biased.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/profiling/internal/periodic_sampler.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/profiling/internal/periodic_sampler.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/profiling/internal/periodic_sampler_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/profiling/internal/sample_recorder.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/benchmarks.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/bernoulli_distribution.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/beta_distribution.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/bit_gen_ref.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/discrete_distribution.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/discrete_distribution.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/distributions.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/exponential_distribution.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/gaussian_distribution.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/chi_square.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/chi_square.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/distribution_caller.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/distribution_test_util.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/distribution_test_util.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/explicit_seed_seq.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/fast_uniform_bits.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/fastmath.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/gaussian_distribution_gentables.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/generate_real.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/iostream_state_saver.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/mock_helpers.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/mock_overload_set.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/nanobenchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/nanobenchmark.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/nonsecure_base.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/pcg_engine.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/platform.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/pool_urbg.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/pool_urbg.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/randen.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/randen.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/randen_benchmarks.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/randen_detect.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/randen_detect.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/randen_engine.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/randen_hwaes.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/randen_hwaes.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/randen_round_keys.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/randen_slow.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/randen_slow.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/randen_traits.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/salted_seed_seq.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/seed_material.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/seed_material.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/sequence_urbg.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/traits.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/uniform_helper.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/internal/wide_multiply.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/log_uniform_int_distribution.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/mock_distributions.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/mocking_bit_gen.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/poisson_distribution.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/random.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/seed_gen_exception.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/seed_gen_exception.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/seed_sequences.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/seed_sequences.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/uniform_int_distribution.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/uniform_real_distribution.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/zipf_distribution.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/status/internal/status_internal.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/status/internal/status_internal.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/status/internal/statusor_internal.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/status/status.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/status/status.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/status/status_payload_printer.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/status/status_payload_printer.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/status/statusor.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/status/statusor.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/ascii.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/ascii.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/ascii_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/charconv.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/charconv.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/charconv_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/charset.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/charset_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/cord.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/cord.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/cord_analysis.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/cord_analysis.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/cord_buffer.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/cord_buffer.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/cord_test_helpers.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/cordz_test_helpers.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/escaping.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/escaping.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/escaping_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/has_absl_stringify.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/has_ostream_operator.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/charconv_bigint.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/charconv_bigint.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/charconv_parse.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/charconv_parse.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_data_edge.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_internal.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_internal.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_rep_btree.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_rep_btree.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_navigator.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_navigator.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_reader.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_reader.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_rep_consume.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_rep_consume.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_rep_flat.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cord_rep_test_util.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cordz_functions.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cordz_functions.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cordz_handle.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cordz_handle.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cordz_info.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cordz_info.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cordz_sample_token.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cordz_sample_token.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cordz_statistics.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cordz_update_scope.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/cordz_update_tracker.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/damerau_levenshtein_distance.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/damerau_levenshtein_distance.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/escaping.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/escaping.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/escaping_test_common.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/has_absl_stringify.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/memutil.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/memutil.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/memutil_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/numbers_test_common.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/ostringstream.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/ostringstream.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/ostringstream_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/pow10_helper.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/pow10_helper.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/resize_uninitialized.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/stl_type_traits.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/arg.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/arg.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/bind.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/bind.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/checker.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/constexpr_parser.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/extension.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/float_conversion.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/float_conversion.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/output.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/output.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/parser.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_format/parser.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_join_internal.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/str_split_internal.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/string_constant.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/stringify_sink.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/stringify_sink.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/utf8.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/internal/utf8.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/match.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/match.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/numbers.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/numbers.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/numbers_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/str_cat.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/str_cat.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/str_cat_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/str_format.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/str_join.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/str_join_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/str_replace.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/str_replace.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/str_replace_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/str_split.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/str_split.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/str_split_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/string_view.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/string_view.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/string_view_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/strip.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/substitute.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/strings/substitute.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/synchronization/barrier.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/synchronization/barrier.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/synchronization/blocking_counter.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/synchronization/blocking_counter.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/synchronization/blocking_counter_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/create_thread_identity.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/create_thread_identity.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/futex.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/futex_waiter.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/futex_waiter.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/graphcycles_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/kernel_timeout.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/kernel_timeout.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/per_thread_sem.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/per_thread_sem.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/pthread_waiter.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/pthread_waiter.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/sem_waiter.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/sem_waiter.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/stdcpp_waiter.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/stdcpp_waiter.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/thread_pool.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/waiter.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/waiter_base.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/waiter_base.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/win32_waiter.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/synchronization/internal/win32_waiter.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/synchronization/mutex.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/synchronization/mutex.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/synchronization/mutex_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/synchronization/notification.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/synchronization/notification.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/civil_time.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/civil_time.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/civil_time_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/clock.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/clock.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/clock_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/duration.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/duration_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/format.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/format_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/include/cctz/civil_time.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/include/cctz/civil_time_detail.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/include/cctz/time_zone.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/include/cctz/zone_info_source.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/cctz_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/civil_time_detail.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_fixed.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_fixed.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_if.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_if.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_impl.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_impl.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_info.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_info.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_libc.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_libc.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_lookup.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_posix.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_posix.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/zone_info_source.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/internal/get_current_time_chrono.inc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/internal/test_util.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/internal/test_util.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/time.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/time.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/time_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/types/any.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/types/bad_any_cast.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/types/bad_any_cast.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/types/bad_optional_access.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/types/bad_optional_access.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/types/bad_variant_access.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/types/bad_variant_access.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/types/compare.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/types/internal/optional.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/types/internal/span.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/types/internal/variant.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/types/optional.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/types/span.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/types/variant.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/types/variant_benchmark.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/utility/internal/if_constexpr.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/utility/utility.h
+FILE: ../../../flutter/third_party/abseil-cpp/ci/absl_alternate_options.h
+FILE: ../../../flutter/third_party/angle/include/CL/cl.h
+FILE: ../../../flutter/third_party/angle/include/CL/cl_d3d10.h
+FILE: ../../../flutter/third_party/angle/include/CL/cl_d3d11.h
+FILE: ../../../flutter/third_party/angle/include/CL/cl_dx9_media_sharing.h
+FILE: ../../../flutter/third_party/angle/include/CL/cl_dx9_media_sharing_intel.h
+FILE: ../../../flutter/third_party/angle/include/CL/cl_egl.h
+FILE: ../../../flutter/third_party/angle/include/CL/cl_ext.h
+FILE: ../../../flutter/third_party/angle/include/CL/cl_ext_intel.h
+FILE: ../../../flutter/third_party/angle/include/CL/cl_gl.h
+FILE: ../../../flutter/third_party/angle/include/CL/cl_gl_ext.h
+FILE: ../../../flutter/third_party/angle/include/CL/cl_half.h
+FILE: ../../../flutter/third_party/angle/include/CL/cl_icd.h
+FILE: ../../../flutter/third_party/angle/include/CL/cl_layer.h
+FILE: ../../../flutter/third_party/angle/include/CL/cl_platform.h
+FILE: ../../../flutter/third_party/angle/include/CL/cl_va_api_media_sharing_intel.h
+FILE: ../../../flutter/third_party/angle/include/CL/cl_version.h
+FILE: ../../../flutter/third_party/angle/include/CL/opencl.h
+FILE: ../../../flutter/third_party/angle/include/EGL/egl.h
+FILE: ../../../flutter/third_party/angle/include/EGL/eglext.h
+FILE: ../../../flutter/third_party/angle/include/EGL/eglplatform.h
+FILE: ../../../flutter/third_party/angle/include/GLES/egl.h
+FILE: ../../../flutter/third_party/angle/include/GLES/glplatform.h
+FILE: ../../../flutter/third_party/angle/include/GLES2/gl2platform.h
+FILE: ../../../flutter/third_party/angle/include/GLES3/gl3platform.h
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/layout/fragment.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-af/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-am/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-ar/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-as/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-az/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-b+sr+Latn/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-be/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-bg/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-bn/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-bs/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-ca/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-cs/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-da/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-de/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-el/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-en-rAU/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-en-rCA/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-en-rGB/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-en-rIN/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-en-rXC/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-es-rUS/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-es/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-et/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-eu/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-fa/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-fi/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-fr-rCA/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-fr/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-gl/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-gu/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-hi/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-hr/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-hu/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-hy/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-in/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-is/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-it/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-iw/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-ja/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-ka/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-kk/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-km/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-kn/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-ko/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-ky/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-lo/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-lt/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-lv/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-mk/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-ml/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-mn/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-mr/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-ms/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-my/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-nb/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-ne/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-nl/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-or/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-pa/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-pl/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-pt-rPT/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-pt/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-ro/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-ru/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-si/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-sk/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-sl/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-sq/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-sr/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-sv/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-sw/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-ta/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-te/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-th/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-tl/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-tr/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-uk/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-ur/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-uz/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-vi/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-zh-rCN/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-zh-rHK/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-zh-rTW/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-zu/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values/dimens.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values/drivers.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values/global_settings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values/intents.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values/preference_keys.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values/strings.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/xml/main.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/src/com/android/angle/AndroidManifest.xml
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/src/com/android/angle/EmptyMainActivity.java
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/src/com/android/angle/MainActivity.java
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/src/com/android/angle/common/GlobalSettings.java
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/src/com/android/angle/common/MainFragment.java
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/src/com/android/angle/common/Receiver.java
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/src/com/android/angle/common/SearchProvider.java
+FILE: ../../../flutter/third_party/angle/src/common/vulkan/vk_google_filtering_precision.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Overlay_font_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/overlay/RobotoMono-Bold.ttf
+FILE: ../../../flutter/third_party/expat/expat/fuzz/xml_parse_fuzzer.c
+FILE: ../../../flutter/third_party/expat/expat/fuzz/xml_parsebuffer_fuzzer.c
+FILE: ../../../flutter/third_party/flatbuffers/composer.json
+FILE: ../../../flutter/third_party/flatbuffers/conan/test_package/test_package.cpp
+FILE: ../../../flutter/third_party/flatbuffers/grpc/boringssl.patch
+FILE: ../../../flutter/third_party/flatbuffers/grpc/flatbuffers-java-grpc/src/main/java/com/google/flatbuffers/grpc/FlatbuffersUtils.java
+FILE: ../../../flutter/third_party/flatbuffers/grpc/src/compiler/cpp_generator.cc
+FILE: ../../../flutter/third_party/flatbuffers/grpc/src/compiler/cpp_generator.h
+FILE: ../../../flutter/third_party/flatbuffers/grpc/src/compiler/go_generator.cc
+FILE: ../../../flutter/third_party/flatbuffers/grpc/src/compiler/go_generator.h
+FILE: ../../../flutter/third_party/flatbuffers/grpc/src/compiler/java_generator.cc
+FILE: ../../../flutter/third_party/flatbuffers/grpc/src/compiler/java_generator.h
+FILE: ../../../flutter/third_party/flatbuffers/grpc/src/compiler/python_generator.cc
+FILE: ../../../flutter/third_party/flatbuffers/grpc/src/compiler/python_generator.h
+FILE: ../../../flutter/third_party/flatbuffers/grpc/src/compiler/schema_interface.h
+FILE: ../../../flutter/third_party/flatbuffers/grpc/src/compiler/swift_generator.cc
+FILE: ../../../flutter/third_party/flatbuffers/grpc/src/compiler/swift_generator.h
+FILE: ../../../flutter/third_party/flatbuffers/grpc/src/compiler/ts_generator.cc
+FILE: ../../../flutter/third_party/flatbuffers/grpc/src/compiler/ts_generator.h
+FILE: ../../../flutter/third_party/flatbuffers/include/flatbuffers/allocator.h
+FILE: ../../../flutter/third_party/flatbuffers/include/flatbuffers/array.h
+FILE: ../../../flutter/third_party/flatbuffers/include/flatbuffers/base.h
+FILE: ../../../flutter/third_party/flatbuffers/include/flatbuffers/bfbs_generator.h
+FILE: ../../../flutter/third_party/flatbuffers/include/flatbuffers/buffer.h
+FILE: ../../../flutter/third_party/flatbuffers/include/flatbuffers/buffer_ref.h
+FILE: ../../../flutter/third_party/flatbuffers/include/flatbuffers/code_generators.h
+FILE: ../../../flutter/third_party/flatbuffers/include/flatbuffers/default_allocator.h
+FILE: ../../../flutter/third_party/flatbuffers/include/flatbuffers/detached_buffer.h
+FILE: ../../../flutter/third_party/flatbuffers/include/flatbuffers/flatbuffer_builder.h
+FILE: ../../../flutter/third_party/flatbuffers/include/flatbuffers/flatbuffers.h
+FILE: ../../../flutter/third_party/flatbuffers/include/flatbuffers/flatc.h
+FILE: ../../../flutter/third_party/flatbuffers/include/flatbuffers/flex_flat_util.h
+FILE: ../../../flutter/third_party/flatbuffers/include/flatbuffers/flexbuffers.h
+FILE: ../../../flutter/third_party/flatbuffers/include/flatbuffers/grpc.h
+FILE: ../../../flutter/third_party/flatbuffers/include/flatbuffers/hash.h
+FILE: ../../../flutter/third_party/flatbuffers/include/flatbuffers/idl.h
+FILE: ../../../flutter/third_party/flatbuffers/include/flatbuffers/minireflect.h
+FILE: ../../../flutter/third_party/flatbuffers/include/flatbuffers/pch/flatc_pch.h
+FILE: ../../../flutter/third_party/flatbuffers/include/flatbuffers/pch/pch.h
+FILE: ../../../flutter/third_party/flatbuffers/include/flatbuffers/reflection.h
+FILE: ../../../flutter/third_party/flatbuffers/include/flatbuffers/reflection_generated.h
+FILE: ../../../flutter/third_party/flatbuffers/include/flatbuffers/registry.h
+FILE: ../../../flutter/third_party/flatbuffers/include/flatbuffers/stl_emulation.h
+FILE: ../../../flutter/third_party/flatbuffers/include/flatbuffers/string.h
+FILE: ../../../flutter/third_party/flatbuffers/include/flatbuffers/struct.h
+FILE: ../../../flutter/third_party/flatbuffers/include/flatbuffers/table.h
+FILE: ../../../flutter/third_party/flatbuffers/include/flatbuffers/util.h
+FILE: ../../../flutter/third_party/flatbuffers/include/flatbuffers/vector.h
+FILE: ../../../flutter/third_party/flatbuffers/include/flatbuffers/vector_downward.h
+FILE: ../../../flutter/third_party/flatbuffers/include/flatbuffers/verifier.h
+FILE: ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/ArrayReadWriteBuf.java
+FILE: ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/BaseVector.java
+FILE: ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/BooleanVector.java
+FILE: ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/ByteBufferReadWriteBuf.java
+FILE: ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/ByteBufferUtil.java
+FILE: ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/ByteVector.java
+FILE: ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/Constants.java
+FILE: ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/DoubleVector.java
+FILE: ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/FlatBufferBuilder.java
+FILE: ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/FlexBuffers.java
+FILE: ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/FlexBuffersBuilder.java
+FILE: ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/FloatVector.java
+FILE: ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/IntVector.java
+FILE: ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/LongVector.java
+FILE: ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/ReadBuf.java
+FILE: ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/ReadWriteBuf.java
+FILE: ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/ShortVector.java
+FILE: ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/StringVector.java
+FILE: ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/Struct.java
+FILE: ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/Table.java
+FILE: ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/UnionVector.java
+FILE: ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/Utf8.java
+FILE: ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/Utf8Old.java
+FILE: ../../../flutter/third_party/flatbuffers/java/com/google/flatbuffers/Utf8Safe.java
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/benchmark/build.gradle.kts
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/ArrayReadWriteBuf.java
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/BaseVector.java
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/BooleanVector.java
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/ByteBufferReadWriteBuf.java
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/ByteBufferUtil.java
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/ByteVector.java
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/Constants.java
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/DoubleVector.java
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/FlatBufferBuilder.java
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/FlexBuffers.java
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/FlexBuffersBuilder.java
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/FloatVector.java
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/IntVector.java
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/LongVector.java
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/ReadBuf.java
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/ReadWriteBuf.java
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/ShortVector.java
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/StringVector.java
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/Struct.java
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/Table.java
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/UnionVector.java
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/Utf8.java
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/Utf8Old.java
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/Utf8Safe.java
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/kotlin/com/google/flatbuffers/kotlin/benchmark/FlexBuffersBenchmark.kt
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/kotlin/com/google/flatbuffers/kotlin/benchmark/JsonBenchmark.kt
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/benchmark/src/jvmMain/kotlin/com/google/flatbuffers/kotlin/benchmark/UTF8Benchmark.kt
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/build.gradle.kts
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/flatbuffers-kotlin/build.gradle.kts
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/commonMain/kotlin/com/google/flatbuffers/kotlin/Buffers.kt
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/commonMain/kotlin/com/google/flatbuffers/kotlin/ByteArray.kt
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/commonMain/kotlin/com/google/flatbuffers/kotlin/FlexBuffers.kt
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/commonMain/kotlin/com/google/flatbuffers/kotlin/FlexBuffersBuilder.kt
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/commonMain/kotlin/com/google/flatbuffers/kotlin/FlexBuffersInternals.kt
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/commonMain/kotlin/com/google/flatbuffers/kotlin/JSON.kt
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/commonMain/kotlin/com/google/flatbuffers/kotlin/Utf8.kt
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/commonTest/kotlin/com/google/flatbuffers/kotlin/ByteArrayTest.kt
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/commonTest/kotlin/com/google/flatbuffers/kotlin/FlexBuffersTest.kt
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/commonTest/kotlin/com/google/flatbuffers/kotlin/JSONTest.kt
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/jsMain/kotlin/com/google/flatbuffers/kotlin/ByteArray.kt
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/jvmMain/kotlin/com/google/flatbuffers/kotlin/ByteArray.kt
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/nativeMain/kotlin/com/google/flatbuffers/kotlin/ByteArray.kt
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/libs.versions.toml
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/META-INF/MANIFEST.MF
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/gradle-wrapper-classpath.properties
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/AbstractCommandLineConverter.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/AbstractPropertiesCommandLineConverter.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineArgumentException.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineConverter.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineOption.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$1.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$AfterFirstSubCommand.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$AfterOptions.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$BeforeFirstSubCommand.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$CaseInsensitiveStringComparator.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$KnownOptionParserState.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$MissingOptionArgState.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$OptionAwareParserState.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$OptionComparator.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$OptionParserState.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$OptionString.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$OptionStringComparator.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$ParserState.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$UnknownOptionParserState.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/ParsedCommandLine.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/ParsedCommandLineOption.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/ProjectPropertiesCommandLineConverter.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/SystemPropertiesCommandLineConverter.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/BootstrapMainStarter$1.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/BootstrapMainStarter.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/Download$1.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/Download$DefaultDownloadProgressListener.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/Download$ProxyAuthenticator.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/Download.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/DownloadProgressListener.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/ExclusiveFileAccessManager.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/GradleUserHomeLookup.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/GradleWrapperMain.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/IDownload.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/Install$1.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/Install$InstallCheck.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/Install.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/Logger.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/PathAssembler$LocalDistribution.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/PathAssembler.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/SystemPropertiesHandler.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/WrapperConfiguration.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/WrapperExecutor.class
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.properties
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/settings.gradle.kts
+FILE: ../../../flutter/third_party/flatbuffers/kotlin/spotless/spotless.kt
+FILE: ../../../flutter/third_party/flatbuffers/lobster/flatbuffers.lobster
+FILE: ../../../flutter/third_party/flatbuffers/lua/flatbuffers.lua
+FILE: ../../../flutter/third_party/flatbuffers/lua/flatbuffers/binaryarray.lua
+FILE: ../../../flutter/third_party/flatbuffers/lua/flatbuffers/builder.lua
+FILE: ../../../flutter/third_party/flatbuffers/lua/flatbuffers/compat.lua
+FILE: ../../../flutter/third_party/flatbuffers/lua/flatbuffers/compat_5_1.lua
+FILE: ../../../flutter/third_party/flatbuffers/lua/flatbuffers/compat_5_3.lua
+FILE: ../../../flutter/third_party/flatbuffers/lua/flatbuffers/compat_luajit.lua
+FILE: ../../../flutter/third_party/flatbuffers/lua/flatbuffers/numTypes.lua
+FILE: ../../../flutter/third_party/flatbuffers/lua/flatbuffers/view.lua
+FILE: ../../../flutter/third_party/flatbuffers/reflection/reflection.fbs
+FILE: ../../../flutter/third_party/flatbuffers/src/annotated_binary_text_gen.cpp
+FILE: ../../../flutter/third_party/flatbuffers/src/annotated_binary_text_gen.h
+FILE: ../../../flutter/third_party/flatbuffers/src/bfbs_gen.h
+FILE: ../../../flutter/third_party/flatbuffers/src/bfbs_gen_lua.cpp
+FILE: ../../../flutter/third_party/flatbuffers/src/bfbs_gen_lua.h
+FILE: ../../../flutter/third_party/flatbuffers/src/bfbs_namer.h
+FILE: ../../../flutter/third_party/flatbuffers/src/binary_annotator.cpp
+FILE: ../../../flutter/third_party/flatbuffers/src/binary_annotator.h
+FILE: ../../../flutter/third_party/flatbuffers/src/code_generators.cpp
+FILE: ../../../flutter/third_party/flatbuffers/src/flatc.cpp
+FILE: ../../../flutter/third_party/flatbuffers/src/flatc_main.cpp
+FILE: ../../../flutter/third_party/flatbuffers/src/flathash.cpp
+FILE: ../../../flutter/third_party/flatbuffers/src/idl_gen_cpp.cpp
+FILE: ../../../flutter/third_party/flatbuffers/src/idl_gen_csharp.cpp
+FILE: ../../../flutter/third_party/flatbuffers/src/idl_gen_dart.cpp
+FILE: ../../../flutter/third_party/flatbuffers/src/idl_gen_fbs.cpp
+FILE: ../../../flutter/third_party/flatbuffers/src/idl_gen_go.cpp
+FILE: ../../../flutter/third_party/flatbuffers/src/idl_gen_grpc.cpp
+FILE: ../../../flutter/third_party/flatbuffers/src/idl_gen_java.cpp
+FILE: ../../../flutter/third_party/flatbuffers/src/idl_gen_json_schema.cpp
+FILE: ../../../flutter/third_party/flatbuffers/src/idl_gen_kotlin.cpp
+FILE: ../../../flutter/third_party/flatbuffers/src/idl_gen_lobster.cpp
+FILE: ../../../flutter/third_party/flatbuffers/src/idl_gen_lua.cpp
+FILE: ../../../flutter/third_party/flatbuffers/src/idl_gen_php.cpp
+FILE: ../../../flutter/third_party/flatbuffers/src/idl_gen_python.cpp
+FILE: ../../../flutter/third_party/flatbuffers/src/idl_gen_rust.cpp
+FILE: ../../../flutter/third_party/flatbuffers/src/idl_gen_swift.cpp
+FILE: ../../../flutter/third_party/flatbuffers/src/idl_gen_text.cpp
+FILE: ../../../flutter/third_party/flatbuffers/src/idl_gen_ts.cpp
+FILE: ../../../flutter/third_party/flatbuffers/src/idl_namer.h
+FILE: ../../../flutter/third_party/flatbuffers/src/idl_parser.cpp
+FILE: ../../../flutter/third_party/flatbuffers/src/namer.h
+FILE: ../../../flutter/third_party/flatbuffers/src/reflection.cpp
+FILE: ../../../flutter/third_party/flatbuffers/src/util.cpp
+FILE: ../../../flutter/third_party/flatbuffers/swift/FlatBuffers.podspec
+FILE: ../../../flutter/third_party/flatbuffers/swift/Package.swift
+FILE: ../../../flutter/third_party/flatbuffers/swift/Package@swift-5.5.swift
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/ByteBuffer.swift
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Constants.swift
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Documentation.md
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/fbs/monster_step_1.fbs
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/fbs/monster_step_2.fbs
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/fbs/monster_step_3.fbs
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/fbs/monster_step_4.fbs
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/fbs/monster_step_5.fbs
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/fbs/monster_step_6.fbs
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/fbs/monster_step_7.fbs
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/swift/swift_code_1.swift
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/swift/swift_code_10.swift
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/swift/swift_code_11.swift
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/swift/swift_code_12.swift
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/swift/swift_code_13.swift
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/swift/swift_code_2.swift
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/swift/swift_code_3.swift
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/swift/swift_code_4.swift
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/swift/swift_code_5.swift
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/swift/swift_code_6.swift
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/swift/swift_code_7.swift
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/swift/swift_code_8.swift
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/swift/swift_code_9.swift
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/images/tutorial_cover_image_1.png
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Tutorials/Tutorial_Table_of_Contents.tutorial
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Tutorials/create_your_first_buffer.tutorial
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Tutorials/creating_flatbuffer_schema.tutorial
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Tutorials/reading_bytebuffer.tutorial
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Enum.swift
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/FlatBufferBuilder.swift
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/FlatBufferObject.swift
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/FlatBuffersUtils.swift
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/FlatbuffersErrors.swift
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Int+extension.swift
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Message.swift
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Mutable.swift
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/NativeObject.swift
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Offset.swift
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Root.swift
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/String+extension.swift
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Struct.swift
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Table.swift
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/TableVerifier.swift
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/VeriferOptions.swift
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Verifiable.swift
+FILE: ../../../flutter/third_party/flatbuffers/swift/Sources/FlatBuffers/Verifier.swift
+FILE: ../../../flutter/third_party/flatbuffers/tsconfig.json
+FILE: ../../../flutter/third_party/flatbuffers/tsconfig.mjs.json
+FILE: ../../../flutter/third_party/flatbuffers/yarn.lock
+FILE: ../../../flutter/third_party/perfetto/Android.bp
+FILE: ../../../flutter/third_party/perfetto/BUILD
+FILE: ../../../flutter/third_party/perfetto/PerfettoIntegrationTests.xml
+FILE: ../../../flutter/third_party/perfetto/bazel/BUILD
+FILE: ../../../flutter/third_party/perfetto/bazel/jsoncpp.BUILD
+FILE: ../../../flutter/third_party/perfetto/bazel/linenoise.BUILD
+FILE: ../../../flutter/third_party/perfetto/bazel/llvm_demangle.BUILD
+FILE: ../../../flutter/third_party/perfetto/bazel/sqlite.BUILD
+FILE: ../../../flutter/third_party/perfetto/bazel/zlib.BUILD
+FILE: ../../../flutter/third_party/perfetto/buildtools/libbacktrace_config/backtrace-supported.h
+FILE: ../../../flutter/third_party/perfetto/buildtools/libbacktrace_config/config.h
+FILE: ../../../flutter/third_party/perfetto/buildtools/rustc-demangle-capi/rustc_demangle.h
+FILE: ../../../flutter/third_party/perfetto/gn/standalone/.emscripten
+FILE: ../../../flutter/third_party/perfetto/heapprofd.rc
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/base/build_config.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/base/build_configs/android_tree/perfetto_build_flags.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/base/build_configs/bazel/perfetto_build_flags.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/base/compiler.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/base/export.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/base/flat_set.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/base/logging.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/base/platform_handle.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/base/proc_utils.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/base/status.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/base/task_runner.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/base/template_util.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/base/thread_utils.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/base/time.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/android_utils.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/base64.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/circular_queue.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/container_annotations.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/crash_keys.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/ctrl_c_handler.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/endian.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/event_fd.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/file_utils.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/flat_hash_map.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/getopt.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/getopt_compat.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/hash.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/http/http_server.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/http/sha1.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/metatrace.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/metatrace_events.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/no_destructor.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/paged_memory.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/periodic_task.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/pipe.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/platform.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/scoped_file.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/small_set.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/small_vector.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/status_or.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/string_splitter.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/string_utils.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/string_view.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/string_writer.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/subprocess.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/sys_types.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/temp_file.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/thread_annotations.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/thread_checker.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/thread_task_runner.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/threading/channel.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/threading/future.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/threading/future_combinators.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/threading/poll.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/threading/spawn.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/threading/stream.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/threading/stream_combinators.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/threading/thread_pool.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/threading/util.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/unix_socket.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/unix_task_runner.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/utils.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/uuid.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/version.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/waitable_event.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/watchdog.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/watchdog_noop.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/watchdog_posix.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/base/weak_ptr.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/bigtrace/environment.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/bigtrace/orchestrator.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/bigtrace/worker.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/ipc/async_result.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/ipc/basic_types.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/ipc/client.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/ipc/client_info.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/ipc/codegen_helpers.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/ipc/deferred.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/ipc/host.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/ipc/service.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/ipc/service_descriptor.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/ipc/service_proxy.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/trace_processor/demangle.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/trace_processor/export_json.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/trace_processor/importers/memory_tracker/graph.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/trace_processor/importers/memory_tracker/graph_processor.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/trace_processor/importers/memory_tracker/memory_allocator_node_id.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/trace_processor/importers/memory_tracker/memory_graph_edge.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/trace_processor/importers/memory_tracker/raw_memory_graph_node.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/trace_processor/importers/memory_tracker/raw_process_memory_node.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/trace_processor/rpc/query_result_serializer.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/traced/data_source_types.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/traced/sys_stats_counters.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/traced/traced.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/tracing/core/basic_types.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/tracing/core/commit_data_request.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/tracing/core/consumer.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/tracing/core/observable_events.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/tracing/core/producer.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/tracing/core/shared_memory.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/tracing/core/shared_memory_abi.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/tracing/core/shared_memory_arbiter.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/tracing/core/slice.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/tracing/core/trace_packet.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/tracing/core/trace_stats.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/tracing/core/trace_writer.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/tracing/core/tracing_service.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/tracing/ipc/consumer_ipc_client.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/tracing/ipc/default_socket.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/tracing/ipc/producer_ipc_client.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/ext/tracing/ipc/service_ipc_host.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/profiling/parse_smaps.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/profiling/pprof_builder.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/protozero/contiguous_memory_range.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/protozero/copyable_ptr.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/protozero/cpp_message_obj.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/protozero/field.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/protozero/field_writer.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/protozero/gen_field_helpers.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/protozero/message.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/protozero/message_arena.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/protozero/message_handle.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/protozero/packed_repeated_fields.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/protozero/proto_decoder.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/protozero/proto_utils.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/protozero/root_message.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/protozero/scattered_heap_buffer.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/protozero/scattered_stream_null_delegate.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/protozero/scattered_stream_writer.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/protozero/static_buffer.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/abi/atomic.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/abi/backend_type.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/abi/data_source_abi.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/abi/export.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/abi/heap_buffer.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/abi/pb_decoder_abi.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/abi/producer_abi.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/abi/stream_writer_abi.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/abi/thread_utils_abi.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/abi/tracing_session_abi.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/abi/track_event_abi.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/abi/track_event_hl_abi.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/abi/track_event_ll_abi.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/compiler.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/data_source.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/fnv1a.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/pb_decoder.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/pb_macros.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/pb_msg.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/pb_packed.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/pb_utils.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/producer.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/protos/common/builtin_clock.pzc.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/protos/common/data_source_descriptor.pzc.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/protos/config/data_source_config.pzc.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/protos/config/trace_config.pzc.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/protos/config/track_event/track_event_config.pzc.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/protos/trace/interned_data/interned_data.pzc.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/protos/trace/test_event.pzc.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/protos/trace/trace.pzc.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/protos/trace/trace_packet.pzc.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/protos/trace/track_event/counter_descriptor.pzc.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/protos/trace/track_event/debug_annotation.pzc.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/protos/trace/track_event/track_descriptor.pzc.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/protos/trace/track_event/track_event.pzc.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/protos/trace/trigger.pzc.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/stream_writer.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/te_category_macros.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/te_macros.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/thread_utils.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/tracing_session.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/public/track_event.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/trace_processor/basic_types.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/trace_processor/iterator.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/trace_processor/metatrace_config.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/trace_processor/read_trace.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/trace_processor/ref_counted.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/trace_processor/status.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/trace_processor/trace_blob.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/trace_processor/trace_blob_view.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/trace_processor/trace_processor.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/trace_processor/trace_processor_storage.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/backend_type.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/buffer_exhausted_policy.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/console_interceptor.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/core/chrome_config.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/core/data_source_config.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/core/data_source_descriptor.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/core/flush_flags.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/core/forward_decls.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/core/trace_config.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/core/tracing_service_capabilities.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/core/tracing_service_state.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/data_source.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/debug_annotation.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/event_context.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/interceptor.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/internal/basic_types.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/internal/checked_scope.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/internal/compile_time_hash.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/internal/data_source_internal.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/internal/in_process_tracing_backend.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/internal/interceptor_trace_writer.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/internal/system_tracing_backend.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/internal/tracing_backend_fake.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/internal/tracing_muxer.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/internal/tracing_tls.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/internal/track_event_data_source.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/internal/track_event_internal.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/internal/track_event_interned_fields.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/internal/track_event_legacy.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/internal/track_event_macros.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/internal/write_track_event_args.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/locked_handle.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/platform.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/string_helpers.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/trace_writer_base.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/traced_proto.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/traced_value.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/traced_value_forward.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/tracing.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/tracing_backend.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/tracing_policy.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/track.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/track_event.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/track_event_args.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/track_event_category_registry.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/track_event_interned_data_index.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/track_event_legacy.h
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/track_event_state_tracker.h
+FILE: ../../../flutter/third_party/perfetto/perfetto.rc
+FILE: ../../../flutter/third_party/perfetto/python/BUILD
+FILE: ../../../flutter/third_party/perfetto/src/android_internal/atrace_hal.cc
+FILE: ../../../flutter/third_party/perfetto/src/android_internal/atrace_hal.h
+FILE: ../../../flutter/third_party/perfetto/src/android_internal/health_hal.cc
+FILE: ../../../flutter/third_party/perfetto/src/android_internal/health_hal.h
+FILE: ../../../flutter/third_party/perfetto/src/android_internal/incident_service.cc
+FILE: ../../../flutter/third_party/perfetto/src/android_internal/incident_service.h
+FILE: ../../../flutter/third_party/perfetto/src/android_internal/lazy_library_loader.cc
+FILE: ../../../flutter/third_party/perfetto/src/android_internal/lazy_library_loader.h
+FILE: ../../../flutter/third_party/perfetto/src/android_internal/power_stats.cc
+FILE: ../../../flutter/third_party/perfetto/src/android_internal/power_stats.h
+FILE: ../../../flutter/third_party/perfetto/src/android_internal/statsd.cc
+FILE: ../../../flutter/third_party/perfetto/src/android_internal/statsd.h
+FILE: ../../../flutter/third_party/perfetto/src/android_internal/statsd_logging.cc
+FILE: ../../../flutter/third_party/perfetto/src/android_internal/statsd_logging.h
+FILE: ../../../flutter/third_party/perfetto/src/android_internal/tracing_service_proxy.cc
+FILE: ../../../flutter/third_party/perfetto/src/android_internal/tracing_service_proxy.h
+FILE: ../../../flutter/third_party/perfetto/src/android_stats/perfetto_atoms.h
+FILE: ../../../flutter/third_party/perfetto/src/android_stats/statsd_logging_helper.cc
+FILE: ../../../flutter/third_party/perfetto/src/android_stats/statsd_logging_helper.h
+FILE: ../../../flutter/third_party/perfetto/src/base/android_utils.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/base64.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/crash_keys.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/ctrl_c_handler.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/debug_crash_stack_trace.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/default_platform.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/event_fd.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/file_utils.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/flat_hash_map_benchmark.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/flat_set_benchmark.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/getopt_compat.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/http/http_server.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/http/sha1.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/log_ring_buffer.h
+FILE: ../../../flutter/third_party/perfetto/src/base/logging.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/metatrace.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/paged_memory.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/periodic_task.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/pipe.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/status.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/string_splitter.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/string_utils.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/string_view.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/subprocess.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/subprocess_posix.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/subprocess_windows.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/temp_file.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/thread_checker.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/thread_task_runner.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/thread_utils.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/threading/spawn.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/threading/stream_combinators.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/threading/thread_pool.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/time.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/unix_socket.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/unix_task_runner.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/utils.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/uuid.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/version.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/virtual_destructors.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/vm_sockets.h
+FILE: ../../../flutter/third_party/perfetto/src/base/waitable_event.cc
+FILE: ../../../flutter/third_party/perfetto/src/base/watchdog_posix.cc
+FILE: ../../../flutter/third_party/perfetto/src/bigtrace/orchestrator_impl.cc
+FILE: ../../../flutter/third_party/perfetto/src/bigtrace/orchestrator_impl.h
+FILE: ../../../flutter/third_party/perfetto/src/bigtrace/trace_processor_wrapper.cc
+FILE: ../../../flutter/third_party/perfetto/src/bigtrace/trace_processor_wrapper.h
+FILE: ../../../flutter/third_party/perfetto/src/bigtrace/worker_impl.cc
+FILE: ../../../flutter/third_party/perfetto/src/bigtrace/worker_impl.h
+FILE: ../../../flutter/third_party/perfetto/src/kallsyms/kernel_symbol_map.cc
+FILE: ../../../flutter/third_party/perfetto/src/kallsyms/kernel_symbol_map.h
+FILE: ../../../flutter/third_party/perfetto/src/kallsyms/kernel_symbol_map_benchmark.cc
+FILE: ../../../flutter/third_party/perfetto/src/kallsyms/lazy_kernel_symbolizer.cc
+FILE: ../../../flutter/third_party/perfetto/src/kallsyms/lazy_kernel_symbolizer.h
+FILE: ../../../flutter/third_party/perfetto/src/kernel_utils/syscall_table.cc
+FILE: ../../../flutter/third_party/perfetto/src/kernel_utils/syscall_table.h
+FILE: ../../../flutter/third_party/perfetto/src/kernel_utils/syscalls_aarch32.h
+FILE: ../../../flutter/third_party/perfetto/src/kernel_utils/syscalls_aarch64.h
+FILE: ../../../flutter/third_party/perfetto/src/kernel_utils/syscalls_armeabi.h
+FILE: ../../../flutter/third_party/perfetto/src/kernel_utils/syscalls_x86.h
+FILE: ../../../flutter/third_party/perfetto/src/kernel_utils/syscalls_x86_64.h
+FILE: ../../../flutter/third_party/perfetto/src/perfetto_cmd/bugreport_path.h
+FILE: ../../../flutter/third_party/perfetto/src/perfetto_cmd/config.cc
+FILE: ../../../flutter/third_party/perfetto/src/perfetto_cmd/config.h
+FILE: ../../../flutter/third_party/perfetto/src/perfetto_cmd/main.cc
+FILE: ../../../flutter/third_party/perfetto/src/perfetto_cmd/packet_writer.cc
+FILE: ../../../flutter/third_party/perfetto/src/perfetto_cmd/packet_writer.h
+FILE: ../../../flutter/third_party/perfetto/src/perfetto_cmd/pbtxt_to_pb.cc
+FILE: ../../../flutter/third_party/perfetto/src/perfetto_cmd/pbtxt_to_pb.h
+FILE: ../../../flutter/third_party/perfetto/src/perfetto_cmd/perfetto_cmd.cc
+FILE: ../../../flutter/third_party/perfetto/src/perfetto_cmd/perfetto_cmd.h
+FILE: ../../../flutter/third_party/perfetto/src/perfetto_cmd/perfetto_cmd_android.cc
+FILE: ../../../flutter/third_party/perfetto/src/perfetto_cmd/perfetto_cmd_state.proto
+FILE: ../../../flutter/third_party/perfetto/src/perfetto_cmd/rate_limiter.cc
+FILE: ../../../flutter/third_party/perfetto/src/perfetto_cmd/rate_limiter.h
+FILE: ../../../flutter/third_party/perfetto/src/perfetto_cmd/trigger_perfetto.cc
+FILE: ../../../flutter/third_party/perfetto/src/perfetto_cmd/trigger_perfetto_main.cc
+FILE: ../../../flutter/third_party/perfetto/src/perfetto_cmd/trigger_producer.cc
+FILE: ../../../flutter/third_party/perfetto/src/perfetto_cmd/trigger_producer.h
+FILE: ../../../flutter/third_party/perfetto/src/profiling/common/callstack_trie.cc
+FILE: ../../../flutter/third_party/perfetto/src/profiling/common/callstack_trie.h
+FILE: ../../../flutter/third_party/perfetto/src/profiling/common/interner.h
+FILE: ../../../flutter/third_party/perfetto/src/profiling/common/interning_output.cc
+FILE: ../../../flutter/third_party/perfetto/src/profiling/common/interning_output.h
+FILE: ../../../flutter/third_party/perfetto/src/profiling/common/proc_cmdline.cc
+FILE: ../../../flutter/third_party/perfetto/src/profiling/common/proc_cmdline.h
+FILE: ../../../flutter/third_party/perfetto/src/profiling/common/proc_utils.cc
+FILE: ../../../flutter/third_party/perfetto/src/profiling/common/proc_utils.h
+FILE: ../../../flutter/third_party/perfetto/src/profiling/common/producer_support.cc
+FILE: ../../../flutter/third_party/perfetto/src/profiling/common/producer_support.h
+FILE: ../../../flutter/third_party/perfetto/src/profiling/common/profiler_guardrails.cc
+FILE: ../../../flutter/third_party/perfetto/src/profiling/common/profiler_guardrails.h
+FILE: ../../../flutter/third_party/perfetto/src/profiling/common/unwind_support.cc
+FILE: ../../../flutter/third_party/perfetto/src/profiling/common/unwind_support.h
+FILE: ../../../flutter/third_party/perfetto/src/profiling/deobfuscator.cc
+FILE: ../../../flutter/third_party/perfetto/src/profiling/deobfuscator.h
+FILE: ../../../flutter/third_party/perfetto/src/profiling/perf/common_types.h
+FILE: ../../../flutter/third_party/perfetto/src/profiling/perf/event_config.cc
+FILE: ../../../flutter/third_party/perfetto/src/profiling/perf/event_config.h
+FILE: ../../../flutter/third_party/perfetto/src/profiling/perf/event_reader.cc
+FILE: ../../../flutter/third_party/perfetto/src/profiling/perf/event_reader.h
+FILE: ../../../flutter/third_party/perfetto/src/profiling/perf/main.cc
+FILE: ../../../flutter/third_party/perfetto/src/profiling/perf/perf_producer.cc
+FILE: ../../../flutter/third_party/perfetto/src/profiling/perf/perf_producer.h
+FILE: ../../../flutter/third_party/perfetto/src/profiling/perf/proc_descriptors.cc
+FILE: ../../../flutter/third_party/perfetto/src/profiling/perf/proc_descriptors.h
+FILE: ../../../flutter/third_party/perfetto/src/profiling/perf/regs_parsing.cc
+FILE: ../../../flutter/third_party/perfetto/src/profiling/perf/regs_parsing.h
+FILE: ../../../flutter/third_party/perfetto/src/profiling/perf/traced_perf.cc
+FILE: ../../../flutter/third_party/perfetto/src/profiling/perf/traced_perf.h
+FILE: ../../../flutter/third_party/perfetto/src/profiling/perf/unwind_queue.h
+FILE: ../../../flutter/third_party/perfetto/src/profiling/perf/unwinding.cc
+FILE: ../../../flutter/third_party/perfetto/src/profiling/perf/unwinding.h
+FILE: ../../../flutter/third_party/perfetto/src/profiling/symbolizer/breakpad_parser.cc
+FILE: ../../../flutter/third_party/perfetto/src/profiling/symbolizer/breakpad_parser.h
+FILE: ../../../flutter/third_party/perfetto/src/profiling/symbolizer/breakpad_symbolizer.cc
+FILE: ../../../flutter/third_party/perfetto/src/profiling/symbolizer/breakpad_symbolizer.h
+FILE: ../../../flutter/third_party/perfetto/src/profiling/symbolizer/elf.h
+FILE: ../../../flutter/third_party/perfetto/src/profiling/symbolizer/filesystem.h
+FILE: ../../../flutter/third_party/perfetto/src/profiling/symbolizer/filesystem_posix.cc
+FILE: ../../../flutter/third_party/perfetto/src/profiling/symbolizer/filesystem_windows.cc
+FILE: ../../../flutter/third_party/perfetto/src/profiling/symbolizer/local_symbolizer.cc
+FILE: ../../../flutter/third_party/perfetto/src/profiling/symbolizer/local_symbolizer.h
+FILE: ../../../flutter/third_party/perfetto/src/profiling/symbolizer/scoped_read_mmap.h
+FILE: ../../../flutter/third_party/perfetto/src/profiling/symbolizer/scoped_read_mmap_posix.cc
+FILE: ../../../flutter/third_party/perfetto/src/profiling/symbolizer/scoped_read_mmap_windows.cc
+FILE: ../../../flutter/third_party/perfetto/src/profiling/symbolizer/subprocess.h
+FILE: ../../../flutter/third_party/perfetto/src/profiling/symbolizer/subprocess_posix.cc
+FILE: ../../../flutter/third_party/perfetto/src/profiling/symbolizer/subprocess_windows.cc
+FILE: ../../../flutter/third_party/perfetto/src/profiling/symbolizer/symbolize_database.cc
+FILE: ../../../flutter/third_party/perfetto/src/profiling/symbolizer/symbolize_database.h
+FILE: ../../../flutter/third_party/perfetto/src/profiling/symbolizer/symbolizer.cc
+FILE: ../../../flutter/third_party/perfetto/src/profiling/symbolizer/symbolizer.h
+FILE: ../../../flutter/third_party/perfetto/src/protozero/field.cc
+FILE: ../../../flutter/third_party/perfetto/src/protozero/filtering/filter_bytecode_common.h
+FILE: ../../../flutter/third_party/perfetto/src/protozero/filtering/filter_bytecode_generator.cc
+FILE: ../../../flutter/third_party/perfetto/src/protozero/filtering/filter_bytecode_generator.h
+FILE: ../../../flutter/third_party/perfetto/src/protozero/filtering/filter_bytecode_parser.cc
+FILE: ../../../flutter/third_party/perfetto/src/protozero/filtering/filter_bytecode_parser.h
+FILE: ../../../flutter/third_party/perfetto/src/protozero/filtering/filter_bytecode_parser_fuzzer.cc
+FILE: ../../../flutter/third_party/perfetto/src/protozero/filtering/filter_util.cc
+FILE: ../../../flutter/third_party/perfetto/src/protozero/filtering/filter_util.h
+FILE: ../../../flutter/third_party/perfetto/src/protozero/filtering/message_filter.cc
+FILE: ../../../flutter/third_party/perfetto/src/protozero/filtering/message_filter.h
+FILE: ../../../flutter/third_party/perfetto/src/protozero/filtering/message_filter_benchmark.cc
+FILE: ../../../flutter/third_party/perfetto/src/protozero/filtering/message_filter_fuzzer.cc
+FILE: ../../../flutter/third_party/perfetto/src/protozero/filtering/message_tokenizer.h
+FILE: ../../../flutter/third_party/perfetto/src/protozero/filtering/string_filter.cc
+FILE: ../../../flutter/third_party/perfetto/src/protozero/filtering/string_filter.h
+FILE: ../../../flutter/third_party/perfetto/src/protozero/filtering/string_filter_benchmark.cc
+FILE: ../../../flutter/third_party/perfetto/src/protozero/gen_field_helpers.cc
+FILE: ../../../flutter/third_party/perfetto/src/protozero/message.cc
+FILE: ../../../flutter/third_party/perfetto/src/protozero/message_arena.cc
+FILE: ../../../flutter/third_party/perfetto/src/protozero/packed_repeated_fields.cc
+FILE: ../../../flutter/third_party/perfetto/src/protozero/proto_decoder.cc
+FILE: ../../../flutter/third_party/perfetto/src/protozero/proto_decoder_fuzzer.cc
+FILE: ../../../flutter/third_party/perfetto/src/protozero/proto_ring_buffer.cc
+FILE: ../../../flutter/third_party/perfetto/src/protozero/proto_ring_buffer.h
+FILE: ../../../flutter/third_party/perfetto/src/protozero/protoc_plugin/cppgen_plugin.cc
+FILE: ../../../flutter/third_party/perfetto/src/protozero/protoc_plugin/protozero_c_plugin.cc
+FILE: ../../../flutter/third_party/perfetto/src/protozero/protoc_plugin/protozero_plugin.cc
+FILE: ../../../flutter/third_party/perfetto/src/protozero/scattered_heap_buffer.cc
+FILE: ../../../flutter/third_party/perfetto/src/protozero/scattered_stream_null_delegate.cc
+FILE: ../../../flutter/third_party/perfetto/src/protozero/scattered_stream_writer.cc
+FILE: ../../../flutter/third_party/perfetto/src/protozero/static_buffer.cc
+FILE: ../../../flutter/third_party/perfetto/src/protozero/virtual_destructors.cc
+FILE: ../../../flutter/third_party/perfetto/src/shared_lib/data_source.cc
+FILE: ../../../flutter/third_party/perfetto/src/shared_lib/heap_buffer.cc
+FILE: ../../../flutter/third_party/perfetto/src/shared_lib/intern_map.cc
+FILE: ../../../flutter/third_party/perfetto/src/shared_lib/intern_map.h
+FILE: ../../../flutter/third_party/perfetto/src/shared_lib/pb_decoder.cc
+FILE: ../../../flutter/third_party/perfetto/src/shared_lib/producer.cc
+FILE: ../../../flutter/third_party/perfetto/src/shared_lib/reset_for_testing.h
+FILE: ../../../flutter/third_party/perfetto/src/shared_lib/stream_writer.cc
+FILE: ../../../flutter/third_party/perfetto/src/shared_lib/stream_writer.h
+FILE: ../../../flutter/third_party/perfetto/src/shared_lib/thread_utils.cc
+FILE: ../../../flutter/third_party/perfetto/src/shared_lib/tracing_session.cc
+FILE: ../../../flutter/third_party/perfetto/src/shared_lib/track_event.cc
+FILE: ../../../flutter/third_party/perfetto/src/tracebox/tracebox.cc
+FILE: ../../../flutter/third_party/perfetto/src/traceconv/deobfuscate_profile.cc
+FILE: ../../../flutter/third_party/perfetto/src/traceconv/deobfuscate_profile.h
+FILE: ../../../flutter/third_party/perfetto/src/traceconv/lite_fallbacks.cc
+FILE: ../../../flutter/third_party/perfetto/src/traceconv/main.cc
+FILE: ../../../flutter/third_party/perfetto/src/traceconv/pprof_builder.cc
+FILE: ../../../flutter/third_party/perfetto/src/traceconv/proto_full_utils.cc
+FILE: ../../../flutter/third_party/perfetto/src/traceconv/proto_full_utils.h
+FILE: ../../../flutter/third_party/perfetto/src/traceconv/symbolize_profile.cc
+FILE: ../../../flutter/third_party/perfetto/src/traceconv/symbolize_profile.h
+FILE: ../../../flutter/third_party/perfetto/src/traceconv/trace_to_hprof.cc
+FILE: ../../../flutter/third_party/perfetto/src/traceconv/trace_to_hprof.h
+FILE: ../../../flutter/third_party/perfetto/src/traceconv/trace_to_json.cc
+FILE: ../../../flutter/third_party/perfetto/src/traceconv/trace_to_json.h
+FILE: ../../../flutter/third_party/perfetto/src/traceconv/trace_to_profile.cc
+FILE: ../../../flutter/third_party/perfetto/src/traceconv/trace_to_profile.h
+FILE: ../../../flutter/third_party/perfetto/src/traceconv/trace_to_systrace.cc
+FILE: ../../../flutter/third_party/perfetto/src/traceconv/trace_to_systrace.h
+FILE: ../../../flutter/third_party/perfetto/src/traceconv/trace_to_text.cc
+FILE: ../../../flutter/third_party/perfetto/src/traceconv/trace_to_text.h
+FILE: ../../../flutter/third_party/perfetto/src/traceconv/utils.cc
+FILE: ../../../flutter/third_party/perfetto/src/traceconv/utils.h
+FILE: ../../../flutter/third_party/perfetto/src/traced_relay/relay_service.cc
+FILE: ../../../flutter/third_party/perfetto/src/traced_relay/relay_service.h
+FILE: ../../../flutter/third_party/perfetto/src/traced_relay/relay_service_integrationtest.cc
+FILE: ../../../flutter/third_party/perfetto/src/traced_relay/relay_service_main.cc
+FILE: ../../../flutter/third_party/perfetto/src/traced_relay/socket_relay_handler.cc
+FILE: ../../../flutter/third_party/perfetto/src/traced_relay/socket_relay_handler.h
+FILE: ../../../flutter/third_party/perfetto/src/websocket_bridge/websocket_bridge.cc
+FILE: ../../../flutter/third_party/perfetto/src/websocket_bridge/websocket_bridge.h
+FILE: ../../../flutter/third_party/perfetto/src/websocket_bridge/websocket_bridge_main.cc
+FILE: ../../../flutter/third_party/perfetto/traced_perf.rc
+FILE: ../../../flutter/third_party/perfetto/ui/build.js
+FILE: ../../../flutter/third_party/perfetto/ui/config/integrationtest_env.js
+FILE: ../../../flutter/third_party/perfetto/ui/config/integrationtest_setup.js
+FILE: ../../../flutter/third_party/perfetto/ui/config/integrationtest_teardown.js
+FILE: ../../../flutter/third_party/perfetto/ui/config/jest.integrationtest.config.js
+FILE: ../../../flutter/third_party/perfetto/ui/config/jest.unittest.config.js
+FILE: ../../../flutter/third_party/perfetto/ui/config/rollup.config.js
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/common.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/details.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/flags_page.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/fonts.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/home_page.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/metrics_page.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/modal.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/perfetto.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/query_page.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/record.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/sidebar.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/topbar.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/trace_info_page.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/viz_page.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/widgets/anchor.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/widgets/button.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/widgets/callout.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/widgets/checkbox.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/widgets/details_shell.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/widgets/details_table.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/widgets/editor.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/widgets/empty_state.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/widgets/error.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/widgets/form.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/widgets/grid_layout.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/widgets/hotkey.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/widgets/menu.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/widgets/multiselect.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/widgets/popup.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/widgets/section.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/widgets/select.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/widgets/spinner.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/widgets/switch.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/widgets/text_input.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/widgets/text_paragraph.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/widgets/theme.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/widgets/timestamp.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/widgets/vega_view.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/widgets/virtual_scroll_container.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/widgets_page.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/base/utils/index-browser.js
+FILE: ../../../flutter/third_party/perfetto/ui/src/base/utils/index.js
+FILE: ../../../flutter/third_party/shaderc/DEVELOPMENT.howto.md
+FILE: ../../../flutter/third_party/shaderc/android_test/test.cpp
+FILE: ../../../flutter/third_party/shaderc/downloads.md
+FILE: ../../../flutter/third_party/shaderc/glslc/src/dependency_info.cc
+FILE: ../../../flutter/third_party/shaderc/glslc/src/dependency_info.h
+FILE: ../../../flutter/third_party/shaderc/glslc/src/file.cc
+FILE: ../../../flutter/third_party/shaderc/glslc/src/file.h
+FILE: ../../../flutter/third_party/shaderc/glslc/src/file_compiler.cc
+FILE: ../../../flutter/third_party/shaderc/glslc/src/file_compiler.h
+FILE: ../../../flutter/third_party/shaderc/glslc/src/file_includer.cc
+FILE: ../../../flutter/third_party/shaderc/glslc/src/file_includer.h
+FILE: ../../../flutter/third_party/shaderc/glslc/src/file_test.cc
+FILE: ../../../flutter/third_party/shaderc/glslc/src/main.cc
+FILE: ../../../flutter/third_party/shaderc/glslc/src/resource_parse.cc
+FILE: ../../../flutter/third_party/shaderc/glslc/src/resource_parse.h
+FILE: ../../../flutter/third_party/shaderc/glslc/src/resource_parse_test.cc
+FILE: ../../../flutter/third_party/shaderc/glslc/src/shader_stage.cc
+FILE: ../../../flutter/third_party/shaderc/glslc/src/shader_stage.h
+FILE: ../../../flutter/third_party/shaderc/glslc/src/stage_test.cc
+FILE: ../../../flutter/third_party/shaderc/kokoro/android-release/continuous_arm.cfg
+FILE: ../../../flutter/third_party/shaderc/kokoro/android-release/continuous_x86.cfg
+FILE: ../../../flutter/third_party/shaderc/kokoro/android-release/presubmit_arm.cfg
+FILE: ../../../flutter/third_party/shaderc/kokoro/android-release/presubmit_x86.cfg
+FILE: ../../../flutter/third_party/shaderc/kokoro/img/linux.png
+FILE: ../../../flutter/third_party/shaderc/kokoro/img/macos.png
+FILE: ../../../flutter/third_party/shaderc/kokoro/img/windows.png
+FILE: ../../../flutter/third_party/shaderc/kokoro/linux/continuous_clang_asan.cfg
+FILE: ../../../flutter/third_party/shaderc/kokoro/linux/continuous_clang_debug.cfg
+FILE: ../../../flutter/third_party/shaderc/kokoro/linux/continuous_clang_release.cfg
+FILE: ../../../flutter/third_party/shaderc/kokoro/linux/continuous_gcc_debug.cfg
+FILE: ../../../flutter/third_party/shaderc/kokoro/linux/continuous_gcc_debug_exception.cfg
+FILE: ../../../flutter/third_party/shaderc/kokoro/linux/continuous_gcc_release.cfg
+FILE: ../../../flutter/third_party/shaderc/kokoro/linux/continuous_license_check.cfg
+FILE: ../../../flutter/third_party/shaderc/kokoro/linux/continuous_mingw_release.cfg
+FILE: ../../../flutter/third_party/shaderc/kokoro/linux/presubmit_clang_asan.cfg
+FILE: ../../../flutter/third_party/shaderc/kokoro/linux/presubmit_clang_debug.cfg
+FILE: ../../../flutter/third_party/shaderc/kokoro/linux/presubmit_clang_release.cfg
+FILE: ../../../flutter/third_party/shaderc/kokoro/linux/presubmit_gcc_debug.cfg
+FILE: ../../../flutter/third_party/shaderc/kokoro/linux/presubmit_gcc_release.cfg
+FILE: ../../../flutter/third_party/shaderc/kokoro/linux/presubmit_license_check.cfg
+FILE: ../../../flutter/third_party/shaderc/kokoro/linux/presubmit_mingw_release.cfg
+FILE: ../../../flutter/third_party/shaderc/kokoro/macos/continuous_clang_debug.cfg
+FILE: ../../../flutter/third_party/shaderc/kokoro/macos/continuous_clang_release.cfg
+FILE: ../../../flutter/third_party/shaderc/kokoro/macos/presubmit_clang_debug.cfg
+FILE: ../../../flutter/third_party/shaderc/kokoro/macos/presubmit_clang_release.cfg
+FILE: ../../../flutter/third_party/shaderc/kokoro/ndk-build/continuous_khronos.cfg
+FILE: ../../../flutter/third_party/shaderc/kokoro/ndk-build/presubmit_khronos.cfg
+FILE: ../../../flutter/third_party/shaderc/kokoro/windows/continuous_debug_2017.cfg
+FILE: ../../../flutter/third_party/shaderc/kokoro/windows/continuous_debug_2019.cfg
+FILE: ../../../flutter/third_party/shaderc/kokoro/windows/continuous_release_2017.cfg
+FILE: ../../../flutter/third_party/shaderc/kokoro/windows/continuous_release_2019.cfg
+FILE: ../../../flutter/third_party/shaderc/kokoro/windows/presubmit_debug_2017.cfg
+FILE: ../../../flutter/third_party/shaderc/kokoro/windows/presubmit_debug_2019.cfg
+FILE: ../../../flutter/third_party/shaderc/kokoro/windows/presubmit_release_2017.cfg
+FILE: ../../../flutter/third_party/shaderc/kokoro/windows/presubmit_release_2019.cfg
+FILE: ../../../flutter/third_party/shaderc/libshaderc/include/shaderc/env.h
+FILE: ../../../flutter/third_party/shaderc/libshaderc/include/shaderc/shaderc.h
+FILE: ../../../flutter/third_party/shaderc/libshaderc/include/shaderc/shaderc.hpp
+FILE: ../../../flutter/third_party/shaderc/libshaderc/include/shaderc/status.h
+FILE: ../../../flutter/third_party/shaderc/libshaderc/include/shaderc/visibility.h
+FILE: ../../../flutter/third_party/shaderc/libshaderc/src/common_shaders_for_test.h
+FILE: ../../../flutter/third_party/shaderc/libshaderc/src/shaderc.cc
+FILE: ../../../flutter/third_party/shaderc/libshaderc/src/shaderc_c_smoke_test.c
+FILE: ../../../flutter/third_party/shaderc/libshaderc/src/shaderc_cpp_test.cc
+FILE: ../../../flutter/third_party/shaderc/libshaderc/src/shaderc_private.h
+FILE: ../../../flutter/third_party/shaderc/libshaderc/src/shaderc_private_test.cc
+FILE: ../../../flutter/third_party/shaderc/libshaderc/src/shaderc_test.cc
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/include/libshaderc_util/args.h
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/include/libshaderc_util/compiler.h
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/include/libshaderc_util/counting_includer.h
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/include/libshaderc_util/exceptions.h
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/include/libshaderc_util/file_finder.h
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/include/libshaderc_util/format.h
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/include/libshaderc_util/io_shaderc.h
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/include/libshaderc_util/message.h
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/include/libshaderc_util/mutex.h
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/include/libshaderc_util/resources.h
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/include/libshaderc_util/resources.inc
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/include/libshaderc_util/shader_stage.h
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/include/libshaderc_util/spirv_tools_wrapper.h
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/include/libshaderc_util/string_piece.h
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/include/libshaderc_util/universal_unistd.h
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/include/libshaderc_util/version_profile.h
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/src/args.cc
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/src/compiler.cc
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/src/compiler_test.cc
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/src/counting_includer_test.cc
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/src/death_test.h
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/src/file_finder.cc
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/src/file_finder_test.cc
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/src/format_test.cc
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/src/io_shaderc.cc
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/src/io_shaderc_test.cc
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/src/message.cc
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/src/message_test.cc
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/src/mutex_test.cc
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/src/resources.cc
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/src/shader_stage.cc
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/src/spirv_tools_wrapper.cc
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/src/string_piece_test.cc
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/src/version_profile.cc
+FILE: ../../../flutter/third_party/shaderc/libshaderc_util/src/version_profile_test.cc
+FILE: ../../../flutter/third_party/txt/benchmarks/skparagraph_benchmarks.cc
+FILE: ../../../flutter/third_party/txt/benchmarks/txt_run_all_benchmarks.cc
+FILE: ../../../flutter/third_party/txt/src/skia/paragraph_builder_skia.cc
+FILE: ../../../flutter/third_party/txt/src/skia/paragraph_builder_skia.h
+FILE: ../../../flutter/third_party/txt/src/skia/paragraph_skia.cc
+FILE: ../../../flutter/third_party/txt/src/skia/paragraph_skia.h
+FILE: ../../../flutter/third_party/txt/src/txt/asset_font_manager.cc
+FILE: ../../../flutter/third_party/txt/src/txt/asset_font_manager.h
+FILE: ../../../flutter/third_party/txt/src/txt/font_asset_provider.cc
+FILE: ../../../flutter/third_party/txt/src/txt/font_asset_provider.h
+FILE: ../../../flutter/third_party/txt/src/txt/font_collection.cc
+FILE: ../../../flutter/third_party/txt/src/txt/font_collection.h
+FILE: ../../../flutter/third_party/txt/src/txt/font_features.cc
+FILE: ../../../flutter/third_party/txt/src/txt/font_features.h
+FILE: ../../../flutter/third_party/txt/src/txt/font_style.h
+FILE: ../../../flutter/third_party/txt/src/txt/font_weight.h
+FILE: ../../../flutter/third_party/txt/src/txt/line_metrics.h
+FILE: ../../../flutter/third_party/txt/src/txt/paragraph.h
+FILE: ../../../flutter/third_party/txt/src/txt/paragraph_builder.cc
+FILE: ../../../flutter/third_party/txt/src/txt/paragraph_builder.h
+FILE: ../../../flutter/third_party/txt/src/txt/paragraph_style.cc
+FILE: ../../../flutter/third_party/txt/src/txt/paragraph_style.h
+FILE: ../../../flutter/third_party/txt/src/txt/placeholder_run.cc
+FILE: ../../../flutter/third_party/txt/src/txt/placeholder_run.h
+FILE: ../../../flutter/third_party/txt/src/txt/run_metrics.h
+FILE: ../../../flutter/third_party/txt/src/txt/test_font_manager.cc
+FILE: ../../../flutter/third_party/txt/src/txt/test_font_manager.h
+FILE: ../../../flutter/third_party/txt/src/txt/text_baseline.h
+FILE: ../../../flutter/third_party/txt/src/txt/text_decoration.cc
+FILE: ../../../flutter/third_party/txt/src/txt/text_decoration.h
+FILE: ../../../flutter/third_party/txt/src/txt/text_shadow.cc
+FILE: ../../../flutter/third_party/txt/src/txt/text_shadow.h
+FILE: ../../../flutter/third_party/txt/src/txt/text_style.cc
+FILE: ../../../flutter/third_party/txt/src/txt/text_style.h
+FILE: ../../../flutter/third_party/txt/src/txt/typeface_font_asset_provider.cc
+FILE: ../../../flutter/third_party/txt/src/txt/typeface_font_asset_provider.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/bitutils.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/hex_float.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/Common.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/HexFloat.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/ndk_test/test.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/Package.swift
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/include/spirv_cross/barrier.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/include/spirv_cross/external_interface.h
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/include/spirv_cross/image.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/include/spirv_cross/internal_interface.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/include/spirv_cross/sampler.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/include/spirv_cross/thread_group.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/main.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/pkg-config/spirv-cross-c-shared.pc.in
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/pkg-config/spirv-cross-c.pc.in
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/comp/access-chain-invalidate.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/comp/atomic-decrement.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/comp/atomic-increment.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/comp/bitcast_icmp.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/comp/block-name-alias-global.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/comp/control-flow-hints.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/comp/global-parameter-name-alias.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/comp/nmin-max-clamp.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/comp/nmin-max-clamp.relax-nan.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/frag/array-of-structured-buffers.structured.fxconly.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/frag/cbuffer-stripped.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/frag/combined-sampler-reuse.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/frag/empty-struct.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/frag/frem.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/frag/function-overload-alias.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/frag/image-extract-reuse.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/frag/implicit-read-dep-phi.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/frag/inf-nan-constant.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/frag/line-directive.line.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/frag/lut-promotion-initializer.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/frag/pack-and-unpack-uint2.fxconly.nofxc.sm60.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/frag/pass-by-value.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/frag/sample-and-compare.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/frag/single-function-private-lut.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/frag/srem.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/frag/storage-class-output-initializer.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/frag/structured-buffer.structured.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/frag/texel-fetch-no-lod.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/frag/texture-sampling-fp16.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/frag/unknown-depth-state.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/frag/unreachable.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/vert/extract-transposed-matrix-from-struct.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/vert/spec-constant-op-composite.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/vert/uint-vertex-id-instance-id.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/asm/vert/vertex-id-instance-id.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/comp/access-chain-load-composite.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/comp/access-chains.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/comp/access-chains.force-uav.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/comp/address-buffers.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/comp/atomic.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/comp/barriers.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/comp/builtins.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/comp/composite-array-initialization.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/comp/globallycoherent.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/comp/image.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/comp/image.nonwritable-uav-texture.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/comp/inverse.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/comp/num-workgroups-alone.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/comp/num-workgroups-with-builtins.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/comp/outer-product.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/comp/rayquery.nofxc.fxconly.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/comp/rmw-matrix.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/comp/rwbuffer-matrix.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/comp/scalar-std450-distance-length-normalize.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/comp/shared.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/comp/spec-constant-op-member-array.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/comp/spec-constant-work-group-size.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/comp/ssbo-array-length.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/comp/ssbo-array.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/comp/ssbo-store-array.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/flatten/array.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/flatten/basic.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/flatten/copy.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/flatten/dynamic.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/flatten/matrix-conversion.flatten.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/flatten/matrixindex.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/flatten/multiindex.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/flatten/push-constant.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/flatten/rowmajor.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/flatten/struct.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/flatten/struct.rowmajor.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/flatten/swizzle.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/flatten/types.flatten.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/array-lut-no-loop-variable.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/basic-color-3comp.sm30.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/basic-color-3comp.sm50.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/basic.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/bit-conversions.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/boolean-mix.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/builtins.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/bvec-operations.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/clip-cull-distance.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/combined-texture-sampler-parameter.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/combined-texture-sampler-shadow.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/complex-expression-in-access-chain.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/constant-composites.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/control-dependent-in-branch.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/demote-to-helper.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/depth-greater-than.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/depth-less-than.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/dual-source-blending.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/early-fragment-test.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/for-loop-continue-control-flow.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/fp16-packing.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/front-facing.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/hyperbolic.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/image-query-selective.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/image-query-uav.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/image-query-uav.nonwritable-uav-texture.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/image-query.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/input-attachment-ms.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/input-attachment.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/io-block.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/legacy-tex-modifiers.sm30.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/lut-promotion.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/matrix-input.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/mod.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/mrt.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/no-return.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/no-return2.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/nonuniform-qualifier.nonuniformresource.sm51.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/partial-write-preserve.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/pixel-interlock-ordered.sm51.fxconly.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/point-coord-compat.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/query-lod.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/readonly-coherent-ssbo.force-uav.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/readonly-coherent-ssbo.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/resources.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/row-major-layout-in-struct.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/sample-cmp-level-zero.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/sample-mask-in-and-out.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/sample-mask-in.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/sample-mask-out.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/sampler-array.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/sampler-image-arrays.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/scalar-refract-reflect.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/separate-combined-fake-overload.sm30.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/spec-constant-block-size.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/spec-constant-ternary.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/switch-unreachable-break.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/switch-unsigned-case.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/swizzle-scalar.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/tex-sampling-ms.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/tex-sampling.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/tex-sampling.sm30.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/texel-fetch-offset.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/texture-proj-shadow.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/texture-size-combined-image-sampler.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/unary-enclose.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/unorm-snorm-packing.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/frag/various-glsl-ops.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/mesh/mesh-shader-basic-lines.spv14.vk.nocompat.mesh
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/mesh/mesh-shader-basic-triangle.spv14.vk.nocompat.mesh
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/task/task-basic.spv14.vk.nocompat.task
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/vert/basic.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/vert/clip-cull-distance.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/vert/instancing.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/vert/invariant.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/vert/legacy-int-attribute.sm30.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/vert/locations.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/vert/matrix-attribute.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/vert/matrix-output.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/vert/no-contraction.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/vert/no-input.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/vert/point-size-compat.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/vert/point-size.sm30.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/vert/qualifiers.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/vert/read-from-row-major-array.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/vert/return-array.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/vert/sampler-buffers.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/vert/struct-composite-decl.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-hlsl/vert/texture_buffer.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/amd/shader_trinary_minmax.msl21.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/comp/atomic-decrement.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/comp/atomic-increment.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/comp/bitcast_iadd.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/comp/bitcast_icmp.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/comp/bitcast_sar.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/comp/bitcast_sdiv.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/comp/bitcast_slr.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/comp/block-name-alias-global.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/comp/buffer-write-relative-addr.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/comp/buffer-write.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/comp/copy-object-ssbo-to-ssbo.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/comp/copy-object-ubo-to-ssbo.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/comp/duplicate-spec-id.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/comp/global-parameter-name-alias.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/comp/image-load-store-short-vector.invalid.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/comp/multiple-entry.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/comp/op-spec-constant-op-vector-related.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/comp/quantize.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/comp/relaxed-block-layout.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/comp/specialization-constant-workgroup.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/comp/struct-resource-name-aliasing.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/comp/uint_smulextended.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/comp/undefined-constant-composite.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/comp/undefined-spec-constant-composite.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/comp/variable-pointers-2.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/comp/variable-pointers-store-forwarding.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/comp/vector-builtin-type-cast-func.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/comp/vector-builtin-type-cast.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/combined-sampler-reuse.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/default-member-names.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/depth-array-texture-lod.lod-as-grad.1d-as-2d.agx-cube-grad.msl23.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/depth-image-color-format-fetch.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/depth-image-color-format-sampled.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/descriptor-array-unnamed.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/disable-renamed-output.frag-output.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/empty-struct.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/extract-packed-from-composite.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/frem.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/function-overload-alias.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/image-extract-reuse.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/implicit-read-dep-phi.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/inf-nan-constant.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/interpolation-qualifiers-struct.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/line-directive.line.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/locations-components.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/lut-promotion-initializer.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/min-lod.msl22.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/op-constant-null.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/op-image-sampled-image.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/pass-by-value.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/phi-loop-variable.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/pull-model-interpolation.asm.msl23.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/sample-and-compare.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/single-function-private-lut.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/srem.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/storage-class-output-initializer.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/switch-different-sizes.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/switch-long-case.asm.msl22.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/switch-unsigned-long-case.asm.msl22.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/texel-fetch-no-lod.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/texture-atomics.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/texture-atomics.asm.graphics-robust-access.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/texture-sampling-fp16.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/undef-variable-store.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/unknown-depth-state.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/unord-relational-op.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/unord-relational-op.relax-nan.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/unreachable.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/frag/vector-shuffle-oom.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/tesc/tess-level-overrun.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/tesc/tess-level-overrun.multi-patch.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/tese/unnamed-builtin-array.asm.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/vert/clip-distance-plain-variable.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/vert/clip-distance-plain-variable.no-user-varying.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/vert/copy-memory-interface.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/vert/extract-transposed-matrix-from-struct.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/vert/fake-builtin-input.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/vert/invariant.msl21.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/vert/packed-bool-to-uint.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/vert/packed-bool2-to-packed_uint2.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/vert/packing-test.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/vert/spec-constant-op-composite.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/asm/vert/uint-vertex-id-instance-id.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/access-private-workgroup-in-function.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/argument-buffers-discrete.msl2.argument.discrete.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/argument-buffers-image-load-store.ios.msl2.argument.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/argument-buffers-image-load-store.msl2.argument.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/argument-buffers-runtime-array-buffer.argument.device-argument-buffer.argument-tier-1.msl2.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/argument-buffers-runtime-array-buffer.rich-descriptor.argument.device-argument-buffer.argument-tier-1.msl2.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/argument-buffers-runtime-array.argument.device-argument-buffer.argument-tier-1.msl2.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/array-length.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/array-length.msl2.argument.discrete.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/atomic-float.msl3.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/atomic-image.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/atomic-image.msl31.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/atomic.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/barriers.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/basic.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/basic.dispatchbase.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/basic.dispatchbase.msl11.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/basic.inline-block.msl2.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/buffer_device_address-packed-vec-and-cast-to-and-from-uvec2.msl23.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/buffer_device_address-recursive-struct-pointers.msl23.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/buffer_device_address.msl2.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/builtins.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/cfg-preserve-parameter.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/coherent-block.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/coherent-image-atomic.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/coherent-image-atomic.msl2.argument.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/coherent-image-atomic.msl2.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/coherent-image-atomic.msl31.argument.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/coherent-image-atomic.msl31.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/coherent-image.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/complex-composite-constant-array.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/complex-type-alias.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/composite-array-initialization.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/composite-array-initialization.force-native-array.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/composite-construct.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/copy-array-of-arrays.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/copy-array-of-arrays.force-native-array.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/culling.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/defer-parens.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/dowhile.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/force-recompile-hooks.swizzle.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/functions.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/global-invocation-id-writable-ssbo-in-function.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/global-invocation-id.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/image-atomic-automatic-bindings.argument.msl2.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/image-atomic-automatic-bindings.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/image-cube-array-load-store.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/image.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/insert.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/inverse.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/local-invocation-id.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/local-invocation-index.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/local-size-duplicate-spec-id.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/mat3-row-maj-read-write-const.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/mat3.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/metal3_1_regression_patch.replace-recursive-inputs.msl3.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/mod.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/modf.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/outer-product.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/packing-test-1.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/packing-test-2.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/raw-buffer-descriptor-aliasing.argument.discrete.device-argument-buffer.msl2.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/raw-buffer-descriptor-aliasing.argument.discrete.msl2.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/ray-query.nocompat.spv14.vk.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/ray-query.spv14.vk.ios.msl24..invalid.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/read-write-only.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/rmw-matrix.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/rmw-opt.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/scalar-std450-distance-length-normalize.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/shader_ballot.msl22.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/shader_group_vote.msl21.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/shared-array-of-arrays.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/shared-matrix-array-of-array.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/shared-matrix-cast.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/shared-matrix-nested-struct-array.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/shared-matrix-nested-struct.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/shared-struct-bool-cast.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/shared.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/spec-constant-op-member-array.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/spec-constant-work-group-size.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/storage-buffer-std140-vector-array.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/struct-layout.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/struct-nested.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/struct-packing.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/threadgroup-boolean-workaround.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/torture-loop.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/type-alias.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/type_casting_i64.msl22.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/udiv.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/comp/writable-ssbo.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/desktop-only/comp/extended-arithmetic.desktop.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/desktop-only/frag/image-ms.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/desktop-only/frag/query-levels.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/desktop-only/frag/sampler-ms-query.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/desktop-only/tesc/arrayed-output.desktop.sso.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/desktop-only/tesc/basic.desktop.sso.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/desktop-only/tesc/basic.desktop.sso.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/desktop-only/tesc/struct-copy.desktop.sso.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/desktop-only/tesc/struct-copy.desktop.sso.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/desktop-only/tese/triangle.desktop.sso.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/desktop-only/vert/basic.desktop.sso.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/desktop-only/vert/clip-cull-distance..no-user-varying.desktop.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/desktop-only/vert/clip-cull-distance.desktop.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/desktop-only/vert/shader-draw-parameters.desktop.for-tess.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/desktop-only/vert/shader-draw-parameters.desktop.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/flatten/basic.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/flatten/multiindex.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/flatten/push-constant.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/flatten/rowmajor.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/flatten/struct.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/flatten/swizzle.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/flatten/types.flatten.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/argument-buffers.msl2.argument.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/array-component-io.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/array-lut-no-loop-variable.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/array-of-array-lut.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/array-of-texture-swizzle-nonconstant-uniform.msl2.argument.discrete.swizzle.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/array-of-texture-swizzle-nonconstant-uniform.msl2.swizzle.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/array-of-texture-swizzle.msl2.argument.discrete.swizzle.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/array-of-texture-swizzle.msl2.swizzle.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/barycentric-nv-nopersp.msl22.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/barycentric-nv.msl22.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/basic.force-sample.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/basic.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/binary-func-unpack-pack-arguments.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/binary-unpack-pack-arguments.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/bitcasting.1d-as-2d.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/bitcasting.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/buffer-read-write.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/buffer-read-write.texture-buffer-native.msl21.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/builtins.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/clip-distance-varying.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/complex-expression-in-access-chain.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/composite-extract-forced-temporary.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/constant-array.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/constant-composites.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/control-dependent-in-branch.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/cull-distance-varying.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/depth-array-texture-lod.lod-as-grad.1d-as-2d.msl23.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/depth-greater-than.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/depth-less-than.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/depth-out-early-frag-tests.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/depth-out-no-early-frag-tests.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/disable-frag-output.frag-output.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/dual-source-blending.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/early-fragment-tests.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/false-loop-init.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/flush_params.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/for-loop-continue-control-flow.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/for-loop-init.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/fp16-packing.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/frag-demote-checks.discard-checks.msl23.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/frag-demote-checks.discard-checks.msl31.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/frag-discard-checks-continue-block.discard-checks.msl23.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/frag-discard-checks-continue-block.discard-checks.msl31.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/frag-discard-checks.discard-checks.msl23.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/frag-discard-checks.discard-checks.msl31.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/fragment-component-padding.pad-fragment.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/front-facing.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/gather-dref.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/gather-offset.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/helper-invocation.msl21.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/huge-argument-buffer.device-argument-buffer.argument.msl2.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/illegal-name-test-0.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/image-query-lod.msl22.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/in_block.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/in_block_with_multiple_structs_of_same_type.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/in_mat.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/input-attachment-ms.arrayed-subpass.msl21.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/input-attachment-ms.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/input-attachment-ms.multiview.msl21.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/input-attachment.arrayed-subpass.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/input-attachment.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/input-attachment.multiview.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/interpolation-qualifiers-block.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/interpolation-qualifiers.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/lut-promotion.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/mix.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/modf-access-tracking-function.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/mrt-array.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/nonuniform-qualifier.msl2.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/packed-expression-vector-shuffle.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/packing-test-3.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/pixel-interlock-ordered.msl2.argument.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/pixel-interlock-ordered.msl2.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/pixel-interlock-ordered.msl31.argument.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/pixel-interlock-ordered.msl31.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/pls.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/post-depth-coverage.ios.msl2.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/post-depth-coverage.msl23.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/private-variable-prototype-declaration.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/ray-query-object-in-function.spv14.vk.msl24.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/read-cull-clip-distance-in-function.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/readonly-ssbo.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/return-value-after-discard-terminator.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/runtime_array_as_argument_buffer.msl3.argument-tier-1.rich-descriptor.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/runtime_array_as_argument_buffer_buf.msl3.argument-tier-1.rich-descriptor.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/sample-depth-propagate-state-from-resource.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/sample-depth-separate-image-sampler.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/sample-mask-in-and-out.fixed-sample-mask.force-sample.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/sample-mask-in-and-out.fixed-sample-mask.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/sample-mask-not-used.fixed-sample-mask.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/sample-mask.fixed-sample-mask.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/sample-mask.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/sample-position-func.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/sample-position.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/sample-rate-frag-coord-sample-id.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/sample-rate-frag-coord-sample-input.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/sample-rate-frag-coord-sample-pos.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/sample-rate-frag-coord.force-sample.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/sampler-1d-lod.1d-as-2d.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/sampler-1d-lod.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/sampler-compare-bias.msl23.1d-as-2d.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/sampler-compare-cascade-gradient.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/sampler-compare-cascade-gradient.ios.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/sampler-compare-cascade-gradient.msl23.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/sampler-cube-grad.agx-cube-grad.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/sampler-image-arrays.msl2.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/sampler-ms.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/sampler.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/scalar-refract-reflect.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/separate-image-sampler-argument.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/shader-arithmetic-8bit.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/spec-constant-block-size.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/spec-constant-ternary.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/stencil-export.msl21.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/subgroup-builtins.msl22.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/subgroup-globals-extract.msl22.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/switch-unreachable-break.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/switch-unsigned-case.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/swizzle.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/texel-fetch-offset.1d-as-2d.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/texel-fetch-offset.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/texture-cube-array.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/texture-cube-array.ios.emulate-cube-array.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/texture-multisample-array.msl21.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/texture-proj-shadow.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/ubo_layout.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/unary-enclose.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/vecsize-mismatch.shader-inputs.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/frag/write-depth-in-function.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/intel/shader-integer-functions2.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/legacy/vert/transpose.legacy.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/masking/copy-arrays.mask-location-0.msl2.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/masking/copy-arrays.mask-location-0.msl2.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/masking/copy-arrays.mask-location-1.msl2.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/masking/copy-arrays.mask-location-1.msl2.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/masking/write-outputs-block.mask-location-0.for-tess.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/masking/write-outputs-block.mask-location-0.msl2.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/masking/write-outputs-block.mask-location-0.multi-patch.msl2.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/masking/write-outputs-block.mask-location-0.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/masking/write-outputs-block.mask-location-1.for-tess.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/masking/write-outputs-block.mask-location-1.msl2.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/masking/write-outputs-block.mask-location-1.multi-patch.msl2.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/masking/write-outputs-block.mask-location-1.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/masking/write-outputs.mask-clip-distance.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/masking/write-outputs.mask-location-0.for-tess.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/masking/write-outputs.mask-location-0.msl2.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/masking/write-outputs.mask-location-0.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/masking/write-outputs.mask-location-0.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/masking/write-outputs.mask-location-0.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/masking/write-outputs.mask-location-1.for-tess.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/masking/write-outputs.mask-location-1.msl2.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/masking/write-outputs.mask-location-1.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/masking/write-outputs.mask-location-1.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/masking/write-outputs.mask-location-1.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/masking/write-outputs.mask-point-size.for-tess.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/masking/write-outputs.mask-point-size.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/masking/write-outputs.mask-point-size.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/masking/write-outputs.mask-point-size.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/masking/write-outputs.mask-position.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/masking/write-outputs.mask-position.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tesc/arrayed-block-io.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tesc/basic.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tesc/basic.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tesc/complex-control-point-inout-types.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tesc/complex-control-point-inout-types.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tesc/complex-patch-out-types.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tesc/load-control-point-array-of-matrix.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tesc/load-control-point-array-of-matrix.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tesc/load-control-point-array-of-struct.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tesc/load-control-point-array-of-struct.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tesc/load-control-point-array.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tesc/load-control-point-array.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tesc/matrix-output.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tesc/reload-tess-level.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tesc/reload-tess-level.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tesc/struct-output.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tesc/water_tess.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tesc/water_tess.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tese/in-array-of-struct.raw-tess-in.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tese/in-block-with-nested-struct.raw-tess-in.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tese/in-block-with-nested-struct.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tese/input-array.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tese/input-types.raw-tess-in.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tese/input-types.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tese/load-control-point-array-of-matrix.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tese/load-control-point-array.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tese/quad.domain.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tese/quad.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tese/read-patch-vertices-in-func.raw-tess-in.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tese/read-tess-level-in-func-quad.msl2.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tese/read-tess-level-in-func-quad.raw-tess-in.msl2.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tese/read-tess-level-in-func.msl2.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tese/read-tess-level-in-func.raw-tess-in.msl2.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tese/set-from-function.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tese/triangle-tess-level.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tese/triangle.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tese/water_tess.raw-tess-in.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/tese/water_tess.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/array-component-io.for-tess.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/array-component-io.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/basic.capture.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/basic.for-tess.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/basic.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/buffer_device_address.msl2.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/clip-distance-block.no-user-varying.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/clip-distance-block.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/copy.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/dynamic.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/float-math.invariant-float-math.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/float-math.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/functions.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/implicit-position-1.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/implicit-position-2.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/in_out_array_mat.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/interface-block-block-composites.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/interface-block-block-composites.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/interface-block-single-element-array.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/interpolation-qualifiers-block.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/interpolation-qualifiers.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/invariant.msl21.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/leaf-function.capture.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/leaf-function.for-tess.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/no-contraction.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/no-disable-vertex-out.frag-output.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/no_stage_out.for-tess.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/no_stage_out.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/no_stage_out.write_buff.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/no_stage_out.write_buff_atomic.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/no_stage_out.write_tex.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/out-block-with-nested-struct-array.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/out-block-with-struct-array.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/out_block.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/packed-bool-to-uint.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/packed-bool2-to-packed_uint2.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/packed_matrix.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/pointsize.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/read-from-row-major-array.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/resource-arrays-leaf.ios.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/resource-arrays.ios.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/return-array.force-native-array.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/return-array.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/set_builtin_in_func.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/sign-int-types.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/signedness-mismatch.shader-inputs.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/texture_buffer.texture-buffer-native.msl21.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/texture_buffer.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/ubo.alignment.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/ubo.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/uniform-struct-out-of-order-offests.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/uniform-struct-packing-nested.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vert/unused-position.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vulkan/frag/basic.multiview.no-layered.nocompat.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vulkan/frag/basic.multiview.nocompat.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vulkan/frag/demote-to-helper-forwarding.asm.vk.nocompat.msl23.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vulkan/frag/demote-to-helper.vk.nocompat.msl23.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vulkan/frag/demote-to-helper.vk.nocompat.msl23.ios.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vulkan/frag/push-constant.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vulkan/frag/spec-constant.msl11.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vulkan/frag/spec-constant.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vulkan/vert/device-group.multiview.viewfromdev.nocompat.vk.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vulkan/vert/device-group.nocompat.vk.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vulkan/vert/multiview.multiview.no-layered.nocompat.vk.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vulkan/vert/multiview.multiview.nocompat.vk.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vulkan/vert/multiview.nocompat.vk.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vulkan/vert/small-storage.vk.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-msl/vulkan/vert/vulkan-vertex.vk.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-ue4/asm/frag/depth-compare.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-ue4/asm/frag/global-constant-arrays.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-ue4/asm/frag/padded-float-array-member-defef.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-ue4/asm/frag/sample-mask-not-array.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-ue4/asm/frag/subpass-input.ios.framebuffer-fetch.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-ue4/asm/frag/subpass-input.msl23.framebuffer-fetch.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-ue4/asm/frag/texture-atomics.asm.argument.msl2.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-ue4/asm/frag/texture-atomics.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-ue4/asm/frag/texture-atomics.asm.graphics-robust-access.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-ue4/asm/tesc/hs-incorrect-base-type.invalid.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-ue4/asm/tesc/hs-input-array-access.invalid.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-ue4/asm/tesc/hs-texcoord-array.invalid.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-ue4/asm/tesc/tess-factor-must-be-threadgroup.invalid.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-ue4/asm/tese/ds-double-gl-in-deref.asm.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-ue4/asm/tese/ds-patch-input-fixes.asm.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-ue4/asm/tese/ds-patch-inputs.asm.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-ue4/asm/vert/array-missing-copies.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders-ue4/asm/vert/texture-buffer.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/amd/gcn_shader.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/amd/shader_ballot.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/amd/shader_group_vote.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/amd/shader_trinary_minmax.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/comp/atomic-decrement.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/comp/atomic-increment.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/comp/bitcast_iadd.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/comp/bitcast_icmp.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/comp/bitcast_iequal.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/comp/bitcast_sar.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/comp/bitcast_sdiv.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/comp/bitcast_slr.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/comp/block-name-alias-global.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/comp/builtin-compute-bitcast.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/comp/control-flow-hints.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/comp/decoration-group.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/comp/global-parameter-name-alias.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/comp/hlsl-functionality.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/comp/logical.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/comp/multiple-entry.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/comp/nmin-max-clamp.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/comp/nmin-max-clamp.relax-nan.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/comp/op-phi-swap.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/comp/quantize.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/comp/recompile-block-naming.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/comp/specialization-constant-workgroup.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/comp/switch-break-ladder.asm.invalid.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/comp/undefined-constant-composite.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/combined-sampler-reuse.vk.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/combined-sampler-reuse.vk.asm.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/complex-name-workarounds.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/composite-construct-struct-no-swizzle.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/default-member-names.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/do-while-statement-fallback.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/empty-struct.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/for-loop-phi-only-continue.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/frem.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/function-overload-alias.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/hlsl-sample-cmp-level-zero-cube.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/hlsl-sample-cmp-level-zero.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/image-extract-reuse.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/image-fetch-no-sampler.asm.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/image-fetch-no-sampler.asm.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/image-fetch-no-sampler.no-samplerless.asm.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/image-fetch-no-sampler.no-samplerless.asm.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/image-query-no-sampler.no-samplerless.vk.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/image-query-no-sampler.no-samplerless.vk.asm.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/image-query-no-sampler.vk.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/image-query-no-sampler.vk.asm.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/implicit-read-dep-phi.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/inf-nan-constant-double.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/inf-nan-constant.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/invalidation.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/line-directive.line.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/locations-components.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/loop-body-dominator-continue-access.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/loop-header-to-continue.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/lut-promotion-initializer.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/multi-for-loop-init.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/op-constant-null.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/op-phi-swap-continue-block.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/out-of-bounds-access-opspecconstant.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/out-of-bounds-access.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/pack-and-unpack-uint2.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/pass-by-value.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/phi-loop-variable.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/sample-and-compare.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/sampler-buffer-array-without-sampler.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/sampler-buffer-without-sampler.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/single-function-private-lut.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/srem.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/storage-class-output-initializer.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/struct-composite-extract-swizzle.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/switch-label-shared-block.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/switch-preserve-sign-extension.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/temporary-name-alias.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/temporary-phi-hoisting.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/texel-fetch-no-lod.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/texture-sampling-fp16.asm.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/texture-sampling-fp16.asm.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/undef-variable-store.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/unknown-depth-state.asm.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/unknown-depth-state.asm.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/unreachable.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/frag/vector-shuffle-oom.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/geom/block-name-namespace.asm.geom
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/geom/inout-split-access-chain-handle.asm.geom
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/geom/split-access-chain-input.asm.geom
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/geom/unroll-glposition-load.asm.geom
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/tese/unroll-input-array-load.asm.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/vert/empty-io.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/vert/extract-transposed-matrix-from-struct.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/vert/global-builtin.sso.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/vert/invariant-block.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/vert/invariant-block.sso.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/vert/invariant.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/vert/invariant.sso.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/vert/spec-constant-op-composite.asm.vk.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/vert/spec-constant-op-composite.asm.vk.vert.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/asm/vert/uint-vertex-id-instance-id.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/comp/atomic.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/comp/bake_gradient.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/comp/barriers.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/comp/basic.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/comp/casts.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/comp/cfg-preserve-parameter.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/comp/cfg.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/comp/coherent-block.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/comp/coherent-image.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/comp/composite-array-initialization.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/comp/composite-construct.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/comp/culling.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/comp/defer-parens.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/comp/dowhile.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/comp/generate_height.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/comp/image.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/comp/insert.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/comp/mat3.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/comp/mod.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/comp/modf.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/comp/outer-product.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/comp/read-write-only.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/comp/rmw-matrix.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/comp/rmw-opt.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/comp/scalar-std450-distance-length-normalize.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/comp/shared.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/comp/ssbo-array-length.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/comp/ssbo-array.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/comp/struct-layout.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/comp/struct-packing.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/comp/torture-loop.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/comp/type-alias.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/comp/udiv.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/desktop-only/comp/enhanced-layouts.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/desktop-only/comp/extended-arithmetic.desktop.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/desktop-only/comp/fp64.desktop.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/desktop-only/comp/image-formats.desktop.noeliminate.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/desktop-only/comp/int64.desktop.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/desktop-only/frag/clip-cull-distance.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/desktop-only/frag/control-dependent-in-branch.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/desktop-only/frag/depth-greater-than.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/desktop-only/frag/depth-less-than.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/desktop-only/frag/dual-source-blending.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/desktop-only/frag/hlsl-uav-block-alias.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/desktop-only/frag/image-ms.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/desktop-only/frag/image-query.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/desktop-only/frag/image-size.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/desktop-only/frag/image-size.no-qualifier-deduction.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/desktop-only/frag/in-block-qualifiers.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/desktop-only/frag/layout-component.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/desktop-only/frag/query-levels.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/desktop-only/frag/query-lod.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/desktop-only/frag/sampler-ms-query.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/desktop-only/frag/stencil-export.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/desktop-only/frag/texture-proj-shadow.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/desktop-only/geom/basic.desktop.sso.geom
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/desktop-only/geom/viewport-index.desktop.geom
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/desktop-only/tesc/basic.desktop.sso.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/desktop-only/tese/triangle.desktop.sso.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/desktop-only/vert/basic.desktop.sso.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/desktop-only/vert/clip-cull-distance.desktop.sso.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/desktop-only/vert/clip-cull-distance.desktop.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/desktop-only/vert/out-block-qualifiers.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/desktop-only/vert/shader-draw-parameters-450.desktop.vk.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/desktop-only/vert/shader-draw-parameters-450.desktop.vk.vert.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/desktop-only/vert/shader-draw-parameters.desktop.vk.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/desktop-only/vert/shader-draw-parameters.desktop.vk.vert.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/flatten/array.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/flatten/basic.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/flatten/copy.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/flatten/dynamic.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/flatten/matrix-conversion.flatten.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/flatten/matrixindex.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/flatten/multiindex.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/flatten/push-constant.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/flatten/rowmajor.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/flatten/struct.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/flatten/struct.rowmajor.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/flatten/swizzle.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/flatten/types.flatten.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/array-lut-no-loop-variable.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/avoid-expression-lowering-to-loop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/barycentric-khr.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/barycentric-nv.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/basic.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/block-match-sad.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/block-match-ssd.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/box-filter.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/complex-expression-in-access-chain.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/composite-extract-forced-temporary.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/constant-array.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/constant-composites.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/false-loop-init.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/flush_params.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/for-loop-continue-control-flow.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/for-loop-init.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/frexp-modf.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/front-facing.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/gather-dref.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/ground.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/helper-invocation.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/hoisted-temporary-use-continue-block-as-value.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/image-load-store-uint-coord.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/inside-loop-dominated-variable-preservation.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/loop-dominator-and-switch-default.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/lut-promotion.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/mix.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/modf-pointer-function-analysis.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/partial-write-preserve.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/pixel-interlock-ordered.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/pixel-interlock-unordered.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/pls.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/post-depth-coverage-es.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/post-depth-coverage.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/round-even.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/round.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/sample-interlock-ordered.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/sample-interlock-unordered.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/sample-parameter.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/sample-weighted.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/sampler-ms.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/sampler-proj.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/sampler.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/scalar-refract-reflect.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/selection-block-dominator.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/shader-clock.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/struct-type-unrelated-alias.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/switch-unreachable-break.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/switch-unsigned-case.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/swizzle.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/texel-fetch-offset.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/ubo-load-row-major-workaround.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/ubo_layout.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/frag/unary-enclose.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/geom/basic.geom
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/geom/geometry-passthrough.geom
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/geom/lines-adjacency.geom
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/geom/lines.geom
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/geom/multi-stream.geom
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/geom/points.geom
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/geom/single-invocation.geom
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/geom/transform-feedback-streams.geom
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/geom/triangles-adjacency.geom
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/geom/triangles.geom
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/legacy/fragment/explicit-lod.legacy.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/legacy/fragment/explicit-lod.legacy.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/legacy/fragment/fma.legacy.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/legacy/fragment/hyperbolic.legacy.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/legacy/fragment/io-blocks.legacy.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/legacy/fragment/isnan-isinf.legacy.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/legacy/fragment/modf.legacy.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/legacy/fragment/multiple-struct-flattening.legacy.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/legacy/fragment/round.legacy.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/legacy/fragment/struct-varying.legacy.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/legacy/fragment/switch.legacy.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/legacy/vert/implicit-lod.legacy.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/legacy/vert/int-attribute.legacy.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/legacy/vert/inverse.legacy.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/legacy/vert/io-block.legacy.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/legacy/vert/outer-product.legacy.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/legacy/vert/struct-flatten-inner-array.legacy.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/legacy/vert/struct-flatten-stores-multi-dimension.legacy.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/legacy/vert/struct-varying.legacy.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/legacy/vert/switch-nested.legacy.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/legacy/vert/transpose.legacy.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/mesh/mesh-shader-basic-lines.spv14.vk.nocompat.mesh.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/mesh/mesh-shader-basic-points.spv14.vk.nocompat.mesh.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/mesh/mesh-shader-basic-triangle.spv14.vk.nocompat.mesh.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/tesc/basic.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/tesc/water_tess.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/tese/ccw.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/tese/cw.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/tese/equal.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/tese/fractional_even.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/tese/fractional_odd.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/tese/input-array.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/tese/line.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/tese/load-array-of-array.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/tese/patch-input-array.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/tese/read-patch-vertices-in-func.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/tese/triangle.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/tese/water_tess.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vert/basic.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vert/ground.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vert/invariant.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vert/no-contraction.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vert/ocean.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vert/read-from-row-major-array.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vert/return-array.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vert/row-major-workaround.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vert/texture_buffer.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vert/transform-feedback-decorations.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vert/ubo.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/comp/array-of-buffer-reference.nocompat.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/comp/buffer-reference-atomic.nocompat.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/comp/buffer-reference-base-alignment-promote.nocompat.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/comp/buffer-reference-bitcast-uvec2-2.nocompat.invalid.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/comp/buffer-reference-bitcast-uvec2.nocompat.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/comp/buffer-reference-bitcast.nocompat.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/comp/buffer-reference-decorations.nocompat.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/comp/buffer-reference.nocompat.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/comp/fp-atomic.nocompat.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/comp/ray-query.nocompat.spv14.invalid.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/comp/spec-constant-op-member-array.vk.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/comp/spec-constant-op-member-array.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/comp/spec-constant-work-group-size.vk.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/comp/spec-constant-work-group-size.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/frag/block-match-sad.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/frag/block-match-ssd.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/frag/box-filter.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/frag/combined-texture-sampler-shadow.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/frag/combined-texture-sampler-shadow.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/frag/combined-texture-sampler.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/frag/combined-texture-sampler.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/frag/demote-to-helper-forwarding.asm.vk.nocompat.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/frag/demote-to-helper.vk.nocompat.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/frag/desktop-mediump.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/frag/desktop-mediump.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/frag/input-attachment-ms.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/frag/input-attachment-ms.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/frag/input-attachment.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/frag/input-attachment.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/frag/nonuniform-qualifier.vk.nocompat.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/frag/push-constant-as-ubo.push-ubo.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/frag/push-constant-as-ubo.push-ubo.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/frag/push-constant.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/frag/push-constant.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/frag/sample-weighted.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/frag/separate-combined-fake-overload.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/frag/separate-combined-fake-overload.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/frag/separate-sampler-texture-array.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/frag/separate-sampler-texture-array.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/frag/separate-sampler-texture.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/frag/separate-sampler-texture.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/frag/shader-arithmetic-8bit.nocompat.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/frag/spec-constant-block-size.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/frag/spec-constant-block-size.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/frag/spec-constant-ternary.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/frag/spec-constant-ternary.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rahit/terminators.khr.spv14.nocompat.vk.rahit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rahit/terminators.nocompat.vk.rahit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rcall/incoming-callable.khr.spv14.nocompat.vk.rcall.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/hit_attribute_block.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/hit_attribute_block.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/hit_attribute_block_in_function.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/hit_attribute_block_in_function.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/hit_attribute_plain.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/hit_attribute_plain.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/hit_attribute_struct.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/hit_attribute_struct.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/hit_kind.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/hit_kind.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/hit_t.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/hit_t.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/incoming_ray_flags.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/incoming_ray_flags.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/instance_custom_id.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/instance_custom_id.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/instance_id.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/instance_id.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/object_ray_direction.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/object_ray_direction.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/object_ray_origin.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/object_ray_origin.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/object_to_world.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/object_to_world.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/payloads.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/payloads.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/primitive_id.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/primitive_id.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/ray_tmax.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/ray_tmax.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/ray_tmin.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/ray_tmin.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/ray_tracing.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/ray_tracing.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/world_ray_direction.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/world_ray_direction.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/world_ray_origin.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/world_ray_origin.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/world_to_object.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rchit/world_to_object.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rgen/convert-u-to-as.spv14.vk.nocompat.rgen.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rgen/execute_callable.nocompat.khr.spv14.vk.rgen.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rgen/execute_callable.nocompat.vk.rgen.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rgen/launch_id.khr.spv14.nocompat.vk.rgen.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rgen/launch_id.nocompat.vk.rgen.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rgen/launch_size.khr.spv14.nocompat.vk.rgen.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rgen/launch_size.nocompat.vk.rgen.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rgen/payloads.khr.spv14.nocompat.vk.rgen.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rgen/payloads.nocompat.vk.rgen.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rgen/pure_call.khr.spv14.nocompat.vk.rgen.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rgen/pure_call.nocompat.vk.rgen.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rgen/ray_tracing.khr.spv14.nocompat.vk.rgen.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rgen/ray_tracing.nocompat.vk.rgen.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rgen/shader_record_buffer.khr.spv14.nocompat.vk.rgen.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rgen/shader_record_buffer.nocompat.vk.rgen.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rint/report-intersection.khr.spv14.nocompat.vk.rint.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rint/report-intersection.nocompat.vk.rint.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rmiss/ray_tracing.khr.spv14.nocompat.vk.rmiss.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rmiss/ray_tracing.nocompat.vk.rmiss.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/rmiss/ray_tracing_trace_incoming.khr.spv14.nocompat.vk.rmiss.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/vert/device-group.nocompat.vk.vert.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/vert/multiview.nocompat.vk.vert.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/vert/small-storage.vk.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/vert/small-storage.vk.vert.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/vert/vulkan-vertex.vk.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/opt/shaders/vulkan/vert/vulkan-vertex.vk.vert.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/comp/access-chain-load-store-composite.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/comp/aliased-struct-divergent-member-name.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/comp/atomic-load-store.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/comp/atomic-result-temporary.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/comp/bitfield-signed-operations.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/comp/bitscan.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/comp/buffer-atomic-nonuniform.asm.sm51.nonuniformresource.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/comp/constant-composite-undef.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/comp/constant-lut-name-aliasing.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/comp/eliminate-globals-not-in-entry-point.noeliminate.spv14.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/comp/glsl-signed-operations.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/comp/glsl.std450.frexp-modf-struct.fxconly.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/comp/image-atomic-nonuniform.asm.sm51.nonuniformresource.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/comp/local-size-id-override.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/comp/local-size-id.asm.invalid.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/comp/num-workgroups.spv14.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/comp/spec-constant-name-aliasing.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/comp/specialization-constant-workgroup.nofxc.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/comp/storage-buffer-basic.nofxc.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/frag/anonymous-inner-struct-names.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/frag/composite-insert-inheritance.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/frag/empty-struct-in-struct.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/frag/image-fetch-uint-coord.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/frag/nonuniform-bracket-handling-2.nonuniformresource.sm51.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/frag/nonuniform-qualifier-propagation.nonuniformresource.sm51.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/frag/nonuniform-ssbo.sm51.nonuniformresource.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/frag/only-initializer-frag-depth.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/frag/phi.zero-initialize.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/frag/pixel-interlock-callstack.sm51.fxconly.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/frag/pixel-interlock-control-flow.sm51.fxconly.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/frag/pixel-interlock-split-functions.sm51.fxconly.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/frag/reserved-function-identifier.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/frag/sample-mask-load-store-array-uint.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/frag/sample-mask-load-store-array.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/frag/scalar-select.spv14.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/frag/struct-packing-last-element-array-matrix-rule.invalid.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/frag/subgroup-arithmetic-cast.invalid.nofxc.sm60.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/frag/switch-block-case-fallthrough.asm.invalid.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/frag/unordered-compare.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/frag/unordered-compare.relax-nan.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/frag/vec4-straddle-packing-holes.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/frag/vector-shuffle-undef-index.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/mesh/mesh-shader-dxil-spirv.flip-vert-y.asm.spv14.nofxc.nocompat.vk.mesh
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/mesh/mesh-shader-plain-builtin-outputs.spv14.asm.vk.nocompat.mesh
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/temporary.zero-initialize.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/vert/block-struct-initializer.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/vert/builtin-output-initializer.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/vert/complex-link-by-name.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/asm/vert/empty-struct-composite.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/comp/bitfield.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/comp/glsl.std450.fxconly.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/comp/illegal-struct-name.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/comp/intmin-literal.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/comp/subgroups-boolean.invalid.nofxc.sm60.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/comp/subgroups.invalid.nofxc.sm60.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/comp/substruct-cbuffer-packing-straddle-top-level.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/comp/substruct-cbuffer-packing-straddle.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/comp/trivial-select-cast-vector.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/comp/trivial-select-matrix.spv14.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/frag/cbuffer-packing-straddle.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/frag/constant-buffer-array.invalid.sm51.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/frag/fp16.invalid.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/frag/frag-coord.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/frag/helper-invocation.fxconly.nofxc.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/frag/native-16bit-types.fxconly.nofxc.sm62.native-16bit.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/frag/nonuniform-constructor.sm51.nonuniformresource.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/frag/pixel-interlock-simple-callstack.sm51.fxconly.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/frag/spec-constant.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/frag/texture-gather-uint-component.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/frag/ubo-offset-out-of-order.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/frag/variables.zero-initialize.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/frag/volatile-helper-invocation.fxconly.nofxc.spv16.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/mesh/mesh-shader-basic-triangle.spv14.vk.nocompat.nofxc.flip-vert-y.mesh
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/vert/base-instance.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/vert/base-vertex.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/vert/block-io-auto-location-assignment.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/vert/empty-shader.nofxc.sm30.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/vert/flatten-matrix-input.flatten-matrix-vertex-input.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl-no-opt/vert/pass-array-by-value.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/comp/access-chain-invalidate.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/comp/atomic-decrement.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/comp/atomic-increment.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/comp/bitcast_icmp.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/comp/block-name-alias-global.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/comp/control-flow-hints.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/comp/global-parameter-name-alias.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/comp/nmin-max-clamp.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/comp/nmin-max-clamp.relax-nan.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/frag/array-of-structured-buffers.structured.fxconly.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/frag/cbuffer-stripped.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/frag/combined-sampler-reuse.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/frag/empty-struct.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/frag/frem.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/frag/function-overload-alias.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/frag/image-extract-reuse.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/frag/implicit-read-dep-phi.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/frag/inf-nan-constant.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/frag/line-directive.line.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/frag/lut-promotion-initializer.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/frag/pack-and-unpack-uint2.fxconly.nofxc.sm60.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/frag/pass-by-value.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/frag/sample-and-compare.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/frag/single-function-private-lut.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/frag/srem.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/frag/storage-class-output-initializer.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/frag/structured-buffer.structured.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/frag/texel-fetch-no-lod.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/frag/texture-sampling-fp16.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/frag/unknown-depth-state.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/frag/unreachable.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/vert/extract-transposed-matrix-from-struct.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/vert/spec-constant-op-composite.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/vert/uint-vertex-id-instance-id.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/asm/vert/vertex-id-instance-id.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/comp/access-chain-load-composite.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/comp/access-chains.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/comp/access-chains.force-uav.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/comp/address-buffers.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/comp/atomic.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/comp/barriers.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/comp/builtins.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/comp/composite-array-initialization.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/comp/globallycoherent.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/comp/image.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/comp/image.nonwritable-uav-texture.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/comp/inverse.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/comp/num-workgroups-alone.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/comp/num-workgroups-with-builtins.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/comp/outer-product.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/comp/rayquery.nofxc.fxconly.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/comp/rmw-matrix.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/comp/rwbuffer-matrix.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/comp/scalar-std450-distance-length-normalize.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/comp/shared.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/comp/spec-constant-op-member-array.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/comp/spec-constant-work-group-size.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/comp/ssbo-array-length.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/comp/ssbo-array.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/comp/ssbo-store-array.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/flatten/array.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/flatten/basic.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/flatten/copy.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/flatten/dynamic.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/flatten/matrix-conversion.flatten.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/flatten/matrixindex.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/flatten/multiindex.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/flatten/push-constant.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/flatten/rowmajor.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/flatten/struct.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/flatten/struct.rowmajor.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/flatten/swizzle.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/flatten/types.flatten.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/array-lut-no-loop-variable.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/basic-color-3comp.sm30.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/basic-color-3comp.sm50.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/basic.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/bit-conversions.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/boolean-mix.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/builtins.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/bvec-operations.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/clip-cull-distance.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/combined-texture-sampler-parameter.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/combined-texture-sampler-shadow.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/complex-expression-in-access-chain.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/constant-composites.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/control-dependent-in-branch.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/demote-to-helper.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/depth-greater-than.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/depth-less-than.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/dual-source-blending.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/early-fragment-test.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/for-loop-continue-control-flow.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/fp16-packing.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/front-facing.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/hyperbolic.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/image-query-selective.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/image-query-uav.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/image-query-uav.nonwritable-uav-texture.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/image-query.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/input-attachment-ms.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/input-attachment.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/io-block.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/legacy-tex-modifiers.sm30.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/lut-promotion.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/matrix-input.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/mod.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/mrt.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/no-return.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/no-return2.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/nonuniform-qualifier.nonuniformresource.sm51.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/partial-write-preserve.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/pixel-interlock-ordered.sm51.fxconly.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/point-coord-compat.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/query-lod.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/readonly-coherent-ssbo.force-uav.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/readonly-coherent-ssbo.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/resources.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/row-major-layout-in-struct.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/sample-cmp-level-zero.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/sample-mask-in-and-out.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/sample-mask-in.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/sample-mask-out.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/sampler-array.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/sampler-image-arrays.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/scalar-refract-reflect.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/separate-combined-fake-overload.sm30.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/spec-constant-block-size.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/spec-constant-ternary.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/switch-unreachable-break.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/switch-unsigned-case.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/swizzle-scalar.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/tex-sampling-ms.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/tex-sampling.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/tex-sampling.sm30.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/texel-fetch-offset.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/texture-proj-shadow.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/texture-size-combined-image-sampler.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/unary-enclose.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/unorm-snorm-packing.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/frag/various-glsl-ops.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/mesh/mesh-shader-basic-lines.spv14.vk.nocompat.mesh
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/mesh/mesh-shader-basic-triangle.spv14.vk.nocompat.mesh
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/task/task-basic.spv14.vk.nocompat.task
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/vert/basic.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/vert/clip-cull-distance.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/vert/instancing.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/vert/invariant.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/vert/legacy-int-attribute.sm30.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/vert/locations.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/vert/matrix-attribute.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/vert/matrix-output.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/vert/no-contraction.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/vert/no-input.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/vert/point-size-compat.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/vert/point-size.sm30.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/vert/qualifiers.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/vert/read-from-row-major-array.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/vert/return-array.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/vert/sampler-buffers.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/vert/struct-composite-decl.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-hlsl/vert/texture_buffer.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/aliased-struct-divergent-member-name.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/arithmetic-conversion-signs.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/atomic-load-store.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/atomic-min-max-sign.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/atomic-result-temporary.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/bda-to-array-in-buffer.asm.spv16.msl24.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/bitcast-fp16-fp32.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/bitfield-signed-operations.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/bitscan.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/block-like-array-type-construct-2.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/block-like-array-type-construct.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/buffer-device-address-ptr-casting.msl24.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/composite-construct-buffer-struct.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/constant-composite-undef.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/constant-lut-name-aliasing.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/copy-logical-2.spv14.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/copy-logical-offset-and-array-stride-diffs.spv14.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/copy-logical.spv14.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/device-array-load-temporary.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/device-array-load-temporary.force-native-array.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/device-constant-array-load-store.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/device-constant-array-load-store.force-native-array.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/eliminate-globals-not-in-entry-point.noeliminate.spv14.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/glsl-signed-operations.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/glsl.std450.frexp-modf-struct.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/groupshared-inner-array-of-struct-copy.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/local-size-id-override.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/local-size-id.asm.invalid.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/modf-storage-class.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/opptrdiff-basic.spv14.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/opptrdiff-opptraccesschain-elem-offset.spv14.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/opptrequal-basic.spv14.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/opptrequal-row-maj-mtx-bypass-transpose.spv14.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/opptrnotequal-basic.spv14.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/spec-constant-name-aliasing.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/storage-buffer-basic.invalid.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/storage-buffer-pointer-argument.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/variable-pointers-2.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/variable-pointers-3.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/variable-pointers-vector-to-scalar.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/variable-pointers.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/comp/workgroup-uint-to-uchar-alias-ptr-access-chain.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/frag/access-chain-array-ubo-partial.argument.msl2.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/frag/access-chain-array-ubo-partial.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/frag/anonymous-inner-struct-names.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/frag/component-insert-packed-expression.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/frag/composite-insert-inheritance.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/frag/constant-composite-block-no-array-stride-2.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/frag/copy-memory-block-like-thread-local.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/frag/empty-struct-in-struct.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/frag/fixup-entry-point-identifier.nomain.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/frag/image-fetch-uint-coord.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/frag/image-gather.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/frag/image-type-normal-comparison-usage.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/frag/in_block_with_aliased_struct_and_name.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/frag/input-attachment-unused-frag-coord.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/frag/modf-frexp-scalar-access-chain-output.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/frag/only-initializer-frag-depth.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/frag/phi.zero-initialize.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/frag/pixel-interlock-callstack.msl2.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/frag/pixel-interlock-control-flow.msl2.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/frag/pixel-interlock-split-functions.msl2.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/frag/private-initializer-direct-store.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/frag/reserved-function-identifier.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/frag/sample-mask-load-store-array-uint.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/frag/sample-mask-load-store-array.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/frag/scalar-select.spv14.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/frag/subgroup-arithmetic-cast.msl21.asm.invalid.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/frag/switch-block-case-fallthrough.asm.invalid.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/frag/texture-access.swizzle.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/frag/usage-tracking-modf-io-pointer.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/frag/vector-shuffle-undef-index.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/masking/initializers-block.mask-location-0.msl2.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/masking/initializers-block.mask-location-0.multi-patch.msl2.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/masking/initializers-block.mask-location-1.msl2.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/masking/initializers-block.mask-location-1.multi-patch.msl2.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/masking/initializers-block.mask-point-size.msl2.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/masking/initializers-block.mask-point-size.multi-patch.msl2.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/masking/initializers-block.mask-position.msl2.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/masking/initializers-block.mask-position.multi-patch.msl2.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/masking/initializers.mask-location-0.msl2.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/masking/initializers.mask-location-0.msl2.multi-patch.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/masking/initializers.mask-location-1.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/masking/initializers.mask-location-1.multi-patch.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/masking/initializers.mask-point-size.msl2.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/masking/initializers.mask-point-size.msl2.multi-patch.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/masking/initializers.mask-position.msl2.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/masking/initializers.mask-position.msl2.multi-patch.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/packing/composite-extract-row-major.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/packing/load-packed-no-forwarding-2.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/packing/load-packed-no-forwarding-3.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/packing/load-packed-no-forwarding-4.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/packing/load-packed-no-forwarding-5.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/packing/load-packed-no-forwarding.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/packing/packed-vector-extract-insert.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/packing/row-major-split-access-chain.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/packing/scalar-array-float2.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/packing/scalar-array-float3-one-element.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/packing/scalar-array-float3.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/packing/scalar-float2x2-col-major.invalid.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/packing/scalar-float2x2-row-major.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/packing/scalar-float2x3-col-major.invalid.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/packing/scalar-float2x3-row-major.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/packing/scalar-float3x2-col-major.invalid.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/packing/scalar-float3x2-row-major.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/packing/scalar-float3x3-col-major.invalid.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/packing/scalar-float3x3-row-major.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/temporary.zero-initialize.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/tesc/array-control-point-initializer.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/tesc/block-control-point-initializer.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/tesc/builtin-control-point-initializer.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/tesc/composite-control-point-initializer.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/tesc/copy-memory-control-point.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/tesc/copy-tess-level-tri.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/tesc/plain-control-point-initializer.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/tesc/tess-fixed-input-array-builtin-array.invalid.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/tesc/tess-fixed-input-array-builtin-array.invalid.multi-patch.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/tesc/tess-level-initializer-quad.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/tesc/tess-level-initializer-triangle.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/tesc/tess-level-read-write-in-function-tri.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/tese/copy-tess-level.asm.msl2.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/tese/split-access-chain.asm.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/vert/block-io-use-in-function.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/vert/block-struct-initializer.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/vert/builtin-output-initializer.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/vert/composite-extract-physical-type-id.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/vert/constant-composite-block-no-array-stride.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/vert/duplicate-view-index.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/vert/empty-struct-composite.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/vert/op-load-forced-temporary-array.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/asm/vert/pointer-to-pointer.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/comp/array-copy-threadgroup-memory.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/comp/basic.dynamic-buffer.msl2.invalid.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/comp/bda-restrict-pointer-variable.msl2.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/comp/bitcast-16bit-1.invalid.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/comp/bitcast-16bit-2.invalid.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/comp/bitfield.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/comp/buffer-device-address-from-pointer-complex-chain.msl23.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/comp/extract-atomics-from-function.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/comp/glsl.std450.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/comp/illegal-struct-name.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/comp/image-array-atomic.msl31.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/comp/implicit-integer-promotion.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/comp/int16min-literal.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/comp/int64.invalid.msl22.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/comp/int64min-literal.msl22.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/comp/integer-dot-product.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/comp/intmin-literal.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/comp/loop.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/comp/return.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/comp/std140-array-load-composite-construct.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/comp/struct-packing-scalar.nocompat.invalid.vk.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/comp/subgroups.nocompat.invalid.vk.msl12.emulate-subgroup.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/comp/subgroups.nocompat.invalid.vk.msl21.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/comp/subgroups.nocompat.invalid.vk.msl21.fixed-subgroup.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/comp/subgroups.nocompat.invalid.vk.msl21.ios.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/comp/subgroups.nocompat.invalid.vk.msl22.ios.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/comp/subgroups.nocompat.invalid.vk.msl23.ios.simd.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/comp/trivial-select-cast-vector.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/comp/trivial-select-matrix.spv14.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/components/fragment-input-component.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/components/fragment-output-component.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/components/fragment-output-component.pad-fragment.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/components/vertex-input-component.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/components/vertex-output-component.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/16bit-constants.invalid.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/combined-sampler-parameter-names.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/demote-to-helper.vk.nocompat.msl21.invalid.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/depth-image-gather.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/force-active-resources.msl2.argument..force-active.discrete.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/fp16.desktop.invalid.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/image-gather.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/in_block_assign.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/min-max-clamp.invalid.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/min-max-clamp.relax-nan.invalid.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/nonuniform-constructor.msl2.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/pixel-interlock-simple-callstack.msl2.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/pull-interpolant-access-chain.msl23.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/ray-query-mutability.spv14.vk.msl24.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/scalar-block-layout-ubo-std430.vk.nocompat.invalid.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/shadow-compare-global-alias.invalid.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/struct-bool-edge-cases.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/subgroups.nocompat.invalid.vk.msl22.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/subpass-input-attachment-index-fallback.msl20.ios.framebuffer-fetch.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/subpass-input-attachment-index-fallback.msl23.framebuffer-fetch.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/subpass-input-function-argument.framebuffer-fetch.ios.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/subpass-input-function-argument.framebuffer-fetch.msl23.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/subpass-input.decoration-binding.framebuffer-fetch.msl23.argument.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/subpass-input.decoration-binding.framebuffer-fetch.msl23.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/subpass-input.decoration-binding.ios.framebuffer-fetch.msl2.argument.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/subpass-input.decoration-binding.ios.framebuffer-fetch.msl2.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/texture-access-int.swizzle.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/texture-access-leaf.swizzle.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/texture-access-uint.swizzle.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/texture-access.swizzle.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/texture-gather-uint-component.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/ubo-array-multiple-structs-access-chain.argument.msl2.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/ubo-array-multiple-structs-access-chain.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/ubo-offset-out-of-order.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/variables.zero-initialize.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/frag/volatile-helper-invocation.msl23.spv16.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/array-of-vec3.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/array-of-vec4.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/isolated-scalar-access.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/load-store-col-rows.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/matrix-2x2-scalar.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/matrix-2x2-std140.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/matrix-2x2-std430.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/matrix-2x3-scalar.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/matrix-2x3-std140.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/matrix-2x3-std430.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/matrix-2x4-scalar.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/matrix-2x4-std140.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/matrix-2x4-std430.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/matrix-3x2-scalar.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/matrix-3x2-std140.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/matrix-3x2-std430.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/matrix-3x3-scalar.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/matrix-3x3-std140.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/matrix-3x3-std430.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/matrix-3x4-scalar.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/matrix-3x4-std140.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/matrix-3x4-std430.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/matrix-4x2-scalar.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/matrix-4x2-std140.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/matrix-4x2-std430.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/matrix-4x3-scalar.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/matrix-4x3-std140.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/matrix-4x3-std430.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/matrix-4x4-scalar.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/matrix-4x4-std140.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/matrix-4x4-std430.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/matrix-multiply-row-major.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/matrix-multiply-unpacked-col-major-2.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/matrix-multiply-unpacked-col-major.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/matrix-multiply-unpacked-row-major-2.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/matrix-multiply-unpacked-row-major.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/member-padding.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/std140-array-of-vectors.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/std140-half-matrix-and-array-write.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/std140-half-matrix-and-array.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/struct-alignment.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/struct-packing-array-of-scalar.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/struct-packing-recursive.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/struct-packing.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/struct-size-padding-array-of-array.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/packing/struct-size-padding.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/tesc/copy-tess-level.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/tesc/passthrough-clip-cull.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/tesc/tess-level-read-write-in-function-quad.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/tese/builtin-input-automatic-attribute-assignment.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/tese/load-clip-cull.msl2.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/vert/cull-distance.for-tess.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/vert/functions_nested.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/vert/layer.msl11.invalid.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/vert/modf-storage-class.capture.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/vert/pass-array-by-value.force-native-array.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/vert/pass-array-by-value.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/vert/uninitialized-vertex-output.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/vert/unused-subgroup-builtin.msl22.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/vert/viewport-index.msl2.invalid.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl-no-opt/vulkan/frag/texture-access-function.swizzle.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/amd/shader_trinary_minmax.msl21.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/comp/atomic-decrement.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/comp/atomic-increment.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/comp/bitcast_iadd.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/comp/bitcast_icmp.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/comp/bitcast_sar.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/comp/bitcast_sdiv.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/comp/bitcast_slr.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/comp/block-name-alias-global.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/comp/buffer-write-relative-addr.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/comp/buffer-write.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/comp/copy-object-ssbo-to-ssbo.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/comp/copy-object-ubo-to-ssbo.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/comp/duplicate-spec-id.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/comp/global-parameter-name-alias.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/comp/image-load-store-short-vector.invalid.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/comp/multiple-entry.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/comp/op-spec-constant-op-vector-related.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/comp/quantize.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/comp/relaxed-block-layout.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/comp/specialization-constant-workgroup.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/comp/struct-resource-name-aliasing.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/comp/uint_smulextended.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/comp/undefined-constant-composite.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/comp/undefined-spec-constant-composite.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/comp/variable-pointers-2.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/comp/variable-pointers-store-forwarding.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/comp/vector-builtin-type-cast-func.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/comp/vector-builtin-type-cast.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/combined-sampler-reuse.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/default-member-names.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/depth-array-texture-lod.lod-as-grad.1d-as-2d.agx-cube-grad.msl23.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/depth-image-color-format-fetch.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/depth-image-color-format-sampled.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/descriptor-array-unnamed.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/disable-renamed-output.frag-output.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/empty-struct.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/extract-packed-from-composite.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/frem.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/function-overload-alias.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/image-extract-reuse.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/implicit-read-dep-phi.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/inf-nan-constant.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/interpolation-qualifiers-struct.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/line-directive.line.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/locations-components.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/lut-promotion-initializer.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/min-lod.msl22.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/op-constant-null.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/op-image-sampled-image.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/pass-by-value.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/phi-loop-variable.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/pull-model-interpolation.asm.msl23.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/sample-and-compare.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/single-function-private-lut.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/srem.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/storage-class-output-initializer.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/switch-different-sizes.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/switch-long-case.asm.msl22.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/switch-unsigned-long-case.asm.msl22.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/texel-fetch-no-lod.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/texture-atomics.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/texture-atomics.asm.graphics-robust-access.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/texture-sampling-fp16.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/undef-variable-store.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/unknown-depth-state.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/unord-relational-op.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/unord-relational-op.relax-nan.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/unreachable.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/frag/vector-shuffle-oom.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/tesc/tess-level-overrun.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/tesc/tess-level-overrun.multi-patch.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/tese/unnamed-builtin-array.asm.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/vert/clip-distance-plain-variable.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/vert/clip-distance-plain-variable.no-user-varying.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/vert/copy-memory-interface.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/vert/extract-transposed-matrix-from-struct.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/vert/fake-builtin-input.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/vert/invariant.msl21.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/vert/packed-bool-to-uint.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/vert/packed-bool2-to-packed_uint2.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/vert/packing-test.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/vert/spec-constant-op-composite.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/asm/vert/uint-vertex-id-instance-id.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/access-private-workgroup-in-function.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/argument-buffers-discrete.msl2.argument.discrete.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/argument-buffers-image-load-store.ios.msl2.argument.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/argument-buffers-image-load-store.msl2.argument.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/argument-buffers-runtime-array-buffer.argument.device-argument-buffer.argument-tier-1.msl2.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/argument-buffers-runtime-array-buffer.rich-descriptor.argument.device-argument-buffer.argument-tier-1.msl2.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/argument-buffers-runtime-array.argument.device-argument-buffer.argument-tier-1.msl2.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/array-length.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/array-length.msl2.argument.discrete.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/atomic-float.msl3.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/atomic-image.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/atomic-image.msl31.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/atomic.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/barriers.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/basic.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/basic.dispatchbase.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/basic.dispatchbase.msl11.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/basic.inline-block.msl2.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/buffer_device_address-packed-vec-and-cast-to-and-from-uvec2.msl23.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/buffer_device_address-recursive-struct-pointers.msl23.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/buffer_device_address.msl2.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/builtins.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/cfg-preserve-parameter.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/coherent-block.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/coherent-image-atomic.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/coherent-image-atomic.msl2.argument.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/coherent-image-atomic.msl2.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/coherent-image-atomic.msl31.argument.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/coherent-image-atomic.msl31.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/coherent-image.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/complex-composite-constant-array.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/complex-type-alias.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/composite-array-initialization.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/composite-array-initialization.force-native-array.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/composite-construct.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/copy-array-of-arrays.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/copy-array-of-arrays.force-native-array.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/culling.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/defer-parens.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/dowhile.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/force-recompile-hooks.swizzle.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/functions.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/global-invocation-id-writable-ssbo-in-function.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/global-invocation-id.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/image-atomic-automatic-bindings.argument.msl2.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/image-atomic-automatic-bindings.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/image-cube-array-load-store.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/image.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/insert.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/inverse.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/local-invocation-id.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/local-invocation-index.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/local-size-duplicate-spec-id.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/mat3-row-maj-read-write-const.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/mat3.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/metal3_1_regression_patch.replace-recursive-inputs.msl3.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/mod.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/modf.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/outer-product.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/packing-test-1.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/packing-test-2.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/raw-buffer-descriptor-aliasing.argument.discrete.device-argument-buffer.msl2.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/raw-buffer-descriptor-aliasing.argument.discrete.msl2.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/ray-query.spv14.vk.ios.msl24..invalid.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/read-write-only.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/rmw-matrix.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/rmw-opt.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/scalar-std450-distance-length-normalize.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/shader_ballot.msl22.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/shader_group_vote.msl21.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/shared-array-of-arrays.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/shared-matrix-array-of-array.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/shared-matrix-cast.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/shared-matrix-nested-struct-array.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/shared-matrix-nested-struct.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/shared-struct-bool-cast.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/shared.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/spec-constant-op-member-array.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/spec-constant-work-group-size.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/storage-buffer-std140-vector-array.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/struct-layout.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/struct-nested.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/struct-packing.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/threadgroup-boolean-workaround.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/torture-loop.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/type-alias.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/type_casting_i64.msl22.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/udiv.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/comp/writable-ssbo.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/desktop-only/comp/extended-arithmetic.desktop.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/desktop-only/frag/image-ms.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/desktop-only/frag/query-levels.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/desktop-only/frag/sampler-ms-query.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/desktop-only/tesc/arrayed-output.desktop.sso.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/desktop-only/tesc/basic.desktop.sso.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/desktop-only/tesc/basic.desktop.sso.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/desktop-only/tesc/struct-copy.desktop.sso.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/desktop-only/tesc/struct-copy.desktop.sso.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/desktop-only/tese/triangle.desktop.sso.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/desktop-only/vert/basic.desktop.sso.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/desktop-only/vert/clip-cull-distance..no-user-varying.desktop.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/desktop-only/vert/clip-cull-distance.desktop.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/desktop-only/vert/shader-draw-parameters.desktop.for-tess.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/desktop-only/vert/shader-draw-parameters.desktop.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/flatten/basic.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/flatten/multiindex.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/flatten/push-constant.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/flatten/rowmajor.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/flatten/struct.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/flatten/swizzle.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/flatten/types.flatten.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/argument-buffers.msl2.argument.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/array-component-io.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/array-lut-no-loop-variable.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/array-of-array-lut.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/array-of-texture-swizzle-nonconstant-uniform.msl2.argument.discrete.swizzle.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/array-of-texture-swizzle-nonconstant-uniform.msl2.swizzle.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/array-of-texture-swizzle.msl2.argument.discrete.swizzle.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/array-of-texture-swizzle.msl2.swizzle.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/barycentric-nv-nopersp.msl22.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/barycentric-nv.msl22.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/basic.force-sample.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/basic.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/binary-func-unpack-pack-arguments.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/binary-unpack-pack-arguments.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/bitcasting.1d-as-2d.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/bitcasting.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/buffer-read-write.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/buffer-read-write.texture-buffer-native.msl21.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/builtins.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/clip-distance-varying.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/complex-expression-in-access-chain.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/composite-extract-forced-temporary.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/constant-array.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/constant-composites.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/control-dependent-in-branch.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/cull-distance-varying.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/depth-array-texture-lod.lod-as-grad.1d-as-2d.msl23.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/depth-greater-than.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/depth-less-than.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/depth-out-early-frag-tests.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/depth-out-no-early-frag-tests.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/disable-frag-output.frag-output.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/dual-source-blending.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/early-fragment-tests.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/false-loop-init.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/flush_params.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/for-loop-continue-control-flow.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/for-loop-init.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/fp16-packing.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/frag-demote-checks.discard-checks.msl23.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/frag-demote-checks.discard-checks.msl31.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/frag-discard-checks-continue-block.discard-checks.msl23.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/frag-discard-checks-continue-block.discard-checks.msl31.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/frag-discard-checks.discard-checks.msl23.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/frag-discard-checks.discard-checks.msl31.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/fragment-component-padding.pad-fragment.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/front-facing.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/gather-dref.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/gather-offset.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/helper-invocation.msl21.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/huge-argument-buffer.device-argument-buffer.argument.msl2.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/illegal-name-test-0.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/image-query-lod.msl22.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/in_block.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/in_block_with_multiple_structs_of_same_type.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/in_mat.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/input-attachment-ms.arrayed-subpass.msl21.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/input-attachment-ms.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/input-attachment-ms.multiview.msl21.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/input-attachment.arrayed-subpass.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/input-attachment.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/input-attachment.multiview.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/interpolation-qualifiers-block.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/interpolation-qualifiers.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/lut-promotion.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/mix.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/modf-access-tracking-function.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/mrt-array.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/nonuniform-qualifier.msl2.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/packed-expression-vector-shuffle.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/packing-test-3.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/pixel-interlock-ordered.msl2.argument.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/pixel-interlock-ordered.msl2.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/pixel-interlock-ordered.msl31.argument.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/pixel-interlock-ordered.msl31.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/pls.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/post-depth-coverage.ios.msl2.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/post-depth-coverage.msl23.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/private-variable-prototype-declaration.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/ray-query-object-in-function.spv14.vk.msl24.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/read-cull-clip-distance-in-function.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/readonly-ssbo.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/return-value-after-discard-terminator.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/runtime_array_as_argument_buffer.msl3.argument-tier-1.rich-descriptor.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/runtime_array_as_argument_buffer_buf.msl3.argument-tier-1.rich-descriptor.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/sample-depth-propagate-state-from-resource.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/sample-depth-separate-image-sampler.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/sample-mask-in-and-out.fixed-sample-mask.force-sample.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/sample-mask-in-and-out.fixed-sample-mask.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/sample-mask-not-used.fixed-sample-mask.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/sample-mask.fixed-sample-mask.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/sample-mask.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/sample-position-func.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/sample-position.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/sample-rate-frag-coord-sample-id.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/sample-rate-frag-coord-sample-input.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/sample-rate-frag-coord-sample-pos.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/sample-rate-frag-coord.force-sample.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/sampler-1d-lod.1d-as-2d.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/sampler-1d-lod.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/sampler-compare-bias.msl23.1d-as-2d.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/sampler-compare-cascade-gradient.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/sampler-compare-cascade-gradient.ios.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/sampler-compare-cascade-gradient.msl23.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/sampler-cube-grad.agx-cube-grad.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/sampler-image-arrays.msl2.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/sampler-ms.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/sampler.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/scalar-refract-reflect.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/separate-image-sampler-argument.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/shader-arithmetic-8bit.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/spec-constant-block-size.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/spec-constant-ternary.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/stencil-export.msl21.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/subgroup-builtins.msl22.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/subgroup-globals-extract.msl22.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/switch-unreachable-break.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/switch-unsigned-case.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/swizzle.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/texel-fetch-offset.1d-as-2d.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/texel-fetch-offset.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/texture-cube-array.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/texture-cube-array.ios.emulate-cube-array.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/texture-multisample-array.msl21.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/texture-proj-shadow.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/ubo_layout.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/unary-enclose.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/vecsize-mismatch.shader-inputs.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/frag/write-depth-in-function.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/intel/shader-integer-functions2.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/legacy/vert/transpose.legacy.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/masking/copy-arrays.mask-location-0.msl2.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/masking/copy-arrays.mask-location-0.msl2.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/masking/copy-arrays.mask-location-1.msl2.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/masking/copy-arrays.mask-location-1.msl2.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/masking/write-outputs-block.mask-location-0.for-tess.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/masking/write-outputs-block.mask-location-0.msl2.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/masking/write-outputs-block.mask-location-0.multi-patch.msl2.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/masking/write-outputs-block.mask-location-0.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/masking/write-outputs-block.mask-location-1.for-tess.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/masking/write-outputs-block.mask-location-1.msl2.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/masking/write-outputs-block.mask-location-1.multi-patch.msl2.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/masking/write-outputs-block.mask-location-1.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/masking/write-outputs.mask-clip-distance.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/masking/write-outputs.mask-location-0.for-tess.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/masking/write-outputs.mask-location-0.msl2.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/masking/write-outputs.mask-location-0.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/masking/write-outputs.mask-location-0.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/masking/write-outputs.mask-location-0.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/masking/write-outputs.mask-location-1.for-tess.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/masking/write-outputs.mask-location-1.msl2.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/masking/write-outputs.mask-location-1.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/masking/write-outputs.mask-location-1.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/masking/write-outputs.mask-location-1.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/masking/write-outputs.mask-point-size.for-tess.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/masking/write-outputs.mask-point-size.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/masking/write-outputs.mask-point-size.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/masking/write-outputs.mask-point-size.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/masking/write-outputs.mask-position.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/masking/write-outputs.mask-position.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tesc/arrayed-block-io.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tesc/basic.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tesc/basic.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tesc/complex-control-point-inout-types.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tesc/complex-control-point-inout-types.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tesc/complex-patch-out-types.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tesc/load-control-point-array-of-matrix.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tesc/load-control-point-array-of-matrix.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tesc/load-control-point-array-of-struct.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tesc/load-control-point-array-of-struct.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tesc/load-control-point-array.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tesc/load-control-point-array.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tesc/matrix-output.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tesc/reload-tess-level.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tesc/reload-tess-level.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tesc/struct-output.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tesc/water_tess.multi-patch.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tesc/water_tess.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tese/in-array-of-struct.raw-tess-in.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tese/in-block-with-nested-struct.raw-tess-in.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tese/in-block-with-nested-struct.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tese/input-array.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tese/input-types.raw-tess-in.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tese/input-types.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tese/load-control-point-array-of-matrix.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tese/load-control-point-array.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tese/quad.domain.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tese/quad.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tese/read-patch-vertices-in-func.raw-tess-in.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tese/read-tess-level-in-func-quad.msl2.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tese/read-tess-level-in-func-quad.raw-tess-in.msl2.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tese/read-tess-level-in-func.msl2.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tese/read-tess-level-in-func.raw-tess-in.msl2.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tese/set-from-function.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tese/triangle-tess-level.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tese/triangle.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tese/water_tess.raw-tess-in.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/tese/water_tess.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/array-component-io.for-tess.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/array-component-io.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/basic.capture.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/basic.for-tess.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/basic.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/buffer_device_address.msl2.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/clip-distance-block.no-user-varying.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/clip-distance-block.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/copy.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/dynamic.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/float-math.invariant-float-math.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/float-math.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/functions.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/implicit-position-1.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/implicit-position-2.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/in_out_array_mat.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/interface-block-block-composites.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/interface-block-block-composites.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/interface-block-single-element-array.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/interpolation-qualifiers-block.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/interpolation-qualifiers.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/invariant.msl21.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/leaf-function.capture.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/leaf-function.for-tess.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/no-contraction.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/no-disable-vertex-out.frag-output.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/no_stage_out.for-tess.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/no_stage_out.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/no_stage_out.write_buff.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/no_stage_out.write_buff_atomic.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/no_stage_out.write_tex.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/out-block-with-nested-struct-array.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/out-block-with-struct-array.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/out_block.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/packed-bool-to-uint.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/packed-bool2-to-packed_uint2.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/packed_matrix.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/pointsize.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/read-from-row-major-array.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/resource-arrays-leaf.ios.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/resource-arrays.ios.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/return-array.force-native-array.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/return-array.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/set_builtin_in_func.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/sign-int-types.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/signedness-mismatch.shader-inputs.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/texture_buffer.texture-buffer-native.msl21.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/texture_buffer.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/ubo.alignment.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/ubo.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/uniform-struct-out-of-order-offests.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/uniform-struct-packing-nested.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vert/unused-position.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vulkan/frag/basic.multiview.no-layered.nocompat.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vulkan/frag/basic.multiview.nocompat.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vulkan/frag/demote-to-helper-forwarding.asm.vk.nocompat.msl23.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vulkan/frag/demote-to-helper.vk.nocompat.msl23.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vulkan/frag/demote-to-helper.vk.nocompat.msl23.ios.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vulkan/frag/push-constant.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vulkan/frag/spec-constant.msl11.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vulkan/frag/spec-constant.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vulkan/vert/device-group.multiview.viewfromdev.nocompat.vk.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vulkan/vert/device-group.nocompat.vk.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vulkan/vert/multiview.multiview.no-layered.nocompat.vk.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vulkan/vert/multiview.multiview.nocompat.vk.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vulkan/vert/multiview.nocompat.vk.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vulkan/vert/small-storage.vk.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-msl/vulkan/vert/vulkan-vertex.vk.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/access-chain-dominator-in-loop-body-2.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/access-chain-dominator-in-loop-body.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/access-tracking-function-call-result.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/aliased-struct-divergent-member-name.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/arithmetic-conversion-signs.asm.nocompat.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/atomic-load-store.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/atomic-result-temporary.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/basic.spv16.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/bda-to-array-in-buffer.asm.spv16.nocompat.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/bitcast-fp16-fp32.asm.vk.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/bitcast-fp16-fp32.asm.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/bitfield-signed-operations.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/bitscan.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/block-undef.noeliminate.invalid.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/buffer-atomic-nonuniform.vk.nocompat.asm.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/buffer-device-address-ptr-casting.vk.nocompat.asm.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/buffer-reference-aliased-block-name.nocompat.vk.asm.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/buffer-reference-chained-access.spv16.asm.nocompat.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/buffer-reference-pointer-to-plain-struct.asm.nocompat.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/buffer-reference-pointer-to-pod-in-buffer.asm.nocompat.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/buffer-reference-pointer-to-std140-std430-array.asm.spv16.nocompat.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/buffer-reference-pointer-to-unused-pod-in-buffer.asm.nocompat.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/buffer-reference-synthesized-pointer-2.asm.nocompat.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/buffer-reference-synthesized-pointer-to-pointer.asm.nocompat.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/buffer-reference-synthesized-pointer.asm.nocompat.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/constant-composite-undef.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/constant-lut-name-aliasing.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/copy-logical.spv14.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/eliminate-globals-not-in-entry-point.noeliminate.spv14.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/empty-ubo-block.noeliminate.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/expression-nesting-limits.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/extended-debug-extinst.invalid.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/fuzz-collapse-degenerate-loop.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/fuzz-loop-variable-dominator-with-unreachable-continue-block.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/glsl-signed-operations.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/glsl.std450.frexp-modf-struct.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/image-atomic-nonuniform.vk.nocompat.asm.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/local-size-id-override.vk.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/local-size-id-override.vk.asm.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/local-size-id.vk.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/local-size-id.vk.invalid.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/local-size-id.vk.invalid.asm.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/loop-variable-early-read-with-initializer.asm.invalid.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/loop-variable-early-read-with-undef.asm.invalid.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/loop-variable-with-initializer.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/multi-break-switch-out-of-loop.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/nonuniform-bracket-handling.vk.nocompat.asm.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/phi-temporary-copy-loop-variable.asm.invalid.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/ray-query-force-temporary-rtas.spv14.asm.vk.nocompat.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/ray-query-function-object.spv14.asm.vk.nocompat.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/spec-constant-name-aliasing.vk.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/spec-constant-name-aliasing.vk.asm.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/spec-constant-op-convert-sign.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/storage-buffer-basic.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/comp/temorary-access-terminator.vk.nocompat.asm.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/degenerate-selection-constructs.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/anonymous-inner-struct-names.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/array-builtin-bitcast-load-store.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/collapsed-switch-phi-flush.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/combined-image-sampler-dxc-min16float.asm.invalid.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/complex-opaque-handle-reuse-in-loop.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/composite-insert-hoisted-temporaries-1.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/composite-insert-hoisted-temporaries-2.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/composite-insert-inheritance.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/demote-impure-function-call.vk.nocompat.asm.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/discard-impure-function-call.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/do-while-continue-phi.asm.invalid.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/do-while-loop-inverted-test.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/early-conditional-return-switch.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/empty-struct-in-struct.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/for-loop-dedicated-merge-block-inverted.asm.invalid.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/for-loop-dedicated-merge-block-non-inverted.asm.invalid.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/for-loop-inverted-test.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/image-fetch-uint-coord.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/inliner-dominator-inside-loop.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/late-expression-invalidation-2.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/late-expression-invalidation.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/ldexp-uint-exponent.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/loop-merge-to-continue.asm.invalid.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/nonuniform-bracket-handling-2.vk.nocompat.asm.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/nonuniform-qualifier-propagation.vk.nocompat.asm.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/nonuniform-ssbo.nocompat.vk.asm.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/only-initializer-frag-depth.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/opaque-id-literal-alias.preserve.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/out-of-order-struct-id.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/phi-alternative-precision.asm..vk.nocompat.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/phi.zero-initialize.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/pixel-interlock-callstack.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/pixel-interlock-control-flow.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/pixel-interlock-split-functions.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/relaxed-precision-inheritance-rules-hoisted-temporaries.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/relaxed-precision-inheritance-rules-hoisted-temporary.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/relaxed-precision-inheritance-rules.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/reserved-function-identifier.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/reserved-identifiers.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/sample-mask-load-store-array-uint.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/sample-mask-load-store-array.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/scalar-select.spv14.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/selection-merge-to-continue.asm.invalid.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/sparse-texture-feedback-uint-code.asm.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/subgroup-arithmetic-cast.nocompat.vk.asm.invalid.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/subgroup-ballot-only.vk.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/subgroup-ballot-only.vk.asm.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/switch-block-case-fallthrough.asm.invalid.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/switch-merge-to-continue.asm.invalid.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/switch-non-default-fallthrough-no-phi.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/switch-single-case-multiple-exit-cfg.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/terminate-impure-function-call.spv16.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/texel-fetch-ms-uint-sample.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/unordered-compare.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/unordered-compare.relax-nan.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/vector-extract-dynamic-spec-constant.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/vector-shuffle-undef-index.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/frag/while-loop-inverted-test.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/geom/store-uint-layer.invalid.asm.geom
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/loop-header-self-continue-break.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/mesh/invariant-position-dx-style.vk.nocompat.spv14.asm.mesh.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/mesh/mesh-shader-clip-cull.vk.nocompat.spv14.asm.mesh.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/mesh/mesh-shader-plain-builtin-outputs.spv14.asm.vk.nocompat.mesh.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/rgen/acceleration-nonuniform.spv14.vk.nocompat.asm.rgen.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/task/task-shader.vk.nocompat.spv14.asm.task.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/temporary.zero-initialize.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/tesc/array-of-block-output-initializer.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/tesc/copy-memory-control-point.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/tesc/tess-fixed-input-array-builtin-array.invalid.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/tesc/tess-level-initializer.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/vert/block-struct-initializer.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/vert/builtin-output-initializer.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/vert/complex-link-by-name.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/vert/complex-link-by-name.force-flattened-io.legacy.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/vert/constant-composite-extract.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/vert/debug-printf.asm.vk.nocompat.vert.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/vert/empty-struct-composite.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/vert/fma-legacy-fallback.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/asm/vert/semantic-decoration.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/comp/bitcast-16bit-1.invalid.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/comp/bitcast-16bit-2.invalid.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/comp/bitfield.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/comp/glsl.std450.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/comp/illegal-struct-name.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/comp/image-load-formatted.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/comp/inout-struct.invalid.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/comp/int16min-literal.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/comp/int64min-literal.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/comp/intmin-literal.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/comp/loop-break-merge-after-inner-continue.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/comp/loop-resolve-debug-semantics.g.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/comp/loop-resolve-debug-semantics.gV.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/comp/loop.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/comp/return.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/comp/shader_ballot_nonuniform_invocations.invalid.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/comp/specialization-constant-evaluation.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/comp/struct-packing-scalar.nocompat.invalid.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/comp/subgroups.nocompat.invalid.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/comp/subgroups_arithmetic_fadd.vk.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/comp/subgroups_arithmetic_fadd.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/comp/subgroups_arithmetic_fmul.vk.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/comp/subgroups_arithmetic_fmul.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/comp/subgroups_arithmetic_iadd.vk.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/comp/subgroups_arithmetic_iadd.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/comp/subgroups_arithmetic_imul.vk.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/comp/subgroups_arithmetic_imul.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/comp/subgroups_basicvoteballot.vk.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/comp/subgroups_basicvoteballot.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/comp/trivial-select-cast-vector.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/comp/trivial-select-matrix.spv14.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/frag/16bit-constants.invalid.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/frag/fp16.invalid.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/frag/frag-fully-covered.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/frag/fragmentMaskFetch_subpassInput.vk.nocompat.invalid.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/frag/fs.invalid.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/frag/image-gather.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/frag/mesh-shader-perprimitive.spv14.nocompat.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/frag/modf-non-function-purity-analysis.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/frag/multi-dimensional.desktop.invalid.flatten_dim.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/frag/nonuniform-constructor.vk.nocompat.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/frag/pixel-interlock-simple-callstack.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/frag/scalar-block-layout-ubo-std430.vk.nocompat.invalid.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/frag/sparse-texture-clamp.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/frag/sparse-texture-feedback.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/frag/subpass-input.framebuffer-fetch.nocompat.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/frag/subpass-input.framebuffer-fetch.nocompat.framebuffer-fetch-noncoherent.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/frag/subpass-input.framebuffer-fetch.nocompat.legacy.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/frag/subpass-input.framebuffer-fetch.nocompat.legacy.framebuffer-fetch-noncoherent.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/frag/texture-gather-offsets.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/frag/texture-gather-uint-component.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/frag/texture1d-emulation.es.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/frag/texture1d-emulation.legacy.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/frag/variables.zero-initialize.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/legacy/frag/switch-single-case-multiple-exit-cfg.legacy.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/mesh/invariant-position-mesh.spv14.nocompat.vk.mesh.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/task/task-shader-basic-2.vk.spv14.nocompat.task.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/task/task-shader-basic.vk.spv14.nocompat.task.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/vert/io-blocks.force-flattened-io.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/vert/pass-array-by-value.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/vulkan/comp/image-64bit.vk.nocompat.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/vulkan/frag/shading-rate.vk.nocompat.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/vulkan/frag/spec-constant.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/vulkan/frag/spec-constant.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/vulkan/frag/ubo-offset-out-of-order.vk.nocompat.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/vulkan/frag/volatile-helper-invocation.vk.nocompat.spv16.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-no-opt/vulkan/vert/primitive-shading-rate.vk.nocompat.vert.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-reflection/asm/aliased-entry-point-names.asm.multi.json
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-reflection/asm/comp/pointer-to-array-of-physical-pointer.asm.comp.json
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-reflection/asm/op-source-glsl-ssbo-1.asm.comp.json
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-reflection/asm/op-source-glsl-ssbo-2.asm.comp.json
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-reflection/asm/op-source-hlsl-uav-1.asm.comp.json
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-reflection/asm/op-source-hlsl-uav-2.asm.comp.json
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-reflection/asm/op-source-none-ssbo-1.asm.comp.json
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-reflection/asm/op-source-none-ssbo-2.asm.comp.json
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-reflection/asm/op-source-none-uav-1.asm.comp.json
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-reflection/asm/op-source-none-uav-2.asm.comp.json
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-reflection/comp/array-of-physical-pointer.comp.json
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-reflection/comp/function-pointer.invalid.asm.comp.json
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-reflection/comp/out-of-order-block-offsets.comp.json
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-reflection/comp/physical-pointer.comp.json
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-reflection/comp/struct-layout.comp.json
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-reflection/comp/struct-packing.comp.json
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-reflection/comp/workgroup-size-spec-constant.comp.json
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-reflection/frag/combined-texture-sampler-shadow.vk.frag.json
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-reflection/frag/combined-texture-sampler.vk.frag.json
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-reflection/frag/image-load-store-uint-coord.asm.frag.json
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-reflection/frag/input-attachment-ms.vk.frag.json
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-reflection/frag/input-attachment.vk.frag.json
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-reflection/frag/push-constant.vk.frag.json
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-reflection/frag/separate-sampler-texture-array.vk.frag.json
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-reflection/frag/spec-constant.vk.frag.json
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-reflection/rgen/acceleration_structure.vk.rgen.json
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-reflection/vert/array-size-reflection.vert.json
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-reflection/vert/read-from-row-major-array.vert.json
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-reflection/vert/stride-reflection.vert.json
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-reflection/vert/texture_buffer.vert.json
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-ue4-no-opt/asm/frag/accesschain-invalid-expression.asm.invalid.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-ue4-no-opt/asm/frag/array-copy-error.asm.invalid.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-ue4-no-opt/asm/frag/phi-variable-declaration.asm.invalid.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-ue4-no-opt/asm/tese/ds-texcoord-array.asm.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-ue4-no-opt/asm/vert/loop-accesschain-writethrough.asm.invalid.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-ue4/asm/frag/depth-compare.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-ue4/asm/frag/global-constant-arrays.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-ue4/asm/frag/padded-float-array-member-defef.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-ue4/asm/frag/sample-mask-not-array.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-ue4/asm/frag/subpass-input.ios.framebuffer-fetch.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-ue4/asm/frag/subpass-input.msl23.framebuffer-fetch.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-ue4/asm/frag/texture-atomics.asm.argument.msl2.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-ue4/asm/frag/texture-atomics.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-ue4/asm/frag/texture-atomics.asm.graphics-robust-access.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-ue4/asm/tesc/hs-incorrect-base-type.invalid.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-ue4/asm/tesc/hs-input-array-access.invalid.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-ue4/asm/tesc/hs-texcoord-array.invalid.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-ue4/asm/tesc/tess-factor-must-be-threadgroup.invalid.asm.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-ue4/asm/tese/ds-double-gl-in-deref.asm.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-ue4/asm/tese/ds-patch-input-fixes.asm.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-ue4/asm/tese/ds-patch-inputs.asm.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-ue4/asm/vert/array-missing-copies.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders-ue4/asm/vert/texture-buffer.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/amd/gcn_shader.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/amd/shader_ballot.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/amd/shader_group_vote.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/amd/shader_trinary_minmax.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/comp/atomic-decrement.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/comp/atomic-increment.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/comp/bitcast_iadd.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/comp/bitcast_icmp.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/comp/bitcast_iequal.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/comp/bitcast_sar.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/comp/bitcast_sdiv.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/comp/bitcast_slr.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/comp/block-name-alias-global.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/comp/builtin-compute-bitcast.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/comp/control-flow-hints.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/comp/decoration-group.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/comp/global-parameter-name-alias.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/comp/hlsl-functionality.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/comp/logical.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/comp/multiple-entry.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/comp/nmin-max-clamp.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/comp/nmin-max-clamp.relax-nan.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/comp/op-phi-swap.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/comp/quantize.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/comp/recompile-block-naming.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/comp/specialization-constant-workgroup.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/comp/switch-break-ladder.asm.invalid.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/comp/undefined-constant-composite.asm.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/combined-sampler-reuse.vk.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/combined-sampler-reuse.vk.asm.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/complex-name-workarounds.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/composite-construct-struct-no-swizzle.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/default-member-names.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/do-while-statement-fallback.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/empty-struct.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/for-loop-phi-only-continue.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/frem.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/function-overload-alias.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/hlsl-sample-cmp-level-zero-cube.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/hlsl-sample-cmp-level-zero.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/image-extract-reuse.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/image-fetch-no-sampler.asm.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/image-fetch-no-sampler.asm.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/image-fetch-no-sampler.no-samplerless.asm.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/image-fetch-no-sampler.no-samplerless.asm.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/image-query-no-sampler.no-samplerless.vk.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/image-query-no-sampler.no-samplerless.vk.asm.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/image-query-no-sampler.vk.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/image-query-no-sampler.vk.asm.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/implicit-read-dep-phi.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/inf-nan-constant-double.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/inf-nan-constant.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/invalidation.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/line-directive.line.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/locations-components.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/loop-body-dominator-continue-access.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/loop-header-to-continue.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/lut-promotion-initializer.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/multi-for-loop-init.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/op-constant-null.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/op-phi-swap-continue-block.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/out-of-bounds-access-opspecconstant.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/out-of-bounds-access.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/pack-and-unpack-uint2.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/pass-by-value.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/phi-loop-variable.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/sample-and-compare.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/sampler-buffer-array-without-sampler.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/sampler-buffer-without-sampler.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/single-function-private-lut.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/srem.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/storage-class-output-initializer.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/struct-composite-extract-swizzle.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/switch-label-shared-block.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/switch-preserve-sign-extension.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/temporary-name-alias.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/temporary-phi-hoisting.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/texel-fetch-no-lod.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/texture-sampling-fp16.asm.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/texture-sampling-fp16.asm.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/undef-variable-store.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/unknown-depth-state.asm.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/unknown-depth-state.asm.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/unreachable.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/frag/vector-shuffle-oom.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/geom/block-name-namespace.asm.geom
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/geom/inout-split-access-chain-handle.asm.geom
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/geom/split-access-chain-input.asm.geom
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/geom/unroll-glposition-load.asm.geom
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/tese/unroll-input-array-load.asm.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/vert/empty-io.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/vert/extract-transposed-matrix-from-struct.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/vert/global-builtin.sso.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/vert/invariant-block.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/vert/invariant-block.sso.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/vert/invariant.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/vert/invariant.sso.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/vert/spec-constant-op-composite.asm.vk.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/vert/spec-constant-op-composite.asm.vk.vert.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/asm/vert/uint-vertex-id-instance-id.asm.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/comp/atomic.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/comp/bake_gradient.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/comp/barriers.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/comp/basic.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/comp/casts.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/comp/cfg-preserve-parameter.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/comp/cfg.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/comp/coherent-block.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/comp/coherent-image.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/comp/composite-array-initialization.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/comp/composite-construct.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/comp/culling.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/comp/defer-parens.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/comp/dowhile.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/comp/generate_height.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/comp/image.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/comp/insert.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/comp/mat3.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/comp/mod.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/comp/modf.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/comp/outer-product.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/comp/read-write-only.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/comp/rmw-matrix.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/comp/rmw-opt.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/comp/scalar-std450-distance-length-normalize.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/comp/shared.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/comp/ssbo-array-length.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/comp/ssbo-array.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/comp/struct-layout.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/comp/struct-packing.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/comp/torture-loop.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/comp/type-alias.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/comp/udiv.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/desktop-only/comp/enhanced-layouts.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/desktop-only/comp/extended-arithmetic.desktop.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/desktop-only/comp/fp64.desktop.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/desktop-only/comp/image-formats.desktop.noeliminate.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/desktop-only/comp/int64.desktop.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/desktop-only/frag/clip-cull-distance.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/desktop-only/frag/control-dependent-in-branch.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/desktop-only/frag/depth-greater-than.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/desktop-only/frag/depth-less-than.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/desktop-only/frag/dual-source-blending.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/desktop-only/frag/hlsl-uav-block-alias.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/desktop-only/frag/image-ms.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/desktop-only/frag/image-query.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/desktop-only/frag/image-size.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/desktop-only/frag/image-size.no-qualifier-deduction.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/desktop-only/frag/in-block-qualifiers.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/desktop-only/frag/layout-component.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/desktop-only/frag/query-levels.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/desktop-only/frag/query-lod.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/desktop-only/frag/sampler-ms-query.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/desktop-only/frag/stencil-export.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/desktop-only/frag/texture-proj-shadow.desktop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/desktop-only/geom/basic.desktop.sso.geom
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/desktop-only/geom/viewport-index.desktop.geom
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/desktop-only/tesc/basic.desktop.sso.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/desktop-only/tese/triangle.desktop.sso.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/desktop-only/vert/basic.desktop.sso.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/desktop-only/vert/clip-cull-distance.desktop.sso.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/desktop-only/vert/clip-cull-distance.desktop.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/desktop-only/vert/out-block-qualifiers.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/desktop-only/vert/shader-draw-parameters-450.desktop.vk.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/desktop-only/vert/shader-draw-parameters-450.desktop.vk.vert.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/desktop-only/vert/shader-draw-parameters.desktop.vk.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/desktop-only/vert/shader-draw-parameters.desktop.vk.vert.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/flatten/array.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/flatten/basic.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/flatten/copy.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/flatten/dynamic.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/flatten/matrix-conversion.flatten.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/flatten/matrixindex.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/flatten/multiindex.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/flatten/push-constant.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/flatten/rowmajor.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/flatten/struct.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/flatten/struct.rowmajor.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/flatten/swizzle.flatten.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/flatten/types.flatten.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/array-lut-no-loop-variable.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/avoid-expression-lowering-to-loop.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/barycentric-khr.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/barycentric-nv.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/basic.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/block-match-sad.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/block-match-ssd.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/box-filter.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/complex-expression-in-access-chain.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/composite-extract-forced-temporary.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/constant-array.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/constant-composites.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/false-loop-init.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/flush_params.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/for-loop-continue-control-flow.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/for-loop-init.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/frexp-modf.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/front-facing.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/gather-dref.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/ground.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/helper-invocation.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/hoisted-temporary-use-continue-block-as-value.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/image-load-store-uint-coord.asm.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/inside-loop-dominated-variable-preservation.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/loop-dominator-and-switch-default.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/lut-promotion.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/mix.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/modf-pointer-function-analysis.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/partial-write-preserve.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/pixel-interlock-ordered.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/pixel-interlock-unordered.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/pls.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/post-depth-coverage-es.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/post-depth-coverage.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/round-even.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/round.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/sample-interlock-ordered.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/sample-interlock-unordered.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/sample-parameter.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/sample-weighted.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/sampler-ms.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/sampler-proj.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/sampler.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/scalar-refract-reflect.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/selection-block-dominator.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/shader-clock.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/struct-type-unrelated-alias.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/switch-unreachable-break.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/switch-unsigned-case.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/swizzle.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/texel-fetch-offset.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/ubo-load-row-major-workaround.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/ubo_layout.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/frag/unary-enclose.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/geom/basic.geom
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/geom/geometry-passthrough.geom
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/geom/lines-adjacency.geom
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/geom/lines.geom
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/geom/multi-stream.geom
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/geom/points.geom
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/geom/single-invocation.geom
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/geom/transform-feedback-streams.geom
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/geom/triangles-adjacency.geom
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/geom/triangles.geom
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/legacy/fragment/explicit-lod.legacy.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/legacy/fragment/explicit-lod.legacy.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/legacy/fragment/fma.legacy.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/legacy/fragment/hyperbolic.legacy.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/legacy/fragment/io-blocks.legacy.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/legacy/fragment/isnan-isinf.legacy.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/legacy/fragment/modf.legacy.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/legacy/fragment/multiple-struct-flattening.legacy.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/legacy/fragment/round.legacy.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/legacy/fragment/struct-varying.legacy.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/legacy/fragment/switch.legacy.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/legacy/vert/implicit-lod.legacy.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/legacy/vert/int-attribute.legacy.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/legacy/vert/inverse.legacy.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/legacy/vert/io-block.legacy.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/legacy/vert/outer-product.legacy.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/legacy/vert/struct-flatten-inner-array.legacy.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/legacy/vert/struct-flatten-stores-multi-dimension.legacy.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/legacy/vert/struct-varying.legacy.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/legacy/vert/switch-nested.legacy.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/legacy/vert/transpose.legacy.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/mesh/mesh-shader-basic-lines.spv14.vk.nocompat.mesh.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/mesh/mesh-shader-basic-points.spv14.vk.nocompat.mesh.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/mesh/mesh-shader-basic-triangle.spv14.vk.nocompat.mesh.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/tesc/basic.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/tesc/water_tess.tesc
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/tese/ccw.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/tese/cw.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/tese/equal.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/tese/fractional_even.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/tese/fractional_odd.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/tese/input-array.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/tese/line.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/tese/load-array-of-array.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/tese/patch-input-array.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/tese/read-patch-vertices-in-func.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/tese/triangle.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/tese/water_tess.tese
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vert/basic.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vert/ground.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vert/invariant.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vert/no-contraction.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vert/ocean.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vert/read-from-row-major-array.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vert/return-array.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vert/row-major-workaround.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vert/texture_buffer.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vert/transform-feedback-decorations.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vert/ubo.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/comp/array-of-buffer-reference.nocompat.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/comp/buffer-reference-atomic.nocompat.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/comp/buffer-reference-base-alignment-promote.nocompat.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/comp/buffer-reference-bitcast-uvec2-2.nocompat.invalid.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/comp/buffer-reference-bitcast-uvec2.nocompat.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/comp/buffer-reference-bitcast.nocompat.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/comp/buffer-reference-decorations.nocompat.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/comp/buffer-reference.nocompat.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/comp/fp-atomic.nocompat.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/comp/ray-query.nocompat.spv14.invalid.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/comp/spec-constant-op-member-array.vk.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/comp/spec-constant-op-member-array.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/comp/spec-constant-work-group-size.vk.comp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/comp/spec-constant-work-group-size.vk.comp.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/frag/block-match-sad.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/frag/block-match-ssd.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/frag/box-filter.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/frag/combined-texture-sampler-shadow.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/frag/combined-texture-sampler-shadow.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/frag/combined-texture-sampler.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/frag/combined-texture-sampler.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/frag/demote-to-helper-forwarding.asm.vk.nocompat.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/frag/demote-to-helper.vk.nocompat.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/frag/desktop-mediump.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/frag/desktop-mediump.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/frag/input-attachment-ms.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/frag/input-attachment-ms.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/frag/input-attachment.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/frag/input-attachment.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/frag/nonuniform-qualifier.vk.nocompat.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/frag/push-constant-as-ubo.push-ubo.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/frag/push-constant-as-ubo.push-ubo.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/frag/push-constant.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/frag/push-constant.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/frag/sample-weighted.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/frag/separate-combined-fake-overload.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/frag/separate-combined-fake-overload.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/frag/separate-sampler-texture-array.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/frag/separate-sampler-texture-array.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/frag/separate-sampler-texture.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/frag/separate-sampler-texture.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/frag/shader-arithmetic-8bit.nocompat.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/frag/spec-constant-block-size.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/frag/spec-constant-block-size.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/frag/spec-constant-ternary.vk.frag
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/frag/spec-constant-ternary.vk.frag.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rahit/terminators.khr.spv14.nocompat.vk.rahit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rahit/terminators.nocompat.vk.rahit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rcall/incoming-callable.khr.spv14.nocompat.vk.rcall.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/hit_attribute_block.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/hit_attribute_block.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/hit_attribute_block_in_function.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/hit_attribute_block_in_function.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/hit_attribute_plain.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/hit_attribute_plain.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/hit_attribute_struct.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/hit_attribute_struct.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/hit_kind.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/hit_kind.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/hit_t.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/hit_t.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/incoming_ray_flags.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/incoming_ray_flags.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/instance_custom_id.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/instance_custom_id.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/instance_id.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/instance_id.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/object_ray_direction.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/object_ray_direction.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/object_ray_origin.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/object_ray_origin.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/object_to_world.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/object_to_world.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/payloads.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/payloads.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/primitive_id.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/primitive_id.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/ray_tmax.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/ray_tmax.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/ray_tmin.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/ray_tmin.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/ray_tracing.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/ray_tracing.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/world_ray_direction.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/world_ray_direction.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/world_ray_origin.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/world_ray_origin.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/world_to_object.khr.spv14.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rchit/world_to_object.nocompat.vk.rchit.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rgen/convert-u-to-as.spv14.vk.nocompat.rgen.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rgen/execute_callable.nocompat.khr.spv14.vk.rgen.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rgen/execute_callable.nocompat.vk.rgen.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rgen/launch_id.khr.spv14.nocompat.vk.rgen.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rgen/launch_id.nocompat.vk.rgen.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rgen/launch_size.khr.spv14.nocompat.vk.rgen.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rgen/launch_size.nocompat.vk.rgen.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rgen/payloads.khr.spv14.nocompat.vk.rgen.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rgen/payloads.nocompat.vk.rgen.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rgen/pure_call.khr.spv14.nocompat.vk.rgen.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rgen/pure_call.nocompat.vk.rgen.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rgen/ray_tracing.khr.spv14.nocompat.vk.rgen.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rgen/ray_tracing.nocompat.vk.rgen.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rgen/shader_record_buffer.khr.spv14.nocompat.vk.rgen.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rgen/shader_record_buffer.nocompat.vk.rgen.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rint/report-intersection.khr.spv14.nocompat.vk.rint.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rint/report-intersection.nocompat.vk.rint.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rmiss/ray_tracing.khr.spv14.nocompat.vk.rmiss.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rmiss/ray_tracing.nocompat.vk.rmiss.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/rmiss/ray_tracing_trace_incoming.khr.spv14.nocompat.vk.rmiss.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/vert/device-group.nocompat.vk.vert.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/vert/multiview.nocompat.vk.vert.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/vert/small-storage.vk.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/vert/small-storage.vk.vert.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/vert/vulkan-vertex.vk.vert
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/reference/shaders/vulkan/vert/vulkan-vertex.vk.vert.vk
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cfg.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cfg.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_common.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cpp.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cpp.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cross.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cross.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cross.natvis
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cross_c.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cross_c.h
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cross_containers.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cross_error_handling.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cross_parsed_ir.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cross_parsed_ir.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cross_util.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_cross_util.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_glsl.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_glsl.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_hlsl.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_hlsl.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_msl.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_msl.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_parser.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_parser.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_reflect.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv_reflect.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/tests-other/c_api_test.c
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/tests-other/c_api_test.spv
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/tests-other/hlsl_resource_binding.spv
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/tests-other/hlsl_resource_bindings.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/tests-other/hlsl_wave_mask.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/tests-other/msl_constexpr_test.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/tests-other/msl_constexpr_test.spv
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/tests-other/msl_resource_binding.spv
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/tests-other/msl_resource_bindings.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/tests-other/msl_ycbcr_conversion_test.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/tests-other/msl_ycbcr_conversion_test.spv
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/tests-other/msl_ycbcr_conversion_test_2.spv
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/tests-other/small_vector.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/tests-other/typed_id_test.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vk_video/vulkan_video_codec_av1std.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vk_video/vulkan_video_codec_av1std_decode.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vk_video/vulkan_video_codec_h264std.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vk_video/vulkan_video_codec_h264std_decode.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vk_video/vulkan_video_codec_h264std_encode.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vk_video/vulkan_video_codec_h265std.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vk_video/vulkan_video_codec_h265std_decode.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vk_video/vulkan_video_codec_h265std_encode.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vk_video/vulkan_video_codecs_common.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vk_icd.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vk_layer.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vk_platform.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan.cppm
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_android.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_beta.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_core.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_directfb.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_enums.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_extension_inspection.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_format_traits.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_fuchsia.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_funcs.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_ggp.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_handles.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_hash.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_hpp_macros.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_ios.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_macos.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_metal.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_raii.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_screen.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_shared.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_static_assertions.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_structs.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_to_string.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_vi.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_video.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_wayland.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_win32.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_xcb.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_xlib.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_xlib_xrandr.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/docs/generated_code.md
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/docs/layer_configuration.md
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/include/vulkan/layer/vk_layer_settings.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/include/vulkan/layer/vk_layer_settings.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/include/vulkan/utility/vk_dispatch_table.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/include/vulkan/utility/vk_format_utils.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/include/vulkan/utility/vk_struct_helper.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/include/vulkan/vk_enum_string_helper.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/scripts/gn/stub.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/src/layer/layer_settings_manager.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/src/layer/layer_settings_manager.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/src/layer/layer_settings_util.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/src/layer/layer_settings_util.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/src/layer/vk_layer_settings.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/src/layer/vk_layer_settings_helper.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/VkLayer_khronos_validation.def
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/best_practices_error_enums.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/best_practices_utils.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/best_practices_validation.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/bp_buffer.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/bp_cmd_buffer.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/bp_cmd_buffer_nv.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/bp_copy_blit_resolve.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/bp_descriptor.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/bp_device_memory.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/bp_drawdispatch.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/bp_framebuffer.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/bp_image.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/bp_instance_device.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/bp_pipeline.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/bp_ray_tracing.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/bp_render_pass.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/bp_synchronization.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/bp_video.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/best_practices/bp_wsi.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/containers/custom_containers.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/containers/qfo_transfer.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/containers/range_vector.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/containers/sparse_containers.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/containers/subresource_adapter.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/containers/subresource_adapter.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_android.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_buffer.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_buffer_address.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_cmd_buffer.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_cmd_buffer_dynamic.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_copy_blit_resolve.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_descriptor.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_device.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_device_memory.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_drawdispatch.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_external_object.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_image.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_image_layout.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_pipeline.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_pipeline_compute.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_pipeline_graphics.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_pipeline_ray_tracing.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_query.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_queue.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_ray_tracing.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_render_pass.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_shader_interface.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_shader_object.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_spirv.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_synchronization.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_video.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_wsi.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/cc_ycbcr.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/core_checks/core_validation.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/drawdispatch/descriptor_validator.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/drawdispatch/descriptor_validator.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/drawdispatch/drawdispatch_vuids.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/drawdispatch/drawdispatch_vuids.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/error_message/error_location.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/error_message/error_location.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/error_message/logging.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/error_message/logging.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/error_message/record_object.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/error_message/unimplementable_validation.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vma.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vma.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_shaders/gpu_pre_action.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_shaders/gpu_pre_copy_buffer_to_image.comp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_shaders/gpu_pre_dispatch.comp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_shaders/gpu_pre_draw.vert
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_shaders/gpu_pre_trace_rays.rgen
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_shaders/gpu_shaders_constants.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_shaders/inst_bindless_descriptor.comp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_shaders/inst_buffer_device_address.comp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/debug_printf.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/debug_printf.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/gpu_descriptor_set.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/gpu_descriptor_set.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/gpu_error_message.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/gpu_error_message.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/gpu_image_layout.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/gpu_record.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/gpu_settings.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/gpu_setup.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/gpu_state_tracker.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/gpu_state_tracker.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/gpu_subclasses.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/gpu_subclasses.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/gpu_validation.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/gpu_validation.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/gpu_vuids.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/gpu_vuids.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/spirv/bindless_descriptor_pass.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/spirv/bindless_descriptor_pass.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/spirv/buffer_device_address_pass.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/spirv/buffer_device_address_pass.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/spirv/function_basic_block.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/spirv/function_basic_block.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/spirv/instruction.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/spirv/instruction.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/spirv/link.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/spirv/module.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/spirv/module.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/spirv/pass.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/spirv/pass.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/spirv/type_manager.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/gpu_validation/spirv/type_manager.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/layer_chassis_dispatch_manual.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/layer_options.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/layer_options.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/object_tracker/object_lifetime_validation.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/object_tracker/object_tracker_utils.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/buffer_state.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/buffer_state.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/cmd_buffer_state.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/cmd_buffer_state.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/descriptor_sets.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/descriptor_sets.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/device_memory_state.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/device_memory_state.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/device_state.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/fence_state.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/fence_state.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/image_layout_map.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/image_layout_map.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/image_state.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/image_state.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/pipeline_layout_state.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/pipeline_layout_state.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/pipeline_state.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/pipeline_state.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/pipeline_sub_state.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/pipeline_sub_state.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/query_state.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/queue_state.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/queue_state.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/ray_tracing_state.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/render_pass_state.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/render_pass_state.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/sampler_state.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/semaphore_state.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/semaphore_state.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/shader_instruction.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/shader_instruction.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/shader_module.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/shader_module.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/shader_object_state.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/shader_object_state.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/state_object.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/state_object.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/state_tracker.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/state_tracker.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/video_session_state.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/state_tracker/video_session_state.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_buffer.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_cmd_buffer.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_cmd_buffer_dynamic.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_descriptor.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_device_memory.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_external_object.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_framebuffer.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_image.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_instance_device.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_pipeline.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_ray_tracing.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_render_pass.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_shader_object.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_synchronization.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_utils.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_wsi.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/stateless_validation.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_access_context.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_access_context.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_access_state.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_access_state.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_commandbuffer.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_commandbuffer.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_common.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_common.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_op.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_op.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_renderpass.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_renderpass.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_submit.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_submit.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_utils.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_utils.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_validation.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_validation.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_vuid_maps.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/sync/sync_vuid_maps.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/thread_tracker/thread_safety_validation.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/thread_tracker/thread_safety_validation.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/android_ndk_types.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/cast_utils.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/convert_utils.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/convert_utils.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/hash_util.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/hash_util.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/hash_vk_types.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/image_layout_utils.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/image_layout_utils.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/ray_tracing_utils.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/ray_tracing_utils.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/shader_utils.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/shader_utils.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/vk_layer_extension_utils.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/vk_layer_extension_utils.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/vk_layer_utils.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/vk_layer_utils.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vk_layer_config.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vk_layer_config.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/best_practices.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/best_practices.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/chassis.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/chassis.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/chassis_dispatch_helper.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/command_validation.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/dynamic_state_helper.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/dynamic_state_helper.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/enum_flag_bits.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/error_location_helper.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/error_location_helper.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/feature_requirements_helper.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/feature_requirements_helper.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/gpu_as_inspection_comp.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/gpu_inst_shader_hash.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/gpu_pre_copy_buffer_to_image_comp.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/gpu_pre_dispatch_comp.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/gpu_pre_draw_vert.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/gpu_pre_trace_rays_rgen.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/inst_bindless_descriptor_comp.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/inst_buffer_device_address_comp.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/layer_chassis_dispatch.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/layer_chassis_dispatch.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/object_tracker.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/object_tracker.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/pnext_chain_extraction.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/pnext_chain_extraction.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/spirv_grammar_helper.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/spirv_grammar_helper.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/spirv_tools_commit_id.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/spirv_validation_helper.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/state_tracker_helper.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/state_tracker_helper.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/stateless_validation_helper.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/stateless_validation_helper.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/sync_validation_types.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/sync_validation_types.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/thread_safety.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/thread_safety_commands.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/thread_safety_counter_bodies.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/thread_safety_counter_definitions.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/thread_safety_counter_instances.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/valid_enum_values.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/valid_enum_values.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/valid_flag_values.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_api_version.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_dispatch_table_helper.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_dispatch_table_helper.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_extension_helper.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_extension_helper.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_function_pointers.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_function_pointers.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_layer_dispatch_table.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_object_types.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_object_types.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_safe_struct.h
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_safe_struct_core.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_safe_struct_ext.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_safe_struct_khr.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_safe_struct_utils.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_safe_struct_vendor.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_validation_error_messages.h
+FILE: ../../../flutter/third_party/wuffs/release/c/wuffs-v0.2.c
+FILE: ../../../flutter/third_party/wuffs/release/c/wuffs-v0.3.c
 ----------------------------------------------------------------------------------------------------
-Copyright (c) 2009 The Chromium Authors. All rights reserved.
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+1. Definitions.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
 
-====================================================================================================
-LIBRARY: accessibility
-ORIGIN: ../../../flutter/third_party/accessibility/base/win/scoped_bstr.cc + ../../../LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../flutter/third_party/accessibility/base/win/scoped_bstr.cc
-FILE: ../../../flutter/third_party/accessibility/base/win/scoped_bstr_unittest.cc
-FILE: ../../../flutter/third_party/accessibility/base/win/scoped_variant.cc
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2010 The Chromium Authors. All rights reserved.
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
 
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
 
-====================================================================================================
-LIBRARY: accessibility
-ORIGIN: ../../../flutter/third_party/accessibility/base/win/atl_module.h + ../../../LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../flutter/third_party/accessibility/base/auto_reset.h
-FILE: ../../../flutter/third_party/accessibility/base/win/atl_module.h
-FILE: ../../../flutter/third_party/accessibility/base/win/display.cc
-FILE: ../../../flutter/third_party/accessibility/base/win/display.h
-FILE: ../../../flutter/third_party/accessibility/base/win/display_unittest.cc
-FILE: ../../../flutter/third_party/accessibility/base/win/enum_variant.cc
-FILE: ../../../flutter/third_party/accessibility/base/win/enum_variant.h
-FILE: ../../../flutter/third_party/accessibility/base/win/enum_variant_unittest.cc
-FILE: ../../../flutter/third_party/accessibility/base/win/scoped_bstr.h
-FILE: ../../../flutter/third_party/accessibility/base/win/scoped_variant.h
-FILE: ../../../flutter/third_party/accessibility/base/win/scoped_variant_unittest.cc
-FILE: ../../../flutter/third_party/accessibility/gfx/range/range_unittest.cc
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2011 The Chromium Authors. All rights reserved.
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
 
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
 
-====================================================================================================
-LIBRARY: accessibility
-ORIGIN: ../../../flutter/third_party/accessibility/ax_build/build_config.h + ../../../LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../flutter/third_party/accessibility/ax_build/build_config.h
-FILE: ../../../flutter/third_party/accessibility/base/base_export.h
-FILE: ../../../flutter/third_party/accessibility/gfx/geometry/insets.h
-FILE: ../../../flutter/third_party/accessibility/gfx/geometry/insets_f.cc
-FILE: ../../../flutter/third_party/accessibility/gfx/geometry/insets_f.h
-FILE: ../../../flutter/third_party/accessibility/gfx/geometry/point.cc
-FILE: ../../../flutter/third_party/accessibility/gfx/geometry/point.h
-FILE: ../../../flutter/third_party/accessibility/gfx/geometry/point_conversions.cc
-FILE: ../../../flutter/third_party/accessibility/gfx/geometry/point_conversions.h
-FILE: ../../../flutter/third_party/accessibility/gfx/geometry/point_f.cc
-FILE: ../../../flutter/third_party/accessibility/gfx/geometry/point_f.h
-FILE: ../../../flutter/third_party/accessibility/gfx/geometry/point_unittest.cc
-FILE: ../../../flutter/third_party/accessibility/gfx/geometry/rect.cc
-FILE: ../../../flutter/third_party/accessibility/gfx/geometry/rect.h
-FILE: ../../../flutter/third_party/accessibility/gfx/geometry/rect_conversions.cc
-FILE: ../../../flutter/third_party/accessibility/gfx/geometry/rect_conversions.h
-FILE: ../../../flutter/third_party/accessibility/gfx/geometry/rect_f.cc
-FILE: ../../../flutter/third_party/accessibility/gfx/geometry/rect_f.h
-FILE: ../../../flutter/third_party/accessibility/gfx/geometry/size.cc
-FILE: ../../../flutter/third_party/accessibility/gfx/geometry/size.h
-FILE: ../../../flutter/third_party/accessibility/gfx/geometry/size_conversions.cc
-FILE: ../../../flutter/third_party/accessibility/gfx/geometry/size_conversions.h
-FILE: ../../../flutter/third_party/accessibility/gfx/geometry/size_f.cc
-FILE: ../../../flutter/third_party/accessibility/gfx/geometry/size_f.h
-FILE: ../../../flutter/third_party/accessibility/gfx/geometry/size_unittest.cc
-FILE: ../../../flutter/third_party/accessibility/gfx/geometry/vector2d.cc
-FILE: ../../../flutter/third_party/accessibility/gfx/geometry/vector2d.h
-FILE: ../../../flutter/third_party/accessibility/gfx/geometry/vector2d_conversions.cc
-FILE: ../../../flutter/third_party/accessibility/gfx/geometry/vector2d_conversions.h
-FILE: ../../../flutter/third_party/accessibility/gfx/geometry/vector2d_f.cc
-FILE: ../../../flutter/third_party/accessibility/gfx/geometry/vector2d_f.h
-FILE: ../../../flutter/third_party/accessibility/gfx/geometry/vector2d_unittest.cc
-FILE: ../../../flutter/third_party/accessibility/gfx/native_widget_types.h
-FILE: ../../../flutter/third_party/accessibility/gfx/range/range.cc
-FILE: ../../../flutter/third_party/accessibility/gfx/range/range.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2012 The Chromium Authors. All rights reserved.
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
 
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
 
-====================================================================================================
-LIBRARY: accessibility
-ORIGIN: ../../../flutter/third_party/accessibility/gfx/geometry/rect_unittest.cc + ../../../LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../flutter/third_party/accessibility/gfx/geometry/rect_unittest.cc
-FILE: ../../../flutter/third_party/accessibility/gfx/gfx_export.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2013 The Chromium Authors. All rights reserved.
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
 
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
 
-====================================================================================================
-LIBRARY: accessibility
-ORIGIN: ../../../flutter/third_party/accessibility/base/win/windows_types.h + ../../../LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../flutter/third_party/accessibility/base/win/windows_types.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2014 The Chromium Authors. All rights reserved.
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
 
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
 
-====================================================================================================
-LIBRARY: web_locale_keymap
-ORIGIN: ../../../flutter/third_party/web_locale_keymap/lib/web_locale_keymap/key_mappings.g.dart + ../../../flutter/third_party/web_locale_keymap/License.txt
-TYPE: LicenseType.mit
-FILE: ../../../flutter/third_party/web_locale_keymap/lib/web_locale_keymap.dart
-FILE: ../../../flutter/third_party/web_locale_keymap/lib/web_locale_keymap/key_mappings.g.dart
-FILE: ../../../flutter/third_party/web_locale_keymap/lib/web_locale_keymap/locale_keymap.dart
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2022 Google LLC
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+END OF TERMS AND CONDITIONS
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 ====================================================================================================
 
 ====================================================================================================
-LIBRARY: accessibility
-ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_export.h + ../../../LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../flutter/third_party/accessibility/ax/ax_export.h
-FILE: ../../../flutter/third_party/accessibility/ax/ax_node.cc
-FILE: ../../../flutter/third_party/accessibility/ax/ax_node.h
-FILE: ../../../flutter/third_party/accessibility/ax/ax_node_data.cc
-FILE: ../../../flutter/third_party/accessibility/ax/ax_node_data.h
-FILE: ../../../flutter/third_party/accessibility/ax/ax_tree.cc
-FILE: ../../../flutter/third_party/accessibility/ax/ax_tree.h
-FILE: ../../../flutter/third_party/accessibility/ax/ax_tree_unittest.cc
-FILE: ../../../flutter/third_party/accessibility/ax/ax_tree_update.h
+LIBRARY: perfetto
+ORIGIN: ../../../flutter/third_party/perfetto/LICENSE
+TYPE: LicenseType.apache
+FILE: ../../../flutter/third_party/perfetto/.git-blame-ignore-revs
+FILE: ../../../flutter/third_party/perfetto/Android.bp.extras
+FILE: ../../../flutter/third_party/perfetto/BUILD.extras
+FILE: ../../../flutter/third_party/perfetto/MODULE_LICENSE_APACHE2
+FILE: ../../../flutter/third_party/perfetto/TEST_MAPPING
+FILE: ../../../flutter/third_party/perfetto/buildtools/libcxx_config/__config_site
+FILE: ../../../flutter/third_party/perfetto/docs/_coverpage.md
+FILE: ../../../flutter/third_party/perfetto/docs/analysis/batch-trace-processor.md
+FILE: ../../../flutter/third_party/perfetto/docs/analysis/builtin.md
+FILE: ../../../flutter/third_party/perfetto/docs/analysis/common-queries.md
+FILE: ../../../flutter/third_party/perfetto/docs/analysis/debug-tracks.md
+FILE: ../../../flutter/third_party/perfetto/docs/analysis/metrics.md
+FILE: ../../../flutter/third_party/perfetto/docs/analysis/perfetto-sql-syntax.md
+FILE: ../../../flutter/third_party/perfetto/docs/analysis/pivot-tables.md
+FILE: ../../../flutter/third_party/perfetto/docs/analysis/trace-processor-python.md
+FILE: ../../../flutter/third_party/perfetto/docs/analysis/trace-processor.md
+FILE: ../../../flutter/third_party/perfetto/docs/case-studies/android-boot-tracing.md
+FILE: ../../../flutter/third_party/perfetto/docs/case-studies/memory.md
+FILE: ../../../flutter/third_party/perfetto/docs/concepts/buffers.md
+FILE: ../../../flutter/third_party/perfetto/docs/concepts/clock-sync.md
+FILE: ../../../flutter/third_party/perfetto/docs/concepts/config.md
+FILE: ../../../flutter/third_party/perfetto/docs/concepts/detached-mode.md
+FILE: ../../../flutter/third_party/perfetto/docs/concepts/service-model.md
+FILE: ../../../flutter/third_party/perfetto/docs/contributing/build-instructions.md
+FILE: ../../../flutter/third_party/perfetto/docs/contributing/chrome-branches.md
+FILE: ../../../flutter/third_party/perfetto/docs/contributing/common-tasks.md
+FILE: ../../../flutter/third_party/perfetto/docs/contributing/embedding.md
+FILE: ../../../flutter/third_party/perfetto/docs/contributing/getting-started.md
+FILE: ../../../flutter/third_party/perfetto/docs/contributing/perfetto-in-the-press.md
+FILE: ../../../flutter/third_party/perfetto/docs/contributing/sdk-releasing.md
+FILE: ../../../flutter/third_party/perfetto/docs/contributing/testing.md
+FILE: ../../../flutter/third_party/perfetto/docs/contributing/ui-development.md
+FILE: ../../../flutter/third_party/perfetto/docs/contributing/ui-plugins.md
+FILE: ../../../flutter/third_party/perfetto/docs/data-sources/android-game-intervention-list.md
+FILE: ../../../flutter/third_party/perfetto/docs/data-sources/android-log.md
+FILE: ../../../flutter/third_party/perfetto/docs/data-sources/atrace.md
+FILE: ../../../flutter/third_party/perfetto/docs/data-sources/battery-counters.md
+FILE: ../../../flutter/third_party/perfetto/docs/data-sources/cpu-freq.md
+FILE: ../../../flutter/third_party/perfetto/docs/data-sources/cpu-scheduling.md
+FILE: ../../../flutter/third_party/perfetto/docs/data-sources/frametimeline.md
+FILE: ../../../flutter/third_party/perfetto/docs/data-sources/gpu.md
+FILE: ../../../flutter/third_party/perfetto/docs/data-sources/java-heap-profiler.md
+FILE: ../../../flutter/third_party/perfetto/docs/data-sources/memory-counters.md
+FILE: ../../../flutter/third_party/perfetto/docs/data-sources/native-heap-profiler.md
+FILE: ../../../flutter/third_party/perfetto/docs/data-sources/syscalls.md
+FILE: ../../../flutter/third_party/perfetto/docs/data-sources/system-log.md
+FILE: ../../../flutter/third_party/perfetto/docs/design-docs/api-and-abi.md
+FILE: ../../../flutter/third_party/perfetto/docs/design-docs/batch-trace-processor.md
+FILE: ../../../flutter/third_party/perfetto/docs/design-docs/checkpoint-atoms.md
+FILE: ../../../flutter/third_party/perfetto/docs/design-docs/continuous-integration.md
+FILE: ../../../flutter/third_party/perfetto/docs/design-docs/extensions.md
+FILE: ../../../flutter/third_party/perfetto/docs/design-docs/heapprofd-design.md
+FILE: ../../../flutter/third_party/perfetto/docs/design-docs/heapprofd-sampling.md
+FILE: ../../../flutter/third_party/perfetto/docs/design-docs/heapprofd-wire-protocol.md
+FILE: ../../../flutter/third_party/perfetto/docs/design-docs/life-of-a-tracing-session.md
+FILE: ../../../flutter/third_party/perfetto/docs/design-docs/protozero.md
+FILE: ../../../flutter/third_party/perfetto/docs/design-docs/security-model.md
+FILE: ../../../flutter/third_party/perfetto/docs/faq.md
+FILE: ../../../flutter/third_party/perfetto/docs/images/android_game_interventions.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/android_logs.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/annotation-counter.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/annotation-slice.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/api-and-abi.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/atrace-slices.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/battery-counters-ui.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/battery-counters.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/buffers.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/camera-slices.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/continuous-integration.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/counter-events.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/counters.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/cpu-bar-graphs.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/cpu-frequency.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/cpu-profile-diamond.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/cpu-profile-flame.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/cpu-sched-details.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/cpu-slice-track.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/cpu-zoomed.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/dataflow.svg
+FILE: ../../../flutter/third_party/perfetto/docs/images/debug-slices-random.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/debug-tracks/debug-tracks-create.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/debug-tracks/debug-tracks-query.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/debug-tracks/debug-tracks-result.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/description.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/example_pd_graph.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/flows.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/frametimeline/app-timelines.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/frametimeline/app-vsyncid.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/frametimeline/blue.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/frametimeline/green.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/frametimeline/light-green.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/frametimeline/red.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/frametimeline/select-app-slice.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/frametimeline/select-sf-slice-1.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/frametimeline/select-sf-slice-2.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/frametimeline/selection.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/frametimeline/sf-vsyncid.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/frametimeline/timeline_tracks.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/frametimeline/yellow.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/gpu-counters.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/heap_prof_continuous.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/heapprofd-design/Android-Heap0.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/heapprofd-design/Android-Heap1.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/heapprofd-design/Android-Heap2.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/heapprofd-design/Android-Heap3.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/heapprofd-design/Architecture.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/heapprofd-design/Service.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/heapprofd-design/Shared-Memory0.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/heapprofd-design/shmem-detail.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/heapprofd-design/shmem-overview.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/heapprofd-sampling/conditional-expected-error.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/heapprofd-sampling/expected-error.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/heapprofd-sampling/one-sample.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/java-heap-graph-focus.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/java-heap-graph.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/java-heap-samples.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/latency.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/lmk_lmkd.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/metrics-summary.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/native-flamegraph-focus.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/native-heap-prof-focus.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/native-heap-prof.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/oom-score.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/oop-table-inheritance.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/perfetto-btp-flattening.svg
+FILE: ../../../flutter/third_party/perfetto/docs/images/perfetto-btp-overview.svg
+FILE: ../../../flutter/third_party/perfetto/docs/images/perfetto-stack.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/perfetto-stack.svg
+FILE: ../../../flutter/third_party/perfetto/docs/images/perfetto-ui-channel-autopush-toggle.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/perfetto-ui-channel-toggle.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/perfetto-ui-channel.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/perfetto-ui-disable-metrics.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/perfetto-ui-screenshot.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/perfetto-ui-version.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/pivot-tables/pivot-table-area-selection.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/pivot-tables/pivot-table-design.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/pivot-tables/pivot-table-editor.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/pivot-tables/pivot-table-expanded-cell.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/pivot-tables/pivot-table-query.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/pivot-tables/pivot-table.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/power-rails.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/proc_stat.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/profile-diamond.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/protozero-ssw.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/rail-mode-debug-slices.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/record-trace-chrome.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/record-trace.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/rss_stat_and_mm_event.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/sched-slices.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/shmem-abi-concepts.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/shmem-abi-overview.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/shmem-abi-page.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/shmem-abi-spans.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/slices.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/socket-protocol.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/span-join.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/synthetic-track-event-counter.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/synthetic-track-event-flow.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/synthetic-track-event-process.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/synthetic-track-event-thread.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/sys_stat_counters.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/syscalls.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/thread-states.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/tp-table-inheritance.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/trace-processor.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/trace-rss-camera.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/trace-view.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/trace_config.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/trace_config_buffer_mapping.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/traceconv-summary.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/tracing-categories-chrome.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/tracing-protocol.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/track-events.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/track-timeline.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/tracks.png
+FILE: ../../../flutter/third_party/perfetto/docs/images/userspace.png
+FILE: ../../../flutter/third_party/perfetto/docs/instrumentation/heapprofd-api.md
+FILE: ../../../flutter/third_party/perfetto/docs/instrumentation/interceptors.md
+FILE: ../../../flutter/third_party/perfetto/docs/instrumentation/tracing-sdk.md
+FILE: ../../../flutter/third_party/perfetto/docs/instrumentation/track-events.md
+FILE: ../../../flutter/third_party/perfetto/docs/logo.png
+FILE: ../../../flutter/third_party/perfetto/docs/quickstart/android-tracing.md
+FILE: ../../../flutter/third_party/perfetto/docs/quickstart/callstack-sampling.md
+FILE: ../../../flutter/third_party/perfetto/docs/quickstart/chrome-tracing.md
+FILE: ../../../flutter/third_party/perfetto/docs/quickstart/heap-profiling.md
+FILE: ../../../flutter/third_party/perfetto/docs/quickstart/linux-tracing.md
+FILE: ../../../flutter/third_party/perfetto/docs/quickstart/trace-analysis.md
+FILE: ../../../flutter/third_party/perfetto/docs/quickstart/traceconv.md
+FILE: ../../../flutter/third_party/perfetto/docs/reference/android-version-notes.md
+FILE: ../../../flutter/third_party/perfetto/docs/reference/heap_profile-cli.md
+FILE: ../../../flutter/third_party/perfetto/docs/reference/perfetto-cli.md
+FILE: ../../../flutter/third_party/perfetto/docs/reference/synthetic-track-event.md
+FILE: ../../../flutter/third_party/perfetto/docs/toc.md
+FILE: ../../../flutter/third_party/perfetto/docs/tracing-101.md
+FILE: ../../../flutter/third_party/perfetto/docs/visualization/deep-linking-to-perfetto-ui.md
+FILE: ../../../flutter/third_party/perfetto/docs/visualization/large-traces.md
+FILE: ../../../flutter/third_party/perfetto/docs/visualization/perfetto-ui-release-process.md
+FILE: ../../../flutter/third_party/perfetto/docs/visualization/perfetto-ui.md
+FILE: ../../../flutter/third_party/perfetto/gn/standalone/wasm_typescript_declaration.d.ts
+FILE: ../../../flutter/third_party/perfetto/include/perfetto/tracing/internal/data_source_type.h
+FILE: ../../../flutter/third_party/perfetto/tools/test_data.txt
+FILE: ../../../flutter/third_party/perfetto/ui/config/gn_deprecation_banner.txt
+FILE: ../../../flutter/third_party/perfetto/ui/release/channels.json
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/brand.png
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/favicon.png
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/hiring_banner.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/index.html
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/logo-128.png
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/logo-3d.png
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/rec_atrace.png
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/rec_battery_counters.png
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/rec_board_voltage.png
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/rec_cpu_coarse.png
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/rec_cpu_fine.png
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/rec_cpu_freq.png
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/rec_cpu_voltage.png
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/rec_frame_timeline.png
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/rec_ftrace.png
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/rec_gpu_mem_total.png
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/rec_java_heap_dump.png
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/rec_lmk.png
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/rec_logcat.png
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/rec_long_trace.png
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/rec_mem_hifreq.png
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/rec_meminfo.png
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/rec_native_heap_profiler.png
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/rec_one_shot.png
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/rec_profiling.png
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/rec_ps_stats.png
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/rec_ring_buf.png
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/rec_syscalls.png
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/rec_vmstat.png
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/scheduling_latency.png
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/typefaces.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/assets/widgets/tree.scss
+FILE: ../../../flutter/third_party/perfetto/ui/src/base/array_utils.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/base/bigint_math.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/base/binary_search.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/base/brand.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/base/classnames.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/base/clipboard.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/base/comparison_utils.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/base/deferred.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/base/disposable.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/base/dom_utils.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/base/fuzzy.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/base/generic_set.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/base/hotkeys.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/base/http_utils.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/base/json_utils.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/base/logging.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/base/math_utils.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/base/mithril_utils.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/base/object_utils.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/base/resize_observer.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/base/result.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/base/semantic_icons.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/base/set_utils.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/base/string_utils.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/base/time.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/base/utils.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/base/utils/index.d.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/base/validators.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/chrome_extension/chrome_tracing_controller.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/chrome_extension/devtools_socket.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/chrome_extension/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/chrome_extension/manifest.json
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/actions.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/aggregation_data.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/arg_types.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/array_buffer_builder.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/basic_async_track.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/cache_manager.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/cache_utils.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/canvas_utils.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/channels.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/colorizer.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/commands.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/comparator_builder.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/constants.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/conversion_jobs.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/dragndrop_logic.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/empty_state.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/engine.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/errors.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/event_set.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/event_set_nocompile_test.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/feature_flags.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/flamegraph_util.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/hash.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/high_precision_time.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/http_rpc_engine.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/internal_layout_utils.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/logs.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/metatracing.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/metric_data.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/plugins.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/proto_ring_buffer.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/queries.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/query_result.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/query_utils.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/recordingV2/adb_connection_impl.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/recordingV2/adb_connection_over_websocket.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/recordingV2/adb_connection_over_webusb.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/recordingV2/adb_file_handler.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/recordingV2/auth/adb_auth.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/recordingV2/auth/adb_key_manager.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/recordingV2/auth/credentials_interfaces.d.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/recordingV2/chrome_traced_tracing_session.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/recordingV2/host_os_byte_stream.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/recordingV2/recording_config_utils.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/recordingV2/recording_error_handling.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/recordingV2/recording_interfaces_v2.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/recordingV2/recording_page_controller.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/recordingV2/recording_utils.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/recordingV2/target_factories/android_websocket_target_factory.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/recordingV2/target_factories/android_webusb_target_factory.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/recordingV2/target_factories/chrome_target_factory.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/recordingV2/target_factories/host_os_target_factory.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/recordingV2/target_factories/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/recordingV2/target_factories/virtual_target_factory.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/recordingV2/target_factory_registry.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/recordingV2/targets/android_target.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/recordingV2/targets/android_virtual_target.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/recordingV2/targets/android_websocket_target.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/recordingV2/targets/android_webusb_target.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/recordingV2/targets/chrome_target.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/recordingV2/targets/host_os_target.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/recordingV2/traced_tracing_session.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/recordingV2/websocket_menu_controller.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/registry.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/schema.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/search_data.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/selection_observer.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/state.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/thread_state.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/timestamp_format.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/track_adapter.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/track_data.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/upload_utils.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/viewer.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/wasm_engine_proxy.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/common/worker_messages.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/adb.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/adb_base_controller.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/adb_interfaces.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/adb_jsdomtest.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/adb_record_controller_jsdomtest.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/adb_shell_controller.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/adb_socket_controller.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/aggregation/aggregation_controller.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/aggregation/counter_aggregation_controller.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/aggregation/cpu_aggregation_controller.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/aggregation/cpu_by_process_aggregation_controller.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/aggregation/frame_aggregation_controller.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/aggregation/slice_aggregation_controller.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/aggregation/thread_aggregation_controller.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/app_controller.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/area_selection_handler.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/args_parser.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/chrome_proxy_record_controller.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/consumer_port_types.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/controller.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/cpu_profile_controller.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/flamegraph_controller.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/flow_events_controller.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/ftrace_controller.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/loading_manager.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/logs_controller.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/permalink_controller.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/pivot_table_controller.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/record_config_types.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/record_controller.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/record_controller_interfaces.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/record_controller_jsdomtest.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/search_controller.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/selection_controller.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/trace_controller.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/trace_error_controller.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/trace_stream.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/controller/track_decider.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/core/perf.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/core/protos.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/core/raf_scheduler.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/core/static_initializers.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/core/trace_config_utils.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/engine/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/engine/wasm_bridge.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/aggregation_panel.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/analytics.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/android_bug_tool.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/animation.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/app.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/base_counter_track.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/base_slice_track.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/bottom_tab.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/checkerboard.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/chrome_slice_details_tab.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/clipboard.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/cookie_consent.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/counter_panel.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/cpu_profile_panel.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/css_constants.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/debug.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/details_panel.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/download_utils.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/drag/border_drag_strategy.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/drag/drag_strategy.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/drag/inner_drag_strategy.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/drag/outer_drag_strategy.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/drag_gesture_handler.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/error_dialog.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/file_drop_handler.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/flags_page.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/flamegraph.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/flamegraph_panel.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/flow_events_panel.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/flow_events_renderer.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/frontend_local_state.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/ftrace_panel.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/generic_slice_details_tab.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/globals.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/gridline_helper.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/help_modal.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/home_page.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/hsluv_cache.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/insights_page.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/keyboard_event_handler.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/keyboard_layout_map.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/legacy_trace_viewer.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/live_reload.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/logs_filters.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/logs_panel.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/metrics_page.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/modal.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/named_slice_track.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/notes_panel.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/omnibox.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/overview_timeline_panel.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/pages.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/pan_and_zoom_handler.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/panel.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/panel_container.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/pivot_table.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/pivot_table_argument_popup.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/pivot_table_query_generator.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/pivot_table_types.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/popup_menu.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/post_message_handler.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/publish.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/query_history.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/query_page.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/query_result_tab.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/query_table.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/rate_limiters.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/record_config.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/record_page.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/record_page_v2.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/record_widgets.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/recording/advanced_settings.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/recording/android_settings.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/recording/chrome_settings.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/recording/cpu_settings.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/recording/gpu_settings.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/recording/linux_perf_settings.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/recording/memory_settings.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/recording/power_settings.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/recording/recording_multiple_choice.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/recording/recording_sections.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/recording/recording_settings.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/recording/recording_ui_utils.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/recording/reset_interface_modal.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/recording/reset_target_modal.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/reorderable_cells.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/router.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/rpc_http_dialog.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/scroll_helper.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/search_handler.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/service_worker_controller.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/sidebar.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/slice.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/slice_args.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/slice_details.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/slice_details_panel.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/slice_layout.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/slice_panel.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/slice_track_base.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/sql/args.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/sql/slice.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/sql/thread_state.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/sql_table/argument_selector.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/sql_table/column.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/sql_table/render_cell.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/sql_table/state.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/sql_table/tab.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/sql_table/table.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/sql_table/table_description.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/sql_table/well_known_tables.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/sql_types.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/sql_utils.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/store.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/tables/attribute_modal_holder.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/tables/table.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/tables/table_showcase.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/task_tracker.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/thread_and_process_info.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/thread_state.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/thread_state_tab.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/tickmark_panel.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/time_axis_panel.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/time_scale.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/time_selection_panel.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/topbar.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/trace_attrs.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/trace_converter.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/trace_info_page.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/trace_url_handler.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/track.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/track_cache.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/track_group_panel.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/track_panel.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/track_registry.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/value.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/vertical_line_helper.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/viewer_page.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/viz_page.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/widgets/timestamp.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/widgets/vega_view.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/frontend/widgets_page.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/plugins/com.example.Skeleton/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/plugins/dev.perfetto.AndroidBinderViz/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/plugins/dev.perfetto.AndroidCujs/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/plugins/dev.perfetto.AndroidPerf/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/plugins/dev.perfetto.CoreCommands/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/plugins/dev.perfetto.ExampleSimpleCommand/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/plugins/dev.perfetto.ExampleState/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/plugins/dev.perfetto.LargeScreensPerf/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/public/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/public/utils.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/service_worker/service_worker.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/service_worker/tsconfig.json
+FILE: ../../../flutter/third_party/perfetto/ui/src/traceconv/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/actual_frames/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/android_log/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/annotation/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/async_slices/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/chrome_critical_user_interactions/details_panel.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/chrome_critical_user_interactions/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/chrome_scroll_jank/chrome_tasks_scroll_jank_track.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/chrome_scroll_jank/event_latency_details_panel.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/chrome_scroll_jank/event_latency_track.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/chrome_scroll_jank/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/chrome_scroll_jank/jank_colors.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/chrome_scroll_jank/scroll_delta_graph.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/chrome_scroll_jank/scroll_details_panel.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/chrome_scroll_jank/scroll_jank_slice.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/chrome_scroll_jank/scroll_jank_v3_details_panel.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/chrome_scroll_jank/scroll_jank_v3_track.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/chrome_scroll_jank/scroll_track.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/chrome_slices/generic_slice_track.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/chrome_slices/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/counter/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/cpu_freq/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/cpu_profile/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/cpu_slices/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/custom_sql_table_slices/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/debug/add_debug_track_menu.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/debug/counter_track.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/debug/details_tab.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/debug/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/debug/slice_track.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/expected_frames/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/ftrace/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/heap_profile/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/null_track/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/perf_samples_profile/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/process_summary/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/process_summary/process_scheduling_track.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/process_summary/process_summary_track.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/screenshots/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/screenshots/screenshot_panel.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/thread_state/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/thread_state/thread_state_track_v2.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/thread_state/thread_state_v2.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/tracks/visualised_args/index.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/widgets/anchor.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/widgets/basic_table.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/widgets/button.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/widgets/callout.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/widgets/checkbox.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/widgets/details_shell.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/widgets/duration.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/widgets/editor.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/widgets/empty_state.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/widgets/error.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/widgets/form.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/widgets/grid_layout.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/widgets/hotkey_context.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/widgets/hotkey_glyphs.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/widgets/icon.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/widgets/menu.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/widgets/multiselect.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/widgets/popup.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/widgets/portal.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/widgets/raf.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/widgets/section.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/widgets/select.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/widgets/spinner.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/widgets/sql_ref.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/widgets/switch.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/widgets/text_input.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/widgets/text_paragraph.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/widgets/tree.ts
+FILE: ../../../flutter/third_party/perfetto/ui/src/widgets/virtual_scroll_container.ts
+FILE: ../../../flutter/third_party/perfetto/ui/tsconfig.base.json
+FILE: ../../../flutter/third_party/perfetto/ui/tsconfig.json
 ----------------------------------------------------------------------------------------------------
-Copyright 2013 The Chromium Authors. All rights reserved.
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+1. Definitions.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
 
-====================================================================================================
-LIBRARY: accessibility
-LIBRARY: engine
-LIBRARY: tonic
-LIBRARY: txt
-LIBRARY: web_unicode
-ORIGIN: ../../../flutter/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../flutter/.clang-tidy
-FILE: ../../../flutter/.pylintrc
-FILE: ../../../flutter/.style.yapf
-FILE: ../../../flutter/DEPS
-FILE: ../../../flutter/assets/asset_manager.cc
-FILE: ../../../flutter/assets/asset_manager.h
-FILE: ../../../flutter/assets/asset_resolver.h
-FILE: ../../../flutter/assets/directory_asset_bundle.cc
-FILE: ../../../flutter/assets/directory_asset_bundle.h
-FILE: ../../../flutter/benchmarking/benchmarking.cc
-FILE: ../../../flutter/benchmarking/benchmarking.h
-FILE: ../../../flutter/benchmarking/library.cc
-FILE: ../../../flutter/benchmarking/library.h
-FILE: ../../../flutter/common/constants.h
-FILE: ../../../flutter/common/exported_symbols.sym
-FILE: ../../../flutter/common/exported_symbols_mac.sym
-FILE: ../../../flutter/common/graphics/gl_context_switch.cc
-FILE: ../../../flutter/common/graphics/gl_context_switch.h
-FILE: ../../../flutter/common/graphics/msaa_sample_count.h
-FILE: ../../../flutter/common/graphics/persistent_cache.cc
-FILE: ../../../flutter/common/graphics/persistent_cache.h
-FILE: ../../../flutter/common/graphics/texture.cc
-FILE: ../../../flutter/common/graphics/texture.h
-FILE: ../../../flutter/common/settings.cc
-FILE: ../../../flutter/common/settings.h
-FILE: ../../../flutter/common/task_runners.cc
-FILE: ../../../flutter/common/task_runners.h
-FILE: ../../../flutter/display_list/display_list.cc
-FILE: ../../../flutter/display_list/display_list.h
-FILE: ../../../flutter/display_list/display_list_attributes.h
-FILE: ../../../flutter/display_list/display_list_attributes_testing.h
-FILE: ../../../flutter/display_list/display_list_benchmarks.cc
-FILE: ../../../flutter/display_list/display_list_benchmarks.h
-FILE: ../../../flutter/display_list/display_list_benchmarks_canvas_provider.h
-FILE: ../../../flutter/display_list/display_list_benchmarks_gl.cc
-FILE: ../../../flutter/display_list/display_list_benchmarks_gl.h
-FILE: ../../../flutter/display_list/display_list_benchmarks_metal.cc
-FILE: ../../../flutter/display_list/display_list_benchmarks_metal.h
-FILE: ../../../flutter/display_list/display_list_benchmarks_software.cc
-FILE: ../../../flutter/display_list/display_list_benchmarks_software.h
-FILE: ../../../flutter/display_list/display_list_blend_mode.cc
-FILE: ../../../flutter/display_list/display_list_blend_mode.h
-FILE: ../../../flutter/display_list/display_list_builder.cc
-FILE: ../../../flutter/display_list/display_list_builder.h
-FILE: ../../../flutter/display_list/display_list_builder_benchmarks.cc
-FILE: ../../../flutter/display_list/display_list_builder_multiplexer.cc
-FILE: ../../../flutter/display_list/display_list_builder_multiplexer.h
-FILE: ../../../flutter/display_list/display_list_canvas_dispatcher.cc
-FILE: ../../../flutter/display_list/display_list_canvas_dispatcher.h
-FILE: ../../../flutter/display_list/display_list_canvas_recorder.cc
-FILE: ../../../flutter/display_list/display_list_canvas_recorder.h
-FILE: ../../../flutter/display_list/display_list_canvas_unittests.cc
-FILE: ../../../flutter/display_list/display_list_color.h
-FILE: ../../../flutter/display_list/display_list_color_filter.cc
-FILE: ../../../flutter/display_list/display_list_color_filter.h
-FILE: ../../../flutter/display_list/display_list_color_filter_unittests.cc
-FILE: ../../../flutter/display_list/display_list_color_source.cc
-FILE: ../../../flutter/display_list/display_list_color_source.h
-FILE: ../../../flutter/display_list/display_list_color_source_unittests.cc
-FILE: ../../../flutter/display_list/display_list_color_unittests.cc
-FILE: ../../../flutter/display_list/display_list_comparable.h
-FILE: ../../../flutter/display_list/display_list_complexity.cc
-FILE: ../../../flutter/display_list/display_list_complexity.h
-FILE: ../../../flutter/display_list/display_list_complexity_gl.cc
-FILE: ../../../flutter/display_list/display_list_complexity_gl.h
-FILE: ../../../flutter/display_list/display_list_complexity_helper.h
-FILE: ../../../flutter/display_list/display_list_complexity_metal.cc
-FILE: ../../../flutter/display_list/display_list_complexity_metal.h
-FILE: ../../../flutter/display_list/display_list_complexity_unittests.cc
-FILE: ../../../flutter/display_list/display_list_dispatcher.cc
-FILE: ../../../flutter/display_list/display_list_dispatcher.h
-FILE: ../../../flutter/display_list/display_list_enum_unittests.cc
-FILE: ../../../flutter/display_list/display_list_flags.cc
-FILE: ../../../flutter/display_list/display_list_flags.h
-FILE: ../../../flutter/display_list/display_list_image.cc
-FILE: ../../../flutter/display_list/display_list_image.h
-FILE: ../../../flutter/display_list/display_list_image_filter.cc
-FILE: ../../../flutter/display_list/display_list_image_filter.h
-FILE: ../../../flutter/display_list/display_list_image_filter_unittests.cc
-FILE: ../../../flutter/display_list/display_list_image_skia.cc
-FILE: ../../../flutter/display_list/display_list_image_skia.h
-FILE: ../../../flutter/display_list/display_list_mask_filter.cc
-FILE: ../../../flutter/display_list/display_list_mask_filter.h
-FILE: ../../../flutter/display_list/display_list_mask_filter_unittests.cc
-FILE: ../../../flutter/display_list/display_list_matrix_clip_tracker.cc
-FILE: ../../../flutter/display_list/display_list_matrix_clip_tracker.h
-FILE: ../../../flutter/display_list/display_list_matrix_clip_tracker_unittests.cc
-FILE: ../../../flutter/display_list/display_list_ops.cc
-FILE: ../../../flutter/display_list/display_list_ops.h
-FILE: ../../../flutter/display_list/display_list_paint.cc
-FILE: ../../../flutter/display_list/display_list_paint.h
-FILE: ../../../flutter/display_list/display_list_paint_unittests.cc
-FILE: ../../../flutter/display_list/display_list_path_effect.cc
-FILE: ../../../flutter/display_list/display_list_path_effect.h
-FILE: ../../../flutter/display_list/display_list_path_effect_unittests.cc
-FILE: ../../../flutter/display_list/display_list_rtree.cc
-FILE: ../../../flutter/display_list/display_list_rtree.h
-FILE: ../../../flutter/display_list/display_list_runtime_effect.cc
-FILE: ../../../flutter/display_list/display_list_runtime_effect.h
-FILE: ../../../flutter/display_list/display_list_sampling_options.h
-FILE: ../../../flutter/display_list/display_list_test_utils.cc
-FILE: ../../../flutter/display_list/display_list_test_utils.h
-FILE: ../../../flutter/display_list/display_list_tile_mode.h
-FILE: ../../../flutter/display_list/display_list_unittests.cc
-FILE: ../../../flutter/display_list/display_list_utils.cc
-FILE: ../../../flutter/display_list/display_list_utils.h
-FILE: ../../../flutter/display_list/display_list_utils_unittests.cc
-FILE: ../../../flutter/display_list/display_list_vertices.cc
-FILE: ../../../flutter/display_list/display_list_vertices.h
-FILE: ../../../flutter/display_list/display_list_vertices_unittests.cc
-FILE: ../../../flutter/display_list/types.h
-FILE: ../../../flutter/flow/compositor_context.cc
-FILE: ../../../flutter/flow/compositor_context.h
-FILE: ../../../flutter/flow/diff_context.cc
-FILE: ../../../flutter/flow/diff_context.h
-FILE: ../../../flutter/flow/diff_context_unittests.cc
-FILE: ../../../flutter/flow/embedded_view_params_unittests.cc
-FILE: ../../../flutter/flow/embedded_views.cc
-FILE: ../../../flutter/flow/embedded_views.h
-FILE: ../../../flutter/flow/flow_run_all_unittests.cc
-FILE: ../../../flutter/flow/flow_test_utils.cc
-FILE: ../../../flutter/flow/flow_test_utils.h
-FILE: ../../../flutter/flow/frame_timings.cc
-FILE: ../../../flutter/flow/frame_timings.h
-FILE: ../../../flutter/flow/frame_timings_recorder_unittests.cc
-FILE: ../../../flutter/flow/gl_context_switch_unittests.cc
-FILE: ../../../flutter/flow/instrumentation.cc
-FILE: ../../../flutter/flow/instrumentation.h
-FILE: ../../../flutter/flow/instrumentation_unittests.cc
-FILE: ../../../flutter/flow/layer_snapshot_store.cc
-FILE: ../../../flutter/flow/layer_snapshot_store.h
-FILE: ../../../flutter/flow/layers/backdrop_filter_layer.cc
-FILE: ../../../flutter/flow/layers/backdrop_filter_layer.h
-FILE: ../../../flutter/flow/layers/backdrop_filter_layer_unittests.cc
-FILE: ../../../flutter/flow/layers/cacheable_layer.cc
-FILE: ../../../flutter/flow/layers/cacheable_layer.h
-FILE: ../../../flutter/flow/layers/checkerboard_layertree_unittests.cc
-FILE: ../../../flutter/flow/layers/clip_path_layer.cc
-FILE: ../../../flutter/flow/layers/clip_path_layer.h
-FILE: ../../../flutter/flow/layers/clip_path_layer_unittests.cc
-FILE: ../../../flutter/flow/layers/clip_rect_layer.cc
-FILE: ../../../flutter/flow/layers/clip_rect_layer.h
-FILE: ../../../flutter/flow/layers/clip_rect_layer_unittests.cc
-FILE: ../../../flutter/flow/layers/clip_rrect_layer.cc
-FILE: ../../../flutter/flow/layers/clip_rrect_layer.h
-FILE: ../../../flutter/flow/layers/clip_rrect_layer_unittests.cc
-FILE: ../../../flutter/flow/layers/clip_shape_layer.h
-FILE: ../../../flutter/flow/layers/color_filter_layer.cc
-FILE: ../../../flutter/flow/layers/color_filter_layer.h
-FILE: ../../../flutter/flow/layers/color_filter_layer_unittests.cc
-FILE: ../../../flutter/flow/layers/container_layer.cc
-FILE: ../../../flutter/flow/layers/container_layer.h
-FILE: ../../../flutter/flow/layers/container_layer_unittests.cc
-FILE: ../../../flutter/flow/layers/display_list_layer.cc
-FILE: ../../../flutter/flow/layers/display_list_layer.h
-FILE: ../../../flutter/flow/layers/display_list_layer_unittests.cc
-FILE: ../../../flutter/flow/layers/display_list_raster_cache_item.cc
-FILE: ../../../flutter/flow/layers/display_list_raster_cache_item.h
-FILE: ../../../flutter/flow/layers/image_filter_layer.cc
-FILE: ../../../flutter/flow/layers/image_filter_layer.h
-FILE: ../../../flutter/flow/layers/image_filter_layer_unittests.cc
-FILE: ../../../flutter/flow/layers/layer.cc
-FILE: ../../../flutter/flow/layers/layer.h
-FILE: ../../../flutter/flow/layers/layer_raster_cache_item.cc
-FILE: ../../../flutter/flow/layers/layer_raster_cache_item.h
-FILE: ../../../flutter/flow/layers/layer_state_stack.cc
-FILE: ../../../flutter/flow/layers/layer_state_stack.h
-FILE: ../../../flutter/flow/layers/layer_state_stack_unittests.cc
-FILE: ../../../flutter/flow/layers/layer_tree.cc
-FILE: ../../../flutter/flow/layers/layer_tree.h
-FILE: ../../../flutter/flow/layers/layer_tree_unittests.cc
-FILE: ../../../flutter/flow/layers/offscreen_surface.cc
-FILE: ../../../flutter/flow/layers/offscreen_surface.h
-FILE: ../../../flutter/flow/layers/offscreen_surface_unittests.cc
-FILE: ../../../flutter/flow/layers/opacity_layer.cc
-FILE: ../../../flutter/flow/layers/opacity_layer.h
-FILE: ../../../flutter/flow/layers/opacity_layer_unittests.cc
-FILE: ../../../flutter/flow/layers/performance_overlay_layer.cc
-FILE: ../../../flutter/flow/layers/performance_overlay_layer.h
-FILE: ../../../flutter/flow/layers/performance_overlay_layer_unittests.cc
-FILE: ../../../flutter/flow/layers/physical_shape_layer.cc
-FILE: ../../../flutter/flow/layers/physical_shape_layer.h
-FILE: ../../../flutter/flow/layers/physical_shape_layer_unittests.cc
-FILE: ../../../flutter/flow/layers/platform_view_layer.cc
-FILE: ../../../flutter/flow/layers/platform_view_layer.h
-FILE: ../../../flutter/flow/layers/platform_view_layer_unittests.cc
-FILE: ../../../flutter/flow/layers/shader_mask_layer.cc
-FILE: ../../../flutter/flow/layers/shader_mask_layer.h
-FILE: ../../../flutter/flow/layers/shader_mask_layer_unittests.cc
-FILE: ../../../flutter/flow/layers/texture_layer.cc
-FILE: ../../../flutter/flow/layers/texture_layer.h
-FILE: ../../../flutter/flow/layers/texture_layer_unittests.cc
-FILE: ../../../flutter/flow/layers/transform_layer.cc
-FILE: ../../../flutter/flow/layers/transform_layer.h
-FILE: ../../../flutter/flow/layers/transform_layer_unittests.cc
-FILE: ../../../flutter/flow/mutators_stack_unittests.cc
-FILE: ../../../flutter/flow/paint_region.cc
-FILE: ../../../flutter/flow/paint_region.h
-FILE: ../../../flutter/flow/paint_utils.cc
-FILE: ../../../flutter/flow/paint_utils.h
-FILE: ../../../flutter/flow/raster_cache.cc
-FILE: ../../../flutter/flow/raster_cache.h
-FILE: ../../../flutter/flow/raster_cache_item.h
-FILE: ../../../flutter/flow/raster_cache_key.cc
-FILE: ../../../flutter/flow/raster_cache_key.h
-FILE: ../../../flutter/flow/raster_cache_unittests.cc
-FILE: ../../../flutter/flow/raster_cache_util.cc
-FILE: ../../../flutter/flow/raster_cache_util.h
-FILE: ../../../flutter/flow/rtree.cc
-FILE: ../../../flutter/flow/rtree.h
-FILE: ../../../flutter/flow/rtree_unittests.cc
-FILE: ../../../flutter/flow/skia_gpu_object.h
-FILE: ../../../flutter/flow/skia_gpu_object_unittests.cc
-FILE: ../../../flutter/flow/surface.cc
-FILE: ../../../flutter/flow/surface.h
-FILE: ../../../flutter/flow/surface_frame.cc
-FILE: ../../../flutter/flow/surface_frame.h
-FILE: ../../../flutter/flow/surface_frame_unittests.cc
-FILE: ../../../flutter/flow/texture_unittests.cc
-FILE: ../../../flutter/flutter_vma/flutter_skia_vma.cc
-FILE: ../../../flutter/flutter_vma/flutter_skia_vma.h
-FILE: ../../../flutter/flutter_vma/flutter_vma.cc
-FILE: ../../../flutter/flutter_vma/flutter_vma.h
-FILE: ../../../flutter/fml/ascii_trie.cc
-FILE: ../../../flutter/fml/ascii_trie.h
-FILE: ../../../flutter/fml/ascii_trie_unittests.cc
-FILE: ../../../flutter/fml/backtrace.cc
-FILE: ../../../flutter/fml/backtrace.h
-FILE: ../../../flutter/fml/backtrace_stub.cc
-FILE: ../../../flutter/fml/backtrace_unittests.cc
-FILE: ../../../flutter/fml/base32.cc
-FILE: ../../../flutter/fml/base32.h
-FILE: ../../../flutter/fml/base32_unittest.cc
-FILE: ../../../flutter/fml/build_config.h
-FILE: ../../../flutter/fml/closure.h
-FILE: ../../../flutter/fml/command_line.cc
-FILE: ../../../flutter/fml/command_line.h
-FILE: ../../../flutter/fml/command_line_unittest.cc
-FILE: ../../../flutter/fml/compiler_specific.h
-FILE: ../../../flutter/fml/concurrent_message_loop.cc
-FILE: ../../../flutter/fml/concurrent_message_loop.h
-FILE: ../../../flutter/fml/container.h
-FILE: ../../../flutter/fml/container_unittests.cc
-FILE: ../../../flutter/fml/dart/dart_converter.cc
-FILE: ../../../flutter/fml/dart/dart_converter.h
-FILE: ../../../flutter/fml/delayed_task.cc
-FILE: ../../../flutter/fml/delayed_task.h
-FILE: ../../../flutter/fml/eintr_wrapper.h
-FILE: ../../../flutter/fml/endianness.cc
-FILE: ../../../flutter/fml/endianness.h
-FILE: ../../../flutter/fml/endianness_unittests.cc
-FILE: ../../../flutter/fml/file.cc
-FILE: ../../../flutter/fml/file.h
-FILE: ../../../flutter/fml/file_unittest.cc
-FILE: ../../../flutter/fml/hash_combine.h
-FILE: ../../../flutter/fml/hash_combine_unittests.cc
-FILE: ../../../flutter/fml/hex_codec.cc
-FILE: ../../../flutter/fml/hex_codec.h
-FILE: ../../../flutter/fml/hex_codec_unittest.cc
-FILE: ../../../flutter/fml/icu_util.cc
-FILE: ../../../flutter/fml/icu_util.h
-FILE: ../../../flutter/fml/log_level.h
-FILE: ../../../flutter/fml/log_settings.cc
-FILE: ../../../flutter/fml/log_settings.h
-FILE: ../../../flutter/fml/log_settings_state.cc
-FILE: ../../../flutter/fml/logging.cc
-FILE: ../../../flutter/fml/logging.h
-FILE: ../../../flutter/fml/logging_unittests.cc
-FILE: ../../../flutter/fml/macros.h
-FILE: ../../../flutter/fml/make_copyable.h
-FILE: ../../../flutter/fml/mapping.cc
-FILE: ../../../flutter/fml/mapping.h
-FILE: ../../../flutter/fml/mapping_unittests.cc
-FILE: ../../../flutter/fml/math.h
-FILE: ../../../flutter/fml/math_unittests.cc
-FILE: ../../../flutter/fml/memory/ref_counted.h
-FILE: ../../../flutter/fml/memory/ref_counted_internal.h
-FILE: ../../../flutter/fml/memory/ref_counted_unittest.cc
-FILE: ../../../flutter/fml/memory/ref_ptr.h
-FILE: ../../../flutter/fml/memory/ref_ptr_internal.h
-FILE: ../../../flutter/fml/memory/task_runner_checker.cc
-FILE: ../../../flutter/fml/memory/task_runner_checker.h
-FILE: ../../../flutter/fml/memory/task_runner_checker_unittest.cc
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+Copyright (c) 2017, The Android Open Source Project
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: abseil-cpp
+ORIGIN: ../../../flutter/third_party/abseil-cpp/LICENSE
+TYPE: LicenseType.apache
+FILE: ../../../flutter/third_party/abseil-cpp/PrivacyInfo.xcprivacy
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/stacktrace_aarch64-inl.inc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/debugging/internal/stacktrace_unimplemented-inl.inc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/flags/flag_benchmark.lds
+FILE: ../../../flutter/third_party/abseil-cpp/absl/random/gaussian_distribution.cc
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/internal/cctz/src/tzfile.h
+FILE: ../../../flutter/third_party/abseil-cpp/absl/time/internal/get_current_time_posix.inc
+FILE: ../../../flutter/third_party/abseil-cpp/patches/0001-Turn-on-hardened-mode.patch
+FILE: ../../../flutter/third_party/abseil-cpp/patches/0002-delete-unprefixed-annotations.patch
+FILE: ../../../flutter/third_party/abseil-cpp/patches/0003-delete-static-initializer-in-stacktrace.patch
+FILE: ../../../flutter/third_party/abseil-cpp/patches/0004-keep-transitive-include.patch
+FILE: ../../../flutter/third_party/abseil-cpp/symbols_arm64_dbg.def
+FILE: ../../../flutter/third_party/abseil-cpp/symbols_arm64_rel.def
+FILE: ../../../flutter/third_party/abseil-cpp/symbols_x64_dbg.def
+FILE: ../../../flutter/third_party/abseil-cpp/symbols_x64_rel.def
+FILE: ../../../flutter/third_party/abseil-cpp/symbols_x64_rel_asan.def
+FILE: ../../../flutter/third_party/abseil-cpp/symbols_x86_dbg.def
+FILE: ../../../flutter/third_party/abseil-cpp/symbols_x86_rel.def
+----------------------------------------------------------------------------------------------------
+Apache License
+Version 2.0, January 2004
+https://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libpng
+ORIGIN: ../../../flutter/third_party/libpng/LICENSE
+ORIGIN: ../../../flutter/third_party/libpng/png.h
+TYPE: LicenseType.libpng
+FILE: ../../../flutter/third_party/libpng/arm/arm_init.c
+FILE: ../../../flutter/third_party/libpng/arm/filter_neon.S
+FILE: ../../../flutter/third_party/libpng/arm/filter_neon_intrinsics.c
+FILE: ../../../flutter/third_party/libpng/arm/palette_neon_intrinsics.c
+FILE: ../../../flutter/third_party/libpng/config.h.in
+FILE: ../../../flutter/third_party/libpng/example.c
+FILE: ../../../flutter/third_party/libpng/intel/filter_sse2_intrinsics.c
+FILE: ../../../flutter/third_party/libpng/intel/intel_init.c
+FILE: ../../../flutter/third_party/libpng/libpng.pc.in
+FILE: ../../../flutter/third_party/libpng/png.c
+FILE: ../../../flutter/third_party/libpng/png.h
+FILE: ../../../flutter/third_party/libpng/pngbar.jpg
+FILE: ../../../flutter/third_party/libpng/pngbar.png
+FILE: ../../../flutter/third_party/libpng/pngconf.h
+FILE: ../../../flutter/third_party/libpng/pngdebug.h
+FILE: ../../../flutter/third_party/libpng/pngerror.c
+FILE: ../../../flutter/third_party/libpng/pngget.c
+FILE: ../../../flutter/third_party/libpng/pnginfo.h
+FILE: ../../../flutter/third_party/libpng/pnglibconf.h
+FILE: ../../../flutter/third_party/libpng/pngmem.c
+FILE: ../../../flutter/third_party/libpng/pngnow.png
+FILE: ../../../flutter/third_party/libpng/pngpread.c
+FILE: ../../../flutter/third_party/libpng/pngprefix.h
+FILE: ../../../flutter/third_party/libpng/pngpriv.h
+FILE: ../../../flutter/third_party/libpng/pngread.c
+FILE: ../../../flutter/third_party/libpng/pngrio.c
+FILE: ../../../flutter/third_party/libpng/pngrtran.c
+FILE: ../../../flutter/third_party/libpng/pngrutil.c
+FILE: ../../../flutter/third_party/libpng/pngset.c
+FILE: ../../../flutter/third_party/libpng/pngstruct.h
+FILE: ../../../flutter/third_party/libpng/pngtest.c
+FILE: ../../../flutter/third_party/libpng/pngtest.png
+FILE: ../../../flutter/third_party/libpng/pngtrans.c
+FILE: ../../../flutter/third_party/libpng/pngusr.dfa
+FILE: ../../../flutter/third_party/libpng/pngwio.c
+FILE: ../../../flutter/third_party/libpng/pngwrite.c
+FILE: ../../../flutter/third_party/libpng/pngwtran.c
+FILE: ../../../flutter/third_party/libpng/pngwutil.c
+----------------------------------------------------------------------------------------------------
+COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
+=========================================
+
+PNG Reference Library License version 2
+---------------------------------------
+
+* Copyright (c) 1995-2019 The PNG Reference Library Authors.
+* Copyright (c) 2018-2019 Cosmin Truta.
+* Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
+* Copyright (c) 1996-1997 Andreas Dilger.
+* Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
+
+The software is supplied "as is", without warranty of any kind,
+express or implied, including, without limitation, the warranties
+of merchantability, fitness for a particular purpose, title, and
+non-infringement.  In no event shall the Copyright owners, or
+anyone distributing the software, be liable for any damages or
+other liability, whether in contract, tort or otherwise, arising
+from, out of, or in connection with the software, or the use or
+other dealings in the software, even if advised of the possibility
+of such damage.
+
+Permission is hereby granted to use, copy, modify, and distribute
+this software, or portions hereof, for any purpose, without fee,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you
+    must not claim that you wrote the original software.  If you
+    use this software in a product, an acknowledgment in the product
+    documentation would be appreciated, but is not required.
+
+2. Altered source versions must be plainly marked as such, and must
+    not be misrepresented as being the original software.
+
+3. This Copyright notice may not be removed or altered from any
+    source or altered source distribution.
+
+
+PNG Reference Library License version 1 (for libpng 0.5 through 1.6.35)
+-----------------------------------------------------------------------
+
+libpng versions 1.0.7, July 1, 2000, through 1.6.35, July 15, 2018 are
+Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are
+derived from libpng-1.0.6, and are distributed according to the same
+disclaimer and license as libpng-1.0.6 with the following individuals
+added to the list of Contributing Authors:
+
+    Simon-Pierre Cadieux
+    Eric S. Raymond
+    Mans Rullgard
+    Cosmin Truta
+    Gilles Vollant
+    James Yu
+    Mandar Sahastrabuddhe
+    Google Inc.
+    Vadim Barkov
+
+and with the following additions to the disclaimer:
+
+    There is no warranty against interference with your enjoyment of
+    the library or against infringement.  There is no warranty that our
+    efforts or the library will fulfill any of your particular purposes
+    or needs.  This library is provided with all faults, and the entire
+    risk of satisfactory quality, performance, accuracy, and effort is
+    with the user.
+
+Some files in the "contrib" directory and some configure-generated
+files that are distributed with libpng have other copyright owners, and
+are released under other open source licenses.
+
+libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
+Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
+libpng-0.96, and are distributed according to the same disclaimer and
+license as libpng-0.96, with the following individuals added to the
+list of Contributing Authors:
+
+    Tom Lane
+    Glenn Randers-Pehrson
+    Willem van Schaik
+
+libpng versions 0.89, June 1996, through 0.96, May 1997, are
+Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
+and are distributed according to the same disclaimer and license as
+libpng-0.88, with the following individuals added to the list of
+Contributing Authors:
+
+    John Bowler
+    Kevin Bracey
+    Sam Bushell
+    Magnus Holmgren
+    Greg Roelofs
+    Tom Tanner
+
+Some files in the "scripts" directory have other copyright owners,
+but are released under this license.
+
+libpng versions 0.5, May 1995, through 0.88, January 1996, are
+Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
+
+For the purposes of this copyright and license, "Contributing Authors"
+is defined as the following set of individuals:
+
+    Andreas Dilger
+    Dave Martindale
+    Guy Eric Schalnat
+    Paul Schmidt
+    Tim Wegner
+
+The PNG Reference Library is supplied "AS IS".  The Contributing
+Authors and Group 42, Inc. disclaim all warranties, expressed or
+implied, including, without limitation, the warranties of
+merchantability and of fitness for any purpose.  The Contributing
+Authors and Group 42, Inc. assume no liability for direct, indirect,
+incidental, special, exemplary, or consequential damages, which may
+result from the use of the PNG Reference Library, even if advised of
+the possibility of such damage.
+
+Permission is hereby granted to use, copy, modify, and distribute this
+source code, or portions hereof, for any purpose, without fee, subject
+to the following restrictions:
+
+1. The origin of this source code must not be misrepresented.
+
+2. Altered versions must be plainly marked as such and must not
+    be misrepresented as being the original source.
+
+3. This Copyright notice may not be removed or altered from any
+    source or altered source distribution.
+
+The Contributing Authors and Group 42, Inc. specifically permit,
+without fee, and encourage the use of this source code as a component
+to supporting the PNG file format in commercial products.  If you use
+this source code in a product, acknowledgment is not required but would
+be appreciated.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libjpeg-turbo
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/rdcolmap.c
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/rdppm.c
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/rdcolmap.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/rdppm.c
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1988 by Jef Poskanzer.
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted, provided
+that the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.  This software is provided "as is" without express or
+implied warranty.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libjpeg-turbo
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/wrgif.c
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/wrgif.c
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1989 by Jef Poskanzer.
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted, provided
+that the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.  This software is provided "as is" without express or
+implied warranty.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/obj/obj_dat.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/bn.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/nid.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/pem.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/obj/obj_dat.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/bn.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/nid.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/pem.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+All rights reserved.
+
+This package is an SSL implementation written
+by Eric Young (eay@cryptsoft.com).
+The implementation was written so as to conform with Netscapes SSL.
+
+This library is free for commercial and non-commercial use as long as
+the following conditions are aheared to.  The following conditions
+apply to all code found in this distribution, be it the RC4, RSA,
+lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+included with this distribution is covered by the same copyright terms
+except that the holder is Tim Hudson (tjh@cryptsoft.com).
+
+Copyright remains Eric Young's, and as such any Copyright notices in
+the code are not to be removed.
+If this package is used in a product, Eric Young should be given attribution
+as the author of the parts of the library used.
+This can be in the form of a textual message at program startup or
+in documentation (online or textual) provided with the package.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. All advertising materials mentioning features or use of this software
+   must display the following acknowledgement:
+   "This product includes cryptographic software written by
+    Eric Young (eay@cryptsoft.com)"
+   The word 'cryptographic' can be left out if the rouines from the library
+   being used are not cryptographic related :-).
+4. If you include any Windows specific code (or a derivative thereof) from
+   the apps directory (application code) you must include an acknowledgement:
+   "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+
+THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+The licence and distribution terms for any publically available version or
+derivative of this code cannot be changed.  i.e. this code cannot simply be
+copied and put under another distribution licence
+[including the GNU Public Licence.]
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/asn1/a_bitstr.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/asn1/a_bool.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/asn1/a_d2i_fp.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/asn1/a_dup.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/asn1/a_gentm.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/asn1/a_i2d_fp.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/asn1/a_int.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/asn1/a_mbstr.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/asn1/a_object.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/asn1/a_octet.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/asn1/a_strex.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/asn1/a_strnid.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/asn1/a_time.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/asn1/a_type.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/asn1/a_utctm.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/asn1/asn1_lib.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/asn1/asn1_par.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/asn1/asn_pack.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/asn1/f_int.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/asn1/f_string.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/asn1/tasn_dec.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/asn1/tasn_enc.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/asn1/tasn_fre.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/asn1/tasn_new.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/asn1/tasn_typ.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/asn1/tasn_utl.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/base64/base64.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/bio/bio.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/bio/bio_mem.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/bio/connect.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/bio/errno.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/bio/fd.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/bio/file.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/bio/hexdump.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/bio/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/bio/printf.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/bio/socket.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/bn_extra/convert.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/buf/buf.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/cipher_extra/cipher_extra.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/cipher_extra/derive_key.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/cipher_extra/e_des.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/cipher_extra/e_null.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/cipher_extra/e_rc2.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/cipher_extra/e_rc4.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/cipher_extra/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/conf/conf.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/conf/conf_def.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/cpu_intel.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/des/des.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/des/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/digest_extra/digest_extra.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/dsa/dsa.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/err/err.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/evp/evp.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/evp/evp_asn1.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/evp/evp_ctx.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/evp/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/evp/sign.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/ex_data.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/add.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/bn.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/bytes.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/cmp.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/div.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/exponentiation.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/gcd.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/generic.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/montgomery.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/mul.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/prime.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/random.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/shift.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/cipher/cipher.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/cipher/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/dh/check.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/dh/dh.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/digest/digest.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/digest/digests.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/digest/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/hmac/hmac.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/md4/md4.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/md5/md5.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/rsa/blinding.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/rsa/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/rsa/rsa.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/rsa/rsa_impl.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/sha/sha256.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/sha/sha512.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/lhash/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/lhash/lhash.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/mem.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/obj/obj.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/obj/obj_xref.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/pem/pem_all.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/pem/pem_info.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/pem/pem_lib.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/pem/pem_oth.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/pem/pem_pk8.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/pem/pem_pkey.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/rc4/rc4.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/rsa_extra/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/rsa_extra/rsa_crypt.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/stack/stack.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/thread.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/a_digest.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/a_sign.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/a_verify.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/algorithm.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/asn1_gen.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/by_dir.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/by_file.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/i2d_pr.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/name_print.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/t_crl.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/t_req.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/t_x509.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/t_x509a.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/x509.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/x509_att.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/x509_cmp.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/x509_d2.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/x509_def.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/x509_ext.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/x509_lu.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/x509_obj.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/x509_req.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/x509_set.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/x509_txt.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/x509_v3.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/x509_vfy.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/x509name.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/x509rset.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/x_all.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/x_attrib.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/x_crl.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/x_exten.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/x_info.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/x_name.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/x_pkey.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/x_pubkey.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/x_req.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/x_sig.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/x_spki.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/x_val.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/x_x509.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/decrepit/bio/base64_bio.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/decrepit/blowfish/blowfish.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/decrepit/cast/cast.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/decrepit/cast/cast_tables.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/decrepit/cast/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/decrepit/des/cfb64ede.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/decrepit/macros.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/decrepit/rc4/rc4_decrepit.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/decrepit/ripemd/ripemd.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/decrepit/rsa/rsa_decrepit.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/decrepit/ssl/ssl_decrepit.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/asn1.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/base64.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/bio.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/blowfish.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/buf.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/cast.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/cipher.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/conf.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/des.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/dh.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/digest.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/dsa.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/err.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/evp.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/evp_errors.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/ex_data.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/hmac.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/lhash.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/md4.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/md5.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/mem.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/obj.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/rc4.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/ripemd.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/rsa.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/sha.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/ssl.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/ssl3.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/stack.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/thread.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/tls1.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/type_check.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/x509.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/d1_both.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/d1_pkt.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/d1_srtp.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/dtls_record.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/extensions.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/handshake.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/handshake_client.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/handshake_server.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/s3_both.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/s3_lib.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/s3_pkt.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/ssl_asn1.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/ssl_cert.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/ssl_cipher.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/ssl_file.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/ssl_lib.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/ssl_privkey.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/ssl_session.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/ssl_stat.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/ssl_transcript.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/ssl_x509.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/t1_enc.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/tls_method.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/tls_record.cc
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/asn1/a_bitstr.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/asn1/a_bool.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/asn1/a_d2i_fp.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/asn1/a_dup.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/asn1/a_gentm.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/asn1/a_i2d_fp.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/asn1/a_int.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/asn1/a_mbstr.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/asn1/a_object.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/asn1/a_octet.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/asn1/a_strex.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/asn1/a_strnid.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/asn1/a_time.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/asn1/a_type.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/asn1/a_utctm.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/asn1/asn1_lib.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/asn1/asn1_par.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/asn1/asn_pack.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/asn1/f_int.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/asn1/f_string.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/asn1/tasn_dec.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/asn1/tasn_enc.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/asn1/tasn_fre.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/asn1/tasn_new.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/asn1/tasn_typ.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/asn1/tasn_utl.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/base64/base64.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/bio/bio.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/bio/bio_mem.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/bio/connect.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/bio/errno.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/bio/fd.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/bio/file.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/bio/hexdump.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/bio/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/bio/printf.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/bio/socket.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/bn_extra/convert.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/buf/buf.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/cipher_extra/cipher_extra.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/cipher_extra/derive_key.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/cipher_extra/e_des.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/cipher_extra/e_null.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/cipher_extra/e_rc2.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/cipher_extra/e_rc4.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/cipher_extra/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/conf/conf.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/conf/conf_def.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/cpu_intel.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/des/des.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/des/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/digest_extra/digest_extra.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/dsa/dsa.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/err/err.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/evp/evp.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/evp/evp_asn1.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/evp/evp_ctx.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/evp/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/evp/sign.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/ex_data.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/add.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/bn.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/bytes.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/cmp.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/div.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/exponentiation.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/gcd.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/generic.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/montgomery.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/mul.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/prime.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/random.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/shift.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/cipher/cipher.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/cipher/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/dh/check.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/dh/dh.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/digest/digest.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/digest/digests.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/digest/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/hmac/hmac.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/md4/md4.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/md5/md5.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/rsa/blinding.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/rsa/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/rsa/rsa.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/rsa/rsa_impl.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/sha/sha256.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/sha/sha512.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/lhash/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/lhash/lhash.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/mem.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/obj/obj.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/obj/obj_xref.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/pem/pem_all.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/pem/pem_info.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/pem/pem_lib.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/pem/pem_oth.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/pem/pem_pk8.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/pem/pem_pkey.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/rc4/rc4.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/rsa_extra/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/rsa_extra/rsa_crypt.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/stack/stack.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/thread.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/a_digest.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/a_sign.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/a_verify.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/algorithm.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/asn1_gen.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/by_dir.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/by_file.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/i2d_pr.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/name_print.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/t_crl.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/t_req.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/t_x509.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/t_x509a.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/x509.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/x509_att.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/x509_cmp.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/x509_d2.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/x509_def.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/x509_ext.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/x509_lu.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/x509_obj.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/x509_req.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/x509_set.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/x509_txt.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/x509_v3.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/x509_vfy.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/x509name.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/x509rset.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/x_all.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/x_attrib.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/x_crl.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/x_exten.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/x_info.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/x_name.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/x_pkey.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/x_pubkey.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/x_req.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/x_sig.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/x_spki.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/x_val.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/x_x509.c
+FILE: ../../../flutter/third_party/boringssl/src/decrepit/bio/base64_bio.c
+FILE: ../../../flutter/third_party/boringssl/src/decrepit/blowfish/blowfish.c
+FILE: ../../../flutter/third_party/boringssl/src/decrepit/cast/cast.c
+FILE: ../../../flutter/third_party/boringssl/src/decrepit/cast/cast_tables.c
+FILE: ../../../flutter/third_party/boringssl/src/decrepit/cast/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/decrepit/des/cfb64ede.c
+FILE: ../../../flutter/third_party/boringssl/src/decrepit/macros.h
+FILE: ../../../flutter/third_party/boringssl/src/decrepit/rc4/rc4_decrepit.c
+FILE: ../../../flutter/third_party/boringssl/src/decrepit/ripemd/ripemd.c
+FILE: ../../../flutter/third_party/boringssl/src/decrepit/rsa/rsa_decrepit.c
+FILE: ../../../flutter/third_party/boringssl/src/decrepit/ssl/ssl_decrepit.c
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/asn1.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/base64.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/bio.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/blowfish.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/buf.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/cast.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/cipher.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/conf.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/des.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/dh.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/digest.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/dsa.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/err.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/evp.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/evp_errors.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/ex_data.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/hmac.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/lhash.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/md4.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/md5.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/mem.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/obj.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/rc4.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/ripemd.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/rsa.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/sha.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/ssl.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/ssl3.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/stack.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/thread.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/tls1.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/type_check.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/x509.h
+FILE: ../../../flutter/third_party/boringssl/src/ssl/d1_both.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/d1_pkt.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/d1_srtp.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/dtls_record.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/extensions.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/handshake.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/handshake_client.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/handshake_server.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/ssl/s3_both.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/s3_lib.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/s3_pkt.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_asn1.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_cert.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_cipher.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_file.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_lib.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_privkey.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_session.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_stat.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_transcript.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_x509.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/t1_enc.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/tls_method.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/tls_record.cc
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+All rights reserved.
+
+This package is an SSL implementation written
+by Eric Young (eay@cryptsoft.com).
+The implementation was written so as to conform with Netscapes SSL.
+
+This library is free for commercial and non-commercial use as long as
+the following conditions are aheared to.  The following conditions
+apply to all code found in this distribution, be it the RC4, RSA,
+lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+included with this distribution is covered by the same copyright terms
+except that the holder is Tim Hudson (tjh@cryptsoft.com).
+
+Copyright remains Eric Young's, and as such any Copyright notices in
+the code are not to be removed.
+If this package is used in a product, Eric Young should be given attribution
+as the author of the parts of the library used.
+This can be in the form of a textual message at program startup or
+in documentation (online or textual) provided with the package.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. All advertising materials mentioning features or use of this software
+   must display the following acknowledgement:
+   "This product includes cryptographic software written by
+    Eric Young (eay@cryptsoft.com)"
+   The word 'cryptographic' can be left out if the rouines from the library
+   being used are not cryptographic related :-).
+4. If you include any Windows specific code (or a derivative thereof) from
+   the apps directory (application code) you must include an acknowledgement:
+   "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+
+THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+The licence and distribution terms for any publically available version or
+derivative of this code cannot be changed.  i.e. this code cannot simply be
+copied and put under another distribution licence
+[including the GNU Public Licence.]
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1388_P103-2001.ucm + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1388_P103-2001.ucm
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1995-2001, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1006_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1025_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1047_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1051_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1089_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1097_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1098_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1112_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1122_P100-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1123_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1124_P100-1996.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1125_P100-1997.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1129_P100-1997.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1130_P100-1997.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1131_P100-1997.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1132_P100-1998.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1133_P100-1997.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1140_P100-1997.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1141_P100-1997.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1142_P100-1997.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1143_P100-1997.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1144_P100-1997.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1145_P100-1997.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1146_P100-1997.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1147_P100-1997.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1148_P100-1997.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1149_P100-1997.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1153_P100-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1154_P100-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1156_P100-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1157_P100-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1158_P100-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1160_P100-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1162_P100-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1164_P100-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1250_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1251_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1252_P100-2000.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1253_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1254_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1255_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1256_P110-1997.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1257_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1258_P100-1997.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-12712_P100-1998.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1276_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-16804_X110-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-273_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-277_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-278_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-280_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-284_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-285_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-290_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-297_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-37_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-424_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-437_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-4899_P100-1998.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-4909_P100-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-4971_P100-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-500_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-5123_P100-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-5346_P100-1998.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-5347_P100-1998.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-5348_P100-1997.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-5349_P100-1998.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-5350_P100-1998.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-5351_P100-1998.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-5352_P100-1998.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-5353_P100-1998.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-5354_P100-1998.ucm + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1006_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1025_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1047_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1051_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1089_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1097_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1098_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1112_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1122_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1123_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1124_P100-1996.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1125_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1129_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1130_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1131_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1132_P100-1998.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1133_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1140_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1141_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1142_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1143_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1144_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1145_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1146_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1147_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1148_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1149_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1153_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1154_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1156_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1157_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1158_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1160_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1162_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1164_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1250_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1251_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1252_P100-2000.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1253_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1254_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1255_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1256_P110-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1257_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1258_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-12712_P100-1998.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1276_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-16804_X110-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-273_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-277_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-278_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-280_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-284_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-285_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-290_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-297_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-37_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-424_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-437_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-4899_P100-1998.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-4909_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-4971_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-500_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-5123_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-5346_P100-1998.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-5347_P100-1998.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-5348_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-5349_P100-1998.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-5350_P100-1998.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-5351_P100-1998.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-5352_P100-1998.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-5353_P100-1998.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-5354_P100-1998.ucm
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1995-2002, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1363_P110-1997.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1363_P11B-1998.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1373_P100-2002.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1390_P110-2003.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1399_P110-2003.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-16684_P110-2003.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-5478_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-803_P100-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-813_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-838_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-8482_P100-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-850_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-851_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-852_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-855_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-856_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-857_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-858_P100-1997.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-860_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-861_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-862_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-863_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-865_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-866_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-867_P100-1998.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-868_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-869_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-870_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-871_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-874_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-875_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-878_P100-1996.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-901_P100-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-902_P100-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-912_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-914_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-915_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-916_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-918_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-920_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-921_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-922_P100-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-923_P100-1998.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-9447_P100-2002.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-9449_P100-2002.ucm + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1363_P110-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1363_P11B-1998.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1373_P100-2002.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1390_P110-2003.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1399_P110-2003.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-16684_P110-2003.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-5478_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-803_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-813_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-838_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-8482_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-850_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-851_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-852_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-855_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-856_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-857_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-858_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-860_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-861_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-862_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-863_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-865_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-866_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-867_P100-1998.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-868_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-869_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-870_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-871_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-874_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-875_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-878_P100-1996.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-901_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-902_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-912_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-914_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-915_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-916_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-918_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-920_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-921_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-922_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-923_P100-1998.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-9447_P100-2002.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-9449_P100-2002.ucm
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1995-2003, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-4517_P100-2005.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-737_P100-1997.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-775_P100-1996.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-9448_X100-2005.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-25546.ucm + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-4517_P100-2005.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-737_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-775_P100-1996.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-9448_X100-2005.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-25546.ucm
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1995-2005, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-9067_X100-2005.ucm + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-9067_X100-2005.ucm
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1995-2006, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1137_P100-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1168_P100-2002.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1364_P110-2007.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1371_P100-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1383_P110-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1386_P100-2001.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-33722_P120-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-33722_P12A_P12A-2004_U2.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-420_X120-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-5012_P100-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-5471_P100-2006.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-720_P100-1997.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-864_X110-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-9005_X110-2007.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-913_P100-2000.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-930_P120-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-933_P110-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-935_P110-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-937_P110-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-939_P120-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-942_P12A-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-943_P130-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-943_P15A-2003.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-949_P110-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-949_P11A-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-950_P110-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-954_P101-2007.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-970_P110_P110-2006_U2.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-971_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1137_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1168_P100-2002.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1364_P110-2007.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1371_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1383_P110-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1386_P100-2001.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-33722_P120-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-33722_P12A_P12A-2004_U2.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-420_X120-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-5012_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-5471_P100-2006.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-720_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-864_X110-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-9005_X110-2007.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-913_P100-2000.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-930_P120-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-933_P110-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-935_P110-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-937_P110-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-939_P120-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-942_P12A-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-943_P130-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-943_P15A-2003.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-949_P110-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-949_P11A-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-950_P110-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-954_P101-2007.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-970_P110_P110-2006_U2.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-971_P100-1995.ucm
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1995-2007, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-964_P110-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-964_P110-1999.ucm
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1995-2009, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/lmb-excp.ucm + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/mappings/lmb-excp.ucm
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1995-2010, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/euc-jp-2007.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1026_P100-1995.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1155_P100-1999.ucm + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/mappings/euc-jp-2007.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1026_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1155_P100-1999.ucm
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1995-2013, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/big5-html.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/convrtrs.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/euc-jp-html.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/shift_jis-html.ucm + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/mappings/big5-html.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/convrtrs.txt
+FILE: ../../../flutter/third_party/icu/source/data/mappings/euc-jp-html.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/shift_jis-html.ucm
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1995-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/euc-kr-html.ucm + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/mappings/euc-kr-html.ucm
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1995-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: freetype2
+ORIGIN: ../../../flutter/third_party/freetype2/src/gzip/zlib.h
+TYPE: LicenseType.zlib
+FILE: ../../../flutter/third_party/freetype2/src/gzip/adler32.c
+FILE: ../../../flutter/third_party/freetype2/src/gzip/crc32.c
+FILE: ../../../flutter/third_party/freetype2/src/gzip/crc32.h
+FILE: ../../../flutter/third_party/freetype2/src/gzip/ftzconf.h
+FILE: ../../../flutter/third_party/freetype2/src/gzip/gzguts.h
+FILE: ../../../flutter/third_party/freetype2/src/gzip/infback.c
+FILE: ../../../flutter/third_party/freetype2/src/gzip/inffast.c
+FILE: ../../../flutter/third_party/freetype2/src/gzip/inffast.h
+FILE: ../../../flutter/third_party/freetype2/src/gzip/inffixed.h
+FILE: ../../../flutter/third_party/freetype2/src/gzip/inflate.c
+FILE: ../../../flutter/third_party/freetype2/src/gzip/inflate.h
+FILE: ../../../flutter/third_party/freetype2/src/gzip/inftrees.c
+FILE: ../../../flutter/third_party/freetype2/src/gzip/inftrees.h
+FILE: ../../../flutter/third_party/freetype2/src/gzip/patches/freetype-zlib.diff
+FILE: ../../../flutter/third_party/freetype2/src/gzip/zlib.h
+FILE: ../../../flutter/third_party/freetype2/src/gzip/zutil.c
+FILE: ../../../flutter/third_party/freetype2/src/gzip/zutil.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/astro.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/astro.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1996-2008, International Business Machines Corporation *
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/astro.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/astro.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1996-2012, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/sortkey.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/sortkey.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1996-2012, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/locmap.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/ctestfw/unicode/ctest.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/locmap.h
+FILE: ../../../flutter/third_party/icu/source/tools/ctestfw/unicode/ctest.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1996-2013, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/resbund.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/resbund.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1996-2013, International Business Machines Corporation
+and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationcompare.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/ctestfw/ctest.c + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/collationcompare.h
+FILE: ../../../flutter/third_party/icu/source/tools/ctestfw/ctest.c
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1996-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/caniter.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/coleitr.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/coll.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/caniter.h
+FILE: ../../../flutter/third_party/icu/source/i18n/coleitr.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/coll.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1996-2014, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/sortkey.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/sortkey.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1996-2014, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ubrk.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/locid.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationcompare.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/rulebasedcollator.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/ucol.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/udat.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unum.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ubrk.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unicode/locid.h
+FILE: ../../../flutter/third_party/icu/source/i18n/collationcompare.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/rulebasedcollator.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/ucol.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/udat.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/unum.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1996-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/caniter.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/ucal.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/caniter.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/ucal.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1996-2015, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/ubrk.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ubrk.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1996-2015, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/locmap.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/uchar.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/utypes.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/ucal.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/ucol_res.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/coll.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/locmap.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uchar.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unicode/utypes.h
+FILE: ../../../flutter/third_party/icu/source/i18n/ucal.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/ucol_res.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/coll.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1996-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/udat.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/udat.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1996-2016, International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/tblcoll.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/tblcoll.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1996-2016, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ebcdic-xml-us.ucm + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ebcdic-xml-us.ucm
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1997-2000, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/jisx-212.ucm + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/mappings/jisx-212.ucm
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1997-2003, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/filestrm.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/filestrm.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1997-2005, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/parsepos.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/parsepos.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1997-2005, International Business Machines Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/resbund_cnv.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/umath.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ures_cnv.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/fieldpos.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/resbund_cnv.cpp
+FILE: ../../../flutter/third_party/icu/source/common/umath.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ures_cnv.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/fieldpos.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1997-2006, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/utrans.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/utrans.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1997-2009,2014 International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/urep.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/cns-11643-1992.ucm + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/urep.h
+FILE: ../../../flutter/third_party/icu/source/data/mappings/cns-11643-1992.ucm
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1997-2010, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/fmtable_cnv.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/fmtable_cnv.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1997-2010, International Business Machines Corporation and    *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/cpputils.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/cstring.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/uelement.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/uhash_us.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/chariter.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/filestrm.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/cpputils.h
+FILE: ../../../flutter/third_party/icu/source/common/cstring.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uelement.h
+FILE: ../../../flutter/third_party/icu/source/common/uhash_us.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unicode/chariter.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/filestrm.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1997-2011, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/format.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/format.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1997-2011, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/utrans.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/utrans.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1997-2011,2014-2015 International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/cstring.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/locresdata.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/ptypes.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/nfrlist.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/cstring.h
+FILE: ../../../flutter/third_party/icu/source/common/locresdata.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ptypes.h
+FILE: ../../../flutter/third_party/icu/source/i18n/nfrlist.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1997-2012, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/format.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/format.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1997-2012, International Business Machines Corporation and    *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glfw
+ORIGIN: ../../../flutter/third_party/glfw/src/mappings.h
+ORIGIN: ../../../flutter/third_party/glfw/src/mappings.h.in
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/glfw/src/mappings.h
+FILE: ../../../flutter/third_party/glfw/src/mappings.h.in
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the
+use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/locavailable.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/mutex.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/resbund.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/choicfmt.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/locavailable.cpp
+FILE: ../../../flutter/third_party/icu/source/common/mutex.h
+FILE: ../../../flutter/third_party/icu/source/common/resbund.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/choicfmt.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1997-2013, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/simpletz.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/simpletz.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1997-2013, International Business Machines                     *
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/simpletz.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/simpletz.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1997-2013, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/choicfmt.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/choicfmt.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1997-2013, International Business Machines Corporation and    *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/gregocal.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/gregocal.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1997-2013, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/hash.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/putil.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/uscript.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/calendar.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/coleitr.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/fmtable.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/hash.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/putil.h
+FILE: ../../../flutter/third_party/icu/source/common/uscript.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/calendar.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/coleitr.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/fmtable.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1997-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/uhash.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/umutex.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/filteredbrk.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/utypes.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/nfrs.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/nfrs.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/nfrule.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/nfsubs.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/nfsubs.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/uhash.h
+FILE: ../../../flutter/third_party/icu/source/common/umutex.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/filteredbrk.h
+FILE: ../../../flutter/third_party/icu/source/common/utypes.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/nfrs.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/nfrs.h
+FILE: ../../../flutter/third_party/icu/source/i18n/nfrule.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/nfsubs.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/nfsubs.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1997-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/nfrule.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/nfrule.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1997-2015, International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/rbnf.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/rbnf.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1997-2015, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/brkiter.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/numfmt.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/brkiter.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/numfmt.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1997-2015, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/datefmt.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/datefmt.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1997-2015, International Business Machines Corporation and    *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/rbnf.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/unum.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/rbnf.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/unum.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1997-2015, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/cmemory.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/locdispnames.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/locid.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/loclikely.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/putil.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/putilimp.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/uhash.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/uloc.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/umutex.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/brkiter.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/platform.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/uchar.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/uloc.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/ures.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/uscript.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/datefmt.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/dcfmtsym.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/decimfmt.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/dtfmtsym.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/cmemory.h
+FILE: ../../../flutter/third_party/icu/source/common/locdispnames.cpp
+FILE: ../../../flutter/third_party/icu/source/common/locid.cpp
+FILE: ../../../flutter/third_party/icu/source/common/loclikely.cpp
+FILE: ../../../flutter/third_party/icu/source/common/putil.cpp
+FILE: ../../../flutter/third_party/icu/source/common/putilimp.h
+FILE: ../../../flutter/third_party/icu/source/common/uhash.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uloc.cpp
+FILE: ../../../flutter/third_party/icu/source/common/umutex.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unicode/brkiter.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/platform.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/uchar.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/uloc.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ures.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/uscript.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/datefmt.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/dcfmtsym.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/decimfmt.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/dtfmtsym.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1997-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/uresbund.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/dcfmtsym.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/fmtable.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/gregocal.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/timezone.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/smpdtfmt.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/uresbund.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/dcfmtsym.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/fmtable.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/gregocal.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/timezone.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/smpdtfmt.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1997-2016, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/calendar.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/dtfmtsym.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/smpdtfmt.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/calendar.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/dtfmtsym.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/smpdtfmt.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1997-2016, International Business Machines Corporation and    *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/numfmt.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/numfmt.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1997-2016, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucnvdisp.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ucnvdisp.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1998-2004, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/schriter.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/uchriter.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/schriter.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/uchriter.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1998-2005, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/io/uprintf.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/makeconv/ucnvstat.c + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/io/uprintf.h
+FILE: ../../../flutter/third_party/icu/source/tools/makeconv/ucnvstat.c
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1998-2006, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/genrb/rbutil.c + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/rbutil.c
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1998-2008, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/io/locbund.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/io/ufmt_cmn.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/genrb/errmsg.c + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/genrb/read.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/io/locbund.h
+FILE: ../../../flutter/third_party/icu/source/io/ufmt_cmn.h
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/errmsg.c
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/read.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1998-2011, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/genrb/read.c + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/genrb/ustr.c + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/genrb/ustr.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/read.c
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/ustr.c
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/ustr.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1998-2012, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/schriter.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/uchriter.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/schriter.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uchriter.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1998-2012, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/ustring.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ustr_cnv.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/ucol_imp.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/io/locbund.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/io/ufile.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/io/ufmt_cmn.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/io/uprintf.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/io/uscanf.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/io/uscanf.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/genrb/parse.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ustring.h
+FILE: ../../../flutter/third_party/icu/source/common/ustr_cnv.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/ucol_imp.h
+FILE: ../../../flutter/third_party/icu/source/io/locbund.cpp
+FILE: ../../../flutter/third_party/icu/source/io/ufile.h
+FILE: ../../../flutter/third_party/icu/source/io/ufmt_cmn.cpp
+FILE: ../../../flutter/third_party/icu/source/io/uprintf.cpp
+FILE: ../../../flutter/third_party/icu/source/io/uscanf.cpp
+FILE: ../../../flutter/third_party/icu/source/io/uscanf.h
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/parse.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1998-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/io/ufile.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/io/unicode/ustdio.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/genrb/parse.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/makeconv/makeconv.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/io/ufile.cpp
+FILE: ../../../flutter/third_party/icu/source/io/unicode/ustdio.h
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/parse.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/makeconv/makeconv.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1998-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucnv.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucnv_err.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/unistr.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ustring.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/io/uprntf_p.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/io/uscanf_p.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/io/ustdio.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/genrb/errmsg.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/genrb/genrb.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/genrb/prscmnts.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/genrb/rbutil.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/ucbuf.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/ucbuf.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ucnv.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_err.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unicode/unistr.h
+FILE: ../../../flutter/third_party/icu/source/common/ustring.cpp
+FILE: ../../../flutter/third_party/icu/source/io/uprntf_p.cpp
+FILE: ../../../flutter/third_party/icu/source/io/uscanf_p.cpp
+FILE: ../../../flutter/third_party/icu/source/io/ustdio.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/errmsg.h
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/genrb.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/prscmnts.h
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/rbutil.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/ucbuf.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/ucbuf.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1998-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/extra/uconv/uwmsg.c + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/extra/uconv/uwmsg.c
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1998-2016, International Business Machines Corporation
+and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/utf32.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/utf32.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1999-2001, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/extra/scrptrun/scrptrun.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/extra/scrptrun/scrptrun.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1999-2003, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucnv_cnv.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_cnv.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1999-2004, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/parseerr.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/parseerr.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1999-2005, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucnv_io.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/umisc.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/gensprep/gensprep.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_io.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/umisc.h
+FILE: ../../../flutter/third_party/icu/source/tools/gensprep/gensprep.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1999-2006, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/dbbi.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/dbbi.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1999-2006,2013 IBM Corp. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/rbt.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/rbt.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1999-2007, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/rbt_data.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/rbt_set.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/rbt_data.h
+FILE: ../../../flutter/third_party/icu/source/i18n/rbt_set.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1999-2007, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/extra/uconv/makedata.mak + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/extra/uconv/makedata.mak
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1999-2008, International Business Machines Corporation
+and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/ucnv_err.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ucnv_err.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1999-2009, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/udatamem.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/uinvchar.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ustr_cnv.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/unewdata.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/unewdata.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/udatamem.h
+FILE: ../../../flutter/third_party/icu/source/common/uinvchar.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ustr_cnv.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/unewdata.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/unewdata.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1999-2010, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/unifilt.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/unifilt.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1999-2010, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/chariter.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucmndata.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucmndata.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucnv_cnv.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucnv_imp.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/udatamem.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/umapfile.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/utf.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unistr_props.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/usc_impl.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/uvectr32.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/cpdtrans.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/cpdtrans.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/rbt_rule.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/rbt_set.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/chariter.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucmndata.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucmndata.h
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_cnv.h
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_imp.h
+FILE: ../../../flutter/third_party/icu/source/common/udatamem.cpp
+FILE: ../../../flutter/third_party/icu/source/common/umapfile.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/utf.h
+FILE: ../../../flutter/third_party/icu/source/common/unistr_props.cpp
+FILE: ../../../flutter/third_party/icu/source/common/usc_impl.h
+FILE: ../../../flutter/third_party/icu/source/common/uvectr32.h
+FILE: ../../../flutter/third_party/icu/source/i18n/cpdtrans.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/cpdtrans.h
+FILE: ../../../flutter/third_party/icu/source/i18n/rbt_rule.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/rbt_set.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1999-2011, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/rbt_pars.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/rbt_pars.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1999-2011, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/utf16.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/utf_impl.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/umsg.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/utf16.h
+FILE: ../../../flutter/third_party/icu/source/common/utf_impl.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/umsg.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1999-2012, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/rep.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/rep.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1999-2012, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/umapfile.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/ubidi.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/toolutil.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/umapfile.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ubidi.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/toolutil.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1999-2013, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/uvector.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/uvector.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1999-2013, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/rbbidata.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/rbbidata.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1999-2014 International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/rbbidata.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/rbbidata.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1999-2014 International Business Machines Corporation   *
+and others. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unames.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/ucnv.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/udata.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/uniset_props.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unistr_case.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unistr_cnv.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/uvectr64.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationweights.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/rbt_data.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/gensprep/store.c + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/toolutil.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unames.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ucnv.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/udata.h
+FILE: ../../../flutter/third_party/icu/source/common/uniset_props.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unistr_case.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unistr_cnv.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uvectr64.h
+FILE: ../../../flutter/third_party/icu/source/i18n/collationweights.h
+FILE: ../../../flutter/third_party/icu/source/i18n/rbt_data.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/gensprep/store.c
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/toolutil.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1999-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/translit.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/translit.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1999-2014, International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucnv_bld.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_bld.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1999-2015 International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ubidi.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ubidiln.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucnv_io.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/uinvchar.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/umachine.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/utf8.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/uniset.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ustr_imp.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationweights.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/rbt.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/package.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ubidi.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ubidiln.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_io.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uinvchar.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/umachine.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/utf8.h
+FILE: ../../../flutter/third_party/icu/source/common/uniset.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ustr_imp.h
+FILE: ../../../flutter/third_party/icu/source/i18n/collationweights.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/rbt.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/package.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1999-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/uvectr32.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/uvectr64.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/uvectr32.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uvectr64.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1999-2015, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/gencnval/gencnval.c + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/gencnval/gencnval.c
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1999-2016 International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/rbbi.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/rbbi.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1999-2016 International Business Machines Corporation
+and others. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/rbbi.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/rbbi.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1999-2016 International Business Machines Corporation   *
+and others. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/uresdata.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/uresdata.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1999-2016, International Business Machines
+               Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/norm2_nfc_data.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/propname_data.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ubidi_props_data.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ubidiimp.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucase_props_data.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/uchar_props_data.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/udata.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/usc_impl.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/uvector.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/unidata/norm2/nfc.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/unidata/norm2/nfkc.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/unidata/norm2/nfkc_cf.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/extra/scrptrun/scrptrun.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/extra/uconv/uconv.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationfcd.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/rbt_pars.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/translit.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/genccode/genccode.c + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/gencmn/gencmn.c + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/genrb/derb.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/gentest/gentest.c + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/icuinfo/icuinfo.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/norm2_nfc_data.h
+FILE: ../../../flutter/third_party/icu/source/common/propname_data.h
+FILE: ../../../flutter/third_party/icu/source/common/ubidi_props_data.h
+FILE: ../../../flutter/third_party/icu/source/common/ubidiimp.h
+FILE: ../../../flutter/third_party/icu/source/common/ucase_props_data.h
+FILE: ../../../flutter/third_party/icu/source/common/uchar_props_data.h
+FILE: ../../../flutter/third_party/icu/source/common/udata.cpp
+FILE: ../../../flutter/third_party/icu/source/common/usc_impl.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uvector.h
+FILE: ../../../flutter/third_party/icu/source/data/unidata/norm2/nfc.txt
+FILE: ../../../flutter/third_party/icu/source/data/unidata/norm2/nfkc.txt
+FILE: ../../../flutter/third_party/icu/source/data/unidata/norm2/nfkc_cf.txt
+FILE: ../../../flutter/third_party/icu/source/extra/scrptrun/scrptrun.cpp
+FILE: ../../../flutter/third_party/icu/source/extra/uconv/uconv.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collationfcd.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/rbt_pars.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/translit.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/genccode/genccode.c
+FILE: ../../../flutter/third_party/icu/source/tools/gencmn/gencmn.c
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/derb.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/gentest/gentest.c
+FILE: ../../../flutter/third_party/icu/source/tools/icuinfo/icuinfo.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1999-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/uresdata.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/uresdata.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1999-2016, International Business Machines Corporation
+              and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/makedata.mak + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/makedata.mak
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1999-2016, International Business Machines Corporation
+and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/uniset.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/uniset.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1999-2016, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unistr.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unistr.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1999-2016, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: freetype2
+ORIGIN: ../../../flutter/third_party/freetype2/src/pcf/pcf.h
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/freetype2/src/pcf/pcf.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2000, 2001, 2002, 2003, 2006, 2010 by
+Francesco Zappa Nardelli
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/genrb/rle.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/rle.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2000, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/genrb/rle.c + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/rle.c
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2000-2003, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: freetype2
+ORIGIN: ../../../flutter/third_party/freetype2/src/pcf/pcfdrivr.c
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/freetype2/src/pcf/pcfdrivr.c
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2000-2004, 2006-2011, 2013, 2014 by
+Francesco Zappa Nardelli
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/ucnv_cb.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ucnv_cb.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2000-2004, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/extra/uconv/unicode/uwmsg.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/extra/uconv/unicode/uwmsg.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2000-2004, International Business Machines Corporation
+and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucnv_cb.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_cb.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2000-2006, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/extra/uconv/pkgdata.inc.in + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/extra/uconv/pkgdata.inc.in
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2000-2007, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/icupkg.inc.in + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/makeconv/genmbcs.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/icupkg.inc.in
+FILE: ../../../flutter/third_party/icu/source/tools/makeconv/genmbcs.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2000-2008, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/makeconv/makeconv.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/uparse.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/makeconv/makeconv.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/uparse.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2000-2010, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucol_data.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/uversion.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/uoptions.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ucol_data.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/uversion.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/uoptions.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2000-2011, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/ushape.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/pkgdata/pkgtypes.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/uparse.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ushape.h
+FILE: ../../../flutter/third_party/icu/source/tools/pkgdata/pkgtypes.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/uparse.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2000-2012, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/gb18030.ucm + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/mappings/gb18030.ucm
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2000-2012, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucnvmbcs.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ucnvmbcs.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2000-2013, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/io/sscanf.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/io/sscanf.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2000-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ubidiwrt.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucnvhz.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucnvlat1.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/genrb/reslist.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/genrb/reslist.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/genrb/wrtjava.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/uoptions.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ubidiwrt.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnvhz.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnvlat1.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/reslist.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/reslist.h
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/wrtjava.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/uoptions.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2000-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucnv2022.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucnv_lmb.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucnvisci.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucnvmbcs.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucnvscsu.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/uresimp.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ushape.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/makeconv/genmbcs.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/pkgdata/pkgdata.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/pkgdata/pkgtypes.c + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ucnv2022.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_lmb.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnvisci.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnvmbcs.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnvscsu.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uresimp.h
+FILE: ../../../flutter/third_party/icu/source/common/ushape.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/makeconv/genmbcs.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/pkgdata/pkgdata.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/pkgdata/pkgtypes.c
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2000-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/icudefs.mk.in + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/icudefs.mk.in
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2000-2016, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: freetype2
+ORIGIN: ../../../flutter/third_party/freetype2/src/bdf/bdf.c
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/freetype2/src/bdf/bdf.c
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2001, 2002 by
+Francesco Zappa Nardelli
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: freetype2
+ORIGIN: ../../../flutter/third_party/freetype2/src/bdf/bdfdrivr.h
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/freetype2/src/bdf/bdfdrivr.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2001, 2002, 2003, 2004 by
+Francesco Zappa Nardelli
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/cwchar.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/cwchar.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/umsg_imp.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/stubdata/stubdata.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/stubdata/stubdata.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/cwchar.cpp
+FILE: ../../../flutter/third_party/icu/source/common/cwchar.h
+FILE: ../../../flutter/third_party/icu/source/i18n/umsg_imp.h
+FILE: ../../../flutter/third_party/icu/source/stubdata/stubdata.cpp
+FILE: ../../../flutter/third_party/icu/source/stubdata/stubdata.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2001, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/macos-0_2-10.2.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/macos-29-10.2.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/macos-35-10.2.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/macos-7_3-10.2.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/windows-874-2000.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/windows-949-2000.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/windows-950-2000.ucm + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/mappings/macos-0_2-10.2.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/macos-29-10.2.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/macos-35-10.2.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/macos-7_3-10.2.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/windows-874-2000.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/windows-949-2000.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/windows-950-2000.ucm
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2001-2003, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/macos-6_2-10.4.ucm + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/mappings/macos-6_2-10.4.ucm
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2001-2005, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/unimatch.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/unimatch.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2001-2005, International Business Machines Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ustrfmt.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ustrfmt.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ustrfmt.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ustrfmt.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2001-2006, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/windows-936-2000.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/name2uni.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/titletrn.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/tolowtrn.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/tolowtrn.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/toupptrn.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/toupptrn.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/uni2name.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/mappings/windows-936-2000.ucm
+FILE: ../../../flutter/third_party/icu/source/i18n/name2uni.h
+FILE: ../../../flutter/third_party/icu/source/i18n/titletrn.h
+FILE: ../../../flutter/third_party/icu/source/i18n/tolowtrn.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/tolowtrn.h
+FILE: ../../../flutter/third_party/icu/source/i18n/toupptrn.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/toupptrn.h
+FILE: ../../../flutter/third_party/icu/source/i18n/uni2name.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2001-2007, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: freetype2
+ORIGIN: ../../../flutter/third_party/freetype2/src/bdf/bdfdrivr.c
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/freetype2/src/bdf/bdfdrivr.c
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2001-2008, 2011, 2013, 2014 by
+Francesco Zappa Nardelli
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/utrie2_impl.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/casetrn.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/utrie2_impl.h
+FILE: ../../../flutter/third_party/icu/source/i18n/casetrn.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2001-2008, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/search.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/search.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2001-2008,2010 IBM and others. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/nortrans.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/nortrans.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2001-2010, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/search.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/search.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2001-2011 IBM and others. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unormimp.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/utrie.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/casetrn.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/name2uni.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/nortrans.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/titletrn.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/uni2name.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unormimp.h
+FILE: ../../../flutter/third_party/icu/source/common/utrie.h
+FILE: ../../../flutter/third_party/icu/source/i18n/casetrn.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/name2uni.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/nortrans.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/titletrn.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/uni2name.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2001-2011, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/io/ucln_io.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/io/ucln_io.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2001-2011, International Business Machines                   *
+               Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/quant.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/strmatch.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/quant.h
+FILE: ../../../flutter/third_party/icu/source/i18n/strmatch.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2001-2011, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/servloc.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/servloc.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2001-2011, International Business Machines Corporation and    *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/serv.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/serv.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2001-2011, International Business Machines Corporation.       *
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/usearch.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/usearch.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2001-2011,2014 IBM and others. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ustr_wcs.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/utrie.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/quant.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ustr_wcs.cpp
+FILE: ../../../flutter/third_party/icu/source/common/utrie.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/quant.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2001-2012, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/servnotf.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/servnotf.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2001-2012, International Business Machines Corporation and    *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucln.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ucln.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2001-2013, International Business Machines
+               Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/stsearch.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/stsearch.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/stsearch.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/stsearch.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2001-2014 IBM and others. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/io/unicode/ustream.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/io/unicode/ustream.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2001-2014 International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucln_cmn.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/uclean.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ucln_cmn.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unicode/uclean.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2001-2014, International Business Machines
+               Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unormcmp.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/utrie2.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/utrie2.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/utrie2_builder.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/bocsu.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/bocsu.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/ucoleitr.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/io/sprintf.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unormcmp.cpp
+FILE: ../../../flutter/third_party/icu/source/common/utrie2.cpp
+FILE: ../../../flutter/third_party/icu/source/common/utrie2.h
+FILE: ../../../flutter/third_party/icu/source/common/utrie2_builder.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/bocsu.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/bocsu.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/ucoleitr.h
+FILE: ../../../flutter/third_party/icu/source/io/sprintf.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2001-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/ucln_in.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/io/ucln_io.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/ucln_in.cpp
+FILE: ../../../flutter/third_party/icu/source/io/ucln_io.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2001-2014, International Business Machines                   *
+               Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/servlk.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/servlkf.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/servls.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/servnotf.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/servrbf.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/servslkf.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/servlk.cpp
+FILE: ../../../flutter/third_party/icu/source/common/servlkf.cpp
+FILE: ../../../flutter/third_party/icu/source/common/servls.cpp
+FILE: ../../../flutter/third_party/icu/source/common/servnotf.h
+FILE: ../../../flutter/third_party/icu/source/common/servrbf.cpp
+FILE: ../../../flutter/third_party/icu/source/common/servslkf.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2001-2014, International Business Machines Corporation and    *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/serv.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/serv.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2001-2014, International Business Machines Corporation.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/usearch.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/usrchimp.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/usearch.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/usrchimp.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2001-2015 IBM and others. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/uinit.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/uinit.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2001-2015, International Business Machines
+               Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ustrcase.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ustrcase.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2001-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucln_cmn.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/ucln_in.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ucln_cmn.h
+FILE: ../../../flutter/third_party/icu/source/i18n/ucln_in.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2001-2016, International Business Machines
+               Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ustrtrns.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/ucoleitr.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/io/ustream.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ustrtrns.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/ucoleitr.cpp
+FILE: ../../../flutter/third_party/icu/source/io/ustream.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2001-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/punycode.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/punycode.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2003, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/GenericCodeGen/CodeGen.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/GenericCodeGen/Link.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Include/InfoSink.h
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Include/InitializeGlobals.h
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Include/ShHandle.h
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/InfoSink.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/PoolAlloc.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/RemoveTree.h
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/parseConst.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/PpTokens.h
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/OSDependent/Unix/ossource.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/OSDependent/Windows/ossource.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/OSDependent/osinclude.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/GenericCodeGen/CodeGen.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/GenericCodeGen/Link.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Include/InfoSink.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Include/InitializeGlobals.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Include/ShHandle.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/InfoSink.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/PoolAlloc.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/RemoveTree.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/parseConst.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/PpTokens.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/OSDependent/Unix/ossource.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/OSDependent/Windows/ossource.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/OSDependent/osinclude.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Include/Common.h
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Include/PoolAlloc.h
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Include/arrays.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Include/Common.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Include/PoolAlloc.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Include/arrays.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2012-2013 LunarG, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/ParseHelper.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/ParseHelper.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2012-2013 LunarG, Inc.
+Copyright (C) 2015-2018 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/SymbolTable.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/SymbolTable.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2012-2013 LunarG, Inc.
+Copyright (C) 2017 ARM Limited.
+Copyright (C) 2015-2018 Google, Inc.
+Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/glslang.y
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/glslang.y
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2012-2013 LunarG, Inc.
+Copyright (C) 2017 ARM Limited.
+Copyright (C) 2015-2019 Google, Inc.
+Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/Constant.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/Constant.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2012-2013 LunarG, Inc.
+Copyright (C) 2017 ARM Limited.
+Copyright (C) 2018-2020 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Include/BaseTypes.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Include/BaseTypes.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2012-2013 LunarG, Inc.
+Copyright (C) 2017 ARM Limited.
+Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/Versions.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/Versions.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2012-2013 LunarG, Inc.
+Copyright (C) 2017, 2022-2024 Arm Limited.
+Copyright (C) 2015-2018 Google, Inc.
+Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/Versions.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/Versions.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2012-2013 LunarG, Inc.
+Copyright (C) 2017, 2022-2024 Arm Limited.
+Copyright (C) 2015-2020 Google, Inc.
+Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/ParseHelper.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/ParseHelper.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2012-2015 LunarG, Inc.
+Copyright (C) 2015-2018 Google, Inc.
+Copyright (C) 2017, 2019 ARM Limited.
+Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/Intermediate.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/Intermediate.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2012-2015 LunarG, Inc.
+Copyright (C) 2015-2020 Google, Inc.
+Copyright (C) 2017 ARM Limited.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Include/Types.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Include/Types.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2012-2016 LunarG, Inc.
+Copyright (C) 2015-2016 Google, Inc.
+Copyright (C) 2017 ARM Limited.
+Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/Initialize.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/Initialize.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2012-2016 LunarG, Inc.
+Copyright (C) 2015-2020 Google, Inc.
+Copyright (C) 2017, 2022-2024 Arm Limited.
+Modifications Copyright (C) 2020-2021 Advanced Micro Devices, Inc. All rights reserved.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Include/intermediate.h
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/intermOut.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Include/intermediate.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/intermOut.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2012-2016 LunarG, Inc.
+Copyright (C) 2017, 2022-2024 Arm Limited.
+Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Include/ResourceLimits.h
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/RemoveTree.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/Scan.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Include/ResourceLimits.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/RemoveTree.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/Scan.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2013 LunarG, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/PpAtom.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/PpAtom.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2013 LunarG, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/SymbolTable.h
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/PpTokens.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/SymbolTable.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/PpTokens.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2013 LunarG, Inc.
+Copyright (C) 2015-2018 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/Pp.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/PpContext.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/Pp.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/PpContext.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2013 LunarG, Inc.
+Copyright (C) 2015-2018 Google, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Include/ConstantUnion.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Include/ConstantUnion.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2013 LunarG, Inc.
+Copyright (C) 2017 ARM Limited.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/PpScanner.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/PpScanner.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2013 LunarG, Inc.
+Copyright (C) 2017 ARM Limited.
+Copyright (C) 2015-2018 Google, Inc.
+Copyright (c) 2023, Mobica Limited
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/Scan.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/Scan.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2013 LunarG, Inc.
+Copyright (C) 2017 ARM Limited.
+Copyright (C) 2020 Google, Inc.
+Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/IntermTraverse.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/IntermTraverse.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2013 LunarG, Inc.
+Copyright (c) 2002-2010 The ANGLE Project Authors.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/Initialize.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/Initialize.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2013-2016 LunarG, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Public/ShaderLang.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Public/ShaderLang.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2013-2016 LunarG, Inc.
+Copyright (C) 2015-2018 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/ShaderLang.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/ShaderLang.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2013-2016 LunarG, Inc.
+Copyright (C) 2015-2020 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/StandAlone/StandAlone.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/ExtensionHeaders/GL_EXT_shader_realtime_clock.glsl
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/StandAlone/StandAlone.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/ExtensionHeaders/GL_EXT_shader_realtime_clock.glsl
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2013-2016 LunarG, Inc.
+Copyright (C) 2016-2020 Google, Inc.
+Modifications Copyright(C) 2021 Advanced Micro Devices, Inc.All rights reserved.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/ParseContextBase.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/ParseContextBase.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2016 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/localintermediate.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/localintermediate.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2016 LunarG, Inc.
+Copyright (C) 2017 ARM Limited.
+Copyright (C) 2015-2018 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/StandAlone/DirStackFileIncluder.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/StandAlone/DirStackFileIncluder.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2017 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/locutil.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/locutil.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2005, International Business Machines Corporation and    *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/uenumimp.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/uenumimp.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2006, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/rbbisetb.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/rbbisetb.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2008 International Business Machines Corporation   *
+and others. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/rbbirb.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/rbbirb.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2008, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/propsvec.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/propsvec.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2010, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/uiter.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/uiter.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2011 International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/propsvec.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/punycode.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/uassert.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/uset.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/uset_props.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/propsvec.cpp
+FILE: ../../../flutter/third_party/icu/source/common/punycode.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uassert.h
+FILE: ../../../flutter/third_party/icu/source/common/uset.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uset_props.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2011, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/rbbirb.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/rbbirb.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2011, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/uenum.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/uiter.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/strenum.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/uobject.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/utf_old.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/uobject.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/uenum.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uiter.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unicode/strenum.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/uobject.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/utf_old.h
+FILE: ../../../flutter/third_party/icu/source/common/uobject.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2012, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/uenum.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/uenum.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2013, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/brkitr/rules/word_ja.txt + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/rules/word_ja.txt
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2013, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/rbbistbl.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/rbbistbl.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2014 International Business Machines Corporation
+and others. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/uset.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/uset.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/locutil.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/locutil.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2014, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/regeximp.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/regeximp.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2015 International Business Machines Corporation
+and others. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/cmemory.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucnv_u16.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucnv_u32.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/genrb/genrb.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/genrb/wrtxml.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/cmemory.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_u16.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_u32.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/genrb.h
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/wrtxml.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/brkitr/rules/sent.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/brkitr/rules/sent_el.txt + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/rules/sent.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/rules/sent_el.txt
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2015, International Business Machines Corporation and others.
+    All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/regexcst.txt + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/regexcst.txt
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2015, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/rbbirpt.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/regexcst.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/rematch.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/repattrn.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/rbbirpt.h
+FILE: ../../../flutter/third_party/icu/source/i18n/regexcst.h
+FILE: ../../../flutter/third_party/icu/source/i18n/rematch.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/repattrn.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2016 International Business Machines Corporation
+and others. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/rbbinode.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/rbbinode.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2016 International Business Machines Corporation   *
+and others. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/regexcmp.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/regexcmp.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2016 International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucnv_u7.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucnv_u8.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucnvbocu.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/uconfig.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/urename.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/uprops.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/uprops.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/regex.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/genbrk/genbrk.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/gendict/gendict.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_u7.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_u8.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnvbocu.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unicode/uconfig.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/urename.h
+FILE: ../../../flutter/third_party/icu/source/common/uprops.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uprops.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/regex.h
+FILE: ../../../flutter/third_party/icu/source/tools/genbrk/genbrk.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/gendict/gendict.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/brkitr/rules/word.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/brkitr/rules/word_POSIX.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/brkitr/rules/word_fi_sv.txt + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/rules/word.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/rules/word_POSIX.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/rules/word_fi_sv.txt
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2016, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/brkitr/rules/char.txt + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/rules/char.txt
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2016, International Business Machines Corporation and others.
+    All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/rbbirpt.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/rbbiscan.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/rbbiscan.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/regexcmp.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/rbbirpt.txt
+FILE: ../../../flutter/third_party/icu/source/common/rbbiscan.cpp
+FILE: ../../../flutter/third_party/icu/source/common/rbbiscan.h
+FILE: ../../../flutter/third_party/icu/source/i18n/regexcmp.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2002-2016, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/cecal.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/cecal.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2003 - 2008, International Business Machines Corporation and  *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/cecal.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/cecal.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2003 - 2009, International Business Machines Corporation and  *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/coptccal.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/ethpccal.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/coptccal.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/ethpccal.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2003 - 2013, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/coptccal.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/ethpccal.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/coptccal.h
+FILE: ../../../flutter/third_party/icu/source/i18n/ethpccal.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2003 - 2013, International Business Machines Corporation and  *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/parsepos.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/parsepos.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2003-2003, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/gentest/gentest.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/gentest/gentest.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2003-2004, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/sprpimpl.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/uregexc.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/gentest/genres32.c + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/sprpimpl.h
+FILE: ../../../flutter/third_party/icu/source/i18n/uregexc.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/gentest/genres32.c
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2003-2006, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucnv_set.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_set.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2003-2007, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/indiancal.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/japancal.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/indiancal.h
+FILE: ../../../flutter/third_party/icu/source/i18n/japancal.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2003-2008, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/utracimp.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/utracimp.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2003-2009, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/japancal.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/japancal.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2003-2009,2012,2016 International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/regexst.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/regexst.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2003-2010, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ustack.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ustack.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2003-2011, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/ucmstate.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/ucmstate.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2003-2012, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/uarrsort.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/uarrsort.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucnv_ext.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/utrace.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/ucm.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/ucm.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/uarrsort.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uarrsort.h
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_ext.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/utrace.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/ucm.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/ucm.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2003-2013, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/buddhcal.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/hebrwcal.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/islamcal.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/persncal.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/persncal.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/taiwncal.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/buddhcal.h
+FILE: ../../../flutter/third_party/icu/source/i18n/hebrwcal.h
+FILE: ../../../flutter/third_party/icu/source/i18n/islamcal.h
+FILE: ../../../flutter/third_party/icu/source/i18n/persncal.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/persncal.h
+FILE: ../../../flutter/third_party/icu/source/i18n/taiwncal.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2003-2013, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/taiwncal.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/taiwncal.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2003-2013, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/buddhcal.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/buddhcal.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2003-2013, International Business Machines Corporation and    *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucol_swp.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/udataswp.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/udataswp.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/uidna.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/uidna.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/usprep.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/utrace.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/genrb/prscmnts.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/icuswap/icuswap.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/makeconv/gencnvex.c + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ucol_swp.h
+FILE: ../../../flutter/third_party/icu/source/common/udataswp.cpp
+FILE: ../../../flutter/third_party/icu/source/common/udataswp.h
+FILE: ../../../flutter/third_party/icu/source/common/uidna.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unicode/uidna.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/usprep.h
+FILE: ../../../flutter/third_party/icu/source/common/utrace.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/prscmnts.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/icuswap/icuswap.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/makeconv/gencnvex.c
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2003-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/indiancal.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/indiancal.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2003-2014, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucol_swp.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/pkgitems.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ucol_swp.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/pkgitems.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2003-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/ulocdata.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/ulocdata.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2003-2015, International Business Machines                   *
+               Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/islamcal.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/islamcal.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2003-2015, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucnv_ext.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/usprep.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/gensprep/gensprep.c + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_ext.cpp
+FILE: ../../../flutter/third_party/icu/source/common/usprep.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/gensprep/gensprep.c
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2003-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/ulocdata.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/ulocdata.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2003-2016, International Business Machines                   *
+               Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/hebrwcal.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/hebrwcal.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2003-2016, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/utmscale.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/utmscale.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2004 - 2008, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/xmlparser.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/xmlparser.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2004-2005, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/translit/el.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/translit/en.txt + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/translit/el.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/en.txt
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2004-2006, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/uset_imp.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/uset_imp.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2004-2007, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/xmlparser.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/xmlparser.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2004-2010, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/ctestfw/unicode/testtype.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/ctestfw/unicode/testtype.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2004-2011, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucase.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/utext.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ucase.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/utext.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2004-2012, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/utmscale.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/utmscale.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2004-2012, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ubidi_props.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ubidi_props.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucase.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ubidi_props.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ubidi_props.h
+FILE: ../../../flutter/third_party/icu/source/common/ucase.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2004-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/uregex.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/uregex.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2004-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/regexst.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/regexst.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2004-2015, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ulocimp.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/unidata/changes.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/ucol_sit.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/uregex.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ulocimp.h
+FILE: ../../../flutter/third_party/icu/source/data/unidata/changes.txt
+FILE: ../../../flutter/third_party/icu/source/i18n/ucol_sit.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/uregex.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2004-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/swapimpl.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/swapimpl.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2005, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/csrecog.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/csrecog.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2005-2006, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/inputext.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/inputext.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2005-2008, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/wintz.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/wintz.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2005-2011, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/ucasemap.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/csmatch.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/csmatch.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/csrecog.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/csrmbcs.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/csrucode.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/csrutf8.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/writesrc.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/writesrc.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ucasemap.h
+FILE: ../../../flutter/third_party/icu/source/i18n/csmatch.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/csmatch.h
+FILE: ../../../flutter/third_party/icu/source/i18n/csrecog.h
+FILE: ../../../flutter/third_party/icu/source/i18n/csrmbcs.h
+FILE: ../../../flutter/third_party/icu/source/i18n/csrucode.h
+FILE: ../../../flutter/third_party/icu/source/i18n/csrutf8.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/writesrc.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/writesrc.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2005-2012, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/csrucode.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/ucsdet.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/csrucode.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/ucsdet.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2005-2013, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/csrutf8.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/icupkg/icupkg.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/package.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/swapimpl.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/csrutf8.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/icupkg/icupkg.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/package.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/swapimpl.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2005-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/wintz.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/csr2022.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/csrsbcs.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/windtfmt.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/winnmfmt.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/wintz.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/csr2022.h
+FILE: ../../../flutter/third_party/icu/source/i18n/csrsbcs.h
+FILE: ../../../flutter/third_party/icu/source/i18n/windtfmt.h
+FILE: ../../../flutter/third_party/icu/source/i18n/winnmfmt.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2005-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucasemap.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/utext.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/csdetect.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/csdetect.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/csr2022.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/csrmbcs.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/csrsbcs.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/inputext.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/ucsdet.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/windtfmt.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/winnmfmt.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/pkg_imp.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ucasemap.cpp
+FILE: ../../../flutter/third_party/icu/source/common/utext.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/csdetect.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/csdetect.h
+FILE: ../../../flutter/third_party/icu/source/i18n/csr2022.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/csrmbcs.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/csrsbcs.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/inputext.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/ucsdet.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/windtfmt.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/winnmfmt.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/pkg_imp.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2005-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/localsvc.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/localsvc.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2006 International Business Machines Corporation        *
+and others. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ubrkimpl.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ubrkimpl.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2006, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/brkeng.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/brkeng.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2006-2012, International Business Machines Corporation and others. *
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/dictbe.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/dictbe.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2006-2014, International Business Machines Corporation   *
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/brkeng.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/dictbe.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/brkeng.cpp
+FILE: ../../../flutter/third_party/icu/source/common/dictbe.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2006-2016, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/bmpset.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unisetspan.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/bmpset.h
+FILE: ../../../flutter/third_party/icu/source/common/unisetspan.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2007, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/msgfmt_impl.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/msgfmt_impl.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2007-2008, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/dtrule.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/tztrans.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/dtrule.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/tztrans.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2007-2008, International Business Machines Corporation and         *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/tzrule.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/tzrule.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2007-2008, International Business Machines Corporation and    *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/bmpset.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unisetspan.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/bmpset.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unisetspan.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2007-2012, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/dtrule.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/tzrule.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/tztrans.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/dtrule.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/tzrule.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/tztrans.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2007-2012, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/chnsecal.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/chnsecal.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2007-2013, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/basictz.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/rbtz.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/basictz.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/msgfmt.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/vtzone.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/basictz.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/rbtz.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/basictz.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/msgfmt.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/vtzone.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2007-2013, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/rbtz.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/zonemeta.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/rbtz.h
+FILE: ../../../flutter/third_party/icu/source/i18n/zonemeta.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2007-2013, International Business Machines Corporation and    *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/tzcode/icuzones + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/tzcode/icuzones
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2007-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/chnsecal.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/chnsecal.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2007-2014, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/plurfmt.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/zonemeta.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/plurfmt.h
+FILE: ../../../flutter/third_party/icu/source/i18n/zonemeta.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2007-2014, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/udatpg.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/udatpg.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2007-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/tzcode/icuzdump.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/tzcode/icuzdump.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2007-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/dt_impl.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/dtitv_impl.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/dtptngen.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/dtptngen_impl.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/plurrule.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/plurrule_impl.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/reldtfmt.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/dtptngen.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/vtzone.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/dt_impl.h
+FILE: ../../../flutter/third_party/icu/source/i18n/dtitv_impl.h
+FILE: ../../../flutter/third_party/icu/source/i18n/dtptngen.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/dtptngen_impl.h
+FILE: ../../../flutter/third_party/icu/source/i18n/plurrule.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/plurrule_impl.h
+FILE: ../../../flutter/third_party/icu/source/i18n/reldtfmt.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/dtptngen.h
+FILE: ../../../flutter/third_party/icu/source/i18n/vtzone.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2007-2016, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/reldtfmt.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/reldtfmt.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2007-2016, International Business Machines Corporation and    *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/tmutamt.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/tmutamt.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2008, Google, International Business Machines Corporation and *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/pkg_gencmn.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/pkg_gencmn.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2008, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/dtintrv.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/dtintrv.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2008, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/dtintrv.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/dtintrv.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2008-2009, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/wintzimpl.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/pkg_genc.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/wintzimpl.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/pkg_genc.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2008-2011, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucnvsel.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/ucnvsel.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ucnvsel.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ucnvsel.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2008-2011, International Business Machines
+Corporation, Google and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/pkg_gencmn.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/pkg_gencmn.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2008-2012, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/icu4j-readme.txt + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/icu4j-readme.txt
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2008-2012, International Business Machines Corporation         *
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/uspoof_impl.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/uspoof_impl.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2008-2013, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/gender.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/gender.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/gender.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/gender.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2008-2013, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/tmutfmt.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/tmutfmt.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2008-2014, Google, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/tmunit.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/tmunit.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2008-2014, Google, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/tmutfmt.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/tmutfmt.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2008-2015, Google, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/brktrans.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/brktrans.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/uspoof_conf.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/pkg_icu.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/brktrans.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/brktrans.h
+FILE: ../../../flutter/third_party/icu/source/i18n/uspoof_conf.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/pkg_icu.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2008-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/uspoof.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/uspoof_build.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/uspoof.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/uspoof_build.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2008-2015, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/plurrule.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/plurrule.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2008-2015, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/uspoof_conf.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/uspoof_impl.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/pkg_icu.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/uspoof_conf.h
+FILE: ../../../flutter/third_party/icu/source/i18n/uspoof_impl.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/pkg_icu.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2008-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/uspoof.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/uspoof.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2008-2016, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/dtitvfmt.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/dtitvinf.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/dtitvfmt.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/dtitvinf.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/dtitvfmt.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/dtitvinf.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/dtitvfmt.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/dtitvinf.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2008-2016, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/misc/icustd.txt + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/misc/icustd.txt
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2009 International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/filetools.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/filetools.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2009, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/icuinfo/icuplugins_windows_sample.txt + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/icuinfo/icuplugins_windows_sample.txt
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2009-2010 IBM Corporation and Others.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/tmutamt.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/tmutamt.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2009-2010, Google, International Business Machines Corporation and *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/ztrans.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/ztrans.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2009-2010, International Business Machines Corporation and         *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucln_imp.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ucln_imp.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2009-2011, International Business Machines
+               Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/errorcode.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/icudataver.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/errorcode.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/flagparser.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/errorcode.cpp
+FILE: ../../../flutter/third_party/icu/source/common/icudataver.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unicode/errorcode.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/flagparser.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2009-2011, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/bytestream.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/bytestream.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2009-2011, International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/vzone.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/zrule.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/vzone.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/zrule.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2009-2011, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libjpeg-turbo
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/simd/jsimd_arm64_neon.S
+TYPE: LicenseType.zlib
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jsimd_arm64_neon.S
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2009-2011, Nokia Corporation and/or its subsidiary(-ies).
+All Rights Reserved.
+Author: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Copyright (C) 2013-2014, Linaro Limited.  All Rights Reserved.
+Author: Ragesh Radhakrishnan <ragesh.r@linaro.org>
+Copyright (C) 2014-2016, D. R. Commander.  All Rights Reserved.
+Copyright (C) 2015-2016, Matthieu Darbois.  All Rights Reserved.
+Copyright (C) 2016, Siarhei Siamashka.  All Rights Reserved.
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libjpeg-turbo
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/simd/jsimd_arm_neon.S
+TYPE: LicenseType.zlib
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jsimd_arm_neon.S
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2009-2011, Nokia Corporation and/or its subsidiary(-ies).
+All Rights Reserved.
+Author: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Copyright (C) 2014, Siarhei Siamashka.  All Rights Reserved.
+Copyright (C) 2014, Linaro Limited.  All Rights Reserved.
+Copyright (C) 2015, D. R. Commander.  All Rights Reserved.
+Copyright (C) 2015-2016, Matthieu Darbois.  All Rights Reserved.
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/filterednormalizer2.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-33722_P12A_P12A-2009_U2.ucm + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/filterednormalizer2.cpp
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-33722_P12A_P12A-2009_U2.ucm
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2009-2012, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/bytestream.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/bytestream.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2009-2012, International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/fpositer.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/fpositer.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2009-2012, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/icudataver.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/normalizer2.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/wintzimpl.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/filetools.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/icudataver.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/normalizer2.h
+FILE: ../../../flutter/third_party/icu/source/i18n/wintzimpl.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/filetools.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2009-2013, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/stringpiece.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/stringpiece.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/stringpiece.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unicode/stringpiece.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2009-2013, International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/smpdtfst.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/smpdtfst.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/smpdtfst.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/smpdtfst.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2009-2013, International Business Machines Corporation and    *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ureslocs.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ureslocs.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2009-2014 International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/normalizer2impl.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/normalizer2impl.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/std_string.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/gennorm2/gennorm2.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/gennorm2/n2builder.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/normalizer2impl.cpp
+FILE: ../../../flutter/third_party/icu/source/common/normalizer2impl.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/std_string.h
+FILE: ../../../flutter/third_party/icu/source/tools/gennorm2/gennorm2.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/gennorm2/n2builder.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2009-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/alphaindex.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/currpinf.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/alphaindex.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/currpinf.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2009-2014, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/icuplug.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/icuplugimp.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/uloc_tag.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/icuplug.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/unorm2.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/udatpg.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/icuinfo/testplug.c + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/flagparser.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/icuplug.cpp
+FILE: ../../../flutter/third_party/icu/source/common/icuplugimp.h
+FILE: ../../../flutter/third_party/icu/source/common/uloc_tag.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unicode/icuplug.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/unorm2.h
+FILE: ../../../flutter/third_party/icu/source/i18n/udatpg.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/icuinfo/testplug.c
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/flagparser.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2009-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/fphdlimp.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/plurfmt.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/fphdlimp.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/plurfmt.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2009-2015, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/fphdlimp.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/currpinf.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/fphdlimp.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/currpinf.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2009-2015, International Business Machines Corporation and    *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/normalizer2.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ulist.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ulist.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/localpointer.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/gencfu/gencfu.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/gennorm2/n2builder.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/pkg_genc.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/normalizer2.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ulist.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ulist.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/localpointer.h
+FILE: ../../../flutter/third_party/icu/source/tools/gencfu/gencfu.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/gennorm2/n2builder.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/pkg_genc.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2009-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/vzone.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/zrule.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/ztrans.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/vzone.h
+FILE: ../../../flutter/third_party/icu/source/i18n/zrule.h
+FILE: ../../../flutter/third_party/icu/source/i18n/ztrans.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2009-2016, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/tmunit.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/tmunit.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2009-2016, International Business Machines Corporation,       *
+Google, and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/nounit.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/nounit.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2009-2017, International Business Machines Corporation,       *
+Google, and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/selfmt.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/selfmtimpl.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/selfmt.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/umsg.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/selfmt.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/selfmtimpl.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/selfmt.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/umsg.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2010 , Yahoo! Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-d1.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-d2.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-d3.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-d4.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-d5.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-d6.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-d7.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-s1.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-s2.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-s3.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-t.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/denseranges.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/denseranges.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-d1.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-d2.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-d3.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-d4.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-d5.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-d6.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-d7.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-s1.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-s2.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-s3.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-t.ucm
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/denseranges.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/denseranges.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2010, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/bytestrie.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucharstrie.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucharstrieiterator.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/bytestrie.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucharstrie.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucharstrieiterator.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2010-2011, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/udateintervalformat.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/udateintervalformat.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2010-2011, International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/bytestriebuilder.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/bytestrieiterator.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/stringtriebuilder.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucharstriebuilder.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/bytestrie.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/idna.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/ucharstrie.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/ustringtrie.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/fpositer.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/bytestriebuilder.cpp
+FILE: ../../../flutter/third_party/icu/source/common/bytestrieiterator.cpp
+FILE: ../../../flutter/third_party/icu/source/common/stringtriebuilder.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucharstriebuilder.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unicode/bytestrie.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/idna.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ucharstrie.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ustringtrie.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/fpositer.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2010-2012, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/upluralrules.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/upluralrules.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2010-2012, International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/stringtriebuilder.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/stringtriebuilder.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2010-2012,2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/udateintervalformat.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/udateintervalformat.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2010-2012,2015 International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/ugender.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/upluralrules.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/ugender.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/upluralrules.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2010-2013, International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collation.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationiterator.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationiterator.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/utf16collationiterator.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/utf16collationiterator.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/collation.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collationiterator.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collationiterator.h
+FILE: ../../../flutter/third_party/icu/source/i18n/utf16collationiterator.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/utf16collationiterator.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2010-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/numsys.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/numsys.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2010-2014, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/fmtableimp.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/fmtableimp.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2010-2014, International Business Machines Corporation and    *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/cldr-icu-readme.txt + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/cldr-icu-readme.txt
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2010-2014, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/charstr.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucnv_ct.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/uts46.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collation.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationdata.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/charstr.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_ct.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uts46.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collation.h
+FILE: ../../../flutter/third_party/icu/source/i18n/collationdata.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2010-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/numsys.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/numsys.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2010-2015, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/misc/icuver.txt + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/misc/icuver.txt
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2010-2016 International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/bytestriebuilder.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/ucharstriebuilder.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/bytestriebuilder.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ucharstriebuilder.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2010-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/uldnames.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/uldnames.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2010-2016, International Business Machines Corporation and
+others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/locdspnm.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/locdspnm.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/locdspnm.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unicode/locdspnm.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2010-2016, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-gobject-enums.cc.tmpl
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-gobject-structs.h
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-gobject.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-gobject-enums.cc.tmpl
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-gobject-structs.h
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-gobject.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2011  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: include
+ORIGIN: ../../../flutter/third_party/inja/third_party/include/hayai/hayai_clock.hpp
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/inja/third_party/include/hayai/hayai_clock.hpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2011 Nick Bruun <nick@bruun.co>
+Copyright (C) 2013 Vlad Lazarenko <vlad@lazarenko.me>
+Copyright (C) 2014 Nicolas Pauss <nicolas.pauss@gmail.com>
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/messageimpl.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/patternprops.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/patternprops.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucasemap_titlecase_brkiter.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/uniset_closure.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unistr_case_locale.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unistr_titlecase_brkiter.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ustr_titlecase_brkiter.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ustrcase_locale.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/messageimpl.h
+FILE: ../../../flutter/third_party/icu/source/common/patternprops.cpp
+FILE: ../../../flutter/third_party/icu/source/common/patternprops.h
+FILE: ../../../flutter/third_party/icu/source/common/ucasemap_titlecase_brkiter.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uniset_closure.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unistr_case_locale.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unistr_titlecase_brkiter.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ustr_titlecase_brkiter.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ustrcase_locale.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2011, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/appendable.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/messagepattern.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/appendable.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/appendable.cpp
+FILE: ../../../flutter/third_party/icu/source/common/messagepattern.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unicode/appendable.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2011-2012, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/tzgnames.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/tzgnames.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2011-2012, International Business Machines Corporation and    *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/translit/el_Upper.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/translit/nl_Title.txt + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/translit/el_Upper.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/nl_Title.txt
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2011-2013, Apple Inc. and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/translit/az_Upper.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/translit/lt_Upper.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/translit/tr_Upper.txt + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/translit/az_Upper.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/lt_Upper.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/tr_Upper.txt
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2011-2013, Apple Inc.; Unicode, Inc.; and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/messagepattern.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/ppucd.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/messagepattern.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/ppucd.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2011-2013, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/alphaindex.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/alphaindex.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2011-2014 International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/ppucd.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/ppucd.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2011-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/uposixdefs.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/uposixdefs.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2011-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/tzfmt.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/tzfmt.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/tzfmt.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/tzfmt.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2011-2015, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/tznames.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/tznames.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2011-2015, International Business Machines Corporation and    *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/tzgnames.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/tznames_impl.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/tznames_impl.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/tznames.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/tzgnames.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/tznames_impl.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/tznames_impl.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/tznames.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2011-2016, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ucd.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ucd.cc
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2012 Grigori Goronzy <greg@kinoho.net>
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/regeximp.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/regeximp.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2012 International Business Machines Corporation
+and others. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/enumset.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/enumset.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2012,2014 International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationdatabuilder.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationfcd.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationkeys.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationroot.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationroot.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/uitercollationiterator.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/utf8collationiterator.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/collationdatabuilder.h
+FILE: ../../../flutter/third_party/icu/source/i18n/collationfcd.h
+FILE: ../../../flutter/third_party/icu/source/i18n/collationkeys.h
+FILE: ../../../flutter/third_party/icu/source/i18n/collationroot.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collationroot.h
+FILE: ../../../flutter/third_party/icu/source/i18n/uitercollationiterator.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/utf8collationiterator.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2012-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationdata.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationdatabuilder.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationkeys.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/collationdata.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collationdatabuilder.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collationkeys.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2012-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/utypeinfo.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/uitercollationiterator.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/compactdecimalformat.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/listformatter.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/utf8collationiterator.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/utypeinfo.h
+FILE: ../../../flutter/third_party/icu/source/i18n/uitercollationiterator.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/compactdecimalformat.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/listformatter.h
+FILE: ../../../flutter/third_party/icu/source/i18n/utf8collationiterator.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2012-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: xxhash
+ORIGIN: ../../../flutter/third_party/angle/src/common/third_party/xxhash/xxhash.c
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/angle/src/common/third_party/xxhash/xxhash.c
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2012-2016, Yann Collet
+
+BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: xxhash
+ORIGIN: ../../../flutter/third_party/angle/src/common/third_party/xxhash/xxhash.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/angle/src/common/third_party/xxhash/xxhash.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2012-2016, Yann Collet.
+
+BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: vulkan-validation-layers
+ORIGIN: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/xxhash.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/xxhash.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2012-2021 Yann Collet
+
+BSD 2-Clause License (https://www.opensource.org/licenses/bsd-license.php)
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+     copyright notice, this list of conditions and the following disclaimer
+     in the documentation and/or other materials provided with the
+     distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-gobject-enums.h.tmpl
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-gobject-enums.h.tmpl
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2013  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/StandAlone/Worklist.h
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/ScanContext.h
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/limits.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/StandAlone/Worklist.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/ScanContext.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/limits.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2013 LunarG, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/PpContext.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/PpContext.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2013 LunarG, Inc.
+Copyright (C) 2015-2018 Google, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/linkValidate.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/linkValidate.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2013 LunarG, Inc.
+Copyright (C) 2017 ARM Limited.
+Copyright (C) 2015-2018 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/misc/currencyNumericCodes.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/scriptset.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/misc/currencyNumericCodes.txt
+FILE: ../../../flutter/third_party/icu/source/i18n/scriptset.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2013, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/dangical.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/dangical.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/dangical.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/dangical.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2013, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/region_impl.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/region_impl.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2013, International Business Machines Corporation and         *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unumsys.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unumsys.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2013, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libjpeg-turbo
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/simd/jsimd_mips_dspr2_asm.h
+TYPE: LicenseType.zlib
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jsimd_mips_dspr2_asm.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2013, MIPS Technologies, Inc., California.
+All Rights Reserved.
+Authors:  Teodora Novkovic (teodora.novkovic@imgtec.com)
+          Darko Laus       (darko.laus@imgtec.com)
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationbuilder.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationbuilder.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationdatawriter.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationrootelements.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationrootelements.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationruleparser.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationsets.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationsets.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationtailoring.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/tzcode/icuregions + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/collationbuilder.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collationbuilder.h
+FILE: ../../../flutter/third_party/icu/source/i18n/collationdatawriter.h
+FILE: ../../../flutter/third_party/icu/source/i18n/collationrootelements.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collationrootelements.h
+FILE: ../../../flutter/third_party/icu/source/i18n/collationruleparser.h
+FILE: ../../../flutter/third_party/icu/source/i18n/collationsets.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collationsets.h
+FILE: ../../../flutter/third_party/icu/source/i18n/collationtailoring.h
+FILE: ../../../flutter/third_party/icu/source/tools/tzcode/icuregions
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2013-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/unumsys.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/unumsys.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2013-2014, International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/sharedbreakiterator.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/sharedbreakiterator.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2013-2014, International Business Machines Corporation and    *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/uformattable.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/uformattable.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2013-2014, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libjpeg-turbo
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/simd/jsimd_mips_dspr2.S
+TYPE: LicenseType.zlib
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jsimd_mips_dspr2.S
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2013-2014, MIPS Technologies, Inc., California.
+All Rights Reserved.
+Authors:  Teodora Novkovic (teodora.novkovic@imgtec.com)
+          Darko Laus       (darko.laus@imgtec.com)
+Copyright (C) 2015, D. R. Commander.  All Rights Reserved.
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationdatareader.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationdatareader.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationdatawriter.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationfastlatin.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationfastlatin.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationfastlatinbuilder.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationruleparser.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationsettings.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationsettings.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationtailoring.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/collationinfo.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/collationinfo.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/collationdatareader.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collationdatareader.h
+FILE: ../../../flutter/third_party/icu/source/i18n/collationdatawriter.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collationfastlatin.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collationfastlatin.h
+FILE: ../../../flutter/third_party/icu/source/i18n/collationfastlatinbuilder.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collationruleparser.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collationsettings.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collationsettings.h
+FILE: ../../../flutter/third_party/icu/source/i18n/collationtailoring.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/collationinfo.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/collationinfo.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2013-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/uregion.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/uregion.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2013-2015, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/reflection.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/reflection.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/reflection.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/reflection.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2013-2016 LunarG, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/uscript_props.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collationfastlatinbuilder.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/listformatter.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/uscript_props.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collationfastlatinbuilder.h
+FILE: ../../../flutter/third_party/icu/source/i18n/listformatter.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2013-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/lang/an.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/lang/ku.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/lang/tg.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/lang/wa.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/locales/ku.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/locales/tg.txt + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/lang/an.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ku.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/tg.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/wa.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ku.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/tg.txt
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2014 International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/zone/tzdbNames.txt + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/zone/tzdbNames.txt
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2014 International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/GlslangToSpv.h
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/spvIR.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/GlslangToSpv.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/spvIR.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2014 LunarG, Inc.
+Copyright (C) 2015-2018 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libjpeg-turbo
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/simd/jccolor-altivec.c
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/simd/jcgray-altivec.c
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/simd/jfdctfst-altivec.c
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/simd/jfdctint-altivec.c
+TYPE: LicenseType.zlib
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jccolor-altivec.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jcgray-altivec.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jfdctfst-altivec.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jfdctint-altivec.c
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2014, D. R. Commander.  All Rights Reserved.
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/dictionarydata.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/loadednormalizer2impl.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/norm2allmodes.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/euc-tw-2014.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/ibm-1375_P100-2008.ucm + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/scriptset.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/sharedbreakiterator.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/sharedcalendar.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/shareddateformatsymbols.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/sharednumberformat.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/sharedpluralrules.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/dictionarydata.h
+FILE: ../../../flutter/third_party/icu/source/common/loadednormalizer2impl.cpp
+FILE: ../../../flutter/third_party/icu/source/common/norm2allmodes.h
+FILE: ../../../flutter/third_party/icu/source/data/mappings/euc-tw-2014.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1375_P100-2008.ucm
+FILE: ../../../flutter/third_party/icu/source/i18n/scriptset.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/sharedbreakiterator.h
+FILE: ../../../flutter/third_party/icu/source/i18n/sharedcalendar.h
+FILE: ../../../flutter/third_party/icu/source/i18n/shareddateformatsymbols.h
+FILE: ../../../flutter/third_party/icu/source/i18n/sharednumberformat.h
+FILE: ../../../flutter/third_party/icu/source/i18n/sharedpluralrules.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/uregion.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/uregion.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2014, International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/disassemble.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/disassemble.h
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/doc.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/disassemble.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/disassemble.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/doc.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2014-2015 LunarG, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/SpvBuilder.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/SpvBuilder.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2014-2015 LunarG, Inc.
+Copyright (C) 2015-2018 Google, Inc.
+Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/SpvBuilder.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/SpvBuilder.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2014-2015 LunarG, Inc.
+Copyright (C) 2015-2020 Google, Inc.
+Copyright (C) 2017 ARM Limited.
+Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/doc.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/doc.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2014-2015 LunarG, Inc.
+Copyright (C) 2022-2024 Arm Limited.
+Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libjpeg-turbo
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/simd/jidctfst-altivec.c
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/simd/jidctint-altivec.c
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/simd/jquanti-altivec.c
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/simd/jsimd_altivec.h
+TYPE: LicenseType.zlib
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jidctfst-altivec.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jidctint-altivec.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jquanti-altivec.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jsimd_altivec.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2014-2015, D. R. Commander.  All Rights Reserved.
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libjpeg-turbo
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/simd/jccolext-altivec.c
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/simd/jcgryext-altivec.c
+TYPE: LicenseType.zlib
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jccolext-altivec.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jcgryext-altivec.c
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2014-2015, D. R. Commander.  All Rights Reserved.
+Copyright (C) 2014, Jay Foad.  All Rights Reserved.
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/filteredbrk.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/filteredbrk.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2014-2015, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/GlslangToSpv.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/GlslangToSpv.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2014-2016 LunarG, Inc.
+Copyright (C) 2015-2020 Google, Inc.
+Copyright (C) 2017, 2022-2024 Arm Limited.
+Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/SpvTools.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/SpvTools.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2014-2016 LunarG, Inc.
+Copyright (C) 2018 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/SpvTools.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/SpvTools.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2014-2016 LunarG, Inc.
+Copyright (C) 2018-2020 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/dictionarydata.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/simpleformatter.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/uloc_keytype.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/simpleformatter.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/quantityformatter.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/quantityformatter.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/dictionarydata.cpp
+FILE: ../../../flutter/third_party/icu/source/common/simpleformatter.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uloc_keytype.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unicode/simpleformatter.h
+FILE: ../../../flutter/third_party/icu/source/i18n/quantityformatter.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/quantityformatter.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2014-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/udisplaycontext.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/udisplaycontext.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2014-2016, International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/reldatefmt.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/reldatefmt.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2014-2016, International Business Machines Corporation and
+others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/region.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/reldatefmt.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/region.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/reldatefmt.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2014-2016, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/region.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/region.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2014-2016, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/SPVRemapper.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/SPVRemapper.h
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/StandAlone/spirv-remap.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/SPVRemapper.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/SPVRemapper.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/StandAlone/spirv-remap.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2015 LunarG, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: rapidjson
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/schema.h + http://opensource->org/licenses/MIT referenced by ../../../flutter/third_party/rapidjson/include/rapidjson/schema.h
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/schema.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip-> All rights reserved->
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: rapidjson
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/allocators.h + http://opensource.org/licenses/MIT referenced by ../../../flutter/third_party/rapidjson/include/rapidjson/allocators.h
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/cursorstreamwrapper.h + http://opensource.org/licenses/MIT referenced by ../../../flutter/third_party/rapidjson/include/rapidjson/cursorstreamwrapper.h
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/document.h + http://opensource.org/licenses/MIT referenced by ../../../flutter/third_party/rapidjson/include/rapidjson/document.h
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/encodedstream.h + http://opensource.org/licenses/MIT referenced by ../../../flutter/third_party/rapidjson/include/rapidjson/encodedstream.h
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/encodings.h + http://opensource.org/licenses/MIT referenced by ../../../flutter/third_party/rapidjson/include/rapidjson/encodings.h
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/error/en.h + http://opensource.org/licenses/MIT referenced by ../../../flutter/third_party/rapidjson/include/rapidjson/error/en.h
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/error/error.h + http://opensource.org/licenses/MIT referenced by ../../../flutter/third_party/rapidjson/include/rapidjson/error/error.h
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/filereadstream.h + http://opensource.org/licenses/MIT referenced by ../../../flutter/third_party/rapidjson/include/rapidjson/filereadstream.h
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/filewritestream.h + http://opensource.org/licenses/MIT referenced by ../../../flutter/third_party/rapidjson/include/rapidjson/filewritestream.h
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/fwd.h + http://opensource.org/licenses/MIT referenced by ../../../flutter/third_party/rapidjson/include/rapidjson/fwd.h
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/internal/biginteger.h + http://opensource.org/licenses/MIT referenced by ../../../flutter/third_party/rapidjson/include/rapidjson/internal/biginteger.h
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/internal/diyfp.h + http://opensource.org/licenses/MIT referenced by ../../../flutter/third_party/rapidjson/include/rapidjson/internal/diyfp.h
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/internal/dtoa.h + http://opensource.org/licenses/MIT referenced by ../../../flutter/third_party/rapidjson/include/rapidjson/internal/dtoa.h
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/internal/ieee754.h + http://opensource.org/licenses/MIT referenced by ../../../flutter/third_party/rapidjson/include/rapidjson/internal/ieee754.h
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/internal/itoa.h + http://opensource.org/licenses/MIT referenced by ../../../flutter/third_party/rapidjson/include/rapidjson/internal/itoa.h
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/internal/meta.h + http://opensource.org/licenses/MIT referenced by ../../../flutter/third_party/rapidjson/include/rapidjson/internal/meta.h
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/internal/pow10.h + http://opensource.org/licenses/MIT referenced by ../../../flutter/third_party/rapidjson/include/rapidjson/internal/pow10.h
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/internal/regex.h + http://opensource.org/licenses/MIT referenced by ../../../flutter/third_party/rapidjson/include/rapidjson/internal/regex.h
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/internal/stack.h + http://opensource.org/licenses/MIT referenced by ../../../flutter/third_party/rapidjson/include/rapidjson/internal/stack.h
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/internal/strfunc.h + http://opensource.org/licenses/MIT referenced by ../../../flutter/third_party/rapidjson/include/rapidjson/internal/strfunc.h
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/internal/strtod.h + http://opensource.org/licenses/MIT referenced by ../../../flutter/third_party/rapidjson/include/rapidjson/internal/strtod.h
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/internal/swap.h + http://opensource.org/licenses/MIT referenced by ../../../flutter/third_party/rapidjson/include/rapidjson/internal/swap.h
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/istreamwrapper.h + http://opensource.org/licenses/MIT referenced by ../../../flutter/third_party/rapidjson/include/rapidjson/istreamwrapper.h
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/memorybuffer.h + http://opensource.org/licenses/MIT referenced by ../../../flutter/third_party/rapidjson/include/rapidjson/memorybuffer.h
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/memorystream.h + http://opensource.org/licenses/MIT referenced by ../../../flutter/third_party/rapidjson/include/rapidjson/memorystream.h
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/ostreamwrapper.h + http://opensource.org/licenses/MIT referenced by ../../../flutter/third_party/rapidjson/include/rapidjson/ostreamwrapper.h
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/pointer.h + http://opensource.org/licenses/MIT referenced by ../../../flutter/third_party/rapidjson/include/rapidjson/pointer.h
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/prettywriter.h + http://opensource.org/licenses/MIT referenced by ../../../flutter/third_party/rapidjson/include/rapidjson/prettywriter.h
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/rapidjson.h + http://opensource.org/licenses/MIT referenced by ../../../flutter/third_party/rapidjson/include/rapidjson/rapidjson.h
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/reader.h + http://opensource.org/licenses/MIT referenced by ../../../flutter/third_party/rapidjson/include/rapidjson/reader.h
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/stream.h + http://opensource.org/licenses/MIT referenced by ../../../flutter/third_party/rapidjson/include/rapidjson/stream.h
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/stringbuffer.h + http://opensource.org/licenses/MIT referenced by ../../../flutter/third_party/rapidjson/include/rapidjson/stringbuffer.h
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/writer.h + http://opensource.org/licenses/MIT referenced by ../../../flutter/third_party/rapidjson/include/rapidjson/writer.h
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/allocators.h
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/cursorstreamwrapper.h
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/document.h
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/encodedstream.h
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/encodings.h
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/error/en.h
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/error/error.h
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/filereadstream.h
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/filewritestream.h
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/fwd.h
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/internal/biginteger.h
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/internal/diyfp.h
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/internal/dtoa.h
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/internal/ieee754.h
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/internal/itoa.h
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/internal/meta.h
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/internal/pow10.h
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/internal/regex.h
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/internal/stack.h
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/internal/strfunc.h
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/internal/strtod.h
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/internal/swap.h
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/istreamwrapper.h
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/memorybuffer.h
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/memorystream.h
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/ostreamwrapper.h
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/pointer.h
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/prettywriter.h
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/rapidjson.h
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/reader.h
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/stream.h
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/stringbuffer.h
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/writer.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libjpeg-turbo
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/simd/jcsample-altivec.c
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/simd/jdcolext-altivec.c
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/simd/jdcolor-altivec.c
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/simd/jdmerge-altivec.c
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/simd/jdmrgext-altivec.c
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/simd/jdsample-altivec.c
+TYPE: LicenseType.zlib
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jcsample-altivec.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jdcolext-altivec.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jdcolor-altivec.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jdmerge-altivec.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jdmrgext-altivec.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jdsample-altivec.c
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2015, D. R. Commander.  All Rights Reserved.
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/sharedobject.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/sharedobject.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/ufieldpositer.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/ulistformatter.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/ufieldpositer.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/ulistformatter.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2015, International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/standardplural.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/standardplural.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/standardplural.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/standardplural.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2015, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/pluralmap.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/pluralmap.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unifiedcache.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unifiedcache.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unistrappender.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/numsys_impl.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/pluralmap.cpp
+FILE: ../../../flutter/third_party/icu/source/common/pluralmap.h
+FILE: ../../../flutter/third_party/icu/source/common/unifiedcache.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unifiedcache.h
+FILE: ../../../flutter/third_party/icu/source/common/unistrappender.h
+FILE: ../../../flutter/third_party/icu/source/i18n/numsys_impl.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2015, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/propagateNoContraction.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/propagateNoContraction.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/propagateNoContraction.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/propagateNoContraction.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2015-2016 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of Google Inc. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/cstr.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/resource.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/resource.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/sharedobject.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/cstr.cpp
+FILE: ../../../flutter/third_party/icu/source/common/resource.cpp
+FILE: ../../../flutter/third_party/icu/source/common/resource.h
+FILE: ../../../flutter/third_party/icu/source/common/sharedobject.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2015-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/ufieldpositer.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/ulistformatter.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/ufieldpositer.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/ulistformatter.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2015-2016, International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/collunsafe.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/collunsafe.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2015-2016, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/parseVersions.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/parseVersions.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2015-2018 Google, Inc.
+Copyright (C) 2017 ARM Limited.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/InReadableOrder.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/InReadableOrder.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2016 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/Logger.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/Logger.h
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Public/ResourceLimits.h
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/ResourceLimits/ResourceLimits.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/BuiltInResource.FromFile.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/Config.FromFile.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/Initializer.h
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/Link.FromFile.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/Pp.FromFile.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/Settings.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/Settings.h
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/TestFixture.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/TestFixture.h
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/main.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/Logger.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/Logger.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Public/ResourceLimits.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/ResourceLimits/ResourceLimits.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/BuiltInResource.FromFile.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/Config.FromFile.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/Initializer.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/Link.FromFile.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/Pp.FromFile.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/Settings.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/Settings.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/TestFixture.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/TestFixture.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/main.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2016 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of Google Inc. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslOpMap.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslOpMap.h
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslScanContext.h
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslTokenStream.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslTokenStream.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslOpMap.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslOpMap.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslScanContext.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslTokenStream.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslTokenStream.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2016 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of Google, Inc., nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/Hlsl.FromFile.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/Hlsl.FromFile.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2016 Google, Inc.
+Copyright (C) 2016 LunarG, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of Google Inc. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslScanContext.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslTokens.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslScanContext.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslTokens.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2016 Google, Inc.
+Copyright (C) 2016 LunarG, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of Google, Inc., nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/Spv.FromFile.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/Spv.FromFile.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2016 Google, Inc.
+Copyright (C) 2019, 2022-2024 Arm Limited.
+Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of Google Inc. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/AST.FromFile.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/AST.FromFile.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2016 Google, Inc.
+Copyright (C) 2022-2024 Arm Limited.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of Google Inc. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/locales/an.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/locales/wa.txt + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/locales/an.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/wa.txt
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2016 International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslParseables.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslParseables.h
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/LiveTraverser.h
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/iomapper.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslParseables.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslParseables.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/LiveTraverser.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/iomapper.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2016 LunarG, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/Remap.FromFile.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/Remap.FromFile.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2016 LunarG, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of Google Inc. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslAttributes.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslAttributes.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslAttributes.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslAttributes.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2016 LunarG, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of Google, Inc., nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/brkitr/dictionaries/thaidict.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/escapesrc/cptbl.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/dictionaries/thaidict.txt
+FILE: ../../../flutter/third_party/icu/source/tools/escapesrc/cptbl.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2016 and later: Unicode, Inc. and others.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/cstr.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/dayperiodrules.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/dayperiodrules.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/cstr.h
+FILE: ../../../flutter/third_party/icu/source/i18n/dayperiodrules.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/dayperiodrules.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/ureldatefmt.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/ureldatefmt.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2016, International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/Link.FromFile.Vk.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/Link.FromFile.Vk.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2016-2017 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of Google Inc. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/GlslMapIO.FromFile.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/VkRelaxed.FromFile.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/GlslMapIO.FromFile.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/VkRelaxed.FromFile.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2016-2017 Google, Inc.
+Copyright (C) 2020 The Khronos Group Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/iomapper.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/iomapper.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2016-2017 LunarG, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslParseHelper.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslParseHelper.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2016-2018 Google, Inc.
+Copyright (C) 2016 LunarG, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslGrammar.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslGrammar.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslGrammar.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslGrammar.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2016-2018 Google, Inc.
+Copyright (C) 2016 LunarG, Inc.
+Copyright (C) 2023 Mobica Limited.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of Google, Inc., nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/attribute.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/attribute.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2017 LunarG, Inc.
+Copyright (C) 2018 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/attribute.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/attribute.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2017 LunarG, Inc.
+Copyright (C) 2018 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of Google, Inc., nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslParseHelper.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslParseHelper.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2017-2018 Google, Inc.
+Copyright (C) 2017 LunarG, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/SpvPostProcess.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/SpvPostProcess.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2018 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/HLSL/pch.h
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/pch.h
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/pch.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/HLSL/pch.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/pch.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/gtests/pch.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2018 The Khronos Group Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/build_info.h.tmpl
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/standalone.gclient
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/build_info.h.tmpl
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/standalone.gclient
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2020 The Khronos Group Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of The Khronos Group Inc. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/span.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/span.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2023 LunarG, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: http://www.ietf.org/rfc/rfc3454.txt referenced by ../../../flutter/third_party/icu/source/data/sprep/rfc3491.txt
+ORIGIN: http://www.ietf.org/rfc/rfc3454.txt referenced by ../../../flutter/third_party/icu/source/data/sprep/rfc3530cs.txt
+ORIGIN: http://www.ietf.org/rfc/rfc3454.txt referenced by ../../../flutter/third_party/icu/source/data/sprep/rfc3530csci.txt
+ORIGIN: http://www.ietf.org/rfc/rfc3454.txt referenced by ../../../flutter/third_party/icu/source/data/sprep/rfc3530mixp.txt
+ORIGIN: http://www.ietf.org/rfc/rfc3454.txt referenced by ../../../flutter/third_party/icu/source/data/sprep/rfc3722.txt
+ORIGIN: http://www.ietf.org/rfc/rfc3454.txt referenced by ../../../flutter/third_party/icu/source/data/sprep/rfc3920node.txt
+ORIGIN: http://www.ietf.org/rfc/rfc3454.txt referenced by ../../../flutter/third_party/icu/source/data/sprep/rfc3920res.txt
+ORIGIN: http://www.ietf.org/rfc/rfc3454.txt referenced by ../../../flutter/third_party/icu/source/data/sprep/rfc4011.txt
+ORIGIN: http://www.ietf.org/rfc/rfc3454.txt referenced by ../../../flutter/third_party/icu/source/data/sprep/rfc4013.txt
+ORIGIN: http://www.ietf.org/rfc/rfc3454.txt referenced by ../../../flutter/third_party/icu/source/data/sprep/rfc4505.txt
+ORIGIN: http://www.ietf.org/rfc/rfc3454.txt referenced by ../../../flutter/third_party/icu/source/data/sprep/rfc4518.txt
+ORIGIN: http://www.ietf.org/rfc/rfc3454.txt referenced by ../../../flutter/third_party/icu/source/data/sprep/rfc4518ci.txt
+TYPE: LicenseType.ietf
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc3491.txt
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc3530cs.txt
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc3530csci.txt
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc3530mixp.txt
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc3722.txt
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc3920node.txt
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc3920res.txt
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc4011.txt
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc4013.txt
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc4505.txt
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc4518.txt
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc4518ci.txt
+----------------------------------------------------------------------------------------------------
+Copyright (C) The Internet Society (2002).  All Rights Reserved.
+
+This document and translations of it may be copied and furnished to
+others, and derivative works that comment on or otherwise explain it
+or assist in its implementation may be prepared, copied, published
+and distributed, in whole or in part, without restriction of any
+kind, provided that the above copyright notice and this paragraph are
+included on all such copies and derivative works.  However, this
+document itself may not be modified in any way, such as by removing
+the copyright notice or references to the Internet Society or other
+Internet organizations, except as needed for the purpose of
+developing Internet standards in which case the procedures for
+copyrights defined in the Internet Standards process must be
+followed, or as required to translate it into languages other than
+English.
+
+The limited permissions granted above are perpetual and will not be
+revoked by the Internet Society or its successors or assigns.
+
+This document and the information contained herein is provided on an
+"AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
+TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
+BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
+HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libtess2
+ORIGIN: ../../../flutter/third_party/libtess2/Include/tesselator.h
+ORIGIN: ../../../flutter/third_party/libtess2/LICENSE.txt
+ORIGIN: ../../../flutter/third_party/libtess2/Source/bucketalloc.c
+ORIGIN: ../../../flutter/third_party/libtess2/Source/bucketalloc.h
+ORIGIN: ../../../flutter/third_party/libtess2/Source/dict.c
+ORIGIN: ../../../flutter/third_party/libtess2/Source/dict.h
+ORIGIN: ../../../flutter/third_party/libtess2/Source/geom.c
+ORIGIN: ../../../flutter/third_party/libtess2/Source/geom.h
+ORIGIN: ../../../flutter/third_party/libtess2/Source/mesh.c
+ORIGIN: ../../../flutter/third_party/libtess2/Source/mesh.h
+ORIGIN: ../../../flutter/third_party/libtess2/Source/priorityq.c
+ORIGIN: ../../../flutter/third_party/libtess2/Source/priorityq.h
+ORIGIN: ../../../flutter/third_party/libtess2/Source/sweep.c
+ORIGIN: ../../../flutter/third_party/libtess2/Source/sweep.h
+ORIGIN: ../../../flutter/third_party/libtess2/Source/tess.c
+ORIGIN: ../../../flutter/third_party/libtess2/Source/tess.h
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/libtess2/Bin/bg.svg
+FILE: ../../../flutter/third_party/libtess2/Bin/fg.svg
+FILE: ../../../flutter/third_party/libtess2/Include/tesselator.h
+FILE: ../../../flutter/third_party/libtess2/Source/bucketalloc.c
+FILE: ../../../flutter/third_party/libtess2/Source/bucketalloc.h
+FILE: ../../../flutter/third_party/libtess2/Source/dict.c
+FILE: ../../../flutter/third_party/libtess2/Source/dict.h
+FILE: ../../../flutter/third_party/libtess2/Source/geom.c
+FILE: ../../../flutter/third_party/libtess2/Source/geom.h
+FILE: ../../../flutter/third_party/libtess2/Source/mesh.c
+FILE: ../../../flutter/third_party/libtess2/Source/mesh.h
+FILE: ../../../flutter/third_party/libtess2/Source/priorityq.c
+FILE: ../../../flutter/third_party/libtess2/Source/priorityq.h
+FILE: ../../../flutter/third_party/libtess2/Source/sweep.c
+FILE: ../../../flutter/third_party/libtess2/Source/sweep.h
+FILE: ../../../flutter/third_party/libtess2/Source/tess.c
+FILE: ../../../flutter/third_party/libtess2/Source/tess.h
+FILE: ../../../flutter/third_party/libtess2/premake4.lua
+----------------------------------------------------------------------------------------------------
+Copyright (C) [dates of first publication] Silicon Graphics, Inc.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice including the dates of first publication and either this
+permission notice or a reference to http://oss.sgi.com/projects/FreeB/ shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL SILICON GRAPHICS, INC.
+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of Silicon Graphics, Inc. shall not
+be used in advertising or otherwise to promote the sale, use or other dealings in
+this Software without prior written authorization from Silicon Graphics, Inc.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/rbt_rule.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/rbt_rule.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) {1999-2001}, International Business Machines Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libjpeg-turbo
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/tjunittest.c
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/tjunittest.c
+----------------------------------------------------------------------------------------------------
+Copyright (C)2009-2014 D. R. Commander.  All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+- Neither the name of the libjpeg-turbo Project nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS",
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libjpeg-turbo
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/turbojpeg.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/turbojpeg.h
+----------------------------------------------------------------------------------------------------
+Copyright (C)2009-2015 D. R. Commander.  All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+- Neither the name of the libjpeg-turbo Project nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS",
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libjpeg-turbo
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/tjbench.c
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/turbojpeg.c
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/tjbench.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/turbojpeg.c
+----------------------------------------------------------------------------------------------------
+Copyright (C)2009-2016 D. R. Commander.  All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+- Neither the name of the libjpeg-turbo Project nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS",
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libjpeg-turbo
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/bmp.h
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/jcstest.c
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/tjutil.c
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/tjutil.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/bmp.h
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jcstest.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/tjutil.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/tjutil.h
+----------------------------------------------------------------------------------------------------
+Copyright (C)2011 D. R. Commander.  All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+- Neither the name of the libjpeg-turbo Project nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS",
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libjpeg-turbo
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/bmp.c
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/bmp.c
+----------------------------------------------------------------------------------------------------
+Copyright (C)2011, 2015 D. R. Commander.  All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+- Neither the name of the libjpeg-turbo Project nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS",
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libjpeg-turbo
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/turbojpeg-jni.c
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/turbojpeg-jni.c
+----------------------------------------------------------------------------------------------------
+Copyright (C)2011-2016 D. R. Commander.  All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+- Neither the name of the libjpeg-turbo Project nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS",
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/normlzr.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/normlzr.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1996-2012, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unorm.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unorm.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1996-2014, International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/normlzr.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/normlzr.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1996-2015, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/ucol.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/ucol.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1996-2015, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/unorm.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/unorm.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1996-2016, International Business Machines Corporation
+              and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucnv_bld.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_bld.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1996-2016, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: expat
+ORIGIN: ../../../flutter/third_party/expat/expat/lib/expat_external.h
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/expat/expat/lib/expat_external.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2000-2004 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2001-2002 Greg Stein <gstein@users.sourceforge.net>
+Copyright (c) 2002-2006 Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2016      Cristian Rodríguez <crrodriguez@opensuse.org>
+Copyright (c) 2016-2019 Sebastian Pipping <sebastian@pipping.org>
+Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
+Copyright (c) 2018      Yury Gribov <tetra2005@gmail.com>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: expat
+ORIGIN: ../../../flutter/third_party/expat/expat/lib/expat.h
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/expat/expat/lib/expat.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2000-2005 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2001-2002 Greg Stein <gstein@users.sourceforge.net>
+Copyright (c) 2002-2016 Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2016-2022 Sebastian Pipping <sebastian@pipping.org>
+Copyright (c) 2016      Cristian Rodríguez <crrodriguez@opensuse.org>
+Copyright (c) 2016      Thomas Beutlich <tc@tbeu.de>
+Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
+Copyright (c) 2022      Thijs Schreijer <thijs@thijsschreijer.nl>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: expat
+ORIGIN: ../../../flutter/third_party/expat/expat/lib/xmlparse.c
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/expat/expat/lib/xmlparse.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2000-2006 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2001-2002 Greg Stein <gstein@users.sourceforge.net>
+Copyright (c) 2002-2016 Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2005-2009 Steven Solie <steven@solie.ca>
+Copyright (c) 2016      Eric Rahm <erahm@mozilla.com>
+Copyright (c) 2016-2022 Sebastian Pipping <sebastian@pipping.org>
+Copyright (c) 2016      Gaurav <g.gupta@samsung.com>
+Copyright (c) 2016      Thomas Beutlich <tc@tbeu.de>
+Copyright (c) 2016      Gustavo Grieco <gustavo.grieco@imag.fr>
+Copyright (c) 2016      Pascal Cuoq <cuoq@trust-in-soft.com>
+Copyright (c) 2016      Ed Schouten <ed@nuxi.nl>
+Copyright (c) 2017-2022 Rhodri James <rhodri@wildebeest.org.uk>
+Copyright (c) 2017      Václav Slavík <vaclav@slavik.io>
+Copyright (c) 2017      Viktor Szakats <commit@vsz.me>
+Copyright (c) 2017      Chanho Park <chanho61.park@samsung.com>
+Copyright (c) 2017      Rolf Eike Beer <eike@sf-mail.de>
+Copyright (c) 2017      Hans Wennborg <hans@chromium.org>
+Copyright (c) 2018      Anton Maklakov <antmak.pub@gmail.com>
+Copyright (c) 2018      Benjamin Peterson <benjamin@python.org>
+Copyright (c) 2018      Marco Maggi <marco.maggi-ipsu@poste.it>
+Copyright (c) 2018      Mariusz Zaborski <oshogbo@vexillium.org>
+Copyright (c) 2019      David Loffredo <loffredo@steptools.com>
+Copyright (c) 2019-2020 Ben Wagner <bungeman@chromium.org>
+Copyright (c) 2019      Vadim Zeitlin <vadim@zeitlins.org>
+Copyright (c) 2021      Dong-hee Na <donghee.na@python.org>
+Copyright (c) 2022      Samanta Navarro <ferivoz@riseup.net>
+Copyright (c) 2022      Jeffrey Walton <noloader@gmail.com>
+Copyright (c) 2022      Jann Horn <jannh@google.com>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: expat
+ORIGIN: ../../../flutter/third_party/expat/expat/xmlwf/unixfilemap.c
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/expat/expat/xmlwf/unixfilemap.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2001-2002 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2006      Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2016-2017 Sebastian Pipping <sebastian@pipping.org>
+Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: expat
+ORIGIN: ../../../flutter/third_party/expat/expat/lib/xmltok.c
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/expat/expat/lib/xmltok.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2001-2003 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2002      Greg Stein <gstein@users.sourceforge.net>
+Copyright (c) 2002-2016 Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2005-2009 Steven Solie <steven@solie.ca>
+Copyright (c) 2016-2022 Sebastian Pipping <sebastian@pipping.org>
+Copyright (c) 2016      Pascal Cuoq <cuoq@trust-in-soft.com>
+Copyright (c) 2016      Don Lewis <truckman@apache.org>
+Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
+Copyright (c) 2017      Alexander Bluhm <alexander.bluhm@gmx.net>
+Copyright (c) 2017      Benbuck Nason <bnason@netflix.com>
+Copyright (c) 2017      José Gutiérrez de la Concha <jose@zeroc.com>
+Copyright (c) 2019      David Loffredo <loffredo@steptools.com>
+Copyright (c) 2021      Dong-hee Na <donghee.na@python.org>
+Copyright (c) 2022      Martin Ettl <ettl.martin78@googlemail.com>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: expat
+ORIGIN: ../../../flutter/third_party/expat/expat/xmlwf/xmlwf.c
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/expat/expat/xmlwf/xmlwf.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2001-2003 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2004-2009 Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2005-2007 Steven Solie <steven@solie.ca>
+Copyright (c) 2016-2022 Sebastian Pipping <sebastian@pipping.org>
+Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
+Copyright (c) 2019      David Loffredo <loffredo@steptools.com>
+Copyright (c) 2020      Joe Orton <jorton@redhat.com>
+Copyright (c) 2020      Kleber Tarcísio <klebertarcisio@yahoo.com.br>
+Copyright (c) 2021      Tim Bray <tbray@textuality.com>
+Copyright (c) 2022      Martin Ettl <ettl.martin78@googlemail.com>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: expat
+ORIGIN: ../../../flutter/third_party/expat/expat/xmlwf/readfilemap.c
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/expat/expat/xmlwf/readfilemap.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2001-2004 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2002-2009 Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2016-2017 Sebastian Pipping <sebastian@pipping.org>
+Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
+Copyright (c) 2017      Franek Korta <fkorta@gmail.com>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: expat
+ORIGIN: ../../../flutter/third_party/expat/expat/lib/xmltok.h
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/expat/expat/lib/xmltok.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2002-2005 Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2016-2017 Sebastian Pipping <sebastian@pipping.org>
+Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: expat
+ORIGIN: ../../../flutter/third_party/expat/expat/lib/xmltok_impl.c
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/expat/expat/lib/xmltok_impl.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2002-2016 Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2016-2022 Sebastian Pipping <sebastian@pipping.org>
+Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
+Copyright (c) 2018      Benjamin Peterson <benjamin@python.org>
+Copyright (c) 2018      Anton Maklakov <antmak.pub@gmail.com>
+Copyright (c) 2019      David Loffredo <loffredo@steptools.com>
+Copyright (c) 2020      Boris Kolpackov <boris@codesynthesis.com>
+Copyright (c) 2022      Martin Ettl <ettl.martin78@googlemail.com>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: expat
+ORIGIN: ../../../flutter/third_party/expat/expat/xmlwf/xmlfile.h
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/expat/expat/xmlwf/xmlfile.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2005      Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2016-2019 Sebastian Pipping <sebastian@pipping.org>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: expat
+ORIGIN: ../../../flutter/third_party/expat/expat/xmlwf/codepage.c
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/expat/expat/xmlwf/codepage.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2005-2006 Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2016-2019 Sebastian Pipping <sebastian@pipping.org>
+Copyright (c) 2019      David Loffredo <loffredo@steptools.com>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: expat
+ORIGIN: ../../../flutter/third_party/expat/expat/gennmtab/gennmtab.c
+ORIGIN: ../../../flutter/third_party/expat/expat/xmlwf/codepage.h
+ORIGIN: ../../../flutter/third_party/expat/expat/xmlwf/filemap.h
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/expat/expat/gennmtab/gennmtab.c
+FILE: ../../../flutter/third_party/expat/expat/xmlwf/codepage.h
+FILE: ../../../flutter/third_party/expat/expat/xmlwf/filemap.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2016-2017 Sebastian Pipping <sebastian@pipping.org>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: expat
+ORIGIN: ../../../flutter/third_party/expat/expat/xmlwf/win32filemap.c
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/expat/expat/xmlwf/win32filemap.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2016-2022 Sebastian Pipping <sebastian@pipping.org>
+Copyright (c) 2022      Martin Ettl <ettl.martin78@googlemail.com>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: expat
+ORIGIN: ../../../flutter/third_party/expat/expat/lib/asciitab.h
+ORIGIN: ../../../flutter/third_party/expat/expat/lib/iasciitab.h
+ORIGIN: ../../../flutter/third_party/expat/expat/lib/latin1tab.h
+ORIGIN: ../../../flutter/third_party/expat/expat/lib/utf8tab.h
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/expat/expat/lib/asciitab.h
+FILE: ../../../flutter/third_party/expat/expat/lib/iasciitab.h
+FILE: ../../../flutter/third_party/expat/expat/lib/latin1tab.h
+FILE: ../../../flutter/third_party/expat/expat/lib/utf8tab.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2017      Sebastian Pipping <sebastian@pipping.org>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: expat
+ORIGIN: ../../../flutter/third_party/expat/expat/lib/xmltok_ns.c
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/expat/expat/lib/xmltok_ns.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2002      Greg Stein <gstein@users.sourceforge.net>
+Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2002-2006 Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2017-2021 Sebastian Pipping <sebastian@pipping.org>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: expat
+ORIGIN: ../../../flutter/third_party/expat/expat/lib/xmlrole.c
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/expat/expat/lib/xmlrole.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2002      Greg Stein <gstein@users.sourceforge.net>
+Copyright (c) 2002-2006 Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2002-2003 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2005-2009 Steven Solie <steven@solie.ca>
+Copyright (c) 2016-2021 Sebastian Pipping <sebastian@pipping.org>
+Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
+Copyright (c) 2019      David Loffredo <loffredo@steptools.com>
+Copyright (c) 2021      Dong-hee Na <donghee.na@python.org>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: expat
+ORIGIN: ../../../flutter/third_party/expat/expat/lib/xmlrole.h
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/expat/expat/lib/xmlrole.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2002      Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2017      Sebastian Pipping <sebastian@pipping.org>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: expat
+ORIGIN: ../../../flutter/third_party/expat/expat/xmlwf/xmlfile.c
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/expat/expat/xmlwf/xmlfile.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2002-2003 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2004-2006 Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2005-2007 Steven Solie <steven@solie.ca>
+Copyright (c) 2016-2021 Sebastian Pipping <sebastian@pipping.org>
+Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
+Copyright (c) 2019      David Loffredo <loffredo@steptools.com>
+Copyright (c) 2021      Dong-hee Na <donghee.na@python.org>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: expat
+ORIGIN: ../../../flutter/third_party/expat/expat/lib/xmltok_impl.h
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/expat/expat/lib/xmltok_impl.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2017-2019 Sebastian Pipping <sebastian@pipping.org>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: expat
+ORIGIN: ../../../flutter/third_party/expat/expat/xmlwf/ct.c
+ORIGIN: ../../../flutter/third_party/expat/expat/xmlwf/xmlmime.h
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/expat/expat/xmlwf/ct.c
+FILE: ../../../flutter/third_party/expat/expat/xmlwf/xmlmime.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2016-2017 Sebastian Pipping <sebastian@pipping.org>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: expat
+ORIGIN: ../../../flutter/third_party/expat/expat/xmlwf/xmlmime.c
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/expat/expat/xmlwf/xmlmime.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2016-2018 Sebastian Pipping <sebastian@pipping.org>
+Copyright (c) 2018      Marco Maggi <marco.maggi-ipsu@poste.it>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: expat
+ORIGIN: ../../../flutter/third_party/expat/expat/xmlwf/xmltchar.h
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/expat/expat/xmlwf/xmltchar.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2016-2021 Sebastian Pipping <sebastian@pipping.org>
+Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/selfmtimpl.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/selfmt.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/umsg.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/selfmtimpl.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/selfmt.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/umsg.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1997-2011, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/ctestfw/unicode/utimer.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/ctestfw/unicode/utimer.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1997-2012, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/docmain.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/selfmt.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/docmain.h
+FILE: ../../../flutter/third_party/icu/source/i18n/selfmt.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1997-2012, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/msgfmt.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/msgfmt.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1997-2015, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/timezone.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/timezone.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1997-2016, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: expat
+ORIGIN: ../../../flutter/third_party/expat/expat/COPYING
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/expat/expat/expat.pc.in
+FILE: ../../../flutter/third_party/expat/expat/lib/siphash.h
+FILE: ../../../flutter/third_party/expat/expat/win32/version.rc
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper
+Copyright (c) 2001-2022 Expat maintainers
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/jacobi.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/sqrt.c
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/jacobi.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/sqrt.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   openssl-core@openssl.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/ex_data.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/gcd.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/prime.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/random.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/base.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/ex_data.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/ex_data.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/gcd.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/prime.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/random.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/base.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/ex_data.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   openssl-core@openssl.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/pem/pem_all.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/decrepit/dh/dh_decrepit.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/decrepit/dsa/dsa_decrepit.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/ssl3.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/handshake.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/s3_both.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/s3_pkt.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/tls_record.cc
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/pem/pem_all.c
+FILE: ../../../flutter/third_party/boringssl/src/decrepit/dh/dh_decrepit.c
+FILE: ../../../flutter/third_party/boringssl/src/decrepit/dsa/dsa_decrepit.c
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/ssl3.h
+FILE: ../../../flutter/third_party/boringssl/src/ssl/handshake.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/s3_both.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/s3_pkt.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/tls_record.cc
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   openssl-core@openssl.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/bio/pair.c
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/bio/pair.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1998-2003 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   openssl-core@openssl.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/ctx.c
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/ctx.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1998-2004 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   openssl-core@openssl.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/ecdsa_extra/ecdsa_asn1.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ecdsa/ecdsa.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/ecdsa.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/ecdsa_extra/ecdsa_asn1.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ecdsa/ecdsa.c
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/ecdsa.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   openssl-core@OpenSSL.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/exponentiation.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/ec.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/ec_key.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/ec_montgomery.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/oct.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/simple.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/wnaf.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/ec.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/ec_key.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/d1_both.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/d1_pkt.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/dtls_record.cc
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/exponentiation.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/ec.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/ec_key.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/ec_montgomery.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/oct.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/simple.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/wnaf.c
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/ec.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/ec_key.h
+FILE: ../../../flutter/third_party/boringssl/src/ssl/d1_both.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/d1_pkt.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/dtls_record.cc
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   openssl-core@openssl.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/err/err.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/montgomery.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/rsa/blinding.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/bn.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/err.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/tls1.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/d1_srtp.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/ssl_session.cc
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/err/err.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/montgomery.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/rsa/blinding.c
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/bn.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/err.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/tls1.h
+FILE: ../../../flutter/third_party/boringssl/src/ssl/d1_srtp.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_session.cc
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   openssl-core@openssl.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/tls/kdf.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/decrepit/ssl/ssl_decrepit.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/ssl.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/extensions.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/handshake_client.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/handshake_server.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/s3_lib.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/ssl_cert.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/ssl_cipher.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/ssl_file.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/ssl_lib.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/ssl_transcript.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/ssl_x509.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/t1_enc.cc
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/tls/kdf.c
+FILE: ../../../flutter/third_party/boringssl/src/decrepit/ssl/ssl_decrepit.c
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/ssl.h
+FILE: ../../../flutter/third_party/boringssl/src/ssl/extensions.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/handshake_client.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/handshake_server.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/ssl/s3_lib.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_cert.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_cipher.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_file.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_lib.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_transcript.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_x509.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/t1_enc.cc
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1998-2007 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   openssl-core@openssl.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/arm_arch.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/arm_arch.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   openssl-core@openssl.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/evp/pbkdf.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/pkcs8/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/pkcs8/p5_pbev2.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/pkcs8/pkcs8.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/pkcs8/pkcs8_x509.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/x509_trs.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/x509spki.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/x_x509a.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_akey.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_akeya.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_bcons.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_bitst.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_enum.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_extku.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_ia5.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_info.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_lib.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_prn.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_skey.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/pkcs8.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/evp/pbkdf.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/pkcs8/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/pkcs8/p5_pbev2.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/pkcs8/pkcs8.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/pkcs8/pkcs8_x509.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/x509_trs.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/x509spki.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/x_x509a.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_akey.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_akeya.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_bcons.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_bitst.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_enum.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_extku.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_ia5.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_info.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_lib.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_prn.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_skey.c
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/pkcs8.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   licensing@OpenSSL.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: expat
+ORIGIN: ../../../flutter/third_party/expat/expat/lib/ascii.h
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/expat/expat/lib/ascii.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1999-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2007      Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2017      Sebastian Pipping <sebastian@pipping.org>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_conf.c
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_conf.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1999-2002 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   licensing@OpenSSL.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_alt.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_utl.c
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_alt.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_utl.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1999-2003 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   licensing@OpenSSL.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509v3/ext_dat.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_cpols.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_int.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_purp.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/x509v3.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509v3/ext_dat.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_cpols.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_int.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_purp.c
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/x509v3.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1999-2004 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   licensing@OpenSSL.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/d1_lib.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/dtls_method.cc
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/ssl/d1_lib.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/dtls_method.cc
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   openssl-core@OpenSSL.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/digest/md32_common.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/digest/md32_common.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1999-2007 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   licensing@OpenSSL.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_crld.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_genn.c
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_crld.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_genn.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1999-2008 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   licensing@OpenSSL.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/gencolusb/verify_uset.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/gencolusb/verify_uset.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1999-2012, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/gencolusb/extract_unsafe_backwards.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/gencolusb/extract_unsafe_backwards.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 1999-2016, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: expat
+ORIGIN: ../../../flutter/third_party/expat/expat/lib/winconfig.h
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/expat/expat/lib/winconfig.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2002      Greg Stein <gstein@users.sourceforge.net>
+Copyright (c) 2005      Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2017-2021 Sebastian Pipping <sebastian@pipping.org>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: expat
+ORIGIN: ../../../flutter/third_party/expat/expat/lib/nametab.h
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/expat/expat/lib/nametab.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2000 Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2017 Sebastian Pipping <sebastian@pipping.org>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/x_algor.c
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/x_algor.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2000 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   licensing@OpenSSL.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/ecdh_extra/ecdh_extra.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ecdh/ecdh.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/ecdh.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/ecdh_extra/ecdh_extra.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ecdh/ecdh.c
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/ecdh.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2000-2002 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   licensing@OpenSSL.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/ec_extra/ec_asn1.c
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/ec_extra/ec_asn1.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2000-2003 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   licensing@OpenSSL.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/extra/uconv/resources/fr.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/extra/uconv/resources/root.txt + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/extra/uconv/resources/fr.txt
+FILE: ../../../flutter/third_party/icu/source/extra/uconv/resources/root.txt
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2000-2004 IBM, Inc. and Others.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/dh_extra/dh_asn1.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/dsa/dsa_asn1.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/rsa_extra/rsa_asn1.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/asn1t.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/dh_extra/dh_asn1.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/dsa/dsa_asn1.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/rsa_extra/rsa_asn1.c
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/asn1t.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2000-2005 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   licensing@OpenSSL.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/symtable.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/nultrans.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/symtable.h
+FILE: ../../../flutter/third_party/icu/source/i18n/nultrans.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2000-2005, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/nultrans.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/nultrans.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2000-2007, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/pem/pem_x509.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/pem/pem_xaux.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/x509cset.c
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/pem/pem_x509.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/pem/pem_xaux.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/x509cset.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2001 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   licensing@OpenSSL.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/rbbisetb.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/rbbisetb.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2001-2005, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/esctrn.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/remtrans.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unesctrn.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/esctrn.h
+FILE: ../../../flutter/third_party/icu/source/i18n/remtrans.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unesctrn.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2001-2007, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/common.rc + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/misc/icudata.rc + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/i18n.rc + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/io/io.rc + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/common.rc
+FILE: ../../../flutter/third_party/icu/source/data/misc/icudata.rc
+FILE: ../../../flutter/third_party/icu/source/i18n/i18n.rc
+FILE: ../../../flutter/third_party/icu/source/io/io.rc
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2001-2010 International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/aes/key_wrap.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.c
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/aes/key_wrap.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2001-2011 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   openssl-core@openssl.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/util.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/util.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/esctrn.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/remtrans.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unesctrn.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/util.cpp
+FILE: ../../../flutter/third_party/icu/source/common/util.h
+FILE: ../../../flutter/third_party/icu/source/i18n/esctrn.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/remtrans.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/unesctrn.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2001-2011, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unifilt.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unifilt.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2001-2012, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/strmatch.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/strmatch.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2001-2012, International Business Machines Corporation
+and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/transreg.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/transreg.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/transreg.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/transreg.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2001-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/charstr.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/charstr.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2001-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/util_props.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/util_props.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2001-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/rbbinode.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/rbbinode.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2001-2016, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/Pp.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/PpAtom.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/PpContext.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/PpContext.h
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/PpScanner.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/PpTokens.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/PpTokens.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/Pp.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/PpAtom.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/PpContext.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/PpContext.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/PpScanner.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/PpTokens.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/preprocessor/PpTokens.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2002, NVIDIA Corporation.
+
+NVIDIA Corporation("NVIDIA") supplies this software to you in
+consideration of your agreement to the following terms, and your use,
+installation, modification or redistribution of this NVIDIA software
+constitutes acceptance of these terms.  If you do not agree with these
+terms, please do not use, install, modify or redistribute this NVIDIA
+software.
+
+In consideration of your agreement to abide by the following terms, and
+subject to these terms, NVIDIA grants you a personal, non-exclusive
+license, under NVIDIA's copyrights in this original NVIDIA software (the
+"NVIDIA Software"), to use, reproduce, modify and redistribute the
+NVIDIA Software, with or without modifications, in source and/or binary
+forms; provided that if you redistribute the NVIDIA Software, you must
+retain the copyright notice of NVIDIA, this notice and the following
+text and disclaimers in all such redistributions of the NVIDIA Software.
+Neither the name, trademarks, service marks nor logos of NVIDIA
+Corporation may be used to endorse or promote products derived from the
+NVIDIA Software without specific prior written permission from NVIDIA.
+Except as expressly stated in this notice, no other rights or licenses
+express or implied, are granted by NVIDIA herein, including but not
+limited to any patent rights that may be infringed by your derivative
+works or by other works in which the NVIDIA Software may be
+incorporated. No hardware is licensed hereunder.
+
+THE NVIDIA SOFTWARE IS BEING PROVIDED ON AN "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED,
+INCLUDING WITHOUT LIMITATION, WARRANTIES OR CONDITIONS OF TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
+ITS USE AND OPERATION EITHER ALONE OR IN COMBINATION WITH OTHER
+PRODUCTS.
+
+IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT,
+INCIDENTAL, EXEMPLARY, CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, LOST PROFITS; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) OR ARISING IN ANY WAY
+OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE
+NVIDIA SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT,
+TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
+NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: expat
+ORIGIN: ../../../flutter/third_party/expat/expat/lib/internal.h
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/expat/expat/lib/internal.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2002-2003 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2002-2006 Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2003      Greg Stein <gstein@users.sourceforge.net>
+Copyright (c) 2016-2022 Sebastian Pipping <sebastian@pipping.org>
+Copyright (c) 2018      Yury Gribov <tetra2005@gmail.com>
+Copyright (c) 2019      David Loffredo <loffredo@steptools.com>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unifunct.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unifunct.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2002-2004, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/unifunct.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/unirepl.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/unifunct.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/unirepl.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2002-2005, International Business Machines Corporation
+and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/ctestfw/testdata.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/ctestfw/unicode/tstdtmod.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/ctestfw/testdata.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/ctestfw/unicode/tstdtmod.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2002-2005, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glfw
+ORIGIN: ../../../flutter/third_party/glfw/LICENSE.md
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/glfw/src/glfw.rc.in
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2002-2006 Marcus Geelnard
+
+Copyright (c) 2006-2019 Camilla Löwy
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not
+   be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+   distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glfw
+ORIGIN: ../../../flutter/third_party/glfw/src/context.c
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/glfw/src/context.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2002-2006 Marcus Geelnard
+Copyright (c) 2006-2016 Camilla Löwy <elmindreda@glfw.org>
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not
+   be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+   distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glfw
+ORIGIN: ../../../flutter/third_party/glfw/src/linux_joystick.c
+ORIGIN: ../../../flutter/third_party/glfw/src/posix_thread.c
+ORIGIN: ../../../flutter/third_party/glfw/src/posix_thread.h
+ORIGIN: ../../../flutter/third_party/glfw/src/posix_time.c
+ORIGIN: ../../../flutter/third_party/glfw/src/posix_time.h
+ORIGIN: ../../../flutter/third_party/glfw/src/win32_thread.c
+ORIGIN: ../../../flutter/third_party/glfw/src/win32_thread.h
+ORIGIN: ../../../flutter/third_party/glfw/src/win32_time.c
+ORIGIN: ../../../flutter/third_party/glfw/src/win32_time.h
+ORIGIN: ../../../flutter/third_party/glfw/src/xkb_unicode.c
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/glfw/src/linux_joystick.c
+FILE: ../../../flutter/third_party/glfw/src/posix_thread.c
+FILE: ../../../flutter/third_party/glfw/src/posix_thread.h
+FILE: ../../../flutter/third_party/glfw/src/posix_time.c
+FILE: ../../../flutter/third_party/glfw/src/posix_time.h
+FILE: ../../../flutter/third_party/glfw/src/win32_thread.c
+FILE: ../../../flutter/third_party/glfw/src/win32_thread.h
+FILE: ../../../flutter/third_party/glfw/src/win32_time.c
+FILE: ../../../flutter/third_party/glfw/src/win32_time.h
+FILE: ../../../flutter/third_party/glfw/src/xkb_unicode.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2002-2006 Marcus Geelnard
+Copyright (c) 2006-2017 Camilla Löwy <elmindreda@glfw.org>
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not
+   be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+   distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glfw
+ORIGIN: ../../../flutter/third_party/glfw/include/GLFW/glfw3native.h
+ORIGIN: ../../../flutter/third_party/glfw/src/init.c
+ORIGIN: ../../../flutter/third_party/glfw/src/platform.c
+ORIGIN: ../../../flutter/third_party/glfw/src/platform.h
+ORIGIN: ../../../flutter/third_party/glfw/src/vulkan.c
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/glfw/include/GLFW/glfw3native.h
+FILE: ../../../flutter/third_party/glfw/src/init.c
+FILE: ../../../flutter/third_party/glfw/src/platform.c
+FILE: ../../../flutter/third_party/glfw/src/platform.h
+FILE: ../../../flutter/third_party/glfw/src/vulkan.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2002-2006 Marcus Geelnard
+Copyright (c) 2006-2018 Camilla Löwy <elmindreda@glfw.org>
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not
+   be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+   distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glfw
+ORIGIN: ../../../flutter/third_party/glfw/include/GLFW/glfw3.h
+ORIGIN: ../../../flutter/third_party/glfw/src/cocoa_monitor.m
+ORIGIN: ../../../flutter/third_party/glfw/src/egl_context.c
+ORIGIN: ../../../flutter/third_party/glfw/src/glx_context.c
+ORIGIN: ../../../flutter/third_party/glfw/src/input.c
+ORIGIN: ../../../flutter/third_party/glfw/src/internal.h
+ORIGIN: ../../../flutter/third_party/glfw/src/monitor.c
+ORIGIN: ../../../flutter/third_party/glfw/src/wgl_context.c
+ORIGIN: ../../../flutter/third_party/glfw/src/win32_init.c
+ORIGIN: ../../../flutter/third_party/glfw/src/win32_joystick.c
+ORIGIN: ../../../flutter/third_party/glfw/src/win32_monitor.c
+ORIGIN: ../../../flutter/third_party/glfw/src/win32_platform.h
+ORIGIN: ../../../flutter/third_party/glfw/src/win32_window.c
+ORIGIN: ../../../flutter/third_party/glfw/src/x11_init.c
+ORIGIN: ../../../flutter/third_party/glfw/src/x11_monitor.c
+ORIGIN: ../../../flutter/third_party/glfw/src/x11_platform.h
+ORIGIN: ../../../flutter/third_party/glfw/src/x11_window.c
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/glfw/include/GLFW/glfw3.h
+FILE: ../../../flutter/third_party/glfw/src/cocoa_monitor.m
+FILE: ../../../flutter/third_party/glfw/src/egl_context.c
+FILE: ../../../flutter/third_party/glfw/src/glx_context.c
+FILE: ../../../flutter/third_party/glfw/src/input.c
+FILE: ../../../flutter/third_party/glfw/src/internal.h
+FILE: ../../../flutter/third_party/glfw/src/monitor.c
+FILE: ../../../flutter/third_party/glfw/src/wgl_context.c
+FILE: ../../../flutter/third_party/glfw/src/win32_init.c
+FILE: ../../../flutter/third_party/glfw/src/win32_joystick.c
+FILE: ../../../flutter/third_party/glfw/src/win32_monitor.c
+FILE: ../../../flutter/third_party/glfw/src/win32_platform.h
+FILE: ../../../flutter/third_party/glfw/src/win32_window.c
+FILE: ../../../flutter/third_party/glfw/src/x11_init.c
+FILE: ../../../flutter/third_party/glfw/src/x11_monitor.c
+FILE: ../../../flutter/third_party/glfw/src/x11_platform.h
+FILE: ../../../flutter/third_party/glfw/src/x11_window.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2002-2006 Marcus Geelnard
+Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not
+   be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+   distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glfw
+ORIGIN: ../../../flutter/third_party/glfw/src/window.c
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/glfw/src/window.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2002-2006 Marcus Geelnard
+Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
+Copyright (c) 2012 Torsten Walluhn <tw@mad-cad.net>
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not
+   be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+   distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/aes/aes.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/aes/mode_wrappers.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/aes.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/aes/aes.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/aes/mode_wrappers.c
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/aes.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2002-2006 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   openssl-core@openssl.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/usetiter.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/usetiter.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2002-2006, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/ctestfw/datamap.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/ctestfw/unicode/datamap.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/ctestfw/unicode/testdata.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/ctestfw/datamap.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/ctestfw/unicode/datamap.h
+FILE: ../../../flutter/third_party/icu/source/tools/ctestfw/unicode/testdata.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2002-2006, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/anytrans.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/anytrans.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2002-2007, International Business Machines Corporation
+and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/tridpars.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/tridpars.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2002-2010, International Business Machines Corporation *
+and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/propname.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/propname.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2002-2011, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/funcrepl.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/strrepl.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/funcrepl.h
+FILE: ../../../flutter/third_party/icu/source/i18n/strrepl.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2002-2011, International Business Machines Corporation
+and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/funcrepl.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/strrepl.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/funcrepl.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/strrepl.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2002-2012, International Business Machines Corporation
+and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/ctestfw/uperf.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/ctestfw/uperf.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2002-2012, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/propname.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/usetiter.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ustrenum.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ustrenum.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/ctestfw/unicode/uperf.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/propname.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unicode/usetiter.h
+FILE: ../../../flutter/third_party/icu/source/common/ustrenum.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ustrenum.h
+FILE: ../../../flutter/third_party/icu/source/tools/ctestfw/unicode/uperf.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2002-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/anytrans.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/tridpars.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/anytrans.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/tridpars.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2002-2014, International Business Machines Corporation
+and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/ctestfw/tstdtmod.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/ctestfw/tstdtmod.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2002-2014, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/brkitr/rules/title.txt + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/rules/title.txt
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2002-2015, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/brkitr/rules/line.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/brkitr/rules/line_cj.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/brkitr/rules/line_loose.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/brkitr/rules/line_loose_cj.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/brkitr/rules/line_normal.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/brkitr/rules/line_normal_cj.txt + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/rules/line.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/rules/line_cj.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/rules/line_loose.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/rules/line_loose_cj.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/rules/line_normal.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/rules/line_normal_cj.txt
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2002-2016  International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/rbbitblb.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/rbbitblb.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucurr.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucurrimp.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/ucurr.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/rbbitblb.cpp
+FILE: ../../../flutter/third_party/icu/source/common/rbbitblb.h
+FILE: ../../../flutter/third_party/icu/source/common/ucurr.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucurrimp.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ucurr.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2002-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_ncons.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_pcons.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_pmaps.c
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_ncons.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_pcons.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_pmaps.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   licensing@OpenSSL.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ucat.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ucat.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2003, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/ucat.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ucat.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2003-2004, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/gregoimp.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/gregoimp.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/gregoimp.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/gregoimp.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2003-2008, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/msvcres.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/msvcres.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2003-2010 International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/ruleiter.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/ruleiter.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/ruleiter.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ruleiter.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2003-2011, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/olsontz.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/olsontz.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/tools/tzcode/tz2icu.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/olsontz.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/olsontz.h
+FILE: ../../../flutter/third_party/icu/source/tools/tzcode/tz2icu.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2003-2013, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/tzcode/tz2icu.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/tzcode/tz2icu.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2003-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/x509_vpm.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509v3/internal.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/x509_vpm.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509v3/internal.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2004 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   licensing@OpenSSL.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/curramt.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/curramt.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2004, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/curramt.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/curramt.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2004-2006, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/ctestfw/unicode/testlog.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/ctestfw/unicode/testlog.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2004-2010, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/currfmt.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/currfmt.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2004-2014 International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/locbased.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/locbased.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/currfmt.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/currunit.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/measure.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/currunit.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/locbased.cpp
+FILE: ../../../flutter/third_party/icu/source/common/locbased.h
+FILE: ../../../flutter/third_party/icu/source/i18n/currfmt.h
+FILE: ../../../flutter/third_party/icu/source/i18n/currunit.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/measure.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/currunit.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2004-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/measure.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/measure.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2004-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/Doxyfile.in + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/Doxyfile.in
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2004-2015, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/measfmt.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/measunit.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/measfmt.h + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/measunit.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/measfmt.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/measunit.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/measfmt.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/measunit.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2004-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/rsa/padding.c
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/rsa/padding.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2005 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   licensing@OpenSSL.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/asn1/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/evp/p_dsa_asn1.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/evp/p_ec.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/evp/p_ec_asn1.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/evp/p_rsa.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/evp/p_rsa_asn1.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/evp/print.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/rsa_pss.c
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/asn1/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/evp/p_dsa_asn1.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/evp/p_ec.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/evp/p_ec_asn1.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/evp/p_rsa.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/evp/p_rsa_asn1.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/evp/print.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/rsa_pss.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   licensing@OpenSSL.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/digestsign/digestsign.c
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/digestsign/digestsign.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2006,2007 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   licensing@OpenSSL.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: rapidjson
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/msinttypes/inttypes.h
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/msinttypes/stdint.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/msinttypes/inttypes.h
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/msinttypes/stdint.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2006-2013 Alexander Chemeris
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+
+  3. Neither the name of the product nor the names of its contributors may
+     be used to endorse or promote products derived from this software
+     without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glfw
+ORIGIN: ../../../flutter/third_party/glfw/src/cocoa_joystick.h
+ORIGIN: ../../../flutter/third_party/glfw/src/null_joystick.h
+ORIGIN: ../../../flutter/third_party/glfw/src/win32_joystick.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/glfw/src/cocoa_joystick.h
+FILE: ../../../flutter/third_party/glfw/src/null_joystick.h
+FILE: ../../../flutter/third_party/glfw/src/win32_joystick.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2006-2017 Camilla Löwy <elmindreda@glfw.org>
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not
+   be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+   distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glfw
+ORIGIN: ../../../flutter/third_party/glfw/src/mappings.h
+ORIGIN: ../../../flutter/third_party/glfw/src/mappings.h.in
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/glfw/src/mappings.h
+FILE: ../../../flutter/third_party/glfw/src/mappings.h.in
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2006-2018 Camilla Löwy <elmindreda@glfw.org>
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not
+   be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+   distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/dbgutil.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/dbgutil.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2007-2012, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/dbgutil.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/dbgutil.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2007-2012, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/ctestfw/ucln_ct.c + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/ctestfw/ucln_ct.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2007-2013, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/ucln_tu.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/ucln_tu.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2007-2014, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/udbgutil.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/udbgutil.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2007-2016, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libXNVCtrl
+ORIGIN: ../../../flutter/third_party/angle/src/third_party/libXNVCtrl/NVCtrl.c
+ORIGIN: ../../../flutter/third_party/angle/src/third_party/libXNVCtrl/NVCtrlLib.h
+ORIGIN: ../../../flutter/third_party/angle/src/third_party/libXNVCtrl/nv_control.h
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/angle/src/third_party/libXNVCtrl/NVCtrl.c
+FILE: ../../../flutter/third_party/angle/src/third_party/libXNVCtrl/NVCtrlLib.h
+FILE: ../../../flutter/third_party/angle/src/third_party/libXNVCtrl/nv_control.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2008 NVIDIA, Corporation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aesccm.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/modes/cbc.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/modes/cfb.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/modes/ctr.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/modes/gcm.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/modes/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/modes/ofb.c
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aesccm.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/modes/cbc.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/modes/cfb.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/modes/ctr.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/modes/gcm.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/modes/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/modes/ofb.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2008 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   openssl-core@openssl.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: include
+ORIGIN: ../../../flutter/third_party/inja/third_party/include/nlohmann/json.hpp
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/inja/third_party/include/nlohmann/json.hpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern@hoehrmann.de>
+
+Permission is hereby  granted, free of charge, to any  person obtaining a copy
+of this software and associated  documentation files (the "Software"), to deal
+in the Software  without restriction, including without  limitation the rights
+to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
+copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
+IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
+FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
+AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
+LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/regextxt.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/regextxt.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2008-2010, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/regextxt.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/regextxt.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2008-2011, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/tools/toolutil/udbgutil.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/udbgutil.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2008-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: angle
+ORIGIN: ../../../flutter/third_party/angle/include/KHR/khrplatform.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/angle/include/KHR/khrplatform.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2008-2018 The Khronos Group Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and/or associated documentation files (the
+"Materials"), to deal in the Materials without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Materials, and to
+permit persons to whom the Materials are furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Materials.
+
+THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: include
+ORIGIN: ../../../flutter/third_party/inja/third_party/include/nlohmann/json.hpp
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/inja/third_party/include/nlohmann/json.hpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2009 Florian Loitsch.
+
+Permission is hereby  granted, free of charge, to any  person obtaining a copy
+of this software and associated  documentation files (the "Software"), to deal
+in the Software  without restriction, including without  limitation the rights
+to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
+copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
+IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
+FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
+AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
+LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: accessibility
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/geometry/insets.cc + ../../../flutter/third_party/accessibility/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/accessibility/gfx/geometry/insets.cc
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2009 The Chromium Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/sprep/rfc3491.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/sprep/rfc3530cs.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/sprep/rfc3530csci.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/sprep/rfc3530mixp.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/sprep/rfc3722.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/sprep/rfc3920res.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/sprep/rfc4011.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/sprep/rfc4013.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/sprep/rfc4505.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/sprep/rfc4518.txt + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/data/sprep/rfc4518ci.txt + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc3491.txt
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc3530cs.txt
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc3530csci.txt
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc3530mixp.txt
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc3722.txt
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc3920res.txt
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc4011.txt
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc4013.txt
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc4505.txt
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc4518.txt
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc4518ci.txt
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2009, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glfw
+ORIGIN: ../../../flutter/third_party/glfw/src/cocoa_time.c
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/glfw/src/cocoa_time.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2009-2016 Camilla Löwy <elmindreda@glfw.org>
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not
+   be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+   distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glfw
+ORIGIN: ../../../flutter/third_party/glfw/src/cocoa_init.m
+ORIGIN: ../../../flutter/third_party/glfw/src/cocoa_platform.h
+ORIGIN: ../../../flutter/third_party/glfw/src/cocoa_window.m
+ORIGIN: ../../../flutter/third_party/glfw/src/nsgl_context.m
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/glfw/src/cocoa_init.m
+FILE: ../../../flutter/third_party/glfw/src/cocoa_platform.h
+FILE: ../../../flutter/third_party/glfw/src/cocoa_window.m
+FILE: ../../../flutter/third_party/glfw/src/nsgl_context.m
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2009-2019 Camilla Löwy <elmindreda@glfw.org>
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not
+   be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+   distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glfw
+ORIGIN: ../../../flutter/third_party/glfw/src/cocoa_joystick.m
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/glfw/src/cocoa_joystick.m
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2009-2019 Camilla Löwy <elmindreda@glfw.org>
+Copyright (c) 2012 Torsten Walluhn <tw@mad-cad.net>
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not
+   be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+   distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glfw
+ORIGIN: ../../../flutter/third_party/glfw/src/cocoa_time.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/glfw/src/cocoa_time.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2009-2021 Camilla Löwy <elmindreda@glfw.org>
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not
+   be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+   distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libXNVCtrl
+ORIGIN: ../../../flutter/third_party/angle/src/third_party/libXNVCtrl/NVCtrl.h
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/angle/src/third_party/libXNVCtrl/NVCtrl.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2010 NVIDIA, Corporation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: accessibility
+ORIGIN: ../../../flutter/third_party/accessibility/base/win/scoped_bstr.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/win/scoped_variant.cc + ../../../flutter/third_party/accessibility/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/accessibility/base/win/scoped_bstr.cc
+FILE: ../../../flutter/third_party/accessibility/base/win/scoped_variant.cc
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2010 The Chromium Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/cmac/cmac.c
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/cmac/cmac.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2010 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   licensing@OpenSSL.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libwebp
+ORIGIN: ../../../flutter/third_party/libwebp/COPYING
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/libwebp/.pylintrc
+FILE: ../../../flutter/third_party/libwebp/extras/webp_quality.c
+FILE: ../../../flutter/third_party/libwebp/sharpyuv/libsharpyuv.pc.in
+FILE: ../../../flutter/third_party/libwebp/sharpyuv/libsharpyuv.rc
+FILE: ../../../flutter/third_party/libwebp/src/demux/libwebpdemux.pc.in
+FILE: ../../../flutter/third_party/libwebp/src/demux/libwebpdemux.rc
+FILE: ../../../flutter/third_party/libwebp/src/libwebp.pc.in
+FILE: ../../../flutter/third_party/libwebp/src/libwebp.rc
+FILE: ../../../flutter/third_party/libwebp/src/libwebpdecoder.pc.in
+FILE: ../../../flutter/third_party/libwebp/src/libwebpdecoder.rc
+FILE: ../../../flutter/third_party/libwebp/src/mux/libwebpmux.pc.in
+FILE: ../../../flutter/third_party/libwebp/src/mux/libwebpmux.rc
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2010, Google Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of Google nor the names of its contributors may
+    be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: include
+ORIGIN: ../../../flutter/third_party/inja/third_party/include/hayai/LICENSE.md
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/inja/third_party/include/hayai/hayai.hpp
+FILE: ../../../flutter/third_party/inja/third_party/include/hayai/hayai_benchmarker.hpp
+FILE: ../../../flutter/third_party/inja/third_party/include/hayai/hayai_compatibility.hpp
+FILE: ../../../flutter/third_party/inja/third_party/include/hayai/hayai_console.hpp
+FILE: ../../../flutter/third_party/inja/third_party/include/hayai/hayai_console_outputter.hpp
+FILE: ../../../flutter/third_party/inja/third_party/include/hayai/hayai_default_test_factory.hpp
+FILE: ../../../flutter/third_party/inja/third_party/include/hayai/hayai_fixture.hpp
+FILE: ../../../flutter/third_party/inja/third_party/include/hayai/hayai_json_outputter.hpp
+FILE: ../../../flutter/third_party/inja/third_party/include/hayai/hayai_junit_xml_outputter.hpp
+FILE: ../../../flutter/third_party/inja/third_party/include/hayai/hayai_main.hpp
+FILE: ../../../flutter/third_party/inja/third_party/include/hayai/hayai_outputter.hpp
+FILE: ../../../flutter/third_party/inja/third_party/include/hayai/hayai_test.hpp
+FILE: ../../../flutter/third_party/inja/third_party/include/hayai/hayai_test_descriptor.hpp
+FILE: ../../../flutter/third_party/inja/third_party/include/hayai/hayai_test_factory.hpp
+FILE: ../../../flutter/third_party/inja/third_party/include/hayai/hayai_test_result.hpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2011 - Nick Bruun.
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1.  The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+2.  Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+3.  If you meet (any of) the author(s), you're encouraged to buy them a beer,
+    a drink or whatever is suited to the situation, given that you like the
+    software.
+4.  This notice may not be removed or altered from any source
+    distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: accessibility
+LIBRARY: angle
+ORIGIN: ../../../flutter/third_party/accessibility/base/auto_reset.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/win/atl_module.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/win/display.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/win/display.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/win/enum_variant.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/win/enum_variant.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/win/scoped_bstr.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/win/scoped_variant.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/base/anglebase/containers/mru_cache.h + ../../../LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/base/anglebase/sha1.cc + ../../../LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/base/anglebase/sha1.h + ../../../LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/accessibility/base/auto_reset.h
+FILE: ../../../flutter/third_party/accessibility/base/win/atl_module.h
+FILE: ../../../flutter/third_party/accessibility/base/win/display.cc
+FILE: ../../../flutter/third_party/accessibility/base/win/display.h
+FILE: ../../../flutter/third_party/accessibility/base/win/enum_variant.cc
+FILE: ../../../flutter/third_party/accessibility/base/win/enum_variant.h
+FILE: ../../../flutter/third_party/accessibility/base/win/scoped_bstr.h
+FILE: ../../../flutter/third_party/accessibility/base/win/scoped_variant.h
+FILE: ../../../flutter/third_party/angle/src/common/base/anglebase/containers/mru_cache.h
+FILE: ../../../flutter/third_party/angle/src/common/base/anglebase/sha1.cc
+FILE: ../../../flutter/third_party/angle/src/common/base/anglebase/sha1.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2011 The Chromium Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/dh_extra/params.c
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/dh_extra/params.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2011 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   licensing@OpenSSL.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/decrepit/xts/xts.c
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/decrepit/xts/xts.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2011 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   openssl-core@openssl.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/brkitr/dictionaries/khmerdict.txt + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/dictionaries/khmerdict.txt
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2011-2012 International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: accessibility
+ORIGIN: ../../../flutter/third_party/accessibility/ax_build/build_config.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/base_export.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/geometry/insets.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/geometry/insets_f.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/geometry/insets_f.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/geometry/point.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/geometry/point.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/geometry/point_conversions.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/geometry/point_conversions.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/geometry/point_f.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/geometry/point_f.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/geometry/rect.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/geometry/rect.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/geometry/rect_conversions.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/geometry/rect_conversions.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/geometry/rect_f.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/geometry/rect_f.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/geometry/size.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/geometry/size.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/geometry/size_conversions.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/geometry/size_conversions.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/geometry/size_f.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/geometry/size_f.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/geometry/vector2d.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/geometry/vector2d.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/geometry/vector2d_conversions.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/geometry/vector2d_conversions.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/geometry/vector2d_f.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/geometry/vector2d_f.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/native_widget_types.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/range/range.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/range/range.h + ../../../flutter/third_party/accessibility/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/accessibility/ax_build/build_config.h
+FILE: ../../../flutter/third_party/accessibility/base/base_export.h
+FILE: ../../../flutter/third_party/accessibility/gfx/geometry/insets.h
+FILE: ../../../flutter/third_party/accessibility/gfx/geometry/insets_f.cc
+FILE: ../../../flutter/third_party/accessibility/gfx/geometry/insets_f.h
+FILE: ../../../flutter/third_party/accessibility/gfx/geometry/point.cc
+FILE: ../../../flutter/third_party/accessibility/gfx/geometry/point.h
+FILE: ../../../flutter/third_party/accessibility/gfx/geometry/point_conversions.cc
+FILE: ../../../flutter/third_party/accessibility/gfx/geometry/point_conversions.h
+FILE: ../../../flutter/third_party/accessibility/gfx/geometry/point_f.cc
+FILE: ../../../flutter/third_party/accessibility/gfx/geometry/point_f.h
+FILE: ../../../flutter/third_party/accessibility/gfx/geometry/rect.cc
+FILE: ../../../flutter/third_party/accessibility/gfx/geometry/rect.h
+FILE: ../../../flutter/third_party/accessibility/gfx/geometry/rect_conversions.cc
+FILE: ../../../flutter/third_party/accessibility/gfx/geometry/rect_conversions.h
+FILE: ../../../flutter/third_party/accessibility/gfx/geometry/rect_f.cc
+FILE: ../../../flutter/third_party/accessibility/gfx/geometry/rect_f.h
+FILE: ../../../flutter/third_party/accessibility/gfx/geometry/size.cc
+FILE: ../../../flutter/third_party/accessibility/gfx/geometry/size.h
+FILE: ../../../flutter/third_party/accessibility/gfx/geometry/size_conversions.cc
+FILE: ../../../flutter/third_party/accessibility/gfx/geometry/size_conversions.h
+FILE: ../../../flutter/third_party/accessibility/gfx/geometry/size_f.cc
+FILE: ../../../flutter/third_party/accessibility/gfx/geometry/size_f.h
+FILE: ../../../flutter/third_party/accessibility/gfx/geometry/vector2d.cc
+FILE: ../../../flutter/third_party/accessibility/gfx/geometry/vector2d.h
+FILE: ../../../flutter/third_party/accessibility/gfx/geometry/vector2d_conversions.cc
+FILE: ../../../flutter/third_party/accessibility/gfx/geometry/vector2d_conversions.h
+FILE: ../../../flutter/third_party/accessibility/gfx/geometry/vector2d_f.cc
+FILE: ../../../flutter/third_party/accessibility/gfx/geometry/vector2d_f.h
+FILE: ../../../flutter/third_party/accessibility/gfx/native_widget_types.h
+FILE: ../../../flutter/third_party/accessibility/gfx/range/range.cc
+FILE: ../../../flutter/third_party/accessibility/gfx/range/range.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2012 The Chromium Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/cipher_extra/tls_cbc.c
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/cipher_extra/tls_cbc.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2012 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   openssl-core@openssl.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: accessibility
+LIBRARY: angle
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/gfx_export.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/base/anglebase/trace_event/trace_event.h + ../../../LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/accessibility/gfx/gfx_export.h
+FILE: ../../../flutter/third_party/angle/src/common/base/anglebase/trace_event/trace_event.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2013 The Chromium Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/gl_types.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/gl_types.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2013 The Khronos Group Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and/or associated documentation files (the
+"Materials"), to deal in the Materials without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Materials, and to
+permit persons to whom the Materials are furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Materials.
+
+THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/internal.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/internal.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2013 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   licensing@OpenSSL.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: khronos
+ORIGIN: ../../../flutter/third_party/angle/src/third_party/khronos/GL/wglext.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/angle/src/third_party/khronos/GL/wglext.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2013-2014 The Khronos Group Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and/or associated documentation files (the
+"Materials"), to deal in the Materials without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Materials, and to
+permit persons to whom the Materials are furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Materials.
+
+THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: angle
+ORIGIN: ../../../flutter/third_party/angle/include/GLES/glext.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/angle/include/GLES/glext.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2013-2017 The Khronos Group Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and/or associated documentation files (the
+"Materials"), to deal in the Materials without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Materials, and to
+permit persons to whom the Materials are furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Materials.
+
+THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: angle
+ORIGIN: ../../../flutter/third_party/angle/include/GLES/gl.h
+ORIGIN: ../../../flutter/third_party/angle/include/WGL/wgl.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/angle/include/GLES/gl.h
+FILE: ../../../flutter/third_party/angle/include/WGL/wgl.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2013-2018 The Khronos Group Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and/or associated documentation files (the
+"Materials"), to deal in the Materials without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Materials, and to
+permit persons to whom the Materials are furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Materials.
+
+THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: include
+ORIGIN: ../../../flutter/third_party/inja/third_party/include/nlohmann/json.hpp
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/inja/third_party/include/nlohmann/json.hpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
+
+Permission is hereby  granted, free of charge, to any  person obtaining a copy
+of this software and associated  documentation files (the "Software"), to deal
+in the Software  without restriction, including without  limitation the rights
+to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
+copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
+IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
+FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
+AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
+LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: json
+ORIGIN: ../../../flutter/third_party/json/LICENSE.MIT
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/json/include/nlohmann/adl_serializer.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/byte_container_with_subtype.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/abi_macros.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/conversions/from_json.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/conversions/to_chars.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/conversions/to_json.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/exceptions.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/hash.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/input/binary_reader.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/input/input_adapters.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/input/json_sax.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/input/lexer.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/input/parser.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/input/position_t.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/iterators/internal_iterator.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/iterators/iter_impl.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/iterators/iteration_proxy.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/iterators/iterator_traits.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/iterators/json_reverse_iterator.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/iterators/primitive_iterator.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/json_custom_base_class.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/json_pointer.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/json_ref.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/macro_scope.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/macro_unscope.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/meta/call_std/begin.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/meta/call_std/end.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/meta/cpp_future.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/meta/detected.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/meta/identity_tag.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/meta/is_sax.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/meta/std_fs.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/meta/type_traits.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/meta/void_t.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/output/binary_writer.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/output/output_adapters.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/output/serializer.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/string_concat.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/string_escape.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/detail/value_t.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/json.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/json_fwd.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/ordered_map.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/thirdparty/hedley/hedley.hpp
+FILE: ../../../flutter/third_party/json/include/nlohmann/thirdparty/hedley/hedley_undef.hpp
+FILE: ../../../flutter/third_party/json/nlohmann_json.natvis
+FILE: ../../../flutter/third_party/json/single_include/nlohmann/json.hpp
+FILE: ../../../flutter/third_party/json/single_include/nlohmann/json_fwd.hpp
+FILE: ../../../flutter/third_party/json/tools/amalgamate/config_json.json
+FILE: ../../../flutter/third_party/json/tools/amalgamate/config_json_fwd.json
+FILE: ../../../flutter/third_party/json/tools/generate_natvis/nlohmann_json.natvis.j2
+FILE: ../../../flutter/third_party/json/tools/macro_builder/main.cpp
+FILE: ../../../flutter/third_party/json/tools/serve_header/demo.png
+FILE: ../../../flutter/third_party/json/tools/serve_header/serve_header.yml.example
+FILE: ../../../flutter/third_party/json/wsjcpp.yml
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2013-2022 Niels Lohmann
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glfw
+ORIGIN: ../../../flutter/third_party/glfw/src/linux_joystick.h
+ORIGIN: ../../../flutter/third_party/glfw/src/wl_init.c
+ORIGIN: ../../../flutter/third_party/glfw/src/wl_monitor.c
+ORIGIN: ../../../flutter/third_party/glfw/src/wl_platform.h
+ORIGIN: ../../../flutter/third_party/glfw/src/wl_window.c
+ORIGIN: ../../../flutter/third_party/glfw/src/xkb_unicode.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/glfw/src/linux_joystick.h
+FILE: ../../../flutter/third_party/glfw/src/wl_init.c
+FILE: ../../../flutter/third_party/glfw/src/wl_monitor.c
+FILE: ../../../flutter/third_party/glfw/src/wl_platform.h
+FILE: ../../../flutter/third_party/glfw/src/wl_window.c
+FILE: ../../../flutter/third_party/glfw/src/xkb_unicode.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2014 Jonas Ådahl <jadahl@gmail.com>
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not
+   be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+   distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: accessibility
+ORIGIN: ../../../flutter/third_party/accessibility/base/win/windows_types.h + ../../../flutter/third_party/accessibility/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/accessibility/base/win/windows_types.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2014 The Chromium Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/bio/socket_helper.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/bytestring/ber.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/bytestring/cbb.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/bytestring/cbs.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/bytestring/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/chacha/chacha.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/cipher_extra/e_chacha20poly1305.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/cipher_extra/e_tls.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/crypto.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/engine/engine.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/cipher/aead.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/hkdf/hkdf.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/rand/rand.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/rand/urandom.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/pkcs7/pkcs7.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/poly1305/poly1305.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/poly1305/poly1305_arm.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/poly1305/poly1305_vec.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/rand_extra/windows.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/aead.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/bytestring.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/chacha.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/cpu.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/crypto.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/engine.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/hkdf.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/objects.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/opensslconf.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/opensslv.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/ossl_typ.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/pkcs12.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/pkcs7.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/poly1305.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/rand.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/safestack.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/tool/args.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/tool/client.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/tool/const.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/tool/digest.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/tool/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/tool/pkcs12.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/tool/server.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/tool/speed.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/tool/tool.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/tool/transport_common.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/tool/transport_common.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/crypto/bio/socket_helper.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/bytestring/ber.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/bytestring/cbb.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/bytestring/cbs.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/bytestring/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/chacha/chacha.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/cipher_extra/e_chacha20poly1305.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/cipher_extra/e_tls.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/crypto.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/engine/engine.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/cipher/aead.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/hkdf/hkdf.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/rand/rand.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/rand/urandom.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/pkcs7/pkcs7.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/poly1305/poly1305.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/poly1305/poly1305_arm.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/poly1305/poly1305_vec.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/rand_extra/windows.c
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/aead.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/bytestring.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/chacha.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/cpu.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/crypto.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/engine.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/hkdf.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/objects.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/opensslconf.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/opensslv.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/ossl_typ.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/pkcs12.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/pkcs7.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/poly1305.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/rand.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/safestack.h
+FILE: ../../../flutter/third_party/boringssl/src/tool/args.cc
+FILE: ../../../flutter/third_party/boringssl/src/tool/client.cc
+FILE: ../../../flutter/third_party/boringssl/src/tool/const.cc
+FILE: ../../../flutter/third_party/boringssl/src/tool/digest.cc
+FILE: ../../../flutter/third_party/boringssl/src/tool/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/tool/pkcs12.cc
+FILE: ../../../flutter/third_party/boringssl/src/tool/server.cc
+FILE: ../../../flutter/third_party/boringssl/src/tool/speed.cc
+FILE: ../../../flutter/third_party/boringssl/src/tool/tool.cc
+FILE: ../../../flutter/third_party/boringssl/src/tool/transport_common.cc
+FILE: ../../../flutter/third_party/boringssl/src/tool/transport_common.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2014, Google Inc.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/scientificnumberformatter.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/scientificnumberformatter.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/GLSL.ext.AMD.h
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/GLSL.ext.EXT.h
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/GLSL.std.450.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/GLSL.ext.AMD.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/GLSL.ext.EXT.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/GLSL.std.450.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2014-2016 The Khronos Group Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and/or associated documentation files (the "Materials"),
+to deal in the Materials without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Materials, and to permit persons to whom the
+Materials are furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Materials.
+
+MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
+STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
+HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
+
+THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM,OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS
+IN THE MATERIALS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/unicode/scientificnumberformatter.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/scientificnumberformatter.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2014-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/GLSL.ext.NV.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/GLSL.ext.NV.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2014-2017 The Khronos Group Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and/or associated documentation files (the "Materials"),
+to deal in the Materials without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Materials, and to permit persons to whom the
+Materials are furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Materials.
+
+MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
+STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
+HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
+
+THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM,OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS
+IN THE MATERIALS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+LIBRARY: spirv-cross
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/spirv.hpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv.h
+ORIGIN: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv.hpp
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/spirv.hpp
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv.h
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/spirv.hpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2014-2020 The Khronos Group Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and/or associated documentation files (the "Materials"),
+to deal in the Materials without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Materials, and to permit persons to whom the
+Materials are furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Materials.
+
+MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
+STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
+HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
+
+THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM,OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS
+IN THE MATERIALS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/GLSL.ext.KHR.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/GLSL.ext.KHR.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2014-2020 The Khronos Group Inc.
+Copyright (C) 2022-2024 Arm Limited.
+Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and/or associated documentation files (the "Materials"),
+to deal in the Materials without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Materials, and to permit persons to whom the
+Materials are furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Materials.
+
+MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
+STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
+HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
+
+THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM,OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS
+IN THE MATERIALS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/err_data.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/bn_extra/bn_asn1.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/conf/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/curve25519/asm/x25519-asm-arm.S
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/p224-64.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/util.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/rand/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/refcount.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/thread_none.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/thread_pthread.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/thread_win.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/buffer.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/cmac.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/curve25519.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/dtls1.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/srtp.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/ssl_aead_ctx.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/ssl_buffer.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/ssl_key_share.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/tool/ciphers.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/tool/generate_ed25519.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/tool/genrsa.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/tool/rand.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/err_data.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/bn_extra/bn_asn1.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/conf/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/curve25519/asm/x25519-asm-arm.S
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/p224-64.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/util.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/rand/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/refcount.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/thread_none.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/thread_pthread.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/thread_win.c
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/buffer.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/cmac.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/curve25519.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/dtls1.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/srtp.h
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_aead_ctx.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_buffer.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_key_share.cc
+FILE: ../../../flutter/third_party/boringssl/src/tool/ciphers.cc
+FILE: ../../../flutter/third_party/boringssl/src/tool/generate_ed25519.cc
+FILE: ../../../flutter/third_party/boringssl/src/tool/genrsa.cc
+FILE: ../../../flutter/third_party/boringssl/src/tool/rand.cc
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2015, Google Inc.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/data/sprep/rfc3920node.txt + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc3920node.txt
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2015, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: fiat
+ORIGIN: ../../../flutter/third_party/boringssl/src/third_party/fiat/LICENSE
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/boringssl/src/third_party/fiat/asm/fiat_curve25519_adx_mul.S
+FILE: ../../../flutter/third_party/boringssl/src/third_party/fiat/asm/fiat_curve25519_adx_square.S
+FILE: ../../../flutter/third_party/boringssl/src/third_party/fiat/curve25519_32.h
+FILE: ../../../flutter/third_party/boringssl/src/third_party/fiat/curve25519_64.h
+FILE: ../../../flutter/third_party/boringssl/src/third_party/fiat/curve25519_64_adx.h
+FILE: ../../../flutter/third_party/boringssl/src/third_party/fiat/curve25519_64_msvc.h
+FILE: ../../../flutter/third_party/boringssl/src/third_party/fiat/p256_32.h
+FILE: ../../../flutter/third_party/boringssl/src/third_party/fiat/p256_64.h
+FILE: ../../../flutter/third_party/boringssl/src/third_party/fiat/p256_64_msvc.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2015-2020 the fiat-crypto authors (see
+
+https://github.com/mit-plv/fiat-crypto/blob/master/AUTHORS).
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glfw
+ORIGIN: ../../../flutter/third_party/glfw/src/null_init.c
+ORIGIN: ../../../flutter/third_party/glfw/src/null_platform.h
+ORIGIN: ../../../flutter/third_party/glfw/src/osmesa_context.c
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/glfw/src/null_init.c
+FILE: ../../../flutter/third_party/glfw/src/null_platform.h
+FILE: ../../../flutter/third_party/glfw/src/osmesa_context.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2016 Google Inc.
+Copyright (c) 2016-2017 Camilla Löwy <elmindreda@glfw.org>
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not
+   be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+   distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glfw
+ORIGIN: ../../../flutter/third_party/glfw/src/null_monitor.c
+ORIGIN: ../../../flutter/third_party/glfw/src/null_window.c
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/glfw/src/null_monitor.c
+FILE: ../../../flutter/third_party/glfw/src/null_window.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2016 Google Inc.
+Copyright (c) 2016-2019 Camilla Löwy <elmindreda@glfw.org>
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not
+   be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+   distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/bytestring/asn1_compat.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/cpu_aarch64_linux.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/cpu_arm_linux.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/curve25519/spake25519.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/modes/polyval.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/obj/objects.go
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/poly1305/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/pool/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/pool/pool.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/rand_extra/deterministic.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/decrepit/evp/dss1.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/decrepit/evp/evp_do_all.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/decrepit/obj/obj_decrepit.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/decrepit/x509/x509_decrepit.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/asn1_mac.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/obj_mac.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/pool.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/tls13_both.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/tls13_client.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/tls13_enc.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/tls13_server.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/crypto/bytestring/asn1_compat.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/cpu_aarch64_linux.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/cpu_arm_linux.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/curve25519/spake25519.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/modes/polyval.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/obj/objects.go
+FILE: ../../../flutter/third_party/boringssl/src/crypto/poly1305/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/pool/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/pool/pool.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/rand_extra/deterministic.c
+FILE: ../../../flutter/third_party/boringssl/src/decrepit/evp/dss1.c
+FILE: ../../../flutter/third_party/boringssl/src/decrepit/evp/evp_do_all.c
+FILE: ../../../flutter/third_party/boringssl/src/decrepit/obj/obj_decrepit.c
+FILE: ../../../flutter/third_party/boringssl/src/decrepit/x509/x509_decrepit.c
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/asn1_mac.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/obj_mac.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/pool.h
+FILE: ../../../flutter/third_party/boringssl/src/ssl/tls13_both.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/tls13_client.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/tls13_enc.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/tls13_server.cc
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2016, Google Inc.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glfw
+ORIGIN: ../../../flutter/third_party/glfw/src/null_joystick.c
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/glfw/src/null_joystick.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2016-2017 Camilla Löwy <elmindreda@glfw.org>
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not
+   be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+   distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/crypto_test_data.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/cipher_extra/e_aesctrhmac.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/cipher_extra/e_aesgcmsiv.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/err/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/evp/p_ed25519.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/evp/p_ed25519_asn1.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bcm.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/delocate.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/rand/ctrdrbg.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/self_check/fips.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/self_check/self_check.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/pkcs7/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/pkcs7/pkcs7_x509.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/rand_extra/forkunsafe.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/rand_extra/rand_extra.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/decrepit/cfb/cfb.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/is_boringssl.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/span.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/ssl_versions.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/tool/file.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/tool/sign.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/crypto_test_data.cc
+FILE: ../../../flutter/third_party/boringssl/src/crypto/cipher_extra/e_aesctrhmac.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/cipher_extra/e_aesgcmsiv.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/err/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/evp/p_ed25519.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/evp/p_ed25519_asn1.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bcm.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/delocate.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/rand/ctrdrbg.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/self_check/fips.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/self_check/self_check.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/pkcs7/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/pkcs7/pkcs7_x509.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/rand_extra/forkunsafe.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/rand_extra/rand_extra.c
+FILE: ../../../flutter/third_party/boringssl/src/decrepit/cfb/cfb.c
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/is_boringssl.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/span.h
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_versions.cc
+FILE: ../../../flutter/third_party/boringssl/src/tool/file.cc
+FILE: ../../../flutter/third_party/boringssl/src/tool/sign.cc
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2017, Google Inc.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/hrss/asm/poly_rq_mul.S
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/crypto/hrss/asm/poly_rq_mul.S
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2017, the HRSS authors.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: ffx_spd
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/ffx_spd/ffx_a.h
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/ffx_spd/ffx_a.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2017-2019 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) <2014> <Michal Drobot>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy,
+modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: ffx_spd
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/ffx_spd/ffx_spd.h
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/ffx_spd/ffx_spd.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2017-2020 Advanced Micro Devices, Inc. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy,
+modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: vulkan-validation-layers
+LIBRARY: vulkan_memory_allocator
+ORIGIN: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h
+ORIGIN: ../../../flutter/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h
+FILE: ../../../flutter/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2017-2022 Advanced Micro Devices, Inc. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/NonSemanticShaderDebugInfo100.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/NonSemanticShaderDebugInfo100.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2018 The Khronos Group Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and/or associated documentation files (the "Materials"),
+to deal in the Materials without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Materials, and to permit persons to whom the
+Materials are furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Materials.
+
+MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
+STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
+HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
+
+THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM,OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS
+IN THE MATERIALS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/bytestring/unicode.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/chacha/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/cpu_aarch64_fuchsia.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/cpu_arm_linux.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/div_extra.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/gcd_extra.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/felem.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/scalar.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/simple_mul.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/md5/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/tls/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/hrss/hrss.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/hrss/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/e_os2.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/hrss.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/handoff.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/crypto/bytestring/unicode.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/chacha/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/cpu_aarch64_fuchsia.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/cpu_arm_linux.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/div_extra.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/gcd_extra.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/felem.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/scalar.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/simple_mul.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/md5/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/tls/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/hrss/hrss.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/hrss/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/e_os2.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/hrss.h
+FILE: ../../../flutter/third_party/boringssl/src/ssl/handoff.cc
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2018, Google Inc.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/cpu_aarch64_win.c
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/crypto/cpu_aarch64_win.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2018, Google Inc.
+Copyright (c) 2020, Arm Ltd.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: inja
+ORIGIN: ../../../flutter/third_party/inja/LICENSE
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/inja/include/inja/config.hpp
+FILE: ../../../flutter/third_party/inja/include/inja/environment.hpp
+FILE: ../../../flutter/third_party/inja/include/inja/exceptions.hpp
+FILE: ../../../flutter/third_party/inja/include/inja/function_storage.hpp
+FILE: ../../../flutter/third_party/inja/include/inja/lexer.hpp
+FILE: ../../../flutter/third_party/inja/include/inja/node.hpp
+FILE: ../../../flutter/third_party/inja/include/inja/parser.hpp
+FILE: ../../../flutter/third_party/inja/include/inja/renderer.hpp
+FILE: ../../../flutter/third_party/inja/include/inja/statistics.hpp
+FILE: ../../../flutter/third_party/inja/include/inja/template.hpp
+FILE: ../../../flutter/third_party/inja/include/inja/token.hpp
+FILE: ../../../flutter/third_party/inja/include/inja/utils.hpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2018-2021 Berscheid
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: inja
+ORIGIN: ../../../flutter/third_party/inja/include/inja/inja.hpp
+ORIGIN: ../../../flutter/third_party/inja/single_include/inja/inja.hpp
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/inja/include/inja/inja.hpp
+FILE: ../../../flutter/third_party/inja/single_include/inja/inja.hpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2018-2021 Lars Berscheid
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/ec_extra/ec_derive.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/evp/p_x25519.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/evp/p_x25519_asn1.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/aes/aes_nohw.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/fips_shared_support.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/modes/gcm_nohw.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/siphash/siphash.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/trust_token/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/trust_token/trust_token.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/siphash.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/crypto/ec_extra/ec_derive.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/evp/p_x25519.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/evp/p_x25519_asn1.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/aes/aes_nohw.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/fips_shared_support.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/modes/gcm_nohw.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/siphash/siphash.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/trust_token/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/trust_token/trust_token.c
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/siphash.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2019, Google Inc.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/CInterface/spirv_c_interface.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/CInterface/glslang_c_interface.cpp
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Include/glslang_c_interface.h
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Include/glslang_c_shader_types.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/CInterface/spirv_c_interface.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/CInterface/glslang_c_interface.cpp
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Include/glslang_c_interface.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Include/glslang_c_shader_types.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2019, Viktor Latypov
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: angle
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/QueryMtl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/QueryMtl.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/SyncMtl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/SyncMtl.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_occlusion_query_pool.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_occlusion_query_pool.mm + ../../../flutter/third_party/angle/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/QueryMtl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/QueryMtl.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/SyncMtl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/SyncMtl.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_occlusion_query_pool.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_occlusion_query_pool.mm
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2020 The ANGLE Project Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+    Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+
+    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
+    Ltd., nor the names of their contributors may be used to endorse
+    or promote products derived from this software without specific
+    prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/NonSemanticDebugPrintf.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/NonSemanticDebugPrintf.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2020 The Khronos Group Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and/or associated documentation files (the
+"Materials"), to deal in the Materials without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Materials, and to
+permit persons to whom the Materials are furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Materials.
+
+MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS
+KHRONOS STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS
+SPECIFICATIONS AND HEADER INFORMATION ARE LOCATED AT
+   https://www.khronos.org/registry/
+
+THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/curve25519/curve25519.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/curve25519/curve25519_tables.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/curve25519/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/dsa/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/ec_extra/hash_to_curve.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/ec_extra/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/p256.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/p256_table.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/rand/fork_detect.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/rand/fork_detect.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/rand/getrandom_fillin.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/hpke/hpke.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/rand_extra/passive.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/trust_token/pmbtoken.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/trust_token/voprf.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/hpke.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/trust_token.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/tool/fd.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/crypto/curve25519/curve25519.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/curve25519/curve25519_tables.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/curve25519/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/dsa/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/ec_extra/hash_to_curve.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/ec_extra/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/p256.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/p256_table.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/rand/fork_detect.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/rand/fork_detect.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/rand/getrandom_fillin.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/hpke/hpke.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/rand_extra/passive.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/trust_token/pmbtoken.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/trust_token/voprf.c
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/hpke.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/trust_token.h
+FILE: ../../../flutter/third_party/boringssl/src/tool/fd.cc
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2020, Google Inc.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Public/resource_limits_c.h
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/ResourceLimits/resource_limits_c.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Public/resource_limits_c.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/ResourceLimits/resource_limits_c.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2020, Travis Fort
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: etc_decoder
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/etc_decoder/etc_decoder.h
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/etc_decoder/etc_decoder.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2020-2022 Hans-Kristian Arntzen
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glfw
+ORIGIN: ../../../flutter/third_party/glfw/src/posix_module.c
+ORIGIN: ../../../flutter/third_party/glfw/src/win32_module.c
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/glfw/src/posix_module.c
+FILE: ../../../flutter/third_party/glfw/src/win32_module.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2021 Camilla Löwy <elmindreda@glfw.org>
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not
+   be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+   distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/GLSL.ext.QCOM.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/GLSL.ext.QCOM.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2021 The Khronos Group Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and/or associated documentation files (the "Materials"),
+to deal in the Materials without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Materials, and to permit persons to whom the
+Materials are furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Materials.
+
+MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
+STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
+HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
+
+THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM,OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS
+IN THE MATERIALS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: ceval
+ORIGIN: ../../../flutter/third_party/angle/src/third_party/ceval/LICENSE
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/angle/src/third_party/ceval/ceval.h
+FILE: ../../../flutter/third_party/angle/src/third_party/ceval/patches/0001-remove-sprintf.patch
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2021 e_t
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/blake2/blake2.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/blake2/blake2b256_tests.txt
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/cpu_aarch64_apple.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ecdsa/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/blake2.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/x509_vfy.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/encrypted_client_hello.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/tool/generate_ech.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/crypto/blake2/blake2.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/blake2/blake2b256_tests.txt
+FILE: ../../../flutter/third_party/boringssl/src/crypto/cpu_aarch64_apple.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ecdsa/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/blake2.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/x509_vfy.h
+FILE: ../../../flutter/third_party/boringssl/src/ssl/encrypted_client_hello.cc
+FILE: ../../../flutter/third_party/boringssl/src/tool/generate_ech.cc
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2021, Google Inc.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/GLSL.ext.ARM.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/SPIRV/GLSL.ext.ARM.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2022 ARM Limited
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and/or associated documentation files (the "Materials"),
+to deal in the Materials without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Materials, and to permit persons to whom the
+Materials are furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Materials.
+
+MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
+STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
+HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
+
+THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM,OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS
+IN THE MATERIALS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glfw
+ORIGIN: ../../../flutter/third_party/glfw/src/posix_poll.c
+ORIGIN: ../../../flutter/third_party/glfw/src/posix_poll.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/glfw/src/posix_poll.c
+FILE: ../../../flutter/third_party/glfw/src/posix_poll.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2022 Camilla Löwy <elmindreda@glfw.org>
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not
+   be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+   distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: web_locale_keymap
+ORIGIN: ../../../flutter/third_party/web_locale_keymap/lib/web_locale_keymap.dart + ../../../flutter/third_party/web_locale_keymap/License.txt
+ORIGIN: ../../../flutter/third_party/web_locale_keymap/lib/web_locale_keymap/key_mappings.g.dart + ../../../flutter/third_party/web_locale_keymap/License.txt
+ORIGIN: ../../../flutter/third_party/web_locale_keymap/lib/web_locale_keymap/locale_keymap.dart + ../../../flutter/third_party/web_locale_keymap/License.txt
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/web_locale_keymap/lib/web_locale_keymap.dart
+FILE: ../../../flutter/third_party/web_locale_keymap/lib/web_locale_keymap/key_mappings.g.dart
+FILE: ../../../flutter/third_party/web_locale_keymap/lib/web_locale_keymap/locale_keymap.dart
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2022 Google LLC
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/asn1/posix_time.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/cpu_arm_freebsd.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/evp/p_hkdf.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/dh/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509/policy.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/ctrdrbg.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/kdf.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/time.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/crypto/asn1/posix_time.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/cpu_arm_freebsd.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/evp/p_hkdf.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/dh/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509/policy.c
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/ctrdrbg.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/kdf.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/time.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2022, Google Inc.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/cpu_aarch64_openbsd.c
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/crypto/cpu_aarch64_openbsd.c
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2022, Robert Nagy <robert.nagy@gmail.com>
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/cpu_aarch64_sysreg.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/curve25519/curve25519_64_adx.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/builtin_curves.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/kyber/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/kyber/keccak.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/kyber/kyber.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/rand_extra/getentropy.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/rand_extra/ios.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/rand_extra/trusty.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/asm_base.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/kyber.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/target.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/crypto/cpu_aarch64_sysreg.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/curve25519/curve25519_64_adx.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/builtin_curves.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/kyber/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/kyber/keccak.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/kyber/kyber.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/rand_extra/getentropy.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/rand_extra/ios.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/rand_extra/trusty.c
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/asm_base.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/kyber.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/target.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2023, Google Inc.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/decNumber.h (with ../../../flutter/third_party/icu/LICENSE)
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/icu/source/i18n/decNumber.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) IBM Corporation, 2000-2010.   All rights reserved.
+
+This software is made available under the terms of the
+ICU License -- ICU 1.8.1 and later.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/decContext.h (with ../../../flutter/third_party/icu/LICENSE)
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/icu/source/i18n/decContext.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) IBM Corporation, 2000-2011.   All rights reserved.
+
+This software is made available under the terms of the
+ICU License -- ICU 1.8.1 and later.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/decContext.cpp (with ../../../flutter/third_party/icu/LICENSE)
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/icu/source/i18n/decContext.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) IBM Corporation, 2000-2012.  All rights reserved.
+
+This software is made available under the terms of the
+ICU License -- ICU 1.8.1 and later.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/decNumber.cpp (with ../../../flutter/third_party/icu/LICENSE)
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/icu/source/i18n/decNumber.cpp
+----------------------------------------------------------------------------------------------------
+Copyright (c) IBM Corporation, 2000-2014.  All rights reserved.
+
+This software is made available under the terms of the
+ICU License -- ICU 1.8.1 and later.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/decNumberLocal.h (with ../../../flutter/third_party/icu/LICENSE)
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/icu/source/i18n/decNumberLocal.h
+----------------------------------------------------------------------------------------------------
+Copyright (c) IBM Corporation, 2000-2016.   All rights reserved.
+
+This software is made available under the terms of the
+ICU License -- ICU 1.8.1 and later.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: spring_animation
+ORIGIN: ../../../flutter/third_party/spring_animation/spring_animation.h + ../../../flutter/third_party/spring_animation/LICENSE
+ORIGIN: ../../../flutter/third_party/spring_animation/spring_animation.mm + ../../../flutter/third_party/spring_animation/LICENSE
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/spring_animation/spring_animation.h
+FILE: ../../../flutter/third_party/spring_animation/spring_animation.mm
+----------------------------------------------------------------------------------------------------
+Copyright (c) Meta Platforms, Inc. and affiliates.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/ms-use/COPYING
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/harfbuzz/src/ms-use/IndicPositionalCategory-Additional.txt
+FILE: ../../../flutter/third_party/harfbuzz/src/ms-use/IndicShapingInvalidCluster.txt
+FILE: ../../../flutter/third_party/harfbuzz/src/ms-use/IndicSyllabicCategory-Additional.txt
+----------------------------------------------------------------------------------------------------
+Copyright (c) Microsoft Corporation.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE
+====================================================================================================
+
+====================================================================================================
+LIBRARY: freetype2
+ORIGIN: ../../../flutter/third_party/freetype2/src/pcf/pcfutil.c
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/freetype2/src/pcf/pcfutil.c
+----------------------------------------------------------------------------------------------------
+Copyright 1990, 1994, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/bio_ssl.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/ssl/bio_ssl.cc
+----------------------------------------------------------------------------------------------------
+Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+
+Licensed under the OpenSSL license (the "License").  You may not use
+this file except in compliance with the License.  You can obtain a copy
+in the file LICENSE in the source distribution or at
+https://www.openssl.org/source/license.html
+====================================================================================================
+
+====================================================================================================
+LIBRARY: freetype2
+ORIGIN: ../../../flutter/third_party/freetype2/src/bdf/bdf.h
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/freetype2/src/bdf/bdf.h
+----------------------------------------------------------------------------------------------------
+Copyright 2000 Computing Research Labs, New Mexico State University
+Copyright 2001-2004, 2011 Francesco Zappa Nardelli
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+THE COMPUTING RESEARCH LAB OR NEW MEXICO STATE UNIVERSITY BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: freetype2
+ORIGIN: ../../../flutter/third_party/freetype2/src/bdf/bdflib.c
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/freetype2/src/bdf/bdflib.c
+----------------------------------------------------------------------------------------------------
+Copyright 2000 Computing Research Labs, New Mexico State University
+Copyright 2001-2014
+  Francesco Zappa Nardelli
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+THE COMPUTING RESEARCH LAB OR NEW MEXICO STATE UNIVERSITY BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: freetype2
+ORIGIN: ../../../flutter/third_party/freetype2/include/freetype/internal/fthash.h
+ORIGIN: ../../../flutter/third_party/freetype2/src/base/fthash.c
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/fthash.h
+FILE: ../../../flutter/third_party/freetype2/src/base/fthash.c
+----------------------------------------------------------------------------------------------------
+Copyright 2000 Computing Research Labs, New Mexico State University
+Copyright 2001-2015
+  Francesco Zappa Nardelli
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+THE COMPUTING RESEARCH LAB OR NEW MEXICO STATE UNIVERSITY BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: freetype2
+ORIGIN: ../../../flutter/third_party/freetype2/src/pcf/pcfutil.h
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/freetype2/src/pcf/pcfutil.h
+----------------------------------------------------------------------------------------------------
+Copyright 2000, 2001, 2004 by
+Francesco Zappa Nardelli
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: freetype2
+ORIGIN: ../../../flutter/third_party/freetype2/src/pcf/pcfdrivr.h
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/freetype2/src/pcf/pcfdrivr.h
+----------------------------------------------------------------------------------------------------
+Copyright 2000-2001, 2002 by
+Francesco Zappa Nardelli
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: freetype2
+ORIGIN: ../../../flutter/third_party/freetype2/src/pcf/pcf.c
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/freetype2/src/pcf/pcf.c
+----------------------------------------------------------------------------------------------------
+Copyright 2000-2001, 2003 by
+Francesco Zappa Nardelli
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: freetype2
+ORIGIN: ../../../flutter/third_party/freetype2/src/pcf/pcfread.c
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/freetype2/src/pcf/pcfread.c
+----------------------------------------------------------------------------------------------------
+Copyright 2000-2010, 2012-2014 by
+Francesco Zappa Nardelli
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_ocsp.c (with ../../../flutter/third_party/boringssl/src/LICENSE)
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_ocsp.c
+----------------------------------------------------------------------------------------------------
+Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.
+
+Licensed under the OpenSSL license (the "License").  You may not use
+this file except in compliance with the License.  You can obtain a copy
+in the file LICENSE in the source distribution or at
+https://www.openssl.org/source/license.html
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/stringpiece.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/unicode/stringpiece.h
+----------------------------------------------------------------------------------------------------
+Copyright 2001 and onwards Google Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: freetype2
+ORIGIN: ../../../flutter/third_party/freetype2/src/bdf/bdferror.h
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/freetype2/src/bdf/bdferror.h
+----------------------------------------------------------------------------------------------------
+Copyright 2001, 2002, 2012 Francesco Zappa Nardelli
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+THE COMPUTING RESEARCH LAB OR NEW MEXICO STATE UNIVERSITY BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/evp/scrypt_tests.txt (with ../../../flutter/third_party/boringssl/src/LICENSE)
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/crypto/evp/scrypt_tests.txt
+----------------------------------------------------------------------------------------------------
+Copyright 2001-2017 The OpenSSL Project Authors. All Rights Reserved.
+
+Licensed under the OpenSSL license (the "License").  You may not use
+this file except in compliance with the License.  You can obtain a copy
+in the file LICENSE in the source distribution or at
+https://www.openssl.org/source/license.html
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/bn.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/bn.h
+----------------------------------------------------------------------------------------------------
+Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+
+Portions of the attached software ("Contribution") are developed by
+SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
+
+The Contribution is licensed pursuant to the Eric Young open source
+license provided above.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/ec.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/ec_key.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/ec_montgomery.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/oct.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/simple.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/wnaf.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/ec.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/ec_key.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/tls1.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/handshake_client.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/handshake_server.cc
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/s3_lib.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/ec.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/ec_key.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/ec_montgomery.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/oct.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/simple.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/wnaf.c
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/ec.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/ec_key.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/tls1.h
+FILE: ../../../flutter/third_party/boringssl/src/ssl/handshake_client.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/handshake_server.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/s3_lib.cc
+----------------------------------------------------------------------------------------------------
+Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+
+Portions of the attached software ("Contribution") are developed by
+SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
+
+The Contribution is licensed pursuant to the OpenSSL open source
+license provided above.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/ecdh_extra/ecdh_extra.c + ../../../flutter/third_party/boringssl/src/crypto/ecdh_extra/ecdh_extra.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ecdh/ecdh.c + ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ecdh/ecdh.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/ecdh.h + ../../../flutter/third_party/boringssl/src/include/openssl/ecdh.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/boringssl/src/crypto/ecdh_extra/ecdh_extra.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ecdh/ecdh.c
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/ecdh.h
+----------------------------------------------------------------------------------------------------
+Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   licensing@OpenSSL.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/ssl.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/ssl3.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/handshake.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/internal.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/s3_both.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/ssl_cert.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/ssl_cipher.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/ssl_lib.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/ssl_x509.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/ssl.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/ssl3.h
+FILE: ../../../flutter/third_party/boringssl/src/ssl/handshake.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/ssl/s3_both.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_cert.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_cipher.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_lib.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_x509.cc
+----------------------------------------------------------------------------------------------------
+Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ECC cipher suite support in OpenSSL originally developed by
+SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/x509.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/x509.h
+----------------------------------------------------------------------------------------------------
+Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ECDH support in OpenSSL originally developed by
+SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: angle
+ORIGIN: ../../../flutter/third_party/angle/include/GLSLANG/ShaderLang.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/angleutils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/debug.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/debug.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/mathutil.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/utilities.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/utilities.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/preprocessor/preprocessor.l + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/BaseTypes.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/BuiltInFunctionEmulator.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/CallDAG.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/CallDAG.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/CollectVariables.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/CollectVariables.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/Common.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/Compiler.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/Compiler.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/ConstantUnion.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/ExtensionBehavior.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/HashNames.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/InfoSink.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/InfoSink.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/Initialize.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/Initialize.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/InitializeDll.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/InitializeDll.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/InitializeGlobals.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/IntermNode.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/IntermNode.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/Operator.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/OutputTree.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/ParseContext.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/ParseContext.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/PoolAlloc.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/PoolAlloc.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/QualifierTypes.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/QualifierTypes.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/ShaderLang.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/SymbolTable.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/SymbolTable.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/Types.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/Types.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/ValidateGlobalInitializer.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/ValidateGlobalInitializer.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/ValidateLimitations.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/ValidateSwitch.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/ValidateSwitch.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/ValidateVaryingLocations.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/ValidateVaryingLocations.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/VariablePacker.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/VariablePacker.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/glsl/BuiltInFunctionEmulatorGLSL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/glsl/OutputESSL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/glsl/OutputESSL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/glsl/OutputGLSL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/glsl/OutputGLSL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/glsl/OutputGLSLBase.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/glsl/OutputGLSLBase.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/glsl/TranslatorESSL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/glsl/TranslatorESSL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/glsl/TranslatorGLSL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/glsl/TranslatorGLSL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/glsl/VersionGLSL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/glsl/VersionGLSL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/glslang.l + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/glslang.y + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/ASTMetadataHLSL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/ASTMetadataHLSL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/OutputHLSL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/OutputHLSL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/TranslatorHLSL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/TranslatorHLSL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/UtilsMSL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/UtilsMSL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/EmulateGLFragColorBroadcast.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/EmulateGLFragColorBroadcast.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/InitializeVariables.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/InitializeVariables.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/PruneNoOps.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/PruneNoOps.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RecordConstantPrecision.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RecordConstantPrecision.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RemoveDynamicIndexing.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RemoveDynamicIndexing.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/SeparateDeclarations.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/SeparateDeclarations.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/RegenerateStructNames.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/RegenerateStructNames.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/ScalarizeVecAndMatConstructorArgs.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/ScalarizeVecAndMatConstructorArgs.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/apple/UnfoldShortCircuitAST.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/apple/UnfoldShortCircuitAST.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/ArrayReturnValueToOutParameter.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/ArrayReturnValueToOutParameter.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/RemoveSwitchFallThrough.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/RemoveSwitchFallThrough.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/SeparateArrayInitialization.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/SeparateArrayInitialization.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/SeparateExpressionsReturningArrays.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/SeparateExpressionsReturningArrays.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/UnfoldShortCircuitToIf.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/UnfoldShortCircuitToIf.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/IntermTraverse.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/NodeSearch.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/util.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/image_util/generatemip.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Buffer.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Buffer.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Config.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Config.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Context.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Context.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Display.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Display.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/EGLSync.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Fence.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Fence.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Framebuffer.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Framebuffer.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/HandleAllocator.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/HandleAllocator.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Program.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Program.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/RefCountObject.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Renderbuffer.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Renderbuffer.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/ResourceManager.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/ResourceManager.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Shader.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Shader.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Surface.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Surface.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Texture.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Texture.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/SurfaceImpl.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/ImageD3D.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/ImageD3D.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/IndexBuffer.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/IndexBuffer.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/IndexDataManager.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/IndexDataManager.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/TextureStorage.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/VertexBuffer.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/VertexBuffer.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/VertexDataManager.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/VertexDataManager.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Blit9.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Blit9.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Image9.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Image9.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/IndexBuffer9.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/IndexBuffer9.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/renderer9_utils.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/renderer9_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/vertexconversion.h + ../../../flutter/third_party/angle/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/angle/include/GLSLANG/ShaderLang.h
+FILE: ../../../flutter/third_party/angle/src/common/angleutils.h
+FILE: ../../../flutter/third_party/angle/src/common/debug.cpp
+FILE: ../../../flutter/third_party/angle/src/common/debug.h
+FILE: ../../../flutter/third_party/angle/src/common/mathutil.h
+FILE: ../../../flutter/third_party/angle/src/common/utilities.cpp
+FILE: ../../../flutter/third_party/angle/src/common/utilities.h
+FILE: ../../../flutter/third_party/angle/src/compiler/preprocessor/preprocessor.l
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/BaseTypes.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/BuiltInFunctionEmulator.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/CallDAG.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/CallDAG.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/CollectVariables.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/CollectVariables.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/Common.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/Compiler.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/Compiler.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/ConstantUnion.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/ExtensionBehavior.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/HashNames.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/InfoSink.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/InfoSink.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/Initialize.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/Initialize.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/InitializeDll.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/InitializeDll.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/InitializeGlobals.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/IntermNode.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/IntermNode.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/Operator.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/OutputTree.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/ParseContext.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/ParseContext.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/PoolAlloc.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/PoolAlloc.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/QualifierTypes.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/QualifierTypes.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/ShaderLang.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/SymbolTable.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/SymbolTable.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/Types.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/Types.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/ValidateGlobalInitializer.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/ValidateGlobalInitializer.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/ValidateLimitations.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/ValidateSwitch.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/ValidateSwitch.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/ValidateVaryingLocations.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/ValidateVaryingLocations.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/VariablePacker.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/VariablePacker.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/glsl/BuiltInFunctionEmulatorGLSL.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/glsl/OutputESSL.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/glsl/OutputESSL.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/glsl/OutputGLSL.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/glsl/OutputGLSL.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/glsl/OutputGLSLBase.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/glsl/OutputGLSLBase.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/glsl/TranslatorESSL.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/glsl/TranslatorESSL.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/glsl/TranslatorGLSL.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/glsl/TranslatorGLSL.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/glsl/VersionGLSL.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/glsl/VersionGLSL.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/glslang.l
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/glslang.y
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/ASTMetadataHLSL.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/ASTMetadataHLSL.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/OutputHLSL.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/OutputHLSL.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/TranslatorHLSL.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/TranslatorHLSL.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/UtilsMSL.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/UtilsMSL.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/EmulateGLFragColorBroadcast.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/EmulateGLFragColorBroadcast.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/InitializeVariables.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/InitializeVariables.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/PruneNoOps.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/PruneNoOps.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RecordConstantPrecision.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RecordConstantPrecision.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RemoveDynamicIndexing.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RemoveDynamicIndexing.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/SeparateDeclarations.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/SeparateDeclarations.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/RegenerateStructNames.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/RegenerateStructNames.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/ScalarizeVecAndMatConstructorArgs.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/ScalarizeVecAndMatConstructorArgs.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/apple/UnfoldShortCircuitAST.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/apple/UnfoldShortCircuitAST.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/ArrayReturnValueToOutParameter.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/ArrayReturnValueToOutParameter.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/RemoveSwitchFallThrough.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/RemoveSwitchFallThrough.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/SeparateArrayInitialization.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/SeparateArrayInitialization.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/SeparateExpressionsReturningArrays.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/SeparateExpressionsReturningArrays.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/UnfoldShortCircuitToIf.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/UnfoldShortCircuitToIf.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/IntermTraverse.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/NodeSearch.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/util.h
+FILE: ../../../flutter/third_party/angle/src/image_util/generatemip.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Buffer.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Buffer.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Config.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Config.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Context.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Context.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Display.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Display.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/EGLSync.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Fence.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Fence.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Framebuffer.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Framebuffer.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/HandleAllocator.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/HandleAllocator.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Program.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Program.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/RefCountObject.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Renderbuffer.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Renderbuffer.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/ResourceManager.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/ResourceManager.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Shader.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Shader.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Surface.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Surface.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Texture.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Texture.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/SurfaceImpl.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/ImageD3D.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/ImageD3D.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/IndexBuffer.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/IndexBuffer.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/IndexDataManager.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/IndexDataManager.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/TextureStorage.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/VertexBuffer.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/VertexBuffer.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/VertexDataManager.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/VertexDataManager.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Blit9.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Blit9.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Image9.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Image9.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/IndexBuffer9.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/IndexBuffer9.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/renderer9_utils.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/renderer9_utils.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/vertexconversion.h
+----------------------------------------------------------------------------------------------------
+Copyright 2002 The ANGLE Project Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+    Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+
+    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
+    Ltd., nor the names of their contributors may be used to endorse
+    or promote products derived from this software without specific
+    prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: freetype2
+ORIGIN: ../../../flutter/third_party/freetype2/src/pcf/pcfread.h
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/freetype2/src/pcf/pcfread.h
+----------------------------------------------------------------------------------------------------
+Copyright 2003 by
+Francesco Zappa Nardelli
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/stringpiece.cpp + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/stringpiece.cpp
+----------------------------------------------------------------------------------------------------
+Copyright 2004 and onwards Google Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/ssl.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/tls1.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/handshake_client.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/handshake_server.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/internal.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/s3_lib.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/ssl_asn1.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/ssl_cipher.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/ssl_lib.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/ssl_session.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/ssl_stat.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/ssl_transcript.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/ssl_x509.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/t1_enc.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/ssl.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/tls1.h
+FILE: ../../../flutter/third_party/boringssl/src/ssl/handshake_client.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/handshake_server.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/ssl/s3_lib.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_asn1.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_cipher.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_lib.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_session.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_stat.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_transcript.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_x509.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/t1_enc.cc
+----------------------------------------------------------------------------------------------------
+Copyright 2005 Nokia. All rights reserved.
+
+The portions of the attached software ("Contribution") is developed by
+Nokia Corporation and is licensed pursuant to the OpenSSL open source
+license.
+
+The Contribution, originally written by Mika Kousa and Pasi Eronen of
+Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
+support (see RFC 4279) to OpenSSL.
+
+No patent licenses or other rights except those expressly stated in
+the OpenSSL open source license shall be deemed granted or received
+expressly, by implication, estoppel, or otherwise.
+
+No assurances are provided by Nokia that the Contribution does not
+infringe the patent or other intellectual property rights of any third
+party or that the license provides you with all the necessary rights
+to make use of the Contribution.
+
+THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
+ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
+SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
+OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
+OTHERWISE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/double-conversion-cached-powers.cpp
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion-cached-powers.cpp
+----------------------------------------------------------------------------------------------------
+Copyright 2006-2008 the V8 project authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google Inc. nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/rsa_extra/rsa_print.c (with ../../../flutter/third_party/boringssl/src/LICENSE)
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/crypto/rsa_extra/rsa_print.c
+----------------------------------------------------------------------------------------------------
+Copyright 2006-2017 The OpenSSL Project Authors. All Rights Reserved.
+
+Licensed under the OpenSSL license (the "License").  You may not use
+this file except in compliance with the License.  You can obtain a copy
+in the file LICENSE in the source distribution or at
+https://www.openssl.org/source/license.html
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/bytestream.cpp + ../../../flutter/third_party/icu/LICENSE
+ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/bytestream.h + ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/common/bytestream.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unicode/bytestream.h
+----------------------------------------------------------------------------------------------------
+Copyright 2007 Google Inc. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/apple-arm/crypto/fipsmodule/sha256-armv4-apple.S (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/apple-arm/crypto/fipsmodule/sha512-armv4-apple.S (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/linux-arm/crypto/fipsmodule/sha256-armv4-linux.S (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/linux-arm/crypto/fipsmodule/sha512-armv4-linux.S (with ../../../flutter/third_party/boringssl/src/LICENSE)
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/apple-arm/crypto/fipsmodule/sha256-armv4-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-arm/crypto/fipsmodule/sha512-armv4-apple.S
+FILE: ../../../flutter/third_party/boringssl/linux-arm/crypto/fipsmodule/sha256-armv4-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-arm/crypto/fipsmodule/sha512-armv4-linux.S
+----------------------------------------------------------------------------------------------------
+Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved.
+
+Licensed under the OpenSSL license (the "License").  You may not use
+this file except in compliance with the License.  You can obtain a copy
+in the file LICENSE in the source distribution or at
+https://www.openssl.org/source/license.html
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libjpeg-turbo
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/simd/jsimdext.inc
+TYPE: LicenseType.zlib
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jsimd.h
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jsimd_none.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jsimddct.h
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jccolext-mmx.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jccolext-sse2-64.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jccolext-sse2.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jccolor-mmx.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jccolor-sse2-64.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jccolor-sse2.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jcgray-mmx.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jcgray-sse2-64.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jcgray-sse2.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jcgryext-mmx.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jcgryext-sse2-64.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jcgryext-sse2.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jchuff-sse2-64.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jchuff-sse2.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jcolsamp.inc
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jcsample-mmx.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jcsample-sse2-64.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jcsample-sse2.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jdcolext-mmx.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jdcolext-sse2-64.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jdcolext-sse2.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jdcolor-mmx.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jdcolor-sse2-64.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jdcolor-sse2.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jdct.inc
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jdmerge-mmx.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jdmerge-sse2-64.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jdmerge-sse2.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jdmrgext-mmx.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jdmrgext-sse2-64.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jdmrgext-sse2.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jdsample-mmx.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jdsample-sse2-64.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jdsample-sse2.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jfdctflt-3dn.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jfdctflt-sse-64.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jfdctflt-sse.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jfdctfst-mmx.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jfdctfst-sse2-64.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jfdctfst-sse2.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jfdctint-mmx.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jfdctint-sse2-64.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jfdctint-sse2.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jidctflt-3dn.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jidctflt-sse.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jidctflt-sse2-64.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jidctflt-sse2.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jidctfst-mmx.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jidctfst-sse2-64.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jidctfst-sse2.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jidctint-mmx.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jidctint-sse2-64.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jidctint-sse2.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jidctred-mmx.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jidctred-sse2-64.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jidctred-sse2.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jquant-3dn.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jquant-mmx.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jquant-sse.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jquantf-sse2-64.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jquantf-sse2.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jquanti-sse2-64.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jquanti-sse2.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jsimd.h
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jsimd_arm.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jsimd_arm64.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jsimd_i386.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jsimd_mips.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jsimd_powerpc.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jsimd_x86_64.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jsimdcpu.asm
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jsimdext.inc
+----------------------------------------------------------------------------------------------------
+Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
+Copyright (C) 2010, D. R. Commander.
+
+Based on the x86 SIMD extension for IJG JPEG library - version 1.02
+
+Copyright (C) 1999-2006, MIYASAKA Masaru.
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libwebp
+ORIGIN: ../../../flutter/third_party/libwebp/src/dec/frame_dec.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dec/quant_dec.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dec/tree_dec.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dec/vp8_dec.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dec/vp8_dec.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dec/vp8i_dec.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dec/webp_dec.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/dec.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/yuv.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/yuv.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/utils/bit_reader_utils.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/utils/bit_reader_utils.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/webp/decode.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/webp/types.h + ../../../flutter/third_party/libwebp/COPYING
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/libwebp/src/dec/frame_dec.c
+FILE: ../../../flutter/third_party/libwebp/src/dec/quant_dec.c
+FILE: ../../../flutter/third_party/libwebp/src/dec/tree_dec.c
+FILE: ../../../flutter/third_party/libwebp/src/dec/vp8_dec.c
+FILE: ../../../flutter/third_party/libwebp/src/dec/vp8_dec.h
+FILE: ../../../flutter/third_party/libwebp/src/dec/vp8i_dec.h
+FILE: ../../../flutter/third_party/libwebp/src/dec/webp_dec.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/dec.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/yuv.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/yuv.h
+FILE: ../../../flutter/third_party/libwebp/src/utils/bit_reader_utils.c
+FILE: ../../../flutter/third_party/libwebp/src/utils/bit_reader_utils.h
+FILE: ../../../flutter/third_party/libwebp/src/webp/decode.h
+FILE: ../../../flutter/third_party/libwebp/src/webp/types.h
+----------------------------------------------------------------------------------------------------
+Copyright 2010 Google Inc. All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of Google nor the names of its contributors may
+    be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: angle
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/ValidateLimitations.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/glslang.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/util.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Uniform.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Uniform.h + ../../../flutter/third_party/angle/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/ValidateLimitations.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/glslang.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/util.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Uniform.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Uniform.h
+----------------------------------------------------------------------------------------------------
+Copyright 2010 The ANGLE Project Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+    Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+
+    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
+    Ltd., nor the names of their contributors may be used to endorse
+    or promote products derived from this software without specific
+    prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/pem.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/pki/pem.cc
+----------------------------------------------------------------------------------------------------
+Copyright 2010 The Chromium Authors
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/double-conversion-bignum-dtoa.cpp
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/double-conversion-bignum-dtoa.h
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/double-conversion-bignum.cpp
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/double-conversion-bignum.h
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/double-conversion-cached-powers.h
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/double-conversion-diy-fp.h
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/double-conversion-double-to-string.cpp
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/double-conversion-fast-dtoa.h
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/double-conversion-string-to-double.cpp
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/double-conversion-strtod.cpp
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/double-conversion-strtod.h
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/double-conversion-utils.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion-bignum-dtoa.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion-bignum-dtoa.h
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion-bignum.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion-bignum.h
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion-cached-powers.h
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion-diy-fp.h
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion-double-to-string.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion-fast-dtoa.h
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion-string-to-double.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion-strtod.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion-strtod.h
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion-utils.h
+----------------------------------------------------------------------------------------------------
+Copyright 2010 the V8 project authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google Inc. nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libwebp
+ORIGIN: ../../../flutter/third_party/libwebp/src/dec/alpha_dec.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dec/buffer_dec.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dec/idec_dec.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dec/io_dec.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dec/webpi_dec.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/cpu.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/dec_sse2.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/dsp.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/enc.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/enc_sse2.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/filters.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/upsampling.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/upsampling_neon.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/upsampling_sse2.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/upsampling_sse41.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/enc/alpha_enc.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/enc/analysis_enc.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/enc/config_enc.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/enc/cost_enc.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/enc/cost_enc.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/enc/filter_enc.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/enc/frame_enc.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/enc/iterator_enc.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/enc/picture_enc.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/enc/quant_enc.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/enc/syntax_enc.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/enc/token_enc.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/enc/tree_enc.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/enc/vp8i_enc.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/enc/webp_enc.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/mux/muxedit.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/mux/muxi.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/mux/muxinternal.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/mux/muxread.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/utils/bit_writer_utils.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/utils/bit_writer_utils.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/utils/filters_utils.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/utils/filters_utils.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/utils/huffman_encode_utils.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/utils/huffman_encode_utils.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/utils/quant_levels_utils.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/utils/quant_levels_utils.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/utils/thread_utils.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/utils/thread_utils.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/webp/encode.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/webp/mux.h + ../../../flutter/third_party/libwebp/COPYING
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/libwebp/src/dec/alpha_dec.c
+FILE: ../../../flutter/third_party/libwebp/src/dec/buffer_dec.c
+FILE: ../../../flutter/third_party/libwebp/src/dec/idec_dec.c
+FILE: ../../../flutter/third_party/libwebp/src/dec/io_dec.c
+FILE: ../../../flutter/third_party/libwebp/src/dec/webpi_dec.h
+FILE: ../../../flutter/third_party/libwebp/src/dsp/cpu.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/dec_sse2.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/dsp.h
+FILE: ../../../flutter/third_party/libwebp/src/dsp/enc.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/enc_sse2.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/filters.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/upsampling.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/upsampling_neon.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/upsampling_sse2.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/upsampling_sse41.c
+FILE: ../../../flutter/third_party/libwebp/src/enc/alpha_enc.c
+FILE: ../../../flutter/third_party/libwebp/src/enc/analysis_enc.c
+FILE: ../../../flutter/third_party/libwebp/src/enc/config_enc.c
+FILE: ../../../flutter/third_party/libwebp/src/enc/cost_enc.c
+FILE: ../../../flutter/third_party/libwebp/src/enc/cost_enc.h
+FILE: ../../../flutter/third_party/libwebp/src/enc/filter_enc.c
+FILE: ../../../flutter/third_party/libwebp/src/enc/frame_enc.c
+FILE: ../../../flutter/third_party/libwebp/src/enc/iterator_enc.c
+FILE: ../../../flutter/third_party/libwebp/src/enc/picture_enc.c
+FILE: ../../../flutter/third_party/libwebp/src/enc/quant_enc.c
+FILE: ../../../flutter/third_party/libwebp/src/enc/syntax_enc.c
+FILE: ../../../flutter/third_party/libwebp/src/enc/token_enc.c
+FILE: ../../../flutter/third_party/libwebp/src/enc/tree_enc.c
+FILE: ../../../flutter/third_party/libwebp/src/enc/vp8i_enc.h
+FILE: ../../../flutter/third_party/libwebp/src/enc/webp_enc.c
+FILE: ../../../flutter/third_party/libwebp/src/mux/muxedit.c
+FILE: ../../../flutter/third_party/libwebp/src/mux/muxi.h
+FILE: ../../../flutter/third_party/libwebp/src/mux/muxinternal.c
+FILE: ../../../flutter/third_party/libwebp/src/mux/muxread.c
+FILE: ../../../flutter/third_party/libwebp/src/utils/bit_writer_utils.c
+FILE: ../../../flutter/third_party/libwebp/src/utils/bit_writer_utils.h
+FILE: ../../../flutter/third_party/libwebp/src/utils/filters_utils.c
+FILE: ../../../flutter/third_party/libwebp/src/utils/filters_utils.h
+FILE: ../../../flutter/third_party/libwebp/src/utils/huffman_encode_utils.c
+FILE: ../../../flutter/third_party/libwebp/src/utils/huffman_encode_utils.h
+FILE: ../../../flutter/third_party/libwebp/src/utils/quant_levels_utils.c
+FILE: ../../../flutter/third_party/libwebp/src/utils/quant_levels_utils.h
+FILE: ../../../flutter/third_party/libwebp/src/utils/thread_utils.c
+FILE: ../../../flutter/third_party/libwebp/src/utils/thread_utils.h
+FILE: ../../../flutter/third_party/libwebp/src/webp/encode.h
+FILE: ../../../flutter/third_party/libwebp/src/webp/mux.h
+----------------------------------------------------------------------------------------------------
+Copyright 2011 Google Inc. All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of Google nor the names of its contributors may
+    be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: angle
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/preprocessor/DirectiveParser.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/preprocessor/Input.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/preprocessor/Input.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/preprocessor/Macro.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/preprocessor/MacroExpander.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/preprocessor/Preprocessor.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/preprocessor/Preprocessor.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/preprocessor/Token.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/preprocessor/Token.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/BuiltInFunctionEmulator.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/glsl/BuiltInFunctionEmulatorGLSL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/length_limits.h + ../../../flutter/third_party/angle/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/angle/src/compiler/preprocessor/DirectiveParser.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/preprocessor/Input.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/preprocessor/Input.h
+FILE: ../../../flutter/third_party/angle/src/compiler/preprocessor/Macro.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/preprocessor/MacroExpander.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/preprocessor/Preprocessor.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/preprocessor/Preprocessor.h
+FILE: ../../../flutter/third_party/angle/src/compiler/preprocessor/Token.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/preprocessor/Token.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/BuiltInFunctionEmulator.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/glsl/BuiltInFunctionEmulatorGLSL.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/length_limits.h
+----------------------------------------------------------------------------------------------------
+Copyright 2011 The ANGLE Project Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+    Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+
+    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
+    Ltd., nor the names of their contributors may be used to endorse
+    or promote products derived from this software without specific
+    prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/pem.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/pki/pem.h
+----------------------------------------------------------------------------------------------------
+Copyright 2011 The Chromium Authors
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libwebp
+ORIGIN: ../../../flutter/third_party/libwebp/imageio/jpegdec.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/imageio/jpegdec.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/imageio/metadata.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/imageio/metadata.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/imageio/pngdec.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/imageio/pngdec.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/imageio/tiffdec.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/imageio/tiffdec.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dec/vp8l_dec.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dec/vp8li_dec.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/demux/demux.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/dec_neon.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/enc_neon.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/lossless.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/lossless.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/lossless_common.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/enc/backward_references_enc.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/enc/backward_references_enc.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/enc/histogram_enc.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/enc/histogram_enc.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/enc/vp8l_enc.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/enc/vp8li_enc.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/utils/color_cache_utils.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/utils/color_cache_utils.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/utils/huffman_utils.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/utils/huffman_utils.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/utils/rescaler_utils.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/utils/rescaler_utils.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/utils/utils.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/utils/utils.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/webp/demux.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/webp/format_constants.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/webp/mux_types.h + ../../../flutter/third_party/libwebp/COPYING
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/libwebp/imageio/jpegdec.c
+FILE: ../../../flutter/third_party/libwebp/imageio/jpegdec.h
+FILE: ../../../flutter/third_party/libwebp/imageio/metadata.c
+FILE: ../../../flutter/third_party/libwebp/imageio/metadata.h
+FILE: ../../../flutter/third_party/libwebp/imageio/pngdec.c
+FILE: ../../../flutter/third_party/libwebp/imageio/pngdec.h
+FILE: ../../../flutter/third_party/libwebp/imageio/tiffdec.c
+FILE: ../../../flutter/third_party/libwebp/imageio/tiffdec.h
+FILE: ../../../flutter/third_party/libwebp/src/dec/vp8l_dec.c
+FILE: ../../../flutter/third_party/libwebp/src/dec/vp8li_dec.h
+FILE: ../../../flutter/third_party/libwebp/src/demux/demux.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/dec_neon.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/enc_neon.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/lossless.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/lossless.h
+FILE: ../../../flutter/third_party/libwebp/src/dsp/lossless_common.h
+FILE: ../../../flutter/third_party/libwebp/src/enc/backward_references_enc.c
+FILE: ../../../flutter/third_party/libwebp/src/enc/backward_references_enc.h
+FILE: ../../../flutter/third_party/libwebp/src/enc/histogram_enc.c
+FILE: ../../../flutter/third_party/libwebp/src/enc/histogram_enc.h
+FILE: ../../../flutter/third_party/libwebp/src/enc/vp8l_enc.c
+FILE: ../../../flutter/third_party/libwebp/src/enc/vp8li_enc.h
+FILE: ../../../flutter/third_party/libwebp/src/utils/color_cache_utils.c
+FILE: ../../../flutter/third_party/libwebp/src/utils/color_cache_utils.h
+FILE: ../../../flutter/third_party/libwebp/src/utils/huffman_utils.c
+FILE: ../../../flutter/third_party/libwebp/src/utils/huffman_utils.h
+FILE: ../../../flutter/third_party/libwebp/src/utils/rescaler_utils.c
+FILE: ../../../flutter/third_party/libwebp/src/utils/rescaler_utils.h
+FILE: ../../../flutter/third_party/libwebp/src/utils/utils.c
+FILE: ../../../flutter/third_party/libwebp/src/utils/utils.h
+FILE: ../../../flutter/third_party/libwebp/src/webp/demux.h
+FILE: ../../../flutter/third_party/libwebp/src/webp/format_constants.h
+FILE: ../../../flutter/third_party/libwebp/src/webp/mux_types.h
+----------------------------------------------------------------------------------------------------
+Copyright 2012 Google Inc. All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of Google nor the names of its contributors may
+    be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: angle
+ORIGIN: ../../../flutter/third_party/angle/src/common/BinaryStream.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/Float16ToFloat32.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/event_tracer.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/event_tracer.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/preprocessor/DiagnosticsBase.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/preprocessor/DiagnosticsBase.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/preprocessor/DirectiveHandlerBase.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/preprocessor/DirectiveHandlerBase.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/preprocessor/DirectiveParser.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/preprocessor/ExpressionParser.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/preprocessor/Lexer.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/preprocessor/Lexer.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/preprocessor/Macro.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/preprocessor/MacroExpander.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/preprocessor/SourceLocation.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/preprocessor/Tokenizer.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/preprocessor/numeric_lex.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/preprocessor/preprocessor.y + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/Diagnostics.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/Diagnostics.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/DirectiveHandler.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/DirectiveHandler.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/Pragma.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Query.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Query.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/angletypes.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/angletypes.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/RenderTargetD3D.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/RenderTargetD3D.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/ShaderExecutableD3D.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/ShaderExecutableD3D.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/SwapChainD3D.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Image11.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Image11.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/IndexBuffer11.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/IndexBuffer11.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/RenderStateCache.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/RenderStateCache.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/RenderTarget11.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/RenderTarget11.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/ShaderExecutable11.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/ShaderExecutable11.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/SwapChain11.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/TextureStorage11.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/RenderTarget9.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/RenderTarget9.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Renderer9.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/ShaderCache.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/ShaderExecutable9.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/ShaderExecutable9.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/SwapChain9.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/SwapChain9.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/TextureStorage9.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/TextureStorage9.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/shaders/Blit.ps + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/shaders/Blit.vs + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/renderergl_utils.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/renderergl_utils.h + ../../../flutter/third_party/angle/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/angle/src/common/BinaryStream.h
+FILE: ../../../flutter/third_party/angle/src/common/Float16ToFloat32.cpp
+FILE: ../../../flutter/third_party/angle/src/common/event_tracer.cpp
+FILE: ../../../flutter/third_party/angle/src/common/event_tracer.h
+FILE: ../../../flutter/third_party/angle/src/compiler/preprocessor/DiagnosticsBase.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/preprocessor/DiagnosticsBase.h
+FILE: ../../../flutter/third_party/angle/src/compiler/preprocessor/DirectiveHandlerBase.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/preprocessor/DirectiveHandlerBase.h
+FILE: ../../../flutter/third_party/angle/src/compiler/preprocessor/DirectiveParser.h
+FILE: ../../../flutter/third_party/angle/src/compiler/preprocessor/ExpressionParser.h
+FILE: ../../../flutter/third_party/angle/src/compiler/preprocessor/Lexer.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/preprocessor/Lexer.h
+FILE: ../../../flutter/third_party/angle/src/compiler/preprocessor/Macro.h
+FILE: ../../../flutter/third_party/angle/src/compiler/preprocessor/MacroExpander.h
+FILE: ../../../flutter/third_party/angle/src/compiler/preprocessor/SourceLocation.h
+FILE: ../../../flutter/third_party/angle/src/compiler/preprocessor/Tokenizer.h
+FILE: ../../../flutter/third_party/angle/src/compiler/preprocessor/numeric_lex.h
+FILE: ../../../flutter/third_party/angle/src/compiler/preprocessor/preprocessor.y
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/Diagnostics.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/Diagnostics.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/DirectiveHandler.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/DirectiveHandler.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/Pragma.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Query.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Query.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/angletypes.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/angletypes.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/RenderTargetD3D.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/RenderTargetD3D.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/ShaderExecutableD3D.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/ShaderExecutableD3D.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/SwapChainD3D.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Image11.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Image11.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/IndexBuffer11.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/IndexBuffer11.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/RenderStateCache.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/RenderStateCache.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/RenderTarget11.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/RenderTarget11.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/ShaderExecutable11.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/ShaderExecutable11.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/SwapChain11.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/TextureStorage11.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/RenderTarget9.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/RenderTarget9.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Renderer9.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/ShaderCache.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/ShaderExecutable9.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/ShaderExecutable9.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/SwapChain9.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/SwapChain9.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/TextureStorage9.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/TextureStorage9.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/shaders/Blit.ps
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/shaders/Blit.vs
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/renderergl_utils.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/renderergl_utils.h
+----------------------------------------------------------------------------------------------------
+Copyright 2012 The ANGLE Project Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+    Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+
+    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
+    Ltd., nor the names of their contributors may be used to endorse
+    or promote products derived from this software without specific
+    prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/asn1_util.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/asn1_util.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/cert_status_flags.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/pki/asn1_util.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/asn1_util.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/cert_status_flags.h
+----------------------------------------------------------------------------------------------------
+Copyright 2012 The Chromium Authors
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/double-conversion-double-to-string.h
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/double-conversion-fast-dtoa.cpp
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/double-conversion-ieee.h
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/double-conversion-string-to-double.h
+ORIGIN: ../../../flutter/third_party/icu/source/i18n/double-conversion.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion-double-to-string.h
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion-fast-dtoa.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion-ieee.h
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion-string-to-double.h
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion.h
+----------------------------------------------------------------------------------------------------
+Copyright 2012 the V8 project authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google Inc. nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/apple-arm/crypto/fipsmodule/bsaes-armv7-apple.S (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/linux-arm/crypto/fipsmodule/bsaes-armv7-linux.S (with ../../../flutter/third_party/boringssl/src/LICENSE)
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/apple-arm/crypto/fipsmodule/bsaes-armv7-apple.S
+FILE: ../../../flutter/third_party/boringssl/linux-arm/crypto/fipsmodule/bsaes-armv7-linux.S
+----------------------------------------------------------------------------------------------------
+Copyright 2012-2016 The OpenSSL Project Authors. All Rights Reserved.
+
+Licensed under the OpenSSL license (the "License").  You may not use
+this file except in compliance with the License.  You can obtain a copy
+in the file LICENSE in the source distribution or at
+https://www.openssl.org/source/license.html
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libwebp
+ORIGIN: ../../../flutter/third_party/libwebp/imageio/wicdec.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/imageio/wicdec.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dec/alphai_dec.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/alpha_processing.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/utils/quant_levels_dec_utils.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/utils/quant_levels_dec_utils.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/utils/random_utils.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/utils/random_utils.h + ../../../flutter/third_party/libwebp/COPYING
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/libwebp/imageio/wicdec.c
+FILE: ../../../flutter/third_party/libwebp/imageio/wicdec.h
+FILE: ../../../flutter/third_party/libwebp/src/dec/alphai_dec.h
+FILE: ../../../flutter/third_party/libwebp/src/dsp/alpha_processing.c
+FILE: ../../../flutter/third_party/libwebp/src/utils/quant_levels_dec_utils.c
+FILE: ../../../flutter/third_party/libwebp/src/utils/quant_levels_dec_utils.h
+FILE: ../../../flutter/third_party/libwebp/src/utils/random_utils.c
+FILE: ../../../flutter/third_party/libwebp/src/utils/random_utils.h
+----------------------------------------------------------------------------------------------------
+Copyright 2013 Google Inc. All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of Google nor the names of its contributors may
+    be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: angle
+ORIGIN: ../../../flutter/third_party/angle/include/GLSLANG/ShaderVars.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/mathutil.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/CodeGen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/FlagStd140Structs.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/FlagStd140Structs.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/ValidateOutputs.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/ValidateOutputs.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/blocklayout.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/blocklayout.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/blocklayoutHLSL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/blocklayoutHLSL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/gpu_info_util/SystemInfo.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/gpu_info_util/SystemInfo.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/gpu_info_util/SystemInfo_internal.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/gpu_info_util/SystemInfo_libpci.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/gpu_info_util/SystemInfo_linux.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/gpu_info_util/SystemInfo_win.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/gpu_info_util/SystemInfo_x11.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/image_util/copyimage.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/image_util/copyimage.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/image_util/imageformats.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/image_util/loadimage.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/image_util/loadimage.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/image_util/loadimage_etc.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Constants.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/IndexRangeCache.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/IndexRangeCache.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Sampler.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Sampler.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/VertexArray.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/VertexArray.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/VertexAttribute.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/angletypes.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/formatutils.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/formatutils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/QueryImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/copyvertex.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Blit11.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Blit11.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Clear11.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Clear11.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Fence11.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Fence11.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Query11.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Query11.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/formatutils11.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/formatutils11.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Fence9.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Fence9.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Query9.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Query9.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/formatutils9.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/formatutils9.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/validationES.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/validationES.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/validationES2.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/validationES3.cpp + ../../../flutter/third_party/angle/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/angle/include/GLSLANG/ShaderVars.h
+FILE: ../../../flutter/third_party/angle/src/common/mathutil.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/CodeGen.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/FlagStd140Structs.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/FlagStd140Structs.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/ValidateOutputs.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/ValidateOutputs.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/blocklayout.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/blocklayout.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/blocklayoutHLSL.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/blocklayoutHLSL.h
+FILE: ../../../flutter/third_party/angle/src/gpu_info_util/SystemInfo.cpp
+FILE: ../../../flutter/third_party/angle/src/gpu_info_util/SystemInfo.h
+FILE: ../../../flutter/third_party/angle/src/gpu_info_util/SystemInfo_internal.h
+FILE: ../../../flutter/third_party/angle/src/gpu_info_util/SystemInfo_libpci.cpp
+FILE: ../../../flutter/third_party/angle/src/gpu_info_util/SystemInfo_linux.cpp
+FILE: ../../../flutter/third_party/angle/src/gpu_info_util/SystemInfo_win.cpp
+FILE: ../../../flutter/third_party/angle/src/gpu_info_util/SystemInfo_x11.cpp
+FILE: ../../../flutter/third_party/angle/src/image_util/copyimage.cpp
+FILE: ../../../flutter/third_party/angle/src/image_util/copyimage.h
+FILE: ../../../flutter/third_party/angle/src/image_util/imageformats.h
+FILE: ../../../flutter/third_party/angle/src/image_util/loadimage.cpp
+FILE: ../../../flutter/third_party/angle/src/image_util/loadimage.h
+FILE: ../../../flutter/third_party/angle/src/image_util/loadimage_etc.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Constants.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/IndexRangeCache.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/IndexRangeCache.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Sampler.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Sampler.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/VertexArray.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/VertexArray.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/VertexAttribute.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/angletypes.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/formatutils.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/formatutils.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/QueryImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/copyvertex.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Blit11.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Blit11.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Clear11.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Clear11.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Fence11.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Fence11.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Query11.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Query11.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/formatutils11.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/formatutils11.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Fence9.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Fence9.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Query9.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Query9.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/formatutils9.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/formatutils9.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/validationES.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/validationES.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/validationES2.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/validationES3.cpp
+----------------------------------------------------------------------------------------------------
+Copyright 2013 The ANGLE Project Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+    Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+
+    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
+    Ltd., nor the names of their contributors may be used to endorse
+    or promote products derived from this software without specific
+    prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: accessibility
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_export.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_node.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_node.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_node_data.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_node_data.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_tree.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_tree.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_tree_update.h + ../../../flutter/third_party/accessibility/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/accessibility/ax/ax_export.h
+FILE: ../../../flutter/third_party/accessibility/ax/ax_node.cc
+FILE: ../../../flutter/third_party/accessibility/ax/ax_node.h
+FILE: ../../../flutter/third_party/accessibility/ax/ax_node_data.cc
+FILE: ../../../flutter/third_party/accessibility/ax/ax_node_data.h
+FILE: ../../../flutter/third_party/accessibility/ax/ax_tree.cc
+FILE: ../../../flutter/third_party/accessibility/ax/ax_tree.h
+FILE: ../../../flutter/third_party/accessibility/ax/ax_tree_update.h
+----------------------------------------------------------------------------------------------------
+Copyright 2013 The Chromium Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: accessibility
+LIBRARY: engine
+LIBRARY: spring_animation
+LIBRARY: tonic
+LIBRARY: txt
+LIBRARY: web_test_fonts
+LIBRARY: web_unicode
+ORIGIN: ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/assets/asset_manager.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/assets/asset_manager.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/assets/asset_resolver.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/assets/directory_asset_bundle.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/assets/directory_asset_bundle.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/benchmarking/benchmarking.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/benchmarking/benchmarking.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/benchmarking/library.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/benchmarking/library.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/common/constants.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/common/graphics/gl_context_switch.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/common/graphics/gl_context_switch.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/common/graphics/msaa_sample_count.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/common/graphics/persistent_cache.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/common/graphics/persistent_cache.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/common/graphics/texture.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/common/graphics/texture.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/common/settings.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/common/settings.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/common/task_runners.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/common/task_runners.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/benchmarking/dl_benchmarks.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/benchmarking/dl_benchmarks.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/benchmarking/dl_builder_benchmarks.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/benchmarking/dl_complexity.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/benchmarking/dl_complexity.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/benchmarking/dl_complexity_gl.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/benchmarking/dl_complexity_gl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/benchmarking/dl_complexity_helper.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/benchmarking/dl_complexity_metal.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/benchmarking/dl_complexity_metal.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/benchmarking/dl_region_benchmarks.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/benchmarking/dl_transform_benchmarks.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/display_list.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/display_list.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/dl_attributes.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/dl_blend_mode.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/dl_blend_mode.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/dl_builder.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/dl_builder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/dl_canvas.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/dl_canvas.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/dl_color.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/dl_op_flags.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/dl_op_flags.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/dl_op_receiver.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/dl_op_receiver.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/dl_op_records.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/dl_op_records.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/dl_paint.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/dl_paint.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/dl_sampling_options.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/dl_tile_mode.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/dl_vertices.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/dl_vertices.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/effects/dl_color_filter.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/effects/dl_color_filter.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/effects/dl_color_source.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/effects/dl_color_source.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/effects/dl_image_filter.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/effects/dl_image_filter.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/effects/dl_mask_filter.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/effects/dl_mask_filter.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/effects/dl_path_effect.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/effects/dl_path_effect.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/effects/dl_runtime_effect.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/effects/dl_runtime_effect.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/geometry/dl_region.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/geometry/dl_region.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/geometry/dl_rtree.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/geometry/dl_rtree.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/image/dl_image.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/image/dl_image.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/image/dl_image_skia.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/image/dl_image_skia.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/skia/dl_sk_canvas.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/skia/dl_sk_canvas.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/skia/dl_sk_conversions.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/skia/dl_sk_conversions.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/skia/dl_sk_dispatcher.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/skia/dl_sk_dispatcher.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/skia/dl_sk_paint_dispatcher.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/skia/dl_sk_paint_dispatcher.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/skia/dl_sk_types.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/utils/dl_bounds_accumulator.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/utils/dl_bounds_accumulator.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/utils/dl_comparable.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/utils/dl_matrix_clip_tracker.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/utils/dl_matrix_clip_tracker.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/utils/dl_receiver_utils.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/display_list/utils/dl_receiver_utils.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/compositor_context.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/compositor_context.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/diff_context.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/diff_context.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/embedded_views.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/embedded_views.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/flow_test_utils.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/flow_test_utils.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/frame_timings.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/frame_timings.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layer_snapshot_store.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layer_snapshot_store.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/backdrop_filter_layer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/backdrop_filter_layer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/cacheable_layer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/cacheable_layer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/clip_path_layer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/clip_path_layer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/clip_rect_layer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/clip_rect_layer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/clip_rrect_layer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/clip_rrect_layer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/clip_shape_layer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/color_filter_layer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/color_filter_layer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/container_layer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/container_layer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/display_list_layer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/display_list_layer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/display_list_raster_cache_item.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/display_list_raster_cache_item.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/image_filter_layer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/image_filter_layer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/layer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/layer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/layer_raster_cache_item.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/layer_raster_cache_item.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/layer_state_stack.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/layer_state_stack.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/layer_tree.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/layer_tree.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/offscreen_surface.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/offscreen_surface.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/opacity_layer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/opacity_layer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/performance_overlay_layer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/performance_overlay_layer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/platform_view_layer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/platform_view_layer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/shader_mask_layer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/shader_mask_layer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/texture_layer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/texture_layer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/transform_layer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/layers/transform_layer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/paint_region.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/paint_region.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/paint_utils.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/paint_utils.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/raster_cache.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/raster_cache.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/raster_cache_item.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/raster_cache_key.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/raster_cache_key.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/raster_cache_util.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/raster_cache_util.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/skia_gpu_object.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/stopwatch.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/stopwatch.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/stopwatch_dl.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/stopwatch_dl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/stopwatch_sk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/stopwatch_sk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/surface.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/surface.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/surface_frame.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flow/surface_frame.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flutter_vma/flutter_skia_vma.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flutter_vma/flutter_skia_vma.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flutter_vma/flutter_vma.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/flutter_vma/flutter_vma.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/ascii_trie.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/ascii_trie.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/backtrace.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/backtrace.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/backtrace_stub.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/base32.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/base32.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/build_config.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/closure.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/command_line.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/command_line.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/compiler_specific.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/concurrent_message_loop.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/concurrent_message_loop.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/concurrent_message_loop_factory.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/container.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/cpu_affinity.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/cpu_affinity.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/delayed_task.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/delayed_task.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/eintr_wrapper.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/endianness.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/endianness.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/file.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/file.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/hash_combine.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/hex_codec.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/hex_codec.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/icu_util.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/icu_util.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/log_level.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/log_settings.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/log_settings.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/log_settings_state.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/logging.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/logging.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/macros.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/make_copyable.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/mapping.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/mapping.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/math.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/memory/ref_counted.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/memory/ref_counted_internal.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/memory/ref_ptr.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/memory/ref_ptr_internal.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/memory/task_runner_checker.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/memory/task_runner_checker.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/memory/thread_checker.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/memory/thread_checker.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/memory/weak_ptr.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/memory/weak_ptr_internal.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/memory/weak_ptr_internal.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/message_loop.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/message_loop.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/message_loop_impl.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/message_loop_impl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/message_loop_task_queues.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/message_loop_task_queues.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/message_loop_task_queues_benchmark.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/native_library.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/paths.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/paths.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/android/cpu_affinity.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/android/cpu_affinity.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/android/jni_util.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/android/jni_util.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/android/jni_weak_ref.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/android/jni_weak_ref.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/android/message_loop_android.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/android/message_loop_android.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/android/paths_android.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/android/paths_android.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/android/scoped_java_ref.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/android/scoped_java_ref.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/darwin/cf_utils.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/darwin/cf_utils.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/darwin/concurrent_message_loop_factory.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/darwin/message_loop_darwin.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/darwin/message_loop_darwin.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/darwin/paths_darwin.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/darwin/platform_version.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/darwin/platform_version.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/darwin/scoped_block.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/darwin/scoped_block.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/darwin/scoped_nsautorelease_pool.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/darwin/scoped_nsautorelease_pool.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/darwin/scoped_nsobject.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/darwin/scoped_nsobject.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/darwin/scoped_policy.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/darwin/scoped_typeref.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/darwin/string_range_sanitization.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/darwin/string_range_sanitization.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/darwin/weak_nsobject.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/darwin/weak_nsobject.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/fuchsia/log_interest_listener.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/fuchsia/log_interest_listener.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/fuchsia/log_state.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/fuchsia/log_state.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/fuchsia/message_loop_fuchsia.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/fuchsia/message_loop_fuchsia.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/fuchsia/paths_fuchsia.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/fuchsia/task_observers.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/fuchsia/task_observers.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/linux/message_loop_linux.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/linux/message_loop_linux.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/linux/paths_linux.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/linux/timerfd.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/linux/timerfd.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/posix/command_line_posix.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/posix/file_posix.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/posix/mapping_posix.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/posix/native_library_posix.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/posix/paths_posix.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/posix/posix_wrappers_posix.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/posix/process_posix.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/posix/shared_mutex_posix.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/posix/shared_mutex_posix.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/win/command_line_win.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/win/errors_win.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/win/errors_win.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/win/file_win.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/win/mapping_win.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/win/message_loop_win.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/win/message_loop_win.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/win/native_library_win.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/win/paths_win.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/win/posix_wrappers_win.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/win/process_win.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/win/wstring_conversion.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/platform/win/wstring_conversion.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/posix_wrappers.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/process.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/raster_thread_merger.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/raster_thread_merger.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/shared_thread_merger.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/shared_thread_merger.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/size.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/status.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/status_or.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/string_conversion.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/string_conversion.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/synchronization/atomic_object.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/synchronization/count_down_latch.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/synchronization/count_down_latch.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/synchronization/semaphore.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/synchronization/semaphore.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/synchronization/shared_mutex.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/synchronization/shared_mutex_std.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/synchronization/shared_mutex_std.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/synchronization/sync_switch.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/synchronization/sync_switch.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/synchronization/waitable_event.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/synchronization/waitable_event.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/task_queue_id.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/task_runner.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/task_runner.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/task_source.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/task_source.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/task_source_grade.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/thread.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/thread.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/time/chrono_timestamp_provider.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/time/chrono_timestamp_provider.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/time/time_delta.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/time/time_point.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/time/time_point.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/time/timestamp_provider.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/trace_event.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/trace_event.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/unique_fd.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/unique_fd.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/unique_object.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/fml/wakeable.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/aiks/aiks_context.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/aiks/aiks_context.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/aiks/aiks_playground.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/aiks/aiks_playground.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/aiks/aiks_playground_inspector.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/aiks/aiks_playground_inspector.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/aiks/canvas.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/aiks/canvas.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/aiks/canvas_benchmarks.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/aiks/canvas_recorder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/aiks/canvas_type.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/aiks/color_filter.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/aiks/color_filter.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/aiks/color_source.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/aiks/color_source.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/aiks/image.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/aiks/image.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/aiks/image_filter.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/aiks/image_filter.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/aiks/paint.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/aiks/paint.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/aiks/paint_pass_delegate.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/aiks/paint_pass_delegate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/aiks/picture.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/aiks/picture.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/aiks/picture_recorder.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/aiks/picture_recorder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/aiks/trace_serializer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/aiks/trace_serializer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/base/allocation.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/base/allocation.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/base/backend_cast.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/base/comparable.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/base/comparable.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/base/config.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/base/mask.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/base/promise.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/base/promise.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/base/strings.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/base/strings.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/base/thread.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/base/thread.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/base/thread_safety.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/base/thread_safety.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/base/timing.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/base/validation.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/base/validation.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/base/version.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/base/version.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/code_gen_template.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/compiler.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/compiler.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/compiler_backend.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/compiler_backend.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/compiler_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/compiler_test.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/constants.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/constants.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/impellerc_main.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/include_dir.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/includer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/includer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/logger.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/reflector.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/reflector.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/runtime_stage_data.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/runtime_stage_data.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/shader_bundle.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/shader_bundle.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/shader_bundle_data.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/shader_bundle_data.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/shader_lib/flutter/runtime_effect.glsl + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/shader_lib/impeller/blending.glsl + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/shader_lib/impeller/branching.glsl + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/shader_lib/impeller/color.glsl + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/shader_lib/impeller/constants.glsl + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/shader_lib/impeller/conversions.glsl + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/shader_lib/impeller/dithering.glsl + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/shader_lib/impeller/external_texture_oes.glsl + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/shader_lib/impeller/gaussian.glsl + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/shader_lib/impeller/gradient.glsl + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/shader_lib/impeller/path.glsl + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/shader_lib/impeller/prefix_sum.glsl + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/shader_lib/impeller/texture.glsl + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/shader_lib/impeller/tile_mode.glsl + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/shader_lib/impeller/transform.glsl + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/shader_lib/impeller/types.glsl + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/source_options.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/source_options.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/spirv_compiler.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/spirv_compiler.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/spirv_sksl.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/spirv_sksl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/switches.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/switches.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/types.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/types.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/uniform_sorter.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/uniform_sorter.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/utilities.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/compiler/utilities.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/allocator.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/allocator.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/buffer_view.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/buffer_view.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/capture.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/capture.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/device_buffer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/device_buffer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/device_buffer_descriptor.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/device_buffer_descriptor.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/formats.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/formats.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/host_buffer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/host_buffer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/platform.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/platform.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/range.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/range.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/resource_binder.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/resource_binder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/runtime_types.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/runtime_types.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/sampler.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/sampler.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/sampler_descriptor.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/sampler_descriptor.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/shader_types.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/shader_types.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/texture.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/texture.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/texture_descriptor.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/texture_descriptor.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/vertex_buffer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/core/vertex_buffer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/display_list/dl_dispatcher.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/display_list/dl_dispatcher.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/display_list/dl_image_impeller.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/display_list/dl_image_impeller.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/display_list/dl_playground.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/display_list/dl_playground.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/display_list/dl_vertices_geometry.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/display_list/dl_vertices_geometry.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/display_list/nine_patch_converter.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/display_list/nine_patch_converter.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/display_list/skia_conversions.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/display_list/skia_conversions.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/anonymous_contents.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/anonymous_contents.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/atlas_contents.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/atlas_contents.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/checkerboard_contents.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/checkerboard_contents.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/clip_contents.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/clip_contents.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/color_source_contents.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/color_source_contents.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/conical_gradient_contents.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/conical_gradient_contents.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/content_context.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/content_context.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/contents.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/contents.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/blend_filter_contents.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/blend_filter_contents.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/border_mask_blur_filter_contents.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/border_mask_blur_filter_contents.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/color_filter_contents.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/color_filter_contents.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/color_matrix_filter_contents.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/color_matrix_filter_contents.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/filter_contents.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/filter_contents.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/gaussian_blur_filter_contents.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/gaussian_blur_filter_contents.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/inputs/contents_filter_input.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/inputs/contents_filter_input.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/inputs/filter_contents_filter_input.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/inputs/filter_contents_filter_input.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/inputs/filter_input.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/inputs/filter_input.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/inputs/placeholder_filter_input.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/inputs/placeholder_filter_input.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/inputs/texture_filter_input.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/inputs/texture_filter_input.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/linear_to_srgb_filter_contents.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/linear_to_srgb_filter_contents.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/local_matrix_filter_contents.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/local_matrix_filter_contents.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/matrix_filter_contents.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/matrix_filter_contents.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/morphology_filter_contents.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/morphology_filter_contents.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/srgb_to_linear_filter_contents.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/srgb_to_linear_filter_contents.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/yuv_to_rgb_filter_contents.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/yuv_to_rgb_filter_contents.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/framebuffer_blend_contents.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/framebuffer_blend_contents.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/gradient_generator.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/gradient_generator.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/linear_gradient_contents.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/linear_gradient_contents.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/radial_gradient_contents.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/radial_gradient_contents.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/runtime_effect_contents.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/runtime_effect_contents.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/scene_contents.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/scene_contents.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/solid_color_contents.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/solid_color_contents.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/solid_rrect_blur_contents.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/solid_rrect_blur_contents.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/sweep_gradient_contents.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/sweep_gradient_contents.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/text_contents.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/text_contents.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/texture_contents.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/texture_contents.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/tiled_texture_contents.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/tiled_texture_contents.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/vertices_contents.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/vertices_contents.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/entity.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/entity.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/entity_pass.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/entity_pass.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/entity_pass_clip_stack.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/entity_pass_clip_stack.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/entity_pass_delegate.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/entity_pass_delegate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/entity_pass_target.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/entity_pass_target.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/entity_playground.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/entity_playground.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/geometry/circle_geometry.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/geometry/circle_geometry.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/geometry/cover_geometry.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/geometry/cover_geometry.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/geometry/ellipse_geometry.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/geometry/ellipse_geometry.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/geometry/fill_path_geometry.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/geometry/fill_path_geometry.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/geometry/geometry.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/geometry/geometry.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/geometry/line_geometry.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/geometry/line_geometry.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/geometry/point_field_geometry.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/geometry/point_field_geometry.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/geometry/rect_geometry.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/geometry/rect_geometry.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/geometry/round_rect_geometry.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/geometry/round_rect_geometry.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/geometry/stroke_path_geometry.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/geometry/stroke_path_geometry.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/geometry/vertices_geometry.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/geometry/vertices_geometry.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/inline_pass_context.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/inline_pass_context.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/render_target_cache.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/render_target_cache.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend.vert + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/blending/blend.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/blending/blend.vert + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/blending/blend_select.glsl + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/blending/framebuffer_blend.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/blending/framebuffer_blend.vert + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/blending/porter_duff_blend.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/blending/porter_duff_blend.vert + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/border_mask_blur.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/border_mask_blur.vert + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/clip.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/clip.vert + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/color_matrix_color_filter.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/color_matrix_color_filter.vert + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/conical_gradient_fill.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/conical_gradient_ssbo_fill.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/debug/checkerboard.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/debug/checkerboard.vert + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/gaussian_blur/gaussian_blur.glsl + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/gaussian_blur/gaussian_blur.vert + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/gaussian_blur/gaussian_blur_noalpha_decal.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/gaussian_blur/gaussian_blur_noalpha_nodecal.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/gaussian_blur/kernel.glsl + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/gaussian_blur/kernel_decal.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/gaussian_blur/kernel_nodecal.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/geometry/points.comp + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/geometry/uv.comp + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/glyph_atlas.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/glyph_atlas.vert + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/glyph_atlas_color.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/gradient_fill.vert + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/linear_gradient_fill.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/linear_gradient_ssbo_fill.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/linear_to_srgb_filter.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/linear_to_srgb_filter.vert + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/morphology_filter.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/morphology_filter.vert + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/position_color.vert + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/radial_gradient_fill.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/radial_gradient_ssbo_fill.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/rrect_blur.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/rrect_blur.vert + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/runtime_effect.vert + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/solid_fill.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/solid_fill.vert + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/srgb_to_linear_filter.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/srgb_to_linear_filter.vert + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/sweep_gradient_fill.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/sweep_gradient_ssbo_fill.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/texture_fill.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/texture_fill.vert + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/texture_fill_external.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/texture_fill_strict_src.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/tiled_texture_fill.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/tiled_texture_fill_external.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/vertices.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/yuv_to_rgb_filter.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/shaders/yuv_to_rgb_filter.vert + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/color.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/color.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/constants.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/constants.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/geometry_asserts.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/geometry_benchmarks.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/gradient.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/gradient.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/half.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/matrix.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/matrix.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/matrix_decomposition.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/matrix_decomposition.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/path.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/path.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/path_builder.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/path_builder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/path_component.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/path_component.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/point.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/point.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/quaternion.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/quaternion.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/rect.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/rect.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/saturated_math.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/scalar.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/shear.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/shear.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/sigma.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/sigma.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/size.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/size.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/trig.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/trig.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/type_traits.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/type_traits.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/vector.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/geometry/vector.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/golden_tests/golden_digest.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/golden_tests/golden_digest.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/golden_tests/golden_playground_test.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/golden_tests/golden_playground_test_mac.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/golden_tests/golden_playground_test_stub.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/golden_tests/golden_tests.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/golden_tests/main.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/golden_tests/metal_screenshot.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/golden_tests/metal_screenshot.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/golden_tests/metal_screenshotter.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/golden_tests/metal_screenshotter.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/golden_tests/screenshot.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/golden_tests/screenshotter.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/golden_tests/vulkan_screenshotter.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/golden_tests/vulkan_screenshotter.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/golden_tests/working_directory.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/golden_tests/working_directory.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/allocator_gles.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/allocator_gles.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/blit_command_gles.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/blit_command_gles.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/blit_pass_gles.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/blit_pass_gles.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/buffer_bindings_gles.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/buffer_bindings_gles.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/capabilities_gles.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/capabilities_gles.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/command_buffer_gles.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/command_buffer_gles.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/context_gles.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/context_gles.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/description_gles.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/description_gles.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/device_buffer_gles.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/device_buffer_gles.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/formats_gles.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/formats_gles.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/gles.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/gpu_tracer_gles.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/gpu_tracer_gles.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/handle_gles.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/handle_gles.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/pipeline_gles.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/pipeline_gles.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/pipeline_library_gles.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/pipeline_library_gles.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/proc_table_gles.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/proc_table_gles.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/reactor_gles.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/reactor_gles.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/render_pass_gles.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/render_pass_gles.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/sampler_gles.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/sampler_gles.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/sampler_library_gles.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/sampler_library_gles.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/shader_function_gles.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/shader_function_gles.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/shader_library_gles.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/shader_library_gles.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/surface_gles.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/surface_gles.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/texture_gles.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/gles/texture_gles.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/allocator_mtl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/allocator_mtl.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/blit_command_mtl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/blit_command_mtl.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/blit_pass_mtl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/blit_pass_mtl.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/command_buffer_mtl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/command_buffer_mtl.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/compute_pass_bindings_cache_mtl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/compute_pass_bindings_cache_mtl.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/compute_pass_mtl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/compute_pass_mtl.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/compute_pipeline_mtl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/compute_pipeline_mtl.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/context_mtl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/context_mtl.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/device_buffer_mtl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/device_buffer_mtl.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/formats_mtl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/formats_mtl.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/gpu_tracer_mtl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/gpu_tracer_mtl.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/lazy_drawable_holder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/lazy_drawable_holder.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/pass_bindings_cache_mtl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/pass_bindings_cache_mtl.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/pipeline_library_mtl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/pipeline_library_mtl.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/pipeline_mtl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/pipeline_mtl.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/render_pass_mtl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/render_pass_mtl.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/sampler_library_mtl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/sampler_library_mtl.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/sampler_mtl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/sampler_mtl.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/shader_function_mtl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/shader_function_mtl.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/shader_library_mtl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/shader_library_mtl.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/surface_mtl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/surface_mtl.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/texture_mtl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/texture_mtl.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/texture_wrapper_mtl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/texture_wrapper_mtl.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/vertex_descriptor_mtl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/vertex_descriptor_mtl.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/allocator_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/allocator_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/android/ahb_texture_source_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/android/ahb_texture_source_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/barrier_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/barrier_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/blit_command_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/blit_command_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/blit_pass_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/blit_pass_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/capabilities_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/capabilities_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/command_buffer_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/command_buffer_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/command_encoder_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/command_encoder_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/command_pool_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/command_pool_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/command_queue_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/command_queue_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/compute_pass_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/compute_pass_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/compute_pipeline_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/compute_pipeline_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/context_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/context_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/debug_report_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/debug_report_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/descriptor_pool_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/descriptor_pool_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/device_buffer_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/device_buffer_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/device_holder_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/driver_info_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/driver_info_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/fence_waiter_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/fence_waiter_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/formats_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/formats_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/gpu_tracer_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/gpu_tracer_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/pipeline_cache_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/pipeline_cache_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/pipeline_library_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/pipeline_library_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/pipeline_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/pipeline_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/queue_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/queue_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/render_pass_builder_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/render_pass_builder_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/render_pass_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/render_pass_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/resource_manager_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/resource_manager_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/sampler_library_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/sampler_library_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/sampler_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/sampler_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/shader_function_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/shader_function_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/shader_library_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/shader_library_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/shared_object_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/shared_object_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/surface_context_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/surface_context_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/khr/khr_surface_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/khr/khr_surface_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_image_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_image_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_impl_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_impl_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/texture_source_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/texture_source_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/texture_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/texture_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/tracked_objects_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/tracked_objects_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/vertex_descriptor_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/vertex_descriptor_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/vma.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/vma.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/yuv_conversion_library_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/yuv_conversion_library_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/yuv_conversion_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/yuv_conversion_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/blit_command.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/blit_command.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/blit_pass.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/blit_pass.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/capabilities.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/capabilities.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/command.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/command.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/command_buffer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/command_buffer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/command_queue.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/command_queue.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/compute_pass.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/compute_pass.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/compute_pipeline_builder.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/compute_pipeline_builder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/compute_pipeline_descriptor.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/compute_pipeline_descriptor.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/compute_tessellator.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/compute_tessellator.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/context.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/context.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/path_polyline.comp + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/pipeline.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/pipeline.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/pipeline_builder.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/pipeline_builder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/pipeline_descriptor.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/pipeline_descriptor.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/pipeline_library.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/pipeline_library.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/pool.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/prefix_sum_test.comp + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/render_pass.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/render_pass.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/render_target.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/render_target.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/renderer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/renderer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/sampler_library.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/sampler_library.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/shader_function.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/shader_function.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/shader_key.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/shader_key.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/shader_library.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/shader_library.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/snapshot.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/snapshot.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/stroke.comp + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/surface.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/surface.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/texture_mipmap.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/texture_mipmap.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/threadgroup_sizing_test.comp + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/vertex_buffer_builder.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/vertex_buffer_builder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/vertex_descriptor.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/vertex_descriptor.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/runtime_stage/runtime_stage.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/runtime_stage/runtime_stage.fbs + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/runtime_stage/runtime_stage.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/runtime_stage/runtime_stage_playground.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/runtime_stage/runtime_stage_playground.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/runtime_stage/runtime_stage_types.fbs + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/animation/animation.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/animation/animation.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/animation/animation_clip.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/animation/animation_clip.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/animation/animation_player.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/animation/animation_player.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/animation/animation_transforms.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/animation/property_resolver.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/animation/property_resolver.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/camera.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/camera.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/geometry.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/geometry.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/importer/conversions.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/importer/conversions.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/importer/importer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/importer/importer_gltf.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/importer/scene.fbs + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/importer/scenec_main.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/importer/switches.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/importer/switches.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/importer/types.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/importer/vertices_builder.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/importer/vertices_builder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/material.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/material.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/mesh.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/mesh.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/node.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/node.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/pipeline_key.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/scene.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/scene.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/scene_context.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/scene_context.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/scene_encoder.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/scene_encoder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/shaders/skinned.vert + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/shaders/unlit.frag + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/shaders/unskinned.vert + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/skin.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/scene/skin.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/shader_archive/multi_arch_shader_archive.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/shader_archive/multi_arch_shader_archive.fbs + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/shader_archive/multi_arch_shader_archive.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/shader_archive/multi_arch_shader_archive_writer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/shader_archive/multi_arch_shader_archive_writer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/shader_archive/shader_archive.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/shader_archive/shader_archive.fbs + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/shader_archive/shader_archive.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/shader_archive/shader_archive_main.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/shader_archive/shader_archive_types.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/shader_archive/shader_archive_writer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/shader_archive/shader_archive_writer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/shader_bundle/shader_bundle.fbs + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/tessellator/c/tessellator.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/tessellator/c/tessellator.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/tessellator/dart/lib/tessellator.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/tessellator/tessellator.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/tessellator/tessellator.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/toolkit/android/choreographer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/toolkit/android/choreographer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/toolkit/android/hardware_buffer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/toolkit/android/hardware_buffer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/toolkit/android/native_window.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/toolkit/android/native_window.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/toolkit/android/proc_table.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/toolkit/android/proc_table.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/toolkit/android/surface_control.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/toolkit/android/surface_control.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/toolkit/android/surface_transaction.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/toolkit/android/surface_transaction.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/toolkit/egl/config.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/toolkit/egl/config.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/toolkit/egl/context.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/toolkit/egl/context.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/toolkit/egl/display.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/toolkit/egl/display.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/toolkit/egl/egl.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/toolkit/egl/egl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/toolkit/egl/image.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/toolkit/egl/surface.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/toolkit/egl/surface.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/toolkit/gles/gles.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/toolkit/gles/texture.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/backends/skia/glyph_atlas_context_skia.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/backends/skia/glyph_atlas_context_skia.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/backends/skia/text_frame_skia.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/backends/skia/text_frame_skia.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/backends/skia/typeface_skia.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/backends/skia/typeface_skia.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/backends/skia/typographer_context_skia.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/backends/skia/typographer_context_skia.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/backends/stb/glyph_atlas_context_stb.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/backends/stb/glyph_atlas_context_stb.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/backends/stb/text_frame_stb.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/backends/stb/text_frame_stb.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/backends/stb/typeface_stb.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/backends/stb/typeface_stb.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/backends/stb/typographer_context_stb.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/backends/stb/typographer_context_stb.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/font.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/font.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/font_glyph_pair.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/font_glyph_pair.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/glyph.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/glyph.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/glyph_atlas.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/glyph_atlas.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/lazy_glyph_atlas.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/lazy_glyph_atlas.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/rectangle_packer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/rectangle_packer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/text_frame.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/text_frame.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/text_run.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/text_run.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/typeface.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/typeface.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/typographer_context.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/typographer/typographer_context.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/command_buffer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/command_buffer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/context.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/context.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/device_buffer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/device_buffer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/export.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/export.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/fixtures.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/fixtures.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/formats.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/formats.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/host_buffer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/host_buffer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/lib/gpu.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/lib/src/buffer.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/lib/src/command_buffer.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/lib/src/context.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/lib/src/formats.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/lib/src/render_pass.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/lib/src/render_pipeline.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/lib/src/shader.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/lib/src/shader_library.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/lib/src/smoketest.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/lib/src/texture.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/render_pass.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/render_pass.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/render_pipeline.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/render_pipeline.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/shader.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/shader.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/shader_library.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/shader_library.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/smoketest.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/smoketest.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/texture.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/gpu/texture.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/io/dart_io.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/io/dart_io.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/snapshot/snapshot.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/annotations.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/channel_buffers.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/compositing.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/compositing/scene.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/compositing/scene.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/compositing/scene_builder.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/compositing/scene_builder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/dart_runtime_hooks.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/dart_runtime_hooks.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/dart_ui.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/dart_ui.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/dart_wrapper.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/experiments/scene.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/experiments/setup_hooks.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/experiments/ui.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/floating_point.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/geometry.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/hash_codes.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/hooks.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/io_manager.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/io_manager.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/isolate_name_server.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/isolate_name_server/isolate_name_server.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/isolate_name_server/isolate_name_server.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/isolate_name_server/isolate_name_server_natives.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/isolate_name_server/isolate_name_server_natives.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/key.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/lerp.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/math.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/natives.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/canvas.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/canvas.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/codec.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/codec.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/color_filter.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/color_filter.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/display_list_deferred_image_gpu_impeller.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/display_list_deferred_image_gpu_impeller.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/display_list_deferred_image_gpu_skia.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/display_list_deferred_image_gpu_skia.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/display_list_image_gpu.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/display_list_image_gpu.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/engine_layer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/engine_layer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/fragment_program.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/fragment_program.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/fragment_shader.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/fragment_shader.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/gradient.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/gradient.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/image.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/image.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/image_decoder.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/image_decoder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/image_decoder_impeller.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/image_decoder_impeller.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/image_decoder_skia.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/image_decoder_skia.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/image_descriptor.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/image_descriptor.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/image_encoding.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/image_encoding.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/image_encoding_impeller.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/image_encoding_impeller.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/image_encoding_impl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/image_encoding_skia.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/image_encoding_skia.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/image_filter.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/image_filter.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/image_generator.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/image_generator.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/image_generator_apng.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/image_generator_apng.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/image_generator_registry.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/image_generator_registry.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/image_shader.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/image_shader.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/immutable_buffer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/immutable_buffer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/matrix.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/matrix.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/multi_frame_codec.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/multi_frame_codec.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/paint.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/paint.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/path.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/path.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/path_measure.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/path_measure.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/picture.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/picture.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/picture_recorder.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/picture_recorder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/rrect.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/rrect.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/scene/scene_node.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/scene/scene_node.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/scene/scene_shader.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/scene/scene_shader.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/shader.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/shader.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/single_frame_codec.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/single_frame_codec.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/vertices.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/painting/vertices.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/platform_dispatcher.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/platform_isolate.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/plugins.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/plugins/callback_cache.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/plugins/callback_cache.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/pointer.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/semantics.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/semantics/custom_accessibility_action.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/semantics/custom_accessibility_action.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/semantics/semantics_node.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/semantics/semantics_node.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/semantics/semantics_update.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/semantics/semantics_update.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/semantics/semantics_update_builder.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/semantics/semantics_update_builder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/semantics/string_attribute.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/semantics/string_attribute.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/setup_hooks.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/snapshot_delegate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/text.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/text/asset_manager_font_provider.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/text/asset_manager_font_provider.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/text/font_collection.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/text/font_collection.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/text/paragraph.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/text/paragraph.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/text/paragraph_builder.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/text/paragraph_builder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/ui.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/ui_benchmarks.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/ui_dart_state.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/ui_dart_state.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/volatile_path_tracker.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/volatile_path_tracker.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/window.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/window/key_data.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/window/key_data.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/window/key_data_packet.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/window/key_data_packet.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/window/platform_configuration.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/window/platform_configuration.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/window/platform_isolate.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/window/platform_isolate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/window/platform_message.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/window/platform_message.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/window/platform_message_response.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/window/platform_message_response.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/window/platform_message_response_dart.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/window/platform_message_response_dart.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/window/platform_message_response_dart_port.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/window/platform_message_response_dart_port.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/window/pointer_data.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/window/pointer_data.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/window/pointer_data_packet.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/window/pointer_data_packet.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/window/pointer_data_packet_converter.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/window/pointer_data_packet_converter.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/window/viewport_metrics.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/ui/window/viewport_metrics.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/flutter_js/src/base_uri.js + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/flutter_js/src/browser_environment.js + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/flutter_js/src/canvaskit_loader.js + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/flutter_js/src/entrypoint_loader.js + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/flutter_js/src/flutter.js + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/flutter_js/src/instantiate_wasm.js + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/flutter_js/src/loader.js + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/flutter_js/src/service_worker_loader.js + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/flutter_js/src/skwasm_loader.js + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/flutter_js/src/trusted_types.js + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/annotations.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/canvas.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/channel_buffers.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/compositing.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/geometry.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/hash_codes.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/initialization.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/key.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/lerp.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/math.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/natives.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/painting.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/path.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/path_metrics.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/platform_dispatcher.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/platform_isolate.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/pointer.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/semantics.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/alarm_clock.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/app_bootstrap.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/browser_detection.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvas_pool.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/canvas.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/canvaskit_api.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/canvaskit_canvas.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/color_filter.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/display_canvas_factory.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/embedded_views.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/fonts.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/image.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/image_filter.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/image_wasm_codecs.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/image_web_codecs.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/layer.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/layer_scene_builder.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/layer_tree.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/mask_filter.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/multi_surface_rasterizer.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/n_way_canvas.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/native_memory.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/offscreen_canvas_rasterizer.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/overlay_scene_optimizer.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/painting.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/path.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/path_metrics.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/picture.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/picture_recorder.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/platform_message.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/raster_cache.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/rasterizer.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/render_canvas.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/renderer.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/shader.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/surface.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/text.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/text_fragmenter.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/util.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/vertices.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/clipboard.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/color_filter.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/configuration.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/display.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/dom.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/engine_canvas.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/font_change_util.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/font_fallback_data.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/font_fallbacks.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/fonts.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/frame_reference.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/frame_timing_recorder.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/backdrop_filter.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/bitmap_canvas.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/canvas.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/clip.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/color_filter.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/debug_canvas_reuse_overlay.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/dom_canvas.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/image_filter.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/offset.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/opacity.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/painting.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/path/conic.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/path/cubic.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/path/path.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/path/path_iterator.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/path/path_metrics.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/path/path_ref.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/path/path_to_svg.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/path/path_utils.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/path/path_windings.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/path/tangent.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/path_to_svg_clip.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/picture.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/platform_view.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/recording_canvas.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/render_vertices.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/renderer.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/resource_manager.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/scene.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/scene_builder.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/shader_mask.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/shaders/image_shader.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/shaders/normalized_gradient.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/shaders/shader.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/shaders/shader_builder.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/shaders/vertex_shaders.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/surface.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/surface_stats.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/transform.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html_image_codec.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/image_decoder.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/initialization.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/js_interop/js_app.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/js_interop/js_loader.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/js_interop/js_promise.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/js_interop/js_typed_data.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/key_map.g.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/keyboard_binding.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/layers.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/mouse/context_menu.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/mouse/cursor.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/mouse/prevent_default.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/navigation/history.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/noto_font.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/noto_font_encoding.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/onscreen_logging.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/picture.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/platform_dispatcher.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/platform_dispatcher/app_lifecycle_state.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/platform_dispatcher/view_focus_binding.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/platform_views.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/platform_views/content_manager.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/platform_views/message_handler.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/platform_views/slots.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/plugins.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/pointer_binding.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/pointer_binding/event_position_helper.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/pointer_converter.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/profiler.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/raw_keyboard.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/renderer.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/rrect_renderer.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/safe_browser_api.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/scene_builder.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/scene_painting.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/scene_view.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/semantics.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/semantics/accessibility.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/semantics/checkable.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/semantics/dialog.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/semantics/focusable.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/semantics/image.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/semantics/incrementable.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/semantics/label_and_value.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/semantics/link.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/semantics/live_region.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/semantics/platform_view.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/semantics/scrollable.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/semantics/semantics.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/semantics/semantics_helper.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/semantics/tappable.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/semantics/text_field.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/services.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/services/buffers.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/services/message_codec.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/services/message_codecs.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/services/serialization.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/shader_data.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/shadow.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/canvas.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/codecs.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/dart_js_conversion.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/filters.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/font_collection.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/image.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/memory.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/paint.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/paragraph.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/path.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/path_metrics.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/picture.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_canvas.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_filters.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_fonts.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_geometry.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_image.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_memory.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_paint.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_path.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_path_metrics.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_picture.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_shaders.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_skdata.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_skstring.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_surface.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_vertices.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/skwasm_module.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/text/raw_line_metrics.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/text/raw_paragraph.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/text/raw_paragraph_builder.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/text/raw_paragraph_style.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/text/raw_strut_style.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/text/raw_text_style.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/renderer.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/shaders.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/surface.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/vertices.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_stub.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_stub/dart_js_conversion.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_stub/renderer.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/svg.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/test_embedding.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/text/canvas_paragraph.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/text/font_collection.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/text/fragmenter.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/text/layout_fragmenter.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/text/layout_service.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/text/line_break_properties.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/text/line_breaker.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/text/measurement.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/text/paint_service.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/text/paragraph.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/text/ruler.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/text/text_direction.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/text/unicode_range.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/text/word_break_properties.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/text/word_breaker.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/text_editing/autofill_hint.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/text_editing/composition_aware_mixin.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/text_editing/input_action.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/text_editing/input_type.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/text_editing/text_capitalization.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/text_editing/text_editing.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/util.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/validators.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/vector_math.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/dimensions_provider/custom_element_dimensions_provider.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/dimensions_provider/dimensions_provider.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/dimensions_provider/full_page_dimensions_provider.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/display_dpr_stream.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/dom_manager.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/embedding_strategy/custom_element_embedding_strategy.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/embedding_strategy/embedding_strategy.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/embedding_strategy/full_page_embedding_strategy.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/flutter_view_manager.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/global_html_attributes.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/hot_restart_cache_handler.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/style_manager.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/window.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/text.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/tile_mode.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/ui.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web/asset_manager.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web/benchmarks.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web/flutter_views_proxy.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web/images.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web/initialization.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web/navigation/platform_location.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web/navigation/url_strategy.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web/platform_view_registry.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web/plugins.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web/testing.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/window.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/skwasm/canvas.cpp + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/skwasm/contour_measure.cpp + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/skwasm/data.cpp + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/skwasm/export.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/skwasm/filters.cpp + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/skwasm/fonts.cpp + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/skwasm/helpers.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/skwasm/image.cpp + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/skwasm/library_skwasm_support.js + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/skwasm/paint.cpp + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/skwasm/path.cpp + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/skwasm/picture.cpp + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/skwasm/shaders.cpp + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/skwasm/skwasm_support.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/skwasm/string.cpp + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/skwasm/surface.cpp + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/skwasm/surface.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/skwasm/text/line_metrics.cpp + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/skwasm/text/paragraph.cpp + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/skwasm/text/paragraph_builder.cpp + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/skwasm/text/paragraph_style.cpp + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/skwasm/text/strut_style.cpp + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/skwasm/text/text_style.cpp + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/skwasm/vertices.cpp + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/skwasm/wrappers.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/dart_isolate.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/dart_isolate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/dart_isolate_group_data.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/dart_isolate_group_data.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/dart_plugin_registrant.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/dart_plugin_registrant.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/dart_service_isolate.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/dart_service_isolate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/dart_snapshot.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/dart_snapshot.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/dart_timestamp_provider.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/dart_timestamp_provider.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/dart_vm.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/dart_vm.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/dart_vm_data.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/dart_vm_data.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/dart_vm_initializer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/dart_vm_initializer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/dart_vm_lifecycle.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/dart_vm_lifecycle.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/embedder_resources.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/embedder_resources.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/isolate_configuration.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/isolate_configuration.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/platform_data.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/platform_data.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/platform_isolate_manager.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/platform_isolate_manager.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/ptrace_check.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/ptrace_check.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/runtime_controller.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/runtime_controller.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/runtime_delegate.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/runtime_delegate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/service_protocol.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/service_protocol.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/skia_concurrent_executor.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/skia_concurrent_executor.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/test_font_data.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/runtime/test_font_data.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/animator.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/animator.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/base64.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/base64.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/context_options.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/context_options.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/dart_native_benchmarks.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/display.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/display.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/display_manager.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/display_manager.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/dl_op_spy.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/dl_op_spy.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/engine.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/engine.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/pipeline.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/pipeline.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/platform_message_handler.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/platform_view.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/platform_view.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/pointer_data_dispatcher.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/pointer_data_dispatcher.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/rasterizer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/rasterizer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/resource_cache_limit_calculator.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/resource_cache_limit_calculator.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/run_configuration.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/run_configuration.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/serialization_callbacks.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/serialization_callbacks.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/shell.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/shell.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/shell_benchmarks.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/shell_io_manager.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/shell_io_manager.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/shell_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/shell_test.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/shell_test_external_view_embedder.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/shell_test_external_view_embedder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/shell_test_platform_view.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/shell_test_platform_view.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/shell_test_platform_view_gl.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/shell_test_platform_view_gl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/shell_test_platform_view_metal.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/shell_test_platform_view_metal.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/shell_test_platform_view_vulkan.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/shell_test_platform_view_vulkan.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/skia_event_tracer_impl.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/skia_event_tracer_impl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/snapshot_controller.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/snapshot_controller.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/snapshot_controller_impeller.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/snapshot_controller_impeller.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/snapshot_controller_skia.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/snapshot_controller_skia.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/snapshot_surface_producer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/switches.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/switches.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/thread_host.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/thread_host.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/variable_refresh_rate_display.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/variable_refresh_rate_display.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/variable_refresh_rate_reporter.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/vsync_waiter.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/vsync_waiter.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/vsync_waiter_fallback.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/vsync_waiter_fallback.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/vsync_waiters_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/vsync_waiters_test.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_surface_gl_delegate.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_surface_gl_delegate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_surface_gl_impeller.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_surface_gl_impeller.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_surface_gl_skia.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_surface_gl_skia.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_surface_metal_delegate.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_surface_metal_delegate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_surface_metal_impeller.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_surface_metal_impeller.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_surface_metal_skia.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_surface_metal_skia.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_surface_software.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_surface_software.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_surface_software_delegate.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_surface_software_delegate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_surface_vulkan.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_surface_vulkan.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_surface_vulkan_delegate.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_surface_vulkan_delegate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_surface_vulkan_impeller.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/gpu/gpu_surface_vulkan_impeller.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/AndroidManifest.xml + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/android_context_gl_impeller.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/android_context_gl_impeller.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/android_context_gl_skia.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/android_context_gl_skia.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/android_context_vulkan_impeller.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/android_context_vulkan_impeller.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/android_display.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/android_display.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/android_egl_surface.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/android_egl_surface.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/android_environment_gl.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/android_environment_gl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/android_exports.lst + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/android_image_generator.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/android_image_generator.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/android_shell_holder.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/android_shell_holder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/android_surface_gl_impeller.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/android_surface_gl_impeller.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/android_surface_gl_skia.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/android_surface_gl_skia.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/android_surface_software.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/android_surface_software.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/android_surface_vulkan_impeller.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/android_surface_vulkan_impeller.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/apk_asset_provider.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/apk_asset_provider.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/context/android_context.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/context/android_context.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/external_view_embedder/external_view_embedder.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/external_view_embedder/external_view_embedder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/external_view_embedder/surface_pool.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/external_view_embedder/surface_pool.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/flutter_main.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/flutter_main.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/image_external_texture.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/image_external_texture.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/image_external_texture_gl.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/image_external_texture_gl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/image_external_texture_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/image_external_texture_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/image_lru.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/image_lru.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/Build.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/BuildConfig.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/FlutterInjector.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/Log.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/app/FlutterActivity.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/app/FlutterActivityEvents.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/app/FlutterApplication.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/app/FlutterPlayStoreSplitApplication.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/app/FlutterPluginRegistry.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/android/ExclusiveAppComponent.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivity.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivityAndFragmentDelegate.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivityLaunchConfigs.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterEngineConfigurator.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterEngineProvider.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterFragment.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterFragmentActivity.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterImageView.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterPlayStoreSplitApplication.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterSurfaceView.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterTextureView.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterView.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/android/KeyChannelResponder.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/android/KeyData.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/android/KeyEmbedderResponder.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/android/KeyboardManager.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/android/KeyboardMap.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/android/RenderMode.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/android/TransparencyMode.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/android/WindowInfoRepositoryCallbackAdapterWrapper.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngine.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngineCache.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngineConnectionRegistry.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngineGroup.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngineGroupCache.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterOverlaySurface.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/dart/DartExecutor.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/dart/DartMessenger.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/dart/PlatformMessageHandler.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/dart/PlatformTaskQueue.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/DeferredComponentManager.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/PlayStoreDeferredComponentManager.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/loader/ApplicationInfoLoader.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/loader/FlutterApplicationInfo.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/loader/FlutterLoader.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/loader/ResourceExtractor.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/mutatorsstack/FlutterMutatorsStack.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/FlutterPlugin.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/PluginRegistry.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/activity/ActivityAware.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/activity/ActivityControlSurface.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/activity/ActivityPluginBinding.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/broadcastreceiver/BroadcastReceiverAware.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/broadcastreceiver/BroadcastReceiverControlSurface.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/broadcastreceiver/BroadcastReceiverPluginBinding.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/contentprovider/ContentProviderAware.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/contentprovider/ContentProviderControlSurface.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/contentprovider/ContentProviderPluginBinding.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/lifecycle/HiddenLifecycleReference.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/service/ServiceAware.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/service/ServiceControlSurface.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/service/ServicePluginBinding.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimPluginRegistry.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimRegistrar.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/util/GeneratedPluginRegister.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterUiDisplayListener.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/RenderSurface.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/SurfaceTextureWrapper.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/BackGestureChannel.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/DeferredComponentChannel.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/KeyEventChannel.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/KeyboardChannel.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/LifecycleChannel.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/LocalizationChannel.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/MouseCursorChannel.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/NavigationChannel.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/PlatformChannel.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/PlatformViewsChannel.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/ProcessTextChannel.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/RestorationChannel.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/SpellCheckChannel.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/SystemChannel.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/common/ActivityLifecycleListener.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/common/BasicMessageChannel.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/common/BinaryCodec.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/common/BinaryMessenger.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/common/ErrorLogResult.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/common/EventChannel.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/common/FlutterException.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/common/JSONMessageCodec.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/common/JSONMethodCodec.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/common/MessageCodec.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/common/MethodCall.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/common/MethodChannel.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/common/MethodCodec.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/common/PluginRegistry.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/common/StandardMessageCodec.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/common/StandardMethodCodec.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/common/StringCodec.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/editing/FlutterTextUtils.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/editing/ImeSyncDeferringInsetsCallback.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/editing/InputConnectionAdaptor.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/editing/ListenableEditingState.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/editing/SpellCheckPlugin.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/editing/TextEditingDelta.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/editing/TextInputPlugin.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/localization/LocalizationPlugin.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/mouse/MouseCursorPlugin.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/AccessibilityEventsDelegate.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformOverlayView.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformView.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewFactory.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewRegistry.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewRegistryImpl.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewRenderTarget.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewWrapper.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsAccessibilityDelegate.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/SingleViewFakeWindowViewGroup.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/SingleViewPresentation.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/SingleViewWindowManager.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/VirtualDisplayController.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/WindowManagerHandler.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/plugin/text/ProcessTextPlugin.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/util/HandlerCompat.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/util/PathUtils.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/util/Preconditions.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/util/Predicate.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/util/TraceSection.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/util/ViewUtils.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/view/AccessibilityBridge.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/view/AccessibilityViewEmbedder.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/view/FlutterCallbackInformation.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/view/FlutterMain.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/view/FlutterNativeView.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/view/FlutterRunArguments.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/view/FlutterView.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/view/TextureRegistry.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/io/flutter/view/VsyncWaiter.java + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/jni/jni_mock.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/jni/platform_view_android_jni.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/jni/platform_view_android_jni.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/library_loader.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/platform_message_handler_android.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/platform_message_handler_android.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/platform_message_response_android.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/platform_message_response_android.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/platform_view_android.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/platform_view_android.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/platform_view_android_delegate/platform_view_android_delegate.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/platform_view_android_delegate/platform_view_android_delegate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/platform_view_android_jni_impl.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/platform_view_android_jni_impl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/surface/android_native_window.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/surface/android_native_window.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/surface/android_surface.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/surface/android_surface.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/surface/android_surface_mock.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/surface/android_surface_mock.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/surface/snapshot_surface_producer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/surface/snapshot_surface_producer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/surface_texture_external_texture.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/surface_texture_external_texture.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/surface_texture_external_texture_gl.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/surface_texture_external_texture_gl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/vsync_waiter_android.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/android/vsync_waiter_android.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/accessibility_bridge.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/accessibility_bridge.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/alert_platform_node_delegate.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/alert_platform_node_delegate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/app_lifecycle_state.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/client_wrapper/binary_messenger_impl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/client_wrapper/byte_buffer_streams.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/client_wrapper/core_implementations.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/client_wrapper/engine_method_result.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/basic_message_channel.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/byte_streams.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/encodable_value.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/engine_method_result.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/event_channel.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/event_sink.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/event_stream_handler.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/event_stream_handler_functions.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/message_codec.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/method_call.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/method_channel.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/method_codec.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/method_result.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/method_result_functions.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/plugin_registrar.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/plugin_registry.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/standard_codec_serializer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/standard_message_codec.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/standard_method_codec.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/texture_registrar.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/client_wrapper/plugin_registrar.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/client_wrapper/standard_codec.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/client_wrapper/texture_registrar_impl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/engine_switches.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/engine_switches.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/flutter_platform_node_delegate.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/flutter_platform_node_delegate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/geometry.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/incoming_message_dispatcher.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/incoming_message_dispatcher.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/json_message_codec.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/json_message_codec.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/json_method_codec.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/json_method_codec.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/path_utils.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/path_utils.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/platform_provided_menu.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/public/flutter_export.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/public/flutter_macros.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/public/flutter_messenger.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/public/flutter_plugin_registrar.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/public/flutter_texture_registrar.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/test_accessibility_bridge.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/test_accessibility_bridge.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/text_editing_delta.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/text_editing_delta.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/text_input_model.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/text_input_model.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/common/text_range.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/common/availability_version_check.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/common/availability_version_check.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/common/buffer_conversions.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/common/buffer_conversions.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/common/command_line.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/common/command_line.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/common/framework/Headers/FlutterCodecs.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/common/framework/Headers/FlutterDartProject.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/common/framework/Headers/FlutterTexture.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/common/framework/Source/FlutterBinaryMessengerRelay.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/common/framework/Source/FlutterBinaryMessengerRelay.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/common/framework/Source/FlutterBinaryMessengerRelayTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/common/framework/Source/FlutterChannels.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/common/framework/Source/FlutterChannelsTest.m + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/common/framework/Source/FlutterCodecs.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/common/framework/Source/FlutterNSBundleUtils.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/common/framework/Source/FlutterNSBundleUtils.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/common/framework/Source/FlutterStandardCodec.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/common/framework/Source/FlutterStandardCodecHelper.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/common/framework/Source/FlutterStandardCodecHelper.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/common/framework/Source/FlutterStandardCodec_Internal.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/common/framework/Source/FlutterTestUtils.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/common/framework/Source/FlutterTestUtils.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/graphics/FlutterDarwinContextMetalImpeller.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/graphics/FlutterDarwinContextMetalImpeller.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/graphics/FlutterDarwinContextMetalSkia.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/graphics/FlutterDarwinContextMetalSkia.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/graphics/FlutterDarwinExternalTextureMetal.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/graphics/FlutterDarwinExternalTextureMetal.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/flutter_task_queue_dispatch.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Headers/Flutter.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterAppDelegate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterCallbackCache.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterEngine.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterEngineGroup.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterHeadlessDartRunner.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterPlatformViews.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterPlugin.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterPluginAppLifeCycleDelegate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterAppDelegate.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterAppDelegateTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterAppDelegate_Test.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterCallbackCache.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterCallbackCache_Internal.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterChannelKeyResponder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterChannelKeyResponder.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterChannelKeyResponderTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterDartProjectTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterDartProject_Internal.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterDartVMServicePublisher.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterDartVMServicePublisher.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterEmbedderKeyResponder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterEmbedderKeyResponder.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterEmbedderKeyResponderTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterEngineGroup.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterEngineGroupTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterEnginePlatformViewTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterEngineTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine_Test.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterFakeKeyEvents.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterFakeKeyEvents.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterHeadlessDartRunner.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterIndirectScribbleDelegate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterKeyPrimaryResponder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterKeySecondaryResponder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterKeyboardManager.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterKeyboardManager.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterKeyboardManagerTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterMetalLayer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterMetalLayer.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterMetalLayerTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterOverlayView.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterOverlayView.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformPluginTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegate.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegateTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegate_internal.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterRestorationPlugin.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterRestorationPlugin.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterRestorationPluginTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterSemanticsScrollView.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterSemanticsScrollView.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterSpellCheckPlugin.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterSpellCheckPlugin.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterSpellCheckPluginTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputDelegate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPluginTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterTextureRegistryRelay.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterTextureRegistryRelay.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterTextureRegistryRelayTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterTouchInterceptingView_Test.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterUIPressProxy.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterUIPressProxy.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterUmbrellaImport.m + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterUndoManagerDelegate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterUndoManagerPlugin.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterUndoManagerPlugin.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterUndoManagerPluginTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterView.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterView.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterViewControllerTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterViewResponder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterViewTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/IOKit.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/KeyCodeMap.g.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/KeyCodeMap_Internal.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/SemanticsObject.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/SemanticsObject.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/SemanticsObjectTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/SemanticsObjectTestMocks.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/UIViewController+FlutterScreenAndSceneIfLoaded.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/UIViewController+FlutterScreenAndSceneIfLoaded.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/UIViewController_FlutterScreenAndSceneIfLoadedTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/VsyncWaiterIosTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge_ios.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge_test.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/accessibility_text_entry.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/accessibility_text_entry.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/availability_version_check_test.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/connection_collection.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/connection_collection.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/connection_collection_test.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/profiler_metrics_ios.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/profiler_metrics_ios.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/ios_context.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/ios_context.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/ios_context_metal_impeller.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/ios_context_metal_impeller.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/ios_context_metal_skia.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/ios_context_metal_skia.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/ios_context_software.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/ios_context_software.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/ios_external_texture_metal.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/ios_external_texture_metal.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/ios_external_view_embedder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/ios_external_view_embedder.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/ios_surface.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/ios_surface.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/ios_surface_metal_impeller.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/ios_surface_metal_impeller.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/ios_surface_metal_skia.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/ios_surface_metal_skia.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/ios_surface_software.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/ios_surface_software.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/platform_message_handler_ios.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/platform_message_handler_ios.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/platform_message_handler_ios_test.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/platform_view_ios.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/platform_view_ios.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/rendering_api_selection.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/ios/rendering_api_selection.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Headers/FlutterAppDelegate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Headers/FlutterAppLifecycleDelegate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Headers/FlutterEngine.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Headers/FlutterMacOS.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Headers/FlutterPlatformViews.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Headers/FlutterPluginMacOS.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Headers/FlutterPluginRegistrarMacOS.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Headers/FlutterViewController.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMac.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMac.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMacTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterAppDelegate.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterAppDelegateTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterAppDelegate_Internal.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterAppLifecycleDelegate.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterAppLifecycleDelegateTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterAppLifecycleDelegate_Internal.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterBackingStore.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterBackingStore.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponder.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponderTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterCompositor.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterCompositor.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterDartProject.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterDartProject_Internal.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterDisplayLinkTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterEmbedderExternalTextureTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterEmbedderKeyResponder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterEmbedderKeyResponder.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterEmbedderKeyResponderTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterEngineTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterEngineTestUtils.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterEngineTestUtils.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterExternalTexture.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterExternalTexture.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterKeyPrimaryResponder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterKeyboardManager.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterKeyboardManager.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterKeyboardManagerTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterKeyboardViewDelegate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMenuPlugin.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMenuPlugin.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMenuPluginTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMenuPlugin_Internal.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMouseCursorPlugin.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMouseCursorPlugin.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMutatorView.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMutatorView.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMutatorViewTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterPlatformNodeDelegateMac.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterPlatformNodeDelegateMac.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterPlatformNodeDelegateMacTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterPlatformViewController.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterPlatformViewController.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterPlatformViewControllerTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterRenderer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterRenderer.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterSurface.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterSurface.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterSurfaceManager.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterSurfaceManager.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterSurfaceManagerTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputPlugin.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputPlugin.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputPluginTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputSemanticsObject.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputSemanticsObject.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputSemanticsObjectTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterTextureRegistrar.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterTextureRegistrar.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterThreadSynchronizer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterThreadSynchronizer.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterThreadSynchronizerTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterTimeConverter.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterTimeConverter.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterUmbrellaImportTests.m + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterVSyncWaiterTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterView.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterView.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewController.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewControllerTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewControllerTestUtils.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewControllerTestUtils.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewController_Internal.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewEngineProvider.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewEngineProvider.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewEngineProviderTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewProvider.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/KeyCodeMap.g.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/KeyCodeMapTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/KeyCodeMap_Internal.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/NSView+ClipsToBounds.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/TestFlutterPlatformView.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/TestFlutterPlatformView.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_engine.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_engine.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_exports.lst + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_external_texture_gl.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_external_texture_gl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_external_texture_metal.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_external_texture_metal.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_external_texture_resolver.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_external_texture_resolver.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_external_view.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_external_view.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_external_view_embedder.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_external_view_embedder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_include.c + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_include2.c + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_layers.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_layers.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_platform_message_response.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_platform_message_response.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_render_target.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_render_target.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_render_target_cache.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_render_target_cache.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_render_target_impeller.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_render_target_impeller.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_render_target_skia.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_render_target_skia.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_semantics_update.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_semantics_update.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_struct_macros.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_surface.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_surface.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_surface_gl.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_surface_gl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_surface_gl_impeller.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_surface_gl_impeller.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_surface_metal.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_surface_metal.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_surface_metal_impeller.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_surface_metal_impeller.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_surface_software.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_surface_software.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_surface_vulkan.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_surface_vulkan.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_task_runner.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_task_runner.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_thread_host.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_thread_host.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/pixel_formats.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/pixel_formats.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/platform_view_embedder.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/platform_view_embedder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/test_utils/key_codes.g.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/test_utils/proc_table_replacement.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/vsync_waiter_embedder.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/vsync_waiter_embedder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart-pkg/fuchsia/lib/fuchsia.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart-pkg/fuchsia/sdk_ext/fuchsia.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart-pkg/fuchsia/sdk_ext/fuchsia.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon/lib/src/handle.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon/lib/src/handle_disposition.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon/lib/src/handle_waiter.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon/lib/src/init.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon/lib/src/system.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon/lib/src/zd_channel.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon/lib/src/zd_handle.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon/lib/zircon.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon/sdk_ext/handle.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon/sdk_ext/handle.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon/sdk_ext/handle_disposition.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon/sdk_ext/handle_disposition.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon/sdk_ext/handle_waiter.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon/sdk_ext/handle_waiter.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon/sdk_ext/natives.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon/sdk_ext/natives.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon/sdk_ext/system.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon/sdk_ext/system.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon_ffi/basic_types.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon_ffi/basic_types.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon_ffi/channel.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon_ffi/channel.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon_ffi/clock.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon_ffi/clock.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon_ffi/handle.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon_ffi/handle.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon_ffi/macros.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart/compiler.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart_runner/builtin_libraries.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart_runner/builtin_libraries.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart_runner/dart_component_controller.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart_runner/dart_component_controller.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart_runner/dart_runner.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart_runner/dart_runner.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart_runner/dart_test_component_controller.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart_runner/dart_test_component_controller.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart_runner/embedder/builtin.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart_runner/embedder/shim.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart_runner/embedder/snapshot.cc.tmpl + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart_runner/embedder/snapshot.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart_runner/embedder/snapshot.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart_runner/fidl/echo.fidl + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart_runner/logging.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart_runner/main.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/common.shard.cml + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/dart_aot_product_runner.cml + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/dart_aot_runner.cml + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/dart_jit_product_runner.cml + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/dart_jit_runner.cml + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart_runner/service_isolate.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart_runner/service_isolate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/dart_runner/vmservice/empty.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/accessibility_bridge.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/accessibility_bridge.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/canvas_spy.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/canvas_spy.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/component_v2.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/component_v2.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/engine.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/engine.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/external_view_embedder.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/external_view_embedder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/file_in_namespace_buffer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/file_in_namespace_buffer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/flatland_connection.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/flatland_connection.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/flutter_runner_fakes.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/flutter_runner_product_configuration.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/flutter_runner_product_configuration.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/focus_delegate.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/focus_delegate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/fuchsia_intl.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/fuchsia_intl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/isolate_configurator.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/isolate_configurator.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/kernel/framework_shim.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/keyboard.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/keyboard.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/logging.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/main.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/meta/common.shard.cml + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/meta/flutter_aot_product_runner.cml + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/meta/flutter_aot_runner.cml + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/meta/flutter_jit_product_runner.cml + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/meta/flutter_jit_runner.cml + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/platform_view.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/platform_view.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/pointer_delegate.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/pointer_delegate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/pointer_injector_delegate.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/pointer_injector_delegate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/program_metadata.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/rtree.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/rtree.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/runner.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/runner.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/software_surface.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/software_surface.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/software_surface_producer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/software_surface_producer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/surface.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/surface.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/surface_producer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/task_runner_adapter.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/task_runner_adapter.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/text_delegate.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/text_delegate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/unique_fdio_ns.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/vsync_waiter.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/vsync_waiter.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/vulkan_surface.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/vulkan_surface.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/vulkan_surface_pool.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/vulkan_surface_pool.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/vulkan_surface_producer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/vulkan_surface_producer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/runtime/dart/profiler_symbols/dart_profiler_symbols.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/build_info.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/build_info_in.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/files.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/files.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/handle_exception.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/handle_exception.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/inlines.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/logging.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/mapped_resource.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/mapped_resource.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/root_inspect_node.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/root_inspect_node.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/tempfs.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/tempfs.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/vmo.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/vmo.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/vmservice_object.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/vmservice_object.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/glfw/client_wrapper/flutter_engine.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/glfw/client_wrapper/flutter_window_controller.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/glfw/client_wrapper/include/flutter/flutter_engine.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/glfw/client_wrapper/include/flutter/flutter_window.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/glfw/client_wrapper/include/flutter/flutter_window_controller.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/glfw/client_wrapper/include/flutter/plugin_registrar_glfw.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/glfw/event_loop.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/glfw/event_loop.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/glfw/flutter_glfw.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/glfw/glfw_event_loop.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/glfw/glfw_event_loop.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/glfw/headless_event_loop.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/glfw/headless_event_loop.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/glfw/key_event_handler.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/glfw/key_event_handler.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/glfw/keyboard_hook_handler.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/glfw/platform_handler.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/glfw/platform_handler.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/glfw/public/flutter_glfw.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/glfw/system_utils.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/glfw/system_utils.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/glfw/system_utils_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/glfw/text_input_plugin.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/glfw/text_input_plugin.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_accessible_node.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_accessible_node.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_accessible_node_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_accessible_text_field.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_accessible_text_field.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_accessible_text_field_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_backing_store_provider.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_backing_store_provider.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_basic_message_channel.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_basic_message_channel_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_binary_codec.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_binary_codec_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_binary_messenger.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_binary_messenger_private.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_binary_messenger_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_dart_project.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_dart_project_private.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_dart_project_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_engine.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_engine_private.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_engine_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_event_channel.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_event_channel_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_gnome_settings.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_gnome_settings.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_gnome_settings_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_json_message_codec.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_json_message_codec_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_json_method_codec.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_json_method_codec_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_key_channel_responder.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_key_channel_responder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_key_channel_responder_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_key_embedder_responder.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_key_embedder_responder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_key_embedder_responder_private.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_key_embedder_responder_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_key_event.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_key_event.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_key_responder.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_key_responder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_keyboard_manager.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_keyboard_manager.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_keyboard_manager_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_keyboard_view_delegate.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_keyboard_view_delegate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_message_codec.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_message_codec_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_method_call.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_method_call_private.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_method_channel.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_method_channel_private.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_method_channel_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_method_codec.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_method_codec_private.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_method_codec_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_method_response.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_method_response_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_mouse_cursor_plugin.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_mouse_cursor_plugin.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_pixel_buffer_texture.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_pixel_buffer_texture_private.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_pixel_buffer_texture_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_platform_plugin.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_platform_plugin.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_platform_plugin_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_plugin_registrar.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_plugin_registrar_private.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_plugin_registrar_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_plugin_registry.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_renderer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_renderer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_renderer_gdk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_renderer_gdk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_renderer_headless.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_renderer_headless.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_scrolling_manager.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_scrolling_manager.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_scrolling_manager_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_scrolling_view_delegate.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_scrolling_view_delegate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_settings.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_settings.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_settings_plugin.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_settings_plugin.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_settings_plugin_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_settings_portal.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_settings_portal.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_settings_portal_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_standard_message_codec.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_standard_message_codec_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_standard_method_codec.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_standard_method_codec_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_string_codec.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_string_codec_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_task_runner.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_task_runner.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_text_input_plugin.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_text_input_plugin.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_text_input_plugin_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_text_input_view_delegate.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_text_input_view_delegate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_texture.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_texture_gl.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_texture_gl_private.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_texture_gl_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_texture_private.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_texture_registrar.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_texture_registrar_private.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_texture_registrar_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_value.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_value_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_view.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_view_accessible.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_view_accessible.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_view_accessible_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_view_private.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_view_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/key_mapping.g.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/key_mapping.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/key_mapping_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_basic_message_channel.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_binary_codec.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_binary_messenger.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_dart_project.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_engine.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_event_channel.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_json_message_codec.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_json_method_codec.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_message_codec.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_method_call.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_method_channel.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_method_codec.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_method_response.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_pixel_buffer_texture.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_plugin_registrar.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_plugin_registry.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_standard_message_codec.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_standard_method_codec.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_string_codec.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_texture.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_texture_gl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_texture_registrar.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_value.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_view.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/public/flutter_linux/flutter_linux.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/accessibility_bridge_windows.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/accessibility_bridge_windows.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/accessibility_plugin.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/accessibility_plugin.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/client_wrapper/flutter_engine.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/client_wrapper/flutter_view_controller.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/client_wrapper/include/flutter/dart_project.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/client_wrapper/include/flutter/flutter_engine.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/client_wrapper/include/flutter/flutter_view.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/client_wrapper/include/flutter/flutter_view_controller.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/client_wrapper/include/flutter/plugin_registrar_windows.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/compositor.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/compositor_opengl.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/compositor_opengl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/compositor_software.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/compositor_software.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/cursor_handler.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/cursor_handler.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/direct_manipulation.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/direct_manipulation.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/dpi_utils.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/dpi_utils.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/egl/context.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/egl/context.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/egl/egl.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/egl/egl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/egl/manager.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/egl/manager.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/egl/proc_table.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/egl/proc_table.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/egl/surface.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/egl/surface.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/egl/window_surface.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/egl/window_surface.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/event_watcher.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/event_watcher.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/external_texture.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/external_texture_d3d.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/external_texture_d3d.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/external_texture_pixelbuffer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/external_texture_pixelbuffer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/flutter_desktop_messenger.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/flutter_key_map.g.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/flutter_platform_node_delegate_windows.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/flutter_platform_node_delegate_windows.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/flutter_project_bundle.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/flutter_project_bundle.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/flutter_window.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/flutter_window.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/flutter_windows.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/flutter_windows_engine.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/flutter_windows_engine.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/flutter_windows_internal.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/flutter_windows_texture_registrar.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/flutter_windows_texture_registrar.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/flutter_windows_view.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/flutter_windows_view.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/flutter_windows_view_controller.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/keyboard_handler_base.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/keyboard_key_channel_handler.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/keyboard_key_channel_handler.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/keyboard_key_embedder_handler.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/keyboard_key_embedder_handler.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/keyboard_key_handler.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/keyboard_key_handler.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/keyboard_manager.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/keyboard_manager.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/keyboard_utils.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/keyboard_utils.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/platform_handler.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/platform_handler.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/platform_view_manager.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/platform_view_manager.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/platform_view_plugin.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/platform_view_plugin.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/public/flutter_windows.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/sequential_id_generator.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/sequential_id_generator.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/settings_plugin.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/settings_plugin.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/system_utils.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/system_utils.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/task_runner.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/task_runner.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/task_runner_window.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/task_runner_window.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/text_input_manager.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/text_input_manager.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/text_input_plugin.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/text_input_plugin.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/window_binding_handler.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/window_binding_handler_delegate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/window_proc_delegate_manager.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/window_proc_delegate_manager.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/window_state.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/windows_lifecycle_manager.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/windows_lifecycle_manager.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/windows_proc_table.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/windows_proc_table.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/windows/windowsx_shim.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/profiling/sampling_profiler.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/profiling/sampling_profiler.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/version/version.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/version/version.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/vmservice/empty.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/color_utils.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/compiler_specific.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/container_utils.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/logging.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/logging.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/macros.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/platform/darwin/scoped_nsobject.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/platform/darwin/scoped_nsobject.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/simple_token.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/simple_token.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/string_utils.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/string_utils.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/transform.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/transform.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/third_party/spring_animation/SpringAnimationTest.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/common/build_config.h + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/common/log.cc + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/common/log.h + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/common/macros.h + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/converter/dart_converter.cc + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/converter/dart_converter.h + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/dart_args.h + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/dart_binding_macros.h + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/dart_class_library.cc + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/dart_class_library.h + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/dart_class_provider.cc + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/dart_class_provider.h + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/dart_library_natives.cc + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/dart_library_natives.h + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/dart_list.cc + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/dart_list.h + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/dart_message_handler.cc + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/dart_message_handler.h + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/dart_microtask_queue.cc + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/dart_microtask_queue.h + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/dart_persistent_value.cc + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/dart_persistent_value.h + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/dart_state.cc + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/dart_state.h + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/dart_weak_persistent_value.cc + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/dart_weak_persistent_value.h + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/dart_wrappable.cc + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/dart_wrappable.h + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/dart_wrapper_info.h + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/file_loader/file_loader.cc + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/file_loader/file_loader.h + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/file_loader/file_loader_fuchsia.cc + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/file_loader/file_loader_posix.cc + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/file_loader/file_loader_win.cc + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/filesystem/filesystem/eintr_wrapper.h + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/filesystem/filesystem/file.cc + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/filesystem/filesystem/file.h + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/filesystem/filesystem/path.h + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/filesystem/filesystem/path_posix.cc + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/filesystem/filesystem/path_win.cc + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/filesystem/filesystem/portable_unistd.h + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/logging/dart_error.cc + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/logging/dart_error.h + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/logging/dart_invoke.cc + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/logging/dart_invoke.h + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/parsers/packages_map.cc + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/parsers/packages_map.h + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/scopes/dart_api_scope.h + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/scopes/dart_isolate_scope.cc + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/scopes/dart_isolate_scope.h + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/typed_data/dart_byte_data.cc + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/typed_data/dart_byte_data.h + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/typed_data/float32_list.h + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/typed_data/float64_list.h + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/typed_data/int32_list.h + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/typed_data/typed_list.cc + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/typed_data/typed_list.h + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/typed_data/uint16_list.h + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/tonic/typed_data/uint8_list.h + ../../../flutter/third_party/tonic/LICENSE
+ORIGIN: ../../../flutter/third_party/txt/src/txt/platform.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/third_party/txt/src/txt/platform.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/third_party/txt/src/txt/platform_android.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/third_party/txt/src/txt/platform_fuchsia.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/third_party/txt/src/txt/platform_linux.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/third_party/txt/src/txt/platform_mac.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/third_party/txt/src/txt/platform_mac.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/third_party/txt/src/txt/platform_windows.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/third_party/web_test_fonts/lib/web_test_fonts.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/third_party/web_test_fonts/lib/web_test_fonts/web_test_fonts.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/third_party/web_unicode/lib/web_unicode.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/third_party/web_unicode/tool/unicode_sync_script.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/procs/vulkan_handle.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/procs/vulkan_handle.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/procs/vulkan_interface.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/procs/vulkan_interface.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/procs/vulkan_proc_table.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/procs/vulkan_proc_table.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/swiftshader_path.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/vulkan_application.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/vulkan_application.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/vulkan_backbuffer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/vulkan_backbuffer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/vulkan_command_buffer.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/vulkan_command_buffer.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/vulkan_debug_report.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/vulkan_debug_report.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/vulkan_device.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/vulkan_device.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/vulkan_image.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/vulkan_image.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/vulkan_native_surface.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/vulkan_native_surface.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/vulkan_native_surface_android.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/vulkan_native_surface_android.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/vulkan_provider.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/vulkan_provider.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/vulkan_skia_proc_table.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/vulkan_skia_proc_table.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/vulkan_surface.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/vulkan_surface.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/vulkan_swapchain.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/vulkan_swapchain.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/vulkan_swapchain_stub.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/vulkan_utilities.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/vulkan_utilities.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/vulkan_window.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/vulkan/vulkan_window.h + ../../../flutter/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/.pylintrc
+FILE: ../../../flutter/assets/asset_manager.cc
+FILE: ../../../flutter/assets/asset_manager.h
+FILE: ../../../flutter/assets/asset_resolver.h
+FILE: ../../../flutter/assets/directory_asset_bundle.cc
+FILE: ../../../flutter/assets/directory_asset_bundle.h
+FILE: ../../../flutter/benchmarking/benchmarking.cc
+FILE: ../../../flutter/benchmarking/benchmarking.h
+FILE: ../../../flutter/benchmarking/library.cc
+FILE: ../../../flutter/benchmarking/library.h
+FILE: ../../../flutter/common/constants.h
+FILE: ../../../flutter/common/exported_symbols.sym
+FILE: ../../../flutter/common/exported_symbols_mac.sym
+FILE: ../../../flutter/common/exported_test_symbols.sym
+FILE: ../../../flutter/common/exported_test_symbols_mac.sym
+FILE: ../../../flutter/common/graphics/gl_context_switch.cc
+FILE: ../../../flutter/common/graphics/gl_context_switch.h
+FILE: ../../../flutter/common/graphics/msaa_sample_count.h
+FILE: ../../../flutter/common/graphics/persistent_cache.cc
+FILE: ../../../flutter/common/graphics/persistent_cache.h
+FILE: ../../../flutter/common/graphics/texture.cc
+FILE: ../../../flutter/common/graphics/texture.h
+FILE: ../../../flutter/common/settings.cc
+FILE: ../../../flutter/common/settings.h
+FILE: ../../../flutter/common/task_runners.cc
+FILE: ../../../flutter/common/task_runners.h
+FILE: ../../../flutter/display_list/benchmarking/dl_benchmarks.cc
+FILE: ../../../flutter/display_list/benchmarking/dl_benchmarks.h
+FILE: ../../../flutter/display_list/benchmarking/dl_builder_benchmarks.cc
+FILE: ../../../flutter/display_list/benchmarking/dl_complexity.cc
+FILE: ../../../flutter/display_list/benchmarking/dl_complexity.h
+FILE: ../../../flutter/display_list/benchmarking/dl_complexity_gl.cc
+FILE: ../../../flutter/display_list/benchmarking/dl_complexity_gl.h
+FILE: ../../../flutter/display_list/benchmarking/dl_complexity_helper.h
+FILE: ../../../flutter/display_list/benchmarking/dl_complexity_metal.cc
+FILE: ../../../flutter/display_list/benchmarking/dl_complexity_metal.h
+FILE: ../../../flutter/display_list/benchmarking/dl_region_benchmarks.cc
+FILE: ../../../flutter/display_list/benchmarking/dl_transform_benchmarks.cc
+FILE: ../../../flutter/display_list/display_list.cc
+FILE: ../../../flutter/display_list/display_list.h
+FILE: ../../../flutter/display_list/dl_attributes.h
+FILE: ../../../flutter/display_list/dl_blend_mode.cc
+FILE: ../../../flutter/display_list/dl_blend_mode.h
+FILE: ../../../flutter/display_list/dl_builder.cc
+FILE: ../../../flutter/display_list/dl_builder.h
+FILE: ../../../flutter/display_list/dl_canvas.cc
+FILE: ../../../flutter/display_list/dl_canvas.h
+FILE: ../../../flutter/display_list/dl_color.h
+FILE: ../../../flutter/display_list/dl_op_flags.cc
+FILE: ../../../flutter/display_list/dl_op_flags.h
+FILE: ../../../flutter/display_list/dl_op_receiver.cc
+FILE: ../../../flutter/display_list/dl_op_receiver.h
+FILE: ../../../flutter/display_list/dl_op_records.cc
+FILE: ../../../flutter/display_list/dl_op_records.h
+FILE: ../../../flutter/display_list/dl_paint.cc
+FILE: ../../../flutter/display_list/dl_paint.h
+FILE: ../../../flutter/display_list/dl_sampling_options.h
+FILE: ../../../flutter/display_list/dl_tile_mode.h
+FILE: ../../../flutter/display_list/dl_vertices.cc
+FILE: ../../../flutter/display_list/dl_vertices.h
+FILE: ../../../flutter/display_list/effects/dl_color_filter.cc
+FILE: ../../../flutter/display_list/effects/dl_color_filter.h
+FILE: ../../../flutter/display_list/effects/dl_color_source.cc
+FILE: ../../../flutter/display_list/effects/dl_color_source.h
+FILE: ../../../flutter/display_list/effects/dl_image_filter.cc
+FILE: ../../../flutter/display_list/effects/dl_image_filter.h
+FILE: ../../../flutter/display_list/effects/dl_mask_filter.cc
+FILE: ../../../flutter/display_list/effects/dl_mask_filter.h
+FILE: ../../../flutter/display_list/effects/dl_path_effect.cc
+FILE: ../../../flutter/display_list/effects/dl_path_effect.h
+FILE: ../../../flutter/display_list/effects/dl_runtime_effect.cc
+FILE: ../../../flutter/display_list/effects/dl_runtime_effect.h
+FILE: ../../../flutter/display_list/geometry/dl_region.cc
+FILE: ../../../flutter/display_list/geometry/dl_region.h
+FILE: ../../../flutter/display_list/geometry/dl_rtree.cc
+FILE: ../../../flutter/display_list/geometry/dl_rtree.h
+FILE: ../../../flutter/display_list/image/dl_image.cc
+FILE: ../../../flutter/display_list/image/dl_image.h
+FILE: ../../../flutter/display_list/image/dl_image_skia.cc
+FILE: ../../../flutter/display_list/image/dl_image_skia.h
+FILE: ../../../flutter/display_list/skia/dl_sk_canvas.cc
+FILE: ../../../flutter/display_list/skia/dl_sk_canvas.h
+FILE: ../../../flutter/display_list/skia/dl_sk_conversions.cc
+FILE: ../../../flutter/display_list/skia/dl_sk_conversions.h
+FILE: ../../../flutter/display_list/skia/dl_sk_dispatcher.cc
+FILE: ../../../flutter/display_list/skia/dl_sk_dispatcher.h
+FILE: ../../../flutter/display_list/skia/dl_sk_paint_dispatcher.cc
+FILE: ../../../flutter/display_list/skia/dl_sk_paint_dispatcher.h
+FILE: ../../../flutter/display_list/skia/dl_sk_types.h
+FILE: ../../../flutter/display_list/utils/dl_bounds_accumulator.cc
+FILE: ../../../flutter/display_list/utils/dl_bounds_accumulator.h
+FILE: ../../../flutter/display_list/utils/dl_comparable.h
+FILE: ../../../flutter/display_list/utils/dl_matrix_clip_tracker.cc
+FILE: ../../../flutter/display_list/utils/dl_matrix_clip_tracker.h
+FILE: ../../../flutter/display_list/utils/dl_receiver_utils.cc
+FILE: ../../../flutter/display_list/utils/dl_receiver_utils.h
+FILE: ../../../flutter/flow/compositor_context.cc
+FILE: ../../../flutter/flow/compositor_context.h
+FILE: ../../../flutter/flow/diff_context.cc
+FILE: ../../../flutter/flow/diff_context.h
+FILE: ../../../flutter/flow/embedded_views.cc
+FILE: ../../../flutter/flow/embedded_views.h
+FILE: ../../../flutter/flow/flow_test_utils.cc
+FILE: ../../../flutter/flow/flow_test_utils.h
+FILE: ../../../flutter/flow/frame_timings.cc
+FILE: ../../../flutter/flow/frame_timings.h
+FILE: ../../../flutter/flow/layer_snapshot_store.cc
+FILE: ../../../flutter/flow/layer_snapshot_store.h
+FILE: ../../../flutter/flow/layers/backdrop_filter_layer.cc
+FILE: ../../../flutter/flow/layers/backdrop_filter_layer.h
+FILE: ../../../flutter/flow/layers/cacheable_layer.cc
+FILE: ../../../flutter/flow/layers/cacheable_layer.h
+FILE: ../../../flutter/flow/layers/clip_path_layer.cc
+FILE: ../../../flutter/flow/layers/clip_path_layer.h
+FILE: ../../../flutter/flow/layers/clip_rect_layer.cc
+FILE: ../../../flutter/flow/layers/clip_rect_layer.h
+FILE: ../../../flutter/flow/layers/clip_rrect_layer.cc
+FILE: ../../../flutter/flow/layers/clip_rrect_layer.h
+FILE: ../../../flutter/flow/layers/clip_shape_layer.h
+FILE: ../../../flutter/flow/layers/color_filter_layer.cc
+FILE: ../../../flutter/flow/layers/color_filter_layer.h
+FILE: ../../../flutter/flow/layers/container_layer.cc
+FILE: ../../../flutter/flow/layers/container_layer.h
+FILE: ../../../flutter/flow/layers/display_list_layer.cc
+FILE: ../../../flutter/flow/layers/display_list_layer.h
+FILE: ../../../flutter/flow/layers/display_list_raster_cache_item.cc
+FILE: ../../../flutter/flow/layers/display_list_raster_cache_item.h
+FILE: ../../../flutter/flow/layers/image_filter_layer.cc
+FILE: ../../../flutter/flow/layers/image_filter_layer.h
+FILE: ../../../flutter/flow/layers/layer.cc
+FILE: ../../../flutter/flow/layers/layer.h
+FILE: ../../../flutter/flow/layers/layer_raster_cache_item.cc
+FILE: ../../../flutter/flow/layers/layer_raster_cache_item.h
+FILE: ../../../flutter/flow/layers/layer_state_stack.cc
+FILE: ../../../flutter/flow/layers/layer_state_stack.h
+FILE: ../../../flutter/flow/layers/layer_tree.cc
+FILE: ../../../flutter/flow/layers/layer_tree.h
+FILE: ../../../flutter/flow/layers/offscreen_surface.cc
+FILE: ../../../flutter/flow/layers/offscreen_surface.h
+FILE: ../../../flutter/flow/layers/opacity_layer.cc
+FILE: ../../../flutter/flow/layers/opacity_layer.h
+FILE: ../../../flutter/flow/layers/performance_overlay_layer.cc
+FILE: ../../../flutter/flow/layers/performance_overlay_layer.h
+FILE: ../../../flutter/flow/layers/platform_view_layer.cc
+FILE: ../../../flutter/flow/layers/platform_view_layer.h
+FILE: ../../../flutter/flow/layers/shader_mask_layer.cc
+FILE: ../../../flutter/flow/layers/shader_mask_layer.h
+FILE: ../../../flutter/flow/layers/texture_layer.cc
+FILE: ../../../flutter/flow/layers/texture_layer.h
+FILE: ../../../flutter/flow/layers/transform_layer.cc
+FILE: ../../../flutter/flow/layers/transform_layer.h
+FILE: ../../../flutter/flow/paint_region.cc
+FILE: ../../../flutter/flow/paint_region.h
+FILE: ../../../flutter/flow/paint_utils.cc
+FILE: ../../../flutter/flow/paint_utils.h
+FILE: ../../../flutter/flow/raster_cache.cc
+FILE: ../../../flutter/flow/raster_cache.h
+FILE: ../../../flutter/flow/raster_cache_item.h
+FILE: ../../../flutter/flow/raster_cache_key.cc
+FILE: ../../../flutter/flow/raster_cache_key.h
+FILE: ../../../flutter/flow/raster_cache_util.cc
+FILE: ../../../flutter/flow/raster_cache_util.h
+FILE: ../../../flutter/flow/skia_gpu_object.h
+FILE: ../../../flutter/flow/stopwatch.cc
+FILE: ../../../flutter/flow/stopwatch.h
+FILE: ../../../flutter/flow/stopwatch_dl.cc
+FILE: ../../../flutter/flow/stopwatch_dl.h
+FILE: ../../../flutter/flow/stopwatch_sk.cc
+FILE: ../../../flutter/flow/stopwatch_sk.h
+FILE: ../../../flutter/flow/surface.cc
+FILE: ../../../flutter/flow/surface.h
+FILE: ../../../flutter/flow/surface_frame.cc
+FILE: ../../../flutter/flow/surface_frame.h
+FILE: ../../../flutter/flutter_vma/flutter_skia_vma.cc
+FILE: ../../../flutter/flutter_vma/flutter_skia_vma.h
+FILE: ../../../flutter/flutter_vma/flutter_vma.cc
+FILE: ../../../flutter/flutter_vma/flutter_vma.h
+FILE: ../../../flutter/fml/ascii_trie.cc
+FILE: ../../../flutter/fml/ascii_trie.h
+FILE: ../../../flutter/fml/backtrace.cc
+FILE: ../../../flutter/fml/backtrace.h
+FILE: ../../../flutter/fml/backtrace_stub.cc
+FILE: ../../../flutter/fml/base32.cc
+FILE: ../../../flutter/fml/base32.h
+FILE: ../../../flutter/fml/build_config.h
+FILE: ../../../flutter/fml/closure.h
+FILE: ../../../flutter/fml/command_line.cc
+FILE: ../../../flutter/fml/command_line.h
+FILE: ../../../flutter/fml/compiler_specific.h
+FILE: ../../../flutter/fml/concurrent_message_loop.cc
+FILE: ../../../flutter/fml/concurrent_message_loop.h
+FILE: ../../../flutter/fml/concurrent_message_loop_factory.cc
+FILE: ../../../flutter/fml/container.h
+FILE: ../../../flutter/fml/cpu_affinity.cc
+FILE: ../../../flutter/fml/cpu_affinity.h
+FILE: ../../../flutter/fml/delayed_task.cc
+FILE: ../../../flutter/fml/delayed_task.h
+FILE: ../../../flutter/fml/eintr_wrapper.h
+FILE: ../../../flutter/fml/endianness.cc
+FILE: ../../../flutter/fml/endianness.h
+FILE: ../../../flutter/fml/file.cc
+FILE: ../../../flutter/fml/file.h
+FILE: ../../../flutter/fml/hash_combine.h
+FILE: ../../../flutter/fml/hex_codec.cc
+FILE: ../../../flutter/fml/hex_codec.h
+FILE: ../../../flutter/fml/icu_util.cc
+FILE: ../../../flutter/fml/icu_util.h
+FILE: ../../../flutter/fml/log_level.h
+FILE: ../../../flutter/fml/log_settings.cc
+FILE: ../../../flutter/fml/log_settings.h
+FILE: ../../../flutter/fml/log_settings_state.cc
+FILE: ../../../flutter/fml/logging.cc
+FILE: ../../../flutter/fml/logging.h
+FILE: ../../../flutter/fml/macros.h
+FILE: ../../../flutter/fml/make_copyable.h
+FILE: ../../../flutter/fml/mapping.cc
+FILE: ../../../flutter/fml/mapping.h
+FILE: ../../../flutter/fml/math.h
+FILE: ../../../flutter/fml/memory/ref_counted.h
+FILE: ../../../flutter/fml/memory/ref_counted_internal.h
+FILE: ../../../flutter/fml/memory/ref_ptr.h
+FILE: ../../../flutter/fml/memory/ref_ptr_internal.h
+FILE: ../../../flutter/fml/memory/task_runner_checker.cc
+FILE: ../../../flutter/fml/memory/task_runner_checker.h
+FILE: ../../../flutter/fml/memory/thread_checker.cc
 FILE: ../../../flutter/fml/memory/thread_checker.h
 FILE: ../../../flutter/fml/memory/weak_ptr.h
 FILE: ../../../flutter/fml/memory/weak_ptr_internal.cc
 FILE: ../../../flutter/fml/memory/weak_ptr_internal.h
-FILE: ../../../flutter/fml/memory/weak_ptr_unittest.cc
 FILE: ../../../flutter/fml/message_loop.cc
 FILE: ../../../flutter/fml/message_loop.h
 FILE: ../../../flutter/fml/message_loop_impl.cc
 FILE: ../../../flutter/fml/message_loop_impl.h
-FILE: ../../../flutter/fml/message_loop_impl_unittests.cc
 FILE: ../../../flutter/fml/message_loop_task_queues.cc
 FILE: ../../../flutter/fml/message_loop_task_queues.h
 FILE: ../../../flutter/fml/message_loop_task_queues_benchmark.cc
-FILE: ../../../flutter/fml/message_loop_task_queues_merge_unmerge_unittests.cc
-FILE: ../../../flutter/fml/message_loop_task_queues_unittests.cc
-FILE: ../../../flutter/fml/message_loop_unittests.cc
 FILE: ../../../flutter/fml/native_library.h
 FILE: ../../../flutter/fml/paths.cc
 FILE: ../../../flutter/fml/paths.h
-FILE: ../../../flutter/fml/paths_unittests.cc
+FILE: ../../../flutter/fml/platform/android/cpu_affinity.cc
+FILE: ../../../flutter/fml/platform/android/cpu_affinity.h
 FILE: ../../../flutter/fml/platform/android/jni_util.cc
 FILE: ../../../flutter/fml/platform/android/jni_util.h
 FILE: ../../../flutter/fml/platform/android/jni_weak_ref.cc
@@ -985,7 +42246,7 @@ FILE: ../../../flutter/fml/platform/android/scoped_java_ref.cc
 FILE: ../../../flutter/fml/platform/android/scoped_java_ref.h
 FILE: ../../../flutter/fml/platform/darwin/cf_utils.cc
 FILE: ../../../flutter/fml/platform/darwin/cf_utils.h
-FILE: ../../../flutter/fml/platform/darwin/cf_utils_unittests.mm
+FILE: ../../../flutter/fml/platform/darwin/concurrent_message_loop_factory.mm
 FILE: ../../../flutter/fml/platform/darwin/message_loop_darwin.h
 FILE: ../../../flutter/fml/platform/darwin/message_loop_darwin.mm
 FILE: ../../../flutter/fml/platform/darwin/paths_darwin.mm
@@ -993,11 +42254,20 @@ FILE: ../../../flutter/fml/platform/darwin/platform_version.h
 FILE: ../../../flutter/fml/platform/darwin/platform_version.mm
 FILE: ../../../flutter/fml/platform/darwin/scoped_block.h
 FILE: ../../../flutter/fml/platform/darwin/scoped_block.mm
+FILE: ../../../flutter/fml/platform/darwin/scoped_nsautorelease_pool.cc
+FILE: ../../../flutter/fml/platform/darwin/scoped_nsautorelease_pool.h
 FILE: ../../../flutter/fml/platform/darwin/scoped_nsobject.h
 FILE: ../../../flutter/fml/platform/darwin/scoped_nsobject.mm
+FILE: ../../../flutter/fml/platform/darwin/scoped_policy.h
+FILE: ../../../flutter/fml/platform/darwin/scoped_typeref.h
 FILE: ../../../flutter/fml/platform/darwin/string_range_sanitization.h
 FILE: ../../../flutter/fml/platform/darwin/string_range_sanitization.mm
-FILE: ../../../flutter/fml/platform/darwin/string_range_sanitization_unittests.mm
+FILE: ../../../flutter/fml/platform/darwin/weak_nsobject.h
+FILE: ../../../flutter/fml/platform/darwin/weak_nsobject.mm
+FILE: ../../../flutter/fml/platform/fuchsia/log_interest_listener.cc
+FILE: ../../../flutter/fml/platform/fuchsia/log_interest_listener.h
+FILE: ../../../flutter/fml/platform/fuchsia/log_state.cc
+FILE: ../../../flutter/fml/platform/fuchsia/log_state.h
 FILE: ../../../flutter/fml/platform/fuchsia/message_loop_fuchsia.cc
 FILE: ../../../flutter/fml/platform/fuchsia/message_loop_fuchsia.h
 FILE: ../../../flutter/fml/platform/fuchsia/paths_fuchsia.cc
@@ -1014,6 +42284,7 @@ FILE: ../../../flutter/fml/platform/posix/mapping_posix.cc
 FILE: ../../../flutter/fml/platform/posix/native_library_posix.cc
 FILE: ../../../flutter/fml/platform/posix/paths_posix.cc
 FILE: ../../../flutter/fml/platform/posix/posix_wrappers_posix.cc
+FILE: ../../../flutter/fml/platform/posix/process_posix.cc
 FILE: ../../../flutter/fml/platform/posix/shared_mutex_posix.cc
 FILE: ../../../flutter/fml/platform/posix/shared_mutex_posix.h
 FILE: ../../../flutter/fml/platform/win/command_line_win.cc
@@ -1026,57 +42297,45 @@ FILE: ../../../flutter/fml/platform/win/message_loop_win.h
 FILE: ../../../flutter/fml/platform/win/native_library_win.cc
 FILE: ../../../flutter/fml/platform/win/paths_win.cc
 FILE: ../../../flutter/fml/platform/win/posix_wrappers_win.cc
+FILE: ../../../flutter/fml/platform/win/process_win.cc
 FILE: ../../../flutter/fml/platform/win/wstring_conversion.cc
 FILE: ../../../flutter/fml/platform/win/wstring_conversion.h
-FILE: ../../../flutter/fml/platform/win/wstring_conversion_unittests.cc
 FILE: ../../../flutter/fml/posix_wrappers.h
+FILE: ../../../flutter/fml/process.h
 FILE: ../../../flutter/fml/raster_thread_merger.cc
 FILE: ../../../flutter/fml/raster_thread_merger.h
-FILE: ../../../flutter/fml/raster_thread_merger_unittests.cc
 FILE: ../../../flutter/fml/shared_thread_merger.cc
 FILE: ../../../flutter/fml/shared_thread_merger.h
 FILE: ../../../flutter/fml/size.h
 FILE: ../../../flutter/fml/status.h
+FILE: ../../../flutter/fml/status_or.h
 FILE: ../../../flutter/fml/string_conversion.cc
 FILE: ../../../flutter/fml/string_conversion.h
-FILE: ../../../flutter/fml/string_conversion_unittests.cc
 FILE: ../../../flutter/fml/synchronization/atomic_object.h
 FILE: ../../../flutter/fml/synchronization/count_down_latch.cc
 FILE: ../../../flutter/fml/synchronization/count_down_latch.h
-FILE: ../../../flutter/fml/synchronization/count_down_latch_unittests.cc
 FILE: ../../../flutter/fml/synchronization/semaphore.cc
 FILE: ../../../flutter/fml/synchronization/semaphore.h
-FILE: ../../../flutter/fml/synchronization/semaphore_unittest.cc
 FILE: ../../../flutter/fml/synchronization/shared_mutex.h
 FILE: ../../../flutter/fml/synchronization/shared_mutex_std.cc
 FILE: ../../../flutter/fml/synchronization/shared_mutex_std.h
 FILE: ../../../flutter/fml/synchronization/sync_switch.cc
 FILE: ../../../flutter/fml/synchronization/sync_switch.h
-FILE: ../../../flutter/fml/synchronization/sync_switch_unittest.cc
 FILE: ../../../flutter/fml/synchronization/waitable_event.cc
 FILE: ../../../flutter/fml/synchronization/waitable_event.h
-FILE: ../../../flutter/fml/synchronization/waitable_event_unittest.cc
 FILE: ../../../flutter/fml/task_queue_id.h
 FILE: ../../../flutter/fml/task_runner.cc
 FILE: ../../../flutter/fml/task_runner.h
 FILE: ../../../flutter/fml/task_source.cc
 FILE: ../../../flutter/fml/task_source.h
 FILE: ../../../flutter/fml/task_source_grade.h
-FILE: ../../../flutter/fml/task_source_unittests.cc
 FILE: ../../../flutter/fml/thread.cc
 FILE: ../../../flutter/fml/thread.h
-FILE: ../../../flutter/fml/thread_local.cc
-FILE: ../../../flutter/fml/thread_local.h
-FILE: ../../../flutter/fml/thread_local_unittests.cc
-FILE: ../../../flutter/fml/thread_unittests.cc
 FILE: ../../../flutter/fml/time/chrono_timestamp_provider.cc
 FILE: ../../../flutter/fml/time/chrono_timestamp_provider.h
 FILE: ../../../flutter/fml/time/time_delta.h
-FILE: ../../../flutter/fml/time/time_delta_unittest.cc
 FILE: ../../../flutter/fml/time/time_point.cc
 FILE: ../../../flutter/fml/time/time_point.h
-FILE: ../../../flutter/fml/time/time_point_unittest.cc
-FILE: ../../../flutter/fml/time/time_unittest.cc
 FILE: ../../../flutter/fml/time/timestamp_provider.h
 FILE: ../../../flutter/fml/trace_event.cc
 FILE: ../../../flutter/fml/trace_event.h
@@ -1088,11 +42347,21 @@ FILE: ../../../flutter/impeller/aiks/aiks_context.cc
 FILE: ../../../flutter/impeller/aiks/aiks_context.h
 FILE: ../../../flutter/impeller/aiks/aiks_playground.cc
 FILE: ../../../flutter/impeller/aiks/aiks_playground.h
-FILE: ../../../flutter/impeller/aiks/aiks_unittests.cc
+FILE: ../../../flutter/impeller/aiks/aiks_playground_inspector.cc
+FILE: ../../../flutter/impeller/aiks/aiks_playground_inspector.h
 FILE: ../../../flutter/impeller/aiks/canvas.cc
 FILE: ../../../flutter/impeller/aiks/canvas.h
+FILE: ../../../flutter/impeller/aiks/canvas_benchmarks.cc
+FILE: ../../../flutter/impeller/aiks/canvas_recorder.h
+FILE: ../../../flutter/impeller/aiks/canvas_type.h
+FILE: ../../../flutter/impeller/aiks/color_filter.cc
+FILE: ../../../flutter/impeller/aiks/color_filter.h
+FILE: ../../../flutter/impeller/aiks/color_source.cc
+FILE: ../../../flutter/impeller/aiks/color_source.h
 FILE: ../../../flutter/impeller/aiks/image.cc
 FILE: ../../../flutter/impeller/aiks/image.h
+FILE: ../../../flutter/impeller/aiks/image_filter.cc
+FILE: ../../../flutter/impeller/aiks/image_filter.h
 FILE: ../../../flutter/impeller/aiks/paint.cc
 FILE: ../../../flutter/impeller/aiks/paint.h
 FILE: ../../../flutter/impeller/aiks/paint_pass_delegate.cc
@@ -1101,34 +42370,15 @@ FILE: ../../../flutter/impeller/aiks/picture.cc
 FILE: ../../../flutter/impeller/aiks/picture.h
 FILE: ../../../flutter/impeller/aiks/picture_recorder.cc
 FILE: ../../../flutter/impeller/aiks/picture_recorder.h
-FILE: ../../../flutter/impeller/archivist/archivable.cc
-FILE: ../../../flutter/impeller/archivist/archivable.h
-FILE: ../../../flutter/impeller/archivist/archive.cc
-FILE: ../../../flutter/impeller/archivist/archive.h
-FILE: ../../../flutter/impeller/archivist/archive_class_registration.cc
-FILE: ../../../flutter/impeller/archivist/archive_class_registration.h
-FILE: ../../../flutter/impeller/archivist/archive_database.cc
-FILE: ../../../flutter/impeller/archivist/archive_database.h
-FILE: ../../../flutter/impeller/archivist/archive_location.cc
-FILE: ../../../flutter/impeller/archivist/archive_location.h
-FILE: ../../../flutter/impeller/archivist/archive_statement.cc
-FILE: ../../../flutter/impeller/archivist/archive_statement.h
-FILE: ../../../flutter/impeller/archivist/archive_transaction.cc
-FILE: ../../../flutter/impeller/archivist/archive_transaction.h
-FILE: ../../../flutter/impeller/archivist/archive_vector.cc
-FILE: ../../../flutter/impeller/archivist/archive_vector.h
-FILE: ../../../flutter/impeller/archivist/archivist_fixture.cc
-FILE: ../../../flutter/impeller/archivist/archivist_fixture.h
-FILE: ../../../flutter/impeller/archivist/archivist_unittests.cc
+FILE: ../../../flutter/impeller/aiks/trace_serializer.cc
+FILE: ../../../flutter/impeller/aiks/trace_serializer.h
 FILE: ../../../flutter/impeller/base/allocation.cc
 FILE: ../../../flutter/impeller/base/allocation.h
 FILE: ../../../flutter/impeller/base/backend_cast.h
-FILE: ../../../flutter/impeller/base/base_unittests.cc
 FILE: ../../../flutter/impeller/base/comparable.cc
 FILE: ../../../flutter/impeller/base/comparable.h
 FILE: ../../../flutter/impeller/base/config.h
-FILE: ../../../flutter/impeller/base/platform/darwin/work_queue_darwin.cc
-FILE: ../../../flutter/impeller/base/platform/darwin/work_queue_darwin.h
+FILE: ../../../flutter/impeller/base/mask.h
 FILE: ../../../flutter/impeller/base/promise.cc
 FILE: ../../../flutter/impeller/base/promise.h
 FILE: ../../../flutter/impeller/base/strings.cc
@@ -1137,22 +42387,11 @@ FILE: ../../../flutter/impeller/base/thread.cc
 FILE: ../../../flutter/impeller/base/thread.h
 FILE: ../../../flutter/impeller/base/thread_safety.cc
 FILE: ../../../flutter/impeller/base/thread_safety.h
+FILE: ../../../flutter/impeller/base/timing.h
 FILE: ../../../flutter/impeller/base/validation.cc
 FILE: ../../../flutter/impeller/base/validation.h
 FILE: ../../../flutter/impeller/base/version.cc
 FILE: ../../../flutter/impeller/base/version.h
-FILE: ../../../flutter/impeller/base/work_queue.cc
-FILE: ../../../flutter/impeller/base/work_queue.h
-FILE: ../../../flutter/impeller/base/work_queue_common.cc
-FILE: ../../../flutter/impeller/base/work_queue_common.h
-FILE: ../../../flutter/impeller/blobcat/blob.fbs
-FILE: ../../../flutter/impeller/blobcat/blob_library.cc
-FILE: ../../../flutter/impeller/blobcat/blob_library.h
-FILE: ../../../flutter/impeller/blobcat/blob_types.h
-FILE: ../../../flutter/impeller/blobcat/blob_writer.cc
-FILE: ../../../flutter/impeller/blobcat/blob_writer.h
-FILE: ../../../flutter/impeller/blobcat/blobcat_main.cc
-FILE: ../../../flutter/impeller/blobcat/blobcat_unittests.cc
 FILE: ../../../flutter/impeller/compiler/code_gen_template.h
 FILE: ../../../flutter/impeller/compiler/compiler.cc
 FILE: ../../../flutter/impeller/compiler/compiler.h
@@ -1160,7 +42399,8 @@ FILE: ../../../flutter/impeller/compiler/compiler_backend.cc
 FILE: ../../../flutter/impeller/compiler/compiler_backend.h
 FILE: ../../../flutter/impeller/compiler/compiler_test.cc
 FILE: ../../../flutter/impeller/compiler/compiler_test.h
-FILE: ../../../flutter/impeller/compiler/compiler_unittests.cc
+FILE: ../../../flutter/impeller/compiler/constants.cc
+FILE: ../../../flutter/impeller/compiler/constants.h
 FILE: ../../../flutter/impeller/compiler/impellerc_main.cc
 FILE: ../../../flutter/impeller/compiler/include_dir.h
 FILE: ../../../flutter/impeller/compiler/includer.cc
@@ -1170,78 +42410,98 @@ FILE: ../../../flutter/impeller/compiler/reflector.cc
 FILE: ../../../flutter/impeller/compiler/reflector.h
 FILE: ../../../flutter/impeller/compiler/runtime_stage_data.cc
 FILE: ../../../flutter/impeller/compiler/runtime_stage_data.h
+FILE: ../../../flutter/impeller/compiler/shader_bundle.cc
+FILE: ../../../flutter/impeller/compiler/shader_bundle.h
+FILE: ../../../flutter/impeller/compiler/shader_bundle_data.cc
+FILE: ../../../flutter/impeller/compiler/shader_bundle_data.h
 FILE: ../../../flutter/impeller/compiler/shader_lib/flutter/runtime_effect.glsl
 FILE: ../../../flutter/impeller/compiler/shader_lib/impeller/blending.glsl
 FILE: ../../../flutter/impeller/compiler/shader_lib/impeller/branching.glsl
 FILE: ../../../flutter/impeller/compiler/shader_lib/impeller/color.glsl
 FILE: ../../../flutter/impeller/compiler/shader_lib/impeller/constants.glsl
+FILE: ../../../flutter/impeller/compiler/shader_lib/impeller/conversions.glsl
+FILE: ../../../flutter/impeller/compiler/shader_lib/impeller/dithering.glsl
+FILE: ../../../flutter/impeller/compiler/shader_lib/impeller/external_texture_oes.glsl
 FILE: ../../../flutter/impeller/compiler/shader_lib/impeller/gaussian.glsl
 FILE: ../../../flutter/impeller/compiler/shader_lib/impeller/gradient.glsl
+FILE: ../../../flutter/impeller/compiler/shader_lib/impeller/path.glsl
+FILE: ../../../flutter/impeller/compiler/shader_lib/impeller/prefix_sum.glsl
 FILE: ../../../flutter/impeller/compiler/shader_lib/impeller/texture.glsl
+FILE: ../../../flutter/impeller/compiler/shader_lib/impeller/tile_mode.glsl
 FILE: ../../../flutter/impeller/compiler/shader_lib/impeller/transform.glsl
 FILE: ../../../flutter/impeller/compiler/shader_lib/impeller/types.glsl
 FILE: ../../../flutter/impeller/compiler/source_options.cc
 FILE: ../../../flutter/impeller/compiler/source_options.h
+FILE: ../../../flutter/impeller/compiler/spirv_compiler.cc
+FILE: ../../../flutter/impeller/compiler/spirv_compiler.h
 FILE: ../../../flutter/impeller/compiler/spirv_sksl.cc
 FILE: ../../../flutter/impeller/compiler/spirv_sksl.h
 FILE: ../../../flutter/impeller/compiler/switches.cc
 FILE: ../../../flutter/impeller/compiler/switches.h
-FILE: ../../../flutter/impeller/compiler/switches_unittests.cc
 FILE: ../../../flutter/impeller/compiler/types.cc
 FILE: ../../../flutter/impeller/compiler/types.h
+FILE: ../../../flutter/impeller/compiler/uniform_sorter.cc
+FILE: ../../../flutter/impeller/compiler/uniform_sorter.h
 FILE: ../../../flutter/impeller/compiler/utilities.cc
 FILE: ../../../flutter/impeller/compiler/utilities.h
-FILE: ../../../flutter/impeller/display_list/display_list_dispatcher.cc
-FILE: ../../../flutter/impeller/display_list/display_list_dispatcher.h
-FILE: ../../../flutter/impeller/display_list/display_list_image_impeller.cc
-FILE: ../../../flutter/impeller/display_list/display_list_image_impeller.h
-FILE: ../../../flutter/impeller/display_list/display_list_playground.cc
-FILE: ../../../flutter/impeller/display_list/display_list_playground.h
-FILE: ../../../flutter/impeller/display_list/display_list_unittests.cc
-FILE: ../../../flutter/impeller/display_list/display_list_vertices_geometry.cc
-FILE: ../../../flutter/impeller/display_list/display_list_vertices_geometry.h
+FILE: ../../../flutter/impeller/core/allocator.cc
+FILE: ../../../flutter/impeller/core/allocator.h
+FILE: ../../../flutter/impeller/core/buffer_view.cc
+FILE: ../../../flutter/impeller/core/buffer_view.h
+FILE: ../../../flutter/impeller/core/capture.cc
+FILE: ../../../flutter/impeller/core/capture.h
+FILE: ../../../flutter/impeller/core/device_buffer.cc
+FILE: ../../../flutter/impeller/core/device_buffer.h
+FILE: ../../../flutter/impeller/core/device_buffer_descriptor.cc
+FILE: ../../../flutter/impeller/core/device_buffer_descriptor.h
+FILE: ../../../flutter/impeller/core/formats.cc
+FILE: ../../../flutter/impeller/core/formats.h
+FILE: ../../../flutter/impeller/core/host_buffer.cc
+FILE: ../../../flutter/impeller/core/host_buffer.h
+FILE: ../../../flutter/impeller/core/platform.cc
+FILE: ../../../flutter/impeller/core/platform.h
+FILE: ../../../flutter/impeller/core/range.cc
+FILE: ../../../flutter/impeller/core/range.h
+FILE: ../../../flutter/impeller/core/resource_binder.cc
+FILE: ../../../flutter/impeller/core/resource_binder.h
+FILE: ../../../flutter/impeller/core/runtime_types.cc
+FILE: ../../../flutter/impeller/core/runtime_types.h
+FILE: ../../../flutter/impeller/core/sampler.cc
+FILE: ../../../flutter/impeller/core/sampler.h
+FILE: ../../../flutter/impeller/core/sampler_descriptor.cc
+FILE: ../../../flutter/impeller/core/sampler_descriptor.h
+FILE: ../../../flutter/impeller/core/shader_types.cc
+FILE: ../../../flutter/impeller/core/shader_types.h
+FILE: ../../../flutter/impeller/core/texture.cc
+FILE: ../../../flutter/impeller/core/texture.h
+FILE: ../../../flutter/impeller/core/texture_descriptor.cc
+FILE: ../../../flutter/impeller/core/texture_descriptor.h
+FILE: ../../../flutter/impeller/core/vertex_buffer.cc
+FILE: ../../../flutter/impeller/core/vertex_buffer.h
+FILE: ../../../flutter/impeller/display_list/dl_dispatcher.cc
+FILE: ../../../flutter/impeller/display_list/dl_dispatcher.h
+FILE: ../../../flutter/impeller/display_list/dl_image_impeller.cc
+FILE: ../../../flutter/impeller/display_list/dl_image_impeller.h
+FILE: ../../../flutter/impeller/display_list/dl_playground.cc
+FILE: ../../../flutter/impeller/display_list/dl_playground.h
+FILE: ../../../flutter/impeller/display_list/dl_vertices_geometry.cc
+FILE: ../../../flutter/impeller/display_list/dl_vertices_geometry.h
 FILE: ../../../flutter/impeller/display_list/nine_patch_converter.cc
 FILE: ../../../flutter/impeller/display_list/nine_patch_converter.h
-FILE: ../../../flutter/impeller/docs/assets/launch-app.png
-FILE: ../../../flutter/impeller/docs/assets/read_frame_captures/image1.png
-FILE: ../../../flutter/impeller/docs/assets/read_frame_captures/image10.png
-FILE: ../../../flutter/impeller/docs/assets/read_frame_captures/image11.png
-FILE: ../../../flutter/impeller/docs/assets/read_frame_captures/image12.png
-FILE: ../../../flutter/impeller/docs/assets/read_frame_captures/image13.png
-FILE: ../../../flutter/impeller/docs/assets/read_frame_captures/image14.png
-FILE: ../../../flutter/impeller/docs/assets/read_frame_captures/image15.png
-FILE: ../../../flutter/impeller/docs/assets/read_frame_captures/image16.png
-FILE: ../../../flutter/impeller/docs/assets/read_frame_captures/image17.png
-FILE: ../../../flutter/impeller/docs/assets/read_frame_captures/image18.png
-FILE: ../../../flutter/impeller/docs/assets/read_frame_captures/image2.png
-FILE: ../../../flutter/impeller/docs/assets/read_frame_captures/image3.png
-FILE: ../../../flutter/impeller/docs/assets/read_frame_captures/image4.png
-FILE: ../../../flutter/impeller/docs/assets/read_frame_captures/image5.png
-FILE: ../../../flutter/impeller/docs/assets/read_frame_captures/image6.png
-FILE: ../../../flutter/impeller/docs/assets/read_frame_captures/image7.png
-FILE: ../../../flutter/impeller/docs/assets/read_frame_captures/image8.png
-FILE: ../../../flutter/impeller/docs/assets/read_frame_captures/image9.png
-FILE: ../../../flutter/impeller/docs/assets/render-doc-capture.png
-FILE: ../../../flutter/impeller/docs/assets/shader_pipeline.png
-FILE: ../../../flutter/impeller/docs/assets/showcase.png
-FILE: ../../../flutter/impeller/docs/assets/xcode_frame_capture/image1.png
-FILE: ../../../flutter/impeller/docs/assets/xcode_frame_capture/image10.png
-FILE: ../../../flutter/impeller/docs/assets/xcode_frame_capture/image11.png
-FILE: ../../../flutter/impeller/docs/assets/xcode_frame_capture/image12.png
-FILE: ../../../flutter/impeller/docs/assets/xcode_frame_capture/image2.png
-FILE: ../../../flutter/impeller/docs/assets/xcode_frame_capture/image3.png
-FILE: ../../../flutter/impeller/docs/assets/xcode_frame_capture/image4.png
-FILE: ../../../flutter/impeller/docs/assets/xcode_frame_capture/image5.png
-FILE: ../../../flutter/impeller/docs/assets/xcode_frame_capture/image6.png
-FILE: ../../../flutter/impeller/docs/assets/xcode_frame_capture/image7.png
-FILE: ../../../flutter/impeller/docs/assets/xcode_frame_capture/image8.png
-FILE: ../../../flutter/impeller/docs/assets/xcode_frame_capture/image9.png
+FILE: ../../../flutter/impeller/display_list/skia_conversions.cc
+FILE: ../../../flutter/impeller/display_list/skia_conversions.h
+FILE: ../../../flutter/impeller/entity/contents/anonymous_contents.cc
+FILE: ../../../flutter/impeller/entity/contents/anonymous_contents.h
 FILE: ../../../flutter/impeller/entity/contents/atlas_contents.cc
 FILE: ../../../flutter/impeller/entity/contents/atlas_contents.h
+FILE: ../../../flutter/impeller/entity/contents/checkerboard_contents.cc
+FILE: ../../../flutter/impeller/entity/contents/checkerboard_contents.h
 FILE: ../../../flutter/impeller/entity/contents/clip_contents.cc
 FILE: ../../../flutter/impeller/entity/contents/clip_contents.h
 FILE: ../../../flutter/impeller/entity/contents/color_source_contents.cc
 FILE: ../../../flutter/impeller/entity/contents/color_source_contents.h
+FILE: ../../../flutter/impeller/entity/contents/conical_gradient_contents.cc
+FILE: ../../../flutter/impeller/entity/contents/conical_gradient_contents.h
 FILE: ../../../flutter/impeller/entity/contents/content_context.cc
 FILE: ../../../flutter/impeller/entity/contents/content_context.h
 FILE: ../../../flutter/impeller/entity/contents/contents.cc
@@ -1264,7 +42524,8 @@ FILE: ../../../flutter/impeller/entity/contents/filters/inputs/filter_contents_f
 FILE: ../../../flutter/impeller/entity/contents/filters/inputs/filter_contents_filter_input.h
 FILE: ../../../flutter/impeller/entity/contents/filters/inputs/filter_input.cc
 FILE: ../../../flutter/impeller/entity/contents/filters/inputs/filter_input.h
-FILE: ../../../flutter/impeller/entity/contents/filters/inputs/filter_input_unittests.cc
+FILE: ../../../flutter/impeller/entity/contents/filters/inputs/placeholder_filter_input.cc
+FILE: ../../../flutter/impeller/entity/contents/filters/inputs/placeholder_filter_input.h
 FILE: ../../../flutter/impeller/entity/contents/filters/inputs/texture_filter_input.cc
 FILE: ../../../flutter/impeller/entity/contents/filters/inputs/texture_filter_input.h
 FILE: ../../../flutter/impeller/entity/contents/filters/linear_to_srgb_filter_contents.cc
@@ -1279,18 +42540,22 @@ FILE: ../../../flutter/impeller/entity/contents/filters/srgb_to_linear_filter_co
 FILE: ../../../flutter/impeller/entity/contents/filters/srgb_to_linear_filter_contents.h
 FILE: ../../../flutter/impeller/entity/contents/filters/yuv_to_rgb_filter_contents.cc
 FILE: ../../../flutter/impeller/entity/contents/filters/yuv_to_rgb_filter_contents.h
+FILE: ../../../flutter/impeller/entity/contents/framebuffer_blend_contents.cc
+FILE: ../../../flutter/impeller/entity/contents/framebuffer_blend_contents.h
 FILE: ../../../flutter/impeller/entity/contents/gradient_generator.cc
 FILE: ../../../flutter/impeller/entity/contents/gradient_generator.h
 FILE: ../../../flutter/impeller/entity/contents/linear_gradient_contents.cc
 FILE: ../../../flutter/impeller/entity/contents/linear_gradient_contents.h
 FILE: ../../../flutter/impeller/entity/contents/radial_gradient_contents.cc
 FILE: ../../../flutter/impeller/entity/contents/radial_gradient_contents.h
-FILE: ../../../flutter/impeller/entity/contents/rrect_shadow_contents.cc
-FILE: ../../../flutter/impeller/entity/contents/rrect_shadow_contents.h
 FILE: ../../../flutter/impeller/entity/contents/runtime_effect_contents.cc
 FILE: ../../../flutter/impeller/entity/contents/runtime_effect_contents.h
+FILE: ../../../flutter/impeller/entity/contents/scene_contents.cc
+FILE: ../../../flutter/impeller/entity/contents/scene_contents.h
 FILE: ../../../flutter/impeller/entity/contents/solid_color_contents.cc
 FILE: ../../../flutter/impeller/entity/contents/solid_color_contents.h
+FILE: ../../../flutter/impeller/entity/contents/solid_rrect_blur_contents.cc
+FILE: ../../../flutter/impeller/entity/contents/solid_rrect_blur_contents.h
 FILE: ../../../flutter/impeller/entity/contents/sweep_gradient_contents.cc
 FILE: ../../../flutter/impeller/entity/contents/sweep_gradient_contents.h
 FILE: ../../../flutter/impeller/entity/contents/text_contents.cc
@@ -1305,48 +42570,71 @@ FILE: ../../../flutter/impeller/entity/entity.cc
 FILE: ../../../flutter/impeller/entity/entity.h
 FILE: ../../../flutter/impeller/entity/entity_pass.cc
 FILE: ../../../flutter/impeller/entity/entity_pass.h
+FILE: ../../../flutter/impeller/entity/entity_pass_clip_stack.cc
+FILE: ../../../flutter/impeller/entity/entity_pass_clip_stack.h
 FILE: ../../../flutter/impeller/entity/entity_pass_delegate.cc
 FILE: ../../../flutter/impeller/entity/entity_pass_delegate.h
+FILE: ../../../flutter/impeller/entity/entity_pass_target.cc
+FILE: ../../../flutter/impeller/entity/entity_pass_target.h
 FILE: ../../../flutter/impeller/entity/entity_playground.cc
 FILE: ../../../flutter/impeller/entity/entity_playground.h
-FILE: ../../../flutter/impeller/entity/entity_unittests.cc
-FILE: ../../../flutter/impeller/entity/geometry.cc
-FILE: ../../../flutter/impeller/entity/geometry.h
+FILE: ../../../flutter/impeller/entity/geometry/circle_geometry.cc
+FILE: ../../../flutter/impeller/entity/geometry/circle_geometry.h
+FILE: ../../../flutter/impeller/entity/geometry/cover_geometry.cc
+FILE: ../../../flutter/impeller/entity/geometry/cover_geometry.h
+FILE: ../../../flutter/impeller/entity/geometry/ellipse_geometry.cc
+FILE: ../../../flutter/impeller/entity/geometry/ellipse_geometry.h
+FILE: ../../../flutter/impeller/entity/geometry/fill_path_geometry.cc
+FILE: ../../../flutter/impeller/entity/geometry/fill_path_geometry.h
+FILE: ../../../flutter/impeller/entity/geometry/geometry.cc
+FILE: ../../../flutter/impeller/entity/geometry/geometry.h
+FILE: ../../../flutter/impeller/entity/geometry/line_geometry.cc
+FILE: ../../../flutter/impeller/entity/geometry/line_geometry.h
+FILE: ../../../flutter/impeller/entity/geometry/point_field_geometry.cc
+FILE: ../../../flutter/impeller/entity/geometry/point_field_geometry.h
+FILE: ../../../flutter/impeller/entity/geometry/rect_geometry.cc
+FILE: ../../../flutter/impeller/entity/geometry/rect_geometry.h
+FILE: ../../../flutter/impeller/entity/geometry/round_rect_geometry.cc
+FILE: ../../../flutter/impeller/entity/geometry/round_rect_geometry.h
+FILE: ../../../flutter/impeller/entity/geometry/stroke_path_geometry.cc
+FILE: ../../../flutter/impeller/entity/geometry/stroke_path_geometry.h
+FILE: ../../../flutter/impeller/entity/geometry/vertices_geometry.cc
+FILE: ../../../flutter/impeller/entity/geometry/vertices_geometry.h
 FILE: ../../../flutter/impeller/entity/inline_pass_context.cc
 FILE: ../../../flutter/impeller/entity/inline_pass_context.h
-FILE: ../../../flutter/impeller/entity/shaders/atlas_fill.frag
-FILE: ../../../flutter/impeller/entity/shaders/atlas_fill.vert
-FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend.glsl
+FILE: ../../../flutter/impeller/entity/render_target_cache.cc
+FILE: ../../../flutter/impeller/entity/render_target_cache.h
+FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend.frag
 FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend.vert
-FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_color.frag
-FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_colorburn.frag
-FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_colordodge.frag
-FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_darken.frag
-FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_difference.frag
-FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_exclusion.frag
-FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_hardlight.frag
-FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_hue.frag
-FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_lighten.frag
-FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_luminosity.frag
-FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_multiply.frag
-FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_overlay.frag
-FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_saturation.frag
-FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_screen.frag
-FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_softlight.frag
 FILE: ../../../flutter/impeller/entity/shaders/blending/blend.frag
 FILE: ../../../flutter/impeller/entity/shaders/blending/blend.vert
+FILE: ../../../flutter/impeller/entity/shaders/blending/blend_select.glsl
+FILE: ../../../flutter/impeller/entity/shaders/blending/framebuffer_blend.frag
+FILE: ../../../flutter/impeller/entity/shaders/blending/framebuffer_blend.vert
+FILE: ../../../flutter/impeller/entity/shaders/blending/porter_duff_blend.frag
+FILE: ../../../flutter/impeller/entity/shaders/blending/porter_duff_blend.vert
 FILE: ../../../flutter/impeller/entity/shaders/border_mask_blur.frag
 FILE: ../../../flutter/impeller/entity/shaders/border_mask_blur.vert
+FILE: ../../../flutter/impeller/entity/shaders/clip.frag
+FILE: ../../../flutter/impeller/entity/shaders/clip.vert
 FILE: ../../../flutter/impeller/entity/shaders/color_matrix_color_filter.frag
 FILE: ../../../flutter/impeller/entity/shaders/color_matrix_color_filter.vert
-FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur.frag
-FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur.glsl
-FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur.vert
-FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur_decal.frag
+FILE: ../../../flutter/impeller/entity/shaders/conical_gradient_fill.frag
+FILE: ../../../flutter/impeller/entity/shaders/conical_gradient_ssbo_fill.frag
+FILE: ../../../flutter/impeller/entity/shaders/debug/checkerboard.frag
+FILE: ../../../flutter/impeller/entity/shaders/debug/checkerboard.vert
+FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur/gaussian_blur.glsl
+FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur/gaussian_blur.vert
+FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur/gaussian_blur_noalpha_decal.frag
+FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur/gaussian_blur_noalpha_nodecal.frag
+FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur/kernel.glsl
+FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur/kernel_decal.frag
+FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur/kernel_nodecal.frag
+FILE: ../../../flutter/impeller/entity/shaders/geometry/points.comp
+FILE: ../../../flutter/impeller/entity/shaders/geometry/uv.comp
 FILE: ../../../flutter/impeller/entity/shaders/glyph_atlas.frag
 FILE: ../../../flutter/impeller/entity/shaders/glyph_atlas.vert
-FILE: ../../../flutter/impeller/entity/shaders/glyph_atlas_sdf.frag
-FILE: ../../../flutter/impeller/entity/shaders/glyph_atlas_sdf.vert
+FILE: ../../../flutter/impeller/entity/shaders/glyph_atlas_color.frag
 FILE: ../../../flutter/impeller/entity/shaders/gradient_fill.vert
 FILE: ../../../flutter/impeller/entity/shaders/linear_gradient_fill.frag
 FILE: ../../../flutter/impeller/entity/shaders/linear_gradient_ssbo_fill.frag
@@ -1354,9 +42642,7 @@ FILE: ../../../flutter/impeller/entity/shaders/linear_to_srgb_filter.frag
 FILE: ../../../flutter/impeller/entity/shaders/linear_to_srgb_filter.vert
 FILE: ../../../flutter/impeller/entity/shaders/morphology_filter.frag
 FILE: ../../../flutter/impeller/entity/shaders/morphology_filter.vert
-FILE: ../../../flutter/impeller/entity/shaders/position.vert
 FILE: ../../../flutter/impeller/entity/shaders/position_color.vert
-FILE: ../../../flutter/impeller/entity/shaders/position_uv.vert
 FILE: ../../../flutter/impeller/entity/shaders/radial_gradient_fill.frag
 FILE: ../../../flutter/impeller/entity/shaders/radial_gradient_ssbo_fill.frag
 FILE: ../../../flutter/impeller/entity/shaders/rrect_blur.frag
@@ -1370,8 +42656,10 @@ FILE: ../../../flutter/impeller/entity/shaders/sweep_gradient_fill.frag
 FILE: ../../../flutter/impeller/entity/shaders/sweep_gradient_ssbo_fill.frag
 FILE: ../../../flutter/impeller/entity/shaders/texture_fill.frag
 FILE: ../../../flutter/impeller/entity/shaders/texture_fill.vert
+FILE: ../../../flutter/impeller/entity/shaders/texture_fill_external.frag
+FILE: ../../../flutter/impeller/entity/shaders/texture_fill_strict_src.frag
 FILE: ../../../flutter/impeller/entity/shaders/tiled_texture_fill.frag
-FILE: ../../../flutter/impeller/entity/shaders/tiled_texture_fill.vert
+FILE: ../../../flutter/impeller/entity/shaders/tiled_texture_fill_external.frag
 FILE: ../../../flutter/impeller/entity/shaders/vertices.frag
 FILE: ../../../flutter/impeller/entity/shaders/yuv_to_rgb_filter.frag
 FILE: ../../../flutter/impeller/entity/shaders/yuv_to_rgb_filter.vert
@@ -1379,11 +42667,11 @@ FILE: ../../../flutter/impeller/geometry/color.cc
 FILE: ../../../flutter/impeller/geometry/color.h
 FILE: ../../../flutter/impeller/geometry/constants.cc
 FILE: ../../../flutter/impeller/geometry/constants.h
+FILE: ../../../flutter/impeller/geometry/geometry_asserts.h
 FILE: ../../../flutter/impeller/geometry/geometry_benchmarks.cc
-FILE: ../../../flutter/impeller/geometry/geometry_unittests.cc
-FILE: ../../../flutter/impeller/geometry/geometry_unittests.h
 FILE: ../../../flutter/impeller/geometry/gradient.cc
 FILE: ../../../flutter/impeller/geometry/gradient.h
+FILE: ../../../flutter/impeller/geometry/half.h
 FILE: ../../../flutter/impeller/geometry/matrix.cc
 FILE: ../../../flutter/impeller/geometry/matrix.h
 FILE: ../../../flutter/impeller/geometry/matrix_decomposition.cc
@@ -1400,6 +42688,7 @@ FILE: ../../../flutter/impeller/geometry/quaternion.cc
 FILE: ../../../flutter/impeller/geometry/quaternion.h
 FILE: ../../../flutter/impeller/geometry/rect.cc
 FILE: ../../../flutter/impeller/geometry/rect.h
+FILE: ../../../flutter/impeller/geometry/saturated_math.h
 FILE: ../../../flutter/impeller/geometry/scalar.h
 FILE: ../../../flutter/impeller/geometry/shear.cc
 FILE: ../../../flutter/impeller/geometry/shear.h
@@ -1407,18 +42696,29 @@ FILE: ../../../flutter/impeller/geometry/sigma.cc
 FILE: ../../../flutter/impeller/geometry/sigma.h
 FILE: ../../../flutter/impeller/geometry/size.cc
 FILE: ../../../flutter/impeller/geometry/size.h
+FILE: ../../../flutter/impeller/geometry/trig.cc
+FILE: ../../../flutter/impeller/geometry/trig.h
 FILE: ../../../flutter/impeller/geometry/type_traits.cc
 FILE: ../../../flutter/impeller/geometry/type_traits.h
 FILE: ../../../flutter/impeller/geometry/vector.cc
 FILE: ../../../flutter/impeller/geometry/vector.h
-FILE: ../../../flutter/impeller/image/backends/skia/compressed_image_skia.cc
-FILE: ../../../flutter/impeller/image/backends/skia/compressed_image_skia.h
-FILE: ../../../flutter/impeller/image/compressed_image.cc
-FILE: ../../../flutter/impeller/image/compressed_image.h
-FILE: ../../../flutter/impeller/image/decompressed_image.cc
-FILE: ../../../flutter/impeller/image/decompressed_image.h
-FILE: ../../../flutter/impeller/renderer/allocator.cc
-FILE: ../../../flutter/impeller/renderer/allocator.h
+FILE: ../../../flutter/impeller/golden_tests/golden_digest.cc
+FILE: ../../../flutter/impeller/golden_tests/golden_digest.h
+FILE: ../../../flutter/impeller/golden_tests/golden_playground_test.h
+FILE: ../../../flutter/impeller/golden_tests/golden_playground_test_mac.cc
+FILE: ../../../flutter/impeller/golden_tests/golden_playground_test_stub.cc
+FILE: ../../../flutter/impeller/golden_tests/golden_tests.cc
+FILE: ../../../flutter/impeller/golden_tests/main.cc
+FILE: ../../../flutter/impeller/golden_tests/metal_screenshot.h
+FILE: ../../../flutter/impeller/golden_tests/metal_screenshot.mm
+FILE: ../../../flutter/impeller/golden_tests/metal_screenshotter.h
+FILE: ../../../flutter/impeller/golden_tests/metal_screenshotter.mm
+FILE: ../../../flutter/impeller/golden_tests/screenshot.h
+FILE: ../../../flutter/impeller/golden_tests/screenshotter.h
+FILE: ../../../flutter/impeller/golden_tests/vulkan_screenshotter.h
+FILE: ../../../flutter/impeller/golden_tests/vulkan_screenshotter.mm
+FILE: ../../../flutter/impeller/golden_tests/working_directory.cc
+FILE: ../../../flutter/impeller/golden_tests/working_directory.h
 FILE: ../../../flutter/impeller/renderer/backend/gles/allocator_gles.cc
 FILE: ../../../flutter/impeller/renderer/backend/gles/allocator_gles.h
 FILE: ../../../flutter/impeller/renderer/backend/gles/blit_command_gles.cc
@@ -1440,6 +42740,8 @@ FILE: ../../../flutter/impeller/renderer/backend/gles/device_buffer_gles.h
 FILE: ../../../flutter/impeller/renderer/backend/gles/formats_gles.cc
 FILE: ../../../flutter/impeller/renderer/backend/gles/formats_gles.h
 FILE: ../../../flutter/impeller/renderer/backend/gles/gles.h
+FILE: ../../../flutter/impeller/renderer/backend/gles/gpu_tracer_gles.cc
+FILE: ../../../flutter/impeller/renderer/backend/gles/gpu_tracer_gles.h
 FILE: ../../../flutter/impeller/renderer/backend/gles/handle_gles.cc
 FILE: ../../../flutter/impeller/renderer/backend/gles/handle_gles.h
 FILE: ../../../flutter/impeller/renderer/backend/gles/pipeline_gles.cc
@@ -1472,6 +42774,8 @@ FILE: ../../../flutter/impeller/renderer/backend/metal/blit_pass_mtl.h
 FILE: ../../../flutter/impeller/renderer/backend/metal/blit_pass_mtl.mm
 FILE: ../../../flutter/impeller/renderer/backend/metal/command_buffer_mtl.h
 FILE: ../../../flutter/impeller/renderer/backend/metal/command_buffer_mtl.mm
+FILE: ../../../flutter/impeller/renderer/backend/metal/compute_pass_bindings_cache_mtl.h
+FILE: ../../../flutter/impeller/renderer/backend/metal/compute_pass_bindings_cache_mtl.mm
 FILE: ../../../flutter/impeller/renderer/backend/metal/compute_pass_mtl.h
 FILE: ../../../flutter/impeller/renderer/backend/metal/compute_pass_mtl.mm
 FILE: ../../../flutter/impeller/renderer/backend/metal/compute_pipeline_mtl.h
@@ -1484,6 +42788,10 @@ FILE: ../../../flutter/impeller/renderer/backend/metal/formats_mtl.h
 FILE: ../../../flutter/impeller/renderer/backend/metal/formats_mtl.mm
 FILE: ../../../flutter/impeller/renderer/backend/metal/gpu_tracer_mtl.h
 FILE: ../../../flutter/impeller/renderer/backend/metal/gpu_tracer_mtl.mm
+FILE: ../../../flutter/impeller/renderer/backend/metal/lazy_drawable_holder.h
+FILE: ../../../flutter/impeller/renderer/backend/metal/lazy_drawable_holder.mm
+FILE: ../../../flutter/impeller/renderer/backend/metal/pass_bindings_cache_mtl.h
+FILE: ../../../flutter/impeller/renderer/backend/metal/pass_bindings_cache_mtl.mm
 FILE: ../../../flutter/impeller/renderer/backend/metal/pipeline_library_mtl.h
 FILE: ../../../flutter/impeller/renderer/backend/metal/pipeline_library_mtl.mm
 FILE: ../../../flutter/impeller/renderer/backend/metal/pipeline_mtl.h
@@ -1502,36 +42810,66 @@ FILE: ../../../flutter/impeller/renderer/backend/metal/surface_mtl.h
 FILE: ../../../flutter/impeller/renderer/backend/metal/surface_mtl.mm
 FILE: ../../../flutter/impeller/renderer/backend/metal/texture_mtl.h
 FILE: ../../../flutter/impeller/renderer/backend/metal/texture_mtl.mm
+FILE: ../../../flutter/impeller/renderer/backend/metal/texture_wrapper_mtl.h
+FILE: ../../../flutter/impeller/renderer/backend/metal/texture_wrapper_mtl.mm
 FILE: ../../../flutter/impeller/renderer/backend/metal/vertex_descriptor_mtl.h
 FILE: ../../../flutter/impeller/renderer/backend/metal/vertex_descriptor_mtl.mm
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/allocator_vk.cc
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/allocator_vk.h
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/android/ahb_texture_source_vk.cc
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/android/ahb_texture_source_vk.h
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/barrier_vk.cc
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/barrier_vk.h
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/blit_command_vk.cc
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/blit_command_vk.h
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/blit_pass_vk.cc
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/blit_pass_vk.h
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/capabilities_vk.cc
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/capabilities_vk.h
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/command_buffer_vk.cc
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/command_buffer_vk.h
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/command_encoder_vk.cc
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/command_encoder_vk.h
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/command_pool_vk.cc
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/command_pool_vk.h
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/command_queue_vk.cc
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/command_queue_vk.h
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/compute_pass_vk.cc
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/compute_pass_vk.h
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/compute_pipeline_vk.cc
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/compute_pipeline_vk.h
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/context_vk.cc
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/context_vk.h
-FILE: ../../../flutter/impeller/renderer/backend/vulkan/deletion_queue_vk.cc
-FILE: ../../../flutter/impeller/renderer/backend/vulkan/deletion_queue_vk.h
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/debug_report_vk.cc
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/debug_report_vk.h
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/descriptor_pool_vk.cc
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/descriptor_pool_vk.h
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/device_buffer_vk.cc
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/device_buffer_vk.h
-FILE: ../../../flutter/impeller/renderer/backend/vulkan/fenced_command_buffer_vk.cc
-FILE: ../../../flutter/impeller/renderer/backend/vulkan/fenced_command_buffer_vk.h
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/device_holder_vk.h
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/driver_info_vk.cc
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/driver_info_vk.h
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/fence_waiter_vk.cc
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/fence_waiter_vk.h
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/formats_vk.cc
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/formats_vk.h
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/gpu_tracer_vk.cc
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/gpu_tracer_vk.h
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/limits_vk.h
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/pipeline_cache_vk.cc
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/pipeline_cache_vk.h
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/pipeline_library_vk.cc
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/pipeline_library_vk.h
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/pipeline_vk.cc
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/pipeline_vk.h
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/queue_vk.cc
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/queue_vk.h
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/render_pass_builder_vk.cc
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/render_pass_builder_vk.h
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/render_pass_vk.cc
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/render_pass_vk.h
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/resource_manager_vk.cc
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/resource_manager_vk.h
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/sampler_library_vk.cc
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/sampler_library_vk.h
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/sampler_vk.cc
@@ -1540,80 +42878,72 @@ FILE: ../../../flutter/impeller/renderer/backend/vulkan/shader_function_vk.cc
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/shader_function_vk.h
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/shader_library_vk.cc
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/shader_library_vk.h
-FILE: ../../../flutter/impeller/renderer/backend/vulkan/surface_producer_vk.cc
-FILE: ../../../flutter/impeller/renderer/backend/vulkan/surface_producer_vk.h
-FILE: ../../../flutter/impeller/renderer/backend/vulkan/surface_vk.cc
-FILE: ../../../flutter/impeller/renderer/backend/vulkan/surface_vk.h
-FILE: ../../../flutter/impeller/renderer/backend/vulkan/swapchain_details_vk.cc
-FILE: ../../../flutter/impeller/renderer/backend/vulkan/swapchain_details_vk.h
-FILE: ../../../flutter/impeller/renderer/backend/vulkan/swapchain_vk.cc
-FILE: ../../../flutter/impeller/renderer/backend/vulkan/swapchain_vk.h
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/shared_object_vk.cc
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/shared_object_vk.h
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/surface_context_vk.cc
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/surface_context_vk.h
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/khr/khr_surface_vk.cc
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/khr/khr_surface_vk.h
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_image_vk.cc
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_image_vk.h
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_impl_vk.cc
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_impl_vk.h
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_vk.cc
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_vk.h
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/texture_source_vk.cc
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/texture_source_vk.h
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/texture_vk.cc
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/texture_vk.h
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/tracked_objects_vk.cc
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/tracked_objects_vk.h
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/vertex_descriptor_vk.cc
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/vertex_descriptor_vk.h
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/vk.h
-FILE: ../../../flutter/impeller/renderer/backend_features.h
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/vma.cc
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/vma.h
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/yuv_conversion_library_vk.cc
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/yuv_conversion_library_vk.h
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/yuv_conversion_vk.cc
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/yuv_conversion_vk.h
 FILE: ../../../flutter/impeller/renderer/blit_command.cc
 FILE: ../../../flutter/impeller/renderer/blit_command.h
 FILE: ../../../flutter/impeller/renderer/blit_pass.cc
 FILE: ../../../flutter/impeller/renderer/blit_pass.h
-FILE: ../../../flutter/impeller/renderer/buffer.cc
-FILE: ../../../flutter/impeller/renderer/buffer.h
-FILE: ../../../flutter/impeller/renderer/buffer_view.cc
-FILE: ../../../flutter/impeller/renderer/buffer_view.h
+FILE: ../../../flutter/impeller/renderer/capabilities.cc
+FILE: ../../../flutter/impeller/renderer/capabilities.h
 FILE: ../../../flutter/impeller/renderer/command.cc
 FILE: ../../../flutter/impeller/renderer/command.h
 FILE: ../../../flutter/impeller/renderer/command_buffer.cc
 FILE: ../../../flutter/impeller/renderer/command_buffer.h
-FILE: ../../../flutter/impeller/renderer/compute_command.cc
-FILE: ../../../flutter/impeller/renderer/compute_command.h
+FILE: ../../../flutter/impeller/renderer/command_queue.cc
+FILE: ../../../flutter/impeller/renderer/command_queue.h
 FILE: ../../../flutter/impeller/renderer/compute_pass.cc
 FILE: ../../../flutter/impeller/renderer/compute_pass.h
 FILE: ../../../flutter/impeller/renderer/compute_pipeline_builder.cc
 FILE: ../../../flutter/impeller/renderer/compute_pipeline_builder.h
 FILE: ../../../flutter/impeller/renderer/compute_pipeline_descriptor.cc
 FILE: ../../../flutter/impeller/renderer/compute_pipeline_descriptor.h
-FILE: ../../../flutter/impeller/renderer/compute_unittests.cc
+FILE: ../../../flutter/impeller/renderer/compute_tessellator.cc
+FILE: ../../../flutter/impeller/renderer/compute_tessellator.h
 FILE: ../../../flutter/impeller/renderer/context.cc
 FILE: ../../../flutter/impeller/renderer/context.h
-FILE: ../../../flutter/impeller/renderer/descriptor_set_layout.h
-FILE: ../../../flutter/impeller/renderer/device_buffer.cc
-FILE: ../../../flutter/impeller/renderer/device_buffer.h
-FILE: ../../../flutter/impeller/renderer/device_buffer_descriptor.cc
-FILE: ../../../flutter/impeller/renderer/device_buffer_descriptor.h
-FILE: ../../../flutter/impeller/renderer/device_buffer_unittests.cc
-FILE: ../../../flutter/impeller/renderer/formats.cc
-FILE: ../../../flutter/impeller/renderer/formats.h
-FILE: ../../../flutter/impeller/renderer/gpu_tracer.cc
-FILE: ../../../flutter/impeller/renderer/gpu_tracer.h
-FILE: ../../../flutter/impeller/renderer/host_buffer.cc
-FILE: ../../../flutter/impeller/renderer/host_buffer.h
-FILE: ../../../flutter/impeller/renderer/host_buffer_unittests.cc
+FILE: ../../../flutter/impeller/renderer/path_polyline.comp
 FILE: ../../../flutter/impeller/renderer/pipeline.cc
 FILE: ../../../flutter/impeller/renderer/pipeline.h
 FILE: ../../../flutter/impeller/renderer/pipeline_builder.cc
 FILE: ../../../flutter/impeller/renderer/pipeline_builder.h
 FILE: ../../../flutter/impeller/renderer/pipeline_descriptor.cc
 FILE: ../../../flutter/impeller/renderer/pipeline_descriptor.h
-FILE: ../../../flutter/impeller/renderer/pipeline_descriptor_unittests.cc
 FILE: ../../../flutter/impeller/renderer/pipeline_library.cc
 FILE: ../../../flutter/impeller/renderer/pipeline_library.h
-FILE: ../../../flutter/impeller/renderer/platform.cc
-FILE: ../../../flutter/impeller/renderer/platform.h
-FILE: ../../../flutter/impeller/renderer/range.cc
-FILE: ../../../flutter/impeller/renderer/range.h
+FILE: ../../../flutter/impeller/renderer/pool.h
+FILE: ../../../flutter/impeller/renderer/prefix_sum_test.comp
 FILE: ../../../flutter/impeller/renderer/render_pass.cc
 FILE: ../../../flutter/impeller/renderer/render_pass.h
 FILE: ../../../flutter/impeller/renderer/render_target.cc
 FILE: ../../../flutter/impeller/renderer/render_target.h
 FILE: ../../../flutter/impeller/renderer/renderer.cc
 FILE: ../../../flutter/impeller/renderer/renderer.h
-FILE: ../../../flutter/impeller/renderer/renderer_unittests.cc
-FILE: ../../../flutter/impeller/renderer/sampler.cc
-FILE: ../../../flutter/impeller/renderer/sampler.h
-FILE: ../../../flutter/impeller/renderer/sampler_descriptor.cc
-FILE: ../../../flutter/impeller/renderer/sampler_descriptor.h
 FILE: ../../../flutter/impeller/renderer/sampler_library.cc
 FILE: ../../../flutter/impeller/renderer/sampler_library.h
 FILE: ../../../flutter/impeller/renderer/shader_function.cc
@@ -1622,18 +42952,14 @@ FILE: ../../../flutter/impeller/renderer/shader_key.cc
 FILE: ../../../flutter/impeller/renderer/shader_key.h
 FILE: ../../../flutter/impeller/renderer/shader_library.cc
 FILE: ../../../flutter/impeller/renderer/shader_library.h
-FILE: ../../../flutter/impeller/renderer/shader_types.cc
-FILE: ../../../flutter/impeller/renderer/shader_types.h
 FILE: ../../../flutter/impeller/renderer/snapshot.cc
 FILE: ../../../flutter/impeller/renderer/snapshot.h
+FILE: ../../../flutter/impeller/renderer/stroke.comp
 FILE: ../../../flutter/impeller/renderer/surface.cc
 FILE: ../../../flutter/impeller/renderer/surface.h
-FILE: ../../../flutter/impeller/renderer/texture.cc
-FILE: ../../../flutter/impeller/renderer/texture.h
-FILE: ../../../flutter/impeller/renderer/texture_descriptor.cc
-FILE: ../../../flutter/impeller/renderer/texture_descriptor.h
-FILE: ../../../flutter/impeller/renderer/vertex_buffer.cc
-FILE: ../../../flutter/impeller/renderer/vertex_buffer.h
+FILE: ../../../flutter/impeller/renderer/texture_mipmap.cc
+FILE: ../../../flutter/impeller/renderer/texture_mipmap.h
+FILE: ../../../flutter/impeller/renderer/threadgroup_sizing_test.comp
 FILE: ../../../flutter/impeller/renderer/vertex_buffer_builder.cc
 FILE: ../../../flutter/impeller/renderer/vertex_buffer_builder.h
 FILE: ../../../flutter/impeller/renderer/vertex_descriptor.cc
@@ -1643,34 +42969,79 @@ FILE: ../../../flutter/impeller/runtime_stage/runtime_stage.fbs
 FILE: ../../../flutter/impeller/runtime_stage/runtime_stage.h
 FILE: ../../../flutter/impeller/runtime_stage/runtime_stage_playground.cc
 FILE: ../../../flutter/impeller/runtime_stage/runtime_stage_playground.h
-FILE: ../../../flutter/impeller/runtime_stage/runtime_stage_unittests.cc
-FILE: ../../../flutter/impeller/runtime_stage/runtime_types.cc
-FILE: ../../../flutter/impeller/runtime_stage/runtime_types.h
+FILE: ../../../flutter/impeller/runtime_stage/runtime_stage_types.fbs
+FILE: ../../../flutter/impeller/scene/animation/animation.cc
+FILE: ../../../flutter/impeller/scene/animation/animation.h
+FILE: ../../../flutter/impeller/scene/animation/animation_clip.cc
+FILE: ../../../flutter/impeller/scene/animation/animation_clip.h
+FILE: ../../../flutter/impeller/scene/animation/animation_player.cc
+FILE: ../../../flutter/impeller/scene/animation/animation_player.h
+FILE: ../../../flutter/impeller/scene/animation/animation_transforms.h
+FILE: ../../../flutter/impeller/scene/animation/property_resolver.cc
+FILE: ../../../flutter/impeller/scene/animation/property_resolver.h
 FILE: ../../../flutter/impeller/scene/camera.cc
 FILE: ../../../flutter/impeller/scene/camera.h
 FILE: ../../../flutter/impeller/scene/geometry.cc
 FILE: ../../../flutter/impeller/scene/geometry.h
+FILE: ../../../flutter/impeller/scene/importer/conversions.cc
+FILE: ../../../flutter/impeller/scene/importer/conversions.h
+FILE: ../../../flutter/impeller/scene/importer/importer.h
+FILE: ../../../flutter/impeller/scene/importer/importer_gltf.cc
+FILE: ../../../flutter/impeller/scene/importer/scene.fbs
+FILE: ../../../flutter/impeller/scene/importer/scenec_main.cc
+FILE: ../../../flutter/impeller/scene/importer/switches.cc
+FILE: ../../../flutter/impeller/scene/importer/switches.h
+FILE: ../../../flutter/impeller/scene/importer/types.h
+FILE: ../../../flutter/impeller/scene/importer/vertices_builder.cc
+FILE: ../../../flutter/impeller/scene/importer/vertices_builder.h
 FILE: ../../../flutter/impeller/scene/material.cc
 FILE: ../../../flutter/impeller/scene/material.h
+FILE: ../../../flutter/impeller/scene/mesh.cc
+FILE: ../../../flutter/impeller/scene/mesh.h
+FILE: ../../../flutter/impeller/scene/node.cc
+FILE: ../../../flutter/impeller/scene/node.h
+FILE: ../../../flutter/impeller/scene/pipeline_key.h
 FILE: ../../../flutter/impeller/scene/scene.cc
 FILE: ../../../flutter/impeller/scene/scene.h
 FILE: ../../../flutter/impeller/scene/scene_context.cc
 FILE: ../../../flutter/impeller/scene/scene_context.h
 FILE: ../../../flutter/impeller/scene/scene_encoder.cc
 FILE: ../../../flutter/impeller/scene/scene_encoder.h
-FILE: ../../../flutter/impeller/scene/scene_entity.cc
-FILE: ../../../flutter/impeller/scene/scene_entity.h
-FILE: ../../../flutter/impeller/scene/scene_unittests.cc
-FILE: ../../../flutter/impeller/scene/shaders/geometry.vert
+FILE: ../../../flutter/impeller/scene/shaders/skinned.vert
 FILE: ../../../flutter/impeller/scene/shaders/unlit.frag
-FILE: ../../../flutter/impeller/scene/static_mesh_entity.cc
-FILE: ../../../flutter/impeller/scene/static_mesh_entity.h
+FILE: ../../../flutter/impeller/scene/shaders/unskinned.vert
+FILE: ../../../flutter/impeller/scene/skin.cc
+FILE: ../../../flutter/impeller/scene/skin.h
+FILE: ../../../flutter/impeller/shader_archive/multi_arch_shader_archive.cc
+FILE: ../../../flutter/impeller/shader_archive/multi_arch_shader_archive.fbs
+FILE: ../../../flutter/impeller/shader_archive/multi_arch_shader_archive.h
+FILE: ../../../flutter/impeller/shader_archive/multi_arch_shader_archive_writer.cc
+FILE: ../../../flutter/impeller/shader_archive/multi_arch_shader_archive_writer.h
+FILE: ../../../flutter/impeller/shader_archive/shader_archive.cc
+FILE: ../../../flutter/impeller/shader_archive/shader_archive.fbs
+FILE: ../../../flutter/impeller/shader_archive/shader_archive.h
+FILE: ../../../flutter/impeller/shader_archive/shader_archive_main.cc
+FILE: ../../../flutter/impeller/shader_archive/shader_archive_types.h
+FILE: ../../../flutter/impeller/shader_archive/shader_archive_writer.cc
+FILE: ../../../flutter/impeller/shader_archive/shader_archive_writer.h
+FILE: ../../../flutter/impeller/shader_bundle/shader_bundle.fbs
 FILE: ../../../flutter/impeller/tessellator/c/tessellator.cc
 FILE: ../../../flutter/impeller/tessellator/c/tessellator.h
 FILE: ../../../flutter/impeller/tessellator/dart/lib/tessellator.dart
 FILE: ../../../flutter/impeller/tessellator/tessellator.cc
 FILE: ../../../flutter/impeller/tessellator/tessellator.h
-FILE: ../../../flutter/impeller/tessellator/tessellator_unittests.cc
+FILE: ../../../flutter/impeller/toolkit/android/choreographer.cc
+FILE: ../../../flutter/impeller/toolkit/android/choreographer.h
+FILE: ../../../flutter/impeller/toolkit/android/hardware_buffer.cc
+FILE: ../../../flutter/impeller/toolkit/android/hardware_buffer.h
+FILE: ../../../flutter/impeller/toolkit/android/native_window.cc
+FILE: ../../../flutter/impeller/toolkit/android/native_window.h
+FILE: ../../../flutter/impeller/toolkit/android/proc_table.cc
+FILE: ../../../flutter/impeller/toolkit/android/proc_table.h
+FILE: ../../../flutter/impeller/toolkit/android/surface_control.cc
+FILE: ../../../flutter/impeller/toolkit/android/surface_control.h
+FILE: ../../../flutter/impeller/toolkit/android/surface_transaction.cc
+FILE: ../../../flutter/impeller/toolkit/android/surface_transaction.h
 FILE: ../../../flutter/impeller/toolkit/egl/config.cc
 FILE: ../../../flutter/impeller/toolkit/egl/config.h
 FILE: ../../../flutter/impeller/toolkit/egl/context.cc
@@ -1679,14 +43050,30 @@ FILE: ../../../flutter/impeller/toolkit/egl/display.cc
 FILE: ../../../flutter/impeller/toolkit/egl/display.h
 FILE: ../../../flutter/impeller/toolkit/egl/egl.cc
 FILE: ../../../flutter/impeller/toolkit/egl/egl.h
+FILE: ../../../flutter/impeller/toolkit/egl/image.cc
+FILE: ../../../flutter/impeller/toolkit/egl/image.h
 FILE: ../../../flutter/impeller/toolkit/egl/surface.cc
 FILE: ../../../flutter/impeller/toolkit/egl/surface.h
+FILE: ../../../flutter/impeller/toolkit/gles/gles.h
+FILE: ../../../flutter/impeller/toolkit/gles/texture.cc
+FILE: ../../../flutter/impeller/toolkit/gles/texture.h
+FILE: ../../../flutter/impeller/tools/malioc.json
+FILE: ../../../flutter/impeller/typographer/backends/skia/glyph_atlas_context_skia.cc
+FILE: ../../../flutter/impeller/typographer/backends/skia/glyph_atlas_context_skia.h
 FILE: ../../../flutter/impeller/typographer/backends/skia/text_frame_skia.cc
 FILE: ../../../flutter/impeller/typographer/backends/skia/text_frame_skia.h
-FILE: ../../../flutter/impeller/typographer/backends/skia/text_render_context_skia.cc
-FILE: ../../../flutter/impeller/typographer/backends/skia/text_render_context_skia.h
 FILE: ../../../flutter/impeller/typographer/backends/skia/typeface_skia.cc
 FILE: ../../../flutter/impeller/typographer/backends/skia/typeface_skia.h
+FILE: ../../../flutter/impeller/typographer/backends/skia/typographer_context_skia.cc
+FILE: ../../../flutter/impeller/typographer/backends/skia/typographer_context_skia.h
+FILE: ../../../flutter/impeller/typographer/backends/stb/glyph_atlas_context_stb.cc
+FILE: ../../../flutter/impeller/typographer/backends/stb/glyph_atlas_context_stb.h
+FILE: ../../../flutter/impeller/typographer/backends/stb/text_frame_stb.cc
+FILE: ../../../flutter/impeller/typographer/backends/stb/text_frame_stb.h
+FILE: ../../../flutter/impeller/typographer/backends/stb/typeface_stb.cc
+FILE: ../../../flutter/impeller/typographer/backends/stb/typeface_stb.h
+FILE: ../../../flutter/impeller/typographer/backends/stb/typographer_context_stb.cc
+FILE: ../../../flutter/impeller/typographer/backends/stb/typographer_context_stb.h
 FILE: ../../../flutter/impeller/typographer/font.cc
 FILE: ../../../flutter/impeller/typographer/font.h
 FILE: ../../../flutter/impeller/typographer/font_glyph_pair.cc
@@ -1697,18 +43084,56 @@ FILE: ../../../flutter/impeller/typographer/glyph_atlas.cc
 FILE: ../../../flutter/impeller/typographer/glyph_atlas.h
 FILE: ../../../flutter/impeller/typographer/lazy_glyph_atlas.cc
 FILE: ../../../flutter/impeller/typographer/lazy_glyph_atlas.h
+FILE: ../../../flutter/impeller/typographer/rectangle_packer.cc
+FILE: ../../../flutter/impeller/typographer/rectangle_packer.h
 FILE: ../../../flutter/impeller/typographer/text_frame.cc
 FILE: ../../../flutter/impeller/typographer/text_frame.h
-FILE: ../../../flutter/impeller/typographer/text_render_context.cc
-FILE: ../../../flutter/impeller/typographer/text_render_context.h
 FILE: ../../../flutter/impeller/typographer/text_run.cc
 FILE: ../../../flutter/impeller/typographer/text_run.h
 FILE: ../../../flutter/impeller/typographer/typeface.cc
 FILE: ../../../flutter/impeller/typographer/typeface.h
-FILE: ../../../flutter/impeller/typographer/typographer_unittests.cc
+FILE: ../../../flutter/impeller/typographer/typographer_context.cc
+FILE: ../../../flutter/impeller/typographer/typographer_context.h
+FILE: ../../../flutter/lib/gpu/command_buffer.cc
+FILE: ../../../flutter/lib/gpu/command_buffer.h
+FILE: ../../../flutter/lib/gpu/context.cc
+FILE: ../../../flutter/lib/gpu/context.h
+FILE: ../../../flutter/lib/gpu/device_buffer.cc
+FILE: ../../../flutter/lib/gpu/device_buffer.h
+FILE: ../../../flutter/lib/gpu/export.cc
+FILE: ../../../flutter/lib/gpu/export.h
+FILE: ../../../flutter/lib/gpu/fixtures.cc
+FILE: ../../../flutter/lib/gpu/fixtures.h
+FILE: ../../../flutter/lib/gpu/formats.cc
+FILE: ../../../flutter/lib/gpu/formats.h
+FILE: ../../../flutter/lib/gpu/host_buffer.cc
+FILE: ../../../flutter/lib/gpu/host_buffer.h
+FILE: ../../../flutter/lib/gpu/lib/gpu.dart
+FILE: ../../../flutter/lib/gpu/lib/src/buffer.dart
+FILE: ../../../flutter/lib/gpu/lib/src/command_buffer.dart
+FILE: ../../../flutter/lib/gpu/lib/src/context.dart
+FILE: ../../../flutter/lib/gpu/lib/src/formats.dart
+FILE: ../../../flutter/lib/gpu/lib/src/render_pass.dart
+FILE: ../../../flutter/lib/gpu/lib/src/render_pipeline.dart
+FILE: ../../../flutter/lib/gpu/lib/src/shader.dart
+FILE: ../../../flutter/lib/gpu/lib/src/shader_library.dart
+FILE: ../../../flutter/lib/gpu/lib/src/smoketest.dart
+FILE: ../../../flutter/lib/gpu/lib/src/texture.dart
+FILE: ../../../flutter/lib/gpu/render_pass.cc
+FILE: ../../../flutter/lib/gpu/render_pass.h
+FILE: ../../../flutter/lib/gpu/render_pipeline.cc
+FILE: ../../../flutter/lib/gpu/render_pipeline.h
+FILE: ../../../flutter/lib/gpu/shader.cc
+FILE: ../../../flutter/lib/gpu/shader.h
+FILE: ../../../flutter/lib/gpu/shader_library.cc
+FILE: ../../../flutter/lib/gpu/shader_library.h
+FILE: ../../../flutter/lib/gpu/smoketest.cc
+FILE: ../../../flutter/lib/gpu/smoketest.h
+FILE: ../../../flutter/lib/gpu/texture.cc
+FILE: ../../../flutter/lib/gpu/texture.h
 FILE: ../../../flutter/lib/io/dart_io.cc
 FILE: ../../../flutter/lib/io/dart_io.h
-FILE: ../../../flutter/lib/snapshot/libraries.json
+FILE: ../../../flutter/lib/snapshot/libraries_experimental.json
 FILE: ../../../flutter/lib/snapshot/snapshot.h
 FILE: ../../../flutter/lib/ui/annotations.dart
 FILE: ../../../flutter/lib/ui/channel_buffers.dart
@@ -1717,16 +43142,18 @@ FILE: ../../../flutter/lib/ui/compositing/scene.cc
 FILE: ../../../flutter/lib/ui/compositing/scene.h
 FILE: ../../../flutter/lib/ui/compositing/scene_builder.cc
 FILE: ../../../flutter/lib/ui/compositing/scene_builder.h
-FILE: ../../../flutter/lib/ui/compositing/scene_builder_unittests.cc
 FILE: ../../../flutter/lib/ui/dart_runtime_hooks.cc
 FILE: ../../../flutter/lib/ui/dart_runtime_hooks.h
 FILE: ../../../flutter/lib/ui/dart_ui.cc
 FILE: ../../../flutter/lib/ui/dart_ui.h
 FILE: ../../../flutter/lib/ui/dart_wrapper.h
+FILE: ../../../flutter/lib/ui/experiments/scene.dart
+FILE: ../../../flutter/lib/ui/experiments/setup_hooks.dart
+FILE: ../../../flutter/lib/ui/experiments/ui.dart
+FILE: ../../../flutter/lib/ui/floating_point.h
 FILE: ../../../flutter/lib/ui/geometry.dart
 FILE: ../../../flutter/lib/ui/hash_codes.dart
 FILE: ../../../flutter/lib/ui/hooks.dart
-FILE: ../../../flutter/lib/ui/hooks_unittests.cc
 FILE: ../../../flutter/lib/ui/io_manager.cc
 FILE: ../../../flutter/lib/ui/io_manager.h
 FILE: ../../../flutter/lib/ui/isolate_name_server.dart
@@ -1767,10 +43194,8 @@ FILE: ../../../flutter/lib/ui/painting/image_decoder_impeller.cc
 FILE: ../../../flutter/lib/ui/painting/image_decoder_impeller.h
 FILE: ../../../flutter/lib/ui/painting/image_decoder_skia.cc
 FILE: ../../../flutter/lib/ui/painting/image_decoder_skia.h
-FILE: ../../../flutter/lib/ui/painting/image_decoder_unittests.cc
 FILE: ../../../flutter/lib/ui/painting/image_descriptor.cc
 FILE: ../../../flutter/lib/ui/painting/image_descriptor.h
-FILE: ../../../flutter/lib/ui/painting/image_dispose_unittests.cc
 FILE: ../../../flutter/lib/ui/painting/image_encoding.cc
 FILE: ../../../flutter/lib/ui/painting/image_encoding.h
 FILE: ../../../flutter/lib/ui/painting/image_encoding_impeller.cc
@@ -1778,14 +43203,14 @@ FILE: ../../../flutter/lib/ui/painting/image_encoding_impeller.h
 FILE: ../../../flutter/lib/ui/painting/image_encoding_impl.h
 FILE: ../../../flutter/lib/ui/painting/image_encoding_skia.cc
 FILE: ../../../flutter/lib/ui/painting/image_encoding_skia.h
-FILE: ../../../flutter/lib/ui/painting/image_encoding_unittests.cc
 FILE: ../../../flutter/lib/ui/painting/image_filter.cc
 FILE: ../../../flutter/lib/ui/painting/image_filter.h
 FILE: ../../../flutter/lib/ui/painting/image_generator.cc
 FILE: ../../../flutter/lib/ui/painting/image_generator.h
+FILE: ../../../flutter/lib/ui/painting/image_generator_apng.cc
+FILE: ../../../flutter/lib/ui/painting/image_generator_apng.h
 FILE: ../../../flutter/lib/ui/painting/image_generator_registry.cc
 FILE: ../../../flutter/lib/ui/painting/image_generator_registry.h
-FILE: ../../../flutter/lib/ui/painting/image_generator_registry_unittests.cc
 FILE: ../../../flutter/lib/ui/painting/image_shader.cc
 FILE: ../../../flutter/lib/ui/painting/image_shader.h
 FILE: ../../../flutter/lib/ui/painting/immutable_buffer.cc
@@ -1796,26 +43221,28 @@ FILE: ../../../flutter/lib/ui/painting/multi_frame_codec.cc
 FILE: ../../../flutter/lib/ui/painting/multi_frame_codec.h
 FILE: ../../../flutter/lib/ui/painting/paint.cc
 FILE: ../../../flutter/lib/ui/painting/paint.h
-FILE: ../../../flutter/lib/ui/painting/paint_unittests.cc
 FILE: ../../../flutter/lib/ui/painting/path.cc
 FILE: ../../../flutter/lib/ui/painting/path.h
 FILE: ../../../flutter/lib/ui/painting/path_measure.cc
 FILE: ../../../flutter/lib/ui/painting/path_measure.h
-FILE: ../../../flutter/lib/ui/painting/path_unittests.cc
 FILE: ../../../flutter/lib/ui/painting/picture.cc
 FILE: ../../../flutter/lib/ui/painting/picture.h
 FILE: ../../../flutter/lib/ui/painting/picture_recorder.cc
 FILE: ../../../flutter/lib/ui/painting/picture_recorder.h
 FILE: ../../../flutter/lib/ui/painting/rrect.cc
 FILE: ../../../flutter/lib/ui/painting/rrect.h
+FILE: ../../../flutter/lib/ui/painting/scene/scene_node.cc
+FILE: ../../../flutter/lib/ui/painting/scene/scene_node.h
+FILE: ../../../flutter/lib/ui/painting/scene/scene_shader.cc
+FILE: ../../../flutter/lib/ui/painting/scene/scene_shader.h
 FILE: ../../../flutter/lib/ui/painting/shader.cc
 FILE: ../../../flutter/lib/ui/painting/shader.h
 FILE: ../../../flutter/lib/ui/painting/single_frame_codec.cc
 FILE: ../../../flutter/lib/ui/painting/single_frame_codec.h
-FILE: ../../../flutter/lib/ui/painting/single_frame_codec_unittests.cc
 FILE: ../../../flutter/lib/ui/painting/vertices.cc
 FILE: ../../../flutter/lib/ui/painting/vertices.h
 FILE: ../../../flutter/lib/ui/platform_dispatcher.dart
+FILE: ../../../flutter/lib/ui/platform_isolate.dart
 FILE: ../../../flutter/lib/ui/plugins.dart
 FILE: ../../../flutter/lib/ui/plugins/callback_cache.cc
 FILE: ../../../flutter/lib/ui/plugins/callback_cache.h
@@ -1829,21 +43256,19 @@ FILE: ../../../flutter/lib/ui/semantics/semantics_update.cc
 FILE: ../../../flutter/lib/ui/semantics/semantics_update.h
 FILE: ../../../flutter/lib/ui/semantics/semantics_update_builder.cc
 FILE: ../../../flutter/lib/ui/semantics/semantics_update_builder.h
-FILE: ../../../flutter/lib/ui/semantics/semantics_update_builder_unittests.cc
 FILE: ../../../flutter/lib/ui/semantics/string_attribute.cc
 FILE: ../../../flutter/lib/ui/semantics/string_attribute.h
+FILE: ../../../flutter/lib/ui/setup_hooks.dart
 FILE: ../../../flutter/lib/ui/snapshot_delegate.h
 FILE: ../../../flutter/lib/ui/text.dart
 FILE: ../../../flutter/lib/ui/text/asset_manager_font_provider.cc
 FILE: ../../../flutter/lib/ui/text/asset_manager_font_provider.h
 FILE: ../../../flutter/lib/ui/text/font_collection.cc
 FILE: ../../../flutter/lib/ui/text/font_collection.h
-FILE: ../../../flutter/lib/ui/text/line_metrics.h
 FILE: ../../../flutter/lib/ui/text/paragraph.cc
 FILE: ../../../flutter/lib/ui/text/paragraph.h
 FILE: ../../../flutter/lib/ui/text/paragraph_builder.cc
 FILE: ../../../flutter/lib/ui/text/paragraph_builder.h
-FILE: ../../../flutter/lib/ui/text/text_box.h
 FILE: ../../../flutter/lib/ui/ui.dart
 FILE: ../../../flutter/lib/ui/ui_benchmarks.cc
 FILE: ../../../flutter/lib/ui/ui_dart_state.cc
@@ -1857,7 +43282,8 @@ FILE: ../../../flutter/lib/ui/window/key_data_packet.cc
 FILE: ../../../flutter/lib/ui/window/key_data_packet.h
 FILE: ../../../flutter/lib/ui/window/platform_configuration.cc
 FILE: ../../../flutter/lib/ui/window/platform_configuration.h
-FILE: ../../../flutter/lib/ui/window/platform_configuration_unittests.cc
+FILE: ../../../flutter/lib/ui/window/platform_isolate.cc
+FILE: ../../../flutter/lib/ui/window/platform_isolate.h
 FILE: ../../../flutter/lib/ui/window/platform_message.cc
 FILE: ../../../flutter/lib/ui/window/platform_message.h
 FILE: ../../../flutter/lib/ui/window/platform_message_response.cc
@@ -1866,20 +43292,25 @@ FILE: ../../../flutter/lib/ui/window/platform_message_response_dart.cc
 FILE: ../../../flutter/lib/ui/window/platform_message_response_dart.h
 FILE: ../../../flutter/lib/ui/window/platform_message_response_dart_port.cc
 FILE: ../../../flutter/lib/ui/window/platform_message_response_dart_port.h
-FILE: ../../../flutter/lib/ui/window/platform_message_response_dart_port_unittests.cc
-FILE: ../../../flutter/lib/ui/window/platform_message_response_dart_unittests.cc
 FILE: ../../../flutter/lib/ui/window/pointer_data.cc
 FILE: ../../../flutter/lib/ui/window/pointer_data.h
 FILE: ../../../flutter/lib/ui/window/pointer_data_packet.cc
 FILE: ../../../flutter/lib/ui/window/pointer_data_packet.h
 FILE: ../../../flutter/lib/ui/window/pointer_data_packet_converter.cc
 FILE: ../../../flutter/lib/ui/window/pointer_data_packet_converter.h
-FILE: ../../../flutter/lib/ui/window/pointer_data_packet_converter_unittests.cc
-FILE: ../../../flutter/lib/ui/window/pointer_data_packet_unittests.cc
 FILE: ../../../flutter/lib/ui/window/viewport_metrics.cc
 FILE: ../../../flutter/lib/ui/window/viewport_metrics.h
-FILE: ../../../flutter/lib/ui/window/window.cc
-FILE: ../../../flutter/lib/ui/window/window.h
+FILE: ../../../flutter/lib/web_ui/flutter_js/src/base_uri.js
+FILE: ../../../flutter/lib/web_ui/flutter_js/src/browser_environment.js
+FILE: ../../../flutter/lib/web_ui/flutter_js/src/canvaskit_loader.js
+FILE: ../../../flutter/lib/web_ui/flutter_js/src/entrypoint_loader.js
+FILE: ../../../flutter/lib/web_ui/flutter_js/src/flutter.js
+FILE: ../../../flutter/lib/web_ui/flutter_js/src/instantiate_wasm.js
+FILE: ../../../flutter/lib/web_ui/flutter_js/src/loader.js
+FILE: ../../../flutter/lib/web_ui/flutter_js/src/service_worker_loader.js
+FILE: ../../../flutter/lib/web_ui/flutter_js/src/skwasm_loader.js
+FILE: ../../../flutter/lib/web_ui/flutter_js/src/trusted_types.js
+FILE: ../../../flutter/lib/web_ui/flutter_js/src/types.d.ts
 FILE: ../../../flutter/lib/web_ui/lib/annotations.dart
 FILE: ../../../flutter/lib/web_ui/lib/canvas.dart
 FILE: ../../../flutter/lib/web_ui/lib/channel_buffers.dart
@@ -1895,34 +43326,34 @@ FILE: ../../../flutter/lib/web_ui/lib/painting.dart
 FILE: ../../../flutter/lib/web_ui/lib/path.dart
 FILE: ../../../flutter/lib/web_ui/lib/path_metrics.dart
 FILE: ../../../flutter/lib/web_ui/lib/platform_dispatcher.dart
+FILE: ../../../flutter/lib/web_ui/lib/platform_isolate.dart
 FILE: ../../../flutter/lib/web_ui/lib/pointer.dart
 FILE: ../../../flutter/lib/web_ui/lib/semantics.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/alarm_clock.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/app_bootstrap.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/assets.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/browser_detection.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvas_pool.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/canvas.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/canvaskit_api.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/canvaskit_canvas.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/color_filter.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/display_canvas_factory.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/embedded_views.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/embedded_views_diff.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/font_fallback_data.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/font_fallbacks.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/fonts.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/image.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/image_filter.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/image_wasm_codecs.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/image_web_codecs.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/interval_tree.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/layer.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/layer_scene_builder.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/layer_tree.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/mask_filter.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/multi_surface_rasterizer.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/n_way_canvas.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/noto_font.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/native_memory.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/offscreen_canvas_rasterizer.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/overlay_scene_optimizer.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/painting.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/path.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/path_metrics.dart
@@ -1931,25 +43362,26 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/picture_recorder.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/platform_message.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/raster_cache.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/rasterizer.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/render_canvas.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/renderer.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/shader.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/skia_object_cache.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/surface.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/surface_factory.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/text.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/text_fragmenter.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/util.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/vertices.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/viewport_metrics.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/clipboard.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/color_filter.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/configuration.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/display.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/dom.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/embedder.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/engine_canvas.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/font_change_util.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/font_fallback_data.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/font_fallbacks.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/fonts.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/frame_reference.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/host_node.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/frame_timing_recorder.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/backdrop_filter.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/bitmap_canvas.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/canvas.dart
@@ -1977,6 +43409,7 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/platform_view.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/recording_canvas.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/render_vertices.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/renderer.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/resource_manager.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/scene.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/scene_builder.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/shader_mask.dart
@@ -1989,38 +43422,53 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/surface.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/surface_stats.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/transform.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/html_image_codec.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/image_decoder.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/initialization.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/js_interop/js_app.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/js_interop/js_loader.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/js_interop/js_promise.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/js_interop/js_typed_data.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/key_map.g.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/keyboard_binding.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/mouse_cursor.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/navigation.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/layers.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/mouse/context_menu.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/mouse/cursor.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/mouse/prevent_default.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/navigation/history.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/navigation/js_url_strategy.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/navigation/url_strategy.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/noto_font.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/noto_font_encoding.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/onscreen_logging.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/picture.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/platform_dispatcher.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/platform_dispatcher/app_lifecycle_state.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/platform_dispatcher/view_focus_binding.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/platform_views.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/platform_views/content_manager.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/platform_views/message_handler.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/platform_views/slots.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/plugins.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/pointer_binding.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/pointer_binding/event_position_helper.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/pointer_converter.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/profiler.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/raw_keyboard.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/renderer.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/rrect_renderer.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/safe_browser_api.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/scene_builder.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/scene_painting.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/scene_view.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/semantics.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/semantics/accessibility.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/semantics/checkable.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/semantics/dialog.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/semantics/focusable.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/semantics/image.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/semantics/incrementable.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/semantics/label_and_value.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/semantics/link.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/semantics/live_region.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/semantics/platform_view.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/semantics/scrollable.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/semantics/semantics.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/semantics/semantics_helper.dart
@@ -2031,10 +43479,49 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/services/buffers.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/services/message_codec.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/services/message_codecs.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/services/serialization.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/shader_data.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/shadow.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/canvas.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/codecs.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/dart_js_conversion.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/filters.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/font_collection.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/image.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/memory.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/paint.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/paragraph.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/path.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/path_metrics.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/picture.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_canvas.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_filters.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_fonts.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_geometry.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_image.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_memory.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_paint.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_path.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_path_metrics.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_picture.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_shaders.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_skdata.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_skstring.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_surface.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_vertices.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/skwasm_module.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/text/raw_line_metrics.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/text/raw_paragraph.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/text/raw_paragraph_builder.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/text/raw_paragraph_style.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/text/raw_strut_style.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/text/raw_text_style.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/renderer.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/shaders.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/surface.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/vertices.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_stub.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_stub/dart_js_conversion.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_stub/renderer.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/svg.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/test_embedding.dart
@@ -2059,27 +43546,70 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/text_editing/input_action.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/text_editing/input_type.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/text_editing/text_capitalization.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/text_editing/text_editing.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/ulps.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/util.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/validators.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/vector_math.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/dimensions_provider/custom_element_dimensions_provider.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/dimensions_provider/dimensions_provider.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/dimensions_provider/full_page_dimensions_provider.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/display_dpr_stream.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/dom_manager.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/embedding_strategy/custom_element_embedding_strategy.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/embedding_strategy/embedding_strategy.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/embedding_strategy/full_page_embedding_strategy.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/flutter_view_manager.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/global_html_attributes.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/hot_restart_cache_handler.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/style_manager.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/window.dart
 FILE: ../../../flutter/lib/web_ui/lib/text.dart
 FILE: ../../../flutter/lib/web_ui/lib/tile_mode.dart
 FILE: ../../../flutter/lib/web_ui/lib/ui.dart
+FILE: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web.dart
+FILE: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web/asset_manager.dart
+FILE: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web/benchmarks.dart
+FILE: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web/flutter_views_proxy.dart
+FILE: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web/images.dart
+FILE: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web/initialization.dart
+FILE: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web/navigation/platform_location.dart
+FILE: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web/navigation/url_strategy.dart
+FILE: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web/platform_view_registry.dart
+FILE: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web/plugins.dart
+FILE: ../../../flutter/lib/web_ui/lib/ui_web/src/ui_web/testing.dart
 FILE: ../../../flutter/lib/web_ui/lib/window.dart
+FILE: ../../../flutter/lib/web_ui/skwasm/canvas.cpp
+FILE: ../../../flutter/lib/web_ui/skwasm/contour_measure.cpp
+FILE: ../../../flutter/lib/web_ui/skwasm/data.cpp
+FILE: ../../../flutter/lib/web_ui/skwasm/export.h
+FILE: ../../../flutter/lib/web_ui/skwasm/filters.cpp
+FILE: ../../../flutter/lib/web_ui/skwasm/fonts.cpp
+FILE: ../../../flutter/lib/web_ui/skwasm/helpers.h
+FILE: ../../../flutter/lib/web_ui/skwasm/image.cpp
+FILE: ../../../flutter/lib/web_ui/skwasm/library_skwasm_support.js
+FILE: ../../../flutter/lib/web_ui/skwasm/paint.cpp
+FILE: ../../../flutter/lib/web_ui/skwasm/path.cpp
+FILE: ../../../flutter/lib/web_ui/skwasm/picture.cpp
+FILE: ../../../flutter/lib/web_ui/skwasm/shaders.cpp
+FILE: ../../../flutter/lib/web_ui/skwasm/skwasm_support.h
+FILE: ../../../flutter/lib/web_ui/skwasm/string.cpp
+FILE: ../../../flutter/lib/web_ui/skwasm/surface.cpp
+FILE: ../../../flutter/lib/web_ui/skwasm/surface.h
+FILE: ../../../flutter/lib/web_ui/skwasm/text/line_metrics.cpp
+FILE: ../../../flutter/lib/web_ui/skwasm/text/paragraph.cpp
+FILE: ../../../flutter/lib/web_ui/skwasm/text/paragraph_builder.cpp
+FILE: ../../../flutter/lib/web_ui/skwasm/text/paragraph_style.cpp
+FILE: ../../../flutter/lib/web_ui/skwasm/text/strut_style.cpp
+FILE: ../../../flutter/lib/web_ui/skwasm/text/text_style.cpp
+FILE: ../../../flutter/lib/web_ui/skwasm/vertices.cpp
+FILE: ../../../flutter/lib/web_ui/skwasm/wrappers.h
 FILE: ../../../flutter/runtime/dart_isolate.cc
 FILE: ../../../flutter/runtime/dart_isolate.h
 FILE: ../../../flutter/runtime/dart_isolate_group_data.cc
 FILE: ../../../flutter/runtime/dart_isolate_group_data.h
-FILE: ../../../flutter/runtime/dart_isolate_unittests.cc
-FILE: ../../../flutter/runtime/dart_lifecycle_unittests.cc
 FILE: ../../../flutter/runtime/dart_plugin_registrant.cc
 FILE: ../../../flutter/runtime/dart_plugin_registrant.h
-FILE: ../../../flutter/runtime/dart_plugin_registrant_unittests.cc
 FILE: ../../../flutter/runtime/dart_service_isolate.cc
 FILE: ../../../flutter/runtime/dart_service_isolate.h
-FILE: ../../../flutter/runtime/dart_service_isolate_unittests.cc
 FILE: ../../../flutter/runtime/dart_snapshot.cc
 FILE: ../../../flutter/runtime/dart_snapshot.h
 FILE: ../../../flutter/runtime/dart_timestamp_provider.cc
@@ -2092,14 +43622,14 @@ FILE: ../../../flutter/runtime/dart_vm_initializer.cc
 FILE: ../../../flutter/runtime/dart_vm_initializer.h
 FILE: ../../../flutter/runtime/dart_vm_lifecycle.cc
 FILE: ../../../flutter/runtime/dart_vm_lifecycle.h
-FILE: ../../../flutter/runtime/dart_vm_unittests.cc
 FILE: ../../../flutter/runtime/embedder_resources.cc
 FILE: ../../../flutter/runtime/embedder_resources.h
 FILE: ../../../flutter/runtime/isolate_configuration.cc
 FILE: ../../../flutter/runtime/isolate_configuration.h
-FILE: ../../../flutter/runtime/no_dart_plugin_registrant_unittests.cc
 FILE: ../../../flutter/runtime/platform_data.cc
 FILE: ../../../flutter/runtime/platform_data.h
+FILE: ../../../flutter/runtime/platform_isolate_manager.cc
+FILE: ../../../flutter/runtime/platform_isolate_manager.h
 FILE: ../../../flutter/runtime/ptrace_check.cc
 FILE: ../../../flutter/runtime/ptrace_check.h
 FILE: ../../../flutter/runtime/runtime_controller.cc
@@ -2112,29 +43642,23 @@ FILE: ../../../flutter/runtime/skia_concurrent_executor.cc
 FILE: ../../../flutter/runtime/skia_concurrent_executor.h
 FILE: ../../../flutter/runtime/test_font_data.cc
 FILE: ../../../flutter/runtime/test_font_data.h
-FILE: ../../../flutter/runtime/type_conversions_unittests.cc
 FILE: ../../../flutter/shell/common/animator.cc
 FILE: ../../../flutter/shell/common/animator.h
-FILE: ../../../flutter/shell/common/animator_unittests.cc
-FILE: ../../../flutter/shell/common/canvas_spy.cc
-FILE: ../../../flutter/shell/common/canvas_spy.h
-FILE: ../../../flutter/shell/common/canvas_spy_unittests.cc
+FILE: ../../../flutter/shell/common/base64.cc
+FILE: ../../../flutter/shell/common/base64.h
 FILE: ../../../flutter/shell/common/context_options.cc
 FILE: ../../../flutter/shell/common/context_options.h
-FILE: ../../../flutter/shell/common/context_options_unittests.cc
 FILE: ../../../flutter/shell/common/dart_native_benchmarks.cc
 FILE: ../../../flutter/shell/common/display.cc
 FILE: ../../../flutter/shell/common/display.h
 FILE: ../../../flutter/shell/common/display_manager.cc
 FILE: ../../../flutter/shell/common/display_manager.h
+FILE: ../../../flutter/shell/common/dl_op_spy.cc
+FILE: ../../../flutter/shell/common/dl_op_spy.h
 FILE: ../../../flutter/shell/common/engine.cc
 FILE: ../../../flutter/shell/common/engine.h
-FILE: ../../../flutter/shell/common/engine_unittests.cc
-FILE: ../../../flutter/shell/common/input_events_unittests.cc
-FILE: ../../../flutter/shell/common/persistent_cache_unittests.cc
 FILE: ../../../flutter/shell/common/pipeline.cc
 FILE: ../../../flutter/shell/common/pipeline.h
-FILE: ../../../flutter/shell/common/pipeline_unittests.cc
 FILE: ../../../flutter/shell/common/platform_message_handler.h
 FILE: ../../../flutter/shell/common/platform_view.cc
 FILE: ../../../flutter/shell/common/platform_view.h
@@ -2142,10 +43666,8 @@ FILE: ../../../flutter/shell/common/pointer_data_dispatcher.cc
 FILE: ../../../flutter/shell/common/pointer_data_dispatcher.h
 FILE: ../../../flutter/shell/common/rasterizer.cc
 FILE: ../../../flutter/shell/common/rasterizer.h
-FILE: ../../../flutter/shell/common/rasterizer_unittests.cc
 FILE: ../../../flutter/shell/common/resource_cache_limit_calculator.cc
 FILE: ../../../flutter/shell/common/resource_cache_limit_calculator.h
-FILE: ../../../flutter/shell/common/resource_cache_limit_calculator_unittests.cc
 FILE: ../../../flutter/shell/common/run_configuration.cc
 FILE: ../../../flutter/shell/common/run_configuration.h
 FILE: ../../../flutter/shell/common/serialization_callbacks.cc
@@ -2153,10 +43675,8 @@ FILE: ../../../flutter/shell/common/serialization_callbacks.h
 FILE: ../../../flutter/shell/common/shell.cc
 FILE: ../../../flutter/shell/common/shell.h
 FILE: ../../../flutter/shell/common/shell_benchmarks.cc
-FILE: ../../../flutter/shell/common/shell_fuchsia_unittests.cc
 FILE: ../../../flutter/shell/common/shell_io_manager.cc
 FILE: ../../../flutter/shell/common/shell_io_manager.h
-FILE: ../../../flutter/shell/common/shell_io_manager_unittests.cc
 FILE: ../../../flutter/shell/common/shell_test.cc
 FILE: ../../../flutter/shell/common/shell_test.h
 FILE: ../../../flutter/shell/common/shell_test_external_view_embedder.cc
@@ -2169,7 +43689,6 @@ FILE: ../../../flutter/shell/common/shell_test_platform_view_metal.h
 FILE: ../../../flutter/shell/common/shell_test_platform_view_metal.mm
 FILE: ../../../flutter/shell/common/shell_test_platform_view_vulkan.cc
 FILE: ../../../flutter/shell/common/shell_test_platform_view_vulkan.h
-FILE: ../../../flutter/shell/common/shell_unittests.cc
 FILE: ../../../flutter/shell/common/skia_event_tracer_impl.cc
 FILE: ../../../flutter/shell/common/skia_event_tracer_impl.h
 FILE: ../../../flutter/shell/common/snapshot_controller.cc
@@ -2181,18 +43700,15 @@ FILE: ../../../flutter/shell/common/snapshot_controller_skia.h
 FILE: ../../../flutter/shell/common/snapshot_surface_producer.h
 FILE: ../../../flutter/shell/common/switches.cc
 FILE: ../../../flutter/shell/common/switches.h
-FILE: ../../../flutter/shell/common/switches_unittests.cc
 FILE: ../../../flutter/shell/common/thread_host.cc
 FILE: ../../../flutter/shell/common/thread_host.h
 FILE: ../../../flutter/shell/common/variable_refresh_rate_display.cc
 FILE: ../../../flutter/shell/common/variable_refresh_rate_display.h
-FILE: ../../../flutter/shell/common/variable_refresh_rate_display_unittests.cc
 FILE: ../../../flutter/shell/common/variable_refresh_rate_reporter.h
 FILE: ../../../flutter/shell/common/vsync_waiter.cc
 FILE: ../../../flutter/shell/common/vsync_waiter.h
 FILE: ../../../flutter/shell/common/vsync_waiter_fallback.cc
 FILE: ../../../flutter/shell/common/vsync_waiter_fallback.h
-FILE: ../../../flutter/shell/common/vsync_waiter_unittests.cc
 FILE: ../../../flutter/shell/common/vsync_waiters_test.cc
 FILE: ../../../flutter/shell/common/vsync_waiters_test.h
 FILE: ../../../flutter/shell/gpu/gpu_surface_gl_delegate.cc
@@ -2218,13 +43734,12 @@ FILE: ../../../flutter/shell/gpu/gpu_surface_vulkan_delegate.h
 FILE: ../../../flutter/shell/gpu/gpu_surface_vulkan_impeller.cc
 FILE: ../../../flutter/shell/gpu/gpu_surface_vulkan_impeller.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_impeller.cc
 FILE: ../../../flutter/shell/platform/android/android_context_gl_impeller.h
 FILE: ../../../flutter/shell/platform/android/android_context_gl_skia.cc
 FILE: ../../../flutter/shell/platform/android/android_context_gl_skia.h
-FILE: ../../../flutter/shell/platform/android/android_context_gl_unittests.cc
+FILE: ../../../flutter/shell/platform/android/android_context_vulkan_impeller.cc
+FILE: ../../../flutter/shell/platform/android/android_context_vulkan_impeller.h
 FILE: ../../../flutter/shell/platform/android/android_display.cc
 FILE: ../../../flutter/shell/platform/android/android_display.h
 FILE: ../../../flutter/shell/platform/android/android_egl_surface.cc
@@ -2232,13 +43747,10 @@ FILE: ../../../flutter/shell/platform/android/android_egl_surface.h
 FILE: ../../../flutter/shell/platform/android/android_environment_gl.cc
 FILE: ../../../flutter/shell/platform/android/android_environment_gl.h
 FILE: ../../../flutter/shell/platform/android/android_exports.lst
-FILE: ../../../flutter/shell/platform/android/android_external_texture_gl.cc
-FILE: ../../../flutter/shell/platform/android/android_external_texture_gl.h
 FILE: ../../../flutter/shell/platform/android/android_image_generator.cc
 FILE: ../../../flutter/shell/platform/android/android_image_generator.h
 FILE: ../../../flutter/shell/platform/android/android_shell_holder.cc
 FILE: ../../../flutter/shell/platform/android/android_shell_holder.h
-FILE: ../../../flutter/shell/platform/android/android_shell_holder_unittests.cc
 FILE: ../../../flutter/shell/platform/android/android_surface_gl_impeller.cc
 FILE: ../../../flutter/shell/platform/android/android_surface_gl_impeller.h
 FILE: ../../../flutter/shell/platform/android/android_surface_gl_skia.cc
@@ -2249,18 +43761,24 @@ FILE: ../../../flutter/shell/platform/android/android_surface_vulkan_impeller.cc
 FILE: ../../../flutter/shell/platform/android/android_surface_vulkan_impeller.h
 FILE: ../../../flutter/shell/platform/android/apk_asset_provider.cc
 FILE: ../../../flutter/shell/platform/android/apk_asset_provider.h
-FILE: ../../../flutter/shell/platform/android/apk_asset_provider_unittests.cc
 FILE: ../../../flutter/shell/platform/android/context/android_context.cc
 FILE: ../../../flutter/shell/platform/android/context/android_context.h
 FILE: ../../../flutter/shell/platform/android/external_view_embedder/external_view_embedder.cc
 FILE: ../../../flutter/shell/platform/android/external_view_embedder/external_view_embedder.h
-FILE: ../../../flutter/shell/platform/android/external_view_embedder/external_view_embedder_unittests.cc
 FILE: ../../../flutter/shell/platform/android/external_view_embedder/surface_pool.cc
 FILE: ../../../flutter/shell/platform/android/external_view_embedder/surface_pool.h
-FILE: ../../../flutter/shell/platform/android/external_view_embedder/surface_pool_unittests.cc
 FILE: ../../../flutter/shell/platform/android/flutter_main.cc
 FILE: ../../../flutter/shell/platform/android/flutter_main.h
-FILE: ../../../flutter/shell/platform/android/flutter_shell_native_unittests.cc
+FILE: ../../../flutter/shell/platform/android/image_external_texture.cc
+FILE: ../../../flutter/shell/platform/android/image_external_texture.h
+FILE: ../../../flutter/shell/platform/android/image_external_texture_gl.cc
+FILE: ../../../flutter/shell/platform/android/image_external_texture_gl.h
+FILE: ../../../flutter/shell/platform/android/image_external_texture_vk.cc
+FILE: ../../../flutter/shell/platform/android/image_external_texture_vk.h
+FILE: ../../../flutter/shell/platform/android/image_lru.cc
+FILE: ../../../flutter/shell/platform/android/image_lru.h
+FILE: ../../../flutter/shell/platform/android/io/flutter/Build.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/BuildConfig.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/FlutterInjector.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/Log.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterActivity.java
@@ -2271,7 +43789,6 @@ FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterFragmentActi
 FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterPlayStoreSplitApplication.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterPluginRegistry.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/AndroidTouchProcessor.java
-FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/DrawableSplashScreen.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/ExclusiveAppComponent.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivity.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivityAndFragmentDelegate.java
@@ -2282,7 +43799,6 @@ FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/Flutt
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterFragmentActivity.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterImageView.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterPlayStoreSplitApplication.java
-FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterSplashView.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterSurfaceView.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterTextureView.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterView.java
@@ -2293,14 +43809,13 @@ FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/Keybo
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/KeyboardMap.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/MotionEventTracker.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/RenderMode.java
-FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/SplashScreen.java
-FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/SplashScreenProvider.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/TransparencyMode.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/WindowInfoRepositoryCallbackAdapterWrapper.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngine.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngineCache.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngineConnectionRegistry.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngineGroup.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngineGroupCache.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterOverlaySurface.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java
@@ -2337,16 +43852,20 @@ FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugin
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterUiDisplayListener.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/RenderSurface.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/SurfaceTextureSurfaceProducer.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/SurfaceTextureWrapper.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/AccessibilityChannel.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/BackGestureChannel.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/DeferredComponentChannel.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/KeyEventChannel.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/KeyboardChannel.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/LifecycleChannel.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/LocalizationChannel.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/MouseCursorChannel.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/NavigationChannel.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/PlatformChannel.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/PlatformViewsChannel.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/ProcessTextChannel.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/RestorationChannel.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/SettingsChannel.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/SpellCheckChannel.java
@@ -2380,17 +43899,25 @@ FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/editing/TextInpu
 FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/localization/LocalizationPlugin.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/mouse/MouseCursorPlugin.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/AccessibilityEventsDelegate.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/ImageReaderPlatformViewRenderTarget.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformOverlayView.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformView.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewFactory.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewRegistry.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewRegistryImpl.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewRenderTarget.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewWrapper.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsAccessibilityDelegate.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/SingleViewFakeWindowViewGroup.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/SingleViewPresentation.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/SingleViewWindowManager.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/SurfaceProducerPlatformViewRenderTarget.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/SurfaceTexturePlatformViewRenderTarget.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/VirtualDisplayController.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/WindowManagerHandler.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/text/ProcessTextPlugin.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/util/HandlerCompat.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/util/PathUtils.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/util/Preconditions.java
@@ -2407,7 +43934,6 @@ FILE: ../../../flutter/shell/platform/android/io/flutter/view/FlutterView.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/view/TextureRegistry.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/view/VsyncWaiter.java
 FILE: ../../../flutter/shell/platform/android/jni/jni_mock.h
-FILE: ../../../flutter/shell/platform/android/jni/jni_mock_unittest.cc
 FILE: ../../../flutter/shell/platform/android/jni/platform_view_android_jni.cc
 FILE: ../../../flutter/shell/platform/android/jni/platform_view_android_jni.h
 FILE: ../../../flutter/shell/platform/android/library_loader.cc
@@ -2419,7 +43945,6 @@ FILE: ../../../flutter/shell/platform/android/platform_view_android.cc
 FILE: ../../../flutter/shell/platform/android/platform_view_android.h
 FILE: ../../../flutter/shell/platform/android/platform_view_android_delegate/platform_view_android_delegate.cc
 FILE: ../../../flutter/shell/platform/android/platform_view_android_delegate/platform_view_android_delegate.h
-FILE: ../../../flutter/shell/platform/android/platform_view_android_delegate/platform_view_android_delegate_unittests.cc
 FILE: ../../../flutter/shell/platform/android/platform_view_android_jni_impl.cc
 FILE: ../../../flutter/shell/platform/android/platform_view_android_jni_impl.h
 FILE: ../../../flutter/shell/platform/android/surface/android_native_window.cc
@@ -2430,18 +43955,21 @@ FILE: ../../../flutter/shell/platform/android/surface/android_surface_mock.cc
 FILE: ../../../flutter/shell/platform/android/surface/android_surface_mock.h
 FILE: ../../../flutter/shell/platform/android/surface/snapshot_surface_producer.cc
 FILE: ../../../flutter/shell/platform/android/surface/snapshot_surface_producer.h
+FILE: ../../../flutter/shell/platform/android/surface_texture_external_texture.cc
+FILE: ../../../flutter/shell/platform/android/surface_texture_external_texture.h
+FILE: ../../../flutter/shell/platform/android/surface_texture_external_texture_gl.cc
+FILE: ../../../flutter/shell/platform/android/surface_texture_external_texture_gl.h
 FILE: ../../../flutter/shell/platform/android/vsync_waiter_android.cc
 FILE: ../../../flutter/shell/platform/android/vsync_waiter_android.h
 FILE: ../../../flutter/shell/platform/common/accessibility_bridge.cc
 FILE: ../../../flutter/shell/platform/common/accessibility_bridge.h
-FILE: ../../../flutter/shell/platform/common/accessibility_bridge_unittests.cc
-FILE: ../../../flutter/shell/platform/common/client_wrapper/basic_message_channel_unittests.cc
+FILE: ../../../flutter/shell/platform/common/alert_platform_node_delegate.cc
+FILE: ../../../flutter/shell/platform/common/alert_platform_node_delegate.h
+FILE: ../../../flutter/shell/platform/common/app_lifecycle_state.h
 FILE: ../../../flutter/shell/platform/common/client_wrapper/binary_messenger_impl.h
 FILE: ../../../flutter/shell/platform/common/client_wrapper/byte_buffer_streams.h
 FILE: ../../../flutter/shell/platform/common/client_wrapper/core_implementations.cc
-FILE: ../../../flutter/shell/platform/common/client_wrapper/encodable_value_unittests.cc
 FILE: ../../../flutter/shell/platform/common/client_wrapper/engine_method_result.cc
-FILE: ../../../flutter/shell/platform/common/client_wrapper/event_channel_unittests.cc
 FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/basic_message_channel.h
 FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h
 FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/byte_streams.h
@@ -2463,36 +43991,22 @@ FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/stan
 FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/standard_message_codec.h
 FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/standard_method_codec.h
 FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/texture_registrar.h
-FILE: ../../../flutter/shell/platform/common/client_wrapper/method_call_unittests.cc
-FILE: ../../../flutter/shell/platform/common/client_wrapper/method_channel_unittests.cc
-FILE: ../../../flutter/shell/platform/common/client_wrapper/method_result_functions_unittests.cc
 FILE: ../../../flutter/shell/platform/common/client_wrapper/plugin_registrar.cc
-FILE: ../../../flutter/shell/platform/common/client_wrapper/plugin_registrar_unittests.cc
 FILE: ../../../flutter/shell/platform/common/client_wrapper/standard_codec.cc
-FILE: ../../../flutter/shell/platform/common/client_wrapper/standard_message_codec_unittests.cc
-FILE: ../../../flutter/shell/platform/common/client_wrapper/standard_method_codec_unittests.cc
 FILE: ../../../flutter/shell/platform/common/client_wrapper/texture_registrar_impl.h
-FILE: ../../../flutter/shell/platform/common/client_wrapper/texture_registrar_unittests.cc
 FILE: ../../../flutter/shell/platform/common/engine_switches.cc
 FILE: ../../../flutter/shell/platform/common/engine_switches.h
-FILE: ../../../flutter/shell/platform/common/engine_switches_unittests.cc
 FILE: ../../../flutter/shell/platform/common/flutter_platform_node_delegate.cc
 FILE: ../../../flutter/shell/platform/common/flutter_platform_node_delegate.h
-FILE: ../../../flutter/shell/platform/common/flutter_platform_node_delegate_unittests.cc
 FILE: ../../../flutter/shell/platform/common/geometry.h
-FILE: ../../../flutter/shell/platform/common/geometry_unittests.cc
 FILE: ../../../flutter/shell/platform/common/incoming_message_dispatcher.cc
 FILE: ../../../flutter/shell/platform/common/incoming_message_dispatcher.h
-FILE: ../../../flutter/shell/platform/common/incoming_message_dispatcher_unittests.cc
 FILE: ../../../flutter/shell/platform/common/json_message_codec.cc
 FILE: ../../../flutter/shell/platform/common/json_message_codec.h
-FILE: ../../../flutter/shell/platform/common/json_message_codec_unittests.cc
 FILE: ../../../flutter/shell/platform/common/json_method_codec.cc
 FILE: ../../../flutter/shell/platform/common/json_method_codec.h
-FILE: ../../../flutter/shell/platform/common/json_method_codec_unittests.cc
 FILE: ../../../flutter/shell/platform/common/path_utils.cc
 FILE: ../../../flutter/shell/platform/common/path_utils.h
-FILE: ../../../flutter/shell/platform/common/path_utils_unittests.cc
 FILE: ../../../flutter/shell/platform/common/platform_provided_menu.h
 FILE: ../../../flutter/shell/platform/common/public/flutter_export.h
 FILE: ../../../flutter/shell/platform/common/public/flutter_macros.h
@@ -2503,12 +44017,11 @@ FILE: ../../../flutter/shell/platform/common/test_accessibility_bridge.cc
 FILE: ../../../flutter/shell/platform/common/test_accessibility_bridge.h
 FILE: ../../../flutter/shell/platform/common/text_editing_delta.cc
 FILE: ../../../flutter/shell/platform/common/text_editing_delta.h
-FILE: ../../../flutter/shell/platform/common/text_editing_delta_unittests.cc
 FILE: ../../../flutter/shell/platform/common/text_input_model.cc
 FILE: ../../../flutter/shell/platform/common/text_input_model.h
-FILE: ../../../flutter/shell/platform/common/text_input_model_unittests.cc
 FILE: ../../../flutter/shell/platform/common/text_range.h
-FILE: ../../../flutter/shell/platform/common/text_range_unittests.cc
+FILE: ../../../flutter/shell/platform/darwin/common/availability_version_check.cc
+FILE: ../../../flutter/shell/platform/darwin/common/availability_version_check.h
 FILE: ../../../flutter/shell/platform/darwin/common/buffer_conversions.h
 FILE: ../../../flutter/shell/platform/darwin/common/buffer_conversions.mm
 FILE: ../../../flutter/shell/platform/darwin/common/command_line.h
@@ -2516,25 +44029,33 @@ FILE: ../../../flutter/shell/platform/darwin/common/command_line.mm
 FILE: ../../../flutter/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h
 FILE: ../../../flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h
 FILE: ../../../flutter/shell/platform/darwin/common/framework/Headers/FlutterCodecs.h
+FILE: ../../../flutter/shell/platform/darwin/common/framework/Headers/FlutterDartProject.h
 FILE: ../../../flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h
 FILE: ../../../flutter/shell/platform/darwin/common/framework/Headers/FlutterTexture.h
+FILE: ../../../flutter/shell/platform/darwin/common/framework/Source/FlutterBinaryMessengerRelay.h
+FILE: ../../../flutter/shell/platform/darwin/common/framework/Source/FlutterBinaryMessengerRelay.mm
+FILE: ../../../flutter/shell/platform/darwin/common/framework/Source/FlutterBinaryMessengerRelayTest.mm
 FILE: ../../../flutter/shell/platform/darwin/common/framework/Source/FlutterChannels.mm
 FILE: ../../../flutter/shell/platform/darwin/common/framework/Source/FlutterChannelsTest.m
 FILE: ../../../flutter/shell/platform/darwin/common/framework/Source/FlutterCodecs.mm
+FILE: ../../../flutter/shell/platform/darwin/common/framework/Source/FlutterNSBundleUtils.h
+FILE: ../../../flutter/shell/platform/darwin/common/framework/Source/FlutterNSBundleUtils.mm
 FILE: ../../../flutter/shell/platform/darwin/common/framework/Source/FlutterStandardCodec.mm
+FILE: ../../../flutter/shell/platform/darwin/common/framework/Source/FlutterStandardCodecHelper.cc
+FILE: ../../../flutter/shell/platform/darwin/common/framework/Source/FlutterStandardCodecHelper.h
 FILE: ../../../flutter/shell/platform/darwin/common/framework/Source/FlutterStandardCodec_Internal.h
-FILE: ../../../flutter/shell/platform/darwin/common/framework/Source/flutter_codecs_unittest.mm
-FILE: ../../../flutter/shell/platform/darwin/common/framework/Source/flutter_standard_codec_unittest.mm
+FILE: ../../../flutter/shell/platform/darwin/common/framework/Source/FlutterTestUtils.h
+FILE: ../../../flutter/shell/platform/darwin/common/framework/Source/FlutterTestUtils.mm
 FILE: ../../../flutter/shell/platform/darwin/graphics/FlutterDarwinContextMetalImpeller.h
 FILE: ../../../flutter/shell/platform/darwin/graphics/FlutterDarwinContextMetalImpeller.mm
 FILE: ../../../flutter/shell/platform/darwin/graphics/FlutterDarwinContextMetalSkia.h
 FILE: ../../../flutter/shell/platform/darwin/graphics/FlutterDarwinContextMetalSkia.mm
 FILE: ../../../flutter/shell/platform/darwin/graphics/FlutterDarwinExternalTextureMetal.h
 FILE: ../../../flutter/shell/platform/darwin/graphics/FlutterDarwinExternalTextureMetal.mm
+FILE: ../../../flutter/shell/platform/darwin/ios/flutter_task_queue_dispatch.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/Flutter.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterAppDelegate.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterCallbackCache.h
-FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterDartProject.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterEngine.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterEngineGroup.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterHeadlessDartRunner.h
@@ -2543,12 +44064,10 @@ FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterPlugin
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterPluginAppLifeCycleDelegate.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Info.plist
+FILE: ../../../flutter/shell/platform/darwin/ios/framework/PrivacyInfo.xcprivacy
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterAppDelegate.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterAppDelegateTest.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterAppDelegate_Test.h
-FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelay.h
-FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelay.mm
-FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelayTest.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterCallbackCache.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterCallbackCache_Internal.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterChannelKeyResponder.h
@@ -2557,6 +44076,8 @@ FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterChannel
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterDartProjectTest.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterDartProject_Internal.h
+FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterDartVMServicePublisher.h
+FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterDartVMServicePublisher.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterEmbedderKeyResponder.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterEmbedderKeyResponder.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterEmbedderKeyResponderTest.mm
@@ -2565,7 +44086,6 @@ FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterEngineG
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterEngineGroupTest.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterEnginePlatformViewTest.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterEngineTest.mm
-FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterEngineTest_mrc.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine_Test.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterFakeKeyEvents.h
@@ -2577,8 +44097,9 @@ FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterKeySeco
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterKeyboardManager.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterKeyboardManager.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterKeyboardManagerTest.mm
-FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterObservatoryPublisher.h
-FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterObservatoryPublisher.mm
+FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterMetalLayer.h
+FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterMetalLayer.mm
+FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterMetalLayerTest.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterOverlayView.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterOverlayView.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.h
@@ -2603,6 +44124,10 @@ FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInp
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPluginTest.mm
+FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterTextureRegistryRelay.h
+FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterTextureRegistryRelay.mm
+FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterTextureRegistryRelayTest.mm
+FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterTouchInterceptingView_Test.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterUIPressProxy.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterUIPressProxy.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterUmbrellaImport.m
@@ -2614,7 +44139,6 @@ FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterView.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterView.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterViewControllerTest.mm
-FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterViewControllerTest_mrc.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterViewResponder.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterViewTest.mm
@@ -2624,6 +44148,10 @@ FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/KeyCodeMap_Int
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/SemanticsObject.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/SemanticsObject.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/SemanticsObjectTest.mm
+FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/SemanticsObjectTestMocks.h
+FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/UIViewController+FlutterScreenAndSceneIfLoaded.h
+FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/UIViewController+FlutterScreenAndSceneIfLoaded.mm
+FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/UIViewController_FlutterScreenAndSceneIfLoadedTest.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/VsyncWaiterIosTest.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge.mm
@@ -2631,6 +44159,7 @@ FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/accessibility_
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge_test.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/accessibility_text_entry.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/accessibility_text_entry.mm
+FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/availability_version_check_test.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/connection_collection.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/connection_collection.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/connection_collection_test.mm
@@ -2669,7 +44198,7 @@ FILE: ../../../flutter/shell/platform/darwin/ios/platform_view_ios.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/rendering_api_selection.h
 FILE: ../../../flutter/shell/platform/darwin/ios/rendering_api_selection.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Headers/FlutterAppDelegate.h
-FILE: ../../../flutter/shell/platform/darwin/macos/framework/Headers/FlutterDartProject.h
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Headers/FlutterAppLifecycleDelegate.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Headers/FlutterEngine.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Headers/FlutterMacOS.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Headers/FlutterPlatformViews.h
@@ -2681,6 +44210,11 @@ FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/Accessibilit
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMac.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMacTest.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterAppDelegate.mm
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterAppDelegateTest.mm
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterAppDelegate_Internal.h
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterAppLifecycleDelegate.mm
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterAppLifecycleDelegateTest.mm
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterAppLifecycleDelegate_Internal.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterBackingStore.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterBackingStore.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponder.h
@@ -2688,9 +44222,11 @@ FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterChann
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponderTest.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterCompositor.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterCompositor.mm
-FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterCompositorTest.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterDartProject.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterDartProject_Internal.h
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterDisplayLink.h
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterDisplayLink.mm
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterDisplayLinkTest.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterEmbedderExternalTextureTest.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterEmbedderKeyResponder.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterEmbedderKeyResponder.mm
@@ -2702,8 +44238,6 @@ FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterEngin
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterExternalTexture.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterExternalTexture.mm
-FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterIOSurfaceHolder.h
-FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterIOSurfaceHolder.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterKeyPrimaryResponder.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterKeyboardManager.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterKeyboardManager.mm
@@ -2715,6 +44249,9 @@ FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMenuP
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMenuPlugin_Internal.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMouseCursorPlugin.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMouseCursorPlugin.mm
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMutatorView.h
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMutatorView.mm
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMutatorViewTest.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterPlatformNodeDelegateMac.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterPlatformNodeDelegateMac.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterPlatformNodeDelegateMacTest.mm
@@ -2723,11 +44260,8 @@ FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterPlatf
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterPlatformViewControllerTest.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterRenderer.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterRenderer.mm
-FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterRendererTest.mm
-FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterResizableBackingStoreProvider.h
-FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterResizableBackingStoreProvider.mm
-FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterResizeSynchronizer.h
-FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterResizeSynchronizer.mm
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterSurface.h
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterSurface.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterSurfaceManager.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterSurfaceManager.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterSurfaceManagerTest.mm
@@ -2739,6 +44273,15 @@ FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterTextI
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputSemanticsObjectTest.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterTextureRegistrar.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterTextureRegistrar.mm
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterThreadSynchronizer.h
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterThreadSynchronizer.mm
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterThreadSynchronizerTest.mm
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterTimeConverter.h
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterTimeConverter.mm
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterUmbrellaImportTests.m
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterVSyncWaiter.h
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterVSyncWaiter.mm
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterVSyncWaiterTest.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterView.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterView.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewController.mm
@@ -2750,8 +44293,11 @@ FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewE
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewEngineProvider.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewEngineProviderTest.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewProvider.h
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewTest.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/KeyCodeMap.g.mm
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/KeyCodeMapTest.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/KeyCodeMap_Internal.h
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/NSView+ClipsToBounds.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/TestFlutterPlatformView.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/TestFlutterPlatformView.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/module.modulemap
@@ -2782,13 +44328,23 @@ FILE: ../../../flutter/shell/platform/embedder/embedder_render_target.cc
 FILE: ../../../flutter/shell/platform/embedder/embedder_render_target.h
 FILE: ../../../flutter/shell/platform/embedder/embedder_render_target_cache.cc
 FILE: ../../../flutter/shell/platform/embedder/embedder_render_target_cache.h
+FILE: ../../../flutter/shell/platform/embedder/embedder_render_target_impeller.cc
+FILE: ../../../flutter/shell/platform/embedder/embedder_render_target_impeller.h
+FILE: ../../../flutter/shell/platform/embedder/embedder_render_target_skia.cc
+FILE: ../../../flutter/shell/platform/embedder/embedder_render_target_skia.h
+FILE: ../../../flutter/shell/platform/embedder/embedder_semantics_update.cc
+FILE: ../../../flutter/shell/platform/embedder/embedder_semantics_update.h
 FILE: ../../../flutter/shell/platform/embedder/embedder_struct_macros.h
 FILE: ../../../flutter/shell/platform/embedder/embedder_surface.cc
 FILE: ../../../flutter/shell/platform/embedder/embedder_surface.h
 FILE: ../../../flutter/shell/platform/embedder/embedder_surface_gl.cc
 FILE: ../../../flutter/shell/platform/embedder/embedder_surface_gl.h
+FILE: ../../../flutter/shell/platform/embedder/embedder_surface_gl_impeller.cc
+FILE: ../../../flutter/shell/platform/embedder/embedder_surface_gl_impeller.h
 FILE: ../../../flutter/shell/platform/embedder/embedder_surface_metal.h
 FILE: ../../../flutter/shell/platform/embedder/embedder_surface_metal.mm
+FILE: ../../../flutter/shell/platform/embedder/embedder_surface_metal_impeller.h
+FILE: ../../../flutter/shell/platform/embedder/embedder_surface_metal_impeller.mm
 FILE: ../../../flutter/shell/platform/embedder/embedder_surface_software.cc
 FILE: ../../../flutter/shell/platform/embedder/embedder_surface_software.h
 FILE: ../../../flutter/shell/platform/embedder/embedder_surface_vulkan.cc
@@ -2801,7 +44357,6 @@ FILE: ../../../flutter/shell/platform/embedder/pixel_formats.cc
 FILE: ../../../flutter/shell/platform/embedder/pixel_formats.h
 FILE: ../../../flutter/shell/platform/embedder/platform_view_embedder.cc
 FILE: ../../../flutter/shell/platform/embedder/platform_view_embedder.h
-FILE: ../../../flutter/shell/platform/embedder/platform_view_embedder_unittests.cc
 FILE: ../../../flutter/shell/platform/embedder/test_utils/key_codes.g.h
 FILE: ../../../flutter/shell/platform/embedder/test_utils/proc_table_replacement.h
 FILE: ../../../flutter/shell/platform/embedder/vsync_waiter_embedder.cc
@@ -2849,12 +44404,11 @@ FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/dart_runner.h
 FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/dart_test_component_controller.cc
 FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/dart_test_component_controller.h
 FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/embedder/builtin.dart
-FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/embedder/script_runner_snapshot.dart
 FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/embedder/shim.dart
 FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/embedder/snapshot.cc.tmpl
 FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/embedder/snapshot.dart
 FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/embedder/snapshot.h
-FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/kernel/libraries.json
+FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/fidl/echo.fidl
 FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/logging.h
 FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/main.cc
 FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/common.shard.cml
@@ -2867,74 +44421,48 @@ FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/service_isolate.h
 FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/vmservice/empty.dart
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/accessibility_bridge.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/accessibility_bridge.h
-FILE: ../../../flutter/shell/platform/fuchsia/flutter/accessibility_bridge_unittest.cc
-FILE: ../../../flutter/shell/platform/fuchsia/flutter/component_v1.cc
-FILE: ../../../flutter/shell/platform/fuchsia/flutter/component_v1.h
-FILE: ../../../flutter/shell/platform/fuchsia/flutter/component_v1_unittest.cc
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/canvas_spy.cc
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/canvas_spy.h
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/component_v2.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/component_v2.h
-FILE: ../../../flutter/shell/platform/fuchsia/flutter/component_v2_unittest.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/engine.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/engine.h
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/external_view_embedder.cc
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/external_view_embedder.h
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/file_in_namespace_buffer.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/file_in_namespace_buffer.h
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/flatland_connection.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/flatland_connection.h
-FILE: ../../../flutter/shell/platform/fuchsia/flutter/flatland_external_view_embedder.cc
-FILE: ../../../flutter/shell/platform/fuchsia/flutter/flatland_external_view_embedder.h
-FILE: ../../../flutter/shell/platform/fuchsia/flutter/flatland_platform_view.cc
-FILE: ../../../flutter/shell/platform/fuchsia/flutter/flatland_platform_view.h
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/flutter_runner_fakes.h
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/flutter_runner_product_configuration.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/flutter_runner_product_configuration.h
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/focus_delegate.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/focus_delegate.h
-FILE: ../../../flutter/shell/platform/fuchsia/flutter/focus_delegate_unittests.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/fuchsia_intl.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/fuchsia_intl.h
-FILE: ../../../flutter/shell/platform/fuchsia/flutter/fuchsia_intl_unittest.cc
-FILE: ../../../flutter/shell/platform/fuchsia/flutter/gfx_external_view_embedder.cc
-FILE: ../../../flutter/shell/platform/fuchsia/flutter/gfx_external_view_embedder.h
-FILE: ../../../flutter/shell/platform/fuchsia/flutter/gfx_platform_view.cc
-FILE: ../../../flutter/shell/platform/fuchsia/flutter/gfx_platform_view.h
-FILE: ../../../flutter/shell/platform/fuchsia/flutter/gfx_session_connection.cc
-FILE: ../../../flutter/shell/platform/fuchsia/flutter/gfx_session_connection.h
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/isolate_configurator.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/isolate_configurator.h
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/kernel/framework_shim.dart
-FILE: ../../../flutter/shell/platform/fuchsia/flutter/kernel/libraries.json
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/keyboard.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/keyboard.h
-FILE: ../../../flutter/shell/platform/fuchsia/flutter/keyboard_unittest.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/logging.h
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/main.cc
-FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/aot_product_runtime
-FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/aot_runtime
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/common.shard.cml
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/flutter_aot_product_runner.cml
-FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/flutter_aot_product_runner.cmx
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/flutter_aot_runner.cml
-FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/flutter_aot_runner.cmx
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/flutter_jit_product_runner.cml
-FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/flutter_jit_product_runner.cmx
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/flutter_jit_runner.cml
-FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/flutter_jit_runner.cmx
-FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/jit_product_runtime
-FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/jit_runtime
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/platform_view.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/platform_view.h
-FILE: ../../../flutter/shell/platform/fuchsia/flutter/platform_view_unittest.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/pointer_delegate.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/pointer_delegate.h
-FILE: ../../../flutter/shell/platform/fuchsia/flutter/pointer_delegate_unittests.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/pointer_injector_delegate.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/pointer_injector_delegate.h
-FILE: ../../../flutter/shell/platform/fuchsia/flutter/pointer_injector_delegate_unittest.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/program_metadata.h
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/rtree.cc
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/rtree.h
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/runner.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/runner.h
-FILE: ../../../flutter/shell/platform/fuchsia/flutter/runner_tzdata_missing_unittest.cc
-FILE: ../../../flutter/shell/platform/fuchsia/flutter/runner_tzdata_unittest.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/software_surface.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/software_surface.h
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/software_surface_producer.cc
@@ -2946,11 +44474,9 @@ FILE: ../../../flutter/shell/platform/fuchsia/flutter/task_runner_adapter.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/task_runner_adapter.h
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/text_delegate.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/text_delegate.h
-FILE: ../../../flutter/shell/platform/fuchsia/flutter/text_delegate_unittests.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/unique_fdio_ns.h
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/vsync_waiter.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/vsync_waiter.h
-FILE: ../../../flutter/shell/platform/fuchsia/flutter/vsync_waiter_unittest.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/vulkan_surface.cc
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/vulkan_surface.h
 FILE: ../../../flutter/shell/platform/fuchsia/flutter/vulkan_surface_pool.cc
@@ -2960,7 +44486,6 @@ FILE: ../../../flutter/shell/platform/fuchsia/flutter/vulkan_surface_producer.h
 FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/profiler_symbols/dart_profiler_symbols.dart
 FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/build_info.h
 FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/build_info_in.cc
-FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/build_info_unittests.cc
 FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/files.cc
 FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/files.h
 FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/handle_exception.cc
@@ -2978,15 +44503,11 @@ FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/vmo.h
 FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/vmservice_object.cc
 FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/vmservice_object.h
 FILE: ../../../flutter/shell/platform/glfw/client_wrapper/flutter_engine.cc
-FILE: ../../../flutter/shell/platform/glfw/client_wrapper/flutter_engine_unittests.cc
 FILE: ../../../flutter/shell/platform/glfw/client_wrapper/flutter_window_controller.cc
-FILE: ../../../flutter/shell/platform/glfw/client_wrapper/flutter_window_controller_unittests.cc
-FILE: ../../../flutter/shell/platform/glfw/client_wrapper/flutter_window_unittests.cc
 FILE: ../../../flutter/shell/platform/glfw/client_wrapper/include/flutter/flutter_engine.h
 FILE: ../../../flutter/shell/platform/glfw/client_wrapper/include/flutter/flutter_window.h
 FILE: ../../../flutter/shell/platform/glfw/client_wrapper/include/flutter/flutter_window_controller.h
 FILE: ../../../flutter/shell/platform/glfw/client_wrapper/include/flutter/plugin_registrar_glfw.h
-FILE: ../../../flutter/shell/platform/glfw/client_wrapper/plugin_registrar_glfw_unittests.cc
 FILE: ../../../flutter/shell/platform/glfw/event_loop.cc
 FILE: ../../../flutter/shell/platform/glfw/event_loop.h
 FILE: ../../../flutter/shell/platform/glfw/flutter_glfw.cc
@@ -3005,8 +44526,6 @@ FILE: ../../../flutter/shell/platform/glfw/system_utils.h
 FILE: ../../../flutter/shell/platform/glfw/system_utils_test.cc
 FILE: ../../../flutter/shell/platform/glfw/text_input_plugin.cc
 FILE: ../../../flutter/shell/platform/glfw/text_input_plugin.h
-FILE: ../../../flutter/shell/platform/linux/fl_accessibility_plugin.cc
-FILE: ../../../flutter/shell/platform/linux/fl_accessibility_plugin.h
 FILE: ../../../flutter/shell/platform/linux/fl_accessible_node.cc
 FILE: ../../../flutter/shell/platform/linux/fl_accessible_node.h
 FILE: ../../../flutter/shell/platform/linux/fl_accessible_node_test.cc
@@ -3030,8 +44549,6 @@ FILE: ../../../flutter/shell/platform/linux/fl_engine_private.h
 FILE: ../../../flutter/shell/platform/linux/fl_engine_test.cc
 FILE: ../../../flutter/shell/platform/linux/fl_event_channel.cc
 FILE: ../../../flutter/shell/platform/linux/fl_event_channel_test.cc
-FILE: ../../../flutter/shell/platform/linux/fl_gl_area.cc
-FILE: ../../../flutter/shell/platform/linux/fl_gl_area.h
 FILE: ../../../flutter/shell/platform/linux/fl_gnome_settings.cc
 FILE: ../../../flutter/shell/platform/linux/fl_gnome_settings.h
 FILE: ../../../flutter/shell/platform/linux/fl_gnome_settings_test.cc
@@ -3074,14 +44591,15 @@ FILE: ../../../flutter/shell/platform/linux/fl_pixel_buffer_texture_private.h
 FILE: ../../../flutter/shell/platform/linux/fl_pixel_buffer_texture_test.cc
 FILE: ../../../flutter/shell/platform/linux/fl_platform_plugin.cc
 FILE: ../../../flutter/shell/platform/linux/fl_platform_plugin.h
+FILE: ../../../flutter/shell/platform/linux/fl_platform_plugin_test.cc
 FILE: ../../../flutter/shell/platform/linux/fl_plugin_registrar.cc
 FILE: ../../../flutter/shell/platform/linux/fl_plugin_registrar_private.h
 FILE: ../../../flutter/shell/platform/linux/fl_plugin_registrar_test.cc
 FILE: ../../../flutter/shell/platform/linux/fl_plugin_registry.cc
 FILE: ../../../flutter/shell/platform/linux/fl_renderer.cc
 FILE: ../../../flutter/shell/platform/linux/fl_renderer.h
-FILE: ../../../flutter/shell/platform/linux/fl_renderer_gl.cc
-FILE: ../../../flutter/shell/platform/linux/fl_renderer_gl.h
+FILE: ../../../flutter/shell/platform/linux/fl_renderer_gdk.cc
+FILE: ../../../flutter/shell/platform/linux/fl_renderer_gdk.h
 FILE: ../../../flutter/shell/platform/linux/fl_renderer_headless.cc
 FILE: ../../../flutter/shell/platform/linux/fl_renderer_headless.h
 FILE: ../../../flutter/shell/platform/linux/fl_scrolling_manager.cc
@@ -3098,7 +44616,6 @@ FILE: ../../../flutter/shell/platform/linux/fl_settings_portal.cc
 FILE: ../../../flutter/shell/platform/linux/fl_settings_portal.h
 FILE: ../../../flutter/shell/platform/linux/fl_settings_portal_test.cc
 FILE: ../../../flutter/shell/platform/linux/fl_standard_message_codec.cc
-FILE: ../../../flutter/shell/platform/linux/fl_standard_message_codec_private.h
 FILE: ../../../flutter/shell/platform/linux/fl_standard_message_codec_test.cc
 FILE: ../../../flutter/shell/platform/linux/fl_standard_method_codec.cc
 FILE: ../../../flutter/shell/platform/linux/fl_standard_method_codec_test.cc
@@ -3126,8 +44643,10 @@ FILE: ../../../flutter/shell/platform/linux/fl_view_accessible.cc
 FILE: ../../../flutter/shell/platform/linux/fl_view_accessible.h
 FILE: ../../../flutter/shell/platform/linux/fl_view_accessible_test.cc
 FILE: ../../../flutter/shell/platform/linux/fl_view_private.h
+FILE: ../../../flutter/shell/platform/linux/fl_view_test.cc
 FILE: ../../../flutter/shell/platform/linux/key_mapping.g.cc
 FILE: ../../../flutter/shell/platform/linux/key_mapping.h
+FILE: ../../../flutter/shell/platform/linux/key_mapping_test.cc
 FILE: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_basic_message_channel.h
 FILE: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_binary_codec.h
 FILE: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_binary_messenger.h
@@ -3153,35 +44672,40 @@ FILE: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_texture_regi
 FILE: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_value.h
 FILE: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_view.h
 FILE: ../../../flutter/shell/platform/linux/public/flutter_linux/flutter_linux.h
-FILE: ../../../flutter/shell/platform/windows/accessibility_alert.cc
-FILE: ../../../flutter/shell/platform/windows/accessibility_alert.h
 FILE: ../../../flutter/shell/platform/windows/accessibility_bridge_windows.cc
 FILE: ../../../flutter/shell/platform/windows/accessibility_bridge_windows.h
-FILE: ../../../flutter/shell/platform/windows/accessibility_bridge_windows_unittests.cc
-FILE: ../../../flutter/shell/platform/windows/accessibility_root_node.cc
-FILE: ../../../flutter/shell/platform/windows/accessibility_root_node.h
-FILE: ../../../flutter/shell/platform/windows/angle_surface_manager.cc
-FILE: ../../../flutter/shell/platform/windows/angle_surface_manager.h
-FILE: ../../../flutter/shell/platform/windows/client_wrapper/dart_project_unittests.cc
+FILE: ../../../flutter/shell/platform/windows/accessibility_plugin.cc
+FILE: ../../../flutter/shell/platform/windows/accessibility_plugin.h
 FILE: ../../../flutter/shell/platform/windows/client_wrapper/flutter_engine.cc
-FILE: ../../../flutter/shell/platform/windows/client_wrapper/flutter_engine_unittests.cc
 FILE: ../../../flutter/shell/platform/windows/client_wrapper/flutter_view_controller.cc
-FILE: ../../../flutter/shell/platform/windows/client_wrapper/flutter_view_controller_unittests.cc
-FILE: ../../../flutter/shell/platform/windows/client_wrapper/flutter_view_unittests.cc
 FILE: ../../../flutter/shell/platform/windows/client_wrapper/include/flutter/dart_project.h
 FILE: ../../../flutter/shell/platform/windows/client_wrapper/include/flutter/flutter_engine.h
 FILE: ../../../flutter/shell/platform/windows/client_wrapper/include/flutter/flutter_view.h
 FILE: ../../../flutter/shell/platform/windows/client_wrapper/include/flutter/flutter_view_controller.h
 FILE: ../../../flutter/shell/platform/windows/client_wrapper/include/flutter/plugin_registrar_windows.h
-FILE: ../../../flutter/shell/platform/windows/client_wrapper/plugin_registrar_windows_unittests.cc
+FILE: ../../../flutter/shell/platform/windows/compositor.h
+FILE: ../../../flutter/shell/platform/windows/compositor_opengl.cc
+FILE: ../../../flutter/shell/platform/windows/compositor_opengl.h
+FILE: ../../../flutter/shell/platform/windows/compositor_software.cc
+FILE: ../../../flutter/shell/platform/windows/compositor_software.h
 FILE: ../../../flutter/shell/platform/windows/cursor_handler.cc
 FILE: ../../../flutter/shell/platform/windows/cursor_handler.h
 FILE: ../../../flutter/shell/platform/windows/direct_manipulation.cc
 FILE: ../../../flutter/shell/platform/windows/direct_manipulation.h
-FILE: ../../../flutter/shell/platform/windows/direct_manipulation_unittests.cc
 FILE: ../../../flutter/shell/platform/windows/dpi_utils.cc
 FILE: ../../../flutter/shell/platform/windows/dpi_utils.h
-FILE: ../../../flutter/shell/platform/windows/dpi_utils_unittests.cc
+FILE: ../../../flutter/shell/platform/windows/egl/context.cc
+FILE: ../../../flutter/shell/platform/windows/egl/context.h
+FILE: ../../../flutter/shell/platform/windows/egl/egl.cc
+FILE: ../../../flutter/shell/platform/windows/egl/egl.h
+FILE: ../../../flutter/shell/platform/windows/egl/manager.cc
+FILE: ../../../flutter/shell/platform/windows/egl/manager.h
+FILE: ../../../flutter/shell/platform/windows/egl/proc_table.cc
+FILE: ../../../flutter/shell/platform/windows/egl/proc_table.h
+FILE: ../../../flutter/shell/platform/windows/egl/surface.cc
+FILE: ../../../flutter/shell/platform/windows/egl/surface.h
+FILE: ../../../flutter/shell/platform/windows/egl/window_surface.cc
+FILE: ../../../flutter/shell/platform/windows/egl/window_surface.h
 FILE: ../../../flutter/shell/platform/windows/event_watcher.cc
 FILE: ../../../flutter/shell/platform/windows/event_watcher.h
 FILE: ../../../flutter/shell/platform/windows/external_texture.h
@@ -3195,87 +44719,69 @@ FILE: ../../../flutter/shell/platform/windows/flutter_platform_node_delegate_win
 FILE: ../../../flutter/shell/platform/windows/flutter_platform_node_delegate_windows.h
 FILE: ../../../flutter/shell/platform/windows/flutter_project_bundle.cc
 FILE: ../../../flutter/shell/platform/windows/flutter_project_bundle.h
-FILE: ../../../flutter/shell/platform/windows/flutter_project_bundle_unittests.cc
 FILE: ../../../flutter/shell/platform/windows/flutter_window.cc
 FILE: ../../../flutter/shell/platform/windows/flutter_window.h
-FILE: ../../../flutter/shell/platform/windows/flutter_window_unittests.cc
 FILE: ../../../flutter/shell/platform/windows/flutter_windows.cc
 FILE: ../../../flutter/shell/platform/windows/flutter_windows_engine.cc
 FILE: ../../../flutter/shell/platform/windows/flutter_windows_engine.h
-FILE: ../../../flutter/shell/platform/windows/flutter_windows_engine_unittests.cc
+FILE: ../../../flutter/shell/platform/windows/flutter_windows_internal.h
 FILE: ../../../flutter/shell/platform/windows/flutter_windows_texture_registrar.cc
 FILE: ../../../flutter/shell/platform/windows/flutter_windows_texture_registrar.h
-FILE: ../../../flutter/shell/platform/windows/flutter_windows_texture_registrar_unittests.cc
-FILE: ../../../flutter/shell/platform/windows/flutter_windows_unittests.cc
 FILE: ../../../flutter/shell/platform/windows/flutter_windows_view.cc
 FILE: ../../../flutter/shell/platform/windows/flutter_windows_view.h
-FILE: ../../../flutter/shell/platform/windows/flutter_windows_view_unittests.cc
+FILE: ../../../flutter/shell/platform/windows/flutter_windows_view_controller.h
 FILE: ../../../flutter/shell/platform/windows/keyboard_handler_base.h
 FILE: ../../../flutter/shell/platform/windows/keyboard_key_channel_handler.cc
 FILE: ../../../flutter/shell/platform/windows/keyboard_key_channel_handler.h
-FILE: ../../../flutter/shell/platform/windows/keyboard_key_channel_handler_unittests.cc
 FILE: ../../../flutter/shell/platform/windows/keyboard_key_embedder_handler.cc
 FILE: ../../../flutter/shell/platform/windows/keyboard_key_embedder_handler.h
-FILE: ../../../flutter/shell/platform/windows/keyboard_key_embedder_handler_unittests.cc
 FILE: ../../../flutter/shell/platform/windows/keyboard_key_handler.cc
 FILE: ../../../flutter/shell/platform/windows/keyboard_key_handler.h
-FILE: ../../../flutter/shell/platform/windows/keyboard_key_handler_unittests.cc
 FILE: ../../../flutter/shell/platform/windows/keyboard_manager.cc
 FILE: ../../../flutter/shell/platform/windows/keyboard_manager.h
-FILE: ../../../flutter/shell/platform/windows/keyboard_unittests.cc
 FILE: ../../../flutter/shell/platform/windows/keyboard_utils.cc
 FILE: ../../../flutter/shell/platform/windows/keyboard_utils.h
-FILE: ../../../flutter/shell/platform/windows/keyboard_utils_unittests.cc
 FILE: ../../../flutter/shell/platform/windows/platform_handler.cc
 FILE: ../../../flutter/shell/platform/windows/platform_handler.h
-FILE: ../../../flutter/shell/platform/windows/platform_handler_unittests.cc
+FILE: ../../../flutter/shell/platform/windows/platform_view_manager.cc
+FILE: ../../../flutter/shell/platform/windows/platform_view_manager.h
+FILE: ../../../flutter/shell/platform/windows/platform_view_plugin.cc
+FILE: ../../../flutter/shell/platform/windows/platform_view_plugin.h
 FILE: ../../../flutter/shell/platform/windows/public/flutter_windows.h
 FILE: ../../../flutter/shell/platform/windows/sequential_id_generator.cc
 FILE: ../../../flutter/shell/platform/windows/sequential_id_generator.h
-FILE: ../../../flutter/shell/platform/windows/sequential_id_generator_unittests.cc
 FILE: ../../../flutter/shell/platform/windows/settings_plugin.cc
 FILE: ../../../flutter/shell/platform/windows/settings_plugin.h
-FILE: ../../../flutter/shell/platform/windows/settings_plugin_unittests.cc
 FILE: ../../../flutter/shell/platform/windows/system_utils.cc
 FILE: ../../../flutter/shell/platform/windows/system_utils.h
-FILE: ../../../flutter/shell/platform/windows/system_utils_unittests.cc
 FILE: ../../../flutter/shell/platform/windows/task_runner.cc
 FILE: ../../../flutter/shell/platform/windows/task_runner.h
-FILE: ../../../flutter/shell/platform/windows/task_runner_unittests.cc
 FILE: ../../../flutter/shell/platform/windows/task_runner_window.cc
 FILE: ../../../flutter/shell/platform/windows/task_runner_window.h
 FILE: ../../../flutter/shell/platform/windows/text_input_manager.cc
 FILE: ../../../flutter/shell/platform/windows/text_input_manager.h
 FILE: ../../../flutter/shell/platform/windows/text_input_plugin.cc
 FILE: ../../../flutter/shell/platform/windows/text_input_plugin.h
-FILE: ../../../flutter/shell/platform/windows/text_input_plugin_delegate.h
-FILE: ../../../flutter/shell/platform/windows/text_input_plugin_unittest.cc
-FILE: ../../../flutter/shell/platform/windows/window.cc
-FILE: ../../../flutter/shell/platform/windows/window.h
 FILE: ../../../flutter/shell/platform/windows/window_binding_handler.h
 FILE: ../../../flutter/shell/platform/windows/window_binding_handler_delegate.h
 FILE: ../../../flutter/shell/platform/windows/window_proc_delegate_manager.cc
 FILE: ../../../flutter/shell/platform/windows/window_proc_delegate_manager.h
-FILE: ../../../flutter/shell/platform/windows/window_proc_delegate_manager_unittests.cc
 FILE: ../../../flutter/shell/platform/windows/window_state.h
-FILE: ../../../flutter/shell/platform/windows/window_unittests.cc
+FILE: ../../../flutter/shell/platform/windows/windows_lifecycle_manager.cc
+FILE: ../../../flutter/shell/platform/windows/windows_lifecycle_manager.h
 FILE: ../../../flutter/shell/platform/windows/windows_proc_table.cc
 FILE: ../../../flutter/shell/platform/windows/windows_proc_table.h
-FILE: ../../../flutter/shell/platform/windows/windows_registry.cc
-FILE: ../../../flutter/shell/platform/windows/windows_registry.h
+FILE: ../../../flutter/shell/platform/windows/windowsx_shim.h
 FILE: ../../../flutter/shell/profiling/sampling_profiler.cc
 FILE: ../../../flutter/shell/profiling/sampling_profiler.h
-FILE: ../../../flutter/shell/profiling/sampling_profiler_unittest.cc
 FILE: ../../../flutter/shell/version/version.cc
 FILE: ../../../flutter/shell/version/version.h
 FILE: ../../../flutter/shell/vmservice/empty.dart
-FILE: ../../../flutter/sky/tools/roll/patches/chromium/android_build.patch
 FILE: ../../../flutter/third_party/accessibility/base/color_utils.h
 FILE: ../../../flutter/third_party/accessibility/base/compiler_specific.h
 FILE: ../../../flutter/third_party/accessibility/base/container_utils.h
 FILE: ../../../flutter/third_party/accessibility/base/logging.cc
 FILE: ../../../flutter/third_party/accessibility/base/logging.h
-FILE: ../../../flutter/third_party/accessibility/base/logging_unittests.cc
 FILE: ../../../flutter/third_party/accessibility/base/macros.h
 FILE: ../../../flutter/third_party/accessibility/base/platform/darwin/scoped_nsobject.h
 FILE: ../../../flutter/third_party/accessibility/base/platform/darwin/scoped_nsobject.mm
@@ -3283,9 +44789,9 @@ FILE: ../../../flutter/third_party/accessibility/base/simple_token.cc
 FILE: ../../../flutter/third_party/accessibility/base/simple_token.h
 FILE: ../../../flutter/third_party/accessibility/base/string_utils.cc
 FILE: ../../../flutter/third_party/accessibility/base/string_utils.h
-FILE: ../../../flutter/third_party/accessibility/base/string_utils_unittest.cc
 FILE: ../../../flutter/third_party/accessibility/gfx/transform.cc
 FILE: ../../../flutter/third_party/accessibility/gfx/transform.h
+FILE: ../../../flutter/third_party/spring_animation/SpringAnimationTest.mm
 FILE: ../../../flutter/third_party/tonic/common/build_config.h
 FILE: ../../../flutter/third_party/tonic/common/log.cc
 FILE: ../../../flutter/third_party/tonic/common/log.h
@@ -3350,8 +44856,11 @@ FILE: ../../../flutter/third_party/txt/src/txt/platform.h
 FILE: ../../../flutter/third_party/txt/src/txt/platform_android.cc
 FILE: ../../../flutter/third_party/txt/src/txt/platform_fuchsia.cc
 FILE: ../../../flutter/third_party/txt/src/txt/platform_linux.cc
+FILE: ../../../flutter/third_party/txt/src/txt/platform_mac.h
 FILE: ../../../flutter/third_party/txt/src/txt/platform_mac.mm
 FILE: ../../../flutter/third_party/txt/src/txt/platform_windows.cc
+FILE: ../../../flutter/third_party/web_test_fonts/lib/web_test_fonts.dart
+FILE: ../../../flutter/third_party/web_test_fonts/lib/web_test_fonts/web_test_fonts.dart
 FILE: ../../../flutter/third_party/web_unicode/lib/web_unicode.dart
 FILE: ../../../flutter/third_party/web_unicode/tool/unicode_sync_script.dart
 FILE: ../../../flutter/vulkan/procs/vulkan_handle.cc
@@ -3360,6 +44869,7 @@ FILE: ../../../flutter/vulkan/procs/vulkan_interface.cc
 FILE: ../../../flutter/vulkan/procs/vulkan_interface.h
 FILE: ../../../flutter/vulkan/procs/vulkan_proc_table.cc
 FILE: ../../../flutter/vulkan/procs/vulkan_proc_table.h
+FILE: ../../../flutter/vulkan/swiftshader_path.h
 FILE: ../../../flutter/vulkan/vulkan_application.cc
 FILE: ../../../flutter/vulkan/vulkan_application.h
 FILE: ../../../flutter/vulkan/vulkan_backbuffer.cc
@@ -3390,53 +44900,9530 @@ FILE: ../../../flutter/vulkan/vulkan_utilities.h
 FILE: ../../../flutter/vulkan/vulkan_window.cc
 FILE: ../../../flutter/vulkan/vulkan_window.h
 ----------------------------------------------------------------------------------------------------
-Copyright 2013 The Flutter Authors. All rights reserved.
+Copyright 2013 The Flutter Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google Inc. nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/rsaz_exp.c (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/rsaz_exp.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/rsaz_exp.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/rsaz_exp.h
+----------------------------------------------------------------------------------------------------
+Copyright 2013-2016 The OpenSSL Project Authors. All Rights Reserved.
+Copyright (c) 2012, Intel Corporation. All Rights Reserved.
+
+Licensed under the OpenSSL license (the "License").  You may not use
+this file except in compliance with the License.  You can obtain a copy
+in the file LICENSE in the source distribution or at
+https://www.openssl.org/source/license.html
+====================================================================================================
+
+====================================================================================================
+LIBRARY: angle
+ORIGIN: ../../../flutter/third_party/angle/include/GLES2/gl2.h + MIT referenced by ../../../flutter/third_party/angle/include/GLES2/gl2.h
+ORIGIN: ../../../flutter/third_party/angle/include/GLES2/gl2ext.h + MIT referenced by ../../../flutter/third_party/angle/include/GLES2/gl2ext.h
+ORIGIN: ../../../flutter/third_party/angle/include/GLES3/gl3.h + MIT referenced by ../../../flutter/third_party/angle/include/GLES3/gl3.h
+ORIGIN: ../../../flutter/third_party/angle/include/GLES3/gl31.h + MIT referenced by ../../../flutter/third_party/angle/include/GLES3/gl31.h
+ORIGIN: ../../../flutter/third_party/angle/include/GLES3/gl32.h + MIT referenced by ../../../flutter/third_party/angle/include/GLES3/gl32.h
+ORIGIN: ../../../flutter/third_party/angle/include/GLX/glxext.h + MIT referenced by ../../../flutter/third_party/angle/include/GLX/glxext.h
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/angle/include/GLES2/gl2.h
+FILE: ../../../flutter/third_party/angle/include/GLES2/gl2ext.h
+FILE: ../../../flutter/third_party/angle/include/GLES3/gl3.h
+FILE: ../../../flutter/third_party/angle/include/GLES3/gl31.h
+FILE: ../../../flutter/third_party/angle/include/GLES3/gl32.h
+FILE: ../../../flutter/third_party/angle/include/GLX/glxext.h
+----------------------------------------------------------------------------------------------------
+Copyright 2013-2020 The Khronos Group Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libwebp
+ORIGIN: ../../../flutter/third_party/libwebp/imageio/webpdec.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/imageio/webpdec.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/alpha_processing_mips_dsp_r2.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/alpha_processing_sse2.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/cost.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/cost_mips32.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/cost_mips_dsp_r2.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/dec_clip_tables.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/dec_mips32.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/dec_mips_dsp_r2.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/enc_mips32.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/enc_mips_dsp_r2.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/filters_mips_dsp_r2.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/lossless_mips_dsp_r2.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/lossless_neon.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/lossless_sse2.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/mips_macro.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/neon.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/rescaler.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/rescaler_mips32.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/rescaler_mips_dsp_r2.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/upsampling_mips_dsp_r2.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/yuv_mips32.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/yuv_mips_dsp_r2.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/yuv_sse2.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/yuv_sse41.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/enc/near_lossless_enc.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/enc/picture_csp_enc.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/enc/picture_psnr_enc.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/enc/picture_rescale_enc.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/enc/picture_tools_enc.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/mux/anim_encode.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/utils/bit_reader_inl_utils.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/utils/endian_inl_utils.h + ../../../flutter/third_party/libwebp/COPYING
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/libwebp/imageio/webpdec.c
+FILE: ../../../flutter/third_party/libwebp/imageio/webpdec.h
+FILE: ../../../flutter/third_party/libwebp/src/dsp/alpha_processing_mips_dsp_r2.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/alpha_processing_sse2.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/cost.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/cost_mips32.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/cost_mips_dsp_r2.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/dec_clip_tables.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/dec_mips32.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/dec_mips_dsp_r2.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/enc_mips32.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/enc_mips_dsp_r2.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/filters_mips_dsp_r2.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/lossless_mips_dsp_r2.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/lossless_neon.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/lossless_sse2.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/mips_macro.h
+FILE: ../../../flutter/third_party/libwebp/src/dsp/neon.h
+FILE: ../../../flutter/third_party/libwebp/src/dsp/rescaler.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/rescaler_mips32.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/rescaler_mips_dsp_r2.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/upsampling_mips_dsp_r2.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/yuv_mips32.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/yuv_mips_dsp_r2.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/yuv_sse2.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/yuv_sse41.c
+FILE: ../../../flutter/third_party/libwebp/src/enc/near_lossless_enc.c
+FILE: ../../../flutter/third_party/libwebp/src/enc/picture_csp_enc.c
+FILE: ../../../flutter/third_party/libwebp/src/enc/picture_psnr_enc.c
+FILE: ../../../flutter/third_party/libwebp/src/enc/picture_rescale_enc.c
+FILE: ../../../flutter/third_party/libwebp/src/enc/picture_tools_enc.c
+FILE: ../../../flutter/third_party/libwebp/src/mux/anim_encode.c
+FILE: ../../../flutter/third_party/libwebp/src/utils/bit_reader_inl_utils.h
+FILE: ../../../flutter/third_party/libwebp/src/utils/endian_inl_utils.h
+----------------------------------------------------------------------------------------------------
+Copyright 2014 Google Inc. All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of Google nor the names of its contributors may
+    be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: angle
+ORIGIN: ../../../flutter/third_party/angle/include/angle_gl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/include/angle_windowsstore.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/include/export.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/MemoryBuffer.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/MemoryBuffer.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/angle_version.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/angleutils.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/platform.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/system_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/system_utils_win.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/tls.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/tls.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/ShaderVars.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/BuiltInFunctionEmulatorHLSL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/BuiltInFunctionEmulatorHLSL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/ResourcesHLSL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/ResourcesHLSL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/StructureHLSL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/StructureHLSL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/UtilsHLSL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/UtilsHLSL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/RewriteElseBlocks.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/RewriteElseBlocks.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/image_util/copyimage.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/image_util/loadimage.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/AttributeMap.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/AttributeMap.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Caps.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Caps.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Compiler.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Compiler.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Error.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Error.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Error.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/FramebufferAttachment.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/FramebufferAttachment.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/ImageIndex.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/ImageIndex.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/State.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/State.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/TransformFeedback.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/TransformFeedback.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/VertexAttribute.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/features.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/queryconversions.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/queryconversions.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/BufferImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/CompilerImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/DisplayImpl.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/DisplayImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/FramebufferImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/ProgramImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/RenderbufferImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/SamplerImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/ShaderImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/ShareGroupImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/SurfaceImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/TextureImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/TransformFeedbackImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/VertexArrayImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/copyvertex.inc.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/BufferD3D.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/BufferD3D.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/CompilerD3D.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/DisplayD3D.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/DisplayD3D.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/DynamicHLSL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/DynamicHLSL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/FramebufferD3D.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/FramebufferD3D.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/HLSLCompiler.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/ProgramD3D.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/ProgramD3D.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/RenderbufferD3D.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/RenderbufferD3D.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/RendererD3D.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/RendererD3D.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/SamplerD3D.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/ShaderD3D.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/ShaderD3D.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/SurfaceD3D.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/SurfaceD3D.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/TextureD3D.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/TextureD3D.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Buffer11.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Buffer11.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Framebuffer11.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Framebuffer11.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/TransformFeedback11.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/TransformFeedback11.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Trim11.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Trim11.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/VertexArray11.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Buffer9.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Buffer9.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Framebuffer9.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Framebuffer9.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/VertexArray9.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/SamplerGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/SamplerGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/global_state.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/global_state.h + ../../../flutter/third_party/angle/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/angle/include/angle_gl.h
+FILE: ../../../flutter/third_party/angle/include/angle_windowsstore.h
+FILE: ../../../flutter/third_party/angle/include/export.h
+FILE: ../../../flutter/third_party/angle/src/common/MemoryBuffer.cpp
+FILE: ../../../flutter/third_party/angle/src/common/MemoryBuffer.h
+FILE: ../../../flutter/third_party/angle/src/common/angle_version.h
+FILE: ../../../flutter/third_party/angle/src/common/angleutils.cpp
+FILE: ../../../flutter/third_party/angle/src/common/platform.h
+FILE: ../../../flutter/third_party/angle/src/common/system_utils.h
+FILE: ../../../flutter/third_party/angle/src/common/system_utils_win.cpp
+FILE: ../../../flutter/third_party/angle/src/common/tls.cpp
+FILE: ../../../flutter/third_party/angle/src/common/tls.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/ShaderVars.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/BuiltInFunctionEmulatorHLSL.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/BuiltInFunctionEmulatorHLSL.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/ResourcesHLSL.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/ResourcesHLSL.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/StructureHLSL.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/StructureHLSL.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/UtilsHLSL.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/UtilsHLSL.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/RewriteElseBlocks.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/RewriteElseBlocks.h
+FILE: ../../../flutter/third_party/angle/src/image_util/copyimage.inc
+FILE: ../../../flutter/third_party/angle/src/image_util/loadimage.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/AttributeMap.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/AttributeMap.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Caps.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Caps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Compiler.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Compiler.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Error.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Error.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Error.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/FramebufferAttachment.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/FramebufferAttachment.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/ImageIndex.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/ImageIndex.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/State.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/State.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/TransformFeedback.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/TransformFeedback.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/VertexAttribute.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/features.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/queryconversions.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/queryconversions.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/BufferImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/CompilerImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/DisplayImpl.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/DisplayImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/FramebufferImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/ProgramImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/RenderbufferImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/SamplerImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/ShaderImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/ShareGroupImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/SurfaceImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/TextureImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/TransformFeedbackImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/VertexArrayImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/copyvertex.inc.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/BufferD3D.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/BufferD3D.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/CompilerD3D.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/DisplayD3D.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/DisplayD3D.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/DynamicHLSL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/DynamicHLSL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/FramebufferD3D.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/FramebufferD3D.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/HLSLCompiler.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/ProgramD3D.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/ProgramD3D.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/RenderbufferD3D.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/RenderbufferD3D.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/RendererD3D.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/RendererD3D.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/SamplerD3D.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/ShaderD3D.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/ShaderD3D.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/SurfaceD3D.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/SurfaceD3D.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/TextureD3D.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/TextureD3D.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Buffer11.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Buffer11.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Framebuffer11.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Framebuffer11.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/TransformFeedback11.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/TransformFeedback11.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Trim11.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Trim11.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/VertexArray11.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Buffer9.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Buffer9.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Framebuffer9.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Framebuffer9.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/VertexArray9.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/SamplerGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/SamplerGL.h
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/global_state.cpp
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/global_state.h
+----------------------------------------------------------------------------------------------------
+Copyright 2014 The ANGLE Project Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+    Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+
+    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
+    Ltd., nor the names of their contributors may be used to endorse
+    or promote products derived from this software without specific
+    prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/cert_status_flags_list.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/pki/cert_status_flags_list.h
+----------------------------------------------------------------------------------------------------
+Copyright 2014 The Chromium Authors
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file
+====================================================================================================
+
+====================================================================================================
+LIBRARY: accessibility
+LIBRARY: angle
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_tree_id_registry.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_tree_id_registry.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_base.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_base.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_delegate.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_delegate_base.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_mac.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_mac.mm + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/numerics/safe_conversions.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/numerics/safe_conversions_impl.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/mac/coordinate_conversion.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/mac/coordinate_conversion.mm + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/base/anglebase/numerics/safe_conversions.h + ../../../LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/base/anglebase/numerics/safe_conversions_impl.h + ../../../LICENSE
+ORIGIN: ../../../flutter/third_party/icu/icu.isolate + ../../../LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/accessibility/ax/ax_tree_id_registry.cc
+FILE: ../../../flutter/third_party/accessibility/ax/ax_tree_id_registry.h
+FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node.cc
+FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node.h
+FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_base.cc
+FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_base.h
+FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_delegate.h
+FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_delegate_base.h
+FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_mac.h
+FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_mac.mm
+FILE: ../../../flutter/third_party/accessibility/base/numerics/safe_conversions.h
+FILE: ../../../flutter/third_party/accessibility/base/numerics/safe_conversions_impl.h
+FILE: ../../../flutter/third_party/accessibility/gfx/mac/coordinate_conversion.h
+FILE: ../../../flutter/third_party/accessibility/gfx/mac/coordinate_conversion.mm
+FILE: ../../../flutter/third_party/angle/src/common/base/anglebase/numerics/safe_conversions.h
+FILE: ../../../flutter/third_party/angle/src/common/base/anglebase/numerics/safe_conversions_impl.h
+FILE: ../../../flutter/third_party/icu/icu.isolate
+----------------------------------------------------------------------------------------------------
+Copyright 2014 The Chromium Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/linux-aarch64/crypto/fipsmodule/sha256-armv8.S (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/linux-aarch64/crypto/fipsmodule/sha512-armv8.S (with ../../../flutter/third_party/boringssl/src/LICENSE)
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/linux-aarch64/crypto/fipsmodule/sha256-armv8.S
+FILE: ../../../flutter/third_party/boringssl/linux-aarch64/crypto/fipsmodule/sha512-armv8.S
+----------------------------------------------------------------------------------------------------
+Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved.
+
+Licensed under the OpenSSL license (the "License").  You may not use
+this file except in compliance with the License.  You can obtain a copy
+in the file LICENSE in the source distribution or at
+https://www.openssl.org/source/license.html
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/p256-nistz.c (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/p256-nistz.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/p256-nistz.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/p256-nistz.h
+----------------------------------------------------------------------------------------------------
+Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved.
+Copyright (c) 2014, Intel Corporation. All Rights Reserved.
+
+Licensed under the OpenSSL license (the "License").  You may not use
+this file except in compliance with the License.  You can obtain a copy
+in the file LICENSE in the source distribution or at
+https://www.openssl.org/source/license.html
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/p256-nistz-table.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/p256-nistz-table.h
+----------------------------------------------------------------------------------------------------
+Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved.
+Copyright (c) 2015, Intel Inc.
+
+Licensed under the OpenSSL license (the "License").  You may not use
+this file except in compliance with the License.  You can obtain a copy
+in the file LICENSE in the source distribution or at
+https://www.openssl.org/source/license.html
+====================================================================================================
+
+====================================================================================================
+LIBRARY: spirv-cross
+ORIGIN: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/GLSL.std.450.h + MIT referenced by ../../../flutter/third_party/vulkan-deps/spirv-cross/src/GLSL.std.450.h
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/vulkan-deps/spirv-cross/src/GLSL.std.450.h
+----------------------------------------------------------------------------------------------------
+Copyright 2014-2016,2021 The Khronos Group, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/apple-aarch64/crypto/fipsmodule/sha256-armv8-apple.S (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/apple-aarch64/crypto/fipsmodule/sha512-armv8-apple.S (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/linux-aarch64/crypto/fipsmodule/sha256-armv8-linux.S (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/linux-aarch64/crypto/fipsmodule/sha512-armv8-linux.S (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/win-aarch64/crypto/fipsmodule/sha256-armv8-win.S (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/win-aarch64/crypto/fipsmodule/sha512-armv8-win.S (with ../../../flutter/third_party/boringssl/src/LICENSE)
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/apple-aarch64/crypto/fipsmodule/sha256-armv8-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-aarch64/crypto/fipsmodule/sha512-armv8-apple.S
+FILE: ../../../flutter/third_party/boringssl/linux-aarch64/crypto/fipsmodule/sha256-armv8-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-aarch64/crypto/fipsmodule/sha512-armv8-linux.S
+FILE: ../../../flutter/third_party/boringssl/win-aarch64/crypto/fipsmodule/sha256-armv8-win.S
+FILE: ../../../flutter/third_party/boringssl/win-aarch64/crypto/fipsmodule/sha512-armv8-win.S
+----------------------------------------------------------------------------------------------------
+Copyright 2014-2020 The OpenSSL Project Authors. All Rights Reserved.
+
+Licensed under the OpenSSL license (the "License").  You may not use
+this file except in compliance with the License.  You can obtain a copy
+in the file LICENSE in the source distribution or at
+https://www.openssl.org/source/license.html
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libwebp
+ORIGIN: ../../../flutter/third_party/libwebp/extras/extras.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/extras/extras.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dec/common_dec.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/demux/anim_decode.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/alpha_processing_sse41.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/cost_sse2.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/dec_sse41.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/enc_sse41.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/filters_sse2.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/lossless_enc.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/lossless_enc_mips32.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/lossless_enc_mips_dsp_r2.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/lossless_enc_neon.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/lossless_enc_sse2.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/lossless_enc_sse41.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/rescaler_neon.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/rescaler_sse2.c + ../../../flutter/third_party/libwebp/COPYING
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/libwebp/extras/extras.c
+FILE: ../../../flutter/third_party/libwebp/extras/extras.h
+FILE: ../../../flutter/third_party/libwebp/src/dec/common_dec.h
+FILE: ../../../flutter/third_party/libwebp/src/demux/anim_decode.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/alpha_processing_sse41.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/cost_sse2.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/dec_sse41.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/enc_sse41.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/filters_sse2.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/lossless_enc.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/lossless_enc_mips32.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/lossless_enc_mips_dsp_r2.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/lossless_enc_neon.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/lossless_enc_sse2.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/lossless_enc_sse41.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/rescaler_neon.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/rescaler_sse2.c
+----------------------------------------------------------------------------------------------------
+Copyright 2015 Google Inc. All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of Google nor the names of its contributors may
+    be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: angle
+ORIGIN: ../../../flutter/third_party/angle/include/platform/PlatformMethods.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/Optional.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/bitset_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/matrix_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/string_utils.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/string_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/system_utils_ios.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/system_utils_ios.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/system_utils_linux.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/system_utils_mac.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/glsl/ExtensionGLSL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/glsl/ExtensionGLSL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/apple/RewriteDoWhile.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/apple/RewriteDoWhile.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/FindSymbolNode.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/FindSymbolNode.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/image_util/generatemip.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Debug.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Debug.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Device.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Device.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Image.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Image.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Platform.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/VaryingPacking.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/VaryingPacking.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Version.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Version.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/VertexAttribute.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/histogram_macros.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/BufferImpl_mock.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/DeviceImpl.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/DeviceImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/FenceNVImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/FramebufferImpl_mock.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/GLImplFactory.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/ImageImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/ImageImpl_mock.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/ProgramImpl_mock.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/RenderbufferImpl_mock.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/SyncImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/TextureImpl_mock.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/TransformFeedbackImpl_mock.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/CompilerD3D.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/DeviceD3D.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/DeviceD3D.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/EGLImageD3D.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/EGLImageD3D.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/StateManager11.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/texture_format_table.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/DebugAnnotator9.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/DebugAnnotator9.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/StateManager9.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/StateManager9.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/formatutilsD3D.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/dxgi_support_table.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/dxgi_support_table_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/BlitGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/BlitGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/BufferGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/BufferGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/CompilerGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/CompilerGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/DisplayGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/DisplayGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/FenceNVGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/FenceNVGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/FramebufferGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/FramebufferGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/FunctionsGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/FunctionsGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/ProgramGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/ProgramGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/QueryGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/QueryGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/RenderbufferGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/RenderbufferGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/RendererGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/RendererGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/ShaderGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/ShaderGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/StateManagerGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/StateManagerGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/SurfaceGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/SurfaceGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/SyncGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/SyncGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/TextureGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/TextureGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/TransformFeedbackGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/TransformFeedbackGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/VertexArrayGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/VertexArrayGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/cgl/DisplayCGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/cgl/DisplayCGL.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/formatutilsgl.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/formatutilsgl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/functionsgl_enums.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/functionsgl_typedefs.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/DisplayGLX.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/FunctionsGLX.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/PbufferSurfaceGLX.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/PbufferSurfaceGLX.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/WindowSurfaceGLX.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/WindowSurfaceGLX.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/functionsglx_typedefs.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/platform_glx.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/D3DTextureSurfaceWGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/D3DTextureSurfaceWGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/DisplayWGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/FunctionsWGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/FunctionsWGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/PbufferSurfaceWGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/PbufferSurfaceWGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/WindowSurfaceWGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/WindowSurfaceWGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/functionswgl_typedefs.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/wgl_utils.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/wgl_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/load_functions_table.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/validationEGL.h + ../../../flutter/third_party/angle/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/angle/include/platform/PlatformMethods.h
+FILE: ../../../flutter/third_party/angle/src/common/Optional.h
+FILE: ../../../flutter/third_party/angle/src/common/bitset_utils.h
+FILE: ../../../flutter/third_party/angle/src/common/matrix_utils.h
+FILE: ../../../flutter/third_party/angle/src/common/string_utils.cpp
+FILE: ../../../flutter/third_party/angle/src/common/string_utils.h
+FILE: ../../../flutter/third_party/angle/src/common/system_utils_ios.cpp
+FILE: ../../../flutter/third_party/angle/src/common/system_utils_ios.mm
+FILE: ../../../flutter/third_party/angle/src/common/system_utils_linux.cpp
+FILE: ../../../flutter/third_party/angle/src/common/system_utils_mac.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/glsl/ExtensionGLSL.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/glsl/ExtensionGLSL.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/apple/RewriteDoWhile.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/apple/RewriteDoWhile.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/FindSymbolNode.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/FindSymbolNode.h
+FILE: ../../../flutter/third_party/angle/src/image_util/generatemip.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Debug.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Debug.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Device.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Device.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Image.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Image.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Platform.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/VaryingPacking.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/VaryingPacking.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Version.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Version.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/VertexAttribute.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/histogram_macros.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/BufferImpl_mock.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/DeviceImpl.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/DeviceImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/FenceNVImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/FramebufferImpl_mock.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/GLImplFactory.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/ImageImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/ImageImpl_mock.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/ProgramImpl_mock.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/RenderbufferImpl_mock.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/SyncImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/TextureImpl_mock.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/TransformFeedbackImpl_mock.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/CompilerD3D.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/DeviceD3D.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/DeviceD3D.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/EGLImageD3D.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/EGLImageD3D.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/StateManager11.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/texture_format_table.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/DebugAnnotator9.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/DebugAnnotator9.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/StateManager9.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/StateManager9.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/formatutilsD3D.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/dxgi_support_table.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/dxgi_support_table_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/BlitGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/BlitGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/BufferGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/BufferGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/CompilerGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/CompilerGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/DisplayGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/DisplayGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/FenceNVGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/FenceNVGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/FramebufferGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/FramebufferGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/FunctionsGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/FunctionsGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/ProgramGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/ProgramGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/QueryGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/QueryGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/RenderbufferGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/RenderbufferGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/RendererGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/RendererGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/ShaderGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/ShaderGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/StateManagerGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/StateManagerGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/SurfaceGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/SurfaceGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/SyncGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/SyncGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/TextureGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/TextureGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/TransformFeedbackGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/TransformFeedbackGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/VertexArrayGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/VertexArrayGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/cgl/DisplayCGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/cgl/DisplayCGL.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/formatutilsgl.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/formatutilsgl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/functionsgl_enums.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/functionsgl_typedefs.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/DisplayGLX.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/FunctionsGLX.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/PbufferSurfaceGLX.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/PbufferSurfaceGLX.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/WindowSurfaceGLX.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/WindowSurfaceGLX.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/functionsglx_typedefs.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/platform_glx.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/D3DTextureSurfaceWGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/D3DTextureSurfaceWGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/DisplayWGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/FunctionsWGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/FunctionsWGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/PbufferSurfaceWGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/PbufferSurfaceWGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/WindowSurfaceWGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/WindowSurfaceWGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/functionswgl_typedefs.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/wgl_utils.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/wgl_utils.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/load_functions_table.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/validationEGL.h
+----------------------------------------------------------------------------------------------------
+Copyright 2015 The ANGLE Project Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+    Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+
+    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
+    Ltd., nor the names of their contributors may be used to endorse
+    or promote products derived from this software without specific
+    prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/certificate_policies.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/certificate_policies.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/extended_key_usage.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/extended_key_usage.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/input.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/input.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/name_constraints.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/name_constraints.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/parse_certificate.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/parse_certificate.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/parse_values.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/parse_values.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/parser.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/parser.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/signature_algorithm.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/signature_algorithm.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/tag.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/tag.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/test_helpers.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/test_helpers.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/verify_certificate_chain.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/verify_certificate_chain.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/verify_name_match.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/verify_name_match.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/verify_signed_data.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/verify_signed_data.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/pki/certificate_policies.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/certificate_policies.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/extended_key_usage.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/extended_key_usage.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/input.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/input.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/name_constraints.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/name_constraints.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/parse_certificate.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/parse_certificate.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/parse_values.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/parse_values.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/parser.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/parser.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/signature_algorithm.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/signature_algorithm.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/tag.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/tag.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/test_helpers.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/test_helpers.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/verify_certificate_chain.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/verify_certificate_chain.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/verify_name_match.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/verify_name_match.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/verify_signed_data.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/verify_signed_data.h
+----------------------------------------------------------------------------------------------------
+Copyright 2015 The Chromium Authors
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file
+====================================================================================================
+
+====================================================================================================
+LIBRARY: accessibility
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_tree_data.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_tree_data.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_win.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_win.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/test_ax_node_wrapper.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/test_ax_node_wrapper.h + ../../../flutter/third_party/accessibility/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/accessibility/ax/ax_tree_data.cc
+FILE: ../../../flutter/third_party/accessibility/ax/ax_tree_data.h
+FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_win.cc
+FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_win.h
+FILE: ../../../flutter/third_party/accessibility/ax/platform/test_ax_node_wrapper.cc
+FILE: ../../../flutter/third_party/accessibility/ax/platform/test_ax_node_wrapper.h
+----------------------------------------------------------------------------------------------------
+Copyright 2015 The Chromium Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/evp/scrypt.c (with ../../../flutter/third_party/boringssl/src/LICENSE)
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/crypto/evp/scrypt.c
+----------------------------------------------------------------------------------------------------
+Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
+
+Licensed under the OpenSSL license (the "License").  You may not use
+this file except in compliance with the License.  You can obtain a copy
+in the file LICENSE in the source distribution or at
+https://www.openssl.org/source/license.html
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/montgomery_inv.c
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/montgomery_inv.c
+----------------------------------------------------------------------------------------------------
+Copyright 2016 Brian Smith.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libwebp
+ORIGIN: ../../../flutter/third_party/libwebp/extras/get_disto.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/extras/quality_estimate.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/imageio/image_dec.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/imageio/image_dec.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/imageio/image_enc.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/imageio/image_enc.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/imageio/imageio_util.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/imageio/imageio_util.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/common_sse2.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/common_sse41.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/dec_msa.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/enc_msa.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/filters_msa.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/lossless_enc_msa.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/lossless_msa.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/msa_macro.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/rescaler_msa.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/upsampling_msa.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/enc/predictor_enc.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/mux/animi.h + ../../../flutter/third_party/libwebp/COPYING
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/libwebp/extras/get_disto.c
+FILE: ../../../flutter/third_party/libwebp/extras/quality_estimate.c
+FILE: ../../../flutter/third_party/libwebp/imageio/image_dec.c
+FILE: ../../../flutter/third_party/libwebp/imageio/image_dec.h
+FILE: ../../../flutter/third_party/libwebp/imageio/image_enc.c
+FILE: ../../../flutter/third_party/libwebp/imageio/image_enc.h
+FILE: ../../../flutter/third_party/libwebp/imageio/imageio_util.c
+FILE: ../../../flutter/third_party/libwebp/imageio/imageio_util.h
+FILE: ../../../flutter/third_party/libwebp/src/dsp/common_sse2.h
+FILE: ../../../flutter/third_party/libwebp/src/dsp/common_sse41.h
+FILE: ../../../flutter/third_party/libwebp/src/dsp/dec_msa.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/enc_msa.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/filters_msa.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/lossless_enc_msa.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/lossless_msa.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/msa_macro.h
+FILE: ../../../flutter/third_party/libwebp/src/dsp/rescaler_msa.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/upsampling_msa.c
+FILE: ../../../flutter/third_party/libwebp/src/enc/predictor_enc.c
+FILE: ../../../flutter/third_party/libwebp/src/mux/animi.h
+----------------------------------------------------------------------------------------------------
+Copyright 2016 Google Inc. All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of Google nor the names of its contributors may
+    be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: angle
+ORIGIN: ../../../flutter/third_party/angle/src/common/Color.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/Color.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/WorkerThread.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/WorkerThread.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/base/anglebase/logging.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/vector_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/vulkan/vk_headers.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/fuzz/translator_fuzzer.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/ConstantUnion.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/Severity.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/ValidateMaxParameters.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/ValidateMaxParameters.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/TextureFunctionHLSL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/TextureFunctionHLSL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/spirv/TranslatorSPIRV.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/spirv/TranslatorSPIRV.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/DeferGlobalInitializers.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/DeferGlobalInitializers.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RemoveInvariantDeclaration.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RemoveInvariantDeclaration.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RewriteTexelFetchOffset.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RewriteTexelFetchOffset.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/SimplifyLoopConditions.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/SimplifyLoopConditions.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/SplitSequenceOperator.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/SplitSequenceOperator.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/UseInterfaceBlockFields.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/UseInterfaceBlockFields.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/apple/AddAndTrueToLoopCondition.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/apple/AddAndTrueToLoopCondition.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/apple/RewriteUnaryMinusOperatorFloat.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/apple/RewriteUnaryMinusOperatorFloat.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/AddDefaultReturnStatements.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/AddDefaultReturnStatements.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/BreakVariableAliasingInInnerLoops.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/BreakVariableAliasingInInnerLoops.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/ExpandIntegerPowExpressions.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/ExpandIntegerPowExpressions.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/RewriteUnaryMinusOperatorInt.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/RewriteUnaryMinusOperatorInt.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/IntermNodePatternMatcher.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/IntermNodePatternMatcher.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/image_util/imageformats.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Observer.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Stream.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Stream.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Thread.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Thread.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/es3_copy_conversion_table_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/format_map_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/queryutils.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/queryutils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/ContextImpl.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/ContextImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/EGLImplFactory.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/Format.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/FramebufferAttachmentObjectImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/StreamProducerImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/TextureImpl.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/HLSLCompiler.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/NativeWindowD3D.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/NativeWindowD3D.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/SwapChainD3D.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Context11.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Context11.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/NativeWindow11.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/StreamProducerD3DTexture.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/StreamProducerD3DTexture.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/VertexArray11.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/texture_format_table.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/texture_format_table_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Context9.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Context9.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/NativeWindow9.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/NativeWindow9.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/driver_utils.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/driver_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/ContextGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/ContextGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/DisplayEGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/DisplayEGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/FunctionsEGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/FunctionsEGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/FunctionsEGLDL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/FunctionsEGLDL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/PbufferSurfaceEGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/PbufferSurfaceEGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/SurfaceEGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/SurfaceEGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/WindowSurfaceEGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/WindowSurfaceEGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/android/DisplayAndroid.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/android/DisplayAndroid.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/functionsegl_typedefs.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/SurfaceGLX.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/BufferNULL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/BufferNULL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/CompilerNULL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/CompilerNULL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/ContextNULL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/ContextNULL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/DeviceNULL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/DeviceNULL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/DisplayNULL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/DisplayNULL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/FenceNVNULL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/FenceNVNULL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/FramebufferNULL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/FramebufferNULL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/ImageNULL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/ImageNULL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/ProgramNULL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/ProgramNULL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/QueryNULL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/QueryNULL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/RenderbufferNULL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/RenderbufferNULL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/SamplerNULL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/SamplerNULL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/ShaderNULL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/ShaderNULL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/SurfaceNULL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/SurfaceNULL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/SyncNULL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/SyncNULL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/TextureNULL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/TextureNULL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/TransformFeedbackNULL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/TransformFeedbackNULL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/VertexArrayNULL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/VertexArrayNULL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/renderer_utils.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/renderer_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/BufferVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/BufferVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CompilerVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CompilerVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ContextVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ContextVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/DeviceVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/DeviceVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/FenceNVVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/FenceNVVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/FramebufferVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/FramebufferVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ImageVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ImageVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ProgramVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ProgramVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/QueryVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/QueryVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/RenderTargetVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/RenderTargetVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/RenderbufferVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/RenderbufferVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/RendererVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/RendererVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/SamplerVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/SamplerVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ShaderVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ShaderVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/SurfaceVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/SurfaceVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/SyncVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/SyncVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/TextureVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/TextureVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/TransformFeedbackVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/TransformFeedbackVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/VertexArrayVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/DeviceVkLinux.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/DeviceVkLinux.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/xcb/DisplayVkXcb.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/xcb/DisplayVkXcb.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/xcb/WindowSurfaceVkXcb.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/xcb/WindowSurfaceVkXcb.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_format_utils.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_format_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_utils.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/win32/DisplayVkWin32.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/win32/DisplayVkWin32.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/win32/WindowSurfaceVkWin32.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/win32/WindowSurfaceVkWin32.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/validationEGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/validationES31.cpp + ../../../flutter/third_party/angle/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/angle/src/common/Color.h
+FILE: ../../../flutter/third_party/angle/src/common/Color.inc
+FILE: ../../../flutter/third_party/angle/src/common/WorkerThread.cpp
+FILE: ../../../flutter/third_party/angle/src/common/WorkerThread.h
+FILE: ../../../flutter/third_party/angle/src/common/base/anglebase/logging.h
+FILE: ../../../flutter/third_party/angle/src/common/vector_utils.h
+FILE: ../../../flutter/third_party/angle/src/common/vulkan/vk_headers.h
+FILE: ../../../flutter/third_party/angle/src/compiler/fuzz/translator_fuzzer.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/ConstantUnion.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/Severity.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/ValidateMaxParameters.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/ValidateMaxParameters.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/TextureFunctionHLSL.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/TextureFunctionHLSL.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/spirv/TranslatorSPIRV.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/spirv/TranslatorSPIRV.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/DeferGlobalInitializers.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/DeferGlobalInitializers.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RemoveInvariantDeclaration.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RemoveInvariantDeclaration.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RewriteTexelFetchOffset.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RewriteTexelFetchOffset.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/SimplifyLoopConditions.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/SimplifyLoopConditions.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/SplitSequenceOperator.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/SplitSequenceOperator.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/UseInterfaceBlockFields.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/UseInterfaceBlockFields.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/apple/AddAndTrueToLoopCondition.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/apple/AddAndTrueToLoopCondition.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/apple/RewriteUnaryMinusOperatorFloat.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/apple/RewriteUnaryMinusOperatorFloat.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/AddDefaultReturnStatements.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/AddDefaultReturnStatements.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/BreakVariableAliasingInInnerLoops.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/BreakVariableAliasingInInnerLoops.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/ExpandIntegerPowExpressions.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/ExpandIntegerPowExpressions.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/RewriteUnaryMinusOperatorInt.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/RewriteUnaryMinusOperatorInt.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/IntermNodePatternMatcher.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/IntermNodePatternMatcher.h
+FILE: ../../../flutter/third_party/angle/src/image_util/imageformats.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Observer.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Stream.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Stream.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Thread.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Thread.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/es3_copy_conversion_table_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/format_map_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/queryutils.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/queryutils.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/ContextImpl.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/ContextImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/EGLImplFactory.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/Format.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/FramebufferAttachmentObjectImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/StreamProducerImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/TextureImpl.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/HLSLCompiler.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/NativeWindowD3D.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/NativeWindowD3D.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/SwapChainD3D.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Context11.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Context11.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/NativeWindow11.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/StreamProducerD3DTexture.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/StreamProducerD3DTexture.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/VertexArray11.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/texture_format_table.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/texture_format_table_utils.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Context9.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Context9.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/NativeWindow9.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/NativeWindow9.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/driver_utils.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/driver_utils.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/ContextGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/ContextGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/DisplayEGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/DisplayEGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/FunctionsEGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/FunctionsEGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/FunctionsEGLDL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/FunctionsEGLDL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/PbufferSurfaceEGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/PbufferSurfaceEGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/SurfaceEGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/SurfaceEGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/WindowSurfaceEGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/WindowSurfaceEGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/android/DisplayAndroid.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/android/DisplayAndroid.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/functionsegl_typedefs.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/SurfaceGLX.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/BufferNULL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/BufferNULL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/CompilerNULL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/CompilerNULL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/ContextNULL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/ContextNULL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/DeviceNULL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/DeviceNULL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/DisplayNULL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/DisplayNULL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/FenceNVNULL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/FenceNVNULL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/FramebufferNULL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/FramebufferNULL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/ImageNULL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/ImageNULL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/ProgramNULL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/ProgramNULL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/QueryNULL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/QueryNULL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/RenderbufferNULL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/RenderbufferNULL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/SamplerNULL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/SamplerNULL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/ShaderNULL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/ShaderNULL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/SurfaceNULL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/SurfaceNULL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/SyncNULL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/SyncNULL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/TextureNULL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/TextureNULL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/TransformFeedbackNULL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/TransformFeedbackNULL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/VertexArrayNULL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/VertexArrayNULL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/renderer_utils.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/renderer_utils.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/BufferVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/BufferVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CompilerVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CompilerVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ContextVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ContextVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/DeviceVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/DeviceVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/FenceNVVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/FenceNVVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/FramebufferVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ImageVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ImageVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ProgramVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ProgramVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/QueryVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/QueryVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/RenderTargetVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/RenderTargetVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/RenderbufferVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/RenderbufferVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/RendererVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/RendererVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/SamplerVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/SamplerVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ShaderVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ShaderVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/SurfaceVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/SurfaceVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/SyncVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/SyncVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/TextureVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/TextureVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/TransformFeedbackVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/TransformFeedbackVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/VertexArrayVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/DeviceVkLinux.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/DeviceVkLinux.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/xcb/DisplayVkXcb.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/xcb/DisplayVkXcb.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/xcb/WindowSurfaceVkXcb.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/xcb/WindowSurfaceVkXcb.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_format_utils.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_format_utils.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_utils.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_utils.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/win32/DisplayVkWin32.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/win32/DisplayVkWin32.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/win32/WindowSurfaceVkWin32.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/win32/WindowSurfaceVkWin32.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/validationEGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/validationES31.cpp
+----------------------------------------------------------------------------------------------------
+Copyright 2016 The ANGLE Project Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+    Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+
+    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
+    Ltd., nor the names of their contributors may be used to endorse
+    or promote products derived from this software without specific
+    prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/cert_error_id.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/cert_error_id.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/cert_error_params.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/cert_error_params.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/cert_errors.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/cert_errors.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/cert_issuer_source.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/cert_issuer_source_static.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/cert_issuer_source_static.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/cert_verify_proc_blocklist.inc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/encode_values.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/encode_values.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/ocsp.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/ocsp.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/ocsp_revocation_status.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/ocsp_verify_result.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/ocsp_verify_result.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/parse_name.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/parse_name.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/parsed_certificate.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/parsed_certificate.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/path_builder.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/path_builder.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/trust_store.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/trust_store.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/trust_store_collection.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/trust_store_collection.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/trust_store_in_memory.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/trust_store_in_memory.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/pki/cert_error_id.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/cert_error_id.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/cert_error_params.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/cert_error_params.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/cert_errors.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/cert_errors.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/cert_issuer_source.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/cert_issuer_source_static.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/cert_issuer_source_static.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/cert_verify_proc_blocklist.inc
+FILE: ../../../flutter/third_party/boringssl/src/pki/encode_values.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/encode_values.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/ocsp.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/ocsp.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/ocsp_revocation_status.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/ocsp_verify_result.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/ocsp_verify_result.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/parse_name.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/parse_name.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/parsed_certificate.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/parsed_certificate.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/path_builder.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/path_builder.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/trust_store.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/trust_store.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/trust_store_collection.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/trust_store_collection.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/trust_store_in_memory.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/trust_store_in_memory.h
+----------------------------------------------------------------------------------------------------
+Copyright 2016 The Chromium Authors
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file
+====================================================================================================
+
+====================================================================================================
+LIBRARY: accessibility
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_action_data.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_action_data.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_node_position.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_node_position.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_position.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_range.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_relative_bounds.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_relative_bounds.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/gfx/range/gfx_range_export.h + ../../../flutter/third_party/accessibility/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/accessibility/ax/ax_action_data.cc
+FILE: ../../../flutter/third_party/accessibility/ax/ax_action_data.h
+FILE: ../../../flutter/third_party/accessibility/ax/ax_node_position.cc
+FILE: ../../../flutter/third_party/accessibility/ax/ax_node_position.h
+FILE: ../../../flutter/third_party/accessibility/ax/ax_position.h
+FILE: ../../../flutter/third_party/accessibility/ax/ax_range.h
+FILE: ../../../flutter/third_party/accessibility/ax/ax_relative_bounds.cc
+FILE: ../../../flutter/third_party/accessibility/ax/ax_relative_bounds.h
+FILE: ../../../flutter/third_party/accessibility/gfx/range/gfx_range_export.h
+----------------------------------------------------------------------------------------------------
+Copyright 2016 The Chromium Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libwebp
+ORIGIN: ../../../flutter/third_party/libwebp/extras/vwebp_sdl.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/extras/webp_to_sdl.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/extras/webp_to_sdl.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/imageio/pnmdec.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/imageio/pnmdec.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/alpha_processing_neon.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/filters_neon.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/ssim.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/ssim_sse2.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/yuv_neon.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/enc/backward_references_cost_enc.c + ../../../flutter/third_party/libwebp/COPYING
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/libwebp/extras/vwebp_sdl.c
+FILE: ../../../flutter/third_party/libwebp/extras/webp_to_sdl.c
+FILE: ../../../flutter/third_party/libwebp/extras/webp_to_sdl.h
+FILE: ../../../flutter/third_party/libwebp/imageio/pnmdec.c
+FILE: ../../../flutter/third_party/libwebp/imageio/pnmdec.h
+FILE: ../../../flutter/third_party/libwebp/src/dsp/alpha_processing_neon.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/filters_neon.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/ssim.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/ssim_sse2.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/yuv_neon.c
+FILE: ../../../flutter/third_party/libwebp/src/enc/backward_references_cost_enc.c
+----------------------------------------------------------------------------------------------------
+Copyright 2017 Google Inc. All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of Google nor the names of its contributors may
+    be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: angle
+ORIGIN: ../../../flutter/third_party/angle/include/EGL/eglext_angle.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/include/GLES2/gl2ext_angle.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/PackedCLEnums_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/PackedCLEnums_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/PackedEGLEnums_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/PackedEGLEnums_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/PackedEnums.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/PackedGLEnums_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/PackedGLEnums_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/aligned_memory.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/aligned_memory.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/base/anglebase/base_export.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/base/anglebase/macros.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/base/anglebase/sys_byteorder.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/uniform_type_info_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/Declarator.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/Declarator.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/ExtensionBehavior.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/HashNames.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/IsASTDepthBelowLimit.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/IsASTDepthBelowLimit.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/OutputTree.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/StaticType.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/Symbol.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/Symbol.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/SymbolUniqueId.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/SymbolUniqueId.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/ImageFunctionHLSL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/ImageFunctionHLSL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/emulated_builtin_functions_hlsl_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/ClampFragDepth.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/ClampFragDepth.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/ClampPointSize.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/ClampPointSize.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/DeclareAndInitBuiltinsForInstancedMultiview.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/DeclareAndInitBuiltinsForInstancedMultiview.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RemoveArrayLengthMethod.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RemoveArrayLengthMethod.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RemoveUnreferencedVariables.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RemoveUnreferencedVariables.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/WrapSwitchStatementsInBlocks.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/WrapSwitchStatementsInBlocks.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/FindMain.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/FindMain.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/IntermNode_util.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/IntermNode_util.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/IntermTraverse.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/RunAtTheEndOfShader.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/RunAtTheEndOfShader.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/gpu_info_util/SystemInfo_macos.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/ErrorStrings.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/LoggingAnnotator.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/LoggingAnnotator.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/MemoryProgramCache.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/MemoryProgramCache.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/ProgramLinkedResources.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/ProgramLinkedResources.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/ProgramPipeline.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/ProgramPipeline.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/ResourceMap.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/SizedMRUCache.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/ProgramPipelineImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/ProgramPipeline11.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/ProgramPipeline11.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/ResourceManager11.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/ResourceManager11.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/Clear11.hlsl + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/ClearMultiviewGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/ClearMultiviewGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/DispatchTableGL_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/DispatchTableGL_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/ProgramPipelineGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/ProgramPipelineGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/egl_utils.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/egl_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/null_functions.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/null_functions.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/SurfaceWGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/ProgramPipelineNULL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/ProgramPipelineNULL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ProgramPipelineVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ProgramPipelineVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ResourceVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ResourceVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/proc_table_egl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/proc_table_glx.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/proc_table_wgl.h + ../../../flutter/third_party/angle/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/angle/include/EGL/eglext_angle.h
+FILE: ../../../flutter/third_party/angle/include/GLES2/gl2ext_angle.h
+FILE: ../../../flutter/third_party/angle/src/common/PackedCLEnums_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/common/PackedCLEnums_autogen.h
+FILE: ../../../flutter/third_party/angle/src/common/PackedEGLEnums_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/common/PackedEGLEnums_autogen.h
+FILE: ../../../flutter/third_party/angle/src/common/PackedEnums.h
+FILE: ../../../flutter/third_party/angle/src/common/PackedGLEnums_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/common/PackedGLEnums_autogen.h
+FILE: ../../../flutter/third_party/angle/src/common/aligned_memory.cpp
+FILE: ../../../flutter/third_party/angle/src/common/aligned_memory.h
+FILE: ../../../flutter/third_party/angle/src/common/base/anglebase/base_export.h
+FILE: ../../../flutter/third_party/angle/src/common/base/anglebase/macros.h
+FILE: ../../../flutter/third_party/angle/src/common/base/anglebase/sys_byteorder.h
+FILE: ../../../flutter/third_party/angle/src/common/uniform_type_info_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/Declarator.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/Declarator.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/ExtensionBehavior.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/HashNames.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/IsASTDepthBelowLimit.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/IsASTDepthBelowLimit.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/OutputTree.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/StaticType.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/Symbol.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/Symbol.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/SymbolUniqueId.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/SymbolUniqueId.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/ImageFunctionHLSL.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/ImageFunctionHLSL.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/emulated_builtin_functions_hlsl_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/ClampFragDepth.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/ClampFragDepth.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/ClampPointSize.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/ClampPointSize.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/DeclareAndInitBuiltinsForInstancedMultiview.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/DeclareAndInitBuiltinsForInstancedMultiview.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RemoveArrayLengthMethod.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RemoveArrayLengthMethod.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RemoveUnreferencedVariables.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RemoveUnreferencedVariables.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/WrapSwitchStatementsInBlocks.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/WrapSwitchStatementsInBlocks.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/FindMain.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/FindMain.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/IntermNode_util.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/IntermNode_util.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/IntermTraverse.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/RunAtTheEndOfShader.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/RunAtTheEndOfShader.h
+FILE: ../../../flutter/third_party/angle/src/gpu_info_util/SystemInfo_macos.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/ErrorStrings.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/LoggingAnnotator.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/LoggingAnnotator.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/MemoryProgramCache.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/MemoryProgramCache.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/ProgramLinkedResources.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/ProgramLinkedResources.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/ProgramPipeline.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/ProgramPipeline.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/ResourceMap.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/SizedMRUCache.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/ProgramPipelineImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/ProgramPipeline11.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/ProgramPipeline11.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/ResourceManager11.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/ResourceManager11.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/Clear11.hlsl
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/ClearMultiviewGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/ClearMultiviewGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/DispatchTableGL_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/DispatchTableGL_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/ProgramPipelineGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/ProgramPipelineGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/egl_utils.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/egl_utils.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/null_functions.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/null_functions.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/SurfaceWGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/ProgramPipelineNULL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/null/ProgramPipelineNULL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ProgramPipelineVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ProgramPipelineVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ResourceVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ResourceVk.h
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/proc_table_egl.h
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/proc_table_glx.h
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/proc_table_wgl.h
+----------------------------------------------------------------------------------------------------
+Copyright 2017 The ANGLE Project Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+    Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+
+    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
+    Ltd., nor the names of their contributors may be used to endorse
+    or promote products derived from this software without specific
+    prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/common_cert_errors.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/common_cert_errors.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/general_names.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/general_names.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/simple_path_builder_delegate.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/simple_path_builder_delegate.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/pki/common_cert_errors.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/common_cert_errors.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/general_names.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/general_names.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/simple_path_builder_delegate.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/simple_path_builder_delegate.h
+----------------------------------------------------------------------------------------------------
+Copyright 2017 The Chromium Authors
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file
+====================================================================================================
+
+====================================================================================================
+LIBRARY: accessibility
+LIBRARY: angle
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_action_handler.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_action_handler.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_event_generator.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_event_generator.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_mode.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_mode_observer.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_role_properties.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_role_properties.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_relation_win.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_relation_win.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/ax_unique_id.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/ax_unique_id.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/numerics/checked_math.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/numerics/checked_math_impl.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/numerics/clamped_math.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/numerics/clamped_math_impl.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/numerics/math_constants.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/numerics/ranges.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/numerics/safe_conversions_arm_impl.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/numerics/safe_math.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/numerics/safe_math_arm_impl.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/numerics/safe_math_clang_gcc_impl.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/numerics/safe_math_shared_impl.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/base/anglebase/numerics/checked_math.h + ../../../LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/base/anglebase/numerics/checked_math_impl.h + ../../../LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/base/anglebase/numerics/clamped_math.h + ../../../LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/base/anglebase/numerics/clamped_math_impl.h + ../../../LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/base/anglebase/numerics/math_constants.h + ../../../LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/base/anglebase/numerics/ranges.h + ../../../LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/base/anglebase/numerics/safe_conversions_arm_impl.h + ../../../LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/base/anglebase/numerics/safe_math.h + ../../../LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/base/anglebase/numerics/safe_math_arm_impl.h + ../../../LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/base/anglebase/numerics/safe_math_clang_gcc_impl.h + ../../../LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/base/anglebase/numerics/safe_math_shared_impl.h + ../../../LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/accessibility/ax/ax_action_handler.cc
+FILE: ../../../flutter/third_party/accessibility/ax/ax_action_handler.h
+FILE: ../../../flutter/third_party/accessibility/ax/ax_event_generator.cc
+FILE: ../../../flutter/third_party/accessibility/ax/ax_event_generator.h
+FILE: ../../../flutter/third_party/accessibility/ax/ax_mode.h
+FILE: ../../../flutter/third_party/accessibility/ax/ax_mode_observer.h
+FILE: ../../../flutter/third_party/accessibility/ax/ax_role_properties.cc
+FILE: ../../../flutter/third_party/accessibility/ax/ax_role_properties.h
+FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_relation_win.cc
+FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_relation_win.h
+FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_unique_id.cc
+FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_unique_id.h
+FILE: ../../../flutter/third_party/accessibility/base/numerics/checked_math.h
+FILE: ../../../flutter/third_party/accessibility/base/numerics/checked_math_impl.h
+FILE: ../../../flutter/third_party/accessibility/base/numerics/clamped_math.h
+FILE: ../../../flutter/third_party/accessibility/base/numerics/clamped_math_impl.h
+FILE: ../../../flutter/third_party/accessibility/base/numerics/math_constants.h
+FILE: ../../../flutter/third_party/accessibility/base/numerics/ranges.h
+FILE: ../../../flutter/third_party/accessibility/base/numerics/safe_conversions_arm_impl.h
+FILE: ../../../flutter/third_party/accessibility/base/numerics/safe_math.h
+FILE: ../../../flutter/third_party/accessibility/base/numerics/safe_math_arm_impl.h
+FILE: ../../../flutter/third_party/accessibility/base/numerics/safe_math_clang_gcc_impl.h
+FILE: ../../../flutter/third_party/accessibility/base/numerics/safe_math_shared_impl.h
+FILE: ../../../flutter/third_party/angle/src/common/base/anglebase/numerics/checked_math.h
+FILE: ../../../flutter/third_party/angle/src/common/base/anglebase/numerics/checked_math_impl.h
+FILE: ../../../flutter/third_party/angle/src/common/base/anglebase/numerics/clamped_math.h
+FILE: ../../../flutter/third_party/angle/src/common/base/anglebase/numerics/clamped_math_impl.h
+FILE: ../../../flutter/third_party/angle/src/common/base/anglebase/numerics/math_constants.h
+FILE: ../../../flutter/third_party/angle/src/common/base/anglebase/numerics/ranges.h
+FILE: ../../../flutter/third_party/angle/src/common/base/anglebase/numerics/safe_conversions_arm_impl.h
+FILE: ../../../flutter/third_party/angle/src/common/base/anglebase/numerics/safe_math.h
+FILE: ../../../flutter/third_party/angle/src/common/base/anglebase/numerics/safe_math_arm_impl.h
+FILE: ../../../flutter/third_party/angle/src/common/base/anglebase/numerics/safe_math_clang_gcc_impl.h
+FILE: ../../../flutter/third_party/angle/src/common/base/anglebase/numerics/safe_math_shared_impl.h
+----------------------------------------------------------------------------------------------------
+Copyright 2017 The Chromium Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libwebp
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/cost_neon.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/quant.h + ../../../flutter/third_party/libwebp/COPYING
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/libwebp/src/dsp/cost_neon.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/quant.h
+----------------------------------------------------------------------------------------------------
+Copyright 2018 Google Inc. All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of Google nor the names of its contributors may
+    be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: angle
+ORIGIN: ../../../flutter/third_party/angle/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/assets/a4a_rules.json
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/drawable/icon.png
+FILE: ../../../flutter/third_party/angle/src/common/fuchsia_egl/fuchsia_egl.c
+FILE: ../../../flutter/third_party/angle/src/common/fuchsia_egl/fuchsia_egl.h
+FILE: ../../../flutter/third_party/angle/src/common/fuchsia_egl/fuchsia_egl_backend.h
+FILE: ../../../flutter/third_party/angle/src/common/packed_cl_enums.json
+FILE: ../../../flutter/third_party/angle/src/common/packed_egl_enums.json
+FILE: ../../../flutter/third_party/angle/src/common/packed_gl_enums.json
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/builtin_function_declarations.txt
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/emulated_builtin_function_data_hlsl.json
+FILE: ../../../flutter/third_party/angle/src/feature_support_util/a4a_rules.json
+FILE: ../../../flutter/third_party/angle/src/libANGLE/es3_copy_conversion_formats.json
+FILE: ../../../flutter/third_party/angle/src/libANGLE/es3_format_type_combinations.json
+FILE: ../../../flutter/third_party/angle/src/libANGLE/format_map_data.json
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/angle_format_data.json
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/angle_format_map.json
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/BufferToTexture11.hlsl
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/Passthrough2D11.hlsl
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/ResolveColor.hlsl
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/ResolveDepthStencil.hlsl
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/Swizzle11.hlsl
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_gs.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4f.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4i.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4ui.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_vs.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11_fl9vs.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11multiviewgs.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11multiviewvs.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11vs.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/cleardepth11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11_fl9ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps1.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps2.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps3.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps4.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps5.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps6.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps7.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps8.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps1.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps2.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps3.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps4.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps5.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps6.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps7.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps8.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps1.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps2.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps3.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps4.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps5.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps6.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps7.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps8.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_luma_2d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_luma_2darray_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_luma_3d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_lumaalpha_2d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_lumaalpha_2darray_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_lumaalpha_3d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_2d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_2darray_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_3d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_565_2d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_565_2darray_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_565_3d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_2d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_2darray_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_3d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_4444_2d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_4444_2darray_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_4444_3d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_5551_2d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_5551_2darray_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_5551_3d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_luma_2d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_luma_2darray_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_luma_3d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_lumaalpha_2d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_lumaalpha_2darray_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_lumaalpha_3d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_2d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_2darray_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_3d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_565_2d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_565_2darray_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_565_3d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_2d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_2darray_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_3d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_4444_2d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_4444_2darray_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_4444_3d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_4444_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_5551_2d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_5551_2darray_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_5551_3d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_5551_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pm_rgb_2darray_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pm_rgb_3d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pm_rgba_2darray_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pm_rgba_3d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pt_rgb_2darray_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pt_rgb_3d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pt_rgba_2darray_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pt_rgba_3d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_um_rgb_2darray_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_um_rgb_3d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_um_rgba_2darray_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_um_rgba_3d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgb_2d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgb_2darray_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgb_3d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgba_2d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgba_2darray_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgba_3d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgb_2d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgb_2darray_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgb_3d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgba_2d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgba_2darray_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgba_3d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgb_2d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgb_2darray_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgb_3d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgba_2d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgba_2darray_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgba_3d_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough2d11vs.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough3d11gs.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough3d11vs.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrougha2d11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughdepth2d11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlum2d11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlum2darray11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlum3d11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha2d11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha2darray11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha3d11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2d11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2darray11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2darrayi11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2darrayui11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2di11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2dui11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr3d11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr3di11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr3dui11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2d11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2darray11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2darrayi11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2darrayui11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2di11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2dui11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg3d11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg3di11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg3dui11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2d11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2d_565_11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2darray11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2darray_565_11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2darrayi11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2darrayui11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2di11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2dui11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3d11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3d_565_11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3di11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3dui11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2d11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2d_4444_11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2d_5551_11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darray11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darray_4444_11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darray_5551_11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darrayi11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darrayui11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2di11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2dms11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2dui11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3d11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3d_4444_11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3d_5551_11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3di11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3dui11ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvecolor2dps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvedepth11_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvedepthstencil11_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvedepthstencil11_vs.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvestencil11_ps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlef2darrayps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlef2dps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlef3dps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlei2darrayps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlei2dps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlei3dps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui2darrayps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui2dps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui3dps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/texture_format_data.json
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/texture_format_map.json
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskpremultps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskunmultps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/luminancepremultps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/luminanceps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/luminanceunmultps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/passthroughps.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/standardvs.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/dxgi_format_data.json
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/dxgi_support_data.json
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/gl_bindings_data.json
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/FBConfigCompatibility.md
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/load_functions_data.json
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/OverlayDraw.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_mandatory_format_support_data.json
+FILE: ../../../flutter/third_party/angle/src/libEGL/libEGL.rc
+FILE: ../../../flutter/third_party/angle/src/libEGL/resource.h
+FILE: ../../../flutter/third_party/angle/src/libGLESv1_CM/libGLESv1_CM.def
+FILE: ../../../flutter/third_party/angle/src/libGLESv1_CM/libGLESv1_CM.rc
+FILE: ../../../flutter/third_party/angle/src/libGLESv1_CM/resource.h
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/libGLESv2.rc
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/resource.h
+----------------------------------------------------------------------------------------------------
+Copyright 2018 The ANGLE Project Authors.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+    Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+
+    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
+    Ltd., nor the names of their contributors may be used to endorse
+    or promote products derived from this software without specific
+    prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: angle
+ORIGIN: ../../../flutter/third_party/angle/src/android_system_settings/res/values-v17/styles.xml + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/FastVector.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/FixedVector.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/PackedEnums.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/android_util.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/android_util.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/hash_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/matrix_utils.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/system_utils.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/system_utils_posix.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/FunctionLookup.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/FunctionLookup.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/ImmutableString.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/ImmutableStringBuilder.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/ImmutableStringBuilder.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/builtin_variables.json + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/AtomicCounterFunctionHLSL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/AtomicCounterFunctionHLSL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/ShaderStorageBlockFunctionHLSL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/ShaderStorageBlockFunctionHLSL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/ShaderStorageBlockOutputHLSL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/ShaderStorageBlockOutputHLSL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/FoldExpressions.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/FoldExpressions.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/PruneEmptyCases.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/PruneEmptyCases.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RewriteStructSamplers.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RewriteStructSamplers.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/SeparateStructFromUniformDeclarations.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/SeparateStructFromUniformDeclarations.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/RewriteRepeatedAssignToSwizzled.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/RewriteRepeatedAssignToSwizzled.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/RewriteAtomicFunctionExpressions.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/RewriteAtomicFunctionExpressions.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/RewriteExpressionsWithShaderStorageBlock.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/RewriteExpressionsWithShaderStorageBlock.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/SeparateArrayConstructorStatements.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/SeparateArrayConstructorStatements.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/NameEmbeddedUniformStructsMetal.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/NameEmbeddedUniformStructsMetal.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/ReplaceVariable.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/ReplaceVariable.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/Visit.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/feature_support_util/feature_support_util.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/feature_support_util/feature_support_util.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/gpu_info_util/SystemInfo_android.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/BlobCache.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/BlobCache.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Context.inl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Context_gles_1_0.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/GLES1Renderer.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/GLES1Renderer.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/GLES1Shaders.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/GLES1State.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/GLES1State.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Observer.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/entry_points_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/QueryImpl.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/RenderTargetCache.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/ContextD3D.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Blit11Helper_autogen.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Program11.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Program11.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/MultiplyAlpha.hlsl + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/Passthrough2DArray11.hlsl + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/Passthrough3D11.hlsl + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/ImageGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/ImageGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/ContextEGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/ContextEGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/ExternalImageSiblingEGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/ImageEGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/ImageEGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/RendererEGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/RendererEGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/android/NativeBufferImageSiblingAndroid.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/android/NativeBufferImageSiblingAndroid.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/ContextWGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/ContextWGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/RendererWGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/RendererWGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/UtilsVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/UtilsVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/android/WindowSurfaceVkAndroid.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/android/WindowSurfaceVkAndroid.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000000.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000001.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000002.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000003.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000004.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000005.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000006.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000007.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000008.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000009.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000A.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000B.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000C.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000D.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000E.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000F.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000010.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000011.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000012.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000013.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000014.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000015.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000016.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000017.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000000.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000001.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000002.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000003.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndex.comp.00000000.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndex.comp.00000001.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndex.comp.00000002.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndex.comp.00000003.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndexIndirectLineLoop.comp.00000000.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndexIndirectLineLoop.comp.00000001.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndexIndirectLineLoop.comp.00000002.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndirectLineLoop.comp.00000000.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000000.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000001.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000002.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000003.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000004.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000005.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000006.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000007.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/CopyImageToBuffer.comp.00000000.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/CopyImageToBuffer.comp.00000001.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/EtcToBc.comp.00000000.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/EtcToBc.comp.00000001.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ExportStencil.frag.00000000.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/FullScreenTri.vert.00000000.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000000.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000001.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000002.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000003.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000004.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000005.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000006.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000007.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000008.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000009.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000000.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000001.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000002.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000003.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000004.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000005.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000006.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000007.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000008.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000009.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000A.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000B.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000C.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000D.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000E.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000F.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000010.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000011.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000012.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000013.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000014.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000015.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000016.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000017.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000018.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000019.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000001A.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000001B.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000001C.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000001D.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000001E.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000001F.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000020.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000021.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000022.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000023.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000024.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000025.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000026.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000027.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000028.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000029.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000002A.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000002B.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000002C.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000002D.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000002E.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000002F.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000000.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000001.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000002.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000003.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000004.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000005.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000006.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000007.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000008.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000009.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000A.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000B.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000010.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000011.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000012.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000013.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000014.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000015.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000016.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000017.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000018.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000019.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000001A.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000001B.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000020.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000021.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000022.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000023.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000024.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000025.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000026.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000027.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000028.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000029.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000002A.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000002B.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/OverlayDraw.frag.00000000.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/OverlayDraw.vert.00000000.inc + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ConvertVertex.comp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ConvertVertex.comp.json + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/FullScreenTri.vert + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ImageCopy.frag + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ImageCopy.frag.json + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_cache_utils.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_cache_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_caps_utils.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_caps_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_format_map.json + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_helpers.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_helpers.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/validationES1.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/validationES1.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/validationES2.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/validationES3.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/validationES31.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/validationESEXT.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libEGL/egl_loader_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libEGL/egl_loader_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv1_CM/libGLESv1_CM.cpp + ../../../flutter/third_party/angle/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/angle/src/android_system_settings/res/values-v17/styles.xml
+FILE: ../../../flutter/third_party/angle/src/common/FastVector.h
+FILE: ../../../flutter/third_party/angle/src/common/FixedVector.h
+FILE: ../../../flutter/third_party/angle/src/common/PackedEnums.cpp
+FILE: ../../../flutter/third_party/angle/src/common/android_util.cpp
+FILE: ../../../flutter/third_party/angle/src/common/android_util.h
+FILE: ../../../flutter/third_party/angle/src/common/hash_utils.h
+FILE: ../../../flutter/third_party/angle/src/common/matrix_utils.cpp
+FILE: ../../../flutter/third_party/angle/src/common/system_utils.cpp
+FILE: ../../../flutter/third_party/angle/src/common/system_utils_posix.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/FunctionLookup.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/FunctionLookup.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/ImmutableString.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/ImmutableStringBuilder.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/ImmutableStringBuilder.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/builtin_variables.json
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/AtomicCounterFunctionHLSL.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/AtomicCounterFunctionHLSL.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/ShaderStorageBlockFunctionHLSL.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/ShaderStorageBlockFunctionHLSL.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/ShaderStorageBlockOutputHLSL.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/hlsl/ShaderStorageBlockOutputHLSL.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/FoldExpressions.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/FoldExpressions.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/PruneEmptyCases.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/PruneEmptyCases.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RewriteStructSamplers.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RewriteStructSamplers.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/SeparateStructFromUniformDeclarations.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/SeparateStructFromUniformDeclarations.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/RewriteRepeatedAssignToSwizzled.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/RewriteRepeatedAssignToSwizzled.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/RewriteAtomicFunctionExpressions.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/RewriteAtomicFunctionExpressions.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/RewriteExpressionsWithShaderStorageBlock.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/RewriteExpressionsWithShaderStorageBlock.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/SeparateArrayConstructorStatements.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/SeparateArrayConstructorStatements.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/NameEmbeddedUniformStructsMetal.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/NameEmbeddedUniformStructsMetal.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/ReplaceVariable.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/ReplaceVariable.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/Visit.h
+FILE: ../../../flutter/third_party/angle/src/feature_support_util/feature_support_util.cpp
+FILE: ../../../flutter/third_party/angle/src/feature_support_util/feature_support_util.h
+FILE: ../../../flutter/third_party/angle/src/gpu_info_util/SystemInfo_android.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/BlobCache.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/BlobCache.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Context.inl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Context_gles_1_0.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/GLES1Renderer.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/GLES1Renderer.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/GLES1Shaders.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/GLES1State.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/GLES1State.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Observer.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/entry_points_utils.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/QueryImpl.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/RenderTargetCache.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/ContextD3D.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Blit11Helper_autogen.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Program11.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/Program11.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/MultiplyAlpha.hlsl
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/Passthrough2DArray11.hlsl
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/Passthrough3D11.hlsl
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/ImageGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/ImageGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/ContextEGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/ContextEGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/ExternalImageSiblingEGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/ImageEGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/ImageEGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/RendererEGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/RendererEGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/android/NativeBufferImageSiblingAndroid.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/android/NativeBufferImageSiblingAndroid.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/ContextWGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/ContextWGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/RendererWGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/wgl/RendererWGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/UtilsVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/UtilsVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/android/WindowSurfaceVkAndroid.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/android/WindowSurfaceVkAndroid.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000000.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000001.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000002.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000003.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000004.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000005.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000006.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000007.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000008.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000009.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000A.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000B.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000C.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000D.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000E.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000F.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000010.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000011.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000012.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000013.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000014.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000015.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000016.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000017.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000000.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000001.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000002.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000003.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndex.comp.00000000.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndex.comp.00000001.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndex.comp.00000002.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndex.comp.00000003.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndexIndirectLineLoop.comp.00000000.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndexIndirectLineLoop.comp.00000001.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndexIndirectLineLoop.comp.00000002.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndirectLineLoop.comp.00000000.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000000.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000001.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000002.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000003.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000004.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000005.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000006.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000007.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/CopyImageToBuffer.comp.00000000.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/CopyImageToBuffer.comp.00000001.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/EtcToBc.comp.00000000.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/EtcToBc.comp.00000001.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ExportStencil.frag.00000000.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/FullScreenTri.vert.00000000.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000000.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000001.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000002.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000003.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000004.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000005.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000006.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000007.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000008.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000009.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000000.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000001.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000002.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000003.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000004.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000005.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000006.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000007.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000008.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000009.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000A.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000B.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000C.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000D.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000E.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000F.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000010.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000011.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000012.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000013.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000014.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000015.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000016.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000017.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000018.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000019.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000001A.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000001B.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000001C.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000001D.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000001E.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000001F.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000020.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000021.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000022.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000023.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000024.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000025.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000026.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000027.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000028.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000029.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000002A.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000002B.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000002C.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000002D.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000002E.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000002F.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000000.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000001.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000002.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000003.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000004.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000005.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000006.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000007.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000008.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000009.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000A.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000B.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000010.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000011.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000012.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000013.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000014.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000015.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000016.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000017.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000018.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000019.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000001A.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000001B.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000020.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000021.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000022.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000023.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000024.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000025.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000026.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000027.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000028.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000029.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000002A.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000002B.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/OverlayDraw.frag.00000000.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/OverlayDraw.vert.00000000.inc
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ConvertVertex.comp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ConvertVertex.comp.json
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/FullScreenTri.vert
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ImageCopy.frag
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ImageCopy.frag.json
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_cache_utils.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_cache_utils.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_caps_utils.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_caps_utils.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_format_map.json
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_helpers.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_helpers.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/validationES1.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/validationES1.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/validationES2.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/validationES3.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/validationES31.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/validationESEXT.h
+FILE: ../../../flutter/third_party/angle/src/libEGL/egl_loader_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libEGL/egl_loader_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libGLESv1_CM/libGLESv1_CM.cpp
+----------------------------------------------------------------------------------------------------
+Copyright 2018 The ANGLE Project Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+    Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+
+    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
+    Ltd., nor the names of their contributors may be used to endorse
+    or promote products derived from this software without specific
+    prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: accessibility
+LIBRARY: angle
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_enum_util.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_enum_util.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_enums.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_table_info.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_table_info.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_tree_id.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_tree_id.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_tree_observer.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_tree_observer.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_delegate_base.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/compute_attributes.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/compute_attributes.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/no_destructor.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/win/atl.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/base/anglebase/no_destructor.h + ../../../LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/accessibility/ax/ax_enum_util.cc
+FILE: ../../../flutter/third_party/accessibility/ax/ax_enum_util.h
+FILE: ../../../flutter/third_party/accessibility/ax/ax_enums.h
+FILE: ../../../flutter/third_party/accessibility/ax/ax_table_info.cc
+FILE: ../../../flutter/third_party/accessibility/ax/ax_table_info.h
+FILE: ../../../flutter/third_party/accessibility/ax/ax_tree_id.cc
+FILE: ../../../flutter/third_party/accessibility/ax/ax_tree_id.h
+FILE: ../../../flutter/third_party/accessibility/ax/ax_tree_observer.cc
+FILE: ../../../flutter/third_party/accessibility/ax/ax_tree_observer.h
+FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_delegate_base.cc
+FILE: ../../../flutter/third_party/accessibility/ax/platform/compute_attributes.cc
+FILE: ../../../flutter/third_party/accessibility/ax/platform/compute_attributes.h
+FILE: ../../../flutter/third_party/accessibility/base/no_destructor.h
+FILE: ../../../flutter/third_party/accessibility/base/win/atl.h
+FILE: ../../../flutter/third_party/angle/src/common/base/anglebase/no_destructor.h
+----------------------------------------------------------------------------------------------------
+Copyright 2018 The Chromium Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: angle
+LIBRARY: xxhash
+ORIGIN: ../../../flutter/third_party/angle/include/platform/Feature.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/include/vulkan/vulkan_fuchsia_ext.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/PoolAlloc.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/PoolAlloc.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/apple_platform_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/gl_enum_utils.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/gl_enum_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/gl_enum_utils_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/gl_enum_utils_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/system_utils_win32.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/system_utils_winuwp.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/third_party/xxhash/xxhash_fuzzer.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/preprocessor/preprocessor.l + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/preprocessor/preprocessor.y + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/preprocessor/preprocessor_lex_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/preprocessor/preprocessor_tab_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/ValidateAST.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/ValidateAST.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/glslang.l + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/glslang.y + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/glslang_lex_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/glslang_tab_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/spirv/BuiltinsWorkaround.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/spirv/BuiltinsWorkaround.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/EmulateMultiDrawShaderBuiltins.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/EmulateMultiDrawShaderBuiltins.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RemoveInactiveInterfaceVariables.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RemoveInactiveInterfaceVariables.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RewriteArrayOfArrayOfOpaqueUniforms.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RewriteAtomicCounters.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RewriteAtomicCounters.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RewriteCubeMapSamplersAs2DArray.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RewriteCubeMapSamplersAs2DArray.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RewriteDfdy.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RewriteDfdy.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/apple/RewriteRowMajorMatrices.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/apple/RewriteRowMajorMatrices.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/BuiltIn.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/FindFunction.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/FindFunction.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/ReplaceShadowingVariables.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/ReplaceShadowingVariables.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Context_gl.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/EGLSync.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/MemoryObject.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/MemoryObject.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Overlay.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Overlay.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/OverlayWidgets.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/OverlayWidgets.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Overlay_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Overlay_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Semaphore.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Semaphore.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/FrameCapture.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/FrameCapture.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/FrameCapture_mock.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_1_0_params.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_2_0_params.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_3_0_params.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_3_1_params.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_3_2_params.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_ext_params.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/format_map_desktop.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/overlay_widgets.json + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/EGLSyncImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/MemoryObjectImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/OverlayImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/SemaphoreImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/ShaderImpl.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/DynamicImage2DHLSL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/DynamicImage2DHLSL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/ExternalImageSiblingImpl11.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/ExternalImageSiblingImpl11.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/MappedSubresourceVerifier11.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/MappedSubresourceVerifier11.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/driver_utils_mac.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/MemoryObjectGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/MemoryObjectGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/SemaphoreGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/SemaphoreGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/cgl/ContextCGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/cgl/ContextCGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/cgl/DeviceCGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/cgl/DeviceCGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/cgl/RendererCGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/cgl/RendererCGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/SyncEGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/SyncEGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/RendererGLX.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/RendererGLX.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/BufferMtl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/BufferMtl.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/CompilerMtl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/CompilerMtl.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/ContextMtl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/ContextMtl.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/DisplayMtl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/DisplayMtl.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/DisplayMtl_api.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/FrameBufferMtl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/FrameBufferMtl.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/IOSurfaceSurfaceMtl.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/ProgramMtl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/ProgramMtl.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/RenderBufferMtl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/RenderBufferMtl.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/RenderTargetMtl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/RenderTargetMtl.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/ShaderMtl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/ShaderMtl.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/SurfaceMtl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/SurfaceMtl.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/TextureMtl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/TextureMtl.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/VertexArrayMtl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/VertexArrayMtl.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_buffer_pool.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_buffer_pool.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_command_buffer.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_command_buffer.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_common.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_common.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_format_map.json + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_format_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_format_utils.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_msl_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_msl_utils.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_render_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_render_utils.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_resources.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_resources.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_state_cache.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_state_cache.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_utils.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/serial_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/MemoryObjectVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/MemoryObjectVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/OverlayVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/OverlayVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/PersistentCommandPool.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/PersistentCommandPool.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/SecondaryCommandBuffer.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/SecondaryCommandBuffer.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/SemaphoreVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/SemaphoreVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/fuchsia/DisplayVkFuchsia.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/fuchsia/DisplayVkFuchsia.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/fuchsia/WindowSurfaceVkFuchsia.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/fuchsia/WindowSurfaceVkFuchsia.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ggp/DisplayVkGGP.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ggp/DisplayVkGGP.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ggp/WindowSurfaceVkGGP.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ggp/WindowSurfaceVkGGP.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/mac/DisplayVkMac.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/mac/DisplayVkMac.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/mac/WindowSurfaceVkMac.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/mac/WindowSurfaceVkMac.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/BlitResolve.frag + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/BlitResolve.frag.json + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/BlitResolveStencilNoExport.comp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/BlitResolveStencilNoExport.comp.json + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ConvertIndex.comp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ConvertIndex.comp.json + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ConvertIndexIndirectLineLoop.comp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ConvertIndirectLineLoop.comp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ConvertIndirectLineLoop.comp.json + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/EtcToBc.comp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ImageClear.frag + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ImageClear.frag.json + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/spv_utils.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/spv_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_wrapper.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/trace.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/validationES32.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/validationES32.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/validationESEXT.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/validationGL1.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/validationGL2.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/validationGL3.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/validationGL4.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_wgl.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_wgl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/proc_table_egl_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/proc_table_glx_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/proc_table_wgl_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/angle/include/platform/Feature.h
+FILE: ../../../flutter/third_party/angle/include/vulkan/vulkan_fuchsia_ext.h
+FILE: ../../../flutter/third_party/angle/src/common/PoolAlloc.cpp
+FILE: ../../../flutter/third_party/angle/src/common/PoolAlloc.h
+FILE: ../../../flutter/third_party/angle/src/common/apple_platform_utils.h
+FILE: ../../../flutter/third_party/angle/src/common/gl_enum_utils.cpp
+FILE: ../../../flutter/third_party/angle/src/common/gl_enum_utils.h
+FILE: ../../../flutter/third_party/angle/src/common/gl_enum_utils_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/common/gl_enum_utils_autogen.h
+FILE: ../../../flutter/third_party/angle/src/common/system_utils_win32.cpp
+FILE: ../../../flutter/third_party/angle/src/common/system_utils_winuwp.cpp
+FILE: ../../../flutter/third_party/angle/src/common/third_party/xxhash/xxhash_fuzzer.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/preprocessor/preprocessor.l
+FILE: ../../../flutter/third_party/angle/src/compiler/preprocessor/preprocessor.y
+FILE: ../../../flutter/third_party/angle/src/compiler/preprocessor/preprocessor_lex_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/preprocessor/preprocessor_tab_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/ValidateAST.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/ValidateAST.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/glslang.l
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/glslang.y
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/glslang_lex_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/glslang_tab_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/spirv/BuiltinsWorkaround.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/spirv/BuiltinsWorkaround.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/EmulateMultiDrawShaderBuiltins.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/EmulateMultiDrawShaderBuiltins.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RemoveInactiveInterfaceVariables.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RemoveInactiveInterfaceVariables.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RewriteArrayOfArrayOfOpaqueUniforms.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RewriteAtomicCounters.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RewriteAtomicCounters.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RewriteCubeMapSamplersAs2DArray.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RewriteCubeMapSamplersAs2DArray.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RewriteDfdy.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RewriteDfdy.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/apple/RewriteRowMajorMatrices.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/glsl/apple/RewriteRowMajorMatrices.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/BuiltIn.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/FindFunction.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/FindFunction.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/ReplaceShadowingVariables.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/ReplaceShadowingVariables.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Context_gl.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/EGLSync.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/MemoryObject.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/MemoryObject.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Overlay.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Overlay.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/OverlayWidgets.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/OverlayWidgets.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Overlay_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Overlay_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Semaphore.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Semaphore.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/FrameCapture.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/FrameCapture.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/FrameCapture_mock.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_1_0_params.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_2_0_params.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_3_0_params.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_3_1_params.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_3_2_params.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_ext_params.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/format_map_desktop.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/overlay_widgets.json
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/EGLSyncImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/MemoryObjectImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/OverlayImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/SemaphoreImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/ShaderImpl.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/DynamicImage2DHLSL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/DynamicImage2DHLSL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/ExternalImageSiblingImpl11.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/ExternalImageSiblingImpl11.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/MappedSubresourceVerifier11.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/d3d11/MappedSubresourceVerifier11.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/driver_utils_mac.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/MemoryObjectGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/MemoryObjectGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/SemaphoreGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/SemaphoreGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/cgl/ContextCGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/cgl/ContextCGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/cgl/DeviceCGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/cgl/DeviceCGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/cgl/RendererCGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/cgl/RendererCGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/SyncEGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/SyncEGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/RendererGLX.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/RendererGLX.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/BufferMtl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/BufferMtl.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/CompilerMtl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/CompilerMtl.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/ContextMtl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/ContextMtl.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/DisplayMtl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/DisplayMtl.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/DisplayMtl_api.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/FrameBufferMtl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/FrameBufferMtl.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/IOSurfaceSurfaceMtl.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/ProgramMtl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/ProgramMtl.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/RenderBufferMtl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/RenderBufferMtl.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/RenderTargetMtl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/RenderTargetMtl.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/ShaderMtl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/ShaderMtl.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/SurfaceMtl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/SurfaceMtl.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/TextureMtl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/TextureMtl.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/VertexArrayMtl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/VertexArrayMtl.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_buffer_pool.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_buffer_pool.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_command_buffer.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_command_buffer.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_common.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_common.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_format_map.json
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_format_utils.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_format_utils.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_msl_utils.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_msl_utils.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_render_utils.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_render_utils.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_resources.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_resources.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_state_cache.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_state_cache.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_utils.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_utils.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/serial_utils.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/MemoryObjectVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/MemoryObjectVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/OverlayVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/OverlayVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/PersistentCommandPool.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/PersistentCommandPool.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/SecondaryCommandBuffer.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/SecondaryCommandBuffer.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/SemaphoreVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/SemaphoreVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/fuchsia/DisplayVkFuchsia.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/fuchsia/DisplayVkFuchsia.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/fuchsia/WindowSurfaceVkFuchsia.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/fuchsia/WindowSurfaceVkFuchsia.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ggp/DisplayVkGGP.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ggp/DisplayVkGGP.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ggp/WindowSurfaceVkGGP.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ggp/WindowSurfaceVkGGP.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/mac/DisplayVkMac.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/mac/DisplayVkMac.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/mac/WindowSurfaceVkMac.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/mac/WindowSurfaceVkMac.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/BlitResolve.frag
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/BlitResolve.frag.json
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/BlitResolveStencilNoExport.comp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/BlitResolveStencilNoExport.comp.json
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ConvertIndex.comp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ConvertIndex.comp.json
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ConvertIndexIndirectLineLoop.comp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ConvertIndirectLineLoop.comp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ConvertIndirectLineLoop.comp.json
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/EtcToBc.comp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ImageClear.frag
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ImageClear.frag.json
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/spv_utils.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/spv_utils.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_wrapper.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/trace.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/validationES32.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/validationES32.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/validationESEXT.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/validationGL1.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/validationGL2.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/validationGL3.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/validationGL4.cpp
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_wgl.cpp
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_wgl.h
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/proc_table_egl_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/proc_table_glx_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/proc_table_wgl_autogen.cpp
+----------------------------------------------------------------------------------------------------
+Copyright 2019 The ANGLE Project Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+    Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+
+    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
+    Ltd., nor the names of their contributors may be used to endorse
+    or promote products derived from this software without specific
+    prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: angle
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/shaders/blit.metal + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/shaders/clear.metal + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/shaders/common.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/shaders/gen_indices.metal + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/shaders/visibility.metal + ../../../flutter/third_party/angle/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/shaders/blit.metal
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/shaders/clear.metal
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/shaders/common.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/shaders/gen_indices.metal
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/shaders/visibility.metal
+----------------------------------------------------------------------------------------------------
+Copyright 2019 The ANGLE Project. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+    Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+
+    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
+    Ltd., nor the names of their contributors may be used to endorse
+    or promote products derived from this software without specific
+    prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/crl.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/crl.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/revocation_util.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/revocation_util.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/pki/crl.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/crl.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/revocation_util.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/revocation_util.h
+----------------------------------------------------------------------------------------------------
+Copyright 2019 The Chromium Authors
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file
+====================================================================================================
+
+====================================================================================================
+LIBRARY: accessibility
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_active_popup.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_active_popup.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_clipping_behavior.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_constants.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_coordinate_system.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_mode.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_node_text_styles.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_node_text_styles.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_offscreen_result.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_tree_manager.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_tree_manager_map.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_tree_manager_map.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/ax_fragment_root_delegate_win.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/ax_fragment_root_win.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/ax_fragment_root_win.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_delegate_utils_win.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_delegate_utils_win.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_textprovider_win.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_textprovider_win.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_textrangeprovider_win.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_textrangeprovider_win.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_tree_manager.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/win/scoped_safearray.h + ../../../flutter/third_party/accessibility/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/accessibility/ax/ax_active_popup.cc
+FILE: ../../../flutter/third_party/accessibility/ax/ax_active_popup.h
+FILE: ../../../flutter/third_party/accessibility/ax/ax_clipping_behavior.h
+FILE: ../../../flutter/third_party/accessibility/ax/ax_constants.h
+FILE: ../../../flutter/third_party/accessibility/ax/ax_coordinate_system.h
+FILE: ../../../flutter/third_party/accessibility/ax/ax_mode.cc
+FILE: ../../../flutter/third_party/accessibility/ax/ax_node_text_styles.cc
+FILE: ../../../flutter/third_party/accessibility/ax/ax_node_text_styles.h
+FILE: ../../../flutter/third_party/accessibility/ax/ax_offscreen_result.h
+FILE: ../../../flutter/third_party/accessibility/ax/ax_tree_manager.h
+FILE: ../../../flutter/third_party/accessibility/ax/ax_tree_manager_map.cc
+FILE: ../../../flutter/third_party/accessibility/ax/ax_tree_manager_map.h
+FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_fragment_root_delegate_win.h
+FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_fragment_root_win.cc
+FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_fragment_root_win.h
+FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_delegate_utils_win.cc
+FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_delegate_utils_win.h
+FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_textprovider_win.cc
+FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_textprovider_win.h
+FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_textrangeprovider_win.cc
+FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_textrangeprovider_win.h
+FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_tree_manager.h
+FILE: ../../../flutter/third_party/accessibility/base/win/scoped_safearray.h
+----------------------------------------------------------------------------------------------------
+Copyright 2019 The Chromium Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: angle
+ORIGIN: ../../../flutter/third_party/angle/src/common/apple/SoftLinking.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/entry_points_enum_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/entry_points_enum_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/frame_capture_utils_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/frame_capture_utils_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/gl/cgl/FunctionsCGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/gl/cgl/FunctionsCGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/system_utils_apple.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/vulkan/vulkan_icd.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/vulkan/vulkan_icd.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/ImmutableString_ESSL_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/ImmutableString_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/SymbolTable_ESSL_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/SymbolTable_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/SymbolTable_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/ValidateBarrierFunctionCall.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/ValidateBarrierFunctionCall.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/ValidateClipCullDistance.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/ValidateClipCullDistance.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/AsNode.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/AstHelpers.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/AstHelpers.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/DebugSink.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/DiscoverDependentFunctions.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/DiscoverDependentFunctions.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/DiscoverEnclosingFunctionTraverser.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/DiscoverEnclosingFunctionTraverser.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/DriverUniformMetal.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/DriverUniformMetal.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/EmitMetal.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/EmitMetal.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/IdGen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/IdGen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/IntermRebuild.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/IntermRebuild.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/Layout.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/Layout.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/MapFunctionsToDefinitions.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/MapFunctionsToDefinitions.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/MapSymbols.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/MapSymbols.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/ModifyStruct.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/ModifyStruct.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/Name.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/Name.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/NodeType.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/Pipeline.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/Pipeline.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/ProgramPrelude.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/ProgramPrelude.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/Reference.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/RewritePipelines.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/RewritePipelines.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/SkippingTraverser.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/SymbolEnv.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/SymbolEnv.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/ToposortStructs.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/ToposortStructs.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/TranslatorMSL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/TranslatorMSL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/ForcePrecisionQualifier.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/ForcePrecisionQualifier.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RemoveAtomicCounterBuiltins.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RemoveAtomicCounterBuiltins.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/RecordUniformBlocksWithLargeArrayMember.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/RecordUniformBlocksWithLargeArrayMember.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/AddExplicitTypeCasts.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/AddExplicitTypeCasts.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/ConvertUnsupportedConstructorsToFunctionCalls.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/ConvertUnsupportedConstructorsToFunctionCalls.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/FixTypeConstructors.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/FixTypeConstructors.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/HoistConstants.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/HoistConstants.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/IntroduceVertexIndexID.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/IntroduceVertexIndexID.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/ReduceInterfaceBlocks.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/ReduceInterfaceBlocks.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/RewriteCaseDeclarations.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/RewriteCaseDeclarations.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/RewriteOutArgs.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/RewriteOutArgs.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/RewriteUnaddressableReferences.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/RewriteUnaddressableReferences.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/SeparateCompoundExpressions.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/SeparateCompoundExpressions.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/SeparateCompoundStructDeclarations.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/SeparateCompoundStructDeclarations.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/TransposeRowMajorMatrices.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/TransposeRowMajorMatrices.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/WrapMain.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/WrapMain.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/spirv/FlagSamplersWithTexelFetch.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/spirv/FlagSamplersWithTexelFetch.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/spirv/RewriteInterpolateAtOffset.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/spirv/RewriteInterpolateAtOffset.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/BuiltIn_ESSL_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/BuiltIn_complete_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/DriverUniform.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/DriverUniform.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/ReplaceArrayOfMatrixVarying.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/ReplaceArrayOfMatrixVarying.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/ReplaceClipCullDistanceVariable.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/ReplaceClipCullDistanceVariable.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/RewriteSampleMaskVariable.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/RewriteSampleMaskVariable.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/RunAtTheBeginningOfShader.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/RunAtTheBeginningOfShader.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/SpecializationConstant.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/SpecializationConstant.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/gpu_info_util/SystemInfo_apple.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/gpu_info_util/SystemInfo_fuchsia.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/gpu_info_util/SystemInfo_ios.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/gpu_info_util/SystemInfo_vulkan.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/gpu_info_util/SystemInfo_vulkan.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Context_gl_1_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Context_gl_2_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Context_gl_3_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Context_gl_4_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Context_gles_1_0_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Context_gles_2_0_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Context_gles_3_0_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Context_gles_3_1_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Context_gles_3_2_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Context_gles_ext_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/InfoLog.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/ProgramExecutable.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/ProgramExecutable.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_egl_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_egl_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gl_1_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gl_1_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gl_2_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gl_2_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gl_3_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gl_3_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gl_4_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gl_4_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_1_0_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_1_0_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_2_0_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_2_0_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_3_0_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_3_0_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_3_1_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_3_1_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_3_2_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_3_2_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_ext_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_ext_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/serialize.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/serialize.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/BufferImpl.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/EGLReusableSync.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/EGLReusableSync.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/EGLSyncImpl.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/FormatID_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/Format_table_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/driver_utils_d3d.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/driver_utils_d3d.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d_format.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d_format.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/dxgi_format_map.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/dxgi_format_map_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/eagl/ContextEAGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/eagl/ContextEAGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/eagl/DeviceEAGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/eagl/DeviceEAGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/eagl/DisplayEAGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/eagl/FunctionsEAGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/eagl/FunctionsEAGL.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/eagl/PbufferSurfaceEAGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/eagl/PbufferSurfaceEAGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/eagl/RendererEAGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/eagl/RendererEAGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/PixmapSurfaceGLX.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/PixmapSurfaceGLX.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/glx_utils.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/glx_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/load_functions_table_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/IOSurfaceSurfaceMtl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/SamplerMtl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/SamplerMtl.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/TransformFeedbackMtl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/TransformFeedbackMtl.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/file_hooking/shader_cache_file_hooking.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_format_table_autogen.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/shaders/mtl_internal_shaders_ios_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/shaders/mtl_internal_shaders_macos_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/shaders/mtl_internal_shaders_src_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CommandProcessor.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CommandProcessor.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/DebugAnnotatorVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/DebugAnnotatorVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ProgramExecutableVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ProgramExecutableVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/android/vk_android_utils.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/android/vk_android_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/display/DisplayVkSimple.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/display/DisplayVkSimple.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/display/WindowSurfaceVkSimple.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/display/WindowSurfaceVkSimple.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/headless/DisplayVkHeadless.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/headless/DisplayVkHeadless.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/headless/WindowSurfaceVkHeadless.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/headless/WindowSurfaceVkHeadless.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/mac/IOSurfaceSurfaceVkMac.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/mac/IOSurfaceSurfaceVkMac.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ConvertIndexIndirectLineLoop.comp.json + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/EtcToBc.comp.json + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/GenerateMipmap.comp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/GenerateMipmap.comp.json + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_format_table_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_mandatory_format_support_table_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_mem_alloc_wrapper.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_mem_alloc_wrapper.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/validationEGL_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/validationES1_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/validationES2_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/validationES31_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/validationES32_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/validationES3_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/validationESEXT_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/validationGL1_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/validationGL2_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/validationGL3_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/validationGL4_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libEGL/libEGL_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libEGL/libEGL_autogen.def + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libEGL/libEGL_vulkan_secondaries_autogen.def + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/egl_ext_stubs.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/egl_ext_stubs_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/egl_get_labeled_object_data.json + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/egl_stubs.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/egl_stubs_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_cl_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_cl_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_egl_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_egl_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_egl_ext_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_egl_ext_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gl_1_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gl_1_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gl_2_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gl_2_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gl_3_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gl_3_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gl_4_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gl_4_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gles_1_0_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gles_1_0_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gles_2_0_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gles_2_0_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gles_3_0_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gles_3_0_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gles_3_1_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gles_3_1_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gles_3_2_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gles_3_2_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gles_ext_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gles_ext_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/libGLESv2_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/libGLESv2_autogen.def + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/libGLESv2_no_capture_autogen.def + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/libGLESv2_vulkan_secondaries_autogen.def + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/libGLESv2_with_capture_autogen.def + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/opengl32_autogen.def + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/opengl32_with_wgl_autogen.def + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libOpenCL/libOpenCL_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/angle/src/common/apple/SoftLinking.h
+FILE: ../../../flutter/third_party/angle/src/common/entry_points_enum_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/common/entry_points_enum_autogen.h
+FILE: ../../../flutter/third_party/angle/src/common/frame_capture_utils_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/common/frame_capture_utils_autogen.h
+FILE: ../../../flutter/third_party/angle/src/common/gl/cgl/FunctionsCGL.cpp
+FILE: ../../../flutter/third_party/angle/src/common/gl/cgl/FunctionsCGL.h
+FILE: ../../../flutter/third_party/angle/src/common/system_utils_apple.cpp
+FILE: ../../../flutter/third_party/angle/src/common/vulkan/vulkan_icd.cpp
+FILE: ../../../flutter/third_party/angle/src/common/vulkan/vulkan_icd.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/ImmutableString_ESSL_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/ImmutableString_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/SymbolTable_ESSL_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/SymbolTable_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/SymbolTable_autogen.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/ValidateBarrierFunctionCall.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/ValidateBarrierFunctionCall.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/ValidateClipCullDistance.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/ValidateClipCullDistance.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/AsNode.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/AstHelpers.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/AstHelpers.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/DebugSink.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/DiscoverDependentFunctions.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/DiscoverDependentFunctions.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/DiscoverEnclosingFunctionTraverser.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/DiscoverEnclosingFunctionTraverser.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/DriverUniformMetal.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/DriverUniformMetal.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/EmitMetal.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/EmitMetal.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/IdGen.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/IdGen.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/IntermRebuild.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/IntermRebuild.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/Layout.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/Layout.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/MapFunctionsToDefinitions.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/MapFunctionsToDefinitions.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/MapSymbols.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/MapSymbols.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/ModifyStruct.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/ModifyStruct.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/Name.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/Name.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/NodeType.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/Pipeline.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/Pipeline.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/ProgramPrelude.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/ProgramPrelude.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/Reference.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/RewritePipelines.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/RewritePipelines.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/SkippingTraverser.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/SymbolEnv.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/SymbolEnv.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/ToposortStructs.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/ToposortStructs.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/TranslatorMSL.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/TranslatorMSL.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/ForcePrecisionQualifier.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/ForcePrecisionQualifier.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RemoveAtomicCounterBuiltins.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RemoveAtomicCounterBuiltins.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/RecordUniformBlocksWithLargeArrayMember.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/RecordUniformBlocksWithLargeArrayMember.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/AddExplicitTypeCasts.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/AddExplicitTypeCasts.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/ConvertUnsupportedConstructorsToFunctionCalls.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/ConvertUnsupportedConstructorsToFunctionCalls.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/FixTypeConstructors.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/FixTypeConstructors.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/HoistConstants.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/HoistConstants.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/IntroduceVertexIndexID.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/IntroduceVertexIndexID.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/ReduceInterfaceBlocks.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/ReduceInterfaceBlocks.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/RewriteCaseDeclarations.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/RewriteCaseDeclarations.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/RewriteOutArgs.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/RewriteOutArgs.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/RewriteUnaddressableReferences.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/RewriteUnaddressableReferences.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/SeparateCompoundExpressions.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/SeparateCompoundExpressions.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/SeparateCompoundStructDeclarations.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/SeparateCompoundStructDeclarations.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/TransposeRowMajorMatrices.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/TransposeRowMajorMatrices.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/WrapMain.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/WrapMain.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/spirv/FlagSamplersWithTexelFetch.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/spirv/FlagSamplersWithTexelFetch.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/spirv/RewriteInterpolateAtOffset.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/spirv/RewriteInterpolateAtOffset.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/BuiltIn_ESSL_autogen.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/BuiltIn_complete_autogen.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/DriverUniform.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/DriverUniform.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/ReplaceArrayOfMatrixVarying.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/ReplaceArrayOfMatrixVarying.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/ReplaceClipCullDistanceVariable.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/ReplaceClipCullDistanceVariable.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/RewriteSampleMaskVariable.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/RewriteSampleMaskVariable.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/RunAtTheBeginningOfShader.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/RunAtTheBeginningOfShader.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/SpecializationConstant.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/SpecializationConstant.h
+FILE: ../../../flutter/third_party/angle/src/gpu_info_util/SystemInfo_apple.mm
+FILE: ../../../flutter/third_party/angle/src/gpu_info_util/SystemInfo_fuchsia.cpp
+FILE: ../../../flutter/third_party/angle/src/gpu_info_util/SystemInfo_ios.cpp
+FILE: ../../../flutter/third_party/angle/src/gpu_info_util/SystemInfo_vulkan.cpp
+FILE: ../../../flutter/third_party/angle/src/gpu_info_util/SystemInfo_vulkan.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Context_gl_1_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Context_gl_2_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Context_gl_3_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Context_gl_4_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Context_gles_1_0_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Context_gles_2_0_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Context_gles_3_0_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Context_gles_3_1_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Context_gles_3_2_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Context_gles_ext_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/InfoLog.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/ProgramExecutable.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/ProgramExecutable.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_egl_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_egl_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gl_1_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gl_1_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gl_2_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gl_2_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gl_3_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gl_3_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gl_4_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gl_4_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_1_0_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_1_0_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_2_0_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_2_0_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_3_0_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_3_0_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_3_1_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_3_1_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_3_2_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_3_2_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_ext_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gles_ext_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/serialize.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/serialize.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/BufferImpl.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/EGLReusableSync.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/EGLReusableSync.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/EGLSyncImpl.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/FormatID_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/Format_table_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/driver_utils_d3d.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d/driver_utils_d3d.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d_format.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/d3d_format.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/dxgi_format_map.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/dxgi_format_map_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/eagl/ContextEAGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/eagl/ContextEAGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/eagl/DeviceEAGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/eagl/DeviceEAGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/eagl/DisplayEAGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/eagl/FunctionsEAGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/eagl/FunctionsEAGL.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/eagl/PbufferSurfaceEAGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/eagl/PbufferSurfaceEAGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/eagl/RendererEAGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/eagl/RendererEAGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/PixmapSurfaceGLX.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/PixmapSurfaceGLX.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/glx_utils.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/glx/glx_utils.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/load_functions_table_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/IOSurfaceSurfaceMtl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/SamplerMtl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/SamplerMtl.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/TransformFeedbackMtl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/TransformFeedbackMtl.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/file_hooking/shader_cache_file_hooking.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_format_table_autogen.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/shaders/mtl_internal_shaders_ios_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/shaders/mtl_internal_shaders_macos_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/shaders/mtl_internal_shaders_src_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CommandProcessor.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CommandProcessor.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/DebugAnnotatorVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/DebugAnnotatorVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ProgramExecutableVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ProgramExecutableVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/android/vk_android_utils.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/android/vk_android_utils.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/display/DisplayVkSimple.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/display/DisplayVkSimple.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/display/WindowSurfaceVkSimple.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/display/WindowSurfaceVkSimple.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/headless/DisplayVkHeadless.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/headless/DisplayVkHeadless.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/headless/WindowSurfaceVkHeadless.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/headless/WindowSurfaceVkHeadless.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/mac/IOSurfaceSurfaceVkMac.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/mac/IOSurfaceSurfaceVkMac.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ConvertIndexIndirectLineLoop.comp.json
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/EtcToBc.comp.json
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/GenerateMipmap.comp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/GenerateMipmap.comp.json
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_format_table_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_mandatory_format_support_table_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_mem_alloc_wrapper.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_mem_alloc_wrapper.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/validationEGL_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/validationES1_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/validationES2_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/validationES31_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/validationES32_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/validationES3_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/validationESEXT_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/validationGL1_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/validationGL2_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/validationGL3_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/validationGL4_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libEGL/libEGL_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libEGL/libEGL_autogen.def
+FILE: ../../../flutter/third_party/angle/src/libEGL/libEGL_vulkan_secondaries_autogen.def
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/egl_ext_stubs.cpp
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/egl_ext_stubs_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/egl_get_labeled_object_data.json
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/egl_stubs.cpp
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/egl_stubs_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_cl_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_cl_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_egl_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_egl_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_egl_ext_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_egl_ext_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gl_1_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gl_1_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gl_2_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gl_2_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gl_3_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gl_3_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gl_4_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gl_4_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gles_1_0_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gles_1_0_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gles_2_0_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gles_2_0_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gles_3_0_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gles_3_0_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gles_3_1_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gles_3_1_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gles_3_2_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gles_3_2_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gles_ext_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_gles_ext_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/libGLESv2_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/libGLESv2_autogen.def
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/libGLESv2_no_capture_autogen.def
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/libGLESv2_vulkan_secondaries_autogen.def
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/libGLESv2_with_capture_autogen.def
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/opengl32_autogen.def
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/opengl32_with_wgl_autogen.def
+FILE: ../../../flutter/third_party/angle/src/libOpenCL/libOpenCL_autogen.cpp
+----------------------------------------------------------------------------------------------------
+Copyright 2020 The ANGLE Project Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+    Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+
+    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
+    Ltd., nor the names of their contributors may be used to endorse
+    or promote products derived from this software without specific
+    prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: angle
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/shaders/constants.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/shaders/copy_buffer.metal + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/shaders/gen_mipmap.metal + ../../../flutter/third_party/angle/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/shaders/constants.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/shaders/copy_buffer.metal
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/shaders/gen_mipmap.metal
+----------------------------------------------------------------------------------------------------
+Copyright 2020 The ANGLE Project. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+    Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+
+    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
+    Ltd., nor the names of their contributors may be used to endorse
+    or promote products derived from this software without specific
+    prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: accessibility
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_action_handler_base.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_action_handler_base.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_base_export.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_event_intent.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_event_intent.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/uia_registrar_win.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/uia_registrar_win.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/test_ax_node_helper.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/test_ax_node_helper.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/test_ax_tree_manager.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/ax/test_ax_tree_manager.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/win/dispatch_stub.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/win/dispatch_stub.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/win/variant_util.h + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/win/variant_vector.cc + ../../../flutter/third_party/accessibility/LICENSE
+ORIGIN: ../../../flutter/third_party/accessibility/base/win/variant_vector.h + ../../../flutter/third_party/accessibility/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/accessibility/ax/ax_action_handler_base.cc
+FILE: ../../../flutter/third_party/accessibility/ax/ax_action_handler_base.h
+FILE: ../../../flutter/third_party/accessibility/ax/ax_base_export.h
+FILE: ../../../flutter/third_party/accessibility/ax/ax_event_intent.cc
+FILE: ../../../flutter/third_party/accessibility/ax/ax_event_intent.h
+FILE: ../../../flutter/third_party/accessibility/ax/platform/uia_registrar_win.cc
+FILE: ../../../flutter/third_party/accessibility/ax/platform/uia_registrar_win.h
+FILE: ../../../flutter/third_party/accessibility/ax/test_ax_node_helper.cc
+FILE: ../../../flutter/third_party/accessibility/ax/test_ax_node_helper.h
+FILE: ../../../flutter/third_party/accessibility/ax/test_ax_tree_manager.cc
+FILE: ../../../flutter/third_party/accessibility/ax/test_ax_tree_manager.h
+FILE: ../../../flutter/third_party/accessibility/base/win/dispatch_stub.cc
+FILE: ../../../flutter/third_party/accessibility/base/win/dispatch_stub.h
+FILE: ../../../flutter/third_party/accessibility/base/win/variant_util.h
+FILE: ../../../flutter/third_party/accessibility/base/win/variant_vector.cc
+FILE: ../../../flutter/third_party/accessibility/base/win/variant_vector.h
+----------------------------------------------------------------------------------------------------
+Copyright 2020 The Chromium Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libwebp
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/lossless_sse41.c + ../../../flutter/third_party/libwebp/COPYING
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/libwebp/src/dsp/lossless_sse41.c
+----------------------------------------------------------------------------------------------------
+Copyright 2021 Google Inc. All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of Google nor the names of its contributors may
+    be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: angle
+ORIGIN: ../../../flutter/third_party/angle/include/angle_cl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/CircularBuffer.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/Spinlock.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/SynchronizedValue.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/angle_version_info.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/angle_version_info.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/apple/apple_platform.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/linux/dma_buf_utils.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/linux/dma_buf_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/serializer/JsonSerializer.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/serializer/JsonSerializer.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/spirv/angle_spirv_utils.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/spirv/spirv_instruction_builder_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/spirv/spirv_instruction_builder_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/spirv/spirv_instruction_parser_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/spirv/spirv_instruction_parser_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/spirv/spirv_types.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/vulkan/libvulkan_loader.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/vulkan/libvulkan_loader.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/Operator_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/ValidateTypeSizeLimitations.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/ValidateTypeSizeLimitations.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/spirv/BuildSPIRV.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/spirv/BuildSPIRV.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/spirv/OutputSPIRV.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/spirv/OutputSPIRV.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/ClampIndirectIndices.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/ClampIndirectIndices.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/DeclarePerVertexBlocks.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/DeclarePerVertexBlocks.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/MonomorphizeUnsupportedFunctions.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/MonomorphizeUnsupportedFunctions.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RewriteArrayOfArrayOfOpaqueUniforms.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/spirv/EmulateFragColorData.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/spirv/EmulateFragColorData.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/spirv/RewriteR32fImages.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/spirv/RewriteR32fImages.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/FindPreciseNodes.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/FindPreciseNodes.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/CLBitField.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/CLBuffer.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/CLBuffer.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/CLCommandQueue.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/CLCommandQueue.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/CLContext.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/CLContext.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/CLDevice.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/CLDevice.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/CLEvent.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/CLEvent.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/CLImage.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/CLImage.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/CLKernel.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/CLKernel.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/CLMemory.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/CLMemory.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/CLObject.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/CLObject.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/CLPlatform.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/CLPlatform.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/CLProgram.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/CLProgram.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/CLRefPointer.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/CLSampler.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/CLSampler.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/CLtypes.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/serialize_mock.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/cl_utils.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/cl_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/gles_extensions_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/gles_extensions_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLCommandQueueImpl.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLCommandQueueImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLContextImpl.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLContextImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLDeviceImpl.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLDeviceImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLEventImpl.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLEventImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLExtensions.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLExtensions.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLKernelImpl.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLKernelImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLMemoryImpl.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLMemoryImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLPlatformImpl.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLPlatformImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLProgramImpl.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLProgramImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLSamplerImpl.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLSamplerImpl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLtypes.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/ImageImpl.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLCommandQueueCL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLCommandQueueCL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLContextCL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLContextCL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLDeviceCL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLDeviceCL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLEventCL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLEventCL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLKernelCL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLKernelCL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLMemoryCL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLMemoryCL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLPlatformCL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLPlatformCL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLProgramCL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLProgramCL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLSamplerCL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLSamplerCL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/cl_types.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/cl_util.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/cl_util.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/driver_utils_ios.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/DeviceMtl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/DeviceMtl.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/ImageMtl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/ImageMtl.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/ProvokingVertexHelper.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/ProvokingVertexHelper.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_context_device.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_context_device.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_resource_spi.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/shaders/rewrite_indices.metal + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLCommandQueueVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLCommandQueueVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLContextVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLContextVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLDeviceVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLDeviceVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLEventVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLEventVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLKernelVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLKernelVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLMemoryVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLMemoryVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLPlatformVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLPlatformVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLProgramVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLProgramVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLSamplerVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLSamplerVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ShaderInterfaceVariableInfoMap.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ShaderInterfaceVariableInfoMap.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/VkImageImageSiblingVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/VkImageImageSiblingVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/VulkanSecondaryCommandBuffer.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/VulkanSecondaryCommandBuffer.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/android/AHBFunctions.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/android/AHBFunctions.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/cl_types.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/DisplayVkLinux.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/DisplayVkLinux.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/DmaBufImageSiblingVkLinux.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/DmaBufImageSiblingVkLinux.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/null/DisplayVkNull.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/null/DisplayVkNull.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_command_buffer_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/validationCL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/validationCL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/validationCL_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/cl_dispatch_table.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/cl_dispatch_table.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/cl_stubs.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/cl_stubs_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_cl_utils.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_cl_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/proc_table_cl.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/proc_table_cl_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libOpenCL/dispatch.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libOpenCL/dispatch.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libOpenCL/libOpenCL_autogen.map + ../../../flutter/third_party/angle/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/angle/include/angle_cl.h
+FILE: ../../../flutter/third_party/angle/src/common/CircularBuffer.h
+FILE: ../../../flutter/third_party/angle/src/common/Spinlock.h
+FILE: ../../../flutter/third_party/angle/src/common/SynchronizedValue.h
+FILE: ../../../flutter/third_party/angle/src/common/angle_version_info.cpp
+FILE: ../../../flutter/third_party/angle/src/common/angle_version_info.h
+FILE: ../../../flutter/third_party/angle/src/common/apple/apple_platform.h
+FILE: ../../../flutter/third_party/angle/src/common/linux/dma_buf_utils.cpp
+FILE: ../../../flutter/third_party/angle/src/common/linux/dma_buf_utils.h
+FILE: ../../../flutter/third_party/angle/src/common/serializer/JsonSerializer.cpp
+FILE: ../../../flutter/third_party/angle/src/common/serializer/JsonSerializer.h
+FILE: ../../../flutter/third_party/angle/src/common/spirv/angle_spirv_utils.cpp
+FILE: ../../../flutter/third_party/angle/src/common/spirv/spirv_instruction_builder_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/common/spirv/spirv_instruction_builder_autogen.h
+FILE: ../../../flutter/third_party/angle/src/common/spirv/spirv_instruction_parser_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/common/spirv/spirv_instruction_parser_autogen.h
+FILE: ../../../flutter/third_party/angle/src/common/spirv/spirv_types.h
+FILE: ../../../flutter/third_party/angle/src/common/vulkan/libvulkan_loader.cpp
+FILE: ../../../flutter/third_party/angle/src/common/vulkan/libvulkan_loader.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/Operator_autogen.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/ValidateTypeSizeLimitations.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/ValidateTypeSizeLimitations.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/spirv/BuildSPIRV.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/spirv/BuildSPIRV.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/spirv/OutputSPIRV.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/spirv/OutputSPIRV.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/ClampIndirectIndices.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/ClampIndirectIndices.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/DeclarePerVertexBlocks.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/DeclarePerVertexBlocks.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/MonomorphizeUnsupportedFunctions.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/MonomorphizeUnsupportedFunctions.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RewriteArrayOfArrayOfOpaqueUniforms.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/spirv/EmulateFragColorData.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/spirv/EmulateFragColorData.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/spirv/RewriteR32fImages.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/spirv/RewriteR32fImages.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/FindPreciseNodes.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_util/FindPreciseNodes.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/CLBitField.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/CLBuffer.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/CLBuffer.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/CLCommandQueue.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/CLCommandQueue.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/CLContext.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/CLContext.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/CLDevice.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/CLDevice.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/CLEvent.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/CLEvent.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/CLImage.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/CLImage.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/CLKernel.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/CLKernel.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/CLMemory.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/CLMemory.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/CLObject.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/CLObject.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/CLPlatform.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/CLPlatform.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/CLProgram.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/CLProgram.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/CLRefPointer.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/CLSampler.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/CLSampler.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/CLtypes.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/serialize_mock.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/cl_utils.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/cl_utils.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/gles_extensions_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/gles_extensions_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLCommandQueueImpl.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLCommandQueueImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLContextImpl.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLContextImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLDeviceImpl.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLDeviceImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLEventImpl.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLEventImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLExtensions.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLExtensions.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLKernelImpl.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLKernelImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLMemoryImpl.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLMemoryImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLPlatformImpl.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLPlatformImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLProgramImpl.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLProgramImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLSamplerImpl.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLSamplerImpl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/CLtypes.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/ImageImpl.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLCommandQueueCL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLCommandQueueCL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLContextCL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLContextCL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLDeviceCL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLDeviceCL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLEventCL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLEventCL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLKernelCL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLKernelCL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLMemoryCL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLMemoryCL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLPlatformCL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLPlatformCL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLProgramCL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLProgramCL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLSamplerCL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/CLSamplerCL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/cl_types.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/cl_util.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/cl/cl_util.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/driver_utils_ios.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/DeviceMtl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/DeviceMtl.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/ImageMtl.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/ImageMtl.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/ProvokingVertexHelper.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/ProvokingVertexHelper.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_context_device.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_context_device.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_resource_spi.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/shaders/rewrite_indices.metal
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLCommandQueueVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLCommandQueueVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLContextVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLContextVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLDeviceVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLDeviceVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLEventVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLEventVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLKernelVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLKernelVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLMemoryVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLMemoryVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLPlatformVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLPlatformVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLProgramVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLProgramVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLSamplerVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/CLSamplerVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ShaderInterfaceVariableInfoMap.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ShaderInterfaceVariableInfoMap.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/VkImageImageSiblingVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/VkImageImageSiblingVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/VulkanSecondaryCommandBuffer.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/VulkanSecondaryCommandBuffer.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/android/AHBFunctions.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/android/AHBFunctions.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/cl_types.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/DisplayVkLinux.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/DisplayVkLinux.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/DmaBufImageSiblingVkLinux.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/DmaBufImageSiblingVkLinux.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/null/DisplayVkNull.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/null/DisplayVkNull.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/vk_command_buffer_utils.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/validationCL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/validationCL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/validationCL_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/cl_dispatch_table.cpp
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/cl_dispatch_table.h
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/cl_stubs.cpp
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/cl_stubs_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_cl_utils.cpp
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_cl_utils.h
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/proc_table_cl.h
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/proc_table_cl_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libOpenCL/dispatch.cpp
+FILE: ../../../flutter/third_party/angle/src/libOpenCL/dispatch.h
+FILE: ../../../flutter/third_party/angle/src/libOpenCL/libOpenCL_autogen.map
+----------------------------------------------------------------------------------------------------
+Copyright 2021 The ANGLE Project Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+    Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+
+    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
+    Ltd., nor the names of their contributors may be used to endorse
+    or promote products derived from this software without specific
+    prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: angle
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/shaders/rewrite_indices_shared.h + ../../../flutter/third_party/angle/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/shaders/rewrite_indices_shared.h
+----------------------------------------------------------------------------------------------------
+Copyright 2021 The ANGLE Project. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+    Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+
+    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
+    Ltd., nor the names of their contributors may be used to endorse
+    or promote products derived from this software without specific
+    prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: angle
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/wayland/DisplayVkWayland.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/wayland/DisplayVkWayland.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/wayland/WindowSurfaceVkWayland.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/wayland/WindowSurfaceVkWayland.h + ../../../flutter/third_party/angle/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/wayland/DisplayVkWayland.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/wayland/DisplayVkWayland.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/wayland/WindowSurfaceVkWayland.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/wayland/WindowSurfaceVkWayland.h
+----------------------------------------------------------------------------------------------------
+Copyright 2021-2022 The ANGLE Project Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+    Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+
+    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
+    Ltd., nor the names of their contributors may be used to endorse
+    or promote products derived from this software without specific
+    prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libwebp
+ORIGIN: ../../../flutter/third_party/libwebp/sharpyuv/sharpyuv.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/sharpyuv/sharpyuv.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/sharpyuv/sharpyuv_cpu.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/sharpyuv/sharpyuv_cpu.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/sharpyuv/sharpyuv_csp.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/sharpyuv/sharpyuv_csp.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/sharpyuv/sharpyuv_dsp.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/sharpyuv/sharpyuv_dsp.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/sharpyuv/sharpyuv_gamma.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/sharpyuv/sharpyuv_gamma.h + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/sharpyuv/sharpyuv_neon.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/sharpyuv/sharpyuv_sse2.c + ../../../flutter/third_party/libwebp/COPYING
+ORIGIN: ../../../flutter/third_party/libwebp/src/dsp/cpu.h + ../../../flutter/third_party/libwebp/COPYING
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/libwebp/sharpyuv/sharpyuv.c
+FILE: ../../../flutter/third_party/libwebp/sharpyuv/sharpyuv.h
+FILE: ../../../flutter/third_party/libwebp/sharpyuv/sharpyuv_cpu.c
+FILE: ../../../flutter/third_party/libwebp/sharpyuv/sharpyuv_cpu.h
+FILE: ../../../flutter/third_party/libwebp/sharpyuv/sharpyuv_csp.c
+FILE: ../../../flutter/third_party/libwebp/sharpyuv/sharpyuv_csp.h
+FILE: ../../../flutter/third_party/libwebp/sharpyuv/sharpyuv_dsp.c
+FILE: ../../../flutter/third_party/libwebp/sharpyuv/sharpyuv_dsp.h
+FILE: ../../../flutter/third_party/libwebp/sharpyuv/sharpyuv_gamma.c
+FILE: ../../../flutter/third_party/libwebp/sharpyuv/sharpyuv_gamma.h
+FILE: ../../../flutter/third_party/libwebp/sharpyuv/sharpyuv_neon.c
+FILE: ../../../flutter/third_party/libwebp/sharpyuv/sharpyuv_sse2.c
+FILE: ../../../flutter/third_party/libwebp/src/dsp/cpu.h
+----------------------------------------------------------------------------------------------------
+Copyright 2022 Google Inc. All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of Google nor the names of its contributors may
+    be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: angle
+ORIGIN: ../../../flutter/third_party/angle/include/platform/autogen/FeaturesD3D_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/include/platform/autogen/FeaturesGL_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/include/platform/autogen/FeaturesMtl_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/include/platform/autogen/FeaturesVk_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/include/platform/autogen/FrontendFeatures_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/include/platform/d3d_features.json + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/include/platform/frontend_features.json + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/include/platform/gl_features.json + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/include/platform/mtl_features.json + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/include/platform/vk_features.json + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/CompiledShaderState.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/CompiledShaderState.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/RingBufferAllocator.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/RingBufferAllocator.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/apple_platform_utils.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/backtrace_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/backtrace_utils_android.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/backtrace_utils_noop.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/frame_capture_utils.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/frame_capture_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/BaseTypes.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/msl/ConstantNames.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RewritePixelLocalStorage.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RewritePixelLocalStorage.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/AggregateAssignArraysInSSBOs.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/AggregateAssignArraysInSSBOs.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/AggregateAssignStructsInSSBOs.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/AggregateAssignStructsInSSBOs.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/GuardFragDepthWrite.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/GuardFragDepthWrite.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/spirv/EmulateAdvancedBlendEquations.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/spirv/EmulateAdvancedBlendEquations.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/spirv/EmulateDithering.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/spirv/EmulateDithering.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/spirv/EmulateYUVBuiltIns.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/spirv/EmulateYUVBuiltIns.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/image_util/AstcDecompressor.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/image_util/AstcDecompressor.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/image_util/AstcDecompressorNoOp.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/image_util/AstcDecompressorTestUtils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/image_util/loadimage_astc.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/image_util/loadimage_paletted.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/image_util/storeimage.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/image_util/storeimage_paletted.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/MemoryShaderCache.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/MemoryShaderCache.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Overlay_font_autogen.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/Overlay_font_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/PixelLocalStorage.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/PixelLocalStorage.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gl_1_params.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gl_2_params.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gl_3_params.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gl_4_params.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/entry_points_utils.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/FramebufferImpl.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/ProgramImpl.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/ProgramPipelineImpl.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/RenderbufferImpl.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/TransformFeedbackImpl.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/VertexArrayImpl.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/PLSProgramCache.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/PLSProgramCache.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/DeviceEGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/DeviceEGL.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_buffer_manager.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_buffer_manager.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/AllocatorHelperPool.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/AllocatorHelperPool.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/AllocatorHelperRing.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/AllocatorHelperRing.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/Suballocation.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/Suballocation.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/gbm/DisplayVkGbm.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/gbm/DisplayVkGbm.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ExportStencil.frag + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/OverlayDraw.frag + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/OverlayDraw.vert + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_glx.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_glx.h + ../../../flutter/third_party/angle/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/angle/include/platform/autogen/FeaturesD3D_autogen.h
+FILE: ../../../flutter/third_party/angle/include/platform/autogen/FeaturesGL_autogen.h
+FILE: ../../../flutter/third_party/angle/include/platform/autogen/FeaturesMtl_autogen.h
+FILE: ../../../flutter/third_party/angle/include/platform/autogen/FeaturesVk_autogen.h
+FILE: ../../../flutter/third_party/angle/include/platform/autogen/FrontendFeatures_autogen.h
+FILE: ../../../flutter/third_party/angle/include/platform/d3d_features.json
+FILE: ../../../flutter/third_party/angle/include/platform/frontend_features.json
+FILE: ../../../flutter/third_party/angle/include/platform/gl_features.json
+FILE: ../../../flutter/third_party/angle/include/platform/mtl_features.json
+FILE: ../../../flutter/third_party/angle/include/platform/vk_features.json
+FILE: ../../../flutter/third_party/angle/src/common/CompiledShaderState.cpp
+FILE: ../../../flutter/third_party/angle/src/common/CompiledShaderState.h
+FILE: ../../../flutter/third_party/angle/src/common/RingBufferAllocator.cpp
+FILE: ../../../flutter/third_party/angle/src/common/RingBufferAllocator.h
+FILE: ../../../flutter/third_party/angle/src/common/apple_platform_utils.mm
+FILE: ../../../flutter/third_party/angle/src/common/backtrace_utils.h
+FILE: ../../../flutter/third_party/angle/src/common/backtrace_utils_android.cpp
+FILE: ../../../flutter/third_party/angle/src/common/backtrace_utils_noop.cpp
+FILE: ../../../flutter/third_party/angle/src/common/frame_capture_utils.cpp
+FILE: ../../../flutter/third_party/angle/src/common/frame_capture_utils.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/BaseTypes.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/msl/ConstantNames.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RewritePixelLocalStorage.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/RewritePixelLocalStorage.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/AggregateAssignArraysInSSBOs.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/AggregateAssignArraysInSSBOs.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/AggregateAssignStructsInSSBOs.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/hlsl/AggregateAssignStructsInSSBOs.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/GuardFragDepthWrite.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/GuardFragDepthWrite.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/spirv/EmulateAdvancedBlendEquations.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/spirv/EmulateAdvancedBlendEquations.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/spirv/EmulateDithering.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/spirv/EmulateDithering.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/spirv/EmulateYUVBuiltIns.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/spirv/EmulateYUVBuiltIns.h
+FILE: ../../../flutter/third_party/angle/src/image_util/AstcDecompressor.cpp
+FILE: ../../../flutter/third_party/angle/src/image_util/AstcDecompressor.h
+FILE: ../../../flutter/third_party/angle/src/image_util/AstcDecompressorNoOp.cpp
+FILE: ../../../flutter/third_party/angle/src/image_util/AstcDecompressorTestUtils.h
+FILE: ../../../flutter/third_party/angle/src/image_util/loadimage_astc.cpp
+FILE: ../../../flutter/third_party/angle/src/image_util/loadimage_paletted.cpp
+FILE: ../../../flutter/third_party/angle/src/image_util/storeimage.h
+FILE: ../../../flutter/third_party/angle/src/image_util/storeimage_paletted.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/MemoryShaderCache.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/MemoryShaderCache.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Overlay_font_autogen.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/Overlay_font_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/PixelLocalStorage.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/PixelLocalStorage.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gl_1_params.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gl_2_params.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gl_3_params.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/capture/capture_gl_4_params.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/entry_points_utils.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/FramebufferImpl.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/ProgramImpl.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/ProgramPipelineImpl.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/RenderbufferImpl.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/TransformFeedbackImpl.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/VertexArrayImpl.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/PLSProgramCache.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/PLSProgramCache.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/DeviceEGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/DeviceEGL.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_buffer_manager.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_buffer_manager.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/AllocatorHelperPool.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/AllocatorHelperPool.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/AllocatorHelperRing.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/AllocatorHelperRing.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/Suballocation.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/Suballocation.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/gbm/DisplayVkGbm.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/linux/gbm/DisplayVkGbm.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ExportStencil.frag
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/OverlayDraw.frag
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/OverlayDraw.vert
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_glx.cpp
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/entry_points_glx.h
+----------------------------------------------------------------------------------------------------
+Copyright 2022 The ANGLE Project Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+    Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+
+    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
+    Ltd., nor the names of their contributors may be used to endorse
+    or promote products derived from this software without specific
+    prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/mock_signature_verify_cache.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/mock_signature_verify_cache.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/signature_verify_cache.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/string_util.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/string_util.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/pki/mock_signature_verify_cache.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/mock_signature_verify_cache.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/signature_verify_cache.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/string_util.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/string_util.h
+----------------------------------------------------------------------------------------------------
+Copyright 2022 The Chromium Authors
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file
+====================================================================================================
+
+====================================================================================================
+LIBRARY: angle
+ORIGIN: ../../../flutter/third_party/angle/src/common/FixedQueue.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/platform_helpers.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/common/platform_helpers.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/RewriteInterpolants.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/RewriteInterpolants.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/spirv/EmulateFramebufferFetch.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/spirv/EmulateFramebufferFetch.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/GlobalMutex.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/GlobalMutex.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/ShareGroup.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/ShareGroup.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/SharedContextMutex.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/SharedContextMutex.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/context_private_call_gl.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/context_private_call_gl_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/context_private_call_gles.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/context_private_call_gles_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/blocklayoutMetal.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/blocklayoutMetal.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_library_cache.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_library_cache.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_pipeline_cache.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_pipeline_cache.mm + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/process.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/process.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/renderermtl_utils.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/renderermtl_utils.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/MemoryTracking.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/MemoryTracking.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/SecondaryCommandPool.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/SecondaryCommandPool.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ShareGroupVk.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ShareGroupVk.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/CopyImageToBuffer.comp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/CopyImageToBuffer.comp.json + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/egl_context_lock_autogen.h + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libGLESv2/egl_context_lock_impl.h + ../../../flutter/third_party/angle/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/angle/src/common/FixedQueue.h
+FILE: ../../../flutter/third_party/angle/src/common/platform_helpers.cpp
+FILE: ../../../flutter/third_party/angle/src/common/platform_helpers.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/RewriteInterpolants.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/msl/RewriteInterpolants.h
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/spirv/EmulateFramebufferFetch.cpp
+FILE: ../../../flutter/third_party/angle/src/compiler/translator/tree_ops/spirv/EmulateFramebufferFetch.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/GlobalMutex.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/GlobalMutex.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/ShareGroup.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/ShareGroup.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/SharedContextMutex.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/SharedContextMutex.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/context_private_call_gl.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/context_private_call_gl_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/context_private_call_gles.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/context_private_call_gles_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/blocklayoutMetal.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/blocklayoutMetal.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_library_cache.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_library_cache.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_pipeline_cache.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/mtl_pipeline_cache.mm
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/process.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/process.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/renderermtl_utils.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/metal/renderermtl_utils.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/MemoryTracking.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/MemoryTracking.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/SecondaryCommandPool.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/SecondaryCommandPool.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ShareGroupVk.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/ShareGroupVk.h
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/CopyImageToBuffer.comp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/CopyImageToBuffer.comp.json
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/egl_context_lock_autogen.h
+FILE: ../../../flutter/third_party/angle/src/libGLESv2/egl_context_lock_impl.h
+----------------------------------------------------------------------------------------------------
+Copyright 2023 The ANGLE Project Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+    Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+
+    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
+    Ltd., nor the names of their contributors may be used to endorse
+    or promote products derived from this software without specific
+    prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/fillins/file_util.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/fillins/file_util.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/fillins/fillins_base64.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/fillins/fillins_base64.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/fillins/fillins_string_util.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/fillins/fillins_string_util.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/fillins/log.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/fillins/net_errors.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/fillins/openssl_util.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/fillins/openssl_util.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/fillins/path_service.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/fillins/path_service.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/ip_util.cc (with ../../../flutter/third_party/boringssl/src/LICENSE)
+ORIGIN: ../../../flutter/third_party/boringssl/src/pki/ip_util.h (with ../../../flutter/third_party/boringssl/src/LICENSE)
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/pki/fillins/file_util.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/fillins/file_util.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/fillins/fillins_base64.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/fillins/fillins_base64.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/fillins/fillins_string_util.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/fillins/fillins_string_util.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/fillins/log.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/fillins/net_errors.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/fillins/openssl_util.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/fillins/openssl_util.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/fillins/path_service.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/fillins/path_service.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/ip_util.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/ip_util.h
+----------------------------------------------------------------------------------------------------
+Copyright 2023 The Chromium Authors
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/service_indicator/internal.h
+ORIGIN: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/service_indicator/service_indicator.c
+ORIGIN: ../../../flutter/third_party/boringssl/src/include/openssl/service_indicator.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/service_indicator/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/service_indicator/service_indicator.c
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/service_indicator.h
+----------------------------------------------------------------------------------------------------
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: angle
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/DmaBufImageSiblingEGL.cpp + ../../../flutter/third_party/angle/LICENSE
+ORIGIN: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/DmaBufImageSiblingEGL.h + ../../../flutter/third_party/angle/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/DmaBufImageSiblingEGL.cpp
+FILE: ../../../flutter/third_party/angle/src/libANGLE/renderer/gl/egl/DmaBufImageSiblingEGL.h
+----------------------------------------------------------------------------------------------------
+Copyright The ANGLE Project Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+    Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+
+    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
+    Ltd., nor the names of their contributors may be used to endorse
+    or promote products derived from this software without specific
+    prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-buffer.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-buffer.h
+----------------------------------------------------------------------------------------------------
+Copyright © 1998-2004  David Turner and Werner Lemberg
+Copyright © 2004,2007,2009  Red Hat, Inc.
+Copyright © 2011,2012  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-buffer.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-buffer.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-buffer.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-buffer.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 1998-2004  David Turner and Werner Lemberg
+Copyright © 2004,2007,2009,2010  Red Hat, Inc.
+Copyright © 2011,2012  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-layout.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-layout.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 1998-2004  David Turner and Werner Lemberg
+Copyright © 2006  Behdad Esfahbod
+Copyright © 2007,2008,2009  Red Hat, Inc.
+Copyright © 2012,2013  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-atomic.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-mutex.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-object.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-atomic.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-mutex.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-object.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2007  Chris Wilson
+Copyright © 2009,2010  Red Hat, Inc.
+Copyright © 2011,2012  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-layout.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-layout.h
+----------------------------------------------------------------------------------------------------
+Copyright © 2007,2008,2009  Red Hat, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GDEF/GDEF.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-layout-gdef-table.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GDEF/GDEF.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-layout-gdef-table.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2007,2008,2009  Red Hat, Inc.
+Copyright © 2010,2011,2012  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/OT/Layout/Common/Coverage.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/OT/Layout/Common/CoverageFormat1.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/OT/Layout/Common/CoverageFormat2.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/OT/Layout/Common/RangeRecord.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/OT/Layout/types.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-layout-common.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/Common/Coverage.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/Common/CoverageFormat1.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/Common/CoverageFormat2.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/Common/RangeRecord.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/types.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-layout-common.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2007,2008,2009  Red Hat, Inc.
+Copyright © 2010,2012  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-common.h
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-common.h
+FILE: ../../../flutter/third_party/harfbuzz/src/hb.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2007,2008,2009  Red Hat, Inc.
+Copyright © 2011,2012  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-open-file.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-open-file.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2007,2008,2009  Red Hat, Inc.
+Copyright © 2012  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-face.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-layout.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-face.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-layout.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2007,2008,2009  Red Hat, Inc.
+Copyright © 2012,2013  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-face-table-list.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-face-table-list.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2007,2008,2009  Red Hat, Inc.
+Copyright © 2012,2013  Google, Inc.
+Copyright © 2019, Facebook Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/main.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/main.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2007,2008,2009  Red Hat, Inc.
+Copyright © 2018,2019,2020  Ebrahim Byagowi
+Copyright © 2018  Khaled Hosny
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-layout-gsubgpos.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-layout-gsubgpos.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2007,2008,2009,2010  Red Hat, Inc.
+Copyright © 2010,2012  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-layout-gpos-table.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-layout-gsub-table.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-layout-gpos-table.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-layout-gsub-table.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2007,2008,2009,2010  Red Hat, Inc.
+Copyright © 2010,2012,2013  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-open-type.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-open-type.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2007,2008,2009,2010  Red Hat, Inc.
+Copyright © 2012  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-dispatch.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-machinery.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-sanitize.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-dispatch.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-machinery.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-sanitize.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2007,2008,2009,2010  Red Hat, Inc.
+Copyright © 2012,2018  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-serialize.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-serialize.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2007,2008,2009,2010  Red Hat, Inc.
+Copyright © 2012,2018  Google, Inc.
+Copyright © 2019  Facebook, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-blob.h
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-face.h
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-font.h
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot.h
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-blob.h
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-face.h
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-font.h
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot.h
+FILE: ../../../flutter/third_party/harfbuzz/src/hb.h
+----------------------------------------------------------------------------------------------------
+Copyright © 2009  Red Hat, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-icu.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-icu.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2009  Red Hat, Inc.
+Copyright © 2009  Keith Stribley
+Copyright © 2011  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ft.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ft.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2009  Red Hat, Inc.
+Copyright © 2009  Keith Stribley
+Copyright © 2015  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-unicode.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-unicode.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-unicode.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-unicode.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2009  Red Hat, Inc.
+Copyright © 2011  Codethink Limited
+Copyright © 2010,2011,2012  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-unicode.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-unicode.h
+----------------------------------------------------------------------------------------------------
+Copyright © 2009  Red Hat, Inc.
+Copyright © 2011  Codethink Limited
+Copyright © 2011,2012  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-face.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-font.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-glib.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-glib.h
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-icu.h
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-tag.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-face.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-font.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-glib.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-glib.h
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-icu.h
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-tag.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2009  Red Hat, Inc.
+Copyright © 2011  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-face-builder.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-face.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-font.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-shape.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-shape.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-face-builder.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-face.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-font.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-shape.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-shape.h
+----------------------------------------------------------------------------------------------------
+Copyright © 2009  Red Hat, Inc.
+Copyright © 2012  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ft.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ft.h
+----------------------------------------------------------------------------------------------------
+Copyright © 2009  Red Hat, Inc.
+Copyright © 2015  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-blob.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-blob.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2009  Red Hat, Inc.
+Copyright © 2018  Ebrahim Byagowi
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-blob.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-blob.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2009  Red Hat, Inc.
+Copyright © 2018  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-shape.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shape.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2009,2010  Red Hat, Inc.
+Copyright © 2010,2011,2012  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-map.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-map.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2009,2010  Red Hat, Inc.
+Copyright © 2010,2011,2012,2013  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-aat-map.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-map.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-aat-map.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-map.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2009,2010  Red Hat, Inc.
+Copyright © 2010,2011,2013  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-common.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-common.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2009,2010  Red Hat, Inc.
+Copyright © 2011,2012  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-shape.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shape.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2010  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-head-table.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-head-table.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2010  Red Hat, Inc.
+Copyright © 2012  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/test-gpos-size-params.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/test-gsub-get-alternates.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/test-gsub-would-substitute.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/test.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/test-gpos-size-params.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/test-gsub-get-alternates.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/test-gsub-would-substitute.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/test.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2010,2011  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2010,2011,2012  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/test-buffer-serialize.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/test-buffer-serialize.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2010,2011,2013  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-arabic.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-default.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-hebrew.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-thai.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-arabic.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-default.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-hebrew.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-thai.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2010,2012  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-fallback-shape.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-gobject-structs.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-uniscribe.h
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-version.h
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-version.h.in
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-wasm-shape.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-fallback-shape.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-gobject-structs.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-uniscribe.h
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-version.h
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-version.h.in
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-wasm-shape.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2011  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-graphite2.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-graphite2.h
+----------------------------------------------------------------------------------------------------
+Copyright © 2011  Martin Hosken
+Copyright © 2011  SIL International
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-graphite2.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-graphite2.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2011  Martin Hosken
+Copyright © 2011  SIL International
+Copyright © 2011,2012  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/OT/name/name.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-hhea-table.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-hmtx-table.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-maxp-table.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-name-table.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-shape-fallback.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-shape-normalize.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-indic-machine.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-indic-machine.rl
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-indic.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-khmer-machine.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-khmer-machine.rl
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-khmer.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-myanmar-machine.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-myanmar-machine.rl
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/name/name.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-hhea-table.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-hmtx-table.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-maxp-table.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-name-table.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shape-fallback.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shape-normalize.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-indic-machine.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-indic-machine.rl
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-indic.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-khmer-machine.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-khmer-machine.rl
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-khmer.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-myanmar-machine.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-myanmar-machine.rl
+----------------------------------------------------------------------------------------------------
+Copyright © 2011,2012  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-os2-table.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-os2-table.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2011,2012  Google, Inc.
+Copyright © 2018  Ebrahim Byagowi
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-myanmar.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-uniscribe.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-myanmar.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-uniscribe.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2011,2012,2013  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ms-feature-ranges.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ms-feature-ranges.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2011,2012,2013  Google, Inc.
+Copyright © 2021  Khaled Hosny
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-utf.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-utf.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2011,2012,2014  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-font.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-font.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2011,2014  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-cache.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-shape-fallback.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-shape-normalize.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-arabic-fallback.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-indic.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-set-digest.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-set.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-set.h
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-shape-plan.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-shape-plan.h
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-shaper-impl.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-shaper-list.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-shaper.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-shaper.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-cache.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shape-fallback.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shape-normalize.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-arabic-fallback.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-indic.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-set-digest.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-set.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-set.h
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-shape-plan.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-shape-plan.h
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-shaper-impl.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-shaper-list.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-shaper.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-shaper.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2012  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-coretext.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-coretext.h
+----------------------------------------------------------------------------------------------------
+Copyright © 2012  Mozilla Foundation.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-buffer-serialize.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-buffer-serialize.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2012,2013  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-coretext.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-coretext.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2012,2013  Mozilla Foundation.
+Copyright © 2012,2013  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-bit-page.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-bit-set-invertible.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-bit-set.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-set.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-bit-page.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-bit-set-invertible.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-bit-set.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-set.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2012,2017  Google, Inc.
+Copyright © 2021 Behdad Esfahbod
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-shape-plan.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-shape-plan.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2012,2018  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-buffer-deserialize-json.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-buffer-deserialize-json.rl
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-buffer-deserialize-text-glyphs.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-buffer-deserialize-text-glyphs.rl
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-buffer-deserialize-text-unicode.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-buffer-deserialize-text-unicode.rl
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-deprecated.h
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-layout-jstf-table.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-hangul.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-buffer-deserialize-json.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-buffer-deserialize-json.rl
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-buffer-deserialize-text-glyphs.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-buffer-deserialize-text-glyphs.rl
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-buffer-deserialize-text-unicode.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-buffer-deserialize-text-unicode.rl
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-deprecated.h
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-layout-jstf-table.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-hangul.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2013  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-shape.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shape.h
+----------------------------------------------------------------------------------------------------
+Copyright © 2013  Red Hat, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-cmap-table.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-font.h
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-arabic-win1256.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-cmap-table.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-font.h
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-arabic-win1256.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2014  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-glyf-table.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-glyf-table.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2015  Google, Inc.
+Copyright © 2019  Adobe Inc.
+Copyright © 2019  Ebrahim Byagowi
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-arabic.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-use-machine.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-use-machine.rl
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-use.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-arabic.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-use-machine.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-use-machine.rl
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-use.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2015  Mozilla Foundation.
+Copyright © 2015  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-directwrite.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-directwrite.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-directwrite.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-directwrite.h
+----------------------------------------------------------------------------------------------------
+Copyright © 2015-2019  Ebrahim Byagowi
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-layout-base-table.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-layout-base-table.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2016  Elie Roux <elie.roux@telecom-bretagne.eu>
+Copyright © 2018  Google, Inc.
+Copyright © 2018-2019  Ebrahim Byagowi
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/OT/Color/CBDT/CBDT.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-post-table.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Color/CBDT/CBDT.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-post-table.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2016  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/OT/Color/CPAL/CPAL.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-color.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Color/CPAL/CPAL.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-color.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2016  Google, Inc.
+Copyright © 2018  Ebrahim Byagowi
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-color.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-color.h
+----------------------------------------------------------------------------------------------------
+Copyright © 2016  Google, Inc.
+Copyright © 2018  Khaled Hosny
+Copyright © 2018  Ebrahim Byagowi
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-math-table.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-math.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-math.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-math-table.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-math.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-math.h
+----------------------------------------------------------------------------------------------------
+Copyright © 2016  Igalia S.L.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-aat-layout-common.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-aat-layout-morx-table.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-aat-layout.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-debug.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-kern.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-kern-table.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-post-macroman.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-var-avar-table.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-var-fvar-table.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-var-hvar-table.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-var-mvar-table.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-var.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-var.h
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-string-array.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-aat-layout-common.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-aat-layout-morx-table.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-aat-layout.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-debug.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-kern.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-kern-table.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-post-macroman.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-var-avar-table.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-var-fvar-table.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-var-hvar-table.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-var-mvar-table.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-var.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-var.h
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-string-array.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2017  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-aat-layout.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-aat-layout.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2017  Google, Inc.
+Copyright © 2018  Ebrahim Byagowi
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-algs.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-algs.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2017  Google, Inc.
+Copyright © 2019  Facebook, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-vector.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-vector.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2017,2018  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/OT/Color/svg/svg.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-aat-layout-ankr-table.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-aat-layout-bsln-table.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-aat-layout-feat-table.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-aat-layout-just-table.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-aat-layout.h
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-aat-ltag-table.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-aat.h
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-gasp-table.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-metrics.h
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-metrics.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-stat-table.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Color/svg/svg.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-aat-layout-ankr-table.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-aat-layout-bsln-table.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-aat-layout-feat-table.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-aat-layout-just-table.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-aat-layout.h
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-aat-ltag-table.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-aat.h
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-gasp-table.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-metrics.h
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-metrics.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-stat-table.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2018  Ebrahim Byagowi
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-aat-layout-kerx-table.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-aat-layout-trak-table.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-aat-layout-kerx-table.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-aat-layout-trak-table.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2018  Ebrahim Byagowi
+Copyright © 2018  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/OT/Color/COLR/COLR.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/OT/Color/COLR/colrv1-closure.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/OT/Color/sbix/sbix.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Color/COLR/COLR.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Color/COLR/colrv1-closure.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Color/sbix/sbix.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2018  Ebrahim Byagowi
+Copyright © 2020  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-name.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-name.h
+----------------------------------------------------------------------------------------------------
+Copyright © 2018  Ebrahim Byagowi.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-aat-map.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-array.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-map.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-map.h
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-map.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-meta.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-null.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-deprecated.h
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-face.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-hdmx-table.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-name-language-static.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-name-language.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-name.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-os2-unicode-ranges.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-vowel-constraints.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-static.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-subset-input.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-subset-input.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-subset-plan.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-subset-plan.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-subset.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-subset.h
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-subset.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/test-iter.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/test-ot-name.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/test-unicode-ranges.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-aat-map.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-array.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-map.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-map.h
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-map.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-meta.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-null.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-deprecated.h
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-face.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-hdmx-table.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-name-language-static.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-name-language.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-name.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-os2-unicode-ranges.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-vowel-constraints.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-static.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-subset-input.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-subset-input.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-subset-plan.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-subset-plan.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-subset.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-subset.h
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-subset.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/test-iter.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/test-ot-name.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/test-unicode-ranges.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2018  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-iter.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-iter.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2018  Google, Inc.
+Copyright © 2019  Facebook, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-subset-plan-member-list.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-subset-plan-member-list.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2018  Google, Inc.
+Copyright © 2023  Behdad Esfahbod
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-cff-interp-common.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-cff-interp-cs-common.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-cff-interp-dict-common.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-cff1-interp-cs.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-cff2-interp-cs.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-cff-common.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-cff1-table.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-cff1-table.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-cff2-table.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-cff2-table.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-vorg-table.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-subset-cff-common.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-subset-cff-common.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-subset-cff1.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-subset-cff2.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-cff-interp-common.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-cff-interp-cs-common.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-cff-interp-dict-common.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-cff1-interp-cs.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-cff2-interp-cs.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-cff-common.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-cff1-table.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-cff1-table.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-cff2-table.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-cff2-table.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-vorg-table.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-subset-cff-common.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-subset-cff-common.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-subset-cff1.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-subset-cff2.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2018 Adobe Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-metrics.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-metrics.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2018-2019  Ebrahim Byagowi
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-var-gvar-table.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-var-gvar-table.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2019  Adobe Inc.
+Copyright © 2019  Ebrahim Byagowi
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-cff1-std-str.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/test-bimap.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/test-ot-glyphname.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-cff1-std-str.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/test-bimap.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/test-ot-glyphname.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2019  Adobe, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-aat-layout-opbd-table.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-gdi.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-gdi.h
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-number-parser.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-number-parser.rl
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-number.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-number.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-meta-table.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-meta.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-meta.h
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-style.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-style.h
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/test-number.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/test-ot-meta.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-aat-layout-opbd-table.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-gdi.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-gdi.h
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-number-parser.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-number-parser.rl
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-number.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-number.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-meta-table.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-meta.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-meta.h
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-style.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-style.h
+FILE: ../../../flutter/third_party/harfbuzz/src/test-number.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/test-ot-meta.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2019  Ebrahim Byagowi
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-config.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-pool.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/test-algs.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-config.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-pool.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/test-algs.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2019  Facebook, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-bimap.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-bimap.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2019 Adobe Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-draw.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-draw.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-draw.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-draw.h
+----------------------------------------------------------------------------------------------------
+Copyright © 2019-2020  Ebrahim Byagowi
 
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+This is part of HarfBuzz, a text shaping library.
 
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google Inc. nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 ====================================================================================================
 
 ====================================================================================================
-LIBRARY: accessibility
-ORIGIN: ../../../LICENSE
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/failing-alloc.c
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-draw.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/failing-alloc.c
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-draw.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2020  Ebrahim Byagowi
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-priority-queue.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-repacker.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/test-array.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/test-item-varstore.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/test-priority-queue.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/test-repacker.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/test-tuple-varstore.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-priority-queue.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-repacker.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/test-array.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/test-item-varstore.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/test-priority-queue.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/test-repacker.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/test-tuple-varstore.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2020  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/test-map.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/test-set.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/test-vector.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/test-map.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/test-set.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/test-vector.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2021  Behdad Esfahbod
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-syllabic.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-syllabic.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-syllabic.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-syllabic.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2021  Behdad Esfahbod.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-post-table-v2subset.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-var-common.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-post-table-v2subset.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-var-common.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2021  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-buffer-verify.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ft-colr.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-limits.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-multimap.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/test-machinery.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/test-multimap.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/test-serialize.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-buffer-verify.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ft-colr.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-limits.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-multimap.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/test-machinery.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/test-multimap.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/test-serialize.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2022  Behdad Esfahbod
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/graph/classdef-graph.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/graph/coverage-graph.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/graph/graph.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/graph/gsubgpos-context.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/graph/gsubgpos-context.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/graph/gsubgpos-graph.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/graph/markbasepos-graph.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/graph/pairpos-graph.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/graph/serialize.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/graph/split-helpers.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/graph/test-classdef-graph.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-subset-accelerator.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-subset-repacker.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-subset-repacker.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/graph/classdef-graph.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/graph/coverage-graph.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/graph/graph.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/graph/gsubgpos-context.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/graph/gsubgpos-context.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/graph/gsubgpos-graph.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/graph/markbasepos-graph.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/graph/pairpos-graph.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/graph/serialize.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/graph/split-helpers.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/graph/test-classdef-graph.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-subset-accelerator.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-subset-repacker.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-subset-repacker.h
+----------------------------------------------------------------------------------------------------
+Copyright © 2022  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-cairo-utils.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-cairo-utils.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2022  Red Hat, Inc
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-cairo-utils.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-cairo-utils.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2022  Red Hat, Inc
+Copyright © 2021, 2022  Black Foundry
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-cairo.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-cairo.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2022  Red Hat, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-cplusplus.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-paint-extents.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-paint-extents.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-cplusplus.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-paint-extents.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-paint-extents.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2022 Behdad Esfahbod
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-paint.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-paint.h
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-paint.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-paint.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-paint.h
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-paint.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2022 Matthias Clasen
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-cairo.h
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-features.h.in
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-cairo.h
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-features.h.in
+----------------------------------------------------------------------------------------------------
+Copyright © 2022 Red Hat, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-outline.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-subset-instancer-solver.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-subset-instancer-solver.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-wasm-api-blob.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-wasm-api-buffer.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-wasm-api-common.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-wasm-api-face.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-wasm-api-font.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-wasm-api-list.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-wasm-api-shape.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-wasm-api.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-wasm-api.h
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-wasm-api.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-outline.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-subset-instancer-solver.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-subset-instancer-solver.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-wasm-api-blob.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-wasm-api-buffer.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-wasm-api-common.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-wasm-api-face.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-wasm-api-font.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-wasm-api-list.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-wasm-api-shape.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-wasm-api.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-wasm-api.h
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-wasm-api.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2023  Behdad Esfahbod
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-outline.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-outline.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2023  Behdad Esfahbod
+Copyright © 1999  David Turner
+Copyright © 2005  Werner Lemberg
+Copyright © 2013-2015  Alexei Podtelezhnikov
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-var-cvar-table.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/test-subset-instancer-solver.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-var-cvar-table.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/test-subset-instancer-solver.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2023  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: glslang
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Include/SpirvIntrinsics.h
+ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/SpirvIntrinsics.cpp
 TYPE: LicenseType.bsd
-FILE: ../../../flutter/third_party/accessibility/ax/ax_tree_id_registry.cc
-FILE: ../../../flutter/third_party/accessibility/ax/ax_tree_id_registry.h
-FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node.cc
-FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node.h
-FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_base.cc
-FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_base.h
-FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_delegate.h
-FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_delegate_base.h
-FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_mac.h
-FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_mac.mm
-FILE: ../../../flutter/third_party/accessibility/base/numerics/safe_conversions.h
-FILE: ../../../flutter/third_party/accessibility/base/numerics/safe_conversions_impl.h
-FILE: ../../../flutter/third_party/accessibility/gfx/mac/coordinate_conversion.h
-FILE: ../../../flutter/third_party/accessibility/gfx/mac/coordinate_conversion.mm
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Include/SpirvIntrinsics.h
+FILE: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/SpirvIntrinsics.cpp
 ----------------------------------------------------------------------------------------------------
-Copyright 2014 The Chromium Authors. All rights reserved.
+Copyright(C) 2021 Advanced Micro Devices, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/ssl/d1_srtp.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/boringssl/src/ssl/d1_srtp.cc
+----------------------------------------------------------------------------------------------------
+DTLS code by Eric Rescorla <ekr@rtfm.com>
+
+Copyright (C) 2006, Network Resonance, Inc.
+Copyright (C) 2011, RTFM, Inc.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/COPYING
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/.ci/requirements-fonttools.in
+FILE: ../../../flutter/third_party/harfbuzz/.ci/requirements-fonttools.txt
+FILE: ../../../flutter/third_party/harfbuzz/.ci/requirements.in
+FILE: ../../../flutter/third_party/harfbuzz/.ci/win32-cross-file.txt
+FILE: ../../../flutter/third_party/harfbuzz/.ci/win64-cross-file.txt
+FILE: ../../../flutter/third_party/harfbuzz/.circleci/config.yml
+FILE: ../../../flutter/third_party/harfbuzz/.codecov.yml
+FILE: ../../../flutter/third_party/harfbuzz/harfbuzz.doap
+FILE: ../../../flutter/third_party/harfbuzz/meson_options.txt
+FILE: ../../../flutter/third_party/harfbuzz/perf/benchmark-font.cc
+FILE: ../../../flutter/third_party/harfbuzz/perf/benchmark-map.cc
+FILE: ../../../flutter/third_party/harfbuzz/perf/benchmark-ot.cc
+FILE: ../../../flutter/third_party/harfbuzz/perf/benchmark-set.cc
+FILE: ../../../flutter/third_party/harfbuzz/perf/benchmark-shape.cc
+FILE: ../../../flutter/third_party/harfbuzz/perf/benchmark-subset.cc
+FILE: ../../../flutter/third_party/harfbuzz/perf/fonts/Amiri-Regular.ttf
+FILE: ../../../flutter/third_party/harfbuzz/perf/fonts/NotoNastaliqUrdu-Regular.ttf
+FILE: ../../../flutter/third_party/harfbuzz/perf/fonts/Roboto-Regular.ttf
+FILE: ../../../flutter/third_party/harfbuzz/perf/texts/duployan.txt
+FILE: ../../../flutter/third_party/harfbuzz/perf/texts/en-thelittleprince.txt
+FILE: ../../../flutter/third_party/harfbuzz/perf/texts/en-words.txt
+FILE: ../../../flutter/third_party/harfbuzz/perf/texts/fa-thelittleprince.txt
+FILE: ../../../flutter/third_party/harfbuzz/perf/texts/fa-words.txt
+FILE: ../../../flutter/third_party/harfbuzz/perf/texts/hi-words.txt
+FILE: ../../../flutter/third_party/harfbuzz/src/ArabicPUASimplified.txt
+FILE: ../../../flutter/third_party/harfbuzz/src/ArabicPUATraditional.txt
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GPOS/Anchor.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GPOS/AnchorFormat1.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GPOS/AnchorFormat2.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GPOS/AnchorFormat3.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GPOS/AnchorMatrix.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GPOS/ChainContextPos.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GPOS/Common.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GPOS/ContextPos.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GPOS/CursivePos.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GPOS/CursivePosFormat1.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GPOS/ExtensionPos.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GPOS/GPOS.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GPOS/LigatureArray.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GPOS/MarkArray.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GPOS/MarkBasePos.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GPOS/MarkBasePosFormat1.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GPOS/MarkLigPos.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GPOS/MarkLigPosFormat1.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GPOS/MarkMarkPos.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GPOS/MarkMarkPosFormat1.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GPOS/MarkRecord.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GPOS/PairPos.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GPOS/PairPosFormat1.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GPOS/PairPosFormat2.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GPOS/PairSet.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GPOS/PairValueRecord.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GPOS/PosLookup.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GPOS/PosLookupSubTable.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GPOS/SinglePos.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GPOS/SinglePosFormat1.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GPOS/SinglePosFormat2.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GPOS/ValueFormat.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GSUB/AlternateSet.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GSUB/AlternateSubst.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GSUB/AlternateSubstFormat1.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GSUB/ChainContextSubst.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GSUB/Common.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GSUB/ContextSubst.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GSUB/ExtensionSubst.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GSUB/GSUB.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GSUB/Ligature.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GSUB/LigatureSet.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GSUB/LigatureSubst.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GSUB/LigatureSubstFormat1.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GSUB/MultipleSubst.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GSUB/MultipleSubstFormat1.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GSUB/ReverseChainSingleSubst.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GSUB/ReverseChainSingleSubstFormat1.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GSUB/Sequence.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GSUB/SingleSubst.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GSUB/SingleSubstFormat1.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GSUB/SingleSubstFormat2.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GSUB/SubstLookup.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GSUB/SubstLookupSubTable.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/glyf/CompositeGlyph.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/glyf/Glyph.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/glyf/GlyphHeader.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/glyf/SimpleGlyph.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/glyf/SubsetGlyph.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/glyf/VarCompositeGlyph.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/glyf/composite-iter.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/glyf/coord-setter.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/glyf/glyf-helpers.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/glyf/glyf.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/glyf/loca.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/glyf/path-builder.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/harfbuzz-cairo.pc.in
+FILE: ../../../flutter/third_party/harfbuzz/src/harfbuzz-config.cmake.in
+FILE: ../../../flutter/third_party/harfbuzz/src/harfbuzz-gobject.pc.in
+FILE: ../../../flutter/third_party/harfbuzz/src/harfbuzz-icu.pc.in
+FILE: ../../../flutter/third_party/harfbuzz/src/harfbuzz-subset.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/harfbuzz-subset.pc.in
+FILE: ../../../flutter/third_party/harfbuzz/src/harfbuzz.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/harfbuzz.pc.in
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-arabic-joining-list.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-arabic-pua.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-arabic-table.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-indic-table.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-use-table.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-shaper-vowel-constraints.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-tag-table.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ucd-table.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/test-use-table.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/wasm/graphite/shape.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/wasm/rust/harfbuzz-wasm/Cargo.toml
+FILE: ../../../flutter/third_party/harfbuzz/src/wasm/sample/c/shape-fallback.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/wasm/sample/c/shape-ot.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/wasm/sample/c/test.ttf
+FILE: ../../../flutter/third_party/harfbuzz/src/wasm/sample/rust/hello-wasm/Cargo.toml
+FILE: ../../../flutter/third_party/harfbuzz/src/wasm/sample/rust/hello-wasm/src/lib.rs
+FILE: ../../../flutter/third_party/harfbuzz/subprojects/cairo.wrap
+FILE: ../../../flutter/third_party/harfbuzz/subprojects/freetype2.wrap
+FILE: ../../../flutter/third_party/harfbuzz/subprojects/glib.wrap
+FILE: ../../../flutter/third_party/harfbuzz/subprojects/google-benchmark.wrap
+FILE: ../../../flutter/third_party/harfbuzz/subprojects/ragel.wrap
+----------------------------------------------------------------------------------------------------
+HarfBuzz is licensed under the so-called "Old MIT" license.  Details follow.
+For parts of HarfBuzz that are licensed under different licenses see individual
+files names COPYING in subdirectories where applicable.
+
+Copyright © 2010-2022  Google, Inc.
+Copyright © 2015-2020  Ebrahim Byagowi
+Copyright © 2019,2020  Facebook, Inc.
+Copyright © 2012,2015  Mozilla Foundation
+Copyright © 2011  Codethink Limited
+Copyright © 2008,2010  Nokia Corporation and/or its subsidiary(-ies)
+Copyright © 2009  Keith Stribley
+Copyright © 2011  Martin Hosken and SIL International
+Copyright © 2007  Chris Wilson
+Copyright © 2005,2006,2020,2021,2022,2023  Behdad Esfahbod
+Copyright © 2004,2007,2008,2009,2010,2013,2021,2022,2023  Red Hat, Inc.
+Copyright © 1998-2005  David Turner and Werner Lemberg
+Copyright © 2016  Igalia S.L.
+Copyright © 2022  Matthias Clasen
+Copyright © 2018,2021  Khaled Hosny
+Copyright © 2018,2019,2020  Adobe, Inc
+Copyright © 2013-2015  Alexei Podtelezhnikov
+
+For full copyright notices consult the individual files in the package.
+
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: engine
+ORIGIN: ../../../flutter/runtime/test_font_data.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/runtime/test_font_data.cc
+----------------------------------------------------------------------------------------------------
+License for the Ahem font embedded below is from:
+https://www.w3.org/Style/CSS/Test/Fonts/Ahem/COPYING
+
+The Ahem font in this directory belongs to the public domain. In
+jurisdictions that do not recognize public domain ownership of these
+files, the following Creative Commons Zero declaration applies:
+
+<http://labs.creativecommons.org/licenses/zero-waive/1.0/us/legalcode>
+
+which is quoted below:
+
+  The person who has associated a work with this document (the "Work")
+  affirms that he or she (the "Affirmer") is the/an author or owner of
+  the Work. The Work may be any work of authorship, including a
+  database.
+
+  The Affirmer hereby fully, permanently and irrevocably waives and
+  relinquishes all of her or his copyright and related or neighboring
+  legal rights in the Work available under any federal or state law,
+  treaty or contract, including but not limited to moral rights,
+  publicity and privacy rights, rights protecting against unfair
+  competition and any rights protecting the extraction, dissemination
+  and reuse of data, whether such rights are present or future, vested
+  or contingent (the "Waiver"). The Affirmer makes the Waiver for the
+  benefit of the public at large and to the detriment of the Affirmer's
+  heirs or successors.
+
+  The Affirmer understands and intends that the Waiver has the effect
+  of eliminating and entirely removing from the Affirmer's control all
+  the copyright and related or neighboring legal rights previously held
+  by the Affirmer in the Work, to that extent making the Work freely
+  available to the public for any and all uses and purposes without
+  restriction of any kind, including commercial use and uses in media
+  and formats or by methods that have not yet been invented or
+  conceived. Should the Waiver for any reason be judged legally
+  ineffective in any jurisdiction, the Affirmer hereby grants a free,
+  full, permanent, irrevocable, nonexclusive and worldwide license for
+  all her or his copyright and related or neighboring legal rights in
+  the Work.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: boringssl
+ORIGIN: ../../../flutter/third_party/boringssl/src/LICENSE
+TYPE: LicenseType.openssl
+FILE: ../../../flutter/third_party/boringssl/apple-aarch64/crypto/chacha/chacha-armv8-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-aarch64/crypto/cipher_extra/chacha20_poly1305_armv8-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-aarch64/crypto/fipsmodule/aesv8-armv8-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-aarch64/crypto/fipsmodule/aesv8-gcm-armv8-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-aarch64/crypto/fipsmodule/armv8-mont-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-aarch64/crypto/fipsmodule/bn-armv8-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-aarch64/crypto/fipsmodule/ghash-neon-armv8-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-aarch64/crypto/fipsmodule/ghashv8-armv8-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-aarch64/crypto/fipsmodule/p256-armv8-asm-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-aarch64/crypto/fipsmodule/p256_beeu-armv8-asm-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-aarch64/crypto/fipsmodule/sha1-armv8-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-aarch64/crypto/fipsmodule/sha256-armv8-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-aarch64/crypto/fipsmodule/sha512-armv8-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-aarch64/crypto/fipsmodule/vpaes-armv8-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-arm/crypto/chacha/chacha-armv4-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-arm/crypto/fipsmodule/aesv8-armv7-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-arm/crypto/fipsmodule/armv4-mont-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-arm/crypto/fipsmodule/bsaes-armv7-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-arm/crypto/fipsmodule/ghash-armv4-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-arm/crypto/fipsmodule/ghashv8-armv7-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-arm/crypto/fipsmodule/sha1-armv4-large-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-arm/crypto/fipsmodule/sha256-armv4-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-arm/crypto/fipsmodule/sha512-armv4-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-arm/crypto/fipsmodule/vpaes-armv7-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-x86/crypto/chacha/chacha-x86-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-x86/crypto/fipsmodule/aesni-x86-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-x86/crypto/fipsmodule/bn-586-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-x86/crypto/fipsmodule/co-586-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-x86/crypto/fipsmodule/ghash-ssse3-x86-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-x86/crypto/fipsmodule/ghash-x86-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-x86/crypto/fipsmodule/md5-586-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-x86/crypto/fipsmodule/sha1-586-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-x86/crypto/fipsmodule/sha256-586-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-x86/crypto/fipsmodule/sha512-586-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-x86/crypto/fipsmodule/vpaes-x86-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-x86/crypto/fipsmodule/x86-mont-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-x86_64/crypto/chacha/chacha-x86_64-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-x86_64/crypto/fipsmodule/aesni-gcm-x86_64-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-x86_64/crypto/fipsmodule/aesni-x86_64-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-x86_64/crypto/fipsmodule/ghash-x86_64-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-x86_64/crypto/fipsmodule/md5-x86_64-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-x86_64/crypto/fipsmodule/p256-x86_64-asm-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-x86_64/crypto/fipsmodule/p256_beeu-x86_64-asm-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-x86_64/crypto/fipsmodule/rdrand-x86_64-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-x86_64/crypto/fipsmodule/rsaz-avx2-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-x86_64/crypto/fipsmodule/sha1-x86_64-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-x86_64/crypto/fipsmodule/sha256-x86_64-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-x86_64/crypto/fipsmodule/sha512-x86_64-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-x86_64/crypto/fipsmodule/vpaes-x86_64-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-x86_64/crypto/fipsmodule/x86_64-mont-apple.S
+FILE: ../../../flutter/third_party/boringssl/apple-x86_64/crypto/fipsmodule/x86_64-mont5-apple.S
+FILE: ../../../flutter/third_party/boringssl/linux-aarch64/crypto/chacha/chacha-armv8-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-aarch64/crypto/chacha/chacha-armv8.S
+FILE: ../../../flutter/third_party/boringssl/linux-aarch64/crypto/cipher_extra/chacha20_poly1305_armv8-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-aarch64/crypto/fipsmodule/aesv8-armv8-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-aarch64/crypto/fipsmodule/aesv8-armx64.S
+FILE: ../../../flutter/third_party/boringssl/linux-aarch64/crypto/fipsmodule/aesv8-gcm-armv8-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-aarch64/crypto/fipsmodule/armv8-mont-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-aarch64/crypto/fipsmodule/armv8-mont.S
+FILE: ../../../flutter/third_party/boringssl/linux-aarch64/crypto/fipsmodule/bn-armv8-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-aarch64/crypto/fipsmodule/ghash-neon-armv8-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-aarch64/crypto/fipsmodule/ghash-neon-armv8.S
+FILE: ../../../flutter/third_party/boringssl/linux-aarch64/crypto/fipsmodule/ghashv8-armv8-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-aarch64/crypto/fipsmodule/ghashv8-armx64.S
+FILE: ../../../flutter/third_party/boringssl/linux-aarch64/crypto/fipsmodule/p256-armv8-asm-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-aarch64/crypto/fipsmodule/p256_beeu-armv8-asm-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-aarch64/crypto/fipsmodule/sha1-armv8-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-aarch64/crypto/fipsmodule/sha1-armv8.S
+FILE: ../../../flutter/third_party/boringssl/linux-aarch64/crypto/fipsmodule/sha256-armv8-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-aarch64/crypto/fipsmodule/sha256-armv8.S
+FILE: ../../../flutter/third_party/boringssl/linux-aarch64/crypto/fipsmodule/sha512-armv8-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-aarch64/crypto/fipsmodule/sha512-armv8.S
+FILE: ../../../flutter/third_party/boringssl/linux-aarch64/crypto/fipsmodule/vpaes-armv8-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-aarch64/crypto/fipsmodule/vpaes-armv8.S
+FILE: ../../../flutter/third_party/boringssl/linux-arm/crypto/chacha/chacha-armv4-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-arm/crypto/fipsmodule/aesv8-armv7-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-arm/crypto/fipsmodule/armv4-mont-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-arm/crypto/fipsmodule/bsaes-armv7-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-arm/crypto/fipsmodule/ghash-armv4-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-arm/crypto/fipsmodule/ghashv8-armv7-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-arm/crypto/fipsmodule/sha1-armv4-large-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-arm/crypto/fipsmodule/sha256-armv4-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-arm/crypto/fipsmodule/sha512-armv4-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-arm/crypto/fipsmodule/vpaes-armv7-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-x86/crypto/chacha/chacha-x86-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-x86/crypto/fipsmodule/aesni-x86-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-x86/crypto/fipsmodule/bn-586-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-x86/crypto/fipsmodule/co-586-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-x86/crypto/fipsmodule/ghash-ssse3-x86-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-x86/crypto/fipsmodule/ghash-x86-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-x86/crypto/fipsmodule/md5-586-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-x86/crypto/fipsmodule/sha1-586-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-x86/crypto/fipsmodule/sha256-586-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-x86/crypto/fipsmodule/sha512-586-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-x86/crypto/fipsmodule/vpaes-x86-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-x86/crypto/fipsmodule/x86-mont-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-x86_64/crypto/chacha/chacha-x86_64-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-x86_64/crypto/fipsmodule/aesni-gcm-x86_64-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-x86_64/crypto/fipsmodule/aesni-x86_64-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-x86_64/crypto/fipsmodule/ghash-x86_64-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-x86_64/crypto/fipsmodule/md5-x86_64-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-x86_64/crypto/fipsmodule/p256-x86_64-asm-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-x86_64/crypto/fipsmodule/p256_beeu-x86_64-asm-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-x86_64/crypto/fipsmodule/rdrand-x86_64-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-x86_64/crypto/fipsmodule/rsaz-avx2-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-x86_64/crypto/fipsmodule/sha1-x86_64-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-x86_64/crypto/fipsmodule/sha256-x86_64-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-x86_64/crypto/fipsmodule/sha512-x86_64-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-x86_64/crypto/fipsmodule/vpaes-x86_64-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-x86_64/crypto/fipsmodule/x86_64-mont-linux.S
+FILE: ../../../flutter/third_party/boringssl/linux-x86_64/crypto/fipsmodule/x86_64-mont5-linux.S
+FILE: ../../../flutter/third_party/boringssl/src/crypto/curve25519/ed25519_tests.txt
+FILE: ../../../flutter/third_party/boringssl/src/crypto/ecdh_extra/ecdh_tests.txt
+FILE: ../../../flutter/third_party/boringssl/src/crypto/err/asn1.errordata
+FILE: ../../../flutter/third_party/boringssl/src/crypto/err/bio.errordata
+FILE: ../../../flutter/third_party/boringssl/src/crypto/err/bn.errordata
+FILE: ../../../flutter/third_party/boringssl/src/crypto/err/cipher.errordata
+FILE: ../../../flutter/third_party/boringssl/src/crypto/err/conf.errordata
+FILE: ../../../flutter/third_party/boringssl/src/crypto/err/dh.errordata
+FILE: ../../../flutter/third_party/boringssl/src/crypto/err/digest.errordata
+FILE: ../../../flutter/third_party/boringssl/src/crypto/err/dsa.errordata
+FILE: ../../../flutter/third_party/boringssl/src/crypto/err/ec.errordata
+FILE: ../../../flutter/third_party/boringssl/src/crypto/err/ecdh.errordata
+FILE: ../../../flutter/third_party/boringssl/src/crypto/err/ecdsa.errordata
+FILE: ../../../flutter/third_party/boringssl/src/crypto/err/engine.errordata
+FILE: ../../../flutter/third_party/boringssl/src/crypto/err/evp.errordata
+FILE: ../../../flutter/third_party/boringssl/src/crypto/err/hkdf.errordata
+FILE: ../../../flutter/third_party/boringssl/src/crypto/err/obj.errordata
+FILE: ../../../flutter/third_party/boringssl/src/crypto/err/pem.errordata
+FILE: ../../../flutter/third_party/boringssl/src/crypto/err/pkcs7.errordata
+FILE: ../../../flutter/third_party/boringssl/src/crypto/err/pkcs8.errordata
+FILE: ../../../flutter/third_party/boringssl/src/crypto/err/rsa.errordata
+FILE: ../../../flutter/third_party/boringssl/src/crypto/err/ssl.errordata
+FILE: ../../../flutter/third_party/boringssl/src/crypto/err/trust_token.errordata
+FILE: ../../../flutter/third_party/boringssl/src/crypto/err/x509.errordata
+FILE: ../../../flutter/third_party/boringssl/src/crypto/err/x509v3.errordata
+FILE: ../../../flutter/third_party/boringssl/src/crypto/evp/evp_tests.txt
+FILE: ../../../flutter/third_party/boringssl/src/crypto/evp/scrypt.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/evp/scrypt_tests.txt
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/aes/aes_tests.txt
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/asm/x86_64-gcc.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/rsaz_exp.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/bn/rsaz_exp.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/cmac/cavp_3des_cmac_tests.txt
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/cmac/cavp_aes128_cmac_tests.txt
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/cmac/cavp_aes192_cmac_tests.txt
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/cmac/cavp_aes256_cmac_tests.txt
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/ec_scalar_base_mult_tests.txt
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/p256-nistz-table.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/p256-nistz.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/p256-nistz.h
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ec/p256-nistz_tests.txt
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ecdsa/ecdsa_sign_tests.txt
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/ecdsa/ecdsa_verify_tests.txt
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/fips_shared.lds
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/intcheck1.png
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/intcheck2.png
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/intcheck3.png
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/modes/gcm_tests.txt
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/[Content_Types].xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/_rels/.rels
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/customXml/_rels/item1.xml.rels
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/customXml/item1.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/customXml/itemProps1.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/docProps/app.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/docProps/core.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/_rels/document.xml.rels
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/document.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/endnotes.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/fontTable.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/footer1.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/footer2.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/footer3.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/footnotes.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/header1.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/header2.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/header3.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/media/image1.png
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/media/image2.png
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/numbering.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/settings.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/styles.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/theme/theme1.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/webSettings.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20210319.docx!/[Content_Types].xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20210319.docx!/_rels/.rels
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20210319.docx!/customXml/_rels/item1.xml.rels
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20210319.docx!/customXml/item1.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20210319.docx!/customXml/itemProps1.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20210319.docx!/docProps/app.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20210319.docx!/docProps/core.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20210319.docx!/word/_rels/document.xml.rels
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20210319.docx!/word/document.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20210319.docx!/word/endnotes.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20210319.docx!/word/fontTable.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20210319.docx!/word/footer1.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20210319.docx!/word/footnotes.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20210319.docx!/word/media/image1.png
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20210319.docx!/word/media/image2.png
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20210319.docx!/word/numbering.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20210319.docx!/word/settings.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20210319.docx!/word/styles.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20210319.docx!/word/theme/theme1.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20210319.docx!/word/webSettings.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/[Content_Types].xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/_rels/.rels
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/customXml/_rels/item1.xml.rels
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/customXml/item1.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/customXml/itemProps1.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/docProps/app.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/docProps/core.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/docProps/thumbnail.emf
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/word/_rels/document.xml.rels
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/word/document.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/word/endnotes.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/word/fontTable.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/word/footer1.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/word/footnotes.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/word/media/image1.jpeg
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/word/media/image2.png
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/word/numbering.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/word/settings.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/word/styles.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/word/theme/theme1.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/word/webSettings.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/[Content_Types].xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/_rels/.rels
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/customXml/_rels/item1.xml.rels
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/customXml/item1.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/customXml/itemProps1.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/docProps/app.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/docProps/core.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/docProps/thumbnail.emf
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/_rels/document.xml.rels
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/document.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/endnotes.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/fontTable.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/footer1.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/footer2.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/footer3.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/footnotes.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/header1.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/header2.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/header3.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/media/image1.png
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/media/image2.png
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/numbering.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/settings.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/styles.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/theme/theme1.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/webSettings.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/[Content_Types].xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/_rels/.rels
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/customXml/_rels/item1.xml.rels
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/customXml/item1.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/customXml/itemProps1.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/docProps/app.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/docProps/core.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/word/_rels/document.xml.rels
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/word/document.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/word/endnotes.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/word/fontTable.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/word/footer1.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/word/footnotes.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/word/media/image1.png
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/word/media/image2.png
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/word/numbering.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/word/settings.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/word/styles.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/word/theme/theme1.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/word/webSettings.xml
+FILE: ../../../flutter/third_party/boringssl/src/crypto/fipsmodule/rand/ctrdrbg_vectors.txt
+FILE: ../../../flutter/third_party/boringssl/src/crypto/hmac_extra/hmac_tests.txt
+FILE: ../../../flutter/third_party/boringssl/src/crypto/hpke/hpke_test_vectors.txt
+FILE: ../../../flutter/third_party/boringssl/src/crypto/hpke/test-vectors.json
+FILE: ../../../flutter/third_party/boringssl/src/crypto/kyber/keccak_tests.txt
+FILE: ../../../flutter/third_party/boringssl/src/crypto/kyber/kyber_tests.txt
+FILE: ../../../flutter/third_party/boringssl/src/crypto/obj/obj_mac.num
+FILE: ../../../flutter/third_party/boringssl/src/crypto/obj/objects.txt
+FILE: ../../../flutter/third_party/boringssl/src/crypto/poly1305/poly1305_arm_asm.S
+FILE: ../../../flutter/third_party/boringssl/src/crypto/poly1305/poly1305_tests.txt
+FILE: ../../../flutter/third_party/boringssl/src/crypto/rsa_extra/rsa_print.c
+FILE: ../../../flutter/third_party/boringssl/src/crypto/siphash/siphash_tests.txt
+FILE: ../../../flutter/third_party/boringssl/src/crypto/x509v3/v3_ocsp.c
+FILE: ../../../flutter/third_party/boringssl/src/go.mod
+FILE: ../../../flutter/third_party/boringssl/src/go.sum
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/ssl.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/ssl3.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/tls1.h
+FILE: ../../../flutter/third_party/boringssl/src/include/openssl/x509.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/asn1_util.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/asn1_util.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/cert_error_id.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/cert_error_id.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/cert_error_params.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/cert_error_params.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/cert_errors.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/cert_errors.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/cert_issuer_source.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/cert_issuer_source_static.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/cert_issuer_source_static.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/cert_status_flags.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/cert_status_flags_list.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/cert_verify_proc_blocklist.inc
+FILE: ../../../flutter/third_party/boringssl/src/pki/certificate_policies.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/certificate_policies.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/common_cert_errors.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/common_cert_errors.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/crl.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/crl.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/encode_values.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/encode_values.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/extended_key_usage.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/extended_key_usage.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/fillins/file_util.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/fillins/file_util.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/fillins/fillins_base64.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/fillins/fillins_base64.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/fillins/fillins_string_util.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/fillins/fillins_string_util.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/fillins/log.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/fillins/net_errors.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/fillins/openssl_util.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/fillins/openssl_util.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/fillins/path_service.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/fillins/path_service.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/general_names.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/general_names.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/import_spec.json
+FILE: ../../../flutter/third_party/boringssl/src/pki/import_tool.go
+FILE: ../../../flutter/third_party/boringssl/src/pki/input.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/input.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/ip_util.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/ip_util.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/mock_signature_verify_cache.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/mock_signature_verify_cache.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/name_constraints.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/name_constraints.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/ocsp.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/ocsp.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/ocsp_revocation_status.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/ocsp_verify_result.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/ocsp_verify_result.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/parse_certificate.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/parse_certificate.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/parse_name.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/parse_name.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/parse_values.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/parse_values.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/parsed_certificate.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/parsed_certificate.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/parser.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/parser.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/patches/0001-Simplify-the-name-constraint-limit-to-resemble-Borin.patch
+FILE: ../../../flutter/third_party/boringssl/src/pki/path_builder.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/path_builder.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/pem.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/pem.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/revocation_util.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/revocation_util.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/signature_algorithm.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/signature_algorithm.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/signature_verify_cache.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/simple_path_builder_delegate.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/simple_path_builder_delegate.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/string_util.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/string_util.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/tag.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/tag.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/test_helpers.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/test_helpers.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/trust_store.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/trust_store.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/trust_store_collection.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/trust_store_collection.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/trust_store_in_memory.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/trust_store_in_memory.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/verify_certificate_chain.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/verify_certificate_chain.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/verify_name_match.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/verify_name_match.h
+FILE: ../../../flutter/third_party/boringssl/src/pki/verify_signed_data.cc
+FILE: ../../../flutter/third_party/boringssl/src/pki/verify_signed_data.h
+FILE: ../../../flutter/third_party/boringssl/src/ssl/bio_ssl.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/handshake.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/handshake_client.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/handshake_server.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/internal.h
+FILE: ../../../flutter/third_party/boringssl/src/ssl/s3_both.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/s3_lib.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_asn1.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_cert.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_cipher.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_lib.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_session.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_stat.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_transcript.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/ssl_x509.cc
+FILE: ../../../flutter/third_party/boringssl/src/ssl/t1_enc.cc
+FILE: ../../../flutter/third_party/boringssl/win-aarch64/crypto/chacha/chacha-armv8-win.S
+FILE: ../../../flutter/third_party/boringssl/win-aarch64/crypto/cipher_extra/chacha20_poly1305_armv8-win.S
+FILE: ../../../flutter/third_party/boringssl/win-aarch64/crypto/fipsmodule/aesv8-armv8-win.S
+FILE: ../../../flutter/third_party/boringssl/win-aarch64/crypto/fipsmodule/aesv8-gcm-armv8-win.S
+FILE: ../../../flutter/third_party/boringssl/win-aarch64/crypto/fipsmodule/armv8-mont-win.S
+FILE: ../../../flutter/third_party/boringssl/win-aarch64/crypto/fipsmodule/bn-armv8-win.S
+FILE: ../../../flutter/third_party/boringssl/win-aarch64/crypto/fipsmodule/ghash-neon-armv8-win.S
+FILE: ../../../flutter/third_party/boringssl/win-aarch64/crypto/fipsmodule/ghashv8-armv8-win.S
+FILE: ../../../flutter/third_party/boringssl/win-aarch64/crypto/fipsmodule/p256-armv8-asm-win.S
+FILE: ../../../flutter/third_party/boringssl/win-aarch64/crypto/fipsmodule/p256_beeu-armv8-asm-win.S
+FILE: ../../../flutter/third_party/boringssl/win-aarch64/crypto/fipsmodule/sha1-armv8-win.S
+FILE: ../../../flutter/third_party/boringssl/win-aarch64/crypto/fipsmodule/sha256-armv8-win.S
+FILE: ../../../flutter/third_party/boringssl/win-aarch64/crypto/fipsmodule/sha512-armv8-win.S
+FILE: ../../../flutter/third_party/boringssl/win-aarch64/crypto/fipsmodule/vpaes-armv8-win.S
+FILE: ../../../flutter/third_party/boringssl/win-x86/crypto/chacha/chacha-x86-win.asm
+FILE: ../../../flutter/third_party/boringssl/win-x86/crypto/fipsmodule/aesni-x86-win.asm
+FILE: ../../../flutter/third_party/boringssl/win-x86/crypto/fipsmodule/bn-586-win.asm
+FILE: ../../../flutter/third_party/boringssl/win-x86/crypto/fipsmodule/co-586-win.asm
+FILE: ../../../flutter/third_party/boringssl/win-x86/crypto/fipsmodule/ghash-ssse3-x86-win.asm
+FILE: ../../../flutter/third_party/boringssl/win-x86/crypto/fipsmodule/ghash-x86-win.asm
+FILE: ../../../flutter/third_party/boringssl/win-x86/crypto/fipsmodule/md5-586-win.asm
+FILE: ../../../flutter/third_party/boringssl/win-x86/crypto/fipsmodule/sha1-586-win.asm
+FILE: ../../../flutter/third_party/boringssl/win-x86/crypto/fipsmodule/sha256-586-win.asm
+FILE: ../../../flutter/third_party/boringssl/win-x86/crypto/fipsmodule/sha512-586-win.asm
+FILE: ../../../flutter/third_party/boringssl/win-x86/crypto/fipsmodule/vpaes-x86-win.asm
+FILE: ../../../flutter/third_party/boringssl/win-x86/crypto/fipsmodule/x86-mont-win.asm
+FILE: ../../../flutter/third_party/boringssl/win-x86_64/crypto/chacha/chacha-x86_64-win.asm
+FILE: ../../../flutter/third_party/boringssl/win-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64-win.asm
+FILE: ../../../flutter/third_party/boringssl/win-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64-win.asm
+FILE: ../../../flutter/third_party/boringssl/win-x86_64/crypto/fipsmodule/aesni-gcm-x86_64-win.asm
+FILE: ../../../flutter/third_party/boringssl/win-x86_64/crypto/fipsmodule/aesni-x86_64-win.asm
+FILE: ../../../flutter/third_party/boringssl/win-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64-win.asm
+FILE: ../../../flutter/third_party/boringssl/win-x86_64/crypto/fipsmodule/ghash-x86_64-win.asm
+FILE: ../../../flutter/third_party/boringssl/win-x86_64/crypto/fipsmodule/md5-x86_64-win.asm
+FILE: ../../../flutter/third_party/boringssl/win-x86_64/crypto/fipsmodule/p256-x86_64-asm-win.asm
+FILE: ../../../flutter/third_party/boringssl/win-x86_64/crypto/fipsmodule/p256_beeu-x86_64-asm-win.asm
+FILE: ../../../flutter/third_party/boringssl/win-x86_64/crypto/fipsmodule/rdrand-x86_64-win.asm
+FILE: ../../../flutter/third_party/boringssl/win-x86_64/crypto/fipsmodule/rsaz-avx2-win.asm
+FILE: ../../../flutter/third_party/boringssl/win-x86_64/crypto/fipsmodule/sha1-x86_64-win.asm
+FILE: ../../../flutter/third_party/boringssl/win-x86_64/crypto/fipsmodule/sha256-x86_64-win.asm
+FILE: ../../../flutter/third_party/boringssl/win-x86_64/crypto/fipsmodule/sha512-x86_64-win.asm
+FILE: ../../../flutter/third_party/boringssl/win-x86_64/crypto/fipsmodule/vpaes-x86_64-win.asm
+FILE: ../../../flutter/third_party/boringssl/win-x86_64/crypto/fipsmodule/x86_64-mont-win.asm
+FILE: ../../../flutter/third_party/boringssl/win-x86_64/crypto/fipsmodule/x86_64-mont5-win.asm
+----------------------------------------------------------------------------------------------------
+OpenSSL License
+---------------
+
+Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   openssl-core@openssl.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This product includes cryptographic software written by Eric Young
+(eay@cryptsoft.com).  This product includes software written by Tim
+Hudson (tjh@cryptsoft.com).
+
+Original SSLeay License
+-----------------------
+
+Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+All rights reserved.
+
+This package is an SSL implementation written
+by Eric Young (eay@cryptsoft.com).
+The implementation was written so as to conform with Netscapes SSL.
+
+This library is free for commercial and non-commercial use as long as
+the following conditions are aheared to.  The following conditions
+apply to all code found in this distribution, be it the RC4, RSA,
+lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+included with this distribution is covered by the same copyright terms
+except that the holder is Tim Hudson (tjh@cryptsoft.com).
+
+Copyright remains Eric Young's, and as such any Copyright notices in
+the code are not to be removed.
+If this package is used in a product, Eric Young should be given attribution
+as the author of the parts of the library used.
+This can be in the form of a textual message at program startup or
+in documentation (online or textual) provided with the package.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. All advertising materials mentioning features or use of this software
+   must display the following acknowledgement:
+   "This product includes cryptographic software written by
+    Eric Young (eay@cryptsoft.com)"
+   The word 'cryptographic' can be left out if the rouines from the library
+   being used are not cryptographic related :-).
+4. If you include any Windows specific code (or a derivative thereof) from
+   the apps directory (application code) you must include an acknowledgement:
+   "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+
+THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+The licence and distribution terms for any publically available version or
+derivative of this code cannot be changed.  i.e. this code cannot simply be
+copied and put under another distribution licence
+[including the GNU Public Licence.]
+
+ISC license used for completely new code in BoringSSL:
+
+Copyright (c) 2015, Google Inc.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+The code in third_party/fiat carries the MIT license:
+
+Copyright (c) 2015-2016 the fiat-crypto authors (see
+https://github.com/mit-plv/fiat-crypto/blob/master/AUTHORS).
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Licenses for support code
+-------------------------
+
+Parts of the TLS test suite are under the Go license. This code is not included
+in BoringSSL (i.e. libcrypto and libssl) when compiled, however, so
+distributing code linked against BoringSSL does not trigger this license:
+
+Copyright (c) 2009 The Go Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -3463,23 +54450,12 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
 
-====================================================================================================
-LIBRARY: accessibility
-ORIGIN: ../../../third_party/icu/scripts/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../flutter/third_party/accessibility/ax/ax_tree_data.cc
-FILE: ../../../flutter/third_party/accessibility/ax/ax_tree_data.h
-FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_mac_unittest.h
-FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_mac_unittest.mm
-FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_win.cc
-FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_win.h
-FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_win_unittest.cc
-FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_unique_id_unittest.cc
-FILE: ../../../flutter/third_party/accessibility/ax/platform/test_ax_node_wrapper.cc
-FILE: ../../../flutter/third_party/accessibility/ax/platform/test_ax_node_wrapper.h
-----------------------------------------------------------------------------------------------------
+BoringSSL uses the Chromium test infrastructure to run a continuous build,
+trybots etc. The scripts which manage this, and the script for generating build
+metadata, are under the Chromium license. Distributing code linked against
+BoringSSL does not trigger this license.
+
 Copyright 2015 The Chromium Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -3510,255 +54486,1183 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ====================================================================================================
 
 ====================================================================================================
-LIBRARY: accessibility
-ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_action_data.cc + ../../../LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../flutter/third_party/accessibility/ax/ax_action_data.cc
-FILE: ../../../flutter/third_party/accessibility/ax/ax_action_data.h
-FILE: ../../../flutter/third_party/accessibility/ax/ax_node_position.cc
-FILE: ../../../flutter/third_party/accessibility/ax/ax_node_position.h
-FILE: ../../../flutter/third_party/accessibility/ax/ax_node_position_unittest.cc
-FILE: ../../../flutter/third_party/accessibility/ax/ax_position.h
-FILE: ../../../flutter/third_party/accessibility/ax/ax_range.h
-FILE: ../../../flutter/third_party/accessibility/ax/ax_relative_bounds.cc
-FILE: ../../../flutter/third_party/accessibility/ax/ax_relative_bounds.h
-FILE: ../../../flutter/third_party/accessibility/gfx/range/gfx_range_export.h
+LIBRARY: freetype2
+ORIGIN: ../../../flutter/third_party/freetype2/docs/FTL.TXT
+TYPE: LicenseType.freetype
+FILE: ../../../flutter/third_party/freetype2/devel/ft2build.h
+FILE: ../../../flutter/third_party/freetype2/devel/ftoption.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype-flutter-config/freetype/config/public-macros.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype-flutter-config/ftmodule.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype-flutter-config/ftoption.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/config/ftconfig.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/config/ftheader.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/config/ftmodule.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/config/ftoption.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/config/ftstdlib.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/config/integer-types.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/config/mac-support.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/config/public-macros.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/freetype.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftadvanc.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftbbox.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftbdf.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftbitmap.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftbzip2.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftcache.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftchapters.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftcid.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftcolor.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftdriver.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/fterrdef.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/fterrors.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftfntfmt.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftgasp.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftglyph.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftgxval.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftgzip.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftimage.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftincrem.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftlcdfil.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftlist.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftlogging.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftlzw.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftmac.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftmm.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftmodapi.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftmoderr.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftotval.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftoutln.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftparams.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftpfr.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftrender.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftsizes.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftsnames.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftstroke.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftsynth.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftsystem.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/fttrigon.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/fttypes.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ftwinfnt.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/autohint.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/cffotypes.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/cfftypes.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/compiler-macros.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/ftcalc.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/ftdebug.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/ftdrv.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/ftgloadr.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/ftmemory.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/ftobjs.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/ftpsprop.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/ftrfork.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/ftserv.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/ftstream.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/fttrace.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/ftvalid.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/psaux.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/pshints.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/services/svbdf.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/services/svcfftl.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/services/svcid.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/services/svfntfmt.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/services/svgldict.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/services/svgxval.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/services/svkern.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/services/svmetric.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/services/svmm.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/services/svotval.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/services/svpfr.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/services/svpostnm.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/services/svprop.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/services/svpscmap.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/services/svpsinfo.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/services/svsfnt.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/services/svttcmap.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/services/svtteng.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/services/svttglyf.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/services/svwinfnt.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/sfnt.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/svginterface.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/t1types.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/tttypes.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/internal/wofftypes.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/otsvg.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/t1tables.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/ttnameid.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/tttables.h
+FILE: ../../../flutter/third_party/freetype2/include/freetype/tttags.h
+FILE: ../../../flutter/third_party/freetype2/include/ft2build.h
+FILE: ../../../flutter/third_party/freetype2/meson_options.txt
+FILE: ../../../flutter/third_party/freetype2/modules.cfg
+FILE: ../../../flutter/third_party/freetype2/src/autofit/afblue.c
+FILE: ../../../flutter/third_party/freetype2/src/autofit/afblue.cin
+FILE: ../../../flutter/third_party/freetype2/src/autofit/afblue.dat
+FILE: ../../../flutter/third_party/freetype2/src/autofit/afblue.h
+FILE: ../../../flutter/third_party/freetype2/src/autofit/afblue.hin
+FILE: ../../../flutter/third_party/freetype2/src/autofit/afcjk.c
+FILE: ../../../flutter/third_party/freetype2/src/autofit/afcjk.h
+FILE: ../../../flutter/third_party/freetype2/src/autofit/afcover.h
+FILE: ../../../flutter/third_party/freetype2/src/autofit/afdummy.c
+FILE: ../../../flutter/third_party/freetype2/src/autofit/afdummy.h
+FILE: ../../../flutter/third_party/freetype2/src/autofit/aferrors.h
+FILE: ../../../flutter/third_party/freetype2/src/autofit/afglobal.c
+FILE: ../../../flutter/third_party/freetype2/src/autofit/afglobal.h
+FILE: ../../../flutter/third_party/freetype2/src/autofit/afhints.c
+FILE: ../../../flutter/third_party/freetype2/src/autofit/afhints.h
+FILE: ../../../flutter/third_party/freetype2/src/autofit/afindic.c
+FILE: ../../../flutter/third_party/freetype2/src/autofit/afindic.h
+FILE: ../../../flutter/third_party/freetype2/src/autofit/aflatin.c
+FILE: ../../../flutter/third_party/freetype2/src/autofit/aflatin.h
+FILE: ../../../flutter/third_party/freetype2/src/autofit/afloader.c
+FILE: ../../../flutter/third_party/freetype2/src/autofit/afloader.h
+FILE: ../../../flutter/third_party/freetype2/src/autofit/afmodule.c
+FILE: ../../../flutter/third_party/freetype2/src/autofit/afmodule.h
+FILE: ../../../flutter/third_party/freetype2/src/autofit/afranges.c
+FILE: ../../../flutter/third_party/freetype2/src/autofit/afranges.h
+FILE: ../../../flutter/third_party/freetype2/src/autofit/afscript.h
+FILE: ../../../flutter/third_party/freetype2/src/autofit/afshaper.c
+FILE: ../../../flutter/third_party/freetype2/src/autofit/afshaper.h
+FILE: ../../../flutter/third_party/freetype2/src/autofit/afstyles.h
+FILE: ../../../flutter/third_party/freetype2/src/autofit/aftypes.h
+FILE: ../../../flutter/third_party/freetype2/src/autofit/afws-decl.h
+FILE: ../../../flutter/third_party/freetype2/src/autofit/afws-iter.h
+FILE: ../../../flutter/third_party/freetype2/src/autofit/autofit.c
+FILE: ../../../flutter/third_party/freetype2/src/base/ftadvanc.c
+FILE: ../../../flutter/third_party/freetype2/src/base/ftbase.c
+FILE: ../../../flutter/third_party/freetype2/src/base/ftbase.h
+FILE: ../../../flutter/third_party/freetype2/src/base/ftbbox.c
+FILE: ../../../flutter/third_party/freetype2/src/base/ftbdf.c
+FILE: ../../../flutter/third_party/freetype2/src/base/ftbitmap.c
+FILE: ../../../flutter/third_party/freetype2/src/base/ftcalc.c
+FILE: ../../../flutter/third_party/freetype2/src/base/ftcid.c
+FILE: ../../../flutter/third_party/freetype2/src/base/ftcolor.c
+FILE: ../../../flutter/third_party/freetype2/src/base/ftdbgmem.c
+FILE: ../../../flutter/third_party/freetype2/src/base/ftdebug.c
+FILE: ../../../flutter/third_party/freetype2/src/base/fterrors.c
+FILE: ../../../flutter/third_party/freetype2/src/base/ftfntfmt.c
+FILE: ../../../flutter/third_party/freetype2/src/base/ftfstype.c
+FILE: ../../../flutter/third_party/freetype2/src/base/ftgasp.c
+FILE: ../../../flutter/third_party/freetype2/src/base/ftgloadr.c
+FILE: ../../../flutter/third_party/freetype2/src/base/ftglyph.c
+FILE: ../../../flutter/third_party/freetype2/src/base/ftgxval.c
+FILE: ../../../flutter/third_party/freetype2/src/base/ftinit.c
+FILE: ../../../flutter/third_party/freetype2/src/base/ftlcdfil.c
+FILE: ../../../flutter/third_party/freetype2/src/base/ftmac.c
+FILE: ../../../flutter/third_party/freetype2/src/base/ftmm.c
+FILE: ../../../flutter/third_party/freetype2/src/base/ftobjs.c
+FILE: ../../../flutter/third_party/freetype2/src/base/ftotval.c
+FILE: ../../../flutter/third_party/freetype2/src/base/ftoutln.c
+FILE: ../../../flutter/third_party/freetype2/src/base/ftpatent.c
+FILE: ../../../flutter/third_party/freetype2/src/base/ftpfr.c
+FILE: ../../../flutter/third_party/freetype2/src/base/ftpsprop.c
+FILE: ../../../flutter/third_party/freetype2/src/base/ftrfork.c
+FILE: ../../../flutter/third_party/freetype2/src/base/ftsnames.c
+FILE: ../../../flutter/third_party/freetype2/src/base/ftstream.c
+FILE: ../../../flutter/third_party/freetype2/src/base/ftstroke.c
+FILE: ../../../flutter/third_party/freetype2/src/base/ftsynth.c
+FILE: ../../../flutter/third_party/freetype2/src/base/ftsystem.c
+FILE: ../../../flutter/third_party/freetype2/src/base/fttrigon.c
+FILE: ../../../flutter/third_party/freetype2/src/base/fttype1.c
+FILE: ../../../flutter/third_party/freetype2/src/base/ftutil.c
+FILE: ../../../flutter/third_party/freetype2/src/base/ftver.rc
+FILE: ../../../flutter/third_party/freetype2/src/base/ftwinfnt.c
+FILE: ../../../flutter/third_party/freetype2/src/bzip2/ftbzip2.c
+FILE: ../../../flutter/third_party/freetype2/src/cache/ftcache.c
+FILE: ../../../flutter/third_party/freetype2/src/cache/ftcbasic.c
+FILE: ../../../flutter/third_party/freetype2/src/cache/ftccache.c
+FILE: ../../../flutter/third_party/freetype2/src/cache/ftccache.h
+FILE: ../../../flutter/third_party/freetype2/src/cache/ftccback.h
+FILE: ../../../flutter/third_party/freetype2/src/cache/ftccmap.c
+FILE: ../../../flutter/third_party/freetype2/src/cache/ftcerror.h
+FILE: ../../../flutter/third_party/freetype2/src/cache/ftcglyph.c
+FILE: ../../../flutter/third_party/freetype2/src/cache/ftcglyph.h
+FILE: ../../../flutter/third_party/freetype2/src/cache/ftcimage.c
+FILE: ../../../flutter/third_party/freetype2/src/cache/ftcimage.h
+FILE: ../../../flutter/third_party/freetype2/src/cache/ftcmanag.c
+FILE: ../../../flutter/third_party/freetype2/src/cache/ftcmanag.h
+FILE: ../../../flutter/third_party/freetype2/src/cache/ftcmru.c
+FILE: ../../../flutter/third_party/freetype2/src/cache/ftcmru.h
+FILE: ../../../flutter/third_party/freetype2/src/cache/ftcsbits.c
+FILE: ../../../flutter/third_party/freetype2/src/cache/ftcsbits.h
+FILE: ../../../flutter/third_party/freetype2/src/cff/cff.c
+FILE: ../../../flutter/third_party/freetype2/src/cff/cffcmap.c
+FILE: ../../../flutter/third_party/freetype2/src/cff/cffcmap.h
+FILE: ../../../flutter/third_party/freetype2/src/cff/cffdrivr.c
+FILE: ../../../flutter/third_party/freetype2/src/cff/cffdrivr.h
+FILE: ../../../flutter/third_party/freetype2/src/cff/cfferrs.h
+FILE: ../../../flutter/third_party/freetype2/src/cff/cffgload.c
+FILE: ../../../flutter/third_party/freetype2/src/cff/cffgload.h
+FILE: ../../../flutter/third_party/freetype2/src/cff/cffload.c
+FILE: ../../../flutter/third_party/freetype2/src/cff/cffload.h
+FILE: ../../../flutter/third_party/freetype2/src/cff/cffobjs.c
+FILE: ../../../flutter/third_party/freetype2/src/cff/cffobjs.h
+FILE: ../../../flutter/third_party/freetype2/src/cff/cffparse.c
+FILE: ../../../flutter/third_party/freetype2/src/cff/cffparse.h
+FILE: ../../../flutter/third_party/freetype2/src/cff/cfftoken.h
+FILE: ../../../flutter/third_party/freetype2/src/cid/ciderrs.h
+FILE: ../../../flutter/third_party/freetype2/src/cid/cidgload.c
+FILE: ../../../flutter/third_party/freetype2/src/cid/cidgload.h
+FILE: ../../../flutter/third_party/freetype2/src/cid/cidload.c
+FILE: ../../../flutter/third_party/freetype2/src/cid/cidload.h
+FILE: ../../../flutter/third_party/freetype2/src/cid/cidobjs.c
+FILE: ../../../flutter/third_party/freetype2/src/cid/cidobjs.h
+FILE: ../../../flutter/third_party/freetype2/src/cid/cidparse.c
+FILE: ../../../flutter/third_party/freetype2/src/cid/cidparse.h
+FILE: ../../../flutter/third_party/freetype2/src/cid/cidriver.c
+FILE: ../../../flutter/third_party/freetype2/src/cid/cidriver.h
+FILE: ../../../flutter/third_party/freetype2/src/cid/cidtoken.h
+FILE: ../../../flutter/third_party/freetype2/src/cid/type1cid.c
+FILE: ../../../flutter/third_party/freetype2/src/dlg/dlgwrap.c
+FILE: ../../../flutter/third_party/freetype2/src/gxvalid/gxvalid.c
+FILE: ../../../flutter/third_party/freetype2/src/gxvalid/gxvalid.h
+FILE: ../../../flutter/third_party/freetype2/src/gxvalid/gxvbsln.c
+FILE: ../../../flutter/third_party/freetype2/src/gxvalid/gxvcommn.c
+FILE: ../../../flutter/third_party/freetype2/src/gxvalid/gxvcommn.h
+FILE: ../../../flutter/third_party/freetype2/src/gxvalid/gxverror.h
+FILE: ../../../flutter/third_party/freetype2/src/gxvalid/gxvfeat.c
+FILE: ../../../flutter/third_party/freetype2/src/gxvalid/gxvfeat.h
+FILE: ../../../flutter/third_party/freetype2/src/gxvalid/gxvfgen.c
+FILE: ../../../flutter/third_party/freetype2/src/gxvalid/gxvjust.c
+FILE: ../../../flutter/third_party/freetype2/src/gxvalid/gxvkern.c
+FILE: ../../../flutter/third_party/freetype2/src/gxvalid/gxvlcar.c
+FILE: ../../../flutter/third_party/freetype2/src/gxvalid/gxvmod.c
+FILE: ../../../flutter/third_party/freetype2/src/gxvalid/gxvmod.h
+FILE: ../../../flutter/third_party/freetype2/src/gxvalid/gxvmort.c
+FILE: ../../../flutter/third_party/freetype2/src/gxvalid/gxvmort.h
+FILE: ../../../flutter/third_party/freetype2/src/gxvalid/gxvmort0.c
+FILE: ../../../flutter/third_party/freetype2/src/gxvalid/gxvmort1.c
+FILE: ../../../flutter/third_party/freetype2/src/gxvalid/gxvmort2.c
+FILE: ../../../flutter/third_party/freetype2/src/gxvalid/gxvmort4.c
+FILE: ../../../flutter/third_party/freetype2/src/gxvalid/gxvmort5.c
+FILE: ../../../flutter/third_party/freetype2/src/gxvalid/gxvmorx.c
+FILE: ../../../flutter/third_party/freetype2/src/gxvalid/gxvmorx.h
+FILE: ../../../flutter/third_party/freetype2/src/gxvalid/gxvmorx0.c
+FILE: ../../../flutter/third_party/freetype2/src/gxvalid/gxvmorx1.c
+FILE: ../../../flutter/third_party/freetype2/src/gxvalid/gxvmorx2.c
+FILE: ../../../flutter/third_party/freetype2/src/gxvalid/gxvmorx4.c
+FILE: ../../../flutter/third_party/freetype2/src/gxvalid/gxvmorx5.c
+FILE: ../../../flutter/third_party/freetype2/src/gxvalid/gxvopbd.c
+FILE: ../../../flutter/third_party/freetype2/src/gxvalid/gxvprop.c
+FILE: ../../../flutter/third_party/freetype2/src/gxvalid/gxvtrak.c
+FILE: ../../../flutter/third_party/freetype2/src/gzip/ftgzip.c
+FILE: ../../../flutter/third_party/freetype2/src/lzw/ftlzw.c
+FILE: ../../../flutter/third_party/freetype2/src/lzw/ftzopen.c
+FILE: ../../../flutter/third_party/freetype2/src/lzw/ftzopen.h
+FILE: ../../../flutter/third_party/freetype2/src/otvalid/otvalid.c
+FILE: ../../../flutter/third_party/freetype2/src/otvalid/otvalid.h
+FILE: ../../../flutter/third_party/freetype2/src/otvalid/otvbase.c
+FILE: ../../../flutter/third_party/freetype2/src/otvalid/otvcommn.c
+FILE: ../../../flutter/third_party/freetype2/src/otvalid/otvcommn.h
+FILE: ../../../flutter/third_party/freetype2/src/otvalid/otverror.h
+FILE: ../../../flutter/third_party/freetype2/src/otvalid/otvgdef.c
+FILE: ../../../flutter/third_party/freetype2/src/otvalid/otvgpos.c
+FILE: ../../../flutter/third_party/freetype2/src/otvalid/otvgpos.h
+FILE: ../../../flutter/third_party/freetype2/src/otvalid/otvgsub.c
+FILE: ../../../flutter/third_party/freetype2/src/otvalid/otvjstf.c
+FILE: ../../../flutter/third_party/freetype2/src/otvalid/otvmath.c
+FILE: ../../../flutter/third_party/freetype2/src/otvalid/otvmod.c
+FILE: ../../../flutter/third_party/freetype2/src/otvalid/otvmod.h
+FILE: ../../../flutter/third_party/freetype2/src/pcf/pcferror.h
+FILE: ../../../flutter/third_party/freetype2/src/pfr/pfr.c
+FILE: ../../../flutter/third_party/freetype2/src/pfr/pfrcmap.c
+FILE: ../../../flutter/third_party/freetype2/src/pfr/pfrcmap.h
+FILE: ../../../flutter/third_party/freetype2/src/pfr/pfrdrivr.c
+FILE: ../../../flutter/third_party/freetype2/src/pfr/pfrdrivr.h
+FILE: ../../../flutter/third_party/freetype2/src/pfr/pfrerror.h
+FILE: ../../../flutter/third_party/freetype2/src/pfr/pfrgload.c
+FILE: ../../../flutter/third_party/freetype2/src/pfr/pfrgload.h
+FILE: ../../../flutter/third_party/freetype2/src/pfr/pfrload.c
+FILE: ../../../flutter/third_party/freetype2/src/pfr/pfrload.h
+FILE: ../../../flutter/third_party/freetype2/src/pfr/pfrobjs.c
+FILE: ../../../flutter/third_party/freetype2/src/pfr/pfrobjs.h
+FILE: ../../../flutter/third_party/freetype2/src/pfr/pfrsbit.c
+FILE: ../../../flutter/third_party/freetype2/src/pfr/pfrsbit.h
+FILE: ../../../flutter/third_party/freetype2/src/pfr/pfrtypes.h
+FILE: ../../../flutter/third_party/freetype2/src/psaux/afmparse.c
+FILE: ../../../flutter/third_party/freetype2/src/psaux/afmparse.h
+FILE: ../../../flutter/third_party/freetype2/src/psaux/cffdecode.c
+FILE: ../../../flutter/third_party/freetype2/src/psaux/cffdecode.h
+FILE: ../../../flutter/third_party/freetype2/src/psaux/psarrst.c
+FILE: ../../../flutter/third_party/freetype2/src/psaux/psarrst.h
+FILE: ../../../flutter/third_party/freetype2/src/psaux/psaux.c
+FILE: ../../../flutter/third_party/freetype2/src/psaux/psauxerr.h
+FILE: ../../../flutter/third_party/freetype2/src/psaux/psauxmod.c
+FILE: ../../../flutter/third_party/freetype2/src/psaux/psauxmod.h
+FILE: ../../../flutter/third_party/freetype2/src/psaux/psblues.c
+FILE: ../../../flutter/third_party/freetype2/src/psaux/psblues.h
+FILE: ../../../flutter/third_party/freetype2/src/psaux/psconv.c
+FILE: ../../../flutter/third_party/freetype2/src/psaux/psconv.h
+FILE: ../../../flutter/third_party/freetype2/src/psaux/pserror.c
+FILE: ../../../flutter/third_party/freetype2/src/psaux/pserror.h
+FILE: ../../../flutter/third_party/freetype2/src/psaux/psfixed.h
+FILE: ../../../flutter/third_party/freetype2/src/psaux/psfont.c
+FILE: ../../../flutter/third_party/freetype2/src/psaux/psfont.h
+FILE: ../../../flutter/third_party/freetype2/src/psaux/psft.c
+FILE: ../../../flutter/third_party/freetype2/src/psaux/psft.h
+FILE: ../../../flutter/third_party/freetype2/src/psaux/psglue.h
+FILE: ../../../flutter/third_party/freetype2/src/psaux/pshints.c
+FILE: ../../../flutter/third_party/freetype2/src/psaux/pshints.h
+FILE: ../../../flutter/third_party/freetype2/src/psaux/psintrp.c
+FILE: ../../../flutter/third_party/freetype2/src/psaux/psintrp.h
+FILE: ../../../flutter/third_party/freetype2/src/psaux/psobjs.c
+FILE: ../../../flutter/third_party/freetype2/src/psaux/psobjs.h
+FILE: ../../../flutter/third_party/freetype2/src/psaux/psread.c
+FILE: ../../../flutter/third_party/freetype2/src/psaux/psread.h
+FILE: ../../../flutter/third_party/freetype2/src/psaux/psstack.c
+FILE: ../../../flutter/third_party/freetype2/src/psaux/psstack.h
+FILE: ../../../flutter/third_party/freetype2/src/psaux/pstypes.h
+FILE: ../../../flutter/third_party/freetype2/src/psaux/t1cmap.c
+FILE: ../../../flutter/third_party/freetype2/src/psaux/t1cmap.h
+FILE: ../../../flutter/third_party/freetype2/src/psaux/t1decode.c
+FILE: ../../../flutter/third_party/freetype2/src/psaux/t1decode.h
+FILE: ../../../flutter/third_party/freetype2/src/pshinter/pshalgo.c
+FILE: ../../../flutter/third_party/freetype2/src/pshinter/pshalgo.h
+FILE: ../../../flutter/third_party/freetype2/src/pshinter/pshglob.c
+FILE: ../../../flutter/third_party/freetype2/src/pshinter/pshglob.h
+FILE: ../../../flutter/third_party/freetype2/src/pshinter/pshinter.c
+FILE: ../../../flutter/third_party/freetype2/src/pshinter/pshmod.c
+FILE: ../../../flutter/third_party/freetype2/src/pshinter/pshmod.h
+FILE: ../../../flutter/third_party/freetype2/src/pshinter/pshnterr.h
+FILE: ../../../flutter/third_party/freetype2/src/pshinter/pshrec.c
+FILE: ../../../flutter/third_party/freetype2/src/pshinter/pshrec.h
+FILE: ../../../flutter/third_party/freetype2/src/psnames/psmodule.c
+FILE: ../../../flutter/third_party/freetype2/src/psnames/psmodule.h
+FILE: ../../../flutter/third_party/freetype2/src/psnames/psnamerr.h
+FILE: ../../../flutter/third_party/freetype2/src/psnames/psnames.c
+FILE: ../../../flutter/third_party/freetype2/src/psnames/pstables.h
+FILE: ../../../flutter/third_party/freetype2/src/raster/ftmisc.h
+FILE: ../../../flutter/third_party/freetype2/src/raster/ftraster.c
+FILE: ../../../flutter/third_party/freetype2/src/raster/ftraster.h
+FILE: ../../../flutter/third_party/freetype2/src/raster/ftrend1.c
+FILE: ../../../flutter/third_party/freetype2/src/raster/ftrend1.h
+FILE: ../../../flutter/third_party/freetype2/src/raster/raster.c
+FILE: ../../../flutter/third_party/freetype2/src/raster/rasterrs.h
+FILE: ../../../flutter/third_party/freetype2/src/sdf/ftbsdf.c
+FILE: ../../../flutter/third_party/freetype2/src/sdf/ftsdf.c
+FILE: ../../../flutter/third_party/freetype2/src/sdf/ftsdf.h
+FILE: ../../../flutter/third_party/freetype2/src/sdf/ftsdfcommon.c
+FILE: ../../../flutter/third_party/freetype2/src/sdf/ftsdfcommon.h
+FILE: ../../../flutter/third_party/freetype2/src/sdf/ftsdferrs.h
+FILE: ../../../flutter/third_party/freetype2/src/sdf/ftsdfrend.c
+FILE: ../../../flutter/third_party/freetype2/src/sdf/ftsdfrend.h
+FILE: ../../../flutter/third_party/freetype2/src/sdf/sdf.c
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/pngshim.c
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/pngshim.h
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/sfdriver.c
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/sfdriver.h
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/sferrors.h
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/sfnt.c
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/sfobjs.c
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/sfobjs.h
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/sfwoff.c
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/sfwoff.h
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/sfwoff2.c
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/sfwoff2.h
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/ttbdf.c
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/ttbdf.h
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/ttcmap.c
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/ttcmap.h
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/ttcmapc.h
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/ttcolr.c
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/ttcolr.h
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/ttcpal.c
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/ttcpal.h
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/ttkern.c
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/ttkern.h
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/ttload.c
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/ttload.h
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/ttmtx.c
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/ttmtx.h
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/ttpost.c
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/ttpost.h
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/ttsbit.c
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/ttsbit.h
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/ttsvg.c
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/ttsvg.h
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/woff2tags.c
+FILE: ../../../flutter/third_party/freetype2/src/sfnt/woff2tags.h
+FILE: ../../../flutter/third_party/freetype2/src/smooth/ftgrays.c
+FILE: ../../../flutter/third_party/freetype2/src/smooth/ftgrays.h
+FILE: ../../../flutter/third_party/freetype2/src/smooth/ftsmerrs.h
+FILE: ../../../flutter/third_party/freetype2/src/smooth/ftsmooth.c
+FILE: ../../../flutter/third_party/freetype2/src/smooth/ftsmooth.h
+FILE: ../../../flutter/third_party/freetype2/src/smooth/smooth.c
+FILE: ../../../flutter/third_party/freetype2/src/svg/ftsvg.c
+FILE: ../../../flutter/third_party/freetype2/src/svg/ftsvg.h
+FILE: ../../../flutter/third_party/freetype2/src/svg/svg.c
+FILE: ../../../flutter/third_party/freetype2/src/svg/svgtypes.h
+FILE: ../../../flutter/third_party/freetype2/src/truetype/truetype.c
+FILE: ../../../flutter/third_party/freetype2/src/truetype/ttdriver.c
+FILE: ../../../flutter/third_party/freetype2/src/truetype/ttdriver.h
+FILE: ../../../flutter/third_party/freetype2/src/truetype/tterrors.h
+FILE: ../../../flutter/third_party/freetype2/src/truetype/ttgload.c
+FILE: ../../../flutter/third_party/freetype2/src/truetype/ttgload.h
+FILE: ../../../flutter/third_party/freetype2/src/truetype/ttgxvar.c
+FILE: ../../../flutter/third_party/freetype2/src/truetype/ttgxvar.h
+FILE: ../../../flutter/third_party/freetype2/src/truetype/ttinterp.c
+FILE: ../../../flutter/third_party/freetype2/src/truetype/ttinterp.h
+FILE: ../../../flutter/third_party/freetype2/src/truetype/ttobjs.c
+FILE: ../../../flutter/third_party/freetype2/src/truetype/ttobjs.h
+FILE: ../../../flutter/third_party/freetype2/src/truetype/ttpload.c
+FILE: ../../../flutter/third_party/freetype2/src/truetype/ttpload.h
+FILE: ../../../flutter/third_party/freetype2/src/truetype/ttsubpix.c
+FILE: ../../../flutter/third_party/freetype2/src/truetype/ttsubpix.h
+FILE: ../../../flutter/third_party/freetype2/src/type1/t1afm.c
+FILE: ../../../flutter/third_party/freetype2/src/type1/t1afm.h
+FILE: ../../../flutter/third_party/freetype2/src/type1/t1driver.c
+FILE: ../../../flutter/third_party/freetype2/src/type1/t1driver.h
+FILE: ../../../flutter/third_party/freetype2/src/type1/t1errors.h
+FILE: ../../../flutter/third_party/freetype2/src/type1/t1gload.c
+FILE: ../../../flutter/third_party/freetype2/src/type1/t1gload.h
+FILE: ../../../flutter/third_party/freetype2/src/type1/t1load.c
+FILE: ../../../flutter/third_party/freetype2/src/type1/t1load.h
+FILE: ../../../flutter/third_party/freetype2/src/type1/t1objs.c
+FILE: ../../../flutter/third_party/freetype2/src/type1/t1objs.h
+FILE: ../../../flutter/third_party/freetype2/src/type1/t1parse.c
+FILE: ../../../flutter/third_party/freetype2/src/type1/t1parse.h
+FILE: ../../../flutter/third_party/freetype2/src/type1/t1tokens.h
+FILE: ../../../flutter/third_party/freetype2/src/type1/type1.c
+FILE: ../../../flutter/third_party/freetype2/src/type42/t42drivr.c
+FILE: ../../../flutter/third_party/freetype2/src/type42/t42drivr.h
+FILE: ../../../flutter/third_party/freetype2/src/type42/t42error.h
+FILE: ../../../flutter/third_party/freetype2/src/type42/t42objs.c
+FILE: ../../../flutter/third_party/freetype2/src/type42/t42objs.h
+FILE: ../../../flutter/third_party/freetype2/src/type42/t42parse.c
+FILE: ../../../flutter/third_party/freetype2/src/type42/t42parse.h
+FILE: ../../../flutter/third_party/freetype2/src/type42/t42types.h
+FILE: ../../../flutter/third_party/freetype2/src/type42/type42.c
+FILE: ../../../flutter/third_party/freetype2/src/winfonts/fnterrs.h
+FILE: ../../../flutter/third_party/freetype2/src/winfonts/winfnt.c
+FILE: ../../../flutter/third_party/freetype2/src/winfonts/winfnt.h
+FILE: ../../../flutter/third_party/freetype2/subprojects/libpng.wrap
+FILE: ../../../flutter/third_party/freetype2/subprojects/zlib.wrap
 ----------------------------------------------------------------------------------------------------
-Copyright 2016 The Chromium Authors. All rights reserved.
+The FreeType Project LICENSE
+----------------------------
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+                            2006-Jan-27
 
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+                    Copyright 1996-2002, 2006 by
+          David Turner, Robert Wilhelm, and Werner Lemberg
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Introduction
+============
+
+  The FreeType  Project is distributed in  several archive packages;
+  some of them may contain, in addition to the FreeType font engine,
+  various tools and  contributions which rely on, or  relate to, the
+  FreeType Project.
+
+  This  license applies  to all  files found  in such  packages, and
+  which do not  fall under their own explicit  license.  The license
+  affects  thus  the  FreeType   font  engine,  the  test  programs,
+  documentation and makefiles, at the very least.
+
+  This  license   was  inspired  by  the  BSD,   Artistic,  and  IJG
+  (Independent JPEG  Group) licenses, which  all encourage inclusion
+  and  use of  free  software in  commercial  and freeware  products
+  alike.  As a consequence, its main points are that:
+
+    o We don't promise that this software works. However, we will be
+      interested in any kind of bug reports. (`as is' distribution)
+
+    o You can  use this software for whatever you  want, in parts or
+      full form, without having to pay us. (`royalty-free' usage)
+
+    o You may not pretend that  you wrote this software.  If you use
+      it, or  only parts of it,  in a program,  you must acknowledge
+      somewhere  in  your  documentation  that  you  have  used  the
+      FreeType code. (`credits')
+
+  We  specifically  permit  and  encourage  the  inclusion  of  this
+  software, with  or without modifications,  in commercial products.
+  We  disclaim  all warranties  covering  The  FreeType Project  and
+  assume no liability related to The FreeType Project.
+
+
+  Finally,  many  people  asked  us  for  a  preferred  form  for  a
+  credit/disclaimer to use in compliance with this license.  We thus
+  encourage you to use the following text:
+
+   """
+    Portions of this software are copyright © <year> The FreeType
+    Project (www.freetype.org).  All rights reserved.
+   """
+
+  Please replace <year> with the value from the FreeType version you
+  actually use.
+
+
+Legal Terms
+===========
+
+0. Definitions
+--------------
+
+  Throughout this license,  the terms `package', `FreeType Project',
+  and  `FreeType  archive' refer  to  the  set  of files  originally
+  distributed  by the  authors  (David Turner,  Robert Wilhelm,  and
+  Werner Lemberg) as the `FreeType Project', be they named as alpha,
+  beta or final release.
+
+  `You' refers to  the licensee, or person using  the project, where
+  `using' is a generic term including compiling the project's source
+  code as  well as linking it  to form a  `program' or `executable'.
+  This  program is  referred to  as  `a program  using the  FreeType
+  engine'.
+
+  This  license applies  to all  files distributed  in  the original
+  FreeType  Project,   including  all  source   code,  binaries  and
+  documentation,  unless  otherwise  stated   in  the  file  in  its
+  original, unmodified form as  distributed in the original archive.
+  If you are  unsure whether or not a particular  file is covered by
+  this license, you must contact us to verify this.
+
+  The FreeType  Project is copyright (C) 1996-2000  by David Turner,
+  Robert Wilhelm, and Werner Lemberg.  All rights reserved except as
+  specified below.
+
+1. No Warranty
+--------------
+
+  THE FREETYPE PROJECT  IS PROVIDED `AS IS' WITHOUT  WARRANTY OF ANY
+  KIND, EITHER  EXPRESS OR IMPLIED,  INCLUDING, BUT NOT  LIMITED TO,
+  WARRANTIES  OF  MERCHANTABILITY   AND  FITNESS  FOR  A  PARTICULAR
+  PURPOSE.  IN NO EVENT WILL ANY OF THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE  FOR ANY DAMAGES CAUSED  BY THE USE OR  THE INABILITY TO
+  USE, OF THE FREETYPE PROJECT.
+
+2. Redistribution
+-----------------
+
+  This  license  grants  a  worldwide, royalty-free,  perpetual  and
+  irrevocable right  and license to use,  execute, perform, compile,
+  display,  copy,   create  derivative  works   of,  distribute  and
+  sublicense the  FreeType Project (in  both source and  object code
+  forms)  and  derivative works  thereof  for  any  purpose; and  to
+  authorize others  to exercise  some or all  of the  rights granted
+  herein, subject to the following conditions:
+
+    o Redistribution of  source code  must retain this  license file
+      (`FTL.TXT') unaltered; any  additions, deletions or changes to
+      the original  files must be clearly  indicated in accompanying
+      documentation.   The  copyright   notices  of  the  unaltered,
+      original  files must  be  preserved in  all  copies of  source
+      files.
+
+    o Redistribution in binary form must provide a  disclaimer  that
+      states  that  the software is based in part of the work of the
+      FreeType Team,  in  the  distribution  documentation.  We also
+      encourage you to put an URL to the FreeType web page  in  your
+      documentation, though this isn't mandatory.
+
+  These conditions  apply to any  software derived from or  based on
+  the FreeType Project,  not just the unmodified files.   If you use
+  our work, you  must acknowledge us.  However, no  fee need be paid
+  to us.
+
+3. Advertising
+--------------
+
+  Neither the  FreeType authors and  contributors nor you  shall use
+  the name of the  other for commercial, advertising, or promotional
+  purposes without specific prior written permission.
+
+  We suggest,  but do not require, that  you use one or  more of the
+  following phrases to refer  to this software in your documentation
+  or advertising  materials: `FreeType Project',  `FreeType Engine',
+  `FreeType library', or `FreeType Distribution'.
+
+  As  you have  not signed  this license,  you are  not  required to
+  accept  it.   However,  as  the FreeType  Project  is  copyrighted
+  material, only  this license, or  another one contracted  with the
+  authors, grants you  the right to use, distribute,  and modify it.
+  Therefore,  by  using,  distributing,  or modifying  the  FreeType
+  Project, you indicate that you understand and accept all the terms
+  of this license.
+
+4. Contacts
+-----------
+
+  There are two mailing lists related to FreeType:
+
+    o freetype@nongnu.org
+
+      Discusses general use and applications of FreeType, as well as
+      future and  wanted additions to the  library and distribution.
+      If  you are looking  for support,  start in  this list  if you
+      haven't found anything to help you in the documentation.
+
+    o freetype-devel@nongnu.org
+
+      Discusses bugs,  as well  as engine internals,  design issues,
+      specific licenses, porting, etc.
+
+  Our home page can be found at
+
+    https://www.freetype.org
+
+
+--- end of FTL.TXT ---
 ====================================================================================================
 
 ====================================================================================================
-LIBRARY: accessibility
-ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_unittest.cc + ../../../LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../flutter/third_party/accessibility/ax/ax_action_handler.cc
-FILE: ../../../flutter/third_party/accessibility/ax/ax_action_handler.h
-FILE: ../../../flutter/third_party/accessibility/ax/ax_event_generator.cc
-FILE: ../../../flutter/third_party/accessibility/ax/ax_event_generator.h
-FILE: ../../../flutter/third_party/accessibility/ax/ax_event_generator_unittest.cc
-FILE: ../../../flutter/third_party/accessibility/ax/ax_mode.h
-FILE: ../../../flutter/third_party/accessibility/ax/ax_mode_observer.h
-FILE: ../../../flutter/third_party/accessibility/ax/ax_role_properties.cc
-FILE: ../../../flutter/third_party/accessibility/ax/ax_role_properties.h
-FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_unittest.cc
-FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_unittest.h
-FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_relation_win.cc
-FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_relation_win.h
-FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_unique_id.cc
-FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_unique_id.h
-FILE: ../../../flutter/third_party/accessibility/base/numerics/checked_math.h
-FILE: ../../../flutter/third_party/accessibility/base/numerics/checked_math_impl.h
-FILE: ../../../flutter/third_party/accessibility/base/numerics/clamped_math.h
-FILE: ../../../flutter/third_party/accessibility/base/numerics/clamped_math_impl.h
-FILE: ../../../flutter/third_party/accessibility/base/numerics/math_constants.h
-FILE: ../../../flutter/third_party/accessibility/base/numerics/ranges.h
-FILE: ../../../flutter/third_party/accessibility/base/numerics/safe_conversions_arm_impl.h
-FILE: ../../../flutter/third_party/accessibility/base/numerics/safe_math.h
-FILE: ../../../flutter/third_party/accessibility/base/numerics/safe_math_arm_impl.h
-FILE: ../../../flutter/third_party/accessibility/base/numerics/safe_math_clang_gcc_impl.h
-FILE: ../../../flutter/third_party/accessibility/base/numerics/safe_math_shared_impl.h
+LIBRARY: rapidjson
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/msinttypes/inttypes.h
+ORIGIN: ../../../flutter/third_party/rapidjson/include/rapidjson/msinttypes/stdint.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/msinttypes/inttypes.h
+FILE: ../../../flutter/third_party/rapidjson/include/rapidjson/msinttypes/stdint.h
 ----------------------------------------------------------------------------------------------------
-Copyright 2017 The Chromium Authors. All rights reserved.
+The above software in this distribution may have been modified by
+THL A29 Limited ("Tencent Modifications").
+All Tencent Modifications are Copyright (C) 2015 THL A29 Limited.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: sqlite
+ORIGIN: ../../../flutter/third_party/sqlite/LICENSE
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/sqlite/sqlite3.c
+FILE: ../../../flutter/third_party/sqlite/sqlite3.h
+----------------------------------------------------------------------------------------------------
+The source code for SQLite is in the public domain. No claim of
+copyright is made on any part of the core source code. (The
+documentation and test code is a different matter - some sections of
+documentation and test logic are governed by open-source licenses.)
+All contributors to the SQLite core software have signed affidavits
+specifically disavowing any copyright interest in the code. This means
+that anybody is able to legally do anything they want with the SQLite
+source code.
+
+There are other SQL database engines with liberal licenses that allow
+the code to be broadly and freely used. But those other engines are
+still governed by copyright law. SQLite is different in that copyright
+law simply does not apply.
+
+The source code files for other SQL database engines typically begin
+with a comment describing your legal rights to view and copy that
+file. The SQLite source code contains no license since it is not
+governed by copyright. Instead of a license, the SQLite source code
+offers a blessing:
+
+May you do good and not evil
+May you find forgiveness for yourself and forgive others
+May you share freely, never taking more than you give.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: freetype2
+ORIGIN: ../../../flutter/third_party/freetype2/src/base/md5.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/freetype2/src/base/md5.h
+----------------------------------------------------------------------------------------------------
+This software was written by Alexander Peslyak in 2001.  No copyright is
+claimed, and the software is hereby placed in the public domain.
+In case this attempt to disclaim copyright and place the software in the
+public domain is deemed null and void, then the software is
+Copyright (c) 2001 Alexander Peslyak and it is hereby released to the
+general public under the following terms:
 
 Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+modification, are permitted.
 
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+There's ABSOLUTELY NO WARRANTY, express or implied.
+====================================================================================================
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ====================================================================================================
+LIBRARY: freetype2
+ORIGIN: ../../../flutter/third_party/freetype2/src/base/md5.c
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/freetype2/src/base/md5.c
+----------------------------------------------------------------------------------------------------
+This software was written by Alexander Peslyak in 2001.  No copyright is
+claimed, and the software is hereby placed in the public domain.
+In case this attempt to disclaim copyright and place the software in the
+public domain is deemed null and void, then the software is
+Copyright (c) 2001 Alexander Peslyak and it is hereby released to the
+general public under the following terms:
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted.
+
+There's ABSOLUTELY NO WARRANTY, express or implied.
 
+(This is a heavily cut-down "BSD license".)
 ====================================================================================================
-LIBRARY: accessibility
-ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_delegate_base.cc + ../../../LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../flutter/third_party/accessibility/ax/ax_enum_util.cc
-FILE: ../../../flutter/third_party/accessibility/ax/ax_enum_util.h
-FILE: ../../../flutter/third_party/accessibility/ax/ax_enums.h
-FILE: ../../../flutter/third_party/accessibility/ax/ax_node_data_unittest.cc
-FILE: ../../../flutter/third_party/accessibility/ax/ax_table_info.cc
-FILE: ../../../flutter/third_party/accessibility/ax/ax_table_info.h
-FILE: ../../../flutter/third_party/accessibility/ax/ax_table_info_unittest.cc
-FILE: ../../../flutter/third_party/accessibility/ax/ax_tree_id.cc
-FILE: ../../../flutter/third_party/accessibility/ax/ax_tree_id.h
-FILE: ../../../flutter/third_party/accessibility/ax/ax_tree_observer.cc
-FILE: ../../../flutter/third_party/accessibility/ax/ax_tree_observer.h
-FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_delegate_base.cc
-FILE: ../../../flutter/third_party/accessibility/ax/platform/compute_attributes.cc
-FILE: ../../../flutter/third_party/accessibility/ax/platform/compute_attributes.h
-FILE: ../../../flutter/third_party/accessibility/base/no_destructor.h
-FILE: ../../../flutter/third_party/accessibility/base/win/atl.h
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/LICENSE
+TYPE: LicenseType.icu
+FILE: ../../../flutter/third_party/icu/android/icudtl.dat
+FILE: ../../../flutter/third_party/icu/cast/brkitr.patch
+FILE: ../../../flutter/third_party/icu/cast/icudtl.dat
+FILE: ../../../flutter/third_party/icu/chromeos/icudtl.dat
+FILE: ../../../flutter/third_party/icu/chromeos/icudtl.dat.hash
+FILE: ../../../flutter/third_party/icu/common/icudtb.dat
+FILE: ../../../flutter/third_party/icu/common/icudtl.dat
+FILE: ../../../flutter/third_party/icu/flutter/brkitr.patch
+FILE: ../../../flutter/third_party/icu/flutter/icudtl.dat
+FILE: ../../../flutter/third_party/icu/flutter_desktop/icudtl.dat
+FILE: ../../../flutter/third_party/icu/ios/icudtl.dat
+FILE: ../../../flutter/third_party/icu/patches/ardatepattern.patch
+FILE: ../../../flutter/third_party/icu/patches/atomic_template_instantiation.patch
+FILE: ../../../flutter/third_party/icu/patches/cjdict.patch
+FILE: ../../../flutter/third_party/icu/patches/configure.patch
+FILE: ../../../flutter/third_party/icu/patches/data_symb.patch
+FILE: ../../../flutter/third_party/icu/patches/fuchsia.patch
+FILE: ../../../flutter/third_party/icu/patches/gb_table.patch
+FILE: ../../../flutter/third_party/icu/patches/gmt24.patch
+FILE: ../../../flutter/third_party/icu/patches/include-utility.patch
+FILE: ../../../flutter/third_party/icu/patches/iso2022jp.patch
+FILE: ../../../flutter/third_party/icu/patches/isvalidenum.patch
+FILE: ../../../flutter/third_party/icu/patches/khmer-dictbe.patch
+FILE: ../../../flutter/third_party/icu/patches/locale1.patch
+FILE: ../../../flutter/third_party/icu/patches/locale_google.patch
+FILE: ../../../flutter/third_party/icu/patches/name_5_langs.patch
+FILE: ../../../flutter/third_party/icu/patches/restrace.patch
+FILE: ../../../flutter/third_party/icu/patches/revert_realpath.patch
+FILE: ../../../flutter/third_party/icu/patches/ultag_parse-double-free.patch
+FILE: ../../../flutter/third_party/icu/patches/wordbrk.patch
+FILE: ../../../flutter/third_party/icu/source/data/in/coll/ucadata-implicithan-icu4x.icu
+FILE: ../../../flutter/third_party/icu/source/data/in/coll/ucadata-implicithan.icu
+FILE: ../../../flutter/third_party/icu/source/data/in/coll/ucadata-unihan-icu4x.icu
+FILE: ../../../flutter/third_party/icu/source/data/in/coll/ucadata-unihan.icu
+FILE: ../../../flutter/third_party/icu/source/data/in/nfc.nrm
+FILE: ../../../flutter/third_party/icu/source/data/in/nfkc.nrm
+FILE: ../../../flutter/third_party/icu/source/data/in/nfkc_cf.nrm
+FILE: ../../../flutter/third_party/icu/source/data/in/pnames.icu
+FILE: ../../../flutter/third_party/icu/source/data/in/ubidi.icu
+FILE: ../../../flutter/third_party/icu/source/data/in/ucase.icu
+FILE: ../../../flutter/third_party/icu/source/data/in/uemoji.icu
+FILE: ../../../flutter/third_party/icu/source/data/in/ulayout.icu
+FILE: ../../../flutter/third_party/icu/source/data/in/unames.icu
+FILE: ../../../flutter/third_party/icu/source/data/in/uprops.icu
+FILE: ../../../flutter/third_party/icu/source/data/in/uts46.nrm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm866-html.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/iso-8859-10-html.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/iso-8859-13-html.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/iso-8859-14-html.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/iso-8859-15-html.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/iso-8859-16-html.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/iso-8859-2-html.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/iso-8859-3-html.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/iso-8859-4-html.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/iso-8859-5-html.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/iso-8859-6-html.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/iso-8859-7-html.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/iso-8859-8-html.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/koi8-r-html.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/koi8-u-html.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/macintosh-html.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/windows-1250-html.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/windows-1251-html.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/windows-1252-html.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/windows-1253-html.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/windows-1254-html.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/windows-1255-html.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/windows-1256-html.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/windows-1257-html.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/windows-1258-html.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/windows-874-html.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/x-mac-cyrillic-html.ucm
+FILE: ../../../flutter/third_party/icu/source/data/unidata/UnicodeData.txt
+FILE: ../../../flutter/third_party/icu/source/data/unidata/confusablesWholeScript.txt
+FILE: ../../../flutter/third_party/icu/source/extra/scrptrun/srtest.dsp
+FILE: ../../../flutter/third_party/icu/source/extra/scrptrun/srtest.dsw
+FILE: ../../../flutter/third_party/icu/source/i18n/decContext.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/decContext.h
+FILE: ../../../flutter/third_party/icu/source/i18n/decNumber.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/decNumber.h
+FILE: ../../../flutter/third_party/icu/source/i18n/decNumberLocal.h
+FILE: ../../../flutter/third_party/icu/source/tools/icuinfo/plugin_sources.txt
+FILE: ../../../flutter/third_party/icu/source/tools/tzcode/asctime.c
+FILE: ../../../flutter/third_party/icu/source/tools/tzcode/ialloc.c
+FILE: ../../../flutter/third_party/icu/source/tools/tzcode/localtime.c
+FILE: ../../../flutter/third_party/icu/source/tools/tzcode/private.h
+FILE: ../../../flutter/third_party/icu/source/tools/tzcode/scheck.c
+FILE: ../../../flutter/third_party/icu/source/tools/tzcode/tzfile.h
+FILE: ../../../flutter/third_party/icu/source/tools/tzcode/zdump.c
+FILE: ../../../flutter/third_party/icu/source/tools/tzcode/zic.c
+FILE: ../../../flutter/third_party/icu/tzres/metaZones.res
+FILE: ../../../flutter/third_party/icu/tzres/timezoneTypes.res
+FILE: ../../../flutter/third_party/icu/tzres/zoneinfo64.res
+FILE: ../../../flutter/third_party/icu/version.json
 ----------------------------------------------------------------------------------------------------
-Copyright 2018 The Chromium Authors. All rights reserved.
+UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
+
+See Terms of Use <https://www.unicode.org/copyright.html>
+for definitions of Unicode Inc.’s Data Files and Software.
+
+NOTICE TO USER: Carefully read the following legal agreement.
+BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S
+DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"),
+YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
+TERMS AND CONDITIONS OF THIS AGREEMENT.
+IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE
+THE DATA FILES OR SOFTWARE.
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright © 1991-2023 Unicode, Inc. All rights reserved.
+Distributed under the Terms of Use in https://www.unicode.org/copyright.html.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+
+Third-Party Software Licenses
+
+This section contains third-party software notices and/or additional
+terms for licensed third-party software components included within ICU
+libraries.
+
+ICU License - ICU 1.8.1 to ICU 57.1
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright (c) 1995-2016 International Business Machines Corporation and others
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, and/or sell copies of the Software, and to permit persons
+to whom the Software is furnished to do so, provided that the above
+copyright notice(s) and this permission notice appear in all copies of
+the Software and that both the above copyright notice(s) and this
+permission notice appear in supporting documentation.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY
+SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER
+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+of the copyright holder.
+
+All trademarks and registered trademarks mentioned herein are the
+property of their respective owners.
+
+Chinese/Japanese Word Break Dictionary Data (cjdict.txt)
+
+The Google Chrome software developed by Google is licensed under
+the BSD license. Other software included in this distribution is
+provided under other licenses, as set forth below.
+
+The BSD License
+http://opensource.org/licenses/bsd-license.php
+Copyright (C) 2006-2008, Google Inc.
+
+All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+modification, are permitted provided that the following conditions are met:
 
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
+Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following
+disclaimer in the documentation and/or other materials provided with
+the distribution.
+Neither the name of  Google Inc. nor the names of its
 contributors may be used to endorse or promote products derived from
 this software without specific prior written permission.
 
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The word list in cjdict.txt are generated by combining three word lists
+listed below with further processing for compound word breaking. The
+frequency is generated with an iterative training against Google web
+corpora.
+
+* Libtabe (Chinese)
+   - https://sourceforge.net/project/?group_id=1519
+   - Its license terms and conditions are shown below.
+
+* IPADIC (Japanese)
+   - http://chasen.aist-nara.ac.jp/chasen/distribution.html
+   - Its license terms and conditions are shown below.
+
+Copyright (c) 1999 TaBE Project.
+Copyright (c) 1999 Pai-Hsiang Hsiao.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+. Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+. Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in
+  the documentation and/or other materials provided with the
+  distribution.
+. Neither the name of the TaBE Project nor the names of its
+  contributors may be used to endorse or promote products derived
+  from this software without specific prior written permission.
+
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
 
-====================================================================================================
-LIBRARY: accessibility
-ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/ax_fragment_root_delegate_win.h + ../../../LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../flutter/third_party/accessibility/ax/ax_active_popup.cc
-FILE: ../../../flutter/third_party/accessibility/ax/ax_active_popup.h
-FILE: ../../../flutter/third_party/accessibility/ax/ax_clipping_behavior.h
-FILE: ../../../flutter/third_party/accessibility/ax/ax_constants.h
-FILE: ../../../flutter/third_party/accessibility/ax/ax_coordinate_system.h
-FILE: ../../../flutter/third_party/accessibility/ax/ax_enum_util_unittest.cc
-FILE: ../../../flutter/third_party/accessibility/ax/ax_mode.cc
-FILE: ../../../flutter/third_party/accessibility/ax/ax_node_text_styles.cc
-FILE: ../../../flutter/third_party/accessibility/ax/ax_node_text_styles.h
-FILE: ../../../flutter/third_party/accessibility/ax/ax_offscreen_result.h
-FILE: ../../../flutter/third_party/accessibility/ax/ax_range_unittest.cc
-FILE: ../../../flutter/third_party/accessibility/ax/ax_role_properties_unittest.cc
-FILE: ../../../flutter/third_party/accessibility/ax/ax_tree_manager.h
-FILE: ../../../flutter/third_party/accessibility/ax/ax_tree_manager_map.cc
-FILE: ../../../flutter/third_party/accessibility/ax/ax_tree_manager_map.h
-FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_fragment_root_delegate_win.h
-FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_fragment_root_win.cc
-FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_fragment_root_win.h
-FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_fragment_root_win_unittest.cc
-FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_base_unittest.cc
-FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_delegate_utils_win.cc
-FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_delegate_utils_win.h
-FILE: ../../../flutter/third_party/accessibility/ax/platform/ax_platform_node_win_unittest.h
-FILE: ../../../flutter/third_party/accessibility/base/win/scoped_safearray.h
-FILE: ../../../flutter/third_party/accessibility/base/win/scoped_safearray_unittest.cc
-----------------------------------------------------------------------------------------------------
-Copyright 2019 The Chromium Authors. All rights reserved.
+Copyright (c) 1999 Computer Systems and Communication Lab,
+                   Institute of Information Science, Academia
+                   Sinica. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+modification, are permitted provided that the following conditions
+are met:
 
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+. Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+. Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in
+  the documentation and/or other materials provided with the
+  distribution.
+. Neither the name of the Computer Systems and Communication Lab
+  nor the names of its contributors may be used to endorse or
+  promote products derived from this software without specific
+  prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
 
-====================================================================================================
-LIBRARY: accessibility
-ORIGIN: ../../../flutter/third_party/accessibility/ax/platform/uia_registrar_win.cc + ../../../LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../flutter/third_party/accessibility/ax/ax_action_handler_base.cc
-FILE: ../../../flutter/third_party/accessibility/ax/ax_action_handler_base.h
-FILE: ../../../flutter/third_party/accessibility/ax/ax_base_export.h
-FILE: ../../../flutter/third_party/accessibility/ax/ax_event_intent.cc
-FILE: ../../../flutter/third_party/accessibility/ax/ax_event_intent.h
-FILE: ../../../flutter/third_party/accessibility/ax/platform/uia_registrar_win.cc
-FILE: ../../../flutter/third_party/accessibility/ax/platform/uia_registrar_win.h
-FILE: ../../../flutter/third_party/accessibility/ax/test_ax_node_helper.cc
-FILE: ../../../flutter/third_party/accessibility/ax/test_ax_node_helper.h
-FILE: ../../../flutter/third_party/accessibility/ax/test_ax_tree_manager.cc
-FILE: ../../../flutter/third_party/accessibility/ax/test_ax_tree_manager.h
-FILE: ../../../flutter/third_party/accessibility/base/win/dispatch_stub.cc
-FILE: ../../../flutter/third_party/accessibility/base/win/dispatch_stub.h
-FILE: ../../../flutter/third_party/accessibility/base/win/variant_util.h
-FILE: ../../../flutter/third_party/accessibility/base/win/variant_vector.cc
-FILE: ../../../flutter/third_party/accessibility/base/win/variant_vector.h
-FILE: ../../../flutter/third_party/accessibility/base/win/variant_vector_unittest.cc
-----------------------------------------------------------------------------------------------------
-Copyright 2020 The Chromium Authors. All rights reserved.
+Copyright 1996 Chih-Hao Tsai @ Beckman Institute,
+    University of Illinois
+c-tsai4@uiuc.edu  http://casper.beckman.uiuc.edu/~c-tsai4
+
+Copyright 2000, 2001, 2002, 2003 Nara Institute of Science
+and Technology.  All Rights Reserved.
+
+Use, reproduction, and distribution of this software is permitted.
+Any copy of this software, whether in its original form or modified,
+must include both the above copyright notice and the following
+paragraphs.
+
+Nara Institute of Science and Technology (NAIST),
+the copyright holders, disclaims all warranties with regard to this
+software, including all implied warranties of merchantability and
+fitness, in no event shall NAIST be liable for
+any special, indirect or consequential damages or any damages
+whatsoever resulting from loss of use, data or profits, whether in an
+action of contract, negligence or other tortuous action, arising out
+of or in connection with the use or performance of this software.
+
+A large portion of the dictionary entries
+originate from ICOT Free Software.  The following conditions for ICOT
+Free Software applies to the current dictionary as well.
 
+Each User may also freely distribute the Program, whether in its
+original form or modified, to any third party or parties, PROVIDED
+that the provisions of Section 3 ("NO WARRANTY") will ALWAYS appear
+on, or be attached to, the Program, which is distributed substantially
+in the same form as set out herein and that such intended
+distribution, if actually made, will neither violate or otherwise
+contravene any of the laws and regulations of the countries having
+jurisdiction over the User or the intended distribution itself.
+
+NO WARRANTY
+
+The program was produced on an experimental basis in the course of the
+research and development conducted during the project and is provided
+to users as so produced on an experimental basis.  Accordingly, the
+program is provided without any warranty whatsoever, whether express,
+implied, statutory or otherwise.  The term "warranty" used herein
+includes, but is not limited to, any warranty of the quality,
+performance, merchantability and fitness for a particular purpose of
+the program and the nonexistence of any infringement or violation of
+any right of any third party.
+
+Each user of the program will agree and understand, and be deemed to
+have agreed and understood, that there is no warranty whatsoever for
+the program and, accordingly, the entire risk arising from or
+otherwise connected with the program is assumed by the user.
+
+Therefore, neither ICOT, the copyright holder, or any other
+organization that participated in or was otherwise related to the
+development of the program and their respective officials, directors,
+officers and other employees shall be held liable for any and all
+damages, including, without limitation, general, special, incidental
+and consequential damages, arising out of or otherwise in connection
+with the use or inability to use the program or any product, material
+or result produced or otherwise obtained by using the program,
+regardless of whether they have been advised of, or otherwise had
+knowledge of, the possibility of such damages at any time during the
+project or thereafter.  Each user will be deemed to have agreed to the
+foregoing by his or her commencement of use of the program.  The term
+"use" as used herein includes, but is not limited to, the use,
+modification, copying and distribution of the program and the
+production of secondary products from the program.
+
+In the case where the program, whether in its original form or
+modified, was distributed or delivered to or received by a user from
+any person, organization or entity other than ICOT, unless it makes or
+grants independently of ICOT any specific warranty to the user in
+writing, such person, organization or entity, will also be exempted
+from and not be held liable to the user for any such damages as noted
+above as far as the program is concerned.
+
+Lao Word Break Dictionary Data (laodict.txt)
+
+Copyright (C) 2016 and later: Unicode, Inc. and others.
+License & terms of use: http://www.unicode.org/copyright.html
+Copyright (c) 2015 International Business Machines Corporation
+and others. All Rights Reserved.
+
+Project: https://github.com/rober42539/lao-dictionary
+Dictionary: https://github.com/rober42539/lao-dictionary/laodict.txt
+License: https://github.com/rober42539/lao-dictionary/LICENSE.txt
+         (copied below)
+
+This file is derived from the above dictionary version of Nov 22, 2020
+
+Copyright (C) 2013 Brian Eugene Wilson, Robert Martin Campbell.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer. Redistributions in binary
+form must reproduce the above copyright notice, this list of conditions and
+the following disclaimer in the documentation and/or other materials
+provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Burmese Word Break Dictionary Data (burmesedict.txt)
+
+Copyright (c) 2014 International Business Machines Corporation
+and others. All Rights Reserved.
+
+This list is part of a project hosted at:
+  github.com/kanyawtech/myanmar-karen-word-lists
+
+Copyright (c) 2013, LeRoy Benjamin Sharon
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met: Redistributions of source code must retain the above
+copyright notice, this list of conditions and the following
+disclaimer.  Redistributions in binary form must reproduce the
+above copyright notice, this list of conditions and the following
+disclaimer in the documentation and/or other materials provided
+with the distribution.
+
+  Neither the name Myanmar Karen Word Lists, nor the names of its
+  contributors may be used to endorse or promote products derived
+  from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+Google double-conversion
+
+Copyright 2006-2011, the V8 project authors. All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google Inc. nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -3771,15 +55675,10890 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+File: install-sh (only for ICU4C)
+
+
+Copyright 1991 by the Massachusetts Institute of Technology
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of M.I.T. not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission.  M.I.T. makes no representations about the
+suitability of this software for any purpose.  It is provided "as is"
+without express or implied warranty.
 ====================================================================================================
 
 ====================================================================================================
+LIBRARY: harfbuzz
+LIBRARY: icu
 LIBRARY: web_unicode
-ORIGIN: ../../../flutter/third_party/web_unicode/LICENSE
-TYPE: LicenseType.unknown
+ORIGIN: http://unicode.org/copyright.html#Exhibit1 referenced by ../../../flutter/third_party/icu/source/data/translit/Hans_Hant.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/APIChangeReport.html
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/Doxyfile.in
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/appendable.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/bmpset.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/bmpset.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/brkeng.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/brkeng.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/brkiter.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/bytesinkutil.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/bytesinkutil.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/bytestream.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/bytestrie.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/bytestriebuilder.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/bytestrieiterator.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/caniter.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/capi_helper.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/characterproperties.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/chariter.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/charstr.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/charstr.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/charstrmap.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/cmemory.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/cmemory.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/common.rc
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/cpputils.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/cstr.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/cstr.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/cstring.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/cstring.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/cwchar.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/cwchar.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/dictbe.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/dictbe.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/dictionarydata.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/dictionarydata.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/dtintrv.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/edits.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/errorcode.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/filteredbrk.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/filterednormalizer2.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/hash.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/icudataver.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/icuplug.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/icuplugimp.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/loadednormalizer2impl.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/localebuilder.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/localefallback_data.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/localematcher.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/localeprioritylist.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/localeprioritylist.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/localsvc.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/locavailable.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/locbased.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/locbased.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/locdispnames.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/locdistance.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/locdistance.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/locdspnm.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/locid.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/loclikely.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/loclikelysubtags.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/loclikelysubtags.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/locmap.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/locmap.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/locresdata.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/locutil.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/locutil.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/lsr.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/lsr.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/lstmbe.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/lstmbe.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/messageimpl.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/messagepattern.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/mlbe.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/mlbe.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/msvcres.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/mutex.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/norm2_nfc_data.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/norm2allmodes.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/normalizer2.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/normalizer2impl.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/normalizer2impl.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/normlzr.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/parsepos.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/patternprops.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/patternprops.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/pluralmap.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/pluralmap.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/propname.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/propname.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/propname_data.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/propsvec.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/propsvec.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/punycode.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/punycode.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/putil.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/putilimp.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/rbbi.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/rbbi_cache.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/rbbi_cache.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/rbbidata.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/rbbidata.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/rbbinode.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/rbbinode.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/rbbirb.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/rbbirb.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/rbbirpt.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/rbbirpt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/rbbiscan.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/rbbiscan.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/rbbisetb.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/rbbisetb.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/rbbistbl.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/rbbitblb.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/rbbitblb.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/resbund.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/resbund_cnv.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/resource.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/resource.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/restrace.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/restrace.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ruleiter.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ruleiter.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/schriter.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/serv.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/serv.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/servlk.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/servlkf.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/servloc.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/servls.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/servnotf.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/servnotf.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/servrbf.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/servslkf.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/sharedobject.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/sharedobject.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/simpleformatter.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/sprpimpl.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/static_unicode_sets.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/static_unicode_sets.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/stringpiece.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/stringtriebuilder.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uarrsort.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uarrsort.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uassert.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ubidi.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ubidi_props.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ubidi_props.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ubidi_props_data.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ubidiimp.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ubidiln.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ubiditransform.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ubidiwrt.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ubrk.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ubrkimpl.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucase.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucase.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucase_props_data.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucasemap.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucasemap_imp.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucasemap_titlecase_brkiter.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucat.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uchar.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uchar_props_data.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucharstrie.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucharstriebuilder.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucharstrieiterator.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uchriter.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucln.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucln_cmn.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucln_cmn.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucln_imp.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucmndata.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucmndata.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucnv.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucnv2022.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucnv_bld.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucnv_bld.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucnv_cb.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucnv_cnv.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucnv_cnv.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucnv_ct.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucnv_err.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucnv_ext.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucnv_ext.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucnv_imp.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucnv_io.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucnv_io.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucnv_lmb.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucnv_set.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucnv_u16.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucnv_u32.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucnv_u7.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucnv_u8.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucnvbocu.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucnvdisp.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucnvhz.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucnvisci.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucnvlat1.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucnvmbcs.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucnvmbcs.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucnvscsu.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucnvsel.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucol_data.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucol_swp.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucol_swp.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucptrie.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucptrie_impl.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucurr.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ucurrimp.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/udata.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/udatamem.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/udatamem.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/udataswp.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/udataswp.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uelement.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uenum.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uenumimp.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uhash.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uhash.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uhash_us.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uidna.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uinit.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uinvchar.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uinvchar.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uiter.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ulayout_props.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ulist.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ulist.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uloc.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uloc_keytype.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uloc_tag.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ulocimp.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/umapfile.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/umapfile.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/umath.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/umutablecptrie.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/umutex.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/umutex.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unames.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/appendable.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/brkiter.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/bytestream.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/bytestrie.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/bytestriebuilder.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/caniter.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/casemap.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/char16ptr.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/chariter.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/dbbi.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/docmain.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/dtintrv.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/edits.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/enumset.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/errorcode.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/filteredbrk.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/icudataver.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/icuplug.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/idna.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/localebuilder.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/localematcher.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/localpointer.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/locdspnm.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/locid.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/messagepattern.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/normalizer2.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/normlzr.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/parseerr.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/parsepos.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/platform.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/ptypes.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/putil.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/rbbi.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/rep.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/resbund.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/schriter.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/simpleformatter.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/std_string.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/strenum.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/stringoptions.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/stringpiece.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/stringtriebuilder.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/symtable.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/ubidi.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/ubiditransform.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/ubrk.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/ucasemap.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/ucat.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/uchar.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/ucharstrie.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/ucharstriebuilder.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/uchriter.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/uclean.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/ucnv.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/ucnv_cb.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/ucnv_err.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/ucnvsel.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/uconfig.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/ucpmap.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/ucptrie.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/ucurr.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/udata.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/udisplaycontext.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/uenum.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/uidna.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/uiter.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/uldnames.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/uloc.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/umachine.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/umisc.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/umutablecptrie.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/unifilt.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/unifunct.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/unimatch.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/uniset.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/unistr.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/unorm.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/unorm2.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/uobject.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/urename.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/urep.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/ures.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/uscript.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/uset.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/usetiter.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/ushape.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/usprep.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/ustring.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/ustringtrie.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/utext.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/utf.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/utf16.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/utf32.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/utf8.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/utf_old.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/utrace.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/utypes.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unicode/uversion.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unifiedcache.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unifiedcache.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unifilt.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unifunct.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uniquecharstr.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uniset.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uniset_closure.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uniset_props.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unisetspan.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unisetspan.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unistr.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unistr_case.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unistr_case_locale.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unistr_cnv.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unistr_props.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unistr_titlecase_brkiter.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unistrappender.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unorm.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unormcmp.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/unormimp.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uobject.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uposixdefs.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uprops.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uprops.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ures_cnv.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uresbund.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uresdata.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uresdata.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uresimp.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ureslocs.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/usc_impl.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/usc_impl.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uscript.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uscript_props.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uset.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uset_imp.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uset_props.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/usetiter.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ushape.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/usprep.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ustack.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ustr_cnv.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ustr_cnv.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ustr_imp.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ustr_titlecase_brkiter.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ustr_wcs.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ustrcase.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ustrcase_locale.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ustrenum.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ustrenum.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ustrfmt.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ustrfmt.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ustring.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/ustrtrns.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/utext.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/utf_impl.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/util.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/util.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/util_props.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/utrace.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/utracimp.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/utrie.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/utrie.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/utrie2.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/utrie2.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/utrie2_builder.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/utrie2_impl.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/utrie_swap.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uts46.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/utypeinfo.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/utypes.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uvector.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uvector.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uvectr32.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uvectr32.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uvectr64.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/uvectr64.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/wintz.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/wintz.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/adaboost/jaml.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/de.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/dictionaries/thaidict.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/el.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/en.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/en_US.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/en_US_POSIX.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/es.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/fi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/fr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/it.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/ko.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/lstm/Burmese_codepoints_exclusive_model4_heavy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/lstm/Burmese_codepoints_exclusive_model5_heavy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/lstm/Burmese_codepoints_exclusive_model7_heavy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/lstm/Burmese_graphclust_model4_heavy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/lstm/Burmese_graphclust_model5_heavy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/lstm/Burmese_graphclust_model7_heavy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/lstm/Thai_codepoints_exclusive_model4_heavy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/lstm/Thai_codepoints_exclusive_model5_heavy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/lstm/Thai_codepoints_exclusive_model7_heavy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/lstm/Thai_graphclust_model4_heavy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/lstm/Thai_graphclust_model5_heavy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/lstm/Thai_graphclust_model7_heavy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/pt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/ru.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/rules/char.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/rules/line.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/rules/line_cj.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/rules/line_loose.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/rules/line_loose_cj.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/rules/line_loose_phrase_cj.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/rules/line_normal.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/rules/line_normal_cj.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/rules/line_normal_phrase_cj.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/rules/line_phrase_cj.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/rules/sent.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/rules/sent_el.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/rules/title.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/rules/word.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/rules/word_POSIX.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/rules/word_fi_sv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/brkitr/sv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/cldr-icu-readme.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/af.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/am.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/ar.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/ar_SA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/ars.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/as.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/az.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/be.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/bg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/bn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/bo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/br.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/bs.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/bs_Cyrl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/ca.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/ceb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/chr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/cs.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/cy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/da.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/de.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/de_AT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/dsb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/dz.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/ee.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/el.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/en.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/en_US.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/en_US_POSIX.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/eo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/es.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/et.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/fa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/fa_AF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/ff.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/ff_Adlm.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/fi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/fil.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/fo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/fr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/fr_CA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/fy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/ga.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/gl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/gu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/ha.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/haw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/he.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/he_IL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/hi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/hr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/hsb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/hu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/hy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/id.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/id_ID.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/ig.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/in.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/in_ID.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/is.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/it.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/iw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/iw_IL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/ja.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/ka.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/kk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/kl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/km.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/kn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/ko.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/kok.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/ku.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/ky.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/lb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/lkt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/ln.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/lo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/lt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/lv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/mk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/ml.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/mn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/mo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/mr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/ms.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/mt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/my.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/nb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/nb_NO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/ne.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/nl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/nn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/no.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/no_NO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/om.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/or.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/pa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/pa_Guru.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/pa_Guru_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/pa_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/pl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/ps.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/pt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/ro.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/root.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/ru.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/sa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/se.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/sh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/sh_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/sh_CS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/sh_YU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/si.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/sk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/sl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/smn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/sq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/sr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/sr_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/sr_Cyrl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/sr_Cyrl_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/sr_Cyrl_ME.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/sr_Cyrl_RS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/sr_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/sr_Latn_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/sr_Latn_RS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/sr_ME.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/sr_RS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/sv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/sw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/ta.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/te.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/th.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/tk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/to.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/tr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/ug.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/uk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/ur.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/uz.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/vi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/wae.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/wo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/xh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/yi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/yo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/yue.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/yue_CN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/yue_Hans.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/yue_Hans_CN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/yue_Hant.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/zh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/zh_CN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/zh_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/zh_Hans.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/zh_Hans_CN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/zh_Hans_SG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/zh_Hant.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/zh_Hant_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/zh_Hant_MO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/zh_Hant_TW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/zh_MO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/zh_SG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/zh_TW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/coll/zu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/af.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/af_NA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/agq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ak.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/am.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ar.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ar_AE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ar_DJ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ar_ER.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ar_KM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ar_LB.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ar_SA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ar_SO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ar_SS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ars.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/as.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/asa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ast.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/az.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/az_AZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/az_Cyrl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/az_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/az_Latn_AZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/bas.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/be.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/bem.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/bez.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/bg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/bgc.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/bho.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/bm.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/bn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/bn_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/bo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/bo_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/br.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/brx.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/bs.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/bs_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/bs_Cyrl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/bs_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/bs_Latn_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ca.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ca_FR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ccp.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ce.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ceb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/cgg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/chr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ckb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/cs.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/cv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/cy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/da.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/dav.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/de.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/de_CH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/de_LI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/de_LU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/dje.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/doi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/dsb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/dua.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/dyo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/dz.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ebu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ee.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/el.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_001.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_150.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_AE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_AG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_AI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_AT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_AU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_BB.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_BE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_BI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_BM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_BS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_BW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_BZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_CA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_CC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_CH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_CK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_CM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_CX.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_CY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_DE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_DG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_DK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_DM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_ER.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_FI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_FJ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_FK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_FM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_GB.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_GD.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_GG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_GH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_GI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_GM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_GY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_IE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_IL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_IM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_IO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_JE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_JM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_KE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_KI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_KN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_KY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_LC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_LR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_LS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_MG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_MO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_MS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_MT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_MU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_MV.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_MW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_MY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_NA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_NF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_NG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_NH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_NL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_NR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_NU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_NZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_PG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_PH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_PN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_PW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_RH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_RW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_SB.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_SC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_SD.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_SE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_SG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_SH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_SI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_SL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_SS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_SX.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_SZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_TC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_TK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_TO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_TT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_TV.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_TZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_UG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_VC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_VG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_VU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_WS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_ZA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_ZM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/en_ZW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/eo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/es.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/es_419.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/es_AR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/es_BO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/es_BR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/es_BZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/es_CL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/es_CO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/es_CR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/es_CU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/es_DO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/es_EC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/es_GQ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/es_GT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/es_HN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/es_MX.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/es_NI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/es_PA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/es_PE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/es_PH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/es_PR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/es_PY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/es_SV.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/es_US.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/es_UY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/es_VE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/et.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/eu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ewo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/fa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/fa_AF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ff.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ff_Adlm.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ff_Adlm_BF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ff_Adlm_CM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ff_Adlm_GH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ff_Adlm_GM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ff_Adlm_GW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ff_Adlm_LR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ff_Adlm_MR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ff_Adlm_NE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ff_Adlm_NG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ff_Adlm_SL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ff_Adlm_SN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ff_CM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ff_GN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ff_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ff_Latn_CM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ff_Latn_GH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ff_Latn_GM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ff_Latn_GN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ff_Latn_LR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ff_Latn_MR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ff_Latn_NG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ff_Latn_SL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ff_Latn_SN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ff_MR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ff_SN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/fi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/fil.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/fil_PH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/fo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/fo_DK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/fr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/fr_BI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/fr_CA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/fr_CD.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/fr_DJ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/fr_DZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/fr_GN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/fr_HT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/fr_KM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/fr_LU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/fr_MG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/fr_MR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/fr_MU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/fr_RW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/fr_SC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/fr_SY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/fr_TN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/fr_VU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/fur.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/fy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ga.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/gd.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/gl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/gsw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/gu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/guz.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/gv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ha.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ha_GH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/haw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/he.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/he_IL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/hi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/hi_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/hr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/hr_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/hsb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/hu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/hy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ia.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/id.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/id_ID.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ig.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ii.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/in.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/in_ID.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/is.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/it.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/iw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/iw_IL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ja.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/jgo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/jmc.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/jv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ka.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/kab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/kam.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/kde.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/kea.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/kgp.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/khq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ki.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/kk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/kkj.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/kl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/kln.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/km.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/kn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ko.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/kok.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ks.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ks_Arab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ks_Arab_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ks_Deva.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ks_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ksb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ksf.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ksh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ku.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/kw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ky.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/lag.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/lb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/lg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/lkt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ln.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ln_AO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/lo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/lrc.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/lt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/lu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/luo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/luy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/lv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/mai.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/mas.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/mas_TZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/mer.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/mfe.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/mg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/mgh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/mgo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/mi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/mk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ml.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/mn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/mni.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/mni_Beng.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/mni_Beng_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/mni_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/mo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/mr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ms.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ms_BN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ms_ID.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ms_SG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/mt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/mua.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/my.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/mzn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/naq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/nb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/nd.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ne.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/nl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/nl_AW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/nl_BQ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/nl_CW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/nl_SR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/nl_SX.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/nmg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/nn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/nn_NO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/nnh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/no.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/no_NO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/no_NO_NY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/nus.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/nyn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/om.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/om_KE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/or.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/os.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/os_RU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/pa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/pa_Arab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/pa_Arab_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/pa_Guru.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/pa_Guru_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/pa_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/pa_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/pcm.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/pl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ps.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ps_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/pt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/pt_AO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/pt_CH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/pt_CV.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/pt_GQ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/pt_GW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/pt_LU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/pt_MO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/pt_MZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/pt_PT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/pt_ST.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/pt_TL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/qu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/qu_BO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/qu_EC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/raj.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/rm.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/rn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ro.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ro_MD.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/rof.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/root.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ru.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ru_BY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ru_KG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ru_KZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ru_MD.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/rw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/rwk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sah.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/saq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sat.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sat_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sat_Olck.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sat_Olck_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sbp.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sc.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sd.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sd_Arab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sd_Arab_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sd_Deva.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sd_Deva_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sd_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sd_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/se.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/se_SE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/seh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ses.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sh_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sh_CS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sh_YU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/shi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/shi_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/shi_MA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/shi_Tfng.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/shi_Tfng_MA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/si.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/smn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/so.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/so_DJ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/so_ET.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/so_KE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sq_MK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sr_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sr_CS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sr_Cyrl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sr_Cyrl_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sr_Cyrl_CS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sr_Cyrl_RS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sr_Cyrl_XK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sr_Cyrl_YU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sr_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sr_Latn_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sr_Latn_CS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sr_Latn_ME.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sr_Latn_RS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sr_Latn_YU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sr_ME.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sr_RS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sr_XK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sr_YU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/su.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/su_ID.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/su_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/su_Latn_ID.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/supplementalData.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sw_CD.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sw_KE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/sw_UG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ta.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ta_LK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ta_MY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ta_SG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/te.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/teo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/teo_KE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/tg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/th.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ti.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ti_ER.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/tk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/tl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/tl_PH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/to.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/tr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/tt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/twq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/tzm.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ug.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/uk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ur.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/ur_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/uz.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/uz_AF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/uz_Arab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/uz_Arab_AF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/uz_Cyrl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/uz_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/uz_Latn_UZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/uz_UZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/vai.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/vai_LR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/vai_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/vai_Vaii.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/vai_Vaii_LR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/vi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/vun.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/wae.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/wo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/xh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/xog.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/yav.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/yi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/yo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/yo_BJ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/yrl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/yrl_CO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/yrl_VE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/yue.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/yue_CN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/yue_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/yue_Hans.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/yue_Hans_CN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/yue_Hant.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/yue_Hant_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/zgh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/zh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/zh_CN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/zh_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/zh_Hans.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/zh_Hans_CN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/zh_Hans_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/zh_Hans_MO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/zh_Hans_SG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/zh_Hant.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/zh_Hant_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/zh_Hant_MO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/zh_Hant_TW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/zh_MO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/zh_SG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/zh_TW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/curr/zu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/icu4j-readme.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/icupkg.inc.in
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/af.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/agq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ak.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/am.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ar.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ar_EG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ar_LY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ar_SA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ars.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/as.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/asa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ast.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ay.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/az.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/az_AZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/az_Cyrl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/az_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/az_Latn_AZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/bas.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/be.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/bem.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/bez.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/bg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/bgc.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/bho.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/bm.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/bn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/bn_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/bo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/br.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/brx.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/bs.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/bs_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/bs_Cyrl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/bs_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/bs_Latn_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ca.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ccp.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ce.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ceb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/cgg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/chr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ckb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/cs.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/cv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/cy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/da.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/dav.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/de.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/de_AT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/de_CH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/dje.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/doi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/dsb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/dua.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/dv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/dyo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/dz.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ebu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ee.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/el.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_001.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_150.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_AG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_AI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_AT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_AU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_BB.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_BE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_BM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_BS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_BW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_BZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_CA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_CC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_CH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_CK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_CM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_CX.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_CY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_DE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_DG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_DK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_DM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_ER.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_FI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_FJ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_FK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_FM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_GB.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_GD.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_GG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_GH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_GI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_GM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_GY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_IE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_IL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_IM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_IO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_JE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_JM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_KE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_KI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_KN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_KY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_LC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_LR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_LS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_MG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_MO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_MS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_MT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_MU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_MV.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_MW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_MY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_NA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_NF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_NG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_NH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_NL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_NR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_NU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_NZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_PG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_PN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_PW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_RH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_RW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_SB.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_SC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_SD.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_SE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_SG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_SH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_SI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_SL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_SS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_SX.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_SZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_TC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_TK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_TO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_TT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_TV.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_TZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_UG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_VC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_VG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_VU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_WS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_ZA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_ZM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/en_ZW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/eo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/es.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/es_419.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/es_AR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/es_BO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/es_BR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/es_BZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/es_CL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/es_CO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/es_CR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/es_CU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/es_DO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/es_EC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/es_GT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/es_HN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/es_MX.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/es_NI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/es_PA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/es_PE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/es_PR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/es_PY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/es_SV.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/es_US.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/es_UY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/es_VE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/et.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/eu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ewo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/fa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/fa_AF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ff.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ff_Adlm.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ff_CM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ff_GN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ff_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ff_Latn_CM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ff_Latn_GN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ff_Latn_MR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ff_Latn_SN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ff_MR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ff_SN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/fi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/fil.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/fil_PH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/fo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/fr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/fr_BE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/fr_CA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/fr_CH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/fur.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/fy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ga.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/gd.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/gl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/gsw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/gu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/guz.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/gv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ha.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ha_NE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/haw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/he.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/he_IL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/hi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/hi_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/hr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/hsb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/hu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/hy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ia.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/id.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/id_ID.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ig.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ii.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ilo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/in.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/in_ID.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/is.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/it.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/iw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/iw_IL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ja.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/jgo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/jmc.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/jv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ka.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/kab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/kam.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/kde.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/kea.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/kgp.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/khq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ki.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/kk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/kkj.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/kl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/kln.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/km.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/kn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ko.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/kok.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ks.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ks_Arab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ks_Arab_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ks_Deva.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ks_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ksb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ksf.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ksh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/kw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ky.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/lag.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/lb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/lg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/lkt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ln.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/lo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/lrc.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/lt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/lu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/luo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/lus.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/luy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/lv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/mai.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/mas.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/mer.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/mfe.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/mg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/mgh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/mgo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/mi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/mk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ml.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/mn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/mni.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/mni_Beng.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/mni_Beng_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/mni_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/mo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/mr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ms.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/mt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/mua.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/my.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/mzn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/naq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/nb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/nd.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ne.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/nl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/nmg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/nn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/nn_NO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/nnh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/no.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/no_NO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/no_NO_NY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/nus.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/nyn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/om.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/or.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/os.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/pa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/pa_Arab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/pa_Arab_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/pa_Guru.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/pa_Guru_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/pa_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/pa_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/pcm.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/pl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ps.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ps_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/pt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/pt_AO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/pt_CH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/pt_CV.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/pt_GQ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/pt_GW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/pt_LU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/pt_MO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/pt_MZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/pt_PT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/pt_ST.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/pt_TL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/qu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/raj.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/rm.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/rn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ro.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ro_MD.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/rof.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/root.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ru.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/rw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/rwk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sah.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/saq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sat.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sat_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sat_Olck.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sat_Olck_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sbp.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sc.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sd.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sd_Arab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sd_Arab_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sd_Deva.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sd_Deva_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sd_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sd_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/se.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/se_FI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/seh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ses.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sh_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sh_CS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sh_YU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/shi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/shi_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/shi_MA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/shi_Tfng.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/shi_Tfng_MA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/si.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/smn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/so.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sr_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sr_CS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sr_Cyrl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sr_Cyrl_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sr_Cyrl_CS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sr_Cyrl_ME.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sr_Cyrl_RS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sr_Cyrl_XK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sr_Cyrl_YU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sr_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sr_Latn_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sr_Latn_CS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sr_Latn_ME.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sr_Latn_RS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sr_Latn_XK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sr_Latn_YU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sr_ME.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sr_RS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sr_XK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sr_YU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/su.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/su_ID.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/su_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/su_Latn_ID.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sv_FI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sw_CD.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/sw_KE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ta.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/te.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/teo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/th.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ti.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ti_ER.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/tk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/tl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/tl_PH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/to.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/tr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ts.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/tt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/twq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/tzm.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ug.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/uk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ur.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/ur_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/uz.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/uz_AF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/uz_Arab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/uz_Arab_AF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/uz_Cyrl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/uz_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/uz_Latn_UZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/uz_UZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/vai.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/vai_LR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/vai_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/vai_Vaii.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/vai_Vaii_LR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/vi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/vun.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/wae.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/wo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/xh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/xog.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/yav.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/yi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/yo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/yo_BJ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/yrl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/yrl_CO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/yrl_VE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/yue.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/yue_CN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/yue_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/yue_Hans.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/yue_Hans_CN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/yue_Hant.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/yue_Hant_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/zgh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/zh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/zh_CN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/zh_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/zh_Hans.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/zh_Hans_CN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/zh_Hans_SG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/zh_Hant.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/zh_Hant_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/zh_Hant_MO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/zh_Hant_TW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/zh_MO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/zh_SG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/zh_TW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/lang/zu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/af.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/af_NA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/af_ZA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/agq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/agq_CM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ak.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ak_GH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/am.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/am_ET.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ar.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ar_001.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ar_AE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ar_BH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ar_DJ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ar_DZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ar_EG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ar_EH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ar_ER.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ar_IL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ar_IQ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ar_JO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ar_KM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ar_KW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ar_LB.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ar_LY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ar_MA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ar_MR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ar_OM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ar_PS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ar_QA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ar_SA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ar_SD.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ar_SO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ar_SS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ar_SY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ar_TD.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ar_TN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ar_YE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ars.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/as.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/as_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/asa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/asa_TZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ast.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ast_ES.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/az.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/az_AZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/az_Cyrl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/az_Cyrl_AZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/az_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/az_Latn_AZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/bas.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/bas_CM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/be.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/be_BY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/bem.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/bem_ZM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/bez.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/bez_TZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/bg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/bg_BG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/bgc.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/bgc_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/bho.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/bho_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/bm.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/bm_ML.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/bn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/bn_BD.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/bn_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/bo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/bo_CN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/bo_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/br.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/br_FR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/brx.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/brx_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/bs.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/bs_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/bs_Cyrl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/bs_Cyrl_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/bs_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/bs_Latn_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ca.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ca_AD.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ca_ES.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ca_FR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ca_IT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ccp.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ccp_BD.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ccp_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ce.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ce_RU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ceb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ceb_PH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/cgg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/cgg_UG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/chr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/chr_US.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ckb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ckb_IQ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ckb_IR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/cs.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/cs_CZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/cv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/cv_RU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/cy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/cy_GB.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/da.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/da_DK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/da_GL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/dav.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/dav_KE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/de.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/de_AT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/de_BE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/de_CH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/de_DE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/de_IT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/de_LI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/de_LU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/dje.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/dje_NE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/doi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/doi_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/dsb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/dsb_DE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/dua.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/dua_CM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/dyo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/dyo_SN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/dz.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/dz_BT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ebu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ebu_KE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ee.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ee_GH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ee_TG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/el.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/el_CY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/el_GR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_001.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_150.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_AE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_AG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_AI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_AS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_AT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_AU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_BB.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_BE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_BI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_BM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_BS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_BW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_BZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_CA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_CC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_CH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_CK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_CM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_CX.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_CY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_DE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_DG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_DK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_DM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_ER.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_FI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_FJ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_FK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_FM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_GB.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_GD.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_GG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_GH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_GI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_GM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_GU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_GY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_IE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_IL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_IM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_IO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_JE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_JM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_KE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_KI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_KN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_KY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_LC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_LR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_LS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_MG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_MH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_MO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_MP.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_MS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_MT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_MU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_MV.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_MW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_MY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_NA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_NF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_NG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_NH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_NL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_NR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_NU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_NZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_PG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_PH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_PN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_PR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_PW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_RH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_RW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_SB.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_SC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_SD.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_SE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_SG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_SH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_SI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_SL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_SS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_SX.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_SZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_TC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_TK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_TO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_TT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_TV.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_TZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_UG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_UM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_US.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_US_POSIX.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_VC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_VG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_VI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_VU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_WS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_ZA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_ZM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/en_ZW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/eo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/eo_001.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/es.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/es_419.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/es_AR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/es_BO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/es_BR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/es_BZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/es_CL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/es_CO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/es_CR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/es_CU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/es_DO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/es_EA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/es_EC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/es_ES.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/es_GQ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/es_GT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/es_HN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/es_IC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/es_MX.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/es_NI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/es_PA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/es_PE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/es_PH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/es_PR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/es_PY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/es_SV.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/es_US.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/es_UY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/es_VE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/et.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/et_EE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/eu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/eu_ES.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ewo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ewo_CM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fa_AF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fa_IR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ff.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ff_Adlm.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ff_Adlm_BF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ff_Adlm_CM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ff_Adlm_GH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ff_Adlm_GM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ff_Adlm_GN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ff_Adlm_GW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ff_Adlm_LR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ff_Adlm_MR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ff_Adlm_NE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ff_Adlm_NG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ff_Adlm_SL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ff_Adlm_SN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ff_CM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ff_GN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ff_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ff_Latn_BF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ff_Latn_CM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ff_Latn_GH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ff_Latn_GM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ff_Latn_GN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ff_Latn_GW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ff_Latn_LR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ff_Latn_MR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ff_Latn_NE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ff_Latn_NG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ff_Latn_SL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ff_Latn_SN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ff_MR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ff_SN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fi_FI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fil.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fil_PH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fo_DK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fo_FO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_BE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_BF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_BI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_BJ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_BL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_CA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_CD.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_CF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_CG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_CH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_CI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_CM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_DJ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_DZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_FR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_GA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_GF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_GN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_GP.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_GQ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_HT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_KM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_LU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_MA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_MC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_MF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_MG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_ML.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_MQ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_MR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_MU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_NC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_NE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_PF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_PM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_RE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_RW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_SC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_SN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_SY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_TD.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_TG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_TN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_VU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_WF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fr_YT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fur.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fur_IT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/fy_NL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ga.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ga_GB.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ga_IE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/gd.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/gd_GB.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/gl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/gl_ES.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/gsw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/gsw_CH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/gsw_FR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/gsw_LI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/gu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/gu_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/guz.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/guz_KE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/gv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/gv_IM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ha.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ha_GH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ha_NE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ha_NG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/haw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/haw_US.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/he.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/he_IL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/hi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/hi_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/hi_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/hi_Latn_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/hr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/hr_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/hr_HR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/hsb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/hsb_DE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/hu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/hu_HU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/hy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/hy_AM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ia.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ia_001.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/id.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/id_ID.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ig.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ig_NG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ii.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ii_CN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/in.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/in_ID.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/is.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/is_IS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/it.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/it_CH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/it_IT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/it_SM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/it_VA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/iw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/iw_IL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ja.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ja_JP.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ja_JP_TRADITIONAL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/jgo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/jgo_CM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/jmc.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/jmc_TZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/jv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/jv_ID.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ka.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ka_GE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/kab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/kab_DZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/kam.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/kam_KE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/kde.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/kde_TZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/kea.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/kea_CV.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/kgp.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/kgp_BR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/khq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/khq_ML.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ki.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ki_KE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/kk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/kk_KZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/kkj.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/kkj_CM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/kl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/kl_GL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/kln.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/kln_KE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/km.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/km_KH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/kn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/kn_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ko.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ko_KP.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ko_KR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/kok.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/kok_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ks.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ks_Arab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ks_Arab_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ks_Deva.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ks_Deva_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ks_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ksb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ksb_TZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ksf.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ksf_CM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ksh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ksh_DE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ku_TR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/kw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/kw_GB.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ky.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ky_KG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/lag.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/lag_TZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/lb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/lb_LU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/lg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/lg_UG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/lkt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/lkt_US.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ln.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ln_AO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ln_CD.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ln_CF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ln_CG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/lo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/lo_LA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/lrc.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/lrc_IQ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/lrc_IR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/lt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/lt_LT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/lu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/lu_CD.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/luo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/luo_KE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/luy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/luy_KE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/lv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/lv_LV.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/mai.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/mai_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/mas.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/mas_KE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/mas_TZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/mer.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/mer_KE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/mfe.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/mfe_MU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/mg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/mg_MG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/mgh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/mgh_MZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/mgo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/mgo_CM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/mi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/mi_NZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/mk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/mk_MK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ml.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ml_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/mn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/mn_MN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/mni.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/mni_Beng.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/mni_Beng_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/mni_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/mo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/mr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/mr_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ms.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ms_BN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ms_ID.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ms_MY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ms_SG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/mt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/mt_MT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/mua.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/mua_CM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/my.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/my_MM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/mzn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/mzn_IR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/naq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/naq_NA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/nb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/nb_NO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/nb_SJ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/nd.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/nd_ZW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ne.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ne_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ne_NP.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/nl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/nl_AW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/nl_BE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/nl_BQ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/nl_CW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/nl_NL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/nl_SR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/nl_SX.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/nmg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/nmg_CM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/nn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/nn_NO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/nnh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/nnh_CM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/no.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/no_NO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/no_NO_NY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/nus.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/nus_SS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/nyn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/nyn_UG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/om.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/om_ET.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/om_KE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/or.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/or_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/os.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/os_GE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/os_RU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/pa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/pa_Arab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/pa_Arab_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/pa_Guru.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/pa_Guru_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/pa_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/pa_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/pcm.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/pcm_NG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/pl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/pl_PL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ps.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ps_AF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ps_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/pt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/pt_AO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/pt_BR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/pt_CH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/pt_CV.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/pt_GQ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/pt_GW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/pt_LU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/pt_MO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/pt_MZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/pt_PT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/pt_ST.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/pt_TL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/qu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/qu_BO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/qu_EC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/qu_PE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/raj.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/raj_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/rm.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/rm_CH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/rn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/rn_BI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ro.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ro_MD.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ro_RO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/rof.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/rof_TZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/root.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ru.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ru_BY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ru_KG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ru_KZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ru_MD.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ru_RU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ru_UA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/rw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/rw_RW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/rwk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/rwk_TZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sa_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sah.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sah_RU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/saq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/saq_KE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sat.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sat_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sat_Olck.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sat_Olck_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sbp.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sbp_TZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sc.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sc_IT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sd.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sd_Arab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sd_Arab_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sd_Deva.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sd_Deva_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sd_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sd_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/se.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/se_FI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/se_NO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/se_SE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/seh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/seh_MZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ses.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ses_ML.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sg_CF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sh_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sh_CS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sh_YU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/shi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/shi_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/shi_Latn_MA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/shi_MA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/shi_Tfng.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/shi_Tfng_MA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/si.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/si_LK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sk_SK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sl_SI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/smn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/smn_FI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sn_ZW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/so.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/so_DJ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/so_ET.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/so_KE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/so_SO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sq_AL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sq_MK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sq_XK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sr_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sr_CS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sr_Cyrl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sr_Cyrl_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sr_Cyrl_CS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sr_Cyrl_ME.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sr_Cyrl_RS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sr_Cyrl_XK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sr_Cyrl_YU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sr_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sr_Latn_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sr_Latn_CS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sr_Latn_ME.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sr_Latn_RS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sr_Latn_XK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sr_Latn_YU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sr_ME.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sr_RS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sr_XK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sr_YU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/su.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/su_ID.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/su_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/su_Latn_ID.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sv_AX.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sv_FI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sv_SE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sw_CD.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sw_KE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sw_TZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/sw_UG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ta.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ta_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ta_LK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ta_MY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ta_SG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/te.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/te_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/teo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/teo_KE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/teo_UG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/tg_TJ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/th.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/th_TH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/th_TH_TRADITIONAL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ti.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ti_ER.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ti_ET.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/tk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/tk_TM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/tl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/tl_PH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/to.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/to_TO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/tr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/tr_CY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/tr_TR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/tt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/tt_RU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/twq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/twq_NE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/tzm.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/tzm_MA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ug.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ug_CN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/uk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/uk_UA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ur.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ur_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/ur_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/uz.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/uz_AF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/uz_Arab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/uz_Arab_AF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/uz_Cyrl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/uz_Cyrl_UZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/uz_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/uz_Latn_UZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/uz_UZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/vai.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/vai_LR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/vai_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/vai_Latn_LR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/vai_Vaii.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/vai_Vaii_LR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/vi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/vi_VN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/vun.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/vun_TZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/wae.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/wae_CH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/wo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/wo_SN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/xh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/xh_ZA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/xog.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/xog_UG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/yav.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/yav_CM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/yi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/yi_001.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/yo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/yo_BJ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/yo_NG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/yrl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/yrl_BR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/yrl_CO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/yrl_VE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/yue.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/yue_CN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/yue_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/yue_Hans.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/yue_Hans_CN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/yue_Hant.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/yue_Hant_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/zgh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/zgh_MA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/zh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/zh_CN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/zh_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/zh_Hans.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/zh_Hans_CN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/zh_Hans_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/zh_Hans_MO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/zh_Hans_SG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/zh_Hant.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/zh_Hant_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/zh_Hant_MO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/zh_Hant_TW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/zh_MO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/zh_SG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/zh_TW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/zu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/locales/zu_ZA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/makedata.mak
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/cns-11643-1992.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ebcdic-xml-us.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/euc-jp-2007.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/euc-tw-2014.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/gsm-03.38-2009.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1006_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1025_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1026_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1047_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1051_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1089_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1097_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1098_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1112_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1122_P100-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1123_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1124_P100-1996.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1125_P100-1997.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1129_P100-1997.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1130_P100-1997.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1131_P100-1997.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1132_P100-1998.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1133_P100-1997.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1137_P100-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1140_P100-1997.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1141_P100-1997.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1142_P100-1997.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1143_P100-1997.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1144_P100-1997.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1145_P100-1997.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1146_P100-1997.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1147_P100-1997.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1148_P100-1997.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1149_P100-1997.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1153_P100-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1154_P100-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1155_P100-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1156_P100-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1157_P100-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1158_P100-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1160_P100-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1162_P100-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1164_P100-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1168_P100-2002.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1250_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1251_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1252_P100-2000.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1253_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1254_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1255_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1256_P110-1997.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1257_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1258_P100-1997.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-12712_P100-1998.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1276_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1363_P110-1997.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1363_P11B-1998.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1364_P110-2007.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1371_P100-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1373_P100-2002.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1375_P100-2008.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1383_P110-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1386_P100-2001.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1388_P103-2001.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1390_P110-2003.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-1399_P110-2003.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-16684_P110-2003.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-16804_X110-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-273_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-277_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-278_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-280_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-284_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-285_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-290_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-297_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-33722_P120-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-33722_P12A_P12A-2004_U2.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-33722_P12A_P12A-2009_U2.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-37_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-420_X120-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-424_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-437_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-4517_P100-2005.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-4899_P100-1998.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-4909_P100-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-4971_P100-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-500_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-5012_P100-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-5123_P100-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-5346_P100-1998.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-5347_P100-1998.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-5348_P100-1997.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-5349_P100-1998.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-5350_P100-1998.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-5351_P100-1998.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-5352_P100-1998.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-5353_P100-1998.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-5354_P100-1998.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-5471_P100-2006.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-5478_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-720_P100-1997.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-737_P100-1997.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-775_P100-1996.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-803_P100-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-813_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-838_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-8482_P100-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-850_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-851_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-852_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-855_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-856_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-857_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-858_P100-1997.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-860_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-861_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-862_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-863_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-864_X110-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-865_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-866_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-867_P100-1998.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-868_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-869_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-870_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-871_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-874_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-875_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-878_P100-1996.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-9005_X110-2007.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-901_P100-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-902_P100-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-9067_X100-2005.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-912_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-913_P100-2000.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-914_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-915_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-916_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-918_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-920_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-921_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-922_P100-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-923_P100-1998.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-930_P120-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-933_P110-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-935_P110-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-937_P110-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-939_P120-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-942_P12A-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-943_P130-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-943_P15A-2003.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-9447_P100-2002.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-9448_X100-2005.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-9449_P100-2002.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-949_P110-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-949_P11A-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-950_P110-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-954_P101-2007.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-964_P110-1999.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-970_P110_P110-2006_U2.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/ibm-971_P100-1995.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/icu-internal-25546.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-d1.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-d2.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-d3.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-d4.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-d5.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-d6.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-d7.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-s1.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-s2.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-s3.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-t.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/iso-8859_10-1998.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/iso-8859_11-2001.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/iso-8859_14-1998.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/iso-ir-165.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/jisx-212.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/lmb-excp.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/macos-0_2-10.2.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/macos-29-10.2.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/macos-35-10.2.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/macos-6_2-10.4.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/macos-7_3-10.2.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/windows-874-2000.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/windows-949-2000.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/mappings/windows-950-2000.ucm
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/misc/currencyNumericCodes.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/misc/dayPeriods.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/misc/genderList.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/misc/grammaticalFeatures.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/misc/icudata.rc
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/misc/icustd.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/misc/icuver.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/misc/keyTypeData.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/misc/langInfo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/misc/likelySubtags.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/misc/metaZones.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/misc/metadata.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/misc/numberingSystems.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/misc/pluralRanges.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/misc/plurals.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/misc/supplementalData.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/misc/timezoneTypes.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/misc/units.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/misc/windowsZones.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/misc/zoneinfo64.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/af.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/ak.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/am.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/ar.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/ar_SA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/ars.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/az.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/be.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/bg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/bs.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/ca.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/ccp.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/chr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/cs.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/cy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/da.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/de.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/de_CH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/ee.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/el.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/en.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/en_001.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/en_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/eo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/es.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/es_419.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/es_DO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/es_GT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/es_HN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/es_MX.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/es_NI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/es_PA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/es_PR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/es_SV.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/es_US.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/et.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/fa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/fa_AF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/ff.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/fi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/fil.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/fo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/fr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/fr_BE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/fr_CH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/ga.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/he.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/hi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/hr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/hu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/hy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/id.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/in.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/is.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/it.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/iw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/ja.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/ka.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/kk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/kl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/km.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/ko.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/ky.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/lb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/lo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/lrc.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/lt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/lv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/mk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/ms.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/mt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/my.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/nb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/ne.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/nl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/nn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/no.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/pl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/pt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/pt_PT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/qu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/ro.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/root.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/ru.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/se.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/sh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/sk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/sl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/sq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/sr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/sr_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/su.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/sv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/sw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/ta.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/th.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/tr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/uk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/vi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/yue.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/yue_Hans.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/zh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/zh_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/zh_Hant.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/zh_Hant_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/zh_Hant_MO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/zh_Hant_TW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/zh_MO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/rbnf/zh_TW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/af.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/agq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ak.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/am.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ar.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ar_AE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ar_LY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ar_SA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ars.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/as.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/asa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ast.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/az.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/az_AZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/az_Cyrl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/az_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/az_Latn_AZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/bas.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/be.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/bem.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/bez.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/bg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/bgc.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/bho.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/bm.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/bn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/bn_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/bo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/bo_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/br.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/brx.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/bs.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/bs_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/bs_Cyrl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/bs_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/bs_Latn_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ca.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ccp.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ce.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ceb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/cgg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/chr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ckb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/cs.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/cv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/cy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/da.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/dav.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/de.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/de_AT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/de_CH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/dje.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/doi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/dsb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/dua.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/dyo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/dz.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ebu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ee.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/el.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_001.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_150.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_AG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_AI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_AT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_AU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_BB.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_BE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_BM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_BS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_BW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_BZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_CA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_CC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_CH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_CK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_CM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_CX.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_CY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_DE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_DG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_DK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_DM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_ER.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_FI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_FJ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_FK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_FM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_GB.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_GD.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_GG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_GH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_GI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_GM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_GY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_IE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_IL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_IM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_IO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_JE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_JM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_KE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_KI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_KN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_KY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_LC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_LR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_LS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_MG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_MO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_MS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_MT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_MU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_MV.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_MW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_MY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_NA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_NF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_NG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_NH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_NL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_NR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_NU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_NZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_PG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_PN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_PW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_RH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_RW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_SB.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_SC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_SD.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_SE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_SG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_SH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_SI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_SL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_SS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_SX.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_SZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_TC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_TK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_TO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_TT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_TV.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_TZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_UG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_VC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_VG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_VU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_WS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_ZA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_ZM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/en_ZW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/eo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/es.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/es_419.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/es_AR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/es_BO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/es_BR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/es_BZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/es_CL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/es_CO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/es_CR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/es_CU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/es_DO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/es_EC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/es_GT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/es_HN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/es_MX.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/es_NI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/es_PA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/es_PE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/es_PR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/es_PY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/es_SV.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/es_US.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/es_UY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/es_VE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/et.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/eu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ewo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/fa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/fa_AF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ff.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ff_Adlm.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ff_CM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ff_GN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ff_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ff_Latn_CM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ff_Latn_GN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ff_Latn_MR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ff_Latn_SN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ff_MR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ff_SN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/fi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/fil.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/fil_PH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/fo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/fr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/fr_BE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/fr_CA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/fur.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/fy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ga.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/gd.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/gl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/gsw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/gu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/guz.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/gv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ha.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/haw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/he.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/he_IL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/hi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/hi_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/hr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/hsb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/hu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/hy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ia.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/id.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/id_ID.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ig.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ii.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/in.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/in_ID.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/is.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/it.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/iw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/iw_IL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ja.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/jgo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/jmc.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/jv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ka.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/kab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/kam.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/kde.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/kea.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/kgp.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/khq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ki.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/kk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/kkj.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/kl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/kln.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/km.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/kn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ko.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ko_KP.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/kok.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ks.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ks_Arab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ks_Arab_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ks_Deva.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ks_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ksb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ksf.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ksh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ku.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/kw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ky.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/lag.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/lb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/lg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/lkt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ln.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/lo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/lrc.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/lt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/lu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/luo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/luy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/lv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/mai.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/mas.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/mer.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/mfe.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/mg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/mgh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/mgo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/mi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/mk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ml.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/mn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/mni.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/mni_Beng.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/mni_Beng_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/mni_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/mo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/mr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ms.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/mt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/mua.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/my.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/mzn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/naq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/nb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/nd.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ne.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/nl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/nmg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/nn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/nn_NO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/nnh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/no.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/no_NO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/no_NO_NY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/nus.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/nyn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/om.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/or.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/os.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/pa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/pa_Arab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/pa_Arab_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/pa_Guru.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/pa_Guru_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/pa_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/pa_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/pcm.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/pl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ps.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ps_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/pt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/pt_AO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/pt_CH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/pt_CV.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/pt_GQ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/pt_GW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/pt_LU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/pt_MO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/pt_MZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/pt_PT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/pt_ST.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/pt_TL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/qu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/raj.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/rm.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/rn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ro.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ro_MD.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/rof.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/root.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ru.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ru_UA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/rw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/rwk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sah.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/saq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sat.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sat_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sat_Olck.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sat_Olck_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sbp.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sc.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sd.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sd_Arab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sd_Arab_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sd_Deva.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sd_Deva_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sd_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sd_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/se.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/se_FI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/seh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ses.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sh_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sh_CS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sh_YU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/shi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/shi_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/shi_MA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/shi_Tfng.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/shi_Tfng_MA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/si.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/smn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/so.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sr_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sr_CS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sr_Cyrl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sr_Cyrl_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sr_Cyrl_CS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sr_Cyrl_ME.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sr_Cyrl_RS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sr_Cyrl_XK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sr_Cyrl_YU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sr_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sr_Latn_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sr_Latn_CS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sr_Latn_ME.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sr_Latn_RS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sr_Latn_XK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sr_Latn_YU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sr_ME.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sr_RS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sr_XK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sr_YU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/su.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/su_ID.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/su_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/su_Latn_ID.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sw_CD.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/sw_KE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ta.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/te.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/teo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/tg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/th.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ti.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/tk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/tl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/tl_PH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/to.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/tr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/tt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/twq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/tzm.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ug.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/uk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ur.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/ur_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/uz.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/uz_AF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/uz_Arab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/uz_Arab_AF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/uz_Cyrl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/uz_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/uz_Latn_UZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/uz_UZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/vai.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/vai_LR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/vai_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/vai_Vaii.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/vai_Vaii_LR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/vi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/vun.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/wae.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/wo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/xh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/xog.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/yav.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/yi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/yo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/yo_BJ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/yrl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/yrl_CO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/yrl_VE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/yue.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/yue_CN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/yue_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/yue_Hans.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/yue_Hans_CN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/yue_Hant.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/yue_Hant_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/zgh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/zh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/zh_CN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/zh_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/zh_Hans.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/zh_Hans_CN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/zh_Hans_SG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/zh_Hant.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/zh_Hant_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/zh_Hant_MO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/zh_Hant_TW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/zh_MO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/zh_SG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/zh_TW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/region/zu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/sprep/rfc3491.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/sprep/rfc3530cs.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/sprep/rfc3530csci.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/sprep/rfc3530mixp.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/sprep/rfc3722.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/sprep/rfc3920node.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/sprep/rfc3920res.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/sprep/rfc4011.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/sprep/rfc4013.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/sprep/rfc4505.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/sprep/rfc4518.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/sprep/rfc4518ci.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Any_Accents.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Any_Publishing.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Arab_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Beng_Arab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Beng_Deva.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Beng_Gujr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Beng_Guru.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Beng_Knda.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Beng_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Beng_Mlym.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Beng_Orya.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Beng_Taml.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Beng_Telu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Beng_ur.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Bengali_InterIndic.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Cyrl_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Deva_Arab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Deva_Beng.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Deva_Gujr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Deva_Guru.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Deva_Knda.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Deva_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Deva_Mlym.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Deva_Orya.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Deva_Taml.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Deva_Telu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Deva_ur.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Devanagari_InterIndic.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Ethi_Cyrl_Gutgarts.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Ethi_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Ethi_Latn_ALALOC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Ethi_Latn_ALALOC_Geminate.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Ethi_Latn_Aethiopi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Ethi_Latn_Aethiopi_Geminate.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Ethi_Latn_Beta_Metsehaf.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Ethi_Latn_Beta_Metsehaf_Geminate.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Ethi_Latn_ES3842.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Ethi_Latn_IES_JES_1964.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Ethi_Latn_IES_JES_1964_Geminate.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Ethi_Latn_Lambdin.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Ethi_Latn_SERA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Fullwidth_Halfwidth.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Geor_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Grek_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Grek_Latn_UNGEGN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Gujarati_InterIndic.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Gujr_Arab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Gujr_Beng.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Gujr_Deva.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Gujr_Guru.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Gujr_Knda.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Gujr_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Gujr_Mlym.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Gujr_Orya.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Gujr_Taml.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Gujr_Telu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Gujr_ur.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Gurmukhi_InterIndic.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Guru_Arab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Guru_Beng.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Guru_Deva.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Guru_Gujr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Guru_Knda.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Guru_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Guru_Mlym.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Guru_Orya.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Guru_Taml.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Guru_Telu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Guru_ur.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Han_Latin_Names.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Han_Spacedhan.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Hang_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Hani_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Hans_Hant.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Hebr_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Hira_Kana.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Hira_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/InterIndic_Arabic.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/InterIndic_Bengali.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/InterIndic_Devanagari.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/InterIndic_Gujarati.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/InterIndic_Gurmukhi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/InterIndic_Kannada.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/InterIndic_Latin.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/InterIndic_Malayalam.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/InterIndic_Oriya.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/InterIndic_Tamil.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/InterIndic_Telugu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/InterIndic_ur.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Jamo_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Kannada_InterIndic.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Knda_Arab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Knda_Beng.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Knda_Deva.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Knda_Gujr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Knda_Guru.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Knda_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Knda_Mlym.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Knda_Orya.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Knda_Taml.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Knda_Telu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Knda_ur.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Latin_ASCII.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Latin_ConjoiningJamo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Latin_InterIndic.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Latin_NumericPinyin.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Latn_Armn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Latn_Beng.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Latn_Bopo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Latn_Cans.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Latn_Deva.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Latn_Ethi_Williamson.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Latn_Gujr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Latn_Guru.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Latn_Hang.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Latn_Jamo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Latn_Kana.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Latn_Knda.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Latn_Mlym.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Latn_Orya.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Latn_Taml.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Latn_Telu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Latn_Thaa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Latn_Thai.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Malayalam_InterIndic.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Mlym_Arab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Mlym_Beng.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Mlym_Deva.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Mlym_Gujr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Mlym_Guru.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Mlym_Knda.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Mlym_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Mlym_Orya.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Mlym_Taml.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Mlym_Telu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Mlym_ur.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Oriya_InterIndic.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Orya_Arab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Orya_Beng.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Orya_Deva.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Orya_Gujr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Orya_Guru.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Orya_Knda.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Orya_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Orya_Mlym.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Orya_Taml.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Orya_Telu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Orya_ur.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Pinyin_NumericPinyin.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Syrc_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Tamil_InterIndic.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Taml_Arab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Taml_Beng.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Taml_Deva.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Taml_Gujr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Taml_Guru.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Taml_Knda.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Taml_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Taml_Mlym.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Taml_Orya.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Taml_Telu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Taml_ur.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Telu_Arab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Telu_Beng.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Telu_Deva.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Telu_Gujr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Telu_Guru.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Telu_Knda.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Telu_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Telu_Mlym.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Telu_Orya.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Telu_Taml.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Telu_ur.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Telugu_InterIndic.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ThaiLogical_Latin.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Thai_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Thai_ThaiLogical.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Thai_ThaiSemi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/Zawgyi_my.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/am_Ethi_am_Brai.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/am_Ethi_am_Ethi_Geminate.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/am_Ethi_d0_Morse.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/am_am_FONIPA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/am_am_Latn_BGN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/am_ar.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/am_chr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/am_fa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ar_ar_Latn_BGN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/az_Cyrl_az_BGN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/az_Lower.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/az_Title.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/az_Upper.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/be_be_Latn_BGN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/bg_bg_Latn_BGN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/blt_blt_FONIPA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/byn_Ethi_byn_Latn_Tekie_Alibekit.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/byn_Ethi_byn_Latn_Xaleget.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ch_am.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ch_ar.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ch_ch_FONIPA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ch_chr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ch_fa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/chr_chr_FONIPA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/cs_FONIPA_ja.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/cs_FONIPA_ko.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/cs_am.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/cs_ar.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/cs_chr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/cs_cs_FONIPA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/cs_fa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/cs_ja.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/cs_ko.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/cy_cy_FONIPA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/de_ASCII.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/dsb_dsb_FONIPA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/dv_dv_Latn_BGN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/el.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/el_Lower.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/el_Title.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/el_Upper.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/el_el_Latn_BGN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/en.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/eo_am.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/eo_ar.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/eo_chr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/eo_eo_FONIPA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/eo_fa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/es_419_am.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/es_419_ar.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/es_419_chr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/es_419_fa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/es_419_ja.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/es_419_zh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/es_FONIPA_am.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/es_FONIPA_es_419_FONIPA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/es_FONIPA_ja.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/es_FONIPA_zh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/es_am.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/es_ar.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/es_chr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/es_es_FONIPA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/es_fa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/es_ja.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/es_zh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/fa_fa_FONIPA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/fa_fa_Latn_BGN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/gz_Ethi_Sarb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ha_ha_NE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/he_he_Latn_BGN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/hy_AREVMDA_am.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/hy_AREVMDA_ar.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/hy_AREVMDA_chr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/hy_AREVMDA_fa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/hy_AREVMDA_hy_AREVMDA_FONIPA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/hy_am.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/hy_ar.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/hy_chr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/hy_fa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/hy_hy_FONIPA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/hy_hy_Latn_BGN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ia_am.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ia_ar.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ia_chr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ia_fa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ia_ia_FONIPA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/it_am.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/it_ja.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ja_Hrkt_ja_Latn_BGN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ja_Latn_ko.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ja_Latn_ru.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ka_ka_Latn_BGN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ka_ka_Latn_BGN_1981.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/kk_am.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/kk_ar.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/kk_chr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/kk_fa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/kk_kk_FONIPA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/kk_kk_Latn_BGN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ko_ko_Latn_BGN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ky_am.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ky_ar.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ky_chr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ky_fa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ky_ky_FONIPA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ky_ky_Latn_BGN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/la_la_FONIPA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/lt_Lower.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/lt_Title.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/lt_Upper.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/mk_mk_Latn_BGN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/mn_mn_Latn_BGN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/mn_mn_Latn_MNS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/my_Zawgyi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/my_am.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/my_ar.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/my_chr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/my_fa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/my_my_FONIPA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/my_my_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/nl_Title.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/nv_nv_FONIPA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/pl_FONIPA_ja.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/pl_am.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/pl_ar.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/pl_chr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/pl_fa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/pl_ja.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/pl_pl_FONIPA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ps_ps_Latn_BGN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/rm_SURSILV_am.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/rm_SURSILV_ar.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/rm_SURSILV_chr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/rm_SURSILV_fa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/rm_SURSILV_rm_FONIPA_SURSILV.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ro_FONIPA_ja.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ro_am.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ro_ar.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ro_chr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ro_fa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ro_ja.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ro_ro_FONIPA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/root.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ru_Latn_ru_BGN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ru_ja.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ru_ru_Latn_BGN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ru_zh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/sat_Olck_sat_FONIPA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/sat_am.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/sat_ar.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/sat_chr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/sat_fa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/sgw_Ethi_Ethi_Gurage_2013.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/si_am.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/si_ar.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/si_chr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/si_fa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/si_si_FONIPA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/si_si_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/sk_FONIPA_ja.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/sk_am.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/sk_ar.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/sk_chr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/sk_fa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/sk_ja.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/sk_sk_FONIPA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/sr_sr_Latn_BGN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ta_ta_FONIPA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/tk_Cyrl_tk_BGN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/tlh_am.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/tlh_ar.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/tlh_chr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/tlh_fa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/tlh_tlh_FONIPA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/tr_Lower.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/tr_Title.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/tr_Upper.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/ug_ug_FONIPA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/uk_uk_Latn_BGN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/und_FONIPA_ar.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/und_FONIPA_chr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/und_FONIPA_fa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/und_FONIPA_und_FONXSAMP.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/uz_Cyrl_uz_BGN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/uz_Cyrl_uz_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/vec_vec_FONIPA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/xh_am.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/xh_ar.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/xh_chr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/xh_fa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/xh_xh_FONIPA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/yo_yo_BJ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/zh_Latn_PINYIN_ru.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/zu_am.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/zu_ar.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/zu_chr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/zu_fa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/translit/zu_zu_FONIPA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unidata/FractionalUCA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unidata/changes.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unidata/norm2/nfc.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unidata/norm2/nfkc.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unidata/norm2/nfkc_cf.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unidata/ppucd.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/af.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/agq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ak.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/am.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ar.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ar_SA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ars.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/as.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/asa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ast.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/az.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/az_AZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/az_Cyrl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/az_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/az_Latn_AZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/bas.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/be.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/bem.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/bez.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/bg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/bgc.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/bho.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/bm.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/bn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/bn_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/bo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/br.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/brx.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/bs.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/bs_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/bs_Cyrl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/bs_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/bs_Latn_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ca.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ccp.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ce.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ceb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/cgg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/chr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ckb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/cs.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/cv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/cy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/da.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/dav.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/de.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/de_CH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/dje.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/doi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/dsb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/dua.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/dyo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/dz.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ebu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ee.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/el.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_001.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_150.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_AG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_AI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_AT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_AU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_BB.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_BE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_BM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_BS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_BW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_BZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_CA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_CC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_CH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_CK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_CM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_CX.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_CY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_DE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_DG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_DK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_DM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_ER.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_FI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_FJ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_FK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_FM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_GB.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_GD.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_GG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_GH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_GI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_GM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_GY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_IE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_IL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_IM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_IO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_JE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_JM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_KE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_KI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_KN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_KY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_LC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_LR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_LS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_MG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_MO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_MS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_MT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_MU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_MV.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_MW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_MY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_NA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_NF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_NG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_NH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_NL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_NR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_NU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_NZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_PG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_PN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_PW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_RH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_RW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_SB.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_SC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_SD.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_SE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_SG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_SH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_SI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_SL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_SS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_SX.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_SZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_TC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_TK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_TO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_TT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_TV.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_TZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_UG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_VC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_VG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_VU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_WS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_ZA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_ZM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/en_ZW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/eo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/es.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/es_419.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/es_AR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/es_BO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/es_BR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/es_BZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/es_CL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/es_CO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/es_CR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/es_CU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/es_DO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/es_EC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/es_GT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/es_HN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/es_MX.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/es_NI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/es_PA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/es_PE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/es_PR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/es_PY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/es_SV.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/es_US.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/es_UY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/es_VE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/et.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/eu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ewo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/fa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ff.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ff_Adlm.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ff_CM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ff_GN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ff_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ff_Latn_CM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ff_Latn_GN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ff_Latn_MR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ff_Latn_SN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ff_MR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ff_SN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/fi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/fil.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/fil_PH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/fo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/fr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/fr_CA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/fr_HT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/fur.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/fy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ga.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/gd.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/gl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/gsw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/gu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/guz.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/gv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ha.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/haw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/he.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/he_IL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/hi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/hi_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/hr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/hsb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/hu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/hy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ia.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/id.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/id_ID.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ig.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ii.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/in.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/in_ID.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/is.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/it.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/iw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/iw_IL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ja.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/jgo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/jmc.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/jv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ka.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/kab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/kam.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/kde.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/kea.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/kgp.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/khq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ki.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/kk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/kkj.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/kl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/kln.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/km.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/kn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ko.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/kok.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ks.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ks_Arab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ks_Arab_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ks_Deva.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ks_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ksb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ksf.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ksh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ku.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/kw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ky.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/lag.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/lb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/lg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/lkt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ln.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/lo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/lrc.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/lt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/lu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/luo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/luy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/lv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/mai.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/mas.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/mer.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/mfe.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/mg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/mgh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/mgo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/mi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/mk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ml.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/mn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/mni.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/mni_Beng.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/mni_Beng_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/mni_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/mo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/mr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ms.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/mt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/mua.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/my.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/mzn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/naq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/nb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/nd.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ne.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/nl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/nmg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/nn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/nn_NO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/nnh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/no.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/no_NO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/no_NO_NY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/nus.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/nyn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/om.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/or.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/os.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/pa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/pa_Arab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/pa_Arab_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/pa_Guru.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/pa_Guru_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/pa_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/pa_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/pcm.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/pl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ps.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ps_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/pt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/pt_AO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/pt_CH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/pt_CV.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/pt_GQ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/pt_GW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/pt_LU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/pt_MO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/pt_MZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/pt_PT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/pt_ST.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/pt_TL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/qu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/raj.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/rm.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/rn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ro.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ro_MD.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/rof.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/root.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ru.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/rw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/rwk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sah.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/saq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sat.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sat_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sat_Olck.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sat_Olck_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sbp.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sc.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sd.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sd_Arab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sd_Arab_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sd_Deva.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sd_Deva_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sd_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sd_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/se.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/seh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ses.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sh_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sh_CS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sh_YU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/shi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/shi_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/shi_MA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/shi_Tfng.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/shi_Tfng_MA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/si.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/smn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/so.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sr_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sr_CS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sr_Cyrl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sr_Cyrl_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sr_Cyrl_CS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sr_Cyrl_RS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sr_Cyrl_XK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sr_Cyrl_YU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sr_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sr_Latn_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sr_Latn_CS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sr_Latn_ME.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sr_Latn_RS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sr_Latn_YU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sr_ME.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sr_RS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sr_XK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sr_YU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/su.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/su_ID.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/su_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/su_Latn_ID.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sv_FI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/sw_KE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ta.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/te.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/teo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/tg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/th.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ti.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/tk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/tl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/tl_PH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/to.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/tr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/tt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/twq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/tzm.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ug.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/uk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ur.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/ur_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/uz.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/uz_AF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/uz_Arab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/uz_Arab_AF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/uz_Cyrl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/uz_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/uz_Latn_UZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/uz_UZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/vai.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/vai_LR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/vai_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/vai_Vaii.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/vai_Vaii_LR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/vi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/vun.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/wae.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/wo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/xh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/xog.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/yav.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/yi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/yo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/yo_BJ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/yrl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/yrl_CO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/yrl_VE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/yue.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/yue_CN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/yue_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/yue_Hans.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/yue_Hans_CN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/yue_Hant.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/yue_Hant_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/zgh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/zh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/zh_CN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/zh_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/zh_Hans.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/zh_Hans_CN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/zh_Hans_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/zh_Hans_MO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/zh_Hans_SG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/zh_Hant.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/zh_Hant_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/zh_Hant_MO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/zh_Hant_TW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/zh_MO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/zh_SG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/zh_TW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/unit/zu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/af.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/agq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ak.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/am.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ar.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ar_SA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ars.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/as.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/asa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ast.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/az.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/az_AZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/az_Cyrl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/az_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/az_Latn_AZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/bas.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/be.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/bem.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/bez.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/bg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/bgc.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/bho.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/bm.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/bn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/bo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/br.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/brx.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/bs.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/bs_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/bs_Cyrl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/bs_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/bs_Latn_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ca.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ccp.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ce.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ceb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/cgg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/chr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ckb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/cs.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/cv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/cy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/da.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/dav.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/de.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/de_CH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/dje.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/doi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/dsb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/dua.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/dyo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/dz.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ebu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ee.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/el.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_001.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_150.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_AE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_AG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_AI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_AT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_AU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_BB.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_BE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_BM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_BS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_BW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_BZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_CA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_CC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_CH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_CK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_CM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_CX.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_CY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_DE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_DG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_DK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_DM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_ER.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_FI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_FJ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_FK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_FM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_GB.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_GD.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_GG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_GH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_GI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_GM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_GU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_GY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_IE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_IL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_IM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_IO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_JE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_JM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_KE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_KI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_KN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_KY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_LC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_LR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_LS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_MG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_MH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_MO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_MP.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_MS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_MT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_MU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_MV.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_MW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_MY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_NA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_NF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_NG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_NH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_NL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_NR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_NU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_NZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_PG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_PN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_PW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_RH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_RW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_SB.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_SC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_SD.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_SE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_SG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_SH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_SI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_SL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_SS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_SX.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_SZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_TC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_TK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_TO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_TT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_TV.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_TZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_UG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_VC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_VG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_VU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_WS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_ZA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_ZM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/en_ZW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/eo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/es.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/es_419.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/es_AR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/es_BO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/es_BR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/es_BZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/es_CL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/es_CO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/es_CR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/es_CU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/es_DO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/es_EC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/es_GT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/es_HN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/es_MX.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/es_NI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/es_PA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/es_PE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/es_PR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/es_PY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/es_SV.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/es_US.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/es_UY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/es_VE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/et.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/eu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ewo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/fa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ff.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ff_Adlm.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ff_CM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ff_GN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ff_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ff_Latn_CM.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ff_Latn_GN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ff_Latn_MR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ff_Latn_SN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ff_MR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ff_SN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/fi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/fil.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/fil_PH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/fo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/fr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/fr_CA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/fr_GF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/fur.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/fy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ga.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/gd.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/gl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/gsw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/gu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/guz.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/gv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ha.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/haw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/he.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/he_IL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/hi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/hi_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/hr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/hsb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/hu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/hy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ia.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/id.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/id_ID.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ig.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ii.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/in.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/in_ID.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/is.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/it.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/iw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/iw_IL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ja.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/jgo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/jmc.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/jv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ka.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/kab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/kam.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/kde.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/kea.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/kgp.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/khq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ki.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/kk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/kkj.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/kl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/kln.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/km.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/kn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ko.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ko_KP.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/kok.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ks.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ks_Arab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ks_Arab_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ks_Deva.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ks_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ksb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ksf.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ksh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ku.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/kw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ky.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/lag.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/lb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/lg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/lkt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ln.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/lo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/lrc.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/lt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/lu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/luo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/luy.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/lv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/mai.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/mas.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/mer.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/mfe.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/mg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/mgh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/mgo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/mi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/mk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ml.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/mn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/mni.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/mni_Beng.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/mni_Beng_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/mni_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/mo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/mr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ms.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ms_ID.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/mt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/mua.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/my.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/mzn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/naq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/nb.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/nd.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ne.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ne_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/nl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/nl_SR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/nmg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/nn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/nn_NO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/nnh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/no.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/no_NO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/no_NO_NY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/nus.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/nyn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/om.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/or.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/os.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/pa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/pa_Arab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/pa_Arab_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/pa_Guru.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/pa_Guru_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/pa_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/pa_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/pcm.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/pl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ps.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ps_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/pt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/pt_AO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/pt_CH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/pt_CV.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/pt_GQ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/pt_GW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/pt_LU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/pt_MO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/pt_MZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/pt_PT.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/pt_ST.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/pt_TL.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/qu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/qu_BO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/qu_EC.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/raj.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/rm.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/rn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ro.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/rof.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/root.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ru.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/rw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/rwk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sa.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sah.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/saq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sat.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sat_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sat_Olck.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sat_Olck_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sbp.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sc.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sd.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sd_Arab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sd_Arab_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sd_Deva.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sd_Deva_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sd_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sd_PK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/se.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/se_FI.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/seh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ses.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sh_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sh_CS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sh_YU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/shi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/shi_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/shi_MA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/shi_Tfng.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/shi_Tfng_MA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/si.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/smn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/so.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sr_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sr_CS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sr_Cyrl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sr_Cyrl_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sr_Cyrl_CS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sr_Cyrl_RS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sr_Cyrl_XK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sr_Cyrl_YU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sr_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sr_Latn_BA.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sr_Latn_CS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sr_Latn_ME.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sr_Latn_RS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sr_Latn_YU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sr_ME.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sr_RS.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sr_XK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sr_YU.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/su.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/su_ID.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/su_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/su_Latn_ID.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sv.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sw.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/sw_KE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ta.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ta_MY.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ta_SG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/te.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/teo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/tg.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/th.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ti.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/tk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/tl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/tl_PH.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/to.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/tr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/tt.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/twq.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/tzdbNames.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/tzm.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ug.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/uk.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ur.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/ur_IN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/uz.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/uz_AF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/uz_Arab.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/uz_Arab_AF.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/uz_Cyrl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/uz_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/uz_Latn_UZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/uz_UZ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/vai.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/vai_LR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/vai_Latn.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/vai_Vaii.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/vai_Vaii_LR.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/vi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/vun.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/wae.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/wo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/xh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/xog.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/yav.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/yi.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/yo.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/yo_BJ.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/yrl.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/yrl_CO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/yrl_VE.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/yue.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/yue_CN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/yue_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/yue_Hans.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/yue_Hans_CN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/yue_Hant.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/yue_Hant_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/zgh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/zh.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/zh_CN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/zh_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/zh_Hans.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/zh_Hans_CN.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/zh_Hans_SG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/zh_Hant.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/zh_Hant_HK.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/zh_Hant_MO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/zh_Hant_TW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/zh_MO.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/zh_SG.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/zh_TW.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/data/zone/zu.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/extra/scrptrun/scrptrun.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/extra/scrptrun/scrptrun.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/extra/scrptrun/srtest.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/extra/uconv/makedata.mak
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/extra/uconv/pkgdata.inc.in
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/extra/uconv/resources/fr.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/extra/uconv/resources/root.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/extra/uconv/uconv.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/extra/uconv/unicode/uwmsg.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/extra/uconv/uwmsg.c
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/alphaindex.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/anytrans.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/anytrans.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/astro.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/astro.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/basictz.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/bocsu.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/bocsu.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/brktrans.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/brktrans.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/buddhcal.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/buddhcal.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/calendar.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/casetrn.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/casetrn.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/cecal.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/cecal.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/chnsecal.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/chnsecal.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/choicfmt.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/coleitr.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/coll.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collation.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collation.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationbuilder.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationbuilder.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationcompare.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationcompare.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationdata.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationdata.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationdatabuilder.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationdatabuilder.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationdatareader.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationdatareader.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationdatawriter.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationdatawriter.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationfastlatin.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationfastlatin.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationfastlatinbuilder.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationfastlatinbuilder.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationfcd.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationfcd.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationiterator.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationiterator.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationkeys.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationkeys.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationroot.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationroot.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationrootelements.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationrootelements.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationruleparser.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationruleparser.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationsets.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationsets.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationsettings.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationsettings.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationtailoring.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationtailoring.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationweights.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collationweights.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/collunsafe.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/compactdecimalformat.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/coptccal.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/coptccal.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/cpdtrans.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/cpdtrans.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/csdetect.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/csdetect.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/csmatch.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/csmatch.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/csr2022.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/csr2022.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/csrecog.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/csrecog.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/csrmbcs.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/csrmbcs.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/csrsbcs.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/csrsbcs.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/csrucode.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/csrucode.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/csrutf8.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/csrutf8.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/curramt.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/currfmt.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/currfmt.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/currpinf.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/currunit.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/dangical.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/dangical.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/datefmt.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/dayperiodrules.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/dayperiodrules.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/dcfmtsym.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/decContext.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/decContext.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/decNumber.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/decNumber.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/decNumberLocal.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/decimfmt.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/displayoptions.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/double-conversion-bignum-dtoa.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/double-conversion-bignum-dtoa.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/double-conversion-bignum.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/double-conversion-bignum.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/double-conversion-cached-powers.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/double-conversion-cached-powers.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/double-conversion-diy-fp.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/double-conversion-double-to-string.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/double-conversion-double-to-string.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/double-conversion-fast-dtoa.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/double-conversion-fast-dtoa.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/double-conversion-ieee.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/double-conversion-string-to-double.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/double-conversion-string-to-double.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/double-conversion-strtod.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/double-conversion-strtod.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/double-conversion-utils.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/double-conversion.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/dt_impl.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/dtfmtsym.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/dtitv_impl.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/dtitvfmt.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/dtitvinf.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/dtptngen.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/dtptngen_impl.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/dtrule.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/erarules.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/erarules.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/esctrn.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/esctrn.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/ethpccal.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/ethpccal.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/fmtable.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/fmtable_cnv.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/fmtableimp.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/format.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/formatted_string_builder.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/formatted_string_builder.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/formattedval_impl.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/formattedval_iterimpl.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/formattedval_sbimpl.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/formattedvalue.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/fphdlimp.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/fphdlimp.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/fpositer.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/funcrepl.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/funcrepl.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/gender.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/gregocal.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/gregoimp.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/gregoimp.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/hebrwcal.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/hebrwcal.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/i18n.rc
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/indiancal.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/indiancal.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/inputext.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/inputext.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/islamcal.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/islamcal.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/iso8601cal.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/iso8601cal.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/japancal.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/japancal.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/listformatter.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/measfmt.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/measunit.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/measunit_extra.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/measunit_impl.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/measure.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/msgfmt.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/msgfmt_impl.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/name2uni.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/name2uni.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/nfrlist.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/nfrs.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/nfrs.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/nfrule.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/nfrule.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/nfsubs.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/nfsubs.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/nortrans.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/nortrans.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/nultrans.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/nultrans.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_affixutils.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_affixutils.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_asformat.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_asformat.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_capi.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_compact.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_compact.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_currencysymbols.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_currencysymbols.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_decimalquantity.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_decimalquantity.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_decimfmtprops.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_decimfmtprops.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_decnum.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_fluent.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_formatimpl.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_formatimpl.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_grouping.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_integerwidth.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_longnames.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_longnames.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_mapper.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_mapper.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_microprops.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_modifiers.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_modifiers.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_multiplier.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_multiplier.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_notation.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_output.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_padding.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_patternmodifier.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_patternmodifier.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_patternstring.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_patternstring.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_rounding.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_roundingutils.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_scientific.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_scientific.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_simple.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_skeletons.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_skeletons.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_symbolswrapper.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_types.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_usageprefs.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_usageprefs.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_utils.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_utils.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/number_utypes.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/numfmt.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/numparse_affixes.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/numparse_affixes.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/numparse_compositions.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/numparse_compositions.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/numparse_currency.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/numparse_currency.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/numparse_decimal.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/numparse_decimal.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/numparse_impl.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/numparse_impl.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/numparse_parsednumber.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/numparse_scientific.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/numparse_scientific.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/numparse_symbols.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/numparse_symbols.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/numparse_types.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/numparse_utils.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/numparse_validators.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/numparse_validators.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/numrange_capi.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/numrange_fluent.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/numrange_impl.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/numrange_impl.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/numsys.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/numsys_impl.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/olsontz.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/olsontz.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/persncal.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/persncal.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/pluralranges.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/pluralranges.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/plurfmt.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/plurrule.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/plurrule_impl.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/quant.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/quant.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/quantityformatter.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/quantityformatter.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/rbnf.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/rbt.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/rbt.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/rbt_data.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/rbt_data.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/rbt_pars.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/rbt_pars.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/rbt_rule.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/rbt_rule.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/rbt_set.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/rbt_set.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/rbtz.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/regexcmp.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/regexcmp.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/regexcst.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/regexcst.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/regeximp.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/regeximp.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/regexst.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/regexst.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/regextxt.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/regextxt.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/region.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/region_impl.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/reldatefmt.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/reldtfmt.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/reldtfmt.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/rematch.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/remtrans.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/remtrans.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/repattrn.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/rulebasedcollator.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/scientificnumberformatter.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/scriptset.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/scriptset.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/search.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/selfmt.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/selfmtimpl.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/sharedbreakiterator.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/sharedbreakiterator.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/sharedcalendar.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/shareddateformatsymbols.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/sharednumberformat.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/sharedpluralrules.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/simpletz.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/smpdtfmt.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/smpdtfst.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/smpdtfst.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/sortkey.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/standardplural.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/standardplural.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/string_segment.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/string_segment.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/strmatch.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/strmatch.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/strrepl.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/strrepl.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/stsearch.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/taiwncal.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/taiwncal.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/timezone.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/titletrn.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/titletrn.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/tmunit.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/tmutamt.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/tmutfmt.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/tolowtrn.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/tolowtrn.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/toupptrn.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/toupptrn.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/translit.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/transreg.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/transreg.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/tridpars.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/tridpars.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/tzfmt.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/tzgnames.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/tzgnames.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/tznames.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/tznames_impl.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/tznames_impl.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/tzrule.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/tztrans.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/ucal.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/ucln_in.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/ucln_in.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/ucol.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/ucol_imp.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/ucol_res.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/ucol_sit.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/ucoleitr.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/ucsdet.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/udat.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/udateintervalformat.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/udatpg.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/ufieldpositer.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/uitercollationiterator.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/uitercollationiterator.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/ulistformatter.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/ulocdata.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/umsg.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/umsg_imp.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unesctrn.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unesctrn.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/uni2name.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/uni2name.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/alphaindex.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/basictz.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/calendar.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/choicfmt.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/coleitr.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/coll.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/compactdecimalformat.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/curramt.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/currpinf.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/currunit.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/datefmt.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/dcfmtsym.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/decimfmt.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/displayoptions.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/dtfmtsym.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/dtitvfmt.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/dtitvinf.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/dtptngen.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/dtrule.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/fieldpos.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/fmtable.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/format.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/formattednumber.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/formattedvalue.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/fpositer.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/gender.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/gregocal.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/listformatter.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/measfmt.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/measunit.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/measure.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/msgfmt.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/nounit.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/numberformatter.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/numberrangeformatter.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/numfmt.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/numsys.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/plurfmt.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/plurrule.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/rbnf.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/rbtz.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/regex.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/region.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/reldatefmt.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/scientificnumberformatter.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/search.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/selfmt.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/simplenumberformatter.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/simpletz.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/smpdtfmt.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/sortkey.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/stsearch.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/tblcoll.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/timezone.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/tmunit.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/tmutamt.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/tmutfmt.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/translit.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/tzfmt.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/tznames.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/tzrule.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/tztrans.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/ucal.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/ucol.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/ucoleitr.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/ucsdet.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/udat.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/udateintervalformat.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/udatpg.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/udisplayoptions.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/ufieldpositer.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/uformattable.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/uformattednumber.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/uformattedvalue.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/ugender.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/ulistformatter.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/ulocdata.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/umsg.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/unirepl.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/unum.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/unumberformatter.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/unumberoptions.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/unumberrangeformatter.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/unumsys.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/upluralrules.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/uregex.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/uregion.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/ureldatefmt.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/usearch.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/usimplenumberformatter.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/uspoof.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/utmscale.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/utrans.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unicode/vtzone.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/units_complexconverter.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/units_complexconverter.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/units_converter.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/units_converter.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/units_data.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/units_data.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/units_router.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/units_router.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unum.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/unumsys.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/upluralrules.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/uregex.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/uregexc.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/uregion.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/usearch.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/uspoof.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/uspoof_build.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/uspoof_conf.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/uspoof_conf.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/uspoof_impl.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/uspoof_impl.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/usrchimp.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/utf16collationiterator.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/utf16collationiterator.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/utf8collationiterator.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/utf8collationiterator.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/utmscale.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/utrans.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/vtzone.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/vzone.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/vzone.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/windtfmt.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/windtfmt.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/winnmfmt.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/winnmfmt.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/wintzimpl.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/wintzimpl.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/zonemeta.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/zonemeta.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/zrule.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/zrule.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/ztrans.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/i18n/ztrans.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/icudefs.mk.in
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/io/io.rc
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/io/locbund.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/io/locbund.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/io/sprintf.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/io/sscanf.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/io/ucln_io.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/io/ucln_io.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/io/ufile.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/io/ufile.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/io/ufmt_cmn.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/io/ufmt_cmn.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/io/unicode/ustdio.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/io/unicode/ustream.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/io/uprintf.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/io/uprintf.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/io/uprntf_p.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/io/uscanf.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/io/uscanf.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/io/uscanf_p.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/io/ustdio.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/io/ustream.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/python/icutools/databuilder/filtration_schema.json
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/stubdata/stubdata.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/stubdata/stubdata.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/ctestfw/ctest.c
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/ctestfw/datamap.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/ctestfw/testdata.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/ctestfw/tstdtmod.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/ctestfw/ucln_ct.c
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/ctestfw/unicode/ctest.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/ctestfw/unicode/datamap.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/ctestfw/unicode/testdata.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/ctestfw/unicode/testlog.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/ctestfw/unicode/testtype.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/ctestfw/unicode/tstdtmod.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/ctestfw/unicode/uperf.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/ctestfw/unicode/utimer.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/ctestfw/uperf.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/escapesrc/escapesrc.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/escapesrc/expect-simple.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/escapesrc/tblgen.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/escapesrc/test-nochange.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/escapesrc/test-simple.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/genbrk/genbrk.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/genccode/genccode.c
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/gencfu/gencfu.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/gencmn/gencmn.c
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/gencnval/gencnval.c
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/gencolusb/extract_unsafe_backwards.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/gencolusb/verify_uset.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/gendict/gendict.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/gennorm2/extradata.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/gennorm2/extradata.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/gennorm2/gennorm2.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/gennorm2/n2builder.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/gennorm2/n2builder.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/gennorm2/norms.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/gennorm2/norms.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/genrb/derb.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/genrb/errmsg.c
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/genrb/errmsg.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/genrb/filterrb.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/genrb/filterrb.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/genrb/genrb.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/genrb/genrb.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/genrb/parse.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/genrb/parse.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/genrb/prscmnts.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/genrb/prscmnts.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/genrb/rbutil.c
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/genrb/rbutil.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/genrb/read.c
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/genrb/read.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/genrb/reslist.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/genrb/reslist.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/genrb/rle.c
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/genrb/rle.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/genrb/ustr.c
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/genrb/ustr.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/genrb/wrtjava.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/genrb/wrtxml.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/gensprep/gensprep.c
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/gensprep/gensprep.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/gensprep/store.c
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/gentest/genres32.c
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/gentest/gentest.c
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/gentest/gentest.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/icuexportdata/icuexportdata.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/icuinfo/icuinfo.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/icuinfo/icuplugins_windows_sample.txt
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/icuinfo/testplug.c
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/icupkg/icupkg.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/icuswap/icuswap.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/makeconv/gencnvex.c
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/makeconv/genmbcs.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/makeconv/genmbcs.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/makeconv/makeconv.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/makeconv/makeconv.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/makeconv/ucnvstat.c
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/pkgdata/pkgdata.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/pkgdata/pkgtypes.c
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/pkgdata/pkgtypes.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/collationinfo.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/collationinfo.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/dbgutil.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/dbgutil.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/denseranges.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/denseranges.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/filestrm.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/filestrm.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/filetools.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/filetools.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/flagparser.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/flagparser.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/package.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/package.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/pkg_genc.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/pkg_genc.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/pkg_gencmn.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/pkg_gencmn.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/pkg_icu.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/pkg_icu.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/pkg_imp.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/pkgitems.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/ppucd.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/ppucd.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/swapimpl.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/swapimpl.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/toolutil.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/toolutil.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/ucbuf.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/ucbuf.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/ucln_tu.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/ucm.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/ucm.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/ucmstate.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/udbgutil.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/udbgutil.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/unewdata.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/unewdata.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/uoptions.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/uoptions.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/uparse.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/uparse.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/writesrc.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/writesrc.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/xmlparser.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/toolutil/xmlparser.h
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/tzcode/icuregions
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/tzcode/icuzdump.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/tzcode/icuzones
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/tzcode/tz2icu.cpp
+ORIGIN: http://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/tools/tzcode/tz2icu.h
+ORIGIN: http://www.unicode.org/copyright.html#License referenced by ../../../flutter/third_party/icu/source/data/brkitr/ja.txt
+ORIGIN: http://www.unicode.org/copyright.html#License referenced by ../../../flutter/third_party/icu/source/data/brkitr/root.txt
+ORIGIN: http://www.unicode.org/copyright.html#License referenced by ../../../flutter/third_party/icu/source/data/brkitr/zh.txt
+ORIGIN: http://www.unicode.org/copyright.html#License referenced by ../../../flutter/third_party/icu/source/data/brkitr/zh_Hant.txt
+ORIGIN: http://www.unicode.org/copyright.html#License referenced by ../../../flutter/third_party/icu/source/data/coll/de_.txt
+ORIGIN: http://www.unicode.org/copyright.html#License referenced by ../../../flutter/third_party/icu/source/data/coll/de__PHONEBOOK.txt
+ORIGIN: http://www.unicode.org/copyright.html#License referenced by ../../../flutter/third_party/icu/source/data/coll/es_.txt
+ORIGIN: http://www.unicode.org/copyright.html#License referenced by ../../../flutter/third_party/icu/source/data/coll/es__TRADITIONAL.txt
+ORIGIN: http://www.unicode.org/terms_of_use.html referenced by ../../../flutter/third_party/web_unicode/properties/LineBreak.txt
+ORIGIN: http://www.unicode.org/terms_of_use.html referenced by ../../../flutter/third_party/web_unicode/properties/WordBreakProperty.txt
+ORIGIN: https://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/emojiprops.cpp
+ORIGIN: https://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/icu/source/common/emojiprops.h
+ORIGIN: https://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/web_unicode/lib/web_unicode/codegen/line_break_properties.dart
+ORIGIN: https://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/web_unicode/lib/web_unicode/codegen/word_break_properties.dart
+ORIGIN: https://www.unicode.org/copyright.html referenced by ../../../flutter/third_party/web_unicode/tool/unicode_sync_script.dart
+ORIGIN: https://www.unicode.org/terms_of_use.html referenced by ../../../flutter/third_party/harfbuzz/src/hb-unicode-emoji-table.hh
+ORIGIN: https://www.unicode.org/terms_of_use.html referenced by ../../../flutter/third_party/icu/source/data/unidata/CaseFolding.txt
+ORIGIN: https://www.unicode.org/terms_of_use.html referenced by ../../../flutter/third_party/icu/source/data/unidata/DerivedCoreProperties.txt
+ORIGIN: https://www.unicode.org/terms_of_use.html referenced by ../../../flutter/third_party/icu/source/data/unidata/DerivedNormalizationProps.txt
+ORIGIN: https://www.unicode.org/terms_of_use.html referenced by ../../../flutter/third_party/icu/source/data/unidata/NormalizationCorrections.txt
+ORIGIN: https://www.unicode.org/terms_of_use.html referenced by ../../../flutter/third_party/icu/source/data/unidata/NormalizationTest.txt
+ORIGIN: https://www.unicode.org/terms_of_use.html referenced by ../../../flutter/third_party/icu/source/data/unidata/SpecialCasing.txt
+ORIGIN: https://www.unicode.org/terms_of_use.html referenced by ../../../flutter/third_party/icu/source/data/unidata/UCARules.txt
+ORIGIN: https://www.unicode.org/terms_of_use.html referenced by ../../../flutter/third_party/icu/source/data/unidata/confusables.txt
+ORIGIN: https://www.unicode.org/terms_of_use.html referenced by ../../../flutter/third_party/icu/source/data/unidata/emoji-sequences.txt
+ORIGIN: https://www.unicode.org/terms_of_use.html referenced by ../../../flutter/third_party/icu/source/data/unidata/emoji-zwj-sequences.txt
+ORIGIN: https://www.unicode.org/terms_of_use.html referenced by ../../../flutter/third_party/icu/source/data/unidata/norm2/uts46.txt
+TYPE: LicenseType.unicode
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-unicode-emoji-table.hh
+FILE: ../../../flutter/third_party/icu/APIChangeReport.html
+FILE: ../../../flutter/third_party/icu/source/Doxyfile.in
+FILE: ../../../flutter/third_party/icu/source/common/appendable.cpp
+FILE: ../../../flutter/third_party/icu/source/common/bmpset.cpp
+FILE: ../../../flutter/third_party/icu/source/common/bmpset.h
+FILE: ../../../flutter/third_party/icu/source/common/brkeng.cpp
+FILE: ../../../flutter/third_party/icu/source/common/brkeng.h
+FILE: ../../../flutter/third_party/icu/source/common/brkiter.cpp
+FILE: ../../../flutter/third_party/icu/source/common/bytesinkutil.cpp
+FILE: ../../../flutter/third_party/icu/source/common/bytesinkutil.h
+FILE: ../../../flutter/third_party/icu/source/common/bytestream.cpp
+FILE: ../../../flutter/third_party/icu/source/common/bytestrie.cpp
+FILE: ../../../flutter/third_party/icu/source/common/bytestriebuilder.cpp
+FILE: ../../../flutter/third_party/icu/source/common/bytestrieiterator.cpp
+FILE: ../../../flutter/third_party/icu/source/common/caniter.cpp
+FILE: ../../../flutter/third_party/icu/source/common/capi_helper.h
+FILE: ../../../flutter/third_party/icu/source/common/characterproperties.cpp
+FILE: ../../../flutter/third_party/icu/source/common/chariter.cpp
+FILE: ../../../flutter/third_party/icu/source/common/charstr.cpp
+FILE: ../../../flutter/third_party/icu/source/common/charstr.h
+FILE: ../../../flutter/third_party/icu/source/common/charstrmap.h
+FILE: ../../../flutter/third_party/icu/source/common/cmemory.cpp
+FILE: ../../../flutter/third_party/icu/source/common/cmemory.h
+FILE: ../../../flutter/third_party/icu/source/common/common.rc
+FILE: ../../../flutter/third_party/icu/source/common/cpputils.h
+FILE: ../../../flutter/third_party/icu/source/common/cstr.cpp
+FILE: ../../../flutter/third_party/icu/source/common/cstr.h
+FILE: ../../../flutter/third_party/icu/source/common/cstring.cpp
+FILE: ../../../flutter/third_party/icu/source/common/cstring.h
+FILE: ../../../flutter/third_party/icu/source/common/cwchar.cpp
+FILE: ../../../flutter/third_party/icu/source/common/cwchar.h
+FILE: ../../../flutter/third_party/icu/source/common/dictbe.cpp
+FILE: ../../../flutter/third_party/icu/source/common/dictbe.h
+FILE: ../../../flutter/third_party/icu/source/common/dictionarydata.cpp
+FILE: ../../../flutter/third_party/icu/source/common/dictionarydata.h
+FILE: ../../../flutter/third_party/icu/source/common/dtintrv.cpp
+FILE: ../../../flutter/third_party/icu/source/common/edits.cpp
+FILE: ../../../flutter/third_party/icu/source/common/emojiprops.cpp
+FILE: ../../../flutter/third_party/icu/source/common/emojiprops.h
+FILE: ../../../flutter/third_party/icu/source/common/errorcode.cpp
+FILE: ../../../flutter/third_party/icu/source/common/filteredbrk.cpp
+FILE: ../../../flutter/third_party/icu/source/common/filterednormalizer2.cpp
+FILE: ../../../flutter/third_party/icu/source/common/hash.h
+FILE: ../../../flutter/third_party/icu/source/common/icudataver.cpp
+FILE: ../../../flutter/third_party/icu/source/common/icuplug.cpp
+FILE: ../../../flutter/third_party/icu/source/common/icuplugimp.h
+FILE: ../../../flutter/third_party/icu/source/common/loadednormalizer2impl.cpp
+FILE: ../../../flutter/third_party/icu/source/common/localebuilder.cpp
+FILE: ../../../flutter/third_party/icu/source/common/localefallback_data.h
+FILE: ../../../flutter/third_party/icu/source/common/localematcher.cpp
+FILE: ../../../flutter/third_party/icu/source/common/localeprioritylist.cpp
+FILE: ../../../flutter/third_party/icu/source/common/localeprioritylist.h
+FILE: ../../../flutter/third_party/icu/source/common/localsvc.h
+FILE: ../../../flutter/third_party/icu/source/common/locavailable.cpp
+FILE: ../../../flutter/third_party/icu/source/common/locbased.cpp
+FILE: ../../../flutter/third_party/icu/source/common/locbased.h
+FILE: ../../../flutter/third_party/icu/source/common/locdispnames.cpp
+FILE: ../../../flutter/third_party/icu/source/common/locdistance.cpp
+FILE: ../../../flutter/third_party/icu/source/common/locdistance.h
+FILE: ../../../flutter/third_party/icu/source/common/locdspnm.cpp
+FILE: ../../../flutter/third_party/icu/source/common/locid.cpp
+FILE: ../../../flutter/third_party/icu/source/common/loclikely.cpp
+FILE: ../../../flutter/third_party/icu/source/common/loclikelysubtags.cpp
+FILE: ../../../flutter/third_party/icu/source/common/loclikelysubtags.h
+FILE: ../../../flutter/third_party/icu/source/common/locmap.cpp
+FILE: ../../../flutter/third_party/icu/source/common/locmap.h
+FILE: ../../../flutter/third_party/icu/source/common/locresdata.cpp
+FILE: ../../../flutter/third_party/icu/source/common/locutil.cpp
+FILE: ../../../flutter/third_party/icu/source/common/locutil.h
+FILE: ../../../flutter/third_party/icu/source/common/lsr.cpp
+FILE: ../../../flutter/third_party/icu/source/common/lsr.h
+FILE: ../../../flutter/third_party/icu/source/common/lstmbe.cpp
+FILE: ../../../flutter/third_party/icu/source/common/lstmbe.h
+FILE: ../../../flutter/third_party/icu/source/common/messageimpl.h
+FILE: ../../../flutter/third_party/icu/source/common/messagepattern.cpp
+FILE: ../../../flutter/third_party/icu/source/common/mlbe.cpp
+FILE: ../../../flutter/third_party/icu/source/common/mlbe.h
+FILE: ../../../flutter/third_party/icu/source/common/msvcres.h
+FILE: ../../../flutter/third_party/icu/source/common/mutex.h
+FILE: ../../../flutter/third_party/icu/source/common/norm2_nfc_data.h
+FILE: ../../../flutter/third_party/icu/source/common/norm2allmodes.h
+FILE: ../../../flutter/third_party/icu/source/common/normalizer2.cpp
+FILE: ../../../flutter/third_party/icu/source/common/normalizer2impl.cpp
+FILE: ../../../flutter/third_party/icu/source/common/normalizer2impl.h
+FILE: ../../../flutter/third_party/icu/source/common/normlzr.cpp
+FILE: ../../../flutter/third_party/icu/source/common/parsepos.cpp
+FILE: ../../../flutter/third_party/icu/source/common/patternprops.cpp
+FILE: ../../../flutter/third_party/icu/source/common/patternprops.h
+FILE: ../../../flutter/third_party/icu/source/common/pluralmap.cpp
+FILE: ../../../flutter/third_party/icu/source/common/pluralmap.h
+FILE: ../../../flutter/third_party/icu/source/common/propname.cpp
+FILE: ../../../flutter/third_party/icu/source/common/propname.h
+FILE: ../../../flutter/third_party/icu/source/common/propname_data.h
+FILE: ../../../flutter/third_party/icu/source/common/propsvec.cpp
+FILE: ../../../flutter/third_party/icu/source/common/propsvec.h
+FILE: ../../../flutter/third_party/icu/source/common/punycode.cpp
+FILE: ../../../flutter/third_party/icu/source/common/punycode.h
+FILE: ../../../flutter/third_party/icu/source/common/putil.cpp
+FILE: ../../../flutter/third_party/icu/source/common/putilimp.h
+FILE: ../../../flutter/third_party/icu/source/common/rbbi.cpp
+FILE: ../../../flutter/third_party/icu/source/common/rbbi_cache.cpp
+FILE: ../../../flutter/third_party/icu/source/common/rbbi_cache.h
+FILE: ../../../flutter/third_party/icu/source/common/rbbidata.cpp
+FILE: ../../../flutter/third_party/icu/source/common/rbbidata.h
+FILE: ../../../flutter/third_party/icu/source/common/rbbinode.cpp
+FILE: ../../../flutter/third_party/icu/source/common/rbbinode.h
+FILE: ../../../flutter/third_party/icu/source/common/rbbirb.cpp
+FILE: ../../../flutter/third_party/icu/source/common/rbbirb.h
+FILE: ../../../flutter/third_party/icu/source/common/rbbirpt.h
+FILE: ../../../flutter/third_party/icu/source/common/rbbirpt.txt
+FILE: ../../../flutter/third_party/icu/source/common/rbbiscan.cpp
+FILE: ../../../flutter/third_party/icu/source/common/rbbiscan.h
+FILE: ../../../flutter/third_party/icu/source/common/rbbisetb.cpp
+FILE: ../../../flutter/third_party/icu/source/common/rbbisetb.h
+FILE: ../../../flutter/third_party/icu/source/common/rbbistbl.cpp
+FILE: ../../../flutter/third_party/icu/source/common/rbbitblb.cpp
+FILE: ../../../flutter/third_party/icu/source/common/rbbitblb.h
+FILE: ../../../flutter/third_party/icu/source/common/resbund.cpp
+FILE: ../../../flutter/third_party/icu/source/common/resbund_cnv.cpp
+FILE: ../../../flutter/third_party/icu/source/common/resource.cpp
+FILE: ../../../flutter/third_party/icu/source/common/resource.h
+FILE: ../../../flutter/third_party/icu/source/common/restrace.cpp
+FILE: ../../../flutter/third_party/icu/source/common/restrace.h
+FILE: ../../../flutter/third_party/icu/source/common/ruleiter.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ruleiter.h
+FILE: ../../../flutter/third_party/icu/source/common/schriter.cpp
+FILE: ../../../flutter/third_party/icu/source/common/serv.cpp
+FILE: ../../../flutter/third_party/icu/source/common/serv.h
+FILE: ../../../flutter/third_party/icu/source/common/servlk.cpp
+FILE: ../../../flutter/third_party/icu/source/common/servlkf.cpp
+FILE: ../../../flutter/third_party/icu/source/common/servloc.h
+FILE: ../../../flutter/third_party/icu/source/common/servls.cpp
+FILE: ../../../flutter/third_party/icu/source/common/servnotf.cpp
+FILE: ../../../flutter/third_party/icu/source/common/servnotf.h
+FILE: ../../../flutter/third_party/icu/source/common/servrbf.cpp
+FILE: ../../../flutter/third_party/icu/source/common/servslkf.cpp
+FILE: ../../../flutter/third_party/icu/source/common/sharedobject.cpp
+FILE: ../../../flutter/third_party/icu/source/common/sharedobject.h
+FILE: ../../../flutter/third_party/icu/source/common/simpleformatter.cpp
+FILE: ../../../flutter/third_party/icu/source/common/sprpimpl.h
+FILE: ../../../flutter/third_party/icu/source/common/static_unicode_sets.cpp
+FILE: ../../../flutter/third_party/icu/source/common/static_unicode_sets.h
+FILE: ../../../flutter/third_party/icu/source/common/stringpiece.cpp
+FILE: ../../../flutter/third_party/icu/source/common/stringtriebuilder.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uarrsort.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uarrsort.h
+FILE: ../../../flutter/third_party/icu/source/common/uassert.h
+FILE: ../../../flutter/third_party/icu/source/common/ubidi.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ubidi_props.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ubidi_props.h
+FILE: ../../../flutter/third_party/icu/source/common/ubidi_props_data.h
+FILE: ../../../flutter/third_party/icu/source/common/ubidiimp.h
+FILE: ../../../flutter/third_party/icu/source/common/ubidiln.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ubiditransform.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ubidiwrt.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ubrk.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ubrkimpl.h
+FILE: ../../../flutter/third_party/icu/source/common/ucase.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucase.h
+FILE: ../../../flutter/third_party/icu/source/common/ucase_props_data.h
+FILE: ../../../flutter/third_party/icu/source/common/ucasemap.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucasemap_imp.h
+FILE: ../../../flutter/third_party/icu/source/common/ucasemap_titlecase_brkiter.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucat.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uchar.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uchar_props_data.h
+FILE: ../../../flutter/third_party/icu/source/common/ucharstrie.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucharstriebuilder.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucharstrieiterator.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uchriter.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucln.h
+FILE: ../../../flutter/third_party/icu/source/common/ucln_cmn.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucln_cmn.h
+FILE: ../../../flutter/third_party/icu/source/common/ucln_imp.h
+FILE: ../../../flutter/third_party/icu/source/common/ucmndata.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucmndata.h
+FILE: ../../../flutter/third_party/icu/source/common/ucnv.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnv2022.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_bld.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_bld.h
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_cb.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_cnv.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_cnv.h
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_ct.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_err.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_ext.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_ext.h
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_imp.h
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_io.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_io.h
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_lmb.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_set.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_u16.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_u32.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_u7.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnv_u8.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnvbocu.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnvdisp.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnvhz.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnvisci.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnvlat1.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnvmbcs.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnvmbcs.h
+FILE: ../../../flutter/third_party/icu/source/common/ucnvscsu.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucnvsel.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucol_data.h
+FILE: ../../../flutter/third_party/icu/source/common/ucol_swp.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucol_swp.h
+FILE: ../../../flutter/third_party/icu/source/common/ucptrie.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucptrie_impl.h
+FILE: ../../../flutter/third_party/icu/source/common/ucurr.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ucurrimp.h
+FILE: ../../../flutter/third_party/icu/source/common/udata.cpp
+FILE: ../../../flutter/third_party/icu/source/common/udatamem.cpp
+FILE: ../../../flutter/third_party/icu/source/common/udatamem.h
+FILE: ../../../flutter/third_party/icu/source/common/udataswp.cpp
+FILE: ../../../flutter/third_party/icu/source/common/udataswp.h
+FILE: ../../../flutter/third_party/icu/source/common/uelement.h
+FILE: ../../../flutter/third_party/icu/source/common/uenum.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uenumimp.h
+FILE: ../../../flutter/third_party/icu/source/common/uhash.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uhash.h
+FILE: ../../../flutter/third_party/icu/source/common/uhash_us.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uidna.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uinit.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uinvchar.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uinvchar.h
+FILE: ../../../flutter/third_party/icu/source/common/uiter.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ulayout_props.h
+FILE: ../../../flutter/third_party/icu/source/common/ulist.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ulist.h
+FILE: ../../../flutter/third_party/icu/source/common/uloc.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uloc_keytype.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uloc_tag.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ulocimp.h
+FILE: ../../../flutter/third_party/icu/source/common/umapfile.cpp
+FILE: ../../../flutter/third_party/icu/source/common/umapfile.h
+FILE: ../../../flutter/third_party/icu/source/common/umath.cpp
+FILE: ../../../flutter/third_party/icu/source/common/umutablecptrie.cpp
+FILE: ../../../flutter/third_party/icu/source/common/umutex.cpp
+FILE: ../../../flutter/third_party/icu/source/common/umutex.h
+FILE: ../../../flutter/third_party/icu/source/common/unames.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unicode/appendable.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/brkiter.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/bytestream.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/bytestrie.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/bytestriebuilder.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/caniter.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/casemap.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/char16ptr.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/chariter.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/dbbi.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/docmain.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/dtintrv.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/edits.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/enumset.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/errorcode.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/filteredbrk.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/icudataver.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/icuplug.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/idna.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/localebuilder.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/localematcher.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/localpointer.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/locdspnm.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/locid.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/messagepattern.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/normalizer2.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/normlzr.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/parseerr.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/parsepos.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/platform.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ptypes.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/putil.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/rbbi.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/rep.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/resbund.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/schriter.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/simpleformatter.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/std_string.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/strenum.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/stringoptions.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/stringpiece.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/stringtriebuilder.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/symtable.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ubidi.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ubiditransform.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ubrk.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ucasemap.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ucat.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/uchar.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ucharstrie.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ucharstriebuilder.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/uchriter.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/uclean.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ucnv.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ucnv_cb.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ucnv_err.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ucnvsel.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/uconfig.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ucpmap.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ucptrie.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ucurr.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/udata.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/udisplaycontext.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/uenum.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/uidna.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/uiter.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/uldnames.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/uloc.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/umachine.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/umisc.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/umutablecptrie.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/unifilt.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/unifunct.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/unimatch.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/uniset.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/unistr.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/unorm.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/unorm2.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/uobject.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/urename.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/urep.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ures.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/uscript.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/uset.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/usetiter.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ushape.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/usprep.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ustring.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/ustringtrie.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/utext.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/utf.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/utf16.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/utf32.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/utf8.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/utf_old.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/utrace.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/utypes.h
+FILE: ../../../flutter/third_party/icu/source/common/unicode/uversion.h
+FILE: ../../../flutter/third_party/icu/source/common/unifiedcache.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unifiedcache.h
+FILE: ../../../flutter/third_party/icu/source/common/unifilt.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unifunct.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uniquecharstr.h
+FILE: ../../../flutter/third_party/icu/source/common/uniset.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uniset_closure.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uniset_props.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unisetspan.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unisetspan.h
+FILE: ../../../flutter/third_party/icu/source/common/unistr.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unistr_case.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unistr_case_locale.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unistr_cnv.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unistr_props.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unistr_titlecase_brkiter.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unistrappender.h
+FILE: ../../../flutter/third_party/icu/source/common/unorm.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unormcmp.cpp
+FILE: ../../../flutter/third_party/icu/source/common/unormimp.h
+FILE: ../../../flutter/third_party/icu/source/common/uobject.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uposixdefs.h
+FILE: ../../../flutter/third_party/icu/source/common/uprops.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uprops.h
+FILE: ../../../flutter/third_party/icu/source/common/ures_cnv.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uresbund.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uresdata.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uresdata.h
+FILE: ../../../flutter/third_party/icu/source/common/uresimp.h
+FILE: ../../../flutter/third_party/icu/source/common/ureslocs.h
+FILE: ../../../flutter/third_party/icu/source/common/usc_impl.cpp
+FILE: ../../../flutter/third_party/icu/source/common/usc_impl.h
+FILE: ../../../flutter/third_party/icu/source/common/uscript.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uscript_props.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uset.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uset_imp.h
+FILE: ../../../flutter/third_party/icu/source/common/uset_props.cpp
+FILE: ../../../flutter/third_party/icu/source/common/usetiter.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ushape.cpp
+FILE: ../../../flutter/third_party/icu/source/common/usprep.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ustack.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ustr_cnv.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ustr_cnv.h
+FILE: ../../../flutter/third_party/icu/source/common/ustr_imp.h
+FILE: ../../../flutter/third_party/icu/source/common/ustr_titlecase_brkiter.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ustr_wcs.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ustrcase.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ustrcase_locale.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ustrenum.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ustrenum.h
+FILE: ../../../flutter/third_party/icu/source/common/ustrfmt.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ustrfmt.h
+FILE: ../../../flutter/third_party/icu/source/common/ustring.cpp
+FILE: ../../../flutter/third_party/icu/source/common/ustrtrns.cpp
+FILE: ../../../flutter/third_party/icu/source/common/utext.cpp
+FILE: ../../../flutter/third_party/icu/source/common/utf_impl.cpp
+FILE: ../../../flutter/third_party/icu/source/common/util.cpp
+FILE: ../../../flutter/third_party/icu/source/common/util.h
+FILE: ../../../flutter/third_party/icu/source/common/util_props.cpp
+FILE: ../../../flutter/third_party/icu/source/common/utrace.cpp
+FILE: ../../../flutter/third_party/icu/source/common/utracimp.h
+FILE: ../../../flutter/third_party/icu/source/common/utrie.cpp
+FILE: ../../../flutter/third_party/icu/source/common/utrie.h
+FILE: ../../../flutter/third_party/icu/source/common/utrie2.cpp
+FILE: ../../../flutter/third_party/icu/source/common/utrie2.h
+FILE: ../../../flutter/third_party/icu/source/common/utrie2_builder.cpp
+FILE: ../../../flutter/third_party/icu/source/common/utrie2_impl.h
+FILE: ../../../flutter/third_party/icu/source/common/utrie_swap.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uts46.cpp
+FILE: ../../../flutter/third_party/icu/source/common/utypeinfo.h
+FILE: ../../../flutter/third_party/icu/source/common/utypes.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uvector.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uvector.h
+FILE: ../../../flutter/third_party/icu/source/common/uvectr32.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uvectr32.h
+FILE: ../../../flutter/third_party/icu/source/common/uvectr64.cpp
+FILE: ../../../flutter/third_party/icu/source/common/uvectr64.h
+FILE: ../../../flutter/third_party/icu/source/common/wintz.cpp
+FILE: ../../../flutter/third_party/icu/source/common/wintz.h
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/adaboost/jaml.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/de.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/dictionaries/thaidict.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/el.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/en.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/en_US.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/en_US_POSIX.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/es.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/fi.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/fr.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/it.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/ja.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/ko.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/lstm/Burmese_codepoints_exclusive_model4_heavy.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/lstm/Burmese_codepoints_exclusive_model5_heavy.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/lstm/Burmese_codepoints_exclusive_model7_heavy.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/lstm/Burmese_graphclust_model4_heavy.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/lstm/Burmese_graphclust_model5_heavy.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/lstm/Burmese_graphclust_model7_heavy.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/lstm/Thai_codepoints_exclusive_model4_heavy.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/lstm/Thai_codepoints_exclusive_model5_heavy.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/lstm/Thai_codepoints_exclusive_model7_heavy.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/lstm/Thai_graphclust_model4_heavy.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/lstm/Thai_graphclust_model5_heavy.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/lstm/Thai_graphclust_model7_heavy.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/pt.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/root.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/ru.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/rules/char.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/rules/line.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/rules/line_cj.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/rules/line_loose.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/rules/line_loose_cj.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/rules/line_loose_phrase_cj.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/rules/line_normal.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/rules/line_normal_cj.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/rules/line_normal_phrase_cj.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/rules/line_phrase_cj.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/rules/sent.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/rules/sent_el.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/rules/title.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/rules/word.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/rules/word_POSIX.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/rules/word_fi_sv.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/sv.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/zh.txt
+FILE: ../../../flutter/third_party/icu/source/data/brkitr/zh_Hant.txt
+FILE: ../../../flutter/third_party/icu/source/data/cldr-icu-readme.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/af.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/am.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/ar.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/ar_SA.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/ars.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/as.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/az.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/be.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/bg.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/bn.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/bo.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/br.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/bs.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/bs_Cyrl.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/ca.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/ceb.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/chr.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/cs.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/cy.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/da.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/de.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/de_.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/de_AT.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/de__PHONEBOOK.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/dsb.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/dz.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/ee.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/el.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/en.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/en_US.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/en_US_POSIX.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/eo.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/es.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/es_.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/es__TRADITIONAL.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/et.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/fa.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/fa_AF.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/ff.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/ff_Adlm.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/fi.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/fil.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/fo.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/fr.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/fr_CA.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/fy.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/ga.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/gl.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/gu.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/ha.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/haw.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/he.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/he_IL.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/hi.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/hr.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/hsb.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/hu.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/hy.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/id.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/id_ID.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/ig.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/in.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/in_ID.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/is.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/it.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/iw.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/iw_IL.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/ja.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/ka.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/kk.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/kl.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/km.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/kn.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/ko.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/kok.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/ku.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/ky.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/lb.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/lkt.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/ln.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/lo.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/lt.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/lv.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/mk.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/ml.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/mn.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/mo.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/mr.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/ms.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/mt.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/my.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/nb.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/nb_NO.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/ne.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/nl.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/nn.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/no.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/no_NO.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/om.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/or.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/pa.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/pa_Guru.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/pa_Guru_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/pa_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/pl.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/ps.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/pt.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/ro.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/root.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/ru.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/sa.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/se.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/sh.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/sh_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/sh_CS.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/sh_YU.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/si.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/sk.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/sl.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/smn.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/sq.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/sr.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/sr_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/sr_Cyrl.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/sr_Cyrl_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/sr_Cyrl_ME.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/sr_Cyrl_RS.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/sr_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/sr_Latn_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/sr_Latn_RS.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/sr_ME.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/sr_RS.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/sv.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/sw.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/ta.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/te.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/th.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/tk.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/to.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/tr.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/ug.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/uk.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/ur.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/uz.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/vi.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/wae.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/wo.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/xh.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/yi.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/yo.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/yue.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/yue_CN.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/yue_Hans.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/yue_Hans_CN.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/yue_Hant.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/zh.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/zh_CN.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/zh_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/zh_Hans.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/zh_Hans_CN.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/zh_Hans_SG.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/zh_Hant.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/zh_Hant_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/zh_Hant_MO.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/zh_Hant_TW.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/zh_MO.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/zh_SG.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/zh_TW.txt
+FILE: ../../../flutter/third_party/icu/source/data/coll/zu.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/af.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/af_NA.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/agq.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ak.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/am.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ar.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ar_AE.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ar_DJ.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ar_ER.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ar_KM.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ar_LB.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ar_SA.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ar_SO.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ar_SS.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ars.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/as.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/asa.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ast.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/az.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/az_AZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/az_Cyrl.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/az_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/az_Latn_AZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/bas.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/be.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/bem.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/bez.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/bg.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/bgc.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/bho.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/bm.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/bn.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/bn_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/bo.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/bo_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/br.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/brx.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/bs.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/bs_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/bs_Cyrl.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/bs_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/bs_Latn_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ca.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ca_FR.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ccp.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ce.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ceb.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/cgg.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/chr.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ckb.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/cs.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/cv.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/cy.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/da.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/dav.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/de.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/de_CH.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/de_LI.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/de_LU.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/dje.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/doi.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/dsb.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/dua.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/dyo.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/dz.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ebu.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ee.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/el.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_001.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_150.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_AE.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_AG.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_AI.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_AT.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_AU.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_BB.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_BE.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_BI.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_BM.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_BS.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_BW.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_BZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_CA.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_CC.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_CH.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_CK.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_CM.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_CX.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_CY.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_DE.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_DG.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_DK.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_DM.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_ER.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_FI.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_FJ.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_FK.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_FM.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_GB.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_GD.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_GG.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_GH.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_GI.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_GM.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_GY.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_IE.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_IL.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_IM.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_IO.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_JE.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_JM.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_KE.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_KI.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_KN.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_KY.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_LC.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_LR.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_LS.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_MG.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_MO.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_MS.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_MT.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_MU.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_MV.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_MW.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_MY.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_NA.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_NF.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_NG.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_NH.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_NL.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_NR.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_NU.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_NZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_PG.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_PH.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_PN.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_PW.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_RH.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_RW.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_SB.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_SC.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_SD.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_SE.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_SG.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_SH.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_SI.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_SL.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_SS.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_SX.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_SZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_TC.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_TK.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_TO.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_TT.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_TV.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_TZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_UG.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_VC.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_VG.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_VU.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_WS.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_ZA.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_ZM.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/en_ZW.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/eo.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/es.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/es_419.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/es_AR.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/es_BO.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/es_BR.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/es_BZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/es_CL.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/es_CO.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/es_CR.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/es_CU.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/es_DO.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/es_EC.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/es_GQ.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/es_GT.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/es_HN.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/es_MX.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/es_NI.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/es_PA.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/es_PE.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/es_PH.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/es_PR.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/es_PY.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/es_SV.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/es_US.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/es_UY.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/es_VE.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/et.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/eu.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ewo.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/fa.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/fa_AF.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ff.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ff_Adlm.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ff_Adlm_BF.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ff_Adlm_CM.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ff_Adlm_GH.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ff_Adlm_GM.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ff_Adlm_GW.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ff_Adlm_LR.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ff_Adlm_MR.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ff_Adlm_NE.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ff_Adlm_NG.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ff_Adlm_SL.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ff_Adlm_SN.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ff_CM.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ff_GN.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ff_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ff_Latn_CM.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ff_Latn_GH.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ff_Latn_GM.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ff_Latn_GN.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ff_Latn_LR.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ff_Latn_MR.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ff_Latn_NG.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ff_Latn_SL.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ff_Latn_SN.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ff_MR.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ff_SN.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/fi.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/fil.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/fil_PH.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/fo.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/fo_DK.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/fr.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/fr_BI.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/fr_CA.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/fr_CD.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/fr_DJ.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/fr_DZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/fr_GN.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/fr_HT.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/fr_KM.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/fr_LU.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/fr_MG.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/fr_MR.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/fr_MU.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/fr_RW.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/fr_SC.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/fr_SY.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/fr_TN.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/fr_VU.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/fur.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/fy.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ga.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/gd.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/gl.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/gsw.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/gu.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/guz.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/gv.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ha.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ha_GH.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/haw.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/he.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/he_IL.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/hi.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/hi_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/hr.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/hr_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/hsb.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/hu.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/hy.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ia.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/id.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/id_ID.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ig.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ii.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/in.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/in_ID.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/is.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/it.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/iw.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/iw_IL.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ja.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/jgo.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/jmc.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/jv.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ka.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/kab.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/kam.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/kde.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/kea.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/kgp.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/khq.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ki.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/kk.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/kkj.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/kl.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/kln.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/km.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/kn.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ko.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/kok.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ks.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ks_Arab.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ks_Arab_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ks_Deva.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ks_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ksb.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ksf.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ksh.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ku.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/kw.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ky.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/lag.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/lb.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/lg.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/lkt.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ln.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ln_AO.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/lo.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/lrc.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/lt.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/lu.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/luo.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/luy.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/lv.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/mai.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/mas.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/mas_TZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/mer.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/mfe.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/mg.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/mgh.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/mgo.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/mi.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/mk.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ml.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/mn.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/mni.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/mni_Beng.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/mni_Beng_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/mni_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/mo.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/mr.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ms.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ms_BN.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ms_ID.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ms_SG.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/mt.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/mua.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/my.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/mzn.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/naq.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/nb.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/nd.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ne.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/nl.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/nl_AW.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/nl_BQ.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/nl_CW.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/nl_SR.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/nl_SX.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/nmg.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/nn.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/nn_NO.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/nnh.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/no.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/no_NO.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/no_NO_NY.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/nus.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/nyn.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/om.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/om_KE.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/or.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/os.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/os_RU.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/pa.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/pa_Arab.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/pa_Arab_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/pa_Guru.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/pa_Guru_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/pa_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/pa_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/pcm.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/pl.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ps.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ps_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/pt.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/pt_AO.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/pt_CH.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/pt_CV.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/pt_GQ.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/pt_GW.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/pt_LU.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/pt_MO.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/pt_MZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/pt_PT.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/pt_ST.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/pt_TL.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/qu.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/qu_BO.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/qu_EC.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/raj.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/rm.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/rn.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ro.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ro_MD.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/rof.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/root.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ru.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ru_BY.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ru_KG.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ru_KZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ru_MD.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/rw.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/rwk.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sa.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sah.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/saq.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sat.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sat_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sat_Olck.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sat_Olck_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sbp.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sc.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sd.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sd_Arab.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sd_Arab_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sd_Deva.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sd_Deva_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sd_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sd_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/se.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/se_SE.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/seh.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ses.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sg.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sh.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sh_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sh_CS.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sh_YU.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/shi.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/shi_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/shi_MA.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/shi_Tfng.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/shi_Tfng_MA.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/si.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sk.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sl.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/smn.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sn.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/so.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/so_DJ.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/so_ET.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/so_KE.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sq.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sq_MK.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sr.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sr_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sr_CS.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sr_Cyrl.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sr_Cyrl_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sr_Cyrl_CS.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sr_Cyrl_RS.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sr_Cyrl_XK.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sr_Cyrl_YU.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sr_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sr_Latn_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sr_Latn_CS.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sr_Latn_ME.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sr_Latn_RS.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sr_Latn_YU.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sr_ME.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sr_RS.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sr_XK.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sr_YU.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/su.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/su_ID.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/su_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/su_Latn_ID.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/supplementalData.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sv.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sw.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sw_CD.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sw_KE.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/sw_UG.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ta.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ta_LK.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ta_MY.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ta_SG.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/te.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/teo.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/teo_KE.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/tg.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/th.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ti.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ti_ER.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/tk.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/tl.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/tl_PH.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/to.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/tr.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/tt.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/twq.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/tzm.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ug.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/uk.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ur.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/ur_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/uz.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/uz_AF.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/uz_Arab.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/uz_Arab_AF.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/uz_Cyrl.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/uz_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/uz_Latn_UZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/uz_UZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/vai.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/vai_LR.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/vai_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/vai_Vaii.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/vai_Vaii_LR.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/vi.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/vun.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/wae.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/wo.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/xh.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/xog.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/yav.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/yi.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/yo.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/yo_BJ.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/yrl.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/yrl_CO.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/yrl_VE.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/yue.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/yue_CN.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/yue_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/yue_Hans.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/yue_Hans_CN.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/yue_Hant.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/yue_Hant_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/zgh.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/zh.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/zh_CN.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/zh_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/zh_Hans.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/zh_Hans_CN.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/zh_Hans_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/zh_Hans_MO.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/zh_Hans_SG.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/zh_Hant.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/zh_Hant_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/zh_Hant_MO.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/zh_Hant_TW.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/zh_MO.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/zh_SG.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/zh_TW.txt
+FILE: ../../../flutter/third_party/icu/source/data/curr/zu.txt
+FILE: ../../../flutter/third_party/icu/source/data/icu4j-readme.txt
+FILE: ../../../flutter/third_party/icu/source/data/icupkg.inc.in
+FILE: ../../../flutter/third_party/icu/source/data/lang/af.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/agq.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ak.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/am.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ar.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ar_EG.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ar_LY.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ar_SA.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ars.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/as.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/asa.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ast.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ay.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/az.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/az_AZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/az_Cyrl.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/az_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/az_Latn_AZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/bas.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/be.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/bem.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/bez.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/bg.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/bgc.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/bho.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/bm.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/bn.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/bn_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/bo.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/br.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/brx.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/bs.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/bs_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/bs_Cyrl.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/bs_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/bs_Latn_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ca.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ccp.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ce.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ceb.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/cgg.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/chr.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ckb.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/cs.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/cv.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/cy.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/da.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/dav.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/de.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/de_AT.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/de_CH.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/dje.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/doi.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/dsb.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/dua.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/dv.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/dyo.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/dz.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ebu.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ee.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/el.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_001.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_150.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_AG.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_AI.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_AT.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_AU.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_BB.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_BE.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_BM.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_BS.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_BW.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_BZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_CA.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_CC.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_CH.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_CK.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_CM.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_CX.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_CY.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_DE.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_DG.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_DK.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_DM.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_ER.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_FI.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_FJ.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_FK.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_FM.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_GB.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_GD.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_GG.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_GH.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_GI.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_GM.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_GY.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_IE.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_IL.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_IM.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_IO.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_JE.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_JM.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_KE.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_KI.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_KN.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_KY.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_LC.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_LR.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_LS.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_MG.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_MO.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_MS.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_MT.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_MU.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_MV.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_MW.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_MY.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_NA.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_NF.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_NG.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_NH.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_NL.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_NR.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_NU.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_NZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_PG.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_PN.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_PW.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_RH.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_RW.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_SB.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_SC.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_SD.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_SE.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_SG.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_SH.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_SI.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_SL.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_SS.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_SX.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_SZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_TC.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_TK.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_TO.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_TT.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_TV.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_TZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_UG.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_VC.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_VG.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_VU.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_WS.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_ZA.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_ZM.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/en_ZW.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/eo.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/es.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/es_419.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/es_AR.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/es_BO.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/es_BR.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/es_BZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/es_CL.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/es_CO.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/es_CR.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/es_CU.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/es_DO.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/es_EC.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/es_GT.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/es_HN.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/es_MX.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/es_NI.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/es_PA.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/es_PE.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/es_PR.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/es_PY.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/es_SV.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/es_US.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/es_UY.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/es_VE.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/et.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/eu.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ewo.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/fa.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/fa_AF.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ff.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ff_Adlm.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ff_CM.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ff_GN.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ff_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ff_Latn_CM.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ff_Latn_GN.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ff_Latn_MR.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ff_Latn_SN.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ff_MR.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ff_SN.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/fi.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/fil.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/fil_PH.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/fo.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/fr.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/fr_BE.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/fr_CA.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/fr_CH.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/fur.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/fy.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ga.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/gd.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/gl.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/gsw.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/gu.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/guz.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/gv.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ha.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ha_NE.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/haw.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/he.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/he_IL.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/hi.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/hi_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/hr.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/hsb.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/hu.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/hy.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ia.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/id.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/id_ID.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ig.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ii.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ilo.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/in.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/in_ID.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/is.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/it.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/iw.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/iw_IL.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ja.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/jgo.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/jmc.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/jv.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ka.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/kab.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/kam.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/kde.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/kea.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/kgp.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/khq.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ki.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/kk.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/kkj.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/kl.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/kln.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/km.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/kn.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ko.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/kok.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ks.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ks_Arab.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ks_Arab_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ks_Deva.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ks_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ksb.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ksf.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ksh.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/kw.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ky.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/lag.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/lb.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/lg.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/lkt.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ln.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/lo.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/lrc.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/lt.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/lu.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/luo.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/lus.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/luy.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/lv.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/mai.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/mas.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/mer.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/mfe.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/mg.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/mgh.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/mgo.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/mi.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/mk.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ml.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/mn.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/mni.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/mni_Beng.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/mni_Beng_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/mni_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/mo.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/mr.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ms.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/mt.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/mua.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/my.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/mzn.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/naq.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/nb.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/nd.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ne.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/nl.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/nmg.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/nn.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/nn_NO.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/nnh.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/no.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/no_NO.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/no_NO_NY.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/nus.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/nyn.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/om.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/or.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/os.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/pa.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/pa_Arab.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/pa_Arab_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/pa_Guru.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/pa_Guru_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/pa_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/pa_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/pcm.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/pl.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ps.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ps_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/pt.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/pt_AO.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/pt_CH.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/pt_CV.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/pt_GQ.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/pt_GW.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/pt_LU.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/pt_MO.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/pt_MZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/pt_PT.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/pt_ST.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/pt_TL.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/qu.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/raj.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/rm.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/rn.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ro.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ro_MD.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/rof.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/root.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ru.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/rw.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/rwk.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sa.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sah.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/saq.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sat.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sat_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sat_Olck.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sat_Olck_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sbp.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sc.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sd.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sd_Arab.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sd_Arab_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sd_Deva.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sd_Deva_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sd_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sd_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/se.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/se_FI.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/seh.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ses.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sg.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sh.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sh_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sh_CS.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sh_YU.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/shi.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/shi_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/shi_MA.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/shi_Tfng.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/shi_Tfng_MA.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/si.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sk.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sl.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/smn.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sn.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/so.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sq.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sr.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sr_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sr_CS.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sr_Cyrl.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sr_Cyrl_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sr_Cyrl_CS.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sr_Cyrl_ME.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sr_Cyrl_RS.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sr_Cyrl_XK.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sr_Cyrl_YU.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sr_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sr_Latn_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sr_Latn_CS.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sr_Latn_ME.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sr_Latn_RS.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sr_Latn_XK.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sr_Latn_YU.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sr_ME.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sr_RS.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sr_XK.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sr_YU.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/su.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/su_ID.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/su_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/su_Latn_ID.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sv.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sv_FI.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sw.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sw_CD.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/sw_KE.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ta.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/te.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/teo.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/th.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ti.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ti_ER.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/tk.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/tl.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/tl_PH.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/to.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/tr.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ts.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/tt.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/twq.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/tzm.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ug.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/uk.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ur.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/ur_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/uz.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/uz_AF.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/uz_Arab.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/uz_Arab_AF.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/uz_Cyrl.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/uz_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/uz_Latn_UZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/uz_UZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/vai.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/vai_LR.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/vai_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/vai_Vaii.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/vai_Vaii_LR.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/vi.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/vun.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/wae.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/wo.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/xh.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/xog.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/yav.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/yi.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/yo.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/yo_BJ.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/yrl.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/yrl_CO.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/yrl_VE.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/yue.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/yue_CN.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/yue_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/yue_Hans.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/yue_Hans_CN.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/yue_Hant.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/yue_Hant_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/zgh.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/zh.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/zh_CN.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/zh_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/zh_Hans.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/zh_Hans_CN.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/zh_Hans_SG.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/zh_Hant.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/zh_Hant_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/zh_Hant_MO.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/zh_Hant_TW.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/zh_MO.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/zh_SG.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/zh_TW.txt
+FILE: ../../../flutter/third_party/icu/source/data/lang/zu.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/af.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/af_NA.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/af_ZA.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/agq.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/agq_CM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ak.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ak_GH.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/am.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/am_ET.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ar.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ar_001.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ar_AE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ar_BH.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ar_DJ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ar_DZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ar_EG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ar_EH.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ar_ER.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ar_IL.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ar_IQ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ar_JO.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ar_KM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ar_KW.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ar_LB.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ar_LY.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ar_MA.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ar_MR.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ar_OM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ar_PS.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ar_QA.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ar_SA.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ar_SD.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ar_SO.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ar_SS.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ar_SY.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ar_TD.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ar_TN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ar_YE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ars.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/as.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/as_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/asa.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/asa_TZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ast.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ast_ES.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/az.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/az_AZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/az_Cyrl.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/az_Cyrl_AZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/az_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/az_Latn_AZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/bas.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/bas_CM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/be.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/be_BY.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/bem.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/bem_ZM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/bez.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/bez_TZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/bg.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/bg_BG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/bgc.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/bgc_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/bho.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/bho_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/bm.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/bm_ML.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/bn.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/bn_BD.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/bn_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/bo.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/bo_CN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/bo_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/br.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/br_FR.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/brx.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/brx_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/bs.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/bs_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/bs_Cyrl.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/bs_Cyrl_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/bs_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/bs_Latn_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ca.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ca_AD.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ca_ES.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ca_FR.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ca_IT.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ccp.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ccp_BD.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ccp_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ce.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ce_RU.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ceb.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ceb_PH.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/cgg.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/cgg_UG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/chr.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/chr_US.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ckb.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ckb_IQ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ckb_IR.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/cs.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/cs_CZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/cv.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/cv_RU.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/cy.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/cy_GB.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/da.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/da_DK.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/da_GL.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/dav.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/dav_KE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/de.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/de_AT.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/de_BE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/de_CH.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/de_DE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/de_IT.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/de_LI.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/de_LU.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/dje.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/dje_NE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/doi.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/doi_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/dsb.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/dsb_DE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/dua.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/dua_CM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/dyo.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/dyo_SN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/dz.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/dz_BT.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ebu.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ebu_KE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ee.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ee_GH.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ee_TG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/el.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/el_CY.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/el_GR.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_001.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_150.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_AE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_AG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_AI.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_AS.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_AT.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_AU.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_BB.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_BE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_BI.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_BM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_BS.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_BW.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_BZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_CA.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_CC.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_CH.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_CK.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_CM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_CX.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_CY.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_DE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_DG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_DK.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_DM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_ER.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_FI.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_FJ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_FK.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_FM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_GB.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_GD.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_GG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_GH.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_GI.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_GM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_GU.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_GY.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_IE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_IL.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_IM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_IO.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_JE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_JM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_KE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_KI.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_KN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_KY.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_LC.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_LR.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_LS.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_MG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_MH.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_MO.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_MP.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_MS.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_MT.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_MU.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_MV.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_MW.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_MY.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_NA.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_NF.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_NG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_NH.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_NL.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_NR.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_NU.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_NZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_PG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_PH.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_PN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_PR.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_PW.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_RH.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_RW.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_SB.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_SC.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_SD.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_SE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_SG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_SH.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_SI.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_SL.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_SS.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_SX.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_SZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_TC.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_TK.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_TO.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_TT.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_TV.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_TZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_UG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_UM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_US.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_US_POSIX.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_VC.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_VG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_VI.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_VU.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_WS.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_ZA.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_ZM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/en_ZW.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/eo.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/eo_001.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/es.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/es_419.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/es_AR.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/es_BO.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/es_BR.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/es_BZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/es_CL.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/es_CO.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/es_CR.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/es_CU.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/es_DO.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/es_EA.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/es_EC.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/es_ES.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/es_GQ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/es_GT.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/es_HN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/es_IC.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/es_MX.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/es_NI.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/es_PA.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/es_PE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/es_PH.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/es_PR.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/es_PY.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/es_SV.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/es_US.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/es_UY.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/es_VE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/et.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/et_EE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/eu.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/eu_ES.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ewo.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ewo_CM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fa.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fa_AF.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fa_IR.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ff.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ff_Adlm.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ff_Adlm_BF.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ff_Adlm_CM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ff_Adlm_GH.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ff_Adlm_GM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ff_Adlm_GN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ff_Adlm_GW.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ff_Adlm_LR.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ff_Adlm_MR.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ff_Adlm_NE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ff_Adlm_NG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ff_Adlm_SL.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ff_Adlm_SN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ff_CM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ff_GN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ff_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ff_Latn_BF.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ff_Latn_CM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ff_Latn_GH.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ff_Latn_GM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ff_Latn_GN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ff_Latn_GW.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ff_Latn_LR.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ff_Latn_MR.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ff_Latn_NE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ff_Latn_NG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ff_Latn_SL.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ff_Latn_SN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ff_MR.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ff_SN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fi.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fi_FI.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fil.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fil_PH.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fo.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fo_DK.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fo_FO.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_BE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_BF.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_BI.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_BJ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_BL.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_CA.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_CD.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_CF.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_CG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_CH.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_CI.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_CM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_DJ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_DZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_FR.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_GA.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_GF.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_GN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_GP.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_GQ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_HT.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_KM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_LU.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_MA.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_MC.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_MF.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_MG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_ML.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_MQ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_MR.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_MU.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_NC.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_NE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_PF.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_PM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_RE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_RW.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_SC.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_SN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_SY.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_TD.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_TG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_TN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_VU.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_WF.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fr_YT.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fur.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fur_IT.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fy.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/fy_NL.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ga.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ga_GB.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ga_IE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/gd.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/gd_GB.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/gl.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/gl_ES.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/gsw.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/gsw_CH.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/gsw_FR.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/gsw_LI.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/gu.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/gu_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/guz.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/guz_KE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/gv.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/gv_IM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ha.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ha_GH.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ha_NE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ha_NG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/haw.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/haw_US.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/he.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/he_IL.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/hi.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/hi_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/hi_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/hi_Latn_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/hr.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/hr_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/hr_HR.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/hsb.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/hsb_DE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/hu.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/hu_HU.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/hy.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/hy_AM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ia.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ia_001.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/id.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/id_ID.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ig.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ig_NG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ii.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ii_CN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/in.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/in_ID.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/is.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/is_IS.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/it.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/it_CH.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/it_IT.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/it_SM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/it_VA.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/iw.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/iw_IL.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ja.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ja_JP.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ja_JP_TRADITIONAL.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/jgo.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/jgo_CM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/jmc.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/jmc_TZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/jv.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/jv_ID.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ka.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ka_GE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/kab.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/kab_DZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/kam.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/kam_KE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/kde.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/kde_TZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/kea.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/kea_CV.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/kgp.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/kgp_BR.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/khq.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/khq_ML.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ki.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ki_KE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/kk.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/kk_KZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/kkj.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/kkj_CM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/kl.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/kl_GL.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/kln.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/kln_KE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/km.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/km_KH.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/kn.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/kn_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ko.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ko_KP.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ko_KR.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/kok.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/kok_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ks.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ks_Arab.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ks_Arab_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ks_Deva.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ks_Deva_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ks_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ksb.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ksb_TZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ksf.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ksf_CM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ksh.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ksh_DE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ku_TR.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/kw.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/kw_GB.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ky.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ky_KG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/lag.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/lag_TZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/lb.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/lb_LU.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/lg.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/lg_UG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/lkt.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/lkt_US.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ln.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ln_AO.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ln_CD.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ln_CF.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ln_CG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/lo.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/lo_LA.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/lrc.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/lrc_IQ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/lrc_IR.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/lt.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/lt_LT.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/lu.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/lu_CD.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/luo.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/luo_KE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/luy.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/luy_KE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/lv.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/lv_LV.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/mai.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/mai_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/mas.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/mas_KE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/mas_TZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/mer.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/mer_KE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/mfe.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/mfe_MU.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/mg.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/mg_MG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/mgh.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/mgh_MZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/mgo.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/mgo_CM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/mi.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/mi_NZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/mk.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/mk_MK.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ml.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ml_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/mn.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/mn_MN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/mni.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/mni_Beng.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/mni_Beng_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/mni_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/mo.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/mr.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/mr_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ms.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ms_BN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ms_ID.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ms_MY.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ms_SG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/mt.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/mt_MT.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/mua.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/mua_CM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/my.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/my_MM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/mzn.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/mzn_IR.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/naq.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/naq_NA.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/nb.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/nb_NO.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/nb_SJ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/nd.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/nd_ZW.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ne.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ne_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ne_NP.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/nl.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/nl_AW.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/nl_BE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/nl_BQ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/nl_CW.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/nl_NL.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/nl_SR.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/nl_SX.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/nmg.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/nmg_CM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/nn.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/nn_NO.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/nnh.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/nnh_CM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/no.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/no_NO.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/no_NO_NY.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/nus.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/nus_SS.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/nyn.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/nyn_UG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/om.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/om_ET.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/om_KE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/or.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/or_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/os.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/os_GE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/os_RU.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/pa.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/pa_Arab.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/pa_Arab_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/pa_Guru.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/pa_Guru_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/pa_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/pa_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/pcm.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/pcm_NG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/pl.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/pl_PL.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ps.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ps_AF.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ps_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/pt.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/pt_AO.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/pt_BR.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/pt_CH.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/pt_CV.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/pt_GQ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/pt_GW.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/pt_LU.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/pt_MO.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/pt_MZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/pt_PT.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/pt_ST.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/pt_TL.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/qu.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/qu_BO.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/qu_EC.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/qu_PE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/raj.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/raj_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/rm.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/rm_CH.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/rn.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/rn_BI.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ro.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ro_MD.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ro_RO.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/rof.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/rof_TZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/root.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ru.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ru_BY.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ru_KG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ru_KZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ru_MD.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ru_RU.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ru_UA.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/rw.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/rw_RW.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/rwk.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/rwk_TZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sa.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sa_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sah.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sah_RU.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/saq.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/saq_KE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sat.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sat_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sat_Olck.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sat_Olck_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sbp.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sbp_TZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sc.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sc_IT.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sd.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sd_Arab.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sd_Arab_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sd_Deva.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sd_Deva_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sd_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sd_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/se.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/se_FI.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/se_NO.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/se_SE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/seh.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/seh_MZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ses.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ses_ML.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sg.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sg_CF.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sh.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sh_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sh_CS.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sh_YU.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/shi.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/shi_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/shi_Latn_MA.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/shi_MA.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/shi_Tfng.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/shi_Tfng_MA.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/si.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/si_LK.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sk.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sk_SK.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sl.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sl_SI.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/smn.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/smn_FI.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sn.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sn_ZW.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/so.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/so_DJ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/so_ET.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/so_KE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/so_SO.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sq.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sq_AL.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sq_MK.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sq_XK.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sr.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sr_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sr_CS.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sr_Cyrl.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sr_Cyrl_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sr_Cyrl_CS.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sr_Cyrl_ME.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sr_Cyrl_RS.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sr_Cyrl_XK.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sr_Cyrl_YU.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sr_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sr_Latn_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sr_Latn_CS.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sr_Latn_ME.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sr_Latn_RS.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sr_Latn_XK.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sr_Latn_YU.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sr_ME.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sr_RS.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sr_XK.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sr_YU.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/su.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/su_ID.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/su_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/su_Latn_ID.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sv.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sv_AX.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sv_FI.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sv_SE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sw.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sw_CD.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sw_KE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sw_TZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/sw_UG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ta.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ta_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ta_LK.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ta_MY.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ta_SG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/te.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/te_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/teo.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/teo_KE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/teo_UG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/tg_TJ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/th.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/th_TH.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/th_TH_TRADITIONAL.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ti.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ti_ER.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ti_ET.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/tk.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/tk_TM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/tl.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/tl_PH.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/to.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/to_TO.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/tr.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/tr_CY.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/tr_TR.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/tt.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/tt_RU.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/twq.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/twq_NE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/tzm.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/tzm_MA.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ug.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ug_CN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/uk.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/uk_UA.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ur.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ur_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/ur_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/uz.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/uz_AF.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/uz_Arab.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/uz_Arab_AF.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/uz_Cyrl.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/uz_Cyrl_UZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/uz_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/uz_Latn_UZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/uz_UZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/vai.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/vai_LR.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/vai_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/vai_Latn_LR.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/vai_Vaii.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/vai_Vaii_LR.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/vi.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/vi_VN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/vun.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/vun_TZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/wae.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/wae_CH.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/wo.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/wo_SN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/xh.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/xh_ZA.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/xog.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/xog_UG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/yav.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/yav_CM.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/yi.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/yi_001.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/yo.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/yo_BJ.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/yo_NG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/yrl.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/yrl_BR.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/yrl_CO.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/yrl_VE.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/yue.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/yue_CN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/yue_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/yue_Hans.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/yue_Hans_CN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/yue_Hant.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/yue_Hant_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/zgh.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/zgh_MA.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/zh.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/zh_CN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/zh_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/zh_Hans.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/zh_Hans_CN.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/zh_Hans_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/zh_Hans_MO.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/zh_Hans_SG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/zh_Hant.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/zh_Hant_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/zh_Hant_MO.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/zh_Hant_TW.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/zh_MO.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/zh_SG.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/zh_TW.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/zu.txt
+FILE: ../../../flutter/third_party/icu/source/data/locales/zu_ZA.txt
+FILE: ../../../flutter/third_party/icu/source/data/makedata.mak
+FILE: ../../../flutter/third_party/icu/source/data/mappings/cns-11643-1992.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ebcdic-xml-us.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/euc-jp-2007.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/euc-tw-2014.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/gsm-03.38-2009.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1006_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1025_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1026_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1047_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1051_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1089_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1097_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1098_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1112_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1122_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1123_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1124_P100-1996.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1125_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1129_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1130_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1131_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1132_P100-1998.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1133_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1137_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1140_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1141_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1142_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1143_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1144_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1145_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1146_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1147_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1148_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1149_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1153_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1154_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1155_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1156_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1157_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1158_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1160_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1162_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1164_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1168_P100-2002.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1250_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1251_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1252_P100-2000.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1253_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1254_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1255_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1256_P110-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1257_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1258_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-12712_P100-1998.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1276_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1363_P110-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1363_P11B-1998.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1364_P110-2007.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1371_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1373_P100-2002.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1375_P100-2008.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1383_P110-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1386_P100-2001.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1388_P103-2001.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1390_P110-2003.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-1399_P110-2003.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-16684_P110-2003.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-16804_X110-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-273_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-277_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-278_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-280_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-284_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-285_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-290_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-297_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-33722_P120-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-33722_P12A_P12A-2004_U2.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-33722_P12A_P12A-2009_U2.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-37_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-420_X120-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-424_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-437_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-4517_P100-2005.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-4899_P100-1998.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-4909_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-4971_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-500_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-5012_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-5123_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-5346_P100-1998.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-5347_P100-1998.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-5348_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-5349_P100-1998.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-5350_P100-1998.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-5351_P100-1998.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-5352_P100-1998.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-5353_P100-1998.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-5354_P100-1998.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-5471_P100-2006.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-5478_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-720_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-737_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-775_P100-1996.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-803_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-813_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-838_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-8482_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-850_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-851_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-852_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-855_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-856_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-857_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-858_P100-1997.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-860_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-861_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-862_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-863_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-864_X110-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-865_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-866_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-867_P100-1998.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-868_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-869_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-870_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-871_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-874_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-875_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-878_P100-1996.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-9005_X110-2007.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-901_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-902_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-9067_X100-2005.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-912_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-913_P100-2000.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-914_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-915_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-916_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-918_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-920_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-921_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-922_P100-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-923_P100-1998.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-930_P120-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-933_P110-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-935_P110-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-937_P110-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-939_P120-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-942_P12A-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-943_P130-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-943_P15A-2003.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-9447_P100-2002.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-9448_X100-2005.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-9449_P100-2002.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-949_P110-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-949_P11A-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-950_P110-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-954_P101-2007.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-964_P110-1999.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-970_P110_P110-2006_U2.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/ibm-971_P100-1995.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-25546.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-d1.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-d2.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-d3.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-d4.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-d5.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-d6.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-d7.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-s1.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-s2.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-s3.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-t.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/iso-8859_10-1998.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/iso-8859_11-2001.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/iso-8859_14-1998.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/iso-ir-165.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/jisx-212.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/lmb-excp.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/macos-0_2-10.2.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/macos-29-10.2.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/macos-35-10.2.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/macos-6_2-10.4.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/macos-7_3-10.2.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/windows-874-2000.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/windows-949-2000.ucm
+FILE: ../../../flutter/third_party/icu/source/data/mappings/windows-950-2000.ucm
+FILE: ../../../flutter/third_party/icu/source/data/misc/currencyNumericCodes.txt
+FILE: ../../../flutter/third_party/icu/source/data/misc/dayPeriods.txt
+FILE: ../../../flutter/third_party/icu/source/data/misc/genderList.txt
+FILE: ../../../flutter/third_party/icu/source/data/misc/grammaticalFeatures.txt
+FILE: ../../../flutter/third_party/icu/source/data/misc/icudata.rc
+FILE: ../../../flutter/third_party/icu/source/data/misc/icustd.txt
+FILE: ../../../flutter/third_party/icu/source/data/misc/icuver.txt
+FILE: ../../../flutter/third_party/icu/source/data/misc/keyTypeData.txt
+FILE: ../../../flutter/third_party/icu/source/data/misc/langInfo.txt
+FILE: ../../../flutter/third_party/icu/source/data/misc/likelySubtags.txt
+FILE: ../../../flutter/third_party/icu/source/data/misc/metaZones.txt
+FILE: ../../../flutter/third_party/icu/source/data/misc/metadata.txt
+FILE: ../../../flutter/third_party/icu/source/data/misc/numberingSystems.txt
+FILE: ../../../flutter/third_party/icu/source/data/misc/pluralRanges.txt
+FILE: ../../../flutter/third_party/icu/source/data/misc/plurals.txt
+FILE: ../../../flutter/third_party/icu/source/data/misc/supplementalData.txt
+FILE: ../../../flutter/third_party/icu/source/data/misc/timezoneTypes.txt
+FILE: ../../../flutter/third_party/icu/source/data/misc/units.txt
+FILE: ../../../flutter/third_party/icu/source/data/misc/windowsZones.txt
+FILE: ../../../flutter/third_party/icu/source/data/misc/zoneinfo64.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/af.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/ak.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/am.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/ar.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/ar_SA.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/ars.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/az.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/be.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/bg.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/bs.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/ca.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/ccp.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/chr.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/cs.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/cy.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/da.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/de.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/de_CH.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/ee.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/el.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/en.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/en_001.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/en_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/eo.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/es.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/es_419.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/es_DO.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/es_GT.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/es_HN.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/es_MX.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/es_NI.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/es_PA.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/es_PR.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/es_SV.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/es_US.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/et.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/fa.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/fa_AF.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/ff.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/fi.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/fil.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/fo.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/fr.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/fr_BE.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/fr_CH.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/ga.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/he.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/hi.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/hr.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/hu.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/hy.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/id.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/in.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/is.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/it.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/iw.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/ja.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/ka.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/kk.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/kl.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/km.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/ko.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/ky.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/lb.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/lo.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/lrc.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/lt.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/lv.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/mk.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/ms.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/mt.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/my.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/nb.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/ne.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/nl.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/nn.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/no.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/pl.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/pt.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/pt_PT.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/qu.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/ro.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/root.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/ru.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/se.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/sh.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/sk.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/sl.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/sq.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/sr.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/sr_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/su.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/sv.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/sw.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/ta.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/th.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/tr.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/uk.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/vi.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/yue.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/yue_Hans.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/zh.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/zh_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/zh_Hant.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/zh_Hant_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/zh_Hant_MO.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/zh_Hant_TW.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/zh_MO.txt
+FILE: ../../../flutter/third_party/icu/source/data/rbnf/zh_TW.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/af.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/agq.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ak.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/am.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ar.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ar_AE.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ar_LY.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ar_SA.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ars.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/as.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/asa.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ast.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/az.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/az_AZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/az_Cyrl.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/az_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/az_Latn_AZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/bas.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/be.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/bem.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/bez.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/bg.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/bgc.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/bho.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/bm.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/bn.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/bn_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/bo.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/bo_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/br.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/brx.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/bs.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/bs_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/bs_Cyrl.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/bs_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/bs_Latn_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ca.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ccp.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ce.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ceb.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/cgg.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/chr.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ckb.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/cs.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/cv.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/cy.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/da.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/dav.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/de.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/de_AT.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/de_CH.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/dje.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/doi.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/dsb.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/dua.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/dyo.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/dz.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ebu.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ee.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/el.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_001.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_150.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_AG.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_AI.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_AT.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_AU.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_BB.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_BE.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_BM.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_BS.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_BW.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_BZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_CA.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_CC.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_CH.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_CK.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_CM.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_CX.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_CY.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_DE.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_DG.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_DK.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_DM.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_ER.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_FI.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_FJ.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_FK.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_FM.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_GB.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_GD.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_GG.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_GH.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_GI.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_GM.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_GY.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_IE.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_IL.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_IM.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_IO.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_JE.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_JM.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_KE.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_KI.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_KN.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_KY.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_LC.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_LR.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_LS.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_MG.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_MO.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_MS.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_MT.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_MU.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_MV.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_MW.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_MY.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_NA.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_NF.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_NG.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_NH.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_NL.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_NR.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_NU.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_NZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_PG.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_PN.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_PW.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_RH.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_RW.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_SB.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_SC.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_SD.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_SE.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_SG.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_SH.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_SI.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_SL.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_SS.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_SX.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_SZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_TC.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_TK.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_TO.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_TT.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_TV.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_TZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_UG.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_VC.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_VG.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_VU.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_WS.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_ZA.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_ZM.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/en_ZW.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/eo.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/es.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/es_419.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/es_AR.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/es_BO.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/es_BR.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/es_BZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/es_CL.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/es_CO.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/es_CR.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/es_CU.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/es_DO.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/es_EC.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/es_GT.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/es_HN.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/es_MX.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/es_NI.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/es_PA.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/es_PE.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/es_PR.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/es_PY.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/es_SV.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/es_US.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/es_UY.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/es_VE.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/et.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/eu.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ewo.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/fa.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/fa_AF.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ff.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ff_Adlm.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ff_CM.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ff_GN.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ff_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ff_Latn_CM.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ff_Latn_GN.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ff_Latn_MR.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ff_Latn_SN.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ff_MR.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ff_SN.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/fi.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/fil.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/fil_PH.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/fo.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/fr.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/fr_BE.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/fr_CA.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/fur.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/fy.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ga.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/gd.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/gl.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/gsw.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/gu.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/guz.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/gv.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ha.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/haw.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/he.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/he_IL.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/hi.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/hi_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/hr.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/hsb.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/hu.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/hy.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ia.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/id.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/id_ID.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ig.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ii.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/in.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/in_ID.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/is.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/it.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/iw.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/iw_IL.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ja.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/jgo.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/jmc.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/jv.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ka.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/kab.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/kam.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/kde.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/kea.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/kgp.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/khq.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ki.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/kk.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/kkj.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/kl.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/kln.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/km.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/kn.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ko.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ko_KP.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/kok.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ks.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ks_Arab.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ks_Arab_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ks_Deva.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ks_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ksb.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ksf.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ksh.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ku.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/kw.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ky.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/lag.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/lb.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/lg.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/lkt.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ln.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/lo.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/lrc.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/lt.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/lu.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/luo.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/luy.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/lv.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/mai.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/mas.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/mer.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/mfe.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/mg.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/mgh.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/mgo.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/mi.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/mk.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ml.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/mn.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/mni.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/mni_Beng.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/mni_Beng_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/mni_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/mo.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/mr.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ms.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/mt.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/mua.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/my.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/mzn.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/naq.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/nb.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/nd.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ne.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/nl.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/nmg.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/nn.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/nn_NO.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/nnh.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/no.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/no_NO.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/no_NO_NY.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/nus.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/nyn.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/om.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/or.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/os.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/pa.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/pa_Arab.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/pa_Arab_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/pa_Guru.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/pa_Guru_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/pa_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/pa_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/pcm.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/pl.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ps.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ps_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/pt.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/pt_AO.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/pt_CH.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/pt_CV.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/pt_GQ.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/pt_GW.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/pt_LU.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/pt_MO.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/pt_MZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/pt_PT.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/pt_ST.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/pt_TL.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/qu.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/raj.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/rm.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/rn.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ro.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ro_MD.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/rof.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/root.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ru.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ru_UA.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/rw.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/rwk.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sa.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sah.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/saq.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sat.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sat_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sat_Olck.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sat_Olck_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sbp.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sc.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sd.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sd_Arab.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sd_Arab_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sd_Deva.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sd_Deva_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sd_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sd_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/se.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/se_FI.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/seh.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ses.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sg.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sh.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sh_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sh_CS.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sh_YU.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/shi.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/shi_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/shi_MA.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/shi_Tfng.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/shi_Tfng_MA.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/si.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sk.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sl.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/smn.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sn.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/so.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sq.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sr.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sr_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sr_CS.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sr_Cyrl.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sr_Cyrl_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sr_Cyrl_CS.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sr_Cyrl_ME.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sr_Cyrl_RS.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sr_Cyrl_XK.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sr_Cyrl_YU.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sr_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sr_Latn_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sr_Latn_CS.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sr_Latn_ME.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sr_Latn_RS.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sr_Latn_XK.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sr_Latn_YU.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sr_ME.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sr_RS.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sr_XK.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sr_YU.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/su.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/su_ID.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/su_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/su_Latn_ID.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sv.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sw.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sw_CD.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/sw_KE.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ta.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/te.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/teo.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/tg.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/th.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ti.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/tk.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/tl.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/tl_PH.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/to.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/tr.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/tt.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/twq.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/tzm.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ug.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/uk.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ur.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/ur_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/uz.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/uz_AF.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/uz_Arab.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/uz_Arab_AF.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/uz_Cyrl.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/uz_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/uz_Latn_UZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/uz_UZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/vai.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/vai_LR.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/vai_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/vai_Vaii.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/vai_Vaii_LR.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/vi.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/vun.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/wae.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/wo.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/xh.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/xog.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/yav.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/yi.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/yo.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/yo_BJ.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/yrl.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/yrl_CO.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/yrl_VE.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/yue.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/yue_CN.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/yue_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/yue_Hans.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/yue_Hans_CN.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/yue_Hant.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/yue_Hant_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/zgh.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/zh.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/zh_CN.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/zh_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/zh_Hans.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/zh_Hans_CN.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/zh_Hans_SG.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/zh_Hant.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/zh_Hant_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/zh_Hant_MO.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/zh_Hant_TW.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/zh_MO.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/zh_SG.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/zh_TW.txt
+FILE: ../../../flutter/third_party/icu/source/data/region/zu.txt
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc3491.txt
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc3530cs.txt
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc3530csci.txt
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc3530mixp.txt
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc3722.txt
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc3920node.txt
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc3920res.txt
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc4011.txt
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc4013.txt
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc4505.txt
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc4518.txt
+FILE: ../../../flutter/third_party/icu/source/data/sprep/rfc4518ci.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Any_Accents.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Any_Publishing.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Arab_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Beng_Arab.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Beng_Deva.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Beng_Gujr.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Beng_Guru.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Beng_Knda.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Beng_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Beng_Mlym.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Beng_Orya.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Beng_Taml.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Beng_Telu.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Beng_ur.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Bengali_InterIndic.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Cyrl_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Deva_Arab.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Deva_Beng.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Deva_Gujr.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Deva_Guru.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Deva_Knda.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Deva_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Deva_Mlym.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Deva_Orya.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Deva_Taml.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Deva_Telu.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Deva_ur.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Devanagari_InterIndic.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Ethi_Cyrl_Gutgarts.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Ethi_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Ethi_Latn_ALALOC.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Ethi_Latn_ALALOC_Geminate.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Ethi_Latn_Aethiopi.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Ethi_Latn_Aethiopi_Geminate.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Ethi_Latn_Beta_Metsehaf.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Ethi_Latn_Beta_Metsehaf_Geminate.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Ethi_Latn_ES3842.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Ethi_Latn_IES_JES_1964.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Ethi_Latn_IES_JES_1964_Geminate.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Ethi_Latn_Lambdin.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Ethi_Latn_SERA.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Fullwidth_Halfwidth.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Geor_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Grek_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Grek_Latn_UNGEGN.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Gujarati_InterIndic.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Gujr_Arab.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Gujr_Beng.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Gujr_Deva.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Gujr_Guru.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Gujr_Knda.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Gujr_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Gujr_Mlym.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Gujr_Orya.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Gujr_Taml.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Gujr_Telu.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Gujr_ur.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Gurmukhi_InterIndic.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Guru_Arab.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Guru_Beng.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Guru_Deva.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Guru_Gujr.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Guru_Knda.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Guru_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Guru_Mlym.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Guru_Orya.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Guru_Taml.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Guru_Telu.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Guru_ur.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Han_Latin_Names.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Han_Spacedhan.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Hang_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Hani_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Hans_Hant.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Hebr_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Hira_Kana.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Hira_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/InterIndic_Arabic.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/InterIndic_Bengali.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/InterIndic_Devanagari.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/InterIndic_Gujarati.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/InterIndic_Gurmukhi.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/InterIndic_Kannada.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/InterIndic_Latin.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/InterIndic_Malayalam.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/InterIndic_Oriya.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/InterIndic_Tamil.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/InterIndic_Telugu.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/InterIndic_ur.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Jamo_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Kannada_InterIndic.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Knda_Arab.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Knda_Beng.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Knda_Deva.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Knda_Gujr.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Knda_Guru.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Knda_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Knda_Mlym.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Knda_Orya.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Knda_Taml.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Knda_Telu.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Knda_ur.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Latin_ASCII.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Latin_ConjoiningJamo.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Latin_InterIndic.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Latin_NumericPinyin.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Latn_Armn.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Latn_Beng.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Latn_Bopo.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Latn_Cans.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Latn_Deva.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Latn_Ethi_Williamson.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Latn_Gujr.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Latn_Guru.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Latn_Hang.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Latn_Jamo.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Latn_Kana.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Latn_Knda.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Latn_Mlym.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Latn_Orya.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Latn_Taml.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Latn_Telu.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Latn_Thaa.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Latn_Thai.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Malayalam_InterIndic.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Mlym_Arab.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Mlym_Beng.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Mlym_Deva.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Mlym_Gujr.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Mlym_Guru.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Mlym_Knda.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Mlym_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Mlym_Orya.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Mlym_Taml.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Mlym_Telu.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Mlym_ur.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Oriya_InterIndic.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Orya_Arab.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Orya_Beng.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Orya_Deva.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Orya_Gujr.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Orya_Guru.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Orya_Knda.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Orya_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Orya_Mlym.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Orya_Taml.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Orya_Telu.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Orya_ur.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Pinyin_NumericPinyin.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Syrc_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Tamil_InterIndic.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Taml_Arab.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Taml_Beng.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Taml_Deva.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Taml_Gujr.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Taml_Guru.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Taml_Knda.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Taml_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Taml_Mlym.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Taml_Orya.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Taml_Telu.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Taml_ur.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Telu_Arab.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Telu_Beng.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Telu_Deva.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Telu_Gujr.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Telu_Guru.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Telu_Knda.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Telu_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Telu_Mlym.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Telu_Orya.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Telu_Taml.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Telu_ur.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Telugu_InterIndic.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ThaiLogical_Latin.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Thai_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Thai_ThaiLogical.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Thai_ThaiSemi.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/Zawgyi_my.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/am_Ethi_am_Brai.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/am_Ethi_am_Ethi_Geminate.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/am_Ethi_d0_Morse.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/am_am_FONIPA.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/am_am_Latn_BGN.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/am_ar.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/am_chr.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/am_fa.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ar_ar_Latn_BGN.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/az_Cyrl_az_BGN.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/az_Lower.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/az_Title.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/az_Upper.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/be_be_Latn_BGN.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/bg_bg_Latn_BGN.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/blt_blt_FONIPA.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/byn_Ethi_byn_Latn_Tekie_Alibekit.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/byn_Ethi_byn_Latn_Xaleget.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ch_am.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ch_ar.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ch_ch_FONIPA.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ch_chr.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ch_fa.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/chr_chr_FONIPA.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/cs_FONIPA_ja.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/cs_FONIPA_ko.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/cs_am.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/cs_ar.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/cs_chr.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/cs_cs_FONIPA.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/cs_fa.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/cs_ja.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/cs_ko.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/cy_cy_FONIPA.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/de_ASCII.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/dsb_dsb_FONIPA.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/dv_dv_Latn_BGN.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/el.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/el_Lower.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/el_Title.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/el_Upper.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/el_el_Latn_BGN.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/en.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/eo_am.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/eo_ar.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/eo_chr.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/eo_eo_FONIPA.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/eo_fa.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/es_419_am.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/es_419_ar.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/es_419_chr.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/es_419_fa.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/es_419_ja.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/es_419_zh.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/es_FONIPA_am.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/es_FONIPA_es_419_FONIPA.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/es_FONIPA_ja.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/es_FONIPA_zh.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/es_am.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/es_ar.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/es_chr.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/es_es_FONIPA.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/es_fa.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/es_ja.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/es_zh.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/fa_fa_FONIPA.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/fa_fa_Latn_BGN.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/gz_Ethi_Sarb.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ha_ha_NE.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/he_he_Latn_BGN.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/hy_AREVMDA_am.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/hy_AREVMDA_ar.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/hy_AREVMDA_chr.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/hy_AREVMDA_fa.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/hy_AREVMDA_hy_AREVMDA_FONIPA.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/hy_am.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/hy_ar.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/hy_chr.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/hy_fa.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/hy_hy_FONIPA.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/hy_hy_Latn_BGN.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ia_am.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ia_ar.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ia_chr.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ia_fa.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ia_ia_FONIPA.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/it_am.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/it_ja.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ja_Hrkt_ja_Latn_BGN.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ja_Latn_ko.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ja_Latn_ru.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ka_ka_Latn_BGN.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ka_ka_Latn_BGN_1981.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/kk_am.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/kk_ar.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/kk_chr.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/kk_fa.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/kk_kk_FONIPA.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/kk_kk_Latn_BGN.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ko_ko_Latn_BGN.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ky_am.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ky_ar.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ky_chr.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ky_fa.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ky_ky_FONIPA.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ky_ky_Latn_BGN.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/la_la_FONIPA.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/lt_Lower.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/lt_Title.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/lt_Upper.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/mk_mk_Latn_BGN.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/mn_mn_Latn_BGN.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/mn_mn_Latn_MNS.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/my_Zawgyi.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/my_am.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/my_ar.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/my_chr.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/my_fa.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/my_my_FONIPA.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/my_my_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/nl_Title.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/nv_nv_FONIPA.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/pl_FONIPA_ja.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/pl_am.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/pl_ar.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/pl_chr.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/pl_fa.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/pl_ja.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/pl_pl_FONIPA.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ps_ps_Latn_BGN.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/rm_SURSILV_am.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/rm_SURSILV_ar.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/rm_SURSILV_chr.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/rm_SURSILV_fa.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/rm_SURSILV_rm_FONIPA_SURSILV.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ro_FONIPA_ja.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ro_am.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ro_ar.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ro_chr.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ro_fa.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ro_ja.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ro_ro_FONIPA.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/root.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ru_Latn_ru_BGN.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ru_ja.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ru_ru_Latn_BGN.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ru_zh.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/sat_Olck_sat_FONIPA.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/sat_am.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/sat_ar.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/sat_chr.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/sat_fa.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/sgw_Ethi_Ethi_Gurage_2013.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/si_am.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/si_ar.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/si_chr.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/si_fa.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/si_si_FONIPA.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/si_si_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/sk_FONIPA_ja.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/sk_am.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/sk_ar.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/sk_chr.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/sk_fa.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/sk_ja.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/sk_sk_FONIPA.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/sr_sr_Latn_BGN.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ta_ta_FONIPA.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/tk_Cyrl_tk_BGN.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/tlh_am.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/tlh_ar.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/tlh_chr.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/tlh_fa.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/tlh_tlh_FONIPA.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/tr_Lower.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/tr_Title.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/tr_Upper.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/ug_ug_FONIPA.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/uk_uk_Latn_BGN.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/und_FONIPA_ar.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/und_FONIPA_chr.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/und_FONIPA_fa.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/und_FONIPA_und_FONXSAMP.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/uz_Cyrl_uz_BGN.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/uz_Cyrl_uz_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/vec_vec_FONIPA.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/xh_am.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/xh_ar.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/xh_chr.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/xh_fa.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/xh_xh_FONIPA.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/yo_yo_BJ.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/zh_Latn_PINYIN_ru.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/zu_am.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/zu_ar.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/zu_chr.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/zu_fa.txt
+FILE: ../../../flutter/third_party/icu/source/data/translit/zu_zu_FONIPA.txt
+FILE: ../../../flutter/third_party/icu/source/data/unidata/CaseFolding.txt
+FILE: ../../../flutter/third_party/icu/source/data/unidata/DerivedCoreProperties.txt
+FILE: ../../../flutter/third_party/icu/source/data/unidata/DerivedNormalizationProps.txt
+FILE: ../../../flutter/third_party/icu/source/data/unidata/FractionalUCA.txt
+FILE: ../../../flutter/third_party/icu/source/data/unidata/NormalizationCorrections.txt
+FILE: ../../../flutter/third_party/icu/source/data/unidata/NormalizationTest.txt
+FILE: ../../../flutter/third_party/icu/source/data/unidata/SpecialCasing.txt
+FILE: ../../../flutter/third_party/icu/source/data/unidata/UCARules.txt
+FILE: ../../../flutter/third_party/icu/source/data/unidata/changes.txt
+FILE: ../../../flutter/third_party/icu/source/data/unidata/confusables.txt
+FILE: ../../../flutter/third_party/icu/source/data/unidata/emoji-sequences.txt
+FILE: ../../../flutter/third_party/icu/source/data/unidata/emoji-zwj-sequences.txt
+FILE: ../../../flutter/third_party/icu/source/data/unidata/norm2/nfc.txt
+FILE: ../../../flutter/third_party/icu/source/data/unidata/norm2/nfkc.txt
+FILE: ../../../flutter/third_party/icu/source/data/unidata/norm2/nfkc_cf.txt
+FILE: ../../../flutter/third_party/icu/source/data/unidata/norm2/uts46.txt
+FILE: ../../../flutter/third_party/icu/source/data/unidata/ppucd.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/af.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/agq.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ak.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/am.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ar.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ar_SA.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ars.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/as.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/asa.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ast.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/az.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/az_AZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/az_Cyrl.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/az_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/az_Latn_AZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/bas.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/be.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/bem.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/bez.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/bg.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/bgc.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/bho.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/bm.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/bn.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/bn_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/bo.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/br.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/brx.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/bs.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/bs_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/bs_Cyrl.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/bs_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/bs_Latn_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ca.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ccp.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ce.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ceb.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/cgg.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/chr.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ckb.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/cs.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/cv.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/cy.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/da.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/dav.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/de.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/de_CH.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/dje.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/doi.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/dsb.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/dua.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/dyo.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/dz.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ebu.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ee.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/el.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_001.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_150.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_AG.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_AI.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_AT.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_AU.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_BB.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_BE.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_BM.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_BS.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_BW.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_BZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_CA.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_CC.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_CH.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_CK.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_CM.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_CX.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_CY.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_DE.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_DG.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_DK.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_DM.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_ER.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_FI.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_FJ.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_FK.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_FM.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_GB.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_GD.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_GG.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_GH.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_GI.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_GM.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_GY.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_IE.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_IL.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_IM.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_IO.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_JE.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_JM.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_KE.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_KI.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_KN.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_KY.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_LC.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_LR.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_LS.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_MG.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_MO.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_MS.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_MT.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_MU.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_MV.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_MW.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_MY.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_NA.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_NF.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_NG.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_NH.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_NL.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_NR.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_NU.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_NZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_PG.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_PN.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_PW.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_RH.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_RW.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_SB.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_SC.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_SD.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_SE.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_SG.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_SH.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_SI.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_SL.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_SS.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_SX.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_SZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_TC.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_TK.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_TO.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_TT.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_TV.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_TZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_UG.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_VC.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_VG.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_VU.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_WS.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_ZA.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_ZM.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/en_ZW.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/eo.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/es.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/es_419.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/es_AR.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/es_BO.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/es_BR.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/es_BZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/es_CL.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/es_CO.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/es_CR.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/es_CU.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/es_DO.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/es_EC.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/es_GT.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/es_HN.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/es_MX.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/es_NI.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/es_PA.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/es_PE.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/es_PR.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/es_PY.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/es_SV.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/es_US.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/es_UY.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/es_VE.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/et.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/eu.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ewo.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/fa.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ff.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ff_Adlm.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ff_CM.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ff_GN.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ff_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ff_Latn_CM.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ff_Latn_GN.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ff_Latn_MR.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ff_Latn_SN.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ff_MR.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ff_SN.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/fi.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/fil.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/fil_PH.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/fo.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/fr.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/fr_CA.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/fr_HT.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/fur.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/fy.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ga.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/gd.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/gl.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/gsw.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/gu.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/guz.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/gv.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ha.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/haw.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/he.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/he_IL.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/hi.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/hi_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/hr.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/hsb.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/hu.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/hy.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ia.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/id.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/id_ID.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ig.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ii.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/in.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/in_ID.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/is.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/it.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/iw.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/iw_IL.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ja.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/jgo.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/jmc.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/jv.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ka.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/kab.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/kam.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/kde.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/kea.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/kgp.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/khq.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ki.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/kk.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/kkj.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/kl.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/kln.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/km.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/kn.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ko.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/kok.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ks.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ks_Arab.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ks_Arab_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ks_Deva.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ks_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ksb.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ksf.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ksh.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ku.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/kw.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ky.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/lag.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/lb.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/lg.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/lkt.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ln.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/lo.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/lrc.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/lt.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/lu.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/luo.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/luy.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/lv.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/mai.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/mas.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/mer.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/mfe.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/mg.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/mgh.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/mgo.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/mi.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/mk.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ml.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/mn.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/mni.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/mni_Beng.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/mni_Beng_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/mni_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/mo.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/mr.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ms.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/mt.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/mua.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/my.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/mzn.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/naq.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/nb.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/nd.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ne.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/nl.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/nmg.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/nn.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/nn_NO.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/nnh.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/no.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/no_NO.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/no_NO_NY.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/nus.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/nyn.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/om.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/or.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/os.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/pa.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/pa_Arab.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/pa_Arab_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/pa_Guru.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/pa_Guru_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/pa_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/pa_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/pcm.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/pl.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ps.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ps_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/pt.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/pt_AO.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/pt_CH.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/pt_CV.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/pt_GQ.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/pt_GW.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/pt_LU.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/pt_MO.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/pt_MZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/pt_PT.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/pt_ST.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/pt_TL.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/qu.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/raj.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/rm.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/rn.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ro.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ro_MD.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/rof.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/root.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ru.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/rw.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/rwk.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sa.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sah.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/saq.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sat.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sat_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sat_Olck.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sat_Olck_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sbp.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sc.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sd.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sd_Arab.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sd_Arab_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sd_Deva.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sd_Deva_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sd_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sd_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/se.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/seh.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ses.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sg.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sh.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sh_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sh_CS.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sh_YU.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/shi.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/shi_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/shi_MA.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/shi_Tfng.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/shi_Tfng_MA.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/si.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sk.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sl.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/smn.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sn.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/so.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sq.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sr.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sr_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sr_CS.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sr_Cyrl.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sr_Cyrl_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sr_Cyrl_CS.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sr_Cyrl_RS.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sr_Cyrl_XK.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sr_Cyrl_YU.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sr_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sr_Latn_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sr_Latn_CS.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sr_Latn_ME.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sr_Latn_RS.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sr_Latn_YU.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sr_ME.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sr_RS.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sr_XK.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sr_YU.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/su.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/su_ID.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/su_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/su_Latn_ID.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sv.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sv_FI.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sw.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/sw_KE.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ta.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/te.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/teo.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/tg.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/th.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ti.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/tk.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/tl.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/tl_PH.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/to.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/tr.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/tt.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/twq.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/tzm.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ug.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/uk.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ur.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/ur_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/uz.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/uz_AF.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/uz_Arab.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/uz_Arab_AF.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/uz_Cyrl.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/uz_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/uz_Latn_UZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/uz_UZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/vai.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/vai_LR.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/vai_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/vai_Vaii.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/vai_Vaii_LR.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/vi.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/vun.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/wae.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/wo.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/xh.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/xog.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/yav.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/yi.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/yo.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/yo_BJ.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/yrl.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/yrl_CO.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/yrl_VE.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/yue.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/yue_CN.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/yue_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/yue_Hans.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/yue_Hans_CN.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/yue_Hant.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/yue_Hant_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/zgh.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/zh.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/zh_CN.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/zh_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/zh_Hans.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/zh_Hans_CN.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/zh_Hans_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/zh_Hans_MO.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/zh_Hans_SG.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/zh_Hant.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/zh_Hant_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/zh_Hant_MO.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/zh_Hant_TW.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/zh_MO.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/zh_SG.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/zh_TW.txt
+FILE: ../../../flutter/third_party/icu/source/data/unit/zu.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/af.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/agq.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ak.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/am.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ar.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ar_SA.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ars.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/as.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/asa.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ast.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/az.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/az_AZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/az_Cyrl.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/az_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/az_Latn_AZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/bas.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/be.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/bem.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/bez.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/bg.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/bgc.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/bho.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/bm.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/bn.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/bo.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/br.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/brx.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/bs.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/bs_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/bs_Cyrl.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/bs_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/bs_Latn_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ca.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ccp.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ce.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ceb.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/cgg.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/chr.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ckb.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/cs.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/cv.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/cy.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/da.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/dav.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/de.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/de_CH.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/dje.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/doi.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/dsb.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/dua.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/dyo.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/dz.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ebu.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ee.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/el.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_001.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_150.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_AE.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_AG.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_AI.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_AT.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_AU.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_BB.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_BE.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_BM.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_BS.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_BW.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_BZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_CA.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_CC.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_CH.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_CK.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_CM.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_CX.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_CY.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_DE.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_DG.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_DK.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_DM.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_ER.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_FI.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_FJ.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_FK.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_FM.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_GB.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_GD.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_GG.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_GH.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_GI.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_GM.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_GU.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_GY.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_IE.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_IL.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_IM.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_IO.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_JE.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_JM.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_KE.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_KI.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_KN.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_KY.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_LC.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_LR.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_LS.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_MG.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_MH.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_MO.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_MP.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_MS.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_MT.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_MU.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_MV.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_MW.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_MY.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_NA.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_NF.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_NG.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_NH.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_NL.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_NR.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_NU.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_NZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_PG.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_PN.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_PW.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_RH.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_RW.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_SB.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_SC.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_SD.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_SE.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_SG.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_SH.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_SI.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_SL.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_SS.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_SX.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_SZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_TC.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_TK.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_TO.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_TT.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_TV.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_TZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_UG.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_VC.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_VG.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_VU.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_WS.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_ZA.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_ZM.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/en_ZW.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/eo.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/es.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/es_419.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/es_AR.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/es_BO.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/es_BR.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/es_BZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/es_CL.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/es_CO.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/es_CR.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/es_CU.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/es_DO.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/es_EC.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/es_GT.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/es_HN.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/es_MX.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/es_NI.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/es_PA.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/es_PE.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/es_PR.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/es_PY.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/es_SV.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/es_US.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/es_UY.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/es_VE.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/et.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/eu.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ewo.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/fa.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ff.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ff_Adlm.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ff_CM.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ff_GN.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ff_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ff_Latn_CM.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ff_Latn_GN.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ff_Latn_MR.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ff_Latn_SN.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ff_MR.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ff_SN.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/fi.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/fil.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/fil_PH.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/fo.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/fr.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/fr_CA.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/fr_GF.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/fur.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/fy.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ga.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/gd.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/gl.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/gsw.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/gu.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/guz.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/gv.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ha.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/haw.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/he.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/he_IL.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/hi.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/hi_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/hr.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/hsb.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/hu.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/hy.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ia.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/id.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/id_ID.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ig.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ii.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/in.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/in_ID.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/is.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/it.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/iw.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/iw_IL.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ja.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/jgo.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/jmc.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/jv.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ka.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/kab.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/kam.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/kde.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/kea.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/kgp.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/khq.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ki.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/kk.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/kkj.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/kl.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/kln.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/km.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/kn.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ko.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ko_KP.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/kok.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ks.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ks_Arab.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ks_Arab_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ks_Deva.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ks_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ksb.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ksf.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ksh.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ku.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/kw.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ky.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/lag.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/lb.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/lg.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/lkt.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ln.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/lo.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/lrc.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/lt.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/lu.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/luo.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/luy.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/lv.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/mai.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/mas.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/mer.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/mfe.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/mg.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/mgh.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/mgo.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/mi.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/mk.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ml.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/mn.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/mni.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/mni_Beng.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/mni_Beng_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/mni_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/mo.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/mr.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ms.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ms_ID.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/mt.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/mua.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/my.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/mzn.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/naq.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/nb.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/nd.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ne.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ne_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/nl.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/nl_SR.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/nmg.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/nn.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/nn_NO.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/nnh.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/no.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/no_NO.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/no_NO_NY.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/nus.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/nyn.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/om.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/or.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/os.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/pa.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/pa_Arab.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/pa_Arab_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/pa_Guru.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/pa_Guru_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/pa_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/pa_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/pcm.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/pl.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ps.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ps_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/pt.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/pt_AO.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/pt_CH.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/pt_CV.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/pt_GQ.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/pt_GW.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/pt_LU.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/pt_MO.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/pt_MZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/pt_PT.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/pt_ST.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/pt_TL.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/qu.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/qu_BO.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/qu_EC.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/raj.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/rm.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/rn.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ro.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/rof.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/root.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ru.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/rw.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/rwk.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sa.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sah.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/saq.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sat.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sat_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sat_Olck.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sat_Olck_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sbp.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sc.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sd.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sd_Arab.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sd_Arab_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sd_Deva.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sd_Deva_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sd_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sd_PK.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/se.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/se_FI.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/seh.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ses.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sg.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sh.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sh_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sh_CS.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sh_YU.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/shi.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/shi_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/shi_MA.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/shi_Tfng.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/shi_Tfng_MA.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/si.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sk.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sl.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/smn.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sn.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/so.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sq.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sr.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sr_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sr_CS.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sr_Cyrl.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sr_Cyrl_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sr_Cyrl_CS.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sr_Cyrl_RS.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sr_Cyrl_XK.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sr_Cyrl_YU.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sr_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sr_Latn_BA.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sr_Latn_CS.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sr_Latn_ME.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sr_Latn_RS.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sr_Latn_YU.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sr_ME.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sr_RS.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sr_XK.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sr_YU.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/su.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/su_ID.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/su_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/su_Latn_ID.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sv.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sw.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/sw_KE.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ta.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ta_MY.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ta_SG.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/te.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/teo.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/tg.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/th.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ti.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/tk.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/tl.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/tl_PH.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/to.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/tr.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/tt.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/twq.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/tzdbNames.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/tzm.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ug.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/uk.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ur.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/ur_IN.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/uz.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/uz_AF.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/uz_Arab.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/uz_Arab_AF.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/uz_Cyrl.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/uz_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/uz_Latn_UZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/uz_UZ.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/vai.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/vai_LR.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/vai_Latn.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/vai_Vaii.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/vai_Vaii_LR.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/vi.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/vun.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/wae.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/wo.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/xh.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/xog.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/yav.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/yi.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/yo.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/yo_BJ.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/yrl.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/yrl_CO.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/yrl_VE.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/yue.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/yue_CN.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/yue_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/yue_Hans.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/yue_Hans_CN.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/yue_Hant.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/yue_Hant_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/zgh.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/zh.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/zh_CN.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/zh_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/zh_Hans.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/zh_Hans_CN.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/zh_Hans_SG.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/zh_Hant.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/zh_Hant_HK.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/zh_Hant_MO.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/zh_Hant_TW.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/zh_MO.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/zh_SG.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/zh_TW.txt
+FILE: ../../../flutter/third_party/icu/source/data/zone/zu.txt
+FILE: ../../../flutter/third_party/icu/source/extra/scrptrun/scrptrun.cpp
+FILE: ../../../flutter/third_party/icu/source/extra/scrptrun/scrptrun.h
+FILE: ../../../flutter/third_party/icu/source/extra/scrptrun/srtest.cpp
+FILE: ../../../flutter/third_party/icu/source/extra/uconv/makedata.mak
+FILE: ../../../flutter/third_party/icu/source/extra/uconv/pkgdata.inc.in
+FILE: ../../../flutter/third_party/icu/source/extra/uconv/resources/fr.txt
+FILE: ../../../flutter/third_party/icu/source/extra/uconv/resources/root.txt
+FILE: ../../../flutter/third_party/icu/source/extra/uconv/uconv.cpp
+FILE: ../../../flutter/third_party/icu/source/extra/uconv/unicode/uwmsg.h
+FILE: ../../../flutter/third_party/icu/source/extra/uconv/uwmsg.c
+FILE: ../../../flutter/third_party/icu/source/i18n/alphaindex.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/anytrans.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/anytrans.h
+FILE: ../../../flutter/third_party/icu/source/i18n/astro.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/astro.h
+FILE: ../../../flutter/third_party/icu/source/i18n/basictz.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/bocsu.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/bocsu.h
+FILE: ../../../flutter/third_party/icu/source/i18n/brktrans.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/brktrans.h
+FILE: ../../../flutter/third_party/icu/source/i18n/buddhcal.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/buddhcal.h
+FILE: ../../../flutter/third_party/icu/source/i18n/calendar.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/casetrn.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/casetrn.h
+FILE: ../../../flutter/third_party/icu/source/i18n/cecal.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/cecal.h
+FILE: ../../../flutter/third_party/icu/source/i18n/chnsecal.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/chnsecal.h
+FILE: ../../../flutter/third_party/icu/source/i18n/choicfmt.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/coleitr.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/coll.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collation.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collation.h
+FILE: ../../../flutter/third_party/icu/source/i18n/collationbuilder.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collationbuilder.h
+FILE: ../../../flutter/third_party/icu/source/i18n/collationcompare.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collationcompare.h
+FILE: ../../../flutter/third_party/icu/source/i18n/collationdata.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collationdata.h
+FILE: ../../../flutter/third_party/icu/source/i18n/collationdatabuilder.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collationdatabuilder.h
+FILE: ../../../flutter/third_party/icu/source/i18n/collationdatareader.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collationdatareader.h
+FILE: ../../../flutter/third_party/icu/source/i18n/collationdatawriter.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collationdatawriter.h
+FILE: ../../../flutter/third_party/icu/source/i18n/collationfastlatin.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collationfastlatin.h
+FILE: ../../../flutter/third_party/icu/source/i18n/collationfastlatinbuilder.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collationfastlatinbuilder.h
+FILE: ../../../flutter/third_party/icu/source/i18n/collationfcd.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collationfcd.h
+FILE: ../../../flutter/third_party/icu/source/i18n/collationiterator.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collationiterator.h
+FILE: ../../../flutter/third_party/icu/source/i18n/collationkeys.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collationkeys.h
+FILE: ../../../flutter/third_party/icu/source/i18n/collationroot.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collationroot.h
+FILE: ../../../flutter/third_party/icu/source/i18n/collationrootelements.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collationrootelements.h
+FILE: ../../../flutter/third_party/icu/source/i18n/collationruleparser.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collationruleparser.h
+FILE: ../../../flutter/third_party/icu/source/i18n/collationsets.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collationsets.h
+FILE: ../../../flutter/third_party/icu/source/i18n/collationsettings.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collationsettings.h
+FILE: ../../../flutter/third_party/icu/source/i18n/collationtailoring.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collationtailoring.h
+FILE: ../../../flutter/third_party/icu/source/i18n/collationweights.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/collationweights.h
+FILE: ../../../flutter/third_party/icu/source/i18n/collunsafe.h
+FILE: ../../../flutter/third_party/icu/source/i18n/compactdecimalformat.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/coptccal.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/coptccal.h
+FILE: ../../../flutter/third_party/icu/source/i18n/cpdtrans.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/cpdtrans.h
+FILE: ../../../flutter/third_party/icu/source/i18n/csdetect.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/csdetect.h
+FILE: ../../../flutter/third_party/icu/source/i18n/csmatch.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/csmatch.h
+FILE: ../../../flutter/third_party/icu/source/i18n/csr2022.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/csr2022.h
+FILE: ../../../flutter/third_party/icu/source/i18n/csrecog.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/csrecog.h
+FILE: ../../../flutter/third_party/icu/source/i18n/csrmbcs.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/csrmbcs.h
+FILE: ../../../flutter/third_party/icu/source/i18n/csrsbcs.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/csrsbcs.h
+FILE: ../../../flutter/third_party/icu/source/i18n/csrucode.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/csrucode.h
+FILE: ../../../flutter/third_party/icu/source/i18n/csrutf8.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/csrutf8.h
+FILE: ../../../flutter/third_party/icu/source/i18n/curramt.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/currfmt.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/currfmt.h
+FILE: ../../../flutter/third_party/icu/source/i18n/currpinf.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/currunit.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/dangical.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/dangical.h
+FILE: ../../../flutter/third_party/icu/source/i18n/datefmt.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/dayperiodrules.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/dayperiodrules.h
+FILE: ../../../flutter/third_party/icu/source/i18n/dcfmtsym.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/decContext.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/decContext.h
+FILE: ../../../flutter/third_party/icu/source/i18n/decNumber.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/decNumber.h
+FILE: ../../../flutter/third_party/icu/source/i18n/decNumberLocal.h
+FILE: ../../../flutter/third_party/icu/source/i18n/decimfmt.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/displayoptions.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion-bignum-dtoa.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion-bignum-dtoa.h
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion-bignum.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion-bignum.h
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion-cached-powers.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion-cached-powers.h
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion-diy-fp.h
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion-double-to-string.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion-double-to-string.h
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion-fast-dtoa.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion-fast-dtoa.h
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion-ieee.h
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion-string-to-double.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion-string-to-double.h
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion-strtod.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion-strtod.h
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion-utils.h
+FILE: ../../../flutter/third_party/icu/source/i18n/double-conversion.h
+FILE: ../../../flutter/third_party/icu/source/i18n/dt_impl.h
+FILE: ../../../flutter/third_party/icu/source/i18n/dtfmtsym.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/dtitv_impl.h
+FILE: ../../../flutter/third_party/icu/source/i18n/dtitvfmt.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/dtitvinf.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/dtptngen.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/dtptngen_impl.h
+FILE: ../../../flutter/third_party/icu/source/i18n/dtrule.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/erarules.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/erarules.h
+FILE: ../../../flutter/third_party/icu/source/i18n/esctrn.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/esctrn.h
+FILE: ../../../flutter/third_party/icu/source/i18n/ethpccal.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/ethpccal.h
+FILE: ../../../flutter/third_party/icu/source/i18n/fmtable.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/fmtable_cnv.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/fmtableimp.h
+FILE: ../../../flutter/third_party/icu/source/i18n/format.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/formatted_string_builder.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/formatted_string_builder.h
+FILE: ../../../flutter/third_party/icu/source/i18n/formattedval_impl.h
+FILE: ../../../flutter/third_party/icu/source/i18n/formattedval_iterimpl.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/formattedval_sbimpl.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/formattedvalue.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/fphdlimp.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/fphdlimp.h
+FILE: ../../../flutter/third_party/icu/source/i18n/fpositer.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/funcrepl.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/funcrepl.h
+FILE: ../../../flutter/third_party/icu/source/i18n/gender.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/gregocal.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/gregoimp.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/gregoimp.h
+FILE: ../../../flutter/third_party/icu/source/i18n/hebrwcal.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/hebrwcal.h
+FILE: ../../../flutter/third_party/icu/source/i18n/i18n.rc
+FILE: ../../../flutter/third_party/icu/source/i18n/indiancal.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/indiancal.h
+FILE: ../../../flutter/third_party/icu/source/i18n/inputext.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/inputext.h
+FILE: ../../../flutter/third_party/icu/source/i18n/islamcal.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/islamcal.h
+FILE: ../../../flutter/third_party/icu/source/i18n/iso8601cal.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/iso8601cal.h
+FILE: ../../../flutter/third_party/icu/source/i18n/japancal.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/japancal.h
+FILE: ../../../flutter/third_party/icu/source/i18n/listformatter.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/measfmt.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/measunit.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/measunit_extra.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/measunit_impl.h
+FILE: ../../../flutter/third_party/icu/source/i18n/measure.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/msgfmt.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/msgfmt_impl.h
+FILE: ../../../flutter/third_party/icu/source/i18n/name2uni.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/name2uni.h
+FILE: ../../../flutter/third_party/icu/source/i18n/nfrlist.h
+FILE: ../../../flutter/third_party/icu/source/i18n/nfrs.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/nfrs.h
+FILE: ../../../flutter/third_party/icu/source/i18n/nfrule.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/nfrule.h
+FILE: ../../../flutter/third_party/icu/source/i18n/nfsubs.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/nfsubs.h
+FILE: ../../../flutter/third_party/icu/source/i18n/nortrans.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/nortrans.h
+FILE: ../../../flutter/third_party/icu/source/i18n/nultrans.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/nultrans.h
+FILE: ../../../flutter/third_party/icu/source/i18n/number_affixutils.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/number_affixutils.h
+FILE: ../../../flutter/third_party/icu/source/i18n/number_asformat.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/number_asformat.h
+FILE: ../../../flutter/third_party/icu/source/i18n/number_capi.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/number_compact.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/number_compact.h
+FILE: ../../../flutter/third_party/icu/source/i18n/number_currencysymbols.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/number_currencysymbols.h
+FILE: ../../../flutter/third_party/icu/source/i18n/number_decimalquantity.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/number_decimalquantity.h
+FILE: ../../../flutter/third_party/icu/source/i18n/number_decimfmtprops.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/number_decimfmtprops.h
+FILE: ../../../flutter/third_party/icu/source/i18n/number_decnum.h
+FILE: ../../../flutter/third_party/icu/source/i18n/number_fluent.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/number_formatimpl.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/number_formatimpl.h
+FILE: ../../../flutter/third_party/icu/source/i18n/number_grouping.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/number_integerwidth.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/number_longnames.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/number_longnames.h
+FILE: ../../../flutter/third_party/icu/source/i18n/number_mapper.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/number_mapper.h
+FILE: ../../../flutter/third_party/icu/source/i18n/number_microprops.h
+FILE: ../../../flutter/third_party/icu/source/i18n/number_modifiers.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/number_modifiers.h
+FILE: ../../../flutter/third_party/icu/source/i18n/number_multiplier.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/number_multiplier.h
+FILE: ../../../flutter/third_party/icu/source/i18n/number_notation.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/number_output.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/number_padding.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/number_patternmodifier.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/number_patternmodifier.h
+FILE: ../../../flutter/third_party/icu/source/i18n/number_patternstring.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/number_patternstring.h
+FILE: ../../../flutter/third_party/icu/source/i18n/number_rounding.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/number_roundingutils.h
+FILE: ../../../flutter/third_party/icu/source/i18n/number_scientific.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/number_scientific.h
+FILE: ../../../flutter/third_party/icu/source/i18n/number_simple.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/number_skeletons.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/number_skeletons.h
+FILE: ../../../flutter/third_party/icu/source/i18n/number_symbolswrapper.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/number_types.h
+FILE: ../../../flutter/third_party/icu/source/i18n/number_usageprefs.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/number_usageprefs.h
+FILE: ../../../flutter/third_party/icu/source/i18n/number_utils.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/number_utils.h
+FILE: ../../../flutter/third_party/icu/source/i18n/number_utypes.h
+FILE: ../../../flutter/third_party/icu/source/i18n/numfmt.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/numparse_affixes.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/numparse_affixes.h
+FILE: ../../../flutter/third_party/icu/source/i18n/numparse_compositions.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/numparse_compositions.h
+FILE: ../../../flutter/third_party/icu/source/i18n/numparse_currency.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/numparse_currency.h
+FILE: ../../../flutter/third_party/icu/source/i18n/numparse_decimal.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/numparse_decimal.h
+FILE: ../../../flutter/third_party/icu/source/i18n/numparse_impl.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/numparse_impl.h
+FILE: ../../../flutter/third_party/icu/source/i18n/numparse_parsednumber.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/numparse_scientific.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/numparse_scientific.h
+FILE: ../../../flutter/third_party/icu/source/i18n/numparse_symbols.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/numparse_symbols.h
+FILE: ../../../flutter/third_party/icu/source/i18n/numparse_types.h
+FILE: ../../../flutter/third_party/icu/source/i18n/numparse_utils.h
+FILE: ../../../flutter/third_party/icu/source/i18n/numparse_validators.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/numparse_validators.h
+FILE: ../../../flutter/third_party/icu/source/i18n/numrange_capi.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/numrange_fluent.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/numrange_impl.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/numrange_impl.h
+FILE: ../../../flutter/third_party/icu/source/i18n/numsys.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/numsys_impl.h
+FILE: ../../../flutter/third_party/icu/source/i18n/olsontz.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/olsontz.h
+FILE: ../../../flutter/third_party/icu/source/i18n/persncal.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/persncal.h
+FILE: ../../../flutter/third_party/icu/source/i18n/pluralranges.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/pluralranges.h
+FILE: ../../../flutter/third_party/icu/source/i18n/plurfmt.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/plurrule.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/plurrule_impl.h
+FILE: ../../../flutter/third_party/icu/source/i18n/quant.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/quant.h
+FILE: ../../../flutter/third_party/icu/source/i18n/quantityformatter.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/quantityformatter.h
+FILE: ../../../flutter/third_party/icu/source/i18n/rbnf.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/rbt.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/rbt.h
+FILE: ../../../flutter/third_party/icu/source/i18n/rbt_data.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/rbt_data.h
+FILE: ../../../flutter/third_party/icu/source/i18n/rbt_pars.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/rbt_pars.h
+FILE: ../../../flutter/third_party/icu/source/i18n/rbt_rule.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/rbt_rule.h
+FILE: ../../../flutter/third_party/icu/source/i18n/rbt_set.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/rbt_set.h
+FILE: ../../../flutter/third_party/icu/source/i18n/rbtz.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/regexcmp.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/regexcmp.h
+FILE: ../../../flutter/third_party/icu/source/i18n/regexcst.h
+FILE: ../../../flutter/third_party/icu/source/i18n/regexcst.txt
+FILE: ../../../flutter/third_party/icu/source/i18n/regeximp.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/regeximp.h
+FILE: ../../../flutter/third_party/icu/source/i18n/regexst.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/regexst.h
+FILE: ../../../flutter/third_party/icu/source/i18n/regextxt.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/regextxt.h
+FILE: ../../../flutter/third_party/icu/source/i18n/region.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/region_impl.h
+FILE: ../../../flutter/third_party/icu/source/i18n/reldatefmt.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/reldtfmt.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/reldtfmt.h
+FILE: ../../../flutter/third_party/icu/source/i18n/rematch.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/remtrans.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/remtrans.h
+FILE: ../../../flutter/third_party/icu/source/i18n/repattrn.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/rulebasedcollator.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/scientificnumberformatter.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/scriptset.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/scriptset.h
+FILE: ../../../flutter/third_party/icu/source/i18n/search.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/selfmt.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/selfmtimpl.h
+FILE: ../../../flutter/third_party/icu/source/i18n/sharedbreakiterator.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/sharedbreakiterator.h
+FILE: ../../../flutter/third_party/icu/source/i18n/sharedcalendar.h
+FILE: ../../../flutter/third_party/icu/source/i18n/shareddateformatsymbols.h
+FILE: ../../../flutter/third_party/icu/source/i18n/sharednumberformat.h
+FILE: ../../../flutter/third_party/icu/source/i18n/sharedpluralrules.h
+FILE: ../../../flutter/third_party/icu/source/i18n/simpletz.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/smpdtfmt.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/smpdtfst.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/smpdtfst.h
+FILE: ../../../flutter/third_party/icu/source/i18n/sortkey.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/standardplural.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/standardplural.h
+FILE: ../../../flutter/third_party/icu/source/i18n/string_segment.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/string_segment.h
+FILE: ../../../flutter/third_party/icu/source/i18n/strmatch.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/strmatch.h
+FILE: ../../../flutter/third_party/icu/source/i18n/strrepl.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/strrepl.h
+FILE: ../../../flutter/third_party/icu/source/i18n/stsearch.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/taiwncal.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/taiwncal.h
+FILE: ../../../flutter/third_party/icu/source/i18n/timezone.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/titletrn.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/titletrn.h
+FILE: ../../../flutter/third_party/icu/source/i18n/tmunit.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/tmutamt.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/tmutfmt.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/tolowtrn.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/tolowtrn.h
+FILE: ../../../flutter/third_party/icu/source/i18n/toupptrn.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/toupptrn.h
+FILE: ../../../flutter/third_party/icu/source/i18n/translit.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/transreg.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/transreg.h
+FILE: ../../../flutter/third_party/icu/source/i18n/tridpars.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/tridpars.h
+FILE: ../../../flutter/third_party/icu/source/i18n/tzfmt.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/tzgnames.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/tzgnames.h
+FILE: ../../../flutter/third_party/icu/source/i18n/tznames.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/tznames_impl.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/tznames_impl.h
+FILE: ../../../flutter/third_party/icu/source/i18n/tzrule.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/tztrans.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/ucal.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/ucln_in.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/ucln_in.h
+FILE: ../../../flutter/third_party/icu/source/i18n/ucol.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/ucol_imp.h
+FILE: ../../../flutter/third_party/icu/source/i18n/ucol_res.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/ucol_sit.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/ucoleitr.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/ucsdet.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/udat.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/udateintervalformat.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/udatpg.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/ufieldpositer.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/uitercollationiterator.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/uitercollationiterator.h
+FILE: ../../../flutter/third_party/icu/source/i18n/ulistformatter.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/ulocdata.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/umsg.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/umsg_imp.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unesctrn.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/unesctrn.h
+FILE: ../../../flutter/third_party/icu/source/i18n/uni2name.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/uni2name.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/alphaindex.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/basictz.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/calendar.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/choicfmt.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/coleitr.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/coll.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/compactdecimalformat.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/curramt.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/currpinf.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/currunit.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/datefmt.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/dcfmtsym.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/decimfmt.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/displayoptions.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/dtfmtsym.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/dtitvfmt.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/dtitvinf.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/dtptngen.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/dtrule.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/fieldpos.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/fmtable.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/format.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/formattednumber.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/formattedvalue.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/fpositer.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/gender.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/gregocal.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/listformatter.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/measfmt.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/measunit.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/measure.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/msgfmt.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/nounit.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/numberformatter.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/numberrangeformatter.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/numfmt.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/numsys.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/plurfmt.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/plurrule.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/rbnf.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/rbtz.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/regex.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/region.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/reldatefmt.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/scientificnumberformatter.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/search.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/selfmt.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/simplenumberformatter.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/simpletz.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/smpdtfmt.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/sortkey.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/stsearch.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/tblcoll.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/timezone.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/tmunit.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/tmutamt.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/tmutfmt.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/translit.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/tzfmt.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/tznames.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/tzrule.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/tztrans.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/ucal.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/ucol.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/ucoleitr.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/ucsdet.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/udat.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/udateintervalformat.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/udatpg.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/udisplayoptions.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/ufieldpositer.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/uformattable.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/uformattednumber.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/uformattedvalue.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/ugender.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/ulistformatter.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/ulocdata.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/umsg.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/unirepl.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/unum.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/unumberformatter.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/unumberoptions.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/unumberrangeformatter.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/unumsys.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/upluralrules.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/uregex.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/uregion.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/ureldatefmt.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/usearch.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/usimplenumberformatter.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/uspoof.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/utmscale.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/utrans.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unicode/vtzone.h
+FILE: ../../../flutter/third_party/icu/source/i18n/units_complexconverter.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/units_complexconverter.h
+FILE: ../../../flutter/third_party/icu/source/i18n/units_converter.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/units_converter.h
+FILE: ../../../flutter/third_party/icu/source/i18n/units_data.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/units_data.h
+FILE: ../../../flutter/third_party/icu/source/i18n/units_router.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/units_router.h
+FILE: ../../../flutter/third_party/icu/source/i18n/unum.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/unumsys.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/upluralrules.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/uregex.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/uregexc.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/uregion.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/usearch.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/uspoof.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/uspoof_build.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/uspoof_conf.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/uspoof_conf.h
+FILE: ../../../flutter/third_party/icu/source/i18n/uspoof_impl.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/uspoof_impl.h
+FILE: ../../../flutter/third_party/icu/source/i18n/usrchimp.h
+FILE: ../../../flutter/third_party/icu/source/i18n/utf16collationiterator.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/utf16collationiterator.h
+FILE: ../../../flutter/third_party/icu/source/i18n/utf8collationiterator.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/utf8collationiterator.h
+FILE: ../../../flutter/third_party/icu/source/i18n/utmscale.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/utrans.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/vtzone.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/vzone.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/vzone.h
+FILE: ../../../flutter/third_party/icu/source/i18n/windtfmt.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/windtfmt.h
+FILE: ../../../flutter/third_party/icu/source/i18n/winnmfmt.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/winnmfmt.h
+FILE: ../../../flutter/third_party/icu/source/i18n/wintzimpl.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/wintzimpl.h
+FILE: ../../../flutter/third_party/icu/source/i18n/zonemeta.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/zonemeta.h
+FILE: ../../../flutter/third_party/icu/source/i18n/zrule.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/zrule.h
+FILE: ../../../flutter/third_party/icu/source/i18n/ztrans.cpp
+FILE: ../../../flutter/third_party/icu/source/i18n/ztrans.h
+FILE: ../../../flutter/third_party/icu/source/icudefs.mk.in
+FILE: ../../../flutter/third_party/icu/source/io/io.rc
+FILE: ../../../flutter/third_party/icu/source/io/locbund.cpp
+FILE: ../../../flutter/third_party/icu/source/io/locbund.h
+FILE: ../../../flutter/third_party/icu/source/io/sprintf.cpp
+FILE: ../../../flutter/third_party/icu/source/io/sscanf.cpp
+FILE: ../../../flutter/third_party/icu/source/io/ucln_io.cpp
+FILE: ../../../flutter/third_party/icu/source/io/ucln_io.h
+FILE: ../../../flutter/third_party/icu/source/io/ufile.cpp
+FILE: ../../../flutter/third_party/icu/source/io/ufile.h
+FILE: ../../../flutter/third_party/icu/source/io/ufmt_cmn.cpp
+FILE: ../../../flutter/third_party/icu/source/io/ufmt_cmn.h
+FILE: ../../../flutter/third_party/icu/source/io/unicode/ustdio.h
+FILE: ../../../flutter/third_party/icu/source/io/unicode/ustream.h
+FILE: ../../../flutter/third_party/icu/source/io/uprintf.cpp
+FILE: ../../../flutter/third_party/icu/source/io/uprintf.h
+FILE: ../../../flutter/third_party/icu/source/io/uprntf_p.cpp
+FILE: ../../../flutter/third_party/icu/source/io/uscanf.cpp
+FILE: ../../../flutter/third_party/icu/source/io/uscanf.h
+FILE: ../../../flutter/third_party/icu/source/io/uscanf_p.cpp
+FILE: ../../../flutter/third_party/icu/source/io/ustdio.cpp
+FILE: ../../../flutter/third_party/icu/source/io/ustream.cpp
+FILE: ../../../flutter/third_party/icu/source/python/icutools/databuilder/filtration_schema.json
+FILE: ../../../flutter/third_party/icu/source/stubdata/stubdata.cpp
+FILE: ../../../flutter/third_party/icu/source/stubdata/stubdata.h
+FILE: ../../../flutter/third_party/icu/source/tools/ctestfw/ctest.c
+FILE: ../../../flutter/third_party/icu/source/tools/ctestfw/datamap.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/ctestfw/testdata.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/ctestfw/tstdtmod.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/ctestfw/ucln_ct.c
+FILE: ../../../flutter/third_party/icu/source/tools/ctestfw/unicode/ctest.h
+FILE: ../../../flutter/third_party/icu/source/tools/ctestfw/unicode/datamap.h
+FILE: ../../../flutter/third_party/icu/source/tools/ctestfw/unicode/testdata.h
+FILE: ../../../flutter/third_party/icu/source/tools/ctestfw/unicode/testlog.h
+FILE: ../../../flutter/third_party/icu/source/tools/ctestfw/unicode/testtype.h
+FILE: ../../../flutter/third_party/icu/source/tools/ctestfw/unicode/tstdtmod.h
+FILE: ../../../flutter/third_party/icu/source/tools/ctestfw/unicode/uperf.h
+FILE: ../../../flutter/third_party/icu/source/tools/ctestfw/unicode/utimer.h
+FILE: ../../../flutter/third_party/icu/source/tools/ctestfw/uperf.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/escapesrc/escapesrc.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/escapesrc/expect-simple.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/escapesrc/tblgen.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/escapesrc/test-nochange.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/escapesrc/test-simple.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/genbrk/genbrk.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/genccode/genccode.c
+FILE: ../../../flutter/third_party/icu/source/tools/gencfu/gencfu.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/gencmn/gencmn.c
+FILE: ../../../flutter/third_party/icu/source/tools/gencnval/gencnval.c
+FILE: ../../../flutter/third_party/icu/source/tools/gencolusb/extract_unsafe_backwards.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/gencolusb/verify_uset.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/gendict/gendict.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/gennorm2/extradata.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/gennorm2/extradata.h
+FILE: ../../../flutter/third_party/icu/source/tools/gennorm2/gennorm2.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/gennorm2/n2builder.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/gennorm2/n2builder.h
+FILE: ../../../flutter/third_party/icu/source/tools/gennorm2/norms.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/gennorm2/norms.h
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/derb.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/errmsg.c
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/errmsg.h
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/filterrb.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/filterrb.h
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/genrb.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/genrb.h
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/parse.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/parse.h
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/prscmnts.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/prscmnts.h
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/rbutil.c
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/rbutil.h
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/read.c
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/read.h
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/reslist.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/reslist.h
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/rle.c
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/rle.h
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/ustr.c
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/ustr.h
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/wrtjava.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/genrb/wrtxml.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/gensprep/gensprep.c
+FILE: ../../../flutter/third_party/icu/source/tools/gensprep/gensprep.h
+FILE: ../../../flutter/third_party/icu/source/tools/gensprep/store.c
+FILE: ../../../flutter/third_party/icu/source/tools/gentest/genres32.c
+FILE: ../../../flutter/third_party/icu/source/tools/gentest/gentest.c
+FILE: ../../../flutter/third_party/icu/source/tools/gentest/gentest.h
+FILE: ../../../flutter/third_party/icu/source/tools/icuexportdata/icuexportdata.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/icuinfo/icuinfo.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/icuinfo/icuplugins_windows_sample.txt
+FILE: ../../../flutter/third_party/icu/source/tools/icuinfo/testplug.c
+FILE: ../../../flutter/third_party/icu/source/tools/icupkg/icupkg.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/icuswap/icuswap.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/makeconv/gencnvex.c
+FILE: ../../../flutter/third_party/icu/source/tools/makeconv/genmbcs.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/makeconv/genmbcs.h
+FILE: ../../../flutter/third_party/icu/source/tools/makeconv/makeconv.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/makeconv/makeconv.h
+FILE: ../../../flutter/third_party/icu/source/tools/makeconv/ucnvstat.c
+FILE: ../../../flutter/third_party/icu/source/tools/pkgdata/pkgdata.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/pkgdata/pkgtypes.c
+FILE: ../../../flutter/third_party/icu/source/tools/pkgdata/pkgtypes.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/collationinfo.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/collationinfo.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/dbgutil.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/dbgutil.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/denseranges.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/denseranges.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/filestrm.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/filestrm.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/filetools.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/filetools.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/flagparser.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/flagparser.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/package.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/package.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/pkg_genc.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/pkg_genc.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/pkg_gencmn.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/pkg_gencmn.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/pkg_icu.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/pkg_icu.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/pkg_imp.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/pkgitems.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/ppucd.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/ppucd.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/swapimpl.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/swapimpl.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/toolutil.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/toolutil.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/ucbuf.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/ucbuf.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/ucln_tu.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/ucm.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/ucm.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/ucmstate.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/udbgutil.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/udbgutil.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/unewdata.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/unewdata.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/uoptions.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/uoptions.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/uparse.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/uparse.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/writesrc.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/writesrc.h
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/xmlparser.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/toolutil/xmlparser.h
+FILE: ../../../flutter/third_party/icu/source/tools/tzcode/icuregions
+FILE: ../../../flutter/third_party/icu/source/tools/tzcode/icuzdump.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/tzcode/icuzones
+FILE: ../../../flutter/third_party/icu/source/tools/tzcode/tz2icu.cpp
+FILE: ../../../flutter/third_party/icu/source/tools/tzcode/tz2icu.h
 FILE: ../../../flutter/third_party/web_unicode/lib/web_unicode/codegen/line_break_properties.dart
 FILE: ../../../flutter/third_party/web_unicode/lib/web_unicode/codegen/word_break_properties.dart
+FILE: ../../../flutter/third_party/web_unicode/properties/LineBreak.txt
+FILE: ../../../flutter/third_party/web_unicode/properties/WordBreakProperty.txt
+FILE: ../../../flutter/third_party/web_unicode/tool/unicode_sync_script.dart
 ----------------------------------------------------------------------------------------------------
+Unicode® Copyright and Terms of Use
+For the general privacy policy governing access to this site, see the  Unicode Privacy Policy.
+
+A. Unicode Copyright
+1. Copyright © 1991-2022 Unicode, Inc. All rights reserved.
+B. Definitions
+Unicode Data Files ("DATA FILES") include all data files under the directories:
+https://www.unicode.org/Public/
+https://www.unicode.org/reports/
+https://www.unicode.org/ivd/data/
+
+Unicode Data Files do not include PDF online code charts under the directory:
+https://www.unicode.org/Public/
+
+Unicode Software ("SOFTWARE") includes any source code published in the Unicode Standard
+or any source code or compiled code under the directories:
+https://www.unicode.org/Public/PROGRAMS/
+https://www.unicode.org/Public/cldr/
+http://site.icu-project.org/download/
+C. Terms of Use
+1. Certain documents and files on this website contain a legend indicating that "Modification is permitted." Any person is hereby authorized, without fee, to modify such documents and files to create derivative works conforming to the Unicode® Standard, subject to Terms and Conditions herein.
+2. Any person is hereby authorized, without fee, to view, use, reproduce, and distribute all documents and files, subject to the Terms and Conditions herein.
+3. Further specifications of rights and restrictions pertaining to the use of the Unicode DATA FILES and SOFTWARE can be found in the Unicode Data Files and Software License.
+4. Each version of the Unicode Standard has further specifications of rights and restrictions of use. For the book editions (Unicode 5.0 and earlier), these are found on the back of the title page.
+5. The Unicode PDF online code charts carry specific restrictions. Those restrictions are incorporated as the first page of each PDF code chart.
+6. All other files, including online documentation of the core specification for Unicode 6.0 and later, are covered under these general Terms of Use.
+7. No license is granted to "mirror" the Unicode website where a fee is charged for access to the "mirror" site.
+8. Modification is not permitted with respect to this document. All copies of this document must be verbatim.
+D. Restricted Rights Legend
+1. Any technical data or software which is licensed to the United States of America, its agencies and/or instrumentalities under this Agreement is commercial technical data or commercial computer software developed exclusively at private expense as defined in FAR 2.101, or DFARS 252.227-7014 (June 1995), as applicable. For technical data, use, duplication, or disclosure by the Government is subject to restrictions as set forth in DFARS 202.227-7015 Technical Data, Commercial and Items (Nov 1995) and this Agreement. For Software, in accordance with FAR 12-212 or DFARS 227-7202, as applicable, use, duplication or disclosure by the Government is subject to the restrictions set forth in this Agreement.
+E.Warranties and Disclaimers
+1. This publication and/or website may include technical or typographical errors or other inaccuracies. Changes are periodically added to the information herein; these changes will be incorporated in new editions of the publication and/or website. Unicode, Inc. may make improvements and/or changes in the product(s) and/or program(s) described in this publication and/or website at any time.
+2. If this file has been purchased on magnetic or optical media from Unicode, Inc. the sole and exclusive remedy for any claim will be exchange of the defective media within ninety (90) days of original purchase.
+3. EXCEPT AS PROVIDED IN SECTION E.2, THIS PUBLICATION AND/OR SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND EITHER EXPRESS, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. UNICODE, INC. AND ITS LICENSORS ASSUME NO RESPONSIBILITY FOR ERRORS OR OMISSIONS IN THIS PUBLICATION AND/OR SOFTWARE OR OTHER DOCUMENTS WHICH ARE REFERENCED BY OR LINKED TO THIS PUBLICATION OR THE UNICODE WEBSITE.
+F. Waiver of Damages
+1. In no event shall Unicode, Inc. or its licensors be liable for any special, incidental, indirect or consequential damages of any kind, or any damages whatsoever, whether or not Unicode, Inc. was advised of the possibility of the damage, including, without limitation, those resulting from the following: loss of use, data or profits, in connection with the use, modification or distribution of this information or its derivatives.
+G. Trademarks & Logos
+1. The Unicode Word Mark and the Unicode Logo are trademarks of Unicode, Inc. “The Unicode Consortium” and “Unicode, Inc.” are trade names of Unicode, Inc. Use of the information and materials found on this website indicates your acknowledgement of Unicode, Inc.’s exclusive worldwide rights in the Unicode Word Mark, the Unicode Logo, and the Unicode trade names.
+3. The Unicode Consortium Name and Trademark Usage Policy (“Trademark Policy”) are incorporated herein by reference and you agree to abide by the provisions of the Trademark Policy, which may be changed from time to time in the sole discretion of Unicode, Inc.
+4. All third party trademarks referenced herein are the property of their respective owners.
+H. Miscellaneous
+1. Jurisdiction and Venue. This website is operated from a location in the State of California, United States of America. Unicode, Inc. makes no representation that the materials are appropriate for use in other locations. If you access this website from other locations, you are responsible for compliance with local laws. This Agreement, all use of this website and any claims and damages resulting from use of this website are governed solely by the laws of the State of California without regard to any principles which would apply the laws of a different jurisdiction. The user agrees that any disputes regarding this website shall be resolved solely in the courts located in Santa Clara County, California. The user agrees said courts have personal jurisdiction and agree to waive any right to transfer the dispute to any other forum.
+2. Modification by Unicode, Inc. Unicode, Inc. shall have the right to modify this Agreement at any time by posting it to this website. The user may not assign any part of this Agreement without Unicode, Inc.’s prior written consent.
+3. Taxes. The user agrees to pay any taxes arising from access to this website or use of the information herein, except for those based on Unicode’s net income.
+4. Severability.  If any provision of this Agreement is declared invalid or unenforceable, the remaining provisions of this Agreement shall remain in effect.
+5. Entire Agreement. This Agreement constitutes the entire agreement between the parties.
+
+EXHIBIT 1
 UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
 
 See Terms of Use <https://www.unicode.org/copyright.html>
@@ -3827,4 +66606,548 @@ shall not be used in advertising or otherwise to promote the sale,
 use or other dealings in these Data Files or Software without prior
 written authorization of the copyright holder.
 ====================================================================================================
-Total license count: 19
+
+====================================================================================================
+LIBRARY: libjpeg-turbo
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/wrgif.c
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/wrgif.c
+----------------------------------------------------------------------------------------------------
+We are also required to state that
+   "The Graphics Interchange Format(c) is the Copyright property of
+   CompuServe Incorporated. GIF(sm) is a Service Mark property of
+   CompuServe Incorporated."
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libjpeg-turbo
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/LICENSE.md
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/example.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jconfig.h
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jconfig.h.in
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jconfigint.h
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jconfigint.h.in
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jpeg_nbits_table.h
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/libjpeg.map.in
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jpeg_nbits_table.inc
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jsimdcfg.inc
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jsimdcfg.inc.h
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/turbojpeg-mapfile
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/turbojpeg-mapfile.jni
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/usage.txt
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/wizard.txt
+----------------------------------------------------------------------------------------------------
+libjpeg-turbo Licenses
+======================
+
+libjpeg-turbo is covered by three compatible BSD-style open source licenses:
+
+- The IJG (Independent JPEG Group) License, which is listed in
+  [README.ijg](README.ijg)
+
+  This license applies to the libjpeg API library and associated programs
+  (any code inherited from libjpeg, and any modifications to that code.)
+
+- The Modified (3-clause) BSD License, which is listed in
+  [turbojpeg.c](turbojpeg.c)
+
+  This license covers the TurboJPEG API library and associated programs.
+
+- The zlib License, which is listed in [simd/jsimdext.inc](simd/jsimdext.inc)
+
+  This license is a subset of the other two, and it covers the libjpeg-turbo
+  SIMD extensions.
+
+
+Complying with the libjpeg-turbo Licenses
+=========================================
+
+This section provides a roll-up of the libjpeg-turbo licensing terms, to the
+best of our understanding.
+
+1.  If you are distributing a modified version of the libjpeg-turbo source,
+    then:
+
+    1.  You cannot alter or remove any existing copyright or license notices
+        from the source.
+
+        **Origin**
+        - Clause 1 of the IJG License
+        - Clause 1 of the Modified BSD License
+        - Clauses 1 and 3 of the zlib License
+
+    2.  You must add your own copyright notice to the header of each source
+        file you modified, so others can tell that you modified that file (if
+        there is not an existing copyright header in that file, then you can
+        simply add a notice stating that you modified the file.)
+
+        **Origin**
+        - Clause 1 of the IJG License
+        - Clause 2 of the zlib License
+
+    3.  You must include the IJG README file, and you must not alter any of the
+        copyright or license text in that file.
+
+        **Origin**
+        - Clause 1 of the IJG License
+
+2.  If you are distributing only libjpeg-turbo binaries without the source, or
+    if you are distributing an application that statically links with
+    libjpeg-turbo, then:
+
+    1.  Your product documentation must include a message stating:
+
+        This software is based in part on the work of the Independent JPEG
+        Group.
+
+        **Origin**
+        - Clause 2 of the IJG license
+
+    2.  If your binary distribution includes or uses the TurboJPEG API, then
+        your product documentation must include the text of the Modified BSD
+        License.
+
+        **Origin**
+        - Clause 2 of the Modified BSD License
+
+3.  You cannot use the name of the IJG or The libjpeg-turbo Project or the
+    contributors thereof in advertising, publicity, etc.
+
+    **Origin**
+    - IJG License
+    - Clause 3 of the Modified BSD License
+
+4.  The IJG and The libjpeg-turbo Project do not warrant libjpeg-turbo to be
+    free of defects, nor do we accept any liability for undesirable
+    consequences resulting from your use of the software.
+
+    **Origin**
+    - IJG License
+    - Modified BSD License
+    - zlib License
+====================================================================================================
+
+====================================================================================================
+LIBRARY: libjpeg-turbo
+ORIGIN: ../../../flutter/third_party/libjpeg-turbo/src/README.ijg
+TYPE: LicenseType.ijg
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/cderror.h
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/cdjpeg.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/cdjpeg.h
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/cjpeg.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/djpeg.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/example.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jaricom.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jcapimin.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jcapistd.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jcarith.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jccoefct.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jccolext.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jccolor.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jcdctmgr.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jchuff.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jchuff.h
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jcinit.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jcmainct.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jcmarker.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jcmaster.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jcomapi.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jconfig.h
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jconfig.h.in
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jconfig.txt
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jconfigint.h
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jconfigint.h.in
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jcparam.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jcphuff.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jcprepct.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jcsample.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jctrans.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jdapimin.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jdapistd.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jdarith.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jdatadst-tj.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jdatadst.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jdatasrc-tj.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jdatasrc.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jdcoefct.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jdcoefct.h
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jdcol565.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jdcolext.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jdcolor.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jdct.h
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jddctmgr.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jdhuff.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jdhuff.h
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jdinput.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jdmainct.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jdmainct.h
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jdmarker.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jdmaster.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jdmaster.h
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jdmerge.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jdmrg565.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jdmrgext.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jdphuff.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jdpostct.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jdsample.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jdsample.h
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jdtrans.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jerror.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jerror.h
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jfdctflt.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jfdctfst.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jfdctint.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jidctflt.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jidctfst.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jidctint.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jidctred.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jinclude.h
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jmemmgr.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jmemnobs.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jmemsys.h
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jmorecfg.h
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jpeg_nbits_table.h
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jpegcomp.h
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jpegint.h
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jpeglib.h
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jpegtran.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jquant1.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jquant2.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jstdhuff.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jutils.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/jversion.h
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/libjpeg.map.in
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/libjpeg.txt
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/rdbmp.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/rdcolmap.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/rdgif.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/rdjpgcom.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/rdppm.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/rdrle.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/rdswitch.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/rdtarga.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jcsample.h
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jpeg_nbits_table.inc
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jsimdcfg.inc
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/simd/jsimdcfg.inc.h
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/transupp.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/transupp.h
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/turbojpeg-mapfile
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/turbojpeg-mapfile.jni
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/usage.txt
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/wizard.txt
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/wrbmp.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/wrgif.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/wrjpgcom.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/wrppm.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/wrppm.h
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/wrrle.c
+FILE: ../../../flutter/third_party/libjpeg-turbo/src/wrtarga.c
+----------------------------------------------------------------------------------------------------
+libjpeg-turbo note:  This file has been modified by The libjpeg-turbo Project
+to include only information relevant to libjpeg-turbo, to wordsmith certain
+sections, and to remove impolitic language that existed in the libjpeg v8
+README.  It is included only for reference.  Please see README.md for
+information specific to libjpeg-turbo.
+
+
+The Independent JPEG Group's JPEG software
+==========================================
+
+This distribution contains a release of the Independent JPEG Group's free JPEG
+software.  You are welcome to redistribute this software and to use it for any
+purpose, subject to the conditions under LEGAL ISSUES, below.
+
+This software is the work of Tom Lane, Guido Vollbeding, Philip Gladstone,
+Bill Allombert, Jim Boucher, Lee Crocker, Bob Friesenhahn, Ben Jackson,
+Julian Minguillon, Luis Ortiz, George Phillips, Davide Rossi, Ge' Weijers,
+and other members of the Independent JPEG Group.
+
+IJG is not affiliated with the ISO/IEC JTC1/SC29/WG1 standards committee
+(also known as JPEG, together with ITU-T SG16).
+
+
+DOCUMENTATION ROADMAP
+=====================
+
+This file contains the following sections:
+
+OVERVIEW            General description of JPEG and the IJG software.
+LEGAL ISSUES        Copyright, lack of warranty, terms of distribution.
+REFERENCES          Where to learn more about JPEG.
+ARCHIVE LOCATIONS   Where to find newer versions of this software.
+FILE FORMAT WARS    Software *not* to get.
+TO DO               Plans for future IJG releases.
+
+Other documentation files in the distribution are:
+
+User documentation:
+  usage.txt         Usage instructions for cjpeg, djpeg, jpegtran,
+                    rdjpgcom, and wrjpgcom.
+  *.1               Unix-style man pages for programs (same info as usage.txt).
+  wizard.txt        Advanced usage instructions for JPEG wizards only.
+  change.log        Version-to-version change highlights.
+Programmer and internal documentation:
+  libjpeg.txt       How to use the JPEG library in your own programs.
+  example.c         Sample code for calling the JPEG library.
+  structure.txt     Overview of the JPEG library's internal structure.
+  coderules.txt     Coding style rules --- please read if you contribute code.
+
+Please read at least usage.txt.  Some information can also be found in the JPEG
+FAQ (Frequently Asked Questions) article.  See ARCHIVE LOCATIONS below to find
+out where to obtain the FAQ article.
+
+If you want to understand how the JPEG code works, we suggest reading one or
+more of the REFERENCES, then looking at the documentation files (in roughly
+the order listed) before diving into the code.
+
+
+OVERVIEW
+========
+
+This package contains C software to implement JPEG image encoding, decoding,
+and transcoding.  JPEG (pronounced "jay-peg") is a standardized compression
+method for full-color and grayscale images.  JPEG's strong suit is compressing
+photographic images or other types of images that have smooth color and
+brightness transitions between neighboring pixels.  Images with sharp lines or
+other abrupt features may not compress well with JPEG, and a higher JPEG
+quality may have to be used to avoid visible compression artifacts with such
+images.
+
+JPEG is lossy, meaning that the output pixels are not necessarily identical to
+the input pixels.  However, on photographic content and other "smooth" images,
+very good compression ratios can be obtained with no visible compression
+artifacts, and extremely high compression ratios are possible if you are
+willing to sacrifice image quality (by reducing the "quality" setting in the
+compressor.)
+
+This software implements JPEG baseline, extended-sequential, and progressive
+compression processes.  Provision is made for supporting all variants of these
+processes, although some uncommon parameter settings aren't implemented yet.
+We have made no provision for supporting the hierarchical or lossless
+processes defined in the standard.
+
+We provide a set of library routines for reading and writing JPEG image files,
+plus two sample applications "cjpeg" and "djpeg", which use the library to
+perform conversion between JPEG and some other popular image file formats.
+The library is intended to be reused in other applications.
+
+In order to support file conversion and viewing software, we have included
+considerable functionality beyond the bare JPEG coding/decoding capability;
+for example, the color quantization modules are not strictly part of JPEG
+decoding, but they are essential for output to colormapped file formats or
+colormapped displays.  These extra functions can be compiled out of the
+library if not required for a particular application.
+
+We have also included "jpegtran", a utility for lossless transcoding between
+different JPEG processes, and "rdjpgcom" and "wrjpgcom", two simple
+applications for inserting and extracting textual comments in JFIF files.
+
+The emphasis in designing this software has been on achieving portability and
+flexibility, while also making it fast enough to be useful.  In particular,
+the software is not intended to be read as a tutorial on JPEG.  (See the
+REFERENCES section for introductory material.)  Rather, it is intended to
+be reliable, portable, industrial-strength code.  We do not claim to have
+achieved that goal in every aspect of the software, but we strive for it.
+
+We welcome the use of this software as a component of commercial products.
+No royalty is required, but we do ask for an acknowledgement in product
+documentation, as described under LEGAL ISSUES.
+
+
+LEGAL ISSUES
+============
+
+In plain English:
+
+1. We don't promise that this software works.  (But if you find any bugs,
+   please let us know!)
+2. You can use this software for whatever you want.  You don't have to pay us.
+3. You may not pretend that you wrote this software.  If you use it in a
+   program, you must acknowledge somewhere in your documentation that
+   you've used the IJG code.
+
+In legalese:
+
+The authors make NO WARRANTY or representation, either express or implied,
+with respect to this software, its quality, accuracy, merchantability, or
+fitness for a particular purpose.  This software is provided "AS IS", and you,
+its user, assume the entire risk as to its quality and accuracy.
+
+This software is copyright (C) 1991-2016, Thomas G. Lane, Guido Vollbeding.
+All Rights Reserved except as specified below.
+
+Permission is hereby granted to use, copy, modify, and distribute this
+software (or portions thereof) for any purpose, without fee, subject to these
+conditions:
+(1) If any part of the source code for this software is distributed, then this
+README file must be included, with this copyright and no-warranty notice
+unaltered; and any additions, deletions, or changes to the original files
+must be clearly indicated in accompanying documentation.
+(2) If only executable code is distributed, then the accompanying
+documentation must state that "this software is based in part on the work of
+the Independent JPEG Group".
+(3) Permission for use of this software is granted only if the user accepts
+full responsibility for any undesirable consequences; the authors accept
+NO LIABILITY for damages of any kind.
+
+These conditions apply to any software derived from or based on the IJG code,
+not just to the unmodified library.  If you use our work, you ought to
+acknowledge us.
+
+Permission is NOT granted for the use of any IJG author's name or company name
+in advertising or publicity relating to this software or products derived from
+it.  This software may be referred to only as "the Independent JPEG Group's
+software".
+
+We specifically permit and encourage the use of this software as the basis of
+commercial products, provided that all warranty or liability claims are
+assumed by the product vendor.
+
+
+The Unix configuration script "configure" was produced with GNU Autoconf.
+It is copyright by the Free Software Foundation but is freely distributable.
+The same holds for its supporting scripts (config.guess, config.sub,
+ltmain.sh).  Another support script, install-sh, is copyright by X Consortium
+but is also freely distributable.
+
+The IJG distribution formerly included code to read and write GIF files.
+To avoid entanglement with the Unisys LZW patent (now expired), GIF reading
+support has been removed altogether, and the GIF writer has been simplified
+to produce "uncompressed GIFs".  This technique does not use the LZW
+algorithm; the resulting GIF files are larger than usual, but are readable
+by all standard GIF decoders.
+
+We are required to state that
+    "The Graphics Interchange Format(c) is the Copyright property of
+    CompuServe Incorporated.  GIF(sm) is a Service Mark property of
+    CompuServe Incorporated."
+
+
+REFERENCES
+==========
+
+We recommend reading one or more of these references before trying to
+understand the innards of the JPEG software.
+
+The best short technical introduction to the JPEG compression algorithm is
+    Wallace, Gregory K.  "The JPEG Still Picture Compression Standard",
+    Communications of the ACM, April 1991 (vol. 34 no. 4), pp. 30-44.
+(Adjacent articles in that issue discuss MPEG motion picture compression,
+applications of JPEG, and related topics.)  If you don't have the CACM issue
+handy, a PDF file containing a revised version of Wallace's article is
+available at http://www.ijg.org/files/Wallace.JPEG.pdf.  The file (actually
+a preprint for an article that appeared in IEEE Trans. Consumer Electronics)
+omits the sample images that appeared in CACM, but it includes corrections
+and some added material.  Note: the Wallace article is copyright ACM and IEEE,
+and it may not be used for commercial purposes.
+
+A somewhat less technical, more leisurely introduction to JPEG can be found in
+"The Data Compression Book" by Mark Nelson and Jean-loup Gailly, published by
+M&T Books (New York), 2nd ed. 1996, ISBN 1-55851-434-1.  This book provides
+good explanations and example C code for a multitude of compression methods
+including JPEG.  It is an excellent source if you are comfortable reading C
+code but don't know much about data compression in general.  The book's JPEG
+sample code is far from industrial-strength, but when you are ready to look
+at a full implementation, you've got one here...
+
+The best currently available description of JPEG is the textbook "JPEG Still
+Image Data Compression Standard" by William B. Pennebaker and Joan L.
+Mitchell, published by Van Nostrand Reinhold, 1993, ISBN 0-442-01272-1.
+Price US$59.95, 638 pp.  The book includes the complete text of the ISO JPEG
+standards (DIS 10918-1 and draft DIS 10918-2).
+
+The original JPEG standard is divided into two parts, Part 1 being the actual
+specification, while Part 2 covers compliance testing methods.  Part 1 is
+titled "Digital Compression and Coding of Continuous-tone Still Images,
+Part 1: Requirements and guidelines" and has document numbers ISO/IEC IS
+10918-1, ITU-T T.81.  Part 2 is titled "Digital Compression and Coding of
+Continuous-tone Still Images, Part 2: Compliance testing" and has document
+numbers ISO/IEC IS 10918-2, ITU-T T.83.
+
+The JPEG standard does not specify all details of an interchangeable file
+format.  For the omitted details we follow the "JFIF" conventions, revision
+1.02.  JFIF 1.02 has been adopted as an Ecma International Technical Report
+and thus received a formal publication status.  It is available as a free
+download in PDF format from
+http://www.ecma-international.org/publications/techreports/E-TR-098.htm.
+A PostScript version of the JFIF document is available at
+http://www.ijg.org/files/jfif.ps.gz.  There is also a plain text version at
+http://www.ijg.org/files/jfif.txt.gz, but it is missing the figures.
+
+The TIFF 6.0 file format specification can be obtained by FTP from
+ftp://ftp.sgi.com/graphics/tiff/TIFF6.ps.gz.  The JPEG incorporation scheme
+found in the TIFF 6.0 spec of 3-June-92 has a number of serious problems.
+IJG does not recommend use of the TIFF 6.0 design (TIFF Compression tag 6).
+Instead, we recommend the JPEG design proposed by TIFF Technical Note #2
+(Compression tag 7).  Copies of this Note can be obtained from
+http://www.ijg.org/files/.  It is expected that the next revision
+of the TIFF spec will replace the 6.0 JPEG design with the Note's design.
+Although IJG's own code does not support TIFF/JPEG, the free libtiff library
+uses our library to implement TIFF/JPEG per the Note.
+
+
+ARCHIVE LOCATIONS
+=================
+
+The "official" archive site for this software is www.ijg.org.
+The most recent released version can always be found there in
+directory "files".
+
+The JPEG FAQ (Frequently Asked Questions) article is a source of some
+general information about JPEG.
+It is available on the World Wide Web at http://www.faqs.org/faqs/jpeg-faq/
+and other news.answers archive sites, including the official news.answers
+archive at rtfm.mit.edu: ftp://rtfm.mit.edu/pub/usenet/news.answers/jpeg-faq/.
+If you don't have Web or FTP access, send e-mail to mail-server@rtfm.mit.edu
+with body
+    send usenet/news.answers/jpeg-faq/part1
+    send usenet/news.answers/jpeg-faq/part2
+
+
+FILE FORMAT WARS
+================
+
+The ISO/IEC JTC1/SC29/WG1 standards committee (also known as JPEG, together
+with ITU-T SG16) currently promotes different formats containing the name
+"JPEG" which are incompatible with original DCT-based JPEG.  IJG therefore does
+not support these formats (see REFERENCES).  Indeed, one of the original
+reasons for developing this free software was to help force convergence on
+common, interoperable format standards for JPEG files.
+Don't use an incompatible file format!
+(In any case, our decoder will remain capable of reading existing JPEG
+image files indefinitely.)
+
+
+TO DO
+=====
+
+Please send bug reports, offers of help, etc. to jpeg-info@jpegclub.org.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: icu
+ORIGIN: ../../../flutter/third_party/icu/source/common/punycode.cpp
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/icu/source/common/punycode.cpp
+----------------------------------------------------------------------------------------------------
+punycode.c 0.4.0 (2001-Nov-17-Sat)
+http://www.cs.berkeley.edu/~amc/idn/
+Adam M. Costello
+http://www.nicemice.net/amc/
+
+Disclaimer and license
+
+    Regarding this entire document or any portion of it (including
+    the pseudocode and C code), the author makes no guarantees and
+    is not responsible for any damage resulting from its use.  The
+    author grants irrevocable permission to anyone to use, modify,
+    and distribute it in any way that does not diminish the rights
+    of anyone else to use, modify, and distribute it, provided that
+    redistributed derivative works do not contain misleading author or
+    version information.  Derivative works need not be licensed under
+    similar terms.
+====================================================================================================
+
+Total license count: 879
diff --git a/ci/licenses_golden/licenses_fuchsia b/ci/licenses_golden/licenses_fuchsia
index 20505e978a9558729bb740ad8188571526cfbb8b..3d6812f74af6d1cdc77b5e0eeddfa8d6f61549b3 100644
--- a/ci/licenses_golden/licenses_fuchsia
+++ b/ci/licenses_golden/licenses_fuchsia
@@ -1,1816 +1,4699 @@
-Signature: 223106bc52292e383a6353e3bea27e48
-
-UNUSED LICENSES:
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-USED LICENSES:
-
-====================================================================================================
-LIBRARY: fuchsia_sdk
-ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/service_provider.fidl + ../../../fuchsia/sdk/linux/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/service_provider.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/input_event_constants.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/input_events.fidl
-----------------------------------------------------------------------------------------------------
-Copyright 2014 The Fuchsia Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: fuchsia_sdk
-ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/debug.h + ../../../fuchsia/sdk/linux/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/assert.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/compiler.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/listnode.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/pixelformat.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/processargs.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/status.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/debug.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/exception.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/log.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/object.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/pci.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/port.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/profile.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/resource.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/types.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/types.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/assert.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/compiler.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/listnode.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/pixelformat.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/processargs.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/status.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/debug.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/exception.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/log.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/object.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/pci.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/port.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/profile.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/resource.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/types.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/types.h
-FILE: ../../../fuchsia/sdk/linux/dart/fidl/lib/src/interface.dart
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.runner/component_runner.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.fonts/font_provider.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.math/math.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.playback/problem.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.playback/seeking_reader.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/audio.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/module_context.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/session_shell.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/story_controller.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/story_info.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/story_provider.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/component_controller.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/environment.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/environment_controller.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/launcher.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/loader.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/runner.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.tracing.provider/provider.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.policy/presenter.fidl
-FILE: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/fdio.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/io.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/vfs.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/watcher.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/thread_checker.h
-FILE: ../../../fuchsia/sdk/linux/pkg/media_cpp_no_converters/include/lib/media/cpp/timeline_function.h
-FILE: ../../../fuchsia/sdk/linux/pkg/media_cpp_no_converters/include/lib/media/cpp/timeline_rate.h
-FILE: ../../../fuchsia/sdk/linux/pkg/media_cpp_no_converters/timeline_function.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/media_cpp_no_converters/timeline_rate.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/sync/include/lib/sync/completion.h
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_cpp/include/lib/sys/cpp/termination_reason.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/channel.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/event.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/eventpair.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/channel.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/event.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/eventpair.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/job.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/object.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/object_traits.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/port.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/process.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/socket.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/task.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/thread.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/time.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/vmar.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/vmo.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/job.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/port.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/process.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/socket.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/thread.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/vmar.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/vmo.cc
-----------------------------------------------------------------------------------------------------
-Copyright 2016 The Fuchsia Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
+Signature: ed807d849045c39a1539be23d04d0e93
 
 ====================================================================================================
 LIBRARY: fuchsia_sdk
-ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/device/audio.h + ../../../fuchsia/sdk/linux/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/device/audio.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/fidl.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/hw/gpt.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/process.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/rights.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/sanitizer.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/hypervisor.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/iommu.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/policy.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/system.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/tls.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/device/audio.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/fidl.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/hw/gpt.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/process.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/rights.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/sanitizer.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/hypervisor.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/iommu.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/policy.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/system.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/tls.h
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth/auth_provider.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth/token_manager.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt/client.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt/server.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.le/peripheral.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.le/types_deprecated.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.images/presentation_info.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/audio_capturer.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mem/buffer.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/agent.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/agent_controller.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/component_context.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/intent.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/lifecycle.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/module_data.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/module_state.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/story_shell.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/story_state.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/surface.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.mdns/mdns.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/flat_namespace.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/commands.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/display_info.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/events.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/nodes.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/renderer.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/resources.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/shapes.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/types.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/ime_service.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/input_device_registry.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/input_reports.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/text_editing.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/text_input.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/usages.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.policy/presentation.fidl
-FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/include/lib/async/cpp/receiver.h
-FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/include/lib/async/cpp/task.h
-FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/include/lib/async/cpp/wait.h
-FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/receiver.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/task.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/trap.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/wait.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/async-default/include/lib/async/default.h
-FILE: ../../../fuchsia/sdk/linux/pkg/async-loop-cpp/include/lib/async-loop/cpp/loop.h
-FILE: ../../../fuchsia/sdk/linux/pkg/async-loop-cpp/loop_wrapper.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/async-loop-testing/real_loop.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/async-loop/include/lib/async-loop/loop.h
-FILE: ../../../fuchsia/sdk/linux/pkg/async-loop/loop.c
-FILE: ../../../fuchsia/sdk/linux/pkg/async-testing/dispatcher_stub.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/async-testing/include/lib/async-testing/dispatcher_stub.h
-FILE: ../../../fuchsia/sdk/linux/pkg/async/include/lib/async/dispatcher.h
-FILE: ../../../fuchsia/sdk/linux/pkg/async/include/lib/async/irq.h
-FILE: ../../../fuchsia/sdk/linux/pkg/async/include/lib/async/receiver.h
-FILE: ../../../fuchsia/sdk/linux/pkg/async/include/lib/async/task.h
-FILE: ../../../fuchsia/sdk/linux/pkg/async/include/lib/async/wait.h
-FILE: ../../../fuchsia/sdk/linux/pkg/async/ops.c
-FILE: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/limits.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/namespace.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/unsafe.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/decoding_and_validating.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/encoding.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/formatting.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/include/lib/fidl/coding.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/include/lib/fidl/internal.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/function.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/internal/function.h
-FILE: ../../../fuchsia/sdk/linux/pkg/memfs/include/lib/memfs/memfs.h
-FILE: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/commands.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/include/lib/ui/scenic/cpp/commands.h
-FILE: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/include/lib/ui/scenic/cpp/resources.h
-FILE: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/include/lib/ui/scenic/cpp/session.h
-FILE: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/resources.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/session.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/trace-engine/include/lib/trace-engine/context.h
-FILE: ../../../fuchsia/sdk/linux/pkg/trace-engine/include/lib/trace-engine/fields.h
-FILE: ../../../fuchsia/sdk/linux/pkg/trace-engine/include/lib/trace-engine/handler.h
-FILE: ../../../fuchsia/sdk/linux/pkg/trace-engine/include/lib/trace-engine/instrumentation.h
-FILE: ../../../fuchsia/sdk/linux/pkg/trace-engine/include/lib/trace-engine/types.h
-FILE: ../../../fuchsia/sdk/linux/pkg/trace-provider-so/include/lib/trace-provider/handler.h
-FILE: ../../../fuchsia/sdk/linux/pkg/trace-provider-so/include/lib/trace-provider/provider.h
-FILE: ../../../fuchsia/sdk/linux/pkg/trace/event.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/trace/include/lib/trace/event.h
-FILE: ../../../fuchsia/sdk/linux/pkg/trace/include/lib/trace/internal/event_common.h
-FILE: ../../../fuchsia/sdk/linux/pkg/trace/include/lib/trace/internal/event_internal.h
-FILE: ../../../fuchsia/sdk/linux/pkg/trace/include/lib/trace/internal/pairs_internal.h
-FILE: ../../../fuchsia/sdk/linux/pkg/trace/include/lib/trace/internal/string_traits.h
-FILE: ../../../fuchsia/sdk/linux/pkg/trace/include/lib/trace/observer.h
-FILE: ../../../fuchsia/sdk/linux/pkg/trace/observer.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/fifo.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/fifo.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/handle.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/timer.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/timer.cc
-----------------------------------------------------------------------------------------------------
-Copyright 2017 The Fuchsia Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: fuchsia_sdk
-ORIGIN: ../../../fuchsia/sdk/linux/dart/fidl/lib/fidl.dart + ../../../LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../fuchsia/sdk/linux/dart/fidl/lib/fidl.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia/lib/fuchsia.dart
-FILE: ../../../fuchsia/sdk/linux/dart/zircon/lib/src/fakes/zircon_fakes.dart
-FILE: ../../../fuchsia/sdk/linux/dart/zircon/lib/zircon.dart
-----------------------------------------------------------------------------------------------------
-Copyright 2018 The Chromium Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: fuchsia_sdk
-ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/boot/bootfs.h + ../../../fuchsia/sdk/linux/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/boot/bootfs.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/boot/image.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/dlfcn.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/features.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/hw/pci.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/limits.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/smc.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/threads.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/time.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/boot/bootfs.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/boot/image.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/dlfcn.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/features.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/hw/pci.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/limits.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/smc.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/threads.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/time.h
-FILE: ../../../fuchsia/sdk/linux/dart/fidl/lib/src/codec.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fidl/lib/src/enum.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fidl/lib/src/error.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fidl/lib/src/hash_codes.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fidl/lib/src/interface_async.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fidl/lib/src/message.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fidl/lib/src/struct.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fidl/lib/src/table.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fidl/lib/src/types.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fidl/lib/src/unknown_data.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia/lib/src/fakes/fuchsia_fakes.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_logger/lib/logger.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_logger/lib/src/internal/_fuchsia_log_writer.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_logger/lib/src/internal/_log_message.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_logger/lib/src/internal/_log_writer.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_logger/lib/src/internal/_stdout_log_writer.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_logger/lib/src/logger/logger.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_services/lib/services.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_services/lib/src/service_provider_impl.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_vfs/lib/src/internal/_error_node.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_vfs/lib/src/pseudo_dir.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_vfs/lib/src/pseudo_file.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_vfs/lib/src/service.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_vfs/lib/src/vnode.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_vfs/lib/vfs.dart
-FILE: ../../../fuchsia/sdk/linux/dart/zircon/lib/src/channel.dart
-FILE: ../../../fuchsia/sdk/linux/dart/zircon/lib/src/channel_reader.dart
-FILE: ../../../fuchsia/sdk/linux/dart/zircon/lib/src/constants.dart
-FILE: ../../../fuchsia/sdk/linux/dart/zircon/lib/src/errors.dart
-FILE: ../../../fuchsia/sdk/linux/dart/zircon/lib/src/eventpair.dart
-FILE: ../../../fuchsia/sdk/linux/dart/zircon/lib/src/fakes/handle.dart
-FILE: ../../../fuchsia/sdk/linux/dart/zircon/lib/src/fakes/handle_waiter.dart
-FILE: ../../../fuchsia/sdk/linux/dart/zircon/lib/src/fakes/system.dart
-FILE: ../../../fuchsia/sdk/linux/dart/zircon/lib/src/handle_wrapper.dart
-FILE: ../../../fuchsia/sdk/linux/dart/zircon/lib/src/socket.dart
-FILE: ../../../fuchsia/sdk/linux/dart/zircon/lib/src/socket_reader.dart
-FILE: ../../../fuchsia/sdk/linux/dart/zircon/lib/src/vmo.dart
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth/attestation_signer.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth/common.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt/types.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.le/central.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera/camera.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera/manager.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.data/data.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.developer.tiles/tiles.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.gpu.magma/magma.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.images/encoded_image.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.images/image_info.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.images/memory_type.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.intl/intl.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/directory.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/node.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ldsvc/ldsvc.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.logger/logger.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.audio/gain_control.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.playback/player.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.playback/source_manager.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/audio_device_enumerator.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/audio_renderer.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/metadata.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/stream.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/stream_common.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/stream_processor.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/stream_type.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/timeline_function.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mediacodec/codec_factory.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/module_manifest.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/puppet_master.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/story_command.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/story_options.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.http/client.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net/net.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.process/launcher.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.process/resolver.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/job_provider.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysinfo/sysinfo.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/allocator.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/collection.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/collections_deprecated.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/constraints.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/driver_connector.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/format_modifier.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/formats_deprecated.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/image_formats.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/image_formats_deprecated.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/usages.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.app/view_provider.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/pose_buffer_provider.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/commands.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.policy/display_usage.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.scenic/commands.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.scenic/events.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.scenic/scenic.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.scenic/session.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.scenic/snapshot.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/commands.fidl
-FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/include/lib/async/cpp/time.h
-FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/include/lib/async/cpp/trap.h
-FILE: ../../../fuchsia/sdk/linux/pkg/async-testing/include/lib/async-testing/test_loop.h
-FILE: ../../../fuchsia/sdk/linux/pkg/async-testing/include/lib/async-testing/test_loop_dispatcher.h
-FILE: ../../../fuchsia/sdk/linux/pkg/async-testing/include/lib/async-testing/test_subloop.h
-FILE: ../../../fuchsia/sdk/linux/pkg/async-testing/test_loop.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/async-testing/test_loop_dispatcher.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/async/include/lib/async/time.h
-FILE: ../../../fuchsia/sdk/linux/pkg/async/include/lib/async/trap.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/spawn.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl/epitaph.c
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl/include/lib/fidl/epitaph.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/include/lib/fidl/walker.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/binding.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/binding_set.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/interface_ptr.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/interface_ptr_set.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/internal/header.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/internal/implementation.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/internal/message_handler.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/internal/message_reader.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/internal/pending_response.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/internal/proxy.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/internal/proxy_controller.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/internal/stub.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/internal/stub_controller.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/internal/weak_stub_controller.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/type_converter.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/internal/message_handler.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/internal/message_reader.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/internal/pending_response.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/internal/proxy.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/internal/proxy_controller.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/internal/stub.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/internal/stub_controller.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/internal/weak_stub_controller.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/clone.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/decoder.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/encoder.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/clone.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/coding_traits.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/comparison.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/decoder.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/encoder.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/enum.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/interface_handle.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/interface_request.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/message.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/message_buffer.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/message_part.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/string.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/traits.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/vector.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/message.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/message_buffer.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_sync/include/lib/fidl/cpp/internal/logging.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_sync/include/lib/fidl/cpp/internal/synchronous_proxy.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_sync/include/lib/fidl/cpp/synchronous_interface_ptr.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_sync/internal/logging.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_sync/internal/synchronous_proxy.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/include/lib/fpromise/bridge.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/include/lib/fpromise/bridge_internal.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/include/lib/fpromise/promise.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/include/lib/fpromise/promise_internal.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/include/lib/fpromise/result.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/include/lib/fpromise/scheduler.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/include/lib/fpromise/scope.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/include/lib/fpromise/sequencer.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/include/lib/fpromise/single_threaded_executor.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/promise.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/scheduler.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/scope.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/sequencer.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/single_threaded_executor.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/defer.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/function_traits.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/nullable.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/thread_safety.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/traits.h
-FILE: ../../../fuchsia/sdk/linux/pkg/images_cpp/images.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/images_cpp/include/lib/images/cpp/images.h
-FILE: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/inspector.h
-FILE: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/vmo/heap.h
-FILE: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/vmo/limits.h
-FILE: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/vmo/state.h
-FILE: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/vmo/types.h
-FILE: ../../../fuchsia/sdk/linux/pkg/inspect/inspector.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/inspect/vmo/heap.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/inspect/vmo/state.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/inspect/vmo/types.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/media_cpp/include/lib/media/cpp/type_converters.h
-FILE: ../../../fuchsia/sdk/linux/pkg/media_cpp/type_converters.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/include/lib/ui/scenic/cpp/id.h
-FILE: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/view_token_pair.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/optional.h
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/queue.h
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/type_traits.h
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/variant.h
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/vector.h
-FILE: ../../../fuchsia/sdk/linux/pkg/svc/include/lib/svc/dir.h
-FILE: ../../../fuchsia/sdk/linux/pkg/sync/include/lib/sync/condition.h
-FILE: ../../../fuchsia/sdk/linux/pkg/sync/include/lib/sync/internal/condition-template.h
-FILE: ../../../fuchsia/sdk/linux/pkg/sync/include/lib/sync/mutex.h
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_cpp_testing/enclosing_environment.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_cpp_testing/fake_component.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_cpp_testing/fake_launcher.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_cpp_testing/launcher_impl.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_cpp_testing/test_with_environment.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/syslog/include/lib/syslog/global.h
-FILE: ../../../fuchsia/sdk/linux/pkg/syslog/include/lib/syslog/logger.h
-FILE: ../../../fuchsia/sdk/linux/pkg/syslog/include/lib/syslog/wire_format.h
-FILE: ../../../fuchsia/sdk/linux/pkg/trace-provider-so/include/lib/trace-provider/fdio_connect.h
-FILE: ../../../fuchsia/sdk/linux/pkg/trace/include/lib/trace/event_args.h
-FILE: ../../../fuchsia/sdk/linux/pkg/trace/include/lib/trace/internal/event_args.h
-FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/composed_service_dir.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/include/lib/vfs/cpp/composed_service_dir.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/bti.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/debuglog.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/guest.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/bti.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/debuglog.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/guest.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/interrupt.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/iommu.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/pmt.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/profile.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/resource.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/suspend_token.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/vcpu.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/interrupt.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/iommu.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/profile.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/resource.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/vcpu.cc
-----------------------------------------------------------------------------------------------------
-Copyright 2018 The Fuchsia Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: fuchsia_sdk
-ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys.test/cache.fidl + ../../../LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys.test/cache.fidl
-----------------------------------------------------------------------------------------------------
-Copyright 2019 The Chromium Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: fuchsia_sdk
-ORIGIN: ../../../fuchsia/sdk/linux/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../fuchsia/sdk/linux/.versions/core.cipd_version
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/VkLayer_image_pipe_swapchain.so
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/VkLayer_khronos_validation.so
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libasync-default.so
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libfdio.so
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libmemfs.so
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libsvc.so
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libsyslog.so
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libtrace-engine.so
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libtrace-provider-so.so
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libvulkan.so
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libasync-default.so
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libasync-loop-default.a
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libfdio.so
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libmemfs.so
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libsvc.so
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libsync.a
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libsyslog.so
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libtrace-engine.so
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libtrace-provider-so.so
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libvulkan.so
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/alloca.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/ar.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/arpa/ftp.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/arpa/inet.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/arpa/nameser.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/arpa/nameser_compat.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/arpa/telnet.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/arpa/tftp.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/assert.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/aarch64/endian.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/aarch64/fenv.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/aarch64/ioctl.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/aarch64/ipc.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/aarch64/reg.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/aarch64/setjmp.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/aarch64/signal.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/aarch64/stat.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/alltypes.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/endian.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/errno.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/fcntl.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/fenv.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/io.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/ioctl.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/ipc.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/limits.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/msg.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/null.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/posix.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/reg.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/sem.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/setjmp.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/shm.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/signal.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/stat.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/statfs.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/termios.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/x86_64/endian.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/x86_64/fenv.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/x86_64/io.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/x86_64/ioctl.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/x86_64/ipc.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/x86_64/reg.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/x86_64/setjmp.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/x86_64/signal.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/x86_64/stat.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/byteswap.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/complex.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/cpio.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/ctype.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/dirent.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/dlfcn.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/elf.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/endian.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/err.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/errno.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/fcntl.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/features.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/fenv.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/fmtmsg.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/fnmatch.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/getopt.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/glob.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/grp.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/iconv.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/ifaddrs.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/inttypes.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/iso646.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/langinfo.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/libgen.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/limits.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/link.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/locale.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/malloc.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/math.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/memory.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/monetary.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/net/ethernet.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/net/if.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/net/if_arp.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/net/route.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/netdb.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/netinet/ether.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/netinet/icmp6.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/netinet/if_ether.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/netinet/igmp.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/netinet/in.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/netinet/in_systm.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/netinet/ip.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/netinet/ip6.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/netinet/ip_icmp.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/netinet/tcp.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/netinet/udp.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/netpacket/packet.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/nl_types.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/paths.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/poll.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/pthread.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/pwd.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/regex.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/resolv.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sched.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/search.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/semaphore.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/setjmp.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/signal.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/spawn.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/stdio.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/stdlib.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/string.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/strings.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/stropts.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/acct.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/auxv.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/dir.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/errno.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/eventfd.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/fcntl.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/file.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/fsuid.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/inotify.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/io.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/ioctl.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/ipc.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/klog.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/mman.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/mount.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/msg.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/mtio.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/param.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/personality.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/poll.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/quota.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/random.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/reboot.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/reg.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/select.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/sem.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/shm.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/signal.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/signalfd.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/socket.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/stat.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/statfs.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/statvfs.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/stropts.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/swap.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/syslog.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/termios.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/time.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/timeb.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/timerfd.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/times.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/timex.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/ttydefaults.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/types.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/ucontext.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/uio.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/un.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/utsname.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/vfs.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/wait.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sysexits.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/syslog.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/tar.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/termios.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/threads.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/time.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/uchar.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/ucontext.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/unistd.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/utime.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/values.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/wait.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/wchar.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/wctype.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/wordexp.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/lib/Scrt1.o
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/lib/libc.so
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/lib/libdl.so
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/lib/libm.so
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/lib/libpthread.so
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/lib/librt.so
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/lib/libzircon.so
-FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/VkLayer_image_pipe_swapchain.so
-FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/VkLayer_khronos_validation.so
-FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libasync-default.so
-FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libfdio.so
-FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libmemfs.so
-FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libsvc.so
-FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libsyslog.so
-FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libtrace-engine.so
-FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libtrace-provider-so.so
-FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libvulkan.so
-FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libasync-default.so
-FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libasync-loop-default.a
-FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libfdio.so
-FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libmemfs.so
-FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libsvc.so
-FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libsync.a
-FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libsyslog.so
-FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libtrace-engine.so
-FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libtrace-provider-so.so
-FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libvulkan.so
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/alloca.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/ar.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/arpa/ftp.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/arpa/inet.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/arpa/nameser.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/arpa/nameser_compat.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/arpa/telnet.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/arpa/tftp.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/assert.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/aarch64/endian.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/aarch64/fenv.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/aarch64/ioctl.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/aarch64/ipc.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/aarch64/reg.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/aarch64/setjmp.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/aarch64/signal.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/aarch64/stat.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/alltypes.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/endian.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/errno.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/fcntl.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/fenv.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/io.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/ioctl.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/ipc.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/limits.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/msg.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/null.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/posix.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/reg.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/sem.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/setjmp.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/shm.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/signal.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/stat.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/statfs.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/termios.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/x86_64/endian.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/x86_64/fenv.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/x86_64/io.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/x86_64/ioctl.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/x86_64/ipc.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/x86_64/reg.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/x86_64/setjmp.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/x86_64/signal.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/x86_64/stat.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/byteswap.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/complex.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/cpio.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/ctype.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/dirent.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/dlfcn.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/elf.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/endian.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/err.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/errno.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/fcntl.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/features.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/fenv.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/fmtmsg.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/fnmatch.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/getopt.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/glob.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/grp.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/iconv.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/ifaddrs.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/inttypes.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/iso646.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/langinfo.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/libgen.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/limits.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/link.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/locale.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/malloc.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/math.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/memory.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/monetary.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/net/ethernet.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/net/if.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/net/if_arp.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/net/route.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/netdb.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/netinet/ether.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/netinet/icmp6.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/netinet/if_ether.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/netinet/igmp.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/netinet/in.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/netinet/in_systm.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/netinet/ip.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/netinet/ip6.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/netinet/ip_icmp.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/netinet/tcp.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/netinet/udp.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/netpacket/packet.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/nl_types.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/paths.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/poll.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/pthread.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/pwd.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/regex.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/resolv.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sched.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/search.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/semaphore.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/setjmp.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/signal.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/spawn.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/stdio.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/stdlib.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/string.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/strings.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/stropts.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/acct.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/auxv.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/dir.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/errno.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/eventfd.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/fcntl.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/file.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/fsuid.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/inotify.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/io.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/ioctl.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/ipc.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/klog.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/mman.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/mount.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/msg.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/mtio.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/param.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/personality.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/poll.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/quota.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/random.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/reboot.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/reg.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/select.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/sem.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/shm.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/signal.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/signalfd.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/socket.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/stat.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/statfs.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/statvfs.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/stropts.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/swap.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/syslog.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/termios.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/time.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/timeb.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/timerfd.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/times.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/timex.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/ttydefaults.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/types.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/ucontext.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/uio.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/un.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/utsname.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/vfs.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/wait.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sysexits.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/syslog.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/tar.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/termios.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/threads.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/time.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/uchar.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/ucontext.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/unistd.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/utime.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/values.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/wait.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/wchar.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/wctype.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/wordexp.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/Scrt1.o
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/libc.so
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/libdl.so
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/libm.so
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/libpthread.so
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/librt.so
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/libzircon.so
-FILE: ../../../fuchsia/sdk/linux/dart/fidl/meta.json
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia/meta.json
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_component_test/meta.json
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_inspect/meta.json
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_logger/meta.json
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_scenic/meta.json
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_scenic_flutter/meta.json
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_services/meta.json
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_vfs/meta.json
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_view/meta.json
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/meta.json
-FILE: ../../../fuchsia/sdk/linux/dart/zircon/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.gesture/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.semantics/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.virtualkeyboard/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.audio.effects/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth.oldtokens/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.a2dp/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.fastpair/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt2/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.hfp/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.le/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.sys/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.buildinfo.test/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.buildinfo/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera2.hal/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera2/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera3/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castauth/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castconfig/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castremotecontrol/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castsetup/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castsysteminfo/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castwindow/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.config/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
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.data/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.debugdata/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.developer.tiles/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics.types/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.test/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.element/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.factory.wlan/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.factory/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.fonts/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.gpu.agis/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.gpu.magma/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.adc/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.goldfish/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.light/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.power.statecontrol/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.radar/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hwinfo/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.images/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.virtualkeyboard/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.inspect/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.intl/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ldsvc/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.legacymetrics/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lightsensor/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.location.namedplace/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.location.position/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.location.sensor/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.location/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.logger/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.bootstrap/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.device/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.thread/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.math/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.audio/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.drm/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.playback/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sessions2/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sounds/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.target/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mediacodec/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mediastreams/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mem/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.memorypressure/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.metrics/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.migration/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.http/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.interfaces/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.mdns/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.reachability/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.routes/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.power.clientlevel/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.power.profile/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.power.systemmode/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.process.lifecycle/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.process/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.recovery.ui/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.recovery/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.scenic.scheduling/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.session/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings.policy/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys.test/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysinfo/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.test/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.thermal/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.tracing.perfetto/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.tracing.provider/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.activity.control/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.activity/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.app/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.brightness/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.composition/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input3/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.observation.geometry/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointer.augment/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointer/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointerinjector/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.policy/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.scenic/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.test.input/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.test.scene/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.types/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ultrasound/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.unknown/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.update.channel/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.update.channelcontrol/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.update.config/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.update/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.url/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.version/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.weave/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.web/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.common/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.ieee80211/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.policy/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.product.deprecatedclient/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.product.deprecatedconfiguration/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/zx/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/async-default/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/async-loop-cpp/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/async-loop-default/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/async-loop-testing/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/async-loop/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/async-testing/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/async/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/fdio/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_sync/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/fit/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/images_cpp/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/inspect/inspect.json
-FILE: ../../../fuchsia/sdk/linux/pkg/inspect/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/inspect_service_cpp/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/media_cpp/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/media_cpp_no_converters/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/memfs/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/modular_cpp/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/svc/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/sync/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/sys/component/realm_builder_shard_sdk.json
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_component_cpp_testing/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_cpp/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_cpp_testing/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_inspect_cpp/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_service_cpp/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/syslog/client.shard.cmx
-FILE: ../../../fuchsia/sdk/linux/pkg/syslog/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/syslog/syslog.json
-FILE: ../../../fuchsia/sdk/linux/pkg/syslog_structured_backend/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/sysroot/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/trace-engine/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/trace-provider-so/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/trace/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/utf-utils/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/vulkan/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/vulkan/vulkan.json
-FILE: ../../../fuchsia/sdk/linux/pkg/vulkan_layers/data/vulkan/explicit_layer.d/VkLayer_image_pipe_swapchain.json
-FILE: ../../../fuchsia/sdk/linux/pkg/vulkan_layers/data/vulkan/explicit_layer.d/VkLayer_khronos_validation.json
-FILE: ../../../fuchsia/sdk/linux/pkg/vulkan_layers/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/meta.json
-FILE: ../../../fuchsia/sdk/linux/version_history.json
-----------------------------------------------------------------------------------------------------
-Copyright 2019 The Fuchsia Authors.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: fuchsia_sdk
-ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/hw/debug/arm64.h + ../../../fuchsia/sdk/linux/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/exception.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/hw/debug/arm64.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/hw/debug/x86.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/lookup.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/clock.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/internal/cdecls.inc
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/scheduler.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/utc.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/exception.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/hw/debug/arm64.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/hw/debug/x86.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/lookup.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/clock.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/internal/cdecls.inc
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/scheduler.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/utc.h
-FILE: ../../../fuchsia/sdk/linux/dart/fidl/lib/src/bits.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fidl/lib/src/union.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_inspect/lib/inspect.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_inspect/lib/src/inspect/inspect.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_inspect/lib/src/inspect/internal/_inspect_impl.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_inspect/lib/src/inspect/node.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_inspect/lib/src/inspect/property.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_inspect/lib/src/vmo/bitfield64.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_inspect/lib/src/vmo/block.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_inspect/lib/src/vmo/heap.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_inspect/lib/src/vmo/little_big_slab.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_inspect/lib/src/vmo/util.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_inspect/lib/src/vmo/vmo_fields.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_inspect/lib/src/vmo/vmo_holder.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_inspect/lib/src/vmo/vmo_writer.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_inspect/lib/testing.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_scenic/lib/src/view_token_pair.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_scenic/lib/views.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_services/lib/src/incoming.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_services/lib/src/outgoing.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_vfs/lib/src/composed_pseudo_dir.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_vfs/lib/src/internal/_flags.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_vfs/lib/src/pseudo_vmo_file.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_vfs/lib/src/vmo_file.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/sl4f.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/audio.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/device_log.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/dump.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/exceptions.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/factory_store.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/input.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/inspect.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/modular.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/performance.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/scenic.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/setui.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/sl4f_client.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/ssh.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/storage.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/common.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/cpu_metrics.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/drm_fps.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/flutter_frame_stats.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/input_latency.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/memory_metrics.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/scenic_frame_stats.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/temperature_metrics.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics_results.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics_spec.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/time_delta.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/time_point.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/trace_importing.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/trace_model.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/webdriver.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/trace_processing.dart
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.semantics/node.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.semantics/semantics_manager.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth.oldtokens/credentials_producer.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt/constants.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.le/advertising_data.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.le/peer.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.sys/access.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.sys/bootstrap.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.sys/host_watcher.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.sys/identity.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.sys/peer.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/address.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/appearance.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/connection_role.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/device_class.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/id.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/uuid.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera2.hal/hal.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera2/manager.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera2/stream.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castauth/cast_auth.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castconfig/cast_config.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castsetup/cast_setup.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castsysteminfo/cast_system_info.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics/format.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics/reader.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics/selector.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.element/annotations.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.element/element_manager.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.factory/factory.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/annotation.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/attachment.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/crash_reporter.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/data_provider.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/device_id_provider.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.fonts/events.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.fonts/provider.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.fonts/styles.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/ring_buffer.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/stream.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/stream_config_connector.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.goldfish/goldfish_address_space.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.goldfish/goldfish_control.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.goldfish/goldfish_pipe.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.light/light.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.power.statecontrol/admin.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hwinfo/hwinfo.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.images/image_pipe2.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/descriptor.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/device.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/keyboard.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/led.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/mouse.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/report.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/sensor.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/touch.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/units.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.inspect/tree.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.intl/property_provider.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/directory2.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/file2.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/io.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/node-protocols.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/node2.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/rights-request.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/kernel-counter.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/kernel-debug.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/kernel-stats.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/root-job.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.location.namedplace/namedplace.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.device/misc.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.device/provisioning_params.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.audio/volume_control.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.drm/content_decryption.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.drm/error.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.drm/license_session.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.drm/provisioning.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.drm/services.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sessions2/discovery.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sessions2/images.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sessions2/player.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sessions2/publisher.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sounds/sound_player.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/audio_consumer.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/audio_core.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/usage_reporter.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mem/range.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.migration/migration.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/annotation.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/story_shell_factory.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.recovery.ui/countdown.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.recovery.ui/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.recovery/factory_reset.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.scenic.scheduling/prediction_info.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.session/launcher.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/accessibility.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/audio.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/display.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/do_not_disturb.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/intl.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/privacy.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/settings.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/setup.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/types.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/secure_mem.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.test/suite.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.thermal/thermal.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.activity.control/control.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.activity/activity.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.activity/provider.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.activity/state.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.activity/tracker.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.app/view.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.app/view_config.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.brightness/brightness.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.brightness/color_adjustment.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/tokens.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/pointer_capture.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.policy/device_listener.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.types/types.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/focuser.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/view.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/view_token.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.update.channel/channel.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.update.channelcontrol/channelcontrol.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.web/constants.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.web/context.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.web/cookie.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.web/debug.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.web/frame.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.web/navigation.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.web/url_request_rewrite_rules.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.policy/access_point_provider.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.policy/client_provider.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/zx/rights.fidl
-FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/executor.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/include/lib/async/cpp/executor.h
-FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/include/lib/async/cpp/irq.h
-FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/include/lib/async/cpp/paged_vmo.h
-FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/irq.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/paged_vmo.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/async-loop-default/include/lib/async-loop/default.h
-FILE: ../../../fuchsia/sdk/linux/pkg/async/include/lib/async/paged_vmo.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/directory.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/fd.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/include/lib/fidl/internal_callable_traits.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/include/lib/fidl/txn_header.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/include/lib/fidl/visitor.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/internal.c
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/event_sender.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/member_connector.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/service_connector.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/service_handler_base.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_sync/include/lib/fidl/cpp/internal/message_sender.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_sync/internal/message_sender.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/barrier.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/include/lib/fpromise/barrier.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/internal/utility.h
-FILE: ../../../fuchsia/sdk/linux/pkg/inspect/health.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/inspect/hierarchy.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/health.h
-FILE: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/hierarchy.h
-FILE: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/inspect.h
-FILE: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/reader.h
-FILE: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/vmo/block.h
-FILE: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/vmo/scanner.h
-FILE: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/vmo/snapshot.h
-FILE: ../../../fuchsia/sdk/linux/pkg/inspect/reader.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/inspect/vmo/scanner.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/inspect/vmo/snapshot.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/inspect_service_cpp/include/lib/inspect/service/cpp/reader.h
-FILE: ../../../fuchsia/sdk/linux/pkg/inspect_service_cpp/include/lib/inspect/service/cpp/service.h
-FILE: ../../../fuchsia/sdk/linux/pkg/inspect_service_cpp/reader.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/inspect_service_cpp/service.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/modular_cpp/agent.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/modular_cpp/include/lib/modular/cpp/agent.h
-FILE: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/include/lib/ui/scenic/cpp/view_ref_pair.h
-FILE: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/include/lib/ui/scenic/cpp/view_token_pair.h
-FILE: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/view_ref_pair.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/constructors.h
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/storage.h
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/utility.h
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/string_view.h
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/utility.h
-FILE: ../../../fuchsia/sdk/linux/pkg/sync/include/lib/sync/internal/mutex-internal.h
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_cpp/component_context.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_cpp/file_descriptor.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_cpp/include/lib/sys/cpp/component_context.h
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_cpp/include/lib/sys/cpp/file_descriptor.h
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_cpp/include/lib/sys/cpp/outgoing_directory.h
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_cpp/include/lib/sys/cpp/service_directory.h
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_cpp/outgoing_directory.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_cpp/service_directory.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_cpp/termination_reason.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_cpp_testing/component_context_provider.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_cpp_testing/service_directory_provider.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_inspect_cpp/component.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_inspect_cpp/include/lib/sys/inspect/cpp/component.h
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_service_cpp/include/lib/sys/service/cpp/service.h
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_service_cpp/include/lib/sys/service/cpp/service_aggregate.h
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_service_cpp/include/lib/sys/service/cpp/service_handler.h
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_service_cpp/include/lib/sys/service/cpp/service_watcher.h
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_service_cpp/service.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_service_cpp/service_aggregate.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_service_cpp/service_watcher.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/include/lib/vfs/cpp/flags.h
-FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/include/lib/vfs/cpp/internal/connection.h
-FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/include/lib/vfs/cpp/internal/directory.h
-FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/include/lib/vfs/cpp/internal/directory_connection.h
-FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/include/lib/vfs/cpp/internal/dirent_filler.h
-FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/include/lib/vfs/cpp/internal/file.h
-FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/include/lib/vfs/cpp/internal/file_connection.h
-FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/include/lib/vfs/cpp/internal/node.h
-FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/include/lib/vfs/cpp/internal/node_connection.h
-FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/include/lib/vfs/cpp/lazy_dir.h
-FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/include/lib/vfs/cpp/pseudo_dir.h
-FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/include/lib/vfs/cpp/pseudo_file.h
-FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/include/lib/vfs/cpp/remote_dir.h
-FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/include/lib/vfs/cpp/service.h
-FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/include/lib/vfs/cpp/vmo_file.h
-FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/internal/connection.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/internal/directory.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/internal/directory_connection.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/internal/dirent_filler.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/internal/file.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/internal/file_connection.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/internal/node.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/internal/node_connection.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/lazy_dir.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/pseudo_dir.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/pseudo_file.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/remote_dir.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/service.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/vmo_file.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/clock.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/exception.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/pager.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/pager.cc
+ORIGIN: ../../../fuchsia/sdk/linux/LICENSE.vulkan
+TYPE: LicenseType.apache
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/VkLayer_image_pipe_swapchain.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/VkLayer_khronos_validation.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libtrace-vthread.a
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/VkLayer_image_pipe_swapchain.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/VkLayer_khronos_validation.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libtrace-vthread.a
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/VkLayer_image_pipe_swapchain.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/VkLayer_khronos_validation.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libtrace-vthread.a
+FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/data/config/symbol_index/config.json
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/arm64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/arm64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/arm64-api-18/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/arm64-api-18/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/arm64-api-19/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/arm64-api-19/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/riscv64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/riscv64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/riscv64-api-18/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/riscv64-api-18/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/riscv64-api-19/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/riscv64-api-19/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/x64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/x64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/x64-api-18/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/x64-api-18/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/x64-api-19/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/x64-api-19/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/arm64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/arm64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/arm64-api-16/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/arm64-api-16/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/arm64-api-17/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/arm64-api-17/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/arm64-api-18/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/arm64-api-18/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/arm64-api-19/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/arm64-api-19/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/riscv64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/riscv64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/riscv64-api-16/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/riscv64-api-16/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/riscv64-api-17/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/riscv64-api-17/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/riscv64-api-18/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/riscv64-api-18/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/riscv64-api-19/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/riscv64-api-19/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/x64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/x64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/x64-api-16/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/x64-api-16/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/x64-api-17/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/x64-api-17/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/x64-api-18/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/x64-api-18/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/x64-api-19/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/x64-api-19/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/arm64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/arm64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/riscv64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/riscv64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/x64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/x64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/arm64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/arm64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/arm64-api-19/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/arm64-api-19/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/riscv64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/riscv64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/riscv64-api-19/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/riscv64-api-19/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/x64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/x64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/x64-api-19/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/x64-api-19/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/pkg/async-default/async-default.ifs
+FILE: ../../../fuchsia/sdk/linux/pkg/backend_fuchsia_globals/backend_fuchsia_globals.ifs
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_runtime_shared_lib/driver_runtime.ifs
+FILE: ../../../fuchsia/sdk/linux/pkg/fdio/fdio.ifs
+FILE: ../../../fuchsia/sdk/linux/pkg/heapdump_instrumentation/heapdump_instrumentation.ifs
+FILE: ../../../fuchsia/sdk/linux/pkg/heapdump_instrumentation/heapdump_instrumentation_shard.json
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect/inspect.json
+FILE: ../../../fuchsia/sdk/linux/pkg/svc/svc.ifs
+FILE: ../../../fuchsia/sdk/linux/pkg/sys/component/realm_builder_shard_sdk.json
+FILE: ../../../fuchsia/sdk/linux/pkg/syslog/syslog.ifs
+FILE: ../../../fuchsia/sdk/linux/pkg/syslog/syslog.json
+FILE: ../../../fuchsia/sdk/linux/pkg/sysroot/libc.ifs
+FILE: ../../../fuchsia/sdk/linux/pkg/sysroot/zircon.ifs
+FILE: ../../../fuchsia/sdk/linux/pkg/trace-engine/trace-engine.ifs
+FILE: ../../../fuchsia/sdk/linux/pkg/trace-provider-so/trace-provider-so.ifs
+FILE: ../../../fuchsia/sdk/linux/pkg/trace/trace.json
+FILE: ../../../fuchsia/sdk/linux/pkg/vfs_internal/vfs_internal.ifs
+FILE: ../../../fuchsia/sdk/linux/pkg/vulkan/vulkan.ifs
+FILE: ../../../fuchsia/sdk/linux/pkg/vulkan/vulkan.json
+FILE: ../../../fuchsia/sdk/linux/pkg/vulkan_layers/data/vulkan/explicit_layer.d/VkLayer_image_pipe_swapchain.json
+FILE: ../../../fuchsia/sdk/linux/pkg/vulkan_layers/data/vulkan/explicit_layer.d/VkLayer_khronos_validation.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/fidl_codec.so
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/fuchsia_controller_internal.so
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.buildinfo/fuchsia.buildinfo.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.component.config/fuchsia.component.config.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.component.decl/fuchsia.component.decl.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.component.runner/fuchsia.component.runner.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.component.sandbox/fuchsia.component.sandbox.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.component.types/fuchsia.component.types.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.component/fuchsia.component.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.data/fuchsia.data.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.developer.ffx/fuchsia.developer.ffx.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.developer.ffxdaemonlifecycle/fuchsia.developer.ffxdaemonlifecycle.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.developer.remotecontrol/fuchsia.developer.remotecontrol.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.diagnostics.types/fuchsia.diagnostics.types.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.diagnostics/fuchsia.diagnostics.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.feedback/fuchsia.feedback.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.gpu.agis/fuchsia.gpu.agis.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.hardware.power.statecontrol/fuchsia.hardware.power.statecontrol.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.hardware.rtc/fuchsia.hardware.rtc.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.hwinfo/fuchsia.hwinfo.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.intl/fuchsia.intl.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.io/fuchsia.io.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.ldsvc/fuchsia.ldsvc.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.math/fuchsia.math.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.mem/fuchsia.mem.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.net/fuchsia.net.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.process/fuchsia.process.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.sys2/fuchsia.sys2.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.tracing.controller/fuchsia.tracing.controller.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.tracing/fuchsia.tracing.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.unknown/fuchsia.unknown.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.url/fuchsia.url.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.version/fuchsia.version.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/zx/zx.fidl.json
 ----------------------------------------------------------------------------------------------------
-Copyright 2019 The Fuchsia Authors. All rights reserved.
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
+1. Definitions.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
 
-====================================================================================================
-LIBRARY: fuchsia_sdk
-ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/boot/crash-reason.h + ../../../fuchsia/sdk/linux/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/analyzer.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/boot/crash-reason.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/string_view.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls-next.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/testonly-syscalls.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/analyzer.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/boot/crash-reason.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/string_view.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls-next.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/testonly-syscalls.h
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_scenic_flutter/lib/fuchsia_view.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_scenic_flutter/lib/src/fuchsia_view.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_scenic_flutter/lib/src/fuchsia_view_connection.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_scenic_flutter/lib/src/fuchsia_view_controller.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_scenic_flutter/lib/src/pointer_injector.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/component.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/device.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/diagnostics.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/feedback_data_provider.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/power.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/proxy.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/tiles.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/time.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/gpu_metrics.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/total_trace_wall_time.dart
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.gesture/gesture_listener.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.a2dp/audio_mode.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.hfp/hfp.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.le/connection_options.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.sys/configuration.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.sys/pairing_options.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.sys/security_mode.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/deprecated.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/device_name.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.buildinfo/buildinfo.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera3/device.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera3/device_watcher.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera3/stream.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castremotecontrol/remote_control.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castsetup/server.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castwindow/window.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.types/constants.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component/constants.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component/error.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component/types.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics/interest.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics/severity.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.element/graphical_presenter.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.factory.wlan/iovar.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/crash_register.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/data_register.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/last_reboot_info.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.adc/adc.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/codec.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/dai.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/dai_format.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/device.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/frames.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/instance.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/mac.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/session.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.power.statecontrol/reboot_reason.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/consumer_control.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/device_ids.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input/keys.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/locking.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/debug-resource.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/hypervisor-resource.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/info-resource.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/ioport-resource.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/irq-resource.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/mexec-resource.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/mmio-resource.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/power-resource.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/smc-resource.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/vmex-resource.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.legacymetrics/event.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.legacymetrics/metrics_recorder.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.location.position/position.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.location.sensor/sensor.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.location/types.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.bootstrap/thread.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.device/device.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.device/energy_scanner.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.audio/effects_controller.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.drm/properties.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.drm/types.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.target/target_discovery.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/activity_reporter.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/profile_provider.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.memorypressure/memorypressure.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.metrics/metric_event_logger.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/session_restart_controller.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.interfaces/interfaces.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.routes/routes.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net/socket.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.process.lifecycle/lifecycle.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings.policy/error.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings.policy/volume_policy.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/factory_reset.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/input.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/light.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/night_mode.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input3/events.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input3/keyboard.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input3/modifiers.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointer.augment/augment.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointer/mouse.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointer/state.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointer/touch.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointer/view.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointerinjector/config.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointerinjector/device.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointerinjector/event.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.policy/display_backlight.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/view_ref.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/view_ref_focused.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/view_ref_installed.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ultrasound/factory.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.update/commit.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.update/update.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.url/url.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.weave/auth.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.weave/bootstrap.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.weave/common.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.weave/weavestack.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.ieee80211/reason_code.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.ieee80211/status_code.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.product.deprecatedclient/wlan_deprecated_client.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.product.deprecatedconfiguration/wlan_deprecated_configuration.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/zx/zx_common.fidl
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/handle_close_many.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/include/lib/fidl/trace.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/internal/bitset.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/internal/natural_types_header.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/internal/natural_types_implementation.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/types.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/internal/compiler.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/internal/result.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/result.h
-FILE: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/commands_sizing.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/include/lib/ui/scenic/cpp/commands_sizing.h
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/array.h
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/bit.h
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/array.h
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/bit.h
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/memory.h
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/source_location.h
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/version.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/msi.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/result.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/stream.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/msi.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/stream.cc
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: fuchsia_sdk
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/service_provider.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/input_event_constants.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/input_events.fidl + ../../../fuchsia/sdk/linux/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/service_provider.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/input_event_constants.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/input_events.fidl
 ----------------------------------------------------------------------------------------------------
-Copyright 2020 The Fuchsia Authors. All rights reserved.
+Copyright 2014 The Fuchsia Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -1838,11 +4721,887 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: fuchsia_sdk
-ORIGIN: ../../../fuchsia/sdk/linux/dart/fuchsia_services/lib/src/component_context.dart + ../../../LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/assert.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/compiler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/listnode.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/processargs.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/status.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/debug.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/log.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/object.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/port.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/profile.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/resource.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/assert.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/compiler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/listnode.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/processargs.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/status.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/debug.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/log.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/object.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/port.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/profile.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/resource.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/assert.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/compiler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/listnode.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/processargs.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/status.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/debug.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/log.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/object.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/port.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/profile.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/resource.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.runner/component_runner.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.fonts/font_provider.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.math/math.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.playback/problem.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.playback/seeking_reader.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/audio.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/module_context.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/session_shell.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/story_controller.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/story_info.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/story_provider.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/component_controller.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/environment.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/environment_controller.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/launcher.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/loader.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/runner.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.tracing.provider/provider.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.policy/presenter.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/assert.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/compiler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/listnode.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/processargs.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/status.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/debug.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/log.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/object.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/port.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/profile.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/resource.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/assert.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/compiler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/listnode.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/processargs.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/status.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/debug.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/log.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/object.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/port.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/profile.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/resource.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/assert.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/compiler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/listnode.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/processargs.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/status.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/debug.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/log.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/object.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/port.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/profile.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/resource.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/assert.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/compiler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/listnode.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/processargs.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/status.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/debug.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/log.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/object.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/port.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/profile.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/resource.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/assert.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/compiler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/listnode.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/processargs.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/status.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/debug.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/log.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/object.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/port.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/profile.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/resource.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/assert.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/compiler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/listnode.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/processargs.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/status.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/debug.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/log.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/object.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/port.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/profile.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/resource.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/assert.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/compiler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/listnode.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/processargs.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/status.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/debug.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/log.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/object.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/port.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/profile.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/resource.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/assert.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/compiler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/listnode.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/processargs.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/status.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/debug.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/log.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/object.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/port.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/profile.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/resource.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/assert.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/compiler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/listnode.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/processargs.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/status.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/debug.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/log.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/object.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/port.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/profile.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/resource.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/assert.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/compiler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/listnode.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/processargs.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/status.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/debug.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/log.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/object.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/port.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/profile.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/resource.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/assert.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/compiler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/listnode.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/processargs.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/status.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/debug.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/log.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/object.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/port.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/profile.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/resource.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/assert.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/compiler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/listnode.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/processargs.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/status.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/debug.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/log.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/object.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/port.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/profile.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/resource.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/assert.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/compiler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/listnode.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/processargs.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/status.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/debug.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/log.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/object.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/port.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/profile.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/resource.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/assert.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/compiler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/listnode.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/processargs.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/status.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/debug.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/log.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/object.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/port.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/profile.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/resource.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/assert.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/compiler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/listnode.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/processargs.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/status.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/debug.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/log.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/object.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/port.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/profile.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/resource.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/assert.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/compiler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/listnode.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/processargs.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/status.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/debug.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/log.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/object.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/port.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/profile.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/resource.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/assert.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/compiler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/listnode.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/processargs.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/status.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/debug.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/log.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/object.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/port.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/profile.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/resource.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/assert.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/compiler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/listnode.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/processargs.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/status.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/debug.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/log.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/object.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/port.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/profile.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/resource.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/assert.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/compiler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/listnode.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/processargs.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/status.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/debug.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/log.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/object.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/port.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/profile.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/resource.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/assert.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/compiler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/listnode.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/processargs.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/status.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/debug.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/log.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/object.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/port.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/profile.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/resource.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/assert.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/compiler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/listnode.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/processargs.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/status.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/debug.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/log.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/object.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/port.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/profile.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/resource.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/fdio.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/io.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/vfs.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/watcher.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/thread_checker.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/magma_client/include/lib/magma/magma.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/magma_common/include/lib/magma/magma_common_defs.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/media_cpp_no_converters/include/lib/media/cpp/timeline_function.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/media_cpp_no_converters/include/lib/media/cpp/timeline_rate.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/media_cpp_no_converters/timeline_function.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/media_cpp_no_converters/timeline_rate.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/sync/include/lib/sync/completion.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/channel.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/event.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/eventpair.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/channel.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/event.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/eventpair.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/job.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/object.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/object_traits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/port.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/process.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/socket.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/task.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/thread.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/time.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/vmar.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/vmo.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/job.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/port.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/process.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/socket.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/thread.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/vmar.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/vmo.cc + ../../../fuchsia/sdk/linux/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_services/lib/src/component_context.dart
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/assert.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/compiler.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/listnode.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/processargs.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/status.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/debug.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/exception.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/log.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/object.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/pci.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/port.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/profile.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/resource.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/types.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/types.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/assert.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/compiler.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/listnode.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/processargs.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/status.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/debug.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/exception.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/log.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/object.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/pci.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/port.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/profile.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/resource.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/types.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/types.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/assert.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/compiler.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/listnode.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/processargs.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/status.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/debug.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/exception.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/log.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/object.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/pci.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/port.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/profile.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/resource.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/types.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/types.h
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.runner/component_runner.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.fonts/font_provider.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.math/math.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.playback/problem.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.playback/seeking_reader.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/audio.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/module_context.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/session_shell.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/story_controller.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/story_info.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/story_provider.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/component_controller.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/environment.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/environment_controller.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/launcher.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/loader.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/runner.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.tracing.provider/provider.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.policy/presenter.fidl
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/compiler.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/listnode.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/processargs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/status.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/debug.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/log.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/object.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/port.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/profile.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/resource.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/compiler.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/listnode.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/processargs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/status.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/debug.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/log.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/object.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/port.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/profile.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/resource.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/compiler.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/listnode.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/processargs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/status.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/debug.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/log.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/object.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/port.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/profile.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/resource.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/compiler.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/listnode.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/processargs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/status.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/debug.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/log.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/object.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/port.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/profile.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/resource.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/compiler.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/listnode.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/processargs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/status.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/debug.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/log.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/object.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/port.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/profile.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/resource.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/compiler.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/listnode.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/processargs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/status.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/debug.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/log.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/object.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/port.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/profile.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/resource.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/compiler.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/listnode.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/processargs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/status.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/debug.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/log.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/object.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/port.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/profile.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/resource.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/compiler.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/listnode.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/processargs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/status.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/debug.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/log.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/object.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/port.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/profile.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/resource.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/compiler.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/listnode.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/processargs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/status.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/debug.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/log.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/object.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/port.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/profile.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/resource.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/compiler.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/listnode.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/processargs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/status.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/debug.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/log.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/object.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/port.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/profile.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/resource.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/compiler.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/listnode.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/processargs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/status.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/debug.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/log.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/object.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/port.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/profile.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/resource.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/compiler.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/listnode.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/processargs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/status.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/debug.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/log.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/object.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/port.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/profile.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/resource.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/compiler.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/listnode.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/processargs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/status.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/debug.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/log.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/object.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/port.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/profile.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/resource.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/compiler.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/listnode.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/processargs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/status.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/debug.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/log.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/object.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/port.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/profile.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/resource.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/compiler.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/listnode.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/processargs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/status.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/debug.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/log.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/object.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/port.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/profile.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/resource.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/compiler.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/listnode.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/processargs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/status.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/debug.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/log.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/object.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/port.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/profile.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/resource.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/compiler.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/listnode.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/processargs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/status.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/debug.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/log.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/object.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/port.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/profile.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/resource.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/compiler.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/listnode.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/processargs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/status.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/debug.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/log.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/object.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/port.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/profile.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/resource.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/compiler.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/listnode.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/processargs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/status.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/debug.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/log.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/object.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/port.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/profile.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/resource.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/compiler.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/listnode.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/processargs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/status.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/debug.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/log.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/object.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/port.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/profile.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/resource.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/compiler.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/listnode.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/processargs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/status.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/debug.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/log.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/object.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/port.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/profile.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/resource.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/types.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/fdio.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/io.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/vfs.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/watcher.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/thread_checker.h
+FILE: ../../../fuchsia/sdk/linux/pkg/magma_client/include/lib/magma/magma.h
+FILE: ../../../fuchsia/sdk/linux/pkg/magma_common/include/lib/magma/magma_common_defs.h
+FILE: ../../../fuchsia/sdk/linux/pkg/media_cpp_no_converters/include/lib/media/cpp/timeline_function.h
+FILE: ../../../fuchsia/sdk/linux/pkg/media_cpp_no_converters/include/lib/media/cpp/timeline_rate.h
+FILE: ../../../fuchsia/sdk/linux/pkg/media_cpp_no_converters/timeline_function.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/media_cpp_no_converters/timeline_rate.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/sync/include/lib/sync/completion.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/channel.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/event.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/eventpair.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/channel.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/event.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/eventpair.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/job.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/object.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/object_traits.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/port.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/process.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/socket.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/task.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/thread.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/time.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/vmar.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/vmo.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/job.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/port.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/process.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/socket.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/thread.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/vmar.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/vmo.cc
 ----------------------------------------------------------------------------------------------------
-Copyright 2021 The Chromium Authors. All rights reserved.
+Copyright 2016 The Fuchsia Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -1854,9 +5613,6 @@ notice, this list of conditions and the following disclaimer.
 copyright notice, this list of conditions and the following disclaimer
 in the documentation and/or other materials provided with the
 distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -1873,153 +5629,735 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: fuchsia_sdk
-ORIGIN: ../../../fuchsia/sdk/linux/dart/zircon/lib/src/fakes/handle_disposition.dart + ../../../flutter/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../fuchsia/sdk/linux/dart/zircon/lib/src/fakes/handle_disposition.dart
-----------------------------------------------------------------------------------------------------
-Copyright 2021 The Flutter Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google Inc. nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: fuchsia_sdk
-ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/availability.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/device/audio.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/fidl.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/hw/gpt.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/process.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/rights.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/sanitizer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/hypervisor.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/iommu.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/policy.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/system.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/tls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/device/audio.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/fidl.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/hw/gpt.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/process.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/rights.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/sanitizer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/hypervisor.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/iommu.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/policy.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/system.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/tls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/device/audio.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/fidl.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/hw/gpt.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/process.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/rights.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/sanitizer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/hypervisor.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/iommu.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/policy.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/system.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/tls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth/auth_provider.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth/token_manager.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt/client.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt/server.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.le/peripheral.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.le/types_deprecated.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.images/presentation_info.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/audio_capturer.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.mem/buffer.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/agent.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/agent_controller.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/component_context.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/intent.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/lifecycle.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/module_data.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/module_state.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/story_shell.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/story_state.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/surface.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.mdns/mdns.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/flat_namespace.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/commands.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/display_info.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/events.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/nodes.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/renderer.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/resources.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/shapes.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/types.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/ime_service.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/input_device_registry.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/input_reports.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/text_editing.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/text_input.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/usages.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.policy/presentation.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/device/audio.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/fidl.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/hw/gpt.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/process.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/rights.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/sanitizer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/hypervisor.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/iommu.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/policy.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/system.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/tls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/device/audio.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/fidl.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/hw/gpt.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/process.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/rights.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/sanitizer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/hypervisor.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/iommu.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/policy.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/system.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/tls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/device/audio.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/fidl.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/hw/gpt.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/process.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/rights.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/sanitizer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/hypervisor.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/iommu.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/policy.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/system.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/tls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/device/audio.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/fidl.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/hw/gpt.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/process.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/rights.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/sanitizer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/hypervisor.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/iommu.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/policy.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/system.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/tls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/device/audio.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/fidl.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/hw/gpt.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/process.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/rights.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/sanitizer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/hypervisor.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/iommu.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/policy.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/system.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/tls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/device/audio.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/fidl.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/hw/gpt.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/process.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/rights.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/sanitizer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/hypervisor.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/iommu.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/policy.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/system.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/tls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/device/audio.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/fidl.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/hw/gpt.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/process.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/rights.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/sanitizer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/hypervisor.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/iommu.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/policy.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/system.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/tls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/device/audio.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/fidl.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/hw/gpt.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/process.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/rights.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/sanitizer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/hypervisor.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/iommu.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/policy.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/system.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/tls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/device/audio.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/fidl.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/hw/gpt.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/process.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/rights.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/sanitizer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/hypervisor.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/iommu.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/policy.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/system.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/tls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/device/audio.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/fidl.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/hw/gpt.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/process.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/rights.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/sanitizer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/hypervisor.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/iommu.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/policy.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/system.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/tls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/device/audio.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/fidl.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/hw/gpt.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/process.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/rights.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/sanitizer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/hypervisor.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/iommu.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/policy.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/system.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/tls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/device/audio.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/fidl.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/hw/gpt.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/process.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/rights.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/sanitizer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/hypervisor.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/iommu.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/policy.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/system.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/tls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/device/audio.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/fidl.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/hw/gpt.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/process.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/rights.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/sanitizer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/hypervisor.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/iommu.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/policy.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/system.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/tls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/device/audio.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/fidl.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/hw/gpt.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/process.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/rights.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/sanitizer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/hypervisor.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/iommu.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/policy.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/system.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/tls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/device/audio.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/fidl.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/hw/gpt.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/process.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/rights.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/sanitizer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/hypervisor.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/iommu.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/policy.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/system.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/tls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/device/audio.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/fidl.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/hw/gpt.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/process.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/rights.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/sanitizer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/hypervisor.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/iommu.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/policy.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/system.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/tls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/device/audio.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/fidl.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/hw/gpt.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/process.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/rights.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/sanitizer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/hypervisor.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/iommu.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/policy.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/system.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/tls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/device/audio.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/fidl.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/hw/gpt.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/process.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/rights.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/sanitizer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/hypervisor.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/iommu.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/policy.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/system.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/tls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/device/audio.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/fidl.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/hw/gpt.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/process.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/rights.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/sanitizer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/hypervisor.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/iommu.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/policy.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/system.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/tls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/device/audio.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/fidl.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/hw/gpt.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/process.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/rights.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/sanitizer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/hypervisor.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/iommu.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/policy.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/system.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/tls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/device/audio.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/fidl.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/hw/gpt.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/process.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/rights.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/sanitizer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/hypervisor.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/iommu.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/policy.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/system.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/tls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async-cpp/include/lib/async/cpp/receiver.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async-cpp/include/lib/async/cpp/task.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async-cpp/include/lib/async/cpp/wait.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async-cpp/receiver.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async-cpp/task.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async-cpp/trap.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async-cpp/wait.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async-default/include/lib/async/default.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async-loop-cpp/include/lib/async-loop/cpp/loop.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async-loop-cpp/loop_wrapper.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async-loop-testing/real_loop.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async-loop/include/lib/async-loop/loop.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async-loop/loop.c + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async-testing/dispatcher_stub.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async-testing/include/lib/async-testing/dispatcher_stub.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async/include/lib/async/dispatcher.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async/include/lib/async/irq.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async/include/lib/async/receiver.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async/include/lib/async/task.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async/include/lib/async/wait.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async/ops.c + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/limits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/namespace.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/unsafe.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_base/decoding_and_validating.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_base/formatting.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_base/include/lib/fidl/coding.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_base/include/lib/fidl/internal.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/string_view.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/vector_view.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/function.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/internal/function.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace-engine-headersonly/include/lib/trace-engine/context.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace-engine-headersonly/include/lib/trace-engine/fields.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace-engine-headersonly/include/lib/trace-engine/handler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace-engine-headersonly/include/lib/trace-engine/instrumentation.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace-engine-headersonly/include/lib/trace-engine/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace-engine/include/lib/trace-engine/context.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace-engine/include/lib/trace-engine/fields.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace-engine/include/lib/trace-engine/handler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace-engine/include/lib/trace-engine/instrumentation.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace-engine/include/lib/trace-engine/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace-headersonly/include/lib/trace/event.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace-headersonly/include/lib/trace/internal/event_common.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace-headersonly/include/lib/trace/internal/event_internal.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace-headersonly/include/lib/trace/internal/pairs_internal.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace-headersonly/include/lib/trace/internal/string_traits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace-headersonly/include/lib/trace/observer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace-provider-so/include/lib/trace-provider/handler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace-provider-so/include/lib/trace-provider/provider.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace/event.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace/include/lib/trace/event.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace/include/lib/trace/internal/event_common.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace/include/lib/trace/internal/event_internal.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace/include/lib/trace/internal/pairs_internal.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace/include/lib/trace/internal/string_traits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace/include/lib/trace/observer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace/observer.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/fifo.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/fifo.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/handle.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/timer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/timer.cc + ../../../fuchsia/sdk/linux/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/availability.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/availability.h
-FILE: ../../../fuchsia/sdk/linux/dart/fidl/lib/src/codegen_common.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fidl/lib/src/wire_format.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_inspect/lib/reader.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_inspect/lib/src/reader/diagnostic_config.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_inspect/lib/src/reader/diagnostic_data.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_inspect/lib/src/reader/reader.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_scenic/lib/src/scenic_context.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_scenic_flutter/lib/src/focus_state.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_scenic_flutter/lib/src/fuchsia_views_service.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_services/lib/src/dart_vm.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_vfs/lib/src/remote_dir.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/camera_metrics.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/flatland_latency.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/virtual_camera.dart
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.virtualkeyboard/virtual_keyboard.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.audio.effects/creator.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.audio.effects/processor.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt2/client.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt2/constants.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt2/server.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt2/types.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.config/specs.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.config/value.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/capability.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/child.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/collection.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/component.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/config.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/environment.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/events.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/expose.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/offer.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/program.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/relative_refs.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/types.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/use.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.test/realm_builder.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component/binder.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component/realm.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics.types/component.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics/log_settings.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.test/realm.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/data_provider_controller.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.gpu.agis/agis.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/signal_processing.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/codec_connector.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/dai_connector.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/health.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.goldfish/goldfish_sync.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/port.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.radar/radar.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.virtualkeyboard/virtual_keyboard.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input/keymap.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.intl/calendar.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.intl/time_zones.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/inotify.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/rights-abilities.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/cpu-resource.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lightsensor/calibrator.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lightsensor/sensor.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lightsensor/types.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.device/counters.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mediastreams/audio_format.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mediastreams/compression.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mediastreams/encryption.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mediastreams/media_format.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mediastreams/video_format.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.power.profile/profile.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/keyboard.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.thermal/client_state.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.composition/allocator.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.composition/flatland.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.observation.geometry/watcher.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/flatland_tokens.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.common/wlan_common.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.ieee80211/constants.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.ieee80211/rsn.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.policy/types.fidl
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/wire_format_metadata.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/include/lib/ui/scenic/cpp/view_creation_tokens.h
-FILE: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/include/lib/ui/scenic/cpp/view_identity.h
-FILE: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/view_creation_tokens.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/view_identity.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/algorithm.h
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/atomic.h
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/cstddef.h
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/functional.h
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/algorithm.h
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/atomic.h
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/erase.h
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/exception.h
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/functional.h
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/span.h
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/tuple.h
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/type_traits.h
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/iterator.h
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/span.h
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/tuple.h
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_component_cpp_testing/internal/errors.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_component_cpp_testing/internal/local_component_runner.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_component_cpp_testing/internal/realm.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_component_cpp_testing/realm_builder.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_component_cpp_testing/realm_builder_types.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_component_cpp_testing/scoped_child.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/syslog_structured_backend/fuchsia_syslog.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/syslog_structured_backend/include/lib/syslog/structured_backend/cpp/fuchsia_syslog.h
-FILE: ../../../fuchsia/sdk/linux/pkg/syslog_structured_backend/include/lib/syslog/structured_backend/fuchsia_syslog.h
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/status_string.cc
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/device/audio.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/fidl.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/hw/gpt.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/process.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/rights.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/sanitizer.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/hypervisor.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/iommu.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/policy.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/system.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/tls.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/device/audio.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/fidl.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/hw/gpt.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/process.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/rights.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/sanitizer.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/hypervisor.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/iommu.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/policy.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/system.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/tls.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/device/audio.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/fidl.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/hw/gpt.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/process.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/rights.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/sanitizer.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/hypervisor.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/iommu.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/policy.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/system.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/tls.h
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth/auth_provider.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth/token_manager.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt/client.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt/server.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.le/peripheral.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.le/types_deprecated.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.images/presentation_info.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/audio_capturer.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mem/buffer.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/agent.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/agent_controller.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/component_context.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/intent.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/lifecycle.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/module_data.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/module_state.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/story_shell.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/story_state.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/surface.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.mdns/mdns.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/flat_namespace.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/commands.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/display_info.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/events.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/nodes.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/renderer.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/resources.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/shapes.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/types.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/ime_service.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/input_device_registry.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/input_reports.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/text_editing.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/text_input.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/usages.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.policy/presentation.fidl
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/device/audio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/fidl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/hw/gpt.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/process.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/rights.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/sanitizer.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/hypervisor.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/iommu.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/policy.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/system.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/tls.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/device/audio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/fidl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/hw/gpt.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/process.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/rights.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/sanitizer.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/hypervisor.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/iommu.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/policy.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/system.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/tls.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/device/audio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/fidl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/hw/gpt.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/process.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/rights.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/sanitizer.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/hypervisor.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/iommu.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/policy.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/system.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/tls.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/device/audio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/fidl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/hw/gpt.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/process.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/rights.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/sanitizer.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/hypervisor.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/iommu.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/policy.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/system.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/tls.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/device/audio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/fidl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/hw/gpt.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/process.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/rights.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/sanitizer.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/hypervisor.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/iommu.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/policy.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/system.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/tls.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/device/audio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/fidl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/hw/gpt.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/process.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/rights.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/sanitizer.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/hypervisor.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/iommu.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/policy.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/system.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/tls.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/device/audio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/fidl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/hw/gpt.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/process.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/rights.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/sanitizer.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/hypervisor.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/iommu.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/policy.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/system.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/tls.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/device/audio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/fidl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/hw/gpt.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/process.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/rights.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/sanitizer.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/hypervisor.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/iommu.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/policy.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/system.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/tls.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/device/audio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/fidl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/hw/gpt.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/process.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/rights.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/sanitizer.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/hypervisor.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/iommu.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/policy.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/system.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/tls.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/device/audio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/fidl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/hw/gpt.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/process.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/rights.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/sanitizer.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/hypervisor.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/iommu.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/policy.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/system.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/tls.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/device/audio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/fidl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/hw/gpt.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/process.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/rights.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/sanitizer.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/hypervisor.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/iommu.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/policy.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/system.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/tls.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/device/audio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/fidl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/hw/gpt.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/process.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/rights.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/sanitizer.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/hypervisor.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/iommu.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/policy.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/system.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/tls.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/device/audio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/fidl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/hw/gpt.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/process.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/rights.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/sanitizer.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/hypervisor.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/iommu.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/policy.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/system.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/tls.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/device/audio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/fidl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/hw/gpt.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/process.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/rights.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/sanitizer.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/hypervisor.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/iommu.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/policy.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/system.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/tls.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/device/audio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/fidl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/hw/gpt.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/process.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/rights.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/sanitizer.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/hypervisor.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/iommu.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/policy.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/system.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/tls.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/device/audio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/fidl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/hw/gpt.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/process.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/rights.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/sanitizer.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/hypervisor.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/iommu.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/policy.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/system.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/tls.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/device/audio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/fidl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/hw/gpt.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/process.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/rights.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/sanitizer.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/hypervisor.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/iommu.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/policy.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/system.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/tls.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/device/audio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/fidl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/hw/gpt.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/process.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/rights.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/sanitizer.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/hypervisor.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/iommu.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/policy.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/system.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/tls.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/device/audio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/fidl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/hw/gpt.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/process.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/rights.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/sanitizer.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/hypervisor.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/iommu.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/policy.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/system.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/tls.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/device/audio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/fidl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/hw/gpt.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/process.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/rights.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/sanitizer.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/hypervisor.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/iommu.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/policy.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/system.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/tls.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/device/audio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/fidl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/hw/gpt.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/process.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/rights.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/sanitizer.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/hypervisor.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/iommu.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/policy.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/system.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/tls.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/include/lib/async/cpp/receiver.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/include/lib/async/cpp/task.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/include/lib/async/cpp/wait.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/receiver.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/task.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/trap.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/wait.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/async-default/include/lib/async/default.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async-loop-cpp/include/lib/async-loop/cpp/loop.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async-loop-cpp/loop_wrapper.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/async-loop-testing/real_loop.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/async-loop/include/lib/async-loop/loop.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async-loop/loop.c
+FILE: ../../../fuchsia/sdk/linux/pkg/async-testing/dispatcher_stub.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/async-testing/include/lib/async-testing/dispatcher_stub.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async/include/lib/async/dispatcher.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async/include/lib/async/irq.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async/include/lib/async/receiver.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async/include/lib/async/task.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async/include/lib/async/wait.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async/ops.c
+FILE: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/limits.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/namespace.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/unsafe.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/decoding_and_validating.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/formatting.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/include/lib/fidl/coding.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/include/lib/fidl/internal.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/string_view.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/vector_view.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/function.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/internal/function.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace-engine-headersonly/include/lib/trace-engine/context.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace-engine-headersonly/include/lib/trace-engine/fields.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace-engine-headersonly/include/lib/trace-engine/handler.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace-engine-headersonly/include/lib/trace-engine/instrumentation.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace-engine-headersonly/include/lib/trace-engine/types.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace-engine/include/lib/trace-engine/context.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace-engine/include/lib/trace-engine/fields.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace-engine/include/lib/trace-engine/handler.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace-engine/include/lib/trace-engine/instrumentation.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace-engine/include/lib/trace-engine/types.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace-headersonly/include/lib/trace/event.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace-headersonly/include/lib/trace/internal/event_common.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace-headersonly/include/lib/trace/internal/event_internal.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace-headersonly/include/lib/trace/internal/pairs_internal.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace-headersonly/include/lib/trace/internal/string_traits.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace-headersonly/include/lib/trace/observer.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace-provider-so/include/lib/trace-provider/handler.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace-provider-so/include/lib/trace-provider/provider.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace/event.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/trace/include/lib/trace/event.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace/include/lib/trace/internal/event_common.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace/include/lib/trace/internal/event_internal.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace/include/lib/trace/internal/pairs_internal.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace/include/lib/trace/internal/string_traits.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace/include/lib/trace/observer.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace/observer.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/fifo.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/fifo.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/handle.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/timer.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/timer.cc
 ----------------------------------------------------------------------------------------------------
-Copyright 2021 The Fuchsia Authors. All rights reserved.
+Copyright 2017 The Fuchsia Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -2047,172 +6385,741 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: fuchsia_sdk
-ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/boot/driver-config.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/dlfcn.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/features.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/hw/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/limits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/smc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/threads.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/time.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/dlfcn.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/features.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/hw/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/limits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/smc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/threads.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/time.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/dlfcn.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/features.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/hw/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/limits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/smc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/threads.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/time.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth/attestation_signer.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth/common.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt/types.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.le/central.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera/camera.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera/manager.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.data/data.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.developer.tiles/tiles.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.gpu.magma/magma.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.i2c/i2c.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.rtc/rtc.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.images/encoded_image.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.images/image_info.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.images/memory_type.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.intl/intl.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/directory.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/node.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ldsvc/ldsvc.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.logger/logger.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.audio/gain_control.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.playback/player.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.playback/source_manager.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/audio_device_enumerator.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/audio_renderer.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/metadata.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/stream.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/stream_common.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/stream_processor.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/stream_type.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/timeline_function.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.mediacodec/codec_factory.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/module_manifest.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/puppet_master.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/story_command.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/story_options.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.http/client.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.net/net.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.process/launcher.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.process/resolver.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/job_provider.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysinfo/sysinfo.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/allocator.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/collection.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/collections_deprecated.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/constraints.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/driver_connector.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/format_modifier.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/formats_deprecated.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/image_formats.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/image_formats_deprecated.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/usages.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.app/view_provider.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/pose_buffer_provider.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/commands.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.policy/display_usage.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.scenic/commands.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.scenic/events.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.scenic/scenic.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.scenic/session.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.scenic/snapshot.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/commands.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/dlfcn.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/features.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/hw/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/limits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/smc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/threads.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/time.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/dlfcn.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/features.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/hw/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/limits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/smc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/threads.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/time.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/dlfcn.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/features.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/hw/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/limits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/smc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/threads.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/time.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/dlfcn.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/features.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/hw/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/limits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/smc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/threads.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/time.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/dlfcn.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/features.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/hw/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/limits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/smc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/threads.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/time.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/dlfcn.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/features.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/hw/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/limits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/smc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/threads.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/time.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/dlfcn.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/features.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/hw/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/limits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/smc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/threads.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/time.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/dlfcn.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/features.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/hw/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/limits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/smc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/threads.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/time.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/dlfcn.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/features.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/hw/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/limits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/smc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/threads.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/time.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/dlfcn.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/features.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/hw/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/limits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/smc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/threads.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/time.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/dlfcn.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/features.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/hw/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/limits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/smc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/threads.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/time.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/dlfcn.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/features.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/hw/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/limits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/smc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/threads.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/time.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/dlfcn.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/features.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/hw/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/limits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/smc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/threads.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/time.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/dlfcn.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/features.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/hw/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/limits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/smc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/threads.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/time.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/dlfcn.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/features.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/hw/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/limits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/smc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/threads.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/time.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/dlfcn.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/features.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/hw/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/limits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/smc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/threads.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/time.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/dlfcn.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/features.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/hw/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/limits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/smc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/threads.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/time.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/dlfcn.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/features.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/hw/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/limits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/smc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/threads.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/time.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/dlfcn.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/features.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/hw/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/limits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/smc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/threads.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/time.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/dlfcn.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/features.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/hw/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/limits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/smc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/threads.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/time.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/dlfcn.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/features.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/hw/pci.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/limits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/smc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/threads.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/time.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async-cpp/include/lib/async/cpp/time.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async-cpp/include/lib/async/cpp/trap.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async-testing/include/lib/async-testing/test_loop.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async-testing/include/lib/async-testing/test_loop_dispatcher.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async-testing/include/lib/async-testing/test_subloop.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async-testing/test_loop.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async-testing/test_loop_dispatcher.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async/include/lib/async/time.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async/include/lib/async/trap.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/spawn.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl/epitaph.c + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl/include/lib/fidl/epitaph.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_base/include/lib/fidl/walker.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/binding.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/binding_set.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/interface_ptr.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/interface_ptr_set.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/internal/header.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/internal/implementation.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/internal/message_handler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/internal/message_reader.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/internal/pending_response.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/internal/proxy.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/internal/proxy_controller.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/internal/stub.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/internal/stub_controller.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/internal/weak_stub_controller.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/type_converter.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/internal/message_handler.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/internal/message_reader.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/internal/pending_response.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/internal/proxy.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/internal/proxy_controller.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/internal/stub.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/internal/stub_controller.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/internal/weak_stub_controller.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/clone.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/decoder.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/encoder.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/clone.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/coding_traits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/comparison.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/decoder.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/encoder.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/enum.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/interface_handle.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/interface_request.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/message.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/message_buffer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/message_part.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/string.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/traits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/vector.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/message.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/message_buffer.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_sync/include/lib/fidl/cpp/internal/logging.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_sync/include/lib/fidl/cpp/internal/synchronous_proxy.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_sync/include/lib/fidl/cpp/synchronous_interface_ptr.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_sync/internal/logging.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_sync/internal/synchronous_proxy.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/array.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/traits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/message.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fit-promise/include/lib/fpromise/bridge.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fit-promise/include/lib/fpromise/bridge_internal.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fit-promise/include/lib/fpromise/promise.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fit-promise/include/lib/fpromise/promise_internal.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fit-promise/include/lib/fpromise/result.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fit-promise/include/lib/fpromise/scheduler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fit-promise/include/lib/fpromise/scope.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fit-promise/include/lib/fpromise/sequencer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fit-promise/include/lib/fpromise/single_threaded_executor.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fit-promise/promise.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fit-promise/scheduler.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fit-promise/scope.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fit-promise/sequencer.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fit-promise/single_threaded_executor.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/defer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/function_traits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/nullable.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/thread_safety.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/traits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/images_cpp/images.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/images_cpp/include/lib/images/cpp/images.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/inspector.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/vmo/heap.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/vmo/limits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/vmo/state.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/vmo/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect/inspector.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect/vmo/heap.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect/vmo/state.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect/vmo/types.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/media_cpp/include/lib/media/cpp/type_converters.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/media_cpp/type_converters.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/view_token_pair.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/optional.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/queue.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/type_traits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/variant.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/vector.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/svc/include/lib/svc/dir.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/sync/include/lib/sync/condition.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/sync/include/lib/sync/internal/condition-template.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/sync/include/lib/sync/mutex.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/syslog/include/lib/syslog/global.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/syslog/include/lib/syslog/logger.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/syslog/include/lib/syslog/wire_format.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace-engine-headersonly/include/lib/trace-engine/buffer_internal.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace-headersonly/include/lib/trace/event_args.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace-headersonly/include/lib/trace/internal/event_args.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace-provider-so/include/lib/trace-provider/fdio_connect.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace-vthread-headersonly/include/trace-vthread/event_vthread.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace-vthread-headersonly/include/trace-vthread/internal/event_vthread.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace-vthread/include/trace-vthread/event_vthread.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace-vthread/include/trace-vthread/internal/event_vthread.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace/include/lib/trace/event_args.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace/include/lib/trace/internal/event_args.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/include/lib/vfs/cpp/composed_service_dir.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/bti.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/debuglog.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/guest.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/bti.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/debuglog.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/guest.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/interrupt.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/iommu.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/pmt.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/profile.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/resource.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/suspend_token.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/vcpu.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/interrupt.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/iommu.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/profile.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/resource.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/vcpu.cc + ../../../fuchsia/sdk/linux/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/boot/driver-config.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/errors.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/boot/driver-config.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/errors.h
-FILE: ../../../fuchsia/sdk/linux/dart/fidl/lib/src/optional_nullable.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_component_test/lib/realm_builder.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_component_test/lib/src/error.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_component_test/lib/src/internal/local_component.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_component_test/lib/src/internal/local_component_runner.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_component_test/lib/src/local_component_handles.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_component_test/lib/src/realm_builder.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_view/lib/src/view_creation_token_pair.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_view/lib/tokens.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/performance_publish.dart
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/power_metrics.dart
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.semantics/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.audio.effects/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.fastpair/provider.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt2/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.le/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.sys/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.sys/pairing.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.buildinfo.test/buildinfotest.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera2/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera3/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castsetup/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.config/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.config/resolved.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.resolution/component.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.resolution/overview.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.component/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.debugdata/publisher.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.element/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.fonts/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/connector.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/dynamics.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/equalizer.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/gain.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/vendor_specific.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.goldfish/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/diagnostics.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.power.statecontrol/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.images/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.intl/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.legacymetrics/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lightsensor/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.device/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.thread/dataset.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.thread/meshcop.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.thread/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan/lowpan.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.audio/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.drm/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.playback/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sessions2/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mediastreams/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mem/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.mdns/common.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.mdns/host_name_resolver.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.mdns/host_name_subscriber.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.mdns/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.mdns/proxy_host_publisher.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.mdns/service_instance_publisher.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.mdns/service_instance_resolver.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.mdns/service_subscriber.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.reachability/reachability.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.power.clientlevel/clientlevel.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.power.systemmode/systemmode.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.process/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.recovery.ui/progress.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings.policy/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.thermal/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.tracing.perfetto/consumer.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.tracing.perfetto/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.tracing.perfetto/producer.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.activity/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.app/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.brightness/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.composition/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.composition/screen_capture.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.composition/screenshot.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input3/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.observation.geometry/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointer/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointerinjector/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.policy/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.scenic/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.test.input/media_buttons.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.test.input/mouse.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.test.input/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.test.input/registry.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.test.input/text.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.test.input/touch.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.test.scene/controller.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.test.scene/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.unknown/unknown.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.update.config/config.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.update/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.version/version.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.weave/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.web/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.common/driver_features.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.common/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.ieee80211/fields.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.ieee80211/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.policy/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/fidl/zx/overview.fidl
-FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/include/lib/async/cpp/sequence_checker.h
-FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/sequence_checker.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/async/include/lib/async/sequence_id.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/include/lib/fidl/cpp/transaction_header.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/include/lib/fidl/cpp/transport_err.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/include/lib/fidl/cpp/wire_format_metadata.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/internal/unknown_interactions_table.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/unknown_interactions_hlcpp.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/internal/unknown_interactions_table.c
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/unknown_interactions_hlcpp.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/inline_any.h
-FILE: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/internal/inline_any.h
-FILE: ../../../fuchsia/sdk/linux/pkg/inspect/client.shard.cml
-FILE: ../../../fuchsia/sdk/linux/pkg/inspect_service_cpp/include/lib/inspect/service/cpp/tree_handler_settings.h
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/linkage.h
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/variant.h
-FILE: ../../../fuchsia/sdk/linux/pkg/sys/component/realm_builder_absolute.shard.cml
-FILE: ../../../fuchsia/sdk/linux/pkg/sys/component/realm_builder_base.shard.cml
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_component_cpp_testing/internal/convert.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/syslog/client.shard.cml
-FILE: ../../../fuchsia/sdk/linux/pkg/syslog/offer.shard.cml
-FILE: ../../../fuchsia/sdk/linux/pkg/syslog/use.shard.cml
-FILE: ../../../fuchsia/sdk/linux/pkg/utf-utils/include/lib/utf-utils/internal/arm-neon.h
-FILE: ../../../fuchsia/sdk/linux/pkg/utf-utils/include/lib/utf-utils/internal/generic-simd.h
-FILE: ../../../fuchsia/sdk/linux/pkg/utf-utils/include/lib/utf-utils/internal/scalar.h
-FILE: ../../../fuchsia/sdk/linux/pkg/utf-utils/include/lib/utf-utils/internal/x86-avx2.h
-FILE: ../../../fuchsia/sdk/linux/pkg/utf-utils/include/lib/utf-utils/internal/x86-ssse3.h
-FILE: ../../../fuchsia/sdk/linux/pkg/utf-utils/include/lib/utf-utils/utf-utils.h
-FILE: ../../../fuchsia/sdk/linux/pkg/utf-utils/internal/scalar.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/utf-utils/utf-utils.cc
-FILE: ../../../fuchsia/sdk/linux/pkg/vulkan/client.shard.cml
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/features.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/hw/pci.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/limits.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/smc.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/threads.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/time.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/features.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/hw/pci.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/limits.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/smc.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/threads.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/time.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/features.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/hw/pci.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/limits.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/smc.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/threads.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/time.h
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth/attestation_signer.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth/common.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt/types.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.le/central.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera/camera.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera/manager.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.data/data.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.developer.tiles/tiles.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.gpu.magma/magma.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.i2c/i2c.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.rtc/rtc.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.images/encoded_image.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.images/image_info.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.images/memory_type.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.intl/intl.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/directory.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/node.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ldsvc/ldsvc.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.logger/logger.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.audio/gain_control.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.playback/player.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.playback/source_manager.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/audio_device_enumerator.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/audio_renderer.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/metadata.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/stream.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/stream_common.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/stream_processor.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/stream_type.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/timeline_function.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mediacodec/codec_factory.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/module_manifest.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/puppet_master.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/story_command.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/story_options.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.http/client.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net/net.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.process/launcher.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.process/resolver.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/job_provider.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysinfo/sysinfo.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/allocator.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/collection.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/collections_deprecated.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/constraints.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/driver_connector.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/format_modifier.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/formats_deprecated.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/image_formats.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/image_formats_deprecated.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/usages.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.app/view_provider.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/pose_buffer_provider.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/commands.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.policy/display_usage.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.scenic/commands.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.scenic/events.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.scenic/scenic.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.scenic/session.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.scenic/snapshot.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/commands.fidl
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/hw/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/smc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/hw/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/smc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/hw/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/smc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/hw/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/smc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/hw/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/smc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/hw/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/smc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/hw/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/smc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/hw/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/smc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/hw/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/smc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/hw/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/smc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/hw/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/smc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/hw/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/smc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/hw/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/smc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/hw/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/smc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/hw/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/smc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/hw/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/smc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/hw/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/smc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/hw/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/smc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/hw/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/smc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/hw/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/smc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/hw/pci.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/smc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/time.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/include/lib/async/cpp/time.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/include/lib/async/cpp/trap.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async-testing/include/lib/async-testing/test_loop.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async-testing/include/lib/async-testing/test_loop_dispatcher.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async-testing/include/lib/async-testing/test_subloop.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async-testing/test_loop.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/async-testing/test_loop_dispatcher.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/async/include/lib/async/time.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async/include/lib/async/trap.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/spawn.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl/epitaph.c
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl/include/lib/fidl/epitaph.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/include/lib/fidl/walker.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/binding.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/binding_set.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/interface_ptr.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/interface_ptr_set.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/internal/header.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/internal/implementation.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/internal/message_handler.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/internal/message_reader.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/internal/pending_response.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/internal/proxy.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/internal/proxy_controller.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/internal/stub.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/internal/stub_controller.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/internal/weak_stub_controller.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/type_converter.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/internal/message_handler.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/internal/message_reader.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/internal/pending_response.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/internal/proxy.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/internal/proxy_controller.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/internal/stub.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/internal/stub_controller.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/internal/weak_stub_controller.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/clone.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/decoder.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/encoder.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/clone.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/coding_traits.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/comparison.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/decoder.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/encoder.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/enum.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/interface_handle.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/interface_request.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/message.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/message_buffer.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/message_part.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/string.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/traits.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/vector.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/message.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/message_buffer.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_sync/include/lib/fidl/cpp/internal/logging.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_sync/include/lib/fidl/cpp/internal/synchronous_proxy.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_sync/include/lib/fidl/cpp/synchronous_interface_ptr.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_sync/internal/logging.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_sync/internal/synchronous_proxy.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/array.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/traits.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/message.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/include/lib/fpromise/bridge.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/include/lib/fpromise/bridge_internal.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/include/lib/fpromise/promise.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/include/lib/fpromise/promise_internal.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/include/lib/fpromise/result.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/include/lib/fpromise/scheduler.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/include/lib/fpromise/scope.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/include/lib/fpromise/sequencer.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/include/lib/fpromise/single_threaded_executor.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/promise.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/scheduler.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/scope.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/sequencer.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/single_threaded_executor.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/defer.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/function_traits.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/nullable.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/thread_safety.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/traits.h
+FILE: ../../../fuchsia/sdk/linux/pkg/images_cpp/images.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/images_cpp/include/lib/images/cpp/images.h
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/inspector.h
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/vmo/heap.h
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/vmo/limits.h
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/vmo/state.h
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/vmo/types.h
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect/inspector.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect/vmo/heap.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect/vmo/state.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect/vmo/types.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/media_cpp/include/lib/media/cpp/type_converters.h
+FILE: ../../../fuchsia/sdk/linux/pkg/media_cpp/type_converters.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/view_token_pair.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/optional.h
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/queue.h
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/type_traits.h
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/variant.h
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/vector.h
+FILE: ../../../fuchsia/sdk/linux/pkg/svc/include/lib/svc/dir.h
+FILE: ../../../fuchsia/sdk/linux/pkg/sync/include/lib/sync/condition.h
+FILE: ../../../fuchsia/sdk/linux/pkg/sync/include/lib/sync/internal/condition-template.h
+FILE: ../../../fuchsia/sdk/linux/pkg/sync/include/lib/sync/mutex.h
+FILE: ../../../fuchsia/sdk/linux/pkg/syslog/include/lib/syslog/global.h
+FILE: ../../../fuchsia/sdk/linux/pkg/syslog/include/lib/syslog/logger.h
+FILE: ../../../fuchsia/sdk/linux/pkg/syslog/include/lib/syslog/wire_format.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace-engine-headersonly/include/lib/trace-engine/buffer_internal.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace-headersonly/include/lib/trace/event_args.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace-headersonly/include/lib/trace/internal/event_args.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace-provider-so/include/lib/trace-provider/fdio_connect.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace-vthread-headersonly/include/trace-vthread/event_vthread.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace-vthread-headersonly/include/trace-vthread/internal/event_vthread.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace-vthread/include/trace-vthread/event_vthread.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace-vthread/include/trace-vthread/internal/event_vthread.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace/include/lib/trace/event_args.h
+FILE: ../../../fuchsia/sdk/linux/pkg/trace/include/lib/trace/internal/event_args.h
+FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/include/lib/vfs/cpp/composed_service_dir.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/bti.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/debuglog.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/guest.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/bti.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/debuglog.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/guest.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/interrupt.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/iommu.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/pmt.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/profile.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/resource.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/suspend_token.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/vcpu.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/interrupt.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/iommu.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/profile.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/resource.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/vcpu.cc
 ----------------------------------------------------------------------------------------------------
-Copyright 2022 The Fuchsia Authors. All rights reserved.
+Copyright 2018 The Fuchsia Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -2240,28 +7147,35 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: fuchsia_sdk
-ORIGIN: ../../../fuchsia/sdk/linux/LICENSE.vulkan
-TYPE: LicenseType.apache
-FILE: ../../../fuchsia/sdk/linux/.versions/core.cipd_version
+ORIGIN: ../../../fuchsia/sdk/linux/LICENSE
+TYPE: LicenseType.bsd
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/VkLayer_image_pipe_swapchain.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/VkLayer_khronos_validation.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libdriver_runtime.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libfdio.so
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libmemfs.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libheapdump_instrumentation.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libsvc.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libsyslog.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libtrace-engine.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libvfs_internal.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libvulkan.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libasync-default.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libdriver_runtime.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libfdio.so
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libmemfs.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libmagma_client.a
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libsvc.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libsync.a
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libsyslog.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libtrace-engine.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libtrace-vthread.a
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libvfs_internal.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libvulkan.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/alloca.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/ar.h
@@ -2272,43 +7186,26 @@ FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/arpa/nameser_compat.
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/arpa/telnet.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/arpa/tftp.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/assert.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/aarch64/endian.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/aarch64/fenv.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/aarch64/ioctl.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/aarch64/ipc.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/aarch64/reg.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/aarch64/setjmp.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/aarch64/signal.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/aarch64/stat.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/alltypes.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/endian.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/errno.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/fcntl.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/fenv.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/io.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/ioctl.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/ipc.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/limits.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/msg.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/null.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/posix.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/reg.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/sem.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/riscv64/setjmp.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/setjmp.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/shm.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/signal.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/stat.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/statfs.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/termios.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/x86_64/endian.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/x86_64/fenv.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/x86_64/io.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/x86_64/ioctl.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/x86_64/ipc.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/x86_64/reg.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/x86_64/setjmp.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/x86_64/signal.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/x86_64/stat.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/byteswap.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/complex.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/cpio.h
@@ -2322,7 +7219,6 @@ FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/errno.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/fcntl.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/features.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/fenv.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/fmtmsg.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/fnmatch.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/getopt.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/glob.h
@@ -2365,7 +7261,6 @@ FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/pwd.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/regex.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/resolv.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sched.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/search.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/semaphore.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/setjmp.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/signal.h
@@ -2382,41 +7277,32 @@ FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/errno.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/eventfd.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/fcntl.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/file.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/fsuid.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/inotify.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/io.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/ioctl.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/ipc.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/klog.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/mman.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/mount.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/msg.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/mtio.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/param.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/personality.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/poll.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/quota.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/random.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/reboot.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/reg.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/select.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/sem.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/shm.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/signal.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/signalfd.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/socket.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/stat.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/statfs.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/statvfs.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/stropts.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/swap.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/syslog.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/termios.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/time.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/timeb.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/timerfd.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/times.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/timex.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/ttydefaults.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/types.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/ucontext.h
@@ -2447,25 +7333,217 @@ FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/lib/libm.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/lib/libpthread.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/lib/librt.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/VkLayer_image_pipe_swapchain.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/VkLayer_khronos_validation.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libtrace-vthread.a
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/lib/libzircon.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/VkLayer_image_pipe_swapchain.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/VkLayer_khronos_validation.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libdriver_runtime.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libfdio.so
-FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libmemfs.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libheapdump_instrumentation.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libsvc.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libsyslog.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libtrace-engine.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libvfs_internal.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libvulkan.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libasync-default.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libdriver_runtime.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libfdio.so
-FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libmemfs.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libmagma_client.a
 FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libsvc.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libsync.a
 FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libsyslog.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libtrace-engine.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libtrace-vthread.a
+FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libvfs_internal.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libvulkan.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/alloca.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/ar.h
@@ -2476,43 +7554,26 @@ FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/arpa/nameser_compat.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/arpa/telnet.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/arpa/tftp.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/assert.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/aarch64/endian.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/aarch64/fenv.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/aarch64/ioctl.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/aarch64/ipc.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/aarch64/reg.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/aarch64/setjmp.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/aarch64/signal.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/aarch64/stat.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/alltypes.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/endian.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/errno.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/fcntl.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/fenv.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/io.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/ioctl.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/ipc.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/limits.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/msg.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/null.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/posix.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/reg.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/sem.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/riscv64/setjmp.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/setjmp.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/shm.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/signal.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/stat.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/statfs.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/termios.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/x86_64/endian.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/x86_64/fenv.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/x86_64/io.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/x86_64/ioctl.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/x86_64/ipc.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/x86_64/reg.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/x86_64/setjmp.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/x86_64/signal.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/x86_64/stat.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/byteswap.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/complex.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/cpio.h
@@ -2526,7 +7587,6 @@ FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/errno.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/fcntl.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/features.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/fenv.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/fmtmsg.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/fnmatch.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/getopt.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/glob.h
@@ -2569,7 +7629,6 @@ FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/pwd.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/regex.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/resolv.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sched.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/search.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/semaphore.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/setjmp.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/signal.h
@@ -2586,41 +7645,32 @@ FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/errno.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/eventfd.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/fcntl.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/file.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/fsuid.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/inotify.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/io.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/ioctl.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/ipc.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/klog.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/mman.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/mount.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/msg.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/mtio.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/param.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/personality.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/poll.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/quota.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/random.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/reboot.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/reg.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/select.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/sem.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/shm.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/signal.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/signalfd.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/socket.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/stat.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/statfs.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/statvfs.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/stropts.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/swap.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/syslog.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/termios.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/time.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/timeb.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/timerfd.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/times.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/timex.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/ttydefaults.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/types.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/ucontext.h
@@ -2651,452 +7701,6861 @@ FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/libm.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/libpthread.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/librt.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/libzircon.so
-FILE: ../../../fuchsia/sdk/linux/dart/fidl/meta.json
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia/meta.json
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_component_test/meta.json
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_inspect/meta.json
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_logger/meta.json
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_scenic/meta.json
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_scenic_flutter/meta.json
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_services/meta.json
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_vfs/meta.json
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_view/meta.json
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/meta.json
-FILE: ../../../fuchsia/sdk/linux/dart/zircon/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.gesture/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.semantics/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.virtualkeyboard/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.audio.effects/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth.oldtokens/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.a2dp/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.fastpair/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt2/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.hfp/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.le/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.sys/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.buildinfo.test/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.buildinfo/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera2.hal/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera2/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera3/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castauth/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castconfig/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castremotecontrol/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castsetup/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castsysteminfo/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castwindow/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.config/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
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.data/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.debugdata/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.developer.tiles/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics.types/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.test/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.element/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.factory.wlan/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.factory/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.fonts/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.gpu.agis/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.gpu.magma/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.adc/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.goldfish/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.light/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.power.statecontrol/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.radar/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hwinfo/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.images/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.virtualkeyboard/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.inspect/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.intl/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ldsvc/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.legacymetrics/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lightsensor/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.location.namedplace/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.location.position/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.location.sensor/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.location/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.logger/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.bootstrap/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.device/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.thread/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.math/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.audio/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.drm/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.playback/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sessions2/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sounds/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.target/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mediacodec/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mediastreams/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mem/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.memorypressure/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.metrics/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.migration/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.http/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.interfaces/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.mdns/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.reachability/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.routes/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.power.clientlevel/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.power.profile/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.power.systemmode/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.process.lifecycle/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.process/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.recovery.ui/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.recovery/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.scenic.scheduling/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.session/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings.policy/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys.test/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysinfo/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.test/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.thermal/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.tracing.perfetto/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.tracing.provider/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.activity.control/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.activity/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.app/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.brightness/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.composition/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input3/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.observation.geometry/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointer.augment/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointer/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointerinjector/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.policy/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.scenic/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.test.input/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.test.scene/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.types/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ultrasound/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.unknown/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.update.channel/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.update.channelcontrol/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.update.config/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.update/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.url/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.version/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.weave/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.web/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.common/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.ieee80211/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.policy/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.product.deprecatedclient/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.product.deprecatedconfiguration/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/zx/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/async-default/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/async-loop-cpp/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/async-loop-default/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/async-loop-testing/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/async-loop/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/async-testing/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/async/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/fdio/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_sync/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/fit/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/images_cpp/meta.json
+FILE: ../../../fuchsia/sdk/linux/data/config/symbol_index/config.json
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/arm64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/arm64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/arm64-api-18/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/arm64-api-18/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/arm64-api-19/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/arm64-api-19/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/riscv64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/riscv64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/riscv64-api-18/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/riscv64-api-18/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/riscv64-api-19/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/riscv64-api-19/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/x64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/x64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/x64-api-18/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/x64-api-18/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/x64-api-19/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/x64-api-19/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/arm64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/arm64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/arm64-api-16/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/arm64-api-16/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/arm64-api-17/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/arm64-api-17/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/arm64-api-18/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/arm64-api-18/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/arm64-api-19/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/arm64-api-19/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/riscv64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/riscv64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/riscv64-api-16/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/riscv64-api-16/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/riscv64-api-17/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/riscv64-api-17/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/riscv64-api-18/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/riscv64-api-18/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/riscv64-api-19/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/riscv64-api-19/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/x64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/x64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/x64-api-16/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/x64-api-16/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/x64-api-17/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/x64-api-17/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/x64-api-18/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/x64-api-18/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/x64-api-19/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/x64-api-19/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/arm64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/arm64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/riscv64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/riscv64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/x64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/x64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/arm64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/arm64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/arm64-api-19/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/arm64-api-19/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/riscv64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/riscv64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/riscv64-api-19/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/riscv64-api-19/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/x64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/x64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/x64-api-19/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/x64-api-19/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/pkg/async-default/async-default.ifs
+FILE: ../../../fuchsia/sdk/linux/pkg/backend_fuchsia_globals/backend_fuchsia_globals.ifs
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_runtime_shared_lib/driver_runtime.ifs
+FILE: ../../../fuchsia/sdk/linux/pkg/fdio/fdio.ifs
+FILE: ../../../fuchsia/sdk/linux/pkg/heapdump_instrumentation/heapdump_instrumentation.ifs
+FILE: ../../../fuchsia/sdk/linux/pkg/heapdump_instrumentation/heapdump_instrumentation_shard.json
 FILE: ../../../fuchsia/sdk/linux/pkg/inspect/inspect.json
-FILE: ../../../fuchsia/sdk/linux/pkg/inspect/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/inspect_service_cpp/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/media_cpp/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/media_cpp_no_converters/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/memfs/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/modular_cpp/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/svc/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/sync/meta.json
+FILE: ../../../fuchsia/sdk/linux/pkg/svc/svc.ifs
 FILE: ../../../fuchsia/sdk/linux/pkg/sys/component/realm_builder_shard_sdk.json
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_component_cpp_testing/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_cpp/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_cpp_testing/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_inspect_cpp/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_service_cpp/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/syslog/client.shard.cmx
-FILE: ../../../fuchsia/sdk/linux/pkg/syslog/meta.json
+FILE: ../../../fuchsia/sdk/linux/pkg/syslog/syslog.ifs
 FILE: ../../../fuchsia/sdk/linux/pkg/syslog/syslog.json
-FILE: ../../../fuchsia/sdk/linux/pkg/syslog_structured_backend/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/sysroot/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/trace-engine/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/trace-provider-so/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/trace/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/utf-utils/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/vulkan/meta.json
+FILE: ../../../fuchsia/sdk/linux/pkg/sysroot/libc.ifs
+FILE: ../../../fuchsia/sdk/linux/pkg/sysroot/zircon.ifs
+FILE: ../../../fuchsia/sdk/linux/pkg/trace-engine/trace-engine.ifs
+FILE: ../../../fuchsia/sdk/linux/pkg/trace-provider-so/trace-provider-so.ifs
+FILE: ../../../fuchsia/sdk/linux/pkg/trace/trace.json
+FILE: ../../../fuchsia/sdk/linux/pkg/vfs_internal/vfs_internal.ifs
+FILE: ../../../fuchsia/sdk/linux/pkg/vulkan/vulkan.ifs
 FILE: ../../../fuchsia/sdk/linux/pkg/vulkan/vulkan.json
 FILE: ../../../fuchsia/sdk/linux/pkg/vulkan_layers/data/vulkan/explicit_layer.d/VkLayer_image_pipe_swapchain.json
 FILE: ../../../fuchsia/sdk/linux/pkg/vulkan_layers/data/vulkan/explicit_layer.d/VkLayer_khronos_validation.json
-FILE: ../../../fuchsia/sdk/linux/pkg/vulkan_layers/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/meta.json
-FILE: ../../../fuchsia/sdk/linux/version_history.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/fidl_codec.so
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/fuchsia_controller_internal.so
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.buildinfo/fuchsia.buildinfo.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.component.config/fuchsia.component.config.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.component.decl/fuchsia.component.decl.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.component.runner/fuchsia.component.runner.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.component.sandbox/fuchsia.component.sandbox.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.component.types/fuchsia.component.types.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.component/fuchsia.component.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.data/fuchsia.data.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.developer.ffx/fuchsia.developer.ffx.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.developer.ffxdaemonlifecycle/fuchsia.developer.ffxdaemonlifecycle.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.developer.remotecontrol/fuchsia.developer.remotecontrol.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.diagnostics.types/fuchsia.diagnostics.types.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.diagnostics/fuchsia.diagnostics.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.feedback/fuchsia.feedback.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.gpu.agis/fuchsia.gpu.agis.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.hardware.power.statecontrol/fuchsia.hardware.power.statecontrol.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.hardware.rtc/fuchsia.hardware.rtc.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.hwinfo/fuchsia.hwinfo.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.intl/fuchsia.intl.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.io/fuchsia.io.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.ldsvc/fuchsia.ldsvc.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.math/fuchsia.math.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.mem/fuchsia.mem.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.net/fuchsia.net.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.process/fuchsia.process.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.sys2/fuchsia.sys2.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.tracing.controller/fuchsia.tracing.controller.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.tracing/fuchsia.tracing.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.unknown/fuchsia.unknown.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.url/fuchsia.url.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.version/fuchsia.version.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/zx/zx.fidl.json
+----------------------------------------------------------------------------------------------------
+Copyright 2019 The Fuchsia Authors.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: fuchsia_sdk
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/hw/debug/arm64.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/hw/debug/x86.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/lookup.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/clock.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/scheduler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/utc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/hw/debug/arm64.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/hw/debug/x86.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/lookup.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/clock.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/scheduler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/utc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/hw/debug/arm64.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/hw/debug/x86.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/lookup.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/clock.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/scheduler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/utc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.acpi/fuchsia.acpi.bind + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.pci/fuchsia.pci.bind + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.platform/fuchsia.platform.bind + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.serial/fuchsia.serial.bind + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.test/fuchsia.test.bind + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/sl4f.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/audio.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/device_log.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/dump.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/exceptions.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/factory_store.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/input.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/inspect.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/modular.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/performance.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/scenic.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/setui.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/sl4f_client.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/ssh.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/storage.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/common.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/cpu_metrics.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/drm_fps.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/flutter_frame_stats.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/input_latency.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/memory_metrics.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/scenic_frame_stats.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/temperature_metrics.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics_results.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics_spec.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/time_delta.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/time_point.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/trace_importing.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/trace_model.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/webdriver.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/trace_processing.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.semantics/node.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.semantics/semantics_manager.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.tts/tts.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.tts/tts_manager.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.tts/tts_registration.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth.oldtokens/credentials_producer.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt/constants.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.le/advertising_data.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.le/peer.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.sys/access.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.sys/bootstrap.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.sys/host_watcher.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.sys/identity.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.sys/peer.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/address.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/appearance.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/connection_role.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/device_class.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/id.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/uuid.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera2.hal/hal.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera2/manager.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera2/stream.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.castauth/cast_auth.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.castconfig/cast_config.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.castsetup/cast_setup.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.castsysteminfo/cast_system_info.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component/events.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics/format.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics/reader.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics/selector.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.element/annotations.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.element/element_manager.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.factory/factory.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/annotation.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/attachment.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/crash_reporter.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/data_provider.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/device_id_provider.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.fonts/events.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.fonts/provider.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.fonts/styles.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/ring_buffer.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/stream_config.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/stream_config_connector.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.light/light.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.power.statecontrol/admin.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.power/power.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hwinfo/hwinfo.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.images/image_pipe2.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/descriptor.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/device.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/keyboard.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/led.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/mouse.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/report.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/sensor.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/touch.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/units.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.inspect/tree.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.intl/property_provider.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/directory2.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/file2.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/io.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/node-protocols.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/node2.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/kernel-counter.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/kernel-debug.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/kernel-stats.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/root-job.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.location.namedplace/namedplace.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.device/misc.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.device/provisioning_params.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.audio/volume_control.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.drm/content_decryption.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.drm/error.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.drm/license_session.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.drm/provisioning.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.drm/services.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sessions2/discovery.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sessions2/images.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sessions2/player.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sessions2/publisher.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sounds/sound_player.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/audio_consumer.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/audio_core.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/usage_reporter.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.mem/range.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.migration/migration.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/annotation.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/story_shell_factory.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.recovery.ui/countdown.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.recovery.ui/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.recovery/factory_reset.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.scenic.scheduling/prediction_info.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.session/launcher.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/accessibility.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/audio.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/display.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/do_not_disturb.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/intl.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/privacy.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/settings.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/setup.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys.test/cache.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/types.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/secure_mem.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.test/suite.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.thermal/thermal.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.activity.control/control.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.activity/activity.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.activity/provider.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.activity/state.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.activity/tracker.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.app/view.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.app/view_config.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.brightness/brightness.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.brightness/color_adjustment.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/tokens.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/pointer_capture.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.policy/device_listener.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.types/types.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/focuser.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/view.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/view_token.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.update.channel/channel.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.update.channelcontrol/channelcontrol.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.web/constants.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.web/context.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.web/cookie.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.web/debug.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.web/frame.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.web/navigation.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.web/url_request_rewrite_rules.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.policy/access_point_provider.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.policy/client_provider.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/zx/rights.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/hw/debug/arm64.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/hw/debug/x86.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/lookup.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/clock.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/scheduler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/utc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/hw/debug/arm64.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/hw/debug/x86.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/lookup.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/clock.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/scheduler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/utc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/hw/debug/arm64.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/hw/debug/x86.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/lookup.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/clock.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/scheduler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/utc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/hw/debug/arm64.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/hw/debug/x86.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/lookup.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/clock.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/scheduler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/utc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/hw/debug/arm64.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/hw/debug/x86.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/lookup.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/clock.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/scheduler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/utc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/hw/debug/arm64.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/hw/debug/x86.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/lookup.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/clock.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/scheduler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/utc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/hw/debug/arm64.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/hw/debug/x86.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/lookup.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/clock.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/scheduler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/utc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/hw/debug/arm64.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/hw/debug/x86.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/lookup.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/clock.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/scheduler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/utc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/hw/debug/arm64.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/hw/debug/x86.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/lookup.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/clock.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/scheduler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/utc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/hw/debug/arm64.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/hw/debug/x86.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/lookup.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/clock.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/scheduler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/utc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/hw/debug/arm64.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/hw/debug/x86.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/lookup.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/clock.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/scheduler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/utc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/hw/debug/arm64.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/hw/debug/x86.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/lookup.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/clock.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/scheduler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/utc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/hw/debug/arm64.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/hw/debug/x86.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/lookup.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/clock.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/scheduler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/utc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/hw/debug/arm64.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/hw/debug/x86.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/lookup.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/clock.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/scheduler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/utc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/hw/debug/arm64.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/hw/debug/x86.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/lookup.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/clock.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/scheduler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/utc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/hw/debug/arm64.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/hw/debug/x86.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/lookup.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/clock.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/scheduler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/utc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/hw/debug/arm64.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/hw/debug/x86.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/lookup.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/clock.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/scheduler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/utc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/hw/debug/arm64.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/hw/debug/x86.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/lookup.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/clock.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/scheduler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/utc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/hw/debug/arm64.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/hw/debug/x86.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/lookup.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/clock.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/scheduler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/utc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/hw/debug/arm64.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/hw/debug/x86.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/lookup.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/clock.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/scheduler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/utc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/hw/debug/arm64.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/hw/debug/x86.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/lookup.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/clock.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/scheduler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/utc.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async-cpp/executor.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async-cpp/include/lib/async/cpp/executor.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async-cpp/include/lib/async/cpp/irq.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async-cpp/include/lib/async/cpp/paged_vmo.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async-cpp/irq.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async-cpp/paged_vmo.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async-loop-default/include/lib/async-loop/default.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async/include/lib/async/paged_vmo.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/directory.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/fd.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_base/include/lib/fidl/internal_callable_traits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_base/include/lib/fidl/txn_header.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_base/include/lib/fidl/visitor.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_base/internal.c + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/event_sender.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/member_connector.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/service_connector.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/service_handler_base.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_sync/include/lib/fidl/cpp/internal/message_sender.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_sync/internal/message_sender.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/async_binding.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/async_transaction.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/async_binding.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/async_transaction.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/connect_service.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/message_storage.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/server.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/service_handler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/sync_call.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/transaction.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/transaction.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fit-promise/barrier.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fit-promise/include/lib/fpromise/barrier.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/internal/utility.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect/health.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect/hierarchy.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/health.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/hierarchy.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/inspect.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/reader.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/vmo/block.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/vmo/scanner.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/vmo/snapshot.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect/reader.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect/vmo/scanner.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect/vmo/snapshot.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect_service_cpp/include/lib/inspect/service/cpp/reader.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect_service_cpp/include/lib/inspect/service/cpp/service.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect_service_cpp/reader.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect_service_cpp/service.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/magma_client/include/lib/magma/magma_sysmem.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/include/lib/ui/scenic/cpp/view_ref_pair.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/include/lib/ui/scenic/cpp/view_token_pair.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/view_ref_pair.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/constructors.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/storage.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/utility.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/string_view.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/utility.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/sync/include/lib/sync/internal/mutex-internal.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/sys_cpp/component_context.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/sys_cpp/include/lib/sys/cpp/component_context.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/sys_cpp/include/lib/sys/cpp/outgoing_directory.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/sys_cpp/include/lib/sys/cpp/service_directory.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/sys_cpp/outgoing_directory.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/sys_cpp/service_directory.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/sys_cpp_testing/component_context_provider.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/sys_cpp_testing/service_directory_provider.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/sys_inspect_cpp/component.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/sys_inspect_cpp/include/lib/sys/inspect/cpp/component.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/sys_service_cpp/include/lib/sys/service/cpp/service.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/sys_service_cpp/include/lib/sys/service/cpp/service_aggregate.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/sys_service_cpp/include/lib/sys/service/cpp/service_handler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/sys_service_cpp/include/lib/sys/service/cpp/service_watcher.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/sys_service_cpp/service.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/sys_service_cpp/service_aggregate.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/sys_service_cpp/service_watcher.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/include/lib/vfs/cpp/internal/node.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/include/lib/vfs/cpp/lazy_dir.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/include/lib/vfs/cpp/pseudo_dir.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/include/lib/vfs/cpp/pseudo_file.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/include/lib/vfs/cpp/remote_dir.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/include/lib/vfs/cpp/service.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/include/lib/vfs/cpp/vmo_file.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/clock.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/pager.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/pager.cc + ../../../fuchsia/sdk/linux/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/exception.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/hw/debug/arm64.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/hw/debug/x86.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/lookup.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/clock.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/scheduler.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/utc.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/exception.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/hw/debug/arm64.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/hw/debug/x86.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/lookup.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/clock.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/scheduler.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/utc.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/exception.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/hw/debug/arm64.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/hw/debug/x86.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/lookup.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/clock.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/scheduler.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/utc.h
+FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.acpi/fuchsia.acpi.bind
+FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.pci/fuchsia.pci.bind
+FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.platform/fuchsia.platform.bind
+FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.serial/fuchsia.serial.bind
+FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.test/fuchsia.test.bind
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/sl4f.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/audio.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/device_log.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/dump.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/exceptions.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/factory_store.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/input.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/inspect.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/modular.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/performance.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/scenic.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/setui.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/sl4f_client.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/ssh.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/storage.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/common.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/cpu_metrics.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/drm_fps.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/flutter_frame_stats.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/input_latency.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/memory_metrics.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/scenic_frame_stats.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/temperature_metrics.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics_results.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics_spec.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/time_delta.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/time_point.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/trace_importing.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/trace_model.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/webdriver.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/trace_processing.dart
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.semantics/node.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.semantics/semantics_manager.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.tts/tts.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.tts/tts_manager.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.tts/tts_registration.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth.oldtokens/credentials_producer.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt/constants.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.le/advertising_data.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.le/peer.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.sys/access.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.sys/bootstrap.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.sys/host_watcher.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.sys/identity.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.sys/peer.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/address.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/appearance.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/connection_role.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/device_class.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/id.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/uuid.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera2.hal/hal.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera2/manager.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera2/stream.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castauth/cast_auth.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castconfig/cast_config.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castsetup/cast_setup.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castsysteminfo/cast_system_info.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component/events.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics/format.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics/reader.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics/selector.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.element/annotations.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.element/element_manager.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.factory/factory.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/annotation.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/attachment.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/crash_reporter.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/data_provider.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/device_id_provider.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.fonts/events.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.fonts/provider.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.fonts/styles.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/ring_buffer.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/stream_config.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/stream_config_connector.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.light/light.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.power.statecontrol/admin.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.power/power.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hwinfo/hwinfo.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.images/image_pipe2.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/descriptor.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/device.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/keyboard.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/led.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/mouse.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/report.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/sensor.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/touch.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/units.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.inspect/tree.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.intl/property_provider.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/directory2.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/file2.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/io.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/node-protocols.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/node2.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/kernel-counter.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/kernel-debug.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/kernel-stats.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/root-job.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.location.namedplace/namedplace.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.device/misc.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.device/provisioning_params.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.audio/volume_control.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.drm/content_decryption.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.drm/error.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.drm/license_session.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.drm/provisioning.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.drm/services.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sessions2/discovery.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sessions2/images.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sessions2/player.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sessions2/publisher.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sounds/sound_player.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/audio_consumer.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/audio_core.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/usage_reporter.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mem/range.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.migration/migration.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/annotation.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/story_shell_factory.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.recovery.ui/countdown.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.recovery.ui/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.recovery/factory_reset.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.scenic.scheduling/prediction_info.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.session/launcher.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/accessibility.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/audio.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/display.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/do_not_disturb.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/intl.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/privacy.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/settings.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/setup.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys.test/cache.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/types.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/secure_mem.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.test/suite.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.thermal/thermal.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.activity.control/control.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.activity/activity.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.activity/provider.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.activity/state.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.activity/tracker.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.app/view.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.app/view_config.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.brightness/brightness.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.brightness/color_adjustment.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/tokens.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/pointer_capture.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.policy/device_listener.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.types/types.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/focuser.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/view.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/view_token.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.update.channel/channel.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.update.channelcontrol/channelcontrol.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.web/constants.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.web/context.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.web/cookie.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.web/debug.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.web/frame.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.web/navigation.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.web/url_request_rewrite_rules.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.policy/access_point_provider.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.policy/client_provider.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/zx/rights.fidl
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/hw/debug/arm64.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/hw/debug/x86.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/lookup.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/clock.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/scheduler.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/utc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/hw/debug/arm64.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/hw/debug/x86.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/lookup.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/clock.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/scheduler.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/utc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/hw/debug/arm64.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/hw/debug/x86.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/lookup.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/clock.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/scheduler.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/utc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/hw/debug/arm64.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/hw/debug/x86.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/lookup.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/clock.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/scheduler.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/utc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/hw/debug/arm64.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/hw/debug/x86.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/lookup.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/clock.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/scheduler.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/utc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/hw/debug/arm64.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/hw/debug/x86.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/lookup.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/clock.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/scheduler.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/utc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/hw/debug/arm64.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/hw/debug/x86.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/lookup.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/clock.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/scheduler.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/utc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/hw/debug/arm64.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/hw/debug/x86.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/lookup.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/clock.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/scheduler.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/utc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/hw/debug/arm64.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/hw/debug/x86.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/lookup.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/clock.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/scheduler.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/utc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/hw/debug/arm64.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/hw/debug/x86.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/lookup.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/clock.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/scheduler.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/utc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/hw/debug/arm64.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/hw/debug/x86.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/lookup.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/clock.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/scheduler.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/utc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/hw/debug/arm64.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/hw/debug/x86.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/lookup.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/clock.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/scheduler.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/utc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/hw/debug/arm64.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/hw/debug/x86.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/lookup.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/clock.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/scheduler.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/utc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/hw/debug/arm64.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/hw/debug/x86.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/lookup.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/clock.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/scheduler.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/utc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/hw/debug/arm64.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/hw/debug/x86.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/lookup.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/clock.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/scheduler.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/utc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/hw/debug/arm64.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/hw/debug/x86.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/lookup.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/clock.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/scheduler.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/utc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/hw/debug/arm64.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/hw/debug/x86.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/lookup.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/clock.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/scheduler.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/utc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/hw/debug/arm64.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/hw/debug/x86.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/lookup.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/clock.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/scheduler.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/utc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/hw/debug/arm64.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/hw/debug/x86.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/lookup.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/clock.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/scheduler.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/utc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/hw/debug/arm64.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/hw/debug/x86.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/lookup.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/clock.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/scheduler.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/utc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/exception.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/hw/debug/arm64.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/hw/debug/x86.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/lookup.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/clock.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/scheduler.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/utc.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/executor.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/include/lib/async/cpp/executor.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/include/lib/async/cpp/irq.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/include/lib/async/cpp/paged_vmo.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/irq.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/paged_vmo.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/async-loop-default/include/lib/async-loop/default.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async/include/lib/async/paged_vmo.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/directory.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/fd.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/include/lib/fidl/internal_callable_traits.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/include/lib/fidl/txn_header.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/include/lib/fidl/visitor.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/internal.c
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/event_sender.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/member_connector.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/service_connector.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/service_handler_base.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_sync/include/lib/fidl/cpp/internal/message_sender.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_sync/internal/message_sender.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/async_binding.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/async_transaction.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/async_binding.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/async_transaction.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/connect_service.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/message_storage.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/server.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/service_handler.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/sync_call.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/transaction.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/transaction.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/barrier.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/include/lib/fpromise/barrier.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/internal/utility.h
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect/health.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect/hierarchy.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/health.h
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/hierarchy.h
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/inspect.h
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/reader.h
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/vmo/block.h
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/vmo/scanner.h
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect/include/lib/inspect/cpp/vmo/snapshot.h
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect/reader.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect/vmo/scanner.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect/vmo/snapshot.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect_service_cpp/include/lib/inspect/service/cpp/reader.h
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect_service_cpp/include/lib/inspect/service/cpp/service.h
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect_service_cpp/reader.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect_service_cpp/service.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/magma_client/include/lib/magma/magma_sysmem.h
+FILE: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/include/lib/ui/scenic/cpp/view_ref_pair.h
+FILE: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/include/lib/ui/scenic/cpp/view_token_pair.h
+FILE: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/view_ref_pair.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/constructors.h
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/storage.h
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/utility.h
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/string_view.h
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/utility.h
+FILE: ../../../fuchsia/sdk/linux/pkg/sync/include/lib/sync/internal/mutex-internal.h
+FILE: ../../../fuchsia/sdk/linux/pkg/sys_cpp/component_context.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/sys_cpp/include/lib/sys/cpp/component_context.h
+FILE: ../../../fuchsia/sdk/linux/pkg/sys_cpp/include/lib/sys/cpp/outgoing_directory.h
+FILE: ../../../fuchsia/sdk/linux/pkg/sys_cpp/include/lib/sys/cpp/service_directory.h
+FILE: ../../../fuchsia/sdk/linux/pkg/sys_cpp/outgoing_directory.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/sys_cpp/service_directory.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/sys_cpp_testing/component_context_provider.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/sys_cpp_testing/service_directory_provider.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/sys_inspect_cpp/component.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/sys_inspect_cpp/include/lib/sys/inspect/cpp/component.h
+FILE: ../../../fuchsia/sdk/linux/pkg/sys_service_cpp/include/lib/sys/service/cpp/service.h
+FILE: ../../../fuchsia/sdk/linux/pkg/sys_service_cpp/include/lib/sys/service/cpp/service_aggregate.h
+FILE: ../../../fuchsia/sdk/linux/pkg/sys_service_cpp/include/lib/sys/service/cpp/service_handler.h
+FILE: ../../../fuchsia/sdk/linux/pkg/sys_service_cpp/include/lib/sys/service/cpp/service_watcher.h
+FILE: ../../../fuchsia/sdk/linux/pkg/sys_service_cpp/service.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/sys_service_cpp/service_aggregate.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/sys_service_cpp/service_watcher.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/include/lib/vfs/cpp/internal/node.h
+FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/include/lib/vfs/cpp/lazy_dir.h
+FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/include/lib/vfs/cpp/pseudo_dir.h
+FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/include/lib/vfs/cpp/pseudo_file.h
+FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/include/lib/vfs/cpp/remote_dir.h
+FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/include/lib/vfs/cpp/service.h
+FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/include/lib/vfs/cpp/vmo_file.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/clock.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/exception.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/pager.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/pager.cc
+----------------------------------------------------------------------------------------------------
+Copyright 2019 The Fuchsia Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: fuchsia_sdk
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/analyzer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/boot/crash-reason.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/string_view.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls-next.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/testonly-syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/analyzer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/boot/crash-reason.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/string_view.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls-next.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/testonly-syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/analyzer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/boot/crash-reason.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/string_view.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls-next.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/testonly-syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.amlogic.platform/fuchsia.amlogic.platform.bind + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.arm.platform/fuchsia.arm.platform.bind + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.broadcom.platform/fuchsia.broadcom.platform.bind + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.designware.platform/fuchsia.designware.platform.bind + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.ethernet/fuchsia.ethernet.bind + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.focaltech.platform/fuchsia.focaltech.platform.bind + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.google.platform/fuchsia.google.platform.bind + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.i2c/fuchsia.i2c.bind + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.khadas.platform/fuchsia.khadas.platform.bind + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.nxp.platform/fuchsia.nxp.platform.bind + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.pwm/fuchsia.pwm.bind + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.realtek.platform/fuchsia.realtek.platform.bind + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.test.platform/fuchsia.test.platform.bind + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.ti.platform/fuchsia.ti.platform.bind + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/component.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/device.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/diagnostics.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/feedback_data_provider.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/proxy.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/time.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/gpu_metrics.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/total_trace_wall_time.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.gesture/gesture_listener.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.a2dp/audio_mode.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.hfp/hfp.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.le/connection_options.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.sys/configuration.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.sys/pairing_options.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.sys/security_mode.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/deprecated.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/device_name.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.buildinfo/buildinfo.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera3/device.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera3/device_watcher.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera3/stream.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.castremotecontrol/remote_control.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.castsetup/server.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.castwindow/window.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.types/constants.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component/constants.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component/error.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component/types.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics/interest.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics/severity.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.framework/driver_start_args.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.framework/topology.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.registrar/driver-registrar.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.factory.wlan/iovar.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/crash_register.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/data_register.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/last_reboot_info.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.adc/adc.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/codec.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/dai.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/dai_format.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/device.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/frames.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/instance.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/mac.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/session.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.power.sensor/sensor.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.power.statecontrol/reboot_reason.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.temperature/temperature.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.images2/format_modifier.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/consumer_control.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/device_ids.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.input/keys.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/locking.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/debug-resource.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/hypervisor-resource.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/info-resource.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/ioport-resource.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/irq-resource.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/mexec-resource.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/mmio-resource.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/power-resource.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/smc-resource.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/vmex-resource.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.legacymetrics/event.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.legacymetrics/metrics_recorder.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.location.position/position.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.location.sensor/sensor.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.location/types.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.bootstrap/thread.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.device/device.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.device/energy_scanner.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.audio/effects_controller.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.drm/properties.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.drm/types.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.target/target_discovery.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/activity_reporter.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/profile_provider.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.memorypressure/memorypressure.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.metrics/metric_event_logger.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/session_restart_controller.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.interfaces/interfaces.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.routes/routes.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.net/socket.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.process.lifecycle/lifecycle.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings.policy/error.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings.policy/volume_policy.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/factory_reset.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/input.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/light.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/night_mode.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem2/constraints.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem2/results.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem2/usages.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input3/events.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input3/keyboard.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input3/modifiers.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointer/mouse.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointer/state.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointer/touch.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointer/view.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointerinjector/config.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointerinjector/device.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointerinjector/event.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.policy/display_backlight.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/view_ref.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/view_ref_focused.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/view_ref_installed.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ultrasound/factory.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.update/commit.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.update/update.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.url/url.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.weave/auth.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.weave/bootstrap.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.weave/common.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.weave/weavestack.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.ieee80211/reason_code.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.ieee80211/status_code.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.product.deprecatedclient/wlan_deprecated_client.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.product.deprecatedconfiguration/wlan_deprecated_configuration.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/zx/zx_common.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/analyzer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/boot/crash-reason.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/string_view.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls-next.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/testonly-syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/analyzer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/boot/crash-reason.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/string_view.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls-next.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/testonly-syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/analyzer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/boot/crash-reason.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/string_view.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls-next.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/testonly-syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/analyzer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/boot/crash-reason.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/string_view.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls-next.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/testonly-syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/analyzer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/boot/crash-reason.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/string_view.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls-next.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/testonly-syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/analyzer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/boot/crash-reason.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/string_view.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls-next.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/testonly-syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/analyzer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/boot/crash-reason.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/string_view.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls-next.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/testonly-syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/analyzer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/boot/crash-reason.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/string_view.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls-next.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/testonly-syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/analyzer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/boot/crash-reason.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/string_view.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls-next.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/testonly-syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/analyzer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/boot/crash-reason.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/string_view.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls-next.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/testonly-syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/analyzer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/boot/crash-reason.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/string_view.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls-next.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/testonly-syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/analyzer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/boot/crash-reason.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/string_view.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls-next.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/testonly-syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/analyzer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/boot/crash-reason.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/string_view.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls-next.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/testonly-syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/analyzer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/boot/crash-reason.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/string_view.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls-next.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/testonly-syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/analyzer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/boot/crash-reason.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/string_view.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls-next.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/testonly-syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/analyzer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/boot/crash-reason.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/string_view.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls-next.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/testonly-syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/analyzer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/boot/crash-reason.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/string_view.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls-next.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/testonly-syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/analyzer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/boot/crash-reason.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/string_view.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls-next.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/testonly-syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/analyzer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/boot/crash-reason.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/string_view.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls-next.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/testonly-syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/analyzer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/boot/crash-reason.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/string_view.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls-next.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/testonly-syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/analyzer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/boot/crash-reason.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/string_view.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls-next.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/testonly-syscalls.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/backend_fuchsia_globals/include/lib/syslog/cpp/logging_backend_fuchsia_globals.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_component_cpp/include/lib/driver/component/cpp/internal/start_args.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_component_cpp/include/lib/driver/component/cpp/internal/symbols.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_incoming_cpp/include/lib/driver/incoming/cpp/namespace.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_incoming_cpp/namespace.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_logging_cpp/include/lib/driver/logging/cpp/logger.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_logging_cpp/logger.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_symbols/include/lib/driver/symbols/symbols.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_base/handle_close_many.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/internal/bitset.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/internal/natural_types_header.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/internal/natural_types_implementation.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/arena.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/client_base.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/arena.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/client.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/client_base.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/decoded_value.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/envelope.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/extract_resource_on_destruction.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/message.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/object_view.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/status.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/server.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/internal/compiler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/internal/result.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/result.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/input_report_reader/include/lib/input_report_reader/reader.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/array.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/bit.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/array.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/bit.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/memory.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/source_location.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/version.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/msi.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/result.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/stream.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/msi.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/stream.cc + ../../../fuchsia/sdk/linux/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/analyzer.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/boot/crash-reason.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/string_view.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls-next.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/testonly-syscalls.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/analyzer.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/boot/crash-reason.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/string_view.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls-next.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/testonly-syscalls.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/analyzer.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/boot/crash-reason.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/string_view.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls-next.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/testonly-syscalls.h
+FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.amlogic.platform/fuchsia.amlogic.platform.bind
+FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.arm.platform/fuchsia.arm.platform.bind
+FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.broadcom.platform/fuchsia.broadcom.platform.bind
+FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.designware.platform/fuchsia.designware.platform.bind
+FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.ethernet/fuchsia.ethernet.bind
+FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.focaltech.platform/fuchsia.focaltech.platform.bind
+FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.google.platform/fuchsia.google.platform.bind
+FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.i2c/fuchsia.i2c.bind
+FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.khadas.platform/fuchsia.khadas.platform.bind
+FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.nxp.platform/fuchsia.nxp.platform.bind
+FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.pwm/fuchsia.pwm.bind
+FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.realtek.platform/fuchsia.realtek.platform.bind
+FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.test.platform/fuchsia.test.platform.bind
+FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.ti.platform/fuchsia.ti.platform.bind
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/component.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/device.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/diagnostics.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/feedback_data_provider.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/proxy.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/time.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/gpu_metrics.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/total_trace_wall_time.dart
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.gesture/gesture_listener.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.a2dp/audio_mode.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.hfp/hfp.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.le/connection_options.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.sys/configuration.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.sys/pairing_options.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.sys/security_mode.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/deprecated.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/device_name.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.buildinfo/buildinfo.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera3/device.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera3/device_watcher.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera3/stream.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castremotecontrol/remote_control.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castsetup/server.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castwindow/window.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.types/constants.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component/constants.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component/error.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component/types.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics/interest.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics/severity.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.framework/driver_start_args.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.framework/topology.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.registrar/driver-registrar.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.factory.wlan/iovar.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/crash_register.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/data_register.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/last_reboot_info.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.adc/adc.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/codec.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/dai.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/dai_format.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/device.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/frames.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/instance.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/mac.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/session.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.power.sensor/sensor.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.power.statecontrol/reboot_reason.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.temperature/temperature.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.images2/format_modifier.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/consumer_control.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/device_ids.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input/keys.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/locking.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/debug-resource.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/hypervisor-resource.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/info-resource.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/ioport-resource.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/irq-resource.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/mexec-resource.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/mmio-resource.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/power-resource.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/smc-resource.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/vmex-resource.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.legacymetrics/event.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.legacymetrics/metrics_recorder.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.location.position/position.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.location.sensor/sensor.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.location/types.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.bootstrap/thread.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.device/device.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.device/energy_scanner.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.audio/effects_controller.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.drm/properties.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.drm/types.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.target/target_discovery.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/activity_reporter.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/profile_provider.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.memorypressure/memorypressure.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.metrics/metric_event_logger.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/session_restart_controller.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.interfaces/interfaces.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.routes/routes.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net/socket.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.process.lifecycle/lifecycle.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings.policy/error.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings.policy/volume_policy.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/factory_reset.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/input.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/light.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/night_mode.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem2/constraints.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem2/results.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem2/usages.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input3/events.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input3/keyboard.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input3/modifiers.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointer/mouse.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointer/state.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointer/touch.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointer/view.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointerinjector/config.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointerinjector/device.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointerinjector/event.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.policy/display_backlight.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/view_ref.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/view_ref_focused.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/view_ref_installed.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ultrasound/factory.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.update/commit.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.update/update.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.url/url.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.weave/auth.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.weave/bootstrap.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.weave/common.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.weave/weavestack.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.ieee80211/reason_code.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.ieee80211/status_code.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.product.deprecatedclient/wlan_deprecated_client.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.product.deprecatedconfiguration/wlan_deprecated_configuration.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/zx/zx_common.fidl
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/analyzer.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/boot/crash-reason.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/string_view.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls-next.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/testonly-syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/analyzer.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/boot/crash-reason.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/string_view.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls-next.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/testonly-syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/analyzer.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/boot/crash-reason.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/string_view.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls-next.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/testonly-syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/analyzer.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/boot/crash-reason.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/string_view.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls-next.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/testonly-syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/analyzer.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/boot/crash-reason.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/string_view.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls-next.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/testonly-syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/analyzer.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/boot/crash-reason.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/string_view.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls-next.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/testonly-syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/analyzer.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/boot/crash-reason.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/string_view.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls-next.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/testonly-syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/analyzer.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/boot/crash-reason.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/string_view.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls-next.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/testonly-syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/analyzer.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/boot/crash-reason.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/string_view.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls-next.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/testonly-syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/analyzer.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/boot/crash-reason.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/string_view.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls-next.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/testonly-syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/analyzer.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/boot/crash-reason.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/string_view.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls-next.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/testonly-syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/analyzer.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/boot/crash-reason.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/string_view.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls-next.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/testonly-syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/analyzer.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/boot/crash-reason.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/string_view.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls-next.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/testonly-syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/analyzer.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/boot/crash-reason.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/string_view.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls-next.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/testonly-syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/analyzer.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/boot/crash-reason.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/string_view.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls-next.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/testonly-syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/analyzer.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/boot/crash-reason.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/string_view.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls-next.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/testonly-syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/analyzer.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/boot/crash-reason.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/string_view.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls-next.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/testonly-syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/analyzer.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/boot/crash-reason.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/string_view.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls-next.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/testonly-syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/analyzer.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/boot/crash-reason.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/string_view.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls-next.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/testonly-syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/analyzer.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/boot/crash-reason.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/string_view.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls-next.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/testonly-syscalls.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/analyzer.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/boot/crash-reason.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/string_view.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls-next.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/testonly-syscalls.h
+FILE: ../../../fuchsia/sdk/linux/pkg/backend_fuchsia_globals/include/lib/syslog/cpp/logging_backend_fuchsia_globals.h
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_component_cpp/include/lib/driver/component/cpp/internal/start_args.h
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_component_cpp/include/lib/driver/component/cpp/internal/symbols.h
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_incoming_cpp/include/lib/driver/incoming/cpp/namespace.h
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_incoming_cpp/namespace.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_logging_cpp/include/lib/driver/logging/cpp/logger.h
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_logging_cpp/logger.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_symbols/include/lib/driver/symbols/symbols.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/handle_close_many.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/internal/bitset.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/internal/natural_types_header.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/internal/natural_types_implementation.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/types.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/arena.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/client_base.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/arena.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/client.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/client_base.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/decoded_value.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/envelope.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/extract_resource_on_destruction.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/message.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/object_view.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/status.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/server.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/internal/compiler.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/internal/result.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/result.h
+FILE: ../../../fuchsia/sdk/linux/pkg/input_report_reader/include/lib/input_report_reader/reader.h
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/array.h
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/bit.h
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/array.h
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/bit.h
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/memory.h
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/source_location.h
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/version.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/msi.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/result.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/stream.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/msi.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/stream.cc
+----------------------------------------------------------------------------------------------------
+Copyright 2020 The Fuchsia Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: fuchsia_sdk
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/availability.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/availability.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/availability.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.amlogic.platform.a311d/fuchsia.amlogic.platform.a311d.bind + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.amlogic.platform.meson/fuchsia.amlogic.platform.meson.bind + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.broadcom.platform.sdio/fuchsia.broadcom.platform.sdio.bind + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.clock/fuchsia.clock.bind + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.gpio/fuchsia.gpio.bind + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.power/fuchsia.power.bind + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.register/fuchsia.register.bind + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.sdio/fuchsia.sdio.bind + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.sysmem/fuchsia.sysmem.bind + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.usb.phy/fuchsia.usb.phy.bind + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.verisilicon.platform/fuchsia.verisilicon.platform.bind + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/camera_metrics.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/flatland_latency.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/virtual_camera.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.virtualkeyboard/virtual_keyboard.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.audio.effects/creator.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.audio.effects/processor.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt2/client.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt2/constants.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt2/server.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt2/types.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.config/specs.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.config/value.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/capability.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/child.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/collection.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/component.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/config.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/environment.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/events.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/expose.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/offer.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/program.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/relative_refs.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/types.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/use.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.test/realm_builder.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component/binder.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component/realm.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.device.fs/connector.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics.types/component.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics/log_settings.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.development/development.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.development/iterators.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.development/types.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.test/realm.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/data_provider_controller.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.gpu.agis/agis.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/signal_processing.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/codec_connector.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/dai_connector.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/health.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/port.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.radar/radar.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.virtualkeyboard/virtual_keyboard.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.input/keymap.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.intl/calendar.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.intl/time_zones.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/inotify.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/rights-abilities.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/cpu-resource.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.lightsensor/calibrator.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.lightsensor/sensor.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.lightsensor/types.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.device/counters.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.mediastreams/audio_format.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.mediastreams/compression.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.mediastreams/encryption.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.mediastreams/media_format.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.mediastreams/video_format.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.power.profile/profile.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/keyboard.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.thermal/client_state.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.composition/allocator.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.composition/flatland.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.observation.geometry/watcher.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/flatland_tokens.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.common/associnfo.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.common/history.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.common/wlan_common.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.ieee80211/constants.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.ieee80211/rsn.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.policy/types.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/availability.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/availability.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/availability.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/availability.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/availability.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/availability.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/availability.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/availability.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/availability.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/availability.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/availability.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/availability.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/availability.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/availability.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/availability.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/availability.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/availability.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/availability.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/availability.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/availability.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/availability.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_logging_cpp/include/lib/driver/logging/cpp/internal/logger_internal.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_logging_cpp/include/lib/driver/logging/cpp/structured_logger.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_runtime/include/lib/fdf/arena.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_runtime/include/lib/fdf/channel.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_runtime/include/lib/fdf/channel_read.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_runtime/include/lib/fdf/dispatcher.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_runtime/include/lib/fdf/handle.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_runtime/include/lib/fdf/types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_runtime_cpp/channel_read.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_runtime_cpp/include/lib/fdf/cpp/arena.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_runtime_cpp/include/lib/fdf/cpp/channel.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_runtime_cpp/include/lib/fdf/cpp/channel_read.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_runtime_cpp/include/lib/fdf/cpp/dispatcher.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_runtime_cpp/include/lib/fdf/cpp/unowned.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_runtime_env/include/lib/fdf/env.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_base/wire_format_metadata.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base_v2/include/lib/fidl/cpp/internal/natural_types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base_v2/include/lib/fidl/cpp/natural_types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_v2/any_error_in.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_v2/include/lib/fidl/cpp/client.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_v2/include/lib/fidl/cpp/internal/client_details.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_v2/include/lib/fidl/cpp/internal/make_response_context.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_v2/include/lib/fidl/cpp/internal/natural_client_base.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_v2/include/lib/fidl/cpp/unified_messaging.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/client_details.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/intrusive_container/container_utils.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/intrusive_container/helper_macros.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/intrusive_container/node_utils.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/intrusive_container/pointer_traits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/intrusive_container/wavl_tree.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/intrusive_container/wavl_tree_internal.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/server_details.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/synchronization_checker.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/transport.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/transport_channel.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/wire_messaging.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/wire_types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/message_storage.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/status.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/transport.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/transport_channel.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_driver/include/lib/fidl_driver/cpp/wire_messaging.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_driver/include/lib/fidl_driver/cpp/wire_types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_driver_transport/include/lib/fidl_driver/cpp/transport.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_driver_transport/transport.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/include/lib/ui/scenic/cpp/view_creation_tokens.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/include/lib/ui/scenic/cpp/view_identity.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/view_creation_tokens.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/view_identity.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/algorithm.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/atomic.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/cstddef.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/functional.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/algorithm.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/atomic.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/erase.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/exception.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/functional.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/span.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/tuple.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/type_traits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/iterator.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/span.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/tuple.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/sync_cpp/include/lib/sync/cpp/completion.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/sys_component_cpp_testing/internal/errors.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/sys_component_cpp_testing/internal/local_component_runner.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/sys_component_cpp_testing/internal/realm.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/sys_component_cpp_testing/realm_builder.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/sys_component_cpp_testing/realm_builder_types.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/sys_component_cpp_testing/scoped_child.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/syslog_structured_backend/cpp/fuchsia_syslog.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/syslog_structured_backend/include/lib/syslog/structured_backend/cpp/fuchsia_syslog.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/syslog_structured_backend/include/lib/syslog/structured_backend/fuchsia_syslog.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/status_string.cc + ../../../fuchsia/sdk/linux/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/availability.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/availability.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/availability.h
+FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.amlogic.platform.a311d/fuchsia.amlogic.platform.a311d.bind
+FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.amlogic.platform.meson/fuchsia.amlogic.platform.meson.bind
+FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.broadcom.platform.sdio/fuchsia.broadcom.platform.sdio.bind
+FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.clock/fuchsia.clock.bind
+FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.gpio/fuchsia.gpio.bind
+FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.power/fuchsia.power.bind
+FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.register/fuchsia.register.bind
+FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.sdio/fuchsia.sdio.bind
+FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.sysmem/fuchsia.sysmem.bind
+FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.usb.phy/fuchsia.usb.phy.bind
+FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.verisilicon.platform/fuchsia.verisilicon.platform.bind
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/camera_metrics.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/flatland_latency.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/virtual_camera.dart
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.virtualkeyboard/virtual_keyboard.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.audio.effects/creator.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.audio.effects/processor.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt2/client.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt2/constants.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt2/server.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt2/types.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.config/specs.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.config/value.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/capability.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/child.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/collection.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/component.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/config.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/environment.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/events.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/expose.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/offer.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/program.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/relative_refs.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/types.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/use.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.test/realm_builder.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component/binder.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component/realm.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.device.fs/connector.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics.types/component.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics/log_settings.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.development/development.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.development/iterators.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.development/types.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.test/realm.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/data_provider_controller.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.gpu.agis/agis.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/signal_processing.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/codec_connector.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/dai_connector.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/health.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/port.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.radar/radar.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.virtualkeyboard/virtual_keyboard.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input/keymap.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.intl/calendar.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.intl/time_zones.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/inotify.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/rights-abilities.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/cpu-resource.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lightsensor/calibrator.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lightsensor/sensor.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lightsensor/types.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.device/counters.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mediastreams/audio_format.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mediastreams/compression.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mediastreams/encryption.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mediastreams/media_format.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mediastreams/video_format.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.power.profile/profile.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/keyboard.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.thermal/client_state.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.composition/allocator.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.composition/flatland.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.observation.geometry/watcher.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/flatland_tokens.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.common/associnfo.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.common/history.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.common/wlan_common.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.ieee80211/constants.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.ieee80211/rsn.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.policy/types.fidl
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/availability.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/availability.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/availability.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/availability.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/availability.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/availability.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/availability.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/availability.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/availability.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/availability.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/availability.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/availability.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/availability.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/availability.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/availability.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/availability.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/availability.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/availability.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/availability.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/availability.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/availability.h
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_logging_cpp/include/lib/driver/logging/cpp/internal/logger_internal.h
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_logging_cpp/include/lib/driver/logging/cpp/structured_logger.h
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_runtime/include/lib/fdf/arena.h
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_runtime/include/lib/fdf/channel.h
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_runtime/include/lib/fdf/channel_read.h
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_runtime/include/lib/fdf/dispatcher.h
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_runtime/include/lib/fdf/handle.h
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_runtime/include/lib/fdf/types.h
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_runtime_cpp/channel_read.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_runtime_cpp/include/lib/fdf/cpp/arena.h
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_runtime_cpp/include/lib/fdf/cpp/channel.h
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_runtime_cpp/include/lib/fdf/cpp/channel_read.h
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_runtime_cpp/include/lib/fdf/cpp/dispatcher.h
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_runtime_cpp/include/lib/fdf/cpp/unowned.h
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_runtime_env/include/lib/fdf/env.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/wire_format_metadata.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base_v2/include/lib/fidl/cpp/internal/natural_types.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base_v2/include/lib/fidl/cpp/natural_types.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_v2/any_error_in.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_v2/include/lib/fidl/cpp/client.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_v2/include/lib/fidl/cpp/internal/client_details.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_v2/include/lib/fidl/cpp/internal/make_response_context.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_v2/include/lib/fidl/cpp/internal/natural_client_base.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_v2/include/lib/fidl/cpp/unified_messaging.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/client_details.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/intrusive_container/container_utils.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/intrusive_container/helper_macros.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/intrusive_container/node_utils.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/intrusive_container/pointer_traits.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/intrusive_container/wavl_tree.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/intrusive_container/wavl_tree_internal.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/server_details.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/synchronization_checker.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/transport.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/transport_channel.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/wire_messaging.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/wire_types.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/message_storage.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/status.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/transport.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/transport_channel.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_driver/include/lib/fidl_driver/cpp/wire_messaging.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_driver/include/lib/fidl_driver/cpp/wire_types.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_driver_transport/include/lib/fidl_driver/cpp/transport.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_driver_transport/transport.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/include/lib/ui/scenic/cpp/view_creation_tokens.h
+FILE: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/include/lib/ui/scenic/cpp/view_identity.h
+FILE: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/view_creation_tokens.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/view_identity.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/algorithm.h
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/atomic.h
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/cstddef.h
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/functional.h
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/algorithm.h
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/atomic.h
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/erase.h
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/exception.h
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/functional.h
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/span.h
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/tuple.h
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/type_traits.h
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/iterator.h
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/span.h
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/tuple.h
+FILE: ../../../fuchsia/sdk/linux/pkg/sync_cpp/include/lib/sync/cpp/completion.h
+FILE: ../../../fuchsia/sdk/linux/pkg/sys_component_cpp_testing/internal/errors.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/sys_component_cpp_testing/internal/local_component_runner.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/sys_component_cpp_testing/internal/realm.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/sys_component_cpp_testing/realm_builder.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/sys_component_cpp_testing/realm_builder_types.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/sys_component_cpp_testing/scoped_child.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/syslog_structured_backend/cpp/fuchsia_syslog.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/syslog_structured_backend/include/lib/syslog/structured_backend/cpp/fuchsia_syslog.h
+FILE: ../../../fuchsia/sdk/linux/pkg/syslog_structured_backend/include/lib/syslog/structured_backend/fuchsia_syslog.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/status_string.cc
+----------------------------------------------------------------------------------------------------
+Copyright 2021 The Fuchsia Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: fuchsia_sdk
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/errors.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/internal/cdecls.inc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/iob.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/errors.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/internal/cdecls.inc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/iob.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/errors.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/internal/cdecls.inc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/iob.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia/fuchsia.bind + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/performance_publish.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/power_metrics.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.semantics/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.audio.effects/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.fastpair/provider.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt2/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.le/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.sys/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.sys/pairing.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.buildinfo.test/buildinfotest.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera2/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera3/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.castsetup/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.config/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.config/resolved.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.resolution/component.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.resolution/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.resolution/package.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.resolution/resolver.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.sandbox/sandbox.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component/namespace.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.debugdata/publisher.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.framework/composite_node_spec.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.framework/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.element/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.fonts/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/connector.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/dynamics.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/equalizer.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/gain.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/vendor_specific.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/diagnostics.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.platform.device/platform-device.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.power.statecontrol/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.images/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.images2/image_format.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.input/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.intl/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/energy-info-resource.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.legacymetrics/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.lightsensor/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.device/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.thread/dataset.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.thread/meshcop.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.thread/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan/lowpan.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.audio/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.drm/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.playback/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sessions2/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.mediastreams/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.mem/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.mdns/common.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.mdns/host_name_resolver.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.mdns/host_name_subscriber.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.mdns/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.mdns/proxy_host_publisher.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.mdns/service_instance_publisher.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.mdns/service_instance_resolver.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.mdns/service_subscriber.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.reachability/reachability.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.net/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.power.clientlevel/clientlevel.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.power.systemmode/systemmode.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.process/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.recovery.ui/progress.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings.policy/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem2/allocator.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem2/collection.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem2/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.thermal/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.tracing.perfetto/consumer.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.tracing.perfetto/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.tracing.perfetto/producer.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.activity/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.app/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.brightness/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.composition/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.composition/screen_capture.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.composition/screenshot.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.display.singleton/info.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input3/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.observation.geometry/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointer/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointerinjector/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.policy/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.scenic/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.test.input/media_buttons.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.test.input/mouse.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.test.input/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.test.input/registry.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.test.input/text.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.test.input/touch.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.test.scene/controller.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.test.scene/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.unknown/unknown.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.update.config/config.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.update/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.version/version.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.weave/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.web/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.common/driver_features.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.common/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.ieee80211/fields.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.ieee80211/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.phyimpl/phyimpl.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.policy/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.softmac/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.softmac/softmac.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/zx/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/errors.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/internal/cdecls.inc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/iob.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/errors.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/internal/cdecls.inc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/iob.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/errors.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/internal/cdecls.inc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/iob.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/errors.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/internal/cdecls.inc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/iob.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/errors.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/internal/cdecls.inc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/iob.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/errors.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/internal/cdecls.inc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/iob.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/errors.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/internal/cdecls.inc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/iob.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/errors.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/internal/cdecls.inc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/iob.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/errors.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/internal/cdecls.inc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/iob.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/errors.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/internal/cdecls.inc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/iob.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/errors.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/internal/cdecls.inc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/iob.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/errors.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/internal/cdecls.inc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/iob.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/errors.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/internal/cdecls.inc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/iob.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/errors.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/internal/cdecls.inc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/iob.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/errors.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/internal/cdecls.inc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/iob.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/errors.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/internal/cdecls.inc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/iob.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/errors.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/internal/cdecls.inc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/iob.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/errors.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/internal/cdecls.inc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/iob.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/errors.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/internal/cdecls.inc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/iob.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/errors.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/internal/cdecls.inc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/iob.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/errors.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/internal/cdecls.inc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/iob.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async-cpp/include/lib/async/cpp/sequence_checker.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async-cpp/sequence_checker.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async/include/lib/async/sequence_id.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/component_incoming_cpp/include/lib/component/incoming/cpp/constants.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/component_outgoing_cpp/include/lib/component/outgoing/cpp/handlers.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/component_outgoing_cpp/include/lib/component/outgoing/cpp/outgoing_directory.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/component_outgoing_cpp/include/lib/component/outgoing/cpp/structured_config.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/component_outgoing_cpp/outgoing_directory.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_component_cpp/include/lib/driver/component/cpp/composite_node_spec.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_component_cpp/include/lib/driver/component/cpp/driver_base.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_component_cpp/include/lib/driver/component/cpp/node_add_args.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_component_cpp/node_add_args.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_outgoing_cpp/include/lib/driver/outgoing/cpp/handlers.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_outgoing_cpp/include/lib/driver/outgoing/cpp/outgoing_directory.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_outgoing_cpp/outgoing_directory.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_runtime/include/lib/fdf/token.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_runtime_cpp/arena.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_runtime_cpp/include/lib/fdf/cpp/protocol.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_runtime_cpp/protocol.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_runtime_env_cpp/env.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_runtime_env_cpp/include/lib/fdf/cpp/env.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_runtime_testing/include/lib/fdf/testing.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_base/include/lib/fidl/cpp/framework_err.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_base/include/lib/fidl/cpp/transaction_header.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_base/include/lib/fidl/cpp/wire_format_metadata.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/internal/unknown_interactions_table.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/unknown_interactions_hlcpp.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/internal/unknown_interactions_table.c + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/unknown_interactions_hlcpp.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base_v2/include/lib/fidl/cpp/box.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base_v2/include/lib/fidl/cpp/internal/framework_err.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base_v2/include/lib/fidl/cpp/natural_coding_traits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base_v2/include/lib/fidl/cpp/natural_decoder.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base_v2/include/lib/fidl/cpp/natural_encoder.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base_v2/include/lib/fidl/cpp/wire_natural_conversions.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base_v2/natural_coding_traits.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base_v2/natural_decoder.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base_v2/natural_encoder.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base_v2/natural_types.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_hlcpp_conversion/include/lib/fidl/cpp/hlcpp_conversion.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_natural_ostream/include/lib/fidl/cpp/natural_ostream.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_v2/include/lib/fidl/cpp/any_error_in.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_v2/include/lib/fidl/cpp/channel.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_v2/include/lib/fidl/cpp/internal/channel_endpoint_conversions.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_v2/include/lib/fidl/cpp/internal/natural_message_encoder.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_v2/include/lib/fidl/cpp/internal/thenable.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_v2/include/lib/fidl/cpp/unified_messaging_declarations.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_v2/internal/natural_message_encoder.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/client_details.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/coding_errors.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/display_error.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/base_wire_result.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/channel.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/coding_errors.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/incoming_message.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/arrow.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/client_continuation.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/coding_config.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/display_error.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/endpoints.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/framework_err.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/make_response_context.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/thenable.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/optional.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/outgoing_message.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/unknown_interaction_handler.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/unknown_interactions.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/wire_coding_common.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/wire_coding_traits.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/wire_decoder.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/wire_encoder.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/wire_messaging_declarations.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/incoming_message.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/outgoing_message.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/thenable.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/unknown_interactions.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/wire_coding_traits.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/wire_decoder.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/wire_encoder.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/wire_messaging.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/wire_types.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_driver/include/lib/fidl_driver/cpp/internal/server_details.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_driver/include/lib/fidl_driver/cpp/internal/wire_client_details.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_driver/include/lib/fidl_driver/cpp/server.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_driver/include/lib/fidl_driver/cpp/sync_call.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_driver/include/lib/fidl_driver/cpp/unknown_interactions.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_driver/include/lib/fidl_driver/cpp/wire_client.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_driver/include/lib/fidl_driver/cpp/wire_messaging_declarations.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_driver/unknown_interactions.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_driver_natural/include/lib/fidl_driver/cpp/internal/endpoint_conversions.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_driver_natural/include/lib/fidl_driver/cpp/internal/natural_client_details.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_driver_natural/include/lib/fidl_driver/cpp/natural_client.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_driver_natural/include/lib/fidl_driver/cpp/natural_messaging.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_driver_natural/include/lib/fidl_driver/cpp/natural_types.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_driver_natural/include/lib/fidl_driver/cpp/unified_messaging_declarations.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_driver_natural/natural_messaging.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/inline_any.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/internal/inline_any.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/input_report_reader/reader.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect/client.shard.cml + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect_component_cpp/component.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect_component_cpp/include/lib/inspect/component/cpp/component.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect_component_cpp/include/lib/inspect/component/cpp/service.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect_component_cpp/include/lib/inspect/component/cpp/testing.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect_component_cpp/include/lib/inspect/component/cpp/tree_handler_settings.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect_component_cpp/service.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect_component_cpp/testing.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect_service_cpp/include/lib/inspect/service/cpp/tree_handler_settings.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/scenic_cpp_testing/fake_flatland.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/scenic_cpp_testing/fake_flatland_types.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/linkage.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/variant.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/sys/component/realm_builder_absolute.shard.cml + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/sys/component/realm_builder_base.shard.cml + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/sys_component_cpp_testing/internal/convert.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/syslog/client.shard.cml + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/syslog/offer.shard.cml + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/syslog/use.shard.cml + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace/client.shard.cml + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace/offer.shard.cml + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/trace/use.shard.cml + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/utf-utils/include/lib/utf-utils/internal/arm-neon.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/utf-utils/include/lib/utf-utils/internal/generic-simd.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/utf-utils/include/lib/utf-utils/internal/scalar.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/utf-utils/include/lib/utf-utils/internal/x86-avx2.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/utf-utils/include/lib/utf-utils/internal/x86-ssse3.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/utf-utils/include/lib/utf-utils/utf-utils.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/utf-utils/internal/scalar.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/utf-utils/utf-utils.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/vulkan/client.shard.cml + ../../../fuchsia/sdk/linux/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/errors.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/internal/cdecls.inc
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/iob.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/errors.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/internal/cdecls.inc
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/zircon/syscalls/iob.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/errors.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/internal/cdecls.inc
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/iob.h
+FILE: ../../../fuchsia/sdk/linux/bind/fuchsia/fuchsia.bind
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/performance_publish.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/power_metrics.dart
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.semantics/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.audio.effects/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.fastpair/provider.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt2/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.le/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.sys/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.sys/pairing.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.buildinfo.test/buildinfotest.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera2/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera3/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castsetup/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.config/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.config/resolved.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.resolution/component.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.resolution/overview.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.component.sandbox/sandbox.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component/namespace.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.debugdata/publisher.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.framework/composite_node_spec.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.framework/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.element/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.fonts/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/connector.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/dynamics.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/equalizer.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/gain.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/vendor_specific.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/diagnostics.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.platform.device/platform-device.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.power.statecontrol/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.images/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.images2/image_format.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.intl/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/energy-info-resource.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.legacymetrics/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lightsensor/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.device/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.thread/dataset.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.thread/meshcop.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.thread/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan/lowpan.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.audio/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.drm/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.playback/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sessions2/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mediastreams/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mem/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.mdns/common.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.mdns/host_name_resolver.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.mdns/host_name_subscriber.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.mdns/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.mdns/proxy_host_publisher.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.mdns/service_instance_publisher.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.mdns/service_instance_resolver.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.mdns/service_subscriber.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.reachability/reachability.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.power.clientlevel/clientlevel.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.power.systemmode/systemmode.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.process/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.recovery.ui/progress.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings.policy/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem2/allocator.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem2/collection.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem2/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.thermal/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.tracing.perfetto/consumer.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.tracing.perfetto/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.tracing.perfetto/producer.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.activity/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.app/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.brightness/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.composition/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.composition/screen_capture.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.composition/screenshot.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.display.singleton/info.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input3/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.observation.geometry/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointer/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointerinjector/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.policy/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.scenic/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.test.input/media_buttons.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.test.input/mouse.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.test.input/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.test.input/registry.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.test.input/text.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.test.input/touch.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.test.scene/controller.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.test.scene/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.unknown/unknown.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.update.config/config.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.update/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.version/version.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.weave/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.web/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.common/driver_features.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.common/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.ieee80211/fields.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.ieee80211/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.phyimpl/phyimpl.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.policy/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.softmac/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.softmac/softmac.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/zx/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/errors.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/internal/cdecls.inc
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/zircon/syscalls/iob.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/errors.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/internal/cdecls.inc
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/zircon/syscalls/iob.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/errors.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/internal/cdecls.inc
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/zircon/syscalls/iob.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/errors.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/internal/cdecls.inc
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/zircon/syscalls/iob.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/errors.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/internal/cdecls.inc
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/zircon/syscalls/iob.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/errors.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/internal/cdecls.inc
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/zircon/syscalls/iob.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/errors.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/internal/cdecls.inc
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/zircon/syscalls/iob.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/errors.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/internal/cdecls.inc
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/zircon/syscalls/iob.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/errors.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/internal/cdecls.inc
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/zircon/syscalls/iob.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/errors.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/internal/cdecls.inc
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/zircon/syscalls/iob.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/errors.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/internal/cdecls.inc
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/zircon/syscalls/iob.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/errors.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/internal/cdecls.inc
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/zircon/syscalls/iob.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/errors.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/internal/cdecls.inc
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/zircon/syscalls/iob.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/errors.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/internal/cdecls.inc
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/zircon/syscalls/iob.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/errors.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/internal/cdecls.inc
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/zircon/syscalls/iob.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/errors.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/internal/cdecls.inc
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/zircon/syscalls/iob.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/errors.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/internal/cdecls.inc
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/zircon/syscalls/iob.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/errors.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/internal/cdecls.inc
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/zircon/syscalls/iob.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/errors.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/internal/cdecls.inc
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/zircon/syscalls/iob.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/errors.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/internal/cdecls.inc
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/zircon/syscalls/iob.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/errors.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/internal/cdecls.inc
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/zircon/syscalls/iob.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/include/lib/async/cpp/sequence_checker.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/sequence_checker.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/async/include/lib/async/sequence_id.h
+FILE: ../../../fuchsia/sdk/linux/pkg/component_incoming_cpp/include/lib/component/incoming/cpp/constants.h
+FILE: ../../../fuchsia/sdk/linux/pkg/component_outgoing_cpp/include/lib/component/outgoing/cpp/handlers.h
+FILE: ../../../fuchsia/sdk/linux/pkg/component_outgoing_cpp/include/lib/component/outgoing/cpp/outgoing_directory.h
+FILE: ../../../fuchsia/sdk/linux/pkg/component_outgoing_cpp/include/lib/component/outgoing/cpp/structured_config.h
+FILE: ../../../fuchsia/sdk/linux/pkg/component_outgoing_cpp/outgoing_directory.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_component_cpp/include/lib/driver/component/cpp/composite_node_spec.h
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_component_cpp/include/lib/driver/component/cpp/driver_base.h
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_component_cpp/include/lib/driver/component/cpp/node_add_args.h
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_component_cpp/node_add_args.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_outgoing_cpp/include/lib/driver/outgoing/cpp/handlers.h
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_outgoing_cpp/include/lib/driver/outgoing/cpp/outgoing_directory.h
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_outgoing_cpp/outgoing_directory.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_runtime/include/lib/fdf/token.h
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_runtime_cpp/arena.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_runtime_cpp/include/lib/fdf/cpp/protocol.h
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_runtime_cpp/protocol.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_runtime_env_cpp/env.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_runtime_env_cpp/include/lib/fdf/cpp/env.h
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_runtime_testing/include/lib/fdf/testing.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/include/lib/fidl/cpp/framework_err.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/include/lib/fidl/cpp/transaction_header.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/include/lib/fidl/cpp/wire_format_metadata.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/internal/unknown_interactions_table.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/include/lib/fidl/cpp/unknown_interactions_hlcpp.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/internal/unknown_interactions_table.c
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/unknown_interactions_hlcpp.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base_v2/include/lib/fidl/cpp/box.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base_v2/include/lib/fidl/cpp/internal/framework_err.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base_v2/include/lib/fidl/cpp/natural_coding_traits.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base_v2/include/lib/fidl/cpp/natural_decoder.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base_v2/include/lib/fidl/cpp/natural_encoder.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base_v2/include/lib/fidl/cpp/wire_natural_conversions.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base_v2/natural_coding_traits.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base_v2/natural_decoder.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base_v2/natural_encoder.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base_v2/natural_types.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_hlcpp_conversion/include/lib/fidl/cpp/hlcpp_conversion.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_natural_ostream/include/lib/fidl/cpp/natural_ostream.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_v2/include/lib/fidl/cpp/any_error_in.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_v2/include/lib/fidl/cpp/channel.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_v2/include/lib/fidl/cpp/internal/channel_endpoint_conversions.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_v2/include/lib/fidl/cpp/internal/natural_message_encoder.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_v2/include/lib/fidl/cpp/internal/thenable.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_v2/include/lib/fidl/cpp/unified_messaging_declarations.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_v2/internal/natural_message_encoder.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/client_details.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/coding_errors.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/display_error.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/base_wire_result.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/channel.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/coding_errors.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/incoming_message.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/arrow.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/client_continuation.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/coding_config.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/display_error.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/endpoints.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/framework_err.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/make_response_context.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/internal/thenable.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/optional.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/outgoing_message.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/unknown_interaction_handler.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/unknown_interactions.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/wire_coding_common.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/wire_coding_traits.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/wire_decoder.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/wire_encoder.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/include/lib/fidl/cpp/wire/wire_messaging_declarations.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/incoming_message.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/outgoing_message.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/thenable.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/unknown_interactions.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/wire_coding_traits.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/wire_decoder.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/wire_encoder.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/wire_messaging.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_wire/wire_types.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_driver/include/lib/fidl_driver/cpp/internal/server_details.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_driver/include/lib/fidl_driver/cpp/internal/wire_client_details.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_driver/include/lib/fidl_driver/cpp/server.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_driver/include/lib/fidl_driver/cpp/sync_call.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_driver/include/lib/fidl_driver/cpp/unknown_interactions.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_driver/include/lib/fidl_driver/cpp/wire_client.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_driver/include/lib/fidl_driver/cpp/wire_messaging_declarations.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_driver/unknown_interactions.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_driver_natural/include/lib/fidl_driver/cpp/internal/endpoint_conversions.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_driver_natural/include/lib/fidl_driver/cpp/internal/natural_client_details.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_driver_natural/include/lib/fidl_driver/cpp/natural_client.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_driver_natural/include/lib/fidl_driver/cpp/natural_messaging.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_driver_natural/include/lib/fidl_driver/cpp/natural_types.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_driver_natural/include/lib/fidl_driver/cpp/unified_messaging_declarations.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_driver_natural/natural_messaging.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/inline_any.h
+FILE: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/internal/inline_any.h
+FILE: ../../../fuchsia/sdk/linux/pkg/input_report_reader/reader.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect/client.shard.cml
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect_component_cpp/component.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect_component_cpp/include/lib/inspect/component/cpp/component.h
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect_component_cpp/include/lib/inspect/component/cpp/service.h
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect_component_cpp/include/lib/inspect/component/cpp/testing.h
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect_component_cpp/include/lib/inspect/component/cpp/tree_handler_settings.h
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect_component_cpp/service.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect_component_cpp/testing.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect_service_cpp/include/lib/inspect/service/cpp/tree_handler_settings.h
+FILE: ../../../fuchsia/sdk/linux/pkg/scenic_cpp_testing/fake_flatland.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/scenic_cpp_testing/fake_flatland_types.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/linkage.h
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/variant.h
+FILE: ../../../fuchsia/sdk/linux/pkg/sys/component/realm_builder_absolute.shard.cml
+FILE: ../../../fuchsia/sdk/linux/pkg/sys/component/realm_builder_base.shard.cml
+FILE: ../../../fuchsia/sdk/linux/pkg/sys_component_cpp_testing/internal/convert.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/syslog/client.shard.cml
+FILE: ../../../fuchsia/sdk/linux/pkg/syslog/offer.shard.cml
+FILE: ../../../fuchsia/sdk/linux/pkg/syslog/use.shard.cml
+FILE: ../../../fuchsia/sdk/linux/pkg/trace/client.shard.cml
+FILE: ../../../fuchsia/sdk/linux/pkg/trace/offer.shard.cml
+FILE: ../../../fuchsia/sdk/linux/pkg/trace/use.shard.cml
+FILE: ../../../fuchsia/sdk/linux/pkg/utf-utils/include/lib/utf-utils/internal/arm-neon.h
+FILE: ../../../fuchsia/sdk/linux/pkg/utf-utils/include/lib/utf-utils/internal/generic-simd.h
+FILE: ../../../fuchsia/sdk/linux/pkg/utf-utils/include/lib/utf-utils/internal/scalar.h
+FILE: ../../../fuchsia/sdk/linux/pkg/utf-utils/include/lib/utf-utils/internal/x86-avx2.h
+FILE: ../../../fuchsia/sdk/linux/pkg/utf-utils/include/lib/utf-utils/internal/x86-ssse3.h
+FILE: ../../../fuchsia/sdk/linux/pkg/utf-utils/include/lib/utf-utils/utf-utils.h
+FILE: ../../../fuchsia/sdk/linux/pkg/utf-utils/internal/scalar.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/utf-utils/utf-utils.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/vulkan/client.shard.cml
+----------------------------------------------------------------------------------------------------
+Copyright 2022 The Fuchsia Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: fuchsia_sdk
+ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.adc/fuchsia.adc.bind + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.block/fuchsia.block.bind + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/bind/fuchsia.devicetree/fuchsia.devicetree.bind + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/flatland_example.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/media_session.dart + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.sandbox/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component/controller.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.device.fs/names.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.development/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.framework/driver.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.framework/driver_info.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.legacy/legacy_types.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.legacy/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.registrar/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.element/graphical_presenter.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/endpoint.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/clock.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/common.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/composite.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/composite_connector.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/device_type.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/plug.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/ring_buffer_format.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/history.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.power/config.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.trippoint/trippoint.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.images2/math.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.inspect/inspect_sink.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/symlink.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/framebuffer-resource.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/iommu-resource.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/profile-resource.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.thread/feature.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.routes/ipv4.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.routes/ipv6.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.stackmigrationdeprecated/stackmigrationdeprecated.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.session/lifecycle.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.session/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.session/restarter.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.tracing/tracing.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.display.singleton/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.ieee80211/deprecated.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async_patterns_cpp/include/lib/async_patterns/cpp/callback.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async_patterns_cpp/include/lib/async_patterns/cpp/dispatcher_bound.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async_patterns_cpp/include/lib/async_patterns/cpp/function.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async_patterns_cpp/include/lib/async_patterns/cpp/internal/dispatcher_bound_storage.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async_patterns_cpp/include/lib/async_patterns/cpp/internal/receiver_base.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async_patterns_cpp/include/lib/async_patterns/cpp/internal/sendable.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async_patterns_cpp/include/lib/async_patterns/cpp/internal/tag.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async_patterns_cpp/include/lib/async_patterns/cpp/internal/task_queue.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async_patterns_cpp/include/lib/async_patterns/cpp/pending_call.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async_patterns_cpp/include/lib/async_patterns/cpp/receiver.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async_patterns_cpp/include/lib/async_patterns/cpp/sendable.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async_patterns_cpp/include/lib/async_patterns/cpp/task_scope.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async_patterns_cpp/internal/dispatcher_bound_storage.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async_patterns_cpp/internal/receiver_base.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async_patterns_cpp/internal/task_queue.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/async_patterns_cpp/task_scope.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/component_incoming_cpp/include/lib/component/incoming/cpp/clone.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/component_incoming_cpp/include/lib/component/incoming/cpp/internal.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/component_incoming_cpp/include/lib/component/incoming/cpp/protocol.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/component_incoming_cpp/include/lib/component/incoming/cpp/service.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/component_incoming_cpp/internal.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/component_incoming_cpp/protocol.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/component_outgoing_cpp/globals.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/component_outgoing_cpp/include/lib/component/outgoing/cpp/globals.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_component_cpp/completer.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_component_cpp/driver_base.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_component_cpp/include/lib/driver/component/cpp/driver_export.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_component_cpp/include/lib/driver/component/cpp/internal/driver_server.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_component_cpp/include/lib/driver/component/cpp/prepare_stop_completer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_component_cpp/include/lib/driver/component/cpp/start_completer.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_devfs_cpp/include/lib/driver/devfs/cpp/connector.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_runtime_testing_cpp/internal/default_dispatcher_setting.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_runtime_testing_cpp/internal/dispatcher.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_runtime_testing_cpp/internal/test_dispatcher_builder.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_runtime_testing_cpp/internal/wait_for.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_runtime_testing_cpp/sync_helpers.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_testing_cpp/driver_lifecycle.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_testing_cpp/driver_runtime.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_testing_cpp/environment_variables.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_testing_cpp/test_environment.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/driver_testing_cpp/test_node.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/fidl_driver_natural/include/lib/fidl_driver/cpp/natural_ostream.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/heapdump_instrumentation/collector.shard.cml + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/heapdump_instrumentation/include/heapdump/bind.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/heapdump_instrumentation/include/heapdump/snapshot.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/heapdump_instrumentation/include/heapdump/stats.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect/offer.shard.cml + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/inspect/use.shard.cml + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/sync_cpp/include/lib/sync/cpp/mutex.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/sys_service_cpp/service_handler.cc + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/vfs_internal/include/lib/vfs/internal/libvfs_private.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/virtgralloc_headers/include/lib/virtgralloc/shared_metadata.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/virtgralloc_headers/include/lib/virtgralloc/virtgralloc_ioctl.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/iob.h + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/iob.cc + ../../../fuchsia/sdk/linux/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.adc/fuchsia.adc.bind
+FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.block/fuchsia.block.bind
+FILE: ../../../fuchsia/sdk/linux/bind/fuchsia.devicetree/fuchsia.devicetree.bind
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/flatland_example.dart
+FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/media_session.dart
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.sandbox/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component/controller.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.device.fs/names.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.development/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.framework/driver.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.framework/driver_info.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.legacy/legacy_types.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.legacy/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.registrar/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.element/graphical_presenter.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/endpoint.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/clock.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/common.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/composite.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/composite_connector.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/device_type.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/plug.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/ring_buffer_format.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/history.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.power/config.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.trippoint/trippoint.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.images2/math.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.inspect/inspect_sink.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/symlink.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/framebuffer-resource.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/iommu-resource.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/profile-resource.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.thread/feature.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.routes/ipv4.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.routes/ipv6.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.stackmigrationdeprecated/stackmigrationdeprecated.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.session/lifecycle.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.session/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.session/restarter.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.tracing/tracing.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.display.singleton/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.ieee80211/deprecated.fidl
+FILE: ../../../fuchsia/sdk/linux/pkg/async_patterns_cpp/include/lib/async_patterns/cpp/callback.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async_patterns_cpp/include/lib/async_patterns/cpp/dispatcher_bound.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async_patterns_cpp/include/lib/async_patterns/cpp/function.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async_patterns_cpp/include/lib/async_patterns/cpp/internal/dispatcher_bound_storage.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async_patterns_cpp/include/lib/async_patterns/cpp/internal/receiver_base.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async_patterns_cpp/include/lib/async_patterns/cpp/internal/sendable.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async_patterns_cpp/include/lib/async_patterns/cpp/internal/tag.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async_patterns_cpp/include/lib/async_patterns/cpp/internal/task_queue.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async_patterns_cpp/include/lib/async_patterns/cpp/pending_call.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async_patterns_cpp/include/lib/async_patterns/cpp/receiver.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async_patterns_cpp/include/lib/async_patterns/cpp/sendable.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async_patterns_cpp/include/lib/async_patterns/cpp/task_scope.h
+FILE: ../../../fuchsia/sdk/linux/pkg/async_patterns_cpp/internal/dispatcher_bound_storage.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/async_patterns_cpp/internal/receiver_base.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/async_patterns_cpp/internal/task_queue.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/async_patterns_cpp/task_scope.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/component_incoming_cpp/include/lib/component/incoming/cpp/clone.h
+FILE: ../../../fuchsia/sdk/linux/pkg/component_incoming_cpp/include/lib/component/incoming/cpp/internal.h
+FILE: ../../../fuchsia/sdk/linux/pkg/component_incoming_cpp/include/lib/component/incoming/cpp/protocol.h
+FILE: ../../../fuchsia/sdk/linux/pkg/component_incoming_cpp/include/lib/component/incoming/cpp/service.h
+FILE: ../../../fuchsia/sdk/linux/pkg/component_incoming_cpp/internal.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/component_incoming_cpp/protocol.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/component_outgoing_cpp/globals.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/component_outgoing_cpp/include/lib/component/outgoing/cpp/globals.h
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_component_cpp/completer.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_component_cpp/driver_base.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_component_cpp/include/lib/driver/component/cpp/driver_export.h
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_component_cpp/include/lib/driver/component/cpp/internal/driver_server.h
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_component_cpp/include/lib/driver/component/cpp/prepare_stop_completer.h
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_component_cpp/include/lib/driver/component/cpp/start_completer.h
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_devfs_cpp/include/lib/driver/devfs/cpp/connector.h
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_runtime_testing_cpp/internal/default_dispatcher_setting.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_runtime_testing_cpp/internal/dispatcher.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_runtime_testing_cpp/internal/test_dispatcher_builder.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_runtime_testing_cpp/internal/wait_for.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_runtime_testing_cpp/sync_helpers.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_testing_cpp/driver_lifecycle.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_testing_cpp/driver_runtime.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_testing_cpp/environment_variables.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_testing_cpp/test_environment.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_testing_cpp/test_node.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/fidl_driver_natural/include/lib/fidl_driver/cpp/natural_ostream.h
+FILE: ../../../fuchsia/sdk/linux/pkg/heapdump_instrumentation/collector.shard.cml
+FILE: ../../../fuchsia/sdk/linux/pkg/heapdump_instrumentation/include/heapdump/bind.h
+FILE: ../../../fuchsia/sdk/linux/pkg/heapdump_instrumentation/include/heapdump/snapshot.h
+FILE: ../../../fuchsia/sdk/linux/pkg/heapdump_instrumentation/include/heapdump/stats.h
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect/offer.shard.cml
+FILE: ../../../fuchsia/sdk/linux/pkg/inspect/use.shard.cml
+FILE: ../../../fuchsia/sdk/linux/pkg/sync_cpp/include/lib/sync/cpp/mutex.h
+FILE: ../../../fuchsia/sdk/linux/pkg/sys_service_cpp/service_handler.cc
+FILE: ../../../fuchsia/sdk/linux/pkg/vfs_internal/include/lib/vfs/internal/libvfs_private.h
+FILE: ../../../fuchsia/sdk/linux/pkg/virtgralloc_headers/include/lib/virtgralloc/shared_metadata.h
+FILE: ../../../fuchsia/sdk/linux/pkg/virtgralloc_headers/include/lib/virtgralloc/virtgralloc_ioctl.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/iob.h
+FILE: ../../../fuchsia/sdk/linux/pkg/zx/iob.cc
+----------------------------------------------------------------------------------------------------
+Copyright 2023 The Fuchsia Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: fuchsia_sdk
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.le/iso.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/coding_format.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component/introspector.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.platform.device/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.power/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.images2/overview.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/msi-resource.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.thread/capabilities.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem2/error.fidl + ../../../fuchsia/sdk/linux/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.le/iso.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/coding_format.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component/introspector.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.platform.device/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.power/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.images2/overview.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/msi-resource.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.thread/capabilities.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem2/error.fidl
 ----------------------------------------------------------------------------------------------------
-The majority of files in this project use the Apache 2.0 License.
-There are a few exceptions and their license can be found in the source.
-Any license deviations from Apache 2.0 are "more permissive" licenses.
-
-===========================================================================================
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+Copyright 2024 The Fuchsia Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ====================================================================================================
 
 ====================================================================================================
 LIBRARY: fuchsia_sdk
 ORIGIN: ../../../fuchsia/sdk/linux/COPYRIGHT.musl
 TYPE: LicenseType.mit
-FILE: ../../../fuchsia/sdk/linux/.versions/core.cipd_version
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/VkLayer_image_pipe_swapchain.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/VkLayer_khronos_validation.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libdriver_runtime.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libfdio.so
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libmemfs.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libheapdump_instrumentation.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libsvc.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libsyslog.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libtrace-engine.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libvfs_internal.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/dist/libvulkan.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libasync-default.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libdriver_runtime.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libfdio.so
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libmemfs.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libmagma_client.a
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libsvc.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libsync.a
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libsyslog.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libtrace-engine.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libtrace-vthread.a
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libvfs_internal.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/lib/libvulkan.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/alloca.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/ar.h
@@ -3107,43 +14566,26 @@ FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/arpa/nameser_compat.
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/arpa/telnet.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/arpa/tftp.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/assert.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/aarch64/endian.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/aarch64/fenv.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/aarch64/ioctl.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/aarch64/ipc.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/aarch64/reg.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/aarch64/setjmp.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/aarch64/signal.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/aarch64/stat.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/alltypes.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/endian.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/errno.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/fcntl.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/fenv.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/io.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/ioctl.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/ipc.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/limits.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/msg.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/null.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/posix.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/reg.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/sem.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/riscv64/setjmp.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/setjmp.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/shm.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/signal.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/stat.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/statfs.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/termios.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/x86_64/endian.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/x86_64/fenv.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/x86_64/io.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/x86_64/ioctl.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/x86_64/ipc.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/x86_64/reg.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/x86_64/setjmp.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/x86_64/signal.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/bits/x86_64/stat.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/byteswap.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/complex.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/cpio.h
@@ -3157,7 +14599,6 @@ FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/errno.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/fcntl.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/features.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/fenv.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/fmtmsg.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/fnmatch.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/getopt.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/glob.h
@@ -3200,7 +14641,6 @@ FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/pwd.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/regex.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/resolv.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sched.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/search.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/semaphore.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/setjmp.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/signal.h
@@ -3217,41 +14657,32 @@ FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/errno.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/eventfd.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/fcntl.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/file.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/fsuid.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/inotify.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/io.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/ioctl.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/ipc.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/klog.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/mman.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/mount.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/msg.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/mtio.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/param.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/personality.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/poll.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/quota.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/random.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/reboot.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/reg.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/select.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/sem.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/shm.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/signal.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/signalfd.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/socket.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/stat.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/statfs.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/statvfs.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/stropts.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/swap.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/syslog.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/termios.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/time.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/timeb.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/timerfd.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/times.h
-FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/timex.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/ttydefaults.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/types.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/sys/ucontext.h
@@ -3282,25 +14713,217 @@ FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/lib/libm.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/lib/libpthread.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/lib/librt.so
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/VkLayer_image_pipe_swapchain.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/VkLayer_khronos_validation.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libtrace-vthread.a
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/arch/riscv64/sysroot/lib/libzircon.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/VkLayer_image_pipe_swapchain.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/VkLayer_khronos_validation.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libdriver_runtime.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libfdio.so
-FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libmemfs.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libheapdump_instrumentation.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libsvc.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libsyslog.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libtrace-engine.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libvfs_internal.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/dist/libvulkan.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libasync-default.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libdriver_runtime.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libfdio.so
-FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libmemfs.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libmagma_client.a
 FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libsvc.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libsync.a
 FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libsyslog.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libtrace-engine.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libtrace-vthread.a
+FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libvfs_internal.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/lib/libvulkan.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/alloca.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/ar.h
@@ -3311,43 +14934,26 @@ FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/arpa/nameser_compat.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/arpa/telnet.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/arpa/tftp.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/assert.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/aarch64/endian.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/aarch64/fenv.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/aarch64/ioctl.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/aarch64/ipc.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/aarch64/reg.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/aarch64/setjmp.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/aarch64/signal.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/aarch64/stat.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/alltypes.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/endian.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/errno.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/fcntl.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/fenv.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/io.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/ioctl.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/ipc.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/limits.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/msg.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/null.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/posix.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/reg.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/sem.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/riscv64/setjmp.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/setjmp.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/shm.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/signal.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/stat.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/statfs.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/termios.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/x86_64/endian.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/x86_64/fenv.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/x86_64/io.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/x86_64/ioctl.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/x86_64/ipc.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/x86_64/reg.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/x86_64/setjmp.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/x86_64/signal.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/bits/x86_64/stat.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/byteswap.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/complex.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/cpio.h
@@ -3361,7 +14967,6 @@ FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/errno.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/fcntl.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/features.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/fenv.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/fmtmsg.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/fnmatch.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/getopt.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/glob.h
@@ -3404,7 +15009,6 @@ FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/pwd.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/regex.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/resolv.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sched.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/search.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/semaphore.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/setjmp.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/signal.h
@@ -3421,41 +15025,32 @@ FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/errno.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/eventfd.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/fcntl.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/file.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/fsuid.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/inotify.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/io.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/ioctl.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/ipc.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/klog.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/mman.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/mount.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/msg.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/mtio.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/param.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/personality.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/poll.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/quota.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/random.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/reboot.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/reg.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/select.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/sem.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/shm.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/signal.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/signalfd.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/socket.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/stat.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/statfs.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/statvfs.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/stropts.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/swap.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/syslog.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/termios.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/time.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/timeb.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/timerfd.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/times.h
-FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/timex.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/ttydefaults.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/types.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/sys/ucontext.h
@@ -3486,221 +15081,3933 @@ FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/libm.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/libpthread.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/librt.so
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/lib/libzircon.so
-FILE: ../../../fuchsia/sdk/linux/dart/fidl/meta.json
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia/meta.json
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_component_test/meta.json
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_inspect/meta.json
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_logger/meta.json
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_scenic/meta.json
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_scenic_flutter/meta.json
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_services/meta.json
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_vfs/meta.json
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_view/meta.json
-FILE: ../../../fuchsia/sdk/linux/dart/sl4f/meta.json
-FILE: ../../../fuchsia/sdk/linux/dart/zircon/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.gesture/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.semantics/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.virtualkeyboard/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.audio.effects/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth.oldtokens/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.a2dp/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.fastpair/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt2/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.hfp/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.le/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.sys/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.buildinfo.test/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.buildinfo/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera2.hal/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera2/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.camera3/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castauth/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castconfig/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castremotecontrol/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castsetup/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castsysteminfo/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castwindow/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.config/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
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.data/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.debugdata/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.developer.tiles/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics.types/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.driver.test/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.element/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.factory.wlan/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.factory/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.fonts/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.gpu.agis/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.gpu.magma/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.adc/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.goldfish/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.light/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.power.statecontrol/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.radar/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hwinfo/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.images/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.report/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.virtualkeyboard/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.inspect/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.intl/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.kernel/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ldsvc/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.legacymetrics/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lightsensor/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.location.namedplace/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.location.position/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.location.sensor/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.location/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.logger/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.bootstrap/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.device/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.thread/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.math/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.audio/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.drm/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.playback/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sessions2/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sounds/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.target/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mediacodec/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mediastreams/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mem/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.memorypressure/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.metrics/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.migration/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.modular/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.http/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.interfaces/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.mdns/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.reachability/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.routes/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.power.clientlevel/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.power.profile/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.power.systemmode/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.process.lifecycle/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.process/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.recovery.ui/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.recovery/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.scenic.scheduling/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.session/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings.policy/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.settings/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys.test/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sys/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysinfo/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.sysmem/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.test/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.thermal/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.tracing.perfetto/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.tracing.provider/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.activity.control/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.activity/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.app/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.brightness/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.composition/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.gfx/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.input3/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.observation.geometry/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointer.augment/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointer/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.pointerinjector/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.policy/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.scenic/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.test.input/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.test.scene/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.types/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ui.views/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.ultrasound/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.unknown/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.update.channel/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.update.channelcontrol/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.update.config/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.update/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.url/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.version/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.weave/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.web/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.common/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.ieee80211/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.policy/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.product.deprecatedclient/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.product.deprecatedconfiguration/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/zx/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/async-cpp/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/async-default/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/async-loop-cpp/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/async-loop-default/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/async-loop-testing/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/async-loop/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/async-testing/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/async/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/fdio/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_sync/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/fit-promise/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/fit/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/images_cpp/meta.json
+FILE: ../../../fuchsia/sdk/linux/data/config/symbol_index/config.json
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-12/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-14/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-17/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-18/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/arm64-api-19/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-12/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-14/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-18/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/riscv64-api-19/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-12/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-14/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-18/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/dist/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/dist/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/dist/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/dist/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/dist/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/dist/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/dist/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/dist/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/dist/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/dist/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/dist/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libasync-default.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libasync-loop-default.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libbackend_fuchsia_globals.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libdriver_runtime.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libfdio.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libheapdump_instrumentation.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libmagma_client.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libsvc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libsync.a
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libsyslog.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libtrace-engine.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libtrace-provider-so.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libvfs_internal.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/lib/libvulkan.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/alloca.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/ar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/arpa/ftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/arpa/inet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/arpa/nameser.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/arpa/nameser_compat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/arpa/telnet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/arpa/tftp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/assert.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/aarch64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/aarch64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/alltypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/null.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/posix.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/riscv64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/riscv64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/x86_64/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/x86_64/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/bits/x86_64/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/byteswap.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/complex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/cpio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/ctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/dirent.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/dlfcn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/elf.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/endian.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/err.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/features.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/fenv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/fnmatch.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/getopt.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/glob.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/grp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/iconv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/ifaddrs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/inttypes.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/iso646.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/langinfo.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/libgen.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/limits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/link.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/locale.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/malloc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/math.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/memory.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/monetary.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/net/ethernet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/net/if.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/net/if_arp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/net/route.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netdb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netinet/ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netinet/icmp6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netinet/if_ether.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netinet/igmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netinet/in.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netinet/in_systm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netinet/ip.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netinet/ip6.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netinet/ip_icmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netinet/tcp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netinet/udp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/netpacket/packet.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/nl_types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/paths.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/pthread.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/pwd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/regex.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/resolv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sched.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/semaphore.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/setjmp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/spawn.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/stdio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/stdlib.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/string.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/strings.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/acct.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/auxv.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/dir.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/errno.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/eventfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/fcntl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/file.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/inotify.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/io.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/ioctl.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/ipc.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/mman.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/mount.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/msg.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/mtio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/param.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/poll.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/random.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/select.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/sem.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/shm.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/signal.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/socket.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/stat.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/statfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/statvfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/stropts.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/timeb.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/timerfd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/times.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/ttydefaults.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/types.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/uio.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/un.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/utsname.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/vfs.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sys/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/sysexits.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/syslog.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/tar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/termios.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/threads.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/time.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/uchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/ucontext.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/unistd.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/utime.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/values.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/wait.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/wchar.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/wctype.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/include/wordexp.h
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/lib/Scrt1.o
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/lib/libc.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/lib/libdl.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/lib/libm.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/lib/libpthread.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/lib/librt.so
+FILE: ../../../fuchsia/sdk/linux/obj/x64-api-19/sysroot/lib/libzircon.so
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/arm64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/arm64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/arm64-api-18/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/arm64-api-18/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/arm64-api-19/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/arm64-api-19/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/riscv64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/riscv64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/riscv64-api-18/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/riscv64-api-18/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/riscv64-api-19/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/riscv64-api-19/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/x64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/x64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/x64-api-18/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/x64-api-18/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/x64-api-19/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/heapdump-collector/x64-api-19/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/arm64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/arm64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/arm64-api-16/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/arm64-api-16/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/arm64-api-17/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/arm64-api-17/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/arm64-api-18/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/arm64-api-18/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/arm64-api-19/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/arm64-api-19/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/riscv64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/riscv64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/riscv64-api-16/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/riscv64-api-16/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/riscv64-api-17/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/riscv64-api-17/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/riscv64-api-18/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/riscv64-api-18/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/riscv64-api-19/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/riscv64-api-19/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/x64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/x64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/x64-api-16/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/x64-api-16/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/x64-api-17/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/x64-api-17/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/x64-api-18/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/x64-api-18/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/x64-api-19/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/magma_conformance_tests/x64-api-19/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/arm64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/arm64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/riscv64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/riscv64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/x64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/realm_builder_server/x64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/arm64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/arm64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/arm64-api-19/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/arm64-api-19/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/riscv64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/riscv64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/riscv64-api-19/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/riscv64-api-19/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/x64-api--1/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/x64-api--1/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/x64-api-19/release/content_checklist_path
+FILE: ../../../fuchsia/sdk/linux/packages/vkreadback_test/x64-api-19/release/package_manifest.json
+FILE: ../../../fuchsia/sdk/linux/pkg/async-default/async-default.ifs
+FILE: ../../../fuchsia/sdk/linux/pkg/backend_fuchsia_globals/backend_fuchsia_globals.ifs
+FILE: ../../../fuchsia/sdk/linux/pkg/driver_runtime_shared_lib/driver_runtime.ifs
+FILE: ../../../fuchsia/sdk/linux/pkg/fdio/fdio.ifs
+FILE: ../../../fuchsia/sdk/linux/pkg/heapdump_instrumentation/heapdump_instrumentation.ifs
+FILE: ../../../fuchsia/sdk/linux/pkg/heapdump_instrumentation/heapdump_instrumentation_shard.json
 FILE: ../../../fuchsia/sdk/linux/pkg/inspect/inspect.json
-FILE: ../../../fuchsia/sdk/linux/pkg/inspect/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/inspect_service_cpp/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/media_cpp/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/media_cpp_no_converters/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/memfs/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/modular_cpp/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/svc/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/sync/meta.json
+FILE: ../../../fuchsia/sdk/linux/pkg/svc/svc.ifs
 FILE: ../../../fuchsia/sdk/linux/pkg/sys/component/realm_builder_shard_sdk.json
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_component_cpp_testing/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_cpp/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_cpp_testing/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_inspect_cpp/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/sys_service_cpp/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/syslog/client.shard.cmx
-FILE: ../../../fuchsia/sdk/linux/pkg/syslog/meta.json
+FILE: ../../../fuchsia/sdk/linux/pkg/syslog/syslog.ifs
 FILE: ../../../fuchsia/sdk/linux/pkg/syslog/syslog.json
-FILE: ../../../fuchsia/sdk/linux/pkg/syslog_structured_backend/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/sysroot/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/trace-engine/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/trace-provider-so/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/trace/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/utf-utils/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/vfs_cpp/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/vulkan/meta.json
+FILE: ../../../fuchsia/sdk/linux/pkg/sysroot/libc.ifs
+FILE: ../../../fuchsia/sdk/linux/pkg/sysroot/zircon.ifs
+FILE: ../../../fuchsia/sdk/linux/pkg/trace-engine/trace-engine.ifs
+FILE: ../../../fuchsia/sdk/linux/pkg/trace-provider-so/trace-provider-so.ifs
+FILE: ../../../fuchsia/sdk/linux/pkg/trace/trace.json
+FILE: ../../../fuchsia/sdk/linux/pkg/vfs_internal/vfs_internal.ifs
+FILE: ../../../fuchsia/sdk/linux/pkg/vulkan/vulkan.ifs
 FILE: ../../../fuchsia/sdk/linux/pkg/vulkan/vulkan.json
 FILE: ../../../fuchsia/sdk/linux/pkg/vulkan_layers/data/vulkan/explicit_layer.d/VkLayer_image_pipe_swapchain.json
 FILE: ../../../fuchsia/sdk/linux/pkg/vulkan_layers/data/vulkan/explicit_layer.d/VkLayer_khronos_validation.json
-FILE: ../../../fuchsia/sdk/linux/pkg/vulkan_layers/meta.json
-FILE: ../../../fuchsia/sdk/linux/pkg/zx/meta.json
-FILE: ../../../fuchsia/sdk/linux/version_history.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/fidl_codec.so
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/fuchsia_controller_internal.so
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.buildinfo/fuchsia.buildinfo.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.component.config/fuchsia.component.config.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.component.decl/fuchsia.component.decl.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.component.runner/fuchsia.component.runner.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.component.sandbox/fuchsia.component.sandbox.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.component.types/fuchsia.component.types.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.component/fuchsia.component.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.data/fuchsia.data.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.developer.ffx/fuchsia.developer.ffx.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.developer.ffxdaemonlifecycle/fuchsia.developer.ffxdaemonlifecycle.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.developer.remotecontrol/fuchsia.developer.remotecontrol.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.diagnostics.types/fuchsia.diagnostics.types.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.diagnostics/fuchsia.diagnostics.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.feedback/fuchsia.feedback.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.gpu.agis/fuchsia.gpu.agis.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.hardware.power.statecontrol/fuchsia.hardware.power.statecontrol.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.hardware.rtc/fuchsia.hardware.rtc.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.hwinfo/fuchsia.hwinfo.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.intl/fuchsia.intl.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.io/fuchsia.io.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.ldsvc/fuchsia.ldsvc.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.math/fuchsia.math.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.mem/fuchsia.mem.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.net/fuchsia.net.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.process/fuchsia.process.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.sys2/fuchsia.sys2.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.tracing.controller/fuchsia.tracing.controller.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.tracing/fuchsia.tracing.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.unknown/fuchsia.unknown.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.url/fuchsia.url.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/fuchsia.version/fuchsia.version.fidl.json
+FILE: ../../../fuchsia/sdk/linux/python/rtc_conformance_test/unversioned/ir_root/zx/zx.fidl.json
 ----------------------------------------------------------------------------------------------------
 musl as a whole is licensed under the following standard MIT license:
 
+
 Copyright © 2005-2014 Rich Felker, et al.
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -3722,6 +19029,7 @@ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+
 Authors/contributors include:
 
 Alex Dowad
@@ -3827,4 +19135,5 @@ negated the permissions granted in the license. In the spirit of
 permissive licensing, and of not having licensing issues being an
 obstacle to adoption, that text has been removed.
 ====================================================================================================
-Total license count: 15
+
+Total license count: 13
diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia
index 5f280e1edcb81fea4fb16f661eea2c63e10060f3..0174f11d0237f059d96fde5368934a7a62fc8621 100644
--- a/ci/licenses_golden/licenses_skia
+++ b/ci/licenses_golden/licenses_skia
@@ -1,199 +1,43 @@
-Signature: 27f6cbeeab8c2e28b648514ca26e8bfa
-
-UNUSED LICENSES:
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-USED LICENSES:
-
-====================================================================================================
-LIBRARY: etc1
-ORIGIN: ../../../third_party/skia/third_party/etc1/LICENSE
-TYPE: LicenseType.apache
-FILE: ../../../third_party/skia/third_party/etc1/BUILD.bazel
-----------------------------------------------------------------------------------------------------
-Apache License
-
-Version 2.0, January 2004
-
-http://www.apache.org/licenses
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and
-distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the
-copyright owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other
-entities that control, are controlled by, or are under common control with
-that entity. For the purposes of this definition, "control" means (i) the
-power, direct or indirect, to cause the direction or management of such
-entity, whether by contract or otherwise, or (ii) ownership of fifty
-percent (50%) or more of the outstanding shares, or (iii) beneficial
-ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising
-permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications,
-including but not limited to software source code, documentation
-source, and configuration files.
-
-"Object" form shall mean any form resulting from mechanical transformation
-or translation of a Source form, including but not limited to compiled
-object code, generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object
-form, made available under the License, as indicated by a copyright
-notice that is included in or attached to the work (an example is
-provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object
-form, that is based on (or derived from) the Work and for which the
-editorial revisions, annotations, elaborations, or other modifications
-represent, as a whole, an original work of authorship. For the purposes
-of this License, Derivative Works shall not include works that remain
-separable from, or merely link (or bind by name) to the interfaces of,
-the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original
-version of the Work and any modifications or additions to that Work or
-Derivative Works thereof, that is intentionally submitted to Licensor
-for inclusion in the Work by the copyright owner or by an individual or
-Legal Entity authorized to submit on behalf of the copyright owner. For
-the purposes of this definition, "submitted" means any form of electronic,
-verbal, or written communication sent to the Licensor or its
-representatives, including but not limited to communication on electronic
-mailing lists, source code control systems, and issue tracking systems that
-are managed by, or on behalf of, the Licensor for the purpose of discussing
-and improving the Work, but excluding communication that is conspicuously
-marked or otherwise designated in writing by the copyright owner as "Not
-a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on
-behalf of whom a Contribution has been received by Licensor and subsequently
-incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of this
-License, each Contributor hereby grants to You a perpetual, worldwide,
-non-exclusive, no-charge, royalty-free, irrevocable copyright license to
-reproduce, prepare Derivative Works of, publicly display, publicly perform,
-sublicense, and distribute the Work and such Derivative Works in Source or
-Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of this
-License, each Contributor hereby grants to You a perpetual, worldwide,
-non-exclusive, no-charge, royalty-free, irrevocable (except as stated in
-this section) patent license to make, have made, use, offer to sell, sell,
-import, and otherwise transfer the Work, where such license applies only to
-those patent claims licensable by such Contributor that are necessarily
-infringed by their Contribution(s) alone or by combination of their
-Contribution(s) with the Work to which such Contribution(s) was submitted.
-If You institute patent litigation against any entity (including a cross-claim
-or counterclaim in a lawsuit) alleging that the Work or a Contribution
-incorporated within the Work constitutes direct or contributory patent
-infringement, then any patent licenses granted to You under this License
-for that Work shall terminate as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the Work or
-Derivative Works thereof in any medium, with or without modifications, and
-in Source or Object form, provided that You meet the following conditions:
-
-You must give any other recipients of the Work or Derivative Works a copy of
-this License; and
-You must cause any modified files to carry prominent notices stating that
-You changed the files; and
-You must retain, in the Source form of any Derivative Works that You
-distribute, all copyright, patent, trademark, and attribution notices
-from the Source form of the Work, excluding those notices that do not
-pertain to any part of the Derivative Works; and
-If the Work includes a "NOTICE" text file as part of its distribution,
-then any Derivative Works that You distribute must include a readable
-copy of the attribution notices contained within such NOTICE file, excluding
-those notices that do not pertain to any part of the Derivative Works, in
-at least one of the following places: within a NOTICE text file distributed
-as part of the Derivative Works; within the Source form or documentation, if
-provided along with the Derivative Works; or, within a display generated by
-the Derivative Works, if and wherever such third-party notices normally
-appear. The contents of the NOTICE file are for informational purposes
-only and do not modify the License. You may add Your own attribution
-notices within Derivative Works that You distribute, alongside or as
-an addendum to the NOTICE text from the Work, provided that such additional
-attribution notices cannot be construed as modifying the License.
-
-You may add Your own copyright statement to Your modifications and may provide
-additional or different license terms and conditions for use, reproduction, or
-distribution of Your modifications, or for any such Derivative Works as a
-whole, provided Your use, reproduction, and distribution of the Work otherwise
-complies with the conditions stated in this License.
-5. Submission of Contributions. Unless You explicitly state otherwise, any
-Contribution intentionally submitted for inclusion in the Work by You to the
-Licensor shall be under the terms and conditions of this License, without any
-additional terms or conditions. Notwithstanding the above, nothing herein
-shall supersede or modify the terms of any separate license agreement you
-may have executed with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade names,
-trademarks, service marks, or product names of the Licensor, except as
-required for reasonable and customary use in describing the origin of the
-Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or agreed to
-in writing, Licensor provides the Work (and each Contributor provides its
-Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
-ANY KIND, either express or implied, including, without limitation, any
-warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or
-FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining
-the appropriateness of using or redistributing the Work and assume any risks
-associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory, whether in
-tort (including negligence), contract, or otherwise, unless required by
-applicable law (such as deliberate and grossly negligent acts) or agreed to
-in writing, shall any Contributor be liable to You for damages, including
-any direct, indirect, special, incidental, or consequential damages of any
-character arising as a result of this License or out of the use or inability
-to use the Work (including but not limited to damages for loss of goodwill,
-work stoppage, computer failure or malfunction, or any and all other
-commercial damages or losses), even if such Contributor has been advised
-of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing the
-Work or Derivative Works thereof, You may choose to offer, and charge a
-fee for, acceptance of support, warranty, indemnity, or other liability
-obligations and/or rights consistent with this License. However, in accepting
-such obligations, You may act only on Your own behalf and on Your sole
-responsibility, not on behalf of any other Contributor, and only if You
-agree to indemnify, defend, and hold each Contributor harmless for any
-liability incurred by, or claims asserted against, such Contributor by
-reason of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-====================================================================================================
+Signature: b49ce7cb754a2cffbb08ac9ebfebb98b
 
 ====================================================================================================
 LIBRARY: etc1
 LIBRARY: vulkan
-ORIGIN: ../../../flutter/third_party/txt/LICENSE
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/skia/include/third_party/vulkan/vulkan/vk_platform.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/skia/include/third_party/vulkan/vulkan/vk_video/vulkan_video_codec_h264std.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/skia/include/third_party/vulkan/vulkan/vk_video/vulkan_video_codec_h264std_decode.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/skia/include/third_party/vulkan/vulkan/vk_video/vulkan_video_codec_h265std.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/skia/include/third_party/vulkan/vulkan/vk_video/vulkan_video_codec_h265std_decode.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/skia/include/third_party/vulkan/vulkan/vk_video/vulkan_video_codecs_common.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/skia/include/third_party/vulkan/vulkan/vulkan.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/skia/include/third_party/vulkan/vulkan/vulkan_android.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/skia/include/third_party/vulkan/vulkan/vulkan_core.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/skia/include/third_party/vulkan/vulkan/vulkan_ios.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/skia/include/third_party/vulkan/vulkan/vulkan_macos.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/skia/include/third_party/vulkan/vulkan/vulkan_win32.h
+ORIGIN: Apache-2.0 referenced by ../../../flutter/third_party/skia/include/third_party/vulkan/vulkan/vulkan_xcb.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/skia/third_party/etc1/etc1.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/skia/third_party/etc1/etc1.h
 TYPE: LicenseType.apache
-FILE: ../../../third_party/skia/include/third_party/vulkan/vulkan/vk_platform.h
-FILE: ../../../third_party/skia/include/third_party/vulkan/vulkan/vulkan.h
-FILE: ../../../third_party/skia/include/third_party/vulkan/vulkan/vulkan_android.h
-FILE: ../../../third_party/skia/include/third_party/vulkan/vulkan/vulkan_core.h
-FILE: ../../../third_party/skia/include/third_party/vulkan/vulkan/vulkan_ios.h
-FILE: ../../../third_party/skia/include/third_party/vulkan/vulkan/vulkan_macos.h
-FILE: ../../../third_party/skia/include/third_party/vulkan/vulkan/vulkan_win32.h
-FILE: ../../../third_party/skia/include/third_party/vulkan/vulkan/vulkan_xcb.h
-FILE: ../../../third_party/skia/third_party/etc1/etc1.cpp
-FILE: ../../../third_party/skia/third_party/etc1/etc1.h
+FILE: ../../../flutter/third_party/skia/include/third_party/vulkan/vulkan/vk_platform.h
+FILE: ../../../flutter/third_party/skia/include/third_party/vulkan/vulkan/vk_video/vulkan_video_codec_h264std.h
+FILE: ../../../flutter/third_party/skia/include/third_party/vulkan/vulkan/vk_video/vulkan_video_codec_h264std_decode.h
+FILE: ../../../flutter/third_party/skia/include/third_party/vulkan/vulkan/vk_video/vulkan_video_codec_h265std.h
+FILE: ../../../flutter/third_party/skia/include/third_party/vulkan/vulkan/vk_video/vulkan_video_codec_h265std_decode.h
+FILE: ../../../flutter/third_party/skia/include/third_party/vulkan/vulkan/vk_video/vulkan_video_codecs_common.h
+FILE: ../../../flutter/third_party/skia/include/third_party/vulkan/vulkan/vulkan.h
+FILE: ../../../flutter/third_party/skia/include/third_party/vulkan/vulkan/vulkan_android.h
+FILE: ../../../flutter/third_party/skia/include/third_party/vulkan/vulkan/vulkan_core.h
+FILE: ../../../flutter/third_party/skia/include/third_party/vulkan/vulkan/vulkan_ios.h
+FILE: ../../../flutter/third_party/skia/include/third_party/vulkan/vulkan/vulkan_macos.h
+FILE: ../../../flutter/third_party/skia/include/third_party/vulkan/vulkan/vulkan_win32.h
+FILE: ../../../flutter/third_party/skia/include/third_party/vulkan/vulkan/vulkan_xcb.h
+FILE: ../../../flutter/third_party/skia/third_party/etc1/etc1.cpp
+FILE: ../../../flutter/third_party/skia/third_party/etc1/etc1.h
 ----------------------------------------------------------------------------------------------------
 Apache License
 Version 2.0, January 2004
-http://www.apache.org/licenses
+http://www.apache.org/licenses/
 
 TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -396,9 +240,9 @@ limitations under the License.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/include/utils/SkEventTracer.h + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/utils/SkEventTracer.h + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/include/utils/SkEventTracer.h
+FILE: ../../../flutter/third_party/skia/include/utils/SkEventTracer.h
 ----------------------------------------------------------------------------------------------------
 Copyright (C) 2014 Google Inc. All rights reserved.
 
@@ -433,27 +277,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-LIBRARY: vulkanmemoryallocator
-ORIGIN: ../../../third_party/skia/modules/canvaskit/npm_build/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/canvaskit/npm_build/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/modules/canvaskit/npm_build/example.html
-FILE: ../../../third_party/skia/modules/canvaskit/npm_build/extra.html
-FILE: ../../../third_party/skia/modules/canvaskit/npm_build/multicanvas.html
-FILE: ../../../third_party/skia/modules/canvaskit/npm_build/node.example.js
-FILE: ../../../third_party/skia/modules/canvaskit/npm_build/package-lock.json
-FILE: ../../../third_party/skia/modules/canvaskit/npm_build/package.json
-FILE: ../../../third_party/skia/modules/canvaskit/npm_build/paragraphs.html
-FILE: ../../../third_party/skia/modules/canvaskit/npm_build/shaping.html
-FILE: ../../../third_party/skia/modules/canvaskit/npm_build/textapi_utils.js
-FILE: ../../../third_party/skia/modules/canvaskit/npm_build/types/canvaskit-wasm-tests.ts
-FILE: ../../../third_party/skia/modules/canvaskit/npm_build/types/index.d.ts
-FILE: ../../../third_party/skia/modules/canvaskit/npm_build/types/tsconfig.json
-FILE: ../../../third_party/skia/modules/canvaskit/npm_build/types/tslint.json
-FILE: ../../../third_party/skia/modules/pathkit/npm-asmjs/example.html
-FILE: ../../../third_party/skia/modules/pathkit/npm-asmjs/package.json
-FILE: ../../../third_party/skia/modules/pathkit/npm-wasm/example.html
-FILE: ../../../third_party/skia/modules/pathkit/npm-wasm/package.json
-FILE: ../../../third_party/skia/third_party/vulkanmemoryallocator/BUILD.bazel
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/npm_build/extra.html
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/npm_build/multicanvas.html
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/npm_build/node.example.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/npm_build/package-lock.json
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/npm_build/paragraphs.html
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/npm_build/shaping.html
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/npm_build/textapi_utils.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/npm_build/types/canvaskit-wasm-tests.ts
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/npm_build/types/index.d.ts
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/npm_build/types/tsconfig.json
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/npm_build/types/tslint.json
 ----------------------------------------------------------------------------------------------------
 Copyright (c) 2011 Google Inc. All rights reserved.
 
@@ -485,706 +321,126 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ====================================================================================================
 
 ====================================================================================================
+LIBRARY: libmicrohttpd
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/.bazelproject
-FILE: ../../../third_party/skia/.bazelrc
-FILE: ../../../third_party/skia/.bazelversion
-FILE: ../../../third_party/skia/.clang-tidy
-FILE: ../../../third_party/skia/.vpython
-FILE: ../../../third_party/skia/BUILD.bazel
-FILE: ../../../third_party/skia/CQ_COMMITTERS
-FILE: ../../../third_party/skia/DEPS
-FILE: ../../../third_party/skia/DIR_METADATA
-FILE: ../../../third_party/skia/OWNERS.android
-FILE: ../../../third_party/skia/WORKSPACE.bazel
-FILE: ../../../third_party/skia/bench/microbench.json
-FILE: ../../../third_party/skia/bench/skpbench.json
-FILE: ../../../third_party/skia/defines.bzl
-FILE: ../../../third_party/skia/demos.skia.org/demos/hello_world/index.html
-FILE: ../../../third_party/skia/demos.skia.org/demos/image_decode_web_worker/index.html
-FILE: ../../../third_party/skia/demos.skia.org/demos/image_decode_web_worker/main.js
-FILE: ../../../third_party/skia/demos.skia.org/demos/image_decode_web_worker/worker.js
-FILE: ../../../third_party/skia/demos.skia.org/demos/image_sampling/index.html
-FILE: ../../../third_party/skia/demos.skia.org/demos/path_performance/garbage.svg
-FILE: ../../../third_party/skia/demos.skia.org/demos/path_performance/index.html
-FILE: ../../../third_party/skia/demos.skia.org/demos/path_performance/main.js
-FILE: ../../../third_party/skia/demos.skia.org/demos/path_performance/shared.js
-FILE: ../../../third_party/skia/demos.skia.org/demos/path_performance/worker.js
-FILE: ../../../third_party/skia/demos.skia.org/demos/sampling_types/index.html
-FILE: ../../../third_party/skia/demos.skia.org/demos/spreadsheet/index.html
-FILE: ../../../third_party/skia/demos.skia.org/demos/textedit/index.html
-FILE: ../../../third_party/skia/demos.skia.org/demos/textedit/spiralshader.js
-FILE: ../../../third_party/skia/demos.skia.org/demos/textedit/textapi_utils.js
-FILE: ../../../third_party/skia/demos.skia.org/demos/textures/index.html
-FILE: ../../../third_party/skia/demos.skia.org/demos/textures/testimg.png
-FILE: ../../../third_party/skia/demos.skia.org/demos/up_scaling/index.html
-FILE: ../../../third_party/skia/demos.skia.org/demos/web_worker/index.html
-FILE: ../../../third_party/skia/demos.skia.org/demos/web_worker/main.js
-FILE: ../../../third_party/skia/demos.skia.org/demos/web_worker/shared.js
-FILE: ../../../third_party/skia/demos.skia.org/demos/web_worker/worker.js
-FILE: ../../../third_party/skia/demos.skia.org/demos/webgpu/index.html
-FILE: ../../../third_party/skia/docker/binary-size/Dockerfile
-FILE: ../../../third_party/skia/docker/cmake-release/Dockerfile
-FILE: ../../../third_party/skia/docker/skia-build-tools/Dockerfile
-FILE: ../../../third_party/skia/docker/skia-release/Dockerfile
-FILE: ../../../third_party/skia/docker/skia-wasm-release/Dockerfile
-FILE: ../../../third_party/skia/docker/skia-with-swift-shader-base/Dockerfile
-FILE: ../../../third_party/skia/docker/skia-with-swift-shader-base/build-with-swift-shader-and-run
-FILE: ../../../third_party/skia/example/BUILD.bazel
-FILE: ../../../third_party/skia/experimental/bazel_test/BUILD.bazel
-FILE: ../../../third_party/skia/experimental/docs/animationCommon.js
-FILE: ../../../third_party/skia/experimental/docs/backend.js
-FILE: ../../../third_party/skia/experimental/docs/canvasBackend.js
-FILE: ../../../third_party/skia/experimental/docs/exampleSlides.js
-FILE: ../../../third_party/skia/experimental/docs/interpolatorFunctions.js
-FILE: ../../../third_party/skia/experimental/docs/jsonbaseddoc.htm
-FILE: ../../../third_party/skia/experimental/docs/svgBackend.js
-FILE: ../../../third_party/skia/experimental/docs/svgbaseddoc.htm
-FILE: ../../../third_party/skia/experimental/docs/utilities.js
-FILE: ../../../third_party/skia/experimental/sktext/editor/Cursor.cpp
-FILE: ../../../third_party/skia/experimental/sktext/editor/Cursor.h
-FILE: ../../../third_party/skia/experimental/sktext/editor/Defaults.h
-FILE: ../../../third_party/skia/experimental/sktext/editor/Editor.cpp
-FILE: ../../../third_party/skia/experimental/sktext/editor/Editor.h
-FILE: ../../../third_party/skia/experimental/sktext/editor/Mouse.cpp
-FILE: ../../../third_party/skia/experimental/sktext/editor/Mouse.h
-FILE: ../../../third_party/skia/experimental/sktext/editor/Selection.cpp
-FILE: ../../../third_party/skia/experimental/sktext/editor/Selection.h
-FILE: ../../../third_party/skia/experimental/sktext/editor/Texts.cpp
-FILE: ../../../third_party/skia/experimental/sktext/editor/Texts.h
-FILE: ../../../third_party/skia/experimental/sktext/include/Interface.h
-FILE: ../../../third_party/skia/experimental/sktext/include/Text.h
-FILE: ../../../third_party/skia/experimental/sktext/include/Types.h
-FILE: ../../../third_party/skia/experimental/sktext/slides/Text.cpp
-FILE: ../../../third_party/skia/experimental/sktext/src/Line.cpp
-FILE: ../../../third_party/skia/experimental/sktext/src/Line.h
-FILE: ../../../third_party/skia/experimental/sktext/src/LogicalRun.cpp
-FILE: ../../../third_party/skia/experimental/sktext/src/LogicalRun.h
-FILE: ../../../third_party/skia/experimental/sktext/src/Paint.cpp
-FILE: ../../../third_party/skia/experimental/sktext/src/Paint.h
-FILE: ../../../third_party/skia/experimental/sktext/src/Text.cpp
-FILE: ../../../third_party/skia/experimental/sktext/src/VisualRun.cpp
-FILE: ../../../third_party/skia/experimental/sktext/src/VisualRun.h
-FILE: ../../../third_party/skia/experimental/tskit/.eslintignore
-FILE: ../../../third_party/skia/experimental/tskit/.eslintrc.js
-FILE: ../../../third_party/skia/experimental/tskit/bindings/core.d.ts
-FILE: ../../../third_party/skia/experimental/tskit/bindings/embind.d.ts
-FILE: ../../../third_party/skia/experimental/tskit/bindings/extension.d.ts
-FILE: ../../../third_party/skia/experimental/tskit/build/externs.js
-FILE: ../../../third_party/skia/experimental/tskit/interface/core.ts
-FILE: ../../../third_party/skia/experimental/tskit/interface/extension.ts
-FILE: ../../../third_party/skia/experimental/tskit/interface/load.ts
-FILE: ../../../third_party/skia/experimental/tskit/interface/memory.ts
-FILE: ../../../third_party/skia/experimental/tskit/interface/public_api.d.ts
-FILE: ../../../third_party/skia/experimental/tskit/npm_build/example.html
-FILE: ../../../third_party/skia/experimental/tskit/npm_build/types/index.d.ts
-FILE: ../../../third_party/skia/experimental/tskit/package-lock.json
-FILE: ../../../third_party/skia/experimental/tskit/package.json
-FILE: ../../../third_party/skia/experimental/tskit/tsconfig.json
-FILE: ../../../third_party/skia/experimental/wasm-hello-world/BUILD.bazel
-FILE: ../../../third_party/skia/experimental/wasm-hello-world/hello_world.html
-FILE: ../../../third_party/skia/experimental/webgpu-bazel/example/index.html
-FILE: ../../../third_party/skia/experimental/webgpu-bazel/src/BUILD.bazel
-FILE: ../../../third_party/skia/gn/BUILD.bazel
-FILE: ../../../third_party/skia/go.mod
-FILE: ../../../third_party/skia/go.sum
-FILE: ../../../third_party/skia/go_repositories.bzl
-FILE: ../../../third_party/skia/include/BUILD.bazel
-FILE: ../../../third_party/skia/include/android/BUILD.bazel
-FILE: ../../../third_party/skia/include/codec/BUILD.bazel
-FILE: ../../../third_party/skia/include/config/BUILD.bazel
-FILE: ../../../third_party/skia/include/core/BUILD.bazel
-FILE: ../../../third_party/skia/include/docs/BUILD.bazel
-FILE: ../../../third_party/skia/include/effects/BUILD.bazel
-FILE: ../../../third_party/skia/include/encode/BUILD.bazel
-FILE: ../../../third_party/skia/include/gpu/BUILD.bazel
-FILE: ../../../third_party/skia/include/gpu/d3d/BUILD.bazel
-FILE: ../../../third_party/skia/include/gpu/dawn/BUILD.bazel
-FILE: ../../../third_party/skia/include/gpu/gl/BUILD.bazel
-FILE: ../../../third_party/skia/include/gpu/gl/egl/BUILD.bazel
-FILE: ../../../third_party/skia/include/gpu/gl/glx/BUILD.bazel
-FILE: ../../../third_party/skia/include/gpu/graphite/mtl/BUILD.bazel
-FILE: ../../../third_party/skia/include/gpu/mock/BUILD.bazel
-FILE: ../../../third_party/skia/include/gpu/mtl/BUILD.bazel
-FILE: ../../../third_party/skia/include/gpu/vk/BUILD.bazel
-FILE: ../../../third_party/skia/include/pathops/BUILD.bazel
-FILE: ../../../third_party/skia/include/ports/BUILD.bazel
-FILE: ../../../third_party/skia/include/private/BUILD.bazel
-FILE: ../../../third_party/skia/include/private/chromium/BUILD.bazel
-FILE: ../../../third_party/skia/include/private/gpu/BUILD.bazel
-FILE: ../../../third_party/skia/include/private/gpu/ganesh/BUILD.bazel
-FILE: ../../../third_party/skia/include/private/gpu/vk/BUILD.bazel
-FILE: ../../../third_party/skia/include/sksl/BUILD.bazel
-FILE: ../../../third_party/skia/include/svg/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
-FILE: ../../../third_party/skia/infra/bots/assets/android_ndk_darwin/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/android_ndk_linux/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/android_ndk_windows/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/android_sdk_linux/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/armhf_sysroot/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/bazel/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/bazel_build_task_driver/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/bazelisk/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/bazelisk_linux_arm64/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/bazelisk_mac_arm64/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/bazelisk_win_amd64/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/binutils_linux_x64/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/bloaty/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/cast_toolchain/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/ccache_linux/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/ccache_mac/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/chromebook_arm_gles/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/chromebook_x86_64_gles/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/clang_linux/Dockerfile
-FILE: ../../../third_party/skia/infra/bots/assets/clang_linux/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/clang_win/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/cmake_linux/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/cmake_mac/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/cockroachdb/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/gcloud_linux/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/go/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/go/asset.json
-FILE: ../../../third_party/skia/infra/bots/assets/go_win/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/gsutil/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/ios-dev-image-11.4/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/ios-dev-image-13.3/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/ios-dev-image-13.4/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/ios-dev-image-13.5/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/ios-dev-image-13.6/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/ios-dev-image-14.4/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/jq/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/kubectl/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/kubeval/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/linux_vulkan_sdk/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/lottie-samples/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/mesa_intel_driver_linux/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/mesa_intel_driver_linux/mesa-driver-builder/Dockerfile
-FILE: ../../../third_party/skia/infra/bots/assets/mesa_intel_driver_linux_22/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/mesa_intel_driver_linux_22/mesa-driver-builder/Dockerfile
-FILE: ../../../third_party/skia/infra/bots/assets/mockery/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/mskp/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/node/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/protoc/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/provisioning_profile_ios/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/skimage/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/skp/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/skparagraph/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/svg/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/text_blob_traces/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/valgrind/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/win_ninja/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/win_toolchain/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/xcode-11.4.1/VERSION
-FILE: ../../../third_party/skia/infra/bots/assets/yq/VERSION
-FILE: ../../../third_party/skia/infra/bots/cfg.json
-FILE: ../../../third_party/skia/infra/bots/jobs.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-arm-OptimizeForSize-Android_NoPatch.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-arm-Release-Android_API26.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-arm-Release-Android_ASAN.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-arm-Release-Chromebook_GLES.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-arm64-Debug-Android_FrameworkWorkarounds.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-arm64-Debug-Android_Graphite_Vulkan.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-arm64-Debug-Android_HWASAN.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-arm64-Release-Android_Graphite_Dawn.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-arm64-Release-Android_Wuffs.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Debug-ASAN_Graphite_Vulkan.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Debug-AVIF.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Debug-Chromebook_GLES.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Debug-Coverage.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Debug-MSAN.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Debug-SK_CPU_LIMIT_SSE41.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Debug-SafeStack.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Debug-SwiftShader_Graphite.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Debug-SwiftShader_MSAN.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Debug-TSAN.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Debug-Tidy.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Debug-Vulkan_TSAN.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Debug-Wuffs.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-OptimizeForSize.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Release-ANGLE.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Release-ASAN.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Release-AVIF.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Release-CMake.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Release-Fast.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Release-NoDEPS.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Release-Static.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Release-SwiftShader.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Release-Vulkan.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-asmjs-Debug-PathKit.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-asmjs-Release-PathKit.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-wasm-Debug-CanvasKit.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-wasm-Debug-PathKit.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-wasm-Release-CanvasKit_CPU.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-wasm-Release-PathKit.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-GCC-x86-Debug-Docker.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-GCC-x86_64-Debug-Docker.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-GCC-x86_64-Release-NoGPU_Docker.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-GCC-x86_64-Release-Shared_Docker.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-arm64-Debug-Android_Vulkan.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-arm64-Debug-Graphite_Dawn.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-arm64-Debug-Graphite_Dawn_NoGpu.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-arm64-Debug-Graphite_Dawn_NoPrecompile.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-arm64-Debug-Graphite_Metal.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-arm64-Debug-Graphite_Metal_NoGpu.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-arm64-Debug-Graphite_Metal_NoPrecompile.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-arm64-Debug-iOS.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-arm64-Release-Graphite_Dawn.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-arm64-Release-Graphite_Metal.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-x86_64-Debug-ASAN.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-x86_64-Debug-Metal.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Xcode11.4.1-arm64-Debug-iOS.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-arm64-Release-Android.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86-Debug-Exceptions.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86_64-Debug-ANGLE.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86_64-Release-Dawn.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86_64-Release-Direct3D.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86_64-Release-Graphite_Vulkan.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86_64-Release-Shared.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/unknown-docker-image.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/builder_name_schema/builder_name_schema.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/builder_name_schema/examples/full.expected/test.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/checkout/examples/full.expected/Build-Debian10-Clang-x86_64-Release-NoDEPS.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/checkout/examples/full.expected/cross_repo_trybot.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/checkout/examples/full.expected/trybot.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/docker/examples/full.expected/test.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/doxygen/examples/full.expected/doxygen.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/env/examples/full.expected/test.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NVIDIA_Shield-CPU-TegraX1-arm64-Release-All-Android.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Skpbench_Mskp.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel6-GPU-Adreno620-arm64-Release-All-Android.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-ASAN.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Win2019-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android_Vulkan.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-Coverage.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-Lottie.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian10-Clang-GCE-GPU-SwiftShader-x86_64-Debug-All-SwiftShader.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-ASAN_Vulkan.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian11-Clang-NUC11TZi5-GPU-IntelIrisXe-x86_64-Debug-All.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Mac10.13-Clang-MacBookPro11.5-CPU-AVX2-x86_64-Debug-All-ASAN.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_golo.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_once.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/exceptions.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/ios_rerun_with_debug.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install_retries_exhausted.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/git/examples/full.expected/test-win.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/git/examples/full.expected/test.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/gold_upload/examples/full.expected/upload_mac.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/gold_upload/examples/full.expected/upload_tests.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/gsutil/examples/full.expected/failed_all_uploads.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/gsutil/examples/full.expected/failed_one_upload.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/gsutil/examples/full.expected/gsutil_tests.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/gsutil/examples/full.expected/gsutil_win_tests.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/infra/examples/full.expected/infra_tests.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/run/examples/full.expected/test.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/vars/examples/full.expected/Build-Debian10-Clang-x86_64-Release-SKNX_NO_SIMD.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/vars/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/vars/examples/full.expected/integer_issue.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/vars/examples/full.expected/win_test.json
-FILE: ../../../third_party/skia/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json
-FILE: ../../../third_party/skia/infra/bots/recipes/compute_buildstats.expected/normal_bot.json
-FILE: ../../../third_party/skia/infra/bots/recipes/compute_buildstats.expected/trybot.json
-FILE: ../../../third_party/skia/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json
-FILE: ../../../third_party/skia/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json
-FILE: ../../../third_party/skia/infra/bots/recipes/infra.expected/infra_tests.json
-FILE: ../../../third_party/skia/infra/bots/recipes/infra.expected/infra_tests_lottie_ci.json
-FILE: ../../../third_party/skia/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android.json
-FILE: ../../../third_party/skia/infra/bots/recipes/perf.expected/Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json
-FILE: ../../../third_party/skia/infra/bots/recipes/perf.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE.json
-FILE: ../../../third_party/skia/infra/bots/recipes/perf_pathkit.expected/Perf-Debian10-EMCC-GCE-CPU-AVX2-asmjs-Release-All-PathKit.json
-FILE: ../../../third_party/skia/infra/bots/recipes/perf_pathkit.expected/Perf-Debian10-EMCC-GCE-CPU-AVX2-wasm-Release-All-PathKit.json
-FILE: ../../../third_party/skia/infra/bots/recipes/perf_pathkit.expected/pathkit_trybot.json
-FILE: ../../../third_party/skia/infra/bots/recipes/perf_skottietrace.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json
-FILE: ../../../third_party/skia/infra/bots/recipes/perf_skottietrace.expected/Perf-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SkottieTracing.json
-FILE: ../../../third_party/skia/infra/bots/recipes/perf_skottietrace.expected/Perf-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-SkottieTracing.json
-FILE: ../../../third_party/skia/infra/bots/recipes/perf_skottietrace.expected/skottietracing_parse_trace_error.json
-FILE: ../../../third_party/skia/infra/bots/recipes/perf_skottietrace.expected/skottietracing_trybot.json
-FILE: ../../../third_party/skia/infra/bots/recipes/perf_skottiewasm_lottieweb.expected/lottie_web_canvas_perf.json
-FILE: ../../../third_party/skia/infra/bots/recipes/perf_skottiewasm_lottieweb.expected/lottie_web_canvas_perf_trybot.json
-FILE: ../../../third_party/skia/infra/bots/recipes/perf_skottiewasm_lottieweb.expected/lottie_web_perf.json
-FILE: ../../../third_party/skia/infra/bots/recipes/perf_skottiewasm_lottieweb.expected/lottie_web_perf_trybot.json
-FILE: ../../../third_party/skia/infra/bots/recipes/perf_skottiewasm_lottieweb.expected/skottie_wasm_perf.json
-FILE: ../../../third_party/skia/infra/bots/recipes/perf_skottiewasm_lottieweb.expected/skottie_wasm_perf_gpu.json
-FILE: ../../../third_party/skia/infra/bots/recipes/perf_skottiewasm_lottieweb.expected/skottie_wasm_perf_trybot.json
-FILE: ../../../third_party/skia/infra/bots/recipes/perf_skottiewasm_lottieweb.expected/unrecognized_builder.json
-FILE: ../../../third_party/skia/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_AllPathsVolatile_Skpbench.json
-FILE: ../../../third_party/skia/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan_AllPathsVolatile_Skpbench.json
-FILE: ../../../third_party/skia/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Skpbench_Mskp.json
-FILE: ../../../third_party/skia/infra/bots/recipes/skpbench.expected/Perf-Mac11-Clang-MacMini9.1-GPU-AppleM1-arm64-Release-All-Metal_AllPathsVolatile_Skpbench.json
-FILE: ../../../third_party/skia/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-AllPathsVolatile_Skpbench.json
-FILE: ../../../third_party/skia/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench.json
-FILE: ../../../third_party/skia/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench_DDLTotal_9x9.json
-FILE: ../../../third_party/skia/infra/bots/recipes/skpbench.expected/trybot.json
-FILE: ../../../third_party/skia/infra/bots/recipes/sync_and_compile.expected/Build-Debian10-Clang-arm-Release-NoPatch (tryjob).json
-FILE: ../../../third_party/skia/infra/bots/recipes/sync_and_compile.expected/Build-Debian10-Clang-arm-Release-NoPatch.json
-FILE: ../../../third_party/skia/infra/bots/recipes/sync_and_compile.expected/Build-Win10-Clang-x86_64-Release-NoDEPS.json
-FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm-Debug-All-Android_ASAN.json
-FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android.json
-FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-Lottie.json
-FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE.json
-FILE: ../../../third_party/skia/infra/bots/recipes/test_canvaskit.expected/Test-Debian10-EMCC-GCE-GPU-WEBGL1-wasm-Debug-All-CanvasKit.json
-FILE: ../../../third_party/skia/infra/bots/recipes/test_canvaskit.expected/canvaskit_trybot.json
-FILE: ../../../third_party/skia/infra/bots/recipes/test_lottie_web.expected/Test-Debian10-none-GCE-CPU-AVX2-x86_64-Debug-All-LottieWeb.json
-FILE: ../../../third_party/skia/infra/bots/recipes/test_lottie_web.expected/lottie_web_trybot.json
-FILE: ../../../third_party/skia/infra/bots/recipes/test_pathkit.expected/Test-Debian10-EMCC-GCE-CPU-AVX2-asmjs-Debug-All-PathKit.json
-FILE: ../../../third_party/skia/infra/bots/recipes/test_pathkit.expected/Test-Debian10-EMCC-GCE-CPU-AVX2-asmjs-Release-All-PathKit.json
-FILE: ../../../third_party/skia/infra/bots/recipes/test_pathkit.expected/Test-Debian10-EMCC-GCE-CPU-AVX2-wasm-Debug-All-PathKit.json
-FILE: ../../../third_party/skia/infra/bots/recipes/test_pathkit.expected/pathkit_trybot.json
-FILE: ../../../third_party/skia/infra/bots/recipes/upload_buildstats_results.expected/normal_bot.json
-FILE: ../../../third_party/skia/infra/bots/recipes/upload_buildstats_results.expected/trybot.json
-FILE: ../../../third_party/skia/infra/bots/recipes/upload_dm_results.expected/alternate_bucket.json
-FILE: ../../../third_party/skia/infra/bots/recipes/upload_dm_results.expected/failed_all.json
-FILE: ../../../third_party/skia/infra/bots/recipes/upload_dm_results.expected/failed_once.json
-FILE: ../../../third_party/skia/infra/bots/recipes/upload_dm_results.expected/normal_bot.json
-FILE: ../../../third_party/skia/infra/bots/recipes/upload_dm_results.expected/trybot.json
-FILE: ../../../third_party/skia/infra/bots/recipes/upload_nano_results.expected/normal_bot.json
-FILE: ../../../third_party/skia/infra/bots/recipes/upload_nano_results.expected/trybot.json
-FILE: ../../../third_party/skia/infra/bots/task_drivers/bazel_build/BUILD.bazel
-FILE: ../../../third_party/skia/infra/bots/task_drivers/canvaskit_gold/BUILD.bazel
-FILE: ../../../third_party/skia/infra/bots/task_drivers/check_generated_files/BUILD.bazel
-FILE: ../../../third_party/skia/infra/bots/task_drivers/codesize/BUILD.bazel
-FILE: ../../../third_party/skia/infra/bots/task_drivers/compile_wasm_gm_tests/BUILD.bazel
-FILE: ../../../third_party/skia/infra/bots/task_drivers/cpu_tests/BUILD.bazel
-FILE: ../../../third_party/skia/infra/bots/task_drivers/fm_driver/BUILD.bazel
-FILE: ../../../third_party/skia/infra/bots/task_drivers/g3_canary/BUILD.bazel
-FILE: ../../../third_party/skia/infra/bots/task_drivers/perf_puppeteer_canvas/BUILD.bazel
-FILE: ../../../third_party/skia/infra/bots/task_drivers/perf_puppeteer_render_skps/BUILD.bazel
-FILE: ../../../third_party/skia/infra/bots/task_drivers/perf_puppeteer_skottie_frames/BUILD.bazel
-FILE: ../../../third_party/skia/infra/bots/task_drivers/perf_puppeteer_skottie_frames/make_lotties_with_assets/BUILD.bazel
-FILE: ../../../third_party/skia/infra/bots/task_drivers/push_apps_from_skia_image/BUILD.bazel
-FILE: ../../../third_party/skia/infra/bots/task_drivers/push_bazel_apps_from_wasm_image/BUILD.bazel
-FILE: ../../../third_party/skia/infra/bots/task_drivers/recreate_skps/BUILD.bazel
-FILE: ../../../third_party/skia/infra/bots/task_drivers/run_gn_to_bp/BUILD.bazel
-FILE: ../../../third_party/skia/infra/bots/task_drivers/run_wasm_gm_tests/BUILD.bazel
-FILE: ../../../third_party/skia/infra/bots/tasks.json
-FILE: ../../../third_party/skia/infra/bots/tools/luci-go/linux64/isolate.sha1
-FILE: ../../../third_party/skia/infra/bots/tools/luci-go/mac64/isolate.sha1
-FILE: ../../../third_party/skia/infra/bots/tools/luci-go/win64/isolate.exe.sha1
-FILE: ../../../third_party/skia/infra/canvaskit/docker/canvaskit-emsdk/Dockerfile
-FILE: ../../../third_party/skia/infra/config/recipes.cfg
-FILE: ../../../third_party/skia/infra/cross-compile/docker/cross-linux-arm64/Dockerfile
-FILE: ../../../third_party/skia/infra/docker/debian9/Dockerfile
-FILE: ../../../third_party/skia/infra/gcc/Debian10-x86/Dockerfile
-FILE: ../../../third_party/skia/infra/gcc/Debian10/Dockerfile
-FILE: ../../../third_party/skia/infra/lottiecap/docker/gold-lottie-web-puppeteer/Dockerfile
-FILE: ../../../third_party/skia/infra/lottiecap/docker/lottie-web-puppeteer/Dockerfile
-FILE: ../../../third_party/skia/infra/project-config/cr-buildbucket.cfg
-FILE: ../../../third_party/skia/infra/project-config/project.cfg
-FILE: ../../../third_party/skia/infra/project-config/refs.cfg
-FILE: ../../../third_party/skia/infra/skcq.json
-FILE: ../../../third_party/skia/infra/wasm-common/docker/emsdk-base/Dockerfile
-FILE: ../../../third_party/skia/infra/wasm-common/docker/gold-karma-chrome-tests/Dockerfile
-FILE: ../../../third_party/skia/infra/wasm-common/docker/karma-chrome-tests/Dockerfile
-FILE: ../../../third_party/skia/infra/wasm-common/docker/perf-karma-chrome-tests/Dockerfile
-FILE: ../../../third_party/skia/modules/canvaskit/BUILD.bazel
-FILE: ../../../third_party/skia/modules/canvaskit/catchExceptionNop.js
-FILE: ../../../third_party/skia/modules/canvaskit/color.js
-FILE: ../../../third_party/skia/modules/canvaskit/cpu.js
-FILE: ../../../third_party/skia/modules/canvaskit/debug.js
-FILE: ../../../third_party/skia/modules/canvaskit/debugger.js
-FILE: ../../../third_party/skia/modules/canvaskit/external_test/typescript_browser/index.html
-FILE: ../../../third_party/skia/modules/canvaskit/external_test/typescript_browser/module_uses_ck.ts
-FILE: ../../../third_party/skia/modules/canvaskit/external_test/typescript_browser/package-lock.json
-FILE: ../../../third_party/skia/modules/canvaskit/external_test/typescript_browser/package.json
-FILE: ../../../third_party/skia/modules/canvaskit/external_test/typescript_browser/tsconfig.json
-FILE: ../../../third_party/skia/modules/canvaskit/external_test/typescript_browser_es6/index.html
-FILE: ../../../third_party/skia/modules/canvaskit/external_test/typescript_browser_es6/module_uses_ck.ts
-FILE: ../../../third_party/skia/modules/canvaskit/external_test/typescript_browser_es6/package-lock.json
-FILE: ../../../third_party/skia/modules/canvaskit/external_test/typescript_browser_es6/package.json
-FILE: ../../../third_party/skia/modules/canvaskit/external_test/typescript_browser_es6/tsconfig.json
-FILE: ../../../third_party/skia/modules/canvaskit/externs.js
-FILE: ../../../third_party/skia/modules/canvaskit/font.js
-FILE: ../../../third_party/skia/modules/canvaskit/fonts/NotoMono-Regular.ttf
-FILE: ../../../third_party/skia/modules/canvaskit/gm.js
-FILE: ../../../third_party/skia/modules/canvaskit/go/gold_test_env/BUILD.bazel
-FILE: ../../../third_party/skia/modules/canvaskit/htmlcanvas/_namedcolors.js
-FILE: ../../../third_party/skia/modules/canvaskit/htmlcanvas/canvas2dcontext.js
-FILE: ../../../third_party/skia/modules/canvaskit/htmlcanvas/color.js
-FILE: ../../../third_party/skia/modules/canvaskit/htmlcanvas/font.js
-FILE: ../../../third_party/skia/modules/canvaskit/htmlcanvas/htmlcanvas.js
-FILE: ../../../third_party/skia/modules/canvaskit/htmlcanvas/htmlimage.js
-FILE: ../../../third_party/skia/modules/canvaskit/htmlcanvas/imagedata.js
-FILE: ../../../third_party/skia/modules/canvaskit/htmlcanvas/lineargradient.js
-FILE: ../../../third_party/skia/modules/canvaskit/htmlcanvas/path2d.js
-FILE: ../../../third_party/skia/modules/canvaskit/htmlcanvas/pattern.js
-FILE: ../../../third_party/skia/modules/canvaskit/htmlcanvas/postamble.js
-FILE: ../../../third_party/skia/modules/canvaskit/htmlcanvas/preamble.js
-FILE: ../../../third_party/skia/modules/canvaskit/htmlcanvas/radialgradient.js
-FILE: ../../../third_party/skia/modules/canvaskit/htmlcanvas/util.js
-FILE: ../../../third_party/skia/modules/canvaskit/interface.js
-FILE: ../../../third_party/skia/modules/canvaskit/karma.bazel.js
-FILE: ../../../third_party/skia/modules/canvaskit/karma.conf.js
-FILE: ../../../third_party/skia/modules/canvaskit/matrix.js
-FILE: ../../../third_party/skia/modules/canvaskit/memory.js
-FILE: ../../../third_party/skia/modules/canvaskit/package-lock.json
-FILE: ../../../third_party/skia/modules/canvaskit/package.json
-FILE: ../../../third_party/skia/modules/canvaskit/paragraph.js
-FILE: ../../../third_party/skia/modules/canvaskit/particles.js
-FILE: ../../../third_party/skia/modules/canvaskit/pathops.js
-FILE: ../../../third_party/skia/modules/canvaskit/postamble.js
-FILE: ../../../third_party/skia/modules/canvaskit/preamble.js
-FILE: ../../../third_party/skia/modules/canvaskit/release.js
-FILE: ../../../third_party/skia/modules/canvaskit/rt_shader.js
-FILE: ../../../third_party/skia/modules/canvaskit/skottie.js
-FILE: ../../../third_party/skia/modules/canvaskit/skp.js
-FILE: ../../../third_party/skia/modules/canvaskit/util.js
-FILE: ../../../third_party/skia/modules/canvaskit/wasm_tools/gms.html
-FILE: ../../../third_party/skia/modules/canvaskit/wasm_tools/viewer.html
-FILE: ../../../third_party/skia/modules/canvaskit/webgl.js
-FILE: ../../../third_party/skia/modules/canvaskit/webgpu.js
-FILE: ../../../third_party/skia/modules/particles/BUILD.bazel
-FILE: ../../../third_party/skia/modules/particles/include/BUILD.bazel
-FILE: ../../../third_party/skia/modules/particles/src/BUILD.bazel
-FILE: ../../../third_party/skia/modules/pathkit/chaining.js
-FILE: ../../../third_party/skia/modules/pathkit/externs.js
-FILE: ../../../third_party/skia/modules/pathkit/helper.js
-FILE: ../../../third_party/skia/modules/pathkit/karma.bench.conf.js
-FILE: ../../../third_party/skia/modules/pathkit/karma.conf.js
-FILE: ../../../third_party/skia/modules/pathkit/package-lock.json
-FILE: ../../../third_party/skia/modules/pathkit/package.json
-FILE: ../../../third_party/skia/modules/pathkit/perf/effects.bench.js
-FILE: ../../../third_party/skia/modules/pathkit/perf/path.bench.js
-FILE: ../../../third_party/skia/modules/pathkit/perf/pathops.bench.js
-FILE: ../../../third_party/skia/modules/pathkit/perf/perfReporter.js
-FILE: ../../../third_party/skia/modules/skcms/BUILD.bazel
-FILE: ../../../third_party/skia/modules/skcms/version.sha1
-FILE: ../../../third_party/skia/modules/skottie/BUILD.bazel
-FILE: ../../../third_party/skia/modules/skottie/fuzz/BUILD.bazel
-FILE: ../../../third_party/skia/modules/skottie/gm/BUILD.bazel
-FILE: ../../../third_party/skia/modules/skottie/include/BUILD.bazel
-FILE: ../../../third_party/skia/modules/skottie/src/BUILD.bazel
-FILE: ../../../third_party/skia/modules/skottie/src/animator/BUILD.bazel
-FILE: ../../../third_party/skia/modules/skottie/src/effects/BUILD.bazel
-FILE: ../../../third_party/skia/modules/skottie/src/layers/BUILD.bazel
-FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/BUILD.bazel
-FILE: ../../../third_party/skia/modules/skottie/src/text/BUILD.bazel
-FILE: ../../../third_party/skia/modules/skottie/utils/BUILD.bazel
-FILE: ../../../third_party/skia/modules/skparagraph/BUILD.bazel
-FILE: ../../../third_party/skia/modules/skparagraph/bench/BUILD.bazel
-FILE: ../../../third_party/skia/modules/skparagraph/gm/BUILD.bazel
-FILE: ../../../third_party/skia/modules/skparagraph/include/BUILD.bazel
-FILE: ../../../third_party/skia/modules/skparagraph/include/DartTypes.h
-FILE: ../../../third_party/skia/modules/skparagraph/include/FontArguments.h
-FILE: ../../../third_party/skia/modules/skparagraph/include/FontCollection.h
-FILE: ../../../third_party/skia/modules/skparagraph/include/Metrics.h
-FILE: ../../../third_party/skia/modules/skparagraph/include/Paragraph.h
-FILE: ../../../third_party/skia/modules/skparagraph/include/ParagraphBuilder.h
-FILE: ../../../third_party/skia/modules/skparagraph/include/ParagraphCache.h
-FILE: ../../../third_party/skia/modules/skparagraph/include/ParagraphPainter.h
-FILE: ../../../third_party/skia/modules/skparagraph/include/ParagraphStyle.h
-FILE: ../../../third_party/skia/modules/skparagraph/include/TextShadow.h
-FILE: ../../../third_party/skia/modules/skparagraph/include/TextStyle.h
-FILE: ../../../third_party/skia/modules/skparagraph/include/TypefaceFontProvider.h
-FILE: ../../../third_party/skia/modules/skparagraph/slides/BUILD.bazel
-FILE: ../../../third_party/skia/modules/skparagraph/slides/ParagraphSlide.cpp
-FILE: ../../../third_party/skia/modules/skparagraph/src/BUILD.bazel
-FILE: ../../../third_party/skia/modules/skparagraph/src/Decorations.cpp
-FILE: ../../../third_party/skia/modules/skparagraph/src/Decorations.h
-FILE: ../../../third_party/skia/modules/skparagraph/src/FontArguments.cpp
-FILE: ../../../third_party/skia/modules/skparagraph/src/FontCollection.cpp
-FILE: ../../../third_party/skia/modules/skparagraph/src/Iterators.h
-FILE: ../../../third_party/skia/modules/skparagraph/src/OneLineShaper.cpp
-FILE: ../../../third_party/skia/modules/skparagraph/src/OneLineShaper.h
-FILE: ../../../third_party/skia/modules/skparagraph/src/ParagraphBuilderImpl.cpp
-FILE: ../../../third_party/skia/modules/skparagraph/src/ParagraphBuilderImpl.h
-FILE: ../../../third_party/skia/modules/skparagraph/src/ParagraphCache.cpp
-FILE: ../../../third_party/skia/modules/skparagraph/src/ParagraphImpl.cpp
-FILE: ../../../third_party/skia/modules/skparagraph/src/ParagraphImpl.h
-FILE: ../../../third_party/skia/modules/skparagraph/src/ParagraphPainterImpl.cpp
-FILE: ../../../third_party/skia/modules/skparagraph/src/ParagraphPainterImpl.h
-FILE: ../../../third_party/skia/modules/skparagraph/src/ParagraphStyle.cpp
-FILE: ../../../third_party/skia/modules/skparagraph/src/Run.cpp
-FILE: ../../../third_party/skia/modules/skparagraph/src/Run.h
-FILE: ../../../third_party/skia/modules/skparagraph/src/TextLine.cpp
-FILE: ../../../third_party/skia/modules/skparagraph/src/TextLine.h
-FILE: ../../../third_party/skia/modules/skparagraph/src/TextShadow.cpp
-FILE: ../../../third_party/skia/modules/skparagraph/src/TextStyle.cpp
-FILE: ../../../third_party/skia/modules/skparagraph/src/TextWrapper.cpp
-FILE: ../../../third_party/skia/modules/skparagraph/src/TextWrapper.h
-FILE: ../../../third_party/skia/modules/skparagraph/src/TypefaceFontProvider.cpp
-FILE: ../../../third_party/skia/modules/skparagraph/test.html
-FILE: ../../../third_party/skia/modules/skparagraph/utils/BUILD.bazel
-FILE: ../../../third_party/skia/modules/skparagraph/utils/TestFontCollection.cpp
-FILE: ../../../third_party/skia/modules/skparagraph/utils/TestFontCollection.h
-FILE: ../../../third_party/skia/modules/skresources/BUILD.bazel
-FILE: ../../../third_party/skia/modules/skresources/include/BUILD.bazel
-FILE: ../../../third_party/skia/modules/skresources/src/BUILD.bazel
-FILE: ../../../third_party/skia/modules/sksg/BUILD.bazel
-FILE: ../../../third_party/skia/modules/sksg/include/BUILD.bazel
-FILE: ../../../third_party/skia/modules/sksg/slides/BUILD.bazel
-FILE: ../../../third_party/skia/modules/sksg/src/BUILD.bazel
-FILE: ../../../third_party/skia/modules/skshaper/BUILD.bazel
-FILE: ../../../third_party/skia/modules/skshaper/include/BUILD.bazel
-FILE: ../../../third_party/skia/modules/skshaper/src/BUILD.bazel
-FILE: ../../../third_party/skia/modules/skunicode/BUILD.bazel
-FILE: ../../../third_party/skia/modules/skunicode/include/BUILD.bazel
-FILE: ../../../third_party/skia/modules/skunicode/src/BUILD.bazel
-FILE: ../../../third_party/skia/modules/svg/include/BUILD.bazel
-FILE: ../../../third_party/skia/modules/svg/src/BUILD.bazel
-FILE: ../../../third_party/skia/modules/svg/utils/BUILD.bazel
-FILE: ../../../third_party/skia/package-lock.json
-FILE: ../../../third_party/skia/package.json
-FILE: ../../../third_party/skia/public.bzl
-FILE: ../../../third_party/skia/site/_index.html
-FILE: ../../../third_party/skia/site/about/_index.html
-FILE: ../../../third_party/skia/site/config.toml
-FILE: ../../../third_party/skia/site/docs/dev/contrib/SuggestedReviewers.png
-FILE: ../../../third_party/skia/site/docs/dev/design/PdfLogicalDocumentStructure.png
-FILE: ../../../third_party/skia/site/docs/dev/design/conical/corollary2.2.1.svg
-FILE: ../../../third_party/skia/site/docs/dev/design/conical/corollary2.2.2.svg
-FILE: ../../../third_party/skia/site/docs/dev/design/conical/corollary2.3.1.svg
-FILE: ../../../third_party/skia/site/docs/dev/design/conical/corollary2.3.2.svg
-FILE: ../../../third_party/skia/site/docs/dev/design/conical/corollary2.3.3.svg
-FILE: ../../../third_party/skia/site/docs/dev/design/conical/lemma1.svg
-FILE: ../../../third_party/skia/site/docs/dev/design/conical/lemma3.1.svg
-FILE: ../../../third_party/skia/site/docs/dev/design/conical/lemma3.2.svg
-FILE: ../../../third_party/skia/site/docs/dev/design/conical/lemma4.svg
-FILE: ../../../third_party/skia/site/docs/dev/tools/android_gdb.png
-FILE: ../../../third_party/skia/site/docs/dev/tools/buttons.png
-FILE: ../../../third_party/skia/site/docs/dev/tools/calendar.mskp
-FILE: ../../../third_party/skia/site/docs/dev/tools/crosshair.png
-FILE: ../../../third_party/skia/site/docs/dev/tools/debugger.png
-FILE: ../../../third_party/skia/site/docs/dev/tools/end.png
-FILE: ../../../third_party/skia/site/docs/dev/tools/expand.png
-FILE: ../../../third_party/skia/site/docs/dev/tools/frameplayback.png
-FILE: ../../../third_party/skia/site/docs/dev/tools/gpuop.png
-FILE: ../../../third_party/skia/site/docs/dev/tools/image.png
-FILE: ../../../third_party/skia/site/docs/dev/tools/layers.png
-FILE: ../../../third_party/skia/site/docs/dev/tools/onlinedebugger.png
-FILE: ../../../third_party/skia/site/docs/dev/tools/playcommands.png
-FILE: ../../../third_party/skia/site/docs/dev/tools/resources.png
-FILE: ../../../third_party/skia/site/docs/dev/tools/settings.png
-FILE: ../../../third_party/skia/site/docs/dev/tools/tracing.png
-FILE: ../../../third_party/skia/site/docs/dev/tools/tracing_load.png
-FILE: ../../../third_party/skia/site/docs/user/modules/PathKit_effects.png
-FILE: ../../../third_party/skia/site/featured-background.png
-FILE: ../../../third_party/skia/specs/web-img-decode/current/index.html
-FILE: ../../../third_party/skia/specs/web-img-decode/proposed/impl/impl.js
-FILE: ../../../third_party/skia/specs/web-img-decode/proposed/index.html
-FILE: ../../../third_party/skia/src/BUILD.bazel
-FILE: ../../../third_party/skia/src/android/BUILD.bazel
-FILE: ../../../third_party/skia/src/codec/BUILD.bazel
-FILE: ../../../third_party/skia/src/core/BUILD.bazel
-FILE: ../../../third_party/skia/src/core/SkOrderedReadBuffer.h
-FILE: ../../../third_party/skia/src/effects/BUILD.bazel
-FILE: ../../../third_party/skia/src/effects/imagefilters/BUILD.bazel
-FILE: ../../../third_party/skia/src/fonts/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/ganesh/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/ganesh/geometry/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/android/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/builders/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/egl/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/glx/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/iOS/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/mac/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/webgl/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/win/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/ganesh/glsl/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/ganesh/gradients/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/ganesh/mock/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/ganesh/text/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/gl/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/mtl/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/piet/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/tessellate/BUILD.bazel
-FILE: ../../../third_party/skia/src/gpu/vk/BUILD.bazel
-FILE: ../../../third_party/skia/src/image/BUILD.bazel
-FILE: ../../../third_party/skia/src/images/BUILD.bazel
-FILE: ../../../third_party/skia/src/lazy/BUILD.bazel
-FILE: ../../../third_party/skia/src/opts/BUILD.bazel
-FILE: ../../../third_party/skia/src/pathops/BUILD.bazel
-FILE: ../../../third_party/skia/src/pdf/BUILD.bazel
-FILE: ../../../third_party/skia/src/ports/BUILD.bazel
-FILE: ../../../third_party/skia/src/sfnt/BUILD.bazel
-FILE: ../../../third_party/skia/src/shaders/BUILD.bazel
-FILE: ../../../third_party/skia/src/shaders/gradients/BUILD.bazel
-FILE: ../../../third_party/skia/src/sksl/BUILD.bazel
-FILE: ../../../third_party/skia/src/sksl/analysis/BUILD.bazel
-FILE: ../../../third_party/skia/src/sksl/codegen/BUILD.bazel
-FILE: ../../../third_party/skia/src/sksl/dsl/BUILD.bazel
-FILE: ../../../third_party/skia/src/sksl/dsl/priv/BUILD.bazel
-FILE: ../../../third_party/skia/src/sksl/generated/sksl_compute.minified.sksl
-FILE: ../../../third_party/skia/src/sksl/generated/sksl_compute.unoptimized.sksl
-FILE: ../../../third_party/skia/src/sksl/generated/sksl_frag.minified.sksl
-FILE: ../../../third_party/skia/src/sksl/generated/sksl_frag.unoptimized.sksl
-FILE: ../../../third_party/skia/src/sksl/generated/sksl_gpu.minified.sksl
-FILE: ../../../third_party/skia/src/sksl/generated/sksl_gpu.unoptimized.sksl
-FILE: ../../../third_party/skia/src/sksl/generated/sksl_graphite_frag.dehydrated.sksl
-FILE: ../../../third_party/skia/src/sksl/generated/sksl_graphite_frag.minified.sksl
-FILE: ../../../third_party/skia/src/sksl/generated/sksl_graphite_frag.unoptimized.sksl
-FILE: ../../../third_party/skia/src/sksl/generated/sksl_graphite_vert.minified.sksl
-FILE: ../../../third_party/skia/src/sksl/generated/sksl_graphite_vert.unoptimized.sksl
-FILE: ../../../third_party/skia/src/sksl/generated/sksl_public.minified.sksl
-FILE: ../../../third_party/skia/src/sksl/generated/sksl_public.unoptimized.sksl
-FILE: ../../../third_party/skia/src/sksl/generated/sksl_rt_shader.minified.sksl
-FILE: ../../../third_party/skia/src/sksl/generated/sksl_rt_shader.unoptimized.sksl
-FILE: ../../../third_party/skia/src/sksl/generated/sksl_shared.minified.sksl
-FILE: ../../../third_party/skia/src/sksl/generated/sksl_shared.unoptimized.sksl
-FILE: ../../../third_party/skia/src/sksl/generated/sksl_vert.minified.sksl
-FILE: ../../../third_party/skia/src/sksl/generated/sksl_vert.unoptimized.sksl
-FILE: ../../../third_party/skia/src/sksl/ir/BUILD.bazel
-FILE: ../../../third_party/skia/src/sksl/lex/BUILD.bazel
-FILE: ../../../third_party/skia/src/sksl/lex/sksl.lex
-FILE: ../../../third_party/skia/src/sksl/sksl_compute.sksl
-FILE: ../../../third_party/skia/src/sksl/sksl_frag.sksl
-FILE: ../../../third_party/skia/src/sksl/sksl_gpu.sksl
-FILE: ../../../third_party/skia/src/sksl/sksl_graphite_frag.sksl
-FILE: ../../../third_party/skia/src/sksl/sksl_graphite_vert.sksl
-FILE: ../../../third_party/skia/src/sksl/sksl_public.sksl
-FILE: ../../../third_party/skia/src/sksl/sksl_rt_shader.sksl
-FILE: ../../../third_party/skia/src/sksl/sksl_shared.sksl
-FILE: ../../../third_party/skia/src/sksl/sksl_vert.sksl
-FILE: ../../../third_party/skia/src/sksl/tracing/BUILD.bazel
-FILE: ../../../third_party/skia/src/sksl/transform/BUILD.bazel
-FILE: ../../../third_party/skia/src/svg/BUILD.bazel
-FILE: ../../../third_party/skia/src/text/BUILD.bazel
-FILE: ../../../third_party/skia/src/text/gpu/BUILD.bazel
-FILE: ../../../third_party/skia/src/utils/BUILD.bazel
-FILE: ../../../third_party/skia/src/utils/mac/BUILD.bazel
-FILE: ../../../third_party/skia/src/utils/win/BUILD.bazel
-FILE: ../../../third_party/skia/src/xml/BUILD.bazel
-FILE: ../../../third_party/skia/src/xps/BUILD.bazel
-FILE: ../../../third_party/skia/toolchain/BUILD.bazel
-FILE: ../../../third_party/skia/toolchain/download_linux_amd64_toolchain.bzl
-FILE: ../../../third_party/skia/toolchain/download_mac_toolchain.bzl
-FILE: ../../../third_party/skia/toolchain/download_toolchains.bzl
-FILE: ../../../third_party/skia/toolchain/linux_amd64_toolchain_config.bzl
-FILE: ../../../third_party/skia/toolchain/linux_trampolines/IWYU_mapping.imp
-FILE: ../../../third_party/skia/toolchain/mac_toolchain_config.bzl
-FILE: ../../../third_party/skia/toolchain/utils.bzl
+FILE: ../../../flutter/third_party/skia/.bazelignore
+FILE: ../../../flutter/third_party/skia/.bazelproject
+FILE: ../../../flutter/third_party/skia/Cargo.toml
+FILE: ../../../flutter/third_party/skia/OWNERS_build_files.android
+FILE: ../../../flutter/third_party/skia/RELEASE_NOTES.md
+FILE: ../../../flutter/third_party/skia/go.mod
+FILE: ../../../flutter/third_party/skia/go.sum
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/catchExceptionNop.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/color.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/cpu.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/debug.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/debugger.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/external_test/typescript_browser/index.html
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/external_test/typescript_browser/module_uses_ck.ts
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/external_test/typescript_browser/package-lock.json
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/external_test/typescript_browser/tsconfig.json
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/external_test/typescript_browser_es6/index.html
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/external_test/typescript_browser_es6/module_uses_ck.ts
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/external_test/typescript_browser_es6/package-lock.json
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/external_test/typescript_browser_es6/tsconfig.json
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/externs.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/font.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/fonts/NotoMono-Regular.ttf
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/future_apis/ImageDecoder.md
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/future_apis/WebGPU.md
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/gm.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/htmlcanvas/_namedcolors.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/htmlcanvas/canvas2dcontext.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/htmlcanvas/color.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/htmlcanvas/font.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/htmlcanvas/htmlcanvas.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/htmlcanvas/htmlimage.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/htmlcanvas/imagedata.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/htmlcanvas/lineargradient.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/htmlcanvas/path2d.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/htmlcanvas/pattern.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/htmlcanvas/postamble.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/htmlcanvas/preamble.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/htmlcanvas/radialgradient.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/htmlcanvas/util.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/interface.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/karma.bazel.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/karma.conf.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/matrix.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/memory.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/package-lock.json
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/paragraph.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/pathops.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/postamble.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/preamble.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/release.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/rt_shader.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/skottie.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/skp.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/util.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/wasm_tools/SIMD/wasm_simd_types.txt
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/wasm_tools/gms.html
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/wasm_tools/viewer.html
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/webgl.js
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/webgpu.js
+FILE: ../../../flutter/third_party/skia/modules/pathkit/chaining.js
+FILE: ../../../flutter/third_party/skia/modules/pathkit/externs.js
+FILE: ../../../flutter/third_party/skia/modules/pathkit/helper.js
+FILE: ../../../flutter/third_party/skia/modules/pathkit/karma.bench.conf.js
+FILE: ../../../flutter/third_party/skia/modules/pathkit/karma.conf.js
+FILE: ../../../flutter/third_party/skia/modules/pathkit/package-lock.json
+FILE: ../../../flutter/third_party/skia/modules/pathkit/perf/effects.bench.js
+FILE: ../../../flutter/third_party/skia/modules/pathkit/perf/path.bench.js
+FILE: ../../../flutter/third_party/skia/modules/pathkit/perf/pathops.bench.js
+FILE: ../../../flutter/third_party/skia/modules/pathkit/perf/perfReporter.js
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/test.html
+FILE: ../../../flutter/third_party/skia/package-lock.json
+FILE: ../../../flutter/third_party/skia/relnotes/CacheBudget.md
+FILE: ../../../flutter/third_party/skia/relnotes/GraphiteContextMaxTextureSize.md
+FILE: ../../../flutter/third_party/skia/relnotes/MTLBinaryArchive.md
+FILE: ../../../flutter/third_party/skia/src/gpu/gpu_workaround_list.txt
+FILE: ../../../flutter/third_party/skia/src/ports/fontations/Cargo.toml
+FILE: ../../../flutter/third_party/skia/src/sksl/generated/sksl_compute.minified.sksl
+FILE: ../../../flutter/third_party/skia/src/sksl/generated/sksl_compute.unoptimized.sksl
+FILE: ../../../flutter/third_party/skia/src/sksl/generated/sksl_frag.minified.sksl
+FILE: ../../../flutter/third_party/skia/src/sksl/generated/sksl_frag.unoptimized.sksl
+FILE: ../../../flutter/third_party/skia/src/sksl/generated/sksl_gpu.minified.sksl
+FILE: ../../../flutter/third_party/skia/src/sksl/generated/sksl_gpu.unoptimized.sksl
+FILE: ../../../flutter/third_party/skia/src/sksl/generated/sksl_graphite_frag.minified.sksl
+FILE: ../../../flutter/third_party/skia/src/sksl/generated/sksl_graphite_frag.unoptimized.sksl
+FILE: ../../../flutter/third_party/skia/src/sksl/generated/sksl_graphite_frag_es2.minified.sksl
+FILE: ../../../flutter/third_party/skia/src/sksl/generated/sksl_graphite_frag_es2.unoptimized.sksl
+FILE: ../../../flutter/third_party/skia/src/sksl/generated/sksl_graphite_vert.minified.sksl
+FILE: ../../../flutter/third_party/skia/src/sksl/generated/sksl_graphite_vert.unoptimized.sksl
+FILE: ../../../flutter/third_party/skia/src/sksl/generated/sksl_graphite_vert_es2.minified.sksl
+FILE: ../../../flutter/third_party/skia/src/sksl/generated/sksl_graphite_vert_es2.unoptimized.sksl
+FILE: ../../../flutter/third_party/skia/src/sksl/generated/sksl_public.minified.sksl
+FILE: ../../../flutter/third_party/skia/src/sksl/generated/sksl_public.unoptimized.sksl
+FILE: ../../../flutter/third_party/skia/src/sksl/generated/sksl_rt_shader.minified.sksl
+FILE: ../../../flutter/third_party/skia/src/sksl/generated/sksl_rt_shader.unoptimized.sksl
+FILE: ../../../flutter/third_party/skia/src/sksl/generated/sksl_shared.minified.sksl
+FILE: ../../../flutter/third_party/skia/src/sksl/generated/sksl_shared.unoptimized.sksl
+FILE: ../../../flutter/third_party/skia/src/sksl/generated/sksl_vert.minified.sksl
+FILE: ../../../flutter/third_party/skia/src/sksl/generated/sksl_vert.unoptimized.sksl
+FILE: ../../../flutter/third_party/skia/src/sksl/lex/sksl.lex
+FILE: ../../../flutter/third_party/skia/src/sksl/sksl_compute.sksl
+FILE: ../../../flutter/third_party/skia/src/sksl/sksl_frag.sksl
+FILE: ../../../flutter/third_party/skia/src/sksl/sksl_gpu.sksl
+FILE: ../../../flutter/third_party/skia/src/sksl/sksl_graphite_frag.sksl
+FILE: ../../../flutter/third_party/skia/src/sksl/sksl_graphite_frag_es2.sksl
+FILE: ../../../flutter/third_party/skia/src/sksl/sksl_graphite_vert.sksl
+FILE: ../../../flutter/third_party/skia/src/sksl/sksl_graphite_vert_es2.sksl
+FILE: ../../../flutter/third_party/skia/src/sksl/sksl_public.sksl
+FILE: ../../../flutter/third_party/skia/src/sksl/sksl_rt_shader.sksl
+FILE: ../../../flutter/third_party/skia/src/sksl/sksl_shared.sksl
+FILE: ../../../flutter/third_party/skia/src/sksl/sksl_vert.sksl
+FILE: ../../../flutter/third_party/skia/third_party/go.mod
+FILE: ../../../flutter/third_party/skia/third_party/libmicrohttpd/MHD_config.h
+FILE: ../../../flutter/third_party/skia/toolchain/linux_trampolines/IWYU_mapping.imp
+FILE: ../../../flutter/third_party/skia/toolchain/ndk.BUILD
+FILE: ../../../flutter/third_party/skia/whitespace.txt
 ----------------------------------------------------------------------------------------------------
 Copyright (c) 2011 Google Inc. All rights reserved.
 
@@ -1219,9 +475,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/src/core/SkTraceEvent.h + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkTraceEvent.h + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/src/core/SkTraceEvent.h
+FILE: ../../../flutter/third_party/skia/src/core/SkTraceEvent.h
 ----------------------------------------------------------------------------------------------------
 Copyright (c) 2014 Google Inc.
 
@@ -1256,10 +512,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/src/sksl/GLSL.std.450.h
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/GLSL.std.450.h
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/spirv.h
 TYPE: LicenseType.unknown
-FILE: ../../../third_party/skia/src/sksl/GLSL.std.450.h
-FILE: ../../../third_party/skia/src/sksl/spirv.h
+FILE: ../../../flutter/third_party/skia/src/sksl/GLSL.std.450.h
+FILE: ../../../flutter/third_party/skia/src/sksl/spirv.h
 ----------------------------------------------------------------------------------------------------
 Copyright (c) 2014-2016 The Khronos Group Inc.
 
@@ -1272,15 +529,32 @@ Materials are furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Materials.
+
+MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
+STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
+HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
+
+THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM,OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS
+IN THE MATERIALS.
 ====================================================================================================
 
 ====================================================================================================
-LIBRARY: vulkan
-ORIGIN: ../../../third_party/skia/include/third_party/vulkan/LICENSE
+LIBRARY: expat
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/skia/third_party/expat/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/third_party/harfbuzz/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/include/third_party/vulkan/BUILD.bazel
+FILE: ../../../flutter/third_party/skia/third_party/expat/0001-Do-not-claim-getrandom.patch
+FILE: ../../../flutter/third_party/skia/third_party/expat/0002-Do-not-claim-arc4random_buf.patch
+FILE: ../../../flutter/third_party/skia/third_party/expat/include/expat_config/expat_config.h
+FILE: ../../../flutter/third_party/skia/third_party/harfbuzz/config-override.h
 ----------------------------------------------------------------------------------------------------
-Copyright (c) 2018 Google Inc. All rights reserved.
+Copyright (c) 2021 Google Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -1310,30 +584,28 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ====================================================================================================
 
 ====================================================================================================
-LIBRARY: expat
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/skia/third_party/expat/LICENSE
+LIBRARY: skia
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkRegion.h + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/third_party/expat/0001-Do-not-claim-getrandom.patch
-FILE: ../../../third_party/skia/third_party/expat/0002-Do-not-claim-arc4random_buf.patch
-FILE: ../../../third_party/skia/third_party/expat/include/expat_config/expat_config.h
-FILE: ../../../third_party/skia/third_party/harfbuzz/config-override.h
+FILE: ../../../flutter/third_party/skia/include/core/SkRegion.h
 ----------------------------------------------------------------------------------------------------
-Copyright (c) 2021 Google Inc. All rights reserved.
+Copyright 2005 The Android Open Source Project
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -1350,11 +622,303 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/include/core/SkRegion.h + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/config/SkUserConfig.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkBitmap.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkCanvas.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkColor.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkColorFilter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkColorPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkFlattenable.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkGraphics.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkMaskFilter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkMatrix.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkPaint.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkPath.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkPathEffect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkPathMeasure.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkRect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkRefCnt.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkScalar.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkShader.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkStream.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkString.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkTypeface.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkTypes.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/effects/Sk1DPathEffect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/effects/Sk2DPathEffect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/effects/SkBlurMaskFilter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/effects/SkCornerPathEffect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/effects/SkDashPathEffect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/effects/SkDiscretePathEffect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/effects/SkGradientShader.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/effects/SkTableMaskFilter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/SkColorData.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkDeque.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkFixed.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkFloatingPoint.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkMath.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkNoncopyable.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkPoint_impl.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkTDArray.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkTemplates.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/utils/SkCamera.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/utils/SkParse.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/utils/SkParsePath.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkBase64.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkBase64.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkBuffer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkBuffer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkDebug.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkDeque.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkEndian.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkRandom.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkTSearch.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkTSearch.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkTSort.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkAlphaRuns.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkAlphaRuns.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkAnalyticEdge.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkAnalyticEdge.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBlitBWMaskTemplate.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBlitter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBlitter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBlitter_A8.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBlitter_ARGB32.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBlitter_Sprite.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBlurMask.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBlurMask.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBlurMaskFilterImpl.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkColor.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkColorFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkCoreBlitters.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkDescriptor.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkDraw.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkDraw.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkEdge.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkEdge.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkFDot6.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkGeometry.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkGeometry.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkGlyph.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkGraphics.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMask.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMaskFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMatrix.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkOSFile.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPaint.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPath.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPathEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPathEffectBase.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPointPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRegion.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRegionPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRegion_path.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkScalerContext.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkScalerContext.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkScan.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkScanPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkScan_AntiPath.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkScan_Hairline.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkScan_Path.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkSpriteBlitter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkSpriteBlitter_ARGB32.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkStream.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkStrike.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkStrike.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkString.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkStroke.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkStrokerPriv.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkStrokerPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/Sk1DPathEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/Sk2DPathEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/SkCornerPathEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/SkDashPathEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/SkDiscretePathEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/SkEmbossMask.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/SkEmbossMask.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/SkEmbossMaskFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/SkEmbossMaskFilter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/colorfilters/SkBlendModeColorFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/colorfilters/SkColorFilterBase.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/colorfilters/SkColorFilterBase.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/encode/SkPngEncoderImpl.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkDebug_android.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkDebug_stdio.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontHost_FreeType.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontHost_win.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontMgr_custom.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontMgr_custom.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontMgr_mac_ct.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkOSFile_stdio.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkScalerContext_mac_ct.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkTypeface_mac_ct.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkBitmapProcShader.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkBlendShader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkShader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkCamera.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkParse.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkParseColor.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/mac/SkCTFontCreateExactCopy.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/mac/SkCTFontCreateExactCopy.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/xml/SkDOM.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/xml/SkDOM.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/xml/SkXMLParser.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/xml/SkXMLParser.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/xml/SkXMLWriter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/xml/SkXMLWriter.h + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/include/core/SkRegion.h
+FILE: ../../../flutter/third_party/skia/include/config/SkUserConfig.h
+FILE: ../../../flutter/third_party/skia/include/core/SkBitmap.h
+FILE: ../../../flutter/third_party/skia/include/core/SkCanvas.h
+FILE: ../../../flutter/third_party/skia/include/core/SkColor.h
+FILE: ../../../flutter/third_party/skia/include/core/SkColorFilter.h
+FILE: ../../../flutter/third_party/skia/include/core/SkColorPriv.h
+FILE: ../../../flutter/third_party/skia/include/core/SkFlattenable.h
+FILE: ../../../flutter/third_party/skia/include/core/SkGraphics.h
+FILE: ../../../flutter/third_party/skia/include/core/SkMaskFilter.h
+FILE: ../../../flutter/third_party/skia/include/core/SkMatrix.h
+FILE: ../../../flutter/third_party/skia/include/core/SkPaint.h
+FILE: ../../../flutter/third_party/skia/include/core/SkPath.h
+FILE: ../../../flutter/third_party/skia/include/core/SkPathEffect.h
+FILE: ../../../flutter/third_party/skia/include/core/SkPathMeasure.h
+FILE: ../../../flutter/third_party/skia/include/core/SkRect.h
+FILE: ../../../flutter/third_party/skia/include/core/SkRefCnt.h
+FILE: ../../../flutter/third_party/skia/include/core/SkScalar.h
+FILE: ../../../flutter/third_party/skia/include/core/SkShader.h
+FILE: ../../../flutter/third_party/skia/include/core/SkStream.h
+FILE: ../../../flutter/third_party/skia/include/core/SkString.h
+FILE: ../../../flutter/third_party/skia/include/core/SkTypeface.h
+FILE: ../../../flutter/third_party/skia/include/core/SkTypes.h
+FILE: ../../../flutter/third_party/skia/include/effects/Sk1DPathEffect.h
+FILE: ../../../flutter/third_party/skia/include/effects/Sk2DPathEffect.h
+FILE: ../../../flutter/third_party/skia/include/effects/SkBlurMaskFilter.h
+FILE: ../../../flutter/third_party/skia/include/effects/SkCornerPathEffect.h
+FILE: ../../../flutter/third_party/skia/include/effects/SkDashPathEffect.h
+FILE: ../../../flutter/third_party/skia/include/effects/SkDiscretePathEffect.h
+FILE: ../../../flutter/third_party/skia/include/effects/SkGradientShader.h
+FILE: ../../../flutter/third_party/skia/include/effects/SkTableMaskFilter.h
+FILE: ../../../flutter/third_party/skia/include/private/SkColorData.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkDeque.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkFixed.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkFloatingPoint.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkMath.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkNoncopyable.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkPoint_impl.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkTDArray.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkTemplates.h
+FILE: ../../../flutter/third_party/skia/include/utils/SkCamera.h
+FILE: ../../../flutter/third_party/skia/include/utils/SkParse.h
+FILE: ../../../flutter/third_party/skia/include/utils/SkParsePath.h
+FILE: ../../../flutter/third_party/skia/src/base/SkBase64.cpp
+FILE: ../../../flutter/third_party/skia/src/base/SkBase64.h
+FILE: ../../../flutter/third_party/skia/src/base/SkBuffer.cpp
+FILE: ../../../flutter/third_party/skia/src/base/SkBuffer.h
+FILE: ../../../flutter/third_party/skia/src/base/SkDebug.cpp
+FILE: ../../../flutter/third_party/skia/src/base/SkDeque.cpp
+FILE: ../../../flutter/third_party/skia/src/base/SkEndian.h
+FILE: ../../../flutter/third_party/skia/src/base/SkRandom.h
+FILE: ../../../flutter/third_party/skia/src/base/SkTSearch.cpp
+FILE: ../../../flutter/third_party/skia/src/base/SkTSearch.h
+FILE: ../../../flutter/third_party/skia/src/base/SkTSort.h
+FILE: ../../../flutter/third_party/skia/src/base/SkUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/base/SkUtils.h
+FILE: ../../../flutter/third_party/skia/src/core/SkAlphaRuns.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkAlphaRuns.h
+FILE: ../../../flutter/third_party/skia/src/core/SkAnalyticEdge.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkAnalyticEdge.h
+FILE: ../../../flutter/third_party/skia/src/core/SkBlitBWMaskTemplate.h
+FILE: ../../../flutter/third_party/skia/src/core/SkBlitter.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkBlitter.h
+FILE: ../../../flutter/third_party/skia/src/core/SkBlitter_A8.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkBlitter_ARGB32.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkBlitter_Sprite.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkBlurMask.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkBlurMask.h
+FILE: ../../../flutter/third_party/skia/src/core/SkBlurMaskFilterImpl.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkColor.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkColorFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkCoreBlitters.h
+FILE: ../../../flutter/third_party/skia/src/core/SkDescriptor.h
+FILE: ../../../flutter/third_party/skia/src/core/SkDraw.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkDraw.h
+FILE: ../../../flutter/third_party/skia/src/core/SkEdge.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkEdge.h
+FILE: ../../../flutter/third_party/skia/src/core/SkFDot6.h
+FILE: ../../../flutter/third_party/skia/src/core/SkGeometry.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkGeometry.h
+FILE: ../../../flutter/third_party/skia/src/core/SkGlyph.h
+FILE: ../../../flutter/third_party/skia/src/core/SkGraphics.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkMask.h
+FILE: ../../../flutter/third_party/skia/src/core/SkMaskFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkMatrix.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkOSFile.h
+FILE: ../../../flutter/third_party/skia/src/core/SkPaint.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkPath.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkPathEffect.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkPathEffectBase.h
+FILE: ../../../flutter/third_party/skia/src/core/SkPointPriv.h
+FILE: ../../../flutter/third_party/skia/src/core/SkRect.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkRegion.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkRegionPriv.h
+FILE: ../../../flutter/third_party/skia/src/core/SkRegion_path.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkScalerContext.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkScalerContext.h
+FILE: ../../../flutter/third_party/skia/src/core/SkScan.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkScanPriv.h
+FILE: ../../../flutter/third_party/skia/src/core/SkScan_AntiPath.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkScan_Hairline.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkScan_Path.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkSpriteBlitter.h
+FILE: ../../../flutter/third_party/skia/src/core/SkSpriteBlitter_ARGB32.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkStream.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkStrike.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkStrike.h
+FILE: ../../../flutter/third_party/skia/src/core/SkString.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkStroke.h
+FILE: ../../../flutter/third_party/skia/src/core/SkStrokerPriv.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkStrokerPriv.h
+FILE: ../../../flutter/third_party/skia/src/effects/Sk1DPathEffect.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/Sk2DPathEffect.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/SkCornerPathEffect.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/SkDashPathEffect.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/SkDiscretePathEffect.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/SkEmbossMask.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/SkEmbossMask.h
+FILE: ../../../flutter/third_party/skia/src/effects/SkEmbossMaskFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/SkEmbossMaskFilter.h
+FILE: ../../../flutter/third_party/skia/src/effects/colorfilters/SkBlendModeColorFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/colorfilters/SkColorFilterBase.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/colorfilters/SkColorFilterBase.h
+FILE: ../../../flutter/third_party/skia/src/encode/SkPngEncoderImpl.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkDebug_android.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkDebug_stdio.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkFontHost_FreeType.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkFontHost_win.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkFontMgr_custom.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkFontMgr_custom.h
+FILE: ../../../flutter/third_party/skia/src/ports/SkFontMgr_mac_ct.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkOSFile_stdio.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkScalerContext_mac_ct.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkTypeface_mac_ct.cpp
+FILE: ../../../flutter/third_party/skia/src/shaders/SkBitmapProcShader.h
+FILE: ../../../flutter/third_party/skia/src/shaders/SkBlendShader.cpp
+FILE: ../../../flutter/third_party/skia/src/shaders/SkShader.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/SkCamera.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/SkParse.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/SkParseColor.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/mac/SkCTFontCreateExactCopy.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/mac/SkCTFontCreateExactCopy.h
+FILE: ../../../flutter/third_party/skia/src/xml/SkDOM.cpp
+FILE: ../../../flutter/third_party/skia/src/xml/SkDOM.h
+FILE: ../../../flutter/third_party/skia/src/xml/SkXMLParser.cpp
+FILE: ../../../flutter/third_party/skia/src/xml/SkXMLParser.h
+FILE: ../../../flutter/third_party/skia/src/xml/SkXMLWriter.cpp
+FILE: ../../../flutter/third_party/skia/src/xml/SkXMLWriter.h
 ----------------------------------------------------------------------------------------------------
-Copyright 2005 The Android Open Source Project
+Copyright 2006 The Android Open Source Project
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -1387,158 +951,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/include/config/SkUserConfig.h + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontHost_FreeType_common.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkTypeface_FreeType.h + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/include/config/SkUserConfig.h
-FILE: ../../../third_party/skia/include/core/SkBitmap.h
-FILE: ../../../third_party/skia/include/core/SkCanvas.h
-FILE: ../../../third_party/skia/include/core/SkColor.h
-FILE: ../../../third_party/skia/include/core/SkColorFilter.h
-FILE: ../../../third_party/skia/include/core/SkColorPriv.h
-FILE: ../../../third_party/skia/include/core/SkFlattenable.h
-FILE: ../../../third_party/skia/include/core/SkGraphics.h
-FILE: ../../../third_party/skia/include/core/SkMaskFilter.h
-FILE: ../../../third_party/skia/include/core/SkMath.h
-FILE: ../../../third_party/skia/include/core/SkMatrix.h
-FILE: ../../../third_party/skia/include/core/SkPaint.h
-FILE: ../../../third_party/skia/include/core/SkPath.h
-FILE: ../../../third_party/skia/include/core/SkPathEffect.h
-FILE: ../../../third_party/skia/include/core/SkPathMeasure.h
-FILE: ../../../third_party/skia/include/core/SkPoint.h
-FILE: ../../../third_party/skia/include/core/SkRect.h
-FILE: ../../../third_party/skia/include/core/SkRefCnt.h
-FILE: ../../../third_party/skia/include/core/SkScalar.h
-FILE: ../../../third_party/skia/include/core/SkShader.h
-FILE: ../../../third_party/skia/include/core/SkStream.h
-FILE: ../../../third_party/skia/include/core/SkString.h
-FILE: ../../../third_party/skia/include/core/SkTime.h
-FILE: ../../../third_party/skia/include/core/SkTypeface.h
-FILE: ../../../third_party/skia/include/core/SkTypes.h
-FILE: ../../../third_party/skia/include/effects/Sk1DPathEffect.h
-FILE: ../../../third_party/skia/include/effects/Sk2DPathEffect.h
-FILE: ../../../third_party/skia/include/effects/SkBlurMaskFilter.h
-FILE: ../../../third_party/skia/include/effects/SkCornerPathEffect.h
-FILE: ../../../third_party/skia/include/effects/SkDashPathEffect.h
-FILE: ../../../third_party/skia/include/effects/SkDiscretePathEffect.h
-FILE: ../../../third_party/skia/include/effects/SkGradientShader.h
-FILE: ../../../third_party/skia/include/effects/SkTableMaskFilter.h
-FILE: ../../../third_party/skia/include/private/SkColorData.h
-FILE: ../../../third_party/skia/include/private/SkDeque.h
-FILE: ../../../third_party/skia/include/private/SkFixed.h
-FILE: ../../../third_party/skia/include/private/SkFloatingPoint.h
-FILE: ../../../third_party/skia/include/private/SkNoncopyable.h
-FILE: ../../../third_party/skia/include/private/SkTDArray.h
-FILE: ../../../third_party/skia/include/private/SkTemplates.h
-FILE: ../../../third_party/skia/include/utils/SkBase64.h
-FILE: ../../../third_party/skia/include/utils/SkCamera.h
-FILE: ../../../third_party/skia/include/utils/SkParse.h
-FILE: ../../../third_party/skia/include/utils/SkParsePath.h
-FILE: ../../../third_party/skia/include/utils/SkRandom.h
-FILE: ../../../third_party/skia/src/core/SkAlphaRuns.cpp
-FILE: ../../../third_party/skia/src/core/SkAnalyticEdge.cpp
-FILE: ../../../third_party/skia/src/core/SkAnalyticEdge.h
-FILE: ../../../third_party/skia/src/core/SkAntiRun.h
-FILE: ../../../third_party/skia/src/core/SkBlitBWMaskTemplate.h
-FILE: ../../../third_party/skia/src/core/SkBlitter.cpp
-FILE: ../../../third_party/skia/src/core/SkBlitter.h
-FILE: ../../../third_party/skia/src/core/SkBlitter_A8.cpp
-FILE: ../../../third_party/skia/src/core/SkBlitter_ARGB32.cpp
-FILE: ../../../third_party/skia/src/core/SkBlitter_Sprite.cpp
-FILE: ../../../third_party/skia/src/core/SkBlurMF.cpp
-FILE: ../../../third_party/skia/src/core/SkBlurMask.cpp
-FILE: ../../../third_party/skia/src/core/SkBlurMask.h
-FILE: ../../../third_party/skia/src/core/SkBuffer.cpp
-FILE: ../../../third_party/skia/src/core/SkBuffer.h
-FILE: ../../../third_party/skia/src/core/SkColor.cpp
-FILE: ../../../third_party/skia/src/core/SkColorFilter.cpp
-FILE: ../../../third_party/skia/src/core/SkColorFilterBase.h
-FILE: ../../../third_party/skia/src/core/SkCoreBlitters.h
-FILE: ../../../third_party/skia/src/core/SkDebug.cpp
-FILE: ../../../third_party/skia/src/core/SkDeque.cpp
-FILE: ../../../third_party/skia/src/core/SkDescriptor.h
-FILE: ../../../third_party/skia/src/core/SkDraw.cpp
-FILE: ../../../third_party/skia/src/core/SkDraw.h
-FILE: ../../../third_party/skia/src/core/SkEdge.cpp
-FILE: ../../../third_party/skia/src/core/SkEdge.h
-FILE: ../../../third_party/skia/src/core/SkEndian.h
-FILE: ../../../third_party/skia/src/core/SkFDot6.h
-FILE: ../../../third_party/skia/src/core/SkGeometry.cpp
-FILE: ../../../third_party/skia/src/core/SkGeometry.h
-FILE: ../../../third_party/skia/src/core/SkGlyph.h
-FILE: ../../../third_party/skia/src/core/SkGraphics.cpp
-FILE: ../../../third_party/skia/src/core/SkMask.h
-FILE: ../../../third_party/skia/src/core/SkMaskFilter.cpp
-FILE: ../../../third_party/skia/src/core/SkMatrix.cpp
-FILE: ../../../third_party/skia/src/core/SkModeColorFilter.cpp
-FILE: ../../../third_party/skia/src/core/SkOSFile.h
-FILE: ../../../third_party/skia/src/core/SkPaint.cpp
-FILE: ../../../third_party/skia/src/core/SkPath.cpp
-FILE: ../../../third_party/skia/src/core/SkPathEffect.cpp
-FILE: ../../../third_party/skia/src/core/SkPathEffectBase.h
-FILE: ../../../third_party/skia/src/core/SkPointPriv.h
-FILE: ../../../third_party/skia/src/core/SkRect.cpp
-FILE: ../../../third_party/skia/src/core/SkRegion.cpp
-FILE: ../../../third_party/skia/src/core/SkRegionPriv.h
-FILE: ../../../third_party/skia/src/core/SkRegion_path.cpp
-FILE: ../../../third_party/skia/src/core/SkScalerCache.cpp
-FILE: ../../../third_party/skia/src/core/SkScalerCache.h
-FILE: ../../../third_party/skia/src/core/SkScalerContext.cpp
-FILE: ../../../third_party/skia/src/core/SkScalerContext.h
-FILE: ../../../third_party/skia/src/core/SkScan.cpp
-FILE: ../../../third_party/skia/src/core/SkScanPriv.h
-FILE: ../../../third_party/skia/src/core/SkScan_AntiPath.cpp
-FILE: ../../../third_party/skia/src/core/SkScan_Hairline.cpp
-FILE: ../../../third_party/skia/src/core/SkScan_Path.cpp
-FILE: ../../../third_party/skia/src/core/SkSpriteBlitter.h
-FILE: ../../../third_party/skia/src/core/SkSpriteBlitter_ARGB32.cpp
-FILE: ../../../third_party/skia/src/core/SkStream.cpp
-FILE: ../../../third_party/skia/src/core/SkString.cpp
-FILE: ../../../third_party/skia/src/core/SkStroke.h
-FILE: ../../../third_party/skia/src/core/SkStrokerPriv.cpp
-FILE: ../../../third_party/skia/src/core/SkStrokerPriv.h
-FILE: ../../../third_party/skia/src/core/SkTSearch.cpp
-FILE: ../../../third_party/skia/src/core/SkTSearch.h
-FILE: ../../../third_party/skia/src/core/SkTSort.h
-FILE: ../../../third_party/skia/src/core/SkUtils.cpp
-FILE: ../../../third_party/skia/src/core/SkUtils.h
-FILE: ../../../third_party/skia/src/core/SkXfermode.cpp
-FILE: ../../../third_party/skia/src/core/SkXfermodePriv.h
-FILE: ../../../third_party/skia/src/effects/Sk1DPathEffect.cpp
-FILE: ../../../third_party/skia/src/effects/Sk2DPathEffect.cpp
-FILE: ../../../third_party/skia/src/effects/SkCornerPathEffect.cpp
-FILE: ../../../third_party/skia/src/effects/SkDashPathEffect.cpp
-FILE: ../../../third_party/skia/src/effects/SkDiscretePathEffect.cpp
-FILE: ../../../third_party/skia/src/effects/SkEmbossMask.cpp
-FILE: ../../../third_party/skia/src/effects/SkEmbossMask.h
-FILE: ../../../third_party/skia/src/effects/SkEmbossMaskFilter.cpp
-FILE: ../../../third_party/skia/src/effects/SkEmbossMaskFilter.h
-FILE: ../../../third_party/skia/src/images/SkPngEncoder.cpp
-FILE: ../../../third_party/skia/src/ports/SkDebug_android.cpp
-FILE: ../../../third_party/skia/src/ports/SkDebug_stdio.cpp
-FILE: ../../../third_party/skia/src/ports/SkFontHost_FreeType.cpp
-FILE: ../../../third_party/skia/src/ports/SkFontHost_win.cpp
-FILE: ../../../third_party/skia/src/ports/SkFontMgr_custom.cpp
-FILE: ../../../third_party/skia/src/ports/SkFontMgr_custom.h
-FILE: ../../../third_party/skia/src/ports/SkFontMgr_mac_ct.cpp
-FILE: ../../../third_party/skia/src/ports/SkOSFile_stdio.cpp
-FILE: ../../../third_party/skia/src/ports/SkScalerContext_mac_ct.cpp
-FILE: ../../../third_party/skia/src/ports/SkTypeface_mac_ct.cpp
-FILE: ../../../third_party/skia/src/shaders/SkBitmapProcShader.h
-FILE: ../../../third_party/skia/src/shaders/SkComposeShader.cpp
-FILE: ../../../third_party/skia/src/shaders/SkShader.cpp
-FILE: ../../../third_party/skia/src/shaders/gradients/SkGradientShader.cpp
-FILE: ../../../third_party/skia/src/utils/SkBase64.cpp
-FILE: ../../../third_party/skia/src/utils/SkCamera.cpp
-FILE: ../../../third_party/skia/src/utils/SkParse.cpp
-FILE: ../../../third_party/skia/src/utils/SkParseColor.cpp
-FILE: ../../../third_party/skia/src/xml/SkDOM.cpp
-FILE: ../../../third_party/skia/src/xml/SkDOM.h
-FILE: ../../../third_party/skia/src/xml/SkXMLParser.cpp
-FILE: ../../../third_party/skia/src/xml/SkXMLParser.h
-FILE: ../../../third_party/skia/src/xml/SkXMLWriter.cpp
-FILE: ../../../third_party/skia/src/xml/SkXMLWriter.h
+FILE: ../../../flutter/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkFontHost_FreeType_common.h
+FILE: ../../../flutter/third_party/skia/src/ports/SkTypeface_FreeType.h
 ----------------------------------------------------------------------------------------------------
-Copyright 2006 The Android Open Source Project
+Copyright 2006-2012 The Android Open Source Project
+Copyright 2012 Mozilla Foundation
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -1571,13 +993,23 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkPicture.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/effects/SkColorMatrix.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/effects/SkColorMatrixFilter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBitmapProcState.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMask.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPicture.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/encode/SkJpegEncoderImpl.cpp + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp
-FILE: ../../../third_party/skia/src/ports/SkFontHost_FreeType_common.h
+FILE: ../../../flutter/third_party/skia/include/core/SkPicture.h
+FILE: ../../../flutter/third_party/skia/include/effects/SkColorMatrix.h
+FILE: ../../../flutter/third_party/skia/include/effects/SkColorMatrixFilter.h
+FILE: ../../../flutter/third_party/skia/src/core/SkBitmapProcState.h
+FILE: ../../../flutter/third_party/skia/src/core/SkMask.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkPicture.cpp
+FILE: ../../../flutter/third_party/skia/src/encode/SkJpegEncoderImpl.cpp
 ----------------------------------------------------------------------------------------------------
-Copyright 2006-2012 The Android Open Source Project
-Copyright 2012 Mozilla Foundation
+Copyright 2007 The Android Open Source Project
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -1610,17 +1042,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/include/core/SkPicture.h + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBitmapProcState_matrixProcs.cpp + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/include/core/SkPicture.h
-FILE: ../../../third_party/skia/include/effects/SkColorMatrix.h
-FILE: ../../../third_party/skia/include/effects/SkColorMatrixFilter.h
-FILE: ../../../third_party/skia/src/core/SkBitmapProcState.h
-FILE: ../../../third_party/skia/src/core/SkMask.cpp
-FILE: ../../../third_party/skia/src/core/SkPicture.cpp
-FILE: ../../../third_party/skia/src/images/SkJpegEncoder.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkBitmapProcState_matrixProcs.cpp
 ----------------------------------------------------------------------------------------------------
-Copyright 2007 The Android Open Source Project
+Copyright 2008 Google Inc.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -1653,12 +1079,33 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/src/core/SkBitmapProcState_matrixProcs.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkMallocPixelRef.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkPixelRef.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkUnPreMultiply.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkFloatBits.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkMathPriv.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBitmap.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkCanvas.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPathMeasure.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPoint.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPtrRecorder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkStroke.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkWriter32.h + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/src/core/SkBitmapProcState_matrixProcs.cpp
-FILE: ../../../third_party/skia/src/ports/SkFontMgr_FontConfigInterface_factory.cpp
+FILE: ../../../flutter/third_party/skia/include/core/SkMallocPixelRef.h
+FILE: ../../../flutter/third_party/skia/include/core/SkPixelRef.h
+FILE: ../../../flutter/third_party/skia/include/core/SkUnPreMultiply.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkFloatBits.h
+FILE: ../../../flutter/third_party/skia/src/base/SkMathPriv.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkBitmap.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkCanvas.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkPathMeasure.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkPoint.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkPtrRecorder.h
+FILE: ../../../flutter/third_party/skia/src/core/SkStroke.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkWriter32.h
 ----------------------------------------------------------------------------------------------------
-Copyright 2008 Google Inc.
+Copyright 2008 The Android Open Source Project
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -1691,25 +1138,23 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/include/core/SkMallocPixelRef.h + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkColorPalette.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkCubicClipper.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkCubicClipper.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkEdgeClipper.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkEdgeClipper.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkQuadClipper.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkQuadClipper.h + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/include/core/SkMallocPixelRef.h
-FILE: ../../../third_party/skia/include/core/SkPixelRef.h
-FILE: ../../../third_party/skia/include/core/SkUnPreMultiply.h
-FILE: ../../../third_party/skia/include/effects/SkBlurDrawLooper.h
-FILE: ../../../third_party/skia/include/private/SkFloatBits.h
-FILE: ../../../third_party/skia/src/core/SkBitmap.cpp
-FILE: ../../../third_party/skia/src/core/SkCanvas.cpp
-FILE: ../../../third_party/skia/src/core/SkMath.cpp
-FILE: ../../../third_party/skia/src/core/SkPathMeasure.cpp
-FILE: ../../../third_party/skia/src/core/SkPoint.cpp
-FILE: ../../../third_party/skia/src/core/SkPtrRecorder.h
-FILE: ../../../third_party/skia/src/core/SkStroke.cpp
-FILE: ../../../third_party/skia/src/core/SkWriter32.h
-FILE: ../../../third_party/skia/src/ports/SkFontMgr_empty_factory.cpp
-FILE: ../../../third_party/skia/src/ports/SkImageEncoder_CG.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkColorPalette.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkCubicClipper.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkCubicClipper.h
+FILE: ../../../flutter/third_party/skia/src/core/SkEdgeClipper.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkEdgeClipper.h
+FILE: ../../../flutter/third_party/skia/src/core/SkQuadClipper.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkQuadClipper.h
 ----------------------------------------------------------------------------------------------------
-Copyright 2008 The Android Open Source Project
+Copyright 2009 The Android Open Source Project
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -1742,18 +1187,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/src/codec/SkColorTable.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontConfigInterface_direct.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontConfigInterface_direct.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/src/codec/SkColorTable.cpp
-FILE: ../../../third_party/skia/src/core/SkCubicClipper.cpp
-FILE: ../../../third_party/skia/src/core/SkCubicClipper.h
-FILE: ../../../third_party/skia/src/core/SkEdgeClipper.cpp
-FILE: ../../../third_party/skia/src/core/SkEdgeClipper.h
-FILE: ../../../third_party/skia/src/core/SkQuadClipper.cpp
-FILE: ../../../third_party/skia/src/core/SkQuadClipper.h
-FILE: ../../../third_party/skia/src/images/SkImageEncoder.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkFontConfigInterface_direct.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkFontConfigInterface_direct.h
+FILE: ../../../flutter/third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp
 ----------------------------------------------------------------------------------------------------
-Copyright 2009 The Android Open Source Project
+Copyright 2009-2015 Google Inc.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -1786,13 +1228,49 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/GrTypes.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkTBlockList.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkImageInfo.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRasterClip.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRasterClip.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkStrikeCache.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/BufferWriter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/Rectanizer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/RectanizerPow2.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/Device.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBufferAllocPool.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBufferAllocPool.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrClip.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrColor.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrFixedClip.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrGpu.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/SkGr.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrRect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkDebug_win.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/text/gpu/Glyph.h + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp
-FILE: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct.h
-FILE: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp
+FILE: ../../../flutter/third_party/skia/include/gpu/GrTypes.h
+FILE: ../../../flutter/third_party/skia/src/base/SkTBlockList.h
+FILE: ../../../flutter/third_party/skia/src/core/SkImageInfo.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkRasterClip.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkRasterClip.h
+FILE: ../../../flutter/third_party/skia/src/core/SkStrikeCache.h
+FILE: ../../../flutter/third_party/skia/src/gpu/BufferWriter.h
+FILE: ../../../flutter/third_party/skia/src/gpu/Rectanizer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/RectanizerPow2.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/Device.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBufferAllocPool.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBufferAllocPool.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrClip.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrColor.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrFixedClip.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrGpu.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/SkGr.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrRect.h
+FILE: ../../../flutter/third_party/skia/src/ports/SkDebug_win.cpp
+FILE: ../../../flutter/third_party/skia/src/text/gpu/Glyph.h
 ----------------------------------------------------------------------------------------------------
-Copyright 2009-2015 Google Inc.
+Copyright 2010 Google Inc.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -1825,32 +1303,33 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/include/gpu/GrConfig.h + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkDevice.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkScalar.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkTextFormatParams.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/encode/SkJPEGWriteUtility.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/encode/SkJPEGWriteUtility.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/encode/SkWebpEncoderImpl.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkDeflate.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkDeflate.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFFormXObject.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFFormXObject.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFGraphicState.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFTypes.h + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/include/gpu/GrConfig.h
-FILE: ../../../third_party/skia/include/gpu/GrTypes.h
-FILE: ../../../third_party/skia/src/core/SkImageInfo.cpp
-FILE: ../../../third_party/skia/src/core/SkRasterClip.cpp
-FILE: ../../../third_party/skia/src/core/SkRasterClip.h
-FILE: ../../../third_party/skia/src/core/SkStrikeCache.h
-FILE: ../../../third_party/skia/src/core/SkTBlockList.h
-FILE: ../../../third_party/skia/src/gpu/BufferWriter.h
-FILE: ../../../third_party/skia/src/gpu/GrRectanizer.h
-FILE: ../../../third_party/skia/src/gpu/Rectanizer.h
-FILE: ../../../third_party/skia/src/gpu/RectanizerPow2.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/Device_v1.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrBufferAllocPool.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrBufferAllocPool.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrClip.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrColor.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrFixedClip.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrGpu.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/SkGr.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/geometry/GrRect.h
-FILE: ../../../third_party/skia/src/ports/SkDebug_win.cpp
-FILE: ../../../third_party/skia/src/text/gpu/Glyph.h
+FILE: ../../../flutter/third_party/skia/src/core/SkDevice.h
+FILE: ../../../flutter/third_party/skia/src/core/SkScalar.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkTextFormatParams.h
+FILE: ../../../flutter/third_party/skia/src/encode/SkJPEGWriteUtility.cpp
+FILE: ../../../flutter/third_party/skia/src/encode/SkJPEGWriteUtility.h
+FILE: ../../../flutter/third_party/skia/src/encode/SkWebpEncoderImpl.cpp
+FILE: ../../../flutter/third_party/skia/src/pdf/SkDeflate.cpp
+FILE: ../../../flutter/third_party/skia/src/pdf/SkDeflate.h
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFFormXObject.cpp
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFFormXObject.h
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFGraphicState.h
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFTypes.h
 ----------------------------------------------------------------------------------------------------
-Copyright 2010 Google Inc.
+Copyright 2010 The Android Open Source Project
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -1883,22 +1362,369 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/src/core/SkDevice.h + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/aaclip.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/aarectmodes.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/arithmode.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/bitmapcopy.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/bitmapfilters.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/bitmaprect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/blurs.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/clip_strokerect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/clipshader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/color4f.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/colormatrix.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/complexclip.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/complexclip2.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/convexpaths.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/cubicpaths.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/degeneratesegments.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/dftext.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/drawbitmaprect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/emptypath.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/encode.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/filltypes.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/filltypespersp.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/filterindiabox.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/fontscaler.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/gammatext.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/giantbitmap.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/gm.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/gm.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/gradients.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/gradtext.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/hairmodes.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/hittestpath.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/image.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/imageblur.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/imageblur2.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/imagefiltersbase.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/imagefilterscropped.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/lcdtext.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/linepaths.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/ninepatchstretch.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/pathfill.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/pathreverse.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/persptext.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/points.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/poly2poly.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/quadpaths.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/rasterhandleallocator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/shaderpath.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/shadertext3.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/strokefill.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/strokerects.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/strokes.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/tablecolorfilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/texteffects.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/tilemodes.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/tilemodes_scaled.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/tinybitmap.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/xfermodes.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkData.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkImageFilter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkSize.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/effects/SkLayerDrawLooper.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/gl/GrGLConfig.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/gl/GrGLConfig_chrome.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/gl/GrGLInterface.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/ports/SkTypeface_mac.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/ports/SkTypeface_win.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkTArray.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/utils/SkNWayCanvas.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/utils/mac/SkCGUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkTLazy.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkAAClip.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkAAClip.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkAdvancedTypefaceMetrics.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBitmapProcState.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBlitRow.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBlitRow_D32.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkClipStack.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkClipStack.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkConvertPixels.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkData.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkDevice.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkDrawProcs.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkEdgeBuilder.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkEdgeBuilder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkFlattenable.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkFontStream.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkLineClipper.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkLineClipper.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMallocPixelRef.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPictureData.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPictureData.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPictureFlat.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPictureFlat.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPictureRecord.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPictureRecord.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPixelRef.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPtrRecorder.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkReadBuffer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkTypefaceCache.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkTypefaceCache.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkUnPreMultiply.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkWriteBuffer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkWriter32.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/SkColorMatrix.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/SkColorMatrixFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/SkLayerDrawLooper.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/SkTableMaskFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/colorfilters/SkMatrixColorFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/Device.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrAttachment.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrAttachment.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrGpu.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrGpuResource.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrNativeRect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrPaint.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrRenderTarget.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrRenderTarget.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrStencilSettings.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrTexture.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrTexture.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/PathRenderer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/PathRenderer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/PathRendererChain.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/PathRendererChain.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrPathUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrPathUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLAttachment.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLAttachment.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLDefines.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLGLSL.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLGLSL.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLGpu.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLGpu.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLGpuProgramCache.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLInterfaceAutogen.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLMakeNativeInterface_none.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLProgram.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLProgram.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLRenderTarget.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLRenderTarget.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLTexture.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLTexture.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLUtil.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/mac/GrGLMakeNativeInterface_mac.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/win/GrGLMakeNativeInterface_win.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/AAHairLinePathRenderer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/AAHairLinePathRenderer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/DefaultPathRenderer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/DefaultPathRenderer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFDevice.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFDevice.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFDocument.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFFont.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFFont.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFGraphicState.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFMakeToUnicodeCmap.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFShader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFShader.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFTypes.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkGlobalInitialization_default.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkMemory_malloc.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkScalerContext_win_dw.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkBitmapProcShader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkBitSet.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkNWayCanvas.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkOSPath.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkParsePath.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/mac/SkCreateCGImageRef.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/win/SkAutoCoInitialize.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/win/SkAutoCoInitialize.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/win/SkHRESULT.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/win/SkHRESULT.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/win/SkIStream.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/win/SkIStream.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/win/SkTScopedComPtr.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/xps/SkXPSDevice.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/xps/SkXPSDevice.h + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/src/core/SkDevice.h
-FILE: ../../../third_party/skia/src/core/SkScalar.cpp
-FILE: ../../../third_party/skia/src/core/SkTextFormatParams.h
-FILE: ../../../third_party/skia/src/images/SkJPEGWriteUtility.cpp
-FILE: ../../../third_party/skia/src/images/SkJPEGWriteUtility.h
-FILE: ../../../third_party/skia/src/images/SkWebpEncoder.cpp
-FILE: ../../../third_party/skia/src/pdf/SkDeflate.cpp
-FILE: ../../../third_party/skia/src/pdf/SkDeflate.h
-FILE: ../../../third_party/skia/src/pdf/SkPDFFormXObject.cpp
-FILE: ../../../third_party/skia/src/pdf/SkPDFFormXObject.h
-FILE: ../../../third_party/skia/src/pdf/SkPDFGraphicState.h
-FILE: ../../../third_party/skia/src/pdf/SkPDFTypes.h
+FILE: ../../../flutter/third_party/skia/gm/aaclip.cpp
+FILE: ../../../flutter/third_party/skia/gm/aarectmodes.cpp
+FILE: ../../../flutter/third_party/skia/gm/arithmode.cpp
+FILE: ../../../flutter/third_party/skia/gm/bitmapcopy.cpp
+FILE: ../../../flutter/third_party/skia/gm/bitmapfilters.cpp
+FILE: ../../../flutter/third_party/skia/gm/bitmaprect.cpp
+FILE: ../../../flutter/third_party/skia/gm/blurs.cpp
+FILE: ../../../flutter/third_party/skia/gm/clip_strokerect.cpp
+FILE: ../../../flutter/third_party/skia/gm/clipshader.cpp
+FILE: ../../../flutter/third_party/skia/gm/color4f.cpp
+FILE: ../../../flutter/third_party/skia/gm/colormatrix.cpp
+FILE: ../../../flutter/third_party/skia/gm/complexclip.cpp
+FILE: ../../../flutter/third_party/skia/gm/complexclip2.cpp
+FILE: ../../../flutter/third_party/skia/gm/convexpaths.cpp
+FILE: ../../../flutter/third_party/skia/gm/cubicpaths.cpp
+FILE: ../../../flutter/third_party/skia/gm/degeneratesegments.cpp
+FILE: ../../../flutter/third_party/skia/gm/dftext.cpp
+FILE: ../../../flutter/third_party/skia/gm/drawbitmaprect.cpp
+FILE: ../../../flutter/third_party/skia/gm/emptypath.cpp
+FILE: ../../../flutter/third_party/skia/gm/encode.cpp
+FILE: ../../../flutter/third_party/skia/gm/filltypes.cpp
+FILE: ../../../flutter/third_party/skia/gm/filltypespersp.cpp
+FILE: ../../../flutter/third_party/skia/gm/filterindiabox.cpp
+FILE: ../../../flutter/third_party/skia/gm/fontscaler.cpp
+FILE: ../../../flutter/third_party/skia/gm/gammatext.cpp
+FILE: ../../../flutter/third_party/skia/gm/giantbitmap.cpp
+FILE: ../../../flutter/third_party/skia/gm/gm.cpp
+FILE: ../../../flutter/third_party/skia/gm/gm.h
+FILE: ../../../flutter/third_party/skia/gm/gradients.cpp
+FILE: ../../../flutter/third_party/skia/gm/gradtext.cpp
+FILE: ../../../flutter/third_party/skia/gm/hairmodes.cpp
+FILE: ../../../flutter/third_party/skia/gm/hittestpath.cpp
+FILE: ../../../flutter/third_party/skia/gm/image.cpp
+FILE: ../../../flutter/third_party/skia/gm/imageblur.cpp
+FILE: ../../../flutter/third_party/skia/gm/imageblur2.cpp
+FILE: ../../../flutter/third_party/skia/gm/imagefiltersbase.cpp
+FILE: ../../../flutter/third_party/skia/gm/imagefilterscropped.cpp
+FILE: ../../../flutter/third_party/skia/gm/lcdtext.cpp
+FILE: ../../../flutter/third_party/skia/gm/linepaths.cpp
+FILE: ../../../flutter/third_party/skia/gm/ninepatchstretch.cpp
+FILE: ../../../flutter/third_party/skia/gm/pathfill.cpp
+FILE: ../../../flutter/third_party/skia/gm/pathreverse.cpp
+FILE: ../../../flutter/third_party/skia/gm/persptext.cpp
+FILE: ../../../flutter/third_party/skia/gm/points.cpp
+FILE: ../../../flutter/third_party/skia/gm/poly2poly.cpp
+FILE: ../../../flutter/third_party/skia/gm/quadpaths.cpp
+FILE: ../../../flutter/third_party/skia/gm/rasterhandleallocator.cpp
+FILE: ../../../flutter/third_party/skia/gm/shaderpath.cpp
+FILE: ../../../flutter/third_party/skia/gm/shadertext3.cpp
+FILE: ../../../flutter/third_party/skia/gm/strokefill.cpp
+FILE: ../../../flutter/third_party/skia/gm/strokerects.cpp
+FILE: ../../../flutter/third_party/skia/gm/strokes.cpp
+FILE: ../../../flutter/third_party/skia/gm/tablecolorfilter.cpp
+FILE: ../../../flutter/third_party/skia/gm/texteffects.cpp
+FILE: ../../../flutter/third_party/skia/gm/tilemodes.cpp
+FILE: ../../../flutter/third_party/skia/gm/tilemodes_scaled.cpp
+FILE: ../../../flutter/third_party/skia/gm/tinybitmap.cpp
+FILE: ../../../flutter/third_party/skia/gm/xfermodes.cpp
+FILE: ../../../flutter/third_party/skia/include/core/SkData.h
+FILE: ../../../flutter/third_party/skia/include/core/SkImageFilter.h
+FILE: ../../../flutter/third_party/skia/include/core/SkSize.h
+FILE: ../../../flutter/third_party/skia/include/effects/SkLayerDrawLooper.h
+FILE: ../../../flutter/third_party/skia/include/gpu/gl/GrGLConfig.h
+FILE: ../../../flutter/third_party/skia/include/gpu/gl/GrGLConfig_chrome.h
+FILE: ../../../flutter/third_party/skia/include/gpu/gl/GrGLInterface.h
+FILE: ../../../flutter/third_party/skia/include/ports/SkTypeface_mac.h
+FILE: ../../../flutter/third_party/skia/include/ports/SkTypeface_win.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkTArray.h
+FILE: ../../../flutter/third_party/skia/include/utils/SkNWayCanvas.h
+FILE: ../../../flutter/third_party/skia/include/utils/mac/SkCGUtils.h
+FILE: ../../../flutter/third_party/skia/src/base/SkTLazy.h
+FILE: ../../../flutter/third_party/skia/src/core/SkAAClip.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkAAClip.h
+FILE: ../../../flutter/third_party/skia/src/core/SkAdvancedTypefaceMetrics.h
+FILE: ../../../flutter/third_party/skia/src/core/SkBitmapProcState.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkBlitRow.h
+FILE: ../../../flutter/third_party/skia/src/core/SkBlitRow_D32.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkClipStack.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkClipStack.h
+FILE: ../../../flutter/third_party/skia/src/core/SkConvertPixels.h
+FILE: ../../../flutter/third_party/skia/src/core/SkData.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkDevice.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkDrawProcs.h
+FILE: ../../../flutter/third_party/skia/src/core/SkEdgeBuilder.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkEdgeBuilder.h
+FILE: ../../../flutter/third_party/skia/src/core/SkFlattenable.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkFontStream.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkLineClipper.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkLineClipper.h
+FILE: ../../../flutter/third_party/skia/src/core/SkMallocPixelRef.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkPictureData.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkPictureData.h
+FILE: ../../../flutter/third_party/skia/src/core/SkPictureFlat.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkPictureFlat.h
+FILE: ../../../flutter/third_party/skia/src/core/SkPictureRecord.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkPictureRecord.h
+FILE: ../../../flutter/third_party/skia/src/core/SkPixelRef.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkPtrRecorder.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkReadBuffer.h
+FILE: ../../../flutter/third_party/skia/src/core/SkTypefaceCache.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkTypefaceCache.h
+FILE: ../../../flutter/third_party/skia/src/core/SkUnPreMultiply.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkWriteBuffer.h
+FILE: ../../../flutter/third_party/skia/src/core/SkWriter32.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/SkColorMatrix.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/SkColorMatrixFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/SkLayerDrawLooper.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/SkTableMaskFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/colorfilters/SkMatrixColorFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/Device.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrAttachment.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrAttachment.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrGpu.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrGpuResource.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrNativeRect.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrPaint.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrRenderTarget.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrRenderTarget.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrStencilSettings.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrTexture.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrTexture.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/PathRenderer.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/PathRenderer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/PathRendererChain.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/PathRendererChain.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrPathUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrPathUtils.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLAttachment.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLAttachment.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLDefines.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLGLSL.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLGLSL.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLGpu.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLGpu.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLGpuProgramCache.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLInterfaceAutogen.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLMakeNativeInterface_none.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLProgram.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLProgram.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLRenderTarget.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLRenderTarget.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLTexture.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLTexture.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLUtil.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/mac/GrGLMakeNativeInterface_mac.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/win/GrGLMakeNativeInterface_win.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/AAHairLinePathRenderer.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/AAHairLinePathRenderer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/DefaultPathRenderer.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/DefaultPathRenderer.h
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFDevice.cpp
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFDevice.h
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFDocument.cpp
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFFont.cpp
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFFont.h
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFGraphicState.cpp
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFMakeToUnicodeCmap.cpp
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFShader.cpp
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFShader.h
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFTypes.cpp
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFUtils.h
+FILE: ../../../flutter/third_party/skia/src/ports/SkGlobalInitialization_default.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkMemory_malloc.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkScalerContext_win_dw.cpp
+FILE: ../../../flutter/third_party/skia/src/shaders/SkBitmapProcShader.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/SkBitSet.h
+FILE: ../../../flutter/third_party/skia/src/utils/SkNWayCanvas.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/SkOSPath.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/SkParsePath.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/mac/SkCreateCGImageRef.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/win/SkAutoCoInitialize.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/win/SkAutoCoInitialize.h
+FILE: ../../../flutter/third_party/skia/src/utils/win/SkHRESULT.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/win/SkHRESULT.h
+FILE: ../../../flutter/third_party/skia/src/utils/win/SkIStream.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/win/SkIStream.h
+FILE: ../../../flutter/third_party/skia/src/utils/win/SkTScopedComPtr.h
+FILE: ../../../flutter/third_party/skia/src/xps/SkXPSDevice.cpp
+FILE: ../../../flutter/third_party/skia/src/xps/SkXPSDevice.h
 ----------------------------------------------------------------------------------------------------
-Copyright 2010 The Android Open Source Project
+Copyright 2011 Google Inc.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -1931,210 +1757,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/bench/AAClipBench.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkMemory_mozalloc.cpp + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/bench/AAClipBench.cpp
-FILE: ../../../third_party/skia/bench/Benchmark.cpp
-FILE: ../../../third_party/skia/bench/Benchmark.h
-FILE: ../../../third_party/skia/bench/BlurBench.cpp
-FILE: ../../../third_party/skia/bench/ChromeBench.cpp
-FILE: ../../../third_party/skia/bench/DashBench.cpp
-FILE: ../../../third_party/skia/bench/GradientBench.cpp
-FILE: ../../../third_party/skia/bench/MatrixBench.cpp
-FILE: ../../../third_party/skia/bench/MutexBench.cpp
-FILE: ../../../third_party/skia/bench/PathBench.cpp
-FILE: ../../../third_party/skia/bench/PathIterBench.cpp
-FILE: ../../../third_party/skia/bench/PicturePlaybackBench.cpp
-FILE: ../../../third_party/skia/bench/RectBench.cpp
-FILE: ../../../third_party/skia/bench/RegionBench.cpp
-FILE: ../../../third_party/skia/bench/RepeatTileBench.cpp
-FILE: ../../../third_party/skia/bench/ScalarBench.cpp
-FILE: ../../../third_party/skia/bench/VertBench.cpp
-FILE: ../../../third_party/skia/gm/aaclip.cpp
-FILE: ../../../third_party/skia/gm/aarectmodes.cpp
-FILE: ../../../third_party/skia/gm/arithmode.cpp
-FILE: ../../../third_party/skia/gm/bitmapcopy.cpp
-FILE: ../../../third_party/skia/gm/bitmapfilters.cpp
-FILE: ../../../third_party/skia/gm/bitmaprect.cpp
-FILE: ../../../third_party/skia/gm/blurs.cpp
-FILE: ../../../third_party/skia/gm/clip_strokerect.cpp
-FILE: ../../../third_party/skia/gm/color4f.cpp
-FILE: ../../../third_party/skia/gm/colormatrix.cpp
-FILE: ../../../third_party/skia/gm/complexclip.cpp
-FILE: ../../../third_party/skia/gm/complexclip2.cpp
-FILE: ../../../third_party/skia/gm/convexpaths.cpp
-FILE: ../../../third_party/skia/gm/cubicpaths.cpp
-FILE: ../../../third_party/skia/gm/degeneratesegments.cpp
-FILE: ../../../third_party/skia/gm/dftext.cpp
-FILE: ../../../third_party/skia/gm/drawbitmaprect.cpp
-FILE: ../../../third_party/skia/gm/emptypath.cpp
-FILE: ../../../third_party/skia/gm/encode.cpp
-FILE: ../../../third_party/skia/gm/filltypes.cpp
-FILE: ../../../third_party/skia/gm/filltypespersp.cpp
-FILE: ../../../third_party/skia/gm/filterindiabox.cpp
-FILE: ../../../third_party/skia/gm/fontscaler.cpp
-FILE: ../../../third_party/skia/gm/gammatext.cpp
-FILE: ../../../third_party/skia/gm/giantbitmap.cpp
-FILE: ../../../third_party/skia/gm/gm.cpp
-FILE: ../../../third_party/skia/gm/gm.h
-FILE: ../../../third_party/skia/gm/gradients.cpp
-FILE: ../../../third_party/skia/gm/gradtext.cpp
-FILE: ../../../third_party/skia/gm/hairmodes.cpp
-FILE: ../../../third_party/skia/gm/hittestpath.cpp
-FILE: ../../../third_party/skia/gm/image.cpp
-FILE: ../../../third_party/skia/gm/imageblur.cpp
-FILE: ../../../third_party/skia/gm/imageblur2.cpp
-FILE: ../../../third_party/skia/gm/imagefiltersbase.cpp
-FILE: ../../../third_party/skia/gm/imagefilterscropped.cpp
-FILE: ../../../third_party/skia/gm/lcdtext.cpp
-FILE: ../../../third_party/skia/gm/linepaths.cpp
-FILE: ../../../third_party/skia/gm/ninepatchstretch.cpp
-FILE: ../../../third_party/skia/gm/pathfill.cpp
-FILE: ../../../third_party/skia/gm/pathreverse.cpp
-FILE: ../../../third_party/skia/gm/points.cpp
-FILE: ../../../third_party/skia/gm/poly2poly.cpp
-FILE: ../../../third_party/skia/gm/quadpaths.cpp
-FILE: ../../../third_party/skia/gm/rasterhandleallocator.cpp
-FILE: ../../../third_party/skia/gm/shadertext3.cpp
-FILE: ../../../third_party/skia/gm/strokefill.cpp
-FILE: ../../../third_party/skia/gm/strokerects.cpp
-FILE: ../../../third_party/skia/gm/strokes.cpp
-FILE: ../../../third_party/skia/gm/tablecolorfilter.cpp
-FILE: ../../../third_party/skia/gm/texteffects.cpp
-FILE: ../../../third_party/skia/gm/tilemodes.cpp
-FILE: ../../../third_party/skia/gm/tilemodes_scaled.cpp
-FILE: ../../../third_party/skia/gm/tinybitmap.cpp
-FILE: ../../../third_party/skia/gm/xfermodes.cpp
-FILE: ../../../third_party/skia/include/core/SkData.h
-FILE: ../../../third_party/skia/include/core/SkImageEncoder.h
-FILE: ../../../third_party/skia/include/core/SkImageFilter.h
-FILE: ../../../third_party/skia/include/core/SkSize.h
-FILE: ../../../third_party/skia/include/effects/SkLayerDrawLooper.h
-FILE: ../../../third_party/skia/include/gpu/gl/GrGLConfig.h
-FILE: ../../../third_party/skia/include/gpu/gl/GrGLConfig_chrome.h
-FILE: ../../../third_party/skia/include/gpu/gl/GrGLInterface.h
-FILE: ../../../third_party/skia/include/ports/SkTypeface_mac.h
-FILE: ../../../third_party/skia/include/ports/SkTypeface_win.h
-FILE: ../../../third_party/skia/include/private/SkTArray.h
-FILE: ../../../third_party/skia/include/utils/SkNWayCanvas.h
-FILE: ../../../third_party/skia/include/utils/mac/SkCGUtils.h
-FILE: ../../../third_party/skia/samplecode/Sample.h
-FILE: ../../../third_party/skia/src/core/SkAAClip.cpp
-FILE: ../../../third_party/skia/src/core/SkAAClip.h
-FILE: ../../../third_party/skia/src/core/SkAdvancedTypefaceMetrics.h
-FILE: ../../../third_party/skia/src/core/SkBitmapProcState.cpp
-FILE: ../../../third_party/skia/src/core/SkBlitRow.h
-FILE: ../../../third_party/skia/src/core/SkBlitRow_D32.cpp
-FILE: ../../../third_party/skia/src/core/SkClipStack.cpp
-FILE: ../../../third_party/skia/src/core/SkClipStack.h
-FILE: ../../../third_party/skia/src/core/SkColorFilter_Matrix.cpp
-FILE: ../../../third_party/skia/src/core/SkConvertPixels.h
-FILE: ../../../third_party/skia/src/core/SkData.cpp
-FILE: ../../../third_party/skia/src/core/SkDevice.cpp
-FILE: ../../../third_party/skia/src/core/SkDrawProcs.h
-FILE: ../../../third_party/skia/src/core/SkEdgeBuilder.cpp
-FILE: ../../../third_party/skia/src/core/SkEdgeBuilder.h
-FILE: ../../../third_party/skia/src/core/SkFlattenable.cpp
-FILE: ../../../third_party/skia/src/core/SkFontStream.cpp
-FILE: ../../../third_party/skia/src/core/SkLineClipper.cpp
-FILE: ../../../third_party/skia/src/core/SkLineClipper.h
-FILE: ../../../third_party/skia/src/core/SkMallocPixelRef.cpp
-FILE: ../../../third_party/skia/src/core/SkPictureData.cpp
-FILE: ../../../third_party/skia/src/core/SkPictureData.h
-FILE: ../../../third_party/skia/src/core/SkPictureFlat.cpp
-FILE: ../../../third_party/skia/src/core/SkPictureFlat.h
-FILE: ../../../third_party/skia/src/core/SkPictureRecord.cpp
-FILE: ../../../third_party/skia/src/core/SkPictureRecord.h
-FILE: ../../../third_party/skia/src/core/SkPixelRef.cpp
-FILE: ../../../third_party/skia/src/core/SkPtrRecorder.cpp
-FILE: ../../../third_party/skia/src/core/SkReadBuffer.h
-FILE: ../../../third_party/skia/src/core/SkTLazy.h
-FILE: ../../../third_party/skia/src/core/SkTypefaceCache.cpp
-FILE: ../../../third_party/skia/src/core/SkTypefaceCache.h
-FILE: ../../../third_party/skia/src/core/SkUnPreMultiply.cpp
-FILE: ../../../third_party/skia/src/core/SkWriteBuffer.h
-FILE: ../../../third_party/skia/src/core/SkWriter32.cpp
-FILE: ../../../third_party/skia/src/effects/SkColorMatrix.cpp
-FILE: ../../../third_party/skia/src/effects/SkColorMatrixFilter.cpp
-FILE: ../../../third_party/skia/src/effects/SkLayerDrawLooper.cpp
-FILE: ../../../third_party/skia/src/effects/SkTableMaskFilter.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/Device.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrAttachment.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrAttachment.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrGpu.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrGpuResource.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrNativeRect.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrPaint.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrRenderTarget.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrRenderTarget.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrStencilSettings.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrTexture.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrTexture.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/PathRenderer.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/PathRenderer.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/PathRendererChain.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/PathRendererChain.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/geometry/GrPathUtils.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/geometry/GrPathUtils.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLAttachment.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLAttachment.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLDefines_impl.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLGLSL.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLGLSL.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLGpu.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLGpu.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLGpuProgramCache.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLInterfaceAutogen.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLMakeNativeInterface_none.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLProgram.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLProgram.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLRenderTarget.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLRenderTarget.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLTexture.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLTexture.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLUtil.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/mac/GrGLMakeNativeInterface_mac.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/win/GrGLMakeNativeInterface_win.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/AAHairLinePathRenderer.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/AAHairLinePathRenderer.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/DefaultPathRenderer.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/DefaultPathRenderer.h
-FILE: ../../../third_party/skia/src/gpu/gl/GrGLDefines.h
-FILE: ../../../third_party/skia/src/pdf/SkPDFDevice.cpp
-FILE: ../../../third_party/skia/src/pdf/SkPDFDevice.h
-FILE: ../../../third_party/skia/src/pdf/SkPDFDocument.cpp
-FILE: ../../../third_party/skia/src/pdf/SkPDFFont.cpp
-FILE: ../../../third_party/skia/src/pdf/SkPDFFont.h
-FILE: ../../../third_party/skia/src/pdf/SkPDFGraphicState.cpp
-FILE: ../../../third_party/skia/src/pdf/SkPDFMakeToUnicodeCmap.cpp
-FILE: ../../../third_party/skia/src/pdf/SkPDFShader.cpp
-FILE: ../../../third_party/skia/src/pdf/SkPDFShader.h
-FILE: ../../../third_party/skia/src/pdf/SkPDFTypes.cpp
-FILE: ../../../third_party/skia/src/pdf/SkPDFUtils.cpp
-FILE: ../../../third_party/skia/src/pdf/SkPDFUtils.h
-FILE: ../../../third_party/skia/src/ports/SkGlobalInitialization_default.cpp
-FILE: ../../../third_party/skia/src/ports/SkImageEncoder_WIC.cpp
-FILE: ../../../third_party/skia/src/ports/SkMemory_malloc.cpp
-FILE: ../../../third_party/skia/src/ports/SkScalerContext_win_dw.cpp
-FILE: ../../../third_party/skia/src/shaders/SkBitmapProcShader.cpp
-FILE: ../../../third_party/skia/src/utils/SkBitSet.h
-FILE: ../../../third_party/skia/src/utils/SkNWayCanvas.cpp
-FILE: ../../../third_party/skia/src/utils/SkOSPath.cpp
-FILE: ../../../third_party/skia/src/utils/SkParsePath.cpp
-FILE: ../../../third_party/skia/src/utils/mac/SkCreateCGImageRef.cpp
-FILE: ../../../third_party/skia/src/utils/win/SkAutoCoInitialize.cpp
-FILE: ../../../third_party/skia/src/utils/win/SkAutoCoInitialize.h
-FILE: ../../../third_party/skia/src/utils/win/SkHRESULT.cpp
-FILE: ../../../third_party/skia/src/utils/win/SkHRESULT.h
-FILE: ../../../third_party/skia/src/utils/win/SkIStream.cpp
-FILE: ../../../third_party/skia/src/utils/win/SkIStream.h
-FILE: ../../../third_party/skia/src/utils/win/SkTScopedComPtr.h
-FILE: ../../../third_party/skia/src/utils/win/SkWGL.h
-FILE: ../../../third_party/skia/src/utils/win/SkWGL_win.cpp
-FILE: ../../../third_party/skia/src/xps/SkXPSDevice.cpp
-FILE: ../../../third_party/skia/src/xps/SkXPSDevice.h
+FILE: ../../../flutter/third_party/skia/src/ports/SkMemory_mozalloc.cpp
 ----------------------------------------------------------------------------------------------------
 Copyright 2011 Google Inc.
+Copyright 2012 Mozilla Foundation
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -2167,12 +1795,23 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/src/ports/SkMemory_mozalloc.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkDrawLooper.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkScan.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkScan_Antihair.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkTypeface.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/imagefilters/SkBlurImageFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontMgr_android_parser.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontMgr_android_parser.h + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/src/ports/SkMemory_mozalloc.cpp
+FILE: ../../../flutter/third_party/skia/include/core/SkDrawLooper.h
+FILE: ../../../flutter/third_party/skia/src/core/SkScan.h
+FILE: ../../../flutter/third_party/skia/src/core/SkScan_Antihair.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkTypeface.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/imagefilters/SkBlurImageFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkFontMgr_android_parser.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkFontMgr_android_parser.h
 ----------------------------------------------------------------------------------------------------
-Copyright 2011 Google Inc.
-Copyright 2012 Mozilla Foundation
+Copyright 2011 The Android Open Source Project
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -2205,17 +1844,323 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/include/core/SkDrawLooper.h + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/bigmatrix.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/blurrect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/colorfilterimagefilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/composeshader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/dashcubics.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/dashing.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/distantclip.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/fatpathfill.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/getpostextpath.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/imagefiltersgraph.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/imagemagnifier.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/lighting.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/matrixconvolution.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/modecolorfilters.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/morphology.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/patheffects.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/pathinterior.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/rrect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/rrects.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/runtimeimagefilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/samplerstress.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/simpleaaclip.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/srcmode.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/strokerect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/typeface.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/verylargebitmap.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkAnnotation.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkImage.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkRRect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkStrokeRec.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkSurface.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/gl/GrGLFunctions.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/pathops/SkPathOps.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/SkPathRef.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/SkWeakRefCnt.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/utils/SkNullCanvas.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkMathPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkTInternalLList.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkColorPalette.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkAnnotation.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkChecksum.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkFontDescriptor.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkFontDescriptor.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkImagePriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMD5.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMD5.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMaskGamma.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMaskGamma.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPaintDefaults.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRRect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRTree.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRTree.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkReadBuffer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkStrokeRec.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkWriteBuffer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrMemoryPool.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrMemoryPool.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrProcessor.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrProcessor.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrProcessorUnitTest.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrSWMaskHelper.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrSWMaskHelper.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrShaderCaps.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrShaderCaps.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrSurface.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrSurface.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLCaps.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLCaps.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLProgramDataManager.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLProgramDataManager.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLUtil.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/image/SkImage_Ganesh.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/AAConvexPathRenderer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/AAConvexPathRenderer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/SoftwarePathRenderer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/SoftwarePathRenderer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/surface/SkSurface_Ganesh.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/image/SkImage.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/image/SkImage_Base.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/image/SkImage_Raster.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/image/SkSurface.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/image/SkSurface_Base.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/image/SkSurface_Raster.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/image/SkSurface_Raster.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkAddIntersections.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkAddIntersections.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkDCubicLineIntersection.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkDLineIntersection.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkDQuadLineIntersection.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkIntersectionHelper.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkIntersections.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkIntersections.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkLineParameters.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkOpAngle.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkOpAngle.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkOpCubicHull.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkOpEdgeBuilder.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkOpEdgeBuilder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkOpSegment.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkOpSegment.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkOpSpan.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkPathOpsBounds.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkPathOpsCommon.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkPathOpsCommon.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkPathOpsCubic.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkPathOpsCubic.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkPathOpsCurve.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkPathOpsLine.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkPathOpsLine.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkPathOpsOp.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkPathOpsPoint.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkPathOpsQuad.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkPathOpsQuad.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkPathOpsRect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkPathOpsRect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkPathOpsSimplify.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkPathOpsTypes.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkPathOpsTypes.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkPathWriter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkPathWriter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkReduceOrder.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkReduceOrder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sfnt/SkIBMFamilyClass.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sfnt/SkOTTableTypes.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_OS_2.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_OS_2_V0.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_OS_2_V1.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_OS_2_V2.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_OS_2_V3.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_OS_2_V4.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_OS_2_VA.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_glyf.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_head.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_hhea.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_loca.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_maxp.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_maxp_CFF.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_maxp_TT.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_name.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_post.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sfnt/SkOTUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sfnt/SkOTUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sfnt/SkPanose.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sfnt/SkSFNTHeader.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/gradients/SkConicalGradient.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/gradients/SkConicalGradient.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/gradients/SkGradientBaseShader.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/gradients/SkLinearGradient.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/gradients/SkLinearGradient.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/gradients/SkRadialGradient.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/gradients/SkSweepGradient.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkFloatUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkNullCanvas.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/win/SkDWriteFontFileStream.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/win/SkDWriteFontFileStream.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/win/SkDWriteGeometrySink.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/win/SkDWriteGeometrySink.h + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/include/core/SkDrawLooper.h
-FILE: ../../../third_party/skia/src/core/SkScan.h
-FILE: ../../../third_party/skia/src/core/SkScan_Antihair.cpp
-FILE: ../../../third_party/skia/src/core/SkTypeface.cpp
-FILE: ../../../third_party/skia/src/effects/imagefilters/SkBlurImageFilter.cpp
-FILE: ../../../third_party/skia/src/ports/SkFontMgr_android_parser.cpp
-FILE: ../../../third_party/skia/src/ports/SkFontMgr_android_parser.h
+FILE: ../../../flutter/third_party/skia/gm/bigmatrix.cpp
+FILE: ../../../flutter/third_party/skia/gm/blurrect.cpp
+FILE: ../../../flutter/third_party/skia/gm/colorfilterimagefilter.cpp
+FILE: ../../../flutter/third_party/skia/gm/composeshader.cpp
+FILE: ../../../flutter/third_party/skia/gm/dashcubics.cpp
+FILE: ../../../flutter/third_party/skia/gm/dashing.cpp
+FILE: ../../../flutter/third_party/skia/gm/distantclip.cpp
+FILE: ../../../flutter/third_party/skia/gm/fatpathfill.cpp
+FILE: ../../../flutter/third_party/skia/gm/getpostextpath.cpp
+FILE: ../../../flutter/third_party/skia/gm/imagefiltersgraph.cpp
+FILE: ../../../flutter/third_party/skia/gm/imagemagnifier.cpp
+FILE: ../../../flutter/third_party/skia/gm/lighting.cpp
+FILE: ../../../flutter/third_party/skia/gm/matrixconvolution.cpp
+FILE: ../../../flutter/third_party/skia/gm/modecolorfilters.cpp
+FILE: ../../../flutter/third_party/skia/gm/morphology.cpp
+FILE: ../../../flutter/third_party/skia/gm/patheffects.cpp
+FILE: ../../../flutter/third_party/skia/gm/pathinterior.cpp
+FILE: ../../../flutter/third_party/skia/gm/rrect.cpp
+FILE: ../../../flutter/third_party/skia/gm/rrects.cpp
+FILE: ../../../flutter/third_party/skia/gm/runtimeimagefilter.cpp
+FILE: ../../../flutter/third_party/skia/gm/samplerstress.cpp
+FILE: ../../../flutter/third_party/skia/gm/simpleaaclip.cpp
+FILE: ../../../flutter/third_party/skia/gm/srcmode.cpp
+FILE: ../../../flutter/third_party/skia/gm/strokerect.cpp
+FILE: ../../../flutter/third_party/skia/gm/typeface.cpp
+FILE: ../../../flutter/third_party/skia/gm/verylargebitmap.cpp
+FILE: ../../../flutter/third_party/skia/include/core/SkAnnotation.h
+FILE: ../../../flutter/third_party/skia/include/core/SkImage.h
+FILE: ../../../flutter/third_party/skia/include/core/SkRRect.h
+FILE: ../../../flutter/third_party/skia/include/core/SkStrokeRec.h
+FILE: ../../../flutter/third_party/skia/include/core/SkSurface.h
+FILE: ../../../flutter/third_party/skia/include/gpu/gl/GrGLFunctions.h
+FILE: ../../../flutter/third_party/skia/include/pathops/SkPathOps.h
+FILE: ../../../flutter/third_party/skia/include/private/SkPathRef.h
+FILE: ../../../flutter/third_party/skia/include/private/SkWeakRefCnt.h
+FILE: ../../../flutter/third_party/skia/include/utils/SkNullCanvas.h
+FILE: ../../../flutter/third_party/skia/src/base/SkMathPriv.h
+FILE: ../../../flutter/third_party/skia/src/base/SkTInternalLList.h
+FILE: ../../../flutter/third_party/skia/src/codec/SkColorPalette.h
+FILE: ../../../flutter/third_party/skia/src/core/SkAnnotation.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkChecksum.h
+FILE: ../../../flutter/third_party/skia/src/core/SkFontDescriptor.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkFontDescriptor.h
+FILE: ../../../flutter/third_party/skia/src/core/SkImagePriv.h
+FILE: ../../../flutter/third_party/skia/src/core/SkMD5.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkMD5.h
+FILE: ../../../flutter/third_party/skia/src/core/SkMaskGamma.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkMaskGamma.h
+FILE: ../../../flutter/third_party/skia/src/core/SkPaintDefaults.h
+FILE: ../../../flutter/third_party/skia/src/core/SkRRect.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkRTree.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkRTree.h
+FILE: ../../../flutter/third_party/skia/src/core/SkReadBuffer.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkStrokeRec.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkWriteBuffer.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrMemoryPool.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrMemoryPool.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrProcessor.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrProcessor.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrProcessorUnitTest.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrSWMaskHelper.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrSWMaskHelper.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrShaderCaps.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrShaderCaps.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrSurface.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrSurface.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLCaps.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLCaps.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLProgramDataManager.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLProgramDataManager.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLUtil.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/image/SkImage_Ganesh.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/AAConvexPathRenderer.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/AAConvexPathRenderer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/SoftwarePathRenderer.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/SoftwarePathRenderer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/surface/SkSurface_Ganesh.cpp
+FILE: ../../../flutter/third_party/skia/src/image/SkImage.cpp
+FILE: ../../../flutter/third_party/skia/src/image/SkImage_Base.h
+FILE: ../../../flutter/third_party/skia/src/image/SkImage_Raster.cpp
+FILE: ../../../flutter/third_party/skia/src/image/SkSurface.cpp
+FILE: ../../../flutter/third_party/skia/src/image/SkSurface_Base.h
+FILE: ../../../flutter/third_party/skia/src/image/SkSurface_Raster.cpp
+FILE: ../../../flutter/third_party/skia/src/image/SkSurface_Raster.h
+FILE: ../../../flutter/third_party/skia/src/pathops/SkAddIntersections.cpp
+FILE: ../../../flutter/third_party/skia/src/pathops/SkAddIntersections.h
+FILE: ../../../flutter/third_party/skia/src/pathops/SkDCubicLineIntersection.cpp
+FILE: ../../../flutter/third_party/skia/src/pathops/SkDLineIntersection.cpp
+FILE: ../../../flutter/third_party/skia/src/pathops/SkDQuadLineIntersection.cpp
+FILE: ../../../flutter/third_party/skia/src/pathops/SkIntersectionHelper.h
+FILE: ../../../flutter/third_party/skia/src/pathops/SkIntersections.cpp
+FILE: ../../../flutter/third_party/skia/src/pathops/SkIntersections.h
+FILE: ../../../flutter/third_party/skia/src/pathops/SkLineParameters.h
+FILE: ../../../flutter/third_party/skia/src/pathops/SkOpAngle.cpp
+FILE: ../../../flutter/third_party/skia/src/pathops/SkOpAngle.h
+FILE: ../../../flutter/third_party/skia/src/pathops/SkOpCubicHull.cpp
+FILE: ../../../flutter/third_party/skia/src/pathops/SkOpEdgeBuilder.cpp
+FILE: ../../../flutter/third_party/skia/src/pathops/SkOpEdgeBuilder.h
+FILE: ../../../flutter/third_party/skia/src/pathops/SkOpSegment.cpp
+FILE: ../../../flutter/third_party/skia/src/pathops/SkOpSegment.h
+FILE: ../../../flutter/third_party/skia/src/pathops/SkOpSpan.h
+FILE: ../../../flutter/third_party/skia/src/pathops/SkPathOpsBounds.h
+FILE: ../../../flutter/third_party/skia/src/pathops/SkPathOpsCommon.cpp
+FILE: ../../../flutter/third_party/skia/src/pathops/SkPathOpsCommon.h
+FILE: ../../../flutter/third_party/skia/src/pathops/SkPathOpsCubic.cpp
+FILE: ../../../flutter/third_party/skia/src/pathops/SkPathOpsCubic.h
+FILE: ../../../flutter/third_party/skia/src/pathops/SkPathOpsCurve.h
+FILE: ../../../flutter/third_party/skia/src/pathops/SkPathOpsLine.cpp
+FILE: ../../../flutter/third_party/skia/src/pathops/SkPathOpsLine.h
+FILE: ../../../flutter/third_party/skia/src/pathops/SkPathOpsOp.cpp
+FILE: ../../../flutter/third_party/skia/src/pathops/SkPathOpsPoint.h
+FILE: ../../../flutter/third_party/skia/src/pathops/SkPathOpsQuad.cpp
+FILE: ../../../flutter/third_party/skia/src/pathops/SkPathOpsQuad.h
+FILE: ../../../flutter/third_party/skia/src/pathops/SkPathOpsRect.cpp
+FILE: ../../../flutter/third_party/skia/src/pathops/SkPathOpsRect.h
+FILE: ../../../flutter/third_party/skia/src/pathops/SkPathOpsSimplify.cpp
+FILE: ../../../flutter/third_party/skia/src/pathops/SkPathOpsTypes.cpp
+FILE: ../../../flutter/third_party/skia/src/pathops/SkPathOpsTypes.h
+FILE: ../../../flutter/third_party/skia/src/pathops/SkPathWriter.cpp
+FILE: ../../../flutter/third_party/skia/src/pathops/SkPathWriter.h
+FILE: ../../../flutter/third_party/skia/src/pathops/SkReduceOrder.cpp
+FILE: ../../../flutter/third_party/skia/src/pathops/SkReduceOrder.h
+FILE: ../../../flutter/third_party/skia/src/sfnt/SkIBMFamilyClass.h
+FILE: ../../../flutter/third_party/skia/src/sfnt/SkOTTableTypes.h
+FILE: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_OS_2.h
+FILE: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_OS_2_V0.h
+FILE: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_OS_2_V1.h
+FILE: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_OS_2_V2.h
+FILE: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_OS_2_V3.h
+FILE: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_OS_2_V4.h
+FILE: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_OS_2_VA.h
+FILE: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_glyf.h
+FILE: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_head.h
+FILE: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_hhea.h
+FILE: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_loca.h
+FILE: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_maxp.h
+FILE: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_maxp_CFF.h
+FILE: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_maxp_TT.h
+FILE: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_name.h
+FILE: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_post.h
+FILE: ../../../flutter/third_party/skia/src/sfnt/SkOTUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/sfnt/SkOTUtils.h
+FILE: ../../../flutter/third_party/skia/src/sfnt/SkPanose.h
+FILE: ../../../flutter/third_party/skia/src/sfnt/SkSFNTHeader.h
+FILE: ../../../flutter/third_party/skia/src/shaders/gradients/SkConicalGradient.cpp
+FILE: ../../../flutter/third_party/skia/src/shaders/gradients/SkConicalGradient.h
+FILE: ../../../flutter/third_party/skia/src/shaders/gradients/SkGradientBaseShader.h
+FILE: ../../../flutter/third_party/skia/src/shaders/gradients/SkLinearGradient.cpp
+FILE: ../../../flutter/third_party/skia/src/shaders/gradients/SkLinearGradient.h
+FILE: ../../../flutter/third_party/skia/src/shaders/gradients/SkRadialGradient.cpp
+FILE: ../../../flutter/third_party/skia/src/shaders/gradients/SkSweepGradient.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/SkFloatUtils.h
+FILE: ../../../flutter/third_party/skia/src/utils/SkNullCanvas.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/win/SkDWriteFontFileStream.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/win/SkDWriteFontFileStream.h
+FILE: ../../../flutter/third_party/skia/src/utils/win/SkDWriteGeometrySink.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/win/SkDWriteGeometrySink.h
 ----------------------------------------------------------------------------------------------------
-Copyright 2011 The Android Open Source Project
+Copyright 2012 Google Inc.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -2248,181 +2193,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/bench/BenchLogger.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkBezierCurves.cpp + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/bench/BenchLogger.cpp
-FILE: ../../../third_party/skia/bench/BenchLogger.h
-FILE: ../../../third_party/skia/bench/ChecksumBench.cpp
-FILE: ../../../third_party/skia/bench/FilteringBench.cpp
-FILE: ../../../third_party/skia/bench/GameBench.cpp
-FILE: ../../../third_party/skia/bench/GrMemoryPoolBench.cpp
-FILE: ../../../third_party/skia/bench/LineBench.cpp
-FILE: ../../../third_party/skia/bench/Matrix44Bench.cpp
-FILE: ../../../third_party/skia/bench/MatrixConvolutionBench.cpp
-FILE: ../../../third_party/skia/bench/MorphologyBench.cpp
-FILE: ../../../third_party/skia/bench/ParagraphBench.cpp
-FILE: ../../../third_party/skia/bench/RTreeBench.cpp
-FILE: ../../../third_party/skia/bench/RefCntBench.cpp
-FILE: ../../../third_party/skia/bench/TableBench.cpp
-FILE: ../../../third_party/skia/gm/bigmatrix.cpp
-FILE: ../../../third_party/skia/gm/blurrect.cpp
-FILE: ../../../third_party/skia/gm/colorfilterimagefilter.cpp
-FILE: ../../../third_party/skia/gm/composeshader.cpp
-FILE: ../../../third_party/skia/gm/dashcubics.cpp
-FILE: ../../../third_party/skia/gm/dashing.cpp
-FILE: ../../../third_party/skia/gm/distantclip.cpp
-FILE: ../../../third_party/skia/gm/fatpathfill.cpp
-FILE: ../../../third_party/skia/gm/getpostextpath.cpp
-FILE: ../../../third_party/skia/gm/imagefiltersgraph.cpp
-FILE: ../../../third_party/skia/gm/imagemagnifier.cpp
-FILE: ../../../third_party/skia/gm/lighting.cpp
-FILE: ../../../third_party/skia/gm/matrixconvolution.cpp
-FILE: ../../../third_party/skia/gm/modecolorfilters.cpp
-FILE: ../../../third_party/skia/gm/morphology.cpp
-FILE: ../../../third_party/skia/gm/patheffects.cpp
-FILE: ../../../third_party/skia/gm/pathinterior.cpp
-FILE: ../../../third_party/skia/gm/rrect.cpp
-FILE: ../../../third_party/skia/gm/rrects.cpp
-FILE: ../../../third_party/skia/gm/runtimeimagefilter.cpp
-FILE: ../../../third_party/skia/gm/samplerstress.cpp
-FILE: ../../../third_party/skia/gm/simpleaaclip.cpp
-FILE: ../../../third_party/skia/gm/srcmode.cpp
-FILE: ../../../third_party/skia/gm/strokerect.cpp
-FILE: ../../../third_party/skia/gm/typeface.cpp
-FILE: ../../../third_party/skia/gm/verylargebitmap.cpp
-FILE: ../../../third_party/skia/include/core/SkAnnotation.h
-FILE: ../../../third_party/skia/include/core/SkImage.h
-FILE: ../../../third_party/skia/include/core/SkRRect.h
-FILE: ../../../third_party/skia/include/core/SkStrokeRec.h
-FILE: ../../../third_party/skia/include/core/SkSurface.h
-FILE: ../../../third_party/skia/include/gpu/gl/GrGLFunctions.h
-FILE: ../../../third_party/skia/include/pathops/SkPathOps.h
-FILE: ../../../third_party/skia/include/private/SkChecksum.h
-FILE: ../../../third_party/skia/include/private/SkPathRef.h
-FILE: ../../../third_party/skia/include/private/SkWeakRefCnt.h
-FILE: ../../../third_party/skia/include/utils/SkNullCanvas.h
-FILE: ../../../third_party/skia/src/codec/SkColorTable.h
-FILE: ../../../third_party/skia/src/core/SkAnnotation.cpp
-FILE: ../../../third_party/skia/src/core/SkFontDescriptor.cpp
-FILE: ../../../third_party/skia/src/core/SkFontDescriptor.h
-FILE: ../../../third_party/skia/src/core/SkImagePriv.h
-FILE: ../../../third_party/skia/src/core/SkMD5.cpp
-FILE: ../../../third_party/skia/src/core/SkMD5.h
-FILE: ../../../third_party/skia/src/core/SkMaskGamma.cpp
-FILE: ../../../third_party/skia/src/core/SkMaskGamma.h
-FILE: ../../../third_party/skia/src/core/SkMathPriv.h
-FILE: ../../../third_party/skia/src/core/SkPaintDefaults.h
-FILE: ../../../third_party/skia/src/core/SkRRect.cpp
-FILE: ../../../third_party/skia/src/core/SkRTree.cpp
-FILE: ../../../third_party/skia/src/core/SkRTree.h
-FILE: ../../../third_party/skia/src/core/SkReadBuffer.cpp
-FILE: ../../../third_party/skia/src/core/SkStrokeRec.cpp
-FILE: ../../../third_party/skia/src/core/SkTInternalLList.h
-FILE: ../../../third_party/skia/src/core/SkWriteBuffer.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrMemoryPool.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrMemoryPool.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrProcessor.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrProcessor.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrProcessorUnitTest.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrSWMaskHelper.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrSWMaskHelper.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrShaderCaps.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrShaderCaps.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrSurface.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrSurface.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrGaussianConvolutionFragmentProcessor.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrGaussianConvolutionFragmentProcessor.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLCaps.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLCaps.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLProgramDataManager.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLProgramDataManager.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLUtil.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/AAConvexPathRenderer.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/AAConvexPathRenderer.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/SoftwarePathRenderer.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/SoftwarePathRenderer.h
-FILE: ../../../third_party/skia/src/image/SkImage.cpp
-FILE: ../../../third_party/skia/src/image/SkImage_Base.h
-FILE: ../../../third_party/skia/src/image/SkImage_Gpu.cpp
-FILE: ../../../third_party/skia/src/image/SkImage_Raster.cpp
-FILE: ../../../third_party/skia/src/image/SkSurface.cpp
-FILE: ../../../third_party/skia/src/image/SkSurface_Base.h
-FILE: ../../../third_party/skia/src/image/SkSurface_Gpu.cpp
-FILE: ../../../third_party/skia/src/image/SkSurface_Raster.cpp
-FILE: ../../../third_party/skia/src/pathops/SkAddIntersections.cpp
-FILE: ../../../third_party/skia/src/pathops/SkAddIntersections.h
-FILE: ../../../third_party/skia/src/pathops/SkDCubicLineIntersection.cpp
-FILE: ../../../third_party/skia/src/pathops/SkDLineIntersection.cpp
-FILE: ../../../third_party/skia/src/pathops/SkDQuadLineIntersection.cpp
-FILE: ../../../third_party/skia/src/pathops/SkIntersectionHelper.h
-FILE: ../../../third_party/skia/src/pathops/SkIntersections.cpp
-FILE: ../../../third_party/skia/src/pathops/SkIntersections.h
-FILE: ../../../third_party/skia/src/pathops/SkLineParameters.h
-FILE: ../../../third_party/skia/src/pathops/SkOpAngle.cpp
-FILE: ../../../third_party/skia/src/pathops/SkOpAngle.h
-FILE: ../../../third_party/skia/src/pathops/SkOpCubicHull.cpp
-FILE: ../../../third_party/skia/src/pathops/SkOpEdgeBuilder.cpp
-FILE: ../../../third_party/skia/src/pathops/SkOpEdgeBuilder.h
-FILE: ../../../third_party/skia/src/pathops/SkOpSegment.cpp
-FILE: ../../../third_party/skia/src/pathops/SkOpSegment.h
-FILE: ../../../third_party/skia/src/pathops/SkOpSpan.h
-FILE: ../../../third_party/skia/src/pathops/SkPathOpsBounds.h
-FILE: ../../../third_party/skia/src/pathops/SkPathOpsCommon.cpp
-FILE: ../../../third_party/skia/src/pathops/SkPathOpsCommon.h
-FILE: ../../../third_party/skia/src/pathops/SkPathOpsCubic.cpp
-FILE: ../../../third_party/skia/src/pathops/SkPathOpsCubic.h
-FILE: ../../../third_party/skia/src/pathops/SkPathOpsCurve.h
-FILE: ../../../third_party/skia/src/pathops/SkPathOpsLine.cpp
-FILE: ../../../third_party/skia/src/pathops/SkPathOpsLine.h
-FILE: ../../../third_party/skia/src/pathops/SkPathOpsOp.cpp
-FILE: ../../../third_party/skia/src/pathops/SkPathOpsPoint.h
-FILE: ../../../third_party/skia/src/pathops/SkPathOpsQuad.cpp
-FILE: ../../../third_party/skia/src/pathops/SkPathOpsQuad.h
-FILE: ../../../third_party/skia/src/pathops/SkPathOpsRect.cpp
-FILE: ../../../third_party/skia/src/pathops/SkPathOpsRect.h
-FILE: ../../../third_party/skia/src/pathops/SkPathOpsSimplify.cpp
-FILE: ../../../third_party/skia/src/pathops/SkPathOpsTypes.cpp
-FILE: ../../../third_party/skia/src/pathops/SkPathOpsTypes.h
-FILE: ../../../third_party/skia/src/pathops/SkPathWriter.cpp
-FILE: ../../../third_party/skia/src/pathops/SkPathWriter.h
-FILE: ../../../third_party/skia/src/pathops/SkReduceOrder.cpp
-FILE: ../../../third_party/skia/src/pathops/SkReduceOrder.h
-FILE: ../../../third_party/skia/src/sfnt/SkIBMFamilyClass.h
-FILE: ../../../third_party/skia/src/sfnt/SkOTTableTypes.h
-FILE: ../../../third_party/skia/src/sfnt/SkOTTable_OS_2.h
-FILE: ../../../third_party/skia/src/sfnt/SkOTTable_OS_2_V0.h
-FILE: ../../../third_party/skia/src/sfnt/SkOTTable_OS_2_V1.h
-FILE: ../../../third_party/skia/src/sfnt/SkOTTable_OS_2_V2.h
-FILE: ../../../third_party/skia/src/sfnt/SkOTTable_OS_2_V3.h
-FILE: ../../../third_party/skia/src/sfnt/SkOTTable_OS_2_V4.h
-FILE: ../../../third_party/skia/src/sfnt/SkOTTable_OS_2_VA.h
-FILE: ../../../third_party/skia/src/sfnt/SkOTTable_glyf.h
-FILE: ../../../third_party/skia/src/sfnt/SkOTTable_head.h
-FILE: ../../../third_party/skia/src/sfnt/SkOTTable_hhea.h
-FILE: ../../../third_party/skia/src/sfnt/SkOTTable_loca.h
-FILE: ../../../third_party/skia/src/sfnt/SkOTTable_maxp.h
-FILE: ../../../third_party/skia/src/sfnt/SkOTTable_maxp_CFF.h
-FILE: ../../../third_party/skia/src/sfnt/SkOTTable_maxp_TT.h
-FILE: ../../../third_party/skia/src/sfnt/SkOTTable_name.h
-FILE: ../../../third_party/skia/src/sfnt/SkOTTable_post.h
-FILE: ../../../third_party/skia/src/sfnt/SkOTUtils.cpp
-FILE: ../../../third_party/skia/src/sfnt/SkOTUtils.h
-FILE: ../../../third_party/skia/src/sfnt/SkPanose.h
-FILE: ../../../third_party/skia/src/sfnt/SkSFNTHeader.h
-FILE: ../../../third_party/skia/src/shaders/gradients/SkGradientShaderBase.h
-FILE: ../../../third_party/skia/src/shaders/gradients/SkLinearGradient.cpp
-FILE: ../../../third_party/skia/src/shaders/gradients/SkLinearGradient.h
-FILE: ../../../third_party/skia/src/shaders/gradients/SkRadialGradient.cpp
-FILE: ../../../third_party/skia/src/shaders/gradients/SkSweepGradient.cpp
-FILE: ../../../third_party/skia/src/shaders/gradients/SkTwoPointConicalGradient.cpp
-FILE: ../../../third_party/skia/src/utils/SkFloatUtils.h
-FILE: ../../../third_party/skia/src/utils/SkNullCanvas.cpp
-FILE: ../../../third_party/skia/src/utils/win/SkDWriteFontFileStream.cpp
-FILE: ../../../third_party/skia/src/utils/win/SkDWriteFontFileStream.h
-FILE: ../../../third_party/skia/src/utils/win/SkDWriteGeometrySink.cpp
-FILE: ../../../third_party/skia/src/utils/win/SkDWriteGeometrySink.h
+FILE: ../../../flutter/third_party/skia/src/base/SkBezierCurves.cpp
 ----------------------------------------------------------------------------------------------------
-Copyright 2012 Google Inc.
+Copyright 2012 Google LLC
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -2455,19 +2230,23 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/bench/ReadPixBench.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkImageFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/imagefilters/SkColorFilterImageFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/imagefilters/SkLightingImageFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/imagefilters/SkMagnifierImageFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/imagefilters/SkMatrixConvolutionImageFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/imagefilters/SkMergeImageFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/imagefilters/SkMorphologyImageFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/encode/SkImageEncoderFns.h + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/bench/ReadPixBench.cpp
-FILE: ../../../third_party/skia/bench/WriterBench.cpp
-FILE: ../../../third_party/skia/src/core/SkImageFilter.cpp
-FILE: ../../../third_party/skia/src/core/SkUtilsArm.cpp
-FILE: ../../../third_party/skia/src/effects/imagefilters/SkColorFilterImageFilter.cpp
-FILE: ../../../third_party/skia/src/effects/imagefilters/SkLightingImageFilter.cpp
-FILE: ../../../third_party/skia/src/effects/imagefilters/SkMagnifierImageFilter.cpp
-FILE: ../../../third_party/skia/src/effects/imagefilters/SkMatrixConvolutionImageFilter.cpp
-FILE: ../../../third_party/skia/src/effects/imagefilters/SkMergeImageFilter.cpp
-FILE: ../../../third_party/skia/src/effects/imagefilters/SkMorphologyImageFilter.cpp
-FILE: ../../../third_party/skia/src/images/SkImageEncoderFns.h
+FILE: ../../../flutter/third_party/skia/src/core/SkImageFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/imagefilters/SkColorFilterImageFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/imagefilters/SkLightingImageFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/imagefilters/SkMagnifierImageFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/imagefilters/SkMatrixConvolutionImageFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/imagefilters/SkMergeImageFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/imagefilters/SkMorphologyImageFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/encode/SkImageEncoderFns.h
 ----------------------------------------------------------------------------------------------------
 Copyright 2012 The Android Open Source Project
 
@@ -2502,173 +2281,281 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/bench/BlendmodeBench.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/client_utils/android/FrontBufferedStream.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/client_utils/android/FrontBufferedStream.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/dm/DM.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/alphagradients.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/arcofzorro.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/beziereffects.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/bigblurs.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/bigtext.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/bitmappremul.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/bitmaprecttest.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/bitmapshader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/bleed.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/blurquickreject.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/blurroundrect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/circularclips.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/clippedbitmapshaders.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/coloremoji.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/conicpaths.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/copy_to_4444.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/displacement.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/dropshadowimagefilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/dstreadshuffle.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/fontcache.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/fontmgr.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/gradient_dirty_laundry.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/gradient_matrix.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/gradients_no_texture.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/hairlines.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/imagesource.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/internal_links.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/inversepaths.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/lumafilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/mixedtextblobs.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/nested.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/nonclosedpaths.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/offsetimagefilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/ovals.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/pathopsinverse.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/perlinnoise.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/pictureimagefilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/polygons.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/resizeimagefilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/roundrects.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/shallowgradient.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/skbug1719.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/spritebitmap.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/stringart.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/thinrects.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/thinstrokedrects.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/tileimagefilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/vertices.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/xfermodeimagefilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/xfermodes2.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/xfermodes3.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkDataTable.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkDocument.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkFontMgr.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkFontStyle.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkImageGenerator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkImageInfo.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/effects/SkLumaColorFilter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/effects/SkPerlinNoiseShader.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/gl/GrGLExtensions.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/ports/SkFontConfigInterface.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/SkJpegMetadataDecoder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkOnce.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkTFitsIn.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkTLogic.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/chromium/SkDiscardableMemory.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/gpu/ganesh/GrTypesPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/utils/SkCanvasStateUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBitmapDevice.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBitmapDevice.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkDataTable.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkDocument.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkDrawLooper.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkFontStream.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMatrixUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMessageBus.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMipmap.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMipmap.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPaintPriv.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPaintPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPathRef.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkResourceCache.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkResourceCache.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkStreamPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkStringUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkStringUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkTDynamicHash.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkTMultiMap.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkValidationUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/imagefilters/SkComposeImageFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/imagefilters/SkDisplacementMapImageFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/imagefilters/SkDropShadowImageFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/Blend.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/RectanizerSkyline.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrCaps.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrGeometryProcessor.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrPaint.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrBezierEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrBezierEffect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrBicubicEffect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrBitmapTextGeoProc.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrBitmapTextGeoProc.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrDistanceFieldGeoProc.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrDistanceFieldGeoProc.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLContext.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLContext.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLExtensions.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLVertexArray.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLVertexArray.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/GrOvalOpFactory.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/GrOvalOpFactory.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/lazy/SkDiscardableMemoryPool.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/lazy/SkDiscardableMemoryPool.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkOpCoincidence.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkOpContour.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkOpContour.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkPathOpsDebug.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkPathOpsDebug.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFResourceDict.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFResourceDict.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkDiscardableMemory_none.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontConfigTypeface.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontMgr_FontConfigInterface.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkOSFile_posix.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkOSFile_win.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_name.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sfnt/SkTTCFHeader.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkColorFilterShader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkPerlinNoiseShaderImpl.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkPerlinNoiseShaderImpl.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkPerlinNoiseShaderType.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkCanvasStack.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkCanvasStack.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkCanvasStateUtils.cpp + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/bench/BlendmodeBench.cpp
-FILE: ../../../third_party/skia/bench/BlurImageFilterBench.cpp
-FILE: ../../../third_party/skia/bench/BlurRectBench.cpp
-FILE: ../../../third_party/skia/bench/ChartBench.cpp
-FILE: ../../../third_party/skia/bench/CmapBench.cpp
-FILE: ../../../third_party/skia/bench/ColorFilterBench.cpp
-FILE: ../../../third_party/skia/bench/ColorPrivBench.cpp
-FILE: ../../../third_party/skia/bench/CoverageBench.cpp
-FILE: ../../../third_party/skia/bench/DisplacementBench.cpp
-FILE: ../../../third_party/skia/bench/FSRectBench.cpp
-FILE: ../../../third_party/skia/bench/FontCacheBench.cpp
-FILE: ../../../third_party/skia/bench/GrResourceCacheBench.cpp
-FILE: ../../../third_party/skia/bench/HairlinePathBench.cpp
-FILE: ../../../third_party/skia/bench/ImageCacheBench.cpp
-FILE: ../../../third_party/skia/bench/LightingBench.cpp
-FILE: ../../../third_party/skia/bench/MemsetBench.cpp
-FILE: ../../../third_party/skia/bench/MergeBench.cpp
-FILE: ../../../third_party/skia/bench/PerlinNoiseBench.cpp
-FILE: ../../../third_party/skia/bench/PremulAndUnpremulAlphaOpsBench.cpp
-FILE: ../../../third_party/skia/bench/RegionContainBench.cpp
-FILE: ../../../third_party/skia/bench/ResultsWriter.h
-FILE: ../../../third_party/skia/bench/SortBench.cpp
-FILE: ../../../third_party/skia/bench/TileBench.cpp
-FILE: ../../../third_party/skia/bench/WritePixelsBench.cpp
-FILE: ../../../third_party/skia/bench/gUniqueGlyphIDs.h
-FILE: ../../../third_party/skia/client_utils/android/FrontBufferedStream.cpp
-FILE: ../../../third_party/skia/client_utils/android/FrontBufferedStream.h
-FILE: ../../../third_party/skia/dm/DM.cpp
-FILE: ../../../third_party/skia/gm/alphagradients.cpp
-FILE: ../../../third_party/skia/gm/arcofzorro.cpp
-FILE: ../../../third_party/skia/gm/beziereffects.cpp
-FILE: ../../../third_party/skia/gm/bigblurs.cpp
-FILE: ../../../third_party/skia/gm/bigtext.cpp
-FILE: ../../../third_party/skia/gm/bitmappremul.cpp
-FILE: ../../../third_party/skia/gm/bitmaprecttest.cpp
-FILE: ../../../third_party/skia/gm/bitmapshader.cpp
-FILE: ../../../third_party/skia/gm/bleed.cpp
-FILE: ../../../third_party/skia/gm/blurquickreject.cpp
-FILE: ../../../third_party/skia/gm/blurroundrect.cpp
-FILE: ../../../third_party/skia/gm/circularclips.cpp
-FILE: ../../../third_party/skia/gm/clippedbitmapshaders.cpp
-FILE: ../../../third_party/skia/gm/coloremoji.cpp
-FILE: ../../../third_party/skia/gm/conicpaths.cpp
-FILE: ../../../third_party/skia/gm/copy_to_4444.cpp
-FILE: ../../../third_party/skia/gm/displacement.cpp
-FILE: ../../../third_party/skia/gm/dropshadowimagefilter.cpp
-FILE: ../../../third_party/skia/gm/dstreadshuffle.cpp
-FILE: ../../../third_party/skia/gm/fontcache.cpp
-FILE: ../../../third_party/skia/gm/fontmgr.cpp
-FILE: ../../../third_party/skia/gm/gradient_dirty_laundry.cpp
-FILE: ../../../third_party/skia/gm/gradient_matrix.cpp
-FILE: ../../../third_party/skia/gm/gradients_no_texture.cpp
-FILE: ../../../third_party/skia/gm/hairlines.cpp
-FILE: ../../../third_party/skia/gm/imagealphathreshold.cpp
-FILE: ../../../third_party/skia/gm/imagesource.cpp
-FILE: ../../../third_party/skia/gm/internal_links.cpp
-FILE: ../../../third_party/skia/gm/inversepaths.cpp
-FILE: ../../../third_party/skia/gm/lumafilter.cpp
-FILE: ../../../third_party/skia/gm/mixedtextblobs.cpp
-FILE: ../../../third_party/skia/gm/nested.cpp
-FILE: ../../../third_party/skia/gm/nonclosedpaths.cpp
-FILE: ../../../third_party/skia/gm/offsetimagefilter.cpp
-FILE: ../../../third_party/skia/gm/ovals.cpp
-FILE: ../../../third_party/skia/gm/pathopsinverse.cpp
-FILE: ../../../third_party/skia/gm/perlinnoise.cpp
-FILE: ../../../third_party/skia/gm/pictureimagefilter.cpp
-FILE: ../../../third_party/skia/gm/polygons.cpp
-FILE: ../../../third_party/skia/gm/resizeimagefilter.cpp
-FILE: ../../../third_party/skia/gm/roundrects.cpp
-FILE: ../../../third_party/skia/gm/shallowgradient.cpp
-FILE: ../../../third_party/skia/gm/skbug1719.cpp
-FILE: ../../../third_party/skia/gm/spritebitmap.cpp
-FILE: ../../../third_party/skia/gm/stringart.cpp
-FILE: ../../../third_party/skia/gm/thinrects.cpp
-FILE: ../../../third_party/skia/gm/thinstrokedrects.cpp
-FILE: ../../../third_party/skia/gm/tileimagefilter.cpp
-FILE: ../../../third_party/skia/gm/vertices.cpp
-FILE: ../../../third_party/skia/gm/xfermodeimagefilter.cpp
-FILE: ../../../third_party/skia/gm/xfermodes2.cpp
-FILE: ../../../third_party/skia/gm/xfermodes3.cpp
-FILE: ../../../third_party/skia/include/core/SkDataTable.h
-FILE: ../../../third_party/skia/include/core/SkDocument.h
-FILE: ../../../third_party/skia/include/core/SkFontMgr.h
-FILE: ../../../third_party/skia/include/core/SkFontStyle.h
-FILE: ../../../third_party/skia/include/core/SkImageGenerator.h
-FILE: ../../../third_party/skia/include/core/SkImageInfo.h
-FILE: ../../../third_party/skia/include/effects/SkLumaColorFilter.h
-FILE: ../../../third_party/skia/include/effects/SkPerlinNoiseShader.h
-FILE: ../../../third_party/skia/include/gpu/gl/GrGLExtensions.h
-FILE: ../../../third_party/skia/include/ports/SkFontConfigInterface.h
-FILE: ../../../third_party/skia/include/private/SkOnce.h
-FILE: ../../../third_party/skia/include/private/SkTFitsIn.h
-FILE: ../../../third_party/skia/include/private/SkTLogic.h
-FILE: ../../../third_party/skia/include/private/gpu/ganesh/GrTypesPriv.h
-FILE: ../../../third_party/skia/include/utils/SkCanvasStateUtils.h
-FILE: ../../../third_party/skia/src/core/SkBitmapDevice.cpp
-FILE: ../../../third_party/skia/src/core/SkBitmapDevice.h
-FILE: ../../../third_party/skia/src/core/SkDataTable.cpp
-FILE: ../../../third_party/skia/src/core/SkDiscardableMemory.h
-FILE: ../../../third_party/skia/src/core/SkDocument.cpp
-FILE: ../../../third_party/skia/src/core/SkDrawLooper.cpp
-FILE: ../../../third_party/skia/src/core/SkFontStream.h
-FILE: ../../../third_party/skia/src/core/SkGpuBlurUtils.cpp
-FILE: ../../../third_party/skia/src/core/SkGpuBlurUtils.h
-FILE: ../../../third_party/skia/src/core/SkMatrixUtils.h
-FILE: ../../../third_party/skia/src/core/SkMessageBus.h
-FILE: ../../../third_party/skia/src/core/SkMipmap.cpp
-FILE: ../../../third_party/skia/src/core/SkMipmap.h
-FILE: ../../../third_party/skia/src/core/SkPaintPriv.cpp
-FILE: ../../../third_party/skia/src/core/SkPaintPriv.h
-FILE: ../../../third_party/skia/src/core/SkPathRef.cpp
-FILE: ../../../third_party/skia/src/core/SkResourceCache.cpp
-FILE: ../../../third_party/skia/src/core/SkResourceCache.h
-FILE: ../../../third_party/skia/src/core/SkStreamPriv.h
-FILE: ../../../third_party/skia/src/core/SkStringUtils.cpp
-FILE: ../../../third_party/skia/src/core/SkStringUtils.h
-FILE: ../../../third_party/skia/src/core/SkTDynamicHash.h
-FILE: ../../../third_party/skia/src/core/SkTMultiMap.h
-FILE: ../../../third_party/skia/src/core/SkValidationUtils.h
-FILE: ../../../third_party/skia/src/effects/SkLumaColorFilter.cpp
-FILE: ../../../third_party/skia/src/effects/imagefilters/SkAlphaThresholdImageFilter.cpp
-FILE: ../../../third_party/skia/src/effects/imagefilters/SkComposeImageFilter.cpp
-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/Blend.h
-FILE: ../../../third_party/skia/src/gpu/RectanizerSkyline.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrCaps.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrGeometryProcessor.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrPaint.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrBezierEffect.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrBezierEffect.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrBicubicEffect.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrBitmapTextGeoProc.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrBitmapTextGeoProc.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrDistanceFieldGeoProc.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrDistanceFieldGeoProc.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLContext.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLContext.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLExtensions.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLVertexArray.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLVertexArray.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/GrOvalOpFactory.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/GrOvalOpFactory.h
-FILE: ../../../third_party/skia/src/lazy/SkDiscardableMemoryPool.cpp
-FILE: ../../../third_party/skia/src/lazy/SkDiscardableMemoryPool.h
-FILE: ../../../third_party/skia/src/pathops/SkOpCoincidence.h
-FILE: ../../../third_party/skia/src/pathops/SkOpContour.cpp
-FILE: ../../../third_party/skia/src/pathops/SkOpContour.h
-FILE: ../../../third_party/skia/src/pathops/SkPathOpsDebug.cpp
-FILE: ../../../third_party/skia/src/pathops/SkPathOpsDebug.h
-FILE: ../../../third_party/skia/src/pdf/SkPDFResourceDict.cpp
-FILE: ../../../third_party/skia/src/pdf/SkPDFResourceDict.h
-FILE: ../../../third_party/skia/src/ports/SkDiscardableMemory_none.cpp
-FILE: ../../../third_party/skia/src/ports/SkFontConfigTypeface.h
-FILE: ../../../third_party/skia/src/ports/SkFontMgr_FontConfigInterface.cpp
-FILE: ../../../third_party/skia/src/ports/SkOSFile_posix.cpp
-FILE: ../../../third_party/skia/src/ports/SkOSFile_win.cpp
-FILE: ../../../third_party/skia/src/sfnt/SkOTTable_name.cpp
-FILE: ../../../third_party/skia/src/sfnt/SkTTCFHeader.h
-FILE: ../../../third_party/skia/src/shaders/SkColorFilterShader.cpp
-FILE: ../../../third_party/skia/src/shaders/SkPerlinNoiseShader.cpp
-FILE: ../../../third_party/skia/src/utils/SkCanvasStack.cpp
-FILE: ../../../third_party/skia/src/utils/SkCanvasStack.h
-FILE: ../../../third_party/skia/src/utils/SkCanvasStateUtils.cpp
+FILE: ../../../flutter/third_party/skia/client_utils/android/FrontBufferedStream.cpp
+FILE: ../../../flutter/third_party/skia/client_utils/android/FrontBufferedStream.h
+FILE: ../../../flutter/third_party/skia/dm/DM.cpp
+FILE: ../../../flutter/third_party/skia/gm/alphagradients.cpp
+FILE: ../../../flutter/third_party/skia/gm/arcofzorro.cpp
+FILE: ../../../flutter/third_party/skia/gm/beziereffects.cpp
+FILE: ../../../flutter/third_party/skia/gm/bigblurs.cpp
+FILE: ../../../flutter/third_party/skia/gm/bigtext.cpp
+FILE: ../../../flutter/third_party/skia/gm/bitmappremul.cpp
+FILE: ../../../flutter/third_party/skia/gm/bitmaprecttest.cpp
+FILE: ../../../flutter/third_party/skia/gm/bitmapshader.cpp
+FILE: ../../../flutter/third_party/skia/gm/bleed.cpp
+FILE: ../../../flutter/third_party/skia/gm/blurquickreject.cpp
+FILE: ../../../flutter/third_party/skia/gm/blurroundrect.cpp
+FILE: ../../../flutter/third_party/skia/gm/circularclips.cpp
+FILE: ../../../flutter/third_party/skia/gm/clippedbitmapshaders.cpp
+FILE: ../../../flutter/third_party/skia/gm/coloremoji.cpp
+FILE: ../../../flutter/third_party/skia/gm/conicpaths.cpp
+FILE: ../../../flutter/third_party/skia/gm/copy_to_4444.cpp
+FILE: ../../../flutter/third_party/skia/gm/displacement.cpp
+FILE: ../../../flutter/third_party/skia/gm/dropshadowimagefilter.cpp
+FILE: ../../../flutter/third_party/skia/gm/dstreadshuffle.cpp
+FILE: ../../../flutter/third_party/skia/gm/fontcache.cpp
+FILE: ../../../flutter/third_party/skia/gm/fontmgr.cpp
+FILE: ../../../flutter/third_party/skia/gm/gradient_dirty_laundry.cpp
+FILE: ../../../flutter/third_party/skia/gm/gradient_matrix.cpp
+FILE: ../../../flutter/third_party/skia/gm/gradients_no_texture.cpp
+FILE: ../../../flutter/third_party/skia/gm/hairlines.cpp
+FILE: ../../../flutter/third_party/skia/gm/imagesource.cpp
+FILE: ../../../flutter/third_party/skia/gm/internal_links.cpp
+FILE: ../../../flutter/third_party/skia/gm/inversepaths.cpp
+FILE: ../../../flutter/third_party/skia/gm/lumafilter.cpp
+FILE: ../../../flutter/third_party/skia/gm/mixedtextblobs.cpp
+FILE: ../../../flutter/third_party/skia/gm/nested.cpp
+FILE: ../../../flutter/third_party/skia/gm/nonclosedpaths.cpp
+FILE: ../../../flutter/third_party/skia/gm/offsetimagefilter.cpp
+FILE: ../../../flutter/third_party/skia/gm/ovals.cpp
+FILE: ../../../flutter/third_party/skia/gm/pathopsinverse.cpp
+FILE: ../../../flutter/third_party/skia/gm/perlinnoise.cpp
+FILE: ../../../flutter/third_party/skia/gm/pictureimagefilter.cpp
+FILE: ../../../flutter/third_party/skia/gm/polygons.cpp
+FILE: ../../../flutter/third_party/skia/gm/resizeimagefilter.cpp
+FILE: ../../../flutter/third_party/skia/gm/roundrects.cpp
+FILE: ../../../flutter/third_party/skia/gm/shallowgradient.cpp
+FILE: ../../../flutter/third_party/skia/gm/skbug1719.cpp
+FILE: ../../../flutter/third_party/skia/gm/spritebitmap.cpp
+FILE: ../../../flutter/third_party/skia/gm/stringart.cpp
+FILE: ../../../flutter/third_party/skia/gm/thinrects.cpp
+FILE: ../../../flutter/third_party/skia/gm/thinstrokedrects.cpp
+FILE: ../../../flutter/third_party/skia/gm/tileimagefilter.cpp
+FILE: ../../../flutter/third_party/skia/gm/vertices.cpp
+FILE: ../../../flutter/third_party/skia/gm/xfermodeimagefilter.cpp
+FILE: ../../../flutter/third_party/skia/gm/xfermodes2.cpp
+FILE: ../../../flutter/third_party/skia/gm/xfermodes3.cpp
+FILE: ../../../flutter/third_party/skia/include/core/SkDataTable.h
+FILE: ../../../flutter/third_party/skia/include/core/SkDocument.h
+FILE: ../../../flutter/third_party/skia/include/core/SkFontMgr.h
+FILE: ../../../flutter/third_party/skia/include/core/SkFontStyle.h
+FILE: ../../../flutter/third_party/skia/include/core/SkImageGenerator.h
+FILE: ../../../flutter/third_party/skia/include/core/SkImageInfo.h
+FILE: ../../../flutter/third_party/skia/include/effects/SkLumaColorFilter.h
+FILE: ../../../flutter/third_party/skia/include/effects/SkPerlinNoiseShader.h
+FILE: ../../../flutter/third_party/skia/include/gpu/gl/GrGLExtensions.h
+FILE: ../../../flutter/third_party/skia/include/ports/SkFontConfigInterface.h
+FILE: ../../../flutter/third_party/skia/include/private/SkJpegMetadataDecoder.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkOnce.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkTFitsIn.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkTLogic.h
+FILE: ../../../flutter/third_party/skia/include/private/chromium/SkDiscardableMemory.h
+FILE: ../../../flutter/third_party/skia/include/private/gpu/ganesh/GrTypesPriv.h
+FILE: ../../../flutter/third_party/skia/include/utils/SkCanvasStateUtils.h
+FILE: ../../../flutter/third_party/skia/src/core/SkBitmapDevice.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkBitmapDevice.h
+FILE: ../../../flutter/third_party/skia/src/core/SkDataTable.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkDocument.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkDrawLooper.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkFontStream.h
+FILE: ../../../flutter/third_party/skia/src/core/SkMatrixUtils.h
+FILE: ../../../flutter/third_party/skia/src/core/SkMessageBus.h
+FILE: ../../../flutter/third_party/skia/src/core/SkMipmap.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkMipmap.h
+FILE: ../../../flutter/third_party/skia/src/core/SkPaintPriv.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkPaintPriv.h
+FILE: ../../../flutter/third_party/skia/src/core/SkPathRef.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkResourceCache.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkResourceCache.h
+FILE: ../../../flutter/third_party/skia/src/core/SkStreamPriv.h
+FILE: ../../../flutter/third_party/skia/src/core/SkStringUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkStringUtils.h
+FILE: ../../../flutter/third_party/skia/src/core/SkTDynamicHash.h
+FILE: ../../../flutter/third_party/skia/src/core/SkTMultiMap.h
+FILE: ../../../flutter/third_party/skia/src/core/SkValidationUtils.h
+FILE: ../../../flutter/third_party/skia/src/effects/imagefilters/SkComposeImageFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/imagefilters/SkDisplacementMapImageFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/imagefilters/SkDropShadowImageFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/Blend.h
+FILE: ../../../flutter/third_party/skia/src/gpu/RectanizerSkyline.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrCaps.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrGeometryProcessor.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrPaint.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrBezierEffect.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrBezierEffect.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrBicubicEffect.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrBitmapTextGeoProc.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrBitmapTextGeoProc.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrDistanceFieldGeoProc.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrDistanceFieldGeoProc.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLContext.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLContext.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLExtensions.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLVertexArray.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLVertexArray.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/GrOvalOpFactory.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/GrOvalOpFactory.h
+FILE: ../../../flutter/third_party/skia/src/lazy/SkDiscardableMemoryPool.cpp
+FILE: ../../../flutter/third_party/skia/src/lazy/SkDiscardableMemoryPool.h
+FILE: ../../../flutter/third_party/skia/src/pathops/SkOpCoincidence.h
+FILE: ../../../flutter/third_party/skia/src/pathops/SkOpContour.cpp
+FILE: ../../../flutter/third_party/skia/src/pathops/SkOpContour.h
+FILE: ../../../flutter/third_party/skia/src/pathops/SkPathOpsDebug.cpp
+FILE: ../../../flutter/third_party/skia/src/pathops/SkPathOpsDebug.h
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFResourceDict.cpp
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFResourceDict.h
+FILE: ../../../flutter/third_party/skia/src/ports/SkDiscardableMemory_none.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkFontConfigTypeface.h
+FILE: ../../../flutter/third_party/skia/src/ports/SkFontMgr_FontConfigInterface.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkOSFile_posix.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkOSFile_win.cpp
+FILE: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_name.cpp
+FILE: ../../../flutter/third_party/skia/src/sfnt/SkTTCFHeader.h
+FILE: ../../../flutter/third_party/skia/src/shaders/SkColorFilterShader.cpp
+FILE: ../../../flutter/third_party/skia/src/shaders/SkPerlinNoiseShaderImpl.cpp
+FILE: ../../../flutter/third_party/skia/src/shaders/SkPerlinNoiseShaderImpl.h
+FILE: ../../../flutter/third_party/skia/src/shaders/SkPerlinNoiseShaderType.h
+FILE: ../../../flutter/third_party/skia/src/utils/SkCanvasStack.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/SkCanvasStack.h
+FILE: ../../../flutter/third_party/skia/src/utils/SkCanvasStateUtils.cpp
 ----------------------------------------------------------------------------------------------------
 Copyright 2013 Google Inc.
 
@@ -2703,10 +2590,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/src/effects/imagefilters/SkBlendImageFilter.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/imagefilters/SkBlendImageFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/imagefilters/SkPictureImageFilter.cpp + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/src/effects/imagefilters/SkBlendImageFilter.cpp
-FILE: ../../../third_party/skia/src/effects/imagefilters/SkPictureImageFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/imagefilters/SkBlendImageFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/imagefilters/SkPictureImageFilter.cpp
 ----------------------------------------------------------------------------------------------------
 Copyright 2013 The Android Open Source Project
 
@@ -2741,190 +2629,333 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/bench/AlternatingColorPatternBench.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/dm/DMJsonWriter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/dm/DMJsonWriter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/aaa.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/beziers.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/blurcircles.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/clipdrawdraw.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/coloremoji_blendmodes.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/colorfilters.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/colorwheel.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/complexclip3.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/convexpolyclip.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/convexpolyeffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/discard.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/drrect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/emboss.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/filterfastbounds.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/glyph_pos.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/gradients_2pt_conical.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/grayscalejpg.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/imageblurtiled.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/imagefiltersclipped.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/imagefilterscropexpand.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/imagefiltersscaled.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/imageresizetiled.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/matriximagefilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/patch.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/picture.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/pictureshader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/pictureshadertile.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/recordopts.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/smallarc.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/stroketext.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/surface.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/tallstretchedbitmaps.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/texelsubset.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/textblob.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/textblobshader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/tiledscaledbitmap.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/variedtext.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/yuvtorgbsubset.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkBBHFactory.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkBlurTypes.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkDrawable.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkFont.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkPictureRecorder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkSurfaceProps.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkTextBlob.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/gl/GrGLAssembleInterface.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/ports/SkFontMgr_indirect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/ports/SkRemotableFontMgr.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkHalf.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkHalf.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBBHFactory.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBitmapCache.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBitmapCache.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkCachedData.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkCachedData.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkCanvasPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkConvertPixels.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkDistanceFieldGen.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkDistanceFieldGen.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkDrawable.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkFont.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkFont_serial.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkImageGenerator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMaskCache.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMaskCache.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPicturePlayback.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPicturePlayback.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPictureRecorder.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkReadPixelsRec.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRecord.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRecordDraw.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRecordDraw.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRecordOpts.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRecordOpts.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRecorder.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRecorder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRecords.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkSurfacePriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkTaskGroup.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkTaskGroup.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkTextBlob.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkVertState.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkVertState.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/fonts/SkFontMgr_indirect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/fonts/SkRemotableFontMgr.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/RectanizerPow2.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/RectanizerSkyline.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ResourceKey.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDefaultGeoProcFactory.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDefaultGeoProcFactory.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrFragmentProcessor.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrGeometryProcessor.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrGpuResource.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrGpuResourceCacheAccess.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrProcessorAnalysis.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrProcessorAnalysis.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrProgramDesc.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrResourceCache.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrResourceCache.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrTracing.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrXferProcessor.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrBicubicEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrConvexPolyEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrConvexPolyEffect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrCoverageSetOpXP.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrCoverageSetOpXP.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrDisableColorXP.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrDisableColorXP.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrOvalEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrOvalEffect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrPorterDuffXferProcessor.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrPorterDuffXferProcessor.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrRRectEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrRRectEffect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLAssembleInterface.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLTextureRenderTarget.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/android/GrGLMakeNativeInterface_android.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/builders/GrGLProgramBuilder.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/builders/GrGLProgramBuilder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/builders/GrGLShaderStringBuilder.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/builders/GrGLShaderStringBuilder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/egl/GrGLMakeEGLInterface.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/glx/GrGLMakeGLXInterface.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/iOS/GrGLMakeNativeInterface_iOS.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/glsl/GrGLSLShaderBuilder.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/glsl/GrGLSLShaderBuilder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/DashOp.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/DashOp.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/SmallPathRenderer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/surface/SkSurface_Ganesh.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkOpBuilder.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkOpSpan.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkPathOpsTSect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkPathOpsTSect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkPathOpsTightBounds.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontMgr_android.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontMgr_fontconfig.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontMgr_win_dw.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkRemotableFontMgr_win_dw.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkScalerContext_win_dw.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkTypeface_win_dw.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkTypeface_win_dw.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_EBDT.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_EBLC.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_EBSC.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_gasp.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkLocalMatrixShader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkLocalMatrixShader.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkPictureShader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkPictureShader.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkDashPath.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkDashPathPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkEventTracer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkMatrix22.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkMatrix22.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkPatchUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkPatchUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/win/SkDWrite.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/win/SkDWrite.h + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/bench/AlternatingColorPatternBench.cpp
-FILE: ../../../third_party/skia/bench/BezierBench.cpp
-FILE: ../../../third_party/skia/bench/BlurRectsBench.cpp
-FILE: ../../../third_party/skia/bench/GMBench.cpp
-FILE: ../../../third_party/skia/bench/GMBench.h
-FILE: ../../../third_party/skia/bench/GeometryBench.cpp
-FILE: ../../../third_party/skia/bench/ImageFilterCollapse.cpp
-FILE: ../../../third_party/skia/bench/ImageFilterDAGBench.cpp
-FILE: ../../../third_party/skia/bench/PatchBench.cpp
-FILE: ../../../third_party/skia/bench/PictureNestingBench.cpp
-FILE: ../../../third_party/skia/bench/RecordingBench.cpp
-FILE: ../../../third_party/skia/bench/RecordingBench.h
-FILE: ../../../third_party/skia/bench/RectanizerBench.cpp
-FILE: ../../../third_party/skia/bench/RotatedRectBench.cpp
-FILE: ../../../third_party/skia/bench/SKPBench.cpp
-FILE: ../../../third_party/skia/bench/SKPBench.h
-FILE: ../../../third_party/skia/bench/nanobench.cpp
-FILE: ../../../third_party/skia/dm/DMJsonWriter.cpp
-FILE: ../../../third_party/skia/dm/DMJsonWriter.h
-FILE: ../../../third_party/skia/gm/aaa.cpp
-FILE: ../../../third_party/skia/gm/beziers.cpp
-FILE: ../../../third_party/skia/gm/blurcircles.cpp
-FILE: ../../../third_party/skia/gm/clipdrawdraw.cpp
-FILE: ../../../third_party/skia/gm/coloremoji_blendmodes.cpp
-FILE: ../../../third_party/skia/gm/colorfilters.cpp
-FILE: ../../../third_party/skia/gm/colorwheel.cpp
-FILE: ../../../third_party/skia/gm/complexclip3.cpp
-FILE: ../../../third_party/skia/gm/convexpolyclip.cpp
-FILE: ../../../third_party/skia/gm/convexpolyeffect.cpp
-FILE: ../../../third_party/skia/gm/discard.cpp
-FILE: ../../../third_party/skia/gm/drrect.cpp
-FILE: ../../../third_party/skia/gm/emboss.cpp
-FILE: ../../../third_party/skia/gm/filterfastbounds.cpp
-FILE: ../../../third_party/skia/gm/glyph_pos.cpp
-FILE: ../../../third_party/skia/gm/gradients_2pt_conical.cpp
-FILE: ../../../third_party/skia/gm/grayscalejpg.cpp
-FILE: ../../../third_party/skia/gm/imageblurtiled.cpp
-FILE: ../../../third_party/skia/gm/imagefiltersclipped.cpp
-FILE: ../../../third_party/skia/gm/imagefilterscropexpand.cpp
-FILE: ../../../third_party/skia/gm/imagefiltersscaled.cpp
-FILE: ../../../third_party/skia/gm/imageresizetiled.cpp
-FILE: ../../../third_party/skia/gm/matriximagefilter.cpp
-FILE: ../../../third_party/skia/gm/patch.cpp
-FILE: ../../../third_party/skia/gm/picture.cpp
-FILE: ../../../third_party/skia/gm/pictureshader.cpp
-FILE: ../../../third_party/skia/gm/pictureshadertile.cpp
-FILE: ../../../third_party/skia/gm/recordopts.cpp
-FILE: ../../../third_party/skia/gm/smallarc.cpp
-FILE: ../../../third_party/skia/gm/stroketext.cpp
-FILE: ../../../third_party/skia/gm/surface.cpp
-FILE: ../../../third_party/skia/gm/tallstretchedbitmaps.cpp
-FILE: ../../../third_party/skia/gm/texelsubset.cpp
-FILE: ../../../third_party/skia/gm/textblob.cpp
-FILE: ../../../third_party/skia/gm/textblobshader.cpp
-FILE: ../../../third_party/skia/gm/tiledscaledbitmap.cpp
-FILE: ../../../third_party/skia/gm/variedtext.cpp
-FILE: ../../../third_party/skia/gm/yuvtorgbsubset.cpp
-FILE: ../../../third_party/skia/include/core/SkBBHFactory.h
-FILE: ../../../third_party/skia/include/core/SkBlurTypes.h
-FILE: ../../../third_party/skia/include/core/SkDrawable.h
-FILE: ../../../third_party/skia/include/core/SkFont.h
-FILE: ../../../third_party/skia/include/core/SkPictureRecorder.h
-FILE: ../../../third_party/skia/include/core/SkSurfaceProps.h
-FILE: ../../../third_party/skia/include/core/SkTextBlob.h
-FILE: ../../../third_party/skia/include/gpu/gl/GrGLAssembleInterface.h
-FILE: ../../../third_party/skia/include/ports/SkFontMgr_indirect.h
-FILE: ../../../third_party/skia/include/ports/SkRemotableFontMgr.h
-FILE: ../../../third_party/skia/include/private/SkHalf.h
-FILE: ../../../third_party/skia/src/core/SkBBHFactory.cpp
-FILE: ../../../third_party/skia/src/core/SkBitmapCache.cpp
-FILE: ../../../third_party/skia/src/core/SkBitmapCache.h
-FILE: ../../../third_party/skia/src/core/SkCachedData.cpp
-FILE: ../../../third_party/skia/src/core/SkCachedData.h
-FILE: ../../../third_party/skia/src/core/SkCanvasPriv.h
-FILE: ../../../third_party/skia/src/core/SkConvertPixels.cpp
-FILE: ../../../third_party/skia/src/core/SkDistanceFieldGen.cpp
-FILE: ../../../third_party/skia/src/core/SkDistanceFieldGen.h
-FILE: ../../../third_party/skia/src/core/SkDrawable.cpp
-FILE: ../../../third_party/skia/src/core/SkFont.cpp
-FILE: ../../../third_party/skia/src/core/SkFont_serial.cpp
-FILE: ../../../third_party/skia/src/core/SkHalf.cpp
-FILE: ../../../third_party/skia/src/core/SkImageGenerator.cpp
-FILE: ../../../third_party/skia/src/core/SkMaskCache.cpp
-FILE: ../../../third_party/skia/src/core/SkMaskCache.h
-FILE: ../../../third_party/skia/src/core/SkPicturePlayback.cpp
-FILE: ../../../third_party/skia/src/core/SkPicturePlayback.h
-FILE: ../../../third_party/skia/src/core/SkPictureRecorder.cpp
-FILE: ../../../third_party/skia/src/core/SkRecord.h
-FILE: ../../../third_party/skia/src/core/SkRecordDraw.cpp
-FILE: ../../../third_party/skia/src/core/SkRecordDraw.h
-FILE: ../../../third_party/skia/src/core/SkRecordOpts.cpp
-FILE: ../../../third_party/skia/src/core/SkRecordOpts.h
-FILE: ../../../third_party/skia/src/core/SkRecorder.cpp
-FILE: ../../../third_party/skia/src/core/SkRecorder.h
-FILE: ../../../third_party/skia/src/core/SkRecords.h
-FILE: ../../../third_party/skia/src/core/SkSurfacePriv.h
-FILE: ../../../third_party/skia/src/core/SkTaskGroup.cpp
-FILE: ../../../third_party/skia/src/core/SkTaskGroup.h
-FILE: ../../../third_party/skia/src/core/SkTextBlob.cpp
-FILE: ../../../third_party/skia/src/core/SkVertState.cpp
-FILE: ../../../third_party/skia/src/core/SkVertState.h
-FILE: ../../../third_party/skia/src/fonts/SkFontMgr_indirect.cpp
-FILE: ../../../third_party/skia/src/fonts/SkRemotableFontMgr.cpp
-FILE: ../../../third_party/skia/src/gpu/RectanizerPow2.h
-FILE: ../../../third_party/skia/src/gpu/RectanizerSkyline.h
-FILE: ../../../third_party/skia/src/gpu/ResourceKey.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrDefaultGeoProcFactory.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrDefaultGeoProcFactory.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrFragmentProcessor.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrGeometryProcessor.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrGpuResource.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrGpuResourceCacheAccess.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrProcessorAnalysis.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrProcessorAnalysis.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrProgramDesc.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrResourceCache.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrResourceCache.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrTracing.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrXferProcessor.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrBicubicEffect.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrConvexPolyEffect.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrConvexPolyEffect.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrCoverageSetOpXP.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrCoverageSetOpXP.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrDisableColorXP.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrDisableColorXP.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrMatrixConvolutionEffect.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrMatrixConvolutionEffect.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrOvalEffect.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrOvalEffect.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrPorterDuffXferProcessor.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrPorterDuffXferProcessor.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrRRectEffect.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrRRectEffect.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLAssembleInterface.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLTextureRenderTarget.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/android/GrGLMakeNativeInterface_android.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/builders/GrGLProgramBuilder.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/builders/GrGLProgramBuilder.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/builders/GrGLShaderStringBuilder.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/builders/GrGLShaderStringBuilder.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/egl/GrGLMakeEGLInterface.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/glx/GrGLMakeGLXInterface.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/iOS/GrGLMakeNativeInterface_iOS.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/glsl/GrGLSLShaderBuilder.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/glsl/GrGLSLShaderBuilder.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/DashOp.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/DashOp.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/SmallPathRenderer.h
-FILE: ../../../third_party/skia/src/image/SkReadPixelsRec.h
-FILE: ../../../third_party/skia/src/image/SkSurface_Gpu.h
-FILE: ../../../third_party/skia/src/pathops/SkOpBuilder.cpp
-FILE: ../../../third_party/skia/src/pathops/SkOpSpan.cpp
-FILE: ../../../third_party/skia/src/pathops/SkPathOpsTSect.cpp
-FILE: ../../../third_party/skia/src/pathops/SkPathOpsTSect.h
-FILE: ../../../third_party/skia/src/pathops/SkPathOpsTightBounds.cpp
-FILE: ../../../third_party/skia/src/ports/SkFontMgr_android.cpp
-FILE: ../../../third_party/skia/src/ports/SkFontMgr_fontconfig.cpp
-FILE: ../../../third_party/skia/src/ports/SkFontMgr_win_dw.cpp
-FILE: ../../../third_party/skia/src/ports/SkRemotableFontMgr_win_dw.cpp
-FILE: ../../../third_party/skia/src/ports/SkScalerContext_win_dw.h
-FILE: ../../../third_party/skia/src/ports/SkTypeface_win_dw.cpp
-FILE: ../../../third_party/skia/src/ports/SkTypeface_win_dw.h
-FILE: ../../../third_party/skia/src/sfnt/SkOTTable_EBDT.h
-FILE: ../../../third_party/skia/src/sfnt/SkOTTable_EBLC.h
-FILE: ../../../third_party/skia/src/sfnt/SkOTTable_EBSC.h
-FILE: ../../../third_party/skia/src/sfnt/SkOTTable_gasp.h
-FILE: ../../../third_party/skia/src/shaders/SkLocalMatrixShader.cpp
-FILE: ../../../third_party/skia/src/shaders/SkLocalMatrixShader.h
-FILE: ../../../third_party/skia/src/shaders/SkPictureShader.cpp
-FILE: ../../../third_party/skia/src/shaders/SkPictureShader.h
-FILE: ../../../third_party/skia/src/utils/SkDashPath.cpp
-FILE: ../../../third_party/skia/src/utils/SkDashPathPriv.h
-FILE: ../../../third_party/skia/src/utils/SkEventTracer.cpp
-FILE: ../../../third_party/skia/src/utils/SkMatrix22.cpp
-FILE: ../../../third_party/skia/src/utils/SkMatrix22.h
-FILE: ../../../third_party/skia/src/utils/SkPatchUtils.cpp
-FILE: ../../../third_party/skia/src/utils/SkPatchUtils.h
-FILE: ../../../third_party/skia/src/utils/win/SkDWrite.cpp
-FILE: ../../../third_party/skia/src/utils/win/SkDWrite.h
+FILE: ../../../flutter/third_party/skia/dm/DMJsonWriter.cpp
+FILE: ../../../flutter/third_party/skia/dm/DMJsonWriter.h
+FILE: ../../../flutter/third_party/skia/gm/aaa.cpp
+FILE: ../../../flutter/third_party/skia/gm/beziers.cpp
+FILE: ../../../flutter/third_party/skia/gm/blurcircles.cpp
+FILE: ../../../flutter/third_party/skia/gm/clipdrawdraw.cpp
+FILE: ../../../flutter/third_party/skia/gm/coloremoji_blendmodes.cpp
+FILE: ../../../flutter/third_party/skia/gm/colorfilters.cpp
+FILE: ../../../flutter/third_party/skia/gm/colorwheel.cpp
+FILE: ../../../flutter/third_party/skia/gm/complexclip3.cpp
+FILE: ../../../flutter/third_party/skia/gm/convexpolyclip.cpp
+FILE: ../../../flutter/third_party/skia/gm/convexpolyeffect.cpp
+FILE: ../../../flutter/third_party/skia/gm/discard.cpp
+FILE: ../../../flutter/third_party/skia/gm/drrect.cpp
+FILE: ../../../flutter/third_party/skia/gm/emboss.cpp
+FILE: ../../../flutter/third_party/skia/gm/filterfastbounds.cpp
+FILE: ../../../flutter/third_party/skia/gm/glyph_pos.cpp
+FILE: ../../../flutter/third_party/skia/gm/gradients_2pt_conical.cpp
+FILE: ../../../flutter/third_party/skia/gm/grayscalejpg.cpp
+FILE: ../../../flutter/third_party/skia/gm/imageblurtiled.cpp
+FILE: ../../../flutter/third_party/skia/gm/imagefiltersclipped.cpp
+FILE: ../../../flutter/third_party/skia/gm/imagefilterscropexpand.cpp
+FILE: ../../../flutter/third_party/skia/gm/imagefiltersscaled.cpp
+FILE: ../../../flutter/third_party/skia/gm/imageresizetiled.cpp
+FILE: ../../../flutter/third_party/skia/gm/matriximagefilter.cpp
+FILE: ../../../flutter/third_party/skia/gm/patch.cpp
+FILE: ../../../flutter/third_party/skia/gm/picture.cpp
+FILE: ../../../flutter/third_party/skia/gm/pictureshader.cpp
+FILE: ../../../flutter/third_party/skia/gm/pictureshadertile.cpp
+FILE: ../../../flutter/third_party/skia/gm/recordopts.cpp
+FILE: ../../../flutter/third_party/skia/gm/smallarc.cpp
+FILE: ../../../flutter/third_party/skia/gm/stroketext.cpp
+FILE: ../../../flutter/third_party/skia/gm/surface.cpp
+FILE: ../../../flutter/third_party/skia/gm/tallstretchedbitmaps.cpp
+FILE: ../../../flutter/third_party/skia/gm/texelsubset.cpp
+FILE: ../../../flutter/third_party/skia/gm/textblob.cpp
+FILE: ../../../flutter/third_party/skia/gm/textblobshader.cpp
+FILE: ../../../flutter/third_party/skia/gm/tiledscaledbitmap.cpp
+FILE: ../../../flutter/third_party/skia/gm/variedtext.cpp
+FILE: ../../../flutter/third_party/skia/gm/yuvtorgbsubset.cpp
+FILE: ../../../flutter/third_party/skia/include/core/SkBBHFactory.h
+FILE: ../../../flutter/third_party/skia/include/core/SkBlurTypes.h
+FILE: ../../../flutter/third_party/skia/include/core/SkDrawable.h
+FILE: ../../../flutter/third_party/skia/include/core/SkFont.h
+FILE: ../../../flutter/third_party/skia/include/core/SkPictureRecorder.h
+FILE: ../../../flutter/third_party/skia/include/core/SkSurfaceProps.h
+FILE: ../../../flutter/third_party/skia/include/core/SkTextBlob.h
+FILE: ../../../flutter/third_party/skia/include/gpu/gl/GrGLAssembleInterface.h
+FILE: ../../../flutter/third_party/skia/include/ports/SkFontMgr_indirect.h
+FILE: ../../../flutter/third_party/skia/include/ports/SkRemotableFontMgr.h
+FILE: ../../../flutter/third_party/skia/src/base/SkHalf.cpp
+FILE: ../../../flutter/third_party/skia/src/base/SkHalf.h
+FILE: ../../../flutter/third_party/skia/src/core/SkBBHFactory.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkBitmapCache.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkBitmapCache.h
+FILE: ../../../flutter/third_party/skia/src/core/SkCachedData.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkCachedData.h
+FILE: ../../../flutter/third_party/skia/src/core/SkCanvasPriv.h
+FILE: ../../../flutter/third_party/skia/src/core/SkConvertPixels.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkDistanceFieldGen.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkDistanceFieldGen.h
+FILE: ../../../flutter/third_party/skia/src/core/SkDrawable.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkFont.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkFont_serial.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkImageGenerator.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkMaskCache.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkMaskCache.h
+FILE: ../../../flutter/third_party/skia/src/core/SkPicturePlayback.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkPicturePlayback.h
+FILE: ../../../flutter/third_party/skia/src/core/SkPictureRecorder.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkReadPixelsRec.h
+FILE: ../../../flutter/third_party/skia/src/core/SkRecord.h
+FILE: ../../../flutter/third_party/skia/src/core/SkRecordDraw.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkRecordDraw.h
+FILE: ../../../flutter/third_party/skia/src/core/SkRecordOpts.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkRecordOpts.h
+FILE: ../../../flutter/third_party/skia/src/core/SkRecorder.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkRecorder.h
+FILE: ../../../flutter/third_party/skia/src/core/SkRecords.h
+FILE: ../../../flutter/third_party/skia/src/core/SkSurfacePriv.h
+FILE: ../../../flutter/third_party/skia/src/core/SkTaskGroup.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkTaskGroup.h
+FILE: ../../../flutter/third_party/skia/src/core/SkTextBlob.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkVertState.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkVertState.h
+FILE: ../../../flutter/third_party/skia/src/fonts/SkFontMgr_indirect.cpp
+FILE: ../../../flutter/third_party/skia/src/fonts/SkRemotableFontMgr.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/RectanizerPow2.h
+FILE: ../../../flutter/third_party/skia/src/gpu/RectanizerSkyline.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ResourceKey.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDefaultGeoProcFactory.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDefaultGeoProcFactory.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrFragmentProcessor.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrGeometryProcessor.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrGpuResource.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrGpuResourceCacheAccess.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrProcessorAnalysis.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrProcessorAnalysis.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrProgramDesc.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrResourceCache.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrResourceCache.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrTracing.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrXferProcessor.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrBicubicEffect.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrConvexPolyEffect.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrConvexPolyEffect.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrCoverageSetOpXP.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrCoverageSetOpXP.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrDisableColorXP.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrDisableColorXP.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrOvalEffect.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrOvalEffect.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrPorterDuffXferProcessor.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrPorterDuffXferProcessor.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrRRectEffect.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrRRectEffect.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLAssembleInterface.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLTextureRenderTarget.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/android/GrGLMakeNativeInterface_android.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/builders/GrGLProgramBuilder.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/builders/GrGLProgramBuilder.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/builders/GrGLShaderStringBuilder.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/builders/GrGLShaderStringBuilder.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/egl/GrGLMakeEGLInterface.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/glx/GrGLMakeGLXInterface.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/iOS/GrGLMakeNativeInterface_iOS.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/glsl/GrGLSLShaderBuilder.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/glsl/GrGLSLShaderBuilder.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/DashOp.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/DashOp.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/SmallPathRenderer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/surface/SkSurface_Ganesh.h
+FILE: ../../../flutter/third_party/skia/src/pathops/SkOpBuilder.cpp
+FILE: ../../../flutter/third_party/skia/src/pathops/SkOpSpan.cpp
+FILE: ../../../flutter/third_party/skia/src/pathops/SkPathOpsTSect.cpp
+FILE: ../../../flutter/third_party/skia/src/pathops/SkPathOpsTSect.h
+FILE: ../../../flutter/third_party/skia/src/pathops/SkPathOpsTightBounds.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkFontMgr_android.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkFontMgr_fontconfig.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkFontMgr_win_dw.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkRemotableFontMgr_win_dw.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkScalerContext_win_dw.h
+FILE: ../../../flutter/third_party/skia/src/ports/SkTypeface_win_dw.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkTypeface_win_dw.h
+FILE: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_EBDT.h
+FILE: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_EBLC.h
+FILE: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_EBSC.h
+FILE: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_gasp.h
+FILE: ../../../flutter/third_party/skia/src/shaders/SkLocalMatrixShader.cpp
+FILE: ../../../flutter/third_party/skia/src/shaders/SkLocalMatrixShader.h
+FILE: ../../../flutter/third_party/skia/src/shaders/SkPictureShader.cpp
+FILE: ../../../flutter/third_party/skia/src/shaders/SkPictureShader.h
+FILE: ../../../flutter/third_party/skia/src/utils/SkDashPath.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/SkDashPathPriv.h
+FILE: ../../../flutter/third_party/skia/src/utils/SkEventTracer.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/SkMatrix22.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/SkMatrix22.h
+FILE: ../../../flutter/third_party/skia/src/utils/SkPatchUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/SkPatchUtils.h
+FILE: ../../../flutter/third_party/skia/src/utils/win/SkDWrite.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/win/SkDWrite.h
 ----------------------------------------------------------------------------------------------------
 Copyright 2014 Google Inc.
 
@@ -2959,9 +2990,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/src/gpu/ganesh/ops/SmallPathRenderer.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/SmallPathRenderer.cpp + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/SmallPathRenderer.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/SmallPathRenderer.cpp
 ----------------------------------------------------------------------------------------------------
 Copyright 2014 Google Inc.
 Copyright 2017 ARM Ltd.
@@ -2997,9 +3028,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/src/effects/imagefilters/SkMatrixTransformImageFilter.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/imagefilters/SkMatrixTransformImageFilter.cpp + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/src/effects/imagefilters/SkMatrixTransformImageFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/imagefilters/SkMatrixTransformImageFilter.cpp
 ----------------------------------------------------------------------------------------------------
 Copyright 2014 The Android Open Source Project
 
@@ -3034,318 +3065,567 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/bench/BigPathBench.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/client_utils/android/BRDAllocator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/client_utils/android/BitmapRegionDecoder.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/client_utils/android/BitmapRegionDecoder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/client_utils/android/BitmapRegionDecoderPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/dm/DMSrcSink.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/dm/DMSrcSink.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/aaxfermodes.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/addarc.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/all_bitmap_configs.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/anisotropic.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/annotated_text.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/badpaint.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/bigrrectaaeffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/bigtileimagefilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/blend.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/blurredclippedcircle.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/bmpfilterqualityrepeat.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/concavepaths.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/constcolorprocessor.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/convex_all_line_paths.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/draw_bitmap_rect_skbug4374.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/drawable.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/drawatlas.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/drawatlascolor.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/drawminibitmaprect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/fadefilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/fontscalerdistortable.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/image_pict.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/image_shader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/imagefilters.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/imagefiltersstroked.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/imagefilterstransformed.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/imagefromyuvtextures.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/imagesource2.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/largeglyphblur.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/lcdblendmodes.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/lcdoverlap.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/localmatriximagefilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/localmatriximageshader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/mipmap.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/path_stroke_with_zero_length.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/pathcontourstart.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/pdf_never_embed.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/perspshaders.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/pictureimagegenerator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/plus.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/repeated_bitmap.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/scaledstrokes.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/skbug_257.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/smallpaths.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/stlouisarch.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/textblobcolortrans.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/textblobgeometrychange.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/textblobmixedsizes.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/textblobrandomfont.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/textblobtransforms.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/textblobuseaftergpufree.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/transparency.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/codec/SkAndroidCodec.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/codec/SkCodec.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/codec/SkEncodedImageFormat.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/codec/SkPngChunkReader.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkPathBuilder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkPixmap.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkPoint3.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkRSXform.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkTraceMemoryDump.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/GrContextOptions.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/gl/GrGLTypes.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/ports/SkFontMgr_android.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/ports/SkFontMgr_directory.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/ports/SkFontMgr_empty.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/ports/SkFontMgr_fontconfig.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkMutex.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkSemaphore.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkThreadID.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/svg/SkSVGCanvas.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/utils/SkPaintFilterCanvas.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkSemaphore.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkSharedMutex.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkSharedMutex.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkSpinlock.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkSpinlock.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkTDPQueue.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkThreadID.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkAndroidCodec.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkAndroidCodecAdapter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkAndroidCodecAdapter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkBmpCodec.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkBmpCodec.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkBmpMaskCodec.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkBmpMaskCodec.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkBmpRLECodec.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkBmpRLECodec.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkBmpStandardCodec.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkBmpStandardCodec.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkCodec.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkCodecImageGenerator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkCodecImageGenerator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkIcoCodec.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkIcoCodec.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkJpegCodec.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkJpegCodec.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkJpegDecoderMgr.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkJpegDecoderMgr.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkJpegUtility.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkJpegUtility.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkMaskSwizzler.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkMaskSwizzler.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkPixmapUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkPixmapUtilsPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkPngCodec.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkPngCodec.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkSampledCodec.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkSampledCodec.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkSampler.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkSampler.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkSwizzler.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkSwizzler.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkWbmpCodec.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkWbmpCodec.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkWebpCodec.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkWebpCodec.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/Sk4px.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBigPicture.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBigPicture.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkFontMgr.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkLatticeIter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkLatticeIter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkLocalMatrixImageFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMasks.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMasks.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMipmapAccessor.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMipmapAccessor.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkNextID.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkOpts.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkOpts.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPathBuilder.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPathPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPixmap.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPoint3.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRecord.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRecordPattern.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRecords.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkTHash.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkYUVPlanesCache.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkYUVPlanesCache.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/colorfilters/SkTableColorFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/colorfilters/SkTableColorFilter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/imagefilters/SkImageImageFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/Blend.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/Device_drawTexture.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrAutoLocaleSetter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBlurUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBlurUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrCaps.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDrawOpAtlas.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDrawOpAtlas.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDrawOpTest.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDrawOpTest.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDrawingManager.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDrawingManager.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrFragmentProcessor.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrGpuResourcePriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrManagedResource.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrNonAtomicRef.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrOpFlushState.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrOpFlushState.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrPipeline.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrPipeline.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrProcessorUnitTest.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrResourceProvider.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrResourceProvider.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrSamplerState.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrSimpleMesh.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrTTopoSort.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrTestUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrTestUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrXferProcessor.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/SurfaceDrawContext.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/SurfaceDrawContext.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrBlendFragmentProcessor.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrBlendFragmentProcessor.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrCustomXfermode.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrCustomXfermode.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrAAConvexTessellator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrAAConvexTessellator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrQuad.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrTriangulator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrTriangulator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLTextureRenderTarget.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLUniformHandler.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLUniformHandler.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLVaryingHandler.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/glsl/GrGLSLBlend.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/glsl/GrGLSLBlend.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/glsl/GrGLSLProgramBuilder.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/glsl/GrGLSLProgramBuilder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/glsl/GrGLSLUniformHandler.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/glsl/GrGLSLVarying.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/glsl/GrGLSLVarying.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/image/SkImage_Ganesh.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/AALinearizingConvexPathRenderer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/AALinearizingConvexPathRenderer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/AtlasTextOp.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/AtlasTextOp.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/ClearOp.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/DashLinePathRenderer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/DashLinePathRenderer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/DrawAtlasOp.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/DrawAtlasOp.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/GrDrawOp.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/GrMeshDrawOp.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/GrMeshDrawOp.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/GrOp.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/GrOp.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/LatticeOp.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/LatticeOp.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/TriangulatingPathRenderer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/TriangulatingPathRenderer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkCaps.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkCaps.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkCommandBuffer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkCommandBuffer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkGpu.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkGpu.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkImage.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkImage.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkRenderPass.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkRenderPass.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkRenderTarget.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkRenderTarget.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkTexture.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkTexture.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkTextureRenderTarget.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkTextureRenderTarget.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkUtil.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkUtil.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/vk/VulkanInterface.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/vk/VulkanInterface.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/vk/VulkanMemory.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/vk/VulkanMemory.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/image/SkImage_Lazy.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/image/SkPictureImageGenerator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/opts/SkBlitMask_opts.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/opts/SkBlitRow_opts.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkDConicLineIntersection.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkDCubicToQuads.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkOpCoincidence.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkPathOpsConic.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkPathOpsConic.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkPathOpsCurve.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkPathOpsWinding.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkDocument_PDF_None.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkJpegInfo.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkJpegInfo_libjpegturbo.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkJpegInfo_none.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFBitmap.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFBitmap.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFMetadata.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFMetadata.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkOSLibrary.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkOSLibrary_posix.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkOSLibrary_win.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkImageShader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkImageShader.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/svg/SkSVGCanvas.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/svg/SkSVGDevice.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/svg/SkSVGDevice.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/text/gpu/DistanceFieldAdjustTable.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/text/gpu/DistanceFieldAdjustTable.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/text/gpu/StrikeCache.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/text/gpu/StrikeCache.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/text/gpu/TextBlob.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/text/gpu/TextBlob.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/text/gpu/TextBlobRedrawCoordinator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/text/gpu/TextBlobRedrawCoordinator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkPaintFilterCanvas.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/xps/SkXPSDocument.cpp + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/bench/BigPathBench.cpp
-FILE: ../../../third_party/skia/bench/BitmapRegionDecoderBench.cpp
-FILE: ../../../third_party/skia/bench/BitmapRegionDecoderBench.h
-FILE: ../../../third_party/skia/bench/CodecBench.cpp
-FILE: ../../../third_party/skia/bench/CodecBench.h
-FILE: ../../../third_party/skia/bench/CodecBenchPriv.h
-FILE: ../../../third_party/skia/bench/ControlBench.cpp
-FILE: ../../../third_party/skia/bench/DrawBitmapAABench.cpp
-FILE: ../../../third_party/skia/bench/ImageBench.cpp
-FILE: ../../../third_party/skia/bench/InterpBench.cpp
-FILE: ../../../third_party/skia/bench/MathBench.cpp
-FILE: ../../../third_party/skia/bench/MipmapBench.cpp
-FILE: ../../../third_party/skia/bench/PictureOverheadBench.cpp
-FILE: ../../../third_party/skia/bench/SKPAnimationBench.cpp
-FILE: ../../../third_party/skia/bench/SKPAnimationBench.h
-FILE: ../../../third_party/skia/bench/Sk4fBench.cpp
-FILE: ../../../third_party/skia/bench/SkGlyphCacheBench.cpp
-FILE: ../../../third_party/skia/bench/StrokeBench.cpp
-FILE: ../../../third_party/skia/bench/TextBlobBench.cpp
-FILE: ../../../third_party/skia/bench/TopoSortBench.cpp
-FILE: ../../../third_party/skia/bench/nanobench.h
-FILE: ../../../third_party/skia/client_utils/android/BRDAllocator.h
-FILE: ../../../third_party/skia/client_utils/android/BitmapRegionDecoder.cpp
-FILE: ../../../third_party/skia/client_utils/android/BitmapRegionDecoder.h
-FILE: ../../../third_party/skia/client_utils/android/BitmapRegionDecoderPriv.h
-FILE: ../../../third_party/skia/dm/DMSrcSink.cpp
-FILE: ../../../third_party/skia/dm/DMSrcSink.h
-FILE: ../../../third_party/skia/experimental/tools/coreGraphicsPdf2png.cpp
-FILE: ../../../third_party/skia/gm/aaxfermodes.cpp
-FILE: ../../../third_party/skia/gm/addarc.cpp
-FILE: ../../../third_party/skia/gm/all_bitmap_configs.cpp
-FILE: ../../../third_party/skia/gm/anisotropic.cpp
-FILE: ../../../third_party/skia/gm/annotated_text.cpp
-FILE: ../../../third_party/skia/gm/badpaint.cpp
-FILE: ../../../third_party/skia/gm/bigrrectaaeffect.cpp
-FILE: ../../../third_party/skia/gm/bigtileimagefilter.cpp
-FILE: ../../../third_party/skia/gm/blend.cpp
-FILE: ../../../third_party/skia/gm/blurredclippedcircle.cpp
-FILE: ../../../third_party/skia/gm/bmpfilterqualityrepeat.cpp
-FILE: ../../../third_party/skia/gm/concavepaths.cpp
-FILE: ../../../third_party/skia/gm/constcolorprocessor.cpp
-FILE: ../../../third_party/skia/gm/convex_all_line_paths.cpp
-FILE: ../../../third_party/skia/gm/draw_bitmap_rect_skbug4374.cpp
-FILE: ../../../third_party/skia/gm/drawable.cpp
-FILE: ../../../third_party/skia/gm/drawatlas.cpp
-FILE: ../../../third_party/skia/gm/drawatlascolor.cpp
-FILE: ../../../third_party/skia/gm/drawminibitmaprect.cpp
-FILE: ../../../third_party/skia/gm/fadefilter.cpp
-FILE: ../../../third_party/skia/gm/fontscalerdistortable.cpp
-FILE: ../../../third_party/skia/gm/image_pict.cpp
-FILE: ../../../third_party/skia/gm/image_shader.cpp
-FILE: ../../../third_party/skia/gm/imagefilters.cpp
-FILE: ../../../third_party/skia/gm/imagefiltersstroked.cpp
-FILE: ../../../third_party/skia/gm/imagefilterstransformed.cpp
-FILE: ../../../third_party/skia/gm/imagefromyuvtextures.cpp
-FILE: ../../../third_party/skia/gm/imagesource2.cpp
-FILE: ../../../third_party/skia/gm/largeglyphblur.cpp
-FILE: ../../../third_party/skia/gm/lcdblendmodes.cpp
-FILE: ../../../third_party/skia/gm/lcdoverlap.cpp
-FILE: ../../../third_party/skia/gm/localmatriximagefilter.cpp
-FILE: ../../../third_party/skia/gm/localmatriximageshader.cpp
-FILE: ../../../third_party/skia/gm/mipmap.cpp
-FILE: ../../../third_party/skia/gm/path_stroke_with_zero_length.cpp
-FILE: ../../../third_party/skia/gm/pathcontourstart.cpp
-FILE: ../../../third_party/skia/gm/pdf_never_embed.cpp
-FILE: ../../../third_party/skia/gm/perspshaders.cpp
-FILE: ../../../third_party/skia/gm/pictureimagegenerator.cpp
-FILE: ../../../third_party/skia/gm/plus.cpp
-FILE: ../../../third_party/skia/gm/repeated_bitmap.cpp
-FILE: ../../../third_party/skia/gm/scaledstrokes.cpp
-FILE: ../../../third_party/skia/gm/skbug_257.cpp
-FILE: ../../../third_party/skia/gm/smallpaths.cpp
-FILE: ../../../third_party/skia/gm/stlouisarch.cpp
-FILE: ../../../third_party/skia/gm/textblobcolortrans.cpp
-FILE: ../../../third_party/skia/gm/textblobgeometrychange.cpp
-FILE: ../../../third_party/skia/gm/textblobmixedsizes.cpp
-FILE: ../../../third_party/skia/gm/textblobrandomfont.cpp
-FILE: ../../../third_party/skia/gm/textblobtransforms.cpp
-FILE: ../../../third_party/skia/gm/textblobuseaftergpufree.cpp
-FILE: ../../../third_party/skia/gm/transparency.cpp
-FILE: ../../../third_party/skia/include/codec/SkAndroidCodec.h
-FILE: ../../../third_party/skia/include/codec/SkCodec.h
-FILE: ../../../third_party/skia/include/core/SkEncodedImageFormat.h
-FILE: ../../../third_party/skia/include/core/SkPathBuilder.h
-FILE: ../../../third_party/skia/include/core/SkPixmap.h
-FILE: ../../../third_party/skia/include/core/SkPngChunkReader.h
-FILE: ../../../third_party/skia/include/core/SkPoint3.h
-FILE: ../../../third_party/skia/include/core/SkRSXform.h
-FILE: ../../../third_party/skia/include/core/SkTraceMemoryDump.h
-FILE: ../../../third_party/skia/include/effects/SkTableColorFilter.h
-FILE: ../../../third_party/skia/include/gpu/GrContextOptions.h
-FILE: ../../../third_party/skia/include/gpu/gl/GrGLTypes.h
-FILE: ../../../third_party/skia/include/ports/SkFontMgr_android.h
-FILE: ../../../third_party/skia/include/ports/SkFontMgr_directory.h
-FILE: ../../../third_party/skia/include/ports/SkFontMgr_empty.h
-FILE: ../../../third_party/skia/include/ports/SkFontMgr_fontconfig.h
-FILE: ../../../third_party/skia/include/private/SkMutex.h
-FILE: ../../../third_party/skia/include/private/SkSemaphore.h
-FILE: ../../../third_party/skia/include/private/SkSpinlock.h
-FILE: ../../../third_party/skia/include/private/SkTHash.h
-FILE: ../../../third_party/skia/include/private/SkThreadID.h
-FILE: ../../../third_party/skia/include/svg/SkSVGCanvas.h
-FILE: ../../../third_party/skia/include/utils/SkPaintFilterCanvas.h
-FILE: ../../../third_party/skia/src/codec/SkAndroidCodec.cpp
-FILE: ../../../third_party/skia/src/codec/SkAndroidCodecAdapter.cpp
-FILE: ../../../third_party/skia/src/codec/SkAndroidCodecAdapter.h
-FILE: ../../../third_party/skia/src/codec/SkBmpCodec.cpp
-FILE: ../../../third_party/skia/src/codec/SkBmpCodec.h
-FILE: ../../../third_party/skia/src/codec/SkBmpMaskCodec.cpp
-FILE: ../../../third_party/skia/src/codec/SkBmpMaskCodec.h
-FILE: ../../../third_party/skia/src/codec/SkBmpRLECodec.cpp
-FILE: ../../../third_party/skia/src/codec/SkBmpRLECodec.h
-FILE: ../../../third_party/skia/src/codec/SkBmpStandardCodec.cpp
-FILE: ../../../third_party/skia/src/codec/SkBmpStandardCodec.h
-FILE: ../../../third_party/skia/src/codec/SkCodec.cpp
-FILE: ../../../third_party/skia/src/codec/SkCodecImageGenerator.cpp
-FILE: ../../../third_party/skia/src/codec/SkCodecImageGenerator.h
-FILE: ../../../third_party/skia/src/codec/SkIcoCodec.cpp
-FILE: ../../../third_party/skia/src/codec/SkIcoCodec.h
-FILE: ../../../third_party/skia/src/codec/SkJpegCodec.cpp
-FILE: ../../../third_party/skia/src/codec/SkJpegCodec.h
-FILE: ../../../third_party/skia/src/codec/SkJpegDecoderMgr.cpp
-FILE: ../../../third_party/skia/src/codec/SkJpegDecoderMgr.h
-FILE: ../../../third_party/skia/src/codec/SkJpegUtility.cpp
-FILE: ../../../third_party/skia/src/codec/SkJpegUtility.h
-FILE: ../../../third_party/skia/src/codec/SkMaskSwizzler.cpp
-FILE: ../../../third_party/skia/src/codec/SkMaskSwizzler.h
-FILE: ../../../third_party/skia/src/codec/SkMasks.cpp
-FILE: ../../../third_party/skia/src/codec/SkMasks.h
-FILE: ../../../third_party/skia/src/codec/SkPngCodec.cpp
-FILE: ../../../third_party/skia/src/codec/SkPngCodec.h
-FILE: ../../../third_party/skia/src/codec/SkSampledCodec.cpp
-FILE: ../../../third_party/skia/src/codec/SkSampledCodec.h
-FILE: ../../../third_party/skia/src/codec/SkSampler.cpp
-FILE: ../../../third_party/skia/src/codec/SkSampler.h
-FILE: ../../../third_party/skia/src/codec/SkSwizzler.cpp
-FILE: ../../../third_party/skia/src/codec/SkSwizzler.h
-FILE: ../../../third_party/skia/src/codec/SkWbmpCodec.cpp
-FILE: ../../../third_party/skia/src/codec/SkWbmpCodec.h
-FILE: ../../../third_party/skia/src/codec/SkWebpCodec.cpp
-FILE: ../../../third_party/skia/src/codec/SkWebpCodec.h
-FILE: ../../../third_party/skia/src/core/Sk4px.h
-FILE: ../../../third_party/skia/src/core/SkBigPicture.cpp
-FILE: ../../../third_party/skia/src/core/SkBigPicture.h
-FILE: ../../../third_party/skia/src/core/SkFontMgr.cpp
-FILE: ../../../third_party/skia/src/core/SkLatticeIter.cpp
-FILE: ../../../third_party/skia/src/core/SkLatticeIter.h
-FILE: ../../../third_party/skia/src/core/SkLocalMatrixImageFilter.cpp
-FILE: ../../../third_party/skia/src/core/SkMipmapAccessor.cpp
-FILE: ../../../third_party/skia/src/core/SkMipmapAccessor.h
-FILE: ../../../third_party/skia/src/core/SkNextID.h
-FILE: ../../../third_party/skia/src/core/SkOpts.cpp
-FILE: ../../../third_party/skia/src/core/SkOpts.h
-FILE: ../../../third_party/skia/src/core/SkPathBuilder.cpp
-FILE: ../../../third_party/skia/src/core/SkPathPriv.h
-FILE: ../../../third_party/skia/src/core/SkPictureImageGenerator.cpp
-FILE: ../../../third_party/skia/src/core/SkPixmap.cpp
-FILE: ../../../third_party/skia/src/core/SkPixmapPriv.h
-FILE: ../../../third_party/skia/src/core/SkPoint3.cpp
-FILE: ../../../third_party/skia/src/core/SkRecord.cpp
-FILE: ../../../third_party/skia/src/core/SkRecordPattern.h
-FILE: ../../../third_party/skia/src/core/SkRecords.cpp
-FILE: ../../../third_party/skia/src/core/SkSemaphore.cpp
-FILE: ../../../third_party/skia/src/core/SkSharedMutex.cpp
-FILE: ../../../third_party/skia/src/core/SkSharedMutex.h
-FILE: ../../../third_party/skia/src/core/SkSpinlock.cpp
-FILE: ../../../third_party/skia/src/core/SkTDPQueue.h
-FILE: ../../../third_party/skia/src/core/SkThreadID.cpp
-FILE: ../../../third_party/skia/src/core/SkTime.cpp
-FILE: ../../../third_party/skia/src/core/SkXfermodeInterpretation.cpp
-FILE: ../../../third_party/skia/src/core/SkXfermodeInterpretation.h
-FILE: ../../../third_party/skia/src/core/SkYUVPlanesCache.cpp
-FILE: ../../../third_party/skia/src/core/SkYUVPlanesCache.h
-FILE: ../../../third_party/skia/src/effects/SkTableColorFilter.cpp
-FILE: ../../../third_party/skia/src/effects/imagefilters/SkImageImageFilter.cpp
-FILE: ../../../third_party/skia/src/gpu/Blend.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/Device_drawTexture.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrAutoLocaleSetter.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrBlurUtils.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrBlurUtils.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrCaps.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrDrawOpAtlas.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrDrawOpAtlas.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrDrawOpTest.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrDrawOpTest.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrDrawingManager.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrDrawingManager.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrFragmentProcessor.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrGpuResourcePriv.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrManagedResource.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrNonAtomicRef.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrOpFlushState.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrOpFlushState.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrPipeline.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrPipeline.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrProcessorUnitTest.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrResourceProvider.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrResourceProvider.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrSamplerState.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrSimpleMesh.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrTTopoSort.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrTestUtils.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrTestUtils.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrXferProcessor.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/SurfaceDrawContext.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/SurfaceDrawContext.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrBlendFragmentProcessor.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrBlendFragmentProcessor.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrCustomXfermode.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrCustomXfermode.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/geometry/GrAAConvexTessellator.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/geometry/GrAAConvexTessellator.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/geometry/GrQuad.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/geometry/GrTriangulator.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/geometry/GrTriangulator.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLTextureRenderTarget.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLUniformHandler.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLUniformHandler.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLVaryingHandler.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/glsl/GrGLSLBlend.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/glsl/GrGLSLBlend.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/glsl/GrGLSLProgramBuilder.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/glsl/GrGLSLProgramBuilder.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/glsl/GrGLSLUniformHandler.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/glsl/GrGLSLVarying.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/glsl/GrGLSLVarying.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/AALinearizingConvexPathRenderer.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/AALinearizingConvexPathRenderer.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/AtlasTextOp.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/AtlasTextOp.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/ClearOp.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/DashLinePathRenderer.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/DashLinePathRenderer.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/DrawAtlasOp.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/DrawAtlasOp.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/GrDrawOp.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/GrMeshDrawOp.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/GrMeshDrawOp.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/GrOp.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/GrOp.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/LatticeOp.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/LatticeOp.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/TriangulatingPathRenderer.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/TriangulatingPathRenderer.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkCaps.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkCaps.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkCommandBuffer.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkCommandBuffer.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkGpu.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkGpu.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkImage.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkImage.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkRenderPass.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkRenderPass.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkRenderTarget.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkRenderTarget.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkTexture.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkTexture.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkTextureRenderTarget.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkTextureRenderTarget.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkUtil.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkUtil.h
-FILE: ../../../third_party/skia/src/gpu/vk/VulkanInterface.cpp
-FILE: ../../../third_party/skia/src/gpu/vk/VulkanInterface.h
-FILE: ../../../third_party/skia/src/gpu/vk/VulkanMemory.cpp
-FILE: ../../../third_party/skia/src/gpu/vk/VulkanMemory.h
-FILE: ../../../third_party/skia/src/image/SkImage_Gpu.h
-FILE: ../../../third_party/skia/src/image/SkImage_Lazy.cpp
-FILE: ../../../third_party/skia/src/opts/SkBlitMask_opts.h
-FILE: ../../../third_party/skia/src/opts/SkBlitRow_opts.h
-FILE: ../../../third_party/skia/src/opts/SkOpts_ssse3.cpp
-FILE: ../../../third_party/skia/src/opts/SkXfermode_opts.h
-FILE: ../../../third_party/skia/src/pathops/SkDConicLineIntersection.cpp
-FILE: ../../../third_party/skia/src/pathops/SkDCubicToQuads.cpp
-FILE: ../../../third_party/skia/src/pathops/SkOpCoincidence.cpp
-FILE: ../../../third_party/skia/src/pathops/SkPathOpsConic.cpp
-FILE: ../../../third_party/skia/src/pathops/SkPathOpsConic.h
-FILE: ../../../third_party/skia/src/pathops/SkPathOpsCurve.cpp
-FILE: ../../../third_party/skia/src/pathops/SkPathOpsWinding.cpp
-FILE: ../../../third_party/skia/src/pdf/SkDocument_PDF_None.cpp
-FILE: ../../../third_party/skia/src/pdf/SkJpegInfo.cpp
-FILE: ../../../third_party/skia/src/pdf/SkJpegInfo.h
-FILE: ../../../third_party/skia/src/pdf/SkPDFBitmap.cpp
-FILE: ../../../third_party/skia/src/pdf/SkPDFBitmap.h
-FILE: ../../../third_party/skia/src/pdf/SkPDFMetadata.cpp
-FILE: ../../../third_party/skia/src/pdf/SkPDFMetadata.h
-FILE: ../../../third_party/skia/src/ports/SkFontMgr_android_factory.cpp
-FILE: ../../../third_party/skia/src/ports/SkFontMgr_custom_directory_factory.cpp
-FILE: ../../../third_party/skia/src/ports/SkFontMgr_custom_embedded_factory.cpp
-FILE: ../../../third_party/skia/src/ports/SkFontMgr_fontconfig_factory.cpp
-FILE: ../../../third_party/skia/src/ports/SkFontMgr_win_dw_factory.cpp
-FILE: ../../../third_party/skia/src/ports/SkOSLibrary.h
-FILE: ../../../third_party/skia/src/ports/SkOSLibrary_posix.cpp
-FILE: ../../../third_party/skia/src/ports/SkOSLibrary_win.cpp
-FILE: ../../../third_party/skia/src/shaders/SkImageShader.cpp
-FILE: ../../../third_party/skia/src/shaders/SkImageShader.h
-FILE: ../../../third_party/skia/src/svg/SkSVGCanvas.cpp
-FILE: ../../../third_party/skia/src/svg/SkSVGDevice.cpp
-FILE: ../../../third_party/skia/src/svg/SkSVGDevice.h
-FILE: ../../../third_party/skia/src/text/gpu/DistanceFieldAdjustTable.cpp
-FILE: ../../../third_party/skia/src/text/gpu/DistanceFieldAdjustTable.h
-FILE: ../../../third_party/skia/src/text/gpu/StrikeCache.cpp
-FILE: ../../../third_party/skia/src/text/gpu/StrikeCache.h
-FILE: ../../../third_party/skia/src/text/gpu/TextBlob.cpp
-FILE: ../../../third_party/skia/src/text/gpu/TextBlob.h
-FILE: ../../../third_party/skia/src/text/gpu/TextBlobRedrawCoordinator.cpp
-FILE: ../../../third_party/skia/src/text/gpu/TextBlobRedrawCoordinator.h
-FILE: ../../../third_party/skia/src/utils/SkPaintFilterCanvas.cpp
-FILE: ../../../third_party/skia/src/xps/SkXPSDocument.cpp
+FILE: ../../../flutter/third_party/skia/client_utils/android/BRDAllocator.h
+FILE: ../../../flutter/third_party/skia/client_utils/android/BitmapRegionDecoder.cpp
+FILE: ../../../flutter/third_party/skia/client_utils/android/BitmapRegionDecoder.h
+FILE: ../../../flutter/third_party/skia/client_utils/android/BitmapRegionDecoderPriv.h
+FILE: ../../../flutter/third_party/skia/dm/DMSrcSink.cpp
+FILE: ../../../flutter/third_party/skia/dm/DMSrcSink.h
+FILE: ../../../flutter/third_party/skia/gm/aaxfermodes.cpp
+FILE: ../../../flutter/third_party/skia/gm/addarc.cpp
+FILE: ../../../flutter/third_party/skia/gm/all_bitmap_configs.cpp
+FILE: ../../../flutter/third_party/skia/gm/anisotropic.cpp
+FILE: ../../../flutter/third_party/skia/gm/annotated_text.cpp
+FILE: ../../../flutter/third_party/skia/gm/badpaint.cpp
+FILE: ../../../flutter/third_party/skia/gm/bigrrectaaeffect.cpp
+FILE: ../../../flutter/third_party/skia/gm/bigtileimagefilter.cpp
+FILE: ../../../flutter/third_party/skia/gm/blend.cpp
+FILE: ../../../flutter/third_party/skia/gm/blurredclippedcircle.cpp
+FILE: ../../../flutter/third_party/skia/gm/bmpfilterqualityrepeat.cpp
+FILE: ../../../flutter/third_party/skia/gm/concavepaths.cpp
+FILE: ../../../flutter/third_party/skia/gm/constcolorprocessor.cpp
+FILE: ../../../flutter/third_party/skia/gm/convex_all_line_paths.cpp
+FILE: ../../../flutter/third_party/skia/gm/draw_bitmap_rect_skbug4374.cpp
+FILE: ../../../flutter/third_party/skia/gm/drawable.cpp
+FILE: ../../../flutter/third_party/skia/gm/drawatlas.cpp
+FILE: ../../../flutter/third_party/skia/gm/drawatlascolor.cpp
+FILE: ../../../flutter/third_party/skia/gm/drawminibitmaprect.cpp
+FILE: ../../../flutter/third_party/skia/gm/fadefilter.cpp
+FILE: ../../../flutter/third_party/skia/gm/fontscalerdistortable.cpp
+FILE: ../../../flutter/third_party/skia/gm/image_pict.cpp
+FILE: ../../../flutter/third_party/skia/gm/image_shader.cpp
+FILE: ../../../flutter/third_party/skia/gm/imagefilters.cpp
+FILE: ../../../flutter/third_party/skia/gm/imagefiltersstroked.cpp
+FILE: ../../../flutter/third_party/skia/gm/imagefilterstransformed.cpp
+FILE: ../../../flutter/third_party/skia/gm/imagefromyuvtextures.cpp
+FILE: ../../../flutter/third_party/skia/gm/imagesource2.cpp
+FILE: ../../../flutter/third_party/skia/gm/largeglyphblur.cpp
+FILE: ../../../flutter/third_party/skia/gm/lcdblendmodes.cpp
+FILE: ../../../flutter/third_party/skia/gm/lcdoverlap.cpp
+FILE: ../../../flutter/third_party/skia/gm/localmatriximagefilter.cpp
+FILE: ../../../flutter/third_party/skia/gm/localmatriximageshader.cpp
+FILE: ../../../flutter/third_party/skia/gm/mipmap.cpp
+FILE: ../../../flutter/third_party/skia/gm/path_stroke_with_zero_length.cpp
+FILE: ../../../flutter/third_party/skia/gm/pathcontourstart.cpp
+FILE: ../../../flutter/third_party/skia/gm/pdf_never_embed.cpp
+FILE: ../../../flutter/third_party/skia/gm/perspshaders.cpp
+FILE: ../../../flutter/third_party/skia/gm/pictureimagegenerator.cpp
+FILE: ../../../flutter/third_party/skia/gm/plus.cpp
+FILE: ../../../flutter/third_party/skia/gm/repeated_bitmap.cpp
+FILE: ../../../flutter/third_party/skia/gm/scaledstrokes.cpp
+FILE: ../../../flutter/third_party/skia/gm/skbug_257.cpp
+FILE: ../../../flutter/third_party/skia/gm/smallpaths.cpp
+FILE: ../../../flutter/third_party/skia/gm/stlouisarch.cpp
+FILE: ../../../flutter/third_party/skia/gm/textblobcolortrans.cpp
+FILE: ../../../flutter/third_party/skia/gm/textblobgeometrychange.cpp
+FILE: ../../../flutter/third_party/skia/gm/textblobmixedsizes.cpp
+FILE: ../../../flutter/third_party/skia/gm/textblobrandomfont.cpp
+FILE: ../../../flutter/third_party/skia/gm/textblobtransforms.cpp
+FILE: ../../../flutter/third_party/skia/gm/textblobuseaftergpufree.cpp
+FILE: ../../../flutter/third_party/skia/gm/transparency.cpp
+FILE: ../../../flutter/third_party/skia/include/codec/SkAndroidCodec.h
+FILE: ../../../flutter/third_party/skia/include/codec/SkCodec.h
+FILE: ../../../flutter/third_party/skia/include/codec/SkEncodedImageFormat.h
+FILE: ../../../flutter/third_party/skia/include/codec/SkPngChunkReader.h
+FILE: ../../../flutter/third_party/skia/include/core/SkPathBuilder.h
+FILE: ../../../flutter/third_party/skia/include/core/SkPixmap.h
+FILE: ../../../flutter/third_party/skia/include/core/SkPoint3.h
+FILE: ../../../flutter/third_party/skia/include/core/SkRSXform.h
+FILE: ../../../flutter/third_party/skia/include/core/SkTraceMemoryDump.h
+FILE: ../../../flutter/third_party/skia/include/gpu/GrContextOptions.h
+FILE: ../../../flutter/third_party/skia/include/gpu/gl/GrGLTypes.h
+FILE: ../../../flutter/third_party/skia/include/ports/SkFontMgr_android.h
+FILE: ../../../flutter/third_party/skia/include/ports/SkFontMgr_directory.h
+FILE: ../../../flutter/third_party/skia/include/ports/SkFontMgr_empty.h
+FILE: ../../../flutter/third_party/skia/include/ports/SkFontMgr_fontconfig.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkMutex.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkSemaphore.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkThreadID.h
+FILE: ../../../flutter/third_party/skia/include/svg/SkSVGCanvas.h
+FILE: ../../../flutter/third_party/skia/include/utils/SkPaintFilterCanvas.h
+FILE: ../../../flutter/third_party/skia/src/base/SkSemaphore.cpp
+FILE: ../../../flutter/third_party/skia/src/base/SkSharedMutex.cpp
+FILE: ../../../flutter/third_party/skia/src/base/SkSharedMutex.h
+FILE: ../../../flutter/third_party/skia/src/base/SkSpinlock.cpp
+FILE: ../../../flutter/third_party/skia/src/base/SkSpinlock.h
+FILE: ../../../flutter/third_party/skia/src/base/SkTDPQueue.h
+FILE: ../../../flutter/third_party/skia/src/base/SkThreadID.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkAndroidCodec.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkAndroidCodecAdapter.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkAndroidCodecAdapter.h
+FILE: ../../../flutter/third_party/skia/src/codec/SkBmpCodec.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkBmpCodec.h
+FILE: ../../../flutter/third_party/skia/src/codec/SkBmpMaskCodec.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkBmpMaskCodec.h
+FILE: ../../../flutter/third_party/skia/src/codec/SkBmpRLECodec.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkBmpRLECodec.h
+FILE: ../../../flutter/third_party/skia/src/codec/SkBmpStandardCodec.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkBmpStandardCodec.h
+FILE: ../../../flutter/third_party/skia/src/codec/SkCodec.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkCodecImageGenerator.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkCodecImageGenerator.h
+FILE: ../../../flutter/third_party/skia/src/codec/SkIcoCodec.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkIcoCodec.h
+FILE: ../../../flutter/third_party/skia/src/codec/SkJpegCodec.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkJpegCodec.h
+FILE: ../../../flutter/third_party/skia/src/codec/SkJpegDecoderMgr.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkJpegDecoderMgr.h
+FILE: ../../../flutter/third_party/skia/src/codec/SkJpegUtility.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkJpegUtility.h
+FILE: ../../../flutter/third_party/skia/src/codec/SkMaskSwizzler.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkMaskSwizzler.h
+FILE: ../../../flutter/third_party/skia/src/codec/SkPixmapUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkPixmapUtilsPriv.h
+FILE: ../../../flutter/third_party/skia/src/codec/SkPngCodec.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkPngCodec.h
+FILE: ../../../flutter/third_party/skia/src/codec/SkSampledCodec.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkSampledCodec.h
+FILE: ../../../flutter/third_party/skia/src/codec/SkSampler.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkSampler.h
+FILE: ../../../flutter/third_party/skia/src/codec/SkSwizzler.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkSwizzler.h
+FILE: ../../../flutter/third_party/skia/src/codec/SkWbmpCodec.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkWbmpCodec.h
+FILE: ../../../flutter/third_party/skia/src/codec/SkWebpCodec.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkWebpCodec.h
+FILE: ../../../flutter/third_party/skia/src/core/Sk4px.h
+FILE: ../../../flutter/third_party/skia/src/core/SkBigPicture.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkBigPicture.h
+FILE: ../../../flutter/third_party/skia/src/core/SkFontMgr.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkLatticeIter.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkLatticeIter.h
+FILE: ../../../flutter/third_party/skia/src/core/SkLocalMatrixImageFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkMasks.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkMasks.h
+FILE: ../../../flutter/third_party/skia/src/core/SkMipmapAccessor.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkMipmapAccessor.h
+FILE: ../../../flutter/third_party/skia/src/core/SkNextID.h
+FILE: ../../../flutter/third_party/skia/src/core/SkOpts.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkOpts.h
+FILE: ../../../flutter/third_party/skia/src/core/SkPathBuilder.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkPathPriv.h
+FILE: ../../../flutter/third_party/skia/src/core/SkPixmap.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkPoint3.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkRecord.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkRecordPattern.h
+FILE: ../../../flutter/third_party/skia/src/core/SkRecords.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkTHash.h
+FILE: ../../../flutter/third_party/skia/src/core/SkYUVPlanesCache.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkYUVPlanesCache.h
+FILE: ../../../flutter/third_party/skia/src/effects/colorfilters/SkTableColorFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/colorfilters/SkTableColorFilter.h
+FILE: ../../../flutter/third_party/skia/src/effects/imagefilters/SkImageImageFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/Blend.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/Device_drawTexture.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrAutoLocaleSetter.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBlurUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBlurUtils.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrCaps.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDrawOpAtlas.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDrawOpAtlas.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDrawOpTest.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDrawOpTest.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDrawingManager.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDrawingManager.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrFragmentProcessor.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrGpuResourcePriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrManagedResource.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrNonAtomicRef.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrOpFlushState.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrOpFlushState.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrPipeline.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrPipeline.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrProcessorUnitTest.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrResourceProvider.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrResourceProvider.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrSamplerState.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrSimpleMesh.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrTTopoSort.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrTestUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrTestUtils.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrXferProcessor.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/SurfaceDrawContext.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/SurfaceDrawContext.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrBlendFragmentProcessor.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrBlendFragmentProcessor.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrCustomXfermode.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrCustomXfermode.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrAAConvexTessellator.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrAAConvexTessellator.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrQuad.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrTriangulator.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrTriangulator.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLTextureRenderTarget.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLUniformHandler.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLUniformHandler.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLVaryingHandler.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/glsl/GrGLSLBlend.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/glsl/GrGLSLBlend.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/glsl/GrGLSLProgramBuilder.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/glsl/GrGLSLProgramBuilder.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/glsl/GrGLSLUniformHandler.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/glsl/GrGLSLVarying.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/glsl/GrGLSLVarying.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/image/SkImage_Ganesh.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/AALinearizingConvexPathRenderer.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/AALinearizingConvexPathRenderer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/AtlasTextOp.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/AtlasTextOp.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/ClearOp.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/DashLinePathRenderer.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/DashLinePathRenderer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/DrawAtlasOp.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/DrawAtlasOp.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/GrDrawOp.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/GrMeshDrawOp.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/GrMeshDrawOp.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/GrOp.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/GrOp.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/LatticeOp.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/LatticeOp.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/TriangulatingPathRenderer.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/TriangulatingPathRenderer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkCaps.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkCaps.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkCommandBuffer.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkCommandBuffer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkGpu.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkGpu.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkImage.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkImage.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkRenderPass.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkRenderPass.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkRenderTarget.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkRenderTarget.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkTexture.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkTexture.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkTextureRenderTarget.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkTextureRenderTarget.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkUtil.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkUtil.h
+FILE: ../../../flutter/third_party/skia/src/gpu/vk/VulkanInterface.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/vk/VulkanInterface.h
+FILE: ../../../flutter/third_party/skia/src/gpu/vk/VulkanMemory.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/vk/VulkanMemory.h
+FILE: ../../../flutter/third_party/skia/src/image/SkImage_Lazy.cpp
+FILE: ../../../flutter/third_party/skia/src/image/SkPictureImageGenerator.cpp
+FILE: ../../../flutter/third_party/skia/src/opts/SkBlitMask_opts.h
+FILE: ../../../flutter/third_party/skia/src/opts/SkBlitRow_opts.h
+FILE: ../../../flutter/third_party/skia/src/pathops/SkDConicLineIntersection.cpp
+FILE: ../../../flutter/third_party/skia/src/pathops/SkDCubicToQuads.cpp
+FILE: ../../../flutter/third_party/skia/src/pathops/SkOpCoincidence.cpp
+FILE: ../../../flutter/third_party/skia/src/pathops/SkPathOpsConic.cpp
+FILE: ../../../flutter/third_party/skia/src/pathops/SkPathOpsConic.h
+FILE: ../../../flutter/third_party/skia/src/pathops/SkPathOpsCurve.cpp
+FILE: ../../../flutter/third_party/skia/src/pathops/SkPathOpsWinding.cpp
+FILE: ../../../flutter/third_party/skia/src/pdf/SkDocument_PDF_None.cpp
+FILE: ../../../flutter/third_party/skia/src/pdf/SkJpegInfo.h
+FILE: ../../../flutter/third_party/skia/src/pdf/SkJpegInfo_libjpegturbo.cpp
+FILE: ../../../flutter/third_party/skia/src/pdf/SkJpegInfo_none.cpp
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFBitmap.cpp
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFBitmap.h
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFMetadata.cpp
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFMetadata.h
+FILE: ../../../flutter/third_party/skia/src/ports/SkOSLibrary.h
+FILE: ../../../flutter/third_party/skia/src/ports/SkOSLibrary_posix.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkOSLibrary_win.cpp
+FILE: ../../../flutter/third_party/skia/src/shaders/SkImageShader.cpp
+FILE: ../../../flutter/third_party/skia/src/shaders/SkImageShader.h
+FILE: ../../../flutter/third_party/skia/src/svg/SkSVGCanvas.cpp
+FILE: ../../../flutter/third_party/skia/src/svg/SkSVGDevice.cpp
+FILE: ../../../flutter/third_party/skia/src/svg/SkSVGDevice.h
+FILE: ../../../flutter/third_party/skia/src/text/gpu/DistanceFieldAdjustTable.cpp
+FILE: ../../../flutter/third_party/skia/src/text/gpu/DistanceFieldAdjustTable.h
+FILE: ../../../flutter/third_party/skia/src/text/gpu/StrikeCache.cpp
+FILE: ../../../flutter/third_party/skia/src/text/gpu/StrikeCache.h
+FILE: ../../../flutter/third_party/skia/src/text/gpu/TextBlob.cpp
+FILE: ../../../flutter/third_party/skia/src/text/gpu/TextBlob.h
+FILE: ../../../flutter/third_party/skia/src/text/gpu/TextBlobRedrawCoordinator.cpp
+FILE: ../../../flutter/third_party/skia/src/text/gpu/TextBlobRedrawCoordinator.h
+FILE: ../../../flutter/third_party/skia/src/utils/SkPaintFilterCanvas.cpp
+FILE: ../../../flutter/third_party/skia/src/xps/SkXPSDocument.cpp
 ----------------------------------------------------------------------------------------------------
 Copyright 2015 Google Inc.
 
@@ -3380,12 +3660,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/src/codec/SkCodecPriv.h + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkCodecPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkLocalMatrixImageFilter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkImageGenerator_none.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkImageGenerator_skia.cpp + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/src/codec/SkCodecPriv.h
-FILE: ../../../third_party/skia/src/core/SkLocalMatrixImageFilter.h
-FILE: ../../../third_party/skia/src/ports/SkImageGenerator_none.cpp
-FILE: ../../../third_party/skia/src/ports/SkImageGenerator_skia.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkCodecPriv.h
+FILE: ../../../flutter/third_party/skia/src/core/SkLocalMatrixImageFilter.h
+FILE: ../../../flutter/third_party/skia/src/ports/SkImageGenerator_none.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkImageGenerator_skia.cpp
 ----------------------------------------------------------------------------------------------------
 Copyright 2015 The Android Open Source Project
 
@@ -3420,9 +3703,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/icu/scripts/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkTraceEventCommon.h + ../../../LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/src/core/SkTraceEventCommon.h
+FILE: ../../../flutter/third_party/skia/src/core/SkTraceEventCommon.h
 ----------------------------------------------------------------------------------------------------
 Copyright 2015 The Chromium Authors. All rights reserved.
 
@@ -3455,339 +3738,613 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/bench/AndroidCodecBench.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/Fuzz.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/Fuzz.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/FuzzGradients.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/FuzzMain.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/FuzzParsePath.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/FuzzPathop.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/animated_gif.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/animatedimageblurs.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/arcto.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/bigrect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/bitmapimage.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/blurcircles2.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/bug5252.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/bug530095.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/bug615686.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/circulararcs.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/clip_error.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/colorfilteralpha8.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/complexclip4.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/complexclip_blur_tiled.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/croppedrects.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/dashcircle.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/drawregion.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/drawregionmodes.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/encode_platform.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/encode_srgb.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/filterbug.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/hardstop_gradients.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/imagemakewithfilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/imagemasksubset.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/lattice.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/overdrawcolorfilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/overstroke.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/pathmaskcache.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/readpixels.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/rectangletexture.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/rrectclipdrawpaint.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/shapes.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/showmiplevels.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/simplerect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/skbug_4868.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/skbug_5321.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/stroke_rect_shader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/strokedlines.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/subsetshader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/textblobblockreordering.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/windowrectangles.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/codec/SkCodecAnimation.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkBlendMode.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkClipOp.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkColorSpace.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkMilestone.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkOverdrawCanvas.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkRasterHandleAllocator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkSwizzle.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/effects/SkOverdrawColorFilter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/encode/SkICC.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/vk/GrVkBackendContext.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/vk/GrVkExtensions.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/vk/GrVkTypes.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/ports/SkFontMgr_FontConfigInterface.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/ports/SkImageGeneratorCG.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/ports/SkImageGeneratorWIC.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/SkEncodedInfo.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SingleOwner.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/utils/SkNoDrawCanvas.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/slides/SVGPongSlide.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skshaper/include/SkShaper.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skshaper/src/SkShaper_harfbuzz.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skshaper/src/SkShaper_primitive.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGAttribute.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGAttributeParser.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGCircle.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGClipPath.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGContainer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGDOM.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGDefs.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGEllipse.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGG.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGHiddenContainer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGIDMapper.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGLine.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGLinearGradient.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGNode.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGPath.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGPoly.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGRect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGRenderContext.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGSVG.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGShape.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGStop.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGTransformableNode.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGTypes.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGValue.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGAttribute.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGAttributeParser.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGCircle.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGClipPath.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGContainer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGDOM.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGEllipse.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGLine.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGLinearGradient.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGNode.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGPath.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGPoly.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGRect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGRenderContext.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGSVG.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGShape.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGStop.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGTransformableNode.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGValue.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkArenaAlloc.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkArenaAlloc.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkAutoMalloc.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkBitmaskEnum.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkLeanWindows.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkMSAN.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkScopeExit.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkRawCodec.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkRawCodec.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkATrace.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkATrace.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkAnnotationKeys.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkAutoPixmapStorage.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkAutoPixmapStorage.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBlendModePriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkColorSpace.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkColorSpacePriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkCpu.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkCpu.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkGlobalInitialization_core.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkImageFilterCache.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkImageFilterCache.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkLRUCache.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMatrixPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkOverdrawCanvas.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPathMeasurePriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRasterPipeline.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRasterPipeline.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRasterPipelineBlitter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRecordedDrawable.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRecordedDrawable.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkScaleToSides.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkSpecialImage.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkSpecialImage.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkSwizzle.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkSwizzlePriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/imagefilters/SkShaderImageFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/encode/SkICC.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/encode/SkICCPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/encode/SkImageEncoderPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/Swizzle.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrAppliedClip.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrAuditTrail.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrAuditTrail.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrColorSpaceXform.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrColorSpaceXform.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDirectContextPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrFixedClip.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrOpsRenderPass.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrOpsRenderPass.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrProgramDesc.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrRenderTargetProxy.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrRenderTargetProxy.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrResourceHandle.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrScissorState.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrShaderVar.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrShaderVar.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrStencilSettings.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrStyle.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrStyle.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrSurfaceProxy.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrSurfaceProxy.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrTextureProxy.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrTextureProxy.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrTextureRenderTargetProxy.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrTextureRenderTargetProxy.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrUserStencilSettings.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrWindowRectangles.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrWindowRectsState.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/SurfaceContext.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/SurfaceContext.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DPipelineStateDataManager.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrShadowGeoProc.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrShadowGeoProc.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrStyledShape.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrStyledShape.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLBuffer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLBuffer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLOpsRenderPass.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/glfw/GrGLMakeNativeInterface_glfw.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/glsl/GrGLSLColorSpaceXformHelper.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/glsl/GrGLSLProgramDataManager.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/GrPathStencilSettings.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/RegionOp.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/RegionOp.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/ShadowRRectOp.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/ShadowRRectOp.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkDescriptorPool.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkDescriptorPool.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkDescriptorSet.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkDescriptorSet.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkDescriptorSetManager.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkDescriptorSetManager.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkFramebuffer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkFramebuffer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkImageView.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkImageView.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkOpsRenderPass.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkOpsRenderPass.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkPipeline.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkPipeline.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkPipelineState.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkPipelineState.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkPipelineStateBuilder.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkPipelineStateBuilder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkPipelineStateCache.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkPipelineStateDataManager.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkPipelineStateDataManager.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkResourceProvider.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkResourceProvider.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkSampler.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkSampler.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkUniformHandler.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkUniformHandler.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkVaryingHandler.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkVaryingHandler.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/vk/VulkanExtensions.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/opts/SkSwizzler_opts.inc + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkBitmapKey.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFDocumentPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFMakeCIDGlyphWidthsArray.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFMakeCIDGlyphWidthsArray.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFMakeToUnicodeCmap.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontConfigInterface.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkImageGeneratorCG.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkImageGeneratorWIC.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkColorFilterShader.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkColorShader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLCompiler.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLCompiler.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLContext.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLMemoryLayout.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLProgramSettings.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLUtil.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLUtil.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLCodeGenerator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLGLSLCodeGenerator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLGLSLCodeGenerator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLMetalCodeGenerator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLMetalCodeGenerator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLSPIRVCodeGenerator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLSPIRVCodeGenerator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLBinaryExpression.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLBlock.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLBreakStatement.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructor.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLContinueStatement.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLDiscardStatement.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLDoStatement.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLExpression.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLExpressionStatement.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLExtension.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLFieldAccess.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLFieldSymbol.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLForStatement.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLFunctionCall.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLFunctionDeclaration.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLFunctionDefinition.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLFunctionReference.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLIRNode.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLIfStatement.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLIndexExpression.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLInterfaceBlock.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLLayout.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLLiteral.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLModifierFlags.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLModifiersDeclaration.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLNop.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLPostfixExpression.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLPrefixExpression.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLProgram.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLProgramElement.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLReturnStatement.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLSetting.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLStatement.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLSwizzle.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLSymbol.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLSymbolTable.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLSymbolTable.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLTernaryExpression.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLType.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLType.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLTypeReference.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLVarDeclarations.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLVariable.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLVariableReference.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkMultiPictureDocument.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkMultiPictureDocument.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkMultiPictureDocumentPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkOSPath.h + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/bench/AndroidCodecBench.cpp
-FILE: ../../../third_party/skia/bench/AndroidCodecBench.h
-FILE: ../../../third_party/skia/bench/DecodeBench.cpp
-FILE: ../../../third_party/skia/bench/EncodeBench.cpp
-FILE: ../../../third_party/skia/bench/GrMipmapBench.cpp
-FILE: ../../../third_party/skia/bench/HardStopGradientBench_ScaleNumColors.cpp
-FILE: ../../../third_party/skia/bench/HardStopGradientBench_ScaleNumHardStops.cpp
-FILE: ../../../third_party/skia/bench/HardStopGradientBench_SpecialHardStops.cpp
-FILE: ../../../third_party/skia/bench/ImageCacheBudgetBench.cpp
-FILE: ../../../third_party/skia/bench/PDFBench.cpp
-FILE: ../../../third_party/skia/bench/QuickRejectBench.cpp
-FILE: ../../../third_party/skia/bench/ShapesBench.cpp
-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/fuzz/Fuzz.cpp
-FILE: ../../../third_party/skia/fuzz/Fuzz.h
-FILE: ../../../third_party/skia/fuzz/FuzzGradients.cpp
-FILE: ../../../third_party/skia/fuzz/FuzzMain.cpp
-FILE: ../../../third_party/skia/fuzz/FuzzParsePath.cpp
-FILE: ../../../third_party/skia/fuzz/FuzzPathop.cpp
-FILE: ../../../third_party/skia/gm/animated_gif.cpp
-FILE: ../../../third_party/skia/gm/animatedimageblurs.cpp
-FILE: ../../../third_party/skia/gm/arcto.cpp
-FILE: ../../../third_party/skia/gm/bigrect.cpp
-FILE: ../../../third_party/skia/gm/bitmapimage.cpp
-FILE: ../../../third_party/skia/gm/blurcircles2.cpp
-FILE: ../../../third_party/skia/gm/bug5252.cpp
-FILE: ../../../third_party/skia/gm/bug530095.cpp
-FILE: ../../../third_party/skia/gm/bug615686.cpp
-FILE: ../../../third_party/skia/gm/circulararcs.cpp
-FILE: ../../../third_party/skia/gm/clip_error.cpp
-FILE: ../../../third_party/skia/gm/colorfilteralpha8.cpp
-FILE: ../../../third_party/skia/gm/complexclip4.cpp
-FILE: ../../../third_party/skia/gm/complexclip_blur_tiled.cpp
-FILE: ../../../third_party/skia/gm/croppedrects.cpp
-FILE: ../../../third_party/skia/gm/dashcircle.cpp
-FILE: ../../../third_party/skia/gm/drawregion.cpp
-FILE: ../../../third_party/skia/gm/drawregionmodes.cpp
-FILE: ../../../third_party/skia/gm/encode_platform.cpp
-FILE: ../../../third_party/skia/gm/encode_srgb.cpp
-FILE: ../../../third_party/skia/gm/filterbug.cpp
-FILE: ../../../third_party/skia/gm/hardstop_gradients.cpp
-FILE: ../../../third_party/skia/gm/imagemakewithfilter.cpp
-FILE: ../../../third_party/skia/gm/imagemasksubset.cpp
-FILE: ../../../third_party/skia/gm/lattice.cpp
-FILE: ../../../third_party/skia/gm/overdrawcolorfilter.cpp
-FILE: ../../../third_party/skia/gm/overstroke.cpp
-FILE: ../../../third_party/skia/gm/pathmaskcache.cpp
-FILE: ../../../third_party/skia/gm/readpixels.cpp
-FILE: ../../../third_party/skia/gm/rectangletexture.cpp
-FILE: ../../../third_party/skia/gm/rrectclipdrawpaint.cpp
-FILE: ../../../third_party/skia/gm/shapes.cpp
-FILE: ../../../third_party/skia/gm/showmiplevels.cpp
-FILE: ../../../third_party/skia/gm/simplerect.cpp
-FILE: ../../../third_party/skia/gm/skbug_4868.cpp
-FILE: ../../../third_party/skia/gm/skbug_5321.cpp
-FILE: ../../../third_party/skia/gm/stroke_rect_shader.cpp
-FILE: ../../../third_party/skia/gm/strokedlines.cpp
-FILE: ../../../third_party/skia/gm/subsetshader.cpp
-FILE: ../../../third_party/skia/gm/textblobblockreordering.cpp
-FILE: ../../../third_party/skia/gm/windowrectangles.cpp
-FILE: ../../../third_party/skia/include/codec/SkCodecAnimation.h
-FILE: ../../../third_party/skia/include/core/SkBlendMode.h
-FILE: ../../../third_party/skia/include/core/SkClipOp.h
-FILE: ../../../third_party/skia/include/core/SkColorSpace.h
-FILE: ../../../third_party/skia/include/core/SkICC.h
-FILE: ../../../third_party/skia/include/core/SkMilestone.h
-FILE: ../../../third_party/skia/include/core/SkOverdrawCanvas.h
-FILE: ../../../third_party/skia/include/core/SkRasterHandleAllocator.h
-FILE: ../../../third_party/skia/include/core/SkSwizzle.h
-FILE: ../../../third_party/skia/include/effects/SkOverdrawColorFilter.h
-FILE: ../../../third_party/skia/include/gpu/vk/GrVkBackendContext.h
-FILE: ../../../third_party/skia/include/gpu/vk/GrVkExtensions.h
-FILE: ../../../third_party/skia/include/gpu/vk/GrVkTypes.h
-FILE: ../../../third_party/skia/include/ports/SkFontMgr_FontConfigInterface.h
-FILE: ../../../third_party/skia/include/ports/SkImageGeneratorCG.h
-FILE: ../../../third_party/skia/include/ports/SkImageGeneratorWIC.h
-FILE: ../../../third_party/skia/include/private/SingleOwner.h
-FILE: ../../../third_party/skia/include/private/SkBitmaskEnum.h
-FILE: ../../../third_party/skia/include/private/SkEncodedInfo.h
-FILE: ../../../third_party/skia/include/private/SkSLIRNode.h
-FILE: ../../../third_party/skia/include/private/SkSLLayout.h
-FILE: ../../../third_party/skia/include/private/SkSLModifiers.h
-FILE: ../../../third_party/skia/include/private/SkSLProgramElement.h
-FILE: ../../../third_party/skia/include/private/SkSLStatement.h
-FILE: ../../../third_party/skia/include/private/SkSLSymbol.h
-FILE: ../../../third_party/skia/include/private/SkSafe_math.h
-FILE: ../../../third_party/skia/include/utils/SkNoDrawCanvas.h
-FILE: ../../../third_party/skia/modules/sksg/slides/SVGPongSlide.cpp
-FILE: ../../../third_party/skia/modules/skshaper/include/SkShaper.h
-FILE: ../../../third_party/skia/modules/skshaper/src/SkShaper_harfbuzz.cpp
-FILE: ../../../third_party/skia/modules/skshaper/src/SkShaper_primitive.cpp
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGAttribute.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGAttributeParser.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGCircle.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGClipPath.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGContainer.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGDOM.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGDefs.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGEllipse.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGG.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGHiddenContainer.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGIDMapper.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGLine.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGLinearGradient.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGNode.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGPath.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGPoly.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGRect.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGRenderContext.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGSVG.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGShape.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGStop.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGTransformableNode.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGTypes.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGValue.h
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGAttribute.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGAttributeParser.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGCircle.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGClipPath.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGContainer.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGDOM.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGEllipse.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGLine.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGLinearGradient.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGNode.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGPath.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGPoly.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGRect.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGRenderContext.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGSVG.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGShape.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGStop.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGTransformableNode.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGValue.cpp
-FILE: ../../../third_party/skia/samplecode/DecodeFile.h
-FILE: ../../../third_party/skia/samplecode/Sample.cpp
-FILE: ../../../third_party/skia/src/codec/SkRawCodec.cpp
-FILE: ../../../third_party/skia/src/codec/SkRawCodec.h
-FILE: ../../../third_party/skia/src/core/SkATrace.cpp
-FILE: ../../../third_party/skia/src/core/SkATrace.h
-FILE: ../../../third_party/skia/src/core/SkAnnotationKeys.h
-FILE: ../../../third_party/skia/src/core/SkArenaAlloc.cpp
-FILE: ../../../third_party/skia/src/core/SkArenaAlloc.h
-FILE: ../../../third_party/skia/src/core/SkAutoMalloc.h
-FILE: ../../../third_party/skia/src/core/SkAutoPixmapStorage.cpp
-FILE: ../../../third_party/skia/src/core/SkAutoPixmapStorage.h
-FILE: ../../../third_party/skia/src/core/SkBlendModePriv.h
-FILE: ../../../third_party/skia/src/core/SkColorSpace.cpp
-FILE: ../../../third_party/skia/src/core/SkColorSpacePriv.h
-FILE: ../../../third_party/skia/src/core/SkCpu.cpp
-FILE: ../../../third_party/skia/src/core/SkCpu.h
-FILE: ../../../third_party/skia/src/core/SkFuzzLogging.h
-FILE: ../../../third_party/skia/src/core/SkGlobalInitialization_core.cpp
-FILE: ../../../third_party/skia/src/core/SkICC.cpp
-FILE: ../../../third_party/skia/src/core/SkICCPriv.h
-FILE: ../../../third_party/skia/src/core/SkImageFilterCache.cpp
-FILE: ../../../third_party/skia/src/core/SkImageFilterCache.h
-FILE: ../../../third_party/skia/src/core/SkLRUCache.h
-FILE: ../../../third_party/skia/src/core/SkLeanWindows.h
-FILE: ../../../third_party/skia/src/core/SkMSAN.h
-FILE: ../../../third_party/skia/src/core/SkMatrixPriv.h
-FILE: ../../../third_party/skia/src/core/SkOverdrawCanvas.cpp
-FILE: ../../../third_party/skia/src/core/SkPathMeasurePriv.h
-FILE: ../../../third_party/skia/src/core/SkRasterPipeline.cpp
-FILE: ../../../third_party/skia/src/core/SkRasterPipeline.h
-FILE: ../../../third_party/skia/src/core/SkRasterPipelineBlitter.cpp
-FILE: ../../../third_party/skia/src/core/SkRecordedDrawable.cpp
-FILE: ../../../third_party/skia/src/core/SkRecordedDrawable.h
-FILE: ../../../third_party/skia/src/core/SkScaleToSides.h
-FILE: ../../../third_party/skia/src/core/SkScopeExit.h
-FILE: ../../../third_party/skia/src/core/SkSpecialImage.cpp
-FILE: ../../../third_party/skia/src/core/SkSpecialImage.h
-FILE: ../../../third_party/skia/src/core/SkSpecialSurface.cpp
-FILE: ../../../third_party/skia/src/core/SkSpecialSurface.h
-FILE: ../../../third_party/skia/src/core/SkSwizzle.cpp
-FILE: ../../../third_party/skia/src/effects/SkOverdrawColorFilter.cpp
-FILE: ../../../third_party/skia/src/effects/imagefilters/SkArithmeticImageFilter.cpp
-FILE: ../../../third_party/skia/src/effects/imagefilters/SkShaderImageFilter.cpp
-FILE: ../../../third_party/skia/src/gpu/Swizzle.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrAppliedClip.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrAuditTrail.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrAuditTrail.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrColorSpaceXform.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrColorSpaceXform.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrDirectContextPriv.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrFixedClip.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrOpsRenderPass.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrOpsRenderPass.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrProgramDesc.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrRenderTargetProxy.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrRenderTargetProxy.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrResourceHandle.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrScissorState.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrShaderVar.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrShaderVar.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrStencilSettings.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrStyle.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrStyle.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrSurfaceProxy.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrSurfaceProxy.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrTextureProxy.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrTextureProxy.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrTextureRenderTargetProxy.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrTextureRenderTargetProxy.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrUserStencilSettings.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrWindowRectangles.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrWindowRectsState.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/SurfaceContext.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/SurfaceContext.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DPipelineStateDataManager.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrShadowGeoProc.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrShadowGeoProc.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/geometry/GrStyledShape.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/geometry/GrStyledShape.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLBuffer.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLBuffer.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLOpsRenderPass.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/glfw/GrGLMakeNativeInterface_glfw.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/glsl/GrGLSLColorSpaceXformHelper.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/glsl/GrGLSLProgramDataManager.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/GrPathStencilSettings.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/RegionOp.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/RegionOp.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/ShadowRRectOp.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/ShadowRRectOp.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkDescriptorPool.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkDescriptorPool.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkDescriptorSet.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkDescriptorSet.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkDescriptorSetManager.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkDescriptorSetManager.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkFramebuffer.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkFramebuffer.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkImageView.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkImageView.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkOpsRenderPass.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkOpsRenderPass.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkPipeline.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkPipeline.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkPipelineState.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkPipelineState.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkPipelineStateBuilder.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkPipelineStateBuilder.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkPipelineStateCache.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkPipelineStateDataManager.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkPipelineStateDataManager.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkResourceProvider.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkResourceProvider.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkSampler.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkSampler.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkUniformHandler.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkUniformHandler.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkVaryingHandler.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkVaryingHandler.h
-FILE: ../../../third_party/skia/src/gpu/vk/VulkanExtensions.cpp
-FILE: ../../../third_party/skia/src/images/SkImageEncoderPriv.h
-FILE: ../../../third_party/skia/src/opts/SkChecksum_opts.h
-FILE: ../../../third_party/skia/src/opts/SkOpts_avx.cpp
-FILE: ../../../third_party/skia/src/opts/SkOpts_crc32.cpp
-FILE: ../../../third_party/skia/src/opts/SkOpts_sse42.cpp
-FILE: ../../../third_party/skia/src/opts/SkSwizzler_opts.h
-FILE: ../../../third_party/skia/src/pdf/SkBitmapKey.h
-FILE: ../../../third_party/skia/src/pdf/SkPDFDocumentPriv.h
-FILE: ../../../third_party/skia/src/pdf/SkPDFMakeCIDGlyphWidthsArray.cpp
-FILE: ../../../third_party/skia/src/pdf/SkPDFMakeCIDGlyphWidthsArray.h
-FILE: ../../../third_party/skia/src/pdf/SkPDFMakeToUnicodeCmap.h
-FILE: ../../../third_party/skia/src/ports/SkFontConfigInterface.cpp
-FILE: ../../../third_party/skia/src/ports/SkFontMgr_custom_empty_factory.cpp
-FILE: ../../../third_party/skia/src/ports/SkImageGeneratorCG.cpp
-FILE: ../../../third_party/skia/src/ports/SkImageGeneratorWIC.cpp
-FILE: ../../../third_party/skia/src/shaders/SkColorFilterShader.h
-FILE: ../../../third_party/skia/src/shaders/SkColorShader.cpp
-FILE: ../../../third_party/skia/src/sksl/SkSLCompiler.cpp
-FILE: ../../../third_party/skia/src/sksl/SkSLCompiler.h
-FILE: ../../../third_party/skia/src/sksl/SkSLContext.h
-FILE: ../../../third_party/skia/src/sksl/SkSLMemoryLayout.h
-FILE: ../../../third_party/skia/src/sksl/SkSLProgramSettings.h
-FILE: ../../../third_party/skia/src/sksl/SkSLUtil.cpp
-FILE: ../../../third_party/skia/src/sksl/SkSLUtil.h
-FILE: ../../../third_party/skia/src/sksl/codegen/SkSLCodeGenerator.h
-FILE: ../../../third_party/skia/src/sksl/codegen/SkSLGLSLCodeGenerator.cpp
-FILE: ../../../third_party/skia/src/sksl/codegen/SkSLGLSLCodeGenerator.h
-FILE: ../../../third_party/skia/src/sksl/codegen/SkSLMetalCodeGenerator.cpp
-FILE: ../../../third_party/skia/src/sksl/codegen/SkSLMetalCodeGenerator.h
-FILE: ../../../third_party/skia/src/sksl/codegen/SkSLSPIRVCodeGenerator.cpp
-FILE: ../../../third_party/skia/src/sksl/codegen/SkSLSPIRVCodeGenerator.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLBinaryExpression.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLBlock.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLBreakStatement.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructor.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLContinueStatement.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLDiscardStatement.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLDoStatement.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLExpression.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLExpressionStatement.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLExtension.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLField.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLFieldAccess.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLForStatement.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLFunctionCall.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLFunctionDeclaration.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLFunctionDefinition.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLFunctionReference.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLIfStatement.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLIndexExpression.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLInterfaceBlock.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLLiteral.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLModifiersDeclaration.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLNop.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLPostfixExpression.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLPrefixExpression.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLProgram.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLReturnStatement.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLSetting.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLSwizzle.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLSymbolTable.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLSymbolTable.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLTernaryExpression.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLType.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLType.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLTypeReference.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLVarDeclarations.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLVariable.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLVariableReference.h
-FILE: ../../../third_party/skia/src/utils/SkMultiPictureDocument.cpp
-FILE: ../../../third_party/skia/src/utils/SkMultiPictureDocument.h
-FILE: ../../../third_party/skia/src/utils/SkMultiPictureDocumentPriv.h
-FILE: ../../../third_party/skia/src/utils/SkOSPath.h
+FILE: ../../../flutter/third_party/skia/fuzz/Fuzz.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/Fuzz.h
+FILE: ../../../flutter/third_party/skia/fuzz/FuzzGradients.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/FuzzMain.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/FuzzParsePath.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/FuzzPathop.cpp
+FILE: ../../../flutter/third_party/skia/gm/animated_gif.cpp
+FILE: ../../../flutter/third_party/skia/gm/animatedimageblurs.cpp
+FILE: ../../../flutter/third_party/skia/gm/arcto.cpp
+FILE: ../../../flutter/third_party/skia/gm/bigrect.cpp
+FILE: ../../../flutter/third_party/skia/gm/bitmapimage.cpp
+FILE: ../../../flutter/third_party/skia/gm/blurcircles2.cpp
+FILE: ../../../flutter/third_party/skia/gm/bug5252.cpp
+FILE: ../../../flutter/third_party/skia/gm/bug530095.cpp
+FILE: ../../../flutter/third_party/skia/gm/bug615686.cpp
+FILE: ../../../flutter/third_party/skia/gm/circulararcs.cpp
+FILE: ../../../flutter/third_party/skia/gm/clip_error.cpp
+FILE: ../../../flutter/third_party/skia/gm/colorfilteralpha8.cpp
+FILE: ../../../flutter/third_party/skia/gm/complexclip4.cpp
+FILE: ../../../flutter/third_party/skia/gm/complexclip_blur_tiled.cpp
+FILE: ../../../flutter/third_party/skia/gm/croppedrects.cpp
+FILE: ../../../flutter/third_party/skia/gm/dashcircle.cpp
+FILE: ../../../flutter/third_party/skia/gm/drawregion.cpp
+FILE: ../../../flutter/third_party/skia/gm/drawregionmodes.cpp
+FILE: ../../../flutter/third_party/skia/gm/encode_platform.cpp
+FILE: ../../../flutter/third_party/skia/gm/encode_srgb.cpp
+FILE: ../../../flutter/third_party/skia/gm/filterbug.cpp
+FILE: ../../../flutter/third_party/skia/gm/hardstop_gradients.cpp
+FILE: ../../../flutter/third_party/skia/gm/imagemakewithfilter.cpp
+FILE: ../../../flutter/third_party/skia/gm/imagemasksubset.cpp
+FILE: ../../../flutter/third_party/skia/gm/lattice.cpp
+FILE: ../../../flutter/third_party/skia/gm/overdrawcolorfilter.cpp
+FILE: ../../../flutter/third_party/skia/gm/overstroke.cpp
+FILE: ../../../flutter/third_party/skia/gm/pathmaskcache.cpp
+FILE: ../../../flutter/third_party/skia/gm/readpixels.cpp
+FILE: ../../../flutter/third_party/skia/gm/rectangletexture.cpp
+FILE: ../../../flutter/third_party/skia/gm/rrectclipdrawpaint.cpp
+FILE: ../../../flutter/third_party/skia/gm/shapes.cpp
+FILE: ../../../flutter/third_party/skia/gm/showmiplevels.cpp
+FILE: ../../../flutter/third_party/skia/gm/simplerect.cpp
+FILE: ../../../flutter/third_party/skia/gm/skbug_4868.cpp
+FILE: ../../../flutter/third_party/skia/gm/skbug_5321.cpp
+FILE: ../../../flutter/third_party/skia/gm/stroke_rect_shader.cpp
+FILE: ../../../flutter/third_party/skia/gm/strokedlines.cpp
+FILE: ../../../flutter/third_party/skia/gm/subsetshader.cpp
+FILE: ../../../flutter/third_party/skia/gm/textblobblockreordering.cpp
+FILE: ../../../flutter/third_party/skia/gm/windowrectangles.cpp
+FILE: ../../../flutter/third_party/skia/include/codec/SkCodecAnimation.h
+FILE: ../../../flutter/third_party/skia/include/core/SkBlendMode.h
+FILE: ../../../flutter/third_party/skia/include/core/SkClipOp.h
+FILE: ../../../flutter/third_party/skia/include/core/SkColorSpace.h
+FILE: ../../../flutter/third_party/skia/include/core/SkMilestone.h
+FILE: ../../../flutter/third_party/skia/include/core/SkOverdrawCanvas.h
+FILE: ../../../flutter/third_party/skia/include/core/SkRasterHandleAllocator.h
+FILE: ../../../flutter/third_party/skia/include/core/SkSwizzle.h
+FILE: ../../../flutter/third_party/skia/include/effects/SkOverdrawColorFilter.h
+FILE: ../../../flutter/third_party/skia/include/encode/SkICC.h
+FILE: ../../../flutter/third_party/skia/include/gpu/vk/GrVkBackendContext.h
+FILE: ../../../flutter/third_party/skia/include/gpu/vk/GrVkExtensions.h
+FILE: ../../../flutter/third_party/skia/include/gpu/vk/GrVkTypes.h
+FILE: ../../../flutter/third_party/skia/include/ports/SkFontMgr_FontConfigInterface.h
+FILE: ../../../flutter/third_party/skia/include/ports/SkImageGeneratorCG.h
+FILE: ../../../flutter/third_party/skia/include/ports/SkImageGeneratorWIC.h
+FILE: ../../../flutter/third_party/skia/include/private/SkEncodedInfo.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SingleOwner.h
+FILE: ../../../flutter/third_party/skia/include/utils/SkNoDrawCanvas.h
+FILE: ../../../flutter/third_party/skia/modules/sksg/slides/SVGPongSlide.cpp
+FILE: ../../../flutter/third_party/skia/modules/skshaper/include/SkShaper.h
+FILE: ../../../flutter/third_party/skia/modules/skshaper/src/SkShaper_harfbuzz.cpp
+FILE: ../../../flutter/third_party/skia/modules/skshaper/src/SkShaper_primitive.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGAttribute.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGAttributeParser.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGCircle.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGClipPath.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGContainer.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGDOM.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGDefs.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGEllipse.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGG.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGHiddenContainer.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGIDMapper.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGLine.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGLinearGradient.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGNode.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGPath.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGPoly.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGRect.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGRenderContext.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGSVG.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGShape.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGStop.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGTransformableNode.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGTypes.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGValue.h
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGAttribute.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGAttributeParser.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGCircle.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGClipPath.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGContainer.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGDOM.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGEllipse.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGLine.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGLinearGradient.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGNode.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGPath.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGPoly.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGRect.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGRenderContext.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGSVG.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGShape.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGStop.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGTransformableNode.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGValue.cpp
+FILE: ../../../flutter/third_party/skia/src/base/SkArenaAlloc.cpp
+FILE: ../../../flutter/third_party/skia/src/base/SkArenaAlloc.h
+FILE: ../../../flutter/third_party/skia/src/base/SkAutoMalloc.h
+FILE: ../../../flutter/third_party/skia/src/base/SkBitmaskEnum.h
+FILE: ../../../flutter/third_party/skia/src/base/SkLeanWindows.h
+FILE: ../../../flutter/third_party/skia/src/base/SkMSAN.h
+FILE: ../../../flutter/third_party/skia/src/base/SkScopeExit.h
+FILE: ../../../flutter/third_party/skia/src/codec/SkRawCodec.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkRawCodec.h
+FILE: ../../../flutter/third_party/skia/src/core/SkATrace.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkATrace.h
+FILE: ../../../flutter/third_party/skia/src/core/SkAnnotationKeys.h
+FILE: ../../../flutter/third_party/skia/src/core/SkAutoPixmapStorage.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkAutoPixmapStorage.h
+FILE: ../../../flutter/third_party/skia/src/core/SkBlendModePriv.h
+FILE: ../../../flutter/third_party/skia/src/core/SkColorSpace.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkColorSpacePriv.h
+FILE: ../../../flutter/third_party/skia/src/core/SkCpu.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkCpu.h
+FILE: ../../../flutter/third_party/skia/src/core/SkGlobalInitialization_core.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkImageFilterCache.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkImageFilterCache.h
+FILE: ../../../flutter/third_party/skia/src/core/SkLRUCache.h
+FILE: ../../../flutter/third_party/skia/src/core/SkMatrixPriv.h
+FILE: ../../../flutter/third_party/skia/src/core/SkOverdrawCanvas.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkPathMeasurePriv.h
+FILE: ../../../flutter/third_party/skia/src/core/SkRasterPipeline.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkRasterPipeline.h
+FILE: ../../../flutter/third_party/skia/src/core/SkRasterPipelineBlitter.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkRecordedDrawable.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkRecordedDrawable.h
+FILE: ../../../flutter/third_party/skia/src/core/SkScaleToSides.h
+FILE: ../../../flutter/third_party/skia/src/core/SkSpecialImage.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkSpecialImage.h
+FILE: ../../../flutter/third_party/skia/src/core/SkSwizzle.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkSwizzlePriv.h
+FILE: ../../../flutter/third_party/skia/src/effects/imagefilters/SkShaderImageFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/encode/SkICC.cpp
+FILE: ../../../flutter/third_party/skia/src/encode/SkICCPriv.h
+FILE: ../../../flutter/third_party/skia/src/encode/SkImageEncoderPriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/Swizzle.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrAppliedClip.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrAuditTrail.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrAuditTrail.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrColorSpaceXform.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrColorSpaceXform.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDirectContextPriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrFixedClip.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrOpsRenderPass.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrOpsRenderPass.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrProgramDesc.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrRenderTargetProxy.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrRenderTargetProxy.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrResourceHandle.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrScissorState.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrShaderVar.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrShaderVar.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrStencilSettings.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrStyle.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrStyle.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrSurfaceProxy.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrSurfaceProxy.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrTextureProxy.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrTextureProxy.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrTextureRenderTargetProxy.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrTextureRenderTargetProxy.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrUserStencilSettings.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrWindowRectangles.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrWindowRectsState.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/SurfaceContext.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/SurfaceContext.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DPipelineStateDataManager.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrShadowGeoProc.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrShadowGeoProc.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrStyledShape.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrStyledShape.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLBuffer.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLBuffer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLOpsRenderPass.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/glfw/GrGLMakeNativeInterface_glfw.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/glsl/GrGLSLColorSpaceXformHelper.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/glsl/GrGLSLProgramDataManager.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/GrPathStencilSettings.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/RegionOp.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/RegionOp.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/ShadowRRectOp.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/ShadowRRectOp.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkDescriptorPool.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkDescriptorPool.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkDescriptorSet.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkDescriptorSet.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkDescriptorSetManager.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkDescriptorSetManager.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkFramebuffer.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkFramebuffer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkImageView.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkImageView.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkOpsRenderPass.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkOpsRenderPass.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkPipeline.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkPipeline.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkPipelineState.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkPipelineState.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkPipelineStateBuilder.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkPipelineStateBuilder.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkPipelineStateCache.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkPipelineStateDataManager.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkPipelineStateDataManager.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkResourceProvider.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkResourceProvider.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkSampler.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkSampler.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkUniformHandler.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkUniformHandler.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkVaryingHandler.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkVaryingHandler.h
+FILE: ../../../flutter/third_party/skia/src/gpu/vk/VulkanExtensions.cpp
+FILE: ../../../flutter/third_party/skia/src/opts/SkSwizzler_opts.inc
+FILE: ../../../flutter/third_party/skia/src/pdf/SkBitmapKey.h
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFDocumentPriv.h
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFMakeCIDGlyphWidthsArray.cpp
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFMakeCIDGlyphWidthsArray.h
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFMakeToUnicodeCmap.h
+FILE: ../../../flutter/third_party/skia/src/ports/SkFontConfigInterface.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkImageGeneratorCG.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkImageGeneratorWIC.cpp
+FILE: ../../../flutter/third_party/skia/src/shaders/SkColorFilterShader.h
+FILE: ../../../flutter/third_party/skia/src/shaders/SkColorShader.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLCompiler.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLCompiler.h
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLContext.h
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLMemoryLayout.h
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLProgramSettings.h
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLUtil.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLUtil.h
+FILE: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLCodeGenerator.h
+FILE: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLGLSLCodeGenerator.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLGLSLCodeGenerator.h
+FILE: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLMetalCodeGenerator.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLMetalCodeGenerator.h
+FILE: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLSPIRVCodeGenerator.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLSPIRVCodeGenerator.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLBinaryExpression.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLBlock.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLBreakStatement.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructor.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLContinueStatement.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLDiscardStatement.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLDoStatement.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLExpression.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLExpressionStatement.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLExtension.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLFieldAccess.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLFieldSymbol.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLForStatement.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLFunctionCall.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLFunctionDeclaration.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLFunctionDefinition.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLFunctionReference.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLIRNode.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLIfStatement.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLIndexExpression.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLInterfaceBlock.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLLayout.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLLiteral.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLModifierFlags.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLModifiersDeclaration.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLNop.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLPostfixExpression.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLPrefixExpression.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLProgram.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLProgramElement.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLReturnStatement.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLSetting.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLStatement.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLSwizzle.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLSymbol.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLSymbolTable.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLSymbolTable.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLTernaryExpression.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLType.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLType.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLTypeReference.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLVarDeclarations.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLVariable.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLVariableReference.h
+FILE: ../../../flutter/third_party/skia/src/utils/SkMultiPictureDocument.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/SkMultiPictureDocument.h
+FILE: ../../../flutter/third_party/skia/src/utils/SkMultiPictureDocumentPriv.h
+FILE: ../../../flutter/third_party/skia/src/utils/SkOSPath.h
 ----------------------------------------------------------------------------------------------------
 Copyright 2016 Google Inc.
 
@@ -3822,9 +4379,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/fuzz/FuzzDrawFunctions.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/FuzzDrawFunctions.cpp + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/fuzz/FuzzDrawFunctions.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/FuzzDrawFunctions.cpp
 ----------------------------------------------------------------------------------------------------
 Copyright 2016 Mozilla Foundation
 
@@ -3859,9 +4416,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/src/core/SkScan_AAAPath.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkScan_AAAPath.cpp + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/src/core/SkScan_AAAPath.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkScan_AAAPath.cpp
 ----------------------------------------------------------------------------------------------------
 Copyright 2016 The Android Open Source Project
 
@@ -3896,26 +4453,29 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/infra/bots/gen_tasks_logic/gen_tasks_logic.go + ../../../LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDistanceFieldGenFromVector.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDistanceFieldGenFromVector.h + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/infra/bots/gen_tasks.go
-FILE: ../../../third_party/skia/infra/bots/gen_tasks_logic/gen_tasks_logic.go
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDistanceFieldGenFromVector.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDistanceFieldGenFromVector.h
 ----------------------------------------------------------------------------------------------------
-Copyright 2016 The Chromium Authors. All rights reserved.
+Copyright 2017 ARM Ltd.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -3932,12 +4492,445 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrDistanceFieldGenFromVector.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/dm/DMGpuTestProcs.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/FuzzCanvas.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/alpha_image.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/bitmaptiled.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/blurignorexform.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/blurimagevmask.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/blurpositioning.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/blurtextsmallradii.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/bug6643.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/bug6783.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/circle_sizes.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/crbug_691386.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/crbug_788500.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/crosscontextimage.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/dftext_blob_persp.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/drrect_small_inner.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/encode_alpha_jpeg.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/flippity.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/highcontrastfilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/hsl.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/imageblurclampmode.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/imageblurrepeatmode.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/jpg_color_cube.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/makecolorspace.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/manypaths.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/pictureshadercache.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/radial_gradient_precision.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/savelayer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/shadowutils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/srgb.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/testgradient.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/text_scale_skew.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/thinconcavepaths.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/android/SkAndroidFrameworkUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/codec/SkEncodedOrigin.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkExecutor.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkFontArguments.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkSerialProcs.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkVertices.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/docs/SkXPSDocument.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/effects/SkHighContrastFilter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/encode/SkEncoder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/encode/SkJpegEncoder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/encode/SkPngEncoder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/encode/SkWebpEncoder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/GrBackendSemaphore.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/GrBackendSurface.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlTypes.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/mock/GrMockTypes.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/ports/SkFontMgr_mac_ct.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkMalloc.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/utils/SkShadowUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/gm/ExternalProperties.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/gm/SkottieGM.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/include/Skottie.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/Skottie.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/SkottieValue.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/include/SkSGDraw.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/include/SkSGEffectNode.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/include/SkSGGeometryNode.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/include/SkSGGroup.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/include/SkSGInvalidationController.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/include/SkSGMerge.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/include/SkSGNode.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/include/SkSGPaint.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/include/SkSGPath.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/include/SkSGRect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/include/SkSGRenderNode.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/include/SkSGTransform.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/src/SkSGDraw.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/src/SkSGEffectNode.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/src/SkSGGeometryNode.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/src/SkSGGroup.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/src/SkSGInvalidationController.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/src/SkSGMerge.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/src/SkSGNode.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/src/SkSGPaint.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/src/SkSGPath.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/src/SkSGRect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/src/SkSGRenderNode.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/src/SkSGTransform.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGGradient.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGPattern.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGRadialGradient.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGUse.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGGradient.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGPattern.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGRadialGradient.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGUse.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/android/SkAndroidFrameworkUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkArenaAllocList.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkSafeMath.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkBmpBaseCodec.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkBmpBaseCodec.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkFrameHolder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkHeifCodec.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkHeifCodec.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkJpegPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkParseEncodedOrigin.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkPngPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkStubHeifDecoderAPI.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkAutoBlitterChoose.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBlendMode.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkClipStackDevice.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkClipStackDevice.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkDrawShadowInfo.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkDrawShadowInfo.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkDraw_vertices.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkExecutor.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkGaussFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkGaussFilter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkImageInfoPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMaskBlurFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMaskBlurFilter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRasterClipStack.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkVertices.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkWritePixelsRec.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/SkDashImpl.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/SkHighContrastFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/encode/SkJpegEncoderImpl.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrAHardwareBufferImageGenerator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrAHardwareBufferImageGenerator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBackendSurface.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBackendTextureImageGenerator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBackendTextureImageGenerator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrColorInfo.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrColorInfo.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDeferredProxyUploader.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDeferredUpload.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrOnFlushResourceProvider.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrOnFlushResourceProvider.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrProcessorSet.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrProcessorSet.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrResourceAllocator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrResourceAllocator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrSemaphore.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrSurfaceProxyPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrTextureProxyCacheAccess.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrTextureProxyPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/SkGr.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/StencilClip.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrAtlasedShaderHelpers.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrTextureEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrTextureEffect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLOpsRenderPass.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLSemaphore.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLSemaphore.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mock/GrMockAttachment.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mock/GrMockBuffer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mock/GrMockCaps.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mock/GrMockGpu.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mock/GrMockGpu.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mock/GrMockOpsRenderPass.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mock/GrMockTexture.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlCaps.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlCaps.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlGpu.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlGpu.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlRenderTarget.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlRenderTarget.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlTexture.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlTexture.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlTrampoline.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlTrampoline.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlUtil.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlUtil.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/ClearOp.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/TextureOp.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/TextureOp.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkSemaphore.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkSemaphore.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/opts/SkMemset_opts.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkKeyedImage.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkKeyedImage.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFGradientShader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFGradientShader.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontMgr_custom_directory.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontMgr_custom_embedded.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontMgr_custom_empty.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkOSFile_ios.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_fvar.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkShaderBase.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLFileOutputStream.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLLexer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLLexer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLOutputStream.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLString.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLString.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLStringStream.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLPipelineStageCodeGenerator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLSetting.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLSwitchCase.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLSwitchStatement.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/lex/DFA.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/lex/DFAState.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/lex/LexUtil.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/lex/Main.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/lex/NFA.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/lex/NFA.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/lex/NFAState.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/lex/NFAtoDFA.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/lex/RegexNode.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/lex/RegexNode.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/lex/RegexParser.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/lex/RegexParser.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkFloatToDecimal.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkFloatToDecimal.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkJSONWriter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkJSONWriter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkPolyUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkPolyUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkShadowTessellator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkShadowTessellator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkShadowUtils.cpp + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrDistanceFieldGenFromVector.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrDistanceFieldGenFromVector.h
+FILE: ../../../flutter/third_party/skia/dm/DMGpuTestProcs.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/FuzzCanvas.cpp
+FILE: ../../../flutter/third_party/skia/gm/alpha_image.cpp
+FILE: ../../../flutter/third_party/skia/gm/bitmaptiled.cpp
+FILE: ../../../flutter/third_party/skia/gm/blurignorexform.cpp
+FILE: ../../../flutter/third_party/skia/gm/blurimagevmask.cpp
+FILE: ../../../flutter/third_party/skia/gm/blurpositioning.cpp
+FILE: ../../../flutter/third_party/skia/gm/blurtextsmallradii.cpp
+FILE: ../../../flutter/third_party/skia/gm/bug6643.cpp
+FILE: ../../../flutter/third_party/skia/gm/bug6783.cpp
+FILE: ../../../flutter/third_party/skia/gm/circle_sizes.cpp
+FILE: ../../../flutter/third_party/skia/gm/crbug_691386.cpp
+FILE: ../../../flutter/third_party/skia/gm/crbug_788500.cpp
+FILE: ../../../flutter/third_party/skia/gm/crosscontextimage.cpp
+FILE: ../../../flutter/third_party/skia/gm/dftext_blob_persp.cpp
+FILE: ../../../flutter/third_party/skia/gm/drrect_small_inner.cpp
+FILE: ../../../flutter/third_party/skia/gm/encode_alpha_jpeg.cpp
+FILE: ../../../flutter/third_party/skia/gm/flippity.cpp
+FILE: ../../../flutter/third_party/skia/gm/highcontrastfilter.cpp
+FILE: ../../../flutter/third_party/skia/gm/hsl.cpp
+FILE: ../../../flutter/third_party/skia/gm/imageblurclampmode.cpp
+FILE: ../../../flutter/third_party/skia/gm/imageblurrepeatmode.cpp
+FILE: ../../../flutter/third_party/skia/gm/jpg_color_cube.cpp
+FILE: ../../../flutter/third_party/skia/gm/makecolorspace.cpp
+FILE: ../../../flutter/third_party/skia/gm/manypaths.cpp
+FILE: ../../../flutter/third_party/skia/gm/pictureshadercache.cpp
+FILE: ../../../flutter/third_party/skia/gm/radial_gradient_precision.cpp
+FILE: ../../../flutter/third_party/skia/gm/savelayer.cpp
+FILE: ../../../flutter/third_party/skia/gm/shadowutils.cpp
+FILE: ../../../flutter/third_party/skia/gm/srgb.cpp
+FILE: ../../../flutter/third_party/skia/gm/testgradient.cpp
+FILE: ../../../flutter/third_party/skia/gm/text_scale_skew.cpp
+FILE: ../../../flutter/third_party/skia/gm/thinconcavepaths.cpp
+FILE: ../../../flutter/third_party/skia/include/android/SkAndroidFrameworkUtils.h
+FILE: ../../../flutter/third_party/skia/include/codec/SkEncodedOrigin.h
+FILE: ../../../flutter/third_party/skia/include/core/SkExecutor.h
+FILE: ../../../flutter/third_party/skia/include/core/SkFontArguments.h
+FILE: ../../../flutter/third_party/skia/include/core/SkSerialProcs.h
+FILE: ../../../flutter/third_party/skia/include/core/SkVertices.h
+FILE: ../../../flutter/third_party/skia/include/docs/SkXPSDocument.h
+FILE: ../../../flutter/third_party/skia/include/effects/SkHighContrastFilter.h
+FILE: ../../../flutter/third_party/skia/include/encode/SkEncoder.h
+FILE: ../../../flutter/third_party/skia/include/encode/SkJpegEncoder.h
+FILE: ../../../flutter/third_party/skia/include/encode/SkPngEncoder.h
+FILE: ../../../flutter/third_party/skia/include/encode/SkWebpEncoder.h
+FILE: ../../../flutter/third_party/skia/include/gpu/GrBackendSemaphore.h
+FILE: ../../../flutter/third_party/skia/include/gpu/GrBackendSurface.h
+FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlTypes.h
+FILE: ../../../flutter/third_party/skia/include/gpu/mock/GrMockTypes.h
+FILE: ../../../flutter/third_party/skia/include/ports/SkFontMgr_mac_ct.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkMalloc.h
+FILE: ../../../flutter/third_party/skia/include/utils/SkShadowUtils.h
+FILE: ../../../flutter/third_party/skia/modules/skottie/gm/ExternalProperties.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/gm/SkottieGM.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/include/Skottie.h
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/Skottie.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/SkottieValue.h
+FILE: ../../../flutter/third_party/skia/modules/sksg/include/SkSGDraw.h
+FILE: ../../../flutter/third_party/skia/modules/sksg/include/SkSGEffectNode.h
+FILE: ../../../flutter/third_party/skia/modules/sksg/include/SkSGGeometryNode.h
+FILE: ../../../flutter/third_party/skia/modules/sksg/include/SkSGGroup.h
+FILE: ../../../flutter/third_party/skia/modules/sksg/include/SkSGInvalidationController.h
+FILE: ../../../flutter/third_party/skia/modules/sksg/include/SkSGMerge.h
+FILE: ../../../flutter/third_party/skia/modules/sksg/include/SkSGNode.h
+FILE: ../../../flutter/third_party/skia/modules/sksg/include/SkSGPaint.h
+FILE: ../../../flutter/third_party/skia/modules/sksg/include/SkSGPath.h
+FILE: ../../../flutter/third_party/skia/modules/sksg/include/SkSGRect.h
+FILE: ../../../flutter/third_party/skia/modules/sksg/include/SkSGRenderNode.h
+FILE: ../../../flutter/third_party/skia/modules/sksg/include/SkSGTransform.h
+FILE: ../../../flutter/third_party/skia/modules/sksg/src/SkSGDraw.cpp
+FILE: ../../../flutter/third_party/skia/modules/sksg/src/SkSGEffectNode.cpp
+FILE: ../../../flutter/third_party/skia/modules/sksg/src/SkSGGeometryNode.cpp
+FILE: ../../../flutter/third_party/skia/modules/sksg/src/SkSGGroup.cpp
+FILE: ../../../flutter/third_party/skia/modules/sksg/src/SkSGInvalidationController.cpp
+FILE: ../../../flutter/third_party/skia/modules/sksg/src/SkSGMerge.cpp
+FILE: ../../../flutter/third_party/skia/modules/sksg/src/SkSGNode.cpp
+FILE: ../../../flutter/third_party/skia/modules/sksg/src/SkSGPaint.cpp
+FILE: ../../../flutter/third_party/skia/modules/sksg/src/SkSGPath.cpp
+FILE: ../../../flutter/third_party/skia/modules/sksg/src/SkSGRect.cpp
+FILE: ../../../flutter/third_party/skia/modules/sksg/src/SkSGRenderNode.cpp
+FILE: ../../../flutter/third_party/skia/modules/sksg/src/SkSGTransform.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGGradient.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGPattern.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGRadialGradient.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGUse.h
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGGradient.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGPattern.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGRadialGradient.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGUse.cpp
+FILE: ../../../flutter/third_party/skia/src/android/SkAndroidFrameworkUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/base/SkArenaAllocList.h
+FILE: ../../../flutter/third_party/skia/src/base/SkSafeMath.h
+FILE: ../../../flutter/third_party/skia/src/codec/SkBmpBaseCodec.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkBmpBaseCodec.h
+FILE: ../../../flutter/third_party/skia/src/codec/SkFrameHolder.h
+FILE: ../../../flutter/third_party/skia/src/codec/SkHeifCodec.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkHeifCodec.h
+FILE: ../../../flutter/third_party/skia/src/codec/SkJpegPriv.h
+FILE: ../../../flutter/third_party/skia/src/codec/SkParseEncodedOrigin.h
+FILE: ../../../flutter/third_party/skia/src/codec/SkPngPriv.h
+FILE: ../../../flutter/third_party/skia/src/codec/SkStubHeifDecoderAPI.h
+FILE: ../../../flutter/third_party/skia/src/core/SkAutoBlitterChoose.h
+FILE: ../../../flutter/third_party/skia/src/core/SkBlendMode.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkClipStackDevice.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkClipStackDevice.h
+FILE: ../../../flutter/third_party/skia/src/core/SkDrawShadowInfo.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkDrawShadowInfo.h
+FILE: ../../../flutter/third_party/skia/src/core/SkDraw_vertices.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkExecutor.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkGaussFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkGaussFilter.h
+FILE: ../../../flutter/third_party/skia/src/core/SkImageInfoPriv.h
+FILE: ../../../flutter/third_party/skia/src/core/SkMaskBlurFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkMaskBlurFilter.h
+FILE: ../../../flutter/third_party/skia/src/core/SkRasterClipStack.h
+FILE: ../../../flutter/third_party/skia/src/core/SkVertices.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkWritePixelsRec.h
+FILE: ../../../flutter/third_party/skia/src/effects/SkDashImpl.h
+FILE: ../../../flutter/third_party/skia/src/effects/SkHighContrastFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/encode/SkJpegEncoderImpl.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrAHardwareBufferImageGenerator.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrAHardwareBufferImageGenerator.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBackendSurface.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBackendTextureImageGenerator.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBackendTextureImageGenerator.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrColorInfo.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrColorInfo.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDeferredProxyUploader.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDeferredUpload.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrOnFlushResourceProvider.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrOnFlushResourceProvider.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrProcessorSet.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrProcessorSet.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrResourceAllocator.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrResourceAllocator.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrSemaphore.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrSurfaceProxyPriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrTextureProxyCacheAccess.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrTextureProxyPriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/SkGr.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/StencilClip.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrAtlasedShaderHelpers.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrTextureEffect.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrTextureEffect.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLOpsRenderPass.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLSemaphore.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLSemaphore.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mock/GrMockAttachment.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mock/GrMockBuffer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mock/GrMockCaps.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mock/GrMockGpu.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mock/GrMockGpu.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mock/GrMockOpsRenderPass.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mock/GrMockTexture.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlCaps.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlCaps.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlGpu.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlGpu.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlRenderTarget.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlRenderTarget.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlTexture.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlTexture.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlTrampoline.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlTrampoline.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlUtil.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlUtil.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/ClearOp.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/TextureOp.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/TextureOp.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkSemaphore.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkSemaphore.h
+FILE: ../../../flutter/third_party/skia/src/opts/SkMemset_opts.h
+FILE: ../../../flutter/third_party/skia/src/pdf/SkKeyedImage.cpp
+FILE: ../../../flutter/third_party/skia/src/pdf/SkKeyedImage.h
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFGradientShader.cpp
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFGradientShader.h
+FILE: ../../../flutter/third_party/skia/src/ports/SkFontMgr_custom_directory.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkFontMgr_custom_embedded.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkFontMgr_custom_empty.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkOSFile_ios.h
+FILE: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_fvar.h
+FILE: ../../../flutter/third_party/skia/src/shaders/SkShaderBase.h
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLFileOutputStream.h
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLLexer.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLLexer.h
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLOutputStream.h
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLString.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLString.h
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLStringStream.h
+FILE: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLPipelineStageCodeGenerator.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLSetting.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLSwitchCase.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLSwitchStatement.h
+FILE: ../../../flutter/third_party/skia/src/sksl/lex/DFA.h
+FILE: ../../../flutter/third_party/skia/src/sksl/lex/DFAState.h
+FILE: ../../../flutter/third_party/skia/src/sksl/lex/LexUtil.h
+FILE: ../../../flutter/third_party/skia/src/sksl/lex/Main.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/lex/NFA.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/lex/NFA.h
+FILE: ../../../flutter/third_party/skia/src/sksl/lex/NFAState.h
+FILE: ../../../flutter/third_party/skia/src/sksl/lex/NFAtoDFA.h
+FILE: ../../../flutter/third_party/skia/src/sksl/lex/RegexNode.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/lex/RegexNode.h
+FILE: ../../../flutter/third_party/skia/src/sksl/lex/RegexParser.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/lex/RegexParser.h
+FILE: ../../../flutter/third_party/skia/src/utils/SkFloatToDecimal.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/SkFloatToDecimal.h
+FILE: ../../../flutter/third_party/skia/src/utils/SkJSONWriter.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/SkJSONWriter.h
+FILE: ../../../flutter/third_party/skia/src/utils/SkPolyUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/SkPolyUtils.h
+FILE: ../../../flutter/third_party/skia/src/utils/SkShadowTessellator.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/SkShadowTessellator.h
+FILE: ../../../flutter/third_party/skia/src/utils/SkShadowUtils.cpp
 ----------------------------------------------------------------------------------------------------
-Copyright 2017 ARM Ltd.
+Copyright 2017 Google Inc.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -3970,243 +4963,437 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/bench/ClipMaskBench.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/FuzzCommon.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/FuzzPathMeasure.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/FuzzRegionOp.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzImageFilterDeserialize.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzPathDeserialize.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzRegionDeserialize.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzRegionSetPath.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/analytic_gradients.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/androidblendmodes.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/b_119394958.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/clockwise.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/crbug_847759.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/crbug_884166.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/crbug_887103.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/crbug_892988.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/crbug_899512.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/crbug_905548.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/daa.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/drawimageset.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/drawquadset.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/fontregen.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/fwidth_squircle.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/gradients_degenerate.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/hugepath.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/localmatrixshader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/make_raster_image.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/mandoline.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/orientation.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/p3.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/pathmeasure.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/perspimages.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/polygonoffset.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/scaledemoji.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/scaledemoji_rendering.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/shadermaskfilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/sharedcorners.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/trickycubicstrokes.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/unpremul.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/wacky_yuv_formats.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/android/SkAnimatedImage.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkCanvasVirtualEnforcer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkContourMeasure.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkCoverageMode.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkCubicMap.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkFontMetrics.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkFontParameters.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkFontTypes.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkSpan.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/effects/SkShaderMaskFilter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/effects/SkTrimPathEffect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/GrBackendDrawableInfo.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/GrDriverBugWorkarounds.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/vk/GrBackendDrawableInfo.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/vk/GrVkMemoryAllocator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/ports/SkFontMgr_fuchsia.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkMacros.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkSafe32.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkSpan_impl.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkTo.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/gpu/vk/SkiaVulkan.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/utils/SkTextUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skcms/skcms.cc + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skcms/src/Transform_inl.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skcms/src/skcms_internals.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skcms/src/skcms_public.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/include/SkottieProperty.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/SkottieJson.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/SkottieJson.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/SkottiePriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/SkottieProperty.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/SkottieTest.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/SkottieTool.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/layers/PrecompLayer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/layers/TextLayer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/layers/shapelayer/ShapeLayer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/utils/SkottieUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/utils/SkottieUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skresources/src/SkAnimCodecPlayer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skresources/src/SkAnimCodecPlayer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/include/SkSGClipEffect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/include/SkSGColorFilter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/include/SkSGGradient.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/include/SkSGImage.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/include/SkSGMaskEffect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/include/SkSGOpacityEffect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/include/SkSGPlane.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/include/SkSGScene.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/include/SkSGText.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/src/SkSGClipEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/src/SkSGColorFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/src/SkSGGradient.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/src/SkSGImage.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/src/SkSGMaskEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/src/SkSGOpacityEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/src/SkSGPlane.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/src/SkSGScene.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/src/SkSGText.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skshaper/src/SkShaper.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/android/SkAnimatedImage.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkTDArray.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkEncodedInfo.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkParseEncodedOrigin.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkWuffsCodec.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkCanvasPriv.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkColorSpaceXformSteps.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkColorSpaceXformSteps.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkContourMeasure.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkCubicMap.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkDraw_text.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkFontPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkIPoint16.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMaskFilterBase.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPath_serial.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPicturePriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRRectPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRectPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkSafeRange.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkStrikeCache.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkTextBlobPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkTypeface_remote.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/SkShaderMaskFilterImpl.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/SkTrimPE.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/SkTrimPathEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrContextThreadSafeProxyPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDDLContext.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDirectContext.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDriverBugWorkarounds.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrFPArgs.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrProxyProvider.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrProxyProvider.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrResourceProviderPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrSurfaceCharacterization.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrSkSLFP.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrSkSLFP.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrYUVtoRGBEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrYUVtoRGBEffect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrQuad.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gradients/GrGradientBitmapCache.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gradients/GrGradientBitmapCache.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gradients/GrGradientShader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gradients/GrGradientShader.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/image/SkImage_GaneshBase.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/image/SkImage_GaneshBase.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/image/SkImage_GaneshYUVA.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/image/SkImage_GaneshYUVA.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlAttachment.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlAttachment.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlBuffer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlBuffer.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlCppUtil.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlDepthStencil.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlOpsRenderPass.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlOpsRenderPass.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlPipelineState.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlPipelineState.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlPipelineStateBuilder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlPipelineStateBuilder.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlPipelineStateDataManager.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlPipelineStateDataManager.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlResourceProvider.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlResourceProvider.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlSampler.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlSampler.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlTextureRenderTarget.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlTextureRenderTarget.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlUniformHandler.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlUniformHandler.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlVaryingHandler.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlVaryingHandler.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/DrawableOp.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/DrawableOp.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/FillRRectOp.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/FillRRectOp.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/FillRectOp.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/FillRectOp.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/QuadPerEdgeAA.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/QuadPerEdgeAA.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/StrokeRectOp.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/StrokeRectOp.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/text/GrAtlasManager.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/text/GrAtlasManager.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkCommandPool.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkCommandPool.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkImageLayout.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkSamplerYcbcrConversion.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkSamplerYcbcrConversion.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkTypesPriv.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkTypesPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/vk/VulkanAMDMemoryAllocator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/vk/VulkanAMDMemoryAllocator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/vk/vulkanmemoryallocator/VulkanMemoryAllocatorWrapper.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/vk/vulkanmemoryallocator/VulkanMemoryAllocatorWrapper.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/image/SkImage_Lazy.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/opts/SkBitmapProcState_opts.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/opts/SkOpts_hsw.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/opts/SkOpts_skx.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/opts/SkRasterPipeline_opts.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkPathOpsAsWinding.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pathops/SkPathOpsTCurve.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkClusterator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkClusterator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFTag.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFTag.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontMgr_fuchsia.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLPipelineStageCodeGenerator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLVariableReference.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/text/gpu/SDFMaskFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/text/gpu/SkChromeRemoteGlyphCache.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkCallableTraits.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkJSON.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkJSON.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkTextUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/mac/SkUniqueCFRef.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/win/SkDWriteNTDDI_VERSION.h + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/bench/ClipMaskBench.cpp
-FILE: ../../../third_party/skia/bench/ClipStrategyBench.cpp
-FILE: ../../../third_party/skia/bench/PathTextBench.cpp
-FILE: ../../../third_party/skia/bench/ShadowBench.cpp
-FILE: ../../../third_party/skia/dm/DMGpuTestProcs.cpp
-FILE: ../../../third_party/skia/example/HelloWorld.cpp
-FILE: ../../../third_party/skia/example/HelloWorld.h
-FILE: ../../../third_party/skia/fuzz/FuzzCanvas.cpp
-FILE: ../../../third_party/skia/gm/alpha_image.cpp
-FILE: ../../../third_party/skia/gm/bitmaptiled.cpp
-FILE: ../../../third_party/skia/gm/blurignorexform.cpp
-FILE: ../../../third_party/skia/gm/blurimagevmask.cpp
-FILE: ../../../third_party/skia/gm/blurpositioning.cpp
-FILE: ../../../third_party/skia/gm/blurtextsmallradii.cpp
-FILE: ../../../third_party/skia/gm/bug6643.cpp
-FILE: ../../../third_party/skia/gm/bug6783.cpp
-FILE: ../../../third_party/skia/gm/circle_sizes.cpp
-FILE: ../../../third_party/skia/gm/crbug_691386.cpp
-FILE: ../../../third_party/skia/gm/crbug_788500.cpp
-FILE: ../../../third_party/skia/gm/crosscontextimage.cpp
-FILE: ../../../third_party/skia/gm/dftext_blob_persp.cpp
-FILE: ../../../third_party/skia/gm/drrect_small_inner.cpp
-FILE: ../../../third_party/skia/gm/encode_alpha_jpeg.cpp
-FILE: ../../../third_party/skia/gm/flippity.cpp
-FILE: ../../../third_party/skia/gm/highcontrastfilter.cpp
-FILE: ../../../third_party/skia/gm/hsl.cpp
-FILE: ../../../third_party/skia/gm/imageblurclampmode.cpp
-FILE: ../../../third_party/skia/gm/imageblurrepeatmode.cpp
-FILE: ../../../third_party/skia/gm/jpg_color_cube.cpp
-FILE: ../../../third_party/skia/gm/makecolorspace.cpp
-FILE: ../../../third_party/skia/gm/manypaths.cpp
-FILE: ../../../third_party/skia/gm/pictureshadercache.cpp
-FILE: ../../../third_party/skia/gm/radial_gradient_precision.cpp
-FILE: ../../../third_party/skia/gm/savelayer.cpp
-FILE: ../../../third_party/skia/gm/shadowutils.cpp
-FILE: ../../../third_party/skia/gm/simple_magnification.cpp
-FILE: ../../../third_party/skia/gm/srgb.cpp
-FILE: ../../../third_party/skia/gm/testgradient.cpp
-FILE: ../../../third_party/skia/gm/text_scale_skew.cpp
-FILE: ../../../third_party/skia/gm/thinconcavepaths.cpp
-FILE: ../../../third_party/skia/include/android/SkAndroidFrameworkUtils.h
-FILE: ../../../third_party/skia/include/codec/SkEncodedOrigin.h
-FILE: ../../../third_party/skia/include/core/SkDeferredDisplayList.h
-FILE: ../../../third_party/skia/include/core/SkDeferredDisplayListRecorder.h
-FILE: ../../../third_party/skia/include/core/SkExecutor.h
-FILE: ../../../third_party/skia/include/core/SkFontArguments.h
-FILE: ../../../third_party/skia/include/core/SkPromiseImageTexture.h
-FILE: ../../../third_party/skia/include/core/SkSerialProcs.h
-FILE: ../../../third_party/skia/include/core/SkSurfaceCharacterization.h
-FILE: ../../../third_party/skia/include/core/SkVertices.h
-FILE: ../../../third_party/skia/include/docs/SkXPSDocument.h
-FILE: ../../../third_party/skia/include/effects/SkHighContrastFilter.h
-FILE: ../../../third_party/skia/include/encode/SkEncoder.h
-FILE: ../../../third_party/skia/include/encode/SkJpegEncoder.h
-FILE: ../../../third_party/skia/include/encode/SkPngEncoder.h
-FILE: ../../../third_party/skia/include/encode/SkWebpEncoder.h
-FILE: ../../../third_party/skia/include/gpu/GrBackendSemaphore.h
-FILE: ../../../third_party/skia/include/gpu/GrBackendSurface.h
-FILE: ../../../third_party/skia/include/gpu/mock/GrMockTypes.h
-FILE: ../../../third_party/skia/include/gpu/mtl/GrMtlTypes.h
-FILE: ../../../third_party/skia/include/ports/SkFontMgr_mac_ct.h
-FILE: ../../../third_party/skia/include/private/SkImageInfoPriv.h
-FILE: ../../../third_party/skia/include/private/SkMalloc.h
-FILE: ../../../third_party/skia/include/private/SkSLString.h
-FILE: ../../../third_party/skia/include/private/SkShadowFlags.h
-FILE: ../../../third_party/skia/include/utils/SkShadowUtils.h
-FILE: ../../../third_party/skia/modules/skottie/gm/ExternalProperties.cpp
-FILE: ../../../third_party/skia/modules/skottie/gm/SkottieGM.cpp
-FILE: ../../../third_party/skia/modules/skottie/include/Skottie.h
-FILE: ../../../third_party/skia/modules/skottie/src/Skottie.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/SkottieValue.h
-FILE: ../../../third_party/skia/modules/sksg/include/SkSGDraw.h
-FILE: ../../../third_party/skia/modules/sksg/include/SkSGEffectNode.h
-FILE: ../../../third_party/skia/modules/sksg/include/SkSGGeometryNode.h
-FILE: ../../../third_party/skia/modules/sksg/include/SkSGGroup.h
-FILE: ../../../third_party/skia/modules/sksg/include/SkSGInvalidationController.h
-FILE: ../../../third_party/skia/modules/sksg/include/SkSGMerge.h
-FILE: ../../../third_party/skia/modules/sksg/include/SkSGNode.h
-FILE: ../../../third_party/skia/modules/sksg/include/SkSGPaint.h
-FILE: ../../../third_party/skia/modules/sksg/include/SkSGPath.h
-FILE: ../../../third_party/skia/modules/sksg/include/SkSGRect.h
-FILE: ../../../third_party/skia/modules/sksg/include/SkSGRenderNode.h
-FILE: ../../../third_party/skia/modules/sksg/include/SkSGTransform.h
-FILE: ../../../third_party/skia/modules/sksg/src/SkSGDraw.cpp
-FILE: ../../../third_party/skia/modules/sksg/src/SkSGEffectNode.cpp
-FILE: ../../../third_party/skia/modules/sksg/src/SkSGGeometryNode.cpp
-FILE: ../../../third_party/skia/modules/sksg/src/SkSGGroup.cpp
-FILE: ../../../third_party/skia/modules/sksg/src/SkSGInvalidationController.cpp
-FILE: ../../../third_party/skia/modules/sksg/src/SkSGMerge.cpp
-FILE: ../../../third_party/skia/modules/sksg/src/SkSGNode.cpp
-FILE: ../../../third_party/skia/modules/sksg/src/SkSGPaint.cpp
-FILE: ../../../third_party/skia/modules/sksg/src/SkSGPath.cpp
-FILE: ../../../third_party/skia/modules/sksg/src/SkSGRect.cpp
-FILE: ../../../third_party/skia/modules/sksg/src/SkSGRenderNode.cpp
-FILE: ../../../third_party/skia/modules/sksg/src/SkSGTransform.cpp
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGGradient.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGPattern.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGRadialGradient.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGUse.h
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGGradient.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGPattern.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGRadialGradient.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGUse.cpp
-FILE: ../../../third_party/skia/src/android/SkAndroidFrameworkUtils.cpp
-FILE: ../../../third_party/skia/src/codec/SkBmpBaseCodec.cpp
-FILE: ../../../third_party/skia/src/codec/SkBmpBaseCodec.h
-FILE: ../../../third_party/skia/src/codec/SkFrameHolder.h
-FILE: ../../../third_party/skia/src/codec/SkHeifCodec.cpp
-FILE: ../../../third_party/skia/src/codec/SkHeifCodec.h
-FILE: ../../../third_party/skia/src/codec/SkJpegPriv.h
-FILE: ../../../third_party/skia/src/codec/SkParseEncodedOrigin.h
-FILE: ../../../third_party/skia/src/codec/SkPngPriv.h
-FILE: ../../../third_party/skia/src/codec/SkStubHeifDecoderAPI.h
-FILE: ../../../third_party/skia/src/core/SkArenaAllocList.h
-FILE: ../../../third_party/skia/src/core/SkAutoBlitterChoose.h
-FILE: ../../../third_party/skia/src/core/SkBlendMode.cpp
-FILE: ../../../third_party/skia/src/core/SkClipStackDevice.cpp
-FILE: ../../../third_party/skia/src/core/SkClipStackDevice.h
-FILE: ../../../third_party/skia/src/core/SkDeferredDisplayListRecorder.cpp
-FILE: ../../../third_party/skia/src/core/SkDrawShadowInfo.cpp
-FILE: ../../../third_party/skia/src/core/SkDrawShadowInfo.h
-FILE: ../../../third_party/skia/src/core/SkDraw_vertices.cpp
-FILE: ../../../third_party/skia/src/core/SkExecutor.cpp
-FILE: ../../../third_party/skia/src/core/SkFontMgrPriv.h
-FILE: ../../../third_party/skia/src/core/SkGaussFilter.cpp
-FILE: ../../../third_party/skia/src/core/SkGaussFilter.h
-FILE: ../../../third_party/skia/src/core/SkMaskBlurFilter.cpp
-FILE: ../../../third_party/skia/src/core/SkMaskBlurFilter.h
-FILE: ../../../third_party/skia/src/core/SkPromiseImageTexture.cpp
-FILE: ../../../third_party/skia/src/core/SkRasterClipStack.h
-FILE: ../../../third_party/skia/src/core/SkSafeMath.h
-FILE: ../../../third_party/skia/src/core/SkVertices.cpp
-FILE: ../../../third_party/skia/src/core/SkWritePixelsRec.h
-FILE: ../../../third_party/skia/src/effects/SkDashImpl.h
-FILE: ../../../third_party/skia/src/effects/SkHighContrastFilter.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrAHardwareBufferImageGenerator.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrAHardwareBufferImageGenerator.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrBackendSurface.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrBackendTextureImageGenerator.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrBackendTextureImageGenerator.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrColorInfo.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrColorInfo.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrDeferredProxyUploader.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrDeferredUpload.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrOnFlushResourceProvider.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrOnFlushResourceProvider.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrProcessorSet.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrProcessorSet.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrResourceAllocator.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrResourceAllocator.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrSemaphore.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrSurfaceProxyPriv.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrTextureProxyCacheAccess.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrTextureProxyPriv.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/SkGr.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/StencilClip.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrAtlasedShaderHelpers.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrTextureEffect.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrTextureEffect.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLOpsRenderPass.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLSemaphore.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLSemaphore.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mock/GrMockAttachment.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mock/GrMockBuffer.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mock/GrMockCaps.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mock/GrMockGpu.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/mock/GrMockGpu.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mock/GrMockOpsRenderPass.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mock/GrMockTexture.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlCaps.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlCaps.mm
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlGpu.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlGpu.mm
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlRenderTarget.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlRenderTarget.mm
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlTexture.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlTexture.mm
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlTrampoline.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlTrampoline.mm
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlUtil.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlUtil.mm
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/ClearOp.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/TextureOp.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/TextureOp.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkSemaphore.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkSemaphore.h
-FILE: ../../../third_party/skia/src/opts/SkUtils_opts.h
-FILE: ../../../third_party/skia/src/pdf/SkKeyedImage.cpp
-FILE: ../../../third_party/skia/src/pdf/SkKeyedImage.h
-FILE: ../../../third_party/skia/src/pdf/SkPDFGradientShader.cpp
-FILE: ../../../third_party/skia/src/pdf/SkPDFGradientShader.h
-FILE: ../../../third_party/skia/src/ports/SkFontMgr_custom_directory.cpp
-FILE: ../../../third_party/skia/src/ports/SkFontMgr_custom_embedded.cpp
-FILE: ../../../third_party/skia/src/ports/SkFontMgr_custom_empty.cpp
-FILE: ../../../third_party/skia/src/ports/SkFontMgr_mac_ct_factory.cpp
-FILE: ../../../third_party/skia/src/ports/SkOSFile_ios.h
-FILE: ../../../third_party/skia/src/sfnt/SkOTTable_fvar.h
-FILE: ../../../third_party/skia/src/shaders/SkShaderBase.h
-FILE: ../../../third_party/skia/src/sksl/SkSLFileOutputStream.h
-FILE: ../../../third_party/skia/src/sksl/SkSLLexer.cpp
-FILE: ../../../third_party/skia/src/sksl/SkSLLexer.h
-FILE: ../../../third_party/skia/src/sksl/SkSLOutputStream.h
-FILE: ../../../third_party/skia/src/sksl/SkSLString.cpp
-FILE: ../../../third_party/skia/src/sksl/SkSLStringStream.h
-FILE: ../../../third_party/skia/src/sksl/codegen/SkSLPipelineStageCodeGenerator.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLSetting.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLSwitchCase.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLSwitchStatement.h
-FILE: ../../../third_party/skia/src/sksl/lex/DFA.h
-FILE: ../../../third_party/skia/src/sksl/lex/DFAState.h
-FILE: ../../../third_party/skia/src/sksl/lex/LexUtil.h
-FILE: ../../../third_party/skia/src/sksl/lex/Main.cpp
-FILE: ../../../third_party/skia/src/sksl/lex/NFA.cpp
-FILE: ../../../third_party/skia/src/sksl/lex/NFA.h
-FILE: ../../../third_party/skia/src/sksl/lex/NFAState.h
-FILE: ../../../third_party/skia/src/sksl/lex/NFAtoDFA.h
-FILE: ../../../third_party/skia/src/sksl/lex/RegexNode.cpp
-FILE: ../../../third_party/skia/src/sksl/lex/RegexNode.h
-FILE: ../../../third_party/skia/src/sksl/lex/RegexParser.cpp
-FILE: ../../../third_party/skia/src/sksl/lex/RegexParser.h
-FILE: ../../../third_party/skia/src/utils/SkFloatToDecimal.cpp
-FILE: ../../../third_party/skia/src/utils/SkFloatToDecimal.h
-FILE: ../../../third_party/skia/src/utils/SkJSONWriter.cpp
-FILE: ../../../third_party/skia/src/utils/SkJSONWriter.h
-FILE: ../../../third_party/skia/src/utils/SkPolyUtils.cpp
-FILE: ../../../third_party/skia/src/utils/SkPolyUtils.h
-FILE: ../../../third_party/skia/src/utils/SkShadowTessellator.cpp
-FILE: ../../../third_party/skia/src/utils/SkShadowTessellator.h
-FILE: ../../../third_party/skia/src/utils/SkShadowUtils.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/FuzzCommon.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/FuzzPathMeasure.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/FuzzRegionOp.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzImageFilterDeserialize.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzPathDeserialize.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzRegionDeserialize.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzRegionSetPath.cpp
+FILE: ../../../flutter/third_party/skia/gm/analytic_gradients.cpp
+FILE: ../../../flutter/third_party/skia/gm/androidblendmodes.cpp
+FILE: ../../../flutter/third_party/skia/gm/b_119394958.cpp
+FILE: ../../../flutter/third_party/skia/gm/clockwise.cpp
+FILE: ../../../flutter/third_party/skia/gm/crbug_847759.cpp
+FILE: ../../../flutter/third_party/skia/gm/crbug_884166.cpp
+FILE: ../../../flutter/third_party/skia/gm/crbug_887103.cpp
+FILE: ../../../flutter/third_party/skia/gm/crbug_892988.cpp
+FILE: ../../../flutter/third_party/skia/gm/crbug_899512.cpp
+FILE: ../../../flutter/third_party/skia/gm/crbug_905548.cpp
+FILE: ../../../flutter/third_party/skia/gm/daa.cpp
+FILE: ../../../flutter/third_party/skia/gm/drawimageset.cpp
+FILE: ../../../flutter/third_party/skia/gm/drawquadset.cpp
+FILE: ../../../flutter/third_party/skia/gm/fontregen.cpp
+FILE: ../../../flutter/third_party/skia/gm/fwidth_squircle.cpp
+FILE: ../../../flutter/third_party/skia/gm/gradients_degenerate.cpp
+FILE: ../../../flutter/third_party/skia/gm/hugepath.cpp
+FILE: ../../../flutter/third_party/skia/gm/localmatrixshader.cpp
+FILE: ../../../flutter/third_party/skia/gm/make_raster_image.cpp
+FILE: ../../../flutter/third_party/skia/gm/mandoline.cpp
+FILE: ../../../flutter/third_party/skia/gm/orientation.cpp
+FILE: ../../../flutter/third_party/skia/gm/p3.cpp
+FILE: ../../../flutter/third_party/skia/gm/pathmeasure.cpp
+FILE: ../../../flutter/third_party/skia/gm/perspimages.cpp
+FILE: ../../../flutter/third_party/skia/gm/polygonoffset.cpp
+FILE: ../../../flutter/third_party/skia/gm/scaledemoji.cpp
+FILE: ../../../flutter/third_party/skia/gm/scaledemoji_rendering.cpp
+FILE: ../../../flutter/third_party/skia/gm/shadermaskfilter.cpp
+FILE: ../../../flutter/third_party/skia/gm/sharedcorners.cpp
+FILE: ../../../flutter/third_party/skia/gm/trickycubicstrokes.cpp
+FILE: ../../../flutter/third_party/skia/gm/unpremul.cpp
+FILE: ../../../flutter/third_party/skia/gm/wacky_yuv_formats.cpp
+FILE: ../../../flutter/third_party/skia/include/android/SkAnimatedImage.h
+FILE: ../../../flutter/third_party/skia/include/core/SkCanvasVirtualEnforcer.h
+FILE: ../../../flutter/third_party/skia/include/core/SkContourMeasure.h
+FILE: ../../../flutter/third_party/skia/include/core/SkCoverageMode.h
+FILE: ../../../flutter/third_party/skia/include/core/SkCubicMap.h
+FILE: ../../../flutter/third_party/skia/include/core/SkFontMetrics.h
+FILE: ../../../flutter/third_party/skia/include/core/SkFontParameters.h
+FILE: ../../../flutter/third_party/skia/include/core/SkFontTypes.h
+FILE: ../../../flutter/third_party/skia/include/core/SkSpan.h
+FILE: ../../../flutter/third_party/skia/include/effects/SkShaderMaskFilter.h
+FILE: ../../../flutter/third_party/skia/include/effects/SkTrimPathEffect.h
+FILE: ../../../flutter/third_party/skia/include/gpu/GrBackendDrawableInfo.h
+FILE: ../../../flutter/third_party/skia/include/gpu/GrDriverBugWorkarounds.h
+FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/vk/GrBackendDrawableInfo.h
+FILE: ../../../flutter/third_party/skia/include/gpu/vk/GrVkMemoryAllocator.h
+FILE: ../../../flutter/third_party/skia/include/ports/SkFontMgr_fuchsia.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkMacros.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkSafe32.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkSpan_impl.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkTo.h
+FILE: ../../../flutter/third_party/skia/include/private/gpu/vk/SkiaVulkan.h
+FILE: ../../../flutter/third_party/skia/include/utils/SkTextUtils.h
+FILE: ../../../flutter/third_party/skia/modules/skcms/skcms.cc
+FILE: ../../../flutter/third_party/skia/modules/skcms/src/Transform_inl.h
+FILE: ../../../flutter/third_party/skia/modules/skcms/src/skcms_internals.h
+FILE: ../../../flutter/third_party/skia/modules/skcms/src/skcms_public.h
+FILE: ../../../flutter/third_party/skia/modules/skottie/include/SkottieProperty.h
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/SkottieJson.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/SkottieJson.h
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/SkottiePriv.h
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/SkottieProperty.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/SkottieTest.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/SkottieTool.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/layers/PrecompLayer.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/layers/TextLayer.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/layers/shapelayer/ShapeLayer.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/utils/SkottieUtils.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/utils/SkottieUtils.h
+FILE: ../../../flutter/third_party/skia/modules/skresources/src/SkAnimCodecPlayer.cpp
+FILE: ../../../flutter/third_party/skia/modules/skresources/src/SkAnimCodecPlayer.h
+FILE: ../../../flutter/third_party/skia/modules/sksg/include/SkSGClipEffect.h
+FILE: ../../../flutter/third_party/skia/modules/sksg/include/SkSGColorFilter.h
+FILE: ../../../flutter/third_party/skia/modules/sksg/include/SkSGGradient.h
+FILE: ../../../flutter/third_party/skia/modules/sksg/include/SkSGImage.h
+FILE: ../../../flutter/third_party/skia/modules/sksg/include/SkSGMaskEffect.h
+FILE: ../../../flutter/third_party/skia/modules/sksg/include/SkSGOpacityEffect.h
+FILE: ../../../flutter/third_party/skia/modules/sksg/include/SkSGPlane.h
+FILE: ../../../flutter/third_party/skia/modules/sksg/include/SkSGScene.h
+FILE: ../../../flutter/third_party/skia/modules/sksg/include/SkSGText.h
+FILE: ../../../flutter/third_party/skia/modules/sksg/src/SkSGClipEffect.cpp
+FILE: ../../../flutter/third_party/skia/modules/sksg/src/SkSGColorFilter.cpp
+FILE: ../../../flutter/third_party/skia/modules/sksg/src/SkSGGradient.cpp
+FILE: ../../../flutter/third_party/skia/modules/sksg/src/SkSGImage.cpp
+FILE: ../../../flutter/third_party/skia/modules/sksg/src/SkSGMaskEffect.cpp
+FILE: ../../../flutter/third_party/skia/modules/sksg/src/SkSGOpacityEffect.cpp
+FILE: ../../../flutter/third_party/skia/modules/sksg/src/SkSGPlane.cpp
+FILE: ../../../flutter/third_party/skia/modules/sksg/src/SkSGScene.cpp
+FILE: ../../../flutter/third_party/skia/modules/sksg/src/SkSGText.cpp
+FILE: ../../../flutter/third_party/skia/modules/skshaper/src/SkShaper.cpp
+FILE: ../../../flutter/third_party/skia/src/android/SkAnimatedImage.cpp
+FILE: ../../../flutter/third_party/skia/src/base/SkTDArray.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkEncodedInfo.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkParseEncodedOrigin.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkWuffsCodec.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkCanvasPriv.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkColorSpaceXformSteps.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkColorSpaceXformSteps.h
+FILE: ../../../flutter/third_party/skia/src/core/SkContourMeasure.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkCubicMap.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkDraw_text.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkFontPriv.h
+FILE: ../../../flutter/third_party/skia/src/core/SkIPoint16.h
+FILE: ../../../flutter/third_party/skia/src/core/SkMaskFilterBase.h
+FILE: ../../../flutter/third_party/skia/src/core/SkPath_serial.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkPicturePriv.h
+FILE: ../../../flutter/third_party/skia/src/core/SkRRectPriv.h
+FILE: ../../../flutter/third_party/skia/src/core/SkRectPriv.h
+FILE: ../../../flutter/third_party/skia/src/core/SkSafeRange.h
+FILE: ../../../flutter/third_party/skia/src/core/SkStrikeCache.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkTextBlobPriv.h
+FILE: ../../../flutter/third_party/skia/src/core/SkTypeface_remote.h
+FILE: ../../../flutter/third_party/skia/src/effects/SkShaderMaskFilterImpl.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/SkTrimPE.h
+FILE: ../../../flutter/third_party/skia/src/effects/SkTrimPathEffect.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrContextThreadSafeProxyPriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDDLContext.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDirectContext.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDriverBugWorkarounds.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrFPArgs.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrProxyProvider.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrProxyProvider.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrResourceProviderPriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrSurfaceCharacterization.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrSkSLFP.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrSkSLFP.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrYUVtoRGBEffect.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrYUVtoRGBEffect.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrQuad.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gradients/GrGradientBitmapCache.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gradients/GrGradientBitmapCache.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gradients/GrGradientShader.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gradients/GrGradientShader.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/image/SkImage_GaneshBase.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/image/SkImage_GaneshBase.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/image/SkImage_GaneshYUVA.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/image/SkImage_GaneshYUVA.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlAttachment.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlAttachment.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlBuffer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlBuffer.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlCppUtil.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlDepthStencil.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlOpsRenderPass.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlOpsRenderPass.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlPipelineState.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlPipelineState.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlPipelineStateBuilder.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlPipelineStateBuilder.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlPipelineStateDataManager.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlPipelineStateDataManager.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlResourceProvider.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlResourceProvider.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlSampler.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlSampler.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlTextureRenderTarget.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlTextureRenderTarget.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlUniformHandler.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlUniformHandler.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlVaryingHandler.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlVaryingHandler.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/DrawableOp.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/DrawableOp.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/FillRRectOp.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/FillRRectOp.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/FillRectOp.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/FillRectOp.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/QuadPerEdgeAA.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/QuadPerEdgeAA.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/StrokeRectOp.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/StrokeRectOp.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/text/GrAtlasManager.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/text/GrAtlasManager.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkCommandPool.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkCommandPool.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkImageLayout.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkSamplerYcbcrConversion.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkSamplerYcbcrConversion.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkTypesPriv.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkTypesPriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/vk/VulkanAMDMemoryAllocator.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/vk/VulkanAMDMemoryAllocator.h
+FILE: ../../../flutter/third_party/skia/src/gpu/vk/vulkanmemoryallocator/VulkanMemoryAllocatorWrapper.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/vk/vulkanmemoryallocator/VulkanMemoryAllocatorWrapper.h
+FILE: ../../../flutter/third_party/skia/src/image/SkImage_Lazy.h
+FILE: ../../../flutter/third_party/skia/src/opts/SkBitmapProcState_opts.h
+FILE: ../../../flutter/third_party/skia/src/opts/SkOpts_hsw.cpp
+FILE: ../../../flutter/third_party/skia/src/opts/SkOpts_skx.cpp
+FILE: ../../../flutter/third_party/skia/src/opts/SkRasterPipeline_opts.h
+FILE: ../../../flutter/third_party/skia/src/pathops/SkPathOpsAsWinding.cpp
+FILE: ../../../flutter/third_party/skia/src/pathops/SkPathOpsTCurve.h
+FILE: ../../../flutter/third_party/skia/src/pdf/SkClusterator.cpp
+FILE: ../../../flutter/third_party/skia/src/pdf/SkClusterator.h
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFTag.cpp
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFTag.h
+FILE: ../../../flutter/third_party/skia/src/ports/SkFontMgr_fuchsia.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLPipelineStageCodeGenerator.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLVariableReference.cpp
+FILE: ../../../flutter/third_party/skia/src/text/gpu/SDFMaskFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/text/gpu/SkChromeRemoteGlyphCache.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/SkCallableTraits.h
+FILE: ../../../flutter/third_party/skia/src/utils/SkJSON.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/SkJSON.h
+FILE: ../../../flutter/third_party/skia/src/utils/SkTextUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/mac/SkUniqueCFRef.h
+FILE: ../../../flutter/third_party/skia/src/utils/win/SkDWriteNTDDI_VERSION.h
 ----------------------------------------------------------------------------------------------------
-Copyright 2017 Google Inc.
+Copyright 2018 Google Inc.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -4238,27 +5425,48 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ====================================================================================================
 
 ====================================================================================================
-LIBRARY: vulkanmemoryallocator
-ORIGIN: ../../../third_party/skia/third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.cpp + ../../../third_party/skia/modules/canvaskit/npm_build/LICENSE
+LIBRARY: skia
+ORIGIN: ../../../flutter/third_party/skia/fuzz/FuzzEncoders.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/FuzzPolyUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/canvaskit/canvaskit_bindings.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/pathkit/pathkit_wasm_bindings.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skcms/src/skcms_Transform.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skcms/src/skcms_TransformBaseline.cc + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skcms/src/skcms_TransformHsw.cc + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skcms/src/skcms_TransformSkx.cc + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkNoDestructor.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkGlyph.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkTypeface_remote.cpp + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.cpp
-FILE: ../../../third_party/skia/third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.h
+FILE: ../../../flutter/third_party/skia/fuzz/FuzzEncoders.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/FuzzPolyUtils.cpp
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/canvaskit_bindings.cpp
+FILE: ../../../flutter/third_party/skia/modules/pathkit/pathkit_wasm_bindings.cpp
+FILE: ../../../flutter/third_party/skia/modules/skcms/src/skcms_Transform.h
+FILE: ../../../flutter/third_party/skia/modules/skcms/src/skcms_TransformBaseline.cc
+FILE: ../../../flutter/third_party/skia/modules/skcms/src/skcms_TransformHsw.cc
+FILE: ../../../flutter/third_party/skia/modules/skcms/src/skcms_TransformSkx.cc
+FILE: ../../../flutter/third_party/skia/src/base/SkNoDestructor.h
+FILE: ../../../flutter/third_party/skia/src/core/SkGlyph.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkTypeface_remote.cpp
 ----------------------------------------------------------------------------------------------------
-Copyright 2018 Google Inc.
+Copyright 2018 Google LLC
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -4275,237 +5483,25 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/bench/ClearBench.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/docs/SkPDFDocument.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkUTF.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkUTF.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFGlyphUse.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFSubsetFont.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFSubsetFont.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFUnion.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkUUID.h + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/bench/ClearBench.cpp
-FILE: ../../../third_party/skia/bench/CompositingImagesBench.cpp
-FILE: ../../../third_party/skia/bench/CubicMapBench.cpp
-FILE: ../../../third_party/skia/bench/ImageCycleBench.cpp
-FILE: ../../../third_party/skia/bench/JSONBench.cpp
-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/fuzz/FuzzCommon.cpp
-FILE: ../../../third_party/skia/fuzz/FuzzPathMeasure.cpp
-FILE: ../../../third_party/skia/fuzz/FuzzRegionOp.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzImageFilterDeserialize.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzPathDeserialize.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzRegionDeserialize.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzRegionSetPath.cpp
-FILE: ../../../third_party/skia/gm/analytic_gradients.cpp
-FILE: ../../../third_party/skia/gm/androidblendmodes.cpp
-FILE: ../../../third_party/skia/gm/b_119394958.cpp
-FILE: ../../../third_party/skia/gm/clockwise.cpp
-FILE: ../../../third_party/skia/gm/crbug_847759.cpp
-FILE: ../../../third_party/skia/gm/crbug_884166.cpp
-FILE: ../../../third_party/skia/gm/crbug_887103.cpp
-FILE: ../../../third_party/skia/gm/crbug_892988.cpp
-FILE: ../../../third_party/skia/gm/crbug_899512.cpp
-FILE: ../../../third_party/skia/gm/crbug_905548.cpp
-FILE: ../../../third_party/skia/gm/daa.cpp
-FILE: ../../../third_party/skia/gm/drawimageset.cpp
-FILE: ../../../third_party/skia/gm/drawquadset.cpp
-FILE: ../../../third_party/skia/gm/fontregen.cpp
-FILE: ../../../third_party/skia/gm/fwidth_squircle.cpp
-FILE: ../../../third_party/skia/gm/gradients_degenerate.cpp
-FILE: ../../../third_party/skia/gm/hugepath.cpp
-FILE: ../../../third_party/skia/gm/localmatrixshader.cpp
-FILE: ../../../third_party/skia/gm/make_raster_image.cpp
-FILE: ../../../third_party/skia/gm/mandoline.cpp
-FILE: ../../../third_party/skia/gm/orientation.cpp
-FILE: ../../../third_party/skia/gm/p3.cpp
-FILE: ../../../third_party/skia/gm/pathmeasure.cpp
-FILE: ../../../third_party/skia/gm/perspimages.cpp
-FILE: ../../../third_party/skia/gm/polygonoffset.cpp
-FILE: ../../../third_party/skia/gm/scaledemoji.cpp
-FILE: ../../../third_party/skia/gm/scaledemoji_rendering.cpp
-FILE: ../../../third_party/skia/gm/shadermaskfilter.cpp
-FILE: ../../../third_party/skia/gm/sharedcorners.cpp
-FILE: ../../../third_party/skia/gm/trickycubicstrokes.cpp
-FILE: ../../../third_party/skia/gm/unpremul.cpp
-FILE: ../../../third_party/skia/gm/wacky_yuv_formats.cpp
-FILE: ../../../third_party/skia/include/android/SkAnimatedImage.h
-FILE: ../../../third_party/skia/include/core/SkCanvasVirtualEnforcer.h
-FILE: ../../../third_party/skia/include/core/SkContourMeasure.h
-FILE: ../../../third_party/skia/include/core/SkCoverageMode.h
-FILE: ../../../third_party/skia/include/core/SkCubicMap.h
-FILE: ../../../third_party/skia/include/core/SkFontMetrics.h
-FILE: ../../../third_party/skia/include/core/SkFontParameters.h
-FILE: ../../../third_party/skia/include/core/SkFontTypes.h
-FILE: ../../../third_party/skia/include/core/SkSpan.h
-FILE: ../../../third_party/skia/include/effects/SkOpPathEffect.h
-FILE: ../../../third_party/skia/include/effects/SkShaderMaskFilter.h
-FILE: ../../../third_party/skia/include/effects/SkTrimPathEffect.h
-FILE: ../../../third_party/skia/include/gpu/GrBackendDrawableInfo.h
-FILE: ../../../third_party/skia/include/gpu/GrDriverBugWorkarounds.h
-FILE: ../../../third_party/skia/include/gpu/vk/GrVkMemoryAllocator.h
-FILE: ../../../third_party/skia/include/ports/SkFontMgr_fuchsia.h
-FILE: ../../../third_party/skia/include/private/SkMacros.h
-FILE: ../../../third_party/skia/include/private/SkSafe32.h
-FILE: ../../../third_party/skia/include/private/SkTo.h
-FILE: ../../../third_party/skia/include/private/gpu/ganesh/GrVkTypesPriv.h
-FILE: ../../../third_party/skia/include/private/gpu/vk/SkiaVulkan.h
-FILE: ../../../third_party/skia/include/utils/SkAnimCodecPlayer.h
-FILE: ../../../third_party/skia/include/utils/SkTextUtils.h
-FILE: ../../../third_party/skia/modules/skcms/skcms.cc
-FILE: ../../../third_party/skia/modules/skcms/skcms.h
-FILE: ../../../third_party/skia/modules/skcms/skcms_internal.h
-FILE: ../../../third_party/skia/modules/skcms/src/Transform_inl.h
-FILE: ../../../third_party/skia/modules/skottie/include/SkottieProperty.h
-FILE: ../../../third_party/skia/modules/skottie/src/SkottieJson.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/SkottieJson.h
-FILE: ../../../third_party/skia/modules/skottie/src/SkottiePriv.h
-FILE: ../../../third_party/skia/modules/skottie/src/SkottieProperty.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/SkottieTest.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/SkottieTool.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/layers/PrecompLayer.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/layers/TextLayer.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/ShapeLayer.cpp
-FILE: ../../../third_party/skia/modules/skottie/utils/SkottieUtils.cpp
-FILE: ../../../third_party/skia/modules/skottie/utils/SkottieUtils.h
-FILE: ../../../third_party/skia/modules/sksg/include/SkSGClipEffect.h
-FILE: ../../../third_party/skia/modules/sksg/include/SkSGColorFilter.h
-FILE: ../../../third_party/skia/modules/sksg/include/SkSGGradient.h
-FILE: ../../../third_party/skia/modules/sksg/include/SkSGImage.h
-FILE: ../../../third_party/skia/modules/sksg/include/SkSGMaskEffect.h
-FILE: ../../../third_party/skia/modules/sksg/include/SkSGOpacityEffect.h
-FILE: ../../../third_party/skia/modules/sksg/include/SkSGPlane.h
-FILE: ../../../third_party/skia/modules/sksg/include/SkSGScene.h
-FILE: ../../../third_party/skia/modules/sksg/include/SkSGText.h
-FILE: ../../../third_party/skia/modules/sksg/src/SkSGClipEffect.cpp
-FILE: ../../../third_party/skia/modules/sksg/src/SkSGColorFilter.cpp
-FILE: ../../../third_party/skia/modules/sksg/src/SkSGGradient.cpp
-FILE: ../../../third_party/skia/modules/sksg/src/SkSGImage.cpp
-FILE: ../../../third_party/skia/modules/sksg/src/SkSGMaskEffect.cpp
-FILE: ../../../third_party/skia/modules/sksg/src/SkSGOpacityEffect.cpp
-FILE: ../../../third_party/skia/modules/sksg/src/SkSGPlane.cpp
-FILE: ../../../third_party/skia/modules/sksg/src/SkSGScene.cpp
-FILE: ../../../third_party/skia/modules/sksg/src/SkSGText.cpp
-FILE: ../../../third_party/skia/modules/skshaper/src/SkShaper.cpp
-FILE: ../../../third_party/skia/src/android/SkAnimatedImage.cpp
-FILE: ../../../third_party/skia/src/codec/SkEncodedInfo.cpp
-FILE: ../../../third_party/skia/src/codec/SkParseEncodedOrigin.cpp
-FILE: ../../../third_party/skia/src/codec/SkWuffsCodec.cpp
-FILE: ../../../third_party/skia/src/codec/SkWuffsCodec.h
-FILE: ../../../third_party/skia/src/core/SkCanvasPriv.cpp
-FILE: ../../../third_party/skia/src/core/SkChromeRemoteGlyphCache.cpp
-FILE: ../../../third_party/skia/src/core/SkColorSpaceXformSteps.cpp
-FILE: ../../../third_party/skia/src/core/SkColorSpaceXformSteps.h
-FILE: ../../../third_party/skia/src/core/SkContourMeasure.cpp
-FILE: ../../../third_party/skia/src/core/SkCubicMap.cpp
-FILE: ../../../third_party/skia/src/core/SkCubicSolver.h
-FILE: ../../../third_party/skia/src/core/SkDeferredDisplayList.cpp
-FILE: ../../../third_party/skia/src/core/SkDeferredDisplayListPriv.h
-FILE: ../../../third_party/skia/src/core/SkDraw_text.cpp
-FILE: ../../../third_party/skia/src/core/SkFontPriv.h
-FILE: ../../../third_party/skia/src/core/SkGlyph.cpp
-FILE: ../../../third_party/skia/src/core/SkIPoint16.h
-FILE: ../../../third_party/skia/src/core/SkMaskFilterBase.h
-FILE: ../../../third_party/skia/src/core/SkPath_serial.cpp
-FILE: ../../../third_party/skia/src/core/SkPicturePriv.h
-FILE: ../../../third_party/skia/src/core/SkRRectPriv.h
-FILE: ../../../third_party/skia/src/core/SkRectPriv.h
-FILE: ../../../third_party/skia/src/core/SkSafeRange.h
-FILE: ../../../third_party/skia/src/core/SkStrikeCache.cpp
-FILE: ../../../third_party/skia/src/core/SkSurfaceCharacterization.cpp
-FILE: ../../../third_party/skia/src/core/SkTDArray.cpp
-FILE: ../../../third_party/skia/src/core/SkTextBlobPriv.h
-FILE: ../../../third_party/skia/src/core/SkTypeface_remote.cpp
-FILE: ../../../third_party/skia/src/core/SkTypeface_remote.h
-FILE: ../../../third_party/skia/src/effects/SkOpPE.h
-FILE: ../../../third_party/skia/src/effects/SkOpPathEffect.cpp
-FILE: ../../../third_party/skia/src/effects/SkShaderMaskFilter.cpp
-FILE: ../../../third_party/skia/src/effects/SkTrimPE.h
-FILE: ../../../third_party/skia/src/effects/SkTrimPathEffect.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrContextThreadSafeProxyPriv.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrDDLContext.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrDirectContext.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrDriverBugWorkarounds.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrFPArgs.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrProxyProvider.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrProxyProvider.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrResourceProviderPriv.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrSkSLFP.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrSkSLFP.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrYUVtoRGBEffect.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrYUVtoRGBEffect.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/geometry/GrQuad.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gradients/GrGradientBitmapCache.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gradients/GrGradientBitmapCache.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/gradients/GrGradientShader.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gradients/GrGradientShader.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlAttachment.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlAttachment.mm
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlBuffer.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlBuffer.mm
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlCppUtil.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlDepthStencil.mm
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlOpsRenderPass.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlOpsRenderPass.mm
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlPipelineState.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlPipelineState.mm
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlPipelineStateBuilder.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlPipelineStateBuilder.mm
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlPipelineStateDataManager.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlPipelineStateDataManager.mm
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlResourceProvider.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlResourceProvider.mm
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlSampler.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlSampler.mm
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlTextureRenderTarget.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlTextureRenderTarget.mm
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlUniformHandler.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlUniformHandler.mm
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlVaryingHandler.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlVaryingHandler.mm
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/DrawableOp.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/DrawableOp.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/FillRRectOp.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/FillRRectOp.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/FillRectOp.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/FillRectOp.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/QuadPerEdgeAA.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/QuadPerEdgeAA.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/StrokeRectOp.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/StrokeRectOp.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/text/GrAtlasManager.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/text/GrAtlasManager.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkCommandPool.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkCommandPool.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkImageLayout.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkSamplerYcbcrConversion.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkSamplerYcbcrConversion.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkTypesPriv.cpp
-FILE: ../../../third_party/skia/src/gpu/vk/VulkanAMDMemoryAllocator.cpp
-FILE: ../../../third_party/skia/src/gpu/vk/VulkanAMDMemoryAllocator.h
-FILE: ../../../third_party/skia/src/image/SkImage_GpuBase.cpp
-FILE: ../../../third_party/skia/src/image/SkImage_GpuBase.h
-FILE: ../../../third_party/skia/src/image/SkImage_GpuYUVA.cpp
-FILE: ../../../third_party/skia/src/image/SkImage_GpuYUVA.h
-FILE: ../../../third_party/skia/src/image/SkImage_Lazy.h
-FILE: ../../../third_party/skia/src/opts/SkBitmapProcState_opts.h
-FILE: ../../../third_party/skia/src/opts/SkOpts_hsw.cpp
-FILE: ../../../third_party/skia/src/opts/SkRasterPipeline_opts.h
-FILE: ../../../third_party/skia/src/pathops/SkPathOpsAsWinding.cpp
-FILE: ../../../third_party/skia/src/pathops/SkPathOpsTCurve.h
-FILE: ../../../third_party/skia/src/pdf/SkClusterator.cpp
-FILE: ../../../third_party/skia/src/pdf/SkClusterator.h
-FILE: ../../../third_party/skia/src/pdf/SkPDFTag.cpp
-FILE: ../../../third_party/skia/src/pdf/SkPDFTag.h
-FILE: ../../../third_party/skia/src/ports/SkFontMgr_fuchsia.cpp
-FILE: ../../../third_party/skia/src/sksl/codegen/SkSLPipelineStageCodeGenerator.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLVariableReference.cpp
-FILE: ../../../third_party/skia/src/text/gpu/SDFMaskFilter.cpp
-FILE: ../../../third_party/skia/src/utils/SkAnimCodecPlayer.cpp
-FILE: ../../../third_party/skia/src/utils/SkCallableTraits.h
-FILE: ../../../third_party/skia/src/utils/SkJSON.cpp
-FILE: ../../../third_party/skia/src/utils/SkJSON.h
-FILE: ../../../third_party/skia/src/utils/SkTextUtils.cpp
-FILE: ../../../third_party/skia/src/utils/mac/SkUniqueCFRef.h
-FILE: ../../../third_party/skia/src/utils/win/SkDWriteNTDDI_VERSION.h
+FILE: ../../../flutter/third_party/skia/include/docs/SkPDFDocument.h
+FILE: ../../../flutter/third_party/skia/src/base/SkUTF.cpp
+FILE: ../../../flutter/third_party/skia/src/base/SkUTF.h
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFGlyphUse.h
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFSubsetFont.cpp
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFSubsetFont.h
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFUnion.h
+FILE: ../../../flutter/third_party/skia/src/pdf/SkUUID.h
 ----------------------------------------------------------------------------------------------------
-Copyright 2018 Google Inc.
+Copyright 2018 Google LLC.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -4538,14 +5534,49 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/fuzz/FuzzEncoders.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/FuzzCommon.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzAPIImageFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzAndroidCodec.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzAnimatedImage.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzDrawFunctions.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzGradients.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzImage.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzIncrementalImage.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzJPEGEncoder.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzJSON.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzMockGPUCanvas.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzNullCanvas.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzPNGEncoder.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzPathMeasure.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzPathop.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzPolyUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzRasterN32Canvas.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzTextBlobDeserialize.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzWEBPEncoder.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/fuzz/FuzzSkottieJSON.cpp + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/fuzz/FuzzEncoders.cpp
-FILE: ../../../third_party/skia/fuzz/FuzzPolyUtils.cpp
-FILE: ../../../third_party/skia/modules/canvaskit/canvaskit_bindings.cpp
-FILE: ../../../third_party/skia/modules/pathkit/pathkit_wasm_bindings.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/FuzzCommon.h
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzAPIImageFilter.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzAndroidCodec.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzAnimatedImage.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzDrawFunctions.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzGradients.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzImage.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzIncrementalImage.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzJPEGEncoder.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzJSON.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzMockGPUCanvas.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzNullCanvas.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzPNGEncoder.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzPathMeasure.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzPathop.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzPolyUtils.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzRasterN32Canvas.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzTextBlobDeserialize.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzWEBPEncoder.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/fuzz/FuzzSkottieJSON.cpp
 ----------------------------------------------------------------------------------------------------
-Copyright 2018 Google LLC
+Copyright 2018 Google, LLC
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -4578,18 +5609,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/include/docs/SkPDFDocument.h + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkGlyphRunPainter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkGlyphRunPainter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/text/GlyphRun.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/text/GlyphRun.h + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/include/docs/SkPDFDocument.h
-FILE: ../../../third_party/skia/src/pdf/SkPDFGlyphUse.h
-FILE: ../../../third_party/skia/src/pdf/SkPDFSubsetFont.cpp
-FILE: ../../../third_party/skia/src/pdf/SkPDFSubsetFont.h
-FILE: ../../../third_party/skia/src/pdf/SkPDFUnion.h
-FILE: ../../../third_party/skia/src/pdf/SkUUID.h
-FILE: ../../../third_party/skia/src/utils/SkUTF.cpp
-FILE: ../../../third_party/skia/src/utils/SkUTF.h
+FILE: ../../../flutter/third_party/skia/src/core/SkGlyphRunPainter.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkGlyphRunPainter.h
+FILE: ../../../flutter/third_party/skia/src/text/GlyphRun.cpp
+FILE: ../../../flutter/third_party/skia/src/text/GlyphRun.h
 ----------------------------------------------------------------------------------------------------
-Copyright 2018 Google LLC.
+Copyright 2018 The Android Open Source Project
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -4622,30 +5652,280 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/fuzz/oss_fuzz/FuzzAPIImageFilter.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/GrDriverBugWorkaroundsAutogen.h + ../../../LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/utils/SkTraceEventPhase.h + ../../../LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/fuzz/FuzzCommon.h
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzAPIImageFilter.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzAndroidCodec.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzAnimatedImage.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzDrawFunctions.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzGradients.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzImage.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzIncrementalImage.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzJPEGEncoder.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzJSON.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzMockGPUCanvas.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzNullCanvas.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzPNGEncoder.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzPathMeasure.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzPathop.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzPolyUtils.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzRasterN32Canvas.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzTextBlobDeserialize.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzWEBPEncoder.cpp
-FILE: ../../../third_party/skia/modules/skottie/fuzz/FuzzSkottieJSON.cpp
+FILE: ../../../flutter/third_party/skia/include/gpu/GrDriverBugWorkaroundsAutogen.h
+FILE: ../../../flutter/third_party/skia/include/utils/SkTraceEventPhase.h
 ----------------------------------------------------------------------------------------------------
-Copyright 2018 Google, LLC
+Copyright 2018 The Chromium Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: skia
+ORIGIN: ../../../flutter/third_party/skia/gm/backdrop.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/backdrop_imagefilter_croprect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/bug9331.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/clip_sierpinski_region.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/collapsepaths.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/compositor_quads.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/crbug_913349.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/crbug_938592.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/crbug_947055.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/crbug_996140.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/ducky_yuv_blend.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/fiddle.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/mac_aa_explorer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/mixercolorfilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/overdrawcanvas.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/postercircle.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/skbug_8664.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/skbug_8955.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/video_decoder.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/yuv420_odd_dim.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/android/GrAHardwareBufferUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkTileMode.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/GrContextThreadSafeProxy.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/GrRecordingContext.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/ports/SkCFObject.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/chromium/GrVkSecondaryCBDrawContext.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/gpu/ganesh/GrContext_Base.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/gpu/ganesh/GrImageContext.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/include/TextShaper.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/Composition.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/Composition.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/Layer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/Layer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/effects/DropShadowEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/effects/Effects.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/effects/Effects.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/effects/FillEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/effects/GaussianBlurEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/effects/GradientEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/effects/HueSaturationEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/effects/InvertEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/effects/LevelsEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/effects/LinearWipeEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/effects/MotionBlurEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/effects/MotionBlurEffect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/effects/MotionTileEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/effects/RadialWipeEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/effects/ShiftChannelsEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/effects/TintEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/effects/TransformEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/effects/TritoneEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/effects/VenetianBlindsEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/layers/FootageLayer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/layers/NullLayer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/layers/SolidLayer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/text/RangeSelector.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/text/RangeSelector.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/text/TextAdapter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/text/TextAdapter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/text/TextAnimator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/text/TextAnimator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/text/TextShaper.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/text/TextValue.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/text/TextValue.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/include/SkSGRenderEffect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/src/SkSGNodePriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/src/SkSGRenderEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/src/SkSGTransformPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGText.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGText.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkVx.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkZip.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkScalingCodec.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkDescriptor.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkDraw_atlas.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkEffectPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkEnumerate.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPathMakers.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkStrikeSpec.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkYUVMath.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkYUVMath.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrAHardwareBufferUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBaseContextPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBuffer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrContextThreadSafeProxy.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrContext_Base.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrCpuBuffer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDataUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDataUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDirectContextPriv.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrGpuBuffer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrGpuBuffer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrImageContext.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrImageContextPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrRecordingContext.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrRecordingContextPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrSPIRVUniformHandler.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrSPIRVUniformHandler.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrSPIRVVaryingHandler.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrSPIRVVaryingHandler.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlCommandBuffer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlCommandBuffer.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlDepthStencil.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlSemaphore.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlSemaphore.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/OpsTask.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/OpsTask.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/surface/SkSurface_GaneshMtl.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkSecondaryCBDrawContext.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLDefines.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLOutputStream.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/text/StrikeForGPU.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkCharToGlyphCache.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkCharToGlyphCache.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkClipStackUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkClipStackUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/win/SkObjBase.h + ../../../flutter/third_party/skia/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/skia/gm/backdrop.cpp
+FILE: ../../../flutter/third_party/skia/gm/backdrop_imagefilter_croprect.cpp
+FILE: ../../../flutter/third_party/skia/gm/bug9331.cpp
+FILE: ../../../flutter/third_party/skia/gm/clip_sierpinski_region.cpp
+FILE: ../../../flutter/third_party/skia/gm/collapsepaths.cpp
+FILE: ../../../flutter/third_party/skia/gm/compositor_quads.cpp
+FILE: ../../../flutter/third_party/skia/gm/crbug_913349.cpp
+FILE: ../../../flutter/third_party/skia/gm/crbug_938592.cpp
+FILE: ../../../flutter/third_party/skia/gm/crbug_947055.cpp
+FILE: ../../../flutter/third_party/skia/gm/crbug_996140.cpp
+FILE: ../../../flutter/third_party/skia/gm/ducky_yuv_blend.cpp
+FILE: ../../../flutter/third_party/skia/gm/fiddle.cpp
+FILE: ../../../flutter/third_party/skia/gm/mac_aa_explorer.cpp
+FILE: ../../../flutter/third_party/skia/gm/mixercolorfilter.cpp
+FILE: ../../../flutter/third_party/skia/gm/overdrawcanvas.cpp
+FILE: ../../../flutter/third_party/skia/gm/postercircle.cpp
+FILE: ../../../flutter/third_party/skia/gm/skbug_8664.cpp
+FILE: ../../../flutter/third_party/skia/gm/skbug_8955.cpp
+FILE: ../../../flutter/third_party/skia/gm/video_decoder.cpp
+FILE: ../../../flutter/third_party/skia/gm/yuv420_odd_dim.cpp
+FILE: ../../../flutter/third_party/skia/include/android/GrAHardwareBufferUtils.h
+FILE: ../../../flutter/third_party/skia/include/core/SkTileMode.h
+FILE: ../../../flutter/third_party/skia/include/gpu/GrContextThreadSafeProxy.h
+FILE: ../../../flutter/third_party/skia/include/gpu/GrRecordingContext.h
+FILE: ../../../flutter/third_party/skia/include/ports/SkCFObject.h
+FILE: ../../../flutter/third_party/skia/include/private/chromium/GrVkSecondaryCBDrawContext.h
+FILE: ../../../flutter/third_party/skia/include/private/gpu/ganesh/GrContext_Base.h
+FILE: ../../../flutter/third_party/skia/include/private/gpu/ganesh/GrImageContext.h
+FILE: ../../../flutter/third_party/skia/modules/skottie/include/TextShaper.h
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/Composition.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/Composition.h
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/Layer.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/Layer.h
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/effects/DropShadowEffect.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/effects/Effects.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/effects/Effects.h
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/effects/FillEffect.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/effects/GaussianBlurEffect.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/effects/GradientEffect.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/effects/HueSaturationEffect.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/effects/InvertEffect.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/effects/LevelsEffect.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/effects/LinearWipeEffect.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/effects/MotionBlurEffect.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/effects/MotionBlurEffect.h
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/effects/MotionTileEffect.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/effects/RadialWipeEffect.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/effects/ShiftChannelsEffect.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/effects/TintEffect.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/effects/TransformEffect.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/effects/TritoneEffect.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/effects/VenetianBlindsEffect.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/layers/FootageLayer.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/layers/NullLayer.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/layers/SolidLayer.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/text/RangeSelector.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/text/RangeSelector.h
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/text/TextAdapter.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/text/TextAdapter.h
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/text/TextAnimator.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/text/TextAnimator.h
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/text/TextShaper.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/text/TextValue.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/text/TextValue.h
+FILE: ../../../flutter/third_party/skia/modules/sksg/include/SkSGRenderEffect.h
+FILE: ../../../flutter/third_party/skia/modules/sksg/src/SkSGNodePriv.h
+FILE: ../../../flutter/third_party/skia/modules/sksg/src/SkSGRenderEffect.cpp
+FILE: ../../../flutter/third_party/skia/modules/sksg/src/SkSGTransformPriv.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGText.h
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGText.cpp
+FILE: ../../../flutter/third_party/skia/src/base/SkVx.h
+FILE: ../../../flutter/third_party/skia/src/base/SkZip.h
+FILE: ../../../flutter/third_party/skia/src/codec/SkScalingCodec.h
+FILE: ../../../flutter/third_party/skia/src/core/SkDescriptor.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkDraw_atlas.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkEffectPriv.h
+FILE: ../../../flutter/third_party/skia/src/core/SkEnumerate.h
+FILE: ../../../flutter/third_party/skia/src/core/SkPathMakers.h
+FILE: ../../../flutter/third_party/skia/src/core/SkStrikeSpec.h
+FILE: ../../../flutter/third_party/skia/src/core/SkYUVMath.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkYUVMath.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrAHardwareBufferUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBaseContextPriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBuffer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrContextThreadSafeProxy.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrContext_Base.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrCpuBuffer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDataUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDataUtils.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDirectContextPriv.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrGpuBuffer.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrGpuBuffer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrImageContext.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrImageContextPriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrRecordingContext.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrRecordingContextPriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrSPIRVUniformHandler.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrSPIRVUniformHandler.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrSPIRVVaryingHandler.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrSPIRVVaryingHandler.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlCommandBuffer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlCommandBuffer.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlDepthStencil.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlSemaphore.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlSemaphore.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/OpsTask.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/OpsTask.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/surface/SkSurface_GaneshMtl.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkSecondaryCBDrawContext.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLDefines.h
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLOutputStream.cpp
+FILE: ../../../flutter/third_party/skia/src/text/StrikeForGPU.h
+FILE: ../../../flutter/third_party/skia/src/utils/SkCharToGlyphCache.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/SkCharToGlyphCache.h
+FILE: ../../../flutter/third_party/skia/src/utils/SkClipStackUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/SkClipStackUtils.h
+FILE: ../../../flutter/third_party/skia/src/utils/win/SkObjBase.h
+----------------------------------------------------------------------------------------------------
+Copyright 2019 Google Inc.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -4678,14 +5958,127 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/src/core/SkGlyphRunPainter.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/asyncrescaleandread.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/crbug_908646.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/crbug_946965.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/patharcto.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/runtimecolorfilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/runtimefunctions.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/runtimeintrinsics.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/runtimeshader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/skbug_9319.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/effects/SkImageFilters.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/effects/SkRuntimeEffect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/gl/GrGLAssembleHelpers.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkThreadAnnotations.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/canvaskit/WasmCommon.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/canvaskit/debugger_bindings.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/canvaskit/paragraph_bindings.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/canvaskit/skottie_bindings.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skresources/include/SkResources.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skresources/src/SkResources.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkImageFilterTypes.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkImageFilterTypes.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkImageFilter_Base.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRuntimeBlender.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRuntimeEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/AsyncReadTypes.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/Swizzle.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrClientMappedBufferManager.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrClientMappedBufferManager.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrCopyRenderTask.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrCopyRenderTask.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrImageInfo.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrPersistentCacheUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrProgramInfo.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrProgramInfo.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrRenderTask.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrRenderTask.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrSurfaceProxyView.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrTextureResolveManager.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrTextureResolveRenderTask.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrTextureResolveRenderTask.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrTransferFromRenderTask.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrTransferFromRenderTask.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrUtil.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrWaitRenderTask.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrWaitRenderTask.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrQuadBuffer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrQuadUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrQuadUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLAssembleGLESInterfaceAutogen.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLAssembleGLInterfaceAutogen.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLAssembleHelpers.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLAssembleWebGLInterfaceAutogen.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLTypesPriv.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLTypesPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/image/SkSpecialImage_Ganesh.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mock/GrMockCaps.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mock/GrMockTypes.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkShaderUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkShaderUtils.h + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/src/core/SkGlyphRunPainter.cpp
-FILE: ../../../third_party/skia/src/core/SkGlyphRunPainter.h
-FILE: ../../../third_party/skia/src/text/GlyphRun.cpp
-FILE: ../../../third_party/skia/src/text/GlyphRun.h
+FILE: ../../../flutter/third_party/skia/gm/asyncrescaleandread.cpp
+FILE: ../../../flutter/third_party/skia/gm/crbug_908646.cpp
+FILE: ../../../flutter/third_party/skia/gm/crbug_946965.cpp
+FILE: ../../../flutter/third_party/skia/gm/patharcto.cpp
+FILE: ../../../flutter/third_party/skia/gm/runtimecolorfilter.cpp
+FILE: ../../../flutter/third_party/skia/gm/runtimefunctions.cpp
+FILE: ../../../flutter/third_party/skia/gm/runtimeintrinsics.cpp
+FILE: ../../../flutter/third_party/skia/gm/runtimeshader.cpp
+FILE: ../../../flutter/third_party/skia/gm/skbug_9319.cpp
+FILE: ../../../flutter/third_party/skia/include/effects/SkImageFilters.h
+FILE: ../../../flutter/third_party/skia/include/effects/SkRuntimeEffect.h
+FILE: ../../../flutter/third_party/skia/include/gpu/gl/GrGLAssembleHelpers.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkThreadAnnotations.h
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/WasmCommon.h
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/debugger_bindings.cpp
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/paragraph_bindings.cpp
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/skottie_bindings.cpp
+FILE: ../../../flutter/third_party/skia/modules/skresources/include/SkResources.h
+FILE: ../../../flutter/third_party/skia/modules/skresources/src/SkResources.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkImageFilterTypes.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkImageFilterTypes.h
+FILE: ../../../flutter/third_party/skia/src/core/SkImageFilter_Base.h
+FILE: ../../../flutter/third_party/skia/src/core/SkRuntimeBlender.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkRuntimeEffect.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/AsyncReadTypes.h
+FILE: ../../../flutter/third_party/skia/src/gpu/Swizzle.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrClientMappedBufferManager.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrClientMappedBufferManager.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrCopyRenderTask.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrCopyRenderTask.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrImageInfo.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrPersistentCacheUtils.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrProgramInfo.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrProgramInfo.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrRenderTask.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrRenderTask.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrSurfaceProxyView.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrTextureResolveManager.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrTextureResolveRenderTask.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrTextureResolveRenderTask.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrTransferFromRenderTask.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrTransferFromRenderTask.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrUtil.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrWaitRenderTask.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrWaitRenderTask.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrQuadBuffer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrQuadUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrQuadUtils.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLAssembleGLESInterfaceAutogen.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLAssembleGLInterfaceAutogen.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLAssembleHelpers.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLAssembleWebGLInterfaceAutogen.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLTypesPriv.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLTypesPriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/image/SkSpecialImage_Ganesh.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mock/GrMockCaps.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mock/GrMockTypes.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/SkShaderUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/SkShaderUtils.h
 ----------------------------------------------------------------------------------------------------
-Copyright 2018 The Android Open Source Project
+Copyright 2019 Google LLC
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -4718,29 +6111,178 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/include/gpu/GrDriverBugWorkaroundsAutogen.h + ../../../LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/include/DartTypes.h
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/include/FontArguments.h
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/include/FontCollection.h
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/include/Metrics.h
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/include/Paragraph.h
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/include/ParagraphBuilder.h
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/include/ParagraphCache.h
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/include/ParagraphPainter.h
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/include/ParagraphStyle.h
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/include/TextShadow.h
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/include/TextStyle.h
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/include/TypefaceFontProvider.h
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/slides/ParagraphSlide.cpp
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/src/FontArguments.cpp
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/src/FontCollection.cpp
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/src/Iterators.h
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/src/OneLineShaper.cpp
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/src/OneLineShaper.h
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/src/ParagraphBuilderImpl.cpp
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/src/ParagraphBuilderImpl.h
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/src/ParagraphCache.cpp
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/src/ParagraphImpl.cpp
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/src/ParagraphImpl.h
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/src/ParagraphPainterImpl.cpp
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/src/ParagraphPainterImpl.h
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/src/ParagraphStyle.cpp
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/src/Run.cpp
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/src/Run.h
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/src/TextLine.cpp
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/src/TextLine.h
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/src/TextShadow.cpp
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/src/TextStyle.cpp
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/src/TextWrapper.cpp
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/src/TextWrapper.h
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/src/TypefaceFontProvider.cpp
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/utils/TestFontCollection.cpp
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/utils/TestFontCollection.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/include/DartTypes.h
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/include/FontArguments.h
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/include/FontCollection.h
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/include/Metrics.h
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/include/Paragraph.h
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/include/ParagraphBuilder.h
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/include/ParagraphCache.h
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/include/ParagraphPainter.h
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/include/ParagraphStyle.h
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/include/TextShadow.h
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/include/TextStyle.h
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/include/TypefaceFontProvider.h
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/slides/ParagraphSlide.cpp
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/src/FontArguments.cpp
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/src/FontCollection.cpp
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/src/Iterators.h
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/src/OneLineShaper.cpp
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/src/OneLineShaper.h
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/src/ParagraphBuilderImpl.cpp
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/src/ParagraphBuilderImpl.h
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/src/ParagraphCache.cpp
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/src/ParagraphImpl.cpp
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/src/ParagraphImpl.h
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/src/ParagraphPainterImpl.cpp
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/src/ParagraphPainterImpl.h
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/src/ParagraphStyle.cpp
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/src/Run.cpp
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/src/Run.h
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/src/TextLine.cpp
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/src/TextLine.h
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/src/TextShadow.cpp
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/src/TextStyle.cpp
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/src/TextWrapper.cpp
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/src/TextWrapper.h
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/src/TypefaceFontProvider.cpp
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/utils/TestFontCollection.cpp
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/utils/TestFontCollection.h
+----------------------------------------------------------------------------------------------------
+Copyright 2019 Google LLC.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: skia
+ORIGIN: ../../../flutter/third_party/skia/gm/crbug_918512.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/fp_sample_chaining.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/fpcoordinateoverride.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/inverseclip.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/labyrinth.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/manypathatlases.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/preservefillrule.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/swizzle.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/tilemodes_alpha.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkPathTypes.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/bench/ParagraphBench.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skplaintexteditor/app/editor_application.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skplaintexteditor/include/editor.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skplaintexteditor/include/stringslice.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skplaintexteditor/include/stringview.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skplaintexteditor/src/editor.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skplaintexteditor/src/shape.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skplaintexteditor/src/shape.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skplaintexteditor/src/stringslice.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skplaintexteditor/src/word_boundaries.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skplaintexteditor/src/word_boundaries.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkContainers.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkMalloc.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPixelRefPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/AtlasPathRenderer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/AtlasPathRenderer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/PathInnerTriangulateOp.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/PathInnerTriangulateOp.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/TessellationPathRenderer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/TessellationPathRenderer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/tessellate/GrPathTessellationShader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/tessellate/GrPathTessellationShader.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFGraphicStackState.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFGraphicStackState.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFType1Font.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/pdf/SkPDFType1Font.h + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/include/gpu/GrDriverBugWorkaroundsAutogen.h
-FILE: ../../../third_party/skia/include/utils/SkTraceEventPhase.h
-FILE: ../../../third_party/skia/infra/lottiecap/gold/lottie-web-aggregator.go
-FILE: ../../../third_party/skia/infra/wasm-common/gold/wasm_gold_aggregator.go
-FILE: ../../../third_party/skia/infra/wasm-common/perf/wasm_perf_aggregator.go
+FILE: ../../../flutter/third_party/skia/gm/crbug_918512.cpp
+FILE: ../../../flutter/third_party/skia/gm/fp_sample_chaining.cpp
+FILE: ../../../flutter/third_party/skia/gm/fpcoordinateoverride.cpp
+FILE: ../../../flutter/third_party/skia/gm/inverseclip.cpp
+FILE: ../../../flutter/third_party/skia/gm/labyrinth.cpp
+FILE: ../../../flutter/third_party/skia/gm/manypathatlases.cpp
+FILE: ../../../flutter/third_party/skia/gm/preservefillrule.cpp
+FILE: ../../../flutter/third_party/skia/gm/swizzle.cpp
+FILE: ../../../flutter/third_party/skia/gm/tilemodes_alpha.cpp
+FILE: ../../../flutter/third_party/skia/include/core/SkPathTypes.h
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/bench/ParagraphBench.cpp
+FILE: ../../../flutter/third_party/skia/modules/skplaintexteditor/app/editor_application.cpp
+FILE: ../../../flutter/third_party/skia/modules/skplaintexteditor/include/editor.h
+FILE: ../../../flutter/third_party/skia/modules/skplaintexteditor/include/stringslice.h
+FILE: ../../../flutter/third_party/skia/modules/skplaintexteditor/include/stringview.h
+FILE: ../../../flutter/third_party/skia/modules/skplaintexteditor/src/editor.cpp
+FILE: ../../../flutter/third_party/skia/modules/skplaintexteditor/src/shape.cpp
+FILE: ../../../flutter/third_party/skia/modules/skplaintexteditor/src/shape.h
+FILE: ../../../flutter/third_party/skia/modules/skplaintexteditor/src/stringslice.cpp
+FILE: ../../../flutter/third_party/skia/modules/skplaintexteditor/src/word_boundaries.cpp
+FILE: ../../../flutter/third_party/skia/modules/skplaintexteditor/src/word_boundaries.h
+FILE: ../../../flutter/third_party/skia/src/base/SkContainers.cpp
+FILE: ../../../flutter/third_party/skia/src/base/SkMalloc.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkPixelRefPriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/AtlasPathRenderer.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/AtlasPathRenderer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/PathInnerTriangulateOp.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/PathInnerTriangulateOp.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/TessellationPathRenderer.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/TessellationPathRenderer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/tessellate/GrPathTessellationShader.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/tessellate/GrPathTessellationShader.h
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFGraphicStackState.cpp
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFGraphicStackState.h
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFType1Font.cpp
+FILE: ../../../flutter/third_party/skia/src/pdf/SkPDFType1Font.h
 ----------------------------------------------------------------------------------------------------
-Copyright 2018 The Chromium Authors. All rights reserved.
+Copyright 2019 Google LLC.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -4757,161 +6299,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/experimental/ffmpeg/SkVideoDecoder.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzSKSL2GLSL.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzSKSL2Metal.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzSKSL2Pipeline.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzSKSL2SPIRV.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzSkDescriptorDeserialize.cpp + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/experimental/ffmpeg/SkVideoDecoder.cpp
-FILE: ../../../third_party/skia/experimental/ffmpeg/SkVideoDecoder.h
-FILE: ../../../third_party/skia/experimental/ffmpeg/SkVideoEncoder.cpp
-FILE: ../../../third_party/skia/experimental/ffmpeg/SkVideoEncoder.h
-FILE: ../../../third_party/skia/gm/backdrop.cpp
-FILE: ../../../third_party/skia/gm/backdrop_imagefilter_croprect.cpp
-FILE: ../../../third_party/skia/gm/bug9331.cpp
-FILE: ../../../third_party/skia/gm/clip_sierpinski_region.cpp
-FILE: ../../../third_party/skia/gm/collapsepaths.cpp
-FILE: ../../../third_party/skia/gm/compositor_quads.cpp
-FILE: ../../../third_party/skia/gm/crbug_913349.cpp
-FILE: ../../../third_party/skia/gm/crbug_938592.cpp
-FILE: ../../../third_party/skia/gm/crbug_947055.cpp
-FILE: ../../../third_party/skia/gm/crbug_996140.cpp
-FILE: ../../../third_party/skia/gm/ducky_yuv_blend.cpp
-FILE: ../../../third_party/skia/gm/fiddle.cpp
-FILE: ../../../third_party/skia/gm/mac_aa_explorer.cpp
-FILE: ../../../third_party/skia/gm/mixercolorfilter.cpp
-FILE: ../../../third_party/skia/gm/overdrawcanvas.cpp
-FILE: ../../../third_party/skia/gm/postercircle.cpp
-FILE: ../../../third_party/skia/gm/skbug_8664.cpp
-FILE: ../../../third_party/skia/gm/skbug_8955.cpp
-FILE: ../../../third_party/skia/gm/video_decoder.cpp
-FILE: ../../../third_party/skia/gm/yuv420_odd_dim.cpp
-FILE: ../../../third_party/skia/include/core/SkTileMode.h
-FILE: ../../../third_party/skia/include/gpu/GrContextThreadSafeProxy.h
-FILE: ../../../third_party/skia/include/gpu/GrRecordingContext.h
-FILE: ../../../third_party/skia/include/gpu/dawn/GrDawnTypes.h
-FILE: ../../../third_party/skia/include/ports/SkCFObject.h
-FILE: ../../../third_party/skia/include/private/SkSLDefines.h
-FILE: ../../../third_party/skia/include/private/SkVx.h
-FILE: ../../../third_party/skia/include/private/gpu/ganesh/GrContext_Base.h
-FILE: ../../../third_party/skia/include/private/gpu/ganesh/GrImageContext.h
-FILE: ../../../third_party/skia/modules/skottie/src/Composition.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/Composition.h
-FILE: ../../../third_party/skia/modules/skottie/src/Layer.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/Layer.h
-FILE: ../../../third_party/skia/modules/skottie/src/effects/DropShadowEffect.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/effects/Effects.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/effects/Effects.h
-FILE: ../../../third_party/skia/modules/skottie/src/effects/FillEffect.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/effects/GaussianBlurEffect.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/effects/GradientEffect.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/effects/HueSaturationEffect.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/effects/InvertEffect.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/effects/LevelsEffect.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/effects/LinearWipeEffect.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/effects/MotionBlurEffect.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/effects/MotionBlurEffect.h
-FILE: ../../../third_party/skia/modules/skottie/src/effects/MotionTileEffect.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/effects/RadialWipeEffect.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/effects/ShiftChannelsEffect.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/effects/TintEffect.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/effects/TransformEffect.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/effects/TritoneEffect.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/effects/VenetianBlindsEffect.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/layers/FootageLayer.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/layers/NullLayer.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/layers/SolidLayer.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/text/RangeSelector.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/text/RangeSelector.h
-FILE: ../../../third_party/skia/modules/skottie/src/text/SkottieShaper.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/text/SkottieShaper.h
-FILE: ../../../third_party/skia/modules/skottie/src/text/TextAdapter.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/text/TextAdapter.h
-FILE: ../../../third_party/skia/modules/skottie/src/text/TextAnimator.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/text/TextAnimator.h
-FILE: ../../../third_party/skia/modules/skottie/src/text/TextValue.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/text/TextValue.h
-FILE: ../../../third_party/skia/modules/sksg/include/SkSGRenderEffect.h
-FILE: ../../../third_party/skia/modules/sksg/src/SkSGNodePriv.h
-FILE: ../../../third_party/skia/modules/sksg/src/SkSGRenderEffect.cpp
-FILE: ../../../third_party/skia/modules/sksg/src/SkSGTransformPriv.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGText.h
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGText.cpp
-FILE: ../../../third_party/skia/src/codec/SkScalingCodec.h
-FILE: ../../../third_party/skia/src/core/SkDescriptor.cpp
-FILE: ../../../third_party/skia/src/core/SkDraw_atlas.cpp
-FILE: ../../../third_party/skia/src/core/SkEffectPriv.h
-FILE: ../../../third_party/skia/src/core/SkEnumerate.h
-FILE: ../../../third_party/skia/src/core/SkGlyphBuffer.cpp
-FILE: ../../../third_party/skia/src/core/SkGlyphBuffer.h
-FILE: ../../../third_party/skia/src/core/SkPathMakers.h
-FILE: ../../../third_party/skia/src/core/SkStrikeSpec.h
-FILE: ../../../third_party/skia/src/core/SkVMBlitter.cpp
-FILE: ../../../third_party/skia/src/core/SkYUVMath.cpp
-FILE: ../../../third_party/skia/src/core/SkYUVMath.h
-FILE: ../../../third_party/skia/src/core/SkZip.h
-FILE: ../../../third_party/skia/src/gpu/GrAHardwareBufferUtils.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrAHardwareBufferUtils.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrAHardwareBufferUtils_impl.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrBaseContextPriv.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrBuffer.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrContextThreadSafeProxy.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrContext_Base.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrCpuBuffer.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrDataUtils.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrDataUtils.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrDirectContextPriv.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrGpuBuffer.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrGpuBuffer.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrImageContext.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrImageContextPriv.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrRecordingContext.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrRecordingContextPriv.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrSPIRVUniformHandler.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrSPIRVUniformHandler.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrSPIRVVaryingHandler.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrSPIRVVaryingHandler.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAttachment.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAttachment.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnBuffer.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnBuffer.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnCaps.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnCaps.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnGpu.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnGpu.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnOpsRenderPass.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnOpsRenderPass.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnProgramBuilder.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnProgramBuilder.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnProgramDataManager.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnProgramDataManager.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnRenderTarget.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnRenderTarget.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnRingBuffer.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnRingBuffer.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnTexture.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnTexture.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnTextureRenderTarget.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnTextureRenderTarget.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnUtil.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnUtil.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlCommandBuffer.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlCommandBuffer.mm
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlDepthStencil.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlSemaphore.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlSemaphore.mm
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/OpsTask.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/OpsTask.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkSecondaryCBDrawContext.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkSecondaryCBDrawContext_impl.h
-FILE: ../../../third_party/skia/src/gpu/vk/GrVkSecondaryCBDrawContext.h
-FILE: ../../../third_party/skia/src/image/SkSurface_GpuMtl.mm
-FILE: ../../../third_party/skia/src/sksl/SkSLOutputStream.cpp
-FILE: ../../../third_party/skia/src/text/StrikeForGPU.h
-FILE: ../../../third_party/skia/src/utils/SkCharToGlyphCache.cpp
-FILE: ../../../third_party/skia/src/utils/SkCharToGlyphCache.h
-FILE: ../../../third_party/skia/src/utils/SkClipStackUtils.cpp
-FILE: ../../../third_party/skia/src/utils/SkClipStackUtils.h
-FILE: ../../../third_party/skia/src/utils/win/SkObjBase.h
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzSKSL2GLSL.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzSKSL2Metal.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzSKSL2Pipeline.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzSKSL2SPIRV.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzSkDescriptorDeserialize.cpp
 ----------------------------------------------------------------------------------------------------
-Copyright 2019 Google Inc.
+Copyright 2019 Google, LLC
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -4944,86 +6344,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/bench/BulkRectBench.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkStrikeSpec.cpp + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/bench/BulkRectBench.cpp
-FILE: ../../../third_party/skia/bench/DDLRecorderBench.cpp
-FILE: ../../../third_party/skia/bench/SkSLBench.cpp
-FILE: ../../../third_party/skia/gm/asyncrescaleandread.cpp
-FILE: ../../../third_party/skia/gm/crbug_908646.cpp
-FILE: ../../../third_party/skia/gm/crbug_946965.cpp
-FILE: ../../../third_party/skia/gm/patharcto.cpp
-FILE: ../../../third_party/skia/gm/runtimecolorfilter.cpp
-FILE: ../../../third_party/skia/gm/runtimefunctions.cpp
-FILE: ../../../third_party/skia/gm/runtimeintrinsics.cpp
-FILE: ../../../third_party/skia/gm/runtimeshader.cpp
-FILE: ../../../third_party/skia/gm/skbug_9319.cpp
-FILE: ../../../third_party/skia/include/effects/SkImageFilters.h
-FILE: ../../../third_party/skia/include/effects/SkRuntimeEffect.h
-FILE: ../../../third_party/skia/include/gpu/gl/GrGLAssembleHelpers.h
-FILE: ../../../third_party/skia/include/private/SkThreadAnnotations.h
-FILE: ../../../third_party/skia/include/private/gpu/ganesh/GrGLTypesPriv.h
-FILE: ../../../third_party/skia/modules/canvaskit/WasmCommon.h
-FILE: ../../../third_party/skia/modules/canvaskit/debugger_bindings.cpp
-FILE: ../../../third_party/skia/modules/canvaskit/paragraph_bindings.cpp
-FILE: ../../../third_party/skia/modules/canvaskit/particles_bindings.cpp
-FILE: ../../../third_party/skia/modules/canvaskit/skottie_bindings.cpp
-FILE: ../../../third_party/skia/modules/particles/include/SkParticleBinding.h
-FILE: ../../../third_party/skia/modules/particles/include/SkParticleData.h
-FILE: ../../../third_party/skia/modules/particles/include/SkParticleDrawable.h
-FILE: ../../../third_party/skia/modules/particles/include/SkParticleEffect.h
-FILE: ../../../third_party/skia/modules/particles/include/SkParticleSerialization.h
-FILE: ../../../third_party/skia/modules/particles/include/SkReflected.h
-FILE: ../../../third_party/skia/modules/particles/src/SkParticleBinding.cpp
-FILE: ../../../third_party/skia/modules/particles/src/SkParticleDrawable.cpp
-FILE: ../../../third_party/skia/modules/particles/src/SkParticleEffect.cpp
-FILE: ../../../third_party/skia/modules/particles/src/SkReflected.cpp
-FILE: ../../../third_party/skia/modules/skresources/include/SkResources.h
-FILE: ../../../third_party/skia/modules/skresources/src/SkResources.cpp
-FILE: ../../../third_party/skia/src/core/SkImageFilterTypes.cpp
-FILE: ../../../third_party/skia/src/core/SkImageFilterTypes.h
-FILE: ../../../third_party/skia/src/core/SkImageFilter_Base.h
-FILE: ../../../third_party/skia/src/core/SkRuntimeEffect.cpp
-FILE: ../../../third_party/skia/src/core/SkVM.cpp
-FILE: ../../../third_party/skia/src/core/SkVM.h
-FILE: ../../../third_party/skia/src/gpu/AsyncReadTypes.h
-FILE: ../../../third_party/skia/src/gpu/Swizzle.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrClientMappedBufferManager.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrClientMappedBufferManager.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrCopyRenderTask.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrCopyRenderTask.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrImageInfo.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrPersistentCacheUtils.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrProgramInfo.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrProgramInfo.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrRenderTask.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrRenderTask.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrSurfaceProxyView.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrTextureResolveManager.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrTextureResolveRenderTask.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrTextureResolveRenderTask.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrTransferFromRenderTask.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrTransferFromRenderTask.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrUtil.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrWaitRenderTask.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrWaitRenderTask.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/geometry/GrQuadBuffer.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/geometry/GrQuadUtils.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/geometry/GrQuadUtils.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLAssembleGLESInterfaceAutogen.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLAssembleGLInterfaceAutogen.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLAssembleHelpers.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLAssembleWebGLInterfaceAutogen.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLTypesPriv.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/mock/GrMockCaps.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/mock/GrMockTypes.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLExternalFunction.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLExternalFunctionCall.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLExternalFunctionReference.h
-FILE: ../../../third_party/skia/src/utils/SkShaderUtils.cpp
-FILE: ../../../third_party/skia/src/utils/SkShaderUtils.h
+FILE: ../../../flutter/third_party/skia/src/core/SkStrikeSpec.cpp
 ----------------------------------------------------------------------------------------------------
-Copyright 2019 Google LLC
+Copyright 2019 The Android Open Source Project
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -5056,1087 +6381,269 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/bench/ShaperBench.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/FuzzSkParagraph.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/3d.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/bc1_transparency.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/bicubic.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/compressed_textures.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/crbug_1073670.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/crbug_1086705.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/crbug_1113794.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/exoticformats.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/rsxtext.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/skbug_9819.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/strokerect_anisotropic.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/widebuttcaps.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkM44.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkSamplingOptions.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/GrDirectContext.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlBackendContext.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkTPin.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/audioplayer/SkAudioPlayer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/audioplayer/SkAudioPlayer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/audioplayer/SkAudioPlayer_mac.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/audioplayer/SkAudioPlayer_none.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/audioplayer/SkAudioPlayer_oboe.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/audioplayer/SkAudioPlayer_sfml.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/include/ExternalLayer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/Adapter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/Camera.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/Camera.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/Path.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/Transform.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/Transform.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/animator/Animator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/animator/Animator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/animator/KeyframeAnimator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/animator/KeyframeAnimator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/animator/ScalarKeyframeAnimator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/animator/ShapeKeyframeAnimator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/animator/TextKeyframeAnimator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/animator/Vec2KeyframeAnimator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/animator/VectorKeyframeAnimator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/animator/VectorKeyframeAnimator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/effects/BlackAndWhiteEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/effects/BrightnessContrastEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/effects/CornerPinEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/effects/DisplacementMapEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/effects/GlowStyles.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/effects/ShadowStyles.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/layers/AudioLayer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/layers/shapelayer/Ellipse.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/layers/shapelayer/FillStroke.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/layers/shapelayer/Gradient.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/layers/shapelayer/MergePaths.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/layers/shapelayer/OffsetPaths.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/layers/shapelayer/Polystar.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/layers/shapelayer/PuckerBloat.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/layers/shapelayer/Rectangle.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/layers/shapelayer/Repeater.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/layers/shapelayer/RoundCorners.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/layers/shapelayer/ShapeLayer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/layers/shapelayer/TrimPaths.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/gm/simple_gm.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/include/SkSGGeometryEffect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/sksg/src/SkSGGeometryEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skshaper/src/SkShaper_coretext.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skunicode/src/SkUnicode_icu.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGFe.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGFeBlend.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGFeColorMatrix.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGFeComposite.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGFeDisplacementMap.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGFeFlood.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGFeGaussianBlur.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGFeLighting.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGFeMorphology.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGFeOffset.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGFeTurbulence.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGFilter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGFilterContext.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGFe.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGFeBlend.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGFeColorMatrix.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGFeComposite.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGFeDisplacementMap.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGFeFlood.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGFeGaussianBlur.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGFeLighting.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGFeMorphology.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGFeOffset.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGFeTurbulence.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGFilterContext.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGTextPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/utils/SvgTool.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkColorFilterPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkCompressedDataUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkCompressedDataUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkM44.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMemset_opts_erms.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMipmapBuilder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkSamplingPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkVerticesPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDynamicAtlas.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDynamicAtlas.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrEagerVertexAllocator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrHashMapWithCache.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrRecordingContextPriv.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrThreadSafeCache.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrThreadSafeCache.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrAATriangulator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrAATriangulator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mock/GrMockOpTarget.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/DrawAtlasPathOp.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/DrawAtlasPathOp.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelperWithStencil.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelperWithStencil.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/SmallPathAtlasMgr.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/SmallPathAtlasMgr.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/SmallPathShapeData.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/SmallPathShapeData.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/tessellate/MiddleOutPolygonTriangulator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/tessellate/StrokeIterator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/tessellate/WangsFormula.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkScalerContext_mac_ct.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkTypeface_mac_ct.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/text/gpu/SDFTControl.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/text/gpu/SDFTControl.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/mac/SkCGBase.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/mac/SkCGGeometry.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/mac/SkCTFont.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/mac/SkCTFont.h + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/bench/ShaperBench.cpp
-FILE: ../../../third_party/skia/bench/SkGlyphCacheBench.h
-FILE: ../../../third_party/skia/docs/examples/Alpha_Constants_a.cpp
-FILE: ../../../third_party/skia/docs/examples/Alpha_Constants_b.cpp
-FILE: ../../../third_party/skia/docs/examples/Alpha_Type_Opaque.cpp
-FILE: ../../../third_party/skia/docs/examples/Alpha_Type_Premul.cpp
-FILE: ../../../third_party/skia/docs/examples/Alpha_Type_Unpremul.cpp
-FILE: ../../../third_party/skia/docs/examples/Anti_Alias.cpp
-FILE: ../../../third_party/skia/docs/examples/Arc.cpp
-FILE: ../../../third_party/skia/docs/examples/AutoCanvasRestore_SkCanvas_star.cpp
-FILE: ../../../third_party/skia/docs/examples/AutoCanvasRestore_restore.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_012.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_ComputeIsOpaque.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_HeapAllocator_allocPixelRef.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_allocN32Pixels.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_allocPixels.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_allocPixelsFlags.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_bounds.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_bytesPerPixel.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_colorSpace.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_colorType.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_computeByteSize.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_copy_const_SkBitmap.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_copy_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_dimensions.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_drawsNothing.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_empty.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_empty_constructor.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_erase.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_eraseARGB.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_eraseColor.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_extractAlpha.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_extractAlpha_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_extractAlpha_3.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_extractSubset.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_getAddr.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_getAddr16.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_getAddr32.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_getAddr8.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_getBounds.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_getBounds_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_getColor.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_getGenerationID.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_getPixels.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_getSubset.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_height.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_info.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_installPixels.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_installPixels_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_installPixels_3.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_isImmutable.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_isNull.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_isOpaque.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_move_SkBitmap.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_move_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_notifyPixelsChanged.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_peekPixels.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_pixelRef.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_pixelRefOrigin.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_pixmap.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_readPixels.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_readPixels_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_readPixels_3.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_readyToDraw.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_refColorSpace.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_reset.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_rowBytes.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_rowBytesAsPixels.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_setAlphaType.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_setImmutable.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_setInfo.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_setPixelRef.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_setPixels.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_shiftPerPixel.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_swap.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_tryAllocN32Pixels.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_tryAllocPixels.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_tryAllocPixelsFlags.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_tryAllocPixels_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_tryAllocPixels_3.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_tryAllocPixels_4.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_width.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_writePixels.cpp
-FILE: ../../../third_party/skia/docs/examples/Bitmap_writePixels_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Blend_Mode_Methods.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_129.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_MakeRasterDirect.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_MakeRasterDirectN32.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_PointMode.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_SaveLayerRec.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_SaveLayerRec_SaveLayerRec.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_SaveLayerRec_const_SkRect_star_const_SkPaint_star.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_SaveLayerRec_const_SkRect_star_const_SkPaint_star_const_SkImageFilter_star.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_SrcRectConstraint.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_accessTopLayerPixels_a.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_accessTopLayerPixels_b.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_accessTopRasterHandle.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_clear.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_clipPath.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_clipPath_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_clipPath_3.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_clipRRect.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_clipRRect_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_clipRRect_3.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_clipRect.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_clipRect_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_clipRect_3.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_clipRegion.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_concat.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_const_SkBitmap_const_SkSurfaceProps.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_copy_const_SkBitmap.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_destructor.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawAnnotation_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawArc_a.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawArc_b.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawAtlas.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawAtlas_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawBitmap.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawBitmapRect.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawBitmapRect_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawBitmapRect_3.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawCircle.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawCircle_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawColor.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawDRRect_a.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawDRRect_b.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawDrawable.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawDrawable_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawIRect.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawImage.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawImageNine.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawImageNine_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawImageRect.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawImageRect_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawImageRect_3.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawImageRect_4.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawImageRect_5.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawImageRect_6.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawImage_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawLine.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawLine_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawOval.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawPaint.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawPatch.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawPatch_2_a.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawPatch_2_b.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawPath.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawPicture_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawPicture_3.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawPicture_4.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawPoint.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawPoint_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawPoints.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawPosText.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawPosTextH.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawRRect.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawRect.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawRegion.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawRoundRect.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawString.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawString_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawText.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawTextBlob.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawTextBlob_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawTextRSXform.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawVertices.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_drawVertices_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_empty_constructor.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_getBaseLayerSize.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_getContext.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_getDeviceClipBounds.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_getDeviceClipBounds_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_getLocalClipBounds.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_getLocalClipBounds_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_getProps.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_getSaveCount.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_getTotalMatrix.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_imageInfo.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_int_int_const_SkSurfaceProps_star.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_isClipEmpty.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_isClipRect.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_kInitWithPrevious_SaveLayerFlag.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_makeSurface.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_peekPixels.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_quickReject.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_quickReject_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_readPixels_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_readPixels_3.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_readPixels_a.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_readPixels_b.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_resetMatrix.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_restore.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_restoreToCount.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_rotate.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_rotate_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_save.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_saveLayer.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_saveLayerAlpha.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_saveLayerPreserveLCDTextRequests.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_saveLayer_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_saveLayer_3.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_scale.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_setMatrix.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_skew.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_translate.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_writePixels.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_writePixels_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Clear.cpp
-FILE: ../../../third_party/skia/docs/examples/Clip.cpp
-FILE: ../../../third_party/skia/docs/examples/Color.cpp
-FILE: ../../../third_party/skia/docs/examples/ColorGetA.cpp
-FILE: ../../../third_party/skia/docs/examples/ColorGetB.cpp
-FILE: ../../../third_party/skia/docs/examples/ColorGetG.cpp
-FILE: ../../../third_party/skia/docs/examples/ColorGetR.cpp
-FILE: ../../../third_party/skia/docs/examples/ColorSetA.cpp
-FILE: ../../../third_party/skia/docs/examples/ColorSetARGB.cpp
-FILE: ../../../third_party/skia/docs/examples/ColorSetRGB.cpp
-FILE: ../../../third_party/skia/docs/examples/ColorToHSV.cpp
-FILE: ../../../third_party/skia/docs/examples/ColorTypeBytesPerPixel.cpp
-FILE: ../../../third_party/skia/docs/examples/ColorTypeIsAlwaysOpaque.cpp
-FILE: ../../../third_party/skia/docs/examples/ColorTypeValidateAlphaType.cpp
-FILE: ../../../third_party/skia/docs/examples/Color_Burn.cpp
-FILE: ../../../third_party/skia/docs/examples/Color_Constants_a.cpp
-FILE: ../../../third_party/skia/docs/examples/Color_Constants_b.cpp
-FILE: ../../../third_party/skia/docs/examples/Color_Constants_c.cpp
-FILE: ../../../third_party/skia/docs/examples/Color_Constants_d.cpp
-FILE: ../../../third_party/skia/docs/examples/Color_Dodge.cpp
-FILE: ../../../third_party/skia/docs/examples/Color_Filter_Methods.cpp
-FILE: ../../../third_party/skia/docs/examples/Color_Methods.cpp
-FILE: ../../../third_party/skia/docs/examples/Color_Type_ARGB_4444.cpp
-FILE: ../../../third_party/skia/docs/examples/Color_Type_Alpha_8.cpp
-FILE: ../../../third_party/skia/docs/examples/Color_Type_BGRA_8888.cpp
-FILE: ../../../third_party/skia/docs/examples/Color_Type_Gray_8.cpp
-FILE: ../../../third_party/skia/docs/examples/Color_Type_RGBA_1010102.cpp
-FILE: ../../../third_party/skia/docs/examples/Color_Type_RGBA_8888.cpp
-FILE: ../../../third_party/skia/docs/examples/Color_Type_RGBA_F16.cpp
-FILE: ../../../third_party/skia/docs/examples/Color_Type_RGB_101010.cpp
-FILE: ../../../third_party/skia/docs/examples/Color_Type_RGB_565.cpp
-FILE: ../../../third_party/skia/docs/examples/Color_Type_RGB_888.cpp
-FILE: ../../../third_party/skia/docs/examples/Colors.cpp
-FILE: ../../../third_party/skia/docs/examples/Conic_Weight_a.cpp
-FILE: ../../../third_party/skia/docs/examples/Conic_Weight_b.cpp
-FILE: ../../../third_party/skia/docs/examples/Conic_Weight_c.cpp
-FILE: ../../../third_party/skia/docs/examples/Cubic.cpp
-FILE: ../../../third_party/skia/docs/examples/Darken.cpp
-FILE: ../../../third_party/skia/docs/examples/Device_Text.cpp
-FILE: ../../../third_party/skia/docs/examples/Difference.cpp
-FILE: ../../../third_party/skia/docs/examples/Dither_a.cpp
-FILE: ../../../third_party/skia/docs/examples/Dither_b.cpp
-FILE: ../../../third_party/skia/docs/examples/Dst.cpp
-FILE: ../../../third_party/skia/docs/examples/Dst_Atop.cpp
-FILE: ../../../third_party/skia/docs/examples/Dst_In.cpp
-FILE: ../../../third_party/skia/docs/examples/Dst_Out.cpp
-FILE: ../../../third_party/skia/docs/examples/Dst_Over.cpp
-FILE: ../../../third_party/skia/docs/examples/Exclusion.cpp
-FILE: ../../../third_party/skia/docs/examples/Fake_Bold.cpp
-FILE: ../../../third_party/skia/docs/examples/Font_breakText.cpp
-FILE: ../../../third_party/skia/docs/examples/HSVToColor.cpp
-FILE: ../../../third_party/skia/docs/examples/HSVToColor_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Hard_Light.cpp
-FILE: ../../../third_party/skia/docs/examples/Hue.cpp
-FILE: ../../../third_party/skia/docs/examples/IPoint_Make.cpp
-FILE: ../../../third_party/skia/docs/examples/IPoint_add_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/IPoint_addto_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/IPoint_equal_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/IPoint_equals.cpp
-FILE: ../../../third_party/skia/docs/examples/IPoint_isZero.cpp
-FILE: ../../../third_party/skia/docs/examples/IPoint_minus_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/IPoint_notequal_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/IPoint_set.cpp
-FILE: ../../../third_party/skia/docs/examples/IPoint_subtract_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/IPoint_subtractfrom_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/IPoint_x.cpp
-FILE: ../../../third_party/skia/docs/examples/IPoint_y.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_Intersects.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_MakeEmpty.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_MakeLTRB.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_MakeSize.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_MakeWH.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_MakeXYWH.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_adjust.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_bottom.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_contains.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_containsNoEmptyCheck.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_containsNoEmptyCheck_2.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_contains_3.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_contains_4.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_equal_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_height.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_height64.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_inset.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_intersect.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_intersect_2.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_isEmpty.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_isEmpty64.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_join_2.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_left.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_makeInset.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_makeOffset.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_makeOutset.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_makeSorted.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_notequal_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_offset.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_offsetTo.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_offset_2.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_outset.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_right.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_setEmpty.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_setLTRB.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_setXYWH.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_size.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_sort.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_top.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_width.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_width64.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_x.cpp
-FILE: ../../../third_party/skia/docs/examples/IRect_y.cpp
-FILE: ../../../third_party/skia/docs/examples/ImageInfo_ByteSizeOverflowed.cpp
-FILE: ../../../third_party/skia/docs/examples/ImageInfo_Make.cpp
-FILE: ../../../third_party/skia/docs/examples/ImageInfo_MakeA8.cpp
-FILE: ../../../third_party/skia/docs/examples/ImageInfo_MakeN32.cpp
-FILE: ../../../third_party/skia/docs/examples/ImageInfo_MakeN32Premul.cpp
-FILE: ../../../third_party/skia/docs/examples/ImageInfo_MakeN32Premul_2.cpp
-FILE: ../../../third_party/skia/docs/examples/ImageInfo_MakeS32.cpp
-FILE: ../../../third_party/skia/docs/examples/ImageInfo_MakeUnknown.cpp
-FILE: ../../../third_party/skia/docs/examples/ImageInfo_MakeUnknown_2.cpp
-FILE: ../../../third_party/skia/docs/examples/ImageInfo_alphaType.cpp
-FILE: ../../../third_party/skia/docs/examples/ImageInfo_bounds.cpp
-FILE: ../../../third_party/skia/docs/examples/ImageInfo_bytesPerPixel.cpp
-FILE: ../../../third_party/skia/docs/examples/ImageInfo_colorSpace.cpp
-FILE: ../../../third_party/skia/docs/examples/ImageInfo_colorType.cpp
-FILE: ../../../third_party/skia/docs/examples/ImageInfo_computeByteSize.cpp
-FILE: ../../../third_party/skia/docs/examples/ImageInfo_computeMinByteSize.cpp
-FILE: ../../../third_party/skia/docs/examples/ImageInfo_computeOffset.cpp
-FILE: ../../../third_party/skia/docs/examples/ImageInfo_dimensions.cpp
-FILE: ../../../third_party/skia/docs/examples/ImageInfo_empty_constructor.cpp
-FILE: ../../../third_party/skia/docs/examples/ImageInfo_equal1_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/ImageInfo_gammaCloseToSRGB.cpp
-FILE: ../../../third_party/skia/docs/examples/ImageInfo_height.cpp
-FILE: ../../../third_party/skia/docs/examples/ImageInfo_isEmpty.cpp
-FILE: ../../../third_party/skia/docs/examples/ImageInfo_isOpaque.cpp
-FILE: ../../../third_party/skia/docs/examples/ImageInfo_makeColorSpace.cpp
-FILE: ../../../third_party/skia/docs/examples/ImageInfo_makeWH.cpp
-FILE: ../../../third_party/skia/docs/examples/ImageInfo_minRowBytes.cpp
-FILE: ../../../third_party/skia/docs/examples/ImageInfo_minRowBytes64.cpp
-FILE: ../../../third_party/skia/docs/examples/ImageInfo_notequal1_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/ImageInfo_refColorSpace.cpp
-FILE: ../../../third_party/skia/docs/examples/ImageInfo_reset.cpp
-FILE: ../../../third_party/skia/docs/examples/ImageInfo_shiftPerPixel.cpp
-FILE: ../../../third_party/skia/docs/examples/ImageInfo_validRowBytes.cpp
-FILE: ../../../third_party/skia/docs/examples/ImageInfo_width.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_Filter_Methods.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_MakeBackendTextureFromSkImage.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_MakeCrossContextFromPixmap.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_MakeFromAdoptedTexture.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_MakeFromBitmap.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_MakeFromEncoded.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_MakeFromGenerator.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_MakeFromPicture.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_MakeFromRaster.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_MakeFromTexture.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_MakeFromTexture_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_MakeRasterCopy.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_MakeRasterData.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_alphaType.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_bounds.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_colorSpace.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_colorType.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_dimensions.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_encodeToData.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_encodeToData_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_getBackendTexture.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_height.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_isAlphaOnly.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_isLazyGenerated_a.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_isLazyGenerated_b.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_isOpaque.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_isTextureBacked.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_isValid.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_makeColorSpace.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_makeNonTextureImage.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_makeRasterImage.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_makeShader.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_makeShader_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_makeSubset.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_makeTextureImage.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_makeWithFilter.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_peekPixels.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_readPixels.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_readPixels_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_refColorSpace.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_refEncodedData.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_scalePixels.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_uniqueID.cpp
-FILE: ../../../third_party/skia/docs/examples/Image_width.cpp
-FILE: ../../../third_party/skia/docs/examples/Lighten.cpp
-FILE: ../../../third_party/skia/docs/examples/Luminosity.cpp
-FILE: ../../../third_party/skia/docs/examples/Mask_Filter_Methods.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_063.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_Concat.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_I.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_InvalidMatrix.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_MakeAll.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_MakeRectToRect.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_MakeScale.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_MakeTrans.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_ScaleToFit.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_SetAffineIdentity.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_TypeMask.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_array_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_asAffine.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_decomposeScale.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_dirtyMatrixTypeCache.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_dump.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_get.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_get9.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_getMaxScale.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_getMinMaxScales.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_getMinScale.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_getPerspX.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_getPerspY.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_getScaleX.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_getScaleY.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_getSkewX.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_getSkewY.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_getTranslateX.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_getTranslateY.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_getType.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_hasPerspective.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_invert.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_isFinite.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_isIdentity.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_isScaleTranslate.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_isSimilarity.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_isTranslate.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_mapHomogeneousPoints.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_mapPoints.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_mapPoints_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_mapRadius.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_mapRect.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_mapRectScaleTranslate.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_mapRectToQuad.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_mapRect_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_mapRect_3.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_mapVector.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_mapVector_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_mapVectors.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_mapVectors_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_mapXY.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_mapXY_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_postConcat.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_postRotate.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_postRotate_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_postScale.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_postScale_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_postSkew.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_postSkew_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_postTranslate.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_preConcat.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_preRotate.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_preRotate_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_preScale.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_preScale_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_preSkew.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_preSkew_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_preTranslate.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_preservesAxisAlignment.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_preservesRightAngles.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_rectStaysRect.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_reset.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_set.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_set9.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_setAffine.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_setAll.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_setConcat.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_setIdentity.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_setPerspX.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_setPerspY.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_setPolyToPoly.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_setRSXform.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_setRotate.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_setRotate_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_setScale.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_setScaleTranslate.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_setScaleX.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_setScaleY.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_setScale_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_setSinCos.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_setSinCos_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_setSkew.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_setSkewX.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_setSkewY.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_setSkew_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_setTranslate.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_setTranslateX.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_setTranslateY.cpp
-FILE: ../../../third_party/skia/docs/examples/Matrix_setTranslate_2.cpp
-FILE: ../../../third_party/skia/docs/examples/MemberIndex.cpp
-FILE: ../../../third_party/skia/docs/examples/Miter_Limit.cpp
-FILE: ../../../third_party/skia/docs/examples/Modulate.cpp
-FILE: ../../../third_party/skia/docs/examples/Multiply.cpp
-FILE: ../../../third_party/skia/docs/examples/Overlay.cpp
-FILE: ../../../third_party/skia/docs/examples/PDF.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_053.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_057.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_containsText.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_copy_const_SkPaint.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_copy_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_countText.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_empty_constructor.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_equal_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_getAlpha.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_getColor.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_getColor4f.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_getColorFilter.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_getFillPath.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_getFillPath_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_getFlags.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_getFontMetrics.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_getFontSpacing.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_getHinting.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_getImageFilter.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_getMaskFilter.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_getPathEffect.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_getPosTextPath.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_getShader.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_getStrokeCap.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_getStrokeJoin.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_getStrokeMiter.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_getStrokeWidth.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_getStyle.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_getTextEncoding.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_getTextPath.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_getTextScaleX.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_getTextSize.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_getTextSkewX.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_getTextWidths.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_getTypeface.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_isAntiAlias.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_isAutohinted.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_isDither.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_isEmbeddedBitmapText.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_isFakeBoldText.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_isLCDRenderText.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_isLinearText.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_isSubpixelText.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_measureText.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_measureText_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_move_SkPaint.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_move_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_notequal_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_nothingToDraw.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_refColorFilter.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_refImageFilter.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_refMaskFilter.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_refPathEffect.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_refShader.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_refTypeface.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_reset.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_setARGB.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_setAlpha.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_setAntiAlias.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_setAutohinted.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_setBlendMode.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_setColor.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_setColor4f.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_setColorFilter.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_setDither.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_setEmbeddedBitmapText.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_setFakeBoldText.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_setFlags.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_setHinting.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_setImageFilter.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_setLCDRenderText.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_setLinearText.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_setMaskFilter.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_setPathEffect.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_setShader.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_setStrokeCap_a.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_setStrokeCap_b.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_setStrokeJoin.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_setStrokeMiter.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_setStrokeWidth.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_setStyle.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_setSubpixelText.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_setTextEncoding.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_setTextScaleX.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_setTextSize.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_setTextSkewX.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_setTypeface.cpp
-FILE: ../../../third_party/skia/docs/examples/Paint_textToGlyphs.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_AddPathMode.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_ArcSize.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_ConvertConicToQuads.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_ConvertToNonInverseFillType.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_Convexity.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_Direction.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_Effect_Methods.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_FillType_a.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_FillType_b.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_IsCubicDegenerate.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_IsInverseFillType.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_IsLineDegenerate.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_IsQuadDegenerate.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_Iter.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_Iter_Iter.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_Iter_conicWeight.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_Iter_const_SkPath.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_Iter_isCloseLine.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_Iter_isClosedContour.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_Iter_next.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_Iter_setPath.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_SegmentMask.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_Verb.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_addArc.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_addCircle.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_addOval.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_addOval_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_addPath.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_addPath_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_addPath_3.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_addPoly.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_addPoly_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_addRRect.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_addRRect_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_addRect.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_addRect_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_addRect_3.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_addRoundRect.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_addRoundRect_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_arcTo.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_arcTo_2_a.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_arcTo_2_b.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_arcTo_2_c.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_arcTo_3.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_arcTo_4.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_close.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_computeTightBounds.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_conicTo.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_conicTo_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_conservativelyContainsRect.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_contains.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_copy_const_SkPath.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_copy_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_countPoints.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_countVerbs.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_cubicTo.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_cubicTo_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_destructor.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_dump.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_dumpHex.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_dump_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_empty_constructor.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_equal_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_getBounds.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_getFillType.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_getGenerationID.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_getLastPt.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_getPoint.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_getPoints.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_getSegmentMasks.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_getVerbs.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_incReserve.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_interpolate.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_isConvex.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_isEmpty.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_isFinite.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_isInterpolatable.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_isInverseFillType_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_isLastContourClosed.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_isLine.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_isOval.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_isRRect.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_isRect.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_isVolatile.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_lineTo.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_lineTo_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_moveTo.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_moveTo_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_offset.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_offset_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_quadTo.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_quadTo_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_rArcTo.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_rConicTo.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_rCubicTo.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_rLineTo.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_rMoveTo.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_rQuadTo.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_readFromMemory.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_reset.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_reverseAddPath.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_rewind.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_serialize.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_setFillType.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_setIsVolatile.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_setLastPt.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_setLastPt_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_swap.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_toggleInverseFillType.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_transform.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_transform_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_updateBoundsCache.cpp
-FILE: ../../../third_party/skia/docs/examples/Path_writeToMemory.cpp
-FILE: ../../../third_party/skia/docs/examples/Picture_008.cpp
-FILE: ../../../third_party/skia/docs/examples/Picture_AbortCallback_abort.cpp
-FILE: ../../../third_party/skia/docs/examples/Picture_MakeFromData.cpp
-FILE: ../../../third_party/skia/docs/examples/Picture_MakeFromStream.cpp
-FILE: ../../../third_party/skia/docs/examples/Picture_MakePlaceholder.cpp
-FILE: ../../../third_party/skia/docs/examples/Picture_approximateBytesUsed.cpp
-FILE: ../../../third_party/skia/docs/examples/Picture_approximateOpCount.cpp
-FILE: ../../../third_party/skia/docs/examples/Picture_cullRect.cpp
-FILE: ../../../third_party/skia/docs/examples/Picture_playback.cpp
-FILE: ../../../third_party/skia/docs/examples/Picture_serialize.cpp
-FILE: ../../../third_party/skia/docs/examples/Picture_serialize_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Picture_uniqueID.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_addr.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_addr16.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_addr16_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_addr32.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_addr32_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_addr64.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_addr64_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_addr8.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_addr8_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_addrF16.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_addrF16_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_addr_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_alphaType.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_bounds.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_colorSpace.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_colorType.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_computeByteSize.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_computeIsOpaque.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_const_SkImageInfo_const_star.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_empty_constructor.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_erase.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_erase_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_erase_3.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_extractSubset.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_getColor.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_height.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_info.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_isOpaque.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_readPixels.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_readPixels_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_readPixels_3.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_readPixels_4.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_reset.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_reset_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_rowBytes.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_rowBytesAsPixels.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_scalePixels.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_setColorSpace.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_shiftPerPixel.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_width.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_writable_addr.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_writable_addr16.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_writable_addr32.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_writable_addr64.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_writable_addr8.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_writable_addrF16.cpp
-FILE: ../../../third_party/skia/docs/examples/Pixmap_writable_addr_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Plus.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_CrossProduct.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_Distance.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_DotProduct.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_Length.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_Make.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_Normalize.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_Offset.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_Offset_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_add_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_addto_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_cross.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_distanceToOrigin.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_dot.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_equal_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_equals.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_isFinite.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_isZero.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_iset.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_iset_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_length_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_minus_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_multiply_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_multiplyby_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_negate.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_normalize_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_notequal_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_offset_3.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_scale.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_scale_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_set.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_setAbs.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_setLength.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_setLength_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_setNormalize.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_subtract_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_subtractfrom_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_x.cpp
-FILE: ../../../third_party/skia/docs/examples/Point_y.cpp
-FILE: ../../../third_party/skia/docs/examples/PreMultiplyARGB.cpp
-FILE: ../../../third_party/skia/docs/examples/PreMultiplyColor.cpp
-FILE: ../../../third_party/skia/docs/examples/Quad_a.cpp
-FILE: ../../../third_party/skia/docs/examples/Quad_b.cpp
-FILE: ../../../third_party/skia/docs/examples/RGBA4f_FromColor.cpp
-FILE: ../../../third_party/skia/docs/examples/RGBA4f_equal1_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/RGBA4f_notequal1_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/RGBA4f_toSkColor.cpp
-FILE: ../../../third_party/skia/docs/examples/RGBA4f_vec.cpp
-FILE: ../../../third_party/skia/docs/examples/RGBA4f_vec_2.cpp
-FILE: ../../../third_party/skia/docs/examples/RGBToHSV.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_Corner.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_MakeEmpty.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_MakeOval.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_MakeRect.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_MakeRectXY.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_Type.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_contains.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_copy_const_SkRRect.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_copy_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_dump.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_dumpHex.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_dump_2.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_empty_constructor.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_equal_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_getBounds.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_getSimpleRadii.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_getType.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_height.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_inset.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_inset_2.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_isComplex.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_isEmpty.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_isNinePatch.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_isOval.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_isRect.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_isSimple.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_isValid.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_makeOffset.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_notequal_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_offset.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_outset.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_outset_2.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_radii.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_readFromMemory.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_rect.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_setEmpty.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_setNinePatch.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_setOval.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_setRect.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_setRectRadii.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_setRectXY.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_transform.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_type_2.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_width.cpp
-FILE: ../../../third_party/skia/docs/examples/RRect_writeToMemory.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_Intersects.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_Make.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_MakeEmpty.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_MakeIWH.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_MakeLTRB.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_MakeSize.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_MakeWH.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_MakeXYWH.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_Make_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_asScalars.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_bottom.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_centerX.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_centerY.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_contains.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_contains_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_contains_3.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_dump.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_dumpHex.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_dump_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_equal_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_height.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_inset.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_intersect.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_intersect_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_intersect_3.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_intersects_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_intersects_3.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_isEmpty.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_isFinite.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_isSorted.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_join.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_joinNonEmptyArg.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_joinPossiblyEmptyRect.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_join_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_left.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_makeInset.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_makeOffset.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_makeOutset.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_makeSorted.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_notequal_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_offset.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_offsetTo.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_offset_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_outset.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_right.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_round.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_roundIn.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_roundOut.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_roundOut_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_roundOut_3.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_round_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_set.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_setBounds.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_setBoundsCheck.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_setBoundsNoCheck.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_setEmpty.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_setLTRB.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_setWH.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_setXYWH.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_set_4.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_sort.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_toQuad.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_top.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_width.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_x.cpp
-FILE: ../../../third_party/skia/docs/examples/Rect_y.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_Cliperator_const_SkRegion_const_SkIRect.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_Cliperator_done.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_Cliperator_next.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_Cliperator_rect.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_Iterator_Iterator.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_Iterator_copy_const_SkRegion.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_Iterator_done.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_Iterator_next.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_Iterator_rect.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_Iterator_reset.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_Iterator_rewind.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_Iterator_rgn.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_Op.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_Spanerator_const_SkRegion_int_int_int.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_Spanerator_next.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_computeRegionComplexity.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_contains.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_contains_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_contains_3.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_copy_const_SkIRect.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_copy_const_SkRegion.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_copy_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_destructor.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_empty_constructor.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_equal1_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_getBoundaryPath.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_getBounds.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_intersects.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_intersects_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_isComplex.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_isEmpty.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_isRect.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_notequal1_operator.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_op_1.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_op_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_op_3.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_op_4.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_op_5.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_op_6.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_quickContains.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_quickReject.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_quickReject_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_readFromMemory.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_set.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_setEmpty.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_setPath.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_setRect.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_setRects.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_setRegion.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_swap.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_translate.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_translate_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Region_writeToMemory.cpp
-FILE: ../../../third_party/skia/docs/examples/Saturation.cpp
-FILE: ../../../third_party/skia/docs/examples/Screen.cpp
-FILE: ../../../third_party/skia/docs/examples/Shader_Methods_a.cpp
-FILE: ../../../third_party/skia/docs/examples/Shader_Methods_b.cpp
-FILE: ../../../third_party/skia/docs/examples/Soft_Light.cpp
-FILE: ../../../third_party/skia/docs/examples/Src.cpp
-FILE: ../../../third_party/skia/docs/examples/Src_Atop.cpp
-FILE: ../../../third_party/skia/docs/examples/Src_In.cpp
-FILE: ../../../third_party/skia/docs/examples/Src_Out.cpp
-FILE: ../../../third_party/skia/docs/examples/Src_Over.cpp
-FILE: ../../../third_party/skia/docs/examples/State_Stack_a.cpp
-FILE: ../../../third_party/skia/docs/examples/State_Stack_b.cpp
-FILE: ../../../third_party/skia/docs/examples/Stroke_Width.cpp
-FILE: ../../../third_party/skia/docs/examples/Surface_MakeFromBackendTexture.cpp
-FILE: ../../../third_party/skia/docs/examples/Surface_MakeNull.cpp
-FILE: ../../../third_party/skia/docs/examples/Surface_MakeRaster.cpp
-FILE: ../../../third_party/skia/docs/examples/Surface_MakeRasterDirect.cpp
-FILE: ../../../third_party/skia/docs/examples/Surface_MakeRasterDirectReleaseProc.cpp
-FILE: ../../../third_party/skia/docs/examples/Surface_MakeRasterN32Premul.cpp
-FILE: ../../../third_party/skia/docs/examples/Surface_MakeRaster_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Surface_MakeRenderTarget.cpp
-FILE: ../../../third_party/skia/docs/examples/Surface_MakeRenderTarget_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Surface_MakeRenderTarget_3.cpp
-FILE: ../../../third_party/skia/docs/examples/Surface_characterize.cpp
-FILE: ../../../third_party/skia/docs/examples/Surface_draw.cpp
-FILE: ../../../third_party/skia/docs/examples/Surface_draw_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Surface_getCanvas.cpp
-FILE: ../../../third_party/skia/docs/examples/Surface_height.cpp
-FILE: ../../../third_party/skia/docs/examples/Surface_makeImageSnapshot.cpp
-FILE: ../../../third_party/skia/docs/examples/Surface_makeImageSnapshot_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Surface_makeSurface.cpp
-FILE: ../../../third_party/skia/docs/examples/Surface_notifyContentWillChange.cpp
-FILE: ../../../third_party/skia/docs/examples/Surface_peekPixels.cpp
-FILE: ../../../third_party/skia/docs/examples/Surface_props.cpp
-FILE: ../../../third_party/skia/docs/examples/Surface_readPixels.cpp
-FILE: ../../../third_party/skia/docs/examples/Surface_readPixels_2.cpp
-FILE: ../../../third_party/skia/docs/examples/Surface_readPixels_3.cpp
-FILE: ../../../third_party/skia/docs/examples/Surface_width.cpp
-FILE: ../../../third_party/skia/docs/examples/Surface_writePixels.cpp
-FILE: ../../../third_party/skia/docs/examples/Surface_writePixels_2.cpp
-FILE: ../../../third_party/skia/docs/examples/TextBlobBuilder_allocRun.cpp
-FILE: ../../../third_party/skia/docs/examples/TextBlobBuilder_allocRunPos.cpp
-FILE: ../../../third_party/skia/docs/examples/TextBlobBuilder_allocRunPosH.cpp
-FILE: ../../../third_party/skia/docs/examples/TextBlobBuilder_empty_constructor.cpp
-FILE: ../../../third_party/skia/docs/examples/TextBlobBuilder_make.cpp
-FILE: ../../../third_party/skia/docs/examples/TextBlob_Deserialize.cpp
-FILE: ../../../third_party/skia/docs/examples/TextBlob_MakeFromString.cpp
-FILE: ../../../third_party/skia/docs/examples/TextBlob_MakeFromText.cpp
-FILE: ../../../third_party/skia/docs/examples/TextBlob_bounds.cpp
-FILE: ../../../third_party/skia/docs/examples/TextBlob_getIntercepts.cpp
-FILE: ../../../third_party/skia/docs/examples/TextBlob_serialize.cpp
-FILE: ../../../third_party/skia/docs/examples/TextBlob_serialize_2.cpp
-FILE: ../../../third_party/skia/docs/examples/TextBlob_uniqueID.cpp
-FILE: ../../../third_party/skia/docs/examples/Text_Encoding.cpp
-FILE: ../../../third_party/skia/docs/examples/Text_Scale_X.cpp
-FILE: ../../../third_party/skia/docs/examples/Text_Size.cpp
-FILE: ../../../third_party/skia/docs/examples/Text_Skew_X.cpp
-FILE: ../../../third_party/skia/docs/examples/Typeface_Methods.cpp
-FILE: ../../../third_party/skia/docs/examples/Xor.cpp
-FILE: ../../../third_party/skia/docs/examples/incomplete.cpp
-FILE: ../../../third_party/skia/experimental/minimal_ios_mtl_skia_app/main.mm
-FILE: ../../../third_party/skia/experimental/sktext/editor/App.cpp
-FILE: ../../../third_party/skia/gm/crbug_918512.cpp
-FILE: ../../../third_party/skia/gm/fp_sample_chaining.cpp
-FILE: ../../../third_party/skia/gm/fpcoordinateoverride.cpp
-FILE: ../../../third_party/skia/gm/inverseclip.cpp
-FILE: ../../../third_party/skia/gm/labyrinth.cpp
-FILE: ../../../third_party/skia/gm/manypathatlases.cpp
-FILE: ../../../third_party/skia/gm/preservefillrule.cpp
-FILE: ../../../third_party/skia/gm/swizzle.cpp
-FILE: ../../../third_party/skia/gm/tilemodes_alpha.cpp
-FILE: ../../../third_party/skia/include/core/SkPathTypes.h
-FILE: ../../../third_party/skia/modules/skparagraph/bench/ParagraphBench.cpp
-FILE: ../../../third_party/skia/modules/skplaintexteditor/app/editor_application.cpp
-FILE: ../../../third_party/skia/modules/skplaintexteditor/include/editor.h
-FILE: ../../../third_party/skia/modules/skplaintexteditor/include/stringslice.h
-FILE: ../../../third_party/skia/modules/skplaintexteditor/include/stringview.h
-FILE: ../../../third_party/skia/modules/skplaintexteditor/src/editor.cpp
-FILE: ../../../third_party/skia/modules/skplaintexteditor/src/shape.cpp
-FILE: ../../../third_party/skia/modules/skplaintexteditor/src/shape.h
-FILE: ../../../third_party/skia/modules/skplaintexteditor/src/stringslice.cpp
-FILE: ../../../third_party/skia/modules/skplaintexteditor/src/word_boundaries.cpp
-FILE: ../../../third_party/skia/modules/skplaintexteditor/src/word_boundaries.h
-FILE: ../../../third_party/skia/src/core/SkContainers.cpp
-FILE: ../../../third_party/skia/src/core/SkMalloc.cpp
-FILE: ../../../third_party/skia/src/core/SkPixelRefPriv.h
-FILE: ../../../third_party/skia/src/core/SkTextBlobTrace.cpp
-FILE: ../../../third_party/skia/src/core/SkTextBlobTrace.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/AtlasPathRenderer.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/AtlasPathRenderer.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/PathInnerTriangulateOp.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/PathInnerTriangulateOp.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/TessellationPathRenderer.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/TessellationPathRenderer.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/GrPathTessellationShader.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/GrPathTessellationShader.h
-FILE: ../../../third_party/skia/src/pdf/SkPDFGraphicStackState.cpp
-FILE: ../../../third_party/skia/src/pdf/SkPDFGraphicStackState.h
-FILE: ../../../third_party/skia/src/pdf/SkPDFType1Font.cpp
-FILE: ../../../third_party/skia/src/pdf/SkPDFType1Font.h
+FILE: ../../../flutter/third_party/skia/fuzz/FuzzSkParagraph.cpp
+FILE: ../../../flutter/third_party/skia/gm/3d.cpp
+FILE: ../../../flutter/third_party/skia/gm/bc1_transparency.cpp
+FILE: ../../../flutter/third_party/skia/gm/bicubic.cpp
+FILE: ../../../flutter/third_party/skia/gm/compressed_textures.cpp
+FILE: ../../../flutter/third_party/skia/gm/crbug_1073670.cpp
+FILE: ../../../flutter/third_party/skia/gm/crbug_1086705.cpp
+FILE: ../../../flutter/third_party/skia/gm/crbug_1113794.cpp
+FILE: ../../../flutter/third_party/skia/gm/exoticformats.cpp
+FILE: ../../../flutter/third_party/skia/gm/rsxtext.cpp
+FILE: ../../../flutter/third_party/skia/gm/skbug_9819.cpp
+FILE: ../../../flutter/third_party/skia/gm/strokerect_anisotropic.cpp
+FILE: ../../../flutter/third_party/skia/gm/widebuttcaps.cpp
+FILE: ../../../flutter/third_party/skia/include/core/SkM44.h
+FILE: ../../../flutter/third_party/skia/include/core/SkSamplingOptions.h
+FILE: ../../../flutter/third_party/skia/include/gpu/GrDirectContext.h
+FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlBackendContext.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkTPin.h
+FILE: ../../../flutter/third_party/skia/modules/audioplayer/SkAudioPlayer.cpp
+FILE: ../../../flutter/third_party/skia/modules/audioplayer/SkAudioPlayer.h
+FILE: ../../../flutter/third_party/skia/modules/audioplayer/SkAudioPlayer_mac.mm
+FILE: ../../../flutter/third_party/skia/modules/audioplayer/SkAudioPlayer_none.cpp
+FILE: ../../../flutter/third_party/skia/modules/audioplayer/SkAudioPlayer_oboe.cpp
+FILE: ../../../flutter/third_party/skia/modules/audioplayer/SkAudioPlayer_sfml.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/include/ExternalLayer.h
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/Adapter.h
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/Camera.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/Camera.h
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/Path.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/Transform.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/Transform.h
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/animator/Animator.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/animator/Animator.h
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/animator/KeyframeAnimator.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/animator/KeyframeAnimator.h
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/animator/ScalarKeyframeAnimator.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/animator/ShapeKeyframeAnimator.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/animator/TextKeyframeAnimator.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/animator/Vec2KeyframeAnimator.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/animator/VectorKeyframeAnimator.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/animator/VectorKeyframeAnimator.h
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/effects/BlackAndWhiteEffect.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/effects/BrightnessContrastEffect.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/effects/CornerPinEffect.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/effects/DisplacementMapEffect.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/effects/GlowStyles.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/effects/ShadowStyles.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/layers/AudioLayer.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/layers/shapelayer/Ellipse.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/layers/shapelayer/FillStroke.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/layers/shapelayer/Gradient.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/layers/shapelayer/MergePaths.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/layers/shapelayer/OffsetPaths.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/layers/shapelayer/Polystar.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/layers/shapelayer/PuckerBloat.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/layers/shapelayer/Rectangle.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/layers/shapelayer/Repeater.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/layers/shapelayer/RoundCorners.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/layers/shapelayer/ShapeLayer.h
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/layers/shapelayer/TrimPaths.cpp
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/gm/simple_gm.cpp
+FILE: ../../../flutter/third_party/skia/modules/sksg/include/SkSGGeometryEffect.h
+FILE: ../../../flutter/third_party/skia/modules/sksg/src/SkSGGeometryEffect.cpp
+FILE: ../../../flutter/third_party/skia/modules/skshaper/src/SkShaper_coretext.cpp
+FILE: ../../../flutter/third_party/skia/modules/skunicode/src/SkUnicode_icu.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGFe.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGFeBlend.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGFeColorMatrix.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGFeComposite.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGFeDisplacementMap.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGFeFlood.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGFeGaussianBlur.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGFeLighting.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGFeMorphology.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGFeOffset.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGFeTurbulence.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGFilter.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGFilterContext.h
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGFe.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGFeBlend.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGFeColorMatrix.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGFeComposite.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGFeDisplacementMap.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGFeFlood.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGFeGaussianBlur.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGFeLighting.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGFeMorphology.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGFeOffset.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGFeTurbulence.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGFilter.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGFilterContext.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGTextPriv.h
+FILE: ../../../flutter/third_party/skia/modules/svg/utils/SvgTool.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkColorFilterPriv.h
+FILE: ../../../flutter/third_party/skia/src/core/SkCompressedDataUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkCompressedDataUtils.h
+FILE: ../../../flutter/third_party/skia/src/core/SkM44.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkMemset_opts_erms.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkMipmapBuilder.h
+FILE: ../../../flutter/third_party/skia/src/core/SkSamplingPriv.h
+FILE: ../../../flutter/third_party/skia/src/core/SkVerticesPriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDynamicAtlas.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDynamicAtlas.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrEagerVertexAllocator.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrHashMapWithCache.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrRecordingContextPriv.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrThreadSafeCache.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrThreadSafeCache.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrAATriangulator.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrAATriangulator.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mock/GrMockOpTarget.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/DrawAtlasPathOp.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/DrawAtlasPathOp.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelperWithStencil.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelperWithStencil.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/SmallPathAtlasMgr.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/SmallPathAtlasMgr.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/SmallPathShapeData.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/SmallPathShapeData.h
+FILE: ../../../flutter/third_party/skia/src/gpu/tessellate/MiddleOutPolygonTriangulator.h
+FILE: ../../../flutter/third_party/skia/src/gpu/tessellate/StrokeIterator.h
+FILE: ../../../flutter/third_party/skia/src/gpu/tessellate/WangsFormula.h
+FILE: ../../../flutter/third_party/skia/src/ports/SkScalerContext_mac_ct.h
+FILE: ../../../flutter/third_party/skia/src/ports/SkTypeface_mac_ct.h
+FILE: ../../../flutter/third_party/skia/src/text/gpu/SDFTControl.cpp
+FILE: ../../../flutter/third_party/skia/src/text/gpu/SDFTControl.h
+FILE: ../../../flutter/third_party/skia/src/utils/mac/SkCGBase.h
+FILE: ../../../flutter/third_party/skia/src/utils/mac/SkCGGeometry.h
+FILE: ../../../flutter/third_party/skia/src/utils/mac/SkCTFont.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/mac/SkCTFont.h
 ----------------------------------------------------------------------------------------------------
-Copyright 2019 Google LLC.
+Copyright 2020 Google Inc.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -6169,15 +6676,275 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSKSL2GLSL.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/animated_image_orientation.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/crbug_1041204.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/crbug_1139750.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/crbug_1156804.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/crbug_1162942.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/crbug_224618.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/encode_color_types.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/kawase_blur_rt.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/userfont.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/ycbcrimage.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkYUVAInfo.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkYUVAPixmaps.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/GrYUVABackendTextures.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/d3d/GrD3DBackendContext.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/d3d/GrD3DTypes.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/ports/SkImageGeneratorNDK.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/SkIDChangeListener.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/SkSLSampleUsage.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/gpu/ganesh/GrD3DTypesMinimal.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/utils/SkCustomTypeface.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/canvaskit/gm_bindings.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/canvaskit/viewer_bindings.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/canvaskit/wasm_tools/SIMD/simd_float_capabilities.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/canvaskit/wasm_tools/SIMD/simd_int_capabilities.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skunicode/include/SkUnicode.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkASAN.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkBlockAllocator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkBlockAllocator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkIDChangeListener.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRuntimeEffectPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkYUVAInfo.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkYUVAPixmaps.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/GpuRefCnt.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ClipStack.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ClipStack.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBackendSemaphore.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBackendUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBackendUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDDLTask.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDDLTask.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrManagedResource.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrPixmap.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrRenderTargetContext.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrRingBuffer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrRingBuffer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrStagingBufferManager.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrStagingBufferManager.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrUniformDataManager.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrUniformDataManager.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrUtil.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrYUVABackendTextures.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/StencilMaskHelper.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/StencilMaskHelper.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DAMDMemoryAllocator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DAMDMemoryAllocator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DAttachment.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DAttachment.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DBuffer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DBuffer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DCaps.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DCaps.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DCommandList.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DCommandList.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DCommandSignature.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DCommandSignature.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DCpuDescriptorManager.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DCpuDescriptorManager.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DDescriptorHeap.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DDescriptorHeap.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DDescriptorTableManager.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DDescriptorTableManager.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DGpu.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DGpu.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DOpsRenderPass.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DOpsRenderPass.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DPipeline.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DPipelineState.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DPipelineState.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DPipelineStateBuilder.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DPipelineStateBuilder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DPipelineStateDataManager.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DRenderTarget.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DRenderTarget.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DResourceProvider.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DResourceProvider.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DResourceState.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DRootSignature.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DRootSignature.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DSemaphore.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DSemaphore.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DTexture.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DTexture.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DTextureRenderTarget.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DTextureRenderTarget.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DTextureResource.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DTextureResource.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DTypesMinimal.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DTypesPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DUtil.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DUtil.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrMatrixEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrMatrixEffect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrShape.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrShape.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/webgl/GrGLMakeNativeInterface_webgl.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/glsl/GrGLSLUniformHandler.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkMSAALoadManager.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkMSAALoadManager.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkManagedResource.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/image/SkRescaleAndReadPixels.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/image/SkRescaleAndReadPixels.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkImageEncoder_NDK.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkImageGeneratorNDK.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkNDKConversions.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkNDKConversions.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLAnalysis.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLConstantFolder.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLConstantFolder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLInliner.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLInliner.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLMemoryPool.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLPool.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLPool.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLSampleUsage.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLHLSLCodeGenerator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLHLSLCodeGenerator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLSPIRVtoHLSL.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLSPIRVtoHLSL.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLFunctionPrototype.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLModifiers.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLPrefixExpression.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLStructDefinition.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkCustomTypeface.cpp + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSKSL2GLSL.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSKSL2Metal.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSKSL2Pipeline.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSKSL2SPIRV.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSkDescriptorDeserialize.cpp
+FILE: ../../../flutter/third_party/skia/gm/animated_image_orientation.cpp
+FILE: ../../../flutter/third_party/skia/gm/crbug_1041204.cpp
+FILE: ../../../flutter/third_party/skia/gm/crbug_1139750.cpp
+FILE: ../../../flutter/third_party/skia/gm/crbug_1156804.cpp
+FILE: ../../../flutter/third_party/skia/gm/crbug_1162942.cpp
+FILE: ../../../flutter/third_party/skia/gm/crbug_224618.cpp
+FILE: ../../../flutter/third_party/skia/gm/encode_color_types.cpp
+FILE: ../../../flutter/third_party/skia/gm/kawase_blur_rt.cpp
+FILE: ../../../flutter/third_party/skia/gm/userfont.cpp
+FILE: ../../../flutter/third_party/skia/gm/ycbcrimage.cpp
+FILE: ../../../flutter/third_party/skia/include/core/SkYUVAInfo.h
+FILE: ../../../flutter/third_party/skia/include/core/SkYUVAPixmaps.h
+FILE: ../../../flutter/third_party/skia/include/gpu/GrYUVABackendTextures.h
+FILE: ../../../flutter/third_party/skia/include/gpu/d3d/GrD3DBackendContext.h
+FILE: ../../../flutter/third_party/skia/include/gpu/d3d/GrD3DTypes.h
+FILE: ../../../flutter/third_party/skia/include/ports/SkImageGeneratorNDK.h
+FILE: ../../../flutter/third_party/skia/include/private/SkIDChangeListener.h
+FILE: ../../../flutter/third_party/skia/include/private/SkSLSampleUsage.h
+FILE: ../../../flutter/third_party/skia/include/private/gpu/ganesh/GrD3DTypesMinimal.h
+FILE: ../../../flutter/third_party/skia/include/utils/SkCustomTypeface.h
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/gm_bindings.cpp
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/viewer_bindings.cpp
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/wasm_tools/SIMD/simd_float_capabilities.cpp
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/wasm_tools/SIMD/simd_int_capabilities.cpp
+FILE: ../../../flutter/third_party/skia/modules/skunicode/include/SkUnicode.h
+FILE: ../../../flutter/third_party/skia/src/base/SkASAN.h
+FILE: ../../../flutter/third_party/skia/src/base/SkBlockAllocator.cpp
+FILE: ../../../flutter/third_party/skia/src/base/SkBlockAllocator.h
+FILE: ../../../flutter/third_party/skia/src/core/SkIDChangeListener.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkRuntimeEffectPriv.h
+FILE: ../../../flutter/third_party/skia/src/core/SkYUVAInfo.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkYUVAPixmaps.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/GpuRefCnt.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ClipStack.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ClipStack.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBackendSemaphore.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBackendUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBackendUtils.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDDLTask.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDDLTask.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrManagedResource.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrPixmap.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrRenderTargetContext.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrRingBuffer.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrRingBuffer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrStagingBufferManager.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrStagingBufferManager.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrUniformDataManager.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrUniformDataManager.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrUtil.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrYUVABackendTextures.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/StencilMaskHelper.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/StencilMaskHelper.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DAMDMemoryAllocator.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DAMDMemoryAllocator.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DAttachment.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DAttachment.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DBuffer.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DBuffer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DCaps.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DCaps.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DCommandList.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DCommandList.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DCommandSignature.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DCommandSignature.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DCpuDescriptorManager.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DCpuDescriptorManager.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DDescriptorHeap.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DDescriptorHeap.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DDescriptorTableManager.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DDescriptorTableManager.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DGpu.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DGpu.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DOpsRenderPass.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DOpsRenderPass.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DPipeline.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DPipelineState.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DPipelineState.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DPipelineStateBuilder.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DPipelineStateBuilder.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DPipelineStateDataManager.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DRenderTarget.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DRenderTarget.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DResourceProvider.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DResourceProvider.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DResourceState.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DRootSignature.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DRootSignature.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DSemaphore.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DSemaphore.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DTexture.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DTexture.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DTextureRenderTarget.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DTextureRenderTarget.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DTextureResource.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DTextureResource.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DTypesMinimal.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DTypesPriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DUtil.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DUtil.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrMatrixEffect.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrMatrixEffect.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrShape.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrShape.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/webgl/GrGLMakeNativeInterface_webgl.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/glsl/GrGLSLUniformHandler.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkMSAALoadManager.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkMSAALoadManager.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkManagedResource.h
+FILE: ../../../flutter/third_party/skia/src/image/SkRescaleAndReadPixels.cpp
+FILE: ../../../flutter/third_party/skia/src/image/SkRescaleAndReadPixels.h
+FILE: ../../../flutter/third_party/skia/src/ports/SkImageEncoder_NDK.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkImageGeneratorNDK.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkNDKConversions.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkNDKConversions.h
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLAnalysis.h
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLConstantFolder.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLConstantFolder.h
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLInliner.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLInliner.h
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLMemoryPool.h
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLPool.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLPool.h
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLSampleUsage.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLHLSLCodeGenerator.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLHLSLCodeGenerator.h
+FILE: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLSPIRVtoHLSL.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLSPIRVtoHLSL.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLFunctionPrototype.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLModifiers.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLPrefixExpression.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLStructDefinition.h
+FILE: ../../../flutter/third_party/skia/src/utils/SkCustomTypeface.cpp
 ----------------------------------------------------------------------------------------------------
-Copyright 2019 Google, LLC
+Copyright 2020 Google LLC
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -6210,11 +6977,44 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/src/core/SkStrikeSpec.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/src/Decorations.cpp
+ORIGIN: ../../../flutter/third_party/skia/modules/skparagraph/src/Decorations.h
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/src/Decorations.cpp
+FILE: ../../../flutter/third_party/skia/modules/skparagraph/src/Decorations.h
+----------------------------------------------------------------------------------------------------
+Copyright 2020 Google LLC.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: skia
+ORIGIN: ../../../flutter/third_party/skia/gm/clear_swizzle.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/gpu_blur_utils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLFinishCallbacks.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLFinishCallbacks.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/AtlasInstancedHelper.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/StrokeTessellateOp.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/StrokeTessellateOp.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/tessellate/GrStrokeTessellationShader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/tessellate/GrStrokeTessellationShader.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/tessellate/GrTessellationShader.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLAnalysis.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructor.cpp + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/src/core/SkStrikeSpec.cpp
+FILE: ../../../flutter/third_party/skia/gm/clear_swizzle.cpp
+FILE: ../../../flutter/third_party/skia/gm/gpu_blur_utils.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLFinishCallbacks.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLFinishCallbacks.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/AtlasInstancedHelper.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/StrokeTessellateOp.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/StrokeTessellateOp.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/tessellate/GrStrokeTessellationShader.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/tessellate/GrStrokeTessellationShader.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/tessellate/GrTessellationShader.h
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLAnalysis.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructor.cpp
 ----------------------------------------------------------------------------------------------------
-Copyright 2019 The Android Open Source Project
+Copyright 2020 Google LLC.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -6247,25 +7047,41 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/infra/bots/recipe_modules/flavor/resources/win_run_and_check_log.ps1 + ../../../LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/FuzzCreateDDL.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/FuzzPath.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/FuzzRRect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzAPICreateDDL.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzAPISVGCanvas.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzSKP.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzSVG.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzSkRuntimeEffect.cpp + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/resources/win_run_and_check_log.ps1
+FILE: ../../../flutter/third_party/skia/fuzz/FuzzCreateDDL.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/FuzzPath.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/FuzzRRect.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzAPICreateDDL.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzAPISVGCanvas.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzSKP.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzSVG.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzSkRuntimeEffect.cpp
 ----------------------------------------------------------------------------------------------------
-Copyright 2019 The Chromium Authors. All rights reserved.
+Copyright 2020 Google, LLC
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -6282,148 +7098,175 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/bench/FindCubicConvex180ChopsBench.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/FuzzDDLThreading.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/aarecteffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/colorspace.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/colrv1.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/drawglyphs.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/largeclippedpath.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/skbug_12212.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/slug.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/gpu/graphite/MtlGraphiteTypesPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/utils/SkOrderedFontMgr.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/jetski/src/Canvas.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/jetski/src/ColorFilters.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/jetski/src/Gradients.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/jetski/src/Image.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/jetski/src/ImageFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/jetski/src/JetSki.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/jetski/src/Matrix.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/jetski/src/Paint.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/jetski/src/Path.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/jetski/src/PathBuilder.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/jetski/src/RuntimeShaderBuilder.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/jetski/src/Shader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/jetski/src/SkottieAnimation.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/jetski/src/Surface.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/jetski/src/Surface.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/jetski/src/SurfaceThread.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/jetski/src/SurfaceThread.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/jetski/src/Utils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/jetski/src/Utils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/effects/BulgeEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/effects/CCTonerEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/effects/DirectionalBlur.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/effects/FractalNoiseEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/effects/SharpenEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/effects/SkSLEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/effects/SphereEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/effects/ThresholdEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skunicode/src/SkUnicode_icu_builtin.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skunicode/src/SkUnicode_icu_runtime.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skunicode/src/SkUnicode_icupriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGFeImage.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGFeLightSource.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGImage.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGMask.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGFeImage.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGFeLightSource.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGImage.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGMask.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkJpegxlCodec.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkJpegxlCodec.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDrawIndirectCommand.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrRenderTaskCluster.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrRenderTaskCluster.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrThreadSafePipelineBuilder.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrThreadSafePipelineBuilder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mock/GrMockRenderTask.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mock/GrMockSurfaceProxy.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlFramebuffer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlFramebuffer.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlPipeline.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlRenderCommandEncoder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlTypesPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/AtlasRenderTask.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/AtlasRenderTask.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/Buffer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/Buffer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/BufferManager.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/BufferManager.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlBlitCommandEncoder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlBuffer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlBuffer.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlGraphiteUtils.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlRenderCommandEncoder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/mtl/MtlUtils.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/tessellate/CullTest.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/tessellate/Tessellation.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkTransformShader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkTransformShader.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLGLSL.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLExpression.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/lex/TransitionTable.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/lex/TransitionTable.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkOrderedFontMgr.cpp + ../../../flutter/third_party/skia/LICENSE
 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/fuzz/FuzzSkParagraph.cpp
-FILE: ../../../third_party/skia/gm/3d.cpp
-FILE: ../../../third_party/skia/gm/bc1_transparency.cpp
-FILE: ../../../third_party/skia/gm/bicubic.cpp
-FILE: ../../../third_party/skia/gm/compressed_textures.cpp
-FILE: ../../../third_party/skia/gm/crbug_1073670.cpp
-FILE: ../../../third_party/skia/gm/crbug_1086705.cpp
-FILE: ../../../third_party/skia/gm/crbug_1113794.cpp
-FILE: ../../../third_party/skia/gm/exoticformats.cpp
-FILE: ../../../third_party/skia/gm/rsxtext.cpp
-FILE: ../../../third_party/skia/gm/skbug_9819.cpp
-FILE: ../../../third_party/skia/gm/strokerect_anisotropic.cpp
-FILE: ../../../third_party/skia/gm/verifiers/gmverifier.cpp
-FILE: ../../../third_party/skia/gm/verifiers/gmverifier.h
-FILE: ../../../third_party/skia/gm/widebuttcaps.cpp
-FILE: ../../../third_party/skia/include/core/SkM44.h
-FILE: ../../../third_party/skia/include/core/SkSamplingOptions.h
-FILE: ../../../third_party/skia/include/effects/SkStrokeAndFillPathEffect.h
-FILE: ../../../third_party/skia/include/gpu/GrDirectContext.h
-FILE: ../../../third_party/skia/include/gpu/mtl/GrMtlBackendContext.h
-FILE: ../../../third_party/skia/include/private/SkOpts_spi.h
-FILE: ../../../third_party/skia/include/private/SkTPin.h
-FILE: ../../../third_party/skia/modules/audioplayer/SkAudioPlayer.cpp
-FILE: ../../../third_party/skia/modules/audioplayer/SkAudioPlayer.h
-FILE: ../../../third_party/skia/modules/audioplayer/SkAudioPlayer_mac.mm
-FILE: ../../../third_party/skia/modules/audioplayer/SkAudioPlayer_none.cpp
-FILE: ../../../third_party/skia/modules/audioplayer/SkAudioPlayer_oboe.cpp
-FILE: ../../../third_party/skia/modules/audioplayer/SkAudioPlayer_sfml.cpp
-FILE: ../../../third_party/skia/modules/skottie/include/ExternalLayer.h
-FILE: ../../../third_party/skia/modules/skottie/src/Adapter.h
-FILE: ../../../third_party/skia/modules/skottie/src/Camera.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/Camera.h
-FILE: ../../../third_party/skia/modules/skottie/src/Path.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/Transform.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/Transform.h
-FILE: ../../../third_party/skia/modules/skottie/src/animator/Animator.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/animator/Animator.h
-FILE: ../../../third_party/skia/modules/skottie/src/animator/KeyframeAnimator.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/animator/KeyframeAnimator.h
-FILE: ../../../third_party/skia/modules/skottie/src/animator/ScalarKeyframeAnimator.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/animator/ShapeKeyframeAnimator.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/animator/TextKeyframeAnimator.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/animator/Vec2KeyframeAnimator.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/animator/VectorKeyframeAnimator.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/animator/VectorKeyframeAnimator.h
-FILE: ../../../third_party/skia/modules/skottie/src/effects/BlackAndWhiteEffect.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/effects/BrightnessContrastEffect.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/effects/CornerPinEffect.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/effects/DisplacementMapEffect.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/effects/GlowStyles.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/effects/ShadowStyles.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/layers/AudioLayer.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/Ellipse.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/FillStroke.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/Gradient.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/MergePaths.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/OffsetPaths.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/Polystar.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/PuckerBloat.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/Rectangle.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/Repeater.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/RoundCorners.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/ShapeLayer.h
-FILE: ../../../third_party/skia/modules/skottie/src/layers/shapelayer/TrimPaths.cpp
-FILE: ../../../third_party/skia/modules/skparagraph/gm/simple_gm.cpp
-FILE: ../../../third_party/skia/modules/sksg/include/SkSGGeometryEffect.h
-FILE: ../../../third_party/skia/modules/sksg/src/SkSGGeometryEffect.cpp
-FILE: ../../../third_party/skia/modules/skshaper/src/SkShaper_coretext.cpp
-FILE: ../../../third_party/skia/modules/skunicode/src/SkUnicode_icu.cpp
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGFe.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGFeBlend.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGFeColorMatrix.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGFeComposite.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGFeDisplacementMap.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGFeFlood.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGFeGaussianBlur.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGFeLighting.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGFeMorphology.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGFeOffset.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGFeTurbulence.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGFilter.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGFilterContext.h
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGFe.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGFeBlend.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGFeColorMatrix.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGFeComposite.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGFeDisplacementMap.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGFeFlood.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGFeGaussianBlur.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGFeLighting.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGFeMorphology.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGFeOffset.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGFeTurbulence.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGFilter.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGFilterContext.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGTextPriv.h
-FILE: ../../../third_party/skia/modules/svg/utils/SvgTool.cpp
-FILE: ../../../third_party/skia/src/core/SkColorFilterPriv.h
-FILE: ../../../third_party/skia/src/core/SkCompressedDataUtils.cpp
-FILE: ../../../third_party/skia/src/core/SkCompressedDataUtils.h
-FILE: ../../../third_party/skia/src/core/SkM44.cpp
-FILE: ../../../third_party/skia/src/core/SkMipmapBuilder.h
-FILE: ../../../third_party/skia/src/core/SkOpts_erms.cpp
-FILE: ../../../third_party/skia/src/core/SkSamplingPriv.h
-FILE: ../../../third_party/skia/src/core/SkVerticesPriv.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrDynamicAtlas.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrDynamicAtlas.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrEagerVertexAllocator.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrHashMapWithCache.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrRecordingContextPriv.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrThreadSafeCache.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrThreadSafeCache.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/geometry/GrAATriangulator.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/geometry/GrAATriangulator.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mock/GrMockOpTarget.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/DrawAtlasPathOp.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/DrawAtlasPathOp.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelperWithStencil.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelperWithStencil.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/SmallPathAtlasMgr.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/SmallPathAtlasMgr.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/SmallPathShapeData.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/SmallPathShapeData.h
-FILE: ../../../third_party/skia/src/gpu/tessellate/MiddleOutPolygonTriangulator.h
-FILE: ../../../third_party/skia/src/gpu/tessellate/StrokeIterator.h
-FILE: ../../../third_party/skia/src/gpu/tessellate/WangsFormula.h
-FILE: ../../../third_party/skia/src/opts/SkOpts_skx.cpp
-FILE: ../../../third_party/skia/src/ports/SkScalerContext_mac_ct.h
-FILE: ../../../third_party/skia/src/ports/SkTypeface_mac_ct.h
-FILE: ../../../third_party/skia/src/text/gpu/SDFTControl.cpp
-FILE: ../../../third_party/skia/src/text/gpu/SDFTControl.h
-FILE: ../../../third_party/skia/src/utils/mac/SkCGBase.h
-FILE: ../../../third_party/skia/src/utils/mac/SkCGGeometry.h
-FILE: ../../../third_party/skia/src/utils/mac/SkCTFont.cpp
-FILE: ../../../third_party/skia/src/utils/mac/SkCTFont.h
+FILE: ../../../flutter/third_party/skia/fuzz/FuzzDDLThreading.cpp
+FILE: ../../../flutter/third_party/skia/gm/aarecteffect.cpp
+FILE: ../../../flutter/third_party/skia/gm/colorspace.cpp
+FILE: ../../../flutter/third_party/skia/gm/colrv1.cpp
+FILE: ../../../flutter/third_party/skia/gm/drawglyphs.cpp
+FILE: ../../../flutter/third_party/skia/gm/largeclippedpath.cpp
+FILE: ../../../flutter/third_party/skia/gm/skbug_12212.cpp
+FILE: ../../../flutter/third_party/skia/gm/slug.cpp
+FILE: ../../../flutter/third_party/skia/include/private/gpu/graphite/MtlGraphiteTypesPriv.h
+FILE: ../../../flutter/third_party/skia/include/utils/SkOrderedFontMgr.h
+FILE: ../../../flutter/third_party/skia/modules/jetski/src/Canvas.cpp
+FILE: ../../../flutter/third_party/skia/modules/jetski/src/ColorFilters.cpp
+FILE: ../../../flutter/third_party/skia/modules/jetski/src/Gradients.cpp
+FILE: ../../../flutter/third_party/skia/modules/jetski/src/Image.cpp
+FILE: ../../../flutter/third_party/skia/modules/jetski/src/ImageFilter.cpp
+FILE: ../../../flutter/third_party/skia/modules/jetski/src/JetSki.cpp
+FILE: ../../../flutter/third_party/skia/modules/jetski/src/Matrix.cpp
+FILE: ../../../flutter/third_party/skia/modules/jetski/src/Paint.cpp
+FILE: ../../../flutter/third_party/skia/modules/jetski/src/Path.cpp
+FILE: ../../../flutter/third_party/skia/modules/jetski/src/PathBuilder.cpp
+FILE: ../../../flutter/third_party/skia/modules/jetski/src/RuntimeShaderBuilder.cpp
+FILE: ../../../flutter/third_party/skia/modules/jetski/src/Shader.cpp
+FILE: ../../../flutter/third_party/skia/modules/jetski/src/SkottieAnimation.cpp
+FILE: ../../../flutter/third_party/skia/modules/jetski/src/Surface.cpp
+FILE: ../../../flutter/third_party/skia/modules/jetski/src/Surface.h
+FILE: ../../../flutter/third_party/skia/modules/jetski/src/SurfaceThread.cpp
+FILE: ../../../flutter/third_party/skia/modules/jetski/src/SurfaceThread.h
+FILE: ../../../flutter/third_party/skia/modules/jetski/src/Utils.cpp
+FILE: ../../../flutter/third_party/skia/modules/jetski/src/Utils.h
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/effects/BulgeEffect.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/effects/CCTonerEffect.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/effects/DirectionalBlur.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/effects/FractalNoiseEffect.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/effects/SharpenEffect.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/effects/SkSLEffect.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/effects/SphereEffect.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/effects/ThresholdEffect.cpp
+FILE: ../../../flutter/third_party/skia/modules/skunicode/src/SkUnicode_icu_builtin.cpp
+FILE: ../../../flutter/third_party/skia/modules/skunicode/src/SkUnicode_icu_runtime.cpp
+FILE: ../../../flutter/third_party/skia/modules/skunicode/src/SkUnicode_icupriv.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGFeImage.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGFeLightSource.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGImage.h
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGMask.h
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGFeImage.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGFeLightSource.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGImage.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGMask.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkJpegxlCodec.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkJpegxlCodec.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDrawIndirectCommand.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrRenderTaskCluster.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrRenderTaskCluster.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrThreadSafePipelineBuilder.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrThreadSafePipelineBuilder.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mock/GrMockRenderTask.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mock/GrMockSurfaceProxy.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlFramebuffer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlFramebuffer.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlPipeline.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlRenderCommandEncoder.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlTypesPriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/AtlasRenderTask.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/AtlasRenderTask.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/Buffer.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/Buffer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/BufferManager.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/BufferManager.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlBlitCommandEncoder.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlBuffer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlBuffer.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlGraphiteUtils.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlRenderCommandEncoder.h
+FILE: ../../../flutter/third_party/skia/src/gpu/mtl/MtlUtils.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/tessellate/CullTest.h
+FILE: ../../../flutter/third_party/skia/src/gpu/tessellate/Tessellation.h
+FILE: ../../../flutter/third_party/skia/src/shaders/SkTransformShader.cpp
+FILE: ../../../flutter/third_party/skia/src/shaders/SkTransformShader.h
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLGLSL.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLExpression.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/lex/TransitionTable.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/lex/TransitionTable.h
+FILE: ../../../flutter/third_party/skia/src/utils/SkOrderedFontMgr.cpp
 ----------------------------------------------------------------------------------------------------
-Copyright 2020 Google Inc.
+Copyright 2021 Google Inc.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -6456,161 +7299,433 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/bench/CreateBackendTextureBench.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/attributes.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/composecolorfilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/crbug_1167277.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/crbug_1174186.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/crbug_1174354.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/crbug_1177833.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/crbug_1257515.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/crop_imagefilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/fillrect_gradient.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/graphitestart.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/hardstop_gradients_many.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/lazytiling.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/mesh.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkBlender.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkMesh.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/effects/SkBlenders.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/ShaderErrorHandler.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/gl/egl/GrGLMakeEGLInterface.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/gl/glx/GrGLMakeGLXInterface.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/BackendTexture.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/Context.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/GraphiteTypes.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/Recorder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/Recording.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/TextureInfo.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/mtl/MtlBackendContext.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/mtl/MtlGraphiteTypes.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/chromium/Slug.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/canvaskit/paragraph_bindings_gen.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkEnumBitMask.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBlendModeBlender.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBlendModeBlender.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBlenderBase.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMatrixInvert.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMatrixInvert.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMesh.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMeshPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkYUVAInfoLocation.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/SkBlenders.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/imagefilters/SkCropImageFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/imagefilters/SkRuntimeImageFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/KeyBuilder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ResourceKey.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ShaderErrorHandler.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/SkRenderEngineAbortf.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDstProxyView.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrEagerVertexAllocator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrMeshDrawTarget.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrMeshDrawTarget.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrOpsTypes.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrPersistentCacheUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrWritePixelsRenderTask.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrWritePixelsRenderTask.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrYUVATextureProxies.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrYUVATextureProxies.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/SurfaceFillContext.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/SurfaceFillContext.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DTypesPriv.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrInnerFanTriangulator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/egl/GrGLMakeNativeInterface_egl.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/glx/GrGLMakeNativeInterface_glx.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mock/GrMockTypesPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlTypesPriv.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/DrawMeshOp.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/DrawMeshOp.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/FillPathFlags.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkBuffer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkBuffer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/Attribute.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/BackendTexture.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/Caps.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/Caps.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/CommandBuffer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/CommandBuffer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/Context.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/ContextPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/ContextUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/ContextUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/Device.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/Device.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/DrawContext.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/DrawContext.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/DrawList.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/DrawList.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/DrawOrder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/DrawPass.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/DrawPass.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/DrawTypes.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/DrawWriter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/DrawWriter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/GpuWorkSubmission.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/GraphicsPipeline.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/GraphicsPipeline.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/GraphicsPipelineDesc.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/Image_Graphite.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/Image_Graphite.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/PipelineDataCache.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/Recorder.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/Recording.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/Renderer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/ResourceProvider.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/ResourceProvider.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/ResourceTypes.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/SharedContext.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/SharedContext.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/Surface_Graphite.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/Surface_Graphite.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/Texture.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/Texture.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/TextureInfo.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/TextureProxy.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/TextureProxy.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/Uniform.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/UniformManager.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/UniformManager.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/geom/BoundsManager.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/geom/IntersectionTree.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/geom/IntersectionTree.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/geom/Rect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/geom/Shape.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/geom/Shape.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/geom/Transform.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/geom/Transform_graphite.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlCaps.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlCaps.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlCommandBuffer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlCommandBuffer.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlGraphicsPipeline.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlGraphicsPipeline.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlGraphiteTypes.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlGraphiteUtilsPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlResourceProvider.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlResourceProvider.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlSharedContext.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlSharedContext.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlTexture.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlTexture.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/task/CopyTask.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/task/CopyTask.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/task/RenderPassTask.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/task/RenderPassTask.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/task/Task.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/task/TaskList.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/task/TaskList.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/mtl/MtlMemoryAllocatorImpl.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/mtl/MtlMemoryAllocatorImpl.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/mtl/MtlUtilsPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLBuiltinTypes.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLBuiltinTypes.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLContext.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLIntrinsicList.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLMangler.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLOperator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLOperator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLCanExitWithoutReturningValue.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLCheckProgramStructure.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLGetLoopUnrollInfo.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLIsConstantExpression.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLProgramUsage.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLProgramVisitor.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLSwitchCaseContainsExit.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLSymbolTableStackBuilder.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLBinaryExpression.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLBlock.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLChildCall.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLChildCall.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorArray.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorArray.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorArrayCast.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorArrayCast.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorCompound.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorCompound.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorCompoundCast.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorCompoundCast.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorDiagonalMatrix.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorDiagonalMatrix.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorMatrixResize.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorMatrixResize.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorScalarCast.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorScalarCast.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorSplat.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorSplat.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorStruct.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorStruct.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLDoStatement.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLExpressionStatement.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLFieldAccess.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLForStatement.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLFunctionCall.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLFunctionDefinition.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLIfStatement.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLIndexExpression.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLMethodReference.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLPostfixExpression.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLSwitchStatement.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLSwizzle.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLTernaryExpression.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLTypeReference.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLVarDeclarations.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/tracing/SkSLDebugTracePlayer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/tracing/SkSLDebugTracePlayer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/tracing/SkSLDebugTracePriv.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/tracing/SkSLDebugTracePriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/transform/SkSLEliminateDeadFunctions.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/transform/SkSLEliminateDeadGlobalVariables.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/transform/SkSLEliminateDeadLocalVariables.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/transform/SkSLEliminateUnreachableCode.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/transform/SkSLProgramWriter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/transform/SkSLReplaceConstVarsWithLiterals.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/text/gpu/Slug.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/text/gpu/SubRunAllocator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/text/gpu/SubRunAllocator.h + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/bench/CreateBackendTextureBench.cpp
-FILE: ../../../third_party/skia/bench/GrQuadBench.cpp
-FILE: ../../../third_party/skia/bench/SkSLBench.h
-FILE: ../../../third_party/skia/gm/animated_image_orientation.cpp
-FILE: ../../../third_party/skia/gm/crbug_1041204.cpp
-FILE: ../../../third_party/skia/gm/crbug_1139750.cpp
-FILE: ../../../third_party/skia/gm/crbug_1156804.cpp
-FILE: ../../../third_party/skia/gm/crbug_1162942.cpp
-FILE: ../../../third_party/skia/gm/crbug_224618.cpp
-FILE: ../../../third_party/skia/gm/encode_color_types.cpp
-FILE: ../../../third_party/skia/gm/kawase_blur_rt.cpp
-FILE: ../../../third_party/skia/gm/userfont.cpp
-FILE: ../../../third_party/skia/gm/ycbcrimage.cpp
-FILE: ../../../third_party/skia/include/core/SkYUVAInfo.h
-FILE: ../../../third_party/skia/include/core/SkYUVAPixmaps.h
-FILE: ../../../third_party/skia/include/gpu/GrBackendSurfaceMutableState.h
-FILE: ../../../third_party/skia/include/gpu/GrYUVABackendTextures.h
-FILE: ../../../third_party/skia/include/gpu/d3d/GrD3DBackendContext.h
-FILE: ../../../third_party/skia/include/gpu/d3d/GrD3DTypes.h
-FILE: ../../../third_party/skia/include/ports/SkImageGeneratorNDK.h
-FILE: ../../../third_party/skia/include/private/SkIDChangeListener.h
-FILE: ../../../third_party/skia/include/private/SkSLSampleUsage.h
-FILE: ../../../third_party/skia/include/private/gpu/ganesh/GrD3DTypesMinimal.h
-FILE: ../../../third_party/skia/include/sksl/DSL.h
-FILE: ../../../third_party/skia/include/sksl/DSLCore.h
-FILE: ../../../third_party/skia/include/sksl/DSLExpression.h
-FILE: ../../../third_party/skia/include/sksl/DSLModifiers.h
-FILE: ../../../third_party/skia/include/sksl/DSLType.h
-FILE: ../../../third_party/skia/include/sksl/DSLVar.h
-FILE: ../../../third_party/skia/include/utils/SkCustomTypeface.h
-FILE: ../../../third_party/skia/modules/canvaskit/gm_bindings.cpp
-FILE: ../../../third_party/skia/modules/canvaskit/viewer_bindings.cpp
-FILE: ../../../third_party/skia/modules/canvaskit/wasm_tools/SIMD/simd_float_capabilities.cpp
-FILE: ../../../third_party/skia/modules/canvaskit/wasm_tools/SIMD/simd_int_capabilities.cpp
-FILE: ../../../third_party/skia/modules/skunicode/include/SkUnicode.h
-FILE: ../../../third_party/skia/src/core/SkASAN.h
-FILE: ../../../third_party/skia/src/core/SkBlockAllocator.cpp
-FILE: ../../../third_party/skia/src/core/SkBlockAllocator.h
-FILE: ../../../third_party/skia/src/core/SkIDChangeListener.cpp
-FILE: ../../../third_party/skia/src/core/SkMatrixProvider.h
-FILE: ../../../third_party/skia/src/core/SkRuntimeEffectPriv.h
-FILE: ../../../third_party/skia/src/core/SkVM_fwd.h
-FILE: ../../../third_party/skia/src/core/SkYUVAInfo.cpp
-FILE: ../../../third_party/skia/src/core/SkYUVAPixmaps.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ClipStack.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ClipStack.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrBackendSemaphore.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrBackendUtils.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrBackendUtils.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrDDLTask.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrDDLTask.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrManagedResource.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrPixmap.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrRefCnt.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrRenderTargetContext.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrRingBuffer.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrRingBuffer.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrStagingBufferManager.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrStagingBufferManager.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrUniformDataManager.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrUniformDataManager.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrUtil.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrYUVABackendTextures.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/StencilMaskHelper.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/StencilMaskHelper.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DAMDMemoryAllocator.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DAMDMemoryAllocator.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DAttachment.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DAttachment.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DBuffer.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DBuffer.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DCaps.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DCaps.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DCommandList.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DCommandList.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DCommandSignature.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DCommandSignature.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DCpuDescriptorManager.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DCpuDescriptorManager.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DDescriptorHeap.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DDescriptorHeap.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DDescriptorTableManager.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DDescriptorTableManager.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DGpu.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DGpu.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DOpsRenderPass.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DOpsRenderPass.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DPipeline.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DPipelineState.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DPipelineState.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DPipelineStateBuilder.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DPipelineStateBuilder.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DPipelineStateDataManager.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DRenderTarget.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DRenderTarget.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DResourceProvider.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DResourceProvider.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DResourceState.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DRootSignature.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DRootSignature.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DSemaphore.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DSemaphore.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DTexture.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DTexture.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DTextureRenderTarget.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DTextureRenderTarget.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DTextureResource.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DTextureResource.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DTypesMinimal.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DTypesPriv.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DUtil.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DUtil.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrMatrixEffect.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrMatrixEffect.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/geometry/GrShape.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/geometry/GrShape.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/webgl/GrGLMakeNativeInterface_webgl.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/glsl/GrGLSLUniformHandler.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkMSAALoadManager.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkMSAALoadManager.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkManagedResource.h
-FILE: ../../../third_party/skia/src/image/SkRescaleAndReadPixels.cpp
-FILE: ../../../third_party/skia/src/image/SkRescaleAndReadPixels.h
-FILE: ../../../third_party/skia/src/ports/SkImageEncoder_NDK.cpp
-FILE: ../../../third_party/skia/src/ports/SkImageGeneratorNDK.cpp
-FILE: ../../../third_party/skia/src/ports/SkNDKConversions.cpp
-FILE: ../../../third_party/skia/src/ports/SkNDKConversions.h
-FILE: ../../../third_party/skia/src/sksl/SkSLAnalysis.h
-FILE: ../../../third_party/skia/src/sksl/SkSLConstantFolder.cpp
-FILE: ../../../third_party/skia/src/sksl/SkSLConstantFolder.h
-FILE: ../../../third_party/skia/src/sksl/SkSLInliner.cpp
-FILE: ../../../third_party/skia/src/sksl/SkSLInliner.h
-FILE: ../../../third_party/skia/src/sksl/SkSLMemoryPool.h
-FILE: ../../../third_party/skia/src/sksl/SkSLPool.cpp
-FILE: ../../../third_party/skia/src/sksl/SkSLPool.h
-FILE: ../../../third_party/skia/src/sksl/SkSLSampleUsage.cpp
-FILE: ../../../third_party/skia/src/sksl/SkSLThreadContext.cpp
-FILE: ../../../third_party/skia/src/sksl/codegen/SkSLSPIRVtoHLSL.cpp
-FILE: ../../../third_party/skia/src/sksl/codegen/SkSLSPIRVtoHLSL.h
-FILE: ../../../third_party/skia/src/sksl/codegen/SkSLVMCodeGenerator.cpp
-FILE: ../../../third_party/skia/src/sksl/codegen/SkSLVMCodeGenerator.h
-FILE: ../../../third_party/skia/src/sksl/dsl/DSLCore.cpp
-FILE: ../../../third_party/skia/src/sksl/dsl/DSLExpression.cpp
-FILE: ../../../third_party/skia/src/sksl/dsl/DSLType.cpp
-FILE: ../../../third_party/skia/src/sksl/dsl/DSLVar.cpp
-FILE: ../../../third_party/skia/src/sksl/dsl/priv/DSLWriter.cpp
-FILE: ../../../third_party/skia/src/sksl/dsl/priv/DSLWriter.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLFunctionPrototype.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLPrefixExpression.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLStructDefinition.h
-FILE: ../../../third_party/skia/src/utils/SkCustomTypeface.cpp
+FILE: ../../../flutter/third_party/skia/gm/attributes.cpp
+FILE: ../../../flutter/third_party/skia/gm/composecolorfilter.cpp
+FILE: ../../../flutter/third_party/skia/gm/crbug_1167277.cpp
+FILE: ../../../flutter/third_party/skia/gm/crbug_1174186.cpp
+FILE: ../../../flutter/third_party/skia/gm/crbug_1174354.cpp
+FILE: ../../../flutter/third_party/skia/gm/crbug_1177833.cpp
+FILE: ../../../flutter/third_party/skia/gm/crbug_1257515.cpp
+FILE: ../../../flutter/third_party/skia/gm/crop_imagefilter.cpp
+FILE: ../../../flutter/third_party/skia/gm/fillrect_gradient.cpp
+FILE: ../../../flutter/third_party/skia/gm/graphitestart.cpp
+FILE: ../../../flutter/third_party/skia/gm/hardstop_gradients_many.cpp
+FILE: ../../../flutter/third_party/skia/gm/lazytiling.cpp
+FILE: ../../../flutter/third_party/skia/gm/mesh.cpp
+FILE: ../../../flutter/third_party/skia/include/core/SkBlender.h
+FILE: ../../../flutter/third_party/skia/include/core/SkMesh.h
+FILE: ../../../flutter/third_party/skia/include/effects/SkBlenders.h
+FILE: ../../../flutter/third_party/skia/include/gpu/ShaderErrorHandler.h
+FILE: ../../../flutter/third_party/skia/include/gpu/gl/egl/GrGLMakeEGLInterface.h
+FILE: ../../../flutter/third_party/skia/include/gpu/gl/glx/GrGLMakeGLXInterface.h
+FILE: ../../../flutter/third_party/skia/include/gpu/graphite/BackendTexture.h
+FILE: ../../../flutter/third_party/skia/include/gpu/graphite/Context.h
+FILE: ../../../flutter/third_party/skia/include/gpu/graphite/GraphiteTypes.h
+FILE: ../../../flutter/third_party/skia/include/gpu/graphite/Recorder.h
+FILE: ../../../flutter/third_party/skia/include/gpu/graphite/Recording.h
+FILE: ../../../flutter/third_party/skia/include/gpu/graphite/TextureInfo.h
+FILE: ../../../flutter/third_party/skia/include/gpu/graphite/mtl/MtlBackendContext.h
+FILE: ../../../flutter/third_party/skia/include/gpu/graphite/mtl/MtlGraphiteTypes.h
+FILE: ../../../flutter/third_party/skia/include/private/chromium/Slug.h
+FILE: ../../../flutter/third_party/skia/modules/canvaskit/paragraph_bindings_gen.cpp
+FILE: ../../../flutter/third_party/skia/src/base/SkEnumBitMask.h
+FILE: ../../../flutter/third_party/skia/src/core/SkBlendModeBlender.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkBlendModeBlender.h
+FILE: ../../../flutter/third_party/skia/src/core/SkBlenderBase.h
+FILE: ../../../flutter/third_party/skia/src/core/SkMatrixInvert.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkMatrixInvert.h
+FILE: ../../../flutter/third_party/skia/src/core/SkMesh.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkMeshPriv.h
+FILE: ../../../flutter/third_party/skia/src/core/SkYUVAInfoLocation.h
+FILE: ../../../flutter/third_party/skia/src/effects/SkBlenders.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/imagefilters/SkCropImageFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/imagefilters/SkRuntimeImageFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/KeyBuilder.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ResourceKey.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ShaderErrorHandler.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/SkRenderEngineAbortf.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDstProxyView.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrEagerVertexAllocator.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrMeshDrawTarget.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrMeshDrawTarget.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrOpsTypes.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrPersistentCacheUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrWritePixelsRenderTask.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrWritePixelsRenderTask.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrYUVATextureProxies.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrYUVATextureProxies.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/SurfaceFillContext.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/SurfaceFillContext.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/d3d/GrD3DTypesPriv.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/geometry/GrInnerFanTriangulator.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/egl/GrGLMakeNativeInterface_egl.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/glx/GrGLMakeNativeInterface_glx.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mock/GrMockTypesPriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlTypesPriv.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/DrawMeshOp.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/DrawMeshOp.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/FillPathFlags.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkBuffer.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkBuffer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/Attribute.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/BackendTexture.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/Caps.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/Caps.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/CommandBuffer.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/CommandBuffer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/Context.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/ContextPriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/ContextUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/ContextUtils.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/Device.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/Device.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/DrawContext.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/DrawContext.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/DrawList.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/DrawList.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/DrawOrder.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/DrawPass.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/DrawPass.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/DrawTypes.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/DrawWriter.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/DrawWriter.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/GpuWorkSubmission.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/GraphicsPipeline.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/GraphicsPipeline.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/GraphicsPipelineDesc.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/Image_Graphite.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/Image_Graphite.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/PipelineDataCache.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/Recorder.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/Recording.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/Renderer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/ResourceProvider.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/ResourceProvider.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/ResourceTypes.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/SharedContext.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/SharedContext.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/Surface_Graphite.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/Surface_Graphite.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/Texture.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/Texture.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/TextureInfo.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/TextureProxy.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/TextureProxy.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/Uniform.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/UniformManager.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/UniformManager.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/geom/BoundsManager.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/geom/IntersectionTree.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/geom/IntersectionTree.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/geom/Rect.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/geom/Shape.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/geom/Shape.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/geom/Transform.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/geom/Transform_graphite.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlCaps.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlCaps.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlCommandBuffer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlCommandBuffer.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlGraphicsPipeline.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlGraphicsPipeline.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlGraphiteTypes.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlGraphiteUtilsPriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlResourceProvider.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlResourceProvider.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlSharedContext.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlSharedContext.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlTexture.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlTexture.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/task/CopyTask.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/task/CopyTask.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/task/RenderPassTask.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/task/RenderPassTask.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/task/Task.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/task/TaskList.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/task/TaskList.h
+FILE: ../../../flutter/third_party/skia/src/gpu/mtl/MtlMemoryAllocatorImpl.h
+FILE: ../../../flutter/third_party/skia/src/gpu/mtl/MtlMemoryAllocatorImpl.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/mtl/MtlUtilsPriv.h
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLBuiltinTypes.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLBuiltinTypes.h
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLContext.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLIntrinsicList.h
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLMangler.h
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLOperator.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLOperator.h
+FILE: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLCanExitWithoutReturningValue.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLCheckProgramStructure.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLGetLoopUnrollInfo.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLIsConstantExpression.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLProgramUsage.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLProgramVisitor.h
+FILE: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLSwitchCaseContainsExit.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLSymbolTableStackBuilder.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLBinaryExpression.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLBlock.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLChildCall.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLChildCall.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorArray.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorArray.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorArrayCast.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorArrayCast.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorCompound.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorCompound.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorCompoundCast.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorCompoundCast.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorDiagonalMatrix.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorDiagonalMatrix.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorMatrixResize.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorMatrixResize.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorScalarCast.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorScalarCast.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorSplat.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorSplat.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorStruct.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLConstructorStruct.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLDoStatement.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLExpressionStatement.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLFieldAccess.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLForStatement.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLFunctionCall.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLFunctionDefinition.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLIfStatement.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLIndexExpression.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLMethodReference.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLPostfixExpression.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLSwitchStatement.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLSwizzle.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLTernaryExpression.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLTypeReference.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLVarDeclarations.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/tracing/SkSLDebugTracePlayer.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/tracing/SkSLDebugTracePlayer.h
+FILE: ../../../flutter/third_party/skia/src/sksl/tracing/SkSLDebugTracePriv.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/tracing/SkSLDebugTracePriv.h
+FILE: ../../../flutter/third_party/skia/src/sksl/transform/SkSLEliminateDeadFunctions.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/transform/SkSLEliminateDeadGlobalVariables.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/transform/SkSLEliminateDeadLocalVariables.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/transform/SkSLEliminateUnreachableCode.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/transform/SkSLProgramWriter.h
+FILE: ../../../flutter/third_party/skia/src/sksl/transform/SkSLReplaceConstVarsWithLiterals.cpp
+FILE: ../../../flutter/third_party/skia/src/text/gpu/Slug.cpp
+FILE: ../../../flutter/third_party/skia/src/text/gpu/SubRunAllocator.cpp
+FILE: ../../../flutter/third_party/skia/src/text/gpu/SubRunAllocator.h
 ----------------------------------------------------------------------------------------------------
-Copyright 2020 Google LLC
+Copyright 2021 Google LLC
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -6643,192 +7758,73 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/docs/examples/50_percent_gray.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/batchedconvexpaths.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/destcolor.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/chromium/SkChromeRemoteGlyphCache.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/sksl/SkSLDebugTrace.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkStringView.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrVertexChunkArray.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrVertexChunkArray.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrModulateAtlasCoverageEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrModulateAtlasCoverageEffect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/AtlasInstancedHelper.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/PathStencilCoverOp.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/PathStencilCoverOp.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/PathTessellateOp.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/PathTessellateOp.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/tessellate/GrTessellationShader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/tessellate/AffineMatrix.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/tessellate/PatchWriter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/tessellate/Tessellation.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLErrorReporter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLErrorReporter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLIntrinsicList.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLMangler.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLParser.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLParser.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLPosition.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLProgramKind.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLFunctionDeclaration.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLModifierFlags.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLPoison.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLVariable.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/transform/SkSLFindAndDeclareBuiltinVariables.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/transform/SkSLTransform.h + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/docs/examples/50_percent_gray.cpp
-FILE: ../../../third_party/skia/docs/examples/50_percent_srgb.cpp
-FILE: ../../../third_party/skia/docs/examples/BlendModes.cpp
-FILE: ../../../third_party/skia/docs/examples/Canvas_saveLayer_4.cpp
-FILE: ../../../third_party/skia/docs/examples/ChromeMDRefreshTab.cpp
-FILE: ../../../third_party/skia/docs/examples/ChromeMDRefreshTabs.cpp
-FILE: ../../../third_party/skia/docs/examples/Color_Wheel.cpp
-FILE: ../../../third_party/skia/docs/examples/DCIToXYZD50.cpp
-FILE: ../../../third_party/skia/docs/examples/GradientShader_MakeLinear.cpp
-FILE: ../../../third_party/skia/docs/examples/Octopus_Generator.cpp
-FILE: ../../../third_party/skia/docs/examples/Octopus_Generator_Animated.cpp
-FILE: ../../../third_party/skia/docs/examples/PaintDump.cpp
-FILE: ../../../third_party/skia/docs/examples/SKIA_LOGO.cpp
-FILE: ../../../third_party/skia/docs/examples/SKIA_LOGO_ANIMATE.cpp
-FILE: ../../../third_party/skia/docs/examples/SKIA_LOGO_svg.cpp
-FILE: ../../../third_party/skia/docs/examples/SkFontMgr_example.cpp
-FILE: ../../../third_party/skia/docs/examples/SkFontMgr_example2.cpp
-FILE: ../../../third_party/skia/docs/examples/SkImage_to_PPM_ascii.cpp
-FILE: ../../../third_party/skia/docs/examples/SkImage_to_PPM_binary.cpp
-FILE: ../../../third_party/skia/docs/examples/SkParsePath_FromSVGString.cpp
-FILE: ../../../third_party/skia/docs/examples/SkParsePath_ToSVGString.cpp
-FILE: ../../../third_party/skia/docs/examples/SkPath_arcTo_example.cpp
-FILE: ../../../third_party/skia/docs/examples/SkPath_arcto_conic_parametric.cpp
-FILE: ../../../third_party/skia/docs/examples/SkPath_arcto_conic_parametric2.cpp
-FILE: ../../../third_party/skia/docs/examples/SkPath_cubicTo_example.cpp
-FILE: ../../../third_party/skia/docs/examples/SkPath_cubicTo_example_parametric.cpp
-FILE: ../../../third_party/skia/docs/examples/SkPath_cubicTo_example_parametric_animated.cpp
-FILE: ../../../third_party/skia/docs/examples/SkPath_quadTo_example.cpp
-FILE: ../../../third_party/skia/docs/examples/SkPath_quadTo_example_parametric.cpp
-FILE: ../../../third_party/skia/docs/examples/SkPath_quadTo_example_parametric_animated.cpp
-FILE: ../../../third_party/skia/docs/examples/SmoothBezierSplineInterpolation.cpp
-FILE: ../../../third_party/skia/docs/examples/Turtle.cpp
-FILE: ../../../third_party/skia/docs/examples/UnicornPoop.cpp
-FILE: ../../../third_party/skia/docs/examples/UnpremulBugs.cpp
-FILE: ../../../third_party/skia/docs/examples/UnpremulGPU.cpp
-FILE: ../../../third_party/skia/docs/examples/alpha_bitmap_color_filter_mask_filter.cpp
-FILE: ../../../third_party/skia/docs/examples/alphaimage_shader_colorfilter.cpp
-FILE: ../../../third_party/skia/docs/examples/backdrop_blur_with_rrect_clip.cpp
-FILE: ../../../third_party/skia/docs/examples/bezier_curves.cpp
-FILE: ../../../third_party/skia/docs/examples/blur4444.cpp
-FILE: ../../../third_party/skia/docs/examples/blur_alpha_img.cpp
-FILE: ../../../third_party/skia/docs/examples/blurbug.cpp
-FILE: ../../../third_party/skia/docs/examples/bug5252.cpp
-FILE: ../../../third_party/skia/docs/examples/bug583299.cpp
-FILE: ../../../third_party/skia/docs/examples/bug6495.cpp
-FILE: ../../../third_party/skia/docs/examples/bug7573.cpp
-FILE: ../../../third_party/skia/docs/examples/bug7573_1.cpp
-FILE: ../../../third_party/skia/docs/examples/bug767834.cpp
-FILE: ../../../third_party/skia/docs/examples/bugoftheday.cpp
-FILE: ../../../third_party/skia/docs/examples/checker_board.cpp
-FILE: ../../../third_party/skia/docs/examples/color_filter_vs_colorFilterImageFilter_saveLayer.cpp
-FILE: ../../../third_party/skia/docs/examples/compose_path.cpp
-FILE: ../../../third_party/skia/docs/examples/convex_overstroke_linear_approx_curve.cpp
-FILE: ../../../third_party/skia/docs/examples/convex_overstroke_quad.cpp
-FILE: ../../../third_party/skia/docs/examples/count_verbs.cpp
-FILE: ../../../third_party/skia/docs/examples/crbug_663246.cpp
-FILE: ../../../third_party/skia/docs/examples/crbug_918512.cpp
-FILE: ../../../third_party/skia/docs/examples/cubics_are_horrible.cpp
-FILE: ../../../third_party/skia/docs/examples/default.cpp
-FILE: ../../../third_party/skia/docs/examples/default2.cpp
-FILE: ../../../third_party/skia/docs/examples/default3.cpp
-FILE: ../../../third_party/skia/docs/examples/discrete_path.cpp
-FILE: ../../../third_party/skia/docs/examples/dither1.cpp
-FILE: ../../../third_party/skia/docs/examples/draw_a8_bitmap.cpp
-FILE: ../../../third_party/skia/docs/examples/draw_image_nine_blur_mask.cpp
-FILE: ../../../third_party/skia/docs/examples/draw_patch.cpp
-FILE: ../../../third_party/skia/docs/examples/draw_pixel_array.cpp
-FILE: ../../../third_party/skia/docs/examples/draw_pixel_array_nocopy.cpp
-FILE: ../../../third_party/skia/docs/examples/draw_pixel_array_with_copy.cpp
-FILE: ../../../third_party/skia/docs/examples/draw_text_fails.cpp
-FILE: ../../../third_party/skia/docs/examples/draw_vertices.cpp
-FILE: ../../../third_party/skia/docs/examples/drawarcs.cpp
-FILE: ../../../third_party/skia/docs/examples/example3ps.cpp
-FILE: ../../../third_party/skia/docs/examples/f16.cpp
-FILE: ../../../third_party/skia/docs/examples/f16to8888busted.cpp
-FILE: ../../../third_party/skia/docs/examples/f16to8888drawImageBug.cpp
-FILE: ../../../third_party/skia/docs/examples/failing_example.cpp
-FILE: ../../../third_party/skia/docs/examples/fivearcs.cpp
-FILE: ../../../third_party/skia/docs/examples/flag_us_1792.cpp
-FILE: ../../../third_party/skia/docs/examples/flag_us_1960.cpp
-FILE: ../../../third_party/skia/docs/examples/fluttershadow.cpp
-FILE: ../../../third_party/skia/docs/examples/gamma_mask_filter.cpp
-FILE: ../../../third_party/skia/docs/examples/getLocalBounds_broken.cpp
-FILE: ../../../third_party/skia/docs/examples/getLocalBounds_working.cpp
-FILE: ../../../third_party/skia/docs/examples/gpu4444diff.cpp
-FILE: ../../../third_party/skia/docs/examples/gpu8888diff.cpp
-FILE: ../../../third_party/skia/docs/examples/gpuconicbug.cpp
-FILE: ../../../third_party/skia/docs/examples/homogeneous.cpp
-FILE: ../../../third_party/skia/docs/examples/image_subsets_get_different_uids.cpp
-FILE: ../../../third_party/skia/docs/examples/image_to_bitmap_does_not_preserve_genid.cpp
-FILE: ../../../third_party/skia/docs/examples/inlinepixmapconstructor.cpp
-FILE: ../../../third_party/skia/docs/examples/issue640176.cpp
-FILE: ../../../third_party/skia/docs/examples/l_system_plant.cpp
-FILE: ../../../third_party/skia/docs/examples/maddash.cpp
-FILE: ../../../third_party/skia/docs/examples/makeRasterImage_fail.cpp
-FILE: ../../../third_party/skia/docs/examples/mapradius.cpp
-FILE: ../../../third_party/skia/docs/examples/massive_coordinates_svg.cpp
-FILE: ../../../third_party/skia/docs/examples/measure_text_bounds.cpp
-FILE: ../../../third_party/skia/docs/examples/no_gpu_blur.cpp
-FILE: ../../../third_party/skia/docs/examples/not_path_gradient.cpp
-FILE: ../../../third_party/skia/docs/examples/pathmeasure.cpp
-FILE: ../../../third_party/skia/docs/examples/pathops.cpp
-FILE: ../../../third_party/skia/docs/examples/persp_text_2.cpp
-FILE: ../../../third_party/skia/docs/examples/picture_shader.cpp
-FILE: ../../../third_party/skia/docs/examples/pong.cpp
-FILE: ../../../third_party/skia/docs/examples/pong2.cpp
-FILE: ../../../third_party/skia/docs/examples/purplestamp.cpp
-FILE: ../../../third_party/skia/docs/examples/radial_gradient_shader_with_animated_color.cpp
-FILE: ../../../third_party/skia/docs/examples/radial_gradient_test.cpp
-FILE: ../../../third_party/skia/docs/examples/redwhiteonblue.cpp
-FILE: ../../../third_party/skia/docs/examples/rotations.cpp
-FILE: ../../../third_party/skia/docs/examples/setimagefilter.cpp
-FILE: ../../../third_party/skia/docs/examples/shader.cpp
-FILE: ../../../third_party/skia/docs/examples/shader_alphaimage.cpp
-FILE: ../../../third_party/skia/docs/examples/shapes.cpp
-FILE: ../../../third_party/skia/docs/examples/shapes_with_motion.cpp
-FILE: ../../../third_party/skia/docs/examples/skbug6031.cpp
-FILE: ../../../third_party/skia/docs/examples/skbug_237_drawImageRect.cpp
-FILE: ../../../third_party/skia/docs/examples/skbug_237_drawImage_with_blur.cpp
-FILE: ../../../third_party/skia/docs/examples/skbug_5648.cpp
-FILE: ../../../third_party/skia/docs/examples/skbug_633528.cpp
-FILE: ../../../third_party/skia/docs/examples/skcanvas_paint.cpp
-FILE: ../../../third_party/skia/docs/examples/skcanvas_square.cpp
-FILE: ../../../third_party/skia/docs/examples/skcanvas_star.cpp
-FILE: ../../../third_party/skia/docs/examples/skew_x_animated.cpp
-FILE: ../../../third_party/skia/docs/examples/skpaint_2pt.cpp
-FILE: ../../../third_party/skia/docs/examples/skpaint_bitmap_shader.cpp
-FILE: ../../../third_party/skia/docs/examples/skpaint_blur_mask_filter.cpp
-FILE: ../../../third_party/skia/docs/examples/skpaint_blur_mask_filter_2.cpp
-FILE: ../../../third_party/skia/docs/examples/skpaint_color_table_filter.cpp
-FILE: ../../../third_party/skia/docs/examples/skpaint_compose.cpp
-FILE: ../../../third_party/skia/docs/examples/skpaint_compose_path_effect.cpp
-FILE: ../../../third_party/skia/docs/examples/skpaint_compose_shader.cpp
-FILE: ../../../third_party/skia/docs/examples/skpaint_corner_path_effects.cpp
-FILE: ../../../third_party/skia/docs/examples/skpaint_dash_path_effect.cpp
-FILE: ../../../third_party/skia/docs/examples/skpaint_discrete_path_effect.cpp
-FILE: ../../../third_party/skia/docs/examples/skpaint_line_2d_path_effect.cpp
-FILE: ../../../third_party/skia/docs/examples/skpaint_matrix_color_filter.cpp
-FILE: ../../../third_party/skia/docs/examples/skpaint_mix.cpp
-FILE: ../../../third_party/skia/docs/examples/skpaint_path_1d_path_effect.cpp
-FILE: ../../../third_party/skia/docs/examples/skpaint_path_2d_path_effect.cpp
-FILE: ../../../third_party/skia/docs/examples/skpaint_perlin.cpp
-FILE: ../../../third_party/skia/docs/examples/skpaint_radial.cpp
-FILE: ../../../third_party/skia/docs/examples/skpaint_shader.cpp
-FILE: ../../../third_party/skia/docs/examples/skpaint_skia.cpp
-FILE: ../../../third_party/skia/docs/examples/skpaint_sum_path_effect.cpp
-FILE: ../../../third_party/skia/docs/examples/skpaint_sweep.cpp
-FILE: ../../../third_party/skia/docs/examples/skpaint_turb.cpp
-FILE: ../../../third_party/skia/docs/examples/skpaint_xfer.cpp
-FILE: ../../../third_party/skia/docs/examples/software_bitmap_w_perspective.cpp
-FILE: ../../../third_party/skia/docs/examples/star.cpp
-FILE: ../../../third_party/skia/docs/examples/star2.cpp
-FILE: ../../../third_party/skia/docs/examples/stroke_closed_degenerate_path.cpp
-FILE: ../../../third_party/skia/docs/examples/strokerect_gm.cpp
-FILE: ../../../third_party/skia/docs/examples/subset_example.cpp
-FILE: ../../../third_party/skia/docs/examples/sum_path_effect.cpp
-FILE: ../../../third_party/skia/docs/examples/sweep_gradient_talk_1.cpp
-FILE: ../../../third_party/skia/docs/examples/sweep_gradient_talk_2.cpp
-FILE: ../../../third_party/skia/docs/examples/sweep_gradient_talk_4.cpp
-FILE: ../../../third_party/skia/docs/examples/sweep_gradient_talk_lots.cpp
-FILE: ../../../third_party/skia/docs/examples/text_only.cpp
-FILE: ../../../third_party/skia/docs/examples/text_rendering.cpp
-FILE: ../../../third_party/skia/docs/examples/text_shadow.cpp
-FILE: ../../../third_party/skia/docs/examples/unexpected_setAlphaType.cpp
-FILE: ../../../third_party/skia/docs/examples/upscale_checkerboard.cpp
-FILE: ../../../third_party/skia/docs/examples/weird_RRect_bug.cpp
-FILE: ../../../third_party/skia/docs/examples/zero_off_dashing.cpp
-FILE: ../../../third_party/skia/experimental/bazel_test/bazel_test.cpp
-FILE: ../../../third_party/skia/gm/clear_swizzle.cpp
-FILE: ../../../third_party/skia/gm/gpu_blur_utils.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrFinishCallbacks.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrFinishCallbacks.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/AtlasInstancedHelper.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/StrokeTessellateOp.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/StrokeTessellateOp.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/GrStrokeTessellationShader.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/GrStrokeTessellationShader.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/GrTessellationShader.h
-FILE: ../../../third_party/skia/src/opts/SkVM_opts.h
-FILE: ../../../third_party/skia/src/sksl/SkSLAnalysis.cpp
-FILE: ../../../third_party/skia/src/sksl/SkSLModifiersPool.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructor.cpp
+FILE: ../../../flutter/third_party/skia/gm/batchedconvexpaths.cpp
+FILE: ../../../flutter/third_party/skia/gm/destcolor.cpp
+FILE: ../../../flutter/third_party/skia/include/private/chromium/SkChromeRemoteGlyphCache.h
+FILE: ../../../flutter/third_party/skia/include/sksl/SkSLDebugTrace.h
+FILE: ../../../flutter/third_party/skia/src/base/SkStringView.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrVertexChunkArray.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrVertexChunkArray.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrModulateAtlasCoverageEffect.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrModulateAtlasCoverageEffect.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/AtlasInstancedHelper.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/PathStencilCoverOp.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/PathStencilCoverOp.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/PathTessellateOp.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/ops/PathTessellateOp.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/tessellate/GrTessellationShader.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/tessellate/AffineMatrix.h
+FILE: ../../../flutter/third_party/skia/src/gpu/tessellate/PatchWriter.h
+FILE: ../../../flutter/third_party/skia/src/gpu/tessellate/Tessellation.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLErrorReporter.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLErrorReporter.h
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLIntrinsicList.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLMangler.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLParser.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLParser.h
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLPosition.h
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLProgramKind.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLFunctionDeclaration.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLModifierFlags.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLPoison.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLVariable.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/transform/SkSLFindAndDeclareBuiltinVariables.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/transform/SkSLTransform.h
 ----------------------------------------------------------------------------------------------------
-Copyright 2020 Google LLC.
+Copyright 2021 Google LLC.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -6861,18 +7857,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/fuzz/oss_fuzz/FuzzAPICreateDDL.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/FuzzTriangulation.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzDDLThreading.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzRegionOp.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzSkParagraph.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzTriangulation.cpp + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/fuzz/FuzzCreateDDL.cpp
-FILE: ../../../third_party/skia/fuzz/FuzzPath.cpp
-FILE: ../../../third_party/skia/fuzz/FuzzRRect.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzAPICreateDDL.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzAPISVGCanvas.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSKP.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSVG.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSkRuntimeEffect.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/FuzzTriangulation.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzDDLThreading.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzRegionOp.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzSkParagraph.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzTriangulation.cpp
 ----------------------------------------------------------------------------------------------------
-Copyright 2020 Google, LLC
+Copyright 2021 Google, LLC
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -6904,28 +7901,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ====================================================================================================
 
 ====================================================================================================
-LIBRARY: skia
-ORIGIN: ../../../third_party/skia/infra/bots/gen_tasks_logic/compile_cas.go + ../../../LICENSE
+LIBRARY: libjxl
+ORIGIN: ../../../flutter/third_party/skia/third_party/libjxl/jxl/jxl_export.h + ../../../LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/infra/bots/gen_tasks_logic/compile_cas.go
-FILE: ../../../third_party/skia/infra/bots/gen_tasks_logic/dm_flags.go
-FILE: ../../../third_party/skia/infra/bots/gen_tasks_logic/job_builder.go
-FILE: ../../../third_party/skia/infra/bots/gen_tasks_logic/nano_flags.go
-FILE: ../../../third_party/skia/infra/bots/gen_tasks_logic/schema.go
-FILE: ../../../third_party/skia/infra/bots/gen_tasks_logic/task_builder.go
-FILE: ../../../third_party/skia/infra/bots/task_drivers/compile_wasm_gm_tests/compile_wasm_gm_tests.go
-FILE: ../../../third_party/skia/infra/bots/task_drivers/fm_driver/fm_driver.go
-FILE: ../../../third_party/skia/infra/bots/task_drivers/g3_canary/g3_canary.go
-FILE: ../../../third_party/skia/infra/bots/task_drivers/perf_puppeteer_canvas/perf_puppeteer_canvas.go
-FILE: ../../../third_party/skia/infra/bots/task_drivers/perf_puppeteer_canvas/perf_puppeteer_canvas_test.go
-FILE: ../../../third_party/skia/infra/bots/task_drivers/perf_puppeteer_render_skps/perf_puppeteer_render_skps.go
-FILE: ../../../third_party/skia/infra/bots/task_drivers/perf_puppeteer_render_skps/perf_puppeteer_render_skps_test.go
-FILE: ../../../third_party/skia/infra/bots/task_drivers/perf_puppeteer_skottie_frames/perf_puppeteer_skottie_frames.go
-FILE: ../../../third_party/skia/infra/bots/task_drivers/perf_puppeteer_skottie_frames/perf_puppeteer_skottie_frames_test.go
-FILE: ../../../third_party/skia/infra/bots/task_drivers/run_gn_to_bp/run_gn_to_bp.go
-FILE: ../../../third_party/skia/infra/bots/task_drivers/run_wasm_gm_tests/run_wasm_gm_tests.go
+FILE: ../../../flutter/third_party/skia/third_party/libjxl/jxl/jxl_export.h
 ----------------------------------------------------------------------------------------------------
-Copyright 2020 The Chromium Authors. All rights reserved.
+Copyright 2021 The Chromium Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -6956,103 +7937,65 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/bench/graphite/IntersectionTreeBench.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/drawlines_with_local_matrix.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/mirrortile.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/nearesthalfpixelimage.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/palette.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkOpenTypeSVGDecoder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/mtl/MtlMemoryAllocator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/BlendModes.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/text/Font.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/text/Font.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/utils/TextEditor.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/utils/TextEditor.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skunicode/src/SkUnicode_client.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skunicode/src/SkUnicode_libgrapheme.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/include/SkSVGOpenTypeSVGDecoder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/svg/src/SkSVGOpenTypeSVGDecoder.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkAvifCodec.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkAvifCodec.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlComputeCommandEncoder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_hmtx.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLRasterPipelineBuilder.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLRasterPipelineBuilder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLWGSLCodeGenerator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLWGSLCodeGenerator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLDiscardStatement.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLInterfaceBlock.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLLayout.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLLiteral.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/text/gpu/SDFMaskFilter.h + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/bench/MSKPBench.cpp
-FILE: ../../../third_party/skia/bench/MSKPBench.h
-FILE: ../../../third_party/skia/bench/graphite/IntersectionTreeBench.cpp
-FILE: ../../../third_party/skia/fuzz/FuzzDDLThreading.cpp
-FILE: ../../../third_party/skia/gm/aarecteffect.cpp
-FILE: ../../../third_party/skia/gm/colorspace.cpp
-FILE: ../../../third_party/skia/gm/colrv1.cpp
-FILE: ../../../third_party/skia/gm/drawglyphs.cpp
-FILE: ../../../third_party/skia/gm/largeclippedpath.cpp
-FILE: ../../../third_party/skia/gm/skbug_12212.cpp
-FILE: ../../../third_party/skia/gm/slug.cpp
-FILE: ../../../third_party/skia/include/private/gpu/ganesh/GrMtlTypesPriv.h
-FILE: ../../../third_party/skia/include/private/gpu/graphite/MtlTypesPriv.h
-FILE: ../../../third_party/skia/include/utils/SkOrderedFontMgr.h
-FILE: ../../../third_party/skia/infra/bots/task_drivers/push_apps_from_skia_image/push_apps_from_skia_image.go
-FILE: ../../../third_party/skia/infra/bots/task_drivers/push_bazel_apps_from_wasm_image/push_bazel_apps_from_wasm_image.go
-FILE: ../../../third_party/skia/infra/bots/task_drivers/recreate_skps/recreate_skps.go
-FILE: ../../../third_party/skia/modules/jetski/src/Canvas.cpp
-FILE: ../../../third_party/skia/modules/jetski/src/ColorFilters.cpp
-FILE: ../../../third_party/skia/modules/jetski/src/Font.cpp
-FILE: ../../../third_party/skia/modules/jetski/src/FontChainAdapter.cpp
-FILE: ../../../third_party/skia/modules/jetski/src/Gradients.cpp
-FILE: ../../../third_party/skia/modules/jetski/src/Image.cpp
-FILE: ../../../third_party/skia/modules/jetski/src/ImageFilter.cpp
-FILE: ../../../third_party/skia/modules/jetski/src/JetSki.cpp
-FILE: ../../../third_party/skia/modules/jetski/src/Matrix.cpp
-FILE: ../../../third_party/skia/modules/jetski/src/Paint.cpp
-FILE: ../../../third_party/skia/modules/jetski/src/Path.cpp
-FILE: ../../../third_party/skia/modules/jetski/src/PathBuilder.cpp
-FILE: ../../../third_party/skia/modules/jetski/src/RuntimeShaderBuilder.cpp
-FILE: ../../../third_party/skia/modules/jetski/src/Shader.cpp
-FILE: ../../../third_party/skia/modules/jetski/src/SkottieAnimation.cpp
-FILE: ../../../third_party/skia/modules/jetski/src/Surface.cpp
-FILE: ../../../third_party/skia/modules/jetski/src/Surface.h
-FILE: ../../../third_party/skia/modules/jetski/src/SurfaceThread.cpp
-FILE: ../../../third_party/skia/modules/jetski/src/SurfaceThread.h
-FILE: ../../../third_party/skia/modules/jetski/src/Text.cpp
-FILE: ../../../third_party/skia/modules/jetski/src/Utils.cpp
-FILE: ../../../third_party/skia/modules/jetski/src/Utils.h
-FILE: ../../../third_party/skia/modules/skottie/src/effects/BulgeEffect.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/effects/CCTonerEffect.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/effects/DirectionalBlur.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/effects/FractalNoiseEffect.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/effects/SharpenEffect.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/effects/SkSLEffect.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/effects/SphereEffect.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/effects/ThresholdEffect.cpp
-FILE: ../../../third_party/skia/modules/skunicode/src/SkUnicode_icu.h
-FILE: ../../../third_party/skia/modules/skunicode/src/SkUnicode_icu_builtin.cpp
-FILE: ../../../third_party/skia/modules/skunicode/src/SkUnicode_icu_runtime.cpp
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGFeImage.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGFeLightSource.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGImage.h
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGMask.h
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGFeImage.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGFeLightSource.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGImage.cpp
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGMask.cpp
-FILE: ../../../third_party/skia/src/codec/SkJpegxlCodec.cpp
-FILE: ../../../third_party/skia/src/codec/SkJpegxlCodec.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrDrawIndirectCommand.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrRenderTaskCluster.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrRenderTaskCluster.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrThreadSafePipelineBuilder.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrThreadSafePipelineBuilder.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mock/GrMockRenderTask.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mock/GrMockSurfaceProxy.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlFramebuffer.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlFramebuffer.mm
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlPipeline.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlRenderCommandEncoder.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/AtlasRenderTask.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/AtlasRenderTask.h
-FILE: ../../../third_party/skia/src/gpu/graphite/Buffer.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/Buffer.h
-FILE: ../../../third_party/skia/src/gpu/graphite/DrawBufferManager.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/DrawBufferManager.h
-FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlBlitCommandEncoder.h
-FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlBuffer.h
-FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlBuffer.mm
-FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlRenderCommandEncoder.h
-FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlTrampoline.h
-FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlTrampoline.mm
-FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlUtils.mm
-FILE: ../../../third_party/skia/src/gpu/tessellate/CullTest.h
-FILE: ../../../third_party/skia/src/gpu/tessellate/Tessellation.h
-FILE: ../../../third_party/skia/src/shaders/SkTransformShader.cpp
-FILE: ../../../third_party/skia/src/shaders/SkTransformShader.h
-FILE: ../../../third_party/skia/src/sksl/SkSLGLSL.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLExpression.cpp
-FILE: ../../../third_party/skia/src/sksl/lex/TransitionTable.cpp
-FILE: ../../../third_party/skia/src/sksl/lex/TransitionTable.h
-FILE: ../../../third_party/skia/src/utils/SkOrderedFontMgr.cpp
+FILE: ../../../flutter/third_party/skia/gm/drawlines_with_local_matrix.cpp
+FILE: ../../../flutter/third_party/skia/gm/mirrortile.cpp
+FILE: ../../../flutter/third_party/skia/gm/nearesthalfpixelimage.cpp
+FILE: ../../../flutter/third_party/skia/gm/palette.cpp
+FILE: ../../../flutter/third_party/skia/include/core/SkOpenTypeSVGDecoder.h
+FILE: ../../../flutter/third_party/skia/include/gpu/mtl/MtlMemoryAllocator.h
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/BlendModes.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/text/Font.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/text/Font.h
+FILE: ../../../flutter/third_party/skia/modules/skottie/utils/TextEditor.cpp
+FILE: ../../../flutter/third_party/skia/modules/skottie/utils/TextEditor.h
+FILE: ../../../flutter/third_party/skia/modules/skunicode/src/SkUnicode_client.cpp
+FILE: ../../../flutter/third_party/skia/modules/skunicode/src/SkUnicode_libgrapheme.cpp
+FILE: ../../../flutter/third_party/skia/modules/svg/include/SkSVGOpenTypeSVGDecoder.h
+FILE: ../../../flutter/third_party/skia/modules/svg/src/SkSVGOpenTypeSVGDecoder.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkAvifCodec.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkAvifCodec.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlComputeCommandEncoder.h
+FILE: ../../../flutter/third_party/skia/src/sfnt/SkOTTable_hmtx.h
+FILE: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLRasterPipelineBuilder.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLRasterPipelineBuilder.h
+FILE: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLWGSLCodeGenerator.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLWGSLCodeGenerator.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLDiscardStatement.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLInterfaceBlock.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLLayout.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLLiteral.cpp
+FILE: ../../../flutter/third_party/skia/src/text/gpu/SDFMaskFilter.h
 ----------------------------------------------------------------------------------------------------
-Copyright 2021 Google Inc.
+Copyright 2022 Google Inc.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -7085,247 +8028,445 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/bench/BigPath.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/bug12866.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/crbug_1313579.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkAlphaType.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkCapabilities.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkColorType.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkPathUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/GpuTypes.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/ContextOptions.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/ImageProvider.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/dawn/DawnBackendContext.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/dawn/DawnUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/mtl/MtlGraphiteUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/vk/VulkanGraphiteUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/vk/VulkanBackendContext.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkAPI.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkAlign.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkAlignedStorage.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkAssert.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkAttributes.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkDebug.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkFeatures.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkLoadUserConfig.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkTypeTraits.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/sksl/SkSLVersion.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skunicode/src/SkUnicode.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skunicode/src/SkUnicode_icu_bidi.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/android/SkAndroidFrameworkPerfettoStaticStorage.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkCapabilities.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkDebugUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPathEnums.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPathUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkSLTypeShared.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkSLTypeShared.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/colorfilters/SkGaussianColorFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/AtlasTypes.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/AtlasTypes.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/RefCntedCallback.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/SkBackingFit.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBufferTransferRenderTask.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBufferTransferRenderTask.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBufferUpdateRenderTask.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBufferUpdateRenderTask.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrImageInfo.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrSurfaceProxyView.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/TestFormatColorTypeCombination.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/tessellate/PathTessellator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/tessellate/PathTessellator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/tessellate/StrokeTessellator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/tessellate/StrokeTessellator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/tessellate/VertexChunkPatchAllocator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/AttachmentTypes.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/BuiltInCodeSnippetID.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/ClientMappedBufferManager.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/ClientMappedBufferManager.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/ClipStack_graphite.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/ClipStack_graphite.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/CommandTypes.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/ComputePipeline.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/ComputePipeline.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/ComputePipelineDesc.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/ComputeTypes.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/DrawAtlas.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/DrawAtlas.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/DrawCommands.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/DrawParams.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/FactoryFunctions.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/FactoryFunctions.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/GlobalCache.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/GlobalCache.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/GpuWorkSubmission.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/GraphiteResourceKey.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/GraphiteResourceKey.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/KeyContext.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/KeyContext.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/KeyHelpers.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/KeyHelpers.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/Log.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/PaintOptionsPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/PaintParams.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/PaintParams.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/PaintParamsKey.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/PaintParamsKey.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/PipelineData.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/PipelineData.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/Precompile.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/Precompile.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/PrecompileBasePriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/PublicPrecompile.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/PublicPrecompile.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/QueueManager.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/QueueManager.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/RecorderPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/RecordingPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/Renderer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/RendererProvider.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/RendererProvider.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/Resource.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/Resource.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/ResourceCache.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/ResourceCache.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/RuntimeEffectDictionary.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/RuntimeEffectDictionary.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/Sampler.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/Sampler.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/ShaderCodeDictionary.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/ShaderCodeDictionary.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/SpecialImage_Graphite.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/SpecialImage_Graphite.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/TextureProxyView.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/TextureUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/TextureUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/UniquePaintParamsID.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/UploadBufferManager.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/UploadBufferManager.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnAsyncWait.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnAsyncWait.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnBuffer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnBuffer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnCaps.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnCaps.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnCommandBuffer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnCommandBuffer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnGraphicsPipeline.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnGraphicsPipeline.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnGraphiteUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnGraphiteUtilsPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnQueueManager.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnQueueManager.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnResourceProvider.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnResourceProvider.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnSampler.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnSampler.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnSharedContext.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnSharedContext.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnTexture.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnTexture.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnTypesPriv.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/geom/Geometry.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/geom/SubRunData.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlComputePipeline.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlComputePipeline.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlQueueManager.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlQueueManager.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlSampler.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlSampler.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/render/AnalyticRRectRenderStep.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/render/AnalyticRRectRenderStep.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/render/BitmapTextRenderStep.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/render/BitmapTextRenderStep.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/render/CommonDepthStencilSettings.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/render/CoverBoundsRenderStep.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/render/CoverBoundsRenderStep.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/render/DynamicInstancesPatchAllocator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/render/MiddleOutFanRenderStep.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/render/MiddleOutFanRenderStep.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/render/SDFTextRenderStep.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/render/SDFTextRenderStep.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/render/TessellateCurvesRenderStep.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/render/TessellateCurvesRenderStep.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/render/TessellateStrokesRenderStep.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/render/TessellateStrokesRenderStep.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/render/TessellateWedgesRenderStep.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/render/TessellateWedgesRenderStep.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/render/VerticesRenderStep.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/render/VerticesRenderStep.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/task/ClearBuffersTask.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/task/ClearBuffersTask.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/task/ComputeTask.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/task/ComputeTask.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/task/SynchronizeToCpuTask.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/task/SynchronizeToCpuTask.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/task/UploadTask.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/task/UploadTask.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/text/TextAtlasManager.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/text/TextAtlasManager.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanBuffer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanBuffer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanCaps.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanCaps.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanCommandBuffer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanCommandBuffer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanGraphiteUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanGraphiteUtilsPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanQueueManager.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanQueueManager.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanResourceProvider.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanResourceProvider.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanSharedContext.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanSharedContext.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanTexture.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanTexture.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/tessellate/FixedCountBufferUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/tessellate/FixedCountBufferUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/tessellate/LinearTolerances.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/vk/VulkanUtilsPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkEmptyShader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/gradients/SkGradientBaseShader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLModuleLoader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLModuleLoader.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLFinalizationChecks.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLHasSideEffects.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLIsSameExpressionTree.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLIsTrivialExpression.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLNoOpErrorReporter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLProgramUsage.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLRasterPipelineCodeGenerator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLRasterPipelineCodeGenerator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLProgram.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/transform/SkSLAddConstToVarModifiers.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/transform/SkSLEliminateEmptyStatements.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/transform/SkSLFindAndDeclareBuiltinFunctions.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/transform/SkSLRenamePrivateSymbols.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/text/StrikeForGPU.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/text/gpu/GlyphVector.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/text/gpu/GlyphVector.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/text/gpu/SubRunContainer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/text/gpu/SubRunContainer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkTestCanvas.h + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/bench/BigPath.cpp
-FILE: ../../../third_party/skia/bench/BigPath.h
-FILE: ../../../third_party/skia/bench/CanvasSaveRestoreBench.cpp
-FILE: ../../../third_party/skia/bench/TriangulatorBench.cpp
-FILE: ../../../third_party/skia/experimental/bazel_test/hello_world.go
-FILE: ../../../third_party/skia/experimental/lowp-basic/QMath.h
-FILE: ../../../third_party/skia/experimental/lowp-basic/bilerp-study.cpp
-FILE: ../../../third_party/skia/experimental/lowp-basic/lerp-study.cpp
-FILE: ../../../third_party/skia/experimental/lowp-basic/lowp_experiments.cpp
-FILE: ../../../third_party/skia/experimental/tskit/bindings/bindings.h
-FILE: ../../../third_party/skia/experimental/tskit/bindings/core.cpp
-FILE: ../../../third_party/skia/experimental/tskit/bindings/extension.cpp
-FILE: ../../../third_party/skia/experimental/webgpu-bazel/src/bindings.cpp
-FILE: ../../../third_party/skia/gm/attributes.cpp
-FILE: ../../../third_party/skia/gm/composecolorfilter.cpp
-FILE: ../../../third_party/skia/gm/crbug_1167277.cpp
-FILE: ../../../third_party/skia/gm/crbug_1174186.cpp
-FILE: ../../../third_party/skia/gm/crbug_1174354.cpp
-FILE: ../../../third_party/skia/gm/crbug_1177833.cpp
-FILE: ../../../third_party/skia/gm/crbug_1257515.cpp
-FILE: ../../../third_party/skia/gm/crop_imagefilter.cpp
-FILE: ../../../third_party/skia/gm/fillrect_gradient.cpp
-FILE: ../../../third_party/skia/gm/graphitestart.cpp
-FILE: ../../../third_party/skia/gm/hardstop_gradients_many.cpp
-FILE: ../../../third_party/skia/gm/lazytiling.cpp
-FILE: ../../../third_party/skia/gm/mesh.cpp
-FILE: ../../../third_party/skia/gm/particles.cpp
-FILE: ../../../third_party/skia/include/core/SkBlender.h
-FILE: ../../../third_party/skia/include/core/SkMesh.h
-FILE: ../../../third_party/skia/include/effects/SkBlenders.h
-FILE: ../../../third_party/skia/include/gpu/GrSurfaceInfo.h
-FILE: ../../../third_party/skia/include/gpu/ShaderErrorHandler.h
-FILE: ../../../third_party/skia/include/gpu/gl/egl/GrGLMakeEGLInterface.h
-FILE: ../../../third_party/skia/include/gpu/gl/glx/GrGLMakeGLXInterface.h
-FILE: ../../../third_party/skia/include/gpu/graphite/BackendTexture.h
-FILE: ../../../third_party/skia/include/gpu/graphite/Context.h
-FILE: ../../../third_party/skia/include/gpu/graphite/GraphiteTypes.h
-FILE: ../../../third_party/skia/include/gpu/graphite/Recorder.h
-FILE: ../../../third_party/skia/include/gpu/graphite/Recording.h
-FILE: ../../../third_party/skia/include/gpu/graphite/TextureInfo.h
-FILE: ../../../third_party/skia/include/gpu/graphite/mtl/MtlBackendContext.h
-FILE: ../../../third_party/skia/include/gpu/graphite/mtl/MtlTypes.h
-FILE: ../../../third_party/skia/include/private/chromium/GrSlug.h
-FILE: ../../../third_party/skia/include/private/chromium/Slug.h
-FILE: ../../../third_party/skia/include/private/gpu/ganesh/GrDawnTypesPriv.h
-FILE: ../../../third_party/skia/include/private/gpu/ganesh/GrMockTypesPriv.h
-FILE: ../../../third_party/skia/include/sksl/SkSLOperator.h
-FILE: ../../../third_party/skia/modules/canvaskit/paragraph_bindings_gen.cpp
-FILE: ../../../third_party/skia/src/core/SkBlendModeBlender.cpp
-FILE: ../../../third_party/skia/src/core/SkBlendModeBlender.h
-FILE: ../../../third_party/skia/src/core/SkBlenderBase.h
-FILE: ../../../third_party/skia/src/core/SkEnumBitMask.h
-FILE: ../../../third_party/skia/src/core/SkMatrixInvert.cpp
-FILE: ../../../third_party/skia/src/core/SkMatrixInvert.h
-FILE: ../../../third_party/skia/src/core/SkMesh.cpp
-FILE: ../../../third_party/skia/src/core/SkMeshPriv.h
-FILE: ../../../third_party/skia/src/core/SkVMBlitter.h
-FILE: ../../../third_party/skia/src/core/SkYUVAInfoLocation.h
-FILE: ../../../third_party/skia/src/effects/SkBlenders.cpp
-FILE: ../../../third_party/skia/src/effects/imagefilters/SkCropImageFilter.cpp
-FILE: ../../../third_party/skia/src/effects/imagefilters/SkCropImageFilter.h
-FILE: ../../../third_party/skia/src/effects/imagefilters/SkRuntimeImageFilter.cpp
-FILE: ../../../third_party/skia/src/effects/imagefilters/SkRuntimeImageFilter.h
-FILE: ../../../third_party/skia/src/gpu/KeyBuilder.h
-FILE: ../../../third_party/skia/src/gpu/ResourceKey.cpp
-FILE: ../../../third_party/skia/src/gpu/ShaderErrorHandler.cpp
-FILE: ../../../third_party/skia/src/gpu/SkRenderEngineAbortf.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrDstProxyView.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrEagerVertexAllocator.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrMeshDrawTarget.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrMeshDrawTarget.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrOpsTypes.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrPersistentCacheUtils.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrSurfaceInfo.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrWritePixelsRenderTask.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrWritePixelsRenderTask.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrYUVATextureProxies.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrYUVATextureProxies.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/SurfaceFillContext.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/SurfaceFillContext.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DTypesPriv.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnTypesPriv.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/geometry/GrInnerFanTriangulator.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/egl/GrGLMakeNativeInterface_egl.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/gl/glx/GrGLMakeNativeInterface_glx.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlTypesPriv.mm
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/DrawMeshOp.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/DrawMeshOp.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/FillPathFlags.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkBuffer.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkBuffer.h
-FILE: ../../../third_party/skia/src/gpu/graphite/Attribute.h
-FILE: ../../../third_party/skia/src/gpu/graphite/BackendTexture.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/Caps.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/Caps.h
-FILE: ../../../third_party/skia/src/gpu/graphite/CommandBuffer.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/CommandBuffer.h
-FILE: ../../../third_party/skia/src/gpu/graphite/Context.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/ContextPriv.h
-FILE: ../../../third_party/skia/src/gpu/graphite/ContextUtils.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/ContextUtils.h
-FILE: ../../../third_party/skia/src/gpu/graphite/CopyTask.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/CopyTask.h
-FILE: ../../../third_party/skia/src/gpu/graphite/Device.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/Device.h
-FILE: ../../../third_party/skia/src/gpu/graphite/DrawContext.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/DrawContext.h
-FILE: ../../../third_party/skia/src/gpu/graphite/DrawList.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/DrawList.h
-FILE: ../../../third_party/skia/src/gpu/graphite/DrawOrder.h
-FILE: ../../../third_party/skia/src/gpu/graphite/DrawPass.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/DrawPass.h
-FILE: ../../../third_party/skia/src/gpu/graphite/DrawTypes.h
-FILE: ../../../third_party/skia/src/gpu/graphite/DrawWriter.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/DrawWriter.h
-FILE: ../../../third_party/skia/src/gpu/graphite/GpuWorkSubmission.h
-FILE: ../../../third_party/skia/src/gpu/graphite/GraphicsPipeline.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/GraphicsPipeline.h
-FILE: ../../../third_party/skia/src/gpu/graphite/GraphicsPipelineDesc.h
-FILE: ../../../third_party/skia/src/gpu/graphite/Image_Graphite.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/Image_Graphite.h
-FILE: ../../../third_party/skia/src/gpu/graphite/PipelineDataCache.h
-FILE: ../../../third_party/skia/src/gpu/graphite/Recorder.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/Recording.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/RenderPassTask.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/RenderPassTask.h
-FILE: ../../../third_party/skia/src/gpu/graphite/Renderer.h
-FILE: ../../../third_party/skia/src/gpu/graphite/ResourceProvider.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/ResourceProvider.h
-FILE: ../../../third_party/skia/src/gpu/graphite/ResourceTypes.h
-FILE: ../../../third_party/skia/src/gpu/graphite/SharedContext.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/SharedContext.h
-FILE: ../../../third_party/skia/src/gpu/graphite/Surface_Graphite.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/Surface_Graphite.h
-FILE: ../../../third_party/skia/src/gpu/graphite/Task.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/Task.h
-FILE: ../../../third_party/skia/src/gpu/graphite/TaskGraph.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/TaskGraph.h
-FILE: ../../../third_party/skia/src/gpu/graphite/Texture.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/Texture.h
-FILE: ../../../third_party/skia/src/gpu/graphite/TextureInfo.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/TextureProxy.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/TextureProxy.h
-FILE: ../../../third_party/skia/src/gpu/graphite/Uniform.h
-FILE: ../../../third_party/skia/src/gpu/graphite/UniformManager.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/UniformManager.h
-FILE: ../../../third_party/skia/src/gpu/graphite/geom/BoundsManager.h
-FILE: ../../../third_party/skia/src/gpu/graphite/geom/IntersectionTree.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/geom/IntersectionTree.h
-FILE: ../../../third_party/skia/src/gpu/graphite/geom/Rect.h
-FILE: ../../../third_party/skia/src/gpu/graphite/geom/Shape.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/geom/Shape.h
-FILE: ../../../third_party/skia/src/gpu/graphite/geom/Transform.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/geom/Transform_graphite.h
-FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlCaps.h
-FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlCaps.mm
-FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlCommandBuffer.h
-FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlCommandBuffer.mm
-FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlGraphicsPipeline.h
-FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlGraphicsPipeline.mm
-FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlResourceProvider.h
-FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlResourceProvider.mm
-FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlSharedContext.h
-FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlSharedContext.mm
-FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlTexture.h
-FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlTexture.mm
-FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlTypesPriv.mm
-FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlUtils.h
-FILE: ../../../third_party/skia/src/gpu/mtl/MtlMemoryAllocatorImpl.h
-FILE: ../../../third_party/skia/src/gpu/mtl/MtlMemoryAllocatorImpl.mm
-FILE: ../../../third_party/skia/src/sksl/SkSLBuiltinTypes.cpp
-FILE: ../../../third_party/skia/src/sksl/SkSLBuiltinTypes.h
-FILE: ../../../third_party/skia/src/sksl/SkSLContext.cpp
-FILE: ../../../third_party/skia/src/sksl/SkSLIntrinsicList.h
-FILE: ../../../third_party/skia/src/sksl/SkSLMangler.h
-FILE: ../../../third_party/skia/src/sksl/SkSLOperator.cpp
-FILE: ../../../third_party/skia/src/sksl/SkSLThreadContext.h
-FILE: ../../../third_party/skia/src/sksl/analysis/SkSLCanExitWithoutReturningValue.cpp
-FILE: ../../../third_party/skia/src/sksl/analysis/SkSLCheckProgramStructure.cpp
-FILE: ../../../third_party/skia/src/sksl/analysis/SkSLGetLoopUnrollInfo.cpp
-FILE: ../../../third_party/skia/src/sksl/analysis/SkSLIsConstantExpression.cpp
-FILE: ../../../third_party/skia/src/sksl/analysis/SkSLProgramUsage.cpp
-FILE: ../../../third_party/skia/src/sksl/analysis/SkSLProgramVisitor.h
-FILE: ../../../third_party/skia/src/sksl/analysis/SkSLSwitchCaseContainsExit.cpp
-FILE: ../../../third_party/skia/src/sksl/analysis/SkSLSymbolTableStackBuilder.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLBinaryExpression.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLBlock.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLChildCall.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLChildCall.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorArray.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorArray.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorArrayCast.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorArrayCast.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorCompound.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorCompound.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorCompoundCast.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorCompoundCast.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorDiagonalMatrix.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorDiagonalMatrix.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorMatrixResize.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorMatrixResize.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorScalarCast.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorScalarCast.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorSplat.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorSplat.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorStruct.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructorStruct.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLDoStatement.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLExpressionStatement.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLFieldAccess.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLForStatement.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLFunctionCall.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLFunctionDefinition.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLIfStatement.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLIndexExpression.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLMethodReference.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLPostfixExpression.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLSwitchStatement.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLSwizzle.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLTernaryExpression.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLTypeReference.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLVarDeclarations.cpp
-FILE: ../../../third_party/skia/src/sksl/tracing/SkVMDebugTrace.cpp
-FILE: ../../../third_party/skia/src/sksl/tracing/SkVMDebugTrace.h
-FILE: ../../../third_party/skia/src/sksl/tracing/SkVMDebugTracePlayer.cpp
-FILE: ../../../third_party/skia/src/sksl/tracing/SkVMDebugTracePlayer.h
-FILE: ../../../third_party/skia/src/sksl/transform/SkSLEliminateDeadFunctions.cpp
-FILE: ../../../third_party/skia/src/sksl/transform/SkSLEliminateDeadGlobalVariables.cpp
-FILE: ../../../third_party/skia/src/sksl/transform/SkSLEliminateDeadLocalVariables.cpp
-FILE: ../../../third_party/skia/src/sksl/transform/SkSLEliminateUnreachableCode.cpp
-FILE: ../../../third_party/skia/src/sksl/transform/SkSLProgramWriter.h
-FILE: ../../../third_party/skia/src/sksl/transform/SkSLReplaceConstVarsWithLiterals.cpp
-FILE: ../../../third_party/skia/src/text/gpu/Slug.cpp
-FILE: ../../../third_party/skia/src/text/gpu/SubRunAllocator.cpp
-FILE: ../../../third_party/skia/src/text/gpu/SubRunAllocator.h
-FILE: ../../../third_party/skia/src/utils/SkVMVisualizer.cpp
-FILE: ../../../third_party/skia/src/utils/SkVMVisualizer.h
+FILE: ../../../flutter/third_party/skia/gm/bug12866.cpp
+FILE: ../../../flutter/third_party/skia/gm/crbug_1313579.cpp
+FILE: ../../../flutter/third_party/skia/include/core/SkAlphaType.h
+FILE: ../../../flutter/third_party/skia/include/core/SkCapabilities.h
+FILE: ../../../flutter/third_party/skia/include/core/SkColorType.h
+FILE: ../../../flutter/third_party/skia/include/core/SkPathUtils.h
+FILE: ../../../flutter/third_party/skia/include/gpu/GpuTypes.h
+FILE: ../../../flutter/third_party/skia/include/gpu/graphite/ContextOptions.h
+FILE: ../../../flutter/third_party/skia/include/gpu/graphite/ImageProvider.h
+FILE: ../../../flutter/third_party/skia/include/gpu/graphite/dawn/DawnBackendContext.h
+FILE: ../../../flutter/third_party/skia/include/gpu/graphite/dawn/DawnUtils.h
+FILE: ../../../flutter/third_party/skia/include/gpu/graphite/mtl/MtlGraphiteUtils.h
+FILE: ../../../flutter/third_party/skia/include/gpu/graphite/vk/VulkanGraphiteUtils.h
+FILE: ../../../flutter/third_party/skia/include/gpu/vk/VulkanBackendContext.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkAPI.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkAlign.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkAlignedStorage.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkAssert.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkAttributes.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkDebug.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkFeatures.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkLoadUserConfig.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkTypeTraits.h
+FILE: ../../../flutter/third_party/skia/include/sksl/SkSLVersion.h
+FILE: ../../../flutter/third_party/skia/modules/skunicode/src/SkUnicode.cpp
+FILE: ../../../flutter/third_party/skia/modules/skunicode/src/SkUnicode_icu_bidi.cpp
+FILE: ../../../flutter/third_party/skia/src/android/SkAndroidFrameworkPerfettoStaticStorage.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkCapabilities.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkDebugUtils.h
+FILE: ../../../flutter/third_party/skia/src/core/SkPathEnums.h
+FILE: ../../../flutter/third_party/skia/src/core/SkPathUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkSLTypeShared.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkSLTypeShared.h
+FILE: ../../../flutter/third_party/skia/src/effects/colorfilters/SkGaussianColorFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/AtlasTypes.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/AtlasTypes.h
+FILE: ../../../flutter/third_party/skia/src/gpu/RefCntedCallback.h
+FILE: ../../../flutter/third_party/skia/src/gpu/SkBackingFit.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBufferTransferRenderTask.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBufferTransferRenderTask.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBufferUpdateRenderTask.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBufferUpdateRenderTask.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrImageInfo.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrSurfaceProxyView.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/TestFormatColorTypeCombination.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/tessellate/PathTessellator.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/tessellate/PathTessellator.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/tessellate/StrokeTessellator.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/tessellate/StrokeTessellator.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/tessellate/VertexChunkPatchAllocator.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/AttachmentTypes.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/BuiltInCodeSnippetID.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/ClientMappedBufferManager.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/ClientMappedBufferManager.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/ClipStack_graphite.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/ClipStack_graphite.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/CommandTypes.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/ComputePipeline.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/ComputePipeline.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/ComputePipelineDesc.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/ComputeTypes.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/DrawAtlas.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/DrawAtlas.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/DrawCommands.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/DrawParams.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/FactoryFunctions.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/FactoryFunctions.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/GlobalCache.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/GlobalCache.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/GpuWorkSubmission.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/GraphiteResourceKey.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/GraphiteResourceKey.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/KeyContext.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/KeyContext.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/KeyHelpers.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/KeyHelpers.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/Log.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/PaintOptionsPriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/PaintParams.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/PaintParams.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/PaintParamsKey.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/PaintParamsKey.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/PipelineData.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/PipelineData.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/Precompile.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/Precompile.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/PrecompileBasePriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/PublicPrecompile.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/PublicPrecompile.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/QueueManager.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/QueueManager.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/RecorderPriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/RecordingPriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/Renderer.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/RendererProvider.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/RendererProvider.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/Resource.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/Resource.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/ResourceCache.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/ResourceCache.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/RuntimeEffectDictionary.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/RuntimeEffectDictionary.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/Sampler.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/Sampler.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/ShaderCodeDictionary.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/ShaderCodeDictionary.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/SpecialImage_Graphite.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/SpecialImage_Graphite.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/TextureProxyView.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/TextureUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/TextureUtils.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/UniquePaintParamsID.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/UploadBufferManager.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/UploadBufferManager.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnAsyncWait.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnAsyncWait.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnBuffer.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnBuffer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnCaps.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnCaps.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnCommandBuffer.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnCommandBuffer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnGraphicsPipeline.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnGraphicsPipeline.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnGraphiteUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnGraphiteUtilsPriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnQueueManager.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnQueueManager.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnResourceProvider.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnResourceProvider.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnSampler.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnSampler.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnSharedContext.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnSharedContext.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnTexture.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnTexture.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnTypesPriv.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/geom/Geometry.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/geom/SubRunData.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlComputePipeline.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlComputePipeline.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlQueueManager.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlQueueManager.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlSampler.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/mtl/MtlSampler.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/render/AnalyticRRectRenderStep.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/render/AnalyticRRectRenderStep.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/render/BitmapTextRenderStep.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/render/BitmapTextRenderStep.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/render/CommonDepthStencilSettings.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/render/CoverBoundsRenderStep.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/render/CoverBoundsRenderStep.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/render/DynamicInstancesPatchAllocator.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/render/MiddleOutFanRenderStep.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/render/MiddleOutFanRenderStep.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/render/SDFTextRenderStep.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/render/SDFTextRenderStep.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/render/TessellateCurvesRenderStep.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/render/TessellateCurvesRenderStep.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/render/TessellateStrokesRenderStep.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/render/TessellateStrokesRenderStep.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/render/TessellateWedgesRenderStep.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/render/TessellateWedgesRenderStep.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/render/VerticesRenderStep.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/render/VerticesRenderStep.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/task/ClearBuffersTask.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/task/ClearBuffersTask.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/task/ComputeTask.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/task/ComputeTask.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/task/SynchronizeToCpuTask.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/task/SynchronizeToCpuTask.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/task/UploadTask.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/task/UploadTask.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/text/TextAtlasManager.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/text/TextAtlasManager.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanBuffer.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanBuffer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanCaps.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanCaps.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanCommandBuffer.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanCommandBuffer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanGraphiteUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanGraphiteUtilsPriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanQueueManager.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanQueueManager.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanResourceProvider.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanResourceProvider.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanSharedContext.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanSharedContext.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanTexture.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanTexture.h
+FILE: ../../../flutter/third_party/skia/src/gpu/tessellate/FixedCountBufferUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/tessellate/FixedCountBufferUtils.h
+FILE: ../../../flutter/third_party/skia/src/gpu/tessellate/LinearTolerances.h
+FILE: ../../../flutter/third_party/skia/src/gpu/vk/VulkanUtilsPriv.h
+FILE: ../../../flutter/third_party/skia/src/shaders/SkEmptyShader.cpp
+FILE: ../../../flutter/third_party/skia/src/shaders/gradients/SkGradientBaseShader.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLModuleLoader.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLModuleLoader.h
+FILE: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLFinalizationChecks.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLHasSideEffects.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLIsSameExpressionTree.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLIsTrivialExpression.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLNoOpErrorReporter.h
+FILE: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLProgramUsage.h
+FILE: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLRasterPipelineCodeGenerator.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/codegen/SkSLRasterPipelineCodeGenerator.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLProgram.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/transform/SkSLAddConstToVarModifiers.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/transform/SkSLEliminateEmptyStatements.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/transform/SkSLFindAndDeclareBuiltinFunctions.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/transform/SkSLRenamePrivateSymbols.cpp
+FILE: ../../../flutter/third_party/skia/src/text/StrikeForGPU.cpp
+FILE: ../../../flutter/third_party/skia/src/text/gpu/GlyphVector.cpp
+FILE: ../../../flutter/third_party/skia/src/text/gpu/GlyphVector.h
+FILE: ../../../flutter/third_party/skia/src/text/gpu/SubRunContainer.cpp
+FILE: ../../../flutter/third_party/skia/src/text/gpu/SubRunContainer.h
+FILE: ../../../flutter/third_party/skia/src/utils/SkTestCanvas.h
 ----------------------------------------------------------------------------------------------------
-Copyright 2021 Google LLC
+Copyright 2022 Google LLC
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -7358,60 +8499,33 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/experimental/sorttoy/Cmds.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/MutableTextureState.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/dawn/DawnTypes.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/vk/VulkanGraphiteTypes.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/vk/VulkanExtensions.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/vk/VulkanMemoryAllocator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/vk/VulkanTypes.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkContainers.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/gpu/graphite/DawnTypesPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/gpu/graphite/VulkanGraphiteTypesPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanGraphiteTypes.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/tessellate/MidpointContourParser.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/SkSLPosition.cpp + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/experimental/sorttoy/Cmds.cpp
-FILE: ../../../third_party/skia/experimental/sorttoy/Cmds.h
-FILE: ../../../third_party/skia/experimental/sorttoy/Fake.cpp
-FILE: ../../../third_party/skia/experimental/sorttoy/Fake.h
-FILE: ../../../third_party/skia/experimental/sorttoy/SortKey.h
-FILE: ../../../third_party/skia/experimental/sorttoy/sorttoy.cpp
-FILE: ../../../third_party/skia/experimental/sorttoy/sorttypes.h
-FILE: ../../../third_party/skia/gm/batchedconvexpaths.cpp
-FILE: ../../../third_party/skia/gm/destcolor.cpp
-FILE: ../../../third_party/skia/include/private/SkSLProgramKind.h
-FILE: ../../../third_party/skia/include/private/SkStringView.h
-FILE: ../../../third_party/skia/include/private/chromium/SkChromeRemoteGlyphCache.h
-FILE: ../../../third_party/skia/include/sksl/DSLBlock.h
-FILE: ../../../third_party/skia/include/sksl/DSLCase.h
-FILE: ../../../third_party/skia/include/sksl/DSLFunction.h
-FILE: ../../../third_party/skia/include/sksl/DSLLayout.h
-FILE: ../../../third_party/skia/include/sksl/DSLStatement.h
-FILE: ../../../third_party/skia/include/sksl/SkSLDebugTrace.h
-FILE: ../../../third_party/skia/include/sksl/SkSLErrorReporter.h
-FILE: ../../../third_party/skia/include/sksl/SkSLPosition.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrVertexChunkArray.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrVertexChunkArray.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrModulateAtlasCoverageEffect.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrModulateAtlasCoverageEffect.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/AtlasInstancedHelper.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/PathStencilCoverOp.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/PathStencilCoverOp.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/PathTessellateOp.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/ops/PathTessellateOp.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/GrTessellationShader.cpp
-FILE: ../../../third_party/skia/src/gpu/tessellate/AffineMatrix.h
-FILE: ../../../third_party/skia/src/gpu/tessellate/PatchWriter.h
-FILE: ../../../third_party/skia/src/gpu/tessellate/Tessellation.cpp
-FILE: ../../../third_party/skia/src/sksl/SkSLErrorReporter.cpp
-FILE: ../../../third_party/skia/src/sksl/SkSLIntrinsicList.cpp
-FILE: ../../../third_party/skia/src/sksl/SkSLMangler.cpp
-FILE: ../../../third_party/skia/src/sksl/SkSLParser.cpp
-FILE: ../../../third_party/skia/src/sksl/SkSLParser.h
-FILE: ../../../third_party/skia/src/sksl/dsl/DSLBlock.cpp
-FILE: ../../../third_party/skia/src/sksl/dsl/DSLCase.cpp
-FILE: ../../../third_party/skia/src/sksl/dsl/DSLFunction.cpp
-FILE: ../../../third_party/skia/src/sksl/dsl/DSLLayout.cpp
-FILE: ../../../third_party/skia/src/sksl/dsl/DSLStatement.cpp
-FILE: ../../../third_party/skia/src/sksl/dsl/priv/DSL_priv.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLFunctionDeclaration.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLModifiers.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLPoison.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLVariable.cpp
-FILE: ../../../third_party/skia/src/sksl/transform/SkSLFindAndDeclareBuiltinVariables.cpp
-FILE: ../../../third_party/skia/src/sksl/transform/SkSLTransform.h
+FILE: ../../../flutter/third_party/skia/include/gpu/MutableTextureState.h
+FILE: ../../../flutter/third_party/skia/include/gpu/graphite/dawn/DawnTypes.h
+FILE: ../../../flutter/third_party/skia/include/gpu/graphite/vk/VulkanGraphiteTypes.h
+FILE: ../../../flutter/third_party/skia/include/gpu/vk/VulkanExtensions.h
+FILE: ../../../flutter/third_party/skia/include/gpu/vk/VulkanMemoryAllocator.h
+FILE: ../../../flutter/third_party/skia/include/gpu/vk/VulkanTypes.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkContainers.h
+FILE: ../../../flutter/third_party/skia/include/private/gpu/graphite/DawnTypesPriv.h
+FILE: ../../../flutter/third_party/skia/include/private/gpu/graphite/VulkanGraphiteTypesPriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanGraphiteTypes.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/tessellate/MidpointContourParser.h
+FILE: ../../../flutter/third_party/skia/src/sksl/SkSLPosition.cpp
 ----------------------------------------------------------------------------------------------------
-Copyright 2021 Google LLC.
+Copyright 2022 Google LLC.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -7444,15 +8558,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/fuzz/oss_fuzz/FuzzDDLThreading.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzCOLRv1.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzSkMeshSpecification.cpp + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/fuzz/FuzzTriangulation.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzDDLThreading.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzRegionOp.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSkParagraph.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzTriangulation.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzCOLRv1.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzSkMeshSpecification.cpp
 ----------------------------------------------------------------------------------------------------
-Copyright 2021 Google, LLC
+Copyright 2022 Google, LLC
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -7484,31 +8596,120 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ====================================================================================================
 
 ====================================================================================================
-LIBRARY: libjxl
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/experimental/tskit/go/gen_types/gen_types.go + ../../../LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/coordclampshader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/fontations.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/imagefiltersunpremul.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/ports/SkFontMgr_data.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/ports/SkTypeface_fontations.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/SkExif.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/SkGainmapInfo.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/SkGainmapShader.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/SkJpegGainmapEncoder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/SkXmp.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skcms/skcms.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/include/SlotManager.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skottie/src/SlotManager.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skshaper/src/SkShaper_skunicode.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skunicode/src/SkUnicode_hardcoded.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skunicode/src/SkUnicode_hardcoded.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skunicode/src/SkUnicode_icu4x.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkExif.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkJpegMultiPicture.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkJpegMultiPicture.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkJpegSegmentScan.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkJpegSegmentScan.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkJpegSourceMgr.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkJpegSourceMgr.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkJpegXmp.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkJpegXmp.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkTiffUtility.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkTiffUtility.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkXmp.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMipmapDrawDownSampler.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMipmapHQDownSampler.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRasterPipelineContextUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRasterPipelineOpContexts.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRasterPipelineOpList.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/encode/SkJpegGainmapEncoder.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanImageView.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanImageView.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanSamplerYcbcrConversion.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanSamplerYcbcrConversion.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkTypeface_fontations.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkTypeface_fontations_priv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkGainmapShader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLExtension.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLIRHelpers.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLModifiersDeclaration.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLSwitchCase.cpp + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/experimental/tskit/go/gen_types/gen_types.go
-FILE: ../../../third_party/skia/experimental/tskit/go/gen_types/gen_types_test.go
-FILE: ../../../third_party/skia/infra/bots/gen_tasks_logic/skpbench_flags.go
-FILE: ../../../third_party/skia/infra/bots/task_drivers/perf_puppeteer_skottie_frames/make_lotties_with_assets/make_lotties_with_assets.go
-FILE: ../../../third_party/skia/third_party/libjxl/jxl/jxl_export.h
+FILE: ../../../flutter/third_party/skia/gm/coordclampshader.cpp
+FILE: ../../../flutter/third_party/skia/gm/fontations.cpp
+FILE: ../../../flutter/third_party/skia/gm/imagefiltersunpremul.cpp
+FILE: ../../../flutter/third_party/skia/include/ports/SkFontMgr_data.h
+FILE: ../../../flutter/third_party/skia/include/ports/SkTypeface_fontations.h
+FILE: ../../../flutter/third_party/skia/include/private/SkExif.h
+FILE: ../../../flutter/third_party/skia/include/private/SkGainmapInfo.h
+FILE: ../../../flutter/third_party/skia/include/private/SkGainmapShader.h
+FILE: ../../../flutter/third_party/skia/include/private/SkJpegGainmapEncoder.h
+FILE: ../../../flutter/third_party/skia/include/private/SkXmp.h
+FILE: ../../../flutter/third_party/skia/modules/skcms/skcms.h
+FILE: ../../../flutter/third_party/skia/modules/skottie/include/SlotManager.h
+FILE: ../../../flutter/third_party/skia/modules/skottie/src/SlotManager.cpp
+FILE: ../../../flutter/third_party/skia/modules/skshaper/src/SkShaper_skunicode.cpp
+FILE: ../../../flutter/third_party/skia/modules/skunicode/src/SkUnicode_hardcoded.cpp
+FILE: ../../../flutter/third_party/skia/modules/skunicode/src/SkUnicode_hardcoded.h
+FILE: ../../../flutter/third_party/skia/modules/skunicode/src/SkUnicode_icu4x.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkExif.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkJpegMultiPicture.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkJpegMultiPicture.h
+FILE: ../../../flutter/third_party/skia/src/codec/SkJpegSegmentScan.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkJpegSegmentScan.h
+FILE: ../../../flutter/third_party/skia/src/codec/SkJpegSourceMgr.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkJpegSourceMgr.h
+FILE: ../../../flutter/third_party/skia/src/codec/SkJpegXmp.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkJpegXmp.h
+FILE: ../../../flutter/third_party/skia/src/codec/SkTiffUtility.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkTiffUtility.h
+FILE: ../../../flutter/third_party/skia/src/codec/SkXmp.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkMipmapDrawDownSampler.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkMipmapHQDownSampler.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkRasterPipelineContextUtils.h
+FILE: ../../../flutter/third_party/skia/src/core/SkRasterPipelineOpContexts.h
+FILE: ../../../flutter/third_party/skia/src/core/SkRasterPipelineOpList.h
+FILE: ../../../flutter/third_party/skia/src/encode/SkJpegGainmapEncoder.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanImageView.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanImageView.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanSamplerYcbcrConversion.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanSamplerYcbcrConversion.h
+FILE: ../../../flutter/third_party/skia/src/ports/SkTypeface_fontations.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkTypeface_fontations_priv.h
+FILE: ../../../flutter/third_party/skia/src/shaders/SkGainmapShader.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLExtension.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLIRHelpers.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLModifiersDeclaration.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLSwitchCase.cpp
 ----------------------------------------------------------------------------------------------------
-Copyright 2021 The Chromium Authors. All rights reserved.
+Copyright 2023 Google Inc.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -7525,37 +8726,591 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/gm/drawlines_with_local_matrix.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/FuzzCubicRoots.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/FuzzPrecompile.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/FuzzQuadRoots.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzColorspace.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzCubicRoots.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzPrecompile.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzQuadRoots.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/fontations_ft_compare.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/graphite_replay.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/hello_bazel_world.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/png_codec.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/rippleshadergm.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/scaledrects.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/workingspace.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/android/AHardwareBufferUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/android/SkCanvasAndroid.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/android/SkHeifDecoder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/android/SkImageAndroid.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/android/SkSurfaceAndroid.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/android/graphite/SurfaceAndroid.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/codec/SkAvifDecoder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/codec/SkBmpDecoder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/codec/SkGifDecoder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/codec/SkIcoDecoder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/codec/SkJpegDecoder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/codec/SkJpegxlDecoder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/codec/SkPixmapUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/codec/SkPngDecoder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/codec/SkRawDecoder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/codec/SkWbmpDecoder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/codec/SkWebpDecoder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkColorTable.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkPoint.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkTextureCompressionType.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/core/SkTiledImageUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/docs/SkMultiPictureDocument.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/GrExternalTextureGenerator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/SkImageGanesh.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/SkMeshGanesh.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/gl/GrGLBackendSurface.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/gl/GrGLDirectContext.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/SkSurfaceMetal.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/vk/GrVkBackendSemaphore.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/vk/GrVkBackendSurface.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/vk/GrVkDirectContext.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/BackendSemaphore.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/Image.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/Surface.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/YUVABackendTextures.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/vk/VulkanMutableTextureState.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkAnySubclass.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkCPUTypes.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/chromium/GrDeferredDisplayList.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/chromium/GrDeferredDisplayListRecorder.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/chromium/GrPromiseImageTexture.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/chromium/GrSurfaceCharacterization.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/chromium/SkImageChromium.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/gpu/ganesh/GrTextureGenerator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/private/gpu/graphite/ContextOptionsPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/bentleyottmann/include/BentleyOttmann1.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/bentleyottmann/include/BruteForceCrossings.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/bentleyottmann/include/Contour.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/bentleyottmann/include/EventQueue.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/bentleyottmann/include/EventQueueInterface.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/bentleyottmann/include/Int96.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/bentleyottmann/include/Myers.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/bentleyottmann/include/Point.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/bentleyottmann/include/Segment.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/bentleyottmann/include/SweepLine.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/bentleyottmann/src/BentleyOttmann1.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/bentleyottmann/src/BruteForceCrossings.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/bentleyottmann/src/Contour.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/bentleyottmann/src/EventQueue.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/bentleyottmann/src/Int96.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/bentleyottmann/src/Myers.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/bentleyottmann/src/Point.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/bentleyottmann/src/Segment.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/bentleyottmann/src/SweepLine.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skunicode/src/SkUnicode_icu_bidi.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkBezierCurves.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkCubics.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkCubics.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkFloatingPoint.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkQuads.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkQuads.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkRectMemcpy.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkSafeMath.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkTime.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/base/SkTime.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkImageGenerator_FromEncoded.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/codec/SkJpegConstants.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBitmapProcState_opts.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBlitMask.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBlitMask_opts.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBlitRow_opts.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBlitRow_opts_hsw.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBlitter_A8.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBlurEngine.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkBlurMaskFilterImpl.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkCanvas_Raster.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkChecksum.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkColorTable.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkDrawBase.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkDrawBase.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkFontMetricsPriv.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkFontMetricsPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMemset.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMemset_opts.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMemset_opts_avx.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkMipmapBuilder.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkOptsTargets.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkPixmapDraw.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRSXform.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkReadPixelsRec.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkRuntimeBlender.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkSwizzler_opts.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkSwizzler_opts_hsw.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkWritePixelsRec.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/SkShaderMaskFilterImpl.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/colorfilters/SkBlendModeColorFilter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/colorfilters/SkColorSpaceXformColorFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/colorfilters/SkColorSpaceXformColorFilter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/colorfilters/SkComposeColorFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/colorfilters/SkComposeColorFilter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/colorfilters/SkGaussianColorFilter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/colorfilters/SkMatrixColorFilter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/colorfilters/SkRuntimeColorFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/colorfilters/SkRuntimeColorFilter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/colorfilters/SkWorkingFormatColorFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/effects/colorfilters/SkWorkingFormatColorFilter.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/encode/SkEncoder.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/encode/SkJpegEncoder_none.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/encode/SkPngEncoderImpl.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/encode/SkPngEncoder_none.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/encode/SkWebpEncoder_none.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/BlendFormula.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/BlendFormula.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/BlurUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/BlurUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/DitherUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/DitherUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/GpuTypesPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/MutableTextureStatePriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/PipelineUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/PipelineUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/SkBackingFit.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/TiledTextureUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/TiledTextureUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/android/AHardwareBufferUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBackendSemaphorePriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBackendSurfacePriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrCanvas.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrCanvas.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDeferredDisplayList.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDeferredDisplayListPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDeferredDisplayListRecorder.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrFragmentProcessors.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrFragmentProcessors.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrMeshBuffers.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrMeshBuffers.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/GrPromiseImageTexture.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrColorTableEffect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrColorTableEffect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrPerlinNoise2Effect.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrPerlinNoise2Effect.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/AHardwareBufferGL.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLBackendSurface.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLBackendSurfacePriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLDirectContext.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/image/GrImageUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/image/GrImageUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/image/GrTextureGenerator.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/image/SkImage_GaneshFactories.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/image/SkImage_LazyTexture.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/image/SkImage_LazyTexture.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/image/SkImage_RasterPinnable.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/image/SkImage_RasterPinnable.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/image/SkSpecialImage_Ganesh.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/surface/SkSurface_AndroidFactories.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/AHardwareBufferVk.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkBackendSemaphore.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkBackendSurface.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkBackendSurfacePriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkContextThreadSafeProxy.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkContextThreadSafeProxy.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkDirectContext.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/AtlasProvider.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/AtlasProvider.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/BackendSemaphore.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/DescriptorData.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/ImageFactories.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/Image_Base_Graphite.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/Image_Base_Graphite.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/Image_YUVA_Graphite.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/Image_YUVA_Graphite.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/PathAtlas.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/PathAtlas.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/ProxyCache.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/ProxyCache.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/RasterPathAtlas.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/RasterPathAtlas.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/ReadSwizzle.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/YUVABackendTextures.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/YUVATextureProxies.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/YUVATextureProxies.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/compute/ComputeStep.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/compute/ComputeStep.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/compute/DispatchGroup.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/compute/DispatchGroup.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/compute/VelloComputeSteps.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/compute/VelloComputeSteps.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/compute/VelloRenderer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/compute/VelloRenderer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnComputePipeline.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnComputePipeline.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnErrorChecker.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnErrorChecker.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnUtilsPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/geom/CoverageMaskShape.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/geom/EdgeAAQuad.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/render/CoverageMaskRenderStep.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/render/CoverageMaskRenderStep.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/render/GraphiteVertexFiller.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/render/PerEdgeAAQuadRenderStep.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/render/PerEdgeAAQuadRenderStep.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/surface/Surface_AndroidFactories.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanDescriptorPool.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanDescriptorPool.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanDescriptorSet.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanDescriptorSet.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanFramebuffer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanFramebuffer.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanGraphicsPipeline.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanGraphicsPipeline.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanRenderPass.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanRenderPass.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanSampler.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanSampler.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/vk/VulkanMutableTextureState.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/vk/VulkanMutableTextureStatePriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/vk/VulkanUtilsPriv.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/image/SkImageGeneratorPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/image/SkImage_AndroidFactories.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/image/SkImage_Base.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/image/SkImage_LazyFactories.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/image/SkImage_Picture.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/image/SkImage_Picture.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/image/SkImage_Raster.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/image/SkImage_RasterFactories.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/image/SkPictureImageGenerator.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/image/SkSurface_Base.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/image/SkSurface_Null.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/image/SkTiledImageUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/opts/SkOpts_RestoreTarget.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/opts/SkOpts_SetTarget.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/fontations/src/ffi.rs + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/fontations/src/skpath_bridge.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkBlendShader.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkColorShader.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkCoordClampShader.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkEmptyShader.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkRuntimeShader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkRuntimeShader.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkShaderBase.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkTriColorShader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkTriColorShader.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkWorkingColorSpaceShader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkWorkingColorSpaceShader.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/gradients/SkRadialGradient.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/gradients/SkSweepGradient.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLGetLoopControlFlowInfo.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLGetReturnComplexity.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLIsDynamicallyUniformExpression.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLReturnsInputAlpha.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLStructDefinition.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/tracing/SkSLTraceHook.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/tracing/SkSLTraceHook.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/transform/SkSLHoistSwitchVarDeclarationsAtTopLevel.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/transform/SkSLRewriteIndexedSwizzle.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/text/SlugFromBuffer.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/text/gpu/SlugImpl.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/text/gpu/SlugImpl.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/text/gpu/VertexFiller.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/text/gpu/VertexFiller.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/SkTestCanvas.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/utils/win/SkWGL_win.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/toolchain/android_trampolines/gen_trampolines/gen_trampolines.go + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/gm/drawlines_with_local_matrix.cpp
-FILE: ../../../third_party/skia/gm/nearesthalfpixelimage.cpp
-FILE: ../../../third_party/skia/gm/palette.cpp
-FILE: ../../../third_party/skia/include/core/SkOpenTypeSVGDecoder.h
-FILE: ../../../third_party/skia/include/gpu/mtl/MtlMemoryAllocator.h
-FILE: ../../../third_party/skia/modules/skottie/src/BlendModes.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/text/Font.cpp
-FILE: ../../../third_party/skia/modules/skottie/src/text/Font.h
-FILE: ../../../third_party/skia/modules/skunicode/src/SkUnicode_client.cpp
-FILE: ../../../third_party/skia/modules/svg/include/SkSVGOpenTypeSVGDecoder.h
-FILE: ../../../third_party/skia/modules/svg/src/SkSVGOpenTypeSVGDecoder.cpp
-FILE: ../../../third_party/skia/src/codec/SkAvifCodec.cpp
-FILE: ../../../third_party/skia/src/codec/SkAvifCodec.h
-FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlComputeCommandEncoder.h
-FILE: ../../../third_party/skia/src/sfnt/SkOTTable_hmtx.h
-FILE: ../../../third_party/skia/src/sksl/codegen/SkSLRasterPipelineBuilder.cpp
-FILE: ../../../third_party/skia/src/sksl/codegen/SkSLRasterPipelineBuilder.h
-FILE: ../../../third_party/skia/src/sksl/codegen/SkSLWGSLCodeGenerator.cpp
-FILE: ../../../third_party/skia/src/sksl/codegen/SkSLWGSLCodeGenerator.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLDiscardStatement.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLInterfaceBlock.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLLayout.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLLiteral.cpp
-FILE: ../../../third_party/skia/src/text/gpu/SDFMaskFilter.h
-FILE: ../../../third_party/skia/src/utils/SkBlitterTrace.h
-FILE: ../../../third_party/skia/src/utils/SkBlitterTraceCommon.h
-FILE: ../../../third_party/skia/src/utils/SkCycles.h
+FILE: ../../../flutter/third_party/skia/fuzz/FuzzCubicRoots.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/FuzzPrecompile.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/FuzzQuadRoots.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzColorspace.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzCubicRoots.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzPrecompile.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzQuadRoots.cpp
+FILE: ../../../flutter/third_party/skia/gm/fontations_ft_compare.cpp
+FILE: ../../../flutter/third_party/skia/gm/graphite_replay.cpp
+FILE: ../../../flutter/third_party/skia/gm/hello_bazel_world.cpp
+FILE: ../../../flutter/third_party/skia/gm/png_codec.cpp
+FILE: ../../../flutter/third_party/skia/gm/rippleshadergm.cpp
+FILE: ../../../flutter/third_party/skia/gm/scaledrects.cpp
+FILE: ../../../flutter/third_party/skia/gm/workingspace.cpp
+FILE: ../../../flutter/third_party/skia/include/android/AHardwareBufferUtils.h
+FILE: ../../../flutter/third_party/skia/include/android/SkCanvasAndroid.h
+FILE: ../../../flutter/third_party/skia/include/android/SkHeifDecoder.h
+FILE: ../../../flutter/third_party/skia/include/android/SkImageAndroid.h
+FILE: ../../../flutter/third_party/skia/include/android/SkSurfaceAndroid.h
+FILE: ../../../flutter/third_party/skia/include/android/graphite/SurfaceAndroid.h
+FILE: ../../../flutter/third_party/skia/include/codec/SkAvifDecoder.h
+FILE: ../../../flutter/third_party/skia/include/codec/SkBmpDecoder.h
+FILE: ../../../flutter/third_party/skia/include/codec/SkGifDecoder.h
+FILE: ../../../flutter/third_party/skia/include/codec/SkIcoDecoder.h
+FILE: ../../../flutter/third_party/skia/include/codec/SkJpegDecoder.h
+FILE: ../../../flutter/third_party/skia/include/codec/SkJpegxlDecoder.h
+FILE: ../../../flutter/third_party/skia/include/codec/SkPixmapUtils.h
+FILE: ../../../flutter/third_party/skia/include/codec/SkPngDecoder.h
+FILE: ../../../flutter/third_party/skia/include/codec/SkRawDecoder.h
+FILE: ../../../flutter/third_party/skia/include/codec/SkWbmpDecoder.h
+FILE: ../../../flutter/third_party/skia/include/codec/SkWebpDecoder.h
+FILE: ../../../flutter/third_party/skia/include/core/SkColorTable.h
+FILE: ../../../flutter/third_party/skia/include/core/SkPoint.h
+FILE: ../../../flutter/third_party/skia/include/core/SkTextureCompressionType.h
+FILE: ../../../flutter/third_party/skia/include/core/SkTiledImageUtils.h
+FILE: ../../../flutter/third_party/skia/include/docs/SkMultiPictureDocument.h
+FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/GrExternalTextureGenerator.h
+FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/SkImageGanesh.h
+FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/SkMeshGanesh.h
+FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h
+FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/gl/GrGLBackendSurface.h
+FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/gl/GrGLDirectContext.h
+FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/SkSurfaceMetal.h
+FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/vk/GrVkBackendSemaphore.h
+FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/vk/GrVkBackendSurface.h
+FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/vk/GrVkDirectContext.h
+FILE: ../../../flutter/third_party/skia/include/gpu/graphite/BackendSemaphore.h
+FILE: ../../../flutter/third_party/skia/include/gpu/graphite/Image.h
+FILE: ../../../flutter/third_party/skia/include/gpu/graphite/Surface.h
+FILE: ../../../flutter/third_party/skia/include/gpu/graphite/YUVABackendTextures.h
+FILE: ../../../flutter/third_party/skia/include/gpu/vk/VulkanMutableTextureState.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkAnySubclass.h
+FILE: ../../../flutter/third_party/skia/include/private/base/SkCPUTypes.h
+FILE: ../../../flutter/third_party/skia/include/private/chromium/GrDeferredDisplayList.h
+FILE: ../../../flutter/third_party/skia/include/private/chromium/GrDeferredDisplayListRecorder.h
+FILE: ../../../flutter/third_party/skia/include/private/chromium/GrPromiseImageTexture.h
+FILE: ../../../flutter/third_party/skia/include/private/chromium/GrSurfaceCharacterization.h
+FILE: ../../../flutter/third_party/skia/include/private/chromium/SkImageChromium.h
+FILE: ../../../flutter/third_party/skia/include/private/gpu/ganesh/GrTextureGenerator.h
+FILE: ../../../flutter/third_party/skia/include/private/gpu/graphite/ContextOptionsPriv.h
+FILE: ../../../flutter/third_party/skia/modules/bentleyottmann/include/BentleyOttmann1.h
+FILE: ../../../flutter/third_party/skia/modules/bentleyottmann/include/BruteForceCrossings.h
+FILE: ../../../flutter/third_party/skia/modules/bentleyottmann/include/Contour.h
+FILE: ../../../flutter/third_party/skia/modules/bentleyottmann/include/EventQueue.h
+FILE: ../../../flutter/third_party/skia/modules/bentleyottmann/include/EventQueueInterface.h
+FILE: ../../../flutter/third_party/skia/modules/bentleyottmann/include/Int96.h
+FILE: ../../../flutter/third_party/skia/modules/bentleyottmann/include/Myers.h
+FILE: ../../../flutter/third_party/skia/modules/bentleyottmann/include/Point.h
+FILE: ../../../flutter/third_party/skia/modules/bentleyottmann/include/Segment.h
+FILE: ../../../flutter/third_party/skia/modules/bentleyottmann/include/SweepLine.h
+FILE: ../../../flutter/third_party/skia/modules/bentleyottmann/src/BentleyOttmann1.cpp
+FILE: ../../../flutter/third_party/skia/modules/bentleyottmann/src/BruteForceCrossings.cpp
+FILE: ../../../flutter/third_party/skia/modules/bentleyottmann/src/Contour.cpp
+FILE: ../../../flutter/third_party/skia/modules/bentleyottmann/src/EventQueue.cpp
+FILE: ../../../flutter/third_party/skia/modules/bentleyottmann/src/Int96.cpp
+FILE: ../../../flutter/third_party/skia/modules/bentleyottmann/src/Myers.cpp
+FILE: ../../../flutter/third_party/skia/modules/bentleyottmann/src/Point.cpp
+FILE: ../../../flutter/third_party/skia/modules/bentleyottmann/src/Segment.cpp
+FILE: ../../../flutter/third_party/skia/modules/bentleyottmann/src/SweepLine.cpp
+FILE: ../../../flutter/third_party/skia/modules/skunicode/src/SkUnicode_icu_bidi.h
+FILE: ../../../flutter/third_party/skia/src/base/SkBezierCurves.h
+FILE: ../../../flutter/third_party/skia/src/base/SkCubics.cpp
+FILE: ../../../flutter/third_party/skia/src/base/SkCubics.h
+FILE: ../../../flutter/third_party/skia/src/base/SkFloatingPoint.cpp
+FILE: ../../../flutter/third_party/skia/src/base/SkQuads.cpp
+FILE: ../../../flutter/third_party/skia/src/base/SkQuads.h
+FILE: ../../../flutter/third_party/skia/src/base/SkRectMemcpy.h
+FILE: ../../../flutter/third_party/skia/src/base/SkSafeMath.cpp
+FILE: ../../../flutter/third_party/skia/src/base/SkTime.cpp
+FILE: ../../../flutter/third_party/skia/src/base/SkTime.h
+FILE: ../../../flutter/third_party/skia/src/codec/SkImageGenerator_FromEncoded.cpp
+FILE: ../../../flutter/third_party/skia/src/codec/SkJpegConstants.h
+FILE: ../../../flutter/third_party/skia/src/core/SkBitmapProcState_opts.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkBlitMask.h
+FILE: ../../../flutter/third_party/skia/src/core/SkBlitMask_opts.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkBlitRow_opts.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkBlitRow_opts_hsw.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkBlitter_A8.h
+FILE: ../../../flutter/third_party/skia/src/core/SkBlurEngine.h
+FILE: ../../../flutter/third_party/skia/src/core/SkBlurMaskFilterImpl.h
+FILE: ../../../flutter/third_party/skia/src/core/SkCanvas_Raster.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkChecksum.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkColorTable.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkDrawBase.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkDrawBase.h
+FILE: ../../../flutter/third_party/skia/src/core/SkFontMetricsPriv.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkFontMetricsPriv.h
+FILE: ../../../flutter/third_party/skia/src/core/SkMemset.h
+FILE: ../../../flutter/third_party/skia/src/core/SkMemset_opts.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkMemset_opts_avx.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkMipmapBuilder.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkOptsTargets.h
+FILE: ../../../flutter/third_party/skia/src/core/SkPixmapDraw.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkRSXform.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkReadPixelsRec.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkRuntimeBlender.h
+FILE: ../../../flutter/third_party/skia/src/core/SkSwizzler_opts.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkSwizzler_opts_hsw.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkWritePixelsRec.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/SkShaderMaskFilterImpl.h
+FILE: ../../../flutter/third_party/skia/src/effects/colorfilters/SkBlendModeColorFilter.h
+FILE: ../../../flutter/third_party/skia/src/effects/colorfilters/SkColorSpaceXformColorFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/colorfilters/SkColorSpaceXformColorFilter.h
+FILE: ../../../flutter/third_party/skia/src/effects/colorfilters/SkComposeColorFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/colorfilters/SkComposeColorFilter.h
+FILE: ../../../flutter/third_party/skia/src/effects/colorfilters/SkGaussianColorFilter.h
+FILE: ../../../flutter/third_party/skia/src/effects/colorfilters/SkMatrixColorFilter.h
+FILE: ../../../flutter/third_party/skia/src/effects/colorfilters/SkRuntimeColorFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/colorfilters/SkRuntimeColorFilter.h
+FILE: ../../../flutter/third_party/skia/src/effects/colorfilters/SkWorkingFormatColorFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/effects/colorfilters/SkWorkingFormatColorFilter.h
+FILE: ../../../flutter/third_party/skia/src/encode/SkEncoder.cpp
+FILE: ../../../flutter/third_party/skia/src/encode/SkJpegEncoder_none.cpp
+FILE: ../../../flutter/third_party/skia/src/encode/SkPngEncoderImpl.h
+FILE: ../../../flutter/third_party/skia/src/encode/SkPngEncoder_none.cpp
+FILE: ../../../flutter/third_party/skia/src/encode/SkWebpEncoder_none.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/BlendFormula.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/BlendFormula.h
+FILE: ../../../flutter/third_party/skia/src/gpu/BlurUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/BlurUtils.h
+FILE: ../../../flutter/third_party/skia/src/gpu/DitherUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/DitherUtils.h
+FILE: ../../../flutter/third_party/skia/src/gpu/GpuTypesPriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/MutableTextureStatePriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/PipelineUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/PipelineUtils.h
+FILE: ../../../flutter/third_party/skia/src/gpu/SkBackingFit.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/TiledTextureUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/TiledTextureUtils.h
+FILE: ../../../flutter/third_party/skia/src/gpu/android/AHardwareBufferUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBackendSemaphorePriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrBackendSurfacePriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrCanvas.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrCanvas.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDeferredDisplayList.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDeferredDisplayListPriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrDeferredDisplayListRecorder.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrFragmentProcessors.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrFragmentProcessors.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrMeshBuffers.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrMeshBuffers.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/GrPromiseImageTexture.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrColorTableEffect.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrColorTableEffect.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrPerlinNoise2Effect.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/effects/GrPerlinNoise2Effect.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/AHardwareBufferGL.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLBackendSurface.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLBackendSurfacePriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLDirectContext.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/image/GrImageUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/image/GrImageUtils.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/image/GrTextureGenerator.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/image/SkImage_GaneshFactories.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/image/SkImage_LazyTexture.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/image/SkImage_LazyTexture.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/image/SkImage_RasterPinnable.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/image/SkImage_RasterPinnable.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/image/SkSpecialImage_Ganesh.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/surface/SkSurface_AndroidFactories.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/AHardwareBufferVk.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkBackendSemaphore.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkBackendSurface.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkBackendSurfacePriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkContextThreadSafeProxy.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkContextThreadSafeProxy.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/vk/GrVkDirectContext.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/AtlasProvider.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/AtlasProvider.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/BackendSemaphore.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/DescriptorData.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/ImageFactories.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/Image_Base_Graphite.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/Image_Base_Graphite.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/Image_YUVA_Graphite.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/Image_YUVA_Graphite.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/PathAtlas.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/PathAtlas.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/ProxyCache.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/ProxyCache.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/RasterPathAtlas.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/RasterPathAtlas.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/ReadSwizzle.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/YUVABackendTextures.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/YUVATextureProxies.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/YUVATextureProxies.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/compute/ComputeStep.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/compute/ComputeStep.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/compute/DispatchGroup.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/compute/DispatchGroup.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/compute/VelloComputeSteps.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/compute/VelloComputeSteps.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/compute/VelloRenderer.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/compute/VelloRenderer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnComputePipeline.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnComputePipeline.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnErrorChecker.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnErrorChecker.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/dawn/DawnUtilsPriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/geom/CoverageMaskShape.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/geom/EdgeAAQuad.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/render/CoverageMaskRenderStep.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/render/CoverageMaskRenderStep.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/render/GraphiteVertexFiller.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/render/PerEdgeAAQuadRenderStep.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/render/PerEdgeAAQuadRenderStep.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/surface/Surface_AndroidFactories.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanDescriptorPool.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanDescriptorPool.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanDescriptorSet.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanDescriptorSet.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanFramebuffer.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanFramebuffer.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanGraphicsPipeline.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanGraphicsPipeline.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanRenderPass.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanRenderPass.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanSampler.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/vk/VulkanSampler.h
+FILE: ../../../flutter/third_party/skia/src/gpu/vk/VulkanMutableTextureState.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/vk/VulkanMutableTextureStatePriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/vk/VulkanUtilsPriv.cpp
+FILE: ../../../flutter/third_party/skia/src/image/SkImageGeneratorPriv.h
+FILE: ../../../flutter/third_party/skia/src/image/SkImage_AndroidFactories.cpp
+FILE: ../../../flutter/third_party/skia/src/image/SkImage_Base.cpp
+FILE: ../../../flutter/third_party/skia/src/image/SkImage_LazyFactories.cpp
+FILE: ../../../flutter/third_party/skia/src/image/SkImage_Picture.cpp
+FILE: ../../../flutter/third_party/skia/src/image/SkImage_Picture.h
+FILE: ../../../flutter/third_party/skia/src/image/SkImage_Raster.h
+FILE: ../../../flutter/third_party/skia/src/image/SkImage_RasterFactories.cpp
+FILE: ../../../flutter/third_party/skia/src/image/SkPictureImageGenerator.h
+FILE: ../../../flutter/third_party/skia/src/image/SkSurface_Base.cpp
+FILE: ../../../flutter/third_party/skia/src/image/SkSurface_Null.cpp
+FILE: ../../../flutter/third_party/skia/src/image/SkTiledImageUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/opts/SkOpts_RestoreTarget.h
+FILE: ../../../flutter/third_party/skia/src/opts/SkOpts_SetTarget.h
+FILE: ../../../flutter/third_party/skia/src/ports/fontations/src/ffi.rs
+FILE: ../../../flutter/third_party/skia/src/ports/fontations/src/skpath_bridge.h
+FILE: ../../../flutter/third_party/skia/src/shaders/SkBlendShader.h
+FILE: ../../../flutter/third_party/skia/src/shaders/SkColorShader.h
+FILE: ../../../flutter/third_party/skia/src/shaders/SkCoordClampShader.h
+FILE: ../../../flutter/third_party/skia/src/shaders/SkEmptyShader.h
+FILE: ../../../flutter/third_party/skia/src/shaders/SkRuntimeShader.cpp
+FILE: ../../../flutter/third_party/skia/src/shaders/SkRuntimeShader.h
+FILE: ../../../flutter/third_party/skia/src/shaders/SkShaderBase.cpp
+FILE: ../../../flutter/third_party/skia/src/shaders/SkTriColorShader.cpp
+FILE: ../../../flutter/third_party/skia/src/shaders/SkTriColorShader.h
+FILE: ../../../flutter/third_party/skia/src/shaders/SkWorkingColorSpaceShader.cpp
+FILE: ../../../flutter/third_party/skia/src/shaders/SkWorkingColorSpaceShader.h
+FILE: ../../../flutter/third_party/skia/src/shaders/gradients/SkRadialGradient.h
+FILE: ../../../flutter/third_party/skia/src/shaders/gradients/SkSweepGradient.h
+FILE: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLGetLoopControlFlowInfo.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLGetReturnComplexity.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLIsDynamicallyUniformExpression.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLReturnsInputAlpha.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLStructDefinition.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/tracing/SkSLTraceHook.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/tracing/SkSLTraceHook.h
+FILE: ../../../flutter/third_party/skia/src/sksl/transform/SkSLHoistSwitchVarDeclarationsAtTopLevel.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/transform/SkSLRewriteIndexedSwizzle.cpp
+FILE: ../../../flutter/third_party/skia/src/text/SlugFromBuffer.cpp
+FILE: ../../../flutter/third_party/skia/src/text/gpu/SlugImpl.cpp
+FILE: ../../../flutter/third_party/skia/src/text/gpu/SlugImpl.h
+FILE: ../../../flutter/third_party/skia/src/text/gpu/VertexFiller.cpp
+FILE: ../../../flutter/third_party/skia/src/text/gpu/VertexFiller.h
+FILE: ../../../flutter/third_party/skia/src/utils/SkTestCanvas.cpp
+FILE: ../../../flutter/third_party/skia/src/utils/win/SkWGL_win.cpp
+FILE: ../../../flutter/third_party/skia/toolchain/android_trampolines/gen_trampolines/gen_trampolines.go
 ----------------------------------------------------------------------------------------------------
-Copyright 2022 Google Inc.
+Copyright 2023 Google LLC
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -7588,209 +9343,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/bench/graphite/BoundsManagerBench.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLEmptyExpression.h + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/bench/graphite/BoundsManagerBench.cpp
-FILE: ../../../third_party/skia/example/VulkanBasic.cpp
-FILE: ../../../third_party/skia/gm/bug12866.cpp
-FILE: ../../../third_party/skia/gm/crbug_1313579.cpp
-FILE: ../../../third_party/skia/include/core/SkAlphaType.h
-FILE: ../../../third_party/skia/include/core/SkCapabilities.h
-FILE: ../../../third_party/skia/include/core/SkColorType.h
-FILE: ../../../third_party/skia/include/gpu/GpuTypes.h
-FILE: ../../../third_party/skia/include/gpu/graphite/CombinationBuilder.h
-FILE: ../../../third_party/skia/include/gpu/graphite/ContextOptions.h
-FILE: ../../../third_party/skia/include/gpu/graphite/ImageProvider.h
-FILE: ../../../third_party/skia/include/gpu/graphite/dawn/DawnBackendContext.h
-FILE: ../../../third_party/skia/include/gpu/vk/VulkanBackendContext.h
-FILE: ../../../third_party/skia/include/private/SkUniquePaintParamsID.h
-FILE: ../../../third_party/skia/include/sksl/SkSLVersion.h
-FILE: ../../../third_party/skia/infra/bots/task_drivers/bazel_build/bazel_build.go
-FILE: ../../../third_party/skia/infra/bots/task_drivers/canvaskit_gold/canvaskit_gold.go
-FILE: ../../../third_party/skia/infra/bots/task_drivers/check_generated_files/check_generated_files.go
-FILE: ../../../third_party/skia/infra/bots/task_drivers/cpu_tests/cpu_tests.go
-FILE: ../../../third_party/skia/modules/skunicode/src/SkUnicode.cpp
-FILE: ../../../third_party/skia/src/core/SkBuiltInCodeSnippetID.h
-FILE: ../../../third_party/skia/src/core/SkCapabilities.cpp
-FILE: ../../../third_party/skia/src/core/SkDebugUtils.h
-FILE: ../../../third_party/skia/src/core/SkRuntimeEffectDictionary.h
-FILE: ../../../third_party/skia/src/core/SkSLTypeShared.cpp
-FILE: ../../../third_party/skia/src/core/SkSLTypeShared.h
-FILE: ../../../third_party/skia/src/gpu/AtlasTypes.cpp
-FILE: ../../../third_party/skia/src/gpu/AtlasTypes.h
-FILE: ../../../third_party/skia/src/gpu/RefCntedCallback.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrBufferTransferRenderTask.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrBufferTransferRenderTask.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrBufferUpdateRenderTask.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrBufferUpdateRenderTask.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrImageInfo.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/GrSurfaceProxyView.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/TestFormatColorTypeCombination.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/PathTessellator.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/PathTessellator.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/StrokeTessellator.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/StrokeTessellator.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/VertexChunkPatchAllocator.h
-FILE: ../../../third_party/skia/src/gpu/graphite/AttachmentTypes.h
-FILE: ../../../third_party/skia/src/gpu/graphite/ClientMappedBufferManager.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/ClientMappedBufferManager.h
-FILE: ../../../third_party/skia/src/gpu/graphite/ClipStack.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/ClipStack_graphite.h
-FILE: ../../../third_party/skia/src/gpu/graphite/CombinationBuilder.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/CommandTypes.h
-FILE: ../../../third_party/skia/src/gpu/graphite/ComputePassTask.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/ComputePassTask.h
-FILE: ../../../third_party/skia/src/gpu/graphite/ComputePipeline.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/ComputePipeline.h
-FILE: ../../../third_party/skia/src/gpu/graphite/ComputePipelineDesc.h
-FILE: ../../../third_party/skia/src/gpu/graphite/ComputeTypes.h
-FILE: ../../../third_party/skia/src/gpu/graphite/DrawAtlas.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/DrawAtlas.h
-FILE: ../../../third_party/skia/src/gpu/graphite/DrawCommands.h
-FILE: ../../../third_party/skia/src/gpu/graphite/DrawParams.h
-FILE: ../../../third_party/skia/src/gpu/graphite/FactoryFunctions.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/FactoryFunctions.h
-FILE: ../../../third_party/skia/src/gpu/graphite/GlobalCache.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/GlobalCache.h
-FILE: ../../../third_party/skia/src/gpu/graphite/GpuWorkSubmission.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/GraphiteResourceKey.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/GraphiteResourceKey.h
-FILE: ../../../third_party/skia/src/gpu/graphite/ImageUtils.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/ImageUtils.h
-FILE: ../../../third_party/skia/src/gpu/graphite/KeyContext.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/KeyContext.h
-FILE: ../../../third_party/skia/src/gpu/graphite/KeyHelpers.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/KeyHelpers.h
-FILE: ../../../third_party/skia/src/gpu/graphite/Log.h
-FILE: ../../../third_party/skia/src/gpu/graphite/PaintOptionsPriv.h
-FILE: ../../../third_party/skia/src/gpu/graphite/PaintParams.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/PaintParams.h
-FILE: ../../../third_party/skia/src/gpu/graphite/PaintParamsKey.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/PaintParamsKey.h
-FILE: ../../../third_party/skia/src/gpu/graphite/PietRenderTask.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/PietRenderTask.h
-FILE: ../../../third_party/skia/src/gpu/graphite/PipelineData.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/PipelineData.h
-FILE: ../../../third_party/skia/src/gpu/graphite/Precompile.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/Precompile.h
-FILE: ../../../third_party/skia/src/gpu/graphite/PrecompileBasePriv.h
-FILE: ../../../third_party/skia/src/gpu/graphite/QueueManager.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/QueueManager.h
-FILE: ../../../third_party/skia/src/gpu/graphite/RecorderPriv.h
-FILE: ../../../third_party/skia/src/gpu/graphite/RecordingPriv.h
-FILE: ../../../third_party/skia/src/gpu/graphite/Renderer.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/RendererProvider.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/RendererProvider.h
-FILE: ../../../third_party/skia/src/gpu/graphite/Resource.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/Resource.h
-FILE: ../../../third_party/skia/src/gpu/graphite/ResourceCache.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/ResourceCache.h
-FILE: ../../../third_party/skia/src/gpu/graphite/Sampler.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/Sampler.h
-FILE: ../../../third_party/skia/src/gpu/graphite/ShaderCodeDictionary.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/ShaderCodeDictionary.h
-FILE: ../../../third_party/skia/src/gpu/graphite/SpecialImage_Graphite.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/SynchronizeToCpuTask.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/SynchronizeToCpuTask.h
-FILE: ../../../third_party/skia/src/gpu/graphite/TextureProxyView.h
-FILE: ../../../third_party/skia/src/gpu/graphite/TextureUtils.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/TextureUtils.h
-FILE: ../../../third_party/skia/src/gpu/graphite/UploadBufferManager.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/UploadBufferManager.h
-FILE: ../../../third_party/skia/src/gpu/graphite/UploadTask.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/UploadTask.h
-FILE: ../../../third_party/skia/src/gpu/graphite/dawn/DawnCaps.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/dawn/DawnCaps.h
-FILE: ../../../third_party/skia/src/gpu/graphite/dawn/DawnCommandBuffer.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/dawn/DawnCommandBuffer.h
-FILE: ../../../third_party/skia/src/gpu/graphite/dawn/DawnGraphicsPipeline.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/dawn/DawnGraphicsPipeline.h
-FILE: ../../../third_party/skia/src/gpu/graphite/dawn/DawnQueueManager.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/dawn/DawnQueueManager.h
-FILE: ../../../third_party/skia/src/gpu/graphite/dawn/DawnResourceProvider.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/dawn/DawnResourceProvider.h
-FILE: ../../../third_party/skia/src/gpu/graphite/dawn/DawnSampler.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/dawn/DawnSampler.h
-FILE: ../../../third_party/skia/src/gpu/graphite/dawn/DawnSharedContext.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/dawn/DawnSharedContext.h
-FILE: ../../../third_party/skia/src/gpu/graphite/dawn/DawnTexture.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/dawn/DawnTexture.h
-FILE: ../../../third_party/skia/src/gpu/graphite/dawn/DawnTypesPriv.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/dawn/DawnUtils.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/dawn/DawnUtils.h
-FILE: ../../../third_party/skia/src/gpu/graphite/geom/Geometry.h
-FILE: ../../../third_party/skia/src/gpu/graphite/geom/SubRunData.h
-FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlComputePipeline.h
-FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlComputePipeline.mm
-FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlQueueManager.h
-FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlQueueManager.mm
-FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlSampler.h
-FILE: ../../../third_party/skia/src/gpu/graphite/mtl/MtlSampler.mm
-FILE: ../../../third_party/skia/src/gpu/graphite/render/AnalyticRRectRenderStep.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/render/AnalyticRRectRenderStep.h
-FILE: ../../../third_party/skia/src/gpu/graphite/render/BitmapTextRenderStep.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/render/BitmapTextRenderStep.h
-FILE: ../../../third_party/skia/src/gpu/graphite/render/CommonDepthStencilSettings.h
-FILE: ../../../third_party/skia/src/gpu/graphite/render/CoverBoundsRenderStep.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/render/CoverBoundsRenderStep.h
-FILE: ../../../third_party/skia/src/gpu/graphite/render/DynamicInstancesPatchAllocator.h
-FILE: ../../../third_party/skia/src/gpu/graphite/render/MiddleOutFanRenderStep.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/render/MiddleOutFanRenderStep.h
-FILE: ../../../third_party/skia/src/gpu/graphite/render/SDFTextRenderStep.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/render/SDFTextRenderStep.h
-FILE: ../../../third_party/skia/src/gpu/graphite/render/TessellateCurvesRenderStep.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/render/TessellateCurvesRenderStep.h
-FILE: ../../../third_party/skia/src/gpu/graphite/render/TessellateStrokesRenderStep.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/render/TessellateStrokesRenderStep.h
-FILE: ../../../third_party/skia/src/gpu/graphite/render/TessellateWedgesRenderStep.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/render/TessellateWedgesRenderStep.h
-FILE: ../../../third_party/skia/src/gpu/graphite/render/VerticesRenderStep.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/render/VerticesRenderStep.h
-FILE: ../../../third_party/skia/src/gpu/graphite/text/AtlasManager.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/text/AtlasManager.h
-FILE: ../../../third_party/skia/src/gpu/graphite/vk/VulkanCaps.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/vk/VulkanCaps.h
-FILE: ../../../third_party/skia/src/gpu/graphite/vk/VulkanCommandBuffer.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/vk/VulkanCommandBuffer.h
-FILE: ../../../third_party/skia/src/gpu/graphite/vk/VulkanGraphiteUtils.h
-FILE: ../../../third_party/skia/src/gpu/graphite/vk/VulkanQueueManager.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/vk/VulkanQueueManager.h
-FILE: ../../../third_party/skia/src/gpu/graphite/vk/VulkanResourceProvider.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/vk/VulkanResourceProvider.h
-FILE: ../../../third_party/skia/src/gpu/graphite/vk/VulkanSharedContext.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/vk/VulkanSharedContext.h
-FILE: ../../../third_party/skia/src/gpu/graphite/vk/VulkanTexture.cpp
-FILE: ../../../third_party/skia/src/gpu/graphite/vk/VulkanTexture.h
-FILE: ../../../third_party/skia/src/gpu/tessellate/FixedCountBufferUtils.cpp
-FILE: ../../../third_party/skia/src/gpu/tessellate/FixedCountBufferUtils.h
-FILE: ../../../third_party/skia/src/gpu/tessellate/LinearTolerances.h
-FILE: ../../../third_party/skia/src/gpu/vk/VulkanUtils.h
-FILE: ../../../third_party/skia/src/shaders/SkEmptyShader.cpp
-FILE: ../../../third_party/skia/src/shaders/gradients/SkGradientShaderBase.cpp
-FILE: ../../../third_party/skia/src/sksl/SkSLModuleLoader.cpp
-FILE: ../../../third_party/skia/src/sksl/SkSLModuleLoader.h
-FILE: ../../../third_party/skia/src/sksl/analysis/SkSLFinalizationChecks.cpp
-FILE: ../../../third_party/skia/src/sksl/analysis/SkSLHasSideEffects.cpp
-FILE: ../../../third_party/skia/src/sksl/analysis/SkSLIsSameExpressionTree.cpp
-FILE: ../../../third_party/skia/src/sksl/analysis/SkSLIsTrivialExpression.cpp
-FILE: ../../../third_party/skia/src/sksl/analysis/SkSLNoOpErrorReporter.h
-FILE: ../../../third_party/skia/src/sksl/analysis/SkSLProgramUsage.h
-FILE: ../../../third_party/skia/src/sksl/codegen/SkSLRasterPipelineCodeGenerator.cpp
-FILE: ../../../third_party/skia/src/sksl/codegen/SkSLRasterPipelineCodeGenerator.h
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLProgram.cpp
-FILE: ../../../third_party/skia/src/sksl/transform/SkSLAddConstToVarModifiers.cpp
-FILE: ../../../third_party/skia/src/sksl/transform/SkSLEliminateEmptyStatements.cpp
-FILE: ../../../third_party/skia/src/sksl/transform/SkSLFindAndDeclareBuiltinFunctions.cpp
-FILE: ../../../third_party/skia/src/sksl/transform/SkSLRenamePrivateSymbols.cpp
-FILE: ../../../third_party/skia/src/text/StrikeForGPU.cpp
-FILE: ../../../third_party/skia/src/text/gpu/GlyphVector.cpp
-FILE: ../../../third_party/skia/src/text/gpu/GlyphVector.h
-FILE: ../../../third_party/skia/src/text/gpu/SubRunContainer.cpp
-FILE: ../../../third_party/skia/src/text/gpu/SubRunContainer.h
-FILE: ../../../third_party/skia/src/utils/SkGaussianColorFilter.cpp
-FILE: ../../../third_party/skia/src/utils/SkTestCanvas.h
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLEmptyExpression.h
 ----------------------------------------------------------------------------------------------------
-Copyright 2022 Google LLC
+Copyright 2023 Google LLC.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -7823,31 +9380,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/include/gpu/graphite/dawn/DawnTypes.h + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzSKSL2WGSL.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzSkRuntimeBlender.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzSkRuntimeColorFilter.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/MutableTextureState.cpp + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/include/gpu/MutableTextureState.h
-FILE: ../../../third_party/skia/include/gpu/graphite/dawn/DawnTypes.h
-FILE: ../../../third_party/skia/include/gpu/graphite/vk/VulkanGraphiteTypes.h
-FILE: ../../../third_party/skia/include/gpu/vk/VulkanExtensions.h
-FILE: ../../../third_party/skia/include/gpu/vk/VulkanMemoryAllocator.h
-FILE: ../../../third_party/skia/include/gpu/vk/VulkanTypes.h
-FILE: ../../../third_party/skia/include/private/SkContainers.h
-FILE: ../../../third_party/skia/include/private/gpu/graphite/DawnTypesPriv.h
-FILE: ../../../third_party/skia/include/private/gpu/graphite/VulkanGraphiteTypesPriv.h
-FILE: ../../../third_party/skia/include/private/gpu/vk/VulkanTypesPriv.h
-FILE: ../../../third_party/skia/src/gpu/MutableTextureStateRef.h
-FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAsyncWait.cpp
-FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAsyncWait.h
-FILE: ../../../third_party/skia/src/gpu/graphite/vk/VulkanGraphiteTypes.cpp
-FILE: ../../../third_party/skia/src/gpu/piet/PietTypes.h
-FILE: ../../../third_party/skia/src/gpu/piet/Render.cpp
-FILE: ../../../third_party/skia/src/gpu/piet/Render.h
-FILE: ../../../third_party/skia/src/gpu/piet/Scene.cpp
-FILE: ../../../third_party/skia/src/gpu/piet/Scene.h
-FILE: ../../../third_party/skia/src/gpu/tessellate/MidpointContourParser.h
-FILE: ../../../third_party/skia/src/sksl/SkSLPosition.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzSKSL2WGSL.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzSkRuntimeBlender.cpp
+FILE: ../../../flutter/third_party/skia/fuzz/oss_fuzz/FuzzSkRuntimeColorFilter.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/MutableTextureState.cpp
 ----------------------------------------------------------------------------------------------------
-Copyright 2022 Google LLC.
+Copyright 2023 Google, LLC
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -7880,12 +9423,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/fuzz/oss_fuzz/FuzzCOLRv1.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/shaders/SkCoordClampShader.cpp + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzCOLRv1.cpp
-FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSkMeshSpecification.cpp
+FILE: ../../../flutter/third_party/skia/src/shaders/SkCoordClampShader.cpp
 ----------------------------------------------------------------------------------------------------
-Copyright 2022 Google, LLC
+Copyright 2023 The Android Open Source Project
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -7918,27 +9460,33 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
-ORIGIN: ../../../third_party/skia/infra/bots/task_drivers/codesize/codesize.go + ../../../LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/ports/SkFontMgr_Fontations.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkFontScanner.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontMgr_fontations_empty.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontMgr_fontations_empty.h + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/skia/infra/bots/task_drivers/codesize/codesize.go
-FILE: ../../../third_party/skia/infra/bots/task_drivers/codesize/codesize_test.go
-FILE: ../../../third_party/skia/modules/canvaskit/go/gold_test_env/gold_test_env.go
+FILE: ../../../flutter/third_party/skia/include/ports/SkFontMgr_Fontations.h
+FILE: ../../../flutter/third_party/skia/src/core/SkFontScanner.h
+FILE: ../../../flutter/third_party/skia/src/ports/SkFontMgr_fontations_empty.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkFontMgr_fontations_empty.h
 ----------------------------------------------------------------------------------------------------
-Copyright 2022 The Chromium Authors. All rights reserved.
+Copyright 2024 Google Inc.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -7952,4 +9500,149 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ====================================================================================================
-Total license count: 66
+
+====================================================================================================
+LIBRARY: skia
+ORIGIN: ../../../flutter/third_party/skia/gm/emptyshader.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/imagedither.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/gm/rendertomipmappedyuvimageplanes.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/gl/GrGLMakeWebGLInterface.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlBackendSemaphore.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlDirectContext.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/include/gpu/gl/epoxy/GrGLMakeEpoxyEGLInterface.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skshaper/include/SkShaper_coretext.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skshaper/include/SkShaper_harfbuzz.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skshaper/include/SkShaper_skunicode.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skunicode/include/SkUnicode_client.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skunicode/include/SkUnicode_icu.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skunicode/include/SkUnicode_icu4x.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skunicode/include/SkUnicode_libgrapheme.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skunicode/src/SkBidiFactory_icu_full.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skunicode/src/SkBidiFactory_icu_full.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skunicode/src/SkBidiFactory_icu_subset.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/modules/skunicode/src/SkBidiFactory_icu_subset.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkKnownRuntimeEffects.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/core/SkKnownRuntimeEffects.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/DataUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/DataUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/SwizzlePriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLCoreFunctions.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/epoxy/GrGLMakeEpoxyEGLInterface.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlBackendSemaphore.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlDirectContext.mm + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/FactoryFunctionsPriv.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/RasterPathUtils.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/RasterPathUtils.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/task/DrawTask.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/gpu/graphite/task/DrawTask.h + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLCheckSymbolTableCorrectness.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLSymbol.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/sksl/transform/SkSLFindAndDeclareBuiltinStructs.cpp + ../../../flutter/third_party/skia/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/skia/gm/emptyshader.cpp
+FILE: ../../../flutter/third_party/skia/gm/imagedither.cpp
+FILE: ../../../flutter/third_party/skia/gm/rendertomipmappedyuvimageplanes.cpp
+FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/gl/GrGLMakeWebGLInterface.h
+FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlBackendSemaphore.h
+FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlDirectContext.h
+FILE: ../../../flutter/third_party/skia/include/gpu/gl/epoxy/GrGLMakeEpoxyEGLInterface.h
+FILE: ../../../flutter/third_party/skia/modules/skshaper/include/SkShaper_coretext.h
+FILE: ../../../flutter/third_party/skia/modules/skshaper/include/SkShaper_harfbuzz.h
+FILE: ../../../flutter/third_party/skia/modules/skshaper/include/SkShaper_skunicode.h
+FILE: ../../../flutter/third_party/skia/modules/skunicode/include/SkUnicode_client.h
+FILE: ../../../flutter/third_party/skia/modules/skunicode/include/SkUnicode_icu.h
+FILE: ../../../flutter/third_party/skia/modules/skunicode/include/SkUnicode_icu4x.h
+FILE: ../../../flutter/third_party/skia/modules/skunicode/include/SkUnicode_libgrapheme.h
+FILE: ../../../flutter/third_party/skia/modules/skunicode/src/SkBidiFactory_icu_full.cpp
+FILE: ../../../flutter/third_party/skia/modules/skunicode/src/SkBidiFactory_icu_full.h
+FILE: ../../../flutter/third_party/skia/modules/skunicode/src/SkBidiFactory_icu_subset.cpp
+FILE: ../../../flutter/third_party/skia/modules/skunicode/src/SkBidiFactory_icu_subset.h
+FILE: ../../../flutter/third_party/skia/src/core/SkKnownRuntimeEffects.cpp
+FILE: ../../../flutter/third_party/skia/src/core/SkKnownRuntimeEffects.h
+FILE: ../../../flutter/third_party/skia/src/gpu/DataUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/DataUtils.h
+FILE: ../../../flutter/third_party/skia/src/gpu/SwizzlePriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/GrGLCoreFunctions.h
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/gl/epoxy/GrGLMakeEpoxyEGLInterface.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlBackendSemaphore.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/ganesh/mtl/GrMtlDirectContext.mm
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/FactoryFunctionsPriv.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/RasterPathUtils.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/RasterPathUtils.h
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/task/DrawTask.cpp
+FILE: ../../../flutter/third_party/skia/src/gpu/graphite/task/DrawTask.h
+FILE: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLCheckSymbolTableCorrectness.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLSymbol.cpp
+FILE: ../../../flutter/third_party/skia/src/sksl/transform/SkSLFindAndDeclareBuiltinStructs.cpp
+----------------------------------------------------------------------------------------------------
+Copyright 2024 Google LLC
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: skia
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontScanner_fontations.cpp + ../../../flutter/third_party/skia/LICENSE
+ORIGIN: ../../../flutter/third_party/skia/src/ports/SkFontScanner_fontations.h + ../../../flutter/third_party/skia/LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/skia/src/ports/SkFontScanner_fontations.cpp
+FILE: ../../../flutter/third_party/skia/src/ports/SkFontScanner_fontations.h
+----------------------------------------------------------------------------------------------------
+Copyright 2024 The Android Open Source Project
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
+
+Total license count: 70
diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party
index e93ce59bfbef934318ec15f62d4aced9de80b0e8..320e0b794d26969b31c8d2dca9f4ac4ed944ba07 100644
--- a/ci/licenses_golden/licenses_third_party
+++ b/ci/licenses_golden/licenses_third_party
@@ -1,2470 +1,865 @@
-Signature: 9f93a65fd695de6412406a5764578d71
-
-UNUSED LICENSES:
-
-====================================================================================================
-ORIGIN: ../../../third_party/angle/util/windows/third_party/StackWalker/LICENSE
-TYPE: LicenseType.bsd
-----------------------------------------------------------------------------------------------------
-BSD 3-Clause License
-
-Copyright (c) 2005 - 2017, Jochen Kalmbach
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the copyright holder nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/ffx_spd/LICENSE
-TYPE: LicenseType.mit
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2020 Advanced Micro Devices, Inc. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-ORIGIN: ../../../third_party/dart/runtime/third_party/double-conversion/LICENSE
-TYPE: LicenseType.bsd
-----------------------------------------------------------------------------------------------------
-Copyright 2006-2011, the V8 project authors.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google LLC nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-ORIGIN: ../../../third_party/harfbuzz/src/ms-use/COPYING
-TYPE: LicenseType.mit
-----------------------------------------------------------------------------------------------------
-MIT License
-
-Copyright (c) Microsoft Corporation.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE
-====================================================================================================
-
-====================================================================================================
-ORIGIN: ../../../third_party/angle/src/common/third_party/xxhash/LICENSE
-TYPE: LicenseType.bsd
-----------------------------------------------------------------------------------------------------
-xxHash Library
-Copyright (c) 2012-2014, Yann Collet
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice, this
-  list of conditions and the following disclaimer in the documentation and/or
-  other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-USED LICENSES:
-
-====================================================================================================
-LIBRARY: angle
-ORIGIN: ../../../third_party/angle/src/compiler/preprocessor/preprocessor_tab_autogen.cpp
-TYPE: LicenseType.bison
-FILE: ../../../third_party/angle/src/compiler/preprocessor/preprocessor_tab_autogen.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/glslang_tab_autogen.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/glslang_tab_autogen.h
-----------------------------------------------------------------------------------------------------
-<THIS BLOCK INTENTIONALLY LEFT BLANK>
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libpng
-ORIGIN: ../../../third_party/libpng/LICENSE
-TYPE: LicenseType.libpng
-FILE: ../../../third_party/libpng/pngprefix.h
-----------------------------------------------------------------------------------------------------
-<THIS BLOCK INTENTIONALLY LEFT BLANK>
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libpng
-ORIGIN: ../../../third_party/libpng/png.h
-TYPE: LicenseType.libpng
-FILE: ../../../third_party/libpng/arm/arm_init.c
-FILE: ../../../third_party/libpng/arm/filter_neon.S
-FILE: ../../../third_party/libpng/arm/filter_neon_intrinsics.c
-FILE: ../../../third_party/libpng/arm/palette_neon_intrinsics.c
-FILE: ../../../third_party/libpng/intel/filter_sse2_intrinsics.c
-FILE: ../../../third_party/libpng/intel/intel_init.c
-FILE: ../../../third_party/libpng/png.c
-FILE: ../../../third_party/libpng/pngconf.h
-FILE: ../../../third_party/libpng/pngdebug.h
-FILE: ../../../third_party/libpng/pngerror.c
-FILE: ../../../third_party/libpng/pngget.c
-FILE: ../../../third_party/libpng/pnginfo.h
-FILE: ../../../third_party/libpng/pnglibconf.h
-FILE: ../../../third_party/libpng/pngmem.c
-FILE: ../../../third_party/libpng/pngpread.c
-FILE: ../../../third_party/libpng/pngpriv.h
-FILE: ../../../third_party/libpng/pngread.c
-FILE: ../../../third_party/libpng/pngrio.c
-FILE: ../../../third_party/libpng/pngrtran.c
-FILE: ../../../third_party/libpng/pngrutil.c
-FILE: ../../../third_party/libpng/pngset.c
-FILE: ../../../third_party/libpng/pngstruct.h
-FILE: ../../../third_party/libpng/pngtest.c
-FILE: ../../../third_party/libpng/pngtrans.c
-FILE: ../../../third_party/libpng/pngwio.c
-FILE: ../../../third_party/libpng/pngwrite.c
-FILE: ../../../third_party/libpng/pngwtran.c
-FILE: ../../../third_party/libpng/pngwutil.c
-----------------------------------------------------------------------------------------------------
-<THIS BLOCK INTENTIONALLY LEFT BLANK>
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: null
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/boringssl/ios-aarch64/crypto/chacha/chacha-armv8.S
-FILE: ../../../third_party/boringssl/ios-aarch64/crypto/fipsmodule/aesv8-armx64.S
-FILE: ../../../third_party/boringssl/ios-aarch64/crypto/fipsmodule/armv8-mont.S
-FILE: ../../../third_party/boringssl/ios-aarch64/crypto/fipsmodule/ghash-neon-armv8.S
-FILE: ../../../third_party/boringssl/ios-aarch64/crypto/fipsmodule/ghashv8-armx64.S
-FILE: ../../../third_party/boringssl/ios-aarch64/crypto/fipsmodule/sha1-armv8.S
-FILE: ../../../third_party/boringssl/ios-aarch64/crypto/fipsmodule/vpaes-armv8.S
-FILE: ../../../third_party/boringssl/ios-arm/crypto/chacha/chacha-armv4.S
-FILE: ../../../third_party/boringssl/ios-arm/crypto/fipsmodule/aesv8-armx32.S
-FILE: ../../../third_party/boringssl/ios-arm/crypto/fipsmodule/armv4-mont.S
-FILE: ../../../third_party/boringssl/ios-arm/crypto/fipsmodule/ghash-armv4.S
-FILE: ../../../third_party/boringssl/ios-arm/crypto/fipsmodule/ghashv8-armx32.S
-FILE: ../../../third_party/boringssl/ios-arm/crypto/fipsmodule/sha1-armv4-large.S
-FILE: ../../../third_party/boringssl/ios-arm/crypto/fipsmodule/vpaes-armv7.S
-FILE: ../../../third_party/boringssl/linux-aarch64/crypto/chacha/chacha-armv8.S
-FILE: ../../../third_party/boringssl/linux-aarch64/crypto/fipsmodule/aesv8-armx64.S
-FILE: ../../../third_party/boringssl/linux-aarch64/crypto/fipsmodule/armv8-mont.S
-FILE: ../../../third_party/boringssl/linux-aarch64/crypto/fipsmodule/ghash-neon-armv8.S
-FILE: ../../../third_party/boringssl/linux-aarch64/crypto/fipsmodule/ghashv8-armx64.S
-FILE: ../../../third_party/boringssl/linux-aarch64/crypto/fipsmodule/sha1-armv8.S
-FILE: ../../../third_party/boringssl/linux-aarch64/crypto/fipsmodule/vpaes-armv8.S
-FILE: ../../../third_party/boringssl/linux-arm/crypto/chacha/chacha-armv4.S
-FILE: ../../../third_party/boringssl/linux-arm/crypto/fipsmodule/aesv8-armx32.S
-FILE: ../../../third_party/boringssl/linux-arm/crypto/fipsmodule/armv4-mont.S
-FILE: ../../../third_party/boringssl/linux-arm/crypto/fipsmodule/ghash-armv4.S
-FILE: ../../../third_party/boringssl/linux-arm/crypto/fipsmodule/ghashv8-armx32.S
-FILE: ../../../third_party/boringssl/linux-arm/crypto/fipsmodule/sha1-armv4-large.S
-FILE: ../../../third_party/boringssl/linux-arm/crypto/fipsmodule/vpaes-armv7.S
-FILE: ../../../third_party/boringssl/linux-ppc64le/crypto/fipsmodule/aesp8-ppc.S
-FILE: ../../../third_party/boringssl/linux-ppc64le/crypto/fipsmodule/ghashp8-ppc.S
-FILE: ../../../third_party/boringssl/linux-x86/crypto/chacha/chacha-x86.S
-FILE: ../../../third_party/boringssl/linux-x86/crypto/fipsmodule/aesni-x86.S
-FILE: ../../../third_party/boringssl/linux-x86/crypto/fipsmodule/bn-586.S
-FILE: ../../../third_party/boringssl/linux-x86/crypto/fipsmodule/co-586.S
-FILE: ../../../third_party/boringssl/linux-x86/crypto/fipsmodule/ghash-ssse3-x86.S
-FILE: ../../../third_party/boringssl/linux-x86/crypto/fipsmodule/ghash-x86.S
-FILE: ../../../third_party/boringssl/linux-x86/crypto/fipsmodule/md5-586.S
-FILE: ../../../third_party/boringssl/linux-x86/crypto/fipsmodule/sha1-586.S
-FILE: ../../../third_party/boringssl/linux-x86/crypto/fipsmodule/sha256-586.S
-FILE: ../../../third_party/boringssl/linux-x86/crypto/fipsmodule/sha512-586.S
-FILE: ../../../third_party/boringssl/linux-x86/crypto/fipsmodule/vpaes-x86.S
-FILE: ../../../third_party/boringssl/linux-x86/crypto/fipsmodule/x86-mont.S
-FILE: ../../../third_party/boringssl/linux-x86_64/crypto/chacha/chacha-x86_64.S
-FILE: ../../../third_party/boringssl/linux-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S
-FILE: ../../../third_party/boringssl/linux-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.S
-FILE: ../../../third_party/boringssl/linux-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S
-FILE: ../../../third_party/boringssl/linux-x86_64/crypto/fipsmodule/aesni-x86_64.S
-FILE: ../../../third_party/boringssl/linux-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.S
-FILE: ../../../third_party/boringssl/linux-x86_64/crypto/fipsmodule/ghash-x86_64.S
-FILE: ../../../third_party/boringssl/linux-x86_64/crypto/fipsmodule/md5-x86_64.S
-FILE: ../../../third_party/boringssl/linux-x86_64/crypto/fipsmodule/p256-x86_64-asm.S
-FILE: ../../../third_party/boringssl/linux-x86_64/crypto/fipsmodule/p256_beeu-x86_64-asm.S
-FILE: ../../../third_party/boringssl/linux-x86_64/crypto/fipsmodule/rdrand-x86_64.S
-FILE: ../../../third_party/boringssl/linux-x86_64/crypto/fipsmodule/rsaz-avx2.S
-FILE: ../../../third_party/boringssl/linux-x86_64/crypto/fipsmodule/sha1-x86_64.S
-FILE: ../../../third_party/boringssl/linux-x86_64/crypto/fipsmodule/sha256-x86_64.S
-FILE: ../../../third_party/boringssl/linux-x86_64/crypto/fipsmodule/sha512-x86_64.S
-FILE: ../../../third_party/boringssl/linux-x86_64/crypto/fipsmodule/vpaes-x86_64.S
-FILE: ../../../third_party/boringssl/linux-x86_64/crypto/fipsmodule/x86_64-mont.S
-FILE: ../../../third_party/boringssl/linux-x86_64/crypto/fipsmodule/x86_64-mont5.S
-FILE: ../../../third_party/boringssl/mac-x86/crypto/chacha/chacha-x86.S
-FILE: ../../../third_party/boringssl/mac-x86/crypto/fipsmodule/aesni-x86.S
-FILE: ../../../third_party/boringssl/mac-x86/crypto/fipsmodule/bn-586.S
-FILE: ../../../third_party/boringssl/mac-x86/crypto/fipsmodule/co-586.S
-FILE: ../../../third_party/boringssl/mac-x86/crypto/fipsmodule/ghash-ssse3-x86.S
-FILE: ../../../third_party/boringssl/mac-x86/crypto/fipsmodule/ghash-x86.S
-FILE: ../../../third_party/boringssl/mac-x86/crypto/fipsmodule/md5-586.S
-FILE: ../../../third_party/boringssl/mac-x86/crypto/fipsmodule/sha1-586.S
-FILE: ../../../third_party/boringssl/mac-x86/crypto/fipsmodule/sha256-586.S
-FILE: ../../../third_party/boringssl/mac-x86/crypto/fipsmodule/sha512-586.S
-FILE: ../../../third_party/boringssl/mac-x86/crypto/fipsmodule/vpaes-x86.S
-FILE: ../../../third_party/boringssl/mac-x86/crypto/fipsmodule/x86-mont.S
-FILE: ../../../third_party/boringssl/mac-x86_64/crypto/chacha/chacha-x86_64.S
-FILE: ../../../third_party/boringssl/mac-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S
-FILE: ../../../third_party/boringssl/mac-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.S
-FILE: ../../../third_party/boringssl/mac-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S
-FILE: ../../../third_party/boringssl/mac-x86_64/crypto/fipsmodule/aesni-x86_64.S
-FILE: ../../../third_party/boringssl/mac-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.S
-FILE: ../../../third_party/boringssl/mac-x86_64/crypto/fipsmodule/ghash-x86_64.S
-FILE: ../../../third_party/boringssl/mac-x86_64/crypto/fipsmodule/md5-x86_64.S
-FILE: ../../../third_party/boringssl/mac-x86_64/crypto/fipsmodule/p256-x86_64-asm.S
-FILE: ../../../third_party/boringssl/mac-x86_64/crypto/fipsmodule/p256_beeu-x86_64-asm.S
-FILE: ../../../third_party/boringssl/mac-x86_64/crypto/fipsmodule/rdrand-x86_64.S
-FILE: ../../../third_party/boringssl/mac-x86_64/crypto/fipsmodule/rsaz-avx2.S
-FILE: ../../../third_party/boringssl/mac-x86_64/crypto/fipsmodule/sha1-x86_64.S
-FILE: ../../../third_party/boringssl/mac-x86_64/crypto/fipsmodule/sha256-x86_64.S
-FILE: ../../../third_party/boringssl/mac-x86_64/crypto/fipsmodule/sha512-x86_64.S
-FILE: ../../../third_party/boringssl/mac-x86_64/crypto/fipsmodule/vpaes-x86_64.S
-FILE: ../../../third_party/boringssl/mac-x86_64/crypto/fipsmodule/x86_64-mont.S
-FILE: ../../../third_party/boringssl/mac-x86_64/crypto/fipsmodule/x86_64-mont5.S
-FILE: ../../../third_party/boringssl/win-aarch64/crypto/chacha/chacha-armv8.S
-FILE: ../../../third_party/boringssl/win-aarch64/crypto/fipsmodule/aesv8-armx64.S
-FILE: ../../../third_party/boringssl/win-aarch64/crypto/fipsmodule/armv8-mont.S
-FILE: ../../../third_party/boringssl/win-aarch64/crypto/fipsmodule/ghash-neon-armv8.S
-FILE: ../../../third_party/boringssl/win-aarch64/crypto/fipsmodule/ghashv8-armx64.S
-FILE: ../../../third_party/boringssl/win-aarch64/crypto/fipsmodule/sha1-armv8.S
-FILE: ../../../third_party/boringssl/win-aarch64/crypto/fipsmodule/vpaes-armv8.S
-FILE: ../../../third_party/boringssl/win-x86/crypto/chacha/chacha-x86.asm
-FILE: ../../../third_party/boringssl/win-x86/crypto/fipsmodule/aesni-x86.asm
-FILE: ../../../third_party/boringssl/win-x86/crypto/fipsmodule/bn-586.asm
-FILE: ../../../third_party/boringssl/win-x86/crypto/fipsmodule/co-586.asm
-FILE: ../../../third_party/boringssl/win-x86/crypto/fipsmodule/ghash-ssse3-x86.asm
-FILE: ../../../third_party/boringssl/win-x86/crypto/fipsmodule/ghash-x86.asm
-FILE: ../../../third_party/boringssl/win-x86/crypto/fipsmodule/md5-586.asm
-FILE: ../../../third_party/boringssl/win-x86/crypto/fipsmodule/sha1-586.asm
-FILE: ../../../third_party/boringssl/win-x86/crypto/fipsmodule/sha256-586.asm
-FILE: ../../../third_party/boringssl/win-x86/crypto/fipsmodule/sha512-586.asm
-FILE: ../../../third_party/boringssl/win-x86/crypto/fipsmodule/vpaes-x86.asm
-FILE: ../../../third_party/boringssl/win-x86/crypto/fipsmodule/x86-mont.asm
-FILE: ../../../third_party/boringssl/win-x86_64/crypto/chacha/chacha-x86_64.asm
-FILE: ../../../third_party/boringssl/win-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.asm
-FILE: ../../../third_party/boringssl/win-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.asm
-FILE: ../../../third_party/boringssl/win-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.asm
-FILE: ../../../third_party/boringssl/win-x86_64/crypto/fipsmodule/aesni-x86_64.asm
-FILE: ../../../third_party/boringssl/win-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.asm
-FILE: ../../../third_party/boringssl/win-x86_64/crypto/fipsmodule/ghash-x86_64.asm
-FILE: ../../../third_party/boringssl/win-x86_64/crypto/fipsmodule/md5-x86_64.asm
-FILE: ../../../third_party/boringssl/win-x86_64/crypto/fipsmodule/p256-x86_64-asm.asm
-FILE: ../../../third_party/boringssl/win-x86_64/crypto/fipsmodule/p256_beeu-x86_64-asm.asm
-FILE: ../../../third_party/boringssl/win-x86_64/crypto/fipsmodule/rdrand-x86_64.asm
-FILE: ../../../third_party/boringssl/win-x86_64/crypto/fipsmodule/rsaz-avx2.asm
-FILE: ../../../third_party/boringssl/win-x86_64/crypto/fipsmodule/sha1-x86_64.asm
-FILE: ../../../third_party/boringssl/win-x86_64/crypto/fipsmodule/sha256-x86_64.asm
-FILE: ../../../third_party/boringssl/win-x86_64/crypto/fipsmodule/sha512-x86_64.asm
-FILE: ../../../third_party/boringssl/win-x86_64/crypto/fipsmodule/vpaes-x86_64.asm
-FILE: ../../../third_party/boringssl/win-x86_64/crypto/fipsmodule/x86_64-mont.asm
-FILE: ../../../third_party/boringssl/win-x86_64/crypto/fipsmodule/x86_64-mont5.asm
-----------------------------------------------------------------------------------------------------
-<THIS BLOCK INTENTIONALLY LEFT BLANK>
-====================================================================================================
-
-====================================================================================================
-LIBRARY: smhasher
-ORIGIN: ../../../third_party/angle/src/common/third_party/smhasher/LICENSE
-TYPE: LicenseType.mit
-FILE: ../../../third_party/angle/src/common/third_party/smhasher/src/PMurHash.cpp
-FILE: ../../../third_party/angle/src/common/third_party/smhasher/src/PMurHash.h
-----------------------------------------------------------------------------------------------------
-All MurmurHash source files are placed in the public domain.
-
-The license below applies to all other code in SMHasher:
-
-Copyright (c) 2011 Google, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: flatbuffers
-ORIGIN: ../../../third_party/flatbuffers/dart/LICENSE
-TYPE: LicenseType.apache
-FILE: ../../../third_party/flatbuffers/dart/example/monster_my_game.sample_generated.dart
-FILE: ../../../third_party/flatbuffers/dart/lib/flat_buffers.dart
-FILE: ../../../third_party/flatbuffers/dart/lib/flex_buffers.dart
-FILE: ../../../third_party/flatbuffers/dart/lib/src/builder.dart
-FILE: ../../../third_party/flatbuffers/dart/lib/src/reference.dart
-FILE: ../../../third_party/flatbuffers/dart/lib/src/types.dart
-----------------------------------------------------------------------------------------------------
-Apache License
-Version 2.0, January 2004
-http://www.apache.org/licenses
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright 2014 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: abseil-cpp
-LIBRARY: angle
-LIBRARY: boringssl
-LIBRARY: expat
-LIBRARY: flatbuffers
-LIBRARY: fuchsia-vulkan
-LIBRARY: khronos
-LIBRARY: libwebp
-LIBRARY: pkg
-LIBRARY: vulkan-deps
-LIBRARY: wuffs
-ORIGIN: ../../../flutter/third_party/txt/LICENSE
-TYPE: LicenseType.apache
-FILE: ../../../third_party/abseil-cpp/BUILD.bazel
-FILE: ../../../third_party/abseil-cpp/CMake/install_test_project/simple.cc
-FILE: ../../../third_party/abseil-cpp/WORKSPACE
-FILE: ../../../third_party/abseil-cpp/absl/BUILD.bazel
-FILE: ../../../third_party/abseil-cpp/absl/algorithm/BUILD.bazel
-FILE: ../../../third_party/abseil-cpp/absl/algorithm/algorithm.h
-FILE: ../../../third_party/abseil-cpp/absl/algorithm/algorithm_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/algorithm/container.h
-FILE: ../../../third_party/abseil-cpp/absl/algorithm/container_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/algorithm/equal_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/BUILD.bazel
-FILE: ../../../third_party/abseil-cpp/absl/base/attributes.h
-FILE: ../../../third_party/abseil-cpp/absl/base/bit_cast_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/call_once.h
-FILE: ../../../third_party/abseil-cpp/absl/base/call_once_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/casts.h
-FILE: ../../../third_party/abseil-cpp/absl/base/config.h
-FILE: ../../../third_party/abseil-cpp/absl/base/config_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/const_init.h
-FILE: ../../../third_party/abseil-cpp/absl/base/dynamic_annotations.h
-FILE: ../../../third_party/abseil-cpp/absl/base/exception_safety_testing_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/inline_variable_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/inline_variable_test_a.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/inline_variable_test_b.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/atomic_hook.h
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/atomic_hook_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/atomic_hook_test_helper.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/atomic_hook_test_helper.h
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/cmake_thread_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/cycleclock.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/cycleclock.h
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/direct_mmap.h
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/endian.h
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/endian_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/errno_saver.h
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/errno_saver_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/exception_safety_testing.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/exception_safety_testing.h
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/exception_testing.h
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/fast_type_id.h
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/fast_type_id_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/hide_ptr.h
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/identity.h
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/inline_variable.h
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/inline_variable_testing.h
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/invoke.h
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/low_level_alloc.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/low_level_alloc.h
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/low_level_alloc_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/low_level_scheduling.h
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/per_thread_tls.h
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/prefetch.h
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/prefetch_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/pretty_function.h
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/raw_logging.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/raw_logging.h
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/scheduling_mode.h
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/scoped_set_env.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/scoped_set_env.h
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/scoped_set_env_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/spinlock.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/spinlock.h
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/spinlock_akaros.inc
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/spinlock_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/spinlock_linux.inc
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/spinlock_posix.inc
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/spinlock_wait.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/spinlock_wait.h
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/spinlock_win32.inc
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/strerror.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/strerror.h
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/strerror_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/strerror_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/sysinfo.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/sysinfo.h
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/sysinfo_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/thread_identity.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/thread_identity.h
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/thread_identity_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/thread_identity_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/throw_delegate.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/throw_delegate.h
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/tsan_mutex_interface.h
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/unaligned_access.h
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/unique_small_name_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
-FILE: ../../../third_party/abseil-cpp/absl/base/invoke_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/log_severity.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/log_severity.h
-FILE: ../../../third_party/abseil-cpp/absl/base/log_severity_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/macros.h
-FILE: ../../../third_party/abseil-cpp/absl/base/optimization.h
-FILE: ../../../third_party/abseil-cpp/absl/base/optimization_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/options.h
-FILE: ../../../third_party/abseil-cpp/absl/base/policy_checks.h
-FILE: ../../../third_party/abseil-cpp/absl/base/port.h
-FILE: ../../../third_party/abseil-cpp/absl/base/raw_logging_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/spinlock_test_common.cc
-FILE: ../../../third_party/abseil-cpp/absl/base/thread_annotations.h
-FILE: ../../../third_party/abseil-cpp/absl/base/throw_delegate_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/cleanup/BUILD.bazel
-FILE: ../../../third_party/abseil-cpp/absl/cleanup/cleanup.h
-FILE: ../../../third_party/abseil-cpp/absl/cleanup/cleanup_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/cleanup/internal/cleanup.h
-FILE: ../../../third_party/abseil-cpp/absl/container/BUILD.bazel
-FILE: ../../../third_party/abseil-cpp/absl/container/btree_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/container/btree_map.h
-FILE: ../../../third_party/abseil-cpp/absl/container/btree_set.h
-FILE: ../../../third_party/abseil-cpp/absl/container/btree_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/container/btree_test.h
-FILE: ../../../third_party/abseil-cpp/absl/container/fixed_array.h
-FILE: ../../../third_party/abseil-cpp/absl/container/fixed_array_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/container/fixed_array_exception_safety_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/container/fixed_array_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/container/flat_hash_map.h
-FILE: ../../../third_party/abseil-cpp/absl/container/flat_hash_map_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/container/flat_hash_set.h
-FILE: ../../../third_party/abseil-cpp/absl/container/flat_hash_set_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/container/inlined_vector.h
-FILE: ../../../third_party/abseil-cpp/absl/container/inlined_vector_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/container/inlined_vector_exception_safety_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/container/inlined_vector_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/btree.h
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/btree_container.h
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/common.h
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/compressed_tuple.h
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/compressed_tuple_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/container_memory.h
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/container_memory_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/counting_allocator.h
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/hash_function_defaults.h
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/hash_function_defaults_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/hash_generator_testing.cc
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/hash_generator_testing.h
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/hash_policy_testing.h
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/hash_policy_testing_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/hash_policy_traits.h
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/hash_policy_traits_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/hashtable_debug.h
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/hashtable_debug_hooks.h
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/hashtablez_sampler.cc
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/hashtablez_sampler.h
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/hashtablez_sampler_force_weak_definition.cc
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/hashtablez_sampler_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/inlined_vector.h
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/layout.h
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/layout_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/layout_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/node_slot_policy.h
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/node_slot_policy_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/raw_hash_map.h
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/raw_hash_set.cc
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/raw_hash_set.h
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/raw_hash_set_allocator_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/raw_hash_set_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/raw_hash_set_probe_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/raw_hash_set_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/test_instance_tracker.cc
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/test_instance_tracker.h
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/test_instance_tracker_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/tracked.h
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/unordered_map_constructor_test.h
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/unordered_map_lookup_test.h
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/unordered_map_members_test.h
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/unordered_map_modifiers_test.h
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/unordered_map_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/unordered_set_constructor_test.h
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/unordered_set_lookup_test.h
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/unordered_set_members_test.h
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/unordered_set_modifiers_test.h
-FILE: ../../../third_party/abseil-cpp/absl/container/internal/unordered_set_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/container/node_hash_map.h
-FILE: ../../../third_party/abseil-cpp/absl/container/node_hash_map_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/container/node_hash_set.h
-FILE: ../../../third_party/abseil-cpp/absl/container/node_hash_set_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/container/sample_element_size_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/debugging/BUILD.bazel
-FILE: ../../../third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc
-FILE: ../../../third_party/abseil-cpp/absl/debugging/failure_signal_handler.h
-FILE: ../../../third_party/abseil-cpp/absl/debugging/failure_signal_handler_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/debugging/internal/address_is_readable.cc
-FILE: ../../../third_party/abseil-cpp/absl/debugging/internal/address_is_readable.h
-FILE: ../../../third_party/abseil-cpp/absl/debugging/internal/demangle.cc
-FILE: ../../../third_party/abseil-cpp/absl/debugging/internal/demangle.h
-FILE: ../../../third_party/abseil-cpp/absl/debugging/internal/demangle_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc
-FILE: ../../../third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h
-FILE: ../../../third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc
-FILE: ../../../third_party/abseil-cpp/absl/debugging/internal/examine_stack.h
-FILE: ../../../third_party/abseil-cpp/absl/debugging/internal/stack_consumption.cc
-FILE: ../../../third_party/abseil-cpp/absl/debugging/internal/stack_consumption.h
-FILE: ../../../third_party/abseil-cpp/absl/debugging/internal/stack_consumption_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/debugging/internal/stacktrace_arm-inl.inc
-FILE: ../../../third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
-FILE: ../../../third_party/abseil-cpp/absl/debugging/internal/stacktrace_emscripten-inl.inc
-FILE: ../../../third_party/abseil-cpp/absl/debugging/internal/stacktrace_generic-inl.inc
-FILE: ../../../third_party/abseil-cpp/absl/debugging/internal/stacktrace_powerpc-inl.inc
-FILE: ../../../third_party/abseil-cpp/absl/debugging/internal/stacktrace_riscv-inl.inc
-FILE: ../../../third_party/abseil-cpp/absl/debugging/internal/stacktrace_win32-inl.inc
-FILE: ../../../third_party/abseil-cpp/absl/debugging/internal/stacktrace_x86-inl.inc
-FILE: ../../../third_party/abseil-cpp/absl/debugging/internal/symbolize.h
-FILE: ../../../third_party/abseil-cpp/absl/debugging/internal/vdso_support.cc
-FILE: ../../../third_party/abseil-cpp/absl/debugging/internal/vdso_support.h
-FILE: ../../../third_party/abseil-cpp/absl/debugging/leak_check.cc
-FILE: ../../../third_party/abseil-cpp/absl/debugging/leak_check.h
-FILE: ../../../third_party/abseil-cpp/absl/debugging/leak_check_fail_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/debugging/leak_check_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/debugging/stacktrace.cc
-FILE: ../../../third_party/abseil-cpp/absl/debugging/stacktrace.h
-FILE: ../../../third_party/abseil-cpp/absl/debugging/stacktrace_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/debugging/symbolize.cc
-FILE: ../../../third_party/abseil-cpp/absl/debugging/symbolize.h
-FILE: ../../../third_party/abseil-cpp/absl/debugging/symbolize_darwin.inc
-FILE: ../../../third_party/abseil-cpp/absl/debugging/symbolize_elf.inc
-FILE: ../../../third_party/abseil-cpp/absl/debugging/symbolize_emscripten.inc
-FILE: ../../../third_party/abseil-cpp/absl/debugging/symbolize_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/debugging/symbolize_unimplemented.inc
-FILE: ../../../third_party/abseil-cpp/absl/debugging/symbolize_win32.inc
-FILE: ../../../third_party/abseil-cpp/absl/flags/BUILD.bazel
-FILE: ../../../third_party/abseil-cpp/absl/flags/commandlineflag.cc
-FILE: ../../../third_party/abseil-cpp/absl/flags/commandlineflag.h
-FILE: ../../../third_party/abseil-cpp/absl/flags/commandlineflag_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/flags/config.h
-FILE: ../../../third_party/abseil-cpp/absl/flags/config_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/flags/declare.h
-FILE: ../../../third_party/abseil-cpp/absl/flags/flag.cc
-FILE: ../../../third_party/abseil-cpp/absl/flags/flag.h
-FILE: ../../../third_party/abseil-cpp/absl/flags/flag_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/flags/flag_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/flags/flag_test_defs.cc
-FILE: ../../../third_party/abseil-cpp/absl/flags/internal/commandlineflag.cc
-FILE: ../../../third_party/abseil-cpp/absl/flags/internal/commandlineflag.h
-FILE: ../../../third_party/abseil-cpp/absl/flags/internal/flag.cc
-FILE: ../../../third_party/abseil-cpp/absl/flags/internal/flag.h
-FILE: ../../../third_party/abseil-cpp/absl/flags/internal/flag_msvc.inc
-FILE: ../../../third_party/abseil-cpp/absl/flags/internal/parse.h
-FILE: ../../../third_party/abseil-cpp/absl/flags/internal/path_util.h
-FILE: ../../../third_party/abseil-cpp/absl/flags/internal/path_util_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/flags/internal/private_handle_accessor.cc
-FILE: ../../../third_party/abseil-cpp/absl/flags/internal/private_handle_accessor.h
-FILE: ../../../third_party/abseil-cpp/absl/flags/internal/program_name.cc
-FILE: ../../../third_party/abseil-cpp/absl/flags/internal/program_name.h
-FILE: ../../../third_party/abseil-cpp/absl/flags/internal/program_name_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/flags/internal/registry.h
-FILE: ../../../third_party/abseil-cpp/absl/flags/internal/sequence_lock.h
-FILE: ../../../third_party/abseil-cpp/absl/flags/internal/sequence_lock_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/flags/internal/usage.cc
-FILE: ../../../third_party/abseil-cpp/absl/flags/internal/usage.h
-FILE: ../../../third_party/abseil-cpp/absl/flags/internal/usage_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/flags/marshalling.cc
-FILE: ../../../third_party/abseil-cpp/absl/flags/marshalling.h
-FILE: ../../../third_party/abseil-cpp/absl/flags/marshalling_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/flags/parse.cc
-FILE: ../../../third_party/abseil-cpp/absl/flags/parse.h
-FILE: ../../../third_party/abseil-cpp/absl/flags/parse_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/flags/reflection.cc
-FILE: ../../../third_party/abseil-cpp/absl/flags/reflection.h
-FILE: ../../../third_party/abseil-cpp/absl/flags/reflection_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/flags/usage.cc
-FILE: ../../../third_party/abseil-cpp/absl/flags/usage.h
-FILE: ../../../third_party/abseil-cpp/absl/flags/usage_config.cc
-FILE: ../../../third_party/abseil-cpp/absl/flags/usage_config.h
-FILE: ../../../third_party/abseil-cpp/absl/flags/usage_config_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/functional/BUILD.bazel
-FILE: ../../../third_party/abseil-cpp/absl/functional/any_invocable.h
-FILE: ../../../third_party/abseil-cpp/absl/functional/any_invocable_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/functional/bind_front.h
-FILE: ../../../third_party/abseil-cpp/absl/functional/bind_front_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/functional/function_ref.h
-FILE: ../../../third_party/abseil-cpp/absl/functional/function_ref_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/functional/function_type_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/functional/internal/any_invocable.h
-FILE: ../../../third_party/abseil-cpp/absl/functional/internal/front_binder.h
-FILE: ../../../third_party/abseil-cpp/absl/functional/internal/function_ref.h
-FILE: ../../../third_party/abseil-cpp/absl/hash/BUILD.bazel
-FILE: ../../../third_party/abseil-cpp/absl/hash/hash.h
-FILE: ../../../third_party/abseil-cpp/absl/hash/hash_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/hash/hash_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/hash/hash_testing.h
-FILE: ../../../third_party/abseil-cpp/absl/hash/internal/city.cc
-FILE: ../../../third_party/abseil-cpp/absl/hash/internal/city.h
-FILE: ../../../third_party/abseil-cpp/absl/hash/internal/city_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/hash/internal/hash.cc
-FILE: ../../../third_party/abseil-cpp/absl/hash/internal/hash.h
-FILE: ../../../third_party/abseil-cpp/absl/hash/internal/low_level_hash.cc
-FILE: ../../../third_party/abseil-cpp/absl/hash/internal/low_level_hash.h
-FILE: ../../../third_party/abseil-cpp/absl/hash/internal/low_level_hash_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/hash/internal/print_hash_of.cc
-FILE: ../../../third_party/abseil-cpp/absl/hash/internal/spy_hash_state.h
-FILE: ../../../third_party/abseil-cpp/absl/memory/BUILD.bazel
-FILE: ../../../third_party/abseil-cpp/absl/memory/memory.h
-FILE: ../../../third_party/abseil-cpp/absl/memory/memory_exception_safety_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/memory/memory_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/meta/BUILD.bazel
-FILE: ../../../third_party/abseil-cpp/absl/meta/type_traits.h
-FILE: ../../../third_party/abseil-cpp/absl/meta/type_traits_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/numeric/BUILD.bazel
-FILE: ../../../third_party/abseil-cpp/absl/numeric/bits.h
-FILE: ../../../third_party/abseil-cpp/absl/numeric/bits_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/numeric/bits_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/numeric/int128.cc
-FILE: ../../../third_party/abseil-cpp/absl/numeric/int128.h
-FILE: ../../../third_party/abseil-cpp/absl/numeric/int128_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/numeric/int128_have_intrinsic.inc
-FILE: ../../../third_party/abseil-cpp/absl/numeric/int128_no_intrinsic.inc
-FILE: ../../../third_party/abseil-cpp/absl/numeric/int128_stream_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/numeric/int128_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/numeric/internal/bits.h
-FILE: ../../../third_party/abseil-cpp/absl/numeric/internal/representation.h
-FILE: ../../../third_party/abseil-cpp/absl/profiling/BUILD.bazel
-FILE: ../../../third_party/abseil-cpp/absl/profiling/internal/exponential_biased.cc
-FILE: ../../../third_party/abseil-cpp/absl/profiling/internal/exponential_biased.h
-FILE: ../../../third_party/abseil-cpp/absl/profiling/internal/exponential_biased_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/profiling/internal/periodic_sampler.cc
-FILE: ../../../third_party/abseil-cpp/absl/profiling/internal/periodic_sampler.h
-FILE: ../../../third_party/abseil-cpp/absl/profiling/internal/periodic_sampler_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/profiling/internal/periodic_sampler_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/profiling/internal/sample_recorder.h
-FILE: ../../../third_party/abseil-cpp/absl/profiling/internal/sample_recorder_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/BUILD.bazel
-FILE: ../../../third_party/abseil-cpp/absl/random/benchmarks.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/bernoulli_distribution.h
-FILE: ../../../third_party/abseil-cpp/absl/random/bernoulli_distribution_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/beta_distribution.h
-FILE: ../../../third_party/abseil-cpp/absl/random/beta_distribution_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/bit_gen_ref.h
-FILE: ../../../third_party/abseil-cpp/absl/random/bit_gen_ref_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/discrete_distribution.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/discrete_distribution.h
-FILE: ../../../third_party/abseil-cpp/absl/random/discrete_distribution_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/distributions.h
-FILE: ../../../third_party/abseil-cpp/absl/random/distributions_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/examples_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/exponential_distribution.h
-FILE: ../../../third_party/abseil-cpp/absl/random/exponential_distribution_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/gaussian_distribution.h
-FILE: ../../../third_party/abseil-cpp/absl/random/gaussian_distribution_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/generators_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/BUILD.bazel
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/chi_square.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/chi_square.h
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/chi_square_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/distribution_caller.h
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/distribution_test_util.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/distribution_test_util.h
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/distribution_test_util_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/explicit_seed_seq.h
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/explicit_seed_seq_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/fast_uniform_bits.h
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/fast_uniform_bits_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/fastmath.h
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/fastmath_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/gaussian_distribution_gentables.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/generate_real.h
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/generate_real_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/iostream_state_saver.h
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/iostream_state_saver_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/mock_helpers.h
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/mock_overload_set.h
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/nanobenchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/nanobenchmark.h
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/nanobenchmark_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/nonsecure_base.h
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/nonsecure_base_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/pcg_engine.h
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/pcg_engine_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/platform.h
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/pool_urbg.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/pool_urbg.h
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/pool_urbg_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/randen.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/randen.h
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/randen_benchmarks.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/randen_detect.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/randen_detect.h
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/randen_engine.h
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/randen_engine_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/randen_hwaes.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/randen_hwaes.h
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/randen_hwaes_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/randen_round_keys.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/randen_slow.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/randen_slow.h
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/randen_slow_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/randen_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/randen_traits.h
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/salted_seed_seq.h
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/salted_seed_seq_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/seed_material.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/seed_material.h
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/seed_material_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/sequence_urbg.h
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/traits.h
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/traits_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/uniform_helper.h
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/uniform_helper_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/wide_multiply.h
-FILE: ../../../third_party/abseil-cpp/absl/random/internal/wide_multiply_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/log_uniform_int_distribution.h
-FILE: ../../../third_party/abseil-cpp/absl/random/log_uniform_int_distribution_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/mock_distributions.h
-FILE: ../../../third_party/abseil-cpp/absl/random/mock_distributions_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/mocking_bit_gen.h
-FILE: ../../../third_party/abseil-cpp/absl/random/mocking_bit_gen_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/poisson_distribution.h
-FILE: ../../../third_party/abseil-cpp/absl/random/poisson_distribution_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/random.h
-FILE: ../../../third_party/abseil-cpp/absl/random/seed_gen_exception.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/seed_gen_exception.h
-FILE: ../../../third_party/abseil-cpp/absl/random/seed_sequences.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/seed_sequences.h
-FILE: ../../../third_party/abseil-cpp/absl/random/seed_sequences_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/uniform_int_distribution.h
-FILE: ../../../third_party/abseil-cpp/absl/random/uniform_int_distribution_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/uniform_real_distribution.h
-FILE: ../../../third_party/abseil-cpp/absl/random/uniform_real_distribution_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/random/zipf_distribution.h
-FILE: ../../../third_party/abseil-cpp/absl/random/zipf_distribution_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/status/BUILD.bazel
-FILE: ../../../third_party/abseil-cpp/absl/status/internal/status_internal.h
-FILE: ../../../third_party/abseil-cpp/absl/status/internal/statusor_internal.h
-FILE: ../../../third_party/abseil-cpp/absl/status/status.cc
-FILE: ../../../third_party/abseil-cpp/absl/status/status.h
-FILE: ../../../third_party/abseil-cpp/absl/status/status_payload_printer.cc
-FILE: ../../../third_party/abseil-cpp/absl/status/status_payload_printer.h
-FILE: ../../../third_party/abseil-cpp/absl/status/status_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/status/statusor.cc
-FILE: ../../../third_party/abseil-cpp/absl/status/statusor.h
-FILE: ../../../third_party/abseil-cpp/absl/status/statusor_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/BUILD.bazel
-FILE: ../../../third_party/abseil-cpp/absl/strings/ascii.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/ascii.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/ascii_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/ascii_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/charconv.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/charconv.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/charconv_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/charconv_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/cord.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/cord.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/cord_analysis.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/cord_analysis.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/cord_buffer.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/cord_buffer.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/cord_buffer_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/cord_ring_reader_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/cord_ring_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/cord_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/cord_test_helpers.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/cordz_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/cordz_test_helpers.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/escaping.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/escaping.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/escaping_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/escaping_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/char_map.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/char_map_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/char_map_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/charconv_bigint.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/charconv_bigint.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/charconv_bigint_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/charconv_parse.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/charconv_parse.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/charconv_parse_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cord_data_edge.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cord_data_edge_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cord_internal.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cord_internal.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cord_rep_btree.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cord_rep_btree.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_navigator.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_navigator.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_navigator_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_reader.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_reader.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_reader_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cord_rep_consume.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cord_rep_consume.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cord_rep_crc_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cord_rep_flat.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cord_rep_ring_reader.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cord_rep_test_util.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cordz_functions.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cordz_functions.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cordz_functions_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cordz_handle.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cordz_handle.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cordz_handle_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cordz_info.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cordz_info.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cordz_info_statistics_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cordz_info_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cordz_sample_token.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cordz_sample_token.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cordz_sample_token_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cordz_statistics.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cordz_update_scope.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cordz_update_scope_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cordz_update_tracker.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/cordz_update_tracker_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/escaping.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/escaping.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/escaping_test_common.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/memutil.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/memutil.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/memutil_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/memutil_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/numbers_test_common.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/ostringstream.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/ostringstream.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/ostringstream_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/ostringstream_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/pow10_helper.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/pow10_helper.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/pow10_helper_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/resize_uninitialized.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/resize_uninitialized_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/stl_type_traits.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/str_format/arg.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/str_format/arg.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/str_format/arg_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/str_format/bind.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/str_format/bind.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/str_format/bind_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/str_format/checker.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/str_format/checker_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/str_format/convert_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/str_format/extension.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/str_format/extension.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/str_format/extension_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/str_format/float_conversion.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/str_format/float_conversion.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/str_format/output.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/str_format/output.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/str_format/output_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/str_format/parser.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/str_format/parser.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/str_format/parser_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/str_join_internal.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/str_split_internal.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/string_constant.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/string_constant_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/utf8.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/utf8.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/internal/utf8_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/match.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/match.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/match_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/numbers.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/numbers.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/numbers_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/numbers_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/str_cat.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/str_cat.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/str_cat_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/str_cat_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/str_format.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/str_format_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/str_join.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/str_join_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/str_join_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/str_replace.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/str_replace.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/str_replace_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/str_replace_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/str_split.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/str_split.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/str_split_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/str_split_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/string_view.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/string_view.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/string_view_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/string_view_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/strip.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/strip_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/substitute.cc
-FILE: ../../../third_party/abseil-cpp/absl/strings/substitute.h
-FILE: ../../../third_party/abseil-cpp/absl/strings/substitute_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/synchronization/BUILD.bazel
-FILE: ../../../third_party/abseil-cpp/absl/synchronization/barrier.cc
-FILE: ../../../third_party/abseil-cpp/absl/synchronization/barrier.h
-FILE: ../../../third_party/abseil-cpp/absl/synchronization/barrier_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/synchronization/blocking_counter.cc
-FILE: ../../../third_party/abseil-cpp/absl/synchronization/blocking_counter.h
-FILE: ../../../third_party/abseil-cpp/absl/synchronization/blocking_counter_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/synchronization/blocking_counter_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/synchronization/internal/create_thread_identity.cc
-FILE: ../../../third_party/abseil-cpp/absl/synchronization/internal/create_thread_identity.h
-FILE: ../../../third_party/abseil-cpp/absl/synchronization/internal/futex.h
-FILE: ../../../third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc
-FILE: ../../../third_party/abseil-cpp/absl/synchronization/internal/graphcycles.h
-FILE: ../../../third_party/abseil-cpp/absl/synchronization/internal/graphcycles_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/synchronization/internal/graphcycles_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/synchronization/internal/kernel_timeout.h
-FILE: ../../../third_party/abseil-cpp/absl/synchronization/internal/per_thread_sem.cc
-FILE: ../../../third_party/abseil-cpp/absl/synchronization/internal/per_thread_sem.h
-FILE: ../../../third_party/abseil-cpp/absl/synchronization/internal/per_thread_sem_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/synchronization/internal/thread_pool.h
-FILE: ../../../third_party/abseil-cpp/absl/synchronization/internal/waiter.cc
-FILE: ../../../third_party/abseil-cpp/absl/synchronization/internal/waiter.h
-FILE: ../../../third_party/abseil-cpp/absl/synchronization/lifetime_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/synchronization/mutex.cc
-FILE: ../../../third_party/abseil-cpp/absl/synchronization/mutex.h
-FILE: ../../../third_party/abseil-cpp/absl/synchronization/mutex_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/synchronization/mutex_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/synchronization/notification.cc
-FILE: ../../../third_party/abseil-cpp/absl/synchronization/notification.h
-FILE: ../../../third_party/abseil-cpp/absl/synchronization/notification_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/time/BUILD.bazel
-FILE: ../../../third_party/abseil-cpp/absl/time/civil_time.cc
-FILE: ../../../third_party/abseil-cpp/absl/time/civil_time.h
-FILE: ../../../third_party/abseil-cpp/absl/time/civil_time_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/time/civil_time_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/time/clock.cc
-FILE: ../../../third_party/abseil-cpp/absl/time/clock.h
-FILE: ../../../third_party/abseil-cpp/absl/time/clock_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/time/clock_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/time/duration.cc
-FILE: ../../../third_party/abseil-cpp/absl/time/duration_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/time/duration_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/time/format.cc
-FILE: ../../../third_party/abseil-cpp/absl/time/format_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/time/format_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/time/internal/cctz/BUILD.bazel
-FILE: ../../../third_party/abseil-cpp/absl/time/internal/cctz/include/cctz/civil_time.h
-FILE: ../../../third_party/abseil-cpp/absl/time/internal/cctz/include/cctz/civil_time_detail.h
-FILE: ../../../third_party/abseil-cpp/absl/time/internal/cctz/include/cctz/time_zone.h
-FILE: ../../../third_party/abseil-cpp/absl/time/internal/cctz/include/cctz/zone_info_source.h
-FILE: ../../../third_party/abseil-cpp/absl/time/internal/cctz/src/cctz_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/time/internal/cctz/src/civil_time_detail.cc
-FILE: ../../../third_party/abseil-cpp/absl/time/internal/cctz/src/civil_time_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_fixed.cc
-FILE: ../../../third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_fixed.h
-FILE: ../../../third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc
-FILE: ../../../third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_if.cc
-FILE: ../../../third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_if.h
-FILE: ../../../third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_impl.cc
-FILE: ../../../third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_impl.h
-FILE: ../../../third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_info.cc
-FILE: ../../../third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_info.h
-FILE: ../../../third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_libc.cc
-FILE: ../../../third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_libc.h
-FILE: ../../../third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_lookup.cc
-FILE: ../../../third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_lookup_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_posix.cc
-FILE: ../../../third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_posix.h
-FILE: ../../../third_party/abseil-cpp/absl/time/internal/cctz/src/zone_info_source.cc
-FILE: ../../../third_party/abseil-cpp/absl/time/internal/get_current_time_chrono.inc
-FILE: ../../../third_party/abseil-cpp/absl/time/internal/test_util.cc
-FILE: ../../../third_party/abseil-cpp/absl/time/internal/test_util.h
-FILE: ../../../third_party/abseil-cpp/absl/time/time.cc
-FILE: ../../../third_party/abseil-cpp/absl/time/time.h
-FILE: ../../../third_party/abseil-cpp/absl/time/time_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/time/time_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/time/time_zone_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/types/BUILD.bazel
-FILE: ../../../third_party/abseil-cpp/absl/types/any.h
-FILE: ../../../third_party/abseil-cpp/absl/types/any_exception_safety_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/types/any_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/types/bad_any_cast.cc
-FILE: ../../../third_party/abseil-cpp/absl/types/bad_any_cast.h
-FILE: ../../../third_party/abseil-cpp/absl/types/bad_optional_access.cc
-FILE: ../../../third_party/abseil-cpp/absl/types/bad_optional_access.h
-FILE: ../../../third_party/abseil-cpp/absl/types/bad_variant_access.cc
-FILE: ../../../third_party/abseil-cpp/absl/types/bad_variant_access.h
-FILE: ../../../third_party/abseil-cpp/absl/types/compare.h
-FILE: ../../../third_party/abseil-cpp/absl/types/compare_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/types/internal/conformance_aliases.h
-FILE: ../../../third_party/abseil-cpp/absl/types/internal/conformance_archetype.h
-FILE: ../../../third_party/abseil-cpp/absl/types/internal/conformance_profile.h
-FILE: ../../../third_party/abseil-cpp/absl/types/internal/conformance_testing.h
-FILE: ../../../third_party/abseil-cpp/absl/types/internal/conformance_testing_helpers.h
-FILE: ../../../third_party/abseil-cpp/absl/types/internal/conformance_testing_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/types/internal/optional.h
-FILE: ../../../third_party/abseil-cpp/absl/types/internal/parentheses.h
-FILE: ../../../third_party/abseil-cpp/absl/types/internal/span.h
-FILE: ../../../third_party/abseil-cpp/absl/types/internal/transform_args.h
-FILE: ../../../third_party/abseil-cpp/absl/types/internal/variant.h
-FILE: ../../../third_party/abseil-cpp/absl/types/optional.h
-FILE: ../../../third_party/abseil-cpp/absl/types/optional_exception_safety_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/types/optional_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/types/span.h
-FILE: ../../../third_party/abseil-cpp/absl/types/span_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/types/variant.h
-FILE: ../../../third_party/abseil-cpp/absl/types/variant_benchmark.cc
-FILE: ../../../third_party/abseil-cpp/absl/types/variant_exception_safety_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/types/variant_test.cc
-FILE: ../../../third_party/abseil-cpp/absl/utility/BUILD.bazel
-FILE: ../../../third_party/abseil-cpp/absl/utility/utility.h
-FILE: ../../../third_party/abseil-cpp/absl/utility/utility_test.cc
-FILE: ../../../third_party/abseil-cpp/ci/absl_alternate_options.h
-FILE: ../../../third_party/angle/include/CL/cl.h
-FILE: ../../../third_party/angle/include/CL/cl_d3d10.h
-FILE: ../../../third_party/angle/include/CL/cl_d3d11.h
-FILE: ../../../third_party/angle/include/CL/cl_dx9_media_sharing.h
-FILE: ../../../third_party/angle/include/CL/cl_dx9_media_sharing_intel.h
-FILE: ../../../third_party/angle/include/CL/cl_egl.h
-FILE: ../../../third_party/angle/include/CL/cl_ext.h
-FILE: ../../../third_party/angle/include/CL/cl_ext_intel.h
-FILE: ../../../third_party/angle/include/CL/cl_gl.h
-FILE: ../../../third_party/angle/include/CL/cl_gl_ext.h
-FILE: ../../../third_party/angle/include/CL/cl_half.h
-FILE: ../../../third_party/angle/include/CL/cl_icd.h
-FILE: ../../../third_party/angle/include/CL/cl_layer.h
-FILE: ../../../third_party/angle/include/CL/cl_platform.h
-FILE: ../../../third_party/angle/include/CL/cl_va_api_media_sharing_intel.h
-FILE: ../../../third_party/angle/include/CL/cl_version.h
-FILE: ../../../third_party/angle/include/CL/opencl.h
-FILE: ../../../third_party/angle/include/EGL/egl.h
-FILE: ../../../third_party/angle/include/EGL/eglext.h
-FILE: ../../../third_party/angle/include/EGL/eglplatform.h
-FILE: ../../../third_party/angle/include/GLES/egl.h
-FILE: ../../../third_party/angle/include/GLES/glplatform.h
-FILE: ../../../third_party/angle/include/GLES2/gl2platform.h
-FILE: ../../../third_party/angle/include/GLES3/gl3platform.h
-FILE: ../../../third_party/angle/scripts/gl.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/layout/fragment.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-af/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-am/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-ar/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-as/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-az/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-b+sr+Latn/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-be/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-bg/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-bn/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-bs/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-ca/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-cs/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-da/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-de/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-el/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-en-rAU/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-en-rCA/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-en-rGB/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-en-rIN/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-en-rXC/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-es-rUS/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-es/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-et/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-eu/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-fa/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-fi/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-fr-rCA/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-fr/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-gl/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-gu/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-hi/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-hr/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-hu/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-hy/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-in/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-is/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-it/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-iw/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-ja/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-ka/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-kk/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-km/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-kn/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-ko/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-ky/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-lo/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-lt/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-lv/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-mk/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-ml/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-mn/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-mr/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-ms/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-my/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-nb/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-ne/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-nl/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-or/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-pa/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-pl/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-pt-rPT/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-pt/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-ro/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-ru/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-si/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-sk/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-sl/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-sq/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-sr/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-sv/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-sw/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-ta/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-te/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-th/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-tl/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-tr/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-uk/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-ur/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-uz/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-vi/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-zh-rCN/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-zh-rHK/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-zh-rTW/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-zu/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values/dimens.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values/drivers.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values/global_settings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values/intents.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values/preference_keys.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/values/strings.xml
-FILE: ../../../third_party/angle/src/android_system_settings/res/xml/main.xml
-FILE: ../../../third_party/angle/src/android_system_settings/src/com/android/angle/AndroidManifest.xml
-FILE: ../../../third_party/angle/src/android_system_settings/src/com/android/angle/EmptyMainActivity.java
-FILE: ../../../third_party/angle/src/android_system_settings/src/com/android/angle/MainActivity.java
-FILE: ../../../third_party/angle/src/android_system_settings/src/com/android/angle/common/GlobalSettings.java
-FILE: ../../../third_party/angle/src/android_system_settings/src/com/android/angle/common/MainFragment.java
-FILE: ../../../third_party/angle/src/android_system_settings/src/com/android/angle/common/Receiver.java
-FILE: ../../../third_party/angle/src/android_system_settings/src/com/android/angle/common/SearchProvider.java
-FILE: ../../../third_party/angle/src/common/vulkan/vk_google_filtering_precision.h
-FILE: ../../../third_party/angle/util/android/third_party/android_native_app_glue.c
-FILE: ../../../third_party/angle/util/android/third_party/android_native_app_glue.h
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/METADATA
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/aead_aes_siv_cmac_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/aegis128L_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/aegis128_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/aegis256_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/aes_cbc_pkcs5_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/aes_ccm_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/aes_cmac_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/aes_eax_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/aes_gcm_siv_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/aes_gcm_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/aes_siv_cmac_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/chacha20_poly1305_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/dsa_2048_224_sha224_p1363_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/dsa_2048_224_sha224_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/dsa_2048_224_sha256_p1363_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/dsa_2048_224_sha256_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/dsa_2048_256_sha256_p1363_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/dsa_2048_256_sha256_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/dsa_3072_256_sha256_p1363_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/dsa_3072_256_sha256_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/dsa_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_brainpoolP224r1_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_brainpoolP256r1_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_brainpoolP320r1_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_brainpoolP384r1_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_brainpoolP512r1_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_secp224r1_ecpoint_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_secp224r1_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_secp256k1_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_secp256r1_ecpoint_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_secp256r1_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_secp384r1_ecpoint_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_secp384r1_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_secp521r1_ecpoint_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_secp521r1_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdh_webcrypto_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_brainpoolP224r1_sha224_p1363_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_brainpoolP224r1_sha224_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_brainpoolP256r1_sha256_p1363_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_brainpoolP256r1_sha256_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_brainpoolP320r1_sha384_p1363_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_brainpoolP320r1_sha384_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_brainpoolP384r1_sha384_p1363_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_brainpoolP384r1_sha384_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_brainpoolP512r1_sha512_p1363_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_brainpoolP512r1_sha512_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp224r1_sha224_p1363_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp224r1_sha224_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp224r1_sha256_p1363_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp224r1_sha256_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp224r1_sha3_224_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp224r1_sha3_256_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp224r1_sha3_512_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp224r1_sha512_p1363_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp224r1_sha512_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp256k1_sha256_p1363_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp256k1_sha256_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp256k1_sha3_256_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp256k1_sha3_512_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp256k1_sha512_p1363_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp256k1_sha512_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp256r1_sha256_p1363_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp256r1_sha256_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp256r1_sha3_256_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp256r1_sha3_512_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp256r1_sha512_p1363_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp256r1_sha512_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp384r1_sha384_p1363_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp384r1_sha384_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp384r1_sha3_384_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp384r1_sha3_512_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp384r1_sha512_p1363_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp384r1_sha512_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp521r1_sha3_512_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp521r1_sha512_p1363_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_secp521r1_sha512_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ecdsa_webcrypto_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/ed448_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/eddsa_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/gmac_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/hkdf_sha1_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/hkdf_sha256_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/hkdf_sha384_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/hkdf_sha512_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/hmac_sha1_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/hmac_sha224_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/hmac_sha256_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/hmac_sha384_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/hmac_sha3_224_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/hmac_sha3_256_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/hmac_sha3_384_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/hmac_sha3_512_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/hmac_sha512_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/kw_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/kwp_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/primality_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha1_mgf1sha1_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha224_mgf1sha1_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha224_mgf1sha224_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha256_mgf1sha1_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha256_mgf1sha256_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha384_mgf1sha1_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha384_mgf1sha384_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha512_mgf1sha1_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_2048_sha512_mgf1sha512_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_3072_sha256_mgf1sha1_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_3072_sha256_mgf1sha256_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_3072_sha512_mgf1sha1_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_3072_sha512_mgf1sha512_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_4096_sha256_mgf1sha1_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_4096_sha256_mgf1sha256_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_4096_sha512_mgf1sha1_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_4096_sha512_mgf1sha512_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_oaep_misc_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_pkcs1_2048_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_pkcs1_3072_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_pkcs1_4096_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_pss_2048_sha1_mgf1_20_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_pss_2048_sha256_mgf1_0_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_pss_2048_sha256_mgf1_32_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_pss_2048_sha512_256_mgf1_28_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_pss_2048_sha512_256_mgf1_32_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_pss_3072_sha256_mgf1_32_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_pss_4096_sha256_mgf1_32_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_pss_4096_sha512_mgf1_32_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_pss_misc_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_sig_gen_misc_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_2048_sha224_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_2048_sha256_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_2048_sha384_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_2048_sha3_224_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_2048_sha3_256_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_2048_sha3_384_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_2048_sha3_512_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_2048_sha512_224_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_2048_sha512_256_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_2048_sha512_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_3072_sha256_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_3072_sha384_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_3072_sha3_256_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_3072_sha3_384_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_3072_sha3_512_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_3072_sha512_256_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_3072_sha512_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_4096_sha384_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_4096_sha512_256_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_4096_sha512_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/rsa_signature_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/vmac_128_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/vmac_64_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/x25519_asn_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/x25519_jwk_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/x25519_pem_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/x25519_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/x448_asn_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/x448_jwk_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/x448_pem_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/x448_test.json
-FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/xchacha20_poly1305_test.json
-FILE: ../../../third_party/expat/expat/fuzz/xml_parse_fuzzer.c
-FILE: ../../../third_party/expat/expat/fuzz/xml_parsebuffer_fuzzer.c
-FILE: ../../../third_party/flatbuffers/.bazelci/presubmit.yml
-FILE: ../../../third_party/flatbuffers/.editorconfig
-FILE: ../../../third_party/flatbuffers/.eslintrc.js
-FILE: ../../../third_party/flatbuffers/BUILD.bazel
-FILE: ../../../third_party/flatbuffers/CMake/CMakeLists_legacy.cmake.in
-FILE: ../../../third_party/flatbuffers/CMake/FlatbuffersConfigVersion.cmake.in
-FILE: ../../../third_party/flatbuffers/CMake/flatbuffers.pc.in
-FILE: ../../../third_party/flatbuffers/WORKSPACE
-FILE: ../../../third_party/flatbuffers/android/AndroidManifest.xml
-FILE: ../../../third_party/flatbuffers/android/app/proguard-rules.pro
-FILE: ../../../third_party/flatbuffers/android/app/src/main/AndroidManifest.xml
-FILE: ../../../third_party/flatbuffers/android/app/src/main/cpp/animals.cpp
-FILE: ../../../third_party/flatbuffers/android/app/src/main/cpp/generated/animal_generated.h
-FILE: ../../../third_party/flatbuffers/android/app/src/main/fbs/animal.fbs
-FILE: ../../../third_party/flatbuffers/android/app/src/main/java/com/flatbuffers/app/MainActivity.kt
-FILE: ../../../third_party/flatbuffers/android/app/src/main/java/generated/com/fbs/app/Animal.kt
-FILE: ../../../third_party/flatbuffers/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
-FILE: ../../../third_party/flatbuffers/android/app/src/main/res/drawable/ic_launcher_background.xml
-FILE: ../../../third_party/flatbuffers/android/app/src/main/res/layout/activity_main.xml
-FILE: ../../../third_party/flatbuffers/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
-FILE: ../../../third_party/flatbuffers/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
-FILE: ../../../third_party/flatbuffers/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
-FILE: ../../../third_party/flatbuffers/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
-FILE: ../../../third_party/flatbuffers/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
-FILE: ../../../third_party/flatbuffers/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
-FILE: ../../../third_party/flatbuffers/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
-FILE: ../../../third_party/flatbuffers/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
-FILE: ../../../third_party/flatbuffers/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
-FILE: ../../../third_party/flatbuffers/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
-FILE: ../../../third_party/flatbuffers/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
-FILE: ../../../third_party/flatbuffers/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
-FILE: ../../../third_party/flatbuffers/android/app/src/main/res/values/colors.xml
-FILE: ../../../third_party/flatbuffers/android/app/src/main/res/values/strings.xml
-FILE: ../../../third_party/flatbuffers/android/app/src/main/res/values/styles.xml
-FILE: ../../../third_party/flatbuffers/android/gradle.properties
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/META-INF/MANIFEST.MF
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/gradle-wrapper-classpath.properties
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/AbstractCommandLineConverter.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/AbstractPropertiesCommandLineConverter.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineArgumentException.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineConverter.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineOption.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$1.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$AfterFirstSubCommand.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$AfterOptions.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$BeforeFirstSubCommand.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$CaseInsensitiveStringComparator.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$KnownOptionParserState.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$MissingOptionArgState.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$OptionAwareParserState.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$OptionComparator.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$OptionParserState.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$OptionString.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$OptionStringComparator.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$ParserState.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$UnknownOptionParserState.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/ParsedCommandLine.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/ParsedCommandLineOption.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/ProjectPropertiesCommandLineConverter.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/SystemPropertiesCommandLineConverter.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/BootstrapMainStarter$1.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/BootstrapMainStarter.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/Download$1.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/Download$DefaultDownloadProgressListener.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/Download$ProxyAuthenticator.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/Download.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/DownloadProgressListener.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/ExclusiveFileAccessManager.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/GradleUserHomeLookup.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/GradleWrapperMain.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/IDownload.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/Install$1.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/Install$InstallCheck.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/Install.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/Logger.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/PathAssembler$LocalDistribution.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/PathAssembler.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/SystemPropertiesHandler.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/WrapperConfiguration.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/WrapperExecutor.class
-FILE: ../../../third_party/flatbuffers/android/gradle/wrapper/gradle-wrapper.properties
-FILE: ../../../third_party/flatbuffers/android/gradlew
-FILE: ../../../third_party/flatbuffers/benchmarks/cpp/bench.h
-FILE: ../../../third_party/flatbuffers/benchmarks/cpp/benchmark_main.cpp
-FILE: ../../../third_party/flatbuffers/benchmarks/cpp/flatbuffers/bench.fbs
-FILE: ../../../third_party/flatbuffers/benchmarks/cpp/flatbuffers/bench_generated.h
-FILE: ../../../third_party/flatbuffers/benchmarks/cpp/flatbuffers/fb_bench.cpp
-FILE: ../../../third_party/flatbuffers/benchmarks/cpp/flatbuffers/fb_bench.h
-FILE: ../../../third_party/flatbuffers/benchmarks/cpp/raw/raw_bench.cpp
-FILE: ../../../third_party/flatbuffers/benchmarks/cpp/raw/raw_bench.h
-FILE: ../../../third_party/flatbuffers/build_defs.bzl
-FILE: ../../../third_party/flatbuffers/composer.json
-FILE: ../../../third_party/flatbuffers/conan/test_package/test_package.cpp
-FILE: ../../../third_party/flatbuffers/dart/example/example.dart
-FILE: ../../../third_party/flatbuffers/docs/footer.html
-FILE: ../../../third_party/flatbuffers/docs/header.html
-FILE: ../../../third_party/flatbuffers/docs/images/fpl_logo_small.png
-FILE: ../../../third_party/flatbuffers/docs/images/ftv2mnode.png
-FILE: ../../../third_party/flatbuffers/docs/images/ftv2pnode.png
-FILE: ../../../third_party/flatbuffers/docs/source/doxygen_layout.xml
-FILE: ../../../third_party/flatbuffers/docs/source/groups
-FILE: ../../../third_party/flatbuffers/go/BUILD.bazel
-FILE: ../../../third_party/flatbuffers/go/builder.go
-FILE: ../../../third_party/flatbuffers/go/doc.go
-FILE: ../../../third_party/flatbuffers/go/encode.go
-FILE: ../../../third_party/flatbuffers/go/grpc.go
-FILE: ../../../third_party/flatbuffers/go/lib.go
-FILE: ../../../third_party/flatbuffers/go/sizes.go
-FILE: ../../../third_party/flatbuffers/go/struct.go
-FILE: ../../../third_party/flatbuffers/go/table.go
-FILE: ../../../third_party/flatbuffers/grpc/boringssl.patch
-FILE: ../../../third_party/flatbuffers/grpc/examples/go/greeter/client/go.mod
-FILE: ../../../third_party/flatbuffers/grpc/examples/go/greeter/client/main.go
-FILE: ../../../third_party/flatbuffers/grpc/examples/go/greeter/models/Greeter_grpc.go
-FILE: ../../../third_party/flatbuffers/grpc/examples/go/greeter/models/HelloReply.go
-FILE: ../../../third_party/flatbuffers/grpc/examples/go/greeter/models/HelloRequest.go
-FILE: ../../../third_party/flatbuffers/grpc/examples/go/greeter/models/go.mod
-FILE: ../../../third_party/flatbuffers/grpc/examples/go/greeter/server/go.mod
-FILE: ../../../third_party/flatbuffers/grpc/examples/go/greeter/server/main.go
-FILE: ../../../third_party/flatbuffers/grpc/examples/greeter.fbs
-FILE: ../../../third_party/flatbuffers/grpc/examples/swift/Greeter/Package.swift
-FILE: ../../../third_party/flatbuffers/grpc/examples/swift/Greeter/Sources/Model/greeter.grpc.swift
-FILE: ../../../third_party/flatbuffers/grpc/examples/swift/Greeter/Sources/Model/greeter_generated.swift
-FILE: ../../../third_party/flatbuffers/grpc/examples/swift/Greeter/Sources/client/main.swift
-FILE: ../../../third_party/flatbuffers/grpc/examples/swift/Greeter/Sources/server/main.swift
-FILE: ../../../third_party/flatbuffers/grpc/examples/ts/greeter/package.json
-FILE: ../../../third_party/flatbuffers/grpc/examples/ts/greeter/src/client.ts
-FILE: ../../../third_party/flatbuffers/grpc/examples/ts/greeter/src/greeter.ts
-FILE: ../../../third_party/flatbuffers/grpc/examples/ts/greeter/src/greeter_grpc.d.ts
-FILE: ../../../third_party/flatbuffers/grpc/examples/ts/greeter/src/greeter_grpc.js
-FILE: ../../../third_party/flatbuffers/grpc/examples/ts/greeter/src/models/hello-reply.ts
-FILE: ../../../third_party/flatbuffers/grpc/examples/ts/greeter/src/models/hello-request.ts
-FILE: ../../../third_party/flatbuffers/grpc/examples/ts/greeter/src/server.ts
-FILE: ../../../third_party/flatbuffers/grpc/examples/ts/greeter/tsconfig.json
-FILE: ../../../third_party/flatbuffers/grpc/flatbuffers-java-grpc/src/main/java/com/google/flatbuffers/grpc/FlatbuffersUtils.java
-FILE: ../../../third_party/flatbuffers/grpc/samples/greeter/client.cpp
-FILE: ../../../third_party/flatbuffers/grpc/samples/greeter/greeter.fbs
-FILE: ../../../third_party/flatbuffers/grpc/samples/greeter/server.cpp
-FILE: ../../../third_party/flatbuffers/grpc/src/compiler/BUILD.bazel
-FILE: ../../../third_party/flatbuffers/grpc/src/compiler/cpp_generator.cc
-FILE: ../../../third_party/flatbuffers/grpc/src/compiler/cpp_generator.h
-FILE: ../../../third_party/flatbuffers/grpc/src/compiler/go_generator.cc
-FILE: ../../../third_party/flatbuffers/grpc/src/compiler/go_generator.h
-FILE: ../../../third_party/flatbuffers/grpc/src/compiler/java_generator.cc
-FILE: ../../../third_party/flatbuffers/grpc/src/compiler/java_generator.h
-FILE: ../../../third_party/flatbuffers/grpc/src/compiler/python_generator.cc
-FILE: ../../../third_party/flatbuffers/grpc/src/compiler/python_generator.h
-FILE: ../../../third_party/flatbuffers/grpc/src/compiler/schema_interface.h
-FILE: ../../../third_party/flatbuffers/grpc/src/compiler/swift_generator.cc
-FILE: ../../../third_party/flatbuffers/grpc/src/compiler/swift_generator.h
-FILE: ../../../third_party/flatbuffers/grpc/src/compiler/ts_generator.cc
-FILE: ../../../third_party/flatbuffers/grpc/src/compiler/ts_generator.h
-FILE: ../../../third_party/flatbuffers/include/flatbuffers/allocator.h
-FILE: ../../../third_party/flatbuffers/include/flatbuffers/array.h
-FILE: ../../../third_party/flatbuffers/include/flatbuffers/base.h
-FILE: ../../../third_party/flatbuffers/include/flatbuffers/bfbs_generator.h
-FILE: ../../../third_party/flatbuffers/include/flatbuffers/buffer.h
-FILE: ../../../third_party/flatbuffers/include/flatbuffers/buffer_ref.h
-FILE: ../../../third_party/flatbuffers/include/flatbuffers/code_generators.h
-FILE: ../../../third_party/flatbuffers/include/flatbuffers/default_allocator.h
-FILE: ../../../third_party/flatbuffers/include/flatbuffers/detached_buffer.h
-FILE: ../../../third_party/flatbuffers/include/flatbuffers/flatbuffer_builder.h
-FILE: ../../../third_party/flatbuffers/include/flatbuffers/flatbuffers.h
-FILE: ../../../third_party/flatbuffers/include/flatbuffers/flatc.h
-FILE: ../../../third_party/flatbuffers/include/flatbuffers/flex_flat_util.h
-FILE: ../../../third_party/flatbuffers/include/flatbuffers/flexbuffers.h
-FILE: ../../../third_party/flatbuffers/include/flatbuffers/grpc.h
-FILE: ../../../third_party/flatbuffers/include/flatbuffers/hash.h
-FILE: ../../../third_party/flatbuffers/include/flatbuffers/idl.h
-FILE: ../../../third_party/flatbuffers/include/flatbuffers/minireflect.h
-FILE: ../../../third_party/flatbuffers/include/flatbuffers/pch/flatc_pch.h
-FILE: ../../../third_party/flatbuffers/include/flatbuffers/pch/pch.h
-FILE: ../../../third_party/flatbuffers/include/flatbuffers/reflection.h
-FILE: ../../../third_party/flatbuffers/include/flatbuffers/reflection_generated.h
-FILE: ../../../third_party/flatbuffers/include/flatbuffers/registry.h
-FILE: ../../../third_party/flatbuffers/include/flatbuffers/stl_emulation.h
-FILE: ../../../third_party/flatbuffers/include/flatbuffers/string.h
-FILE: ../../../third_party/flatbuffers/include/flatbuffers/struct.h
-FILE: ../../../third_party/flatbuffers/include/flatbuffers/table.h
-FILE: ../../../third_party/flatbuffers/include/flatbuffers/util.h
-FILE: ../../../third_party/flatbuffers/include/flatbuffers/vector.h
-FILE: ../../../third_party/flatbuffers/include/flatbuffers/vector_downward.h
-FILE: ../../../third_party/flatbuffers/include/flatbuffers/verifier.h
-FILE: ../../../third_party/flatbuffers/java/com/google/flatbuffers/ArrayReadWriteBuf.java
-FILE: ../../../third_party/flatbuffers/java/com/google/flatbuffers/BaseVector.java
-FILE: ../../../third_party/flatbuffers/java/com/google/flatbuffers/BooleanVector.java
-FILE: ../../../third_party/flatbuffers/java/com/google/flatbuffers/ByteBufferReadWriteBuf.java
-FILE: ../../../third_party/flatbuffers/java/com/google/flatbuffers/ByteBufferUtil.java
-FILE: ../../../third_party/flatbuffers/java/com/google/flatbuffers/ByteVector.java
-FILE: ../../../third_party/flatbuffers/java/com/google/flatbuffers/Constants.java
-FILE: ../../../third_party/flatbuffers/java/com/google/flatbuffers/DoubleVector.java
-FILE: ../../../third_party/flatbuffers/java/com/google/flatbuffers/FlatBufferBuilder.java
-FILE: ../../../third_party/flatbuffers/java/com/google/flatbuffers/FlexBuffers.java
-FILE: ../../../third_party/flatbuffers/java/com/google/flatbuffers/FlexBuffersBuilder.java
-FILE: ../../../third_party/flatbuffers/java/com/google/flatbuffers/FloatVector.java
-FILE: ../../../third_party/flatbuffers/java/com/google/flatbuffers/IntVector.java
-FILE: ../../../third_party/flatbuffers/java/com/google/flatbuffers/LongVector.java
-FILE: ../../../third_party/flatbuffers/java/com/google/flatbuffers/ReadBuf.java
-FILE: ../../../third_party/flatbuffers/java/com/google/flatbuffers/ReadWriteBuf.java
-FILE: ../../../third_party/flatbuffers/java/com/google/flatbuffers/ShortVector.java
-FILE: ../../../third_party/flatbuffers/java/com/google/flatbuffers/StringVector.java
-FILE: ../../../third_party/flatbuffers/java/com/google/flatbuffers/Struct.java
-FILE: ../../../third_party/flatbuffers/java/com/google/flatbuffers/Table.java
-FILE: ../../../third_party/flatbuffers/java/com/google/flatbuffers/UnionVector.java
-FILE: ../../../third_party/flatbuffers/java/com/google/flatbuffers/Utf8.java
-FILE: ../../../third_party/flatbuffers/java/com/google/flatbuffers/Utf8Old.java
-FILE: ../../../third_party/flatbuffers/java/com/google/flatbuffers/Utf8Safe.java
-FILE: ../../../third_party/flatbuffers/kotlin/benchmark/build.gradle.kts
-FILE: ../../../third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/ArrayReadWriteBuf.java
-FILE: ../../../third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/BaseVector.java
-FILE: ../../../third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/BooleanVector.java
-FILE: ../../../third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/ByteBufferReadWriteBuf.java
-FILE: ../../../third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/ByteBufferUtil.java
-FILE: ../../../third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/ByteVector.java
-FILE: ../../../third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/Constants.java
-FILE: ../../../third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/DoubleVector.java
-FILE: ../../../third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/FlatBufferBuilder.java
-FILE: ../../../third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/FlexBuffers.java
-FILE: ../../../third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/FlexBuffersBuilder.java
-FILE: ../../../third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/FloatVector.java
-FILE: ../../../third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/IntVector.java
-FILE: ../../../third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/LongVector.java
-FILE: ../../../third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/ReadBuf.java
-FILE: ../../../third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/ReadWriteBuf.java
-FILE: ../../../third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/ShortVector.java
-FILE: ../../../third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/StringVector.java
-FILE: ../../../third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/Struct.java
-FILE: ../../../third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/Table.java
-FILE: ../../../third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/UnionVector.java
-FILE: ../../../third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/Utf8.java
-FILE: ../../../third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/Utf8Old.java
-FILE: ../../../third_party/flatbuffers/kotlin/benchmark/src/jvmMain/java/com/google/flatbuffers/Utf8Safe.java
-FILE: ../../../third_party/flatbuffers/kotlin/benchmark/src/jvmMain/kotlin/com/google/flatbuffers/kotlin/benchmark/FlexBuffersBenchmark.kt
-FILE: ../../../third_party/flatbuffers/kotlin/benchmark/src/jvmMain/kotlin/com/google/flatbuffers/kotlin/benchmark/JsonBenchmark.kt
-FILE: ../../../third_party/flatbuffers/kotlin/benchmark/src/jvmMain/kotlin/com/google/flatbuffers/kotlin/benchmark/UTF8Benchmark.kt
-FILE: ../../../third_party/flatbuffers/kotlin/build.gradle.kts
-FILE: ../../../third_party/flatbuffers/kotlin/flatbuffers-kotlin/build.gradle.kts
-FILE: ../../../third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/commonMain/kotlin/com/google/flatbuffers/kotlin/Buffers.kt
-FILE: ../../../third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/commonMain/kotlin/com/google/flatbuffers/kotlin/ByteArray.kt
-FILE: ../../../third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/commonMain/kotlin/com/google/flatbuffers/kotlin/FlexBuffers.kt
-FILE: ../../../third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/commonMain/kotlin/com/google/flatbuffers/kotlin/FlexBuffersBuilder.kt
-FILE: ../../../third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/commonMain/kotlin/com/google/flatbuffers/kotlin/FlexBuffersInternals.kt
-FILE: ../../../third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/commonMain/kotlin/com/google/flatbuffers/kotlin/JSON.kt
-FILE: ../../../third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/commonMain/kotlin/com/google/flatbuffers/kotlin/Utf8.kt
-FILE: ../../../third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/commonTest/kotlin/com/google/flatbuffers/kotlin/ByteArrayTest.kt
-FILE: ../../../third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/commonTest/kotlin/com/google/flatbuffers/kotlin/FlexBuffersTest.kt
-FILE: ../../../third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/commonTest/kotlin/com/google/flatbuffers/kotlin/JSONTest.kt
-FILE: ../../../third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/jsMain/kotlin/com/google/flatbuffers/kotlin/ByteArray.kt
-FILE: ../../../third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/jvmMain/kotlin/com/google/flatbuffers/kotlin/ByteArray.kt
-FILE: ../../../third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/jvmTest/kotlin/com/google/flatbuffers/kotlin/Utf8Test.kt
-FILE: ../../../third_party/flatbuffers/kotlin/flatbuffers-kotlin/src/nativeMain/kotlin/com/google/flatbuffers/kotlin/ByteArray.kt
-FILE: ../../../third_party/flatbuffers/kotlin/gradle.properties
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/libs.versions.toml
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/META-INF/MANIFEST.MF
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/gradle-wrapper-classpath.properties
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/AbstractCommandLineConverter.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/AbstractPropertiesCommandLineConverter.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineArgumentException.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineConverter.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineOption.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$1.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$AfterFirstSubCommand.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$AfterOptions.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$BeforeFirstSubCommand.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$CaseInsensitiveStringComparator.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$KnownOptionParserState.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$MissingOptionArgState.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$OptionAwareParserState.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$OptionComparator.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$OptionParserState.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$OptionString.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$OptionStringComparator.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$ParserState.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser$UnknownOptionParserState.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/CommandLineParser.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/ParsedCommandLine.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/ParsedCommandLineOption.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/ProjectPropertiesCommandLineConverter.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/cli/SystemPropertiesCommandLineConverter.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/BootstrapMainStarter$1.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/BootstrapMainStarter.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/Download$1.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/Download$DefaultDownloadProgressListener.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/Download$ProxyAuthenticator.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/Download.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/DownloadProgressListener.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/ExclusiveFileAccessManager.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/GradleUserHomeLookup.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/GradleWrapperMain.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/IDownload.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/Install$1.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/Install$InstallCheck.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/Install.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/Logger.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/PathAssembler$LocalDistribution.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/PathAssembler.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/SystemPropertiesHandler.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/WrapperConfiguration.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.jar!/org/gradle/wrapper/WrapperExecutor.class
-FILE: ../../../third_party/flatbuffers/kotlin/gradle/wrapper/gradle-wrapper.properties
-FILE: ../../../third_party/flatbuffers/kotlin/settings.gradle.kts
-FILE: ../../../third_party/flatbuffers/kotlin/spotless/spotless.kt
-FILE: ../../../third_party/flatbuffers/lobster/flatbuffers.lobster
-FILE: ../../../third_party/flatbuffers/lua/flatbuffers.lua
-FILE: ../../../third_party/flatbuffers/lua/flatbuffers/binaryarray.lua
-FILE: ../../../third_party/flatbuffers/lua/flatbuffers/builder.lua
-FILE: ../../../third_party/flatbuffers/lua/flatbuffers/compat.lua
-FILE: ../../../third_party/flatbuffers/lua/flatbuffers/compat_5_1.lua
-FILE: ../../../third_party/flatbuffers/lua/flatbuffers/compat_5_3.lua
-FILE: ../../../third_party/flatbuffers/lua/flatbuffers/compat_luajit.lua
-FILE: ../../../third_party/flatbuffers/lua/flatbuffers/numTypes.lua
-FILE: ../../../third_party/flatbuffers/lua/flatbuffers/view.lua
-FILE: ../../../third_party/flatbuffers/net/FlatBuffers/ByteBuffer.cs
-FILE: ../../../third_party/flatbuffers/net/FlatBuffers/ByteBufferUtil.cs
-FILE: ../../../third_party/flatbuffers/net/FlatBuffers/FlatBufferBuilder.cs
-FILE: ../../../third_party/flatbuffers/net/FlatBuffers/FlatBufferConstants.cs
-FILE: ../../../third_party/flatbuffers/net/FlatBuffers/FlatBuffers.csproj
-FILE: ../../../third_party/flatbuffers/net/FlatBuffers/FlatBuffers.net35.csproj
-FILE: ../../../third_party/flatbuffers/net/FlatBuffers/IFlatbufferObject.cs
-FILE: ../../../third_party/flatbuffers/net/FlatBuffers/Offset.cs
-FILE: ../../../third_party/flatbuffers/net/FlatBuffers/Properties/AssemblyInfo.cs
-FILE: ../../../third_party/flatbuffers/net/FlatBuffers/Struct.cs
-FILE: ../../../third_party/flatbuffers/net/FlatBuffers/Table.cs
-FILE: ../../../third_party/flatbuffers/package.json
-FILE: ../../../third_party/flatbuffers/php/ByteBuffer.php
-FILE: ../../../third_party/flatbuffers/php/Constants.php
-FILE: ../../../third_party/flatbuffers/php/FlatbufferBuilder.php
-FILE: ../../../third_party/flatbuffers/php/Struct.php
-FILE: ../../../third_party/flatbuffers/php/Table.php
-FILE: ../../../third_party/flatbuffers/python/setup.cfg
-FILE: ../../../third_party/flatbuffers/reflection/BUILD.bazel
-FILE: ../../../third_party/flatbuffers/reflection/reflection.fbs
-FILE: ../../../third_party/flatbuffers/rust/flatbuffers/Cargo.toml
-FILE: ../../../third_party/flatbuffers/rust/flatbuffers/src/array.rs
-FILE: ../../../third_party/flatbuffers/rust/flatbuffers/src/builder.rs
-FILE: ../../../third_party/flatbuffers/rust/flatbuffers/src/endian_scalar.rs
-FILE: ../../../third_party/flatbuffers/rust/flatbuffers/src/follow.rs
-FILE: ../../../third_party/flatbuffers/rust/flatbuffers/src/get_root.rs
-FILE: ../../../third_party/flatbuffers/rust/flatbuffers/src/lib.rs
-FILE: ../../../third_party/flatbuffers/rust/flatbuffers/src/primitives.rs
-FILE: ../../../third_party/flatbuffers/rust/flatbuffers/src/push.rs
-FILE: ../../../third_party/flatbuffers/rust/flatbuffers/src/table.rs
-FILE: ../../../third_party/flatbuffers/rust/flatbuffers/src/vector.rs
-FILE: ../../../third_party/flatbuffers/rust/flatbuffers/src/verifier.rs
-FILE: ../../../third_party/flatbuffers/rust/flatbuffers/src/vtable.rs
-FILE: ../../../third_party/flatbuffers/rust/flatbuffers/src/vtable_writer.rs
-FILE: ../../../third_party/flatbuffers/rust/flexbuffers/Cargo.toml
-FILE: ../../../third_party/flatbuffers/rust/flexbuffers/src/bitwidth.rs
-FILE: ../../../third_party/flatbuffers/rust/flexbuffers/src/buffer.rs
-FILE: ../../../third_party/flatbuffers/rust/flexbuffers/src/builder/map.rs
-FILE: ../../../third_party/flatbuffers/rust/flexbuffers/src/builder/mod.rs
-FILE: ../../../third_party/flatbuffers/rust/flexbuffers/src/builder/push.rs
-FILE: ../../../third_party/flatbuffers/rust/flexbuffers/src/builder/ser.rs
-FILE: ../../../third_party/flatbuffers/rust/flexbuffers/src/builder/value.rs
-FILE: ../../../third_party/flatbuffers/rust/flexbuffers/src/builder/vector.rs
-FILE: ../../../third_party/flatbuffers/rust/flexbuffers/src/flexbuffer_type.rs
-FILE: ../../../third_party/flatbuffers/rust/flexbuffers/src/lib.rs
-FILE: ../../../third_party/flatbuffers/rust/flexbuffers/src/reader/de.rs
-FILE: ../../../third_party/flatbuffers/rust/flexbuffers/src/reader/iter.rs
-FILE: ../../../third_party/flatbuffers/rust/flexbuffers/src/reader/map.rs
-FILE: ../../../third_party/flatbuffers/rust/flexbuffers/src/reader/mod.rs
-FILE: ../../../third_party/flatbuffers/rust/flexbuffers/src/reader/serialize.rs
-FILE: ../../../third_party/flatbuffers/rust/flexbuffers/src/reader/vector.rs
-FILE: ../../../third_party/flatbuffers/samples/SampleBinary.cs
-FILE: ../../../third_party/flatbuffers/samples/SampleBinary.java
-FILE: ../../../third_party/flatbuffers/samples/SampleBinary.kt
-FILE: ../../../third_party/flatbuffers/samples/SampleBinary.php
-FILE: ../../../third_party/flatbuffers/samples/lua/MyGame/Sample/Color.lua
-FILE: ../../../third_party/flatbuffers/samples/lua/MyGame/Sample/Equipment.lua
-FILE: ../../../third_party/flatbuffers/samples/lua/MyGame/Sample/Monster.lua
-FILE: ../../../third_party/flatbuffers/samples/lua/MyGame/Sample/Vec3.lua
-FILE: ../../../third_party/flatbuffers/samples/lua/MyGame/Sample/Weapon.lua
-FILE: ../../../third_party/flatbuffers/samples/monster.bfbs
-FILE: ../../../third_party/flatbuffers/samples/monster.fbs
-FILE: ../../../third_party/flatbuffers/samples/monster_generated.h
-FILE: ../../../third_party/flatbuffers/samples/monster_generated.lobster
-FILE: ../../../third_party/flatbuffers/samples/monster_generated.swift
-FILE: ../../../third_party/flatbuffers/samples/monsterdata.json
-FILE: ../../../third_party/flatbuffers/samples/rust_generated/mod.rs
-FILE: ../../../third_party/flatbuffers/samples/rust_generated/my_game/sample/color_generated.rs
-FILE: ../../../third_party/flatbuffers/samples/rust_generated/my_game/sample/equipment_generated.rs
-FILE: ../../../third_party/flatbuffers/samples/rust_generated/my_game/sample/monster_generated.rs
-FILE: ../../../third_party/flatbuffers/samples/rust_generated/my_game/sample/vec_3_generated.rs
-FILE: ../../../third_party/flatbuffers/samples/rust_generated/my_game/sample/weapon_generated.rs
-FILE: ../../../third_party/flatbuffers/samples/sample_bfbs.cpp
-FILE: ../../../third_party/flatbuffers/samples/sample_binary.cpp
-FILE: ../../../third_party/flatbuffers/samples/sample_binary.go
-FILE: ../../../third_party/flatbuffers/samples/sample_binary.lobster
-FILE: ../../../third_party/flatbuffers/samples/sample_binary.lua
-FILE: ../../../third_party/flatbuffers/samples/sample_binary.rs
-FILE: ../../../third_party/flatbuffers/samples/sample_binary.swift
-FILE: ../../../third_party/flatbuffers/samples/sample_flexbuffers.rs
-FILE: ../../../third_party/flatbuffers/samples/sample_flexbuffers_serde.rs
-FILE: ../../../third_party/flatbuffers/samples/sample_text.cpp
-FILE: ../../../third_party/flatbuffers/samples/sample_text.lobster
-FILE: ../../../third_party/flatbuffers/src/BUILD.bazel
-FILE: ../../../third_party/flatbuffers/src/annotated_binary_text_gen.cpp
-FILE: ../../../third_party/flatbuffers/src/annotated_binary_text_gen.h
-FILE: ../../../third_party/flatbuffers/src/bfbs_gen.h
-FILE: ../../../third_party/flatbuffers/src/bfbs_gen_lua.cpp
-FILE: ../../../third_party/flatbuffers/src/bfbs_gen_lua.h
-FILE: ../../../third_party/flatbuffers/src/bfbs_namer.h
-FILE: ../../../third_party/flatbuffers/src/binary_annotator.cpp
-FILE: ../../../third_party/flatbuffers/src/binary_annotator.h
-FILE: ../../../third_party/flatbuffers/src/code_generators.cpp
-FILE: ../../../third_party/flatbuffers/src/flatc.cpp
-FILE: ../../../third_party/flatbuffers/src/flatc_main.cpp
-FILE: ../../../third_party/flatbuffers/src/flathash.cpp
-FILE: ../../../third_party/flatbuffers/src/idl_gen_cpp.cpp
-FILE: ../../../third_party/flatbuffers/src/idl_gen_csharp.cpp
-FILE: ../../../third_party/flatbuffers/src/idl_gen_dart.cpp
-FILE: ../../../third_party/flatbuffers/src/idl_gen_fbs.cpp
-FILE: ../../../third_party/flatbuffers/src/idl_gen_go.cpp
-FILE: ../../../third_party/flatbuffers/src/idl_gen_grpc.cpp
-FILE: ../../../third_party/flatbuffers/src/idl_gen_java.cpp
-FILE: ../../../third_party/flatbuffers/src/idl_gen_json_schema.cpp
-FILE: ../../../third_party/flatbuffers/src/idl_gen_kotlin.cpp
-FILE: ../../../third_party/flatbuffers/src/idl_gen_lobster.cpp
-FILE: ../../../third_party/flatbuffers/src/idl_gen_lua.cpp
-FILE: ../../../third_party/flatbuffers/src/idl_gen_php.cpp
-FILE: ../../../third_party/flatbuffers/src/idl_gen_python.cpp
-FILE: ../../../third_party/flatbuffers/src/idl_gen_rust.cpp
-FILE: ../../../third_party/flatbuffers/src/idl_gen_swift.cpp
-FILE: ../../../third_party/flatbuffers/src/idl_gen_text.cpp
-FILE: ../../../third_party/flatbuffers/src/idl_gen_ts.cpp
-FILE: ../../../third_party/flatbuffers/src/idl_namer.h
-FILE: ../../../third_party/flatbuffers/src/idl_parser.cpp
-FILE: ../../../third_party/flatbuffers/src/namer.h
-FILE: ../../../third_party/flatbuffers/src/reflection.cpp
-FILE: ../../../third_party/flatbuffers/src/util.cpp
-FILE: ../../../third_party/flatbuffers/swift/BUILD.bazel
-FILE: ../../../third_party/flatbuffers/swift/FlatBuffers.podspec
-FILE: ../../../third_party/flatbuffers/swift/Package.swift
-FILE: ../../../third_party/flatbuffers/swift/Package@swift-5.5.swift
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/ByteBuffer.swift
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Constants.swift
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/fbs/monster_step_1.fbs
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/fbs/monster_step_2.fbs
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/fbs/monster_step_3.fbs
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/fbs/monster_step_4.fbs
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/fbs/monster_step_5.fbs
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/fbs/monster_step_6.fbs
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/fbs/monster_step_7.fbs
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/swift/swift_code_1.swift
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/swift/swift_code_10.swift
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/swift/swift_code_11.swift
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/swift/swift_code_12.swift
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/swift/swift_code_13.swift
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/swift/swift_code_2.swift
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/swift/swift_code_3.swift
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/swift/swift_code_4.swift
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/swift/swift_code_5.swift
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/swift/swift_code_6.swift
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/swift/swift_code_7.swift
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/swift/swift_code_8.swift
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/code/swift/swift_code_9.swift
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Resources/images/tutorial_cover_image_1.png
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Tutorials/Tutorial_Table_of_Contents.tutorial
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Tutorials/create_your_first_buffer.tutorial
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Tutorials/creating_flatbuffer_schema.tutorial
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Documentation.docc/Tutorials/reading_bytebuffer.tutorial
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Enum.swift
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/FlatBufferBuilder.swift
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/FlatBufferObject.swift
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/FlatBuffersUtils.swift
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/FlatbuffersErrors.swift
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Int+extension.swift
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Message.swift
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Mutable.swift
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/NativeObject.swift
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Offset.swift
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Root.swift
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/String+extension.swift
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Struct.swift
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Table.swift
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/TableVerifier.swift
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/VeriferOptions.swift
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Verifiable.swift
-FILE: ../../../third_party/flatbuffers/swift/Sources/FlatBuffers/Verifier.swift
-FILE: ../../../third_party/flatbuffers/ts/BUILD.bazel
-FILE: ../../../third_party/flatbuffers/ts/builder.ts
-FILE: ../../../third_party/flatbuffers/ts/byte-buffer.ts
-FILE: ../../../third_party/flatbuffers/ts/constants.ts
-FILE: ../../../third_party/flatbuffers/ts/encoding.ts
-FILE: ../../../third_party/flatbuffers/ts/flexbuffers.ts
-FILE: ../../../third_party/flatbuffers/ts/flexbuffers/bit-width-util.ts
-FILE: ../../../third_party/flatbuffers/ts/flexbuffers/bit-width.ts
-FILE: ../../../third_party/flatbuffers/ts/flexbuffers/builder.ts
-FILE: ../../../third_party/flatbuffers/ts/flexbuffers/flexbuffers-util.ts
-FILE: ../../../third_party/flatbuffers/ts/flexbuffers/reference-util.ts
-FILE: ../../../third_party/flatbuffers/ts/flexbuffers/reference.ts
-FILE: ../../../third_party/flatbuffers/ts/flexbuffers/stack-value.ts
-FILE: ../../../third_party/flatbuffers/ts/flexbuffers/value-type-util.ts
-FILE: ../../../third_party/flatbuffers/ts/flexbuffers/value-type.ts
-FILE: ../../../third_party/flatbuffers/ts/index.ts
-FILE: ../../../third_party/flatbuffers/ts/types.ts
-FILE: ../../../third_party/flatbuffers/ts/utils.ts
-FILE: ../../../third_party/flatbuffers/tsconfig.json
-FILE: ../../../third_party/flatbuffers/tsconfig.mjs.json
-FILE: ../../../third_party/flatbuffers/typescript.bzl
-FILE: ../../../third_party/flatbuffers/yarn.lock
-FILE: ../../../third_party/fuchsia-vulkan/cmake/cmake_uninstall.cmake.in
-FILE: ../../../third_party/fuchsia-vulkan/include/vk_video/vulkan_video_codec_h264std.h
-FILE: ../../../third_party/fuchsia-vulkan/include/vk_video/vulkan_video_codec_h264std_decode.h
-FILE: ../../../third_party/fuchsia-vulkan/include/vk_video/vulkan_video_codec_h264std_encode.h
-FILE: ../../../third_party/fuchsia-vulkan/include/vk_video/vulkan_video_codec_h265std.h
-FILE: ../../../third_party/fuchsia-vulkan/include/vk_video/vulkan_video_codec_h265std_decode.h
-FILE: ../../../third_party/fuchsia-vulkan/include/vk_video/vulkan_video_codec_h265std_encode.h
-FILE: ../../../third_party/fuchsia-vulkan/include/vk_video/vulkan_video_codecs_common.h
-FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vk_icd.h
-FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vk_layer.h
-FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vk_platform.h
-FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vk_sdk_platform.h
-FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan.h
-FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan.hpp
-FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_android.h
-FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_beta.h
-FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_core.h
-FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_directfb.h
-FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_enums.hpp
-FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_fuchsia.h
-FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_funcs.hpp
-FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_ggp.h
-FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_handles.hpp
-FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_ios.h
-FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_macos.h
-FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_metal.h
-FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_raii.hpp
-FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_screen.h
-FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_structs.hpp
-FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_vi.h
-FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_wayland.h
-FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_win32.h
-FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_xcb.h
-FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_xlib.h
-FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_xlib_xrandr.h
-FILE: ../../../third_party/fuchsia-vulkan/registry/validusage.json
-FILE: ../../../third_party/fuchsia-vulkan/registry/vk.xml
-FILE: ../../../third_party/khronos/EGL/egl.h
-FILE: ../../../third_party/khronos/EGL/eglext.h
-FILE: ../../../third_party/khronos/EGL/eglplatform.h
-FILE: ../../../third_party/khronos/GLES2/gl2platform.h
-FILE: ../../../third_party/khronos/GLES3/gl3platform.h
-FILE: ../../../third_party/libwebp/gradlew
-FILE: ../../../third_party/pkg/quiver/lib/async.dart
-FILE: ../../../third_party/pkg/quiver/lib/cache.dart
-FILE: ../../../third_party/pkg/quiver/lib/check.dart
-FILE: ../../../third_party/pkg/quiver/lib/collection.dart
-FILE: ../../../third_party/pkg/quiver/lib/core.dart
-FILE: ../../../third_party/pkg/quiver/lib/io.dart
-FILE: ../../../third_party/pkg/quiver/lib/iterables.dart
-FILE: ../../../third_party/pkg/quiver/lib/mirrors.dart
-FILE: ../../../third_party/pkg/quiver/lib/pattern.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/async/collect.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/async/concat.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/async/countdown_timer.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/async/enumerate.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/async/future_stream.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/async/iteration.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/async/metronome.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/async/stream_buffer.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/async/stream_router.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/async/string.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/cache/cache.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/cache/map_cache.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/collection/bimap.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/collection/delegates/iterable.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/collection/delegates/list.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/collection/delegates/map.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/collection/delegates/queue.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/collection/delegates/set.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/collection/lru_map.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/collection/multimap.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/collection/treeset.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/core/hash.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/core/optional.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/iterables/concat.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/iterables/count.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/iterables/cycle.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/iterables/enumerate.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/iterables/generating_iterable.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/iterables/infinite_iterable.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/iterables/merge.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/iterables/min_max.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/iterables/partition.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/iterables/range.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/iterables/zip.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/time/clock.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/time/duration_unit_constants.dart
-FILE: ../../../third_party/pkg/quiver/lib/src/time/util.dart
-FILE: ../../../third_party/pkg/quiver/lib/strings.dart
-FILE: ../../../third_party/pkg/quiver/lib/time.dart
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vk_video/vulkan_video_codec_h264std.h
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vk_video/vulkan_video_codec_h264std_decode.h
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vk_video/vulkan_video_codec_h264std_encode.h
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vk_video/vulkan_video_codec_h265std.h
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vk_video/vulkan_video_codec_h265std_decode.h
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vk_video/vulkan_video_codec_h265std_encode.h
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vk_video/vulkan_video_codecs_common.h
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vk_icd.h
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vk_layer.h
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vk_platform.h
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vk_sdk_platform.h
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan.h
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan.hpp
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_android.h
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_beta.h
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_core.h
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_directfb.h
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_enums.hpp
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_format_traits.hpp
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_fuchsia.h
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_funcs.hpp
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_ggp.h
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_handles.hpp
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_hash.hpp
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_ios.h
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_macos.h
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_metal.h
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_raii.hpp
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_screen.h
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_structs.hpp
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_to_string.hpp
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_vi.h
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_wayland.h
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_win32.h
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_xcb.h
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_xlib.h
-FILE: ../../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan_xlib_xrandr.h
-FILE: ../../../third_party/wuffs/release/c/wuffs-v0.2.c
-FILE: ../../../third_party/wuffs/release/c/wuffs-v0.3.c
-----------------------------------------------------------------------------------------------------
-Apache License
-Version 2.0, January 2004
-http://www.apache.org/licenses
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-====================================================================================================
+Signature: be8ce23f4fb161952d9fa6424a6bf111
 
 ====================================================================================================
 LIBRARY: libcxx
 LIBRARY: libcxxabi
-ORIGIN: ../../../third_party/libcxx/benchmarks/algorithms/common.h
-TYPE: LicenseType.apache
-FILE: ../../../third_party/libcxx/benchmarks/CartesianBenchmarks.h
-FILE: ../../../third_party/libcxx/benchmarks/ContainerBenchmarks.h
-FILE: ../../../third_party/libcxx/benchmarks/Utilities.h
-FILE: ../../../third_party/libcxx/benchmarks/VariantBenchmarks.h
-FILE: ../../../third_party/libcxx/benchmarks/algorithms/common.h
-FILE: ../../../third_party/libcxx/benchmarks/algorithms/lower_bound.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/algorithms/make_heap.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/algorithms/make_heap_then_sort_heap.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/algorithms/min_max_element.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/algorithms/pop_heap.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/algorithms/push_heap.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/algorithms/ranges_sort.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/algorithms/ranges_stable_sort.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/algorithms/sort.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/algorithms/sort_heap.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/algorithms/stable_sort.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/allocation.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/deque.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/format.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/format_to.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/format_to_n.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/formatted_size.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/formatter_float.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/function.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/map.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/ordered_set.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/random.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/std_format_spec_string_unicode.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/to_chars.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/util_smartptr.bench.cpp
+ORIGIN: Apache-2.0 WITH LLVM-exception referenced by ../../../third_party/libcxx/src/charconv.cpp
+ORIGIN: Apache-2.0 WITH LLVM-exception referenced by ../../../third_party/libcxx/src/include/ryu/common.h
+ORIGIN: Apache-2.0 WITH LLVM-exception referenced by ../../../third_party/libcxx/src/include/ryu/d2fixed.h
+ORIGIN: Apache-2.0 WITH LLVM-exception referenced by ../../../third_party/libcxx/src/include/ryu/d2fixed_full_table.h
+ORIGIN: Apache-2.0 WITH LLVM-exception referenced by ../../../third_party/libcxx/src/include/ryu/d2s.h
+ORIGIN: Apache-2.0 WITH LLVM-exception referenced by ../../../third_party/libcxx/src/include/ryu/d2s_full_table.h
+ORIGIN: Apache-2.0 WITH LLVM-exception referenced by ../../../third_party/libcxx/src/include/ryu/d2s_intrinsics.h
+ORIGIN: Apache-2.0 WITH LLVM-exception referenced by ../../../third_party/libcxx/src/include/ryu/digit_table.h
+ORIGIN: Apache-2.0 WITH LLVM-exception referenced by ../../../third_party/libcxx/src/include/ryu/f2s.h
+ORIGIN: Apache-2.0 WITH LLVM-exception referenced by ../../../third_party/libcxx/src/include/ryu/ryu.h
+ORIGIN: Apache-2.0 WITH LLVM-exception referenced by ../../../third_party/libcxx/src/include/to_chars_floating_point.h
+ORIGIN: Apache-2.0 WITH LLVM-exception referenced by ../../../third_party/libcxx/src/ryu/d2fixed.cpp
+ORIGIN: Apache-2.0 WITH LLVM-exception referenced by ../../../third_party/libcxx/src/ryu/d2s.cpp
+ORIGIN: Apache-2.0 WITH LLVM-exception referenced by ../../../third_party/libcxx/src/ryu/f2s.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/adjacent_find.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/all_of.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/any_of.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/binary_search.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/clamp.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/comp.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/comp_ref_type.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/copy.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/copy_backward.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/copy_if.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/copy_n.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/count.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/count_if.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/equal.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/equal_range.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/fill.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/fill_n.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/find.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/find_end.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/find_first_of.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/find_if.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/find_if_not.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/for_each.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/for_each_n.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/generate.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/generate_n.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/half_positive.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/in_found_result.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/in_fun_result.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/in_in_out_result.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/in_in_result.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/in_out_out_result.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/in_out_result.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/includes.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/inplace_merge.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/is_heap.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/is_heap_until.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/is_partitioned.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/is_permutation.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/is_sorted.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/is_sorted_until.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/iter_swap.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/iterator_operations.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/lexicographical_compare.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/lower_bound.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/make_heap.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/make_projected.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/max.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/max_element.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/merge.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/min.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/min_element.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/min_max_result.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/minmax.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/minmax_element.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/mismatch.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/move.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/move_backward.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/next_permutation.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/none_of.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/nth_element.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/partial_sort.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/partial_sort_copy.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/partition.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/partition_copy.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/partition_point.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/pop_heap.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/prev_permutation.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/push_heap.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_adjacent_find.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_all_of.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_any_of.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_binary_search.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_copy.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_copy_backward.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_copy_if.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_copy_n.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_count.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_count_if.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_equal.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_fill.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_fill_n.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_find.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_find_first_of.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_find_if.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_find_if_not.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_for_each.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_for_each_n.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_is_partitioned.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_is_sorted.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_is_sorted_until.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_lexicographical_compare.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_lower_bound.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_max.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_max_element.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_merge.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_min.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_min_element.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_minmax.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_minmax_element.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_mismatch.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_move.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_move_backward.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_none_of.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_nth_element.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_remove.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_remove_if.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_replace.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_replace_if.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_reverse.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_set_difference.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_sort.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_stable_sort.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_swap_ranges.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_transform.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/ranges_upper_bound.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/remove.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/remove_copy.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/remove_copy_if.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/remove_if.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/replace.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/replace_copy.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/replace_copy_if.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/replace_if.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/reverse.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/reverse_copy.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/rotate.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/rotate_copy.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/sample.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/search.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/search_n.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/set_difference.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/set_intersection.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/set_symmetric_difference.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/set_union.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/shift_left.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/shift_right.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/shuffle.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/sift_down.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/sort.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/sort_heap.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/stable_partition.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/stable_sort.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/swap_ranges.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/transform.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/unique.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/unique_copy.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/unwrap_iter.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__algorithm/upper_bound.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__assert
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__availability
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__bit/bit_cast.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__bit/byteswap.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__bit_reference
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__bits
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__bsd_locale_defaults.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__bsd_locale_fallbacks.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__charconv/chars_format.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__charconv/from_chars_result.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__charconv/tables.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__charconv/to_chars_base_10.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__charconv/to_chars_result.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__chrono/calendar.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__chrono/convert_to_timespec.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__chrono/day.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__chrono/duration.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__chrono/file_clock.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__chrono/hh_mm_ss.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__chrono/high_resolution_clock.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__chrono/literals.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__chrono/month.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__chrono/month_weekday.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__chrono/monthday.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__chrono/steady_clock.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__chrono/system_clock.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__chrono/time_point.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__chrono/weekday.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__chrono/year.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__chrono/year_month.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__chrono/year_month_day.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__chrono/year_month_weekday.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__compare/common_comparison_category.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__compare/compare_partial_order_fallback.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__compare/compare_strong_order_fallback.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__compare/compare_three_way.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__compare/compare_three_way_result.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__compare/compare_weak_order_fallback.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__compare/is_eq.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__compare/ordering.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__compare/partial_order.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__compare/strong_order.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__compare/synth_three_way.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__compare/three_way_comparable.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__compare/weak_order.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__concepts/arithmetic.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__concepts/assignable.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__concepts/boolean_testable.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__concepts/class_or_enum.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__concepts/common_reference_with.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__concepts/common_with.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__concepts/constructible.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__concepts/convertible_to.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__concepts/copyable.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__concepts/derived_from.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__concepts/destructible.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__concepts/different_from.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__concepts/equality_comparable.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__concepts/invocable.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__concepts/movable.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__concepts/predicate.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__concepts/regular.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__concepts/relation.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__concepts/same_as.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__concepts/semiregular.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__concepts/swappable.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__concepts/totally_ordered.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__config
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__config_site.in
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__coroutine/coroutine_handle.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__coroutine/coroutine_traits.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__coroutine/noop_coroutine_handle.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__coroutine/trivial_awaitables.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__debug
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__debug_utils/randomize_range.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__errc
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__filesystem/copy_options.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__filesystem/directory_entry.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__filesystem/directory_iterator.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__filesystem/directory_options.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__filesystem/file_status.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__filesystem/file_time_type.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__filesystem/file_type.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__filesystem/filesystem_error.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__filesystem/operations.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__filesystem/path.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__filesystem/path_iterator.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__filesystem/perm_options.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__filesystem/perms.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__filesystem/recursive_directory_iterator.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__filesystem/space_info.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__filesystem/u8path.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__format/buffer.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__format/concepts.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__format/enable_insertable.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__format/format_arg.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__format/format_arg_store.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__format/format_args.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__format/format_context.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__format/format_error.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__format/format_fwd.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__format/format_parse_context.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__format/format_string.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__format/format_to_n_result.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__format/formatter.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__format/formatter_bool.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__format/formatter_char.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__format/formatter_floating_point.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__format/formatter_integer.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__format/formatter_integral.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__format/formatter_output.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__format/formatter_pointer.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__format/formatter_string.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__format/parser_std_format_spec.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__functional/binary_function.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__functional/binary_negate.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__functional/bind.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__functional/bind_back.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__functional/bind_front.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__functional/binder1st.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__functional/binder2nd.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__functional/boyer_moore_searcher.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__functional/compose.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__functional/default_searcher.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__functional/function.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__functional/hash.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__functional/identity.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__functional/invoke.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__functional/is_transparent.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__functional/mem_fn.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__functional/mem_fun_ref.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__functional/not_fn.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__functional/operations.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__functional/perfect_forward.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__functional/pointer_to_binary_function.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__functional/pointer_to_unary_function.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__functional/ranges_operations.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__functional/reference_wrapper.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__functional/unary_function.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__functional/unary_negate.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__functional/unwrap_ref.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__functional/weak_result_type.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__fwd/span.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__fwd/string_view.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__hash_table
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__ios/fpos.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/access.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/advance.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/back_insert_iterator.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/bounded_iter.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/common_iterator.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/concepts.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/counted_iterator.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/data.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/default_sentinel.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/distance.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/empty.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/erase_if_container.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/front_insert_iterator.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/incrementable_traits.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/indirectly_comparable.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/insert_iterator.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/istream_iterator.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/istreambuf_iterator.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/iter_move.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/iter_swap.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/iterator.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/iterator_traits.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/mergeable.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/move_iterator.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/move_sentinel.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/next.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/ostream_iterator.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/ostreambuf_iterator.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/permutable.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/prev.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/projected.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/readable_traits.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/reverse_access.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/reverse_iterator.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/size.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/sortable.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/unreachable_sentinel.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__iterator/wrap_iter.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__locale
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__mbstate_t.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__memory/addressof.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__memory/allocate_at_least.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__memory/allocation_guard.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__memory/allocator.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__memory/allocator_arg_t.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__memory/allocator_traits.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__memory/assume_aligned.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__memory/auto_ptr.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__memory/compressed_pair.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__memory/concepts.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__memory/construct_at.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__memory/pointer_traits.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__memory/ranges_construct_at.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__memory/ranges_uninitialized_algorithms.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__memory/raw_storage_iterator.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__memory/shared_ptr.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__memory/temporary_buffer.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__memory/uninitialized_algorithms.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__memory/unique_ptr.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__memory/uses_allocator.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__memory/voidify.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__mutex_base
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__node_handle
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__numeric/accumulate.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__numeric/adjacent_difference.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__numeric/exclusive_scan.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__numeric/gcd_lcm.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__numeric/inclusive_scan.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__numeric/inner_product.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__numeric/iota.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__numeric/midpoint.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__numeric/partial_sum.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__numeric/reduce.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__numeric/transform_exclusive_scan.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__numeric/transform_inclusive_scan.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__numeric/transform_reduce.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/bernoulli_distribution.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/binomial_distribution.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/cauchy_distribution.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/chi_squared_distribution.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/clamp_to_integral.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/default_random_engine.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/discard_block_engine.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/discrete_distribution.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/exponential_distribution.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/extreme_value_distribution.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/fisher_f_distribution.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/gamma_distribution.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/generate_canonical.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/geometric_distribution.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/independent_bits_engine.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/is_seed_sequence.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/is_valid.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/knuth_b.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/linear_congruential_engine.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/log2.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/lognormal_distribution.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/mersenne_twister_engine.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/negative_binomial_distribution.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/normal_distribution.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/piecewise_constant_distribution.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/piecewise_linear_distribution.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/poisson_distribution.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/random_device.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/ranlux.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/seed_seq.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/shuffle_order_engine.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/student_t_distribution.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/subtract_with_carry_engine.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/uniform_int_distribution.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/uniform_random_bit_generator.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/uniform_real_distribution.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__random/weibull_distribution.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__ranges/access.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__ranges/all.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__ranges/common_view.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__ranges/concepts.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__ranges/copyable_box.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__ranges/counted.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__ranges/dangling.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__ranges/data.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__ranges/drop_view.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__ranges/empty.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__ranges/empty_view.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__ranges/enable_borrowed_range.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__ranges/enable_view.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__ranges/filter_view.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__ranges/iota_view.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__ranges/join_view.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__ranges/lazy_split_view.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__ranges/non_propagating_cache.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__ranges/owning_view.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__ranges/range_adaptor.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__ranges/rbegin.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__ranges/ref_view.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__ranges/rend.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__ranges/reverse_view.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__ranges/single_view.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__ranges/size.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__ranges/subrange.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__ranges/take_view.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__ranges/transform_view.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__ranges/view_interface.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__ranges/views.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__ranges/zip_view.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__split_buffer
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__std_stream
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__string/char_traits.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__string/extern_template_lists.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__support/android/locale_bionic.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__support/fuchsia/xlocale.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__support/ibm/gettod_zos.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__support/ibm/limits.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__support/ibm/locale_mgmt_zos.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__support/ibm/nanosleep.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__support/ibm/support.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__support/ibm/xlocale.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__support/musl/xlocale.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__support/newlib/xlocale.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__support/openbsd/xlocale.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__support/solaris/floatingpoint.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__support/solaris/wchar.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__support/solaris/xlocale.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__support/win32/limits_msvc_win32.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__support/win32/locale_win32.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__support/xlocale/__nop_locale_mgmt.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__support/xlocale/__posix_l_fallback.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__support/xlocale/__strtonum_fallback.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__thread/poll_with_backoff.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__thread/timed_backoff_policy.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__threading_support
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__tree
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__tuple
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/add_const.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/add_cv.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/add_lvalue_reference.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/add_pointer.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/add_rvalue_reference.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/add_volatile.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/alignment_of.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/apply_cv.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/conditional.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/conjunction.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/decay.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/disjunction.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/enable_if.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/extent.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/has_unique_object_representation.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/has_virtual_destructor.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/integral_constant.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_abstract.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_aggregate.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_arithmetic.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_array.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_assignable.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_base_of.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_bounded_array.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_callable.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_class.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_compound.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_const.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_constant_evaluated.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_constructible.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_convertible.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_copy_assignable.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_copy_constructible.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_core_convertible.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_default_constructible.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_destructible.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_empty.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_enum.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_final.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_floating_point.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_function.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_fundamental.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_integral.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_literal_type.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_member_function_pointer.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_member_object_pointer.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_member_pointer.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_move_assignable.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_move_constructible.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_nothrow_assignable.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_nothrow_constructible.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_nothrow_copy_assignable.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_nothrow_copy_constructible.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_nothrow_default_constructible.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_nothrow_destructible.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_nothrow_move_assignable.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_nothrow_move_constructible.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_null_pointer.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_object.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_pod.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_pointer.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_polymorphic.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_reference.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_reference_wrapper.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_referenceable.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_same.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_scalar.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_scoped_enum.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_signed.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_standard_layout.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_trivial.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_trivially_assignable.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_trivially_constructible.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_trivially_copy_assignable.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_trivially_copy_constructible.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_trivially_copyable.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_trivially_default_constructible.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_trivially_destructible.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_trivially_move_assignable.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_trivially_move_constructible.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_unbounded_array.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_union.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_unsigned.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_void.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/is_volatile.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/negation.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/rank.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/remove_all_extents.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/remove_const.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/remove_cv.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/remove_extent.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/remove_pointer.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/remove_reference.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/remove_volatile.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/type_identity.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/underlying_type.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__type_traits/void_t.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__undef_macros
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__utility/as_const.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__utility/auto_cast.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__utility/cmp.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__utility/declval.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__utility/exchange.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__utility/forward.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__utility/in_place.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__utility/integer_sequence.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__utility/move.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__utility/pair.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__utility/piecewise_construct.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__utility/priority_tag.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__utility/rel_ops.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__utility/swap.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__utility/to_underlying.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__utility/transaction.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__utility/unreachable.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/__variant/monostate.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/algorithm
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/any
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/array
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/atomic
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/barrier
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/bit
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/bitset
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/cassert
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/ccomplex
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/cctype
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/cerrno
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/cfenv
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/cfloat
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/charconv
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/chrono
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/cinttypes
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/ciso646
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/climits
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/clocale
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/cmath
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/codecvt
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/compare
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/complex
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/complex.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/concepts
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/condition_variable
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/coroutine
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/csetjmp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/csignal
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/cstdarg
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/cstdbool
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/cstddef
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/cstdint
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/cstdio
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/cstdlib
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/cstring
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/ctgmath
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/ctime
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/ctype.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/cuchar
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/cwchar
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/cwctype
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/deque
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/errno.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/exception
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/execution
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/experimental/__config
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/experimental/__memory
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/experimental/algorithm
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/experimental/coroutine
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/experimental/deque
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/experimental/forward_list
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/experimental/functional
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/experimental/iterator
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/experimental/list
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/experimental/map
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/experimental/memory_resource
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/experimental/propagate_const
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/experimental/regex
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/experimental/set
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/experimental/simd
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/experimental/string
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/experimental/type_traits
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/experimental/unordered_map
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/experimental/unordered_set
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/experimental/utility
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/experimental/vector
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/ext/__hash
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/ext/hash_map
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/ext/hash_set
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/fenv.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/filesystem
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/float.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/format
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/forward_list
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/fstream
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/functional
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/future
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/initializer_list
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/inttypes.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/iomanip
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/ios
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/iosfwd
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/iostream
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/istream
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/iterator
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/latch
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/limits
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/limits.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/list
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/locale
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/locale.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/map
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/math.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/memory
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/mutex
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/new
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/numbers
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/numeric
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/optional
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/ostream
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/queue
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/random
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/ranges
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/ratio
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/regex
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/scoped_allocator
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/semaphore
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/set
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/setjmp.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/shared_mutex
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/span
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/sstream
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/stack
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/stdatomic.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/stdbool.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/stddef.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/stdexcept
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/stdint.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/stdio.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/stdlib.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/streambuf
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/string
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/string.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/string_view
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/strstream
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/system_error
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/tgmath.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/thread
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/tuple
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/type_traits
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/typeindex
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/typeinfo
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/uchar.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/unordered_map
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/unordered_set
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/utility
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/valarray
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/variant
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/vector
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/wchar.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/include/wctype.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/algorithm.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/any.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/assert.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/atomic.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/barrier.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/bind.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/charconv.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/chrono.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/condition_variable.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/condition_variable_destructor.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/debug.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/exception.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/experimental/memory_resource.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/filesystem/directory_iterator.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/filesystem/filesystem_common.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/filesystem/int128_builtins.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/filesystem/operations.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/filesystem/posix_compat.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/format.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/functional.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/future.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/hash.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/include/apple_availability.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/include/atomic_support.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/include/config_elast.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/include/refstring.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/include/ryu/common.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/include/ryu/d2fixed.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/include/ryu/d2fixed_full_table.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/include/ryu/d2s.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/include/ryu/d2s_full_table.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/include/ryu/d2s_intrinsics.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/include/ryu/digit_table.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/include/ryu/f2s.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/include/ryu/ryu.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/include/sso_allocator.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/include/to_chars_floating_point.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/ios.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/ios.instantiations.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/iostream.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/legacy_debug_handler.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/legacy_pointer_safety.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/locale.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/memory.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/mutex.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/mutex_destructor.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/new.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/optional.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/random.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/random_shuffle.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/regex.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/ryu/d2fixed.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/ryu/d2s.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/ryu/f2s.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/shared_mutex.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/stdexcept.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/string.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/strstream.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/support/ibm/mbsnrtowcs.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/support/ibm/wcsnrtombs.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/support/ibm/xlocale_zos.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/support/runtime/exception_fallback.ipp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/support/runtime/exception_glibcxx.ipp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/support/runtime/exception_libcxxabi.ipp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/support/runtime/exception_libcxxrt.ipp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/support/runtime/exception_msvc.ipp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/support/runtime/exception_pointer_cxxabi.ipp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/support/runtime/exception_pointer_glibcxx.ipp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/support/runtime/exception_pointer_msvc.ipp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/support/runtime/exception_pointer_unimplemented.ipp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/support/runtime/new_handler_fallback.ipp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/support/runtime/stdexcept_default.ipp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/support/runtime/stdexcept_vcruntime.ipp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/support/win32/locale_win32.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/support/win32/support.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/support/win32/thread_win32.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/system_error.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/thread.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/typeinfo.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/utility.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/valarray.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/variant.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxx/src/vector.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxxabi/include/__cxxabi_config.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxxabi/include/cxxabi.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxxabi/src/abort_message.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxxabi/src/abort_message.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxxabi/src/aix_state_tab_eh.inc
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxxabi/src/cxa_aux_runtime.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxxabi/src/cxa_default_handlers.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxxabi/src/cxa_demangle.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxxabi/src/cxa_exception.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxxabi/src/cxa_exception.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxxabi/src/cxa_exception_storage.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxxabi/src/cxa_guard.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxxabi/src/cxa_guard_impl.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxxabi/src/cxa_handlers.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxxabi/src/cxa_handlers.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxxabi/src/cxa_noexception.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxxabi/src/cxa_personality.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxxabi/src/cxa_thread_atexit.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxxabi/src/cxa_vector.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxxabi/src/cxa_virtual.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxxabi/src/demangle/DemangleConfig.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxxabi/src/demangle/ItaniumDemangle.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxxabi/src/demangle/ItaniumNodes.def
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxxabi/src/demangle/StringView.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxxabi/src/demangle/Utility.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxxabi/src/fallback_malloc.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxxabi/src/fallback_malloc.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxxabi/src/private_typeinfo.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxxabi/src/private_typeinfo.h
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxxabi/src/stdlib_exception.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxxabi/src/stdlib_new_delete.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxxabi/src/stdlib_stdexcept.cpp
+ORIGIN: https://llvm.org/LICENSE.txt referenced by ../../../third_party/libcxxabi/src/stdlib_typeinfo.cpp
+TYPE: LicenseType.llvm
 FILE: ../../../third_party/libcxx/include/__algorithm/adjacent_find.h
 FILE: ../../../third_party/libcxx/include/__algorithm/all_of.h
 FILE: ../../../third_party/libcxx/include/__algorithm/any_of.h
@@ -3189,7 +1584,6 @@ FILE: ../../../third_party/libcxx/include/utility
 FILE: ../../../third_party/libcxx/include/valarray
 FILE: ../../../third_party/libcxx/include/variant
 FILE: ../../../third_party/libcxx/include/vector
-FILE: ../../../third_party/libcxx/include/version
 FILE: ../../../third_party/libcxx/include/wchar.h
 FILE: ../../../third_party/libcxx/include/wctype.h
 FILE: ../../../third_party/libcxx/src/algorithm.cpp
@@ -3311,7 +1705,7 @@ FILE: ../../../third_party/libcxxabi/src/stdlib_typeinfo.cpp
 ----------------------------------------------------------------------------------------------------
 Apache License
 Version 2.0, January 2004
-http://www.apache.org/licenses
+http://www.apache.org/licenses/
 
 TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -3511,6 +1905,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
+
 --- LLVM Exceptions to the Apache 2.0 License ----
 
 As an exception, if, as a result of your compiling your source code, portions
@@ -3529,21071 +1924,74 @@ Software.
 ====================================================================================================
 
 ====================================================================================================
-LIBRARY: abseil-cpp
-ORIGIN: ../../../third_party/abseil-cpp/LICENSE
-TYPE: LicenseType.apache
-FILE: ../../../third_party/abseil-cpp/CMake/Googletest/CMakeLists.txt.in
-FILE: ../../../third_party/abseil-cpp/CMake/abslConfig.cmake.in
-FILE: ../../../third_party/abseil-cpp/DIR_METADATA
-FILE: ../../../third_party/abseil-cpp/absl/copts/GENERATED_copts.bzl
-FILE: ../../../third_party/abseil-cpp/absl/copts/configure_copts.bzl
-FILE: ../../../third_party/abseil-cpp/absl/debugging/internal/stacktrace_aarch64-inl.inc
-FILE: ../../../third_party/abseil-cpp/absl/debugging/internal/stacktrace_unimplemented-inl.inc
-FILE: ../../../third_party/abseil-cpp/absl/flags/flag_benchmark.lds
-FILE: ../../../third_party/abseil-cpp/absl/random/gaussian_distribution.cc
-FILE: ../../../third_party/abseil-cpp/absl/time/internal/cctz/src/tzfile.h
-FILE: ../../../third_party/abseil-cpp/absl/time/internal/get_current_time_posix.inc
-FILE: ../../../third_party/abseil-cpp/absl/time/internal/zoneinfo.inc
-FILE: ../../../third_party/abseil-cpp/patches/0001-Turn-on-hardened-mode.patch
-FILE: ../../../third_party/abseil-cpp/patches/0002-delete-unprefixed-annotations.patch
-FILE: ../../../third_party/abseil-cpp/patches/0003-delete-static-initializer-in-stacktrace.patch
-FILE: ../../../third_party/abseil-cpp/symbols_arm64_dbg.def
-FILE: ../../../third_party/abseil-cpp/symbols_arm64_rel.def
-FILE: ../../../third_party/abseil-cpp/symbols_x64_dbg.def
-FILE: ../../../third_party/abseil-cpp/symbols_x64_rel.def
-FILE: ../../../third_party/abseil-cpp/symbols_x64_rel_asan.def
-FILE: ../../../third_party/abseil-cpp/symbols_x86_dbg.def
-FILE: ../../../third_party/abseil-cpp/symbols_x86_rel.def
-----------------------------------------------------------------------------------------------------
-Apache License
-Version 2.0, January 2004
-https://www.apache.org/licenses
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    https://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/internal.h
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/internal.h
-FILE: ../../../third_party/boringssl/src/crypto/obj/obj_dat.h
-FILE: ../../../third_party/boringssl/src/include/openssl/bn.h
-FILE: ../../../third_party/boringssl/src/include/openssl/nid.h
-FILE: ../../../third_party/boringssl/src/include/openssl/pem.h
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
-All rights reserved.
-
-This package is an SSL implementation written
-by Eric Young (eay@cryptsoft.com).
-The implementation was written so as to conform with Netscapes SSL.
-
-This library is free for commercial and non-commercial use as long as
-the following conditions are aheared to.  The following conditions
-apply to all code found in this distribution, be it the RC4, RSA,
-lhash, DES, etc., code; not just the SSL code.  The SSL documentation
-included with this distribution is covered by the same copyright terms
-except that the holder is Tim Hudson (tjh@cryptsoft.com).
-
-Copyright remains Eric Young's, and as such any Copyright notices in
-the code are not to be removed.
-If this package is used in a product, Eric Young should be given attribution
-as the author of the parts of the library used.
-This can be in the form of a textual message at program startup or
-in documentation (online or textual) provided with the package.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. All advertising materials mentioning features or use of this software
-   must display the following acknowledgement:
-   "This product includes cryptographic software written by
-    Eric Young (eay@cryptsoft.com)"
-   The word 'cryptographic' can be left out if the rouines from the library
-   being used are not cryptographic related :-).
-4. If you include any Windows specific code (or a derivative thereof) from
-   the apps directory (application code) you must include an acknowledgement:
-   "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
-
-THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-The licence and distribution terms for any publically available version or
-derivative of this code cannot be changed.  i.e. this code cannot simply be
-copied and put under another distribution licence
-[including the GNU Public Licence.]
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/asn1/a_bitstr.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/asn1/a_bitstr.c
-FILE: ../../../third_party/boringssl/src/crypto/asn1/a_bool.c
-FILE: ../../../third_party/boringssl/src/crypto/asn1/a_d2i_fp.c
-FILE: ../../../third_party/boringssl/src/crypto/asn1/a_dup.c
-FILE: ../../../third_party/boringssl/src/crypto/asn1/a_enum.c
-FILE: ../../../third_party/boringssl/src/crypto/asn1/a_gentm.c
-FILE: ../../../third_party/boringssl/src/crypto/asn1/a_i2d_fp.c
-FILE: ../../../third_party/boringssl/src/crypto/asn1/a_int.c
-FILE: ../../../third_party/boringssl/src/crypto/asn1/a_mbstr.c
-FILE: ../../../third_party/boringssl/src/crypto/asn1/a_object.c
-FILE: ../../../third_party/boringssl/src/crypto/asn1/a_octet.c
-FILE: ../../../third_party/boringssl/src/crypto/asn1/a_print.c
-FILE: ../../../third_party/boringssl/src/crypto/asn1/a_strex.c
-FILE: ../../../third_party/boringssl/src/crypto/asn1/a_strnid.c
-FILE: ../../../third_party/boringssl/src/crypto/asn1/a_time.c
-FILE: ../../../third_party/boringssl/src/crypto/asn1/a_type.c
-FILE: ../../../third_party/boringssl/src/crypto/asn1/a_utctm.c
-FILE: ../../../third_party/boringssl/src/crypto/asn1/a_utf8.c
-FILE: ../../../third_party/boringssl/src/crypto/asn1/asn1_lib.c
-FILE: ../../../third_party/boringssl/src/crypto/asn1/asn1_par.c
-FILE: ../../../third_party/boringssl/src/crypto/asn1/asn_pack.c
-FILE: ../../../third_party/boringssl/src/crypto/asn1/f_enum.c
-FILE: ../../../third_party/boringssl/src/crypto/asn1/f_int.c
-FILE: ../../../third_party/boringssl/src/crypto/asn1/f_string.c
-FILE: ../../../third_party/boringssl/src/crypto/asn1/tasn_dec.c
-FILE: ../../../third_party/boringssl/src/crypto/asn1/tasn_enc.c
-FILE: ../../../third_party/boringssl/src/crypto/asn1/tasn_fre.c
-FILE: ../../../third_party/boringssl/src/crypto/asn1/tasn_new.c
-FILE: ../../../third_party/boringssl/src/crypto/asn1/tasn_typ.c
-FILE: ../../../third_party/boringssl/src/crypto/asn1/tasn_utl.c
-FILE: ../../../third_party/boringssl/src/crypto/base64/base64.c
-FILE: ../../../third_party/boringssl/src/crypto/bio/bio.c
-FILE: ../../../third_party/boringssl/src/crypto/bio/bio_mem.c
-FILE: ../../../third_party/boringssl/src/crypto/bio/connect.c
-FILE: ../../../third_party/boringssl/src/crypto/bio/fd.c
-FILE: ../../../third_party/boringssl/src/crypto/bio/file.c
-FILE: ../../../third_party/boringssl/src/crypto/bio/hexdump.c
-FILE: ../../../third_party/boringssl/src/crypto/bio/internal.h
-FILE: ../../../third_party/boringssl/src/crypto/bio/printf.c
-FILE: ../../../third_party/boringssl/src/crypto/bio/socket.c
-FILE: ../../../third_party/boringssl/src/crypto/bn_extra/convert.c
-FILE: ../../../third_party/boringssl/src/crypto/buf/buf.c
-FILE: ../../../third_party/boringssl/src/crypto/cipher_extra/cipher_extra.c
-FILE: ../../../third_party/boringssl/src/crypto/cipher_extra/derive_key.c
-FILE: ../../../third_party/boringssl/src/crypto/cipher_extra/e_null.c
-FILE: ../../../third_party/boringssl/src/crypto/cipher_extra/e_rc2.c
-FILE: ../../../third_party/boringssl/src/crypto/cipher_extra/e_rc4.c
-FILE: ../../../third_party/boringssl/src/crypto/cipher_extra/internal.h
-FILE: ../../../third_party/boringssl/src/crypto/conf/conf.c
-FILE: ../../../third_party/boringssl/src/crypto/conf/conf_def.h
-FILE: ../../../third_party/boringssl/src/crypto/cpu-intel.c
-FILE: ../../../third_party/boringssl/src/crypto/dh_extra/dh_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/digest_extra/digest_extra.c
-FILE: ../../../third_party/boringssl/src/crypto/dsa/dsa.c
-FILE: ../../../third_party/boringssl/src/crypto/dsa/dsa_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/err/err.c
-FILE: ../../../third_party/boringssl/src/crypto/evp/evp.c
-FILE: ../../../third_party/boringssl/src/crypto/evp/evp_asn1.c
-FILE: ../../../third_party/boringssl/src/crypto/evp/evp_ctx.c
-FILE: ../../../third_party/boringssl/src/crypto/evp/internal.h
-FILE: ../../../third_party/boringssl/src/crypto/evp/sign.c
-FILE: ../../../third_party/boringssl/src/crypto/ex_data.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/add.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/bn.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/bn_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/bytes.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/cmp.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/div.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/exponentiation.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/gcd.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/generic.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/montgomery.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/mul.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/prime.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/random.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/shift.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/cipher/cipher.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/cipher/e_des.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/cipher/internal.h
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/des/des.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/des/internal.h
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/dh/check.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/dh/dh.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/digest/digest.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/digest/digests.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/digest/internal.h
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/hmac/hmac.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/md4/md4.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/md5/md5.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/rsa/blinding.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/rsa/internal.h
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/rsa/rsa.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/rsa/rsa_impl.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/sha/sha1-altivec.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/sha/sha1.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/sha/sha256.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/sha/sha512.c
-FILE: ../../../third_party/boringssl/src/crypto/hmac_extra/hmac_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/internal.h
-FILE: ../../../third_party/boringssl/src/crypto/lhash/internal.h
-FILE: ../../../third_party/boringssl/src/crypto/lhash/lhash.c
-FILE: ../../../third_party/boringssl/src/crypto/mem.c
-FILE: ../../../third_party/boringssl/src/crypto/obj/obj.c
-FILE: ../../../third_party/boringssl/src/crypto/obj/obj_xref.c
-FILE: ../../../third_party/boringssl/src/crypto/pem/pem_all.c
-FILE: ../../../third_party/boringssl/src/crypto/pem/pem_info.c
-FILE: ../../../third_party/boringssl/src/crypto/pem/pem_lib.c
-FILE: ../../../third_party/boringssl/src/crypto/pem/pem_oth.c
-FILE: ../../../third_party/boringssl/src/crypto/pem/pem_pk8.c
-FILE: ../../../third_party/boringssl/src/crypto/pem/pem_pkey.c
-FILE: ../../../third_party/boringssl/src/crypto/rc4/rc4.c
-FILE: ../../../third_party/boringssl/src/crypto/rsa_extra/rsa_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/stack/stack.c
-FILE: ../../../third_party/boringssl/src/crypto/thread.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/a_digest.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/a_sign.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/a_verify.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/algorithm.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/asn1_gen.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/by_dir.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/by_file.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/i2d_pr.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/name_print.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/t_crl.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/t_req.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/t_x509.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/t_x509a.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/x509.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/x509_att.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/x509_cmp.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/x509_d2.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/x509_def.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/x509_ext.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/x509_lu.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/x509_obj.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/x509_req.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/x509_set.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/x509_txt.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/x509_v3.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/x509_vfy.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/x509name.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/x509rset.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/x_all.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/x_attrib.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/x_crl.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/x_exten.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/x_info.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/x_name.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/x_pkey.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/x_pubkey.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/x_req.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/x_sig.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/x_spki.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/x_val.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/x_x509.c
-FILE: ../../../third_party/boringssl/src/decrepit/bio/base64_bio.c
-FILE: ../../../third_party/boringssl/src/decrepit/blowfish/blowfish.c
-FILE: ../../../third_party/boringssl/src/decrepit/cast/cast.c
-FILE: ../../../third_party/boringssl/src/decrepit/cast/cast_tables.c
-FILE: ../../../third_party/boringssl/src/decrepit/cast/internal.h
-FILE: ../../../third_party/boringssl/src/decrepit/des/cfb64ede.c
-FILE: ../../../third_party/boringssl/src/decrepit/macros.h
-FILE: ../../../third_party/boringssl/src/decrepit/rc4/rc4_decrepit.c
-FILE: ../../../third_party/boringssl/src/decrepit/ripemd/ripemd.c
-FILE: ../../../third_party/boringssl/src/decrepit/rsa/rsa_decrepit.c
-FILE: ../../../third_party/boringssl/src/decrepit/ssl/ssl_decrepit.c
-FILE: ../../../third_party/boringssl/src/include/openssl/asn1.h
-FILE: ../../../third_party/boringssl/src/include/openssl/base64.h
-FILE: ../../../third_party/boringssl/src/include/openssl/bio.h
-FILE: ../../../third_party/boringssl/src/include/openssl/blowfish.h
-FILE: ../../../third_party/boringssl/src/include/openssl/buf.h
-FILE: ../../../third_party/boringssl/src/include/openssl/cast.h
-FILE: ../../../third_party/boringssl/src/include/openssl/cipher.h
-FILE: ../../../third_party/boringssl/src/include/openssl/conf.h
-FILE: ../../../third_party/boringssl/src/include/openssl/cpu.h
-FILE: ../../../third_party/boringssl/src/include/openssl/des.h
-FILE: ../../../third_party/boringssl/src/include/openssl/dh.h
-FILE: ../../../third_party/boringssl/src/include/openssl/digest.h
-FILE: ../../../third_party/boringssl/src/include/openssl/dsa.h
-FILE: ../../../third_party/boringssl/src/include/openssl/err.h
-FILE: ../../../third_party/boringssl/src/include/openssl/evp.h
-FILE: ../../../third_party/boringssl/src/include/openssl/evp_errors.h
-FILE: ../../../third_party/boringssl/src/include/openssl/ex_data.h
-FILE: ../../../third_party/boringssl/src/include/openssl/hmac.h
-FILE: ../../../third_party/boringssl/src/include/openssl/lhash.h
-FILE: ../../../third_party/boringssl/src/include/openssl/md4.h
-FILE: ../../../third_party/boringssl/src/include/openssl/md5.h
-FILE: ../../../third_party/boringssl/src/include/openssl/mem.h
-FILE: ../../../third_party/boringssl/src/include/openssl/obj.h
-FILE: ../../../third_party/boringssl/src/include/openssl/rc4.h
-FILE: ../../../third_party/boringssl/src/include/openssl/ripemd.h
-FILE: ../../../third_party/boringssl/src/include/openssl/rsa.h
-FILE: ../../../third_party/boringssl/src/include/openssl/sha.h
-FILE: ../../../third_party/boringssl/src/include/openssl/ssl.h
-FILE: ../../../third_party/boringssl/src/include/openssl/ssl3.h
-FILE: ../../../third_party/boringssl/src/include/openssl/stack.h
-FILE: ../../../third_party/boringssl/src/include/openssl/thread.h
-FILE: ../../../third_party/boringssl/src/include/openssl/tls1.h
-FILE: ../../../third_party/boringssl/src/include/openssl/type_check.h
-FILE: ../../../third_party/boringssl/src/include/openssl/x509.h
-FILE: ../../../third_party/boringssl/src/include/openssl/x509_vfy.h
-FILE: ../../../third_party/boringssl/src/ssl/d1_both.cc
-FILE: ../../../third_party/boringssl/src/ssl/d1_pkt.cc
-FILE: ../../../third_party/boringssl/src/ssl/d1_srtp.cc
-FILE: ../../../third_party/boringssl/src/ssl/dtls_record.cc
-FILE: ../../../third_party/boringssl/src/ssl/extensions.cc
-FILE: ../../../third_party/boringssl/src/ssl/handshake.cc
-FILE: ../../../third_party/boringssl/src/ssl/handshake_client.cc
-FILE: ../../../third_party/boringssl/src/ssl/handshake_server.cc
-FILE: ../../../third_party/boringssl/src/ssl/internal.h
-FILE: ../../../third_party/boringssl/src/ssl/s3_both.cc
-FILE: ../../../third_party/boringssl/src/ssl/s3_lib.cc
-FILE: ../../../third_party/boringssl/src/ssl/s3_pkt.cc
-FILE: ../../../third_party/boringssl/src/ssl/ssl_asn1.cc
-FILE: ../../../third_party/boringssl/src/ssl/ssl_cert.cc
-FILE: ../../../third_party/boringssl/src/ssl/ssl_cipher.cc
-FILE: ../../../third_party/boringssl/src/ssl/ssl_file.cc
-FILE: ../../../third_party/boringssl/src/ssl/ssl_lib.cc
-FILE: ../../../third_party/boringssl/src/ssl/ssl_privkey.cc
-FILE: ../../../third_party/boringssl/src/ssl/ssl_session.cc
-FILE: ../../../third_party/boringssl/src/ssl/ssl_stat.cc
-FILE: ../../../third_party/boringssl/src/ssl/ssl_transcript.cc
-FILE: ../../../third_party/boringssl/src/ssl/ssl_x509.cc
-FILE: ../../../third_party/boringssl/src/ssl/t1_enc.cc
-FILE: ../../../third_party/boringssl/src/ssl/tls_method.cc
-FILE: ../../../third_party/boringssl/src/ssl/tls_record.cc
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
-All rights reserved.
-
-This package is an SSL implementation written
-by Eric Young (eay@cryptsoft.com).
-The implementation was written so as to conform with Netscapes SSL.
-
-This library is free for commercial and non-commercial use as long as
-the following conditions are aheared to.  The following conditions
-apply to all code found in this distribution, be it the RC4, RSA,
-lhash, DES, etc., code; not just the SSL code.  The SSL documentation
-included with this distribution is covered by the same copyright terms
-except that the holder is Tim Hudson (tjh@cryptsoft.com).
-
-Copyright remains Eric Young's, and as such any Copyright notices in
-the code are not to be removed.
-If this package is used in a product, Eric Young should be given attribution
-as the author of the parts of the library used.
-This can be in the form of a textual message at program startup or
-in documentation (online or textual) provided with the package.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. All advertising materials mentioning features or use of this software
-   must display the following acknowledgement:
-   "This product includes cryptographic software written by
-    Eric Young (eay@cryptsoft.com)"
-   The word 'cryptographic' can be left out if the rouines from the library
-   being used are not cryptographic related :-).
-4. If you include any Windows specific code (or a derivative thereof) from
-   the apps directory (application code) you must include an acknowledgement:
-   "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
-
-THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-The licence and distribution terms for any publically available version or
-derivative of this code cannot be changed.  i.e. this code cannot simply be
-copied and put under another distribution licence
-[including the GNU Public Licence.]
-====================================================================================================
-
-====================================================================================================
-LIBRARY: freetype2
-LIBRARY: zlib
-ORIGIN: ../../../third_party/freetype2/src/gzip/inffast.h + ../../../third_party/freetype2/src/gzip/zlib.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/freetype2/src/gzip/inffast.h
-FILE: ../../../third_party/zlib/inffast.h
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1995-2003, 2010 Mark Adler
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/contrib/optimizations/inffast_chunk.h + ../../../third_party/zlib/zlib.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/zlib/contrib/optimizations/inffast_chunk.h
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1995-2003, 2010 Mark Adler
-Copyright (C) 2017 ARM, Inc.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/uncompr.c + ../../../third_party/zlib/zlib.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/zlib/uncompr.c
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1995-2003, 2010, 2014, 2016 Jean-loup Gailly, Mark Adler
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: freetype2
-LIBRARY: zlib
-ORIGIN: ../../../third_party/freetype2/src/gzip/inftrees.h + ../../../third_party/freetype2/src/gzip/zlib.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/freetype2/src/gzip/inftrees.h
-FILE: ../../../third_party/zlib/inftrees.h
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1995-2005, 2010 Mark Adler
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/compress.c + ../../../third_party/zlib/zlib.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/zlib/compress.c
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1995-2005, 2014, 2016 Jean-loup Gailly, Mark Adler
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: freetype2
-ORIGIN: ../../../third_party/freetype2/src/gzip/crc32.c + ../../../third_party/freetype2/src/gzip/zlib.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/freetype2/src/gzip/crc32.c
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1995-2006, 2010, 2011, 2012, 2016 Mark Adler
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: freetype2
 LIBRARY: zlib
-ORIGIN: ../../../third_party/freetype2/src/gzip/adler32.c + ../../../third_party/freetype2/src/gzip/zlib.h
+ORIGIN: ../../../third_party/zlib/zlib.h
 TYPE: LicenseType.zlib
-FILE: ../../../third_party/freetype2/src/gzip/adler32.c
 FILE: ../../../third_party/zlib/adler32.c
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1995-2011, 2016 Mark Adler
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: freetype2
-LIBRARY: zlib
-ORIGIN: ../../../third_party/freetype2/src/gzip/ftzconf.h + ../../../third_party/freetype2/src/gzip/zlib.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/freetype2/src/gzip/ftzconf.h
-FILE: ../../../third_party/freetype2/src/gzip/zutil.h
-FILE: ../../../third_party/zlib/zconf.h
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: freetype2
-ORIGIN: ../../../third_party/freetype2/src/gzip/infback.c + ../../../third_party/freetype2/src/gzip/zlib.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/freetype2/src/gzip/infback.c
-FILE: ../../../third_party/freetype2/src/gzip/inflate.c
-FILE: ../../../third_party/freetype2/src/gzip/inflate.h
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1995-2016 Mark Adler
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: freetype2
-LIBRARY: zlib
-ORIGIN: ../../../third_party/freetype2/src/gzip/zutil.c + ../../../third_party/freetype2/src/gzip/zlib.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/freetype2/src/gzip/zutil.c
-FILE: ../../../third_party/zlib/zutil.c
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1995-2017 Jean-loup Gailly
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: freetype2
-ORIGIN: ../../../third_party/freetype2/src/gzip/zlib.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/freetype2/src/gzip/crc32.h
-FILE: ../../../third_party/freetype2/src/gzip/inffixed.h
-FILE: ../../../third_party/freetype2/src/gzip/patches/freetype-zlib.diff
-FILE: ../../../third_party/freetype2/src/gzip/zlib.h
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: freetype2
-LIBRARY: zlib
-ORIGIN: ../../../third_party/freetype2/src/gzip/inffast.c + ../../../third_party/freetype2/src/gzip/zlib.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/freetype2/src/gzip/inffast.c
-FILE: ../../../third_party/freetype2/src/gzip/inftrees.c
+FILE: ../../../third_party/zlib/compress.c
 FILE: ../../../third_party/zlib/contrib/optimizations/inffast_chunk.c
-FILE: ../../../third_party/zlib/inffast.c
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1995-2017 Mark Adler
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/deflate.h + ../../../third_party/zlib/zlib.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/zlib/deflate.h
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1995-2018 Jean-loup Gailly
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/inflate.h + ../../../third_party/zlib/zlib.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/zlib/inflate.h
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1995-2019 Mark Adler
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/trees.c + ../../../third_party/zlib/zlib.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/zlib/trees.c
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1995-2021 Jean-loup Gailly
-detect_data_type() function provided freely by Cosmin Truta, 2006
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/zlib.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/zlib/deflate.c
-FILE: ../../../third_party/zlib/zlib.h
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/zutil.h + ../../../third_party/zlib/zlib.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/zlib/zutil.h
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1995-2022 Jean-loup Gailly, Mark Adler
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/contrib/optimizations/inflate.c + ../../../third_party/zlib/zlib.h
-TYPE: LicenseType.zlib
+FILE: ../../../third_party/zlib/contrib/optimizations/inffast_chunk.h
 FILE: ../../../third_party/zlib/contrib/optimizations/inflate.c
 FILE: ../../../third_party/zlib/crc32.c
-FILE: ../../../third_party/zlib/infback.c
-FILE: ../../../third_party/zlib/inflate.c
-FILE: ../../../third_party/zlib/inftrees.c
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1995-2022 Mark Adler
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/contrib/minizip/zip.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/zlib/contrib/minizip/zip.h
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
-Modifications for Zip64 support
-Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
-For more info read MiniZip_info.txt
-
-Condition of use and distribution are the same than zlib :
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/contrib/minizip/unzip.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/zlib/contrib/minizip/unzip.h
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
-Modifications of Unzip for Zip64
-Copyright (C) 2007-2008 Even Rouault
-
-Modifications for Zip64 support on both zip and unzip
-Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
-For more info read MiniZip_info.txt
-
-Condition of use and distribution are the same than zlib :
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libjpeg-turbo
-ORIGIN: ../../../third_party/libjpeg-turbo/simd/jccolext-sse2.asm + ../../../third_party/libjpeg-turbo/simd/jsimdext.inc
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/libjpeg-turbo/simd/jccolext-sse2.asm
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1999-2006, MIYASAKA Masaru.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: freetype2
-ORIGIN: ../../../third_party/freetype2/src/pcf/pcf.h
-TYPE: LicenseType.mit
-FILE: ../../../third_party/freetype2/src/pcf/pcf.h
-----------------------------------------------------------------------------------------------------
-Copyright (C) 2000, 2001, 2002, 2003, 2006, 2010 by
-Francesco Zappa Nardelli
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: freetype2
-ORIGIN: ../../../third_party/freetype2/src/pcf/pcfdrivr.c
-TYPE: LicenseType.mit
-FILE: ../../../third_party/freetype2/src/pcf/pcfdrivr.c
-----------------------------------------------------------------------------------------------------
-Copyright (C) 2000-2004, 2006-2011, 2013, 2014 by
-Francesco Zappa Nardelli
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: freetype2
-ORIGIN: ../../../third_party/freetype2/src/bdf/bdf.c
-TYPE: LicenseType.mit
-FILE: ../../../third_party/freetype2/src/bdf/bdf.c
-----------------------------------------------------------------------------------------------------
-Copyright (C) 2001, 2002 by
-Francesco Zappa Nardelli
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: freetype2
-ORIGIN: ../../../third_party/freetype2/src/bdf/bdfdrivr.h
-TYPE: LicenseType.mit
-FILE: ../../../third_party/freetype2/src/bdf/bdfdrivr.h
-----------------------------------------------------------------------------------------------------
-Copyright (C) 2001, 2002, 2003, 2004 by
-Francesco Zappa Nardelli
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: freetype2
-ORIGIN: ../../../third_party/freetype2/src/bdf/bdfdrivr.c
-TYPE: LicenseType.mit
-FILE: ../../../third_party/freetype2/src/bdf/bdfdrivr.c
-----------------------------------------------------------------------------------------------------
-Copyright (C) 2001-2008, 2011, 2013, 2014 by
-Francesco Zappa Nardelli
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: freetype2
-ORIGIN: ../../../third_party/freetype2/src/gzip/gzguts.h + ../../../third_party/freetype2/src/gzip/zlib.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/freetype2/src/gzip/gzguts.h
-----------------------------------------------------------------------------------------------------
-Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/gzclose.c + ../../../third_party/zlib/zlib.h
-TYPE: LicenseType.zlib
+FILE: ../../../third_party/zlib/crc_folding.c
+FILE: ../../../third_party/zlib/deflate.c
+FILE: ../../../third_party/zlib/deflate.h
 FILE: ../../../third_party/zlib/gzclose.c
-----------------------------------------------------------------------------------------------------
-Copyright (C) 2004, 2010 Mark Adler
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/gzread.c + ../../../third_party/zlib/zlib.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/zlib/gzread.c
-----------------------------------------------------------------------------------------------------
-Copyright (C) 2004-2017 Mark Adler
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/gzguts.h + ../../../third_party/zlib/zlib.h
-TYPE: LicenseType.zlib
 FILE: ../../../third_party/zlib/gzguts.h
 FILE: ../../../third_party/zlib/gzlib.c
-FILE: ../../../third_party/zlib/gzwrite.c
-----------------------------------------------------------------------------------------------------
-Copyright (C) 2004-2019 Mark Adler
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: angle
-ORIGIN: ../../../third_party/angle/src/third_party/systeminfo/SystemInfo.cpp
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/src/third_party/systeminfo/SystemInfo.cpp
-FILE: ../../../third_party/angle/src/third_party/systeminfo/SystemInfo.h
-----------------------------------------------------------------------------------------------------
-Copyright (C) 2009 Apple Inc. All Rights Reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libjpeg-turbo
-ORIGIN: ../../../third_party/libjpeg-turbo/simd/jccolext-sse2-64.asm + ../../../third_party/libjpeg-turbo/simd/jsimdext.inc
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/libjpeg-turbo/simd/jccolext-sse2-64.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jccolor-sse2-64.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jccolor-sse2.asm
-----------------------------------------------------------------------------------------------------
-Copyright (C) 2009, D. R. Commander.
-
-Based on the x86 SIMD extension for IJG JPEG library
-Copyright (C) 1999-2006, MIYASAKA Masaru.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libjpeg-turbo
-ORIGIN: ../../../third_party/libjpeg-turbo/simd/jchuff-sse2-64.asm + ../../../third_party/libjpeg-turbo/simd/jsimdext.inc
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/libjpeg-turbo/simd/jchuff-sse2-64.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jchuff-sse2.asm
-----------------------------------------------------------------------------------------------------
-Copyright (C) 2009-2011, 2014-2016, D. R. Commander.
-Copyright (C) 2015, Matthieu Darbois.
-
-Based on the x86 SIMD extension for IJG JPEG library
-Copyright (C) 1999-2006, MIYASAKA Masaru.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libjpeg-turbo
-ORIGIN: ../../../third_party/libjpeg-turbo/simd/jsimd_arm64_neon.S
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/libjpeg-turbo/simd/jsimd_arm64_neon.S
-----------------------------------------------------------------------------------------------------
-Copyright (C) 2009-2011, Nokia Corporation and/or its subsidiary(-ies).
-All Rights Reserved.
-Author: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Copyright (C) 2013-2014, Linaro Limited.  All Rights Reserved.
-Author: Ragesh Radhakrishnan <ragesh.r@linaro.org>
-Copyright (C) 2014-2016, D. R. Commander.  All Rights Reserved.
-Copyright (C) 2015-2016, Matthieu Darbois.  All Rights Reserved.
-Copyright (C) 2016, Siarhei Siamashka.  All Rights Reserved.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libjpeg-turbo
-ORIGIN: ../../../third_party/libjpeg-turbo/simd/jsimd_arm_neon.S
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/libjpeg-turbo/simd/jsimd_arm_neon.S
-----------------------------------------------------------------------------------------------------
-Copyright (C) 2009-2011, Nokia Corporation and/or its subsidiary(-ies).
-All Rights Reserved.
-Author: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Copyright (C) 2014, Siarhei Siamashka.  All Rights Reserved.
-Copyright (C) 2014, Linaro Limited.  All Rights Reserved.
-Copyright (C) 2015, D. R. Commander.  All Rights Reserved.
-Copyright (C) 2015-2016, Matthieu Darbois.  All Rights Reserved.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-gobject-enums.cc.tmpl
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-gobject-enums.cc.tmpl
-FILE: ../../../third_party/harfbuzz/src/hb-gobject-structs.h
-FILE: ../../../third_party/harfbuzz/src/hb-gobject.h
-----------------------------------------------------------------------------------------------------
-Copyright (C) 2011  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libjpeg-turbo
-ORIGIN: ../../../third_party/libjpeg-turbo/simd/jcgray-sse2-64.asm + ../../../third_party/libjpeg-turbo/simd/jsimdext.inc
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/libjpeg-turbo/simd/jcgray-sse2-64.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jcgray-sse2.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jcgryext-sse2-64.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jcgryext-sse2.asm
-----------------------------------------------------------------------------------------------------
-Copyright (C) 2011, D. R. Commander.
-
-Based on the x86 SIMD extension for IJG JPEG library
-Copyright (C) 1999-2006, MIYASAKA Masaru.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ucd.cc
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ucd.cc
-----------------------------------------------------------------------------------------------------
-Copyright (C) 2012 Grigori Goronzy <greg@kinoho.net>
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: xxhash
-ORIGIN: ../../../third_party/angle/src/common/third_party/xxhash/xxhash.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/src/common/third_party/xxhash/xxhash.c
-----------------------------------------------------------------------------------------------------
-Copyright (C) 2012-2016, Yann Collet
-
-BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: xxhash
-ORIGIN: ../../../third_party/angle/src/common/third_party/xxhash/xxhash.h
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/src/common/third_party/xxhash/xxhash.h
-----------------------------------------------------------------------------------------------------
-Copyright (C) 2012-2016, Yann Collet.
-
-BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-gobject-enums.h.tmpl
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-gobject-enums.h.tmpl
-----------------------------------------------------------------------------------------------------
-Copyright (C) 2013  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/crc_folding.c + ../../../third_party/zlib/zlib.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/zlib/crc_folding.c
-----------------------------------------------------------------------------------------------------
-Copyright (C) 2013 Intel Corporation. All rights reserved.
-Authors:
- Wajdi Feghali   <wajdi.k.feghali@intel.com>
- Jim Guilford    <james.guilford@intel.com>
- Vinodh Gopal    <vinodh.gopal@intel.com>
- Erdinc Ozturk   <erdinc.ozturk@intel.com>
- Jim Kukunas     <james.t.kukunas@linux.intel.com>
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libjpeg-turbo
-ORIGIN: ../../../third_party/libjpeg-turbo/simd/jsimd_mips_dspr2_asm.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/libjpeg-turbo/simd/jsimd_mips_dspr2_asm.h
-----------------------------------------------------------------------------------------------------
-Copyright (C) 2013, MIPS Technologies, Inc., California.
-All Rights Reserved.
-Authors:  Teodora Novkovic (teodora.novkovic@imgtec.com)
-          Darko Laus       (darko.laus@imgtec.com)
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libjpeg-turbo
-ORIGIN: ../../../third_party/libjpeg-turbo/simd/jsimd_mips_dspr2.S
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/libjpeg-turbo/simd/jsimd_mips_dspr2.S
-----------------------------------------------------------------------------------------------------
-Copyright (C) 2013-2014, MIPS Technologies, Inc., California.
-All Rights Reserved.
-Authors:  Teodora Novkovic (teodora.novkovic@imgtec.com)
-          Darko Laus       (darko.laus@imgtec.com)
-Copyright (C) 2015, D. R. Commander.  All Rights Reserved.
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libjpeg-turbo
-ORIGIN: ../../../third_party/libjpeg-turbo/simd/jccolor-altivec.c
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/libjpeg-turbo/simd/jccolor-altivec.c
-FILE: ../../../third_party/libjpeg-turbo/simd/jcgray-altivec.c
-FILE: ../../../third_party/libjpeg-turbo/simd/jfdctfst-altivec.c
-FILE: ../../../third_party/libjpeg-turbo/simd/jfdctint-altivec.c
-----------------------------------------------------------------------------------------------------
-Copyright (C) 2014, D. R. Commander.  All Rights Reserved.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libjpeg-turbo
-ORIGIN: ../../../third_party/libjpeg-turbo/simd/jidctfst-altivec.c
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/libjpeg-turbo/simd/jidctfst-altivec.c
-FILE: ../../../third_party/libjpeg-turbo/simd/jidctint-altivec.c
-FILE: ../../../third_party/libjpeg-turbo/simd/jquanti-altivec.c
-FILE: ../../../third_party/libjpeg-turbo/simd/jsimd_altivec.h
-----------------------------------------------------------------------------------------------------
-Copyright (C) 2014-2015, D. R. Commander.  All Rights Reserved.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libjpeg-turbo
-ORIGIN: ../../../third_party/libjpeg-turbo/simd/jccolext-altivec.c
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/libjpeg-turbo/simd/jccolext-altivec.c
-FILE: ../../../third_party/libjpeg-turbo/simd/jcgryext-altivec.c
-----------------------------------------------------------------------------------------------------
-Copyright (C) 2014-2015, D. R. Commander.  All Rights Reserved.
-Copyright (C) 2014, Jay Foad.  All Rights Reserved.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libjpeg-turbo
-ORIGIN: ../../../third_party/libjpeg-turbo/simd/jcsample-altivec.c
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/libjpeg-turbo/simd/jcsample-altivec.c
-FILE: ../../../third_party/libjpeg-turbo/simd/jdcolext-altivec.c
-FILE: ../../../third_party/libjpeg-turbo/simd/jdcolor-altivec.c
-FILE: ../../../third_party/libjpeg-turbo/simd/jdmerge-altivec.c
-FILE: ../../../third_party/libjpeg-turbo/simd/jdmrgext-altivec.c
-FILE: ../../../third_party/libjpeg-turbo/simd/jdsample-altivec.c
-----------------------------------------------------------------------------------------------------
-Copyright (C) 2015, D. R. Commander.  All Rights Reserved.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: icu
-ORIGIN: ../../../third_party/icu/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/icu/DIR_METADATA
-FILE: ../../../third_party/icu/android/icudtl.dat
-FILE: ../../../third_party/icu/cast/brkitr.patch
-FILE: ../../../third_party/icu/cast/icudtl.dat
-FILE: ../../../third_party/icu/chromeos/icudtl.dat
-FILE: ../../../third_party/icu/chromeos/icudtl.dat.hash
-FILE: ../../../third_party/icu/common/icudtb.dat
-FILE: ../../../third_party/icu/common/icudtl.dat
-FILE: ../../../third_party/icu/flutter/brkitr.patch
-FILE: ../../../third_party/icu/flutter/icudtl.dat
-FILE: ../../../third_party/icu/fuzzers/fuzzer_utils.h
-FILE: ../../../third_party/icu/fuzzers/icu_appendable_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_break_iterator_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_break_iterator_utf32_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_number_format_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_to_case_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_ucasemap_fuzzer.cc
-FILE: ../../../third_party/icu/ios/icudtl.dat
-FILE: ../../../third_party/icu/patches/ardatepattern.patch
-FILE: ../../../third_party/icu/patches/atomic_template_instantiation.patch
-FILE: ../../../third_party/icu/patches/cjdict.patch
-FILE: ../../../third_party/icu/patches/configure.patch
-FILE: ../../../third_party/icu/patches/data_symb.patch
-FILE: ../../../third_party/icu/patches/fix-bool-mix-use.patch
-FILE: ../../../third_party/icu/patches/fuchsia.patch
-FILE: ../../../third_party/icu/patches/gb_table.patch
-FILE: ../../../third_party/icu/patches/iso2022jp.patch
-FILE: ../../../third_party/icu/patches/isvalidenum.patch
-FILE: ../../../third_party/icu/patches/khmer-dictbe.patch
-FILE: ../../../third_party/icu/patches/locale1.patch
-FILE: ../../../third_party/icu/patches/locale_google.patch
-FILE: ../../../third_party/icu/patches/restrace.patch
-FILE: ../../../third_party/icu/patches/wordbrk.patch
-FILE: ../../../third_party/icu/patches/wpo.patch
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-implicithan-icu4x.icu
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-implicithan.icu
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-unihan-icu4x.icu
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-unihan.icu
-FILE: ../../../third_party/icu/source/data/in/nfc.nrm
-FILE: ../../../third_party/icu/source/data/in/nfkc.nrm
-FILE: ../../../third_party/icu/source/data/in/nfkc_cf.nrm
-FILE: ../../../third_party/icu/source/data/in/pnames.icu
-FILE: ../../../third_party/icu/source/data/in/ubidi.icu
-FILE: ../../../third_party/icu/source/data/in/ucase.icu
-FILE: ../../../third_party/icu/source/data/in/uemoji.icu
-FILE: ../../../third_party/icu/source/data/in/ulayout.icu
-FILE: ../../../third_party/icu/source/data/in/unames.icu
-FILE: ../../../third_party/icu/source/data/in/uprops.icu
-FILE: ../../../third_party/icu/source/data/in/uts46.nrm
-FILE: ../../../third_party/icu/source/data/mappings/big5-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/euc-jp-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/euc-kr-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/gb18030.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm866-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-10-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-13-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-14-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-15-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-16-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-2-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-3-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-4-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-5-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-6-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-7-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-8-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/koi8-r-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/koi8-u-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/macintosh-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/shift_jis-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1250-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1251-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1252-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1253-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1254-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1255-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1256-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1257-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1258-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-874-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-936-2000.ucm
-FILE: ../../../third_party/icu/source/data/mappings/x-mac-cyrillic-html.ucm
-FILE: ../../../third_party/icu/source/extra/scrptrun/srtest.dsp
-FILE: ../../../third_party/icu/source/extra/scrptrun/srtest.dsw
-FILE: ../../../third_party/icu/source/tools/tzcode/asctime.c
-FILE: ../../../third_party/icu/source/tools/tzcode/ialloc.c
-FILE: ../../../third_party/icu/source/tools/tzcode/localtime.c
-FILE: ../../../third_party/icu/source/tools/tzcode/private.h
-FILE: ../../../third_party/icu/source/tools/tzcode/scheck.c
-FILE: ../../../third_party/icu/source/tools/tzcode/tzfile.h
-FILE: ../../../third_party/icu/source/tools/tzcode/tzselect.ksh
-FILE: ../../../third_party/icu/source/tools/tzcode/zdump.c
-FILE: ../../../third_party/icu/source/tools/tzcode/zic.c
-FILE: ../../../third_party/icu/tzres/metaZones.res
-FILE: ../../../third_party/icu/tzres/timezoneTypes.res
-FILE: ../../../third_party/icu/tzres/zoneinfo64.res
-----------------------------------------------------------------------------------------------------
-Copyright (C) 2016 and later: Unicode, Inc. and others.
-License & terms of use: http://www.unicode.org/copyright.html
-Copyright (c) 2015 International Business Machines Corporation
-and others. All Rights Reserved.
-
-Project: https://github.com/rober42539/lao-dictionary
-Dictionary: https://github.com/rober42539/lao-dictionary/laodict.txt
-License: https://github.com/rober42539/lao-dictionary/LICENSE.txt
-         (copied below)
-
-	This file is derived from the above dictionary version of Nov 22, 2020
-
- Copyright (C) 2013 Brian Eugene Wilson, Robert Martin Campbell.
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer. Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions and
- the following disclaimer in the documentation and/or other materials
- provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/contrib/optimizations/chunkcopy.h + ../../../LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/zlib/contrib/optimizations/chunkcopy.h
-----------------------------------------------------------------------------------------------------
-Copyright (C) 2017 ARM, Inc.
-Copyright 2017 The Chromium Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libtess2
-ORIGIN: ../../../third_party/libtess2/Include/tesselator.h
-TYPE: LicenseType.mit
-FILE: ../../../third_party/libtess2/Include/tesselator.h
-FILE: ../../../third_party/libtess2/Source/bucketalloc.c
-FILE: ../../../third_party/libtess2/Source/bucketalloc.h
-FILE: ../../../third_party/libtess2/Source/dict.c
-FILE: ../../../third_party/libtess2/Source/dict.h
-FILE: ../../../third_party/libtess2/Source/geom.c
-FILE: ../../../third_party/libtess2/Source/geom.h
-FILE: ../../../third_party/libtess2/Source/mesh.c
-FILE: ../../../third_party/libtess2/Source/mesh.h
-FILE: ../../../third_party/libtess2/Source/priorityq.c
-FILE: ../../../third_party/libtess2/Source/priorityq.h
-FILE: ../../../third_party/libtess2/Source/sweep.c
-FILE: ../../../third_party/libtess2/Source/sweep.h
-FILE: ../../../third_party/libtess2/Source/tess.c
-FILE: ../../../third_party/libtess2/Source/tess.h
-----------------------------------------------------------------------------------------------------
-Copyright (C) [dates of first publication] Silicon Graphics, Inc.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice including the dates of first publication and either this
-permission notice or a reference to http://oss.sgi.com/projects/FreeB/ shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL SILICON GRAPHICS, INC.
-BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
-OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of Silicon Graphics, Inc. shall not
-be used in advertising or otherwise to promote the sale, use or other dealings in
-this Software without prior written authorization from Silicon Graphics, Inc.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libjpeg-turbo
-ORIGIN: ../../../third_party/libjpeg-turbo/tjunittest.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/libjpeg-turbo/tjunittest.c
-----------------------------------------------------------------------------------------------------
-Copyright (C)2009-2014 D. R. Commander.  All Rights Reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-- Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-- Neither the name of the libjpeg-turbo Project nor the names of its
-  contributors may be used to endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS",
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libjpeg-turbo
-ORIGIN: ../../../third_party/libjpeg-turbo/turbojpeg.h
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/libjpeg-turbo/turbojpeg.h
-----------------------------------------------------------------------------------------------------
-Copyright (C)2009-2015 D. R. Commander.  All Rights Reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-- Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-- Neither the name of the libjpeg-turbo Project nor the names of its
-  contributors may be used to endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS",
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libjpeg-turbo
-ORIGIN: ../../../third_party/libjpeg-turbo/turbojpeg.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/libjpeg-turbo/jconfig.h
-FILE: ../../../third_party/libjpeg-turbo/jconfig.h.in
-FILE: ../../../third_party/libjpeg-turbo/jconfigint.h
-FILE: ../../../third_party/libjpeg-turbo/jconfigint.h.in
-FILE: ../../../third_party/libjpeg-turbo/jpeg_nbits_table.h
-FILE: ../../../third_party/libjpeg-turbo/libjpeg.map.in
-FILE: ../../../third_party/libjpeg-turbo/simd/jpeg_nbits_table.inc
-FILE: ../../../third_party/libjpeg-turbo/simd/jsimdcfg.inc
-FILE: ../../../third_party/libjpeg-turbo/simd/jsimdcfg.inc.h
-FILE: ../../../third_party/libjpeg-turbo/tjbench.c
-FILE: ../../../third_party/libjpeg-turbo/turbojpeg-mapfile
-FILE: ../../../third_party/libjpeg-turbo/turbojpeg-mapfile.jni
-FILE: ../../../third_party/libjpeg-turbo/turbojpeg.c
-----------------------------------------------------------------------------------------------------
-Copyright (C)2009-2016 D. R. Commander.  All Rights Reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-- Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-- Neither the name of the libjpeg-turbo Project nor the names of its
-  contributors may be used to endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS",
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libjpeg-turbo
-ORIGIN: ../../../third_party/libjpeg-turbo/bmp.h
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/libjpeg-turbo/bmp.h
-FILE: ../../../third_party/libjpeg-turbo/jcstest.c
-FILE: ../../../third_party/libjpeg-turbo/tjutil.c
-FILE: ../../../third_party/libjpeg-turbo/tjutil.h
-----------------------------------------------------------------------------------------------------
-Copyright (C)2011 D. R. Commander.  All Rights Reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-- Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-- Neither the name of the libjpeg-turbo Project nor the names of its
-  contributors may be used to endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS",
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libjpeg-turbo
-ORIGIN: ../../../third_party/libjpeg-turbo/bmp.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/libjpeg-turbo/bmp.c
-----------------------------------------------------------------------------------------------------
-Copyright (C)2011, 2015 D. R. Commander.  All Rights Reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-- Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-- Neither the name of the libjpeg-turbo Project nor the names of its
-  contributors may be used to endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS",
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libjpeg-turbo
-ORIGIN: ../../../third_party/libjpeg-turbo/turbojpeg-jni.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/libjpeg-turbo/turbojpeg-jni.c
-----------------------------------------------------------------------------------------------------
-Copyright (C)2011-2016 D. R. Commander.  All Rights Reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-- Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-- Neither the name of the libjpeg-turbo Project nor the names of its
-  contributors may be used to endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS",
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: icu
-ORIGIN: ../../../third_party/icu/LICENSE
-TYPE: LicenseType.icu
-FILE: ../../../third_party/icu/DIR_METADATA
-FILE: ../../../third_party/icu/android/icudtl.dat
-FILE: ../../../third_party/icu/cast/brkitr.patch
-FILE: ../../../third_party/icu/cast/icudtl.dat
-FILE: ../../../third_party/icu/chromeos/icudtl.dat
-FILE: ../../../third_party/icu/chromeos/icudtl.dat.hash
-FILE: ../../../third_party/icu/common/icudtb.dat
-FILE: ../../../third_party/icu/common/icudtl.dat
-FILE: ../../../third_party/icu/flutter/brkitr.patch
-FILE: ../../../third_party/icu/flutter/icudtl.dat
-FILE: ../../../third_party/icu/fuzzers/fuzzer_utils.h
-FILE: ../../../third_party/icu/fuzzers/icu_appendable_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_break_iterator_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_break_iterator_utf32_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_number_format_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_to_case_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_ucasemap_fuzzer.cc
-FILE: ../../../third_party/icu/ios/icudtl.dat
-FILE: ../../../third_party/icu/patches/ardatepattern.patch
-FILE: ../../../third_party/icu/patches/atomic_template_instantiation.patch
-FILE: ../../../third_party/icu/patches/cjdict.patch
-FILE: ../../../third_party/icu/patches/configure.patch
-FILE: ../../../third_party/icu/patches/data_symb.patch
-FILE: ../../../third_party/icu/patches/fix-bool-mix-use.patch
-FILE: ../../../third_party/icu/patches/fuchsia.patch
-FILE: ../../../third_party/icu/patches/gb_table.patch
-FILE: ../../../third_party/icu/patches/iso2022jp.patch
-FILE: ../../../third_party/icu/patches/isvalidenum.patch
-FILE: ../../../third_party/icu/patches/khmer-dictbe.patch
-FILE: ../../../third_party/icu/patches/locale1.patch
-FILE: ../../../third_party/icu/patches/locale_google.patch
-FILE: ../../../third_party/icu/patches/restrace.patch
-FILE: ../../../third_party/icu/patches/wordbrk.patch
-FILE: ../../../third_party/icu/patches/wpo.patch
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-implicithan-icu4x.icu
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-implicithan.icu
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-unihan-icu4x.icu
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-unihan.icu
-FILE: ../../../third_party/icu/source/data/in/nfc.nrm
-FILE: ../../../third_party/icu/source/data/in/nfkc.nrm
-FILE: ../../../third_party/icu/source/data/in/nfkc_cf.nrm
-FILE: ../../../third_party/icu/source/data/in/pnames.icu
-FILE: ../../../third_party/icu/source/data/in/ubidi.icu
-FILE: ../../../third_party/icu/source/data/in/ucase.icu
-FILE: ../../../third_party/icu/source/data/in/uemoji.icu
-FILE: ../../../third_party/icu/source/data/in/ulayout.icu
-FILE: ../../../third_party/icu/source/data/in/unames.icu
-FILE: ../../../third_party/icu/source/data/in/uprops.icu
-FILE: ../../../third_party/icu/source/data/in/uts46.nrm
-FILE: ../../../third_party/icu/source/data/mappings/big5-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/euc-jp-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/euc-kr-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/gb18030.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm866-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-10-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-13-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-14-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-15-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-16-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-2-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-3-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-4-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-5-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-6-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-7-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-8-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/koi8-r-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/koi8-u-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/macintosh-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/shift_jis-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1250-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1251-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1252-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1253-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1254-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1255-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1256-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1257-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1258-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-874-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-936-2000.ucm
-FILE: ../../../third_party/icu/source/data/mappings/x-mac-cyrillic-html.ucm
-FILE: ../../../third_party/icu/source/extra/scrptrun/srtest.dsp
-FILE: ../../../third_party/icu/source/extra/scrptrun/srtest.dsw
-FILE: ../../../third_party/icu/source/tools/tzcode/asctime.c
-FILE: ../../../third_party/icu/source/tools/tzcode/ialloc.c
-FILE: ../../../third_party/icu/source/tools/tzcode/localtime.c
-FILE: ../../../third_party/icu/source/tools/tzcode/private.h
-FILE: ../../../third_party/icu/source/tools/tzcode/scheck.c
-FILE: ../../../third_party/icu/source/tools/tzcode/tzfile.h
-FILE: ../../../third_party/icu/source/tools/tzcode/tzselect.ksh
-FILE: ../../../third_party/icu/source/tools/tzcode/zdump.c
-FILE: ../../../third_party/icu/source/tools/tzcode/zic.c
-FILE: ../../../third_party/icu/tzres/metaZones.res
-FILE: ../../../third_party/icu/tzres/timezoneTypes.res
-FILE: ../../../third_party/icu/tzres/zoneinfo64.res
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1995-2016 International Business Machines Corporation and others
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, and/or sell copies of the Software, and to permit persons
-to whom the Software is furnished to do so, provided that the above
-copyright notice(s) and this permission notice appear in all copies of
-the Software and that both the above copyright notice(s) and this
-permission notice appear in supporting documentation.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY
-SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-of the copyright holder.
-
-All trademarks and registered trademarks mentioned herein are the
-property of their respective owners.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: expat
-ORIGIN: ../../../third_party/expat/expat/lib/expat_external.h
-TYPE: LicenseType.mit
-FILE: ../../../third_party/expat/expat/lib/expat_external.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2000-2004 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2001-2002 Greg Stein <gstein@users.sourceforge.net>
-Copyright (c) 2002-2006 Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2016      Cristian Rodríguez <crrodriguez@opensuse.org>
-Copyright (c) 2016-2019 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
-Copyright (c) 2018      Yury Gribov <tetra2005@gmail.com>
-Licensed under the MIT license:
-
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
-
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
-
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: expat
-ORIGIN: ../../../third_party/expat/expat/lib/expat.h
-TYPE: LicenseType.mit
-FILE: ../../../third_party/expat/expat/lib/expat.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2000-2005 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2001-2002 Greg Stein <gstein@users.sourceforge.net>
-Copyright (c) 2002-2016 Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2016-2022 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2016      Cristian Rodríguez <crrodriguez@opensuse.org>
-Copyright (c) 2016      Thomas Beutlich <tc@tbeu.de>
-Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
-Copyright (c) 2022      Thijs Schreijer <thijs@thijsschreijer.nl>
-Licensed under the MIT license:
-
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
-
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
-
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: expat
-ORIGIN: ../../../third_party/expat/expat/lib/xmlparse.c
-TYPE: LicenseType.mit
-FILE: ../../../third_party/expat/expat/lib/xmlparse.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2000-2006 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2001-2002 Greg Stein <gstein@users.sourceforge.net>
-Copyright (c) 2002-2016 Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2005-2009 Steven Solie <steven@solie.ca>
-Copyright (c) 2016      Eric Rahm <erahm@mozilla.com>
-Copyright (c) 2016-2022 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2016      Gaurav <g.gupta@samsung.com>
-Copyright (c) 2016      Thomas Beutlich <tc@tbeu.de>
-Copyright (c) 2016      Gustavo Grieco <gustavo.grieco@imag.fr>
-Copyright (c) 2016      Pascal Cuoq <cuoq@trust-in-soft.com>
-Copyright (c) 2016      Ed Schouten <ed@nuxi.nl>
-Copyright (c) 2017-2022 Rhodri James <rhodri@wildebeest.org.uk>
-Copyright (c) 2017      Václav Slavík <vaclav@slavik.io>
-Copyright (c) 2017      Viktor Szakats <commit@vsz.me>
-Copyright (c) 2017      Chanho Park <chanho61.park@samsung.com>
-Copyright (c) 2017      Rolf Eike Beer <eike@sf-mail.de>
-Copyright (c) 2017      Hans Wennborg <hans@chromium.org>
-Copyright (c) 2018      Anton Maklakov <antmak.pub@gmail.com>
-Copyright (c) 2018      Benjamin Peterson <benjamin@python.org>
-Copyright (c) 2018      Marco Maggi <marco.maggi-ipsu@poste.it>
-Copyright (c) 2018      Mariusz Zaborski <oshogbo@vexillium.org>
-Copyright (c) 2019      David Loffredo <loffredo@steptools.com>
-Copyright (c) 2019-2020 Ben Wagner <bungeman@chromium.org>
-Copyright (c) 2019      Vadim Zeitlin <vadim@zeitlins.org>
-Copyright (c) 2021      Dong-hee Na <donghee.na@python.org>
-Copyright (c) 2022      Samanta Navarro <ferivoz@riseup.net>
-Copyright (c) 2022      Jeffrey Walton <noloader@gmail.com>
-Copyright (c) 2022      Jann Horn <jannh@google.com>
-Licensed under the MIT license:
-
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
-
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
-
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: expat
-ORIGIN: ../../../third_party/expat/expat/xmlwf/unixfilemap.c
-TYPE: LicenseType.mit
-FILE: ../../../third_party/expat/expat/xmlwf/unixfilemap.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2001-2002 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2006      Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2016-2017 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
-Licensed under the MIT license:
-
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
-
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
-
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: expat
-ORIGIN: ../../../third_party/expat/expat/lib/xmltok.c
-TYPE: LicenseType.mit
-FILE: ../../../third_party/expat/expat/lib/xmltok.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2001-2003 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2002      Greg Stein <gstein@users.sourceforge.net>
-Copyright (c) 2002-2016 Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2005-2009 Steven Solie <steven@solie.ca>
-Copyright (c) 2016-2022 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2016      Pascal Cuoq <cuoq@trust-in-soft.com>
-Copyright (c) 2016      Don Lewis <truckman@apache.org>
-Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
-Copyright (c) 2017      Alexander Bluhm <alexander.bluhm@gmx.net>
-Copyright (c) 2017      Benbuck Nason <bnason@netflix.com>
-Copyright (c) 2017      José Gutiérrez de la Concha <jose@zeroc.com>
-Copyright (c) 2019      David Loffredo <loffredo@steptools.com>
-Copyright (c) 2021      Dong-hee Na <donghee.na@python.org>
-Copyright (c) 2022      Martin Ettl <ettl.martin78@googlemail.com>
-Licensed under the MIT license:
-
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
-
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
-
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: expat
-ORIGIN: ../../../third_party/expat/expat/xmlwf/xmlwf.c
-TYPE: LicenseType.mit
-FILE: ../../../third_party/expat/expat/xmlwf/xmlwf.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2001-2003 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2004-2009 Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2005-2007 Steven Solie <steven@solie.ca>
-Copyright (c) 2016-2022 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
-Copyright (c) 2019      David Loffredo <loffredo@steptools.com>
-Copyright (c) 2020      Joe Orton <jorton@redhat.com>
-Copyright (c) 2020      Kleber Tarcísio <klebertarcisio@yahoo.com.br>
-Copyright (c) 2021      Tim Bray <tbray@textuality.com>
-Copyright (c) 2022      Martin Ettl <ettl.martin78@googlemail.com>
-Licensed under the MIT license:
-
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
-
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
-
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: expat
-ORIGIN: ../../../third_party/expat/expat/xmlwf/readfilemap.c
-TYPE: LicenseType.mit
-FILE: ../../../third_party/expat/expat/xmlwf/readfilemap.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2001-2004 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2002-2009 Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2016-2017 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
-Copyright (c) 2017      Franek Korta <fkorta@gmail.com>
-Licensed under the MIT license:
-
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
-
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
-
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: expat
-ORIGIN: ../../../third_party/expat/expat/lib/xmltok.h
-TYPE: LicenseType.mit
-FILE: ../../../third_party/expat/expat/lib/xmltok.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2002-2005 Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2016-2017 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
-Licensed under the MIT license:
-
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
-
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
-
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: expat
-ORIGIN: ../../../third_party/expat/expat/lib/xmltok_impl.c
-TYPE: LicenseType.mit
-FILE: ../../../third_party/expat/expat/lib/xmltok_impl.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2002-2016 Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2016-2022 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
-Copyright (c) 2018      Benjamin Peterson <benjamin@python.org>
-Copyright (c) 2018      Anton Maklakov <antmak.pub@gmail.com>
-Copyright (c) 2019      David Loffredo <loffredo@steptools.com>
-Copyright (c) 2020      Boris Kolpackov <boris@codesynthesis.com>
-Copyright (c) 2022      Martin Ettl <ettl.martin78@googlemail.com>
-Licensed under the MIT license:
-
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
-
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
-
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: expat
-ORIGIN: ../../../third_party/expat/expat/xmlwf/xmlfile.h
-TYPE: LicenseType.mit
-FILE: ../../../third_party/expat/expat/xmlwf/xmlfile.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2005      Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2016-2019 Sebastian Pipping <sebastian@pipping.org>
-Licensed under the MIT license:
-
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
-
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
-
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: expat
-ORIGIN: ../../../third_party/expat/expat/xmlwf/codepage.c
-TYPE: LicenseType.mit
-FILE: ../../../third_party/expat/expat/xmlwf/codepage.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2005-2006 Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2016-2019 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2019      David Loffredo <loffredo@steptools.com>
-Licensed under the MIT license:
-
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
-
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
-
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: expat
-ORIGIN: ../../../third_party/expat/expat/gennmtab/gennmtab.c
-TYPE: LicenseType.mit
-FILE: ../../../third_party/expat/expat/gennmtab/gennmtab.c
-FILE: ../../../third_party/expat/expat/xmlwf/codepage.h
-FILE: ../../../third_party/expat/expat/xmlwf/filemap.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2016-2017 Sebastian Pipping <sebastian@pipping.org>
-Licensed under the MIT license:
-
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
-
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
-
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: expat
-ORIGIN: ../../../third_party/expat/expat/xmlwf/win32filemap.c
-TYPE: LicenseType.mit
-FILE: ../../../third_party/expat/expat/xmlwf/win32filemap.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2016-2022 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2022      Martin Ettl <ettl.martin78@googlemail.com>
-Licensed under the MIT license:
-
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
-
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
-
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: expat
-ORIGIN: ../../../third_party/expat/expat/lib/asciitab.h
-TYPE: LicenseType.mit
-FILE: ../../../third_party/expat/expat/lib/asciitab.h
-FILE: ../../../third_party/expat/expat/lib/iasciitab.h
-FILE: ../../../third_party/expat/expat/lib/latin1tab.h
-FILE: ../../../third_party/expat/expat/lib/utf8tab.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2017      Sebastian Pipping <sebastian@pipping.org>
-Licensed under the MIT license:
-
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
-
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
-
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: expat
-ORIGIN: ../../../third_party/expat/expat/lib/xmltok_ns.c
-TYPE: LicenseType.mit
-FILE: ../../../third_party/expat/expat/lib/xmltok_ns.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2002      Greg Stein <gstein@users.sourceforge.net>
-Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2002-2006 Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2017-2021 Sebastian Pipping <sebastian@pipping.org>
-Licensed under the MIT license:
-
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
-
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
-
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: expat
-ORIGIN: ../../../third_party/expat/expat/lib/xmlrole.c
-TYPE: LicenseType.mit
-FILE: ../../../third_party/expat/expat/lib/xmlrole.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2002      Greg Stein <gstein@users.sourceforge.net>
-Copyright (c) 2002-2006 Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2002-2003 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2005-2009 Steven Solie <steven@solie.ca>
-Copyright (c) 2016-2021 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
-Copyright (c) 2019      David Loffredo <loffredo@steptools.com>
-Copyright (c) 2021      Dong-hee Na <donghee.na@python.org>
-Licensed under the MIT license:
-
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
-
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
-
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: expat
-ORIGIN: ../../../third_party/expat/expat/lib/xmlrole.h
-TYPE: LicenseType.mit
-FILE: ../../../third_party/expat/expat/lib/xmlrole.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2002      Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2017      Sebastian Pipping <sebastian@pipping.org>
-Licensed under the MIT license:
-
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
-
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
-
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: expat
-ORIGIN: ../../../third_party/expat/expat/xmlwf/xmlfile.c
-TYPE: LicenseType.mit
-FILE: ../../../third_party/expat/expat/xmlwf/xmlfile.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2002-2003 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2004-2006 Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2005-2007 Steven Solie <steven@solie.ca>
-Copyright (c) 2016-2021 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
-Copyright (c) 2019      David Loffredo <loffredo@steptools.com>
-Copyright (c) 2021      Dong-hee Na <donghee.na@python.org>
-Licensed under the MIT license:
-
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
-
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
-
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: expat
-ORIGIN: ../../../third_party/expat/expat/lib/xmltok_impl.h
-TYPE: LicenseType.mit
-FILE: ../../../third_party/expat/expat/lib/xmltok_impl.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2017-2019 Sebastian Pipping <sebastian@pipping.org>
-Licensed under the MIT license:
-
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
-
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
-
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: expat
-ORIGIN: ../../../third_party/expat/expat/examples/elements.c
-TYPE: LicenseType.mit
-FILE: ../../../third_party/expat/expat/examples/elements.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2001-2003 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2004-2006 Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2005-2007 Steven Solie <steven@solie.ca>
-Copyright (c) 2016-2022 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
-Copyright (c) 2019      Zhongyuan Zhou <zhouzhongyuan@huawei.com>
-Licensed under the MIT license:
-
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
-
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
-
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: expat
-ORIGIN: ../../../third_party/expat/expat/xmlwf/ct.c
-TYPE: LicenseType.mit
-FILE: ../../../third_party/expat/expat/xmlwf/ct.c
-FILE: ../../../third_party/expat/expat/xmlwf/xmlmime.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2016-2017 Sebastian Pipping <sebastian@pipping.org>
-Licensed under the MIT license:
-
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
-
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
-
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: expat
-ORIGIN: ../../../third_party/expat/expat/xmlwf/xmlmime.c
-TYPE: LicenseType.mit
-FILE: ../../../third_party/expat/expat/xmlwf/xmlmime.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2016-2018 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2018      Marco Maggi <marco.maggi-ipsu@poste.it>
-Licensed under the MIT license:
-
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
-
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
-
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: expat
-ORIGIN: ../../../third_party/expat/expat/xmlwf/xmltchar.h
-TYPE: LicenseType.mit
-FILE: ../../../third_party/expat/expat/xmlwf/xmltchar.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2016-2021 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
-Licensed under the MIT license:
-
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
-
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
-
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: expat
-ORIGIN: ../../../third_party/expat/COPYING
-TYPE: LicenseType.mit
-FILE: ../../../third_party/expat/expat/Changes
-FILE: ../../../third_party/expat/expat/cmake/autotools/expat-config-version.cmake.in
-FILE: ../../../third_party/expat/expat/cmake/autotools/expat-noconfig__linux.cmake.in
-FILE: ../../../third_party/expat/expat/cmake/autotools/expat-noconfig__macos.cmake.in
-FILE: ../../../third_party/expat/expat/cmake/autotools/expat-noconfig__windows.cmake.in
-FILE: ../../../third_party/expat/expat/expat.pc.in
-FILE: ../../../third_party/expat/expat/lib/siphash.h
-FILE: ../../../third_party/expat/expat/win32/version.rc
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper
-Copyright (c) 2001-2022 Expat maintainers
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/jacobi.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/jacobi.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/sqrt.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   openssl-core@openssl.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/gcd.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/ex_data.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/gcd.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/prime.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/random.c
-FILE: ../../../third_party/boringssl/src/crypto/internal.h
-FILE: ../../../third_party/boringssl/src/include/openssl/base.h
-FILE: ../../../third_party/boringssl/src/include/openssl/ex_data.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   openssl-core@openssl.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/pem/pem_all.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/pem/pem_all.c
-FILE: ../../../third_party/boringssl/src/decrepit/dh/dh_decrepit.c
-FILE: ../../../third_party/boringssl/src/decrepit/dsa/dsa_decrepit.c
-FILE: ../../../third_party/boringssl/src/include/openssl/ssl3.h
-FILE: ../../../third_party/boringssl/src/ssl/handshake.cc
-FILE: ../../../third_party/boringssl/src/ssl/s3_both.cc
-FILE: ../../../third_party/boringssl/src/ssl/s3_pkt.cc
-FILE: ../../../third_party/boringssl/src/ssl/tls_record.cc
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   openssl-core@openssl.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/bio/pair.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/bio/pair.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1998-2003 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   openssl-core@openssl.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/ctx.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/ctx.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1998-2004 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   openssl-core@openssl.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/ecdsa_extra/ecdsa_asn1.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/ecdsa_extra/ecdsa_asn1.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ecdsa/ecdsa.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ecdsa/ecdsa_test.cc
-FILE: ../../../third_party/boringssl/src/include/openssl/ecdsa.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   openssl-core@OpenSSL.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/exponentiation.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/exponentiation.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/ec.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/ec_key.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/ec_montgomery.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/internal.h
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/oct.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/simple.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/wnaf.c
-FILE: ../../../third_party/boringssl/src/include/openssl/ec.h
-FILE: ../../../third_party/boringssl/src/include/openssl/ec_key.h
-FILE: ../../../third_party/boringssl/src/ssl/d1_both.cc
-FILE: ../../../third_party/boringssl/src/ssl/d1_pkt.cc
-FILE: ../../../third_party/boringssl/src/ssl/dtls_record.cc
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   openssl-core@openssl.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/err/err.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/err/err.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/internal.h
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/montgomery.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/rsa/blinding.c
-FILE: ../../../third_party/boringssl/src/include/openssl/bn.h
-FILE: ../../../third_party/boringssl/src/include/openssl/err.h
-FILE: ../../../third_party/boringssl/src/include/openssl/tls1.h
-FILE: ../../../third_party/boringssl/src/ssl/d1_srtp.cc
-FILE: ../../../third_party/boringssl/src/ssl/ssl_session.cc
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   openssl-core@openssl.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/fipsmodule/tls/kdf.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/tls/kdf.c
-FILE: ../../../third_party/boringssl/src/decrepit/ssl/ssl_decrepit.c
-FILE: ../../../third_party/boringssl/src/include/openssl/ssl.h
-FILE: ../../../third_party/boringssl/src/ssl/extensions.cc
-FILE: ../../../third_party/boringssl/src/ssl/handshake_client.cc
-FILE: ../../../third_party/boringssl/src/ssl/handshake_server.cc
-FILE: ../../../third_party/boringssl/src/ssl/internal.h
-FILE: ../../../third_party/boringssl/src/ssl/s3_lib.cc
-FILE: ../../../third_party/boringssl/src/ssl/ssl_cert.cc
-FILE: ../../../third_party/boringssl/src/ssl/ssl_cipher.cc
-FILE: ../../../third_party/boringssl/src/ssl/ssl_file.cc
-FILE: ../../../third_party/boringssl/src/ssl/ssl_lib.cc
-FILE: ../../../third_party/boringssl/src/ssl/ssl_transcript.cc
-FILE: ../../../third_party/boringssl/src/ssl/ssl_x509.cc
-FILE: ../../../third_party/boringssl/src/ssl/t1_enc.cc
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1998-2007 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   openssl-core@openssl.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/include/openssl/arm_arch.h
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/include/openssl/arm_arch.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   openssl-core@openssl.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: icu
-ORIGIN: ../../../third_party/icu/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/icu/DIR_METADATA
-FILE: ../../../third_party/icu/android/icudtl.dat
-FILE: ../../../third_party/icu/cast/brkitr.patch
-FILE: ../../../third_party/icu/cast/icudtl.dat
-FILE: ../../../third_party/icu/chromeos/icudtl.dat
-FILE: ../../../third_party/icu/chromeos/icudtl.dat.hash
-FILE: ../../../third_party/icu/common/icudtb.dat
-FILE: ../../../third_party/icu/common/icudtl.dat
-FILE: ../../../third_party/icu/flutter/brkitr.patch
-FILE: ../../../third_party/icu/flutter/icudtl.dat
-FILE: ../../../third_party/icu/fuzzers/fuzzer_utils.h
-FILE: ../../../third_party/icu/fuzzers/icu_appendable_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_break_iterator_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_break_iterator_utf32_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_number_format_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_to_case_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_ucasemap_fuzzer.cc
-FILE: ../../../third_party/icu/ios/icudtl.dat
-FILE: ../../../third_party/icu/patches/ardatepattern.patch
-FILE: ../../../third_party/icu/patches/atomic_template_instantiation.patch
-FILE: ../../../third_party/icu/patches/cjdict.patch
-FILE: ../../../third_party/icu/patches/configure.patch
-FILE: ../../../third_party/icu/patches/data_symb.patch
-FILE: ../../../third_party/icu/patches/fix-bool-mix-use.patch
-FILE: ../../../third_party/icu/patches/fuchsia.patch
-FILE: ../../../third_party/icu/patches/gb_table.patch
-FILE: ../../../third_party/icu/patches/iso2022jp.patch
-FILE: ../../../third_party/icu/patches/isvalidenum.patch
-FILE: ../../../third_party/icu/patches/khmer-dictbe.patch
-FILE: ../../../third_party/icu/patches/locale1.patch
-FILE: ../../../third_party/icu/patches/locale_google.patch
-FILE: ../../../third_party/icu/patches/restrace.patch
-FILE: ../../../third_party/icu/patches/wordbrk.patch
-FILE: ../../../third_party/icu/patches/wpo.patch
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-implicithan-icu4x.icu
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-implicithan.icu
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-unihan-icu4x.icu
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-unihan.icu
-FILE: ../../../third_party/icu/source/data/in/nfc.nrm
-FILE: ../../../third_party/icu/source/data/in/nfkc.nrm
-FILE: ../../../third_party/icu/source/data/in/nfkc_cf.nrm
-FILE: ../../../third_party/icu/source/data/in/pnames.icu
-FILE: ../../../third_party/icu/source/data/in/ubidi.icu
-FILE: ../../../third_party/icu/source/data/in/ucase.icu
-FILE: ../../../third_party/icu/source/data/in/uemoji.icu
-FILE: ../../../third_party/icu/source/data/in/ulayout.icu
-FILE: ../../../third_party/icu/source/data/in/unames.icu
-FILE: ../../../third_party/icu/source/data/in/uprops.icu
-FILE: ../../../third_party/icu/source/data/in/uts46.nrm
-FILE: ../../../third_party/icu/source/data/mappings/big5-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/euc-jp-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/euc-kr-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/gb18030.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm866-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-10-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-13-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-14-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-15-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-16-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-2-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-3-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-4-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-5-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-6-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-7-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-8-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/koi8-r-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/koi8-u-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/macintosh-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/shift_jis-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1250-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1251-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1252-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1253-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1254-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1255-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1256-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1257-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1258-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-874-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-936-2000.ucm
-FILE: ../../../third_party/icu/source/data/mappings/x-mac-cyrillic-html.ucm
-FILE: ../../../third_party/icu/source/extra/scrptrun/srtest.dsp
-FILE: ../../../third_party/icu/source/extra/scrptrun/srtest.dsw
-FILE: ../../../third_party/icu/source/tools/tzcode/asctime.c
-FILE: ../../../third_party/icu/source/tools/tzcode/ialloc.c
-FILE: ../../../third_party/icu/source/tools/tzcode/localtime.c
-FILE: ../../../third_party/icu/source/tools/tzcode/private.h
-FILE: ../../../third_party/icu/source/tools/tzcode/scheck.c
-FILE: ../../../third_party/icu/source/tools/tzcode/tzfile.h
-FILE: ../../../third_party/icu/source/tools/tzcode/tzselect.ksh
-FILE: ../../../third_party/icu/source/tools/tzcode/zdump.c
-FILE: ../../../third_party/icu/source/tools/tzcode/zic.c
-FILE: ../../../third_party/icu/tzres/metaZones.res
-FILE: ../../../third_party/icu/tzres/timezoneTypes.res
-FILE: ../../../third_party/icu/tzres/zoneinfo64.res
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1999 Computer Systems and Communication Lab,
-                   Institute of Information Science, Academia
-  *                    Sinica. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-. Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-. Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in
-  the documentation and/or other materials provided with the
-  distribution.
-. Neither the name of the Computer Systems and Communication Lab
-  nor the names of its contributors may be used to endorse or
-  promote products derived from this software without specific
-  prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: icu
-ORIGIN: ../../../third_party/icu/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/icu/DIR_METADATA
-FILE: ../../../third_party/icu/android/icudtl.dat
-FILE: ../../../third_party/icu/cast/brkitr.patch
-FILE: ../../../third_party/icu/cast/icudtl.dat
-FILE: ../../../third_party/icu/chromeos/icudtl.dat
-FILE: ../../../third_party/icu/chromeos/icudtl.dat.hash
-FILE: ../../../third_party/icu/common/icudtb.dat
-FILE: ../../../third_party/icu/common/icudtl.dat
-FILE: ../../../third_party/icu/flutter/brkitr.patch
-FILE: ../../../third_party/icu/flutter/icudtl.dat
-FILE: ../../../third_party/icu/fuzzers/fuzzer_utils.h
-FILE: ../../../third_party/icu/fuzzers/icu_appendable_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_break_iterator_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_break_iterator_utf32_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_number_format_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_to_case_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_ucasemap_fuzzer.cc
-FILE: ../../../third_party/icu/ios/icudtl.dat
-FILE: ../../../third_party/icu/patches/ardatepattern.patch
-FILE: ../../../third_party/icu/patches/atomic_template_instantiation.patch
-FILE: ../../../third_party/icu/patches/cjdict.patch
-FILE: ../../../third_party/icu/patches/configure.patch
-FILE: ../../../third_party/icu/patches/data_symb.patch
-FILE: ../../../third_party/icu/patches/fix-bool-mix-use.patch
-FILE: ../../../third_party/icu/patches/fuchsia.patch
-FILE: ../../../third_party/icu/patches/gb_table.patch
-FILE: ../../../third_party/icu/patches/iso2022jp.patch
-FILE: ../../../third_party/icu/patches/isvalidenum.patch
-FILE: ../../../third_party/icu/patches/khmer-dictbe.patch
-FILE: ../../../third_party/icu/patches/locale1.patch
-FILE: ../../../third_party/icu/patches/locale_google.patch
-FILE: ../../../third_party/icu/patches/restrace.patch
-FILE: ../../../third_party/icu/patches/wordbrk.patch
-FILE: ../../../third_party/icu/patches/wpo.patch
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-implicithan-icu4x.icu
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-implicithan.icu
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-unihan-icu4x.icu
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-unihan.icu
-FILE: ../../../third_party/icu/source/data/in/nfc.nrm
-FILE: ../../../third_party/icu/source/data/in/nfkc.nrm
-FILE: ../../../third_party/icu/source/data/in/nfkc_cf.nrm
-FILE: ../../../third_party/icu/source/data/in/pnames.icu
-FILE: ../../../third_party/icu/source/data/in/ubidi.icu
-FILE: ../../../third_party/icu/source/data/in/ucase.icu
-FILE: ../../../third_party/icu/source/data/in/uemoji.icu
-FILE: ../../../third_party/icu/source/data/in/ulayout.icu
-FILE: ../../../third_party/icu/source/data/in/unames.icu
-FILE: ../../../third_party/icu/source/data/in/uprops.icu
-FILE: ../../../third_party/icu/source/data/in/uts46.nrm
-FILE: ../../../third_party/icu/source/data/mappings/big5-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/euc-jp-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/euc-kr-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/gb18030.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm866-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-10-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-13-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-14-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-15-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-16-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-2-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-3-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-4-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-5-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-6-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-7-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-8-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/koi8-r-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/koi8-u-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/macintosh-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/shift_jis-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1250-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1251-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1252-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1253-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1254-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1255-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1256-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1257-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1258-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-874-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-936-2000.ucm
-FILE: ../../../third_party/icu/source/data/mappings/x-mac-cyrillic-html.ucm
-FILE: ../../../third_party/icu/source/extra/scrptrun/srtest.dsp
-FILE: ../../../third_party/icu/source/extra/scrptrun/srtest.dsw
-FILE: ../../../third_party/icu/source/tools/tzcode/asctime.c
-FILE: ../../../third_party/icu/source/tools/tzcode/ialloc.c
-FILE: ../../../third_party/icu/source/tools/tzcode/localtime.c
-FILE: ../../../third_party/icu/source/tools/tzcode/private.h
-FILE: ../../../third_party/icu/source/tools/tzcode/scheck.c
-FILE: ../../../third_party/icu/source/tools/tzcode/tzfile.h
-FILE: ../../../third_party/icu/source/tools/tzcode/tzselect.ksh
-FILE: ../../../third_party/icu/source/tools/tzcode/zdump.c
-FILE: ../../../third_party/icu/source/tools/tzcode/zic.c
-FILE: ../../../third_party/icu/tzres/metaZones.res
-FILE: ../../../third_party/icu/tzres/timezoneTypes.res
-FILE: ../../../third_party/icu/tzres/zoneinfo64.res
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1999 TaBE Project.
-Copyright (c) 1999 Pai-Hsiang Hsiao.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-. Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-. Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in
-  the documentation and/or other materials provided with the
-  distribution.
-. Neither the name of the TaBE Project nor the names of its
-  contributors may be used to endorse or promote products derived
-  from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/evp/pbkdf.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/evp/pbkdf.c
-FILE: ../../../third_party/boringssl/src/crypto/pkcs8/internal.h
-FILE: ../../../third_party/boringssl/src/crypto/pkcs8/p5_pbev2.c
-FILE: ../../../third_party/boringssl/src/crypto/pkcs8/pkcs8.c
-FILE: ../../../third_party/boringssl/src/crypto/pkcs8/pkcs8_x509.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/x509_trs.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/x509spki.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/x_x509a.c
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/tab_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/v3_akey.c
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/v3_akeya.c
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/v3_bcons.c
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/v3_bitst.c
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/v3_enum.c
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/v3_extku.c
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/v3_ia5.c
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/v3_info.c
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/v3_lib.c
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/v3_prn.c
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/v3_skey.c
-FILE: ../../../third_party/boringssl/src/include/openssl/pkcs8.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: expat
-ORIGIN: ../../../third_party/expat/expat/lib/ascii.h
-TYPE: LicenseType.mit
-FILE: ../../../third_party/expat/expat/lib/ascii.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1999-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2007      Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2017      Sebastian Pipping <sebastian@pipping.org>
-Licensed under the MIT license:
-
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
-
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
-
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/x509v3/v3_conf.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/v3_conf.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1999-2002 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/x509v3/v3_alt.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/v3_alt.c
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/v3_utl.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1999-2003 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/x509v3/ext_dat.h
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/ext_dat.h
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/v3_cpols.c
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/v3_int.c
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/v3_purp.c
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/v3name_test.cc
-FILE: ../../../third_party/boringssl/src/include/openssl/x509v3.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1999-2004 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/ssl/d1_lib.cc
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/ssl/d1_lib.cc
-FILE: ../../../third_party/boringssl/src/ssl/dtls_method.cc
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   openssl-core@OpenSSL.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/fipsmodule/digest/md32_common.h
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/digest/md32_common.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1999-2007 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/x509v3/v3_crld.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/v3_crld.c
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/v3_genn.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 1999-2008 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: expat
-ORIGIN: ../../../third_party/expat/expat/examples/outline.c
-TYPE: LicenseType.mit
-FILE: ../../../third_party/expat/expat/examples/outline.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2001-2003 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2005-2007 Steven Solie <steven@solie.ca>
-Copyright (c) 2005-2006 Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2016-2022 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
-Licensed under the MIT license:
-
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
-
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
-
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: expat
-ORIGIN: ../../../third_party/expat/expat/lib/winconfig.h
-TYPE: LicenseType.mit
-FILE: ../../../third_party/expat/expat/lib/winconfig.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2002      Greg Stein <gstein@users.sourceforge.net>
-Copyright (c) 2005      Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2017-2021 Sebastian Pipping <sebastian@pipping.org>
-Licensed under the MIT license:
-
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
-
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
-
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: expat
-ORIGIN: ../../../third_party/expat/expat/lib/nametab.h
-TYPE: LicenseType.mit
-FILE: ../../../third_party/expat/expat/lib/nametab.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2000 Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2017 Sebastian Pipping <sebastian@pipping.org>
-Licensed under the MIT license:
-
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
-
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
-
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/x509/x_algor.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/x509/x_algor.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2000 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/ecdh_extra/ecdh_extra.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/ecdh_extra/ecdh_extra.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ecdh/ecdh.c
-FILE: ../../../third_party/boringssl/src/include/openssl/ecdh.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2000-2002 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/ec_extra/ec_asn1.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/ec_extra/ec_asn1.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2000-2003 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/dh_extra/dh_asn1.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/dh_extra/dh_asn1.c
-FILE: ../../../third_party/boringssl/src/crypto/dsa/dsa_asn1.c
-FILE: ../../../third_party/boringssl/src/crypto/rsa_extra/rsa_asn1.c
-FILE: ../../../third_party/boringssl/src/include/openssl/asn1t.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2000-2005 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: expat
-ORIGIN: ../../../third_party/expat/expat/win32/expat.iss
-TYPE: LicenseType.mit
-FILE: ../../../third_party/expat/expat/win32/expat.iss
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2001      Tim Peters <tim.peters@gmail.com>
-Copyright (c) 2001-2005 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2006-2017 Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2007-2022 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2022      Johnny Jazeix <jazeix@gmail.com>
-Licensed under the MIT license:
-
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
-
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
-
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/asn1/time_support.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/asn1/time_support.c
-FILE: ../../../third_party/boringssl/src/crypto/pem/pem_x509.c
-FILE: ../../../third_party/boringssl/src/crypto/pem/pem_xaux.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/x509cset.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2001 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/fipsmodule/aes/key_wrap.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/aes/key_wrap.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2001-2011 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   openssl-core@openssl.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: expat
-ORIGIN: ../../../third_party/expat/expat/lib/internal.h
-TYPE: LicenseType.mit
-FILE: ../../../third_party/expat/expat/lib/internal.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2002-2003 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2002-2006 Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2003      Greg Stein <gstein@users.sourceforge.net>
-Copyright (c) 2016-2022 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2018      Yury Gribov <tetra2005@gmail.com>
-Copyright (c) 2019      David Loffredo <loffredo@steptools.com>
-Licensed under the MIT license:
-
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
-
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
-
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: glfw
-ORIGIN: ../../../third_party/glfw/LICENSE.md
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/glfw/.appveyor.yml
-FILE: ../../../third_party/glfw/CMake/MacOSXBundleInfo.plist.in
-FILE: ../../../third_party/glfw/cmake_uninstall.cmake.in
-FILE: ../../../third_party/glfw/docs/Doxyfile.in
-FILE: ../../../third_party/glfw/docs/DoxygenLayout.xml
-FILE: ../../../third_party/glfw/docs/build.dox
-FILE: ../../../third_party/glfw/docs/compat.dox
-FILE: ../../../third_party/glfw/docs/compile.dox
-FILE: ../../../third_party/glfw/docs/context.dox
-FILE: ../../../third_party/glfw/docs/extra.less
-FILE: ../../../third_party/glfw/docs/footer.html
-FILE: ../../../third_party/glfw/docs/header.html
-FILE: ../../../third_party/glfw/docs/input.dox
-FILE: ../../../third_party/glfw/docs/internal.dox
-FILE: ../../../third_party/glfw/docs/intro.dox
-FILE: ../../../third_party/glfw/docs/main.dox
-FILE: ../../../third_party/glfw/docs/monitor.dox
-FILE: ../../../third_party/glfw/docs/moving.dox
-FILE: ../../../third_party/glfw/docs/news.dox
-FILE: ../../../third_party/glfw/docs/quick.dox
-FILE: ../../../third_party/glfw/docs/spaces.svg
-FILE: ../../../third_party/glfw/docs/vulkan.dox
-FILE: ../../../third_party/glfw/docs/window.dox
-FILE: ../../../third_party/glfw/include/GLFW/glfw3.h
-FILE: ../../../third_party/glfw/include/GLFW/glfw3native.h
-FILE: ../../../third_party/glfw/src/cocoa_monitor.m
-FILE: ../../../third_party/glfw/src/context.c
-FILE: ../../../third_party/glfw/src/egl_context.c
-FILE: ../../../third_party/glfw/src/egl_context.h
-FILE: ../../../third_party/glfw/src/glfw3.pc.in
-FILE: ../../../third_party/glfw/src/glfw3Config.cmake.in
-FILE: ../../../third_party/glfw/src/glx_context.c
-FILE: ../../../third_party/glfw/src/glx_context.h
-FILE: ../../../third_party/glfw/src/init.c
-FILE: ../../../third_party/glfw/src/input.c
-FILE: ../../../third_party/glfw/src/internal.h
-FILE: ../../../third_party/glfw/src/linux_joystick.c
-FILE: ../../../third_party/glfw/src/monitor.c
-FILE: ../../../third_party/glfw/src/posix_thread.c
-FILE: ../../../third_party/glfw/src/posix_thread.h
-FILE: ../../../third_party/glfw/src/posix_time.c
-FILE: ../../../third_party/glfw/src/posix_time.h
-FILE: ../../../third_party/glfw/src/vulkan.c
-FILE: ../../../third_party/glfw/src/wgl_context.c
-FILE: ../../../third_party/glfw/src/wgl_context.h
-FILE: ../../../third_party/glfw/src/win32_init.c
-FILE: ../../../third_party/glfw/src/win32_joystick.c
-FILE: ../../../third_party/glfw/src/win32_monitor.c
-FILE: ../../../third_party/glfw/src/win32_platform.h
-FILE: ../../../third_party/glfw/src/win32_thread.c
-FILE: ../../../third_party/glfw/src/win32_time.c
-FILE: ../../../third_party/glfw/src/win32_window.c
-FILE: ../../../third_party/glfw/src/x11_init.c
-FILE: ../../../third_party/glfw/src/x11_monitor.c
-FILE: ../../../third_party/glfw/src/x11_platform.h
-FILE: ../../../third_party/glfw/src/x11_window.c
-FILE: ../../../third_party/glfw/src/xkb_unicode.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2002-2006 Marcus Geelnard
-Copyright (c) 2006-2016 Camilla Löwy <elmindreda@glfw.org>
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would
-   be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and must not
-   be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-   distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: glfw
-ORIGIN: ../../../third_party/glfw/src/window.c
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/glfw/src/window.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2002-2006 Marcus Geelnard
-Copyright (c) 2006-2016 Camilla Löwy <elmindreda@glfw.org>
-Copyright (c) 2012 Torsten Walluhn <tw@mad-cad.net>
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would
-   be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and must not
-   be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-   distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/fipsmodule/aes/aes.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/aes/aes.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/aes/mode_wrappers.c
-FILE: ../../../third_party/boringssl/src/include/openssl/aes.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2002-2006 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   openssl-core@openssl.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/x509v3/v3_ncons.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/v3_ncons.c
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/v3_pcons.c
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/v3_pmaps.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: tcmalloc
-ORIGIN: ../../../third_party/dart/third_party/tcmalloc/include/gperftools/tcmalloc.h
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/dart/third_party/tcmalloc/include/gperftools/tcmalloc.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2003, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: dart
-ORIGIN: ../../../third_party/dart/sdk/lib/_internal/vm_shared/lib/bigint_patch.dart
-TYPE: LicenseType.mit
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm_shared/lib/bigint_patch.dart
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2003-2005  Tom Wu
-Copyright (c) 2012 Adam Singer (adam@solvr.io)
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
-EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
-WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-
-IN NO EVENT SHALL TOM WU BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
-INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF
-THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-In addition, the following condition applies:
-
-All redistributions must retain an intact copy of this copyright notice
-and disclaimer.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/x509v3/v3_pci.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/v3_pci.c
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/v3_pcia.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2004 Kungliga Tekniska Högskolan
-(Royal Institute of Technology, Stockholm, Sweden).
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the Institute nor the names of its contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/x509/x509_vpm.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/x509/x509_vpm.c
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/pcy_cache.c
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/pcy_data.c
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/pcy_int.h
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/pcy_lib.c
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/pcy_map.c
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/pcy_node.c
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/pcy_tree.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2004 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/fipsmodule/rsa/padding.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/rsa/padding.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2005 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: tcmalloc
-ORIGIN: ../../../third_party/dart/third_party/tcmalloc/COPYING
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/dart/third_party/tcmalloc/configure_command
-FILE: ../../../third_party/dart/third_party/tcmalloc/include/config.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2005, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: StackWalker
-ORIGIN: ../../../third_party/angle/util/windows/third_party/StackWalker/src/StackWalker.h
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/util/windows/third_party/StackWalker/src/StackWalker.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2005-2009, Jochen Kalmbach
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-Neither the name of Jochen Kalmbach nor the names of its contributors may be
-used to endorse or promote products derived from this software without
-specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: StackWalker
-ORIGIN: ../../../third_party/angle/util/windows/third_party/StackWalker/src/StackWalker.cpp
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/util/windows/third_party/StackWalker/src/StackWalker.cpp
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2005-2013, Jochen Kalmbach
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-Neither the name of Jochen Kalmbach nor the names of its contributors may be
-used to endorse or promote products derived from this software without
-specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/asn1/internal.h
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/asn1/internal.h
-FILE: ../../../third_party/boringssl/src/crypto/evp/p_dsa_asn1.c
-FILE: ../../../third_party/boringssl/src/crypto/evp/p_ec.c
-FILE: ../../../third_party/boringssl/src/crypto/evp/p_ec_asn1.c
-FILE: ../../../third_party/boringssl/src/crypto/evp/p_rsa.c
-FILE: ../../../third_party/boringssl/src/crypto/evp/p_rsa_asn1.c
-FILE: ../../../third_party/boringssl/src/crypto/evp/print.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/rsa_pss.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/evp/digestsign.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/evp/digestsign.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2006,2007 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: rapidjson
-ORIGIN: ../../../third_party/rapidjson/include/rapidjson/msinttypes/inttypes.h
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/rapidjson/include/rapidjson/msinttypes/inttypes.h
-FILE: ../../../third_party/rapidjson/include/rapidjson/msinttypes/stdint.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2006-2013 Alexander Chemeris
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  1. Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-
-  2. Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-
-  3. Neither the name of the product nor the names of its contributors may
-     be used to endorse or promote products derived from this software
-     without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: glfw
-ORIGIN: ../../../third_party/glfw/src/cocoa_joystick.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/glfw/src/cocoa_joystick.h
-FILE: ../../../third_party/glfw/src/mappings.h
-FILE: ../../../third_party/glfw/src/mappings.h.in
-FILE: ../../../third_party/glfw/src/null_joystick.c
-FILE: ../../../third_party/glfw/src/null_joystick.h
-FILE: ../../../third_party/glfw/src/win32_joystick.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2006-2016 Camilla Löwy <elmindreda@glfw.org>
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would
-   be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and must not
-   be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-   distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: khronos
-ORIGIN: ../../../third_party/khronos/LICENSE
-TYPE: LicenseType.mit
-FILE: ../../../third_party/khronos/DEPS
-FILE: ../../../third_party/khronos/DIR_METADATA
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2007-2010 The Khronos Group Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and/or associated documentation files (the
-"Materials"), to deal in the Materials without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Materials, and to
-permit persons to whom the Materials are furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Materials.
-
-THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-
-SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
-
-Copyright (C) 1992 Silicon Graphics, Inc. All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice including the dates of first publication and either
-this permission notice or a reference to http://oss.sgi.com/projects/FreeB
-shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL SILICON
-GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of Silicon Graphics, Inc. shall
-not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from Silicon
-Graphics, Inc.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: khronos
-ORIGIN: ../../../third_party/khronos/noninclude/GL/glxext.h
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/khronos/noninclude/GL/glxext.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2007-2012 The Khronos Group Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and/or associated documentation files (the
-"Materials"), to deal in the Materials without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Materials, and to
-permit persons to whom the Materials are furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Materials.
-
-THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: angle
-ORIGIN: ../../../third_party/angle/src/third_party/libXNVCtrl/LICENSE
-TYPE: LicenseType.mit
-FILE: ../../../third_party/angle/src/third_party/libXNVCtrl/NVCtrl.c
-FILE: ../../../third_party/angle/src/third_party/libXNVCtrl/NVCtrlLib.h
-FILE: ../../../third_party/angle/src/third_party/libXNVCtrl/nv_control.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2008 NVIDIA, Corporation
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/cipher_extra/e_aesccm.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/cipher_extra/e_aesccm.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/modes/cbc.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/modes/cfb.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/modes/ctr.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/modes/gcm.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/modes/gcm_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/modes/internal.h
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/modes/ofb.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2008 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   openssl-core@openssl.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: khronos
-ORIGIN: ../../../third_party/khronos/KHR/khrplatform.h
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/khronos/KHR/khrplatform.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2008-2009 The Khronos Group Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and/or associated documentation files (the
-"Materials"), to deal in the Materials without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Materials, and to
-permit persons to whom the Materials are furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Materials.
-
-THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: angle
-ORIGIN: ../../../third_party/angle/include/KHR/khrplatform.h
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/angle/include/KHR/khrplatform.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2008-2018 The Khronos Group Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and/or associated documentation files (the
-"Materials"), to deal in the Materials without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Materials, and to
-permit persons to whom the Materials are furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Materials.
-
-THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libtess2
-ORIGIN: ../../../third_party/libtess2/Contrib/nanosvg.c
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/libtess2/Contrib/nanosvg.c
-FILE: ../../../third_party/libtess2/Contrib/nanosvg.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2009 Mikko Mononen memon@inside.org
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libcxx
-LIBRARY: libcxxabi
-ORIGIN: null
-TYPE: LicenseType.mit
-FILE: ../../../third_party/libcxx/.clang-tidy
-FILE: ../../../third_party/libcxx/appveyor-reqs-install.cmd
-FILE: ../../../third_party/libcxx/appveyor.yml
-FILE: ../../../third_party/libcxx/benchmarks/GenerateInput.h
-FILE: ../../../third_party/libcxx/benchmarks/algorithms.partition_point.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/filesystem.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/lit.site.cfg.py.in
-FILE: ../../../third_party/libcxx/benchmarks/string.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/stringstream.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/unordered_set_operations.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/variant_visit_1.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/variant_visit_2.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/variant_visit_3.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/vector_operations.bench.cpp
-FILE: ../../../third_party/libcxx/docs/AddingNewCIJobs.rst
-FILE: ../../../third_party/libcxx/docs/BuildingLibcxx.rst
-FILE: ../../../third_party/libcxx/docs/DesignDocs/ABIVersioning.rst
-FILE: ../../../third_party/libcxx/docs/DesignDocs/AtomicDesign.rst
-FILE: ../../../third_party/libcxx/docs/DesignDocs/CapturingConfigInfo.rst
-FILE: ../../../third_party/libcxx/docs/DesignDocs/DebugMode.rst
-FILE: ../../../third_party/libcxx/docs/DesignDocs/ExperimentalFeatures.rst
-FILE: ../../../third_party/libcxx/docs/DesignDocs/ExtendedCXX03Support.rst
-FILE: ../../../third_party/libcxx/docs/DesignDocs/FeatureTestMacros.rst
-FILE: ../../../third_party/libcxx/docs/DesignDocs/FileTimeType.rst
-FILE: ../../../third_party/libcxx/docs/DesignDocs/NoexceptPolicy.rst
-FILE: ../../../third_party/libcxx/docs/DesignDocs/ThreadingSupportAPI.rst
-FILE: ../../../third_party/libcxx/docs/DesignDocs/UniquePtrTrivialAbi.rst
-FILE: ../../../third_party/libcxx/docs/DesignDocs/UnspecifiedBehaviorRandomization.rst
-FILE: ../../../third_party/libcxx/docs/DesignDocs/VisibilityMacros.rst
-FILE: ../../../third_party/libcxx/docs/FeatureTestMacroTable.rst
-FILE: ../../../third_party/libcxx/docs/Helpers/Styles.rst
-FILE: ../../../third_party/libcxx/docs/ReleaseNotes.rst
-FILE: ../../../third_party/libcxx/docs/Status/Cxx14.rst
-FILE: ../../../third_party/libcxx/docs/Status/Cxx14Issues.csv
-FILE: ../../../third_party/libcxx/docs/Status/Cxx14Papers.csv
-FILE: ../../../third_party/libcxx/docs/Status/Cxx17.rst
-FILE: ../../../third_party/libcxx/docs/Status/Cxx17Issues.csv
-FILE: ../../../third_party/libcxx/docs/Status/Cxx17Papers.csv
-FILE: ../../../third_party/libcxx/docs/Status/Cxx20.rst
-FILE: ../../../third_party/libcxx/docs/Status/Cxx20Issues.csv
-FILE: ../../../third_party/libcxx/docs/Status/Cxx20Papers.csv
-FILE: ../../../third_party/libcxx/docs/Status/Cxx2b.rst
-FILE: ../../../third_party/libcxx/docs/Status/Cxx2bIssues.csv
-FILE: ../../../third_party/libcxx/docs/Status/Cxx2bPapers.csv
-FILE: ../../../third_party/libcxx/docs/Status/Format.rst
-FILE: ../../../third_party/libcxx/docs/Status/FormatIssues.csv
-FILE: ../../../third_party/libcxx/docs/Status/FormatPaper.csv
-FILE: ../../../third_party/libcxx/docs/Status/Ranges.rst
-FILE: ../../../third_party/libcxx/docs/Status/RangesAlgorithms.csv
-FILE: ../../../third_party/libcxx/docs/Status/RangesIssues.csv
-FILE: ../../../third_party/libcxx/docs/Status/RangesPaper.csv
-FILE: ../../../third_party/libcxx/docs/Status/Spaceship.rst
-FILE: ../../../third_party/libcxx/docs/Status/SpaceshipPapers.csv
-FILE: ../../../third_party/libcxx/docs/Status/SpaceshipProjects.csv
-FILE: ../../../third_party/libcxx/docs/Status/Zip.rst
-FILE: ../../../third_party/libcxx/docs/Status/ZipProjects.csv
-FILE: ../../../third_party/libcxx/docs/TestingLibcxx.rst
-FILE: ../../../third_party/libcxx/docs/UsingLibcxx.rst
-FILE: ../../../third_party/libcxx/docs/index.rst
-FILE: ../../../third_party/libcxx/include/module.modulemap.in
-FILE: ../../../third_party/libcxx/lib/abi/arm64-apple-darwin.libcxxabi.v1.stable.exceptions.nonew.debug.incomplete.abilist
-FILE: ../../../third_party/libcxx/lib/abi/arm64-apple-darwin.libcxxabi.v1.stable.exceptions.nonew.nodebug.noincomplete.abilist
-FILE: ../../../third_party/libcxx/lib/abi/powerpc-ibm-aix.libcxxabi.v1.stable.exceptions.nonew.debug.incomplete.abilist
-FILE: ../../../third_party/libcxx/lib/abi/powerpc64-ibm-aix.libcxxabi.v1.stable.exceptions.nonew.debug.incomplete.abilist
-FILE: ../../../third_party/libcxx/lib/abi/x86_64-apple-darwin.libcxxabi.v1.stable.exceptions.nonew.debug.incomplete.abilist
-FILE: ../../../third_party/libcxx/lib/abi/x86_64-apple-darwin.libcxxabi.v1.stable.exceptions.nonew.nodebug.noincomplete.abilist
-FILE: ../../../third_party/libcxx/lib/abi/x86_64-unknown-linux-gnu.libcxxabi.v1.stable.exceptions.nonew.debug.incomplete.abilist
-FILE: ../../../third_party/libcxx/lib/abi/x86_64-unknown-linux-gnu.libcxxabi.v1.stable.exceptions.nonew.debug.noincomplete.abilist
-FILE: ../../../third_party/libcxx/lib/abi/x86_64-unknown-linux-gnu.libcxxabi.v1.stable.exceptions.nonew.nodebug.incomplete.abilist
-FILE: ../../../third_party/libcxx/lib/abi/x86_64-unknown-linux-gnu.libcxxabi.v1.stable.noexceptions.nonew.debug.incomplete.abilist
-FILE: ../../../third_party/libcxx/lib/libc++abi.exp
-FILE: ../../../third_party/libcxx/lib/libc++unexp.exp
-FILE: ../../../third_party/libcxx/lib/notweak.exp
-FILE: ../../../third_party/libcxx/lib/weak.exp
-FILE: ../../../third_party/libcxx/src/chrono_system_time_init.h
-FILE: ../../../third_party/libcxx/src/experimental/memory_resource_init_helper.h
-FILE: ../../../third_party/libcxx/src/iostream_init.h
-FILE: ../../../third_party/libcxxabi/fuzz/cxa_demangle_fuzzer.cpp
-FILE: ../../../third_party/libcxxabi/lib/exceptions.exp
-FILE: ../../../third_party/libcxxabi/lib/itanium-base.exp
-FILE: ../../../third_party/libcxxabi/lib/new-delete.exp
-FILE: ../../../third_party/libcxxabi/lib/personality-sjlj.exp
-FILE: ../../../third_party/libcxxabi/lib/personality-v0.exp
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2009-2014 by the contributors listed in CREDITS.TXT
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: glfw
-ORIGIN: ../../../third_party/glfw/src/cocoa_init.m
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/glfw/src/cocoa_init.m
-FILE: ../../../third_party/glfw/src/cocoa_platform.h
-FILE: ../../../third_party/glfw/src/cocoa_time.c
-FILE: ../../../third_party/glfw/src/cocoa_window.m
-FILE: ../../../third_party/glfw/src/nsgl_context.h
-FILE: ../../../third_party/glfw/src/nsgl_context.m
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2009-2016 Camilla Löwy <elmindreda@glfw.org>
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would
-   be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and must not
-   be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-   distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: glfw
-ORIGIN: ../../../third_party/glfw/src/cocoa_joystick.m
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/glfw/src/cocoa_joystick.m
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2009-2016 Camilla Löwy <elmindreda@glfw.org>
-Copyright (c) 2012 Torsten Walluhn <tw@mad-cad.net>
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would
-   be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and must not
-   be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-   distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: colorama
-ORIGIN: ../../../third_party/colorama/src/LICENSE.txt
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/colorama/src/MANIFEST.in
-FILE: ../../../third_party/colorama/src/screenshots/ubuntu-demo.png
-FILE: ../../../third_party/colorama/src/screenshots/windows-demo.png
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2010 Jonathan Hartley
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the copyright holders, nor those of its contributors
-  may be used to endorse or promote products derived from this software without
-  specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: angle
-ORIGIN: ../../../third_party/angle/src/third_party/libXNVCtrl/NVCtrl.h
-TYPE: LicenseType.mit
-FILE: ../../../third_party/angle/src/third_party/libXNVCtrl/NVCtrl.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2010 NVIDIA, Corporation
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/cmac/cmac.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/cmac/cmac.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2010 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libwebp
-ORIGIN: ../../../third_party/libwebp/COPYING
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/libwebp/Makefile.vc
-FILE: ../../../third_party/libwebp/cmake/WebPConfig.cmake.in
-FILE: ../../../third_party/libwebp/cmake/config.h.in
-FILE: ../../../third_party/libwebp/doc/TODO
-FILE: ../../../third_party/libwebp/doc/template.html
-FILE: ../../../third_party/libwebp/extras/webp_quality.c
-FILE: ../../../third_party/libwebp/gradle.properties
-FILE: ../../../third_party/libwebp/makefile.unix
-FILE: ../../../third_party/libwebp/src/demux/libwebpdemux.pc.in
-FILE: ../../../third_party/libwebp/src/demux/libwebpdemux.rc
-FILE: ../../../third_party/libwebp/src/libwebp.pc.in
-FILE: ../../../third_party/libwebp/src/libwebp.rc
-FILE: ../../../third_party/libwebp/src/libwebpdecoder.pc.in
-FILE: ../../../third_party/libwebp/src/libwebpdecoder.rc
-FILE: ../../../third_party/libwebp/src/mux/libwebpmux.pc.in
-FILE: ../../../third_party/libwebp/src/mux/libwebpmux.rc
-FILE: ../../../third_party/libwebp/webp_js/index.html
-FILE: ../../../third_party/libwebp/webp_js/index_wasm.html
-FILE: ../../../third_party/libwebp/webp_js/test_webp_js.webp
-FILE: ../../../third_party/libwebp/webp_js/test_webp_wasm.webp
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2010, Google Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-  * Neither the name of Google nor the names of its contributors may
-    be used to endorse or promote products derived from this software
-    without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: dart
-ORIGIN: ../../../third_party/dart/runtime/platform/splay-tree-inl.h + ../../../third_party/dart/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/dart/runtime/platform/splay-tree-inl.h
-FILE: ../../../third_party/dart/runtime/platform/splay-tree.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2010, the Dart project authors.  Please see the AUTHORS file
-for details. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google LLC nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: glfw
-ORIGIN: ../../../third_party/glfw/src/glfw_config.h.in
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/glfw/src/glfw_config.h.in
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2010-2016 Camilla Löwy <elmindreda@glfw.org>
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would
-   be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and must not
-   be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-   distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: base
-LIBRARY: zlib
-ORIGIN: ../../../third_party/angle/src/common/third_party/base/anglebase/containers/mru_cache.h + ../../../LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/src/common/third_party/base/anglebase/containers/mru_cache.h
-FILE: ../../../third_party/angle/src/common/third_party/base/anglebase/sha1.cc
-FILE: ../../../third_party/angle/src/common/third_party/base/anglebase/sha1.h
-FILE: ../../../third_party/zlib/google/zip.h
-FILE: ../../../third_party/zlib/google/zip_internal.cc
-FILE: ../../../third_party/zlib/google/zip_internal.h
-FILE: ../../../third_party/zlib/google/zip_reader.h
-FILE: ../../../third_party/zlib/google/zip_reader_unittest.cc
-FILE: ../../../third_party/zlib/google/zip_unittest.cc
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2011 The Chromium Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/dh_extra/params.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/dh_extra/params.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2011 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/decrepit/xts/xts.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/decrepit/xts/xts.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2011 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   openssl-core@openssl.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: dart
-ORIGIN: ../../../third_party/dart/runtime/bin/process_test.cc + ../../../third_party/dart/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/dart/runtime/bin/process_test.cc
-FILE: ../../../third_party/dart/runtime/bin/snapshot_empty.cc
-FILE: ../../../third_party/dart/runtime/bin/snapshot_in.cc
-FILE: ../../../third_party/dart/runtime/include/dart_tools_api.h
-FILE: ../../../third_party/dart/runtime/lib/double.cc
-FILE: ../../../third_party/dart/runtime/lib/math.cc
-FILE: ../../../third_party/dart/runtime/lib/mirrors.h
-FILE: ../../../third_party/dart/runtime/lib/object.cc
-FILE: ../../../third_party/dart/runtime/lib/string.cc
-FILE: ../../../third_party/dart/runtime/vm/bitfield.h
-FILE: ../../../third_party/dart/runtime/vm/code_patcher_ia32_test.cc
-FILE: ../../../third_party/dart/runtime/vm/code_patcher_x64_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/disassembler.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/disassembler.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/disassembler_test.cc
-FILE: ../../../third_party/dart/runtime/vm/cpu_ia32.cc
-FILE: ../../../third_party/dart/runtime/vm/custom_isolate_test.cc
-FILE: ../../../third_party/dart/runtime/vm/dart.h
-FILE: ../../../third_party/dart/runtime/vm/dart_api_impl.h
-FILE: ../../../third_party/dart/runtime/vm/dart_entry.cc
-FILE: ../../../third_party/dart/runtime/vm/dart_entry.h
-FILE: ../../../third_party/dart/runtime/vm/debugger_arm.cc
-FILE: ../../../third_party/dart/runtime/vm/debugger_ia32.cc
-FILE: ../../../third_party/dart/runtime/vm/debugger_x64.cc
-FILE: ../../../third_party/dart/runtime/vm/double_conversion.cc
-FILE: ../../../third_party/dart/runtime/vm/double_conversion.h
-FILE: ../../../third_party/dart/runtime/vm/exceptions.cc
-FILE: ../../../third_party/dart/runtime/vm/exceptions.h
-FILE: ../../../third_party/dart/runtime/vm/handle_visitor.h
-FILE: ../../../third_party/dart/runtime/vm/handles.h
-FILE: ../../../third_party/dart/runtime/vm/heap/freelist.cc
-FILE: ../../../third_party/dart/runtime/vm/heap/marker.cc
-FILE: ../../../third_party/dart/runtime/vm/heap/marker.h
-FILE: ../../../third_party/dart/runtime/vm/heap/pages.h
-FILE: ../../../third_party/dart/runtime/vm/heap/scavenger.cc
-FILE: ../../../third_party/dart/runtime/vm/heap/sweeper.cc
-FILE: ../../../third_party/dart/runtime/vm/heap/sweeper.h
-FILE: ../../../third_party/dart/runtime/vm/heap/verifier.h
-FILE: ../../../third_party/dart/runtime/vm/longjump.cc
-FILE: ../../../third_party/dart/runtime/vm/longjump_test.cc
-FILE: ../../../third_party/dart/runtime/vm/memory_region.cc
-FILE: ../../../third_party/dart/runtime/vm/message.cc
-FILE: ../../../third_party/dart/runtime/vm/message.h
-FILE: ../../../third_party/dart/runtime/vm/message_handler.cc
-FILE: ../../../third_party/dart/runtime/vm/message_handler.h
-FILE: ../../../third_party/dart/runtime/vm/native_entry.cc
-FILE: ../../../third_party/dart/runtime/vm/native_entry.h
-FILE: ../../../third_party/dart/runtime/vm/native_entry_test.cc
-FILE: ../../../third_party/dart/runtime/vm/native_entry_test.h
-FILE: ../../../third_party/dart/runtime/vm/native_function.h
-FILE: ../../../third_party/dart/runtime/vm/object_store_test.cc
-FILE: ../../../third_party/dart/runtime/vm/os.h
-FILE: ../../../third_party/dart/runtime/vm/port.h
-FILE: ../../../third_party/dart/runtime/vm/resolver.cc
-FILE: ../../../third_party/dart/runtime/vm/resolver.h
-FILE: ../../../third_party/dart/runtime/vm/runtime_entry.cc
-FILE: ../../../third_party/dart/runtime/vm/runtime_entry.h
-FILE: ../../../third_party/dart/runtime/vm/runtime_entry_arm.cc
-FILE: ../../../third_party/dart/runtime/vm/runtime_entry_ia32.cc
-FILE: ../../../third_party/dart/runtime/vm/runtime_entry_list.h
-FILE: ../../../third_party/dart/runtime/vm/runtime_entry_x64.cc
-FILE: ../../../third_party/dart/runtime/vm/stack_frame.h
-FILE: ../../../third_party/dart/runtime/vm/stub_code.h
-FILE: ../../../third_party/dart/runtime/vm/stub_code_ia32_test.cc
-FILE: ../../../third_party/dart/runtime/vm/stub_code_x64_test.cc
-FILE: ../../../third_party/dart/runtime/vm/timer.cc
-FILE: ../../../third_party/dart/runtime/vm/timer.h
-FILE: ../../../third_party/dart/runtime/vm/token.cc
-FILE: ../../../third_party/dart/runtime/vm/unicode_data.cc
-FILE: ../../../third_party/dart/runtime/vm/unicode_test.cc
-FILE: ../../../third_party/dart/runtime/vm/unit_test.h
-FILE: ../../../third_party/dart/runtime/vm/visitor.h
-FILE: ../../../third_party/dart/sdk/lib/collection/queue.dart
-FILE: ../../../third_party/dart/sdk/lib/core/comparable.dart
-FILE: ../../../third_party/dart/sdk/lib/core/date_time.dart
-FILE: ../../../third_party/dart/sdk/lib/core/duration.dart
-FILE: ../../../third_party/dart/sdk/lib/core/function.dart
-FILE: ../../../third_party/dart/sdk/lib/core/iterable.dart
-FILE: ../../../third_party/dart/sdk/lib/core/map.dart
-FILE: ../../../third_party/dart/sdk/lib/core/pattern.dart
-FILE: ../../../third_party/dart/sdk/lib/core/set.dart
-FILE: ../../../third_party/dart/sdk/lib/core/stopwatch.dart
-FILE: ../../../third_party/dart/sdk/lib/core/string_buffer.dart
-FILE: ../../../third_party/dart/sdk/lib/html/html_common/device.dart
-FILE: ../../../third_party/dart/sdk/lib/html/html_common/filtered_element_list.dart
-FILE: ../../../third_party/dart/sdk/lib/html/html_common/lists.dart
-FILE: ../../../third_party/dart/sdk/lib/internal/iterable.dart
-FILE: ../../../third_party/dart/sdk/lib/internal/sort.dart
-FILE: ../../../third_party/dart/utils/peg/pegparser.dart
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-for details. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google LLC nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/google/zip.cc + ../../../LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/zlib/google/zip.cc
-FILE: ../../../third_party/zlib/google/zip_reader.cc
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2012 The Chromium Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/cipher_extra/tls_cbc.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/cipher_extra/tls_cbc.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2012 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   openssl-core@openssl.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: dart
-ORIGIN: ../../../third_party/dart/runtime/bin/builtin.cc + ../../../third_party/dart/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/dart/DEPS
-FILE: ../../../third_party/dart/runtime/bin/builtin.cc
-FILE: ../../../third_party/dart/runtime/bin/builtin.h
-FILE: ../../../third_party/dart/runtime/bin/builtin_gen_snapshot.cc
-FILE: ../../../third_party/dart/runtime/bin/builtin_in.cc
-FILE: ../../../third_party/dart/runtime/bin/builtin_natives.cc
-FILE: ../../../third_party/dart/runtime/bin/crashpad.cc
-FILE: ../../../third_party/dart/runtime/bin/crypto.cc
-FILE: ../../../third_party/dart/runtime/bin/crypto.h
-FILE: ../../../third_party/dart/runtime/bin/crypto_android.cc
-FILE: ../../../third_party/dart/runtime/bin/crypto_linux.cc
-FILE: ../../../third_party/dart/runtime/bin/crypto_macos.cc
-FILE: ../../../third_party/dart/runtime/bin/crypto_win.cc
-FILE: ../../../third_party/dart/runtime/bin/dartutils.cc
-FILE: ../../../third_party/dart/runtime/bin/dartutils.h
-FILE: ../../../third_party/dart/runtime/bin/directory.cc
-FILE: ../../../third_party/dart/runtime/bin/directory.h
-FILE: ../../../third_party/dart/runtime/bin/directory_android.cc
-FILE: ../../../third_party/dart/runtime/bin/directory_linux.cc
-FILE: ../../../third_party/dart/runtime/bin/directory_macos.cc
-FILE: ../../../third_party/dart/runtime/bin/directory_win.cc
-FILE: ../../../third_party/dart/runtime/bin/eventhandler.cc
-FILE: ../../../third_party/dart/runtime/bin/eventhandler.h
-FILE: ../../../third_party/dart/runtime/bin/eventhandler_android.cc
-FILE: ../../../third_party/dart/runtime/bin/eventhandler_android.h
-FILE: ../../../third_party/dart/runtime/bin/eventhandler_linux.cc
-FILE: ../../../third_party/dart/runtime/bin/eventhandler_linux.h
-FILE: ../../../third_party/dart/runtime/bin/eventhandler_macos.cc
-FILE: ../../../third_party/dart/runtime/bin/eventhandler_macos.h
-FILE: ../../../third_party/dart/runtime/bin/eventhandler_test.cc
-FILE: ../../../third_party/dart/runtime/bin/eventhandler_win.h
-FILE: ../../../third_party/dart/runtime/bin/fdutils.h
-FILE: ../../../third_party/dart/runtime/bin/fdutils_android.cc
-FILE: ../../../third_party/dart/runtime/bin/fdutils_fuchsia.cc
-FILE: ../../../third_party/dart/runtime/bin/fdutils_linux.cc
-FILE: ../../../third_party/dart/runtime/bin/fdutils_macos.cc
-FILE: ../../../third_party/dart/runtime/bin/file_android.cc
-FILE: ../../../third_party/dart/runtime/bin/file_linux.cc
-FILE: ../../../third_party/dart/runtime/bin/file_macos.cc
-FILE: ../../../third_party/dart/runtime/bin/file_test.cc
-FILE: ../../../third_party/dart/runtime/bin/file_win.cc
-FILE: ../../../third_party/dart/runtime/bin/hashmap_test.cc
-FILE: ../../../third_party/dart/runtime/bin/io_buffer.cc
-FILE: ../../../third_party/dart/runtime/bin/io_buffer.h
-FILE: ../../../third_party/dart/runtime/bin/io_natives.h
-FILE: ../../../third_party/dart/runtime/bin/isolate_data.h
-FILE: ../../../third_party/dart/runtime/bin/lockers.h
-FILE: ../../../third_party/dart/runtime/bin/main.cc
-FILE: ../../../third_party/dart/runtime/bin/platform.cc
-FILE: ../../../third_party/dart/runtime/bin/platform.h
-FILE: ../../../third_party/dart/runtime/bin/platform_android.cc
-FILE: ../../../third_party/dart/runtime/bin/platform_linux.cc
-FILE: ../../../third_party/dart/runtime/bin/platform_macos.cc
-FILE: ../../../third_party/dart/runtime/bin/platform_win.cc
-FILE: ../../../third_party/dart/runtime/bin/process.h
-FILE: ../../../third_party/dart/runtime/bin/process_android.cc
-FILE: ../../../third_party/dart/runtime/bin/process_linux.cc
-FILE: ../../../third_party/dart/runtime/bin/process_macos.cc
-FILE: ../../../third_party/dart/runtime/bin/process_win.cc
-FILE: ../../../third_party/dart/runtime/bin/run_vm_tests.cc
-FILE: ../../../third_party/dart/runtime/bin/secure_socket_unsupported.cc
-FILE: ../../../third_party/dart/runtime/bin/socket_android.cc
-FILE: ../../../third_party/dart/runtime/bin/socket_base_android.h
-FILE: ../../../third_party/dart/runtime/bin/socket_base_linux.h
-FILE: ../../../third_party/dart/runtime/bin/socket_base_macos.h
-FILE: ../../../third_party/dart/runtime/bin/socket_base_win.h
-FILE: ../../../third_party/dart/runtime/bin/thread.h
-FILE: ../../../third_party/dart/runtime/bin/thread_android.cc
-FILE: ../../../third_party/dart/runtime/bin/thread_android.h
-FILE: ../../../third_party/dart/runtime/bin/thread_linux.cc
-FILE: ../../../third_party/dart/runtime/bin/thread_linux.h
-FILE: ../../../third_party/dart/runtime/bin/thread_macos.cc
-FILE: ../../../third_party/dart/runtime/bin/thread_macos.h
-FILE: ../../../third_party/dart/runtime/bin/thread_win.cc
-FILE: ../../../third_party/dart/runtime/bin/thread_win.h
-FILE: ../../../third_party/dart/runtime/bin/utils.h
-FILE: ../../../third_party/dart/runtime/bin/utils_android.cc
-FILE: ../../../third_party/dart/runtime/bin/utils_linux.cc
-FILE: ../../../third_party/dart/runtime/bin/utils_macos.cc
-FILE: ../../../third_party/dart/runtime/bin/utils_win.cc
-FILE: ../../../third_party/dart/runtime/bin/utils_win.h
-FILE: ../../../third_party/dart/runtime/include/dart_api.h
-FILE: ../../../third_party/dart/runtime/lib/array.cc
-FILE: ../../../third_party/dart/runtime/lib/bool.cc
-FILE: ../../../third_party/dart/runtime/lib/date.cc
-FILE: ../../../third_party/dart/runtime/lib/errors.cc
-FILE: ../../../third_party/dart/runtime/lib/function.cc
-FILE: ../../../third_party/dart/runtime/lib/growable_array.cc
-FILE: ../../../third_party/dart/runtime/lib/identical.cc
-FILE: ../../../third_party/dart/runtime/lib/integers.cc
-FILE: ../../../third_party/dart/runtime/lib/isolate.cc
-FILE: ../../../third_party/dart/runtime/lib/mirrors.cc
-FILE: ../../../third_party/dart/runtime/lib/regexp.cc
-FILE: ../../../third_party/dart/runtime/lib/stopwatch.cc
-FILE: ../../../third_party/dart/runtime/platform/assert.cc
-FILE: ../../../third_party/dart/runtime/platform/assert.h
-FILE: ../../../third_party/dart/runtime/platform/floating_point.h
-FILE: ../../../third_party/dart/runtime/platform/floating_point_win.cc
-FILE: ../../../third_party/dart/runtime/platform/floating_point_win.h
-FILE: ../../../third_party/dart/runtime/platform/globals.h
-FILE: ../../../third_party/dart/runtime/platform/hashmap.cc
-FILE: ../../../third_party/dart/runtime/platform/hashmap.h
-FILE: ../../../third_party/dart/runtime/platform/syslog.h
-FILE: ../../../third_party/dart/runtime/platform/syslog_android.cc
-FILE: ../../../third_party/dart/runtime/platform/syslog_linux.cc
-FILE: ../../../third_party/dart/runtime/platform/syslog_macos.cc
-FILE: ../../../third_party/dart/runtime/platform/syslog_win.cc
-FILE: ../../../third_party/dart/runtime/platform/text_buffer.cc
-FILE: ../../../third_party/dart/runtime/platform/text_buffer.h
-FILE: ../../../third_party/dart/runtime/platform/unicode.cc
-FILE: ../../../third_party/dart/runtime/platform/unicode.h
-FILE: ../../../third_party/dart/runtime/platform/utils.cc
-FILE: ../../../third_party/dart/runtime/platform/utils.h
-FILE: ../../../third_party/dart/runtime/platform/utils_android.cc
-FILE: ../../../third_party/dart/runtime/platform/utils_android.h
-FILE: ../../../third_party/dart/runtime/platform/utils_linux.cc
-FILE: ../../../third_party/dart/runtime/platform/utils_linux.h
-FILE: ../../../third_party/dart/runtime/platform/utils_macos.cc
-FILE: ../../../third_party/dart/runtime/platform/utils_macos.h
-FILE: ../../../third_party/dart/runtime/platform/utils_win.cc
-FILE: ../../../third_party/dart/runtime/platform/utils_win.h
-FILE: ../../../third_party/dart/runtime/vm/allocation.cc
-FILE: ../../../third_party/dart/runtime/vm/allocation_test.cc
-FILE: ../../../third_party/dart/runtime/vm/assert_test.cc
-FILE: ../../../third_party/dart/runtime/vm/base_isolate.h
-FILE: ../../../third_party/dart/runtime/vm/benchmark_test.cc
-FILE: ../../../third_party/dart/runtime/vm/benchmark_test.h
-FILE: ../../../third_party/dart/runtime/vm/bit_set.h
-FILE: ../../../third_party/dart/runtime/vm/bit_vector.cc
-FILE: ../../../third_party/dart/runtime/vm/bit_vector.h
-FILE: ../../../third_party/dart/runtime/vm/bit_vector_test.cc
-FILE: ../../../third_party/dart/runtime/vm/bitfield_test.cc
-FILE: ../../../third_party/dart/runtime/vm/bitmap.cc
-FILE: ../../../third_party/dart/runtime/vm/bitmap.h
-FILE: ../../../third_party/dart/runtime/vm/bitmap_test.cc
-FILE: ../../../third_party/dart/runtime/vm/boolfield.h
-FILE: ../../../third_party/dart/runtime/vm/boolfield_test.cc
-FILE: ../../../third_party/dart/runtime/vm/bootstrap.cc
-FILE: ../../../third_party/dart/runtime/vm/bootstrap.h
-FILE: ../../../third_party/dart/runtime/vm/bootstrap_natives.cc
-FILE: ../../../third_party/dart/runtime/vm/bootstrap_natives.h
-FILE: ../../../third_party/dart/runtime/vm/class_finalizer.h
-FILE: ../../../third_party/dart/runtime/vm/class_finalizer_test.cc
-FILE: ../../../third_party/dart/runtime/vm/class_table.cc
-FILE: ../../../third_party/dart/runtime/vm/class_table.h
-FILE: ../../../third_party/dart/runtime/vm/code_descriptors.cc
-FILE: ../../../third_party/dart/runtime/vm/code_descriptors.h
-FILE: ../../../third_party/dart/runtime/vm/code_descriptors_test.cc
-FILE: ../../../third_party/dart/runtime/vm/code_observers.cc
-FILE: ../../../third_party/dart/runtime/vm/code_observers.h
-FILE: ../../../third_party/dart/runtime/vm/code_patcher.cc
-FILE: ../../../third_party/dart/runtime/vm/code_patcher.h
-FILE: ../../../third_party/dart/runtime/vm/code_patcher_ia32.cc
-FILE: ../../../third_party/dart/runtime/vm/code_patcher_x64.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/aot/aot_call_specializer.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_base.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_ia32_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_x64_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/disassembler_x86.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/object_pool_builder.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/constant_propagator.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/flow_graph.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/flow_graph_compiler.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/flow_graph_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/il_printer.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/il_printer.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/il_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/inliner.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/cha.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/cha.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/cha_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/flow_graph_builder.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/flow_graph_builder.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/intrinsifier.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/intrinsifier.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/jit/compiler.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/jit/compiler.h
-FILE: ../../../third_party/dart/runtime/vm/compiler_test.cc
-FILE: ../../../third_party/dart/runtime/vm/cpu.h
-FILE: ../../../third_party/dart/runtime/vm/cpu_arm.cc
-FILE: ../../../third_party/dart/runtime/vm/cpu_test.cc
-FILE: ../../../third_party/dart/runtime/vm/cpu_x64.cc
-FILE: ../../../third_party/dart/runtime/vm/cpuinfo_linux.cc
-FILE: ../../../third_party/dart/runtime/vm/cpuinfo_macos.cc
-FILE: ../../../third_party/dart/runtime/vm/dart_api_impl_test.cc
-FILE: ../../../third_party/dart/runtime/vm/dart_api_message.h
-FILE: ../../../third_party/dart/runtime/vm/dart_api_state.h
-FILE: ../../../third_party/dart/runtime/vm/datastream.h
-FILE: ../../../third_party/dart/runtime/vm/debugger.cc
-FILE: ../../../third_party/dart/runtime/vm/debugger.h
-FILE: ../../../third_party/dart/runtime/vm/debugger_api_impl_test.cc
-FILE: ../../../third_party/dart/runtime/vm/double_internals.h
-FILE: ../../../third_party/dart/runtime/vm/exceptions_test.cc
-FILE: ../../../third_party/dart/runtime/vm/flag_list.h
-FILE: ../../../third_party/dart/runtime/vm/flags.cc
-FILE: ../../../third_party/dart/runtime/vm/flags.h
-FILE: ../../../third_party/dart/runtime/vm/flags_test.cc
-FILE: ../../../third_party/dart/runtime/vm/globals.h
-FILE: ../../../third_party/dart/runtime/vm/growable_array.h
-FILE: ../../../third_party/dart/runtime/vm/growable_array_test.cc
-FILE: ../../../third_party/dart/runtime/vm/handles.cc
-FILE: ../../../third_party/dart/runtime/vm/handles_impl.h
-FILE: ../../../third_party/dart/runtime/vm/handles_test.cc
-FILE: ../../../third_party/dart/runtime/vm/hash_map.h
-FILE: ../../../third_party/dart/runtime/vm/hash_map_test.cc
-FILE: ../../../third_party/dart/runtime/vm/heap/freelist.h
-FILE: ../../../third_party/dart/runtime/vm/heap/freelist_test.cc
-FILE: ../../../third_party/dart/runtime/vm/heap/heap.cc
-FILE: ../../../third_party/dart/runtime/vm/heap/heap.h
-FILE: ../../../third_party/dart/runtime/vm/heap/heap_test.cc
-FILE: ../../../third_party/dart/runtime/vm/heap/pages.cc
-FILE: ../../../third_party/dart/runtime/vm/heap/pages_test.cc
-FILE: ../../../third_party/dart/runtime/vm/heap/pointer_block.cc
-FILE: ../../../third_party/dart/runtime/vm/heap/pointer_block.h
-FILE: ../../../third_party/dart/runtime/vm/heap/scavenger.h
-FILE: ../../../third_party/dart/runtime/vm/heap/verifier.cc
-FILE: ../../../third_party/dart/runtime/vm/instructions_ia32.cc
-FILE: ../../../third_party/dart/runtime/vm/instructions_ia32.h
-FILE: ../../../third_party/dart/runtime/vm/instructions_ia32_test.cc
-FILE: ../../../third_party/dart/runtime/vm/instructions_x64.cc
-FILE: ../../../third_party/dart/runtime/vm/instructions_x64.h
-FILE: ../../../third_party/dart/runtime/vm/instructions_x64_test.cc
-FILE: ../../../third_party/dart/runtime/vm/isolate_test.cc
-FILE: ../../../third_party/dart/runtime/vm/json_test.cc
-FILE: ../../../third_party/dart/runtime/vm/lockers.h
-FILE: ../../../third_party/dart/runtime/vm/megamorphic_cache_table.cc
-FILE: ../../../third_party/dart/runtime/vm/megamorphic_cache_table.h
-FILE: ../../../third_party/dart/runtime/vm/memory_region.h
-FILE: ../../../third_party/dart/runtime/vm/memory_region_test.cc
-FILE: ../../../third_party/dart/runtime/vm/message_handler_test.cc
-FILE: ../../../third_party/dart/runtime/vm/message_test.cc
-FILE: ../../../third_party/dart/runtime/vm/native_arguments.h
-FILE: ../../../third_party/dart/runtime/vm/native_message_handler.cc
-FILE: ../../../third_party/dart/runtime/vm/native_message_handler.h
-FILE: ../../../third_party/dart/runtime/vm/object.cc
-FILE: ../../../third_party/dart/runtime/vm/object.h
-FILE: ../../../third_party/dart/runtime/vm/object_arm_test.cc
-FILE: ../../../third_party/dart/runtime/vm/object_ia32_test.cc
-FILE: ../../../third_party/dart/runtime/vm/object_set.h
-FILE: ../../../third_party/dart/runtime/vm/object_store.h
-FILE: ../../../third_party/dart/runtime/vm/object_test.cc
-FILE: ../../../third_party/dart/runtime/vm/object_x64_test.cc
-FILE: ../../../third_party/dart/runtime/vm/os_android.cc
-FILE: ../../../third_party/dart/runtime/vm/os_linux.cc
-FILE: ../../../third_party/dart/runtime/vm/os_macos.cc
-FILE: ../../../third_party/dart/runtime/vm/os_thread.h
-FILE: ../../../third_party/dart/runtime/vm/os_thread_android.cc
-FILE: ../../../third_party/dart/runtime/vm/os_thread_android.h
-FILE: ../../../third_party/dart/runtime/vm/os_thread_linux.cc
-FILE: ../../../third_party/dart/runtime/vm/os_thread_linux.h
-FILE: ../../../third_party/dart/runtime/vm/os_thread_macos.cc
-FILE: ../../../third_party/dart/runtime/vm/os_thread_macos.h
-FILE: ../../../third_party/dart/runtime/vm/os_thread_win.cc
-FILE: ../../../third_party/dart/runtime/vm/os_thread_win.h
-FILE: ../../../third_party/dart/runtime/vm/os_win.cc
-FILE: ../../../third_party/dart/runtime/vm/parser.cc
-FILE: ../../../third_party/dart/runtime/vm/parser.h
-FILE: ../../../third_party/dart/runtime/vm/port.cc
-FILE: ../../../third_party/dart/runtime/vm/port_test.cc
-FILE: ../../../third_party/dart/runtime/vm/proccpuinfo.cc
-FILE: ../../../third_party/dart/runtime/vm/proccpuinfo.h
-FILE: ../../../third_party/dart/runtime/vm/raw_object.cc
-FILE: ../../../third_party/dart/runtime/vm/raw_object.h
-FILE: ../../../third_party/dart/runtime/vm/scopes.cc
-FILE: ../../../third_party/dart/runtime/vm/scopes.h
-FILE: ../../../third_party/dart/runtime/vm/scopes_test.cc
-FILE: ../../../third_party/dart/runtime/vm/snapshot.cc
-FILE: ../../../third_party/dart/runtime/vm/snapshot.h
-FILE: ../../../third_party/dart/runtime/vm/snapshot_test.cc
-FILE: ../../../third_party/dart/runtime/vm/stack_frame.cc
-FILE: ../../../third_party/dart/runtime/vm/stack_frame_test.cc
-FILE: ../../../third_party/dart/runtime/vm/stub_code.cc
-FILE: ../../../third_party/dart/runtime/vm/symbols.cc
-FILE: ../../../third_party/dart/runtime/vm/symbols.h
-FILE: ../../../third_party/dart/runtime/vm/thread_pool.cc
-FILE: ../../../third_party/dart/runtime/vm/thread_pool.h
-FILE: ../../../third_party/dart/runtime/vm/thread_pool_test.cc
-FILE: ../../../third_party/dart/runtime/vm/thread_test.cc
-FILE: ../../../third_party/dart/runtime/vm/token.h
-FILE: ../../../third_party/dart/runtime/vm/unicode.cc
-FILE: ../../../third_party/dart/runtime/vm/unit_test.cc
-FILE: ../../../third_party/dart/runtime/vm/utils_test.cc
-FILE: ../../../third_party/dart/runtime/vm/version.h
-FILE: ../../../third_party/dart/runtime/vm/version_in.cc
-FILE: ../../../third_party/dart/runtime/vm/virtual_memory.cc
-FILE: ../../../third_party/dart/runtime/vm/virtual_memory.h
-FILE: ../../../third_party/dart/runtime/vm/virtual_memory_posix.cc
-FILE: ../../../third_party/dart/runtime/vm/virtual_memory_test.cc
-FILE: ../../../third_party/dart/runtime/vm/virtual_memory_win.cc
-FILE: ../../../third_party/dart/runtime/vm/zone.cc
-FILE: ../../../third_party/dart/runtime/vm/zone.h
-FILE: ../../../third_party/dart/runtime/vm/zone_test.cc
-FILE: ../../../third_party/dart/samples/samples.status
-FILE: ../../../third_party/dart/sdk/lib/_http/crypto.dart
-FILE: ../../../third_party/dart/sdk/lib/_http/http_date.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/async_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/core_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/isolate_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/math_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/foreign_helper.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/interceptors.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/isolate_helper.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_array.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_number.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_string.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/native_helper.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/regexp_helper.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/string_helper.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/async_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/constant_map.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/core_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/foreign_helper.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/interceptors.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/isolate_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/js_array.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/js_number.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/js_string.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/math_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/native_helper.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/regexp_helper.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/string_helper.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/sdk_library_metadata/lib/libraries.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/builtin.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/common_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/directory_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/eventhandler_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/file_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/platform_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/secure_socket_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/array.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/date_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/double.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/double_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/empty_source.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/errors_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/expando_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/function_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/growable_array.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/identical_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/immutable_map.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/integers.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/invocation_mirror_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/isolate_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/math_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/mirrors_impl.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/mirrors_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/object_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/print_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/regexp_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/stopwatch_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/string_buffer_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/string_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/timer_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/type_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/weak_property.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm_shared/lib/array_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm_shared/lib/bool_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm_shared/lib/integers_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm_shared/lib/map_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/async/async.dart
-FILE: ../../../third_party/dart/sdk/lib/async/async_error.dart
-FILE: ../../../third_party/dart/sdk/lib/async/broadcast_stream_controller.dart
-FILE: ../../../third_party/dart/sdk/lib/async/future.dart
-FILE: ../../../third_party/dart/sdk/lib/async/future_impl.dart
-FILE: ../../../third_party/dart/sdk/lib/async/stream_controller.dart
-FILE: ../../../third_party/dart/sdk/lib/async/stream_impl.dart
-FILE: ../../../third_party/dart/sdk/lib/async/stream_pipe.dart
-FILE: ../../../third_party/dart/sdk/lib/async/timer.dart
-FILE: ../../../third_party/dart/sdk/lib/collection/collection.dart
-FILE: ../../../third_party/dart/sdk/lib/collection/iterable.dart
-FILE: ../../../third_party/dart/sdk/lib/collection/iterator.dart
-FILE: ../../../third_party/dart/sdk/lib/collection/maps.dart
-FILE: ../../../third_party/dart/sdk/lib/collection/splay_tree.dart
-FILE: ../../../third_party/dart/sdk/lib/core/bool.dart
-FILE: ../../../third_party/dart/sdk/lib/core/core.dart
-FILE: ../../../third_party/dart/sdk/lib/core/double.dart
-FILE: ../../../third_party/dart/sdk/lib/core/errors.dart
-FILE: ../../../third_party/dart/sdk/lib/core/exceptions.dart
-FILE: ../../../third_party/dart/sdk/lib/core/identical.dart
-FILE: ../../../third_party/dart/sdk/lib/core/int.dart
-FILE: ../../../third_party/dart/sdk/lib/core/invocation.dart
-FILE: ../../../third_party/dart/sdk/lib/core/iterator.dart
-FILE: ../../../third_party/dart/sdk/lib/core/list.dart
-FILE: ../../../third_party/dart/sdk/lib/core/num.dart
-FILE: ../../../third_party/dart/sdk/lib/core/object.dart
-FILE: ../../../third_party/dart/sdk/lib/core/print.dart
-FILE: ../../../third_party/dart/sdk/lib/core/regexp.dart
-FILE: ../../../third_party/dart/sdk/lib/core/string.dart
-FILE: ../../../third_party/dart/sdk/lib/core/type.dart
-FILE: ../../../third_party/dart/sdk/lib/core/uri.dart
-FILE: ../../../third_party/dart/sdk/lib/core/weak.dart
-FILE: ../../../third_party/dart/sdk/lib/html/dart2js/html_dart2js.dart
-FILE: ../../../third_party/dart/sdk/lib/html/dartium/nativewrappers.dart
-FILE: ../../../third_party/dart/sdk/lib/html/html_common/conversions.dart
-FILE: ../../../third_party/dart/sdk/lib/html/html_common/css_class_set.dart
-FILE: ../../../third_party/dart/sdk/lib/html/html_common/html_common_dart2js.dart
-FILE: ../../../third_party/dart/sdk/lib/html/html_common/metadata.dart
-FILE: ../../../third_party/dart/sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart
-FILE: ../../../third_party/dart/sdk/lib/internal/async_cast.dart
-FILE: ../../../third_party/dart/sdk/lib/internal/cast.dart
-FILE: ../../../third_party/dart/sdk/lib/internal/internal.dart
-FILE: ../../../third_party/dart/sdk/lib/io/common.dart
-FILE: ../../../third_party/dart/sdk/lib/io/directory.dart
-FILE: ../../../third_party/dart/sdk/lib/io/directory_impl.dart
-FILE: ../../../third_party/dart/sdk/lib/io/eventhandler.dart
-FILE: ../../../third_party/dart/sdk/lib/io/io.dart
-FILE: ../../../third_party/dart/sdk/lib/io/platform.dart
-FILE: ../../../third_party/dart/sdk/lib/io/platform_impl.dart
-FILE: ../../../third_party/dart/sdk/lib/io/secure_server_socket.dart
-FILE: ../../../third_party/dart/sdk/lib/isolate/isolate.dart
-FILE: ../../../third_party/dart/sdk/lib/math/math.dart
-FILE: ../../../third_party/dart/sdk/lib/math/random.dart
-FILE: ../../../third_party/dart/sdk/lib/svg/dart2js/svg_dart2js.dart
-FILE: ../../../third_party/dart/sdk/lib/web_audio/dart2js/web_audio_dart2js.dart
-FILE: ../../../third_party/dart/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart
-FILE: ../../../third_party/dart/sdk/lib/web_sql/dart2js/web_sql_dart2js.dart
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-for details. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google LLC nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: angle
-ORIGIN: ../../../third_party/angle/src/third_party/trace_event/trace_event.h + ../../../LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/src/third_party/trace_event/trace_event.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2013 The Chromium Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/x509/internal.h
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/x509/internal.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2013 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: dart
-ORIGIN: ../../../third_party/dart/runtime/bin/eventhandler_win.cc + ../../../third_party/dart/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/dart/WATCHLISTS
-FILE: ../../../third_party/dart/runtime/bin/eventhandler_win.cc
-FILE: ../../../third_party/dart/runtime/bin/file.cc
-FILE: ../../../third_party/dart/runtime/bin/file.h
-FILE: ../../../third_party/dart/runtime/bin/file_system_watcher.cc
-FILE: ../../../third_party/dart/runtime/bin/file_system_watcher.h
-FILE: ../../../third_party/dart/runtime/bin/file_system_watcher_android.cc
-FILE: ../../../third_party/dart/runtime/bin/file_system_watcher_linux.cc
-FILE: ../../../third_party/dart/runtime/bin/file_system_watcher_macos.cc
-FILE: ../../../third_party/dart/runtime/bin/file_system_watcher_win.cc
-FILE: ../../../third_party/dart/runtime/bin/filter.cc
-FILE: ../../../third_party/dart/runtime/bin/filter.h
-FILE: ../../../third_party/dart/runtime/bin/gen_snapshot.cc
-FILE: ../../../third_party/dart/runtime/bin/io_natives.cc
-FILE: ../../../third_party/dart/runtime/bin/io_service.cc
-FILE: ../../../third_party/dart/runtime/bin/io_service.h
-FILE: ../../../third_party/dart/runtime/bin/io_service_no_ssl.cc
-FILE: ../../../third_party/dart/runtime/bin/io_service_no_ssl.h
-FILE: ../../../third_party/dart/runtime/bin/process.cc
-FILE: ../../../third_party/dart/runtime/bin/socket.cc
-FILE: ../../../third_party/dart/runtime/bin/socket.h
-FILE: ../../../third_party/dart/runtime/bin/socket_base_linux.cc
-FILE: ../../../third_party/dart/runtime/bin/socket_base_macos.cc
-FILE: ../../../third_party/dart/runtime/bin/socket_base_win.cc
-FILE: ../../../third_party/dart/runtime/bin/socket_linux.cc
-FILE: ../../../third_party/dart/runtime/bin/socket_macos.cc
-FILE: ../../../third_party/dart/runtime/bin/socket_win.cc
-FILE: ../../../third_party/dart/runtime/bin/stdio.cc
-FILE: ../../../third_party/dart/runtime/bin/stdio.h
-FILE: ../../../third_party/dart/runtime/bin/stdio_android.cc
-FILE: ../../../third_party/dart/runtime/bin/stdio_linux.cc
-FILE: ../../../third_party/dart/runtime/bin/stdio_macos.cc
-FILE: ../../../third_party/dart/runtime/bin/stdio_win.cc
-FILE: ../../../third_party/dart/runtime/bin/vmservice_impl.cc
-FILE: ../../../third_party/dart/runtime/bin/vmservice_impl.h
-FILE: ../../../third_party/dart/runtime/include/dart_native_api.h
-FILE: ../../../third_party/dart/runtime/lib/invocation_mirror.h
-FILE: ../../../third_party/dart/runtime/lib/libgen_in.cc
-FILE: ../../../third_party/dart/runtime/lib/simd128.cc
-FILE: ../../../third_party/dart/runtime/lib/stacktrace.cc
-FILE: ../../../third_party/dart/runtime/lib/typed_data.cc
-FILE: ../../../third_party/dart/runtime/lib/uri.cc
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/app/application.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/app/location_manager.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/class_instances.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/class_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/class_view.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/code_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/code_view.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/context_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/context_view.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/cpu_profile.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/cpu_profile/virtual_tree.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/cpu_profile_table.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/curly_block.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/error_view.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/eval_box.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/field_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/field_view.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/flag_list.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/function_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/function_view.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/heap_snapshot.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/helpers/any_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/icdata_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/icdata_view.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/instance_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/instance_view.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/isolate_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/isolate_view.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/json_view.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/library_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/library_view.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/local_var_descriptors_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/megamorphiccache_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/native_memory_profiler.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/object_common.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/object_view.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/objectpool_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/objectstore_view.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/observatory_application.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/pc_descriptors_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/sample_buffer_control.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/script_inset.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/script_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/script_view.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/sentinel_value.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/sentinel_view.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/source_inset.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/stack_trace_tree_config.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/type_arguments_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/unknown_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/vm_view.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/tracer.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/app/application.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/app/location_manager.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/class_instances.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/class_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/class_view.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/code_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/code_view.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/context_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/context_view.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/cpu_profile.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/cpu_profile/virtual_tree.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/cpu_profile_table.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/curly_block.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/error_view.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/eval_box.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/field_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/field_view.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/flag_list.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/function_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/function_view.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/heap_snapshot.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/helpers/any_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/icdata_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/icdata_view.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/instance_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/instance_view.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/isolate_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/isolate_view.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/json_view.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/library_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/library_view.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/local_var_descriptors_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/megamorphiccache_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/native_memory_profiler.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/object_common.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/object_view.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/objectpool_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/objectstore_view.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/observatory_application.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/pc_descriptors_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/sample_buffer_control.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/script_inset.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/script_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/script_view.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/sentinel_value.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/sentinel_view.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/source_inset.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/stack_trace_tree_config.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/type_arguments_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/unknown_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/vm_view.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/tracer.dart
-FILE: ../../../third_party/dart/runtime/platform/atomic.h
-FILE: ../../../third_party/dart/runtime/platform/signal_blocker.h
-FILE: ../../../third_party/dart/runtime/vm/allocation.h
-FILE: ../../../third_party/dart/runtime/vm/class_finalizer.cc
-FILE: ../../../third_party/dart/runtime/vm/code_patcher_arm.cc
-FILE: ../../../third_party/dart/runtime/vm/code_patcher_arm_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/aot/aot_call_specializer.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_arm.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_arm.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_arm64_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_arm_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_ia32.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_ia32.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_x64.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_x64.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/disassembler_arm.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/block_scheduler.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/block_scheduler.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/constant_propagator.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/flow_graph.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/flow_graph_compiler.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/flow_graph_compiler_arm.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/flow_graph_compiler_ia32.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/flow_graph_compiler_x64.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/il.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/il.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/il_arm.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/il_ia32.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/il_x64.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/inliner.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/linearscan.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/linearscan.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/locations.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/locations.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/type_propagator.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/type_propagator.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/jit/jit_call_specializer.cc
-FILE: ../../../third_party/dart/runtime/vm/constants_arm.h
-FILE: ../../../third_party/dart/runtime/vm/constants_ia32.h
-FILE: ../../../third_party/dart/runtime/vm/constants_x64.h
-FILE: ../../../third_party/dart/runtime/vm/dart.cc
-FILE: ../../../third_party/dart/runtime/vm/dart_api_impl.cc
-FILE: ../../../third_party/dart/runtime/vm/deferred_objects.cc
-FILE: ../../../third_party/dart/runtime/vm/deferred_objects.h
-FILE: ../../../third_party/dart/runtime/vm/deopt_instructions.cc
-FILE: ../../../third_party/dart/runtime/vm/deopt_instructions.h
-FILE: ../../../third_party/dart/runtime/vm/guard_field_test.cc
-FILE: ../../../third_party/dart/runtime/vm/heap/weak_table.cc
-FILE: ../../../third_party/dart/runtime/vm/heap/weak_table.h
-FILE: ../../../third_party/dart/runtime/vm/instructions.h
-FILE: ../../../third_party/dart/runtime/vm/instructions_arm.cc
-FILE: ../../../third_party/dart/runtime/vm/instructions_arm.h
-FILE: ../../../third_party/dart/runtime/vm/instructions_arm_test.cc
-FILE: ../../../third_party/dart/runtime/vm/isolate.cc
-FILE: ../../../third_party/dart/runtime/vm/isolate.h
-FILE: ../../../third_party/dart/runtime/vm/json_stream.cc
-FILE: ../../../third_party/dart/runtime/vm/json_stream.h
-FILE: ../../../third_party/dart/runtime/vm/native_api_impl.cc
-FILE: ../../../third_party/dart/runtime/vm/native_symbol.h
-FILE: ../../../third_party/dart/runtime/vm/native_symbol_android.cc
-FILE: ../../../third_party/dart/runtime/vm/native_symbol_linux.cc
-FILE: ../../../third_party/dart/runtime/vm/native_symbol_macos.cc
-FILE: ../../../third_party/dart/runtime/vm/native_symbol_win.cc
-FILE: ../../../third_party/dart/runtime/vm/object_id_ring.cc
-FILE: ../../../third_party/dart/runtime/vm/object_id_ring.h
-FILE: ../../../third_party/dart/runtime/vm/object_id_ring_test.cc
-FILE: ../../../third_party/dart/runtime/vm/object_store.cc
-FILE: ../../../third_party/dart/runtime/vm/os_test.cc
-FILE: ../../../third_party/dart/runtime/vm/profiler.cc
-FILE: ../../../third_party/dart/runtime/vm/profiler.h
-FILE: ../../../third_party/dart/runtime/vm/profiler_test.cc
-FILE: ../../../third_party/dart/runtime/vm/random.cc
-FILE: ../../../third_party/dart/runtime/vm/random.h
-FILE: ../../../third_party/dart/runtime/vm/reusable_handles.h
-FILE: ../../../third_party/dart/runtime/vm/service.cc
-FILE: ../../../third_party/dart/runtime/vm/service.h
-FILE: ../../../third_party/dart/runtime/vm/service_isolate.h
-FILE: ../../../third_party/dart/runtime/vm/service_test.cc
-FILE: ../../../third_party/dart/runtime/vm/signal_handler.h
-FILE: ../../../third_party/dart/runtime/vm/signal_handler_android.cc
-FILE: ../../../third_party/dart/runtime/vm/signal_handler_linux.cc
-FILE: ../../../third_party/dart/runtime/vm/signal_handler_macos.cc
-FILE: ../../../third_party/dart/runtime/vm/signal_handler_win.cc
-FILE: ../../../third_party/dart/runtime/vm/simulator.h
-FILE: ../../../third_party/dart/runtime/vm/simulator_arm.cc
-FILE: ../../../third_party/dart/runtime/vm/simulator_arm.h
-FILE: ../../../third_party/dart/runtime/vm/stack_frame_arm.h
-FILE: ../../../third_party/dart/runtime/vm/stack_frame_ia32.h
-FILE: ../../../third_party/dart/runtime/vm/stack_frame_x64.h
-FILE: ../../../third_party/dart/runtime/vm/stub_code_arm_test.cc
-FILE: ../../../third_party/dart/runtime/vm/tags.h
-FILE: ../../../third_party/dart/runtime/vm/thread_interrupter.cc
-FILE: ../../../third_party/dart/runtime/vm/thread_interrupter.h
-FILE: ../../../third_party/dart/runtime/vm/thread_interrupter_android.cc
-FILE: ../../../third_party/dart/runtime/vm/thread_interrupter_linux.cc
-FILE: ../../../third_party/dart/runtime/vm/thread_interrupter_macos.cc
-FILE: ../../../third_party/dart/runtime/vm/thread_interrupter_win.cc
-FILE: ../../../third_party/dart/sdk/lib/_http/http.dart
-FILE: ../../../third_party/dart/sdk/lib/_http/http_headers.dart
-FILE: ../../../third_party/dart/sdk/lib/_http/http_impl.dart
-FILE: ../../../third_party/dart/sdk/lib/_http/http_parser.dart
-FILE: ../../../third_party/dart/sdk/lib/_http/http_session.dart
-FILE: ../../../third_party/dart/sdk/lib/_http/websocket.dart
-FILE: ../../../third_party/dart/sdk/lib/_http/websocket_impl.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/collection_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/convert_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/internal_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/io_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/typed_data_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/annotations.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_helper.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_primitives.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_rti.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/mirror_helper.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/native_typed_data.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/annotations.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/collection_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/convert_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/internal_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/io_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/js_helper.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/js_names.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/js_primitives.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/native_typed_data.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/typed_data_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/file_system_entity_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/filter_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/io_service_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/process_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/socket_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/stdio_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/vmservice_io.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/vmservice_server.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/core_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/deferred_load_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/function.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/internal_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/mirror_reference.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/schedule_microtask_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/stacktrace.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/symbol_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/timer_impl.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/typed_data_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/uri_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm_shared/lib/collection_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm_shared/lib/null_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/io_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/async/deferred_load.dart
-FILE: ../../../third_party/dart/sdk/lib/async/schedule_microtask.dart
-FILE: ../../../third_party/dart/sdk/lib/async/stream.dart
-FILE: ../../../third_party/dart/sdk/lib/async/stream_transformers.dart
-FILE: ../../../third_party/dart/sdk/lib/async/zone.dart
-FILE: ../../../third_party/dart/sdk/lib/collection/collections.dart
-FILE: ../../../third_party/dart/sdk/lib/collection/hash_map.dart
-FILE: ../../../third_party/dart/sdk/lib/collection/hash_set.dart
-FILE: ../../../third_party/dart/sdk/lib/collection/linked_hash_map.dart
-FILE: ../../../third_party/dart/sdk/lib/collection/linked_hash_set.dart
-FILE: ../../../third_party/dart/sdk/lib/collection/linked_list.dart
-FILE: ../../../third_party/dart/sdk/lib/collection/list.dart
-FILE: ../../../third_party/dart/sdk/lib/convert/ascii.dart
-FILE: ../../../third_party/dart/sdk/lib/convert/byte_conversion.dart
-FILE: ../../../third_party/dart/sdk/lib/convert/chunked_conversion.dart
-FILE: ../../../third_party/dart/sdk/lib/convert/codec.dart
-FILE: ../../../third_party/dart/sdk/lib/convert/convert.dart
-FILE: ../../../third_party/dart/sdk/lib/convert/converter.dart
-FILE: ../../../third_party/dart/sdk/lib/convert/encoding.dart
-FILE: ../../../third_party/dart/sdk/lib/convert/html_escape.dart
-FILE: ../../../third_party/dart/sdk/lib/convert/json.dart
-FILE: ../../../third_party/dart/sdk/lib/convert/latin1.dart
-FILE: ../../../third_party/dart/sdk/lib/convert/line_splitter.dart
-FILE: ../../../third_party/dart/sdk/lib/convert/string_conversion.dart
-FILE: ../../../third_party/dart/sdk/lib/convert/utf.dart
-FILE: ../../../third_party/dart/sdk/lib/core/annotations.dart
-FILE: ../../../third_party/dart/sdk/lib/core/null.dart
-FILE: ../../../third_party/dart/sdk/lib/core/stacktrace.dart
-FILE: ../../../third_party/dart/sdk/lib/core/string_sink.dart
-FILE: ../../../third_party/dart/sdk/lib/core/symbol.dart
-FILE: ../../../third_party/dart/sdk/lib/internal/bytes_builder.dart
-FILE: ../../../third_party/dart/sdk/lib/internal/list.dart
-FILE: ../../../third_party/dart/sdk/lib/internal/print.dart
-FILE: ../../../third_party/dart/sdk/lib/internal/symbol.dart
-FILE: ../../../third_party/dart/sdk/lib/io/data_transformer.dart
-FILE: ../../../third_party/dart/sdk/lib/io/file.dart
-FILE: ../../../third_party/dart/sdk/lib/io/file_impl.dart
-FILE: ../../../third_party/dart/sdk/lib/io/file_system_entity.dart
-FILE: ../../../third_party/dart/sdk/lib/io/io_service.dart
-FILE: ../../../third_party/dart/sdk/lib/io/io_sink.dart
-FILE: ../../../third_party/dart/sdk/lib/io/link.dart
-FILE: ../../../third_party/dart/sdk/lib/io/secure_socket.dart
-FILE: ../../../third_party/dart/sdk/lib/io/socket.dart
-FILE: ../../../third_party/dart/sdk/lib/io/stdio.dart
-FILE: ../../../third_party/dart/sdk/lib/io/string_transformer.dart
-FILE: ../../../third_party/dart/sdk/lib/js/js.dart
-FILE: ../../../third_party/dart/sdk/lib/math/point.dart
-FILE: ../../../third_party/dart/sdk/lib/math/rectangle.dart
-FILE: ../../../third_party/dart/sdk/lib/mirrors/mirrors.dart
-FILE: ../../../third_party/dart/sdk/lib/typed_data/typed_data.dart
-FILE: ../../../third_party/dart/sdk/lib/vmservice/client.dart
-FILE: ../../../third_party/dart/sdk/lib/vmservice/constants.dart
-FILE: ../../../third_party/dart/sdk/lib/vmservice/message.dart
-FILE: ../../../third_party/dart/sdk/lib/vmservice/message_router.dart
-FILE: ../../../third_party/dart/sdk/lib/vmservice/running_isolate.dart
-FILE: ../../../third_party/dart/sdk/lib/vmservice/running_isolates.dart
-FILE: ../../../third_party/dart/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart
-FILE: ../../../third_party/dart/utils/compiler/create_snapshot_entry.dart
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-for details. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google LLC nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: angle
-LIBRARY: khronos
-ORIGIN: ../../../third_party/angle/src/third_party/khronos/GL/wglext.h
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/angle/src/third_party/khronos/GL/wglext.h
-FILE: ../../../third_party/khronos/noninclude/GL/glext.h
-FILE: ../../../third_party/khronos/noninclude/GL/wglext.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2013-2014 The Khronos Group Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and/or associated documentation files (the
-"Materials"), to deal in the Materials without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Materials, and to
-permit persons to whom the Materials are furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Materials.
-
-THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: khronos
-ORIGIN: ../../../third_party/khronos/GLES3/gl31.h
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/khronos/GLES3/gl31.h
-FILE: ../../../third_party/khronos/GLES3/gl32.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2013-2016 The Khronos Group Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and/or associated documentation files (the
-"Materials"), to deal in the Materials without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Materials, and to
-permit persons to whom the Materials are furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Materials.
-
-THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: angle
-ORIGIN: ../../../third_party/angle/include/GLES/glext.h
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/angle/include/GLES/glext.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2013-2017 The Khronos Group Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and/or associated documentation files (the
-"Materials"), to deal in the Materials without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Materials, and to
-permit persons to whom the Materials are furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Materials.
-
-THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: angle
-LIBRARY: khronos
-ORIGIN: ../../../third_party/angle/include/GLES/gl.h
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/angle/include/GLES/gl.h
-FILE: ../../../third_party/angle/include/WGL/wgl.h
-FILE: ../../../third_party/khronos/GLES2/gl2.h
-FILE: ../../../third_party/khronos/GLES2/gl2ext.h
-FILE: ../../../third_party/khronos/GLES3/gl3.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2013-2018 The Khronos Group Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and/or associated documentation files (the
-"Materials"), to deal in the Materials without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Materials, and to
-permit persons to whom the Materials are furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Materials.
-
-THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: icu
-ORIGIN: ../../../third_party/icu/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/icu/DIR_METADATA
-FILE: ../../../third_party/icu/android/icudtl.dat
-FILE: ../../../third_party/icu/cast/brkitr.patch
-FILE: ../../../third_party/icu/cast/icudtl.dat
-FILE: ../../../third_party/icu/chromeos/icudtl.dat
-FILE: ../../../third_party/icu/chromeos/icudtl.dat.hash
-FILE: ../../../third_party/icu/common/icudtb.dat
-FILE: ../../../third_party/icu/common/icudtl.dat
-FILE: ../../../third_party/icu/flutter/brkitr.patch
-FILE: ../../../third_party/icu/flutter/icudtl.dat
-FILE: ../../../third_party/icu/fuzzers/fuzzer_utils.h
-FILE: ../../../third_party/icu/fuzzers/icu_appendable_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_break_iterator_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_break_iterator_utf32_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_number_format_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_to_case_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_ucasemap_fuzzer.cc
-FILE: ../../../third_party/icu/ios/icudtl.dat
-FILE: ../../../third_party/icu/patches/ardatepattern.patch
-FILE: ../../../third_party/icu/patches/atomic_template_instantiation.patch
-FILE: ../../../third_party/icu/patches/cjdict.patch
-FILE: ../../../third_party/icu/patches/configure.patch
-FILE: ../../../third_party/icu/patches/data_symb.patch
-FILE: ../../../third_party/icu/patches/fix-bool-mix-use.patch
-FILE: ../../../third_party/icu/patches/fuchsia.patch
-FILE: ../../../third_party/icu/patches/gb_table.patch
-FILE: ../../../third_party/icu/patches/iso2022jp.patch
-FILE: ../../../third_party/icu/patches/isvalidenum.patch
-FILE: ../../../third_party/icu/patches/khmer-dictbe.patch
-FILE: ../../../third_party/icu/patches/locale1.patch
-FILE: ../../../third_party/icu/patches/locale_google.patch
-FILE: ../../../third_party/icu/patches/restrace.patch
-FILE: ../../../third_party/icu/patches/wordbrk.patch
-FILE: ../../../third_party/icu/patches/wpo.patch
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-implicithan-icu4x.icu
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-implicithan.icu
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-unihan-icu4x.icu
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-unihan.icu
-FILE: ../../../third_party/icu/source/data/in/nfc.nrm
-FILE: ../../../third_party/icu/source/data/in/nfkc.nrm
-FILE: ../../../third_party/icu/source/data/in/nfkc_cf.nrm
-FILE: ../../../third_party/icu/source/data/in/pnames.icu
-FILE: ../../../third_party/icu/source/data/in/ubidi.icu
-FILE: ../../../third_party/icu/source/data/in/ucase.icu
-FILE: ../../../third_party/icu/source/data/in/uemoji.icu
-FILE: ../../../third_party/icu/source/data/in/ulayout.icu
-FILE: ../../../third_party/icu/source/data/in/unames.icu
-FILE: ../../../third_party/icu/source/data/in/uprops.icu
-FILE: ../../../third_party/icu/source/data/in/uts46.nrm
-FILE: ../../../third_party/icu/source/data/mappings/big5-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/euc-jp-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/euc-kr-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/gb18030.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm866-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-10-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-13-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-14-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-15-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-16-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-2-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-3-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-4-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-5-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-6-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-7-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-8-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/koi8-r-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/koi8-u-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/macintosh-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/shift_jis-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1250-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1251-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1252-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1253-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1254-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1255-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1256-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1257-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1258-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-874-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-936-2000.ucm
-FILE: ../../../third_party/icu/source/data/mappings/x-mac-cyrillic-html.ucm
-FILE: ../../../third_party/icu/source/extra/scrptrun/srtest.dsp
-FILE: ../../../third_party/icu/source/extra/scrptrun/srtest.dsw
-FILE: ../../../third_party/icu/source/tools/tzcode/asctime.c
-FILE: ../../../third_party/icu/source/tools/tzcode/ialloc.c
-FILE: ../../../third_party/icu/source/tools/tzcode/localtime.c
-FILE: ../../../third_party/icu/source/tools/tzcode/private.h
-FILE: ../../../third_party/icu/source/tools/tzcode/scheck.c
-FILE: ../../../third_party/icu/source/tools/tzcode/tzfile.h
-FILE: ../../../third_party/icu/source/tools/tzcode/tzselect.ksh
-FILE: ../../../third_party/icu/source/tools/tzcode/zdump.c
-FILE: ../../../third_party/icu/source/tools/tzcode/zic.c
-FILE: ../../../third_party/icu/tzres/metaZones.res
-FILE: ../../../third_party/icu/tzres/timezoneTypes.res
-FILE: ../../../third_party/icu/tzres/zoneinfo64.res
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2014 International Business Machines Corporation
-and others. All Rights Reserved.
-
-This list is part of a project hosted at:
-  github.com/kanyawtech/myanmar-karen-word-lists
-
-Copyright (c) 2013, LeRoy Benjamin Sharon
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met: Redistributions of source code must retain the above
-copyright notice, this list of conditions and the following
-disclaimer.  Redistributions in binary form must reproduce the
-above copyright notice, this list of conditions and the following
-disclaimer in the documentation and/or other materials provided
-with the distribution.
-
-  Neither the name Myanmar Karen Word Lists, nor the names of its
-  contributors may be used to endorse or promote products derived
-  from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: glfw
-ORIGIN: ../../../third_party/glfw/src/linux_joystick.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/glfw/src/linux_joystick.h
-FILE: ../../../third_party/glfw/src/wl_init.c
-FILE: ../../../third_party/glfw/src/wl_monitor.c
-FILE: ../../../third_party/glfw/src/wl_platform.h
-FILE: ../../../third_party/glfw/src/wl_window.c
-FILE: ../../../third_party/glfw/src/xkb_unicode.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2014 Jonas Ådahl <jadahl@gmail.com>
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would
-   be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and must not
-   be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-   distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/constant_time_test.cc
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/constant_time_test.cc
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2014 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. All advertising materials mentioning features or use of this software
-   must display the following acknowledgement:
-   "This product includes cryptographic software written by
-    Eric Young (eay@cryptsoft.com)"
-   The word 'cryptographic' can be left out if the rouines from the library
-   being used are not cryptographic related :-).
-4. If you include any Windows specific code (or a derivative thereof) from
-   the apps directory (application code) you must include an acknowledgement:
-   "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
-
-THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-The licence and distribution terms for any publically available version or
-derivative of this code cannot be changed.  i.e. this code cannot simply be
-copied and put under another distribution licence
-[including the GNU Public Licence.]
-====================================================================================================
-
-====================================================================================================
-LIBRARY: dart
-ORIGIN: ../../../third_party/dart/runtime/observatory/web/third_party/webcomponents.min.js
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/dart/runtime/observatory/web/third_party/webcomponents.min.js
-FILE: ../../../third_party/dart/runtime/observatory_2/web/third_party/webcomponents.min.js
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2014 The Polymer Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/base64/base64_test.cc
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/boringssl/src/crypto/base64/base64_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/bio/bio_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/bio/socket_helper.c
-FILE: ../../../third_party/boringssl/src/crypto/bytestring/ber.c
-FILE: ../../../third_party/boringssl/src/crypto/bytestring/bytestring_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/bytestring/cbb.c
-FILE: ../../../third_party/boringssl/src/crypto/bytestring/cbs.c
-FILE: ../../../third_party/boringssl/src/crypto/bytestring/internal.h
-FILE: ../../../third_party/boringssl/src/crypto/chacha/chacha.c
-FILE: ../../../third_party/boringssl/src/crypto/cipher_extra/aead_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/cipher_extra/e_chacha20poly1305.c
-FILE: ../../../third_party/boringssl/src/crypto/cipher_extra/e_tls.c
-FILE: ../../../third_party/boringssl/src/crypto/cpu-arm.c
-FILE: ../../../third_party/boringssl/src/crypto/crypto.c
-FILE: ../../../third_party/boringssl/src/crypto/digest_extra/digest_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/engine/engine.c
-FILE: ../../../third_party/boringssl/src/crypto/err/err_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/evp/evp_extra_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/cipher/aead.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/ec_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/rand/rand.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/rand/urandom.c
-FILE: ../../../third_party/boringssl/src/crypto/hkdf/hkdf.c
-FILE: ../../../third_party/boringssl/src/crypto/hkdf/hkdf_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/lhash/lhash_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/pkcs7/pkcs7.c
-FILE: ../../../third_party/boringssl/src/crypto/pkcs7/pkcs7_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/pkcs8/pkcs12_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/poly1305/poly1305.c
-FILE: ../../../third_party/boringssl/src/crypto/poly1305/poly1305_arm.c
-FILE: ../../../third_party/boringssl/src/crypto/poly1305/poly1305_vec.c
-FILE: ../../../third_party/boringssl/src/crypto/rand_extra/windows.c
-FILE: ../../../third_party/boringssl/src/include/openssl/aead.h
-FILE: ../../../third_party/boringssl/src/include/openssl/bytestring.h
-FILE: ../../../third_party/boringssl/src/include/openssl/chacha.h
-FILE: ../../../third_party/boringssl/src/include/openssl/crypto.h
-FILE: ../../../third_party/boringssl/src/include/openssl/engine.h
-FILE: ../../../third_party/boringssl/src/include/openssl/hkdf.h
-FILE: ../../../third_party/boringssl/src/include/openssl/objects.h
-FILE: ../../../third_party/boringssl/src/include/openssl/opensslconf.h
-FILE: ../../../third_party/boringssl/src/include/openssl/opensslv.h
-FILE: ../../../third_party/boringssl/src/include/openssl/ossl_typ.h
-FILE: ../../../third_party/boringssl/src/include/openssl/pkcs12.h
-FILE: ../../../third_party/boringssl/src/include/openssl/pkcs7.h
-FILE: ../../../third_party/boringssl/src/include/openssl/poly1305.h
-FILE: ../../../third_party/boringssl/src/include/openssl/rand.h
-FILE: ../../../third_party/boringssl/src/include/openssl/safestack.h
-FILE: ../../../third_party/boringssl/src/ssl/ssl_test.cc
-FILE: ../../../third_party/boringssl/src/tool/args.cc
-FILE: ../../../third_party/boringssl/src/tool/client.cc
-FILE: ../../../third_party/boringssl/src/tool/const.cc
-FILE: ../../../third_party/boringssl/src/tool/digest.cc
-FILE: ../../../third_party/boringssl/src/tool/internal.h
-FILE: ../../../third_party/boringssl/src/tool/pkcs12.cc
-FILE: ../../../third_party/boringssl/src/tool/server.cc
-FILE: ../../../third_party/boringssl/src/tool/speed.cc
-FILE: ../../../third_party/boringssl/src/tool/tool.cc
-FILE: ../../../third_party/boringssl/src/tool/transport_common.cc
-FILE: ../../../third_party/boringssl/src/tool/transport_common.h
-FILE: ../../../third_party/boringssl/src/util/make_errors.go
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2014, Google Inc.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: dart
-ORIGIN: ../../../third_party/dart/runtime/lib/profiler.cc + ../../../third_party/dart/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/dart/runtime/lib/profiler.cc
-FILE: ../../../third_party/dart/runtime/observatory/bin/shell.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/app.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/object_graph.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/service.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/service_common.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/service_html.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/service_io.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/app/page.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/app/settings.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/app/view_model.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/allocation_profile.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/class_tree.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/debugger.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/heap_map.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/isolate_reconnect.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/metrics.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/vm_connect.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/service/object.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/utils.dart
-FILE: ../../../third_party/dart/runtime/observatory/web/main.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/bin/shell.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/app.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/object_graph.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/service.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/service_common.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/service_html.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/service_io.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/app/page.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/app/settings.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/app/view_model.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/allocation_profile.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/class_tree.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/debugger.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/heap_map.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/isolate_reconnect.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/metrics.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/vm_connect.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/service/object.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/utils.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/web/main.dart
-FILE: ../../../third_party/dart/runtime/platform/address_sanitizer.h
-FILE: ../../../third_party/dart/runtime/platform/memory_sanitizer.h
-FILE: ../../../third_party/dart/runtime/platform/safe_stack.h
-FILE: ../../../third_party/dart/runtime/tools/verbose_gc_to_bmu.dart
-FILE: ../../../third_party/dart/runtime/vm/bit_set_test.cc
-FILE: ../../../third_party/dart/runtime/vm/code_patcher_arm64.cc
-FILE: ../../../third_party/dart/runtime/vm/code_patcher_arm64_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_arm64.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_arm64.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/disassembler_arm64.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/flow_graph_compiler_arm64.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/il_arm64.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/range_analysis.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/range_analysis.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/range_analysis_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/method_recognizer.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/method_recognizer.h
-FILE: ../../../third_party/dart/runtime/vm/constants_arm64.h
-FILE: ../../../third_party/dart/runtime/vm/cpu_arm.h
-FILE: ../../../third_party/dart/runtime/vm/cpu_arm64.cc
-FILE: ../../../third_party/dart/runtime/vm/cpu_arm64.h
-FILE: ../../../third_party/dart/runtime/vm/cpu_ia32.h
-FILE: ../../../third_party/dart/runtime/vm/cpu_x64.h
-FILE: ../../../third_party/dart/runtime/vm/cpuid.cc
-FILE: ../../../third_party/dart/runtime/vm/cpuid.h
-FILE: ../../../third_party/dart/runtime/vm/cpuinfo.h
-FILE: ../../../third_party/dart/runtime/vm/cpuinfo_android.cc
-FILE: ../../../third_party/dart/runtime/vm/cpuinfo_test.cc
-FILE: ../../../third_party/dart/runtime/vm/cpuinfo_win.cc
-FILE: ../../../third_party/dart/runtime/vm/debugger_arm64.cc
-FILE: ../../../third_party/dart/runtime/vm/hash_table.h
-FILE: ../../../third_party/dart/runtime/vm/hash_table_test.cc
-FILE: ../../../third_party/dart/runtime/vm/heap/scavenger_test.cc
-FILE: ../../../third_party/dart/runtime/vm/heap/spaces.h
-FILE: ../../../third_party/dart/runtime/vm/heap/weak_code.cc
-FILE: ../../../third_party/dart/runtime/vm/heap/weak_code.h
-FILE: ../../../third_party/dart/runtime/vm/instructions_arm64.cc
-FILE: ../../../third_party/dart/runtime/vm/instructions_arm64.h
-FILE: ../../../third_party/dart/runtime/vm/instructions_arm64_test.cc
-FILE: ../../../third_party/dart/runtime/vm/metrics.cc
-FILE: ../../../third_party/dart/runtime/vm/metrics.h
-FILE: ../../../third_party/dart/runtime/vm/metrics_test.cc
-FILE: ../../../third_party/dart/runtime/vm/object_arm64_test.cc
-FILE: ../../../third_party/dart/runtime/vm/object_graph.cc
-FILE: ../../../third_party/dart/runtime/vm/object_graph.h
-FILE: ../../../third_party/dart/runtime/vm/object_graph_test.cc
-FILE: ../../../third_party/dart/runtime/vm/regexp.cc
-FILE: ../../../third_party/dart/runtime/vm/regexp.h
-FILE: ../../../third_party/dart/runtime/vm/regexp_assembler.cc
-FILE: ../../../third_party/dart/runtime/vm/regexp_assembler.h
-FILE: ../../../third_party/dart/runtime/vm/regexp_assembler_ir.cc
-FILE: ../../../third_party/dart/runtime/vm/regexp_assembler_ir.h
-FILE: ../../../third_party/dart/runtime/vm/regexp_ast.cc
-FILE: ../../../third_party/dart/runtime/vm/regexp_ast.h
-FILE: ../../../third_party/dart/runtime/vm/regexp_parser.cc
-FILE: ../../../third_party/dart/runtime/vm/regexp_parser.h
-FILE: ../../../third_party/dart/runtime/vm/regexp_test.cc
-FILE: ../../../third_party/dart/runtime/vm/report.cc
-FILE: ../../../third_party/dart/runtime/vm/report.h
-FILE: ../../../third_party/dart/runtime/vm/ring_buffer.h
-FILE: ../../../third_party/dart/runtime/vm/ring_buffer_test.cc
-FILE: ../../../third_party/dart/runtime/vm/runtime_entry_arm64.cc
-FILE: ../../../third_party/dart/runtime/vm/simulator_arm64.cc
-FILE: ../../../third_party/dart/runtime/vm/simulator_arm64.h
-FILE: ../../../third_party/dart/runtime/vm/stack_frame_arm64.h
-FILE: ../../../third_party/dart/runtime/vm/stub_code_arm64_test.cc
-FILE: ../../../third_party/dart/runtime/vm/tags.cc
-FILE: ../../../third_party/dart/runtime/vm/unibrow-inl.h
-FILE: ../../../third_party/dart/runtime/vm/unibrow.cc
-FILE: ../../../third_party/dart/runtime/vm/unibrow.h
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/preambles/d8.js
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/preambles/jsshell.js
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/linked_hash_map.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/synced/embedded_names.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/lib_prefix.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/profiler.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm_shared/lib/convert_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/collection/set.dart
-FILE: ../../../third_party/dart/sdk/lib/core/sink.dart
-FILE: ../../../third_party/dart/sdk/lib/developer/profiler.dart
-FILE: ../../../third_party/dart/sdk/lib/io/process.dart
-FILE: ../../../third_party/dart/sdk/lib/io/service_object.dart
-FILE: ../../../third_party/dart/sdk/lib/isolate/capability.dart
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-for details. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google LLC nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/cipher_extra/cipher_test.cc
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/cipher_extra/cipher_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/evp/evp_test.cc
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2015 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/bn_extra/bn_asn1.c
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/boringssl/err_data.c
-FILE: ../../../third_party/boringssl/src/crypto/bn_extra/bn_asn1.c
-FILE: ../../../third_party/boringssl/src/crypto/cmac/cmac_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/conf/internal.h
-FILE: ../../../third_party/boringssl/src/crypto/curve25519/asm/x25519-asm-arm.S
-FILE: ../../../third_party/boringssl/src/crypto/curve25519/ed25519_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/curve25519/x25519_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/err/err_data_generate.go
-FILE: ../../../third_party/boringssl/src/crypto/evp/pbkdf_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/aes/aes_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/p224-64.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/util.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/rand/internal.h
-FILE: ../../../third_party/boringssl/src/crypto/pkcs8/pkcs8_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/poly1305/poly1305_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/refcount_c11.c
-FILE: ../../../third_party/boringssl/src/crypto/refcount_lock.c
-FILE: ../../../third_party/boringssl/src/crypto/refcount_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/thread_none.c
-FILE: ../../../third_party/boringssl/src/crypto/thread_pthread.c
-FILE: ../../../third_party/boringssl/src/crypto/thread_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/thread_win.c
-FILE: ../../../third_party/boringssl/src/include/openssl/buffer.h
-FILE: ../../../third_party/boringssl/src/include/openssl/cmac.h
-FILE: ../../../third_party/boringssl/src/include/openssl/curve25519.h
-FILE: ../../../third_party/boringssl/src/include/openssl/dtls1.h
-FILE: ../../../third_party/boringssl/src/include/openssl/srtp.h
-FILE: ../../../third_party/boringssl/src/ssl/ssl_aead_ctx.cc
-FILE: ../../../third_party/boringssl/src/ssl/ssl_buffer.cc
-FILE: ../../../third_party/boringssl/src/ssl/ssl_key_share.cc
-FILE: ../../../third_party/boringssl/src/tool/ciphers.cc
-FILE: ../../../third_party/boringssl/src/tool/generate_ed25519.cc
-FILE: ../../../third_party/boringssl/src/tool/genrsa.cc
-FILE: ../../../third_party/boringssl/src/tool/rand.cc
-FILE: ../../../third_party/boringssl/src/util/all_tests.go
-FILE: ../../../third_party/boringssl/src/util/bot/DEPS
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2015, Google Inc.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: dart
-ORIGIN: ../../../third_party/dart/runtime/bin/address_sanitizer.cc + ../../../third_party/dart/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/dart/runtime/bin/address_sanitizer.cc
-FILE: ../../../third_party/dart/runtime/bin/dart_io_api_impl.cc
-FILE: ../../../third_party/dart/runtime/bin/observatory_assets_empty.cc
-FILE: ../../../third_party/dart/runtime/include/bin/dart_io_api.h
-FILE: ../../../third_party/dart/runtime/lib/developer.cc
-FILE: ../../../third_party/dart/runtime/lib/timeline.cc
-FILE: ../../../third_party/dart/runtime/lib/vmservice.cc
-FILE: ../../../third_party/dart/runtime/observatory/lib/allocation_profile.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/cli.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/debugger.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/sample_profile.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/allocation_profile/allocation_profile.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/cli/command.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/debugger/debugger.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/debugger/debugger_location.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/heap_snapshot.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/logging.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/logging_list.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/megamorphiccache_view.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/objectpool_view.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/persistent_handles.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/ports.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/timeline_page.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/sample_profile/sample_profile.dart
-FILE: ../../../third_party/dart/runtime/observatory/web/timeline.js
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/allocation_profile.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/cli.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/debugger.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/sample_profile.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/allocation_profile/allocation_profile.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/cli/command.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/debugger/debugger.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/debugger/debugger_location.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/heap_snapshot.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/logging.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/logging_list.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/megamorphiccache_view.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/objectpool_view.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/persistent_handles.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/ports.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/timeline_page.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/sample_profile/sample_profile.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/web/timeline.js
-FILE: ../../../third_party/dart/runtime/vm/atomic_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/aot/precompiler.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/aot/precompiler.h
-FILE: ../../../third_party/dart/runtime/vm/log.cc
-FILE: ../../../third_party/dart/runtime/vm/log.h
-FILE: ../../../third_party/dart/runtime/vm/log_test.cc
-FILE: ../../../third_party/dart/runtime/vm/os_thread.cc
-FILE: ../../../third_party/dart/runtime/vm/profiler_service.cc
-FILE: ../../../third_party/dart/runtime/vm/profiler_service.h
-FILE: ../../../third_party/dart/runtime/vm/program_visitor.cc
-FILE: ../../../third_party/dart/runtime/vm/program_visitor.h
-FILE: ../../../third_party/dart/runtime/vm/regexp_assembler_bytecode.cc
-FILE: ../../../third_party/dart/runtime/vm/regexp_assembler_bytecode.h
-FILE: ../../../third_party/dart/runtime/vm/regexp_assembler_bytecode_inl.h
-FILE: ../../../third_party/dart/runtime/vm/regexp_bytecodes.h
-FILE: ../../../third_party/dart/runtime/vm/regexp_interpreter.cc
-FILE: ../../../third_party/dart/runtime/vm/regexp_interpreter.h
-FILE: ../../../third_party/dart/runtime/vm/scope_timer.h
-FILE: ../../../third_party/dart/runtime/vm/service_event.cc
-FILE: ../../../third_party/dart/runtime/vm/service_event.h
-FILE: ../../../third_party/dart/runtime/vm/service_isolate.cc
-FILE: ../../../third_party/dart/runtime/vm/source_report.cc
-FILE: ../../../third_party/dart/runtime/vm/source_report.h
-FILE: ../../../third_party/dart/runtime/vm/source_report_test.cc
-FILE: ../../../third_party/dart/runtime/vm/thread.cc
-FILE: ../../../third_party/dart/runtime/vm/thread.h
-FILE: ../../../third_party/dart/runtime/vm/thread_barrier.h
-FILE: ../../../third_party/dart/runtime/vm/thread_barrier_test.cc
-FILE: ../../../third_party/dart/runtime/vm/thread_registry.cc
-FILE: ../../../third_party/dart/runtime/vm/thread_registry.h
-FILE: ../../../third_party/dart/runtime/vm/timeline.cc
-FILE: ../../../third_party/dart/runtime/vm/timeline.h
-FILE: ../../../third_party/dart/runtime/vm/timeline_test.cc
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/developer_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_runtime/classes.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_runtime/errors.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_runtime/operations.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_runtime/rtti.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_runtime/runtime.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_runtime/types.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_runtime/utils.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/debugger.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/developer_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/preambles/d8.js
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/preambles/jsshell.js
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/synced/async_await_error_codes.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/async_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/developer.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/timeline.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm_shared/lib/compact_hash.dart
-FILE: ../../../third_party/dart/sdk/lib/convert/base64.dart
-FILE: ../../../third_party/dart/sdk/lib/developer/developer.dart
-FILE: ../../../third_party/dart/sdk/lib/developer/extension.dart
-FILE: ../../../third_party/dart/sdk/lib/developer/timeline.dart
-FILE: ../../../third_party/dart/sdk/lib/io/io_resource_info.dart
-FILE: ../../../third_party/dart/sdk/lib/io/security_context.dart
-FILE: ../../../third_party/dart/sdk/lib/js/_js_annotations.dart
-FILE: ../../../third_party/dart/sdk/lib/vmservice/asset.dart
-FILE: ../../../third_party/dart/sdk/lib/vmservice/vmservice.dart
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-for details. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google LLC nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: glfw
-ORIGIN: ../../../third_party/glfw/src/null_init.c
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/glfw/src/null_init.c
-FILE: ../../../third_party/glfw/src/null_monitor.c
-FILE: ../../../third_party/glfw/src/null_platform.h
-FILE: ../../../third_party/glfw/src/null_window.c
-FILE: ../../../third_party/glfw/src/osmesa_context.c
-FILE: ../../../third_party/glfw/src/osmesa_context.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2016 Google Inc.
-Copyright (c) 2006-2016 Camilla Löwy <elmindreda@glfw.org>
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would
-   be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and must not
-   be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-   distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/asn1/asn1_test.cc
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/boringssl/src/crypto/asn1/asn1_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/bytestring/asn1_compat.c
-FILE: ../../../third_party/boringssl/src/crypto/chacha/chacha_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/cpu-aarch64-linux.c
-FILE: ../../../third_party/boringssl/src/crypto/cpu-arm-linux.c
-FILE: ../../../third_party/boringssl/src/crypto/cpu-ppc64le.c
-FILE: ../../../third_party/boringssl/src/crypto/curve25519/spake25519.c
-FILE: ../../../third_party/boringssl/src/crypto/curve25519/spake25519_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/ecdh_extra/ecdh_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/check_bn_tests.go
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/p256-x86_64_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/modes/polyval.c
-FILE: ../../../third_party/boringssl/src/crypto/obj/obj_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/obj/objects.go
-FILE: ../../../third_party/boringssl/src/crypto/poly1305/internal.h
-FILE: ../../../third_party/boringssl/src/crypto/pool/internal.h
-FILE: ../../../third_party/boringssl/src/crypto/pool/pool.c
-FILE: ../../../third_party/boringssl/src/crypto/pool/pool_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/rand_extra/deterministic.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/x509_test.cc
-FILE: ../../../third_party/boringssl/src/decrepit/evp/dss1.c
-FILE: ../../../third_party/boringssl/src/decrepit/evp/evp_do_all.c
-FILE: ../../../third_party/boringssl/src/decrepit/obj/obj_decrepit.c
-FILE: ../../../third_party/boringssl/src/decrepit/ripemd/ripemd_test.cc
-FILE: ../../../third_party/boringssl/src/decrepit/x509/x509_decrepit.c
-FILE: ../../../third_party/boringssl/src/include/openssl/asn1_mac.h
-FILE: ../../../third_party/boringssl/src/include/openssl/obj_mac.h
-FILE: ../../../third_party/boringssl/src/include/openssl/pool.h
-FILE: ../../../third_party/boringssl/src/ssl/tls13_both.cc
-FILE: ../../../third_party/boringssl/src/ssl/tls13_client.cc
-FILE: ../../../third_party/boringssl/src/ssl/tls13_enc.cc
-FILE: ../../../third_party/boringssl/src/ssl/tls13_server.cc
-FILE: ../../../third_party/boringssl/src/util/BUILD.toplevel
-FILE: ../../../third_party/boringssl/src/util/diff_asm.go
-FILE: ../../../third_party/boringssl/src/util/run_android_tests.go
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2016, Google Inc.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: dart
-ORIGIN: ../../../third_party/dart/runtime/bin/crypto_fuchsia.cc + ../../../third_party/dart/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/dart/runtime/bin/crypto_fuchsia.cc
-FILE: ../../../third_party/dart/runtime/bin/crypto_test.cc
-FILE: ../../../third_party/dart/runtime/bin/directory_fuchsia.cc
-FILE: ../../../third_party/dart/runtime/bin/directory_test.cc
-FILE: ../../../third_party/dart/runtime/bin/eventhandler_fuchsia.cc
-FILE: ../../../third_party/dart/runtime/bin/eventhandler_fuchsia.h
-FILE: ../../../third_party/dart/runtime/bin/file_fuchsia.cc
-FILE: ../../../third_party/dart/runtime/bin/file_support.cc
-FILE: ../../../third_party/dart/runtime/bin/file_system_watcher_fuchsia.cc
-FILE: ../../../third_party/dart/runtime/bin/loader.cc
-FILE: ../../../third_party/dart/runtime/bin/loader.h
-FILE: ../../../third_party/dart/runtime/bin/platform_fuchsia.cc
-FILE: ../../../third_party/dart/runtime/bin/process_fuchsia.cc
-FILE: ../../../third_party/dart/runtime/bin/reference_counting.h
-FILE: ../../../third_party/dart/runtime/bin/root_certificates_unsupported.cc
-FILE: ../../../third_party/dart/runtime/bin/socket_base_fuchsia.cc
-FILE: ../../../third_party/dart/runtime/bin/socket_base_fuchsia.h
-FILE: ../../../third_party/dart/runtime/bin/socket_fuchsia.cc
-FILE: ../../../third_party/dart/runtime/bin/stdio_fuchsia.cc
-FILE: ../../../third_party/dart/runtime/bin/thread_fuchsia.cc
-FILE: ../../../third_party/dart/runtime/bin/thread_fuchsia.h
-FILE: ../../../third_party/dart/runtime/bin/utils_fuchsia.cc
-FILE: ../../../third_party/dart/runtime/lib/stacktrace.h
-FILE: ../../../third_party/dart/runtime/observatory/lib/event.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/models.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/repositories.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/app/notification.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/class_allocation_profile.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/containers/virtual_collection.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/containers/virtual_tree.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/error_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/general_error.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/helpers/custom_element.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/helpers/nav_bar.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/helpers/nav_menu.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/helpers/rendering_queue.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/helpers/rendering_scheduler.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/helpers/uris.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/inbound_references.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/isolate/counter_chart.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/isolate/location.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/isolate/run_state.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/isolate/shared_summary.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/isolate/summary.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/metric/details.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/metric/graph.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/nav/class_menu.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/nav/isolate_menu.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/nav/library_menu.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/nav/menu_item.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/nav/notify.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/nav/notify_event.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/nav/notify_exception.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/nav/refresh.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/nav/top_menu.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/nav/vm_menu.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/retaining_path.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/source_link.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/strongly_reachable_instances.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/vm_connect_target.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/exceptions.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/allocation_profile.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/breakpoint.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/class.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/code.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/context.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/error.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/event.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/extension_data.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/field.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/flag.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/frame.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/function.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/guarded.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/heap_space.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/icdata.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/inbound_references.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/instance.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/isolate.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/library.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/local_var_descriptors.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/map_association.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/megamorphiccache.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/metric.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/notification.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/object.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/objectpool.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/objectstore.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/pc_descriptors.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/persistent_handles.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/ports.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/retaining_path.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/sample_profile.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/script.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/sentinel.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/source_location.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/target.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/timeline_event.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/type_arguments.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/unknown.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/vm.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/allocation_profile.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/breakpoint.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/class.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/context.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/editor.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/eval.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/event.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/field.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/flag.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/function.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/heap_snapshot.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/icdata.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/inbound_references.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/instance.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/isolate.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/library.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/megamorphiccache.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/metric.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/notification.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/object.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/objectpool.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/objectstore.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/persistent_handles.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/ports.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/reachable_size.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/retained_size.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/retaining_path.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/sample_profile.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/script.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/strongly_reachable_instances.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/target.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/type_arguments.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/allocation_profile.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/breakpoint.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/class.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/context.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/editor.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/eval.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/event.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/field.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/flag.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/function.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/heap_snapshot.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/icdata.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/inbound_references.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/instance.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/isolate.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/library.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/megamorphiccache.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/metric.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/notification.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/object.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/objectpool.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/objectstore.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/persistent_handles.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/ports.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/reachable_size.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/retained_size.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/retaining_path.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/sample_profile.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/script.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/settings.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/strongly_reachable_instances.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/target.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/type_arguments.dart
-FILE: ../../../third_party/dart/runtime/observatory/web/timeline_message_handler.js
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/event.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/models.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/repositories.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/app/notification.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/class_allocation_profile.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/containers/virtual_collection.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/containers/virtual_tree.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/error_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/general_error.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/helpers/custom_element.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/helpers/nav_bar.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/helpers/nav_menu.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/helpers/rendering_queue.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/helpers/rendering_scheduler.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/helpers/tag.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/helpers/uris.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/inbound_references.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/isolate/counter_chart.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/isolate/location.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/isolate/run_state.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/isolate/shared_summary.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/isolate/summary.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/metric/details.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/metric/graph.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/nav/class_menu.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/nav/isolate_menu.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/nav/library_menu.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/nav/menu_item.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/nav/notify.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/nav/notify_event.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/nav/notify_exception.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/nav/refresh.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/nav/top_menu.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/nav/vm_menu.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/retaining_path.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/source_link.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/strongly_reachable_instances.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/vm_connect_target.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/exceptions.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/allocation_profile.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/breakpoint.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/class.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/code.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/context.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/error.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/event.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/extension_data.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/field.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/flag.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/frame.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/function.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/guarded.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/heap_space.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/icdata.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/inbound_references.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/instance.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/isolate.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/library.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/local_var_descriptors.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/map_association.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/megamorphiccache.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/metric.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/notification.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/object.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/objectpool.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/objectstore.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/pc_descriptors.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/persistent_handles.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/ports.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/retaining_path.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/sample_profile.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/script.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/sentinel.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/source_location.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/target.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/timeline_event.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/type_arguments.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/unknown.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/vm.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/allocation_profile.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/breakpoint.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/class.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/context.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/editor.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/eval.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/event.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/field.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/flag.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/function.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/heap_snapshot.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/icdata.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/inbound_references.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/instance.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/isolate.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/library.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/megamorphiccache.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/metric.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/notification.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/object.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/objectpool.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/objectstore.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/persistent_handles.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/ports.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/reachable_size.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/retained_size.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/retaining_path.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/sample_profile.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/script.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/strongly_reachable_instances.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/target.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/type_arguments.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/allocation_profile.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/breakpoint.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/class.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/context.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/editor.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/eval.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/event.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/field.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/flag.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/function.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/heap_snapshot.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/icdata.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/inbound_references.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/instance.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/isolate.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/library.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/megamorphiccache.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/metric.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/notification.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/object.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/objectpool.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/objectstore.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/persistent_handles.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/ports.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/reachable_size.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/retained_size.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/retaining_path.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/sample_profile.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/script.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/settings.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/strongly_reachable_instances.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/target.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/type_arguments.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/web/timeline_message_handler.js
-FILE: ../../../third_party/dart/runtime/platform/syslog_fuchsia.cc
-FILE: ../../../third_party/dart/runtime/platform/utils_fuchsia.cc
-FILE: ../../../third_party/dart/runtime/platform/utils_fuchsia.h
-FILE: ../../../third_party/dart/runtime/vm/app_snapshot.cc
-FILE: ../../../third_party/dart/runtime/vm/app_snapshot.h
-FILE: ../../../third_party/dart/runtime/vm/canonical_tables.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/branch_optimizer.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/branch_optimizer.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/redundancy_elimination.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/redundancy_elimination.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/kernel_binary_flowgraph.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/kernel_to_il.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/kernel_to_il.h
-FILE: ../../../third_party/dart/runtime/vm/cpuinfo_fuchsia.cc
-FILE: ../../../third_party/dart/runtime/vm/dart_api_state.cc
-FILE: ../../../third_party/dart/runtime/vm/heap/become.cc
-FILE: ../../../third_party/dart/runtime/vm/heap/become.h
-FILE: ../../../third_party/dart/runtime/vm/heap/safepoint.cc
-FILE: ../../../third_party/dart/runtime/vm/heap/safepoint.h
-FILE: ../../../third_party/dart/runtime/vm/isolate_reload.cc
-FILE: ../../../third_party/dart/runtime/vm/isolate_reload.h
-FILE: ../../../third_party/dart/runtime/vm/isolate_reload_test.cc
-FILE: ../../../third_party/dart/runtime/vm/kernel.cc
-FILE: ../../../third_party/dart/runtime/vm/kernel.h
-FILE: ../../../third_party/dart/runtime/vm/kernel_binary.cc
-FILE: ../../../third_party/dart/runtime/vm/kernel_isolate.cc
-FILE: ../../../third_party/dart/runtime/vm/kernel_isolate.h
-FILE: ../../../third_party/dart/runtime/vm/kernel_loader.cc
-FILE: ../../../third_party/dart/runtime/vm/kernel_loader.h
-FILE: ../../../third_party/dart/runtime/vm/lockers.cc
-FILE: ../../../third_party/dart/runtime/vm/native_symbol_fuchsia.cc
-FILE: ../../../third_party/dart/runtime/vm/object_reload.cc
-FILE: ../../../third_party/dart/runtime/vm/object_service.cc
-FILE: ../../../third_party/dart/runtime/vm/os_fuchsia.cc
-FILE: ../../../third_party/dart/runtime/vm/os_thread_fuchsia.cc
-FILE: ../../../third_party/dart/runtime/vm/os_thread_fuchsia.h
-FILE: ../../../third_party/dart/runtime/vm/signal_handler_fuchsia.cc
-FILE: ../../../third_party/dart/runtime/vm/thread_interrupter_fuchsia.cc
-FILE: ../../../third_party/dart/runtime/vm/token_position.cc
-FILE: ../../../third_party/dart/runtime/vm/token_position.h
-FILE: ../../../third_party/dart/runtime/vm/uri.cc
-FILE: ../../../third_party/dart/runtime/vm/uri.h
-FILE: ../../../third_party/dart/runtime/vm/uri_test.cc
-FILE: ../../../third_party/dart/runtime/vm/virtual_memory_fuchsia.cc
-FILE: ../../../third_party/dart/sdk/lib/developer/service.dart
-FILE: ../../../third_party/dart/sdk/lib/js_util/js_util.dart
-FILE: ../../../third_party/dart/sdk/lib/vmservice/devfs.dart
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
-for details. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google LLC nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: expat
-ORIGIN: ../../../third_party/expat/appveyor.yml
-TYPE: LicenseType.mit
-FILE: ../../../third_party/expat/appveyor.yml
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2017      José Gutiérrez de la Concha <jose@zeroc.com>
-Copyright (c) 2017-2022 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2017      Franek Korta <fkorta@gmail.com>
-Licensed under the MIT license:
-
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
-
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
-
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/buf/buf_test.cc
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/boringssl/crypto_test_data.cc
-FILE: ../../../third_party/boringssl/src/crypto/buf/buf_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/cipher_extra/e_aesctrhmac.c
-FILE: ../../../third_party/boringssl/src/crypto/cipher_extra/e_aesgcmsiv.c
-FILE: ../../../third_party/boringssl/src/crypto/compiler_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/err/internal.h
-FILE: ../../../third_party/boringssl/src/crypto/evp/p_ed25519.c
-FILE: ../../../third_party/boringssl/src/crypto/evp/p_ed25519_asn1.c
-FILE: ../../../third_party/boringssl/src/crypto/evp/scrypt_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/aes/internal.h
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bcm.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/bn_test_to_fuzzer.go
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/delocate.h
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/rand/ctrdrbg.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/rand/ctrdrbg_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/self_check/fips.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/self_check/self_check.c
-FILE: ../../../third_party/boringssl/src/crypto/pkcs7/internal.h
-FILE: ../../../third_party/boringssl/src/crypto/pkcs7/pkcs7_x509.c
-FILE: ../../../third_party/boringssl/src/crypto/rand_extra/forkunsafe.c
-FILE: ../../../third_party/boringssl/src/crypto/rand_extra/fuchsia.c
-FILE: ../../../third_party/boringssl/src/crypto/rand_extra/rand_extra.c
-FILE: ../../../third_party/boringssl/src/decrepit/cfb/cfb.c
-FILE: ../../../third_party/boringssl/src/decrepit/cfb/cfb_test.cc
-FILE: ../../../third_party/boringssl/src/include/openssl/is_boringssl.h
-FILE: ../../../third_party/boringssl/src/include/openssl/span.h
-FILE: ../../../third_party/boringssl/src/ssl/span_test.cc
-FILE: ../../../third_party/boringssl/src/ssl/ssl_versions.cc
-FILE: ../../../third_party/boringssl/src/tool/file.cc
-FILE: ../../../third_party/boringssl/src/tool/sign.cc
-FILE: ../../../third_party/boringssl/src/util/ar/ar.go
-FILE: ../../../third_party/boringssl/src/util/check_imported_libraries.go
-FILE: ../../../third_party/boringssl/src/util/convert_comments.go
-FILE: ../../../third_party/boringssl/src/util/embed_test_data.go
-FILE: ../../../third_party/boringssl/src/util/fipstools/break-hash.go
-FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_aes_gcm_test.cc
-FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_aes_test.cc
-FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_ctr_drbg_test.cc
-FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_ecdsa2_keypair_test.cc
-FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_ecdsa2_pkv_test.cc
-FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_ecdsa2_siggen_test.cc
-FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_ecdsa2_sigver_test.cc
-FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_hmac_test.cc
-FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_keywrap_test.cc
-FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_main.cc
-FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_rsa2_keygen_test.cc
-FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_rsa2_siggen_test.cc
-FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_rsa2_sigver_test.cc
-FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_sha_monte_test.cc
-FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_sha_test.cc
-FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_tdes_test.cc
-FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_test_util.cc
-FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_test_util.h
-FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/test_fips.c
-FILE: ../../../third_party/boringssl/src/util/fipstools/delocate/delocate.go
-FILE: ../../../third_party/boringssl/src/util/fipstools/delocate/delocate.peg
-FILE: ../../../third_party/boringssl/src/util/fipstools/delocate/delocate_test.go
-FILE: ../../../third_party/boringssl/src/util/fipstools/fipscommon/const.go
-FILE: ../../../third_party/boringssl/src/util/fipstools/inject_hash/inject_hash.go
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2017, Google Inc.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: dart
-ORIGIN: ../../../third_party/dart/runtime/bin/cli.cc + ../../../third_party/dart/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/dart/runtime/bin/cli.cc
-FILE: ../../../third_party/dart/runtime/bin/dfe.cc
-FILE: ../../../third_party/dart/runtime/bin/dfe.h
-FILE: ../../../third_party/dart/runtime/bin/error_exit.cc
-FILE: ../../../third_party/dart/runtime/bin/error_exit.h
-FILE: ../../../third_party/dart/runtime/bin/gzip.cc
-FILE: ../../../third_party/dart/runtime/bin/gzip.h
-FILE: ../../../third_party/dart/runtime/bin/isolate_data.cc
-FILE: ../../../third_party/dart/runtime/bin/main_options.cc
-FILE: ../../../third_party/dart/runtime/bin/main_options.h
-FILE: ../../../third_party/dart/runtime/bin/namespace.cc
-FILE: ../../../third_party/dart/runtime/bin/namespace.h
-FILE: ../../../third_party/dart/runtime/bin/namespace_android.cc
-FILE: ../../../third_party/dart/runtime/bin/namespace_fuchsia.cc
-FILE: ../../../third_party/dart/runtime/bin/namespace_linux.cc
-FILE: ../../../third_party/dart/runtime/bin/namespace_macos.cc
-FILE: ../../../third_party/dart/runtime/bin/namespace_win.cc
-FILE: ../../../third_party/dart/runtime/bin/options.cc
-FILE: ../../../third_party/dart/runtime/bin/options.h
-FILE: ../../../third_party/dart/runtime/bin/secure_socket_filter.cc
-FILE: ../../../third_party/dart/runtime/bin/secure_socket_filter.h
-FILE: ../../../third_party/dart/runtime/bin/secure_socket_utils.cc
-FILE: ../../../third_party/dart/runtime/bin/secure_socket_utils.h
-FILE: ../../../third_party/dart/runtime/bin/security_context.cc
-FILE: ../../../third_party/dart/runtime/bin/security_context.h
-FILE: ../../../third_party/dart/runtime/bin/security_context_android.cc
-FILE: ../../../third_party/dart/runtime/bin/security_context_fuchsia.cc
-FILE: ../../../third_party/dart/runtime/bin/security_context_linux.cc
-FILE: ../../../third_party/dart/runtime/bin/security_context_macos.cc
-FILE: ../../../third_party/dart/runtime/bin/security_context_win.cc
-FILE: ../../../third_party/dart/runtime/bin/snapshot_utils.cc
-FILE: ../../../third_party/dart/runtime/bin/snapshot_utils.h
-FILE: ../../../third_party/dart/runtime/bin/socket_base.cc
-FILE: ../../../third_party/dart/runtime/bin/socket_base.h
-FILE: ../../../third_party/dart/runtime/bin/sync_socket.cc
-FILE: ../../../third_party/dart/runtime/bin/sync_socket.h
-FILE: ../../../third_party/dart/runtime/bin/sync_socket_android.cc
-FILE: ../../../third_party/dart/runtime/bin/sync_socket_fuchsia.cc
-FILE: ../../../third_party/dart/runtime/bin/sync_socket_linux.cc
-FILE: ../../../third_party/dart/runtime/bin/sync_socket_macos.cc
-FILE: ../../../third_party/dart/runtime/bin/sync_socket_win.cc
-FILE: ../../../third_party/dart/runtime/lib/async.cc
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/containers/search_bar.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/nav/reload.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/singletargetcache_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/singletargetcache_view.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/subtypetestcache_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/subtypetestcache_view.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/unlinkedcall_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/unlinkedcall_view.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/service.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/single_target_cache.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/subtype_test_cache.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/timeline.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/unlinked_call.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/single_target_cache.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/subtype_test_cache.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/timeline.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/unlinked_call.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/vm.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/single_target_cache.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/subtype_test_cache.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/timeline.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/unlinked_call.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/vm.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/containers/search_bar.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/nav/reload.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/singletargetcache_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/singletargetcache_view.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/subtypetestcache_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/subtypetestcache_view.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/timeline/dashboard.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/unlinkedcall_ref.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/unlinkedcall_view.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/service.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/single_target_cache.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/subtype_test_cache.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/timeline.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/unlinked_call.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/single_target_cache.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/subtype_test_cache.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/timeline.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/unlinked_call.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/vm.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/single_target_cache.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/subtype_test_cache.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/timeline.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/unlinked_call.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/vm.dart
-FILE: ../../../third_party/dart/runtime/platform/allocation.h
-FILE: ../../../third_party/dart/runtime/platform/growable_array.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_riscv.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_riscv.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_riscv_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/disassembler_riscv.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/locations_helpers.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/locations_helpers_arm.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/locations_helpers_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/call_specializer.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/call_specializer.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/kernel_binary_flowgraph.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/prologue_builder.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/prologue_builder.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/jit/jit_call_specializer.h
-FILE: ../../../third_party/dart/runtime/vm/constants_riscv.cc
-FILE: ../../../third_party/dart/runtime/vm/constants_riscv.h
-FILE: ../../../third_party/dart/runtime/vm/constants_x86.h
-FILE: ../../../third_party/dart/runtime/vm/debugger_api_impl_test.h
-FILE: ../../../third_party/dart/runtime/vm/dwarf.cc
-FILE: ../../../third_party/dart/runtime/vm/dwarf.h
-FILE: ../../../third_party/dart/runtime/vm/fixed_cache.h
-FILE: ../../../third_party/dart/runtime/vm/fixed_cache_test.cc
-FILE: ../../../third_party/dart/runtime/vm/gdb_helpers.cc
-FILE: ../../../third_party/dart/runtime/vm/heap/compactor.cc
-FILE: ../../../third_party/dart/runtime/vm/heap/compactor.h
-FILE: ../../../third_party/dart/runtime/vm/image_snapshot.cc
-FILE: ../../../third_party/dart/runtime/vm/image_snapshot.h
-FILE: ../../../third_party/dart/runtime/vm/json_writer.cc
-FILE: ../../../third_party/dart/runtime/vm/json_writer.h
-FILE: ../../../third_party/dart/runtime/vm/kernel_binary.h
-FILE: ../../../third_party/dart/runtime/vm/malloc_hooks.h
-FILE: ../../../third_party/dart/runtime/vm/malloc_hooks_arm.cc
-FILE: ../../../third_party/dart/runtime/vm/malloc_hooks_arm64.cc
-FILE: ../../../third_party/dart/runtime/vm/malloc_hooks_ia32.cc
-FILE: ../../../third_party/dart/runtime/vm/malloc_hooks_tcmalloc.cc
-FILE: ../../../third_party/dart/runtime/vm/malloc_hooks_test.cc
-FILE: ../../../third_party/dart/runtime/vm/malloc_hooks_unsupported.cc
-FILE: ../../../third_party/dart/runtime/vm/malloc_hooks_x64.cc
-FILE: ../../../third_party/dart/runtime/vm/mixin_test.cc
-FILE: ../../../third_party/dart/runtime/vm/simulator_riscv.cc
-FILE: ../../../third_party/dart/runtime/vm/simulator_riscv.h
-FILE: ../../../third_party/dart/runtime/vm/stack_trace.cc
-FILE: ../../../third_party/dart/runtime/vm/stack_trace.h
-FILE: ../../../third_party/dart/runtime/vm/timeline_android.cc
-FILE: ../../../third_party/dart/runtime/vm/timeline_fuchsia.cc
-FILE: ../../../third_party/dart/runtime/vm/timeline_linux.cc
-FILE: ../../../third_party/dart/runtime/vm/zone_text_buffer.cc
-FILE: ../../../third_party/dart/runtime/vm/zone_text_buffer.h
-FILE: ../../../third_party/dart/sdk/lib/_http/overrides.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/custom_hash_map.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/identity_hash_map.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/linked_hash_map.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/profile.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/cli_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/namespace_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/bin/sync_socket_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/class_id_fasta.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm_shared/lib/bigint_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/cli/cli.dart
-FILE: ../../../third_party/dart/sdk/lib/cli/wait_for.dart
-FILE: ../../../third_party/dart/sdk/lib/core/bigint.dart
-FILE: ../../../third_party/dart/sdk/lib/internal/linked_list.dart
-FILE: ../../../third_party/dart/sdk/lib/internal/patch.dart
-FILE: ../../../third_party/dart/sdk/lib/io/embedder_config.dart
-FILE: ../../../third_party/dart/sdk/lib/io/namespace_impl.dart
-FILE: ../../../third_party/dart/sdk/lib/io/overrides.dart
-FILE: ../../../third_party/dart/sdk/lib/io/sync_socket.dart
-FILE: ../../../third_party/dart/sdk/lib/vmservice/named_lookup.dart
-FILE: ../../../third_party/dart/utils/bazel/kernel_worker.dart
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
-for details. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google LLC nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/hrss/asm/poly_rq_mul.S
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/boringssl/src/crypto/hrss/asm/poly_rq_mul.S
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2017, the HRSS authors.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: ffx_spd
-ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/ffx_spd/ffx_a.h
-TYPE: LicenseType.mit
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/ffx_spd/ffx_a.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2017-2019 Advanced Micro Devices, Inc. All rights reserved.
-Copyright (c) <2014> <Michal Drobot>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy,
-modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: ffx_spd
-ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/ffx_spd/ffx_spd.h
-TYPE: LicenseType.mit
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/ffx_spd/ffx_spd.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2017-2020 Advanced Micro Devices, Inc. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy,
-modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: vulkan_memory_allocator
-ORIGIN: ../../../third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
-TYPE: LicenseType.mit
-FILE: ../../../third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2017-2022 Advanced Micro Devices, Inc. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/bytestring/unicode.c
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/boringssl/src/crypto/abi_self_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/bytestring/unicode.c
-FILE: ../../../third_party/boringssl/src/crypto/chacha/internal.h
-FILE: ../../../third_party/boringssl/src/crypto/cpu-aarch64-fuchsia.c
-FILE: ../../../third_party/boringssl/src/crypto/cpu-arm-linux.h
-FILE: ../../../third_party/boringssl/src/crypto/cpu-arm-linux_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/div_extra.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/gcd_extra.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/felem.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/make_ec_scalar_base_mult_tests.go
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/make_p256-x86_64-tests.go
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/scalar.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/simple_mul.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/md5/internal.h
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/md5/md5_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/sha/internal.h
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/sha/sha_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/tls/internal.h
-FILE: ../../../third_party/boringssl/src/crypto/hrss/hrss.c
-FILE: ../../../third_party/boringssl/src/crypto/hrss/hrss_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/hrss/internal.h
-FILE: ../../../third_party/boringssl/src/crypto/impl_dispatch_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/pem/pem_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/rand_extra/rand_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/self_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/stack/stack_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/internal.h
-FILE: ../../../third_party/boringssl/src/include/openssl/e_os2.h
-FILE: ../../../third_party/boringssl/src/include/openssl/hrss.h
-FILE: ../../../third_party/boringssl/src/ssl/handoff.cc
-FILE: ../../../third_party/boringssl/src/util/ar/ar_test.go
-FILE: ../../../third_party/boringssl/src/util/check_filenames.go
-FILE: ../../../third_party/boringssl/src/util/convert_wycheproof.go
-FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_kas_test.cc
-FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/cavp_tlskdf_test.cc
-FILE: ../../../third_party/boringssl/src/util/godeps.go
-FILE: ../../../third_party/boringssl/src/util/make_prefix_headers.go
-FILE: ../../../third_party/boringssl/src/util/read_symbols.go
-FILE: ../../../third_party/boringssl/src/util/testresult/testresult.go
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2018, Google Inc.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/cpu-aarch64-win.c
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/boringssl/src/crypto/cpu-aarch64-win.c
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2018, Google Inc.
-Copyright (c) 2020, Arm Ltd.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: dart
-ORIGIN: ../../../third_party/dart/runtime/bin/crashpad.h + ../../../third_party/dart/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/dart/runtime/bin/crashpad.h
-FILE: ../../../third_party/dart/runtime/bin/dart_embedder_api_impl.cc
-FILE: ../../../third_party/dart/runtime/bin/typed_data_utils.cc
-FILE: ../../../third_party/dart/runtime/bin/typed_data_utils.h
-FILE: ../../../third_party/dart/runtime/include/dart_embedder_api.h
-FILE: ../../../third_party/dart/runtime/tools/dartfuzz/dartfuzz.dart
-FILE: ../../../third_party/dart/runtime/tools/dartfuzz/dartfuzz_test.dart
-FILE: ../../../third_party/dart/runtime/vm/base64.cc
-FILE: ../../../third_party/dart/runtime/vm/base64.h
-FILE: ../../../third_party/dart/runtime/vm/base64_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/code_statistics.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/code_statistics.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/compile_type.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/loops.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/loops.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/loops_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/redundancy_elimination_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/slot.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/slot.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/compiler_pass.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/compiler_pass.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/compiler_state.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/compiler_state.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/base_flow_graph_builder.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/base_flow_graph_builder.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/constant_reader.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/constant_reader.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/kernel_fingerprints.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/kernel_fingerprints.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/kernel_translation_helper.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/kernel_translation_helper.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/scope_builder.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/scope_builder.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/relocation.h
-FILE: ../../../third_party/dart/runtime/vm/constants.h
-FILE: ../../../third_party/dart/runtime/vm/datastream.cc
-FILE: ../../../third_party/dart/runtime/vm/finalizable_data.h
-FILE: ../../../third_party/dart/runtime/vm/hash.h
-FILE: ../../../third_party/dart/runtime/vm/raw_object_fields.cc
-FILE: ../../../third_party/dart/runtime/vm/raw_object_fields.h
-FILE: ../../../third_party/dart/runtime/vm/reverse_pc_lookup_cache.cc
-FILE: ../../../third_party/dart/runtime/vm/reverse_pc_lookup_cache.h
-FILE: ../../../third_party/dart/runtime/vm/type_testing_stubs.cc
-FILE: ../../../third_party/dart/runtime/vm/type_testing_stubs.h
-FILE: ../../../third_party/dart/runtime/vm/v8_snapshot_writer.cc
-FILE: ../../../third_party/dart/runtime/vm/v8_snapshot_writer.h
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/instantiation.dart
-FILE: ../../../third_party/dart/sdk/lib/js/_js.dart
-FILE: ../../../third_party/dart/sdk/lib/js/_js_client.dart
-FILE: ../../../third_party/dart/sdk/lib/js/_js_server.dart
-FILE: ../../../third_party/dart/sdk/lib/typed_data/unmodifiable_typed_data.dart
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
-for details. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google LLC nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: dart
-ORIGIN: ../../../third_party/dart/runtime/bin/console.h + ../../../third_party/dart/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/dart/runtime/bin/console.h
-FILE: ../../../third_party/dart/runtime/bin/console_posix.cc
-FILE: ../../../third_party/dart/runtime/bin/console_win.cc
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2018, the Dart project authors. Please see the AUTHORS file
-for details. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google LLC nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: expat
-ORIGIN: ../../../third_party/expat/expat/cmake/expat-config.cmake.in
-TYPE: LicenseType.mit
-FILE: ../../../third_party/expat/expat/cmake/expat-config.cmake.in
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2019 Expat development team
-Licensed under the MIT license:
-
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
-
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
-
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/ec_extra/ec_derive.c
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/boringssl/src/crypto/ec_extra/ec_derive.c
-FILE: ../../../third_party/boringssl/src/crypto/evp/p_x25519.c
-FILE: ../../../third_party/boringssl/src/crypto/evp/p_x25519_asn1.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/aes/aes_nohw.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/fips_shared_support.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/modes/gcm_nohw.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/rand/urandom_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/siphash/siphash.c
-FILE: ../../../third_party/boringssl/src/crypto/siphash/siphash_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/trust_token/internal.h
-FILE: ../../../third_party/boringssl/src/crypto/trust_token/trust_token.c
-FILE: ../../../third_party/boringssl/src/decrepit/blowfish/blowfish_test.cc
-FILE: ../../../third_party/boringssl/src/decrepit/cast/cast_test.cc
-FILE: ../../../third_party/boringssl/src/include/openssl/siphash.h
-FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/acvptool/acvp.go
-FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/acvptool/acvp/acvp.go
-FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/acvptool/interactive.go
-FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/acvptool/parser.peg
-FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/acvptool/subprocess/block.go
-FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/acvptool/subprocess/drbg.go
-FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/acvptool/subprocess/ecdsa.go
-FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/acvptool/subprocess/hash.go
-FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/acvptool/subprocess/hmac.go
-FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/acvptool/subprocess/subprocess.go
-FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/modulewrapper/modulewrapper.cc
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2019, Google Inc.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: dart
-ORIGIN: ../../../third_party/dart/runtime/bin/ffi_test/ffi_test_dynamic_library.cc + ../../../third_party/dart/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/dart/runtime/bin/elf_loader.cc
-FILE: ../../../third_party/dart/runtime/bin/elf_loader.h
-FILE: ../../../third_party/dart/runtime/bin/entrypoints_verification_test.cc
-FILE: ../../../third_party/dart/runtime/bin/ffi_test/ffi_test_dynamic_library.cc
-FILE: ../../../third_party/dart/runtime/bin/ffi_test/ffi_test_functions.cc
-FILE: ../../../third_party/dart/runtime/bin/ffi_test/ffi_test_functions_vmspecific.cc
-FILE: ../../../third_party/dart/runtime/bin/ifaddrs-android.cc
-FILE: ../../../third_party/dart/runtime/bin/ifaddrs-android.h
-FILE: ../../../third_party/dart/runtime/bin/namespace_fuchsia.h
-FILE: ../../../third_party/dart/runtime/bin/socket_base_android.cc
-FILE: ../../../third_party/dart/runtime/lib/ffi.cc
-FILE: ../../../third_party/dart/runtime/lib/ffi_dynamic_library.cc
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/tree_map.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/isolate_group.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/repositories/isolate_group.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/isolate_group.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/repositories/timeline_base.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/tree_map.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/objects/isolate_group.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/models/repositories/isolate_group.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/isolate_group.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/repositories/timeline_base.dart
-FILE: ../../../third_party/dart/runtime/platform/elf.h
-FILE: ../../../third_party/dart/runtime/platform/thread_sanitizer.h
-FILE: ../../../third_party/dart/runtime/tools/dartfuzz/dartfuzz_api_table.dart
-FILE: ../../../third_party/dart/runtime/tools/dartfuzz/dartfuzz_ffi_api.dart
-FILE: ../../../third_party/dart/runtime/tools/dartfuzz/dartfuzz_type_table.dart
-FILE: ../../../third_party/dart/runtime/tools/dartfuzz/gen_api_table.dart
-FILE: ../../../third_party/dart/runtime/tools/dartfuzz/gen_type_table.dart
-FILE: ../../../third_party/dart/runtime/tools/dartfuzz/gen_util.dart
-FILE: ../../../third_party/dart/runtime/tools/ffi/sdk_lib_ffi_generator.dart
-FILE: ../../../third_party/dart/runtime/tools/graphexplorer/graphexplorer.html
-FILE: ../../../third_party/dart/runtime/tools/graphexplorer/graphexplorer.js
-FILE: ../../../third_party/dart/runtime/tools/run_clang_tidy.dart
-FILE: ../../../third_party/dart/runtime/vm/bss_relocs.cc
-FILE: ../../../third_party/dart/runtime/vm/bss_relocs.h
-FILE: ../../../third_party/dart/runtime/vm/catch_entry_moves_test.cc
-FILE: ../../../third_party/dart/runtime/vm/class_id.h
-FILE: ../../../third_party/dart/runtime/vm/code_comments.cc
-FILE: ../../../third_party/dart/runtime/vm/code_comments.h
-FILE: ../../../third_party/dart/runtime/vm/code_entry_kind.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/asm_intrinsifier.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/asm_intrinsifier.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/asm_intrinsifier_arm.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/asm_intrinsifier_arm64.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/asm_intrinsifier_ia32.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/asm_intrinsifier_x64.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/bce_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/block_builder.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/evaluator.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/evaluator.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/flow_graph_checker.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/flow_graph_checker.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/il_test_helper.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/il_test_helper.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/inliner_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/slot_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/type_propagator_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/typed_data_aot_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/yield_position_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/graph_intrinsifier.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/graph_intrinsifier.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/offsets_extractor.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/recognized_methods_list.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/relocation.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/runtime_api.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/runtime_api.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/runtime_offsets_extracted.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/runtime_offsets_list.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/stub_code_compiler.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/stub_code_compiler_arm.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/stub_code_compiler_arm64.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/stub_code_compiler_ia32.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/stub_code_compiler_x64.cc
-FILE: ../../../third_party/dart/runtime/vm/constants_arm.cc
-FILE: ../../../third_party/dart/runtime/vm/constants_arm64.cc
-FILE: ../../../third_party/dart/runtime/vm/constants_ia32.cc
-FILE: ../../../third_party/dart/runtime/vm/constants_x64.cc
-FILE: ../../../third_party/dart/runtime/vm/elf.cc
-FILE: ../../../third_party/dart/runtime/vm/elf.h
-FILE: ../../../third_party/dart/runtime/vm/ffi_callback_trampolines.cc
-FILE: ../../../third_party/dart/runtime/vm/ffi_callback_trampolines.h
-FILE: ../../../third_party/dart/runtime/vm/frame_layout.h
-FILE: ../../../third_party/dart/runtime/vm/intrusive_dlist.h
-FILE: ../../../third_party/dart/runtime/vm/intrusive_dlist_test.cc
-FILE: ../../../third_party/dart/runtime/vm/libfuzzer/dart_libfuzzer.cc
-FILE: ../../../third_party/dart/runtime/vm/longjump.h
-FILE: ../../../third_party/dart/runtime/vm/pointer_tagging.h
-FILE: ../../../third_party/dart/runtime/vm/splay-tree.h
-FILE: ../../../third_party/dart/runtime/vm/static_type_exactness_state.h
-FILE: ../../../third_party/dart/runtime/vm/stub_code_list.h
-FILE: ../../../third_party/dart/runtime/vm/thread_stack_resource.cc
-FILE: ../../../third_party/dart/runtime/vm/thread_stack_resource.h
-FILE: ../../../third_party/dart/runtime/vm/thread_state.cc
-FILE: ../../../third_party/dart/runtime/vm/thread_state.h
-FILE: ../../../third_party/dart/samples/ffi/coordinate.dart
-FILE: ../../../third_party/dart/samples/ffi/dylib_utils.dart
-FILE: ../../../third_party/dart/samples/ffi/resource_management/arena_isolate_shutdown_sample.dart
-FILE: ../../../third_party/dart/samples/ffi/resource_management/arena_sample.dart
-FILE: ../../../third_party/dart/samples/ffi/resource_management/arena_zoned_sample.dart
-FILE: ../../../third_party/dart/samples/ffi/resource_management/resource_management_test.dart
-FILE: ../../../third_party/dart/samples/ffi/resource_management/unmanaged_sample.dart
-FILE: ../../../third_party/dart/samples/ffi/sample_ffi_bitfield.dart
-FILE: ../../../third_party/dart/samples/ffi/sample_ffi_data.dart
-FILE: ../../../third_party/dart/samples/ffi/sample_ffi_dynamic_library.dart
-FILE: ../../../third_party/dart/samples/ffi/sample_ffi_functions.dart
-FILE: ../../../third_party/dart/samples/ffi/sample_ffi_functions_callbacks.dart
-FILE: ../../../third_party/dart/samples/ffi/sample_ffi_functions_structs.dart
-FILE: ../../../third_party/dart/samples/ffi/sample_ffi_structs.dart
-FILE: ../../../third_party/dart/samples/ffi/samples_test.dart
-FILE: ../../../third_party/dart/samples/ffi/sqlite/example/main.dart
-FILE: ../../../third_party/dart/samples/ffi/sqlite/lib/sqlite.dart
-FILE: ../../../third_party/dart/samples/ffi/sqlite/lib/src/bindings/bindings.dart
-FILE: ../../../third_party/dart/samples/ffi/sqlite/lib/src/bindings/constants.dart
-FILE: ../../../third_party/dart/samples/ffi/sqlite/lib/src/bindings/signatures.dart
-FILE: ../../../third_party/dart/samples/ffi/sqlite/lib/src/bindings/types.dart
-FILE: ../../../third_party/dart/samples/ffi/sqlite/lib/src/collections/closable_iterator.dart
-FILE: ../../../third_party/dart/samples/ffi/sqlite/lib/src/database.dart
-FILE: ../../../third_party/dart/samples/ffi/sqlite/lib/src/ffi/dylib_utils.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_shared/lib/rti.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_shared/lib/synced/recipe_syntax.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_dynamic_library_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_native_type_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/ffi/annotations.dart
-FILE: ../../../third_party/dart/sdk/lib/ffi/dynamic_library.dart
-FILE: ../../../third_party/dart/sdk/lib/ffi/ffi.dart
-FILE: ../../../third_party/dart/sdk/lib/ffi/native_type.dart
-FILE: ../../../third_party/dart/sdk/lib/ffi/struct.dart
-FILE: ../../../third_party/dart/sdk/lib/internal/errors.dart
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
-for details. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google LLC nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: dart
-ORIGIN: ../../../third_party/dart/sdk/lib/io/network_profiling.dart + ../../../third_party/dart/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/dart/sdk/lib/io/network_profiling.dart
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2019, the Dart project authors. Please see the AUTHORS file
-for details. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google LLC nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/util/compare_benchmarks.go
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/boringssl/src/util/compare_benchmarks.go
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2020 Google Inc.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: angle
-ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/metal/QueryMtl.h + ../../../third_party/angle/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/QueryMtl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/QueryMtl.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/SyncMtl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/SyncMtl.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_occlusion_query_pool.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_occlusion_query_pool.mm
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2020 The ANGLE Project Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-    Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.
-
-    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
-    Ltd., nor the names of their contributors may be used to endorse
-    or promote products derived from this software without specific
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/curve25519/curve25519.c
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/boringssl/src/crypto/crypto_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/curve25519/curve25519.c
-FILE: ../../../third_party/boringssl/src/crypto/curve25519/curve25519_tables.h
-FILE: ../../../third_party/boringssl/src/crypto/curve25519/internal.h
-FILE: ../../../third_party/boringssl/src/crypto/dsa/internal.h
-FILE: ../../../third_party/boringssl/src/crypto/ec_extra/hash_to_curve.c
-FILE: ../../../third_party/boringssl/src/crypto/ec_extra/internal.h
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/make_tables.go
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/p256.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/p256_table.h
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/rand/fork_detect.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/rand/fork_detect.h
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/rand/fork_detect_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/rand/getrandom_fillin.h
-FILE: ../../../third_party/boringssl/src/crypto/hpke/hpke.c
-FILE: ../../../third_party/boringssl/src/crypto/hpke/hpke_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/rand_extra/passive.c
-FILE: ../../../third_party/boringssl/src/crypto/trust_token/pmbtoken.c
-FILE: ../../../third_party/boringssl/src/crypto/trust_token/trust_token_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/trust_token/voprf.c
-FILE: ../../../third_party/boringssl/src/decrepit/xts/xts_test.cc
-FILE: ../../../third_party/boringssl/src/include/openssl/hpke.h
-FILE: ../../../third_party/boringssl/src/include/openssl/trust_token.h
-FILE: ../../../third_party/boringssl/src/tool/fd.cc
-FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/acvptool/nointeractive.go
-FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/acvptool/subprocess/aead.go
-FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/acvptool/subprocess/kas.go
-FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/acvptool/subprocess/kasdh.go
-FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/acvptool/subprocess/kdf.go
-FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/acvptool/subprocess/keyedMac.go
-FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/acvptool/subprocess/rsa.go
-FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/acvptool/subprocess/tlskdf.go
-FILE: ../../../third_party/boringssl/src/util/testconfig/testconfig.go
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2020, Google Inc.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: dart
-ORIGIN: ../../../third_party/dart/runtime/bin/ffi_test/ffi_test_functions_generated.cc + ../../../third_party/dart/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/dart/runtime/bin/dartdev_isolate.cc
-FILE: ../../../third_party/dart/runtime/bin/dartdev_isolate.h
-FILE: ../../../third_party/dart/runtime/bin/exe_utils.cc
-FILE: ../../../third_party/dart/runtime/bin/exe_utils.h
-FILE: ../../../third_party/dart/runtime/bin/ffi_test/ffi_test_functions_generated.cc
-FILE: ../../../third_party/dart/runtime/bin/ffi_unit_test/run_ffi_unit_tests.cc
-FILE: ../../../third_party/dart/runtime/bin/file_win.h
-FILE: ../../../third_party/dart/runtime/bin/platform_macos.h
-FILE: ../../../third_party/dart/runtime/bin/priority_heap_test.cc
-FILE: ../../../third_party/dart/runtime/include/dart_api_dl.c
-FILE: ../../../third_party/dart/runtime/include/dart_api_dl.h
-FILE: ../../../third_party/dart/runtime/include/dart_version.h
-FILE: ../../../third_party/dart/runtime/include/internal/dart_api_dl_impl.h
-FILE: ../../../third_party/dart/runtime/observatory/bin/heap_snapshot.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/process_snapshot.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/bin/heap_snapshot.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/process_snapshot.dart
-FILE: ../../../third_party/dart/runtime/platform/allocation.cc
-FILE: ../../../third_party/dart/runtime/platform/leak_sanitizer.h
-FILE: ../../../third_party/dart/runtime/platform/priority_queue.h
-FILE: ../../../third_party/dart/runtime/platform/unaligned.h
-FILE: ../../../third_party/dart/runtime/platform/undefined_behavior_sanitizer.h
-FILE: ../../../third_party/dart/runtime/tools/wiki/xref_extractor/bin/main.dart
-FILE: ../../../third_party/dart/runtime/tools/wiki/xref_extractor/lib/cquery_driver.dart
-FILE: ../../../third_party/dart/runtime/tools/wiki/xref_extractor/lib/xref_extractor.dart
-FILE: ../../../third_party/dart/runtime/vm/canonical_tables.cc
-FILE: ../../../third_party/dart/runtime/vm/closure_functions_cache.cc
-FILE: ../../../third_party/dart/runtime/vm/closure_functions_cache.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/aot/dispatch_table_generator.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/aot/dispatch_table_generator.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/aot/precompiler_tracer.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/aot/precompiler_tracer.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/api/deopt_id.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/api/print_filter.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/api/print_filter.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/api/type_check_mode.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/assembler_base.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/constant_propagator_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/reachability_fence_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/abi.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/abi.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/call.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/call.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/callback.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/callback.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/frame_rebase.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/frame_rebase.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/marshaller.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/marshaller.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/native_calling_convention.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/native_calling_convention.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/native_calling_convention_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/native_location.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/native_location.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/native_location_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/native_type.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/native_type.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/native_type_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/native_type_vm_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/recognized_method.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/recognized_method.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_test.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_test_custom_zone.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_test_custom_zone.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/kernel_binary_flowgraph_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/stub_code_compiler.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/write_barrier_elimination.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/write_barrier_elimination.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/write_barrier_elimination_test.cc
-FILE: ../../../third_party/dart/runtime/vm/constants_base.h
-FILE: ../../../third_party/dart/runtime/vm/datastream_test.cc
-FILE: ../../../third_party/dart/runtime/vm/dispatch_table.cc
-FILE: ../../../third_party/dart/runtime/vm/dispatch_table.h
-FILE: ../../../third_party/dart/runtime/vm/experimental_features.cc
-FILE: ../../../third_party/dart/runtime/vm/experimental_features.h
-FILE: ../../../third_party/dart/runtime/vm/field_table.cc
-FILE: ../../../third_party/dart/runtime/vm/field_table.h
-FILE: ../../../third_party/dart/runtime/vm/heap/become_test.cc
-FILE: ../../../third_party/dart/runtime/vm/heap/weak_table_test.cc
-FILE: ../../../third_party/dart/runtime/vm/port_set.h
-FILE: ../../../third_party/dart/runtime/vm/stub_code_test.cc
-FILE: ../../../third_party/dart/runtime/vm/tagged_pointer.h
-FILE: ../../../third_party/dart/runtime/vm/timeline_macos.cc
-FILE: ../../../third_party/dart/runtime/vm/type_testing_stubs_test.cc
-FILE: ../../../third_party/dart/runtime/vm/visitor.cc
-FILE: ../../../third_party/dart/samples/ffi/async/async_test.dart
-FILE: ../../../third_party/dart/samples/ffi/async/sample_async_callback.dart
-FILE: ../../../third_party/dart/samples/ffi/async/sample_native_port_call.dart
-FILE: ../../../third_party/dart/samples/ffi/sample_ffi_functions_callbacks_closures.dart
-FILE: ../../../third_party/dart/sdk/lib/_http/embedder_config.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/js_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/js_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_struct_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/internal/lowering.dart
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
-for details. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google LLC nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/blake2/blake2.c
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/boringssl/src/crypto/blake2/blake2.c
-FILE: ../../../third_party/boringssl/src/crypto/blake2/blake2_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/conf/conf_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ecdsa/internal.h
-FILE: ../../../third_party/boringssl/src/decrepit/evp/evp_test.cc
-FILE: ../../../third_party/boringssl/src/include/openssl/blake2.h
-FILE: ../../../third_party/boringssl/src/ssl/encrypted_client_hello.cc
-FILE: ../../../third_party/boringssl/src/tool/generate_ech.cc
-FILE: ../../../third_party/boringssl/src/util/fetch_ech_config_list.go
-FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/acvptool/subprocess/hkdf.go
-FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/acvptool/subprocess/xts.go
-FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/acvptool/testmodulewrapper/cts_test.go
-FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/acvptool/testmodulewrapper/hmac_drbg.go
-FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/acvptool/testmodulewrapper/hmac_drbg_test.go
-FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/acvptool/testmodulewrapper/testmodulewrapper.go
-FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc
-FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/modulewrapper/modulewrapper.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2021, Google Inc.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: dart
-ORIGIN: ../../../third_party/dart/runtime/bin/abstract_socket_test.cc + ../../../third_party/dart/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/dart/runtime/bin/abstract_socket_test.cc
-FILE: ../../../third_party/dart/runtime/bin/analyze_snapshot.cc
-FILE: ../../../third_party/dart/runtime/bin/platform_macos_cocoa.h
-FILE: ../../../third_party/dart/runtime/bin/platform_macos_cocoa.mm
-FILE: ../../../third_party/dart/runtime/bin/secure_socket_utils_test.cc
-FILE: ../../../third_party/dart/runtime/bin/socket_base_posix.cc
-FILE: ../../../third_party/dart/runtime/bin/utils.cc
-FILE: ../../../third_party/dart/runtime/bin/virtual_memory.h
-FILE: ../../../third_party/dart/runtime/bin/virtual_memory_fuchsia.cc
-FILE: ../../../third_party/dart/runtime/bin/virtual_memory_posix.cc
-FILE: ../../../third_party/dart/runtime/bin/virtual_memory_win.cc
-FILE: ../../../third_party/dart/runtime/include/analyze_snapshot_api.h
-FILE: ../../../third_party/dart/runtime/vm/analyze_snapshot_api_impl.cc
-FILE: ../../../third_party/dart/runtime/vm/code_patcher_riscv.cc
-FILE: ../../../third_party/dart/runtime/vm/code_patcher_riscv_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/asm_intrinsifier_riscv.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/asm_intrinsifier_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/flow_graph_compiler_riscv.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/il_riscv.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/compiler_timings.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/compiler_timings.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/range.h
-FILE: ../../../third_party/dart/runtime/vm/compiler/relocation_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/stub_code_compiler_riscv.cc
-FILE: ../../../third_party/dart/runtime/vm/cpu_riscv.cc
-FILE: ../../../third_party/dart/runtime/vm/cpu_riscv.h
-FILE: ../../../third_party/dart/runtime/vm/debugger_riscv.cc
-FILE: ../../../third_party/dart/runtime/vm/heap/safepoint_test.cc
-FILE: ../../../third_party/dart/runtime/vm/instructions_riscv.cc
-FILE: ../../../third_party/dart/runtime/vm/instructions_riscv.h
-FILE: ../../../third_party/dart/runtime/vm/instructions_riscv_test.cc
-FILE: ../../../third_party/dart/runtime/vm/message_snapshot.cc
-FILE: ../../../third_party/dart/runtime/vm/message_snapshot.h
-FILE: ../../../third_party/dart/runtime/vm/object_graph_copy.cc
-FILE: ../../../third_party/dart/runtime/vm/object_graph_copy.h
-FILE: ../../../third_party/dart/runtime/vm/object_riscv_test.cc
-FILE: ../../../third_party/dart/runtime/vm/pending_deopts.cc
-FILE: ../../../third_party/dart/runtime/vm/pending_deopts.h
-FILE: ../../../third_party/dart/runtime/vm/runtime_entry_riscv.cc
-FILE: ../../../third_party/dart/runtime/vm/stack_frame_riscv.h
-FILE: ../../../third_party/dart/runtime/vm/stub_code_riscv_test.cc
-FILE: ../../../third_party/dart/runtime/vm/thread_interrupter_android_arm.S
-FILE: ../../../third_party/dart/runtime/vm/virtual_memory_compressed.cc
-FILE: ../../../third_party/dart/runtime/vm/virtual_memory_compressed.h
-FILE: ../../../third_party/dart/samples/ffi/resource_management/utf8_helpers.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/dart2js_runtime_metrics.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/late_helper.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_allocation_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/core/enum.dart
-FILE: ../../../third_party/dart/sdk/lib/ffi/abi.dart
-FILE: ../../../third_party/dart/sdk/lib/ffi/abi_specific.dart
-FILE: ../../../third_party/dart/sdk/lib/ffi/allocation.dart
-FILE: ../../../third_party/dart/sdk/lib/ffi/union.dart
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2021, the Dart project authors.  Please see the AUTHORS file
-for details. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google LLC nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/google/redact.h + ../../../LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/zlib/google/redact.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2022 The Chromium Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: dart
-ORIGIN: ../../../third_party/dart/runtime/bin/snapshot_utils_test.cc + ../../../third_party/dart/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/dart/runtime/bin/snapshot_utils_test.cc
-FILE: ../../../third_party/dart/runtime/bin/test_utils.cc
-FILE: ../../../third_party/dart/runtime/bin/test_utils.h
-FILE: ../../../third_party/dart/runtime/bin/thread_absl.cc
-FILE: ../../../third_party/dart/runtime/bin/thread_absl.h
-FILE: ../../../third_party/dart/runtime/lib/integers.h
-FILE: ../../../third_party/dart/runtime/platform/mach_o.h
-FILE: ../../../third_party/dart/runtime/platform/pe.h
-FILE: ../../../third_party/dart/runtime/tools/heapsnapshot/bin/explore.dart
-FILE: ../../../third_party/dart/runtime/tools/heapsnapshot/lib/heapsnapshot.dart
-FILE: ../../../third_party/dart/runtime/tools/heapsnapshot/lib/src/analysis.dart
-FILE: ../../../third_party/dart/runtime/tools/heapsnapshot/lib/src/cli.dart
-FILE: ../../../third_party/dart/runtime/tools/heapsnapshot/lib/src/completion.dart
-FILE: ../../../third_party/dart/runtime/tools/heapsnapshot/lib/src/console.dart
-FILE: ../../../third_party/dart/runtime/tools/heapsnapshot/lib/src/expression.dart
-FILE: ../../../third_party/dart/runtime/tools/heapsnapshot/lib/src/format.dart
-FILE: ../../../third_party/dart/runtime/tools/heapsnapshot/lib/src/intset.dart
-FILE: ../../../third_party/dart/runtime/tools/heapsnapshot/lib/src/load.dart
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/il_serializer.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler/backend/il_serializer.h
-FILE: ../../../third_party/dart/runtime/vm/heap/gc_shared.cc
-FILE: ../../../third_party/dart/runtime/vm/heap/gc_shared.h
-FILE: ../../../third_party/dart/runtime/vm/heap/page.cc
-FILE: ../../../third_party/dart/runtime/vm/heap/page.h
-FILE: ../../../third_party/dart/runtime/vm/heap/sampler.cc
-FILE: ../../../third_party/dart/runtime/vm/heap/sampler.h
-FILE: ../../../third_party/dart/runtime/vm/instructions.cc
-FILE: ../../../third_party/dart/runtime/vm/kernel_test.cc
-FILE: ../../../third_party/dart/runtime/vm/malloc_hooks_riscv.cc
-FILE: ../../../third_party/dart/runtime/vm/os_thread_absl.cc
-FILE: ../../../third_party/dart/runtime/vm/os_thread_absl.h
-FILE: ../../../third_party/dart/runtime/vm/simulator_x64.cc
-FILE: ../../../third_party/dart/runtime/vm/simulator_x64.h
-FILE: ../../../third_party/dart/sdk/lib/_http/http_testing.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_names.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/runtime_metrics.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/synced/load_library_priority.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_shared/lib/js_util_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/js_shared/lib/synced/embedded_names.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_native_finalizer_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/finalizer_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/hash_factories.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/vm/lib/record_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/async_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/bool.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/class_id.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/convert_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/core_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/date_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/developer.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/double.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/errors_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/expando_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/function.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/growable_list.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/hash_factories.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/identical_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/int.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/internal_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/isolate_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/js_helper.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/js_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/js_util_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/list.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/math_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/object_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/print_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/regexp_helper.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/regexp_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/simd_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/stack_trace_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/stopwatch_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/string_buffer_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/string_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/symbol_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/timer_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/type.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/typed_data_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/uri_patch.dart
-FILE: ../../../third_party/dart/sdk/lib/core/record.dart
-FILE: ../../../third_party/dart/sdk/lib/ffi/c_type.dart
-FILE: ../../../third_party/dart/sdk/lib/ffi/native_finalizer.dart
-FILE: ../../../third_party/dart/sdk/lib/js/js_wasm.dart
-FILE: ../../../third_party/dart/sdk/lib/js_util/js_util_wasm.dart
-FILE: ../../../third_party/dart/sdk/lib/wasm/wasm_types.dart
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
-for details. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google LLC nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: icu
-ORIGIN: ../../../third_party/icu/source/i18n/decNumber.h + ../../../third_party/dart/runtime/third_party/double-conversion/COPYING
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/icu/source/i18n/decNumber.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) IBM Corporation, 2000-2010.   All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google Inc. nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: icu
-ORIGIN: ../../../third_party/icu/source/i18n/decContext.h + ../../../third_party/dart/runtime/third_party/double-conversion/COPYING
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/icu/source/i18n/decContext.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) IBM Corporation, 2000-2011.   All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google Inc. nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: icu
-ORIGIN: ../../../third_party/icu/source/i18n/decContext.cpp + ../../../third_party/dart/runtime/third_party/double-conversion/COPYING
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/icu/source/i18n/decContext.cpp
-----------------------------------------------------------------------------------------------------
-Copyright (c) IBM Corporation, 2000-2012.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google Inc. nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: icu
-ORIGIN: ../../../third_party/icu/source/i18n/decNumber.cpp + ../../../third_party/dart/runtime/third_party/double-conversion/COPYING
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/icu/source/i18n/decNumber.cpp
-----------------------------------------------------------------------------------------------------
-Copyright (c) IBM Corporation, 2000-2014.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google Inc. nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: icu
-ORIGIN: ../../../third_party/icu/source/i18n/decNumberLocal.h + ../../../third_party/dart/runtime/third_party/double-conversion/COPYING
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/icu/source/i18n/decNumberLocal.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) IBM Corporation, 2000-2016.   All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google Inc. nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: freetype2
-ORIGIN: ../../../third_party/freetype2/src/pcf/pcfutil.c
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/freetype2/src/pcf/pcfutil.c
-----------------------------------------------------------------------------------------------------
-Copyright 1990, 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: icu
-ORIGIN: ../../../third_party/icu/LICENSE
-TYPE: LicenseType.mit
-FILE: ../../../third_party/icu/DIR_METADATA
-FILE: ../../../third_party/icu/android/icudtl.dat
-FILE: ../../../third_party/icu/cast/brkitr.patch
-FILE: ../../../third_party/icu/cast/icudtl.dat
-FILE: ../../../third_party/icu/chromeos/icudtl.dat
-FILE: ../../../third_party/icu/chromeos/icudtl.dat.hash
-FILE: ../../../third_party/icu/common/icudtb.dat
-FILE: ../../../third_party/icu/common/icudtl.dat
-FILE: ../../../third_party/icu/flutter/brkitr.patch
-FILE: ../../../third_party/icu/flutter/icudtl.dat
-FILE: ../../../third_party/icu/fuzzers/fuzzer_utils.h
-FILE: ../../../third_party/icu/fuzzers/icu_appendable_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_break_iterator_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_break_iterator_utf32_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_number_format_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_to_case_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_ucasemap_fuzzer.cc
-FILE: ../../../third_party/icu/ios/icudtl.dat
-FILE: ../../../third_party/icu/patches/ardatepattern.patch
-FILE: ../../../third_party/icu/patches/atomic_template_instantiation.patch
-FILE: ../../../third_party/icu/patches/cjdict.patch
-FILE: ../../../third_party/icu/patches/configure.patch
-FILE: ../../../third_party/icu/patches/data_symb.patch
-FILE: ../../../third_party/icu/patches/fix-bool-mix-use.patch
-FILE: ../../../third_party/icu/patches/fuchsia.patch
-FILE: ../../../third_party/icu/patches/gb_table.patch
-FILE: ../../../third_party/icu/patches/iso2022jp.patch
-FILE: ../../../third_party/icu/patches/isvalidenum.patch
-FILE: ../../../third_party/icu/patches/khmer-dictbe.patch
-FILE: ../../../third_party/icu/patches/locale1.patch
-FILE: ../../../third_party/icu/patches/locale_google.patch
-FILE: ../../../third_party/icu/patches/restrace.patch
-FILE: ../../../third_party/icu/patches/wordbrk.patch
-FILE: ../../../third_party/icu/patches/wpo.patch
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-implicithan-icu4x.icu
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-implicithan.icu
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-unihan-icu4x.icu
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-unihan.icu
-FILE: ../../../third_party/icu/source/data/in/nfc.nrm
-FILE: ../../../third_party/icu/source/data/in/nfkc.nrm
-FILE: ../../../third_party/icu/source/data/in/nfkc_cf.nrm
-FILE: ../../../third_party/icu/source/data/in/pnames.icu
-FILE: ../../../third_party/icu/source/data/in/ubidi.icu
-FILE: ../../../third_party/icu/source/data/in/ucase.icu
-FILE: ../../../third_party/icu/source/data/in/uemoji.icu
-FILE: ../../../third_party/icu/source/data/in/ulayout.icu
-FILE: ../../../third_party/icu/source/data/in/unames.icu
-FILE: ../../../third_party/icu/source/data/in/uprops.icu
-FILE: ../../../third_party/icu/source/data/in/uts46.nrm
-FILE: ../../../third_party/icu/source/data/mappings/big5-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/euc-jp-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/euc-kr-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/gb18030.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm866-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-10-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-13-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-14-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-15-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-16-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-2-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-3-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-4-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-5-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-6-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-7-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-8-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/koi8-r-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/koi8-u-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/macintosh-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/shift_jis-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1250-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1251-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1252-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1253-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1254-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1255-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1256-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1257-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1258-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-874-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-936-2000.ucm
-FILE: ../../../third_party/icu/source/data/mappings/x-mac-cyrillic-html.ucm
-FILE: ../../../third_party/icu/source/extra/scrptrun/srtest.dsp
-FILE: ../../../third_party/icu/source/extra/scrptrun/srtest.dsw
-FILE: ../../../third_party/icu/source/tools/tzcode/asctime.c
-FILE: ../../../third_party/icu/source/tools/tzcode/ialloc.c
-FILE: ../../../third_party/icu/source/tools/tzcode/localtime.c
-FILE: ../../../third_party/icu/source/tools/tzcode/private.h
-FILE: ../../../third_party/icu/source/tools/tzcode/scheck.c
-FILE: ../../../third_party/icu/source/tools/tzcode/tzfile.h
-FILE: ../../../third_party/icu/source/tools/tzcode/tzselect.ksh
-FILE: ../../../third_party/icu/source/tools/tzcode/zdump.c
-FILE: ../../../third_party/icu/source/tools/tzcode/zic.c
-FILE: ../../../third_party/icu/tzres/metaZones.res
-FILE: ../../../third_party/icu/tzres/timezoneTypes.res
-FILE: ../../../third_party/icu/tzres/zoneinfo64.res
-----------------------------------------------------------------------------------------------------
-Copyright 1991 by the Massachusetts Institute of Technology
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/ssl/bio_ssl.cc + ../../../third_party/boringssl/src/LICENSE
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/boringssl/src/ssl/bio_ssl.cc
-----------------------------------------------------------------------------------------------------
-Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
-
-Licensed under the OpenSSL license (the "License").  You may not use
-this file except in compliance with the License.  You can obtain a copy
-in the file LICENSE in the source distribution or at
-https://www.openssl.org/source/license.html
-====================================================================================================
-
-====================================================================================================
-LIBRARY: icu
-ORIGIN: ../../../third_party/icu/LICENSE
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/icu/DIR_METADATA
-FILE: ../../../third_party/icu/android/icudtl.dat
-FILE: ../../../third_party/icu/cast/brkitr.patch
-FILE: ../../../third_party/icu/cast/icudtl.dat
-FILE: ../../../third_party/icu/chromeos/icudtl.dat
-FILE: ../../../third_party/icu/chromeos/icudtl.dat.hash
-FILE: ../../../third_party/icu/common/icudtb.dat
-FILE: ../../../third_party/icu/common/icudtl.dat
-FILE: ../../../third_party/icu/flutter/brkitr.patch
-FILE: ../../../third_party/icu/flutter/icudtl.dat
-FILE: ../../../third_party/icu/fuzzers/fuzzer_utils.h
-FILE: ../../../third_party/icu/fuzzers/icu_appendable_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_break_iterator_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_break_iterator_utf32_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_number_format_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_to_case_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_ucasemap_fuzzer.cc
-FILE: ../../../third_party/icu/ios/icudtl.dat
-FILE: ../../../third_party/icu/patches/ardatepattern.patch
-FILE: ../../../third_party/icu/patches/atomic_template_instantiation.patch
-FILE: ../../../third_party/icu/patches/cjdict.patch
-FILE: ../../../third_party/icu/patches/configure.patch
-FILE: ../../../third_party/icu/patches/data_symb.patch
-FILE: ../../../third_party/icu/patches/fix-bool-mix-use.patch
-FILE: ../../../third_party/icu/patches/fuchsia.patch
-FILE: ../../../third_party/icu/patches/gb_table.patch
-FILE: ../../../third_party/icu/patches/iso2022jp.patch
-FILE: ../../../third_party/icu/patches/isvalidenum.patch
-FILE: ../../../third_party/icu/patches/khmer-dictbe.patch
-FILE: ../../../third_party/icu/patches/locale1.patch
-FILE: ../../../third_party/icu/patches/locale_google.patch
-FILE: ../../../third_party/icu/patches/restrace.patch
-FILE: ../../../third_party/icu/patches/wordbrk.patch
-FILE: ../../../third_party/icu/patches/wpo.patch
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-implicithan-icu4x.icu
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-implicithan.icu
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-unihan-icu4x.icu
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-unihan.icu
-FILE: ../../../third_party/icu/source/data/in/nfc.nrm
-FILE: ../../../third_party/icu/source/data/in/nfkc.nrm
-FILE: ../../../third_party/icu/source/data/in/nfkc_cf.nrm
-FILE: ../../../third_party/icu/source/data/in/pnames.icu
-FILE: ../../../third_party/icu/source/data/in/ubidi.icu
-FILE: ../../../third_party/icu/source/data/in/ucase.icu
-FILE: ../../../third_party/icu/source/data/in/uemoji.icu
-FILE: ../../../third_party/icu/source/data/in/ulayout.icu
-FILE: ../../../third_party/icu/source/data/in/unames.icu
-FILE: ../../../third_party/icu/source/data/in/uprops.icu
-FILE: ../../../third_party/icu/source/data/in/uts46.nrm
-FILE: ../../../third_party/icu/source/data/mappings/big5-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/euc-jp-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/euc-kr-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/gb18030.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm866-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-10-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-13-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-14-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-15-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-16-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-2-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-3-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-4-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-5-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-6-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-7-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-8-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/koi8-r-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/koi8-u-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/macintosh-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/shift_jis-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1250-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1251-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1252-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1253-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1254-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1255-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1256-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1257-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1258-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-874-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-936-2000.ucm
-FILE: ../../../third_party/icu/source/data/mappings/x-mac-cyrillic-html.ucm
-FILE: ../../../third_party/icu/source/extra/scrptrun/srtest.dsp
-FILE: ../../../third_party/icu/source/extra/scrptrun/srtest.dsw
-FILE: ../../../third_party/icu/source/tools/tzcode/asctime.c
-FILE: ../../../third_party/icu/source/tools/tzcode/ialloc.c
-FILE: ../../../third_party/icu/source/tools/tzcode/localtime.c
-FILE: ../../../third_party/icu/source/tools/tzcode/private.h
-FILE: ../../../third_party/icu/source/tools/tzcode/scheck.c
-FILE: ../../../third_party/icu/source/tools/tzcode/tzfile.h
-FILE: ../../../third_party/icu/source/tools/tzcode/tzselect.ksh
-FILE: ../../../third_party/icu/source/tools/tzcode/zdump.c
-FILE: ../../../third_party/icu/source/tools/tzcode/zic.c
-FILE: ../../../third_party/icu/tzres/metaZones.res
-FILE: ../../../third_party/icu/tzres/timezoneTypes.res
-FILE: ../../../third_party/icu/tzres/zoneinfo64.res
-----------------------------------------------------------------------------------------------------
-Copyright 1996 Chih-Hao Tsai @ Beckman Institute,
-    University of Illinois
-c-tsai4@uiuc.edu  http://casper.beckman.uiuc.edu/~c-tsai4
-====================================================================================================
-
-====================================================================================================
-LIBRARY: freetype2
-ORIGIN: ../../../third_party/freetype2/src/bdf/bdf.h
-TYPE: LicenseType.mit
-FILE: ../../../third_party/freetype2/src/bdf/bdf.h
-----------------------------------------------------------------------------------------------------
-Copyright 2000 Computing Research Labs, New Mexico State University
-Copyright 2001-2004, 2011 Francesco Zappa Nardelli
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE COMPUTING RESEARCH LAB OR NEW MEXICO STATE UNIVERSITY BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
-OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: freetype2
-ORIGIN: ../../../third_party/freetype2/src/bdf/bdflib.c
-TYPE: LicenseType.mit
-FILE: ../../../third_party/freetype2/src/bdf/bdflib.c
-----------------------------------------------------------------------------------------------------
-Copyright 2000 Computing Research Labs, New Mexico State University
-Copyright 2001-2014
-  Francesco Zappa Nardelli
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE COMPUTING RESEARCH LAB OR NEW MEXICO STATE UNIVERSITY BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
-OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: freetype2
-ORIGIN: ../../../third_party/freetype2/include/freetype/internal/fthash.h
-TYPE: LicenseType.mit
-FILE: ../../../third_party/freetype2/include/freetype/internal/fthash.h
-FILE: ../../../third_party/freetype2/src/base/fthash.c
-----------------------------------------------------------------------------------------------------
-Copyright 2000 Computing Research Labs, New Mexico State University
-Copyright 2001-2015
-  Francesco Zappa Nardelli
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE COMPUTING RESEARCH LAB OR NEW MEXICO STATE UNIVERSITY BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
-OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: icu
-ORIGIN: ../../../third_party/icu/LICENSE
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/icu/DIR_METADATA
-FILE: ../../../third_party/icu/android/icudtl.dat
-FILE: ../../../third_party/icu/cast/brkitr.patch
-FILE: ../../../third_party/icu/cast/icudtl.dat
-FILE: ../../../third_party/icu/chromeos/icudtl.dat
-FILE: ../../../third_party/icu/chromeos/icudtl.dat.hash
-FILE: ../../../third_party/icu/common/icudtb.dat
-FILE: ../../../third_party/icu/common/icudtl.dat
-FILE: ../../../third_party/icu/flutter/brkitr.patch
-FILE: ../../../third_party/icu/flutter/icudtl.dat
-FILE: ../../../third_party/icu/fuzzers/fuzzer_utils.h
-FILE: ../../../third_party/icu/fuzzers/icu_appendable_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_break_iterator_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_break_iterator_utf32_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_number_format_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_to_case_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_ucasemap_fuzzer.cc
-FILE: ../../../third_party/icu/ios/icudtl.dat
-FILE: ../../../third_party/icu/patches/ardatepattern.patch
-FILE: ../../../third_party/icu/patches/atomic_template_instantiation.patch
-FILE: ../../../third_party/icu/patches/cjdict.patch
-FILE: ../../../third_party/icu/patches/configure.patch
-FILE: ../../../third_party/icu/patches/data_symb.patch
-FILE: ../../../third_party/icu/patches/fix-bool-mix-use.patch
-FILE: ../../../third_party/icu/patches/fuchsia.patch
-FILE: ../../../third_party/icu/patches/gb_table.patch
-FILE: ../../../third_party/icu/patches/iso2022jp.patch
-FILE: ../../../third_party/icu/patches/isvalidenum.patch
-FILE: ../../../third_party/icu/patches/khmer-dictbe.patch
-FILE: ../../../third_party/icu/patches/locale1.patch
-FILE: ../../../third_party/icu/patches/locale_google.patch
-FILE: ../../../third_party/icu/patches/restrace.patch
-FILE: ../../../third_party/icu/patches/wordbrk.patch
-FILE: ../../../third_party/icu/patches/wpo.patch
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-implicithan-icu4x.icu
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-implicithan.icu
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-unihan-icu4x.icu
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-unihan.icu
-FILE: ../../../third_party/icu/source/data/in/nfc.nrm
-FILE: ../../../third_party/icu/source/data/in/nfkc.nrm
-FILE: ../../../third_party/icu/source/data/in/nfkc_cf.nrm
-FILE: ../../../third_party/icu/source/data/in/pnames.icu
-FILE: ../../../third_party/icu/source/data/in/ubidi.icu
-FILE: ../../../third_party/icu/source/data/in/ucase.icu
-FILE: ../../../third_party/icu/source/data/in/uemoji.icu
-FILE: ../../../third_party/icu/source/data/in/ulayout.icu
-FILE: ../../../third_party/icu/source/data/in/unames.icu
-FILE: ../../../third_party/icu/source/data/in/uprops.icu
-FILE: ../../../third_party/icu/source/data/in/uts46.nrm
-FILE: ../../../third_party/icu/source/data/mappings/big5-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/euc-jp-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/euc-kr-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/gb18030.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm866-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-10-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-13-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-14-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-15-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-16-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-2-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-3-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-4-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-5-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-6-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-7-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-8-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/koi8-r-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/koi8-u-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/macintosh-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/shift_jis-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1250-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1251-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1252-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1253-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1254-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1255-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1256-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1257-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1258-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-874-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-936-2000.ucm
-FILE: ../../../third_party/icu/source/data/mappings/x-mac-cyrillic-html.ucm
-FILE: ../../../third_party/icu/source/extra/scrptrun/srtest.dsp
-FILE: ../../../third_party/icu/source/extra/scrptrun/srtest.dsw
-FILE: ../../../third_party/icu/source/tools/tzcode/asctime.c
-FILE: ../../../third_party/icu/source/tools/tzcode/ialloc.c
-FILE: ../../../third_party/icu/source/tools/tzcode/localtime.c
-FILE: ../../../third_party/icu/source/tools/tzcode/private.h
-FILE: ../../../third_party/icu/source/tools/tzcode/scheck.c
-FILE: ../../../third_party/icu/source/tools/tzcode/tzfile.h
-FILE: ../../../third_party/icu/source/tools/tzcode/tzselect.ksh
-FILE: ../../../third_party/icu/source/tools/tzcode/zdump.c
-FILE: ../../../third_party/icu/source/tools/tzcode/zic.c
-FILE: ../../../third_party/icu/tzres/metaZones.res
-FILE: ../../../third_party/icu/tzres/timezoneTypes.res
-FILE: ../../../third_party/icu/tzres/zoneinfo64.res
-----------------------------------------------------------------------------------------------------
-Copyright 2000, 2001, 2002, 2003 Nara Institute of Science
-and Technology.  All Rights Reserved.
-
-Use, reproduction, and distribution of this software is permitted.
-Any copy of this software, whether in its original form or modified,
-must include both the above copyright notice and the following
-paragraphs.
-
-Nara Institute of Science and Technology (NAIST),
-the copyright holders, disclaims all warranties with regard to this
-software, including all implied warranties of merchantability and
-fitness, in no event shall NAIST be liable for
-any special, indirect or consequential damages or any damages
-whatsoever resulting from loss of use, data or profits, whether in an
-action of contract, negligence or other tortuous action, arising out
-of or in connection with the use or performance of this software.
-
-A large portion of the dictionary entries
-originate from ICOT Free Software.  The following conditions for ICOT
-Free Software applies to the current dictionary as well.
-
-Each User may also freely distribute the Program, whether in its
-original form or modified, to any third party or parties, PROVIDED
-that the provisions of Section 3 ("NO WARRANTY") will ALWAYS appear
-on, or be attached to, the Program, which is distributed substantially
-in the same form as set out herein and that such intended
-distribution, if actually made, will neither violate or otherwise
-contravene any of the laws and regulations of the countries having
-jurisdiction over the User or the intended distribution itself.
-
-NO WARRANTY
-
-The program was produced on an experimental basis in the course of the
-research and development conducted during the project and is provided
-to users as so produced on an experimental basis.  Accordingly, the
-program is provided without any warranty whatsoever, whether express,
-implied, statutory or otherwise.  The term "warranty" used herein
-includes, but is not limited to, any warranty of the quality,
-performance, merchantability and fitness for a particular purpose of
-the program and the nonexistence of any infringement or violation of
-any right of any third party.
-
-Each user of the program will agree and understand, and be deemed to
-have agreed and understood, that there is no warranty whatsoever for
-the program and, accordingly, the entire risk arising from or
-otherwise connected with the program is assumed by the user.
-
-Therefore, neither ICOT, the copyright holder, or any other
-organization that participated in or was otherwise related to the
-development of the program and their respective officials, directors,
-officers and other employees shall be held liable for any and all
-damages, including, without limitation, general, special, incidental
-and consequential damages, arising out of or otherwise in connection
-with the use or inability to use the program or any product, material
-or result produced or otherwise obtained by using the program,
-regardless of whether they have been advised of, or otherwise had
-knowledge of, the possibility of such damages at any time during the
-project or thereafter.  Each user will be deemed to have agreed to the
-foregoing by his or her commencement of use of the program.  The term
-"use" as used herein includes, but is not limited to, the use,
-modification, copying and distribution of the program and the
-production of secondary products from the program.
-
-In the case where the program, whether in its original form or
-modified, was distributed or delivered to or received by a user from
-any person, organization or entity other than ICOT, unless it makes or
-grants independently of ICOT any specific warranty to the user in
-writing, such person, organization or entity, will also be exempted
-from and not be held liable to the user for any such damages as noted
-above as far as the program is concerned.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: freetype2
-ORIGIN: ../../../third_party/freetype2/src/pcf/pcfutil.h
-TYPE: LicenseType.mit
-FILE: ../../../third_party/freetype2/src/pcf/pcfutil.h
-----------------------------------------------------------------------------------------------------
-Copyright 2000, 2001, 2004 by
-Francesco Zappa Nardelli
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: freetype2
-ORIGIN: ../../../third_party/freetype2/src/pcf/pcfdrivr.h
-TYPE: LicenseType.mit
-FILE: ../../../third_party/freetype2/src/pcf/pcfdrivr.h
-----------------------------------------------------------------------------------------------------
-Copyright 2000-2001, 2002 by
-Francesco Zappa Nardelli
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: freetype2
-ORIGIN: ../../../third_party/freetype2/src/pcf/pcf.c
-TYPE: LicenseType.mit
-FILE: ../../../third_party/freetype2/src/pcf/pcf.c
-----------------------------------------------------------------------------------------------------
-Copyright 2000-2001, 2003 by
-Francesco Zappa Nardelli
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: freetype2
-ORIGIN: ../../../third_party/freetype2/src/pcf/pcfread.c
-TYPE: LicenseType.mit
-FILE: ../../../third_party/freetype2/src/pcf/pcfread.c
-----------------------------------------------------------------------------------------------------
-Copyright 2000-2010, 2012-2014 by
-Francesco Zappa Nardelli
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/x509v3/v3_ocsp.c + ../../../third_party/boringssl/src/LICENSE
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/v3_ocsp.c
-----------------------------------------------------------------------------------------------------
-Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.
-
-Licensed under the OpenSSL license (the "License").  You may not use
-this file except in compliance with the License.  You can obtain a copy
-in the file LICENSE in the source distribution or at
-https://www.openssl.org/source/license.html
-====================================================================================================
-
-====================================================================================================
-LIBRARY: freetype2
-ORIGIN: ../../../third_party/freetype2/src/bdf/bdferror.h
-TYPE: LicenseType.mit
-FILE: ../../../third_party/freetype2/src/bdf/bdferror.h
-----------------------------------------------------------------------------------------------------
-Copyright 2001, 2002, 2012 Francesco Zappa Nardelli
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE COMPUTING RESEARCH LAB OR NEW MEXICO STATE UNIVERSITY BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
-OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/ecdh_extra/ecdh_extra.c + ../../../third_party/boringssl/src/crypto/ecdh_extra/ecdh_extra.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/ecdh_extra/ecdh_extra.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ecdh/ecdh.c
-FILE: ../../../third_party/boringssl/src/include/openssl/ecdh.h
-----------------------------------------------------------------------------------------------------
-Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/ec.c + ../../../third_party/boringssl/src/crypto/fipsmodule/bn/exponentiation.c
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/ec.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/ec_key.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/ec_montgomery.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/internal.h
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/oct.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/simple.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/wnaf.c
-FILE: ../../../third_party/boringssl/src/include/openssl/ec.h
-FILE: ../../../third_party/boringssl/src/include/openssl/ec_key.h
-----------------------------------------------------------------------------------------------------
-Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   openssl-core@openssl.org.
-
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: angle
-ORIGIN: ../../../third_party/angle/include/GLSLANG/ShaderLang.h + ../../../third_party/angle/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/include/GLSLANG/ShaderLang.h
-FILE: ../../../third_party/angle/samples/shader_translator/shader_translator.cpp
-FILE: ../../../third_party/angle/src/common/angleutils.h
-FILE: ../../../third_party/angle/src/common/debug.cpp
-FILE: ../../../third_party/angle/src/common/debug.h
-FILE: ../../../third_party/angle/src/common/mathutil.h
-FILE: ../../../third_party/angle/src/common/utilities.cpp
-FILE: ../../../third_party/angle/src/common/utilities.h
-FILE: ../../../third_party/angle/src/compiler/preprocessor/preprocessor.l
-FILE: ../../../third_party/angle/src/compiler/translator/ASTMetadataHLSL.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/ASTMetadataHLSL.h
-FILE: ../../../third_party/angle/src/compiler/translator/BaseTypes.h
-FILE: ../../../third_party/angle/src/compiler/translator/BuiltInFunctionEmulator.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/BuiltInFunctionEmulatorGLSL.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/CallDAG.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/CallDAG.h
-FILE: ../../../third_party/angle/src/compiler/translator/CollectVariables.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/CollectVariables.h
-FILE: ../../../third_party/angle/src/compiler/translator/Common.h
-FILE: ../../../third_party/angle/src/compiler/translator/Compiler.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/Compiler.h
-FILE: ../../../third_party/angle/src/compiler/translator/ConstantUnion.h
-FILE: ../../../third_party/angle/src/compiler/translator/ExtensionBehavior.h
-FILE: ../../../third_party/angle/src/compiler/translator/HashNames.h
-FILE: ../../../third_party/angle/src/compiler/translator/InfoSink.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/InfoSink.h
-FILE: ../../../third_party/angle/src/compiler/translator/Initialize.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/Initialize.h
-FILE: ../../../third_party/angle/src/compiler/translator/InitializeDll.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/InitializeDll.h
-FILE: ../../../third_party/angle/src/compiler/translator/InitializeGlobals.h
-FILE: ../../../third_party/angle/src/compiler/translator/IntermNode.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/IntermNode.h
-FILE: ../../../third_party/angle/src/compiler/translator/Operator.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/OutputESSL.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/OutputESSL.h
-FILE: ../../../third_party/angle/src/compiler/translator/OutputGLSL.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/OutputGLSL.h
-FILE: ../../../third_party/angle/src/compiler/translator/OutputGLSLBase.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/OutputGLSLBase.h
-FILE: ../../../third_party/angle/src/compiler/translator/OutputHLSL.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/OutputHLSL.h
-FILE: ../../../third_party/angle/src/compiler/translator/OutputTree.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/ParseContext.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/ParseContext.h
-FILE: ../../../third_party/angle/src/compiler/translator/PoolAlloc.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/PoolAlloc.h
-FILE: ../../../third_party/angle/src/compiler/translator/QualifierTypes.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/QualifierTypes.h
-FILE: ../../../third_party/angle/src/compiler/translator/ShaderLang.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/SymbolTable.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/SymbolTable.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorESSL.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorESSL.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorGLSL.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorGLSL.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorHLSL.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorHLSL.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/TranslatorMetalUtils.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/TranslatorMetalUtils.h
-FILE: ../../../third_party/angle/src/compiler/translator/Types.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/Types.h
-FILE: ../../../third_party/angle/src/compiler/translator/ValidateGlobalInitializer.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/ValidateGlobalInitializer.h
-FILE: ../../../third_party/angle/src/compiler/translator/ValidateLimitations.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/ValidateSwitch.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/ValidateSwitch.h
-FILE: ../../../third_party/angle/src/compiler/translator/ValidateVaryingLocations.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/ValidateVaryingLocations.h
-FILE: ../../../third_party/angle/src/compiler/translator/VariablePacker.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/VariablePacker.h
-FILE: ../../../third_party/angle/src/compiler/translator/VersionGLSL.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/VersionGLSL.h
-FILE: ../../../third_party/angle/src/compiler/translator/glslang.l
-FILE: ../../../third_party/angle/src/compiler/translator/glslang.y
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/EmulateGLFragColorBroadcast.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/EmulateGLFragColorBroadcast.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/InitializeVariables.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/InitializeVariables.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/PruneNoOps.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/PruneNoOps.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/RecordConstantPrecision.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/RecordConstantPrecision.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/RemoveDynamicIndexing.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/RemoveDynamicIndexing.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/ScalarizeVecAndMatConstructorArgs.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/ScalarizeVecAndMatConstructorArgs.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/SeparateDeclarations.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/SeparateDeclarations.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/apple/UnfoldShortCircuitAST.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/apple/UnfoldShortCircuitAST.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/ArrayReturnValueToOutParameter.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/ArrayReturnValueToOutParameter.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/RemoveSwitchFallThrough.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/RemoveSwitchFallThrough.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/SeparateArrayInitialization.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/SeparateArrayInitialization.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/SeparateExpressionsReturningArrays.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/SeparateExpressionsReturningArrays.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/UnfoldShortCircuitToIf.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/UnfoldShortCircuitToIf.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/gl/RegenerateStructNames.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/gl/RegenerateStructNames.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/IntermTraverse.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/NodeSearch.h
-FILE: ../../../third_party/angle/src/compiler/translator/util.h
-FILE: ../../../third_party/angle/src/image_util/generatemip.h
-FILE: ../../../third_party/angle/src/libANGLE/Buffer.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Buffer.h
-FILE: ../../../third_party/angle/src/libANGLE/Config.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Config.h
-FILE: ../../../third_party/angle/src/libANGLE/Context.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Context.h
-FILE: ../../../third_party/angle/src/libANGLE/Display.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Display.h
-FILE: ../../../third_party/angle/src/libANGLE/EGLSync.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Fence.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Fence.h
-FILE: ../../../third_party/angle/src/libANGLE/Framebuffer.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Framebuffer.h
-FILE: ../../../third_party/angle/src/libANGLE/HandleAllocator.cpp
-FILE: ../../../third_party/angle/src/libANGLE/HandleAllocator.h
-FILE: ../../../third_party/angle/src/libANGLE/Program.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Program.h
-FILE: ../../../third_party/angle/src/libANGLE/RefCountObject.h
-FILE: ../../../third_party/angle/src/libANGLE/Renderbuffer.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Renderbuffer.h
-FILE: ../../../third_party/angle/src/libANGLE/ResourceManager.cpp
-FILE: ../../../third_party/angle/src/libANGLE/ResourceManager.h
-FILE: ../../../third_party/angle/src/libANGLE/Shader.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Shader.h
-FILE: ../../../third_party/angle/src/libANGLE/Surface.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Surface.h
-FILE: ../../../third_party/angle/src/libANGLE/Texture.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Texture.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/SurfaceImpl.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/ImageD3D.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/ImageD3D.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/IndexBuffer.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/IndexBuffer.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/IndexDataManager.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/IndexDataManager.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/TextureStorage.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/VertexBuffer.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/VertexBuffer.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/VertexDataManager.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/VertexDataManager.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/Blit9.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/Blit9.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/Image9.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/Image9.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/IndexBuffer9.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/IndexBuffer9.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/renderer9_utils.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/renderer9_utils.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/vertexconversion.h
-----------------------------------------------------------------------------------------------------
-Copyright 2002 The ANGLE Project Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-    Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.
-
-    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
-    Ltd., nor the names of their contributors may be used to endorse
-    or promote products derived from this software without specific
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: freetype2
-ORIGIN: ../../../third_party/freetype2/src/pcf/pcfread.h
-TYPE: LicenseType.mit
-FILE: ../../../third_party/freetype2/src/pcf/pcfread.h
-----------------------------------------------------------------------------------------------------
-Copyright 2003 by
-Francesco Zappa Nardelli
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/ssl/ssl_asn1.cc
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/boringssl/src/ssl/ssl_asn1.cc
-FILE: ../../../third_party/boringssl/src/ssl/ssl_stat.cc
-----------------------------------------------------------------------------------------------------
-Copyright 2005 Nokia. All rights reserved.
-
-The portions of the attached software ("Contribution") is developed by
-Nokia Corporation and is licensed pursuant to the OpenSSL open source
-license.
-
-The Contribution, originally written by Mika Kousa and Pasi Eronen of
-Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
-support (see RFC 4279) to OpenSSL.
-
-No patent licenses or other rights except those expressly stated in
-the OpenSSL open source license shall be deemed granted or received
-expressly, by implication, estoppel, or otherwise.
-
-No assurances are provided by Nokia that the Contribution does not
-infringe the patent or other intellectual property rights of any third
-party or that the license provides you with all the necessary rights
-to make use of the Contribution.
-
-THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
-ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
-SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
-OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
-OTHERWISE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/internal/gtest-death-test-internal.h
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/gtest-death-test.h
-FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/gtest-message.h
-FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/gtest.h
-FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/internal/gtest-death-test-internal.h
-FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/internal/gtest-internal.h
-FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/internal/gtest-port.h
-FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/internal/gtest-string.h
-FILE: ../../../third_party/boringssl/src/third_party/googletest/samples/sample1.cc
-FILE: ../../../third_party/boringssl/src/third_party/googletest/samples/sample1.h
-FILE: ../../../third_party/boringssl/src/third_party/googletest/samples/sample1_unittest.cc
-FILE: ../../../third_party/boringssl/src/third_party/googletest/samples/sample2.cc
-FILE: ../../../third_party/boringssl/src/third_party/googletest/samples/sample2.h
-FILE: ../../../third_party/boringssl/src/third_party/googletest/samples/sample2_unittest.cc
-FILE: ../../../third_party/boringssl/src/third_party/googletest/samples/sample3-inl.h
-FILE: ../../../third_party/boringssl/src/third_party/googletest/samples/sample3_unittest.cc
-FILE: ../../../third_party/boringssl/src/third_party/googletest/samples/sample4.cc
-FILE: ../../../third_party/boringssl/src/third_party/googletest/samples/sample4.h
-FILE: ../../../third_party/boringssl/src/third_party/googletest/samples/sample4_unittest.cc
-FILE: ../../../third_party/boringssl/src/third_party/googletest/samples/sample5_unittest.cc
-FILE: ../../../third_party/boringssl/src/third_party/googletest/src/gtest-death-test.cc
-FILE: ../../../third_party/boringssl/src/third_party/googletest/src/gtest-internal-inl.h
-FILE: ../../../third_party/boringssl/src/third_party/googletest/src/gtest.cc
-----------------------------------------------------------------------------------------------------
-Copyright 2005, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/gtest_pred_impl.h
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/gtest_pred_impl.h
-FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/gtest_prod.h
-FILE: ../../../third_party/boringssl/src/third_party/googletest/src/gtest_main.cc
-----------------------------------------------------------------------------------------------------
-Copyright 2006, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: double-conversion
-LIBRARY: icu
-ORIGIN: ../../../third_party/dart/runtime/third_party/double-conversion/src/cached-powers.cc
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/dart/runtime/third_party/double-conversion/src/cached-powers.cc
-FILE: ../../../third_party/icu/source/i18n/double-conversion-cached-powers.cpp
-----------------------------------------------------------------------------------------------------
-Copyright 2006-2008 the V8 project authors. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google Inc. nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: icu
-ORIGIN: ../../../third_party/dart/runtime/third_party/double-conversion/COPYING
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/icu/DIR_METADATA
-FILE: ../../../third_party/icu/android/icudtl.dat
-FILE: ../../../third_party/icu/cast/brkitr.patch
-FILE: ../../../third_party/icu/cast/icudtl.dat
-FILE: ../../../third_party/icu/chromeos/icudtl.dat
-FILE: ../../../third_party/icu/chromeos/icudtl.dat.hash
-FILE: ../../../third_party/icu/common/icudtb.dat
-FILE: ../../../third_party/icu/common/icudtl.dat
-FILE: ../../../third_party/icu/flutter/brkitr.patch
-FILE: ../../../third_party/icu/flutter/icudtl.dat
-FILE: ../../../third_party/icu/fuzzers/fuzzer_utils.h
-FILE: ../../../third_party/icu/fuzzers/icu_appendable_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_break_iterator_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_break_iterator_utf32_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_number_format_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_to_case_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_ucasemap_fuzzer.cc
-FILE: ../../../third_party/icu/ios/icudtl.dat
-FILE: ../../../third_party/icu/patches/ardatepattern.patch
-FILE: ../../../third_party/icu/patches/atomic_template_instantiation.patch
-FILE: ../../../third_party/icu/patches/cjdict.patch
-FILE: ../../../third_party/icu/patches/configure.patch
-FILE: ../../../third_party/icu/patches/data_symb.patch
-FILE: ../../../third_party/icu/patches/fix-bool-mix-use.patch
-FILE: ../../../third_party/icu/patches/fuchsia.patch
-FILE: ../../../third_party/icu/patches/gb_table.patch
-FILE: ../../../third_party/icu/patches/iso2022jp.patch
-FILE: ../../../third_party/icu/patches/isvalidenum.patch
-FILE: ../../../third_party/icu/patches/khmer-dictbe.patch
-FILE: ../../../third_party/icu/patches/locale1.patch
-FILE: ../../../third_party/icu/patches/locale_google.patch
-FILE: ../../../third_party/icu/patches/restrace.patch
-FILE: ../../../third_party/icu/patches/wordbrk.patch
-FILE: ../../../third_party/icu/patches/wpo.patch
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-implicithan-icu4x.icu
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-implicithan.icu
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-unihan-icu4x.icu
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-unihan.icu
-FILE: ../../../third_party/icu/source/data/in/nfc.nrm
-FILE: ../../../third_party/icu/source/data/in/nfkc.nrm
-FILE: ../../../third_party/icu/source/data/in/nfkc_cf.nrm
-FILE: ../../../third_party/icu/source/data/in/pnames.icu
-FILE: ../../../third_party/icu/source/data/in/ubidi.icu
-FILE: ../../../third_party/icu/source/data/in/ucase.icu
-FILE: ../../../third_party/icu/source/data/in/uemoji.icu
-FILE: ../../../third_party/icu/source/data/in/ulayout.icu
-FILE: ../../../third_party/icu/source/data/in/unames.icu
-FILE: ../../../third_party/icu/source/data/in/uprops.icu
-FILE: ../../../third_party/icu/source/data/in/uts46.nrm
-FILE: ../../../third_party/icu/source/data/mappings/big5-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/euc-jp-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/euc-kr-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/gb18030.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm866-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-10-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-13-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-14-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-15-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-16-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-2-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-3-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-4-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-5-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-6-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-7-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-8-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/koi8-r-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/koi8-u-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/macintosh-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/shift_jis-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1250-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1251-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1252-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1253-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1254-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1255-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1256-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1257-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1258-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-874-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-936-2000.ucm
-FILE: ../../../third_party/icu/source/data/mappings/x-mac-cyrillic-html.ucm
-FILE: ../../../third_party/icu/source/extra/scrptrun/srtest.dsp
-FILE: ../../../third_party/icu/source/extra/scrptrun/srtest.dsw
-FILE: ../../../third_party/icu/source/tools/tzcode/asctime.c
-FILE: ../../../third_party/icu/source/tools/tzcode/ialloc.c
-FILE: ../../../third_party/icu/source/tools/tzcode/localtime.c
-FILE: ../../../third_party/icu/source/tools/tzcode/private.h
-FILE: ../../../third_party/icu/source/tools/tzcode/scheck.c
-FILE: ../../../third_party/icu/source/tools/tzcode/tzfile.h
-FILE: ../../../third_party/icu/source/tools/tzcode/tzselect.ksh
-FILE: ../../../third_party/icu/source/tools/tzcode/zdump.c
-FILE: ../../../third_party/icu/source/tools/tzcode/zic.c
-FILE: ../../../third_party/icu/tzres/metaZones.res
-FILE: ../../../third_party/icu/tzres/timezoneTypes.res
-FILE: ../../../third_party/icu/tzres/zoneinfo64.res
-----------------------------------------------------------------------------------------------------
-Copyright 2006-2011, the V8 project authors. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google Inc. nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/rsa_extra/rsa_print.c + ../../../third_party/boringssl/src/LICENSE
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/boringssl/src/crypto/rsa_extra/rsa_print.c
-----------------------------------------------------------------------------------------------------
-Copyright 2006-2017 The OpenSSL Project Authors. All Rights Reserved.
-
-Licensed under the OpenSSL license (the "License").  You may not use
-this file except in compliance with the License.  You can obtain a copy
-in the file LICENSE in the source distribution or at
-https://www.openssl.org/source/license.html
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/gtest-matchers.h
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/gtest-matchers.h
-FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/gtest-printers.h
-FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/gtest-spi.h
-FILE: ../../../third_party/boringssl/src/third_party/googletest/src/gtest-matchers.cc
-FILE: ../../../third_party/boringssl/src/third_party/googletest/src/gtest-printers.cc
-----------------------------------------------------------------------------------------------------
-Copyright 2007, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/ios-arm/crypto/fipsmodule/sha256-armv4.S + ../../../third_party/boringssl/src/LICENSE
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/boringssl/ios-arm/crypto/fipsmodule/sha256-armv4.S
-FILE: ../../../third_party/boringssl/ios-arm/crypto/fipsmodule/sha512-armv4.S
-FILE: ../../../third_party/boringssl/linux-arm/crypto/fipsmodule/sha256-armv4.S
-FILE: ../../../third_party/boringssl/linux-arm/crypto/fipsmodule/sha512-armv4.S
-----------------------------------------------------------------------------------------------------
-Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved.
-
-Licensed under the OpenSSL license (the "License").  You may not use
-this file except in compliance with the License.  You can obtain a copy
-in the file LICENSE in the source distribution or at
-https://www.openssl.org/source/license.html
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/internal/gtest-param-util.h
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/gtest-typed-test.h
-FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/internal/gtest-param-util.h
-FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/internal/gtest-type-util.h
-FILE: ../../../third_party/boringssl/src/third_party/googletest/samples/prime_tables.h
-FILE: ../../../third_party/boringssl/src/third_party/googletest/samples/sample6_unittest.cc
-FILE: ../../../third_party/boringssl/src/third_party/googletest/samples/sample7_unittest.cc
-FILE: ../../../third_party/boringssl/src/third_party/googletest/samples/sample8_unittest.cc
-FILE: ../../../third_party/boringssl/src/third_party/googletest/src/gtest-typed-test.cc
-----------------------------------------------------------------------------------------------------
-Copyright 2008 Google Inc.
-All Rights Reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/third_party/googletest/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/third_party/googletest/CONTRIBUTORS
-FILE: ../../../third_party/boringssl/src/third_party/googletest/METADATA
-FILE: ../../../third_party/boringssl/src/third_party/googletest/cmake/Config.cmake.in
-FILE: ../../../third_party/boringssl/src/third_party/googletest/cmake/gtest.pc.in
-FILE: ../../../third_party/boringssl/src/third_party/googletest/cmake/gtest_main.pc.in
-FILE: ../../../third_party/boringssl/src/third_party/googletest/cmake/libgtest.la.in
-FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/gtest-param-test.h
-FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/gtest-test-part.h
-FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/internal/gtest-filepath.h
-FILE: ../../../third_party/boringssl/src/third_party/googletest/src/gtest-all.cc
-FILE: ../../../third_party/boringssl/src/third_party/googletest/src/gtest-filepath.cc
-FILE: ../../../third_party/boringssl/src/third_party/googletest/src/gtest-port.cc
-FILE: ../../../third_party/boringssl/src/third_party/googletest/src/gtest-test-part.cc
-----------------------------------------------------------------------------------------------------
-Copyright 2008, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/third_party/googletest/samples/sample10_unittest.cc
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/third_party/googletest/samples/sample10_unittest.cc
-FILE: ../../../third_party/boringssl/src/third_party/googletest/samples/sample9_unittest.cc
-----------------------------------------------------------------------------------------------------
-Copyright 2009 Google Inc. All Rights Reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libjpeg-turbo
-ORIGIN: ../../../third_party/libjpeg-turbo/simd/jccolext-mmx.asm + ../../../third_party/libjpeg-turbo/simd/jsimdext.inc
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/libjpeg-turbo/simd/jccolext-mmx.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jcolsamp.inc
-FILE: ../../../third_party/libjpeg-turbo/simd/jcsample-mmx.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jcsample-sse2.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jdcolext-mmx.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jdct.inc
-FILE: ../../../third_party/libjpeg-turbo/simd/jdmrgext-mmx.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jdsample-mmx.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jdsample-sse2.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jfdctflt-3dn.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jfdctflt-sse.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jfdctfst-mmx.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jfdctfst-sse2.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jfdctint-mmx.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jfdctint-sse2.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jidctflt-3dn.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jidctflt-sse.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jidctflt-sse2.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jidctfst-mmx.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jidctfst-sse2.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jidctint-mmx.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jidctint-sse2.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jidctred-mmx.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jidctred-sse2.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jquant-3dn.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jquant-mmx.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jquant-sse.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jquantf-sse2.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jquanti-sse2.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jsimdcpu.asm
-----------------------------------------------------------------------------------------------------
-Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-
-Based on the x86 SIMD extension for IJG JPEG library
-Copyright (C) 1999-2006, MIYASAKA Masaru.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libjpeg-turbo
-ORIGIN: ../../../third_party/libjpeg-turbo/jsimddct.h + ../../../third_party/libjpeg-turbo/simd/jsimdext.inc
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/libjpeg-turbo/jsimddct.h
-----------------------------------------------------------------------------------------------------
-Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-
-Based on the x86 SIMD extension for IJG JPEG library,
-Copyright (C) 1999-2006, MIYASAKA Masaru.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libjpeg-turbo
-ORIGIN: ../../../third_party/libjpeg-turbo/simd/jccolor-mmx.asm + ../../../third_party/libjpeg-turbo/simd/jsimdext.inc
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/libjpeg-turbo/simd/jccolor-mmx.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jcsample-sse2-64.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jdcolor-mmx.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jdcolor-sse2-64.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jdcolor-sse2.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jdmerge-mmx.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jdmerge-sse2-64.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jdmerge-sse2.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jdsample-sse2-64.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jfdctflt-sse-64.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jfdctfst-sse2-64.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jfdctint-sse2-64.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jidctflt-sse2-64.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jidctfst-sse2-64.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jidctint-sse2-64.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jidctred-sse2-64.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jquantf-sse2-64.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jquanti-sse2-64.asm
-----------------------------------------------------------------------------------------------------
-Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-Copyright (C) 2009, D. R. Commander.
-
-Based on the x86 SIMD extension for IJG JPEG library
-Copyright (C) 1999-2006, MIYASAKA Masaru.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libjpeg-turbo
-ORIGIN: ../../../third_party/libjpeg-turbo/simd/jsimd_i386.c + ../../../third_party/libjpeg-turbo/simd/jsimdext.inc
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/libjpeg-turbo/simd/jsimd_i386.c
-----------------------------------------------------------------------------------------------------
-Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-Copyright (C) 2009-2011, 2013-2014, 2016, D. R. Commander.
-Copyright (C) 2015, Matthieu Darbois.
-
-Based on the x86 SIMD extension for IJG JPEG library,
-Copyright (C) 1999-2006, MIYASAKA Masaru.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libjpeg-turbo
-ORIGIN: ../../../third_party/libjpeg-turbo/simd/jsimd_arm.c + ../../../third_party/libjpeg-turbo/simd/jsimdext.inc
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/libjpeg-turbo/simd/jsimd_arm.c
-FILE: ../../../third_party/libjpeg-turbo/simd/jsimd_arm64.c
-----------------------------------------------------------------------------------------------------
-Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-Copyright (C) 2009-2011, 2013-2014, 2016, D. R. Commander.
-Copyright (C) 2015-2016, Matthieu Darbois.
-
-Based on the x86 SIMD extension for IJG JPEG library,
-Copyright (C) 1999-2006, MIYASAKA Masaru.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libjpeg-turbo
-ORIGIN: ../../../third_party/libjpeg-turbo/simd/jsimd_x86_64.c + ../../../third_party/libjpeg-turbo/simd/jsimdext.inc
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/libjpeg-turbo/simd/jsimd_x86_64.c
-----------------------------------------------------------------------------------------------------
-Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-Copyright (C) 2009-2011, 2014, 2016, D. R. Commander.
-Copyright (C) 2015, Matthieu Darbois.
-
-Based on the x86 SIMD extension for IJG JPEG library,
-Copyright (C) 1999-2006, MIYASAKA Masaru.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libjpeg-turbo
-ORIGIN: ../../../third_party/libjpeg-turbo/simd/jsimd_mips.c + ../../../third_party/libjpeg-turbo/simd/jsimdext.inc
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/libjpeg-turbo/simd/jsimd_mips.c
-----------------------------------------------------------------------------------------------------
-Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-Copyright (C) 2009-2011, 2014, D. R. Commander.
-Copyright (C) 2013-2014, MIPS Technologies, Inc., California.
-Copyright (C) 2015, Matthieu Darbois.
-
-Based on the x86 SIMD extension for IJG JPEG library,
-Copyright (C) 1999-2006, MIYASAKA Masaru.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libjpeg-turbo
-ORIGIN: ../../../third_party/libjpeg-turbo/jsimd_none.c + ../../../third_party/libjpeg-turbo/simd/jsimdext.inc
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/libjpeg-turbo/jsimd_none.c
-----------------------------------------------------------------------------------------------------
-Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-Copyright (C) 2009-2011, 2014, D. R. Commander.
-Copyright (C) 2015, Matthieu Darbois.
-
-Based on the x86 SIMD extension for IJG JPEG library,
-Copyright (C) 1999-2006, MIYASAKA Masaru.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libjpeg-turbo
-ORIGIN: ../../../third_party/libjpeg-turbo/simd/jsimd_powerpc.c + ../../../third_party/libjpeg-turbo/simd/jsimdext.inc
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/libjpeg-turbo/simd/jsimd_powerpc.c
-----------------------------------------------------------------------------------------------------
-Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-Copyright (C) 2009-2011, 2014-2015, D. R. Commander.
-Copyright (C) 2015, Matthieu Darbois.
-
-Based on the x86 SIMD extension for IJG JPEG library,
-Copyright (C) 1999-2006, MIYASAKA Masaru.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libjpeg-turbo
-ORIGIN: ../../../third_party/libjpeg-turbo/simd/jsimdext.inc
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/libjpeg-turbo/jconfig.h
-FILE: ../../../third_party/libjpeg-turbo/jconfig.h.in
-FILE: ../../../third_party/libjpeg-turbo/jconfigint.h
-FILE: ../../../third_party/libjpeg-turbo/jconfigint.h.in
-FILE: ../../../third_party/libjpeg-turbo/jpeg_nbits_table.h
-FILE: ../../../third_party/libjpeg-turbo/libjpeg.map.in
-FILE: ../../../third_party/libjpeg-turbo/simd/jpeg_nbits_table.inc
-FILE: ../../../third_party/libjpeg-turbo/simd/jsimdcfg.inc
-FILE: ../../../third_party/libjpeg-turbo/simd/jsimdcfg.inc.h
-FILE: ../../../third_party/libjpeg-turbo/simd/jsimdext.inc
-FILE: ../../../third_party/libjpeg-turbo/turbojpeg-mapfile
-FILE: ../../../third_party/libjpeg-turbo/turbojpeg-mapfile.jni
-----------------------------------------------------------------------------------------------------
-Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-Copyright (C) 2010, D. R. Commander.
-
-Based on the x86 SIMD extension for IJG JPEG library - version 1.02
-
-Copyright (C) 1999-2006, MIYASAKA Masaru.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libjpeg-turbo
-ORIGIN: ../../../third_party/libjpeg-turbo/jsimd.h + ../../../third_party/libjpeg-turbo/simd/jsimdext.inc
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/libjpeg-turbo/jsimd.h
-----------------------------------------------------------------------------------------------------
-Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-Copyright (C) 2011, 2014, D. R. Commander.
-Copyright (C) 2015, Matthieu Darbois.
-
-Based on the x86 SIMD extension for IJG JPEG library,
-Copyright (C) 1999-2006, MIYASAKA Masaru.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libjpeg-turbo
-ORIGIN: ../../../third_party/libjpeg-turbo/simd/jsimd.h + ../../../third_party/libjpeg-turbo/simd/jsimdext.inc
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/libjpeg-turbo/simd/jsimd.h
-----------------------------------------------------------------------------------------------------
-Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-Copyright (C) 2011, 2014-2016, D. R. Commander.
-Copyright (C) 2013-2014, MIPS Technologies, Inc., California.
-Copyright (C) 2014, Linaro Limited.
-Copyright (C) 2015-2016, Matthieu Darbois.
-
-Based on the x86 SIMD extension for IJG JPEG library,
-Copyright (C) 1999-2006, MIYASAKA Masaru.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libjpeg-turbo
-ORIGIN: ../../../third_party/libjpeg-turbo/simd/jcgray-mmx.asm + ../../../third_party/libjpeg-turbo/simd/jsimdext.inc
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/libjpeg-turbo/simd/jcgray-mmx.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jcgryext-mmx.asm
-----------------------------------------------------------------------------------------------------
-Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-Copyright (C) 2011, D. R. Commander.
-
-Based on the x86 SIMD extension for IJG JPEG library
-Copyright (C) 1999-2006, MIYASAKA Masaru.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libjpeg-turbo
-ORIGIN: ../../../third_party/libjpeg-turbo/simd/jdcolext-sse2-64.asm + ../../../third_party/libjpeg-turbo/simd/jsimdext.inc
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/libjpeg-turbo/simd/jdcolext-sse2-64.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jdmrgext-sse2-64.asm
-----------------------------------------------------------------------------------------------------
-Copyright 2009, 2012 Pierre Ossman <ossman@cendio.se> for Cendio AB
-Copyright (C) 2009, 2012, D. R. Commander.
-
-Based on the x86 SIMD extension for IJG JPEG library
-Copyright (C) 1999-2006, MIYASAKA Masaru.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libjpeg-turbo
-ORIGIN: ../../../third_party/libjpeg-turbo/simd/jdcolext-sse2.asm + ../../../third_party/libjpeg-turbo/simd/jsimdext.inc
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/libjpeg-turbo/simd/jdcolext-sse2.asm
-FILE: ../../../third_party/libjpeg-turbo/simd/jdmrgext-sse2.asm
-----------------------------------------------------------------------------------------------------
-Copyright 2009, 2012 Pierre Ossman <ossman@cendio.se> for Cendio AB
-Copyright (C) 2012, D. R. Commander.
-
-Based on the x86 SIMD extension for IJG JPEG library
-Copyright (C) 1999-2006, MIYASAKA Masaru.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libwebp
-ORIGIN: ../../../third_party/libwebp/src/dec/frame_dec.c + ../../../third_party/libwebp/COPYING
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/libwebp/src/dec/frame_dec.c
-FILE: ../../../third_party/libwebp/src/dec/quant_dec.c
-FILE: ../../../third_party/libwebp/src/dec/tree_dec.c
-FILE: ../../../third_party/libwebp/src/dec/vp8_dec.c
-FILE: ../../../third_party/libwebp/src/dec/vp8_dec.h
-FILE: ../../../third_party/libwebp/src/dec/vp8i_dec.h
-FILE: ../../../third_party/libwebp/src/dec/webp_dec.c
-FILE: ../../../third_party/libwebp/src/dsp/dec.c
-FILE: ../../../third_party/libwebp/src/dsp/yuv.c
-FILE: ../../../third_party/libwebp/src/dsp/yuv.h
-FILE: ../../../third_party/libwebp/src/utils/bit_reader_utils.c
-FILE: ../../../third_party/libwebp/src/utils/bit_reader_utils.h
-FILE: ../../../third_party/libwebp/src/webp/decode.h
-FILE: ../../../third_party/libwebp/src/webp/types.h
-----------------------------------------------------------------------------------------------------
-Copyright 2010 Google Inc. All Rights Reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-  * Neither the name of Google nor the names of its contributors may
-    be used to endorse or promote products derived from this software
-    without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: angle
-ORIGIN: ../../../third_party/angle/src/compiler/translator/ValidateLimitations.h + ../../../third_party/angle/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/src/compiler/translator/ValidateLimitations.h
-FILE: ../../../third_party/angle/src/compiler/translator/glslang.h
-FILE: ../../../third_party/angle/src/compiler/translator/util.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Uniform.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Uniform.h
-----------------------------------------------------------------------------------------------------
-Copyright 2010 The ANGLE Project Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-    Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.
-
-    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
-    Ltd., nor the names of their contributors may be used to endorse
-    or promote products derived from this software without specific
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: double-conversion
-LIBRARY: icu
-ORIGIN: ../../../third_party/dart/runtime/third_party/double-conversion/src/bignum-dtoa.cc
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/dart/runtime/third_party/double-conversion/src/bignum-dtoa.cc
-FILE: ../../../third_party/dart/runtime/third_party/double-conversion/src/bignum-dtoa.h
-FILE: ../../../third_party/dart/runtime/third_party/double-conversion/src/bignum.cc
-FILE: ../../../third_party/dart/runtime/third_party/double-conversion/src/bignum.h
-FILE: ../../../third_party/dart/runtime/third_party/double-conversion/src/cached-powers.h
-FILE: ../../../third_party/dart/runtime/third_party/double-conversion/src/diy-fp.cc
-FILE: ../../../third_party/dart/runtime/third_party/double-conversion/src/diy-fp.h
-FILE: ../../../third_party/dart/runtime/third_party/double-conversion/src/double-conversion.cc
-FILE: ../../../third_party/dart/runtime/third_party/double-conversion/src/fast-dtoa.h
-FILE: ../../../third_party/dart/runtime/third_party/double-conversion/src/fixed-dtoa.cc
-FILE: ../../../third_party/dart/runtime/third_party/double-conversion/src/fixed-dtoa.h
-FILE: ../../../third_party/dart/runtime/third_party/double-conversion/src/strtod.cc
-FILE: ../../../third_party/dart/runtime/third_party/double-conversion/src/strtod.h
-FILE: ../../../third_party/dart/runtime/third_party/double-conversion/src/utils.h
-FILE: ../../../third_party/icu/source/i18n/double-conversion-bignum-dtoa.cpp
-FILE: ../../../third_party/icu/source/i18n/double-conversion-bignum-dtoa.h
-FILE: ../../../third_party/icu/source/i18n/double-conversion-bignum.cpp
-FILE: ../../../third_party/icu/source/i18n/double-conversion-bignum.h
-FILE: ../../../third_party/icu/source/i18n/double-conversion-cached-powers.h
-FILE: ../../../third_party/icu/source/i18n/double-conversion-diy-fp.h
-FILE: ../../../third_party/icu/source/i18n/double-conversion-double-to-string.cpp
-FILE: ../../../third_party/icu/source/i18n/double-conversion-fast-dtoa.h
-FILE: ../../../third_party/icu/source/i18n/double-conversion-string-to-double.cpp
-FILE: ../../../third_party/icu/source/i18n/double-conversion-strtod.cpp
-FILE: ../../../third_party/icu/source/i18n/double-conversion-strtod.h
-FILE: ../../../third_party/icu/source/i18n/double-conversion-utils.h
-----------------------------------------------------------------------------------------------------
-Copyright 2010 the V8 project authors. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google Inc. nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libwebp
-ORIGIN: ../../../third_party/libwebp/src/dec/alpha_dec.c + ../../../third_party/libwebp/COPYING
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/libwebp/src/dec/alpha_dec.c
-FILE: ../../../third_party/libwebp/src/dec/buffer_dec.c
-FILE: ../../../third_party/libwebp/src/dec/idec_dec.c
-FILE: ../../../third_party/libwebp/src/dec/io_dec.c
-FILE: ../../../third_party/libwebp/src/dec/webpi_dec.h
-FILE: ../../../third_party/libwebp/src/dsp/cpu.c
-FILE: ../../../third_party/libwebp/src/dsp/dec_sse2.c
-FILE: ../../../third_party/libwebp/src/dsp/dsp.h
-FILE: ../../../third_party/libwebp/src/dsp/enc.c
-FILE: ../../../third_party/libwebp/src/dsp/enc_sse2.c
-FILE: ../../../third_party/libwebp/src/dsp/filters.c
-FILE: ../../../third_party/libwebp/src/dsp/upsampling.c
-FILE: ../../../third_party/libwebp/src/dsp/upsampling_neon.c
-FILE: ../../../third_party/libwebp/src/dsp/upsampling_sse2.c
-FILE: ../../../third_party/libwebp/src/dsp/upsampling_sse41.c
-FILE: ../../../third_party/libwebp/src/enc/alpha_enc.c
-FILE: ../../../third_party/libwebp/src/enc/analysis_enc.c
-FILE: ../../../third_party/libwebp/src/enc/config_enc.c
-FILE: ../../../third_party/libwebp/src/enc/cost_enc.c
-FILE: ../../../third_party/libwebp/src/enc/cost_enc.h
-FILE: ../../../third_party/libwebp/src/enc/filter_enc.c
-FILE: ../../../third_party/libwebp/src/enc/frame_enc.c
-FILE: ../../../third_party/libwebp/src/enc/iterator_enc.c
-FILE: ../../../third_party/libwebp/src/enc/picture_enc.c
-FILE: ../../../third_party/libwebp/src/enc/quant_enc.c
-FILE: ../../../third_party/libwebp/src/enc/syntax_enc.c
-FILE: ../../../third_party/libwebp/src/enc/token_enc.c
-FILE: ../../../third_party/libwebp/src/enc/tree_enc.c
-FILE: ../../../third_party/libwebp/src/enc/vp8i_enc.h
-FILE: ../../../third_party/libwebp/src/enc/webp_enc.c
-FILE: ../../../third_party/libwebp/src/mux/muxedit.c
-FILE: ../../../third_party/libwebp/src/mux/muxi.h
-FILE: ../../../third_party/libwebp/src/mux/muxinternal.c
-FILE: ../../../third_party/libwebp/src/mux/muxread.c
-FILE: ../../../third_party/libwebp/src/utils/bit_writer_utils.c
-FILE: ../../../third_party/libwebp/src/utils/bit_writer_utils.h
-FILE: ../../../third_party/libwebp/src/utils/filters_utils.c
-FILE: ../../../third_party/libwebp/src/utils/filters_utils.h
-FILE: ../../../third_party/libwebp/src/utils/huffman_encode_utils.c
-FILE: ../../../third_party/libwebp/src/utils/huffman_encode_utils.h
-FILE: ../../../third_party/libwebp/src/utils/quant_levels_utils.c
-FILE: ../../../third_party/libwebp/src/utils/quant_levels_utils.h
-FILE: ../../../third_party/libwebp/src/utils/thread_utils.c
-FILE: ../../../third_party/libwebp/src/utils/thread_utils.h
-FILE: ../../../third_party/libwebp/src/webp/encode.h
-FILE: ../../../third_party/libwebp/src/webp/mux.h
-----------------------------------------------------------------------------------------------------
-Copyright 2011 Google Inc. All Rights Reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-  * Neither the name of Google nor the names of its contributors may
-    be used to endorse or promote products derived from this software
-    without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: angle
-ORIGIN: ../../../third_party/angle/src/compiler/preprocessor/DirectiveParser.cpp + ../../../third_party/angle/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/src/compiler/preprocessor/DirectiveParser.cpp
-FILE: ../../../third_party/angle/src/compiler/preprocessor/Input.cpp
-FILE: ../../../third_party/angle/src/compiler/preprocessor/Input.h
-FILE: ../../../third_party/angle/src/compiler/preprocessor/Macro.cpp
-FILE: ../../../third_party/angle/src/compiler/preprocessor/MacroExpander.cpp
-FILE: ../../../third_party/angle/src/compiler/preprocessor/Preprocessor.cpp
-FILE: ../../../third_party/angle/src/compiler/preprocessor/Preprocessor.h
-FILE: ../../../third_party/angle/src/compiler/preprocessor/Token.cpp
-FILE: ../../../third_party/angle/src/compiler/preprocessor/Token.h
-FILE: ../../../third_party/angle/src/compiler/translator/BuiltInFunctionEmulator.h
-FILE: ../../../third_party/angle/src/compiler/translator/BuiltInFunctionEmulatorGLSL.h
-FILE: ../../../third_party/angle/src/compiler/translator/length_limits.h
-----------------------------------------------------------------------------------------------------
-Copyright 2011 The ANGLE Project Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-    Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.
-
-    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
-    Ltd., nor the names of their contributors may be used to endorse
-    or promote products derived from this software without specific
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libwebp
-ORIGIN: ../../../third_party/libwebp/imageio/jpegdec.c + ../../../third_party/libwebp/COPYING
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/libwebp/imageio/jpegdec.c
-FILE: ../../../third_party/libwebp/imageio/jpegdec.h
-FILE: ../../../third_party/libwebp/imageio/metadata.c
-FILE: ../../../third_party/libwebp/imageio/metadata.h
-FILE: ../../../third_party/libwebp/imageio/pngdec.c
-FILE: ../../../third_party/libwebp/imageio/pngdec.h
-FILE: ../../../third_party/libwebp/imageio/tiffdec.c
-FILE: ../../../third_party/libwebp/imageio/tiffdec.h
-FILE: ../../../third_party/libwebp/src/dec/vp8l_dec.c
-FILE: ../../../third_party/libwebp/src/dec/vp8li_dec.h
-FILE: ../../../third_party/libwebp/src/demux/demux.c
-FILE: ../../../third_party/libwebp/src/dsp/dec_neon.c
-FILE: ../../../third_party/libwebp/src/dsp/enc_neon.c
-FILE: ../../../third_party/libwebp/src/dsp/lossless.c
-FILE: ../../../third_party/libwebp/src/dsp/lossless.h
-FILE: ../../../third_party/libwebp/src/dsp/lossless_common.h
-FILE: ../../../third_party/libwebp/src/enc/backward_references_enc.c
-FILE: ../../../third_party/libwebp/src/enc/backward_references_enc.h
-FILE: ../../../third_party/libwebp/src/enc/histogram_enc.c
-FILE: ../../../third_party/libwebp/src/enc/histogram_enc.h
-FILE: ../../../third_party/libwebp/src/enc/vp8l_enc.c
-FILE: ../../../third_party/libwebp/src/enc/vp8li_enc.h
-FILE: ../../../third_party/libwebp/src/utils/color_cache_utils.c
-FILE: ../../../third_party/libwebp/src/utils/color_cache_utils.h
-FILE: ../../../third_party/libwebp/src/utils/huffman_utils.c
-FILE: ../../../third_party/libwebp/src/utils/huffman_utils.h
-FILE: ../../../third_party/libwebp/src/utils/rescaler_utils.c
-FILE: ../../../third_party/libwebp/src/utils/rescaler_utils.h
-FILE: ../../../third_party/libwebp/src/utils/utils.c
-FILE: ../../../third_party/libwebp/src/utils/utils.h
-FILE: ../../../third_party/libwebp/src/webp/demux.h
-FILE: ../../../third_party/libwebp/src/webp/format_constants.h
-FILE: ../../../third_party/libwebp/src/webp/mux_types.h
-----------------------------------------------------------------------------------------------------
-Copyright 2012 Google Inc. All Rights Reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-  * Neither the name of Google nor the names of its contributors may
-    be used to endorse or promote products derived from this software
-    without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: angle
-ORIGIN: ../../../third_party/angle/src/common/Float16ToFloat32.cpp + ../../../third_party/angle/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/src/common/Float16ToFloat32.cpp
-FILE: ../../../third_party/angle/src/common/event_tracer.cpp
-FILE: ../../../third_party/angle/src/common/event_tracer.h
-FILE: ../../../third_party/angle/src/compiler/preprocessor/DiagnosticsBase.cpp
-FILE: ../../../third_party/angle/src/compiler/preprocessor/DiagnosticsBase.h
-FILE: ../../../third_party/angle/src/compiler/preprocessor/DirectiveHandlerBase.cpp
-FILE: ../../../third_party/angle/src/compiler/preprocessor/DirectiveHandlerBase.h
-FILE: ../../../third_party/angle/src/compiler/preprocessor/DirectiveParser.h
-FILE: ../../../third_party/angle/src/compiler/preprocessor/ExpressionParser.h
-FILE: ../../../third_party/angle/src/compiler/preprocessor/Lexer.cpp
-FILE: ../../../third_party/angle/src/compiler/preprocessor/Lexer.h
-FILE: ../../../third_party/angle/src/compiler/preprocessor/Macro.h
-FILE: ../../../third_party/angle/src/compiler/preprocessor/MacroExpander.h
-FILE: ../../../third_party/angle/src/compiler/preprocessor/SourceLocation.h
-FILE: ../../../third_party/angle/src/compiler/preprocessor/Tokenizer.h
-FILE: ../../../third_party/angle/src/compiler/preprocessor/numeric_lex.h
-FILE: ../../../third_party/angle/src/compiler/preprocessor/preprocessor.y
-FILE: ../../../third_party/angle/src/compiler/translator/Diagnostics.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/Diagnostics.h
-FILE: ../../../third_party/angle/src/compiler/translator/DirectiveHandler.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/DirectiveHandler.h
-FILE: ../../../third_party/angle/src/compiler/translator/Pragma.h
-FILE: ../../../third_party/angle/src/libANGLE/BinaryStream.h
-FILE: ../../../third_party/angle/src/libANGLE/Query.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Query.h
-FILE: ../../../third_party/angle/src/libANGLE/angletypes.h
-FILE: ../../../third_party/angle/src/libANGLE/angletypes.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/RenderTargetD3D.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/RenderTargetD3D.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/ShaderExecutableD3D.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/ShaderExecutableD3D.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/SwapChainD3D.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/Image11.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/Image11.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/IndexBuffer11.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/IndexBuffer11.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/RenderStateCache.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/RenderStateCache.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/RenderTarget11.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/RenderTarget11.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/ShaderExecutable11.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/ShaderExecutable11.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/SwapChain11.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/TextureStorage11.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/RenderTarget9.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/RenderTarget9.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/Renderer9.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/ShaderCache.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/ShaderExecutable9.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/ShaderExecutable9.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/SwapChain9.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/SwapChain9.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/TextureStorage9.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/TextureStorage9.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/shaders/Blit.ps
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/shaders/Blit.vs
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/renderergl_utils.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/renderergl_utils.h
-----------------------------------------------------------------------------------------------------
-Copyright 2012 The ANGLE Project Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-    Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.
-
-    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
-    Ltd., nor the names of their contributors may be used to endorse
-    or promote products derived from this software without specific
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: double-conversion
-LIBRARY: icu
-ORIGIN: ../../../third_party/dart/runtime/third_party/double-conversion/src/double-conversion.h
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/dart/runtime/third_party/double-conversion/src/double-conversion.h
-FILE: ../../../third_party/dart/runtime/third_party/double-conversion/src/fast-dtoa.cc
-FILE: ../../../third_party/dart/runtime/third_party/double-conversion/src/ieee.h
-FILE: ../../../third_party/icu/source/i18n/double-conversion-double-to-string.h
-FILE: ../../../third_party/icu/source/i18n/double-conversion-fast-dtoa.cpp
-FILE: ../../../third_party/icu/source/i18n/double-conversion-ieee.h
-FILE: ../../../third_party/icu/source/i18n/double-conversion-string-to-double.h
-FILE: ../../../third_party/icu/source/i18n/double-conversion.h
-----------------------------------------------------------------------------------------------------
-Copyright 2012 the V8 project authors. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google Inc. nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: dart
-ORIGIN: ../../../third_party/dart/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/dart/.gitconfig
-FILE: ../../../third_party/dart/.style.yapf
-FILE: ../../../third_party/dart/.vpython
-FILE: ../../../third_party/dart/PATENT_GRANT
-FILE: ../../../third_party/dart/runtime/.clang-tidy
-FILE: ../../../third_party/dart/runtime/CPPLINT.cfg
-FILE: ../../../third_party/dart/runtime/bin/ffi_test/clobber_arm.S
-FILE: ../../../third_party/dart/runtime/bin/ffi_test/clobber_arm64.S
-FILE: ../../../third_party/dart/runtime/bin/ffi_test/clobber_riscv32.S
-FILE: ../../../third_party/dart/runtime/bin/ffi_test/clobber_riscv64.S
-FILE: ../../../third_party/dart/runtime/bin/ffi_test/clobber_x64.S
-FILE: ../../../third_party/dart/runtime/bin/ffi_test/clobber_x64_win.S
-FILE: ../../../third_party/dart/runtime/bin/ffi_test/clobber_x86.S
-FILE: ../../../third_party/dart/runtime/bin/ffi_test/ffi_test_functions_helpers.S
-FILE: ../../../third_party/dart/runtime/docs/compiler/images/catch-block-entry-0.png
-FILE: ../../../third_party/dart/runtime/docs/compiler/images/catch-block-entry-1.png
-FILE: ../../../third_party/dart/runtime/docs/images/aot-ic-dictionary.png
-FILE: ../../../third_party/dart/runtime/docs/images/aot-ic-linear.png
-FILE: ../../../third_party/dart/runtime/docs/images/aot-ic-monomorphic.png
-FILE: ../../../third_party/dart/runtime/docs/images/aot-ic-singletarget.png
-FILE: ../../../third_party/dart/runtime/docs/images/aot-ic-unlinked.png
-FILE: ../../../third_party/dart/runtime/docs/images/aot.png
-FILE: ../../../third_party/dart/runtime/docs/images/dart-to-kernel.png
-FILE: ../../../third_party/dart/runtime/docs/images/flutter-cfe.png
-FILE: ../../../third_party/dart/runtime/docs/images/images.graffle!images
-FILE: ../../../third_party/dart/runtime/docs/images/inline-cache-1.png
-FILE: ../../../third_party/dart/runtime/docs/images/isolates.png
-FILE: ../../../third_party/dart/runtime/docs/images/kernel-loaded-1.png
-FILE: ../../../third_party/dart/runtime/docs/images/kernel-loaded-2.png
-FILE: ../../../third_party/dart/runtime/docs/images/kernel-service.png
-FILE: ../../../third_party/dart/runtime/docs/images/optimizing-compilation.png
-FILE: ../../../third_party/dart/runtime/docs/images/raw-function-lazy-compile.png
-FILE: ../../../third_party/dart/runtime/docs/images/snapshot-appjit.png
-FILE: ../../../third_party/dart/runtime/docs/images/snapshot-with-code.png
-FILE: ../../../third_party/dart/runtime/docs/images/snapshot.png
-FILE: ../../../third_party/dart/runtime/docs/images/unoptimized-compilation.png
-FILE: ../../../third_party/dart/runtime/docs/infra/images/isolated-out-browser.png
-FILE: ../../../third_party/dart/runtime/docs/infra/images/isolated-out-link.png
-FILE: ../../../third_party/dart/runtime/observatory/lib/elements.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/img/chromium_icon.png
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/img/dart_icon.png
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/img/isolate_icon.png
-FILE: ../../../third_party/dart/runtime/observatory/web/favicon.ico
-FILE: ../../../third_party/dart/runtime/observatory/web/index.html
-FILE: ../../../third_party/dart/runtime/observatory/web/third_party/trace_viewer_full.html
-FILE: ../../../third_party/dart/runtime/observatory/web/timeline.html
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/elements.dart
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/img/chromium_icon.png
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/img/dart_icon.png
-FILE: ../../../third_party/dart/runtime/observatory_2/lib/src/elements/img/isolate_icon.png
-FILE: ../../../third_party/dart/runtime/observatory_2/web/favicon.ico
-FILE: ../../../third_party/dart/runtime/observatory_2/web/index.html
-FILE: ../../../third_party/dart/runtime/observatory_2/web/third_party/trace_viewer_full.html
-FILE: ../../../third_party/dart/runtime/observatory_2/web/timeline.html
-FILE: ../../../third_party/dart/runtime/tools/wiki/styles/style.scss
-FILE: ../../../third_party/dart/runtime/tools/wiki/templates/includes/auto-refresh.html
-FILE: ../../../third_party/dart/runtime/tools/wiki/templates/includes/favicon.html
-FILE: ../../../third_party/dart/runtime/tools/wiki/templates/page.html
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/doublex20/arm64_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/doublex20/arm64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/doublex20/arm64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/doublex20/arm64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/doublex20/arm64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/doublex20/arm_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/doublex20/arm_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/doublex20/arm_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/doublex20/ia32_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/doublex20/ia32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/doublex20/ia32_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/doublex20/riscv32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/doublex20/riscv64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/doublex20/x64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/doublex20/x64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/doublex20/x64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/doublex20/x64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/doublex20/x64_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/floatx20/arm64_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/floatx20/arm64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/floatx20/arm64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/floatx20/arm64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/floatx20/arm64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/floatx20/arm_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/floatx20/arm_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/floatx20/arm_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/floatx20/ia32_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/floatx20/ia32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/floatx20/ia32_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/floatx20/riscv32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/floatx20/riscv64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/floatx20/x64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/floatx20/x64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/floatx20/x64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/floatx20/x64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/floatx20/x64_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/int8x10/arm64_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/int8x10/arm64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/int8x10/arm64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/int8x10/arm64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/int8x10/arm64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/int8x10/arm_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/int8x10/arm_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/int8x10/arm_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/int8x10/ia32_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/int8x10/ia32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/int8x10/ia32_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/int8x10/riscv32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/int8x10/riscv64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/int8x10/x64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/int8x10/x64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/int8x10/x64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/int8x10/x64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/int8x10/x64_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/mixedx20/arm64_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/mixedx20/arm64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/mixedx20/arm64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/mixedx20/arm64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/mixedx20/arm64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/mixedx20/arm_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/mixedx20/arm_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/mixedx20/arm_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/mixedx20/ia32_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/mixedx20/ia32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/mixedx20/ia32_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/mixedx20/riscv32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/mixedx20/riscv64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/mixedx20/x64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/mixedx20/x64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/mixedx20/x64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/mixedx20/x64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/mixedx20/x64_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress46127/arm64_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress46127/arm64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress46127/arm64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress46127/arm64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress46127/arm64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress46127/arm_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress46127/arm_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress46127/arm_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress46127/ia32_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress46127/ia32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress46127/ia32_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress46127/riscv32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress46127/riscv64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress46127/x64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress46127/x64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress46127/x64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress46127/x64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress46127/x64_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress_fuchsia105336/arm64_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress_fuchsia105336/arm64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress_fuchsia105336/arm64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress_fuchsia105336/arm64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress_fuchsia105336/arm64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress_fuchsia105336/arm_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress_fuchsia105336/arm_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress_fuchsia105336/arm_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress_fuchsia105336/ia32_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress_fuchsia105336/ia32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress_fuchsia105336/ia32_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress_fuchsia105336/riscv32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress_fuchsia105336/riscv64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress_fuchsia105336/x64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress_fuchsia105336/x64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress_fuchsia105336/x64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress_fuchsia105336/x64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/regress_fuchsia105336/x64_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct128bytesx1/arm64_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct128bytesx1/arm64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct128bytesx1/arm64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct128bytesx1/arm64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct128bytesx1/arm64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct128bytesx1/arm_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct128bytesx1/arm_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct128bytesx1/arm_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct128bytesx1/ia32_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct128bytesx1/ia32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct128bytesx1/ia32_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct128bytesx1/riscv32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct128bytesx1/riscv64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct128bytesx1/x64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct128bytesx1/x64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct128bytesx1/x64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct128bytesx1/x64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct128bytesx1/x64_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct12bytesFloatx6/arm64_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct12bytesFloatx6/arm64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct12bytesFloatx6/arm64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct12bytesFloatx6/arm64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct12bytesFloatx6/arm64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct12bytesFloatx6/arm_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct12bytesFloatx6/arm_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct12bytesFloatx6/arm_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct12bytesFloatx6/ia32_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct12bytesFloatx6/ia32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct12bytesFloatx6/ia32_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct12bytesFloatx6/riscv32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct12bytesFloatx6/riscv64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct12bytesFloatx6/x64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct12bytesFloatx6/x64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct12bytesFloatx6/x64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct12bytesFloatx6/x64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct12bytesFloatx6/x64_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct16bytesHomogenousx10/arm64_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct16bytesHomogenousx10/arm64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct16bytesHomogenousx10/arm64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct16bytesHomogenousx10/arm64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct16bytesHomogenousx10/arm64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct16bytesHomogenousx10/arm_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct16bytesHomogenousx10/arm_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct16bytesHomogenousx10/arm_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct16bytesHomogenousx10/ia32_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct16bytesHomogenousx10/ia32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct16bytesHomogenousx10/ia32_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct16bytesHomogenousx10/riscv32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct16bytesHomogenousx10/riscv64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct16bytesHomogenousx10/x64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct16bytesHomogenousx10/x64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct16bytesHomogenousx10/x64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct16bytesHomogenousx10/x64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct16bytesHomogenousx10/x64_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct16bytesMixedx10/x64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct16bytesMixedx10/x64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct16bytesMixedx10/x64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct16bytesMixedx10/x64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct16bytesMixedx10/x64_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct16bytesMixedx10_2/x64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct16bytesMixedx10_2/x64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct16bytesMixedx10_2/x64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct16bytesMixedx10_2/x64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct16bytesMixedx10_2/x64_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct16bytesMixedx10_3/x64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct16bytesMixedx10_3/x64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct16bytesMixedx10_3/x64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct16bytesMixedx10_3/x64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct16bytesMixedx10_3/x64_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct3bytesx10/arm64_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct3bytesx10/arm64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct3bytesx10/arm64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct3bytesx10/arm64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct3bytesx10/arm64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct3bytesx10/arm_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct3bytesx10/arm_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct3bytesx10/arm_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct3bytesx10/ia32_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct3bytesx10/ia32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct3bytesx10/ia32_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct3bytesx10/riscv32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct3bytesx10/riscv64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct3bytesx10/x64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct3bytesx10/x64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct3bytesx10/x64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct3bytesx10/x64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct3bytesx10/x64_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesPackedx10/arm64_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesPackedx10/arm64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesPackedx10/arm64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesPackedx10/arm64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesPackedx10/arm64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesPackedx10/arm_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesPackedx10/arm_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesPackedx10/arm_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesPackedx10/ia32_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesPackedx10/ia32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesPackedx10/ia32_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesPackedx10/riscv32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesPackedx10/riscv64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesPackedx10/x64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesPackedx10/x64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesPackedx10/x64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesPackedx10/x64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesPackedx10/x64_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesx1/arm64_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesx1/arm64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesx1/arm64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesx1/arm64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesx1/arm64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesx1/arm_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesx1/arm_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesx1/arm_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesx1/ia32_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesx1/ia32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesx1/ia32_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesx1/riscv32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesx1/riscv64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesx1/x64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesx1/x64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesx1/x64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesx1/x64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct8bytesx1/x64_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/structPacked/arm64_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/structPacked/arm64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/structPacked/arm64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/structPacked/arm64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/structPacked/arm64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/structPacked/arm_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/structPacked/arm_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/structPacked/arm_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/structPacked/ia32_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/structPacked/ia32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/structPacked/ia32_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/structPacked/riscv32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/structPacked/riscv64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/structPacked/x64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/structPacked/x64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/structPacked/x64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/structPacked/x64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/structPacked/x64_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_VeryLargeStruct/arm64_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_VeryLargeStruct/arm64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_VeryLargeStruct/arm64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_VeryLargeStruct/arm64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_VeryLargeStruct/arm64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_VeryLargeStruct/arm_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_VeryLargeStruct/arm_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_VeryLargeStruct/arm_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_VeryLargeStruct/ia32_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_VeryLargeStruct/ia32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_VeryLargeStruct/ia32_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_VeryLargeStruct/riscv32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_VeryLargeStruct/riscv64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_VeryLargeStruct/x64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_VeryLargeStruct/x64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_VeryLargeStruct/x64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_VeryLargeStruct/x64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_VeryLargeStruct/x64_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatarray/arm64_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatarray/arm64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatarray/arm64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatarray/arm64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatarray/arm64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatarray/arm_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatarray/arm_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatarray/arm_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatarray/ia32_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatarray/ia32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatarray/ia32_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatarray/riscv32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatarray/riscv64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatarray/x64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatarray/x64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatarray/x64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatarray/x64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatarray/x64_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatx4/arm64_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatx4/arm64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatx4/arm64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatx4/arm64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatx4/arm64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatx4/arm_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatx4/arm_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatx4/arm_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatx4/ia32_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatx4/ia32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatx4/ia32_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatx4/riscv32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatx4/riscv64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatx4/x64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatx4/x64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatx4/x64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatx4/x64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_floatx4/x64_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8array/arm64_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8array/arm64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8array/arm64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8array/arm64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8array/arm64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8array/arm_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8array/arm_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8array/arm_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8array/ia32_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8array/ia32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8array/ia32_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8array/riscv32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8array/riscv64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8array/x64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8array/x64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8array/x64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8array/x64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8array/x64_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8x10/arm64_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8x10/arm64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8x10/arm64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8x10/arm64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8x10/arm64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8x10/arm_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8x10/arm_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8x10/arm_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8x10/ia32_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8x10/ia32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8x10/ia32_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8x10/riscv32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8x10/riscv64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8x10/x64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8x10/x64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8x10/x64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8x10/x64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/struct_int8x10/x64_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union16bytesHomogenousx10/arm64_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union16bytesHomogenousx10/arm64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union16bytesHomogenousx10/arm64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union16bytesHomogenousx10/arm64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union16bytesHomogenousx10/arm64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union16bytesHomogenousx10/arm_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union16bytesHomogenousx10/arm_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union16bytesHomogenousx10/arm_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union16bytesHomogenousx10/ia32_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union16bytesHomogenousx10/ia32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union16bytesHomogenousx10/ia32_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union16bytesHomogenousx10/riscv32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union16bytesHomogenousx10/riscv64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union16bytesHomogenousx10/x64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union16bytesHomogenousx10/x64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union16bytesHomogenousx10/x64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union16bytesHomogenousx10/x64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union16bytesHomogenousx10/x64_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union5bytesPackedx10/arm64_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union5bytesPackedx10/arm64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union5bytesPackedx10/arm64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union5bytesPackedx10/arm64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union5bytesPackedx10/arm64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union5bytesPackedx10/arm_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union5bytesPackedx10/arm_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union5bytesPackedx10/arm_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union5bytesPackedx10/ia32_android.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union5bytesPackedx10/ia32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union5bytesPackedx10/ia32_win.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union5bytesPackedx10/riscv32_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union5bytesPackedx10/riscv64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union5bytesPackedx10/x64_fuchsia.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union5bytesPackedx10/x64_ios.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union5bytesPackedx10/x64_linux.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union5bytesPackedx10/x64_macos.expect
-FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/unit_tests/union5bytesPackedx10/x64_win.expect
-FILE: ../../../third_party/dart/samples/ffi/sqlite/docs/lib/scenario-default.svg
-FILE: ../../../third_party/dart/samples/ffi/sqlite/docs/lib/scenario-full.svg
-FILE: ../../../third_party/dart/sdk/lib/_internal/allowed_experiments.json
-FILE: ../../../third_party/dart/sdk/lib/html/html_common/conversions_dart2js.dart
-FILE: ../../../third_party/dart/sdk/lib/html/html_common/html_common.dart
-FILE: ../../../third_party/dart/sdk/lib/libraries.json
-FILE: ../../../third_party/dart/sdk/lib/vmservice_libraries.json
-FILE: ../../../third_party/dart/sdk/version
-FILE: ../../../third_party/dart/third_party/clang.tar.gz.sha1
-----------------------------------------------------------------------------------------------------
-Copyright 2012, the Dart project authors.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google LLC nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/ios-arm/crypto/fipsmodule/bsaes-armv7.S + ../../../third_party/boringssl/src/LICENSE
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/boringssl/ios-arm/crypto/fipsmodule/bsaes-armv7.S
-FILE: ../../../third_party/boringssl/linux-arm/crypto/fipsmodule/bsaes-armv7.S
-----------------------------------------------------------------------------------------------------
-Copyright 2012-2016 The OpenSSL Project Authors. All Rights Reserved.
-
-Licensed under the OpenSSL license (the "License").  You may not use
-this file except in compliance with the License.  You can obtain a copy
-in the file LICENSE in the source distribution or at
-https://www.openssl.org/source/license.html
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libwebp
-ORIGIN: ../../../third_party/libwebp/imageio/wicdec.c + ../../../third_party/libwebp/COPYING
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/libwebp/imageio/wicdec.c
-FILE: ../../../third_party/libwebp/imageio/wicdec.h
-FILE: ../../../third_party/libwebp/src/dec/alphai_dec.h
-FILE: ../../../third_party/libwebp/src/dsp/alpha_processing.c
-FILE: ../../../third_party/libwebp/src/utils/quant_levels_dec_utils.c
-FILE: ../../../third_party/libwebp/src/utils/quant_levels_dec_utils.h
-FILE: ../../../third_party/libwebp/src/utils/random_utils.c
-FILE: ../../../third_party/libwebp/src/utils/random_utils.h
-----------------------------------------------------------------------------------------------------
-Copyright 2013 Google Inc. All Rights Reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-  * Neither the name of Google nor the names of its contributors may
-    be used to endorse or promote products derived from this software
-    without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: angle
-ORIGIN: ../../../third_party/angle/include/GLSLANG/ShaderVars.h + ../../../third_party/angle/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/include/GLSLANG/ShaderVars.h
-FILE: ../../../third_party/angle/samples/sample_util/SampleApplication.cpp
-FILE: ../../../third_party/angle/src/common/mathutil.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/CodeGen.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/FlagStd140Structs.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/FlagStd140Structs.h
-FILE: ../../../third_party/angle/src/compiler/translator/ValidateOutputs.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/ValidateOutputs.h
-FILE: ../../../third_party/angle/src/compiler/translator/blocklayout.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/blocklayout.h
-FILE: ../../../third_party/angle/src/compiler/translator/blocklayoutHLSL.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/blocklayoutHLSL.h
-FILE: ../../../third_party/angle/src/gpu_info_util/SystemInfo.cpp
-FILE: ../../../third_party/angle/src/gpu_info_util/SystemInfo.h
-FILE: ../../../third_party/angle/src/gpu_info_util/SystemInfo_internal.h
-FILE: ../../../third_party/angle/src/gpu_info_util/SystemInfo_libpci.cpp
-FILE: ../../../third_party/angle/src/gpu_info_util/SystemInfo_linux.cpp
-FILE: ../../../third_party/angle/src/gpu_info_util/SystemInfo_win.cpp
-FILE: ../../../third_party/angle/src/gpu_info_util/SystemInfo_x11.cpp
-FILE: ../../../third_party/angle/src/image_util/copyimage.cpp
-FILE: ../../../third_party/angle/src/image_util/copyimage.h
-FILE: ../../../third_party/angle/src/image_util/imageformats.h
-FILE: ../../../third_party/angle/src/image_util/loadimage.cpp
-FILE: ../../../third_party/angle/src/image_util/loadimage.h
-FILE: ../../../third_party/angle/src/image_util/loadimage_etc.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Constants.h
-FILE: ../../../third_party/angle/src/libANGLE/IndexRangeCache.cpp
-FILE: ../../../third_party/angle/src/libANGLE/IndexRangeCache.h
-FILE: ../../../third_party/angle/src/libANGLE/Sampler.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Sampler.h
-FILE: ../../../third_party/angle/src/libANGLE/VertexArray.cpp
-FILE: ../../../third_party/angle/src/libANGLE/VertexArray.h
-FILE: ../../../third_party/angle/src/libANGLE/VertexAttribute.h
-FILE: ../../../third_party/angle/src/libANGLE/angletypes.cpp
-FILE: ../../../third_party/angle/src/libANGLE/formatutils.cpp
-FILE: ../../../third_party/angle/src/libANGLE/formatutils.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/QueryImpl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/copyvertex.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/Blit11.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/Blit11.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/Clear11.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/Clear11.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/Fence11.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/Fence11.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/Query11.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/Query11.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/formatutils11.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/formatutils11.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/Fence9.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/Fence9.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/Query9.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/Query9.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/formatutils9.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/formatutils9.h
-FILE: ../../../third_party/angle/src/libANGLE/validationES.cpp
-FILE: ../../../third_party/angle/src/libANGLE/validationES.h
-FILE: ../../../third_party/angle/src/libANGLE/validationES2.cpp
-FILE: ../../../third_party/angle/src/libANGLE/validationES3.cpp
-FILE: ../../../third_party/angle/util/EGLWindow.cpp
-----------------------------------------------------------------------------------------------------
-Copyright 2013 The ANGLE Project Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-    Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.
-
-    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
-    Ltd., nor the names of their contributors may be used to endorse
-    or promote products derived from this software without specific
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/rsaz_exp.c + ../../../third_party/boringssl/src/LICENSE
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/rsaz_exp.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/rsaz_exp.h
-----------------------------------------------------------------------------------------------------
-Copyright 2013-2016 The OpenSSL Project Authors. All Rights Reserved.
-Copyright (c) 2012, Intel Corporation. All Rights Reserved.
-
-Licensed under the OpenSSL license (the "License").  You may not use
-this file except in compliance with the License.  You can obtain a copy
-in the file LICENSE in the source distribution or at
-https://www.openssl.org/source/license.html
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libwebp
-ORIGIN: ../../../third_party/libwebp/imageio/webpdec.c + ../../../third_party/libwebp/COPYING
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/libwebp/imageio/webpdec.c
-FILE: ../../../third_party/libwebp/imageio/webpdec.h
-FILE: ../../../third_party/libwebp/src/dsp/alpha_processing_mips_dsp_r2.c
-FILE: ../../../third_party/libwebp/src/dsp/alpha_processing_sse2.c
-FILE: ../../../third_party/libwebp/src/dsp/cost.c
-FILE: ../../../third_party/libwebp/src/dsp/cost_mips32.c
-FILE: ../../../third_party/libwebp/src/dsp/cost_mips_dsp_r2.c
-FILE: ../../../third_party/libwebp/src/dsp/dec_clip_tables.c
-FILE: ../../../third_party/libwebp/src/dsp/dec_mips32.c
-FILE: ../../../third_party/libwebp/src/dsp/dec_mips_dsp_r2.c
-FILE: ../../../third_party/libwebp/src/dsp/enc_mips32.c
-FILE: ../../../third_party/libwebp/src/dsp/enc_mips_dsp_r2.c
-FILE: ../../../third_party/libwebp/src/dsp/filters_mips_dsp_r2.c
-FILE: ../../../third_party/libwebp/src/dsp/lossless_mips_dsp_r2.c
-FILE: ../../../third_party/libwebp/src/dsp/lossless_neon.c
-FILE: ../../../third_party/libwebp/src/dsp/lossless_sse2.c
-FILE: ../../../third_party/libwebp/src/dsp/mips_macro.h
-FILE: ../../../third_party/libwebp/src/dsp/neon.h
-FILE: ../../../third_party/libwebp/src/dsp/rescaler.c
-FILE: ../../../third_party/libwebp/src/dsp/rescaler_mips32.c
-FILE: ../../../third_party/libwebp/src/dsp/rescaler_mips_dsp_r2.c
-FILE: ../../../third_party/libwebp/src/dsp/upsampling_mips_dsp_r2.c
-FILE: ../../../third_party/libwebp/src/dsp/yuv_mips32.c
-FILE: ../../../third_party/libwebp/src/dsp/yuv_mips_dsp_r2.c
-FILE: ../../../third_party/libwebp/src/dsp/yuv_sse2.c
-FILE: ../../../third_party/libwebp/src/dsp/yuv_sse41.c
-FILE: ../../../third_party/libwebp/src/enc/near_lossless_enc.c
-FILE: ../../../third_party/libwebp/src/enc/picture_csp_enc.c
-FILE: ../../../third_party/libwebp/src/enc/picture_psnr_enc.c
-FILE: ../../../third_party/libwebp/src/enc/picture_rescale_enc.c
-FILE: ../../../third_party/libwebp/src/enc/picture_tools_enc.c
-FILE: ../../../third_party/libwebp/src/mux/anim_encode.c
-FILE: ../../../third_party/libwebp/src/utils/bit_reader_inl_utils.h
-FILE: ../../../third_party/libwebp/src/utils/endian_inl_utils.h
-----------------------------------------------------------------------------------------------------
-Copyright 2014 Google Inc. All Rights Reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-  * Neither the name of Google nor the names of its contributors may
-    be used to endorse or promote products derived from this software
-    without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: angle
-ORIGIN: ../../../third_party/angle/include/angle_gl.h + ../../../third_party/angle/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/include/angle_gl.h
-FILE: ../../../third_party/angle/include/angle_windowsstore.h
-FILE: ../../../third_party/angle/include/export.h
-FILE: ../../../third_party/angle/samples/hello_triangle/HelloTriangle.cpp
-FILE: ../../../third_party/angle/samples/mip_map_2d/MipMap2D.cpp
-FILE: ../../../third_party/angle/samples/multi_texture/MultiTexture.cpp
-FILE: ../../../third_party/angle/samples/multiple_draw_buffers/MultipleDrawBuffers.cpp
-FILE: ../../../third_party/angle/samples/particle_system/ParticleSystem.cpp
-FILE: ../../../third_party/angle/samples/post_sub_buffer/PostSubBuffer.cpp
-FILE: ../../../third_party/angle/samples/sample_util/SampleApplication.h
-FILE: ../../../third_party/angle/samples/sample_util/texture_utils.cpp
-FILE: ../../../third_party/angle/samples/sample_util/texture_utils.h
-FILE: ../../../third_party/angle/samples/sample_util/tga_utils.cpp
-FILE: ../../../third_party/angle/samples/sample_util/tga_utils.h
-FILE: ../../../third_party/angle/samples/simple_instancing/SimpleInstancing.cpp
-FILE: ../../../third_party/angle/samples/simple_texture_2d/SimpleTexture2D.cpp
-FILE: ../../../third_party/angle/samples/simple_texture_cubemap/SimpleTextureCubemap.cpp
-FILE: ../../../third_party/angle/samples/simple_vertex_shader/SimpleVertexShader.cpp
-FILE: ../../../third_party/angle/samples/stencil_operations/StencilOperations.cpp
-FILE: ../../../third_party/angle/samples/tex_redef_microbench/TexRedefMicroBench.cpp
-FILE: ../../../third_party/angle/samples/texture_wrap/TextureWrap.cpp
-FILE: ../../../third_party/angle/samples/tri_fan_microbench/TriFanMicroBench.cpp
-FILE: ../../../third_party/angle/src/common/MemoryBuffer.cpp
-FILE: ../../../third_party/angle/src/common/MemoryBuffer.h
-FILE: ../../../third_party/angle/src/common/angle_version.h
-FILE: ../../../third_party/angle/src/common/angleutils.cpp
-FILE: ../../../third_party/angle/src/common/platform.h
-FILE: ../../../third_party/angle/src/common/system_utils.h
-FILE: ../../../third_party/angle/src/common/system_utils_win.cpp
-FILE: ../../../third_party/angle/src/common/tls.cpp
-FILE: ../../../third_party/angle/src/common/tls.h
-FILE: ../../../third_party/angle/src/compiler/translator/BuiltInFunctionEmulatorHLSL.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/BuiltInFunctionEmulatorHLSL.h
-FILE: ../../../third_party/angle/src/compiler/translator/ResourcesHLSL.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/ResourcesHLSL.h
-FILE: ../../../third_party/angle/src/compiler/translator/ShaderVars.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/StructureHLSL.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/StructureHLSL.h
-FILE: ../../../third_party/angle/src/compiler/translator/UtilsHLSL.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/UtilsHLSL.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/RewriteElseBlocks.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/RewriteElseBlocks.h
-FILE: ../../../third_party/angle/src/image_util/copyimage.inc
-FILE: ../../../third_party/angle/src/image_util/loadimage.inc
-FILE: ../../../third_party/angle/src/libANGLE/AttributeMap.cpp
-FILE: ../../../third_party/angle/src/libANGLE/AttributeMap.h
-FILE: ../../../third_party/angle/src/libANGLE/Caps.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Caps.h
-FILE: ../../../third_party/angle/src/libANGLE/Compiler.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Compiler.h
-FILE: ../../../third_party/angle/src/libANGLE/Config_unittest.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Error.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Error.h
-FILE: ../../../third_party/angle/src/libANGLE/Error.inc
-FILE: ../../../third_party/angle/src/libANGLE/Fence_unittest.cpp
-FILE: ../../../third_party/angle/src/libANGLE/FramebufferAttachment.cpp
-FILE: ../../../third_party/angle/src/libANGLE/FramebufferAttachment.h
-FILE: ../../../third_party/angle/src/libANGLE/ImageIndex.cpp
-FILE: ../../../third_party/angle/src/libANGLE/ImageIndex.h
-FILE: ../../../third_party/angle/src/libANGLE/ImageIndexIterator_unittest.cpp
-FILE: ../../../third_party/angle/src/libANGLE/State.cpp
-FILE: ../../../third_party/angle/src/libANGLE/State.h
-FILE: ../../../third_party/angle/src/libANGLE/Surface_unittest.cpp
-FILE: ../../../third_party/angle/src/libANGLE/TransformFeedback.cpp
-FILE: ../../../third_party/angle/src/libANGLE/TransformFeedback.h
-FILE: ../../../third_party/angle/src/libANGLE/TransformFeedback_unittest.cpp
-FILE: ../../../third_party/angle/src/libANGLE/VertexAttribute.cpp
-FILE: ../../../third_party/angle/src/libANGLE/features.h
-FILE: ../../../third_party/angle/src/libANGLE/queryconversions.cpp
-FILE: ../../../third_party/angle/src/libANGLE/queryconversions.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/BufferImpl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/CompilerImpl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/DisplayImpl.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/DisplayImpl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/FramebufferImpl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/ProgramImpl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/RenderbufferImpl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/SamplerImpl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/ShaderImpl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/SurfaceImpl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/TextureImpl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/TransformFeedbackImpl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/VertexArrayImpl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/copyvertex.inc.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/BufferD3D.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/BufferD3D.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/CompilerD3D.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/DisplayD3D.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/DisplayD3D.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/DynamicHLSL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/DynamicHLSL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/FramebufferD3D.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/FramebufferD3D.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/HLSLCompiler.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/ProgramD3D.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/ProgramD3D.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/RenderbufferD3D.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/RenderbufferD3D.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/RendererD3D.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/RendererD3D.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/SamplerD3D.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/ShaderD3D.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/ShaderD3D.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/SurfaceD3D.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/SurfaceD3D.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/TextureD3D.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/TextureD3D.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/Buffer11.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/Buffer11.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/Framebuffer11.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/Framebuffer11.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/TransformFeedback11.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/TransformFeedback11.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/Trim11.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/Trim11.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/VertexArray11.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow_unittest.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow_unittest.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/Buffer9.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/Buffer9.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/Framebuffer9.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/Framebuffer9.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/VertexArray9.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/SamplerGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/SamplerGL.h
-FILE: ../../../third_party/angle/src/libGLESv2/global_state.cpp
-FILE: ../../../third_party/angle/src/libGLESv2/global_state.h
-FILE: ../../../third_party/angle/util/EGLWindow.h
-FILE: ../../../third_party/angle/util/Event.h
-FILE: ../../../third_party/angle/util/Matrix.cpp
-FILE: ../../../third_party/angle/util/Matrix.h
-FILE: ../../../third_party/angle/util/OSWindow.cpp
-FILE: ../../../third_party/angle/util/OSWindow.h
-FILE: ../../../third_party/angle/util/com_utils.h
-FILE: ../../../third_party/angle/util/geometry_utils.cpp
-FILE: ../../../third_party/angle/util/geometry_utils.h
-FILE: ../../../third_party/angle/util/keyboard.h
-FILE: ../../../third_party/angle/util/mouse.h
-FILE: ../../../third_party/angle/util/random_utils.cpp
-FILE: ../../../third_party/angle/util/random_utils.h
-FILE: ../../../third_party/angle/util/shader_utils.cpp
-FILE: ../../../third_party/angle/util/shader_utils.h
-FILE: ../../../third_party/angle/util/test_utils.h
-FILE: ../../../third_party/angle/util/windows/test_utils_win.cpp
-FILE: ../../../third_party/angle/util/windows/win32/Win32Window.cpp
-FILE: ../../../third_party/angle/util/windows/win32/Win32Window.h
-FILE: ../../../third_party/angle/util/windows/win32/test_utils_win32.cpp
-----------------------------------------------------------------------------------------------------
-Copyright 2014 The ANGLE Project Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-    Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.
-
-    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
-    Ltd., nor the names of their contributors may be used to endorse
-    or promote products derived from this software without specific
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: base
-LIBRARY: icu
-LIBRARY: zlib
-ORIGIN: ../../../LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/src/common/third_party/base/anglebase/numerics/safe_conversions.h
-FILE: ../../../third_party/angle/src/common/third_party/base/anglebase/numerics/safe_conversions_impl.h
-FILE: ../../../third_party/icu/icu.isolate
-FILE: ../../../third_party/zlib/google/compression_utils.cc
-FILE: ../../../third_party/zlib/google/compression_utils.h
-FILE: ../../../third_party/zlib/google/compression_utils_unittest.cc
-----------------------------------------------------------------------------------------------------
-Copyright 2014 The Chromium Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/ios-aarch64/crypto/fipsmodule/sha256-armv8.S + ../../../third_party/boringssl/src/LICENSE
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/boringssl/ios-aarch64/crypto/fipsmodule/sha256-armv8.S
-FILE: ../../../third_party/boringssl/ios-aarch64/crypto/fipsmodule/sha512-armv8.S
-FILE: ../../../third_party/boringssl/linux-aarch64/crypto/fipsmodule/sha256-armv8.S
-FILE: ../../../third_party/boringssl/linux-aarch64/crypto/fipsmodule/sha512-armv8.S
-FILE: ../../../third_party/boringssl/win-aarch64/crypto/fipsmodule/sha256-armv8.S
-FILE: ../../../third_party/boringssl/win-aarch64/crypto/fipsmodule/sha512-armv8.S
-----------------------------------------------------------------------------------------------------
-Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved.
-
-Licensed under the OpenSSL license (the "License").  You may not use
-this file except in compliance with the License.  You can obtain a copy
-in the file LICENSE in the source distribution or at
-https://www.openssl.org/source/license.html
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/p256-x86_64.c + ../../../third_party/boringssl/src/LICENSE
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/p256-x86_64.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/p256-x86_64.h
-----------------------------------------------------------------------------------------------------
-Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved.
-Copyright (c) 2014, Intel Corporation. All Rights Reserved.
-
-Licensed under the OpenSSL license (the "License").  You may not use
-this file except in compliance with the License.  You can obtain a copy
-in the file LICENSE in the source distribution or at
-https://www.openssl.org/source/license.html
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/make_tables.go + ../../../third_party/boringssl/src/LICENSE
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/make_tables.go
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/p256-x86_64-table.h
-----------------------------------------------------------------------------------------------------
-Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved.
-Copyright (c) 2015, Intel Inc.
-
-Licensed under the OpenSSL license (the "License").  You may not use
-this file except in compliance with the License.  You can obtain a copy
-in the file LICENSE in the source distribution or at
-https://www.openssl.org/source/license.html
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libwebp
-ORIGIN: ../../../third_party/libwebp/extras/extras.c + ../../../third_party/libwebp/COPYING
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/libwebp/extras/extras.c
-FILE: ../../../third_party/libwebp/extras/extras.h
-FILE: ../../../third_party/libwebp/src/dec/common_dec.h
-FILE: ../../../third_party/libwebp/src/demux/anim_decode.c
-FILE: ../../../third_party/libwebp/src/dsp/alpha_processing_sse41.c
-FILE: ../../../third_party/libwebp/src/dsp/cost_sse2.c
-FILE: ../../../third_party/libwebp/src/dsp/dec_sse41.c
-FILE: ../../../third_party/libwebp/src/dsp/enc_sse41.c
-FILE: ../../../third_party/libwebp/src/dsp/filters_sse2.c
-FILE: ../../../third_party/libwebp/src/dsp/lossless_enc.c
-FILE: ../../../third_party/libwebp/src/dsp/lossless_enc_mips32.c
-FILE: ../../../third_party/libwebp/src/dsp/lossless_enc_mips_dsp_r2.c
-FILE: ../../../third_party/libwebp/src/dsp/lossless_enc_neon.c
-FILE: ../../../third_party/libwebp/src/dsp/lossless_enc_sse2.c
-FILE: ../../../third_party/libwebp/src/dsp/lossless_enc_sse41.c
-FILE: ../../../third_party/libwebp/src/dsp/rescaler_neon.c
-FILE: ../../../third_party/libwebp/src/dsp/rescaler_sse2.c
-----------------------------------------------------------------------------------------------------
-Copyright 2015 Google Inc. All Rights Reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-  * Neither the name of Google nor the names of its contributors may
-    be used to endorse or promote products derived from this software
-    without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: angle
-ORIGIN: ../../../third_party/angle/include/platform/PlatformMethods.h + ../../../third_party/angle/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/include/platform/PlatformMethods.h
-FILE: ../../../third_party/angle/samples/WindowTest/WindowTest.cpp
-FILE: ../../../third_party/angle/samples/multi_window/MultiWindow.cpp
-FILE: ../../../third_party/angle/src/common/Optional.h
-FILE: ../../../third_party/angle/src/common/Optional_unittest.cpp
-FILE: ../../../third_party/angle/src/common/bitset_utils.h
-FILE: ../../../third_party/angle/src/common/bitset_utils_unittest.cpp
-FILE: ../../../third_party/angle/src/common/mathutil_unittest.cpp
-FILE: ../../../third_party/angle/src/common/matrix_utils.h
-FILE: ../../../third_party/angle/src/common/matrix_utils_unittest.cpp
-FILE: ../../../third_party/angle/src/common/string_utils.cpp
-FILE: ../../../third_party/angle/src/common/string_utils.h
-FILE: ../../../third_party/angle/src/common/string_utils_unittest.cpp
-FILE: ../../../third_party/angle/src/common/system_utils_ios.cpp
-FILE: ../../../third_party/angle/src/common/system_utils_ios.mm
-FILE: ../../../third_party/angle/src/common/system_utils_linux.cpp
-FILE: ../../../third_party/angle/src/common/system_utils_mac.cpp
-FILE: ../../../third_party/angle/src/common/utilities_unittest.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/ExtensionGLSL.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/ExtensionGLSL.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/apple/RewriteDoWhile.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/apple/RewriteDoWhile.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/FindSymbolNode.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/FindSymbolNode.h
-FILE: ../../../third_party/angle/src/image_util/generatemip.inc
-FILE: ../../../third_party/angle/src/libANGLE/BinaryStream_unittest.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Debug.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Debug.h
-FILE: ../../../third_party/angle/src/libANGLE/Device.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Device.h
-FILE: ../../../third_party/angle/src/libANGLE/HandleAllocator_unittest.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Image.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Image.h
-FILE: ../../../third_party/angle/src/libANGLE/Image_unittest.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Platform.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Program_unittest.cpp
-FILE: ../../../third_party/angle/src/libANGLE/ResourceManager_unittest.cpp
-FILE: ../../../third_party/angle/src/libANGLE/VaryingPacking.cpp
-FILE: ../../../third_party/angle/src/libANGLE/VaryingPacking.h
-FILE: ../../../third_party/angle/src/libANGLE/Version.h
-FILE: ../../../third_party/angle/src/libANGLE/Version.inc
-FILE: ../../../third_party/angle/src/libANGLE/VertexAttribute.inc
-FILE: ../../../third_party/angle/src/libANGLE/histogram_macros.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/BufferImpl_mock.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/DeviceImpl.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/DeviceImpl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/FenceNVImpl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/FramebufferImpl_mock.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/GLImplFactory.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/ImageImpl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/ImageImpl_mock.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/ProgramImpl_mock.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/RenderbufferImpl_mock.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/SyncImpl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/TextureImpl_mock.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/TransformFeedbackImpl_mock.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/CompilerD3D.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/DeviceD3D.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/DeviceD3D.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/EGLImageD3D.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/EGLImageD3D.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/StateManager11.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/texture_format_table.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/DebugAnnotator9.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/DebugAnnotator9.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/StateManager9.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/StateManager9.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/formatutilsD3D.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/dxgi_support_table.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/dxgi_support_table_autogen.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/BlitGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/BlitGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/BufferGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/BufferGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/CompilerGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/CompilerGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/DisplayGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/DisplayGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/FenceNVGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/FenceNVGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/FramebufferGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/FramebufferGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/FunctionsGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/FunctionsGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/ProgramGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/ProgramGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/QueryGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/QueryGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/RenderbufferGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/RenderbufferGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/RendererGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/RendererGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/ShaderGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/ShaderGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/StateManagerGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/StateManagerGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/SurfaceGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/SurfaceGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/SyncGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/SyncGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/TextureGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/TextureGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/TransformFeedbackGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/TransformFeedbackGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/VertexArrayGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/VertexArrayGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/cgl/DisplayCGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/cgl/DisplayCGL.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/cgl/PbufferSurfaceCGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/formatutilsgl.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/formatutilsgl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/functionsgl_enums.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/functionsgl_typedefs.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/glx/DisplayGLX.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/glx/FunctionsGLX.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/glx/PbufferSurfaceGLX.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/glx/PbufferSurfaceGLX.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/glx/WindowSurfaceGLX.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/glx/WindowSurfaceGLX.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/glx/functionsglx_typedefs.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/glx/platform_glx.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/wgl/D3DTextureSurfaceWGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/wgl/D3DTextureSurfaceWGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/wgl/DisplayWGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/wgl/FunctionsWGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/wgl/FunctionsWGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/wgl/PbufferSurfaceWGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/wgl/PbufferSurfaceWGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/wgl/WindowSurfaceWGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/wgl/WindowSurfaceWGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/wgl/functionswgl_typedefs.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/wgl/wgl_utils.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/wgl/wgl_utils.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/load_functions_table.h
-FILE: ../../../third_party/angle/src/libANGLE/validationEGL.h
-FILE: ../../../third_party/angle/util/OSPixmap.h
-FILE: ../../../third_party/angle/util/linux/x11/X11Pixmap.cpp
-FILE: ../../../third_party/angle/util/linux/x11/X11Pixmap.h
-FILE: ../../../third_party/angle/util/linux/x11/X11Window.cpp
-FILE: ../../../third_party/angle/util/linux/x11/X11Window.h
-FILE: ../../../third_party/angle/util/osx/OSXPixmap.h
-FILE: ../../../third_party/angle/util/osx/OSXPixmap.mm
-FILE: ../../../third_party/angle/util/osx/OSXWindow.h
-FILE: ../../../third_party/angle/util/osx/OSXWindow.mm
-FILE: ../../../third_party/angle/util/posix/test_utils_posix.cpp
-FILE: ../../../third_party/angle/util/windows/win32/Win32Pixmap.cpp
-FILE: ../../../third_party/angle/util/windows/win32/Win32Pixmap.h
-----------------------------------------------------------------------------------------------------
-Copyright 2015 The ANGLE Project Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-    Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.
-
-    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
-    Ltd., nor the names of their contributors may be used to endorse
-    or promote products derived from this software without specific
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: icu
-LIBRARY: vulkan-deps
-ORIGIN: ../../../third_party/icu/scripts/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/icu/fuzzers/icu_unicode_string_codepage_create_fuzzer.cc
-FILE: ../../../third_party/icu/scripts/accept_lang.list
-FILE: ../../../third_party/icu/scripts/chrome_ui_languages.list
-FILE: ../../../third_party/icu/scripts/currencies.list
-FILE: ../../../third_party/vulkan-deps/.gitignore
-FILE: ../../../third_party/vulkan-deps/DEPS
-FILE: ../../../third_party/vulkan-deps/additional_readme_paths.json
-----------------------------------------------------------------------------------------------------
-Copyright 2015 The Chromium Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/internal/custom/gtest-port.h
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/internal/custom/gtest-port.h
-FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/internal/custom/gtest-printers.h
-FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/internal/custom/gtest.h
-FILE: ../../../third_party/boringssl/src/third_party/googletest/include/gtest/internal/gtest-port-arch.h
-----------------------------------------------------------------------------------------------------
-Copyright 2015, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/evp/scrypt.c + ../../../third_party/boringssl/src/LICENSE
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/boringssl/src/crypto/evp/scrypt.c
-----------------------------------------------------------------------------------------------------
-Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
-
-Licensed under the OpenSSL license (the "License").  You may not use
-this file except in compliance with the License.  You can obtain a copy
-in the file LICENSE in the source distribution or at
-https://www.openssl.org/source/license.html
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/montgomery_inv.c
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/montgomery_inv.c
-----------------------------------------------------------------------------------------------------
-Copyright 2016 Brian Smith.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libwebp
-ORIGIN: ../../../third_party/libwebp/extras/get_disto.c + ../../../third_party/libwebp/COPYING
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/libwebp/extras/get_disto.c
-FILE: ../../../third_party/libwebp/extras/quality_estimate.c
-FILE: ../../../third_party/libwebp/imageio/image_dec.c
-FILE: ../../../third_party/libwebp/imageio/image_dec.h
-FILE: ../../../third_party/libwebp/imageio/image_enc.c
-FILE: ../../../third_party/libwebp/imageio/image_enc.h
-FILE: ../../../third_party/libwebp/imageio/imageio_util.c
-FILE: ../../../third_party/libwebp/imageio/imageio_util.h
-FILE: ../../../third_party/libwebp/src/dsp/common_sse2.h
-FILE: ../../../third_party/libwebp/src/dsp/common_sse41.h
-FILE: ../../../third_party/libwebp/src/dsp/dec_msa.c
-FILE: ../../../third_party/libwebp/src/dsp/enc_msa.c
-FILE: ../../../third_party/libwebp/src/dsp/filters_msa.c
-FILE: ../../../third_party/libwebp/src/dsp/lossless_enc_msa.c
-FILE: ../../../third_party/libwebp/src/dsp/lossless_msa.c
-FILE: ../../../third_party/libwebp/src/dsp/msa_macro.h
-FILE: ../../../third_party/libwebp/src/dsp/rescaler_msa.c
-FILE: ../../../third_party/libwebp/src/dsp/upsampling_msa.c
-FILE: ../../../third_party/libwebp/src/enc/predictor_enc.c
-FILE: ../../../third_party/libwebp/src/mux/animi.h
-----------------------------------------------------------------------------------------------------
-Copyright 2016 Google Inc. All Rights Reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-  * Neither the name of Google nor the names of its contributors may
-    be used to endorse or promote products derived from this software
-    without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: angle
-LIBRARY: base
-ORIGIN: ../../../third_party/angle/src/common/third_party/base/anglebase/logging.h + ../../../third_party/angle/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/src/common/Color.h
-FILE: ../../../third_party/angle/src/common/Color.inc
-FILE: ../../../third_party/angle/src/common/third_party/base/anglebase/logging.h
-FILE: ../../../third_party/angle/src/common/vector_utils.h
-FILE: ../../../third_party/angle/src/common/vector_utils_unittest.cpp
-FILE: ../../../third_party/angle/src/common/vulkan/vk_headers.h
-FILE: ../../../third_party/angle/src/compiler/fuzz/translator_fuzzer.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/ConstantUnion.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/OutputVulkanGLSL.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/OutputVulkanGLSL.h
-FILE: ../../../third_party/angle/src/compiler/translator/Severity.h
-FILE: ../../../third_party/angle/src/compiler/translator/TextureFunctionHLSL.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TextureFunctionHLSL.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorVulkan.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorVulkan.h
-FILE: ../../../third_party/angle/src/compiler/translator/ValidateMaxParameters.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/ValidateMaxParameters.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/DeferGlobalInitializers.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/DeferGlobalInitializers.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/RemoveInvariantDeclaration.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/RemoveInvariantDeclaration.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/RewriteTexelFetchOffset.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/RewriteTexelFetchOffset.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/SimplifyLoopConditions.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/SimplifyLoopConditions.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/SplitSequenceOperator.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/SplitSequenceOperator.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/apple/AddAndTrueToLoopCondition.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/apple/AddAndTrueToLoopCondition.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/apple/RewriteUnaryMinusOperatorFloat.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/apple/RewriteUnaryMinusOperatorFloat.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/AddDefaultReturnStatements.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/AddDefaultReturnStatements.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/BreakVariableAliasingInInnerLoops.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/BreakVariableAliasingInInnerLoops.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/ExpandIntegerPowExpressions.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/ExpandIntegerPowExpressions.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/RewriteUnaryMinusOperatorInt.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/RewriteUnaryMinusOperatorInt.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/gl/UseInterfaceBlockFields.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/gl/UseInterfaceBlockFields.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/IntermNodePatternMatcher.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/IntermNodePatternMatcher.h
-FILE: ../../../third_party/angle/src/image_util/imageformats.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Observer.h
-FILE: ../../../third_party/angle/src/libANGLE/Observer_unittest.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Stream.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Stream.h
-FILE: ../../../third_party/angle/src/libANGLE/Thread.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Thread.h
-FILE: ../../../third_party/angle/src/libANGLE/VaryingPacking_unittest.cpp
-FILE: ../../../third_party/angle/src/libANGLE/WorkerThread.cpp
-FILE: ../../../third_party/angle/src/libANGLE/WorkerThread.h
-FILE: ../../../third_party/angle/src/libANGLE/WorkerThread_unittest.cpp
-FILE: ../../../third_party/angle/src/libANGLE/es3_copy_conversion_table_autogen.cpp
-FILE: ../../../third_party/angle/src/libANGLE/format_map_autogen.cpp
-FILE: ../../../third_party/angle/src/libANGLE/queryutils.cpp
-FILE: ../../../third_party/angle/src/libANGLE/queryutils.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/ContextImpl.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/ContextImpl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/EGLImplFactory.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/Format.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/FramebufferAttachmentObjectImpl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/StreamProducerImpl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/TextureImpl.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/HLSLCompiler.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/NativeWindowD3D.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/NativeWindowD3D.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/SwapChainD3D.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/Context11.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/Context11.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/NativeWindow11.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/StreamProducerD3DTexture.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/StreamProducerD3DTexture.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/VertexArray11.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/texture_format_table.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/texture_format_table_utils.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/Context9.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/Context9.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/NativeWindow9.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/NativeWindow9.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/driver_utils.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/driver_utils.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/ContextGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/ContextGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/DisplayEGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/DisplayEGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/FunctionsEGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/FunctionsEGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/FunctionsEGLDL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/FunctionsEGLDL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/PbufferSurfaceEGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/PbufferSurfaceEGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/SurfaceEGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/SurfaceEGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/WindowSurfaceEGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/WindowSurfaceEGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/android/DisplayAndroid.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/android/DisplayAndroid.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/functionsegl_typedefs.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/gbm/DisplayGbm.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/gbm/DisplayGbm.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/gbm/SurfaceGbm.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/gbm/SurfaceGbm.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/glx/SurfaceGLX.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/BufferNULL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/BufferNULL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/CompilerNULL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/CompilerNULL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/ContextNULL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/ContextNULL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/DeviceNULL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/DeviceNULL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/DisplayNULL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/DisplayNULL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/FenceNVNULL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/FenceNVNULL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/FramebufferNULL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/FramebufferNULL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/ImageNULL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/ImageNULL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/ProgramNULL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/ProgramNULL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/QueryNULL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/QueryNULL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/RenderbufferNULL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/RenderbufferNULL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/SamplerNULL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/SamplerNULL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/ShaderNULL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/ShaderNULL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/SurfaceNULL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/SurfaceNULL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/SyncNULL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/SyncNULL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/TextureNULL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/TextureNULL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/TransformFeedbackNULL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/TransformFeedbackNULL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/VertexArrayNULL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/VertexArrayNULL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/renderer_utils.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/renderer_utils.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/BufferVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/BufferVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/CompilerVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/CompilerVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/ContextVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/ContextVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/DeviceVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/DeviceVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/FenceNVVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/FenceNVVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/FramebufferVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/GlslangWrapperVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/GlslangWrapperVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/ImageVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/ImageVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/ProgramVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/ProgramVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/QueryVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/QueryVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/RenderTargetVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/RenderTargetVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/RenderbufferVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/RenderbufferVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/RendererVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/RendererVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/SamplerVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/SamplerVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/ShaderVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/ShaderVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/SurfaceVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/SurfaceVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/SyncVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/SyncVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/TextureVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/TextureVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/TransformFeedbackVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/TransformFeedbackVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/VertexArrayVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/linux/xcb/DisplayVkXcb.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/linux/xcb/DisplayVkXcb.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/linux/xcb/WindowSurfaceVkXcb.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/linux/xcb/WindowSurfaceVkXcb.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/vk_format_utils.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/vk_format_utils.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/vk_utils.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/vk_utils.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/win32/DisplayVkWin32.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/win32/DisplayVkWin32.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/win32/WindowSurfaceVkWin32.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/win32/WindowSurfaceVkWin32.h
-FILE: ../../../third_party/angle/src/libANGLE/validationEGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/validationES31.cpp
-FILE: ../../../third_party/angle/util/android/AndroidPixmap.cpp
-FILE: ../../../third_party/angle/util/android/AndroidWindow.cpp
-FILE: ../../../third_party/angle/util/android/AndroidWindow.h
-FILE: ../../../third_party/angle/util/ozone/OzonePixmap.cpp
-FILE: ../../../third_party/angle/util/ozone/OzoneWindow.cpp
-FILE: ../../../third_party/angle/util/ozone/OzoneWindow.h
-----------------------------------------------------------------------------------------------------
-Copyright 2016 The ANGLE Project Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-    Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.
-
-    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
-    Ltd., nor the names of their contributors may be used to endorse
-    or promote products derived from this software without specific
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: icu
-ORIGIN: ../../../third_party/icu/fuzzers/icu_converter_fuzzer.cc + ../../../LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/icu/fuzzers/icu_converter_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_regex.dict
-FILE: ../../../third_party/icu/fuzzers/icu_uregex_open_fuzzer.cc
-----------------------------------------------------------------------------------------------------
-Copyright 2016 The Chromium Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libwebp
-ORIGIN: ../../../third_party/libwebp/extras/vwebp_sdl.c + ../../../third_party/libwebp/COPYING
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/libwebp/extras/vwebp_sdl.c
-FILE: ../../../third_party/libwebp/extras/webp_to_sdl.c
-FILE: ../../../third_party/libwebp/extras/webp_to_sdl.h
-FILE: ../../../third_party/libwebp/imageio/pnmdec.c
-FILE: ../../../third_party/libwebp/imageio/pnmdec.h
-FILE: ../../../third_party/libwebp/src/dsp/alpha_processing_neon.c
-FILE: ../../../third_party/libwebp/src/dsp/filters_neon.c
-FILE: ../../../third_party/libwebp/src/dsp/ssim.c
-FILE: ../../../third_party/libwebp/src/dsp/ssim_sse2.c
-FILE: ../../../third_party/libwebp/src/dsp/yuv_neon.c
-FILE: ../../../third_party/libwebp/src/enc/backward_references_cost_enc.c
-----------------------------------------------------------------------------------------------------
-Copyright 2017 Google Inc. All Rights Reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-  * Neither the name of Google nor the names of its contributors may
-    be used to endorse or promote products derived from this software
-    without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: angle
-LIBRARY: base
-ORIGIN: ../../../third_party/angle/include/EGL/eglext_angle.h + ../../../third_party/angle/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/include/EGL/eglext_angle.h
-FILE: ../../../third_party/angle/include/GLES2/gl2ext_angle.h
-FILE: ../../../third_party/angle/samples/multiview/Multiview.cpp
-FILE: ../../../third_party/angle/src/common/PackedCLEnums_autogen.cpp
-FILE: ../../../third_party/angle/src/common/PackedCLEnums_autogen.h
-FILE: ../../../third_party/angle/src/common/PackedEGLEnums_autogen.cpp
-FILE: ../../../third_party/angle/src/common/PackedEGLEnums_autogen.h
-FILE: ../../../third_party/angle/src/common/PackedEnums.h
-FILE: ../../../third_party/angle/src/common/PackedGLEnums_autogen.cpp
-FILE: ../../../third_party/angle/src/common/PackedGLEnums_autogen.h
-FILE: ../../../third_party/angle/src/common/aligned_memory.cpp
-FILE: ../../../third_party/angle/src/common/aligned_memory.h
-FILE: ../../../third_party/angle/src/common/aligned_memory_unittest.cpp
-FILE: ../../../third_party/angle/src/common/angleutils_unittest.cpp
-FILE: ../../../third_party/angle/src/common/third_party/base/anglebase/base_export.h
-FILE: ../../../third_party/angle/src/common/third_party/base/anglebase/macros.h
-FILE: ../../../third_party/angle/src/common/third_party/base/anglebase/sys_byteorder.h
-FILE: ../../../third_party/angle/src/common/uniform_type_info_autogen.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/Declarator.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/Declarator.h
-FILE: ../../../third_party/angle/src/compiler/translator/ExtensionBehavior.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/HashNames.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/ImageFunctionHLSL.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/ImageFunctionHLSL.h
-FILE: ../../../third_party/angle/src/compiler/translator/IsASTDepthBelowLimit.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/IsASTDepthBelowLimit.h
-FILE: ../../../third_party/angle/src/compiler/translator/OutputTree.h
-FILE: ../../../third_party/angle/src/compiler/translator/StaticType.h
-FILE: ../../../third_party/angle/src/compiler/translator/Symbol.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/Symbol.h
-FILE: ../../../third_party/angle/src/compiler/translator/SymbolUniqueId.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/SymbolUniqueId.h
-FILE: ../../../third_party/angle/src/compiler/translator/emulated_builtin_functions_hlsl_autogen.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/ClampPointSize.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/ClampPointSize.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/DeclareAndInitBuiltinsForInstancedMultiview.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/DeclareAndInitBuiltinsForInstancedMultiview.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/RemoveArrayLengthMethod.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/RemoveArrayLengthMethod.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/RemoveUnreferencedVariables.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/RemoveUnreferencedVariables.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/WrapSwitchStatementsInBlocks.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/WrapSwitchStatementsInBlocks.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/gl/ClampFragDepth.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/gl/ClampFragDepth.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/FindMain.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/FindMain.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/IntermNode_util.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/IntermNode_util.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/IntermTraverse.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/RunAtTheEndOfShader.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/RunAtTheEndOfShader.h
-FILE: ../../../third_party/angle/src/gpu_info_util/SystemInfo_macos.mm
-FILE: ../../../third_party/angle/src/gpu_info_util/SystemInfo_unittest.cpp
-FILE: ../../../third_party/angle/src/libANGLE/ErrorStrings.h
-FILE: ../../../third_party/angle/src/libANGLE/LoggingAnnotator.cpp
-FILE: ../../../third_party/angle/src/libANGLE/LoggingAnnotator.h
-FILE: ../../../third_party/angle/src/libANGLE/MemoryProgramCache.cpp
-FILE: ../../../third_party/angle/src/libANGLE/MemoryProgramCache.h
-FILE: ../../../third_party/angle/src/libANGLE/ProgramLinkedResources.cpp
-FILE: ../../../third_party/angle/src/libANGLE/ProgramLinkedResources.h
-FILE: ../../../third_party/angle/src/libANGLE/ProgramPipeline.cpp
-FILE: ../../../third_party/angle/src/libANGLE/ProgramPipeline.h
-FILE: ../../../third_party/angle/src/libANGLE/ResourceMap.h
-FILE: ../../../third_party/angle/src/libANGLE/SizedMRUCache.h
-FILE: ../../../third_party/angle/src/libANGLE/SizedMRUCache_unittest.cpp
-FILE: ../../../third_party/angle/src/libANGLE/VertexArray_unittest.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/ProgramPipelineImpl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/ProgramPipeline11.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/ProgramPipeline11.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/ResourceManager11.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/ResourceManager11.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/Clear11.hlsl
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/ClearMultiviewGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/ClearMultiviewGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/DispatchTableGL_autogen.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/DispatchTableGL_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/ProgramPipelineGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/ProgramPipelineGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/egl_utils.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/egl_utils.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/null_functions.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/null_functions.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/wgl/SurfaceWGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/ProgramPipelineNULL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/null/ProgramPipelineNULL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/ProgramPipelineVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/ProgramPipelineVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/ResourceVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/ResourceVk.h
-FILE: ../../../third_party/angle/src/libGLESv2/proc_table_egl.h
-FILE: ../../../third_party/angle/src/libGLESv2/proc_table_glx.h
-FILE: ../../../third_party/angle/src/libGLESv2/proc_table_wgl.h
-----------------------------------------------------------------------------------------------------
-Copyright 2017 The ANGLE Project Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-    Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.
-
-    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
-    Ltd., nor the names of their contributors may be used to endorse
-    or promote products derived from this software without specific
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: base
-LIBRARY: zlib
-ORIGIN: ../../../third_party/angle/src/common/third_party/base/anglebase/numerics/checked_math.h + ../../../LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/src/common/third_party/base/anglebase/numerics/checked_math.h
-FILE: ../../../third_party/angle/src/common/third_party/base/anglebase/numerics/checked_math_impl.h
-FILE: ../../../third_party/angle/src/common/third_party/base/anglebase/numerics/clamped_math.h
-FILE: ../../../third_party/angle/src/common/third_party/base/anglebase/numerics/clamped_math_impl.h
-FILE: ../../../third_party/angle/src/common/third_party/base/anglebase/numerics/math_constants.h
-FILE: ../../../third_party/angle/src/common/third_party/base/anglebase/numerics/ranges.h
-FILE: ../../../third_party/angle/src/common/third_party/base/anglebase/numerics/safe_conversions_arm_impl.h
-FILE: ../../../third_party/angle/src/common/third_party/base/anglebase/numerics/safe_math.h
-FILE: ../../../third_party/angle/src/common/third_party/base/anglebase/numerics/safe_math_arm_impl.h
-FILE: ../../../third_party/angle/src/common/third_party/base/anglebase/numerics/safe_math_clang_gcc_impl.h
-FILE: ../../../third_party/angle/src/common/third_party/base/anglebase/numerics/safe_math_shared_impl.h
-FILE: ../../../third_party/zlib/adler32_simd.c
-FILE: ../../../third_party/zlib/adler32_simd.h
-FILE: ../../../third_party/zlib/chromeconf.h
-FILE: ../../../third_party/zlib/crc32_simd.c
-FILE: ../../../third_party/zlib/crc32_simd.h
-FILE: ../../../third_party/zlib/google/zip_writer.cc
-FILE: ../../../third_party/zlib/google/zip_writer.h
-----------------------------------------------------------------------------------------------------
-Copyright 2017 The Chromium Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/crypto/x509/x509_time_test.cc + ../../../third_party/boringssl/src/LICENSE
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/boringssl/src/crypto/x509/x509_time_test.cc
-----------------------------------------------------------------------------------------------------
-Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
-
-Licensed under the OpenSSL license (the "License").  You may not use
-this file except in compliance with the License.  You can obtain a copy
-in the file LICENSE in the source distribution or at
-https://www.openssl.org/source/license.html
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libwebp
-ORIGIN: ../../../third_party/libwebp/src/dsp/cost_neon.c + ../../../third_party/libwebp/COPYING
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/libwebp/src/dsp/cost_neon.c
-FILE: ../../../third_party/libwebp/src/dsp/quant.h
-----------------------------------------------------------------------------------------------------
-Copyright 2018 Google Inc. All Rights Reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-  * Neither the name of Google nor the names of its contributors may
-    be used to endorse or promote products derived from this software
-    without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: angle
-ORIGIN: ../../../third_party/angle/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/.style.yapf
-FILE: ../../../third_party/angle/.vpython
-FILE: ../../../third_party/angle/.vpython3
-FILE: ../../../third_party/angle/.yapfignore
-FILE: ../../../third_party/angle/CONTRIBUTORS
-FILE: ../../../third_party/angle/DEPS
-FILE: ../../../third_party/angle/DIR_METADATA
-FILE: ../../../third_party/angle/additional_readme_paths.json
-FILE: ../../../third_party/angle/doc/img/JobUnit.png
-FILE: ../../../third_party/angle/doc/img/RegressionTestingArchitecture.png
-FILE: ../../../third_party/angle/doc/img/StateChangeNotificationFlow.svg
-FILE: ../../../third_party/angle/doc/img/StateNotificationExample.svg
-FILE: ../../../third_party/angle/doc/img/VangleDebugOverlay.png
-FILE: ../../../third_party/angle/infra/config/generated/commit-queue.cfg
-FILE: ../../../third_party/angle/infra/config/generated/cr-buildbucket.cfg
-FILE: ../../../third_party/angle/infra/config/generated/luci-logdog.cfg
-FILE: ../../../third_party/angle/infra/config/generated/luci-milo.cfg
-FILE: ../../../third_party/angle/infra/config/generated/luci-scheduler.cfg
-FILE: ../../../third_party/angle/infra/config/generated/project.cfg
-FILE: ../../../third_party/angle/infra/config/generated/project.pyl
-FILE: ../../../third_party/angle/infra/config/generated/realms.cfg
-FILE: ../../../third_party/angle/infra/specs/angle.json
-FILE: ../../../third_party/angle/infra/specs/trybot_analyze_config.json
-FILE: ../../../third_party/angle/samples/multi_texture/basemap.tga
-FILE: ../../../third_party/angle/samples/multi_texture/lightmap.tga
-FILE: ../../../third_party/angle/samples/multiple_draw_buffers/multiple_draw_buffers_copy_fs.glsl
-FILE: ../../../third_party/angle/samples/multiple_draw_buffers/multiple_draw_buffers_fs.glsl
-FILE: ../../../third_party/angle/samples/multiple_draw_buffers/multiple_draw_buffers_vs.glsl
-FILE: ../../../third_party/angle/samples/particle_system/smoke.tga
-FILE: ../../../third_party/angle/scripts/code_generation_hashes/ANGLE_features.json
-FILE: ../../../third_party/angle/scripts/code_generation_hashes/ANGLE_format.json
-FILE: ../../../third_party/angle/scripts/code_generation_hashes/ANGLE_load_functions_table.json
-FILE: ../../../third_party/angle/scripts/code_generation_hashes/ANGLE_shader_preprocessor.json
-FILE: ../../../third_party/angle/scripts/code_generation_hashes/ANGLE_shader_translator.json
-FILE: ../../../third_party/angle/scripts/code_generation_hashes/D3D11_blit_shader_selection.json
-FILE: ../../../third_party/angle/scripts/code_generation_hashes/D3D11_format.json
-FILE: ../../../third_party/angle/scripts/code_generation_hashes/DXGI_format.json
-FILE: ../../../third_party/angle/scripts/code_generation_hashes/DXGI_format_support.json
-FILE: ../../../third_party/angle/scripts/code_generation_hashes/Emulated_HLSL_functions.json
-FILE: ../../../third_party/angle/scripts/code_generation_hashes/Extension_files.json
-FILE: ../../../third_party/angle/scripts/code_generation_hashes/GL_CTS_(dEQP)_build_files.json
-FILE: ../../../third_party/angle/scripts/code_generation_hashes/GL_EGL_WGL_loader.json
-FILE: ../../../third_party/angle/scripts/code_generation_hashes/GL_EGL_entry_points.json
-FILE: ../../../third_party/angle/scripts/code_generation_hashes/GL_copy_conversion_table.json
-FILE: ../../../third_party/angle/scripts/code_generation_hashes/GL_format_map.json
-FILE: ../../../third_party/angle/scripts/code_generation_hashes/GLenum_value_to_string_map.json
-FILE: ../../../third_party/angle/scripts/code_generation_hashes/Metal_default_shaders.json
-FILE: ../../../third_party/angle/scripts/code_generation_hashes/Metal_format_table.json
-FILE: ../../../third_party/angle/scripts/code_generation_hashes/OpenGL_dispatch_table.json
-FILE: ../../../third_party/angle/scripts/code_generation_hashes/SPIR-V_helpers.json
-FILE: ../../../third_party/angle/scripts/code_generation_hashes/Static_builtins.json
-FILE: ../../../third_party/angle/scripts/code_generation_hashes/Test_spec_JSON.json
-FILE: ../../../third_party/angle/scripts/code_generation_hashes/Vulkan_format.json
-FILE: ../../../third_party/angle/scripts/code_generation_hashes/Vulkan_internal_shader_programs.json
-FILE: ../../../third_party/angle/scripts/code_generation_hashes/Vulkan_mandatory_format_support_table.json
-FILE: ../../../third_party/angle/scripts/code_generation_hashes/overlay_fonts.json
-FILE: ../../../third_party/angle/scripts/code_generation_hashes/overlay_widgets.json
-FILE: ../../../third_party/angle/scripts/code_generation_hashes/packed_enum.json
-FILE: ../../../third_party/angle/scripts/code_generation_hashes/proc_table.json
-FILE: ../../../third_party/angle/scripts/code_generation_hashes/restricted_traces.json
-FILE: ../../../third_party/angle/scripts/code_generation_hashes/uniform_type.json
-FILE: ../../../third_party/angle/scripts/extension_data/intel_630_linux.json
-FILE: ../../../third_party/angle/scripts/extension_data/intel_630_win10.json
-FILE: ../../../third_party/angle/scripts/extension_data/nvidia_1660_linux.json
-FILE: ../../../third_party/angle/scripts/extension_data/nvidia_1660_win10.json
-FILE: ../../../third_party/angle/scripts/extension_data/pixel_4_android_11.json
-FILE: ../../../third_party/angle/scripts/extension_data/pixel_6_android_13.json
-FILE: ../../../third_party/angle/scripts/extension_data/swiftshader_linux.json
-FILE: ../../../third_party/angle/scripts/extension_data/swiftshader_win10.json
-FILE: ../../../third_party/angle/scripts/extension_data/swiftshader_win10_gles1.json
-FILE: ../../../third_party/angle/src/android_system_settings/assets/a4a_rules.json
-FILE: ../../../third_party/angle/src/android_system_settings/res/drawable/icon.png
-FILE: ../../../third_party/angle/src/common/packed_cl_enums.json
-FILE: ../../../third_party/angle/src/common/packed_egl_enums.json
-FILE: ../../../third_party/angle/src/common/packed_gl_enums.json
-FILE: ../../../third_party/angle/src/compiler/translator/emulated_builtin_function_data_hlsl.json
-FILE: ../../../third_party/angle/src/feature_support_util/a4a_rules.json
-FILE: ../../../third_party/angle/src/libANGLE/es3_copy_conversion_formats.json
-FILE: ../../../third_party/angle/src/libANGLE/es3_format_type_combinations.json
-FILE: ../../../third_party/angle/src/libANGLE/format_map_data.json
-FILE: ../../../third_party/angle/src/libANGLE/overlay/DejaVuSansMono-Bold.ttf
-FILE: ../../../third_party/angle/src/libANGLE/renderer/angle_format_data.json
-FILE: ../../../third_party/angle/src/libANGLE/renderer/angle_format_map.json
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/BufferToTexture11.hlsl
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/Passthrough2D11.hlsl
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/ResolveColor.hlsl
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/ResolveDepthStencil.hlsl
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/Swizzle11.hlsl
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_gs.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4f.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4i.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4ui.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_vs.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11_fl9vs.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11multiviewgs.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11multiviewvs.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clear11vs.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/cleardepth11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11_fl9ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps1.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps2.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps3.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps4.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps5.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps6.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps7.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps8.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps1.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps2.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps3.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps4.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps5.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps6.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps7.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearsint11ps8.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps1.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps2.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps3.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps4.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps5.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps6.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps7.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/clearuint11ps8.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_luma_2d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_luma_2darray_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_luma_3d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_lumaalpha_2d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_lumaalpha_2darray_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_lumaalpha_3d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_2d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_2darray_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_3d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_565_2d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_565_2darray_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgb_565_3d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_2d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_2darray_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_3d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_4444_2d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_4444_2darray_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_4444_3d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_5551_2d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_5551_2darray_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_pm_rgba_5551_3d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_luma_2d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_luma_2darray_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_luma_3d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_lumaalpha_2d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_lumaalpha_2darray_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_lumaalpha_3d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_2d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_2darray_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_3d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_565_2d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_565_2darray_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgb_565_3d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_2d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_2darray_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_3d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_4444_2d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_4444_2darray_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_4444_3d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_4444_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_5551_2d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_5551_2darray_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_5551_3d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftof_um_rgba_5551_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pm_rgb_2darray_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pm_rgb_3d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pm_rgba_2darray_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pm_rgba_3d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pt_rgb_2darray_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pt_rgb_3d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pt_rgba_2darray_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_pt_rgba_3d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_um_rgb_2darray_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_um_rgb_3d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_um_rgba_2darray_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftoi_um_rgba_3d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgb_2d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgb_2darray_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgb_3d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgba_2d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgba_2darray_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pm_rgba_3d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgb_2d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgb_2darray_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgb_3d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgba_2d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgba_2darray_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_pt_rgba_3d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgb_2d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgb_2darray_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgb_3d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgba_2d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgba_2darray_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/multiplyalpha_ftou_um_rgba_3d_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough2d11vs.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough3d11gs.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough3d11vs.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrougha2d11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughdepth2d11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlum2d11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlum2darray11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlum3d11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha2d11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha2darray11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha3d11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2d11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2darray11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2darrayi11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2darrayui11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2di11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr2dui11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr3d11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr3di11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughr3dui11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2d11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2darray11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2darrayi11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2darrayui11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2di11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg2dui11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg3d11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg3di11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrg3dui11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2d11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2d_565_11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2darray11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2darray_565_11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2darrayi11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2darrayui11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2di11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2dui11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3d11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3d_565_11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3di11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3dui11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2d11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2d_4444_11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2d_5551_11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darray11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darray_4444_11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darray_5551_11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darrayi11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2darrayui11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2di11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2dms11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2dui11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3d11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3d_4444_11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3d_5551_11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3di11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3dui11ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvecolor2dps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvedepth11_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvedepthstencil11_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvedepthstencil11_vs.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/resolvestencil11_ps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlef2darrayps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlef2dps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlef3dps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlei2darrayps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlei2dps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzlei3dps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui2darrayps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui2dps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/compiled/swizzleui3dps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/texture_format_data.json
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/texture_format_map.json
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskpremultps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/componentmaskunmultps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/luminancepremultps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/luminanceps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/luminanceunmultps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/passthroughps.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d9/shaders/compiled/standardvs.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/dxgi_format_data.json
-FILE: ../../../third_party/angle/src/libANGLE/renderer/dxgi_support_data.json
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/gl_bindings_data.json
-FILE: ../../../third_party/angle/src/libANGLE/renderer/load_functions_data.json
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_default_shaders_compiled.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/doc/img/LineRasterComparison.gif
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/doc/img/LineRasterHoles.jpg
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/doc/img/LineRasterPixelExample.png
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/doc/img/VulkanShaderTranslation.svg
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/OverlayDraw.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/vk_mandatory_format_support_data.json
-FILE: ../../../third_party/angle/src/libEGL/libEGL.rc
-FILE: ../../../third_party/angle/src/libEGL/resource.h
-FILE: ../../../third_party/angle/src/libGLESv1_CM/libGLESv1_CM.def
-FILE: ../../../third_party/angle/src/libGLESv1_CM/libGLESv1_CM.rc
-FILE: ../../../third_party/angle/src/libGLESv1_CM/resource.h
-FILE: ../../../third_party/angle/src/libGLESv2/libGLESv2.rc
-FILE: ../../../third_party/angle/src/libGLESv2/resource.h
-FILE: ../../../third_party/angle/util/ios/Info.plist
-FILE: ../../../third_party/angle/util/osx/supports_automatic_graphics_switching.plist
-----------------------------------------------------------------------------------------------------
-Copyright 2018 The ANGLE Project Authors.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-    Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.
-
-    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
-    Ltd., nor the names of their contributors may be used to endorse
-    or promote products derived from this software without specific
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: angle
-ORIGIN: ../../../third_party/angle/android/AndroidManifest.xml.jinja2 + ../../../third_party/angle/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/android/AndroidManifest.xml.jinja2
-FILE: ../../../third_party/angle/samples/gles1/DrawTexture.cpp
-FILE: ../../../third_party/angle/samples/gles1/FlatShading.cpp
-FILE: ../../../third_party/angle/samples/gles1/HelloTriangle.cpp
-FILE: ../../../third_party/angle/samples/gles1/SimpleLighting.cpp
-FILE: ../../../third_party/angle/samples/gles1/SimpleTexture2D.cpp
-FILE: ../../../third_party/angle/scripts/egl_angle_ext.xml
-FILE: ../../../third_party/angle/scripts/gl_angle_ext.xml
-FILE: ../../../third_party/angle/scripts/vk_mandatory_format_support_capture_to_json.js
-FILE: ../../../third_party/angle/src/android_system_settings/res/values-v17/styles.xml
-FILE: ../../../third_party/angle/src/common/FastVector.h
-FILE: ../../../third_party/angle/src/common/FastVector_unittest.cpp
-FILE: ../../../third_party/angle/src/common/FixedVector.h
-FILE: ../../../third_party/angle/src/common/FixedVector_unittest.cpp
-FILE: ../../../third_party/angle/src/common/PackedEnums.cpp
-FILE: ../../../third_party/angle/src/common/android_util.cpp
-FILE: ../../../third_party/angle/src/common/android_util.h
-FILE: ../../../third_party/angle/src/common/hash_utils.h
-FILE: ../../../third_party/angle/src/common/hash_utils_unittest.cpp
-FILE: ../../../third_party/angle/src/common/matrix_utils.cpp
-FILE: ../../../third_party/angle/src/common/system_utils.cpp
-FILE: ../../../third_party/angle/src/common/system_utils_posix.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/AtomicCounterFunctionHLSL.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/AtomicCounterFunctionHLSL.h
-FILE: ../../../third_party/angle/src/compiler/translator/FunctionLookup.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/FunctionLookup.h
-FILE: ../../../third_party/angle/src/compiler/translator/ImmutableString.h
-FILE: ../../../third_party/angle/src/compiler/translator/ImmutableStringBuilder.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/ImmutableStringBuilder.h
-FILE: ../../../third_party/angle/src/compiler/translator/ShaderStorageBlockFunctionHLSL.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/ShaderStorageBlockFunctionHLSL.h
-FILE: ../../../third_party/angle/src/compiler/translator/ShaderStorageBlockOutputHLSL.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/ShaderStorageBlockOutputHLSL.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/NameEmbeddedUniformStructsMetal.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/NameEmbeddedUniformStructsMetal.h
-FILE: ../../../third_party/angle/src/compiler/translator/builtin_variables.json
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/FoldExpressions.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/FoldExpressions.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/PruneEmptyCases.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/PruneEmptyCases.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/RewriteStructSamplers.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/RewriteStructSamplers.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/SeparateStructFromUniformDeclarations.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/SeparateStructFromUniformDeclarations.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/RewriteAtomicFunctionExpressions.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/RewriteAtomicFunctionExpressions.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/RewriteExpressionsWithShaderStorageBlock.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/RewriteExpressionsWithShaderStorageBlock.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/SeparateArrayConstructorStatements.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/SeparateArrayConstructorStatements.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/gl/RewriteRepeatedAssignToSwizzled.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/gl/RewriteRepeatedAssignToSwizzled.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/ReplaceVariable.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/ReplaceVariable.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/Visit.h
-FILE: ../../../third_party/angle/src/feature_support_util/feature_support_util.cpp
-FILE: ../../../third_party/angle/src/feature_support_util/feature_support_util.h
-FILE: ../../../third_party/angle/src/feature_support_util/feature_support_util_unittest.cpp
-FILE: ../../../third_party/angle/src/gpu_info_util/SystemInfo_android.cpp
-FILE: ../../../third_party/angle/src/libANGLE/BlobCache.cpp
-FILE: ../../../third_party/angle/src/libANGLE/BlobCache.h
-FILE: ../../../third_party/angle/src/libANGLE/BlobCache_unittest.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Context.inl.h
-FILE: ../../../third_party/angle/src/libANGLE/Context_gles_1_0.cpp
-FILE: ../../../third_party/angle/src/libANGLE/GLES1Renderer.cpp
-FILE: ../../../third_party/angle/src/libANGLE/GLES1Renderer.h
-FILE: ../../../third_party/angle/src/libANGLE/GLES1Shaders.inc
-FILE: ../../../third_party/angle/src/libANGLE/GLES1State.cpp
-FILE: ../../../third_party/angle/src/libANGLE/GLES1State.h
-FILE: ../../../third_party/angle/src/libANGLE/Observer.cpp
-FILE: ../../../third_party/angle/src/libANGLE/ResourceMap_unittest.cpp
-FILE: ../../../third_party/angle/src/libANGLE/entry_points_utils.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/QueryImpl.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/RenderTargetCache.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/ContextD3D.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/Blit11Helper_autogen.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/Program11.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/Program11.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/MultiplyAlpha.hlsl
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/Passthrough2DArray11.hlsl
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/shaders/Passthrough3D11.hlsl
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/ImageGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/ImageGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/ContextEGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/ContextEGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/ExternalImageSiblingEGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/ImageEGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/ImageEGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/RendererEGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/RendererEGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/android/NativeBufferImageSiblingAndroid.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/android/NativeBufferImageSiblingAndroid.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/wgl/ContextWGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/wgl/ContextWGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/wgl/RendererWGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/wgl/RendererWGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/UtilsVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/UtilsVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/android/WindowSurfaceVkAndroid.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/android/WindowSurfaceVkAndroid.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000000.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000001.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000002.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000003.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000004.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000005.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000006.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000007.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000008.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000009.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000A.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000B.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000C.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000D.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000E.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000F.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000010.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000011.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000012.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000013.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000014.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000015.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000016.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000017.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000000.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000001.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000002.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000003.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndex.comp.00000000.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndex.comp.00000001.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndex.comp.00000002.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndex.comp.00000003.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndexIndirectLineLoop.comp.00000000.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndexIndirectLineLoop.comp.00000001.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndexIndirectLineLoop.comp.00000002.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndirectLineLoop.comp.00000000.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000000.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000001.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000002.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000003.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000004.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000005.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000006.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000007.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/FullScreenTri.vert.00000000.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000000.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000001.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000002.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000003.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000004.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000005.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000006.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000007.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000008.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000009.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000000.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000001.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000002.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000003.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000004.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000005.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000006.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000007.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000008.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000009.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000A.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000B.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000C.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000D.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000E.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000F.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000010.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000011.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000012.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000013.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000014.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000015.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000016.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000017.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000018.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000019.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000001A.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000001B.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000001C.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000001D.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000001E.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000001F.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000020.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000021.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000022.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000023.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000024.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000025.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000026.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000027.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000028.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000029.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000002A.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000002B.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000002C.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000002D.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000002E.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000002F.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000000.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000001.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000002.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000004.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000005.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000006.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000008.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000009.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000A.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000010.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000011.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000012.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000014.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000015.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000016.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000018.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000019.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000001A.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000020.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000021.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000022.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000024.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000025.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000026.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000028.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000029.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000002A.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/OverlayDraw.frag.00000000.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/OverlayDraw.vert.00000000.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ConvertVertex.comp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ConvertVertex.comp.json
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/FullScreenTri.vert
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ImageCopy.frag
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ImageCopy.frag.json
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/vk_cache_utils.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/vk_cache_utils.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/vk_caps_utils.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/vk_caps_utils.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/vk_format_map.json
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/vk_helpers.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/vk_helpers.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/validationES1.cpp
-FILE: ../../../third_party/angle/src/libANGLE/validationES1.h
-FILE: ../../../third_party/angle/src/libANGLE/validationES2.h
-FILE: ../../../third_party/angle/src/libANGLE/validationES3.h
-FILE: ../../../third_party/angle/src/libANGLE/validationES31.h
-FILE: ../../../third_party/angle/src/libANGLE/validationESEXT.h
-FILE: ../../../third_party/angle/src/libEGL/egl_loader_autogen.cpp
-FILE: ../../../third_party/angle/src/libEGL/egl_loader_autogen.h
-FILE: ../../../third_party/angle/src/libGLESv1_CM/libGLESv1_CM.cpp
-FILE: ../../../third_party/angle/util/EGLPlatformParameters.h
-FILE: ../../../third_party/angle/util/capture/trace_egl_loader_autogen.cpp
-FILE: ../../../third_party/angle/util/capture/trace_egl_loader_autogen.h
-FILE: ../../../third_party/angle/util/capture/trace_gles_loader_autogen.cpp
-FILE: ../../../third_party/angle/util/capture/trace_gles_loader_autogen.h
-FILE: ../../../third_party/angle/util/egl_loader_autogen.cpp
-FILE: ../../../third_party/angle/util/egl_loader_autogen.h
-FILE: ../../../third_party/angle/util/gles_loader_autogen.cpp
-FILE: ../../../third_party/angle/util/gles_loader_autogen.h
-FILE: ../../../third_party/angle/util/util_export.h
-FILE: ../../../third_party/angle/util/util_gl.h
-FILE: ../../../third_party/angle/util/windows/WGLWindow.cpp
-FILE: ../../../third_party/angle/util/windows/WGLWindow.h
-FILE: ../../../third_party/angle/util/windows/wgl_loader_autogen.cpp
-FILE: ../../../third_party/angle/util/windows/wgl_loader_autogen.h
-----------------------------------------------------------------------------------------------------
-Copyright 2018 The ANGLE Project Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-    Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.
-
-    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
-    Ltd., nor the names of their contributors may be used to endorse
-    or promote products derived from this software without specific
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: base
-LIBRARY: zlib
-ORIGIN: ../../../third_party/angle/src/common/third_party/base/anglebase/no_destructor.h + ../../../LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/src/common/third_party/base/anglebase/no_destructor.h
-FILE: ../../../third_party/zlib/contrib/bench/zlib_bench.cc
-FILE: ../../../third_party/zlib/cpu_features.c
-FILE: ../../../third_party/zlib/cpu_features.h
-----------------------------------------------------------------------------------------------------
-Copyright 2018 The Chromium Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: angle
-LIBRARY: xxhash
-ORIGIN: ../../../third_party/angle/include/platform/Feature.h + ../../../third_party/angle/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/WATCHLISTS
-FILE: ../../../third_party/angle/include/platform/Feature.h
-FILE: ../../../third_party/angle/include/vulkan/vulkan_fuchsia_ext.h
-FILE: ../../../third_party/angle/samples/capture_replay/CaptureReplay.cpp
-FILE: ../../../third_party/angle/scripts/entry_point_packed_gl_enums.json
-FILE: ../../../third_party/angle/src/common/PoolAlloc.cpp
-FILE: ../../../third_party/angle/src/common/PoolAlloc.h
-FILE: ../../../third_party/angle/src/common/PoolAlloc_unittest.cpp
-FILE: ../../../third_party/angle/src/common/apple_platform_utils.h
-FILE: ../../../third_party/angle/src/common/system_utils_unittest.cpp
-FILE: ../../../third_party/angle/src/common/system_utils_win32.cpp
-FILE: ../../../third_party/angle/src/common/system_utils_winuwp.cpp
-FILE: ../../../third_party/angle/src/common/third_party/xxhash/xxhash_fuzzer.cpp
-FILE: ../../../third_party/angle/src/compiler/preprocessor/preprocessor.l
-FILE: ../../../third_party/angle/src/compiler/preprocessor/preprocessor.y
-FILE: ../../../third_party/angle/src/compiler/preprocessor/preprocessor_lex_autogen.cpp
-FILE: ../../../third_party/angle/src/compiler/preprocessor/preprocessor_tab_autogen.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/BuiltinsWorkaroundGLSL.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/BuiltinsWorkaroundGLSL.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetal.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetal.h
-FILE: ../../../third_party/angle/src/compiler/translator/ValidateAST.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/ValidateAST.h
-FILE: ../../../third_party/angle/src/compiler/translator/glslang.l
-FILE: ../../../third_party/angle/src/compiler/translator/glslang.y
-FILE: ../../../third_party/angle/src/compiler/translator/glslang_lex_autogen.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/glslang_tab_autogen.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/span_unittest.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/EmulateMultiDrawShaderBuiltins.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/EmulateMultiDrawShaderBuiltins.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/NameNamelessUniformBuffers.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/NameNamelessUniformBuffers.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/RemoveInactiveInterfaceVariables.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/RemoveInactiveInterfaceVariables.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/RewriteArrayOfArrayOfOpaqueUniforms.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/RewriteAtomicCounters.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/RewriteAtomicCounters.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/RewriteCubeMapSamplersAs2DArray.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/RewriteCubeMapSamplersAs2DArray.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/RewriteDfdy.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/RewriteDfdy.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/apple/RewriteRowMajorMatrices.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/apple/RewriteRowMajorMatrices.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/BuiltIn.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/FindFunction.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/FindFunction.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/ReplaceShadowingVariables.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/ReplaceShadowingVariables.h
-FILE: ../../../third_party/angle/src/libANGLE/Context_gl.cpp
-FILE: ../../../third_party/angle/src/libANGLE/EGLSync.h
-FILE: ../../../third_party/angle/src/libANGLE/MemoryObject.cpp
-FILE: ../../../third_party/angle/src/libANGLE/MemoryObject.h
-FILE: ../../../third_party/angle/src/libANGLE/Overlay.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Overlay.h
-FILE: ../../../third_party/angle/src/libANGLE/OverlayWidgets.cpp
-FILE: ../../../third_party/angle/src/libANGLE/OverlayWidgets.h
-FILE: ../../../third_party/angle/src/libANGLE/Overlay_autogen.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Overlay_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/Semaphore.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Semaphore.h
-FILE: ../../../third_party/angle/src/libANGLE/capture/FrameCapture.cpp
-FILE: ../../../third_party/angle/src/libANGLE/capture/FrameCapture.h
-FILE: ../../../third_party/angle/src/libANGLE/capture/FrameCapture_mock.cpp
-FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gles_1_0_params.cpp
-FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gles_2_0_params.cpp
-FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gles_3_0_params.cpp
-FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gles_3_1_params.cpp
-FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gles_3_2_params.cpp
-FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gles_ext_params.cpp
-FILE: ../../../third_party/angle/src/libANGLE/capture/gl_enum_utils.cpp
-FILE: ../../../third_party/angle/src/libANGLE/capture/gl_enum_utils.h
-FILE: ../../../third_party/angle/src/libANGLE/capture/gl_enum_utils_autogen.cpp
-FILE: ../../../third_party/angle/src/libANGLE/capture/gl_enum_utils_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/format_map_desktop.cpp
-FILE: ../../../third_party/angle/src/libANGLE/overlay_widgets.json
-FILE: ../../../third_party/angle/src/libANGLE/renderer/EGLSyncImpl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/MemoryObjectImpl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/OverlayImpl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/SemaphoreImpl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/ShaderImpl.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/DynamicImage2DHLSL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/DynamicImage2DHLSL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/ExternalImageSiblingImpl11.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/ExternalImageSiblingImpl11.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/MappedSubresourceVerifier11.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/d3d11/MappedSubresourceVerifier11.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/driver_utils_mac.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/MemoryObjectGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/MemoryObjectGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/SemaphoreGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/SemaphoreGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/cgl/ContextCGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/cgl/ContextCGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/cgl/DeviceCGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/cgl/DeviceCGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/cgl/RendererCGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/cgl/RendererCGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/SyncEGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/SyncEGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/glx/RendererGLX.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/glx/RendererGLX.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/glslang_wrapper_utils.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/glslang_wrapper_utils.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/BufferMtl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/BufferMtl.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/CompilerMtl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/CompilerMtl.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/ContextMtl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/ContextMtl.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/DisplayMtl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/DisplayMtl.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/DisplayMtl_api.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/FrameBufferMtl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/FrameBufferMtl.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/IOSurfaceSurfaceMtl.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/ProgramMtl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/ProgramMtl.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/RenderBufferMtl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/RenderBufferMtl.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/RenderTargetMtl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/RenderTargetMtl.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/ShaderMtl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/ShaderMtl.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/SurfaceMtl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/SurfaceMtl.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/TextureMtl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/TextureMtl.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/VertexArrayMtl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/VertexArrayMtl.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_buffer_pool.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_buffer_pool.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_command_buffer.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_command_buffer.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_common.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_common.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_format_map.json
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_format_utils.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_format_utils.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_glslang_mtl_utils.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_glslang_mtl_utils.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_glslang_utils.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_glslang_utils.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_render_utils.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_render_utils.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_resources.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_resources.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_state_cache.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_state_cache.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_utils.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_utils.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/serial_utils.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/serial_utils_unittest.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/MemoryObjectVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/MemoryObjectVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/OverlayVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/OverlayVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/PersistentCommandPool.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/PersistentCommandPool.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/SecondaryCommandBuffer.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/SecondaryCommandBuffer.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/SemaphoreVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/SemaphoreVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/fuchsia/DisplayVkFuchsia.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/fuchsia/DisplayVkFuchsia.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/fuchsia/WindowSurfaceVkFuchsia.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/fuchsia/WindowSurfaceVkFuchsia.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/ggp/DisplayVkGGP.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/ggp/DisplayVkGGP.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/ggp/WindowSurfaceVkGGP.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/ggp/WindowSurfaceVkGGP.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/mac/DisplayVkMac.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/mac/DisplayVkMac.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/mac/WindowSurfaceVkMac.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/mac/WindowSurfaceVkMac.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/BlitResolve.frag
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/BlitResolve.frag.json
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/BlitResolveStencilNoExport.comp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/BlitResolveStencilNoExport.comp.json
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ConvertIndex.comp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ConvertIndex.comp.json
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ConvertIndexIndirectLineLoop.comp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ConvertIndirectLineLoop.comp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ConvertIndirectLineLoop.comp.json
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ImageClear.frag
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ImageClear.frag.json
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/vk_wrapper.h
-FILE: ../../../third_party/angle/src/libANGLE/trace.h
-FILE: ../../../third_party/angle/src/libANGLE/validationES32.cpp
-FILE: ../../../third_party/angle/src/libANGLE/validationES32.h
-FILE: ../../../third_party/angle/src/libANGLE/validationESEXT.cpp
-FILE: ../../../third_party/angle/src/libANGLE/validationGL1.cpp
-FILE: ../../../third_party/angle/src/libANGLE/validationGL2.cpp
-FILE: ../../../third_party/angle/src/libANGLE/validationGL3.cpp
-FILE: ../../../third_party/angle/src/libANGLE/validationGL4.cpp
-FILE: ../../../third_party/angle/src/libGLESv2/entry_points_wgl.cpp
-FILE: ../../../third_party/angle/src/libGLESv2/entry_points_wgl.h
-FILE: ../../../third_party/angle/src/libGLESv2/proc_table_egl_autogen.cpp
-FILE: ../../../third_party/angle/src/libGLESv2/proc_table_glx_autogen.cpp
-FILE: ../../../third_party/angle/src/libGLESv2/proc_table_wgl_autogen.cpp
-FILE: ../../../third_party/angle/util/Timer.cpp
-FILE: ../../../third_party/angle/util/Timer.h
-FILE: ../../../third_party/angle/util/fuchsia/ScenicWindow.cpp
-FILE: ../../../third_party/angle/util/fuchsia/ScenicWindow.h
-FILE: ../../../third_party/angle/util/posix/crash_handler_posix.cpp
-FILE: ../../../third_party/angle/util/test_utils.cpp
-FILE: ../../../third_party/angle/util/test_utils_unittest.cpp
-FILE: ../../../third_party/angle/util/test_utils_unittest_helper.cpp
-FILE: ../../../third_party/angle/util/test_utils_unittest_helper.h
-FILE: ../../../third_party/angle/util/windows/test_utils_winuwp.cpp
-----------------------------------------------------------------------------------------------------
-Copyright 2019 The ANGLE Project Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-    Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.
-
-    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
-    Ltd., nor the names of their contributors may be used to endorse
-    or promote products derived from this software without specific
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: angle
-ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/metal/shaders/blit.metal + ../../../third_party/angle/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/shaders/blit.metal
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/shaders/clear.metal
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/shaders/common.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/shaders/gen_indices.metal
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/shaders/visibility.metal
-----------------------------------------------------------------------------------------------------
-Copyright 2019 The ANGLE Project. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-    Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.
-
-    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
-    Ltd., nor the names of their contributors may be used to endorse
-    or promote products derived from this software without specific
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/contrib/optimizations/insert_string.h + ../../../LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/zlib/contrib/optimizations/insert_string.h
-FILE: ../../../third_party/zlib/google/compression_utils_portable.cc
-FILE: ../../../third_party/zlib/google/compression_utils_portable.h
-----------------------------------------------------------------------------------------------------
-Copyright 2019 The Chromium Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: angle
-ORIGIN: ../../../third_party/angle/src/common/fuchsia_egl/fuchsia_egl.c + ../../../fuchsia/sdk/linux/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/src/common/fuchsia_egl/fuchsia_egl.c
-FILE: ../../../third_party/angle/src/common/fuchsia_egl/fuchsia_egl.h
-FILE: ../../../third_party/angle/src/common/fuchsia_egl/fuchsia_egl_backend.h
-----------------------------------------------------------------------------------------------------
-Copyright 2019 The Fuchsia Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: icu
-ORIGIN: ../../../third_party/icu/filters/android.json + ../../../third_party/dart/runtime/third_party/double-conversion/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/icu/filters/android.json
-FILE: ../../../third_party/icu/filters/cast.json
-FILE: ../../../third_party/icu/filters/chromeos.json
-FILE: ../../../third_party/icu/filters/common.json
-FILE: ../../../third_party/icu/filters/flutter.json
-FILE: ../../../third_party/icu/filters/ios.json
-----------------------------------------------------------------------------------------------------
-Copyright 2019 the V8 project authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google LLC nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: angle
-ORIGIN: ../../../third_party/angle/include/platform/Platform.h + ../../../third_party/angle/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/include/platform/Platform.h
-FILE: ../../../third_party/angle/infra/specs/gn_isolate_map.pyl
-FILE: ../../../third_party/angle/samples/capture_replay/angle_trace_gl.h
-FILE: ../../../third_party/angle/scripts/entry_point_packed_egl_enums.json
-FILE: ../../../third_party/angle/src/common/apple/SoftLinking.h
-FILE: ../../../third_party/angle/src/common/entry_points_enum_autogen.cpp
-FILE: ../../../third_party/angle/src/common/entry_points_enum_autogen.h
-FILE: ../../../third_party/angle/src/common/gl/cgl/FunctionsCGL.cpp
-FILE: ../../../third_party/angle/src/common/gl/cgl/FunctionsCGL.h
-FILE: ../../../third_party/angle/src/common/system_utils_apple.cpp
-FILE: ../../../third_party/angle/src/common/vulkan/vulkan_icd.cpp
-FILE: ../../../third_party/angle/src/common/vulkan/vulkan_icd.h
-FILE: ../../../third_party/angle/src/compiler/translator/DriverUniformMetal.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/DriverUniformMetal.h
-FILE: ../../../third_party/angle/src/compiler/translator/ImmutableString_ESSL_autogen.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/ImmutableString_autogen.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/SymbolTable_ESSL_autogen.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/SymbolTable_autogen.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/SymbolTable_autogen.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/AddExplicitTypeCasts.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/AddExplicitTypeCasts.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/AstHelpers.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/AstHelpers.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/DebugSink.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/DiscoverDependentFunctions.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/DiscoverDependentFunctions.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/DiscoverEnclosingFunctionTraverser.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/DiscoverEnclosingFunctionTraverser.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/EmitMetal.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/EmitMetal.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/FixTypeConstructors.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/FixTypeConstructors.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/HoistConstants.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/HoistConstants.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/IdGen.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/IdGen.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/IntermRebuild.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/IntroduceVertexIndexID.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/IntroduceVertexIndexID.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/Layout.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/Layout.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/MapFunctionsToDefinitions.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/MapFunctionsToDefinitions.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/MapSymbols.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/MapSymbols.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/ModifyStruct.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/ModifyStruct.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/Name.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/Name.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/Pipeline.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/Pipeline.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/ProgramPrelude.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/ProgramPrelude.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/ReduceInterfaceBlocks.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/ReduceInterfaceBlocks.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/Reference.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/RewriteCaseDeclarations.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/RewriteCaseDeclarations.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/RewriteOutArgs.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/RewriteOutArgs.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/RewritePipelines.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/RewritePipelines.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/RewriteUnaddressableReferences.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/RewriteUnaddressableReferences.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/SeparateCompoundExpressions.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/SeparateCompoundExpressions.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/SeparateCompoundStructDeclarations.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/SeparateCompoundStructDeclarations.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/SkippingTraverser.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/SymbolEnv.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/SymbolEnv.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/ToposortStructs.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/ToposortStructs.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/TransposeRowMajorMatrices.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/TransposeRowMajorMatrices.h
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/WrapMain.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/WrapMain.h
-FILE: ../../../third_party/angle/src/compiler/translator/ValidateBarrierFunctionCall.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/ValidateBarrierFunctionCall.h
-FILE: ../../../third_party/angle/src/compiler/translator/ValidateClipCullDistance.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/ValidateClipCullDistance.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/ConvertUnsupportedConstructorsToFunctionCalls.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/ConvertUnsupportedConstructorsToFunctionCalls.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/ForcePrecisionQualifier.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/ForcePrecisionQualifier.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/RemoveAtomicCounterBuiltins.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/RemoveAtomicCounterBuiltins.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/RecordUniformBlocksWithLargeArrayMember.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/RecordUniformBlocksWithLargeArrayMember.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/vulkan/FlagSamplersWithTexelFetch.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/vulkan/FlagSamplersWithTexelFetch.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/vulkan/ReplaceForShaderFramebufferFetch.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/vulkan/ReplaceForShaderFramebufferFetch.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/vulkan/RewriteInterpolateAtOffset.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/vulkan/RewriteInterpolateAtOffset.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/AsNode.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/BuiltIn_ESSL_autogen.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/BuiltIn_complete_autogen.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/DriverUniform.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/DriverUniform.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/IntermRebuild.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/IntermRebuild.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/NodeType.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/ReplaceArrayOfMatrixVarying.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/ReplaceArrayOfMatrixVarying.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/ReplaceClipCullDistanceVariable.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/ReplaceClipCullDistanceVariable.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/RewriteSampleMaskVariable.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/RewriteSampleMaskVariable.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/RunAtTheBeginningOfShader.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/RunAtTheBeginningOfShader.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/SpecializationConstant.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/SpecializationConstant.h
-FILE: ../../../third_party/angle/src/gpu_info_util/SystemInfo_apple.mm
-FILE: ../../../third_party/angle/src/gpu_info_util/SystemInfo_fuchsia.cpp
-FILE: ../../../third_party/angle/src/gpu_info_util/SystemInfo_ios.cpp
-FILE: ../../../third_party/angle/src/gpu_info_util/SystemInfo_vulkan.cpp
-FILE: ../../../third_party/angle/src/gpu_info_util/SystemInfo_vulkan.h
-FILE: ../../../third_party/angle/src/libANGLE/Context_gl_1_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/Context_gl_2_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/Context_gl_3_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/Context_gl_4_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/Context_gles_1_0_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/Context_gles_2_0_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/Context_gles_3_0_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/Context_gles_3_1_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/Context_gles_3_2_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/Context_gles_ext_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/InfoLog.h
-FILE: ../../../third_party/angle/src/libANGLE/ProgramExecutable.cpp
-FILE: ../../../third_party/angle/src/libANGLE/ProgramExecutable.h
-FILE: ../../../third_party/angle/src/libANGLE/angletypes_unittest.cpp
-FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gl_1_autogen.cpp
-FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gl_1_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gl_2_autogen.cpp
-FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gl_2_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gl_3_autogen.cpp
-FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gl_3_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gl_4_autogen.cpp
-FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gl_4_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gles_1_0_autogen.cpp
-FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gles_1_0_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gles_2_0_autogen.cpp
-FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gles_2_0_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gles_3_0_autogen.cpp
-FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gles_3_0_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gles_3_1_autogen.cpp
-FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gles_3_1_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gles_3_2_autogen.cpp
-FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gles_3_2_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gles_ext_autogen.cpp
-FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gles_ext_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/capture/frame_capture_replay_autogen.cpp
-FILE: ../../../third_party/angle/src/libANGLE/capture/frame_capture_utils.cpp
-FILE: ../../../third_party/angle/src/libANGLE/capture/frame_capture_utils.h
-FILE: ../../../third_party/angle/src/libANGLE/capture/frame_capture_utils_autogen.cpp
-FILE: ../../../third_party/angle/src/libANGLE/capture/frame_capture_utils_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/BufferImpl.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/EGLReusableSync.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/EGLReusableSync.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/EGLSyncImpl.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/FormatID_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/Format_table_autogen.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/driver_utils_d3d.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d/driver_utils_d3d.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d_format.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/d3d_format.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/dxgi_format_map.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/dxgi_format_map_autogen.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/apple/DisplayApple_api.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/apple/DisplayApple_api.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/ContextEAGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/ContextEAGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/DeviceEAGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/DeviceEAGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/DisplayEAGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/FunctionsEAGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/FunctionsEAGL.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/PbufferSurfaceEAGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/PbufferSurfaceEAGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/RendererEAGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/RendererEAGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/glx/PixmapSurfaceGLX.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/glx/PixmapSurfaceGLX.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/glx/glx_utils.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/glx/glx_utils.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/load_functions_table_autogen.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/IOSurfaceSurfaceMtl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/SamplerMtl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/SamplerMtl.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/TransformFeedbackMtl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/TransformFeedbackMtl.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/file_hooking/shader_cache_file_hooking.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_format_table_autogen.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/shaders/format_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/shaders/mtl_default_shaders_src_autogen.inc
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/shaders/mtl_default_shaders_src_autogen.metal
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/CommandProcessor.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/CommandProcessor.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/DebugAnnotatorVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/DebugAnnotatorVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/ProgramExecutableVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/ProgramExecutableVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/android/vk_android_utils.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/android/vk_android_utils.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/linux/display/DisplayVkSimple.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/linux/display/DisplayVkSimple.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/linux/display/WindowSurfaceVkSimple.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/linux/display/WindowSurfaceVkSimple.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/linux/headless/DisplayVkHeadless.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/linux/headless/DisplayVkHeadless.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/linux/headless/WindowSurfaceVkHeadless.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/linux/headless/WindowSurfaceVkHeadless.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/mac/IOSurfaceSurfaceVkMac.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/mac/IOSurfaceSurfaceVkMac.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/ConvertIndexIndirectLineLoop.comp.json
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/GenerateMipmap.comp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/GenerateMipmap.comp.json
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/vk_format_table_autogen.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/vk_mandatory_format_support_table_autogen.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/vk_mem_alloc_wrapper.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/vk_mem_alloc_wrapper.h
-FILE: ../../../third_party/angle/src/libANGLE/validationEGL_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/validationES1_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/validationES2_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/validationES31_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/validationES32_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/validationES3_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/validationESEXT_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/validationGL11_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/validationGL12_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/validationGL13_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/validationGL14_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/validationGL15_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/validationGL1_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/validationGL21_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/validationGL2_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/validationGL31_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/validationGL32_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/validationGL33_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/validationGL3_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/validationGL41_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/validationGL42_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/validationGL43_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/validationGL44_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/validationGL45_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/validationGL46_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/validationGL4_autogen.h
-FILE: ../../../third_party/angle/src/libEGL/libEGL_autogen.cpp
-FILE: ../../../third_party/angle/src/libEGL/libEGL_autogen.def
-FILE: ../../../third_party/angle/src/libGLESv2/egl_ext_stubs.cpp
-FILE: ../../../third_party/angle/src/libGLESv2/egl_ext_stubs_autogen.h
-FILE: ../../../third_party/angle/src/libGLESv2/egl_get_labeled_object_data.json
-FILE: ../../../third_party/angle/src/libGLESv2/egl_stubs.cpp
-FILE: ../../../third_party/angle/src/libGLESv2/egl_stubs_autogen.h
-FILE: ../../../third_party/angle/src/libGLESv2/entry_points_cl_autogen.cpp
-FILE: ../../../third_party/angle/src/libGLESv2/entry_points_cl_autogen.h
-FILE: ../../../third_party/angle/src/libGLESv2/entry_points_egl_autogen.cpp
-FILE: ../../../third_party/angle/src/libGLESv2/entry_points_egl_autogen.h
-FILE: ../../../third_party/angle/src/libGLESv2/entry_points_egl_ext_autogen.cpp
-FILE: ../../../third_party/angle/src/libGLESv2/entry_points_egl_ext_autogen.h
-FILE: ../../../third_party/angle/src/libGLESv2/entry_points_gl_1_autogen.cpp
-FILE: ../../../third_party/angle/src/libGLESv2/entry_points_gl_1_autogen.h
-FILE: ../../../third_party/angle/src/libGLESv2/entry_points_gl_2_autogen.cpp
-FILE: ../../../third_party/angle/src/libGLESv2/entry_points_gl_2_autogen.h
-FILE: ../../../third_party/angle/src/libGLESv2/entry_points_gl_3_autogen.cpp
-FILE: ../../../third_party/angle/src/libGLESv2/entry_points_gl_3_autogen.h
-FILE: ../../../third_party/angle/src/libGLESv2/entry_points_gl_4_autogen.cpp
-FILE: ../../../third_party/angle/src/libGLESv2/entry_points_gl_4_autogen.h
-FILE: ../../../third_party/angle/src/libGLESv2/entry_points_gles_1_0_autogen.cpp
-FILE: ../../../third_party/angle/src/libGLESv2/entry_points_gles_1_0_autogen.h
-FILE: ../../../third_party/angle/src/libGLESv2/entry_points_gles_2_0_autogen.cpp
-FILE: ../../../third_party/angle/src/libGLESv2/entry_points_gles_2_0_autogen.h
-FILE: ../../../third_party/angle/src/libGLESv2/entry_points_gles_3_0_autogen.cpp
-FILE: ../../../third_party/angle/src/libGLESv2/entry_points_gles_3_0_autogen.h
-FILE: ../../../third_party/angle/src/libGLESv2/entry_points_gles_3_1_autogen.cpp
-FILE: ../../../third_party/angle/src/libGLESv2/entry_points_gles_3_1_autogen.h
-FILE: ../../../third_party/angle/src/libGLESv2/entry_points_gles_3_2_autogen.cpp
-FILE: ../../../third_party/angle/src/libGLESv2/entry_points_gles_3_2_autogen.h
-FILE: ../../../third_party/angle/src/libGLESv2/entry_points_gles_ext_autogen.cpp
-FILE: ../../../third_party/angle/src/libGLESv2/entry_points_gles_ext_autogen.h
-FILE: ../../../third_party/angle/src/libGLESv2/libGLESv2_autogen.cpp
-FILE: ../../../third_party/angle/src/libGLESv2/libGLESv2_autogen.def
-FILE: ../../../third_party/angle/src/libGLESv2/libGLESv2_no_capture_autogen.def
-FILE: ../../../third_party/angle/src/libGLESv2/libGLESv2_with_capture_autogen.def
-FILE: ../../../third_party/angle/src/libGLESv2/opengl32_autogen.def
-FILE: ../../../third_party/angle/src/libGLESv2/opengl32_with_wgl_autogen.def
-FILE: ../../../third_party/angle/src/libOpenCL/libOpenCL_autogen.cpp
-FILE: ../../../third_party/angle/util/capture/angle_trace_gl.h
-FILE: ../../../third_party/angle/util/capture/frame_capture_test_utils.h
-FILE: ../../../third_party/angle/util/display/DisplayPixmap.cpp
-FILE: ../../../third_party/angle/util/display/DisplayWindow.cpp
-FILE: ../../../third_party/angle/util/display/DisplayWindow.h
-FILE: ../../../third_party/angle/util/ios/IOSPixmap.h
-FILE: ../../../third_party/angle/util/ios/IOSPixmap.mm
-FILE: ../../../third_party/angle/util/ios/IOSWindow.h
-FILE: ../../../third_party/angle/util/ios/IOSWindow.mm
-FILE: ../../../third_party/angle/util/ios/ios_main.mm
-FILE: ../../../third_party/angle/util/png_utils.cpp
-FILE: ../../../third_party/angle/util/png_utils.h
-----------------------------------------------------------------------------------------------------
-Copyright 2020 The ANGLE Project Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-    Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.
-
-    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
-    Ltd., nor the names of their contributors may be used to endorse
-    or promote products derived from this software without specific
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: angle
-ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/metal/shaders/constants.h + ../../../third_party/angle/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/shaders/constants.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/shaders/copy_buffer.metal
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/shaders/gen_mipmap.metal
-----------------------------------------------------------------------------------------------------
-Copyright 2020 The ANGLE Project. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-    Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.
-
-    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
-    Ltd., nor the names of their contributors may be used to endorse
-    or promote products derived from this software without specific
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: abseil-cpp
-ORIGIN: ../../../third_party/abseil-cpp/absl_hardening_test.cc + ../../../LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/abseil-cpp/absl_hardening_test.cc
-----------------------------------------------------------------------------------------------------
-Copyright 2020 The Chromium Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: angle
-ORIGIN: ../../../third_party/angle/android/AndroidManifest.xml + ../../../third_party/angle/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/android/AndroidManifest.xml
-FILE: ../../../third_party/angle/include/angle_cl.h
-FILE: ../../../third_party/angle/infra/specs/angle_mb_config.pyl
-FILE: ../../../third_party/angle/infra/specs/mixins.pyl
-FILE: ../../../third_party/angle/infra/specs/test_suite_exceptions.pyl
-FILE: ../../../third_party/angle/infra/specs/test_suites.pyl
-FILE: ../../../third_party/angle/infra/specs/variants.pyl
-FILE: ../../../third_party/angle/infra/specs/waterfalls.pyl
-FILE: ../../../third_party/angle/samples/multiple_contexts/MultipleContexts.cpp
-FILE: ../../../third_party/angle/samples/torus_lighting/TorusBufferStorage.cpp
-FILE: ../../../third_party/angle/samples/torus_lighting/TorusLightingES1.cpp
-FILE: ../../../third_party/angle/samples/torus_lighting/TorusLightingES2.cpp
-FILE: ../../../third_party/angle/samples/torus_lighting/torus.h
-FILE: ../../../third_party/angle/src/common/CircularBuffer.h
-FILE: ../../../third_party/angle/src/common/CircularBuffer_unittest.cpp
-FILE: ../../../third_party/angle/src/common/Spinlock.h
-FILE: ../../../third_party/angle/src/common/SynchronizedValue.h
-FILE: ../../../third_party/angle/src/common/angle_version_info.cpp
-FILE: ../../../third_party/angle/src/common/angle_version_info.h
-FILE: ../../../third_party/angle/src/common/apple/apple_platform.h
-FILE: ../../../third_party/angle/src/common/linux/dma_buf_utils.cpp
-FILE: ../../../third_party/angle/src/common/linux/dma_buf_utils.h
-FILE: ../../../third_party/angle/src/common/serializer/JsonSerializer.cpp
-FILE: ../../../third_party/angle/src/common/serializer/JsonSerializer.h
-FILE: ../../../third_party/angle/src/common/serializer/JsonSerializer_unittest.cpp
-FILE: ../../../third_party/angle/src/common/spirv/angle_spirv_utils.cpp
-FILE: ../../../third_party/angle/src/common/spirv/spirv_instruction_builder_autogen.cpp
-FILE: ../../../third_party/angle/src/common/spirv/spirv_instruction_builder_autogen.h
-FILE: ../../../third_party/angle/src/common/spirv/spirv_instruction_parser_autogen.cpp
-FILE: ../../../third_party/angle/src/common/spirv/spirv_instruction_parser_autogen.h
-FILE: ../../../third_party/angle/src/common/spirv/spirv_types.h
-FILE: ../../../third_party/angle/src/common/vulkan/libvulkan_loader.cpp
-FILE: ../../../third_party/angle/src/common/vulkan/libvulkan_loader.h
-FILE: ../../../third_party/angle/src/compiler/translator/BuildSPIRV.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/BuildSPIRV.h
-FILE: ../../../third_party/angle/src/compiler/translator/Operator_autogen.h
-FILE: ../../../third_party/angle/src/compiler/translator/OutputSPIRV.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/OutputSPIRV.h
-FILE: ../../../third_party/angle/src/compiler/translator/ValidateTypeSizeLimitations.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/ValidateTypeSizeLimitations.h
-FILE: ../../../third_party/angle/src/compiler/translator/glslang_wrapper.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/glslang_wrapper.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/ClampIndirectIndices.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/ClampIndirectIndices.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/MonomorphizeUnsupportedFunctions.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/MonomorphizeUnsupportedFunctions.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/RewriteArrayOfArrayOfOpaqueUniforms.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/vulkan/DeclarePerVertexBlocks.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/vulkan/DeclarePerVertexBlocks.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/vulkan/EmulateFragColorData.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/vulkan/EmulateFragColorData.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/vulkan/RewriteR32fImages.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/vulkan/RewriteR32fImages.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/FindPreciseNodes.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_util/FindPreciseNodes.h
-FILE: ../../../third_party/angle/src/libANGLE/CLBitField.h
-FILE: ../../../third_party/angle/src/libANGLE/CLBuffer.cpp
-FILE: ../../../third_party/angle/src/libANGLE/CLBuffer.h
-FILE: ../../../third_party/angle/src/libANGLE/CLCommandQueue.cpp
-FILE: ../../../third_party/angle/src/libANGLE/CLCommandQueue.h
-FILE: ../../../third_party/angle/src/libANGLE/CLContext.cpp
-FILE: ../../../third_party/angle/src/libANGLE/CLContext.h
-FILE: ../../../third_party/angle/src/libANGLE/CLDevice.cpp
-FILE: ../../../third_party/angle/src/libANGLE/CLDevice.h
-FILE: ../../../third_party/angle/src/libANGLE/CLEvent.cpp
-FILE: ../../../third_party/angle/src/libANGLE/CLEvent.h
-FILE: ../../../third_party/angle/src/libANGLE/CLImage.cpp
-FILE: ../../../third_party/angle/src/libANGLE/CLImage.h
-FILE: ../../../third_party/angle/src/libANGLE/CLKernel.cpp
-FILE: ../../../third_party/angle/src/libANGLE/CLKernel.h
-FILE: ../../../third_party/angle/src/libANGLE/CLMemory.cpp
-FILE: ../../../third_party/angle/src/libANGLE/CLMemory.h
-FILE: ../../../third_party/angle/src/libANGLE/CLObject.cpp
-FILE: ../../../third_party/angle/src/libANGLE/CLObject.h
-FILE: ../../../third_party/angle/src/libANGLE/CLPlatform.cpp
-FILE: ../../../third_party/angle/src/libANGLE/CLPlatform.h
-FILE: ../../../third_party/angle/src/libANGLE/CLProgram.cpp
-FILE: ../../../third_party/angle/src/libANGLE/CLProgram.h
-FILE: ../../../third_party/angle/src/libANGLE/CLRefPointer.h
-FILE: ../../../third_party/angle/src/libANGLE/CLSampler.cpp
-FILE: ../../../third_party/angle/src/libANGLE/CLSampler.h
-FILE: ../../../third_party/angle/src/libANGLE/CLtypes.h
-FILE: ../../../third_party/angle/src/libANGLE/capture/frame_capture_utils_mock.cpp
-FILE: ../../../third_party/angle/src/libANGLE/capture/trace_fixture.cpp
-FILE: ../../../third_party/angle/src/libANGLE/capture/trace_fixture.h
-FILE: ../../../third_party/angle/src/libANGLE/cl_utils.cpp
-FILE: ../../../third_party/angle/src/libANGLE/cl_utils.h
-FILE: ../../../third_party/angle/src/libANGLE/gles_extensions_autogen.cpp
-FILE: ../../../third_party/angle/src/libANGLE/gles_extensions_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/CLCommandQueueImpl.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/CLCommandQueueImpl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/CLContextImpl.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/CLContextImpl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/CLDeviceImpl.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/CLDeviceImpl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/CLEventImpl.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/CLEventImpl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/CLExtensions.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/CLExtensions.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/CLKernelImpl.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/CLKernelImpl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/CLMemoryImpl.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/CLMemoryImpl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/CLPlatformImpl.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/CLPlatformImpl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/CLProgramImpl.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/CLProgramImpl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/CLSamplerImpl.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/CLSamplerImpl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/CLtypes.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/ImageImpl.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/ShaderInterfaceVariableInfoMap.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/ShaderInterfaceVariableInfoMap.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/cl/CLCommandQueueCL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/cl/CLCommandQueueCL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/cl/CLContextCL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/cl/CLContextCL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/cl/CLDeviceCL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/cl/CLDeviceCL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/cl/CLEventCL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/cl/CLEventCL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/cl/CLKernelCL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/cl/CLKernelCL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/cl/CLMemoryCL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/cl/CLMemoryCL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/cl/CLPlatformCL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/cl/CLPlatformCL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/cl/CLProgramCL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/cl/CLProgramCL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/cl/CLSamplerCL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/cl/CLSamplerCL.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/cl/cl_types.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/cl/cl_util.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/cl/cl_util.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/driver_utils_ios.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/DisplayGL_unittest.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/DeviceMtl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/DeviceMtl.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/ImageMtl.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/ImageMtl.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/ProvokingVertexHelper.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/ProvokingVertexHelper.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_context_device.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_context_device.mm
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_resource_spi.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/shaders/rewrite_indices.metal
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/CLCommandQueueVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/CLCommandQueueVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/CLContextVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/CLContextVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/CLDeviceVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/CLDeviceVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/CLEventVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/CLEventVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/CLKernelVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/CLKernelVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/CLMemoryVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/CLMemoryVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/CLPlatformVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/CLPlatformVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/CLProgramVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/CLProgramVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/CLSamplerVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/CLSamplerVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/VkImageImageSiblingVk.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/VkImageImageSiblingVk.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/VulkanSecondaryCommandBuffer.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/VulkanSecondaryCommandBuffer.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/android/AHBFunctions.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/android/AHBFunctions.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/cl_types.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/linux/DisplayVkLinux.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/linux/DisplayVkLinux.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/linux/DmaBufImageSiblingVkLinux.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/linux/DmaBufImageSiblingVkLinux.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/null/DisplayVkNull.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/null/DisplayVkNull.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/vk_command_buffer_utils.h
-FILE: ../../../third_party/angle/src/libANGLE/validationCL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/validationCL.h
-FILE: ../../../third_party/angle/src/libANGLE/validationCL_autogen.h
-FILE: ../../../third_party/angle/src/libGLESv2/cl_dispatch_table.cpp
-FILE: ../../../third_party/angle/src/libGLESv2/cl_dispatch_table.h
-FILE: ../../../third_party/angle/src/libGLESv2/cl_stubs.cpp
-FILE: ../../../third_party/angle/src/libGLESv2/cl_stubs_autogen.h
-FILE: ../../../third_party/angle/src/libGLESv2/entry_points_cl_utils.cpp
-FILE: ../../../third_party/angle/src/libGLESv2/entry_points_cl_utils.h
-FILE: ../../../third_party/angle/src/libGLESv2/proc_table_cl.h
-FILE: ../../../third_party/angle/src/libGLESv2/proc_table_cl_autogen.cpp
-FILE: ../../../third_party/angle/src/libOpenCL/dispatch.cpp
-FILE: ../../../third_party/angle/src/libOpenCL/dispatch.h
-FILE: ../../../third_party/angle/src/libOpenCL/libOpenCL_autogen.map
-FILE: ../../../third_party/angle/util/capture/frame_capture_test_utils.cpp
-FILE: ../../../third_party/angle/util/capture/traces_export.h
-----------------------------------------------------------------------------------------------------
-Copyright 2021 The ANGLE Project Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-    Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.
-
-    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
-    Ltd., nor the names of their contributors may be used to endorse
-    or promote products derived from this software without specific
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: angle
-ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/metal/shaders/rewrite_indices_shared.h + ../../../third_party/angle/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/shaders/rewrite_indices_shared.h
-----------------------------------------------------------------------------------------------------
-Copyright 2021 The ANGLE Project. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-    Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.
-
-    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
-    Ltd., nor the names of their contributors may be used to endorse
-    or promote products derived from this software without specific
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: angle
-ORIGIN: ../../../third_party/angle/infra/config/main.star + ../../../LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/infra/config/main.star
-----------------------------------------------------------------------------------------------------
-Copyright 2021 The Chromium Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: angle
-ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/vulkan/linux/wayland/DisplayVkWayland.cpp + ../../../third_party/angle/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/linux/wayland/DisplayVkWayland.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/linux/wayland/DisplayVkWayland.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/linux/wayland/WindowSurfaceVkWayland.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/linux/wayland/WindowSurfaceVkWayland.h
-----------------------------------------------------------------------------------------------------
-Copyright 2021-2022 The ANGLE Project Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-    Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.
-
-    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
-    Ltd., nor the names of their contributors may be used to endorse
-    or promote products derived from this software without specific
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: angle
-ORIGIN: ../../../third_party/angle/include/platform/FeaturesD3D_autogen.h + ../../../third_party/angle/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/include/platform/FeaturesD3D_autogen.h
-FILE: ../../../third_party/angle/include/platform/FeaturesGL_autogen.h
-FILE: ../../../third_party/angle/include/platform/FeaturesMtl_autogen.h
-FILE: ../../../third_party/angle/include/platform/FeaturesVk_autogen.h
-FILE: ../../../third_party/angle/include/platform/FrontendFeatures_autogen.h
-FILE: ../../../third_party/angle/include/platform/d3d_features.json
-FILE: ../../../third_party/angle/include/platform/frontend_features.json
-FILE: ../../../third_party/angle/include/platform/gl_features.json
-FILE: ../../../third_party/angle/include/platform/mtl_features.json
-FILE: ../../../third_party/angle/include/platform/vk_features.json
-FILE: ../../../third_party/angle/samples/hello_triangle_gl/HelloTriangleGL.cpp
-FILE: ../../../third_party/angle/scripts/angle_android_codegen.go
-FILE: ../../../third_party/angle/src/common/apple_platform_utils.mm
-FILE: ../../../third_party/angle/src/compiler/translator/BaseTypes.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalConstantNames.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/GuardFragDepthWrite.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/GuardFragDepthWrite.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/RewritePixelLocalStorage.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/RewritePixelLocalStorage.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/AggregateAssignArraysInSSBOs.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/AggregateAssignArraysInSSBOs.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/AggregateAssignStructsInSSBOs.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/d3d/AggregateAssignStructsInSSBOs.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/vulkan/EmulateAdvancedBlendEquations.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/vulkan/EmulateAdvancedBlendEquations.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/vulkan/EmulateDithering.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/vulkan/EmulateDithering.h
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/vulkan/EmulateYUVBuiltIns.cpp
-FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/vulkan/EmulateYUVBuiltIns.h
-FILE: ../../../third_party/angle/src/image_util/loadimage_astc.cpp
-FILE: ../../../third_party/angle/src/libANGLE/MemoryShaderCache.cpp
-FILE: ../../../third_party/angle/src/libANGLE/MemoryShaderCache.h
-FILE: ../../../third_party/angle/src/libANGLE/Overlay_font_autogen.cpp
-FILE: ../../../third_party/angle/src/libANGLE/Overlay_font_autogen.h
-FILE: ../../../third_party/angle/src/libANGLE/PixelLocalStorage.cpp
-FILE: ../../../third_party/angle/src/libANGLE/PixelLocalStorage.h
-FILE: ../../../third_party/angle/src/libANGLE/capture/capture_egl.cpp
-FILE: ../../../third_party/angle/src/libANGLE/capture/capture_egl.h
-FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gl_1_params.cpp
-FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gl_2_params.cpp
-FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gl_3_params.cpp
-FILE: ../../../third_party/angle/src/libANGLE/capture/capture_gl_4_params.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/FramebufferImpl.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/ProgramImpl.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/ProgramPipelineImpl.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/RenderbufferImpl.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/TransformFeedbackImpl.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/VertexArrayImpl.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/Suballocation.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/Suballocation.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/linux/gbm/DisplayVkGbm.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/linux/gbm/DisplayVkGbm.h
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/OverlayDraw.frag
-FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/OverlayDraw.vert
-FILE: ../../../third_party/angle/src/libGLESv2/entry_points_glx.cpp
-FILE: ../../../third_party/angle/src/libGLESv2/entry_points_glx.h
-FILE: ../../../third_party/angle/util/angle_features_autogen.cpp
-FILE: ../../../third_party/angle/util/angle_features_autogen.h
-FILE: ../../../third_party/angle/util/linux/LinuxWindow.cpp
-FILE: ../../../third_party/angle/util/linux/wayland/WaylandWindow.cpp
-FILE: ../../../third_party/angle/util/linux/wayland/WaylandWindow.h
-----------------------------------------------------------------------------------------------------
-Copyright 2022 The ANGLE Project Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-    Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.
-
-    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
-    Ltd., nor the names of their contributors may be used to endorse
-    or promote products derived from this software without specific
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/slide_hash_simd.h + ../../../LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/zlib/slide_hash_simd.h
-----------------------------------------------------------------------------------------------------
-Copyright 2022 The Chromium Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: angle
-ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/DmaBufImageSiblingEGL.cpp + ../../../third_party/angle/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/DmaBufImageSiblingEGL.cpp
-FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/DmaBufImageSiblingEGL.h
-FILE: ../../../third_party/angle/util/fuchsia/FuchsiaPixmap.cpp
-FILE: ../../../third_party/angle/util/fuchsia/FuchsiaPixmap.h
-----------------------------------------------------------------------------------------------------
-Copyright The ANGLE Project Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-    Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.
-
-    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
-    Ltd., nor the names of their contributors may be used to endorse
-    or promote products derived from this software without specific
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-buffer.h
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-buffer.h
-----------------------------------------------------------------------------------------------------
-Copyright © 1998-2004  David Turner and Werner Lemberg
-Copyright © 2004,2007,2009  Red Hat, Inc.
-Copyright © 2011,2012  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-buffer.cc
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-buffer.cc
-FILE: ../../../third_party/harfbuzz/src/hb-buffer.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 1998-2004  David Turner and Werner Lemberg
-Copyright © 2004,2007,2009,2010  Red Hat, Inc.
-Copyright © 2011,2012  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-layout.cc
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ot-layout.cc
-----------------------------------------------------------------------------------------------------
-Copyright © 1998-2004  David Turner and Werner Lemberg
-Copyright © 2006  Behdad Esfahbod
-Copyright © 2007,2008,2009  Red Hat, Inc.
-Copyright © 2012,2013  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-atomic.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-atomic.hh
-FILE: ../../../third_party/harfbuzz/src/hb-mutex.hh
-FILE: ../../../third_party/harfbuzz/src/hb-object.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2007  Chris Wilson
-Copyright © 2009,2010  Red Hat, Inc.
-Copyright © 2011,2012  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-layout.h
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ot-layout.h
-----------------------------------------------------------------------------------------------------
-Copyright © 2007,2008,2009  Red Hat, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-layout-gdef-table.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ot-layout-gdef-table.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2007,2008,2009  Red Hat, Inc.
-Copyright © 2010,2011,2012  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-layout-common.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ot-layout-common.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2007,2008,2009  Red Hat, Inc.
-Copyright © 2010,2012  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-common.h
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-common.h
-FILE: ../../../third_party/harfbuzz/src/hb.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2007,2008,2009  Red Hat, Inc.
-Copyright © 2011,2012  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-open-file.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-open-file.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2007,2008,2009  Red Hat, Inc.
-Copyright © 2012  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-face.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ot-face.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-layout.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2007,2008,2009  Red Hat, Inc.
-Copyright © 2012,2013  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-face-table-list.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ot-face-table-list.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2007,2008,2009  Red Hat, Inc.
-Copyright © 2012,2013  Google, Inc.
-Copyright © 2019, Facebook Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/main.cc
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/main.cc
-----------------------------------------------------------------------------------------------------
-Copyright © 2007,2008,2009  Red Hat, Inc.
-Copyright © 2018,2019,2020  Ebrahim Byagowi
-Copyright © 2018  Khaled Hosny
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-layout-gsubgpos.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ot-layout-gsubgpos.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2007,2008,2009,2010  Red Hat, Inc.
-Copyright © 2010,2012  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-layout-gpos-table.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ot-layout-gpos-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-layout-gsub-table.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2007,2008,2009,2010  Red Hat, Inc.
-Copyright © 2010,2012,2013  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-open-type.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-open-type.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2007,2008,2009,2010  Red Hat, Inc.
-Copyright © 2012  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-dispatch.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-dispatch.hh
-FILE: ../../../third_party/harfbuzz/src/hb-machinery.hh
-FILE: ../../../third_party/harfbuzz/src/hb-sanitize.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2007,2008,2009,2010  Red Hat, Inc.
-Copyright © 2012,2018  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-serialize.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-serialize.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2007,2008,2009,2010  Red Hat, Inc.
-Copyright © 2012,2018  Google, Inc.
-Copyright © 2019  Facebook, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-blob.h
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-blob.h
-FILE: ../../../third_party/harfbuzz/src/hb-face.h
-FILE: ../../../third_party/harfbuzz/src/hb-font.h
-FILE: ../../../third_party/harfbuzz/src/hb-ot.h
-FILE: ../../../third_party/harfbuzz/src/hb.h
-----------------------------------------------------------------------------------------------------
-Copyright © 2009  Red Hat, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-icu.cc
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-icu.cc
-----------------------------------------------------------------------------------------------------
-Copyright © 2009  Red Hat, Inc.
-Copyright © 2009  Keith Stribley
-Copyright © 2011  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ft.cc
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ft.cc
-----------------------------------------------------------------------------------------------------
-Copyright © 2009  Red Hat, Inc.
-Copyright © 2009  Keith Stribley
-Copyright © 2015  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-unicode.cc
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-unicode.cc
-FILE: ../../../third_party/harfbuzz/src/hb-unicode.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2009  Red Hat, Inc.
-Copyright © 2011  Codethink Limited
-Copyright © 2010,2011,2012  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-unicode.h
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-unicode.h
-----------------------------------------------------------------------------------------------------
-Copyright © 2009  Red Hat, Inc.
-Copyright © 2011  Codethink Limited
-Copyright © 2011,2012  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-face.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-face.hh
-FILE: ../../../third_party/harfbuzz/src/hb-font.hh
-FILE: ../../../third_party/harfbuzz/src/hb-glib.cc
-FILE: ../../../third_party/harfbuzz/src/hb-glib.h
-FILE: ../../../third_party/harfbuzz/src/hb-icu.h
-FILE: ../../../third_party/harfbuzz/src/hb-ot-tag.cc
-----------------------------------------------------------------------------------------------------
-Copyright © 2009  Red Hat, Inc.
-Copyright © 2011  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-face.cc
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-face.cc
-FILE: ../../../third_party/harfbuzz/src/hb-font.cc
-FILE: ../../../third_party/harfbuzz/src/hb-shape.cc
-FILE: ../../../third_party/harfbuzz/src/hb-shape.h
-----------------------------------------------------------------------------------------------------
-Copyright © 2009  Red Hat, Inc.
-Copyright © 2012  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ft.h
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ft.h
-----------------------------------------------------------------------------------------------------
-Copyright © 2009  Red Hat, Inc.
-Copyright © 2015  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-blob.cc
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-blob.cc
-----------------------------------------------------------------------------------------------------
-Copyright © 2009  Red Hat, Inc.
-Copyright © 2018  Ebrahim Byagowi
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-blob.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-blob.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2009  Red Hat, Inc.
-Copyright © 2018  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-shape.cc
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape.cc
-----------------------------------------------------------------------------------------------------
-Copyright © 2009,2010  Red Hat, Inc.
-Copyright © 2010,2011,2012  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-map.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ot-map.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2009,2010  Red Hat, Inc.
-Copyright © 2010,2011,2012,2013  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-aat-map.cc
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-aat-map.cc
-FILE: ../../../third_party/harfbuzz/src/hb-ot-map.cc
-----------------------------------------------------------------------------------------------------
-Copyright © 2009,2010  Red Hat, Inc.
-Copyright © 2010,2011,2013  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-common.cc
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-common.cc
-----------------------------------------------------------------------------------------------------
-Copyright © 2009,2010  Red Hat, Inc.
-Copyright © 2011,2012  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-shape.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2010  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-head-table.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ot-head-table.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2010  Red Hat, Inc.
-Copyright © 2012  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/test-gpos-size-params.cc
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/test-gpos-size-params.cc
-FILE: ../../../third_party/harfbuzz/src/test-gsub-would-substitute.cc
-FILE: ../../../third_party/harfbuzz/src/test.cc
-----------------------------------------------------------------------------------------------------
-Copyright © 2010,2011  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-shape-complex.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2010,2011,2012  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/test-buffer-serialize.cc
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/test-buffer-serialize.cc
-----------------------------------------------------------------------------------------------------
-Copyright © 2010,2011,2013  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-arabic.cc
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-arabic.cc
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-default.cc
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-hebrew.cc
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-thai.cc
-----------------------------------------------------------------------------------------------------
-Copyright © 2010,2012  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-fallback-shape.cc
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-fallback-shape.cc
-FILE: ../../../third_party/harfbuzz/src/hb-gobject-structs.cc
-FILE: ../../../third_party/harfbuzz/src/hb-uniscribe.h
-FILE: ../../../third_party/harfbuzz/src/hb-version.h
-FILE: ../../../third_party/harfbuzz/src/hb-version.h.in
-----------------------------------------------------------------------------------------------------
-Copyright © 2011  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-graphite2.h
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-graphite2.h
-----------------------------------------------------------------------------------------------------
-Copyright © 2011  Martin Hosken
-Copyright © 2011  SIL International
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-graphite2.cc
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-graphite2.cc
-----------------------------------------------------------------------------------------------------
-Copyright © 2011  Martin Hosken
-Copyright © 2011  SIL International
-Copyright © 2011,2012  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-hhea-table.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ot-hhea-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-hmtx-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-maxp-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-name-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-indic-machine.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-indic-machine.rl
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-indic.cc
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-khmer-machine.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-khmer-machine.rl
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-khmer.cc
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-myanmar-machine.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-myanmar-machine.rl
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-fallback.cc
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-normalize.cc
-----------------------------------------------------------------------------------------------------
-Copyright © 2011,2012  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-os2-table.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ot-os2-table.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2011,2012  Google, Inc.
-Copyright © 2018  Ebrahim Byagowi
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-myanmar.cc
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-myanmar.cc
-FILE: ../../../third_party/harfbuzz/src/hb-uniscribe.cc
-----------------------------------------------------------------------------------------------------
-Copyright © 2011,2012,2013  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ms-feature-ranges.cc
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ms-feature-ranges.cc
-FILE: ../../../third_party/harfbuzz/src/hb-ms-feature-ranges.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2011,2012,2013  Google, Inc.
-Copyright © 2021  Khaled Hosny
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-utf.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-utf.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2011,2012,2014  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-font.cc
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ot-font.cc
-----------------------------------------------------------------------------------------------------
-Copyright © 2011,2014  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-cache.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-cache.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-arabic-fallback.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-indic.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-fallback.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-normalize.hh
-FILE: ../../../third_party/harfbuzz/src/hb-set-digest.hh
-FILE: ../../../third_party/harfbuzz/src/hb-set.cc
-FILE: ../../../third_party/harfbuzz/src/hb-set.h
-FILE: ../../../third_party/harfbuzz/src/hb-shape-plan.cc
-FILE: ../../../third_party/harfbuzz/src/hb-shape-plan.h
-FILE: ../../../third_party/harfbuzz/src/hb-shaper-impl.hh
-FILE: ../../../third_party/harfbuzz/src/hb-shaper-list.hh
-FILE: ../../../third_party/harfbuzz/src/hb-shaper.cc
-FILE: ../../../third_party/harfbuzz/src/hb-shaper.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2012  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-coretext.h
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-coretext.h
-----------------------------------------------------------------------------------------------------
-Copyright © 2012  Mozilla Foundation.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-buffer-serialize.cc
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-buffer-serialize.cc
-----------------------------------------------------------------------------------------------------
-Copyright © 2012,2013  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-coretext.cc
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-coretext.cc
-----------------------------------------------------------------------------------------------------
-Copyright © 2012,2013  Mozilla Foundation.
-Copyright © 2012,2013  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-bit-page.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-bit-page.hh
-FILE: ../../../third_party/harfbuzz/src/hb-bit-set-invertible.hh
-FILE: ../../../third_party/harfbuzz/src/hb-bit-set.hh
-FILE: ../../../third_party/harfbuzz/src/hb-set.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2012,2017  Google, Inc.
-Copyright © 2021 Behdad Esfahbod
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-shape-plan.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-shape-plan.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2012,2018  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-buffer-deserialize-json.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-buffer-deserialize-json.hh
-FILE: ../../../third_party/harfbuzz/src/hb-buffer-deserialize-json.rl
-FILE: ../../../third_party/harfbuzz/src/hb-buffer-deserialize-text.hh
-FILE: ../../../third_party/harfbuzz/src/hb-buffer-deserialize-text.rl
-FILE: ../../../third_party/harfbuzz/src/hb-deprecated.h
-FILE: ../../../third_party/harfbuzz/src/hb-ot-layout-jstf-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-hangul.cc
-----------------------------------------------------------------------------------------------------
-Copyright © 2013  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-shape.h
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape.h
-----------------------------------------------------------------------------------------------------
-Copyright © 2013  Red Hat, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-cmap-table.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ot-cmap-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-font.h
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-arabic-win1256.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2014  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-glyf-table.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ot-glyf-table.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2015  Google, Inc.
-Copyright © 2019  Adobe Inc.
-Copyright © 2019  Ebrahim Byagowi
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-arabic.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-arabic.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-use-machine.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-use-machine.rl
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-use.cc
-----------------------------------------------------------------------------------------------------
-Copyright © 2015  Mozilla Foundation.
-Copyright © 2015  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-directwrite.cc
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-directwrite.cc
-FILE: ../../../third_party/harfbuzz/src/hb-directwrite.h
-----------------------------------------------------------------------------------------------------
-Copyright © 2015-2019  Ebrahim Byagowi
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-layout-base-table.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ot-layout-base-table.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2016  Elie Roux <elie.roux@telecom-bretagne.eu>
-Copyright © 2018  Google, Inc.
-Copyright © 2018-2019  Ebrahim Byagowi
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-color-cbdt-table.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ot-color-cbdt-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-post-table.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2016  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-color-cpal-table.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ot-color-cpal-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-color.cc
-----------------------------------------------------------------------------------------------------
-Copyright © 2016  Google, Inc.
-Copyright © 2018  Ebrahim Byagowi
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-color.h
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ot-color.h
-----------------------------------------------------------------------------------------------------
-Copyright © 2016  Google, Inc.
-Copyright © 2018  Khaled Hosny
-Copyright © 2018  Ebrahim Byagowi
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-math-table.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ot-math-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-math.cc
-FILE: ../../../third_party/harfbuzz/src/hb-ot-math.h
-----------------------------------------------------------------------------------------------------
-Copyright © 2016  Igalia S.L.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-aat-layout-common.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-aat-layout-common.hh
-FILE: ../../../third_party/harfbuzz/src/hb-aat-layout-morx-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-aat-layout.hh
-FILE: ../../../third_party/harfbuzz/src/hb-debug.hh
-FILE: ../../../third_party/harfbuzz/src/hb-kern.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-kern-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-post-macroman.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-var-avar-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-var-fvar-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-var-hvar-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-var-mvar-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-var.cc
-FILE: ../../../third_party/harfbuzz/src/hb-ot-var.h
-FILE: ../../../third_party/harfbuzz/src/hb-string-array.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2017  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-aat-layout.cc
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-aat-layout.cc
-----------------------------------------------------------------------------------------------------
-Copyright © 2017  Google, Inc.
-Copyright © 2018  Ebrahim Byagowi
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-algs.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-algs.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2017  Google, Inc.
-Copyright © 2019  Facebook, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-vector.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-vector.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2017,2018  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-aat-layout-ankr-table.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-aat-layout-ankr-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-aat-layout-bsln-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-aat-layout-feat-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-aat-layout-just-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-aat-layout.h
-FILE: ../../../third_party/harfbuzz/src/hb-aat-ltag-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-aat.h
-FILE: ../../../third_party/harfbuzz/src/hb-ot-color-svg-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-gasp-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-metrics.h
-FILE: ../../../third_party/harfbuzz/src/hb-ot-metrics.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-stat-table.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2018  Ebrahim Byagowi
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-aat-layout-kerx-table.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-aat-layout-kerx-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-aat-layout-trak-table.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2018  Ebrahim Byagowi
-Copyright © 2018  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-color-colr-table.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ot-color-colr-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-color-colrv1-closure.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-color-sbix-table.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2018  Ebrahim Byagowi
-Copyright © 2020  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-name.h
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ot-name.h
-----------------------------------------------------------------------------------------------------
-Copyright © 2018  Ebrahim Byagowi.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-aat-map.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-aat-map.hh
-FILE: ../../../third_party/harfbuzz/src/hb-array.hh
-FILE: ../../../third_party/harfbuzz/src/hb-map.cc
-FILE: ../../../third_party/harfbuzz/src/hb-map.h
-FILE: ../../../third_party/harfbuzz/src/hb-map.hh
-FILE: ../../../third_party/harfbuzz/src/hb-meta.hh
-FILE: ../../../third_party/harfbuzz/src/hb-null.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-deprecated.h
-FILE: ../../../third_party/harfbuzz/src/hb-ot-face.cc
-FILE: ../../../third_party/harfbuzz/src/hb-ot-hdmx-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-name-language-static.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-name-language.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-name.cc
-FILE: ../../../third_party/harfbuzz/src/hb-ot-os2-unicode-ranges.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-khmer.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-myanmar.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-vowel-constraints.hh
-FILE: ../../../third_party/harfbuzz/src/hb-static.cc
-FILE: ../../../third_party/harfbuzz/src/hb-subset-input.cc
-FILE: ../../../third_party/harfbuzz/src/hb-subset-input.hh
-FILE: ../../../third_party/harfbuzz/src/hb-subset-plan.cc
-FILE: ../../../third_party/harfbuzz/src/hb-subset-plan.hh
-FILE: ../../../third_party/harfbuzz/src/hb-subset.cc
-FILE: ../../../third_party/harfbuzz/src/hb-subset.h
-FILE: ../../../third_party/harfbuzz/src/hb-subset.hh
-FILE: ../../../third_party/harfbuzz/src/test-iter.cc
-FILE: ../../../third_party/harfbuzz/src/test-ot-name.cc
-FILE: ../../../third_party/harfbuzz/src/test-unicode-ranges.cc
-----------------------------------------------------------------------------------------------------
-Copyright © 2018  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-iter.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-iter.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2018  Google, Inc.
-Copyright © 2019  Facebook, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-cff-interp-common.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-cff-interp-common.hh
-FILE: ../../../third_party/harfbuzz/src/hb-cff-interp-cs-common.hh
-FILE: ../../../third_party/harfbuzz/src/hb-cff-interp-dict-common.hh
-FILE: ../../../third_party/harfbuzz/src/hb-cff1-interp-cs.hh
-FILE: ../../../third_party/harfbuzz/src/hb-cff2-interp-cs.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-cff-common.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-cff1-table.cc
-FILE: ../../../third_party/harfbuzz/src/hb-ot-cff1-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-cff2-table.cc
-FILE: ../../../third_party/harfbuzz/src/hb-ot-cff2-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-vorg-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-subset-cff-common.cc
-FILE: ../../../third_party/harfbuzz/src/hb-subset-cff-common.hh
-FILE: ../../../third_party/harfbuzz/src/hb-subset-cff1.cc
-FILE: ../../../third_party/harfbuzz/src/hb-subset-cff1.hh
-FILE: ../../../third_party/harfbuzz/src/hb-subset-cff2.cc
-FILE: ../../../third_party/harfbuzz/src/hb-subset-cff2.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2018 Adobe Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-metrics.cc
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ot-metrics.cc
-----------------------------------------------------------------------------------------------------
-Copyright © 2018-2019  Ebrahim Byagowi
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-var-gvar-table.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ot-var-gvar-table.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2019  Adobe Inc.
-Copyright © 2019  Ebrahim Byagowi
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-cff1-std-str.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ot-cff1-std-str.hh
-FILE: ../../../third_party/harfbuzz/src/test-bimap.cc
-FILE: ../../../third_party/harfbuzz/src/test-ot-glyphname.cc
-----------------------------------------------------------------------------------------------------
-Copyright © 2019  Adobe, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-aat-layout-opbd-table.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-aat-layout-opbd-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-gdi.cc
-FILE: ../../../third_party/harfbuzz/src/hb-gdi.h
-FILE: ../../../third_party/harfbuzz/src/hb-number-parser.hh
-FILE: ../../../third_party/harfbuzz/src/hb-number-parser.rl
-FILE: ../../../third_party/harfbuzz/src/hb-number.cc
-FILE: ../../../third_party/harfbuzz/src/hb-number.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-meta-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-meta.cc
-FILE: ../../../third_party/harfbuzz/src/hb-ot-meta.h
-FILE: ../../../third_party/harfbuzz/src/hb-style.cc
-FILE: ../../../third_party/harfbuzz/src/hb-style.h
-FILE: ../../../third_party/harfbuzz/src/test-number.cc
-FILE: ../../../third_party/harfbuzz/src/test-ot-meta.cc
-----------------------------------------------------------------------------------------------------
-Copyright © 2019  Ebrahim Byagowi
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-config.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-config.hh
-FILE: ../../../third_party/harfbuzz/src/hb-pool.hh
-FILE: ../../../third_party/harfbuzz/src/test-algs.cc
-----------------------------------------------------------------------------------------------------
-Copyright © 2019  Facebook, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-bimap.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-bimap.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2019 Adobe Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-draw.cc
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-draw.cc
-FILE: ../../../third_party/harfbuzz/src/hb-draw.h
-----------------------------------------------------------------------------------------------------
-Copyright © 2019-2020  Ebrahim Byagowi
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/failing-alloc.c
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/failing-alloc.c
-FILE: ../../../third_party/harfbuzz/src/hb-draw.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2020  Ebrahim Byagowi
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-priority-queue.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-priority-queue.hh
-FILE: ../../../third_party/harfbuzz/src/hb-repacker.hh
-FILE: ../../../third_party/harfbuzz/src/test-array.cc
-FILE: ../../../third_party/harfbuzz/src/test-priority-queue.cc
-FILE: ../../../third_party/harfbuzz/src/test-repacker.cc
-----------------------------------------------------------------------------------------------------
-Copyright © 2020  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/test-map.cc
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/test-map.cc
-FILE: ../../../third_party/harfbuzz/src/test-set.cc
-FILE: ../../../third_party/harfbuzz/src/test-vector.cc
-----------------------------------------------------------------------------------------------------
-Copyright © 2021  Behdad Esfahbod
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-syllabic.cc
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-syllabic.cc
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-syllabic.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2021  Behdad Esfahbod.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/src/hb-ot-post-table-v2subset.hh
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/src/hb-ot-post-table-v2subset.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-var-common.hh
-----------------------------------------------------------------------------------------------------
-Copyright © 2021  Google, Inc.
-
- This is part of HarfBuzz, a text shaping library.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: harfbuzz
-ORIGIN: ../../../third_party/harfbuzz/COPYING
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/harfbuzz/.circleci/config.yml
-FILE: ../../../third_party/harfbuzz/.codecov.yml
-FILE: ../../../third_party/harfbuzz/.editorconfig
-FILE: ../../../third_party/harfbuzz/THANKS
-FILE: ../../../third_party/harfbuzz/TODO
-FILE: ../../../third_party/harfbuzz/docs/HarfBuzz.png
-FILE: ../../../third_party/harfbuzz/docs/HarfBuzz.svg
-FILE: ../../../third_party/harfbuzz/docs/harfbuzz-docs.xml
-FILE: ../../../third_party/harfbuzz/docs/meson.build
-FILE: ../../../third_party/harfbuzz/docs/usermanual-buffers-language-script-and-direction.xml
-FILE: ../../../third_party/harfbuzz/docs/usermanual-clusters.xml
-FILE: ../../../third_party/harfbuzz/docs/usermanual-fonts-and-faces.xml
-FILE: ../../../third_party/harfbuzz/docs/usermanual-getting-started.xml
-FILE: ../../../third_party/harfbuzz/docs/usermanual-glyph-information.xml
-FILE: ../../../third_party/harfbuzz/docs/usermanual-install-harfbuzz.xml
-FILE: ../../../third_party/harfbuzz/docs/usermanual-integration.xml
-FILE: ../../../third_party/harfbuzz/docs/usermanual-object-model.xml
-FILE: ../../../third_party/harfbuzz/docs/usermanual-opentype-features.xml
-FILE: ../../../third_party/harfbuzz/docs/usermanual-shaping-concepts.xml
-FILE: ../../../third_party/harfbuzz/docs/usermanual-utilities.xml
-FILE: ../../../third_party/harfbuzz/docs/usermanual-what-is-harfbuzz.xml
-FILE: ../../../third_party/harfbuzz/docs/version.xml.in
-FILE: ../../../third_party/harfbuzz/harfbuzz.doap
-FILE: ../../../third_party/harfbuzz/meson.build
-FILE: ../../../third_party/harfbuzz/perf/fonts/Amiri-Regular.ttf
-FILE: ../../../third_party/harfbuzz/perf/fonts/NotoNastaliqUrdu-Regular.ttf
-FILE: ../../../third_party/harfbuzz/perf/fonts/NotoSansDevanagari-Regular.ttf
-FILE: ../../../third_party/harfbuzz/perf/fonts/Roboto-Regular.ttf
-FILE: ../../../third_party/harfbuzz/perf/meson.build
-FILE: ../../../third_party/harfbuzz/perf/perf-draw.hh
-FILE: ../../../third_party/harfbuzz/perf/perf-extents.hh
-FILE: ../../../third_party/harfbuzz/perf/perf-shaping.hh
-FILE: ../../../third_party/harfbuzz/perf/perf.cc
-FILE: ../../../third_party/harfbuzz/src/Makefile.sources
-FILE: ../../../third_party/harfbuzz/src/harfbuzz-config.cmake.in
-FILE: ../../../third_party/harfbuzz/src/harfbuzz-gobject.pc.in
-FILE: ../../../third_party/harfbuzz/src/harfbuzz-icu.pc.in
-FILE: ../../../third_party/harfbuzz/src/harfbuzz-subset.pc.in
-FILE: ../../../third_party/harfbuzz/src/harfbuzz.cc
-FILE: ../../../third_party/harfbuzz/src/harfbuzz.pc.in
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-arabic-joining-list.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-arabic-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-indic-table.cc
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-use-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ot-shape-complex-vowel-constraints.cc
-FILE: ../../../third_party/harfbuzz/src/hb-ot-tag-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-ucd-table.hh
-FILE: ../../../third_party/harfbuzz/src/hb-unicode-emoji-table.hh
-FILE: ../../../third_party/harfbuzz/src/meson.build
-FILE: ../../../third_party/harfbuzz/src/update-unicode-tables.make
-FILE: ../../../third_party/harfbuzz/subprojects/cairo.wrap
-FILE: ../../../third_party/harfbuzz/subprojects/freetype2.wrap
-FILE: ../../../third_party/harfbuzz/subprojects/glib.wrap
-FILE: ../../../third_party/harfbuzz/subprojects/google-benchmark.wrap
-FILE: ../../../third_party/harfbuzz/subprojects/packagefiles/ragel/meson.build
-FILE: ../../../third_party/harfbuzz/subprojects/ragel.wrap
-FILE: ../../../third_party/harfbuzz/subprojects/ttf-parser.wrap
-----------------------------------------------------------------------------------------------------
-HarfBuzz is licensed under the so-called "Old MIT" license.  Details follow.
-For parts of HarfBuzz that are licensed under different licenses see individual
-files names COPYING in subdirectories where applicable.
-
-Copyright © 2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020  Google, Inc.
-Copyright © 2018,2019,2020  Ebrahim Byagowi
-Copyright © 2019,2020  Facebook, Inc.
-Copyright © 2012  Mozilla Foundation
-Copyright © 2011  Codethink Limited
-Copyright © 2008,2010  Nokia Corporation and/or its subsidiary(-ies)
-Copyright © 2009  Keith Stribley
-Copyright © 2009  Martin Hosken and SIL International
-Copyright © 2007  Chris Wilson
-Copyright © 2005,2006,2020,2021  Behdad Esfahbod
-Copyright © 2005  David Turner
-Copyright © 2004,2007,2008,2009,2010  Red Hat, Inc.
-Copyright © 1998-2004  David Turner and Werner Lemberg
-
-For full copyright notices consult the individual files in the package.
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: json
-ORIGIN: ../../../third_party/json/LICENSE.MIT
-TYPE: LicenseType.mit
-FILE: ../../../third_party/json/.clang-tidy
-FILE: ../../../third_party/json/.lgtm.yml
-FILE: ../../../third_party/json/BUILD.bazel
-FILE: ../../../third_party/json/CITATION.cff
-FILE: ../../../third_party/json/WORKSPACE.bazel
-FILE: ../../../third_party/json/cmake/config.cmake.in
-FILE: ../../../third_party/json/cmake/nlohmann_jsonConfigVersion.cmake.in
-FILE: ../../../third_party/json/cmake/pkg-config.pc.in
-FILE: ../../../third_party/json/include/nlohmann/detail/json_custom_base_class.hpp
-FILE: ../../../third_party/json/meson.build
-FILE: ../../../third_party/json/nlohmann_json.natvis
-FILE: ../../../third_party/json/tools/amalgamate/config_json.json
-FILE: ../../../third_party/json/tools/amalgamate/config_json_fwd.json
-FILE: ../../../third_party/json/tools/generate_natvis/nlohmann_json.natvis.j2
-FILE: ../../../third_party/json/tools/macro_builder/main.cpp
-FILE: ../../../third_party/json/tools/serve_header/demo.png
-FILE: ../../../third_party/json/tools/serve_header/serve_header.yml.example
-FILE: ../../../third_party/json/wsjcpp.yml
-----------------------------------------------------------------------------------------------------
-MIT License
-
-Copyright (c) 2013-2022 Niels Lohmann
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: angle
-ORIGIN: ../../../third_party/angle/src/third_party/ceval/LICENSE
-TYPE: LicenseType.mit
-FILE: ../../../third_party/angle/src/third_party/ceval/ceval.h
-FILE: ../../../third_party/angle/src/third_party/ceval/package.json
-FILE: ../../../third_party/angle/src/third_party/ceval/patches/0001-remove-sprintf.patch
-----------------------------------------------------------------------------------------------------
-MIT License
-
-Copyright (c) 2021 e_t
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: root_certificates
-ORIGIN: ../../../third_party/root_certificates/certdata.pem
-TYPE: LicenseType.mpl
-FILE: ../../../third_party/root_certificates/certdata.pem
-----------------------------------------------------------------------------------------------------
-Mozilla Public License
-Version 2.0
-
-1. Definitions
-
-1.1. “Contributor”
-
-means each individual or legal entity that creates, contributes to the creation of, or owns Covered Software.
-
-1.2. “Contributor Version”
-
-means the combination of the Contributions of others (if any) used by a Contributor and that particular Contributor’s Contribution.
-
-1.3. “Contribution”
-
-means Covered Software of a particular Contributor.
-
-1.4. “Covered Software”
-
-means Source Code Form to which the initial Contributor has attached the notice in Exhibit A, the Executable Form of such Source Code Form, and Modifications of such Source Code Form, in each case including portions thereof.
-
-1.5. “Incompatible With Secondary Licenses”
-
-means
-
-    a. that the initial Contributor has attached the notice described in Exhibit B to the Covered Software; or
-
-    b. that the Covered Software was made available under the terms of version 1.1 or earlier of the License, but not also under the terms of a Secondary License.
-
-1.6. “Executable Form”
-
-means any form of the work other than Source Code Form.
-
-1.7. “Larger Work”
-
-means a work that combines Covered Software with other material, in a separate file or files, that is not Covered Software.
-
-1.8. “License”
-
-means this document.
-
-1.9. “Licensable”
-
-means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently, any and all of the rights conveyed by this License.
-
-1.10. “Modifications”
-
-means any of the following:
-
-    a. any file in Source Code Form that results from an addition to, deletion from, or modification of the contents of Covered Software; or
-
-    b. any new file in Source Code Form that contains any Covered Software.
-
-1.11. “Patent Claims” of a Contributor
-
-means any patent claim(s), including without limitation, method, process, and apparatus claims, in any patent Licensable by such Contributor that would be infringed, but for the grant of the License, by the making, using, selling, offering for sale, having made, import, or transfer of either its Contributions or its Contributor Version.
-
-1.12. “Secondary License”
-
-means either the GNU General Public License, Version 2.0, the GNU Lesser General Public License, Version 2.1, the GNU Affero General Public License, Version 3.0, or any later versions of those licenses.
-
-1.13. “Source Code Form”
-
-means the form of the work preferred for making modifications.
-
-1.14. “You” (or “Your”)
-
-means an individual or a legal entity exercising rights under this License. For legal entities, “You” includes any entity that controls, is controlled by, or is under common control with You. For purposes of this definition, “control” means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
-
-2. License Grants and Conditions
-
-2.1. Grants
-
-Each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license:
-
-    a. under intellectual property rights (other than patent or trademark) Licensable by such Contributor to use, reproduce, make available, modify, display, perform, distribute, and otherwise exploit its Contributions, either on an unmodified basis, with Modifications, or as part of a Larger Work; and
-
-    b. under Patent Claims of such Contributor to make, use, sell, offer for sale, have made, import, and otherwise transfer either its Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-The licenses granted in Section 2.1 with respect to any Contribution become effective for each Contribution on the date the Contributor first distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-The licenses granted in this Section 2 are the only rights granted under this License. No additional rights or licenses will be implied from the distribution or licensing of Covered Software under this License. Notwithstanding Section 2.1(b) above, no patent license is granted by a Contributor:
-
-    a. for any code that a Contributor has removed from Covered Software; or
-
-    b. for infringements caused by: (i) Your and any other third party’s modifications of Covered Software, or (ii) the combination of its Contributions with other software (except as part of its Contributor Version); or
-
-    c. under Patent Claims infringed by Covered Software in the absence of its Contributions.
-
-This License does not grant any rights in the trademarks, service marks, or logos of any Contributor (except as may be necessary to comply with the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-No Contributor makes additional grants as a result of Your choice to distribute the Covered Software under a subsequent version of this License (see Section 10.2) or under the terms of a Secondary License (if permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-Each Contributor represents that the Contributor believes its Contributions are its original creation(s) or it has sufficient rights to grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-This License is not intended to limit any rights You have under applicable copyright doctrines of fair use, fair dealing, or other equivalents.
-
-2.7. Conditions
-
-Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in Section 2.1.
-
-3. Responsibilities
-
-3.1. Distribution of Source Form
-
-All distribution of Covered Software in Source Code Form, including any Modifications that You create or to which You contribute, must be under the terms of this License. You must inform recipients that the Source Code Form of the Covered Software is governed by the terms of this License, and how they can obtain a copy of this License. You may not attempt to alter or restrict the recipients’ rights in the Source Code Form.
-
-3.2. Distribution of Executable Form
-
-If You distribute Covered Software in Executable Form then:
-
-    a. such Covered Software must also be made available in Source Code Form, as described in Section 3.1, and You must inform recipients of the Executable Form how they can obtain a copy of such Source Code Form by reasonable means in a timely manner, at a charge no more than the cost of distribution to the recipient; and
-
-    b. You may distribute such Executable Form under the terms of this License, or sublicense it under different terms, provided that the license for the Executable Form does not attempt to limit or alter the recipients’ rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-You may create and distribute a Larger Work under terms of Your choice, provided that You also comply with the requirements of this License for the Covered Software. If the Larger Work is a combination of Covered Software with a work governed by one or more Secondary Licenses, and the Covered Software is not Incompatible With Secondary Licenses, this License permits You to additionally distribute such Covered Software under the terms of such Secondary License(s), so that the recipient of the Larger Work may, at their option, further distribute the Covered Software under the terms of either this License or such Secondary License(s).
-
-3.4. Notices
-
-You may not remove or alter the substance of any license notices (including copyright notices, patent notices, disclaimers of warranty, or limitations of liability) contained within the Source Code Form of the Covered Software, except that You may alter any license notices to the extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Software. However, You may do so only on Your own behalf, and not on behalf of any Contributor. You must make it absolutely clear that any such warranty, support, indemnity, or liability obligation is offered by You alone, and You hereby agree to indemnify every Contributor for any liability incurred by such Contributor as a result of warranty, support, indemnity or liability terms You offer. You may include additional disclaimers of warranty and limitations of liability specific to any jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
-
-If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Software due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be placed in a text file included with all distributions of the Covered Software under this License. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it.
-
-5. Termination
-
-5.1. The rights granted under this License will terminate automatically if You fail to comply with any of its terms. However, if You become compliant, then the rights granted under this License from a particular Contributor are reinstated (a) provisionally, unless and until such Contributor explicitly and finally terminates Your grants, and (b) on an ongoing basis, if such Contributor fails to notify You of the non-compliance by some reasonable means prior to 60 days after You have come back into compliance. Moreover, Your grants from a particular Contributor are reinstated on an ongoing basis if such Contributor notifies You of the non-compliance by some reasonable means, this is the first time You have received notice of non-compliance with this License from such Contributor, and You become compliant prior to 30 days after Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent infringement claim (excluding declaratory judgment actions, counter-claims, and cross-claims) alleging that a Contributor Version directly or indirectly infringes any patent, then the rights granted to You by any and all Contributors for the Covered Software under Section 2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user license agreements (excluding distributors and resellers) which have been validly granted by You or Your distributors under this License prior to termination shall survive termination.
-
-6. Disclaimer of Warranty
-
-    Covered Software is provided under this License on an “as is” basis, without warranty of any kind, either expressed, implied, or statutory, including, without limitation, warranties that the Covered Software is free of defects, merchantable, fit for a particular purpose or non-infringing. The entire risk as to the quality and performance of the Covered Software is with You. Should any Covered Software prove defective in any respect, You (not any Contributor) assume the cost of any necessary servicing, repair, or correction. This disclaimer of warranty constitutes an essential part of this License. No use of any Covered Software is authorized under this License except under this disclaimer.
-
-7. Limitation of Liability
-
-    Under no circumstances and under no legal theory, whether tort (including negligence), contract, or otherwise, shall any Contributor, or anyone who distributes Covered Software as permitted above, be liable to You for any direct, indirect, special, incidental, or consequential damages of any character including, without limitation, damages for lost profits, loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses, even if such party shall have been informed of the possibility of such damages. This limitation of liability shall not apply to liability for death or personal injury resulting from such party’s negligence to the extent applicable law prohibits such limitation. Some jurisdictions do not allow the exclusion or limitation of incidental or consequential damages, so this exclusion and limitation may not apply to You.
-
-8. Litigation
-
-Any litigation relating to this License may be brought only in the courts of a jurisdiction where the defendant maintains its principal place of business and such litigation shall be governed by laws of that jurisdiction, without reference to its conflict-of-law provisions. Nothing in this Section shall prevent a party’s ability to bring cross-claims or counter-claims.
-
-9. Miscellaneous
-
-This License represents the complete agreement concerning the subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not be used to construe this License against a Contributor.
-
-10. Versions of the License
-
-10.1. New Versions
-
-Mozilla Foundation is the license steward. Except as provided in Section 10.3, no one other than the license steward has the right to modify or publish new versions of this License. Each version will be given a distinguishing version number.
-
-10.2. Effect of New Versions
-
-You may distribute the Covered Software under the terms of the version of the License under which You originally received the Covered Software, or under the terms of any subsequent version published by the license steward.
-
-10.3. Modified Versions
-
-If you create software not governed by this License, and you want to create a new license for such software, you may create and use a modified version of this License if you rename the license and remove any references to the name of the license steward (except to note that such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses
-
-If You choose to distribute Source Code Form that is Incompatible With Secondary Licenses under the terms of this version of the License, the notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
-
-    This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular file, then You may include the notice in a location (such as a LICENSE file in a relevant directory) where a recipient would be likely to look for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - “Incompatible With Secondary Licenses” Notice
-
-    This Source Code Form is “Incompatible With Secondary Licenses”, as defined by the Mozilla Public License, v. 2.0.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: root_certificates
-ORIGIN: ../../../third_party/root_certificates/LICENSE
-TYPE: LicenseType.mpl
-FILE: ../../../third_party/root_certificates/root_certificates.cc
-----------------------------------------------------------------------------------------------------
-Mozilla Public License Version 2.0
-==================================
-
-1. Definitions
-
-1.1. "Contributor"
-    means each individual or legal entity that creates, contributes to
-    the creation of, or owns Covered Software.
-
-1.2. "Contributor Version"
-    means the combination of the Contributions of others (if any) used
-    by a Contributor and that particular Contributor's Contribution.
-
-1.3. "Contribution"
-    means Covered Software of a particular Contributor.
-
-1.4. "Covered Software"
-    means Source Code Form to which the initial Contributor has attached
-    the notice in Exhibit A, the Executable Form of such Source Code
-    Form, and Modifications of such Source Code Form, in each case
-    including portions thereof.
-
-1.5. "Incompatible With Secondary Licenses"
-    means
-
-    (a) that the initial Contributor has attached the notice described
-        in Exhibit B to the Covered Software; or
-
-    (b) that the Covered Software was made available under the terms of
-        version 1.1 or earlier of the License, but not also under the
-        terms of a Secondary License.
-
-1.6. "Executable Form"
-    means any form of the work other than Source Code Form.
-
-1.7. "Larger Work"
-    means a work that combines Covered Software with other material, in
-    a separate file or files, that is not Covered Software.
-
-1.8. "License"
-    means this document.
-
-1.9. "Licensable"
-    means having the right to grant, to the maximum extent possible,
-    whether at the time of the initial grant or subsequently, any and
-    all of the rights conveyed by this License.
-
-1.10. "Modifications"
-    means any of the following:
-
-    (a) any file in Source Code Form that results from an addition to,
-        deletion from, or modification of the contents of Covered
-        Software; or
-
-    (b) any new file in Source Code Form that contains any Covered
-        Software.
-
-1.11. "Patent Claims" of a Contributor
-    means any patent claim(s), including without limitation, method,
-    process, and apparatus claims, in any patent Licensable by such
-    Contributor that would be infringed, but for the grant of the
-    License, by the making, using, selling, offering for sale, having
-    made, import, or transfer of either its Contributions or its
-    Contributor Version.
-
-1.12. "Secondary License"
-    means either the GNU General Public License, Version 2.0, the GNU
-    Lesser General Public License, Version 2.1, the GNU Affero General
-    Public License, Version 3.0, or any later versions of those
-    licenses.
-
-1.13. "Source Code Form"
-    means the form of the work preferred for making modifications.
-
-1.14. "You" (or "Your")
-    means an individual or a legal entity exercising rights under this
-    License. For legal entities, "You" includes any entity that
-    controls, is controlled by, or is under common control with You. For
-    purposes of this definition, "control" means (a) the power, direct
-    or indirect, to cause the direction or management of such entity,
-    whether by contract or otherwise, or (b) ownership of more than
-    fifty percent (50%) of the outstanding shares or beneficial
-    ownership of such entity.
-
-2. License Grants and Conditions
-
-2.1. Grants
-
-Each Contributor hereby grants You a world-wide, royalty-free,
-non-exclusive license:
-
-(a) under intellectual property rights (other than patent or trademark)
-    Licensable by such Contributor to use, reproduce, make available,
-    modify, display, perform, distribute, and otherwise exploit its
-    Contributions, either on an unmodified basis, with Modifications, or
-    as part of a Larger Work; and
-
-(b) under Patent Claims of such Contributor to make, use, sell, offer
-    for sale, have made, import, and otherwise transfer either its
-    Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-The licenses granted in Section 2.1 with respect to any Contribution
-become effective for each Contribution on the date the Contributor first
-distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-The licenses granted in this Section 2 are the only rights granted under
-this License. No additional rights or licenses will be implied from the
-distribution or licensing of Covered Software under this License.
-Notwithstanding Section 2.1(b) above, no patent license is granted by a
-Contributor:
-
-(a) for any code that a Contributor has removed from Covered Software;
-    or
-
-(b) for infringements caused by: (i) Your and any other third party's
-    modifications of Covered Software, or (ii) the combination of its
-    Contributions with other software (except as part of its Contributor
-    Version); or
-
-(c) under Patent Claims infringed by Covered Software in the absence of
-    its Contributions.
-
-This License does not grant any rights in the trademarks, service marks,
-or logos of any Contributor (except as may be necessary to comply with
-the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-No Contributor makes additional grants as a result of Your choice to
-distribute the Covered Software under a subsequent version of this
-License (see Section 10.2) or under the terms of a Secondary License (if
-permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-Each Contributor represents that the Contributor believes its
-Contributions are its original creation(s) or it has sufficient rights
-to grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-This License is not intended to limit any rights You have under
-applicable copyright doctrines of fair use, fair dealing, or other
-equivalents.
-
-2.7. Conditions
-
-Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
-in Section 2.1.
-
-3. Responsibilities
-
-3.1. Distribution of Source Form
-
-All distribution of Covered Software in Source Code Form, including any
-Modifications that You create or to which You contribute, must be under
-the terms of this License. You must inform recipients that the Source
-Code Form of the Covered Software is governed by the terms of this
-License, and how they can obtain a copy of this License. You may not
-attempt to alter or restrict the recipients' rights in the Source Code
-Form.
-
-3.2. Distribution of Executable Form
-
-If You distribute Covered Software in Executable Form then:
-
-(a) such Covered Software must also be made available in Source Code
-    Form, as described in Section 3.1, and You must inform recipients of
-    the Executable Form how they can obtain a copy of such Source Code
-    Form by reasonable means in a timely manner, at a charge no more
-    than the cost of distribution to the recipient; and
-
-(b) You may distribute such Executable Form under the terms of this
-    License, or sublicense it under different terms, provided that the
-    license for the Executable Form does not attempt to limit or alter
-    the recipients' rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-You may create and distribute a Larger Work under terms of Your choice,
-provided that You also comply with the requirements of this License for
-the Covered Software. If the Larger Work is a combination of Covered
-Software with a work governed by one or more Secondary Licenses, and the
-Covered Software is not Incompatible With Secondary Licenses, this
-License permits You to additionally distribute such Covered Software
-under the terms of such Secondary License(s), so that the recipient of
-the Larger Work may, at their option, further distribute the Covered
-Software under the terms of either this License or such Secondary
-License(s).
-
-3.4. Notices
-
-You may not remove or alter the substance of any license notices
-(including copyright notices, patent notices, disclaimers of warranty,
-or limitations of liability) contained within the Source Code Form of
-the Covered Software, except that You may alter any license notices to
-the extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-You may choose to offer, and to charge a fee for, warranty, support,
-indemnity or liability obligations to one or more recipients of Covered
-Software. However, You may do so only on Your own behalf, and not on
-behalf of any Contributor. You must make it absolutely clear that any
-such warranty, support, indemnity, or liability obligation is offered by
-You alone, and You hereby agree to indemnify every Contributor for any
-liability incurred by such Contributor as a result of warranty, support,
-indemnity or liability terms You offer. You may include additional
-disclaimers of warranty and limitations of liability specific to any
-jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
-
-If it is impossible for You to comply with any of the terms of this
-License with respect to some or all of the Covered Software due to
-statute, judicial order, or regulation then You must: (a) comply with
-the terms of this License to the maximum extent possible; and (b)
-describe the limitations and the code they affect. Such description must
-be placed in a text file included with all distributions of the Covered
-Software under this License. Except to the extent prohibited by statute
-or regulation, such description must be sufficiently detailed for a
-recipient of ordinary skill to be able to understand it.
-
-5. Termination
-
-5.1. The rights granted under this License will terminate automatically
-if You fail to comply with any of its terms. However, if You become
-compliant, then the rights granted under this License from a particular
-Contributor are reinstated (a) provisionally, unless and until such
-Contributor explicitly and finally terminates Your grants, and (b) on an
-ongoing basis, if such Contributor fails to notify You of the
-non-compliance by some reasonable means prior to 60 days after You have
-come back into compliance. Moreover, Your grants from a particular
-Contributor are reinstated on an ongoing basis if such Contributor
-notifies You of the non-compliance by some reasonable means, this is the
-first time You have received notice of non-compliance with this License
-from such Contributor, and You become compliant prior to 30 days after
-Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-infringement claim (excluding declaratory judgment actions,
-counter-claims, and cross-claims) alleging that a Contributor Version
-directly or indirectly infringes any patent, then the rights granted to
-You by any and all Contributors for the Covered Software under Section
-2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all
-end user license agreements (excluding distributors and resellers) which
-have been validly granted by You or Your distributors under this License
-prior to termination shall survive termination.
-
-*  6. Disclaimer of Warranty
-
-*  Covered Software is provided under this License on an "as is"
-*  basis, without warranty of any kind, either expressed, implied, or
-*  statutory, including, without limitation, warranties that the
-*  Covered Software is free of defects, merchantable, fit for a
-*  particular purpose or non-infringing. The entire risk as to the
-*  quality and performance of the Covered Software is with You.
-*  Should any Covered Software prove defective in any respect, You
-*  (not any Contributor) assume the cost of any necessary servicing,
-*  repair, or correction. This disclaimer of warranty constitutes an
-*  essential part of this License. No use of any Covered Software is
-*  authorized under this License except under this disclaimer.
-
-*  7. Limitation of Liability
-
-*  Under no circumstances and under no legal theory, whether tort
-*  (including negligence), contract, or otherwise, shall any
-*  Contributor, or anyone who distributes Covered Software as
-*  permitted above, be liable to You for any direct, indirect,
-*  special, incidental, or consequential damages of any character
-*  including, without limitation, damages for lost profits, loss of
-*  goodwill, work stoppage, computer failure or malfunction, or any
-*  and all other commercial damages or losses, even if such party
-*  shall have been informed of the possibility of such damages. This
-*  limitation of liability shall not apply to liability for death or
-*  personal injury resulting from such party's negligence to the
-*  extent applicable law prohibits such limitation. Some
-*  jurisdictions do not allow the exclusion or limitation of
-*  incidental or consequential damages, so this exclusion and
-*  limitation may not apply to You.
-
-8. Litigation
-
-Any litigation relating to this License may be brought only in the
-courts of a jurisdiction where the defendant maintains its principal
-place of business and such litigation shall be governed by laws of that
-jurisdiction, without reference to its conflict-of-law provisions.
-Nothing in this Section shall prevent a party's ability to bring
-cross-claims or counter-claims.
-
-9. Miscellaneous
-
-This License represents the complete agreement concerning the subject
-matter hereof. If any provision of this License is held to be
-unenforceable, such provision shall be reformed only to the extent
-necessary to make it enforceable. Any law or regulation which provides
-that the language of a contract shall be construed against the drafter
-shall not be used to construe this License against a Contributor.
-
-10. Versions of the License
-
-10.1. New Versions
-
-Mozilla Foundation is the license steward. Except as provided in Section
-10.3, no one other than the license steward has the right to modify or
-publish new versions of this License. Each version will be given a
-distinguishing version number.
-
-10.2. Effect of New Versions
-
-You may distribute the Covered Software under the terms of the version
-of the License under which You originally received the Covered Software,
-or under the terms of any subsequent version published by the license
-steward.
-
-10.3. Modified Versions
-
-If you create software not governed by this License, and you want to
-create a new license for such software, you may create and use a
-modified version of this License if you rename the license and remove
-any references to the name of the license steward (except to note that
-such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary
-Licenses
-
-If You choose to distribute Source Code Form that is Incompatible With
-Secondary Licenses under the terms of this version of the License, the
-notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular
-file, then You may include the notice in a location (such as a LICENSE
-file in a relevant directory) where a recipient would be likely to look
-for such a notice.
+FILE: ../../../third_party/zlib/gzread.c
+FILE: ../../../third_party/zlib/gzwrite.c
+FILE: ../../../third_party/zlib/infback.c
+FILE: ../../../third_party/zlib/inffast.c
+FILE: ../../../third_party/zlib/inffast.h
+FILE: ../../../third_party/zlib/inflate.c
+FILE: ../../../third_party/zlib/inflate.h
+FILE: ../../../third_party/zlib/inftrees.c
+FILE: ../../../third_party/zlib/inftrees.h
+FILE: ../../../third_party/zlib/trees.c
+FILE: ../../../third_party/zlib/uncompr.c
+FILE: ../../../third_party/zlib/zconf.h
+FILE: ../../../third_party/zlib/zconf.h.cmakein
+FILE: ../../../third_party/zlib/zlib.h
+FILE: ../../../third_party/zlib/zutil.c
+FILE: ../../../third_party/zlib/zutil.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
 
-You may add additional accurate notices of copyright ownership.
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
 
-Exhibit B - "Incompatible With Secondary Licenses" Notice
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
 
-  This Source Code Form is "Incompatible With Secondary Licenses", as
-  defined by the Mozilla Public License, v. 2.0.
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
 ====================================================================================================
 
 ====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/LICENSE
-TYPE: LicenseType.openssl
-FILE: ../../../third_party/boringssl/ios-aarch64/crypto/fipsmodule/sha256-armv8.S
-FILE: ../../../third_party/boringssl/ios-aarch64/crypto/fipsmodule/sha512-armv8.S
-FILE: ../../../third_party/boringssl/ios-arm/crypto/fipsmodule/bsaes-armv7.S
-FILE: ../../../third_party/boringssl/ios-arm/crypto/fipsmodule/sha256-armv4.S
-FILE: ../../../third_party/boringssl/ios-arm/crypto/fipsmodule/sha512-armv4.S
-FILE: ../../../third_party/boringssl/linux-aarch64/crypto/fipsmodule/sha256-armv8.S
-FILE: ../../../third_party/boringssl/linux-aarch64/crypto/fipsmodule/sha512-armv8.S
-FILE: ../../../third_party/boringssl/linux-arm/crypto/fipsmodule/bsaes-armv7.S
-FILE: ../../../third_party/boringssl/linux-arm/crypto/fipsmodule/sha256-armv4.S
-FILE: ../../../third_party/boringssl/linux-arm/crypto/fipsmodule/sha512-armv4.S
-FILE: ../../../third_party/boringssl/src/crypto/asn1/charmap.h
-FILE: ../../../third_party/boringssl/src/crypto/err/asn1.errordata
-FILE: ../../../third_party/boringssl/src/crypto/err/bio.errordata
-FILE: ../../../third_party/boringssl/src/crypto/err/bn.errordata
-FILE: ../../../third_party/boringssl/src/crypto/err/cipher.errordata
-FILE: ../../../third_party/boringssl/src/crypto/err/conf.errordata
-FILE: ../../../third_party/boringssl/src/crypto/err/dh.errordata
-FILE: ../../../third_party/boringssl/src/crypto/err/digest.errordata
-FILE: ../../../third_party/boringssl/src/crypto/err/dsa.errordata
-FILE: ../../../third_party/boringssl/src/crypto/err/ec.errordata
-FILE: ../../../third_party/boringssl/src/crypto/err/ecdh.errordata
-FILE: ../../../third_party/boringssl/src/crypto/err/ecdsa.errordata
-FILE: ../../../third_party/boringssl/src/crypto/err/engine.errordata
-FILE: ../../../third_party/boringssl/src/crypto/err/evp.errordata
-FILE: ../../../third_party/boringssl/src/crypto/err/hkdf.errordata
-FILE: ../../../third_party/boringssl/src/crypto/err/obj.errordata
-FILE: ../../../third_party/boringssl/src/crypto/err/pem.errordata
-FILE: ../../../third_party/boringssl/src/crypto/err/pkcs7.errordata
-FILE: ../../../third_party/boringssl/src/crypto/err/pkcs8.errordata
-FILE: ../../../third_party/boringssl/src/crypto/err/rsa.errordata
-FILE: ../../../third_party/boringssl/src/crypto/err/ssl.errordata
-FILE: ../../../third_party/boringssl/src/crypto/err/trust_token.errordata
-FILE: ../../../third_party/boringssl/src/crypto/err/x509.errordata
-FILE: ../../../third_party/boringssl/src/crypto/err/x509v3.errordata
-FILE: ../../../third_party/boringssl/src/crypto/evp/scrypt.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/asm/x86_64-gcc.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/rsaz_exp.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/bn/rsaz_exp.h
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/make_tables.go
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/p256-x86_64-table.h
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/p256-x86_64.c
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/ec/p256-x86_64.h
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/fips_shared.lds
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/intcheck1.png
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/intcheck2.png
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/intcheck3.png
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/[Content_Types].xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/_rels/.rels
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/customXml/_rels/item1.xml.rels
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/customXml/item1.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/customXml/itemProps1.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/docProps/app.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/docProps/core.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/_rels/document.xml.rels
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/document.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/endnotes.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/fontTable.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/footer1.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/footer2.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/footer3.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/footnotes.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/header1.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/header2.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/header3.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/media/image1.png
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/media/image2.png
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/numbering.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/settings.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/styles.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/theme/theme1.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Android-Security-Policy-20191020.docx!/word/webSettings.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/[Content_Types].xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/_rels/.rels
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/customXml/_rels/item1.xml.rels
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/customXml/item1.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/customXml/itemProps1.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/docProps/app.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/docProps/core.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/docProps/thumbnail.emf
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/word/_rels/document.xml.rels
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/word/document.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/word/endnotes.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/word/fontTable.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/word/footer1.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/word/footnotes.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/word/media/image1.jpeg
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/word/media/image2.png
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/word/numbering.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/word/settings.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/word/styles.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/word/theme/theme1.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20170615.docx!/word/webSettings.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/[Content_Types].xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/_rels/.rels
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/customXml/_rels/item1.xml.rels
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/customXml/item1.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/customXml/itemProps1.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/docProps/app.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/docProps/core.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/docProps/thumbnail.emf
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/_rels/document.xml.rels
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/document.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/endnotes.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/fontTable.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/footer1.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/footer2.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/footer3.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/footnotes.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/header1.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/header2.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/header3.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/media/image1.png
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/media/image2.png
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/numbering.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/settings.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/styles.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/theme/theme1.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20180730.docx!/word/webSettings.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/[Content_Types].xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/_rels/.rels
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/customXml/_rels/item1.xml.rels
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/customXml/item1.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/customXml/itemProps1.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/docProps/app.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/docProps/core.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/word/_rels/document.xml.rels
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/word/document.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/word/endnotes.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/word/fontTable.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/word/footer1.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/word/footnotes.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/word/media/image1.png
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/word/media/image2.png
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/word/numbering.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/word/settings.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/word/styles.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/word/theme/theme1.xml
-FILE: ../../../third_party/boringssl/src/crypto/fipsmodule/policydocs/BoringCrypto-Security-Policy-20190808.docx!/word/webSettings.xml
-FILE: ../../../third_party/boringssl/src/crypto/hpke/test-vectors.json
-FILE: ../../../third_party/boringssl/src/crypto/obj/obj_mac.num
-FILE: ../../../third_party/boringssl/src/crypto/poly1305/poly1305_arm_asm.S
-FILE: ../../../third_party/boringssl/src/crypto/rsa_extra/rsa_print.c
-FILE: ../../../third_party/boringssl/src/crypto/x509/x509_time_test.cc
-FILE: ../../../third_party/boringssl/src/crypto/x509v3/v3_ocsp.c
-FILE: ../../../third_party/boringssl/src/go.mod
-FILE: ../../../third_party/boringssl/src/go.sum
-FILE: ../../../third_party/boringssl/src/ssl/bio_ssl.cc
-FILE: ../../../third_party/boringssl/src/ssl/ssl_c_test.c
-FILE: ../../../third_party/boringssl/src/util/all_tests.json
-FILE: ../../../third_party/boringssl/src/util/bot/UPDATING
-FILE: ../../../third_party/boringssl/src/util/bot/cmake-win32.zip.sha1
-FILE: ../../../third_party/boringssl/src/util/bot/nasm-win32.exe.sha1
-FILE: ../../../third_party/boringssl/src/util/bot/perl-win32.zip.sha1
-FILE: ../../../third_party/boringssl/src/util/bot/sde-linux64.tar.bz2.sha1
-FILE: ../../../third_party/boringssl/src/util/bot/sde-win32.tar.bz2.sha1
-FILE: ../../../third_party/boringssl/src/util/doc.config
-FILE: ../../../third_party/boringssl/src/util/doc.go
-FILE: ../../../third_party/boringssl/src/util/fipstools/acvp/acvptool/parser.peg.go
-FILE: ../../../third_party/boringssl/src/util/fipstools/cavp/run_cavp.go
-FILE: ../../../third_party/boringssl/src/util/fipstools/delocate/delocate.peg.go
-FILE: ../../../third_party/boringssl/win-aarch64/crypto/fipsmodule/sha256-armv8.S
-FILE: ../../../third_party/boringssl/win-aarch64/crypto/fipsmodule/sha512-armv8.S
+LIBRARY: zlib
+ORIGIN: ../../../third_party/zlib/contrib/minizip/crypt.h
+TYPE: LicenseType.unknown
+FILE: ../../../third_party/zlib/contrib/minizip/crypt.h
 ----------------------------------------------------------------------------------------------------
-OpenSSL License
-
- ====================================================================
- Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
- 3. All advertising materials mentioning features or use of this
-    software must display the following acknowledgment:
-    "This product includes software developed by the OpenSSL Project
-    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
-
- 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-    endorse or promote products derived from this software without
-    prior written permission. For written permission, please contact
-    openssl-core@openssl.org.
-
- 5. Products derived from this software may not be called "OpenSSL"
-    nor may "OpenSSL" appear in their names without prior written
-    permission of the OpenSSL Project.
-
- 6. Redistributions of any form whatsoever must retain the following
-    acknowledgment:
-    "This product includes software developed by the OpenSSL Project
-    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
-
- THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
- ====================================================================
-
- This product includes cryptographic software written by Eric Young
- (eay@cryptsoft.com).  This product includes software written by Tim
- Hudson (tjh@cryptsoft.com).
-
-Original SSLeay License
-
-* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
-* All rights reserved.
-
-* This package is an SSL implementation written
-* by Eric Young (eay@cryptsoft.com).
-* The implementation was written so as to conform with Netscapes SSL.
-
-* This library is free for commercial and non-commercial use as long as
-* the following conditions are aheared to.  The following conditions
-* apply to all code found in this distribution, be it the RC4, RSA,
-* lhash, DES, etc., code; not just the SSL code.  The SSL documentation
-* included with this distribution is covered by the same copyright terms
-* except that the holder is Tim Hudson (tjh@cryptsoft.com).
-
-* Copyright remains Eric Young's, and as such any Copyright notices in
-* the code are not to be removed.
-* If this package is used in a product, Eric Young should be given attribution
-* as the author of the parts of the library used.
-* This can be in the form of a textual message at program startup or
-* in documentation (online or textual) provided with the package.
-
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions
-* are met:
-* 1. Redistributions of source code must retain the copyright
-*    notice, this list of conditions and the following disclaimer.
-* 2. Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the
-*    documentation and/or other materials provided with the distribution.
-* 3. All advertising materials mentioning features or use of this software
-*    must display the following acknowledgement:
-*    "This product includes cryptographic software written by
-*     Eric Young (eay@cryptsoft.com)"
-*    The word 'cryptographic' can be left out if the rouines from the library
-*    being used are not cryptographic related :-).
-* 4. If you include any Windows specific code (or a derivative thereof) from
-*    the apps directory (application code) you must include an acknowledgement:
-*    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
-
-* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-* ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-* SUCH DAMAGE.
-
-* The licence and distribution terms for any publically available version or
-* derivative of this code cannot be changed.  i.e. this code cannot simply be
-* copied and put under another distribution licence
-* [including the GNU Public Licence.]
-
-ISC license used for completely new code in BoringSSL:
-
-/* Copyright (c) 2015, Google Inc.
-
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
-
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-The code in third_party/fiat carries the MIT license:
-
-Copyright (c) 2015-2016 the fiat-crypto authors (see
-https://github.com/mit-plv/fiat-crypto/blob/master/AUTHORS).
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-Licenses for support code
-
-Parts of the TLS test suite are under the Go license. This code is not included
-in BoringSSL (i.e. libcrypto and libssl) when compiled, however, so
-distributing code linked against BoringSSL does not trigger this license:
+Copyright (C) 1998-2005 Gilles Vollant
+====================================================================================================
 
-Copyright (c) 2009 The Go Authors. All rights reserved.
+====================================================================================================
+LIBRARY: zlib
+ORIGIN: ../../../third_party/zlib/contrib/optimizations/chunkcopy.h + ../../../LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../third_party/zlib/contrib/optimizations/chunkcopy.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2017 ARM, Inc.
+Copyright 2017 The Chromium Authors
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -24623,1313 +2021,37 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ====================================================================================================
 
 ====================================================================================================
-LIBRARY: angle
-LIBRARY: json
-LIBRARY: rapidjson
-ORIGIN: ../../../third_party/angle/include/GLES2/gl2.h
-TYPE: LicenseType.mit
-FILE: ../../../third_party/angle/include/GLES2/gl2.h
-FILE: ../../../third_party/angle/include/GLES2/gl2ext.h
-FILE: ../../../third_party/angle/include/GLES3/gl3.h
-FILE: ../../../third_party/angle/include/GLES3/gl31.h
-FILE: ../../../third_party/angle/include/GLES3/gl32.h
-FILE: ../../../third_party/angle/include/GLX/glxext.h
-FILE: ../../../third_party/json/include/nlohmann/adl_serializer.hpp
-FILE: ../../../third_party/json/include/nlohmann/byte_container_with_subtype.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/abi_macros.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/conversions/from_json.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/conversions/to_chars.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/conversions/to_json.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/exceptions.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/hash.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/input/binary_reader.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/input/input_adapters.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/input/json_sax.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/input/lexer.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/input/parser.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/input/position_t.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/iterators/internal_iterator.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/iterators/iter_impl.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/iterators/iteration_proxy.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/iterators/iterator_traits.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/iterators/json_reverse_iterator.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/iterators/primitive_iterator.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/json_pointer.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/json_ref.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/macro_scope.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/macro_unscope.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/meta/call_std/begin.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/meta/call_std/end.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/meta/cpp_future.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/meta/detected.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/meta/identity_tag.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/meta/is_sax.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/meta/std_fs.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/meta/type_traits.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/meta/void_t.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/output/binary_writer.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/output/output_adapters.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/output/serializer.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/string_concat.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/string_escape.hpp
-FILE: ../../../third_party/json/include/nlohmann/detail/value_t.hpp
-FILE: ../../../third_party/json/include/nlohmann/json.hpp
-FILE: ../../../third_party/json/include/nlohmann/json_fwd.hpp
-FILE: ../../../third_party/json/include/nlohmann/ordered_map.hpp
-FILE: ../../../third_party/json/include/nlohmann/thirdparty/hedley/hedley.hpp
-FILE: ../../../third_party/json/include/nlohmann/thirdparty/hedley/hedley_undef.hpp
-FILE: ../../../third_party/json/single_include/nlohmann/json.hpp
-FILE: ../../../third_party/json/single_include/nlohmann/json_fwd.hpp
-FILE: ../../../third_party/rapidjson/include/rapidjson/allocators.h
-FILE: ../../../third_party/rapidjson/include/rapidjson/cursorstreamwrapper.h
-FILE: ../../../third_party/rapidjson/include/rapidjson/document.h
-FILE: ../../../third_party/rapidjson/include/rapidjson/encodedstream.h
-FILE: ../../../third_party/rapidjson/include/rapidjson/encodings.h
-FILE: ../../../third_party/rapidjson/include/rapidjson/error/en.h
-FILE: ../../../third_party/rapidjson/include/rapidjson/error/error.h
-FILE: ../../../third_party/rapidjson/include/rapidjson/filereadstream.h
-FILE: ../../../third_party/rapidjson/include/rapidjson/filewritestream.h
-FILE: ../../../third_party/rapidjson/include/rapidjson/fwd.h
-FILE: ../../../third_party/rapidjson/include/rapidjson/internal/biginteger.h
-FILE: ../../../third_party/rapidjson/include/rapidjson/internal/diyfp.h
-FILE: ../../../third_party/rapidjson/include/rapidjson/internal/dtoa.h
-FILE: ../../../third_party/rapidjson/include/rapidjson/internal/ieee754.h
-FILE: ../../../third_party/rapidjson/include/rapidjson/internal/itoa.h
-FILE: ../../../third_party/rapidjson/include/rapidjson/internal/meta.h
-FILE: ../../../third_party/rapidjson/include/rapidjson/internal/pow10.h
-FILE: ../../../third_party/rapidjson/include/rapidjson/internal/regex.h
-FILE: ../../../third_party/rapidjson/include/rapidjson/internal/stack.h
-FILE: ../../../third_party/rapidjson/include/rapidjson/internal/strfunc.h
-FILE: ../../../third_party/rapidjson/include/rapidjson/internal/strtod.h
-FILE: ../../../third_party/rapidjson/include/rapidjson/internal/swap.h
-FILE: ../../../third_party/rapidjson/include/rapidjson/istreamwrapper.h
-FILE: ../../../third_party/rapidjson/include/rapidjson/memorybuffer.h
-FILE: ../../../third_party/rapidjson/include/rapidjson/memorystream.h
-FILE: ../../../third_party/rapidjson/include/rapidjson/ostreamwrapper.h
-FILE: ../../../third_party/rapidjson/include/rapidjson/pointer.h
-FILE: ../../../third_party/rapidjson/include/rapidjson/prettywriter.h
-FILE: ../../../third_party/rapidjson/include/rapidjson/rapidjson.h
-FILE: ../../../third_party/rapidjson/include/rapidjson/reader.h
-FILE: ../../../third_party/rapidjson/include/rapidjson/schema.h
-FILE: ../../../third_party/rapidjson/include/rapidjson/stream.h
-FILE: ../../../third_party/rapidjson/include/rapidjson/stringbuffer.h
-FILE: ../../../third_party/rapidjson/include/rapidjson/writer.h
-----------------------------------------------------------------------------------------------------
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: libtess2
-ORIGIN: ../../../third_party/libtess2/LICENSE.txt
-TYPE: LicenseType.mit
-FILE: ../../../third_party/libtess2/Bin/bg.svg
-FILE: ../../../third_party/libtess2/Bin/fg.svg
-FILE: ../../../third_party/libtess2/premake4.lua
-----------------------------------------------------------------------------------------------------
-SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
-Copyright (C) [dates of first publication] Silicon Graphics, Inc.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice including the dates of first publication and either this
-permission notice or a reference to http://oss.sgi.com/projects/FreeB/ shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL SILICON GRAPHICS, INC.
-BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
-OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of Silicon Graphics, Inc. shall not
-be used in advertising or otherwise to promote the sale, use or other dealings in
-this Software without prior written authorization from Silicon Graphics, Inc.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: icu
-ORIGIN: ../../../third_party/icu/LICENSE
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/icu/DIR_METADATA
-FILE: ../../../third_party/icu/android/icudtl.dat
-FILE: ../../../third_party/icu/cast/brkitr.patch
-FILE: ../../../third_party/icu/cast/icudtl.dat
-FILE: ../../../third_party/icu/chromeos/icudtl.dat
-FILE: ../../../third_party/icu/chromeos/icudtl.dat.hash
-FILE: ../../../third_party/icu/common/icudtb.dat
-FILE: ../../../third_party/icu/common/icudtl.dat
-FILE: ../../../third_party/icu/flutter/brkitr.patch
-FILE: ../../../third_party/icu/flutter/icudtl.dat
-FILE: ../../../third_party/icu/fuzzers/fuzzer_utils.h
-FILE: ../../../third_party/icu/fuzzers/icu_appendable_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_break_iterator_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_break_iterator_utf32_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_number_format_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_to_case_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_ucasemap_fuzzer.cc
-FILE: ../../../third_party/icu/ios/icudtl.dat
-FILE: ../../../third_party/icu/patches/ardatepattern.patch
-FILE: ../../../third_party/icu/patches/atomic_template_instantiation.patch
-FILE: ../../../third_party/icu/patches/cjdict.patch
-FILE: ../../../third_party/icu/patches/configure.patch
-FILE: ../../../third_party/icu/patches/data_symb.patch
-FILE: ../../../third_party/icu/patches/fix-bool-mix-use.patch
-FILE: ../../../third_party/icu/patches/fuchsia.patch
-FILE: ../../../third_party/icu/patches/gb_table.patch
-FILE: ../../../third_party/icu/patches/iso2022jp.patch
-FILE: ../../../third_party/icu/patches/isvalidenum.patch
-FILE: ../../../third_party/icu/patches/khmer-dictbe.patch
-FILE: ../../../third_party/icu/patches/locale1.patch
-FILE: ../../../third_party/icu/patches/locale_google.patch
-FILE: ../../../third_party/icu/patches/restrace.patch
-FILE: ../../../third_party/icu/patches/wordbrk.patch
-FILE: ../../../third_party/icu/patches/wpo.patch
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-implicithan-icu4x.icu
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-implicithan.icu
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-unihan-icu4x.icu
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-unihan.icu
-FILE: ../../../third_party/icu/source/data/in/nfc.nrm
-FILE: ../../../third_party/icu/source/data/in/nfkc.nrm
-FILE: ../../../third_party/icu/source/data/in/nfkc_cf.nrm
-FILE: ../../../third_party/icu/source/data/in/pnames.icu
-FILE: ../../../third_party/icu/source/data/in/ubidi.icu
-FILE: ../../../third_party/icu/source/data/in/ucase.icu
-FILE: ../../../third_party/icu/source/data/in/uemoji.icu
-FILE: ../../../third_party/icu/source/data/in/ulayout.icu
-FILE: ../../../third_party/icu/source/data/in/unames.icu
-FILE: ../../../third_party/icu/source/data/in/uprops.icu
-FILE: ../../../third_party/icu/source/data/in/uts46.nrm
-FILE: ../../../third_party/icu/source/data/mappings/big5-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/euc-jp-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/euc-kr-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/gb18030.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm866-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-10-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-13-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-14-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-15-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-16-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-2-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-3-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-4-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-5-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-6-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-7-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-8-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/koi8-r-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/koi8-u-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/macintosh-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/shift_jis-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1250-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1251-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1252-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1253-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1254-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1255-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1256-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1257-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1258-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-874-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-936-2000.ucm
-FILE: ../../../third_party/icu/source/data/mappings/x-mac-cyrillic-html.ucm
-FILE: ../../../third_party/icu/source/extra/scrptrun/srtest.dsp
-FILE: ../../../third_party/icu/source/extra/scrptrun/srtest.dsw
-FILE: ../../../third_party/icu/source/tools/tzcode/asctime.c
-FILE: ../../../third_party/icu/source/tools/tzcode/ialloc.c
-FILE: ../../../third_party/icu/source/tools/tzcode/localtime.c
-FILE: ../../../third_party/icu/source/tools/tzcode/private.h
-FILE: ../../../third_party/icu/source/tools/tzcode/scheck.c
-FILE: ../../../third_party/icu/source/tools/tzcode/tzfile.h
-FILE: ../../../third_party/icu/source/tools/tzcode/tzselect.ksh
-FILE: ../../../third_party/icu/source/tools/tzcode/zdump.c
-FILE: ../../../third_party/icu/source/tools/tzcode/zic.c
-FILE: ../../../third_party/icu/tzres/metaZones.res
-FILE: ../../../third_party/icu/tzres/timezoneTypes.res
-FILE: ../../../third_party/icu/tzres/zoneinfo64.res
-----------------------------------------------------------------------------------------------------
-See Terms of Use <https://www.unicode.org/copyright.html>
-for definitions of Unicode Inc.’s Data Files and Software.
-
-NOTICE TO USER: Carefully read the following legal agreement.
-BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S
-DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"),
-YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
-TERMS AND CONDITIONS OF THIS AGREEMENT.
-IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE
-THE DATA FILES OR SOFTWARE.
-
-COPYRIGHT AND PERMISSION NOTICE
-
-Copyright © 1991-2022 Unicode, Inc. All rights reserved.
-Distributed under the Terms of Use in https://www.unicode.org/copyright.html.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Unicode data files and any associated documentation
-(the "Data Files") or Unicode software and any associated documentation
-(the "Software") to deal in the Data Files or Software
-without restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, and/or sell copies of
-the Data Files or Software, and to permit persons to whom the Data Files
-or Software are furnished to do so, provided that either
-(a) this copyright and permission notice appear with all copies
-of the Data Files or Software, or
-(b) this copyright and permission notice appear in associated
-Documentation.
-
-THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT OF THIRD PARTY RIGHTS.
-IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
-NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
-DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THE DATA FILES OR SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale,
-use or other dealings in these Data Files or Software without prior
-written authorization of the copyright holder.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: rapidjson
-ORIGIN: ../../../third_party/rapidjson/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/rapidjson/.gitmodules
-FILE: ../../../third_party/rapidjson/RapidJSON.pc.in
-FILE: ../../../third_party/rapidjson/RapidJSONConfig.cmake.in
-FILE: ../../../third_party/rapidjson/RapidJSONConfigVersion.cmake.in
-FILE: ../../../third_party/rapidjson/appveyor.yml
-FILE: ../../../third_party/rapidjson/doc/Doxyfile.in
-FILE: ../../../third_party/rapidjson/doc/Doxyfile.zh-cn.in
-FILE: ../../../third_party/rapidjson/doc/diagram/architecture.dot
-FILE: ../../../third_party/rapidjson/doc/diagram/architecture.png
-FILE: ../../../third_party/rapidjson/doc/diagram/insituparsing.dot
-FILE: ../../../third_party/rapidjson/doc/diagram/insituparsing.png
-FILE: ../../../third_party/rapidjson/doc/diagram/iterative-parser-states-diagram.dot
-FILE: ../../../third_party/rapidjson/doc/diagram/iterative-parser-states-diagram.png
-FILE: ../../../third_party/rapidjson/doc/diagram/move1.dot
-FILE: ../../../third_party/rapidjson/doc/diagram/move1.png
-FILE: ../../../third_party/rapidjson/doc/diagram/move2.dot
-FILE: ../../../third_party/rapidjson/doc/diagram/move2.png
-FILE: ../../../third_party/rapidjson/doc/diagram/move3.dot
-FILE: ../../../third_party/rapidjson/doc/diagram/move3.png
-FILE: ../../../third_party/rapidjson/doc/diagram/normalparsing.dot
-FILE: ../../../third_party/rapidjson/doc/diagram/normalparsing.png
-FILE: ../../../third_party/rapidjson/doc/diagram/simpledom.dot
-FILE: ../../../third_party/rapidjson/doc/diagram/simpledom.png
-FILE: ../../../third_party/rapidjson/doc/diagram/tutorial.dot
-FILE: ../../../third_party/rapidjson/doc/diagram/tutorial.png
-FILE: ../../../third_party/rapidjson/doc/diagram/utilityclass.dot
-FILE: ../../../third_party/rapidjson/doc/diagram/utilityclass.png
-FILE: ../../../third_party/rapidjson/doc/logo/rapidjson.png
-FILE: ../../../third_party/rapidjson/doc/logo/rapidjson.svg
-FILE: ../../../third_party/rapidjson/doc/misc/DoxygenLayout.xml
-FILE: ../../../third_party/rapidjson/doc/misc/footer.html
-FILE: ../../../third_party/rapidjson/doc/misc/header.html
-FILE: ../../../third_party/rapidjson/docker/debian/Dockerfile
-FILE: ../../../third_party/rapidjson/example/archiver/archiver.cpp
-FILE: ../../../third_party/rapidjson/example/archiver/archiver.h
-FILE: ../../../third_party/rapidjson/example/archiver/archivertest.cpp
-FILE: ../../../third_party/rapidjson/example/capitalize/capitalize.cpp
-FILE: ../../../third_party/rapidjson/example/condense/condense.cpp
-FILE: ../../../third_party/rapidjson/example/filterkey/filterkey.cpp
-FILE: ../../../third_party/rapidjson/example/filterkeydom/filterkeydom.cpp
-FILE: ../../../third_party/rapidjson/example/jsonx/jsonx.cpp
-FILE: ../../../third_party/rapidjson/example/lookaheadparser/lookaheadparser.cpp
-FILE: ../../../third_party/rapidjson/example/messagereader/messagereader.cpp
-FILE: ../../../third_party/rapidjson/example/parsebyparts/parsebyparts.cpp
-FILE: ../../../third_party/rapidjson/example/pretty/pretty.cpp
-FILE: ../../../third_party/rapidjson/example/prettyauto/prettyauto.cpp
-FILE: ../../../third_party/rapidjson/example/schemavalidator/schemavalidator.cpp
-FILE: ../../../third_party/rapidjson/example/serialize/serialize.cpp
-FILE: ../../../third_party/rapidjson/example/simpledom/simpledom.cpp
-FILE: ../../../third_party/rapidjson/example/simplepullreader/simplepullreader.cpp
-FILE: ../../../third_party/rapidjson/example/simplereader/simplereader.cpp
-FILE: ../../../third_party/rapidjson/example/simplewriter/simplewriter.cpp
-FILE: ../../../third_party/rapidjson/example/sortkeys/sortkeys.cpp
-FILE: ../../../third_party/rapidjson/example/tutorial/tutorial.cpp
-FILE: ../../../third_party/rapidjson/include_dirs.js
-FILE: ../../../third_party/rapidjson/library.json
-FILE: ../../../third_party/rapidjson/package.json
-----------------------------------------------------------------------------------------------------
-Tencent is pleased to support the open source community by making RapidJSON available.
-
-Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.  All rights reserved.
-
-If you have downloaded a copy of the RapidJSON binary from Tencent, please note that the RapidJSON binary is licensed under the MIT License.
-If you have downloaded a copy of the RapidJSON source code from Tencent, please note that RapidJSON source code is licensed under the MIT License, except for the third-party components listed below which are subject to different license terms.  Your integration of RapidJSON into your own projects may require compliance with the MIT License, as well as the other licenses applicable to the third-party components included within RapidJSON.
-
-A copy of the MIT License is included in this file.
-
-Other dependencies and licenses:
-
-Open Source Software Licensed Under the BSD License:
-
-The msinttypes r29
-Copyright (c) 2006-2013 Alexander Chemeris
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-* Neither the name of  copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Terms of the MIT License:
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: rapidjson
-ORIGIN: ../../../third_party/rapidjson/license.txt
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/rapidjson/.gitmodules
-FILE: ../../../third_party/rapidjson/RapidJSON.pc.in
-FILE: ../../../third_party/rapidjson/RapidJSONConfig.cmake.in
-FILE: ../../../third_party/rapidjson/RapidJSONConfigVersion.cmake.in
-FILE: ../../../third_party/rapidjson/appveyor.yml
-FILE: ../../../third_party/rapidjson/doc/Doxyfile.in
-FILE: ../../../third_party/rapidjson/doc/Doxyfile.zh-cn.in
-FILE: ../../../third_party/rapidjson/doc/diagram/architecture.dot
-FILE: ../../../third_party/rapidjson/doc/diagram/architecture.png
-FILE: ../../../third_party/rapidjson/doc/diagram/insituparsing.dot
-FILE: ../../../third_party/rapidjson/doc/diagram/insituparsing.png
-FILE: ../../../third_party/rapidjson/doc/diagram/iterative-parser-states-diagram.dot
-FILE: ../../../third_party/rapidjson/doc/diagram/iterative-parser-states-diagram.png
-FILE: ../../../third_party/rapidjson/doc/diagram/move1.dot
-FILE: ../../../third_party/rapidjson/doc/diagram/move1.png
-FILE: ../../../third_party/rapidjson/doc/diagram/move2.dot
-FILE: ../../../third_party/rapidjson/doc/diagram/move2.png
-FILE: ../../../third_party/rapidjson/doc/diagram/move3.dot
-FILE: ../../../third_party/rapidjson/doc/diagram/move3.png
-FILE: ../../../third_party/rapidjson/doc/diagram/normalparsing.dot
-FILE: ../../../third_party/rapidjson/doc/diagram/normalparsing.png
-FILE: ../../../third_party/rapidjson/doc/diagram/simpledom.dot
-FILE: ../../../third_party/rapidjson/doc/diagram/simpledom.png
-FILE: ../../../third_party/rapidjson/doc/diagram/tutorial.dot
-FILE: ../../../third_party/rapidjson/doc/diagram/tutorial.png
-FILE: ../../../third_party/rapidjson/doc/diagram/utilityclass.dot
-FILE: ../../../third_party/rapidjson/doc/diagram/utilityclass.png
-FILE: ../../../third_party/rapidjson/doc/logo/rapidjson.png
-FILE: ../../../third_party/rapidjson/doc/logo/rapidjson.svg
-FILE: ../../../third_party/rapidjson/doc/misc/DoxygenLayout.xml
-FILE: ../../../third_party/rapidjson/doc/misc/footer.html
-FILE: ../../../third_party/rapidjson/doc/misc/header.html
-FILE: ../../../third_party/rapidjson/docker/debian/Dockerfile
-FILE: ../../../third_party/rapidjson/example/archiver/archiver.cpp
-FILE: ../../../third_party/rapidjson/example/archiver/archiver.h
-FILE: ../../../third_party/rapidjson/example/archiver/archivertest.cpp
-FILE: ../../../third_party/rapidjson/example/capitalize/capitalize.cpp
-FILE: ../../../third_party/rapidjson/example/condense/condense.cpp
-FILE: ../../../third_party/rapidjson/example/filterkey/filterkey.cpp
-FILE: ../../../third_party/rapidjson/example/filterkeydom/filterkeydom.cpp
-FILE: ../../../third_party/rapidjson/example/jsonx/jsonx.cpp
-FILE: ../../../third_party/rapidjson/example/lookaheadparser/lookaheadparser.cpp
-FILE: ../../../third_party/rapidjson/example/messagereader/messagereader.cpp
-FILE: ../../../third_party/rapidjson/example/parsebyparts/parsebyparts.cpp
-FILE: ../../../third_party/rapidjson/example/pretty/pretty.cpp
-FILE: ../../../third_party/rapidjson/example/prettyauto/prettyauto.cpp
-FILE: ../../../third_party/rapidjson/example/schemavalidator/schemavalidator.cpp
-FILE: ../../../third_party/rapidjson/example/serialize/serialize.cpp
-FILE: ../../../third_party/rapidjson/example/simpledom/simpledom.cpp
-FILE: ../../../third_party/rapidjson/example/simplepullreader/simplepullreader.cpp
-FILE: ../../../third_party/rapidjson/example/simplereader/simplereader.cpp
-FILE: ../../../third_party/rapidjson/example/simplewriter/simplewriter.cpp
-FILE: ../../../third_party/rapidjson/example/sortkeys/sortkeys.cpp
-FILE: ../../../third_party/rapidjson/example/tutorial/tutorial.cpp
-FILE: ../../../third_party/rapidjson/include_dirs.js
-FILE: ../../../third_party/rapidjson/library.json
-FILE: ../../../third_party/rapidjson/package.json
-----------------------------------------------------------------------------------------------------
-Tencent is pleased to support the open source community by making RapidJSON available.
-
-Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.  All rights reserved.
-
-If you have downloaded a copy of the RapidJSON binary from Tencent, please note that the RapidJSON binary is licensed under the MIT License.
-If you have downloaded a copy of the RapidJSON source code from Tencent, please note that RapidJSON source code is licensed under the MIT License, except for the third-party components listed below which are subject to different license terms.  Your integration of RapidJSON into your own projects may require compliance with the MIT License, as well as the other licenses applicable to the third-party components included within RapidJSON. To avoid the problematic JSON license in your own projects, it's sufficient to exclude the bin/jsonchecker/ directory, as it's the only code under the JSON license.
-A copy of the MIT License is included in this file.
-
-Other dependencies and licenses:
-
-Open Source Software Licensed Under the BSD License:
-
-The msinttypes r29
-Copyright (c) 2006-2013 Alexander Chemeris
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-* Neither the name of  copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Open Source Software Licensed Under the JSON License:
-
-json.org
-Copyright (c) 2002 JSON.org
-All Rights Reserved.
-
-JSON_checker
-Copyright (c) 2002 JSON.org
-All Rights Reserved.
-
-Terms of the JSON License:
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Terms of the MIT License:
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: icu
-ORIGIN: ../../../third_party/icu/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/icu/DIR_METADATA
-FILE: ../../../third_party/icu/android/icudtl.dat
-FILE: ../../../third_party/icu/cast/brkitr.patch
-FILE: ../../../third_party/icu/cast/icudtl.dat
-FILE: ../../../third_party/icu/chromeos/icudtl.dat
-FILE: ../../../third_party/icu/chromeos/icudtl.dat.hash
-FILE: ../../../third_party/icu/common/icudtb.dat
-FILE: ../../../third_party/icu/common/icudtl.dat
-FILE: ../../../third_party/icu/flutter/brkitr.patch
-FILE: ../../../third_party/icu/flutter/icudtl.dat
-FILE: ../../../third_party/icu/fuzzers/fuzzer_utils.h
-FILE: ../../../third_party/icu/fuzzers/icu_appendable_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_break_iterator_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_break_iterator_utf32_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_number_format_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_to_case_fuzzer.cc
-FILE: ../../../third_party/icu/fuzzers/icu_ucasemap_fuzzer.cc
-FILE: ../../../third_party/icu/ios/icudtl.dat
-FILE: ../../../third_party/icu/patches/ardatepattern.patch
-FILE: ../../../third_party/icu/patches/atomic_template_instantiation.patch
-FILE: ../../../third_party/icu/patches/cjdict.patch
-FILE: ../../../third_party/icu/patches/configure.patch
-FILE: ../../../third_party/icu/patches/data_symb.patch
-FILE: ../../../third_party/icu/patches/fix-bool-mix-use.patch
-FILE: ../../../third_party/icu/patches/fuchsia.patch
-FILE: ../../../third_party/icu/patches/gb_table.patch
-FILE: ../../../third_party/icu/patches/iso2022jp.patch
-FILE: ../../../third_party/icu/patches/isvalidenum.patch
-FILE: ../../../third_party/icu/patches/khmer-dictbe.patch
-FILE: ../../../third_party/icu/patches/locale1.patch
-FILE: ../../../third_party/icu/patches/locale_google.patch
-FILE: ../../../third_party/icu/patches/restrace.patch
-FILE: ../../../third_party/icu/patches/wordbrk.patch
-FILE: ../../../third_party/icu/patches/wpo.patch
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-implicithan-icu4x.icu
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-implicithan.icu
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-unihan-icu4x.icu
-FILE: ../../../third_party/icu/source/data/in/coll/ucadata-unihan.icu
-FILE: ../../../third_party/icu/source/data/in/nfc.nrm
-FILE: ../../../third_party/icu/source/data/in/nfkc.nrm
-FILE: ../../../third_party/icu/source/data/in/nfkc_cf.nrm
-FILE: ../../../third_party/icu/source/data/in/pnames.icu
-FILE: ../../../third_party/icu/source/data/in/ubidi.icu
-FILE: ../../../third_party/icu/source/data/in/ucase.icu
-FILE: ../../../third_party/icu/source/data/in/uemoji.icu
-FILE: ../../../third_party/icu/source/data/in/ulayout.icu
-FILE: ../../../third_party/icu/source/data/in/unames.icu
-FILE: ../../../third_party/icu/source/data/in/uprops.icu
-FILE: ../../../third_party/icu/source/data/in/uts46.nrm
-FILE: ../../../third_party/icu/source/data/mappings/big5-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/euc-jp-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/euc-kr-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/gb18030.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm866-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-10-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-13-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-14-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-15-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-16-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-2-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-3-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-4-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-5-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-6-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-7-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859-8-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/koi8-r-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/koi8-u-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/macintosh-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/shift_jis-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1250-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1251-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1252-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1253-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1254-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1255-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1256-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1257-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-1258-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-874-html.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-936-2000.ucm
-FILE: ../../../third_party/icu/source/data/mappings/x-mac-cyrillic-html.ucm
-FILE: ../../../third_party/icu/source/extra/scrptrun/srtest.dsp
-FILE: ../../../third_party/icu/source/extra/scrptrun/srtest.dsw
-FILE: ../../../third_party/icu/source/tools/tzcode/asctime.c
-FILE: ../../../third_party/icu/source/tools/tzcode/ialloc.c
-FILE: ../../../third_party/icu/source/tools/tzcode/localtime.c
-FILE: ../../../third_party/icu/source/tools/tzcode/private.h
-FILE: ../../../third_party/icu/source/tools/tzcode/scheck.c
-FILE: ../../../third_party/icu/source/tools/tzcode/tzfile.h
-FILE: ../../../third_party/icu/source/tools/tzcode/tzselect.ksh
-FILE: ../../../third_party/icu/source/tools/tzcode/zdump.c
-FILE: ../../../third_party/icu/source/tools/tzcode/zic.c
-FILE: ../../../third_party/icu/tzres/metaZones.res
-FILE: ../../../third_party/icu/tzres/timezoneTypes.res
-FILE: ../../../third_party/icu/tzres/zoneinfo64.res
-----------------------------------------------------------------------------------------------------
-The BSD License
-http://opensource.org/licenses/bsd-license.php
-Copyright (C) 2006-2008, Google Inc.
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following
-disclaimer in the documentation and/or other materials provided with
-the distribution.
- Neither the name of  Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: freetype2
-ORIGIN: ../../../third_party/freetype2/docs/FTL.TXT
-TYPE: LicenseType.freetype
-FILE: ../../../third_party/freetype2/.gitlab-ci.yml
-FILE: ../../../third_party/freetype2/.gitmodules
-FILE: ../../../third_party/freetype2/devel/ft2build.h
-FILE: ../../../third_party/freetype2/devel/ftoption.h
-FILE: ../../../third_party/freetype2/include/freetype-flutter-config/freetype/config/public-macros.h
-FILE: ../../../third_party/freetype2/include/freetype-flutter-config/ftmodule.h
-FILE: ../../../third_party/freetype2/include/freetype-flutter-config/ftoption.h
-FILE: ../../../third_party/freetype2/include/freetype/config/ftconfig.h
-FILE: ../../../third_party/freetype2/include/freetype/config/ftheader.h
-FILE: ../../../third_party/freetype2/include/freetype/config/ftmodule.h
-FILE: ../../../third_party/freetype2/include/freetype/config/ftoption.h
-FILE: ../../../third_party/freetype2/include/freetype/config/ftstdlib.h
-FILE: ../../../third_party/freetype2/include/freetype/config/integer-types.h
-FILE: ../../../third_party/freetype2/include/freetype/config/mac-support.h
-FILE: ../../../third_party/freetype2/include/freetype/config/public-macros.h
-FILE: ../../../third_party/freetype2/include/freetype/freetype.h
-FILE: ../../../third_party/freetype2/include/freetype/ftadvanc.h
-FILE: ../../../third_party/freetype2/include/freetype/ftbbox.h
-FILE: ../../../third_party/freetype2/include/freetype/ftbdf.h
-FILE: ../../../third_party/freetype2/include/freetype/ftbitmap.h
-FILE: ../../../third_party/freetype2/include/freetype/ftbzip2.h
-FILE: ../../../third_party/freetype2/include/freetype/ftcache.h
-FILE: ../../../third_party/freetype2/include/freetype/ftchapters.h
-FILE: ../../../third_party/freetype2/include/freetype/ftcid.h
-FILE: ../../../third_party/freetype2/include/freetype/ftcolor.h
-FILE: ../../../third_party/freetype2/include/freetype/ftdriver.h
-FILE: ../../../third_party/freetype2/include/freetype/fterrdef.h
-FILE: ../../../third_party/freetype2/include/freetype/fterrors.h
-FILE: ../../../third_party/freetype2/include/freetype/ftfntfmt.h
-FILE: ../../../third_party/freetype2/include/freetype/ftgasp.h
-FILE: ../../../third_party/freetype2/include/freetype/ftglyph.h
-FILE: ../../../third_party/freetype2/include/freetype/ftgxval.h
-FILE: ../../../third_party/freetype2/include/freetype/ftgzip.h
-FILE: ../../../third_party/freetype2/include/freetype/ftimage.h
-FILE: ../../../third_party/freetype2/include/freetype/ftincrem.h
-FILE: ../../../third_party/freetype2/include/freetype/ftlcdfil.h
-FILE: ../../../third_party/freetype2/include/freetype/ftlist.h
-FILE: ../../../third_party/freetype2/include/freetype/ftlogging.h
-FILE: ../../../third_party/freetype2/include/freetype/ftlzw.h
-FILE: ../../../third_party/freetype2/include/freetype/ftmac.h
-FILE: ../../../third_party/freetype2/include/freetype/ftmm.h
-FILE: ../../../third_party/freetype2/include/freetype/ftmodapi.h
-FILE: ../../../third_party/freetype2/include/freetype/ftmoderr.h
-FILE: ../../../third_party/freetype2/include/freetype/ftotval.h
-FILE: ../../../third_party/freetype2/include/freetype/ftoutln.h
-FILE: ../../../third_party/freetype2/include/freetype/ftparams.h
-FILE: ../../../third_party/freetype2/include/freetype/ftpfr.h
-FILE: ../../../third_party/freetype2/include/freetype/ftrender.h
-FILE: ../../../third_party/freetype2/include/freetype/ftsizes.h
-FILE: ../../../third_party/freetype2/include/freetype/ftsnames.h
-FILE: ../../../third_party/freetype2/include/freetype/ftstroke.h
-FILE: ../../../third_party/freetype2/include/freetype/ftsynth.h
-FILE: ../../../third_party/freetype2/include/freetype/ftsystem.h
-FILE: ../../../third_party/freetype2/include/freetype/fttrigon.h
-FILE: ../../../third_party/freetype2/include/freetype/fttypes.h
-FILE: ../../../third_party/freetype2/include/freetype/ftwinfnt.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/autohint.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/cffotypes.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/cfftypes.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/compiler-macros.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/ftcalc.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/ftdebug.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/ftdrv.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/ftgloadr.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/ftmemory.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/ftobjs.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/ftpsprop.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/ftrfork.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/ftserv.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/ftstream.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/fttrace.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/ftvalid.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/psaux.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/pshints.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/services/svbdf.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/services/svcfftl.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/services/svcid.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/services/svfntfmt.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/services/svgldict.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/services/svgxval.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/services/svkern.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/services/svmetric.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/services/svmm.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/services/svotval.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/services/svpfr.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/services/svpostnm.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/services/svprop.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/services/svpscmap.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/services/svpsinfo.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/services/svsfnt.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/services/svttcmap.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/services/svtteng.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/services/svttglyf.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/services/svwinfnt.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/sfnt.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/svginterface.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/t1types.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/tttypes.h
-FILE: ../../../third_party/freetype2/include/freetype/internal/wofftypes.h
-FILE: ../../../third_party/freetype2/include/freetype/otsvg.h
-FILE: ../../../third_party/freetype2/include/freetype/t1tables.h
-FILE: ../../../third_party/freetype2/include/freetype/ttnameid.h
-FILE: ../../../third_party/freetype2/include/freetype/tttables.h
-FILE: ../../../third_party/freetype2/include/freetype/tttags.h
-FILE: ../../../third_party/freetype2/include/ft2build.h
-FILE: ../../../third_party/freetype2/meson.build
-FILE: ../../../third_party/freetype2/modules.cfg
-FILE: ../../../third_party/freetype2/src/autofit/afblue.c
-FILE: ../../../third_party/freetype2/src/autofit/afblue.cin
-FILE: ../../../third_party/freetype2/src/autofit/afblue.dat
-FILE: ../../../third_party/freetype2/src/autofit/afblue.h
-FILE: ../../../third_party/freetype2/src/autofit/afblue.hin
-FILE: ../../../third_party/freetype2/src/autofit/afcjk.c
-FILE: ../../../third_party/freetype2/src/autofit/afcjk.h
-FILE: ../../../third_party/freetype2/src/autofit/afcover.h
-FILE: ../../../third_party/freetype2/src/autofit/afdummy.c
-FILE: ../../../third_party/freetype2/src/autofit/afdummy.h
-FILE: ../../../third_party/freetype2/src/autofit/aferrors.h
-FILE: ../../../third_party/freetype2/src/autofit/afglobal.c
-FILE: ../../../third_party/freetype2/src/autofit/afglobal.h
-FILE: ../../../third_party/freetype2/src/autofit/afhints.c
-FILE: ../../../third_party/freetype2/src/autofit/afhints.h
-FILE: ../../../third_party/freetype2/src/autofit/afindic.c
-FILE: ../../../third_party/freetype2/src/autofit/afindic.h
-FILE: ../../../third_party/freetype2/src/autofit/aflatin.c
-FILE: ../../../third_party/freetype2/src/autofit/aflatin.h
-FILE: ../../../third_party/freetype2/src/autofit/afloader.c
-FILE: ../../../third_party/freetype2/src/autofit/afloader.h
-FILE: ../../../third_party/freetype2/src/autofit/afmodule.c
-FILE: ../../../third_party/freetype2/src/autofit/afmodule.h
-FILE: ../../../third_party/freetype2/src/autofit/afranges.c
-FILE: ../../../third_party/freetype2/src/autofit/afranges.h
-FILE: ../../../third_party/freetype2/src/autofit/afscript.h
-FILE: ../../../third_party/freetype2/src/autofit/afshaper.c
-FILE: ../../../third_party/freetype2/src/autofit/afshaper.h
-FILE: ../../../third_party/freetype2/src/autofit/afstyles.h
-FILE: ../../../third_party/freetype2/src/autofit/aftypes.h
-FILE: ../../../third_party/freetype2/src/autofit/afws-decl.h
-FILE: ../../../third_party/freetype2/src/autofit/afws-iter.h
-FILE: ../../../third_party/freetype2/src/autofit/autofit.c
-FILE: ../../../third_party/freetype2/src/base/ftadvanc.c
-FILE: ../../../third_party/freetype2/src/base/ftbase.c
-FILE: ../../../third_party/freetype2/src/base/ftbase.h
-FILE: ../../../third_party/freetype2/src/base/ftbbox.c
-FILE: ../../../third_party/freetype2/src/base/ftbdf.c
-FILE: ../../../third_party/freetype2/src/base/ftbitmap.c
-FILE: ../../../third_party/freetype2/src/base/ftcalc.c
-FILE: ../../../third_party/freetype2/src/base/ftcid.c
-FILE: ../../../third_party/freetype2/src/base/ftcolor.c
-FILE: ../../../third_party/freetype2/src/base/ftdbgmem.c
-FILE: ../../../third_party/freetype2/src/base/ftdebug.c
-FILE: ../../../third_party/freetype2/src/base/fterrors.c
-FILE: ../../../third_party/freetype2/src/base/ftfntfmt.c
-FILE: ../../../third_party/freetype2/src/base/ftfstype.c
-FILE: ../../../third_party/freetype2/src/base/ftgasp.c
-FILE: ../../../third_party/freetype2/src/base/ftgloadr.c
-FILE: ../../../third_party/freetype2/src/base/ftglyph.c
-FILE: ../../../third_party/freetype2/src/base/ftgxval.c
-FILE: ../../../third_party/freetype2/src/base/ftinit.c
-FILE: ../../../third_party/freetype2/src/base/ftlcdfil.c
-FILE: ../../../third_party/freetype2/src/base/ftmac.c
-FILE: ../../../third_party/freetype2/src/base/ftmm.c
-FILE: ../../../third_party/freetype2/src/base/ftobjs.c
-FILE: ../../../third_party/freetype2/src/base/ftotval.c
-FILE: ../../../third_party/freetype2/src/base/ftoutln.c
-FILE: ../../../third_party/freetype2/src/base/ftpatent.c
-FILE: ../../../third_party/freetype2/src/base/ftpfr.c
-FILE: ../../../third_party/freetype2/src/base/ftpsprop.c
-FILE: ../../../third_party/freetype2/src/base/ftrfork.c
-FILE: ../../../third_party/freetype2/src/base/ftsnames.c
-FILE: ../../../third_party/freetype2/src/base/ftstream.c
-FILE: ../../../third_party/freetype2/src/base/ftstroke.c
-FILE: ../../../third_party/freetype2/src/base/ftsynth.c
-FILE: ../../../third_party/freetype2/src/base/ftsystem.c
-FILE: ../../../third_party/freetype2/src/base/fttrigon.c
-FILE: ../../../third_party/freetype2/src/base/fttype1.c
-FILE: ../../../third_party/freetype2/src/base/ftutil.c
-FILE: ../../../third_party/freetype2/src/base/ftver.rc
-FILE: ../../../third_party/freetype2/src/base/ftwinfnt.c
-FILE: ../../../third_party/freetype2/src/base/md5.c
-FILE: ../../../third_party/freetype2/src/base/md5.h
-FILE: ../../../third_party/freetype2/src/bzip2/ftbzip2.c
-FILE: ../../../third_party/freetype2/src/cache/ftcache.c
-FILE: ../../../third_party/freetype2/src/cache/ftcbasic.c
-FILE: ../../../third_party/freetype2/src/cache/ftccache.c
-FILE: ../../../third_party/freetype2/src/cache/ftccache.h
-FILE: ../../../third_party/freetype2/src/cache/ftccback.h
-FILE: ../../../third_party/freetype2/src/cache/ftccmap.c
-FILE: ../../../third_party/freetype2/src/cache/ftcerror.h
-FILE: ../../../third_party/freetype2/src/cache/ftcglyph.c
-FILE: ../../../third_party/freetype2/src/cache/ftcglyph.h
-FILE: ../../../third_party/freetype2/src/cache/ftcimage.c
-FILE: ../../../third_party/freetype2/src/cache/ftcimage.h
-FILE: ../../../third_party/freetype2/src/cache/ftcmanag.c
-FILE: ../../../third_party/freetype2/src/cache/ftcmanag.h
-FILE: ../../../third_party/freetype2/src/cache/ftcmru.c
-FILE: ../../../third_party/freetype2/src/cache/ftcmru.h
-FILE: ../../../third_party/freetype2/src/cache/ftcsbits.c
-FILE: ../../../third_party/freetype2/src/cache/ftcsbits.h
-FILE: ../../../third_party/freetype2/src/cff/cff.c
-FILE: ../../../third_party/freetype2/src/cff/cffcmap.c
-FILE: ../../../third_party/freetype2/src/cff/cffcmap.h
-FILE: ../../../third_party/freetype2/src/cff/cffdrivr.c
-FILE: ../../../third_party/freetype2/src/cff/cffdrivr.h
-FILE: ../../../third_party/freetype2/src/cff/cfferrs.h
-FILE: ../../../third_party/freetype2/src/cff/cffgload.c
-FILE: ../../../third_party/freetype2/src/cff/cffgload.h
-FILE: ../../../third_party/freetype2/src/cff/cffload.c
-FILE: ../../../third_party/freetype2/src/cff/cffload.h
-FILE: ../../../third_party/freetype2/src/cff/cffobjs.c
-FILE: ../../../third_party/freetype2/src/cff/cffobjs.h
-FILE: ../../../third_party/freetype2/src/cff/cffparse.c
-FILE: ../../../third_party/freetype2/src/cff/cffparse.h
-FILE: ../../../third_party/freetype2/src/cff/cfftoken.h
-FILE: ../../../third_party/freetype2/src/cid/ciderrs.h
-FILE: ../../../third_party/freetype2/src/cid/cidgload.c
-FILE: ../../../third_party/freetype2/src/cid/cidgload.h
-FILE: ../../../third_party/freetype2/src/cid/cidload.c
-FILE: ../../../third_party/freetype2/src/cid/cidload.h
-FILE: ../../../third_party/freetype2/src/cid/cidobjs.c
-FILE: ../../../third_party/freetype2/src/cid/cidobjs.h
-FILE: ../../../third_party/freetype2/src/cid/cidparse.c
-FILE: ../../../third_party/freetype2/src/cid/cidparse.h
-FILE: ../../../third_party/freetype2/src/cid/cidriver.c
-FILE: ../../../third_party/freetype2/src/cid/cidriver.h
-FILE: ../../../third_party/freetype2/src/cid/cidtoken.h
-FILE: ../../../third_party/freetype2/src/cid/type1cid.c
-FILE: ../../../third_party/freetype2/src/dlg/dlgwrap.c
-FILE: ../../../third_party/freetype2/src/gxvalid/gxvalid.c
-FILE: ../../../third_party/freetype2/src/gxvalid/gxvalid.h
-FILE: ../../../third_party/freetype2/src/gxvalid/gxvbsln.c
-FILE: ../../../third_party/freetype2/src/gxvalid/gxvcommn.c
-FILE: ../../../third_party/freetype2/src/gxvalid/gxvcommn.h
-FILE: ../../../third_party/freetype2/src/gxvalid/gxverror.h
-FILE: ../../../third_party/freetype2/src/gxvalid/gxvfeat.c
-FILE: ../../../third_party/freetype2/src/gxvalid/gxvfeat.h
-FILE: ../../../third_party/freetype2/src/gxvalid/gxvfgen.c
-FILE: ../../../third_party/freetype2/src/gxvalid/gxvjust.c
-FILE: ../../../third_party/freetype2/src/gxvalid/gxvkern.c
-FILE: ../../../third_party/freetype2/src/gxvalid/gxvlcar.c
-FILE: ../../../third_party/freetype2/src/gxvalid/gxvmod.c
-FILE: ../../../third_party/freetype2/src/gxvalid/gxvmod.h
-FILE: ../../../third_party/freetype2/src/gxvalid/gxvmort.c
-FILE: ../../../third_party/freetype2/src/gxvalid/gxvmort.h
-FILE: ../../../third_party/freetype2/src/gxvalid/gxvmort0.c
-FILE: ../../../third_party/freetype2/src/gxvalid/gxvmort1.c
-FILE: ../../../third_party/freetype2/src/gxvalid/gxvmort2.c
-FILE: ../../../third_party/freetype2/src/gxvalid/gxvmort4.c
-FILE: ../../../third_party/freetype2/src/gxvalid/gxvmort5.c
-FILE: ../../../third_party/freetype2/src/gxvalid/gxvmorx.c
-FILE: ../../../third_party/freetype2/src/gxvalid/gxvmorx.h
-FILE: ../../../third_party/freetype2/src/gxvalid/gxvmorx0.c
-FILE: ../../../third_party/freetype2/src/gxvalid/gxvmorx1.c
-FILE: ../../../third_party/freetype2/src/gxvalid/gxvmorx2.c
-FILE: ../../../third_party/freetype2/src/gxvalid/gxvmorx4.c
-FILE: ../../../third_party/freetype2/src/gxvalid/gxvmorx5.c
-FILE: ../../../third_party/freetype2/src/gxvalid/gxvopbd.c
-FILE: ../../../third_party/freetype2/src/gxvalid/gxvprop.c
-FILE: ../../../third_party/freetype2/src/gxvalid/gxvtrak.c
-FILE: ../../../third_party/freetype2/src/gzip/ftgzip.c
-FILE: ../../../third_party/freetype2/src/lzw/ftlzw.c
-FILE: ../../../third_party/freetype2/src/lzw/ftzopen.c
-FILE: ../../../third_party/freetype2/src/lzw/ftzopen.h
-FILE: ../../../third_party/freetype2/src/otvalid/otvalid.c
-FILE: ../../../third_party/freetype2/src/otvalid/otvalid.h
-FILE: ../../../third_party/freetype2/src/otvalid/otvbase.c
-FILE: ../../../third_party/freetype2/src/otvalid/otvcommn.c
-FILE: ../../../third_party/freetype2/src/otvalid/otvcommn.h
-FILE: ../../../third_party/freetype2/src/otvalid/otverror.h
-FILE: ../../../third_party/freetype2/src/otvalid/otvgdef.c
-FILE: ../../../third_party/freetype2/src/otvalid/otvgpos.c
-FILE: ../../../third_party/freetype2/src/otvalid/otvgpos.h
-FILE: ../../../third_party/freetype2/src/otvalid/otvgsub.c
-FILE: ../../../third_party/freetype2/src/otvalid/otvjstf.c
-FILE: ../../../third_party/freetype2/src/otvalid/otvmath.c
-FILE: ../../../third_party/freetype2/src/otvalid/otvmod.c
-FILE: ../../../third_party/freetype2/src/otvalid/otvmod.h
-FILE: ../../../third_party/freetype2/src/pcf/pcferror.h
-FILE: ../../../third_party/freetype2/src/pfr/pfr.c
-FILE: ../../../third_party/freetype2/src/pfr/pfrcmap.c
-FILE: ../../../third_party/freetype2/src/pfr/pfrcmap.h
-FILE: ../../../third_party/freetype2/src/pfr/pfrdrivr.c
-FILE: ../../../third_party/freetype2/src/pfr/pfrdrivr.h
-FILE: ../../../third_party/freetype2/src/pfr/pfrerror.h
-FILE: ../../../third_party/freetype2/src/pfr/pfrgload.c
-FILE: ../../../third_party/freetype2/src/pfr/pfrgload.h
-FILE: ../../../third_party/freetype2/src/pfr/pfrload.c
-FILE: ../../../third_party/freetype2/src/pfr/pfrload.h
-FILE: ../../../third_party/freetype2/src/pfr/pfrobjs.c
-FILE: ../../../third_party/freetype2/src/pfr/pfrobjs.h
-FILE: ../../../third_party/freetype2/src/pfr/pfrsbit.c
-FILE: ../../../third_party/freetype2/src/pfr/pfrsbit.h
-FILE: ../../../third_party/freetype2/src/pfr/pfrtypes.h
-FILE: ../../../third_party/freetype2/src/psaux/afmparse.c
-FILE: ../../../third_party/freetype2/src/psaux/afmparse.h
-FILE: ../../../third_party/freetype2/src/psaux/cffdecode.c
-FILE: ../../../third_party/freetype2/src/psaux/cffdecode.h
-FILE: ../../../third_party/freetype2/src/psaux/psarrst.c
-FILE: ../../../third_party/freetype2/src/psaux/psarrst.h
-FILE: ../../../third_party/freetype2/src/psaux/psaux.c
-FILE: ../../../third_party/freetype2/src/psaux/psauxerr.h
-FILE: ../../../third_party/freetype2/src/psaux/psauxmod.c
-FILE: ../../../third_party/freetype2/src/psaux/psauxmod.h
-FILE: ../../../third_party/freetype2/src/psaux/psblues.c
-FILE: ../../../third_party/freetype2/src/psaux/psblues.h
-FILE: ../../../third_party/freetype2/src/psaux/psconv.c
-FILE: ../../../third_party/freetype2/src/psaux/psconv.h
-FILE: ../../../third_party/freetype2/src/psaux/pserror.c
-FILE: ../../../third_party/freetype2/src/psaux/pserror.h
-FILE: ../../../third_party/freetype2/src/psaux/psfixed.h
-FILE: ../../../third_party/freetype2/src/psaux/psfont.c
-FILE: ../../../third_party/freetype2/src/psaux/psfont.h
-FILE: ../../../third_party/freetype2/src/psaux/psft.c
-FILE: ../../../third_party/freetype2/src/psaux/psft.h
-FILE: ../../../third_party/freetype2/src/psaux/psglue.h
-FILE: ../../../third_party/freetype2/src/psaux/pshints.c
-FILE: ../../../third_party/freetype2/src/psaux/pshints.h
-FILE: ../../../third_party/freetype2/src/psaux/psintrp.c
-FILE: ../../../third_party/freetype2/src/psaux/psintrp.h
-FILE: ../../../third_party/freetype2/src/psaux/psobjs.c
-FILE: ../../../third_party/freetype2/src/psaux/psobjs.h
-FILE: ../../../third_party/freetype2/src/psaux/psread.c
-FILE: ../../../third_party/freetype2/src/psaux/psread.h
-FILE: ../../../third_party/freetype2/src/psaux/psstack.c
-FILE: ../../../third_party/freetype2/src/psaux/psstack.h
-FILE: ../../../third_party/freetype2/src/psaux/pstypes.h
-FILE: ../../../third_party/freetype2/src/psaux/t1cmap.c
-FILE: ../../../third_party/freetype2/src/psaux/t1cmap.h
-FILE: ../../../third_party/freetype2/src/psaux/t1decode.c
-FILE: ../../../third_party/freetype2/src/psaux/t1decode.h
-FILE: ../../../third_party/freetype2/src/pshinter/pshalgo.c
-FILE: ../../../third_party/freetype2/src/pshinter/pshalgo.h
-FILE: ../../../third_party/freetype2/src/pshinter/pshglob.c
-FILE: ../../../third_party/freetype2/src/pshinter/pshglob.h
-FILE: ../../../third_party/freetype2/src/pshinter/pshinter.c
-FILE: ../../../third_party/freetype2/src/pshinter/pshmod.c
-FILE: ../../../third_party/freetype2/src/pshinter/pshmod.h
-FILE: ../../../third_party/freetype2/src/pshinter/pshnterr.h
-FILE: ../../../third_party/freetype2/src/pshinter/pshrec.c
-FILE: ../../../third_party/freetype2/src/pshinter/pshrec.h
-FILE: ../../../third_party/freetype2/src/psnames/psmodule.c
-FILE: ../../../third_party/freetype2/src/psnames/psmodule.h
-FILE: ../../../third_party/freetype2/src/psnames/psnamerr.h
-FILE: ../../../third_party/freetype2/src/psnames/psnames.c
-FILE: ../../../third_party/freetype2/src/psnames/pstables.h
-FILE: ../../../third_party/freetype2/src/raster/ftmisc.h
-FILE: ../../../third_party/freetype2/src/raster/ftraster.c
-FILE: ../../../third_party/freetype2/src/raster/ftraster.h
-FILE: ../../../third_party/freetype2/src/raster/ftrend1.c
-FILE: ../../../third_party/freetype2/src/raster/ftrend1.h
-FILE: ../../../third_party/freetype2/src/raster/raster.c
-FILE: ../../../third_party/freetype2/src/raster/rasterrs.h
-FILE: ../../../third_party/freetype2/src/sdf/ftbsdf.c
-FILE: ../../../third_party/freetype2/src/sdf/ftsdf.c
-FILE: ../../../third_party/freetype2/src/sdf/ftsdf.h
-FILE: ../../../third_party/freetype2/src/sdf/ftsdfcommon.c
-FILE: ../../../third_party/freetype2/src/sdf/ftsdfcommon.h
-FILE: ../../../third_party/freetype2/src/sdf/ftsdferrs.h
-FILE: ../../../third_party/freetype2/src/sdf/ftsdfrend.c
-FILE: ../../../third_party/freetype2/src/sdf/ftsdfrend.h
-FILE: ../../../third_party/freetype2/src/sdf/sdf.c
-FILE: ../../../third_party/freetype2/src/sfnt/pngshim.c
-FILE: ../../../third_party/freetype2/src/sfnt/pngshim.h
-FILE: ../../../third_party/freetype2/src/sfnt/sfdriver.c
-FILE: ../../../third_party/freetype2/src/sfnt/sfdriver.h
-FILE: ../../../third_party/freetype2/src/sfnt/sferrors.h
-FILE: ../../../third_party/freetype2/src/sfnt/sfnt.c
-FILE: ../../../third_party/freetype2/src/sfnt/sfobjs.c
-FILE: ../../../third_party/freetype2/src/sfnt/sfobjs.h
-FILE: ../../../third_party/freetype2/src/sfnt/sfwoff.c
-FILE: ../../../third_party/freetype2/src/sfnt/sfwoff.h
-FILE: ../../../third_party/freetype2/src/sfnt/sfwoff2.c
-FILE: ../../../third_party/freetype2/src/sfnt/sfwoff2.h
-FILE: ../../../third_party/freetype2/src/sfnt/ttbdf.c
-FILE: ../../../third_party/freetype2/src/sfnt/ttbdf.h
-FILE: ../../../third_party/freetype2/src/sfnt/ttcmap.c
-FILE: ../../../third_party/freetype2/src/sfnt/ttcmap.h
-FILE: ../../../third_party/freetype2/src/sfnt/ttcmapc.h
-FILE: ../../../third_party/freetype2/src/sfnt/ttcolr.c
-FILE: ../../../third_party/freetype2/src/sfnt/ttcolr.h
-FILE: ../../../third_party/freetype2/src/sfnt/ttcpal.c
-FILE: ../../../third_party/freetype2/src/sfnt/ttcpal.h
-FILE: ../../../third_party/freetype2/src/sfnt/ttkern.c
-FILE: ../../../third_party/freetype2/src/sfnt/ttkern.h
-FILE: ../../../third_party/freetype2/src/sfnt/ttload.c
-FILE: ../../../third_party/freetype2/src/sfnt/ttload.h
-FILE: ../../../third_party/freetype2/src/sfnt/ttmtx.c
-FILE: ../../../third_party/freetype2/src/sfnt/ttmtx.h
-FILE: ../../../third_party/freetype2/src/sfnt/ttpost.c
-FILE: ../../../third_party/freetype2/src/sfnt/ttpost.h
-FILE: ../../../third_party/freetype2/src/sfnt/ttsbit.c
-FILE: ../../../third_party/freetype2/src/sfnt/ttsbit.h
-FILE: ../../../third_party/freetype2/src/sfnt/ttsvg.c
-FILE: ../../../third_party/freetype2/src/sfnt/ttsvg.h
-FILE: ../../../third_party/freetype2/src/sfnt/woff2tags.c
-FILE: ../../../third_party/freetype2/src/sfnt/woff2tags.h
-FILE: ../../../third_party/freetype2/src/smooth/ftgrays.c
-FILE: ../../../third_party/freetype2/src/smooth/ftgrays.h
-FILE: ../../../third_party/freetype2/src/smooth/ftsmerrs.h
-FILE: ../../../third_party/freetype2/src/smooth/ftsmooth.c
-FILE: ../../../third_party/freetype2/src/smooth/ftsmooth.h
-FILE: ../../../third_party/freetype2/src/smooth/smooth.c
-FILE: ../../../third_party/freetype2/src/svg/ftsvg.c
-FILE: ../../../third_party/freetype2/src/svg/ftsvg.h
-FILE: ../../../third_party/freetype2/src/svg/svg.c
-FILE: ../../../third_party/freetype2/src/svg/svgtypes.h
-FILE: ../../../third_party/freetype2/src/truetype/truetype.c
-FILE: ../../../third_party/freetype2/src/truetype/ttdriver.c
-FILE: ../../../third_party/freetype2/src/truetype/ttdriver.h
-FILE: ../../../third_party/freetype2/src/truetype/tterrors.h
-FILE: ../../../third_party/freetype2/src/truetype/ttgload.c
-FILE: ../../../third_party/freetype2/src/truetype/ttgload.h
-FILE: ../../../third_party/freetype2/src/truetype/ttgxvar.c
-FILE: ../../../third_party/freetype2/src/truetype/ttgxvar.h
-FILE: ../../../third_party/freetype2/src/truetype/ttinterp.c
-FILE: ../../../third_party/freetype2/src/truetype/ttinterp.h
-FILE: ../../../third_party/freetype2/src/truetype/ttobjs.c
-FILE: ../../../third_party/freetype2/src/truetype/ttobjs.h
-FILE: ../../../third_party/freetype2/src/truetype/ttpload.c
-FILE: ../../../third_party/freetype2/src/truetype/ttpload.h
-FILE: ../../../third_party/freetype2/src/truetype/ttsubpix.c
-FILE: ../../../third_party/freetype2/src/truetype/ttsubpix.h
-FILE: ../../../third_party/freetype2/src/type1/t1afm.c
-FILE: ../../../third_party/freetype2/src/type1/t1afm.h
-FILE: ../../../third_party/freetype2/src/type1/t1driver.c
-FILE: ../../../third_party/freetype2/src/type1/t1driver.h
-FILE: ../../../third_party/freetype2/src/type1/t1errors.h
-FILE: ../../../third_party/freetype2/src/type1/t1gload.c
-FILE: ../../../third_party/freetype2/src/type1/t1gload.h
-FILE: ../../../third_party/freetype2/src/type1/t1load.c
-FILE: ../../../third_party/freetype2/src/type1/t1load.h
-FILE: ../../../third_party/freetype2/src/type1/t1objs.c
-FILE: ../../../third_party/freetype2/src/type1/t1objs.h
-FILE: ../../../third_party/freetype2/src/type1/t1parse.c
-FILE: ../../../third_party/freetype2/src/type1/t1parse.h
-FILE: ../../../third_party/freetype2/src/type1/t1tokens.h
-FILE: ../../../third_party/freetype2/src/type1/type1.c
-FILE: ../../../third_party/freetype2/src/type42/t42drivr.c
-FILE: ../../../third_party/freetype2/src/type42/t42drivr.h
-FILE: ../../../third_party/freetype2/src/type42/t42error.h
-FILE: ../../../third_party/freetype2/src/type42/t42objs.c
-FILE: ../../../third_party/freetype2/src/type42/t42objs.h
-FILE: ../../../third_party/freetype2/src/type42/t42parse.c
-FILE: ../../../third_party/freetype2/src/type42/t42parse.h
-FILE: ../../../third_party/freetype2/src/type42/t42types.h
-FILE: ../../../third_party/freetype2/src/type42/type42.c
-FILE: ../../../third_party/freetype2/src/winfonts/fnterrs.h
-FILE: ../../../third_party/freetype2/src/winfonts/winfnt.c
-FILE: ../../../third_party/freetype2/src/winfonts/winfnt.h
-FILE: ../../../third_party/freetype2/subprojects/libpng.wrap
-FILE: ../../../third_party/freetype2/subprojects/zlib.wrap
-----------------------------------------------------------------------------------------------------
-The FreeType Project LICENSE
-
-        2006-Jan-27
-
-Copyright 1996-2002, 2006 by
-David Turner, Robert Wilhelm, and Werner Lemberg
-
-Introduction
-============
-
-  The FreeType  Project is distributed in  several archive packages;
-  some of them may contain, in addition to the FreeType font engine,
-  various tools and  contributions which rely on, or  relate to, the
-  FreeType Project.
-
-  This  license applies  to all  files found  in such  packages, and
-  which do not  fall under their own explicit  license.  The license
-  affects  thus  the  FreeType   font  engine,  the  test  programs,
-  documentation and makefiles, at the very least.
-
-  This  license   was  inspired  by  the  BSD,   Artistic,  and  IJG
-  (Independent JPEG  Group) licenses, which  all encourage inclusion
-  and  use of  free  software in  commercial  and freeware  products
-  alike.  As a consequence, its main points are that:
-
-    o We don't promise that this software works. However, we will be
-      interested in any kind of bug reports. (`as is' distribution)
-
-    o You can  use this software for whatever you  want, in parts or
-      full form, without having to pay us. (`royalty-free' usage)
-
-    o You may not pretend that  you wrote this software.  If you use
-      it, or  only parts of it,  in a program,  you must acknowledge
-      somewhere  in  your  documentation  that  you  have  used  the
-      FreeType code. (`credits')
-
-  We  specifically  permit  and  encourage  the  inclusion  of  this
-  software, with  or without modifications,  in commercial products.
-  We  disclaim  all warranties  covering  The  FreeType Project  and
-  assume no liability related to The FreeType Project.
-
-  Finally,  many  people  asked  us  for  a  preferred  form  for  a
-  credit/disclaimer to use in compliance with this license.  We thus
-  encourage you to use the following text:
-
-    Portions of this software are copyright © <year> The FreeType
-    Project (www.freetype.org).  All rights reserved.
-
-  Please replace <year> with the value from the FreeType version you
-  actually use.
-
-Legal Terms
-===========
-
-0. Definitions
-
-  Throughout this license,  the terms `package', `FreeType Project',
-  and  `FreeType  archive' refer  to  the  set  of files  originally
-  distributed  by the  authors  (David Turner,  Robert Wilhelm,  and
-  Werner Lemberg) as the `FreeType Project', be they named as alpha,
-  beta or final release.
-
-  `You' refers to  the licensee, or person using  the project, where
-  `using' is a generic term including compiling the project's source
-  code as  well as linking it  to form a  `program' or `executable'.
-  This  program is  referred to  as  `a program  using the  FreeType
-  engine'.
-
-  This  license applies  to all  files distributed  in  the original
-  FreeType  Project,   including  all  source   code,  binaries  and
-  documentation,  unless  otherwise  stated   in  the  file  in  its
-  original, unmodified form as  distributed in the original archive.
-  If you are  unsure whether or not a particular  file is covered by
-  this license, you must contact us to verify this.
-
-  The FreeType  Project is copyright (C) 1996-2000  by David Turner,
-  Robert Wilhelm, and Werner Lemberg.  All rights reserved except as
-  specified below.
-
-1. No Warranty
-
-  THE FREETYPE PROJECT  IS PROVIDED `AS IS' WITHOUT  WARRANTY OF ANY
-  KIND, EITHER  EXPRESS OR IMPLIED,  INCLUDING, BUT NOT  LIMITED TO,
-  WARRANTIES  OF  MERCHANTABILITY   AND  FITNESS  FOR  A  PARTICULAR
-  PURPOSE.  IN NO EVENT WILL ANY OF THE AUTHORS OR COPYRIGHT HOLDERS
-  BE LIABLE  FOR ANY DAMAGES CAUSED  BY THE USE OR  THE INABILITY TO
-  USE, OF THE FREETYPE PROJECT.
-
-2. Redistribution
-
-  This  license  grants  a  worldwide, royalty-free,  perpetual  and
-  irrevocable right  and license to use,  execute, perform, compile,
-  display,  copy,   create  derivative  works   of,  distribute  and
-  sublicense the  FreeType Project (in  both source and  object code
-  forms)  and  derivative works  thereof  for  any  purpose; and  to
-  authorize others  to exercise  some or all  of the  rights granted
-  herein, subject to the following conditions:
-
-    o Redistribution of  source code  must retain this  license file
-      (`FTL.TXT') unaltered; any  additions, deletions or changes to
-      the original  files must be clearly  indicated in accompanying
-      documentation.   The  copyright   notices  of  the  unaltered,
-      original  files must  be  preserved in  all  copies of  source
-      files.
-
-    o Redistribution in binary form must provide a  disclaimer  that
-      states  that  the software is based in part of the work of the
-      FreeType Team,  in  the  distribution  documentation.  We also
-      encourage you to put an URL to the FreeType web page  in  your
-      documentation, though this isn't mandatory.
-
-  These conditions  apply to any  software derived from or  based on
-  the FreeType Project,  not just the unmodified files.   If you use
-  our work, you  must acknowledge us.  However, no  fee need be paid
-  to us.
-
-3. Advertising
-
-  Neither the  FreeType authors and  contributors nor you  shall use
-  the name of the  other for commercial, advertising, or promotional
-  purposes without specific prior written permission.
-
-  We suggest,  but do not require, that  you use one or  more of the
-  following phrases to refer  to this software in your documentation
-  or advertising  materials: `FreeType Project',  `FreeType Engine',
-  `FreeType library', or `FreeType Distribution'.
-
-  As  you have  not signed  this license,  you are  not  required to
-  accept  it.   However,  as  the FreeType  Project  is  copyrighted
-  material, only  this license, or  another one contracted  with the
-  authors, grants you  the right to use, distribute,  and modify it.
-  Therefore,  by  using,  distributing,  or modifying  the  FreeType
-  Project, you indicate that you understand and accept all the terms
-  of this license.
-
-4. Contacts
-
-  There are two mailing lists related to FreeType:
-
-    o freetype@nongnu.org
-
-      Discusses general use and applications of FreeType, as well as
-      future and  wanted additions to the  library and distribution.
-      If  you are looking  for support,  start in  this list  if you
-      haven't found anything to help you in the documentation.
-
-    o freetype-devel@nongnu.org
-
-      Discusses bugs,  as well  as engine internals,  design issues,
-      specific licenses, porting, etc.
-
-  Our home page can be found at
-
-    https://www.freetype.org
-
---- end of FTL.TXT ---
-====================================================================================================
-
-====================================================================================================
-LIBRARY: boringssl
-ORIGIN: ../../../third_party/boringssl/src/third_party/fiat/LICENSE
-TYPE: LicenseType.mit
-FILE: ../../../third_party/boringssl/src/third_party/fiat/METADATA
-FILE: ../../../third_party/boringssl/src/third_party/fiat/curve25519_32.h
-FILE: ../../../third_party/boringssl/src/third_party/fiat/curve25519_64.h
-FILE: ../../../third_party/boringssl/src/third_party/fiat/p256_32.h
-FILE: ../../../third_party/boringssl/src/third_party/fiat/p256_64.h
-----------------------------------------------------------------------------------------------------
-The MIT License (MIT)
-
-Copyright (c) 2015-2016 the fiat-crypto authors (see
-https://github.com/mit-plv/fiat-crypto/blob/master/AUTHORS).
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: rapidjson
-ORIGIN: ../../../third_party/rapidjson/contrib/natvis/LICENSE
+LIBRARY: libcxx
+LIBRARY: libcxxabi
+ORIGIN: ../../../third_party/libcxx/LICENSE.TXT
+ORIGIN: ../../../third_party/libcxxabi/LICENSE.TXT
 TYPE: LicenseType.mit
-FILE: ../../../third_party/rapidjson/contrib/natvis/rapidjson.natvis
+FILE: ../../../third_party/libcxx/include/module.modulemap.in
+FILE: ../../../third_party/libcxx/lib/abi/arm64-apple-darwin.libcxxabi.v1.stable.exceptions.nonew.debug.incomplete.abilist
+FILE: ../../../third_party/libcxx/lib/abi/arm64-apple-darwin.libcxxabi.v1.stable.exceptions.nonew.nodebug.noincomplete.abilist
+FILE: ../../../third_party/libcxx/lib/abi/powerpc-ibm-aix.libcxxabi.v1.stable.exceptions.nonew.debug.incomplete.abilist
+FILE: ../../../third_party/libcxx/lib/abi/powerpc64-ibm-aix.libcxxabi.v1.stable.exceptions.nonew.debug.incomplete.abilist
+FILE: ../../../third_party/libcxx/lib/abi/x86_64-apple-darwin.libcxxabi.v1.stable.exceptions.nonew.debug.incomplete.abilist
+FILE: ../../../third_party/libcxx/lib/abi/x86_64-apple-darwin.libcxxabi.v1.stable.exceptions.nonew.nodebug.noincomplete.abilist
+FILE: ../../../third_party/libcxx/lib/abi/x86_64-unknown-linux-gnu.libcxxabi.v1.stable.exceptions.nonew.debug.incomplete.abilist
+FILE: ../../../third_party/libcxx/lib/abi/x86_64-unknown-linux-gnu.libcxxabi.v1.stable.exceptions.nonew.debug.noincomplete.abilist
+FILE: ../../../third_party/libcxx/lib/abi/x86_64-unknown-linux-gnu.libcxxabi.v1.stable.exceptions.nonew.nodebug.incomplete.abilist
+FILE: ../../../third_party/libcxx/lib/abi/x86_64-unknown-linux-gnu.libcxxabi.v1.stable.noexceptions.nonew.debug.incomplete.abilist
+FILE: ../../../third_party/libcxx/lib/libc++abi.exp
+FILE: ../../../third_party/libcxx/lib/libc++unexp.exp
+FILE: ../../../third_party/libcxx/lib/notweak.exp
+FILE: ../../../third_party/libcxx/lib/weak.exp
+FILE: ../../../third_party/libcxx/src/chrono_system_time_init.h
+FILE: ../../../third_party/libcxx/src/experimental/memory_resource_init_helper.h
+FILE: ../../../third_party/libcxx/src/iostream_init.h
+FILE: ../../../third_party/libcxxabi/fuzz/cxa_demangle_fuzzer.cpp
+FILE: ../../../third_party/libcxxabi/lib/exceptions.exp
+FILE: ../../../third_party/libcxxabi/lib/itanium-base.exp
+FILE: ../../../third_party/libcxxabi/lib/new-delete.exp
+FILE: ../../../third_party/libcxxabi/lib/personality-sjlj.exp
+FILE: ../../../third_party/libcxxabi/lib/personality-v0.exp
 ----------------------------------------------------------------------------------------------------
-The MIT License (MIT)
-
-Copyright (c) 2017 Bart Muzzin
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-Derived from:
-
-The MIT License (MIT)
-
-Copyright (c) 2015 mojmir svoboda
+Copyright (c) 2009-2014 by the contributors listed in CREDITS.TXT
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -25938,1563 +2060,24 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: sqlite
-ORIGIN: ../../../third_party/sqlite/LICENSE
-TYPE: LicenseType.unknown
-FILE: ../../../third_party/sqlite/GIT_REVISION
-FILE: ../../../third_party/sqlite/LAST_UPDATE
-FILE: ../../../third_party/sqlite/VERSION
-FILE: ../../../third_party/sqlite/sqlite3.c
-FILE: ../../../third_party/sqlite/sqlite3.h
-----------------------------------------------------------------------------------------------------
-The source code for SQLite is in the public domain. No claim of
-copyright is made on any part of the core source code. (The
-documentation and test code is a different matter - some sections of
-documentation and test logic are governed by open-source licenses.)
-All contributors to the SQLite core software have signed affidavits
-specifically disavowing any copyright interest in the code. This means
-that anybody is able to legally do anything they want with the SQLite
-source code.
-
-There are other SQL database engines with liberal licenses that allow
-the code to be broadly and freely used. But those other engines are
-still governed by copyright law. SQLite is different in that copyright
-law simply does not apply.
-
-The source code files for other SQL database engines typically begin
-with a comment describing your legal rights to view and copy that
-file. The SQLite source code contains no license since it is not
-governed by copyright. Instead of a license, the SQLite source code
-offers a blessing:
-
-May you do good and not evil
-May you find forgiveness for yourself and forgive others
-May you share freely, never taking more than you give.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: icu
-ORIGIN: ../../../third_party/icu/source/common/unicode/appendable.h
-TYPE: LicenseType.icu
-FILE: ../../../third_party/icu/APIChangeReport.html
-FILE: ../../../third_party/icu/source/Doxyfile.in
-FILE: ../../../third_party/icu/source/common/BUILD.bazel
-FILE: ../../../third_party/icu/source/common/appendable.cpp
-FILE: ../../../third_party/icu/source/common/bmpset.cpp
-FILE: ../../../third_party/icu/source/common/bmpset.h
-FILE: ../../../third_party/icu/source/common/brkeng.cpp
-FILE: ../../../third_party/icu/source/common/brkeng.h
-FILE: ../../../third_party/icu/source/common/brkiter.cpp
-FILE: ../../../third_party/icu/source/common/bytesinkutil.cpp
-FILE: ../../../third_party/icu/source/common/bytesinkutil.h
-FILE: ../../../third_party/icu/source/common/bytestream.cpp
-FILE: ../../../third_party/icu/source/common/bytestrie.cpp
-FILE: ../../../third_party/icu/source/common/bytestriebuilder.cpp
-FILE: ../../../third_party/icu/source/common/bytestrieiterator.cpp
-FILE: ../../../third_party/icu/source/common/caniter.cpp
-FILE: ../../../third_party/icu/source/common/capi_helper.h
-FILE: ../../../third_party/icu/source/common/characterproperties.cpp
-FILE: ../../../third_party/icu/source/common/chariter.cpp
-FILE: ../../../third_party/icu/source/common/charstr.cpp
-FILE: ../../../third_party/icu/source/common/charstr.h
-FILE: ../../../third_party/icu/source/common/charstrmap.h
-FILE: ../../../third_party/icu/source/common/cmemory.cpp
-FILE: ../../../third_party/icu/source/common/cmemory.h
-FILE: ../../../third_party/icu/source/common/common.rc
-FILE: ../../../third_party/icu/source/common/cpputils.h
-FILE: ../../../third_party/icu/source/common/cstr.cpp
-FILE: ../../../third_party/icu/source/common/cstr.h
-FILE: ../../../third_party/icu/source/common/cstring.cpp
-FILE: ../../../third_party/icu/source/common/cstring.h
-FILE: ../../../third_party/icu/source/common/cwchar.cpp
-FILE: ../../../third_party/icu/source/common/cwchar.h
-FILE: ../../../third_party/icu/source/common/dictbe.cpp
-FILE: ../../../third_party/icu/source/common/dictbe.h
-FILE: ../../../third_party/icu/source/common/dictionarydata.cpp
-FILE: ../../../third_party/icu/source/common/dictionarydata.h
-FILE: ../../../third_party/icu/source/common/dtintrv.cpp
-FILE: ../../../third_party/icu/source/common/edits.cpp
-FILE: ../../../third_party/icu/source/common/emojiprops.cpp
-FILE: ../../../third_party/icu/source/common/emojiprops.h
-FILE: ../../../third_party/icu/source/common/errorcode.cpp
-FILE: ../../../third_party/icu/source/common/filteredbrk.cpp
-FILE: ../../../third_party/icu/source/common/filterednormalizer2.cpp
-FILE: ../../../third_party/icu/source/common/hash.h
-FILE: ../../../third_party/icu/source/common/icudataver.cpp
-FILE: ../../../third_party/icu/source/common/icuplug.cpp
-FILE: ../../../third_party/icu/source/common/icuplugimp.h
-FILE: ../../../third_party/icu/source/common/loadednormalizer2impl.cpp
-FILE: ../../../third_party/icu/source/common/localebuilder.cpp
-FILE: ../../../third_party/icu/source/common/localefallback_data.h
-FILE: ../../../third_party/icu/source/common/localematcher.cpp
-FILE: ../../../third_party/icu/source/common/localeprioritylist.cpp
-FILE: ../../../third_party/icu/source/common/localeprioritylist.h
-FILE: ../../../third_party/icu/source/common/localsvc.h
-FILE: ../../../third_party/icu/source/common/locavailable.cpp
-FILE: ../../../third_party/icu/source/common/locbased.cpp
-FILE: ../../../third_party/icu/source/common/locbased.h
-FILE: ../../../third_party/icu/source/common/locdispnames.cpp
-FILE: ../../../third_party/icu/source/common/locdistance.cpp
-FILE: ../../../third_party/icu/source/common/locdistance.h
-FILE: ../../../third_party/icu/source/common/locdspnm.cpp
-FILE: ../../../third_party/icu/source/common/locid.cpp
-FILE: ../../../third_party/icu/source/common/loclikely.cpp
-FILE: ../../../third_party/icu/source/common/loclikelysubtags.cpp
-FILE: ../../../third_party/icu/source/common/loclikelysubtags.h
-FILE: ../../../third_party/icu/source/common/locmap.cpp
-FILE: ../../../third_party/icu/source/common/locmap.h
-FILE: ../../../third_party/icu/source/common/locresdata.cpp
-FILE: ../../../third_party/icu/source/common/locutil.cpp
-FILE: ../../../third_party/icu/source/common/locutil.h
-FILE: ../../../third_party/icu/source/common/lsr.cpp
-FILE: ../../../third_party/icu/source/common/lsr.h
-FILE: ../../../third_party/icu/source/common/lstmbe.cpp
-FILE: ../../../third_party/icu/source/common/lstmbe.h
-FILE: ../../../third_party/icu/source/common/messageimpl.h
-FILE: ../../../third_party/icu/source/common/messagepattern.cpp
-FILE: ../../../third_party/icu/source/common/msvcres.h
-FILE: ../../../third_party/icu/source/common/mutex.h
-FILE: ../../../third_party/icu/source/common/norm2_nfc_data.h
-FILE: ../../../third_party/icu/source/common/norm2allmodes.h
-FILE: ../../../third_party/icu/source/common/normalizer2.cpp
-FILE: ../../../third_party/icu/source/common/normalizer2impl.cpp
-FILE: ../../../third_party/icu/source/common/normalizer2impl.h
-FILE: ../../../third_party/icu/source/common/normlzr.cpp
-FILE: ../../../third_party/icu/source/common/parsepos.cpp
-FILE: ../../../third_party/icu/source/common/patternprops.cpp
-FILE: ../../../third_party/icu/source/common/patternprops.h
-FILE: ../../../third_party/icu/source/common/pluralmap.cpp
-FILE: ../../../third_party/icu/source/common/pluralmap.h
-FILE: ../../../third_party/icu/source/common/propname.cpp
-FILE: ../../../third_party/icu/source/common/propname.h
-FILE: ../../../third_party/icu/source/common/propname_data.h
-FILE: ../../../third_party/icu/source/common/propsvec.cpp
-FILE: ../../../third_party/icu/source/common/propsvec.h
-FILE: ../../../third_party/icu/source/common/punycode.cpp
-FILE: ../../../third_party/icu/source/common/punycode.h
-FILE: ../../../third_party/icu/source/common/putil.cpp
-FILE: ../../../third_party/icu/source/common/putilimp.h
-FILE: ../../../third_party/icu/source/common/rbbi.cpp
-FILE: ../../../third_party/icu/source/common/rbbi_cache.cpp
-FILE: ../../../third_party/icu/source/common/rbbi_cache.h
-FILE: ../../../third_party/icu/source/common/rbbidata.cpp
-FILE: ../../../third_party/icu/source/common/rbbidata.h
-FILE: ../../../third_party/icu/source/common/rbbinode.cpp
-FILE: ../../../third_party/icu/source/common/rbbinode.h
-FILE: ../../../third_party/icu/source/common/rbbirb.cpp
-FILE: ../../../third_party/icu/source/common/rbbirb.h
-FILE: ../../../third_party/icu/source/common/rbbirpt.h
-FILE: ../../../third_party/icu/source/common/rbbiscan.cpp
-FILE: ../../../third_party/icu/source/common/rbbiscan.h
-FILE: ../../../third_party/icu/source/common/rbbisetb.cpp
-FILE: ../../../third_party/icu/source/common/rbbisetb.h
-FILE: ../../../third_party/icu/source/common/rbbistbl.cpp
-FILE: ../../../third_party/icu/source/common/rbbitblb.cpp
-FILE: ../../../third_party/icu/source/common/rbbitblb.h
-FILE: ../../../third_party/icu/source/common/resbund.cpp
-FILE: ../../../third_party/icu/source/common/resbund_cnv.cpp
-FILE: ../../../third_party/icu/source/common/resource.cpp
-FILE: ../../../third_party/icu/source/common/resource.h
-FILE: ../../../third_party/icu/source/common/restrace.cpp
-FILE: ../../../third_party/icu/source/common/restrace.h
-FILE: ../../../third_party/icu/source/common/ruleiter.cpp
-FILE: ../../../third_party/icu/source/common/ruleiter.h
-FILE: ../../../third_party/icu/source/common/schriter.cpp
-FILE: ../../../third_party/icu/source/common/serv.cpp
-FILE: ../../../third_party/icu/source/common/serv.h
-FILE: ../../../third_party/icu/source/common/servlk.cpp
-FILE: ../../../third_party/icu/source/common/servlkf.cpp
-FILE: ../../../third_party/icu/source/common/servloc.h
-FILE: ../../../third_party/icu/source/common/servls.cpp
-FILE: ../../../third_party/icu/source/common/servnotf.cpp
-FILE: ../../../third_party/icu/source/common/servnotf.h
-FILE: ../../../third_party/icu/source/common/servrbf.cpp
-FILE: ../../../third_party/icu/source/common/servslkf.cpp
-FILE: ../../../third_party/icu/source/common/sharedobject.cpp
-FILE: ../../../third_party/icu/source/common/sharedobject.h
-FILE: ../../../third_party/icu/source/common/simpleformatter.cpp
-FILE: ../../../third_party/icu/source/common/sprpimpl.h
-FILE: ../../../third_party/icu/source/common/static_unicode_sets.cpp
-FILE: ../../../third_party/icu/source/common/static_unicode_sets.h
-FILE: ../../../third_party/icu/source/common/stringpiece.cpp
-FILE: ../../../third_party/icu/source/common/stringtriebuilder.cpp
-FILE: ../../../third_party/icu/source/common/uarrsort.cpp
-FILE: ../../../third_party/icu/source/common/uarrsort.h
-FILE: ../../../third_party/icu/source/common/uassert.h
-FILE: ../../../third_party/icu/source/common/ubidi.cpp
-FILE: ../../../third_party/icu/source/common/ubidi_props.cpp
-FILE: ../../../third_party/icu/source/common/ubidi_props.h
-FILE: ../../../third_party/icu/source/common/ubidi_props_data.h
-FILE: ../../../third_party/icu/source/common/ubidiimp.h
-FILE: ../../../third_party/icu/source/common/ubidiln.cpp
-FILE: ../../../third_party/icu/source/common/ubiditransform.cpp
-FILE: ../../../third_party/icu/source/common/ubidiwrt.cpp
-FILE: ../../../third_party/icu/source/common/ubrk.cpp
-FILE: ../../../third_party/icu/source/common/ubrkimpl.h
-FILE: ../../../third_party/icu/source/common/ucase.cpp
-FILE: ../../../third_party/icu/source/common/ucase.h
-FILE: ../../../third_party/icu/source/common/ucase_props_data.h
-FILE: ../../../third_party/icu/source/common/ucasemap.cpp
-FILE: ../../../third_party/icu/source/common/ucasemap_imp.h
-FILE: ../../../third_party/icu/source/common/ucasemap_titlecase_brkiter.cpp
-FILE: ../../../third_party/icu/source/common/ucat.cpp
-FILE: ../../../third_party/icu/source/common/uchar.cpp
-FILE: ../../../third_party/icu/source/common/uchar_props_data.h
-FILE: ../../../third_party/icu/source/common/ucharstrie.cpp
-FILE: ../../../third_party/icu/source/common/ucharstriebuilder.cpp
-FILE: ../../../third_party/icu/source/common/ucharstrieiterator.cpp
-FILE: ../../../third_party/icu/source/common/uchriter.cpp
-FILE: ../../../third_party/icu/source/common/ucln.h
-FILE: ../../../third_party/icu/source/common/ucln_cmn.cpp
-FILE: ../../../third_party/icu/source/common/ucln_cmn.h
-FILE: ../../../third_party/icu/source/common/ucln_imp.h
-FILE: ../../../third_party/icu/source/common/ucmndata.cpp
-FILE: ../../../third_party/icu/source/common/ucmndata.h
-FILE: ../../../third_party/icu/source/common/ucnv.cpp
-FILE: ../../../third_party/icu/source/common/ucnv2022.cpp
-FILE: ../../../third_party/icu/source/common/ucnv_bld.cpp
-FILE: ../../../third_party/icu/source/common/ucnv_bld.h
-FILE: ../../../third_party/icu/source/common/ucnv_cb.cpp
-FILE: ../../../third_party/icu/source/common/ucnv_cnv.cpp
-FILE: ../../../third_party/icu/source/common/ucnv_cnv.h
-FILE: ../../../third_party/icu/source/common/ucnv_ct.cpp
-FILE: ../../../third_party/icu/source/common/ucnv_err.cpp
-FILE: ../../../third_party/icu/source/common/ucnv_ext.cpp
-FILE: ../../../third_party/icu/source/common/ucnv_ext.h
-FILE: ../../../third_party/icu/source/common/ucnv_imp.h
-FILE: ../../../third_party/icu/source/common/ucnv_io.cpp
-FILE: ../../../third_party/icu/source/common/ucnv_io.h
-FILE: ../../../third_party/icu/source/common/ucnv_lmb.cpp
-FILE: ../../../third_party/icu/source/common/ucnv_set.cpp
-FILE: ../../../third_party/icu/source/common/ucnv_u16.cpp
-FILE: ../../../third_party/icu/source/common/ucnv_u32.cpp
-FILE: ../../../third_party/icu/source/common/ucnv_u7.cpp
-FILE: ../../../third_party/icu/source/common/ucnv_u8.cpp
-FILE: ../../../third_party/icu/source/common/ucnvbocu.cpp
-FILE: ../../../third_party/icu/source/common/ucnvdisp.cpp
-FILE: ../../../third_party/icu/source/common/ucnvhz.cpp
-FILE: ../../../third_party/icu/source/common/ucnvisci.cpp
-FILE: ../../../third_party/icu/source/common/ucnvlat1.cpp
-FILE: ../../../third_party/icu/source/common/ucnvmbcs.cpp
-FILE: ../../../third_party/icu/source/common/ucnvmbcs.h
-FILE: ../../../third_party/icu/source/common/ucnvscsu.cpp
-FILE: ../../../third_party/icu/source/common/ucnvsel.cpp
-FILE: ../../../third_party/icu/source/common/ucol_data.h
-FILE: ../../../third_party/icu/source/common/ucol_swp.cpp
-FILE: ../../../third_party/icu/source/common/ucol_swp.h
-FILE: ../../../third_party/icu/source/common/ucptrie.cpp
-FILE: ../../../third_party/icu/source/common/ucptrie_impl.h
-FILE: ../../../third_party/icu/source/common/ucurr.cpp
-FILE: ../../../third_party/icu/source/common/ucurrimp.h
-FILE: ../../../third_party/icu/source/common/udata.cpp
-FILE: ../../../third_party/icu/source/common/udatamem.cpp
-FILE: ../../../third_party/icu/source/common/udatamem.h
-FILE: ../../../third_party/icu/source/common/udataswp.cpp
-FILE: ../../../third_party/icu/source/common/udataswp.h
-FILE: ../../../third_party/icu/source/common/uelement.h
-FILE: ../../../third_party/icu/source/common/uenum.cpp
-FILE: ../../../third_party/icu/source/common/uenumimp.h
-FILE: ../../../third_party/icu/source/common/uhash.cpp
-FILE: ../../../third_party/icu/source/common/uhash.h
-FILE: ../../../third_party/icu/source/common/uhash_us.cpp
-FILE: ../../../third_party/icu/source/common/uidna.cpp
-FILE: ../../../third_party/icu/source/common/uinit.cpp
-FILE: ../../../third_party/icu/source/common/uinvchar.cpp
-FILE: ../../../third_party/icu/source/common/uinvchar.h
-FILE: ../../../third_party/icu/source/common/uiter.cpp
-FILE: ../../../third_party/icu/source/common/ulayout_props.h
-FILE: ../../../third_party/icu/source/common/ulist.cpp
-FILE: ../../../third_party/icu/source/common/ulist.h
-FILE: ../../../third_party/icu/source/common/uloc.cpp
-FILE: ../../../third_party/icu/source/common/uloc_keytype.cpp
-FILE: ../../../third_party/icu/source/common/uloc_tag.cpp
-FILE: ../../../third_party/icu/source/common/ulocimp.h
-FILE: ../../../third_party/icu/source/common/umapfile.cpp
-FILE: ../../../third_party/icu/source/common/umapfile.h
-FILE: ../../../third_party/icu/source/common/umath.cpp
-FILE: ../../../third_party/icu/source/common/umutablecptrie.cpp
-FILE: ../../../third_party/icu/source/common/umutex.cpp
-FILE: ../../../third_party/icu/source/common/umutex.h
-FILE: ../../../third_party/icu/source/common/unames.cpp
-FILE: ../../../third_party/icu/source/common/unicode/appendable.h
-FILE: ../../../third_party/icu/source/common/unicode/brkiter.h
-FILE: ../../../third_party/icu/source/common/unicode/bytestream.h
-FILE: ../../../third_party/icu/source/common/unicode/bytestrie.h
-FILE: ../../../third_party/icu/source/common/unicode/bytestriebuilder.h
-FILE: ../../../third_party/icu/source/common/unicode/caniter.h
-FILE: ../../../third_party/icu/source/common/unicode/casemap.h
-FILE: ../../../third_party/icu/source/common/unicode/char16ptr.h
-FILE: ../../../third_party/icu/source/common/unicode/chariter.h
-FILE: ../../../third_party/icu/source/common/unicode/dbbi.h
-FILE: ../../../third_party/icu/source/common/unicode/docmain.h
-FILE: ../../../third_party/icu/source/common/unicode/dtintrv.h
-FILE: ../../../third_party/icu/source/common/unicode/edits.h
-FILE: ../../../third_party/icu/source/common/unicode/enumset.h
-FILE: ../../../third_party/icu/source/common/unicode/errorcode.h
-FILE: ../../../third_party/icu/source/common/unicode/filteredbrk.h
-FILE: ../../../third_party/icu/source/common/unicode/icudataver.h
-FILE: ../../../third_party/icu/source/common/unicode/icuplug.h
-FILE: ../../../third_party/icu/source/common/unicode/idna.h
-FILE: ../../../third_party/icu/source/common/unicode/localebuilder.h
-FILE: ../../../third_party/icu/source/common/unicode/localematcher.h
-FILE: ../../../third_party/icu/source/common/unicode/localpointer.h
-FILE: ../../../third_party/icu/source/common/unicode/locdspnm.h
-FILE: ../../../third_party/icu/source/common/unicode/locid.h
-FILE: ../../../third_party/icu/source/common/unicode/messagepattern.h
-FILE: ../../../third_party/icu/source/common/unicode/normalizer2.h
-FILE: ../../../third_party/icu/source/common/unicode/normlzr.h
-FILE: ../../../third_party/icu/source/common/unicode/parseerr.h
-FILE: ../../../third_party/icu/source/common/unicode/parsepos.h
-FILE: ../../../third_party/icu/source/common/unicode/platform.h
-FILE: ../../../third_party/icu/source/common/unicode/ptypes.h
-FILE: ../../../third_party/icu/source/common/unicode/putil.h
-FILE: ../../../third_party/icu/source/common/unicode/rbbi.h
-FILE: ../../../third_party/icu/source/common/unicode/rep.h
-FILE: ../../../third_party/icu/source/common/unicode/resbund.h
-FILE: ../../../third_party/icu/source/common/unicode/schriter.h
-FILE: ../../../third_party/icu/source/common/unicode/simpleformatter.h
-FILE: ../../../third_party/icu/source/common/unicode/std_string.h
-FILE: ../../../third_party/icu/source/common/unicode/strenum.h
-FILE: ../../../third_party/icu/source/common/unicode/stringoptions.h
-FILE: ../../../third_party/icu/source/common/unicode/stringpiece.h
-FILE: ../../../third_party/icu/source/common/unicode/stringtriebuilder.h
-FILE: ../../../third_party/icu/source/common/unicode/symtable.h
-FILE: ../../../third_party/icu/source/common/unicode/ubidi.h
-FILE: ../../../third_party/icu/source/common/unicode/ubiditransform.h
-FILE: ../../../third_party/icu/source/common/unicode/ubrk.h
-FILE: ../../../third_party/icu/source/common/unicode/ucasemap.h
-FILE: ../../../third_party/icu/source/common/unicode/ucat.h
-FILE: ../../../third_party/icu/source/common/unicode/uchar.h
-FILE: ../../../third_party/icu/source/common/unicode/ucharstrie.h
-FILE: ../../../third_party/icu/source/common/unicode/ucharstriebuilder.h
-FILE: ../../../third_party/icu/source/common/unicode/uchriter.h
-FILE: ../../../third_party/icu/source/common/unicode/uclean.h
-FILE: ../../../third_party/icu/source/common/unicode/ucnv.h
-FILE: ../../../third_party/icu/source/common/unicode/ucnv_cb.h
-FILE: ../../../third_party/icu/source/common/unicode/ucnv_err.h
-FILE: ../../../third_party/icu/source/common/unicode/ucnvsel.h
-FILE: ../../../third_party/icu/source/common/unicode/uconfig.h
-FILE: ../../../third_party/icu/source/common/unicode/ucpmap.h
-FILE: ../../../third_party/icu/source/common/unicode/ucptrie.h
-FILE: ../../../third_party/icu/source/common/unicode/ucurr.h
-FILE: ../../../third_party/icu/source/common/unicode/udata.h
-FILE: ../../../third_party/icu/source/common/unicode/udisplaycontext.h
-FILE: ../../../third_party/icu/source/common/unicode/uenum.h
-FILE: ../../../third_party/icu/source/common/unicode/uidna.h
-FILE: ../../../third_party/icu/source/common/unicode/uiter.h
-FILE: ../../../third_party/icu/source/common/unicode/uldnames.h
-FILE: ../../../third_party/icu/source/common/unicode/uloc.h
-FILE: ../../../third_party/icu/source/common/unicode/umachine.h
-FILE: ../../../third_party/icu/source/common/unicode/umisc.h
-FILE: ../../../third_party/icu/source/common/unicode/umutablecptrie.h
-FILE: ../../../third_party/icu/source/common/unicode/unifilt.h
-FILE: ../../../third_party/icu/source/common/unicode/unifunct.h
-FILE: ../../../third_party/icu/source/common/unicode/unimatch.h
-FILE: ../../../third_party/icu/source/common/unicode/uniset.h
-FILE: ../../../third_party/icu/source/common/unicode/unistr.h
-FILE: ../../../third_party/icu/source/common/unicode/unorm.h
-FILE: ../../../third_party/icu/source/common/unicode/unorm2.h
-FILE: ../../../third_party/icu/source/common/unicode/uobject.h
-FILE: ../../../third_party/icu/source/common/unicode/urename.h
-FILE: ../../../third_party/icu/source/common/unicode/urep.h
-FILE: ../../../third_party/icu/source/common/unicode/ures.h
-FILE: ../../../third_party/icu/source/common/unicode/uscript.h
-FILE: ../../../third_party/icu/source/common/unicode/uset.h
-FILE: ../../../third_party/icu/source/common/unicode/usetiter.h
-FILE: ../../../third_party/icu/source/common/unicode/ushape.h
-FILE: ../../../third_party/icu/source/common/unicode/usprep.h
-FILE: ../../../third_party/icu/source/common/unicode/ustring.h
-FILE: ../../../third_party/icu/source/common/unicode/ustringtrie.h
-FILE: ../../../third_party/icu/source/common/unicode/utext.h
-FILE: ../../../third_party/icu/source/common/unicode/utf.h
-FILE: ../../../third_party/icu/source/common/unicode/utf16.h
-FILE: ../../../third_party/icu/source/common/unicode/utf32.h
-FILE: ../../../third_party/icu/source/common/unicode/utf8.h
-FILE: ../../../third_party/icu/source/common/unicode/utf_old.h
-FILE: ../../../third_party/icu/source/common/unicode/utrace.h
-FILE: ../../../third_party/icu/source/common/unicode/utypes.h
-FILE: ../../../third_party/icu/source/common/unicode/uvernum.h
-FILE: ../../../third_party/icu/source/common/unicode/uversion.h
-FILE: ../../../third_party/icu/source/common/unifiedcache.cpp
-FILE: ../../../third_party/icu/source/common/unifiedcache.h
-FILE: ../../../third_party/icu/source/common/unifilt.cpp
-FILE: ../../../third_party/icu/source/common/unifunct.cpp
-FILE: ../../../third_party/icu/source/common/uniquecharstr.h
-FILE: ../../../third_party/icu/source/common/uniset.cpp
-FILE: ../../../third_party/icu/source/common/uniset_closure.cpp
-FILE: ../../../third_party/icu/source/common/uniset_props.cpp
-FILE: ../../../third_party/icu/source/common/unisetspan.cpp
-FILE: ../../../third_party/icu/source/common/unisetspan.h
-FILE: ../../../third_party/icu/source/common/unistr.cpp
-FILE: ../../../third_party/icu/source/common/unistr_case.cpp
-FILE: ../../../third_party/icu/source/common/unistr_case_locale.cpp
-FILE: ../../../third_party/icu/source/common/unistr_cnv.cpp
-FILE: ../../../third_party/icu/source/common/unistr_props.cpp
-FILE: ../../../third_party/icu/source/common/unistr_titlecase_brkiter.cpp
-FILE: ../../../third_party/icu/source/common/unistrappender.h
-FILE: ../../../third_party/icu/source/common/unorm.cpp
-FILE: ../../../third_party/icu/source/common/unormcmp.cpp
-FILE: ../../../third_party/icu/source/common/unormimp.h
-FILE: ../../../third_party/icu/source/common/uobject.cpp
-FILE: ../../../third_party/icu/source/common/uposixdefs.h
-FILE: ../../../third_party/icu/source/common/uprops.cpp
-FILE: ../../../third_party/icu/source/common/uprops.h
-FILE: ../../../third_party/icu/source/common/ures_cnv.cpp
-FILE: ../../../third_party/icu/source/common/uresbund.cpp
-FILE: ../../../third_party/icu/source/common/uresdata.cpp
-FILE: ../../../third_party/icu/source/common/uresdata.h
-FILE: ../../../third_party/icu/source/common/uresimp.h
-FILE: ../../../third_party/icu/source/common/ureslocs.h
-FILE: ../../../third_party/icu/source/common/usc_impl.cpp
-FILE: ../../../third_party/icu/source/common/usc_impl.h
-FILE: ../../../third_party/icu/source/common/uscript.cpp
-FILE: ../../../third_party/icu/source/common/uscript_props.cpp
-FILE: ../../../third_party/icu/source/common/uset.cpp
-FILE: ../../../third_party/icu/source/common/uset_imp.h
-FILE: ../../../third_party/icu/source/common/uset_props.cpp
-FILE: ../../../third_party/icu/source/common/usetiter.cpp
-FILE: ../../../third_party/icu/source/common/ushape.cpp
-FILE: ../../../third_party/icu/source/common/usprep.cpp
-FILE: ../../../third_party/icu/source/common/ustack.cpp
-FILE: ../../../third_party/icu/source/common/ustr_cnv.cpp
-FILE: ../../../third_party/icu/source/common/ustr_cnv.h
-FILE: ../../../third_party/icu/source/common/ustr_imp.h
-FILE: ../../../third_party/icu/source/common/ustr_titlecase_brkiter.cpp
-FILE: ../../../third_party/icu/source/common/ustr_wcs.cpp
-FILE: ../../../third_party/icu/source/common/ustrcase.cpp
-FILE: ../../../third_party/icu/source/common/ustrcase_locale.cpp
-FILE: ../../../third_party/icu/source/common/ustrenum.cpp
-FILE: ../../../third_party/icu/source/common/ustrenum.h
-FILE: ../../../third_party/icu/source/common/ustrfmt.cpp
-FILE: ../../../third_party/icu/source/common/ustrfmt.h
-FILE: ../../../third_party/icu/source/common/ustring.cpp
-FILE: ../../../third_party/icu/source/common/ustrtrns.cpp
-FILE: ../../../third_party/icu/source/common/utext.cpp
-FILE: ../../../third_party/icu/source/common/utf_impl.cpp
-FILE: ../../../third_party/icu/source/common/util.cpp
-FILE: ../../../third_party/icu/source/common/util.h
-FILE: ../../../third_party/icu/source/common/util_props.cpp
-FILE: ../../../third_party/icu/source/common/utrace.cpp
-FILE: ../../../third_party/icu/source/common/utracimp.h
-FILE: ../../../third_party/icu/source/common/utrie.cpp
-FILE: ../../../third_party/icu/source/common/utrie.h
-FILE: ../../../third_party/icu/source/common/utrie2.cpp
-FILE: ../../../third_party/icu/source/common/utrie2.h
-FILE: ../../../third_party/icu/source/common/utrie2_builder.cpp
-FILE: ../../../third_party/icu/source/common/utrie2_impl.h
-FILE: ../../../third_party/icu/source/common/utrie_swap.cpp
-FILE: ../../../third_party/icu/source/common/uts46.cpp
-FILE: ../../../third_party/icu/source/common/utypeinfo.h
-FILE: ../../../third_party/icu/source/common/utypes.cpp
-FILE: ../../../third_party/icu/source/common/uvector.cpp
-FILE: ../../../third_party/icu/source/common/uvector.h
-FILE: ../../../third_party/icu/source/common/uvectr32.cpp
-FILE: ../../../third_party/icu/source/common/uvectr32.h
-FILE: ../../../third_party/icu/source/common/uvectr64.cpp
-FILE: ../../../third_party/icu/source/common/uvectr64.h
-FILE: ../../../third_party/icu/source/common/wintz.cpp
-FILE: ../../../third_party/icu/source/common/wintz.h
-FILE: ../../../third_party/icu/source/config/icu-config-bottom
-FILE: ../../../third_party/icu/source/config/icu-config.1.in
-FILE: ../../../third_party/icu/source/config/icu.pc.in
-FILE: ../../../third_party/icu/source/config/make2sh.sed
-FILE: ../../../third_party/icu/source/config/mh-aix-gcc
-FILE: ../../../third_party/icu/source/config/mh-aix-va
-FILE: ../../../third_party/icu/source/config/mh-alpha-linux-cc
-FILE: ../../../third_party/icu/source/config/mh-alpha-linux-gcc
-FILE: ../../../third_party/icu/source/config/mh-alpha-osf
-FILE: ../../../third_party/icu/source/config/mh-beos
-FILE: ../../../third_party/icu/source/config/mh-bsd-gcc
-FILE: ../../../third_party/icu/source/config/mh-cygwin
-FILE: ../../../third_party/icu/source/config/mh-cygwin-msvc
-FILE: ../../../third_party/icu/source/config/mh-cygwin64
-FILE: ../../../third_party/icu/source/config/mh-darwin
-FILE: ../../../third_party/icu/source/config/mh-haiku
-FILE: ../../../third_party/icu/source/config/mh-hpux-acc
-FILE: ../../../third_party/icu/source/config/mh-hpux-gcc
-FILE: ../../../third_party/icu/source/config/mh-irix
-FILE: ../../../third_party/icu/source/config/mh-linux
-FILE: ../../../third_party/icu/source/config/mh-linux-va
-FILE: ../../../third_party/icu/source/config/mh-mingw
-FILE: ../../../third_party/icu/source/config/mh-mingw64
-FILE: ../../../third_party/icu/source/config/mh-mpras
-FILE: ../../../third_party/icu/source/config/mh-msys-msvc
-FILE: ../../../third_party/icu/source/config/mh-os390
-FILE: ../../../third_party/icu/source/config/mh-os400
-FILE: ../../../third_party/icu/source/config/mh-qnx
-FILE: ../../../third_party/icu/source/config/mh-solaris
-FILE: ../../../third_party/icu/source/config/mh-solaris-gcc
-FILE: ../../../third_party/icu/source/config/mh-unknown
-FILE: ../../../third_party/icu/source/config/windows-update.sed.in
-FILE: ../../../third_party/icu/source/data/brkitr/LOCALE_DEPS.json
-FILE: ../../../third_party/icu/source/data/build.xml
-FILE: ../../../third_party/icu/source/data/coll/LOCALE_DEPS.json
-FILE: ../../../third_party/icu/source/data/curr/LOCALE_DEPS.json
-FILE: ../../../third_party/icu/source/data/dtd/cldr-35.1/common/dtd/ldml.dtd
-FILE: ../../../third_party/icu/source/data/dtd/cldr-35.1/common/dtd/ldmlICU.dtd
-FILE: ../../../third_party/icu/source/data/dtd/cldr-40/common/dtd/ldml.dtd
-FILE: ../../../third_party/icu/source/data/dtd/cldr-40/common/dtd/ldmlICU.dtd
-FILE: ../../../third_party/icu/source/data/dtd/cldr/common/dtd/ldml.dtd
-FILE: ../../../third_party/icu/source/data/dtd/cldr/common/dtd/ldmlICU.dtd
-FILE: ../../../third_party/icu/source/data/icupkg.inc.in
-FILE: ../../../third_party/icu/source/data/lang/LOCALE_DEPS.json
-FILE: ../../../third_party/icu/source/data/locales/LOCALE_DEPS.json
-FILE: ../../../third_party/icu/source/data/makedata.mak
-FILE: ../../../third_party/icu/source/data/mappings/cns-11643-1992.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ebcdic-xml-us.ucm
-FILE: ../../../third_party/icu/source/data/mappings/euc-jp-2007.ucm
-FILE: ../../../third_party/icu/source/data/mappings/euc-tw-2014.ucm
-FILE: ../../../third_party/icu/source/data/mappings/gsm-03.38-2009.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1006_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1025_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1026_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1047_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1051_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1089_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1097_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1098_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1112_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1122_P100-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1123_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1124_P100-1996.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1125_P100-1997.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1129_P100-1997.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1130_P100-1997.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1131_P100-1997.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1132_P100-1998.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1133_P100-1997.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1137_P100-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1140_P100-1997.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1141_P100-1997.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1142_P100-1997.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1143_P100-1997.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1144_P100-1997.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1145_P100-1997.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1146_P100-1997.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1147_P100-1997.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1148_P100-1997.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1149_P100-1997.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1153_P100-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1154_P100-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1155_P100-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1156_P100-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1157_P100-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1158_P100-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1160_P100-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1162_P100-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1164_P100-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1168_P100-2002.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1250_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1251_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1252_P100-2000.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1253_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1254_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1255_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1256_P110-1997.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1257_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1258_P100-1997.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-12712_P100-1998.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1276_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1363_P110-1997.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1363_P11B-1998.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1364_P110-2007.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1371_P100-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1373_P100-2002.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1375_P100-2008.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1383_P110-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1386_P100-2001.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1388_P103-2001.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1390_P110-2003.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-1399_P110-2003.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-16684_P110-2003.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-16804_X110-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-273_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-277_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-278_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-280_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-284_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-285_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-290_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-297_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-33722_P120-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-33722_P12A_P12A-2004_U2.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-33722_P12A_P12A-2009_U2.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-37_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-420_X120-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-424_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-437_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-4517_P100-2005.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-4899_P100-1998.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-4909_P100-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-4971_P100-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-500_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-5012_P100-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-5123_P100-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-5346_P100-1998.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-5347_P100-1998.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-5348_P100-1997.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-5349_P100-1998.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-5350_P100-1998.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-5351_P100-1998.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-5352_P100-1998.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-5353_P100-1998.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-5354_P100-1998.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-5471_P100-2006.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-5478_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-720_P100-1997.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-737_P100-1997.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-775_P100-1996.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-803_P100-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-813_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-838_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-8482_P100-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-850_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-851_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-852_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-855_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-856_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-857_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-858_P100-1997.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-860_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-861_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-862_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-863_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-864_X110-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-865_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-866_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-867_P100-1998.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-868_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-869_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-870_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-871_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-874_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-875_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-878_P100-1996.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-9005_X110-2007.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-901_P100-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-902_P100-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-9067_X100-2005.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-912_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-913_P100-2000.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-914_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-915_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-916_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-918_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-920_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-921_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-922_P100-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-923_P100-1998.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-930_P120-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-933_P110-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-935_P110-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-937_P110-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-939_P120-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-942_P12A-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-943_P130-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-943_P15A-2003.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-9447_P100-2002.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-9448_X100-2005.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-9449_P100-2002.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-949_P110-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-949_P11A-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-950_P110-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-954_P101-2007.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-964_P110-1999.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-970_P110_P110-2006_U2.ucm
-FILE: ../../../third_party/icu/source/data/mappings/ibm-971_P100-1995.ucm
-FILE: ../../../third_party/icu/source/data/mappings/icu-internal-25546.ucm
-FILE: ../../../third_party/icu/source/data/mappings/icu-internal-compound-d1.ucm
-FILE: ../../../third_party/icu/source/data/mappings/icu-internal-compound-d2.ucm
-FILE: ../../../third_party/icu/source/data/mappings/icu-internal-compound-d3.ucm
-FILE: ../../../third_party/icu/source/data/mappings/icu-internal-compound-d4.ucm
-FILE: ../../../third_party/icu/source/data/mappings/icu-internal-compound-d5.ucm
-FILE: ../../../third_party/icu/source/data/mappings/icu-internal-compound-d6.ucm
-FILE: ../../../third_party/icu/source/data/mappings/icu-internal-compound-d7.ucm
-FILE: ../../../third_party/icu/source/data/mappings/icu-internal-compound-s1.ucm
-FILE: ../../../third_party/icu/source/data/mappings/icu-internal-compound-s2.ucm
-FILE: ../../../third_party/icu/source/data/mappings/icu-internal-compound-s3.ucm
-FILE: ../../../third_party/icu/source/data/mappings/icu-internal-compound-t.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859_10-1998.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859_11-2001.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-8859_14-1998.ucm
-FILE: ../../../third_party/icu/source/data/mappings/iso-ir-165.ucm
-FILE: ../../../third_party/icu/source/data/mappings/jisx-212.ucm
-FILE: ../../../third_party/icu/source/data/mappings/lmb-excp.ucm
-FILE: ../../../third_party/icu/source/data/mappings/macos-0_2-10.2.ucm
-FILE: ../../../third_party/icu/source/data/mappings/macos-29-10.2.ucm
-FILE: ../../../third_party/icu/source/data/mappings/macos-35-10.2.ucm
-FILE: ../../../third_party/icu/source/data/mappings/macos-6_2-10.4.ucm
-FILE: ../../../third_party/icu/source/data/mappings/macos-7_3-10.2.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-874-2000.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-949-2000.ucm
-FILE: ../../../third_party/icu/source/data/mappings/windows-950-2000.ucm
-FILE: ../../../third_party/icu/source/data/misc/icudata.rc
-FILE: ../../../third_party/icu/source/data/rbnf/LOCALE_DEPS.json
-FILE: ../../../third_party/icu/source/data/region/LOCALE_DEPS.json
-FILE: ../../../third_party/icu/source/data/unidata/norm2/BUILD.bazel
-FILE: ../../../third_party/icu/source/data/unit/LOCALE_DEPS.json
-FILE: ../../../third_party/icu/source/data/zone/LOCALE_DEPS.json
-FILE: ../../../third_party/icu/source/extra/scrptrun/scrptrun.cpp
-FILE: ../../../third_party/icu/source/extra/scrptrun/scrptrun.h
-FILE: ../../../third_party/icu/source/extra/scrptrun/srtest.cpp
-FILE: ../../../third_party/icu/source/extra/uconv/makedata.mak
-FILE: ../../../third_party/icu/source/extra/uconv/pkgdata.inc.in
-FILE: ../../../third_party/icu/source/extra/uconv/uconv.1.in
-FILE: ../../../third_party/icu/source/extra/uconv/uconv.cpp
-FILE: ../../../third_party/icu/source/extra/uconv/unicode/uwmsg.h
-FILE: ../../../third_party/icu/source/extra/uconv/uwmsg.c
-FILE: ../../../third_party/icu/source/i18n/BUILD.bazel
-FILE: ../../../third_party/icu/source/i18n/alphaindex.cpp
-FILE: ../../../third_party/icu/source/i18n/anytrans.cpp
-FILE: ../../../third_party/icu/source/i18n/anytrans.h
-FILE: ../../../third_party/icu/source/i18n/astro.cpp
-FILE: ../../../third_party/icu/source/i18n/astro.h
-FILE: ../../../third_party/icu/source/i18n/basictz.cpp
-FILE: ../../../third_party/icu/source/i18n/bocsu.cpp
-FILE: ../../../third_party/icu/source/i18n/bocsu.h
-FILE: ../../../third_party/icu/source/i18n/brktrans.cpp
-FILE: ../../../third_party/icu/source/i18n/brktrans.h
-FILE: ../../../third_party/icu/source/i18n/buddhcal.cpp
-FILE: ../../../third_party/icu/source/i18n/buddhcal.h
-FILE: ../../../third_party/icu/source/i18n/calendar.cpp
-FILE: ../../../third_party/icu/source/i18n/casetrn.cpp
-FILE: ../../../third_party/icu/source/i18n/casetrn.h
-FILE: ../../../third_party/icu/source/i18n/cecal.cpp
-FILE: ../../../third_party/icu/source/i18n/cecal.h
-FILE: ../../../third_party/icu/source/i18n/chnsecal.cpp
-FILE: ../../../third_party/icu/source/i18n/chnsecal.h
-FILE: ../../../third_party/icu/source/i18n/choicfmt.cpp
-FILE: ../../../third_party/icu/source/i18n/coleitr.cpp
-FILE: ../../../third_party/icu/source/i18n/coll.cpp
-FILE: ../../../third_party/icu/source/i18n/collation.cpp
-FILE: ../../../third_party/icu/source/i18n/collation.h
-FILE: ../../../third_party/icu/source/i18n/collationbuilder.cpp
-FILE: ../../../third_party/icu/source/i18n/collationbuilder.h
-FILE: ../../../third_party/icu/source/i18n/collationcompare.cpp
-FILE: ../../../third_party/icu/source/i18n/collationcompare.h
-FILE: ../../../third_party/icu/source/i18n/collationdata.cpp
-FILE: ../../../third_party/icu/source/i18n/collationdata.h
-FILE: ../../../third_party/icu/source/i18n/collationdatabuilder.cpp
-FILE: ../../../third_party/icu/source/i18n/collationdatabuilder.h
-FILE: ../../../third_party/icu/source/i18n/collationdatareader.cpp
-FILE: ../../../third_party/icu/source/i18n/collationdatareader.h
-FILE: ../../../third_party/icu/source/i18n/collationdatawriter.cpp
-FILE: ../../../third_party/icu/source/i18n/collationdatawriter.h
-FILE: ../../../third_party/icu/source/i18n/collationfastlatin.cpp
-FILE: ../../../third_party/icu/source/i18n/collationfastlatin.h
-FILE: ../../../third_party/icu/source/i18n/collationfastlatinbuilder.cpp
-FILE: ../../../third_party/icu/source/i18n/collationfastlatinbuilder.h
-FILE: ../../../third_party/icu/source/i18n/collationfcd.cpp
-FILE: ../../../third_party/icu/source/i18n/collationfcd.h
-FILE: ../../../third_party/icu/source/i18n/collationiterator.cpp
-FILE: ../../../third_party/icu/source/i18n/collationiterator.h
-FILE: ../../../third_party/icu/source/i18n/collationkeys.cpp
-FILE: ../../../third_party/icu/source/i18n/collationkeys.h
-FILE: ../../../third_party/icu/source/i18n/collationroot.cpp
-FILE: ../../../third_party/icu/source/i18n/collationroot.h
-FILE: ../../../third_party/icu/source/i18n/collationrootelements.cpp
-FILE: ../../../third_party/icu/source/i18n/collationrootelements.h
-FILE: ../../../third_party/icu/source/i18n/collationruleparser.cpp
-FILE: ../../../third_party/icu/source/i18n/collationruleparser.h
-FILE: ../../../third_party/icu/source/i18n/collationsets.cpp
-FILE: ../../../third_party/icu/source/i18n/collationsets.h
-FILE: ../../../third_party/icu/source/i18n/collationsettings.cpp
-FILE: ../../../third_party/icu/source/i18n/collationsettings.h
-FILE: ../../../third_party/icu/source/i18n/collationtailoring.cpp
-FILE: ../../../third_party/icu/source/i18n/collationtailoring.h
-FILE: ../../../third_party/icu/source/i18n/collationweights.cpp
-FILE: ../../../third_party/icu/source/i18n/collationweights.h
-FILE: ../../../third_party/icu/source/i18n/collunsafe.h
-FILE: ../../../third_party/icu/source/i18n/compactdecimalformat.cpp
-FILE: ../../../third_party/icu/source/i18n/coptccal.cpp
-FILE: ../../../third_party/icu/source/i18n/coptccal.h
-FILE: ../../../third_party/icu/source/i18n/cpdtrans.cpp
-FILE: ../../../third_party/icu/source/i18n/cpdtrans.h
-FILE: ../../../third_party/icu/source/i18n/csdetect.cpp
-FILE: ../../../third_party/icu/source/i18n/csdetect.h
-FILE: ../../../third_party/icu/source/i18n/csmatch.cpp
-FILE: ../../../third_party/icu/source/i18n/csmatch.h
-FILE: ../../../third_party/icu/source/i18n/csr2022.cpp
-FILE: ../../../third_party/icu/source/i18n/csr2022.h
-FILE: ../../../third_party/icu/source/i18n/csrecog.cpp
-FILE: ../../../third_party/icu/source/i18n/csrecog.h
-FILE: ../../../third_party/icu/source/i18n/csrmbcs.cpp
-FILE: ../../../third_party/icu/source/i18n/csrmbcs.h
-FILE: ../../../third_party/icu/source/i18n/csrsbcs.cpp
-FILE: ../../../third_party/icu/source/i18n/csrsbcs.h
-FILE: ../../../third_party/icu/source/i18n/csrucode.cpp
-FILE: ../../../third_party/icu/source/i18n/csrucode.h
-FILE: ../../../third_party/icu/source/i18n/csrutf8.cpp
-FILE: ../../../third_party/icu/source/i18n/csrutf8.h
-FILE: ../../../third_party/icu/source/i18n/curramt.cpp
-FILE: ../../../third_party/icu/source/i18n/currfmt.cpp
-FILE: ../../../third_party/icu/source/i18n/currfmt.h
-FILE: ../../../third_party/icu/source/i18n/currpinf.cpp
-FILE: ../../../third_party/icu/source/i18n/currunit.cpp
-FILE: ../../../third_party/icu/source/i18n/dangical.cpp
-FILE: ../../../third_party/icu/source/i18n/dangical.h
-FILE: ../../../third_party/icu/source/i18n/datefmt.cpp
-FILE: ../../../third_party/icu/source/i18n/dayperiodrules.cpp
-FILE: ../../../third_party/icu/source/i18n/dayperiodrules.h
-FILE: ../../../third_party/icu/source/i18n/dcfmtsym.cpp
-FILE: ../../../third_party/icu/source/i18n/decContext.cpp
-FILE: ../../../third_party/icu/source/i18n/decContext.h
-FILE: ../../../third_party/icu/source/i18n/decNumber.cpp
-FILE: ../../../third_party/icu/source/i18n/decNumber.h
-FILE: ../../../third_party/icu/source/i18n/decNumberLocal.h
-FILE: ../../../third_party/icu/source/i18n/decimfmt.cpp
-FILE: ../../../third_party/icu/source/i18n/displayoptions.cpp
-FILE: ../../../third_party/icu/source/i18n/double-conversion-bignum-dtoa.cpp
-FILE: ../../../third_party/icu/source/i18n/double-conversion-bignum-dtoa.h
-FILE: ../../../third_party/icu/source/i18n/double-conversion-bignum.cpp
-FILE: ../../../third_party/icu/source/i18n/double-conversion-bignum.h
-FILE: ../../../third_party/icu/source/i18n/double-conversion-cached-powers.cpp
-FILE: ../../../third_party/icu/source/i18n/double-conversion-cached-powers.h
-FILE: ../../../third_party/icu/source/i18n/double-conversion-diy-fp.h
-FILE: ../../../third_party/icu/source/i18n/double-conversion-double-to-string.cpp
-FILE: ../../../third_party/icu/source/i18n/double-conversion-double-to-string.h
-FILE: ../../../third_party/icu/source/i18n/double-conversion-fast-dtoa.cpp
-FILE: ../../../third_party/icu/source/i18n/double-conversion-fast-dtoa.h
-FILE: ../../../third_party/icu/source/i18n/double-conversion-ieee.h
-FILE: ../../../third_party/icu/source/i18n/double-conversion-string-to-double.cpp
-FILE: ../../../third_party/icu/source/i18n/double-conversion-string-to-double.h
-FILE: ../../../third_party/icu/source/i18n/double-conversion-strtod.cpp
-FILE: ../../../third_party/icu/source/i18n/double-conversion-strtod.h
-FILE: ../../../third_party/icu/source/i18n/double-conversion-utils.h
-FILE: ../../../third_party/icu/source/i18n/double-conversion.h
-FILE: ../../../third_party/icu/source/i18n/dt_impl.h
-FILE: ../../../third_party/icu/source/i18n/dtfmtsym.cpp
-FILE: ../../../third_party/icu/source/i18n/dtitv_impl.h
-FILE: ../../../third_party/icu/source/i18n/dtitvfmt.cpp
-FILE: ../../../third_party/icu/source/i18n/dtitvinf.cpp
-FILE: ../../../third_party/icu/source/i18n/dtptngen.cpp
-FILE: ../../../third_party/icu/source/i18n/dtptngen_impl.h
-FILE: ../../../third_party/icu/source/i18n/dtrule.cpp
-FILE: ../../../third_party/icu/source/i18n/erarules.cpp
-FILE: ../../../third_party/icu/source/i18n/erarules.h
-FILE: ../../../third_party/icu/source/i18n/esctrn.cpp
-FILE: ../../../third_party/icu/source/i18n/esctrn.h
-FILE: ../../../third_party/icu/source/i18n/ethpccal.cpp
-FILE: ../../../third_party/icu/source/i18n/ethpccal.h
-FILE: ../../../third_party/icu/source/i18n/fmtable.cpp
-FILE: ../../../third_party/icu/source/i18n/fmtable_cnv.cpp
-FILE: ../../../third_party/icu/source/i18n/fmtableimp.h
-FILE: ../../../third_party/icu/source/i18n/format.cpp
-FILE: ../../../third_party/icu/source/i18n/formatted_string_builder.cpp
-FILE: ../../../third_party/icu/source/i18n/formatted_string_builder.h
-FILE: ../../../third_party/icu/source/i18n/formattedval_impl.h
-FILE: ../../../third_party/icu/source/i18n/formattedval_iterimpl.cpp
-FILE: ../../../third_party/icu/source/i18n/formattedval_sbimpl.cpp
-FILE: ../../../third_party/icu/source/i18n/formattedvalue.cpp
-FILE: ../../../third_party/icu/source/i18n/fphdlimp.cpp
-FILE: ../../../third_party/icu/source/i18n/fphdlimp.h
-FILE: ../../../third_party/icu/source/i18n/fpositer.cpp
-FILE: ../../../third_party/icu/source/i18n/funcrepl.cpp
-FILE: ../../../third_party/icu/source/i18n/funcrepl.h
-FILE: ../../../third_party/icu/source/i18n/gender.cpp
-FILE: ../../../third_party/icu/source/i18n/gregocal.cpp
-FILE: ../../../third_party/icu/source/i18n/gregoimp.cpp
-FILE: ../../../third_party/icu/source/i18n/gregoimp.h
-FILE: ../../../third_party/icu/source/i18n/hebrwcal.cpp
-FILE: ../../../third_party/icu/source/i18n/hebrwcal.h
-FILE: ../../../third_party/icu/source/i18n/i18n.rc
-FILE: ../../../third_party/icu/source/i18n/indiancal.cpp
-FILE: ../../../third_party/icu/source/i18n/indiancal.h
-FILE: ../../../third_party/icu/source/i18n/inputext.cpp
-FILE: ../../../third_party/icu/source/i18n/inputext.h
-FILE: ../../../third_party/icu/source/i18n/islamcal.cpp
-FILE: ../../../third_party/icu/source/i18n/islamcal.h
-FILE: ../../../third_party/icu/source/i18n/japancal.cpp
-FILE: ../../../third_party/icu/source/i18n/japancal.h
-FILE: ../../../third_party/icu/source/i18n/listformatter.cpp
-FILE: ../../../third_party/icu/source/i18n/measfmt.cpp
-FILE: ../../../third_party/icu/source/i18n/measunit.cpp
-FILE: ../../../third_party/icu/source/i18n/measunit_extra.cpp
-FILE: ../../../third_party/icu/source/i18n/measunit_impl.h
-FILE: ../../../third_party/icu/source/i18n/measure.cpp
-FILE: ../../../third_party/icu/source/i18n/msgfmt.cpp
-FILE: ../../../third_party/icu/source/i18n/msgfmt_impl.h
-FILE: ../../../third_party/icu/source/i18n/name2uni.cpp
-FILE: ../../../third_party/icu/source/i18n/name2uni.h
-FILE: ../../../third_party/icu/source/i18n/nfrlist.h
-FILE: ../../../third_party/icu/source/i18n/nfrs.cpp
-FILE: ../../../third_party/icu/source/i18n/nfrs.h
-FILE: ../../../third_party/icu/source/i18n/nfrule.cpp
-FILE: ../../../third_party/icu/source/i18n/nfrule.h
-FILE: ../../../third_party/icu/source/i18n/nfsubs.cpp
-FILE: ../../../third_party/icu/source/i18n/nfsubs.h
-FILE: ../../../third_party/icu/source/i18n/nortrans.cpp
-FILE: ../../../third_party/icu/source/i18n/nortrans.h
-FILE: ../../../third_party/icu/source/i18n/nultrans.cpp
-FILE: ../../../third_party/icu/source/i18n/nultrans.h
-FILE: ../../../third_party/icu/source/i18n/number_affixutils.cpp
-FILE: ../../../third_party/icu/source/i18n/number_affixutils.h
-FILE: ../../../third_party/icu/source/i18n/number_asformat.cpp
-FILE: ../../../third_party/icu/source/i18n/number_asformat.h
-FILE: ../../../third_party/icu/source/i18n/number_capi.cpp
-FILE: ../../../third_party/icu/source/i18n/number_compact.cpp
-FILE: ../../../third_party/icu/source/i18n/number_compact.h
-FILE: ../../../third_party/icu/source/i18n/number_currencysymbols.cpp
-FILE: ../../../third_party/icu/source/i18n/number_currencysymbols.h
-FILE: ../../../third_party/icu/source/i18n/number_decimalquantity.cpp
-FILE: ../../../third_party/icu/source/i18n/number_decimalquantity.h
-FILE: ../../../third_party/icu/source/i18n/number_decimfmtprops.cpp
-FILE: ../../../third_party/icu/source/i18n/number_decimfmtprops.h
-FILE: ../../../third_party/icu/source/i18n/number_decnum.h
-FILE: ../../../third_party/icu/source/i18n/number_fluent.cpp
-FILE: ../../../third_party/icu/source/i18n/number_formatimpl.cpp
-FILE: ../../../third_party/icu/source/i18n/number_formatimpl.h
-FILE: ../../../third_party/icu/source/i18n/number_grouping.cpp
-FILE: ../../../third_party/icu/source/i18n/number_integerwidth.cpp
-FILE: ../../../third_party/icu/source/i18n/number_longnames.cpp
-FILE: ../../../third_party/icu/source/i18n/number_longnames.h
-FILE: ../../../third_party/icu/source/i18n/number_mapper.cpp
-FILE: ../../../third_party/icu/source/i18n/number_mapper.h
-FILE: ../../../third_party/icu/source/i18n/number_microprops.h
-FILE: ../../../third_party/icu/source/i18n/number_modifiers.cpp
-FILE: ../../../third_party/icu/source/i18n/number_modifiers.h
-FILE: ../../../third_party/icu/source/i18n/number_multiplier.cpp
-FILE: ../../../third_party/icu/source/i18n/number_multiplier.h
-FILE: ../../../third_party/icu/source/i18n/number_notation.cpp
-FILE: ../../../third_party/icu/source/i18n/number_output.cpp
-FILE: ../../../third_party/icu/source/i18n/number_padding.cpp
-FILE: ../../../third_party/icu/source/i18n/number_patternmodifier.cpp
-FILE: ../../../third_party/icu/source/i18n/number_patternmodifier.h
-FILE: ../../../third_party/icu/source/i18n/number_patternstring.cpp
-FILE: ../../../third_party/icu/source/i18n/number_patternstring.h
-FILE: ../../../third_party/icu/source/i18n/number_rounding.cpp
-FILE: ../../../third_party/icu/source/i18n/number_roundingutils.h
-FILE: ../../../third_party/icu/source/i18n/number_scientific.cpp
-FILE: ../../../third_party/icu/source/i18n/number_scientific.h
-FILE: ../../../third_party/icu/source/i18n/number_skeletons.cpp
-FILE: ../../../third_party/icu/source/i18n/number_skeletons.h
-FILE: ../../../third_party/icu/source/i18n/number_symbolswrapper.cpp
-FILE: ../../../third_party/icu/source/i18n/number_types.h
-FILE: ../../../third_party/icu/source/i18n/number_usageprefs.cpp
-FILE: ../../../third_party/icu/source/i18n/number_usageprefs.h
-FILE: ../../../third_party/icu/source/i18n/number_utils.cpp
-FILE: ../../../third_party/icu/source/i18n/number_utils.h
-FILE: ../../../third_party/icu/source/i18n/number_utypes.h
-FILE: ../../../third_party/icu/source/i18n/numfmt.cpp
-FILE: ../../../third_party/icu/source/i18n/numparse_affixes.cpp
-FILE: ../../../third_party/icu/source/i18n/numparse_affixes.h
-FILE: ../../../third_party/icu/source/i18n/numparse_compositions.cpp
-FILE: ../../../third_party/icu/source/i18n/numparse_compositions.h
-FILE: ../../../third_party/icu/source/i18n/numparse_currency.cpp
-FILE: ../../../third_party/icu/source/i18n/numparse_currency.h
-FILE: ../../../third_party/icu/source/i18n/numparse_decimal.cpp
-FILE: ../../../third_party/icu/source/i18n/numparse_decimal.h
-FILE: ../../../third_party/icu/source/i18n/numparse_impl.cpp
-FILE: ../../../third_party/icu/source/i18n/numparse_impl.h
-FILE: ../../../third_party/icu/source/i18n/numparse_parsednumber.cpp
-FILE: ../../../third_party/icu/source/i18n/numparse_scientific.cpp
-FILE: ../../../third_party/icu/source/i18n/numparse_scientific.h
-FILE: ../../../third_party/icu/source/i18n/numparse_symbols.cpp
-FILE: ../../../third_party/icu/source/i18n/numparse_symbols.h
-FILE: ../../../third_party/icu/source/i18n/numparse_types.h
-FILE: ../../../third_party/icu/source/i18n/numparse_utils.h
-FILE: ../../../third_party/icu/source/i18n/numparse_validators.cpp
-FILE: ../../../third_party/icu/source/i18n/numparse_validators.h
-FILE: ../../../third_party/icu/source/i18n/numrange_capi.cpp
-FILE: ../../../third_party/icu/source/i18n/numrange_fluent.cpp
-FILE: ../../../third_party/icu/source/i18n/numrange_impl.cpp
-FILE: ../../../third_party/icu/source/i18n/numrange_impl.h
-FILE: ../../../third_party/icu/source/i18n/numsys.cpp
-FILE: ../../../third_party/icu/source/i18n/numsys_impl.h
-FILE: ../../../third_party/icu/source/i18n/olsontz.cpp
-FILE: ../../../third_party/icu/source/i18n/olsontz.h
-FILE: ../../../third_party/icu/source/i18n/persncal.cpp
-FILE: ../../../third_party/icu/source/i18n/persncal.h
-FILE: ../../../third_party/icu/source/i18n/pluralranges.cpp
-FILE: ../../../third_party/icu/source/i18n/pluralranges.h
-FILE: ../../../third_party/icu/source/i18n/plurfmt.cpp
-FILE: ../../../third_party/icu/source/i18n/plurrule.cpp
-FILE: ../../../third_party/icu/source/i18n/plurrule_impl.h
-FILE: ../../../third_party/icu/source/i18n/quant.cpp
-FILE: ../../../third_party/icu/source/i18n/quant.h
-FILE: ../../../third_party/icu/source/i18n/quantityformatter.cpp
-FILE: ../../../third_party/icu/source/i18n/quantityformatter.h
-FILE: ../../../third_party/icu/source/i18n/rbnf.cpp
-FILE: ../../../third_party/icu/source/i18n/rbt.cpp
-FILE: ../../../third_party/icu/source/i18n/rbt.h
-FILE: ../../../third_party/icu/source/i18n/rbt_data.cpp
-FILE: ../../../third_party/icu/source/i18n/rbt_data.h
-FILE: ../../../third_party/icu/source/i18n/rbt_pars.cpp
-FILE: ../../../third_party/icu/source/i18n/rbt_pars.h
-FILE: ../../../third_party/icu/source/i18n/rbt_rule.cpp
-FILE: ../../../third_party/icu/source/i18n/rbt_rule.h
-FILE: ../../../third_party/icu/source/i18n/rbt_set.cpp
-FILE: ../../../third_party/icu/source/i18n/rbt_set.h
-FILE: ../../../third_party/icu/source/i18n/rbtz.cpp
-FILE: ../../../third_party/icu/source/i18n/regexcmp.cpp
-FILE: ../../../third_party/icu/source/i18n/regexcmp.h
-FILE: ../../../third_party/icu/source/i18n/regexcst.h
-FILE: ../../../third_party/icu/source/i18n/regeximp.cpp
-FILE: ../../../third_party/icu/source/i18n/regeximp.h
-FILE: ../../../third_party/icu/source/i18n/regexst.cpp
-FILE: ../../../third_party/icu/source/i18n/regexst.h
-FILE: ../../../third_party/icu/source/i18n/regextxt.cpp
-FILE: ../../../third_party/icu/source/i18n/regextxt.h
-FILE: ../../../third_party/icu/source/i18n/region.cpp
-FILE: ../../../third_party/icu/source/i18n/region_impl.h
-FILE: ../../../third_party/icu/source/i18n/reldatefmt.cpp
-FILE: ../../../third_party/icu/source/i18n/reldtfmt.cpp
-FILE: ../../../third_party/icu/source/i18n/reldtfmt.h
-FILE: ../../../third_party/icu/source/i18n/rematch.cpp
-FILE: ../../../third_party/icu/source/i18n/remtrans.cpp
-FILE: ../../../third_party/icu/source/i18n/remtrans.h
-FILE: ../../../third_party/icu/source/i18n/repattrn.cpp
-FILE: ../../../third_party/icu/source/i18n/rulebasedcollator.cpp
-FILE: ../../../third_party/icu/source/i18n/scientificnumberformatter.cpp
-FILE: ../../../third_party/icu/source/i18n/scriptset.cpp
-FILE: ../../../third_party/icu/source/i18n/scriptset.h
-FILE: ../../../third_party/icu/source/i18n/search.cpp
-FILE: ../../../third_party/icu/source/i18n/selfmt.cpp
-FILE: ../../../third_party/icu/source/i18n/selfmtimpl.h
-FILE: ../../../third_party/icu/source/i18n/sharedbreakiterator.cpp
-FILE: ../../../third_party/icu/source/i18n/sharedbreakiterator.h
-FILE: ../../../third_party/icu/source/i18n/sharedcalendar.h
-FILE: ../../../third_party/icu/source/i18n/shareddateformatsymbols.h
-FILE: ../../../third_party/icu/source/i18n/sharednumberformat.h
-FILE: ../../../third_party/icu/source/i18n/sharedpluralrules.h
-FILE: ../../../third_party/icu/source/i18n/simpletz.cpp
-FILE: ../../../third_party/icu/source/i18n/smpdtfmt.cpp
-FILE: ../../../third_party/icu/source/i18n/smpdtfst.cpp
-FILE: ../../../third_party/icu/source/i18n/smpdtfst.h
-FILE: ../../../third_party/icu/source/i18n/sortkey.cpp
-FILE: ../../../third_party/icu/source/i18n/standardplural.cpp
-FILE: ../../../third_party/icu/source/i18n/standardplural.h
-FILE: ../../../third_party/icu/source/i18n/string_segment.cpp
-FILE: ../../../third_party/icu/source/i18n/string_segment.h
-FILE: ../../../third_party/icu/source/i18n/strmatch.cpp
-FILE: ../../../third_party/icu/source/i18n/strmatch.h
-FILE: ../../../third_party/icu/source/i18n/strrepl.cpp
-FILE: ../../../third_party/icu/source/i18n/strrepl.h
-FILE: ../../../third_party/icu/source/i18n/stsearch.cpp
-FILE: ../../../third_party/icu/source/i18n/taiwncal.cpp
-FILE: ../../../third_party/icu/source/i18n/taiwncal.h
-FILE: ../../../third_party/icu/source/i18n/timezone.cpp
-FILE: ../../../third_party/icu/source/i18n/titletrn.cpp
-FILE: ../../../third_party/icu/source/i18n/titletrn.h
-FILE: ../../../third_party/icu/source/i18n/tmunit.cpp
-FILE: ../../../third_party/icu/source/i18n/tmutamt.cpp
-FILE: ../../../third_party/icu/source/i18n/tmutfmt.cpp
-FILE: ../../../third_party/icu/source/i18n/tolowtrn.cpp
-FILE: ../../../third_party/icu/source/i18n/tolowtrn.h
-FILE: ../../../third_party/icu/source/i18n/toupptrn.cpp
-FILE: ../../../third_party/icu/source/i18n/toupptrn.h
-FILE: ../../../third_party/icu/source/i18n/translit.cpp
-FILE: ../../../third_party/icu/source/i18n/transreg.cpp
-FILE: ../../../third_party/icu/source/i18n/transreg.h
-FILE: ../../../third_party/icu/source/i18n/tridpars.cpp
-FILE: ../../../third_party/icu/source/i18n/tridpars.h
-FILE: ../../../third_party/icu/source/i18n/tzfmt.cpp
-FILE: ../../../third_party/icu/source/i18n/tzgnames.cpp
-FILE: ../../../third_party/icu/source/i18n/tzgnames.h
-FILE: ../../../third_party/icu/source/i18n/tznames.cpp
-FILE: ../../../third_party/icu/source/i18n/tznames_impl.cpp
-FILE: ../../../third_party/icu/source/i18n/tznames_impl.h
-FILE: ../../../third_party/icu/source/i18n/tzrule.cpp
-FILE: ../../../third_party/icu/source/i18n/tztrans.cpp
-FILE: ../../../third_party/icu/source/i18n/ucal.cpp
-FILE: ../../../third_party/icu/source/i18n/ucln_in.cpp
-FILE: ../../../third_party/icu/source/i18n/ucln_in.h
-FILE: ../../../third_party/icu/source/i18n/ucol.cpp
-FILE: ../../../third_party/icu/source/i18n/ucol_imp.h
-FILE: ../../../third_party/icu/source/i18n/ucol_res.cpp
-FILE: ../../../third_party/icu/source/i18n/ucol_sit.cpp
-FILE: ../../../third_party/icu/source/i18n/ucoleitr.cpp
-FILE: ../../../third_party/icu/source/i18n/ucsdet.cpp
-FILE: ../../../third_party/icu/source/i18n/udat.cpp
-FILE: ../../../third_party/icu/source/i18n/udateintervalformat.cpp
-FILE: ../../../third_party/icu/source/i18n/udatpg.cpp
-FILE: ../../../third_party/icu/source/i18n/ufieldpositer.cpp
-FILE: ../../../third_party/icu/source/i18n/uitercollationiterator.cpp
-FILE: ../../../third_party/icu/source/i18n/uitercollationiterator.h
-FILE: ../../../third_party/icu/source/i18n/ulistformatter.cpp
-FILE: ../../../third_party/icu/source/i18n/ulocdata.cpp
-FILE: ../../../third_party/icu/source/i18n/umsg.cpp
-FILE: ../../../third_party/icu/source/i18n/umsg_imp.h
-FILE: ../../../third_party/icu/source/i18n/unesctrn.cpp
-FILE: ../../../third_party/icu/source/i18n/unesctrn.h
-FILE: ../../../third_party/icu/source/i18n/uni2name.cpp
-FILE: ../../../third_party/icu/source/i18n/uni2name.h
-FILE: ../../../third_party/icu/source/i18n/unicode/alphaindex.h
-FILE: ../../../third_party/icu/source/i18n/unicode/basictz.h
-FILE: ../../../third_party/icu/source/i18n/unicode/calendar.h
-FILE: ../../../third_party/icu/source/i18n/unicode/choicfmt.h
-FILE: ../../../third_party/icu/source/i18n/unicode/coleitr.h
-FILE: ../../../third_party/icu/source/i18n/unicode/coll.h
-FILE: ../../../third_party/icu/source/i18n/unicode/compactdecimalformat.h
-FILE: ../../../third_party/icu/source/i18n/unicode/curramt.h
-FILE: ../../../third_party/icu/source/i18n/unicode/currpinf.h
-FILE: ../../../third_party/icu/source/i18n/unicode/currunit.h
-FILE: ../../../third_party/icu/source/i18n/unicode/datefmt.h
-FILE: ../../../third_party/icu/source/i18n/unicode/dcfmtsym.h
-FILE: ../../../third_party/icu/source/i18n/unicode/decimfmt.h
-FILE: ../../../third_party/icu/source/i18n/unicode/displayoptions.h
-FILE: ../../../third_party/icu/source/i18n/unicode/dtfmtsym.h
-FILE: ../../../third_party/icu/source/i18n/unicode/dtitvfmt.h
-FILE: ../../../third_party/icu/source/i18n/unicode/dtitvinf.h
-FILE: ../../../third_party/icu/source/i18n/unicode/dtptngen.h
-FILE: ../../../third_party/icu/source/i18n/unicode/dtrule.h
-FILE: ../../../third_party/icu/source/i18n/unicode/fieldpos.h
-FILE: ../../../third_party/icu/source/i18n/unicode/fmtable.h
-FILE: ../../../third_party/icu/source/i18n/unicode/format.h
-FILE: ../../../third_party/icu/source/i18n/unicode/formattedvalue.h
-FILE: ../../../third_party/icu/source/i18n/unicode/fpositer.h
-FILE: ../../../third_party/icu/source/i18n/unicode/gender.h
-FILE: ../../../third_party/icu/source/i18n/unicode/gregocal.h
-FILE: ../../../third_party/icu/source/i18n/unicode/listformatter.h
-FILE: ../../../third_party/icu/source/i18n/unicode/measfmt.h
-FILE: ../../../third_party/icu/source/i18n/unicode/measunit.h
-FILE: ../../../third_party/icu/source/i18n/unicode/measure.h
-FILE: ../../../third_party/icu/source/i18n/unicode/msgfmt.h
-FILE: ../../../third_party/icu/source/i18n/unicode/nounit.h
-FILE: ../../../third_party/icu/source/i18n/unicode/numberformatter.h
-FILE: ../../../third_party/icu/source/i18n/unicode/numberrangeformatter.h
-FILE: ../../../third_party/icu/source/i18n/unicode/numfmt.h
-FILE: ../../../third_party/icu/source/i18n/unicode/numsys.h
-FILE: ../../../third_party/icu/source/i18n/unicode/plurfmt.h
-FILE: ../../../third_party/icu/source/i18n/unicode/plurrule.h
-FILE: ../../../third_party/icu/source/i18n/unicode/rbnf.h
-FILE: ../../../third_party/icu/source/i18n/unicode/rbtz.h
-FILE: ../../../third_party/icu/source/i18n/unicode/regex.h
-FILE: ../../../third_party/icu/source/i18n/unicode/region.h
-FILE: ../../../third_party/icu/source/i18n/unicode/reldatefmt.h
-FILE: ../../../third_party/icu/source/i18n/unicode/scientificnumberformatter.h
-FILE: ../../../third_party/icu/source/i18n/unicode/search.h
-FILE: ../../../third_party/icu/source/i18n/unicode/selfmt.h
-FILE: ../../../third_party/icu/source/i18n/unicode/simpletz.h
-FILE: ../../../third_party/icu/source/i18n/unicode/smpdtfmt.h
-FILE: ../../../third_party/icu/source/i18n/unicode/sortkey.h
-FILE: ../../../third_party/icu/source/i18n/unicode/stsearch.h
-FILE: ../../../third_party/icu/source/i18n/unicode/tblcoll.h
-FILE: ../../../third_party/icu/source/i18n/unicode/timezone.h
-FILE: ../../../third_party/icu/source/i18n/unicode/tmunit.h
-FILE: ../../../third_party/icu/source/i18n/unicode/tmutamt.h
-FILE: ../../../third_party/icu/source/i18n/unicode/tmutfmt.h
-FILE: ../../../third_party/icu/source/i18n/unicode/translit.h
-FILE: ../../../third_party/icu/source/i18n/unicode/tzfmt.h
-FILE: ../../../third_party/icu/source/i18n/unicode/tznames.h
-FILE: ../../../third_party/icu/source/i18n/unicode/tzrule.h
-FILE: ../../../third_party/icu/source/i18n/unicode/tztrans.h
-FILE: ../../../third_party/icu/source/i18n/unicode/ucal.h
-FILE: ../../../third_party/icu/source/i18n/unicode/ucol.h
-FILE: ../../../third_party/icu/source/i18n/unicode/ucoleitr.h
-FILE: ../../../third_party/icu/source/i18n/unicode/ucsdet.h
-FILE: ../../../third_party/icu/source/i18n/unicode/udat.h
-FILE: ../../../third_party/icu/source/i18n/unicode/udateintervalformat.h
-FILE: ../../../third_party/icu/source/i18n/unicode/udatpg.h
-FILE: ../../../third_party/icu/source/i18n/unicode/udisplayoptions.h
-FILE: ../../../third_party/icu/source/i18n/unicode/ufieldpositer.h
-FILE: ../../../third_party/icu/source/i18n/unicode/uformattable.h
-FILE: ../../../third_party/icu/source/i18n/unicode/uformattedvalue.h
-FILE: ../../../third_party/icu/source/i18n/unicode/ugender.h
-FILE: ../../../third_party/icu/source/i18n/unicode/ulistformatter.h
-FILE: ../../../third_party/icu/source/i18n/unicode/ulocdata.h
-FILE: ../../../third_party/icu/source/i18n/unicode/umsg.h
-FILE: ../../../third_party/icu/source/i18n/unicode/unirepl.h
-FILE: ../../../third_party/icu/source/i18n/unicode/unum.h
-FILE: ../../../third_party/icu/source/i18n/unicode/unumberformatter.h
-FILE: ../../../third_party/icu/source/i18n/unicode/unumberrangeformatter.h
-FILE: ../../../third_party/icu/source/i18n/unicode/unumsys.h
-FILE: ../../../third_party/icu/source/i18n/unicode/upluralrules.h
-FILE: ../../../third_party/icu/source/i18n/unicode/uregex.h
-FILE: ../../../third_party/icu/source/i18n/unicode/uregion.h
-FILE: ../../../third_party/icu/source/i18n/unicode/ureldatefmt.h
-FILE: ../../../third_party/icu/source/i18n/unicode/usearch.h
-FILE: ../../../third_party/icu/source/i18n/unicode/uspoof.h
-FILE: ../../../third_party/icu/source/i18n/unicode/utmscale.h
-FILE: ../../../third_party/icu/source/i18n/unicode/utrans.h
-FILE: ../../../third_party/icu/source/i18n/unicode/vtzone.h
-FILE: ../../../third_party/icu/source/i18n/units_complexconverter.cpp
-FILE: ../../../third_party/icu/source/i18n/units_complexconverter.h
-FILE: ../../../third_party/icu/source/i18n/units_converter.cpp
-FILE: ../../../third_party/icu/source/i18n/units_converter.h
-FILE: ../../../third_party/icu/source/i18n/units_data.cpp
-FILE: ../../../third_party/icu/source/i18n/units_data.h
-FILE: ../../../third_party/icu/source/i18n/units_router.cpp
-FILE: ../../../third_party/icu/source/i18n/units_router.h
-FILE: ../../../third_party/icu/source/i18n/unum.cpp
-FILE: ../../../third_party/icu/source/i18n/unumsys.cpp
-FILE: ../../../third_party/icu/source/i18n/upluralrules.cpp
-FILE: ../../../third_party/icu/source/i18n/uregex.cpp
-FILE: ../../../third_party/icu/source/i18n/uregexc.cpp
-FILE: ../../../third_party/icu/source/i18n/uregion.cpp
-FILE: ../../../third_party/icu/source/i18n/usearch.cpp
-FILE: ../../../third_party/icu/source/i18n/uspoof.cpp
-FILE: ../../../third_party/icu/source/i18n/uspoof_build.cpp
-FILE: ../../../third_party/icu/source/i18n/uspoof_conf.cpp
-FILE: ../../../third_party/icu/source/i18n/uspoof_conf.h
-FILE: ../../../third_party/icu/source/i18n/uspoof_impl.cpp
-FILE: ../../../third_party/icu/source/i18n/uspoof_impl.h
-FILE: ../../../third_party/icu/source/i18n/usrchimp.h
-FILE: ../../../third_party/icu/source/i18n/utf16collationiterator.cpp
-FILE: ../../../third_party/icu/source/i18n/utf16collationiterator.h
-FILE: ../../../third_party/icu/source/i18n/utf8collationiterator.cpp
-FILE: ../../../third_party/icu/source/i18n/utf8collationiterator.h
-FILE: ../../../third_party/icu/source/i18n/utmscale.cpp
-FILE: ../../../third_party/icu/source/i18n/utrans.cpp
-FILE: ../../../third_party/icu/source/i18n/vtzone.cpp
-FILE: ../../../third_party/icu/source/i18n/vzone.cpp
-FILE: ../../../third_party/icu/source/i18n/vzone.h
-FILE: ../../../third_party/icu/source/i18n/windtfmt.cpp
-FILE: ../../../third_party/icu/source/i18n/windtfmt.h
-FILE: ../../../third_party/icu/source/i18n/winnmfmt.cpp
-FILE: ../../../third_party/icu/source/i18n/winnmfmt.h
-FILE: ../../../third_party/icu/source/i18n/wintzimpl.cpp
-FILE: ../../../third_party/icu/source/i18n/wintzimpl.h
-FILE: ../../../third_party/icu/source/i18n/zonemeta.cpp
-FILE: ../../../third_party/icu/source/i18n/zonemeta.h
-FILE: ../../../third_party/icu/source/i18n/zrule.cpp
-FILE: ../../../third_party/icu/source/i18n/zrule.h
-FILE: ../../../third_party/icu/source/i18n/ztrans.cpp
-FILE: ../../../third_party/icu/source/i18n/ztrans.h
-FILE: ../../../third_party/icu/source/icudefs.mk.in
-FILE: ../../../third_party/icu/source/io/io.rc
-FILE: ../../../third_party/icu/source/io/locbund.cpp
-FILE: ../../../third_party/icu/source/io/locbund.h
-FILE: ../../../third_party/icu/source/io/sprintf.cpp
-FILE: ../../../third_party/icu/source/io/sscanf.cpp
-FILE: ../../../third_party/icu/source/io/ucln_io.cpp
-FILE: ../../../third_party/icu/source/io/ucln_io.h
-FILE: ../../../third_party/icu/source/io/ufile.cpp
-FILE: ../../../third_party/icu/source/io/ufile.h
-FILE: ../../../third_party/icu/source/io/ufmt_cmn.cpp
-FILE: ../../../third_party/icu/source/io/ufmt_cmn.h
-FILE: ../../../third_party/icu/source/io/unicode/ustdio.h
-FILE: ../../../third_party/icu/source/io/unicode/ustream.h
-FILE: ../../../third_party/icu/source/io/uprintf.cpp
-FILE: ../../../third_party/icu/source/io/uprintf.h
-FILE: ../../../third_party/icu/source/io/uprntf_p.cpp
-FILE: ../../../third_party/icu/source/io/uscanf.cpp
-FILE: ../../../third_party/icu/source/io/uscanf.h
-FILE: ../../../third_party/icu/source/io/uscanf_p.cpp
-FILE: ../../../third_party/icu/source/io/ustdio.cpp
-FILE: ../../../third_party/icu/source/io/ustream.cpp
-FILE: ../../../third_party/icu/source/python/icutools/databuilder/filtration_schema.json
-FILE: ../../../third_party/icu/source/stubdata/BUILD.bazel
-FILE: ../../../third_party/icu/source/stubdata/stubdata.cpp
-FILE: ../../../third_party/icu/source/stubdata/stubdata.h
-FILE: ../../../third_party/icu/source/tools/ctestfw/ctest.c
-FILE: ../../../third_party/icu/source/tools/ctestfw/datamap.cpp
-FILE: ../../../third_party/icu/source/tools/ctestfw/testdata.cpp
-FILE: ../../../third_party/icu/source/tools/ctestfw/tstdtmod.cpp
-FILE: ../../../third_party/icu/source/tools/ctestfw/ucln_ct.c
-FILE: ../../../third_party/icu/source/tools/ctestfw/unicode/ctest.h
-FILE: ../../../third_party/icu/source/tools/ctestfw/unicode/datamap.h
-FILE: ../../../third_party/icu/source/tools/ctestfw/unicode/testdata.h
-FILE: ../../../third_party/icu/source/tools/ctestfw/unicode/testlog.h
-FILE: ../../../third_party/icu/source/tools/ctestfw/unicode/testtype.h
-FILE: ../../../third_party/icu/source/tools/ctestfw/unicode/tstdtmod.h
-FILE: ../../../third_party/icu/source/tools/ctestfw/unicode/uperf.h
-FILE: ../../../third_party/icu/source/tools/ctestfw/unicode/utimer.h
-FILE: ../../../third_party/icu/source/tools/ctestfw/uperf.cpp
-FILE: ../../../third_party/icu/source/tools/escapesrc/cptbl.h
-FILE: ../../../third_party/icu/source/tools/escapesrc/escapesrc.cpp
-FILE: ../../../third_party/icu/source/tools/escapesrc/expect-simple.cpp
-FILE: ../../../third_party/icu/source/tools/escapesrc/tblgen.cpp
-FILE: ../../../third_party/icu/source/tools/escapesrc/test-nochange.cpp
-FILE: ../../../third_party/icu/source/tools/escapesrc/test-simple.cpp
-FILE: ../../../third_party/icu/source/tools/genbrk/genbrk.1.in
-FILE: ../../../third_party/icu/source/tools/genbrk/genbrk.cpp
-FILE: ../../../third_party/icu/source/tools/genccode/genccode.8.in
-FILE: ../../../third_party/icu/source/tools/genccode/genccode.c
-FILE: ../../../third_party/icu/source/tools/gencfu/gencfu.1.in
-FILE: ../../../third_party/icu/source/tools/gencfu/gencfu.cpp
-FILE: ../../../third_party/icu/source/tools/gencmn/gencmn.8.in
-FILE: ../../../third_party/icu/source/tools/gencmn/gencmn.c
-FILE: ../../../third_party/icu/source/tools/gencnval/gencnval.1.in
-FILE: ../../../third_party/icu/source/tools/gencnval/gencnval.c
-FILE: ../../../third_party/icu/source/tools/gencolusb/extract_unsafe_backwards.cpp
-FILE: ../../../third_party/icu/source/tools/gencolusb/verify_uset.cpp
-FILE: ../../../third_party/icu/source/tools/gendict/gendict.1.in
-FILE: ../../../third_party/icu/source/tools/gendict/gendict.cpp
-FILE: ../../../third_party/icu/source/tools/gennorm2/BUILD.bazel
-FILE: ../../../third_party/icu/source/tools/gennorm2/extradata.cpp
-FILE: ../../../third_party/icu/source/tools/gennorm2/extradata.h
-FILE: ../../../third_party/icu/source/tools/gennorm2/gennorm2.cpp
-FILE: ../../../third_party/icu/source/tools/gennorm2/n2builder.cpp
-FILE: ../../../third_party/icu/source/tools/gennorm2/n2builder.h
-FILE: ../../../third_party/icu/source/tools/gennorm2/norms.cpp
-FILE: ../../../third_party/icu/source/tools/gennorm2/norms.h
-FILE: ../../../third_party/icu/source/tools/genrb/derb.1.in
-FILE: ../../../third_party/icu/source/tools/genrb/derb.cpp
-FILE: ../../../third_party/icu/source/tools/genrb/errmsg.c
-FILE: ../../../third_party/icu/source/tools/genrb/errmsg.h
-FILE: ../../../third_party/icu/source/tools/genrb/filterrb.cpp
-FILE: ../../../third_party/icu/source/tools/genrb/filterrb.h
-FILE: ../../../third_party/icu/source/tools/genrb/genrb.1.in
-FILE: ../../../third_party/icu/source/tools/genrb/genrb.cpp
-FILE: ../../../third_party/icu/source/tools/genrb/genrb.h
-FILE: ../../../third_party/icu/source/tools/genrb/parse.cpp
-FILE: ../../../third_party/icu/source/tools/genrb/parse.h
-FILE: ../../../third_party/icu/source/tools/genrb/prscmnts.cpp
-FILE: ../../../third_party/icu/source/tools/genrb/prscmnts.h
-FILE: ../../../third_party/icu/source/tools/genrb/rbutil.c
-FILE: ../../../third_party/icu/source/tools/genrb/rbutil.h
-FILE: ../../../third_party/icu/source/tools/genrb/read.c
-FILE: ../../../third_party/icu/source/tools/genrb/read.h
-FILE: ../../../third_party/icu/source/tools/genrb/reslist.cpp
-FILE: ../../../third_party/icu/source/tools/genrb/reslist.h
-FILE: ../../../third_party/icu/source/tools/genrb/rle.c
-FILE: ../../../third_party/icu/source/tools/genrb/rle.h
-FILE: ../../../third_party/icu/source/tools/genrb/ustr.c
-FILE: ../../../third_party/icu/source/tools/genrb/ustr.h
-FILE: ../../../third_party/icu/source/tools/genrb/wrtjava.cpp
-FILE: ../../../third_party/icu/source/tools/genrb/wrtxml.cpp
-FILE: ../../../third_party/icu/source/tools/gensprep/gensprep.8.in
-FILE: ../../../third_party/icu/source/tools/gensprep/gensprep.c
-FILE: ../../../third_party/icu/source/tools/gensprep/gensprep.h
-FILE: ../../../third_party/icu/source/tools/gensprep/store.c
-FILE: ../../../third_party/icu/source/tools/gentest/genres32.c
-FILE: ../../../third_party/icu/source/tools/gentest/gentest.c
-FILE: ../../../third_party/icu/source/tools/gentest/gentest.h
-FILE: ../../../third_party/icu/source/tools/icuexportdata/icuexportdata.1.in
-FILE: ../../../third_party/icu/source/tools/icuexportdata/icuexportdata.cpp
-FILE: ../../../third_party/icu/source/tools/icuinfo/icuinfo.cpp
-FILE: ../../../third_party/icu/source/tools/icuinfo/testplug.c
-FILE: ../../../third_party/icu/source/tools/icupkg/icupkg.8.in
-FILE: ../../../third_party/icu/source/tools/icupkg/icupkg.cpp
-FILE: ../../../third_party/icu/source/tools/icuswap/icuswap.cpp
-FILE: ../../../third_party/icu/source/tools/makeconv/gencnvex.c
-FILE: ../../../third_party/icu/source/tools/makeconv/genmbcs.cpp
-FILE: ../../../third_party/icu/source/tools/makeconv/genmbcs.h
-FILE: ../../../third_party/icu/source/tools/makeconv/makeconv.1.in
-FILE: ../../../third_party/icu/source/tools/makeconv/makeconv.cpp
-FILE: ../../../third_party/icu/source/tools/makeconv/makeconv.h
-FILE: ../../../third_party/icu/source/tools/makeconv/ucnvstat.c
-FILE: ../../../third_party/icu/source/tools/pkgdata/pkgdata.1.in
-FILE: ../../../third_party/icu/source/tools/pkgdata/pkgdata.cpp
-FILE: ../../../third_party/icu/source/tools/pkgdata/pkgtypes.c
-FILE: ../../../third_party/icu/source/tools/pkgdata/pkgtypes.h
-FILE: ../../../third_party/icu/source/tools/toolutil/BUILD.bazel
-FILE: ../../../third_party/icu/source/tools/toolutil/collationinfo.cpp
-FILE: ../../../third_party/icu/source/tools/toolutil/collationinfo.h
-FILE: ../../../third_party/icu/source/tools/toolutil/dbgutil.cpp
-FILE: ../../../third_party/icu/source/tools/toolutil/dbgutil.h
-FILE: ../../../third_party/icu/source/tools/toolutil/denseranges.cpp
-FILE: ../../../third_party/icu/source/tools/toolutil/denseranges.h
-FILE: ../../../third_party/icu/source/tools/toolutil/filestrm.cpp
-FILE: ../../../third_party/icu/source/tools/toolutil/filestrm.h
-FILE: ../../../third_party/icu/source/tools/toolutil/filetools.cpp
-FILE: ../../../third_party/icu/source/tools/toolutil/filetools.h
-FILE: ../../../third_party/icu/source/tools/toolutil/flagparser.cpp
-FILE: ../../../third_party/icu/source/tools/toolutil/flagparser.h
-FILE: ../../../third_party/icu/source/tools/toolutil/package.cpp
-FILE: ../../../third_party/icu/source/tools/toolutil/package.h
-FILE: ../../../third_party/icu/source/tools/toolutil/pkg_genc.cpp
-FILE: ../../../third_party/icu/source/tools/toolutil/pkg_genc.h
-FILE: ../../../third_party/icu/source/tools/toolutil/pkg_gencmn.cpp
-FILE: ../../../third_party/icu/source/tools/toolutil/pkg_gencmn.h
-FILE: ../../../third_party/icu/source/tools/toolutil/pkg_icu.cpp
-FILE: ../../../third_party/icu/source/tools/toolutil/pkg_icu.h
-FILE: ../../../third_party/icu/source/tools/toolutil/pkg_imp.h
-FILE: ../../../third_party/icu/source/tools/toolutil/pkgitems.cpp
-FILE: ../../../third_party/icu/source/tools/toolutil/ppucd.cpp
-FILE: ../../../third_party/icu/source/tools/toolutil/ppucd.h
-FILE: ../../../third_party/icu/source/tools/toolutil/swapimpl.cpp
-FILE: ../../../third_party/icu/source/tools/toolutil/swapimpl.h
-FILE: ../../../third_party/icu/source/tools/toolutil/toolutil.cpp
-FILE: ../../../third_party/icu/source/tools/toolutil/toolutil.h
-FILE: ../../../third_party/icu/source/tools/toolutil/ucbuf.cpp
-FILE: ../../../third_party/icu/source/tools/toolutil/ucbuf.h
-FILE: ../../../third_party/icu/source/tools/toolutil/ucln_tu.cpp
-FILE: ../../../third_party/icu/source/tools/toolutil/ucm.cpp
-FILE: ../../../third_party/icu/source/tools/toolutil/ucm.h
-FILE: ../../../third_party/icu/source/tools/toolutil/ucmstate.cpp
-FILE: ../../../third_party/icu/source/tools/toolutil/udbgutil.cpp
-FILE: ../../../third_party/icu/source/tools/toolutil/udbgutil.h
-FILE: ../../../third_party/icu/source/tools/toolutil/unewdata.cpp
-FILE: ../../../third_party/icu/source/tools/toolutil/unewdata.h
-FILE: ../../../third_party/icu/source/tools/toolutil/uoptions.cpp
-FILE: ../../../third_party/icu/source/tools/toolutil/uoptions.h
-FILE: ../../../third_party/icu/source/tools/toolutil/uparse.cpp
-FILE: ../../../third_party/icu/source/tools/toolutil/uparse.h
-FILE: ../../../third_party/icu/source/tools/toolutil/writesrc.cpp
-FILE: ../../../third_party/icu/source/tools/toolutil/writesrc.h
-FILE: ../../../third_party/icu/source/tools/toolutil/xmlparser.cpp
-FILE: ../../../third_party/icu/source/tools/toolutil/xmlparser.h
-FILE: ../../../third_party/icu/source/tools/tzcode/icuregions
-FILE: ../../../third_party/icu/source/tools/tzcode/icuzdump.cpp
-FILE: ../../../third_party/icu/source/tools/tzcode/icuzones
-FILE: ../../../third_party/icu/source/tools/tzcode/tz2icu.cpp
-FILE: ../../../third_party/icu/source/tools/tzcode/tz2icu.h
-----------------------------------------------------------------------------------------------------
-Unicode® Copyright and Terms of Use
-For the general privacy policy governing access to this site, see the  Unicode Privacy Policy.
-
-A. Unicode Copyright
-1. Copyright © 1991-2022 Unicode, Inc. All rights reserved.
-B. Definitions
-Unicode Data Files ("DATA FILES") include all data files under the directories:
-https://www.unicode.org/Public
-https://www.unicode.org/reports
-https://www.unicode.org/ivd/data
-
-Unicode Data Files do not include PDF online code charts under the directory:
-https://www.unicode.org/Public
-
-Unicode Software ("SOFTWARE") includes any source code published in the Unicode Standard
-or any source code or compiled code under the directories:
-https://www.unicode.org/Public/PROGRAMS
-https://www.unicode.org/Public/cldr
-http://site.icu-project.org/download
-C. Terms of Use
-1. Certain documents and files on this website contain a legend indicating that "Modification is permitted." Any person is hereby authorized, without fee, to modify such documents and files to create derivative works conforming to the Unicode® Standard, subject to Terms and Conditions herein.
-2. Any person is hereby authorized, without fee, to view, use, reproduce, and distribute all documents and files, subject to the Terms and Conditions herein.
-3. Further specifications of rights and restrictions pertaining to the use of the Unicode DATA FILES and SOFTWARE can be found in the Unicode Data Files and Software License.
-4. Each version of the Unicode Standard has further specifications of rights and restrictions of use. For the book editions (Unicode 5.0 and earlier), these are found on the back of the title page.
-5. The Unicode PDF online code charts carry specific restrictions. Those restrictions are incorporated as the first page of each PDF code chart.
-6. All other files, including online documentation of the core specification for Unicode 6.0 and later, are covered under these general Terms of Use.
-7. No license is granted to "mirror" the Unicode website where a fee is charged for access to the "mirror" site.
-8. Modification is not permitted with respect to this document. All copies of this document must be verbatim.
-D. Restricted Rights Legend
-1. Any technical data or software which is licensed to the United States of America, its agencies and/or instrumentalities under this Agreement is commercial technical data or commercial computer software developed exclusively at private expense as defined in FAR 2.101, or DFARS 252.227-7014 (June 1995), as applicable. For technical data, use, duplication, or disclosure by the Government is subject to restrictions as set forth in DFARS 202.227-7015 Technical Data, Commercial and Items (Nov 1995) and this Agreement. For Software, in accordance with FAR 12-212 or DFARS 227-7202, as applicable, use, duplication or disclosure by the Government is subject to the restrictions set forth in this Agreement.
-E.Warranties and Disclaimers
-1. This publication and/or website may include technical or typographical errors or other inaccuracies. Changes are periodically added to the information herein; these changes will be incorporated in new editions of the publication and/or website. Unicode, Inc. may make improvements and/or changes in the product(s) and/or program(s) described in this publication and/or website at any time.
-2. If this file has been purchased on magnetic or optical media from Unicode, Inc. the sole and exclusive remedy for any claim will be exchange of the defective media within ninety (90) days of original purchase.
-3. EXCEPT AS PROVIDED IN SECTION E.2, THIS PUBLICATION AND/OR SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND EITHER EXPRESS, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. UNICODE, INC. AND ITS LICENSORS ASSUME NO RESPONSIBILITY FOR ERRORS OR OMISSIONS IN THIS PUBLICATION AND/OR SOFTWARE OR OTHER DOCUMENTS WHICH ARE REFERENCED BY OR LINKED TO THIS PUBLICATION OR THE UNICODE WEBSITE.
-F. Waiver of Damages
-1. In no event shall Unicode, Inc. or its licensors be liable for any special, incidental, indirect or consequential damages of any kind, or any damages whatsoever, whether or not Unicode, Inc. was advised of the possibility of the damage, including, without limitation, those resulting from the following: loss of use, data or profits, in connection with the use, modification or distribution of this information or its derivatives.
-G. Trademarks & Logos
-1. The Unicode Word Mark and the Unicode Logo are trademarks of Unicode, Inc. “The Unicode Consortium” and “Unicode, Inc.” are trade names of Unicode, Inc. Use of the information and materials found on this website indicates your acknowledgement of Unicode, Inc.’s exclusive worldwide rights in the Unicode Word Mark, the Unicode Logo, and the Unicode trade names.
-3. The Unicode Consortium Name and Trademark Usage Policy (“Trademark Policy”) are incorporated herein by reference and you agree to abide by the provisions of the Trademark Policy, which may be changed from time to time in the sole discretion of Unicode, Inc.
-4. All third party trademarks referenced herein are the property of their respective owners.
-H. Miscellaneous
-1. Jurisdiction and Venue. This website is operated from a location in the State of California, United States of America. Unicode, Inc. makes no representation that the materials are appropriate for use in other locations. If you access this website from other locations, you are responsible for compliance with local laws. This Agreement, all use of this website and any claims and damages resulting from use of this website are governed solely by the laws of the State of California without regard to any principles which would apply the laws of a different jurisdiction. The user agrees that any disputes regarding this website shall be resolved solely in the courts located in Santa Clara County, California. The user agrees said courts have personal jurisdiction and agree to waive any right to transfer the dispute to any other forum.
-2. Modification by Unicode, Inc. Unicode, Inc. shall have the right to modify this Agreement at any time by posting it to this website. The user may not assign any part of this Agreement without Unicode, Inc.’s prior written consent.
-3. Taxes. The user agrees to pay any taxes arising from access to this website or use of the information herein, except for those based on Unicode’s net income.
-4. Severability.  If any provision of this Agreement is declared invalid or unenforceable, the remaining provisions of this Agreement shall remain in effect.
-5. Entire Agreement. This Agreement constitutes the entire agreement between the parties.
-
-EXHIBIT 1
-UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
-
-See Terms of Use <https://www.unicode.org/copyright.html>
-for definitions of Unicode Inc.’s Data Files and Software.
-
-NOTICE TO USER: Carefully read the following legal agreement.
-BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S
-DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"),
-YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
-TERMS AND CONDITIONS OF THIS AGREEMENT.
-IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE
-THE DATA FILES OR SOFTWARE.
-
-COPYRIGHT AND PERMISSION NOTICE
-
-Copyright © 1991-2022 Unicode, Inc. All rights reserved.
-Distributed under the Terms of Use in https://www.unicode.org/copyright.html.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Unicode data files and any associated documentation
-(the "Data Files") or Unicode software and any associated documentation
-(the "Software") to deal in the Data Files or Software
-without restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, and/or sell copies of
-the Data Files or Software, and to permit persons to whom the Data Files
-or Software are furnished to do so, provided that either
-(a) this copyright and permission notice appear with all copies
-of the Data Files or Software, or
-(b) this copyright and permission notice appear in associated
-Documentation.
-
-THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT OF THIRD PARTY RIGHTS.
-IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
-NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
-DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THE DATA FILES OR SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale,
-use or other dealings in these Data Files or Software without prior
-written authorization of the copyright holder.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
 ====================================================================================================
 
 ====================================================================================================
 LIBRARY: libcxx
 LIBRARY: libcxxabi
-ORIGIN: null
+ORIGIN: ../../../third_party/libcxx/LICENSE.TXT
+ORIGIN: ../../../third_party/libcxxabi/LICENSE.TXT
 TYPE: LicenseType.bsd
-FILE: ../../../third_party/libcxx/.clang-tidy
-FILE: ../../../third_party/libcxx/appveyor-reqs-install.cmd
-FILE: ../../../third_party/libcxx/appveyor.yml
-FILE: ../../../third_party/libcxx/benchmarks/GenerateInput.h
-FILE: ../../../third_party/libcxx/benchmarks/algorithms.partition_point.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/filesystem.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/lit.site.cfg.py.in
-FILE: ../../../third_party/libcxx/benchmarks/string.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/stringstream.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/unordered_set_operations.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/variant_visit_1.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/variant_visit_2.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/variant_visit_3.bench.cpp
-FILE: ../../../third_party/libcxx/benchmarks/vector_operations.bench.cpp
-FILE: ../../../third_party/libcxx/docs/AddingNewCIJobs.rst
-FILE: ../../../third_party/libcxx/docs/BuildingLibcxx.rst
-FILE: ../../../third_party/libcxx/docs/DesignDocs/ABIVersioning.rst
-FILE: ../../../third_party/libcxx/docs/DesignDocs/AtomicDesign.rst
-FILE: ../../../third_party/libcxx/docs/DesignDocs/CapturingConfigInfo.rst
-FILE: ../../../third_party/libcxx/docs/DesignDocs/DebugMode.rst
-FILE: ../../../third_party/libcxx/docs/DesignDocs/ExperimentalFeatures.rst
-FILE: ../../../third_party/libcxx/docs/DesignDocs/ExtendedCXX03Support.rst
-FILE: ../../../third_party/libcxx/docs/DesignDocs/FeatureTestMacros.rst
-FILE: ../../../third_party/libcxx/docs/DesignDocs/FileTimeType.rst
-FILE: ../../../third_party/libcxx/docs/DesignDocs/NoexceptPolicy.rst
-FILE: ../../../third_party/libcxx/docs/DesignDocs/ThreadingSupportAPI.rst
-FILE: ../../../third_party/libcxx/docs/DesignDocs/UniquePtrTrivialAbi.rst
-FILE: ../../../third_party/libcxx/docs/DesignDocs/UnspecifiedBehaviorRandomization.rst
-FILE: ../../../third_party/libcxx/docs/DesignDocs/VisibilityMacros.rst
-FILE: ../../../third_party/libcxx/docs/FeatureTestMacroTable.rst
-FILE: ../../../third_party/libcxx/docs/Helpers/Styles.rst
-FILE: ../../../third_party/libcxx/docs/ReleaseNotes.rst
-FILE: ../../../third_party/libcxx/docs/Status/Cxx14.rst
-FILE: ../../../third_party/libcxx/docs/Status/Cxx14Issues.csv
-FILE: ../../../third_party/libcxx/docs/Status/Cxx14Papers.csv
-FILE: ../../../third_party/libcxx/docs/Status/Cxx17.rst
-FILE: ../../../third_party/libcxx/docs/Status/Cxx17Issues.csv
-FILE: ../../../third_party/libcxx/docs/Status/Cxx17Papers.csv
-FILE: ../../../third_party/libcxx/docs/Status/Cxx20.rst
-FILE: ../../../third_party/libcxx/docs/Status/Cxx20Issues.csv
-FILE: ../../../third_party/libcxx/docs/Status/Cxx20Papers.csv
-FILE: ../../../third_party/libcxx/docs/Status/Cxx2b.rst
-FILE: ../../../third_party/libcxx/docs/Status/Cxx2bIssues.csv
-FILE: ../../../third_party/libcxx/docs/Status/Cxx2bPapers.csv
-FILE: ../../../third_party/libcxx/docs/Status/Format.rst
-FILE: ../../../third_party/libcxx/docs/Status/FormatIssues.csv
-FILE: ../../../third_party/libcxx/docs/Status/FormatPaper.csv
-FILE: ../../../third_party/libcxx/docs/Status/Ranges.rst
-FILE: ../../../third_party/libcxx/docs/Status/RangesAlgorithms.csv
-FILE: ../../../third_party/libcxx/docs/Status/RangesIssues.csv
-FILE: ../../../third_party/libcxx/docs/Status/RangesPaper.csv
-FILE: ../../../third_party/libcxx/docs/Status/Spaceship.rst
-FILE: ../../../third_party/libcxx/docs/Status/SpaceshipPapers.csv
-FILE: ../../../third_party/libcxx/docs/Status/SpaceshipProjects.csv
-FILE: ../../../third_party/libcxx/docs/Status/Zip.rst
-FILE: ../../../third_party/libcxx/docs/Status/ZipProjects.csv
-FILE: ../../../third_party/libcxx/docs/TestingLibcxx.rst
-FILE: ../../../third_party/libcxx/docs/UsingLibcxx.rst
-FILE: ../../../third_party/libcxx/docs/index.rst
 FILE: ../../../third_party/libcxx/include/module.modulemap.in
 FILE: ../../../third_party/libcxx/lib/abi/arm64-apple-darwin.libcxxabi.v1.stable.exceptions.nonew.debug.incomplete.abilist
 FILE: ../../../third_party/libcxx/lib/abi/arm64-apple-darwin.libcxxabi.v1.stable.exceptions.nonew.nodebug.noincomplete.abilist
@@ -27520,9 +2103,6 @@ FILE: ../../../third_party/libcxxabi/lib/new-delete.exp
 FILE: ../../../third_party/libcxxabi/lib/personality-sjlj.exp
 FILE: ../../../third_party/libcxxabi/lib/personality-v0.exp
 ----------------------------------------------------------------------------------------------------
-University of Illinois/NCSA
-Open Source License
-
 Copyright (c) 2009-2019 by the contributors listed in CREDITS.TXT
 
 All rights reserved.
@@ -27564,408 +2144,270 @@ SOFTWARE.
 ====================================================================================================
 
 ====================================================================================================
-LIBRARY: libjpeg-turbo
-ORIGIN: ../../../third_party/libjpeg-turbo/README.ijg
-TYPE: LicenseType.ijg
-FILE: ../../../third_party/libjpeg-turbo/cderror.h
-FILE: ../../../third_party/libjpeg-turbo/cdjpeg.c
-FILE: ../../../third_party/libjpeg-turbo/cdjpeg.h
-FILE: ../../../third_party/libjpeg-turbo/cjpeg.c
-FILE: ../../../third_party/libjpeg-turbo/djpeg.c
-FILE: ../../../third_party/libjpeg-turbo/jaricom.c
-FILE: ../../../third_party/libjpeg-turbo/jcapimin.c
-FILE: ../../../third_party/libjpeg-turbo/jcapistd.c
-FILE: ../../../third_party/libjpeg-turbo/jcarith.c
-FILE: ../../../third_party/libjpeg-turbo/jccoefct.c
-FILE: ../../../third_party/libjpeg-turbo/jccolext.c
-FILE: ../../../third_party/libjpeg-turbo/jccolor.c
-FILE: ../../../third_party/libjpeg-turbo/jcdctmgr.c
-FILE: ../../../third_party/libjpeg-turbo/jchuff.c
-FILE: ../../../third_party/libjpeg-turbo/jchuff.h
-FILE: ../../../third_party/libjpeg-turbo/jcinit.c
-FILE: ../../../third_party/libjpeg-turbo/jcmainct.c
-FILE: ../../../third_party/libjpeg-turbo/jcmarker.c
-FILE: ../../../third_party/libjpeg-turbo/jcmaster.c
-FILE: ../../../third_party/libjpeg-turbo/jcomapi.c
-FILE: ../../../third_party/libjpeg-turbo/jconfig.h
-FILE: ../../../third_party/libjpeg-turbo/jconfig.h.in
-FILE: ../../../third_party/libjpeg-turbo/jconfigint.h
-FILE: ../../../third_party/libjpeg-turbo/jconfigint.h.in
-FILE: ../../../third_party/libjpeg-turbo/jcparam.c
-FILE: ../../../third_party/libjpeg-turbo/jcphuff.c
-FILE: ../../../third_party/libjpeg-turbo/jcprepct.c
-FILE: ../../../third_party/libjpeg-turbo/jcsample.c
-FILE: ../../../third_party/libjpeg-turbo/jctrans.c
-FILE: ../../../third_party/libjpeg-turbo/jdapimin.c
-FILE: ../../../third_party/libjpeg-turbo/jdapistd.c
-FILE: ../../../third_party/libjpeg-turbo/jdarith.c
-FILE: ../../../third_party/libjpeg-turbo/jdatadst-tj.c
-FILE: ../../../third_party/libjpeg-turbo/jdatadst.c
-FILE: ../../../third_party/libjpeg-turbo/jdatasrc-tj.c
-FILE: ../../../third_party/libjpeg-turbo/jdatasrc.c
-FILE: ../../../third_party/libjpeg-turbo/jdcoefct.c
-FILE: ../../../third_party/libjpeg-turbo/jdcoefct.h
-FILE: ../../../third_party/libjpeg-turbo/jdcol565.c
-FILE: ../../../third_party/libjpeg-turbo/jdcolext.c
-FILE: ../../../third_party/libjpeg-turbo/jdcolor.c
-FILE: ../../../third_party/libjpeg-turbo/jdct.h
-FILE: ../../../third_party/libjpeg-turbo/jddctmgr.c
-FILE: ../../../third_party/libjpeg-turbo/jdhuff.c
-FILE: ../../../third_party/libjpeg-turbo/jdhuff.h
-FILE: ../../../third_party/libjpeg-turbo/jdinput.c
-FILE: ../../../third_party/libjpeg-turbo/jdmainct.c
-FILE: ../../../third_party/libjpeg-turbo/jdmainct.h
-FILE: ../../../third_party/libjpeg-turbo/jdmarker.c
-FILE: ../../../third_party/libjpeg-turbo/jdmaster.c
-FILE: ../../../third_party/libjpeg-turbo/jdmaster.h
-FILE: ../../../third_party/libjpeg-turbo/jdmerge.c
-FILE: ../../../third_party/libjpeg-turbo/jdmrg565.c
-FILE: ../../../third_party/libjpeg-turbo/jdmrgext.c
-FILE: ../../../third_party/libjpeg-turbo/jdphuff.c
-FILE: ../../../third_party/libjpeg-turbo/jdpostct.c
-FILE: ../../../third_party/libjpeg-turbo/jdsample.c
-FILE: ../../../third_party/libjpeg-turbo/jdsample.h
-FILE: ../../../third_party/libjpeg-turbo/jdtrans.c
-FILE: ../../../third_party/libjpeg-turbo/jerror.c
-FILE: ../../../third_party/libjpeg-turbo/jerror.h
-FILE: ../../../third_party/libjpeg-turbo/jfdctflt.c
-FILE: ../../../third_party/libjpeg-turbo/jfdctfst.c
-FILE: ../../../third_party/libjpeg-turbo/jfdctint.c
-FILE: ../../../third_party/libjpeg-turbo/jidctflt.c
-FILE: ../../../third_party/libjpeg-turbo/jidctfst.c
-FILE: ../../../third_party/libjpeg-turbo/jidctint.c
-FILE: ../../../third_party/libjpeg-turbo/jidctred.c
-FILE: ../../../third_party/libjpeg-turbo/jinclude.h
-FILE: ../../../third_party/libjpeg-turbo/jmemmgr.c
-FILE: ../../../third_party/libjpeg-turbo/jmemnobs.c
-FILE: ../../../third_party/libjpeg-turbo/jmemsys.h
-FILE: ../../../third_party/libjpeg-turbo/jmorecfg.h
-FILE: ../../../third_party/libjpeg-turbo/jpeg_nbits_table.h
-FILE: ../../../third_party/libjpeg-turbo/jpegcomp.h
-FILE: ../../../third_party/libjpeg-turbo/jpegint.h
-FILE: ../../../third_party/libjpeg-turbo/jpeglib.h
-FILE: ../../../third_party/libjpeg-turbo/jpegtran.c
-FILE: ../../../third_party/libjpeg-turbo/jquant1.c
-FILE: ../../../third_party/libjpeg-turbo/jquant2.c
-FILE: ../../../third_party/libjpeg-turbo/jstdhuff.c
-FILE: ../../../third_party/libjpeg-turbo/jutils.c
-FILE: ../../../third_party/libjpeg-turbo/jversion.h
-FILE: ../../../third_party/libjpeg-turbo/libjpeg.map.in
-FILE: ../../../third_party/libjpeg-turbo/rdbmp.c
-FILE: ../../../third_party/libjpeg-turbo/rdcolmap.c
-FILE: ../../../third_party/libjpeg-turbo/rdgif.c
-FILE: ../../../third_party/libjpeg-turbo/rdjpgcom.c
-FILE: ../../../third_party/libjpeg-turbo/rdppm.c
-FILE: ../../../third_party/libjpeg-turbo/rdrle.c
-FILE: ../../../third_party/libjpeg-turbo/rdswitch.c
-FILE: ../../../third_party/libjpeg-turbo/rdtarga.c
-FILE: ../../../third_party/libjpeg-turbo/simd/jcsample.h
-FILE: ../../../third_party/libjpeg-turbo/simd/jpeg_nbits_table.inc
-FILE: ../../../third_party/libjpeg-turbo/simd/jsimdcfg.inc
-FILE: ../../../third_party/libjpeg-turbo/simd/jsimdcfg.inc.h
-FILE: ../../../third_party/libjpeg-turbo/transupp.c
-FILE: ../../../third_party/libjpeg-turbo/transupp.h
-FILE: ../../../third_party/libjpeg-turbo/turbojpeg-mapfile
-FILE: ../../../third_party/libjpeg-turbo/turbojpeg-mapfile.jni
-FILE: ../../../third_party/libjpeg-turbo/wrbmp.c
-FILE: ../../../third_party/libjpeg-turbo/wrgif.c
-FILE: ../../../third_party/libjpeg-turbo/wrjpgcom.c
-FILE: ../../../third_party/libjpeg-turbo/wrppm.c
-FILE: ../../../third_party/libjpeg-turbo/wrppm.h
-FILE: ../../../third_party/libjpeg-turbo/wrrle.c
-FILE: ../../../third_party/libjpeg-turbo/wrtarga.c
+LIBRARY: zlib
+ORIGIN: ../../../third_party/zlib/adler32_simd.c + ../../../LICENSE
+ORIGIN: ../../../third_party/zlib/adler32_simd.h + ../../../LICENSE
+ORIGIN: ../../../third_party/zlib/crc32_simd.c + ../../../LICENSE
+ORIGIN: ../../../third_party/zlib/crc32_simd.h + ../../../LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../third_party/zlib/adler32_simd.c
+FILE: ../../../third_party/zlib/adler32_simd.h
+FILE: ../../../third_party/zlib/crc32_simd.c
+FILE: ../../../third_party/zlib/crc32_simd.h
 ----------------------------------------------------------------------------------------------------
-libjpeg-turbo note:  This file has been modified by The libjpeg-turbo Project
-to include only information relevant to libjpeg-turbo, to wordsmith certain
-sections, and to remove impolitic language that existed in the libjpeg v8
-README.  It is included only for reference.  Please see README.md for
-information specific to libjpeg-turbo.
-
-The Independent JPEG Group's JPEG software
-==========================================
-
-This distribution contains a release of the Independent JPEG Group's free JPEG
-software.  You are welcome to redistribute this software and to use it for any
-purpose, subject to the conditions under LEGAL ISSUES, below.
-
-This software is the work of Tom Lane, Guido Vollbeding, Philip Gladstone,
-Bill Allombert, Jim Boucher, Lee Crocker, Bob Friesenhahn, Ben Jackson,
-Julian Minguillon, Luis Ortiz, George Phillips, Davide Rossi, Ge' Weijers,
-and other members of the Independent JPEG Group.
-
-IJG is not affiliated with the ISO/IEC JTC1/SC29/WG1 standards committee
-(also known as JPEG, together with ITU-T SG16).
-
-DOCUMENTATION ROADMAP
-=====================
-
-This file contains the following sections:
+Copyright 2017 The Chromium Authors
 
-OVERVIEW            General description of JPEG and the IJG software.
-LEGAL ISSUES        Copyright, lack of warranty, terms of distribution.
-REFERENCES          Where to learn more about JPEG.
-ARCHIVE LOCATIONS   Where to find newer versions of this software.
-FILE FORMAT WARS    Software *not* to get.
-TO DO               Plans for future IJG releases.
-
-Other documentation files in the distribution are:
-
-User documentation:
-  usage.txt         Usage instructions for cjpeg, djpeg, jpegtran,
-                    rdjpgcom, and wrjpgcom.
-  *.1               Unix-style man pages for programs (same info as usage.txt).
-  wizard.txt        Advanced usage instructions for JPEG wizards only.
-  change.log        Version-to-version change highlights.
-Programmer and internal documentation:
-  libjpeg.txt       How to use the JPEG library in your own programs.
-  example.c         Sample code for calling the JPEG library.
-  structure.txt     Overview of the JPEG library's internal structure.
-  coderules.txt     Coding style rules --- please read if you contribute code.
-
-Please read at least usage.txt.  Some information can also be found in the JPEG
-FAQ (Frequently Asked Questions) article.  See ARCHIVE LOCATIONS below to find
-out where to obtain the FAQ article.
-
-If you want to understand how the JPEG code works, we suggest reading one or
-more of the REFERENCES, then looking at the documentation files (in roughly
-the order listed) before diving into the code.
-
-OVERVIEW
-========
-
-This package contains C software to implement JPEG image encoding, decoding,
-and transcoding.  JPEG (pronounced "jay-peg") is a standardized compression
-method for full-color and grayscale images.  JPEG's strong suit is compressing
-photographic images or other types of images that have smooth color and
-brightness transitions between neighboring pixels.  Images with sharp lines or
-other abrupt features may not compress well with JPEG, and a higher JPEG
-quality may have to be used to avoid visible compression artifacts with such
-images.
-
-JPEG is lossy, meaning that the output pixels are not necessarily identical to
-the input pixels.  However, on photographic content and other "smooth" images,
-very good compression ratios can be obtained with no visible compression
-artifacts, and extremely high compression ratios are possible if you are
-willing to sacrifice image quality (by reducing the "quality" setting in the
-compressor.)
-
-This software implements JPEG baseline, extended-sequential, and progressive
-compression processes.  Provision is made for supporting all variants of these
-processes, although some uncommon parameter settings aren't implemented yet.
-We have made no provision for supporting the hierarchical or lossless
-processes defined in the standard.
-
-We provide a set of library routines for reading and writing JPEG image files,
-plus two sample applications "cjpeg" and "djpeg", which use the library to
-perform conversion between JPEG and some other popular image file formats.
-The library is intended to be reused in other applications.
-
-In order to support file conversion and viewing software, we have included
-considerable functionality beyond the bare JPEG coding/decoding capability;
-for example, the color quantization modules are not strictly part of JPEG
-decoding, but they are essential for output to colormapped file formats or
-colormapped displays.  These extra functions can be compiled out of the
-library if not required for a particular application.
-
-We have also included "jpegtran", a utility for lossless transcoding between
-different JPEG processes, and "rdjpgcom" and "wrjpgcom", two simple
-applications for inserting and extracting textual comments in JFIF files.
-
-The emphasis in designing this software has been on achieving portability and
-flexibility, while also making it fast enough to be useful.  In particular,
-the software is not intended to be read as a tutorial on JPEG.  (See the
-REFERENCES section for introductory material.)  Rather, it is intended to
-be reliable, portable, industrial-strength code.  We do not claim to have
-achieved that goal in every aspect of the software, but we strive for it.
-
-We welcome the use of this software as a component of commercial products.
-No royalty is required, but we do ask for an acknowledgement in product
-documentation, as described under LEGAL ISSUES.
-
-LEGAL ISSUES
-============
-
-In plain English:
-
-1. We don't promise that this software works.  (But if you find any bugs,
-   please let us know!)
-2. You can use this software for whatever you want.  You don't have to pay us.
-3. You may not pretend that you wrote this software.  If you use it in a
-   program, you must acknowledge somewhere in your documentation that
-   you've used the IJG code.
-
-In legalese:
-
-The authors make NO WARRANTY or representation, either express or implied,
-with respect to this software, its quality, accuracy, merchantability, or
-fitness for a particular purpose.  This software is provided "AS IS", and you,
-its user, assume the entire risk as to its quality and accuracy.
-
-This software is copyright (C) 1991-2016, Thomas G. Lane, Guido Vollbeding.
-All Rights Reserved except as specified below.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
 
-Permission is hereby granted to use, copy, modify, and distribute this
-software (or portions thereof) for any purpose, without fee, subject to these
-conditions:
-(1) If any part of the source code for this software is distributed, then this
-README file must be included, with this copyright and no-warranty notice
-unaltered; and any additions, deletions, or changes to the original files
-must be clearly indicated in accompanying documentation.
-(2) If only executable code is distributed, then the accompanying
-documentation must state that "this software is based in part on the work of
-the Independent JPEG Group".
-(3) Permission for use of this software is granted only if the user accepts
-full responsibility for any undesirable consequences; the authors accept
-NO LIABILITY for damages of any kind.
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
 
-These conditions apply to any software derived from or based on the IJG code,
-not just to the unmodified library.  If you use our work, you ought to
-acknowledge us.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
 
-Permission is NOT granted for the use of any IJG author's name or company name
-in advertising or publicity relating to this software or products derived from
-it.  This software may be referred to only as "the Independent JPEG Group's
-software".
+====================================================================================================
+LIBRARY: zlib
+ORIGIN: ../../../third_party/zlib/contrib/bench/zlib_bench.cc + ../../../LICENSE
+ORIGIN: ../../../third_party/zlib/cpu_features.c + ../../../LICENSE
+ORIGIN: ../../../third_party/zlib/cpu_features.h + ../../../LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../third_party/zlib/contrib/bench/zlib_bench.cc
+FILE: ../../../third_party/zlib/cpu_features.c
+FILE: ../../../third_party/zlib/cpu_features.h
+----------------------------------------------------------------------------------------------------
+Copyright 2018 The Chromium Authors
 
-We specifically permit and encourage the use of this software as the basis of
-commercial products, provided that all warranty or liability claims are
-assumed by the product vendor.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
 
-The Unix configuration script "configure" was produced with GNU Autoconf.
-It is copyright by the Free Software Foundation but is freely distributable.
-The same holds for its supporting scripts (config.guess, config.sub,
-ltmain.sh).  Another support script, install-sh, is copyright by X Consortium
-but is also freely distributable.
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
 
-The IJG distribution formerly included code to read and write GIF files.
-To avoid entanglement with the Unisys LZW patent (now expired), GIF reading
-support has been removed altogether, and the GIF writer has been simplified
-to produce "uncompressed GIFs".  This technique does not use the LZW
-algorithm; the resulting GIF files are larger than usual, but are readable
-by all standard GIF decoders.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
 
-We are required to state that
-    "The Graphics Interchange Format(c) is the Copyright property of
-    CompuServe Incorporated.  GIF(sm) is a Service Mark property of
-    CompuServe Incorporated."
+====================================================================================================
+LIBRARY: libcxx
+ORIGIN: ../../../third_party/libcxx/src/include/ryu/common.h
+ORIGIN: ../../../third_party/libcxx/src/include/ryu/d2fixed.h
+ORIGIN: ../../../third_party/libcxx/src/include/ryu/d2fixed_full_table.h
+ORIGIN: ../../../third_party/libcxx/src/include/ryu/d2s.h
+ORIGIN: ../../../third_party/libcxx/src/include/ryu/d2s_full_table.h
+ORIGIN: ../../../third_party/libcxx/src/include/ryu/d2s_intrinsics.h
+ORIGIN: ../../../third_party/libcxx/src/include/ryu/digit_table.h
+ORIGIN: ../../../third_party/libcxx/src/include/ryu/f2s.h
+ORIGIN: ../../../third_party/libcxx/src/include/ryu/ryu.h
+ORIGIN: ../../../third_party/libcxx/src/ryu/d2fixed.cpp
+ORIGIN: ../../../third_party/libcxx/src/ryu/d2s.cpp
+ORIGIN: ../../../third_party/libcxx/src/ryu/f2s.cpp
+TYPE: LicenseType.unknown
+FILE: ../../../third_party/libcxx/src/include/ryu/common.h
+FILE: ../../../third_party/libcxx/src/include/ryu/d2fixed.h
+FILE: ../../../third_party/libcxx/src/include/ryu/d2fixed_full_table.h
+FILE: ../../../third_party/libcxx/src/include/ryu/d2s.h
+FILE: ../../../third_party/libcxx/src/include/ryu/d2s_full_table.h
+FILE: ../../../third_party/libcxx/src/include/ryu/d2s_intrinsics.h
+FILE: ../../../third_party/libcxx/src/include/ryu/digit_table.h
+FILE: ../../../third_party/libcxx/src/include/ryu/f2s.h
+FILE: ../../../third_party/libcxx/src/include/ryu/ryu.h
+FILE: ../../../third_party/libcxx/src/ryu/d2fixed.cpp
+FILE: ../../../third_party/libcxx/src/ryu/d2s.cpp
+FILE: ../../../third_party/libcxx/src/ryu/f2s.cpp
+----------------------------------------------------------------------------------------------------
+Copyright 2018 Ulf Adams
+Copyright (c) Microsoft Corporation. All rights reserved.
 
-REFERENCES
-==========
+Boost Software License - Version 1.0 - August 17th, 2003
 
-We recommend reading one or more of these references before trying to
-understand the innards of the JPEG software.
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
 
-The best short technical introduction to the JPEG compression algorithm is
-	Wallace, Gregory K.  "The JPEG Still Picture Compression Standard",
-	Communications of the ACM, April 1991 (vol. 34 no. 4), pp. 30-44.
-(Adjacent articles in that issue discuss MPEG motion picture compression,
-applications of JPEG, and related topics.)  If you don't have the CACM issue
-handy, a PDF file containing a revised version of Wallace's article is
-available at http://www.ijg.org/files/Wallace.JPEG.pdf.  The file (actually
-a preprint for an article that appeared in IEEE Trans. Consumer Electronics)
-omits the sample images that appeared in CACM, but it includes corrections
-and some added material.  Note: the Wallace article is copyright ACM and IEEE,
-and it may not be used for commercial purposes.
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
 
-A somewhat less technical, more leisurely introduction to JPEG can be found in
-"The Data Compression Book" by Mark Nelson and Jean-loup Gailly, published by
-M&T Books (New York), 2nd ed. 1996, ISBN 1-55851-434-1.  This book provides
-good explanations and example C code for a multitude of compression methods
-including JPEG.  It is an excellent source if you are comfortable reading C
-code but don't know much about data compression in general.  The book's JPEG
-sample code is far from industrial-strength, but when you are ready to look
-at a full implementation, you've got one here...
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+====================================================================================================
 
-The best currently available description of JPEG is the textbook "JPEG Still
-Image Data Compression Standard" by William B. Pennebaker and Joan L.
-Mitchell, published by Van Nostrand Reinhold, 1993, ISBN 0-442-01272-1.
-Price US$59.95, 638 pp.  The book includes the complete text of the ISO JPEG
-standards (DIS 10918-1 and draft DIS 10918-2).
+====================================================================================================
+LIBRARY: zlib
+ORIGIN: ../../../third_party/zlib/contrib/optimizations/insert_string.h + ../../../LICENSE
+ORIGIN: ../../../third_party/zlib/google/compression_utils_portable.cc + ../../../LICENSE
+ORIGIN: ../../../third_party/zlib/google/compression_utils_portable.h + ../../../LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../third_party/zlib/contrib/optimizations/insert_string.h
+FILE: ../../../third_party/zlib/google/compression_utils_portable.cc
+FILE: ../../../third_party/zlib/google/compression_utils_portable.h
+----------------------------------------------------------------------------------------------------
+Copyright 2019 The Chromium Authors
 
-The original JPEG standard is divided into two parts, Part 1 being the actual
-specification, while Part 2 covers compliance testing methods.  Part 1 is
-titled "Digital Compression and Coding of Continuous-tone Still Images,
-Part 1: Requirements and guidelines" and has document numbers ISO/IEC IS
-10918-1, ITU-T T.81.  Part 2 is titled "Digital Compression and Coding of
-Continuous-tone Still Images, Part 2: Compliance testing" and has document
-numbers ISO/IEC IS 10918-2, ITU-T T.83.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
 
-The JPEG standard does not specify all details of an interchangeable file
-format.  For the omitted details we follow the "JFIF" conventions, revision
-1.02.  JFIF 1.02 has been adopted as an Ecma International Technical Report
-and thus received a formal publication status.  It is available as a free
-download in PDF format from
-http://www.ecma-international.org/publications/techreports/E-TR-098.htm.
-A PostScript version of the JFIF document is available at
-http://www.ijg.org/files/jfif.ps.gz.  There is also a plain text version at
-http://www.ijg.org/files/jfif.txt.gz, but it is missing the figures.
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
 
-The TIFF 6.0 file format specification can be obtained by FTP from
-ftp://ftp.sgi.com/graphics/tiff/TIFF6.ps.gz.  The JPEG incorporation scheme
-found in the TIFF 6.0 spec of 3-June-92 has a number of serious problems.
-IJG does not recommend use of the TIFF 6.0 design (TIFF Compression tag 6).
-Instead, we recommend the JPEG design proposed by TIFF Technical Note #2
-(Compression tag 7).  Copies of this Note can be obtained from
-http://www.ijg.org/files/.  It is expected that the next revision
-of the TIFF spec will replace the 6.0 JPEG design with the Note's design.
-Although IJG's own code does not support TIFF/JPEG, the free libtiff library
-uses our library to implement TIFF/JPEG per the Note.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
 
-ARCHIVE LOCATIONS
-=================
+====================================================================================================
+LIBRARY: zlib
+ORIGIN: ../../../third_party/zlib/slide_hash_simd.h + ../../../LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../third_party/zlib/slide_hash_simd.h
+----------------------------------------------------------------------------------------------------
+Copyright 2022 The Chromium Authors
 
-The "official" archive site for this software is www.ijg.org.
-The most recent released version can always be found there in
-directory "files".
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
 
-The JPEG FAQ (Frequently Asked Questions) article is a source of some
-general information about JPEG.
-It is available on the World Wide Web at http://www.faqs.org/faqs/jpeg-faq
-and other news.answers archive sites, including the official news.answers
-archive at rtfm.mit.edu: ftp://rtfm.mit.edu/pub/usenet/news.answers/jpeg-faq/.
-If you don't have Web or FTP access, send e-mail to mail-server@rtfm.mit.edu
-with body
-	send usenet/news.answers/jpeg-faq/part1
-	send usenet/news.answers/jpeg-faq/part2
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
 
-FILE FORMAT WARS
-================
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+====================================================================================================
 
-The ISO/IEC JTC1/SC29/WG1 standards committee (also known as JPEG, together
-with ITU-T SG16) currently promotes different formats containing the name
-"JPEG" which are incompatible with original DCT-based JPEG.  IJG therefore does
-not support these formats (see REFERENCES).  Indeed, one of the original
-reasons for developing this free software was to help force convergence on
-common, interoperable format standards for JPEG files.
-Don't use an incompatible file format!
-(In any case, our decoder will remain capable of reading existing JPEG
-image files indefinitely.)
+====================================================================================================
+LIBRARY: zlib
+ORIGIN: ../../../third_party/zlib/contrib/minizip/unzip.h
+ORIGIN: ../../../third_party/zlib/contrib/minizip/zip.h
+TYPE: LicenseType.zlib
+FILE: ../../../third_party/zlib/contrib/minizip/unzip.h
+FILE: ../../../third_party/zlib/contrib/minizip/zip.h
+----------------------------------------------------------------------------------------------------
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
 
-TO DO
-=====
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
 
-Please send bug reports, offers of help, etc. to jpeg-info@jpegclub.org.
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
 ====================================================================================================
 
 ====================================================================================================
 LIBRARY: zlib
 ORIGIN: ../../../third_party/zlib/LICENSE
 TYPE: LicenseType.zlib
-FILE: ../../../third_party/zlib/DIR_METADATA
+FILE: ../../../third_party/zlib/chromeconf.h
 FILE: ../../../third_party/zlib/contrib/minizip/ChangeLogUnzip
-FILE: ../../../third_party/zlib/contrib/minizip/crypt.h
 FILE: ../../../third_party/zlib/contrib/minizip/ioapi.c
 FILE: ../../../third_party/zlib/contrib/minizip/ioapi.h
 FILE: ../../../third_party/zlib/contrib/minizip/iowin32.c
 FILE: ../../../third_party/zlib/contrib/minizip/iowin32.h
-FILE: ../../../third_party/zlib/contrib/minizip/miniunz.c
-FILE: ../../../third_party/zlib/contrib/minizip/minizip.c
 FILE: ../../../third_party/zlib/contrib/minizip/mztools.c
 FILE: ../../../third_party/zlib/contrib/minizip/mztools.h
 FILE: ../../../third_party/zlib/contrib/minizip/unzip.c
+FILE: ../../../third_party/zlib/contrib/minizip/unzip.h
 FILE: ../../../third_party/zlib/contrib/minizip/zip.c
+FILE: ../../../third_party/zlib/contrib/minizip/zip.h
 FILE: ../../../third_party/zlib/crc32.h
-FILE: ../../../third_party/zlib/google/DEPS
+FILE: ../../../third_party/zlib/google/compression_utils.cc
+FILE: ../../../third_party/zlib/google/compression_utils.h
+FILE: ../../../third_party/zlib/google/redact.h
+FILE: ../../../third_party/zlib/google/test_data.filelist
+FILE: ../../../third_party/zlib/google/test_data.globlist
+FILE: ../../../third_party/zlib/google/zip.cc
+FILE: ../../../third_party/zlib/google/zip.h
+FILE: ../../../third_party/zlib/google/zip_internal.cc
+FILE: ../../../third_party/zlib/google/zip_internal.h
+FILE: ../../../third_party/zlib/google/zip_reader.cc
+FILE: ../../../third_party/zlib/google/zip_reader.h
+FILE: ../../../third_party/zlib/google/zip_writer.cc
+FILE: ../../../third_party/zlib/google/zip_writer.h
 FILE: ../../../third_party/zlib/inffixed.h
 FILE: ../../../third_party/zlib/patches/0000-build.patch
 FILE: ../../../third_party/zlib/patches/0001-simd.patch
@@ -27977,7 +2419,11 @@ FILE: ../../../third_party/zlib/patches/0006-fix-check_match.patch
 FILE: ../../../third_party/zlib/patches/0007-zero-init-deflate-window.patch
 FILE: ../../../third_party/zlib/patches/0008-minizip-zip-unzip-tools.patch
 FILE: ../../../third_party/zlib/patches/0009-infcover-oob.patch
+FILE: ../../../third_party/zlib/patches/0010-cmake-enable-simd.patch
+FILE: ../../../third_party/zlib/patches/0011-avx512.patch
 FILE: ../../../third_party/zlib/trees.h
+FILE: ../../../third_party/zlib/zlib.map
+FILE: ../../../third_party/zlib/zlib.pc.cmakein
 ----------------------------------------------------------------------------------------------------
 version 1.2.12, March 27th, 2022
 
@@ -27999,4 +2445,5 @@ freely, subject to the following restrictions:
    misrepresented as being the original software.
 3. This notice may not be removed or altered from any source distribution.
 ====================================================================================================
-Total license count: 416
+
+Total license count: 13
diff --git a/ci/licenses_golden/tool_signature b/ci/licenses_golden/tool_signature
index 5ab989a0f4fa83dda44ce7f74994a4e89182e80e..7c03df131166112a24340053501f4ad1780b1460 100644
--- a/ci/licenses_golden/tool_signature
+++ b/ci/licenses_golden/tool_signature
@@ -1,2 +1,2 @@
-Signature: 9d0f7a4c4f53b80e33da848062bef937
+Signature: ca33ea519500557f75994e39099baaa0
 
diff --git a/ci/pubspec.yaml b/ci/pubspec.yaml
index 11583566998d59add0e3c6662a0737e519ea18af..c92fb333cc733da8b71ae3b859ff3c94cd568662 100644
--- a/ci/pubspec.yaml
+++ b/ci/pubspec.yaml
@@ -5,7 +5,7 @@
 name: ci_scripts
 publish_to: none
 environment:
-  sdk: '>=2.12.0-0 <3.0.0'
+  sdk: '>=3.2.0-0 <4.0.0'
 
 # Do not add any dependencies that require more than what is provided in
 # //third_party/pkg, //third_party/dart/pkg, or
@@ -23,22 +23,35 @@ dependencies:
   process_runner: any
   process: any
 
+dev_dependencies:
+  async_helper: any
+  expect: any
+  litetest: any
+
 dependency_overrides:
   args:
     path: ../../third_party/dart/third_party/pkg/args
   async:
     path: ../../third_party/dart/third_party/pkg/async
+  async_helper:
+    path: ../../third_party/dart/pkg/async_helper
   collection:
     path: ../../third_party/dart/third_party/pkg/collection
+  expect:
+    path: ../../third_party/dart/pkg/expect
   file:
-    path: ../../third_party/pkg/file/packages/file
+    path: ../../third_party/dart/third_party/pkg/file/packages/file
+  litetest:
+    path: ../testing/litetest
   meta:
     path: ../../third_party/dart/pkg/meta
   path:
     path: ../../third_party/dart/third_party/pkg/path
   platform:
-    path: ../../third_party/pkg/platform
+    path: ../third_party/pkg/platform
   process:
-    path: ../../third_party/pkg/process
+    path: ../third_party/pkg/process
   process_runner:
-    path: ../../third_party/pkg/process_runner
+    path: ../third_party/pkg/process_runner
+  smith:
+    path: ../../third_party/dart/pkg/smith
diff --git a/ci/pylint.sh b/ci/pylint.sh
new file mode 100755
index 0000000000000000000000000000000000000000..e94f5248cb8e65069eb8571a95d72e1c5f1a53fc
--- /dev/null
+++ b/ci/pylint.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+#
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+set -e
+
+# Needed because if it is set, cd may print the path it changed to.
+unset CDPATH
+
+# On Mac OS, readlink -f doesn't work, so follow_links traverses the path one
+# link at a time, and then cds into the link destination and find out where it
+# ends up.
+#
+# The function is enclosed in a subshell to avoid changing the working directory
+# of the caller.
+function follow_links() (
+  cd -P "$(dirname -- "$1")"
+  file="$PWD/$(basename -- "$1")"
+  while [[ -h "$file" ]]; do
+    cd -P "$(dirname -- "$file")"
+    file="$(readlink -- "$file")"
+    cd -P "$(dirname -- "$file")"
+    file="$PWD/$(basename -- "$file")"
+  done
+  echo "$file"
+)
+
+SCRIPT_DIR=$(follow_links "$(dirname -- "${BASH_SOURCE[0]}")")
+FLUTTER_DIR="$(cd "$SCRIPT_DIR/.."; pwd -P)"
+
+echo "$(date +%T) Running pylint"
+
+cd "$FLUTTER_DIR"
+pylint-2.7 --rcfile=.pylintrc \
+  "ci/" \
+  "impeller/" \
+  "sky/" \
+  "tools/gn" \
+  "tools/pub_get_offline.py" \
+  "testing/"
+
+echo "$(date +%T) Linting complete"
diff --git a/ci/deps_parser.py b/ci/scan_deps.py
similarity index 30%
rename from ci/deps_parser.py
rename to ci/scan_deps.py
index bf4f6d8b72049917c60c58d6a2750a45d8e707c5..d6be9828b515ce84df02fb9e7eaf2c3b8f459357 100644
--- a/ci/deps_parser.py
+++ b/ci/scan_deps.py
@@ -4,23 +4,31 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
-# Usage: deps_parser.py --deps <DEPS file> --output <flattened deps>
+# Usage: scan_deps.py --deps <DEPS file> --output <parsed lockfile>
 #
-# This script parses the DEPS file, extracts the fully qualified dependencies
-# and writes the to a file. This file will be later used to validate the dependencies
-# are pinned to a hash.
+# This script extracts the dependencies provided from the DEPS file and
+# finds the appropriate git commit hash per dependency for osv-scanner
+# to use in checking for vulnerabilities.
+# It is expected that the lockfile output of this script is then
+# uploaded using GitHub actions to be used by the osv-scanner reusable action.
 
 import argparse
+import json
 import os
 import re
+import shutil
+import subprocess
 import sys
+from compatibility_helper import byte_str_decode
 
 SCRIPT_DIR = os.path.dirname(sys.argv[0])
 CHECKOUT_ROOT = os.path.realpath(os.path.join(SCRIPT_DIR, '..'))
-
 CHROMIUM_README_FILE = 'third_party/accessibility/README.md'
-CHROMIUM_README_COMMIT_LINE = 4  # the fifth line will always contain the commit hash
+CHROMIUM_README_COMMIT_LINE = 4  # The fifth line will always contain the commit hash.
 CHROMIUM = 'https://chromium.googlesource.com/chromium/src'
+DEP_CLONE_DIR = CHECKOUT_ROOT + '/clone-test'
+DEPS = os.path.join(CHECKOUT_ROOT, 'DEPS')
+UPSTREAM_PREFIX = 'upstream_'
 
 
 # Used in parsing the DEPS file.
@@ -37,13 +45,13 @@ class VarImpl:
     """Implements the Var syntax."""
     if var_name in self._local_scope.get('vars', {}):
       return self._local_scope['vars'][var_name]
-    # Inject default values for env variables
+    # Inject default values for env variables.
     if var_name in self._env_vars:
       return self._env_vars[var_name]
     raise Exception('Var is not defined: %s' % var_name)
 
 
-def parse_deps_file(deps_file):
+def extract_deps(deps_file):
   local_scope = {}
   var = VarImpl(local_scope)
   global_scope = {
@@ -57,18 +65,39 @@ def parse_deps_file(deps_file):
   # Eval the content.
   exec(deps_content, global_scope, local_scope)
 
+  if not os.path.exists(DEP_CLONE_DIR):
+    os.mkdir(DEP_CLONE_DIR)  # Clone deps with upstream into temporary dir.
+
   # Extract the deps and filter.
   deps = local_scope.get('deps', {})
-  filtered_deps = []
+  deps_list = local_scope.get('vars')
+  filtered_osv_deps = []
   for _, dep in deps.items():
     # We currently do not support packages or cipd which are represented
     # as dictionaries.
-    if isinstance(dep, str):
-      filtered_deps.append(dep)
-  return filtered_deps
+    if not isinstance(dep, str):
+      continue
+
+    dep_split = dep.rsplit('@', 1)
+    ancestor_result = get_common_ancestor([dep_split[0], dep_split[1]], deps_list)
+    if ancestor_result:
+      filtered_osv_deps.append({
+          'package': {'name': ancestor_result[1], 'commit': ancestor_result[0]}
+      })
+
+  try:
+    # Clean up cloned upstream dependency directory.
+    shutil.rmtree(DEP_CLONE_DIR)  # Use shutil.rmtree since dir could be non-empty.
+  except OSError as clone_dir_error:
+    print('Error cleaning up clone directory: %s : %s' % (DEP_CLONE_DIR, clone_dir_error.strerror))
+
+  osv_result = {
+      'packageSource': {'path': deps_file, 'type': 'lockfile'}, 'packages': filtered_osv_deps
+  }
+  return osv_result
 
 
-def parse_readme(deps):
+def parse_readme():
   """
   Opens the Flutter Accessibility Library README and uses the commit hash
   found in the README to check for viulnerabilities.
@@ -76,49 +105,128 @@ def parse_readme(deps):
   """
   file_path = os.path.join(CHECKOUT_ROOT, CHROMIUM_README_FILE)
   with open(file_path) as file:
-    # read the content of the file opened
+    # Read the content of the file opened.
     content = file.readlines()
     commit_line = content[CHROMIUM_README_COMMIT_LINE]
     commit = re.search(r'(?<=\[).*(?=\])', commit_line)
-    deps.append(CHROMIUM + '@' + commit.group())
-    return deps
 
+    osv_result = {
+        'packageSource': {'path': file_path, 'type': 'lockfile'},
+        'packages': [{'package': {'name': CHROMIUM, 'commit': commit.group()}}]
+    }
 
-def write_manifest(deps, manifest_file):
-  print('\n'.join(sorted(deps)))
-  with open(manifest_file, 'w') as manifest:
-    manifest.write('\n'.join(sorted(deps)))
+    return osv_result
+
+
+def get_common_ancestor(dep, deps_list):
+  """
+  Given an input of a mirrored dep,
+  compare to the mapping of deps to their upstream
+  in DEPS and find a common ancestor
+  commit SHA value.
+
+  This is done by first cloning the mirrored dep,
+  then a branch which tracks the upstream.
+  From there,  git merge-base operates using the HEAD
+  commit SHA of the upstream branch and the pinned
+  SHA value of the mirrored branch
+  """
+  # dep[0] contains the mirror repo.
+  # dep[1] contains the mirror's pinned SHA.
+  # upstream is the origin repo.
+  dep_name = dep[0].split('/')[-1].split('.')[0]
+  if UPSTREAM_PREFIX + dep_name not in deps_list:
+    print('did not find dep: ' + dep_name)
+    return None
+  try:
+    # Get the upstream URL from the mapping in DEPS file.
+    upstream = deps_list.get(UPSTREAM_PREFIX + dep_name)
+    temp_dep_dir = DEP_CLONE_DIR + '/' + dep_name
+    # Clone dependency from mirror.
+    subprocess.check_output(['git', 'clone', '--quiet', '--', dep[0], dep_name], cwd=DEP_CLONE_DIR)
+
+    # Create branch that will track the upstream dep.
+    print('attempting to add upstream remote from: {upstream}'.format(upstream=upstream))
+    subprocess.check_output(['git', 'remote', 'add', 'upstream', upstream], cwd=temp_dep_dir)
+    subprocess.check_output(['git', 'fetch', '--quiet', 'upstream'], cwd=temp_dep_dir)
+    # Get name of the default branch for upstream (e.g. main/master/etc.).
+    default_branch = subprocess.check_output(
+        'git remote show upstream ' + "| sed -n \'/HEAD branch/s/.*: //p\'",
+        cwd=temp_dep_dir,
+        shell=True
+    )
+    default_branch = byte_str_decode(default_branch)
+    default_branch = default_branch.strip()
+
+    # Make upstream branch track the upstream dep.
+    subprocess.check_output([
+        'git', 'checkout', '--force', '-b', 'upstream', '--track', 'upstream/' + default_branch
+    ],
+                            cwd=temp_dep_dir)
+    # Get the most recent commit from default branch of upstream.
+    commit = subprocess.check_output(
+        'git for-each-ref ' + "--format=\'%(objectname:short)\' refs/heads/upstream",
+        cwd=temp_dep_dir,
+        shell=True
+    )
+    commit = byte_str_decode(commit)
+    commit = commit.strip()
+
+    # Perform merge-base on most recent default branch commit and pinned mirror commit.
+    ancestor_commit = subprocess.check_output(
+        'git merge-base {commit} {depUrl}'.format(commit=commit, depUrl=dep[1]),
+        cwd=temp_dep_dir,
+        shell=True
+    )
+    ancestor_commit = byte_str_decode(ancestor_commit)
+    ancestor_commit = ancestor_commit.strip()
+    print('Ancestor commit: ' + ancestor_commit)
+    return ancestor_commit, upstream
+  except subprocess.CalledProcessError as error:
+    print(
+        "Subprocess command '{0}' failed with exit code: {1}.".format(
+            error.cmd, str(error.returncode)
+        )
+    )
+    if error.output:
+      print("Subprocess error output: '{0}'".format(error.output))
+  return None
 
 
 def parse_args(args):
   args = args[1:]
-  parser = argparse.ArgumentParser(
-      description='A script to flatten a gclient DEPS file.'
-  )
+  parser = argparse.ArgumentParser(description='A script to find common ancestor commit SHAs')
 
   parser.add_argument(
       '--deps',
       '-d',
       type=str,
-      help='Input DEPS file.',
+      help='Input DEPS file to extract.',
       default=os.path.join(CHECKOUT_ROOT, 'DEPS')
   )
   parser.add_argument(
       '--output',
       '-o',
       type=str,
-      help='Output flattened deps file.',
-      default=os.path.join(CHECKOUT_ROOT, 'deps_flatten.txt')
+      help='Output osv-scanner compatible deps file.',
+      default=os.path.join(CHECKOUT_ROOT, 'osv-lockfile.json')
   )
 
   return parser.parse_args(args)
 
 
+def write_manifest(deps, manifest_file):
+  output = {'results': deps}
+  print(json.dumps(output, indent=2))
+  with open(manifest_file, 'w') as manifest:
+    json.dump(output, manifest, indent=2)
+
+
 def main(argv):
   args = parse_args(argv)
-  deps = parse_deps_file(args.deps)
-  deps = parse_readme(deps)
-  write_manifest(deps, args.output)
+  deps = extract_deps(args.deps)
+  readme_deps = parse_readme()
+  write_manifest([deps, readme_deps], args.output)
   return 0
 
 
diff --git a/ci/scan_flattened_deps.py b/ci/scan_flattened_deps.py
deleted file mode 100644
index 0184db7a9e6bf826423042ff8e1e539b833f7b26..0000000000000000000000000000000000000000
--- a/ci/scan_flattened_deps.py
+++ /dev/null
@@ -1,319 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright 2013 The Flutter Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-#
-# Usage: scan_flattened_deps.py --flat-deps <flat DEPS file> --output <vulnerability report>
-#
-# This script parses the flattened, fully qualified dependencies,
-# and uses the OSV API to check for known vulnerabilities
-# for the given hash of the dependency
-
-import argparse
-import json
-import os
-import shutil
-import subprocess
-import sys
-from urllib import request
-from compatibility_helper import byte_str_decode
-
-SCRIPT_DIR = os.path.dirname(sys.argv[0])
-CHECKOUT_ROOT = os.path.realpath(os.path.join(SCRIPT_DIR, '..'))
-DEP_CLONE_DIR = CHECKOUT_ROOT + '/clone-test'
-DEPS = os.path.join(CHECKOUT_ROOT, 'DEPS')
-HELP_STR = 'To find complete information on this vulnerability, navigate to '
-OSV_VULN_DB_URL = 'https://osv.dev/vulnerability/'
-SECONDS_PER_YEAR = 31556952
-UPSTREAM_PREFIX = 'upstream_'
-
-failed_deps = []  # deps which fail to be be cloned or git-merge based
-
-sarif_log = {
-    '$schema':
-        'https://json.schemastore.org/sarif-2.1.0.json', 'version':
-            '2.1.0', 'runs': [{
-                'tool': {'driver': {'name': 'OSV Scan', 'rules': []}},
-                'results': []
-            }]
-}
-
-
-def sarif_result():
-  """
-  Returns the template for a result entry in the Sarif log,
-  which is populated with CVE findings from OSV API
-  """
-  return {
-      'ruleId':
-          'N/A', 'message': {'text': 'OSV Scan Finding'}, 'locations': [{
-              'physicalLocation': {
-                  'artifactLocation': {
-                      'uri': 'No location associated with this finding'
-                  },
-                  'region': {'startLine': 1, 'startColumn': 1, 'endColumn': 1}
-              }
-          }]
-  }
-
-
-def sarif_rule():
-  """
-  Returns the template for a rule entry in the Sarif log,
-  which is populated with CVE findings from OSV API
-  """
-  return {
-      'id': 'OSV Scan', 'name': 'OSV Scan Finding',
-      'shortDescription': {'text': 'Insert OSV id'}, 'fullDescription': {
-          'text': 'Vulnerability found by scanning against the OSV API'
-      }, 'help': {
-          'text':
-              'More details in the OSV DB at: https://osv.dev/vulnerability/'
-      }, 'defaultConfiguration': {'level': 'error'},
-      'properties': {'tags': ['supply-chain', 'dependency']}
-  }
-
-
-def parse_deps_file(deps_flat_file):
-  """
-  Takes input of fully qualified dependencies,
-  for each dep find the common ancestor commit SHA
-  from the upstream and query OSV API using that SHA
-
-  If the commit cannot be found or the dep cannot be
-  compared to an upstream, prints list of those deps
-  """
-  deps_list = []
-  with open(DEPS, 'r') as file:
-    local_scope = {}
-    global_scope = {'Var': lambda x: x}  # dummy lambda
-    # Read the content.
-    deps_content = file.read()
-
-    # Eval the content.
-    exec(deps_content, global_scope, local_scope)
-
-    # Extract the deps and filter.
-    deps_list = local_scope.get('vars')
-  queries = []  # list of queries to submit in bulk request to OSV API
-  with open(deps_flat_file, 'r') as file:
-    lines = file.readlines()
-
-  headers = {
-      'Content-Type': 'application/json',
-  }
-  osv_url = 'https://api.osv.dev/v1/querybatch'
-
-  if not os.path.exists(DEP_CLONE_DIR):
-    os.mkdir(DEP_CLONE_DIR)  #clone deps with upstream into temporary dir
-
-  # Extract commit hash, save in dictionary
-  for line in lines:
-    dep = line.strip().split(
-        '@'
-    )  # separate fully qualified dep into name + pinned hash
-
-    common_commit = get_common_ancestor_commit(dep, deps_list)
-    if isinstance(common_commit, str):
-      queries.append({'commit': common_commit})
-    else:
-      failed_deps.append(dep[0])
-
-  print(
-      'Dependencies that could not be parsed for ancestor commits: ' +
-      ', '.join(failed_deps)
-  )
-  try:
-    # clean up cloned upstream dependency directory
-    shutil.rmtree(
-        DEP_CLONE_DIR
-    )  # use shutil.rmtree since dir could be non-empty
-  except OSError as clone_dir_error:
-    print(
-        'Error cleaning up clone directory: %s : %s' %
-        (DEP_CLONE_DIR, clone_dir_error.strerror)
-    )
-  # Query OSV API using common ancestor commit for each dep
-  # return any vulnerabilities found.
-  data = json.dumps({'queries': queries}).encode('utf-8')
-  req = request.Request(osv_url, data, headers=headers)
-  with request.urlopen(req) as resp:
-    res_body = resp.read()
-    results_json = json.loads(res_body.decode('utf-8'))
-    if resp.status != 200:
-      print('Request error')
-    elif results_json['results'] == [{}]:
-      print('Found no vulnerabilities')
-    else:
-      results = results_json['results']
-      filtered_results = list(filter(lambda vuln: vuln != {}, results))
-      if len(filtered_results) > 0:
-        print(
-            'Found vulnerability on {vuln_count} dependenc(y/ies), adding to report'
-            .format(vuln_count=str(len(filtered_results)))
-        )
-        print(*filtered_results)
-        return filtered_results
-      print('Found no vulnerabilities')
-  return {}
-
-
-def get_common_ancestor_commit(dep, deps_list):
-  """
-  Given an input of a mirrored dep,
-  compare to the mapping of deps to their upstream
-  in DEPS and find a common ancestor
-  commit SHA value.
-
-  This is done by first cloning the mirrored dep,
-  then a branch which tracks the upstream.
-  From there,  git merge-base operates using the HEAD
-  commit SHA of the upstream branch and the pinned
-  SHA value of the mirrored branch
-  """
-  # dep[0] contains the mirror repo
-  # dep[1] contains the mirror's pinned SHA
-  # upstream is the origin repo
-  dep_name = dep[0].split('/')[-1].split('.')[0]
-  if UPSTREAM_PREFIX + dep_name not in deps_list:
-    print('did not find dep: ' + dep_name)
-    return {}
-  try:
-    # get the upstream URL from the mapping in DEPS file
-    upstream = deps_list.get(UPSTREAM_PREFIX + dep_name)
-    temp_dep_dir = DEP_CLONE_DIR + '/' + dep_name
-    # clone dependency from mirror
-    subprocess.check_output([
-        'git', 'clone', '--quiet', '--', dep[0], temp_dep_dir
-    ])
-
-    # create branch that will track the upstream dep
-    print(
-        'attempting to add upstream remote from: {upstream}'.format(
-            upstream=upstream
-        )
-    )
-    subprocess.check_output([
-        'git', '--git-dir', temp_dep_dir + '/.git', 'remote', 'add', 'upstream',
-        upstream
-    ])
-    subprocess.check_output([
-        'git', '--git-dir', temp_dep_dir + '/.git', 'fetch', '--quiet',
-        'upstream'
-    ])
-    # get name of the default branch for upstream (e.g. main/master/etc.)
-    default_branch = subprocess.check_output(
-        'git --git-dir ' + temp_dep_dir + '/.git remote show upstream ' +
-        "| sed -n \'/HEAD branch/s/.*: //p\'",
-        shell=True
-    )
-    default_branch = byte_str_decode(default_branch)
-    default_branch = default_branch.strip()
-    print(
-        'default_branch found: {default_branch}'.format(
-            default_branch=default_branch
-        )
-    )
-    # make upstream branch track the upstream dep
-    subprocess.check_output([
-        'git', '--git-dir', temp_dep_dir + '/.git', 'checkout', '-b',
-        'upstream', '--track', 'upstream/' + default_branch
-    ])
-    # get the most recent commit from default branch of upstream
-    commit = subprocess.check_output(
-        'git --git-dir ' + temp_dep_dir + '/.git for-each-ref ' +
-        "--format=\'%(objectname:short)\' refs/heads/upstream",
-        shell=True
-    )
-    commit = byte_str_decode(commit)
-    commit = commit.strip()
-
-    # perform merge-base on most recent default branch commit and pinned mirror commit
-    ancestor_commit = subprocess.check_output(
-        'git --git-dir {temp_dep_dir}/.git merge-base {commit} {depUrl}'.format(
-            temp_dep_dir=temp_dep_dir, commit=commit, depUrl=dep[1]
-        ),
-        shell=True
-    )
-    ancestor_commit = byte_str_decode(ancestor_commit)
-    ancestor_commit = ancestor_commit.strip()
-    print('Ancestor commit: ' + ancestor_commit)
-    return ancestor_commit
-  except subprocess.CalledProcessError as error:
-    print("Subprocess error '{0}' occured.".format(error.output))
-  return {}
-
-
-def write_sarif(responses, manifest_file):
-  """
-  Creates a full SARIF report based on the OSV API response which
-  may contain several vulnerabilities
-
-  Combines a rule with a result in order to construct the report
-  """
-  data = sarif_log
-  for response in responses:
-    for vuln in response['vulns']:
-      new_rule = create_rule_entry(vuln)
-      data['runs'][0]['tool']['driver']['rules'].append(new_rule)
-      data['runs'][0]['results'].append(create_result_entry(vuln))
-  with open(manifest_file, 'w') as out:
-    json.dump(data, out)
-
-
-def create_rule_entry(vuln):
-  """
-  Creates a Sarif rule entry from an OSV finding.
-  Vuln object follows OSV Schema and is required to have 'id' and 'modified'
-  """
-  rule = sarif_rule()
-  rule['id'] = vuln['id']
-  rule['shortDescription']['text'] = vuln['id']
-  rule['help']['text'] += vuln['id']
-  return rule
-
-
-def create_result_entry(vuln):
-  """
-  Creates a Sarif res entry from an OSV entry.
-  Rule finding linked to the associated rule metadata via ruleId
-  """
-  result = sarif_result()
-  result['ruleId'] = vuln['id']
-  return result
-
-
-def parse_args(args):
-  args = args[1:]
-  parser = argparse.ArgumentParser(
-      description='A script to scan a flattened DEPS file using OSV API.'
-  )
-
-  parser.add_argument(
-      '--flat-deps',
-      '-d',
-      type=str,
-      help='Input flattened DEPS file.',
-      default=os.path.join(CHECKOUT_ROOT, 'deps_flatten.txt')
-  )
-  parser.add_argument(
-      '--output',
-      '-o',
-      type=str,
-      help='Output SARIF log of vulnerabilities found in OSV database.',
-      default=os.path.join(CHECKOUT_ROOT, 'osvReport.sarif')
-  )
-
-  return parser.parse_args(args)
-
-
-def main(argv):
-  args = parse_args(argv)
-  osv_scans = parse_deps_file(args.flat_deps)
-  write_sarif(osv_scans, args.output)
-  return 0
-
-
-if __name__ == '__main__':
-  sys.exit(main(sys.argv))
diff --git a/ci/test/ban_generated_plugin_registrant_java_test.sh b/ci/test/ban_generated_plugin_registrant_java_test.sh
new file mode 100755
index 0000000000000000000000000000000000000000..3f6d4e415a85e23ad299ab89c510ba25b5af365b
--- /dev/null
+++ b/ci/test/ban_generated_plugin_registrant_java_test.sh
@@ -0,0 +1,77 @@
+#!/bin/bash
+#
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+set -e
+
+# Needed because if it is set, cd may print the path it changed to.
+unset CDPATH
+
+# On Mac OS, readlink -f doesn't work, so follow_links traverses the path one
+# link at a time, and then cds into the link destination and find out where it
+# ends up.
+#
+# The function is enclosed in a subshell to avoid changing the working directory
+# of the caller.
+function follow_links() (
+  cd -P "$(dirname -- "$1")"
+  file="$PWD/$(basename -- "$1")"
+  while [[ -h "$file" ]]; do
+    cd -P "$(dirname -- "$file")"
+    file="$(readlink -- "$file")"
+    cd -P "$(dirname -- "$file")"
+    file="$PWD/$(basename -- "$file")"
+  done
+  echo "$file"
+)
+
+SCRIPT_DIR=$(follow_links "$(dirname -- "${BASH_SOURCE[0]}")")
+SRC_DIR="$(
+  cd "$SCRIPT_DIR/../../.."
+  pwd -P
+)"
+FLUTTER_DIR="$SRC_DIR/flutter"
+
+# Creates a file named `GeneratedPluginRegistrant.java` in the project outside
+# of it's expected location in shell/platform/android/test/... (where the exact
+# name and location is required to get loaded).
+#
+# This file is typically generated by Flutter tooling and should not exist.
+echo "Creating file ./src/flutter/GeneratedPluginRegistrant.java"
+touch "$FLUTTER_DIR/GeneratedPluginRegistrant.java"
+
+# Create a trap that, on exit, removes the temp files.
+function cleanup() {
+  rm -f "$SRC_DIR/third_party/GeneratedPluginRegistrant.java"
+  rm -f "$FLUTTER_DIR/GeneratedPluginRegistrant.java"
+  rm -f "$FLUTTER_DIR/third_party/GeneratedPluginRegistrant.java"
+}
+trap cleanup EXIT
+
+# Run the ban script, expecting it to fail.
+# Intercept the output, only check the exit code.
+"$FLUTTER_DIR/ci/ban_generated_plugin_registrant_java.sh" > /dev/null 2>&1 && {
+  echo "FAIL: ban_generated_plugin_registrant_java did not fail as expected"
+  exit 1
+}
+echo "PASS: ban_generated_plugin_registrant_java failed as expected"
+
+# Create a file in SRC_DIR/third_party, that should be OK.
+echo "Creating file ./src/third_party/GeneratedPluginRegistrant.java"
+touch "$SRC_DIR/third_party/GeneratedPluginRegistrant.java"
+
+# Run the ban script, expecting it to succeed.
+"$FLUTTER_DIR/ci/ban_generated_plugin_registrant_java.sh" > /dev/null 2>&1 || {
+  echo "PASS: ban_generated_plugin_registrant_java ignored third_party"
+}
+
+# Create a file in SRC_DIR/flutter/third_party, that should be OK too.
+echo "Creating file ./src/flutter/third_party/GeneratedPluginRegistrant.java"
+touch "$FLUTTER_DIR/third_party/GeneratedPluginRegistrant.java"
+
+# Run the ban script, expecting it to succeed.
+"$FLUTTER_DIR/ci/ban_generated_plugin_registrant_java.sh" > /dev/null 2>&1 || {
+  echo "PASS: ban_generated_plugin_registrant_java ignored flutter/third_party"
+}
diff --git a/ci/test/format_test.dart b/ci/test/format_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..f31a944bffeab355e6f2c7989db2600064ccd182
--- /dev/null
+++ b/ci/test/format_test.dart
@@ -0,0 +1,254 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io' as io;
+
+import 'package:litetest/litetest.dart';
+import 'package:path/path.dart' as path;
+
+import '../bin/format.dart' as target;
+
+final io.File script = io.File.fromUri(io.Platform.script).absolute;
+final io.Directory repoDir = script.parent.parent.parent;
+
+class FileContentPair {
+  FileContentPair(this.original, this.formatted);
+
+  final String original;
+  final String formatted;
+}
+
+final FileContentPair ccContentPair = FileContentPair(
+    'int main(){return 0;}\n', 'int main() {\n  return 0;\n}\n');
+final FileContentPair hContentPair =
+    FileContentPair('int\nmain\n()\n;\n', 'int main();\n');
+final FileContentPair gnContentPair = FileContentPair(
+    'test\n(){testvar=true}\n', 'test() {\n  testvar = true\n}\n');
+final FileContentPair javaContentPair = FileContentPair(
+    'class Test{public static void main(String args[]){System.out.println("Test");}}\n',
+    'class Test {\n  public static void main(String args[]) {\n    System.out.println("Test");\n  }\n}\n');
+final FileContentPair pythonContentPair = FileContentPair(
+    "if __name__=='__main__':\n  sys.exit(\nMain(sys.argv)\n)\n",
+    "if __name__ == '__main__':\n  sys.exit(Main(sys.argv))\n");
+final FileContentPair whitespaceContentPair = FileContentPair(
+    'int main() {\n  return 0;       \n}\n',
+    'int main() {\n  return 0;\n}\n');
+final FileContentPair headerContentPair = FileContentPair(
+    <String>[
+      '#ifndef FOO_H_',
+      '#define FOO_H_',
+      '',
+      '#endif  // FOO_H_',
+    ].join('\n'),
+    <String>[
+      '#ifndef FLUTTER_FORMAT_TEST_H_',
+      '#define FLUTTER_FORMAT_TEST_H_',
+      '',
+      '#endif  // FLUTTER_FORMAT_TEST_H_',
+      '',
+    ].join('\n'),
+);
+
+class TestFileFixture {
+  TestFileFixture(this.type) {
+    switch (type) {
+      case target.FormatCheck.clang:
+        final io.File ccFile = io.File('${repoDir.path}/format_test.cc');
+        ccFile.writeAsStringSync(ccContentPair.original);
+        files.add(ccFile);
+
+        final io.File hFile = io.File('${repoDir.path}/format_test.h');
+        hFile.writeAsStringSync(hContentPair.original);
+        files.add(hFile);
+      case target.FormatCheck.gn:
+        final io.File gnFile = io.File('${repoDir.path}/format_test.gn');
+        gnFile.writeAsStringSync(gnContentPair.original);
+        files.add(gnFile);
+      case target.FormatCheck.java:
+        final io.File javaFile = io.File('${repoDir.path}/format_test.java');
+        javaFile.writeAsStringSync(javaContentPair.original);
+        files.add(javaFile);
+      case target.FormatCheck.python:
+        final io.File pyFile = io.File('${repoDir.path}/format_test.py');
+        pyFile.writeAsStringSync(pythonContentPair.original);
+        files.add(pyFile);
+      case target.FormatCheck.whitespace:
+        final io.File whitespaceFile = io.File('${repoDir.path}/format_test.c');
+        whitespaceFile.writeAsStringSync(whitespaceContentPair.original);
+        files.add(whitespaceFile);
+      case target.FormatCheck.header:
+        final io.File headerFile = io.File('${repoDir.path}/format_test.h');
+        headerFile.writeAsStringSync(headerContentPair.original);
+        files.add(headerFile);
+    }
+  }
+
+  final target.FormatCheck type;
+  final List<io.File> files = <io.File>[];
+
+  void gitAdd() {
+    final List<String> args = <String>['add'];
+    for (final io.File file in files) {
+      args.add(file.path);
+    }
+
+    io.Process.runSync('git', args);
+  }
+
+  void gitRemove() {
+    final List<String> args = <String>['rm', '-f'];
+    for (final io.File file in files) {
+      args.add(file.path);
+    }
+    io.Process.runSync('git', args);
+  }
+
+  Iterable<FileContentPair> getFileContents() {
+    return files.map((io.File file) {
+      String content = file.readAsStringSync();
+      // Avoid clang-tidy formatting CRLF EOL on Windows
+      content = content.replaceAll('\r\n', '\n');
+      switch (type) {
+        case target.FormatCheck.clang:
+          return FileContentPair(
+            content,
+            path.extension(file.path) == '.cc'
+                ? ccContentPair.formatted
+                : hContentPair.formatted,
+          );
+        case target.FormatCheck.gn:
+          return FileContentPair(
+            content,
+            gnContentPair.formatted,
+          );
+        case target.FormatCheck.java:
+          return FileContentPair(
+            content,
+            javaContentPair.formatted,
+          );
+        case target.FormatCheck.python:
+          return FileContentPair(
+            content,
+            pythonContentPair.formatted,
+          );
+        case target.FormatCheck.whitespace:
+          return FileContentPair(
+            content,
+            whitespaceContentPair.formatted,
+          );
+        case target.FormatCheck.header:
+          return FileContentPair(
+            content,
+            headerContentPair.formatted,
+          );
+      }
+    });
+  }
+}
+
+void main() {
+  final String formatterPath =
+      '${repoDir.path}/ci/format.${io.Platform.isWindows ? 'bat' : 'sh'}';
+
+  test('Can fix C++ formatting errors', () {
+    final TestFileFixture fixture = TestFileFixture(target.FormatCheck.clang);
+    try {
+      fixture.gitAdd();
+      io.Process.runSync(formatterPath, <String>['--check', 'clang', '--fix'],
+          workingDirectory: repoDir.path);
+
+      final Iterable<FileContentPair> files = fixture.getFileContents();
+      for (final FileContentPair pair in files) {
+        expect(pair.original, equals(pair.formatted));
+      }
+    } finally {
+      fixture.gitRemove();
+    }
+  });
+
+  test('Can fix GN formatting errors', () {
+    final TestFileFixture fixture = TestFileFixture(target.FormatCheck.gn);
+    try {
+      fixture.gitAdd();
+      io.Process.runSync(formatterPath, <String>['--check', 'gn', '--fix'],
+          workingDirectory: repoDir.path);
+
+      final Iterable<FileContentPair> files = fixture.getFileContents();
+      for (final FileContentPair pair in files) {
+        expect(pair.original, equals(pair.formatted));
+      }
+    } finally {
+      fixture.gitRemove();
+    }
+  });
+
+  test('Can fix Java formatting errors', () {
+    final TestFileFixture fixture = TestFileFixture(target.FormatCheck.java);
+    try {
+      fixture.gitAdd();
+      io.Process.runSync(formatterPath, <String>['--check', 'java', '--fix'],
+          workingDirectory: repoDir.path);
+
+      final Iterable<FileContentPair> files = fixture.getFileContents();
+      for (final FileContentPair pair in files) {
+        expect(pair.original, equals(pair.formatted));
+      }
+    } finally {
+      fixture.gitRemove();
+    }
+    // TODO(mtolmacs): Fails if Java dependency is unavailable,
+    // https://github.com/flutter/flutter/issues/129221
+  }, skip: true);
+
+  test('Can fix Python formatting errors', () {
+    final TestFileFixture fixture = TestFileFixture(target.FormatCheck.python);
+    try {
+      fixture.gitAdd();
+      io.Process.runSync(formatterPath, <String>['--check', 'python', '--fix'],
+          workingDirectory: repoDir.path);
+
+      final Iterable<FileContentPair> files = fixture.getFileContents();
+      for (final FileContentPair pair in files) {
+        expect(pair.original, equals(pair.formatted));
+      }
+    } finally {
+      fixture.gitRemove();
+    }
+  });
+
+  test('Can fix whitespace formatting errors', () {
+    final TestFileFixture fixture =
+        TestFileFixture(target.FormatCheck.whitespace);
+    try {
+      fixture.gitAdd();
+      io.Process.runSync(
+          formatterPath, <String>['--check', 'whitespace', '--fix'],
+          workingDirectory: repoDir.path);
+
+      final Iterable<FileContentPair> files = fixture.getFileContents();
+      for (final FileContentPair pair in files) {
+        expect(pair.original, equals(pair.formatted));
+      }
+    } finally {
+      fixture.gitRemove();
+    }
+  });
+
+  test('Can fix header guard formatting errors', () {
+    final TestFileFixture fixture = TestFileFixture(target.FormatCheck.header);
+    try {
+      fixture.gitAdd();
+      io.Process.runSync(
+        formatterPath, <String>['--check', 'header', '--fix'],
+        workingDirectory: repoDir.path,
+      );
+      final Iterable<FileContentPair> files = fixture.getFileContents();
+      for (final FileContentPair pair in files) {
+        expect(pair.original, equals(pair.formatted));
+      }
+    } finally {
+      fixture.gitRemove();
+    }
+  });
+}
diff --git a/common/config.gni b/common/config.gni
index d74f2c9bc20c612c9b8e7fb48876a73d3c971e6f..effded6c771b8d0f84a9d95b8cba822cd4cfb4a7 100644
--- a/common/config.gni
+++ b/common/config.gni
@@ -18,17 +18,20 @@ declare_args() {
   # The runtime mode ("debug", "profile", "release", or "jit_release")
   flutter_runtime_mode = "debug"
 
-  # Whether to link the Skia text shaper module into the engine
-  flutter_enable_skshaper = false
-
-  # Whether to use the Skia text shaper module for all text rendering
-  flutter_always_use_skshaper = false
-
   # Whether to use a prebuilt Dart SDK instead of building one.
   flutter_prebuilt_dart_sdk = false
 
-  # Whether to build the flutter web sdk outline/DDC artifacts.
-  flutter_build_web_sdk = false
+  # Whether to build host-side development artifacts.
+  flutter_build_engine_artifacts = true
+
+  # Whether to include backtrace support.
+  enable_backtrace = true
+
+  # Whether to include --fapplication-extension when build iOS framework.
+  # This is currently a test flag and does not work properly.
+  #TODO(cyanglaz): Remove above comment about test flag when the entire iOS embedder supports app extension
+  #https://github.com/flutter/flutter/issues/124289
+  darwin_extension_safe = false
 }
 
 # feature_defines_list ---------------------------------------------------------
@@ -68,6 +71,10 @@ if (is_ios || is_mac) {
     "-Werror=overriding-method-mismatch",
     "-Werror=undeclared-selector",
   ]
+  if (is_mac) {
+    flutter_cflags_objc += [ "-fapplication-extension" ]
+  }
+
   flutter_cflags_objcc = flutter_cflags_objc
   flutter_cflags_objc_arc = flutter_cflags_objc + [ "-fobjc-arc" ]
   flutter_cflags_objcc_arc = flutter_cflags_objc_arc
@@ -94,39 +101,48 @@ if (target_platform_name == "mac") {
 full_target_platform_name = "$target_platform_name-$target_cpu"
 
 # Prebuilt Dart SDK location
+_target_os_name = target_os
+if (_target_os_name == "mac") {
+  _target_os_name = "macos"
+} else if (_target_os_name == "win") {
+  _target_os_name = "windows"
+}
 
-if (flutter_prebuilt_dart_sdk) {
-  _target_os_name = target_os
-  if (_target_os_name == "mac") {
-    _target_os_name = "macos"
-  } else if (_target_os_name == "win") {
-    _target_os_name = "windows"
-  }
+_host_os_name = host_os
+if (_host_os_name == "mac") {
+  _host_os_name = "macos"
+} else if (_host_os_name == "win") {
+  _host_os_name = "windows"
+}
 
-  _host_os_name = host_os
-  if (_host_os_name == "mac") {
-    _host_os_name = "macos"
-  } else if (_host_os_name == "win") {
-    _host_os_name = "windows"
-  }
+# When building 32-bit Android development artifacts for Windows host (like
+# gen_snapshot), the host_cpu is set to x86. However, the correct prebuilt
+# Dart SDK to use during this build is still the 64-bit one.
+_host_cpu = host_cpu
+if (host_os == "win" && host_cpu == "x86") {
+  _host_cpu = "x64"
+}
 
-  _target_prebuilt_dart_sdk_config = "$_target_os_name-$target_cpu"
-  _host_prebuilt_dart_sdk_config = "$_host_os_name-$host_cpu"
+_target_prebuilt_config = "$_target_os_name-$target_cpu"
+_host_prebuilt_config = "$_host_os_name-$_host_cpu"
 
-  target_prebuilt_dart_sdk =
-      "//flutter/prebuilts/$_target_prebuilt_dart_sdk_config/dart-sdk"
-  host_prebuilt_dart_sdk =
-      "//flutter/prebuilts/$_host_prebuilt_dart_sdk_config/dart-sdk"
+target_prebuilts_path = "//flutter/prebuilts/$_target_prebuilt_config"
+host_prebuilts_path = "//flutter/prebuilts/$_host_prebuilt_config"
 
-  # There is no prebuilt Dart SDK targeting Fuchsia, but we also don't need
-  # one, so even when the build is targeting Fuchsia, use the prebuilt
-  # Dart SDK for the host.
-  if (current_toolchain == host_toolchain || is_fuchsia || is_wasm) {
+if (flutter_prebuilt_dart_sdk) {
+  target_prebuilt_dart_sdk = "$target_prebuilts_path/dart-sdk"
+  host_prebuilt_dart_sdk = "$host_prebuilts_path/dart-sdk"
+
+  # There is no prebuilt Dart SDK targeting Fuchsia, iOS, and Android, but we
+  # also don't need one, so even when the build is targeting one of these
+  # platforms, we use the prebuilt Dart SDK for the host.
+  if (current_toolchain == host_toolchain || target_os == "android" ||
+      target_os == "fuchsia" || target_os == "ios" || target_os == "wasm") {
     prebuilt_dart_sdk = host_prebuilt_dart_sdk
-    prebuilt_dart_sdk_config = _host_prebuilt_dart_sdk_config
+    prebuilt_dart_sdk_config = _host_prebuilt_config
   } else {
     prebuilt_dart_sdk = target_prebuilt_dart_sdk
-    prebuilt_dart_sdk_config = _target_prebuilt_dart_sdk_config
+    prebuilt_dart_sdk_config = _target_prebuilt_config
   }
 }
 
@@ -135,5 +151,6 @@ if (flutter_prebuilt_dart_sdk) {
 # TODO: We can't build the engine artifacts for arm (32-bit) right now;
 # see https://github.com/flutter/flutter/issues/74322
 build_engine_artifacts =
-    current_toolchain == host_toolchain ||
-    (is_linux && !is_chromeos && current_cpu != "arm") || is_mac || is_win || is_ohos
+    flutter_build_engine_artifacts &&
+    (current_toolchain == host_toolchain ||
+     (is_linux && !is_chromeos && current_cpu != "arm") || is_mac || is_win || is_ohos)
diff --git a/common/constants.h b/common/constants.h
index 50b0f91e84823ff924802d3b5f3eabe36b1e8dc4..668aa4f64ebd207432946adb50d451204f8a235a 100644
--- a/common/constants.h
+++ b/common/constants.h
@@ -2,6 +2,37 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_COMMON_CONSTANTS_H_
+#define FLUTTER_COMMON_CONSTANTS_H_
+
 namespace flutter {
 constexpr double kMegaByteSizeInBytes = (1 << 20);
+
+// The ID for the implicit view if the implicit view is enabled.
+//
+// The implicit view is a compatibility mechanism to help the transition from
+// the older single-view APIs to the newer multi-view APIs. The two sets of APIs
+// use different models for view management. The implicit view mechanism allows
+// single-view APIs to operate a special view as if other views don't exist.
+//
+// In the regular multi-view model, all views should be created by
+// `Shell::AddView` before being used, and removed by `Shell::RemoveView` to
+// signify that they are gone. If a view is added or removed, the framework
+// (`PlatformDispatcher`) will be notified. New view IDs are always unique,
+// never reused. Operating a non-existing view is an error.
+//
+// The implicit view is another special view in addition to the "regular views"
+// as above. The shell starts up having the implicit view, which has a fixed
+// view ID of `kFlutterImplicitViewId` and is available throughout the lifetime
+// of the shell. `Shell::AddView` or `RemoveView` must not be called for this
+// view. Even when the window that shows the view is closed, the framework is
+// unaware and might continue rendering into or operating this view.
+//
+// The single-view APIs, which are APIs that do not specify view IDs, operate
+// the implicit view. The multi-view APIs can operate all views, including the
+// implicit view if the target ID is `kFlutterImplicitViewId`, unless specified
+// otherwise.
+constexpr int64_t kFlutterImplicitViewId = 0;
 }  // namespace flutter
+
+#endif  // FLUTTER_COMMON_CONSTANTS_H_
diff --git a/common/exported_symbols.sym b/common/exported_symbols.sym
index d85c253e3c07b6d44479ae3a5bc6d9daddf56c1a..c9ad42cd3350ed76ced86a22e902803dfac14163 100644
--- a/common/exported_symbols.sym
+++ b/common/exported_symbols.sym
@@ -5,4 +5,6 @@
   kDartVmSnapshotInstructions;
   kDartIsolateSnapshotData;
   kDartIsolateSnapshotInstructions;
+  InternalFlutterGpu*;
+  kInternalFlutterGpu*;
 };
diff --git a/common/exported_symbols_mac.sym b/common/exported_symbols_mac.sym
index c65b740925271c0a3219e3e084d04a1aebe6a595..09687a75427f50975962bd2e80103bb4d821c23b 100644
--- a/common/exported_symbols_mac.sym
+++ b/common/exported_symbols_mac.sym
@@ -4,3 +4,5 @@ _kDartVmSnapshotData
 _kDartVmSnapshotInstructions
 _kDartIsolateSnapshotData
 _kDartIsolateSnapshotInstructions
+_InternalFlutterGpu*
+_kInternalFlutterGpu*
diff --git a/common/exported_test_symbols.sym b/common/exported_test_symbols.sym
new file mode 100644
index 0000000000000000000000000000000000000000..12da485f23a4a1504d407bd24e8957507a6007ad
--- /dev/null
+++ b/common/exported_test_symbols.sym
@@ -0,0 +1,14 @@
+# These symbols are looked up from within the executable at runtime and must
+# be exported in the dynamic symbol table.
+{
+  kDartVmSnapshotData;
+  kDartVmSnapshotInstructions;
+  kDartIsolateSnapshotData;
+  kDartIsolateSnapshotInstructions;
+  InternalFlutterGpu*;
+  kInternalFlutterGpu*;
+  Spawn;
+  LoadLibraryFromKernel;
+  LookupEntryPoint;
+  ForceShutdownIsolate;
+};
diff --git a/common/exported_test_symbols_mac.sym b/common/exported_test_symbols_mac.sym
new file mode 100644
index 0000000000000000000000000000000000000000..83992eeeb9d8917e4827a57a3a418cdc03ee28b7
--- /dev/null
+++ b/common/exported_test_symbols_mac.sym
@@ -0,0 +1,12 @@
+# These symbols are looked up from within the executable at runtime and must
+# be exported in the dynamic symbol table.
+_kDartVmSnapshotData
+_kDartVmSnapshotInstructions
+_kDartIsolateSnapshotData
+_kDartIsolateSnapshotInstructions
+_InternalFlutterGpu*
+_kInternalFlutterGpu*
+_Spawn
+_LoadLibraryFromKernel
+_LookupEntryPoint
+_ForceShutdownIsolate
diff --git a/common/graphics/BUILD.gn b/common/graphics/BUILD.gn
index 480aefb2343420a44b0e13814170e32327c964ce..a9db34c011c919d7189b3a00666c5f1f7dff1866 100644
--- a/common/graphics/BUILD.gn
+++ b/common/graphics/BUILD.gn
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//flutter/common/config.gni")
+import("//flutter/shell/config.gni")
 import("//flutter/testing/testing.gni")
 
 source_set("graphics") {
@@ -23,14 +24,17 @@ source_set("graphics") {
     "//flutter/assets",
     "//flutter/display_list",
     "//flutter/fml",
+    "//flutter/shell/common:base64",
     "//flutter/shell/version:version",
-    "//third_party/boringssl",
-    "//third_party/rapidjson",
-    "//third_party/skia",
+    "//flutter/skia",
+    "//flutter/third_party/boringssl",
+    "//flutter/third_party/rapidjson",
   ]
 
-  public_configs = [
-    "//flutter:config",
-    "//flutter/vulkan:vulkan_config",
-  ]
+  public_configs = [ "//flutter:config" ]
+  if (shell_enable_vulkan) {
+    public_deps = [
+      "//flutter/third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
+    ]
+  }
 }
diff --git a/common/graphics/persistent_cache.cc b/common/graphics/persistent_cache.cc
index 50d09bb8fcbc6d4c93d654004085d1cd8d1884ea..0d24125d1f00b9f14417749f7a1c47f1ef9479c8 100644
--- a/common/graphics/persistent_cache.cc
+++ b/common/graphics/persistent_cache.cc
@@ -18,11 +18,11 @@
 #include "flutter/fml/mapping.h"
 #include "flutter/fml/paths.h"
 #include "flutter/fml/trace_event.h"
+#include "flutter/shell/common/base64.h"
 #include "flutter/shell/version/version.h"
 #include "openssl/sha.h"
 #include "rapidjson/document.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
-#include "third_party/skia/include/utils/SkBase64.h"
 
 namespace flutter {
 
@@ -169,21 +169,21 @@ sk_sp<SkData> ParseBase32(const std::string& input) {
 }
 
 sk_sp<SkData> ParseBase64(const std::string& input) {
-  SkBase64::Error error;
+  Base64::Error error;
 
   size_t output_len;
-  error = SkBase64::Decode(input.c_str(), input.length(), nullptr, &output_len);
-  if (error != SkBase64::Error::kNoError) {
-    FML_LOG(ERROR) << "Base64 decode error: " << error;
+  error = Base64::Decode(input.c_str(), input.length(), nullptr, &output_len);
+  if (error != Base64::Error::kNone) {
+    FML_LOG(ERROR) << "Base64 decode error: " << (int)error;
     FML_LOG(ERROR) << "Base64 can't decode: " << input;
     return nullptr;
   }
 
   sk_sp<SkData> data = SkData::MakeUninitialized(output_len);
   void* output = data->writable_data();
-  error = SkBase64::Decode(input.c_str(), input.length(), output, &output_len);
-  if (error != SkBase64::Error::kNoError) {
-    FML_LOG(ERROR) << "Base64 decode error: " << error;
+  error = Base64::Decode(input.c_str(), input.length(), output, &output_len);
+  if (error != Base64::Error::kNone) {
+    FML_LOG(ERROR) << "Base64 decode error: " << (int)error;
     FML_LOG(ERROR) << "Base64 can't decode: " << input;
     return nullptr;
   }
diff --git a/common/graphics/persistent_cache.h b/common/graphics/persistent_cache.h
index cee0254736a286d73bb1d0744e04d274c5d40966..0b60091f0b8021fbc1c8337f86fb1a03d3a10984 100644
--- a/common/graphics/persistent_cache.h
+++ b/common/graphics/persistent_cache.h
@@ -15,6 +15,8 @@
 #include "flutter/fml/unique_fd.h"
 #include "third_party/skia/include/gpu/GrContextOptions.h"
 
+class GrDirectContext;
+
 namespace flutter {
 
 namespace testing {
diff --git a/common/graphics/texture.cc b/common/graphics/texture.cc
index 318dcc244b928c4a54606c46170f69d894c250e1..74d76c909f823e83e34f9f70dd365eff883e37bd 100644
--- a/common/graphics/texture.cc
+++ b/common/graphics/texture.cc
@@ -26,7 +26,13 @@ void TextureRegistry::RegisterTexture(const std::shared_ptr<Texture>& texture) {
 void TextureRegistry::RegisterContextListener(
     uintptr_t id,
     std::weak_ptr<ContextListener> image) {
-  images_[id] = std::move(image);
+  size_t next_id = image_counter_++;
+  auto const result = image_indices_.insert({id, next_id});
+  if (!result.second) {
+    ordered_images_.erase(result.first->second);
+    result.first->second = next_id;
+  }
+  ordered_images_[next_id] = {next_id, std::move(image)};
 }
 
 void TextureRegistry::UnregisterTexture(int64_t id) {
@@ -39,7 +45,8 @@ void TextureRegistry::UnregisterTexture(int64_t id) {
 }
 
 void TextureRegistry::UnregisterContextListener(uintptr_t id) {
-  images_.erase(id);
+  ordered_images_.erase(image_indices_[id]);
+  image_indices_.erase(id);
 }
 
 void TextureRegistry::OnGrContextCreated() {
@@ -47,11 +54,19 @@ void TextureRegistry::OnGrContextCreated() {
     it.second->OnGrContextCreated();
   }
 
-  for (const auto& [id, weak_image] : images_) {
+  // Calling OnGrContextCreated may result in a subsequent call to
+  // RegisterContextListener from the listener, which may modify the map.
+  std::vector<InsertionOrderMap::value_type> ordered_images(
+      ordered_images_.begin(), ordered_images_.end());
+
+  for (const auto& [id, pair] : ordered_images) {
+    auto index_id = pair.first;
+    auto weak_image = pair.second;
     if (auto image = weak_image.lock()) {
       image->OnGrContextCreated();
     } else {
-      images_.erase(id);
+      image_indices_.erase(index_id);
+      ordered_images_.erase(id);
     }
   }
 }
@@ -61,11 +76,16 @@ void TextureRegistry::OnGrContextDestroyed() {
     it.second->OnGrContextDestroyed();
   }
 
-  for (const auto& [id, weak_image] : images_) {
+  auto it = ordered_images_.begin();
+  while (it != ordered_images_.end()) {
+    auto index_id = it->second.first;
+    auto weak_image = it->second.second;
     if (auto image = weak_image.lock()) {
       image->OnGrContextDestroyed();
+      it++;
     } else {
-      images_.erase(id);
+      image_indices_.erase(index_id);
+      it = ordered_images_.erase(it);
     }
   }
 }
diff --git a/common/graphics/texture.h b/common/graphics/texture.h
index 16a97658d9fed2ab5760529ffc0a376e46069f87..3f4ea4fcecfdeab95302b41b275fcf683cd6e10d 100644
--- a/common/graphics/texture.h
+++ b/common/graphics/texture.h
@@ -7,8 +7,7 @@
 
 #include <map>
 
-#include "flutter/display_list/display_list_builder.h"
-#include "flutter/display_list/display_list_paint.h"
+#include "flutter/display_list/dl_canvas.h"
 #include "flutter/fml/macros.h"
 #include "flutter/fml/synchronization/waitable_event.h"
 #include "third_party/skia/include/core/SkCanvas.h"
@@ -40,12 +39,10 @@ class ContextListener {
 class Texture : public ContextListener {
  public:
   struct PaintContext {
-    SkCanvas* canvas = nullptr;
-    DisplayListBuilder* builder = nullptr;
+    DlCanvas* canvas = nullptr;
     GrDirectContext* gr_context = nullptr;
     impeller::AiksContext* aiks_context = nullptr;
-    const SkPaint* sk_paint = nullptr;
-    const DlPaint* dl_paint = nullptr;
+    const DlPaint* paint = nullptr;
   };
 
   explicit Texture(int64_t id);  // Called from UI or raster thread.
@@ -55,7 +52,7 @@ class Texture : public ContextListener {
   virtual void Paint(PaintContext& context,
                      const SkRect& bounds,
                      bool freeze,
-                     const SkSamplingOptions& sampling) = 0;
+                     const DlImageSampling sampling) = 0;
 
   // Called on raster thread.
   virtual void MarkNewFrameAvailable() = 0;
@@ -98,7 +95,16 @@ class TextureRegistry {
 
  private:
   std::map<int64_t, std::shared_ptr<Texture>> mapping_;
-  std::map<uintptr_t, std::weak_ptr<ContextListener>> images_;
+  size_t image_counter_ = 0;
+  // This map keeps track of registered context listeners by their own
+  // externally provided id. It indexes into ordered_images_.
+  std::map<uintptr_t, size_t> image_indices_;
+  // This map makes sure that iteration of images happens in insertion order
+  // (managed by image_counter_) so that images which depend on other images get
+  // re-created in the right order.
+  using InsertionOrderMap =
+      std::map<size_t, std::pair<uintptr_t, std::weak_ptr<ContextListener>>>;
+  InsertionOrderMap ordered_images_;
 
   FML_DISALLOW_COPY_AND_ASSIGN(TextureRegistry);
 };
diff --git a/common/settings.h b/common/settings.h
index 39017dbc1cd4019cc7b51d5728d7fd503de68310..d6a6946d655b314a593e03b2a8620b8639ec3f78 100644
--- a/common/settings.h
+++ b/common/settings.h
@@ -14,6 +14,7 @@
 #include <string>
 #include <vector>
 
+#include "flutter/fml/build_config.h"
 #include "flutter/fml/closure.h"
 #include "flutter/fml/mapping.h"
 #include "flutter/fml/time/time_point.h"
@@ -21,6 +22,21 @@
 
 namespace flutter {
 
+// The combination of targeted graphics API and Impeller support.
+enum class AndroidRenderingAPI {
+  kSoftware,
+  kImpellerOpenGLES,
+  kImpellerVulkan,
+  kSkiaOpenGLES
+};
+
+// The combination of targeted graphics API and Impeller support.
+enum class OHOSRenderingAPI {
+  kSoftware,
+  kOpenGLES,
+  kImpellerVulkan,
+};
+
 class FrameTiming {
  public:
   enum Phase {
@@ -89,6 +105,9 @@ using FrameRasterizedCallback = std::function<void(const FrameTiming&)>;
 
 class DartIsolate;
 
+// TODO(https://github.com/flutter/flutter/issues/138750): Re-order fields to
+// reduce padding.
+// NOLINTNEXTLINE(clang-analyzer-optin.performance.Padding)
 struct Settings {
   Settings();
 
@@ -96,6 +115,15 @@ struct Settings {
 
   ~Settings();
 
+  /// Determines if attempts at grabbing the Surface's SurfaceData can be
+  /// attempted.
+  static constexpr bool kSurfaceDataAccessible =
+#ifdef _NDEBUG
+      false;
+#else
+      true;
+#endif
+
   // VM settings
   std::string vm_snapshot_data_path;  // deprecated
   MappingCallback vm_snapshot_data;
@@ -136,6 +164,7 @@ struct Settings {
   std::optional<std::vector<std::string>> trace_skia_allowlist;
   bool trace_startup = false;
   bool trace_systrace = false;
+  std::string trace_to_file;
   bool enable_timeline_event_handler = true;
   bool dump_skp_on_shader_compilation = false;
   bool cache_sksl = false;
@@ -161,23 +190,23 @@ struct Settings {
   // Platform.executable from dart:io. If unknown, defaults to "Flutter".
   std::string executable_name = "Flutter";
 
-  // Observatory settings
+  // VM Service settings
 
   // Whether the Dart VM service should be enabled.
-  bool enable_observatory = false;
+  bool enable_vm_service = false;
 
-  // Whether to publish the observatory URL over mDNS.
+  // Whether to publish the VM Service URL over mDNS.
   // On iOS 14 this prompts a local network permission dialog,
   // which cannot be accepted or dismissed in a CI environment.
-  bool enable_observatory_publication = true;
+  bool enable_vm_service_publication = true;
 
   // The IP address to which the Dart VM service is bound.
-  std::string observatory_host;
+  std::string vm_service_host;
 
   // The port to which the Dart VM service is bound. When set to `0`, a free
   // port will be automatically selected by the OS. A message is logged on the
   // target indicating the URL at which the VM service can be accessed.
-  uint32_t observatory_port = 0;
+  uint32_t vm_service_port = 0;
 
   // Determines whether an authentication code is required to communicate with
   // the VM service.
@@ -196,12 +225,40 @@ struct Settings {
   // manager before creating the engine.
   bool prefetched_default_font_manager = false;
 
-  // Selects the SkParagraph implementation of the text layout engine.
-  bool enable_skparagraph = false;
+  // Enable the rendering of colors outside of the sRGB gamut.
+  bool enable_wide_gamut = false;
 
   // Enable the Impeller renderer on supported platforms. Ignored if Impeller is
   // not supported on the platform.
+#if FML_OS_IOS || FML_OS_IOS_SIMULATOR
+  bool enable_impeller = true;
+#else
   bool enable_impeller = false;
+#endif
+
+  // Log a warning during shell initialization if Impeller is not enabled.
+  bool warn_on_impeller_opt_out = false;
+
+  // The selected Android rendering API.
+  AndroidRenderingAPI android_rendering_api =
+      AndroidRenderingAPI::kSkiaOpenGLES;
+
+  // The selected Android rendering API.
+  OHOSRenderingAPI ohos_rendering_api = OHOSRenderingAPI::kOpenGLES;
+
+  // Requests a specific rendering backend.
+  std::optional<std::string> requested_rendering_backend;
+
+  // Enable Vulkan validation on backends that support it. The validation layers
+  // must be available to the application.
+  bool enable_vulkan_validation = false;
+
+  // Enable GPU tracing in GLES backends.
+  // Some devices claim to support the required APIs but crash on their usage.
+  bool enable_opengl_gpu_tracing = false;
+
+  // Enable GPU tracing in Vulkan backends.
+  bool enable_vulkan_gpu_tracing = false;
 
   // Data set by platform-specific embedders for use in font initialization.
   uint32_t font_initialization_data = 0;
@@ -307,6 +364,11 @@ struct Settings {
   /// If it is not 0 or 1, it must be one of 2, 4, 8, or 16. However, if the
   /// GPU does not support the requested sampling value, MSAA will be disabled.
   uint8_t msaa_samples = 0;
+
+  /// Enable embedder api on the embedder.
+  ///
+  /// This is currently only used by iOS.
+  bool enable_embedder_api = false;
 };
 
 }  // namespace flutter
diff --git a/display_list/BUILD.gn b/display_list/BUILD.gn
index 5a49ecf8a8b970efe4a968650038f498d9a6b646..2bbb1e545e4db901663f46194197171935004fc4 100644
--- a/display_list/BUILD.gn
+++ b/display_list/BUILD.gn
@@ -2,123 +2,136 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/fuchsia/sdk.gni")
 import("//flutter/common/config.gni")
 import("//flutter/impeller/tools/impeller.gni")
 import("//flutter/testing/testing.gni")
 
+if (is_fuchsia) {
+  import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
+}
+
+config("display_list_config") {
+  defines = []
+
+  if (impeller_enable_3d) {
+    defines += [ "IMPELLER_ENABLE_3D" ]
+  }
+}
+
 source_set("display_list") {
   sources = [
+    "benchmarking/dl_complexity.cc",
+    "benchmarking/dl_complexity.h",
+    "benchmarking/dl_complexity_gl.cc",
+    "benchmarking/dl_complexity_gl.h",
+    "benchmarking/dl_complexity_metal.cc",
+    "benchmarking/dl_complexity_metal.h",
     "display_list.cc",
     "display_list.h",
-    "display_list_attributes.h",
-    "display_list_blend_mode.cc",
-    "display_list_blend_mode.h",
-    "display_list_builder.cc",
-    "display_list_builder.h",
-    "display_list_builder_multiplexer.cc",
-    "display_list_builder_multiplexer.h",
-    "display_list_canvas_dispatcher.cc",
-    "display_list_canvas_dispatcher.h",
-    "display_list_canvas_recorder.cc",
-    "display_list_canvas_recorder.h",
-    "display_list_color.h",
-    "display_list_color_filter.cc",
-    "display_list_color_filter.h",
-    "display_list_color_source.cc",
-    "display_list_color_source.h",
-    "display_list_complexity.cc",
-    "display_list_complexity.h",
-    "display_list_complexity_gl.cc",
-    "display_list_complexity_gl.h",
-    "display_list_complexity_metal.cc",
-    "display_list_complexity_metal.h",
-    "display_list_dispatcher.cc",
-    "display_list_dispatcher.h",
-    "display_list_flags.cc",
-    "display_list_flags.h",
-    "display_list_image.cc",
-    "display_list_image.h",
-    "display_list_image_filter.cc",
-    "display_list_image_filter.h",
-    "display_list_image_skia.cc",
-    "display_list_image_skia.h",
-    "display_list_mask_filter.cc",
-    "display_list_mask_filter.h",
-    "display_list_matrix_clip_tracker.cc",
-    "display_list_matrix_clip_tracker.h",
-    "display_list_ops.cc",
-    "display_list_ops.h",
-    "display_list_paint.cc",
-    "display_list_paint.h",
-    "display_list_path_effect.cc",
-    "display_list_path_effect.h",
-    "display_list_rtree.cc",
-    "display_list_rtree.h",
-    "display_list_runtime_effect.cc",
-    "display_list_runtime_effect.h",
-    "display_list_sampling_options.h",
-    "display_list_tile_mode.h",
-    "display_list_utils.cc",
-    "display_list_utils.h",
-    "display_list_vertices.cc",
-    "display_list_vertices.h",
-    "types.h",
+    "dl_attributes.h",
+    "dl_blend_mode.cc",
+    "dl_blend_mode.h",
+    "dl_builder.cc",
+    "dl_builder.h",
+    "dl_canvas.cc",
+    "dl_canvas.h",
+    "dl_color.h",
+    "dl_op_flags.cc",
+    "dl_op_flags.h",
+    "dl_op_receiver.cc",
+    "dl_op_receiver.h",
+    "dl_op_records.cc",
+    "dl_op_records.h",
+    "dl_paint.cc",
+    "dl_paint.h",
+    "dl_sampling_options.h",
+    "dl_tile_mode.h",
+    "dl_vertices.cc",
+    "dl_vertices.h",
+    "effects/dl_color_filter.cc",
+    "effects/dl_color_filter.h",
+    "effects/dl_color_source.cc",
+    "effects/dl_color_source.h",
+    "effects/dl_image_filter.cc",
+    "effects/dl_image_filter.h",
+    "effects/dl_mask_filter.cc",
+    "effects/dl_mask_filter.h",
+    "effects/dl_path_effect.cc",
+    "effects/dl_path_effect.h",
+    "effects/dl_runtime_effect.cc",
+    "effects/dl_runtime_effect.h",
+    "geometry/dl_region.cc",
+    "geometry/dl_region.h",
+    "geometry/dl_rtree.cc",
+    "geometry/dl_rtree.h",
+    "image/dl_image.cc",
+    "image/dl_image.h",
+    "image/dl_image_skia.cc",
+    "image/dl_image_skia.h",
+    "skia/dl_sk_canvas.cc",
+    "skia/dl_sk_canvas.h",
+    "skia/dl_sk_conversions.cc",
+    "skia/dl_sk_conversions.h",
+    "skia/dl_sk_dispatcher.cc",
+    "skia/dl_sk_dispatcher.h",
+    "skia/dl_sk_paint_dispatcher.cc",
+    "skia/dl_sk_paint_dispatcher.h",
+    "skia/dl_sk_types.h",
+    "utils/dl_bounds_accumulator.cc",
+    "utils/dl_bounds_accumulator.h",
+    "utils/dl_matrix_clip_tracker.cc",
+    "utils/dl_matrix_clip_tracker.h",
+    "utils/dl_receiver_utils.cc",
+    "utils/dl_receiver_utils.h",
   ]
 
+  public_configs = [ ":display_list_config" ]
+
   public_deps = [
     "//flutter/fml",
     "//flutter/impeller/runtime_stage",
-    "//third_party/skia",
+    "//flutter/impeller/typographer",
+    "//flutter/skia",
   ]
-}
 
-if (enable_unittests) {
-  test_fixtures("display_list_fixtures") {
-    fixtures = []
+  if (!defined(defines)) {
+    defines = []
   }
+}
 
-  source_set("display_list_testing") {
-    testonly = true
-
-    sources = [
-      "display_list_attributes_testing.h",
-      "display_list_test_utils.cc",
-      "display_list_test_utils.h",
-    ]
-
-    deps = [
-      "//flutter/testing:testing_lib",
-      "//third_party/skia",
-    ]
-
-    public_deps = [ ":display_list" ]
-  }
+test_fixtures("display_list_fixtures") {
+  fixtures =
+      [ "//flutter/third_party/txt/third_party/fonts/Roboto-Regular.ttf" ]
+}
 
+if (enable_unittests) {
   executable("display_list_unittests") {
     testonly = true
 
     sources = [
-      "display_list_color_filter_unittests.cc",
-      "display_list_color_source_unittests.cc",
-      "display_list_color_unittests.cc",
-      "display_list_complexity_unittests.cc",
-      "display_list_enum_unittests.cc",
-      "display_list_image_filter_unittests.cc",
-      "display_list_mask_filter_unittests.cc",
-      "display_list_matrix_clip_tracker_unittests.cc",
-      "display_list_paint_unittests.cc",
-      "display_list_path_effect_unittests.cc",
+      "benchmarking/dl_complexity_unittests.cc",
       "display_list_unittests.cc",
-      "display_list_utils_unittests.cc",
-      "display_list_vertices_unittests.cc",
+      "dl_color_unittests.cc",
+      "dl_paint_unittests.cc",
+      "dl_vertices_unittests.cc",
+      "effects/dl_color_filter_unittests.cc",
+      "effects/dl_color_source_unittests.cc",
+      "effects/dl_image_filter_unittests.cc",
+      "effects/dl_mask_filter_unittests.cc",
+      "effects/dl_path_effect_unittests.cc",
+      "geometry/dl_region_unittests.cc",
+      "geometry/dl_rtree_unittests.cc",
+      "skia/dl_sk_conversions_unittests.cc",
+      "skia/dl_sk_paint_dispatcher_unittests.cc",
+      "utils/dl_matrix_clip_tracker_unittests.cc",
     ]
 
     deps = [
       ":display_list",
       ":display_list_fixtures",
-      ":display_list_testing",
+      "//flutter/display_list/testing:display_list_testing",
       "//flutter/testing",
+      "//flutter/testing:skia",
     ]
 
     if (!defined(defines)) {
@@ -129,23 +142,27 @@ if (enable_unittests) {
       defines += [ "_USE_MATH_DEFINES" ]
     }
 
-    # This is needed for //third_party/googletest for linking zircon symbols.
+    # This is needed for //flutter/third_party/googletest for linking zircon
+    # symbols.
     if (is_fuchsia) {
-      libs =
-          [ "${fuchsia_sdk_path}/arch/${target_cpu}/sysroot/lib/libzircon.so" ]
+      libs = [ "${fuchsia_arch_root}/sysroot/lib/libzircon.so" ]
     }
   }
 
   executable("display_list_rendertests") {
     testonly = true
 
-    sources = [ "display_list_canvas_unittests.cc" ]
+    sources = [ "testing/dl_rendering_unittests.cc" ]
 
     deps = [
       ":display_list",
       ":display_list_fixtures",
-      ":display_list_testing",
+      "//flutter/common/graphics",
+      "//flutter/display_list/testing:display_list_surface_provider",
+      "//flutter/display_list/testing:display_list_testing",
+      "//flutter/impeller/typographer/backends/skia:typographer_skia_backend",
       "//flutter/testing",
+      "//flutter/third_party/txt",
     ]
 
     if (!defined(defines)) {
@@ -156,103 +173,73 @@ if (enable_unittests) {
       defines += [ "_USE_MATH_DEFINES" ]
     }
 
-    # This is needed for //third_party/googletest for linking zircon symbols.
+    # This is needed for //flutter/third_party/googletest for linking zircon
+    # symbols.
     if (is_fuchsia) {
-      libs =
-          [ "${fuchsia_sdk_path}/arch/${target_cpu}/sysroot/lib/libzircon.so" ]
+      libs = [ "${fuchsia_arch_root}/sysroot/lib/libzircon.so" ]
     }
   }
 
   executable("display_list_builder_benchmarks") {
     testonly = true
 
-    sources = [ "display_list_builder_benchmarks.cc" ]
+    sources = [ "benchmarking/dl_builder_benchmarks.cc" ]
 
     deps = [
       ":display_list",
       ":display_list_fixtures",
-      ":display_list_testing",
       "//flutter/benchmarking",
+      "//flutter/display_list/testing:display_list_testing",
       "//flutter/testing:testing_lib",
     ]
   }
-}
 
-fixtures_location("display_list_benchmarks_fixtures") {
-  assets_dir = "$target_gen_dir/"
+  executable("display_list_region_benchmarks") {
+    testonly = true
+
+    sources = [ "benchmarking/dl_region_benchmarks.cc" ]
+
+    deps = [
+      ":display_list_fixtures",
+      "//flutter/benchmarking",
+      "//flutter/testing:testing_lib",
+    ]
+  }
+
+  executable("display_list_transform_benchmarks") {
+    testonly = true
+
+    sources = [ "benchmarking/dl_transform_benchmarks.cc" ]
+
+    deps = [
+      ":display_list_fixtures",
+      "//flutter/benchmarking",
+      "//flutter/testing:testing_lib",
+    ]
+  }
 }
 
 source_set("display_list_benchmarks_source") {
   testonly = true
 
   sources = [
-    "display_list_benchmarks.cc",
-    "display_list_benchmarks.h",
+    "benchmarking/dl_benchmarks.cc",
+    "benchmarking/dl_benchmarks.h",
   ]
 
   deps = [
     ":display_list",
-    ":display_list_benchmarks_fixtures",
+    ":display_list_fixtures",
+    "$dart_src/runtime:libdart_jit",  # for tracing
     "//flutter/benchmarking",
     "//flutter/common/graphics",
+    "//flutter/display_list/testing:display_list_surface_provider",
+    "//flutter/display_list/testing:display_list_testing",
     "//flutter/fml",
+    "//flutter/skia",
     "//flutter/testing:skia",
     "//flutter/testing:testing_lib",
-    "//third_party/dart/runtime:libdart_jit",  # for tracing
-    "//third_party/skia",
   ]
-
-  defines = []
-
-  if (is_android) {
-    libs = [
-      "android",
-      "EGL",
-      "GLESv2",
-    ]
-  }
-
-  # We only do software benchmarks on non-mobile platforms
-  if (!is_android && !is_ios) {
-    sources += [
-      "display_list_benchmarks_software.cc",
-      "display_list_benchmarks_software.h",
-    ]
-    defines += [ "ENABLE_SOFTWARE_BENCHMARKS" ]
-  }
-
-  # iOS and Fuchsia don't support OpenGL
-  _enable_gl_benchmarks = !is_fuchsia && !is_ios
-
-  # TODO (https://github.com/flutter/flutter/issues/107357):
-  # impeller_enable_vulkan currently requires skia to not use VMA, which inturn
-  # causes linkage problems with swiftshader.
-  if (impeller_enable_vulkan) {
-    _enable_gl_benchmarks = false
-  }
-
-  if (_enable_gl_benchmarks) {
-    defines += [ "ENABLE_OPENGL_BENCHMARKS" ]
-    sources += [
-      "display_list_benchmarks_gl.cc",
-      "display_list_benchmarks_gl.h",
-    ]
-    deps += [ "//flutter/testing:opengl" ]
-  }
-
-  if (is_mac || is_ios) {
-    defines += [ "ENABLE_METAL_BENCHMARKS" ]
-    sources += [
-      "display_list_benchmarks_metal.cc",
-      "display_list_benchmarks_metal.h",
-    ]
-    deps += [ "//flutter/testing:metal" ]
-  }
-
-  # Don't snapshot test results on mobile platforms
-  if (is_android || is_ios) {
-    defines += [ "BENCHMARKS_NO_SNAPSHOT" ]
-  }
 }
 
 executable("display_list_benchmarks") {
diff --git a/display_list/display_list_benchmarks.cc b/display_list/benchmarking/dl_benchmarks.cc
similarity index 74%
rename from display_list/display_list_benchmarks.cc
rename to display_list/benchmarking/dl_benchmarks.cc
index efc01e3b4d540fbc0bdd1fc41b56f291e664b6d8..d5681864901a3b1c9c25c313a96daeb63091bb88 100644
--- a/display_list/display_list_benchmarks.cc
+++ b/display_list/benchmarking/dl_benchmarks.cc
@@ -2,75 +2,70 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/display_list/display_list_benchmarks.h"
-#include "flutter/display_list/display_list_builder.h"
-#include "flutter/display_list/display_list_flags.h"
-
+#include "flutter/display_list/benchmarking/dl_benchmarks.h"
+#include "flutter/display_list/dl_builder.h"
+#include "flutter/display_list/dl_op_flags.h"
+#include "flutter/display_list/skia/dl_sk_canvas.h"
+#include "flutter/display_list/testing/dl_test_snippets.h"
+
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkPoint.h"
+#include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/core/SkTextBlob.h"
+#include "third_party/skia/include/gpu/GrDirectContext.h"
+#include "third_party/skia/include/gpu/GrRecordingContext.h"
+#include "third_party/skia/include/gpu/GrTypes.h"
 
 namespace flutter {
 namespace testing {
 
-std::unique_ptr<CanvasProvider> CreateCanvasProvider(BackendType backend_type) {
-  switch (backend_type) {
-#ifdef ENABLE_SOFTWARE_BENCHMARKS
-    case kSoftware_Backend:
-      return std::make_unique<SoftwareCanvasProvider>();
-#endif
-#ifdef ENABLE_OPENGL_BENCHMARKS
-    case kOpenGL_Backend:
-      return std::make_unique<OpenGLCanvasProvider>();
-#endif
-#ifdef ENABLE_METAL_BENCHMARKS
-    case kMetal_Backend:
-      return std::make_unique<MetalCanvasProvider>();
-#endif
-    default:
-      return nullptr;
-  }
-
-  return nullptr;
-}
+DlPaint GetPaintForRun(unsigned attributes) {
+  DlPaint paint;
 
-SkPaint GetPaintForRun(unsigned attributes) {
-  SkPaint paint;
-
-  if (attributes & kStrokedStyle_Flag && attributes & kFilledStyle_Flag) {
+  if (attributes & kStrokedStyle && attributes & kFilledStyle) {
     // Not currently exposed by Flutter, but we can probably benchmark this in
     // the future
-    paint.setStyle(SkPaint::kStrokeAndFill_Style);
-  } else if (attributes & kStrokedStyle_Flag) {
-    paint.setStyle(SkPaint::kStroke_Style);
-  } else if (attributes & kFilledStyle_Flag) {
-    paint.setStyle(SkPaint::kFill_Style);
+    paint.setDrawStyle(DlDrawStyle::kStrokeAndFill);
+  } else if (attributes & kStrokedStyle) {
+    paint.setDrawStyle(DlDrawStyle::kStroke);
+  } else if (attributes & kFilledStyle) {
+    paint.setDrawStyle(DlDrawStyle::kFill);
   }
 
-  if (attributes & kHairlineStroke_Flag) {
+  if (attributes & kHairlineStroke) {
     paint.setStrokeWidth(0.0f);
   } else {
     paint.setStrokeWidth(1.0f);
   }
 
-  paint.setAntiAlias(attributes & kAntiAliasing_Flag);
+  paint.setAntiAlias(attributes & kAntiAliasing);
   return paint;
 }
 
+static void FlushSubmitCpuSync(const sk_sp<SkSurface>& surface) {
+  if (!surface) {
+    return;
+  }
+  if (GrDirectContext* dContext =
+          GrAsDirectContext(surface->recordingContext())) {
+    dContext->flushAndSubmit(surface.get(), GrSyncCpu::kYes);
+  }
+}
+
 void AnnotateAttributes(unsigned attributes,
                         benchmark::State& state,
                         const DisplayListAttributeFlags flags) {
   if (flags.always_stroked()) {
-    state.counters["HairlineStroke"] =
-        attributes & kHairlineStroke_Flag ? 1 : 0;
+    state.counters["HairlineStroke"] = attributes & kHairlineStroke ? 1 : 0;
   }
   if (flags.applies_style()) {
-    state.counters["HairlineStroke"] =
-        attributes & kHairlineStroke_Flag ? 1 : 0;
-    state.counters["StrokedStyle"] = attributes & kStrokedStyle_Flag ? 1 : 0;
-    state.counters["FilledStyle"] = attributes & kFilledStyle_Flag ? 1 : 0;
+    state.counters["HairlineStroke"] = attributes & kHairlineStroke ? 1 : 0;
+    state.counters["StrokedStyle"] = attributes & kStrokedStyle ? 1 : 0;
+    state.counters["FilledStyle"] = attributes & kFilledStyle ? 1 : 0;
   }
   if (flags.applies_anti_alias()) {
-    state.counters["AntiAliasing"] = attributes & kAntiAliasing_Flag ? 1 : 0;
+    state.counters["AntiAliasing"] = attributes & kAntiAliasing ? 1 : 0;
   }
 }
 
@@ -94,34 +89,35 @@ constexpr size_t kFixedCanvasSize = 1024;
 void BM_DrawLine(benchmark::State& state,
                  BackendType backend_type,
                  unsigned attributes) {
-  auto canvas_provider = CreateCanvasProvider(backend_type);
+  auto surface_provider = DlSurfaceProvider::Create(backend_type);
   DisplayListBuilder builder;
-  builder.setAttributesFromPaint(GetPaintForRun(attributes),
-                                 DisplayListOpFlags::kDrawLineFlags);
+  DlPaint paint = GetPaintForRun(attributes);
+
   AnnotateAttributes(attributes, state, DisplayListOpFlags::kDrawLineFlags);
 
   size_t length = state.range(0);
 
-  canvas_provider->InitializeSurface(length, length);
-  auto canvas = canvas_provider->GetSurface()->getCanvas();
+  surface_provider->InitializeSurface(length, length);
+  auto surface = surface_provider->GetPrimarySurface()->sk_surface();
+  auto canvas = DlSkCanvasAdapter(surface->getCanvas());
 
   state.counters["DrawCallCount"] = kLinesToDraw;
   for (size_t i = 0; i < kLinesToDraw; i++) {
-    builder.drawLine(SkPoint::Make(i % length, 0),
-                     SkPoint::Make(length - i % length, length));
+    builder.DrawLine(SkPoint::Make(i % length, 0),
+                     SkPoint::Make(length - i % length, length), paint);
   }
 
   auto display_list = builder.Build();
 
   // We only want to time the actual rasterization.
   for ([[maybe_unused]] auto _ : state) {
-    display_list->RenderTo(canvas);
-    canvas_provider->GetSurface()->flushAndSubmit(true);
+    canvas.DrawDisplayList(display_list);
+    FlushSubmitCpuSync(surface);
   }
 
-  auto filename = canvas_provider->BackendName() + "-DrawLine-" +
+  auto filename = surface_provider->backend_name() + "-DrawLine-" +
                   std::to_string(state.range(0)) + ".png";
-  canvas_provider->Snapshot(filename);
+  surface_provider->Snapshot(filename);
 }
 
 // Draws a series of square rects of the requested width across
@@ -131,16 +127,17 @@ void BM_DrawLine(benchmark::State& state,
 void BM_DrawRect(benchmark::State& state,
                  BackendType backend_type,
                  unsigned attributes) {
-  auto canvas_provider = CreateCanvasProvider(backend_type);
+  auto surface_provider = DlSurfaceProvider::Create(backend_type);
   DisplayListBuilder builder;
-  builder.setAttributesFromPaint(GetPaintForRun(attributes),
-                                 DisplayListOpFlags::kDrawRectFlags);
+  DlPaint paint = GetPaintForRun(attributes);
+
   AnnotateAttributes(attributes, state, DisplayListOpFlags::kDrawRectFlags);
 
   size_t length = state.range(0);
   size_t canvas_size = length * 2;
-  canvas_provider->InitializeSurface(canvas_size, canvas_size);
-  auto canvas = canvas_provider->GetSurface()->getCanvas();
+  surface_provider->InitializeSurface(canvas_size, canvas_size);
+  auto surface = surface_provider->GetPrimarySurface()->sk_surface();
+  auto canvas = DlSkCanvasAdapter(surface->getCanvas());
 
   // As rects have SkScalar dimensions, we want to ensure that we also
   // draw rects with non-integer position and size
@@ -149,7 +146,7 @@ void BM_DrawRect(benchmark::State& state,
 
   state.counters["DrawCallCount"] = kRectsToDraw;
   for (size_t i = 0; i < kRectsToDraw; i++) {
-    builder.drawRect(rect);
+    builder.DrawRect(rect, paint);
     rect.offset(offset, offset);
     if (rect.right() > canvas_size) {
       rect.offset(-canvas_size, 0);
@@ -163,13 +160,13 @@ void BM_DrawRect(benchmark::State& state,
 
   // We only want to time the actual rasterization.
   for ([[maybe_unused]] auto _ : state) {
-    display_list->RenderTo(canvas);
-    canvas_provider->GetSurface()->flushAndSubmit(true);
+    canvas.DrawDisplayList(display_list);
+    FlushSubmitCpuSync(surface);
   }
 
-  auto filename = canvas_provider->BackendName() + "-DrawRect-" +
+  auto filename = surface_provider->backend_name() + "-DrawRect-" +
                   std::to_string(state.range(0)) + ".png";
-  canvas_provider->Snapshot(filename);
+  surface_provider->Snapshot(filename);
 }
 
 // Draws a series of ovals of the requested height with aspect ratio 3:2 across
@@ -179,23 +176,24 @@ void BM_DrawRect(benchmark::State& state,
 void BM_DrawOval(benchmark::State& state,
                  BackendType backend_type,
                  unsigned attributes) {
-  auto canvas_provider = CreateCanvasProvider(backend_type);
+  auto surface_provider = DlSurfaceProvider::Create(backend_type);
   DisplayListBuilder builder;
-  builder.setAttributesFromPaint(GetPaintForRun(attributes),
-                                 DisplayListOpFlags::kDrawOvalFlags);
+  DlPaint paint = GetPaintForRun(attributes);
+
   AnnotateAttributes(attributes, state, DisplayListOpFlags::kDrawOvalFlags);
 
   size_t length = state.range(0);
   size_t canvas_size = length * 2;
-  canvas_provider->InitializeSurface(canvas_size, canvas_size);
-  auto canvas = canvas_provider->GetSurface()->getCanvas();
+  surface_provider->InitializeSurface(canvas_size, canvas_size);
+  auto surface = surface_provider->GetPrimarySurface()->sk_surface();
+  auto canvas = DlSkCanvasAdapter(surface->getCanvas());
 
   SkRect rect = SkRect::MakeXYWH(0, 0, length * 1.5f, length);
   const SkScalar offset = 0.5f;
 
   state.counters["DrawCallCount"] = kOvalsToDraw;
   for (size_t i = 0; i < kOvalsToDraw; i++) {
-    builder.drawOval(rect);
+    builder.DrawOval(rect, paint);
     rect.offset(offset, offset);
     if (rect.right() > canvas_size) {
       rect.offset(-canvas_size, 0);
@@ -208,13 +206,13 @@ void BM_DrawOval(benchmark::State& state,
 
   // We only want to time the actual rasterization.
   for ([[maybe_unused]] auto _ : state) {
-    display_list->RenderTo(canvas);
-    canvas_provider->GetSurface()->flushAndSubmit(true);
+    canvas.DrawDisplayList(display_list);
+    FlushSubmitCpuSync(surface);
   }
 
-  auto filename = canvas_provider->BackendName() + "-DrawOval-" +
+  auto filename = surface_provider->backend_name() + "-DrawOval-" +
                   std::to_string(state.range(0)) + ".png";
-  canvas_provider->Snapshot(filename);
+  surface_provider->Snapshot(filename);
 }
 
 // Draws a series of circles of the requested radius across
@@ -224,16 +222,17 @@ void BM_DrawOval(benchmark::State& state,
 void BM_DrawCircle(benchmark::State& state,
                    BackendType backend_type,
                    unsigned attributes) {
-  auto canvas_provider = CreateCanvasProvider(backend_type);
+  auto surface_provider = DlSurfaceProvider::Create(backend_type);
   DisplayListBuilder builder;
-  builder.setAttributesFromPaint(GetPaintForRun(attributes),
-                                 DisplayListOpFlags::kDrawCircleFlags);
+  DlPaint paint = GetPaintForRun(attributes);
+
   AnnotateAttributes(attributes, state, DisplayListOpFlags::kDrawCircleFlags);
 
   size_t length = state.range(0);
   size_t canvas_size = length * 2;
-  canvas_provider->InitializeSurface(canvas_size, canvas_size);
-  auto canvas = canvas_provider->GetSurface()->getCanvas();
+  surface_provider->InitializeSurface(canvas_size, canvas_size);
+  auto surface = surface_provider->GetPrimarySurface()->sk_surface();
+  auto canvas = DlSkCanvasAdapter(surface->getCanvas());
 
   SkScalar radius = length / 2.0f;
   const SkScalar offset = 0.5f;
@@ -242,7 +241,7 @@ void BM_DrawCircle(benchmark::State& state,
 
   state.counters["DrawCallCount"] = kCirclesToDraw;
   for (size_t i = 0; i < kCirclesToDraw; i++) {
-    builder.drawCircle(center, radius);
+    builder.DrawCircle(center, radius, paint);
     center.offset(offset, offset);
     if (center.x() + radius > canvas_size) {
       center.set(radius, center.y());
@@ -255,13 +254,13 @@ void BM_DrawCircle(benchmark::State& state,
 
   // We only want to time the actual rasterization.
   for ([[maybe_unused]] auto _ : state) {
-    display_list->RenderTo(canvas);
-    canvas_provider->GetSurface()->flushAndSubmit(true);
+    canvas.DrawDisplayList(display_list);
+    FlushSubmitCpuSync(surface);
   }
 
-  auto filename = canvas_provider->BackendName() + "-DrawCircle-" +
+  auto filename = surface_provider->backend_name() + "-DrawCircle-" +
                   std::to_string(state.range(0)) + ".png";
-  canvas_provider->Snapshot(filename);
+  surface_provider->Snapshot(filename);
 }
 
 // Draws a series of rounded rects of the requested width across
@@ -272,16 +271,17 @@ void BM_DrawRRect(benchmark::State& state,
                   BackendType backend_type,
                   unsigned attributes,
                   SkRRect::Type type) {
-  auto canvas_provider = CreateCanvasProvider(backend_type);
+  auto surface_provider = DlSurfaceProvider::Create(backend_type);
   DisplayListBuilder builder;
-  builder.setAttributesFromPaint(GetPaintForRun(attributes),
-                                 DisplayListOpFlags::kDrawRRectFlags);
+  DlPaint paint = GetPaintForRun(attributes);
+
   AnnotateAttributes(attributes, state, DisplayListOpFlags::kDrawRRectFlags);
 
   size_t length = state.range(0);
   size_t canvas_size = length * 2;
-  canvas_provider->InitializeSurface(canvas_size, canvas_size);
-  auto canvas = canvas_provider->GetSurface()->getCanvas();
+  surface_provider->InitializeSurface(canvas_size, canvas_size);
+  auto surface = surface_provider->GetPrimarySurface()->sk_surface();
+  auto canvas = DlSkCanvasAdapter(surface->getCanvas());
 
   SkVector radii[4] = {};
   switch (type) {
@@ -319,7 +319,7 @@ void BM_DrawRRect(benchmark::State& state,
 
   state.counters["DrawCallCount"] = kRRectsToDraw;
   for (size_t i = 0; i < kRRectsToDraw; i++) {
-    builder.drawRRect(rrect);
+    builder.DrawRRect(rrect, paint);
     rrect.offset(offset, offset);
     if (rrect.rect().right() > canvas_size) {
       rrect.offset(-canvas_size, 0);
@@ -332,13 +332,13 @@ void BM_DrawRRect(benchmark::State& state,
 
   // We only want to time the actual rasterization.
   for ([[maybe_unused]] auto _ : state) {
-    display_list->RenderTo(canvas);
-    canvas_provider->GetSurface()->flushAndSubmit(true);
+    canvas.DrawDisplayList(display_list);
+    FlushSubmitCpuSync(surface);
   }
 
-  auto filename = canvas_provider->BackendName() + "-DrawRRect-" +
+  auto filename = surface_provider->backend_name() + "-DrawRRect-" +
                   std::to_string(state.range(0)) + ".png";
-  canvas_provider->Snapshot(filename);
+  surface_provider->Snapshot(filename);
 }
 
 // Draws a series of "DR" rects of the requested width across
@@ -352,16 +352,17 @@ void BM_DrawDRRect(benchmark::State& state,
                    BackendType backend_type,
                    unsigned attributes,
                    SkRRect::Type type) {
-  auto canvas_provider = CreateCanvasProvider(backend_type);
+  auto surface_provider = DlSurfaceProvider::Create(backend_type);
   DisplayListBuilder builder;
-  builder.setAttributesFromPaint(GetPaintForRun(attributes),
-                                 DisplayListOpFlags::kDrawDRRectFlags);
+  DlPaint paint = GetPaintForRun(attributes);
+
   AnnotateAttributes(attributes, state, DisplayListOpFlags::kDrawDRRectFlags);
 
   size_t length = state.range(0);
   size_t canvas_size = length * 2;
-  canvas_provider->InitializeSurface(canvas_size, canvas_size);
-  auto canvas = canvas_provider->GetSurface()->getCanvas();
+  surface_provider->InitializeSurface(canvas_size, canvas_size);
+  auto surface = surface_provider->GetPrimarySurface()->sk_surface();
+  auto canvas = DlSkCanvasAdapter(surface->getCanvas());
 
   SkVector radii[4] = {};
   switch (type) {
@@ -400,7 +401,7 @@ void BM_DrawDRRect(benchmark::State& state,
   state.counters["DrawCallCount"] = kDRRectsToDraw;
   for (size_t i = 0; i < kDRRectsToDraw; i++) {
     rrect.inset(0.1f * length, 0.1f * length, &rrect_2);
-    builder.drawDRRect(rrect, rrect_2);
+    builder.DrawDRRect(rrect, rrect_2, paint);
     rrect.offset(offset, offset);
     if (rrect.rect().right() > canvas_size) {
       rrect.offset(-canvas_size, 0);
@@ -413,29 +414,30 @@ void BM_DrawDRRect(benchmark::State& state,
 
   // We only want to time the actual rasterization.
   for ([[maybe_unused]] auto _ : state) {
-    display_list->RenderTo(canvas);
-    canvas_provider->GetSurface()->flushAndSubmit(true);
+    canvas.DrawDisplayList(display_list);
+    FlushSubmitCpuSync(surface);
   }
 
-  auto filename = canvas_provider->BackendName() + "-DrawDRRect-" +
+  auto filename = surface_provider->backend_name() + "-DrawDRRect-" +
                   std::to_string(state.range(0)) + ".png";
-  canvas_provider->Snapshot(filename);
+  surface_provider->Snapshot(filename);
 }
 
 void BM_DrawArc(benchmark::State& state,
                 BackendType backend_type,
                 unsigned attributes) {
-  auto canvas_provider = CreateCanvasProvider(backend_type);
+  auto surface_provider = DlSurfaceProvider::Create(backend_type);
   DisplayListBuilder builder;
-  builder.setAttributesFromPaint(GetPaintForRun(attributes),
-                                 DisplayListOpFlags::kDrawArcNoCenterFlags);
+  DlPaint paint = GetPaintForRun(attributes);
+
   AnnotateAttributes(attributes, state,
                      DisplayListOpFlags::kDrawArcNoCenterFlags);
 
   size_t length = state.range(0);
   size_t canvas_size = length * 2;
-  canvas_provider->InitializeSurface(canvas_size, canvas_size);
-  auto canvas = canvas_provider->GetSurface()->getCanvas();
+  surface_provider->InitializeSurface(canvas_size, canvas_size);
+  auto surface = surface_provider->GetPrimarySurface()->sk_surface();
+  auto canvas = DlSkCanvasAdapter(surface->getCanvas());
 
   SkScalar starting_angle = 0.0f;
   SkScalar offset = 0.5f;
@@ -449,7 +451,7 @@ void BM_DrawArc(benchmark::State& state,
   state.counters["DrawCallCount"] = kArcSweepSetsToDraw * segment_sweeps.size();
   for (size_t i = 0; i < kArcSweepSetsToDraw; i++) {
     for (SkScalar sweep : segment_sweeps) {
-      builder.drawArc(bounds, starting_angle, sweep, false);
+      builder.DrawArc(bounds, starting_angle, sweep, false, paint);
       starting_angle += sweep + 5.0f;
     }
     bounds.offset(offset, offset);
@@ -465,13 +467,13 @@ void BM_DrawArc(benchmark::State& state,
 
   // We only want to time the actual rasterization.
   for ([[maybe_unused]] auto _ : state) {
-    display_list->RenderTo(canvas);
-    canvas_provider->GetSurface()->flushAndSubmit(true);
+    canvas.DrawDisplayList(display_list);
+    FlushSubmitCpuSync(surface);
   }
 
-  auto filename = canvas_provider->BackendName() + "-DrawArc-" +
+  auto filename = surface_provider->backend_name() + "-DrawArc-" +
                   std::to_string(state.range(0)) + ".png";
-  canvas_provider->Snapshot(filename);
+  surface_provider->Snapshot(filename);
 }
 
 // Returns a list of SkPoints that represent `n` points equally spaced out
@@ -640,15 +642,16 @@ void BM_DrawPath(benchmark::State& state,
                  BackendType backend_type,
                  unsigned attributes,
                  SkPath::Verb type) {
-  auto canvas_provider = CreateCanvasProvider(backend_type);
+  auto surface_provider = DlSurfaceProvider::Create(backend_type);
   DisplayListBuilder builder;
-  builder.setAttributesFromPaint(GetPaintForRun(attributes),
-                                 DisplayListOpFlags::kDrawPathFlags);
+  DlPaint paint = GetPaintForRun(attributes);
+
   AnnotateAttributes(attributes, state, DisplayListOpFlags::kDrawPathFlags);
 
   size_t length = kFixedCanvasSize;
-  canvas_provider->InitializeSurface(length, length);
-  auto canvas = canvas_provider->GetSurface()->getCanvas();
+  surface_provider->InitializeSurface(length, length);
+  auto surface = surface_provider->GetPrimarySurface()->sk_surface();
+  auto canvas = DlSkCanvasAdapter(surface->getCanvas());
 
   SkPath path;
 
@@ -662,18 +665,18 @@ void BM_DrawPath(benchmark::State& state,
   state.counters["VerbCount"] = path.countVerbs();
   state.counters["DrawCallCount"] = 1;
 
-  builder.drawPath(path);
+  builder.DrawPath(path, paint);
   auto display_list = builder.Build();
 
   // We only want to time the actual rasterization.
   for ([[maybe_unused]] auto _ : state) {
-    display_list->RenderTo(canvas);
-    canvas_provider->GetSurface()->flushAndSubmit(true);
+    canvas.DrawDisplayList(display_list);
+    FlushSubmitCpuSync(surface);
   }
 
-  auto filename = canvas_provider->BackendName() + "-DrawPath-" + label + "-" +
-                  std::to_string(state.range(0)) + ".png";
-  canvas_provider->Snapshot(filename);
+  auto filename = surface_provider->backend_name() + "-DrawPath-" + label +
+                  "-" + std::to_string(state.range(0)) + ".png";
+  surface_provider->Snapshot(filename);
 }
 
 // Returns a set of vertices that describe a circle that has a
@@ -706,15 +709,15 @@ std::shared_ptr<DlVertices> GetTestVertices(SkPoint center,
       // the center point C, this should create a triangle fan with vertices
       // C, O_0, O_1, O_2, O_3, ...
       vertices.push_back(center);
-      colors.push_back(SK_ColorCYAN);
+      colors.push_back(DlColor(SK_ColorCYAN));
       for (size_t i = 0; i <= outer_points.size(); i++) {
         vertices.push_back(outer_points[i % outer_points.size()]);
         if (i % 3 == 0) {
-          colors.push_back(SK_ColorRED);
+          colors.push_back(DlColor(SK_ColorRED));
         } else if (i % 3 == 1) {
-          colors.push_back(SK_ColorGREEN);
+          colors.push_back(DlColor(SK_ColorGREEN));
         } else {
-          colors.push_back(SK_ColorBLUE);
+          colors.push_back(DlColor(SK_ColorBLUE));
         }
       }
       break;
@@ -724,11 +727,11 @@ std::shared_ptr<DlVertices> GetTestVertices(SkPoint center,
       // vertices O_0, O_1, C, O_1, O_2, C, O_2, O_3, C, ...
       for (size_t i = 0; i < outer_vertex_count; i++) {
         vertices.push_back(outer_points[i % outer_points.size()]);
-        colors.push_back(SK_ColorRED);
+        colors.push_back(DlColor(SK_ColorRED));
         vertices.push_back(outer_points[(i + 1) % outer_points.size()]);
-        colors.push_back(SK_ColorGREEN);
+        colors.push_back(DlColor(SK_ColorGREEN));
         vertices.push_back(center);
-        colors.push_back(SK_ColorBLUE);
+        colors.push_back(DlColor(SK_ColorBLUE));
       }
       break;
     case DlVertexMode::kTriangleStrip:
@@ -737,10 +740,10 @@ std::shared_ptr<DlVertices> GetTestVertices(SkPoint center,
       // O_0, O_1, C, O_2, O_3, C, O_4, O_5, C, ...
       for (size_t i = 0; i <= outer_vertex_count; i++) {
         vertices.push_back(outer_points[i % outer_points.size()]);
-        colors.push_back(i % 2 ? SK_ColorRED : SK_ColorGREEN);
+        colors.push_back(i % 2 ? DlColor(SK_ColorRED) : DlColor(SK_ColorGREEN));
         if (i % 2 == 1) {
           vertices.push_back(center);
-          colors.push_back(SK_ColorBLUE);
+          colors.push_back(DlColor(SK_ColorBLUE));
         }
       }
       break;
@@ -777,15 +780,16 @@ void BM_DrawVertices(benchmark::State& state,
                      BackendType backend_type,
                      unsigned attributes,
                      DlVertexMode mode) {
-  auto canvas_provider = CreateCanvasProvider(backend_type);
+  auto surface_provider = DlSurfaceProvider::Create(backend_type);
   DisplayListBuilder builder;
-  builder.setAttributesFromPaint(GetPaintForRun(attributes),
-                                 DisplayListOpFlags::kDrawVerticesFlags);
+  DlPaint paint = GetPaintForRun(attributes);
+
   AnnotateAttributes(attributes, state, DisplayListOpFlags::kDrawVerticesFlags);
 
   size_t length = kFixedCanvasSize;
-  canvas_provider->InitializeSurface(length, length);
-  auto canvas = canvas_provider->GetSurface()->getCanvas();
+  surface_provider->InitializeSurface(length, length);
+  auto surface = surface_provider->GetPrimarySurface()->sk_surface();
+  auto canvas = DlSkCanvasAdapter(surface->getCanvas());
 
   SkPoint center = SkPoint::Make(length / 2.0f, length / 2.0f);
 
@@ -802,7 +806,7 @@ void BM_DrawVertices(benchmark::State& state,
     std::shared_ptr<DlVertices> vertices =
         GetTestVertices(p, radius, 50, mode, vertex_count);
     total_vertex_count += vertex_count;
-    builder.drawVertices(vertices, DlBlendMode::kSrc);
+    builder.DrawVertices(vertices.get(), DlBlendMode::kSrc, paint);
   }
 
   state.counters["VertexCount"] = total_vertex_count;
@@ -812,14 +816,14 @@ void BM_DrawVertices(benchmark::State& state,
 
   // We only want to time the actual rasterization.
   for ([[maybe_unused]] auto _ : state) {
-    display_list->RenderTo(canvas);
-    canvas_provider->GetSurface()->flushAndSubmit(true);
+    canvas.DrawDisplayList(display_list);
+    FlushSubmitCpuSync(surface);
   }
 
-  auto filename = canvas_provider->BackendName() + "-DrawVertices-" +
+  auto filename = surface_provider->backend_name() + "-DrawVertices-" +
                   std::to_string(disc_count) + "-" + VertexModeToString(mode) +
                   ".png";
-  canvas_provider->Snapshot(filename);
+  surface_provider->Snapshot(filename);
 }
 
 // Generate `count` test points.
@@ -850,13 +854,13 @@ std::vector<SkPoint> GetTestPoints(size_t count, SkISize canvas_size) {
   return points;
 }
 
-std::string PointModeToString(SkCanvas::PointMode mode) {
+std::string PointModeToString(DlCanvas::PointMode mode) {
   switch (mode) {
-    case SkCanvas::kLines_PointMode:
+    case DlCanvas::PointMode::kLines:
       return "Lines";
-    case SkCanvas::kPolygon_PointMode:
+    case DlCanvas::PointMode::kPolygon:
       return "Polygon";
-    case SkCanvas::kPoints_PointMode:
+    case DlCanvas::PointMode::kPoints:
     default:
       return "Points";
   }
@@ -871,37 +875,30 @@ std::string PointModeToString(SkCanvas::PointMode mode) {
 void BM_DrawPoints(benchmark::State& state,
                    BackendType backend_type,
                    unsigned attributes,
-                   SkCanvas::PointMode mode) {
-  auto canvas_provider = CreateCanvasProvider(backend_type);
+                   DlCanvas::PointMode mode) {
+  auto surface_provider = DlSurfaceProvider::Create(backend_type);
   DisplayListBuilder builder;
-  SkPaint paint;
+  DlPaint paint = GetPaintForRun(attributes);
+
   switch (mode) {
-    case SkCanvas::kPoints_PointMode:
-      builder.setAttributesFromPaint(
-          GetPaintForRun(attributes),
-          DisplayListOpFlags::kDrawPointsAsPointsFlags);
+    case DlCanvas::PointMode::kPoints:
       AnnotateAttributes(attributes, state,
                          DisplayListOpFlags::kDrawPointsAsPointsFlags);
       break;
-    case SkCanvas::kLines_PointMode:
-      builder.setAttributesFromPaint(
-          GetPaintForRun(attributes),
-          DisplayListOpFlags::kDrawPointsAsLinesFlags);
+    case DlCanvas::PointMode::kLines:
       AnnotateAttributes(attributes, state,
                          DisplayListOpFlags::kDrawPointsAsLinesFlags);
       break;
-    case SkCanvas::kPolygon_PointMode:
-      builder.setAttributesFromPaint(
-          GetPaintForRun(attributes),
-          DisplayListOpFlags::kDrawPointsAsPolygonFlags);
+    case DlCanvas::PointMode::kPolygon:
       AnnotateAttributes(attributes, state,
                          DisplayListOpFlags::kDrawPointsAsPolygonFlags);
       break;
   }
 
   size_t length = kFixedCanvasSize;
-  canvas_provider->InitializeSurface(length, length);
-  auto canvas = canvas_provider->GetSurface()->getCanvas();
+  surface_provider->InitializeSurface(length, length);
+  auto surface = surface_provider->GetPrimarySurface()->sk_surface();
+  auto canvas = DlSkCanvasAdapter(surface->getCanvas());
 
   size_t point_count = state.range(0);
   state.SetComplexityN(point_count);
@@ -910,19 +907,19 @@ void BM_DrawPoints(benchmark::State& state,
 
   std::vector<SkPoint> points =
       GetTestPoints(point_count, SkISize::Make(length, length));
-  builder.drawPoints(mode, points.size(), points.data());
+  builder.DrawPoints(mode, points.size(), points.data(), paint);
 
   auto display_list = builder.Build();
 
   for ([[maybe_unused]] auto _ : state) {
-    display_list->RenderTo(canvas);
-    canvas_provider->GetSurface()->flushAndSubmit(true);
+    canvas.DrawDisplayList(display_list);
+    FlushSubmitCpuSync(surface);
   }
 
-  auto filename = canvas_provider->BackendName() + "-DrawPoints-" +
+  auto filename = surface_provider->backend_name() + "-DrawPoints-" +
                   PointModeToString(mode) + "-" + std::to_string(point_count) +
                   ".png";
-  canvas_provider->Snapshot(filename);
+  surface_provider->Snapshot(filename);
 }
 
 sk_sp<SkImage> ImageFromBitmapWithNewID(const SkBitmap& bitmap) {
@@ -931,7 +928,7 @@ sk_sp<SkImage> ImageFromBitmapWithNewID(const SkBitmap& bitmap) {
   // so we will avoid hitting the cache.
   SkPixmap pixmap;
   bitmap.peekPixels(&pixmap);
-  return SkImage::MakeFromRaster(pixmap, nullptr, nullptr);
+  return SkImages::RasterFromPixmap(pixmap, nullptr, nullptr);
 }
 
 // Draws `kImagesToDraw` bitmaps to a canvas, either with texture-backed
@@ -941,19 +938,21 @@ void BM_DrawImage(benchmark::State& state,
                   unsigned attributes,
                   DlImageSampling options,
                   bool upload_bitmap) {
-  auto canvas_provider = CreateCanvasProvider(backend_type);
+  auto surface_provider = DlSurfaceProvider::Create(backend_type);
   DisplayListBuilder builder;
-  builder.setAttributesFromPaint(GetPaintForRun(attributes),
-                                 DisplayListOpFlags::kDrawImageWithPaintFlags);
+  DlPaint paint = GetPaintForRun(attributes);
+
   AnnotateAttributes(attributes, state,
                      DisplayListOpFlags::kDrawImageWithPaintFlags);
 
   size_t bitmap_size = state.range(0);
   size_t canvas_size = 2 * bitmap_size;
-  canvas_provider->InitializeSurface(canvas_size, canvas_size);
-  auto canvas = canvas_provider->GetSurface()->getCanvas();
+  surface_provider->InitializeSurface(canvas_size, canvas_size);
+  auto surface = surface_provider->GetPrimarySurface()->sk_surface();
+  auto canvas = DlSkCanvasAdapter(surface->getCanvas());
 
   sk_sp<SkImage> image;
+  std::shared_ptr<DlSurfaceInstance> offscreen_instance;
   sk_sp<SkSurface> offscreen;
   SkBitmap bitmap;
 
@@ -964,7 +963,9 @@ void BM_DrawImage(benchmark::State& state,
     bitmap.allocPixels(info, 0);
     bitmap.eraseColor(SK_ColorBLUE);
   } else {
-    offscreen = canvas_provider->MakeOffscreenSurface(bitmap_size, bitmap_size);
+    offscreen_instance =
+        surface_provider->MakeOffscreenSurface(bitmap_size, bitmap_size);
+    offscreen = offscreen_instance->sk_surface();
     offscreen->getCanvas()->clear(SK_ColorRED);
   }
 
@@ -975,7 +976,7 @@ void BM_DrawImage(benchmark::State& state,
   for (size_t i = 0; i < kImagesToDraw; i++) {
     image = upload_bitmap ? ImageFromBitmapWithNewID(bitmap)
                           : offscreen->makeImageSnapshot();
-    builder.drawImage(DlImage::Make(image), dst, options, true);
+    builder.DrawImage(DlImage::Make(image), dst, options, &paint);
 
     dst.offset(offset, offset);
     if (dst.x() + bitmap_size > canvas_size) {
@@ -989,21 +990,21 @@ void BM_DrawImage(benchmark::State& state,
   auto display_list = builder.Build();
 
   for ([[maybe_unused]] auto _ : state) {
-    display_list->RenderTo(canvas);
-    canvas_provider->GetSurface()->flushAndSubmit(true);
+    canvas.DrawDisplayList(display_list);
+    FlushSubmitCpuSync(surface);
   }
 
-  auto filename = canvas_provider->BackendName() + "-DrawImage-" +
+  auto filename = surface_provider->backend_name() + "-DrawImage-" +
                   (upload_bitmap ? "Upload-" : "Texture-") +
                   std::to_string(bitmap_size) + ".png";
-  canvas_provider->Snapshot(filename);
+  surface_provider->Snapshot(filename);
 }
 
-std::string ConstraintToString(SkCanvas::SrcRectConstraint constraint) {
+std::string ConstraintToString(DlCanvas::SrcRectConstraint constraint) {
   switch (constraint) {
-    case SkCanvas::SrcRectConstraint::kStrict_SrcRectConstraint:
+    case DlCanvas::SrcRectConstraint::kStrict:
       return "Strict";
-    case SkCanvas::SrcRectConstraint::kFast_SrcRectConstraint:
+    case DlCanvas::SrcRectConstraint::kFast:
       return "Fast";
     default:
       return "Unknown";
@@ -1018,22 +1019,23 @@ void BM_DrawImageRect(benchmark::State& state,
                       BackendType backend_type,
                       unsigned attributes,
                       DlImageSampling options,
-                      SkCanvas::SrcRectConstraint constraint,
+                      DlCanvas::SrcRectConstraint constraint,
                       bool upload_bitmap) {
-  auto canvas_provider = CreateCanvasProvider(backend_type);
+  auto surface_provider = DlSurfaceProvider::Create(backend_type);
   DisplayListBuilder builder;
-  builder.setAttributesFromPaint(
-      GetPaintForRun(attributes),
-      DisplayListOpFlags::kDrawImageRectWithPaintFlags);
+  DlPaint paint = GetPaintForRun(attributes);
+
   AnnotateAttributes(attributes, state,
                      DisplayListOpFlags::kDrawImageRectWithPaintFlags);
 
   size_t bitmap_size = state.range(0);
   size_t canvas_size = 2 * bitmap_size;
-  canvas_provider->InitializeSurface(canvas_size, canvas_size);
-  auto canvas = canvas_provider->GetSurface()->getCanvas();
+  surface_provider->InitializeSurface(canvas_size, canvas_size);
+  auto surface = surface_provider->GetPrimarySurface()->sk_surface();
+  auto canvas = DlSkCanvasAdapter(surface->getCanvas());
 
   sk_sp<SkImage> image;
+  std::shared_ptr<DlSurfaceInstance> offscreen_instance;
   sk_sp<SkSurface> offscreen;
   SkBitmap bitmap;
 
@@ -1044,7 +1046,9 @@ void BM_DrawImageRect(benchmark::State& state,
     bitmap.allocPixels(info, 0);
     bitmap.eraseColor(SK_ColorBLUE);
   } else {
-    offscreen = canvas_provider->MakeOffscreenSurface(bitmap_size, bitmap_size);
+    offscreen_instance =
+        surface_provider->MakeOffscreenSurface(bitmap_size, bitmap_size);
+    offscreen = offscreen_instance->sk_surface();
     offscreen->getCanvas()->clear(SK_ColorRED);
   }
 
@@ -1058,7 +1062,7 @@ void BM_DrawImageRect(benchmark::State& state,
   for (size_t i = 0; i < kImagesToDraw; i++) {
     image = upload_bitmap ? ImageFromBitmapWithNewID(bitmap)
                           : offscreen->makeImageSnapshot();
-    builder.drawImageRect(DlImage::Make(image), src, dst, options, true,
+    builder.DrawImageRect(DlImage::Make(image), src, dst, options, &paint,
                           constraint);
     dst.offset(offset, offset);
     if (dst.right() > canvas_size) {
@@ -1072,15 +1076,15 @@ void BM_DrawImageRect(benchmark::State& state,
   auto display_list = builder.Build();
 
   for ([[maybe_unused]] auto _ : state) {
-    display_list->RenderTo(canvas);
-    canvas_provider->GetSurface()->flushAndSubmit(true);
+    canvas.DrawDisplayList(display_list);
+    FlushSubmitCpuSync(surface);
   }
 
-  auto filename = canvas_provider->BackendName() + "-DrawImageRect-" +
+  auto filename = surface_provider->backend_name() + "-DrawImageRect-" +
                   (upload_bitmap ? "Upload-" : "Texture-") +
                   ConstraintToString(constraint) + "-" +
                   std::to_string(bitmap_size) + ".png";
-  canvas_provider->Snapshot(filename);
+  surface_provider->Snapshot(filename);
 }
 
 std::string FilterModeToString(const DlFilterMode mode) {
@@ -1104,23 +1108,24 @@ void BM_DrawImageNine(benchmark::State& state,
                       unsigned attributes,
                       const DlFilterMode filter,
                       bool upload_bitmap) {
-  auto canvas_provider = CreateCanvasProvider(backend_type);
+  auto surface_provider = DlSurfaceProvider::Create(backend_type);
   DisplayListBuilder builder;
-  builder.setAttributesFromPaint(
-      GetPaintForRun(attributes),
-      DisplayListOpFlags::kDrawImageNineWithPaintFlags);
+  DlPaint paint = GetPaintForRun(attributes);
+
   AnnotateAttributes(attributes, state,
                      DisplayListOpFlags::kDrawImageNineWithPaintFlags);
 
   size_t bitmap_size = state.range(0);
   size_t canvas_size = 2 * bitmap_size;
-  canvas_provider->InitializeSurface(canvas_size, canvas_size);
-  auto canvas = canvas_provider->GetSurface()->getCanvas();
+  surface_provider->InitializeSurface(canvas_size, canvas_size);
+  auto surface = surface_provider->GetPrimarySurface()->sk_surface();
+  auto canvas = DlSkCanvasAdapter(surface->getCanvas());
 
   SkIRect center = SkIRect::MakeXYWH(bitmap_size / 4, bitmap_size / 4,
                                      bitmap_size / 2, bitmap_size / 2);
 
   sk_sp<SkImage> image;
+  std::shared_ptr<DlSurfaceInstance> offscreen_instance;
   sk_sp<SkSurface> offscreen;
   SkBitmap bitmap;
 
@@ -1131,7 +1136,9 @@ void BM_DrawImageNine(benchmark::State& state,
     bitmap.allocPixels(info, 0);
     bitmap.eraseColor(SK_ColorBLUE);
   } else {
-    offscreen = canvas_provider->MakeOffscreenSurface(bitmap_size, bitmap_size);
+    offscreen_instance =
+        surface_provider->MakeOffscreenSurface(bitmap_size, bitmap_size);
+    offscreen = offscreen_instance->sk_surface();
     offscreen->getCanvas()->clear(SK_ColorRED);
   }
 
@@ -1143,7 +1150,7 @@ void BM_DrawImageNine(benchmark::State& state,
   for (size_t i = 0; i < kImagesToDraw; i++) {
     image = upload_bitmap ? ImageFromBitmapWithNewID(bitmap)
                           : offscreen->makeImageSnapshot();
-    builder.drawImageNine(DlImage::Make(image), center, dst, filter, true);
+    builder.DrawImageNine(DlImage::Make(image), center, dst, filter, &paint);
     dst.offset(offset, offset);
     if (dst.right() > canvas_size) {
       dst.offsetTo(0, dst.y());
@@ -1156,15 +1163,15 @@ void BM_DrawImageNine(benchmark::State& state,
   auto display_list = builder.Build();
 
   for ([[maybe_unused]] auto _ : state) {
-    display_list->RenderTo(canvas);
-    canvas_provider->GetSurface()->flushAndSubmit(true);
+    canvas.DrawDisplayList(display_list);
+    FlushSubmitCpuSync(surface);
   }
 
-  auto filename = canvas_provider->BackendName() + "-DrawImageNine-" +
+  auto filename = surface_provider->backend_name() + "-DrawImageNine-" +
                   (upload_bitmap ? "Upload-" : "Texture-") +
                   FilterModeToString(filter) + "-" +
                   std::to_string(bitmap_size) + ".png";
-  canvas_provider->Snapshot(filename);
+  surface_provider->Snapshot(filename);
 }
 
 // Draws a series of glyph runs with 32 glyphs in each run. The number of runs
@@ -1177,16 +1184,17 @@ void BM_DrawImageNine(benchmark::State& state,
 void BM_DrawTextBlob(benchmark::State& state,
                      BackendType backend_type,
                      unsigned attributes) {
-  auto canvas_provider = CreateCanvasProvider(backend_type);
+  auto surface_provider = DlSurfaceProvider::Create(backend_type);
   DisplayListBuilder builder;
-  builder.setAttributesFromPaint(GetPaintForRun(attributes),
-                                 DisplayListOpFlags::kDrawTextBlobFlags);
+  DlPaint paint = GetPaintForRun(attributes);
+
   AnnotateAttributes(attributes, state, DisplayListOpFlags::kDrawTextBlobFlags);
 
   size_t draw_calls = state.range(0);
   size_t canvas_size = kFixedCanvasSize;
-  canvas_provider->InitializeSurface(canvas_size, canvas_size);
-  auto canvas = canvas_provider->GetSurface()->getCanvas();
+  surface_provider->InitializeSurface(canvas_size, canvas_size);
+  auto surface = surface_provider->GetPrimarySurface()->sk_surface();
+  auto canvas = DlSkCanvasAdapter(surface->getCanvas());
 
   state.counters["DrawCallCount_Varies"] = draw_calls;
   state.counters["GlyphCount"] = draw_calls;
@@ -1194,20 +1202,20 @@ void BM_DrawTextBlob(benchmark::State& state,
 
   for (size_t i = 0; i < draw_calls; i++) {
     character[0] = 'A' + (i % 26);
-    auto blob = SkTextBlob::MakeFromString(character, SkFont());
-    builder.drawTextBlob(blob, 50.0f, 50.0f);
+    auto blob = SkTextBlob::MakeFromString(character, CreateTestFontOfSize(20));
+    builder.DrawTextBlob(blob, 50.0f, 50.0f, paint);
   }
 
   auto display_list = builder.Build();
 
   for ([[maybe_unused]] auto _ : state) {
-    display_list->RenderTo(canvas);
-    canvas_provider->GetSurface()->flushAndSubmit(true);
+    canvas.DrawDisplayList(display_list);
+    FlushSubmitCpuSync(surface);
   }
 
-  auto filename = canvas_provider->BackendName() + "-DrawTextBlob-" +
+  auto filename = surface_provider->backend_name() + "-DrawTextBlob-" +
                   std::to_string(draw_calls) + ".png";
-  canvas_provider->Snapshot(filename);
+  surface_provider->Snapshot(filename);
 }
 
 // Draw the shadow for a 10-sided regular polygon where the polygon's
@@ -1223,15 +1231,16 @@ void BM_DrawShadow(benchmark::State& state,
                    unsigned attributes,
                    bool transparent_occluder,
                    SkPath::Verb type) {
-  auto canvas_provider = CreateCanvasProvider(backend_type);
+  auto surface_provider = DlSurfaceProvider::Create(backend_type);
   DisplayListBuilder builder;
-  builder.setAttributesFromPaint(GetPaintForRun(attributes),
-                                 DisplayListOpFlags::kDrawShadowFlags);
+  DlPaint paint = GetPaintForRun(attributes);
+
   AnnotateAttributes(attributes, state, DisplayListOpFlags::kDrawShadowFlags);
 
   size_t length = kFixedCanvasSize;
-  canvas_provider->InitializeSurface(length, length);
-  auto canvas = canvas_provider->GetSurface()->getCanvas();
+  surface_provider->InitializeSurface(length, length);
+  auto surface = surface_provider->GetPrimarySurface()->sk_surface();
+  auto canvas = DlSkCanvasAdapter(surface->getCanvas());
 
   SkPath path;
 
@@ -1260,20 +1269,21 @@ void BM_DrawShadow(benchmark::State& state,
 
   // We can hardcode dpr to 1.0f as we're varying elevation, and dpr is only
   // ever used in conjunction with elevation.
-  builder.drawShadow(path, SK_ColorBLUE, elevation, transparent_occluder, 1.0f);
+  builder.DrawShadow(path, DlColor(SK_ColorBLUE), elevation,
+                     transparent_occluder, 1.0f);
   auto display_list = builder.Build();
 
   // We only want to time the actual rasterization.
   for ([[maybe_unused]] auto _ : state) {
-    display_list->RenderTo(canvas);
-    canvas_provider->GetSurface()->flushAndSubmit(true);
+    canvas.DrawDisplayList(display_list);
+    FlushSubmitCpuSync(surface);
   }
 
-  auto filename = canvas_provider->BackendName() + "-DrawShadow-" +
+  auto filename = surface_provider->backend_name() + "-DrawShadow-" +
                   VerbToString(type) + "-" +
                   (transparent_occluder ? "Transparent-" : "Opaque-") +
                   std::to_string(elevation) + "-" + ".png";
-  canvas_provider->Snapshot(filename);
+  surface_provider->Snapshot(filename);
 }
 
 // Calls saveLayer N times from the root canvas layer, and optionally calls
@@ -1286,15 +1296,16 @@ void BM_SaveLayer(benchmark::State& state,
                   BackendType backend_type,
                   unsigned attributes,
                   size_t save_depth) {
-  auto canvas_provider = CreateCanvasProvider(backend_type);
+  auto surface_provider = DlSurfaceProvider::Create(backend_type);
   DisplayListBuilder builder;
-  builder.setAttributesFromPaint(GetPaintForRun(attributes),
-                                 DisplayListOpFlags::kSaveLayerFlags);
+  DlPaint paint = GetPaintForRun(attributes);
+
   AnnotateAttributes(attributes, state, DisplayListOpFlags::kSaveLayerFlags);
 
   size_t length = kFixedCanvasSize;
-  canvas_provider->InitializeSurface(length, length);
-  auto canvas = canvas_provider->GetSurface()->getCanvas();
+  surface_provider->InitializeSurface(length, length);
+  auto surface = surface_provider->GetPrimarySurface()->sk_surface();
+  auto canvas = DlSkCanvasAdapter(surface->getCanvas());
 
   size_t save_layer_calls = state.range(0);
 
@@ -1306,27 +1317,39 @@ void BM_SaveLayer(benchmark::State& state,
   state.counters["DrawCallCount_Varies"] = save_layer_calls * save_depth;
   for (size_t i = 0; i < save_layer_calls; i++) {
     for (size_t j = 0; j < save_depth; j++) {
-      builder.saveLayer(nullptr, false);
-      builder.drawRect(rect1);
-      builder.drawRect(rect2);
+      builder.SaveLayer(nullptr, nullptr);
+      builder.DrawRect(rect1, paint);
+      builder.DrawRect(rect2, paint);
     }
     for (size_t j = 0; j < save_depth; j++) {
-      builder.restore();
+      builder.Restore();
     }
   }
   auto display_list = builder.Build();
 
   // We only want to time the actual rasterization.
   for ([[maybe_unused]] auto _ : state) {
-    display_list->RenderTo(canvas);
-    canvas_provider->GetSurface()->flushAndSubmit(true);
+    canvas.DrawDisplayList(display_list);
+    FlushSubmitCpuSync(surface);
   }
 
-  auto filename = canvas_provider->BackendName() + "-SaveLayer-" +
+  auto filename = surface_provider->backend_name() + "-SaveLayer-" +
                   std::to_string(save_depth) + "-" +
                   std::to_string(save_layer_calls) + ".png";
-  canvas_provider->Snapshot(filename);
+  surface_provider->Snapshot(filename);
 }
 
+#ifdef ENABLE_SOFTWARE_BENCHMARKS
+RUN_DISPLAYLIST_BENCHMARKS(Software)
+#endif
+
+#ifdef ENABLE_OPENGL_BENCHMARKS
+RUN_DISPLAYLIST_BENCHMARKS(OpenGL)
+#endif
+
+#ifdef ENABLE_METAL_BENCHMARKS
+RUN_DISPLAYLIST_BENCHMARKS(Metal)
+#endif
+
 }  // namespace testing
 }  // namespace flutter
diff --git a/display_list/display_list_benchmarks.h b/display_list/benchmarking/dl_benchmarks.h
similarity index 85%
rename from display_list/display_list_benchmarks.h
rename to display_list/benchmarking/dl_benchmarks.h
index 38c27edc8c8c44434b2d7229986ad90d9cd4d466..b0b33d32ebe88286b8e0a8ee6450127a09007097 100644
--- a/display_list/display_list_benchmarks.h
+++ b/display_list/benchmarking/dl_benchmarks.h
@@ -2,12 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKS_H_
-#define FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKS_H_
+#ifndef FLUTTER_DISPLAY_LIST_BENCHMARKING_DL_BENCHMARKS_H_
+#define FLUTTER_DISPLAY_LIST_BENCHMARKING_DL_BENCHMARKS_H_
 
-#include "flutter/display_list/display_list_benchmarks_canvas_provider.h"
-#include "flutter/display_list/display_list_sampling_options.h"
-#include "flutter/display_list/display_list_vertices.h"
+#include "flutter/display_list/dl_canvas.h"
+#include "flutter/display_list/dl_sampling_options.h"
+#include "flutter/display_list/dl_vertices.h"
+#include "flutter/display_list/testing/dl_test_surface_provider.h"
 
 #include "third_party/benchmark/include/benchmark/benchmark.h"
 #include "third_party/skia/include/core/SkCanvas.h"
@@ -16,31 +17,20 @@
 #include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/core/SkVertices.h"
 
-#ifdef ENABLE_SOFTWARE_BENCHMARKS
-#include "flutter/display_list/display_list_benchmarks_software.h"
-#endif
-#ifdef ENABLE_OPENGL_BENCHMARKS
-#include "flutter/display_list/display_list_benchmarks_gl.h"
-#endif
-#ifdef ENABLE_METAL_BENCHMARKS
-#include "flutter/display_list/display_list_benchmarks_metal.h"
-#endif
-
 namespace flutter {
 namespace testing {
 
-typedef enum { kSoftware_Backend, kOpenGL_Backend, kMetal_Backend } BackendType;
-
 enum BenchmarkAttributes {
-  kEmpty_Flag = 0,
-  kStrokedStyle_Flag = 1 << 0,
-  kFilledStyle_Flag = 1 << 1,
-  kHairlineStroke_Flag = 1 << 2,
-  kAntiAliasing_Flag = 1 << 3
+  kEmpty = 0,
+  kStrokedStyle = 1 << 0,
+  kFilledStyle = 1 << 1,
+  kHairlineStroke = 1 << 2,
+  kAntiAliasing = 1 << 3
 };
 
-std::unique_ptr<CanvasProvider> CreateCanvasProvider(BackendType backend_type);
-SkPaint GetPaintForRun(unsigned attributes);
+DlPaint GetPaintForRun(unsigned attributes);
+
+using BackendType = DlSurfaceProvider::BackendType;
 
 // Benchmarks
 
@@ -74,7 +64,7 @@ void BM_DrawPath(benchmark::State& state,
 void BM_DrawPoints(benchmark::State& state,
                    BackendType backend_type,
                    unsigned attributes,
-                   SkCanvas::PointMode mode);
+                   DlCanvas::PointMode mode);
 void BM_DrawVertices(benchmark::State& state,
                      BackendType backend_type,
                      unsigned attributes,
@@ -88,7 +78,7 @@ void BM_DrawImageRect(benchmark::State& state,
                       BackendType backend_type,
                       unsigned attributes,
                       DlImageSampling options,
-                      SkCanvas::SrcRectConstraint constraint,
+                      DlCanvas::SrcRectConstraint constraint,
                       bool upload_bitmap);
 void BM_DrawImageNine(benchmark::State& state,
                       BackendType backend_type,
@@ -112,7 +102,7 @@ void BM_SaveLayer(benchmark::State& state,
 // DrawLine
 #define DRAW_LINE_BENCHMARKS(BACKEND, ATTRIBUTES)                       \
   BENCHMARK_CAPTURE(BM_DrawLine, BACKEND,                               \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES)                                         \
       ->RangeMultiplier(2)                                              \
       ->Range(16, 2048)                                                 \
@@ -122,7 +112,7 @@ void BM_SaveLayer(benchmark::State& state,
 // DrawRect
 #define DRAW_RECT_BENCHMARKS(BACKEND, ATTRIBUTES)                       \
   BENCHMARK_CAPTURE(BM_DrawRect, BACKEND,                               \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES)                                         \
       ->RangeMultiplier(2)                                              \
       ->Range(16, 2048)                                                 \
@@ -132,7 +122,7 @@ void BM_SaveLayer(benchmark::State& state,
 // DrawOval
 #define DRAW_OVAL_BENCHMARKS(BACKEND, ATTRIBUTES)                       \
   BENCHMARK_CAPTURE(BM_DrawOval, BACKEND,                               \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES)                                         \
       ->RangeMultiplier(2)                                              \
       ->Range(16, 2048)                                                 \
@@ -142,7 +132,7 @@ void BM_SaveLayer(benchmark::State& state,
 // DrawCircle
 #define DRAW_CIRCLE_BENCHMARKS(BACKEND, ATTRIBUTES)                     \
   BENCHMARK_CAPTURE(BM_DrawCircle, BACKEND,                             \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES)                                         \
       ->RangeMultiplier(2)                                              \
       ->Range(16, 2048)                                                 \
@@ -152,7 +142,7 @@ void BM_SaveLayer(benchmark::State& state,
 // DrawArc
 #define DRAW_ARC_BENCHMARKS(BACKEND, ATTRIBUTES)                        \
   BENCHMARK_CAPTURE(BM_DrawArc, BACKEND,                                \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES)                                         \
       ->RangeMultiplier(2)                                              \
       ->Range(128, 2048)                                                \
@@ -163,7 +153,7 @@ void BM_SaveLayer(benchmark::State& state,
 #define DRAW_PATH_BENCHMARKS(BACKEND, ATTRIBUTES)                       \
   BENCHMARK_CAPTURE(BM_DrawPath,                                        \
                     Lines/BACKEND,                                      \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES,                                         \
                     SkPath::Verb::kLine_Verb)                           \
       ->RangeMultiplier(2)                                              \
@@ -174,7 +164,7 @@ void BM_SaveLayer(benchmark::State& state,
                                                                         \
   BENCHMARK_CAPTURE(BM_DrawPath,                                        \
                     Quads/BACKEND,                                      \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES,                                         \
                     SkPath::Verb::kQuad_Verb)                           \
       ->RangeMultiplier(2)                                              \
@@ -185,7 +175,7 @@ void BM_SaveLayer(benchmark::State& state,
                                                                         \
   BENCHMARK_CAPTURE(BM_DrawPath,                                        \
                     Conics/BACKEND,                                     \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES,                                         \
                     SkPath::Verb::kConic_Verb)                          \
       ->RangeMultiplier(2)                                              \
@@ -196,7 +186,7 @@ void BM_SaveLayer(benchmark::State& state,
                                                                         \
   BENCHMARK_CAPTURE(BM_DrawPath,                                        \
                     Cubics/BACKEND,                                     \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES,                                         \
                     SkPath::Verb::kCubic_Verb)                          \
       ->RangeMultiplier(2)                                              \
@@ -208,27 +198,27 @@ void BM_SaveLayer(benchmark::State& state,
 // DrawPoints
 #define DRAW_POINTS_BENCHMARKS(BACKEND, ATTRIBUTES)                     \
   BENCHMARK_CAPTURE(BM_DrawPoints, Points/BACKEND,                      \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES,                                         \
-                    SkCanvas::kPoints_PointMode)                        \
+                    DlCanvas::PointMode::kPoints)                       \
       ->RangeMultiplier(2)                                              \
       ->Range(1024, 32768)                                              \
       ->UseRealTime()                                                   \
       ->Unit(benchmark::kMillisecond);                                  \
                                                                         \
   BENCHMARK_CAPTURE(BM_DrawPoints, Lines/BACKEND,                       \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES,                                         \
-                    SkCanvas::kLines_PointMode)                         \
+                    DlCanvas::PointMode::kLines)                        \
       ->RangeMultiplier(2)                                              \
       ->Range(1024, 32768)                                              \
       ->UseRealTime()                                                   \
       ->Unit(benchmark::kMillisecond);                                  \
                                                                         \
   BENCHMARK_CAPTURE(BM_DrawPoints, Polygon/BACKEND,                     \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES,                                         \
-                    SkCanvas::kPolygon_PointMode)                       \
+                    DlCanvas::PointMode::kPolygon)                      \
       ->RangeMultiplier(2)                                              \
       ->Range(1024, 32768)                                              \
       ->UseRealTime()                                                   \
@@ -238,7 +228,7 @@ void BM_SaveLayer(benchmark::State& state,
 #define DRAW_VERTICES_BENCHMARKS(BACKEND, ATTRIBUTES)                   \
   BENCHMARK_CAPTURE(BM_DrawVertices,                                    \
                     TriangleStrip/BACKEND,                              \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES,                                         \
                     DlVertexMode::kTriangleStrip)                       \
       ->RangeMultiplier(2)                                              \
@@ -249,7 +239,7 @@ void BM_SaveLayer(benchmark::State& state,
                                                                         \
   BENCHMARK_CAPTURE(BM_DrawVertices,                                    \
                     TriangleFan/BACKEND,                                \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES,                                         \
                     DlVertexMode::kTriangleFan)                         \
       ->RangeMultiplier(2)                                              \
@@ -260,7 +250,7 @@ void BM_SaveLayer(benchmark::State& state,
                                                                         \
   BENCHMARK_CAPTURE(BM_DrawVertices,                                    \
                     Triangles/BACKEND,                                  \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES,                                         \
                     DlVertexMode::kTriangles)                           \
       ->RangeMultiplier(2)                                              \
@@ -272,7 +262,7 @@ void BM_SaveLayer(benchmark::State& state,
 // DrawRRect
 #define DRAW_RRECT_BENCHMARKS(BACKEND, ATTRIBUTES)                      \
   BENCHMARK_CAPTURE(BM_DrawRRect, Symmetric/BACKEND,                    \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES,                                         \
                     SkRRect::Type::kSimple_Type)                        \
       ->RangeMultiplier(2)                                              \
@@ -281,7 +271,7 @@ void BM_SaveLayer(benchmark::State& state,
       ->Unit(benchmark::kMillisecond);                                  \
                                                                         \
   BENCHMARK_CAPTURE(BM_DrawRRect, NinePatch/BACKEND,                    \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES,                                         \
                     SkRRect::Type::kNinePatch_Type)                     \
       ->RangeMultiplier(2)                                              \
@@ -290,7 +280,7 @@ void BM_SaveLayer(benchmark::State& state,
       ->Unit(benchmark::kMillisecond);                                  \
                                                                         \
   BENCHMARK_CAPTURE(BM_DrawRRect, Complex/BACKEND,                      \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES,                                         \
                     SkRRect::Type::kComplex_Type)                       \
       ->RangeMultiplier(2)                                              \
@@ -301,7 +291,7 @@ void BM_SaveLayer(benchmark::State& state,
 // DrawDRRect
 #define DRAW_DRRECT_BENCHMARKS(BACKEND, ATTRIBUTES)                     \
   BENCHMARK_CAPTURE(BM_DrawDRRect, Symmetric/BACKEND,                   \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES,                                         \
                     SkRRect::Type::kSimple_Type)                        \
       ->RangeMultiplier(2)                                              \
@@ -310,7 +300,7 @@ void BM_SaveLayer(benchmark::State& state,
       ->Unit(benchmark::kMillisecond);                                  \
                                                                         \
   BENCHMARK_CAPTURE(BM_DrawDRRect, NinePatch/BACKEND,                   \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES,                                         \
                     SkRRect::Type::kNinePatch_Type)                     \
       ->RangeMultiplier(2)                                              \
@@ -319,7 +309,7 @@ void BM_SaveLayer(benchmark::State& state,
       ->Unit(benchmark::kMillisecond);                                  \
                                                                         \
   BENCHMARK_CAPTURE(BM_DrawDRRect, Complex/BACKEND,                     \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES,                                         \
                     SkRRect::Type::kComplex_Type)                       \
       ->RangeMultiplier(2)                                              \
@@ -330,7 +320,7 @@ void BM_SaveLayer(benchmark::State& state,
 // DrawImage
 #define DRAW_IMAGE_BENCHMARKS(BACKEND, ATTRIBUTES)                      \
   BENCHMARK_CAPTURE(BM_DrawImage, Texture/BACKEND,                      \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES,                                         \
                     DlImageSampling::kNearestNeighbor, false)                         \
       ->RangeMultiplier(2)                                              \
@@ -339,7 +329,7 @@ void BM_SaveLayer(benchmark::State& state,
       ->Unit(benchmark::kMillisecond);                                  \
                                                                         \
   BENCHMARK_CAPTURE(BM_DrawImage, Upload/BACKEND,                       \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES,                                         \
                     DlImageSampling::kNearestNeighbor, true)                          \
       ->RangeMultiplier(2)                                              \
@@ -351,10 +341,10 @@ void BM_SaveLayer(benchmark::State& state,
 #define DRAW_IMAGE_RECT_BENCHMARKS(BACKEND, ATTRIBUTES)                 \
   BENCHMARK_CAPTURE(                                                    \
       BM_DrawImageRect, Texture/Strict/BACKEND,                         \
-      BackendType::k##BACKEND##_Backend,                                \
+      BackendType::k##BACKEND##Backend,                                \
       ATTRIBUTES,                                                       \
-      DlImageSampling::kNearestNeighbor,                                              \
-      SkCanvas::SrcRectConstraint::kStrict_SrcRectConstraint, false)    \
+      DlImageSampling::kNearestNeighbor,                                \
+      DlCanvas::SrcRectConstraint::kStrict, false)                      \
       ->RangeMultiplier(2)                                              \
       ->Range(32, 256)                                                  \
       ->UseRealTime()                                                   \
@@ -362,10 +352,10 @@ void BM_SaveLayer(benchmark::State& state,
                                                                         \
   BENCHMARK_CAPTURE(                                                    \
       BM_DrawImageRect, Texture/Fast/BACKEND,                           \
-      BackendType::k##BACKEND##_Backend,                                \
+      BackendType::k##BACKEND##Backend,                                \
       ATTRIBUTES,                                                       \
-      DlImageSampling::kNearestNeighbor,                                              \
-      SkCanvas::SrcRectConstraint::kFast_SrcRectConstraint, false)      \
+      DlImageSampling::kNearestNeighbor,                                \
+      DlCanvas::SrcRectConstraint::kFast, false)                        \
       ->RangeMultiplier(2)                                              \
       ->Range(32, 256)                                                  \
       ->UseRealTime()                                                   \
@@ -373,10 +363,10 @@ void BM_SaveLayer(benchmark::State& state,
                                                                         \
   BENCHMARK_CAPTURE(                                                    \
       BM_DrawImageRect, Upload/Strict/BACKEND,                          \
-      BackendType::k##BACKEND##_Backend,                                \
+      BackendType::k##BACKEND##Backend,                                \
       ATTRIBUTES,                                                       \
-      DlImageSampling::kNearestNeighbor,                                              \
-      SkCanvas::SrcRectConstraint::kStrict_SrcRectConstraint, true)     \
+      DlImageSampling::kNearestNeighbor,                                \
+      DlCanvas::SrcRectConstraint::kStrict, true)                       \
       ->RangeMultiplier(2)                                              \
       ->Range(32, 256)                                                  \
       ->UseRealTime()                                                   \
@@ -384,10 +374,10 @@ void BM_SaveLayer(benchmark::State& state,
                                                                         \
   BENCHMARK_CAPTURE(                                                    \
       BM_DrawImageRect, Upload/Fast/BACKEND,                            \
-      BackendType::k##BACKEND##_Backend,                                \
+      BackendType::k##BACKEND##Backend,                                \
       ATTRIBUTES,                                                       \
-      DlImageSampling::kNearestNeighbor,                                              \
-      SkCanvas::SrcRectConstraint::kFast_SrcRectConstraint, true)       \
+      DlImageSampling::kNearestNeighbor,                                \
+      DlCanvas::SrcRectConstraint::kFast, true)                         \
       ->RangeMultiplier(2)                                              \
       ->Range(32, 256)                                                  \
       ->UseRealTime()                                                   \
@@ -396,7 +386,7 @@ void BM_SaveLayer(benchmark::State& state,
 // DrawImageNine
 #define DRAW_IMAGE_NINE_BENCHMARKS(BACKEND, ATTRIBUTES)                 \
   BENCHMARK_CAPTURE(BM_DrawImageNine, Texture/Nearest/BACKEND,          \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES,                                         \
                     DlFilterMode::kNearest, false)                      \
       ->RangeMultiplier(2)                                              \
@@ -405,7 +395,7 @@ void BM_SaveLayer(benchmark::State& state,
       ->Unit(benchmark::kMillisecond);                                  \
                                                                         \
   BENCHMARK_CAPTURE(BM_DrawImageNine, Upload/Nearest/BACKEND,           \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES,                                         \
                     DlFilterMode::kNearest, true)                       \
       ->RangeMultiplier(2)                                              \
@@ -414,7 +404,7 @@ void BM_SaveLayer(benchmark::State& state,
       ->Unit(benchmark::kMillisecond);                                  \
                                                                         \
   BENCHMARK_CAPTURE(BM_DrawImageNine, Texture/Linear/BACKEND,           \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES,                                         \
                     DlFilterMode::kLinear, false)                       \
       ->RangeMultiplier(2)                                              \
@@ -423,7 +413,7 @@ void BM_SaveLayer(benchmark::State& state,
       ->Unit(benchmark::kMillisecond);                                  \
                                                                         \
   BENCHMARK_CAPTURE(BM_DrawImageNine, Upload/Linear/BACKEND,            \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES,                                         \
                     DlFilterMode::kLinear, true)                        \
       ->RangeMultiplier(2)                                              \
@@ -434,7 +424,7 @@ void BM_SaveLayer(benchmark::State& state,
 // DrawTextBlob
 #define DRAW_TEXT_BLOB_BENCHMARKS(BACKEND, ATTRIBUTES)                  \
   BENCHMARK_CAPTURE(BM_DrawTextBlob, BACKEND,                           \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES)                                         \
       ->RangeMultiplier(2)                                              \
       ->Range(1, 256)                                                   \
@@ -445,7 +435,7 @@ void BM_SaveLayer(benchmark::State& state,
 // DrawShadow
 #define DRAW_SHADOW_BENCHMARKS(BACKEND, ATTRIBUTES)                     \
   BENCHMARK_CAPTURE(BM_DrawShadow, Lines/Transparent/BACKEND,           \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES,                                         \
                     true,                                               \
                     SkPath::Verb::kLine_Verb)                           \
@@ -455,7 +445,7 @@ void BM_SaveLayer(benchmark::State& state,
       ->Unit(benchmark::kMillisecond);                                  \
                                                                         \
   BENCHMARK_CAPTURE(BM_DrawShadow, Quads/Transparent/BACKEND,           \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES,                                         \
                     true,                                               \
                     SkPath::Verb::kQuad_Verb)                           \
@@ -465,7 +455,7 @@ void BM_SaveLayer(benchmark::State& state,
       ->Unit(benchmark::kMillisecond);                                  \
                                                                         \
   BENCHMARK_CAPTURE(BM_DrawShadow, Conics/Transparent/BACKEND,          \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES,                                         \
                     true,                                               \
                     SkPath::Verb::kConic_Verb)                          \
@@ -475,7 +465,7 @@ void BM_SaveLayer(benchmark::State& state,
       ->Unit(benchmark::kMillisecond);                                  \
                                                                         \
   BENCHMARK_CAPTURE(BM_DrawShadow, Cubics/Transparent/BACKEND,          \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES,                                         \
                     true,                                               \
                     SkPath::Verb::kCubic_Verb)                          \
@@ -485,7 +475,7 @@ void BM_SaveLayer(benchmark::State& state,
       ->Unit(benchmark::kMillisecond);                                  \
                                                                         \
   BENCHMARK_CAPTURE(BM_DrawShadow, Lines/Opaque/BACKEND,                \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES,                                         \
                     false,                                              \
                     SkPath::Verb::kLine_Verb)                           \
@@ -495,7 +485,7 @@ void BM_SaveLayer(benchmark::State& state,
       ->Unit(benchmark::kMillisecond);                                  \
                                                                         \
   BENCHMARK_CAPTURE(BM_DrawShadow, Quads/Opaque/BACKEND,                \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES,                                         \
                     false,                                              \
                     SkPath::Verb::kQuad_Verb)                           \
@@ -505,7 +495,7 @@ void BM_SaveLayer(benchmark::State& state,
       ->Unit(benchmark::kMillisecond);                                  \
                                                                         \
   BENCHMARK_CAPTURE(BM_DrawShadow, Conics/Opaque/BACKEND,               \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES,                                         \
                     false,                                              \
                     SkPath::Verb::kConic_Verb)                          \
@@ -515,7 +505,7 @@ void BM_SaveLayer(benchmark::State& state,
       ->Unit(benchmark::kMillisecond);                                  \
                                                                         \
   BENCHMARK_CAPTURE(BM_DrawShadow, Cubics/Opaque/BACKEND,               \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES,                                         \
                     false,                                              \
                     SkPath::Verb::kCubic_Verb)                          \
@@ -527,7 +517,7 @@ void BM_SaveLayer(benchmark::State& state,
 // SaveLayer
 #define SAVE_LAYER_BENCHMARKS(BACKEND, ATTRIBUTES)                      \
   BENCHMARK_CAPTURE(BM_SaveLayer, Depth 1/BACKEND,                      \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES,                                         \
                     1)                                                  \
       ->RangeMultiplier(2)                                              \
@@ -536,7 +526,7 @@ void BM_SaveLayer(benchmark::State& state,
       ->Unit(benchmark::kMillisecond);                                  \
                                                                         \
   BENCHMARK_CAPTURE(BM_SaveLayer, Depth 8/BACKEND,                      \
-                    BackendType::k##BACKEND##_Backend,                  \
+                    BackendType::k##BACKEND##Backend,                  \
                     ATTRIBUTES,                                         \
                     8)                                                  \
       ->RangeMultiplier(2)                                              \
@@ -580,21 +570,21 @@ void BM_SaveLayer(benchmark::State& state,
   DRAW_SHADOW_BENCHMARKS(BACKEND, ATTRIBUTES)                            \
   SAVE_LAYER_BENCHMARKS(BACKEND, ATTRIBUTES)
 
-#define RUN_DISPLAYLIST_BENCHMARKS(BACKEND)                              \
-  STROKE_BENCHMARKS(BACKEND, kStrokedStyle_Flag)                         \
-  STROKE_BENCHMARKS(BACKEND, kStrokedStyle_Flag | kAntiAliasing_Flag)    \
-  STROKE_BENCHMARKS(BACKEND, kStrokedStyle_Flag | kHairlineStroke_Flag)  \
-  STROKE_BENCHMARKS(BACKEND, kStrokedStyle_Flag | kHairlineStroke_Flag | \
-                             kAntiAliasing_Flag)                         \
-  FILL_BENCHMARKS(BACKEND, kFilledStyle_Flag)                            \
-  FILL_BENCHMARKS(BACKEND, kFilledStyle_Flag | kAntiAliasing_Flag)       \
-  ANTI_ALIASING_BENCHMARKS(BACKEND, kEmpty_Flag)                         \
-  ANTI_ALIASING_BENCHMARKS(BACKEND, kAntiAliasing_Flag)                  \
-  OTHER_BENCHMARKS(BACKEND, kEmpty_Flag)
+#define RUN_DISPLAYLIST_BENCHMARKS(BACKEND)                        \
+  STROKE_BENCHMARKS(BACKEND, kStrokedStyle)                        \
+  STROKE_BENCHMARKS(BACKEND, kStrokedStyle | kAntiAliasing)        \
+  STROKE_BENCHMARKS(BACKEND, kStrokedStyle | kHairlineStroke)      \
+  STROKE_BENCHMARKS(BACKEND, kStrokedStyle | kHairlineStroke |     \
+                             kAntiAliasing)                         \
+  FILL_BENCHMARKS(BACKEND, kFilledStyle)                            \
+  FILL_BENCHMARKS(BACKEND, kFilledStyle | kAntiAliasing)            \
+  ANTI_ALIASING_BENCHMARKS(BACKEND, kEmpty)                         \
+  ANTI_ALIASING_BENCHMARKS(BACKEND, kAntiAliasing)                  \
+  OTHER_BENCHMARKS(BACKEND, kEmpty)
 
 // clang-format on
 
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKS_H_
+#endif  // FLUTTER_DISPLAY_LIST_BENCHMARKING_DL_BENCHMARKS_H_
diff --git a/display_list/display_list_builder_benchmarks.cc b/display_list/benchmarking/dl_builder_benchmarks.cc
similarity index 71%
rename from display_list/display_list_builder_benchmarks.cc
rename to display_list/benchmarking/dl_builder_benchmarks.cc
index 129eac3abd497a4d6ac529c5349b0bb794bce18a..2b17ce04f4c5f5883428499c9b2a761dfef87967 100644
--- a/display_list/display_list_builder_benchmarks.cc
+++ b/display_list/benchmarking/dl_builder_benchmarks.cc
@@ -3,9 +3,14 @@
 // found in the LICENSE file.
 
 #include "flutter/benchmarking/benchmarking.h"
-#include "flutter/display_list/display_list_test_utils.h"
+#include "flutter/display_list/testing/dl_test_snippets.h"
 
 namespace flutter {
+
+DlOpReceiver& DisplayListBuilderBenchmarkAccessor(DisplayListBuilder& builder) {
+  return builder.asReceiver();
+}
+
 namespace {
 
 static std::vector<testing::DisplayListInvocationGroup> allRenderingOps =
@@ -19,10 +24,11 @@ enum class DisplayListBuilderBenchmarkType {
 };
 
 static void InvokeAllRenderingOps(DisplayListBuilder& builder) {
+  DlOpReceiver& receiver = DisplayListBuilderBenchmarkAccessor(builder);
   for (auto& group : allRenderingOps) {
     for (size_t i = 0; i < group.variants.size(); i++) {
       auto& invocation = group.variants[i];
-      invocation.Invoke(builder);
+      invocation.Invoke(receiver);
     }
   }
 }
@@ -46,12 +52,18 @@ static void Complete(DisplayListBuilder& builder,
   }
 }
 
+bool NeedPrepareRTree(DisplayListBuilderBenchmarkType type) {
+  return type == DisplayListBuilderBenchmarkType::kRtree ||
+         type == DisplayListBuilderBenchmarkType::kBoundsAndRtree;
+}
+
 }  // namespace
 
 static void BM_DisplayListBuilderDefault(benchmark::State& state,
                                          DisplayListBuilderBenchmarkType type) {
+  bool prepare_rtree = NeedPrepareRTree(type);
   while (state.KeepRunning()) {
-    DisplayListBuilder builder;
+    DisplayListBuilder builder(prepare_rtree);
     InvokeAllRenderingOps(builder);
     Complete(builder, type);
   }
@@ -60,10 +72,11 @@ static void BM_DisplayListBuilderDefault(benchmark::State& state,
 static void BM_DisplayListBuilderWithScaleAndTranslate(
     benchmark::State& state,
     DisplayListBuilderBenchmarkType type) {
+  bool prepare_rtree = NeedPrepareRTree(type);
   while (state.KeepRunning()) {
-    DisplayListBuilder builder;
-    builder.scale(3.5, 3.5);
-    builder.translate(10.3, 6.9);
+    DisplayListBuilder builder(prepare_rtree);
+    builder.Scale(3.5, 3.5);
+    builder.Translate(10.3, 6.9);
     InvokeAllRenderingOps(builder);
     Complete(builder, type);
   }
@@ -72,9 +85,10 @@ static void BM_DisplayListBuilderWithScaleAndTranslate(
 static void BM_DisplayListBuilderWithPerspective(
     benchmark::State& state,
     DisplayListBuilderBenchmarkType type) {
+  bool prepare_rtree = NeedPrepareRTree(type);
   while (state.KeepRunning()) {
-    DisplayListBuilder builder;
-    builder.transformFullPerspective(0, 1, 0, 12, 1, 0, 0, 33, 3, 2, 5, 29, 0,
+    DisplayListBuilder builder(prepare_rtree);
+    builder.TransformFullPerspective(0, 1, 0, 12, 1, 0, 0, 33, 3, 2, 5, 29, 0,
                                      0, 0, 12);
     InvokeAllRenderingOps(builder);
     Complete(builder, type);
@@ -85,25 +99,50 @@ static void BM_DisplayListBuilderWithClipRect(
     benchmark::State& state,
     DisplayListBuilderBenchmarkType type) {
   SkRect clip_bounds = SkRect::MakeLTRB(6.5, 7.3, 90.2, 85.7);
+  bool prepare_rtree = NeedPrepareRTree(type);
   while (state.KeepRunning()) {
-    DisplayListBuilder builder;
-    builder.clipRect(clip_bounds, SkClipOp::kIntersect, true);
+    DisplayListBuilder builder(prepare_rtree);
+    builder.ClipRect(clip_bounds, DlCanvas::ClipOp::kIntersect, true);
     InvokeAllRenderingOps(builder);
     Complete(builder, type);
   }
 }
 
+static void BM_DisplayListBuilderWithGlobalSaveLayer(
+    benchmark::State& state,
+    DisplayListBuilderBenchmarkType type) {
+  bool prepare_rtree = NeedPrepareRTree(type);
+  while (state.KeepRunning()) {
+    DisplayListBuilder builder(prepare_rtree);
+    builder.Scale(3.5, 3.5);
+    builder.Translate(10.3, 6.9);
+    builder.SaveLayer(nullptr, nullptr);
+    builder.Translate(45.3, 27.9);
+    DlOpReceiver& receiver = DisplayListBuilderBenchmarkAccessor(builder);
+    for (auto& group : allRenderingOps) {
+      for (size_t i = 0; i < group.variants.size(); i++) {
+        auto& invocation = group.variants[i];
+        invocation.Invoke(receiver);
+      }
+    }
+    builder.Restore();
+    Complete(builder, type);
+  }
+}
+
 static void BM_DisplayListBuilderWithSaveLayer(
     benchmark::State& state,
     DisplayListBuilderBenchmarkType type) {
+  bool prepare_rtree = NeedPrepareRTree(type);
   while (state.KeepRunning()) {
-    DisplayListBuilder builder;
+    DisplayListBuilder builder(prepare_rtree);
+    DlOpReceiver& receiver = DisplayListBuilderBenchmarkAccessor(builder);
     for (auto& group : allRenderingOps) {
       for (size_t i = 0; i < group.variants.size(); i++) {
         auto& invocation = group.variants[i];
-        builder.saveLayer(nullptr, false);
-        invocation.Invoke(builder);
-        builder.restore();
+        builder.SaveLayer(nullptr, nullptr);
+        invocation.Invoke(receiver);
+        builder.Restore();
       }
     }
     Complete(builder, type);
@@ -116,14 +155,16 @@ static void BM_DisplayListBuilderWithSaveLayerAndImageFilter(
   DlPaint layer_paint;
   layer_paint.setImageFilter(&testing::kTestBlurImageFilter1);
   SkRect layer_bounds = SkRect::MakeLTRB(6.5, 7.3, 35.2, 42.7);
+  bool prepare_rtree = NeedPrepareRTree(type);
   while (state.KeepRunning()) {
-    DisplayListBuilder builder;
+    DisplayListBuilder builder(prepare_rtree);
+    DlOpReceiver& receiver = DisplayListBuilderBenchmarkAccessor(builder);
     for (auto& group : allRenderingOps) {
       for (size_t i = 0; i < group.variants.size(); i++) {
         auto& invocation = group.variants[i];
-        builder.saveLayer(&layer_bounds, &layer_paint);
-        invocation.Invoke(builder);
-        builder.restore();
+        builder.SaveLayer(&layer_bounds, &layer_paint);
+        invocation.Invoke(receiver);
+        builder.Restore();
       }
     }
     Complete(builder, type);
@@ -198,6 +239,23 @@ BENCHMARK_CAPTURE(BM_DisplayListBuilderWithClipRect,
                   DisplayListBuilderBenchmarkType::kBoundsAndRtree)
     ->Unit(benchmark::kMicrosecond);
 
+BENCHMARK_CAPTURE(BM_DisplayListBuilderWithGlobalSaveLayer,
+                  kDefault,
+                  DisplayListBuilderBenchmarkType::kDefault)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_DisplayListBuilderWithGlobalSaveLayer,
+                  kBounds,
+                  DisplayListBuilderBenchmarkType::kBounds)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_DisplayListBuilderWithGlobalSaveLayer,
+                  kRtree,
+                  DisplayListBuilderBenchmarkType::kRtree)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_DisplayListBuilderWithGlobalSaveLayer,
+                  kBoundsAndRtree,
+                  DisplayListBuilderBenchmarkType::kBoundsAndRtree)
+    ->Unit(benchmark::kMicrosecond);
+
 BENCHMARK_CAPTURE(BM_DisplayListBuilderWithSaveLayer,
                   kDefault,
                   DisplayListBuilderBenchmarkType::kDefault)
diff --git a/display_list/display_list_complexity.cc b/display_list/benchmarking/dl_complexity.cc
similarity index 85%
rename from display_list/display_list_complexity.cc
rename to display_list/benchmarking/dl_complexity.cc
index 1823088816b1c13bf7989d410cca9602657b894d..cda80c6e5bc095505b6c4dab150d92c7690bc5d5 100644
--- a/display_list/display_list_complexity.cc
+++ b/display_list/benchmarking/dl_complexity.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/display_list/display_list_complexity.h"
+#include "flutter/display_list/benchmarking/dl_complexity.h"
+#include "flutter/display_list/benchmarking/dl_complexity_gl.h"
+#include "flutter/display_list/benchmarking/dl_complexity_metal.h"
 #include "flutter/display_list/display_list.h"
-#include "flutter/display_list/display_list_complexity_gl.h"
-#include "flutter/display_list/display_list_complexity_metal.h"
 
 namespace flutter {
 
diff --git a/display_list/display_list_complexity.h b/display_list/benchmarking/dl_complexity.h
similarity index 83%
rename from display_list/display_list_complexity.h
rename to display_list/benchmarking/dl_complexity.h
index f6a838865ee4ca449fa1e06d623fdc99f38b89dd..6cbf1de0a3622905eccddd579d5221e5624c5389 100644
--- a/display_list/display_list_complexity.h
+++ b/display_list/benchmarking/dl_complexity.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLOW_DISPLAY_LIST_COMPLEXITY_H_
-#define FLUTTER_FLOW_DISPLAY_LIST_COMPLEXITY_H_
+#ifndef FLUTTER_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_H_
+#define FLUTTER_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_H_
 
 #include "flutter/display_list/display_list.h"
-#include "flutter/display_list/types.h"
+
 #include "third_party/skia/include/gpu/GrTypes.h"
 
 namespace flutter {
@@ -19,7 +19,7 @@ class DisplayListComplexityCalculator {
   virtual ~DisplayListComplexityCalculator() = default;
 
   // Returns a calculated complexity score for a given DisplayList object
-  virtual unsigned int Compute(DisplayList* display_list) = 0;
+  virtual unsigned int Compute(const DisplayList* display_list) = 0;
 
   // Returns whether a given complexity score meets the threshold for
   // cacheability for this particular ComplexityCalculator
@@ -38,7 +38,7 @@ class DisplayListNaiveComplexityCalculator
  public:
   static DisplayListComplexityCalculator* GetInstance();
 
-  unsigned int Compute(DisplayList* display_list) override {
+  unsigned int Compute(const DisplayList* display_list) override {
     return display_list->op_count(true);
   }
 
@@ -55,4 +55,4 @@ class DisplayListNaiveComplexityCalculator
 
 }  // namespace flutter
 
-#endif  // FLUTTER_FLOW_DISPLAY_LIST_COMPLEXITY_H_
+#endif  // FLUTTER_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_H_
diff --git a/display_list/display_list_complexity_gl.cc b/display_list/benchmarking/dl_complexity_gl.cc
similarity index 90%
rename from display_list/display_list_complexity_gl.cc
rename to display_list/benchmarking/dl_complexity_gl.cc
index 9391253ee3b14301f9244da86cad02a489065709..a1f4c79de5d1920e24d0aad6b19a99161a2b42bd 100644
--- a/display_list/display_list_complexity_gl.cc
+++ b/display_list/benchmarking/dl_complexity_gl.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/display_list/display_list_complexity_gl.h"
+#include "flutter/display_list/benchmarking/dl_complexity_gl.h"
 
 // The numbers and weightings used in this file stem from taking the
 // data from the DisplayListBenchmarks suite run on an Pixel 4 and
@@ -49,7 +49,7 @@ unsigned int DisplayListGLComplexityCalculator::GLHelper::BatchedComplexity() {
 }
 
 void DisplayListGLComplexityCalculator::GLHelper::saveLayer(
-    const SkRect* bounds,
+    const SkRect& bounds,
     const SaveLayerOptions options,
     const DlImageFilter* backdrop) {
   if (IsComplex()) {
@@ -114,7 +114,7 @@ void DisplayListGLComplexityCalculator::GLHelper::drawRect(const SkRect& rect) {
   //
   // There is also a kStrokeAndFill_Style that Skia exposes, but we do not
   // currently use it anywhere in Flutter.
-  if (Style() == SkPaint::Style::kFill_Style) {
+  if (DrawStyle() == DlDrawStyle::kFill) {
     // No real difference for AA with filled styles
     unsigned int area = rect.width() * rect.height();
 
@@ -165,7 +165,7 @@ void DisplayListGLComplexityCalculator::GLHelper::drawOval(
 
   // There is also a kStrokeAndFill_Style that Skia exposes, but we do not
   // currently use it anywhere in Flutter.
-  if (Style() == SkPaint::Style::kFill_Style) {
+  if (DrawStyle() == DlDrawStyle::kFill) {
     // With filled styles, there is no significant AA penalty.
     // m = 1/6000
     // c = 0
@@ -199,7 +199,7 @@ void DisplayListGLComplexityCalculator::GLHelper::drawCircle(
 
   // There is also a kStrokeAndFill_Style that Skia exposes, but we do not
   // currently use it anywhere in Flutter.
-  if (Style() == SkPaint::Style::kFill_Style) {
+  if (DrawStyle() == DlDrawStyle::kFill) {
     // We can ignore pi here
     unsigned int area = radius * radius;
     // m = 1/525
@@ -245,7 +245,7 @@ void DisplayListGLComplexityCalculator::GLHelper::drawRRect(
   // These values were worked out by creating a straight line graph (y=mx+c)
   // approximately matching the measured data, normalising the data so that
   // 0.0005ms resulted in a score of 100 then simplifying down the formula.
-  if (Style() == SkPaint::Style::kFill_Style ||
+  if (DrawStyle() == DlDrawStyle::kFill ||
       ((rrect.getType() == SkRRect::Type::kSimple_Type) && IsAntiAliased())) {
     unsigned int area = rrect.width() * rrect.height();
     // m = 1/3200
@@ -295,7 +295,7 @@ void DisplayListGLComplexityCalculator::GLHelper::drawDRRect(
   //
   // There is also a kStrokeAndFill_Style that Skia exposes, but we do not
   // currently use it anywhere in Flutter.
-  if (Style() == SkPaint::Style::kFill_Style) {
+  if (DrawStyle() == DlDrawStyle::kFill) {
     unsigned int area = outer.width() * outer.height();
     if (outer.getType() == SkRRect::Type::kComplex_Type) {
       // m = 1/500
@@ -382,7 +382,7 @@ void DisplayListGLComplexityCalculator::GLHelper::drawArc(
   //
   // There is also a kStrokeAndFill_Style that Skia exposes, but we do not
   // currently use it anywhere in Flutter.
-  if (Style() == SkPaint::Style::kStroke_Style) {
+  if (DrawStyle() == DlDrawStyle::kStroke) {
     if (IsAntiAliased()) {
       // m = 1/3800
       // c = 12
@@ -414,7 +414,7 @@ void DisplayListGLComplexityCalculator::GLHelper::drawArc(
 }
 
 void DisplayListGLComplexityCalculator::GLHelper::drawPoints(
-    SkCanvas::PointMode mode,
+    DlCanvas::PointMode mode,
     uint32_t count,
     const SkPoint points[]) {
   if (IsComplex()) {
@@ -423,7 +423,7 @@ void DisplayListGLComplexityCalculator::GLHelper::drawPoints(
   unsigned int complexity;
 
   if (IsAntiAliased()) {
-    if (mode == SkCanvas::kPoints_PointMode) {
+    if (mode == DlCanvas::PointMode::kPoints) {
       if (IsHairline()) {
         // This is a special case, it triggers an extremely fast path.
         // m = 1/4500
@@ -434,7 +434,7 @@ void DisplayListGLComplexityCalculator::GLHelper::drawPoints(
         // c = 0
         complexity = count * 400;
       }
-    } else if (mode == SkCanvas::kLines_PointMode) {
+    } else if (mode == DlCanvas::PointMode::kLines) {
       if (IsHairline()) {
         // m = 1/750
         // c = 0
@@ -456,12 +456,12 @@ void DisplayListGLComplexityCalculator::GLHelper::drawPoints(
       }
     }
   } else {
-    if (mode == SkCanvas::kPoints_PointMode) {
+    if (mode == DlCanvas::PointMode::kPoints) {
       // Hairline vs non hairline makes no difference for points without AA.
       // m = 1/18000
       // c = 0.25
       complexity = (count + 4500) * 100 / 9;
-    } else if (mode == SkCanvas::kLines_PointMode) {
+    } else if (mode == DlCanvas::PointMode::kLines) {
       if (IsHairline()) {
         // m = 1/8500
         // c = 0.25
@@ -483,34 +483,6 @@ void DisplayListGLComplexityCalculator::GLHelper::drawPoints(
   AccumulateComplexity(complexity);
 }
 
-void DisplayListGLComplexityCalculator::GLHelper::drawSkVertices(
-    const sk_sp<SkVertices> vertices,
-    SkBlendMode mode) {
-  // There is currently no way for us to get the VertexMode from the SkVertices
-  // object, but for future reference:
-  //
-  // TriangleStrip is roughly 25% more expensive than TriangleFan.
-  // TriangleFan is roughly 5% more expensive than Triangles.
-
-  // There is currently no way for us to get the vertex count from an SkVertices
-  // object, so we have to estimate it from the approximate size.
-  //
-  // Approximate size returns the sum of the sizes of the positions (SkPoint),
-  // texs (SkPoint), colors (SkColor) and indices (uint16_t) arrays multiplied
-  // by sizeof(type). As a very, very rough estimate, divide that by 20 to get
-  // an idea of the vertex count.
-  unsigned int approximate_vertex_count = vertices->approximateSize() / 20;
-
-  // For the baseline, it's hard to identify the trend. It might be O(n^1/2)
-  // For now, treat it as linear as an approximation.
-  //
-  // m = 1/1600
-  // c = 1
-  unsigned int complexity = (approximate_vertex_count + 1600) * 250 / 2;
-
-  AccumulateComplexity(complexity);
-}
-
 void DisplayListGLComplexityCalculator::GLHelper::drawVertices(
     const DlVertices* vertices,
     DlBlendMode mode) {
@@ -578,7 +550,7 @@ void DisplayListGLComplexityCalculator::GLHelper::ImageRect(
     const SkISize& size,
     bool texture_backed,
     bool render_with_attributes,
-    SkCanvas::SrcRectConstraint constraint) {
+    bool enforce_src_edges) {
   if (IsComplex()) {
     return;
   }
@@ -591,10 +563,8 @@ void DisplayListGLComplexityCalculator::GLHelper::ImageRect(
   // approximately matching the measured data, normalising the data so that
   // 0.0005ms resulted in a score of 100 then simplifying down the formula.
   unsigned int complexity;
-  if (!texture_backed ||
-      (texture_backed && render_with_attributes &&
-       constraint == SkCanvas::SrcRectConstraint::kStrict_SrcRectConstraint &&
-       IsAntiAliased())) {
+  if (!texture_backed || (texture_backed && render_with_attributes &&
+                          enforce_src_edges && IsAntiAliased())) {
     unsigned int area = size.width() * size.height();
     // m = 1/4000
     // c = 5
@@ -638,11 +608,16 @@ void DisplayListGLComplexityCalculator::GLHelper::drawImageNine(
 }
 
 void DisplayListGLComplexityCalculator::GLHelper::drawDisplayList(
-    const sk_sp<DisplayList> display_list) {
+    const sk_sp<DisplayList> display_list,
+    SkScalar opacity) {
   if (IsComplex()) {
     return;
   }
   GLHelper helper(Ceiling() - CurrentComplexityScore());
+  if (opacity < SK_Scalar1 && !display_list->can_apply_group_opacity()) {
+    auto bounds = display_list->bounds();
+    helper.saveLayer(bounds, SaveLayerOptions::kWithAttributes, nullptr);
+  }
   display_list->Dispatch(helper);
   AccumulateComplexity(helper.ComplexityScore());
 }
@@ -663,6 +638,11 @@ void DisplayListGLComplexityCalculator::GLHelper::drawTextBlob(
   draw_text_blob_count_++;
 }
 
+void DisplayListGLComplexityCalculator::GLHelper::drawTextFrame(
+    const std::shared_ptr<impeller::TextFrame>& text_frame,
+    SkScalar x,
+    SkScalar y) {}
+
 void DisplayListGLComplexityCalculator::GLHelper::drawShadow(
     const SkPath& path,
     const DlColor color,
diff --git a/display_list/display_list_complexity_gl.h b/display_list/benchmarking/dl_complexity_gl.h
similarity index 75%
rename from display_list/display_list_complexity_gl.h
rename to display_list/benchmarking/dl_complexity_gl.h
index bcc81bfab592a7795a1193efba6e3e29383d074b..c30926902ade3894b99cf3fb04d7e2c3358bef65 100644
--- a/display_list/display_list_complexity_gl.h
+++ b/display_list/benchmarking/dl_complexity_gl.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLOW_DISPLAY_LIST_COMPLEXITY_GL_H_
-#define FLUTTER_FLOW_DISPLAY_LIST_COMPLEXITY_GL_H_
+#ifndef FLUTTER_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_GL_H_
+#define FLUTTER_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_GL_H_
 
-#include "flutter/display_list/display_list_complexity_helper.h"
+#include "flutter/display_list/benchmarking/dl_complexity_helper.h"
 
 namespace flutter {
 
@@ -14,7 +14,7 @@ class DisplayListGLComplexityCalculator
  public:
   static DisplayListGLComplexityCalculator* GetInstance();
 
-  unsigned int Compute(DisplayList* display_list) override {
+  unsigned int Compute(const DisplayList* display_list) override {
     GLHelper helper(ceiling_);
     display_list->Dispatch(helper);
     return helper.ComplexityScore();
@@ -32,12 +32,10 @@ class DisplayListGLComplexityCalculator
  private:
   class GLHelper : public ComplexityCalculatorHelper {
    public:
-    GLHelper(unsigned int ceiling)
-        : ComplexityCalculatorHelper(ceiling),
-          save_layer_count_(0),
-          draw_text_blob_count_(0) {}
+    explicit GLHelper(unsigned int ceiling)
+        : ComplexityCalculatorHelper(ceiling) {}
 
-    void saveLayer(const SkRect* bounds,
+    void saveLayer(const SkRect& bounds,
                    const SaveLayerOptions options,
                    const DlImageFilter* backdrop) override;
 
@@ -52,10 +50,9 @@ class DisplayListGLComplexityCalculator
                  SkScalar start_degrees,
                  SkScalar sweep_degrees,
                  bool use_center) override;
-    void drawPoints(SkCanvas::PointMode mode,
+    void drawPoints(DlCanvas::PointMode mode,
                     uint32_t count,
                     const SkPoint points[]) override;
-    void drawSkVertices(const sk_sp<SkVertices>, SkBlendMode mode) override;
     void drawVertices(const DlVertices* vertices, DlBlendMode mode) override;
     void drawImage(const sk_sp<DlImage> image,
                    const SkPoint point,
@@ -66,10 +63,14 @@ class DisplayListGLComplexityCalculator
                        const SkRect& dst,
                        DlFilterMode filter,
                        bool render_with_attributes) override;
-    void drawDisplayList(const sk_sp<DisplayList> display_list) override;
+    void drawDisplayList(const sk_sp<DisplayList> display_list,
+                         SkScalar opacity) override;
     void drawTextBlob(const sk_sp<SkTextBlob> blob,
                       SkScalar x,
                       SkScalar y) override;
+    void drawTextFrame(const std::shared_ptr<impeller::TextFrame>& text_frame,
+                       SkScalar x,
+                       SkScalar y) override;
     void drawShadow(const SkPath& path,
                     const DlColor color,
                     const SkScalar elevation,
@@ -80,13 +81,13 @@ class DisplayListGLComplexityCalculator
     void ImageRect(const SkISize& size,
                    bool texture_backed,
                    bool render_with_attributes,
-                   SkCanvas::SrcRectConstraint constraint) override;
+                   bool enforce_src_edges) override;
 
     unsigned int BatchedComplexity() override;
 
    private:
-    unsigned int save_layer_count_;
-    unsigned int draw_text_blob_count_;
+    unsigned int save_layer_count_ = 0;
+    unsigned int draw_text_blob_count_ = 0;
   };
 
   DisplayListGLComplexityCalculator()
@@ -98,4 +99,4 @@ class DisplayListGLComplexityCalculator
 
 }  // namespace flutter
 
-#endif  // FLUTTER_FLOW_DISPLAY_LIST_COMPLEXITY_GL_H_
+#endif  // FLUTTER_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_GL_H_
diff --git a/display_list/display_list_complexity_helper.h b/display_list/benchmarking/dl_complexity_helper.h
similarity index 78%
rename from display_list/display_list_complexity_helper.h
rename to display_list/benchmarking/dl_complexity_helper.h
index 6752e96bac6a46d908bcc1909954d42090003b76..13253affa2e0a9a7eda97de7ac857fe08a95de91 100644
--- a/display_list/display_list_complexity_helper.h
+++ b/display_list/benchmarking/dl_complexity_helper.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLOW_DISPLAY_LIST_COMPLEXITY_HELPER_H_
-#define FLUTTER_FLOW_DISPLAY_LIST_COMPLEXITY_HELPER_H_
+#ifndef FLUTTER_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_HELPER_H_
+#define FLUTTER_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_HELPER_H_
 
-#include "flutter/display_list/display_list_blend_mode.h"
-#include "flutter/display_list/display_list_complexity.h"
-#include "flutter/display_list/display_list_dispatcher.h"
-#include "flutter/display_list/display_list_utils.h"
+#include "flutter/display_list/benchmarking/dl_complexity.h"
+#include "flutter/display_list/dl_blend_mode.h"
+#include "flutter/display_list/dl_op_receiver.h"
+#include "flutter/display_list/utils/dl_receiver_utils.h"
 
 namespace flutter {
 
@@ -92,23 +92,21 @@ namespace flutter {
 //   y = 4x
 
 class ComplexityCalculatorHelper
-    : public virtual Dispatcher,
+    : public virtual DlOpReceiver,
       public virtual IgnoreClipDispatchHelper,
       public virtual IgnoreTransformDispatchHelper {
  public:
-  ComplexityCalculatorHelper(unsigned int ceiling)
-      : is_complex_(false), ceiling_(ceiling), complexity_score_(0) {}
+  explicit ComplexityCalculatorHelper(unsigned int ceiling)
+      : ceiling_(ceiling) {}
 
   virtual ~ComplexityCalculatorHelper() = default;
 
-  void setDither(bool dither) override {}
   void setInvertColors(bool invert) override {}
   void setStrokeCap(DlStrokeCap cap) override {}
   void setStrokeJoin(DlStrokeJoin join) override {}
   void setStrokeMiter(SkScalar limit) override {}
   void setColor(DlColor color) override {}
   void setBlendMode(DlBlendMode mode) override {}
-  void setBlender(sk_sp<SkBlender> blender) override {}
   void setColorSource(const DlColorSource* source) override {}
   void setImageFilter(const DlImageFilter* filter) override {}
   void setColorFilter(const DlColorFilter* filter) override {}
@@ -121,8 +119,8 @@ class ComplexityCalculatorHelper
 
   void setAntiAlias(bool aa) override { current_paint_.setAntiAlias(aa); }
 
-  void setStyle(DlDrawStyle style) override {
-    current_paint_.setStyle(ToSk(style));
+  void setDrawStyle(DlDrawStyle style) override {
+    current_paint_.setDrawStyle(style);
   }
 
   void setStrokeWidth(SkScalar width) override {
@@ -146,33 +144,18 @@ class ComplexityCalculatorHelper
     AccumulateComplexity(50);
   }
 
-  void drawImageRect(const sk_sp<DlImage> image,
-                     const SkRect& src,
-                     const SkRect& dst,
-                     DlImageSampling sampling,
-                     bool render_with_attributes,
-                     SkCanvas::SrcRectConstraint constraint) override {
+  void drawImageRect(
+      const sk_sp<DlImage> image,
+      const SkRect& src,
+      const SkRect& dst,
+      DlImageSampling sampling,
+      bool render_with_attributes,
+      SrcRectConstraint constraint = SrcRectConstraint::kFast) override {
     if (IsComplex()) {
       return;
     }
     ImageRect(image->dimensions(), image->isTextureBacked(),
-              render_with_attributes, constraint);
-  }
-
-  void drawImageLattice(const sk_sp<DlImage> image,
-                        const SkCanvas::Lattice& lattice,
-                        const SkRect& dst,
-                        DlFilterMode filter,
-                        bool render_with_attributes) override {
-    if (IsComplex()) {
-      return;
-    }
-    // This is not currently called from Flutter code, and this API is likely
-    // to be removed in the future. For now, just return what drawImageNine
-    // would
-    ImageRect(image->dimensions(), image->isTextureBacked(),
-              render_with_attributes,
-              SkCanvas::SrcRectConstraint::kStrict_SrcRectConstraint);
+              render_with_attributes, constraint == SrcRectConstraint::kStrict);
   }
 
   void drawAtlas(const sk_sp<DlImage> atlas,
@@ -191,19 +174,10 @@ class ComplexityCalculatorHelper
     // This is equivalent to calling drawImageRect lots of times
     for (int i = 0; i < count; i++) {
       ImageRect(SkISize::Make(tex[i].width(), tex[i].height()), true,
-                render_with_attributes,
-                SkCanvas::SrcRectConstraint::kStrict_SrcRectConstraint);
+                render_with_attributes, true);
     }
   }
 
-  void drawPicture(const sk_sp<SkPicture> picture,
-                   const SkMatrix* matrix,
-                   bool render_with_attributes) override {
-    // This API shouldn't be used, but for now just take the
-    // approximateOpCount() and multiply by 50 as a placeholder.
-    AccumulateComplexity(picture->approximateOpCount() * 50);
-  }
-
   // This method finalizes the complexity score calculation and returns it
   unsigned int ComplexityScore() {
     // We hit our ceiling, so return that
@@ -236,7 +210,7 @@ class ComplexityCalculatorHelper
 
   inline bool IsAntiAliased() { return current_paint_.isAntiAlias(); }
   inline bool IsHairline() { return current_paint_.getStrokeWidth() == 0.0f; }
-  inline SkPaint::Style Style() { return current_paint_.getStyle(); }
+  inline DlDrawStyle DrawStyle() { return current_paint_.getDrawStyle(); }
   inline bool IsComplex() { return is_complex_; }
   inline unsigned int Ceiling() { return ceiling_; }
   inline unsigned int CurrentComplexityScore() { return complexity_score_; }
@@ -247,8 +221,8 @@ class ComplexityCalculatorHelper
                                        unsigned int conic_verb_cost,
                                        unsigned int cubic_verb_cost) {
     int verb_count = path.countVerbs();
-    uint8_t verbs[verb_count];
-    path.getVerbs(verbs, verb_count);
+    std::vector<uint8_t> verbs(verb_count);
+    path.getVerbs(verbs.data(), verbs.size());
 
     unsigned int complexity = 0;
     for (int i = 0; i < verb_count; i++) {
@@ -273,7 +247,7 @@ class ComplexityCalculatorHelper
   virtual void ImageRect(const SkISize& size,
                          bool texture_backed,
                          bool render_with_attributes,
-                         SkCanvas::SrcRectConstraint constraint) = 0;
+                         bool enforce_src_edges) = 0;
 
   // This calculates and returns the cost of draw calls which are batched and
   // thus have a time cost proportional to the number of draw calls made, such
@@ -281,17 +255,17 @@ class ComplexityCalculatorHelper
   virtual unsigned int BatchedComplexity() = 0;
 
  private:
-  SkPaint current_paint_;
+  DlPaint current_paint_;
 
   // If we exceed the ceiling (defaults to the largest number representable
   // by unsigned int), then set the is_complex_ bool and we no longer
   // accumulate.
-  bool is_complex_;
+  bool is_complex_ = false;
   unsigned int ceiling_;
 
-  unsigned int complexity_score_;
+  unsigned int complexity_score_ = 0;
 };
 
 }  // namespace flutter
 
-#endif  // FLUTTER_FLOW_DISPLAY_LIST_COMPLEXITY_HELPER_H_
+#endif  // FLUTTER_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_HELPER_H_
diff --git a/display_list/display_list_complexity_metal.cc b/display_list/benchmarking/dl_complexity_metal.cc
similarity index 89%
rename from display_list/display_list_complexity_metal.cc
rename to display_list/benchmarking/dl_complexity_metal.cc
index 0152c120025fe627e442d1f24781921be2413ca5..d24c1c643425ea629ae86494c6a462d870b91a7c 100644
--- a/display_list/display_list_complexity_metal.cc
+++ b/display_list/benchmarking/dl_complexity_metal.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/display_list/display_list_complexity_metal.h"
+#include "flutter/display_list/benchmarking/dl_complexity_metal.h"
 
 // The numbers and weightings used in this file stem from taking the
 // data from the DisplayListBenchmarks suite run on an iPhone 12 and
@@ -63,7 +63,7 @@ DisplayListMetalComplexityCalculator::MetalHelper::BatchedComplexity() {
 }
 
 void DisplayListMetalComplexityCalculator::MetalHelper::saveLayer(
-    const SkRect* bounds,
+    const SkRect& bounds,
     const SaveLayerOptions options,
     const DlImageFilter* backdrop) {
   if (IsComplex()) {
@@ -128,7 +128,7 @@ void DisplayListMetalComplexityCalculator::MetalHelper::drawRect(
   //
   // There is also a kStrokeAndFill_Style that Skia exposes, but we do not
   // currently use it anywhere in Flutter.
-  if (Style() == SkPaint::Style::kFill_Style) {
+  if (DrawStyle() == DlDrawStyle::kFill) {
     // No real difference for AA with filled styles.
     unsigned int area = rect.width() * rect.height();
 
@@ -170,7 +170,7 @@ void DisplayListMetalComplexityCalculator::MetalHelper::drawOval(
 
   // There is also a kStrokeAndFill_Style that Skia exposes, but we do not
   // currently use it anywhere in Flutter.
-  if (Style() == SkPaint::Style::kFill_Style) {
+  if (DrawStyle() == DlDrawStyle::kFill) {
     // With filled styles, there is no significant AA penalty.
     // m = 1/16000
     // c = 0
@@ -204,7 +204,7 @@ void DisplayListMetalComplexityCalculator::MetalHelper::drawCircle(
 
   // There is also a kStrokeAndFill_Style that Skia exposes, but we do not
   // currently use it anywhere in Flutter.
-  if (Style() == SkPaint::Style::kFill_Style) {
+  if (DrawStyle() == DlDrawStyle::kFill) {
     // We can ignore pi here.
     unsigned int area = radius * radius;
     // m = 1/1300
@@ -244,7 +244,7 @@ void DisplayListMetalComplexityCalculator::MetalHelper::drawRRect(
   //
   // Expensive: All filled style, symmetric w/AA.
   bool expensive =
-      (Style() == SkPaint::Style::kFill_Style) ||
+      (DrawStyle() == DlDrawStyle::kFill) ||
       ((rrect.getType() == SkRRect::Type::kSimple_Type) && IsAntiAliased());
 
   unsigned int complexity;
@@ -292,7 +292,7 @@ void DisplayListMetalComplexityCalculator::MetalHelper::drawDRRect(
   //
   // There is also a kStrokeAndFill_Style that Skia exposes, but we do not
   // currently use it anywhere in Flutter.
-  if (Style() == SkPaint::Style::kFill_Style) {
+  if (DrawStyle() == DlDrawStyle::kFill) {
     unsigned int area = outer.width() * outer.height();
     if (outer.getType() == SkRRect::Type::kComplex_Type) {
       // m = 1/1000
@@ -374,7 +374,7 @@ void DisplayListMetalComplexityCalculator::MetalHelper::drawArc(
   //
   // There is also a kStrokeAndFill_Style that Skia exposes, but we do not
   // currently use it anywhere in Flutter.
-  if (Style() == SkPaint::Style::kStroke_Style) {
+  if (DrawStyle() == DlDrawStyle::kStroke) {
     if (IsAntiAliased()) {
       // m = 1/8500
       // c = 16
@@ -400,7 +400,7 @@ void DisplayListMetalComplexityCalculator::MetalHelper::drawArc(
 }
 
 void DisplayListMetalComplexityCalculator::MetalHelper::drawPoints(
-    SkCanvas::PointMode mode,
+    DlCanvas::PointMode mode,
     uint32_t count,
     const SkPoint points[]) {
   if (IsComplex()) {
@@ -415,12 +415,12 @@ void DisplayListMetalComplexityCalculator::MetalHelper::drawPoints(
     // c = 0.75
     complexity = (count + 12000) * 25 / 2;
   } else {
-    if (mode == SkCanvas::kPolygon_PointMode) {
+    if (mode == DlCanvas::PointMode::kPolygon) {
       // m = 1/1250
       // c = 1
       complexity = (count + 1250) * 160;
     } else {
-      if (IsHairline() && mode == SkCanvas::kPoints_PointMode) {
+      if (IsHairline() && mode == DlCanvas::PointMode::kPoints) {
         // This is a special case, it triggers an extremely fast path.
         // m = 1/14500
         // c = 0
@@ -435,34 +435,6 @@ void DisplayListMetalComplexityCalculator::MetalHelper::drawPoints(
   AccumulateComplexity(complexity);
 }
 
-void DisplayListMetalComplexityCalculator::MetalHelper::drawSkVertices(
-    const sk_sp<SkVertices> vertices,
-    SkBlendMode mode) {
-  // There is currently no way for us to get the VertexMode from the SkVertices
-  // object, but for future reference:
-  //
-  // TriangleStrip is roughly 25% more expensive than TriangleFan.
-  // TriangleFan is roughly 5% more expensive than Triangles.
-
-  // There is currently no way for us to get the vertex count from an SkVertices
-  // object, so we have to estimate it from the approximate size.
-  //
-  // Approximate size returns the sum of the sizes of the positions (SkPoint),
-  // texs (SkPoint), colors (SkColor) and indices (uint16_t) arrays multiplied
-  // by sizeof(type). As a very, very rough estimate, divide that by 20 to get
-  // an idea of the vertex count.
-  unsigned int approximate_vertex_count = vertices->approximateSize() / 20;
-
-  // For the baseline, it's hard to identify the trend. It might be O(n^1/2).
-  // For now, treat it as linear as an approximation.
-  //
-  // m = 1/4000
-  // c = 1
-  unsigned int complexity = (approximate_vertex_count + 4000) * 50;
-
-  AccumulateComplexity(complexity);
-}
-
 void DisplayListMetalComplexityCalculator::MetalHelper::drawVertices(
     const DlVertices* vertices,
     DlBlendMode mode) {
@@ -521,7 +493,7 @@ void DisplayListMetalComplexityCalculator::MetalHelper::ImageRect(
     const SkISize& size,
     bool texture_backed,
     bool render_with_attributes,
-    SkCanvas::SrcRectConstraint constraint) {
+    bool enforce_src_edges) {
   if (IsComplex()) {
     return;
   }
@@ -540,16 +512,12 @@ void DisplayListMetalComplexityCalculator::MetalHelper::ImageRect(
     // m = 1/23000
     // c = 2.3
     complexity = (area + 52900) * 2 / 115;
-    if (render_with_attributes &&
-        constraint == SkCanvas::SrcRectConstraint::kStrict_SrcRectConstraint &&
-        IsAntiAliased()) {
+    if (render_with_attributes && enforce_src_edges && IsAntiAliased()) {
       // There's about a 30% performance penalty from the baseline.
       complexity *= 1.3f;
     }
   } else {
-    if (render_with_attributes &&
-        constraint == SkCanvas::SrcRectConstraint::kStrict_SrcRectConstraint &&
-        IsAntiAliased()) {
+    if (render_with_attributes && enforce_src_edges && IsAntiAliased()) {
       // m = 1/12200
       // c = 2.75
       complexity = (area + 33550) * 2 / 61;
@@ -584,11 +552,16 @@ void DisplayListMetalComplexityCalculator::MetalHelper::drawImageNine(
 }
 
 void DisplayListMetalComplexityCalculator::MetalHelper::drawDisplayList(
-    const sk_sp<DisplayList> display_list) {
+    const sk_sp<DisplayList> display_list,
+    SkScalar opacity) {
   if (IsComplex()) {
     return;
   }
   MetalHelper helper(Ceiling() - CurrentComplexityScore());
+  if (opacity < SK_Scalar1 && !display_list->can_apply_group_opacity()) {
+    auto bounds = display_list->bounds();
+    helper.saveLayer(bounds, SaveLayerOptions::kWithAttributes, nullptr);
+  }
   display_list->Dispatch(helper);
   AccumulateComplexity(helper.ComplexityScore());
 }
@@ -609,6 +582,11 @@ void DisplayListMetalComplexityCalculator::MetalHelper::drawTextBlob(
   draw_text_blob_count_++;
 }
 
+void DisplayListMetalComplexityCalculator::MetalHelper::drawTextFrame(
+    const std::shared_ptr<impeller::TextFrame>& text_frame,
+    SkScalar x,
+    SkScalar y) {}
+
 void DisplayListMetalComplexityCalculator::MetalHelper::drawShadow(
     const SkPath& path,
     const DlColor color,
diff --git a/display_list/display_list_complexity_metal.h b/display_list/benchmarking/dl_complexity_metal.h
similarity index 75%
rename from display_list/display_list_complexity_metal.h
rename to display_list/benchmarking/dl_complexity_metal.h
index e484bac857e4f8a7c37fc1572bbb14d805a327c8..303e9c645d996debcc07c179c1be447551bb1375 100644
--- a/display_list/display_list_complexity_metal.h
+++ b/display_list/benchmarking/dl_complexity_metal.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLOW_DISPLAY_LIST_COMPLEXITY_METAL_H_
-#define FLUTTER_FLOW_DISPLAY_LIST_COMPLEXITY_METAL_H_
+#ifndef FLUTTER_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_METAL_H_
+#define FLUTTER_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_METAL_H_
 
-#include "flutter/display_list/display_list_complexity_helper.h"
+#include "flutter/display_list/benchmarking/dl_complexity_helper.h"
 
 namespace flutter {
 
@@ -14,7 +14,7 @@ class DisplayListMetalComplexityCalculator
  public:
   static DisplayListMetalComplexityCalculator* GetInstance();
 
-  unsigned int Compute(DisplayList* display_list) override {
+  unsigned int Compute(const DisplayList* display_list) override {
     MetalHelper helper(ceiling_);
     display_list->Dispatch(helper);
     return helper.ComplexityScore();
@@ -32,12 +32,10 @@ class DisplayListMetalComplexityCalculator
  private:
   class MetalHelper : public ComplexityCalculatorHelper {
    public:
-    MetalHelper(unsigned int ceiling)
-        : ComplexityCalculatorHelper(ceiling),
-          save_layer_count_(0),
-          draw_text_blob_count_(0) {}
+    explicit MetalHelper(unsigned int ceiling)
+        : ComplexityCalculatorHelper(ceiling) {}
 
-    void saveLayer(const SkRect* bounds,
+    void saveLayer(const SkRect& bounds,
                    const SaveLayerOptions options,
                    const DlImageFilter* backdrop) override;
 
@@ -52,11 +50,9 @@ class DisplayListMetalComplexityCalculator
                  SkScalar start_degrees,
                  SkScalar sweep_degrees,
                  bool use_center) override;
-    void drawPoints(SkCanvas::PointMode mode,
+    void drawPoints(DlCanvas::PointMode mode,
                     uint32_t count,
                     const SkPoint points[]) override;
-    void drawSkVertices(const sk_sp<SkVertices> vertices,
-                        SkBlendMode mode) override;
     void drawVertices(const DlVertices* vertices, DlBlendMode mode) override;
     void drawImage(const sk_sp<DlImage> image,
                    const SkPoint point,
@@ -67,10 +63,14 @@ class DisplayListMetalComplexityCalculator
                        const SkRect& dst,
                        DlFilterMode filter,
                        bool render_with_attributes) override;
-    void drawDisplayList(const sk_sp<DisplayList> display_list) override;
+    void drawDisplayList(const sk_sp<DisplayList> display_list,
+                         SkScalar opacity) override;
     void drawTextBlob(const sk_sp<SkTextBlob> blob,
                       SkScalar x,
                       SkScalar y) override;
+    void drawTextFrame(const std::shared_ptr<impeller::TextFrame>& text_frame,
+                       SkScalar x,
+                       SkScalar y) override;
     void drawShadow(const SkPath& path,
                     const DlColor color,
                     const SkScalar elevation,
@@ -81,13 +81,13 @@ class DisplayListMetalComplexityCalculator
     void ImageRect(const SkISize& size,
                    bool texture_backed,
                    bool render_with_attributes,
-                   SkCanvas::SrcRectConstraint constraint) override;
+                   bool enforce_src_edges) override;
 
     unsigned int BatchedComplexity() override;
 
    private:
-    unsigned int save_layer_count_;
-    unsigned int draw_text_blob_count_;
+    unsigned int save_layer_count_ = 0;
+    unsigned int draw_text_blob_count_ = 0;
   };
 
   DisplayListMetalComplexityCalculator()
@@ -99,4 +99,4 @@ class DisplayListMetalComplexityCalculator
 
 }  // namespace flutter
 
-#endif  // FLUTTER_FLOW_DISPLAY_LIST_COMPLEXITY_METAL_H_
+#endif  // FLUTTER_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_METAL_H_
diff --git a/display_list/display_list_complexity_unittests.cc b/display_list/benchmarking/dl_complexity_unittests.cc
similarity index 77%
rename from display_list/display_list_complexity_unittests.cc
rename to display_list/benchmarking/dl_complexity_unittests.cc
index d2dfbcd55161d5e9cd3b6703bccc1e93ab29302b..3e86622a76591eab307f54ecf47736cc7b233a63 100644
--- a/display_list/display_list_complexity_unittests.cc
+++ b/display_list/benchmarking/dl_complexity_unittests.cc
@@ -2,15 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "flutter/display_list/benchmarking/dl_complexity.h"
+#include "flutter/display_list/benchmarking/dl_complexity_gl.h"
+#include "flutter/display_list/benchmarking/dl_complexity_metal.h"
 #include "flutter/display_list/display_list.h"
-#include "flutter/display_list/display_list_builder.h"
-#include "flutter/display_list/display_list_complexity.h"
-#include "flutter/display_list/display_list_complexity_gl.h"
-#include "flutter/display_list/display_list_complexity_metal.h"
-#include "flutter/display_list/display_list_sampling_options.h"
-#include "flutter/display_list/display_list_test_utils.h"
+#include "flutter/display_list/dl_builder.h"
+#include "flutter/display_list/dl_sampling_options.h"
+#include "flutter/display_list/testing/dl_test_snippets.h"
 #include "flutter/testing/testing.h"
+
+#include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "third_party/skia/include/core/SkImage.h"
 
 namespace flutter {
 namespace testing {
@@ -76,12 +79,13 @@ TEST(DisplayListComplexity, NestedDisplayList) {
 
 TEST(DisplayListComplexity, AntiAliasing) {
   DisplayListBuilder builder_no_aa;
-  builder_no_aa.drawLine(SkPoint::Make(0, 0), SkPoint::Make(100, 100));
+  builder_no_aa.DrawLine(SkPoint::Make(0, 0), SkPoint::Make(100, 100),
+                         DlPaint());
   auto display_list_no_aa = builder_no_aa.Build();
 
   DisplayListBuilder builder_aa;
-  builder_aa.setAntiAlias(true);
-  builder_aa.drawLine(SkPoint::Make(0, 0), SkPoint::Make(100, 100));
+  builder_aa.DrawLine(SkPoint::Make(0, 0), SkPoint::Make(100, 100),
+                      DlPaint().setAntiAlias(true));
   auto display_list_aa = builder_aa.Build();
 
   auto calculators = AccumulatorCalculators();
@@ -93,13 +97,13 @@ TEST(DisplayListComplexity, AntiAliasing) {
 
 TEST(DisplayListComplexity, StrokeWidth) {
   DisplayListBuilder builder_stroke_0;
-  builder_stroke_0.setStrokeWidth(0.0f);
-  builder_stroke_0.drawLine(SkPoint::Make(0, 0), SkPoint::Make(100, 100));
+  builder_stroke_0.DrawLine(SkPoint::Make(0, 0), SkPoint::Make(100, 100),
+                            DlPaint().setStrokeWidth(0.0f));
   auto display_list_stroke_0 = builder_stroke_0.Build();
 
   DisplayListBuilder builder_stroke_1;
-  builder_stroke_1.setStrokeWidth(1.0f);
-  builder_stroke_1.drawLine(SkPoint::Make(0, 0), SkPoint::Make(100, 100));
+  builder_stroke_0.DrawLine(SkPoint::Make(0, 0), SkPoint::Make(100, 100),
+                            DlPaint().setStrokeWidth(1.0f));
   auto display_list_stroke_1 = builder_stroke_1.Build();
 
   auto calculators = AccumulatorCalculators();
@@ -111,13 +115,13 @@ TEST(DisplayListComplexity, StrokeWidth) {
 
 TEST(DisplayListComplexity, Style) {
   DisplayListBuilder builder_filled;
-  builder_filled.setStyle(DlDrawStyle::kFill);
-  builder_filled.drawRect(SkRect::MakeXYWH(10, 10, 80, 80));
+  builder_filled.DrawRect(SkRect::MakeXYWH(10, 10, 80, 80),
+                          DlPaint().setDrawStyle(DlDrawStyle::kFill));
   auto display_list_filled = builder_filled.Build();
 
   DisplayListBuilder builder_stroked;
-  builder_stroked.setStyle(DlDrawStyle::kStroke);
-  builder_stroked.drawRect(SkRect::MakeXYWH(10, 10, 80, 80));
+  builder_stroked.DrawRect(SkRect::MakeXYWH(10, 10, 80, 80),
+                           DlPaint().setDrawStyle(DlDrawStyle::kStroke));
   auto display_list_stroked = builder_stroked.Build();
 
   auto calculators = AccumulatorCalculators();
@@ -129,7 +133,7 @@ TEST(DisplayListComplexity, Style) {
 
 TEST(DisplayListComplexity, SaveLayers) {
   DisplayListBuilder builder;
-  builder.saveLayer(nullptr, true);
+  builder.SaveLayer(nullptr, nullptr);
   auto display_list = builder.Build();
 
   auto calculators = AccumulatorCalculators();
@@ -144,7 +148,7 @@ TEST(DisplayListComplexity, DrawPath) {
   line_path.moveTo(SkPoint::Make(0, 0));
   line_path.lineTo(SkPoint::Make(10, 10));
   line_path.close();
-  builder_line.drawPath(line_path);
+  builder_line.DrawPath(line_path, DlPaint());
   auto display_list_line = builder_line.Build();
 
   DisplayListBuilder builder_quad;
@@ -152,7 +156,7 @@ TEST(DisplayListComplexity, DrawPath) {
   quad_path.moveTo(SkPoint::Make(0, 0));
   quad_path.quadTo(SkPoint::Make(10, 10), SkPoint::Make(10, 20));
   quad_path.close();
-  builder_quad.drawPath(quad_path);
+  builder_quad.DrawPath(quad_path, DlPaint());
   auto display_list_quad = builder_quad.Build();
 
   DisplayListBuilder builder_conic;
@@ -160,7 +164,7 @@ TEST(DisplayListComplexity, DrawPath) {
   conic_path.moveTo(SkPoint::Make(0, 0));
   conic_path.conicTo(SkPoint::Make(10, 10), SkPoint::Make(10, 20), 1.5f);
   conic_path.close();
-  builder_conic.drawPath(conic_path);
+  builder_conic.DrawPath(conic_path, DlPaint());
   auto display_list_conic = builder_conic.Build();
 
   DisplayListBuilder builder_cubic;
@@ -168,7 +172,7 @@ TEST(DisplayListComplexity, DrawPath) {
   cubic_path.moveTo(SkPoint::Make(0, 0));
   cubic_path.cubicTo(SkPoint::Make(10, 10), SkPoint::Make(10, 20),
                      SkPoint::Make(20, 20));
-  builder_cubic.drawPath(cubic_path);
+  builder_cubic.DrawPath(cubic_path, DlPaint());
   auto display_list_cubic = builder_cubic.Build();
 
   auto calculators = AccumulatorCalculators();
@@ -186,7 +190,7 @@ TEST(DisplayListComplexity, DrawShadow) {
   line_path.moveTo(SkPoint::Make(0, 0));
   line_path.lineTo(SkPoint::Make(10, 10));
   line_path.close();
-  builder_line.drawShadow(line_path, SK_ColorRED, 10.0f, false, 1.0f);
+  builder_line.DrawShadow(line_path, DlColor(SK_ColorRED), 10.0f, false, 1.0f);
   auto display_list_line = builder_line.Build();
 
   DisplayListBuilder builder_quad;
@@ -194,7 +198,7 @@ TEST(DisplayListComplexity, DrawShadow) {
   quad_path.moveTo(SkPoint::Make(0, 0));
   quad_path.quadTo(SkPoint::Make(10, 10), SkPoint::Make(10, 20));
   quad_path.close();
-  builder_quad.drawShadow(quad_path, SK_ColorRED, 10.0f, false, 1.0f);
+  builder_quad.DrawShadow(quad_path, DlColor(SK_ColorRED), 10.0f, false, 1.0f);
   auto display_list_quad = builder_quad.Build();
 
   DisplayListBuilder builder_conic;
@@ -202,7 +206,8 @@ TEST(DisplayListComplexity, DrawShadow) {
   conic_path.moveTo(SkPoint::Make(0, 0));
   conic_path.conicTo(SkPoint::Make(10, 10), SkPoint::Make(10, 20), 1.5f);
   conic_path.close();
-  builder_conic.drawShadow(conic_path, SK_ColorRED, 10.0f, false, 1.0f);
+  builder_conic.DrawShadow(conic_path, DlColor(SK_ColorRED), 10.0f, false,
+                           1.0f);
   auto display_list_conic = builder_conic.Build();
 
   DisplayListBuilder builder_cubic;
@@ -210,7 +215,8 @@ TEST(DisplayListComplexity, DrawShadow) {
   cubic_path.moveTo(SkPoint::Make(0, 0));
   cubic_path.cubicTo(SkPoint::Make(10, 10), SkPoint::Make(10, 20),
                      SkPoint::Make(20, 20));
-  builder_cubic.drawShadow(cubic_path, SK_ColorRED, 10.0f, false, 1.0f);
+  builder_cubic.DrawShadow(cubic_path, DlColor(SK_ColorRED), 10.0f, false,
+                           1.0f);
   auto display_list_cubic = builder_cubic.Build();
 
   auto calculators = AccumulatorCalculators();
@@ -224,7 +230,7 @@ TEST(DisplayListComplexity, DrawShadow) {
 
 TEST(DisplayListComplexity, DrawOval) {
   DisplayListBuilder builder;
-  builder.drawOval(SkRect::MakeXYWH(10, 10, 100, 80));
+  builder.DrawOval(SkRect::MakeXYWH(10, 10, 100, 80), DlPaint());
   auto display_list = builder.Build();
 
   auto calculators = AccumulatorCalculators();
@@ -235,7 +241,7 @@ TEST(DisplayListComplexity, DrawOval) {
 
 TEST(DisplayListComplexity, DrawCircle) {
   DisplayListBuilder builder;
-  builder.drawCircle(SkPoint::Make(50, 50), 10.0f);
+  builder.DrawCircle(SkPoint::Make(50, 50), 10.0f, DlPaint());
   auto display_list = builder.Build();
 
   auto calculators = AccumulatorCalculators();
@@ -246,8 +252,9 @@ TEST(DisplayListComplexity, DrawCircle) {
 
 TEST(DisplayListComplexity, DrawRRect) {
   DisplayListBuilder builder;
-  builder.drawRRect(
-      SkRRect::MakeRectXY(SkRect::MakeXYWH(10, 10, 80, 80), 2.0f, 3.0f));
+  builder.DrawRRect(
+      SkRRect::MakeRectXY(SkRect::MakeXYWH(10, 10, 80, 80), 2.0f, 3.0f),
+      DlPaint());
   auto display_list = builder.Build();
 
   auto calculators = AccumulatorCalculators();
@@ -262,7 +269,7 @@ TEST(DisplayListComplexity, DrawDRRect) {
       SkRRect::MakeRectXY(SkRect::MakeXYWH(10, 10, 80, 80), 2.0f, 3.0f);
   SkRRect inner =
       SkRRect::MakeRectXY(SkRect::MakeXYWH(15, 15, 70, 70), 1.5f, 1.5f);
-  builder.drawDRRect(outer, inner);
+  builder.DrawDRRect(outer, inner, DlPaint());
   auto display_list = builder.Build();
 
   auto calculators = AccumulatorCalculators();
@@ -273,7 +280,8 @@ TEST(DisplayListComplexity, DrawDRRect) {
 
 TEST(DisplayListComplexity, DrawArc) {
   DisplayListBuilder builder;
-  builder.drawArc(SkRect::MakeXYWH(10, 10, 100, 80), 0.0f, 10.0f, true);
+  builder.DrawArc(SkRect::MakeXYWH(10, 10, 100, 80), 0.0f, 10.0f, true,
+                  DlPaint());
   auto display_list = builder.Build();
 
   auto calculators = AccumulatorCalculators();
@@ -287,7 +295,7 @@ TEST(DisplayListComplexity, DrawVertices) {
   auto vertices = DlVertices::Make(DlVertexMode::kTriangles, points.size(),
                                    points.data(), nullptr, nullptr);
   DisplayListBuilder builder;
-  builder.drawVertices(vertices, DlBlendMode::kSrc);
+  builder.DrawVertices(vertices.get(), DlBlendMode::kSrc, DlPaint());
   auto display_list = builder.Build();
 
   auto calculators = AccumulatorCalculators();
@@ -298,15 +306,15 @@ TEST(DisplayListComplexity, DrawVertices) {
 
 TEST(DisplayListComplexity, DrawTextBlob) {
   auto text_blob = SkTextBlob::MakeFromString(
-      "The quick brown fox jumps over the lazy dog.", SkFont());
+      "The quick brown fox jumps over the lazy dog.", CreateTestFontOfSize(20));
 
   DisplayListBuilder builder;
-  builder.drawTextBlob(text_blob, 0.0f, 0.0f);
+  builder.DrawTextBlob(text_blob, 0.0f, 0.0f, DlPaint());
   auto display_list = builder.Build();
 
   DisplayListBuilder builder_multiple;
-  builder_multiple.drawTextBlob(text_blob, 0.0f, 0.0f);
-  builder_multiple.drawTextBlob(text_blob, 0.0f, 0.0f);
+  builder_multiple.DrawTextBlob(text_blob, 0.0f, 0.0f, DlPaint());
+  builder_multiple.DrawTextBlob(text_blob, 0.0f, 0.0f, DlPaint());
   auto display_list_multiple = builder_multiple.Build();
 
   auto calculators = AccumulatorCalculators();
@@ -320,18 +328,18 @@ TEST(DisplayListComplexity, DrawTextBlob) {
 TEST(DisplayListComplexity, DrawPoints) {
   auto points = GetTestPoints();
   DisplayListBuilder builder_lines;
-  builder_lines.drawPoints(SkCanvas::kLines_PointMode, points.size(),
-                           points.data());
+  builder_lines.DrawPoints(DlCanvas::PointMode::kLines, points.size(),
+                           points.data(), DlPaint());
   auto display_list_lines = builder_lines.Build();
 
   DisplayListBuilder builder_points;
-  builder_points.drawPoints(SkCanvas::kPoints_PointMode, points.size(),
-                            points.data());
+  builder_points.DrawPoints(DlCanvas::PointMode::kPoints, points.size(),
+                            points.data(), DlPaint());
   auto display_list_points = builder_points.Build();
 
   DisplayListBuilder builder_polygon;
-  builder_polygon.drawPoints(SkCanvas::kPolygon_PointMode, points.size(),
-                             points.data());
+  builder_polygon.DrawPoints(DlCanvas::PointMode::kPolygon, points.size(),
+                             points.data(), DlPaint());
   auto display_list_polygon = builder_polygon.Build();
 
   auto calculators = AccumulatorCalculators();
@@ -348,11 +356,11 @@ TEST(DisplayListComplexity, DrawImage) {
                         SkAlphaType::kPremul_SkAlphaType);
   SkBitmap bitmap;
   bitmap.allocPixels(info, 0);
-  auto image = SkImage::MakeFromBitmap(bitmap);
+  auto image = SkImages::RasterFromBitmap(bitmap);
 
   DisplayListBuilder builder;
-  builder.drawImage(DlImage::Make(image), SkPoint::Make(0, 0),
-                    DlImageSampling::kNearestNeighbor, false);
+  builder.DrawImage(DlImage::Make(image), SkPoint::Make(0, 0),
+                    DlImageSampling::kNearestNeighbor, nullptr);
   auto display_list = builder.Build();
 
   auto calculators = AccumulatorCalculators();
@@ -367,14 +375,14 @@ TEST(DisplayListComplexity, DrawImageNine) {
                         SkAlphaType::kPremul_SkAlphaType);
   SkBitmap bitmap;
   bitmap.allocPixels(info, 0);
-  auto image = SkImage::MakeFromBitmap(bitmap);
+  auto image = SkImages::RasterFromBitmap(bitmap);
 
   SkIRect center = SkIRect::MakeXYWH(5, 5, 20, 20);
   SkRect dest = SkRect::MakeXYWH(0, 0, 50, 50);
 
   DisplayListBuilder builder;
-  builder.drawImageNine(DlImage::Make(image), center, dest,
-                        DlFilterMode::kNearest, true);
+  builder.DrawImageNine(DlImage::Make(image), center, dest,
+                        DlFilterMode::kNearest, nullptr);
   auto display_list = builder.Build();
 
   auto calculators = AccumulatorCalculators();
@@ -389,14 +397,14 @@ TEST(DisplayListComplexity, DrawImageRect) {
                         SkAlphaType::kPremul_SkAlphaType);
   SkBitmap bitmap;
   bitmap.allocPixels(info, 0);
-  auto image = SkImage::MakeFromBitmap(bitmap);
+  auto image = SkImages::RasterFromBitmap(bitmap);
 
   SkRect src = SkRect::MakeXYWH(0, 0, 50, 50);
   SkRect dest = SkRect::MakeXYWH(0, 0, 50, 50);
 
   DisplayListBuilder builder;
-  builder.drawImageRect(DlImage::Make(image), src, dest,
-                        DlImageSampling::kNearestNeighbor, true);
+  builder.DrawImageRect(DlImage::Make(image), src, dest,
+                        DlImageSampling::kNearestNeighbor, nullptr);
   auto display_list = builder.Build();
 
   auto calculators = AccumulatorCalculators();
@@ -411,19 +419,19 @@ TEST(DisplayListComplexity, DrawAtlas) {
                         SkAlphaType::kPremul_SkAlphaType);
   SkBitmap bitmap;
   bitmap.allocPixels(info, 0);
-  auto image = SkImage::MakeFromBitmap(bitmap);
+  auto image = SkImages::RasterFromBitmap(bitmap);
 
   std::vector<SkRect> rects;
   std::vector<SkRSXform> xforms;
   for (int i = 0; i < 10; i++) {
     rects.push_back(SkRect::MakeXYWH(0, 0, 10, 10));
-    xforms.push_back(SkRSXform::Make(0, 0, 0, 0));
+    xforms.push_back(SkRSXform::Make(1, 0, 0, 0));
   }
 
   DisplayListBuilder builder;
-  builder.drawAtlas(DlImage::Make(image), xforms.data(), rects.data(), nullptr,
+  builder.DrawAtlas(DlImage::Make(image), xforms.data(), rects.data(), nullptr,
                     10, DlBlendMode::kSrc, DlImageSampling::kNearestNeighbor,
-                    nullptr, true);
+                    nullptr, nullptr);
   auto display_list = builder.Build();
 
   auto calculators = AccumulatorCalculators();
diff --git a/display_list/benchmarking/dl_region_benchmarks.cc b/display_list/benchmarking/dl_region_benchmarks.cc
new file mode 100644
index 0000000000000000000000000000000000000000..bf169baf7db1d325b0ed3993d3834fe7053cfa65
--- /dev/null
+++ b/display_list/benchmarking/dl_region_benchmarks.cc
@@ -0,0 +1,712 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/benchmarking/benchmarking.h"
+
+#include "flutter/display_list/geometry/dl_region.h"
+#include "flutter/fml/logging.h"
+#include "third_party/skia/include/core/SkRegion.h"
+
+#include <random>
+
+namespace {
+
+template <typename RNG>
+std::vector<SkIRect> GenerateRects(RNG& rng,
+                                   const SkIRect& bounds,
+                                   int numRects,
+                                   int maxSize) {
+  auto max_size_x = std::min(maxSize, bounds.width());
+  auto max_size_y = std::min(maxSize, bounds.height());
+
+  std::uniform_int_distribution pos_x(bounds.fLeft, bounds.fRight - max_size_x);
+  std::uniform_int_distribution pos_y(bounds.fTop, bounds.fBottom - max_size_y);
+  std::uniform_int_distribution size_x(1, max_size_x);
+  std::uniform_int_distribution size_y(1, max_size_y);
+
+  std::vector<SkIRect> rects;
+  for (int i = 0; i < numRects; ++i) {
+    SkIRect rect =
+        SkIRect::MakeXYWH(pos_x(rng), pos_y(rng), size_x(rng), size_y(rng));
+    rects.push_back(rect);
+  }
+  return rects;
+}
+
+template <typename RNG>
+SkIRect RandomSubRect(RNG& rng, const SkIRect& rect, double size_factor) {
+  FML_DCHECK(size_factor <= 1);
+
+  int32_t width = rect.width() * size_factor;
+  int32_t height = rect.height() * size_factor;
+
+  std::uniform_int_distribution pos_x(0, rect.width() - width);
+  std::uniform_int_distribution pos_y(0, rect.height() - height);
+
+  return SkIRect::MakeXYWH(rect.fLeft + pos_x(rng), rect.fTop + pos_y(rng),
+                           width, height);
+}
+
+class SkRegionAdapter {
+ public:
+  explicit SkRegionAdapter(const std::vector<SkIRect>& rects) {
+    region_.setRects(rects.data(), rects.size());
+  }
+
+  SkIRect getBounds() { return region_.getBounds(); }
+
+  static SkRegionAdapter unionRegions(const SkRegionAdapter& a1,
+                                      const SkRegionAdapter& a2) {
+    SkRegionAdapter result(a1);
+    result.region_.op(a2.region_, SkRegion::kUnion_Op);
+    return result;
+  }
+
+  static SkRegionAdapter intersectRegions(const SkRegionAdapter& a1,
+                                          const SkRegionAdapter& a2) {
+    SkRegionAdapter result(a1);
+    result.region_.op(a2.region_, SkRegion::kIntersect_Op);
+    return result;
+  }
+
+  bool intersects(const SkRegionAdapter& region) {
+    return region_.intersects(region.region_);
+  }
+
+  bool intersects(const SkIRect& rect) { return region_.intersects(rect); }
+
+  std::vector<SkIRect> getRects() {
+    std::vector<SkIRect> rects;
+    SkRegion::Iterator it(region_);
+    while (!it.done()) {
+      rects.push_back(it.rect());
+      it.next();
+    }
+    return rects;
+  }
+
+ private:
+  SkRegion region_;
+};
+
+class DlRegionAdapter {
+ public:
+  explicit DlRegionAdapter(const std::vector<SkIRect>& rects)
+      : region_(rects) {}
+
+  static DlRegionAdapter unionRegions(const DlRegionAdapter& a1,
+                                      const DlRegionAdapter& a2) {
+    return DlRegionAdapter(
+        flutter::DlRegion::MakeUnion(a1.region_, a2.region_));
+  }
+
+  static DlRegionAdapter intersectRegions(const DlRegionAdapter& a1,
+                                          const DlRegionAdapter& a2) {
+    return DlRegionAdapter(
+        flutter::DlRegion::MakeIntersection(a1.region_, a2.region_));
+  }
+
+  SkIRect getBounds() { return region_.bounds(); }
+
+  bool intersects(const DlRegionAdapter& region) {
+    return region_.intersects(region.region_);
+  }
+
+  bool intersects(const SkIRect& rect) { return region_.intersects(rect); }
+
+  std::vector<SkIRect> getRects() { return region_.getRects(false); }
+
+ private:
+  explicit DlRegionAdapter(flutter::DlRegion&& region)
+      : region_(std::move(region)) {}
+
+  flutter::DlRegion region_;
+};
+
+template <typename Region>
+void RunFromRectsBenchmark(benchmark::State& state, int maxSize) {
+  std::random_device d;
+  std::seed_seq seed{2, 1, 3};
+  std::mt19937 rng(seed);
+
+  std::uniform_int_distribution pos(0, 4000);
+  std::uniform_int_distribution size(1, maxSize);
+
+  std::vector<SkIRect> rects;
+  for (int i = 0; i < 2000; ++i) {
+    SkIRect rect = SkIRect::MakeXYWH(pos(rng), pos(rng), size(rng), size(rng));
+    rects.push_back(rect);
+  }
+
+  while (state.KeepRunning()) {
+    Region region(rects);
+  }
+}
+
+template <typename Region>
+void RunGetRectsBenchmark(benchmark::State& state, int maxSize) {
+  std::random_device d;
+  std::seed_seq seed{2, 1, 3};
+  std::mt19937 rng(seed);
+
+  std::uniform_int_distribution pos(0, 4000);
+  std::uniform_int_distribution size(1, maxSize);
+
+  std::vector<SkIRect> rects;
+  for (int i = 0; i < 2000; ++i) {
+    SkIRect rect = SkIRect::MakeXYWH(pos(rng), pos(rng), size(rng), size(rng));
+    rects.push_back(rect);
+  }
+
+  Region region(rects);
+
+  while (state.KeepRunning()) {
+    auto vec2 = region.getRects();
+  }
+}
+
+enum RegionOp { kUnion, kIntersection };
+
+template <typename Region>
+void RunRegionOpBenchmark(benchmark::State& state,
+                          RegionOp op,
+                          bool withSingleRect,
+                          int maxSize,
+                          double sizeFactor) {
+  std::random_device d;
+  std::seed_seq seed{2, 1, 3};
+  std::mt19937 rng(seed);
+
+  SkIRect bounds1 = SkIRect::MakeWH(4000, 4000);
+  SkIRect bounds2 = RandomSubRect(rng, bounds1, sizeFactor);
+
+  auto rects = GenerateRects(rng, bounds1, 500, maxSize);
+  Region region1(rects);
+
+  rects = GenerateRects(rng, bounds2, withSingleRect ? 1 : 500 * sizeFactor,
+                        maxSize);
+  Region region2(rects);
+
+  switch (op) {
+    case kUnion:
+      while (state.KeepRunning()) {
+        Region::unionRegions(region1, region2);
+      }
+      break;
+    case kIntersection:
+      while (state.KeepRunning()) {
+        Region::intersectRegions(region1, region2);
+      }
+      break;
+  }
+}
+
+template <typename Region>
+void RunIntersectsRegionBenchmark(benchmark::State& state,
+                                  int maxSize,
+                                  double sizeFactor) {
+  std::random_device d;
+  std::seed_seq seed{2, 1, 3};
+  std::mt19937 rng(seed);
+
+  SkIRect bounds1 = SkIRect::MakeWH(4000, 4000);
+  SkIRect bounds2 = RandomSubRect(rng, bounds1, sizeFactor);
+
+  auto rects = GenerateRects(rng, bounds1, 500, maxSize);
+  Region region1(rects);
+
+  rects = GenerateRects(rng, bounds2, 500 * sizeFactor, maxSize);
+  Region region2(rects);
+
+  while (state.KeepRunning()) {
+    region1.intersects(region2);
+  }
+}
+
+template <typename Region>
+void RunIntersectsSingleRectBenchmark(benchmark::State& state, int maxSize) {
+  std::random_device d;
+  std::seed_seq seed{2, 1, 3};
+  std::mt19937 rng(seed);
+
+  std::uniform_int_distribution pos(0, 4000);
+  std::uniform_int_distribution size(1, maxSize);
+
+  std::vector<SkIRect> rects;
+  for (int i = 0; i < 500; ++i) {
+    SkIRect rect = SkIRect::MakeXYWH(pos(rng), pos(rng), size(rng), size(rng));
+    rects.push_back(rect);
+  }
+  Region region1(rects);
+
+  rects.clear();
+  for (int i = 0; i < 100; ++i) {
+    SkIRect rect = SkIRect::MakeXYWH(pos(rng), pos(rng), size(rng), size(rng));
+    rects.push_back(rect);
+  }
+
+  while (state.KeepRunning()) {
+    for (auto& rect : rects) {
+      region1.intersects(rect);
+    }
+  }
+}
+
+}  // namespace
+
+namespace flutter {
+
+static void BM_DlRegion_FromRects(benchmark::State& state, int maxSize) {
+  RunFromRectsBenchmark<DlRegionAdapter>(state, maxSize);
+}
+
+static void BM_SkRegion_FromRects(benchmark::State& state, int maxSize) {
+  RunFromRectsBenchmark<SkRegionAdapter>(state, maxSize);
+}
+
+static void BM_DlRegion_GetRects(benchmark::State& state, int maxSize) {
+  RunGetRectsBenchmark<DlRegionAdapter>(state, maxSize);
+}
+
+static void BM_SkRegion_GetRects(benchmark::State& state, int maxSize) {
+  RunGetRectsBenchmark<SkRegionAdapter>(state, maxSize);
+}
+
+static void BM_DlRegion_Operation(benchmark::State& state,
+                                  RegionOp op,
+                                  bool withSingleRect,
+                                  int maxSize,
+                                  double sizeFactor) {
+  RunRegionOpBenchmark<DlRegionAdapter>(state, op, withSingleRect, maxSize,
+                                        sizeFactor);
+}
+
+static void BM_SkRegion_Operation(benchmark::State& state,
+                                  RegionOp op,
+                                  bool withSingleRect,
+                                  int maxSize,
+                                  double sizeFactor) {
+  RunRegionOpBenchmark<SkRegionAdapter>(state, op, withSingleRect, maxSize,
+                                        sizeFactor);
+}
+
+static void BM_DlRegion_IntersectsRegion(benchmark::State& state,
+                                         int maxSize,
+                                         double sizeFactor) {
+  RunIntersectsRegionBenchmark<DlRegionAdapter>(state, maxSize, sizeFactor);
+}
+
+static void BM_SkRegion_IntersectsRegion(benchmark::State& state,
+                                         int maxSize,
+                                         double sizeFactor) {
+  RunIntersectsRegionBenchmark<SkRegionAdapter>(state, maxSize, sizeFactor);
+}
+
+static void BM_DlRegion_IntersectsSingleRect(benchmark::State& state,
+                                             int maxSize) {
+  RunIntersectsSingleRectBenchmark<DlRegionAdapter>(state, maxSize);
+}
+
+static void BM_SkRegion_IntersectsSingleRect(benchmark::State& state,
+                                             int maxSize) {
+  RunIntersectsSingleRectBenchmark<SkRegionAdapter>(state, maxSize);
+}
+
+const double kSizeFactorSmall = 0.3;
+
+BENCHMARK_CAPTURE(BM_DlRegion_IntersectsSingleRect, Tiny, 30)
+    ->Unit(benchmark::kNanosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_IntersectsSingleRect, Tiny, 30)
+    ->Unit(benchmark::kNanosecond);
+BENCHMARK_CAPTURE(BM_DlRegion_IntersectsSingleRect, Small, 100)
+    ->Unit(benchmark::kNanosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_IntersectsSingleRect, Small, 100)
+    ->Unit(benchmark::kNanosecond);
+BENCHMARK_CAPTURE(BM_DlRegion_IntersectsSingleRect, Medium, 400)
+    ->Unit(benchmark::kNanosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_IntersectsSingleRect, Medium, 400)
+    ->Unit(benchmark::kNanosecond);
+BENCHMARK_CAPTURE(BM_DlRegion_IntersectsSingleRect, Large, 1500)
+    ->Unit(benchmark::kNanosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_IntersectsSingleRect, Large, 1500)
+    ->Unit(benchmark::kNanosecond);
+
+BENCHMARK_CAPTURE(BM_DlRegion_IntersectsRegion, Tiny, 30, 1.0)
+    ->Unit(benchmark::kNanosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_IntersectsRegion, Tiny, 30, 1.0)
+    ->Unit(benchmark::kNanosecond);
+BENCHMARK_CAPTURE(BM_DlRegion_IntersectsRegion, Small, 100, 1.0)
+    ->Unit(benchmark::kNanosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_IntersectsRegion, Small, 100, 1.0)
+    ->Unit(benchmark::kNanosecond);
+BENCHMARK_CAPTURE(BM_DlRegion_IntersectsRegion, Medium, 400, 1.0)
+    ->Unit(benchmark::kNanosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_IntersectsRegion, Medium, 400, 1.0)
+    ->Unit(benchmark::kNanosecond);
+BENCHMARK_CAPTURE(BM_DlRegion_IntersectsRegion, Large, 1500, 1.0)
+    ->Unit(benchmark::kNanosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_IntersectsRegion, Large, 1500, 1.0)
+    ->Unit(benchmark::kNanosecond);
+
+BENCHMARK_CAPTURE(BM_DlRegion_IntersectsRegion,
+                  TinyAsymmetric,
+                  30,
+                  kSizeFactorSmall)
+    ->Unit(benchmark::kNanosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_IntersectsRegion,
+                  TinyAsymmetric,
+                  30,
+                  kSizeFactorSmall)
+    ->Unit(benchmark::kNanosecond);
+BENCHMARK_CAPTURE(BM_DlRegion_IntersectsRegion,
+                  SmallAsymmetric,
+                  100,
+                  kSizeFactorSmall)
+    ->Unit(benchmark::kNanosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_IntersectsRegion,
+                  SmallAsymmetric,
+                  100,
+                  kSizeFactorSmall)
+    ->Unit(benchmark::kNanosecond);
+BENCHMARK_CAPTURE(BM_DlRegion_IntersectsRegion,
+                  MediumAsymmetric,
+                  400,
+                  kSizeFactorSmall)
+    ->Unit(benchmark::kNanosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_IntersectsRegion,
+                  MediumAsymmetric,
+                  400,
+                  kSizeFactorSmall)
+    ->Unit(benchmark::kNanosecond);
+BENCHMARK_CAPTURE(BM_DlRegion_IntersectsRegion,
+                  LargeAsymmetric,
+                  1500,
+                  kSizeFactorSmall)
+    ->Unit(benchmark::kNanosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_IntersectsRegion,
+                  LargeAsymmetric,
+                  1500,
+                  kSizeFactorSmall)
+    ->Unit(benchmark::kNanosecond);
+
+BENCHMARK_CAPTURE(BM_DlRegion_Operation,
+                  Union_Tiny,
+                  RegionOp::kUnion,
+                  false,
+                  30,
+                  1.0)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_Operation,
+                  Union_Tiny,
+                  RegionOp::kUnion,
+                  false,
+                  30,
+                  1.0)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_DlRegion_Operation,
+                  Union_Small,
+                  RegionOp::kUnion,
+                  false,
+                  100,
+                  1.0)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_Operation,
+                  Union_Small,
+                  RegionOp::kUnion,
+                  false,
+                  100,
+                  1.0)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_DlRegion_Operation,
+                  Union_Medium,
+                  RegionOp::kUnion,
+                  false,
+                  400,
+                  1.0)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_Operation,
+                  Union_Medium,
+                  RegionOp::kUnion,
+                  false,
+                  400,
+                  1.0)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_DlRegion_Operation,
+                  Union_Large,
+                  RegionOp::kUnion,
+                  false,
+                  1500,
+                  1.0)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_Operation,
+                  Union_Large,
+                  RegionOp::kUnion,
+                  false,
+                  1500,
+                  1.0)
+    ->Unit(benchmark::kMicrosecond);
+
+BENCHMARK_CAPTURE(BM_DlRegion_Operation,
+                  Union_TinyAsymmetric,
+                  RegionOp::kUnion,
+                  false,
+                  30,
+                  kSizeFactorSmall)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_Operation,
+                  Union_TinyAsymmetric,
+                  RegionOp::kUnion,
+                  false,
+                  30,
+                  kSizeFactorSmall)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_DlRegion_Operation,
+                  Union_SmallAsymmetric,
+                  RegionOp::kUnion,
+                  false,
+                  100,
+                  kSizeFactorSmall)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_Operation,
+                  Union_SmallAsymmetric,
+                  RegionOp::kUnion,
+                  false,
+                  100,
+                  kSizeFactorSmall)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_DlRegion_Operation,
+                  Union_MediumAsymmetric,
+                  RegionOp::kUnion,
+                  false,
+                  400,
+                  kSizeFactorSmall)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_Operation,
+                  Union_MediumAsymmetric,
+                  RegionOp::kUnion,
+                  false,
+                  400,
+                  kSizeFactorSmall)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_DlRegion_Operation,
+                  Union_LargeAsymmetric,
+                  RegionOp::kUnion,
+                  false,
+                  1500,
+                  kSizeFactorSmall)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_Operation,
+                  Union_LargeAsymmetric,
+                  RegionOp::kUnion,
+                  false,
+                  1500,
+                  kSizeFactorSmall)
+    ->Unit(benchmark::kMicrosecond);
+
+BENCHMARK_CAPTURE(BM_DlRegion_Operation,
+                  Intersection_Tiny,
+                  RegionOp::kIntersection,
+                  false,
+                  30,
+                  1.0)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_Operation,
+                  Intersection_Tiny,
+                  RegionOp::kIntersection,
+                  false,
+                  30,
+                  1.0)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_DlRegion_Operation,
+                  Intersection_Small,
+                  RegionOp::kIntersection,
+                  false,
+                  100,
+                  1.0)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_Operation,
+                  Intersection_Small,
+                  RegionOp::kIntersection,
+                  false,
+                  100,
+                  1.0)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_DlRegion_Operation,
+                  Intersection_Medium,
+                  RegionOp::kIntersection,
+                  false,
+                  400,
+                  1.0)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_Operation,
+                  Intersection_Medium,
+                  RegionOp::kIntersection,
+                  false,
+                  400,
+                  1.0)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_DlRegion_Operation,
+                  Intersection_Large,
+                  RegionOp::kIntersection,
+                  false,
+                  1500,
+                  1.0)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_Operation,
+                  Intersection_Large,
+                  RegionOp::kIntersection,
+                  false,
+                  1500,
+                  1.0)
+    ->Unit(benchmark::kMicrosecond);
+
+BENCHMARK_CAPTURE(BM_DlRegion_Operation,
+                  Intersection_TinyAsymmetric,
+                  RegionOp::kIntersection,
+                  false,
+                  30,
+                  kSizeFactorSmall)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_Operation,
+                  Intersection_TinyAsymmetric,
+                  RegionOp::kIntersection,
+                  false,
+                  30,
+                  kSizeFactorSmall)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_DlRegion_Operation,
+                  Intersection_SmallAsymmetric,
+                  RegionOp::kIntersection,
+                  false,
+                  100,
+                  kSizeFactorSmall)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_Operation,
+                  Intersection_SmallAsymmetric,
+                  RegionOp::kIntersection,
+                  false,
+                  100,
+                  kSizeFactorSmall)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_DlRegion_Operation,
+                  Intersection_MediumAsymmetric,
+                  RegionOp::kIntersection,
+                  false,
+                  400,
+                  kSizeFactorSmall)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_Operation,
+                  Intersection_MediumAsymmetric,
+                  RegionOp::kIntersection,
+                  false,
+                  400,
+                  kSizeFactorSmall)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_DlRegion_Operation,
+                  Intersection_LargeAsymmetric,
+                  RegionOp::kIntersection,
+                  false,
+                  1500,
+                  kSizeFactorSmall)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_Operation,
+                  Intersection_LargeAsymmetric,
+                  RegionOp::kIntersection,
+                  false,
+                  1500,
+                  kSizeFactorSmall)
+    ->Unit(benchmark::kMicrosecond);
+
+BENCHMARK_CAPTURE(BM_DlRegion_Operation,
+                  Intersection_SingleRect_Tiny,
+                  RegionOp::kIntersection,
+                  true,
+                  30,
+                  1.0)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_Operation,
+                  Intersection_SingleRect_Tiny,
+                  RegionOp::kIntersection,
+                  true,
+                  30,
+                  1.0)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_DlRegion_Operation,
+                  Intersection_SingleRect_Small,
+                  RegionOp::kIntersection,
+                  true,
+                  100,
+                  1.0)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_Operation,
+                  Intersection_SingleRect_Small,
+                  RegionOp::kIntersection,
+                  true,
+                  100,
+                  1.0)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_DlRegion_Operation,
+                  Intersection_SingleRect_Medium,
+                  RegionOp::kIntersection,
+                  true,
+                  400,
+                  1.0)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_Operation,
+                  Intersection_SingleRect_Medium,
+                  RegionOp::kIntersection,
+                  true,
+                  400,
+                  1.0)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_DlRegion_Operation,
+                  Intersection_SingleRect_Large,
+                  RegionOp::kIntersection,
+                  true,
+                  1500,
+                  1.0)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_Operation,
+                  Intersection_SingleRect_Large,
+                  RegionOp::kIntersection,
+                  true,
+                  1500,
+                  1.0)
+    ->Unit(benchmark::kMicrosecond);
+
+BENCHMARK_CAPTURE(BM_DlRegion_FromRects, Tiny, 30)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_FromRects, Tiny, 30)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_DlRegion_FromRects, Small, 100)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_FromRects, Small, 100)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_DlRegion_FromRects, Medium, 400)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_FromRects, Medium, 400)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_DlRegion_FromRects, Large, 1500)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_FromRects, Large, 1500)
+    ->Unit(benchmark::kMicrosecond);
+
+BENCHMARK_CAPTURE(BM_DlRegion_GetRects, Tiny, 30)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_GetRects, Tiny, 30)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_DlRegion_GetRects, Small, 100)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_GetRects, Small, 100)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_DlRegion_GetRects, Medium, 400)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_GetRects, Medium, 400)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_DlRegion_GetRects, Large, 1500)
+    ->Unit(benchmark::kMicrosecond);
+BENCHMARK_CAPTURE(BM_SkRegion_GetRects, Large, 1500)
+    ->Unit(benchmark::kMicrosecond);
+
+}  // namespace flutter
\ No newline at end of file
diff --git a/display_list/benchmarking/dl_transform_benchmarks.cc b/display_list/benchmarking/dl_transform_benchmarks.cc
new file mode 100644
index 0000000000000000000000000000000000000000..8e6ca99d9e77d18ce46ba7a5526ae3b787dc1ab9
--- /dev/null
+++ b/display_list/benchmarking/dl_transform_benchmarks.cc
@@ -0,0 +1,652 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <functional>
+
+#include "flutter/benchmarking/benchmarking.h"
+
+#include "flutter/impeller/geometry/matrix.h"
+#include "flutter/impeller/geometry/rect.h"
+#include "third_party/skia/include/core/SkM44.h"
+#include "third_party/skia/include/core/SkMatrix.h"
+
+namespace flutter {
+
+namespace {
+
+static constexpr float kPiOver4 = impeller::kPiOver4;
+static constexpr float kFieldOfView = impeller::kPiOver2 + impeller::kPiOver4;
+
+enum class AdapterType {
+  kSkMatrix,
+  kSkM44,
+  kImpellerMatrix,
+};
+
+union TestPoint {
+  TestPoint() {}
+
+  SkPoint sk_point;
+  impeller::Point impeller_point;
+};
+
+union TestRect {
+  TestRect() {}
+
+  SkRect sk_rect;
+  impeller::Rect impeller_rect;
+};
+
+union TestTransform {
+  TestTransform() {}
+
+  SkMatrix sk_matrix;
+  SkM44 sk_m44;
+  impeller::Matrix impeller_matrix;
+};
+
+// We use a virtual adapter class rather than templating the BM_* methods
+// to prevent the compiler from optimizing the benchmark bodies into a
+// null set of instructions because the calculation can be proven to have
+// no side effects and the result is never used.
+class TransformAdapter {
+ public:
+  TransformAdapter() = default;
+  virtual ~TransformAdapter() = default;
+
+  // Two methods to test the overhead of just calling a virtual method on
+  // the adapter (should be the same for all inheriting subclasses) and
+  // for a method that does a conversion to and from the TestRect object
+  // (which should be the same as the method call overhead since it does
+  // no work).
+  virtual void DoNothing(TestTransform& ignored) const = 0;
+
+  virtual void InitRectLTRB(TestRect& rect,
+                            float left,
+                            float top,
+                            float right,
+                            float bottom) const = 0;
+  virtual void InitPoint(TestPoint& point, float x, float y) const = 0;
+
+  // The actual methods that do work and are the meat of the benchmarks.
+  virtual void SetIdentity(TestTransform& result) const = 0;
+  virtual void SetPerspective(TestTransform& result,
+                              float fov_radians,
+                              float near,
+                              float far) const = 0;
+
+  virtual void Translate(TestTransform& result, float tx, float ty) const = 0;
+  virtual void Scale(TestTransform& result, float sx, float sy) const = 0;
+  virtual void RotateRadians(TestTransform& result, float radians) const = 0;
+
+  virtual void Concat(const TestTransform& a,
+                      const TestTransform& b,
+                      TestTransform& result) const = 0;
+
+  virtual void TransformPoint(const TestTransform& transform,
+                              const TestPoint& in,
+                              TestPoint& out) const = 0;
+  virtual void TransformPoints(const TestTransform& transform,
+                               const TestPoint in[],
+                               TestPoint out[],
+                               int n) const = 0;
+  virtual void TransformRect(const TestTransform& transform,
+                             const TestRect& in,
+                             TestRect& out) const = 0;
+  virtual void InvertUnchecked(const TestTransform& transform,
+                               TestTransform& result) const = 0;
+  virtual bool InvertAndCheck(const TestTransform& transform,
+                              TestTransform& result) const = 0;
+};
+
+class SkiaAdapterBase : public TransformAdapter {
+ public:
+  // DoNothing methods used to measure overhead for various operations
+  void DoNothing(TestTransform& ignored) const override {}
+
+  void InitPoint(TestPoint& point, float x, float y) const override {
+    point.sk_point.set(x, y);
+  }
+
+  void InitRectLTRB(TestRect& rect,
+                    float left,
+                    float top,
+                    float right,
+                    float bottom) const override {
+    rect.sk_rect.setLTRB(left, top, right, bottom);
+  }
+
+ protected:
+  static SkM44 MakePerspective(float fov_radians, float near, float far) {
+    return SkM44::Perspective(near, far, fov_radians);
+  }
+};
+
+class SkMatrixAdapter : public SkiaAdapterBase {
+ public:
+  SkMatrixAdapter() = default;
+  ~SkMatrixAdapter() = default;
+
+  void SetIdentity(TestTransform& result) const override {
+    result.sk_matrix.setIdentity();
+  }
+
+  virtual void SetPerspective(TestTransform& result,
+                              float fov_radians,
+                              float near,
+                              float far) const override {
+    result.sk_matrix = MakePerspective(fov_radians, near, far).asM33();
+  }
+
+  void Translate(TestTransform& result, float tx, float ty) const override {
+    result.sk_matrix.preTranslate(tx, ty);
+  }
+
+  void Scale(TestTransform& result, float sx, float sy) const override {
+    result.sk_matrix.preScale(sx, sy);
+  }
+
+  void RotateRadians(TestTransform& result, float radians) const override {
+    result.sk_matrix.preRotate(SkRadiansToDegrees(radians));
+  }
+
+  void Concat(const TestTransform& a,
+              const TestTransform& b,
+              TestTransform& result) const override {
+    result.sk_matrix = SkMatrix::Concat(a.sk_matrix, b.sk_matrix);
+  }
+
+  void TransformPoint(const TestTransform& transform,
+                      const TestPoint& in,
+                      TestPoint& out) const override {
+    out.sk_point = transform.sk_matrix.mapPoint(in.sk_point);
+  }
+
+  void TransformPoints(const TestTransform& transform,
+                       const TestPoint in[],
+                       TestPoint out[],
+                       int n) const override {
+    static_assert(sizeof(TestPoint) == sizeof(SkPoint));
+    transform.sk_matrix.mapPoints(reinterpret_cast<SkPoint*>(out),
+                                  reinterpret_cast<const SkPoint*>(in), n);
+  }
+
+  void TransformRect(const TestTransform& transform,
+                     const TestRect& in,
+                     TestRect& out) const override {
+    out.sk_rect = transform.sk_matrix.mapRect(in.sk_rect);
+  }
+
+  void InvertUnchecked(const TestTransform& transform,
+                       TestTransform& result) const override {
+    [[maybe_unused]]
+    bool ret = transform.sk_matrix.invert(&result.sk_matrix);
+  }
+
+  bool InvertAndCheck(const TestTransform& transform,
+                      TestTransform& result) const override {
+    return transform.sk_matrix.invert(&result.sk_matrix);
+  }
+};
+
+class SkM44Adapter : public SkiaAdapterBase {
+ public:
+  SkM44Adapter() = default;
+  ~SkM44Adapter() = default;
+
+  void SetIdentity(TestTransform& storage) const override {
+    storage.sk_m44.setIdentity();
+  }
+
+  virtual void SetPerspective(TestTransform& result,
+                              float fov_radians,
+                              float near,
+                              float far) const override {
+    result.sk_m44 = MakePerspective(fov_radians, near, far);
+  }
+
+  void Translate(TestTransform& storage, float tx, float ty) const override {
+    storage.sk_m44.preTranslate(tx, ty);
+  }
+
+  void Scale(TestTransform& storage, float sx, float sy) const override {
+    storage.sk_m44.preScale(sx, sy);
+  }
+
+  void RotateRadians(TestTransform& storage, float radians) const override {
+    storage.sk_m44.preConcat(SkM44::Rotate({0, 0, 1}, radians));
+  }
+
+  void Concat(const TestTransform& a,
+              const TestTransform& b,
+              TestTransform& result) const override {
+    result.sk_m44.setConcat(a.sk_m44, b.sk_m44);
+  }
+
+  void TransformPoint(const TestTransform& transform,
+                      const TestPoint& in,
+                      TestPoint& out) const override {
+    out.sk_point = transform.sk_m44.asM33().mapPoint(in.sk_point);
+  }
+
+  void TransformPoints(const TestTransform& transform,
+                       const TestPoint in[],
+                       TestPoint out[],
+                       int n) const override {
+    static_assert(sizeof(TestPoint) == sizeof(SkPoint));
+    transform.sk_m44.asM33().mapPoints(reinterpret_cast<SkPoint*>(out),
+                                       reinterpret_cast<const SkPoint*>(in), n);
+  }
+
+  void TransformRect(const TestTransform& transform,
+                     const TestRect& in,
+                     TestRect& out) const override {
+    out.sk_rect = transform.sk_m44.asM33().mapRect(in.sk_rect);
+  }
+
+  void InvertUnchecked(const TestTransform& transform,
+                       TestTransform& result) const override {
+    [[maybe_unused]]
+    bool ret = transform.sk_m44.invert(&result.sk_m44);
+  }
+
+  bool InvertAndCheck(const TestTransform& transform,
+                      TestTransform& result) const override {
+    return transform.sk_m44.invert(&result.sk_m44);
+  }
+};
+
+class ImpellerMatrixAdapter : public TransformAdapter {
+ public:
+  ImpellerMatrixAdapter() = default;
+  ~ImpellerMatrixAdapter() = default;
+
+  void DoNothing(TestTransform& ignored) const override {}
+
+  void InitPoint(TestPoint& point, float x, float y) const override {
+    point.impeller_point = impeller::Point(x, y);
+  }
+
+  void InitRectLTRB(TestRect& rect,
+                    float left,
+                    float top,
+                    float right,
+                    float bottom) const override {
+    rect.impeller_rect = impeller::Rect::MakeLTRB(left, top, right, bottom);
+  }
+
+  void SetIdentity(TestTransform& storage) const override {
+    storage.impeller_matrix = impeller::Matrix();
+  }
+
+  virtual void SetPerspective(TestTransform& result,
+                              float fov_radians,
+                              float near,
+                              float far) const override {
+    impeller::Radians fov = impeller::Radians(fov_radians);
+    result.impeller_matrix =
+        impeller::Matrix::MakePerspective(fov, 1.0f, near, far);
+  }
+
+  void Translate(TestTransform& storage, float tx, float ty) const override {
+    storage.impeller_matrix = storage.impeller_matrix.Translate({tx, ty});
+  }
+
+  void Scale(TestTransform& storage, float sx, float sy) const override {
+    storage.impeller_matrix = storage.impeller_matrix.Scale({sx, sy, 1.0f});
+  }
+
+  void RotateRadians(TestTransform& storage, float radians) const override {
+    storage.impeller_matrix =
+        storage.impeller_matrix *
+        impeller::Matrix::MakeRotationZ(impeller::Radians(radians));
+  }
+
+  void Concat(const TestTransform& a,
+              const TestTransform& b,
+              TestTransform& result) const override {
+    result.impeller_matrix = a.impeller_matrix * b.impeller_matrix;
+  }
+
+  void TransformPoint(const TestTransform& transform,
+                      const TestPoint& in,
+                      TestPoint& out) const override {
+    out.impeller_point = transform.impeller_matrix * in.impeller_point;
+  }
+
+  void TransformPoints(const TestTransform& transform,
+                       const TestPoint in[],
+                       TestPoint out[],
+                       int n) const override {
+    for (int i = 0; i < n; i++) {
+      out[i].impeller_point = transform.impeller_matrix * in[i].impeller_point;
+    }
+  }
+
+  void TransformRect(const TestTransform& transform,
+                     const TestRect& in,
+                     TestRect& out) const override {
+    out.impeller_rect =
+        in.impeller_rect.TransformBounds(transform.impeller_matrix);
+  }
+
+  void InvertUnchecked(const TestTransform& transform,
+                       TestTransform& result) const override {
+    result.impeller_matrix = transform.impeller_matrix.Invert();
+  }
+
+  bool InvertAndCheck(const TestTransform& transform,
+                      TestTransform& result) const override {
+    result.impeller_matrix = transform.impeller_matrix.Invert();
+    return transform.impeller_matrix.GetDeterminant() != 0.0f;
+  }
+};
+
+using SetupFunction = std::function<void(TransformAdapter*, TestTransform&)>;
+
+static void SetupIdentity(const TransformAdapter* adapter,
+                          TestTransform& transform) {
+  adapter->SetIdentity(transform);
+}
+
+static void SetupTranslate(const TransformAdapter* adapter,
+                           TestTransform& transform) {
+  adapter->SetIdentity(transform);
+  adapter->Translate(transform, 10.2, 12.3);
+}
+
+static void SetupScale(const TransformAdapter* adapter,
+                       TestTransform& transform) {
+  adapter->SetIdentity(transform);
+  adapter->Scale(transform, 2.0, 2.0);
+}
+
+static void SetupScaleTranslate(const TransformAdapter* adapter,
+                                TestTransform& transform) {
+  adapter->SetIdentity(transform);
+  adapter->Scale(transform, 2.0, 2.0);
+  adapter->Translate(transform, 10.2, 12.3);
+}
+
+static void SetupRotate(const TransformAdapter* adapter,
+                        TestTransform& transform) {
+  adapter->SetIdentity(transform);
+  adapter->RotateRadians(transform, kPiOver4);
+}
+
+static void SetupPerspective(const TransformAdapter* adapter,
+                             TestTransform& transform) {
+  auto fov_radians = kFieldOfView;
+  auto near = 1.0f;
+  auto far = 100.0f;
+  adapter->SetPerspective(transform, fov_radians, near, far);
+}
+
+// We use a function to return the appropriate adapter so that all methods
+// used in benchmarking are "pure virtual" and cannot be optimized out
+// due to issues such as the arguments being constexpr and the result
+// simplified to a constant value.
+static std::unique_ptr<TransformAdapter> GetAdapter(AdapterType type) {
+  switch (type) {
+    case AdapterType::kSkMatrix:
+      return std::make_unique<SkMatrixAdapter>();
+    case AdapterType::kSkM44:
+      return std::make_unique<SkM44Adapter>();
+    case AdapterType::kImpellerMatrix:
+      return std::make_unique<ImpellerMatrixAdapter>();
+  }
+  FML_UNREACHABLE();
+}
+
+}  // namespace
+
+static void BM_AdapterDispatchOverhead(benchmark::State& state,
+                                       AdapterType type) {
+  auto adapter = GetAdapter(type);
+  TestTransform transform;
+  while (state.KeepRunning()) {
+    adapter->DoNothing(transform);
+  }
+}
+
+static void BM_SetIdentity(benchmark::State& state, AdapterType type) {
+  auto adapter = GetAdapter(type);
+  TestTransform transform;
+  while (state.KeepRunning()) {
+    adapter->SetIdentity(transform);
+  }
+}
+
+static void BM_SetPerspective(benchmark::State& state, AdapterType type) {
+  auto adapter = GetAdapter(type);
+  TestTransform transform;
+  auto fov_radians = kFieldOfView;
+  auto near = 1.0f;
+  auto far = 100.0f;
+  while (state.KeepRunning()) {
+    adapter->SetPerspective(transform, fov_radians, near, far);
+  }
+}
+
+static void BM_Translate(benchmark::State& state,
+                         AdapterType type,
+                         float tx,
+                         float ty) {
+  auto adapter = GetAdapter(type);
+  TestTransform transform;
+  adapter->SetIdentity(transform);
+  bool flip = true;
+  while (state.KeepRunning()) {
+    if (flip) {
+      adapter->Translate(transform, tx, ty);
+    } else {
+      adapter->Translate(transform, -tx, -ty);
+    }
+    flip = !flip;
+  }
+}
+
+static void BM_Scale(benchmark::State& state, AdapterType type, float scale) {
+  auto adapter = GetAdapter(type);
+  TestTransform transform;
+  adapter->SetIdentity(transform);
+  float inv_scale = 1.0f / scale;
+  bool flip = true;
+  while (state.KeepRunning()) {
+    if (flip) {
+      adapter->Scale(transform, scale, scale);
+    } else {
+      adapter->Scale(transform, inv_scale, inv_scale);
+    }
+    flip = !flip;
+  }
+}
+
+static void BM_Rotate(benchmark::State& state,
+                      AdapterType type,
+                      float radians) {
+  auto adapter = GetAdapter(type);
+  TestTransform transform;
+  adapter->SetIdentity(transform);
+  while (state.KeepRunning()) {
+    adapter->RotateRadians(transform, radians);
+  }
+}
+
+static void BM_Concat(benchmark::State& state,
+                      AdapterType type,
+                      const SetupFunction& a_setup,
+                      const SetupFunction& b_setup) {
+  auto adapter = GetAdapter(type);
+  TestTransform a, b, result;
+  a_setup(adapter.get(), a);
+  b_setup(adapter.get(), b);
+  while (state.KeepRunning()) {
+    adapter->Concat(a, b, result);
+  }
+}
+
+static void BM_TransformPoint(benchmark::State& state,
+                              AdapterType type,
+                              const SetupFunction& setup) {
+  auto adapter = GetAdapter(type);
+  TestTransform transform;
+  setup(adapter.get(), transform);
+  TestPoint point, result;
+  adapter->InitPoint(point, 25.7, 32.4);
+  while (state.KeepRunning()) {
+    adapter->TransformPoint(transform, point, result);
+  }
+}
+
+static void BM_TransformPoints(benchmark::State& state,
+                               AdapterType type,
+                               const SetupFunction& setup) {
+  auto adapter = GetAdapter(type);
+  TestTransform transform;
+  setup(adapter.get(), transform);
+  const int Xs = 10;
+  const int Ys = 10;
+  const int N = Xs * Ys;
+  TestPoint points[N];
+  for (int i = 0; i < Xs; i++) {
+    for (int j = 0; j < Ys; j++) {
+      int index = i * Xs + j;
+      FML_CHECK(index < N);
+      adapter->InitPoint(points[index], i * 23.3 + 17, j * 32.7 + 12);
+    }
+  }
+  TestPoint results[N];
+  int64_t item_count = 0;
+  while (state.KeepRunning()) {
+    adapter->TransformPoints(transform, points, results, N);
+    item_count += N;
+  }
+  state.SetItemsProcessed(item_count);
+}
+
+static void BM_TransformRect(benchmark::State& state,
+                             AdapterType type,
+                             const SetupFunction& setup) {
+  auto adapter = GetAdapter(type);
+  TestTransform transform;
+  setup(adapter.get(), transform);
+  TestRect rect, result;
+  adapter->InitRectLTRB(rect, 100, 100, 200, 200);
+  while (state.KeepRunning()) {
+    adapter->TransformRect(transform, rect, result);
+  }
+}
+
+static void BM_InvertUnchecked(benchmark::State& state,
+                               AdapterType type,
+                               const SetupFunction& setup) {
+  auto adapter = GetAdapter(type);
+  TestTransform transform;
+  setup(adapter.get(), transform);
+  TestTransform result;
+  while (state.KeepRunning()) {
+    adapter->InvertUnchecked(transform, result);
+  }
+}
+
+static void BM_InvertAndCheck(benchmark::State& state,
+                              AdapterType type,
+                              const SetupFunction& setup) {
+  auto adapter = GetAdapter(type);
+  TestTransform transform;
+  setup(adapter.get(), transform);
+  TestTransform result;
+  while (state.KeepRunning()) {
+    adapter->InvertAndCheck(transform, result);
+  }
+}
+
+#define BENCHMARK_CAPTURE_TYPE(name, type) \
+  BENCHMARK_CAPTURE(name, type, AdapterType::k##type)
+
+#define BENCHMARK_CAPTURE_TYPE_ARGS(name, type, ...) \
+  BENCHMARK_CAPTURE(name, type, AdapterType::k##type, __VA_ARGS__)
+
+#define BENCHMARK_CAPTURE_ALL(name)       \
+  BENCHMARK_CAPTURE_TYPE(name, SkMatrix); \
+  BENCHMARK_CAPTURE_TYPE(name, SkM44);    \
+  BENCHMARK_CAPTURE_TYPE(name, ImpellerMatrix)
+
+#define BENCHMARK_CAPTURE_ALL_ARGS(name, ...)               \
+  BENCHMARK_CAPTURE_TYPE_ARGS(name, SkMatrix, __VA_ARGS__); \
+  BENCHMARK_CAPTURE_TYPE_ARGS(name, SkM44, __VA_ARGS__);    \
+  BENCHMARK_CAPTURE_TYPE_ARGS(name, ImpellerMatrix, __VA_ARGS__)
+
+BENCHMARK_CAPTURE_ALL(BM_AdapterDispatchOverhead);
+
+BENCHMARK_CAPTURE_ALL(BM_SetIdentity);
+BENCHMARK_CAPTURE_ALL(BM_SetPerspective);
+BENCHMARK_CAPTURE_ALL_ARGS(BM_Translate, 10.0f, 15.0f);
+BENCHMARK_CAPTURE_ALL_ARGS(BM_Scale, 2.0f);
+BENCHMARK_CAPTURE_ALL_ARGS(BM_Rotate, kPiOver4);
+
+// clang-format off
+#define BENCHMARK_CAPTURE_TYPE_SETUP(name, type, setup) \
+  BENCHMARK_CAPTURE(name, setup/type, AdapterType::k##type, Setup##setup)
+// clang-format on
+
+#define BENCHMARK_CAPTURE_ALL_SETUP(name, setup)       \
+  BENCHMARK_CAPTURE_TYPE_SETUP(name, SkMatrix, setup); \
+  BENCHMARK_CAPTURE_TYPE_SETUP(name, SkM44, setup);    \
+  BENCHMARK_CAPTURE_TYPE_SETUP(name, ImpellerMatrix, setup)
+
+// clang-format off
+#define BENCHMARK_CAPTURE_TYPE_SETUP2(name, type, setup1, setup2)   \
+  BENCHMARK_CAPTURE(name, setup1*setup2/type, AdapterType::k##type, \
+                    Setup##setup1, Setup##setup2)
+// clang-format on
+
+#define BENCHMARK_CAPTURE_ALL_SETUP2(name, setup1, setup2)       \
+  BENCHMARK_CAPTURE_TYPE_SETUP2(name, SkMatrix, setup1, setup2); \
+  BENCHMARK_CAPTURE_TYPE_SETUP2(name, SkM44, setup1, setup2);    \
+  BENCHMARK_CAPTURE_TYPE_SETUP2(name, ImpellerMatrix, setup1, setup2)
+
+BENCHMARK_CAPTURE_ALL_SETUP2(BM_Concat, Scale, Translate);
+BENCHMARK_CAPTURE_ALL_SETUP2(BM_Concat, ScaleTranslate, ScaleTranslate);
+BENCHMARK_CAPTURE_ALL_SETUP2(BM_Concat, ScaleTranslate, Rotate);
+BENCHMARK_CAPTURE_ALL_SETUP2(BM_Concat, ScaleTranslate, Perspective);
+BENCHMARK_CAPTURE_ALL_SETUP2(BM_Concat, Perspective, ScaleTranslate);
+
+BENCHMARK_CAPTURE_ALL_SETUP(BM_InvertUnchecked, Identity);
+BENCHMARK_CAPTURE_ALL_SETUP(BM_InvertUnchecked, Translate);
+BENCHMARK_CAPTURE_ALL_SETUP(BM_InvertUnchecked, Scale);
+BENCHMARK_CAPTURE_ALL_SETUP(BM_InvertUnchecked, ScaleTranslate);
+BENCHMARK_CAPTURE_ALL_SETUP(BM_InvertUnchecked, Rotate);
+BENCHMARK_CAPTURE_ALL_SETUP(BM_InvertUnchecked, Perspective);
+
+BENCHMARK_CAPTURE_ALL_SETUP(BM_InvertAndCheck, Identity);
+BENCHMARK_CAPTURE_ALL_SETUP(BM_InvertAndCheck, Translate);
+BENCHMARK_CAPTURE_ALL_SETUP(BM_InvertAndCheck, Scale);
+BENCHMARK_CAPTURE_ALL_SETUP(BM_InvertAndCheck, ScaleTranslate);
+BENCHMARK_CAPTURE_ALL_SETUP(BM_InvertAndCheck, Rotate);
+BENCHMARK_CAPTURE_ALL_SETUP(BM_InvertAndCheck, Perspective);
+
+BENCHMARK_CAPTURE_ALL_SETUP(BM_TransformPoint, Identity);
+BENCHMARK_CAPTURE_ALL_SETUP(BM_TransformPoint, Translate);
+BENCHMARK_CAPTURE_ALL_SETUP(BM_TransformPoint, Scale);
+BENCHMARK_CAPTURE_ALL_SETUP(BM_TransformPoint, ScaleTranslate);
+BENCHMARK_CAPTURE_ALL_SETUP(BM_TransformPoint, Rotate);
+BENCHMARK_CAPTURE_ALL_SETUP(BM_TransformPoint, Perspective);
+
+BENCHMARK_CAPTURE_ALL_SETUP(BM_TransformPoints, Identity);
+BENCHMARK_CAPTURE_ALL_SETUP(BM_TransformPoints, Translate);
+BENCHMARK_CAPTURE_ALL_SETUP(BM_TransformPoints, Scale);
+BENCHMARK_CAPTURE_ALL_SETUP(BM_TransformPoints, ScaleTranslate);
+BENCHMARK_CAPTURE_ALL_SETUP(BM_TransformPoints, Rotate);
+BENCHMARK_CAPTURE_ALL_SETUP(BM_TransformPoints, Perspective);
+
+BENCHMARK_CAPTURE_ALL_SETUP(BM_TransformRect, Identity);
+BENCHMARK_CAPTURE_ALL_SETUP(BM_TransformRect, Translate);
+BENCHMARK_CAPTURE_ALL_SETUP(BM_TransformRect, Scale);
+BENCHMARK_CAPTURE_ALL_SETUP(BM_TransformRect, ScaleTranslate);
+BENCHMARK_CAPTURE_ALL_SETUP(BM_TransformRect, Rotate);
+BENCHMARK_CAPTURE_ALL_SETUP(BM_TransformRect, Perspective);
+
+}  // namespace flutter
diff --git a/display_list/display_list.cc b/display_list/display_list.cc
index 048ccdb0a13008861393f200661dc6121a097fc1..dfacba0c114f09d47933c2740e0f7f25972ec26e 100644
--- a/display_list/display_list.cc
+++ b/display_list/display_list.cc
@@ -5,9 +5,7 @@
 #include <type_traits>
 
 #include "flutter/display_list/display_list.h"
-#include "flutter/display_list/display_list_canvas_dispatcher.h"
-#include "flutter/display_list/display_list_ops.h"
-#include "flutter/display_list/display_list_utils.h"
+#include "flutter/display_list/dl_op_records.h"
 #include "flutter/fml/trace_event.h"
 
 namespace flutter {
@@ -23,69 +21,178 @@ DisplayList::DisplayList()
       nested_op_count_(0),
       unique_id_(0),
       bounds_({0, 0, 0, 0}),
-      bounds_cull_({0, 0, 0, 0}),
-      can_apply_group_opacity_(true) {}
+      can_apply_group_opacity_(true),
+      is_ui_thread_safe_(true),
+      modifies_transparent_black_(false) {}
 
-DisplayList::DisplayList(uint8_t* ptr,
+DisplayList::DisplayList(DisplayListStorage&& storage,
                          size_t byte_count,
                          unsigned int op_count,
                          size_t nested_byte_count,
                          unsigned int nested_op_count,
-                         const SkRect& cull_rect,
-                         bool can_apply_group_opacity)
-    : storage_(ptr),
+                         const SkRect& bounds,
+                         bool can_apply_group_opacity,
+                         bool is_ui_thread_safe,
+                         bool modifies_transparent_black,
+                         sk_sp<const DlRTree> rtree)
+    : storage_(std::move(storage)),
       byte_count_(byte_count),
       op_count_(op_count),
       nested_byte_count_(nested_byte_count),
       nested_op_count_(nested_op_count),
-      bounds_({0, 0, -1, -1}),
-      bounds_cull_(cull_rect),
-      can_apply_group_opacity_(can_apply_group_opacity) {
-  static std::atomic<uint32_t> next_id{1};
-  do {
-    unique_id_ = next_id.fetch_add(+1, std::memory_order_relaxed);
-  } while (unique_id_ == 0);
-}
+      unique_id_(next_unique_id()),
+      bounds_(bounds),
+      can_apply_group_opacity_(can_apply_group_opacity),
+      is_ui_thread_safe_(is_ui_thread_safe),
+      modifies_transparent_black_(modifies_transparent_black),
+      rtree_(std::move(rtree)) {}
 
 DisplayList::~DisplayList() {
   uint8_t* ptr = storage_.get();
   DisposeOps(ptr, ptr + byte_count_);
 }
 
-void DisplayList::ComputeBounds() {
-  RectBoundsAccumulator accumulator;
-  DisplayListBoundsCalculator calculator(accumulator, &bounds_cull_);
-  Dispatch(calculator);
-  if (calculator.is_unbounded()) {
-    FML_LOG(INFO) << "returning partial bounds for unbounded DisplayList";
+uint32_t DisplayList::next_unique_id() {
+  static std::atomic<uint32_t> next_id{1};
+  uint32_t id;
+  do {
+    id = next_id.fetch_add(+1, std::memory_order_relaxed);
+  } while (id == 0);
+  return id;
+}
+
+class Culler {
+ public:
+  virtual ~Culler() = default;
+  virtual bool init(DispatchContext& context) = 0;
+  virtual void update(DispatchContext& context) = 0;
+};
+class NopCuller final : public Culler {
+ public:
+  static NopCuller instance;
+
+  ~NopCuller() = default;
+
+  bool init(DispatchContext& context) override {
+    // Setting next_render_index to 0 means that
+    // all rendering ops will be at or after that
+    // index so they will execute and all restore
+    // indices will be after it as well so all
+    // clip and transform operations will execute.
+    context.next_render_index = 0;
+    return true;
+  }
+  void update(DispatchContext& context) override {}
+};
+NopCuller NopCuller::instance = NopCuller();
+class VectorCuller final : public Culler {
+ public:
+  VectorCuller(const DlRTree* rtree, const std::vector<int>& rect_indices)
+      : rtree_(rtree), cur_(rect_indices.begin()), end_(rect_indices.end()) {}
+
+  ~VectorCuller() = default;
+
+  bool init(DispatchContext& context) override {
+    if (cur_ < end_) {
+      context.next_render_index = rtree_->id(*cur_++);
+      return true;
+    } else {
+      // Setting next_render_index to MAX_INT means that
+      // all rendering ops will be "before" that index and
+      // they will skip themselves and all clip and transform
+      // ops will see that the next render index is not
+      // before the next restore index (even if both are MAX_INT)
+      // and so they will also not execute.
+      // None of this really matters because returning false
+      // here should cause the Dispatch operation to abort,
+      // but this value is conceptually correct if that short
+      // circuit optimization isn't used.
+      context.next_render_index = std::numeric_limits<int>::max();
+      return false;
+    }
+  }
+  void update(DispatchContext& context) override {
+    if (++context.cur_index > context.next_render_index) {
+      while (cur_ < end_) {
+        context.next_render_index = rtree_->id(*cur_++);
+        if (context.next_render_index >= context.cur_index) {
+          // It should be rare that we have duplicate indices
+          // but if we do, then having a while loop is a cheap
+          // insurance for those cases.
+          // The main cause of duplicate indices is when a
+          // DrawDisplayListOp was added to this DisplayList and
+          // both are computing an R-Tree, in which case the
+          // builder method will forward all of the child
+          // DisplayList's rects to this R-Tree with the same
+          // op_index.
+          return;
+        }
+      }
+      context.next_render_index = std::numeric_limits<int>::max();
+    }
   }
-  bounds_ = accumulator.bounds();
+
+ private:
+  const DlRTree* rtree_;
+  std::vector<int>::const_iterator cur_;
+  std::vector<int>::const_iterator end_;
+};
+
+void DisplayList::Dispatch(DlOpReceiver& receiver) const {
+  uint8_t* ptr = storage_.get();
+  Dispatch(receiver, ptr, ptr + byte_count_, NopCuller::instance);
+}
+
+void DisplayList::Dispatch(DlOpReceiver& receiver,
+                           const SkIRect& cull_rect) const {
+  Dispatch(receiver, SkRect::Make(cull_rect));
 }
 
-void DisplayList::ComputeRTree() {
-  RTreeBoundsAccumulator accumulator;
-  DisplayListBoundsCalculator calculator(accumulator, &bounds_cull_);
-  Dispatch(calculator);
-  if (calculator.is_unbounded()) {
-    FML_LOG(INFO) << "returning partial rtree for unbounded DisplayList";
+void DisplayList::Dispatch(DlOpReceiver& receiver,
+                           const SkRect& cull_rect) const {
+  if (cull_rect.isEmpty()) {
+    return;
+  }
+  if (!has_rtree() || cull_rect.contains(bounds())) {
+    Dispatch(receiver);
+    return;
   }
-  rtree_ = accumulator.rtree();
+  const DlRTree* rtree = this->rtree().get();
+  FML_DCHECK(rtree != nullptr);
+  uint8_t* ptr = storage_.get();
+  std::vector<int> rect_indices;
+  rtree->search(cull_rect, &rect_indices);
+  VectorCuller culler(rtree, rect_indices);
+  Dispatch(receiver, ptr, ptr + byte_count_, culler);
 }
 
-void DisplayList::Dispatch(Dispatcher& dispatcher,
+void DisplayList::Dispatch(DlOpReceiver& receiver,
                            uint8_t* ptr,
-                           uint8_t* end) const {
+                           uint8_t* end,
+                           Culler& culler) const {
+  DispatchContext context = {
+      .receiver = receiver,
+      .cur_index = 0,
+      // next_render_index will be initialized by culler.init()
+      .next_restore_index = std::numeric_limits<int>::max(),
+  };
+  if (!culler.init(context)) {
+    return;
+  }
   while (ptr < end) {
     auto op = reinterpret_cast<const DLOp*>(ptr);
     ptr += op->size;
     FML_DCHECK(ptr <= end);
     switch (op->type) {
-#define DL_OP_DISPATCH(name)                                \
-  case DisplayListOpType::k##name:                          \
-    static_cast<const name##Op*>(op)->dispatch(dispatcher); \
+#define DL_OP_DISPATCH(name)                             \
+  case DisplayListOpType::k##name:                       \
+    static_cast<const name##Op*>(op)->dispatch(context); \
     break;
 
       FOR_EACH_DISPLAY_LIST_OP(DL_OP_DISPATCH)
+#ifdef IMPELLER_ENABLE_3D
+      DL_OP_DISPATCH(SetSceneColorSource)
+#endif  // IMPELLER_ENABLE_3D
 
 #undef DL_OP_DISPATCH
 
@@ -93,6 +200,7 @@ void DisplayList::Dispatch(Dispatcher& dispatcher,
         FML_DCHECK(false);
         return;
     }
+    culler.update(context);
   }
 }
 
@@ -110,6 +218,9 @@ void DisplayList::DisposeOps(uint8_t* ptr, uint8_t* end) {
     break;
 
       FOR_EACH_DISPLAY_LIST_OP(DL_OP_DISPOSE)
+#ifdef IMPELLER_ENABLE_3D
+      DL_OP_DISPOSE(SetSceneColorSource)
+#endif  // IMPELLER_ENABLE_3D
 
 #undef DL_OP_DISPOSE
 
@@ -148,6 +259,9 @@ static bool CompareOps(uint8_t* ptrA,
     break;
 
       FOR_EACH_DISPLAY_LIST_OP(DL_OP_EQUALS)
+#ifdef IMPELLER_ENABLE_3D
+      DL_OP_EQUALS(SetSceneColorSource)
+#endif  // IMPELLER_ENABLE_3D
 
 #undef DL_OP_EQUALS
 
@@ -186,19 +300,6 @@ static bool CompareOps(uint8_t* ptrA,
   return true;
 }
 
-void DisplayList::RenderTo(DisplayListBuilder* builder) const {
-  if (!builder) {
-    return;
-  }
-  Dispatch(*builder);
-}
-
-void DisplayList::RenderTo(SkCanvas* canvas, SkScalar opacity) const {
-  FML_DCHECK(can_apply_group_opacity() || opacity >= SK_Scalar1);
-  DisplayListCanvasDispatcher dispatcher(canvas, opacity);
-  Dispatch(dispatcher);
-}
-
 bool DisplayList::Equals(const DisplayList* other) const {
   if (this == other) {
     return true;
diff --git a/display_list/display_list.h b/display_list/display_list.h
index 1ffa60e424e78e920c03178d12e9670cafe6f816..fe12048418972f81d258d7f52be374365693fc78 100644
--- a/display_list/display_list.h
+++ b/display_list/display_list.h
@@ -8,9 +8,8 @@
 #include <memory>
 #include <optional>
 
-#include "flutter/display_list/display_list_rtree.h"
-#include "flutter/display_list/display_list_sampling_options.h"
-#include "flutter/display_list/types.h"
+#include "flutter/display_list/dl_sampling_options.h"
+#include "flutter/display_list/geometry/dl_rtree.h"
 #include "flutter/fml/logging.h"
 
 // The Flutter DisplayList mechanism encapsulates a persistent sequence of
@@ -18,41 +17,36 @@
 //
 // This file contains the definitions for:
 // DisplayList: the base class that holds the information about the
-//              sequence of operations and can dispatch them to a Dispatcher
-// Dispatcher: a pure virtual interface which can be implemented to field
-//             the requests for purposes such as sending them to an SkCanvas
-//             or detecting various rendering optimization scenarios
-// DisplayListBuilder: a class for constructing a DisplayList from the same
-//                     calls defined in the Dispatcher
+//              sequence of operations and can dispatch them to a DlOpReceiver
+// DlOpReceiver: a pure virtual interface which can be implemented to field
+//               the requests for purposes such as sending them to an SkCanvas
+//               or detecting various rendering optimization scenarios
+// DisplayListBuilder: a class for constructing a DisplayList from DlCanvas
+//                     method calls and which can act as a DlOpReceiver as well
 //
 // Other files include various class definitions for dealing with display
 // lists, such as:
-// display_list_canvas.h: classes to interact between SkCanvas and DisplayList
-//                        (SkCanvas->DisplayList adapter and vice versa)
+// skia/dl_sk_*.h: classes to interact between SkCanvas and DisplayList
+//                 (SkCanvas->DisplayList adapter and vice versa)
 //
 // display_list_utils.h: various utility classes to ease implementing
-//                       a Dispatcher, including NOP implementations of
+//                       a DlOpReceiver, including NOP implementations of
 //                       the attribute, clip, and transform methods,
 //                       classes to track attributes, clips, and transforms
 //                       and a class to compute the bounds of a DisplayList
-//                       Any class implementing Dispatcher can inherit from
+//                       Any class implementing DlOpReceiver can inherit from
 //                       these utility classes to simplify its creation
 //
-// The Flutter DisplayList mechanism can be used in place of the Skia
-// SkPicture mechanism. The primary means of communication into and out
-// of the DisplayList is through the Dispatcher virtual class which
-// provides a nearly 1:1 translation between the records of the DisplayList
-// to method calls.
+// The Flutter DisplayList mechanism is used in a similar manner to the Skia
+// SkPicture mechanism.
 //
-// A DisplayList can be created directly using a DisplayListBuilder and
-// the Dispatcher methods that it implements, or it can be created from
-// a sequence of SkCanvas calls using the DisplayListCanvasRecorder class.
+// A DisplayList must be created using a DisplayListBuilder using its stateless
+// methods inherited from DlCanvas.
 //
-// A DisplayList can be read back by implementing the Dispatcher virtual
+// A DisplayList can be read back by implementing the DlOpReceiver virtual
 // methods (with help from some of the classes in the utils file) and
-// passing an instance to the dispatch() method, or it can be rendered
-// to Skia using a DisplayListCanvasDispatcher or simply by passing an
-// SkCanvas pointer to its renderTo() method.
+// passing an instance to the Dispatch() method, or it can be rendered
+// to Skia using a DlSkCanvasDispatcher.
 //
 // The mechanism is inspired by the SkLiteDL class that is not directly
 // supported by Skia, but has been recommended as a basis for custom
@@ -62,7 +56,6 @@ namespace flutter {
 
 #define FOR_EACH_DISPLAY_LIST_OP(V) \
   V(SetAntiAlias)                   \
-  V(SetDither)                      \
   V(SetInvertColors)                \
                                     \
   V(SetStrokeCap)                   \
@@ -75,37 +68,27 @@ namespace flutter {
   V(SetColor)                       \
   V(SetBlendMode)                   \
                                     \
-  V(SetBlender)                     \
-  V(ClearBlender)                   \
-                                    \
-  V(SetSkPathEffect)                \
   V(SetPodPathEffect)               \
   V(ClearPathEffect)                \
                                     \
   V(ClearColorFilter)               \
   V(SetPodColorFilter)              \
-  V(SetSkColorFilter)               \
                                     \
   V(ClearColorSource)               \
   V(SetPodColorSource)              \
-  V(SetSkColorSource)               \
   V(SetImageColorSource)            \
   V(SetRuntimeEffectColorSource)    \
                                     \
   V(ClearImageFilter)               \
   V(SetPodImageFilter)              \
-  V(SetSkImageFilter)               \
   V(SetSharedImageFilter)           \
                                     \
   V(ClearMaskFilter)                \
   V(SetPodMaskFilter)               \
-  V(SetSkMaskFilter)                \
                                     \
   V(Save)                           \
   V(SaveLayer)                      \
-  V(SaveLayerBounds)                \
   V(SaveLayerBackdrop)              \
-  V(SaveLayerBackdropBounds)        \
   V(Restore)                        \
                                     \
   V(Translate)                      \
@@ -139,30 +122,32 @@ namespace flutter {
   V(DrawLines)                      \
   V(DrawPolygon)                    \
   V(DrawVertices)                   \
-  V(DrawSkVertices)                 \
                                     \
   V(DrawImage)                      \
   V(DrawImageWithAttr)              \
   V(DrawImageRect)                  \
   V(DrawImageNine)                  \
   V(DrawImageNineWithAttr)          \
-  V(DrawImageLattice)               \
   V(DrawAtlas)                      \
   V(DrawAtlasCulled)                \
                                     \
-  V(DrawSkPicture)                  \
-  V(DrawSkPictureMatrix)            \
   V(DrawDisplayList)                \
   V(DrawTextBlob)                   \
+  V(DrawTextFrame)                  \
                                     \
   V(DrawShadow)                     \
   V(DrawShadowTransparentOccluder)
 
 #define DL_OP_TO_ENUM_VALUE(name) k##name,
-enum class DisplayListOpType { FOR_EACH_DISPLAY_LIST_OP(DL_OP_TO_ENUM_VALUE) };
+enum class DisplayListOpType {
+  FOR_EACH_DISPLAY_LIST_OP(DL_OP_TO_ENUM_VALUE)
+#ifdef IMPELLER_ENABLE_3D
+      DL_OP_TO_ENUM_VALUE(SetSceneColorSource)
+#endif  // IMPELLER_ENABLE_3D
+};
 #undef DL_OP_TO_ENUM_VALUE
 
-class Dispatcher;
+class DlOpReceiver;
 class DisplayListBuilder;
 
 class SaveLayerOptions {
@@ -172,11 +157,13 @@ class SaveLayerOptions {
 
   SaveLayerOptions() : flags_(0) {}
   SaveLayerOptions(const SaveLayerOptions& options) : flags_(options.flags_) {}
-  SaveLayerOptions(const SaveLayerOptions* options) : flags_(options->flags_) {}
+  explicit SaveLayerOptions(const SaveLayerOptions* options)
+      : flags_(options->flags_) {}
 
   SaveLayerOptions without_optimizations() const {
     SaveLayerOptions options;
     options.fRendersWithAttributes = fRendersWithAttributes;
+    options.fBoundsFromCaller = fBoundsFromCaller;
     return options;
   }
 
@@ -194,6 +181,33 @@ class SaveLayerOptions {
     return options;
   }
 
+  // Returns true iff the bounds for the saveLayer operation were provided
+  // by the caller, otherwise the bounds will have been computed by the
+  // DisplayListBuilder and provided for reference.
+  bool bounds_from_caller() const { return fBoundsFromCaller; }
+  SaveLayerOptions with_bounds_from_caller() const {
+    SaveLayerOptions options(this);
+    options.fBoundsFromCaller = true;
+    return options;
+  }
+  SaveLayerOptions without_bounds_from_caller() const {
+    SaveLayerOptions options(this);
+    options.fBoundsFromCaller = false;
+    return options;
+  }
+  bool bounds_were_calculated() const { return !fBoundsFromCaller; }
+
+  // Returns true iff the bounds for the saveLayer do not fully cover the
+  // contained rendering operations. This will only occur if the original
+  // caller supplied bounds and those bounds were not a strict superset
+  // of the content bounds computed by the DisplayListBuilder.
+  bool content_is_clipped() const { return fContentIsClipped; }
+  SaveLayerOptions with_content_is_clipped() const {
+    SaveLayerOptions options(this);
+    options.fContentIsClipped = true;
+    return options;
+  }
+
   SaveLayerOptions& operator=(const SaveLayerOptions& other) {
     flags_ = other.flags_;
     return *this;
@@ -210,13 +224,37 @@ class SaveLayerOptions {
     struct {
       unsigned fRendersWithAttributes : 1;
       unsigned fCanDistributeOpacity : 1;
+      unsigned fBoundsFromCaller : 1;
+      unsigned fContentIsClipped : 1;
     };
     uint32_t flags_;
   };
 };
 
+// Manages a buffer allocated with malloc.
+class DisplayListStorage {
+ public:
+  DisplayListStorage() = default;
+  DisplayListStorage(DisplayListStorage&&) = default;
+
+  uint8_t* get() const { return ptr_.get(); }
+
+  void realloc(size_t count) {
+    ptr_.reset(static_cast<uint8_t*>(std::realloc(ptr_.release(), count)));
+    FML_CHECK(ptr_);
+  }
+
+ private:
+  struct FreeDeleter {
+    void operator()(uint8_t* p) { std::free(p); }
+  };
+  std::unique_ptr<uint8_t, FreeDeleter> ptr_;
+};
+
+class Culler;
+
 // The base class that contains a sequence of rendering operations
-// for dispatch to a Dispatcher. These objects must be instantiated
+// for dispatch to a DlOpReceiver. These objects must be instantiated
 // through an instance of DisplayListBuilder::build().
 class DisplayList : public SkRefCnt {
  public:
@@ -224,18 +262,13 @@ class DisplayList : public SkRefCnt {
 
   ~DisplayList();
 
-  void Dispatch(Dispatcher& ctx) const {
-    uint8_t* ptr = storage_.get();
-    Dispatch(ctx, ptr, ptr + byte_count_);
-  }
-
-  void RenderTo(DisplayListBuilder* builder) const;
+  void Dispatch(DlOpReceiver& ctx) const;
+  void Dispatch(DlOpReceiver& ctx, const SkRect& cull_rect) const;
+  void Dispatch(DlOpReceiver& ctx, const SkIRect& cull_rect) const;
 
-  void RenderTo(SkCanvas* canvas, SkScalar opacity = SK_Scalar1) const;
-
-  // SkPicture always includes nested bytes, but nested ops are
-  // only included if requested. The defaults used here for these
-  // accessors follow that pattern.
+  // From historical behavior, SkPicture always included nested bytes,
+  // but nested ops are only included if requested. The defaults used
+  // here for these accessors follow that pattern.
   size_t bytes(bool nested = true) const {
     return sizeof(DisplayList) + byte_count_ +
            (nested ? nested_byte_count_ : 0);
@@ -247,63 +280,69 @@ class DisplayList : public SkRefCnt {
 
   uint32_t unique_id() const { return unique_id_; }
 
-  const SkRect& bounds() {
-    if (bounds_.width() < 0.0) {
-      // ComputeBounds() will leave the variable with a
-      // non-negative width and height
-      ComputeBounds();
-    }
-    return bounds_;
-  }
+  const SkRect& bounds() const { return bounds_; }
 
-  sk_sp<const DlRTree> rtree() {
-    if (!rtree_) {
-      ComputeRTree();
-    }
-    return rtree_;
-  }
+  bool has_rtree() const { return rtree_ != nullptr; }
+  sk_sp<const DlRTree> rtree() const { return rtree_; }
 
   bool Equals(const DisplayList* other) const;
   bool Equals(const DisplayList& other) const { return Equals(&other); }
-  bool Equals(sk_sp<const DisplayList> other) const {
+  bool Equals(const sk_sp<const DisplayList>& other) const {
     return Equals(other.get());
   }
 
   bool can_apply_group_opacity() const { return can_apply_group_opacity_; }
-
-  static void DisposeOps(uint8_t* ptr, uint8_t* end);
+  bool isUIThreadSafe() const { return is_ui_thread_safe_; }
+
+  /// @brief     Indicates if there are any rendering operations in this
+  ///            DisplayList that will modify a surface of transparent black
+  ///            pixels.
+  ///
+  /// This condition can be used to determine whether to create a cleared
+  /// surface, render a DisplayList into it, and then composite the
+  /// result into a scene. It is not uncommon for code in the engine to
+  /// come across such degenerate DisplayList objects when slicing up a
+  /// frame between platform views.
+  bool modifies_transparent_black() const {
+    return modifies_transparent_black_;
+  }
 
  private:
-  DisplayList(uint8_t* ptr,
+  DisplayList(DisplayListStorage&& ptr,
               size_t byte_count,
               unsigned int op_count,
               size_t nested_byte_count,
               unsigned int nested_op_count,
-              const SkRect& cull_rect,
-              bool can_apply_group_opacity);
+              const SkRect& bounds,
+              bool can_apply_group_opacity,
+              bool is_ui_thread_safe,
+              bool modifies_transparent_black,
+              sk_sp<const DlRTree> rtree);
 
-  struct SkFreeDeleter {
-    void operator()(uint8_t* p) { sk_free(p); }
-  };
-  std::unique_ptr<uint8_t, SkFreeDeleter> storage_;
-  size_t byte_count_;
-  unsigned int op_count_;
+  static uint32_t next_unique_id();
+
+  static void DisposeOps(uint8_t* ptr, uint8_t* end);
+
+  const DisplayListStorage storage_;
+  const size_t byte_count_;
+  const unsigned int op_count_;
 
-  size_t nested_byte_count_;
-  unsigned int nested_op_count_;
+  const size_t nested_byte_count_;
+  const unsigned int nested_op_count_;
 
-  uint32_t unique_id_;
-  SkRect bounds_;
-  sk_sp<const DlRTree> rtree_;
+  const uint32_t unique_id_;
+  const SkRect bounds_;
 
-  // Only used for drawPaint() and drawColor()
-  SkRect bounds_cull_;
+  const bool can_apply_group_opacity_;
+  const bool is_ui_thread_safe_;
+  const bool modifies_transparent_black_;
 
-  bool can_apply_group_opacity_;
+  const sk_sp<const DlRTree> rtree_;
 
-  void ComputeBounds();
-  void ComputeRTree();
-  void Dispatch(Dispatcher& ctx, uint8_t* ptr, uint8_t* end) const;
+  void Dispatch(DlOpReceiver& ctx,
+                uint8_t* ptr,
+                uint8_t* end,
+                Culler& culler) const;
 
   friend class DisplayListBuilder;
 };
diff --git a/display_list/display_list_benchmarks_canvas_provider.h b/display_list/display_list_benchmarks_canvas_provider.h
deleted file mode 100644
index 3b12ef7b3b33ddd32b3d9afcb0637545dc6e38b2..0000000000000000000000000000000000000000
--- a/display_list/display_list_benchmarks_canvas_provider.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKS_CANVAS_PROVIDER_H_
-#define FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKS_CANVAS_PROVIDER_H_
-
-#include "flutter/fml/mapping.h"
-#include "flutter/testing/testing.h"
-
-#include "third_party/skia/include/core/SkData.h"
-#include "third_party/skia/include/core/SkSurface.h"
-
-namespace flutter {
-namespace testing {
-
-class CanvasProvider {
- public:
-  virtual ~CanvasProvider() = default;
-  virtual const std::string BackendName() = 0;
-  virtual void InitializeSurface(const size_t width, const size_t height) = 0;
-  virtual sk_sp<SkSurface> GetSurface() = 0;
-  virtual sk_sp<SkSurface> MakeOffscreenSurface(const size_t width,
-                                                const size_t height) = 0;
-
-  virtual bool Snapshot(std::string filename) {
-#ifdef BENCHMARKS_NO_SNAPSHOT
-    return false;
-#else
-    auto image = GetSurface()->makeImageSnapshot();
-    if (!image) {
-      return false;
-    }
-    auto raster = image->makeRasterImage();
-    if (!raster) {
-      return false;
-    }
-    auto data = raster->encodeToData();
-    if (!data) {
-      return false;
-    }
-    fml::NonOwnedMapping mapping(static_cast<const uint8_t*>(data->data()),
-                                 data->size());
-    return WriteAtomically(OpenFixturesDirectory(), filename.c_str(), mapping);
-#endif
-  }
-};
-
-}  // namespace testing
-}  // namespace flutter
-
-#endif  // FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKS_CANVAS_PROVIDER_H_
diff --git a/display_list/display_list_benchmarks_gl.h b/display_list/display_list_benchmarks_gl.h
deleted file mode 100644
index 0c0d05aa85437fb6b0a5418edb1f1e3054d5887b..0000000000000000000000000000000000000000
--- a/display_list/display_list_benchmarks_gl.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKS_GL_H_
-#define FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKS_GL_H_
-
-#include "flutter/display_list/display_list_benchmarks_canvas_provider.h"
-#include "flutter/testing/test_gl_surface.h"
-
-namespace flutter {
-namespace testing {
-
-class OpenGLCanvasProvider : public CanvasProvider {
- public:
-  virtual ~OpenGLCanvasProvider() = default;
-  void InitializeSurface(const size_t width, const size_t height) override;
-  sk_sp<SkSurface> GetSurface() override;
-  sk_sp<SkSurface> MakeOffscreenSurface(const size_t width,
-                                        const size_t height) override;
-  const std::string BackendName() override { return "OpenGL"; }
-
- private:
-  SkISize surface_size_;
-  sk_sp<SkSurface> surface_;
-  std::unique_ptr<TestGLSurface> gl_surface_;
-};
-
-}  // namespace testing
-}  // namespace flutter
-
-#endif  // FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKS_GL_H_
diff --git a/display_list/display_list_benchmarks_metal.cc b/display_list/display_list_benchmarks_metal.cc
deleted file mode 100644
index 904fa7d58b4c3c84c56d3ccebb36644985459429..0000000000000000000000000000000000000000
--- a/display_list/display_list_benchmarks_metal.cc
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "flutter/display_list/display_list_benchmarks_metal.h"
-#include "flutter/display_list/display_list_benchmarks.h"
-
-#include "third_party/skia/include/core/SkCanvas.h"
-
-namespace flutter {
-namespace testing {
-
-void MetalCanvasProvider::InitializeSurface(const size_t width,
-                                            const size_t height) {
-  metal_context_ = std::make_unique<TestMetalContext>();
-  metal_surface_ =
-      TestMetalSurface::Create(*metal_context_, SkISize::Make(width, height));
-  metal_surface_->GetSurface()->getCanvas()->clear(SK_ColorTRANSPARENT);
-}
-
-sk_sp<SkSurface> MetalCanvasProvider::GetSurface() {
-  if (!metal_surface_) {
-    return nullptr;
-  }
-  return metal_surface_->GetSurface();
-}
-
-sk_sp<SkSurface> MetalCanvasProvider::MakeOffscreenSurface(
-    const size_t width,
-    const size_t height) {
-  metal_offscreen_surface_ =
-      TestMetalSurface::Create(*metal_context_, SkISize::Make(width, height));
-  return metal_offscreen_surface_->GetSurface();
-}
-
-RUN_DISPLAYLIST_BENCHMARKS(Metal)
-
-}  // namespace testing
-}  // namespace flutter
diff --git a/display_list/display_list_benchmarks_metal.h b/display_list/display_list_benchmarks_metal.h
deleted file mode 100644
index 3df8a11a8b85073bdcf6c3843406c71a3963d43b..0000000000000000000000000000000000000000
--- a/display_list/display_list_benchmarks_metal.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKS_METAL_H_
-#define FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKS_METAL_H_
-
-#include "flutter/display_list/display_list_benchmarks_canvas_provider.h"
-#include "flutter/testing/test_metal_surface.h"
-
-namespace flutter {
-namespace testing {
-
-class MetalCanvasProvider : public CanvasProvider {
- public:
-  virtual ~MetalCanvasProvider() = default;
-
-  void InitializeSurface(const size_t width, const size_t height) override;
-  sk_sp<SkSurface> GetSurface() override;
-  sk_sp<SkSurface> MakeOffscreenSurface(const size_t width,
-                                        const size_t height) override;
-  const std::string BackendName() override { return "Metal"; }
-
- private:
-  std::unique_ptr<TestMetalContext> metal_context_;
-  std::unique_ptr<TestMetalSurface> metal_surface_;
-  std::unique_ptr<TestMetalSurface> metal_offscreen_surface_;
-};
-
-}  // namespace testing
-}  // namespace flutter
-
-#endif  // FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKS_METAL_H_
diff --git a/display_list/display_list_benchmarks_software.cc b/display_list/display_list_benchmarks_software.cc
deleted file mode 100644
index f05bf95b05733cf874daeb8907ebbf64e1f9959b..0000000000000000000000000000000000000000
--- a/display_list/display_list_benchmarks_software.cc
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "flutter/display_list/display_list_benchmarks_software.h"
-#include "flutter/display_list/display_list_benchmarks.h"
-
-namespace flutter {
-namespace testing {
-
-void SoftwareCanvasProvider::InitializeSurface(const size_t width,
-                                               const size_t height) {
-  surface_ = SkSurface::MakeRasterN32Premul(width, height);
-  surface_->getCanvas()->clear(SK_ColorTRANSPARENT);
-}
-
-sk_sp<SkSurface> SoftwareCanvasProvider::MakeOffscreenSurface(
-    const size_t width,
-    const size_t height) {
-  auto surface = SkSurface::MakeRasterN32Premul(width, height);
-  surface->getCanvas()->clear(SK_ColorTRANSPARENT);
-  return surface;
-}
-
-RUN_DISPLAYLIST_BENCHMARKS(Software)
-
-}  // namespace testing
-}  // namespace flutter
diff --git a/display_list/display_list_benchmarks_software.h b/display_list/display_list_benchmarks_software.h
deleted file mode 100644
index 6451c0cbed472d21020dd375eb4a5d328f047b6b..0000000000000000000000000000000000000000
--- a/display_list/display_list_benchmarks_software.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKS_SOFTWARE_H_
-#define FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKS_SOFTWARE_H_
-
-#include "flutter/display_list/display_list_benchmarks_canvas_provider.h"
-
-#include "third_party/skia/include/core/SkSurface.h"
-
-namespace flutter {
-namespace testing {
-
-class SoftwareCanvasProvider : public CanvasProvider {
- public:
-  virtual ~SoftwareCanvasProvider() = default;
-  void InitializeSurface(const size_t width, const size_t height) override;
-  sk_sp<SkSurface> GetSurface() override { return surface_; }
-  sk_sp<SkSurface> MakeOffscreenSurface(const size_t width,
-                                        const size_t height) override;
-  const std::string BackendName() override { return "Software"; }
-
- private:
-  sk_sp<SkSurface> surface_;
-};
-
-}  // namespace testing
-}  // namespace flutter
-
-#endif  // FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKS_SOFTWARE_H_
diff --git a/display_list/display_list_builder_multiplexer.cc b/display_list/display_list_builder_multiplexer.cc
deleted file mode 100644
index 0c029c532f89d7c359200c8eb1b404d1ddb3ab38..0000000000000000000000000000000000000000
--- a/display_list/display_list_builder_multiplexer.cc
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "flutter/display_list/display_list_builder_multiplexer.h"
-
-namespace flutter {
-
-void DisplayListBuilderMultiplexer::addBuilder(DisplayListBuilder* builder) {
-  builders_.push_back(builder);
-}
-
-void DisplayListBuilderMultiplexer::saveLayer(
-    const SkRect* bounds,
-    const DlPaint* paint,
-    const DlImageFilter* backdrop_filter) {
-  for (auto* builder : builders_) {
-    builder->saveLayer(bounds, paint, backdrop_filter);
-  }
-}
-
-void DisplayListBuilderMultiplexer::restore() {
-  for (auto* builder : builders_) {
-    builder->restore();
-  }
-}
-
-}  // namespace flutter
diff --git a/display_list/display_list_builder_multiplexer.h b/display_list/display_list_builder_multiplexer.h
deleted file mode 100644
index 498301d13677339355e68bff406fcd17d70dacbf..0000000000000000000000000000000000000000
--- a/display_list/display_list_builder_multiplexer.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_BUILDER_MULTIPLEXER_H_
-#define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_BUILDER_MULTIPLEXER_H_
-
-#include "flutter/display_list/display_list_builder.h"
-#include "flutter/display_list/display_list_image_filter.h"
-#include "flutter/display_list/display_list_paint.h"
-#include "flutter/fml/macros.h"
-
-namespace flutter {
-
-/// A class that mutiplexes some of the DisplayListBuilder calls to multiple
-/// other builders. For now it only implements saveLayer and restore as those
-/// are needed to create a replacement for PaintContext::internal_nodes_canvas.
-class DisplayListBuilderMultiplexer {
- public:
-  DisplayListBuilderMultiplexer() = default;
-
-  void addBuilder(DisplayListBuilder* builder);
-
-  void saveLayer(const SkRect* bounds,
-                 const DlPaint* paint,
-                 const DlImageFilter* backdrop_filter = nullptr);
-
-  void restore();
-
- private:
-  std::vector<DisplayListBuilder*> builders_;
-};
-
-}  // namespace flutter
-
-#endif  // FLUTTER_DISPLAY_LIST_DISPLAY_LIST_BUILDER_MULTIPLEXER_H_
diff --git a/display_list/display_list_canvas_recorder.cc b/display_list/display_list_canvas_recorder.cc
deleted file mode 100644
index 406ee96015bc9f1d6681f82dbfc1399d280dc7a7..0000000000000000000000000000000000000000
--- a/display_list/display_list_canvas_recorder.cc
+++ /dev/null
@@ -1,322 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "flutter/display_list/display_list_canvas_recorder.h"
-
-#include "flutter/display_list/display_list_blend_mode.h"
-#include "flutter/display_list/display_list_builder.h"
-#include "flutter/display_list/display_list_image_filter.h"
-
-namespace flutter {
-
-#define CHECK_DISPOSE(ret)                                                \
-  do {                                                                    \
-    if (!builder_) {                                                      \
-      FML_DCHECK(builder_)                                                \
-          << "Calling method on DisplayListCanvasRecorder after Build()"; \
-      return ret;                                                         \
-    }                                                                     \
-  } while (0)
-
-DisplayListCanvasRecorder::DisplayListCanvasRecorder(const SkRect& bounds)
-    : SkCanvasVirtualEnforcer(bounds.width(), bounds.height()),
-      builder_(sk_make_sp<DisplayListBuilder>(bounds)) {}
-
-sk_sp<DisplayList> DisplayListCanvasRecorder::Build() {
-  CHECK_DISPOSE(nullptr);
-  sk_sp<DisplayList> display_list = builder_->Build();
-  builder_.reset();
-  return display_list;
-}
-
-// clang-format off
-void DisplayListCanvasRecorder::didConcat44(const SkM44& m44) {
-  CHECK_DISPOSE();
-  builder_->transform(m44);
-}
-// clang-format on
-void DisplayListCanvasRecorder::didSetM44(const SkM44& matrix) {
-  CHECK_DISPOSE();
-  builder_->transformReset();
-  builder_->transform(matrix);
-}
-void DisplayListCanvasRecorder::didTranslate(SkScalar tx, SkScalar ty) {
-  CHECK_DISPOSE();
-  builder_->translate(tx, ty);
-}
-void DisplayListCanvasRecorder::didScale(SkScalar sx, SkScalar sy) {
-  CHECK_DISPOSE();
-  builder_->scale(sx, sy);
-}
-
-void DisplayListCanvasRecorder::onClipRect(const SkRect& rect,
-                                           SkClipOp clip_op,
-                                           ClipEdgeStyle edge_style) {
-  CHECK_DISPOSE();
-  builder_->clipRect(rect, clip_op,
-                     edge_style == ClipEdgeStyle::kSoft_ClipEdgeStyle);
-}
-void DisplayListCanvasRecorder::onClipRRect(const SkRRect& rrect,
-                                            SkClipOp clip_op,
-                                            ClipEdgeStyle edge_style) {
-  CHECK_DISPOSE();
-  builder_->clipRRect(rrect, clip_op,
-                      edge_style == ClipEdgeStyle::kSoft_ClipEdgeStyle);
-}
-void DisplayListCanvasRecorder::onClipPath(const SkPath& path,
-                                           SkClipOp clip_op,
-                                           ClipEdgeStyle edge_style) {
-  CHECK_DISPOSE();
-  builder_->clipPath(path, clip_op,
-                     edge_style == ClipEdgeStyle::kSoft_ClipEdgeStyle);
-}
-
-void DisplayListCanvasRecorder::willSave() {
-  CHECK_DISPOSE();
-  builder_->save();
-}
-SkCanvas::SaveLayerStrategy DisplayListCanvasRecorder::getSaveLayerStrategy(
-    const SaveLayerRec& rec) {
-  CHECK_DISPOSE(SaveLayerStrategy::kNoLayer_SaveLayerStrategy);
-  std::shared_ptr<DlImageFilter> backdrop = DlImageFilter::From(rec.fBackdrop);
-  if (rec.fPaint) {
-    builder_->setAttributesFromPaint(*rec.fPaint, kSaveLayerWithPaintFlags);
-    builder_->saveLayer(rec.fBounds, SaveLayerOptions::kWithAttributes,
-                        backdrop.get());
-  } else {
-    builder_->saveLayer(rec.fBounds, SaveLayerOptions::kNoAttributes,
-                        backdrop.get());
-  }
-  return SaveLayerStrategy::kNoLayer_SaveLayerStrategy;
-}
-void DisplayListCanvasRecorder::didRestore() {
-  CHECK_DISPOSE();
-  builder_->restore();
-}
-
-void DisplayListCanvasRecorder::onDrawPaint(const SkPaint& paint) {
-  CHECK_DISPOSE();
-  builder_->setAttributesFromPaint(paint, kDrawPaintFlags);
-  builder_->drawPaint();
-}
-void DisplayListCanvasRecorder::onDrawRect(const SkRect& rect,
-                                           const SkPaint& paint) {
-  CHECK_DISPOSE();
-  builder_->setAttributesFromPaint(paint, kDrawRectFlags);
-  builder_->drawRect(rect);
-}
-void DisplayListCanvasRecorder::onDrawRRect(const SkRRect& rrect,
-                                            const SkPaint& paint) {
-  CHECK_DISPOSE();
-  builder_->setAttributesFromPaint(paint, kDrawRRectFlags);
-  builder_->drawRRect(rrect);
-}
-void DisplayListCanvasRecorder::onDrawDRRect(const SkRRect& outer,
-                                             const SkRRect& inner,
-                                             const SkPaint& paint) {
-  CHECK_DISPOSE();
-  builder_->setAttributesFromPaint(paint, kDrawDRRectFlags);
-  builder_->drawDRRect(outer, inner);
-}
-void DisplayListCanvasRecorder::onDrawOval(const SkRect& rect,
-                                           const SkPaint& paint) {
-  CHECK_DISPOSE();
-  builder_->setAttributesFromPaint(paint, kDrawOvalFlags);
-  builder_->drawOval(rect);
-}
-void DisplayListCanvasRecorder::onDrawArc(const SkRect& rect,
-                                          SkScalar startAngle,
-                                          SkScalar sweepAngle,
-                                          bool useCenter,
-                                          const SkPaint& paint) {
-  CHECK_DISPOSE();
-  builder_->setAttributesFromPaint(paint,
-                                   useCenter  //
-                                       ? kDrawArcWithCenterFlags
-                                       : kDrawArcNoCenterFlags);
-  builder_->drawArc(rect, startAngle, sweepAngle, useCenter);
-}
-void DisplayListCanvasRecorder::onDrawPath(const SkPath& path,
-                                           const SkPaint& paint) {
-  CHECK_DISPOSE();
-  builder_->setAttributesFromPaint(paint, kDrawPathFlags);
-  builder_->drawPath(path);
-}
-
-void DisplayListCanvasRecorder::onDrawPoints(SkCanvas::PointMode mode,
-                                             size_t count,
-                                             const SkPoint pts[],
-                                             const SkPaint& paint) {
-  CHECK_DISPOSE();
-  switch (mode) {
-    case SkCanvas::kPoints_PointMode:
-      builder_->setAttributesFromPaint(paint, kDrawPointsAsPointsFlags);
-      break;
-    case SkCanvas::kLines_PointMode:
-      builder_->setAttributesFromPaint(paint, kDrawPointsAsLinesFlags);
-      break;
-    case SkCanvas::kPolygon_PointMode:
-      builder_->setAttributesFromPaint(paint, kDrawPointsAsPolygonFlags);
-      break;
-  }
-  if (mode == SkCanvas::PointMode::kLines_PointMode && count == 2) {
-    builder_->drawLine(pts[0], pts[1]);
-  } else {
-    uint32_t count32 = static_cast<uint32_t>(count);
-    // TODO(flar): depending on the mode we could break it down into
-    // multiple calls to drawPoints, but how much do we really want
-    // to support more than a couple billion points?
-    FML_DCHECK(count32 == count);
-    builder_->drawPoints(mode, count32, pts);
-  }
-}
-void DisplayListCanvasRecorder::onDrawVerticesObject(const SkVertices* vertices,
-                                                     SkBlendMode mode,
-                                                     const SkPaint& paint) {
-  CHECK_DISPOSE();
-  builder_->setAttributesFromPaint(paint, kDrawVerticesFlags);
-  builder_->drawSkVertices(sk_ref_sp(vertices), mode);
-}
-
-void DisplayListCanvasRecorder::onDrawImage2(const SkImage* image,
-                                             SkScalar dx,
-                                             SkScalar dy,
-                                             const SkSamplingOptions& sampling,
-                                             const SkPaint* paint) {
-  CHECK_DISPOSE();
-  if (paint != nullptr) {
-    builder_->setAttributesFromPaint(*paint, kDrawImageWithPaintFlags);
-  }
-  builder_->drawImage(DlImage::Make(image), SkPoint::Make(dx, dy),
-                      ToDl(sampling), paint != nullptr);
-}
-void DisplayListCanvasRecorder::onDrawImageRect2(
-    const SkImage* image,
-    const SkRect& src,
-    const SkRect& dst,
-    const SkSamplingOptions& sampling,
-    const SkPaint* paint,
-    SrcRectConstraint constraint) {
-  CHECK_DISPOSE();
-  if (paint != nullptr) {
-    builder_->setAttributesFromPaint(*paint, kDrawImageRectWithPaintFlags);
-  }
-  builder_->drawImageRect(DlImage::Make(image), src, dst, ToDl(sampling),
-                          paint != nullptr, constraint);
-}
-void DisplayListCanvasRecorder::onDrawImageLattice2(const SkImage* image,
-                                                    const Lattice& lattice,
-                                                    const SkRect& dst,
-                                                    SkFilterMode filter,
-                                                    const SkPaint* paint) {
-  CHECK_DISPOSE();
-  if (paint != nullptr) {
-    // SkCanvas will always construct a paint,
-    // though it is a default paint most of the time
-    SkPaint default_paint;
-    if (*paint == default_paint) {
-      paint = nullptr;
-    } else {
-      builder_->setAttributesFromPaint(*paint, kDrawImageLatticeWithPaintFlags);
-    }
-  }
-  builder_->drawImageLattice(DlImage::Make(image), lattice, dst, ToDl(filter),
-                             paint != nullptr);
-}
-void DisplayListCanvasRecorder::onDrawAtlas2(const SkImage* image,
-                                             const SkRSXform xform[],
-                                             const SkRect src[],
-                                             const SkColor colors[],
-                                             int count,
-                                             SkBlendMode mode,
-                                             const SkSamplingOptions& sampling,
-                                             const SkRect* cull,
-                                             const SkPaint* paint) {
-  CHECK_DISPOSE();
-  if (paint != nullptr) {
-    builder_->setAttributesFromPaint(*paint, kDrawAtlasWithPaintFlags);
-  }
-  const DlColor* dl_colors = reinterpret_cast<const DlColor*>(colors);
-  builder_->drawAtlas(DlImage::Make(image), xform, src, dl_colors, count,
-                      ToDl(mode), ToDl(sampling), cull, paint != nullptr);
-}
-
-void DisplayListCanvasRecorder::onDrawTextBlob(const SkTextBlob* blob,
-                                               SkScalar x,
-                                               SkScalar y,
-                                               const SkPaint& paint) {
-  CHECK_DISPOSE();
-  builder_->setAttributesFromPaint(paint, kDrawTextBlobFlags);
-  builder_->drawTextBlob(sk_ref_sp(blob), x, y);
-}
-
-void DisplayListCanvasRecorder::onDrawPicture(const SkPicture* picture,
-                                              const SkMatrix* matrix,
-                                              const SkPaint* paint) {
-  CHECK_DISPOSE();
-  if (paint != nullptr) {
-    builder_->setAttributesFromPaint(*paint, kDrawPictureWithPaintFlags);
-  }
-  builder_->drawPicture(sk_ref_sp(picture), matrix, paint != nullptr);
-}
-
-void DisplayListCanvasRecorder::onDrawShadowRec(const SkPath& path,
-                                                const SkDrawShadowRec& rec) {
-  CHECK_DISPOSE();
-  // Skia does not expose the SkDrawShadowRec structure in a public
-  // header file so we cannot record this operation.
-  // See: https://bugs.chromium.org/p/skia/issues/detail?id=12125
-  FML_DLOG(ERROR) << "Unimplemented DisplayListCanvasRecorder::"
-                  << __FUNCTION__;
-}
-
-void DisplayListCanvasRecorder::onDrawBehind(const SkPaint&) {
-  CHECK_DISPOSE();
-  FML_DLOG(ERROR) << "Unimplemented DisplayListCanvasRecorder::"
-                  << __FUNCTION__;
-}
-
-void DisplayListCanvasRecorder::onDrawRegion(const SkRegion& region,
-                                             const SkPaint& paint) {
-  CHECK_DISPOSE();
-  FML_DLOG(ERROR) << "Unimplemented DisplayListCanvasRecorder::"
-                  << __FUNCTION__;
-}
-
-void DisplayListCanvasRecorder::onDrawPatch(const SkPoint cubics[12],
-                                            const SkColor colors[4],
-                                            const SkPoint texCoords[4],
-                                            SkBlendMode mode,
-                                            const SkPaint& paint) {
-  CHECK_DISPOSE();
-  FML_DLOG(ERROR) << "Unimplemented DisplayListCanvasRecorder::"
-                  << __FUNCTION__;
-}
-
-void DisplayListCanvasRecorder::onDrawEdgeAAQuad(const SkRect& rect,
-                                                 const SkPoint clip[4],
-                                                 SkCanvas::QuadAAFlags aaFlags,
-                                                 const SkColor4f& color,
-                                                 SkBlendMode mode) {
-  CHECK_DISPOSE();
-  FML_DLOG(ERROR) << "Unimplemented DisplayListCanvasRecorder::"
-                  << __FUNCTION__;
-}
-
-void DisplayListCanvasRecorder::onDrawAnnotation(const SkRect& rect,
-                                                 const char key[],
-                                                 SkData* value) {
-  CHECK_DISPOSE();
-  FML_DLOG(ERROR) << "Unimplemented DisplayListCanvasRecorder::"
-                  << __FUNCTION__;
-}
-
-void DisplayListCanvasRecorder::onDrawDrawable(SkDrawable* drawable,
-                                               const SkMatrix* matrix) {
-  CHECK_DISPOSE();
-  FML_DLOG(ERROR) << "Unimplemented DisplayListCanvasRecorder::"
-                  << __FUNCTION__;
-}
-
-}  // namespace flutter
diff --git a/display_list/display_list_canvas_recorder.h b/display_list/display_list_canvas_recorder.h
deleted file mode 100644
index b5d079bdb3b4ec14a8bbe5db1fa5be2cca7cd09d..0000000000000000000000000000000000000000
--- a/display_list/display_list_canvas_recorder.h
+++ /dev/null
@@ -1,136 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_CANVAS_RECORDER_H_
-#define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_CANVAS_RECORDER_H_
-
-#include "flutter/display_list/display_list.h"
-#include "flutter/display_list/display_list_builder.h"
-#include "flutter/display_list/display_list_flags.h"
-#include "flutter/fml/macros.h"
-#include "third_party/skia/include/core/SkCanvasVirtualEnforcer.h"
-#include "third_party/skia/include/utils/SkNoDrawCanvas.h"
-
-namespace flutter {
-
-//------------------------------------------------------------------------------
-/// An adapter that implements an SkCanvas interface which can then be handed to
-/// code that outputs to an SkCanvas to capture the output into a Flutter
-/// DisplayList.
-///
-/// Receives all methods on SkCanvas and sends them to a DisplayListBuilder
-///
-class DisplayListCanvasRecorder
-    : public SkCanvasVirtualEnforcer<SkNoDrawCanvas>,
-      public SkRefCnt,
-      DisplayListOpFlags {
- public:
-  explicit DisplayListCanvasRecorder(const SkRect& bounds);
-
-  const sk_sp<DisplayListBuilder> builder() { return builder_; }
-
-  sk_sp<DisplayList> Build();
-
-  void didConcat44(const SkM44&) override;
-  void didSetM44(const SkM44&) override;
-  void didTranslate(SkScalar, SkScalar) override;
-  void didScale(SkScalar, SkScalar) override;
-
-  void onClipRect(const SkRect& rect,
-                  SkClipOp op,
-                  ClipEdgeStyle edgeStyle) override;
-  void onClipRRect(const SkRRect& rrect,
-                   SkClipOp op,
-                   ClipEdgeStyle edgeStyle) override;
-  void onClipPath(const SkPath& path,
-                  SkClipOp op,
-                  ClipEdgeStyle edgeStyle) override;
-
-  void willSave() override;
-  SaveLayerStrategy getSaveLayerStrategy(const SaveLayerRec&) override;
-  void didRestore() override;
-
-  void onDrawPaint(const SkPaint& paint) override;
-  void onDrawBehind(const SkPaint&) override;
-  void onDrawRect(const SkRect& rect, const SkPaint& paint) override;
-  void onDrawRRect(const SkRRect& rrect, const SkPaint& paint) override;
-  void onDrawDRRect(const SkRRect& outer,
-                    const SkRRect& inner,
-                    const SkPaint& paint) override;
-  void onDrawOval(const SkRect& rect, const SkPaint& paint) override;
-  void onDrawArc(const SkRect& rect,
-                 SkScalar startAngle,
-                 SkScalar sweepAngle,
-                 bool useCenter,
-                 const SkPaint& paint) override;
-  void onDrawPath(const SkPath& path, const SkPaint& paint) override;
-  void onDrawRegion(const SkRegion& region, const SkPaint& paint) override;
-
-  void onDrawTextBlob(const SkTextBlob* blob,
-                      SkScalar x,
-                      SkScalar y,
-                      const SkPaint& paint) override;
-
-  void onDrawPatch(const SkPoint cubics[12],
-                   const SkColor colors[4],
-                   const SkPoint texCoords[4],
-                   SkBlendMode mode,
-                   const SkPaint& paint) override;
-  void onDrawPoints(SkCanvas::PointMode mode,
-                    size_t count,
-                    const SkPoint pts[],
-                    const SkPaint& paint) override;
-  void onDrawVerticesObject(const SkVertices* vertices,
-                            SkBlendMode mode,
-                            const SkPaint& paint) override;
-
-  void onDrawImage2(const SkImage*,
-                    SkScalar dx,
-                    SkScalar dy,
-                    const SkSamplingOptions&,
-                    const SkPaint*) override;
-  void onDrawImageRect2(const SkImage*,
-                        const SkRect& src,
-                        const SkRect& dst,
-                        const SkSamplingOptions&,
-                        const SkPaint*,
-                        SrcRectConstraint) override;
-  void onDrawImageLattice2(const SkImage*,
-                           const Lattice&,
-                           const SkRect& dst,
-                           SkFilterMode,
-                           const SkPaint*) override;
-  void onDrawAtlas2(const SkImage*,
-                    const SkRSXform[],
-                    const SkRect src[],
-                    const SkColor[],
-                    int count,
-                    SkBlendMode,
-                    const SkSamplingOptions&,
-                    const SkRect* cull,
-                    const SkPaint*) override;
-
-  void onDrawEdgeAAQuad(const SkRect& rect,
-                        const SkPoint clip[4],
-                        SkCanvas::QuadAAFlags aaFlags,
-                        const SkColor4f& color,
-                        SkBlendMode mode) override;
-
-  void onDrawAnnotation(const SkRect& rect,
-                        const char key[],
-                        SkData* value) override;
-  void onDrawShadowRec(const SkPath&, const SkDrawShadowRec&) override;
-
-  void onDrawDrawable(SkDrawable* drawable, const SkMatrix* matrix) override;
-  void onDrawPicture(const SkPicture* picture,
-                     const SkMatrix* matrix,
-                     const SkPaint* paint) override;
-
- private:
-  sk_sp<DisplayListBuilder> builder_;
-};
-
-}  // namespace flutter
-
-#endif  // FLUTTER_DISPLAY_LIST_DISPLAY_LIST_CANVAS_RECORDER_H_
diff --git a/display_list/display_list_color.h b/display_list/display_list_color.h
deleted file mode 100644
index d84ccd4342a930857ee35da066d3521a3f6fd42a..0000000000000000000000000000000000000000
--- a/display_list/display_list_color.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_COLOR_H_
-#define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_COLOR_H_
-
-#include "flutter/display_list/types.h"
-
-namespace flutter {
-
-struct DlColor {
- public:
-  constexpr DlColor() : argb(0xFF000000) {}
-  constexpr DlColor(uint32_t argb) : argb(argb) {}
-
-  static constexpr uint8_t toAlpha(SkScalar opacity) { return toC(opacity); }
-  static constexpr SkScalar toOpacity(uint8_t alpha) { return toF(alpha); }
-
-  // clang-format off
-  static constexpr DlColor kTransparent()        {return 0x00000000;};
-  static constexpr DlColor kBlack()              {return 0xFF000000;};
-  static constexpr DlColor kWhite()              {return 0xFFFFFFFF;};
-  static constexpr DlColor kRed()                {return 0xFFFF0000;};
-  static constexpr DlColor kGreen()              {return 0xFF00FF00;};
-  static constexpr DlColor kBlue()               {return 0xFF0000FF;};
-  static constexpr DlColor kCyan()               {return 0xFF00FFFF;};
-  static constexpr DlColor kMagenta()            {return 0xFFFF00FF;};
-  static constexpr DlColor kYellow()             {return 0xFFFFFF00;};
-  static constexpr DlColor kDarkGrey()           {return 0xFF3F3F3F;};
-  static constexpr DlColor kMidGrey()            {return 0xFF808080;};
-  static constexpr DlColor kLightGrey()          {return 0xFFC0C0C0;};
-  // clang-format on
-
-  uint32_t argb;
-
-  bool isOpaque() const { return getAlpha() == 0xFF; }
-
-  int getAlpha() const { return argb >> 24; }
-  int getRed() const { return (argb >> 16) & 0xFF; }
-  int getGreen() const { return (argb >> 8) & 0xFF; }
-  int getBlue() const { return argb & 0xFF; }
-
-  float getAlphaF() const { return toF(getAlpha()); }
-  float getRedF() const { return toF(getRed()); }
-  float getGreenF() const { return toF(getGreen()); }
-  float getBlueF() const { return toF(getBlue()); }
-
-  uint32_t premultipliedArgb() const {
-    if (isOpaque()) {
-      return argb;
-    }
-    float f = getAlphaF();
-    return (argb & 0xFF000000) |        //
-           toC(getRedF() * f) << 16 |   //
-           toC(getGreenF() * f) << 8 |  //
-           toC(getBlueF() * f);
-  }
-
-  DlColor withAlpha(uint8_t alpha) const {  //
-    return (argb & 0x00FFFFFF) | (alpha << 24);
-  }
-  DlColor withRed(uint8_t red) const {  //
-    return (argb & 0xFF00FFFF) | (red << 16);
-  }
-  DlColor withGreen(uint8_t green) const {  //
-    return (argb & 0xFFFF00FF) | (green << 8);
-  }
-  DlColor withBlue(uint8_t blue) const {  //
-    return (argb & 0xFFFFFF00) | (blue << 0);
-  }
-
-  DlColor modulateOpacity(float opacity) const {
-    return opacity <= 0   ? withAlpha(0)
-           : opacity >= 1 ? *this
-                          : withAlpha(round(getAlpha() * opacity));
-  }
-
-  operator uint32_t() const { return argb; }
-  bool operator==(DlColor const& other) const { return argb == other.argb; }
-  bool operator!=(DlColor const& other) const { return argb != other.argb; }
-  bool operator==(uint32_t const& other) const { return argb == other; }
-  bool operator!=(uint32_t const& other) const { return argb != other; }
-
- private:
-  static float toF(uint8_t comp) { return comp * (1.0 / 255); }
-  static uint8_t toC(float fComp) { return round(fComp * 255); }
-};
-
-}  // namespace flutter
-
-#endif  // FLUTTER_DISPLAY_LIST_DISPLAY_LIST_COLOR_H_
diff --git a/display_list/display_list_color_filter.cc b/display_list/display_list_color_filter.cc
deleted file mode 100644
index 0204993d1b482d8f578eb82bf5b4756d0cbf15a2..0000000000000000000000000000000000000000
--- a/display_list/display_list_color_filter.cc
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "flutter/display_list/display_list_color_filter.h"
-
-#include "flutter/display_list/display_list_color.h"
-
-namespace flutter {
-
-std::shared_ptr<DlColorFilter> DlColorFilter::From(SkColorFilter* sk_filter) {
-  if (sk_filter == nullptr) {
-    return nullptr;
-  }
-  if (sk_filter == DlSrgbToLinearGammaColorFilter::sk_filter_.get()) {
-    // Skia implements these filters as a singleton.
-    return DlSrgbToLinearGammaColorFilter::instance;
-  }
-  if (sk_filter == DlLinearToSrgbGammaColorFilter::sk_filter_.get()) {
-    // Skia implements these filters as a singleton.
-    return DlLinearToSrgbGammaColorFilter::instance;
-  }
-  {
-    SkColor color;
-    SkBlendMode mode;
-    if (sk_filter->asAColorMode(&color, &mode)) {
-      return std::make_shared<DlBlendColorFilter>(color, ToDl(mode));
-    }
-  }
-  {
-    float matrix[20];
-    if (sk_filter->asAColorMatrix(matrix)) {
-      return std::make_shared<DlMatrixColorFilter>(matrix);
-    }
-  }
-  return std::make_shared<DlUnknownColorFilter>(sk_ref_sp(sk_filter));
-}
-
-const std::shared_ptr<DlSrgbToLinearGammaColorFilter>
-    DlSrgbToLinearGammaColorFilter::instance =
-        std::make_shared<DlSrgbToLinearGammaColorFilter>();
-const sk_sp<SkColorFilter> DlSrgbToLinearGammaColorFilter::sk_filter_ =
-    SkColorFilters::SRGBToLinearGamma();
-
-const std::shared_ptr<DlLinearToSrgbGammaColorFilter>
-    DlLinearToSrgbGammaColorFilter::instance =
-        std::make_shared<DlLinearToSrgbGammaColorFilter>();
-const sk_sp<SkColorFilter> DlLinearToSrgbGammaColorFilter::sk_filter_ =
-    SkColorFilters::LinearToSRGBGamma();
-
-}  // namespace flutter
diff --git a/display_list/display_list_enum_unittests.cc b/display_list/display_list_enum_unittests.cc
deleted file mode 100644
index 0da01c0cbdd1ce03ef50bd69c0f8650ddd2aa4ee..0000000000000000000000000000000000000000
--- a/display_list/display_list_enum_unittests.cc
+++ /dev/null
@@ -1,172 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "flutter/display_list/display_list_blend_mode.h"
-#include "flutter/display_list/display_list_paint.h"
-#include "flutter/display_list/display_list_sampling_options.h"
-#include "flutter/display_list/display_list_tile_mode.h"
-#include "flutter/display_list/display_list_vertices.h"
-#include "flutter/display_list/types.h"
-#include "gtest/gtest.h"
-#include "include/core/SkSamplingOptions.h"
-
-namespace flutter {
-namespace testing {
-
-TEST(DisplayListEnum, ToDlTileMode) {
-  ASSERT_EQ(ToDl(SkTileMode::kClamp), DlTileMode::kClamp);
-  ASSERT_EQ(ToDl(SkTileMode::kRepeat), DlTileMode::kRepeat);
-  ASSERT_EQ(ToDl(SkTileMode::kMirror), DlTileMode::kMirror);
-  ASSERT_EQ(ToDl(SkTileMode::kDecal), DlTileMode::kDecal);
-}
-
-TEST(DisplayListEnum, ToSkTileMode) {
-  ASSERT_EQ(ToSk(DlTileMode::kClamp), SkTileMode::kClamp);
-  ASSERT_EQ(ToSk(DlTileMode::kRepeat), SkTileMode::kRepeat);
-  ASSERT_EQ(ToSk(DlTileMode::kMirror), SkTileMode::kMirror);
-  ASSERT_EQ(ToSk(DlTileMode::kDecal), SkTileMode::kDecal);
-}
-
-TEST(DisplayListEnum, ToDlDrawStyle) {
-  ASSERT_EQ(ToDl(SkPaint::Style::kFill_Style), DlDrawStyle::kFill);
-  ASSERT_EQ(ToDl(SkPaint::Style::kStroke_Style), DlDrawStyle::kStroke);
-  ASSERT_EQ(ToDl(SkPaint::Style::kStrokeAndFill_Style),
-            DlDrawStyle::kStrokeAndFill);
-}
-
-TEST(DisplayListEnum, ToSkDrawStyle) {
-  ASSERT_EQ(ToSk(DlDrawStyle::kFill), SkPaint::Style::kFill_Style);
-  ASSERT_EQ(ToSk(DlDrawStyle::kStroke), SkPaint::Style::kStroke_Style);
-  ASSERT_EQ(ToSk(DlDrawStyle::kStrokeAndFill),
-            SkPaint::Style::kStrokeAndFill_Style);
-}
-
-TEST(DisplayListEnum, ToDlStrokeCap) {
-  ASSERT_EQ(ToDl(SkPaint::Cap::kButt_Cap), DlStrokeCap::kButt);
-  ASSERT_EQ(ToDl(SkPaint::Cap::kRound_Cap), DlStrokeCap::kRound);
-  ASSERT_EQ(ToDl(SkPaint::Cap::kSquare_Cap), DlStrokeCap::kSquare);
-}
-
-TEST(DisplayListEnum, ToSkStrokeCap) {
-  ASSERT_EQ(ToSk(DlStrokeCap::kButt), SkPaint::Cap::kButt_Cap);
-  ASSERT_EQ(ToSk(DlStrokeCap::kRound), SkPaint::Cap::kRound_Cap);
-  ASSERT_EQ(ToSk(DlStrokeCap::kSquare), SkPaint::Cap::kSquare_Cap);
-}
-
-TEST(DisplayListEnum, ToDlStrokeJoin) {
-  ASSERT_EQ(ToDl(SkPaint::Join::kMiter_Join), DlStrokeJoin::kMiter);
-  ASSERT_EQ(ToDl(SkPaint::Join::kRound_Join), DlStrokeJoin::kRound);
-  ASSERT_EQ(ToDl(SkPaint::Join::kBevel_Join), DlStrokeJoin::kBevel);
-}
-
-TEST(DisplayListEnum, ToSkStrokeJoin) {
-  ASSERT_EQ(ToSk(DlStrokeJoin::kMiter), SkPaint::Join::kMiter_Join);
-  ASSERT_EQ(ToSk(DlStrokeJoin::kRound), SkPaint::Join::kRound_Join);
-  ASSERT_EQ(ToSk(DlStrokeJoin::kBevel), SkPaint::Join::kBevel_Join);
-}
-
-TEST(DisplayListEnum, ToDlVertexMode) {
-  ASSERT_EQ(ToDl(SkVertices::VertexMode::kTriangles_VertexMode),
-            DlVertexMode::kTriangles);
-  ASSERT_EQ(ToDl(SkVertices::VertexMode::kTriangleStrip_VertexMode),
-            DlVertexMode::kTriangleStrip);
-  ASSERT_EQ(ToDl(SkVertices::VertexMode::kTriangleFan_VertexMode),
-            DlVertexMode::kTriangleFan);
-}
-
-TEST(DisplayListEnum, ToSkVertexMode) {
-  ASSERT_EQ(ToSk(DlVertexMode::kTriangles),
-            SkVertices::VertexMode::kTriangles_VertexMode);
-  ASSERT_EQ(ToSk(DlVertexMode::kTriangleStrip),
-            SkVertices::VertexMode::kTriangleStrip_VertexMode);
-  ASSERT_EQ(ToSk(DlVertexMode::kTriangleFan),
-            SkVertices::VertexMode::kTriangleFan_VertexMode);
-}
-
-TEST(DisplayListEnum, ToDlFilterMode) {
-  ASSERT_EQ(ToDl(SkFilterMode::kLinear), DlFilterMode::kLinear);
-  ASSERT_EQ(ToDl(SkFilterMode::kNearest), DlFilterMode::kNearest);
-  ASSERT_EQ(ToDl(SkFilterMode::kLast), DlFilterMode::kLast);
-}
-
-TEST(DisplayListEnum, ToSkFilterMode) {
-  ASSERT_EQ(ToSk(DlFilterMode::kLinear), SkFilterMode::kLinear);
-  ASSERT_EQ(ToSk(DlFilterMode::kNearest), SkFilterMode::kNearest);
-  ASSERT_EQ(ToSk(DlFilterMode::kLast), SkFilterMode::kLast);
-}
-
-TEST(DisplayListEnum, ToDlImageSampling) {
-  ASSERT_EQ(ToDl(SkSamplingOptions(SkFilterMode::kLinear, SkMipmapMode::kNone)),
-            DlImageSampling::kLinear);
-  ASSERT_EQ(
-      ToDl(SkSamplingOptions(SkFilterMode::kLinear, SkMipmapMode::kLinear)),
-      DlImageSampling::kMipmapLinear);
-  ASSERT_EQ(
-      ToDl(SkSamplingOptions(SkFilterMode::kNearest, SkMipmapMode::kNone)),
-      DlImageSampling::kNearestNeighbor);
-  ASSERT_EQ(ToDl(SkSamplingOptions(SkCubicResampler{1 / 3.0f, 1 / 3.0f})),
-            DlImageSampling::kCubic);
-}
-
-TEST(DisplayListEnum, ToSkSamplingOptions) {
-  ASSERT_EQ(ToSk(DlImageSampling::kLinear),
-            SkSamplingOptions(SkFilterMode::kLinear, SkMipmapMode::kNone));
-  ASSERT_EQ(ToSk(DlImageSampling::kMipmapLinear),
-            SkSamplingOptions(SkFilterMode::kLinear, SkMipmapMode::kLinear));
-  ASSERT_EQ(ToSk(DlImageSampling::kNearestNeighbor),
-            SkSamplingOptions(SkFilterMode::kNearest, SkMipmapMode::kNone));
-  ASSERT_EQ(ToSk(DlImageSampling::kCubic),
-            SkSamplingOptions(SkCubicResampler{1 / 3.0f, 1 / 3.0f}));
-}
-
-#define CHECK_TO_DLENUM(V) ASSERT_EQ(ToDl(SkBlendMode::V), DlBlendMode::V);
-#define CHECK_TO_SKENUM(V) ASSERT_EQ(ToSk(DlBlendMode::V), SkBlendMode::V);
-
-#define FOR_EACH_ENUM(FUNC) \
-  FUNC(kSrc)                \
-  FUNC(kClear)              \
-  FUNC(kSrc)                \
-  FUNC(kDst)                \
-  FUNC(kSrcOver)            \
-  FUNC(kDstOver)            \
-  FUNC(kSrcIn)              \
-  FUNC(kDstIn)              \
-  FUNC(kSrcOut)             \
-  FUNC(kDstOut)             \
-  FUNC(kSrcATop)            \
-  FUNC(kDstATop)            \
-  FUNC(kXor)                \
-  FUNC(kPlus)               \
-  FUNC(kModulate)           \
-  FUNC(kScreen)             \
-  FUNC(kOverlay)            \
-  FUNC(kDarken)             \
-  FUNC(kLighten)            \
-  FUNC(kColorDodge)         \
-  FUNC(kColorBurn)          \
-  FUNC(kHardLight)          \
-  FUNC(kSoftLight)          \
-  FUNC(kDifference)         \
-  FUNC(kExclusion)          \
-  FUNC(kMultiply)           \
-  FUNC(kHue)                \
-  FUNC(kSaturation)         \
-  FUNC(kColor)              \
-  FUNC(kLuminosity)         \
-  FUNC(kLastCoeffMode)      \
-  FUNC(kLastSeparableMode)  \
-  FUNC(kLastMode)
-
-TEST(DisplayListEnum, ToDlBlendMode){FOR_EACH_ENUM(CHECK_TO_DLENUM)}
-
-TEST(DisplayListEnum, ToSkBlendMode) {
-  FOR_EACH_ENUM(CHECK_TO_SKENUM)
-}
-
-#undef CHECK_TO_DLENUM
-#undef CHECK_TO_SKENUM
-#undef FOR_EACH_ENUM
-
-}  // namespace testing
-}  // namespace flutter
diff --git a/display_list/display_list_flags.cc b/display_list/display_list_flags.cc
deleted file mode 100644
index a7e248588566488a69dd5b9fd67aac73fb91da71..0000000000000000000000000000000000000000
--- a/display_list/display_list_flags.cc
+++ /dev/null
@@ -1,191 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "flutter/display_list/display_list_flags.h"
-#include "flutter/display_list/display_list_path_effect.h"
-namespace flutter {
-
-const DisplayListSpecialGeometryFlags DisplayListAttributeFlags::WithPathEffect(
-    const DlPathEffect* effect) const {
-  if (is_geometric() && effect) {
-    if (effect->asDash()) {
-      // A dash effect has a very simple impact. It cannot introduce any
-      // miter joins that weren't already present in the original path
-      // and it does not grow the bounds of the path, but it can add
-      // end caps to areas that might not have had them before so all
-      // we need to do is to indicate the potential for diagonal
-      // end caps and move on.
-      return special_flags_.with(kMayHaveCaps_ | kMayHaveDiagonalCaps_);
-    } else {
-      // An arbitrary path effect can introduce joins at an arbitrary
-      // angle and may change the geometry of the end caps
-      return special_flags_.with(kMayHaveCaps_ | kMayHaveDiagonalCaps_ |
-                                 kMayHaveJoins_ | kMayHaveAcuteJoins_);
-    }
-  }
-  return special_flags_;
-}
-
-// clang-format off
-// Flags common to all primitives that apply colors
-#define PAINT_FLAGS (kUsesDither_ |      \
-                     kUsesColor_ |       \
-                     kUsesAlpha_ |       \
-                     kUsesBlend_ |       \
-                     kUsesShader_ |      \
-                     kUsesColorFilter_ | \
-                     kUsesImageFilter_)
-
-// Flags common to all primitives that stroke or fill
-#define STROKE_OR_FILL_FLAGS (kIsDrawnGeometry_ | \
-                              kUsesAntiAlias_ |   \
-                              kUsesMaskFilter_ |  \
-                              kUsesPathEffect_)
-
-// Flags common to primitives that stroke geometry
-#define STROKE_FLAGS (kIsStrokedGeometry_ | \
-                      kUsesAntiAlias_ |     \
-                      kUsesMaskFilter_ |    \
-                      kUsesPathEffect_)
-
-// Flags common to primitives that render an image with paint attributes
-#define IMAGE_FLAGS_BASE (kIsNonGeometric_ |  \
-                          kUsesAlpha_ |       \
-                          kUsesDither_ |      \
-                          kUsesBlend_ |       \
-                          kUsesColorFilter_ | \
-                          kUsesImageFilter_)
-// clang-format on
-
-const DisplayListAttributeFlags DisplayListOpFlags::kSaveLayerFlags =
-    DisplayListAttributeFlags(kIgnoresPaint_);
-
-const DisplayListAttributeFlags DisplayListOpFlags::kSaveLayerWithPaintFlags =
-    DisplayListAttributeFlags(kIsNonGeometric_ |   //
-                              kUsesAlpha_ |        //
-                              kUsesBlend_ |        //
-                              kUsesColorFilter_ |  //
-                              kUsesImageFilter_);
-
-const DisplayListAttributeFlags DisplayListOpFlags::kDrawColorFlags =
-    DisplayListAttributeFlags(kFloodsSurface_ | kIgnoresPaint_);
-
-const DisplayListAttributeFlags DisplayListOpFlags::kDrawPaintFlags =
-    DisplayListAttributeFlags(PAINT_FLAGS | kFloodsSurface_);
-
-const DisplayListAttributeFlags DisplayListOpFlags::kDrawHVLineFlags =
-    DisplayListAttributeFlags(PAINT_FLAGS | STROKE_FLAGS | kMayHaveCaps_);
-
-const DisplayListAttributeFlags DisplayListOpFlags::kDrawLineFlags =
-    kDrawHVLineFlags.with(kMayHaveDiagonalCaps_);
-
-const DisplayListAttributeFlags DisplayListOpFlags::kDrawRectFlags =
-    DisplayListAttributeFlags(PAINT_FLAGS | STROKE_OR_FILL_FLAGS |
-                              kMayHaveJoins_);
-
-const DisplayListAttributeFlags DisplayListOpFlags::kDrawOvalFlags =
-    DisplayListAttributeFlags(PAINT_FLAGS | STROKE_OR_FILL_FLAGS);
-
-const DisplayListAttributeFlags DisplayListOpFlags::kDrawCircleFlags =
-    DisplayListAttributeFlags(PAINT_FLAGS | STROKE_OR_FILL_FLAGS);
-
-const DisplayListAttributeFlags DisplayListOpFlags::kDrawRRectFlags =
-    DisplayListAttributeFlags(PAINT_FLAGS | STROKE_OR_FILL_FLAGS);
-
-const DisplayListAttributeFlags DisplayListOpFlags::kDrawDRRectFlags =
-    DisplayListAttributeFlags(PAINT_FLAGS | STROKE_OR_FILL_FLAGS);
-
-const DisplayListAttributeFlags DisplayListOpFlags::kDrawPathFlags =
-    DisplayListAttributeFlags(PAINT_FLAGS | STROKE_OR_FILL_FLAGS |
-                              kMayHaveCaps_ | kMayHaveDiagonalCaps_ |
-                              kMayHaveJoins_ | kMayHaveAcuteJoins_);
-
-const DisplayListAttributeFlags DisplayListOpFlags::kDrawArcNoCenterFlags =
-    DisplayListAttributeFlags(PAINT_FLAGS | STROKE_OR_FILL_FLAGS |
-                              kMayHaveCaps_ | kMayHaveDiagonalCaps_);
-
-const DisplayListAttributeFlags DisplayListOpFlags::kDrawArcWithCenterFlags =
-    DisplayListAttributeFlags(PAINT_FLAGS | STROKE_OR_FILL_FLAGS |
-                              kMayHaveJoins_ | kMayHaveAcuteJoins_);
-
-const DisplayListAttributeFlags DisplayListOpFlags::kDrawPointsAsPointsFlags =
-    DisplayListAttributeFlags(PAINT_FLAGS | STROKE_FLAGS |  //
-                              kMayHaveCaps_ | kButtCapIsSquare_);
-
-const DisplayListAttributeFlags DisplayListOpFlags::kDrawPointsAsLinesFlags =
-    DisplayListAttributeFlags(PAINT_FLAGS | STROKE_FLAGS |  //
-                              kMayHaveCaps_ | kMayHaveDiagonalCaps_);
-
-// Polygon mode just draws (count-1) separate lines, no joins
-const DisplayListAttributeFlags DisplayListOpFlags::kDrawPointsAsPolygonFlags =
-    DisplayListAttributeFlags(PAINT_FLAGS | STROKE_FLAGS |  //
-                              kMayHaveCaps_ | kMayHaveDiagonalCaps_);
-
-const DisplayListAttributeFlags DisplayListOpFlags::kDrawVerticesFlags =
-    DisplayListAttributeFlags(kIsNonGeometric_ |   //
-                              kUsesDither_ |       //
-                              kUsesAlpha_ |        //
-                              kUsesShader_ |       //
-                              kUsesBlend_ |        //
-                              kUsesColorFilter_ |  //
-                              kUsesImageFilter_);
-
-const DisplayListAttributeFlags DisplayListOpFlags::kDrawImageFlags =
-    DisplayListAttributeFlags(kIgnoresPaint_);
-
-const DisplayListAttributeFlags DisplayListOpFlags::kDrawImageWithPaintFlags =
-    DisplayListAttributeFlags(IMAGE_FLAGS_BASE |  //
-                              kUsesAntiAlias_ | kUsesMaskFilter_);
-
-const DisplayListAttributeFlags DisplayListOpFlags::kDrawImageRectFlags =
-    DisplayListAttributeFlags(kIgnoresPaint_);
-
-const DisplayListAttributeFlags
-    DisplayListOpFlags::kDrawImageRectWithPaintFlags =
-        DisplayListAttributeFlags(IMAGE_FLAGS_BASE |  //
-                                  kUsesAntiAlias_ | kUsesMaskFilter_);
-
-const DisplayListAttributeFlags DisplayListOpFlags::kDrawImageNineFlags =
-    DisplayListAttributeFlags(kIgnoresPaint_);
-
-const DisplayListAttributeFlags
-    DisplayListOpFlags::kDrawImageNineWithPaintFlags =
-        DisplayListAttributeFlags(IMAGE_FLAGS_BASE);
-
-const DisplayListAttributeFlags DisplayListOpFlags::kDrawImageLatticeFlags =
-    DisplayListAttributeFlags(kIgnoresPaint_);
-
-const DisplayListAttributeFlags
-    DisplayListOpFlags::kDrawImageLatticeWithPaintFlags =
-        DisplayListAttributeFlags(IMAGE_FLAGS_BASE);
-
-const DisplayListAttributeFlags DisplayListOpFlags::kDrawAtlasFlags =
-    DisplayListAttributeFlags(kIgnoresPaint_);
-
-const DisplayListAttributeFlags DisplayListOpFlags::kDrawAtlasWithPaintFlags =
-    DisplayListAttributeFlags(IMAGE_FLAGS_BASE);
-
-const DisplayListAttributeFlags DisplayListOpFlags::kDrawPictureFlags =
-    DisplayListAttributeFlags(kIgnoresPaint_);
-
-const DisplayListAttributeFlags DisplayListOpFlags::kDrawPictureWithPaintFlags =
-    kSaveLayerWithPaintFlags;
-
-const DisplayListAttributeFlags DisplayListOpFlags::kDrawDisplayListFlags =
-    DisplayListAttributeFlags(kIgnoresPaint_);
-
-const DisplayListAttributeFlags DisplayListOpFlags::kDrawTextBlobFlags =
-    DisplayListAttributeFlags(PAINT_FLAGS | STROKE_OR_FILL_FLAGS |
-                              kMayHaveJoins_)
-        .without(kUsesAntiAlias_);
-
-const DisplayListAttributeFlags DisplayListOpFlags::kDrawShadowFlags =
-    DisplayListAttributeFlags(kIgnoresPaint_);
-
-#undef PAINT_FLAGS
-#undef STROKE_OR_FILL_FLAGS
-#undef STROKE_FLAGS
-#undef IMAGE_FLAGS_BASE
-
-}  // namespace flutter
diff --git a/display_list/display_list_paint.cc b/display_list/display_list_paint.cc
deleted file mode 100644
index d3a0f8c752c29056a74badef2e5e9ea759935de8..0000000000000000000000000000000000000000
--- a/display_list/display_list_paint.cc
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "flutter/display_list/display_list_paint.h"
-
-namespace flutter {
-
-DlPaint::DlPaint()
-    : blendMode_(static_cast<unsigned>(DlBlendMode::kDefaultMode)),
-      drawStyle_(static_cast<unsigned>(DlDrawStyle::kDefaultStyle)),
-      strokeCap_(static_cast<unsigned>(DlStrokeCap::kDefaultCap)),
-      strokeJoin_(static_cast<unsigned>(DlStrokeJoin::kDefaultJoin)),
-      isAntiAlias_(false),
-      isDither_(false),
-      isInvertColors_(false),
-      strokeWidth_(kDefaultWidth),
-      strokeMiter_(kDefaultMiter) {}
-
-bool DlPaint::operator==(DlPaint const& other) const {
-  return blendMode_ == other.blendMode_ &&            //
-         drawStyle_ == other.drawStyle_ &&            //
-         strokeCap_ == other.strokeCap_ &&            //
-         strokeJoin_ == other.strokeJoin_ &&          //
-         isAntiAlias_ == other.isAntiAlias_ &&        //
-         isDither_ == other.isDither_ &&              //
-         isInvertColors_ == other.isInvertColors_ &&  //
-         color_ == other.color_ &&                    //
-         strokeWidth_ == other.strokeWidth_ &&        //
-         strokeMiter_ == other.strokeMiter_ &&        //
-         Equals(colorSource_, other.colorSource_) &&  //
-         Equals(colorFilter_, other.colorFilter_) &&  //
-         Equals(imageFilter_, other.imageFilter_) &&  //
-         Equals(maskFilter_, other.maskFilter_);
-}
-
-}  // namespace flutter
diff --git a/display_list/display_list_rtree.cc b/display_list/display_list_rtree.cc
deleted file mode 100644
index 2d641925bb419db73a86d05f1c4e6ea177aeea85..0000000000000000000000000000000000000000
--- a/display_list/display_list_rtree.cc
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "flutter/display_list/display_list_rtree.h"
-
-#include "flutter/fml/logging.h"
-
-namespace flutter {
-
-DlRTree::DlRTree() : bbh_{SkRTreeFactory{}()}, all_ops_count_(0) {}
-
-void DlRTree::insert(const SkRect boundsArray[],
-                     const SkBBoxHierarchy::Metadata metadata[],
-                     int N) {
-  FML_DCHECK(0 == all_ops_count_);
-  bbh_->insert(boundsArray, metadata, N);
-  for (int i = 0; i < N; i++) {
-    if (metadata == nullptr || metadata[i].isDraw) {
-      draw_op_[i] = boundsArray[i];
-    }
-  }
-  all_ops_count_ = N;
-}
-
-void DlRTree::insert(const SkRect boundsArray[], int N) {
-  insert(boundsArray, nullptr, N);
-}
-
-void DlRTree::search(const SkRect& query, std::vector<int>* results) const {
-  bbh_->search(query, results);
-}
-
-std::list<SkRect> DlRTree::searchNonOverlappingDrawnRects(
-    const SkRect& query) const {
-  // Get the indexes for the operations that intersect with the query rect.
-  std::vector<int> intermediary_results;
-  search(query, &intermediary_results);
-
-  std::list<SkRect> final_results;
-  for (int index : intermediary_results) {
-    auto draw_op = draw_op_.find(index);
-    // Ignore records that don't draw anything.
-    if (draw_op == draw_op_.end()) {
-      continue;
-    }
-    auto current_record_rect = draw_op->second;
-    auto replaced_existing_rect = false;
-    // // If the current record rect intersects with any of the rects in the
-    // // result list, then join them, and update the rect in final_results.
-    std::list<SkRect>::iterator curr_rect_itr = final_results.begin();
-    std::list<SkRect>::iterator first_intersecting_rect_itr;
-    while (!replaced_existing_rect && curr_rect_itr != final_results.end()) {
-      if (SkRect::Intersects(*curr_rect_itr, current_record_rect)) {
-        replaced_existing_rect = true;
-        first_intersecting_rect_itr = curr_rect_itr;
-        curr_rect_itr->join(current_record_rect);
-      }
-      curr_rect_itr++;
-    }
-    // It's possible that the result contains duplicated rects at this point.
-    // For example, consider a result list that contains rects A, B. If a
-    // new rect C is a superset of A and B, then A and B are the same set after
-    // the merge. As a result, find such cases and remove them from the result
-    // list.
-    while (replaced_existing_rect && curr_rect_itr != final_results.end()) {
-      if (SkRect::Intersects(*curr_rect_itr, *first_intersecting_rect_itr)) {
-        first_intersecting_rect_itr->join(*curr_rect_itr);
-        curr_rect_itr = final_results.erase(curr_rect_itr);
-      } else {
-        curr_rect_itr++;
-      }
-    }
-    if (!replaced_existing_rect) {
-      final_results.push_back(current_record_rect);
-    }
-  }
-  return final_results;
-}
-
-size_t DlRTree::bytesUsed() const {
-  return bbh_->bytesUsed();
-}
-
-DlRTreeFactory::DlRTreeFactory() {
-  r_tree_ = sk_make_sp<DlRTree>();
-}
-
-sk_sp<DlRTree> DlRTreeFactory::getInstance() {
-  return r_tree_;
-}
-
-sk_sp<SkBBoxHierarchy> DlRTreeFactory::operator()() const {
-  return r_tree_;
-}
-
-}  // namespace flutter
diff --git a/display_list/display_list_rtree.h b/display_list/display_list_rtree.h
deleted file mode 100644
index 189c6e4e4d858dc9af3f79ab39c1d6f4a28c5e8b..0000000000000000000000000000000000000000
--- a/display_list/display_list_rtree.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_DISPLAY_LIST_RTREE_H_
-#define FLUTTER_DISPLAY_LIST_RTREE_H_
-
-#include <list>
-#include <map>
-
-#include "third_party/skia/include/core/SkBBHFactory.h"
-#include "third_party/skia/include/core/SkRect.h"
-
-namespace flutter {
-
-/**
- * An R-Tree implementation that forwards calls to an SkRTree. This is just
- * a copy of flow/rtree.h/cc until we can figure out where these utilities
- * can live with appropriate linking visibility.
- *
- * This implementation provides a searchNonOverlappingDrawnRects method,
- * which can be used to query the rects for the operations recorded in the tree.
- */
-class DlRTree : public SkBBoxHierarchy {
- public:
-  DlRTree();
-
-  void insert(const SkRect[],
-              const SkBBoxHierarchy::Metadata[],
-              int N) override;
-  void insert(const SkRect[], int N) override;
-  void search(const SkRect& query, std::vector<int>* results) const override;
-  size_t bytesUsed() const override;
-
-  // Finds the rects in the tree that represent drawing operations and intersect
-  // with the query rect.
-  //
-  // When two rects intersect with each other, they are joined into a single
-  // rect which also intersects with the query rect. In other words, the bounds
-  // of each rect in the result list are mutually exclusive.
-  std::list<SkRect> searchNonOverlappingDrawnRects(const SkRect& query) const;
-
-  // Insertion count (not overall node count, which may be greater).
-  int getCount() const { return all_ops_count_; }
-
- private:
-  // A map containing the draw operation rects keyed off the operation index
-  // in the insert call.
-  std::map<int, SkRect> draw_op_;
-  sk_sp<SkBBoxHierarchy> bbh_;
-  int all_ops_count_;
-};
-
-class DlRTreeFactory : public SkBBHFactory {
- public:
-  DlRTreeFactory();
-
-  // Gets the instance to the R-tree.
-  sk_sp<DlRTree> getInstance();
-  sk_sp<SkBBoxHierarchy> operator()() const override;
-
- private:
-  sk_sp<DlRTree> r_tree_;
-};
-
-}  // namespace flutter
-
-#endif  // FLUTTER_DISPLAY_LIST_RTREE_H_
diff --git a/display_list/display_list_sampling_options.h b/display_list/display_list_sampling_options.h
deleted file mode 100644
index b3f1afa5fa3224f0c1327b637b7f550b09b75203..0000000000000000000000000000000000000000
--- a/display_list/display_list_sampling_options.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_SAMPLING_OPTIONS_H_
-#define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_SAMPLING_OPTIONS_H_
-
-#include "include/core/SkColorSpace.h"
-#include "include/core/SkSamplingOptions.h"
-namespace flutter {
-
-enum class DlFilterMode {
-  kNearest,  // single sample point (nearest neighbor)
-  kLinear,   // interporate between 2x2 sample points (bilinear interpolation)
-
-  kLast = kLinear,
-};
-
-inline DlFilterMode ToDl(const SkFilterMode filter_mode) {
-  return static_cast<DlFilterMode>(filter_mode);
-}
-
-inline SkFilterMode ToSk(const DlFilterMode filter_mode) {
-  return static_cast<SkFilterMode>(filter_mode);
-}
-
-enum class DlImageSampling {
-  kNearestNeighbor,
-  kLinear,
-  kMipmapLinear,
-  kCubic,
-};
-
-inline DlImageSampling ToDl(const SkSamplingOptions& so) {
-  if (so.useCubic) {
-    return DlImageSampling::kCubic;
-  }
-  if (so.filter == SkFilterMode::kLinear) {
-    if (so.mipmap == SkMipmapMode::kNone) {
-      return DlImageSampling::kLinear;
-    }
-    if (so.mipmap == SkMipmapMode::kLinear) {
-      return DlImageSampling::kMipmapLinear;
-    }
-  }
-  return DlImageSampling::kNearestNeighbor;
-}
-
-inline SkSamplingOptions ToSk(DlImageSampling sampling) {
-  switch (sampling) {
-    case DlImageSampling::kCubic:
-      return SkSamplingOptions(SkCubicResampler{1 / 3.0f, 1 / 3.0f});
-    case DlImageSampling::kLinear:
-      return SkSamplingOptions(SkFilterMode::kLinear);
-    case DlImageSampling::kMipmapLinear:
-      return SkSamplingOptions(SkFilterMode::kLinear, SkMipmapMode::kLinear);
-    case DlImageSampling::kNearestNeighbor:
-      return SkSamplingOptions(SkFilterMode::kNearest);
-  }
-}
-
-}  // namespace flutter
-
-#endif  // FLUTTER_DISPLAY_LIST_DISPLAY_LIST_SAMPLING_OPTIONS_H_
diff --git a/display_list/display_list_unittests.cc b/display_list/display_list_unittests.cc
index 2a9e5d7cf7e274e371e41481f5c9f6b9be13276c..cc1912e8772204be8ea07c85b91c884f47f5fd35 100644
--- a/display_list/display_list_unittests.cc
+++ b/display_list/display_list_unittests.cc
@@ -9,40 +9,567 @@
 #include <vector>
 
 #include "flutter/display_list/display_list.h"
-#include "flutter/display_list/display_list_blend_mode.h"
-#include "flutter/display_list/display_list_builder.h"
-#include "flutter/display_list/display_list_canvas_recorder.h"
-#include "flutter/display_list/display_list_paint.h"
-#include "flutter/display_list/display_list_rtree.h"
-#include "flutter/display_list/display_list_test_utils.h"
-#include "flutter/display_list/display_list_utils.h"
+#include "flutter/display_list/dl_blend_mode.h"
+#include "flutter/display_list/dl_builder.h"
+#include "flutter/display_list/dl_paint.h"
+#include "flutter/display_list/geometry/dl_rtree.h"
+#include "flutter/display_list/skia/dl_sk_dispatcher.h"
+#include "flutter/display_list/testing/dl_test_snippets.h"
+#include "flutter/display_list/utils/dl_receiver_utils.h"
 #include "flutter/fml/logging.h"
 #include "flutter/fml/math.h"
+#include "flutter/testing/assertions_skia.h"
 #include "flutter/testing/display_list_testing.h"
 #include "flutter/testing/testing.h"
 
+#include "third_party/skia/include/core/SkBBHFactory.h"
+#include "third_party/skia/include/core/SkColorFilter.h"
+#include "third_party/skia/include/core/SkPictureRecorder.h"
+#include "third_party/skia/include/core/SkRSXform.h"
+#include "third_party/skia/include/core/SkSurface.h"
+
 namespace flutter {
+
+DlOpReceiver& DisplayListBuilderTestingAccessor(DisplayListBuilder& builder) {
+  return builder.asReceiver();
+}
+
+DlPaint DisplayListBuilderTestingAttributes(DisplayListBuilder& builder) {
+  return builder.CurrentAttributes();
+}
+
 namespace testing {
 
 static std::vector<testing::DisplayListInvocationGroup> allGroups =
     CreateAllGroups();
 
-#ifndef NDEBUG
-TEST(DisplayList, CallMethodAfterBuild) {
-  DisplayListCanvasRecorder recorder(kTestBounds);
-  recorder.drawRect(kTestBounds, SkPaint());
-  recorder.Build();
-  EXPECT_DEATH_IF_SUPPORTED(
-      recorder.drawRect(kTestBounds, SkPaint()),
-      "Calling method on DisplayListCanvasRecorder after Build\\(\\)");
+using ClipOp = DlCanvas::ClipOp;
+using PointMode = DlCanvas::PointMode;
+
+template <typename BaseT>
+class DisplayListTestBase : public BaseT {
+ public:
+  DisplayListTestBase() = default;
+
+  static DlOpReceiver& ToReceiver(DisplayListBuilder& builder) {
+    return DisplayListBuilderTestingAccessor(builder);
+  }
+
+  static sk_sp<DisplayList> Build(DisplayListInvocation& invocation) {
+    DisplayListBuilder builder;
+    invocation.Invoke(ToReceiver(builder));
+    return builder.Build();
+  }
+
+  static sk_sp<DisplayList> Build(size_t g_index, size_t v_index) {
+    DisplayListBuilder builder;
+    DlOpReceiver& receiver =
+        DisplayListTestBase<::testing::Test>::ToReceiver(builder);
+    unsigned int op_count = 0;
+    size_t byte_count = 0;
+    for (size_t i = 0; i < allGroups.size(); i++) {
+      DisplayListInvocationGroup& group = allGroups[i];
+      size_t j = (i == g_index ? v_index : 0);
+      if (j >= group.variants.size()) {
+        continue;
+      }
+      DisplayListInvocation& invocation = group.variants[j];
+      op_count += invocation.op_count();
+      byte_count += invocation.raw_byte_count();
+      invocation.invoker(receiver);
+    }
+    sk_sp<DisplayList> dl = builder.Build();
+    std::string name;
+    if (g_index >= allGroups.size()) {
+      name = "Default";
+    } else {
+      name = allGroups[g_index].op_name;
+      if (v_index >= allGroups[g_index].variants.size()) {
+        name += " skipped";
+      } else {
+        name += " variant " + std::to_string(v_index + 1);
+      }
+    }
+    EXPECT_EQ(dl->op_count(false), op_count) << name;
+    EXPECT_EQ(dl->bytes(false), byte_count + sizeof(DisplayList)) << name;
+    return dl;
+  }
+
+  static void check_defaults(
+      DisplayListBuilder& builder,
+      const SkRect& cull_rect = DisplayListBuilder::kMaxCullRect) {
+    DlPaint builder_paint = DisplayListBuilderTestingAttributes(builder);
+    DlPaint defaults;
+
+    EXPECT_EQ(builder_paint.isAntiAlias(), defaults.isAntiAlias());
+    EXPECT_EQ(builder_paint.isInvertColors(), defaults.isInvertColors());
+    EXPECT_EQ(builder_paint.getColor(), defaults.getColor());
+    EXPECT_EQ(builder_paint.getBlendMode(), defaults.getBlendMode());
+    EXPECT_EQ(builder_paint.getDrawStyle(), defaults.getDrawStyle());
+    EXPECT_EQ(builder_paint.getStrokeWidth(), defaults.getStrokeWidth());
+    EXPECT_EQ(builder_paint.getStrokeMiter(), defaults.getStrokeMiter());
+    EXPECT_EQ(builder_paint.getStrokeCap(), defaults.getStrokeCap());
+    EXPECT_EQ(builder_paint.getStrokeJoin(), defaults.getStrokeJoin());
+    EXPECT_EQ(builder_paint.getColorSource(), defaults.getColorSource());
+    EXPECT_EQ(builder_paint.getColorFilter(), defaults.getColorFilter());
+    EXPECT_EQ(builder_paint.getImageFilter(), defaults.getImageFilter());
+    EXPECT_EQ(builder_paint.getMaskFilter(), defaults.getMaskFilter());
+    EXPECT_EQ(builder_paint.getPathEffect(), defaults.getPathEffect());
+    EXPECT_EQ(builder_paint, defaults);
+    EXPECT_TRUE(builder_paint.isDefault());
+
+    EXPECT_EQ(builder.GetTransform(), SkMatrix());
+    EXPECT_EQ(builder.GetTransformFullPerspective(), SkM44());
+
+    EXPECT_EQ(builder.GetLocalClipBounds(), cull_rect);
+    EXPECT_EQ(builder.GetDestinationClipBounds(), cull_rect);
+
+    EXPECT_EQ(builder.GetSaveCount(), 1);
+  }
+
+  typedef const std::function<void(DlCanvas&)> DlSetup;
+  typedef const std::function<void(DlCanvas&, DlPaint&, SkRect& rect)>
+      DlRenderer;
+
+  static void verify_inverted_bounds(DlSetup& setup,
+                                     DlRenderer& renderer,
+                                     DlPaint paint,
+                                     SkRect render_rect,
+                                     SkRect expected_bounds,
+                                     const std::string& desc) {
+    DisplayListBuilder builder;
+    setup(builder);
+    renderer(builder, paint, render_rect);
+    auto dl = builder.Build();
+    EXPECT_EQ(dl->op_count(), 1u) << desc;
+    EXPECT_EQ(dl->bounds(), expected_bounds) << desc;
+  }
+
+  static void check_inverted_bounds(DlRenderer& renderer,
+                                    const std::string& desc) {
+    SkRect rect = SkRect::MakeLTRB(0.0f, 0.0f, 10.0f, 10.0f);
+    SkRect invertedLR = SkRect::MakeLTRB(rect.fRight, rect.fTop,  //
+                                         rect.fLeft, rect.fBottom);
+    SkRect invertedTB = SkRect::MakeLTRB(rect.fLeft, rect.fBottom,  //
+                                         rect.fRight, rect.fTop);
+    SkRect invertedLTRB = SkRect::MakeLTRB(rect.fRight, rect.fBottom,  //
+                                           rect.fLeft, rect.fTop);
+    auto empty_setup = [](DlCanvas&) {};
+
+    ASSERT_TRUE(rect.fLeft < rect.fRight);
+    ASSERT_TRUE(rect.fTop < rect.fBottom);
+    ASSERT_FALSE(rect.isEmpty());
+    ASSERT_TRUE(invertedLR.fLeft > invertedLR.fRight);
+    ASSERT_TRUE(invertedLR.isEmpty());
+    ASSERT_TRUE(invertedTB.fTop > invertedTB.fBottom);
+    ASSERT_TRUE(invertedTB.isEmpty());
+    ASSERT_TRUE(invertedLTRB.fLeft > invertedLTRB.fRight);
+    ASSERT_TRUE(invertedLTRB.fTop > invertedLTRB.fBottom);
+    ASSERT_TRUE(invertedLTRB.isEmpty());
+
+    DlPaint ref_paint = DlPaint();
+    SkRect ref_bounds = rect;
+    verify_inverted_bounds(empty_setup, renderer, ref_paint, invertedLR,
+                           ref_bounds, desc + " LR swapped");
+    verify_inverted_bounds(empty_setup, renderer, ref_paint, invertedTB,
+                           ref_bounds, desc + " TB swapped");
+    verify_inverted_bounds(empty_setup, renderer, ref_paint, invertedLTRB,
+                           ref_bounds, desc + " LR&TB swapped");
+
+    // Round joins are used because miter joins greatly pad the bounds,
+    // but only on paths. So we use round joins for consistency there.
+    // We aren't fully testing all stroke-related bounds computations here,
+    // those are more fully tested in the render tests. We are simply
+    // checking that they are applied to the ordered bounds.
+    DlPaint stroke_paint = DlPaint()                                 //
+                               .setDrawStyle(DlDrawStyle::kStroke)   //
+                               .setStrokeJoin(DlStrokeJoin::kRound)  //
+                               .setStrokeWidth(2.0f);
+    SkRect stroke_bounds = rect.makeOutset(1.0f, 1.0f);
+    verify_inverted_bounds(empty_setup, renderer, stroke_paint, invertedLR,
+                           stroke_bounds, desc + " LR swapped, sw 2");
+    verify_inverted_bounds(empty_setup, renderer, stroke_paint, invertedTB,
+                           stroke_bounds, desc + " TB swapped, sw 2");
+    verify_inverted_bounds(empty_setup, renderer, stroke_paint, invertedLTRB,
+                           stroke_bounds, desc + " LR&TB swapped, sw 2");
+
+    DlBlurMaskFilter mask_filter(DlBlurStyle::kNormal, 2.0f);
+    DlPaint maskblur_paint = DlPaint()  //
+                                 .setMaskFilter(&mask_filter);
+    SkRect maskblur_bounds = rect.makeOutset(6.0f, 6.0f);
+    verify_inverted_bounds(empty_setup, renderer, maskblur_paint, invertedLR,
+                           maskblur_bounds, desc + " LR swapped, mask 2");
+    verify_inverted_bounds(empty_setup, renderer, maskblur_paint, invertedTB,
+                           maskblur_bounds, desc + " TB swapped, mask 2");
+    verify_inverted_bounds(empty_setup, renderer, maskblur_paint, invertedLTRB,
+                           maskblur_bounds, desc + " LR&TB swapped, mask 2");
+
+    DlErodeImageFilter erode_filter(2.0f, 2.0f);
+    DlPaint erode_paint = DlPaint()  //
+                              .setImageFilter(&erode_filter);
+    SkRect erode_bounds = rect.makeInset(2.0f, 2.0f);
+    verify_inverted_bounds(empty_setup, renderer, erode_paint, invertedLR,
+                           erode_bounds, desc + " LR swapped, erode 2");
+    verify_inverted_bounds(empty_setup, renderer, erode_paint, invertedTB,
+                           erode_bounds, desc + " TB swapped, erode 2");
+    verify_inverted_bounds(empty_setup, renderer, erode_paint, invertedLTRB,
+                           erode_bounds, desc + " LR&TB swapped, erode 2");
+  }
+
+ private:
+  FML_DISALLOW_COPY_AND_ASSIGN(DisplayListTestBase);
+};
+using DisplayListTest = DisplayListTestBase<::testing::Test>;
+
+TEST_F(DisplayListTest, Defaults) {
+  DisplayListBuilder builder;
+  check_defaults(builder);
+}
+
+TEST_F(DisplayListTest, EmptyBuild) {
+  DisplayListBuilder builder;
+  auto dl = builder.Build();
+  EXPECT_EQ(dl->op_count(), 0u);
+  EXPECT_EQ(dl->bytes(), sizeof(DisplayList));
+}
+
+TEST_F(DisplayListTest, EmptyRebuild) {
+  DisplayListBuilder builder;
+  auto dl1 = builder.Build();
+  auto dl2 = builder.Build();
+  auto dl3 = builder.Build();
+  ASSERT_TRUE(dl1->Equals(dl2));
+  ASSERT_TRUE(dl2->Equals(dl3));
+}
+
+TEST_F(DisplayListTest, BuilderCanBeReused) {
+  DisplayListBuilder builder(kTestBounds);
+  builder.DrawRect(kTestBounds, DlPaint());
+  auto dl = builder.Build();
+  builder.DrawRect(kTestBounds, DlPaint());
+  auto dl2 = builder.Build();
+  ASSERT_TRUE(dl->Equals(dl2));
+}
+
+TEST_F(DisplayListTest, SaveRestoreRestoresTransform) {
+  SkRect cull_rect = SkRect::MakeLTRB(-10.0f, -10.0f, 500.0f, 500.0f);
+  DisplayListBuilder builder(cull_rect);
+
+  builder.Save();
+  builder.Translate(10.0f, 10.0f);
+  builder.Restore();
+  check_defaults(builder, cull_rect);
+
+  builder.Save();
+  builder.Scale(10.0f, 10.0f);
+  builder.Restore();
+  check_defaults(builder, cull_rect);
+
+  builder.Save();
+  builder.Skew(0.1f, 0.1f);
+  builder.Restore();
+  check_defaults(builder, cull_rect);
+
+  builder.Save();
+  builder.Rotate(45.0f);
+  builder.Restore();
+  check_defaults(builder, cull_rect);
+
+  builder.Save();
+  builder.Transform(SkMatrix::Scale(10.0f, 10.0f));
+  builder.Restore();
+  check_defaults(builder, cull_rect);
+
+  builder.Save();
+  builder.Transform2DAffine(1.0f, 0.0f, 12.0f,  //
+                            0.0f, 1.0f, 35.0f);
+  builder.Restore();
+  check_defaults(builder, cull_rect);
+
+  builder.Save();
+  builder.Transform(SkM44(SkMatrix::Scale(10.0f, 10.0f)));
+  builder.Restore();
+  check_defaults(builder, cull_rect);
+
+  builder.Save();
+  builder.TransformFullPerspective(1.0f, 0.0f, 0.0f, 12.0f,  //
+                                   0.0f, 1.0f, 0.0f, 35.0f,  //
+                                   0.0f, 0.0f, 1.0f, 5.0f,   //
+                                   0.0f, 0.0f, 0.0f, 1.0f);
+  builder.Restore();
+  check_defaults(builder, cull_rect);
+}
+
+TEST_F(DisplayListTest, BuildRestoresTransform) {
+  SkRect cull_rect = SkRect::MakeLTRB(-10.0f, -10.0f, 500.0f, 500.0f);
+  DisplayListBuilder builder(cull_rect);
+
+  builder.Translate(10.0f, 10.0f);
+  builder.Build();
+  check_defaults(builder, cull_rect);
+
+  builder.Scale(10.0f, 10.0f);
+  builder.Build();
+  check_defaults(builder, cull_rect);
+
+  builder.Skew(0.1f, 0.1f);
+  builder.Build();
+  check_defaults(builder, cull_rect);
+
+  builder.Rotate(45.0f);
+  builder.Build();
+  check_defaults(builder, cull_rect);
+
+  builder.Transform(SkMatrix::Scale(10.0f, 10.0f));
+  builder.Build();
+  check_defaults(builder, cull_rect);
+
+  builder.Transform2DAffine(1.0f, 0.0f, 12.0f,  //
+                            0.0f, 1.0f, 35.0f);
+  builder.Build();
+  check_defaults(builder, cull_rect);
+
+  builder.Transform(SkM44(SkMatrix::Scale(10.0f, 10.0f)));
+  builder.Build();
+  check_defaults(builder, cull_rect);
+
+  builder.TransformFullPerspective(1.0f, 0.0f, 0.0f, 12.0f,  //
+                                   0.0f, 1.0f, 0.0f, 35.0f,  //
+                                   0.0f, 0.0f, 1.0f, 5.0f,   //
+                                   0.0f, 0.0f, 0.0f, 1.0f);
+  builder.Build();
+  check_defaults(builder, cull_rect);
+}
+
+TEST_F(DisplayListTest, SaveRestoreRestoresClip) {
+  SkRect cull_rect = SkRect::MakeLTRB(-10.0f, -10.0f, 500.0f, 500.0f);
+  DisplayListBuilder builder(cull_rect);
+
+  builder.Save();
+  builder.ClipRect({0.0f, 0.0f, 10.0f, 10.0f});
+  builder.Restore();
+  check_defaults(builder, cull_rect);
+
+  builder.Save();
+  builder.ClipRRect(SkRRect::MakeRectXY({0.0f, 0.0f, 5.0f, 5.0f}, 2.0f, 2.0f));
+  builder.Restore();
+  check_defaults(builder, cull_rect);
+
+  builder.Save();
+  builder.ClipPath(SkPath().addOval({0.0f, 0.0f, 10.0f, 10.0f}));
+  builder.Restore();
+  check_defaults(builder, cull_rect);
+}
+
+TEST_F(DisplayListTest, BuildRestoresClip) {
+  SkRect cull_rect = SkRect::MakeLTRB(-10.0f, -10.0f, 500.0f, 500.0f);
+  DisplayListBuilder builder(cull_rect);
+
+  builder.ClipRect({0.0f, 0.0f, 10.0f, 10.0f});
+  builder.Build();
+  check_defaults(builder, cull_rect);
+
+  builder.ClipRRect(SkRRect::MakeRectXY({0.0f, 0.0f, 5.0f, 5.0f}, 2.0f, 2.0f));
+  builder.Build();
+  check_defaults(builder, cull_rect);
+
+  builder.ClipPath(SkPath().addOval({0.0f, 0.0f, 10.0f, 10.0f}));
+  builder.Build();
+  check_defaults(builder, cull_rect);
+}
+
+TEST_F(DisplayListTest, BuildRestoresAttributes) {
+  SkRect cull_rect = SkRect::MakeLTRB(-10.0f, -10.0f, 500.0f, 500.0f);
+  DisplayListBuilder builder(cull_rect);
+  DlOpReceiver& receiver = ToReceiver(builder);
+
+  receiver.setAntiAlias(true);
+  builder.Build();
+  check_defaults(builder, cull_rect);
+
+  receiver.setInvertColors(true);
+  builder.Build();
+  check_defaults(builder, cull_rect);
+
+  receiver.setColor(DlColor::kRed());
+  builder.Build();
+  check_defaults(builder, cull_rect);
+
+  receiver.setBlendMode(DlBlendMode::kColorBurn);
+  builder.Build();
+  check_defaults(builder, cull_rect);
+
+  receiver.setDrawStyle(DlDrawStyle::kStrokeAndFill);
+  builder.Build();
+  check_defaults(builder, cull_rect);
+
+  receiver.setStrokeWidth(300.0f);
+  builder.Build();
+  check_defaults(builder, cull_rect);
+
+  receiver.setStrokeMiter(300.0f);
+  builder.Build();
+  check_defaults(builder, cull_rect);
+
+  receiver.setStrokeCap(DlStrokeCap::kRound);
+  builder.Build();
+  check_defaults(builder, cull_rect);
+
+  receiver.setStrokeJoin(DlStrokeJoin::kRound);
+  builder.Build();
+  check_defaults(builder, cull_rect);
+
+  receiver.setColorSource(&kTestSource1);
+  builder.Build();
+  check_defaults(builder, cull_rect);
+
+  receiver.setColorFilter(&kTestMatrixColorFilter1);
+  builder.Build();
+  check_defaults(builder, cull_rect);
+
+  receiver.setImageFilter(&kTestBlurImageFilter1);
+  builder.Build();
+  check_defaults(builder, cull_rect);
+
+  receiver.setMaskFilter(&kTestMaskFilter1);
+  builder.Build();
+  check_defaults(builder, cull_rect);
+
+  receiver.setPathEffect(kTestPathEffect1.get());
+  builder.Build();
+  check_defaults(builder, cull_rect);
+}
+
+TEST_F(DisplayListTest, BuilderBoundsTransformComparedToSkia) {
+  const SkRect frame_rect = SkRect::MakeLTRB(10, 10, 100, 100);
+  DisplayListBuilder builder(frame_rect);
+  SkPictureRecorder recorder;
+  SkCanvas* canvas = recorder.beginRecording(frame_rect);
+  ASSERT_EQ(builder.GetDestinationClipBounds(),
+            SkRect::Make(canvas->getDeviceClipBounds()));
+  ASSERT_EQ(builder.GetLocalClipBounds().makeOutset(1, 1),
+            canvas->getLocalClipBounds());
+  ASSERT_EQ(builder.GetTransform(), canvas->getTotalMatrix());
+}
+
+TEST_F(DisplayListTest, BuilderInitialClipBounds) {
+  SkRect cull_rect = SkRect::MakeWH(100, 100);
+  SkRect clip_bounds = SkRect::MakeWH(100, 100);
+  DisplayListBuilder builder(cull_rect);
+  ASSERT_EQ(builder.GetDestinationClipBounds(), clip_bounds);
+}
+
+TEST_F(DisplayListTest, BuilderInitialClipBoundsNaN) {
+  SkRect cull_rect = SkRect::MakeWH(SK_ScalarNaN, SK_ScalarNaN);
+  SkRect clip_bounds = SkRect::MakeEmpty();
+  DisplayListBuilder builder(cull_rect);
+  ASSERT_EQ(builder.GetDestinationClipBounds(), clip_bounds);
+}
+
+TEST_F(DisplayListTest, BuilderClipBoundsAfterClipRect) {
+  SkRect cull_rect = SkRect::MakeWH(100, 100);
+  SkRect clip_rect = SkRect::MakeLTRB(10, 10, 20, 20);
+  SkRect clip_bounds = SkRect::MakeLTRB(10, 10, 20, 20);
+  DisplayListBuilder builder(cull_rect);
+  builder.ClipRect(clip_rect, ClipOp::kIntersect, false);
+  ASSERT_EQ(builder.GetDestinationClipBounds(), clip_bounds);
+}
+
+TEST_F(DisplayListTest, BuilderClipBoundsAfterClipRRect) {
+  SkRect cull_rect = SkRect::MakeWH(100, 100);
+  SkRect clip_rect = SkRect::MakeLTRB(10, 10, 20, 20);
+  SkRRect clip_rrect = SkRRect::MakeRectXY(clip_rect, 2, 2);
+  SkRect clip_bounds = SkRect::MakeLTRB(10, 10, 20, 20);
+  DisplayListBuilder builder(cull_rect);
+  builder.ClipRRect(clip_rrect, ClipOp::kIntersect, false);
+  ASSERT_EQ(builder.GetDestinationClipBounds(), clip_bounds);
+}
+
+TEST_F(DisplayListTest, BuilderClipBoundsAfterClipPath) {
+  SkRect cull_rect = SkRect::MakeWH(100, 100);
+  SkPath clip_path = SkPath().addRect(10, 10, 15, 15).addRect(15, 15, 20, 20);
+  SkRect clip_bounds = SkRect::MakeLTRB(10, 10, 20, 20);
+  DisplayListBuilder builder(cull_rect);
+  builder.ClipPath(clip_path, ClipOp::kIntersect, false);
+  ASSERT_EQ(builder.GetDestinationClipBounds(), clip_bounds);
+}
+
+TEST_F(DisplayListTest, BuilderInitialClipBoundsNonZero) {
+  SkRect cull_rect = SkRect::MakeLTRB(10, 10, 100, 100);
+  SkRect clip_bounds = SkRect::MakeLTRB(10, 10, 100, 100);
+  DisplayListBuilder builder(cull_rect);
+  ASSERT_EQ(builder.GetDestinationClipBounds(), clip_bounds);
+}
+
+TEST_F(DisplayListTest, UnclippedSaveLayerContentAccountsForFilter) {
+  SkRect cull_rect = SkRect::MakeLTRB(0.0f, 0.0f, 300.0f, 300.0f);
+  SkRect clip_rect = SkRect::MakeLTRB(100.0f, 100.0f, 200.0f, 200.0f);
+  SkRect draw_rect = SkRect::MakeLTRB(50.0f, 140.0f, 101.0f, 160.0f);
+  auto filter = DlBlurImageFilter::Make(10.0f, 10.0f, DlTileMode::kDecal);
+  DlPaint layer_paint = DlPaint().setImageFilter(filter);
+
+  ASSERT_TRUE(clip_rect.intersects(draw_rect));
+  ASSERT_TRUE(cull_rect.contains(clip_rect));
+  ASSERT_TRUE(cull_rect.contains(draw_rect));
+
+  DisplayListBuilder builder;
+  builder.Save();
+  {
+    builder.ClipRect(clip_rect, ClipOp::kIntersect, false);
+    builder.SaveLayer(&cull_rect, &layer_paint);
+    {  //
+      builder.DrawRect(draw_rect, DlPaint());
+    }
+    builder.Restore();
+  }
+  builder.Restore();
+  auto display_list = builder.Build();
+
+  ASSERT_EQ(display_list->op_count(), 6u);
+
+  SkRect result_rect = draw_rect.makeOutset(30.0f, 30.0f);
+  ASSERT_TRUE(result_rect.intersect(clip_rect));
+  ASSERT_EQ(result_rect, SkRect::MakeLTRB(100.0f, 110.0f, 131.0f, 190.0f));
+  ASSERT_EQ(display_list->bounds(), result_rect);
+}
+
+TEST_F(DisplayListTest, ClippedSaveLayerContentAccountsForFilter) {
+  SkRect cull_rect = SkRect::MakeLTRB(0.0f, 0.0f, 300.0f, 300.0f);
+  SkRect clip_rect = SkRect::MakeLTRB(100.0f, 100.0f, 200.0f, 200.0f);
+  SkRect draw_rect = SkRect::MakeLTRB(50.0f, 140.0f, 99.0f, 160.0f);
+  auto filter = DlBlurImageFilter::Make(10.0f, 10.0f, DlTileMode::kDecal);
+  DlPaint layer_paint = DlPaint().setImageFilter(filter);
+
+  ASSERT_FALSE(clip_rect.intersects(draw_rect));
+  ASSERT_TRUE(cull_rect.contains(clip_rect));
+  ASSERT_TRUE(cull_rect.contains(draw_rect));
+
+  DisplayListBuilder builder;
+  builder.Save();
+  {
+    builder.ClipRect(clip_rect, ClipOp::kIntersect, false);
+    builder.SaveLayer(&cull_rect, &layer_paint);
+    {  //
+      builder.DrawRect(draw_rect, DlPaint());
+    }
+    builder.Restore();
+  }
+  builder.Restore();
+  auto display_list = builder.Build();
+
+  ASSERT_EQ(display_list->op_count(), 6u);
+
+  SkRect result_rect = draw_rect.makeOutset(30.0f, 30.0f);
+  ASSERT_TRUE(result_rect.intersect(clip_rect));
+  ASSERT_EQ(result_rect, SkRect::MakeLTRB(100.0f, 110.0f, 129.0f, 190.0f));
+  ASSERT_EQ(display_list->bounds(), result_rect);
 }
-#endif  // NDEBUG
 
-TEST(DisplayList, SingleOpSizes) {
+TEST_F(DisplayListTest, SingleOpSizes) {
   for (auto& group : allGroups) {
     for (size_t i = 0; i < group.variants.size(); i++) {
       auto& invocation = group.variants[i];
-      sk_sp<DisplayList> dl = invocation.Build();
+      sk_sp<DisplayList> dl = Build(invocation);
       auto desc = group.op_name + "(variant " + std::to_string(i + 1) + ")";
       ASSERT_EQ(dl->op_count(false), invocation.op_count()) << desc;
       ASSERT_EQ(dl->bytes(false), invocation.byte_count()) << desc;
@@ -50,11 +577,11 @@ TEST(DisplayList, SingleOpSizes) {
   }
 }
 
-TEST(DisplayList, SingleOpDisplayListsNotEqualEmpty) {
+TEST_F(DisplayListTest, SingleOpDisplayListsNotEqualEmpty) {
   sk_sp<DisplayList> empty = DisplayListBuilder().Build();
   for (auto& group : allGroups) {
     for (size_t i = 0; i < group.variants.size(); i++) {
-      sk_sp<DisplayList> dl = group.variants[i].Build();
+      sk_sp<DisplayList> dl = Build(group.variants[i]);
       auto desc =
           group.op_name + "(variant " + std::to_string(i + 1) + " != empty)";
       if (group.variants[i].is_empty()) {
@@ -68,15 +595,16 @@ TEST(DisplayList, SingleOpDisplayListsNotEqualEmpty) {
   }
 }
 
-TEST(DisplayList, SingleOpDisplayListsRecapturedAreEqual) {
+TEST_F(DisplayListTest, SingleOpDisplayListsRecapturedAreEqual) {
   for (auto& group : allGroups) {
     for (size_t i = 0; i < group.variants.size(); i++) {
-      sk_sp<DisplayList> dl = group.variants[i].Build();
+      sk_sp<DisplayList> dl = Build(group.variants[i]);
       // Verify recapturing the replay of the display list is Equals()
       // when dispatching directly from the DL to another builder
-      DisplayListBuilder builder;
-      dl->Dispatch(builder);
-      sk_sp<DisplayList> copy = builder.Build();
+      DisplayListBuilder copy_builder;
+      DlOpReceiver& r = ToReceiver(copy_builder);
+      dl->Dispatch(r);
+      sk_sp<DisplayList> copy = copy_builder.Build();
       auto desc =
           group.op_name + "(variant " + std::to_string(i + 1) + " == copy)";
       ASSERT_EQ(copy->op_count(false), dl->op_count(false)) << desc;
@@ -90,51 +618,13 @@ TEST(DisplayList, SingleOpDisplayListsRecapturedAreEqual) {
   }
 }
 
-TEST(DisplayList, SingleOpDisplayListsRecapturedViaSkCanvasAreEqual) {
-  for (auto& group : allGroups) {
-    for (size_t i = 0; i < group.variants.size(); i++) {
-      if (group.variants[i].sk_testing_invalid()) {
-        continue;
-      }
-      // Verify a DisplayList (re)built by "rendering" it to an
-      // [SkCanvas->DisplayList] recorder recaptures an equivalent
-      // sequence.
-      // Note that sometimes the rendering ops can be optimized out by
-      // SkCanvas so the transfer is not always 1:1. We control for
-      // this by having separate op counts and sizes for the sk results
-      // and changing our expectation of Equals() results accordingly.
-      sk_sp<DisplayList> dl = group.variants[i].Build();
-
-      DisplayListCanvasRecorder recorder(dl->bounds());
-      dl->RenderTo(&recorder);
-      sk_sp<DisplayList> sk_copy = recorder.Build();
-      auto desc = group.op_name + "[variant " + std::to_string(i + 1) + "]";
-      EXPECT_EQ(static_cast<int>(sk_copy->op_count(false)),
-                group.variants[i].sk_op_count())
-          << desc;
-      EXPECT_EQ(sk_copy->bytes(false), group.variants[i].sk_byte_count())
-          << desc;
-      if (group.variants[i].sk_version_matches()) {
-        EXPECT_EQ(sk_copy->bounds(), dl->bounds()) << desc;
-        EXPECT_TRUE(dl->Equals(*sk_copy)) << desc << " == sk_copy";
-        EXPECT_TRUE(sk_copy->Equals(*dl)) << "sk_copy == " << desc;
-      } else {
-        // No assertion on bounds
-        // they could be equal, hard to tell
-        EXPECT_FALSE(dl->Equals(*sk_copy)) << desc << " != sk_copy";
-        EXPECT_FALSE(sk_copy->Equals(*dl)) << "sk_copy != " << desc;
-      }
-    }
-  }
-}
-
-TEST(DisplayList, SingleOpDisplayListsCompareToEachOther) {
+TEST_F(DisplayListTest, SingleOpDisplayListsCompareToEachOther) {
   for (auto& group : allGroups) {
     std::vector<sk_sp<DisplayList>> lists_a;
     std::vector<sk_sp<DisplayList>> lists_b;
     for (size_t i = 0; i < group.variants.size(); i++) {
-      lists_a.push_back(group.variants[i].Build());
-      lists_b.push_back(group.variants[i].Build());
+      lists_a.push_back(Build(group.variants[i]));
+      lists_b.push_back(Build(group.variants[i]));
     }
 
     for (size_t i = 0; i < lists_a.size(); i++) {
@@ -164,13 +654,38 @@ TEST(DisplayList, SingleOpDisplayListsCompareToEachOther) {
   }
 }
 
-TEST(DisplayList, FullRotationsAreNop) {
+TEST_F(DisplayListTest, SingleOpDisplayListsAreEqualWithOrWithoutRtree) {
+  for (auto& group : allGroups) {
+    for (size_t i = 0; i < group.variants.size(); i++) {
+      DisplayListBuilder builder1(/*prepare_rtree=*/false);
+      DisplayListBuilder builder2(/*prepare_rtree=*/true);
+      group.variants[i].invoker(ToReceiver(builder1));
+      group.variants[i].invoker(ToReceiver(builder2));
+      sk_sp<DisplayList> dl1 = builder1.Build();
+      sk_sp<DisplayList> dl2 = builder2.Build();
+
+      auto desc = group.op_name + "(variant " + std::to_string(i + 1) + " )";
+      ASSERT_EQ(dl1->op_count(false), dl2->op_count(false)) << desc;
+      ASSERT_EQ(dl1->bytes(false), dl2->bytes(false)) << desc;
+      ASSERT_EQ(dl1->op_count(true), dl2->op_count(true)) << desc;
+      ASSERT_EQ(dl1->bytes(true), dl2->bytes(true)) << desc;
+      ASSERT_EQ(dl1->bounds(), dl2->bounds()) << desc;
+      ASSERT_TRUE(DisplayListsEQ_Verbose(dl1, dl2)) << desc;
+      ASSERT_TRUE(DisplayListsEQ_Verbose(dl2, dl2)) << desc;
+      ASSERT_EQ(dl1->rtree().get(), nullptr) << desc;
+      ASSERT_NE(dl2->rtree().get(), nullptr) << desc;
+    }
+  }
+}
+
+TEST_F(DisplayListTest, FullRotationsAreNop) {
   DisplayListBuilder builder;
-  builder.rotate(0);
-  builder.rotate(360);
-  builder.rotate(720);
-  builder.rotate(1080);
-  builder.rotate(1440);
+  DlOpReceiver& receiver = ToReceiver(builder);
+  receiver.rotate(0);
+  receiver.rotate(360);
+  receiver.rotate(720);
+  receiver.rotate(1080);
+  receiver.rotate(1440);
   sk_sp<DisplayList> dl = builder.Build();
   ASSERT_EQ(dl->bytes(false), sizeof(DisplayList));
   ASSERT_EQ(dl->bytes(true), sizeof(DisplayList));
@@ -178,10 +693,10 @@ TEST(DisplayList, FullRotationsAreNop) {
   ASSERT_EQ(dl->op_count(true), 0u);
 }
 
-TEST(DisplayList, AllBlendModeNops) {
+TEST_F(DisplayListTest, AllBlendModeNops) {
   DisplayListBuilder builder;
-  builder.setBlendMode(DlBlendMode::kSrcOver);
-  builder.setBlender(nullptr);
+  DlOpReceiver& receiver = ToReceiver(builder);
+  receiver.setBlendMode(DlBlendMode::kSrcOver);
   sk_sp<DisplayList> dl = builder.Build();
   ASSERT_EQ(dl->bytes(false), sizeof(DisplayList));
   ASSERT_EQ(dl->bytes(true), sizeof(DisplayList));
@@ -189,39 +704,7 @@ TEST(DisplayList, AllBlendModeNops) {
   ASSERT_EQ(dl->op_count(true), 0u);
 }
 
-static sk_sp<DisplayList> Build(size_t g_index, size_t v_index) {
-  DisplayListBuilder builder;
-  unsigned int op_count = 0;
-  size_t byte_count = 0;
-  for (size_t i = 0; i < allGroups.size(); i++) {
-    DisplayListInvocationGroup& group = allGroups[i];
-    size_t j = (i == g_index ? v_index : 0);
-    if (j >= group.variants.size()) {
-      continue;
-    }
-    DisplayListInvocation& invocation = group.variants[j];
-    op_count += invocation.op_count();
-    byte_count += invocation.raw_byte_count();
-    invocation.invoker(builder);
-  }
-  sk_sp<DisplayList> dl = builder.Build();
-  std::string name;
-  if (g_index >= allGroups.size()) {
-    name = "Default";
-  } else {
-    name = allGroups[g_index].op_name;
-    if (v_index >= allGroups[g_index].variants.size()) {
-      name += " skipped";
-    } else {
-      name += " variant " + std::to_string(v_index + 1);
-    }
-  }
-  EXPECT_EQ(dl->op_count(false), op_count) << name;
-  EXPECT_EQ(dl->bytes(false), byte_count + sizeof(DisplayList)) << name;
-  return dl;
-}
-
-TEST(DisplayList, DisplayListsWithVaryingOpComparisons) {
+TEST_F(DisplayListTest, DisplayListsWithVaryingOpComparisons) {
   sk_sp<DisplayList> default_dl = Build(allGroups.size(), 0);
   ASSERT_TRUE(default_dl->Equals(*default_dl)) << "Default == itself";
   for (size_t gi = 0; gi < allGroups.size(); gi++) {
@@ -254,7 +737,7 @@ TEST(DisplayList, DisplayListsWithVaryingOpComparisons) {
   }
 }
 
-TEST(DisplayList, DisplayListSaveLayerBoundsWithAlphaFilter) {
+TEST_F(DisplayListTest, DisplayListSaveLayerBoundsWithAlphaFilter) {
   SkRect build_bounds = SkRect::MakeLTRB(-100, -100, 200, 200);
   SkRect save_bounds = SkRect::MakeWH(100, 100);
   SkRect rect = SkRect::MakeLTRB(30, 30, 70, 70);
@@ -276,13 +759,16 @@ TEST(DisplayList, DisplayListSaveLayerBoundsWithAlphaFilter) {
   };
   // clang-format on
   DlMatrixColorFilter alpha_color_filter(alpha_matrix);
+  sk_sp<SkColorFilter> sk_alpha_color_filter =
+      SkColorFilters::Matrix(alpha_matrix);
 
   {
     // No tricky stuff, just verifying drawing a rect produces rect bounds
     DisplayListBuilder builder(build_bounds);
-    builder.saveLayer(&save_bounds, true);
-    builder.drawRect(rect);
-    builder.restore();
+    DlOpReceiver& receiver = ToReceiver(builder);
+    receiver.saveLayer(&save_bounds, SaveLayerOptions::kWithAttributes);
+    receiver.drawRect(rect);
+    receiver.restore();
     sk_sp<DisplayList> display_list = builder.Build();
     ASSERT_EQ(display_list->bounds(), rect);
   }
@@ -290,11 +776,12 @@ TEST(DisplayList, DisplayListSaveLayerBoundsWithAlphaFilter) {
   {
     // Now checking that a normal color filter still produces rect bounds
     DisplayListBuilder builder(build_bounds);
-    builder.setColorFilter(&base_color_filter);
-    builder.saveLayer(&save_bounds, true);
-    builder.setColorFilter(nullptr);
-    builder.drawRect(rect);
-    builder.restore();
+    DlOpReceiver& receiver = ToReceiver(builder);
+    receiver.setColorFilter(&base_color_filter);
+    receiver.saveLayer(&save_bounds, SaveLayerOptions::kWithAttributes);
+    receiver.setColorFilter(nullptr);
+    receiver.drawRect(rect);
+    receiver.restore();
     sk_sp<DisplayList> display_list = builder.Build();
     ASSERT_EQ(display_list->bounds(), rect);
   }
@@ -307,7 +794,7 @@ TEST(DisplayList, DisplayListSaveLayerBoundsWithAlphaFilter) {
     SkRTreeFactory rtree_factory;
     SkCanvas* canvas = recorder.beginRecording(build_bounds, &rtree_factory);
     SkPaint p1;
-    p1.setColorFilter(alpha_color_filter.skia_object());
+    p1.setColorFilter(sk_alpha_color_filter);
     canvas->saveLayer(save_bounds, &p1);
     SkPaint p2;
     canvas->drawRect(rect, p2);
@@ -322,11 +809,12 @@ TEST(DisplayList, DisplayListSaveLayerBoundsWithAlphaFilter) {
     // cull rect of the DisplayListBuilder when it encounters a
     // save layer that modifies an unbounded region
     DisplayListBuilder builder(build_bounds);
-    builder.setColorFilter(&alpha_color_filter);
-    builder.saveLayer(&save_bounds, true);
-    builder.setColorFilter(nullptr);
-    builder.drawRect(rect);
-    builder.restore();
+    DlOpReceiver& receiver = ToReceiver(builder);
+    receiver.setColorFilter(&alpha_color_filter);
+    receiver.saveLayer(&save_bounds, SaveLayerOptions::kWithAttributes);
+    receiver.setColorFilter(nullptr);
+    receiver.drawRect(rect);
+    receiver.restore();
     sk_sp<DisplayList> display_list = builder.Build();
     ASSERT_EQ(display_list->bounds(), build_bounds);
   }
@@ -335,11 +823,12 @@ TEST(DisplayList, DisplayListSaveLayerBoundsWithAlphaFilter) {
     // Verifying that the save layer bounds are not relevant
     // to the behavior in the previous example
     DisplayListBuilder builder(build_bounds);
-    builder.setColorFilter(&alpha_color_filter);
-    builder.saveLayer(nullptr, true);
-    builder.setColorFilter(nullptr);
-    builder.drawRect(rect);
-    builder.restore();
+    DlOpReceiver& receiver = ToReceiver(builder);
+    receiver.setColorFilter(&alpha_color_filter);
+    receiver.saveLayer(nullptr, SaveLayerOptions::kWithAttributes);
+    receiver.setColorFilter(nullptr);
+    receiver.drawRect(rect);
+    receiver.restore();
     sk_sp<DisplayList> display_list = builder.Build();
     ASSERT_EQ(display_list->bounds(), build_bounds);
   }
@@ -348,12 +837,13 @@ TEST(DisplayList, DisplayListSaveLayerBoundsWithAlphaFilter) {
     // Making sure hiding a ColorFilter as an ImageFilter will
     // generate the same behavior as setting it as a ColorFilter
     DisplayListBuilder builder(build_bounds);
+    DlOpReceiver& receiver = ToReceiver(builder);
     DlColorFilterImageFilter color_filter_image_filter(base_color_filter);
-    builder.setImageFilter(&color_filter_image_filter);
-    builder.saveLayer(&save_bounds, true);
-    builder.setImageFilter(nullptr);
-    builder.drawRect(rect);
-    builder.restore();
+    receiver.setImageFilter(&color_filter_image_filter);
+    receiver.saveLayer(&save_bounds, SaveLayerOptions::kWithAttributes);
+    receiver.setImageFilter(nullptr);
+    receiver.drawRect(rect);
+    receiver.restore();
     sk_sp<DisplayList> display_list = builder.Build();
     ASSERT_EQ(display_list->bounds(), rect);
   }
@@ -362,12 +852,13 @@ TEST(DisplayList, DisplayListSaveLayerBoundsWithAlphaFilter) {
     // Making sure hiding a problematic ColorFilter as an ImageFilter
     // will generate the same behavior as setting it as a ColorFilter
     DisplayListBuilder builder(build_bounds);
+    DlOpReceiver& receiver = ToReceiver(builder);
     DlColorFilterImageFilter color_filter_image_filter(alpha_color_filter);
-    builder.setImageFilter(&color_filter_image_filter);
-    builder.saveLayer(&save_bounds, true);
-    builder.setImageFilter(nullptr);
-    builder.drawRect(rect);
-    builder.restore();
+    receiver.setImageFilter(&color_filter_image_filter);
+    receiver.saveLayer(&save_bounds, SaveLayerOptions::kWithAttributes);
+    receiver.setImageFilter(nullptr);
+    receiver.drawRect(rect);
+    receiver.restore();
     sk_sp<DisplayList> display_list = builder.Build();
     ASSERT_EQ(display_list->bounds(), build_bounds);
   }
@@ -375,12 +866,13 @@ TEST(DisplayList, DisplayListSaveLayerBoundsWithAlphaFilter) {
   {
     // Same as above (ImageFilter hiding ColorFilter) with no save bounds
     DisplayListBuilder builder(build_bounds);
+    DlOpReceiver& receiver = ToReceiver(builder);
     DlColorFilterImageFilter color_filter_image_filter(alpha_color_filter);
-    builder.setImageFilter(&color_filter_image_filter);
-    builder.saveLayer(nullptr, true);
-    builder.setImageFilter(nullptr);
-    builder.drawRect(rect);
-    builder.restore();
+    receiver.setImageFilter(&color_filter_image_filter);
+    receiver.saveLayer(nullptr, SaveLayerOptions::kWithAttributes);
+    receiver.setImageFilter(nullptr);
+    receiver.drawRect(rect);
+    receiver.restore();
     sk_sp<DisplayList> display_list = builder.Build();
     ASSERT_EQ(display_list->bounds(), build_bounds);
   }
@@ -388,11 +880,12 @@ TEST(DisplayList, DisplayListSaveLayerBoundsWithAlphaFilter) {
   {
     // Testing behavior with an unboundable blend mode
     DisplayListBuilder builder(build_bounds);
-    builder.setBlendMode(DlBlendMode::kClear);
-    builder.saveLayer(&save_bounds, true);
-    builder.setBlendMode(DlBlendMode::kSrcOver);
-    builder.drawRect(rect);
-    builder.restore();
+    DlOpReceiver& receiver = ToReceiver(builder);
+    receiver.setBlendMode(DlBlendMode::kClear);
+    receiver.saveLayer(&save_bounds, SaveLayerOptions::kWithAttributes);
+    receiver.setBlendMode(DlBlendMode::kSrcOver);
+    receiver.drawRect(rect);
+    receiver.restore();
     sk_sp<DisplayList> display_list = builder.Build();
     ASSERT_EQ(display_list->bounds(), build_bounds);
   }
@@ -400,17 +893,18 @@ TEST(DisplayList, DisplayListSaveLayerBoundsWithAlphaFilter) {
   {
     // Same as previous with no save bounds
     DisplayListBuilder builder(build_bounds);
-    builder.setBlendMode(DlBlendMode::kClear);
-    builder.saveLayer(nullptr, true);
-    builder.setBlendMode(DlBlendMode::kSrcOver);
-    builder.drawRect(rect);
-    builder.restore();
+    DlOpReceiver& receiver = ToReceiver(builder);
+    receiver.setBlendMode(DlBlendMode::kClear);
+    receiver.saveLayer(nullptr, SaveLayerOptions::kWithAttributes);
+    receiver.setBlendMode(DlBlendMode::kSrcOver);
+    receiver.drawRect(rect);
+    receiver.restore();
     sk_sp<DisplayList> display_list = builder.Build();
     ASSERT_EQ(display_list->bounds(), build_bounds);
   }
 }
 
-TEST(DisplayList, NestedOpCountMetricsSameAsSkPicture) {
+TEST_F(DisplayListTest, NestedOpCountMetricsSameAsSkPicture) {
   SkPictureRecorder recorder;
   recorder.beginRecording(SkRect::MakeWH(150, 100));
   SkCanvas* canvas = recorder.getRecordingCanvas();
@@ -431,14 +925,17 @@ TEST(DisplayList, NestedOpCountMetricsSameAsSkPicture) {
   ASSERT_EQ(picture->approximateOpCount(true), 36);
 
   DisplayListBuilder builder(SkRect::MakeWH(150, 100));
+  DlOpReceiver& receiver = ToReceiver(builder);
   for (int y = 10; y <= 60; y += 10) {
     for (int x = 10; x <= 60; x += 10) {
-      builder.setColor(((x + y) % 20) == 10 ? SK_ColorRED : SK_ColorBLUE);
-      builder.drawRect(SkRect::MakeXYWH(x, y, 80, 80));
+      receiver.setColor(((x + y) % 20) == 10 ? DlColor(SK_ColorRED)
+                                             : DlColor(SK_ColorBLUE));
+      receiver.drawRect(SkRect::MakeXYWH(x, y, 80, 80));
     }
   }
   DisplayListBuilder outer_builder(SkRect::MakeWH(150, 100));
-  outer_builder.drawDisplayList(builder.Build());
+  DlOpReceiver& outer_receiver = ToReceiver(outer_builder);
+  outer_receiver.drawDisplayList(builder.Build());
 
   auto display_list = outer_builder.Build();
   ASSERT_EQ(display_list->op_count(), 1u);
@@ -448,89 +945,9 @@ TEST(DisplayList, NestedOpCountMetricsSameAsSkPicture) {
             static_cast<int>(display_list->op_count()));
   ASSERT_EQ(picture->approximateOpCount(true),
             static_cast<int>(display_list->op_count(true)));
-
-  DisplayListCanvasRecorder dl_recorder(SkRect::MakeWH(150, 100));
-  picture->playback(&dl_recorder);
-
-  auto sk_display_list = dl_recorder.Build();
-  ASSERT_EQ(display_list->op_count(), 1u);
-  ASSERT_EQ(display_list->op_count(true), 36u);
-}
-
-class AttributeRefTester {
- public:
-  virtual void setRefToPaint(SkPaint& paint) const = 0;
-  virtual void setRefToDisplayList(DisplayListBuilder& builder) const = 0;
-  virtual bool ref_is_unique() const = 0;
-
-  void testDisplayList() {
-    {
-      DisplayListBuilder builder;
-      setRefToDisplayList(builder);
-      builder.drawRect(SkRect::MakeLTRB(50, 50, 100, 100));
-      ASSERT_FALSE(ref_is_unique());
-    }
-    ASSERT_TRUE(ref_is_unique());
-  }
-  void testPaint() {
-    {
-      SkPaint paint;
-      setRefToPaint(paint);
-      ASSERT_FALSE(ref_is_unique());
-    }
-    ASSERT_TRUE(ref_is_unique());
-  }
-  void testCanvasRecorder() {
-    {
-      sk_sp<DisplayList> display_list;
-      {
-        DisplayListCanvasRecorder recorder(SkRect::MakeLTRB(0, 0, 200, 200));
-        {
-          {
-            SkPaint paint;
-            setRefToPaint(paint);
-            recorder.drawRect(SkRect::MakeLTRB(50, 50, 100, 100), paint);
-            ASSERT_FALSE(ref_is_unique());
-          }
-          ASSERT_FALSE(ref_is_unique());
-        }
-        display_list = recorder.Build();
-        ASSERT_FALSE(ref_is_unique());
-      }
-      ASSERT_FALSE(ref_is_unique());
-    }
-    ASSERT_TRUE(ref_is_unique());
-  }
-
-  void test() {
-    testDisplayList();
-    testPaint();
-    testCanvasRecorder();
-  }
-};
-
-TEST(DisplayList, DisplayListBlenderRefHandling) {
-  class BlenderRefTester : public virtual AttributeRefTester {
-   public:
-    void setRefToPaint(SkPaint& paint) const override {
-      paint.setBlender(blender_);
-    }
-    void setRefToDisplayList(DisplayListBuilder& builder) const override {
-      builder.setBlender(blender_);
-    }
-    bool ref_is_unique() const override { return blender_->unique(); }
-
-   private:
-    sk_sp<SkBlender> blender_ =
-        SkBlenders::Arithmetic(0.25, 0.25, 0.25, 0.25, true);
-  };
-
-  BlenderRefTester tester;
-  tester.test();
-  ASSERT_TRUE(tester.ref_is_unique());
 }
 
-TEST(DisplayList, DisplayListFullPerspectiveTransformHandling) {
+TEST_F(DisplayListTest, DisplayListFullPerspectiveTransformHandling) {
   // SkM44 constructor takes row-major order
   SkM44 sk_matrix = SkM44(
       // clang-format off
@@ -543,8 +960,9 @@ TEST(DisplayList, DisplayListFullPerspectiveTransformHandling) {
 
   {  // First test ==
     DisplayListBuilder builder;
-    // builder.transformFullPerspective takes row-major order
-    builder.transformFullPerspective(
+    DlOpReceiver& receiver = ToReceiver(builder);
+    // receiver.transformFullPerspective takes row-major order
+    receiver.transformFullPerspective(
         // clang-format off
          1,  2,  3,  4,
          5,  6,  7,  8,
@@ -553,16 +971,21 @@ TEST(DisplayList, DisplayListFullPerspectiveTransformHandling) {
         // clang-format on
     );
     sk_sp<DisplayList> display_list = builder.Build();
-    sk_sp<SkSurface> surface = SkSurface::MakeRasterN32Premul(10, 10);
+    sk_sp<SkSurface> surface =
+        SkSurfaces::Raster(SkImageInfo::MakeN32Premul(10, 10));
     SkCanvas* canvas = surface->getCanvas();
-    display_list->RenderTo(canvas);
+    // We can't use DlSkCanvas.DrawDisplayList as that method protects
+    // the canvas against mutations from the display list being drawn.
+    auto dispatcher = DlSkCanvasDispatcher(surface->getCanvas());
+    display_list->Dispatch(dispatcher);
     SkM44 dl_matrix = canvas->getLocalToDevice();
     ASSERT_EQ(sk_matrix, dl_matrix);
   }
   {  // Next test !=
     DisplayListBuilder builder;
-    // builder.transformFullPerspective takes row-major order
-    builder.transformFullPerspective(
+    DlOpReceiver& receiver = ToReceiver(builder);
+    // receiver.transformFullPerspective takes row-major order
+    receiver.transformFullPerspective(
         // clang-format off
          1,  5,  9, 13,
          2,  6,  7, 11,
@@ -571,35 +994,45 @@ TEST(DisplayList, DisplayListFullPerspectiveTransformHandling) {
         // clang-format on
     );
     sk_sp<DisplayList> display_list = builder.Build();
-    sk_sp<SkSurface> surface = SkSurface::MakeRasterN32Premul(10, 10);
+    sk_sp<SkSurface> surface =
+        SkSurfaces::Raster(SkImageInfo::MakeN32Premul(10, 10));
     SkCanvas* canvas = surface->getCanvas();
-    display_list->RenderTo(canvas);
+    // We can't use DlSkCanvas.DrawDisplayList as that method protects
+    // the canvas against mutations from the display list being drawn.
+    auto dispatcher = DlSkCanvasDispatcher(surface->getCanvas());
+    display_list->Dispatch(dispatcher);
     SkM44 dl_matrix = canvas->getLocalToDevice();
     ASSERT_NE(sk_matrix, dl_matrix);
   }
 }
 
-TEST(DisplayList, DisplayListTransformResetHandling) {
+TEST_F(DisplayListTest, DisplayListTransformResetHandling) {
   DisplayListBuilder builder;
-  builder.scale(20.0, 20.0);
-  builder.transformReset();
-  auto list = builder.Build();
-  ASSERT_NE(list, nullptr);
-  sk_sp<SkSurface> surface = SkSurface::MakeRasterN32Premul(10, 10);
+  DlOpReceiver& receiver = ToReceiver(builder);
+  receiver.scale(20.0, 20.0);
+  receiver.transformReset();
+  auto display_list = builder.Build();
+  ASSERT_NE(display_list, nullptr);
+  sk_sp<SkSurface> surface =
+      SkSurfaces::Raster(SkImageInfo::MakeN32Premul(10, 10));
   SkCanvas* canvas = surface->getCanvas();
-  list->RenderTo(canvas);
+  // We can't use DlSkCanvas.DrawDisplayList as that method protects
+  // the canvas against mutations from the display list being drawn.
+  auto dispatcher = DlSkCanvasDispatcher(surface->getCanvas());
+  display_list->Dispatch(dispatcher);
   ASSERT_TRUE(canvas->getTotalMatrix().isIdentity());
 }
 
-TEST(DisplayList, SingleOpsMightSupportGroupOpacityWithOrWithoutBlendMode) {
+TEST_F(DisplayListTest, SingleOpsMightSupportGroupOpacityBlendMode) {
   auto run_tests = [](const std::string& name,
-                      void build(DisplayListBuilder & builder),
-                      bool expect_for_op, bool expect_with_kSrc) {
+                      void build(DlOpReceiver & receiver), bool expect_for_op,
+                      bool expect_with_kSrc) {
     {
       // First test is the draw op, by itself
       // (usually supports group opacity)
       DisplayListBuilder builder;
-      build(builder);
+      DlOpReceiver& receiver = ToReceiver(builder);
+      build(receiver);
       auto display_list = builder.Build();
       EXPECT_EQ(display_list->can_apply_group_opacity(), expect_for_op)
           << "{" << std::endl
@@ -610,175 +1043,178 @@ TEST(DisplayList, SingleOpsMightSupportGroupOpacityWithOrWithoutBlendMode) {
       // Second test i the draw op with kSrc,
       // (usually fails group opacity)
       DisplayListBuilder builder;
-      builder.setBlendMode(DlBlendMode::kSrc);
-      build(builder);
+      DlOpReceiver& receiver = ToReceiver(builder);
+      receiver.setBlendMode(DlBlendMode::kSrc);
+      build(receiver);
       auto display_list = builder.Build();
       EXPECT_EQ(display_list->can_apply_group_opacity(), expect_with_kSrc)
           << "{" << std::endl
-          << "  builder.setBlendMode(kSrc);" << std::endl
+          << "  receiver.setBlendMode(kSrc);" << std::endl
           << "  " << name << std::endl
           << "}";
     }
   };
 
 #define RUN_TESTS(body) \
-  run_tests(            \
-      #body, [](DisplayListBuilder& builder) { body }, true, false)
+  run_tests(#body, [](DlOpReceiver& receiver) { body }, true, false)
 #define RUN_TESTS2(body, expect) \
-  run_tests(                     \
-      #body, [](DisplayListBuilder& builder) { body }, expect, expect)
-
-  RUN_TESTS(builder.drawPaint(););
-  RUN_TESTS2(builder.drawColor(SK_ColorRED, DlBlendMode::kSrcOver);, true);
-  RUN_TESTS2(builder.drawColor(SK_ColorRED, DlBlendMode::kSrc);, false);
-  RUN_TESTS(builder.drawLine({0, 0}, {10, 10}););
-  RUN_TESTS(builder.drawRect({0, 0, 10, 10}););
-  RUN_TESTS(builder.drawOval({0, 0, 10, 10}););
-  RUN_TESTS(builder.drawCircle({10, 10}, 5););
-  RUN_TESTS(builder.drawRRect(SkRRect::MakeRectXY({0, 0, 10, 10}, 2, 2)););
-  RUN_TESTS(builder.drawDRRect(SkRRect::MakeRectXY({0, 0, 10, 10}, 2, 2),
-                               SkRRect::MakeRectXY({2, 2, 8, 8}, 2, 2)););
-  RUN_TESTS(builder.drawPath(
+  run_tests(#body, [](DlOpReceiver& receiver) { body }, expect, expect)
+
+  RUN_TESTS(receiver.drawPaint(););
+  RUN_TESTS2(receiver.drawColor(DlColor(SK_ColorRED), DlBlendMode::kSrcOver);
+             , true);
+  RUN_TESTS2(receiver.drawColor(DlColor(SK_ColorRED), DlBlendMode::kSrc);
+             , false);
+  RUN_TESTS(receiver.drawLine({0, 0}, {10, 10}););
+  RUN_TESTS(receiver.drawRect({0, 0, 10, 10}););
+  RUN_TESTS(receiver.drawOval({0, 0, 10, 10}););
+  RUN_TESTS(receiver.drawCircle({10, 10}, 5););
+  RUN_TESTS(receiver.drawRRect(SkRRect::MakeRectXY({0, 0, 10, 10}, 2, 2)););
+  RUN_TESTS(receiver.drawDRRect(SkRRect::MakeRectXY({0, 0, 10, 10}, 2, 2),
+                                SkRRect::MakeRectXY({2, 2, 8, 8}, 2, 2)););
+  RUN_TESTS(receiver.drawPath(
       SkPath().addOval({0, 0, 10, 10}).addOval({5, 5, 15, 15})););
-  RUN_TESTS(builder.drawArc({0, 0, 10, 10}, 0, math::kPi, true););
-  RUN_TESTS2(builder.drawPoints(SkCanvas::kPoints_PointMode, TestPointCount,
-                                TestPoints);
+  RUN_TESTS(receiver.drawArc({0, 0, 10, 10}, 0, math::kPi, true););
+  RUN_TESTS2(
+      receiver.drawPoints(PointMode::kPoints, TestPointCount, kTestPoints);
+      , false);
+  RUN_TESTS2(receiver.drawVertices(TestVertices1.get(), DlBlendMode::kSrc);
              , false);
-  RUN_TESTS2(builder.drawVertices(TestVertices1, DlBlendMode::kSrc);, false);
-  RUN_TESTS(builder.drawImage(TestImage1, {0, 0}, kLinearSampling, true););
-  RUN_TESTS2(builder.drawImage(TestImage1, {0, 0}, kLinearSampling, false);
+  RUN_TESTS(receiver.drawImage(TestImage1, {0, 0}, kLinearSampling, true););
+  RUN_TESTS2(receiver.drawImage(TestImage1, {0, 0}, kLinearSampling, false);
              , true);
-  RUN_TESTS(builder.drawImageRect(TestImage1, {10, 10, 20, 20}, {0, 0, 10, 10},
-                                  kNearestSampling, true););
-  RUN_TESTS2(builder.drawImageRect(TestImage1, {10, 10, 20, 20}, {0, 0, 10, 10},
-                                   kNearestSampling, false);
-             , true);
-  RUN_TESTS(builder.drawImageNine(TestImage2, {20, 20, 30, 30}, {0, 0, 20, 20},
-                                  DlFilterMode::kLinear, true););
-  RUN_TESTS2(builder.drawImageNine(TestImage2, {20, 20, 30, 30}, {0, 0, 20, 20},
-                                   DlFilterMode::kLinear, false);
-             , true);
-  RUN_TESTS(builder.drawImageLattice(
-      TestImage1,
-      {kTestDivs1, kTestDivs1, nullptr, 3, 3, &kTestLatticeSrcRect, nullptr},
-      {10, 10, 40, 40}, DlFilterMode::kNearest, true););
-  RUN_TESTS2(builder.drawImageLattice(
-      TestImage1,
-      {kTestDivs1, kTestDivs1, nullptr, 3, 3, &kTestLatticeSrcRect, nullptr},
-      {10, 10, 40, 40}, DlFilterMode::kNearest, false);
+  RUN_TESTS(receiver.drawImageRect(TestImage1, {10, 10, 20, 20}, {0, 0, 10, 10},
+                                   kNearestSampling, true,
+                                   DlCanvas::SrcRectConstraint::kFast););
+  RUN_TESTS2(receiver.drawImageRect(TestImage1, {10, 10, 20, 20},
+                                    {0, 0, 10, 10}, kNearestSampling, false,
+                                    DlCanvas::SrcRectConstraint::kFast);
              , true);
+  RUN_TESTS(receiver.drawImageNine(TestImage2, {20, 20, 30, 30}, {0, 0, 20, 20},
+                                   DlFilterMode::kLinear, true););
+  RUN_TESTS2(
+      receiver.drawImageNine(TestImage2, {20, 20, 30, 30}, {0, 0, 20, 20},
+                             DlFilterMode::kLinear, false);
+      , true);
   static SkRSXform xforms[] = {{1, 0, 0, 0}, {0, 1, 0, 0}};
   static SkRect texs[] = {{10, 10, 20, 20}, {20, 20, 30, 30}};
   RUN_TESTS2(
-      builder.drawAtlas(TestImage1, xforms, texs, nullptr, 2,
-                        DlBlendMode::kSrcIn, kNearestSampling, nullptr, true);
+      receiver.drawAtlas(TestImage1, xforms, texs, nullptr, 2,
+                         DlBlendMode::kSrcIn, kNearestSampling, nullptr, true);
       , false);
   RUN_TESTS2(
-      builder.drawAtlas(TestImage1, xforms, texs, nullptr, 2,
-                        DlBlendMode::kSrcIn, kNearestSampling, nullptr, false);
+      receiver.drawAtlas(TestImage1, xforms, texs, nullptr, 2,
+                         DlBlendMode::kSrcIn, kNearestSampling, nullptr, false);
       , false);
-  RUN_TESTS(builder.drawPicture(TestPicture1, nullptr, true););
-  RUN_TESTS2(builder.drawPicture(TestPicture1, nullptr, false);, true);
   EXPECT_TRUE(TestDisplayList1->can_apply_group_opacity());
-  RUN_TESTS2(builder.drawDisplayList(TestDisplayList1);, true);
+  RUN_TESTS2(receiver.drawDisplayList(TestDisplayList1);, true);
   {
     static DisplayListBuilder builder;
-    builder.drawRect({0, 0, 10, 10});
-    builder.drawRect({5, 5, 15, 15});
+    builder.DrawRect({0, 0, 10, 10}, DlPaint());
+    builder.DrawRect({5, 5, 15, 15}, DlPaint());
     static auto display_list = builder.Build();
-    RUN_TESTS2(builder.drawDisplayList(display_list);, false);
+    RUN_TESTS2(receiver.drawDisplayList(display_list);, false);
   }
-  RUN_TESTS(builder.drawTextBlob(TestBlob1, 0, 0););
-  RUN_TESTS2(builder.drawShadow(kTestPath1, SK_ColorBLACK, 1.0, false, 1.0);
-             , false);
+  RUN_TESTS2(receiver.drawTextBlob(GetTestTextBlob(1), 0, 0);, false);
+  RUN_TESTS2(
+      receiver.drawShadow(kTestPath1, DlColor(SK_ColorBLACK), 1.0, false, 1.0);
+      , false);
 
 #undef RUN_TESTS2
 #undef RUN_TESTS
 }
 
-TEST(DisplayList, OverlappingOpsDoNotSupportGroupOpacity) {
+TEST_F(DisplayListTest, OverlappingOpsDoNotSupportGroupOpacity) {
   DisplayListBuilder builder;
+  DlOpReceiver& receiver = ToReceiver(builder);
   for (int i = 0; i < 10; i++) {
-    builder.drawRect(SkRect::MakeXYWH(i * 10, 0, 30, 30));
+    receiver.drawRect(SkRect::MakeXYWH(i * 10, 0, 30, 30));
   }
   auto display_list = builder.Build();
   EXPECT_FALSE(display_list->can_apply_group_opacity());
 }
 
-TEST(DisplayList, SaveLayerFalseSupportsGroupOpacityWithOverlappingChidren) {
+TEST_F(DisplayListTest, SaveLayerFalseSupportsGroupOpacityOverlappingChidren) {
   DisplayListBuilder builder;
-  builder.saveLayer(nullptr, false);
+  DlOpReceiver& receiver = ToReceiver(builder);
+  receiver.saveLayer(nullptr, SaveLayerOptions::kNoAttributes);
   for (int i = 0; i < 10; i++) {
-    builder.drawRect(SkRect::MakeXYWH(i * 10, 0, 30, 30));
+    receiver.drawRect(SkRect::MakeXYWH(i * 10, 0, 30, 30));
   }
-  builder.restore();
+  receiver.restore();
   auto display_list = builder.Build();
   EXPECT_TRUE(display_list->can_apply_group_opacity());
 }
 
-TEST(DisplayList, SaveLayerTrueSupportsGroupOpacityWithOverlappingChidren) {
+TEST_F(DisplayListTest, SaveLayerTrueSupportsGroupOpacityOverlappingChidren) {
   DisplayListBuilder builder;
-  builder.saveLayer(nullptr, true);
+  DlOpReceiver& receiver = ToReceiver(builder);
+  receiver.saveLayer(nullptr, SaveLayerOptions::kWithAttributes);
   for (int i = 0; i < 10; i++) {
-    builder.drawRect(SkRect::MakeXYWH(i * 10, 0, 30, 30));
+    receiver.drawRect(SkRect::MakeXYWH(i * 10, 0, 30, 30));
   }
-  builder.restore();
+  receiver.restore();
   auto display_list = builder.Build();
   EXPECT_TRUE(display_list->can_apply_group_opacity());
 }
 
-TEST(DisplayList, SaveLayerFalseWithSrcBlendSupportsGroupOpacity) {
+TEST_F(DisplayListTest, SaveLayerFalseWithSrcBlendSupportsGroupOpacity) {
   DisplayListBuilder builder;
-  builder.setBlendMode(DlBlendMode::kSrc);
-  builder.saveLayer(nullptr, false);
-  builder.drawRect({0, 0, 10, 10});
-  builder.restore();
+  DlOpReceiver& receiver = ToReceiver(builder);
+  receiver.setBlendMode(DlBlendMode::kSrc);
+  receiver.saveLayer(nullptr, SaveLayerOptions::kNoAttributes);
+  receiver.drawRect({0, 0, 10, 10});
+  receiver.restore();
   auto display_list = builder.Build();
   EXPECT_TRUE(display_list->can_apply_group_opacity());
 }
 
-TEST(DisplayList, SaveLayerTrueWithSrcBlendDoesNotSupportGroupOpacity) {
+TEST_F(DisplayListTest, SaveLayerTrueWithSrcBlendDoesNotSupportGroupOpacity) {
   DisplayListBuilder builder;
-  builder.setBlendMode(DlBlendMode::kSrc);
-  builder.saveLayer(nullptr, true);
-  builder.drawRect({0, 0, 10, 10});
-  builder.restore();
+  DlOpReceiver& receiver = ToReceiver(builder);
+  receiver.setBlendMode(DlBlendMode::kSrc);
+  receiver.saveLayer(nullptr, SaveLayerOptions::kWithAttributes);
+  receiver.drawRect({0, 0, 10, 10});
+  receiver.restore();
   auto display_list = builder.Build();
   EXPECT_FALSE(display_list->can_apply_group_opacity());
 }
 
-TEST(DisplayList, SaveLayerFalseSupportsGroupOpacityWithChildSrcBlend) {
+TEST_F(DisplayListTest, SaveLayerFalseSupportsGroupOpacityWithChildSrcBlend) {
   DisplayListBuilder builder;
-  builder.saveLayer(nullptr, false);
-  builder.setBlendMode(DlBlendMode::kSrc);
-  builder.drawRect({0, 0, 10, 10});
-  builder.restore();
+  DlOpReceiver& receiver = ToReceiver(builder);
+  receiver.saveLayer(nullptr, SaveLayerOptions::kNoAttributes);
+  receiver.setBlendMode(DlBlendMode::kSrc);
+  receiver.drawRect({0, 0, 10, 10});
+  receiver.restore();
   auto display_list = builder.Build();
   EXPECT_TRUE(display_list->can_apply_group_opacity());
 }
 
-TEST(DisplayList, SaveLayerTrueSupportsGroupOpacityWithChildSrcBlend) {
+TEST_F(DisplayListTest, SaveLayerTrueSupportsGroupOpacityWithChildSrcBlend) {
   DisplayListBuilder builder;
-  builder.saveLayer(nullptr, true);
-  builder.setBlendMode(DlBlendMode::kSrc);
-  builder.drawRect({0, 0, 10, 10});
-  builder.restore();
+  DlOpReceiver& receiver = ToReceiver(builder);
+  receiver.saveLayer(nullptr, SaveLayerOptions::kWithAttributes);
+  receiver.setBlendMode(DlBlendMode::kSrc);
+  receiver.drawRect({0, 0, 10, 10});
+  receiver.restore();
   auto display_list = builder.Build();
   EXPECT_TRUE(display_list->can_apply_group_opacity());
 }
 
-TEST(DisplayList, SaveLayerBoundsSnapshotsImageFilter) {
+TEST_F(DisplayListTest, SaveLayerBoundsSnapshotsImageFilter) {
   DisplayListBuilder builder;
-  builder.saveLayer(nullptr, true);
-  builder.drawRect({50, 50, 100, 100});
+  DlOpReceiver& receiver = ToReceiver(builder);
+  receiver.saveLayer(nullptr, SaveLayerOptions::kWithAttributes);
+  receiver.drawRect({50, 50, 100, 100});
   // This image filter should be ignored since it was not set before saveLayer
-  builder.setImageFilter(&kTestBlurImageFilter1);
-  builder.restore();
+  receiver.setImageFilter(&kTestBlurImageFilter1);
+  receiver.restore();
   SkRect bounds = builder.Build()->bounds();
   EXPECT_EQ(bounds, SkRect::MakeLTRB(50, 50, 100, 100));
 }
 
-class SaveLayerOptionsExpector : public virtual Dispatcher,
+class SaveLayerOptionsExpector : public virtual DlOpReceiver,
                                  public IgnoreAttributeDispatchHelper,
                                  public IgnoreClipDispatchHelper,
                                  public IgnoreTransformDispatchHelper,
@@ -791,7 +1227,7 @@ class SaveLayerOptionsExpector : public virtual Dispatcher,
   explicit SaveLayerOptionsExpector(std::vector<SaveLayerOptions> expected)
       : expected_(std::move(expected)) {}
 
-  void saveLayer(const SkRect* bounds,
+  void saveLayer(const SkRect& bounds,
                  const SaveLayerOptions options,
                  const DlImageFilter* backdrop) override {
     EXPECT_EQ(options, expected_[save_layer_count_]);
@@ -805,51 +1241,54 @@ class SaveLayerOptionsExpector : public virtual Dispatcher,
   int save_layer_count_ = 0;
 };
 
-TEST(DisplayList, SaveLayerOneSimpleOpSupportsOpacityOptimization) {
+TEST_F(DisplayListTest, SaveLayerOneSimpleOpInheritsOpacity) {
   SaveLayerOptions expected =
       SaveLayerOptions::kWithAttributes.with_can_distribute_opacity();
   SaveLayerOptionsExpector expector(expected);
 
   DisplayListBuilder builder;
-  builder.setColor(SkColorSetARGB(127, 255, 255, 255));
-  builder.saveLayer(nullptr, true);
-  builder.drawRect({10, 10, 20, 20});
-  builder.restore();
+  DlOpReceiver& receiver = ToReceiver(builder);
+  receiver.setColor(DlColor(SkColorSetARGB(127, 255, 255, 255)));
+  receiver.saveLayer(nullptr, SaveLayerOptions::kWithAttributes);
+  receiver.drawRect({10, 10, 20, 20});
+  receiver.restore();
 
   builder.Build()->Dispatch(expector);
   EXPECT_EQ(expector.save_layer_count(), 1);
 }
 
-TEST(DisplayList, SaveLayerNoAttributesSupportsOpacityOptimization) {
+TEST_F(DisplayListTest, SaveLayerNoAttributesInheritsOpacity) {
   SaveLayerOptions expected =
       SaveLayerOptions::kNoAttributes.with_can_distribute_opacity();
   SaveLayerOptionsExpector expector(expected);
 
   DisplayListBuilder builder;
-  builder.saveLayer(nullptr, false);
-  builder.drawRect({10, 10, 20, 20});
-  builder.restore();
+  DlOpReceiver& receiver = ToReceiver(builder);
+  receiver.saveLayer(nullptr, SaveLayerOptions::kNoAttributes);
+  receiver.drawRect({10, 10, 20, 20});
+  receiver.restore();
 
   builder.Build()->Dispatch(expector);
   EXPECT_EQ(expector.save_layer_count(), 1);
 }
 
-TEST(DisplayList, SaveLayerTwoOverlappingOpsPreventsOpacityOptimization) {
+TEST_F(DisplayListTest, SaveLayerTwoOverlappingOpsDoesNotInheritOpacity) {
   SaveLayerOptions expected = SaveLayerOptions::kWithAttributes;
   SaveLayerOptionsExpector expector(expected);
 
   DisplayListBuilder builder;
-  builder.setColor(SkColorSetARGB(127, 255, 255, 255));
-  builder.saveLayer(nullptr, true);
-  builder.drawRect({10, 10, 20, 20});
-  builder.drawRect({15, 15, 25, 25});
-  builder.restore();
+  DlOpReceiver& receiver = ToReceiver(builder);
+  receiver.setColor(DlColor(SkColorSetARGB(127, 255, 255, 255)));
+  receiver.saveLayer(nullptr, SaveLayerOptions::kWithAttributes);
+  receiver.drawRect({10, 10, 20, 20});
+  receiver.drawRect({15, 15, 25, 25});
+  receiver.restore();
 
   builder.Build()->Dispatch(expector);
   EXPECT_EQ(expector.save_layer_count(), 1);
 }
 
-TEST(DisplayList, NestedSaveLayersMightSupportOpacityOptimization) {
+TEST_F(DisplayListTest, NestedSaveLayersMightInheritOpacity) {
   SaveLayerOptions expected1 =
       SaveLayerOptions::kWithAttributes.with_can_distribute_opacity();
   SaveLayerOptions expected2 = SaveLayerOptions::kWithAttributes;
@@ -858,21 +1297,22 @@ TEST(DisplayList, NestedSaveLayersMightSupportOpacityOptimization) {
   SaveLayerOptionsExpector expector({expected1, expected2, expected3});
 
   DisplayListBuilder builder;
-  builder.setColor(SkColorSetARGB(127, 255, 255, 255));
-  builder.saveLayer(nullptr, true);
-  builder.saveLayer(nullptr, true);
-  builder.drawRect({10, 10, 20, 20});
-  builder.saveLayer(nullptr, true);
-  builder.drawRect({15, 15, 25, 25});
-  builder.restore();
-  builder.restore();
-  builder.restore();
+  DlOpReceiver& receiver = ToReceiver(builder);
+  receiver.setColor(DlColor(SkColorSetARGB(127, 255, 255, 255)));
+  receiver.saveLayer(nullptr, SaveLayerOptions::kWithAttributes);
+  receiver.saveLayer(nullptr, SaveLayerOptions::kWithAttributes);
+  receiver.drawRect({10, 10, 20, 20});
+  receiver.saveLayer(nullptr, SaveLayerOptions::kWithAttributes);
+  receiver.drawRect({15, 15, 25, 25});
+  receiver.restore();
+  receiver.restore();
+  receiver.restore();
 
   builder.Build()->Dispatch(expector);
   EXPECT_EQ(expector.save_layer_count(), 3);
 }
 
-TEST(DisplayList, NestedSaveLayersCanBothSupportOpacityOptimization) {
+TEST_F(DisplayListTest, NestedSaveLayersCanBothSupportOpacityOptimization) {
   SaveLayerOptions expected1 =
       SaveLayerOptions::kWithAttributes.with_can_distribute_opacity();
   SaveLayerOptions expected2 =
@@ -880,112 +1320,119 @@ TEST(DisplayList, NestedSaveLayersCanBothSupportOpacityOptimization) {
   SaveLayerOptionsExpector expector({expected1, expected2});
 
   DisplayListBuilder builder;
-  builder.setColor(SkColorSetARGB(127, 255, 255, 255));
-  builder.saveLayer(nullptr, true);
-  builder.saveLayer(nullptr, false);
-  builder.drawRect({10, 10, 20, 20});
-  builder.restore();
-  builder.restore();
+  DlOpReceiver& receiver = ToReceiver(builder);
+  receiver.setColor(DlColor(SkColorSetARGB(127, 255, 255, 255)));
+  receiver.saveLayer(nullptr, SaveLayerOptions::kWithAttributes);
+  receiver.saveLayer(nullptr, SaveLayerOptions::kNoAttributes);
+  receiver.drawRect({10, 10, 20, 20});
+  receiver.restore();
+  receiver.restore();
 
   builder.Build()->Dispatch(expector);
   EXPECT_EQ(expector.save_layer_count(), 2);
 }
 
-TEST(DisplayList, SaveLayerImageFilterPreventsOpacityOptimization) {
+TEST_F(DisplayListTest, SaveLayerImageFilterDoesNotInheritOpacity) {
   SaveLayerOptions expected = SaveLayerOptions::kWithAttributes;
   SaveLayerOptionsExpector expector(expected);
 
   DisplayListBuilder builder;
-  builder.setColor(SkColorSetARGB(127, 255, 255, 255));
-  builder.setImageFilter(&kTestBlurImageFilter1);
-  builder.saveLayer(nullptr, true);
-  builder.setImageFilter(nullptr);
-  builder.drawRect({10, 10, 20, 20});
-  builder.restore();
+  DlOpReceiver& receiver = ToReceiver(builder);
+  receiver.setColor(DlColor(SkColorSetARGB(127, 255, 255, 255)));
+  receiver.setImageFilter(&kTestBlurImageFilter1);
+  receiver.saveLayer(nullptr, SaveLayerOptions::kWithAttributes);
+  receiver.setImageFilter(nullptr);
+  receiver.drawRect({10, 10, 20, 20});
+  receiver.restore();
 
   builder.Build()->Dispatch(expector);
   EXPECT_EQ(expector.save_layer_count(), 1);
 }
 
-TEST(DisplayList, SaveLayerColorFilterPreventsOpacityOptimization) {
+TEST_F(DisplayListTest, SaveLayerColorFilterDoesNotInheritOpacity) {
   SaveLayerOptions expected = SaveLayerOptions::kWithAttributes;
   SaveLayerOptionsExpector expector(expected);
 
   DisplayListBuilder builder;
-  builder.setColor(SkColorSetARGB(127, 255, 255, 255));
-  builder.setColorFilter(&kTestMatrixColorFilter1);
-  builder.saveLayer(nullptr, true);
-  builder.setColorFilter(nullptr);
-  builder.drawRect({10, 10, 20, 20});
-  builder.restore();
+  DlOpReceiver& receiver = ToReceiver(builder);
+  receiver.setColor(DlColor(SkColorSetARGB(127, 255, 255, 255)));
+  receiver.setColorFilter(&kTestMatrixColorFilter1);
+  receiver.saveLayer(nullptr, SaveLayerOptions::kWithAttributes);
+  receiver.setColorFilter(nullptr);
+  receiver.drawRect({10, 10, 20, 20});
+  receiver.restore();
 
   builder.Build()->Dispatch(expector);
   EXPECT_EQ(expector.save_layer_count(), 1);
 }
 
-TEST(DisplayList, SaveLayerSrcBlendPreventsOpacityOptimization) {
+TEST_F(DisplayListTest, SaveLayerSrcBlendDoesNotInheritOpacity) {
   SaveLayerOptions expected = SaveLayerOptions::kWithAttributes;
   SaveLayerOptionsExpector expector(expected);
 
   DisplayListBuilder builder;
-  builder.setColor(SkColorSetARGB(127, 255, 255, 255));
-  builder.setBlendMode(DlBlendMode::kSrc);
-  builder.saveLayer(nullptr, true);
-  builder.setBlendMode(DlBlendMode::kSrcOver);
-  builder.drawRect({10, 10, 20, 20});
-  builder.restore();
+  DlOpReceiver& receiver = ToReceiver(builder);
+  receiver.setColor(DlColor(SkColorSetARGB(127, 255, 255, 255)));
+  receiver.setBlendMode(DlBlendMode::kSrc);
+  receiver.saveLayer(nullptr, SaveLayerOptions::kWithAttributes);
+  receiver.setBlendMode(DlBlendMode::kSrcOver);
+  receiver.drawRect({10, 10, 20, 20});
+  receiver.restore();
 
   builder.Build()->Dispatch(expector);
   EXPECT_EQ(expector.save_layer_count(), 1);
 }
 
-TEST(DisplayList, SaveLayerImageFilterOnChildSupportsOpacityOptimization) {
+TEST_F(DisplayListTest, SaveLayerImageFilterOnChildInheritsOpacity) {
   SaveLayerOptions expected =
       SaveLayerOptions::kWithAttributes.with_can_distribute_opacity();
   SaveLayerOptionsExpector expector(expected);
 
   DisplayListBuilder builder;
-  builder.setColor(SkColorSetARGB(127, 255, 255, 255));
-  builder.saveLayer(nullptr, true);
-  builder.setImageFilter(&kTestBlurImageFilter1);
-  builder.drawRect({10, 10, 20, 20});
-  builder.restore();
+  DlOpReceiver& receiver = ToReceiver(builder);
+  receiver.setColor(DlColor(SkColorSetARGB(127, 255, 255, 255)));
+  receiver.saveLayer(nullptr, SaveLayerOptions::kWithAttributes);
+  receiver.setImageFilter(&kTestBlurImageFilter1);
+  receiver.drawRect({10, 10, 20, 20});
+  receiver.restore();
 
   builder.Build()->Dispatch(expector);
   EXPECT_EQ(expector.save_layer_count(), 1);
 }
 
-TEST(DisplayList, SaveLayerColorFilterOnChildPreventsOpacityOptimization) {
+TEST_F(DisplayListTest, SaveLayerColorFilterOnChildDoesNotInheritOpacity) {
   SaveLayerOptions expected = SaveLayerOptions::kWithAttributes;
   SaveLayerOptionsExpector expector(expected);
 
   DisplayListBuilder builder;
-  builder.setColor(SkColorSetARGB(127, 255, 255, 255));
-  builder.saveLayer(nullptr, true);
-  builder.setColorFilter(&kTestMatrixColorFilter1);
-  builder.drawRect({10, 10, 20, 20});
-  builder.restore();
+  DlOpReceiver& receiver = ToReceiver(builder);
+  receiver.setColor(DlColor(SkColorSetARGB(127, 255, 255, 255)));
+  receiver.saveLayer(nullptr, SaveLayerOptions::kWithAttributes);
+  receiver.setColorFilter(&kTestMatrixColorFilter1);
+  receiver.drawRect({10, 10, 20, 20});
+  receiver.restore();
 
   builder.Build()->Dispatch(expector);
   EXPECT_EQ(expector.save_layer_count(), 1);
 }
 
-TEST(DisplayList, SaveLayerSrcBlendOnChildPreventsOpacityOptimization) {
+TEST_F(DisplayListTest, SaveLayerSrcBlendOnChildDoesNotInheritOpacity) {
   SaveLayerOptions expected = SaveLayerOptions::kWithAttributes;
   SaveLayerOptionsExpector expector(expected);
 
   DisplayListBuilder builder;
-  builder.setColor(SkColorSetARGB(127, 255, 255, 255));
-  builder.saveLayer(nullptr, true);
-  builder.setBlendMode(DlBlendMode::kSrc);
-  builder.drawRect({10, 10, 20, 20});
-  builder.restore();
+  DlOpReceiver& receiver = ToReceiver(builder);
+  receiver.setColor(DlColor(SkColorSetARGB(127, 255, 255, 255)));
+  receiver.saveLayer(nullptr, SaveLayerOptions::kWithAttributes);
+  receiver.setBlendMode(DlBlendMode::kSrc);
+  receiver.drawRect({10, 10, 20, 20});
+  receiver.restore();
 
   builder.Build()->Dispatch(expector);
   EXPECT_EQ(expector.save_layer_count(), 1);
 }
 
-TEST(DisplayList, FlutterSvgIssue661BoundsWereEmpty) {
+TEST_F(DisplayListTest, FlutterSvgIssue661BoundsWereEmpty) {
   // See https://github.com/dnfield/flutter_svg/issues/661
 
   SkPath path1;
@@ -1056,158 +1503,166 @@ TEST(DisplayList, FlutterSvgIssue661BoundsWereEmpty) {
   path2.close();
 
   DisplayListBuilder builder;
+  DlPaint paint = DlPaint(DlColor::kWhite()).setAntiAlias(true);
   {
-    builder.save();
-    builder.clipRect({0, 0, 100, 100}, SkClipOp::kIntersect, true);
+    builder.Save();
+    builder.ClipRect({0, 0, 100, 100}, ClipOp::kIntersect, true);
     {
-      builder.save();
-      builder.transform2DAffine(2.17391, 0, -2547.83,  //
+      builder.Save();
+      builder.Transform2DAffine(2.17391, 0, -2547.83,  //
                                 0, 2.04082, -500);
       {
-        builder.save();
-        builder.clipRect({1172, 245, 1218, 294}, SkClipOp::kIntersect, true);
+        builder.Save();
+        builder.ClipRect({1172, 245, 1218, 294}, ClipOp::kIntersect, true);
         {
-          builder.saveLayer(nullptr, SaveLayerOptions::kWithAttributes,
-                            nullptr);
+          builder.SaveLayer(nullptr, nullptr, nullptr);
           {
-            builder.save();
-            builder.transform2DAffine(1.4375, 0, 1164.09,  //
+            builder.Save();
+            builder.Transform2DAffine(1.4375, 0, 1164.09,  //
                                       0, 1.53125, 236.548);
-            builder.setAntiAlias(1);
-            builder.setColor(0xffffffff);
-            builder.drawPath(path1);
-            builder.restore();
+            builder.DrawPath(path1, paint);
+            builder.Restore();
           }
           {
-            builder.save();
-            builder.transform2DAffine(1.4375, 0, 1164.09,  //
+            builder.Save();
+            builder.Transform2DAffine(1.4375, 0, 1164.09,  //
                                       0, 1.53125, 236.548);
-            builder.drawPath(path2);
-            builder.restore();
+            builder.DrawPath(path2, paint);
+            builder.Restore();
           }
-          builder.restore();
+          builder.Restore();
         }
-        builder.restore();
+        builder.Restore();
       }
-      builder.restore();
+      builder.Restore();
     }
-    builder.restore();
+    builder.Restore();
   }
   sk_sp<DisplayList> display_list = builder.Build();
   // Prior to the fix, the bounds were empty.
   EXPECT_FALSE(display_list->bounds().isEmpty());
-  // These are the expected bounds, but testing float values can be
-  // flaky wrt minor changes in the bounds calculations. If this
-  // line has to be revised too often as the DL implementation is
-  // improved and maintained, then we can eliminate this test and
-  // just rely on the "rounded out" bounds test that follows.
-  EXPECT_EQ(display_list->bounds(),
-            SkRect::MakeLTRB(0, 0.00189208984375, 99.9839630127, 100));
+  // These are just inside and outside of the expected bounds, but
+  // testing float values can be flaky wrt minor changes in the bounds
+  // calculations. If these lines have to be revised too often as the DL
+  // implementation is improved and maintained, then we can eliminate
+  // this test and just rely on the "rounded out" bounds test that follows.
+  SkRect min_bounds = SkRect::MakeLTRB(0, 0.00191, 99.983, 100);
+  SkRect max_bounds = SkRect::MakeLTRB(0, 0.00189, 99.985, 100);
+  ASSERT_TRUE(max_bounds.contains(min_bounds));
+  EXPECT_TRUE(max_bounds.contains(display_list->bounds()));
+  EXPECT_TRUE(display_list->bounds().contains(min_bounds));
+
   // This is the more practical result. The bounds are "almost" 0,0,100x100
   EXPECT_EQ(display_list->bounds().roundOut(), SkIRect::MakeWH(100, 100));
   EXPECT_EQ(display_list->op_count(), 19u);
-  EXPECT_EQ(display_list->bytes(), sizeof(DisplayList) + 304u);
+  EXPECT_EQ(display_list->bytes(), sizeof(DisplayList) + 400u);
 }
 
-TEST(DisplayList, TranslateAffectsCurrentTransform) {
+TEST_F(DisplayListTest, TranslateAffectsCurrentTransform) {
   DisplayListBuilder builder;
-  builder.translate(12.3, 14.5);
+  DlOpReceiver& receiver = ToReceiver(builder);
+  receiver.translate(12.3, 14.5);
   SkMatrix matrix = SkMatrix::Translate(12.3, 14.5);
   SkM44 m44 = SkM44(matrix);
-  SkM44 cur_m44 = builder.getTransformFullPerspective();
-  SkMatrix cur_matrix = builder.getTransform();
+  SkM44 cur_m44 = builder.GetTransformFullPerspective();
+  SkMatrix cur_matrix = builder.GetTransform();
   ASSERT_EQ(cur_m44, m44);
   ASSERT_EQ(cur_matrix, matrix);
-  builder.translate(10, 10);
+  receiver.translate(10, 10);
   // CurrentTransform has changed
-  ASSERT_NE(builder.getTransformFullPerspective(), m44);
-  ASSERT_NE(builder.getTransform(), cur_matrix);
+  ASSERT_NE(builder.GetTransformFullPerspective(), m44);
+  ASSERT_NE(builder.GetTransform(), cur_matrix);
   // Previous return values have not
   ASSERT_EQ(cur_m44, m44);
   ASSERT_EQ(cur_matrix, matrix);
 }
 
-TEST(DisplayList, ScaleAffectsCurrentTransform) {
+TEST_F(DisplayListTest, ScaleAffectsCurrentTransform) {
   DisplayListBuilder builder;
-  builder.scale(12.3, 14.5);
+  DlOpReceiver& receiver = ToReceiver(builder);
+  receiver.scale(12.3, 14.5);
   SkMatrix matrix = SkMatrix::Scale(12.3, 14.5);
   SkM44 m44 = SkM44(matrix);
-  SkM44 cur_m44 = builder.getTransformFullPerspective();
-  SkMatrix cur_matrix = builder.getTransform();
+  SkM44 cur_m44 = builder.GetTransformFullPerspective();
+  SkMatrix cur_matrix = builder.GetTransform();
   ASSERT_EQ(cur_m44, m44);
   ASSERT_EQ(cur_matrix, matrix);
-  builder.translate(10, 10);
+  receiver.translate(10, 10);
   // CurrentTransform has changed
-  ASSERT_NE(builder.getTransformFullPerspective(), m44);
-  ASSERT_NE(builder.getTransform(), cur_matrix);
+  ASSERT_NE(builder.GetTransformFullPerspective(), m44);
+  ASSERT_NE(builder.GetTransform(), cur_matrix);
   // Previous return values have not
   ASSERT_EQ(cur_m44, m44);
   ASSERT_EQ(cur_matrix, matrix);
 }
 
-TEST(DisplayList, RotateAffectsCurrentTransform) {
+TEST_F(DisplayListTest, RotateAffectsCurrentTransform) {
   DisplayListBuilder builder;
-  builder.rotate(12.3);
+  DlOpReceiver& receiver = ToReceiver(builder);
+  receiver.rotate(12.3);
   SkMatrix matrix = SkMatrix::RotateDeg(12.3);
   SkM44 m44 = SkM44(matrix);
-  SkM44 cur_m44 = builder.getTransformFullPerspective();
-  SkMatrix cur_matrix = builder.getTransform();
+  SkM44 cur_m44 = builder.GetTransformFullPerspective();
+  SkMatrix cur_matrix = builder.GetTransform();
   ASSERT_EQ(cur_m44, m44);
   ASSERT_EQ(cur_matrix, matrix);
-  builder.translate(10, 10);
+  receiver.translate(10, 10);
   // CurrentTransform has changed
-  ASSERT_NE(builder.getTransformFullPerspective(), m44);
-  ASSERT_NE(builder.getTransform(), cur_matrix);
+  ASSERT_NE(builder.GetTransformFullPerspective(), m44);
+  ASSERT_NE(builder.GetTransform(), cur_matrix);
   // Previous return values have not
   ASSERT_EQ(cur_m44, m44);
   ASSERT_EQ(cur_matrix, matrix);
 }
 
-TEST(DisplayList, SkewAffectsCurrentTransform) {
+TEST_F(DisplayListTest, SkewAffectsCurrentTransform) {
   DisplayListBuilder builder;
-  builder.skew(12.3, 14.5);
+  DlOpReceiver& receiver = ToReceiver(builder);
+  receiver.skew(12.3, 14.5);
   SkMatrix matrix = SkMatrix::Skew(12.3, 14.5);
   SkM44 m44 = SkM44(matrix);
-  SkM44 cur_m44 = builder.getTransformFullPerspective();
-  SkMatrix cur_matrix = builder.getTransform();
+  SkM44 cur_m44 = builder.GetTransformFullPerspective();
+  SkMatrix cur_matrix = builder.GetTransform();
   ASSERT_EQ(cur_m44, m44);
   ASSERT_EQ(cur_matrix, matrix);
-  builder.translate(10, 10);
+  receiver.translate(10, 10);
   // CurrentTransform has changed
-  ASSERT_NE(builder.getTransformFullPerspective(), m44);
-  ASSERT_NE(builder.getTransform(), cur_matrix);
+  ASSERT_NE(builder.GetTransformFullPerspective(), m44);
+  ASSERT_NE(builder.GetTransform(), cur_matrix);
   // Previous return values have not
   ASSERT_EQ(cur_m44, m44);
   ASSERT_EQ(cur_matrix, matrix);
 }
 
-TEST(DisplayList, TransformAffectsCurrentTransform) {
+TEST_F(DisplayListTest, TransformAffectsCurrentTransform) {
   DisplayListBuilder builder;
-  builder.transform2DAffine(3, 0, 12.3,  //
-                            1, 5, 14.5);
+  DlOpReceiver& receiver = ToReceiver(builder);
+  receiver.transform2DAffine(3, 0, 12.3,  //
+                             1, 5, 14.5);
   SkMatrix matrix = SkMatrix::MakeAll(3, 0, 12.3,  //
                                       1, 5, 14.5,  //
                                       0, 0, 1);
   SkM44 m44 = SkM44(matrix);
-  SkM44 cur_m44 = builder.getTransformFullPerspective();
-  SkMatrix cur_matrix = builder.getTransform();
+  SkM44 cur_m44 = builder.GetTransformFullPerspective();
+  SkMatrix cur_matrix = builder.GetTransform();
   ASSERT_EQ(cur_m44, m44);
   ASSERT_EQ(cur_matrix, matrix);
-  builder.translate(10, 10);
+  receiver.translate(10, 10);
   // CurrentTransform has changed
-  ASSERT_NE(builder.getTransformFullPerspective(), m44);
-  ASSERT_NE(builder.getTransform(), cur_matrix);
+  ASSERT_NE(builder.GetTransformFullPerspective(), m44);
+  ASSERT_NE(builder.GetTransform(), cur_matrix);
   // Previous return values have not
   ASSERT_EQ(cur_m44, m44);
   ASSERT_EQ(cur_matrix, matrix);
 }
 
-TEST(DisplayList, FullTransformAffectsCurrentTransform) {
+TEST_F(DisplayListTest, FullTransformAffectsCurrentTransform) {
   DisplayListBuilder builder;
-  builder.transformFullPerspective(3, 0, 4, 12.3,  //
-                                   1, 5, 3, 14.5,  //
-                                   0, 0, 7, 16.2,  //
-                                   0, 0, 0, 1);
+  DlOpReceiver& receiver = ToReceiver(builder);
+  receiver.transformFullPerspective(3, 0, 4, 12.3,  //
+                                    1, 5, 3, 14.5,  //
+                                    0, 0, 7, 16.2,  //
+                                    0, 0, 0, 1);
   SkMatrix matrix = SkMatrix::MakeAll(3, 0, 12.3,  //
                                       1, 5, 14.5,  //
                                       0, 0, 1);
@@ -1215,286 +1670,412 @@ TEST(DisplayList, FullTransformAffectsCurrentTransform) {
                     1, 5, 3, 14.5,  //
                     0, 0, 7, 16.2,  //
                     0, 0, 0, 1);
-  SkM44 cur_m44 = builder.getTransformFullPerspective();
-  SkMatrix cur_matrix = builder.getTransform();
+  SkM44 cur_m44 = builder.GetTransformFullPerspective();
+  SkMatrix cur_matrix = builder.GetTransform();
   ASSERT_EQ(cur_m44, m44);
   ASSERT_EQ(cur_matrix, matrix);
-  builder.translate(10, 10);
+  receiver.translate(10, 10);
   // CurrentTransform has changed
-  ASSERT_NE(builder.getTransformFullPerspective(), m44);
-  ASSERT_NE(builder.getTransform(), cur_matrix);
+  ASSERT_NE(builder.GetTransformFullPerspective(), m44);
+  ASSERT_NE(builder.GetTransform(), cur_matrix);
   // Previous return values have not
   ASSERT_EQ(cur_m44, m44);
   ASSERT_EQ(cur_matrix, matrix);
 }
 
-TEST(DisplayList, ClipRectAffectsClipBounds) {
+TEST_F(DisplayListTest, ClipRectAffectsClipBounds) {
+  DisplayListBuilder builder;
+  DlOpReceiver& receiver = ToReceiver(builder);
+  SkRect clip_bounds = SkRect::MakeLTRB(10.2, 11.3, 20.4, 25.7);
+  receiver.clipRect(clip_bounds, ClipOp::kIntersect, false);
+
+  // Save initial return values for testing restored values
+  SkRect initial_local_bounds = builder.GetLocalClipBounds();
+  SkRect initial_destination_bounds = builder.GetDestinationClipBounds();
+  ASSERT_EQ(initial_local_bounds, clip_bounds);
+  ASSERT_EQ(initial_destination_bounds, clip_bounds);
+
+  receiver.save();
+  receiver.clipRect({0, 0, 15, 15}, ClipOp::kIntersect, false);
+  // Both clip bounds have changed
+  ASSERT_NE(builder.GetLocalClipBounds(), clip_bounds);
+  ASSERT_NE(builder.GetDestinationClipBounds(), clip_bounds);
+  // Previous return values have not changed
+  ASSERT_EQ(initial_local_bounds, clip_bounds);
+  ASSERT_EQ(initial_destination_bounds, clip_bounds);
+  receiver.restore();
+
+  // save/restore returned the values to their original values
+  ASSERT_EQ(builder.GetLocalClipBounds(), initial_local_bounds);
+  ASSERT_EQ(builder.GetDestinationClipBounds(), initial_destination_bounds);
+
+  receiver.save();
+  receiver.scale(2, 2);
+  SkRect scaled_clip_bounds = SkRect::MakeLTRB(5.1, 5.65, 10.2, 12.85);
+  ASSERT_EQ(builder.GetLocalClipBounds(), scaled_clip_bounds);
+  // Destination bounds are unaffected by transform
+  ASSERT_EQ(builder.GetDestinationClipBounds(), clip_bounds);
+  receiver.restore();
+
+  // save/restore returned the values to their original values
+  ASSERT_EQ(builder.GetLocalClipBounds(), initial_local_bounds);
+  ASSERT_EQ(builder.GetDestinationClipBounds(), initial_destination_bounds);
+}
+
+TEST_F(DisplayListTest, ClipRectDoAAAffectsClipBounds) {
   DisplayListBuilder builder;
+  DlOpReceiver& receiver = ToReceiver(builder);
   SkRect clip_bounds = SkRect::MakeLTRB(10.2, 11.3, 20.4, 25.7);
   SkRect clip_expanded_bounds = SkRect::MakeLTRB(10, 11, 21, 26);
-  builder.clipRect(clip_bounds, SkClipOp::kIntersect, false);
+  receiver.clipRect(clip_bounds, ClipOp::kIntersect, true);
 
   // Save initial return values for testing restored values
-  SkRect initial_local_bounds = builder.getLocalClipBounds();
-  SkRect initial_destination_bounds = builder.getDestinationClipBounds();
+  SkRect initial_local_bounds = builder.GetLocalClipBounds();
+  SkRect initial_destination_bounds = builder.GetDestinationClipBounds();
   ASSERT_EQ(initial_local_bounds, clip_expanded_bounds);
-  ASSERT_EQ(initial_destination_bounds, clip_bounds);
+  ASSERT_EQ(initial_destination_bounds, clip_expanded_bounds);
 
-  builder.save();
-  builder.clipRect({0, 0, 15, 15}, SkClipOp::kIntersect, false);
+  receiver.save();
+  receiver.clipRect({0, 0, 15, 15}, ClipOp::kIntersect, true);
   // Both clip bounds have changed
-  ASSERT_NE(builder.getLocalClipBounds(), clip_expanded_bounds);
-  ASSERT_NE(builder.getDestinationClipBounds(), clip_bounds);
+  ASSERT_NE(builder.GetLocalClipBounds(), clip_expanded_bounds);
+  ASSERT_NE(builder.GetDestinationClipBounds(), clip_expanded_bounds);
   // Previous return values have not changed
   ASSERT_EQ(initial_local_bounds, clip_expanded_bounds);
-  ASSERT_EQ(initial_destination_bounds, clip_bounds);
-  builder.restore();
+  ASSERT_EQ(initial_destination_bounds, clip_expanded_bounds);
+  receiver.restore();
 
   // save/restore returned the values to their original values
-  ASSERT_EQ(builder.getLocalClipBounds(), initial_local_bounds);
-  ASSERT_EQ(builder.getDestinationClipBounds(), initial_destination_bounds);
+  ASSERT_EQ(builder.GetLocalClipBounds(), initial_local_bounds);
+  ASSERT_EQ(builder.GetDestinationClipBounds(), initial_destination_bounds);
 
-  builder.save();
-  builder.scale(2, 2);
+  receiver.save();
+  receiver.scale(2, 2);
   SkRect scaled_expanded_bounds = SkRect::MakeLTRB(5, 5.5, 10.5, 13);
-  ASSERT_EQ(builder.getLocalClipBounds(), scaled_expanded_bounds);
+  ASSERT_EQ(builder.GetLocalClipBounds(), scaled_expanded_bounds);
   // Destination bounds are unaffected by transform
-  ASSERT_EQ(builder.getDestinationClipBounds(), clip_bounds);
-  builder.restore();
+  ASSERT_EQ(builder.GetDestinationClipBounds(), clip_expanded_bounds);
+  receiver.restore();
 
   // save/restore returned the values to their original values
-  ASSERT_EQ(builder.getLocalClipBounds(), initial_local_bounds);
-  ASSERT_EQ(builder.getDestinationClipBounds(), initial_destination_bounds);
+  ASSERT_EQ(builder.GetLocalClipBounds(), initial_local_bounds);
+  ASSERT_EQ(builder.GetDestinationClipBounds(), initial_destination_bounds);
 }
 
-TEST(DisplayList, ClipRectAffectsClipBoundsWithMatrix) {
+TEST_F(DisplayListTest, ClipRectAffectsClipBoundsWithMatrix) {
   DisplayListBuilder builder;
+  DlOpReceiver& receiver = ToReceiver(builder);
   SkRect clip_bounds_1 = SkRect::MakeLTRB(0, 0, 10, 10);
   SkRect clip_bounds_2 = SkRect::MakeLTRB(10, 10, 20, 20);
-  builder.save();
-  builder.clipRect(clip_bounds_1, SkClipOp::kIntersect, false);
-  builder.translate(10, 0);
-  builder.clipRect(clip_bounds_1, SkClipOp::kIntersect, false);
-  ASSERT_TRUE(builder.getDestinationClipBounds().isEmpty());
-  builder.restore();
+  receiver.save();
+  receiver.clipRect(clip_bounds_1, ClipOp::kIntersect, false);
+  receiver.translate(10, 0);
+  receiver.clipRect(clip_bounds_1, ClipOp::kIntersect, false);
+  ASSERT_TRUE(builder.GetDestinationClipBounds().isEmpty());
+  receiver.restore();
+
+  receiver.save();
+  receiver.clipRect(clip_bounds_1, ClipOp::kIntersect, false);
+  receiver.translate(-10, -10);
+  receiver.clipRect(clip_bounds_2, ClipOp::kIntersect, false);
+  ASSERT_EQ(builder.GetDestinationClipBounds(), clip_bounds_1);
+  receiver.restore();
+}
+
+TEST_F(DisplayListTest, ClipRRectAffectsClipBounds) {
+  DisplayListBuilder builder;
+  DlOpReceiver& receiver = ToReceiver(builder);
+  SkRect clip_bounds = SkRect::MakeLTRB(10.2, 11.3, 20.4, 25.7);
+  SkRRect clip = SkRRect::MakeRectXY(clip_bounds, 3, 2);
+  receiver.clipRRect(clip, ClipOp::kIntersect, false);
+
+  // Save initial return values for testing restored values
+  SkRect initial_local_bounds = builder.GetLocalClipBounds();
+  SkRect initial_destination_bounds = builder.GetDestinationClipBounds();
+  ASSERT_EQ(initial_local_bounds, clip_bounds);
+  ASSERT_EQ(initial_destination_bounds, clip_bounds);
+
+  receiver.save();
+  receiver.clipRect({0, 0, 15, 15}, ClipOp::kIntersect, false);
+  // Both clip bounds have changed
+  ASSERT_NE(builder.GetLocalClipBounds(), clip_bounds);
+  ASSERT_NE(builder.GetDestinationClipBounds(), clip_bounds);
+  // Previous return values have not changed
+  ASSERT_EQ(initial_local_bounds, clip_bounds);
+  ASSERT_EQ(initial_destination_bounds, clip_bounds);
+  receiver.restore();
 
-  builder.save();
-  builder.clipRect(clip_bounds_1, SkClipOp::kIntersect, false);
-  builder.translate(-10, -10);
-  builder.clipRect(clip_bounds_2, SkClipOp::kIntersect, false);
-  ASSERT_EQ(builder.getDestinationClipBounds(), clip_bounds_1);
-  builder.restore();
+  // save/restore returned the values to their original values
+  ASSERT_EQ(builder.GetLocalClipBounds(), initial_local_bounds);
+  ASSERT_EQ(builder.GetDestinationClipBounds(), initial_destination_bounds);
+
+  receiver.save();
+  receiver.scale(2, 2);
+  SkRect scaled_clip_bounds = SkRect::MakeLTRB(5.1, 5.65, 10.2, 12.85);
+  ASSERT_EQ(builder.GetLocalClipBounds(), scaled_clip_bounds);
+  // Destination bounds are unaffected by transform
+  ASSERT_EQ(builder.GetDestinationClipBounds(), clip_bounds);
+  receiver.restore();
+
+  // save/restore returned the values to their original values
+  ASSERT_EQ(builder.GetLocalClipBounds(), initial_local_bounds);
+  ASSERT_EQ(builder.GetDestinationClipBounds(), initial_destination_bounds);
 }
 
-TEST(DisplayList, ClipRRectAffectsClipBounds) {
+TEST_F(DisplayListTest, ClipRRectDoAAAffectsClipBounds) {
   DisplayListBuilder builder;
+  DlOpReceiver& receiver = ToReceiver(builder);
   SkRect clip_bounds = SkRect::MakeLTRB(10.2, 11.3, 20.4, 25.7);
   SkRect clip_expanded_bounds = SkRect::MakeLTRB(10, 11, 21, 26);
   SkRRect clip = SkRRect::MakeRectXY(clip_bounds, 3, 2);
-  builder.clipRRect(clip, SkClipOp::kIntersect, false);
+  receiver.clipRRect(clip, ClipOp::kIntersect, true);
 
   // Save initial return values for testing restored values
-  SkRect initial_local_bounds = builder.getLocalClipBounds();
-  SkRect initial_destination_bounds = builder.getDestinationClipBounds();
+  SkRect initial_local_bounds = builder.GetLocalClipBounds();
+  SkRect initial_destination_bounds = builder.GetDestinationClipBounds();
   ASSERT_EQ(initial_local_bounds, clip_expanded_bounds);
-  ASSERT_EQ(initial_destination_bounds, clip_bounds);
+  ASSERT_EQ(initial_destination_bounds, clip_expanded_bounds);
 
-  builder.save();
-  builder.clipRect({0, 0, 15, 15}, SkClipOp::kIntersect, false);
+  receiver.save();
+  receiver.clipRect({0, 0, 15, 15}, ClipOp::kIntersect, true);
   // Both clip bounds have changed
-  ASSERT_NE(builder.getLocalClipBounds(), clip_expanded_bounds);
-  ASSERT_NE(builder.getDestinationClipBounds(), clip_bounds);
+  ASSERT_NE(builder.GetLocalClipBounds(), clip_expanded_bounds);
+  ASSERT_NE(builder.GetDestinationClipBounds(), clip_expanded_bounds);
   // Previous return values have not changed
   ASSERT_EQ(initial_local_bounds, clip_expanded_bounds);
-  ASSERT_EQ(initial_destination_bounds, clip_bounds);
-  builder.restore();
+  ASSERT_EQ(initial_destination_bounds, clip_expanded_bounds);
+  receiver.restore();
 
   // save/restore returned the values to their original values
-  ASSERT_EQ(builder.getLocalClipBounds(), initial_local_bounds);
-  ASSERT_EQ(builder.getDestinationClipBounds(), initial_destination_bounds);
+  ASSERT_EQ(builder.GetLocalClipBounds(), initial_local_bounds);
+  ASSERT_EQ(builder.GetDestinationClipBounds(), initial_destination_bounds);
 
-  builder.save();
-  builder.scale(2, 2);
+  receiver.save();
+  receiver.scale(2, 2);
   SkRect scaled_expanded_bounds = SkRect::MakeLTRB(5, 5.5, 10.5, 13);
-  ASSERT_EQ(builder.getLocalClipBounds(), scaled_expanded_bounds);
+  ASSERT_EQ(builder.GetLocalClipBounds(), scaled_expanded_bounds);
   // Destination bounds are unaffected by transform
-  ASSERT_EQ(builder.getDestinationClipBounds(), clip_bounds);
-  builder.restore();
+  ASSERT_EQ(builder.GetDestinationClipBounds(), clip_expanded_bounds);
+  receiver.restore();
 
   // save/restore returned the values to their original values
-  ASSERT_EQ(builder.getLocalClipBounds(), initial_local_bounds);
-  ASSERT_EQ(builder.getDestinationClipBounds(), initial_destination_bounds);
+  ASSERT_EQ(builder.GetLocalClipBounds(), initial_local_bounds);
+  ASSERT_EQ(builder.GetDestinationClipBounds(), initial_destination_bounds);
 }
 
-TEST(DisplayList, ClipRRectAffectsClipBoundsWithMatrix) {
+TEST_F(DisplayListTest, ClipRRectAffectsClipBoundsWithMatrix) {
   DisplayListBuilder builder;
+  DlOpReceiver& receiver = ToReceiver(builder);
   SkRect clip_bounds_1 = SkRect::MakeLTRB(0, 0, 10, 10);
   SkRect clip_bounds_2 = SkRect::MakeLTRB(10, 10, 20, 20);
   SkRRect clip1 = SkRRect::MakeRectXY(clip_bounds_1, 3, 2);
   SkRRect clip2 = SkRRect::MakeRectXY(clip_bounds_2, 3, 2);
 
-  builder.save();
-  builder.clipRRect(clip1, SkClipOp::kIntersect, false);
-  builder.translate(10, 0);
-  builder.clipRRect(clip1, SkClipOp::kIntersect, false);
-  ASSERT_TRUE(builder.getDestinationClipBounds().isEmpty());
-  builder.restore();
+  receiver.save();
+  receiver.clipRRect(clip1, ClipOp::kIntersect, false);
+  receiver.translate(10, 0);
+  receiver.clipRRect(clip1, ClipOp::kIntersect, false);
+  ASSERT_TRUE(builder.GetDestinationClipBounds().isEmpty());
+  receiver.restore();
 
-  builder.save();
-  builder.clipRRect(clip1, SkClipOp::kIntersect, false);
-  builder.translate(-10, -10);
-  builder.clipRRect(clip2, SkClipOp::kIntersect, false);
-  ASSERT_EQ(builder.getDestinationClipBounds(), clip_bounds_1);
-  builder.restore();
+  receiver.save();
+  receiver.clipRRect(clip1, ClipOp::kIntersect, false);
+  receiver.translate(-10, -10);
+  receiver.clipRRect(clip2, ClipOp::kIntersect, false);
+  ASSERT_EQ(builder.GetDestinationClipBounds(), clip_bounds_1);
+  receiver.restore();
 }
 
-TEST(DisplayList, ClipPathAffectsClipBounds) {
+TEST_F(DisplayListTest, ClipPathAffectsClipBounds) {
   DisplayListBuilder builder;
+  DlOpReceiver& receiver = ToReceiver(builder);
   SkPath clip = SkPath().addCircle(10.2, 11.3, 2).addCircle(20.4, 25.7, 2);
   SkRect clip_bounds = SkRect::MakeLTRB(8.2, 9.3, 22.4, 27.7);
+  receiver.clipPath(clip, ClipOp::kIntersect, false);
+
+  // Save initial return values for testing restored values
+  SkRect initial_local_bounds = builder.GetLocalClipBounds();
+  SkRect initial_destination_bounds = builder.GetDestinationClipBounds();
+  ASSERT_EQ(initial_local_bounds, clip_bounds);
+  ASSERT_EQ(initial_destination_bounds, clip_bounds);
+
+  receiver.save();
+  receiver.clipRect({0, 0, 15, 15}, ClipOp::kIntersect, false);
+  // Both clip bounds have changed
+  ASSERT_NE(builder.GetLocalClipBounds(), clip_bounds);
+  ASSERT_NE(builder.GetDestinationClipBounds(), clip_bounds);
+  // Previous return values have not changed
+  ASSERT_EQ(initial_local_bounds, clip_bounds);
+  ASSERT_EQ(initial_destination_bounds, clip_bounds);
+  receiver.restore();
+
+  // save/restore returned the values to their original values
+  ASSERT_EQ(builder.GetLocalClipBounds(), initial_local_bounds);
+  ASSERT_EQ(builder.GetDestinationClipBounds(), initial_destination_bounds);
+
+  receiver.save();
+  receiver.scale(2, 2);
+  SkRect scaled_clip_bounds = SkRect::MakeLTRB(4.1, 4.65, 11.2, 13.85);
+  ASSERT_EQ(builder.GetLocalClipBounds(), scaled_clip_bounds);
+  // Destination bounds are unaffected by transform
+  ASSERT_EQ(builder.GetDestinationClipBounds(), clip_bounds);
+  receiver.restore();
+
+  // save/restore returned the values to their original values
+  ASSERT_EQ(builder.GetLocalClipBounds(), initial_local_bounds);
+  ASSERT_EQ(builder.GetDestinationClipBounds(), initial_destination_bounds);
+}
+
+TEST_F(DisplayListTest, ClipPathDoAAAffectsClipBounds) {
+  DisplayListBuilder builder;
+  DlOpReceiver& receiver = ToReceiver(builder);
+  SkPath clip = SkPath().addCircle(10.2, 11.3, 2).addCircle(20.4, 25.7, 2);
   SkRect clip_expanded_bounds = SkRect::MakeLTRB(8, 9, 23, 28);
-  builder.clipPath(clip, SkClipOp::kIntersect, false);
+  receiver.clipPath(clip, ClipOp::kIntersect, true);
 
   // Save initial return values for testing restored values
-  SkRect initial_local_bounds = builder.getLocalClipBounds();
-  SkRect initial_destination_bounds = builder.getDestinationClipBounds();
+  SkRect initial_local_bounds = builder.GetLocalClipBounds();
+  SkRect initial_destination_bounds = builder.GetDestinationClipBounds();
   ASSERT_EQ(initial_local_bounds, clip_expanded_bounds);
-  ASSERT_EQ(initial_destination_bounds, clip_bounds);
+  ASSERT_EQ(initial_destination_bounds, clip_expanded_bounds);
 
-  builder.save();
-  builder.clipRect({0, 0, 15, 15}, SkClipOp::kIntersect, false);
+  receiver.save();
+  receiver.clipRect({0, 0, 15, 15}, ClipOp::kIntersect, true);
   // Both clip bounds have changed
-  ASSERT_NE(builder.getLocalClipBounds(), clip_expanded_bounds);
-  ASSERT_NE(builder.getDestinationClipBounds(), clip_bounds);
+  ASSERT_NE(builder.GetLocalClipBounds(), clip_expanded_bounds);
+  ASSERT_NE(builder.GetDestinationClipBounds(), clip_expanded_bounds);
   // Previous return values have not changed
   ASSERT_EQ(initial_local_bounds, clip_expanded_bounds);
-  ASSERT_EQ(initial_destination_bounds, clip_bounds);
-  builder.restore();
+  ASSERT_EQ(initial_destination_bounds, clip_expanded_bounds);
+  receiver.restore();
 
   // save/restore returned the values to their original values
-  ASSERT_EQ(builder.getLocalClipBounds(), initial_local_bounds);
-  ASSERT_EQ(builder.getDestinationClipBounds(), initial_destination_bounds);
+  ASSERT_EQ(builder.GetLocalClipBounds(), initial_local_bounds);
+  ASSERT_EQ(builder.GetDestinationClipBounds(), initial_destination_bounds);
 
-  builder.save();
-  builder.scale(2, 2);
+  receiver.save();
+  receiver.scale(2, 2);
   SkRect scaled_expanded_bounds = SkRect::MakeLTRB(4, 4.5, 11.5, 14);
-  ASSERT_EQ(builder.getLocalClipBounds(), scaled_expanded_bounds);
+  ASSERT_EQ(builder.GetLocalClipBounds(), scaled_expanded_bounds);
   // Destination bounds are unaffected by transform
-  ASSERT_EQ(builder.getDestinationClipBounds(), clip_bounds);
-  builder.restore();
+  ASSERT_EQ(builder.GetDestinationClipBounds(), clip_expanded_bounds);
+  receiver.restore();
 
   // save/restore returned the values to their original values
-  ASSERT_EQ(builder.getLocalClipBounds(), initial_local_bounds);
-  ASSERT_EQ(builder.getDestinationClipBounds(), initial_destination_bounds);
+  ASSERT_EQ(builder.GetLocalClipBounds(), initial_local_bounds);
+  ASSERT_EQ(builder.GetDestinationClipBounds(), initial_destination_bounds);
 }
 
-TEST(DisplayList, ClipPathAffectsClipBoundsWithMatrix) {
+TEST_F(DisplayListTest, ClipPathAffectsClipBoundsWithMatrix) {
   DisplayListBuilder builder;
+  DlOpReceiver& receiver = ToReceiver(builder);
   SkRect clip_bounds = SkRect::MakeLTRB(0, 0, 10, 10);
   SkPath clip1 = SkPath().addCircle(2.5, 2.5, 2.5).addCircle(7.5, 7.5, 2.5);
   SkPath clip2 = SkPath().addCircle(12.5, 12.5, 2.5).addCircle(17.5, 17.5, 2.5);
 
-  builder.save();
-  builder.clipPath(clip1, SkClipOp::kIntersect, false);
-  builder.translate(10, 0);
-  builder.clipPath(clip1, SkClipOp::kIntersect, false);
-  ASSERT_TRUE(builder.getDestinationClipBounds().isEmpty());
-  builder.restore();
+  receiver.save();
+  receiver.clipPath(clip1, ClipOp::kIntersect, false);
+  receiver.translate(10, 0);
+  receiver.clipPath(clip1, ClipOp::kIntersect, false);
+  ASSERT_TRUE(builder.GetDestinationClipBounds().isEmpty());
+  receiver.restore();
 
-  builder.save();
-  builder.clipPath(clip1, SkClipOp::kIntersect, false);
-  builder.translate(-10, -10);
-  builder.clipPath(clip2, SkClipOp::kIntersect, false);
-  ASSERT_EQ(builder.getDestinationClipBounds(), clip_bounds);
-  builder.restore();
+  receiver.save();
+  receiver.clipPath(clip1, ClipOp::kIntersect, false);
+  receiver.translate(-10, -10);
+  receiver.clipPath(clip2, ClipOp::kIntersect, false);
+  ASSERT_EQ(builder.GetDestinationClipBounds(), clip_bounds);
+  receiver.restore();
 }
 
-TEST(DisplayList, DiffClipRectDoesNotAffectClipBounds) {
+TEST_F(DisplayListTest, DiffClipRectDoesNotAffectClipBounds) {
   DisplayListBuilder builder;
+  DlOpReceiver& receiver = ToReceiver(builder);
   SkRect diff_clip = SkRect::MakeLTRB(0, 0, 15, 15);
   SkRect clip_bounds = SkRect::MakeLTRB(10.2, 11.3, 20.4, 25.7);
-  SkRect clip_expanded_bounds = SkRect::MakeLTRB(10, 11, 21, 26);
-  builder.clipRect(clip_bounds, SkClipOp::kIntersect, false);
+  receiver.clipRect(clip_bounds, ClipOp::kIntersect, false);
 
   // Save initial return values for testing after kDifference clip
-  SkRect initial_local_bounds = builder.getLocalClipBounds();
-  SkRect initial_destination_bounds = builder.getDestinationClipBounds();
-  ASSERT_EQ(initial_local_bounds, clip_expanded_bounds);
+  SkRect initial_local_bounds = builder.GetLocalClipBounds();
+  SkRect initial_destination_bounds = builder.GetDestinationClipBounds();
+  ASSERT_EQ(initial_local_bounds, clip_bounds);
   ASSERT_EQ(initial_destination_bounds, clip_bounds);
 
-  builder.clipRect(diff_clip, SkClipOp::kDifference, false);
-  ASSERT_EQ(builder.getLocalClipBounds(), initial_local_bounds);
-  ASSERT_EQ(builder.getDestinationClipBounds(), initial_destination_bounds);
+  receiver.clipRect(diff_clip, ClipOp::kDifference, false);
+  ASSERT_EQ(builder.GetLocalClipBounds(), initial_local_bounds);
+  ASSERT_EQ(builder.GetDestinationClipBounds(), initial_destination_bounds);
 }
 
-TEST(DisplayList, DiffClipRRectDoesNotAffectClipBounds) {
+TEST_F(DisplayListTest, DiffClipRRectDoesNotAffectClipBounds) {
   DisplayListBuilder builder;
+  DlOpReceiver& receiver = ToReceiver(builder);
   SkRRect diff_clip = SkRRect::MakeRectXY({0, 0, 15, 15}, 1, 1);
   SkRect clip_bounds = SkRect::MakeLTRB(10.2, 11.3, 20.4, 25.7);
-  SkRect clip_expanded_bounds = SkRect::MakeLTRB(10, 11, 21, 26);
   SkRRect clip = SkRRect::MakeRectXY({10.2, 11.3, 20.4, 25.7}, 3, 2);
-  builder.clipRRect(clip, SkClipOp::kIntersect, false);
+  receiver.clipRRect(clip, ClipOp::kIntersect, false);
 
   // Save initial return values for testing after kDifference clip
-  SkRect initial_local_bounds = builder.getLocalClipBounds();
-  SkRect initial_destination_bounds = builder.getDestinationClipBounds();
-  ASSERT_EQ(initial_local_bounds, clip_expanded_bounds);
+  SkRect initial_local_bounds = builder.GetLocalClipBounds();
+  SkRect initial_destination_bounds = builder.GetDestinationClipBounds();
+  ASSERT_EQ(initial_local_bounds, clip_bounds);
   ASSERT_EQ(initial_destination_bounds, clip_bounds);
 
-  builder.clipRRect(diff_clip, SkClipOp::kDifference, false);
-  ASSERT_EQ(builder.getLocalClipBounds(), initial_local_bounds);
-  ASSERT_EQ(builder.getDestinationClipBounds(), initial_destination_bounds);
+  receiver.clipRRect(diff_clip, ClipOp::kDifference, false);
+  ASSERT_EQ(builder.GetLocalClipBounds(), initial_local_bounds);
+  ASSERT_EQ(builder.GetDestinationClipBounds(), initial_destination_bounds);
 }
 
-TEST(DisplayList, DiffClipPathDoesNotAffectClipBounds) {
+TEST_F(DisplayListTest, DiffClipPathDoesNotAffectClipBounds) {
   DisplayListBuilder builder;
+  DlOpReceiver& receiver = ToReceiver(builder);
   SkPath diff_clip = SkPath().addRect({0, 0, 15, 15});
   SkPath clip = SkPath().addCircle(10.2, 11.3, 2).addCircle(20.4, 25.7, 2);
   SkRect clip_bounds = SkRect::MakeLTRB(8.2, 9.3, 22.4, 27.7);
-  SkRect clip_expanded_bounds = SkRect::MakeLTRB(8, 9, 23, 28);
-  builder.clipPath(clip, SkClipOp::kIntersect, false);
+  receiver.clipPath(clip, ClipOp::kIntersect, false);
 
   // Save initial return values for testing after kDifference clip
-  SkRect initial_local_bounds = builder.getLocalClipBounds();
-  SkRect initial_destination_bounds = builder.getDestinationClipBounds();
-  ASSERT_EQ(initial_local_bounds, clip_expanded_bounds);
+  SkRect initial_local_bounds = builder.GetLocalClipBounds();
+  SkRect initial_destination_bounds = builder.GetDestinationClipBounds();
+  ASSERT_EQ(initial_local_bounds, clip_bounds);
   ASSERT_EQ(initial_destination_bounds, clip_bounds);
 
-  builder.clipPath(diff_clip, SkClipOp::kDifference, false);
-  ASSERT_EQ(builder.getLocalClipBounds(), initial_local_bounds);
-  ASSERT_EQ(builder.getDestinationClipBounds(), initial_destination_bounds);
+  receiver.clipPath(diff_clip, ClipOp::kDifference, false);
+  ASSERT_EQ(builder.GetLocalClipBounds(), initial_local_bounds);
+  ASSERT_EQ(builder.GetDestinationClipBounds(), initial_destination_bounds);
 }
 
-TEST(DisplayList, ClipPathWithInvertFillTypeDoesNotAffectClipBounds) {
+TEST_F(DisplayListTest, ClipPathWithInvertFillTypeDoesNotAffectClipBounds) {
   SkRect cull_rect = SkRect::MakeLTRB(0, 0, 100.0, 100.0);
   DisplayListBuilder builder(cull_rect);
+  DlOpReceiver& receiver = ToReceiver(builder);
   SkPath clip = SkPath().addCircle(10.2, 11.3, 2).addCircle(20.4, 25.7, 2);
   clip.setFillType(SkPathFillType::kInverseWinding);
-  builder.clipPath(clip, SkClipOp::kIntersect, false);
+  receiver.clipPath(clip, ClipOp::kIntersect, false);
 
-  ASSERT_EQ(builder.getLocalClipBounds(), cull_rect);
-  ASSERT_EQ(builder.getDestinationClipBounds(), cull_rect);
+  ASSERT_EQ(builder.GetLocalClipBounds(), cull_rect);
+  ASSERT_EQ(builder.GetDestinationClipBounds(), cull_rect);
 }
 
-TEST(DisplayList, DiffClipPathWithInvertFillTypeAffectsClipBounds) {
+TEST_F(DisplayListTest, DiffClipPathWithInvertFillTypeAffectsClipBounds) {
   SkRect cull_rect = SkRect::MakeLTRB(0, 0, 100.0, 100.0);
   DisplayListBuilder builder(cull_rect);
+  DlOpReceiver& receiver = ToReceiver(builder);
   SkPath clip = SkPath().addCircle(10.2, 11.3, 2).addCircle(20.4, 25.7, 2);
   clip.setFillType(SkPathFillType::kInverseWinding);
   SkRect clip_bounds = SkRect::MakeLTRB(8.2, 9.3, 22.4, 27.7);
-  SkRect clip_expanded_bounds = SkRect::MakeLTRB(8, 9, 23, 28);
-  builder.clipPath(clip, SkClipOp::kDifference, false);
+  receiver.clipPath(clip, ClipOp::kDifference, false);
 
-  ASSERT_EQ(builder.getLocalClipBounds(), clip_expanded_bounds);
-  ASSERT_EQ(builder.getDestinationClipBounds(), clip_bounds);
+  ASSERT_EQ(builder.GetLocalClipBounds(), clip_bounds);
+  ASSERT_EQ(builder.GetDestinationClipBounds(), clip_bounds);
 }
 
-TEST(DisplayList, FlatDrawPointsProducesBounds) {
+TEST_F(DisplayListTest, FlatDrawPointsProducesBounds) {
   SkPoint horizontal_points[2] = {{10, 10}, {20, 10}};
   SkPoint vertical_points[2] = {{10, 10}, {10, 20}};
   {
     DisplayListBuilder builder;
-    builder.drawPoints(SkCanvas::kPolygon_PointMode, 2, horizontal_points);
+    DlOpReceiver& receiver = ToReceiver(builder);
+    receiver.drawPoints(PointMode::kPolygon, 2, horizontal_points);
     SkRect bounds = builder.Build()->bounds();
     EXPECT_TRUE(bounds.contains(10, 10));
     EXPECT_TRUE(bounds.contains(20, 10));
@@ -1502,7 +2083,8 @@ TEST(DisplayList, FlatDrawPointsProducesBounds) {
   }
   {
     DisplayListBuilder builder;
-    builder.drawPoints(SkCanvas::kPolygon_PointMode, 2, vertical_points);
+    DlOpReceiver& receiver = ToReceiver(builder);
+    receiver.drawPoints(PointMode::kPolygon, 2, vertical_points);
     SkRect bounds = builder.Build()->bounds();
     EXPECT_TRUE(bounds.contains(10, 10));
     EXPECT_TRUE(bounds.contains(10, 20));
@@ -1510,14 +2092,16 @@ TEST(DisplayList, FlatDrawPointsProducesBounds) {
   }
   {
     DisplayListBuilder builder;
-    builder.drawPoints(SkCanvas::kPoints_PointMode, 1, horizontal_points);
+    DlOpReceiver& receiver = ToReceiver(builder);
+    receiver.drawPoints(PointMode::kPoints, 1, horizontal_points);
     SkRect bounds = builder.Build()->bounds();
     EXPECT_TRUE(bounds.contains(10, 10));
   }
   {
     DisplayListBuilder builder;
-    builder.setStrokeWidth(2);
-    builder.drawPoints(SkCanvas::kPolygon_PointMode, 2, horizontal_points);
+    DlOpReceiver& receiver = ToReceiver(builder);
+    receiver.setStrokeWidth(2);
+    receiver.drawPoints(PointMode::kPolygon, 2, horizontal_points);
     SkRect bounds = builder.Build()->bounds();
     EXPECT_TRUE(bounds.contains(10, 10));
     EXPECT_TRUE(bounds.contains(20, 10));
@@ -1525,8 +2109,9 @@ TEST(DisplayList, FlatDrawPointsProducesBounds) {
   }
   {
     DisplayListBuilder builder;
-    builder.setStrokeWidth(2);
-    builder.drawPoints(SkCanvas::kPolygon_PointMode, 2, vertical_points);
+    DlOpReceiver& receiver = ToReceiver(builder);
+    receiver.setStrokeWidth(2);
+    receiver.drawPoints(PointMode::kPolygon, 2, vertical_points);
     SkRect bounds = builder.Build()->bounds();
     EXPECT_TRUE(bounds.contains(10, 10));
     EXPECT_TRUE(bounds.contains(10, 20));
@@ -1534,8 +2119,9 @@ TEST(DisplayList, FlatDrawPointsProducesBounds) {
   }
   {
     DisplayListBuilder builder;
-    builder.setStrokeWidth(2);
-    builder.drawPoints(SkCanvas::kPoints_PointMode, 1, horizontal_points);
+    DlOpReceiver& receiver = ToReceiver(builder);
+    receiver.setStrokeWidth(2);
+    receiver.drawPoints(PointMode::kPoints, 1, horizontal_points);
     SkRect bounds = builder.Build()->bounds();
     EXPECT_TRUE(bounds.contains(10, 10));
     EXPECT_EQ(bounds, SkRect::MakeLTRB(9, 9, 11, 11));
@@ -1550,7 +2136,7 @@ static void test_rtree(const sk_sp<const DlRTree>& rtree,
   rtree->search(query, &indices);
   EXPECT_EQ(indices, expected_indices);
   EXPECT_EQ(indices.size(), expected_indices.size());
-  std::list<SkRect> rects = rtree->searchNonOverlappingDrawnRects(query);
+  std::list<SkRect> rects = rtree->searchAndConsolidateRects(query);
   // ASSERT_EQ(rects.size(), expected_indices.size());
   auto iterator = rects.cbegin();
   for (int i : expected_indices) {
@@ -1559,10 +2145,11 @@ static void test_rtree(const sk_sp<const DlRTree>& rtree,
   }
 }
 
-TEST(DisplayList, RTreeOfSimpleScene) {
-  DisplayListBuilder builder;
-  builder.drawRect({10, 10, 20, 20});
-  builder.drawRect({50, 50, 60, 60});
+TEST_F(DisplayListTest, RTreeOfSimpleScene) {
+  DisplayListBuilder builder(/*prepare_rtree=*/true);
+  DlOpReceiver& receiver = ToReceiver(builder);
+  receiver.drawRect({10, 10, 20, 20});
+  receiver.drawRect({50, 50, 60, 60});
   auto display_list = builder.Build();
   auto rtree = display_list->rtree();
   std::vector<SkRect> rects = {
@@ -1586,12 +2173,13 @@ TEST(DisplayList, RTreeOfSimpleScene) {
   test_rtree(rtree, {19, 19, 51, 51}, rects, {0, 1});
 }
 
-TEST(DisplayList, RTreeOfSaveRestoreScene) {
-  DisplayListBuilder builder;
-  builder.drawRect({10, 10, 20, 20});
-  builder.save();
-  builder.drawRect({50, 50, 60, 60});
-  builder.restore();
+TEST_F(DisplayListTest, RTreeOfSaveRestoreScene) {
+  DisplayListBuilder builder(/*prepare_rtree=*/true);
+  DlOpReceiver& receiver = ToReceiver(builder);
+  receiver.drawRect({10, 10, 20, 20});
+  receiver.save();
+  receiver.drawRect({50, 50, 60, 60});
+  receiver.restore();
   auto display_list = builder.Build();
   auto rtree = display_list->rtree();
   std::vector<SkRect> rects = {
@@ -1615,18 +2203,18 @@ TEST(DisplayList, RTreeOfSaveRestoreScene) {
   test_rtree(rtree, {19, 19, 51, 51}, rects, {0, 1});
 }
 
-TEST(DisplayList, RTreeOfSaveLayerFilterScene) {
-  DisplayListBuilder builder;
+TEST_F(DisplayListTest, RTreeOfSaveLayerFilterScene) {
+  DisplayListBuilder builder(/*prepare_rtree=*/true);
   // blur filter with sigma=1 expands by 3 on all sides
   auto filter = DlBlurImageFilter(1.0, 1.0, DlTileMode::kClamp);
   DlPaint default_paint = DlPaint();
   DlPaint filter_paint = DlPaint().setImageFilter(&filter);
-  builder.drawRect({10, 10, 20, 20}, default_paint);
-  builder.saveLayer(nullptr, &filter_paint);
+  builder.DrawRect({10, 10, 20, 20}, default_paint);
+  builder.SaveLayer(nullptr, &filter_paint);
   // the following rectangle will be expanded to 50,50,60,60
   // by the saveLayer filter during the restore operation
-  builder.drawRect({53, 53, 57, 57}, default_paint);
-  builder.restore();
+  builder.DrawRect({53, 53, 57, 57}, default_paint);
+  builder.Restore();
   auto display_list = builder.Build();
   auto rtree = display_list->rtree();
   std::vector<SkRect> rects = {
@@ -1650,14 +2238,16 @@ TEST(DisplayList, RTreeOfSaveLayerFilterScene) {
   test_rtree(rtree, {19, 19, 51, 51}, rects, {0, 1});
 }
 
-TEST(DisplayList, NestedDisplayListRTreesAreSparse) {
-  DisplayListBuilder nested_dl_builder;
-  nested_dl_builder.drawRect({10, 10, 20, 20});
-  nested_dl_builder.drawRect({50, 50, 60, 60});
+TEST_F(DisplayListTest, NestedDisplayListRTreesAreSparse) {
+  DisplayListBuilder nested_dl_builder(/**prepare_rtree=*/true);
+  DlOpReceiver& nested_dl_receiver = ToReceiver(nested_dl_builder);
+  nested_dl_receiver.drawRect({10, 10, 20, 20});
+  nested_dl_receiver.drawRect({50, 50, 60, 60});
   auto nested_display_list = nested_dl_builder.Build();
 
-  DisplayListBuilder builder;
-  builder.drawDisplayList(nested_display_list);
+  DisplayListBuilder builder(/**prepare_rtree=*/true);
+  DlOpReceiver& receiver = ToReceiver(builder);
+  receiver.drawDisplayList(nested_display_list);
   auto display_list = builder.Build();
 
   auto rtree = display_list->rtree();
@@ -1670,98 +2260,106 @@ TEST(DisplayList, NestedDisplayListRTreesAreSparse) {
   test_rtree(rtree, {19, 19, 51, 51}, rects, {0, 1});
 }
 
-TEST(DisplayList, RemoveUnnecessarySaveRestorePairs) {
+TEST_F(DisplayListTest, RemoveUnnecessarySaveRestorePairs) {
   {
     DisplayListBuilder builder;
-    builder.drawRect({10, 10, 20, 20});
-    builder.save();  // This save op is unnecessary
-    builder.drawRect({50, 50, 60, 60});
-    builder.restore();
+    DlOpReceiver& receiver = ToReceiver(builder);
+    receiver.drawRect({10, 10, 20, 20});
+    receiver.save();  // This save op is unnecessary
+    receiver.drawRect({50, 50, 60, 60});
+    receiver.restore();
 
     DisplayListBuilder builder2;
-    builder2.drawRect({10, 10, 20, 20});
-    builder2.drawRect({50, 50, 60, 60});
+    DlOpReceiver& receiver2 = ToReceiver(builder2);
+    receiver2.drawRect({10, 10, 20, 20});
+    receiver2.drawRect({50, 50, 60, 60});
     ASSERT_TRUE(DisplayListsEQ_Verbose(builder.Build(), builder2.Build()));
   }
 
   {
     DisplayListBuilder builder;
-    builder.drawRect({10, 10, 20, 20});
-    builder.save();
-    builder.translate(1.0, 1.0);
+    DlOpReceiver& receiver = ToReceiver(builder);
+    receiver.drawRect({10, 10, 20, 20});
+    receiver.save();
+    receiver.translate(1.0, 1.0);
     {
-      builder.save();  // unnecessary
-      builder.drawRect({50, 50, 60, 60});
-      builder.restore();
+      receiver.save();  // unnecessary
+      receiver.drawRect({50, 50, 60, 60});
+      receiver.restore();
     }
 
-    builder.restore();
+    receiver.restore();
 
     DisplayListBuilder builder2;
-    builder2.drawRect({10, 10, 20, 20});
-    builder2.save();
-    builder2.translate(1.0, 1.0);
-    { builder2.drawRect({50, 50, 60, 60}); }
-    builder2.restore();
+    DlOpReceiver& receiver2 = ToReceiver(builder2);
+    receiver2.drawRect({10, 10, 20, 20});
+    receiver2.save();
+    receiver2.translate(1.0, 1.0);
+    { receiver2.drawRect({50, 50, 60, 60}); }
+    receiver2.restore();
     ASSERT_TRUE(DisplayListsEQ_Verbose(builder.Build(), builder2.Build()));
   }
 }
 
-TEST(DisplayList, CollapseMultipleNestedSaveRestore) {
+TEST_F(DisplayListTest, CollapseMultipleNestedSaveRestore) {
   DisplayListBuilder builder1;
-  builder1.save();
-  builder1.save();
-  builder1.save();
-  builder1.translate(10, 10);
-  builder1.scale(2, 2);
-  builder1.clipRect({10, 10, 20, 20}, SkClipOp::kIntersect, false);
-  builder1.drawRect({0, 0, 100, 100});
-  builder1.restore();
-  builder1.restore();
-  builder1.restore();
+  DlOpReceiver& receiver1 = ToReceiver(builder1);
+  receiver1.save();
+  receiver1.save();
+  receiver1.save();
+  receiver1.translate(10, 10);
+  receiver1.scale(2, 2);
+  receiver1.clipRect({10, 10, 20, 20}, ClipOp::kIntersect, false);
+  receiver1.drawRect({0, 0, 100, 100});
+  receiver1.restore();
+  receiver1.restore();
+  receiver1.restore();
   auto display_list1 = builder1.Build();
 
   DisplayListBuilder builder2;
-  builder2.save();
-  builder2.translate(10, 10);
-  builder2.scale(2, 2);
-  builder2.clipRect({10, 10, 20, 20}, SkClipOp::kIntersect, false);
-  builder2.drawRect({0, 0, 100, 100});
-  builder2.restore();
+  DlOpReceiver& receiver2 = ToReceiver(builder2);
+  receiver2.save();
+  receiver2.translate(10, 10);
+  receiver2.scale(2, 2);
+  receiver2.clipRect({10, 10, 20, 20}, ClipOp::kIntersect, false);
+  receiver2.drawRect({0, 0, 100, 100});
+  receiver2.restore();
   auto display_list2 = builder2.Build();
 
   ASSERT_TRUE(DisplayListsEQ_Verbose(display_list1, display_list2));
 }
 
-TEST(DisplayList, CollapseNestedSaveAndSaveLayerRestore) {
+TEST_F(DisplayListTest, CollapseNestedSaveAndSaveLayerRestore) {
   DisplayListBuilder builder1;
-  builder1.save();
-  builder1.saveLayer(nullptr, false);
-  builder1.drawRect({0, 0, 100, 100});
-  builder1.scale(2, 2);
-  builder1.restore();
-  builder1.restore();
+  DlOpReceiver& receiver1 = ToReceiver(builder1);
+  receiver1.save();
+  receiver1.saveLayer(nullptr, SaveLayerOptions::kNoAttributes);
+  receiver1.drawRect({0, 0, 100, 100});
+  receiver1.scale(2, 2);
+  receiver1.restore();
+  receiver1.restore();
   auto display_list1 = builder1.Build();
 
   DisplayListBuilder builder2;
-  builder2.saveLayer(nullptr, false);
-  builder2.drawRect({0, 0, 100, 100});
-  builder2.scale(2, 2);
-  builder2.restore();
+  DlOpReceiver& receiver2 = ToReceiver(builder2);
+  receiver2.saveLayer(nullptr, SaveLayerOptions::kNoAttributes);
+  receiver2.drawRect({0, 0, 100, 100});
+  receiver2.scale(2, 2);
+  receiver2.restore();
   auto display_list2 = builder2.Build();
 
   ASSERT_TRUE(DisplayListsEQ_Verbose(display_list1, display_list2));
 }
 
-TEST(DisplayList, RemoveUnnecessarySaveRestorePairsInSetPaint) {
+TEST_F(DisplayListTest, RemoveUnnecessarySaveRestorePairsInSetPaint) {
   SkRect build_bounds = SkRect::MakeLTRB(-100, -100, 200, 200);
   SkRect rect = SkRect::MakeLTRB(30, 30, 70, 70);
   // clang-format off
   const float alpha_matrix[] = {
-    0, 0, 0, 0, 0,
-    0, 1, 0, 0, 0,
-    0, 0, 1, 0, 0,
-    0, 0, 0, 0, 1,
+      0, 0, 0, 0, 0,
+      0, 1, 0, 0, 0,
+      0, 0, 1, 0, 0,
+      0, 0, 0, 0, 1,
   };
   // clang-format on
   DlMatrixColorFilter alpha_color_filter(alpha_matrix);
@@ -1771,398 +2369,474 @@ TEST(DisplayList, RemoveUnnecessarySaveRestorePairsInSetPaint) {
   DlColorFilterImageFilter color_filter_image_filter(alpha_color_filter);
   {
     DisplayListBuilder builder(build_bounds);
-    builder.save();
+    builder.Save();
     DlPaint paint;
     paint.setImageFilter(&color_filter_image_filter);
-    builder.drawRect(rect, paint);
-    builder.restore();
+    builder.DrawRect(rect, paint);
+    builder.Restore();
     sk_sp<DisplayList> display_list1 = builder.Build();
 
     DisplayListBuilder builder2(build_bounds);
     DlPaint paint2;
     paint2.setImageFilter(&color_filter_image_filter);
-    builder2.drawRect(rect, paint2);
+    builder2.DrawRect(rect, paint2);
     sk_sp<DisplayList> display_list2 = builder2.Build();
     ASSERT_TRUE(DisplayListsEQ_Verbose(display_list1, display_list2));
   }
 
   {
     DisplayListBuilder builder(build_bounds);
-    builder.save();
-    builder.saveLayer(&build_bounds, true);
+    builder.Save();
+    builder.SaveLayer(&build_bounds);
     DlPaint paint;
     paint.setImageFilter(&color_filter_image_filter);
-    builder.drawRect(rect, paint);
-    builder.restore();
-    builder.restore();
+    builder.DrawRect(rect, paint);
+    builder.Restore();
+    builder.Restore();
     sk_sp<DisplayList> display_list1 = builder.Build();
 
     DisplayListBuilder builder2(build_bounds);
-    builder2.saveLayer(&build_bounds, true);
+    builder2.SaveLayer(&build_bounds);
     DlPaint paint2;
     paint2.setImageFilter(&color_filter_image_filter);
-    builder2.drawRect(rect, paint2);
-    builder2.restore();
+    builder2.DrawRect(rect, paint2);
+    builder2.Restore();
     sk_sp<DisplayList> display_list2 = builder2.Build();
     ASSERT_TRUE(DisplayListsEQ_Verbose(display_list1, display_list2));
   }
 }
 
-TEST(DisplayList, TransformTriggersDeferredSave) {
+TEST_F(DisplayListTest, TransformTriggersDeferredSave) {
   DisplayListBuilder builder1;
-  builder1.save();
-  builder1.save();
-  builder1.transform(SkM44::Translate(10, 100));
-  builder1.drawRect({0, 0, 100, 100});
-  builder1.restore();
-  builder1.transform(SkM44::Translate(10, 100));
-  builder1.drawRect({0, 0, 100, 100});
-  builder1.restore();
+  DlOpReceiver& receiver1 = ToReceiver(builder1);
+  receiver1.save();
+  receiver1.save();
+  receiver1.transformFullPerspective(1, 0, 0, 10,   //
+                                     0, 1, 0, 100,  //
+                                     0, 0, 1, 0,    //
+                                     0, 0, 0, 1);
+  receiver1.drawRect({0, 0, 100, 100});
+  receiver1.restore();
+  receiver1.transformFullPerspective(1, 0, 0, 10,   //
+                                     0, 1, 0, 100,  //
+                                     0, 0, 1, 0,    //
+                                     0, 0, 0, 1);
+  receiver1.drawRect({0, 0, 100, 100});
+  receiver1.restore();
   auto display_list1 = builder1.Build();
 
   DisplayListBuilder builder2;
-  builder2.save();
-  builder2.transform(SkM44::Translate(10, 100));
-  builder2.drawRect({0, 0, 100, 100});
-  builder2.restore();
-  builder2.save();
-  builder2.transform(SkM44::Translate(10, 100));
-  builder2.drawRect({0, 0, 100, 100});
-  builder2.restore();
+  DlOpReceiver& receiver2 = ToReceiver(builder2);
+  receiver2.save();
+  receiver2.transformFullPerspective(1, 0, 0, 10,   //
+                                     0, 1, 0, 100,  //
+                                     0, 0, 1, 0,    //
+                                     0, 0, 0, 1);
+  receiver2.drawRect({0, 0, 100, 100});
+  receiver2.restore();
+  receiver2.save();
+  receiver2.transformFullPerspective(1, 0, 0, 10,   //
+                                     0, 1, 0, 100,  //
+                                     0, 0, 1, 0,    //
+                                     0, 0, 0, 1);
+  receiver2.drawRect({0, 0, 100, 100});
+  receiver2.restore();
   auto display_list2 = builder2.Build();
 
   ASSERT_TRUE(DisplayListsEQ_Verbose(display_list1, display_list2));
 }
 
-TEST(DisplayList, Transform2DTriggersDeferredSave) {
+TEST_F(DisplayListTest, Transform2DTriggersDeferredSave) {
   DisplayListBuilder builder1;
-  builder1.save();
-  builder1.save();
-  builder1.transform2DAffine(0, 1, 12, 1, 0, 33);
-  builder1.drawRect({0, 0, 100, 100});
-  builder1.restore();
-  builder1.restore();
+  DlOpReceiver& receiver1 = ToReceiver(builder1);
+  receiver1.save();
+  receiver1.save();
+  receiver1.transform2DAffine(0, 1, 12, 1, 0, 33);
+  receiver1.drawRect({0, 0, 100, 100});
+  receiver1.restore();
+  receiver1.restore();
   auto display_list1 = builder1.Build();
 
   DisplayListBuilder builder2;
-  builder2.save();
-  builder2.transform2DAffine(0, 1, 12, 1, 0, 33);
-  builder2.drawRect({0, 0, 100, 100});
-  builder2.restore();
+  DlOpReceiver& receiver2 = ToReceiver(builder2);
+  receiver2.save();
+  receiver2.transform2DAffine(0, 1, 12, 1, 0, 33);
+  receiver2.drawRect({0, 0, 100, 100});
+  receiver2.restore();
   auto display_list2 = builder2.Build();
 
   ASSERT_TRUE(DisplayListsEQ_Verbose(display_list1, display_list2));
 }
 
-TEST(DisplayList, TransformPerspectiveTriggersDeferredSave) {
+TEST_F(DisplayListTest, TransformPerspectiveTriggersDeferredSave) {
   DisplayListBuilder builder1;
-  builder1.save();
-  builder1.save();
-  builder1.transformFullPerspective(0, 1, 0, 12, 1, 0, 0, 33, 3, 2, 5, 29, 0, 0,
-                                    0, 12);
-  builder1.drawRect({0, 0, 100, 100});
-  builder1.restore();
-  builder1.restore();
+  DlOpReceiver& receiver1 = ToReceiver(builder1);
+  receiver1.save();
+  receiver1.save();
+  receiver1.transformFullPerspective(0, 1, 0, 12,  //
+                                     1, 0, 0, 33,  //
+                                     3, 2, 5, 29,  //
+                                     0, 0, 0, 12);
+  receiver1.drawRect({0, 0, 100, 100});
+  receiver1.restore();
+  receiver1.restore();
   auto display_list1 = builder1.Build();
 
   DisplayListBuilder builder2;
-  builder2.save();
-  builder2.transformFullPerspective(0, 1, 0, 12, 1, 0, 0, 33, 3, 2, 5, 29, 0, 0,
-                                    0, 12);
-  builder2.drawRect({0, 0, 100, 100});
-  builder2.restore();
+  DlOpReceiver& receiver2 = ToReceiver(builder2);
+  receiver2.save();
+  receiver2.transformFullPerspective(0, 1, 0, 12,  //
+                                     1, 0, 0, 33,  //
+                                     3, 2, 5, 29,  //
+                                     0, 0, 0, 12);
+  receiver2.drawRect({0, 0, 100, 100});
+  receiver2.restore();
   auto display_list2 = builder2.Build();
 
   ASSERT_TRUE(DisplayListsEQ_Verbose(display_list1, display_list2));
 }
 
-TEST(DisplayList, ResetTransformTriggersDeferredSave) {
+TEST_F(DisplayListTest, ResetTransformTriggersDeferredSave) {
   DisplayListBuilder builder1;
-  builder1.save();
-  builder1.save();
-  builder1.transformReset();
-  builder1.drawRect({0, 0, 100, 100});
-  builder1.restore();
-  builder1.restore();
+  DlOpReceiver& receiver1 = ToReceiver(builder1);
+  receiver1.save();
+  receiver1.save();
+  receiver1.transformReset();
+  receiver1.drawRect({0, 0, 100, 100});
+  receiver1.restore();
+  receiver1.restore();
   auto display_list1 = builder1.Build();
 
   DisplayListBuilder builder2;
-  builder2.save();
-  builder2.transformReset();
-  builder2.drawRect({0, 0, 100, 100});
-  builder2.restore();
+  DlOpReceiver& receiver2 = ToReceiver(builder2);
+  receiver2.save();
+  receiver2.transformReset();
+  receiver2.drawRect({0, 0, 100, 100});
+  receiver2.restore();
   auto display_list2 = builder2.Build();
 
   ASSERT_TRUE(DisplayListsEQ_Verbose(display_list1, display_list2));
 }
 
-TEST(DisplayList, SkewTriggersDeferredSave) {
+TEST_F(DisplayListTest, SkewTriggersDeferredSave) {
   DisplayListBuilder builder1;
-  builder1.save();
-  builder1.save();
-  builder1.skew(10, 10);
-  builder1.drawRect({0, 0, 100, 100});
-  builder1.restore();
-  builder1.restore();
+  DlOpReceiver& receiver1 = ToReceiver(builder1);
+  receiver1.save();
+  receiver1.save();
+  receiver1.skew(10, 10);
+  receiver1.drawRect({0, 0, 100, 100});
+  receiver1.restore();
+  receiver1.restore();
   auto display_list1 = builder1.Build();
 
   DisplayListBuilder builder2;
-  builder2.save();
-  builder2.skew(10, 10);
-  builder2.drawRect({0, 0, 100, 100});
-  builder2.restore();
+  DlOpReceiver& receiver2 = ToReceiver(builder2);
+  receiver2.save();
+  receiver2.skew(10, 10);
+  receiver2.drawRect({0, 0, 100, 100});
+  receiver2.restore();
   auto display_list2 = builder2.Build();
 
   ASSERT_TRUE(DisplayListsEQ_Verbose(display_list1, display_list2));
 }
 
-TEST(DisplayList, TranslateTriggersDeferredSave) {
+TEST_F(DisplayListTest, TranslateTriggersDeferredSave) {
   DisplayListBuilder builder1;
-  builder1.save();
-  builder1.save();
-  builder1.translate(10, 10);
-  builder1.drawRect({0, 0, 100, 100});
-  builder1.restore();
-  builder1.restore();
+  DlOpReceiver& receiver1 = ToReceiver(builder1);
+  receiver1.save();
+  receiver1.save();
+  receiver1.translate(10, 10);
+  receiver1.drawRect({0, 0, 100, 100});
+  receiver1.restore();
+  receiver1.restore();
   auto display_list1 = builder1.Build();
 
   DisplayListBuilder builder2;
-  builder2.save();
-  builder2.translate(10, 10);
-  builder2.drawRect({0, 0, 100, 100});
-  builder2.restore();
+  DlOpReceiver& receiver2 = ToReceiver(builder2);
+  receiver2.save();
+  receiver2.translate(10, 10);
+  receiver2.drawRect({0, 0, 100, 100});
+  receiver2.restore();
   auto display_list2 = builder2.Build();
 
   ASSERT_TRUE(DisplayListsEQ_Verbose(display_list1, display_list2));
 }
 
-TEST(DisplayList, ScaleTriggersDeferredSave) {
+TEST_F(DisplayListTest, ScaleTriggersDeferredSave) {
   DisplayListBuilder builder1;
-  builder1.save();
-  builder1.save();
-  builder1.scale(0.5, 0.5);
-  builder1.drawRect({0, 0, 100, 100});
-  builder1.restore();
-  builder1.restore();
+  DlOpReceiver& receiver1 = ToReceiver(builder1);
+  receiver1.save();
+  receiver1.save();
+  receiver1.scale(0.5, 0.5);
+  receiver1.drawRect({0, 0, 100, 100});
+  receiver1.restore();
+  receiver1.restore();
   auto display_list1 = builder1.Build();
 
   DisplayListBuilder builder2;
-  builder2.save();
-  builder2.scale(0.5, 0.5);
-  builder2.drawRect({0, 0, 100, 100});
-  builder2.restore();
+  DlOpReceiver& receiver2 = ToReceiver(builder2);
+  receiver2.save();
+  receiver2.scale(0.5, 0.5);
+  receiver2.drawRect({0, 0, 100, 100});
+  receiver2.restore();
   auto display_list2 = builder2.Build();
 
   ASSERT_TRUE(DisplayListsEQ_Verbose(display_list1, display_list2));
 }
 
-TEST(DisplayList, ClipRectTriggersDeferredSave) {
+TEST_F(DisplayListTest, ClipRectTriggersDeferredSave) {
   DisplayListBuilder builder1;
-  builder1.save();
-  builder1.save();
-  builder1.clipRect(SkRect::MakeLTRB(0, 0, 100, 100), SkClipOp::kIntersect,
-                    true);
-  builder1.drawRect({0, 0, 100, 100});
-  builder1.restore();
-  builder1.transform(SkM44());
-  builder1.drawRect({0, 0, 100, 100});
-  builder1.restore();
+  DlOpReceiver& receiver1 = ToReceiver(builder1);
+  receiver1.save();
+  receiver1.save();
+  receiver1.clipRect(SkRect::MakeLTRB(0, 0, 100, 100), ClipOp::kIntersect,
+                     true);
+  receiver1.drawRect({0, 0, 100, 100});
+  receiver1.restore();
+  receiver1.transformFullPerspective(1, 0, 0, 0,  //
+                                     0, 1, 0, 0,  //
+                                     0, 0, 1, 0,  //
+                                     0, 0, 0, 1);
+  receiver1.drawRect({0, 0, 100, 100});
+  receiver1.restore();
   auto display_list1 = builder1.Build();
 
   DisplayListBuilder builder2;
-  builder2.save();
-  builder2.clipRect(SkRect::MakeLTRB(0, 0, 100, 100), SkClipOp::kIntersect,
-                    true);
-  builder2.drawRect({0, 0, 100, 100});
-  builder2.restore();
-  builder2.transform(SkM44());
-  builder2.drawRect({0, 0, 100, 100});
+  DlOpReceiver& receiver2 = ToReceiver(builder2);
+  receiver2.save();
+  receiver2.clipRect(SkRect::MakeLTRB(0, 0, 100, 100), ClipOp::kIntersect,
+                     true);
+  receiver2.drawRect({0, 0, 100, 100});
+  receiver2.restore();
+  receiver2.transformFullPerspective(1, 0, 0, 0,  //
+                                     0, 1, 0, 0,  //
+                                     0, 0, 1, 0,  //
+                                     0, 0, 0, 1);
+  receiver2.drawRect({0, 0, 100, 100});
   auto display_list2 = builder2.Build();
 
   ASSERT_TRUE(DisplayListsEQ_Verbose(display_list1, display_list2));
 }
 
-TEST(DisplayList, ClipRRectTriggersDeferredSave) {
+TEST_F(DisplayListTest, ClipRRectTriggersDeferredSave) {
   DisplayListBuilder builder1;
-  builder1.save();
-  builder1.save();
-  builder1.clipRRect(kTestRRect, SkClipOp::kIntersect, true);
-
-  builder1.drawRect({0, 0, 100, 100});
-  builder1.restore();
-  builder1.transform(SkM44());
-  builder1.drawRect({0, 0, 100, 100});
-  builder1.restore();
+  DlOpReceiver& receiver1 = ToReceiver(builder1);
+  receiver1.save();
+  receiver1.save();
+  receiver1.clipRRect(kTestRRect, ClipOp::kIntersect, true);
+
+  receiver1.drawRect({0, 0, 100, 100});
+  receiver1.restore();
+  receiver1.transformFullPerspective(1, 0, 0, 0,  //
+                                     0, 1, 0, 0,  //
+                                     0, 0, 1, 0,  //
+                                     0, 0, 0, 1);
+  receiver1.drawRect({0, 0, 100, 100});
+  receiver1.restore();
   auto display_list1 = builder1.Build();
 
   DisplayListBuilder builder2;
-  builder2.save();
-  builder2.clipRRect(kTestRRect, SkClipOp::kIntersect, true);
-
-  builder2.drawRect({0, 0, 100, 100});
-  builder2.restore();
-  builder2.transform(SkM44());
-  builder2.drawRect({0, 0, 100, 100});
+  DlOpReceiver& receiver2 = ToReceiver(builder2);
+  receiver2.save();
+  receiver2.clipRRect(kTestRRect, ClipOp::kIntersect, true);
+
+  receiver2.drawRect({0, 0, 100, 100});
+  receiver2.restore();
+  receiver2.transformFullPerspective(1, 0, 0, 0,  //
+                                     0, 1, 0, 0,  //
+                                     0, 0, 1, 0,  //
+                                     0, 0, 0, 1);
+  receiver2.drawRect({0, 0, 100, 100});
   auto display_list2 = builder2.Build();
 
   ASSERT_TRUE(DisplayListsEQ_Verbose(display_list1, display_list2));
 }
 
-TEST(DisplayList, ClipPathTriggersDeferredSave) {
+TEST_F(DisplayListTest, ClipPathTriggersDeferredSave) {
   DisplayListBuilder builder1;
-  builder1.save();
-  builder1.save();
-  builder1.clipPath(kTestPath1, SkClipOp::kIntersect, true);
-  builder1.drawRect({0, 0, 100, 100});
-  builder1.restore();
-  builder1.transform(SkM44());
-  builder1.drawRect({0, 0, 100, 100});
-  builder1.restore();
+  DlOpReceiver& receiver1 = ToReceiver(builder1);
+  receiver1.save();
+  receiver1.save();
+  receiver1.clipPath(kTestPath1, ClipOp::kIntersect, true);
+  receiver1.drawRect({0, 0, 100, 100});
+  receiver1.restore();
+  receiver1.transformFullPerspective(1, 0, 0, 0,  //
+                                     0, 1, 0, 0,  //
+                                     0, 0, 1, 0,  //
+                                     0, 0, 0, 1);
+  receiver1.drawRect({0, 0, 100, 100});
+  receiver1.restore();
   auto display_list1 = builder1.Build();
 
   DisplayListBuilder builder2;
-  builder2.save();
-  builder2.clipPath(kTestPath1, SkClipOp::kIntersect, true);
-  builder2.drawRect({0, 0, 100, 100});
-  builder2.restore();
-  builder2.transform(SkM44());
-  builder2.drawRect({0, 0, 100, 100});
+  DlOpReceiver& receiver2 = ToReceiver(builder2);
+  receiver2.save();
+  receiver2.clipPath(kTestPath1, ClipOp::kIntersect, true);
+  receiver2.drawRect({0, 0, 100, 100});
+  receiver2.restore();
+  receiver2.transformFullPerspective(1, 0, 0, 0,  //
+                                     0, 1, 0, 0,  //
+                                     0, 0, 1, 0,  //
+                                     0, 0, 0, 1);
+  receiver2.drawRect({0, 0, 100, 100});
   auto display_list2 = builder2.Build();
 
   ASSERT_TRUE(DisplayListsEQ_Verbose(display_list1, display_list2));
 }
 
-TEST(DisplayList, NOPTranslateDoesNotTriggerDeferredSave) {
+TEST_F(DisplayListTest, NOPTranslateDoesNotTriggerDeferredSave) {
   DisplayListBuilder builder1;
-  builder1.save();
-  builder1.save();
-  builder1.translate(0, 0);
-  builder1.drawRect({0, 0, 100, 100});
-  builder1.restore();
-  builder1.drawRect({0, 0, 100, 100});
-  builder1.restore();
+  DlOpReceiver& receiver1 = ToReceiver(builder1);
+  receiver1.save();
+  receiver1.save();
+  receiver1.translate(0, 0);
+  receiver1.drawRect({0, 0, 100, 100});
+  receiver1.restore();
+  receiver1.drawRect({0, 0, 100, 100});
+  receiver1.restore();
   auto display_list1 = builder1.Build();
 
   DisplayListBuilder builder2;
-  builder2.drawRect({0, 0, 100, 100});
-  builder2.drawRect({0, 0, 100, 100});
+  DlOpReceiver& receiver2 = ToReceiver(builder2);
+  receiver2.drawRect({0, 0, 100, 100});
+  receiver2.drawRect({0, 0, 100, 100});
   auto display_list2 = builder2.Build();
 
   ASSERT_TRUE(DisplayListsEQ_Verbose(display_list1, display_list2));
 }
 
-TEST(DisplayList, NOPScaleDoesNotTriggerDeferredSave) {
+TEST_F(DisplayListTest, NOPScaleDoesNotTriggerDeferredSave) {
   DisplayListBuilder builder1;
-  builder1.save();
-  builder1.save();
-  builder1.scale(1.0, 1.0);
-  builder1.drawRect({0, 0, 100, 100});
-  builder1.restore();
-  builder1.drawRect({0, 0, 100, 100});
-  builder1.restore();
+  DlOpReceiver& receiver1 = ToReceiver(builder1);
+  receiver1.save();
+  receiver1.save();
+  receiver1.scale(1.0, 1.0);
+  receiver1.drawRect({0, 0, 100, 100});
+  receiver1.restore();
+  receiver1.drawRect({0, 0, 100, 100});
+  receiver1.restore();
   auto display_list1 = builder1.Build();
 
   DisplayListBuilder builder2;
-  builder2.drawRect({0, 0, 100, 100});
-  builder2.drawRect({0, 0, 100, 100});
+  DlOpReceiver& receiver2 = ToReceiver(builder2);
+  receiver2.drawRect({0, 0, 100, 100});
+  receiver2.drawRect({0, 0, 100, 100});
   auto display_list2 = builder2.Build();
 
   ASSERT_TRUE(DisplayListsEQ_Verbose(display_list1, display_list2));
 }
 
-TEST(DisplayList, NOPRotationDoesNotTriggerDeferredSave) {
+TEST_F(DisplayListTest, NOPRotationDoesNotTriggerDeferredSave) {
   DisplayListBuilder builder1;
-  builder1.save();
-  builder1.save();
-  builder1.rotate(360);
-  builder1.drawRect({0, 0, 100, 100});
-  builder1.restore();
-  builder1.drawRect({0, 0, 100, 100});
-  builder1.restore();
+  DlOpReceiver& receiver1 = ToReceiver(builder1);
+  receiver1.save();
+  receiver1.save();
+  receiver1.rotate(360);
+  receiver1.drawRect({0, 0, 100, 100});
+  receiver1.restore();
+  receiver1.drawRect({0, 0, 100, 100});
+  receiver1.restore();
   auto display_list1 = builder1.Build();
 
   DisplayListBuilder builder2;
-  builder2.drawRect({0, 0, 100, 100});
-  builder2.drawRect({0, 0, 100, 100});
+  DlOpReceiver& receiver2 = ToReceiver(builder2);
+  receiver2.drawRect({0, 0, 100, 100});
+  receiver2.drawRect({0, 0, 100, 100});
   auto display_list2 = builder2.Build();
 
   ASSERT_TRUE(DisplayListsEQ_Verbose(display_list1, display_list2));
 }
 
-TEST(DisplayList, NOPSkewDoesNotTriggerDeferredSave) {
+TEST_F(DisplayListTest, NOPSkewDoesNotTriggerDeferredSave) {
   DisplayListBuilder builder1;
-  builder1.save();
-  builder1.save();
-  builder1.skew(0, 0);
-  builder1.drawRect({0, 0, 100, 100});
-  builder1.restore();
-  builder1.drawRect({0, 0, 100, 100});
-  builder1.restore();
+  DlOpReceiver& receiver1 = ToReceiver(builder1);
+  receiver1.save();
+  receiver1.save();
+  receiver1.skew(0, 0);
+  receiver1.drawRect({0, 0, 100, 100});
+  receiver1.restore();
+  receiver1.drawRect({0, 0, 100, 100});
+  receiver1.restore();
   auto display_list1 = builder1.Build();
 
   DisplayListBuilder builder2;
-  builder2.drawRect({0, 0, 100, 100});
-  builder2.drawRect({0, 0, 100, 100});
+  DlOpReceiver& receiver2 = ToReceiver(builder2);
+  receiver2.drawRect({0, 0, 100, 100});
+  receiver2.drawRect({0, 0, 100, 100});
   auto display_list2 = builder2.Build();
 
   ASSERT_TRUE(DisplayListsEQ_Verbose(display_list1, display_list2));
 }
 
-TEST(DisplayList, NOPTransformDoesNotTriggerDeferredSave) {
+TEST_F(DisplayListTest, NOPTransformDoesNotTriggerDeferredSave) {
   DisplayListBuilder builder1;
-  builder1.save();
-  builder1.save();
-  builder1.transform(SkM44());
-  builder1.drawRect({0, 0, 100, 100});
-  builder1.restore();
-  builder1.transform(SkM44());
-  builder1.drawRect({0, 0, 100, 100});
-  builder1.restore();
+  DlOpReceiver& receiver1 = ToReceiver(builder1);
+  receiver1.save();
+  receiver1.save();
+  receiver1.transformFullPerspective(1, 0, 0, 0,  //
+                                     0, 1, 0, 0,  //
+                                     0, 0, 1, 0,  //
+                                     0, 0, 0, 1);
+  receiver1.drawRect({0, 0, 100, 100});
+  receiver1.restore();
+  receiver1.transformFullPerspective(1, 0, 0, 0,  //
+                                     0, 1, 0, 0,  //
+                                     0, 0, 1, 0,  //
+                                     0, 0, 0, 1);
+  receiver1.drawRect({0, 0, 100, 100});
+  receiver1.restore();
   auto display_list1 = builder1.Build();
 
   DisplayListBuilder builder2;
-  builder2.drawRect({0, 0, 100, 100});
-  builder2.drawRect({0, 0, 100, 100});
+  DlOpReceiver& receiver2 = ToReceiver(builder2);
+  receiver2.drawRect({0, 0, 100, 100});
+  receiver2.drawRect({0, 0, 100, 100});
   auto display_list2 = builder2.Build();
 
   ASSERT_TRUE(DisplayListsEQ_Verbose(display_list1, display_list2));
 }
 
-TEST(DisplayList, NOPTransform2DDoesNotTriggerDeferredSave) {
+TEST_F(DisplayListTest, NOPTransform2DDoesNotTriggerDeferredSave) {
   DisplayListBuilder builder1;
-  builder1.save();
-  builder1.save();
-  builder1.transform2DAffine(1, 0, 0, 0, 1, 0);
-  builder1.drawRect({0, 0, 100, 100});
-  builder1.restore();
-  builder1.drawRect({0, 0, 100, 100});
-  builder1.restore();
+  DlOpReceiver& receiver1 = ToReceiver(builder1);
+  receiver1.save();
+  receiver1.save();
+  receiver1.transform2DAffine(1, 0, 0, 0, 1, 0);
+  receiver1.drawRect({0, 0, 100, 100});
+  receiver1.restore();
+  receiver1.drawRect({0, 0, 100, 100});
+  receiver1.restore();
   auto display_list1 = builder1.Build();
 
   DisplayListBuilder builder2;
-  builder2.drawRect({0, 0, 100, 100});
-  builder2.drawRect({0, 0, 100, 100});
+  DlOpReceiver& receiver2 = ToReceiver(builder2);
+  receiver2.drawRect({0, 0, 100, 100});
+  receiver2.drawRect({0, 0, 100, 100});
   auto display_list2 = builder2.Build();
 
   ASSERT_TRUE(DisplayListsEQ_Verbose(display_list1, display_list2));
 }
 
-TEST(DisplayList, NOPTransformFullPerspectiveDoesNotTriggerDeferredSave) {
+TEST_F(DisplayListTest, NOPTransformFullPerspectiveDoesNotTriggerDeferredSave) {
   {
     DisplayListBuilder builder1;
-    builder1.save();
-    builder1.save();
-    builder1.transformFullPerspective(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0,
-                                      0, 1);
-    builder1.drawRect({0, 0, 100, 100});
-    builder1.restore();
-    builder1.drawRect({0, 0, 100, 100});
-    builder1.restore();
+    DlOpReceiver& receiver1 = ToReceiver(builder1);
+    receiver1.save();
+    receiver1.save();
+    receiver1.transformFullPerspective(1, 0, 0, 0,  //
+                                       0, 1, 0, 0,  //
+                                       0, 0, 1, 0,  //
+                                       0, 0, 0, 1);
+    receiver1.drawRect({0, 0, 100, 100});
+    receiver1.restore();
+    receiver1.drawRect({0, 0, 100, 100});
+    receiver1.restore();
     auto display_list1 = builder1.Build();
 
     DisplayListBuilder builder2;
-    builder2.drawRect({0, 0, 100, 100});
-    builder2.drawRect({0, 0, 100, 100});
+    DlOpReceiver& receiver2 = ToReceiver(builder2);
+    receiver2.drawRect({0, 0, 100, 100});
+    receiver2.drawRect({0, 0, 100, 100});
     auto display_list2 = builder2.Build();
 
     ASSERT_TRUE(DisplayListsEQ_Verbose(display_list1, display_list2));
@@ -2170,23 +2844,27 @@ TEST(DisplayList, NOPTransformFullPerspectiveDoesNotTriggerDeferredSave) {
 
   {
     DisplayListBuilder builder1;
-    builder1.save();
-    builder1.save();
-    builder1.transformFullPerspective(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0,
-                                      0, 1);
-    builder1.transformReset();
-    builder1.drawRect({0, 0, 100, 100});
-    builder1.restore();
-    builder1.drawRect({0, 0, 100, 100});
-    builder1.restore();
+    DlOpReceiver& receiver1 = ToReceiver(builder1);
+    receiver1.save();
+    receiver1.save();
+    receiver1.transformFullPerspective(1, 0, 0, 0,  //
+                                       0, 1, 0, 0,  //
+                                       0, 0, 1, 0,  //
+                                       0, 0, 0, 1);
+    receiver1.transformReset();
+    receiver1.drawRect({0, 0, 100, 100});
+    receiver1.restore();
+    receiver1.drawRect({0, 0, 100, 100});
+    receiver1.restore();
     auto display_list1 = builder1.Build();
 
     DisplayListBuilder builder2;
-    builder2.save();
-    builder2.transformReset();
-    builder2.drawRect({0, 0, 100, 100});
-    builder2.restore();
-    builder2.drawRect({0, 0, 100, 100});
+    DlOpReceiver& receiver2 = ToReceiver(builder2);
+    receiver2.save();
+    receiver2.transformReset();
+    receiver2.drawRect({0, 0, 100, 100});
+    receiver2.restore();
+    receiver2.drawRect({0, 0, 100, 100});
 
     auto display_list2 = builder2.Build();
 
@@ -2194,40 +2872,42 @@ TEST(DisplayList, NOPTransformFullPerspectiveDoesNotTriggerDeferredSave) {
   }
 }
 
-TEST(DisplayList, NOPClipDoesNotTriggerDeferredSave) {
+TEST_F(DisplayListTest, NOPClipDoesNotTriggerDeferredSave) {
   DisplayListBuilder builder1;
-  builder1.save();
-  builder1.save();
-  builder1.clipRect(SkRect::MakeLTRB(0, SK_ScalarNaN, SK_ScalarNaN, 0),
-                    SkClipOp::kIntersect, true);
-  builder1.drawRect({0, 0, 100, 100});
-  builder1.restore();
-  builder1.drawRect({0, 0, 100, 100});
-  builder1.restore();
+  DlOpReceiver& receiver1 = ToReceiver(builder1);
+  receiver1.save();
+  receiver1.save();
+  receiver1.clipRect(SkRect::MakeLTRB(0, SK_ScalarNaN, SK_ScalarNaN, 0),
+                     ClipOp::kIntersect, true);
+  receiver1.drawRect({0, 0, 100, 100});
+  receiver1.restore();
+  receiver1.drawRect({0, 0, 100, 100});
+  receiver1.restore();
   auto display_list1 = builder1.Build();
 
   DisplayListBuilder builder2;
-  builder2.drawRect({0, 0, 100, 100});
-  builder2.drawRect({0, 0, 100, 100});
+  DlOpReceiver& receiver2 = ToReceiver(builder2);
+  receiver2.drawRect({0, 0, 100, 100});
+  receiver2.drawRect({0, 0, 100, 100});
   auto display_list2 = builder2.Build();
 
   ASSERT_TRUE(DisplayListsEQ_Verbose(display_list1, display_list2));
 }
 
-TEST(DisplayList, RTreeOfClippedSaveLayerFilterScene) {
-  DisplayListBuilder builder;
+TEST_F(DisplayListTest, RTreeOfClippedSaveLayerFilterScene) {
+  DisplayListBuilder builder(/*prepare_rtree=*/true);
   // blur filter with sigma=1 expands by 30 on all sides
   auto filter = DlBlurImageFilter(10.0, 10.0, DlTileMode::kClamp);
   DlPaint default_paint = DlPaint();
   DlPaint filter_paint = DlPaint().setImageFilter(&filter);
-  builder.drawRect({10, 10, 20, 20}, default_paint);
-  builder.clipRect({50, 50, 60, 60}, SkClipOp::kIntersect, false);
-  builder.saveLayer(nullptr, &filter_paint);
+  builder.DrawRect({10, 10, 20, 20}, default_paint);
+  builder.ClipRect({50, 50, 60, 60}, ClipOp::kIntersect, false);
+  builder.SaveLayer(nullptr, &filter_paint);
   // the following rectangle will be expanded to 23,23,87,87
   // by the saveLayer filter during the restore operation
   // but it will then be clipped to 50,50,60,60
-  builder.drawRect({53, 53, 57, 57}, default_paint);
-  builder.restore();
+  builder.DrawRect({53, 53, 57, 57}, default_paint);
+  builder.Restore();
   auto display_list = builder.Build();
   auto rtree = display_list->rtree();
   std::vector<SkRect> rects = {
@@ -2251,5 +2931,855 @@ TEST(DisplayList, RTreeOfClippedSaveLayerFilterScene) {
   test_rtree(rtree, {19, 19, 51, 51}, rects, {0, 1});
 }
 
+TEST_F(DisplayListTest, RTreeRenderCulling) {
+  DisplayListBuilder main_builder(true);
+  DlOpReceiver& main_receiver = ToReceiver(main_builder);
+  main_receiver.drawRect({0, 0, 10, 10});
+  main_receiver.drawRect({20, 0, 30, 10});
+  main_receiver.drawRect({0, 20, 10, 30});
+  main_receiver.drawRect({20, 20, 30, 30});
+  auto main = main_builder.Build();
+
+  auto test = [main](SkIRect cull_rect, const sk_sp<DisplayList>& expected) {
+    {  // Test SkIRect culling
+      DisplayListBuilder culling_builder;
+      main->Dispatch(ToReceiver(culling_builder), cull_rect);
+
+      EXPECT_TRUE(DisplayListsEQ_Verbose(culling_builder.Build(), expected));
+    }
+
+    {  // Test SkRect culling
+      DisplayListBuilder culling_builder;
+      main->Dispatch(ToReceiver(culling_builder), SkRect::Make(cull_rect));
+
+      EXPECT_TRUE(DisplayListsEQ_Verbose(culling_builder.Build(), expected));
+    }
+  };
+
+  {  // No rects
+    SkIRect cull_rect = {11, 11, 19, 19};
+
+    DisplayListBuilder expected_builder;
+    auto expected = expected_builder.Build();
+
+    test(cull_rect, expected);
+  }
+
+  {  // Rect 1
+    SkIRect cull_rect = {9, 9, 19, 19};
+
+    DisplayListBuilder expected_builder;
+    DlOpReceiver& expected_receiver = ToReceiver(expected_builder);
+    expected_receiver.drawRect({0, 0, 10, 10});
+    auto expected = expected_builder.Build();
+
+    test(cull_rect, expected);
+  }
+
+  {  // Rect 2
+    SkIRect cull_rect = {11, 9, 21, 19};
+
+    DisplayListBuilder expected_builder;
+    DlOpReceiver& expected_receiver = ToReceiver(expected_builder);
+    expected_receiver.drawRect({20, 0, 30, 10});
+    auto expected = expected_builder.Build();
+
+    test(cull_rect, expected);
+  }
+
+  {  // Rect 3
+    SkIRect cull_rect = {9, 11, 19, 21};
+
+    DisplayListBuilder expected_builder;
+    DlOpReceiver& expected_receiver = ToReceiver(expected_builder);
+    expected_receiver.drawRect({0, 20, 10, 30});
+    auto expected = expected_builder.Build();
+
+    test(cull_rect, expected);
+  }
+
+  {  // Rect 4
+    SkIRect cull_rect = {11, 11, 21, 21};
+
+    DisplayListBuilder expected_builder;
+    DlOpReceiver& expected_receiver = ToReceiver(expected_builder);
+    expected_receiver.drawRect({20, 20, 30, 30});
+    auto expected = expected_builder.Build();
+
+    test(cull_rect, expected);
+  }
+
+  {  // All 4 rects
+    SkIRect cull_rect = {9, 9, 21, 21};
+
+    test(cull_rect, main);
+  }
+}
+
+TEST_F(DisplayListTest, DrawSaveDrawCannotInheritOpacity) {
+  DisplayListBuilder builder;
+  builder.DrawCircle({10, 10}, 5, DlPaint());
+  builder.Save();
+  builder.ClipRect({0, 0, 20, 20}, DlCanvas::ClipOp::kIntersect, false);
+  builder.DrawRect({5, 5, 15, 15}, DlPaint());
+  builder.Restore();
+  auto display_list = builder.Build();
+
+  ASSERT_FALSE(display_list->can_apply_group_opacity());
+}
+
+TEST_F(DisplayListTest, DrawUnorderedRect) {
+  auto renderer = [](DlCanvas& canvas, DlPaint& paint, SkRect& rect) {
+    canvas.DrawRect(rect, paint);
+  };
+  check_inverted_bounds(renderer, "DrawRect");
+}
+
+TEST_F(DisplayListTest, DrawUnorderedRoundRect) {
+  auto renderer = [](DlCanvas& canvas, DlPaint& paint, SkRect& rect) {
+    canvas.DrawRRect(SkRRect::MakeRectXY(rect, 2.0f, 2.0f), paint);
+  };
+  check_inverted_bounds(renderer, "DrawRoundRect");
+}
+
+TEST_F(DisplayListTest, DrawUnorderedOval) {
+  auto renderer = [](DlCanvas& canvas, DlPaint& paint, SkRect& rect) {
+    canvas.DrawOval(rect, paint);
+  };
+  check_inverted_bounds(renderer, "DrawOval");
+}
+
+TEST_F(DisplayListTest, DrawUnorderedRectangularPath) {
+  auto renderer = [](DlCanvas& canvas, DlPaint& paint, SkRect& rect) {
+    canvas.DrawPath(SkPath().addRect(rect), paint);
+  };
+  check_inverted_bounds(renderer, "DrawRectangularPath");
+}
+
+TEST_F(DisplayListTest, DrawUnorderedOvalPath) {
+  auto renderer = [](DlCanvas& canvas, DlPaint& paint, SkRect& rect) {
+    canvas.DrawPath(SkPath().addOval(rect), paint);
+  };
+  check_inverted_bounds(renderer, "DrawOvalPath");
+}
+
+TEST_F(DisplayListTest, DrawUnorderedRoundRectPathCW) {
+  auto renderer = [](DlCanvas& canvas, DlPaint& paint, SkRect& rect) {
+    SkPath path = SkPath()  //
+                      .addRoundRect(rect, 2.0f, 2.0f, SkPathDirection::kCW);
+    canvas.DrawPath(path, paint);
+  };
+  check_inverted_bounds(renderer, "DrawRoundRectPath Clockwise");
+}
+
+TEST_F(DisplayListTest, DrawUnorderedRoundRectPathCCW) {
+  auto renderer = [](DlCanvas& canvas, DlPaint& paint, SkRect& rect) {
+    SkPath path = SkPath()  //
+                      .addRoundRect(rect, 2.0f, 2.0f, SkPathDirection::kCCW);
+    canvas.DrawPath(path, paint);
+  };
+  check_inverted_bounds(renderer, "DrawRoundRectPath Counter-Clockwise");
+}
+
+TEST_F(DisplayListTest, NopOperationsOmittedFromRecords) {
+  auto run_tests = [](const std::string& name,
+                      void init(DisplayListBuilder & builder, DlPaint & paint),
+                      uint32_t expected_op_count = 0u) {
+    auto run_one_test =
+        [init](const std::string& name,
+               void build(DisplayListBuilder & builder, DlPaint & paint),
+               uint32_t expected_op_count = 0u) {
+          DisplayListBuilder builder;
+          DlPaint paint;
+          init(builder, paint);
+          build(builder, paint);
+          auto list = builder.Build();
+          if (list->op_count() != expected_op_count) {
+            FML_LOG(ERROR) << *list;
+          }
+          ASSERT_EQ(list->op_count(), expected_op_count) << name;
+          ASSERT_TRUE(list->bounds().isEmpty()) << name;
+        };
+    run_one_test(
+        name + " DrawColor",
+        [](DisplayListBuilder& builder, DlPaint& paint) {
+          builder.DrawColor(paint.getColor(), paint.getBlendMode());
+        },
+        expected_op_count);
+    run_one_test(
+        name + " DrawPaint",
+        [](DisplayListBuilder& builder, DlPaint& paint) {
+          builder.DrawPaint(paint);
+        },
+        expected_op_count);
+    run_one_test(
+        name + " DrawRect",
+        [](DisplayListBuilder& builder, DlPaint& paint) {
+          builder.DrawRect({10, 10, 20, 20}, paint);
+        },
+        expected_op_count);
+    run_one_test(
+        name + " Other Draw Ops",
+        [](DisplayListBuilder& builder, DlPaint& paint) {
+          builder.DrawLine({10, 10}, {20, 20}, paint);
+          builder.DrawOval({10, 10, 20, 20}, paint);
+          builder.DrawCircle({50, 50}, 20, paint);
+          builder.DrawRRect(SkRRect::MakeRectXY({10, 10, 20, 20}, 5, 5), paint);
+          builder.DrawDRRect(SkRRect::MakeRectXY({5, 5, 100, 100}, 5, 5),
+                             SkRRect::MakeRectXY({10, 10, 20, 20}, 5, 5),
+                             paint);
+          builder.DrawPath(kTestPath1, paint);
+          builder.DrawArc({10, 10, 20, 20}, 45, 90, true, paint);
+          SkPoint pts[] = {{10, 10}, {20, 20}};
+          builder.DrawPoints(PointMode::kLines, 2, pts, paint);
+          builder.DrawVertices(TestVertices1, DlBlendMode::kSrcOver, paint);
+          builder.DrawImage(TestImage1, {10, 10}, DlImageSampling::kLinear,
+                            &paint);
+          builder.DrawImageRect(TestImage1, SkRect{0.0f, 0.0f, 10.0f, 10.0f},
+                                SkRect{10.0f, 10.0f, 25.0f, 25.0f},
+                                DlImageSampling::kLinear, &paint);
+          builder.DrawImageNine(TestImage1, {10, 10, 20, 20},
+                                {10, 10, 100, 100}, DlFilterMode::kLinear,
+                                &paint);
+          SkRSXform xforms[] = {{1, 0, 10, 10}, {0, 1, 10, 10}};
+          SkRect rects[] = {{10, 10, 20, 20}, {10, 20, 30, 20}};
+          builder.DrawAtlas(TestImage1, xforms, rects, nullptr, 2,
+                            DlBlendMode::kSrcOver, DlImageSampling::kLinear,
+                            nullptr, &paint);
+          builder.DrawTextBlob(GetTestTextBlob(1), 10, 10, paint);
+
+          // Dst mode eliminates most rendering ops except for
+          // the following two, so we'll prune those manually...
+          if (paint.getBlendMode() != DlBlendMode::kDst) {
+            builder.DrawDisplayList(TestDisplayList1, paint.getOpacity());
+            builder.DrawShadow(kTestPath1, paint.getColor(), 1, true, 1);
+          }
+        },
+        expected_op_count);
+    run_one_test(
+        name + " SaveLayer",
+        [](DisplayListBuilder& builder, DlPaint& paint) {
+          builder.SaveLayer(nullptr, &paint, nullptr);
+          builder.DrawRect({10, 10, 20, 20}, DlPaint());
+          builder.Restore();
+        },
+        expected_op_count);
+    run_one_test(
+        name + " inside Save",
+        [](DisplayListBuilder& builder, DlPaint& paint) {
+          builder.Save();
+          builder.DrawRect({10, 10, 20, 20}, paint);
+          builder.Restore();
+        },
+        expected_op_count);
+  };
+  run_tests("transparent color",  //
+            [](DisplayListBuilder& builder, DlPaint& paint) {
+              paint.setColor(DlColor::kTransparent());
+            });
+  run_tests("0 alpha",  //
+            [](DisplayListBuilder& builder, DlPaint& paint) {
+              // The transparent test above already tested transparent
+              // black (all 0s), we set White color here so we can test
+              // the case of all 1s with a 0 alpha
+              paint.setColor(DlColor::kWhite());
+              paint.setAlpha(0);
+            });
+  run_tests("BlendMode::kDst",  //
+            [](DisplayListBuilder& builder, DlPaint& paint) {
+              paint.setBlendMode(DlBlendMode::kDst);
+            });
+  run_tests("Empty rect clip",  //
+            [](DisplayListBuilder& builder, DlPaint& paint) {
+              builder.ClipRect(SkRect::MakeEmpty(), ClipOp::kIntersect, false);
+            });
+  run_tests("Empty rrect clip",  //
+            [](DisplayListBuilder& builder, DlPaint& paint) {
+              builder.ClipRRect(SkRRect::MakeEmpty(), ClipOp::kIntersect,
+                                false);
+            });
+  run_tests("Empty path clip",  //
+            [](DisplayListBuilder& builder, DlPaint& paint) {
+              builder.ClipPath(SkPath(), ClipOp::kIntersect, false);
+            });
+  run_tests("Transparent SaveLayer",  //
+            [](DisplayListBuilder& builder, DlPaint& paint) {
+              DlPaint save_paint;
+              save_paint.setColor(DlColor::kTransparent());
+              builder.SaveLayer(nullptr, &save_paint);
+            });
+  run_tests("0 alpha SaveLayer",  //
+            [](DisplayListBuilder& builder, DlPaint& paint) {
+              DlPaint save_paint;
+              // The transparent test above already tested transparent
+              // black (all 0s), we set White color here so we can test
+              // the case of all 1s with a 0 alpha
+              save_paint.setColor(DlColor::kWhite());
+              save_paint.setAlpha(0);
+              builder.SaveLayer(nullptr, &save_paint);
+            });
+  run_tests("Dst blended SaveLayer",  //
+            [](DisplayListBuilder& builder, DlPaint& paint) {
+              DlPaint save_paint;
+              save_paint.setBlendMode(DlBlendMode::kDst);
+              builder.SaveLayer(nullptr, &save_paint);
+            });
+  run_tests(
+      "Nop inside SaveLayer",
+      [](DisplayListBuilder& builder, DlPaint& paint) {
+        builder.SaveLayer(nullptr, nullptr);
+        paint.setBlendMode(DlBlendMode::kDst);
+      },
+      2u);
+  run_tests("DrawImage inside Culled SaveLayer",  //
+            [](DisplayListBuilder& builder, DlPaint& paint) {
+              DlPaint save_paint;
+              save_paint.setColor(DlColor::kTransparent());
+              builder.SaveLayer(nullptr, &save_paint);
+              builder.DrawImage(TestImage1, {10, 10}, DlImageSampling::kLinear);
+            });
+}
+
+TEST_F(DisplayListTest, ImpellerPathPreferenceIsHonored) {
+  class Tester : virtual public DlOpReceiver,
+                 public IgnoreClipDispatchHelper,
+                 public IgnoreDrawDispatchHelper,
+                 public IgnoreAttributeDispatchHelper,
+                 public IgnoreTransformDispatchHelper {
+   public:
+    explicit Tester(bool prefer_impeller_paths)
+        : prefer_impeller_paths_(prefer_impeller_paths) {}
+
+    bool PrefersImpellerPaths() const override {
+      return prefer_impeller_paths_;
+    }
+
+    void drawPath(const SkPath& path) override { skia_draw_path_calls_++; }
+
+    void drawPath(const CacheablePath& cache) override {
+      impeller_draw_path_calls_++;
+    }
+
+    void clipPath(const SkPath& path, ClipOp op, bool is_aa) override {
+      skia_clip_path_calls_++;
+    }
+
+    void clipPath(const CacheablePath& cache, ClipOp op, bool is_aa) override {
+      impeller_clip_path_calls_++;
+    }
+
+    virtual void drawShadow(const SkPath& sk_path,
+                            const DlColor color,
+                            const SkScalar elevation,
+                            bool transparent_occluder,
+                            SkScalar dpr) override {
+      skia_draw_shadow_calls_++;
+    }
+
+    virtual void drawShadow(const CacheablePath& cache,
+                            const DlColor color,
+                            const SkScalar elevation,
+                            bool transparent_occluder,
+                            SkScalar dpr) override {
+      impeller_draw_shadow_calls_++;
+    }
+
+    int skia_draw_path_calls() const { return skia_draw_path_calls_; }
+    int skia_clip_path_calls() const { return skia_draw_path_calls_; }
+    int skia_draw_shadow_calls() const { return skia_draw_path_calls_; }
+    int impeller_draw_path_calls() const { return impeller_draw_path_calls_; }
+    int impeller_clip_path_calls() const { return impeller_draw_path_calls_; }
+    int impeller_draw_shadow_calls() const { return impeller_draw_path_calls_; }
+
+   private:
+    const bool prefer_impeller_paths_;
+    int skia_draw_path_calls_ = 0;
+    int skia_clip_path_calls_ = 0;
+    int skia_draw_shadow_calls_ = 0;
+    int impeller_draw_path_calls_ = 0;
+    int impeller_clip_path_calls_ = 0;
+    int impeller_draw_shadow_calls_ = 0;
+  };
+
+  DisplayListBuilder builder;
+  builder.DrawPath(SkPath::Rect(SkRect::MakeLTRB(0, 0, 100, 100)), DlPaint());
+  builder.ClipPath(SkPath::Rect(SkRect::MakeLTRB(0, 0, 100, 100)),
+                   ClipOp::kIntersect, true);
+  builder.DrawShadow(SkPath::Rect(SkRect::MakeLTRB(20, 20, 80, 80)),
+                     DlColor::kBlue(), 1.0f, true, 1.0f);
+  auto display_list = builder.Build();
+
+  {
+    Tester skia_tester(false);
+    display_list->Dispatch(skia_tester);
+    EXPECT_EQ(skia_tester.skia_draw_path_calls(), 1);
+    EXPECT_EQ(skia_tester.skia_clip_path_calls(), 1);
+    EXPECT_EQ(skia_tester.skia_draw_shadow_calls(), 1);
+    EXPECT_EQ(skia_tester.impeller_draw_path_calls(), 0);
+    EXPECT_EQ(skia_tester.impeller_clip_path_calls(), 0);
+    EXPECT_EQ(skia_tester.impeller_draw_shadow_calls(), 0);
+  }
+
+  {
+    Tester impeller_tester(true);
+    display_list->Dispatch(impeller_tester);
+    EXPECT_EQ(impeller_tester.skia_draw_path_calls(), 0);
+    EXPECT_EQ(impeller_tester.skia_clip_path_calls(), 0);
+    EXPECT_EQ(impeller_tester.skia_draw_shadow_calls(), 0);
+    EXPECT_EQ(impeller_tester.impeller_draw_path_calls(), 1);
+    EXPECT_EQ(impeller_tester.impeller_clip_path_calls(), 1);
+    EXPECT_EQ(impeller_tester.impeller_draw_shadow_calls(), 1);
+  }
+}
+
+class SaveLayerBoundsExpector : public virtual DlOpReceiver,
+                                public IgnoreAttributeDispatchHelper,
+                                public IgnoreClipDispatchHelper,
+                                public IgnoreTransformDispatchHelper,
+                                public IgnoreDrawDispatchHelper {
+ public:
+  explicit SaveLayerBoundsExpector() {}
+
+  SaveLayerBoundsExpector& addComputedExpectation(const SkRect& bounds) {
+    expected_.emplace_back(BoundsExpectation{
+        .bounds = bounds,
+        .options = SaveLayerOptions(),
+    });
+    return *this;
+  }
+
+  SaveLayerBoundsExpector& addSuppliedExpectation(const SkRect& bounds,
+                                                  bool clipped = false) {
+    SaveLayerOptions options;
+    options = options.with_bounds_from_caller();
+    if (clipped) {
+      options = options.with_content_is_clipped();
+    }
+    expected_.emplace_back(BoundsExpectation{
+        .bounds = bounds,
+        .options = options,
+    });
+    return *this;
+  }
+
+  void saveLayer(const SkRect& bounds,
+                 const SaveLayerOptions options,
+                 const DlImageFilter* backdrop) override {
+    ASSERT_LT(save_layer_count_, expected_.size());
+    auto expected = expected_[save_layer_count_];
+    EXPECT_EQ(options.bounds_from_caller(),
+              expected.options.bounds_from_caller())
+        << "expected bounds index " << save_layer_count_;
+    EXPECT_EQ(options.content_is_clipped(),
+              expected.options.content_is_clipped())
+        << "expected bounds index " << save_layer_count_;
+    if (!SkScalarNearlyEqual(bounds.fLeft, expected.bounds.fLeft) ||
+        !SkScalarNearlyEqual(bounds.fTop, expected.bounds.fTop) ||
+        !SkScalarNearlyEqual(bounds.fRight, expected.bounds.fRight) ||
+        !SkScalarNearlyEqual(bounds.fBottom, expected.bounds.fBottom)) {
+      EXPECT_EQ(bounds, expected.bounds)
+          << "expected bounds index " << save_layer_count_;
+    }
+    save_layer_count_++;
+  }
+
+  bool all_bounds_checked() const {
+    return save_layer_count_ == expected_.size();
+  }
+
+ private:
+  struct BoundsExpectation {
+    const SkRect bounds;
+    const SaveLayerOptions options;
+  };
+
+  std::vector<BoundsExpectation> expected_;
+  size_t save_layer_count_ = 0;
+};
+
+TEST_F(DisplayListTest, SaveLayerBoundsComputationOfSimpleRect) {
+  SkRect rect = SkRect::MakeLTRB(100.0f, 100.0f, 200.0f, 200.0f);
+
+  DisplayListBuilder builder;
+  builder.SaveLayer(nullptr, nullptr);
+  {  //
+    builder.DrawRect(rect, DlPaint());
+  }
+  builder.Restore();
+  auto display_list = builder.Build();
+
+  SaveLayerBoundsExpector expector;
+  expector.addComputedExpectation(rect);
+  display_list->Dispatch(expector);
+  EXPECT_TRUE(expector.all_bounds_checked());
+}
+
+TEST_F(DisplayListTest, SaveLayerBoundsComputationOfMaskBlurredRect) {
+  SkRect rect = SkRect::MakeLTRB(100.0f, 100.0f, 200.0f, 200.0f);
+  DlPaint draw_paint;
+  auto mask_filter = DlBlurMaskFilter::Make(DlBlurStyle::kNormal, 2.0f);
+  draw_paint.setMaskFilter(mask_filter);
+
+  DisplayListBuilder builder;
+  builder.SaveLayer(nullptr, nullptr);
+  {  //
+    builder.DrawRect(rect, draw_paint);
+  }
+  builder.Restore();
+  auto display_list = builder.Build();
+
+  SaveLayerBoundsExpector expector;
+  expector.addComputedExpectation(rect.makeOutset(6.0f, 6.0f));
+  display_list->Dispatch(expector);
+  EXPECT_TRUE(expector.all_bounds_checked());
+}
+
+TEST_F(DisplayListTest, SaveLayerBoundsComputationOfImageBlurredRect) {
+  SkRect rect = SkRect::MakeLTRB(100.0f, 100.0f, 200.0f, 200.0f);
+  DlPaint draw_paint;
+  auto image_filter = DlBlurImageFilter::Make(2.0f, 3.0f, DlTileMode::kDecal);
+  draw_paint.setImageFilter(image_filter);
+
+  DisplayListBuilder builder;
+  builder.SaveLayer(nullptr, nullptr);
+  {  //
+    builder.DrawRect(rect, draw_paint);
+  }
+  builder.Restore();
+  auto display_list = builder.Build();
+
+  SaveLayerBoundsExpector expector;
+  expector.addComputedExpectation(rect.makeOutset(6.0f, 9.0f));
+  display_list->Dispatch(expector);
+  EXPECT_TRUE(expector.all_bounds_checked());
+}
+
+TEST_F(DisplayListTest, SaveLayerBoundsComputationOfStrokedRect) {
+  SkRect rect = SkRect::MakeLTRB(100.0f, 100.0f, 200.0f, 200.0f);
+  DlPaint draw_paint;
+  draw_paint.setStrokeWidth(5.0f);
+  draw_paint.setDrawStyle(DlDrawStyle::kStroke);
+
+  DisplayListBuilder builder;
+  builder.SaveLayer(nullptr, nullptr);
+  {  //
+    builder.DrawRect(rect, draw_paint);
+  }
+  builder.Restore();
+  auto display_list = builder.Build();
+
+  SaveLayerBoundsExpector expector;
+  expector.addComputedExpectation(rect.makeOutset(2.5f, 2.5f));
+  display_list->Dispatch(expector);
+  EXPECT_TRUE(expector.all_bounds_checked());
+}
+
+TEST_F(DisplayListTest, TranslatedSaveLayerBoundsComputationOfSimpleRect) {
+  SkRect rect = SkRect::MakeLTRB(100.0f, 100.0f, 200.0f, 200.0f);
+
+  DisplayListBuilder builder;
+  builder.Translate(10.0f, 10.0f);
+  builder.SaveLayer(nullptr, nullptr);
+  {  //
+    builder.DrawRect(rect, DlPaint());
+  }
+  builder.Restore();
+  auto display_list = builder.Build();
+
+  SaveLayerBoundsExpector expector;
+  expector.addComputedExpectation(rect);
+  display_list->Dispatch(expector);
+  EXPECT_TRUE(expector.all_bounds_checked());
+}
+
+TEST_F(DisplayListTest, ScaledSaveLayerBoundsComputationOfSimpleRect) {
+  SkRect rect = SkRect::MakeLTRB(100.0f, 100.0f, 200.0f, 200.0f);
+
+  DisplayListBuilder builder;
+  builder.Scale(10.0f, 10.0f);
+  builder.SaveLayer(nullptr, nullptr);
+  {  //
+    builder.DrawRect(rect, DlPaint());
+  }
+  builder.Restore();
+  auto display_list = builder.Build();
+
+  SaveLayerBoundsExpector expector;
+  expector.addComputedExpectation(rect);
+  display_list->Dispatch(expector);
+  EXPECT_TRUE(expector.all_bounds_checked());
+}
+
+TEST_F(DisplayListTest, RotatedSaveLayerBoundsComputationOfSimpleRect) {
+  SkRect rect = SkRect::MakeLTRB(100.0f, 100.0f, 200.0f, 200.0f);
+
+  DisplayListBuilder builder;
+  builder.Rotate(45.0f);
+  builder.SaveLayer(nullptr, nullptr);
+  {  //
+    builder.DrawRect(rect, DlPaint());
+  }
+  builder.Restore();
+  auto display_list = builder.Build();
+
+  SaveLayerBoundsExpector expector;
+  expector.addComputedExpectation(rect);
+  display_list->Dispatch(expector);
+  EXPECT_TRUE(expector.all_bounds_checked());
+}
+
+TEST_F(DisplayListTest, TransformResetSaveLayerBoundsComputationOfSimpleRect) {
+  SkRect rect = SkRect::MakeLTRB(100.0f, 100.0f, 200.0f, 200.0f);
+  SkRect rect_doubled = SkMatrix::Scale(2.0f, 2.0f).mapRect(rect);
+
+  DisplayListBuilder builder;
+  builder.Scale(10.0f, 10.0f);
+  builder.SaveLayer(nullptr, nullptr);
+  builder.TransformReset();
+  builder.Scale(20.0f, 20.0f);
+  // Net local transform for saveLayer is Scale(2, 2)
+  {  //
+    builder.DrawRect(rect, DlPaint());
+  }
+  builder.Restore();
+  auto display_list = builder.Build();
+
+  SaveLayerBoundsExpector expector;
+  expector.addComputedExpectation(rect_doubled);
+  display_list->Dispatch(expector);
+  EXPECT_TRUE(expector.all_bounds_checked());
+}
+
+TEST_F(DisplayListTest, SaveLayerBoundsComputationOfTranslatedSimpleRect) {
+  SkRect rect = SkRect::MakeLTRB(100.0f, 100.0f, 200.0f, 200.0f);
+
+  DisplayListBuilder builder;
+  builder.SaveLayer(nullptr, nullptr);
+  {  //
+    builder.Translate(10.0f, 10.0f);
+    builder.DrawRect(rect, DlPaint());
+  }
+  builder.Restore();
+  auto display_list = builder.Build();
+
+  SaveLayerBoundsExpector expector;
+  expector.addComputedExpectation(rect.makeOffset(10.0f, 10.0f));
+  display_list->Dispatch(expector);
+  EXPECT_TRUE(expector.all_bounds_checked());
+}
+
+TEST_F(DisplayListTest, SaveLayerBoundsComputationOfScaledSimpleRect) {
+  SkRect rect = SkRect::MakeLTRB(100.0f, 100.0f, 200.0f, 200.0f);
+
+  DisplayListBuilder builder;
+  builder.SaveLayer(nullptr, nullptr);
+  {  //
+    builder.Scale(10.0f, 10.0f);
+    builder.DrawRect(rect, DlPaint());
+  }
+  builder.Restore();
+  auto display_list = builder.Build();
+
+  SaveLayerBoundsExpector expector;
+  expector.addComputedExpectation(
+      SkRect::MakeLTRB(1000.0f, 1000.0f, 2000.0f, 2000.0f));
+  display_list->Dispatch(expector);
+  EXPECT_TRUE(expector.all_bounds_checked());
+}
+
+TEST_F(DisplayListTest, SaveLayerBoundsComputationOfRotatedSimpleRect) {
+  SkRect rect = SkRect::MakeLTRB(100.0f, 100.0f, 200.0f, 200.0f);
+
+  DisplayListBuilder builder;
+  builder.SaveLayer(nullptr, nullptr);
+  {  //
+    builder.Rotate(45.0f);
+    builder.DrawRect(rect, DlPaint());
+  }
+  builder.Restore();
+  auto display_list = builder.Build();
+
+  SkMatrix matrix = SkMatrix::RotateDeg(45.0f);
+  SaveLayerBoundsExpector expector;
+  expector.addComputedExpectation(matrix.mapRect(rect));
+  display_list->Dispatch(expector);
+  EXPECT_TRUE(expector.all_bounds_checked());
+}
+
+TEST_F(DisplayListTest, SaveLayerBoundsComputationOfNestedSimpleRect) {
+  SkRect rect = SkRect::MakeLTRB(100.0f, 100.0f, 200.0f, 200.0f);
+
+  DisplayListBuilder builder;
+  builder.SaveLayer(nullptr, nullptr);
+  {  //
+    builder.SaveLayer(nullptr, nullptr);
+    {  //
+      builder.DrawRect(rect, DlPaint());
+    }
+    builder.Restore();
+  }
+  builder.Restore();
+  auto display_list = builder.Build();
+
+  SaveLayerBoundsExpector expector;
+  expector.addComputedExpectation(rect);
+  expector.addComputedExpectation(rect);
+  display_list->Dispatch(expector);
+  EXPECT_TRUE(expector.all_bounds_checked());
+}
+
+TEST_F(DisplayListTest, FloodingSaveLayerBoundsComputationOfSimpleRect) {
+  SkRect rect = SkRect::MakeLTRB(100.0f, 100.0f, 200.0f, 200.0f);
+  DlPaint save_paint;
+  auto color_filter =
+      DlBlendColorFilter::Make(DlColor::kRed(), DlBlendMode::kSrc);
+  ASSERT_TRUE(color_filter->modifies_transparent_black());
+  save_paint.setColorFilter(color_filter);
+  SkRect clip_rect = rect.makeOutset(100.0f, 100.0f);
+  ASSERT_NE(clip_rect, rect);
+  ASSERT_TRUE(clip_rect.contains(rect));
+
+  DisplayListBuilder builder;
+  builder.ClipRect(clip_rect);
+  builder.SaveLayer(nullptr, &save_paint);
+  {  //
+    builder.DrawRect(rect, DlPaint());
+  }
+  builder.Restore();
+  auto display_list = builder.Build();
+
+  SaveLayerBoundsExpector expector;
+  expector.addComputedExpectation(rect);
+  display_list->Dispatch(expector);
+  EXPECT_TRUE(expector.all_bounds_checked());
+}
+
+TEST_F(DisplayListTest, NestedFloodingSaveLayerBoundsComputationOfSimpleRect) {
+  SkRect rect = SkRect::MakeLTRB(100.0f, 100.0f, 200.0f, 200.0f);
+  DlPaint save_paint;
+  auto color_filter =
+      DlBlendColorFilter::Make(DlColor::kRed(), DlBlendMode::kSrc);
+  ASSERT_TRUE(color_filter->modifies_transparent_black());
+  save_paint.setColorFilter(color_filter);
+  SkRect clip_rect = rect.makeOutset(100.0f, 100.0f);
+  ASSERT_NE(clip_rect, rect);
+  ASSERT_TRUE(clip_rect.contains(rect));
+
+  DisplayListBuilder builder;
+  builder.ClipRect(clip_rect);
+  builder.SaveLayer(nullptr, nullptr);
+  {
+    builder.SaveLayer(nullptr, &save_paint);
+    {  //
+      builder.DrawRect(rect, DlPaint());
+    }
+    builder.Restore();
+  }
+  builder.Restore();
+  auto display_list = builder.Build();
+
+  SaveLayerBoundsExpector expector;
+  expector.addComputedExpectation(clip_rect);
+  expector.addComputedExpectation(rect);
+  display_list->Dispatch(expector);
+  EXPECT_TRUE(expector.all_bounds_checked());
+}
+
+TEST_F(DisplayListTest, SaveLayerBoundsComputationOfFloodingImageFilter) {
+  SkRect rect = SkRect::MakeLTRB(100.0f, 100.0f, 200.0f, 200.0f);
+  DlPaint draw_paint;
+  auto color_filter =
+      DlBlendColorFilter::Make(DlColor::kRed(), DlBlendMode::kSrc);
+  ASSERT_TRUE(color_filter->modifies_transparent_black());
+  auto image_filter = DlColorFilterImageFilter::Make(color_filter);
+  draw_paint.setImageFilter(image_filter);
+  SkRect clip_rect = rect.makeOutset(100.0f, 100.0f);
+  ASSERT_NE(clip_rect, rect);
+  ASSERT_TRUE(clip_rect.contains(rect));
+
+  DisplayListBuilder builder;
+  builder.ClipRect(clip_rect);
+  builder.SaveLayer(nullptr, nullptr);
+  {  //
+    builder.DrawRect(rect, draw_paint);
+  }
+  builder.Restore();
+  auto display_list = builder.Build();
+
+  SaveLayerBoundsExpector expector;
+  expector.addComputedExpectation(clip_rect);
+  display_list->Dispatch(expector);
+  EXPECT_TRUE(expector.all_bounds_checked());
+}
+
+TEST_F(DisplayListTest, SaveLayerBoundsComputationOfFloodingColorFilter) {
+  SkRect rect = SkRect::MakeLTRB(100.0f, 100.0f, 200.0f, 200.0f);
+  DlPaint draw_paint;
+  auto color_filter =
+      DlBlendColorFilter::Make(DlColor::kRed(), DlBlendMode::kSrc);
+  ASSERT_TRUE(color_filter->modifies_transparent_black());
+  draw_paint.setColorFilter(color_filter);
+  SkRect clip_rect = rect.makeOutset(100.0f, 100.0f);
+  ASSERT_NE(clip_rect, rect);
+  ASSERT_TRUE(clip_rect.contains(rect));
+
+  DisplayListBuilder builder;
+  builder.ClipRect(clip_rect);
+  builder.SaveLayer(nullptr, nullptr);
+  {  //
+    builder.DrawRect(rect, draw_paint);
+  }
+  builder.Restore();
+  auto display_list = builder.Build();
+
+  // A color filter is implicitly clipped to the draw bounds so the layer
+  // bounds will be the same as the draw bounds.
+  SaveLayerBoundsExpector expector;
+  expector.addComputedExpectation(rect);
+  display_list->Dispatch(expector);
+  EXPECT_TRUE(expector.all_bounds_checked());
+}
+
+TEST_F(DisplayListTest, SaveLayerBoundsClipDetectionSimpleUnclippedRect) {
+  SkRect rect = SkRect::MakeLTRB(100.0f, 100.0f, 200.0f, 200.0f);
+  SkRect save_rect = SkRect::MakeLTRB(50.0f, 50.0f, 250.0f, 250.0f);
+
+  DisplayListBuilder builder;
+  builder.SaveLayer(&save_rect, nullptr);
+  {  //
+    builder.DrawRect(rect, DlPaint());
+  }
+  builder.Restore();
+  auto display_list = builder.Build();
+
+  // A color filter is implicitly clipped to the draw bounds so the layer
+  // bounds will be the same as the draw bounds.
+  SaveLayerBoundsExpector expector;
+  expector.addSuppliedExpectation(rect);
+  display_list->Dispatch(expector);
+  EXPECT_TRUE(expector.all_bounds_checked());
+}
+
+TEST_F(DisplayListTest, SaveLayerBoundsClipDetectionSimpleClippedRect) {
+  SkRect rect = SkRect::MakeLTRB(100.0f, 100.0f, 200.0f, 200.0f);
+  SkRect save_rect = SkRect::MakeLTRB(50.0f, 50.0f, 110.0f, 110.0f);
+  SkRect content_rect = SkRect::MakeLTRB(100.0f, 100.0f, 110.0f, 110.0f);
+
+  DisplayListBuilder builder;
+  builder.SaveLayer(&save_rect, nullptr);
+  {  //
+    builder.DrawRect(rect, DlPaint());
+  }
+  builder.Restore();
+  auto display_list = builder.Build();
+
+  // A color filter is implicitly clipped to the draw bounds so the layer
+  // bounds will be the same as the draw bounds.
+  SaveLayerBoundsExpector expector;
+  expector.addSuppliedExpectation(content_rect, true);
+  display_list->Dispatch(expector);
+  EXPECT_TRUE(expector.all_bounds_checked());
+}
+
 }  // namespace testing
 }  // namespace flutter
diff --git a/display_list/display_list_utils.cc b/display_list/display_list_utils.cc
deleted file mode 100644
index ff8ddd534dca5b08981a6e5321931d374bed24b4..0000000000000000000000000000000000000000
--- a/display_list/display_list_utils.cc
+++ /dev/null
@@ -1,873 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "flutter/display_list/display_list_utils.h"
-
-#include <math.h>
-#include <optional>
-#include <type_traits>
-
-#include "flutter/display_list/display_list_blend_mode.h"
-#include "flutter/display_list/display_list_canvas_dispatcher.h"
-#include "flutter/fml/logging.h"
-#include "third_party/skia/include/core/SkMaskFilter.h"
-#include "third_party/skia/include/core/SkPath.h"
-#include "third_party/skia/include/core/SkRSXform.h"
-#include "third_party/skia/include/core/SkTextBlob.h"
-#include "third_party/skia/include/utils/SkShadowUtils.h"
-
-namespace flutter {
-
-// clang-format off
-constexpr float kInvertColorMatrix[20] = {
-  -1.0,    0,    0, 1.0, 0,
-     0, -1.0,    0, 1.0, 0,
-     0,    0, -1.0, 1.0, 0,
-   1.0,  1.0,  1.0, 1.0, 0
-};
-// clang-format on
-
-void SkPaintDispatchHelper::save_opacity(SkScalar child_opacity) {
-  save_stack_.emplace_back(opacity_);
-  set_opacity(child_opacity);
-}
-void SkPaintDispatchHelper::restore_opacity() {
-  if (save_stack_.empty()) {
-    return;
-  }
-  set_opacity(save_stack_.back().opacity);
-  save_stack_.pop_back();
-}
-
-void SkPaintDispatchHelper::setAntiAlias(bool aa) {
-  paint_.setAntiAlias(aa);
-}
-void SkPaintDispatchHelper::setDither(bool dither) {
-  paint_.setDither(dither);
-}
-void SkPaintDispatchHelper::setInvertColors(bool invert) {
-  invert_colors_ = invert;
-  paint_.setColorFilter(makeColorFilter());
-}
-void SkPaintDispatchHelper::setStrokeCap(DlStrokeCap cap) {
-  paint_.setStrokeCap(ToSk(cap));
-}
-void SkPaintDispatchHelper::setStrokeJoin(DlStrokeJoin join) {
-  paint_.setStrokeJoin(ToSk(join));
-}
-void SkPaintDispatchHelper::setStyle(DlDrawStyle style) {
-  paint_.setStyle(ToSk(style));
-}
-void SkPaintDispatchHelper::setStrokeWidth(SkScalar width) {
-  paint_.setStrokeWidth(width);
-}
-void SkPaintDispatchHelper::setStrokeMiter(SkScalar limit) {
-  paint_.setStrokeMiter(limit);
-}
-void SkPaintDispatchHelper::setColor(DlColor color) {
-  current_color_ = color;
-  paint_.setColor(color);
-  if (has_opacity()) {
-    paint_.setAlphaf(paint_.getAlphaf() * opacity());
-  }
-}
-void SkPaintDispatchHelper::setBlendMode(DlBlendMode mode) {
-  paint_.setBlendMode(ToSk(mode));
-}
-void SkPaintDispatchHelper::setBlender(sk_sp<SkBlender> blender) {
-  paint_.setBlender(blender);
-}
-void SkPaintDispatchHelper::setColorSource(const DlColorSource* source) {
-  paint_.setShader(source ? source->skia_object() : nullptr);
-}
-void SkPaintDispatchHelper::setImageFilter(const DlImageFilter* filter) {
-  paint_.setImageFilter(filter ? filter->skia_object() : nullptr);
-}
-void SkPaintDispatchHelper::setColorFilter(const DlColorFilter* filter) {
-  color_filter_ = filter ? filter->shared() : nullptr;
-  paint_.setColorFilter(makeColorFilter());
-}
-void SkPaintDispatchHelper::setPathEffect(const DlPathEffect* effect) {
-  paint_.setPathEffect(effect ? effect->skia_object() : nullptr);
-}
-void SkPaintDispatchHelper::setMaskFilter(const DlMaskFilter* filter) {
-  paint_.setMaskFilter(filter ? filter->skia_object() : nullptr);
-}
-
-sk_sp<SkColorFilter> SkPaintDispatchHelper::makeColorFilter() const {
-  if (!invert_colors_) {
-    return color_filter_ ? color_filter_->skia_object() : nullptr;
-  }
-  sk_sp<SkColorFilter> invert_filter =
-      SkColorFilters::Matrix(kInvertColorMatrix);
-  if (color_filter_) {
-    invert_filter = invert_filter->makeComposed(color_filter_->skia_object());
-  }
-  return invert_filter;
-}
-
-void SkMatrixDispatchHelper::translate(SkScalar tx, SkScalar ty) {
-  matrix_.preTranslate(tx, ty);
-  matrix33_ = matrix_.asM33();
-}
-void SkMatrixDispatchHelper::scale(SkScalar sx, SkScalar sy) {
-  matrix_.preScale(sx, sy);
-  matrix33_ = matrix_.asM33();
-}
-void SkMatrixDispatchHelper::rotate(SkScalar degrees) {
-  matrix33_.setRotate(degrees);
-  matrix_.preConcat(matrix33_);
-  matrix33_ = matrix_.asM33();
-}
-void SkMatrixDispatchHelper::skew(SkScalar sx, SkScalar sy) {
-  matrix33_.setSkew(sx, sy);
-  matrix_.preConcat(matrix33_);
-  matrix33_ = matrix_.asM33();
-}
-
-// clang-format off
-
-// 2x3 2D affine subset of a 4x4 transform in row major order
-void SkMatrixDispatchHelper::transform2DAffine(
-    SkScalar mxx, SkScalar mxy, SkScalar mxt,
-    SkScalar myx, SkScalar myy, SkScalar myt) {
-  matrix_.preConcat({
-      mxx, mxy,  0 , mxt,
-      myx, myy,  0 , myt,
-       0 ,  0 ,  1 ,  0 ,
-       0 ,  0 ,  0 ,  1 ,
-  });
-  matrix33_ = matrix_.asM33();
-}
-// full 4x4 transform in row major order
-void SkMatrixDispatchHelper::transformFullPerspective(
-    SkScalar mxx, SkScalar mxy, SkScalar mxz, SkScalar mxt,
-    SkScalar myx, SkScalar myy, SkScalar myz, SkScalar myt,
-    SkScalar mzx, SkScalar mzy, SkScalar mzz, SkScalar mzt,
-    SkScalar mwx, SkScalar mwy, SkScalar mwz, SkScalar mwt) {
-  matrix_.preConcat({
-      mxx, mxy, mxz, mxt,
-      myx, myy, myz, myt,
-      mzx, mzy, mzz, mzt,
-      mwx, mwy, mwz, mwt,
-  });
-  matrix33_ = matrix_.asM33();
-}
-
-// clang-format on
-
-void SkMatrixDispatchHelper::transformReset() {
-  matrix_ = {};
-  matrix33_ = {};
-}
-
-void SkMatrixDispatchHelper::save() {
-  saved_.push_back(matrix_);
-}
-void SkMatrixDispatchHelper::restore() {
-  if (saved_.empty()) {
-    return;
-  }
-  matrix_ = saved_.back();
-  matrix33_ = matrix_.asM33();
-  saved_.pop_back();
-}
-void SkMatrixDispatchHelper::reset() {
-  matrix_.setIdentity();
-  matrix33_ = matrix_.asM33();
-}
-
-void ClipBoundsDispatchHelper::clipRect(const SkRect& rect,
-                                        SkClipOp clip_op,
-                                        bool is_aa) {
-  switch (clip_op) {
-    case SkClipOp::kIntersect:
-      intersect(rect, is_aa);
-      break;
-    case SkClipOp::kDifference:
-      break;
-  }
-}
-void ClipBoundsDispatchHelper::clipRRect(const SkRRect& rrect,
-                                         SkClipOp clip_op,
-                                         bool is_aa) {
-  switch (clip_op) {
-    case SkClipOp::kIntersect:
-      intersect(rrect.getBounds(), is_aa);
-      break;
-    case SkClipOp::kDifference:
-      break;
-  }
-}
-void ClipBoundsDispatchHelper::clipPath(const SkPath& path,
-                                        SkClipOp clip_op,
-                                        bool is_aa) {
-  switch (clip_op) {
-    case SkClipOp::kIntersect:
-      intersect(path.getBounds(), is_aa);
-      break;
-    case SkClipOp::kDifference:
-      break;
-  }
-}
-void ClipBoundsDispatchHelper::intersect(const SkRect& rect, bool is_aa) {
-  SkRect dev_clip_bounds = matrix().mapRect(rect);
-  if (is_aa) {
-    dev_clip_bounds.roundOut(&dev_clip_bounds);
-  }
-  if (has_clip_) {
-    if (!bounds_.intersect(dev_clip_bounds)) {
-      bounds_.setEmpty();
-    }
-  } else {
-    has_clip_ = true;
-    if (dev_clip_bounds.isEmpty()) {
-      bounds_.setEmpty();
-    } else {
-      bounds_ = dev_clip_bounds;
-    }
-  }
-}
-void ClipBoundsDispatchHelper::save() {
-  if (!has_clip_) {
-    saved_.push_back(SkRect::MakeLTRB(0, 0, -1, -1));
-  } else if (bounds_.isEmpty()) {
-    saved_.push_back(SkRect::MakeEmpty());
-  } else {
-    saved_.push_back(bounds_);
-  }
-}
-void ClipBoundsDispatchHelper::restore() {
-  if (saved_.empty()) {
-    return;
-  }
-  bounds_ = saved_.back();
-  saved_.pop_back();
-  has_clip_ = (bounds_.fLeft <= bounds_.fRight &&  //
-               bounds_.fTop <= bounds_.fBottom);
-  if (!has_clip_) {
-    bounds_.setEmpty();
-  }
-}
-void ClipBoundsDispatchHelper::reset(const SkRect* cull_rect) {
-  if ((has_clip_ = cull_rect != nullptr) && !cull_rect->isEmpty()) {
-    bounds_ = *cull_rect;
-  } else {
-    bounds_.setEmpty();
-  }
-}
-
-void RectBoundsAccumulator::accumulate(const SkRect& r) {
-  if (r.fLeft < r.fRight && r.fTop < r.fBottom) {
-    rect_.accumulate(r.fLeft, r.fTop);
-    rect_.accumulate(r.fRight, r.fBottom);
-  }
-}
-
-void RectBoundsAccumulator::save() {
-  saved_rects_.emplace_back(rect_);
-  rect_ = AccumulationRect();
-}
-void RectBoundsAccumulator::restore() {
-  if (!saved_rects_.empty()) {
-    SkRect layer_bounds = rect_.bounds();
-    pop_and_accumulate(layer_bounds, nullptr);
-  }
-}
-bool RectBoundsAccumulator::restore(
-    std::function<bool(const SkRect&, SkRect&)> mapper,
-    const SkRect* clip) {
-  bool success = true;
-  if (!saved_rects_.empty()) {
-    SkRect layer_bounds = rect_.bounds();
-    success = mapper(layer_bounds, layer_bounds);
-    pop_and_accumulate(layer_bounds, clip);
-  }
-  return success;
-}
-void RectBoundsAccumulator::pop_and_accumulate(SkRect& layer_bounds,
-                                               const SkRect* clip) {
-  FML_DCHECK(!saved_rects_.empty());
-
-  rect_ = saved_rects_.back();
-  saved_rects_.pop_back();
-
-  if (clip == nullptr || layer_bounds.intersect(*clip)) {
-    accumulate(layer_bounds);
-  }
-}
-
-RectBoundsAccumulator::AccumulationRect::AccumulationRect() {
-  min_x_ = std::numeric_limits<SkScalar>::infinity();
-  min_y_ = std::numeric_limits<SkScalar>::infinity();
-  max_x_ = -std::numeric_limits<SkScalar>::infinity();
-  max_y_ = -std::numeric_limits<SkScalar>::infinity();
-}
-void RectBoundsAccumulator::AccumulationRect::accumulate(SkScalar x,
-                                                         SkScalar y) {
-  if (min_x_ > x) {
-    min_x_ = x;
-  }
-  if (min_y_ > y) {
-    min_y_ = y;
-  }
-  if (max_x_ < x) {
-    max_x_ = x;
-  }
-  if (max_y_ < y) {
-    max_y_ = y;
-  }
-}
-SkRect RectBoundsAccumulator::AccumulationRect::bounds() const {
-  return (max_x_ >= min_x_ && max_y_ >= min_y_)
-             ? SkRect::MakeLTRB(min_x_, min_y_, max_x_, max_y_)
-             : SkRect::MakeEmpty();
-}
-
-void RTreeBoundsAccumulator::accumulate(const SkRect& r) {
-  if (r.fLeft < r.fRight && r.fTop < r.fBottom) {
-    rects_.push_back(r);
-  }
-}
-bool RTreeBoundsAccumulator::is_empty() const {
-  return rects_.empty();
-}
-bool RTreeBoundsAccumulator::is_not_empty() const {
-  return !rects_.empty();
-}
-void RTreeBoundsAccumulator::save() {
-  saved_offsets_.push_back(rects_.size());
-}
-void RTreeBoundsAccumulator::restore() {
-  if (saved_offsets_.empty()) {
-    return;
-  }
-
-  saved_offsets_.pop_back();
-}
-bool RTreeBoundsAccumulator::restore(
-    std::function<bool(const SkRect& original, SkRect& modified)> map,
-    const SkRect* clip) {
-  if (saved_offsets_.empty()) {
-    return true;
-  }
-
-  size_t previous_size = saved_offsets_.back();
-  saved_offsets_.pop_back();
-
-  bool success = true;
-  for (size_t i = previous_size; i < rects_.size(); i++) {
-    SkRect original = rects_[i];
-    if (!map(original, original)) {
-      success = false;
-    }
-    if (clip == nullptr || original.intersect(*clip)) {
-      rects_[previous_size++] = original;
-    }
-  }
-  rects_.resize(previous_size);
-  return success;
-}
-sk_sp<DlRTree> RTreeBoundsAccumulator::rtree() const {
-  FML_DCHECK(saved_offsets_.empty());
-  DlRTreeFactory factory;
-  sk_sp<DlRTree> rtree = factory.getInstance();
-  rtree->insert(rects_.data(), rects_.size());
-  return rtree;
-}
-
-DisplayListBoundsCalculator::DisplayListBoundsCalculator(
-    BoundsAccumulator& accumulator,
-    const SkRect* cull_rect)
-    : ClipBoundsDispatchHelper(cull_rect), accumulator_(accumulator) {
-  layer_infos_.emplace_back(std::make_unique<LayerData>(nullptr));
-}
-void DisplayListBoundsCalculator::setStrokeCap(DlStrokeCap cap) {
-  cap_is_square_ = (cap == DlStrokeCap::kSquare);
-}
-void DisplayListBoundsCalculator::setStrokeJoin(DlStrokeJoin join) {
-  join_is_miter_ = (join == DlStrokeJoin::kMiter);
-}
-void DisplayListBoundsCalculator::setStyle(DlDrawStyle style) {
-  style_ = style;
-}
-void DisplayListBoundsCalculator::setStrokeWidth(SkScalar width) {
-  half_stroke_width_ = std::max(width * 0.5f, kMinStrokeWidth);
-}
-void DisplayListBoundsCalculator::setStrokeMiter(SkScalar limit) {
-  miter_limit_ = std::max(limit, 1.0f);
-}
-void DisplayListBoundsCalculator::setBlendMode(DlBlendMode mode) {
-  blend_mode_ = mode;
-}
-void DisplayListBoundsCalculator::setBlender(sk_sp<SkBlender> blender) {
-  SkPaint paint;
-  paint.setBlender(std::move(blender));
-  auto blend_mode = paint.asBlendMode();
-  if (blend_mode.has_value()) {
-    blend_mode_ = ToDl(blend_mode.value());
-  } else {
-    blend_mode_ = std::nullopt;
-  }
-}
-void DisplayListBoundsCalculator::setImageFilter(const DlImageFilter* filter) {
-  image_filter_ = filter ? filter->shared() : nullptr;
-}
-void DisplayListBoundsCalculator::setColorFilter(const DlColorFilter* filter) {
-  color_filter_ = filter ? filter->shared() : nullptr;
-}
-void DisplayListBoundsCalculator::setPathEffect(const DlPathEffect* effect) {
-  path_effect_ = effect ? effect->shared() : nullptr;
-}
-void DisplayListBoundsCalculator::setMaskFilter(const DlMaskFilter* filter) {
-  mask_filter_ = filter ? filter->shared() : nullptr;
-}
-void DisplayListBoundsCalculator::save() {
-  SkMatrixDispatchHelper::save();
-  ClipBoundsDispatchHelper::save();
-  layer_infos_.emplace_back(std::make_unique<LayerData>(nullptr));
-  accumulator_.save();
-}
-void DisplayListBoundsCalculator::saveLayer(const SkRect* bounds,
-                                            const SaveLayerOptions options,
-                                            const DlImageFilter* backdrop) {
-  SkMatrixDispatchHelper::save();
-  ClipBoundsDispatchHelper::save();
-  if (options.renders_with_attributes()) {
-    // The actual flood of the outer layer clip will occur after the
-    // (eventual) corresponding restore is called, but rather than
-    // remember this information in the LayerInfo until the restore
-    // method is processed, we just mark the unbounded state up front.
-    if (!paint_nops_on_transparency()) {
-      // We will fill the clip of the outer layer when we restore
-      AccumulateUnbounded();
-    }
-
-    layer_infos_.emplace_back(std::make_unique<LayerData>(image_filter_));
-  } else {
-    layer_infos_.emplace_back(std::make_unique<LayerData>(nullptr));
-  }
-
-  accumulator_.save();
-
-  // Even though Skia claims that the bounds are only a hint, they actually
-  // use them as the temporary layer bounds during rendering the layer, so
-  // we set them as if a clip operation were performed.
-  if (bounds) {
-    clipRect(*bounds, SkClipOp::kIntersect, false);
-  }
-  if (backdrop) {
-    // A backdrop will affect up to the entire surface, bounded by the clip
-    AccumulateUnbounded();
-  }
-}
-void DisplayListBoundsCalculator::restore() {
-  if (layer_infos_.size() > 1) {
-    SkMatrixDispatchHelper::restore();
-    ClipBoundsDispatchHelper::restore();
-
-    // Remember a few pieces of information from the current layer info
-    // for later processing.
-    LayerData* layer_info = layer_infos_.back().get();
-    bool is_unbounded = layer_info->is_unbounded();
-
-    // Before we pop_back we will get the current layer bounds from the
-    // current accumulator and adjust ot as required based on the filter.
-    std::shared_ptr<DlImageFilter> filter = layer_info->filter();
-    const SkRect* clip = has_clip() ? &clip_bounds() : nullptr;
-    if (filter) {
-      if (!accumulator_.restore(
-              [filter = filter, matrix = matrix()](const SkRect& input,
-                                                   SkRect& output) {
-                SkIRect output_bounds;
-                bool ret = filter->map_device_bounds(input.roundOut(), matrix,
-                                                     output_bounds);
-                output.set(output_bounds);
-                return ret;
-              },
-              clip)) {
-        is_unbounded = true;
-      }
-    } else {
-      accumulator_.restore();
-    }
-
-    // Restore the accumulator before popping the LayerInfo so that
-    // it nevers points to an out of scope instance.
-    layer_infos_.pop_back();
-
-    if (is_unbounded) {
-      AccumulateUnbounded();
-    }
-  }
-}
-
-void DisplayListBoundsCalculator::drawPaint() {
-  AccumulateUnbounded();
-}
-void DisplayListBoundsCalculator::drawColor(DlColor color, DlBlendMode mode) {
-  AccumulateUnbounded();
-}
-void DisplayListBoundsCalculator::drawLine(const SkPoint& p0,
-                                           const SkPoint& p1) {
-  SkRect bounds = SkRect::MakeLTRB(p0.fX, p0.fY, p1.fX, p1.fY).makeSorted();
-  DisplayListAttributeFlags flags =
-      (bounds.width() > 0.0f && bounds.height() > 0.0f) ? kDrawLineFlags
-                                                        : kDrawHVLineFlags;
-  AccumulateOpBounds(bounds, flags);
-}
-void DisplayListBoundsCalculator::drawRect(const SkRect& rect) {
-  AccumulateOpBounds(rect, kDrawRectFlags);
-}
-void DisplayListBoundsCalculator::drawOval(const SkRect& bounds) {
-  AccumulateOpBounds(bounds, kDrawOvalFlags);
-}
-void DisplayListBoundsCalculator::drawCircle(const SkPoint& center,
-                                             SkScalar radius) {
-  AccumulateOpBounds(SkRect::MakeLTRB(center.fX - radius, center.fY - radius,
-                                      center.fX + radius, center.fY + radius),
-                     kDrawCircleFlags);
-}
-void DisplayListBoundsCalculator::drawRRect(const SkRRect& rrect) {
-  AccumulateOpBounds(rrect.getBounds(), kDrawRRectFlags);
-}
-void DisplayListBoundsCalculator::drawDRRect(const SkRRect& outer,
-                                             const SkRRect& inner) {
-  AccumulateOpBounds(outer.getBounds(), kDrawDRRectFlags);
-}
-void DisplayListBoundsCalculator::drawPath(const SkPath& path) {
-  if (path.isInverseFillType()) {
-    AccumulateUnbounded();
-  } else {
-    AccumulateOpBounds(path.getBounds(), kDrawPathFlags);
-  }
-}
-void DisplayListBoundsCalculator::drawArc(const SkRect& bounds,
-                                          SkScalar start,
-                                          SkScalar sweep,
-                                          bool useCenter) {
-  // This could be tighter if we compute where the start and end
-  // angles are and then also consider the quadrants swept and
-  // the center if specified.
-  AccumulateOpBounds(bounds,
-                     useCenter  //
-                         ? kDrawArcWithCenterFlags
-                         : kDrawArcNoCenterFlags);
-}
-void DisplayListBoundsCalculator::drawPoints(SkCanvas::PointMode mode,
-                                             uint32_t count,
-                                             const SkPoint pts[]) {
-  if (count > 0) {
-    RectBoundsAccumulator pt_bounds;
-    for (size_t i = 0; i < count; i++) {
-      pt_bounds.accumulate(pts[i]);
-    }
-    SkRect point_bounds = pt_bounds.bounds();
-    switch (mode) {
-      case SkCanvas::kPoints_PointMode:
-        AccumulateOpBounds(point_bounds, kDrawPointsAsPointsFlags);
-        break;
-      case SkCanvas::kLines_PointMode:
-        AccumulateOpBounds(point_bounds, kDrawPointsAsLinesFlags);
-        break;
-      case SkCanvas::kPolygon_PointMode:
-        AccumulateOpBounds(point_bounds, kDrawPointsAsPolygonFlags);
-        break;
-    }
-  }
-}
-void DisplayListBoundsCalculator::drawSkVertices(
-    const sk_sp<SkVertices> vertices,
-    SkBlendMode mode) {
-  AccumulateOpBounds(vertices->bounds(), kDrawVerticesFlags);
-}
-void DisplayListBoundsCalculator::drawVertices(const DlVertices* vertices,
-                                               DlBlendMode mode) {
-  AccumulateOpBounds(vertices->bounds(), kDrawVerticesFlags);
-}
-void DisplayListBoundsCalculator::drawImage(const sk_sp<DlImage> image,
-                                            const SkPoint point,
-                                            DlImageSampling sampling,
-                                            bool render_with_attributes) {
-  SkRect bounds = SkRect::MakeXYWH(point.fX, point.fY,  //
-                                   image->width(), image->height());
-  DisplayListAttributeFlags flags = render_with_attributes  //
-                                        ? kDrawImageWithPaintFlags
-                                        : kDrawImageFlags;
-  AccumulateOpBounds(bounds, flags);
-}
-void DisplayListBoundsCalculator::drawImageRect(
-    const sk_sp<DlImage> image,
-    const SkRect& src,
-    const SkRect& dst,
-    DlImageSampling sampling,
-    bool render_with_attributes,
-    SkCanvas::SrcRectConstraint constraint) {
-  DisplayListAttributeFlags flags = render_with_attributes
-                                        ? kDrawImageRectWithPaintFlags
-                                        : kDrawImageRectFlags;
-  AccumulateOpBounds(dst, flags);
-}
-void DisplayListBoundsCalculator::drawImageNine(const sk_sp<DlImage> image,
-                                                const SkIRect& center,
-                                                const SkRect& dst,
-                                                DlFilterMode filter,
-                                                bool render_with_attributes) {
-  DisplayListAttributeFlags flags = render_with_attributes
-                                        ? kDrawImageNineWithPaintFlags
-                                        : kDrawImageNineFlags;
-  AccumulateOpBounds(dst, flags);
-}
-void DisplayListBoundsCalculator::drawImageLattice(
-    const sk_sp<DlImage> image,
-    const SkCanvas::Lattice& lattice,
-    const SkRect& dst,
-    DlFilterMode filter,
-    bool render_with_attributes) {
-  DisplayListAttributeFlags flags = render_with_attributes
-                                        ? kDrawImageLatticeWithPaintFlags
-                                        : kDrawImageLatticeFlags;
-  AccumulateOpBounds(dst, flags);
-}
-void DisplayListBoundsCalculator::drawAtlas(const sk_sp<DlImage> atlas,
-                                            const SkRSXform xform[],
-                                            const SkRect tex[],
-                                            const DlColor colors[],
-                                            int count,
-                                            DlBlendMode mode,
-                                            DlImageSampling sampling,
-                                            const SkRect* cullRect,
-                                            bool render_with_attributes) {
-  SkPoint quad[4];
-  RectBoundsAccumulator atlas_bounds;
-  for (int i = 0; i < count; i++) {
-    const SkRect& src = tex[i];
-    xform[i].toQuad(src.width(), src.height(), quad);
-    for (int j = 0; j < 4; j++) {
-      atlas_bounds.accumulate(quad[j]);
-    }
-  }
-  if (atlas_bounds.is_not_empty()) {
-    DisplayListAttributeFlags flags = render_with_attributes  //
-                                          ? kDrawAtlasWithPaintFlags
-                                          : kDrawAtlasFlags;
-    AccumulateOpBounds(atlas_bounds.bounds(), flags);
-  }
-}
-void DisplayListBoundsCalculator::drawPicture(const sk_sp<SkPicture> picture,
-                                              const SkMatrix* pic_matrix,
-                                              bool render_with_attributes) {
-  // TODO(flar) cull rect really cannot be trusted in general, but it will
-  // work for SkPictures generated from our own PictureRecorder or any
-  // picture captured with an SkRTreeFactory or accurate bounds estimate.
-  SkRect bounds = picture->cullRect();
-  if (pic_matrix) {
-    pic_matrix->mapRect(&bounds);
-  }
-  DisplayListAttributeFlags flags = render_with_attributes  //
-                                        ? kDrawPictureWithPaintFlags
-                                        : kDrawPictureFlags;
-  AccumulateOpBounds(bounds, flags);
-}
-void DisplayListBoundsCalculator::drawDisplayList(
-    const sk_sp<DisplayList> display_list) {
-  const SkRect bounds = display_list->bounds();
-  switch (accumulator_.type()) {
-    case BoundsAccumulatorType::kRect:
-      AccumulateOpBounds(bounds, kDrawDisplayListFlags);
-      return;
-    case BoundsAccumulatorType::kRTree:
-      std::list<SkRect> rects =
-          display_list->rtree()->searchNonOverlappingDrawnRects(bounds);
-      for (const SkRect& rect : rects) {
-        // TODO (https://github.com/flutter/flutter/issues/114919): Attributes
-        // are not necessarily `kDrawDisplayListFlags`.
-        AccumulateOpBounds(rect, kDrawDisplayListFlags);
-      }
-      return;
-  }
-
-  FML_UNREACHABLE();
-}
-void DisplayListBoundsCalculator::drawTextBlob(const sk_sp<SkTextBlob> blob,
-                                               SkScalar x,
-                                               SkScalar y) {
-  AccumulateOpBounds(blob->bounds().makeOffset(x, y), kDrawTextBlobFlags);
-}
-void DisplayListBoundsCalculator::drawShadow(const SkPath& path,
-                                             const DlColor color,
-                                             const SkScalar elevation,
-                                             bool transparent_occluder,
-                                             SkScalar dpr) {
-  SkRect shadow_bounds = DisplayListCanvasDispatcher::ComputeShadowBounds(
-      path, elevation, dpr, matrix());
-  AccumulateOpBounds(shadow_bounds, kDrawShadowFlags);
-}
-
-bool DisplayListBoundsCalculator::ComputeFilteredBounds(SkRect& bounds,
-                                                        DlImageFilter* filter) {
-  if (filter) {
-    if (!filter->map_local_bounds(bounds, bounds)) {
-      return false;
-    }
-  }
-  return true;
-}
-
-bool DisplayListBoundsCalculator::AdjustBoundsForPaint(
-    SkRect& bounds,
-    DisplayListAttributeFlags flags) {
-  if (flags.ignores_paint()) {
-    return true;
-  }
-
-  if (flags.is_geometric()) {
-    // Path effect occurs before stroking...
-    DisplayListSpecialGeometryFlags special_flags =
-        flags.WithPathEffect(path_effect_.get());
-    if (path_effect_) {
-      auto effect_bounds = path_effect_->effect_bounds(bounds);
-      if (!effect_bounds.has_value()) {
-        return false;
-      }
-      bounds = effect_bounds.value();
-    }
-
-    if (flags.is_stroked(style_)) {
-      // Determine the max multiplier to the stroke width first.
-      SkScalar pad = 1.0f;
-      if (join_is_miter_ && special_flags.may_have_acute_joins()) {
-        pad = std::max(pad, miter_limit_);
-      }
-      if (cap_is_square_ && special_flags.may_have_diagonal_caps()) {
-        pad = std::max(pad, SK_ScalarSqrt2);
-      }
-      pad *= half_stroke_width_;
-      bounds.outset(pad, pad);
-    }
-  }
-
-  if (flags.applies_mask_filter()) {
-    if (mask_filter_) {
-      const DlBlurMaskFilter* blur_filter = mask_filter_->asBlur();
-      if (blur_filter) {
-        SkScalar mask_sigma_pad = blur_filter->sigma() * 3.0;
-        bounds.outset(mask_sigma_pad, mask_sigma_pad);
-      } else {
-        SkPaint p;
-        p.setMaskFilter(mask_filter_->skia_object());
-        if (!p.canComputeFastBounds()) {
-          return false;
-        }
-        bounds = p.computeFastBounds(bounds, &bounds);
-      }
-    }
-  }
-
-  if (flags.applies_image_filter()) {
-    return ComputeFilteredBounds(bounds, image_filter_.get());
-  }
-
-  return true;
-}
-
-void DisplayListBoundsCalculator::AccumulateUnbounded() {
-  if (has_clip()) {
-    accumulator_.accumulate(clip_bounds());
-  } else {
-    layer_infos_.back()->set_unbounded();
-  }
-}
-void DisplayListBoundsCalculator::AccumulateOpBounds(
-    SkRect& bounds,
-    DisplayListAttributeFlags flags) {
-  if (AdjustBoundsForPaint(bounds, flags)) {
-    AccumulateBounds(bounds);
-  } else {
-    AccumulateUnbounded();
-  }
-}
-void DisplayListBoundsCalculator::AccumulateBounds(SkRect& bounds) {
-  matrix().mapRect(&bounds);
-  if (!has_clip() || bounds.intersect(clip_bounds())) {
-    accumulator_.accumulate(bounds);
-  }
-}
-
-bool DisplayListBoundsCalculator::paint_nops_on_transparency() {
-  // SkImageFilter::canComputeFastBounds tests for transparency behavior
-  // This test assumes that the blend mode checked down below will
-  // NOP on transparent black.
-  if (image_filter_ && image_filter_->modifies_transparent_black()) {
-    return false;
-  }
-
-  // We filter the transparent black that is used for the background of a
-  // saveLayer and make sure it returns transparent black. If it does, then
-  // the color filter will leave all area surrounding the contents of the
-  // save layer untouched out to the edge of the output surface.
-  // This test assumes that the blend mode checked down below will
-  // NOP on transparent black.
-  if (color_filter_ && color_filter_->modifies_transparent_black()) {
-    return false;
-  }
-
-  if (!blend_mode_) {
-    return false;  // can we query other blenders for this?
-  }
-  // Unusual blendmodes require us to process a saved layer
-  // even with operations outisde the clip.
-  // For example, DstIn is used by masking layers.
-  // https://code.google.com/p/skia/issues/detail?id=1291
-  // https://crbug.com/401593
-  switch (blend_mode_.value()) {
-    // For each of the following transfer modes, if the source
-    // alpha is zero (our transparent black), the resulting
-    // blended pixel is not necessarily equal to the original
-    // destination pixel.
-    // Mathematically, any time in the following equations where
-    // the result is not d assuming source is 0
-    case DlBlendMode::kClear:     // r = 0
-    case DlBlendMode::kSrc:       // r = s
-    case DlBlendMode::kSrcIn:     // r = s * da
-    case DlBlendMode::kDstIn:     // r = d * sa
-    case DlBlendMode::kSrcOut:    // r = s * (1-da)
-    case DlBlendMode::kDstATop:   // r = d*sa + s*(1-da)
-    case DlBlendMode::kModulate:  // r = s*d
-      return false;
-      break;
-
-    // And in these equations, the result must be d if the
-    // source is 0
-    case DlBlendMode::kDst:         // r = d
-    case DlBlendMode::kSrcOver:     // r = s + (1-sa)*d
-    case DlBlendMode::kDstOver:     // r = d + (1-da)*s
-    case DlBlendMode::kDstOut:      // r = d * (1-sa)
-    case DlBlendMode::kSrcATop:     // r = s*da + d*(1-sa)
-    case DlBlendMode::kXor:         // r = s*(1-da) + d*(1-sa)
-    case DlBlendMode::kPlus:        // r = min(s + d, 1)
-    case DlBlendMode::kScreen:      // r = s + d - s*d
-    case DlBlendMode::kOverlay:     // multiply or screen, depending on dest
-    case DlBlendMode::kDarken:      // rc = s + d - max(s*da, d*sa),
-                                    // ra = kSrcOver
-    case DlBlendMode::kLighten:     // rc = s + d - min(s*da, d*sa),
-                                    // ra = kSrcOver
-    case DlBlendMode::kColorDodge:  // brighten destination to reflect source
-    case DlBlendMode::kColorBurn:   // darken destination to reflect source
-    case DlBlendMode::kHardLight:   // multiply or screen, depending on source
-    case DlBlendMode::kSoftLight:   // lighten or darken, depending on source
-    case DlBlendMode::kDifference:  // rc = s + d - 2*(min(s*da, d*sa)),
-                                    // ra = kSrcOver
-    case DlBlendMode::kExclusion:   // rc = s + d - two(s*d), ra = kSrcOver
-    case DlBlendMode::kMultiply:    // r = s*(1-da) + d*(1-sa) + s*d
-    case DlBlendMode::kHue:         // ra = kSrcOver
-    case DlBlendMode::kSaturation:  // ra = kSrcOver
-    case DlBlendMode::kColor:       // ra = kSrcOver
-    case DlBlendMode::kLuminosity:  // ra = kSrcOver
-      return true;
-      break;
-  }
-}
-
-}  // namespace flutter
diff --git a/display_list/display_list_utils.h b/display_list/display_list_utils.h
deleted file mode 100644
index 406e852fbcae984eccf3e82a54450bc4d9a72e37..0000000000000000000000000000000000000000
--- a/display_list/display_list_utils.h
+++ /dev/null
@@ -1,705 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_UTILS_H_
-#define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_UTILS_H_
-
-#include <optional>
-
-#include "flutter/display_list/display_list.h"
-#include "flutter/display_list/display_list_blend_mode.h"
-#include "flutter/display_list/display_list_builder.h"
-#include "flutter/display_list/display_list_rtree.h"
-#include "flutter/fml/logging.h"
-#include "flutter/fml/macros.h"
-#include "third_party/skia/include/core/SkMaskFilter.h"
-
-// This file contains various utility classes to ease implementing
-// a Flutter DisplayList Dispatcher, including:
-//
-// IgnoreAttributeDispatchHelper:
-// IgnoreClipDispatchHelper:
-// IgnoreTransformDispatchHelper
-//     Empty overrides of all of the associated methods of Dispatcher
-//     for dispatchers that only track some of the rendering operations
-//
-// SkPaintAttributeDispatchHelper:
-//     Tracks the attribute methods and maintains their state in an
-//     SkPaint object.
-// SkMatrixTransformDispatchHelper:
-//     Tracks the transform methods and maintains their state in a
-//     (save/restore stack of) SkMatrix object.
-// ClipBoundsDispatchHelper:
-//     Tracks the clip methods and maintains a culling box in a
-//     (save/restore stack of) SkRect culling rectangle.
-//
-// DisplayListBoundsCalculator:
-//     A class that can traverse an entire display list and compute
-//     a conservative estimate of the bounds of all of the rendering
-//     operations.
-
-namespace flutter {
-
-// A utility class that will ignore all Dispatcher methods relating
-// to the setting of attributes.
-class IgnoreAttributeDispatchHelper : public virtual Dispatcher {
- public:
-  void setAntiAlias(bool aa) override {}
-  void setDither(bool dither) override {}
-  void setInvertColors(bool invert) override {}
-  void setStrokeCap(DlStrokeCap cap) override {}
-  void setStrokeJoin(DlStrokeJoin join) override {}
-  void setStyle(DlDrawStyle style) override {}
-  void setStrokeWidth(float width) override {}
-  void setStrokeMiter(float limit) override {}
-  void setColor(DlColor color) override {}
-  void setBlendMode(DlBlendMode mode) override {}
-  void setBlender(sk_sp<SkBlender> blender) override {}
-  void setColorSource(const DlColorSource* source) override {}
-  void setImageFilter(const DlImageFilter* filter) override {}
-  void setColorFilter(const DlColorFilter* filter) override {}
-  void setPathEffect(const DlPathEffect* effect) override {}
-  void setMaskFilter(const DlMaskFilter* filter) override {}
-};
-
-// A utility class that will ignore all Dispatcher methods relating
-// to setting a clip.
-class IgnoreClipDispatchHelper : public virtual Dispatcher {
-  void clipRect(const SkRect& rect, SkClipOp clip_op, bool is_aa) override {}
-  void clipRRect(const SkRRect& rrect, SkClipOp clip_op, bool is_aa) override {}
-  void clipPath(const SkPath& path, SkClipOp clip_op, bool is_aa) override {}
-};
-
-// A utility class that will ignore all Dispatcher methods relating
-// to modifying the transform.
-class IgnoreTransformDispatchHelper : public virtual Dispatcher {
- public:
-  void translate(SkScalar tx, SkScalar ty) override {}
-  void scale(SkScalar sx, SkScalar sy) override {}
-  void rotate(SkScalar degrees) override {}
-  void skew(SkScalar sx, SkScalar sy) override {}
-  // clang-format off
-  // 2x3 2D affine subset of a 4x4 transform in row major order
-  void transform2DAffine(SkScalar mxx, SkScalar mxy, SkScalar mxt,
-                         SkScalar myx, SkScalar myy, SkScalar myt) override {}
-  // full 4x4 transform in row major order
-  void transformFullPerspective(
-      SkScalar mxx, SkScalar mxy, SkScalar mxz, SkScalar mxt,
-      SkScalar myx, SkScalar myy, SkScalar myz, SkScalar myt,
-      SkScalar mzx, SkScalar mzy, SkScalar mzz, SkScalar mzt,
-      SkScalar mwx, SkScalar mwy, SkScalar mwz, SkScalar mwt) override {}
-  // clang-format on
-  void transformReset() override {}
-};
-
-class IgnoreDrawDispatchHelper : public virtual Dispatcher {
- public:
-  void save() override {}
-  void saveLayer(const SkRect* bounds,
-                 const SaveLayerOptions options,
-                 const DlImageFilter* backdrop) override {}
-  void restore() override {}
-  void drawColor(DlColor color, DlBlendMode mode) override {}
-  void drawPaint() override {}
-  void drawLine(const SkPoint& p0, const SkPoint& p1) override {}
-  void drawRect(const SkRect& rect) override {}
-  void drawOval(const SkRect& bounds) override {}
-  void drawCircle(const SkPoint& center, SkScalar radius) override {}
-  void drawRRect(const SkRRect& rrect) override {}
-  void drawDRRect(const SkRRect& outer, const SkRRect& inner) override {}
-  void drawPath(const SkPath& path) override {}
-  void drawArc(const SkRect& oval_bounds,
-               SkScalar start_degrees,
-               SkScalar sweep_degrees,
-               bool use_center) override {}
-  void drawPoints(SkCanvas::PointMode mode,
-                  uint32_t count,
-                  const SkPoint points[]) override {}
-  void drawSkVertices(const sk_sp<SkVertices> vertices,
-                      SkBlendMode mode) override {}
-  void drawVertices(const DlVertices* vertices, DlBlendMode mode) override {}
-  void drawImage(const sk_sp<DlImage> image,
-                 const SkPoint point,
-                 DlImageSampling sampling,
-                 bool render_with_attributes) override {}
-  void drawImageRect(const sk_sp<DlImage> image,
-                     const SkRect& src,
-                     const SkRect& dst,
-                     DlImageSampling sampling,
-                     bool render_with_attributes,
-                     SkCanvas::SrcRectConstraint constraint) override {}
-  void drawImageNine(const sk_sp<DlImage> image,
-                     const SkIRect& center,
-                     const SkRect& dst,
-                     DlFilterMode filter,
-                     bool render_with_attributes) override {}
-  void drawImageLattice(const sk_sp<DlImage> image,
-                        const SkCanvas::Lattice& lattice,
-                        const SkRect& dst,
-                        DlFilterMode filter,
-                        bool render_with_attributes) override {}
-  void drawAtlas(const sk_sp<DlImage> atlas,
-                 const SkRSXform xform[],
-                 const SkRect tex[],
-                 const DlColor colors[],
-                 int count,
-                 DlBlendMode mode,
-                 DlImageSampling sampling,
-                 const SkRect* cull_rect,
-                 bool render_with_attributes) override {}
-  void drawPicture(const sk_sp<SkPicture> picture,
-                   const SkMatrix* matrix,
-                   bool render_with_attributes) override {}
-  void drawDisplayList(const sk_sp<DisplayList> display_list) override {}
-  void drawTextBlob(const sk_sp<SkTextBlob> blob,
-                    SkScalar x,
-                    SkScalar y) override {}
-  void drawShadow(const SkPath& path,
-                  const DlColor color,
-                  const SkScalar elevation,
-                  bool transparent_occluder,
-                  SkScalar dpr) override {}
-};
-
-// A utility class that will monitor the Dispatcher methods relating
-// to the rendering attributes and accumulate them into an SkPaint
-// which can be accessed at any time via paint().
-class SkPaintDispatchHelper : public virtual Dispatcher {
- public:
-  SkPaintDispatchHelper(SkScalar opacity = SK_Scalar1)
-      : current_color_(SK_ColorBLACK), opacity_(opacity) {
-    if (opacity < SK_Scalar1) {
-      paint_.setAlphaf(opacity);
-    }
-  }
-
-  void setAntiAlias(bool aa) override;
-  void setDither(bool dither) override;
-  void setStyle(DlDrawStyle style) override;
-  void setColor(DlColor color) override;
-  void setStrokeWidth(SkScalar width) override;
-  void setStrokeMiter(SkScalar limit) override;
-  void setStrokeCap(DlStrokeCap cap) override;
-  void setStrokeJoin(DlStrokeJoin join) override;
-  void setColorSource(const DlColorSource* source) override;
-  void setColorFilter(const DlColorFilter* filter) override;
-  void setInvertColors(bool invert) override;
-  void setBlendMode(DlBlendMode mode) override;
-  void setBlender(sk_sp<SkBlender> blender) override;
-  void setPathEffect(const DlPathEffect* effect) override;
-  void setMaskFilter(const DlMaskFilter* filter) override;
-  void setImageFilter(const DlImageFilter* filter) override;
-
-  const SkPaint& paint() { return paint_; }
-
-  /// Returns the current opacity attribute which is used to reduce
-  /// the alpha of all setColor calls encountered in the streeam
-  SkScalar opacity() { return opacity_; }
-  /// Returns the combined opacity that includes both the current
-  /// opacity attribute and the alpha of the most recent color.
-  /// The most recently set color will have combined the two and
-  /// stored the combined value in the alpha of the paint.
-  SkScalar combined_opacity() { return paint_.getAlphaf(); }
-  /// Returns true iff the current opacity attribute is not opaque,
-  /// irrespective of the alpha of the current color
-  bool has_opacity() { return opacity_ < SK_Scalar1; }
-
- protected:
-  void save_opacity(SkScalar opacity_for_children);
-  void restore_opacity();
-
- private:
-  SkPaint paint_;
-  bool invert_colors_ = false;
-  std::shared_ptr<const DlColorFilter> color_filter_;
-
-  sk_sp<SkColorFilter> makeColorFilter() const;
-
-  struct SaveInfo {
-    SaveInfo(SkScalar opacity) : opacity(opacity) {}
-
-    SkScalar opacity;
-  };
-  std::vector<SaveInfo> save_stack_;
-
-  void set_opacity(SkScalar opacity) {
-    if (opacity_ != opacity) {
-      opacity_ = opacity;
-      setColor(current_color_);
-    }
-  }
-
-  SkColor current_color_;
-  SkScalar opacity_;
-};
-
-class SkMatrixSource {
- public:
-  // The current full 4x4 transform matrix. Not generally needed
-  // for 2D operations. See |matrix|.
-  virtual const SkM44& m44() const = 0;
-
-  // The current matrix expressed as an SkMatrix. The data held
-  // in an SkMatrix is enough to perform point and rect transforms
-  // assuming input coordinates have only an X and Y and an assumed
-  // Z of 0 and an assumed W of 1.
-  // See the block comment on the transform methods in |Dispatcher|
-  // for a detailed explanation.
-  virtual const SkMatrix& matrix() const = 0;
-};
-
-// A utility class that will monitor the Dispatcher methods relating
-// to the transform and accumulate them into an SkMatrix which can
-// be accessed at any time via matrix().
-//
-// This class also implements an appropriate stack of transforms via
-// its save() and restore() methods so those methods will need to be
-// forwarded if overridden in more than one super class.
-class SkMatrixDispatchHelper : public virtual Dispatcher,
-                               public virtual SkMatrixSource {
- public:
-  void translate(SkScalar tx, SkScalar ty) override;
-  void scale(SkScalar sx, SkScalar sy) override;
-  void rotate(SkScalar degrees) override;
-  void skew(SkScalar sx, SkScalar sy) override;
-
-  // clang-format off
-
-  // 2x3 2D affine subset of a 4x4 transform in row major order
-  void transform2DAffine(SkScalar mxx, SkScalar mxy, SkScalar mxt,
-                         SkScalar myx, SkScalar myy, SkScalar myt) override;
-  // full 4x4 transform in row major order
-  void transformFullPerspective(
-      SkScalar mxx, SkScalar mxy, SkScalar mxz, SkScalar mxt,
-      SkScalar myx, SkScalar myy, SkScalar myz, SkScalar myt,
-      SkScalar mzx, SkScalar mzy, SkScalar mzz, SkScalar mzt,
-      SkScalar mwx, SkScalar mwy, SkScalar mwz, SkScalar mwt) override;
-
-  // clang-format on
-
-  void transformReset() override;
-
-  void save() override;
-  void restore() override;
-
-  const SkM44& m44() const override { return matrix_; }
-  const SkMatrix& matrix() const override { return matrix33_; }
-
- protected:
-  void reset();
-
- private:
-  SkM44 matrix_;
-  SkMatrix matrix33_;
-  std::vector<SkM44> saved_;
-};
-
-// A utility class that will monitor the Dispatcher methods relating
-// to the clip and accumulate a conservative bounds into an SkRect
-// which can be accessed at any time via getCullingBounds().
-//
-// The subclass must implement a single virtual method matrix()
-// which will happen automatically if the subclass also inherits
-// from SkMatrixTransformDispatchHelper.
-//
-// This class also implements an appropriate stack of transforms via
-// its save() and restore() methods so those methods will need to be
-// forwarded if overridden in more than one super class.
-class ClipBoundsDispatchHelper : public virtual Dispatcher,
-                                 private virtual SkMatrixSource {
- public:
-  ClipBoundsDispatchHelper() : ClipBoundsDispatchHelper(nullptr) {}
-
-  explicit ClipBoundsDispatchHelper(const SkRect* cull_rect)
-      : has_clip_(cull_rect),
-        bounds_(cull_rect && !cull_rect->isEmpty() ? *cull_rect
-                                                   : SkRect::MakeEmpty()) {}
-
-  void clipRect(const SkRect& rect, SkClipOp clip_op, bool is_aa) override;
-  void clipRRect(const SkRRect& rrect, SkClipOp clip_op, bool is_aa) override;
-  void clipPath(const SkPath& path, SkClipOp clip_op, bool is_aa) override;
-
-  void save() override;
-  void restore() override;
-
-  bool has_clip() const { return has_clip_; }
-  const SkRect& clip_bounds() const { return bounds_; }
-
- protected:
-  void reset(const SkRect* cull_rect);
-
- private:
-  bool has_clip_;
-  SkRect bounds_;
-  std::vector<SkRect> saved_;
-
-  void intersect(const SkRect& clipBounds, bool is_aa);
-};
-
-enum class BoundsAccumulatorType {
-  kRect,
-  kRTree,
-};
-
-class BoundsAccumulator {
- public:
-  /// function definition for modifying the bounds of a rectangle
-  /// during a restore operation. The function is used primarily
-  /// to account for the bounds impact of an ImageFilter on a
-  /// saveLayer on a per-rect basis. The implementation may apply
-  /// this function at whatever granularity it can manage easily
-  /// (for example, a Rect accumulator might apply it to the entire
-  /// local bounds being restored, whereas an RTree accumulator might
-  /// apply it individually to each element in the local RTree).
-  ///
-  /// The function will do a best faith attempt at determining the
-  /// modified bounds and store the results in the supplied |dest|
-  /// rectangle and return true. If the function is unable to
-  /// accurately determine the modifed bounds, it will set the
-  /// |dest| rectangle to a copy of the input bounds (or a best
-  /// guess) and return false to indicate that the bounds should not
-  /// be trusted.
-  typedef bool BoundsModifier(const SkRect& original, SkRect* dest);
-
-  virtual void accumulate(const SkRect& r) = 0;
-
-  virtual bool is_empty() const = 0;
-  virtual bool is_not_empty() const = 0;
-
-  /// Save aside the rects/bounds currently being accumulated and start
-  /// accumulating a new set of rects/bounds. When restore is called,
-  /// some additional modifications may be applied to these new bounds
-  /// before they are accumulated back into the surrounding bounds.
-  virtual void save() = 0;
-
-  /// Restore to the previous accumulation and incorporate the bounds of
-  /// the primitives that were recorded since the last save (if needed).
-  virtual void restore() = 0;
-
-  /// Restore the previous set of accumulation rects/bounds and accumulate
-  /// the current rects/bounds that were accumulated since the most recent
-  /// call to |save| into them with modifications specified by the |map|
-  /// parameter and clipping to the clip parameter if it is not null.
-  ///
-  /// The indicated map function is applied to the various rects and bounds
-  /// that have been accumulated in this save/restore cycle before they
-  /// are then accumulated into the previous accumulations. The granularity
-  /// of the application of the map function to the rectangles that were
-  /// accumulated during the save period is left up to the implementation.
-  ///
-  /// This method will return true if the map function returned true on
-  /// every single invocation. A false return value means that the
-  /// bounds accumulated during this restore may not be trusted (as
-  /// determined by the map function).
-  ///
-  /// If there are no saved accumulations to restore to, this method will
-  /// NOP ignoring the map function and the optional clip entirely.
-  virtual bool restore(
-      std::function<bool(const SkRect& original, SkRect& modified)> map,
-      const SkRect* clip = nullptr) = 0;
-
-  virtual BoundsAccumulatorType type() const = 0;
-};
-
-class RectBoundsAccumulator final : public virtual BoundsAccumulator {
- public:
-  void accumulate(SkScalar x, SkScalar y) { rect_.accumulate(x, y); }
-  void accumulate(const SkPoint& p) { rect_.accumulate(p.fX, p.fY); }
-  void accumulate(const SkRect& r) override;
-
-  bool is_empty() const override { return rect_.is_empty(); }
-  bool is_not_empty() const override { return rect_.is_not_empty(); }
-
-  void save() override;
-  void restore() override;
-  bool restore(std::function<bool(const SkRect&, SkRect&)> mapper,
-               const SkRect* clip) override;
-
-  SkRect bounds() const {
-    FML_DCHECK(saved_rects_.empty());
-    return rect_.bounds();
-  }
-
-  BoundsAccumulatorType type() const override {
-    return BoundsAccumulatorType::kRect;
-  }
-
- private:
-  class AccumulationRect {
-   public:
-    AccumulationRect();
-
-    void accumulate(SkScalar x, SkScalar y);
-
-    bool is_empty() const { return min_x_ >= max_x_ || min_y_ >= max_y_; }
-    bool is_not_empty() const { return min_x_ < max_x_ && min_y_ < max_y_; }
-
-    SkRect bounds() const;
-
-   private:
-    SkScalar min_x_;
-    SkScalar min_y_;
-    SkScalar max_x_;
-    SkScalar max_y_;
-  };
-
-  void pop_and_accumulate(SkRect& layer_bounds, const SkRect* clip);
-
-  AccumulationRect rect_;
-  std::vector<AccumulationRect> saved_rects_;
-};
-
-class RTreeBoundsAccumulator final : public virtual BoundsAccumulator {
- public:
-  void accumulate(const SkRect& r) override;
-
-  bool is_empty() const override;
-  bool is_not_empty() const override;
-
-  void save() override;
-  void restore() override;
-
-  bool restore(
-      std::function<bool(const SkRect& original, SkRect& modified)> map,
-      const SkRect* clip = nullptr) override;
-
-  sk_sp<DlRTree> rtree() const;
-
-  BoundsAccumulatorType type() const override {
-    return BoundsAccumulatorType::kRTree;
-  }
-
- private:
-  std::vector<SkRect> rects_;
-  std::vector<size_t> saved_offsets_;
-};
-
-// This class implements all rendering methods and computes a liberal
-// bounds of the rendering operations.
-class DisplayListBoundsCalculator final
-    : public virtual Dispatcher,
-      public virtual IgnoreAttributeDispatchHelper,
-      public virtual SkMatrixDispatchHelper,
-      public virtual ClipBoundsDispatchHelper,
-      DisplayListOpFlags {
- public:
-  // Construct a Calculator to determine the bounds of a list of
-  // DisplayList dispatcher method calls. Since 2 of the method calls
-  // have no intrinsic size because they flood the entire clip/surface,
-  // the |cull_rect| provides a bounds for them to include. If cull_rect
-  // is not specified or is null, then the unbounded calls will not
-  // affect the resulting bounds, but will set a flag that can be
-  // queried using |isUnbounded| if an alternate plan is available
-  // for such cases.
-  // The flag should never be set if a cull_rect is provided.
-  explicit DisplayListBoundsCalculator(BoundsAccumulator& accumulator,
-                                       const SkRect* cull_rect = nullptr);
-
-  void setStrokeCap(DlStrokeCap cap) override;
-  void setStrokeJoin(DlStrokeJoin join) override;
-  void setStyle(DlDrawStyle style) override;
-  void setStrokeWidth(SkScalar width) override;
-  void setStrokeMiter(SkScalar limit) override;
-  void setBlendMode(DlBlendMode mode) override;
-  void setBlender(sk_sp<SkBlender> blender) override;
-  void setImageFilter(const DlImageFilter* filter) override;
-  void setColorFilter(const DlColorFilter* filter) override;
-  void setPathEffect(const DlPathEffect* effect) override;
-  void setMaskFilter(const DlMaskFilter* filter) override;
-
-  void save() override;
-  void saveLayer(const SkRect* bounds,
-                 const SaveLayerOptions options,
-                 const DlImageFilter* backdrop) override;
-  void restore() override;
-
-  void drawPaint() override;
-  void drawColor(DlColor color, DlBlendMode mode) override;
-  void drawLine(const SkPoint& p0, const SkPoint& p1) override;
-  void drawRect(const SkRect& rect) override;
-  void drawOval(const SkRect& bounds) override;
-  void drawCircle(const SkPoint& center, SkScalar radius) override;
-  void drawRRect(const SkRRect& rrect) override;
-  void drawDRRect(const SkRRect& outer, const SkRRect& inner) override;
-  void drawPath(const SkPath& path) override;
-  void drawArc(const SkRect& bounds,
-               SkScalar start,
-               SkScalar sweep,
-               bool useCenter) override;
-  void drawPoints(SkCanvas::PointMode mode,
-                  uint32_t count,
-                  const SkPoint pts[]) override;
-  void drawSkVertices(const sk_sp<SkVertices> vertices,
-                      SkBlendMode mode) override;
-  void drawVertices(const DlVertices* vertices, DlBlendMode mode) override;
-  void drawImage(const sk_sp<DlImage> image,
-                 const SkPoint point,
-                 DlImageSampling sampling,
-                 bool render_with_attributes) override;
-  void drawImageRect(const sk_sp<DlImage> image,
-                     const SkRect& src,
-                     const SkRect& dst,
-                     DlImageSampling sampling,
-                     bool render_with_attributes,
-                     SkCanvas::SrcRectConstraint constraint) override;
-  void drawImageNine(const sk_sp<DlImage> image,
-                     const SkIRect& center,
-                     const SkRect& dst,
-                     DlFilterMode filter,
-                     bool render_with_attributes) override;
-  void drawImageLattice(const sk_sp<DlImage> image,
-                        const SkCanvas::Lattice& lattice,
-                        const SkRect& dst,
-                        DlFilterMode filter,
-                        bool render_with_attributes) override;
-  void drawAtlas(const sk_sp<DlImage> atlas,
-                 const SkRSXform xform[],
-                 const SkRect tex[],
-                 const DlColor colors[],
-                 int count,
-                 DlBlendMode mode,
-                 DlImageSampling sampling,
-                 const SkRect* cullRect,
-                 bool render_with_attributes) override;
-  void drawPicture(const sk_sp<SkPicture> picture,
-                   const SkMatrix* matrix,
-                   bool with_save_layer) override;
-  void drawDisplayList(const sk_sp<DisplayList> display_list) override;
-  void drawTextBlob(const sk_sp<SkTextBlob> blob,
-                    SkScalar x,
-                    SkScalar y) override;
-  void drawShadow(const SkPath& path,
-                  const DlColor color,
-                  const SkScalar elevation,
-                  bool transparent_occluder,
-                  SkScalar dpr) override;
-
-  // The DisplayList had an unbounded call with no cull rect or clip
-  // to contain it. Should only be called after the stream is fully
-  // dispatched.
-  // Unbounded operations are calls like |drawColor| which are defined
-  // to flood the entire surface, or calls that relied on a rendering
-  // attribute which is unable to compute bounds (should be rare).
-  // In those cases the bounds will represent only the accumulation
-  // of the bounded calls and this flag will be set to indicate that
-  // condition.
-  bool is_unbounded() const {
-    FML_DCHECK(layer_infos_.size() == 1);
-    return layer_infos_.front()->is_unbounded();
-  }
-
- private:
-  BoundsAccumulator& accumulator_;
-
-  // A class that remembers the information kept for a single
-  // |save| or |saveLayer|.
-  // Each save or saveLayer will maintain its own bounds accumulator
-  // and then accumulate that back into the surrounding accumulator
-  // during restore.
-  class LayerData {
-   public:
-    // Construct a LayerData to push on the save stack for a |save|
-    // or |saveLayer| call.
-    // Some saveLayer calls will process their bounds by a
-    // |DlImageFilter| when they are restored, but for most
-    // saveLayer (and all save) calls the filter will be null.
-    explicit LayerData(std::shared_ptr<DlImageFilter> filter = nullptr)
-        : filter_(filter), is_unbounded_(false) {}
-    ~LayerData() = default;
-
-    // The filter to apply to the layer bounds when it is restored
-    std::shared_ptr<DlImageFilter> filter() { return filter_; }
-
-    // is_unbounded should be set to true if we ever encounter an operation
-    // on a layer that either is unrestricted (|drawColor| or |drawPaint|)
-    // or cannot compute its bounds (some effects and filters) and there
-    // was no outstanding clip op at the time.
-    // When the layer is restored, the outer layer may then process this
-    // unbounded state by accumulating its own clip or transferring the
-    // unbounded state to its own outer layer.
-    // Typically the DisplayList will have been constructed with a cull
-    // rect which will act as a default clip for the outermost layer and
-    // the unbounded state of all sub layers will eventually be caught by
-    // that cull rect so that the overall unbounded state of the entire
-    // DisplayList will never be true.
-    //
-    // SkPicture treats these same conditions as a Nop (they accumulate
-    // the SkPicture cull rect, but if it was not specified then it is an
-    // empty Rect and so has no effect on the bounds).
-    // If the Calculator object accumulates this flag into the root layer,
-    // then at least we can make the caller aware of that exceptional
-    // condition via the |DisplayListBoundsCalculator::isUnbounded| call.
-    //
-    // Flutter is unlikely to ever run into this as the Dart mechanisms
-    // all supply a non-null cull rect for all Dart Picture objects,
-    // even if that cull rect is kGiantRect.
-    void set_unbounded() { is_unbounded_ = true; }
-
-    // |is_unbounded| should be called after |getLayerBounds| in case
-    // a problem was found during the computation of those bounds,
-    // the layer will have one last chance to flag an unbounded state.
-    bool is_unbounded() const { return is_unbounded_; }
-
-    bool map_bounds(const SkRect& input, SkRect* output) {
-      *output = input;
-      return true;
-    }
-
-   private:
-    std::shared_ptr<DlImageFilter> filter_;
-    bool is_unbounded_;
-
-    FML_DISALLOW_COPY_AND_ASSIGN(LayerData);
-  };
-
-  std::vector<std::unique_ptr<LayerData>> layer_infos_;
-
-  static constexpr SkScalar kMinStrokeWidth = 0.01;
-
-  std::optional<DlBlendMode> blend_mode_ = DlBlendMode::kSrcOver;
-  std::shared_ptr<const DlColorFilter> color_filter_;
-
-  SkScalar half_stroke_width_ = kMinStrokeWidth;
-  SkScalar miter_limit_ = 4.0;
-  DlDrawStyle style_ = DlDrawStyle::kFill;
-  bool join_is_miter_ = true;
-  bool cap_is_square_ = false;
-  std::shared_ptr<DlImageFilter> image_filter_;
-  std::shared_ptr<const DlPathEffect> path_effect_;
-  std::shared_ptr<const DlMaskFilter> mask_filter_;
-
-  bool paint_nops_on_transparency();
-
-  // Computes the bounds of an operation adjusted for a given ImageFilter
-  static bool ComputeFilteredBounds(SkRect& bounds, DlImageFilter* filter);
-
-  // Adjusts the indicated bounds for the given flags and returns true if
-  // the calculation was possible, or false if it could not be estimated.
-  bool AdjustBoundsForPaint(SkRect& bounds, DisplayListAttributeFlags flags);
-
-  // Records the fact that we encountered an op that either could not
-  // estimate its bounds or that fills all of the destination space.
-  void AccumulateUnbounded();
-
-  // Records the bounds for an op after modifying them according to the
-  // supplied attribute flags and transforming by the current matrix.
-  void AccumulateOpBounds(const SkRect& bounds,
-                          DisplayListAttributeFlags flags) {
-    SkRect safe_bounds = bounds;
-    AccumulateOpBounds(safe_bounds, flags);
-  }
-
-  // Records the bounds for an op after modifying them according to the
-  // supplied attribute flags and transforming by the current matrix
-  // and clipping against the current clip.
-  void AccumulateOpBounds(SkRect& bounds, DisplayListAttributeFlags flags);
-
-  // Records the given bounds after transforming by the current matrix
-  // and clipping against the current clip.
-  void AccumulateBounds(SkRect& bounds);
-};
-
-}  // namespace flutter
-
-#endif  // FLUTTER_DISPLAY_LIST_DISPLAY_LIST_UTILS_H_
diff --git a/display_list/display_list_utils_unittests.cc b/display_list/display_list_utils_unittests.cc
deleted file mode 100644
index 3141ffd0ebbf6c0eaf5459a34c5ab5f3da598607..0000000000000000000000000000000000000000
--- a/display_list/display_list_utils_unittests.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "flutter/display_list/display_list_utils.h"
-#include "gtest/gtest.h"
-
-namespace flutter {
-namespace testing {
-
-class MockDispatchHelper final : public virtual Dispatcher,
-                                 public virtual SkPaintDispatchHelper,
-                                 public virtual SkMatrixDispatchHelper,
-                                 public virtual ClipBoundsDispatchHelper,
-                                 public virtual IgnoreDrawDispatchHelper {
- public:
-  void save() override {
-    SkPaintDispatchHelper::save_opacity(0.5f);
-    SkMatrixDispatchHelper::save();
-    ClipBoundsDispatchHelper::save();
-  }
-
-  void restore() override {
-    SkPaintDispatchHelper::restore_opacity();
-    SkMatrixDispatchHelper::restore();
-    ClipBoundsDispatchHelper::restore();
-  }
-};
-
-// Regression test for https://github.com/flutter/flutter/issues/100176.
-TEST(DisplayListUtils, OverRestore) {
-  MockDispatchHelper helper;
-  helper.save();
-  helper.restore();
-  // There should be a protection here for over-restore to keep the program from
-  // crashing.
-  helper.restore();
-}
-
-}  // namespace testing
-}  // namespace flutter
diff --git a/display_list/display_list_attributes.h b/display_list/dl_attributes.h
similarity index 85%
rename from display_list/display_list_attributes.h
rename to display_list/dl_attributes.h
index 051e4efd65f7cbd4eadcb24ac1ff7366d01f7134..294d8573bdfd340fb0c7bdd66e2284302b8b1286 100644
--- a/display_list/display_list_attributes.h
+++ b/display_list/dl_attributes.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_ATTRIBUTES_H_
-#define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_ATTRIBUTES_H_
+#ifndef FLUTTER_DISPLAY_LIST_DL_ATTRIBUTES_H_
+#define FLUTTER_DISPLAY_LIST_DL_ATTRIBUTES_H_
 
-#include "flutter/display_list/types.h"
+#include <memory>
 
 namespace flutter {
 
@@ -36,10 +36,6 @@ namespace flutter {
 //     wrong type of instance.
 //     (eg. DlColorFilter::asBlend() or DlMaskFilter::asBlur())
 //
-// - Skiafiable:
-//     The classes override an |skia_object| method to easily obtain a Skia
-//     version of the attribute on demand.
-//
 // - Immutable:
 //     Neither the base class or any of the subclasses specify any mutation
 //     methods. Instances are often passed around as const as a reminder,
@@ -56,7 +52,7 @@ namespace flutter {
 //     compared using a |memcmp| when performing a |DisplayList::Equals|.
 //
 // - Passed by Pointer:
-//     The data shared via the |Dispatcher::set<Attribute>| calls are stored
+//     The data shared via the |DlOpReceiver::set<Attribute>| calls are stored
 //     in the buffer itself and so their lifetime is controlled by the
 //     DisplayList. That memory cannot be shared as by a |shared_ptr|
 //     because the memory may be freed outside the control of the shared
@@ -70,7 +66,7 @@ namespace flutter {
 // - Shared_Ptr-able:
 //     The classes support a method to return a |std::shared_ptr| version of
 //     themselves, safely instantiating a new copy of the object into a
-//     shared_ptr using |std::make_shared|. For those dispatcher objects
+//     shared_ptr using |std::make_shared|. For those receiver objects
 //     that may want to hold on to the contents of the object (typically
 //     in a |current_attribute_| field), they can obtain a shared_ptr
 //     copy safely and easily using the |shared| method.
@@ -79,11 +75,9 @@ namespace flutter {
 
 // |D| is the base type for the attribute
 //     (i.e. DlColorFilter, etc.)
-// |S| is the base type for the Skia version of the attribute
-//     (i.e. SkColorFilter, etc.)
 // |T| is the enum that describes the specific subclasses
 //     (i.e DlColorFilterType, etc.)
-template <class D, class S, typename T>
+template <class D, typename T>
 class DlAttribute {
  public:
   // Return the recognized specific type of the attribute.
@@ -98,9 +92,6 @@ class DlAttribute {
   // version is not tied to the storage of this particular instance.
   virtual std::shared_ptr<D> shared() const = 0;
 
-  // Return an equivalent sk_sp<Skia> version of this object.
-  virtual sk_sp<S> skia_object() const = 0;
-
   // Perform a content aware |==| comparison of the Attribute.
   bool operator==(D const& other) const {
     return type() == other.type() && equals_(other);
@@ -117,4 +108,4 @@ class DlAttribute {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_DISPLAY_LIST_DISPLAY_LIST_ATTRIBUTES_H_
+#endif  // FLUTTER_DISPLAY_LIST_DL_ATTRIBUTES_H_
diff --git a/display_list/display_list_blend_mode.cc b/display_list/dl_blend_mode.cc
similarity index 78%
rename from display_list/display_list_blend_mode.cc
rename to display_list/dl_blend_mode.cc
index a8f2425af73e35d760fa622e8669d1f6d22a6bc4..3b3bb91a0fe537361449646fb742ae53fef4755e 100644
--- a/display_list/display_list_blend_mode.cc
+++ b/display_list/dl_blend_mode.cc
@@ -2,6 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/display_list/display_list_blend_mode.h"
+#include "flutter/display_list/dl_blend_mode.h"
 
 namespace flutter {}  // namespace flutter
diff --git a/display_list/display_list_blend_mode.h b/display_list/dl_blend_mode.h
similarity index 78%
rename from display_list/display_list_blend_mode.h
rename to display_list/dl_blend_mode.h
index 6a84e08879a8fa3424a65ce3961de80777d0efbd..a1c7b1231e98ae75d5b98bdc430d44065f8f9c65 100644
--- a/display_list/display_list_blend_mode.h
+++ b/display_list/dl_blend_mode.h
@@ -2,26 +2,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_BLEND_MODE_H_
-#define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_BLEND_MODE_H_
-
-#include "include/core/SkBlender.h"
+#ifndef FLUTTER_DISPLAY_LIST_DL_BLEND_MODE_H_
+#define FLUTTER_DISPLAY_LIST_DL_BLEND_MODE_H_
 
 namespace flutter {
 
 /// A enum define the blend mode.
 /// Blends are operators that take in two colors (source, destination) and
-/// return a new color. Blends are operators that take in two colors (source,
-/// destination) and return a new color. Many of these operate the same on all 4
+/// return a new color. Many of these operate the same on all 4
 /// components: red, green, blue, alpha. For these, we just document what
 /// happens to one component, rather than naming each one separately. Different
-/// SkColorTypes have different representations for color components:
+/// color types might have different representations for color components:
 ///     8-bit: 0..255
 ///     6-bit: 0..63
 ///     5-bit: 0..31
 ///     4-bit: 0..15
 ///    floats: 0...1
-/// The documentation is expressed as if the component values are always 0..1
+/// The comments are expressed as if the component values are always 0..1
 /// (floats). For brevity, the documentation uses the following abbreviations s
 /// : source d  : destination sa : source alpha da : destination alpha Results
 /// are abbreviated r  : if all 4 components are computed in the same manner ra
@@ -66,14 +63,6 @@ enum class DlBlendMode {
   kDefaultMode = kSrcOver,
 };
 
-inline DlBlendMode ToDl(SkBlendMode mode) {
-  return static_cast<DlBlendMode>(mode);
-}
-
-inline SkBlendMode ToSk(DlBlendMode mode) {
-  return static_cast<SkBlendMode>(mode);
-}
-
 }  // namespace flutter
 
-#endif  // FLUTTER_DISPLAY_LIST_DISPLAY_LIST_BLEND_MODE_H_
+#endif  // FLUTTER_DISPLAY_LIST_DL_BLEND_MODE_H_
diff --git a/display_list/display_list_builder.cc b/display_list/dl_builder.cc
similarity index 36%
rename from display_list/display_list_builder.cc
rename to display_list/dl_builder.cc
index 7aa654730e245cad907e059ec780b52fd87921bb..cefca969017069da86e7a5887fb04eb971b7a1fe 100644
--- a/display_list/display_list_builder.cc
+++ b/display_list/dl_builder.cc
@@ -2,12 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/display_list/display_list_builder.h"
+#include "flutter/display_list/dl_builder.h"
 
 #include "flutter/display_list/display_list.h"
-#include "flutter/display_list/display_list_blend_mode.h"
-#include "flutter/display_list/display_list_color_source.h"
-#include "flutter/display_list/display_list_ops.h"
+#include "flutter/display_list/dl_blend_mode.h"
+#include "flutter/display_list/dl_op_flags.h"
+#include "flutter/display_list/dl_op_records.h"
+#include "flutter/display_list/effects/dl_color_source.h"
+#include "flutter/display_list/utils/dl_bounds_accumulator.h"
+#include "fml/logging.h"
+#include "third_party/skia/include/core/SkScalar.h"
 
 namespace flutter {
 
@@ -21,16 +25,26 @@ static void CopyV(void* dst, const S* src, int n, Rest&&... rest) {
   FML_DCHECK(((uintptr_t)dst & (alignof(S) - 1)) == 0)
       << "Expected " << dst << " to be aligned for at least " << alignof(S)
       << " bytes.";
-  sk_careful_memcpy(dst, src, n * sizeof(S));
-  CopyV(SkTAddOffset<void>(dst, n * sizeof(S)), std::forward<Rest>(rest)...);
+  // If n is 0, there is nothing to copy into dst from src.
+  if (n > 0) {
+    memcpy(dst, src, n * sizeof(S));
+    dst = reinterpret_cast<void*>(reinterpret_cast<uint8_t*>(dst) +
+                                  n * sizeof(S));
+  }
+  // Repeat for the next items, if any
+  CopyV(dst, std::forward<Rest>(rest)...);
+}
+
+static constexpr inline bool is_power_of_two(int value) {
+  return (value & (value - 1)) == 0;
 }
 
 template <typename T, typename... Args>
-void* DisplayListBuilder::Push(size_t pod, int op_inc, Args&&... args) {
+void* DisplayListBuilder::Push(size_t pod, int render_op_inc, Args&&... args) {
   size_t size = SkAlignPtr(sizeof(T) + pod);
   FML_DCHECK(size < (1 << 24));
   if (used_ + size > allocated_) {
-    static_assert(SkIsPow2(DL_BUILDER_PAGE),
+    static_assert(is_power_of_two(DL_BUILDER_PAGE),
                   "This math needs updating for non-pow2.");
     // Next greater multiple of DL_BUILDER_PAGE.
     allocated_ = (used_ + size + DL_BUILDER_PAGE) & ~(DL_BUILDER_PAGE - 1);
@@ -44,7 +58,8 @@ void* DisplayListBuilder::Push(size_t pod, int op_inc, Args&&... args) {
   new (op) T{std::forward<Args>(args)...};
   op->type = T::kType;
   op->size = size;
-  op_count_ += op_inc;
+  render_op_count_ += render_op_inc;
+  op_index_++;
   return op + 1;
 }
 
@@ -52,22 +67,44 @@ sk_sp<DisplayList> DisplayListBuilder::Build() {
   while (layer_stack_.size() > 1) {
     restore();
   }
+
   size_t bytes = used_;
-  int count = op_count_;
+  int count = render_op_count_;
   size_t nested_bytes = nested_bytes_;
   int nested_count = nested_op_count_;
-  used_ = allocated_ = op_count_ = 0;
+  bool compatible = current_layer_->is_group_opacity_compatible();
+  bool is_safe = is_ui_thread_safe_;
+  bool affects_transparency = current_layer_->affects_transparent_layer();
+
+  sk_sp<DlRTree> rtree = this->rtree();
+  SkRect bounds = rtree ? rtree->bounds() : this->bounds();
+
+  used_ = allocated_ = render_op_count_ = op_index_ = 0;
   nested_bytes_ = nested_op_count_ = 0;
+  is_ui_thread_safe_ = true;
   storage_.realloc(bytes);
-  bool compatible = layer_stack_.back().is_group_opacity_compatible();
-  return sk_sp<DisplayList>(new DisplayList(storage_.release(), bytes, count,
-                                            nested_bytes, nested_count,
-                                            cull_rect_, compatible));
+  layer_stack_.pop_back();
+  layer_stack_.emplace_back();
+  current_layer_ = &layer_stack_.back();
+  tracker_.reset();
+  layer_tracker_.reset();
+  current_ = DlPaint();
+
+  return sk_sp<DisplayList>(new DisplayList(
+      std::move(storage_), bytes, count, nested_bytes, nested_count, bounds,
+      compatible, is_safe, affects_transparency, std::move(rtree)));
 }
 
-DisplayListBuilder::DisplayListBuilder(const SkRect& cull_rect)
-    : cull_rect_(cull_rect) {
-  layer_stack_.emplace_back(SkM44(), cull_rect);
+DisplayListBuilder::DisplayListBuilder(const SkRect& cull_rect,
+                                       bool prepare_rtree)
+    : tracker_(cull_rect, SkMatrix::I()) {
+  if (prepare_rtree) {
+    accumulator_ = std::make_unique<RTreeBoundsAccumulator>();
+  } else {
+    accumulator_ = std::make_unique<RectBoundsAccumulator>();
+  }
+
+  layer_stack_.emplace_back();
   current_layer_ = &layer_stack_.back();
 }
 
@@ -78,14 +115,19 @@ DisplayListBuilder::~DisplayListBuilder() {
   }
 }
 
+SkISize DisplayListBuilder::GetBaseLayerSize() const {
+  return tracker_.base_device_cull_rect().roundOut().size();
+}
+
+SkImageInfo DisplayListBuilder::GetImageInfo() const {
+  SkISize size = GetBaseLayerSize();
+  return SkImageInfo::MakeUnknown(size.width(), size.height());
+}
+
 void DisplayListBuilder::onSetAntiAlias(bool aa) {
   current_.setAntiAlias(aa);
   Push<SetAntiAliasOp>(0, 0, aa);
 }
-void DisplayListBuilder::onSetDither(bool dither) {
-  current_.setDither(dither);
-  Push<SetDitherOp>(0, 0, dither);
-}
 void DisplayListBuilder::onSetInvertColors(bool invert) {
   current_.setInvertColors(invert);
   Push<SetInvertColorsOp>(0, 0, invert);
@@ -99,7 +141,7 @@ void DisplayListBuilder::onSetStrokeJoin(DlStrokeJoin join) {
   current_.setStrokeJoin(join);
   Push<SetStrokeJoinOp>(0, 0, join);
 }
-void DisplayListBuilder::onSetStyle(DlDrawStyle style) {
+void DisplayListBuilder::onSetDrawStyle(DlDrawStyle style) {
   current_.setDrawStyle(style);
   Push<SetStyleOp>(0, 0, style);
 }
@@ -116,33 +158,18 @@ void DisplayListBuilder::onSetColor(DlColor color) {
   Push<SetColorOp>(0, 0, color);
 }
 void DisplayListBuilder::onSetBlendMode(DlBlendMode mode) {
-  current_blender_ = nullptr;
   current_.setBlendMode(mode);
   Push<SetBlendModeOp>(0, 0, mode);
   UpdateCurrentOpacityCompatibility();
 }
-void DisplayListBuilder::onSetBlender(sk_sp<SkBlender> blender) {
-  // setBlender(nullptr) should be redirected to setBlendMode(SrcOver)
-  // by the set method, if not then the following is inefficient but works
-  FML_DCHECK(blender);
-  SkPaint p;
-  p.setBlender(blender);
-  if (p.asBlendMode()) {
-    setBlendMode(ToDl(p.asBlendMode().value()));
-  } else {
-    // |current_blender_| supersedes any value of |current_blend_mode_|
-    (current_blender_ = blender)  //
-        ? Push<SetBlenderOp>(0, 0, std::move(blender))
-        : Push<ClearBlenderOp>(0, 0);
-    UpdateCurrentOpacityCompatibility();
-  }
-}
+
 void DisplayListBuilder::onSetColorSource(const DlColorSource* source) {
   if (source == nullptr) {
     current_.setColorSource(nullptr);
     Push<ClearColorSourceOp>(0, 0);
   } else {
     current_.setColorSource(source->shared());
+    is_ui_thread_safe_ = is_ui_thread_safe_ && source->isUIThreadSafe();
     switch (source->type()) {
       case DlColorSourceType::kColor: {
         const DlColorColorSource* color_source = source->asColor();
@@ -191,9 +218,14 @@ void DisplayListBuilder::onSetColorSource(const DlColorSource* source) {
         Push<SetRuntimeEffectColorSourceOp>(0, 0, effect);
         break;
       }
-      case DlColorSourceType::kUnknown:
-        Push<SetSkColorSourceOp>(0, 0, source->skia_object());
+#ifdef IMPELLER_ENABLE_3D
+      case DlColorSourceType::kScene: {
+        const DlSceneColorSource* scene = source->asScene();
+        FML_DCHECK(scene);
+        Push<SetSceneColorSourceOp>(0, 0, scene);
         break;
+      }
+#endif  // IMPELLER_ENABLE_3D
     }
   }
 }
@@ -232,16 +264,12 @@ void DisplayListBuilder::onSetImageFilter(const DlImageFilter* filter) {
         new (pod) DlMatrixImageFilter(matrix_filter);
         break;
       }
-      case DlImageFilterType::kComposeFilter:
-      case DlImageFilterType::kLocalMatrixFilter:
+      case DlImageFilterType::kCompose:
+      case DlImageFilterType::kLocalMatrix:
       case DlImageFilterType::kColorFilter: {
         Push<SetSharedImageFilterOp>(0, 0, filter);
         break;
       }
-      case DlImageFilterType::kUnknown: {
-        Push<SetSkImageFilterOp>(0, 0, filter->skia_object());
-        break;
-      }
     }
   }
 }
@@ -276,10 +304,6 @@ void DisplayListBuilder::onSetColorFilter(const DlColorFilter* filter) {
         new (pod) DlLinearToSrgbGammaColorFilter();
         break;
       }
-      case DlColorFilterType::kUnknown: {
-        Push<SetSkColorFilterOp>(0, 0, filter->skia_object());
-        break;
-      }
     }
   }
   UpdateCurrentOpacityCompatibility();
@@ -297,10 +321,6 @@ void DisplayListBuilder::onSetPathEffect(const DlPathEffect* effect) {
         new (pod) DlDashPathEffect(dash_effect);
         break;
       }
-      case DlPathEffectType::kUnknown: {
-        Push<SetSkPathEffectOp>(0, 0, effect->skia_object());
-        break;
-      }
     }
   }
 }
@@ -318,30 +338,24 @@ void DisplayListBuilder::onSetMaskFilter(const DlMaskFilter* filter) {
         new (pod) DlBlurMaskFilter(blur_filter);
         break;
       }
-      case DlMaskFilterType::kUnknown:
-        Push<SetSkMaskFilterOp>(0, 0, filter->skia_object());
-        break;
     }
   }
 }
 
-void DisplayListBuilder::setAttributesFromDlPaint(
+void DisplayListBuilder::SetAttributesFromPaint(
     const DlPaint& paint,
     const DisplayListAttributeFlags flags) {
   if (flags.applies_anti_alias()) {
     setAntiAlias(paint.isAntiAlias());
   }
-  if (flags.applies_dither()) {
-    setDither(paint.isDither());
-  }
   if (flags.applies_alpha_or_color()) {
-    setColor(paint.getColor().argb);
+    setColor(paint.getColor());
   }
   if (flags.applies_blend()) {
     setBlendMode(paint.getBlendMode());
   }
   if (flags.applies_style()) {
-    setStyle(paint.getDrawStyle());
+    setDrawStyle(paint.getDrawStyle());
   }
   if (flags.is_stroked(paint.getDrawStyle())) {
     setStrokeWidth(paint.getStrokeWidth());
@@ -367,85 +381,117 @@ void DisplayListBuilder::setAttributesFromDlPaint(
   }
 }
 
-void DisplayListBuilder::setAttributesFromPaint(
-    const SkPaint& paint,
-    const DisplayListAttributeFlags flags) {
-  if (flags.applies_anti_alias()) {
-    setAntiAlias(paint.isAntiAlias());
-  }
-  if (flags.applies_dither()) {
-    setDither(paint.isDither());
-  }
-  if (flags.applies_alpha_or_color()) {
-    setColor(paint.getColor());
-  }
-  if (flags.applies_blend()) {
-    std::optional<SkBlendMode> mode_optional = paint.asBlendMode();
-    if (mode_optional) {
-      setBlendMode(ToDl(mode_optional.value()));
-    } else {
-      setBlender(sk_ref_sp(paint.getBlender()));
-    }
-  }
-  if (flags.applies_style()) {
-    setStyle(ToDl(paint.getStyle()));
-  }
-  if (flags.is_stroked(ToDl(paint.getStyle()))) {
-    setStrokeWidth(paint.getStrokeWidth());
-    setStrokeMiter(paint.getStrokeMiter());
-    setStrokeCap(ToDl(paint.getStrokeCap()));
-    setStrokeJoin(ToDl(paint.getStrokeJoin()));
-  }
-  if (flags.applies_shader()) {
-    SkShader* shader = paint.getShader();
-    setColorSource(DlColorSource::From(shader).get());
-  }
-  if (flags.applies_color_filter()) {
-    // invert colors is a Flutter::Paint thing, not an SkPaint thing
-    // we must clear it because it is a second potential color filter
-    // that is composed with the paint's color filter.
-    setInvertColors(false);
-    SkColorFilter* color_filter = paint.getColorFilter();
-    setColorFilter(DlColorFilter::From(color_filter).get());
-  }
-  if (flags.applies_image_filter()) {
-    setImageFilter(DlImageFilter::From(paint.getImageFilter()).get());
-  }
-  if (flags.applies_path_effect()) {
-    SkPathEffect* path_effect = paint.getPathEffect();
-    setPathEffect(DlPathEffect::From(path_effect).get());
-  }
-  if (flags.applies_mask_filter()) {
-    SkMaskFilter* mask_filter = paint.getMaskFilter();
-    setMaskFilter(DlMaskFilter::From(mask_filter).get());
-  }
-}
-
 void DisplayListBuilder::checkForDeferredSave() {
   if (current_layer_->has_deferred_save_op_) {
+    size_t save_offset_ = used_;
     Push<SaveOp>(0, 1);
+    current_layer_->save_offset_ = save_offset_;
     current_layer_->has_deferred_save_op_ = false;
   }
 }
 
-void DisplayListBuilder::save() {
-  layer_stack_.emplace_back(current_layer_);
+void DisplayListBuilder::Save() {
+  layer_stack_.emplace_back();
   current_layer_ = &layer_stack_.back();
+
+  FML_DCHECK(layer_stack_.size() >= 2u);
+  // Note we can't use the previous value of current_layer_ because
+  // the emplace_back() may have moved the storage locations, so we
+  // recompute the location of the penultimate layer info here.
+  auto parent_layer = &layer_stack_.end()[-2];
+
   current_layer_->has_deferred_save_op_ = true;
+  current_layer_->is_nop_ = parent_layer->is_nop_;
+
+  if (parent_layer->layer_accumulator_) {
+    FML_DCHECK(layer_tracker_);
+    // If the previous layer was using an accumulator, we need to keep
+    // filling it with content bounds. We reuse the previous accumulator
+    // for this layer, but clone the associated transform so that new
+    // transform mutations are restricted to this save/restore context.
+    current_layer_->layer_accumulator_ = parent_layer->layer_accumulator_;
+    layer_tracker_->save();
+  } else {
+    FML_DCHECK(!layer_tracker_);
+  }
+
+  tracker_.save();
+  accumulator()->save();
 }
 
-void DisplayListBuilder::restore() {
-  if (layer_stack_.size() > 1) {
-    if (!current_layer_->has_deferred_save_op_) {
-      Push<RestoreOp>(0, 1);
-    }
-    // Grab the current layer info before we push the restore
-    // on the stack.
-    LayerInfo layer_info = layer_stack_.back();
-    layer_stack_.pop_back();
-    current_layer_ = &layer_stack_.back();
-    if (layer_info.has_layer) {
-      if (layer_info.is_group_opacity_compatible()) {
+void DisplayListBuilder::Restore() {
+  if (layer_stack_.size() <= 1) {
+    return;
+  }
+
+  SaveOpBase* op = reinterpret_cast<SaveOpBase*>(storage_.get() +
+                                                 current_layer_->save_offset());
+
+  if (!current_layer_->has_deferred_save_op_) {
+    op->restore_index = op_index_;
+    Push<RestoreOp>(0, 1);
+  }
+
+  std::shared_ptr<const DlImageFilter> filter = current_layer_->filter();
+  {
+    // We should not pop the stack until we are done synching up the current
+    // and parent layers.
+    auto parent_layer = &layer_stack_.end()[-2];
+
+    if (current_layer_->is_save_layer()) {
+      // Layers are never deferred for now, we need to update the
+      // following code if we ever do saveLayer culling...
+      FML_DCHECK(!current_layer_->has_deferred_save_op_);
+      FML_DCHECK(current_layer_->layer_accumulator_);
+
+      SkRect content_bounds = current_layer_->layer_accumulator_->bounds();
+
+      switch (op->type) {
+        case DisplayListOpType::kSaveLayer:
+        case DisplayListOpType::kSaveLayerBackdrop: {
+          SaveLayerOpBase* layer_op = reinterpret_cast<SaveLayerOpBase*>(op);
+          if (op->options.bounds_from_caller()) {
+            if (!content_bounds.isEmpty() &&
+                !layer_op->rect.contains(content_bounds)) {
+              op->options = op->options.with_content_is_clipped();
+              content_bounds.intersect(layer_op->rect);
+            }
+          }
+          layer_op->rect = content_bounds;
+          break;
+        }
+        default:
+          FML_UNREACHABLE();
+      }
+
+      if (layer_tracker_->getSaveCount() > 1) {
+        layer_tracker_->restore();
+      } else {
+        // If this was the last layer in the tracker, then there should
+        // be no parent saveLayer.
+        FML_DCHECK(!parent_layer->layer_accumulator_);
+        layer_tracker_.reset();
+      }
+
+      if (parent_layer->layer_accumulator_) {
+        SkRect bounds_for_parent = content_bounds;
+        if (filter) {
+          if (!filter->map_local_bounds(bounds_for_parent, bounds_for_parent)) {
+            parent_layer->set_unbounded();
+          }
+        }
+        // The content_bounds were accumulated in the base coordinate system
+        // of the current layer, and have been adjusted there according to
+        // its image filter.
+        // The content bounds accumulation of the parent layer is relative
+        // to the parent's base coordinate system, so we need to adjust
+        // bounds_for_parent to that coordinate space.
+        FML_DCHECK(layer_tracker_);
+        layer_tracker_->mapRect(&bounds_for_parent);
+        parent_layer->layer_accumulator_->accumulate(bounds_for_parent);
+      }
+
+      if (current_layer_->is_group_opacity_compatible()) {
         // We are now going to go back and modify the matching saveLayer
         // call to add the option indicating it can distribute an opacity
         // value to its children.
@@ -458,44 +504,143 @@ void DisplayListBuilder::restore() {
         // in the DisplayList are only allowed *during* the build phase.
         // Once built, the DisplayList records must remain read only to
         // ensure consistency of rendering and |Equals()| behavior.
-        SaveLayerOp* op = reinterpret_cast<SaveLayerOp*>(
-            storage_.get() + layer_info.save_layer_offset);
         op->options = op->options.with_can_distribute_opacity();
       }
     } else {
+      if (layer_tracker_) {
+        FML_DCHECK(layer_tracker_->getSaveCount() > 1);
+        layer_tracker_->restore();
+      }
       // For regular save() ops there was no protecting layer so we have to
-      // accumulate the values into the enclosing layer.
-      if (layer_info.cannot_inherit_opacity) {
-        current_layer_->mark_incompatible();
-      } else if (layer_info.has_compatible_op) {
-        current_layer_->add_compatible_op();
+      // accumulate the inheritance properties into the enclosing layer.
+      if (current_layer_->cannot_inherit_opacity()) {
+        parent_layer->mark_incompatible();
+      } else if (current_layer_->has_compatible_op()) {
+        parent_layer->add_compatible_op();
       }
     }
   }
+
+  // Remember whether the outgoing layer was unbounded so we can adjust
+  // for it below after we apply the outgoing layer's filter to the bounds.
+  bool popped_was_unbounded = current_layer_->is_unbounded();
+
+  // parent_layer is no longer in scope, time to pop the layer.
+  layer_stack_.pop_back();
+  tracker_.restore();
+  current_layer_ = &layer_stack_.back();
+
+  // As we pop the accumulator, use the filter that was applied to the
+  // outgoing layer (saved above, if any) to adjust the bounds that
+  // were accumulated while that layer was active.
+  if (filter) {
+    const SkRect clip = tracker_.device_cull_rect();
+    if (!accumulator()->restore(
+            [filter = filter, matrix = GetTransform()](const SkRect& input,
+                                                       SkRect& output) {
+              SkIRect output_bounds;
+              bool ret = filter->map_device_bounds(input.roundOut(), matrix,
+                                                   output_bounds);
+              output.set(output_bounds);
+              return ret;
+            },
+            &clip)) {
+      popped_was_unbounded = true;
+    }
+  } else {
+    accumulator()->restore();
+  }
+
+  if (popped_was_unbounded) {
+    AccumulateUnbounded();
+  }
 }
-void DisplayListBuilder::restoreToCount(int restore_count) {
-  FML_DCHECK(restore_count <= getSaveCount());
-  while (restore_count < getSaveCount() && getSaveCount() > 1) {
+void DisplayListBuilder::RestoreToCount(int restore_count) {
+  FML_DCHECK(restore_count <= GetSaveCount());
+  while (restore_count < GetSaveCount() && GetSaveCount() > 1) {
     restore();
   }
 }
-void DisplayListBuilder::saveLayer(const SkRect* bounds,
+void DisplayListBuilder::saveLayer(const SkRect& bounds,
                                    const SaveLayerOptions in_options,
                                    const DlImageFilter* backdrop) {
   SaveLayerOptions options = in_options.without_optimizations();
+  DisplayListAttributeFlags flags = options.renders_with_attributes()
+                                        ? kSaveLayerWithPaintFlags
+                                        : kSaveLayerFlags;
+  OpResult result = PaintResult(current_, flags);
+  if (result == OpResult::kNoEffect) {
+    save();
+    current_layer_->is_nop_ = true;
+    return;
+  }
+
   size_t save_layer_offset = used_;
-  if (backdrop) {
-    bounds  //
-        ? Push<SaveLayerBackdropBoundsOp>(0, 1, *bounds, options, backdrop)
-        : Push<SaveLayerBackdropOp>(0, 1, options, backdrop);
+
+  if (options.renders_with_attributes()) {
+    // The actual flood of the outer layer clip will occur after the
+    // (eventual) corresponding restore is called, but rather than
+    // remember this information in the LayerInfo until the restore
+    // method is processed, we just mark the unbounded state up front.
+    // Another reason to accumulate the clip here rather than in
+    // restore is so that this savelayer will be tagged in the rtree
+    // with its full bounds and the right op_index so that it doesn't
+    // get culled during rendering.
+    if (!paint_nops_on_transparency()) {
+      // We will fill the clip of the outer layer when we restore.
+      // Accumulate should always return true here because if the
+      // clip was empty then that would have been caught up above
+      // when we tested the PaintResult.
+      [[maybe_unused]] bool unclipped = AccumulateUnbounded();
+      FML_DCHECK(unclipped);
+    }
+    CheckLayerOpacityCompatibility(true);
+    layer_stack_.emplace_back(save_layer_offset);
+    layer_stack_.back().filter_ = current_.getImageFilter();
   } else {
-    bounds  //
-        ? Push<SaveLayerBoundsOp>(0, 1, *bounds, options)
-        : Push<SaveLayerOp>(0, 1, options);
+    CheckLayerOpacityCompatibility(false);
+    layer_stack_.emplace_back(save_layer_offset);
   }
-  CheckLayerOpacityCompatibility(options.renders_with_attributes());
-  layer_stack_.emplace_back(current_layer_, save_layer_offset, true);
   current_layer_ = &layer_stack_.back();
+  current_layer_->is_save_layer_ = true;
+
+  tracker_.save();
+  accumulator()->save();
+
+  SkRect record_bounds;
+  if (in_options.bounds_from_caller()) {
+    options = options.with_bounds_from_caller();
+    record_bounds = bounds;
+  } else {
+    FML_DCHECK(record_bounds.isEmpty());
+  }
+  current_layer_->layer_accumulator_.reset(new RectBoundsAccumulator());
+  if (layer_tracker_) {
+    layer_tracker_->save();
+    layer_tracker_->setTransform(SkMatrix::I());
+  } else {
+    SkRect cull_rect;
+    if (in_options.bounds_from_caller()) {
+      cull_rect = bounds;
+    } else {
+      cull_rect = tracker_.local_cull_rect();
+    }
+    layer_tracker_.reset(
+        new DisplayListMatrixClipTracker(cull_rect, SkMatrix::I()));
+  }
+
+  if (backdrop) {
+    // A backdrop will affect up to the entire surface, bounded by the clip
+    // Accumulate should always return true here because if the
+    // clip was empty then that would have been caught up above
+    // when we tested the PaintResult.
+    [[maybe_unused]] bool unclipped = AccumulateUnbounded();
+    FML_DCHECK(unclipped);
+    Push<SaveLayerBackdropOp>(0, 1, options, record_bounds, backdrop);
+  } else {
+    Push<SaveLayerOp>(0, 1, options, record_bounds);
+  }
+
   if (options.renders_with_attributes()) {
     // |current_opacity_compatibility_| does not take an ImageFilter into
     // account because an individual primitive with an ImageFilter can apply
@@ -506,74 +651,118 @@ void DisplayListBuilder::saveLayer(const SkRect* bounds,
       UpdateLayerOpacityCompatibility(false);
     }
   }
+  UpdateLayerResult(result);
+
+  if (options.renders_with_attributes() && current_.getImageFilter()) {
+    // We use |resetCullRect| here because we will be accumulating bounds of
+    // primitives before applying the filter to those bounds. We might
+    // encounter a primitive whose bounds are clipped, but whose filtered
+    // bounds will not be clipped. If the individual rendering ops bounds
+    // are clipped, it will not contribute to the overall bounds which
+    // could lead to inaccurate (subset) bounds of the DisplayList.
+    // We need to reset the cull rect here to avoid this premature clipping.
+    // The filtered bounds will be clipped to the existing clip rect when
+    // this layer is restored.
+    // If bounds is null then the original cull_rect will be used.
+    tracker_.resetCullRect(in_options.bounds_from_caller() ? &bounds : nullptr);
+  } else if (in_options.bounds_from_caller()) {
+    // Even though Skia claims that the bounds are only a hint, they actually
+    // use them as the temporary layer bounds during rendering the layer, so
+    // we set them as if a clip operation were performed.
+    tracker_.clipRect(bounds, ClipOp::kIntersect, false);
+  }
 }
-void DisplayListBuilder::saveLayer(const SkRect* bounds,
+void DisplayListBuilder::SaveLayer(const SkRect* bounds,
                                    const DlPaint* paint,
                                    const DlImageFilter* backdrop) {
-  if (paint != nullptr) {
-    setAttributesFromDlPaint(*paint,
-                             DisplayListOpFlags::kSaveLayerWithPaintFlags);
-    saveLayer(bounds, SaveLayerOptions::kWithAttributes, backdrop);
+  SaveLayerOptions options;
+  SkRect temp_bounds;
+  if (bounds) {
+    options = options.with_bounds_from_caller();
+    temp_bounds = *bounds;
   } else {
-    saveLayer(bounds, SaveLayerOptions::kNoAttributes, backdrop);
+    temp_bounds.setEmpty();
+  }
+  if (paint != nullptr) {
+    options = options.with_renders_with_attributes();
+    SetAttributesFromPaint(*paint,
+                           DisplayListOpFlags::kSaveLayerWithPaintFlags);
   }
+  saveLayer(temp_bounds, options, backdrop);
 }
 
-void DisplayListBuilder::translate(SkScalar tx, SkScalar ty) {
+void DisplayListBuilder::Translate(SkScalar tx, SkScalar ty) {
   if (SkScalarIsFinite(tx) && SkScalarIsFinite(ty) &&
       (tx != 0.0 || ty != 0.0)) {
     checkForDeferredSave();
     Push<TranslateOp>(0, 1, tx, ty);
-    current_layer_->matrix.preTranslate(tx, ty);
+    tracker_.translate(tx, ty);
+    if (layer_tracker_) {
+      layer_tracker_->translate(tx, ty);
+    }
   }
 }
-void DisplayListBuilder::scale(SkScalar sx, SkScalar sy) {
+void DisplayListBuilder::Scale(SkScalar sx, SkScalar sy) {
   if (SkScalarIsFinite(sx) && SkScalarIsFinite(sy) &&
       (sx != 1.0 || sy != 1.0)) {
     checkForDeferredSave();
     Push<ScaleOp>(0, 1, sx, sy);
-    current_layer_->matrix.preScale(sx, sy);
+    tracker_.scale(sx, sy);
+    if (layer_tracker_) {
+      layer_tracker_->scale(sx, sy);
+    }
   }
 }
-void DisplayListBuilder::rotate(SkScalar degrees) {
+void DisplayListBuilder::Rotate(SkScalar degrees) {
   if (SkScalarMod(degrees, 360.0) != 0.0) {
     checkForDeferredSave();
     Push<RotateOp>(0, 1, degrees);
-    current_layer_->matrix.preConcat(SkMatrix::RotateDeg(degrees));
+    tracker_.rotate(degrees);
+    if (layer_tracker_) {
+      layer_tracker_->rotate(degrees);
+    }
   }
 }
-void DisplayListBuilder::skew(SkScalar sx, SkScalar sy) {
+void DisplayListBuilder::Skew(SkScalar sx, SkScalar sy) {
   if (SkScalarIsFinite(sx) && SkScalarIsFinite(sy) &&
       (sx != 0.0 || sy != 0.0)) {
     checkForDeferredSave();
     Push<SkewOp>(0, 1, sx, sy);
-    current_layer_->matrix.preConcat(SkMatrix::Skew(sx, sy));
+    tracker_.skew(sx, sy);
+    if (layer_tracker_) {
+      layer_tracker_->skew(sx, sy);
+    }
   }
 }
 
 // clang-format off
 
 // 2x3 2D affine subset of a 4x4 transform in row major order
-void DisplayListBuilder::transform2DAffine(
+void DisplayListBuilder::Transform2DAffine(
     SkScalar mxx, SkScalar mxy, SkScalar mxt,
     SkScalar myx, SkScalar myy, SkScalar myt) {
   if (SkScalarsAreFinite(mxx, myx) &&
       SkScalarsAreFinite(mxy, myy) &&
-      SkScalarsAreFinite(mxt, myt) &&
-      !(mxx == 1 && mxy == 0 && mxt == 0 &&
-        myx == 0 && myy == 1 && myt == 0)) {
-    checkForDeferredSave();
-    Push<Transform2DAffineOp>(0, 1,
-                              mxx, mxy, mxt,
-                              myx, myy, myt);
-    current_layer_->matrix.preConcat(SkM44(mxx, mxy,  0,  mxt,
-                                           myx, myy,  0,  myt,
-                                            0,   0,   1,   0,
-                                            0,   0,   0,   1));
+      SkScalarsAreFinite(mxt, myt)) {
+    if (mxx == 1 && mxy == 0 &&
+        myx == 0 && myy == 1) {
+      Translate(mxt, myt);
+    } else {
+      checkForDeferredSave();
+      Push<Transform2DAffineOp>(0, 1,
+                                mxx, mxy, mxt,
+                                myx, myy, myt);
+      tracker_.transform2DAffine(mxx, mxy, mxt,
+                                 myx, myy, myt);
+      if (layer_tracker_) {
+        layer_tracker_->transform2DAffine(mxx, mxy, mxt,
+                                          myx, myy, myt);
+      }
+    }
   }
 }
 // full 4x4 transform in row major order
-void DisplayListBuilder::transformFullPerspective(
+void DisplayListBuilder::TransformFullPerspective(
     SkScalar mxx, SkScalar mxy, SkScalar mxz, SkScalar mxt,
     SkScalar myx, SkScalar myy, SkScalar myz, SkScalar myt,
     SkScalar mzx, SkScalar mzy, SkScalar mzz, SkScalar mzt,
@@ -582,7 +771,7 @@ void DisplayListBuilder::transformFullPerspective(
                               myz == 0 &&
       mzx == 0 && mzy == 0 && mzz == 1 && mzt == 0 &&
       mwx == 0 && mwy == 0 && mwz == 0 && mwt == 1) {
-    transform2DAffine(mxx, mxy, mxt,
+    Transform2DAffine(mxx, mxy, mxt,
                       myx, myy, myt);
   } else if (SkScalarsAreFinite(mxx, mxy) && SkScalarsAreFinite(mxz, mxt) &&
              SkScalarsAreFinite(myx, myy) && SkScalarsAreFinite(myz, myt) &&
@@ -594,24 +783,51 @@ void DisplayListBuilder::transformFullPerspective(
                                      myx, myy, myz, myt,
                                      mzx, mzy, mzz, mzt,
                                      mwx, mwy, mwz, mwt);
-    current_layer_->matrix.preConcat(SkM44(mxx, mxy, mxz, mxt,
-                                           myx, myy, myz, myt,
-                                           mzx, mzy, mzz, mzt,
-                                           mwx, mwy, mwz, mwt));
+    tracker_.transformFullPerspective(mxx, mxy, mxz, mxt,
+                                      myx, myy, myz, myt,
+                                      mzx, mzy, mzz, mzt,
+                                      mwx, mwy, mwz, mwt);
+    if (layer_tracker_) {
+      layer_tracker_->transformFullPerspective(mxx, mxy, mxz, mxt,
+                                               myx, myy, myz, myt,
+                                               mzx, mzy, mzz, mzt,
+                                               mwx, mwy, mwz, mwt);
+    }
   }
 }
 // clang-format on
-void DisplayListBuilder::transformReset() {
+void DisplayListBuilder::TransformReset() {
   checkForDeferredSave();
   Push<TransformResetOp>(0, 0);
-  current_layer_->matrix.setIdentity();
+  if (layer_tracker_) {
+    // The matrices in layer_tracker_ and tracker_ are similar, but
+    // start at a different base transform. The tracker_ potentially
+    // has some number of transform operations on it that prefix the
+    // operations accumulated in layer_tracker_. So we can't set them both
+    // to identity in parallel as they would no longer maintain their
+    // relationship to each other.
+    // Instead we reinterpret this operation as transforming by the
+    // inverse of the current transform. Doing so to tracker_ sets it
+    // to identity so we can avoid the math there, but we must do the
+    // math the long way for layer_tracker_. This becomes:
+    //   layer_tracker_.transform(tracker_.inverse());
+    if (!layer_tracker_->inverseTransform(tracker_)) {
+      // If the inverse operation failed then that means that either
+      // the matrix above the current layer was singular, or the matrix
+      // became singular while we were accumulating the current layer.
+      // In either case, we should no longer be accumulating any
+      // contents so we set the layer tracking transform to a singular one.
+      layer_tracker_->setTransform(SkMatrix::Scale(0.0f, 0.0f));
+    }
+  }
+  tracker_.setIdentity();
 }
-void DisplayListBuilder::transform(const SkMatrix* matrix) {
+void DisplayListBuilder::Transform(const SkMatrix* matrix) {
   if (matrix != nullptr) {
-    transform(SkM44(*matrix));
+    Transform(SkM44(*matrix));
   }
 }
-void DisplayListBuilder::transform(const SkM44* m44) {
+void DisplayListBuilder::Transform(const SkM44* m44) {
   if (m44 != nullptr) {
     transformFullPerspective(
         m44->rc(0, 0), m44->rc(0, 1), m44->rc(0, 2), m44->rc(0, 3),
@@ -621,43 +837,51 @@ void DisplayListBuilder::transform(const SkM44* m44) {
   }
 }
 
-void DisplayListBuilder::clipRect(const SkRect& rect,
-                                  SkClipOp clip_op,
+void DisplayListBuilder::ClipRect(const SkRect& rect,
+                                  ClipOp clip_op,
                                   bool is_aa) {
   if (!rect.isFinite()) {
     return;
   }
+  tracker_.clipRect(rect, clip_op, is_aa);
+  if (current_layer_->is_nop_ || tracker_.is_cull_rect_empty()) {
+    current_layer_->is_nop_ = true;
+    return;
+  }
   checkForDeferredSave();
   switch (clip_op) {
-    case SkClipOp::kIntersect:
+    case ClipOp::kIntersect:
       Push<ClipIntersectRectOp>(0, 1, rect, is_aa);
-      intersect(rect);
       break;
-    case SkClipOp::kDifference:
+    case ClipOp::kDifference:
       Push<ClipDifferenceRectOp>(0, 1, rect, is_aa);
       break;
   }
 }
-void DisplayListBuilder::clipRRect(const SkRRect& rrect,
-                                   SkClipOp clip_op,
+void DisplayListBuilder::ClipRRect(const SkRRect& rrect,
+                                   ClipOp clip_op,
                                    bool is_aa) {
   if (rrect.isRect()) {
     clipRect(rrect.rect(), clip_op, is_aa);
   } else {
+    tracker_.clipRRect(rrect, clip_op, is_aa);
+    if (current_layer_->is_nop_ || tracker_.is_cull_rect_empty()) {
+      current_layer_->is_nop_ = true;
+      return;
+    }
     checkForDeferredSave();
     switch (clip_op) {
-      case SkClipOp::kIntersect:
+      case ClipOp::kIntersect:
         Push<ClipIntersectRRectOp>(0, 1, rrect, is_aa);
-        intersect(rrect.getBounds());
         break;
-      case SkClipOp::kDifference:
+      case ClipOp::kDifference:
         Push<ClipDifferenceRRectOp>(0, 1, rrect, is_aa);
         break;
     }
   }
 }
-void DisplayListBuilder::clipPath(const SkPath& path,
-                                  SkClipOp clip_op,
+void DisplayListBuilder::ClipPath(const SkPath& path,
+                                  ClipOp clip_op,
                                   bool is_aa) {
   if (!path.isInverseFillType()) {
     SkRect rect;
@@ -676,100 +900,109 @@ void DisplayListBuilder::clipPath(const SkPath& path,
       return;
     }
   }
+  tracker_.clipPath(path, clip_op, is_aa);
+  if (current_layer_->is_nop_ || tracker_.is_cull_rect_empty()) {
+    current_layer_->is_nop_ = true;
+    return;
+  }
   checkForDeferredSave();
   switch (clip_op) {
-    case SkClipOp::kIntersect:
+    case ClipOp::kIntersect:
       Push<ClipIntersectPathOp>(0, 1, path, is_aa);
-      if (!path.isInverseFillType()) {
-        intersect(path.getBounds());
-      }
       break;
-    case SkClipOp::kDifference:
+    case ClipOp::kDifference:
       Push<ClipDifferencePathOp>(0, 1, path, is_aa);
-      // Map "kDifference of inverse path" to "kIntersect of the original path".
-      if (path.isInverseFillType()) {
-        intersect(path.getBounds());
-      }
       break;
   }
 }
-void DisplayListBuilder::intersect(const SkRect& rect) {
-  SkRect dev_clip_bounds = getTransform().mapRect(rect);
-  if (!current_layer_->clip_bounds.intersect(dev_clip_bounds)) {
-    current_layer_->clip_bounds.setEmpty();
-  }
-}
-SkRect DisplayListBuilder::getLocalClipBounds() {
-  SkM44 inverse;
-  if (current_layer_->matrix.invert(&inverse)) {
-    SkRect dev_bounds;
-    current_layer_->clip_bounds.roundOut(&dev_bounds);
-    return inverse.asM33().mapRect(dev_bounds);
-  }
-  return kMaxCullRect;
-}
 
-bool DisplayListBuilder::quickReject(const SkRect& bounds) const {
-  if (bounds.isEmpty()) {
-    return true;
-  }
-  SkMatrix matrix = getTransform();
-  // We don't need the inverse, but this method tells us if the matrix
-  // is singular in which case we can reject all rendering.
-  if (!matrix.invert(nullptr)) {
-    return true;
-  }
-  SkRect dev_bounds;
-  matrix.mapRect(bounds).roundOut(&dev_bounds);
-  return !current_layer_->clip_bounds.intersects(dev_bounds);
+bool DisplayListBuilder::QuickReject(const SkRect& bounds) const {
+  return tracker_.content_culled(bounds);
 }
 
 void DisplayListBuilder::drawPaint() {
-  Push<DrawPaintOp>(0, 1);
-  CheckLayerOpacityCompatibility();
+  OpResult result = PaintResult(current_, kDrawPaintFlags);
+  if (result != OpResult::kNoEffect && AccumulateUnbounded()) {
+    Push<DrawPaintOp>(0, 1);
+    CheckLayerOpacityCompatibility();
+    UpdateLayerResult(result);
+  }
 }
-void DisplayListBuilder::drawPaint(const DlPaint& paint) {
-  setAttributesFromDlPaint(paint, DisplayListOpFlags::kDrawPaintFlags);
+void DisplayListBuilder::DrawPaint(const DlPaint& paint) {
+  SetAttributesFromPaint(paint, DisplayListOpFlags::kDrawPaintFlags);
   drawPaint();
 }
-void DisplayListBuilder::drawColor(DlColor color, DlBlendMode mode) {
-  Push<DrawColorOp>(0, 1, color, mode);
-  CheckLayerOpacityCompatibility(mode);
+void DisplayListBuilder::DrawColor(DlColor color, DlBlendMode mode) {
+  OpResult result = PaintResult(DlPaint(color).setBlendMode(mode));
+  if (result != OpResult::kNoEffect && AccumulateUnbounded()) {
+    Push<DrawColorOp>(0, 1, color, mode);
+    CheckLayerOpacityCompatibility(mode);
+    UpdateLayerResult(result);
+  }
 }
 void DisplayListBuilder::drawLine(const SkPoint& p0, const SkPoint& p1) {
-  Push<DrawLineOp>(0, 1, p0, p1);
-  CheckLayerOpacityCompatibility();
+  SkRect bounds = SkRect::MakeLTRB(p0.fX, p0.fY, p1.fX, p1.fY).makeSorted();
+  DisplayListAttributeFlags flags =
+      (bounds.width() > 0.0f && bounds.height() > 0.0f) ? kDrawLineFlags
+                                                        : kDrawHVLineFlags;
+  OpResult result = PaintResult(current_, flags);
+  if (result != OpResult::kNoEffect && AccumulateOpBounds(bounds, flags)) {
+    Push<DrawLineOp>(0, 1, p0, p1);
+    CheckLayerOpacityCompatibility();
+    UpdateLayerResult(result);
+  }
 }
-void DisplayListBuilder::drawLine(const SkPoint& p0,
+void DisplayListBuilder::DrawLine(const SkPoint& p0,
                                   const SkPoint& p1,
                                   const DlPaint& paint) {
-  setAttributesFromDlPaint(paint, DisplayListOpFlags::kDrawLineFlags);
+  SetAttributesFromPaint(paint, DisplayListOpFlags::kDrawLineFlags);
   drawLine(p0, p1);
 }
 void DisplayListBuilder::drawRect(const SkRect& rect) {
-  Push<DrawRectOp>(0, 1, rect);
-  CheckLayerOpacityCompatibility();
+  DisplayListAttributeFlags flags = kDrawRectFlags;
+  OpResult result = PaintResult(current_, flags);
+  if (result != OpResult::kNoEffect &&
+      AccumulateOpBounds(rect.makeSorted(), flags)) {
+    Push<DrawRectOp>(0, 1, rect);
+    CheckLayerOpacityCompatibility();
+    UpdateLayerResult(result);
+  }
 }
-void DisplayListBuilder::drawRect(const SkRect& rect, const DlPaint& paint) {
-  setAttributesFromDlPaint(paint, DisplayListOpFlags::kDrawRectFlags);
+void DisplayListBuilder::DrawRect(const SkRect& rect, const DlPaint& paint) {
+  SetAttributesFromPaint(paint, DisplayListOpFlags::kDrawRectFlags);
   drawRect(rect);
 }
 void DisplayListBuilder::drawOval(const SkRect& bounds) {
-  Push<DrawOvalOp>(0, 1, bounds);
-  CheckLayerOpacityCompatibility();
+  DisplayListAttributeFlags flags = kDrawOvalFlags;
+  OpResult result = PaintResult(current_, flags);
+  if (result != OpResult::kNoEffect &&
+      AccumulateOpBounds(bounds.makeSorted(), flags)) {
+    Push<DrawOvalOp>(0, 1, bounds);
+    CheckLayerOpacityCompatibility();
+    UpdateLayerResult(result);
+  }
 }
-void DisplayListBuilder::drawOval(const SkRect& bounds, const DlPaint& paint) {
-  setAttributesFromDlPaint(paint, DisplayListOpFlags::kDrawOvalFlags);
+void DisplayListBuilder::DrawOval(const SkRect& bounds, const DlPaint& paint) {
+  SetAttributesFromPaint(paint, DisplayListOpFlags::kDrawOvalFlags);
   drawOval(bounds);
 }
 void DisplayListBuilder::drawCircle(const SkPoint& center, SkScalar radius) {
-  Push<DrawCircleOp>(0, 1, center, radius);
-  CheckLayerOpacityCompatibility();
+  DisplayListAttributeFlags flags = kDrawCircleFlags;
+  OpResult result = PaintResult(current_, flags);
+  if (result != OpResult::kNoEffect) {
+    SkRect bounds = SkRect::MakeLTRB(center.fX - radius, center.fY - radius,
+                                     center.fX + radius, center.fY + radius);
+    if (AccumulateOpBounds(bounds, flags)) {
+      Push<DrawCircleOp>(0, 1, center, radius);
+      CheckLayerOpacityCompatibility();
+      UpdateLayerResult(result);
+    }
+  }
 }
-void DisplayListBuilder::drawCircle(const SkPoint& center,
+void DisplayListBuilder::DrawCircle(const SkPoint& center,
                                     SkScalar radius,
                                     const DlPaint& paint) {
-  setAttributesFromDlPaint(paint, DisplayListOpFlags::kDrawCircleFlags);
+  SetAttributesFromPaint(paint, DisplayListOpFlags::kDrawCircleFlags);
   drawCircle(center, radius);
 }
 void DisplayListBuilder::drawRRect(const SkRRect& rrect) {
@@ -778,31 +1011,53 @@ void DisplayListBuilder::drawRRect(const SkRRect& rrect) {
   } else if (rrect.isOval()) {
     drawOval(rrect.rect());
   } else {
-    Push<DrawRRectOp>(0, 1, rrect);
-    CheckLayerOpacityCompatibility();
+    DisplayListAttributeFlags flags = kDrawRRectFlags;
+    OpResult result = PaintResult(current_, flags);
+    if (result != OpResult::kNoEffect &&
+        AccumulateOpBounds(rrect.getBounds(), flags)) {
+      Push<DrawRRectOp>(0, 1, rrect);
+      CheckLayerOpacityCompatibility();
+      UpdateLayerResult(result);
+    }
   }
 }
-void DisplayListBuilder::drawRRect(const SkRRect& rrect, const DlPaint& paint) {
-  setAttributesFromDlPaint(paint, DisplayListOpFlags::kDrawRRectFlags);
+void DisplayListBuilder::DrawRRect(const SkRRect& rrect, const DlPaint& paint) {
+  SetAttributesFromPaint(paint, DisplayListOpFlags::kDrawRRectFlags);
   drawRRect(rrect);
 }
 void DisplayListBuilder::drawDRRect(const SkRRect& outer,
                                     const SkRRect& inner) {
-  Push<DrawDRRectOp>(0, 1, outer, inner);
-  CheckLayerOpacityCompatibility();
+  DisplayListAttributeFlags flags = kDrawDRRectFlags;
+  OpResult result = PaintResult(current_, flags);
+  if (result != OpResult::kNoEffect &&
+      AccumulateOpBounds(outer.getBounds(), flags)) {
+    Push<DrawDRRectOp>(0, 1, outer, inner);
+    CheckLayerOpacityCompatibility();
+    UpdateLayerResult(result);
+  }
 }
-void DisplayListBuilder::drawDRRect(const SkRRect& outer,
+void DisplayListBuilder::DrawDRRect(const SkRRect& outer,
                                     const SkRRect& inner,
                                     const DlPaint& paint) {
-  setAttributesFromDlPaint(paint, DisplayListOpFlags::kDrawDRRectFlags);
+  SetAttributesFromPaint(paint, DisplayListOpFlags::kDrawDRRectFlags);
   drawDRRect(outer, inner);
 }
 void DisplayListBuilder::drawPath(const SkPath& path) {
-  Push<DrawPathOp>(0, 1, path);
-  CheckLayerOpacityHairlineCompatibility();
+  DisplayListAttributeFlags flags = kDrawPathFlags;
+  OpResult result = PaintResult(current_, flags);
+  if (result != OpResult::kNoEffect) {
+    bool is_visible = path.isInverseFillType()
+                          ? AccumulateUnbounded()
+                          : AccumulateOpBounds(path.getBounds(), flags);
+    if (is_visible) {
+      Push<DrawPathOp>(0, 1, path);
+      CheckLayerOpacityHairlineCompatibility();
+      UpdateLayerResult(result);
+    }
+  }
 }
-void DisplayListBuilder::drawPath(const SkPath& path, const DlPaint& paint) {
-  setAttributesFromDlPaint(paint, DisplayListOpFlags::kDrawPathFlags);
+void DisplayListBuilder::DrawPath(const SkPath& path, const DlPaint& paint) {
+  SetAttributesFromPaint(paint, DisplayListOpFlags::kDrawPathFlags);
   drawPath(path);
 }
 
@@ -810,40 +1065,82 @@ void DisplayListBuilder::drawArc(const SkRect& bounds,
                                  SkScalar start,
                                  SkScalar sweep,
                                  bool useCenter) {
-  Push<DrawArcOp>(0, 1, bounds, start, sweep, useCenter);
-  if (useCenter) {
-    CheckLayerOpacityHairlineCompatibility();
-  } else {
-    CheckLayerOpacityCompatibility();
+  DisplayListAttributeFlags flags =  //
+      useCenter                      //
+          ? kDrawArcWithCenterFlags
+          : kDrawArcNoCenterFlags;
+  OpResult result = PaintResult(current_, flags);
+  // This could be tighter if we compute where the start and end
+  // angles are and then also consider the quadrants swept and
+  // the center if specified.
+  if (result != OpResult::kNoEffect && AccumulateOpBounds(bounds, flags)) {
+    Push<DrawArcOp>(0, 1, bounds, start, sweep, useCenter);
+    if (useCenter) {
+      CheckLayerOpacityHairlineCompatibility();
+    } else {
+      CheckLayerOpacityCompatibility();
+    }
+    UpdateLayerResult(result);
   }
 }
-void DisplayListBuilder::drawArc(const SkRect& bounds,
+void DisplayListBuilder::DrawArc(const SkRect& bounds,
                                  SkScalar start,
                                  SkScalar sweep,
                                  bool useCenter,
                                  const DlPaint& paint) {
-  setAttributesFromDlPaint(
+  SetAttributesFromPaint(
       paint, useCenter ? kDrawArcWithCenterFlags : kDrawArcNoCenterFlags);
   drawArc(bounds, start, sweep, useCenter);
 }
-void DisplayListBuilder::drawPoints(SkCanvas::PointMode mode,
+
+DisplayListAttributeFlags DisplayListBuilder::FlagsForPointMode(
+    PointMode mode) {
+  switch (mode) {
+    case DlCanvas::PointMode::kPoints:
+      return kDrawPointsAsPointsFlags;
+    case PointMode::kLines:
+      return kDrawPointsAsLinesFlags;
+    case PointMode::kPolygon:
+      return kDrawPointsAsPolygonFlags;
+  }
+  FML_UNREACHABLE();
+}
+void DisplayListBuilder::drawPoints(PointMode mode,
                                     uint32_t count,
                                     const SkPoint pts[]) {
-  void* data_ptr;
-  FML_DCHECK(count < kMaxDrawPointsCount);
+  if (count == 0) {
+    return;
+  }
+  DisplayListAttributeFlags flags = FlagsForPointMode(mode);
+  OpResult result = PaintResult(current_, flags);
+  if (result == OpResult::kNoEffect) {
+    return;
+  }
+
+  FML_DCHECK(count < DlOpReceiver::kMaxDrawPointsCount);
   int bytes = count * sizeof(SkPoint);
+  RectBoundsAccumulator ptBounds;
+  for (size_t i = 0; i < count; i++) {
+    ptBounds.accumulate(pts[i]);
+  }
+  SkRect point_bounds = ptBounds.bounds();
+  if (!AccumulateOpBounds(point_bounds, flags)) {
+    return;
+  }
+
+  void* data_ptr;
   switch (mode) {
-    case SkCanvas::PointMode::kPoints_PointMode:
+    case PointMode::kPoints:
       data_ptr = Push<DrawPointsOp>(bytes, 1, count);
       break;
-    case SkCanvas::PointMode::kLines_PointMode:
+    case PointMode::kLines:
       data_ptr = Push<DrawLinesOp>(bytes, 1, count);
       break;
-    case SkCanvas::PointMode::kPolygon_PointMode:
+    case PointMode::kPolygon:
       data_ptr = Push<DrawPolygonOp>(bytes, 1, count);
       break;
     default:
-      FML_DCHECK(false);
+      FML_UNREACHABLE();
       return;
   }
   CopyV(data_ptr, pts, count);
@@ -853,52 +1150,35 @@ void DisplayListBuilder::drawPoints(SkCanvas::PointMode mode,
   // bounds of every sub-primitive.
   // See: https://fiddle.skia.org/c/228459001d2de8db117ce25ef5cedb0c
   UpdateLayerOpacityCompatibility(false);
+  UpdateLayerResult(result);
 }
-void DisplayListBuilder::drawPoints(SkCanvas::PointMode mode,
+void DisplayListBuilder::DrawPoints(PointMode mode,
                                     uint32_t count,
                                     const SkPoint pts[],
                                     const DlPaint& paint) {
-  const DisplayListAttributeFlags* flags;
-  switch (mode) {
-    case SkCanvas::PointMode::kPoints_PointMode:
-      flags = &DisplayListOpFlags::kDrawPointsAsPointsFlags;
-      break;
-    case SkCanvas::PointMode::kLines_PointMode:
-      flags = &DisplayListOpFlags::kDrawPointsAsLinesFlags;
-      break;
-    case SkCanvas::PointMode::kPolygon_PointMode:
-      flags = &DisplayListOpFlags::kDrawPointsAsPolygonFlags;
-      break;
-    default:
-      FML_DCHECK(false);
-      return;
-  }
-  setAttributesFromDlPaint(paint, *flags);
+  SetAttributesFromPaint(paint, FlagsForPointMode(mode));
   drawPoints(mode, count, pts);
 }
-void DisplayListBuilder::drawSkVertices(const sk_sp<SkVertices> vertices,
-                                        SkBlendMode mode) {
-  Push<DrawSkVerticesOp>(0, 1, vertices, mode);
-  // DrawVertices applies its colors to the paint so we have no way
-  // of controlling opacity using the current paint attributes.
-  // Although, examination of the |mode| might find some predictable
-  // cases.
-  UpdateLayerOpacityCompatibility(false);
-}
 void DisplayListBuilder::drawVertices(const DlVertices* vertices,
                                       DlBlendMode mode) {
-  void* pod = Push<DrawVerticesOp>(vertices->size(), 1, mode);
-  new (pod) DlVertices(vertices);
-  // DrawVertices applies its colors to the paint so we have no way
-  // of controlling opacity using the current paint attributes.
-  // Although, examination of the |mode| might find some predictable
-  // cases.
-  UpdateLayerOpacityCompatibility(false);
+  DisplayListAttributeFlags flags = kDrawVerticesFlags;
+  OpResult result = PaintResult(current_, flags);
+  if (result != OpResult::kNoEffect &&
+      AccumulateOpBounds(vertices->bounds(), flags)) {
+    void* pod = Push<DrawVerticesOp>(vertices->size(), 1, mode);
+    new (pod) DlVertices(vertices);
+    // DrawVertices applies its colors to the paint so we have no way
+    // of controlling opacity using the current paint attributes.
+    // Although, examination of the |mode| might find some predictable
+    // cases.
+    UpdateLayerOpacityCompatibility(false);
+    UpdateLayerResult(result);
+  }
 }
-void DisplayListBuilder::drawVertices(const DlVertices* vertices,
+void DisplayListBuilder::DrawVertices(const DlVertices* vertices,
                                       DlBlendMode mode,
                                       const DlPaint& paint) {
-  setAttributesFromDlPaint(paint, DisplayListOpFlags::kDrawVerticesFlags);
+  SetAttributesFromPaint(paint, DisplayListOpFlags::kDrawVerticesFlags);
   drawVertices(vertices, mode);
 }
 
@@ -906,18 +1186,31 @@ void DisplayListBuilder::drawImage(const sk_sp<DlImage> image,
                                    const SkPoint point,
                                    DlImageSampling sampling,
                                    bool render_with_attributes) {
-  render_with_attributes
-      ? Push<DrawImageWithAttrOp>(0, 1, image, point, sampling)
-      : Push<DrawImageOp>(0, 1, image, point, sampling);
-  CheckLayerOpacityCompatibility(render_with_attributes);
+  DisplayListAttributeFlags flags = render_with_attributes  //
+                                        ? kDrawImageWithPaintFlags
+                                        : kDrawImageFlags;
+  OpResult result = PaintResult(current_, flags);
+  if (result == OpResult::kNoEffect) {
+    return;
+  }
+  SkRect bounds = SkRect::MakeXYWH(point.fX, point.fY,  //
+                                   image->width(), image->height());
+  if (AccumulateOpBounds(bounds, flags)) {
+    render_with_attributes
+        ? Push<DrawImageWithAttrOp>(0, 1, image, point, sampling)
+        : Push<DrawImageOp>(0, 1, image, point, sampling);
+    CheckLayerOpacityCompatibility(render_with_attributes);
+    UpdateLayerResult(result);
+    is_ui_thread_safe_ = is_ui_thread_safe_ && image->isUIThreadSafe();
+  }
 }
-void DisplayListBuilder::drawImage(const sk_sp<DlImage>& image,
+void DisplayListBuilder::DrawImage(const sk_sp<DlImage>& image,
                                    const SkPoint point,
                                    DlImageSampling sampling,
                                    const DlPaint* paint) {
   if (paint != nullptr) {
-    setAttributesFromDlPaint(*paint,
-                             DisplayListOpFlags::kDrawImageWithPaintFlags);
+    SetAttributesFromPaint(*paint,
+                           DisplayListOpFlags::kDrawImageWithPaintFlags);
     drawImage(image, point, sampling, true);
   } else {
     drawImage(image, point, sampling, false);
@@ -928,20 +1221,28 @@ void DisplayListBuilder::drawImageRect(const sk_sp<DlImage> image,
                                        const SkRect& dst,
                                        DlImageSampling sampling,
                                        bool render_with_attributes,
-                                       SkCanvas::SrcRectConstraint constraint) {
-  Push<DrawImageRectOp>(0, 1, image, src, dst, sampling, render_with_attributes,
-                        constraint);
-  CheckLayerOpacityCompatibility(render_with_attributes);
+                                       SrcRectConstraint constraint) {
+  DisplayListAttributeFlags flags = render_with_attributes
+                                        ? kDrawImageRectWithPaintFlags
+                                        : kDrawImageRectFlags;
+  OpResult result = PaintResult(current_, flags);
+  if (result != OpResult::kNoEffect && AccumulateOpBounds(dst, flags)) {
+    Push<DrawImageRectOp>(0, 1, image, src, dst, sampling,
+                          render_with_attributes, constraint);
+    CheckLayerOpacityCompatibility(render_with_attributes);
+    UpdateLayerResult(result);
+    is_ui_thread_safe_ = is_ui_thread_safe_ && image->isUIThreadSafe();
+  }
 }
-void DisplayListBuilder::drawImageRect(const sk_sp<DlImage>& image,
+void DisplayListBuilder::DrawImageRect(const sk_sp<DlImage>& image,
                                        const SkRect& src,
                                        const SkRect& dst,
                                        DlImageSampling sampling,
                                        const DlPaint* paint,
-                                       SkCanvas::SrcRectConstraint constraint) {
+                                       SrcRectConstraint constraint) {
   if (paint != nullptr) {
-    setAttributesFromDlPaint(*paint,
-                             DisplayListOpFlags::kDrawImageRectWithPaintFlags);
+    SetAttributesFromPaint(*paint,
+                           DisplayListOpFlags::kDrawImageRectWithPaintFlags);
     drawImageRect(image, src, dst, sampling, true, constraint);
   } else {
     drawImageRect(image, src, dst, sampling, false, constraint);
@@ -952,46 +1253,32 @@ void DisplayListBuilder::drawImageNine(const sk_sp<DlImage> image,
                                        const SkRect& dst,
                                        DlFilterMode filter,
                                        bool render_with_attributes) {
-  render_with_attributes
-      ? Push<DrawImageNineWithAttrOp>(0, 1, image, center, dst, filter)
-      : Push<DrawImageNineOp>(0, 1, image, center, dst, filter);
-  CheckLayerOpacityCompatibility(render_with_attributes);
+  DisplayListAttributeFlags flags = render_with_attributes
+                                        ? kDrawImageNineWithPaintFlags
+                                        : kDrawImageNineFlags;
+  OpResult result = PaintResult(current_, flags);
+  if (result != OpResult::kNoEffect && AccumulateOpBounds(dst, flags)) {
+    render_with_attributes
+        ? Push<DrawImageNineWithAttrOp>(0, 1, image, center, dst, filter)
+        : Push<DrawImageNineOp>(0, 1, image, center, dst, filter);
+    CheckLayerOpacityCompatibility(render_with_attributes);
+    UpdateLayerResult(result);
+    is_ui_thread_safe_ = is_ui_thread_safe_ && image->isUIThreadSafe();
+  }
 }
-void DisplayListBuilder::drawImageNine(const sk_sp<DlImage>& image,
+void DisplayListBuilder::DrawImageNine(const sk_sp<DlImage>& image,
                                        const SkIRect& center,
                                        const SkRect& dst,
                                        DlFilterMode filter,
                                        const DlPaint* paint) {
   if (paint != nullptr) {
-    setAttributesFromDlPaint(*paint,
-                             DisplayListOpFlags::kDrawImageNineWithPaintFlags);
+    SetAttributesFromPaint(*paint,
+                           DisplayListOpFlags::kDrawImageNineWithPaintFlags);
     drawImageNine(image, center, dst, filter, true);
   } else {
     drawImageNine(image, center, dst, filter, false);
   }
 }
-void DisplayListBuilder::drawImageLattice(const sk_sp<DlImage> image,
-                                          const SkCanvas::Lattice& lattice,
-                                          const SkRect& dst,
-                                          DlFilterMode filter,
-                                          bool render_with_attributes) {
-  int x_div_count = lattice.fXCount;
-  int y_div_count = lattice.fYCount;
-  FML_DCHECK((lattice.fRectTypes == nullptr) || (lattice.fColors != nullptr));
-  int cell_count = lattice.fRectTypes && lattice.fColors
-                       ? (x_div_count + 1) * (y_div_count + 1)
-                       : 0;
-  size_t bytes =
-      (x_div_count + y_div_count) * sizeof(int) +
-      cell_count * (sizeof(SkColor) + sizeof(SkCanvas::Lattice::RectType));
-  SkIRect src = lattice.fBounds ? *lattice.fBounds : image->bounds();
-  void* pod = this->Push<DrawImageLatticeOp>(bytes, 1, image, x_div_count,
-                                             y_div_count, cell_count, src, dst,
-                                             filter, render_with_attributes);
-  CopyV(pod, lattice.fXDivs, x_div_count, lattice.fYDivs, y_div_count,
-        lattice.fColors, cell_count, lattice.fRectTypes, cell_count);
-  CheckLayerOpacityCompatibility(render_with_attributes);
-}
 void DisplayListBuilder::drawAtlas(const sk_sp<DlImage> atlas,
                                    const SkRSXform xform[],
                                    const SkRect tex[],
@@ -1001,6 +1288,27 @@ void DisplayListBuilder::drawAtlas(const sk_sp<DlImage> atlas,
                                    DlImageSampling sampling,
                                    const SkRect* cull_rect,
                                    bool render_with_attributes) {
+  DisplayListAttributeFlags flags = render_with_attributes  //
+                                        ? kDrawAtlasWithPaintFlags
+                                        : kDrawAtlasFlags;
+  OpResult result = PaintResult(current_, flags);
+  if (result == OpResult::kNoEffect) {
+    return;
+  }
+  SkPoint quad[4];
+  RectBoundsAccumulator atlasBounds;
+  for (int i = 0; i < count; i++) {
+    const SkRect& src = tex[i];
+    xform[i].toQuad(src.width(), src.height(), quad);
+    for (int j = 0; j < 4; j++) {
+      atlasBounds.accumulate(quad[j]);
+    }
+  }
+  if (atlasBounds.is_empty() ||
+      !AccumulateOpBounds(atlasBounds.bounds(), flags)) {
+    return;
+  }
+
   int bytes = count * (sizeof(SkRSXform) + sizeof(SkRect));
   void* data_ptr;
   if (colors != nullptr) {
@@ -1029,8 +1337,10 @@ void DisplayListBuilder::drawAtlas(const sk_sp<DlImage> atlas,
   // on it to distribute the opacity without overlap without checking all
   // of the transforms and texture rectangles.
   UpdateLayerOpacityCompatibility(false);
+  UpdateLayerResult(result);
+  is_ui_thread_safe_ = is_ui_thread_safe_ && atlas->isUIThreadSafe();
 }
-void DisplayListBuilder::drawAtlas(const sk_sp<DlImage>& atlas,
+void DisplayListBuilder::DrawAtlas(const sk_sp<DlImage>& atlas,
                                    const SkRSXform xform[],
                                    const SkRect tex[],
                                    const DlColor colors[],
@@ -1040,8 +1350,8 @@ void DisplayListBuilder::drawAtlas(const sk_sp<DlImage>& atlas,
                                    const SkRect* cull_rect,
                                    const DlPaint* paint) {
   if (paint != nullptr) {
-    setAttributesFromDlPaint(*paint,
-                             DisplayListOpFlags::kDrawAtlasWithPaintFlags);
+    SetAttributesFromPaint(*paint,
+                           DisplayListOpFlags::kDrawAtlasWithPaintFlags);
     drawAtlas(atlas, xform, tex, colors, count, mode, sampling, cull_rect,
               true);
   } else {
@@ -1050,58 +1360,464 @@ void DisplayListBuilder::drawAtlas(const sk_sp<DlImage>& atlas,
   }
 }
 
-void DisplayListBuilder::drawPicture(const sk_sp<SkPicture> picture,
-                                     const SkMatrix* matrix,
-                                     bool render_with_attributes) {
-  matrix  //
-      ? Push<DrawSkPictureMatrixOp>(0, 1, picture, *matrix,
-                                    render_with_attributes)
-      : Push<DrawSkPictureOp>(0, 1, picture, render_with_attributes);
-  // The non-nested op count accumulated in the |Push| method will include
-  // this call to |drawPicture| for non-nested op count metrics.
-  // But, for nested op count metrics we want the |drawPicture| call itself
-  // to be transparent. So we subtract 1 from our accumulated nested count to
-  // balance out against the 1 that was accumulated into the regular count.
-  // This behavior is identical to the way SkPicture computes nested op counts.
-  nested_op_count_ += picture->approximateOpCount(true) - 1;
-  nested_bytes_ += picture->approximateBytesUsed();
-  CheckLayerOpacityCompatibility(render_with_attributes);
-}
-void DisplayListBuilder::drawDisplayList(
-    const sk_sp<DisplayList> display_list) {
-  Push<DrawDisplayListOp>(0, 1, display_list);
+void DisplayListBuilder::DrawDisplayList(const sk_sp<DisplayList> display_list,
+                                         SkScalar opacity) {
+  if (!SkScalarIsFinite(opacity) || opacity <= SK_ScalarNearlyZero ||
+      display_list->op_count() == 0 || display_list->bounds().isEmpty() ||
+      current_layer_->is_nop_) {
+    return;
+  }
+  const SkRect bounds = display_list->bounds();
+  bool accumulated;
+  switch (accumulator()->type()) {
+    case BoundsAccumulatorType::kRect:
+      accumulated = AccumulateOpBounds(bounds, kDrawDisplayListFlags);
+      break;
+    case BoundsAccumulatorType::kRTree:
+      auto rtree = display_list->rtree();
+      if (rtree) {
+        std::list<SkRect> rects =
+            rtree->searchAndConsolidateRects(GetLocalClipBounds(), false);
+        accumulated = false;
+        for (const SkRect& rect : rects) {
+          // TODO (https://github.com/flutter/flutter/issues/114919): Attributes
+          // are not necessarily `kDrawDisplayListFlags`.
+          if (AccumulateOpBounds(rect, kDrawDisplayListFlags)) {
+            accumulated = true;
+          }
+        }
+      } else {
+        accumulated = AccumulateOpBounds(bounds, kDrawDisplayListFlags);
+      }
+      break;
+  }
+  if (!accumulated) {
+    return;
+  }
+
+  DlPaint current_paint = current_;
+  Push<DrawDisplayListOp>(0, 1, display_list,
+                          opacity < SK_Scalar1 ? opacity : SK_Scalar1);
+  is_ui_thread_safe_ = is_ui_thread_safe_ && display_list->isUIThreadSafe();
+  // Not really necessary if the developer is interacting with us via
+  // our attribute-state-less DlCanvas methods, but this avoids surprises
+  // for those who may have been using the stateful Dispatcher methods.
+  SetAttributesFromPaint(current_paint,
+                         DisplayListOpFlags::kSaveLayerWithPaintFlags);
+
   // The non-nested op count accumulated in the |Push| method will include
   // this call to |drawDisplayList| for non-nested op count metrics.
   // But, for nested op count metrics we want the |drawDisplayList| call itself
   // to be transparent. So we subtract 1 from our accumulated nested count to
   // balance out against the 1 that was accumulated into the regular count.
-  // This behavior is identical to the way SkPicture computes nested op counts.
+  // This behavior is identical to the way SkPicture computed nested op counts.
   nested_op_count_ += display_list->op_count(true) - 1;
   nested_bytes_ += display_list->bytes(true);
   UpdateLayerOpacityCompatibility(display_list->can_apply_group_opacity());
+  // Nop DisplayLists are eliminated above so we either affect transparent
+  // pixels or we do not. We should not have [kNoEffect].
+  UpdateLayerResult(display_list->modifies_transparent_black()
+                        ? OpResult::kAffectsAll
+                        : OpResult::kPreservesTransparency);
 }
 void DisplayListBuilder::drawTextBlob(const sk_sp<SkTextBlob> blob,
                                       SkScalar x,
                                       SkScalar y) {
-  Push<DrawTextBlobOp>(0, 1, blob, x, y);
-  CheckLayerOpacityCompatibility();
+  DisplayListAttributeFlags flags = kDrawTextBlobFlags;
+  OpResult result = PaintResult(current_, flags);
+  if (result == OpResult::kNoEffect) {
+    return;
+  }
+  bool unclipped = AccumulateOpBounds(blob->bounds().makeOffset(x, y), flags);
+  // TODO(https://github.com/flutter/flutter/issues/82202): Remove once the
+  // unit tests can use Fuchsia's font manager instead of the empty default.
+  // Until then we might encounter empty bounds for otherwise valid text and
+  // thus we ignore the results from AccumulateOpBounds.
+#if defined(OS_FUCHSIA)
+  unclipped = true;
+#endif  // OS_FUCHSIA
+  if (unclipped) {
+    Push<DrawTextBlobOp>(0, 1, blob, x, y);
+    // There is no way to query if the glyphs of a text blob overlap and
+    // there are no current guarantees from either Skia or Impeller that
+    // they will protect overlapping glyphs from the effects of overdraw
+    // so we must make the conservative assessment that this DL layer is
+    // not compatible with group opacity inheritance.
+    UpdateLayerOpacityCompatibility(false);
+    UpdateLayerResult(result);
+  }
 }
-void DisplayListBuilder::drawTextBlob(const sk_sp<SkTextBlob>& blob,
+void DisplayListBuilder::DrawTextBlob(const sk_sp<SkTextBlob>& blob,
                                       SkScalar x,
                                       SkScalar y,
                                       const DlPaint& paint) {
-  setAttributesFromDlPaint(paint, DisplayListOpFlags::kDrawTextBlobFlags);
+  SetAttributesFromPaint(paint, DisplayListOpFlags::kDrawTextBlobFlags);
   drawTextBlob(blob, x, y);
 }
-void DisplayListBuilder::drawShadow(const SkPath& path,
+
+void DisplayListBuilder::drawTextFrame(
+    const std::shared_ptr<impeller::TextFrame>& text_frame,
+    SkScalar x,
+    SkScalar y) {
+  DisplayListAttributeFlags flags = kDrawTextBlobFlags;
+  OpResult result = PaintResult(current_, flags);
+  if (result == OpResult::kNoEffect) {
+    return;
+  }
+  impeller::Rect bounds = text_frame->GetBounds();
+  SkRect sk_bounds = SkRect::MakeLTRB(bounds.GetLeft(), bounds.GetTop(),
+                                      bounds.GetRight(), bounds.GetBottom());
+  bool unclipped = AccumulateOpBounds(sk_bounds.makeOffset(x, y), flags);
+  // TODO(https://github.com/flutter/flutter/issues/82202): Remove once the
+  // unit tests can use Fuchsia's font manager instead of the empty default.
+  // Until then we might encounter empty bounds for otherwise valid text and
+  // thus we ignore the results from AccumulateOpBounds.
+#if defined(OS_FUCHSIA)
+  unclipped = true;
+#endif  // OS_FUCHSIA
+  if (unclipped) {
+    Push<DrawTextFrameOp>(0, 1, text_frame, x, y);
+    // There is no way to query if the glyphs of a text blob overlap and
+    // there are no current guarantees from either Skia or Impeller that
+    // they will protect overlapping glyphs from the effects of overdraw
+    // so we must make the conservative assessment that this DL layer is
+    // not compatible with group opacity inheritance.
+    UpdateLayerOpacityCompatibility(false);
+    UpdateLayerResult(result);
+  }
+}
+
+void DisplayListBuilder::DrawTextFrame(
+    const std::shared_ptr<impeller::TextFrame>& text_frame,
+    SkScalar x,
+    SkScalar y,
+    const DlPaint& paint) {
+  SetAttributesFromPaint(paint, DisplayListOpFlags::kDrawTextBlobFlags);
+  drawTextFrame(text_frame, x, y);
+}
+
+void DisplayListBuilder::DrawShadow(const SkPath& path,
                                     const DlColor color,
                                     const SkScalar elevation,
                                     bool transparent_occluder,
                                     SkScalar dpr) {
-  transparent_occluder  //
-      ? Push<DrawShadowTransparentOccluderOp>(0, 1, path, color, elevation, dpr)
-      : Push<DrawShadowOp>(0, 1, path, color, elevation, dpr);
-  UpdateLayerOpacityCompatibility(false);
+  OpResult result = PaintResult(DlPaint(color));
+  if (result != OpResult::kNoEffect) {
+    SkRect shadow_bounds =
+        DlCanvas::ComputeShadowBounds(path, elevation, dpr, GetTransform());
+    if (AccumulateOpBounds(shadow_bounds, kDrawShadowFlags)) {
+      transparent_occluder  //
+          ? Push<DrawShadowTransparentOccluderOp>(0, 1, path, color, elevation,
+                                                  dpr)
+          : Push<DrawShadowOp>(0, 1, path, color, elevation, dpr);
+      UpdateLayerOpacityCompatibility(false);
+      UpdateLayerResult(result);
+    }
+  }
+}
+
+bool DisplayListBuilder::AdjustBoundsForPaint(SkRect& bounds,
+                                              DisplayListAttributeFlags flags) {
+  if (flags.ignores_paint()) {
+    return true;
+  }
+
+  if (flags.is_geometric()) {
+    bool is_stroked = flags.is_stroked(current_.getDrawStyle());
+
+    // Path effect occurs before stroking...
+    DisplayListSpecialGeometryFlags special_flags =
+        flags.WithPathEffect(current_.getPathEffectPtr(), is_stroked);
+    if (current_.getPathEffect()) {
+      auto effect_bounds = current_.getPathEffect()->effect_bounds(bounds);
+      if (!effect_bounds.has_value()) {
+        return false;
+      }
+      bounds = effect_bounds.value();
+    }
+
+    if (is_stroked) {
+      // Determine the max multiplier to the stroke width first.
+      SkScalar pad = 1.0f;
+      if (current_.getStrokeJoin() == DlStrokeJoin::kMiter &&
+          special_flags.may_have_acute_joins()) {
+        pad = std::max(pad, current_.getStrokeMiter());
+      }
+      if (current_.getStrokeCap() == DlStrokeCap::kSquare &&
+          special_flags.may_have_diagonal_caps()) {
+        pad = std::max(pad, SK_ScalarSqrt2);
+      }
+      SkScalar min_stroke_width = 0.01;
+      pad *= std::max(current_.getStrokeWidth() * 0.5f, min_stroke_width);
+      bounds.outset(pad, pad);
+    }
+  }
+
+  if (flags.applies_mask_filter()) {
+    auto filter = current_.getMaskFilter();
+    if (filter) {
+      switch (filter->type()) {
+        case DlMaskFilterType::kBlur: {
+          FML_DCHECK(filter->asBlur());
+          SkScalar mask_sigma_pad = filter->asBlur()->sigma() * 3.0;
+          bounds.outset(mask_sigma_pad, mask_sigma_pad);
+        }
+      }
+    }
+  }
+
+  // Color filter does not modify bounds even if it affects transparent
+  // black because it is clipped by the "mask" of the primitive. That
+  // property only comes into play when it is applied to something like
+  // a layer.
+
+  if (flags.applies_image_filter()) {
+    auto filter = current_.getImageFilterPtr();
+    if (filter && !filter->map_local_bounds(bounds, bounds)) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+bool DisplayListBuilder::AccumulateUnbounded() {
+  SkRect clip = tracker_.device_cull_rect();
+  if (clip.isEmpty()) {
+    return false;
+  }
+  accumulator()->accumulate(clip, op_index_);
+  if (current_layer_->layer_accumulator_) {
+    FML_DCHECK(layer_tracker_);
+    current_layer_->layer_accumulator_->accumulate(
+        layer_tracker_->device_cull_rect());
+  }
+  return true;
+}
+
+bool DisplayListBuilder::AccumulateOpBounds(SkRect& bounds,
+                                            DisplayListAttributeFlags flags) {
+  if (AdjustBoundsForPaint(bounds, flags)) {
+    return AccumulateBounds(bounds);
+  } else {
+    return AccumulateUnbounded();
+  }
+}
+bool DisplayListBuilder::AccumulateBounds(SkRect& bounds) {
+  if (!bounds.isEmpty()) {
+    SkRect device_bounds;
+    tracker_.mapRect(bounds, &device_bounds);
+    if (device_bounds.intersect(tracker_.device_cull_rect())) {
+      accumulator()->accumulate(device_bounds, op_index_);
+      if (current_layer_->layer_accumulator_) {
+        FML_DCHECK(layer_tracker_);
+        SkRect layer_bounds;
+        layer_tracker_->mapRect(bounds, &layer_bounds);
+        current_layer_->layer_accumulator_->accumulate(layer_bounds);
+      }
+      return true;
+    }
+  }
+  return false;
+}
+
+bool DisplayListBuilder::paint_nops_on_transparency() {
+  // SkImageFilter::canComputeFastBounds tests for transparency behavior
+  // This test assumes that the blend mode checked down below will
+  // NOP on transparent black.
+  if (current_.getImageFilterPtr() &&
+      current_.getImageFilterPtr()->modifies_transparent_black()) {
+    return false;
+  }
+
+  // We filter the transparent black that is used for the background of a
+  // saveLayer and make sure it returns transparent black. If it does, then
+  // the color filter will leave all area surrounding the contents of the
+  // save layer untouched out to the edge of the output surface.
+  // This test assumes that the blend mode checked down below will
+  // NOP on transparent black.
+  if (current_.getColorFilterPtr() &&
+      current_.getColorFilterPtr()->modifies_transparent_black()) {
+    return false;
+  }
+
+  // Unusual blendmodes require us to process a saved layer
+  // even with operations outside the clip.
+  // For example, DstIn is used by masking layers.
+  // https://code.google.com/p/skia/issues/detail?id=1291
+  // https://crbug.com/401593
+  switch (current_.getBlendMode()) {
+    // For each of the following transfer modes, if the source
+    // alpha is zero (our transparent black), the resulting
+    // blended pixel is not necessarily equal to the original
+    // destination pixel.
+    // Mathematically, any time in the following equations where
+    // the result is not d assuming source is 0
+    case DlBlendMode::kClear:     // r = 0
+    case DlBlendMode::kSrc:       // r = s
+    case DlBlendMode::kSrcIn:     // r = s * da
+    case DlBlendMode::kDstIn:     // r = d * sa
+    case DlBlendMode::kSrcOut:    // r = s * (1-da)
+    case DlBlendMode::kDstATop:   // r = d*sa + s*(1-da)
+    case DlBlendMode::kModulate:  // r = s*d
+      return false;
+      break;
+
+    // And in these equations, the result must be d if the
+    // source is 0
+    case DlBlendMode::kDst:         // r = d
+    case DlBlendMode::kSrcOver:     // r = s + (1-sa)*d
+    case DlBlendMode::kDstOver:     // r = d + (1-da)*s
+    case DlBlendMode::kDstOut:      // r = d * (1-sa)
+    case DlBlendMode::kSrcATop:     // r = s*da + d*(1-sa)
+    case DlBlendMode::kXor:         // r = s*(1-da) + d*(1-sa)
+    case DlBlendMode::kPlus:        // r = min(s + d, 1)
+    case DlBlendMode::kScreen:      // r = s + d - s*d
+    case DlBlendMode::kOverlay:     // multiply or screen, depending on dest
+    case DlBlendMode::kDarken:      // rc = s + d - max(s*da, d*sa),
+                                    // ra = kSrcOver
+    case DlBlendMode::kLighten:     // rc = s + d - min(s*da, d*sa),
+                                    // ra = kSrcOver
+    case DlBlendMode::kColorDodge:  // brighten destination to reflect source
+    case DlBlendMode::kColorBurn:   // darken destination to reflect source
+    case DlBlendMode::kHardLight:   // multiply or screen, depending on source
+    case DlBlendMode::kSoftLight:   // lighten or darken, depending on source
+    case DlBlendMode::kDifference:  // rc = s + d - 2*(min(s*da, d*sa)),
+                                    // ra = kSrcOver
+    case DlBlendMode::kExclusion:   // rc = s + d - two(s*d), ra = kSrcOver
+    case DlBlendMode::kMultiply:    // r = s*(1-da) + d*(1-sa) + s*d
+    case DlBlendMode::kHue:         // ra = kSrcOver
+    case DlBlendMode::kSaturation:  // ra = kSrcOver
+    case DlBlendMode::kColor:       // ra = kSrcOver
+    case DlBlendMode::kLuminosity:  // ra = kSrcOver
+      return true;
+      break;
+  }
+}
+
+DlColor DisplayListBuilder::GetEffectiveColor(const DlPaint& paint,
+                                              DisplayListAttributeFlags flags) {
+  DlColor color;
+  if (flags.applies_color()) {
+    const DlColorSource* source = paint.getColorSourcePtr();
+    if (source) {
+      if (source->asColor()) {
+        color = source->asColor()->color();
+      } else {
+        color = source->is_opaque() ? DlColor::kBlack() : kAnyColor;
+      }
+    } else {
+      color = paint.getColor();
+    }
+  } else if (flags.applies_alpha()) {
+    // If the operation applies alpha, but not color, then the only impact
+    // of the alpha is to modulate the output towards transparency.
+    // We can not guarantee an opaque source even if the alpha is opaque
+    // since that would require knowing something about the colors that
+    // the alpha is modulating, but we can guarantee a transparent source
+    // if the alpha is 0.
+    color = (paint.getAlpha() == 0) ? DlColor::kTransparent() : kAnyColor;
+  } else {
+    color = kAnyColor;
+  }
+  if (flags.applies_image_filter()) {
+    auto filter = paint.getImageFilterPtr();
+    if (filter) {
+      if (!color.isTransparent() || filter->modifies_transparent_black()) {
+        color = kAnyColor;
+      }
+    }
+  }
+  if (flags.applies_color_filter()) {
+    auto filter = paint.getColorFilterPtr();
+    if (filter) {
+      if (!color.isTransparent() || filter->modifies_transparent_black()) {
+        color = kAnyColor;
+      }
+    }
+  }
+  return color;
+}
+
+DisplayListBuilder::OpResult DisplayListBuilder::PaintResult(
+    const DlPaint& paint,
+    DisplayListAttributeFlags flags) {
+  if (current_layer_->is_nop_) {
+    return OpResult::kNoEffect;
+  }
+  if (flags.applies_blend()) {
+    switch (paint.getBlendMode()) {
+      // Nop blend mode (singular, there is only one)
+      case DlBlendMode::kDst:
+        return OpResult::kNoEffect;
+
+      // Always clears pixels blend mode (singular, there is only one)
+      case DlBlendMode::kClear:
+        return OpResult::kPreservesTransparency;
+
+      case DlBlendMode::kHue:
+      case DlBlendMode::kSaturation:
+      case DlBlendMode::kColor:
+      case DlBlendMode::kLuminosity:
+      case DlBlendMode::kColorBurn:
+        return GetEffectiveColor(paint, flags).isTransparent()
+                   ? OpResult::kNoEffect
+                   : OpResult::kAffectsAll;
+
+      // kSrcIn modifies pixels towards transparency
+      case DlBlendMode::kSrcIn:
+        return OpResult::kPreservesTransparency;
+
+      // These blend modes preserve destination alpha
+      case DlBlendMode::kSrcATop:
+      case DlBlendMode::kDstOut:
+        return GetEffectiveColor(paint, flags).isTransparent()
+                   ? OpResult::kNoEffect
+                   : OpResult::kPreservesTransparency;
+
+      // Always destructive blend modes, potentially not affecting transparency
+      case DlBlendMode::kSrc:
+      case DlBlendMode::kSrcOut:
+      case DlBlendMode::kDstATop:
+        return GetEffectiveColor(paint, flags).isTransparent()
+                   ? OpResult::kPreservesTransparency
+                   : OpResult::kAffectsAll;
+
+      // The kDstIn blend mode modifies the destination unless the
+      // source color is opaque.
+      case DlBlendMode::kDstIn:
+        return GetEffectiveColor(paint, flags).isOpaque()
+                   ? OpResult::kNoEffect
+                   : OpResult::kPreservesTransparency;
+
+      // The next group of blend modes modifies the destination unless the
+      // source color is transparent.
+      case DlBlendMode::kSrcOver:
+      case DlBlendMode::kDstOver:
+      case DlBlendMode::kXor:
+      case DlBlendMode::kPlus:
+      case DlBlendMode::kScreen:
+      case DlBlendMode::kMultiply:
+      case DlBlendMode::kOverlay:
+      case DlBlendMode::kDarken:
+      case DlBlendMode::kLighten:
+      case DlBlendMode::kColorDodge:
+      case DlBlendMode::kHardLight:
+      case DlBlendMode::kSoftLight:
+      case DlBlendMode::kDifference:
+      case DlBlendMode::kExclusion:
+        return GetEffectiveColor(paint, flags).isTransparent()
+                   ? OpResult::kNoEffect
+                   : OpResult::kAffectsAll;
+
+      // Modulate only leaves the pixel alone when the source is white.
+      case DlBlendMode::kModulate:
+        return GetEffectiveColor(paint, flags) == DlColor::kWhite()
+                   ? OpResult::kNoEffect
+                   : OpResult::kPreservesTransparency;
+    }
+  }
+  return OpResult::kAffectsAll;
 }
 
 }  // namespace flutter
diff --git a/display_list/display_list_builder.h b/display_list/dl_builder.h
similarity index 41%
rename from display_list/display_list_builder.h
rename to display_list/dl_builder.h
index 2f2cd863bd96c904a03e6681d60db92bd364dcef..a1742f3a4305ae5b581a3408adf88e98e00b232c 100644
--- a/display_list/display_list_builder.h
+++ b/display_list/dl_builder.h
@@ -2,321 +2,459 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_BUILDER_H_
-#define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_BUILDER_H_
+#ifndef FLUTTER_DISPLAY_LIST_DL_BUILDER_H_
+#define FLUTTER_DISPLAY_LIST_DL_BUILDER_H_
 
 #include "flutter/display_list/display_list.h"
-#include "flutter/display_list/display_list_blend_mode.h"
-#include "flutter/display_list/display_list_comparable.h"
-#include "flutter/display_list/display_list_dispatcher.h"
-#include "flutter/display_list/display_list_flags.h"
-#include "flutter/display_list/display_list_image.h"
-#include "flutter/display_list/display_list_paint.h"
-#include "flutter/display_list/display_list_path_effect.h"
-#include "flutter/display_list/display_list_sampling_options.h"
-#include "flutter/display_list/types.h"
+#include "flutter/display_list/dl_blend_mode.h"
+#include "flutter/display_list/dl_canvas.h"
+#include "flutter/display_list/dl_op_flags.h"
+#include "flutter/display_list/dl_op_receiver.h"
+#include "flutter/display_list/dl_paint.h"
+#include "flutter/display_list/dl_sampling_options.h"
+#include "flutter/display_list/effects/dl_path_effect.h"
+#include "flutter/display_list/image/dl_image.h"
+#include "flutter/display_list/utils/dl_bounds_accumulator.h"
+#include "flutter/display_list/utils/dl_comparable.h"
+#include "flutter/display_list/utils/dl_matrix_clip_tracker.h"
 #include "flutter/fml/macros.h"
 
 namespace flutter {
 
 // The primary class used to build a display list. The list of methods
-// here matches the list of methods invoked on a |Dispatcher|.
-// If there is some code that already renders to an SkCanvas object,
-// those rendering commands can be captured into a DisplayList using
-// the DisplayListCanvasRecorder class.
-class DisplayListBuilder final : public virtual Dispatcher,
+// here matches the list of methods invoked on a |DlOpReceiver| combined
+// with the list of methods invoked on a |DlCanvas|.
+class DisplayListBuilder final : public virtual DlCanvas,
                                  public SkRefCnt,
+                                 virtual DlOpReceiver,
                                  DisplayListOpFlags {
  public:
   static constexpr SkRect kMaxCullRect =
       SkRect::MakeLTRB(-1E9F, -1E9F, 1E9F, 1E9F);
 
-  explicit DisplayListBuilder(const SkRect& cull_rect = kMaxCullRect);
+  explicit DisplayListBuilder(bool prepare_rtree)
+      : DisplayListBuilder(kMaxCullRect, prepare_rtree) {}
+
+  explicit DisplayListBuilder(const SkRect& cull_rect = kMaxCullRect,
+                              bool prepare_rtree = false);
 
   ~DisplayListBuilder();
 
+  // |DlCanvas|
+  SkISize GetBaseLayerSize() const override;
+  // |DlCanvas|
+  SkImageInfo GetImageInfo() const override;
+
+  // |DlCanvas|
+  void Save() override;
+
+  // |DlCanvas|
+  void SaveLayer(const SkRect* bounds,
+                 const DlPaint* paint = nullptr,
+                 const DlImageFilter* backdrop = nullptr) override;
+  // |DlCanvas|
+  void Restore() override;
+  // |DlCanvas|
+  int GetSaveCount() const override { return layer_stack_.size(); }
+  // |DlCanvas|
+  void RestoreToCount(int restore_count) override;
+
+  // |DlCanvas|
+  void Translate(SkScalar tx, SkScalar ty) override;
+  // |DlCanvas|
+  void Scale(SkScalar sx, SkScalar sy) override;
+  // |DlCanvas|
+  void Rotate(SkScalar degrees) override;
+  // |DlCanvas|
+  void Skew(SkScalar sx, SkScalar sy) override;
+
+  // clang-format off
+  // 2x3 2D affine subset of a 4x4 transform in row major order
+  // |DlCanvas|
+  void Transform2DAffine(SkScalar mxx, SkScalar mxy, SkScalar mxt,
+                         SkScalar myx, SkScalar myy, SkScalar myt) override;
+  // full 4x4 transform in row major order
+  // |DlCanvas|
+  void TransformFullPerspective(
+      SkScalar mxx, SkScalar mxy, SkScalar mxz, SkScalar mxt,
+      SkScalar myx, SkScalar myy, SkScalar myz, SkScalar myt,
+      SkScalar mzx, SkScalar mzy, SkScalar mzz, SkScalar mzt,
+      SkScalar mwx, SkScalar mwy, SkScalar mwz, SkScalar mwt) override;
+  // clang-format on
+  // |DlCanvas|
+  void TransformReset() override;
+  // |DlCanvas|
+  void Transform(const SkMatrix* matrix) override;
+  // |DlCanvas|
+  void Transform(const SkM44* matrix44) override;
+  // |DlCanvas|
+  void SetTransform(const SkMatrix* matrix) override {
+    TransformReset();
+    Transform(matrix);
+  }
+  // |DlCanvas|
+  void SetTransform(const SkM44* matrix44) override {
+    TransformReset();
+    Transform(matrix44);
+  }
+  using DlCanvas::Transform;
+
+  /// Returns the 4x4 full perspective transform representing all transform
+  /// operations executed so far in this DisplayList within the enclosing
+  /// save stack.
+  // |DlCanvas|
+  SkM44 GetTransformFullPerspective() const override {
+    return tracker_.matrix_4x4();
+  }
+  /// Returns the 3x3 partial perspective transform representing all transform
+  /// operations executed so far in this DisplayList within the enclosing
+  /// save stack.
+  // |DlCanvas|
+  SkMatrix GetTransform() const override { return tracker_.matrix_3x3(); }
+
+  // |DlCanvas|
+  void ClipRect(const SkRect& rect,
+                ClipOp clip_op = ClipOp::kIntersect,
+                bool is_aa = false) override;
+  // |DlCanvas|
+  void ClipRRect(const SkRRect& rrect,
+                 ClipOp clip_op = ClipOp::kIntersect,
+                 bool is_aa = false) override;
+  // |DlCanvas|
+  void ClipPath(const SkPath& path,
+                ClipOp clip_op = ClipOp::kIntersect,
+                bool is_aa = false) override;
+
+  /// Conservative estimate of the bounds of all outstanding clip operations
+  /// measured in the coordinate space within which this DisplayList will
+  /// be rendered.
+  // |DlCanvas|
+  SkRect GetDestinationClipBounds() const override {
+    return tracker_.device_cull_rect();
+  }
+  /// Conservative estimate of the bounds of all outstanding clip operations
+  /// transformed into the local coordinate space in which currently
+  /// recorded rendering operations are interpreted.
+  // |DlCanvas|
+  SkRect GetLocalClipBounds() const override {
+    return tracker_.local_cull_rect();
+  }
+
+  /// Return true iff the supplied bounds are easily shown to be outside
+  /// of the current clip bounds. This method may conservatively return
+  /// false if it cannot make the determination.
+  // |DlCanvas|
+  bool QuickReject(const SkRect& bounds) const override;
+
+  // |DlCanvas|
+  void DrawPaint(const DlPaint& paint) override;
+  // |DlCanvas|
+  void DrawColor(DlColor color, DlBlendMode mode) override;
+  // |DlCanvas|
+  void DrawLine(const SkPoint& p0,
+                const SkPoint& p1,
+                const DlPaint& paint) override;
+  // |DlCanvas|
+  void DrawRect(const SkRect& rect, const DlPaint& paint) override;
+  // |DlCanvas|
+  void DrawOval(const SkRect& bounds, const DlPaint& paint) override;
+  // |DlCanvas|
+  void DrawCircle(const SkPoint& center,
+                  SkScalar radius,
+                  const DlPaint& paint) override;
+  // |DlCanvas|
+  void DrawRRect(const SkRRect& rrect, const DlPaint& paint) override;
+  // |DlCanvas|
+  void DrawDRRect(const SkRRect& outer,
+                  const SkRRect& inner,
+                  const DlPaint& paint) override;
+  // |DlCanvas|
+  void DrawPath(const SkPath& path, const DlPaint& paint) override;
+  // |DlCanvas|
+  void DrawArc(const SkRect& bounds,
+               SkScalar start,
+               SkScalar sweep,
+               bool useCenter,
+               const DlPaint& paint) override;
+  // |DlCanvas|
+  void DrawPoints(PointMode mode,
+                  uint32_t count,
+                  const SkPoint pts[],
+                  const DlPaint& paint) override;
+  // |DlCanvas|
+  void DrawVertices(const DlVertices* vertices,
+                    DlBlendMode mode,
+                    const DlPaint& paint) override;
+  using DlCanvas::DrawVertices;
+  // |DlCanvas|
+  void DrawImage(const sk_sp<DlImage>& image,
+                 const SkPoint point,
+                 DlImageSampling sampling,
+                 const DlPaint* paint = nullptr) override;
+  // |DlCanvas|
+  void DrawImageRect(
+      const sk_sp<DlImage>& image,
+      const SkRect& src,
+      const SkRect& dst,
+      DlImageSampling sampling,
+      const DlPaint* paint = nullptr,
+      SrcRectConstraint constraint = SrcRectConstraint::kFast) override;
+  using DlCanvas::DrawImageRect;
+  // |DlCanvas|
+  void DrawImageNine(const sk_sp<DlImage>& image,
+                     const SkIRect& center,
+                     const SkRect& dst,
+                     DlFilterMode filter,
+                     const DlPaint* paint = nullptr) override;
+  // |DlCanvas|
+  void DrawAtlas(const sk_sp<DlImage>& atlas,
+                 const SkRSXform xform[],
+                 const SkRect tex[],
+                 const DlColor colors[],
+                 int count,
+                 DlBlendMode mode,
+                 DlImageSampling sampling,
+                 const SkRect* cullRect,
+                 const DlPaint* paint = nullptr) override;
+  // |DlCanvas|
+  void DrawDisplayList(const sk_sp<DisplayList> display_list,
+                       SkScalar opacity = SK_Scalar1) override;
+  // |DlCanvas|
+  void DrawTextBlob(const sk_sp<SkTextBlob>& blob,
+                    SkScalar x,
+                    SkScalar y,
+                    const DlPaint& paint) override;
+
+  void drawTextFrame(const std::shared_ptr<impeller::TextFrame>& text_frame,
+                     SkScalar x,
+                     SkScalar y) override;
+
+  void DrawTextFrame(const std::shared_ptr<impeller::TextFrame>& text_frame,
+                     SkScalar x,
+                     SkScalar y,
+                     const DlPaint& paint) override;
+
+  // |DlCanvas|
+  void DrawShadow(const SkPath& path,
+                  const DlColor color,
+                  const SkScalar elevation,
+                  bool transparent_occluder,
+                  SkScalar dpr) override;
+
+  // |DlCanvas|
+  void Flush() override {}
+
+  sk_sp<DisplayList> Build();
+
+ private:
+  // This method exposes the internal stateful DlOpReceiver implementation
+  // of the DisplayListBuilder, primarily for testing purposes. Its use
+  // is obsolete and forbidden in every other case and is only shared to a
+  // pair of "friend" accessors in the benchmark/unittest files.
+  DlOpReceiver& asReceiver() { return *this; }
+
+  friend DlOpReceiver& DisplayListBuilderBenchmarkAccessor(
+      DisplayListBuilder& builder);
+  friend DlOpReceiver& DisplayListBuilderTestingAccessor(
+      DisplayListBuilder& builder);
+  friend DlPaint DisplayListBuilderTestingAttributes(
+      DisplayListBuilder& builder);
+
+  void SetAttributesFromPaint(const DlPaint& paint,
+                              const DisplayListAttributeFlags flags);
+
+  // |DlOpReceiver|
   void setAntiAlias(bool aa) override {
     if (current_.isAntiAlias() != aa) {
       onSetAntiAlias(aa);
     }
   }
-  void setDither(bool dither) override {
-    if (current_.isDither() != dither) {
-      onSetDither(dither);
-    }
-  }
+  // |DlOpReceiver|
   void setInvertColors(bool invert) override {
     if (current_.isInvertColors() != invert) {
       onSetInvertColors(invert);
     }
   }
+  // |DlOpReceiver|
   void setStrokeCap(DlStrokeCap cap) override {
     if (current_.getStrokeCap() != cap) {
       onSetStrokeCap(cap);
     }
   }
+  // |DlOpReceiver|
   void setStrokeJoin(DlStrokeJoin join) override {
     if (current_.getStrokeJoin() != join) {
       onSetStrokeJoin(join);
     }
   }
-  void setStyle(DlDrawStyle style) override {
+  // |DlOpReceiver|
+  void setDrawStyle(DlDrawStyle style) override {
     if (current_.getDrawStyle() != style) {
-      onSetStyle(style);
+      onSetDrawStyle(style);
     }
   }
+  // |DlOpReceiver|
   void setStrokeWidth(float width) override {
     if (current_.getStrokeWidth() != width) {
       onSetStrokeWidth(width);
     }
   }
+  // |DlOpReceiver|
   void setStrokeMiter(float limit) override {
     if (current_.getStrokeMiter() != limit) {
       onSetStrokeMiter(limit);
     }
   }
+  // |DlOpReceiver|
   void setColor(DlColor color) override {
     if (current_.getColor() != color) {
       onSetColor(color);
     }
   }
+  // |DlOpReceiver|
   void setBlendMode(DlBlendMode mode) override {
-    if (current_blender_ || current_.getBlendMode() != mode) {
+    if (current_.getBlendMode() != mode) {
       onSetBlendMode(mode);
     }
   }
-  void setBlender(sk_sp<SkBlender> blender) override {
-    if (!blender) {
-      setBlendMode(DlBlendMode::kSrcOver);
-    } else if (current_blender_ != blender) {
-      onSetBlender(std::move(blender));
-    }
-  }
+  // |DlOpReceiver|
   void setColorSource(const DlColorSource* source) override {
     if (NotEquals(current_.getColorSource(), source)) {
       onSetColorSource(source);
     }
   }
+  // |DlOpReceiver|
   void setImageFilter(const DlImageFilter* filter) override {
     if (NotEquals(current_.getImageFilter(), filter)) {
       onSetImageFilter(filter);
     }
   }
+  // |DlOpReceiver|
   void setColorFilter(const DlColorFilter* filter) override {
     if (NotEquals(current_.getColorFilter(), filter)) {
       onSetColorFilter(filter);
     }
   }
+  // |DlOpReceiver|
   void setPathEffect(const DlPathEffect* effect) override {
     if (NotEquals(current_.getPathEffect(), effect)) {
       onSetPathEffect(effect);
     }
   }
+  // |DlOpReceiver|
   void setMaskFilter(const DlMaskFilter* filter) override {
     if (NotEquals(current_.getMaskFilter(), filter)) {
       onSetMaskFilter(filter);
     }
   }
 
-  bool isAntiAlias() const { return current_.isAntiAlias(); }
-  bool isDither() const { return current_.isDither(); }
-  DlDrawStyle getStyle() const { return current_.getDrawStyle(); }
-  DlColor getColor() const { return current_.getColor(); }
-  float getStrokeWidth() const { return current_.getStrokeWidth(); }
-  float getStrokeMiter() const { return current_.getStrokeMiter(); }
-  DlStrokeCap getStrokeCap() const { return current_.getStrokeCap(); }
-  DlStrokeJoin getStrokeJoin() const { return current_.getStrokeJoin(); }
-  std::shared_ptr<const DlColorSource> getColorSource() const {
-    return current_.getColorSource();
-  }
-  std::shared_ptr<const DlColorFilter> getColorFilter() const {
-    return current_.getColorFilter();
-  }
-  bool isInvertColors() const { return current_.isInvertColors(); }
-  std::optional<DlBlendMode> getBlendMode() const {
-    if (current_blender_) {
-      // The setters will turn "Mode" style blenders into "blend_mode"s
-      return {};
-    }
-    return current_.getBlendMode();
-  }
-  sk_sp<SkBlender> getBlender() const {
-    return current_blender_ ? current_blender_
-                            : SkBlender::Mode(ToSk(current_.getBlendMode()));
-  }
-  std::shared_ptr<const DlPathEffect> getPathEffect() const {
-    return current_.getPathEffect();
-  }
-  std::shared_ptr<const DlMaskFilter> getMaskFilter() const {
-    return current_.getMaskFilter();
-  }
-  std::shared_ptr<const DlImageFilter> getImageFilter() const {
-    return current_.getImageFilter();
-  }
+  DlPaint CurrentAttributes() const { return current_; }
 
-  void save() override;
+  // |DlOpReceiver|
+  void save() override { Save(); }
   // Only the |renders_with_attributes()| option will be accepted here. Any
   // other flags will be ignored and calculated anew as the DisplayList is
   // built. Alternatively, use the |saveLayer(SkRect, bool)| method.
-  void saveLayer(const SkRect* bounds,
+  // |DlOpReceiver|
+  void saveLayer(const SkRect& bounds,
                  const SaveLayerOptions options,
                  const DlImageFilter* backdrop) override;
-  // Convenience method with just a boolean to indicate whether the saveLayer
-  // should apply the rendering attributes.
-  void saveLayer(const SkRect* bounds, bool renders_with_attributes) {
-    saveLayer(bounds,
-              renders_with_attributes ? SaveLayerOptions::kWithAttributes
-                                      : SaveLayerOptions::kNoAttributes,
-              nullptr);
-  }
-  void saveLayer(const SkRect* bounds,
-                 const DlPaint* paint,
-                 const DlImageFilter* backdrop = nullptr);
-  void restore() override;
-  int getSaveCount() { return layer_stack_.size(); }
-  void restoreToCount(int restore_count);
-
-  void translate(SkScalar tx, SkScalar ty) override;
-  void scale(SkScalar sx, SkScalar sy) override;
-  void rotate(SkScalar degrees) override;
-  void skew(SkScalar sx, SkScalar sy) override;
-
-  void setAttributesFromPaint(const SkPaint& paint,
-                              const DisplayListAttributeFlags flags);
+  // |DlOpReceiver|
+  void restore() override { Restore(); }
+
+  // |DlOpReceiver|
+  void translate(SkScalar tx, SkScalar ty) override { Translate(tx, ty); }
+  // |DlOpReceiver|
+  void scale(SkScalar sx, SkScalar sy) override { Scale(sx, sy); }
+  // |DlOpReceiver|
+  void rotate(SkScalar degrees) override { Rotate(degrees); }
+  // |DlOpReceiver|
+  void skew(SkScalar sx, SkScalar sy) override { Skew(sx, sy); }
 
   // clang-format off
-
-  // 2x3 2D affine subset of a 4x4 transform in row major order
+  // |DlOpReceiver|
   void transform2DAffine(SkScalar mxx, SkScalar mxy, SkScalar mxt,
-                         SkScalar myx, SkScalar myy, SkScalar myt) override;
-  // full 4x4 transform in row major order
+                         SkScalar myx, SkScalar myy, SkScalar myt) override {
+    Transform2DAffine(mxx, mxy, mxt, myx, myy, myt);
+  }
+  // |DlOpReceiver|
   void transformFullPerspective(
       SkScalar mxx, SkScalar mxy, SkScalar mxz, SkScalar mxt,
       SkScalar myx, SkScalar myy, SkScalar myz, SkScalar myt,
       SkScalar mzx, SkScalar mzy, SkScalar mzz, SkScalar mzt,
-      SkScalar mwx, SkScalar mwy, SkScalar mwz, SkScalar mwt) override;
-  // clang-format on
-  void transformReset() override;
-  void transform(const SkMatrix* matrix);
-  void transform(const SkM44* matrix44);
-  void transform(const SkMatrix& matrix) { transform(&matrix); }
-  void transform(const SkM44& matrix44) { transform(&matrix44); }
-
-  /// Returns the 4x4 full perspective transform representing all transform
-  /// operations executed so far in this DisplayList within the enclosing
-  /// save stack.
-  SkM44 getTransformFullPerspective() { return current_layer_->matrix; }
-  /// Returns the 3x3 partial perspective transform representing all transform
-  /// operations executed so far in this DisplayList within the enclosing
-  /// save stack.
-  SkMatrix getTransform() const { return current_layer_->matrix.asM33(); }
-
-  void clipRect(const SkRect& rect, SkClipOp clip_op, bool is_aa) override;
-  void clipRRect(const SkRRect& rrect, SkClipOp clip_op, bool is_aa) override;
-  void clipPath(const SkPath& path, SkClipOp clip_op, bool is_aa) override;
-
-  /// Conservative estimate of the bounds of all outstanding clip operations
-  /// measured in the coordinate space within which this DisplayList will
-  /// be rendered.
-  SkRect getDestinationClipBounds() { return current_layer_->clip_bounds; }
-  /// Conservative estimate of the bounds of all outstanding clip operations
-  /// transformed into the local coordinate space in which currently
-  /// recorded rendering operations are interpreted.
-  SkRect getLocalClipBounds();
+      SkScalar mwx, SkScalar mwy, SkScalar mwz, SkScalar mwt) override {
+    TransformFullPerspective(mxx, mxy, mxz, mxt,
+                             myx, myy, myz, myt,
+                             mzx, mzy, mzz, mzt,
+                             mwx, mwy, mwz, mwt);
+  }
+  // clang-format off
+  // |DlOpReceiver|
+  void transformReset() override { TransformReset(); }
 
-  /// Return true iff the supplied bounds are easily shown to be outside
-  /// of the current clip bounds. This method may conservatively return
-  /// false if it cannot make the determination.
-  bool quickReject(const SkRect& bounds) const;
+  // |DlOpReceiver|
+  void clipRect(const SkRect& rect, ClipOp clip_op, bool is_aa) override {
+    ClipRect(rect, clip_op, is_aa);
+  }
+  // |DlOpReceiver|
+  void clipRRect(const SkRRect& rrect, ClipOp clip_op, bool is_aa) override {
+    ClipRRect(rrect, clip_op, is_aa);
+  }
+  // |DlOpReceiver|
+  void clipPath(const SkPath& path, ClipOp clip_op, bool is_aa) override {
+    ClipPath(path, clip_op, is_aa);
+  }
 
+  // |DlOpReceiver|
   void drawPaint() override;
-  void drawPaint(const DlPaint& paint);
-  void drawColor(DlColor color, DlBlendMode mode) override;
+  // |DlOpReceiver|
+  void drawColor(DlColor color, DlBlendMode mode) override {
+    DrawColor(color, mode);
+  }
+  // |DlOpReceiver|
   void drawLine(const SkPoint& p0, const SkPoint& p1) override;
-  void drawLine(const SkPoint& p0, const SkPoint& p1, const DlPaint& paint);
+  // |DlOpReceiver|
   void drawRect(const SkRect& rect) override;
-  void drawRect(const SkRect& rect, const DlPaint& paint);
+  // |DlOpReceiver|
   void drawOval(const SkRect& bounds) override;
-  void drawOval(const SkRect& bounds, const DlPaint& paint);
+  // |DlOpReceiver|
   void drawCircle(const SkPoint& center, SkScalar radius) override;
-  void drawCircle(const SkPoint& center, SkScalar radius, const DlPaint& paint);
+  // |DlOpReceiver|
   void drawRRect(const SkRRect& rrect) override;
-  void drawRRect(const SkRRect& rrect, const DlPaint& paint);
+  // |DlOpReceiver|
   void drawDRRect(const SkRRect& outer, const SkRRect& inner) override;
-  void drawDRRect(const SkRRect& outer,
-                  const SkRRect& inner,
-                  const DlPaint& paint);
+  // |DlOpReceiver|
   void drawPath(const SkPath& path) override;
-  void drawPath(const SkPath& path, const DlPaint& paint);
+  // |DlOpReceiver|
   void drawArc(const SkRect& bounds,
                SkScalar start,
                SkScalar sweep,
                bool useCenter) override;
-  void drawArc(const SkRect& bounds,
-               SkScalar start,
-               SkScalar sweep,
-               bool useCenter,
-               const DlPaint& paint);
-  void drawPoints(SkCanvas::PointMode mode,
-                  uint32_t count,
-                  const SkPoint pts[]) override;
-  void drawPoints(SkCanvas::PointMode mode,
-                  uint32_t count,
-                  const SkPoint pts[],
-                  const DlPaint& paint);
-  void drawSkVertices(const sk_sp<SkVertices> vertices,
-                      SkBlendMode mode) override;
+  // |DlOpReceiver|
+  void drawPoints(PointMode mode, uint32_t count, const SkPoint pts[]) override;
+  // |DlOpReceiver|
   void drawVertices(const DlVertices* vertices, DlBlendMode mode) override;
-  void drawVertices(const std::shared_ptr<const DlVertices> vertices,
-                    DlBlendMode mode) {
-    drawVertices(vertices.get(), mode);
-  }
-  void drawVertices(const DlVertices* vertices,
-                    DlBlendMode mode,
-                    const DlPaint& paint);
-  void drawVertices(const std::shared_ptr<const DlVertices> vertices,
-                    DlBlendMode mode,
-                    const DlPaint& paint) {
-    drawVertices(vertices.get(), mode, paint);
-  }
+
+  // |DlOpReceiver|
   void drawImage(const sk_sp<DlImage> image,
                  const SkPoint point,
                  DlImageSampling sampling,
                  bool render_with_attributes) override;
-  void drawImage(const sk_sp<DlImage>& image,
-                 const SkPoint point,
-                 DlImageSampling sampling,
-                 const DlPaint* paint = nullptr);
+  // |DlOpReceiver|
   void drawImageRect(
       const sk_sp<DlImage> image,
       const SkRect& src,
       const SkRect& dst,
       DlImageSampling sampling,
       bool render_with_attributes,
-      SkCanvas::SrcRectConstraint constraint =
-          SkCanvas::SrcRectConstraint::kFast_SrcRectConstraint) override;
-  void drawImageRect(const sk_sp<DlImage>& image,
-                     const SkRect& src,
-                     const SkRect& dst,
-                     DlImageSampling sampling,
-                     const DlPaint* paint = nullptr,
-                     SkCanvas::SrcRectConstraint constraint =
-                         SkCanvas::SrcRectConstraint::kFast_SrcRectConstraint);
+      SrcRectConstraint constraint = SrcRectConstraint::kFast) override;
+  // |DlOpReceiver|
   void drawImageNine(const sk_sp<DlImage> image,
                      const SkIRect& center,
                      const SkRect& dst,
                      DlFilterMode filter,
                      bool render_with_attributes) override;
-  void drawImageNine(const sk_sp<DlImage>& image,
-                     const SkIRect& center,
-                     const SkRect& dst,
-                     DlFilterMode filter,
-                     const DlPaint* paint = nullptr);
-  void drawImageLattice(const sk_sp<DlImage> image,
-                        const SkCanvas::Lattice& lattice,
-                        const SkRect& dst,
-                        DlFilterMode filter,
-                        bool render_with_attributes) override;
+  // |DlOpReceiver|
   void drawAtlas(const sk_sp<DlImage> atlas,
                  const SkRSXform xform[],
                  const SkRect tex[],
@@ -326,53 +464,42 @@ class DisplayListBuilder final : public virtual Dispatcher,
                  DlImageSampling sampling,
                  const SkRect* cullRect,
                  bool render_with_attributes) override;
-  void drawAtlas(const sk_sp<DlImage>& atlas,
-                 const SkRSXform xform[],
-                 const SkRect tex[],
-                 const DlColor colors[],
-                 int count,
-                 DlBlendMode mode,
-                 DlImageSampling sampling,
-                 const SkRect* cullRect,
-                 const DlPaint* paint = nullptr);
-  void drawPicture(const sk_sp<SkPicture> picture,
-                   const SkMatrix* matrix,
-                   bool render_with_attributes) override;
-  void drawDisplayList(const sk_sp<DisplayList> display_list) override;
+
+  // |DlOpReceiver|
+  void drawDisplayList(const sk_sp<DisplayList> display_list,
+                       SkScalar opacity) override {
+    DrawDisplayList(display_list, opacity);
+  }
+  // |DlOpReceiver|
   void drawTextBlob(const sk_sp<SkTextBlob> blob,
                     SkScalar x,
                     SkScalar y) override;
-  void drawTextBlob(const sk_sp<SkTextBlob>& blob,
-                    SkScalar x,
-                    SkScalar y,
-                    const DlPaint& paint);
+  // |DlOpReceiver|
   void drawShadow(const SkPath& path,
                   const DlColor color,
                   const SkScalar elevation,
                   bool transparent_occluder,
-                  SkScalar dpr) override;
-
-  sk_sp<DisplayList> Build();
+                  SkScalar dpr) override {
+    DrawShadow(path, color, elevation, transparent_occluder, dpr);
+  }
 
- private:
   void checkForDeferredSave();
 
-  SkAutoTMalloc<uint8_t> storage_;
+  DisplayListStorage storage_;
   size_t used_ = 0;
   size_t allocated_ = 0;
-  int op_count_ = 0;
+  int render_op_count_ = 0;
+  int op_index_ = 0;
 
   // bytes and ops from |drawPicture| and |drawDisplayList|
   size_t nested_bytes_ = 0;
   int nested_op_count_ = 0;
 
-  SkRect cull_rect_;
+  bool is_ui_thread_safe_ = true;
 
   template <typename T, typename... Args>
   void* Push(size_t extra, int op_inc, Args&&... args);
 
-  void setAttributesFromDlPaint(const DlPaint& paint,
-                                const DisplayListAttributeFlags flags);
   void intersect(const SkRect& rect);
 
   // kInvalidSigma is used to indicate that no MaskBlur is currently set.
@@ -381,46 +508,30 @@ class DisplayListBuilder final : public virtual Dispatcher,
     return SkScalarIsFinite(sigma) && sigma > 0.0;
   }
 
-  struct LayerInfo {
-    LayerInfo(const SkM44& matrix,
-              const SkRect& clip_bounds,
-              size_t save_layer_offset = 0,
-              bool has_layer = false)
-        : save_layer_offset(save_layer_offset),
-          has_layer(has_layer),
-          cannot_inherit_opacity(false),
-          has_compatible_op(false),
-          matrix(matrix),
-          clip_bounds(clip_bounds) {}
-
-    LayerInfo(const LayerInfo* current_layer,
-              size_t save_layer_offset = 0,
-              bool has_layer = false)
-        : LayerInfo(current_layer->matrix,
-                    current_layer->clip_bounds,
-                    save_layer_offset,
-                    has_layer) {}
-
-    // The offset into the memory buffer where the saveLayer DLOp record
-    // for this saveLayer() call is placed. This may be needed if the
+  class SaveInfo {
+   public:
+    explicit SaveInfo(size_t save_offset = 0) : save_offset_(save_offset) {}
+
+    // The offset into the memory buffer where the save DLOp record
+    // for this save() call is placed. This may be needed if the
     // eventual restore() call has discovered important information about
     // the records inside the saveLayer that may impact how the saveLayer
     // is handled (e.g., |cannot_inherit_opacity| == false).
     // This offset is only valid if |has_layer| is true.
-    size_t save_layer_offset;
-
-    bool has_deferred_save_op_ = false;
-
-    bool has_layer;
-    bool cannot_inherit_opacity;
-    bool has_compatible_op;
+    size_t save_offset() const { return save_offset_; }
 
-    SkM44 matrix;
-    SkRect clip_bounds;
+    bool is_save_layer() const { return is_save_layer_; }
+    bool cannot_inherit_opacity() const { return cannot_inherit_opacity_; }
+    bool has_compatible_op() const { return has_compatible_op_; }
+    bool affects_transparent_layer() const {
+      return affects_transparent_layer_;
+    }
 
-    bool is_group_opacity_compatible() const { return !cannot_inherit_opacity; }
+    bool is_group_opacity_compatible() const {
+      return !cannot_inherit_opacity_;
+    }
 
-    void mark_incompatible() { cannot_inherit_opacity = true; }
+    void mark_incompatible() { cannot_inherit_opacity_ = true; }
 
     // For now this only allows a single compatible op to mark the
     // layer as being compatible with group opacity. If we start
@@ -428,18 +539,73 @@ class DisplayListBuilder final : public virtual Dispatcher,
     // can upgrade this to checking for overlapping ops.
     // See https://github.com/flutter/flutter/issues/93899
     void add_compatible_op() {
-      if (!cannot_inherit_opacity) {
-        if (has_compatible_op) {
-          cannot_inherit_opacity = true;
+      if (!cannot_inherit_opacity_) {
+        if (has_compatible_op_) {
+          cannot_inherit_opacity_ = true;
         } else {
-          has_compatible_op = true;
+          has_compatible_op_ = true;
         }
       }
     }
+
+    // Records that the current layer contains an op that produces visible
+    // output on a transparent surface.
+    void add_visible_op() {
+      affects_transparent_layer_ = true;
+    }
+
+    // The filter to apply to the layer bounds when it is restored
+    std::shared_ptr<const DlImageFilter> filter() { return filter_; }
+
+    // is_unbounded should be set to true if we ever encounter an operation
+    // on a layer that either is unrestricted (|drawColor| or |drawPaint|)
+    // or cannot compute its bounds (some effects and filters) and there
+    // was no outstanding clip op at the time.
+    // When the layer is restored, the outer layer may then process this
+    // unbounded state by accumulating its own clip or transferring the
+    // unbounded state to its own outer layer.
+    // Typically the DisplayList will have been constructed with a cull
+    // rect which will act as a default clip for the outermost layer and
+    // the unbounded state of all sub layers will eventually be caught by
+    // that cull rect so that the overall unbounded state of the entire
+    // DisplayList will never be true.
+    //
+    // For historical consistency it is worth noting that SkPicture used
+    // to treat these same conditions as a Nop (they accumulate the
+    // SkPicture cull rect, but if no cull rect was specified then it is
+    // an empty Rect and so has no effect on the bounds).
+    //
+    // Flutter is unlikely to ever run into this as the Dart mechanisms
+    // all supply a non-null cull rect for all Dart Picture objects,
+    // even if that cull rect is kGiantRect.
+    void set_unbounded() { is_unbounded_ = true; }
+
+    // |is_unbounded| should be called after |getLayerBounds| in case
+    // a problem was found during the computation of those bounds,
+    // the layer will have one last chance to flag an unbounded state.
+    bool is_unbounded() const { return is_unbounded_; }
+
+   private:
+    size_t save_offset_;
+    bool is_save_layer_ = false;
+    bool cannot_inherit_opacity_ = false;
+    bool has_compatible_op_ = false;
+    std::shared_ptr<const DlImageFilter> filter_;
+    bool is_unbounded_ = false;
+    bool has_deferred_save_op_ = false;
+    bool is_nop_ = false;
+    bool affects_transparent_layer_ = false;
+    std::shared_ptr<BoundsAccumulator> layer_accumulator_;
+
+    friend class DisplayListBuilder;
   };
 
-  std::vector<LayerInfo> layer_stack_;
-  LayerInfo* current_layer_;
+  std::vector<SaveInfo> layer_stack_;
+  SaveInfo* current_layer_;
+  DisplayListMatrixClipTracker tracker_;
+  std::unique_ptr<DisplayListMatrixClipTracker> layer_tracker_;
+  std::unique_ptr<BoundsAccumulator> accumulator_;
+  BoundsAccumulator* accumulator() { return accumulator_.get(); }
 
   // This flag indicates whether or not the current rendering attributes
   // are compatible with rendering ops applying an inherited opacity.
@@ -459,7 +625,6 @@ class DisplayListBuilder final : public virtual Dispatcher,
     current_opacity_compatibility_ =             //
         current_.getColorFilter() == nullptr &&  //
         !current_.isInvertColors() &&            //
-        current_blender_ == nullptr &&           //
         IsOpacityCompatible(current_.getBlendMode());
   }
 
@@ -498,27 +663,111 @@ class DisplayListBuilder final : public virtual Dispatcher,
   }
 
   void onSetAntiAlias(bool aa);
-  void onSetDither(bool dither);
   void onSetInvertColors(bool invert);
   void onSetStrokeCap(DlStrokeCap cap);
   void onSetStrokeJoin(DlStrokeJoin join);
-  void onSetStyle(DlDrawStyle style);
+  void onSetDrawStyle(DlDrawStyle style);
   void onSetStrokeWidth(SkScalar width);
   void onSetStrokeMiter(SkScalar limit);
   void onSetColor(DlColor color);
   void onSetBlendMode(DlBlendMode mode);
-  void onSetBlender(sk_sp<SkBlender> blender);
   void onSetColorSource(const DlColorSource* source);
   void onSetImageFilter(const DlImageFilter* filter);
   void onSetColorFilter(const DlColorFilter* filter);
   void onSetPathEffect(const DlPathEffect* effect);
   void onSetMaskFilter(const DlMaskFilter* filter);
 
+  // The DisplayList had an unbounded call with no cull rect or clip
+  // to contain it. Should only be called after the stream is fully
+  // built.
+  // Unbounded operations are calls like |drawColor| which are defined
+  // to flood the entire surface, or calls that relied on a rendering
+  // attribute which is unable to compute bounds (should be rare).
+  // In those cases the bounds will represent only the accumulation
+  // of the bounded calls and this flag will be set to indicate that
+  // condition.
+  bool is_unbounded() const {
+    FML_DCHECK(layer_stack_.size() == 1);
+    return layer_stack_.front().is_unbounded();
+  }
+
+  SkRect bounds() const {
+    FML_DCHECK(layer_stack_.size() == 1);
+    if (is_unbounded()) {
+      FML_LOG(INFO) << "returning partial bounds for unbounded DisplayList";
+    }
+
+    return accumulator_->bounds();
+  }
+
+  sk_sp<DlRTree> rtree() {
+    FML_DCHECK(layer_stack_.size() == 1);
+    if (is_unbounded()) {
+      FML_LOG(INFO) << "returning partial rtree for unbounded DisplayList";
+    }
+
+    return accumulator_->rtree();
+  }
+
+  static DisplayListAttributeFlags FlagsForPointMode(PointMode mode);
+
+  enum class OpResult {
+    kNoEffect,
+    kPreservesTransparency,
+    kAffectsAll,
+  };
+
+  bool paint_nops_on_transparency();
+  OpResult PaintResult(const DlPaint& paint,
+                       DisplayListAttributeFlags flags = kDrawPaintFlags);
+
+  void UpdateLayerResult(OpResult result) {
+    switch (result) {
+      case OpResult::kNoEffect:
+      case OpResult::kPreservesTransparency:
+        break;
+      case OpResult::kAffectsAll:
+        current_layer_->add_visible_op();
+        break;
+    }
+  }
+
+  // kAnyColor is a non-opaque and non-transparent color that will not
+  // trigger any short-circuit tests about the results of a blend.
+  static constexpr DlColor kAnyColor = DlColor::kMidGrey().withAlpha(0x80);
+  static_assert(!kAnyColor.isOpaque());
+  static_assert(!kAnyColor.isTransparent());
+  static DlColor GetEffectiveColor(const DlPaint& paint,
+                                   DisplayListAttributeFlags flags);
+
+  // Adjusts the indicated bounds for the given flags and returns true if
+  // the calculation was possible, or false if it could not be estimated.
+  bool AdjustBoundsForPaint(SkRect& bounds, DisplayListAttributeFlags flags);
+
+  // Records the fact that we encountered an op that either could not
+  // estimate its bounds or that fills all of the destination space.
+  bool AccumulateUnbounded();
+
+  // Records the bounds for an op after modifying them according to the
+  // supplied attribute flags and transforming by the current matrix.
+  bool AccumulateOpBounds(const SkRect& bounds,
+                          DisplayListAttributeFlags flags) {
+    SkRect safe_bounds = bounds;
+    return AccumulateOpBounds(safe_bounds, flags);
+  }
+
+  // Records the bounds for an op after modifying them according to the
+  // supplied attribute flags and transforming by the current matrix
+  // and clipping against the current clip.
+  bool AccumulateOpBounds(SkRect& bounds, DisplayListAttributeFlags flags);
+
+  // Records the given bounds after transforming by the current matrix
+  // and clipping against the current clip.
+  bool AccumulateBounds(SkRect& bounds);
+
   DlPaint current_;
-  // If |current_blender_| is set then ignore |current_.getBlendMode()|
-  sk_sp<SkBlender> current_blender_;
 };
 
 }  // namespace flutter
 
-#endif  // FLUTTER_DISPLAY_LIST_DISPLAY_LIST_BUILDER_H_
+#endif  // FLUTTER_DISPLAY_LIST_DL_BUILDER_H_
diff --git a/display_list/dl_canvas.cc b/display_list/dl_canvas.cc
new file mode 100644
index 0000000000000000000000000000000000000000..200ceb639aa165bb82c29a78d07e743b14b72b9a
--- /dev/null
+++ b/display_list/dl_canvas.cc
@@ -0,0 +1,24 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/display_list/dl_canvas.h"
+
+#include "third_party/skia/include/core/SkPoint3.h"
+#include "third_party/skia/include/utils/SkShadowUtils.h"
+
+namespace flutter {
+
+SkRect DlCanvas::ComputeShadowBounds(const SkPath& path,
+                                     float elevation,
+                                     SkScalar dpr,
+                                     const SkMatrix& ctm) {
+  SkRect shadow_bounds(path.getBounds());
+  SkShadowUtils::GetLocalBounds(
+      ctm, path, SkPoint3::Make(0, 0, dpr * elevation),
+      SkPoint3::Make(0, -1, 1), kShadowLightRadius / kShadowLightHeight,
+      SkShadowFlags::kDirectionalLight_ShadowFlag, &shadow_bounds);
+  return shadow_bounds;
+}
+
+}  // namespace flutter
diff --git a/display_list/dl_canvas.h b/display_list/dl_canvas.h
new file mode 100644
index 0000000000000000000000000000000000000000..9ba279a15b590da576535517930d702f485951cb
--- /dev/null
+++ b/display_list/dl_canvas.h
@@ -0,0 +1,266 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_DISPLAY_LIST_DL_CANVAS_H_
+#define FLUTTER_DISPLAY_LIST_DL_CANVAS_H_
+
+#include "flutter/display_list/dl_blend_mode.h"
+#include "flutter/display_list/dl_paint.h"
+#include "flutter/display_list/dl_vertices.h"
+#include "flutter/display_list/image/dl_image.h"
+
+#include "third_party/skia/include/core/SkM44.h"
+#include "third_party/skia/include/core/SkMatrix.h"
+#include "third_party/skia/include/core/SkPath.h"
+#include "third_party/skia/include/core/SkRRect.h"
+#include "third_party/skia/include/core/SkRSXform.h"
+#include "third_party/skia/include/core/SkRect.h"
+#include "third_party/skia/include/core/SkTextBlob.h"
+
+#include "impeller/typographer/text_frame.h"
+
+namespace flutter {
+
+//------------------------------------------------------------------------------
+/// @brief    Developer-facing API for rendering anything *within* the engine.
+///
+/// |DlCanvas| should be used to render anything in the framework classes (i.e.
+/// `lib/ui`), flow and flow layers, embedders, shell, and elsewhere.
+///
+/// The only state carried by implementations of this interface are the clip
+/// and transform which are saved and restored by the |save|, |saveLayer|, and
+/// |restore| calls.
+///
+/// @note      The interface resembles closely the familiar |SkCanvas| interface
+///            used throughout the engine.
+class DlCanvas {
+ public:
+  enum class ClipOp {
+    kDifference,
+    kIntersect,
+  };
+
+  enum class PointMode {
+    kPoints,   //!< draw each point separately
+    kLines,    //!< draw each separate pair of points as a line segment
+    kPolygon,  //!< draw each pair of overlapping points as a line segment
+  };
+
+  enum class SrcRectConstraint {
+    kStrict,
+    kFast,
+  };
+
+  virtual ~DlCanvas() = default;
+
+  virtual SkISize GetBaseLayerSize() const = 0;
+  virtual SkImageInfo GetImageInfo() const = 0;
+
+  virtual void Save() = 0;
+  virtual void SaveLayer(const SkRect* bounds,
+                         const DlPaint* paint = nullptr,
+                         const DlImageFilter* backdrop = nullptr) = 0;
+  virtual void Restore() = 0;
+  virtual int GetSaveCount() const = 0;
+  virtual void RestoreToCount(int restore_count) = 0;
+
+  virtual void Translate(SkScalar tx, SkScalar ty) = 0;
+  virtual void Scale(SkScalar sx, SkScalar sy) = 0;
+  virtual void Rotate(SkScalar degrees) = 0;
+  virtual void Skew(SkScalar sx, SkScalar sy) = 0;
+
+  // clang-format off
+
+  // 2x3 2D affine subset of a 4x4 transform in row major order
+  virtual void Transform2DAffine(SkScalar mxx, SkScalar mxy, SkScalar mxt,
+                                 SkScalar myx, SkScalar myy, SkScalar myt) = 0;
+  // full 4x4 transform in row major order
+  virtual void TransformFullPerspective(
+      SkScalar mxx, SkScalar mxy, SkScalar mxz, SkScalar mxt,
+      SkScalar myx, SkScalar myy, SkScalar myz, SkScalar myt,
+      SkScalar mzx, SkScalar mzy, SkScalar mzz, SkScalar mzt,
+      SkScalar mwx, SkScalar mwy, SkScalar mwz, SkScalar mwt) = 0;
+  // clang-format on
+  virtual void TransformReset() = 0;
+  virtual void Transform(const SkMatrix* matrix) = 0;
+  virtual void Transform(const SkM44* matrix44) = 0;
+  void Transform(const SkMatrix& matrix) { Transform(&matrix); }
+  void Transform(const SkM44& matrix44) { Transform(&matrix44); }
+  virtual void SetTransform(const SkMatrix* matrix) = 0;
+  virtual void SetTransform(const SkM44* matrix44) = 0;
+  virtual void SetTransform(const SkMatrix& matrix) { SetTransform(&matrix); }
+  virtual void SetTransform(const SkM44& matrix44) { SetTransform(&matrix44); }
+
+  /// Returns the 4x4 full perspective transform representing all transform
+  /// operations executed so far in this DisplayList within the enclosing
+  /// save stack.
+  virtual SkM44 GetTransformFullPerspective() const = 0;
+  /// Returns the 3x3 partial perspective transform representing all transform
+  /// operations executed so far in this DisplayList within the enclosing
+  /// save stack.
+  virtual SkMatrix GetTransform() const = 0;
+
+  virtual void ClipRect(const SkRect& rect,
+                        ClipOp clip_op = ClipOp::kIntersect,
+                        bool is_aa = false) = 0;
+  virtual void ClipRRect(const SkRRect& rrect,
+                         ClipOp clip_op = ClipOp::kIntersect,
+                         bool is_aa = false) = 0;
+  virtual void ClipPath(const SkPath& path,
+                        ClipOp clip_op = ClipOp::kIntersect,
+                        bool is_aa = false) = 0;
+
+  /// Conservative estimate of the bounds of all outstanding clip operations
+  /// measured in the coordinate space within which this DisplayList will
+  /// be rendered.
+  virtual SkRect GetDestinationClipBounds() const = 0;
+  /// Conservative estimate of the bounds of all outstanding clip operations
+  /// transformed into the local coordinate space in which currently
+  /// recorded rendering operations are interpreted.
+  virtual SkRect GetLocalClipBounds() const = 0;
+
+  /// Return true iff the supplied bounds are easily shown to be outside
+  /// of the current clip bounds. This method may conservatively return
+  /// false if it cannot make the determination.
+  virtual bool QuickReject(const SkRect& bounds) const = 0;
+
+  virtual void DrawPaint(const DlPaint& paint) = 0;
+  virtual void DrawColor(DlColor color,
+                         DlBlendMode mode = DlBlendMode::kSrcOver) = 0;
+  void Clear(DlColor color) { DrawColor(color, DlBlendMode::kSrc); }
+  virtual void DrawLine(const SkPoint& p0,
+                        const SkPoint& p1,
+                        const DlPaint& paint) = 0;
+  virtual void DrawRect(const SkRect& rect, const DlPaint& paint) = 0;
+  virtual void DrawOval(const SkRect& bounds, const DlPaint& paint) = 0;
+  virtual void DrawCircle(const SkPoint& center,
+                          SkScalar radius,
+                          const DlPaint& paint) = 0;
+  virtual void DrawRRect(const SkRRect& rrect, const DlPaint& paint) = 0;
+  virtual void DrawDRRect(const SkRRect& outer,
+                          const SkRRect& inner,
+                          const DlPaint& paint) = 0;
+  virtual void DrawPath(const SkPath& path, const DlPaint& paint) = 0;
+  virtual void DrawArc(const SkRect& bounds,
+                       SkScalar start,
+                       SkScalar sweep,
+                       bool useCenter,
+                       const DlPaint& paint) = 0;
+  virtual void DrawPoints(PointMode mode,
+                          uint32_t count,
+                          const SkPoint pts[],
+                          const DlPaint& paint) = 0;
+  virtual void DrawVertices(const DlVertices* vertices,
+                            DlBlendMode mode,
+                            const DlPaint& paint) = 0;
+  void DrawVertices(const std::shared_ptr<const DlVertices>& vertices,
+                    DlBlendMode mode,
+                    const DlPaint& paint) {
+    DrawVertices(vertices.get(), mode, paint);
+  }
+  virtual void DrawImage(const sk_sp<DlImage>& image,
+                         const SkPoint point,
+                         DlImageSampling sampling,
+                         const DlPaint* paint = nullptr) = 0;
+  virtual void DrawImageRect(
+      const sk_sp<DlImage>& image,
+      const SkRect& src,
+      const SkRect& dst,
+      DlImageSampling sampling,
+      const DlPaint* paint = nullptr,
+      SrcRectConstraint constraint = SrcRectConstraint::kFast) = 0;
+  virtual void DrawImageRect(
+      const sk_sp<DlImage>& image,
+      const SkIRect& src,
+      const SkRect& dst,
+      DlImageSampling sampling,
+      const DlPaint* paint = nullptr,
+      SrcRectConstraint constraint = SrcRectConstraint::kFast) {
+    DrawImageRect(image, SkRect::Make(src), dst, sampling, paint, constraint);
+  }
+  void DrawImageRect(const sk_sp<DlImage>& image,
+                     const SkRect& dst,
+                     DlImageSampling sampling,
+                     const DlPaint* paint = nullptr,
+                     SrcRectConstraint constraint = SrcRectConstraint::kFast) {
+    DrawImageRect(image, image->bounds(), dst, sampling, paint, constraint);
+  }
+  virtual void DrawImageNine(const sk_sp<DlImage>& image,
+                             const SkIRect& center,
+                             const SkRect& dst,
+                             DlFilterMode filter,
+                             const DlPaint* paint = nullptr) = 0;
+  virtual void DrawAtlas(const sk_sp<DlImage>& atlas,
+                         const SkRSXform xform[],
+                         const SkRect tex[],
+                         const DlColor colors[],
+                         int count,
+                         DlBlendMode mode,
+                         DlImageSampling sampling,
+                         const SkRect* cullRect,
+                         const DlPaint* paint = nullptr) = 0;
+  virtual void DrawDisplayList(const sk_sp<DisplayList> display_list,
+                               SkScalar opacity = SK_Scalar1) = 0;
+
+  virtual void DrawTextFrame(
+      const std::shared_ptr<impeller::TextFrame>& text_frame,
+      SkScalar x,
+      SkScalar y,
+      const DlPaint& paint) = 0;
+
+  virtual void DrawTextBlob(const sk_sp<SkTextBlob>& blob,
+                            SkScalar x,
+                            SkScalar y,
+                            const DlPaint& paint) = 0;
+  virtual void DrawShadow(const SkPath& path,
+                          const DlColor color,
+                          const SkScalar elevation,
+                          bool transparent_occluder,
+                          SkScalar dpr) = 0;
+
+  virtual void Flush() = 0;
+
+  static constexpr SkScalar kShadowLightHeight = 600;
+  static constexpr SkScalar kShadowLightRadius = 800;
+
+  static SkRect ComputeShadowBounds(const SkPath& path,
+                                    float elevation,
+                                    SkScalar dpr,
+                                    const SkMatrix& ctm);
+};
+
+class DlAutoCanvasRestore {
+ public:
+  DlAutoCanvasRestore(DlCanvas* canvas, bool do_save) : canvas_(canvas) {
+    if (canvas) {
+      canvas_ = canvas;
+      restore_count_ = canvas->GetSaveCount();
+      if (do_save) {
+        canvas_->Save();
+      }
+    } else {
+      canvas_ = nullptr;
+      restore_count_ = 0;
+    }
+  }
+
+  ~DlAutoCanvasRestore() { Restore(); }
+
+  void Restore() {
+    if (canvas_) {
+      canvas_->RestoreToCount(restore_count_);
+      canvas_ = nullptr;
+    }
+  }
+
+ private:
+  DlCanvas* canvas_;
+  int restore_count_;
+
+  FML_DISALLOW_COPY_ASSIGN_AND_MOVE(DlAutoCanvasRestore);
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_DISPLAY_LIST_DL_CANVAS_H_
diff --git a/display_list/dl_color.h b/display_list/dl_color.h
new file mode 100644
index 0000000000000000000000000000000000000000..0b6bb2c21cb12fed9b67d0d04a9b2d01b8022cfe
--- /dev/null
+++ b/display_list/dl_color.h
@@ -0,0 +1,94 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_DISPLAY_LIST_DL_COLOR_H_
+#define FLUTTER_DISPLAY_LIST_DL_COLOR_H_
+
+#include "third_party/skia/include/core/SkScalar.h"
+
+namespace flutter {
+
+struct DlColor {
+ public:
+  constexpr DlColor() : argb_(0xFF000000) {}
+  constexpr explicit DlColor(uint32_t argb) : argb_(argb) {}
+
+  static constexpr uint8_t toAlpha(SkScalar opacity) { return toC(opacity); }
+  static constexpr SkScalar toOpacity(uint8_t alpha) { return toF(alpha); }
+
+  // clang-format off
+  static constexpr DlColor kTransparent()        {return DlColor(0x00000000);};
+  static constexpr DlColor kBlack()              {return DlColor(0xFF000000);};
+  static constexpr DlColor kWhite()              {return DlColor(0xFFFFFFFF);};
+  static constexpr DlColor kRed()                {return DlColor(0xFFFF0000);};
+  static constexpr DlColor kGreen()              {return DlColor(0xFF00FF00);};
+  static constexpr DlColor kBlue()               {return DlColor(0xFF0000FF);};
+  static constexpr DlColor kCyan()               {return DlColor(0xFF00FFFF);};
+  static constexpr DlColor kMagenta()            {return DlColor(0xFFFF00FF);};
+  static constexpr DlColor kYellow()             {return DlColor(0xFFFFFF00);};
+  static constexpr DlColor kDarkGrey()           {return DlColor(0xFF3F3F3F);};
+  static constexpr DlColor kMidGrey()            {return DlColor(0xFF808080);};
+  static constexpr DlColor kLightGrey()          {return DlColor(0xFFC0C0C0);};
+  // clang-format on
+
+  constexpr bool isOpaque() const { return getAlpha() == 0xFF; }
+  constexpr bool isTransparent() const { return getAlpha() == 0; }
+
+  constexpr int getAlpha() const { return argb_ >> 24; }
+  constexpr int getRed() const { return (argb_ >> 16) & 0xFF; }
+  constexpr int getGreen() const { return (argb_ >> 8) & 0xFF; }
+  constexpr int getBlue() const { return argb_ & 0xFF; }
+
+  constexpr float getAlphaF() const { return toF(getAlpha()); }
+  constexpr float getRedF() const { return toF(getRed()); }
+  constexpr float getGreenF() const { return toF(getGreen()); }
+  constexpr float getBlueF() const { return toF(getBlue()); }
+
+  constexpr uint32_t premultipliedArgb() const {
+    if (isOpaque()) {
+      return argb_;
+    }
+    float f = getAlphaF();
+    return (argb_ & 0xFF000000) |       //
+           toC(getRedF() * f) << 16 |   //
+           toC(getGreenF() * f) << 8 |  //
+           toC(getBlueF() * f);
+  }
+
+  constexpr DlColor withAlpha(uint8_t alpha) const {  //
+    return DlColor((argb_ & 0x00FFFFFF) | (alpha << 24));
+  }
+  constexpr DlColor withRed(uint8_t red) const {  //
+    return DlColor((argb_ & 0xFF00FFFF) | (red << 16));
+  }
+  constexpr DlColor withGreen(uint8_t green) const {  //
+    return DlColor((argb_ & 0xFFFF00FF) | (green << 8));
+  }
+  constexpr DlColor withBlue(uint8_t blue) const {  //
+    return DlColor((argb_ & 0xFFFFFF00) | (blue << 0));
+  }
+
+  constexpr DlColor modulateOpacity(float opacity) const {
+    return opacity <= 0   ? withAlpha(0)
+           : opacity >= 1 ? *this
+                          : withAlpha(round(getAlpha() * opacity));
+  }
+
+  constexpr uint32_t argb() const { return argb_; }
+
+  bool operator==(DlColor const& other) const { return argb_ == other.argb_; }
+  bool operator!=(DlColor const& other) const { return argb_ != other.argb_; }
+  bool operator==(uint32_t const& other) const { return argb_ == other; }
+  bool operator!=(uint32_t const& other) const { return argb_ != other; }
+
+ private:
+  uint32_t argb_;
+
+  static float toF(uint8_t comp) { return comp * (1.0f / 255); }
+  static uint8_t toC(float fComp) { return round(fComp * 255); }
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_DISPLAY_LIST_DL_COLOR_H_
diff --git a/display_list/display_list_color_unittests.cc b/display_list/dl_color_unittests.cc
similarity index 79%
rename from display_list/display_list_color_unittests.cc
rename to display_list/dl_color_unittests.cc
index f1506051ca2d2ff5656952a51fdbe6170eca858e..7a6c6a15ed82db5127d9ce0a8e2905c812a2aa0d 100644
--- a/display_list/display_list_color_unittests.cc
+++ b/display_list/dl_color_unittests.cc
@@ -2,11 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/display_list/display_list_attributes_testing.h"
-#include "flutter/display_list/display_list_builder.h"
-#include "flutter/display_list/display_list_color_source.h"
-#include "flutter/display_list/types.h"
-#include "third_party/skia/include/core/SkSurface.h"
+#include "flutter/display_list/dl_color.h"
+#include "flutter/testing/testing.h"
+
+#include "third_party/skia/include/core/SkColor.h"
 
 namespace flutter {
 namespace testing {
@@ -15,7 +14,7 @@ static void arraysEqual(const uint32_t* ints,
                         const DlColor* colors,
                         int count) {
   for (int i = 0; i < count; i++) {
-    EXPECT_TRUE(ints[i] == colors[i]);
+    EXPECT_TRUE(ints[i] == colors[i].argb());
   }
 }
 
diff --git a/display_list/dl_op_flags.cc b/display_list/dl_op_flags.cc
new file mode 100644
index 0000000000000000000000000000000000000000..9293b2adcdc7f199a92d94c9e7aba60042713e8d
--- /dev/null
+++ b/display_list/dl_op_flags.cc
@@ -0,0 +1,32 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/display_list/dl_op_flags.h"
+#include "flutter/display_list/effects/dl_path_effect.h"
+
+namespace flutter {
+
+const DisplayListSpecialGeometryFlags DisplayListAttributeFlags::WithPathEffect(
+    const DlPathEffect* effect,
+    bool is_stroked) const {
+  if (is_geometric() && effect) {
+    switch (effect->type()) {
+      case DlPathEffectType::kDash: {
+        // Dashing has no effect on filled geometry.
+        if (is_stroked) {
+          // A dash effect has a very simple impact. It cannot introduce any
+          // miter joins that weren't already present in the original path
+          // and it does not grow the bounds of the path, but it can add
+          // end caps to areas that might not have had them before so all
+          // we need to do is to indicate the potential for diagonal
+          // end caps and move on.
+          return special_flags_.with(kMayHaveCaps | kMayHaveDiagonalCaps);
+        }
+      }
+    }
+  }
+  return special_flags_;
+}
+
+}  // namespace flutter
diff --git a/display_list/display_list_flags.h b/display_list/dl_op_flags.h
similarity index 32%
rename from display_list/display_list_flags.h
rename to display_list/dl_op_flags.h
index f5362599c3b9317f3e3902c5edf49400e7f0202e..ec9f7749e169243302b4c172d7c6ba3b0da9a509 100644
--- a/display_list/display_list_flags.h
+++ b/display_list/dl_op_flags.h
@@ -2,11 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_FLAGS_H_
-#define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_FLAGS_H_
+#ifndef FLUTTER_DISPLAY_LIST_DL_OP_FLAGS_H_
+#define FLUTTER_DISPLAY_LIST_DL_OP_FLAGS_H_
 
-#include "flutter/display_list/display_list_paint.h"
-#include "flutter/display_list/types.h"
+#include "flutter/display_list/dl_paint.h"
 #include "flutter/fml/logging.h"
 
 namespace flutter {
@@ -24,36 +23,36 @@ class DlPathEffect;
 class DisplayListFlags {
  protected:
   // A drawing operation that is not geometric in nature (but which
-  // may still apply a MaskFilter - see |kUsesMaskFilter_| below).
-  static constexpr int kIsNonGeometric_ = 0;
+  // may still apply a MaskFilter - see |kUsesMaskFilter| below).
+  static constexpr int kIsNonGeometric = 0;
 
   // A geometric operation that is defined as a fill operation
   // regardless of what the current paint Style is set to.
-  // This flag will automatically assume |kUsesMaskFilter_|.
-  static constexpr int kIsFilledGeometry_ = 1 << 0;
+  // This flag will automatically assume |kUsesMaskFilter|.
+  static constexpr int kIsFilledGeometry = 1 << 0;
 
   // A geometric operation that is defined as a stroke operation
   // regardless of what the current paint Style is set to.
-  // This flag will automatically assume |kUsesMaskFilter_|.
-  static constexpr int kIsStrokedGeometry_ = 1 << 1;
+  // This flag will automatically assume |kUsesMaskFilter|.
+  static constexpr int kIsStrokedGeometry = 1 << 1;
 
   // A geometric operation that may be a stroke or fill operation
   // depending on the current state of the paint Style attribute.
-  // This flag will automatically assume |kUsesMaskFilter_|.
-  static constexpr int kIsDrawnGeometry_ = 1 << 2;
+  // This flag will automatically assume |kUsesMaskFilter|.
+  static constexpr int kIsDrawnGeometry = 1 << 2;
 
-  static constexpr int kIsAnyGeometryMask_ =  //
-      kIsFilledGeometry_ |                    //
-      kIsStrokedGeometry_ |                   //
-      kIsDrawnGeometry_;
+  static constexpr int kIsAnyGeometryMask =  //
+      kIsFilledGeometry |                    //
+      kIsStrokedGeometry |                   //
+      kIsDrawnGeometry;
 
   // A primitive that floods the surface (or clip) with no
   // natural bounds, such as |drawColor| or |drawPaint|.
-  static constexpr int kFloodsSurface_ = 1 << 3;
+  static constexpr int kFloodsSurface = 1 << 3;
 
-  static constexpr int kMayHaveCaps_ = 1 << 4;
-  static constexpr int kMayHaveJoins_ = 1 << 5;
-  static constexpr int kButtCapIsSquare_ = 1 << 6;
+  static constexpr int kMayHaveCaps = 1 << 4;
+  static constexpr int kMayHaveJoins = 1 << 5;
+  static constexpr int kButtCapIsSquare = 1 << 6;
 
   // A geometric operation which has a path that might have
   // end caps that are not rectilinear which means that square
@@ -63,7 +62,7 @@ class DisplayListFlags {
   // diagonal end caps. |drawLine| might have diagonal end
   // caps depending on the angle of the line, and more likely
   // |drawPath| will often have such end caps.
-  static constexpr int kMayHaveDiagonalCaps_ = 1 << 7;
+  static constexpr int kMayHaveDiagonalCaps = 1 << 7;
 
   // A geometric operation which has joined vertices that are
   // not guaranteed to be smooth (angles of incoming and outgoing)
@@ -74,23 +73,22 @@ class DisplayListFlags {
   // |drawRect|, |drawOval| and |drawRRect| all have well
   // behaved joins, but |drawPath| might have joins that cause
   // mitered extensions outside the pre-transformed bounding box.
-  static constexpr int kMayHaveAcuteJoins_ = 1 << 8;
+  static constexpr int kMayHaveAcuteJoins = 1 << 8;
 
-  static constexpr int kAnySpecialGeometryMask_ =           //
-      kMayHaveCaps_ | kMayHaveJoins_ | kButtCapIsSquare_ |  //
-      kMayHaveDiagonalCaps_ | kMayHaveAcuteJoins_;
+  static constexpr int kAnySpecialGeometryMask =         //
+      kMayHaveCaps | kMayHaveJoins | kButtCapIsSquare |  //
+      kMayHaveDiagonalCaps | kMayHaveAcuteJoins;
 
   // clang-format off
-  static constexpr int kUsesAntiAlias_       = 1 << 10;
-  static constexpr int kUsesDither_          = 1 << 11;
-  static constexpr int kUsesAlpha_           = 1 << 12;
-  static constexpr int kUsesColor_           = 1 << 13;
-  static constexpr int kUsesBlend_           = 1 << 14;
-  static constexpr int kUsesShader_          = 1 << 15;
-  static constexpr int kUsesColorFilter_     = 1 << 16;
-  static constexpr int kUsesPathEffect_      = 1 << 17;
-  static constexpr int kUsesMaskFilter_      = 1 << 18;
-  static constexpr int kUsesImageFilter_     = 1 << 19;
+  static constexpr int kUsesAntiAlias       = 1 << 10;
+  static constexpr int kUsesAlpha           = 1 << 11;
+  static constexpr int kUsesColor           = 1 << 12;
+  static constexpr int kUsesBlend           = 1 << 13;
+  static constexpr int kUsesShader          = 1 << 14;
+  static constexpr int kUsesColorFilter     = 1 << 15;
+  static constexpr int kUsesPathEffect      = 1 << 16;
+  static constexpr int kUsesMaskFilter      = 1 << 17;
+  static constexpr int kUsesImageFilter     = 1 << 18;
 
   // Some ops have an optional paint argument. If the version
   // stored in the DisplayList ignores the paint, but there
@@ -99,24 +97,25 @@ class DisplayListFlags {
   // a default paint object can be constructed when rendering
   // the op to carry information imposed from outside the
   // DisplayList (for example, the opacity override).
-  static constexpr int kIgnoresPaint_        = 1 << 30;
+  static constexpr int kIgnoresPaint        = 1 << 30;
   // clang-format on
 
-  static constexpr int kAnyAttributeMask_ =  //
-      kUsesAntiAlias_ | kUsesDither_ | kUsesAlpha_ | kUsesColor_ | kUsesBlend_ |
-      kUsesShader_ | kUsesColorFilter_ | kUsesPathEffect_ | kUsesMaskFilter_ |
-      kUsesImageFilter_;
+  static constexpr int kAnyAttributeMask =  //
+      kUsesAntiAlias | kUsesAlpha | kUsesColor | kUsesBlend | kUsesShader |
+      kUsesColorFilter | kUsesPathEffect | kUsesMaskFilter | kUsesImageFilter;
 };
 
 class DisplayListFlagsBase : protected DisplayListFlags {
  protected:
-  explicit DisplayListFlagsBase(int flags) : flags_(flags) {}
+  explicit constexpr DisplayListFlagsBase(int flags) : flags_(flags) {}
 
   const int flags_;
 
-  bool has_any(int qFlags) const { return (flags_ & qFlags) != 0; }
-  bool has_all(int qFlags) const { return (flags_ & qFlags) == qFlags; }
-  bool has_none(int qFlags) const { return (flags_ & qFlags) == 0; }
+  constexpr bool has_any(int qFlags) const { return (flags_ & qFlags) != 0; }
+  constexpr bool has_all(int qFlags) const {
+    return (flags_ & qFlags) == qFlags;
+  }
+  constexpr bool has_none(int qFlags) const { return (flags_ & qFlags) == 0; }
 };
 
 /// An attribute class for advertising specific properties of
@@ -125,29 +124,35 @@ class DisplayListFlagsBase : protected DisplayListFlags {
 class DisplayListSpecialGeometryFlags : DisplayListFlagsBase {
  public:
   /// The geometry may have segments that end without closing the path.
-  bool may_have_end_caps() const { return has_any(kMayHaveCaps_); }
+  constexpr bool may_have_end_caps() const { return has_any(kMayHaveCaps); }
 
   /// The geometry may have segments connect non-continuously.
-  bool may_have_joins() const { return has_any(kMayHaveJoins_); }
+  constexpr bool may_have_joins() const { return has_any(kMayHaveJoins); }
 
   /// Mainly for drawPoints(PointMode) where Butt caps are rendered as squares.
-  bool butt_cap_becomes_square() const { return has_any(kButtCapIsSquare_); }
+  constexpr bool butt_cap_becomes_square() const {
+    return has_any(kButtCapIsSquare);
+  }
 
   /// The geometry may have segments that end on a diagonal
   /// such that their end caps extend further than the default
   /// |strokeWidth * 0.5| margin around the geometry.
-  bool may_have_diagonal_caps() const { return has_any(kMayHaveDiagonalCaps_); }
+  constexpr bool may_have_diagonal_caps() const {
+    return has_any(kMayHaveDiagonalCaps);
+  }
 
   /// The geometry may have segments that meet at vertices at
   /// an acute angle such that the miter joins will extend
   /// further than the default |strokeWidth * 0.5| margin around
   /// the geometry.
-  bool may_have_acute_joins() const { return has_any(kMayHaveAcuteJoins_); }
+  constexpr bool may_have_acute_joins() const {
+    return has_any(kMayHaveAcuteJoins);
+  }
 
  private:
-  explicit DisplayListSpecialGeometryFlags(int flags)
+  explicit constexpr DisplayListSpecialGeometryFlags(int flags)
       : DisplayListFlagsBase(flags) {
-    FML_DCHECK((flags & kAnySpecialGeometryMask_) == flags);
+    FML_DCHECK((flags & kAnySpecialGeometryMask) == flags);
   }
 
   const DisplayListSpecialGeometryFlags with(int extra) const {
@@ -160,21 +165,21 @@ class DisplayListSpecialGeometryFlags : DisplayListFlagsBase {
 class DisplayListAttributeFlags : DisplayListFlagsBase {
  public:
   const DisplayListSpecialGeometryFlags WithPathEffect(
-      const DlPathEffect* effect) const;
+      const DlPathEffect* effect,
+      bool is_stroked) const;
 
-  bool ignores_paint() const { return has_any(kIgnoresPaint_); }
+  constexpr bool ignores_paint() const { return has_any(kIgnoresPaint); }
 
-  bool applies_anti_alias() const { return has_any(kUsesAntiAlias_); }
-  bool applies_dither() const { return has_any(kUsesDither_); }
-  bool applies_color() const { return has_any(kUsesColor_); }
-  bool applies_alpha() const { return has_any(kUsesAlpha_); }
-  bool applies_alpha_or_color() const {
-    return has_any(kUsesAlpha_ | kUsesColor_);
+  constexpr bool applies_anti_alias() const { return has_any(kUsesAntiAlias); }
+  constexpr bool applies_color() const { return has_any(kUsesColor); }
+  constexpr bool applies_alpha() const { return has_any(kUsesAlpha); }
+  constexpr bool applies_alpha_or_color() const {
+    return has_any(kUsesAlpha | kUsesColor);
   }
 
   /// The primitive dynamically determines whether it is a stroke or fill
   /// operation (or both) based on the setting of the |Style| attribute.
-  bool applies_style() const { return has_any(kIsDrawnGeometry_); }
+  constexpr bool applies_style() const { return has_any(kIsDrawnGeometry); }
   /// The primitive can use any of the stroke attributes, such as
   /// StrokeWidth, StrokeMiter, StrokeCap, or StrokeJoin. This
   /// method will return if the primitive is defined as one that
@@ -185,46 +190,58 @@ class DisplayListAttributeFlags : DisplayListFlagsBase {
   /// the style.
   // bool applies_stroke_attributes() const { return is_stroked(); }
 
-  bool applies_shader() const { return has_any(kUsesShader_); }
-  /// The primitive honors the current SkColorFilter, including
+  constexpr bool applies_shader() const { return has_any(kUsesShader); }
+  /// The primitive honors the current DlColorFilter, including
   /// the related attribute InvertColors
-  bool applies_color_filter() const { return has_any(kUsesColorFilter_); }
-  /// The primitive honors the SkBlendMode or SkBlender
-  bool applies_blend() const { return has_any(kUsesBlend_); }
-  bool applies_path_effect() const { return has_any(kUsesPathEffect_); }
-  /// The primitive honors the SkMaskFilter whether set using the
+  constexpr bool applies_color_filter() const {
+    return has_any(kUsesColorFilter);
+  }
+  /// The primitive honors the DlBlendMode
+  constexpr bool applies_blend() const { return has_any(kUsesBlend); }
+  constexpr bool applies_path_effect() const {
+    return has_any(kUsesPathEffect);
+  }
+  /// The primitive honors the DlMaskFilter whether set using the
   /// filter object or using the convenience method |setMaskBlurFilter|
-  bool applies_mask_filter() const { return has_any(kUsesMaskFilter_); }
-  bool applies_image_filter() const { return has_any(kUsesImageFilter_); }
-
-  bool is_geometric() const { return has_any(kIsAnyGeometryMask_); }
-  bool always_stroked() const { return has_any(kIsStrokedGeometry_); }
-  bool is_stroked(DlDrawStyle style = DlDrawStyle::kStroke) const {
-    return (has_any(kIsStrokedGeometry_) ||
-            (style != DlDrawStyle::kFill && has_any(kIsDrawnGeometry_)));
+  constexpr bool applies_mask_filter() const {
+    return has_any(kUsesMaskFilter);
+  }
+  constexpr bool applies_image_filter() const {
+    return has_any(kUsesImageFilter);
   }
 
-  bool is_flood() const { return has_any(kFloodsSurface_); }
+  constexpr bool is_geometric() const { return has_any(kIsAnyGeometryMask); }
+  constexpr bool always_stroked() const { return has_any(kIsStrokedGeometry); }
+  constexpr bool is_stroked(DlDrawStyle style = DlDrawStyle::kStroke) const {
+    return (has_any(kIsStrokedGeometry) ||
+            (style != DlDrawStyle::kFill && has_any(kIsDrawnGeometry)));
+  }
+
+  constexpr bool is_flood() const { return has_any(kFloodsSurface); }
+
+  constexpr bool operator==(DisplayListAttributeFlags const& other) const {
+    return flags_ == other.flags_;
+  }
 
  private:
-  explicit DisplayListAttributeFlags(int flags)
+  explicit constexpr DisplayListAttributeFlags(int flags)
       : DisplayListFlagsBase(flags),
-        special_flags_(flags & kAnySpecialGeometryMask_) {
-    FML_DCHECK((flags & kIsAnyGeometryMask_) == kIsNonGeometric_ ||
-               (flags & kIsAnyGeometryMask_) == kIsFilledGeometry_ ||
-               (flags & kIsAnyGeometryMask_) == kIsStrokedGeometry_ ||
-               (flags & kIsAnyGeometryMask_) == kIsDrawnGeometry_);
-    FML_DCHECK(((flags & kAnyAttributeMask_) == 0) !=
-               ((flags & kIgnoresPaint_) == 0));
-    FML_DCHECK((flags & kIsAnyGeometryMask_) != 0 ||
-               (flags & kAnySpecialGeometryMask_) == 0);
+        special_flags_(flags & kAnySpecialGeometryMask) {
+    FML_DCHECK((flags & kIsAnyGeometryMask) == kIsNonGeometric ||
+               (flags & kIsAnyGeometryMask) == kIsFilledGeometry ||
+               (flags & kIsAnyGeometryMask) == kIsStrokedGeometry ||
+               (flags & kIsAnyGeometryMask) == kIsDrawnGeometry);
+    FML_DCHECK(((flags & kAnyAttributeMask) == 0) !=
+               ((flags & kIgnoresPaint) == 0));
+    FML_DCHECK((flags & kIsAnyGeometryMask) != 0 ||
+               (flags & kAnySpecialGeometryMask) == 0);
   }
 
-  const DisplayListAttributeFlags with(int extra) const {
+  constexpr DisplayListAttributeFlags operator+(int extra) const {
     return extra == 0 ? *this : DisplayListAttributeFlags(flags_ | extra);
   }
 
-  const DisplayListAttributeFlags without(int remove) const {
+  constexpr DisplayListAttributeFlags operator-(int remove) const {
     FML_DCHECK(has_all(remove));
     return DisplayListAttributeFlags(flags_ & ~remove);
   }
@@ -235,43 +252,173 @@ class DisplayListAttributeFlags : DisplayListFlagsBase {
 };
 
 class DisplayListOpFlags : DisplayListFlags {
+ private:
+  // Flags common to all primitives that apply colors
+  static constexpr int kBasePaintFlags = (kUsesColor |        //
+                                          kUsesAlpha |        //
+                                          kUsesBlend |        //
+                                          kUsesShader |       //
+                                          kUsesColorFilter |  //
+                                          kUsesImageFilter);
+
+  // Flags common to all primitives that stroke or fill
+  static constexpr int kBaseStrokeOrFillFlags = (kIsDrawnGeometry |  //
+                                                 kUsesAntiAlias |    //
+                                                 kUsesMaskFilter |   //
+                                                 kUsesPathEffect);
+
+  // Flags common to primitives that stroke geometry
+  static constexpr int kBaseStrokeFlags = (kIsStrokedGeometry |  //
+                                           kUsesAntiAlias |      //
+                                           kUsesMaskFilter |     //
+                                           kUsesPathEffect);
+
+  // Flags common to primitives that render an image with paint attributes
+  static constexpr int kBaseImageFlags = (kIsNonGeometric |   //
+                                          kUsesAlpha |        //
+                                          kUsesBlend |        //
+                                          kUsesColorFilter |  //
+                                          kUsesImageFilter);
+
  public:
-  static const DisplayListAttributeFlags kSaveLayerFlags;
-  static const DisplayListAttributeFlags kSaveLayerWithPaintFlags;
-  static const DisplayListAttributeFlags kDrawColorFlags;
-  static const DisplayListAttributeFlags kDrawPaintFlags;
-  static const DisplayListAttributeFlags kDrawLineFlags;
+  static constexpr DisplayListAttributeFlags kSaveLayerFlags{
+      kIgnoresPaint  //
+  };
+  static constexpr DisplayListAttributeFlags kSaveLayerWithPaintFlags{
+      kIsNonGeometric |   //
+      kUsesAlpha |        //
+      kUsesBlend |        //
+      kUsesColorFilter |  //
+      kUsesImageFilter    //
+  };
+  static constexpr DisplayListAttributeFlags kDrawColorFlags{
+      kFloodsSurface |  //
+      kIgnoresPaint     //
+  };
+  static constexpr DisplayListAttributeFlags kDrawPaintFlags{
+      kBasePaintFlags |  //
+      kFloodsSurface     //
+  };
   // Special case flags for horizonal and vertical lines
-  static const DisplayListAttributeFlags kDrawHVLineFlags;
-  static const DisplayListAttributeFlags kDrawRectFlags;
-  static const DisplayListAttributeFlags kDrawOvalFlags;
-  static const DisplayListAttributeFlags kDrawCircleFlags;
-  static const DisplayListAttributeFlags kDrawRRectFlags;
-  static const DisplayListAttributeFlags kDrawDRRectFlags;
-  static const DisplayListAttributeFlags kDrawPathFlags;
-  static const DisplayListAttributeFlags kDrawArcNoCenterFlags;
-  static const DisplayListAttributeFlags kDrawArcWithCenterFlags;
-  static const DisplayListAttributeFlags kDrawPointsAsPointsFlags;
-  static const DisplayListAttributeFlags kDrawPointsAsLinesFlags;
-  static const DisplayListAttributeFlags kDrawPointsAsPolygonFlags;
-  static const DisplayListAttributeFlags kDrawVerticesFlags;
-  static const DisplayListAttributeFlags kDrawImageFlags;
-  static const DisplayListAttributeFlags kDrawImageWithPaintFlags;
-  static const DisplayListAttributeFlags kDrawImageRectFlags;
-  static const DisplayListAttributeFlags kDrawImageRectWithPaintFlags;
-  static const DisplayListAttributeFlags kDrawImageNineFlags;
-  static const DisplayListAttributeFlags kDrawImageNineWithPaintFlags;
-  static const DisplayListAttributeFlags kDrawImageLatticeFlags;
-  static const DisplayListAttributeFlags kDrawImageLatticeWithPaintFlags;
-  static const DisplayListAttributeFlags kDrawAtlasFlags;
-  static const DisplayListAttributeFlags kDrawAtlasWithPaintFlags;
-  static const DisplayListAttributeFlags kDrawPictureFlags;
-  static const DisplayListAttributeFlags kDrawPictureWithPaintFlags;
-  static const DisplayListAttributeFlags kDrawDisplayListFlags;
-  static const DisplayListAttributeFlags kDrawTextBlobFlags;
-  static const DisplayListAttributeFlags kDrawShadowFlags;
+  static constexpr DisplayListAttributeFlags kDrawHVLineFlags{
+      kBasePaintFlags |   //
+      kBaseStrokeFlags |  //
+      kMayHaveCaps        //
+  };
+  static constexpr DisplayListAttributeFlags kDrawLineFlags{
+      kDrawHVLineFlags        //
+      + kMayHaveDiagonalCaps  //
+  };
+  static constexpr DisplayListAttributeFlags kDrawRectFlags{
+      kBasePaintFlags |         //
+      kBaseStrokeOrFillFlags |  //
+      kMayHaveJoins             //
+  };
+  static constexpr DisplayListAttributeFlags kDrawOvalFlags{
+      kBasePaintFlags |       //
+      kBaseStrokeOrFillFlags  //
+  };
+  static constexpr DisplayListAttributeFlags kDrawCircleFlags{
+      kBasePaintFlags |       //
+      kBaseStrokeOrFillFlags  //
+  };
+  static constexpr DisplayListAttributeFlags kDrawRRectFlags{
+      kBasePaintFlags |       //
+      kBaseStrokeOrFillFlags  //
+  };
+  static constexpr DisplayListAttributeFlags kDrawDRRectFlags{
+      kBasePaintFlags |       //
+      kBaseStrokeOrFillFlags  //
+  };
+  static constexpr DisplayListAttributeFlags kDrawPathFlags{
+      kBasePaintFlags |         //
+      kBaseStrokeOrFillFlags |  //
+      kMayHaveCaps |            //
+      kMayHaveDiagonalCaps |    //
+      kMayHaveJoins |           //
+      kMayHaveAcuteJoins        //
+  };
+  static constexpr DisplayListAttributeFlags kDrawArcNoCenterFlags{
+      kBasePaintFlags |         //
+      kBaseStrokeOrFillFlags |  //
+      kMayHaveCaps |            //
+      kMayHaveDiagonalCaps      //
+  };
+  static constexpr DisplayListAttributeFlags kDrawArcWithCenterFlags{
+      kBasePaintFlags |         //
+      kBaseStrokeOrFillFlags |  //
+      kMayHaveJoins |           //
+      kMayHaveAcuteJoins        //
+  };
+  static constexpr DisplayListAttributeFlags kDrawPointsAsPointsFlags{
+      kBasePaintFlags |   //
+      kBaseStrokeFlags |  //
+      kMayHaveCaps |      //
+      kButtCapIsSquare    //
+  };
+  static constexpr DisplayListAttributeFlags kDrawPointsAsLinesFlags{
+      kBasePaintFlags |     //
+      kBaseStrokeFlags |    //
+      kMayHaveCaps |        //
+      kMayHaveDiagonalCaps  //
+  };
+  // Polygon mode just draws (count-1) separate lines, no joins
+  static constexpr DisplayListAttributeFlags kDrawPointsAsPolygonFlags{
+      kBasePaintFlags |     //
+      kBaseStrokeFlags |    //
+      kMayHaveCaps |        //
+      kMayHaveDiagonalCaps  //
+  };
+  static constexpr DisplayListAttributeFlags kDrawVerticesFlags{
+      kIsNonGeometric |   //
+      kUsesAlpha |        //
+      kUsesShader |       //
+      kUsesBlend |        //
+      kUsesColorFilter |  //
+      kUsesImageFilter    //
+  };
+  static constexpr DisplayListAttributeFlags kDrawImageFlags{
+      kIgnoresPaint  //
+  };
+  static constexpr DisplayListAttributeFlags kDrawImageWithPaintFlags{
+      kBaseImageFlags |  //
+      kUsesAntiAlias |   //
+      kUsesMaskFilter    //
+  };
+  static constexpr DisplayListAttributeFlags kDrawImageRectFlags{
+      kIgnoresPaint  //
+  };
+  static constexpr DisplayListAttributeFlags kDrawImageRectWithPaintFlags{
+      kBaseImageFlags |  //
+      kUsesAntiAlias |   //
+      kUsesMaskFilter    //
+  };
+  static constexpr DisplayListAttributeFlags kDrawImageNineFlags{
+      kIgnoresPaint  //
+  };
+  static constexpr DisplayListAttributeFlags kDrawImageNineWithPaintFlags{
+      kBaseImageFlags  //
+  };
+  static constexpr DisplayListAttributeFlags kDrawAtlasFlags{
+      kIgnoresPaint  //
+  };
+  static constexpr DisplayListAttributeFlags kDrawAtlasWithPaintFlags{
+      kBaseImageFlags  //
+  };
+  static constexpr DisplayListAttributeFlags kDrawDisplayListFlags{
+      kIgnoresPaint  //
+  };
+  static constexpr DisplayListAttributeFlags kDrawTextBlobFlags{
+      DisplayListAttributeFlags(kBasePaintFlags |         //
+                                kBaseStrokeOrFillFlags |  //
+                                kMayHaveJoins)            //
+      - kUsesAntiAlias                                    //
+  };
+  static constexpr DisplayListAttributeFlags kDrawShadowFlags{
+      kIgnoresPaint  //
+  };
 };
 
 }  // namespace flutter
 
-#endif  // FLUTTER_DISPLAY_LIST_DISPLAY_LIST_FLAGS_H_
+#endif  // FLUTTER_DISPLAY_LIST_DL_OP_FLAGS_H_
diff --git a/display_list/display_list_ops.cc b/display_list/dl_op_receiver.cc
similarity index 84%
rename from display_list/display_list_ops.cc
rename to display_list/dl_op_receiver.cc
index 4e8bdb23ee26457e746a75695bbcaa772be280bd..b1b6c01967e56cc0bc8c34475d3a2ecd66317caa 100644
--- a/display_list/display_list_ops.cc
+++ b/display_list/dl_op_receiver.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/display_list/display_list_ops.h"
+#include "flutter/display_list/dl_op_receiver.h"
 
 namespace flutter {
 
diff --git a/display_list/display_list_dispatcher.h b/display_list/dl_op_receiver.h
similarity index 65%
rename from display_list/display_list_dispatcher.h
rename to display_list/dl_op_receiver.h
index 62750b0d515ddc9320025d8b6b6e2f6f6bc09def..2eec9358273a79180154d24ed47aeed36828efa3 100644
--- a/display_list/display_list_dispatcher.h
+++ b/display_list/dl_op_receiver.h
@@ -2,44 +2,102 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_DISPATCHER_H_
-#define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_DISPATCHER_H_
+#ifndef FLUTTER_DISPLAY_LIST_DL_OP_RECEIVER_H_
+#define FLUTTER_DISPLAY_LIST_DL_OP_RECEIVER_H_
 
 #include "flutter/display_list/display_list.h"
-#include "flutter/display_list/display_list_blend_mode.h"
-#include "flutter/display_list/display_list_color_filter.h"
-#include "flutter/display_list/display_list_color_source.h"
-#include "flutter/display_list/display_list_image.h"
-#include "flutter/display_list/display_list_image_filter.h"
-#include "flutter/display_list/display_list_mask_filter.h"
-#include "flutter/display_list/display_list_paint.h"
-#include "flutter/display_list/display_list_path_effect.h"
-#include "flutter/display_list/display_list_sampling_options.h"
-#include "flutter/display_list/display_list_vertices.h"
+#include "flutter/display_list/dl_blend_mode.h"
+#include "flutter/display_list/dl_canvas.h"
+#include "flutter/display_list/dl_paint.h"
+#include "flutter/display_list/dl_sampling_options.h"
+#include "flutter/display_list/dl_vertices.h"
+#include "flutter/display_list/effects/dl_color_filter.h"
+#include "flutter/display_list/effects/dl_color_source.h"
+#include "flutter/display_list/effects/dl_image_filter.h"
+#include "flutter/display_list/effects/dl_mask_filter.h"
+#include "flutter/display_list/effects/dl_path_effect.h"
+#include "flutter/display_list/image/dl_image.h"
+
+#include "flutter/impeller/geometry/path.h"
 
 namespace flutter {
 
 class DisplayList;
 
 //------------------------------------------------------------------------------
-/// @brief      The pure virtual interface for interacting with a display list.
-///             This interface represents the methods used to build a list
-///             through the DisplayListBuilder and also the methods that will be
-///             invoked through the DisplayList::dispatch() method.
+/// @brief      Internal API for rendering recorded display lists to backends.
+///
+/// The |DisplayList| object will play back recorded operations in this format.
+/// Most developers should not need to deal with this interface unless they are
+/// writing a utility that needs to examine the contents of a display list.
+///
+/// Similar to |DlCanvas|, this interface carries clip and transform state
+/// which are saved and restored by the |save|, |saveLayer|, and |restore|
+/// calls.
 ///
-class Dispatcher {
+/// Unlike DlCanvas, this interface has attribute state which is global across
+/// an entire DisplayList (not affected by save/restore).
+///
+/// @see        DlSkCanvasDispatcher
+/// @see        impeller::DlDispatcher
+/// @see        DlOpSpy
+class DlOpReceiver {
+ protected:
+  using ClipOp = DlCanvas::ClipOp;
+  using PointMode = DlCanvas::PointMode;
+  using SrcRectConstraint = DlCanvas::SrcRectConstraint;
+
  public:
   // MaxDrawPointsCount * sizeof(SkPoint) must be less than 1 << 32
   static constexpr int kMaxDrawPointsCount = ((1 << 29) - 1);
 
-  // The following methods are nearly 1:1 with the methods on SkPaint and
+  // ---------------------------------------------------------------------
+  // The CacheablePath forms of the drawPath, clipPath, and drawShadow
+  // methods are only called if the DlOpReceiver indicates that it prefers
+  // impeller paths by returning true from |PrefersImpellerPaths|.
+  // Note that we pass in both the SkPath and (a place to cache the)
+  // impeller::Path forms of the path since the SkPath version can contain
+  // information about the type of path that lets the receiver optimize
+  // the operation (and potentially avoid the need to cache it).
+  // It is up to the receiver to convert the path to Impeller form and
+  // cache it to avoid needing to do a lot of Impeller-specific processing
+  // inside the DisplayList code.
+
+  virtual bool PrefersImpellerPaths() const { return false; }
+
+  struct CacheablePath {
+    explicit CacheablePath(const SkPath& path) : sk_path(path) {}
+
+    const SkPath sk_path;
+    mutable impeller::Path cached_impeller_path;
+
+    bool operator==(const CacheablePath& other) const {
+      return sk_path == other.sk_path;
+    }
+  };
+
+  virtual void clipPath(const CacheablePath& cache,
+                        ClipOp clip_op,
+                        bool is_aa) {
+    FML_UNREACHABLE();
+  }
+  virtual void drawPath(const CacheablePath& cache) { FML_UNREACHABLE(); }
+  virtual void drawShadow(const CacheablePath& cache,
+                          const DlColor color,
+                          const SkScalar elevation,
+                          bool transparent_occluder,
+                          SkScalar dpr) {
+    FML_UNREACHABLE();
+  }
+  // ---------------------------------------------------------------------
+
+  // The following methods are nearly 1:1 with the methods on DlPaint and
   // carry the same meanings. Each method sets a persistent value for the
   // attribute for the rest of the display list or until it is reset by
   // another method that changes the same attribute. The current set of
   // attributes is not affected by |save| and |restore|.
   virtual void setAntiAlias(bool aa) = 0;
-  virtual void setDither(bool dither) = 0;
-  virtual void setStyle(DlDrawStyle style) = 0;
+  virtual void setDrawStyle(DlDrawStyle style) = 0;
   virtual void setColor(DlColor color) = 0;
   virtual void setStrokeWidth(float width) = 0;
   virtual void setStrokeMiter(float limit) = 0;
@@ -47,13 +105,12 @@ class Dispatcher {
   virtual void setStrokeJoin(DlStrokeJoin join) = 0;
   virtual void setColorSource(const DlColorSource* source) = 0;
   virtual void setColorFilter(const DlColorFilter* filter) = 0;
-  // setInvertColors does not exist in SkPaint, but is a quick way to set
-  // a ColorFilter that inverts the rgb values of all rendered colors.
+  // setInvertColors is a quick way to set a ColorFilter that inverts the
+  // rgb values of all rendered colors.
   // It is not reset by |setColorFilter|, but instead composed with that
   // filter so that the color inversion happens after the ColorFilter.
   virtual void setInvertColors(bool invert) = 0;
   virtual void setBlendMode(DlBlendMode mode) = 0;
-  virtual void setBlender(sk_sp<SkBlender> blender) = 0;
   virtual void setPathEffect(const DlPathEffect* effect) = 0;
   virtual void setMaskFilter(const DlMaskFilter* filter) = 0;
   virtual void setImageFilter(const DlImageFilter* filter) = 0;
@@ -65,6 +122,11 @@ class Dispatcher {
   // attributes will be applied to the save layer surface while rendering
   // it back to the current surface. If the flag is false then this method
   // is equivalent to |SkCanvas::saveLayer| with a null paint object.
+  //
+  // The |options| parameter can also specify whether the bounds came from
+  // the caller who recorded the operation, or whether they were calculated
+  // by the DisplayListBuilder.
+  //
   // The |options| parameter may contain other options that indicate some
   // specific optimizations may be made by the underlying implementation
   // to avoid creating a temporary layer, these optimization options will
@@ -72,11 +134,37 @@ class Dispatcher {
   // specified in calling a |DisplayListBuilder| as they will be ignored.
   // The |backdrop| filter, if not null, is used to initialize the new
   // layer before further rendering happens.
-  virtual void saveLayer(const SkRect* bounds,
+  virtual void saveLayer(const SkRect& bounds,
                          const SaveLayerOptions options,
                          const DlImageFilter* backdrop = nullptr) = 0;
   virtual void restore() = 0;
 
+  // ---------------------------------------------------------------------
+  // Legacy helper method for older callers that use the null-ness of
+  // the bounds to indicate if they should be recorded or computed.
+  // This method will not be called on a |DlOpReceiver| that is passed
+  // to the |DisplayList::Dispatch()| method, so client receivers should
+  // ignore it for their implementation purposes.
+  //
+  // DlOpReceiver methods are generally meant to ONLY be output from a
+  // previously recorded DisplayList so this method is really only used
+  // from testing methods that bypass the public builder APIs for legacy
+  // convenience or for internal white-box testing of the DisplayList
+  // internals. Such methods should eventually be converted to using the
+  // public DisplayListBuilder/DlCanvas public interfaces where possible,
+  // as tracked in:
+  // https://github.com/flutter/flutter/issues/144070
+  virtual void saveLayer(const SkRect* bounds,
+                         const SaveLayerOptions options,
+                         const DlImageFilter* backdrop = nullptr) final {
+    if (bounds) {
+      saveLayer(*bounds, options.with_bounds_from_caller(), backdrop);
+    } else {
+      saveLayer(SkRect(), options.without_bounds_from_caller(), backdrop);
+    }
+  }
+  // ---------------------------------------------------------------------
+
   virtual void translate(SkScalar tx, SkScalar ty) = 0;
   virtual void scale(SkScalar sx, SkScalar sy) = 0;
   virtual void rotate(SkScalar degrees) = 0;
@@ -183,11 +271,9 @@ class Dispatcher {
   // Clears the transformation stack.
   virtual void transformReset() = 0;
 
-  virtual void clipRect(const SkRect& rect, SkClipOp clip_op, bool is_aa) = 0;
-  virtual void clipRRect(const SkRRect& rrect,
-                         SkClipOp clip_op,
-                         bool is_aa) = 0;
-  virtual void clipPath(const SkPath& path, SkClipOp clip_op, bool is_aa) = 0;
+  virtual void clipRect(const SkRect& rect, ClipOp clip_op, bool is_aa) = 0;
+  virtual void clipRRect(const SkRRect& rrect, ClipOp clip_op, bool is_aa) = 0;
+  virtual void clipPath(const SkPath& path, ClipOp clip_op, bool is_aa) = 0;
 
   // The following rendering methods all take their rendering attributes
   // from the last value set by the attribute methods above (regardless
@@ -209,32 +295,26 @@ class Dispatcher {
                        SkScalar start_degrees,
                        SkScalar sweep_degrees,
                        bool use_center) = 0;
-  virtual void drawPoints(SkCanvas::PointMode mode,
+  virtual void drawPoints(PointMode mode,
                           uint32_t count,
                           const SkPoint points[]) = 0;
-  virtual void drawSkVertices(const sk_sp<SkVertices> vertices,
-                              SkBlendMode mode) = 0;
   virtual void drawVertices(const DlVertices* vertices, DlBlendMode mode) = 0;
   virtual void drawImage(const sk_sp<DlImage> image,
                          const SkPoint point,
                          DlImageSampling sampling,
                          bool render_with_attributes) = 0;
-  virtual void drawImageRect(const sk_sp<DlImage> image,
-                             const SkRect& src,
-                             const SkRect& dst,
-                             DlImageSampling sampling,
-                             bool render_with_attributes,
-                             SkCanvas::SrcRectConstraint constraint) = 0;
+  virtual void drawImageRect(
+      const sk_sp<DlImage> image,
+      const SkRect& src,
+      const SkRect& dst,
+      DlImageSampling sampling,
+      bool render_with_attributes,
+      SrcRectConstraint constraint = SrcRectConstraint::kFast) = 0;
   virtual void drawImageNine(const sk_sp<DlImage> image,
                              const SkIRect& center,
                              const SkRect& dst,
                              DlFilterMode filter,
                              bool render_with_attributes) = 0;
-  virtual void drawImageLattice(const sk_sp<DlImage> image,
-                                const SkCanvas::Lattice& lattice,
-                                const SkRect& dst,
-                                DlFilterMode filter,
-                                bool render_with_attributes) = 0;
   virtual void drawAtlas(const sk_sp<DlImage> atlas,
                          const SkRSXform xform[],
                          const SkRect tex[],
@@ -244,13 +324,15 @@ class Dispatcher {
                          DlImageSampling sampling,
                          const SkRect* cull_rect,
                          bool render_with_attributes) = 0;
-  virtual void drawPicture(const sk_sp<SkPicture> picture,
-                           const SkMatrix* matrix,
-                           bool render_with_attributes) = 0;
-  virtual void drawDisplayList(const sk_sp<DisplayList> display_list) = 0;
+  virtual void drawDisplayList(const sk_sp<DisplayList> display_list,
+                               SkScalar opacity = SK_Scalar1) = 0;
   virtual void drawTextBlob(const sk_sp<SkTextBlob> blob,
                             SkScalar x,
                             SkScalar y) = 0;
+  virtual void drawTextFrame(
+      const std::shared_ptr<impeller::TextFrame>& text_frame,
+      SkScalar x,
+      SkScalar y) = 0;
   virtual void drawShadow(const SkPath& path,
                           const DlColor color,
                           const SkScalar elevation,
@@ -260,4 +342,4 @@ class Dispatcher {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_DISPLAY_LIST_DISPLAY_LIST_DISPATCHER_H_
+#endif  // FLUTTER_DISPLAY_LIST_DL_OP_RECEIVER_H_
diff --git a/display_list/dl_op_records.cc b/display_list/dl_op_records.cc
new file mode 100644
index 0000000000000000000000000000000000000000..e93e65afb4d6d5fa11d2ae278d95078deab4c35a
--- /dev/null
+++ b/display_list/dl_op_records.cc
@@ -0,0 +1,11 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/display_list/dl_op_records.h"
+
+namespace flutter {
+
+// Just exists to ensure that the header can be cleanly imported.
+
+}  // namespace flutter
diff --git a/display_list/display_list_ops.h b/display_list/dl_op_records.h
similarity index 55%
rename from display_list/display_list_ops.h
rename to display_list/dl_op_records.h
index 061f29365df454553d02c939c4f063859c811432..bcd895a1fcad734af13e50b880d79e6429e49d04 100644
--- a/display_list/display_list_ops.h
+++ b/display_list/dl_op_records.h
@@ -2,19 +2,63 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_OPS_H_
-#define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_OPS_H_
+#ifndef FLUTTER_DISPLAY_LIST_DL_OP_RECORDS_H_
+#define FLUTTER_DISPLAY_LIST_DL_OP_RECORDS_H_
 
-#include "display_list_color_source.h"
 #include "flutter/display_list/display_list.h"
-#include "flutter/display_list/display_list_blend_mode.h"
-#include "flutter/display_list/display_list_dispatcher.h"
-#include "flutter/display_list/display_list_sampling_options.h"
-#include "flutter/display_list/types.h"
+#include "flutter/display_list/dl_blend_mode.h"
+#include "flutter/display_list/dl_op_receiver.h"
+#include "flutter/display_list/dl_sampling_options.h"
+#include "flutter/display_list/effects/dl_color_source.h"
 #include "flutter/fml/macros.h"
 
+#include "flutter/impeller/geometry/path.h"
+#include "flutter/impeller/typographer/text_frame.h"
+#include "third_party/skia/include/core/SkRSXform.h"
+
 namespace flutter {
 
+// Structure holding the information necessary to dispatch and
+// potentially cull the DLOps during playback.
+//
+// Generally drawing ops will execute as long as |cur_index|
+// is at or after |next_render_index|, so setting the latter
+// to 0 will render all primitives and setting it to MAX_INT
+// will skip all remaining rendering primitives.
+//
+// Save and saveLayer ops will execute as long as the next
+// rendering index is before their closing restore index.
+// They will also store their own restore index into the
+// |next_restore_index| field for use by clip and transform ops.
+//
+// Clip and transform ops will only execute if the next
+// render index is before the next restore index. Otherwise
+// their modified state will not be used before it gets
+// restored.
+//
+// Attribute ops always execute as they are too numerous and
+// cheap to deal with a complicated "lifetime" tracking to
+// determine if they will be used.
+struct DispatchContext {
+  DlOpReceiver& receiver;
+
+  int cur_index;
+  int next_render_index;
+
+  int next_restore_index;
+
+  struct SaveInfo {
+    SaveInfo(int previous_restore_index, bool save_was_needed)
+        : previous_restore_index(previous_restore_index),
+          save_was_needed(save_was_needed) {}
+
+    int previous_restore_index;
+    bool save_was_needed;
+  };
+
+  std::vector<SaveInfo> save_infos;
+};
+
 // Most Ops can be bulk compared using memcmp because they contain
 // only numeric values or constructs that are constructed from numeric
 // values.
@@ -69,12 +113,11 @@ struct DLOp {
                                                              \
     const bool value;                                        \
                                                              \
-    void dispatch(Dispatcher& dispatcher) const {            \
-      dispatcher.set##name(value);                           \
+    void dispatch(DispatchContext& ctx) const {              \
+      ctx.receiver.set##name(value);                         \
     }                                                        \
   };
 DEFINE_SET_BOOL_OP(AntiAlias)
-DEFINE_SET_BOOL_OP(Dither)
 DEFINE_SET_BOOL_OP(InvertColors)
 #undef DEFINE_SET_BOOL_OP
 
@@ -87,8 +130,8 @@ DEFINE_SET_BOOL_OP(InvertColors)
                                                                          \
     const DlStroke##name value;                                          \
                                                                          \
-    void dispatch(Dispatcher& dispatcher) const {                        \
-      dispatcher.setStroke##name(value);                                 \
+    void dispatch(DispatchContext& ctx) const {                          \
+      ctx.receiver.setStroke##name(value);                               \
     }                                                                    \
   };
 DEFINE_SET_ENUM_OP(Cap)
@@ -103,7 +146,9 @@ struct SetStyleOp final : DLOp {
 
   const DlDrawStyle style;
 
-  void dispatch(Dispatcher& dispatcher) const { dispatcher.setStyle(style); }
+  void dispatch(DispatchContext& ctx) const {
+    ctx.receiver.setDrawStyle(style);
+  }
 };
 // 4 byte header + 4 byte payload packs into minimum 8 bytes
 struct SetStrokeWidthOp final : DLOp {
@@ -113,8 +158,8 @@ struct SetStrokeWidthOp final : DLOp {
 
   const float width;
 
-  void dispatch(Dispatcher& dispatcher) const {
-    dispatcher.setStrokeWidth(width);
+  void dispatch(DispatchContext& ctx) const {
+    ctx.receiver.setStrokeWidth(width);
   }
 };
 // 4 byte header + 4 byte payload packs into minimum 8 bytes
@@ -125,8 +170,8 @@ struct SetStrokeMiterOp final : DLOp {
 
   const float limit;
 
-  void dispatch(Dispatcher& dispatcher) const {
-    dispatcher.setStrokeMiter(limit);
+  void dispatch(DispatchContext& ctx) const {
+    ctx.receiver.setStrokeMiter(limit);
   }
 };
 
@@ -138,7 +183,7 @@ struct SetColorOp final : DLOp {
 
   const DlColor color;
 
-  void dispatch(Dispatcher& dispatcher) const { dispatcher.setColor(color); }
+  void dispatch(DispatchContext& ctx) const { ctx.receiver.setColor(color); }
 };
 // 4 byte header + 4 byte payload packs into minimum 8 bytes
 struct SetBlendModeOp final : DLOp {
@@ -148,55 +193,25 @@ struct SetBlendModeOp final : DLOp {
 
   const DlBlendMode mode;
 
-  void dispatch(Dispatcher& dispatcher) const { dispatcher.setBlendMode(mode); }
+  void dispatch(DispatchContext& ctx) const {  //
+    ctx.receiver.setBlendMode(mode);
+  }
 };
 
-// Clear: 4 byte header + unused 4 byte payload uses 8 bytes
-//        (4 bytes unused)
-// Set: 4 byte header + an sk_sp (ptr) uses 16 bytes due to the
-//      alignment of the ptr.
-//      (4 bytes unused)
-#define DEFINE_SET_CLEAR_SKREF_OP(name, field)                                 \
-  struct Clear##name##Op final : DLOp {                                        \
-    static const auto kType = DisplayListOpType::kClear##name;                 \
-                                                                               \
-    Clear##name##Op() {}                                                       \
-                                                                               \
-    void dispatch(Dispatcher& dispatcher) const {                              \
-      dispatcher.set##name(nullptr);                                           \
-    }                                                                          \
-  };                                                                           \
-  struct Set##name##Op final : DLOp {                                          \
-    static const auto kType = DisplayListOpType::kSet##name;                   \
-                                                                               \
-    explicit Set##name##Op(sk_sp<Sk##name> field) : field(std::move(field)) {} \
-                                                                               \
-    sk_sp<Sk##name> field;                                                     \
-                                                                               \
-    void dispatch(Dispatcher& dispatcher) const {                              \
-      dispatcher.set##name(field);                                             \
-    }                                                                          \
-  };
-DEFINE_SET_CLEAR_SKREF_OP(Blender, blender)
-#undef DEFINE_SET_CLEAR_SKREF_OP
-
 // Clear: 4 byte header + unused 4 byte payload uses 8 bytes
 //        (4 bytes unused)
 // Set: 4 byte header + unused 4 byte struct padding + Dl<name>
 //      instance copied to the memory following the record
 //      yields a size and efficiency that has somewhere between
 //      4 and 8 bytes unused
-// SetSk: 4 byte header + an sk_sp (ptr) uses 16 bytes due to the
-//        alignment of the ptr.
-//        (4 bytes unused)
 #define DEFINE_SET_CLEAR_DLATTR_OP(name, sk_name, field)                    \
   struct Clear##name##Op final : DLOp {                                     \
     static const auto kType = DisplayListOpType::kClear##name;              \
                                                                             \
     Clear##name##Op() {}                                                    \
                                                                             \
-    void dispatch(Dispatcher& dispatcher) const {                           \
-      dispatcher.set##name(nullptr);                                        \
+    void dispatch(DispatchContext& ctx) const {                             \
+      ctx.receiver.set##name(nullptr);                                      \
     }                                                                       \
   };                                                                        \
   struct SetPod##name##Op final : DLOp {                                    \
@@ -204,21 +219,9 @@ DEFINE_SET_CLEAR_SKREF_OP(Blender, blender)
                                                                             \
     SetPod##name##Op() {}                                                   \
                                                                             \
-    void dispatch(Dispatcher& dispatcher) const {                           \
+    void dispatch(DispatchContext& ctx) const {                             \
       const Dl##name* filter = reinterpret_cast<const Dl##name*>(this + 1); \
-      dispatcher.set##name(filter);                                         \
-    }                                                                       \
-  };                                                                        \
-  struct SetSk##name##Op final : DLOp {                                     \
-    static const auto kType = DisplayListOpType::kSetSk##name;              \
-                                                                            \
-    SetSk##name##Op(sk_sp<Sk##sk_name> field) : field(field) {}             \
-                                                                            \
-    sk_sp<Sk##sk_name> field;                                               \
-                                                                            \
-    void dispatch(Dispatcher& dispatcher) const {                           \
-      DlUnknown##name dl_filter(field);                                     \
-      dispatcher.set##name(&dl_filter);                                     \
+      ctx.receiver.set##name(filter);                                       \
     }                                                                       \
   };
 DEFINE_SET_CLEAR_DLATTR_OP(ColorFilter, ColorFilter, filter)
@@ -233,7 +236,7 @@ DEFINE_SET_CLEAR_DLATTR_OP(PathEffect, PathEffect, effect)
 struct SetImageColorSourceOp : DLOp {
   static const auto kType = DisplayListOpType::kSetImageColorSource;
 
-  SetImageColorSourceOp(const DlImageColorSource* source)
+  explicit SetImageColorSourceOp(const DlImageColorSource* source)
       : source(source->image(),
                source->horizontal_tile_mode(),
                source->vertical_tile_mode(),
@@ -242,8 +245,8 @@ struct SetImageColorSourceOp : DLOp {
 
   const DlImageColorSource source;
 
-  void dispatch(Dispatcher& dispatcher) const {
-    dispatcher.setColorSource(&source);
+  void dispatch(DispatchContext& ctx) const {
+    ctx.receiver.setColorSource(&source);
   }
 };
 
@@ -252,15 +255,16 @@ struct SetImageColorSourceOp : DLOp {
 struct SetRuntimeEffectColorSourceOp : DLOp {
   static const auto kType = DisplayListOpType::kSetRuntimeEffectColorSource;
 
-  SetRuntimeEffectColorSourceOp(const DlRuntimeEffectColorSource* source)
+  explicit SetRuntimeEffectColorSourceOp(
+      const DlRuntimeEffectColorSource* source)
       : source(source->runtime_effect(),
                source->samplers(),
                source->uniform_data()) {}
 
   const DlRuntimeEffectColorSource source;
 
-  void dispatch(Dispatcher& dispatcher) const {
-    dispatcher.setColorSource(&source);
+  void dispatch(DispatchContext& ctx) const {
+    ctx.receiver.setColorSource(&source);
   }
 
   DisplayListCompare equals(const SetRuntimeEffectColorSourceOp* other) const {
@@ -269,17 +273,37 @@ struct SetRuntimeEffectColorSourceOp : DLOp {
   }
 };
 
+#ifdef IMPELLER_ENABLE_3D
+struct SetSceneColorSourceOp : DLOp {
+  static const auto kType = DisplayListOpType::kSetSceneColorSource;
+
+  explicit SetSceneColorSourceOp(const DlSceneColorSource* source)
+      : source(source->scene_node(), source->camera_matrix()) {}
+
+  const DlSceneColorSource source;
+
+  void dispatch(DispatchContext& ctx) const {
+    ctx.receiver.setColorSource(&source);
+  }
+
+  DisplayListCompare equals(const SetSceneColorSourceOp* other) const {
+    return (source == other->source) ? DisplayListCompare::kEqual
+                                     : DisplayListCompare::kNotEqual;
+  }
+};
+#endif  // IMPELLER_ENABLE_3D
+
 // 4 byte header + 16 byte payload uses 24 total bytes (4 bytes unused)
 struct SetSharedImageFilterOp : DLOp {
   static const auto kType = DisplayListOpType::kSetSharedImageFilter;
 
-  SetSharedImageFilterOp(const DlImageFilter* filter)
+  explicit SetSharedImageFilterOp(const DlImageFilter* filter)
       : filter(filter->shared()) {}
 
   const std::shared_ptr<DlImageFilter> filter;
 
-  void dispatch(Dispatcher& dispatcher) const {
-    dispatcher.setImageFilter(filter.get());
+  void dispatch(DispatchContext& ctx) const {
+    ctx.receiver.setImageFilter(filter.get());
   }
 
   DisplayListCompare equals(const SetSharedImageFilterOp* other) const {
@@ -288,79 +312,78 @@ struct SetSharedImageFilterOp : DLOp {
   }
 };
 
-// 4 byte header + no payload uses minimum 8 bytes (4 bytes unused)
-struct SaveOp final : DLOp {
-  static const auto kType = DisplayListOpType::kSave;
+// The base struct for all save() and saveLayer() ops
+// 4 byte header + 8 byte payload packs into 16 bytes (4 bytes unused)
+struct SaveOpBase : DLOp {
+  SaveOpBase() : options(), restore_index(0) {}
 
-  SaveOp() {}
-
-  void dispatch(Dispatcher& dispatcher) const { dispatcher.save(); }
-};
-// 4 byte header + 4 byte payload packs into minimum 8 bytes
-struct SaveLayerOp final : DLOp {
-  static const auto kType = DisplayListOpType::kSaveLayer;
-
-  explicit SaveLayerOp(const SaveLayerOptions options) : options(options) {}
+  explicit SaveOpBase(const SaveLayerOptions& options)
+      : options(options), restore_index(0) {}
 
+  // options parameter is only used by saveLayer operations, but since
+  // it packs neatly into the empty space created by laying out the 64-bit
+  // offsets, it can be stored for free and defaulted to 0 for save operations.
   SaveLayerOptions options;
+  int restore_index;
 
-  void dispatch(Dispatcher& dispatcher) const {
-    dispatcher.saveLayer(nullptr, options);
+  inline bool save_needed(DispatchContext& ctx) const {
+    bool needed = ctx.next_render_index <= restore_index;
+    ctx.save_infos.emplace_back(ctx.next_restore_index, needed);
+    ctx.next_restore_index = restore_index;
+    return needed;
   }
 };
-// 4 byte header + 20 byte payload packs evenly into 24 bytes
-struct SaveLayerBoundsOp final : DLOp {
-  static const auto kType = DisplayListOpType::kSaveLayerBounds;
-
-  SaveLayerBoundsOp(SkRect rect, const SaveLayerOptions options)
-      : options(options), rect(rect) {}
+// 16 byte SaveOpBase with no additional data (options is unsed here)
+struct SaveOp final : SaveOpBase {
+  static const auto kType = DisplayListOpType::kSave;
 
-  SaveLayerOptions options;
-  const SkRect rect;
+  SaveOp() : SaveOpBase() {}
 
-  void dispatch(Dispatcher& dispatcher) const {
-    dispatcher.saveLayer(&rect, options);
+  void dispatch(DispatchContext& ctx) const {
+    if (save_needed(ctx)) {
+      ctx.receiver.save();
+    }
   }
 };
-// 4 byte header + 20 byte payload packs into minimum 24 bytes
-struct SaveLayerBackdropOp final : DLOp {
-  static const auto kType = DisplayListOpType::kSaveLayerBackdrop;
-
-  explicit SaveLayerBackdropOp(const SaveLayerOptions options,
-                               const DlImageFilter* backdrop)
-      : options(options), backdrop(backdrop->shared()) {}
+// The base struct for all saveLayer() ops
+// 16 byte SaveOpBase + 16 byte payload packs into 32 bytes (4 bytes unused)
+struct SaveLayerOpBase : SaveOpBase {
+  SaveLayerOpBase(const SaveLayerOptions& options, const SkRect& rect)
+      : SaveOpBase(options), rect(rect) {}
 
-  SaveLayerOptions options;
-  const std::shared_ptr<DlImageFilter> backdrop;
+  SkRect rect;
+};
+// 32 byte SaveLayerOpBase with no additional data
+struct SaveLayerOp final : SaveLayerOpBase {
+  static const auto kType = DisplayListOpType::kSaveLayer;
 
-  void dispatch(Dispatcher& dispatcher) const {
-    dispatcher.saveLayer(nullptr, options, backdrop.get());
-  }
+  SaveLayerOp(const SaveLayerOptions& options, const SkRect& rect)
+      : SaveLayerOpBase(options, rect) {}
 
-  DisplayListCompare equals(const SaveLayerBackdropOp* other) const {
-    return options == other->options && Equals(backdrop, other->backdrop)
-               ? DisplayListCompare::kEqual
-               : DisplayListCompare::kNotEqual;
+  void dispatch(DispatchContext& ctx) const {
+    if (save_needed(ctx)) {
+      ctx.receiver.saveLayer(rect, options);
+    }
   }
 };
-// 4 byte header + 36 byte payload packs evenly into 36 bytes
-struct SaveLayerBackdropBoundsOp final : DLOp {
-  static const auto kType = DisplayListOpType::kSaveLayerBackdropBounds;
+// 32 byte SaveLayerOpBase + 16 byte payload packs into minimum 48 bytes
+struct SaveLayerBackdropOp final : SaveLayerOpBase {
+  static const auto kType = DisplayListOpType::kSaveLayerBackdrop;
 
-  SaveLayerBackdropBoundsOp(SkRect rect,
-                            const SaveLayerOptions options,
-                            const DlImageFilter* backdrop)
-      : options(options), rect(rect), backdrop(backdrop->shared()) {}
+  SaveLayerBackdropOp(const SaveLayerOptions& options,
+                      const SkRect& rect,
+                      const DlImageFilter* backdrop)
+      : SaveLayerOpBase(options, rect), backdrop(backdrop->shared()) {}
 
-  SaveLayerOptions options;
-  const SkRect rect;
   const std::shared_ptr<DlImageFilter> backdrop;
 
-  void dispatch(Dispatcher& dispatcher) const {
-    dispatcher.saveLayer(&rect, options, backdrop.get());
+  void dispatch(DispatchContext& ctx) const {
+    if (save_needed(ctx)) {
+      ctx.receiver.saveLayer(rect, options, backdrop.get());
+    }
   }
 
-  DisplayListCompare equals(const SaveLayerBackdropBoundsOp* other) const {
+  DisplayListCompare equals(const SaveLayerBackdropOp* other) const {
     return (options == other->options && rect == other->rect &&
             Equals(backdrop, other->backdrop))
                ? DisplayListCompare::kEqual
@@ -373,12 +396,24 @@ struct RestoreOp final : DLOp {
 
   RestoreOp() {}
 
-  void dispatch(Dispatcher& dispatcher) const { dispatcher.restore(); }
+  void dispatch(DispatchContext& ctx) const {
+    DispatchContext::SaveInfo& info = ctx.save_infos.back();
+    if (info.save_was_needed) {
+      ctx.receiver.restore();
+    }
+    ctx.next_restore_index = info.previous_restore_index;
+    ctx.save_infos.pop_back();
+  }
 };
 
+struct TransformClipOpBase : DLOp {
+  inline bool op_needed(const DispatchContext& context) const {
+    return context.next_render_index <= context.next_restore_index;
+  }
+};
 // 4 byte header + 8 byte payload uses 12 bytes but is rounded up to 16 bytes
 // (4 bytes unused)
-struct TranslateOp final : DLOp {
+struct TranslateOp final : TransformClipOpBase {
   static const auto kType = DisplayListOpType::kTranslate;
 
   TranslateOp(SkScalar tx, SkScalar ty) : tx(tx), ty(ty) {}
@@ -386,11 +421,15 @@ struct TranslateOp final : DLOp {
   const SkScalar tx;
   const SkScalar ty;
 
-  void dispatch(Dispatcher& dispatcher) const { dispatcher.translate(tx, ty); }
+  void dispatch(DispatchContext& ctx) const {
+    if (op_needed(ctx)) {
+      ctx.receiver.translate(tx, ty);
+    }
+  }
 };
 // 4 byte header + 8 byte payload uses 12 bytes but is rounded up to 16 bytes
 // (4 bytes unused)
-struct ScaleOp final : DLOp {
+struct ScaleOp final : TransformClipOpBase {
   static const auto kType = DisplayListOpType::kScale;
 
   ScaleOp(SkScalar sx, SkScalar sy) : sx(sx), sy(sy) {}
@@ -398,21 +437,29 @@ struct ScaleOp final : DLOp {
   const SkScalar sx;
   const SkScalar sy;
 
-  void dispatch(Dispatcher& dispatcher) const { dispatcher.scale(sx, sy); }
+  void dispatch(DispatchContext& ctx) const {
+    if (op_needed(ctx)) {
+      ctx.receiver.scale(sx, sy);
+    }
+  }
 };
 // 4 byte header + 4 byte payload packs into minimum 8 bytes
-struct RotateOp final : DLOp {
+struct RotateOp final : TransformClipOpBase {
   static const auto kType = DisplayListOpType::kRotate;
 
   explicit RotateOp(SkScalar degrees) : degrees(degrees) {}
 
   const SkScalar degrees;
 
-  void dispatch(Dispatcher& dispatcher) const { dispatcher.rotate(degrees); }
+  void dispatch(DispatchContext& ctx) const {
+    if (op_needed(ctx)) {
+      ctx.receiver.rotate(degrees);
+    }
+  }
 };
 // 4 byte header + 8 byte payload uses 12 bytes but is rounded up to 16 bytes
 // (4 bytes unused)
-struct SkewOp final : DLOp {
+struct SkewOp final : TransformClipOpBase {
   static const auto kType = DisplayListOpType::kSkew;
 
   SkewOp(SkScalar sx, SkScalar sy) : sx(sx), sy(sy) {}
@@ -420,11 +467,15 @@ struct SkewOp final : DLOp {
   const SkScalar sx;
   const SkScalar sy;
 
-  void dispatch(Dispatcher& dispatcher) const { dispatcher.skew(sx, sy); }
+  void dispatch(DispatchContext& ctx) const {
+    if (op_needed(ctx)) {
+      ctx.receiver.skew(sx, sy);
+    }
+  }
 };
 // 4 byte header + 24 byte payload uses 28 bytes but is rounded up to 32 bytes
 // (4 bytes unused)
-struct Transform2DAffineOp final : DLOp {
+struct Transform2DAffineOp final : TransformClipOpBase {
   static const auto kType = DisplayListOpType::kTransform2DAffine;
 
   // clang-format off
@@ -436,14 +487,16 @@ struct Transform2DAffineOp final : DLOp {
   const SkScalar mxx, mxy, mxt;
   const SkScalar myx, myy, myt;
 
-  void dispatch(Dispatcher& dispatcher) const {
-    dispatcher.transform2DAffine(mxx, mxy, mxt,  //
-                                 myx, myy, myt);
+  void dispatch(DispatchContext& ctx) const {
+    if (op_needed(ctx)) {
+      ctx.receiver.transform2DAffine(mxx, mxy, mxt,  //
+                                     myx, myy, myt);
+    }
   }
 };
 // 4 byte header + 64 byte payload uses 68 bytes which is rounded up to 72 bytes
 // (4 bytes unused)
-struct TransformFullPerspectiveOp final : DLOp {
+struct TransformFullPerspectiveOp final : TransformClipOpBase {
   static const auto kType = DisplayListOpType::kTransformFullPerspective;
 
   // clang-format off
@@ -463,35 +516,41 @@ struct TransformFullPerspectiveOp final : DLOp {
   const SkScalar mzx, mzy, mzz, mzt;
   const SkScalar mwx, mwy, mwz, mwt;
 
-  void dispatch(Dispatcher& dispatcher) const {
-    dispatcher.transformFullPerspective(mxx, mxy, mxz, mxt,  //
-                                        myx, myy, myz, myt,  //
-                                        mzx, mzy, mzz, mzt,  //
-                                        mwx, mwy, mwz, mwt);
+  void dispatch(DispatchContext& ctx) const {
+    if (op_needed(ctx)) {
+      ctx.receiver.transformFullPerspective(mxx, mxy, mxz, mxt,  //
+                                            myx, myy, myz, myt,  //
+                                            mzx, mzy, mzz, mzt,  //
+                                            mwx, mwy, mwz, mwt);
+    }
   }
 };
 
 // 4 byte header with no payload.
-struct TransformResetOp final : DLOp {
+struct TransformResetOp final : TransformClipOpBase {
   static const auto kType = DisplayListOpType::kTransformReset;
 
   TransformResetOp() = default;
 
-  void dispatch(Dispatcher& dispatcher) const { dispatcher.transformReset(); }
+  void dispatch(DispatchContext& ctx) const {
+    if (op_needed(ctx)) {
+      ctx.receiver.transformReset();
+    }
+  }
 };
 
 // 4 byte header + 4 byte common payload packs into minimum 8 bytes
 // SkRect is 16 more bytes, which packs efficiently into 24 bytes total
 // SkRRect is 52 more bytes, which rounds up to 56 bytes (4 bytes unused)
 //         which packs into 64 bytes total
-// SkPath is 16 more bytes, which packs efficiently into 24 bytes total
+// CacheablePath is 128 more bytes, which packs efficiently into 136 bytes total
 //
 // We could pack the clip_op and the bool both into the free 4 bytes after
 // the header, but the Windows compiler keeps wanting to expand that
 // packing into more bytes than needed (even when they are declared as
 // packed bit fields!)
 #define DEFINE_CLIP_SHAPE_OP(shapetype, clipop)                            \
-  struct Clip##clipop##shapetype##Op final : DLOp {                        \
+  struct Clip##clipop##shapetype##Op final : TransformClipOpBase {         \
     static const auto kType = DisplayListOpType::kClip##clipop##shapetype; \
                                                                            \
     Clip##clipop##shapetype##Op(Sk##shapetype shape, bool is_aa)           \
@@ -500,8 +559,11 @@ struct TransformResetOp final : DLOp {
     const bool is_aa;                                                      \
     const Sk##shapetype shape;                                             \
                                                                            \
-    void dispatch(Dispatcher& dispatcher) const {                          \
-      dispatcher.clip##shapetype(shape, SkClipOp::k##clipop, is_aa);       \
+    void dispatch(DispatchContext& ctx) const {                            \
+      if (op_needed(ctx)) {                                                \
+        ctx.receiver.clip##shapetype(shape, DlCanvas::ClipOp::k##clipop,   \
+                                     is_aa);                               \
+      }                                                                    \
     }                                                                      \
   };
 DEFINE_CLIP_SHAPE_OP(Rect, Intersect)
@@ -510,41 +572,59 @@ DEFINE_CLIP_SHAPE_OP(Rect, Difference)
 DEFINE_CLIP_SHAPE_OP(RRect, Difference)
 #undef DEFINE_CLIP_SHAPE_OP
 
-#define DEFINE_CLIP_PATH_OP(clipop)                                      \
-  struct Clip##clipop##PathOp final : DLOp {                             \
-    static const auto kType = DisplayListOpType::kClip##clipop##Path;    \
-                                                                         \
-    Clip##clipop##PathOp(SkPath path, bool is_aa)                        \
-        : is_aa(is_aa), path(path) {}                                    \
-                                                                         \
-    const bool is_aa;                                                    \
-    const SkPath path;                                                   \
-                                                                         \
-    void dispatch(Dispatcher& dispatcher) const {                        \
-      dispatcher.clipPath(path, SkClipOp::k##clipop, is_aa);             \
-    }                                                                    \
-                                                                         \
-    DisplayListCompare equals(const Clip##clipop##PathOp* other) const { \
-      return is_aa == other->is_aa && path == other->path                \
-                 ? DisplayListCompare::kEqual                            \
-                 : DisplayListCompare::kNotEqual;                        \
-    }                                                                    \
+#define DEFINE_CLIP_PATH_OP(clipop)                                       \
+  struct Clip##clipop##PathOp final : TransformClipOpBase {               \
+    static const auto kType = DisplayListOpType::kClip##clipop##Path;     \
+                                                                          \
+    Clip##clipop##PathOp(const SkPath& path, bool is_aa)                  \
+        : is_aa(is_aa), cached_path(path) {}                              \
+                                                                          \
+    const bool is_aa;                                                     \
+    const DlOpReceiver::CacheablePath cached_path;                        \
+                                                                          \
+    void dispatch(DispatchContext& ctx) const {                           \
+      if (op_needed(ctx)) {                                               \
+        if (ctx.receiver.PrefersImpellerPaths()) {                        \
+          ctx.receiver.clipPath(cached_path, DlCanvas::ClipOp::k##clipop, \
+                                is_aa);                                   \
+        } else {                                                          \
+          ctx.receiver.clipPath(cached_path.sk_path,                      \
+                                DlCanvas::ClipOp::k##clipop, is_aa);      \
+        }                                                                 \
+      }                                                                   \
+    }                                                                     \
+                                                                          \
+    DisplayListCompare equals(const Clip##clipop##PathOp* other) const {  \
+      return is_aa == other->is_aa && cached_path == other->cached_path   \
+                 ? DisplayListCompare::kEqual                             \
+                 : DisplayListCompare::kNotEqual;                         \
+    }                                                                     \
   };
 DEFINE_CLIP_PATH_OP(Intersect)
 DEFINE_CLIP_PATH_OP(Difference)
 #undef DEFINE_CLIP_PATH_OP
 
+struct DrawOpBase : DLOp {
+  inline bool op_needed(const DispatchContext& ctx) const {
+    return ctx.cur_index >= ctx.next_render_index;
+  }
+};
+
 // 4 byte header + no payload uses minimum 8 bytes (4 bytes unused)
-struct DrawPaintOp final : DLOp {
+struct DrawPaintOp final : DrawOpBase {
   static const auto kType = DisplayListOpType::kDrawPaint;
 
   DrawPaintOp() {}
 
-  void dispatch(Dispatcher& dispatcher) const { dispatcher.drawPaint(); }
+  void dispatch(DispatchContext& ctx) const {
+    if (op_needed(ctx)) {
+      ctx.receiver.drawPaint();
+    }
+  }
 };
 // 4 byte header + 8 byte payload uses 12 bytes but is rounded up to 16 bytes
 // (4 bytes unused)
-struct DrawColorOp final : DLOp {
+struct DrawColorOp final : DrawOpBase {
   static const auto kType = DisplayListOpType::kDrawColor;
 
   DrawColorOp(DlColor color, DlBlendMode mode) : color(color), mode(mode) {}
@@ -552,8 +632,10 @@ struct DrawColorOp final : DLOp {
   const DlColor color;
   const DlBlendMode mode;
 
-  void dispatch(Dispatcher& dispatcher) const {
-    dispatcher.drawColor(color, mode);
+  void dispatch(DispatchContext& ctx) const {
+    if (op_needed(ctx)) {
+      ctx.receiver.drawColor(color, mode);
+    }
   }
 };
 
@@ -563,15 +645,17 @@ struct DrawColorOp final : DLOp {
 // SkOval is same as SkRect
 // SkRRect is 52 more bytes, which packs efficiently into 56 bytes total
 #define DEFINE_DRAW_1ARG_OP(op_name, arg_type, arg_name)                  \
-  struct Draw##op_name##Op final : DLOp {                                 \
+  struct Draw##op_name##Op final : DrawOpBase {                           \
     static const auto kType = DisplayListOpType::kDraw##op_name;          \
                                                                           \
     explicit Draw##op_name##Op(arg_type arg_name) : arg_name(arg_name) {} \
                                                                           \
     const arg_type arg_name;                                              \
                                                                           \
-    void dispatch(Dispatcher& dispatcher) const {                         \
-      dispatcher.draw##op_name(arg_name);                                 \
+    void dispatch(DispatchContext& ctx) const {                           \
+      if (op_needed(ctx)) {                                               \
+        ctx.receiver.draw##op_name(arg_name);                             \
+      }                                                                   \
     }                                                                     \
   };
 DEFINE_DRAW_1ARG_OP(Rect, SkRect, rect)
@@ -579,20 +663,28 @@ DEFINE_DRAW_1ARG_OP(Oval, SkRect, oval)
 DEFINE_DRAW_1ARG_OP(RRect, SkRRect, rrect)
 #undef DEFINE_DRAW_1ARG_OP
 
-// 4 byte header + 16 byte payload uses 20 bytes but is rounded up to 24 bytes
-// (4 bytes unused)
-struct DrawPathOp final : DLOp {
+// 4 byte header + 128 byte payload uses 132 bytes but is rounded
+// up to 136 bytes (4 bytes unused)
+struct DrawPathOp final : DrawOpBase {
   static const auto kType = DisplayListOpType::kDrawPath;
 
-  explicit DrawPathOp(SkPath path) : path(path) {}
+  explicit DrawPathOp(const SkPath& path) : cached_path(path) {}
 
-  const SkPath path;
+  const DlOpReceiver::CacheablePath cached_path;
 
-  void dispatch(Dispatcher& dispatcher) const { dispatcher.drawPath(path); }
+  void dispatch(DispatchContext& ctx) const {
+    if (op_needed(ctx)) {
+      if (ctx.receiver.PrefersImpellerPaths()) {
+        ctx.receiver.drawPath(cached_path);
+      } else {
+        ctx.receiver.drawPath(cached_path.sk_path);
+      }
+    }
+  }
 
   DisplayListCompare equals(const DrawPathOp* other) const {
-    return path == other->path ? DisplayListCompare::kEqual
-                               : DisplayListCompare::kNotEqual;
+    return cached_path == other->cached_path ? DisplayListCompare::kEqual
+                                             : DisplayListCompare::kNotEqual;
   }
 };
 
@@ -603,7 +695,7 @@ struct DrawPathOp final : DLOp {
 // 2 x SkRRect is 104 more bytes, using 108 and rounding up to 112 bytes total
 //             (4 bytes unused)
 #define DEFINE_DRAW_2ARG_OP(op_name, type1, name1, type2, name2) \
-  struct Draw##op_name##Op final : DLOp {                        \
+  struct Draw##op_name##Op final : DrawOpBase {                  \
     static const auto kType = DisplayListOpType::kDraw##op_name; \
                                                                  \
     Draw##op_name##Op(type1 name1, type2 name2)                  \
@@ -612,8 +704,10 @@ struct DrawPathOp final : DLOp {
     const type1 name1;                                           \
     const type2 name2;                                           \
                                                                  \
-    void dispatch(Dispatcher& dispatcher) const {                \
-      dispatcher.draw##op_name(name1, name2);                    \
+    void dispatch(DispatchContext& ctx) const {                  \
+      if (op_needed(ctx)) {                                      \
+        ctx.receiver.draw##op_name(name1, name2);                \
+      }                                                          \
     }                                                            \
   };
 DEFINE_DRAW_2ARG_OP(Line, SkPoint, p0, SkPoint, p1)
@@ -622,7 +716,7 @@ DEFINE_DRAW_2ARG_OP(DRRect, SkRRect, outer, SkRRect, inner)
 #undef DEFINE_DRAW_2ARG_OP
 
 // 4 byte header + 28 byte payload packs efficiently into 32 bytes
-struct DrawArcOp final : DLOp {
+struct DrawArcOp final : DrawOpBase {
   static const auto kType = DisplayListOpType::kDrawArc;
 
   DrawArcOp(SkRect bounds, SkScalar start, SkScalar sweep, bool center)
@@ -633,8 +727,10 @@ struct DrawArcOp final : DLOp {
   const SkScalar sweep;
   const bool center;
 
-  void dispatch(Dispatcher& dispatcher) const {
-    dispatcher.drawArc(bounds, start, sweep, center);
+  void dispatch(DispatchContext& ctx) const {
+    if (op_needed(ctx)) {
+      ctx.receiver.drawArc(bounds, start, sweep, center);
+    }
   }
 };
 
@@ -644,22 +740,24 @@ struct DrawArcOp final : DLOp {
 // so this op will always pack efficiently
 // The point type is packed into 3 different OpTypes to avoid expanding
 // the fixed payload beyond the 8 bytes
-#define DEFINE_DRAW_POINTS_OP(name, mode)                              \
-  struct Draw##name##Op final : DLOp {                                 \
-    static const auto kType = DisplayListOpType::kDraw##name;          \
-                                                                       \
-    explicit Draw##name##Op(uint32_t count) : count(count) {}          \
-                                                                       \
-    const uint32_t count;                                              \
-                                                                       \
-    void dispatch(Dispatcher& dispatcher) const {                      \
-      const SkPoint* pts = reinterpret_cast<const SkPoint*>(this + 1); \
-      dispatcher.drawPoints(SkCanvas::PointMode::mode, count, pts);    \
-    }                                                                  \
+#define DEFINE_DRAW_POINTS_OP(name, mode)                                \
+  struct Draw##name##Op final : DrawOpBase {                             \
+    static const auto kType = DisplayListOpType::kDraw##name;            \
+                                                                         \
+    explicit Draw##name##Op(uint32_t count) : count(count) {}            \
+                                                                         \
+    const uint32_t count;                                                \
+                                                                         \
+    void dispatch(DispatchContext& ctx) const {                          \
+      if (op_needed(ctx)) {                                              \
+        const SkPoint* pts = reinterpret_cast<const SkPoint*>(this + 1); \
+        ctx.receiver.drawPoints(DlCanvas::PointMode::mode, count, pts);  \
+      }                                                                  \
+    }                                                                    \
   };
-DEFINE_DRAW_POINTS_OP(Points, kPoints_PointMode);
-DEFINE_DRAW_POINTS_OP(Lines, kLines_PointMode);
-DEFINE_DRAW_POINTS_OP(Polygon, kPolygon_PointMode);
+DEFINE_DRAW_POINTS_OP(Points, kPoints);
+DEFINE_DRAW_POINTS_OP(Lines, kLines);
+DEFINE_DRAW_POINTS_OP(Polygon, kPolygon);
 #undef DEFINE_DRAW_POINTS_OP
 
 // 4 byte header + 4 byte payload packs efficiently into 8 bytes
@@ -669,52 +767,49 @@ DEFINE_DRAW_POINTS_OP(Polygon, kPolygon_PointMode);
 // Note that the DlVertices object ends with an array of 16-bit
 // indices so the alignment can be up to 6 bytes off leading to
 // up to 6 bytes of overhead
-struct DrawVerticesOp final : DLOp {
+struct DrawVerticesOp final : DrawOpBase {
   static const auto kType = DisplayListOpType::kDrawVertices;
 
-  DrawVerticesOp(DlBlendMode mode) : mode(mode) {}
+  explicit DrawVerticesOp(DlBlendMode mode) : mode(mode) {}
 
   const DlBlendMode mode;
 
-  void dispatch(Dispatcher& dispatcher) const {
-    const DlVertices* vertices = reinterpret_cast<const DlVertices*>(this + 1);
-    dispatcher.drawVertices(vertices, mode);
-  }
-};
-
-// 4 byte header + 12 byte payload packs efficiently into 16 bytes
-struct DrawSkVerticesOp final : DLOp {
-  static const auto kType = DisplayListOpType::kDrawSkVertices;
-
-  DrawSkVerticesOp(sk_sp<SkVertices> vertices, SkBlendMode mode)
-      : mode(mode), vertices(std::move(vertices)) {}
-
-  const SkBlendMode mode;
-  const sk_sp<SkVertices> vertices;
-
-  void dispatch(Dispatcher& dispatcher) const {
-    dispatcher.drawSkVertices(vertices, mode);
+  void dispatch(DispatchContext& ctx) const {
+    if (op_needed(ctx)) {
+      const DlVertices* vertices =
+          reinterpret_cast<const DlVertices*>(this + 1);
+      ctx.receiver.drawVertices(vertices, mode);
+    }
   }
 };
 
 // 4 byte header + 40 byte payload uses 44 bytes but is rounded up to 48 bytes
 // (4 bytes unused)
-#define DEFINE_DRAW_IMAGE_OP(name, with_attributes)                    \
-  struct name##Op final : DLOp {                                       \
-    static const auto kType = DisplayListOpType::k##name;              \
-                                                                       \
-    name##Op(const sk_sp<DlImage> image,                               \
-             const SkPoint& point,                                     \
-             DlImageSampling sampling)                                 \
-        : point(point), sampling(sampling), image(std::move(image)) {} \
-                                                                       \
-    const SkPoint point;                                               \
-    const DlImageSampling sampling;                                    \
-    const sk_sp<DlImage> image;                                        \
-                                                                       \
-    void dispatch(Dispatcher& dispatcher) const {                      \
-      dispatcher.drawImage(image, point, sampling, with_attributes);   \
-    }                                                                  \
+#define DEFINE_DRAW_IMAGE_OP(name, with_attributes)                      \
+  struct name##Op final : DrawOpBase {                                   \
+    static const auto kType = DisplayListOpType::k##name;                \
+                                                                         \
+    name##Op(const sk_sp<DlImage>& image,                                \
+             const SkPoint& point,                                       \
+             DlImageSampling sampling)                                   \
+        : point(point), sampling(sampling), image(std::move(image)) {}   \
+                                                                         \
+    const SkPoint point;                                                 \
+    const DlImageSampling sampling;                                      \
+    const sk_sp<DlImage> image;                                          \
+                                                                         \
+    void dispatch(DispatchContext& ctx) const {                          \
+      if (op_needed(ctx)) {                                              \
+        ctx.receiver.drawImage(image, point, sampling, with_attributes); \
+      }                                                                  \
+    }                                                                    \
+                                                                         \
+    DisplayListCompare equals(const name##Op* other) const {             \
+      return (point == other->point && sampling == other->sampling &&    \
+              image->Equals(other->image))                               \
+                 ? DisplayListCompare::kEqual                            \
+                 : DisplayListCompare::kNotEqual;                        \
+    }                                                                    \
   };
 DEFINE_DRAW_IMAGE_OP(DrawImage, false)
 DEFINE_DRAW_IMAGE_OP(DrawImageWithAttr, true)
@@ -722,107 +817,80 @@ DEFINE_DRAW_IMAGE_OP(DrawImageWithAttr, true)
 
 // 4 byte header + 72 byte payload uses 76 bytes but is rounded up to 80 bytes
 // (4 bytes unused)
-struct DrawImageRectOp final : DLOp {
+struct DrawImageRectOp final : DrawOpBase {
   static const auto kType = DisplayListOpType::kDrawImageRect;
 
-  DrawImageRectOp(const sk_sp<DlImage> image,
+  DrawImageRectOp(const sk_sp<DlImage>& image,
                   const SkRect& src,
                   const SkRect& dst,
                   DlImageSampling sampling,
                   bool render_with_attributes,
-                  SkCanvas::SrcRectConstraint constraint)
+                  DlCanvas::SrcRectConstraint constraint)
       : src(src),
         dst(dst),
         sampling(sampling),
         render_with_attributes(render_with_attributes),
         constraint(constraint),
-        image(std::move(image)) {}
+        image(image) {}
 
   const SkRect src;
   const SkRect dst;
   const DlImageSampling sampling;
   const bool render_with_attributes;
-  const SkCanvas::SrcRectConstraint constraint;
+  const DlCanvas::SrcRectConstraint constraint;
   const sk_sp<DlImage> image;
 
-  void dispatch(Dispatcher& dispatcher) const {
-    dispatcher.drawImageRect(image, src, dst, sampling, render_with_attributes,
-                             constraint);
+  void dispatch(DispatchContext& ctx) const {
+    if (op_needed(ctx)) {
+      ctx.receiver.drawImageRect(image, src, dst, sampling,
+                                 render_with_attributes, constraint);
+    }
+  }
+
+  DisplayListCompare equals(const DrawImageRectOp* other) const {
+    return (src == other->src && dst == other->dst &&
+            sampling == other->sampling &&
+            render_with_attributes == other->render_with_attributes &&
+            constraint == other->constraint && image->Equals(other->image))
+               ? DisplayListCompare::kEqual
+               : DisplayListCompare::kNotEqual;
   }
 };
 
 // 4 byte header + 44 byte payload packs efficiently into 48 bytes
-#define DEFINE_DRAW_IMAGE_NINE_OP(name, render_with_attributes)                \
-  struct name##Op final : DLOp {                                               \
-    static const auto kType = DisplayListOpType::k##name;                      \
-                                                                               \
-    name##Op(const sk_sp<DlImage> image,                                       \
-             const SkIRect& center,                                            \
-             const SkRect& dst,                                                \
-             DlFilterMode filter)                                              \
-        : center(center), dst(dst), filter(filter), image(std::move(image)) {} \
-                                                                               \
-    const SkIRect center;                                                      \
-    const SkRect dst;                                                          \
-    const DlFilterMode filter;                                                 \
-    const sk_sp<DlImage> image;                                                \
-                                                                               \
-    void dispatch(Dispatcher& dispatcher) const {                              \
-      dispatcher.drawImageNine(image, center, dst, filter,                     \
-                               render_with_attributes);                        \
-    }                                                                          \
+#define DEFINE_DRAW_IMAGE_NINE_OP(name, render_with_attributes)            \
+  struct name##Op final : DrawOpBase {                                     \
+    static const auto kType = DisplayListOpType::k##name;                  \
+                                                                           \
+    name##Op(const sk_sp<DlImage>& image,                                  \
+             const SkIRect& center,                                        \
+             const SkRect& dst,                                            \
+             DlFilterMode mode)                                            \
+        : center(center), dst(dst), mode(mode), image(std::move(image)) {} \
+                                                                           \
+    const SkIRect center;                                                  \
+    const SkRect dst;                                                      \
+    const DlFilterMode mode;                                               \
+    const sk_sp<DlImage> image;                                            \
+                                                                           \
+    void dispatch(DispatchContext& ctx) const {                            \
+      if (op_needed(ctx)) {                                                \
+        ctx.receiver.drawImageNine(image, center, dst, mode,               \
+                                   render_with_attributes);                \
+      }                                                                    \
+    }                                                                      \
+                                                                           \
+    DisplayListCompare equals(const name##Op* other) const {               \
+      return (center == other->center && dst == other->dst &&              \
+              mode == other->mode && image->Equals(other->image))          \
+                 ? DisplayListCompare::kEqual                              \
+                 : DisplayListCompare::kNotEqual;                          \
+    }                                                                      \
   };
 DEFINE_DRAW_IMAGE_NINE_OP(DrawImageNine, false)
 DEFINE_DRAW_IMAGE_NINE_OP(DrawImageNineWithAttr, true)
 #undef DEFINE_DRAW_IMAGE_NINE_OP
 
-// 4 byte header + 60 byte payload packs evenly into 64 bytes
-struct DrawImageLatticeOp final : DLOp {
-  static const auto kType = DisplayListOpType::kDrawImageLattice;
-
-  DrawImageLatticeOp(const sk_sp<DlImage> image,
-                     int x_count,
-                     int y_count,
-                     int cell_count,
-                     const SkIRect& src,
-                     const SkRect& dst,
-                     DlFilterMode filter,
-                     bool with_paint)
-      : with_paint(with_paint),
-        x_count(x_count),
-        y_count(y_count),
-        cell_count(cell_count),
-        filter(filter),
-        src(src),
-        dst(dst),
-        image(std::move(image)) {}
-
-  const bool with_paint;
-  const int x_count;
-  const int y_count;
-  const int cell_count;
-  const DlFilterMode filter;
-  const SkIRect src;
-  const SkRect dst;
-  const sk_sp<DlImage> image;
-
-  void dispatch(Dispatcher& dispatcher) const {
-    const int* xDivs = reinterpret_cast<const int*>(this + 1);
-    const int* yDivs = reinterpret_cast<const int*>(xDivs + x_count);
-    const SkColor* colors =
-        (cell_count == 0) ? nullptr
-                          : reinterpret_cast<const SkColor*>(yDivs + y_count);
-    const SkCanvas::Lattice::RectType* types =
-        (cell_count == 0)
-            ? nullptr
-            : reinterpret_cast<const SkCanvas::Lattice::RectType*>(colors +
-                                                                   cell_count);
-    dispatcher.drawImageLattice(
-        image, {xDivs, yDivs, types, x_count, y_count, &src, colors}, dst,
-        filter, with_paint);
-  }
-};
-
 // 4 byte header + 40 byte payload uses 44 bytes but is rounded up to 48 bytes
 // (4 bytes unused)
 // Each of these is then followed by a number of lists.
@@ -830,8 +898,8 @@ struct DrawImageLatticeOp final : DLOp {
 // SkRect list is also a multiple of 16 bytes so it also packs well
 // DlColor list only packs well if the count is even, otherwise there
 // can be 4 unusued bytes at the end.
-struct DrawAtlasBaseOp : DLOp {
-  DrawAtlasBaseOp(const sk_sp<DlImage> atlas,
+struct DrawAtlasBaseOp : DrawOpBase {
+  DrawAtlasBaseOp(const sk_sp<DlImage>& atlas,
                   int count,
                   DlBlendMode mode,
                   DlImageSampling sampling,
@@ -842,7 +910,7 @@ struct DrawAtlasBaseOp : DLOp {
         has_colors(has_colors),
         render_with_attributes(render_with_attributes),
         sampling(sampling),
-        atlas(std::move(atlas)) {}
+        atlas(atlas) {}
 
   const int count;
   const uint16_t mode_index;
@@ -850,6 +918,23 @@ struct DrawAtlasBaseOp : DLOp {
   const uint8_t render_with_attributes;
   const DlImageSampling sampling;
   const sk_sp<DlImage> atlas;
+
+  bool equals(const DrawAtlasBaseOp* other,
+              const void* pod_this,
+              const void* pod_other) const {
+    bool ret = (count == other->count && mode_index == other->mode_index &&
+                has_colors == other->has_colors &&
+                render_with_attributes == other->render_with_attributes &&
+                sampling == other->sampling && atlas->Equals(other->atlas));
+    if (ret) {
+      size_t bytes = count * (sizeof(SkRSXform) + sizeof(SkRect));
+      if (has_colors) {
+        bytes += count * sizeof(DlColor);
+      }
+      ret = (memcmp(pod_this, pod_other, bytes) == 0);
+    }
+    return ret;
+  }
 };
 
 // Packs into 48 bytes as per DrawAtlasBaseOp
@@ -857,7 +942,7 @@ struct DrawAtlasBaseOp : DLOp {
 struct DrawAtlasOp final : DrawAtlasBaseOp {
   static const auto kType = DisplayListOpType::kDrawAtlas;
 
-  DrawAtlasOp(const sk_sp<DlImage> atlas,
+  DrawAtlasOp(const sk_sp<DlImage>& atlas,
               int count,
               DlBlendMode mode,
               DlImageSampling sampling,
@@ -870,14 +955,24 @@ struct DrawAtlasOp final : DrawAtlasBaseOp {
                         has_colors,
                         render_with_attributes) {}
 
-  void dispatch(Dispatcher& dispatcher) const {
-    const SkRSXform* xform = reinterpret_cast<const SkRSXform*>(this + 1);
-    const SkRect* tex = reinterpret_cast<const SkRect*>(xform + count);
-    const DlColor* colors =
-        has_colors ? reinterpret_cast<const DlColor*>(tex + count) : nullptr;
-    const DlBlendMode mode = static_cast<DlBlendMode>(mode_index);
-    dispatcher.drawAtlas(atlas, xform, tex, colors, count, mode, sampling,
-                         nullptr, render_with_attributes);
+  void dispatch(DispatchContext& ctx) const {
+    if (op_needed(ctx)) {
+      const SkRSXform* xform = reinterpret_cast<const SkRSXform*>(this + 1);
+      const SkRect* tex = reinterpret_cast<const SkRect*>(xform + count);
+      const DlColor* colors =
+          has_colors ? reinterpret_cast<const DlColor*>(tex + count) : nullptr;
+      const DlBlendMode mode = static_cast<DlBlendMode>(mode_index);
+      ctx.receiver.drawAtlas(atlas, xform, tex, colors, count, mode, sampling,
+                             nullptr, render_with_attributes);
+    }
+  }
+
+  DisplayListCompare equals(const DrawAtlasOp* other) const {
+    const void* pod_this = reinterpret_cast<const void*>(this + 1);
+    const void* pod_other = reinterpret_cast<const void*>(other + 1);
+    return (DrawAtlasBaseOp::equals(other, pod_this, pod_other))
+               ? DisplayListCompare::kEqual
+               : DisplayListCompare::kNotEqual;
   }
 };
 
@@ -888,7 +983,7 @@ struct DrawAtlasOp final : DrawAtlasBaseOp {
 struct DrawAtlasCulledOp final : DrawAtlasBaseOp {
   static const auto kType = DisplayListOpType::kDrawAtlasCulled;
 
-  DrawAtlasCulledOp(const sk_sp<DlImage> atlas,
+  DrawAtlasCulledOp(const sk_sp<DlImage>& atlas,
                     int count,
                     DlBlendMode mode,
                     DlImageSampling sampling,
@@ -905,69 +1000,49 @@ struct DrawAtlasCulledOp final : DrawAtlasBaseOp {
 
   const SkRect cull_rect;
 
-  void dispatch(Dispatcher& dispatcher) const {
-    const SkRSXform* xform = reinterpret_cast<const SkRSXform*>(this + 1);
-    const SkRect* tex = reinterpret_cast<const SkRect*>(xform + count);
-    const DlColor* colors =
-        has_colors ? reinterpret_cast<const DlColor*>(tex + count) : nullptr;
-    const DlBlendMode mode = static_cast<DlBlendMode>(mode_index);
-    dispatcher.drawAtlas(atlas, xform, tex, colors, count, mode, sampling,
-                         &cull_rect, render_with_attributes);
-  }
-};
-
-// 4 byte header + 12 byte payload packs evenly into 16 bytes
-struct DrawSkPictureOp final : DLOp {
-  static const auto kType = DisplayListOpType::kDrawSkPicture;
-
-  DrawSkPictureOp(sk_sp<SkPicture> picture, bool render_with_attributes)
-      : render_with_attributes(render_with_attributes),
-        picture(std::move(picture)) {}
-
-  const bool render_with_attributes;
-  const sk_sp<SkPicture> picture;
-
-  void dispatch(Dispatcher& dispatcher) const {
-    dispatcher.drawPicture(picture, nullptr, render_with_attributes);
+  void dispatch(DispatchContext& ctx) const {
+    if (op_needed(ctx)) {
+      const SkRSXform* xform = reinterpret_cast<const SkRSXform*>(this + 1);
+      const SkRect* tex = reinterpret_cast<const SkRect*>(xform + count);
+      const DlColor* colors =
+          has_colors ? reinterpret_cast<const DlColor*>(tex + count) : nullptr;
+      const DlBlendMode mode = static_cast<DlBlendMode>(mode_index);
+      ctx.receiver.drawAtlas(atlas, xform, tex, colors, count, mode, sampling,
+                             &cull_rect, render_with_attributes);
+    }
   }
-};
-
-// 4 byte header + 52 byte payload packs evenly into 56 bytes
-struct DrawSkPictureMatrixOp final : DLOp {
-  static const auto kType = DisplayListOpType::kDrawSkPictureMatrix;
-
-  DrawSkPictureMatrixOp(sk_sp<SkPicture> picture,
-                        const SkMatrix matrix,
-                        bool render_with_attributes)
-      : render_with_attributes(render_with_attributes),
-        picture(std::move(picture)),
-        matrix(matrix) {}
-
-  const bool render_with_attributes;
-  const sk_sp<SkPicture> picture;
-  const SkMatrix matrix;
 
-  void dispatch(Dispatcher& dispatcher) const {
-    dispatcher.drawPicture(picture, &matrix, render_with_attributes);
+  DisplayListCompare equals(const DrawAtlasCulledOp* other) const {
+    const void* pod_this = reinterpret_cast<const void*>(this + 1);
+    const void* pod_other = reinterpret_cast<const void*>(other + 1);
+    return (cull_rect == other->cull_rect &&
+            DrawAtlasBaseOp::equals(other, pod_this, pod_other))
+               ? DisplayListCompare::kEqual
+               : DisplayListCompare::kNotEqual;
   }
 };
 
 // 4 byte header + ptr aligned payload uses 12 bytes round up to 16
 // (4 bytes unused)
-struct DrawDisplayListOp final : DLOp {
+struct DrawDisplayListOp final : DrawOpBase {
   static const auto kType = DisplayListOpType::kDrawDisplayList;
 
-  explicit DrawDisplayListOp(const sk_sp<DisplayList> display_list)
-      : display_list(std::move(display_list)) {}
+  explicit DrawDisplayListOp(const sk_sp<DisplayList>& display_list,
+                             SkScalar opacity)
+      : opacity(opacity), display_list(display_list) {}
 
-  sk_sp<DisplayList> display_list;
+  SkScalar opacity;
+  const sk_sp<DisplayList> display_list;
 
-  void dispatch(Dispatcher& dispatcher) const {
-    dispatcher.drawDisplayList(display_list);
+  void dispatch(DispatchContext& ctx) const {
+    if (op_needed(ctx)) {
+      ctx.receiver.drawDisplayList(display_list, opacity);
+    }
   }
 
   DisplayListCompare equals(const DrawDisplayListOp* other) const {
-    return display_list->Equals(other->display_list)
+    return (opacity == other->opacity &&
+            display_list->Equals(other->display_list))
                ? DisplayListCompare::kEqual
                : DisplayListCompare::kNotEqual;
   }
@@ -975,41 +1050,76 @@ struct DrawDisplayListOp final : DLOp {
 
 // 4 byte header + 8 payload bytes + an aligned pointer take 24 bytes
 // (4 unused to align the pointer)
-struct DrawTextBlobOp final : DLOp {
+struct DrawTextBlobOp final : DrawOpBase {
   static const auto kType = DisplayListOpType::kDrawTextBlob;
 
-  DrawTextBlobOp(const sk_sp<SkTextBlob> blob, SkScalar x, SkScalar y)
-      : x(x), y(y), blob(std::move(blob)) {}
+  DrawTextBlobOp(const sk_sp<SkTextBlob>& blob, SkScalar x, SkScalar y)
+      : x(x), y(y), blob(blob) {}
 
   const SkScalar x;
   const SkScalar y;
   const sk_sp<SkTextBlob> blob;
 
-  void dispatch(Dispatcher& dispatcher) const {
-    dispatcher.drawTextBlob(blob, x, y);
+  void dispatch(DispatchContext& ctx) const {
+    if (op_needed(ctx)) {
+      ctx.receiver.drawTextBlob(blob, x, y);
+    }
   }
 };
 
-// 4 byte header + 28 byte payload packs evenly into 32 bytes
-#define DEFINE_DRAW_SHADOW_OP(name, transparent_occluder)                 \
-  struct Draw##name##Op final : DLOp {                                    \
-    static const auto kType = DisplayListOpType::kDraw##name;             \
-                                                                          \
-    Draw##name##Op(const SkPath& path,                                    \
-                   DlColor color,                                         \
-                   SkScalar elevation,                                    \
-                   SkScalar dpr)                                          \
-        : color(color), elevation(elevation), dpr(dpr), path(path) {}     \
-                                                                          \
-    const DlColor color;                                                  \
-    const SkScalar elevation;                                             \
-    const SkScalar dpr;                                                   \
-    const SkPath path;                                                    \
-                                                                          \
-    void dispatch(Dispatcher& dispatcher) const {                         \
-      dispatcher.drawShadow(path, color, elevation, transparent_occluder, \
-                            dpr);                                         \
-    }                                                                     \
+struct DrawTextFrameOp final : DrawOpBase {
+  static const auto kType = DisplayListOpType::kDrawTextFrame;
+
+  DrawTextFrameOp(const std::shared_ptr<impeller::TextFrame>& text_frame,
+                  SkScalar x,
+                  SkScalar y)
+      : x(x), y(y), text_frame(text_frame) {}
+
+  const SkScalar x;
+  const SkScalar y;
+  const std::shared_ptr<impeller::TextFrame> text_frame;
+
+  void dispatch(DispatchContext& ctx) const {
+    if (op_needed(ctx)) {
+      ctx.receiver.drawTextFrame(text_frame, x, y);
+    }
+  }
+};
+
+// 4 byte header + 140 byte payload packs evenly into 140 bytes
+#define DEFINE_DRAW_SHADOW_OP(name, transparent_occluder)                    \
+  struct Draw##name##Op final : DrawOpBase {                                 \
+    static const auto kType = DisplayListOpType::kDraw##name;                \
+                                                                             \
+    Draw##name##Op(const SkPath& path,                                       \
+                   DlColor color,                                            \
+                   SkScalar elevation,                                       \
+                   SkScalar dpr)                                             \
+        : color(color), elevation(elevation), dpr(dpr), cached_path(path) {} \
+                                                                             \
+    const DlColor color;                                                     \
+    const SkScalar elevation;                                                \
+    const SkScalar dpr;                                                      \
+    const DlOpReceiver::CacheablePath cached_path;                           \
+                                                                             \
+    void dispatch(DispatchContext& ctx) const {                              \
+      if (op_needed(ctx)) {                                                  \
+        if (ctx.receiver.PrefersImpellerPaths()) {                           \
+          ctx.receiver.drawShadow(cached_path, color, elevation,             \
+                                  transparent_occluder, dpr);                \
+        } else {                                                             \
+          ctx.receiver.drawShadow(cached_path.sk_path, color, elevation,     \
+                                  transparent_occluder, dpr);                \
+        }                                                                    \
+      }                                                                      \
+    }                                                                        \
+                                                                             \
+    DisplayListCompare equals(const Draw##name##Op* other) const {           \
+      return color == other->color && elevation == other->elevation &&       \
+                     dpr == other->dpr && cached_path == other->cached_path  \
+                 ? DisplayListCompare::kEqual                                \
+                 : DisplayListCompare::kNotEqual;                            \
+    }                                                                        \
   };
 DEFINE_DRAW_SHADOW_OP(Shadow, false)
 DEFINE_DRAW_SHADOW_OP(ShadowTransparentOccluder, true)
@@ -1019,4 +1129,4 @@ DEFINE_DRAW_SHADOW_OP(ShadowTransparentOccluder, true)
 
 }  // namespace flutter
 
-#endif  // FLUTTER_DISPLAY_LIST_DISPLAY_LIST_OPS_H_
+#endif  // FLUTTER_DISPLAY_LIST_DL_OP_RECORDS_H_
diff --git a/display_list/dl_paint.cc b/display_list/dl_paint.cc
new file mode 100644
index 0000000000000000000000000000000000000000..81635a2a9f48d94addb288b41f4d3e12060d55d5
--- /dev/null
+++ b/display_list/dl_paint.cc
@@ -0,0 +1,39 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/display_list/dl_paint.h"
+
+namespace flutter {
+
+DlPaint::DlPaint(DlColor color)
+    : blend_mode_(static_cast<unsigned>(DlBlendMode::kDefaultMode)),
+      draw_style_(static_cast<unsigned>(DlDrawStyle::kDefaultStyle)),
+      stroke_cap_(static_cast<unsigned>(DlStrokeCap::kDefaultCap)),
+      stroke_join_(static_cast<unsigned>(DlStrokeJoin::kDefaultJoin)),
+      is_anti_alias_(false),
+      is_invert_colors_(false),
+      color_(color),
+      stroke_width_(kDefaultWidth),
+      stroke_miter_(kDefaultMiter) {}
+
+bool DlPaint::operator==(DlPaint const& other) const {
+  return blend_mode_ == other.blend_mode_ &&              //
+         draw_style_ == other.draw_style_ &&              //
+         stroke_cap_ == other.stroke_cap_ &&              //
+         stroke_join_ == other.stroke_join_ &&            //
+         is_anti_alias_ == other.is_anti_alias_ &&        //
+         is_invert_colors_ == other.is_invert_colors_ &&  //
+         color_ == other.color_ &&                        //
+         stroke_width_ == other.stroke_width_ &&          //
+         stroke_miter_ == other.stroke_miter_ &&          //
+         Equals(color_source_, other.color_source_) &&    //
+         Equals(color_filter_, other.color_filter_) &&    //
+         Equals(image_filter_, other.image_filter_) &&    //
+         Equals(mask_filter_, other.mask_filter_) &&      //
+         Equals(path_effect_, other.path_effect_);
+}
+
+const DlPaint DlPaint::kDefault;
+
+}  // namespace flutter
diff --git a/display_list/display_list_paint.h b/display_list/dl_paint.h
similarity index 48%
rename from display_list/display_list_paint.h
rename to display_list/dl_paint.h
index 9eb0ad0de2b2a2211c6d92b58015593be0200fea..d83bb55c37f6cf418f1d317a3447102f08c6601c 100644
--- a/display_list/display_list_paint.h
+++ b/display_list/dl_paint.h
@@ -2,17 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_PAINT_H_
-#define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_PAINT_H_
+#ifndef FLUTTER_DISPLAY_LIST_DL_PAINT_H_
+#define FLUTTER_DISPLAY_LIST_DL_PAINT_H_
 
 #include <memory>
-#include "flutter/display_list/display_list_blend_mode.h"
-#include "flutter/display_list/display_list_color.h"
-#include "flutter/display_list/display_list_color_filter.h"
-#include "flutter/display_list/display_list_color_source.h"
-#include "flutter/display_list/display_list_image_filter.h"
-#include "flutter/display_list/display_list_mask_filter.h"
-#include "flutter/display_list/display_list_path_effect.h"
+#include <utility>
+#include "flutter/display_list/dl_blend_mode.h"
+#include "flutter/display_list/dl_color.h"
+#include "flutter/display_list/effects/dl_color_filter.h"
+#include "flutter/display_list/effects/dl_color_source.h"
+#include "flutter/display_list/effects/dl_image_filter.h"
+#include "flutter/display_list/effects/dl_mask_filter.h"
+#include "flutter/display_list/effects/dl_path_effect.h"
 
 namespace flutter {
 
@@ -25,14 +26,6 @@ enum class DlDrawStyle {
   kDefaultStyle = kFill,
 };
 
-inline DlDrawStyle ToDl(SkPaint::Style style) {
-  return static_cast<DlDrawStyle>(style);
-}
-
-inline SkPaint::Style ToSk(DlDrawStyle style) {
-  return static_cast<SkPaint::Style>(style);
-}
-
 enum class DlStrokeCap {
   kButt,    //!< no stroke extension
   kRound,   //!< adds circle
@@ -42,14 +35,6 @@ enum class DlStrokeCap {
   kDefaultCap = kButt,
 };
 
-inline DlStrokeCap ToDl(SkPaint::Cap cap) {
-  return static_cast<DlStrokeCap>(cap);
-}
-
-inline SkPaint::Cap ToSk(DlStrokeCap cap) {
-  return static_cast<SkPaint::Cap>(cap);
-}
-
 enum class DlStrokeJoin {
   kMiter,  //!< extends to miter limit
   kRound,  //!< adds circle
@@ -59,37 +44,26 @@ enum class DlStrokeJoin {
   kDefaultJoin = kMiter,
 };
 
-inline DlStrokeJoin ToDl(SkPaint::Join join) {
-  return static_cast<DlStrokeJoin>(join);
-}
-
-inline SkPaint::Join ToSk(DlStrokeJoin join) {
-  return static_cast<SkPaint::Join>(join);
-}
-
 class DlPaint {
  public:
   static constexpr DlColor kDefaultColor = DlColor::kBlack();
   static constexpr float kDefaultWidth = 0.0;
   static constexpr float kDefaultMiter = 4.0;
 
-  DlPaint();
+  static const DlPaint kDefault;
 
-  bool isAntiAlias() const { return isAntiAlias_; }
-  DlPaint& setAntiAlias(bool isAntiAlias) {
-    isAntiAlias_ = isAntiAlias;
-    return *this;
-  }
+  DlPaint() : DlPaint(DlColor::kBlack()) {}
+  explicit DlPaint(DlColor color);
 
-  bool isDither() const { return isDither_; }
-  DlPaint& setDither(bool isDither) {
-    isDither_ = isDither;
+  bool isAntiAlias() const { return is_anti_alias_; }
+  DlPaint& setAntiAlias(bool isAntiAlias) {
+    is_anti_alias_ = isAntiAlias;
     return *this;
   }
 
-  bool isInvertColors() const { return isInvertColors_; }
+  bool isInvertColors() const { return is_invert_colors_; }
   DlPaint& setInvertColors(bool isInvertColors) {
-    isInvertColors_ = isInvertColors;
+    is_invert_colors_ = isInvertColors;
     return *this;
   }
 
@@ -99,120 +73,124 @@ class DlPaint {
     return *this;
   }
 
-  uint8_t getAlpha() const { return color_.argb >> 24; }
-  DlPaint& setAlpha(uint8_t alpha) {
-    color_.argb = alpha << 24 | (color_.argb & 0x00FFFFFF);
-    return *this;
-  }
+  uint8_t getAlpha() const { return color_.argb() >> 24; }
+  DlPaint& setAlpha(uint8_t alpha) { return setColor(color_.withAlpha(alpha)); }
+  SkScalar getOpacity() const { return color_.getAlphaF(); }
   DlPaint& setOpacity(SkScalar opacity) {
     setAlpha(SkScalarRoundToInt(opacity * 0xff));
     return *this;
   }
 
   DlBlendMode getBlendMode() const {
-    return static_cast<DlBlendMode>(blendMode_);
+    return static_cast<DlBlendMode>(blend_mode_);
   }
   DlPaint& setBlendMode(DlBlendMode mode) {
-    blendMode_ = static_cast<unsigned>(mode);
+    blend_mode_ = static_cast<unsigned>(mode);
     return *this;
   }
 
   DlDrawStyle getDrawStyle() const {
-    return static_cast<DlDrawStyle>(drawStyle_);
+    return static_cast<DlDrawStyle>(draw_style_);
   }
   DlPaint& setDrawStyle(DlDrawStyle style) {
-    drawStyle_ = static_cast<unsigned>(style);
+    draw_style_ = static_cast<unsigned>(style);
     return *this;
   }
 
   DlStrokeCap getStrokeCap() const {
-    return static_cast<DlStrokeCap>(strokeCap_);
+    return static_cast<DlStrokeCap>(stroke_cap_);
   }
   DlPaint& setStrokeCap(DlStrokeCap cap) {
-    strokeCap_ = static_cast<unsigned>(cap);
+    stroke_cap_ = static_cast<unsigned>(cap);
     return *this;
   }
 
   DlStrokeJoin getStrokeJoin() const {
-    return static_cast<DlStrokeJoin>(strokeJoin_);
+    return static_cast<DlStrokeJoin>(stroke_join_);
   }
   DlPaint& setStrokeJoin(DlStrokeJoin join) {
-    strokeJoin_ = static_cast<unsigned>(join);
+    stroke_join_ = static_cast<unsigned>(join);
     return *this;
   }
 
-  float getStrokeWidth() const { return strokeWidth_; }
+  float getStrokeWidth() const { return stroke_width_; }
   DlPaint& setStrokeWidth(float width) {
-    strokeWidth_ = width;
+    stroke_width_ = width;
     return *this;
   }
 
-  float getStrokeMiter() const { return strokeMiter_; }
+  float getStrokeMiter() const { return stroke_miter_; }
   DlPaint& setStrokeMiter(float miter) {
-    strokeMiter_ = miter;
+    stroke_miter_ = miter;
     return *this;
   }
 
   std::shared_ptr<const DlColorSource> getColorSource() const {
-    return colorSource_;
+    return color_source_;
   }
-  const DlColorSource* getColorSourcePtr() const { return colorSource_.get(); }
+  const DlColorSource* getColorSourcePtr() const { return color_source_.get(); }
   DlPaint& setColorSource(std::shared_ptr<const DlColorSource> source) {
-    colorSource_ = source;
+    color_source_ = std::move(source);
     return *this;
   }
   DlPaint& setColorSource(const DlColorSource* source) {
-    colorSource_ = source ? source->shared() : nullptr;
+    color_source_ = source ? source->shared() : nullptr;
     return *this;
   }
 
   std::shared_ptr<const DlColorFilter> getColorFilter() const {
-    return colorFilter_;
+    return color_filter_;
   }
-  const DlColorFilter* getColorFilterPtr() const { return colorFilter_.get(); }
-  DlPaint& setColorFilter(const std::shared_ptr<const DlColorFilter> filter) {
-    colorFilter_ = filter ? filter->shared() : nullptr;
+  const DlColorFilter* getColorFilterPtr() const { return color_filter_.get(); }
+  DlPaint& setColorFilter(const std::shared_ptr<const DlColorFilter>& filter) {
+    color_filter_ = filter;
     return *this;
   }
   DlPaint& setColorFilter(const DlColorFilter* filter) {
-    colorFilter_ = filter ? filter->shared() : nullptr;
+    color_filter_ = filter ? filter->shared() : nullptr;
     return *this;
   }
 
   std::shared_ptr<const DlImageFilter> getImageFilter() const {
-    return imageFilter_;
+    return image_filter_;
   }
-  const DlImageFilter* getImageFilterPtr() const { return imageFilter_.get(); }
-  DlPaint& setImageFilter(const std::shared_ptr<const DlImageFilter> filter) {
-    imageFilter_ = filter;
+  const DlImageFilter* getImageFilterPtr() const { return image_filter_.get(); }
+  DlPaint& setImageFilter(const std::shared_ptr<const DlImageFilter>& filter) {
+    image_filter_ = filter;
     return *this;
   }
   DlPaint& setImageFilter(const DlImageFilter* filter) {
-    imageFilter_ = filter ? filter->shared() : nullptr;
+    image_filter_ = filter ? filter->shared() : nullptr;
     return *this;
   }
 
   std::shared_ptr<const DlMaskFilter> getMaskFilter() const {
-    return maskFilter_;
+    return mask_filter_;
   }
-  const DlMaskFilter* getMaskFilterPtr() const { return maskFilter_.get(); }
-  DlPaint& setMaskFilter(std::shared_ptr<DlMaskFilter> filter) {
-    maskFilter_ = filter;
+  const DlMaskFilter* getMaskFilterPtr() const { return mask_filter_.get(); }
+  DlPaint& setMaskFilter(const std::shared_ptr<DlMaskFilter>& filter) {
+    mask_filter_ = filter;
     return *this;
   }
   DlPaint& setMaskFilter(const DlMaskFilter* filter) {
-    maskFilter_ = filter ? filter->shared() : nullptr;
+    mask_filter_ = filter ? filter->shared() : nullptr;
     return *this;
   }
 
   std::shared_ptr<const DlPathEffect> getPathEffect() const {
-    return pathEffect_;
+    return path_effect_;
   }
-  const DlPathEffect* getPathEffectPtr() const { return pathEffect_.get(); }
-  DlPaint& setPathEffect(std::shared_ptr<DlPathEffect> pathEffect) {
-    pathEffect_ = pathEffect;
+  const DlPathEffect* getPathEffectPtr() const { return path_effect_.get(); }
+  DlPaint& setPathEffect(const std::shared_ptr<DlPathEffect>& pathEffect) {
+    path_effect_ = pathEffect;
     return *this;
   }
+  DlPaint& setPathEffect(const DlPathEffect* effect) {
+    path_effect_ = effect ? effect->shared() : nullptr;
+    return *this;
+  }
+
+  bool isDefault() const { return *this == kDefault; }
 
   bool operator==(DlPaint const& other) const;
   bool operator!=(DlPaint const& other) const { return !(*this == other); }
@@ -233,29 +211,26 @@ class DlPaint {
 
   union {
     struct {
-      unsigned blendMode_ : kBlendModeBits;
-      unsigned drawStyle_ : kDrawStyleBits;
-      unsigned strokeCap_ : kStrokeCapBits;
-      unsigned strokeJoin_ : kStrokeJoinBits;
-      unsigned isAntiAlias_ : 1;
-      unsigned isDither_ : 1;
-      unsigned isInvertColors_ : 1;
+      unsigned blend_mode_ : kBlendModeBits;
+      unsigned draw_style_ : kDrawStyleBits;
+      unsigned stroke_cap_ : kStrokeCapBits;
+      unsigned stroke_join_ : kStrokeJoinBits;
+      unsigned is_anti_alias_ : 1;
+      unsigned is_invert_colors_ : 1;
     };
   };
 
   DlColor color_;
-  float strokeWidth_;
-  float strokeMiter_;
-
-  std::shared_ptr<const DlColorSource> colorSource_;
-  std::shared_ptr<const DlColorFilter> colorFilter_;
-  std::shared_ptr<const DlImageFilter> imageFilter_;
-  std::shared_ptr<const DlMaskFilter> maskFilter_;
-  std::shared_ptr<const DlPathEffect> pathEffect_;
-  // missing (as compared to SkPaint):
-  // DlBlender - not planning on using that object in a pure DisplayList world
+  float stroke_width_;
+  float stroke_miter_;
+
+  std::shared_ptr<const DlColorSource> color_source_;
+  std::shared_ptr<const DlColorFilter> color_filter_;
+  std::shared_ptr<const DlImageFilter> image_filter_;
+  std::shared_ptr<const DlMaskFilter> mask_filter_;
+  std::shared_ptr<const DlPathEffect> path_effect_;
 };
 
 }  // namespace flutter
 
-#endif  // FLUTTER_DISPLAY_LIST_DISPLAY_LIST_PAINT_H_
+#endif  // FLUTTER_DISPLAY_LIST_DL_PAINT_H_
diff --git a/display_list/display_list_paint_unittests.cc b/display_list/dl_paint_unittests.cc
similarity index 82%
rename from display_list/display_list_paint_unittests.cc
rename to display_list/dl_paint_unittests.cc
index b040647035e27e3ba55ce9cc3e504a76fdd29b02..e6a2b02e0308e4de76e5b5e86924be3051ee2191 100644
--- a/display_list/display_list_paint_unittests.cc
+++ b/display_list/dl_paint_unittests.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/display_list/display_list_paint.h"
+#include "flutter/display_list/dl_paint.h"
 
-#include "flutter/display_list/display_list_comparable.h"
+#include "flutter/display_list/utils/dl_comparable.h"
 #include "gtest/gtest.h"
 
 namespace flutter {
@@ -13,7 +13,6 @@ namespace testing {
 TEST(DisplayListPaint, ConstructorDefaults) {
   DlPaint paint;
   EXPECT_FALSE(paint.isAntiAlias());
-  EXPECT_FALSE(paint.isDither());
   EXPECT_FALSE(paint.isInvertColors());
   EXPECT_EQ(paint.getColor(), DlPaint::kDefaultColor);
   EXPECT_EQ(paint.getAlpha(), 0xFF);
@@ -27,6 +26,9 @@ TEST(DisplayListPaint, ConstructorDefaults) {
   EXPECT_EQ(paint.getColorFilter(), nullptr);
   EXPECT_EQ(paint.getImageFilter(), nullptr);
   EXPECT_EQ(paint.getMaskFilter(), nullptr);
+  EXPECT_EQ(paint.getPathEffect(), nullptr);
+  EXPECT_TRUE(paint.isDefault());
+  EXPECT_EQ(paint, DlPaint::kDefault);
 
   EXPECT_EQ(DlBlendMode::kDefaultMode, DlBlendMode::kSrcOver);
   EXPECT_EQ(DlDrawStyle::kDefaultStyle, DlDrawStyle::kFill);
@@ -38,11 +40,14 @@ TEST(DisplayListPaint, ConstructorDefaults) {
   EXPECT_EQ(DlPaint::kDefaultMiter, 4.0);
 
   EXPECT_EQ(paint, DlPaint());
+  EXPECT_EQ(paint, DlPaint(DlColor::kBlack()));
+  EXPECT_EQ(paint, DlPaint(DlColor(0xFF000000)));
 
   EXPECT_NE(paint, DlPaint().setAntiAlias(true));
-  EXPECT_NE(paint, DlPaint().setDither(true));
   EXPECT_NE(paint, DlPaint().setInvertColors(true));
   EXPECT_NE(paint, DlPaint().setColor(DlColor::kGreen()));
+  EXPECT_NE(paint, DlPaint(DlColor::kGreen()));
+  EXPECT_NE(paint, DlPaint(DlColor(0xFF00FF00)));
   EXPECT_NE(paint, DlPaint().setAlpha(0x7f));
   EXPECT_NE(paint, DlPaint().setBlendMode(DlBlendMode::kDstIn));
   EXPECT_NE(paint, DlPaint().setDrawStyle(DlDrawStyle::kStrokeAndFill));
@@ -60,8 +65,12 @@ TEST(DisplayListPaint, ConstructorDefaults) {
   DlBlurImageFilter image_filter(1.3, 4.7, DlTileMode::kClamp);
   EXPECT_NE(paint, DlPaint().setImageFilter(image_filter.shared()));
 
-  DlBlurMaskFilter mask_filter(SkBlurStyle::kInner_SkBlurStyle, 3.14);
+  DlBlurMaskFilter mask_filter(DlBlurStyle::kInner, 3.14);
   EXPECT_NE(paint, DlPaint().setMaskFilter(mask_filter.shared()));
+
+  SkScalar intervals[] = {1.0f, 2.0f};
+  auto path_effect = DlDashPathEffect::Make(intervals, 2, 0.0f);
+  EXPECT_NE(paint, DlPaint().setPathEffect(path_effect.get()));
 }
 
 TEST(DisplayListPaint, NullPointerSetGet) {
@@ -69,11 +78,13 @@ TEST(DisplayListPaint, NullPointerSetGet) {
   DlColorFilter* null_color_filter = nullptr;
   DlImageFilter* null_image_filter = nullptr;
   DlMaskFilter* null_mask_filter = nullptr;
+  DlPathEffect* null_path_effect = nullptr;
   DlPaint paint;
   EXPECT_EQ(paint.setColorSource(null_color_source).getColorSource(), nullptr);
   EXPECT_EQ(paint.setColorFilter(null_color_filter).getColorFilter(), nullptr);
   EXPECT_EQ(paint.setImageFilter(null_image_filter).getImageFilter(), nullptr);
   EXPECT_EQ(paint.setMaskFilter(null_mask_filter).getMaskFilter(), nullptr);
+  EXPECT_EQ(paint.setPathEffect(null_path_effect).getPathEffect(), nullptr);
 }
 
 TEST(DisplayListPaint, NullSharedPointerSetGet) {
@@ -81,18 +92,22 @@ TEST(DisplayListPaint, NullSharedPointerSetGet) {
   std::shared_ptr<DlColorFilter> null_color_filter;
   std::shared_ptr<DlImageFilter> null_image_filter;
   std::shared_ptr<DlMaskFilter> null_mask_filter;
+  std::shared_ptr<DlPathEffect> null_path_effect;
   DlPaint paint;
   EXPECT_EQ(paint.setColorSource(null_color_source).getColorSource(), nullptr);
   EXPECT_EQ(paint.setColorFilter(null_color_filter).getColorFilter(), nullptr);
   EXPECT_EQ(paint.setImageFilter(null_image_filter).getImageFilter(), nullptr);
   EXPECT_EQ(paint.setMaskFilter(null_mask_filter).getMaskFilter(), nullptr);
+  EXPECT_EQ(paint.setPathEffect(null_path_effect).getPathEffect(), nullptr);
 }
 
 TEST(DisplayListPaint, ChainingConstructor) {
+  SkScalar intervals[] = {1.0f, 2.0f};
+  auto path_effect = DlDashPathEffect::Make(intervals, 2, 0.0f);
+
   DlPaint paint =
       DlPaint()                                                              //
           .setAntiAlias(true)                                                //
-          .setDither(true)                                                   //
           .setInvertColors(true)                                             //
           .setColor(DlColor::kGreen())                                       //
           .setAlpha(0x7F)                                                    //
@@ -108,10 +123,9 @@ TEST(DisplayListPaint, ChainingConstructor) {
                   .shared())
           .setImageFilter(
               DlBlurImageFilter(1.3, 4.7, DlTileMode::kClamp).shared())
-          .setMaskFilter(
-              DlBlurMaskFilter(SkBlurStyle::kInner_SkBlurStyle, 3.14).shared());
+          .setMaskFilter(DlBlurMaskFilter(DlBlurStyle::kInner, 3.14).shared())
+          .setPathEffect(path_effect);
   EXPECT_TRUE(paint.isAntiAlias());
-  EXPECT_TRUE(paint.isDither());
   EXPECT_TRUE(paint.isInvertColors());
   EXPECT_EQ(paint.getColor(), DlColor::kGreen().withAlpha(0x7F));
   EXPECT_EQ(paint.getAlpha(), 0x7F);
@@ -127,7 +141,8 @@ TEST(DisplayListPaint, ChainingConstructor) {
   EXPECT_EQ(*paint.getImageFilter(),
             DlBlurImageFilter(1.3, 4.7, DlTileMode::kClamp));
   EXPECT_EQ(*paint.getMaskFilter(),
-            DlBlurMaskFilter(SkBlurStyle::kInner_SkBlurStyle, 3.14));
+            DlBlurMaskFilter(DlBlurStyle::kInner, 3.14));
+  EXPECT_EQ(*paint.getPathEffect(), *path_effect);
 
   EXPECT_NE(paint, DlPaint());
 }
diff --git a/display_list/display_list_mask_filter.cc b/display_list/dl_sampling_options.h
similarity index 32%
rename from display_list/display_list_mask_filter.cc
rename to display_list/dl_sampling_options.h
index fe762066e2fbe432fd0ac4af1b012e245448114f..3563cf000ae3b6cd885bc0dd080fc860af55872b 100644
--- a/display_list/display_list_mask_filter.cc
+++ b/display_list/dl_sampling_options.h
@@ -2,17 +2,25 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/display_list/display_list_mask_filter.h"
+#ifndef FLUTTER_DISPLAY_LIST_DL_SAMPLING_OPTIONS_H_
+#define FLUTTER_DISPLAY_LIST_DL_SAMPLING_OPTIONS_H_
 
 namespace flutter {
 
-std::shared_ptr<DlMaskFilter> DlMaskFilter::From(SkMaskFilter* sk_filter) {
-  if (sk_filter == nullptr) {
-    return nullptr;
-  }
-  // There are no inspection methods for SkMaskFilter so we cannot break
-  // the Skia filter down into a specific subclass (i.e. Blur).
-  return std::make_shared<DlUnknownMaskFilter>(sk_ref_sp(sk_filter));
-}
+enum class DlFilterMode {
+  kNearest,  // single sample point (nearest neighbor)
+  kLinear,   // interporate between 2x2 sample points (bilinear interpolation)
+
+  kLast = kLinear,
+};
+
+enum class DlImageSampling {
+  kNearestNeighbor,
+  kLinear,
+  kMipmapLinear,
+  kCubic,
+};
 
 }  // namespace flutter
+
+#endif  // FLUTTER_DISPLAY_LIST_DL_SAMPLING_OPTIONS_H_
diff --git a/display_list/display_list_tile_mode.h b/display_list/dl_tile_mode.h
similarity index 70%
rename from display_list/display_list_tile_mode.h
rename to display_list/dl_tile_mode.h
index 0be9b54ae307dd297038efcc5b9c60ee389ee719..60132e8b317ae9ddb1a530f188bc2ac1a68f2f0d 100644
--- a/display_list/display_list_tile_mode.h
+++ b/display_list/dl_tile_mode.h
@@ -2,10 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_TILE_MODE_H_
-#define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_TILE_MODE_H_
-
-#include "third_party/skia/include/core/SkTileMode.h"
+#ifndef FLUTTER_DISPLAY_LIST_DL_TILE_MODE_H_
+#define FLUTTER_DISPLAY_LIST_DL_TILE_MODE_H_
 
 namespace flutter {
 
@@ -30,14 +28,6 @@ enum class DlTileMode {
   kDecal,
 };
 
-inline DlTileMode ToDl(SkTileMode sk_mode) {
-  return static_cast<DlTileMode>(sk_mode);
-}
-
-inline SkTileMode ToSk(DlTileMode dl_mode) {
-  return static_cast<SkTileMode>(dl_mode);
-}
-
 }  // namespace flutter
 
-#endif  // FLUTTER_DISPLAY_LIST_DISPLAY_LIST_TILE_MODE_H_
+#endif  // FLUTTER_DISPLAY_LIST_DL_TILE_MODE_H_
diff --git a/display_list/display_list_vertices.cc b/display_list/dl_vertices.cc
similarity index 95%
rename from display_list/display_list_vertices.cc
rename to display_list/dl_vertices.cc
index 6c20c3aebef97e7072358e7a932ecb38fad22451..cbbe6e1ea4ab8b5c09662c38dfa05fd9a6fb821b 100644
--- a/display_list/display_list_vertices.cc
+++ b/display_list/dl_vertices.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/display_list/display_list_vertices.h"
+#include "flutter/display_list/dl_vertices.h"
 
-#include "flutter/display_list/display_list_utils.h"
+#include "flutter/display_list/utils/dl_bounds_accumulator.h"
 #include "flutter/fml/logging.h"
 
 namespace flutter {
@@ -176,13 +176,6 @@ DlVertices::DlVertices(DlVertexMode mode,
   FML_DCHECK((index_count_ != 0) == (indices() != nullptr));
 }
 
-sk_sp<SkVertices> DlVertices::skia_object() const {
-  const SkColor* sk_colors = reinterpret_cast<const SkColor*>(colors());
-  return SkVertices::MakeCopy(ToSk(mode_), vertex_count_, vertices(),
-                              texture_coordinates(), sk_colors, index_count_,
-                              indices());
-}
-
 bool DlVertices::operator==(DlVertices const& other) const {
   auto lists_equal = [](auto* a, auto* b, int count) {
     if (a == nullptr || b == nullptr) {
@@ -210,8 +203,7 @@ DlVertices::Builder::Builder(DlVertexMode mode,
                              int vertex_count,
                              Flags flags,
                              int index_count)
-    : needs_vertices_(true),
-      needs_texture_coords_(flags.has_texture_coordinates),
+    : needs_texture_coords_(flags.has_texture_coordinates),
       needs_colors_(flags.has_colors),
       needs_indices_(index_count > 0) {
   vertex_count = std::max(vertex_count, 0);
diff --git a/display_list/display_list_vertices.h b/display_list/dl_vertices.h
similarity index 94%
rename from display_list/display_list_vertices.h
rename to display_list/dl_vertices.h
index 885ef6cfa65e8d1f871025b7ebdbee0316226a15..6f7e6443ad6b8d0a2b563237aab9b163b7a08fe4 100644
--- a/display_list/display_list_vertices.h
+++ b/display_list/dl_vertices.h
@@ -2,11 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_VERTICES_H_
-#define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_VERTICES_H_
+#ifndef FLUTTER_DISPLAY_LIST_DL_VERTICES_H_
+#define FLUTTER_DISPLAY_LIST_DL_VERTICES_H_
 
-#include "flutter/display_list/display_list_color.h"
-#include "flutter/display_list/types.h"
+#include <memory>
+
+#include "flutter/display_list/dl_color.h"
+
+#include "third_party/skia/include/core/SkRect.h"
 
 namespace flutter {
 
@@ -30,14 +33,6 @@ enum class DlVertexMode {
   kTriangleFan,
 };
 
-inline SkVertices::VertexMode ToSk(DlVertexMode dl_mode) {
-  return static_cast<SkVertices::VertexMode>(dl_mode);
-}
-
-inline DlVertexMode ToDl(SkVertices::VertexMode sk_mode) {
-  return static_cast<DlVertexMode>(sk_mode);
-}
-
 //------------------------------------------------------------------------------
 /// @brief      Holds all of the data (both required and optional) for a
 ///             DisplayList drawVertices call.
@@ -170,7 +165,7 @@ class DlVertices {
 
    private:
     std::shared_ptr<DlVertices> vertices_;
-    bool needs_vertices_;
+    bool needs_vertices_ = true;
     bool needs_texture_coords_;
     bool needs_colors_;
     bool needs_indices_;
@@ -233,9 +228,6 @@ class DlVertices {
     return static_cast<const uint16_t*>(pod(indices_offset_));
   }
 
-  // Returns an equivalent sk_sp<SkVertices> analog to this object.
-  sk_sp<SkVertices> skia_object() const;
-
   bool operator==(DlVertices const& other) const;
 
   bool operator!=(DlVertices const& other) const { return !(*this == other); }
@@ -292,4 +284,4 @@ class DlVertices {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_DISPLAY_LIST_DISPLAY_LIST_VERTICES_H_
+#endif  // FLUTTER_DISPLAY_LIST_DL_VERTICES_H_
diff --git a/display_list/display_list_vertices_unittests.cc b/display_list/dl_vertices_unittests.cc
similarity index 98%
rename from display_list/display_list_vertices_unittests.cc
rename to display_list/dl_vertices_unittests.cc
index 04d9549b0aaae680bf1a630421832fc012950cb8..f30f473b1c31fcf907ed4aed3f0485f881476394 100644
--- a/display_list/display_list_vertices_unittests.cc
+++ b/display_list/dl_vertices_unittests.cc
@@ -2,11 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/display_list/display_list_attributes_testing.h"
-#include "flutter/display_list/display_list_builder.h"
-#include "flutter/display_list/display_list_comparable.h"
-#include "flutter/display_list/display_list_vertices.h"
-#include "flutter/display_list/types.h"
+#include "flutter/display_list/dl_builder.h"
+#include "flutter/display_list/dl_vertices.h"
+#include "flutter/display_list/testing/dl_test_equality.h"
+#include "flutter/display_list/utils/dl_comparable.h"
 #include "gtest/gtest.h"
 
 namespace flutter {
@@ -22,7 +21,6 @@ TEST(DisplayListVertices, MakeWithZeroAndNegativeVerticesAndIndices) {
   EXPECT_EQ(vertices1->colors(), nullptr);
   EXPECT_EQ(vertices1->index_count(), 0);
   EXPECT_EQ(vertices1->indices(), nullptr);
-  EXPECT_NE(vertices1->skia_object(), nullptr);
 
   std::shared_ptr<const DlVertices> vertices2 = DlVertices::Make(
       DlVertexMode::kTriangles, -1, nullptr, nullptr, nullptr, -1, nullptr);
@@ -33,7 +31,6 @@ TEST(DisplayListVertices, MakeWithZeroAndNegativeVerticesAndIndices) {
   EXPECT_EQ(vertices2->colors(), nullptr);
   EXPECT_EQ(vertices2->index_count(), 0);
   EXPECT_EQ(vertices2->indices(), nullptr);
-  EXPECT_NE(vertices2->skia_object(), nullptr);
 
   TestEquals(*vertices1, *vertices2);
 }
@@ -425,7 +422,6 @@ TEST(DisplayListVertices, BuildWithZeroAndNegativeVerticesAndIndices) {
   EXPECT_EQ(vertices1->colors(), nullptr);
   EXPECT_EQ(vertices1->index_count(), 0);
   EXPECT_EQ(vertices1->indices(), nullptr);
-  EXPECT_NE(vertices1->skia_object(), nullptr);
 
   Builder builder2(DlVertexMode::kTriangles, -1, Builder::kNone, -1);
   EXPECT_TRUE(builder2.is_valid());
@@ -437,7 +433,6 @@ TEST(DisplayListVertices, BuildWithZeroAndNegativeVerticesAndIndices) {
   EXPECT_EQ(vertices2->colors(), nullptr);
   EXPECT_EQ(vertices2->index_count(), 0);
   EXPECT_EQ(vertices2->indices(), nullptr);
-  EXPECT_NE(vertices2->skia_object(), nullptr);
 
   TestEquals(*vertices1, *vertices2);
 }
diff --git a/display_list/effects/dl_color_filter.cc b/display_list/effects/dl_color_filter.cc
new file mode 100644
index 0000000000000000000000000000000000000000..686484421561caab7d7c87a2d499368918d2377f
--- /dev/null
+++ b/display_list/effects/dl_color_filter.cc
@@ -0,0 +1,200 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/display_list/effects/dl_color_filter.h"
+
+#include "flutter/display_list/dl_color.h"
+
+namespace flutter {
+
+std::shared_ptr<DlColorFilter> DlBlendColorFilter::Make(DlColor color,
+                                                        DlBlendMode mode) {
+  switch (mode) {
+    case DlBlendMode::kDst: {
+      return nullptr;
+    }
+    case DlBlendMode::kSrcOver: {
+      if (color.isTransparent()) {
+        return nullptr;
+      }
+      if (color.isOpaque()) {
+        mode = DlBlendMode::kSrc;
+      }
+      break;
+    }
+    case DlBlendMode::kDstOver:
+    case DlBlendMode::kDstOut:
+    case DlBlendMode::kSrcATop:
+    case DlBlendMode::kXor:
+    case DlBlendMode::kDarken: {
+      if (color.isTransparent()) {
+        return nullptr;
+      }
+      break;
+    }
+    case DlBlendMode::kDstIn: {
+      if (color.isOpaque()) {
+        return nullptr;
+      }
+      break;
+    }
+    default:
+      break;
+  }
+  return std::make_shared<DlBlendColorFilter>(color, mode);
+}
+
+bool DlBlendColorFilter::modifies_transparent_black() const {
+  switch (mode_) {
+    // These modes all act like kSrc when the dest is all 0s.
+    // So they modify transparent black when the src color is
+    // not transparent.
+    case DlBlendMode::kSrc:
+    case DlBlendMode::kSrcOver:
+    case DlBlendMode::kDstOver:
+    case DlBlendMode::kSrcOut:
+    case DlBlendMode::kDstATop:
+    case DlBlendMode::kXor:
+    case DlBlendMode::kPlus:
+    case DlBlendMode::kScreen:
+    case DlBlendMode::kOverlay:
+    case DlBlendMode::kDarken:
+    case DlBlendMode::kLighten:
+    case DlBlendMode::kColorDodge:
+    case DlBlendMode::kColorBurn:
+    case DlBlendMode::kHardLight:
+    case DlBlendMode::kSoftLight:
+    case DlBlendMode::kDifference:
+    case DlBlendMode::kExclusion:
+    case DlBlendMode::kMultiply:
+    case DlBlendMode::kHue:
+    case DlBlendMode::kSaturation:
+    case DlBlendMode::kColor:
+    case DlBlendMode::kLuminosity:
+      return !color_.isTransparent();
+
+    // These modes are all like kDst when the dest is all 0s.
+    // So they never modify transparent black.
+    case DlBlendMode::kClear:
+    case DlBlendMode::kDst:
+    case DlBlendMode::kSrcIn:
+    case DlBlendMode::kDstIn:
+    case DlBlendMode::kDstOut:
+    case DlBlendMode::kSrcATop:
+    case DlBlendMode::kModulate:
+      return false;
+  }
+}
+
+bool DlBlendColorFilter::can_commute_with_opacity() const {
+  switch (mode_) {
+    case DlBlendMode::kClear:
+    case DlBlendMode::kDst:
+    case DlBlendMode::kSrcIn:
+    case DlBlendMode::kDstIn:
+    case DlBlendMode::kDstOut:
+    case DlBlendMode::kSrcATop:
+    case DlBlendMode::kModulate:
+      return true;
+
+    case DlBlendMode::kSrc:
+    case DlBlendMode::kSrcOver:
+    case DlBlendMode::kDstOver:
+    case DlBlendMode::kSrcOut:
+    case DlBlendMode::kDstATop:
+    case DlBlendMode::kXor:
+    case DlBlendMode::kPlus:
+    case DlBlendMode::kScreen:
+    case DlBlendMode::kOverlay:
+    case DlBlendMode::kDarken:
+    case DlBlendMode::kLighten:
+    case DlBlendMode::kColorDodge:
+    case DlBlendMode::kColorBurn:
+    case DlBlendMode::kHardLight:
+    case DlBlendMode::kSoftLight:
+    case DlBlendMode::kDifference:
+    case DlBlendMode::kExclusion:
+    case DlBlendMode::kMultiply:
+    case DlBlendMode::kHue:
+    case DlBlendMode::kSaturation:
+    case DlBlendMode::kColor:
+    case DlBlendMode::kLuminosity:
+      return color_.isTransparent();
+  }
+}
+
+std::shared_ptr<DlColorFilter> DlMatrixColorFilter::Make(
+    const float matrix[20]) {
+  float product = 0;
+  for (int i = 0; i < 20; i++) {
+    product *= matrix[i];
+  }
+  // If any of the elements of the matrix are infinity or NaN, then
+  // |product| will be NaN, otherwise 0.
+  if (product == 0) {
+    return std::make_shared<DlMatrixColorFilter>(matrix);
+  }
+  return nullptr;
+}
+
+bool DlMatrixColorFilter::modifies_transparent_black() const {
+  // Values are considered in non-premultiplied form when the matrix is
+  // applied, but we only care about this answer for whether it leaves
+  // an incoming color with a transparent alpha as transparent on output.
+  // Thus, we only need to consider the alpha part of the matrix equation,
+  // which is the last row. Since the incoming alpha value is 0, the last
+  // equation ends up becoming A' = matrix_[19]. Negative results will be
+  // clamped to the range [0,1] so we only care about positive values.
+  // Non-finite values are clamped to a zero alpha.
+  return (SkScalarIsFinite(matrix_[19]) && matrix_[19] > 0);
+}
+
+bool DlMatrixColorFilter::can_commute_with_opacity() const {
+  // We need to check if:
+  //   filter(color) * opacity == filter(color * opacity).
+  //
+  // filter(RGBA) = R' = [ R*m[ 0] + G*m[ 1] + B*m[ 2] + A*m[ 3] + m[ 4] ]
+  //                G' = [ R*m[ 5] + G*m[ 6] + B*m[ 7] + A*m[ 8] + m[ 9] ]
+  //                B' = [ R*m[10] + G*m[11] + B*m[12] + A*m[13] + m[14] ]
+  //                A' = [ R*m[15] + G*m[16] + B*m[17] + A*m[18] + m[19] ]
+  //
+  // Applying the opacity only affects the alpha value since the operations
+  // are performed on non-premultiplied colors. (If the data is stored in
+  // premultiplied form, though, there may be rounding errors due to
+  // premul->unpremul->premul conversions.)
+
+  // We test for the successful cases and return false if they fail so that
+  // we fail and return false if any matrix values are NaN.
+
+  // If any of the alpha column are non-zero then the prior alpha affects
+  // the result color, so applying opacity before the filter will change
+  // the incoming alpha and therefore the colors that are produced.
+  if (!(matrix_[3] == 0 &&    // A does not affect R'
+        matrix_[8] == 0 &&    // A does not affect G'
+        matrix_[13] == 0)) {  // A does not affect B'
+    return false;
+  }
+
+  // Similarly, if any of the alpha row are non-zero then the prior colors
+  // affect the result alpha in a way that prevents opacity from commuting
+  // through the filter operation.
+  if (!(matrix_[15] == 0 &&   // R does not affect A'
+        matrix_[16] == 0 &&   // G does not affect A'
+        matrix_[17] == 0 &&   // B does not affect A'
+        matrix_[19] == 0)) {  // A' is not offset by an absolute value
+    return false;
+  }
+
+  return true;
+}
+
+const std::shared_ptr<DlSrgbToLinearGammaColorFilter>
+    DlSrgbToLinearGammaColorFilter::kInstance =
+        std::make_shared<DlSrgbToLinearGammaColorFilter>();
+
+const std::shared_ptr<DlLinearToSrgbGammaColorFilter>
+    DlLinearToSrgbGammaColorFilter::kInstance =
+        std::make_shared<DlLinearToSrgbGammaColorFilter>();
+
+}  // namespace flutter
diff --git a/display_list/display_list_color_filter.h b/display_list/effects/dl_color_filter.h
similarity index 56%
rename from display_list/display_list_color_filter.h
rename to display_list/effects/dl_color_filter.h
index ee536b30eb21512de51fa860f48012bccc201763..42a4845e0a90c65bae406995cfa2af00096cba00 100644
--- a/display_list/display_list_color_filter.h
+++ b/display_list/effects/dl_color_filter.h
@@ -2,13 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_COLOR_FILTER_H_
-#define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_COLOR_FILTER_H_
+#ifndef FLUTTER_DISPLAY_LIST_EFFECTS_DL_COLOR_FILTER_H_
+#define FLUTTER_DISPLAY_LIST_EFFECTS_DL_COLOR_FILTER_H_
 
-#include "flutter/display_list/display_list_attributes.h"
-#include "flutter/display_list/display_list_blend_mode.h"
-#include "flutter/display_list/display_list_color.h"
-#include "flutter/display_list/types.h"
+#include "flutter/display_list/dl_attributes.h"
+#include "flutter/display_list/dl_blend_mode.h"
+#include "flutter/display_list/dl_color.h"
 #include "flutter/fml/logging.h"
 
 namespace flutter {
@@ -20,37 +19,16 @@ class DlMatrixColorFilter;
 // facilities and adheres to the design goals of the |DlAttribute| base
 // class.
 
-// An enumerated type for the recognized ColorFilter operations.
-// If a custom ColorFilter outside of the recognized types is needed
-// then a |kUnknown| type that simply defers to an SkColorFilter is
-// provided as a fallback.
+// An enumerated type for the supported ColorFilter operations.
 enum class DlColorFilterType {
   kBlend,
   kMatrix,
   kSrgbToLinearGamma,
   kLinearToSrgbGamma,
-  kUnknown
 };
 
-class DlColorFilter
-    : public DlAttribute<DlColorFilter, SkColorFilter, DlColorFilterType> {
+class DlColorFilter : public DlAttribute<DlColorFilter, DlColorFilterType> {
  public:
-  // Return a shared_ptr holding a DlColorFilter representing the indicated
-  // Skia SkColorFilter pointer.
-  //
-  // This method can detect each of the 4 recognized types from an analogous
-  // SkColorFilter.
-  static std::shared_ptr<DlColorFilter> From(SkColorFilter* sk_filter);
-
-  // Return a shared_ptr holding a DlColorFilter representing the indicated
-  // Skia SkColorFilter pointer.
-  //
-  // This method can detect each of the 4 recognized types from an analogous
-  // SkColorFilter.
-  static std::shared_ptr<DlColorFilter> From(sk_sp<SkColorFilter> sk_filter) {
-    return From(sk_filter.get());
-  }
-
   // Return a boolean indicating whether the color filtering operation will
   // modify transparent black. This is typically used to determine if applying
   // the ColorFilter to a temporary saveLayer buffer will turn the surrounding
@@ -70,9 +48,8 @@ class DlColorFilter
   // type of ColorFilter, otherwise return nullptr.
   virtual const DlMatrixColorFilter* asMatrix() const { return nullptr; }
 
-  // asSrgb<->Linear and asUnknown are not needed because they
-  // have no properties to query. Their type fully specifies their
-  // operation or can be accessed via the common skia_object() method.
+  // asSrgb<->Linear is not needed because it has no properties to query.
+  // Its type fully specifies its operation.
 };
 
 // The Blend type of ColorFilter which specifies modifying the
@@ -86,26 +63,21 @@ class DlBlendColorFilter final : public DlColorFilter {
       : color_(color), mode_(mode) {}
   DlBlendColorFilter(const DlBlendColorFilter& filter)
       : DlBlendColorFilter(filter.color_, filter.mode_) {}
-  DlBlendColorFilter(const DlBlendColorFilter* filter)
+  explicit DlBlendColorFilter(const DlBlendColorFilter* filter)
       : DlBlendColorFilter(filter->color_, filter->mode_) {}
 
+  static std::shared_ptr<DlColorFilter> Make(DlColor color, DlBlendMode mode);
+
   DlColorFilterType type() const override { return DlColorFilterType::kBlend; }
   size_t size() const override { return sizeof(*this); }
-  bool modifies_transparent_black() const override {
-    // Look at blend and color to make a faster determination?
-    sk_sp<SkColorFilter> sk_filter = skia_object();
-    return sk_filter &&
-           sk_filter->filterColor(SK_ColorTRANSPARENT) != SK_ColorTRANSPARENT;
-  }
+
+  bool modifies_transparent_black() const override;
+  bool can_commute_with_opacity() const override;
 
   std::shared_ptr<DlColorFilter> shared() const override {
     return std::make_shared<DlBlendColorFilter>(this);
   }
 
-  sk_sp<SkColorFilter> skia_object() const override {
-    return SkColorFilters::Blend(color_, ToSk(mode_));
-  }
-
   const DlBlendColorFilter* asBlend() const override { return this; }
 
   DlColor color() const { return color_; }
@@ -135,40 +107,32 @@ class DlBlendColorFilter final : public DlColorFilter {
 //
 // The resulting color [oR,oG,oB,oA] is then clamped to the range of
 // valid pixel components before storing in the output.
+//
+// The incoming and outgoing [iR,iG,iB,iA] and [oR,oG,oB,oA] are
+// considered to be non-premultiplied. When working on premultiplied
+// pixel data, the necessary pre<->non-pre conversions must be performed.
 class DlMatrixColorFilter final : public DlColorFilter {
  public:
-  DlMatrixColorFilter(const float matrix[20]) {
+  explicit DlMatrixColorFilter(const float matrix[20]) {
     memcpy(matrix_, matrix, sizeof(matrix_));
   }
   DlMatrixColorFilter(const DlMatrixColorFilter& filter)
       : DlMatrixColorFilter(filter.matrix_) {}
-  DlMatrixColorFilter(const DlMatrixColorFilter* filter)
+  explicit DlMatrixColorFilter(const DlMatrixColorFilter* filter)
       : DlMatrixColorFilter(filter->matrix_) {}
 
+  static std::shared_ptr<DlColorFilter> Make(const float matrix[20]);
+
   DlColorFilterType type() const override { return DlColorFilterType::kMatrix; }
   size_t size() const override { return sizeof(*this); }
-  bool modifies_transparent_black() const override {
-    // Look at the matrix to make a faster determination?
-    // Basically, are the translation components all 0?
-    sk_sp<SkColorFilter> sk_filter = skia_object();
-    return sk_filter &&
-           sk_filter->filterColor(SK_ColorTRANSPARENT) != SK_ColorTRANSPARENT;
-  }
 
-  bool can_commute_with_opacity() const override {
-    return matrix_[3] == 0 && matrix_[8] == 0 && matrix_[13] == 0 &&
-           matrix_[15] == 0 && matrix_[16] == 0 && matrix_[17] == 0 &&
-           (matrix_[18] >= 0.0 && matrix_[18] <= 1.0) && matrix_[19] == 0;
-  }
+  bool modifies_transparent_black() const override;
+  bool can_commute_with_opacity() const override;
 
   std::shared_ptr<DlColorFilter> shared() const override {
     return std::make_shared<DlMatrixColorFilter>(this);
   }
 
-  sk_sp<SkColorFilter> skia_object() const override {
-    return SkColorFilters::Matrix(matrix_);
-  }
-
   const DlMatrixColorFilter* asMatrix() const override { return this; }
 
   const float& operator[](int index) const { return matrix_[index]; }
@@ -191,12 +155,13 @@ class DlMatrixColorFilter final : public DlColorFilter {
 // gamma curve to the rendered pixels.
 class DlSrgbToLinearGammaColorFilter final : public DlColorFilter {
  public:
-  static const std::shared_ptr<DlSrgbToLinearGammaColorFilter> instance;
+  static const std::shared_ptr<DlSrgbToLinearGammaColorFilter> kInstance;
 
   DlSrgbToLinearGammaColorFilter() {}
   DlSrgbToLinearGammaColorFilter(const DlSrgbToLinearGammaColorFilter& filter)
       : DlSrgbToLinearGammaColorFilter() {}
-  DlSrgbToLinearGammaColorFilter(const DlSrgbToLinearGammaColorFilter* filter)
+  explicit DlSrgbToLinearGammaColorFilter(
+      const DlSrgbToLinearGammaColorFilter* filter)
       : DlSrgbToLinearGammaColorFilter() {}
 
   DlColorFilterType type() const override {
@@ -206,8 +171,7 @@ class DlSrgbToLinearGammaColorFilter final : public DlColorFilter {
   bool modifies_transparent_black() const override { return false; }
   bool can_commute_with_opacity() const override { return true; }
 
-  std::shared_ptr<DlColorFilter> shared() const override { return instance; }
-  sk_sp<SkColorFilter> skia_object() const override { return sk_filter_; }
+  std::shared_ptr<DlColorFilter> shared() const override { return kInstance; }
 
  protected:
   bool equals_(const DlColorFilter& other) const override {
@@ -216,7 +180,6 @@ class DlSrgbToLinearGammaColorFilter final : public DlColorFilter {
   }
 
  private:
-  static const sk_sp<SkColorFilter> sk_filter_;
   friend class DlColorFilter;
 };
 
@@ -224,12 +187,13 @@ class DlSrgbToLinearGammaColorFilter final : public DlColorFilter {
 // to the rendered pixels.
 class DlLinearToSrgbGammaColorFilter final : public DlColorFilter {
  public:
-  static const std::shared_ptr<DlLinearToSrgbGammaColorFilter> instance;
+  static const std::shared_ptr<DlLinearToSrgbGammaColorFilter> kInstance;
 
   DlLinearToSrgbGammaColorFilter() {}
   DlLinearToSrgbGammaColorFilter(const DlLinearToSrgbGammaColorFilter& filter)
       : DlLinearToSrgbGammaColorFilter() {}
-  DlLinearToSrgbGammaColorFilter(const DlLinearToSrgbGammaColorFilter* filter)
+  explicit DlLinearToSrgbGammaColorFilter(
+      const DlLinearToSrgbGammaColorFilter* filter)
       : DlLinearToSrgbGammaColorFilter() {}
 
   DlColorFilterType type() const override {
@@ -239,8 +203,7 @@ class DlLinearToSrgbGammaColorFilter final : public DlColorFilter {
   bool modifies_transparent_black() const override { return false; }
   bool can_commute_with_opacity() const override { return true; }
 
-  std::shared_ptr<DlColorFilter> shared() const override { return instance; }
-  sk_sp<SkColorFilter> skia_object() const override { return sk_filter_; }
+  std::shared_ptr<DlColorFilter> shared() const override { return kInstance; }
 
  protected:
   bool equals_(const DlColorFilter& other) const override {
@@ -249,53 +212,9 @@ class DlLinearToSrgbGammaColorFilter final : public DlColorFilter {
   }
 
  private:
-  static const sk_sp<SkColorFilter> sk_filter_;
   friend class DlColorFilter;
 };
 
-// A wrapper class for a Skia ColorFilter of unknown type. The above 4 types
-// are the only types that can be constructed by Flutter using the
-// ui.ColorFilter class so this class should be rarely used. The main use
-// would come from the |DisplayListCanvasRecorder| recording Skia rendering
-// calls that originated outside of the Flutter dart code. This would
-// primarily happen in the Paragraph code that renders the text using the
-// SkCanvas interface which we capture into DisplayList data structures.
-class DlUnknownColorFilter final : public DlColorFilter {
- public:
-  DlUnknownColorFilter(sk_sp<SkColorFilter> sk_filter)
-      : sk_filter_(std::move(sk_filter)) {}
-  DlUnknownColorFilter(const DlUnknownColorFilter& filter)
-      : DlUnknownColorFilter(filter.sk_filter_) {}
-  DlUnknownColorFilter(const DlUnknownColorFilter* filter)
-      : DlUnknownColorFilter(filter->sk_filter_) {}
-
-  DlColorFilterType type() const override {
-    return DlColorFilterType::kUnknown;
-  }
-  size_t size() const override { return sizeof(*this); }
-  bool modifies_transparent_black() const override {
-    return sk_filter_->filterColor(SK_ColorTRANSPARENT) != SK_ColorTRANSPARENT;
-  }
-
-  std::shared_ptr<DlColorFilter> shared() const override {
-    return std::make_shared<DlUnknownColorFilter>(this);
-  }
-
-  sk_sp<SkColorFilter> skia_object() const override { return sk_filter_; }
-
-  virtual ~DlUnknownColorFilter() = default;
-
- protected:
-  bool equals_(const DlColorFilter& other) const override {
-    FML_DCHECK(other.type() == DlColorFilterType::kUnknown);
-    auto that = static_cast<DlUnknownColorFilter const*>(&other);
-    return sk_filter_ == that->sk_filter_;
-  }
-
- private:
-  sk_sp<SkColorFilter> sk_filter_;
-};
-
 }  // namespace flutter
 
-#endif  // FLUTTER_DISPLAY_LIST_DISPLAY_LIST_COLOR_FILTER_H_
+#endif  // FLUTTER_DISPLAY_LIST_EFFECTS_DL_COLOR_FILTER_H_
diff --git a/display_list/display_list_color_filter_unittests.cc b/display_list/effects/dl_color_filter_unittests.cc
similarity index 48%
rename from display_list/display_list_color_filter_unittests.cc
rename to display_list/effects/dl_color_filter_unittests.cc
index 3642ec8a917d0856caf29f83fde6e18a003fa3ca..157348f3cf3aeb2e8d2c7fb712da5ca4e791f9bd 100644
--- a/display_list/display_list_color_filter_unittests.cc
+++ b/display_list/effects/dl_color_filter_unittests.cc
@@ -2,10 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/display_list/display_list_attributes_testing.h"
-#include "flutter/display_list/display_list_builder.h"
-#include "flutter/display_list/display_list_color_filter.h"
-#include "flutter/display_list/types.h"
+#include "flutter/display_list/effects/dl_color_filter.h"
+#include "flutter/display_list/testing/dl_test_equality.h"
 
 namespace flutter {
 namespace testing {
@@ -17,84 +15,6 @@ static const float kMatrix[20] = {
     16, 17, 18, 19, 20,  //
 };
 
-TEST(DisplayListColorFilter, BuilderSetGet) {
-  DlBlendColorFilter filter(DlColor::kRed(), DlBlendMode::kDstATop);
-  DisplayListBuilder builder;
-  ASSERT_EQ(builder.getColorFilter(), nullptr);
-  builder.setColorFilter(&filter);
-  ASSERT_NE(builder.getColorFilter(), nullptr);
-  ASSERT_TRUE(
-      Equals(builder.getColorFilter(), static_cast<DlColorFilter*>(&filter)));
-  builder.setColorFilter(nullptr);
-  ASSERT_EQ(builder.getColorFilter(), nullptr);
-}
-
-TEST(DisplayListColorFilter, FromSkiaNullFilter) {
-  std::shared_ptr<DlColorFilter> filter = DlColorFilter::From(nullptr);
-  ASSERT_EQ(filter, nullptr);
-  ASSERT_EQ(filter.get(), nullptr);
-}
-
-TEST(DisplayListColorFilter, FromSkiaBlendFilter) {
-  sk_sp<SkColorFilter> sk_filter =
-      SkColorFilters::Blend(SK_ColorRED, SkBlendMode::kDstATop);
-  std::shared_ptr<DlColorFilter> filter = DlColorFilter::From(sk_filter);
-  DlBlendColorFilter dl_filter(DlColor::kRed(), DlBlendMode::kDstATop);
-  ASSERT_EQ(filter->type(), DlColorFilterType::kBlend);
-  ASSERT_EQ(*filter->asBlend(), dl_filter);
-  ASSERT_EQ(filter->asBlend()->color(), DlColor::kRed());
-  ASSERT_EQ(filter->asBlend()->mode(), DlBlendMode::kDstATop);
-
-  ASSERT_EQ(filter->asMatrix(), nullptr);
-}
-
-TEST(DisplayListColorFilter, FromSkiaMatrixFilter) {
-  sk_sp<SkColorFilter> sk_filter = SkColorFilters::Matrix(kMatrix);
-  std::shared_ptr<DlColorFilter> filter = DlColorFilter::From(sk_filter);
-  DlMatrixColorFilter dl_filter(kMatrix);
-  ASSERT_EQ(filter->type(), DlColorFilterType::kMatrix);
-  ASSERT_EQ(*filter->asMatrix(), dl_filter);
-  const DlMatrixColorFilter* matrix_filter = filter->asMatrix();
-  for (int i = 0; i < 20; i++) {
-    ASSERT_EQ((*matrix_filter)[i], kMatrix[i]);
-  }
-
-  ASSERT_EQ(filter->asBlend(), nullptr);
-}
-
-TEST(DisplayListColorFilter, FromSkiaSrgbToLinearFilter) {
-  sk_sp<SkColorFilter> sk_filter = SkColorFilters::SRGBToLinearGamma();
-  std::shared_ptr<DlColorFilter> filter = DlColorFilter::From(sk_filter);
-  ASSERT_EQ(filter->type(), DlColorFilterType::kSrgbToLinearGamma);
-
-  ASSERT_EQ(filter->asBlend(), nullptr);
-  ASSERT_EQ(filter->asMatrix(), nullptr);
-}
-
-TEST(DisplayListColorFilter, FromSkiaLinearToSrgbFilter) {
-  sk_sp<SkColorFilter> sk_filter = SkColorFilters::LinearToSRGBGamma();
-  std::shared_ptr<DlColorFilter> filter = DlColorFilter::From(sk_filter);
-  ASSERT_EQ(filter->type(), DlColorFilterType::kLinearToSrgbGamma);
-
-  ASSERT_EQ(filter->asBlend(), nullptr);
-  ASSERT_EQ(filter->asMatrix(), nullptr);
-}
-
-TEST(DisplayListColorFilter, FromSkiaUnrecognizedFilter) {
-  sk_sp<SkColorFilter> sk_input_a =
-      SkColorFilters::Blend(SK_ColorRED, SkBlendMode::kOverlay);
-  sk_sp<SkColorFilter> sk_input_b =
-      SkColorFilters::Blend(SK_ColorBLUE, SkBlendMode::kScreen);
-  sk_sp<SkColorFilter> sk_filter =
-      SkColorFilters::Compose(sk_input_a, sk_input_b);
-  std::shared_ptr<DlColorFilter> filter = DlColorFilter::From(sk_filter);
-  ASSERT_EQ(filter->type(), DlColorFilterType::kUnknown);
-  ASSERT_EQ(filter->skia_object(), sk_filter);
-
-  ASSERT_EQ(filter->asBlend(), nullptr);
-  ASSERT_EQ(filter->asMatrix(), nullptr);
-}
-
 TEST(DisplayListColorFilter, BlendConstructor) {
   DlBlendColorFilter filter(DlColor::kRed(), DlBlendMode::kDstATop);
 }
@@ -215,7 +135,7 @@ TEST(DisplayListColorFilter, SrgbToLinearEquals) {
   DlSrgbToLinearGammaColorFilter filter1;
   DlSrgbToLinearGammaColorFilter filter2;
   TestEquals(filter1, filter2);
-  TestEquals(filter1, *DlSrgbToLinearGammaColorFilter::instance);
+  TestEquals(filter1, *DlSrgbToLinearGammaColorFilter::kInstance);
 }
 
 TEST(DisplayListColorFilter, LinearToSrgbConstructor) {
@@ -232,42 +152,7 @@ TEST(DisplayListColorFilter, LinearToSrgbEquals) {
   DlLinearToSrgbGammaColorFilter filter1;
   DlLinearToSrgbGammaColorFilter filter2;
   TestEquals(filter1, filter2);
-  TestEquals(filter1, *DlLinearToSrgbGammaColorFilter::instance);
-}
-
-TEST(DisplayListColorFilter, UnknownConstructor) {
-  DlUnknownColorFilter filter(SkColorFilters::LinearToSRGBGamma());
-}
-
-TEST(DisplayListColorFilter, UnknownShared) {
-  DlUnknownColorFilter filter(SkColorFilters::LinearToSRGBGamma());
-  ASSERT_NE(filter.shared().get(), &filter);
-  ASSERT_EQ(*filter.shared(), filter);
-}
-
-TEST(DisplayListColorFilter, UnknownContents) {
-  sk_sp<SkColorFilter> sk_filter = SkColorFilters::LinearToSRGBGamma();
-  DlUnknownColorFilter filter(sk_filter);
-  ASSERT_EQ(sk_filter, filter.skia_object());
-  ASSERT_EQ(sk_filter.get(), filter.skia_object().get());
-}
-
-TEST(DisplayListColorFilter, UnknownEquals) {
-  sk_sp<SkColorFilter> sk_filter = SkColorFilters::LinearToSRGBGamma();
-  DlUnknownColorFilter filter1(sk_filter);
-  DlUnknownColorFilter filter2(sk_filter);
-  TestEquals(filter1, filter2);
-}
-
-TEST(DisplayListColorFilter, UnknownNotEquals) {
-  // Even though the filter is the same, it is a different instance
-  // and we cannot currently tell them apart because the Skia
-  // ColorFilter objects do not implement ==
-  DlUnknownColorFilter filter1(
-      SkColorFilters::Blend(SK_ColorRED, SkBlendMode::kDstATop));
-  DlUnknownColorFilter filter2(
-      SkColorFilters::Blend(SK_ColorRED, SkBlendMode::kDstATop));
-  TestNotEquals(filter1, filter2, "SkColorFilter instance differs");
+  TestEquals(filter1, *DlLinearToSrgbGammaColorFilter::kInstance);
 }
 
 }  // namespace testing
diff --git a/display_list/display_list_color_source.cc b/display_list/effects/dl_color_source.cc
similarity index 69%
rename from display_list/display_list_color_source.cc
rename to display_list/effects/dl_color_source.cc
index 0344de312161bc7cc806826f8627076a2f222aaf..5b1744f22f2127f268b5dc0d38659d33f88f72db 100644
--- a/display_list/display_list_color_source.cc
+++ b/display_list/effects/dl_color_source.cc
@@ -2,40 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/display_list/display_list_color_source.h"
+#include "flutter/display_list/effects/dl_color_source.h"
 
-#include "flutter/display_list/display_list_runtime_effect.h"
-#include "flutter/display_list/display_list_sampling_options.h"
+#include "flutter/display_list/dl_sampling_options.h"
+#include "flutter/display_list/effects/dl_runtime_effect.h"
 #include "flutter/fml/logging.h"
 
 namespace flutter {
 
-std::shared_ptr<DlColorSource> DlColorSource::From(SkShader* sk_shader) {
-  if (sk_shader == nullptr) {
-    return nullptr;
-  }
-  {
-    SkMatrix local_matrix;
-    SkTileMode xy[2];
-    SkImage* image = sk_shader->isAImage(&local_matrix, xy);
-    if (image) {
-      return std::make_shared<DlImageColorSource>(
-          DlImage::Make(image), ToDl(xy[0]), ToDl(xy[1]),
-          DlImageSampling::kLinear, &local_matrix);
-    }
-  }
-  // Skia provides |SkShader->asAGradient(&info)| method to access the
-  // parameters of a gradient, but the info object being filled has a number
-  // of parameters which are missing, including the local matrix in every
-  // gradient, and the sweep angles in the sweep gradients.
-  //
-  // Since we can't reproduce every Gradient, and customers rely on using
-  // gradients with matrices in text code, we have to just use an Unknown
-  // ColorSource to express all gradients.
-  // (see: https://github.com/flutter/flutter/issues/102947)
-  return std::make_shared<DlUnknownColorSource>(sk_ref_sp(sk_shader));
-}
-
 static void DlGradientDeleter(void* p) {
   // Some of our target environments would prefer a sized delete,
   // but other target environments do not have that operator.
@@ -45,7 +19,7 @@ static void DlGradientDeleter(void* p) {
   ::operator delete(p);
 }
 
-std::shared_ptr<DlColorSource> DlColorSource::MakeLinear(
+std::shared_ptr<DlLinearGradientColorSource> DlColorSource::MakeLinear(
     const SkPoint start_point,
     const SkPoint end_point,
     uint32_t stop_count,
@@ -63,10 +37,10 @@ std::shared_ptr<DlColorSource> DlColorSource::MakeLinear(
                 DlLinearGradientColorSource(start_point, end_point, stop_count,
                                             colors, stops, tile_mode, matrix),
             DlGradientDeleter);
-  return std::move(ret);
+  return ret;
 }
 
-std::shared_ptr<DlColorSource> DlColorSource::MakeRadial(
+std::shared_ptr<DlRadialGradientColorSource> DlColorSource::MakeRadial(
     SkPoint center,
     SkScalar radius,
     uint32_t stop_count,
@@ -83,10 +57,10 @@ std::shared_ptr<DlColorSource> DlColorSource::MakeRadial(
   ret.reset(new (storage) DlRadialGradientColorSource(
                 center, radius, stop_count, colors, stops, tile_mode, matrix),
             DlGradientDeleter);
-  return std::move(ret);
+  return ret;
 }
 
-std::shared_ptr<DlColorSource> DlColorSource::MakeConical(
+std::shared_ptr<DlConicalGradientColorSource> DlColorSource::MakeConical(
     SkPoint start_center,
     SkScalar start_radius,
     SkPoint end_center,
@@ -106,10 +80,10 @@ std::shared_ptr<DlColorSource> DlColorSource::MakeConical(
                 start_center, start_radius, end_center, end_radius, stop_count,
                 colors, stops, tile_mode, matrix),
             DlGradientDeleter);
-  return std::move(ret);
+  return ret;
 }
 
-std::shared_ptr<DlColorSource> DlColorSource::MakeSweep(
+std::shared_ptr<DlSweepGradientColorSource> DlColorSource::MakeSweep(
     SkPoint center,
     SkScalar start,
     SkScalar end,
@@ -128,7 +102,7 @@ std::shared_ptr<DlColorSource> DlColorSource::MakeSweep(
                 DlSweepGradientColorSource(center, start, end, stop_count,
                                            colors, stops, tile_mode, matrix),
             DlGradientDeleter);
-  return std::move(ret);
+  return ret;
 }
 
 std::shared_ptr<DlRuntimeEffectColorSource> DlColorSource::MakeRuntimeEffect(
diff --git a/display_list/display_list_color_source.h b/display_list/effects/dl_color_source.h
similarity index 77%
rename from display_list/display_list_color_source.h
rename to display_list/effects/dl_color_source.h
index 1e5f545554a72f0ef68b74de8f98a65830f4f842..39359d7996a066118b055fd49af2344fffb78bec 100644
--- a/display_list/display_list_color_source.h
+++ b/display_list/effects/dl_color_source.h
@@ -2,25 +2,31 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_COLOR_SOURCE_H_
-#define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_COLOR_SOURCE_H_
+#ifndef FLUTTER_DISPLAY_LIST_EFFECTS_DL_COLOR_SOURCE_H_
+#define FLUTTER_DISPLAY_LIST_EFFECTS_DL_COLOR_SOURCE_H_
 
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "flutter/display_list/display_list.h"
-#include "flutter/display_list/display_list_attributes.h"
-#include "flutter/display_list/display_list_color.h"
-#include "flutter/display_list/display_list_image.h"
-#include "flutter/display_list/display_list_runtime_effect.h"
-#include "flutter/display_list/display_list_sampling_options.h"
-#include "flutter/display_list/display_list_tile_mode.h"
-#include "flutter/display_list/types.h"
+#include "flutter/display_list/dl_attributes.h"
+#include "flutter/display_list/dl_color.h"
+#include "flutter/display_list/dl_sampling_options.h"
+#include "flutter/display_list/dl_tile_mode.h"
+#include "flutter/display_list/effects/dl_runtime_effect.h"
+#include "flutter/display_list/image/dl_image.h"
 #include "flutter/fml/logging.h"
+
 #include "third_party/skia/include/core/SkShader.h"
-#include "third_party/skia/include/effects/SkGradientShader.h"
-#include "third_party/skia/include/effects/SkRuntimeEffect.h"
+
+#ifdef IMPELLER_ENABLE_3D
+#include "impeller/geometry/matrix.h"  // nogncheck
+#include "impeller/scene/node.h"       // nogncheck
+namespace flutter {
+class DlSceneColorSource;
+}
+#endif  // IMPELLER_ENABLE_3D
 
 namespace flutter {
 
@@ -31,7 +37,6 @@ class DlRadialGradientColorSource;
 class DlConicalGradientColorSource;
 class DlSweepGradientColorSource;
 class DlRuntimeEffectColorSource;
-class DlUnknownColorSource;
 
 // The DisplayList ColorSource class. This class implements all of the
 // facilities and adheres to the design goals of the |DlAttribute| base
@@ -51,29 +56,14 @@ enum class DlColorSourceType {
   kConicalGradient,
   kSweepGradient,
   kRuntimeEffect,
-  kUnknown
+#ifdef IMPELLER_ENABLE_3D
+  kScene,
+#endif  // IMPELLER_ENABLE_3D
 };
 
-class DlColorSource
-    : public DlAttribute<DlColorSource, SkShader, DlColorSourceType> {
+class DlColorSource : public DlAttribute<DlColorSource, DlColorSourceType> {
  public:
-  // Return a shared_ptr holding a DlColorSource representing the indicated
-  // Skia SkShader pointer.
-  //
-  // This method can detect each of the 4 recognized types from an analogous
-  // SkShader.
-  static std::shared_ptr<DlColorSource> From(SkShader* sk_filter);
-
-  // Return a shared_ptr holding a DlColorFilter representing the indicated
-  // Skia SkShader pointer.
-  //
-  // This method can detect each of the 4 recognized types from an analogous
-  // SkShader.
-  static std::shared_ptr<DlColorSource> From(sk_sp<SkShader> sk_filter) {
-    return From(sk_filter.get());
-  }
-
-  static std::shared_ptr<DlColorSource> MakeLinear(
+  static std::shared_ptr<DlLinearGradientColorSource> MakeLinear(
       const SkPoint start_point,
       const SkPoint end_point,
       uint32_t stop_count,
@@ -82,7 +72,7 @@ class DlColorSource
       DlTileMode tile_mode,
       const SkMatrix* matrix = nullptr);
 
-  static std::shared_ptr<DlColorSource> MakeRadial(
+  static std::shared_ptr<DlRadialGradientColorSource> MakeRadial(
       SkPoint center,
       SkScalar radius,
       uint32_t stop_count,
@@ -91,7 +81,7 @@ class DlColorSource
       DlTileMode tile_mode,
       const SkMatrix* matrix = nullptr);
 
-  static std::shared_ptr<DlColorSource> MakeConical(
+  static std::shared_ptr<DlConicalGradientColorSource> MakeConical(
       SkPoint start_center,
       SkScalar start_radius,
       SkPoint end_center,
@@ -102,7 +92,7 @@ class DlColorSource
       DlTileMode tile_mode,
       const SkMatrix* matrix = nullptr);
 
-  static std::shared_ptr<DlColorSource> MakeSweep(
+  static std::shared_ptr<DlSweepGradientColorSource> MakeSweep(
       SkPoint center,
       SkScalar start,
       SkScalar end,
@@ -119,10 +109,25 @@ class DlColorSource
 
   virtual bool is_opaque() const = 0;
 
-  virtual std::shared_ptr<DlColorSource> with_sampling(
-      DlImageSampling options) const {
-    return shared();
-  }
+  //----------------------------------------------------------------------------
+  /// @brief      If the underlying platform data held by this object is
+  ///             held in a way that it can be stored and potentially
+  ///             released from the UI thread, this method returns true.
+  ///
+  /// @return     True if the class has no GPU related resources or if any
+  ///             that it holds are held in a thread-safe manner.
+  ///
+  virtual bool isUIThreadSafe() const = 0;
+
+  //----------------------------------------------------------------------------
+  /// @brief      If the underlying platform data represents a gradient.
+  ///
+  ///             TODO(matanl): Remove this flag when the Skia backend is
+  ///             removed, https://github.com/flutter/flutter/issues/112498.
+  ///
+  /// @return     True if the class represents the output of a gradient.
+  ///
+  virtual bool isGradient() const { return false; }
 
   // Return a DlColorColorSource pointer to this object iff it is an Color
   // type of ColorSource, otherwise return nullptr.
@@ -160,14 +165,9 @@ class DlColorSource
     return nullptr;
   }
 
-  // If this filter contains images, specifies the owning context for those
-  // images.
-  // Images with a DlImage::OwningContext::kRaster must only call skia_object
-  // on the raster task runner.
-  // A nullopt return means there is no image.
-  virtual std::optional<DlImage::OwningContext> owning_context() const {
-    return std::nullopt;
-  }
+#ifdef IMPELLER_ENABLE_3D
+  virtual const DlSceneColorSource* asScene() const { return nullptr; }
+#endif  // IMPELLER_ENABLE_3D
 
  protected:
   DlColorSource() = default;
@@ -178,7 +178,9 @@ class DlColorSource
 
 class DlColorColorSource final : public DlColorSource {
  public:
-  DlColorColorSource(DlColor color) : color_(color) {}
+  explicit DlColorColorSource(DlColor color) : color_(color) {}
+
+  bool isUIThreadSafe() const override { return true; }
 
   std::shared_ptr<DlColorSource> shared() const override {
     return std::make_shared<DlColorColorSource>(color_);
@@ -189,14 +191,10 @@ class DlColorColorSource final : public DlColorSource {
   DlColorSourceType type() const override { return DlColorSourceType::kColor; }
   size_t size() const override { return sizeof(*this); }
 
-  bool is_opaque() const override { return (color_ >> 24) == 255; }
+  bool is_opaque() const override { return color_.getAlpha() == 255; }
 
   DlColor color() const { return color_; }
 
-  sk_sp<SkShader> skia_object() const override {
-    return SkShaders::Color(color_);
-  }
-
  protected:
   bool equals_(DlColorSource const& other) const override {
     FML_DCHECK(other.type() == DlColorSourceType::kColor);
@@ -218,7 +216,7 @@ class DlMatrixColorSourceBase : public DlColorSource {
   }
 
  protected:
-  DlMatrixColorSourceBase(const SkMatrix* matrix)
+  explicit DlMatrixColorSourceBase(const SkMatrix* matrix)
       : matrix_(matrix ? *matrix : SkMatrix::I()) {}
 
  private:
@@ -234,19 +232,22 @@ class DlImageColorSource final : public SkRefCnt,
                      DlImageSampling sampling = DlImageSampling::kLinear,
                      const SkMatrix* matrix = nullptr)
       : DlMatrixColorSourceBase(matrix),
-        image_(image),
+        image_(std::move(image)),
         horizontal_tile_mode_(horizontal_tile_mode),
         vertical_tile_mode_(vertical_tile_mode),
         sampling_(sampling) {}
 
+  bool isUIThreadSafe() const override {
+    return image_ ? image_->isUIThreadSafe() : true;
+  }
+
   const DlImageColorSource* asImage() const override { return this; }
 
   std::shared_ptr<DlColorSource> shared() const override {
     return with_sampling(sampling_);
   }
 
-  std::shared_ptr<DlColorSource> with_sampling(
-      DlImageSampling sampling) const override {
+  std::shared_ptr<DlColorSource> with_sampling(DlImageSampling sampling) const {
     return std::make_shared<DlImageColorSource>(image_, horizontal_tile_mode_,
                                                 vertical_tile_mode_, sampling,
                                                 matrix_ptr());
@@ -257,24 +258,11 @@ class DlImageColorSource final : public SkRefCnt,
 
   bool is_opaque() const override { return image_->isOpaque(); }
 
-  std::optional<DlImage::OwningContext> owning_context() const override {
-    return image_->owning_context();
-  }
-
   sk_sp<const DlImage> image() const { return image_; }
   DlTileMode horizontal_tile_mode() const { return horizontal_tile_mode_; }
   DlTileMode vertical_tile_mode() const { return vertical_tile_mode_; }
   DlImageSampling sampling() const { return sampling_; }
 
-  virtual sk_sp<SkShader> skia_object() const override {
-    if (!image_->skia_image()) {
-      return nullptr;
-    }
-    return image_->skia_image()->makeShader(ToSk(horizontal_tile_mode_),
-                                            ToSk(vertical_tile_mode_),
-                                            ToSk(sampling_), matrix_ptr());
-  }
-
  protected:
   bool equals_(DlColorSource const& other) const override {
     FML_DCHECK(other.type() == DlColorSourceType::kImage);
@@ -302,13 +290,15 @@ class DlGradientColorSourceBase : public DlMatrixColorSourceBase {
     }
     const DlColor* my_colors = colors();
     for (uint32_t i = 0; i < stop_count_; i++) {
-      if ((my_colors[i] >> 24) < 255) {
+      if (my_colors[i].getAlpha() < 255) {
         return false;
       }
     }
     return true;
   }
 
+  bool isGradient() const override { return true; }
+
   DlTileMode tile_mode() const { return mode_; }
   int stop_count() const { return stop_count_; }
   const DlColor* colors() const {
@@ -376,6 +366,8 @@ class DlLinearGradientColorSource final : public DlGradientColorSourceBase {
     return this;
   }
 
+  bool isUIThreadSafe() const override { return true; }
+
   DlColorSourceType type() const override {
     return DlColorSourceType::kLinearGradient;
   }
@@ -389,13 +381,6 @@ class DlLinearGradientColorSource final : public DlGradientColorSourceBase {
   const SkPoint& start_point() const { return start_point_; }
   const SkPoint& end_point() const { return end_point_; }
 
-  sk_sp<SkShader> skia_object() const override {
-    SkPoint pts[] = {start_point_, end_point_};
-    const SkColor* sk_colors = reinterpret_cast<const SkColor*>(colors());
-    return SkGradientShader::MakeLinear(pts, sk_colors, stops(), stop_count(),
-                                        ToSk(tile_mode()), 0, matrix_ptr());
-  }
-
  protected:
   virtual const void* pod() const override { return this + 1; }
 
@@ -420,7 +405,8 @@ class DlLinearGradientColorSource final : public DlGradientColorSourceBase {
     store_color_stops(this + 1, colors, stops);
   }
 
-  DlLinearGradientColorSource(const DlLinearGradientColorSource* source)
+  explicit DlLinearGradientColorSource(
+      const DlLinearGradientColorSource* source)
       : DlGradientColorSourceBase(source->stop_count(),
                                   source->tile_mode(),
                                   source->matrix_ptr()),
@@ -444,6 +430,8 @@ class DlRadialGradientColorSource final : public DlGradientColorSourceBase {
     return this;
   }
 
+  bool isUIThreadSafe() const override { return true; }
+
   std::shared_ptr<DlColorSource> shared() const override {
     return MakeRadial(center_, radius_, stop_count(), colors(), stops(),
                       tile_mode(), matrix_ptr());
@@ -457,13 +445,6 @@ class DlRadialGradientColorSource final : public DlGradientColorSourceBase {
   SkPoint center() const { return center_; }
   SkScalar radius() const { return radius_; }
 
-  sk_sp<SkShader> skia_object() const override {
-    const SkColor* sk_colors = reinterpret_cast<const SkColor*>(colors());
-    return SkGradientShader::MakeRadial(center_, radius_, sk_colors, stops(),
-                                        stop_count(), ToSk(tile_mode()), 0,
-                                        matrix_ptr());
-  }
-
  protected:
   virtual const void* pod() const override { return this + 1; }
 
@@ -488,7 +469,8 @@ class DlRadialGradientColorSource final : public DlGradientColorSourceBase {
     store_color_stops(this + 1, colors, stops);
   }
 
-  DlRadialGradientColorSource(const DlRadialGradientColorSource* source)
+  explicit DlRadialGradientColorSource(
+      const DlRadialGradientColorSource* source)
       : DlGradientColorSourceBase(source->stop_count(),
                                   source->tile_mode(),
                                   source->matrix_ptr()),
@@ -512,6 +494,8 @@ class DlConicalGradientColorSource final : public DlGradientColorSourceBase {
     return this;
   }
 
+  bool isUIThreadSafe() const override { return true; }
+
   std::shared_ptr<DlColorSource> shared() const override {
     return MakeConical(start_center_, start_radius_, end_center_, end_radius_,
                        stop_count(), colors(), stops(), tile_mode(),
@@ -528,13 +512,6 @@ class DlConicalGradientColorSource final : public DlGradientColorSourceBase {
   SkPoint end_center() const { return end_center_; }
   SkScalar end_radius() const { return end_radius_; }
 
-  sk_sp<SkShader> skia_object() const override {
-    const SkColor* sk_colors = reinterpret_cast<const SkColor*>(colors());
-    return SkGradientShader::MakeTwoPointConical(
-        start_center_, start_radius_, end_center_, end_radius_, sk_colors,
-        stops(), stop_count(), ToSk(tile_mode()), 0, matrix_ptr());
-  }
-
  protected:
   virtual const void* pod() const override { return this + 1; }
 
@@ -565,7 +542,8 @@ class DlConicalGradientColorSource final : public DlGradientColorSourceBase {
     store_color_stops(this + 1, colors, stops);
   }
 
-  DlConicalGradientColorSource(const DlConicalGradientColorSource* source)
+  explicit DlConicalGradientColorSource(
+      const DlConicalGradientColorSource* source)
       : DlGradientColorSourceBase(source->stop_count(),
                                   source->tile_mode(),
                                   source->matrix_ptr()),
@@ -593,6 +571,8 @@ class DlSweepGradientColorSource final : public DlGradientColorSourceBase {
     return this;
   }
 
+  bool isUIThreadSafe() const override { return true; }
+
   std::shared_ptr<DlColorSource> shared() const override {
     return MakeSweep(center_, start_, end_, stop_count(), colors(), stops(),
                      tile_mode(), matrix_ptr());
@@ -607,13 +587,6 @@ class DlSweepGradientColorSource final : public DlGradientColorSourceBase {
   SkScalar start() const { return start_; }
   SkScalar end() const { return end_; }
 
-  sk_sp<SkShader> skia_object() const override {
-    const SkColor* sk_colors = reinterpret_cast<const SkColor*>(colors());
-    return SkGradientShader::MakeSweep(center_.x(), center_.y(), sk_colors,
-                                       stops(), stop_count(), ToSk(tile_mode()),
-                                       start_, end_, 0, matrix_ptr());
-  }
-
  protected:
   virtual const void* pod() const override { return this + 1; }
 
@@ -640,7 +613,7 @@ class DlSweepGradientColorSource final : public DlGradientColorSourceBase {
     store_color_stops(this + 1, colors, stops);
   }
 
-  DlSweepGradientColorSource(const DlSweepGradientColorSource* source)
+  explicit DlSweepGradientColorSource(const DlSweepGradientColorSource* source)
       : DlGradientColorSourceBase(source->stop_count(),
                                   source->tile_mode(),
                                   source->matrix_ptr()),
@@ -670,6 +643,15 @@ class DlRuntimeEffectColorSource final : public DlColorSource {
         samplers_(std::move(samplers)),
         uniform_data_(std::move(uniform_data)) {}
 
+  bool isUIThreadSafe() const override {
+    for (const auto& sampler : samplers_) {
+      if (!sampler->isUIThreadSafe()) {
+        return false;
+      }
+    }
+    return true;
+  }
+
   const DlRuntimeEffectColorSource* asRuntimeEffect() const override {
     return this;
   }
@@ -696,35 +678,6 @@ class DlRuntimeEffectColorSource final : public DlColorSource {
     return uniform_data_;
   }
 
-  sk_sp<SkShader> skia_object() const override {
-    if (!runtime_effect_) {
-      return nullptr;
-    }
-    if (!runtime_effect_->skia_runtime_effect()) {
-      return nullptr;
-    }
-    std::vector<sk_sp<SkShader>> sk_samplers(samplers_.size());
-    for (size_t i = 0; i < samplers_.size(); i++) {
-      auto sampler = samplers_[i];
-      if (sampler == nullptr) {
-        return nullptr;
-      }
-      sk_samplers[i] = sampler->skia_object();
-    }
-
-    auto ref = new std::shared_ptr<std::vector<uint8_t>>(uniform_data_);
-    auto uniform_data = SkData::MakeWithProc(
-        uniform_data_->data(), uniform_data_->size(),
-        [](const void* ptr, void* context) {
-          delete reinterpret_cast<std::shared_ptr<std::vector<uint8_t>>*>(
-              context);
-        },
-        ref);
-
-    return runtime_effect_->skia_runtime_effect()->makeShader(
-        uniform_data, sk_samplers.data(), sk_samplers.size());
-  }
-
  protected:
   bool equals_(DlColorSource const& other) const override {
     FML_DCHECK(other.type() == DlColorSourceType::kRuntimeEffect);
@@ -754,37 +707,48 @@ class DlRuntimeEffectColorSource final : public DlColorSource {
   FML_DISALLOW_COPY_ASSIGN_AND_MOVE(DlRuntimeEffectColorSource);
 };
 
-class DlUnknownColorSource final : public DlColorSource {
+#ifdef IMPELLER_ENABLE_3D
+class DlSceneColorSource final : public DlColorSource {
  public:
-  DlUnknownColorSource(sk_sp<SkShader> shader)
-      : sk_shader_(std::move(shader)) {}
+  DlSceneColorSource(std::shared_ptr<impeller::scene::Node> node,
+                     impeller::Matrix camera_matrix)
+      : node_(std::move(node)), camera_matrix_(camera_matrix) {}
+
+  bool isUIThreadSafe() const override { return true; }
+
+  const DlSceneColorSource* asScene() const override { return this; }
 
   std::shared_ptr<DlColorSource> shared() const override {
-    return std::make_shared<DlUnknownColorSource>(sk_shader_);
+    return std::make_shared<DlSceneColorSource>(node_, camera_matrix_);
   }
 
-  DlColorSourceType type() const override {
-    return DlColorSourceType::kUnknown;
-  }
+  DlColorSourceType type() const override { return DlColorSourceType::kScene; }
   size_t size() const override { return sizeof(*this); }
 
-  bool is_opaque() const override { return sk_shader_->isOpaque(); }
+  bool is_opaque() const override { return false; }
+
+  std::shared_ptr<impeller::scene::Node> scene_node() const { return node_; }
 
-  sk_sp<SkShader> skia_object() const override { return sk_shader_; }
+  impeller::Matrix camera_matrix() const { return camera_matrix_; }
 
  protected:
   bool equals_(DlColorSource const& other) const override {
-    FML_DCHECK(other.type() == DlColorSourceType::kUnknown);
-    auto that = static_cast<DlUnknownColorSource const*>(&other);
-    return (sk_shader_ == that->sk_shader_);
+    FML_DCHECK(other.type() == DlColorSourceType::kScene);
+    auto that = static_cast<DlSceneColorSource const*>(&other);
+    if (node_ != that->node_) {
+      return false;
+    }
+    return true;
   }
 
  private:
-  sk_sp<SkShader> sk_shader_;
+  std::shared_ptr<impeller::scene::Node> node_;
+  impeller::Matrix camera_matrix_;  // the view-projection matrix of the scene.
 
-  FML_DISALLOW_COPY_ASSIGN_AND_MOVE(DlUnknownColorSource);
+  FML_DISALLOW_COPY_ASSIGN_AND_MOVE(DlSceneColorSource);
 };
+#endif  // IMPELLER_ENABLE_3D
 
 }  // namespace flutter
 
-#endif  // FLUTTER_DISPLAY_LIST_DISPLAY_LIST_COLOR_SOURCE_H_
+#endif  // FLUTTER_DISPLAY_LIST_EFFECTS_DL_COLOR_SOURCE_H_
diff --git a/display_list/display_list_color_source_unittests.cc b/display_list/effects/dl_color_source_unittests.cc
similarity index 74%
rename from display_list/display_list_color_source_unittests.cc
rename to display_list/effects/dl_color_source_unittests.cc
index 5c9a62abd8697eecf1805297ffe5f3db71868a70..6fc0aac4cddb4556a3fba89167569c264ad33dc3 100644
--- a/display_list/display_list_color_source_unittests.cc
+++ b/display_list/effects/dl_color_source_unittests.cc
@@ -5,14 +5,14 @@
 #include <memory>
 #include <vector>
 
-#include "flutter/display_list/display_list_attributes_testing.h"
-#include "flutter/display_list/display_list_builder.h"
-#include "flutter/display_list/display_list_color_source.h"
-#include "flutter/display_list/display_list_image.h"
-#include "flutter/display_list/display_list_runtime_effect.h"
-#include "flutter/display_list/display_list_sampling_options.h"
-#include "flutter/display_list/types.h"
-#include "third_party/skia/include/core/SkString.h"
+#include "display_list/dl_color.h"
+#include "flutter/display_list/dl_sampling_options.h"
+#include "flutter/display_list/effects/dl_color_source.h"
+#include "flutter/display_list/effects/dl_runtime_effect.h"
+#include "flutter/display_list/image/dl_image.h"
+#include "flutter/display_list/testing/dl_test_equality.h"
+
+#include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkSurface.h"
 
 namespace flutter {
@@ -21,11 +21,11 @@ namespace testing {
 static sk_sp<DlImage> MakeTestImage(int w, int h, SkColor color) {
   sk_sp<SkSurface> surface;
   if (SkColorGetA(color) < 255) {
-    surface = SkSurface::MakeRasterN32Premul(w, h);
+    surface = SkSurfaces::Raster(SkImageInfo::MakeN32Premul(w, h));
   } else {
     SkImageInfo info =
         SkImageInfo::MakeN32(w, h, SkAlphaType::kOpaque_SkAlphaType);
-    surface = SkSurface::MakeRaster(info);
+    surface = SkSurfaces::Raster(info);
   }
   SkCanvas* canvas = surface->getCanvas();
   canvas->drawColor(color);
@@ -85,187 +85,19 @@ static constexpr SkPoint kTestPoints2[2] = {
     SkPoint::Make(100, 115),
     SkPoint::Make(107, 118),
 };
-static const sk_sp<SkShader> kShaderA = SkShaders::Color(SK_ColorRED);
-static const sk_sp<SkShader> kShaderB = SkShaders::Color(SK_ColorBLUE);
-static const sk_sp<SkShader> kTestUnknownShader =
-    SkShaders::Blend(SkBlendMode::kOverlay, kShaderA, kShaderB);
-static const sk_sp<SkShader> kTestAlphaUnknownShader =
-    SkShaders::Blend(SkBlendMode::kDstOut, kShaderA, kShaderB);
-
-TEST(DisplayListColorSource, BuilderSetGet) {
-  DlImageColorSource source(kTestImage1, DlTileMode::kClamp, DlTileMode::kClamp,
-                            DlImageSampling::kLinear, &kTestMatrix1);
-  DisplayListBuilder builder;
-  ASSERT_EQ(builder.getColorSource(), nullptr);
-  builder.setColorSource(&source);
-  ASSERT_NE(builder.getColorSource(), nullptr);
-  ASSERT_TRUE(
-      Equals(builder.getColorSource(), static_cast<DlColorSource*>(&source)));
-  builder.setColorSource(nullptr);
-  ASSERT_EQ(builder.getColorSource(), nullptr);
-}
-
-TEST(DisplayListColorSource, FromSkiaNullShader) {
-  std::shared_ptr<DlColorSource> source = DlColorSource::From(nullptr);
-  ASSERT_EQ(source, nullptr);
-  ASSERT_EQ(source.get(), nullptr);
-}
-
-TEST(DisplayListColorSource, FromSkiaColorShader) {
-  // We cannot read back the matrix parameter from a Skia LinearGradient
-  // so we conservatively use an UnknownColorSource wrapper so as to not
-  // lose any data. Note that the Skia Color shader end is read back from
-  // the Skia asAGradient() method so while this type of color source
-  // does not really need the matrix, we represent all of the gradient
-  // sources using an unknown source.
-  // Note that this shader should never really happen in practice as it
-  // represents a degenerate gradient that collapsed to a single color.
-  sk_sp<SkShader> shader = SkShaders::Color(SK_ColorBLUE);
-  std::shared_ptr<DlColorSource> source = DlColorSource::From(shader);
-  ASSERT_EQ(source->type(), DlColorSourceType::kUnknown);
-  ASSERT_EQ(source->skia_object(), shader);
-
-  ASSERT_EQ(source->asColor(), nullptr);
-  ASSERT_EQ(source->asImage(), nullptr);
-  ASSERT_EQ(source->asLinearGradient(), nullptr);
-  ASSERT_EQ(source->asRadialGradient(), nullptr);
-  ASSERT_EQ(source->asConicalGradient(), nullptr);
-  ASSERT_EQ(source->asSweepGradient(), nullptr);
-}
-
-TEST(DisplayListColorSource, FromSkiaImageShader) {
-  sk_sp<SkShader> shader = kTestImage1->skia_image()->makeShader(
-      ToSk(DlImageSampling::kLinear), &kTestMatrix1);
-  std::shared_ptr<DlColorSource> source = DlColorSource::From(shader);
-  DlImageColorSource dl_source(kTestImage1, DlTileMode::kClamp,
-                               DlTileMode::kClamp, DlImageSampling::kLinear,
-                               &kTestMatrix1);
-  ASSERT_EQ(source->type(), DlColorSourceType::kImage);
-  ASSERT_EQ(*source->asImage(), dl_source);
-  ASSERT_TRUE(source->asImage()->image()->Equals(kTestImage1));
-  ASSERT_TRUE(kTestImage1->Equals(source->asImage()->image()));
-  ASSERT_EQ(source->asImage()->matrix(), kTestMatrix1);
-  ASSERT_EQ(source->asImage()->horizontal_tile_mode(), DlTileMode::kClamp);
-  ASSERT_EQ(source->asImage()->vertical_tile_mode(), DlTileMode::kClamp);
-  ASSERT_EQ(source->asImage()->sampling(), DlImageSampling::kLinear);
-
-  ASSERT_EQ(source->asColor(), nullptr);
-  ASSERT_EQ(source->asLinearGradient(), nullptr);
-  ASSERT_EQ(source->asRadialGradient(), nullptr);
-  ASSERT_EQ(source->asConicalGradient(), nullptr);
-  ASSERT_EQ(source->asSweepGradient(), nullptr);
-  ASSERT_EQ(source->asRuntimeEffect(), nullptr);
-}
-
-TEST(DisplayListColorSource, FromSkiaLinearGradient) {
-  // We cannot read back the matrix parameter from a Skia LinearGradient
-  // so we conservatively use an UnknownColorSource wrapper so as to not
-  // lose any data.
-  const SkColor* sk_colors = reinterpret_cast<const SkColor*>(kTestColors);
-  sk_sp<SkShader> shader = SkGradientShader::MakeLinear(
-      kTestPoints, sk_colors, kTestStops, kTestStopCount, SkTileMode::kClamp);
-  std::shared_ptr<DlColorSource> source = DlColorSource::From(shader);
-  ASSERT_EQ(source->type(), DlColorSourceType::kUnknown);
-  ASSERT_EQ(source->skia_object(), shader);
-
-  ASSERT_EQ(source->asColor(), nullptr);
-  ASSERT_EQ(source->asImage(), nullptr);
-  ASSERT_EQ(source->asLinearGradient(), nullptr);
-  ASSERT_EQ(source->asRadialGradient(), nullptr);
-  ASSERT_EQ(source->asConicalGradient(), nullptr);
-  ASSERT_EQ(source->asSweepGradient(), nullptr);
-}
-
-TEST(DisplayListColorSource, FromSkiaRadialGradient) {
-  // We cannot read back the matrix parameter from a Skia RadialGradient
-  // so we conservatively use an UnknownColorSource wrapper so as to not
-  // lose any data.
-  const SkColor* sk_colors = reinterpret_cast<const SkColor*>(kTestColors);
-  sk_sp<SkShader> shader =
-      SkGradientShader::MakeRadial(kTestPoints[0], 10.0, sk_colors, kTestStops,
-                                   kTestStopCount, SkTileMode::kClamp);
-  std::shared_ptr<DlColorSource> source = DlColorSource::From(shader);
-  ASSERT_EQ(source->type(), DlColorSourceType::kUnknown);
-  ASSERT_EQ(source->skia_object(), shader);
-
-  ASSERT_EQ(source->asColor(), nullptr);
-  ASSERT_EQ(source->asImage(), nullptr);
-  ASSERT_EQ(source->asLinearGradient(), nullptr);
-  ASSERT_EQ(source->asRadialGradient(), nullptr);
-  ASSERT_EQ(source->asConicalGradient(), nullptr);
-  ASSERT_EQ(source->asSweepGradient(), nullptr);
-  ASSERT_EQ(source->asRuntimeEffect(), nullptr);
-}
-
-TEST(DisplayListColorSource, FromSkiaConicalGradient) {
-  // We cannot read back the matrix parameter from a Skia ConicalGradient
-  // so we conservatively use an UnknownColorSource wrapper so as to not
-  // lose any data.
-  const SkColor* sk_colors = reinterpret_cast<const SkColor*>(kTestColors);
-  sk_sp<SkShader> shader = SkGradientShader::MakeTwoPointConical(
-      kTestPoints[0], 10.0, kTestPoints[1], 20.0, sk_colors, kTestStops,
-      kTestStopCount, SkTileMode::kClamp);
-  std::shared_ptr<DlColorSource> source = DlColorSource::From(shader);
-  ASSERT_EQ(source->type(), DlColorSourceType::kUnknown);
-  ASSERT_EQ(source->skia_object(), shader);
-
-  ASSERT_EQ(source->asColor(), nullptr);
-  ASSERT_EQ(source->asImage(), nullptr);
-  ASSERT_EQ(source->asLinearGradient(), nullptr);
-  ASSERT_EQ(source->asRadialGradient(), nullptr);
-  ASSERT_EQ(source->asConicalGradient(), nullptr);
-  ASSERT_EQ(source->asSweepGradient(), nullptr);
-  ASSERT_EQ(source->asRuntimeEffect(), nullptr);
-}
-
-TEST(DisplayListColorSource, FromSkiaSweepGradient) {
-  // We cannot read back the matrix parameter, nor the sweep parameters from a
-  // Skia SweepGradient so we conservatively use an UnknownColorSource wrapper
-  // so as to not lose any data.
-  const SkColor* sk_colors = reinterpret_cast<const SkColor*>(kTestColors);
-  sk_sp<SkShader> shader =
-      SkGradientShader::MakeSweep(kTestPoints[0].fX, kTestPoints[0].fY,
-                                  sk_colors, kTestStops, kTestStopCount);
-  std::shared_ptr<DlColorSource> source = DlColorSource::From(shader);
-  ASSERT_EQ(source->type(), DlColorSourceType::kUnknown);
-  ASSERT_EQ(source->skia_object(), shader);
-
-  ASSERT_EQ(source->asColor(), nullptr);
-  ASSERT_EQ(source->asImage(), nullptr);
-  ASSERT_EQ(source->asLinearGradient(), nullptr);
-  ASSERT_EQ(source->asRadialGradient(), nullptr);
-  ASSERT_EQ(source->asConicalGradient(), nullptr);
-  ASSERT_EQ(source->asSweepGradient(), nullptr);
-  ASSERT_EQ(source->asRuntimeEffect(), nullptr);
-}
-
-TEST(DisplayListColorSource, FromSkiaUnrecognizedShader) {
-  std::shared_ptr<DlColorSource> source =
-      DlColorSource::From(kTestUnknownShader);
-  ASSERT_EQ(source->type(), DlColorSourceType::kUnknown);
-  ASSERT_EQ(source->skia_object(), kTestUnknownShader);
-
-  ASSERT_EQ(source->asColor(), nullptr);
-  ASSERT_EQ(source->asImage(), nullptr);
-  ASSERT_EQ(source->asLinearGradient(), nullptr);
-  ASSERT_EQ(source->asRadialGradient(), nullptr);
-  ASSERT_EQ(source->asConicalGradient(), nullptr);
-  ASSERT_EQ(source->asSweepGradient(), nullptr);
-  ASSERT_EQ(source->asRuntimeEffect(), nullptr);
-}
 
 TEST(DisplayListColorSource, ColorConstructor) {
-  DlColorColorSource source(SK_ColorRED);
+  DlColorColorSource source(DlColor::kRed());
 }
 
 TEST(DisplayListColorSource, ColorShared) {
-  DlColorColorSource source(SK_ColorRED);
+  DlColorColorSource source(DlColor::kRed());
   ASSERT_NE(source.shared().get(), &source);
   ASSERT_EQ(*source.shared(), source);
 }
 
 TEST(DisplayListColorSource, ColorAsColor) {
-  DlColorColorSource source(SK_ColorRED);
+  DlColorColorSource source(DlColor::kRed());
   ASSERT_NE(source.asColor(), nullptr);
   ASSERT_EQ(source.asColor(), &source);
 
@@ -278,26 +110,26 @@ TEST(DisplayListColorSource, ColorAsColor) {
 }
 
 TEST(DisplayListColorSource, ColorContents) {
-  DlColorColorSource source(SK_ColorRED);
-  ASSERT_EQ(source.color(), SK_ColorRED);
+  DlColorColorSource source(DlColor::kRed());
+  ASSERT_EQ(source.color(), DlColor::kRed());
   ASSERT_EQ(source.is_opaque(), true);
   for (int i = 0; i < 255; i++) {
     SkColor alpha_color = SkColorSetA(SK_ColorRED, i);
-    DlColorColorSource alpha_source(alpha_color);
+    auto const alpha_source = DlColorColorSource(DlColor(alpha_color));
     ASSERT_EQ(alpha_source.color(), alpha_color);
     ASSERT_EQ(alpha_source.is_opaque(), false);
   }
 }
 
 TEST(DisplayListColorSource, ColorEquals) {
-  DlColorColorSource source1(SK_ColorRED);
-  DlColorColorSource source2(SK_ColorRED);
+  DlColorColorSource source1(DlColor::kRed());
+  DlColorColorSource source2(DlColor::kRed());
   TestEquals(source1, source2);
 }
 
 TEST(DisplayListColorSource, ColorNotEquals) {
-  DlColorColorSource source1(SK_ColorRED);
-  DlColorColorSource source2(SK_ColorBLUE);
+  DlColorColorSource source1(DlColor::kRed());
+  DlColorColorSource source2(DlColor::kBlue());
   TestNotEquals(source1, source2, "Color differs");
 }
 
@@ -896,53 +728,6 @@ TEST(DisplayListColorSource, SweepGradientNotEquals) {
   }
 }
 
-TEST(DisplayListColorSource, UnknownConstructor) {
-  DlUnknownColorSource source(kTestUnknownShader);
-}
-
-TEST(DisplayListColorSource, UnknownShared) {
-  DlUnknownColorSource source(kTestUnknownShader);
-  ASSERT_NE(source.shared().get(), &source);
-  ASSERT_EQ(*source.shared(), source);
-}
-
-TEST(DisplayListColorSource, UnknownAsNone) {
-  DlUnknownColorSource source(kTestUnknownShader);
-  ASSERT_EQ(source.asColor(), nullptr);
-  ASSERT_EQ(source.asImage(), nullptr);
-  ASSERT_EQ(source.asLinearGradient(), nullptr);
-  ASSERT_EQ(source.asRadialGradient(), nullptr);
-  ASSERT_EQ(source.asConicalGradient(), nullptr);
-  ASSERT_EQ(source.asSweepGradient(), nullptr);
-  ASSERT_EQ(source.asRuntimeEffect(), nullptr);
-}
-
-TEST(DisplayListColorSource, UnknownContents) {
-  DlUnknownColorSource source(kTestUnknownShader);
-  ASSERT_EQ(source.skia_object(), kTestUnknownShader);
-  // Blend shaders always return false for is_opaque.
-  // See: https://bugs.chromium.org/p/skia/issues/detail?id=13046
-  ASSERT_EQ(source.is_opaque(), false);
-}
-
-TEST(DisplayListColorSource, AlphaUnknownContents) {
-  DlUnknownColorSource source(kTestAlphaUnknownShader);
-  ASSERT_EQ(source.skia_object(), kTestAlphaUnknownShader);
-  ASSERT_EQ(source.is_opaque(), false);
-}
-
-TEST(DisplayListColorSource, UnknownEquals) {
-  DlUnknownColorSource source1(kTestUnknownShader);
-  DlUnknownColorSource source2(kTestUnknownShader);
-  TestEquals(source1, source2);
-}
-
-TEST(DisplayListColorSource, UnknownNotEquals) {
-  DlUnknownColorSource source1(kTestUnknownShader);
-  DlUnknownColorSource source2(kTestAlphaUnknownShader);
-  TestNotEquals(source1, source2, "SkShader differs");
-}
-
 TEST(DisplayListColorSource, RuntimeEffect) {
   std::shared_ptr<DlRuntimeEffectColorSource> source1 =
       DlColorSource::MakeRuntimeEffect(
@@ -965,23 +750,11 @@ TEST(DisplayListColorSource, RuntimeEffect) {
   ASSERT_EQ(source1->asConicalGradient(), nullptr);
   ASSERT_EQ(source1->asSweepGradient(), nullptr);
 
-  ASSERT_NE(source1->skia_object(), nullptr);
-  ASSERT_EQ(source3->skia_object(), nullptr);
-
   TestEquals(source1, source1);
   TestEquals(source3, source3);
   TestNotEquals(source1, source2, "SkRuntimeEffect differs");
   TestNotEquals(source2, source3, "SkRuntimeEffect differs");
 }
 
-TEST(DisplayListColorSource, RuntimeEffectWithNullSampler) {
-  std::shared_ptr<DlRuntimeEffectColorSource> source1 =
-      DlColorSource::MakeRuntimeEffect(
-          kTestRuntimeEffect1, {nullptr},
-          std::make_shared<std::vector<uint8_t>>());
-
-  ASSERT_EQ(source1->skia_object(), nullptr);
-}
-
 }  // namespace testing
 }  // namespace flutter
diff --git a/display_list/display_list_image_filter.cc b/display_list/effects/dl_image_filter.cc
similarity index 74%
rename from display_list/display_list_image_filter.cc
rename to display_list/effects/dl_image_filter.cc
index 4e43649a208e0ffcc7a3ea4bc08e44066dbfd338..7f0481f0562e0a6ce1546fbaff95dab36efabbb2 100644
--- a/display_list/display_list_image_filter.cc
+++ b/display_list/effects/dl_image_filter.cc
@@ -2,31 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/display_list/display_list_image_filter.h"
+#include "flutter/display_list/effects/dl_image_filter.h"
 
 namespace flutter {
 
-std::shared_ptr<DlImageFilter> DlImageFilter::From(
-    const SkImageFilter* sk_filter) {
-  if (sk_filter == nullptr) {
-    return nullptr;
-  }
-  {
-    SkColorFilter* color_filter;
-    if (sk_filter->isColorFilterNode(&color_filter)) {
-      FML_DCHECK(color_filter != nullptr);
-      // If |isColorFilterNode| succeeds, the pointer it sets into color_filter
-      // will be ref'd already so we do not use sk_ref_sp() here as that would
-      // double-ref the color filter object. Instead we use a bare sk_sp
-      // constructor to adopt this reference into an sk_sp<SkCF> without
-      // reffing it and let the compiler manage the refs.
-      return std::make_shared<DlColorFilterImageFilter>(
-          DlColorFilter::From(sk_sp<SkColorFilter>(color_filter)));
-    }
-  }
-  return std::make_shared<DlUnknownImageFilter>(sk_ref_sp(sk_filter));
-}
-
 std::shared_ptr<DlImageFilter> DlImageFilter::makeWithLocalMatrix(
     const SkMatrix& matrix) const {
   if (matrix.isIdentity()) {
diff --git a/display_list/display_list_image_filter.h b/display_list/effects/dl_image_filter.h
similarity index 77%
rename from display_list/display_list_image_filter.h
rename to display_list/effects/dl_image_filter.h
index 3a79b89aa43b8198022622d0552e8a5fceb04c6f..9cd0126a0cabb061ab6555530283f1b9d2395b1d 100644
--- a/display_list/display_list_image_filter.h
+++ b/display_list/effects/dl_image_filter.h
@@ -2,17 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_IMAGE_FILTER_H_
-#define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_IMAGE_FILTER_H_
-
-#include "flutter/display_list/display_list_attributes.h"
-#include "flutter/display_list/display_list_color_filter.h"
-#include "flutter/display_list/display_list_comparable.h"
-#include "flutter/display_list/display_list_sampling_options.h"
-#include "flutter/display_list/display_list_tile_mode.h"
-#include "flutter/display_list/types.h"
+#ifndef FLUTTER_DISPLAY_LIST_EFFECTS_DL_IMAGE_FILTER_H_
+#define FLUTTER_DISPLAY_LIST_EFFECTS_DL_IMAGE_FILTER_H_
+
+#include <utility>
+
+#include "flutter/display_list/dl_attributes.h"
+#include "flutter/display_list/dl_sampling_options.h"
+#include "flutter/display_list/dl_tile_mode.h"
+#include "flutter/display_list/effects/dl_color_filter.h"
+#include "flutter/display_list/utils/dl_comparable.h"
 #include "flutter/fml/logging.h"
-#include "third_party/skia/include/effects/SkImageFilters.h"
+
+#include "third_party/skia/include/core/SkMatrix.h"
 
 namespace flutter {
 
@@ -23,19 +25,15 @@ namespace flutter {
 // The objects here define operations that can take a location and one or
 // more input pixels and produce a color for that output pixel
 
-// An enumerated type for the recognized ImageFilter operations.
-// If a custom ImageFilter outside of the recognized types is needed
-// then a |kUnknown| type that simply defers to an SkImageFilter is
-// provided as a fallback.
+// An enumerated type for the supported ImageFilter operations.
 enum class DlImageFilterType {
   kBlur,
   kDilate,
   kErode,
   kMatrix,
-  kComposeFilter,
+  kCompose,
   kColorFilter,
-  kLocalMatrixFilter,
-  kUnknown
+  kLocalMatrix,
 };
 
 class DlBlurImageFilter;
@@ -46,8 +44,7 @@ class DlLocalMatrixImageFilter;
 class DlComposeImageFilter;
 class DlColorFilterImageFilter;
 
-class DlImageFilter
-    : public DlAttribute<DlImageFilter, SkImageFilter, DlImageFilterType> {
+class DlImageFilter : public DlAttribute<DlImageFilter, DlImageFilterType> {
  public:
   enum class MatrixCapability {
     kTranslate,
@@ -55,25 +52,6 @@ class DlImageFilter
     kComplex,
   };
 
-  // Return a shared_ptr holding a DlImageFilter representing the indicated
-  // Skia SkImageFilter pointer.
-  //
-  // This method can only detect the ColorFilter type of ImageFilter from an
-  // analogous SkImageFilter as there are no "asA..." methods for the other
-  // types on SkImageFilter.
-  static std::shared_ptr<DlImageFilter> From(const SkImageFilter* sk_filter);
-
-  // Return a shared_ptr holding a DlImageFilter representing the indicated
-  // Skia SkImageFilter pointer.
-  //
-  // This method can only detect the ColorFilter type of ImageFilter from an
-  // analogous SkImageFilter as there are no "asA..." methods for the other
-  // types on SkImageFilter.
-  static std::shared_ptr<DlImageFilter> From(
-      const sk_sp<SkImageFilter> sk_filter) {
-    return From(sk_filter.get());
-  }
-
   // Return a DlBlurImageFilter pointer to this object iff it is a Blur
   // type of ImageFilter, otherwise return nullptr.
   virtual const DlBlurImageFilter* asBlur() const { return nullptr; }
@@ -247,9 +225,23 @@ class DlBlurImageFilter final : public DlImageFilter {
       : DlBlurImageFilter(filter->sigma_x_,
                           filter->sigma_y_,
                           filter->tile_mode_) {}
-  explicit DlBlurImageFilter(const DlBlurImageFilter& filter)
+  DlBlurImageFilter(const DlBlurImageFilter& filter)
       : DlBlurImageFilter(&filter) {}
 
+  static std::shared_ptr<DlImageFilter> Make(SkScalar sigma_x,
+                                             SkScalar sigma_y,
+                                             DlTileMode tile_mode) {
+    if (!SkScalarIsFinite(sigma_x) || !SkScalarIsFinite(sigma_y)) {
+      return nullptr;
+    }
+    if (sigma_x < SK_ScalarNearlyZero && sigma_y < SK_ScalarNearlyZero) {
+      return nullptr;
+    }
+    sigma_x = (sigma_x < SK_ScalarNearlyZero) ? 0 : sigma_x;
+    sigma_y = (sigma_y < SK_ScalarNearlyZero) ? 0 : sigma_y;
+    return std::make_shared<DlBlurImageFilter>(sigma_x, sigma_y, tile_mode);
+  }
+
   std::shared_ptr<DlImageFilter> shared() const override {
     return std::make_shared<DlBlurImageFilter>(this);
   }
@@ -263,14 +255,14 @@ class DlBlurImageFilter final : public DlImageFilter {
 
   SkRect* map_local_bounds(const SkRect& input_bounds,
                            SkRect& output_bounds) const override {
-    output_bounds = input_bounds.makeOutset(sigma_x_ * 3, sigma_y_ * 3);
+    output_bounds = input_bounds.makeOutset(sigma_x_ * 3.0f, sigma_y_ * 3.0f);
     return &output_bounds;
   }
 
   SkIRect* map_device_bounds(const SkIRect& input_bounds,
                              const SkMatrix& ctm,
                              SkIRect& output_bounds) const override {
-    return outset_device_bounds(input_bounds, sigma_x_ * 3.0, sigma_y_ * 3.0,
+    return outset_device_bounds(input_bounds, sigma_x_ * 3.0f, sigma_y_ * 3.0f,
                                 ctm, output_bounds);
   }
 
@@ -285,10 +277,6 @@ class DlBlurImageFilter final : public DlImageFilter {
   SkScalar sigma_y() const { return sigma_y_; }
   DlTileMode tile_mode() const { return tile_mode_; }
 
-  sk_sp<SkImageFilter> skia_object() const override {
-    return SkImageFilters::Blur(sigma_x_, sigma_y_, ToSk(tile_mode_), nullptr);
-  }
-
  protected:
   bool equals_(const DlImageFilter& other) const override {
     FML_DCHECK(other.type() == DlImageFilterType::kBlur);
@@ -309,9 +297,18 @@ class DlDilateImageFilter final : public DlImageFilter {
       : radius_x_(radius_x), radius_y_(radius_y) {}
   explicit DlDilateImageFilter(const DlDilateImageFilter* filter)
       : DlDilateImageFilter(filter->radius_x_, filter->radius_y_) {}
-  explicit DlDilateImageFilter(const DlDilateImageFilter& filter)
+  DlDilateImageFilter(const DlDilateImageFilter& filter)
       : DlDilateImageFilter(&filter) {}
 
+  static std::shared_ptr<DlImageFilter> Make(SkScalar radius_x,
+                                             SkScalar radius_y) {
+    if (SkScalarIsFinite(radius_x) && radius_x > SK_ScalarNearlyZero &&
+        SkScalarIsFinite(radius_y) && radius_y > SK_ScalarNearlyZero) {
+      return std::make_shared<DlDilateImageFilter>(radius_x, radius_y);
+    }
+    return nullptr;
+  }
+
   std::shared_ptr<DlImageFilter> shared() const override {
     return std::make_shared<DlDilateImageFilter>(this);
   }
@@ -346,10 +343,6 @@ class DlDilateImageFilter final : public DlImageFilter {
   SkScalar radius_x() const { return radius_x_; }
   SkScalar radius_y() const { return radius_y_; }
 
-  sk_sp<SkImageFilter> skia_object() const override {
-    return SkImageFilters::Dilate(radius_x_, radius_y_, nullptr);
-  }
-
  protected:
   bool equals_(const DlImageFilter& other) const override {
     FML_DCHECK(other.type() == DlImageFilterType::kDilate);
@@ -368,9 +361,18 @@ class DlErodeImageFilter final : public DlImageFilter {
       : radius_x_(radius_x), radius_y_(radius_y) {}
   explicit DlErodeImageFilter(const DlErodeImageFilter* filter)
       : DlErodeImageFilter(filter->radius_x_, filter->radius_y_) {}
-  explicit DlErodeImageFilter(const DlErodeImageFilter& filter)
+  DlErodeImageFilter(const DlErodeImageFilter& filter)
       : DlErodeImageFilter(&filter) {}
 
+  static std::shared_ptr<DlImageFilter> Make(SkScalar radius_x,
+                                             SkScalar radius_y) {
+    if (SkScalarIsFinite(radius_x) && radius_x > SK_ScalarNearlyZero &&
+        SkScalarIsFinite(radius_y) && radius_y > SK_ScalarNearlyZero) {
+      return std::make_shared<DlErodeImageFilter>(radius_x, radius_y);
+    }
+    return nullptr;
+  }
+
   std::shared_ptr<DlImageFilter> shared() const override {
     return std::make_shared<DlErodeImageFilter>(this);
   }
@@ -405,10 +407,6 @@ class DlErodeImageFilter final : public DlImageFilter {
   SkScalar radius_x() const { return radius_x_; }
   SkScalar radius_y() const { return radius_y_; }
 
-  sk_sp<SkImageFilter> skia_object() const override {
-    return SkImageFilters::Erode(radius_x_, radius_y_, nullptr);
-  }
-
  protected:
   bool equals_(const DlImageFilter& other) const override {
     FML_DCHECK(other.type() == DlImageFilterType::kErode);
@@ -427,9 +425,17 @@ class DlMatrixImageFilter final : public DlImageFilter {
       : matrix_(matrix), sampling_(sampling) {}
   explicit DlMatrixImageFilter(const DlMatrixImageFilter* filter)
       : DlMatrixImageFilter(filter->matrix_, filter->sampling_) {}
-  explicit DlMatrixImageFilter(const DlMatrixImageFilter& filter)
+  DlMatrixImageFilter(const DlMatrixImageFilter& filter)
       : DlMatrixImageFilter(&filter) {}
 
+  static std::shared_ptr<DlImageFilter> Make(const SkMatrix& matrix,
+                                             DlImageSampling sampling) {
+    if (matrix.isFinite() && !matrix.isIdentity()) {
+      return std::make_shared<DlMatrixImageFilter>(matrix, sampling);
+    }
+    return nullptr;
+  }
+
   std::shared_ptr<DlImageFilter> shared() const override {
     return std::make_shared<DlMatrixImageFilter>(this);
   }
@@ -483,10 +489,6 @@ class DlMatrixImageFilter final : public DlImageFilter {
     return &input_bounds;
   }
 
-  sk_sp<SkImageFilter> skia_object() const override {
-    return SkImageFilters::MatrixTransform(matrix_, ToSk(sampling_), nullptr);
-  }
-
  protected:
   bool equals_(const DlImageFilter& other) const override {
     FML_DCHECK(other.type() == DlImageFilterType::kMatrix);
@@ -501,8 +503,8 @@ class DlMatrixImageFilter final : public DlImageFilter {
 
 class DlComposeImageFilter final : public DlImageFilter {
  public:
-  DlComposeImageFilter(std::shared_ptr<DlImageFilter> outer,
-                       std::shared_ptr<DlImageFilter> inner)
+  DlComposeImageFilter(std::shared_ptr<const DlImageFilter> outer,
+                       std::shared_ptr<const DlImageFilter> inner)
       : outer_(std::move(outer)), inner_(std::move(inner)) {}
   DlComposeImageFilter(const DlImageFilter* outer, const DlImageFilter* inner)
       : outer_(outer->shared()), inner_(inner->shared()) {}
@@ -510,20 +512,32 @@ class DlComposeImageFilter final : public DlImageFilter {
       : DlComposeImageFilter(&outer, &inner) {}
   explicit DlComposeImageFilter(const DlComposeImageFilter* filter)
       : DlComposeImageFilter(filter->outer_, filter->inner_) {}
-  explicit DlComposeImageFilter(const DlComposeImageFilter& filter)
+  DlComposeImageFilter(const DlComposeImageFilter& filter)
       : DlComposeImageFilter(&filter) {}
 
+  static std::shared_ptr<const DlImageFilter> Make(
+      std::shared_ptr<const DlImageFilter> outer,
+      std::shared_ptr<const DlImageFilter> inner) {
+    if (!outer) {
+      return inner;
+    }
+    if (!inner) {
+      return outer;
+    }
+    return std::make_shared<DlComposeImageFilter>(outer, inner);
+  }
+
   std::shared_ptr<DlImageFilter> shared() const override {
     return std::make_shared<DlComposeImageFilter>(this);
   }
 
   DlImageFilterType type() const override {
-    return DlImageFilterType::kComposeFilter;
+    return DlImageFilterType::kCompose;
   }
   size_t size() const override { return sizeof(*this); }
 
-  std::shared_ptr<DlImageFilter> outer() const { return outer_; }
-  std::shared_ptr<DlImageFilter> inner() const { return inner_; }
+  std::shared_ptr<const DlImageFilter> outer() const { return outer_; }
+  std::shared_ptr<const DlImageFilter> inner() const { return inner_; }
 
   const DlComposeImageFilter* asCompose() const override { return this; }
 
@@ -548,30 +562,25 @@ class DlComposeImageFilter final : public DlImageFilter {
                                    const SkMatrix& ctm,
                                    SkIRect& input_bounds) const override;
 
-  sk_sp<SkImageFilter> skia_object() const override {
-    return SkImageFilters::Compose(outer_->skia_object(),
-                                   inner_->skia_object());
-  }
-
   MatrixCapability matrix_capability() const override {
     return std::min(outer_->matrix_capability(), inner_->matrix_capability());
   }
 
  protected:
   bool equals_(const DlImageFilter& other) const override {
-    FML_DCHECK(other.type() == DlImageFilterType::kComposeFilter);
+    FML_DCHECK(other.type() == DlImageFilterType::kCompose);
     auto that = static_cast<const DlComposeImageFilter*>(&other);
     return (Equals(outer_, that->outer_) && Equals(inner_, that->inner_));
   }
 
  private:
-  std::shared_ptr<DlImageFilter> outer_;
-  std::shared_ptr<DlImageFilter> inner_;
+  std::shared_ptr<const DlImageFilter> outer_;
+  std::shared_ptr<const DlImageFilter> inner_;
 };
 
 class DlColorFilterImageFilter final : public DlImageFilter {
  public:
-  explicit DlColorFilterImageFilter(std::shared_ptr<DlColorFilter> filter)
+  explicit DlColorFilterImageFilter(std::shared_ptr<const DlColorFilter> filter)
       : color_filter_(std::move(filter)) {}
   explicit DlColorFilterImageFilter(const DlColorFilter* filter)
       : color_filter_(filter->shared()) {}
@@ -579,9 +588,17 @@ class DlColorFilterImageFilter final : public DlImageFilter {
       : color_filter_(filter.shared()) {}
   explicit DlColorFilterImageFilter(const DlColorFilterImageFilter* filter)
       : DlColorFilterImageFilter(filter->color_filter_) {}
-  explicit DlColorFilterImageFilter(const DlColorFilterImageFilter& filter)
+  DlColorFilterImageFilter(const DlColorFilterImageFilter& filter)
       : DlColorFilterImageFilter(&filter) {}
 
+  static std::shared_ptr<DlImageFilter> Make(
+      const std::shared_ptr<const DlColorFilter>& filter) {
+    if (filter) {
+      return std::make_shared<DlColorFilterImageFilter>(filter);
+    }
+    return nullptr;
+  }
+
   std::shared_ptr<DlImageFilter> shared() const override {
     return std::make_shared<DlColorFilterImageFilter>(color_filter_);
   }
@@ -591,7 +608,7 @@ class DlColorFilterImageFilter final : public DlImageFilter {
   }
   size_t size() const override { return sizeof(*this); }
 
-  const std::shared_ptr<DlColorFilter> color_filter() const {
+  const std::shared_ptr<const DlColorFilter> color_filter() const {
     return color_filter_;
   }
 
@@ -625,10 +642,6 @@ class DlColorFilterImageFilter final : public DlImageFilter {
     return map_device_bounds(output_bounds, ctm, input_bounds);
   }
 
-  sk_sp<SkImageFilter> skia_object() const override {
-    return SkImageFilters::ColorFilter(color_filter_->skia_object(), nullptr);
-  }
-
   MatrixCapability matrix_capability() const override {
     return MatrixCapability::kComplex;
   }
@@ -646,14 +659,14 @@ class DlColorFilterImageFilter final : public DlImageFilter {
   }
 
  private:
-  std::shared_ptr<DlColorFilter> color_filter_;
+  std::shared_ptr<const DlColorFilter> color_filter_;
 };
 
 class DlLocalMatrixImageFilter final : public DlImageFilter {
  public:
   explicit DlLocalMatrixImageFilter(const SkMatrix& matrix,
                                     std::shared_ptr<DlImageFilter> filter)
-      : matrix_(matrix), image_filter_(filter) {}
+      : matrix_(matrix), image_filter_(std::move(filter)) {}
   explicit DlLocalMatrixImageFilter(const DlLocalMatrixImageFilter* filter)
       : DlLocalMatrixImageFilter(filter->matrix_, filter->image_filter_) {}
   DlLocalMatrixImageFilter(const DlLocalMatrixImageFilter& filter)
@@ -663,7 +676,7 @@ class DlLocalMatrixImageFilter final : public DlImageFilter {
   }
 
   DlImageFilterType type() const override {
-    return DlImageFilterType::kLocalMatrixFilter;
+    return DlImageFilterType::kLocalMatrix;
   }
   size_t size() const override { return sizeof(*this); }
 
@@ -687,7 +700,8 @@ class DlLocalMatrixImageFilter final : public DlImageFilter {
   SkRect* map_local_bounds(const SkRect& input_bounds,
                            SkRect& output_bounds) const override {
     if (!image_filter_) {
-      return nullptr;
+      output_bounds = input_bounds;
+      return &output_bounds;
     }
     return image_filter_->map_local_bounds(input_bounds, output_bounds);
   }
@@ -696,7 +710,8 @@ class DlLocalMatrixImageFilter final : public DlImageFilter {
                              const SkMatrix& ctm,
                              SkIRect& output_bounds) const override {
     if (!image_filter_) {
-      return nullptr;
+      output_bounds = input_bounds;
+      return &output_bounds;
     }
     return image_filter_->map_device_bounds(
         input_bounds, SkMatrix::Concat(ctm, matrix_), output_bounds);
@@ -706,26 +721,16 @@ class DlLocalMatrixImageFilter final : public DlImageFilter {
                                    const SkMatrix& ctm,
                                    SkIRect& input_bounds) const override {
     if (!image_filter_) {
-      return nullptr;
+      input_bounds = output_bounds;
+      return &input_bounds;
     }
     return image_filter_->get_input_device_bounds(
         output_bounds, SkMatrix::Concat(ctm, matrix_), input_bounds);
   }
 
-  sk_sp<SkImageFilter> skia_object() const override {
-    if (!image_filter_) {
-      return nullptr;
-    }
-    sk_sp<SkImageFilter> skia_object = image_filter_->skia_object();
-    if (!skia_object) {
-      return nullptr;
-    }
-    return skia_object->makeWithLocalMatrix(matrix_);
-  }
-
  protected:
   bool equals_(const DlImageFilter& other) const override {
-    FML_DCHECK(other.type() == DlImageFilterType::kMatrix);
+    FML_DCHECK(other.type() == DlImageFilterType::kLocalMatrix);
     auto that = static_cast<const DlLocalMatrixImageFilter*>(&other);
     return (matrix_ == that->matrix_ &&
             Equals(image_filter_, that->image_filter_));
@@ -736,89 +741,6 @@ class DlLocalMatrixImageFilter final : public DlImageFilter {
   std::shared_ptr<DlImageFilter> image_filter_;
 };
 
-// A wrapper class for a Skia ImageFilter of unknown type. The above 4 types
-// are the only types that can be constructed by Flutter using the
-// ui.ImageFilter class so this class should be rarely used. The main use
-// would come from the |DisplayListCanvasRecorder| recording Skia rendering
-// calls that originated outside of the Flutter dart code. This would
-// primarily happen in the Paragraph code that renders the text using the
-// SkCanvas interface which we capture into DisplayList data structures.
-class DlUnknownImageFilter final : public DlImageFilter {
- public:
-  explicit DlUnknownImageFilter(sk_sp<SkImageFilter> sk_filter)
-      : sk_filter_(std::move(sk_filter)) {}
-  explicit DlUnknownImageFilter(const SkImageFilter* sk_filter)
-      : sk_filter_(sk_ref_sp(sk_filter)) {}
-  explicit DlUnknownImageFilter(const DlUnknownImageFilter* filter)
-      : DlUnknownImageFilter(filter->sk_filter_) {}
-  explicit DlUnknownImageFilter(const DlUnknownImageFilter& filter)
-      : DlUnknownImageFilter(&filter) {}
-
-  DlImageFilterType type() const override {
-    return DlImageFilterType::kUnknown;
-  }
-  size_t size() const override { return sizeof(*this); }
-
-  std::shared_ptr<DlImageFilter> shared() const override {
-    return std::make_shared<DlUnknownImageFilter>(this);
-  }
-
-  bool modifies_transparent_black() const override {
-    if (!sk_filter_) {
-      return false;
-    }
-    return !sk_filter_->canComputeFastBounds();
-  }
-
-  SkRect* map_local_bounds(const SkRect& input_bounds,
-                           SkRect& output_bounds) const override {
-    if (!sk_filter_ || modifies_transparent_black()) {
-      output_bounds = input_bounds;
-      return nullptr;
-    }
-    output_bounds = sk_filter_->computeFastBounds(input_bounds);
-    return &output_bounds;
-  }
-
-  SkIRect* map_device_bounds(const SkIRect& input_bounds,
-                             const SkMatrix& ctm,
-                             SkIRect& output_bounds) const override {
-    if (!sk_filter_ || modifies_transparent_black()) {
-      output_bounds = input_bounds;
-      return nullptr;
-    }
-    output_bounds = sk_filter_->filterBounds(
-        input_bounds, ctm, SkImageFilter::kForward_MapDirection);
-    return &output_bounds;
-  }
-
-  SkIRect* get_input_device_bounds(const SkIRect& output_bounds,
-                                   const SkMatrix& ctm,
-                                   SkIRect& input_bounds) const override {
-    if (!sk_filter_ || modifies_transparent_black()) {
-      input_bounds = output_bounds;
-      return nullptr;
-    }
-    input_bounds = sk_filter_->filterBounds(
-        output_bounds, ctm, SkImageFilter::kReverse_MapDirection);
-    return &input_bounds;
-  }
-
-  sk_sp<SkImageFilter> skia_object() const override { return sk_filter_; }
-
-  virtual ~DlUnknownImageFilter() = default;
-
- protected:
-  bool equals_(const DlImageFilter& other) const override {
-    FML_DCHECK(other.type() == DlImageFilterType::kUnknown);
-    auto that = static_cast<DlUnknownImageFilter const*>(&other);
-    return sk_filter_ == that->sk_filter_;
-  }
-
- private:
-  sk_sp<SkImageFilter> sk_filter_;
-};
-
 }  // namespace flutter
 
-#endif  // FLUTTER_DISPLAY_LIST_DISPLAY_LIST_IMAGE_FILTER_H_
+#endif  // FLUTTER_DISPLAY_LIST_EFFECTS_DL_IMAGE_FILTER_H_
diff --git a/display_list/display_list_image_filter_unittests.cc b/display_list/effects/dl_image_filter_unittests.cc
similarity index 75%
rename from display_list/display_list_image_filter_unittests.cc
rename to display_list/effects/dl_image_filter_unittests.cc
index 95807c061666b36840a3a3213b7dfea26bb93811..70925455aa999fa7bfc16d6ee79fa8130f5c1d7e 100644
--- a/display_list/display_list_image_filter_unittests.cc
+++ b/display_list/effects/dl_image_filter_unittests.cc
@@ -2,150 +2,24 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/display_list/display_list_attributes_testing.h"
-#include "flutter/display_list/display_list_blend_mode.h"
-#include "flutter/display_list/display_list_builder.h"
-#include "flutter/display_list/display_list_color.h"
-#include "flutter/display_list/display_list_color_filter.h"
-#include "flutter/display_list/display_list_comparable.h"
-#include "flutter/display_list/display_list_image_filter.h"
-#include "flutter/display_list/display_list_sampling_options.h"
-#include "flutter/display_list/display_list_tile_mode.h"
-#include "flutter/display_list/types.h"
+#include "flutter/display_list/dl_blend_mode.h"
+#include "flutter/display_list/dl_color.h"
+#include "flutter/display_list/dl_sampling_options.h"
+#include "flutter/display_list/dl_tile_mode.h"
+#include "flutter/display_list/effects/dl_color_filter.h"
+#include "flutter/display_list/effects/dl_image_filter.h"
+#include "flutter/display_list/testing/dl_test_equality.h"
+#include "flutter/display_list/utils/dl_comparable.h"
 #include "gtest/gtest.h"
 
+#include "third_party/skia/include/core/SkBlendMode.h"
+#include "third_party/skia/include/core/SkColorFilter.h"
+#include "third_party/skia/include/core/SkSamplingOptions.h"
+#include "third_party/skia/include/effects/SkImageFilters.h"
+
 namespace flutter {
 namespace testing {
 
-TEST(DisplayListImageFilter, BuilderSetGet) {
-  DlBlurImageFilter filter(5.0, 5.0, DlTileMode::kDecal);
-  DisplayListBuilder builder;
-
-  ASSERT_EQ(builder.getImageFilter(), nullptr);
-
-  builder.setImageFilter(&filter);
-  ASSERT_NE(builder.getImageFilter(), nullptr);
-  ASSERT_TRUE(
-      Equals(builder.getImageFilter(), static_cast<DlImageFilter*>(&filter)));
-
-  builder.setImageFilter(nullptr);
-  ASSERT_EQ(builder.getImageFilter(), nullptr);
-}
-
-TEST(DisplayListImageFilter, FromSkiaNullFilter) {
-  std::shared_ptr<DlImageFilter> filter = DlImageFilter::From(nullptr);
-
-  ASSERT_EQ(filter, nullptr);
-  ASSERT_EQ(filter.get(), nullptr);
-}
-
-TEST(DisplayListImageFilter, FromSkiaBlurImageFilter) {
-  sk_sp<SkImageFilter> sk_image_filter =
-      SkImageFilters::Blur(5.0, 5.0, SkTileMode::kRepeat, nullptr);
-  std::shared_ptr<DlImageFilter> filter = DlImageFilter::From(sk_image_filter);
-
-  ASSERT_EQ(filter->type(), DlImageFilterType::kUnknown);
-
-  // We cannot recapture the blur parameters from an SkBlurImageFilter
-  ASSERT_EQ(filter->asBlur(), nullptr);
-  ASSERT_EQ(filter->asDilate(), nullptr);
-  ASSERT_EQ(filter->asErode(), nullptr);
-  ASSERT_EQ(filter->asMatrix(), nullptr);
-  ASSERT_EQ(filter->asCompose(), nullptr);
-  ASSERT_EQ(filter->asColorFilter(), nullptr);
-}
-
-TEST(DisplayListImageFilter, FromSkiaDilateImageFilter) {
-  sk_sp<SkImageFilter> sk_image_filter =
-      SkImageFilters::Dilate(5.0, 5.0, nullptr);
-  std::shared_ptr<DlImageFilter> filter = DlImageFilter::From(sk_image_filter);
-
-  ASSERT_EQ(filter->type(), DlImageFilterType::kUnknown);
-
-  // We cannot recapture the dilate parameters from an SkDilateImageFilter
-  ASSERT_EQ(filter->asBlur(), nullptr);
-  ASSERT_EQ(filter->asDilate(), nullptr);
-  ASSERT_EQ(filter->asErode(), nullptr);
-  ASSERT_EQ(filter->asMatrix(), nullptr);
-  ASSERT_EQ(filter->asCompose(), nullptr);
-  ASSERT_EQ(filter->asColorFilter(), nullptr);
-}
-
-TEST(DisplayListImageFilter, FromSkiaErodeImageFilter) {
-  sk_sp<SkImageFilter> sk_image_filter =
-      SkImageFilters::Erode(5.0, 5.0, nullptr);
-  std::shared_ptr<DlImageFilter> filter = DlImageFilter::From(sk_image_filter);
-
-  ASSERT_EQ(filter->type(), DlImageFilterType::kUnknown);
-
-  // We cannot recapture the erode parameters from an SkErodeImageFilter
-  ASSERT_EQ(filter->asBlur(), nullptr);
-  ASSERT_EQ(filter->asDilate(), nullptr);
-  ASSERT_EQ(filter->asErode(), nullptr);
-  ASSERT_EQ(filter->asMatrix(), nullptr);
-  ASSERT_EQ(filter->asCompose(), nullptr);
-  ASSERT_EQ(filter->asColorFilter(), nullptr);
-}
-
-TEST(DisplayListImageFilter, FromSkiaMatrixImageFilter) {
-  sk_sp<SkImageFilter> sk_image_filter = SkImageFilters::MatrixTransform(
-      SkMatrix::RotateDeg(45), ToSk(DlImageSampling::kLinear), nullptr);
-  std::shared_ptr<DlImageFilter> filter = DlImageFilter::From(sk_image_filter);
-
-  ASSERT_EQ(filter->type(), DlImageFilterType::kUnknown);
-
-  // We cannot recapture the blur parameters from an SkMatrixImageFilter
-  ASSERT_EQ(filter->asBlur(), nullptr);
-  ASSERT_EQ(filter->asDilate(), nullptr);
-  ASSERT_EQ(filter->asErode(), nullptr);
-  ASSERT_EQ(filter->asMatrix(), nullptr);
-  ASSERT_EQ(filter->asCompose(), nullptr);
-  ASSERT_EQ(filter->asColorFilter(), nullptr);
-}
-
-TEST(DisplayListImageFilter, FromSkiaComposeImageFilter) {
-  sk_sp<SkImageFilter> sk_blur_filter =
-      SkImageFilters::Blur(5.0, 5.0, SkTileMode::kRepeat, nullptr);
-  sk_sp<SkImageFilter> sk_matrix_filter = SkImageFilters::MatrixTransform(
-      SkMatrix::RotateDeg(45), ToSk(DlImageSampling::kLinear), nullptr);
-  sk_sp<SkImageFilter> sk_image_filter =
-      SkImageFilters::Compose(sk_blur_filter, sk_matrix_filter);
-  std::shared_ptr<DlImageFilter> filter = DlImageFilter::From(sk_image_filter);
-
-  ASSERT_EQ(filter->type(), DlImageFilterType::kUnknown);
-
-  // We cannot recapture the blur parameters from an SkComposeImageFilter
-  ASSERT_EQ(filter->asBlur(), nullptr);
-  ASSERT_EQ(filter->asDilate(), nullptr);
-  ASSERT_EQ(filter->asErode(), nullptr);
-  ASSERT_EQ(filter->asMatrix(), nullptr);
-  ASSERT_EQ(filter->asCompose(), nullptr);
-  ASSERT_EQ(filter->asColorFilter(), nullptr);
-}
-
-TEST(DisplayListImageFilter, FromSkiaColorFilterImageFilter) {
-  sk_sp<SkColorFilter> sk_color_filter =
-      SkColorFilters::Blend(SK_ColorRED, SkBlendMode::kSrcIn);
-  sk_sp<SkImageFilter> sk_image_filter =
-      SkImageFilters::ColorFilter(sk_color_filter, nullptr);
-  std::shared_ptr<DlImageFilter> filter = DlImageFilter::From(sk_image_filter);
-  DlBlendColorFilter dl_color_filter(DlColor::kRed(), DlBlendMode::kSrcIn);
-  DlColorFilterImageFilter dl_image_filter(dl_color_filter.shared());
-
-  ASSERT_EQ(filter->type(), DlImageFilterType::kColorFilter);
-
-  ASSERT_TRUE(*filter->asColorFilter() == dl_image_filter);
-  ASSERT_EQ(*filter.get(), dl_image_filter);
-  ASSERT_EQ(*filter->asColorFilter()->color_filter(), dl_color_filter);
-
-  ASSERT_EQ(filter->asBlur(), nullptr);
-  ASSERT_EQ(filter->asDilate(), nullptr);
-  ASSERT_EQ(filter->asErode(), nullptr);
-  ASSERT_EQ(filter->asMatrix(), nullptr);
-  ASSERT_EQ(filter->asCompose(), nullptr);
-  ASSERT_NE(filter->asColorFilter(), nullptr);
-}
-
 // SkRect::contains treats the rect as a half-open interval which is
 // appropriate for so many operations. Unfortunately, we are using
 // it here to test containment of the corners of a transformed quad
@@ -308,6 +182,15 @@ TEST(DisplayListImageFilter, BlurEquals) {
   TestEquals(filter1, filter2);
 }
 
+TEST(DisplayListImageFilter, BlurWithLocalMatrixEquals) {
+  DlBlurImageFilter filter1(5.0, 6.0, DlTileMode::kMirror);
+  DlBlurImageFilter filter2(5.0, 6.0, DlTileMode::kMirror);
+
+  SkMatrix local_matrix = SkMatrix::Translate(10, 10);
+  TestEquals(*filter1.makeWithLocalMatrix(local_matrix),
+             *filter2.makeWithLocalMatrix(local_matrix));
+}
+
 TEST(DisplayListImageFilter, BlurNotEquals) {
   DlBlurImageFilter filter1(5.0, 6.0, DlTileMode::kMirror);
   DlBlurImageFilter filter2(7.0, 6.0, DlTileMode::kMirror);
@@ -326,6 +209,23 @@ TEST(DisplayListImageFilter, BlurBounds) {
   TestBounds(filter, input_bounds, expected_output_bounds);
 }
 
+TEST(DisplayListImageFilter, BlurZeroSigma) {
+  std::shared_ptr<DlImageFilter> filter =
+      DlBlurImageFilter::Make(0, 0, DlTileMode::kMirror);
+  ASSERT_EQ(filter, nullptr);
+  filter = DlBlurImageFilter::Make(3, SK_ScalarNaN, DlTileMode::kMirror);
+  ASSERT_EQ(filter, nullptr);
+  filter = DlBlurImageFilter::Make(SK_ScalarNaN, 3, DlTileMode::kMirror);
+  ASSERT_EQ(filter, nullptr);
+  filter =
+      DlBlurImageFilter::Make(SK_ScalarNaN, SK_ScalarNaN, DlTileMode::kMirror);
+  ASSERT_EQ(filter, nullptr);
+  filter = DlBlurImageFilter::Make(3, 0, DlTileMode::kMirror);
+  ASSERT_NE(filter, nullptr);
+  filter = DlBlurImageFilter::Make(0, 3, DlTileMode::kMirror);
+  ASSERT_NE(filter, nullptr);
+}
+
 TEST(DisplayListImageFilter, DilateConstructor) {
   DlDilateImageFilter filter(5.0, 6.0);
 }
@@ -358,6 +258,15 @@ TEST(DisplayListImageFilter, DilateEquals) {
   TestEquals(filter1, filter2);
 }
 
+TEST(DisplayListImageFilter, DilateWithLocalMatrixEquals) {
+  DlDilateImageFilter filter1(5.0, 6.0);
+  DlDilateImageFilter filter2(5.0, 6.0);
+
+  SkMatrix local_matrix = SkMatrix::Translate(10, 10);
+  TestEquals(*filter1.makeWithLocalMatrix(local_matrix),
+             *filter2.makeWithLocalMatrix(local_matrix));
+}
+
 TEST(DisplayListImageFilter, DilateNotEquals) {
   DlDilateImageFilter filter1(5.0, 6.0);
   DlDilateImageFilter filter2(7.0, 6.0);
@@ -406,6 +315,15 @@ TEST(DisplayListImageFilter, ErodeEquals) {
   TestEquals(filter1, filter2);
 }
 
+TEST(DisplayListImageFilter, ErodeWithLocalMatrixEquals) {
+  DlErodeImageFilter filter1(5.0, 6.0);
+  DlErodeImageFilter filter2(5.0, 6.0);
+
+  SkMatrix local_matrix = SkMatrix::Translate(10, 10);
+  TestEquals(*filter1.makeWithLocalMatrix(local_matrix),
+             *filter2.makeWithLocalMatrix(local_matrix));
+}
+
 TEST(DisplayListImageFilter, ErodeNotEquals) {
   DlErodeImageFilter filter1(5.0, 6.0);
   DlErodeImageFilter filter2(7.0, 6.0);
@@ -469,6 +387,18 @@ TEST(DisplayListImageFilter, MatrixEquals) {
   TestEquals(filter1, filter2);
 }
 
+TEST(DisplayListImageFilter, MatrixWithLocalMatrixEquals) {
+  SkMatrix matrix = SkMatrix::MakeAll(2.0, 0.0, 10,  //
+                                      0.5, 3.0, 15,  //
+                                      0.0, 0.0, 1);
+  DlMatrixImageFilter filter1(matrix, DlImageSampling::kLinear);
+  DlMatrixImageFilter filter2(matrix, DlImageSampling::kLinear);
+
+  SkMatrix local_matrix = SkMatrix::Translate(10, 10);
+  TestEquals(*filter1.makeWithLocalMatrix(local_matrix),
+             *filter2.makeWithLocalMatrix(local_matrix));
+}
+
 TEST(DisplayListImageFilter, MatrixNotEquals) {
   SkMatrix matrix1 = SkMatrix::MakeAll(2.0, 0.0, 10,  //
                                        0.5, 3.0, 15,  //
@@ -564,6 +494,26 @@ TEST(DisplayListImageFilter, ComposeEquals) {
   TestEquals(filter1, filter2);
 }
 
+TEST(DisplayListImageFilter, ComposeWithLocalMatrixEquals) {
+  DlMatrixImageFilter outer1(SkMatrix::MakeAll(2.0, 0.0, 10,  //
+                                               0.5, 3.0, 15,  //
+                                               0.0, 0.0, 1),
+                             DlImageSampling::kLinear);
+  DlBlurImageFilter inner1(5.0, 6.0, DlTileMode::kMirror);
+  DlComposeImageFilter filter1(outer1, inner1);
+
+  DlMatrixImageFilter outer2(SkMatrix::MakeAll(2.0, 0.0, 10,  //
+                                               0.5, 3.0, 15,  //
+                                               0.0, 0.0, 1),
+                             DlImageSampling::kLinear);
+  DlBlurImageFilter inner2(5.0, 6.0, DlTileMode::kMirror);
+  DlComposeImageFilter filter2(outer1, inner1);
+
+  SkMatrix local_matrix = SkMatrix::Translate(10, 10);
+  TestEquals(*filter1.makeWithLocalMatrix(local_matrix),
+             *filter2.makeWithLocalMatrix(local_matrix));
+}
+
 TEST(DisplayListImageFilter, ComposeNotEquals) {
   DlMatrixImageFilter outer1(SkMatrix::MakeAll(2.0, 0.0, 10,  //
                                                0.5, 3.0, 15,  //
@@ -655,26 +605,18 @@ TEST(DisplayListImageFilter, ComposeBoundsWithUnboundedInnerAndOuter) {
 // See https://github.com/flutter/flutter/issues/108433
 TEST(DisplayListImageFilter, Issue108433) {
   auto input_bounds = SkIRect::MakeLTRB(20, 20, 80, 80);
-
-  auto sk_filter = SkColorFilters::Blend(SK_ColorRED, SkBlendMode::kSrcOver);
-  auto sk_outer = SkImageFilters::Blur(5.0, 6.0, SkTileMode::kRepeat, nullptr);
-  auto sk_inner = SkImageFilters::ColorFilter(sk_filter, nullptr);
-  auto sk_compose = SkImageFilters::Compose(sk_outer, sk_inner);
+  auto expected_bounds = SkIRect::MakeLTRB(5, 2, 95, 98);
 
   DlBlendColorFilter dl_color_filter(DlColor::kRed(), DlBlendMode::kSrcOver);
   auto dl_outer = DlBlurImageFilter(5.0, 6.0, DlTileMode::kRepeat);
   auto dl_inner = DlColorFilterImageFilter(dl_color_filter.shared());
   auto dl_compose = DlComposeImageFilter(dl_outer, dl_inner);
 
-  auto sk_bounds = sk_compose->filterBounds(
-      input_bounds, SkMatrix::I(),
-      SkImageFilter::MapDirection::kForward_MapDirection);
-
   SkIRect dl_bounds;
-  EXPECT_EQ(
+  ASSERT_EQ(
       dl_compose.map_device_bounds(input_bounds, SkMatrix::I(), dl_bounds),
       nullptr);
-  ASSERT_EQ(dl_bounds, sk_bounds);
+  ASSERT_EQ(dl_bounds, expected_bounds);
 }
 
 TEST(DisplayListImageFilter, ColorFilterConstructor) {
@@ -714,6 +656,18 @@ TEST(DisplayListImageFilter, ColorFilterEquals) {
   TestEquals(filter1, filter2);
 }
 
+TEST(DisplayListImageFilter, ColorFilterWithLocalMatrixEquals) {
+  DlBlendColorFilter dl_color_filter1(DlColor::kRed(), DlBlendMode::kLighten);
+  DlColorFilterImageFilter filter1(dl_color_filter1);
+
+  DlBlendColorFilter dl_color_filter2(DlColor::kRed(), DlBlendMode::kLighten);
+  DlColorFilterImageFilter filter2(dl_color_filter2);
+
+  SkMatrix local_matrix = SkMatrix::Translate(10, 10);
+  TestEquals(*filter1.makeWithLocalMatrix(local_matrix),
+             *filter2.makeWithLocalMatrix(local_matrix));
+}
+
 TEST(DisplayListImageFilter, ColorFilterNotEquals) {
   DlBlendColorFilter dl_color_filter1(DlColor::kRed(), DlBlendMode::kLighten);
   DlColorFilterImageFilter filter1(dl_color_filter1);
@@ -742,28 +696,6 @@ TEST(DisplayListImageFilter, ColorFilterModifiesTransparencyBounds) {
   TestInvalidBounds(filter, SkMatrix::I(), input_bounds);
 }
 
-TEST(DisplayListImageFilter, UnknownConstructor) {
-  DlUnknownImageFilter filter(
-      SkImageFilters::Blur(5.0, 6.0, SkTileMode::kRepeat, nullptr));
-}
-
-TEST(DisplayListImageFilter, UnknownShared) {
-  DlUnknownImageFilter filter(
-      SkImageFilters::Blur(5.0, 6.0, SkTileMode::kRepeat, nullptr));
-
-  ASSERT_NE(filter.shared().get(), &filter);
-  ASSERT_EQ(*filter.shared(), filter);
-}
-
-TEST(DisplayListImageFilter, UnknownContents) {
-  sk_sp<SkImageFilter> sk_filter =
-      SkImageFilters::Blur(5.0, 6.0, SkTileMode::kRepeat, nullptr);
-  DlUnknownImageFilter filter(sk_filter);
-
-  ASSERT_EQ(filter.skia_object(), sk_filter);
-  ASSERT_EQ(filter.skia_object().get(), sk_filter.get());
-}
-
 TEST(DisplayListImageFilter, LocalImageFilterBounds) {
   auto filter_matrix = SkMatrix::MakeAll(2.0, 0.0, 10,  //
                                          0.5, 3.0, 15,  //
@@ -773,8 +705,8 @@ TEST(DisplayListImageFilter, LocalImageFilterBounds) {
       SkImageFilters::ColorFilter(
           SkColorFilters::Blend(SK_ColorRED, SkBlendMode::kSrcOver), nullptr),
       SkImageFilters::Dilate(5.0, 10.0, nullptr),
-      SkImageFilters::MatrixTransform(filter_matrix,
-                                      ToSk(DlImageSampling::kLinear), nullptr),
+      SkImageFilters::MatrixTransform(
+          filter_matrix, SkSamplingOptions(SkFilterMode::kLinear), nullptr),
       SkImageFilters::Compose(
           SkImageFilters::Blur(5.0, 6.0, SkTileMode::kRepeat, nullptr),
           SkImageFilters::ColorFilter(
@@ -802,9 +734,42 @@ TEST(DisplayListImageFilter, LocalImageFilterBounds) {
   std::vector<SkMatrix> bounds_matrices{SkMatrix::Translate(5.0, 10.0),
                                         SkMatrix::Scale(2.0, 2.0)};
 
+  for (unsigned j = 0; j < matrices.size(); j++) {
+    DlLocalMatrixImageFilter filter(matrices[j], nullptr);
+    {
+      const auto input_bounds = SkRect::MakeLTRB(20, 20, 80, 80);
+      SkRect output_bounds;
+      EXPECT_EQ(filter.map_local_bounds(input_bounds, output_bounds),
+                &output_bounds);
+      EXPECT_EQ(input_bounds, output_bounds);
+    }
+    for (unsigned k = 0; k < bounds_matrices.size(); k++) {
+      auto& bounds_matrix = bounds_matrices[k];
+      {
+        const auto input_bounds = SkIRect::MakeLTRB(20, 20, 80, 80);
+        SkIRect output_bounds;
+        EXPECT_EQ(filter.map_device_bounds(input_bounds, bounds_matrix,
+                                           output_bounds),
+                  &output_bounds);
+        EXPECT_EQ(input_bounds, output_bounds);
+      }
+      {
+        const auto output_bounds = SkIRect::MakeLTRB(20, 20, 80, 80);
+        SkIRect input_bounds;
+        EXPECT_EQ(filter.get_input_device_bounds(output_bounds, bounds_matrix,
+                                                 input_bounds),
+                  &input_bounds);
+        EXPECT_EQ(input_bounds, output_bounds);
+      }
+    }
+  }
+
   for (unsigned i = 0; i < sk_filters.size(); i++) {
     for (unsigned j = 0; j < matrices.size(); j++) {
       for (unsigned k = 0; k < bounds_matrices.size(); k++) {
+        auto desc = "filter " + std::to_string(i + 1)             //
+                    + ", filter matrix " + std::to_string(j + 1)  //
+                    + ", bounds matrix " + std::to_string(k + 1);
         auto& m = matrices[j];
         auto& bounds_matrix = bounds_matrices[k];
         auto sk_local_filter = sk_filters[i]->makeWithLocalMatrix(m);
@@ -814,7 +779,7 @@ TEST(DisplayListImageFilter, LocalImageFilterBounds) {
           // their behavior. Once the Skia fixes are rolled in, the
           // DlImageFilter should adapt  to the new rules.
           // See https://github.com/flutter/flutter/issues/114723
-          ASSERT_TRUE(sk_local_filter || !dl_local_filter);
+          ASSERT_TRUE(sk_local_filter || !dl_local_filter) << desc;
           continue;
         }
         {
@@ -823,9 +788,13 @@ TEST(DisplayListImageFilter, LocalImageFilterBounds) {
           sk_rect = sk_local_filter->filterBounds(
               input_bounds, bounds_matrix,
               SkImageFilter::MapDirection::kForward_MapDirection);
-          dl_local_filter->map_device_bounds(input_bounds, bounds_matrix,
-                                             dl_rect);
-          ASSERT_EQ(sk_rect, dl_rect);
+          if (dl_local_filter->map_device_bounds(input_bounds, bounds_matrix,
+                                                 dl_rect)) {
+            ASSERT_EQ(sk_rect, dl_rect) << desc;
+          } else {
+            ASSERT_TRUE(dl_local_filter->modifies_transparent_black()) << desc;
+            ASSERT_FALSE(sk_local_filter->canComputeFastBounds()) << desc;
+          }
         }
         {
           // Test for: Know the outset bounds to get the inset bounds
@@ -841,46 +810,18 @@ TEST(DisplayListImageFilter, LocalImageFilterBounds) {
           sk_rect = sk_local_filter->filterBounds(
               outset_bounds, bounds_matrix,
               SkImageFilter::MapDirection::kReverse_MapDirection);
-          dl_local_filter->get_input_device_bounds(outset_bounds, bounds_matrix,
-                                                   dl_rect);
-          ASSERT_EQ(sk_rect, dl_rect);
+          if (dl_local_filter->get_input_device_bounds(
+                  outset_bounds, bounds_matrix, dl_rect)) {
+            ASSERT_EQ(sk_rect, dl_rect) << desc;
+          } else {
+            ASSERT_TRUE(dl_local_filter->modifies_transparent_black());
+            ASSERT_FALSE(sk_local_filter->canComputeFastBounds());
+          }
         }
       }
     }
   }
 }
 
-TEST(DisplayListImageFilter, LocalImageSkiaNull) {
-  auto blur_filter =
-      std::make_shared<DlBlurImageFilter>(0, 0, DlTileMode::kClamp);
-  DlLocalMatrixImageFilter dl_local_matrix_filter(SkMatrix::RotateDeg(45),
-                                                  blur_filter);
-  // With sigmas set to zero on the blur filter, Skia will return a null filter.
-  // The local matrix filter should return nullptr instead of crashing.
-  ASSERT_EQ(dl_local_matrix_filter.skia_object(), nullptr);
-}
-
-TEST(DisplayListImageFilter, UnknownEquals) {
-  sk_sp<SkImageFilter> sk_filter =
-      SkImageFilters::Blur(5.0, 6.0, SkTileMode::kRepeat, nullptr);
-
-  DlUnknownImageFilter filter1(sk_filter);
-  DlUnknownImageFilter filter2(sk_filter);
-
-  TestEquals(filter1, filter2);
-}
-
-TEST(DisplayListImageFilter, UnknownNotEquals) {
-  DlUnknownImageFilter filter1(
-      SkImageFilters::Blur(5.0, 6.0, SkTileMode::kRepeat, nullptr));
-  DlUnknownImageFilter filter2(
-      SkImageFilters::Blur(5.0, 6.0, SkTileMode::kRepeat, nullptr));
-
-  // Even though the filter is the same, it is a different instance
-  // and we cannot currently tell them apart because the Skia
-  // ImageFilter objects do not implement ==
-  TestNotEquals(filter1, filter2, "SkImageFilter instance differs");
-}
-
 }  // namespace testing
 }  // namespace flutter
diff --git a/display_list/effects/dl_mask_filter.cc b/display_list/effects/dl_mask_filter.cc
new file mode 100644
index 0000000000000000000000000000000000000000..554fafedcd0c288b42bcf4f4cb4a2806f10f04b4
--- /dev/null
+++ b/display_list/effects/dl_mask_filter.cc
@@ -0,0 +1,11 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/display_list/effects/dl_mask_filter.h"
+
+namespace flutter {
+
+// Just exists to ensure that the header can be cleanly imported.
+
+}  // namespace flutter
diff --git a/display_list/display_list_mask_filter.h b/display_list/effects/dl_mask_filter.h
similarity index 38%
rename from display_list/display_list_mask_filter.h
rename to display_list/effects/dl_mask_filter.h
index 336d7c58e74fd56e72107837b6283e425c2945e8..d39839565ad2e486ca78d0c5a7a977e19c7ee4e1 100644
--- a/display_list/display_list_mask_filter.h
+++ b/display_list/effects/dl_mask_filter.h
@@ -2,13 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_MASK_FILTER_H_
-#define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_MASK_FILTER_H_
+#ifndef FLUTTER_DISPLAY_LIST_EFFECTS_DL_MASK_FILTER_H_
+#define FLUTTER_DISPLAY_LIST_EFFECTS_DL_MASK_FILTER_H_
 
-#include "flutter/display_list/display_list_attributes.h"
-#include "flutter/display_list/types.h"
+#include "flutter/display_list/dl_attributes.h"
 #include "flutter/fml/logging.h"
 
+#include "third_party/skia/include/core/SkScalar.h"
+
 namespace flutter {
 
 class DlBlurMaskFilter;
@@ -17,35 +18,18 @@ class DlBlurMaskFilter;
 // facilities and adheres to the design goals of the |DlAttribute| base
 // class.
 
-// An enumerated type for the recognized MaskFilter operations.
-// If a custom MaskFilter outside of the recognized types is needed
-// then a |kUnknown| type that simply defers to an SkMaskFilter is
-// provided as a fallback.
-enum class DlMaskFilterType { kBlur, kUnknown };
+// An enumerated type for the supported MaskFilter operations.
+enum class DlMaskFilterType { kBlur };
 
-class DlMaskFilter
-    : public DlAttribute<DlMaskFilter, SkMaskFilter, DlMaskFilterType> {
- public:
-  // Return a shared_ptr holding a DlMaskFilter representing the indicated
-  // Skia SkMaskFilter pointer.
-  //
-  // Since there is no public SkBlurMaskFilter and since the SkMaskFilter
-  // class provides no |asABlur| style type inference method, we cannot
-  // infer any specific data from the SkMaskFilter. As a result, the return
-  // value in this case will always be nullptr or DlUnknownMaskFilter.
-  static std::shared_ptr<DlMaskFilter> From(SkMaskFilter* sk_filter);
-
-  // Return a shared_ptr holding a DlMaskFilter representing the indicated
-  // Skia SkMaskFilter pointer.
-  //
-  // Since there is no public SkBlurMaskFilter and since the SkMaskFilter
-  // class provides no |asABlur| style type inference methods, we cannot
-  // infer any specific data from the SkMaskFilter. As a result, the return
-  // value in this case will always be nullptr or DlUnknownMaskFilter.
-  static std::shared_ptr<DlMaskFilter> From(sk_sp<SkMaskFilter> sk_filter) {
-    return From(sk_filter.get());
-  }
+enum class DlBlurStyle {
+  kNormal,  //!< fuzzy inside and outside
+  kSolid,   //!< solid inside, fuzzy outside
+  kOuter,   //!< nothing inside, fuzzy outside
+  kInner,   //!< fuzzy inside, nothing outside
+};
 
+class DlMaskFilter : public DlAttribute<DlMaskFilter, DlMaskFilterType> {
+ public:
   // Return a DlBlurMaskFilter pointer to this object iff it is a Blur
   // type of MaskFilter, otherwise return nullptr.
   virtual const DlBlurMaskFilter* asBlur() const { return nullptr; }
@@ -58,14 +42,23 @@ class DlMaskFilter
 // filter is then used to combine those colors.
 class DlBlurMaskFilter final : public DlMaskFilter {
  public:
-  DlBlurMaskFilter(SkBlurStyle style, SkScalar sigma, bool respect_ctm = true)
+  DlBlurMaskFilter(DlBlurStyle style, SkScalar sigma, bool respect_ctm = true)
       : style_(style), sigma_(sigma), respect_ctm_(respect_ctm) {}
   DlBlurMaskFilter(const DlBlurMaskFilter& filter)
       : DlBlurMaskFilter(filter.style_, filter.sigma_, filter.respect_ctm_) {}
-  DlBlurMaskFilter(const DlBlurMaskFilter* filter)
+  explicit DlBlurMaskFilter(const DlBlurMaskFilter* filter)
       : DlBlurMaskFilter(filter->style_, filter->sigma_, filter->respect_ctm_) {
   }
 
+  static std::shared_ptr<DlMaskFilter> Make(DlBlurStyle style,
+                                            SkScalar sigma,
+                                            bool respect_ctm = true) {
+    if (SkScalarIsFinite(sigma) && sigma > 0) {
+      return std::make_shared<DlBlurMaskFilter>(style, sigma, respect_ctm);
+    }
+    return nullptr;
+  }
+
   DlMaskFilterType type() const override { return DlMaskFilterType::kBlur; }
   size_t size() const override { return sizeof(*this); }
 
@@ -73,13 +66,9 @@ class DlBlurMaskFilter final : public DlMaskFilter {
     return std::make_shared<DlBlurMaskFilter>(this);
   }
 
-  sk_sp<SkMaskFilter> skia_object() const override {
-    return SkMaskFilter::MakeBlur(style_, sigma_, respect_ctm_);
-  }
-
   const DlBlurMaskFilter* asBlur() const override { return this; }
 
-  SkBlurStyle style() const { return style_; }
+  DlBlurStyle style() const { return style_; }
   SkScalar sigma() const { return sigma_; }
   bool respectCTM() const { return respect_ctm_; }
 
@@ -92,51 +81,13 @@ class DlBlurMaskFilter final : public DlMaskFilter {
   }
 
  private:
-  SkBlurStyle style_;
+  DlBlurStyle style_;
   SkScalar sigma_;
   // Added for backward compatibility with Flutter text shadow rendering which
   // uses Skia blur filters with this flag set to false.
   bool respect_ctm_;
 };
 
-// A wrapper class for a Skia MaskFilter of unknown type. The above 4 types
-// are the only types that can be constructed by Flutter using the
-// ui.MaskFilter class so this class should be rarely used. The main use
-// would come from the |DisplayListCanvasRecorder| recording Skia rendering
-// calls that originated outside of the Flutter dart code. This would
-// primarily happen in the Paragraph code that renders the text using the
-// SkCanvas interface which we capture into DisplayList data structures.
-class DlUnknownMaskFilter final : public DlMaskFilter {
- public:
-  DlUnknownMaskFilter(sk_sp<SkMaskFilter> sk_filter)
-      : sk_filter_(std::move(sk_filter)) {}
-  DlUnknownMaskFilter(const DlUnknownMaskFilter& filter)
-      : DlUnknownMaskFilter(filter.sk_filter_) {}
-  DlUnknownMaskFilter(const DlUnknownMaskFilter* filter)
-      : DlUnknownMaskFilter(filter->sk_filter_) {}
-
-  DlMaskFilterType type() const override { return DlMaskFilterType::kUnknown; }
-  size_t size() const override { return sizeof(*this); }
-
-  std::shared_ptr<DlMaskFilter> shared() const override {
-    return std::make_shared<DlUnknownMaskFilter>(this);
-  }
-
-  sk_sp<SkMaskFilter> skia_object() const override { return sk_filter_; }
-
-  virtual ~DlUnknownMaskFilter() = default;
-
- protected:
-  bool equals_(const DlMaskFilter& other) const override {
-    FML_DCHECK(other.type() == DlMaskFilterType::kUnknown);
-    auto that = static_cast<DlUnknownMaskFilter const&>(other);
-    return sk_filter_ == that.sk_filter_;
-  }
-
- private:
-  sk_sp<SkMaskFilter> sk_filter_;
-};
-
 }  // namespace flutter
 
-#endif  // FLUTTER_DISPLAY_LIST_DISPLAY_LIST_MASK_FILTER_H_
+#endif  // FLUTTER_DISPLAY_LIST_EFFECTS_DL_MASK_FILTER_H_
diff --git a/display_list/display_list_mask_filter_unittests.cc b/display_list/effects/dl_mask_filter_unittests.cc
similarity index 53%
rename from display_list/display_list_mask_filter_unittests.cc
rename to display_list/effects/dl_mask_filter_unittests.cc
index 5a46856e22cf7785a6b359f32684f745fd82b22d..9c23cffeecb1450e43d96c5d3c2ca1f7b8667784 100644
--- a/display_list/display_list_mask_filter_unittests.cc
+++ b/display_list/effects/dl_mask_filter_unittests.cc
@@ -2,119 +2,50 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/display_list/display_list_attributes_testing.h"
-#include "flutter/display_list/display_list_builder.h"
-#include "flutter/display_list/display_list_comparable.h"
-#include "flutter/display_list/display_list_mask_filter.h"
-#include "flutter/display_list/types.h"
+#include "flutter/display_list/effects/dl_mask_filter.h"
+#include "flutter/display_list/testing/dl_test_equality.h"
+#include "flutter/display_list/utils/dl_comparable.h"
 #include "gtest/gtest.h"
 
 namespace flutter {
 namespace testing {
 
-TEST(DisplayListMaskFilter, BuilderSetGet) {
-  DlBlurMaskFilter filter(SkBlurStyle::kNormal_SkBlurStyle, 5.0);
-  DisplayListBuilder builder;
-  ASSERT_EQ(builder.getMaskFilter(), nullptr);
-  builder.setMaskFilter(&filter);
-  ASSERT_NE(builder.getMaskFilter(), nullptr);
-  ASSERT_TRUE(
-      Equals(builder.getMaskFilter(), static_cast<DlMaskFilter*>(&filter)));
-  builder.setMaskFilter(nullptr);
-  ASSERT_EQ(builder.getMaskFilter(), nullptr);
-}
-
-TEST(DisplayListMaskFilter, FromSkiaNullFilter) {
-  std::shared_ptr<DlMaskFilter> filter = DlMaskFilter::From(nullptr);
-  ASSERT_EQ(filter, nullptr);
-  ASSERT_EQ(filter.get(), nullptr);
-}
-
-TEST(DisplayListMaskFilter, FromSkiaBlurFilter) {
-  sk_sp<SkMaskFilter> sk_filter =
-      SkMaskFilter::MakeBlur(SkBlurStyle::kNormal_SkBlurStyle, 5.0);
-  std::shared_ptr<DlMaskFilter> filter = DlMaskFilter::From(sk_filter);
-  ASSERT_EQ(filter->type(), DlMaskFilterType::kUnknown);
-  // We cannot recapture the blur parameters from an SkBlurMaskFilter
-  ASSERT_EQ(filter->asBlur(), nullptr);
-  ASSERT_EQ(filter->skia_object(), sk_filter);
-}
-
 TEST(DisplayListMaskFilter, BlurConstructor) {
-  DlBlurMaskFilter filter(SkBlurStyle::kNormal_SkBlurStyle, 5.0);
+  DlBlurMaskFilter filter(DlBlurStyle::kNormal, 5.0);
 }
 
 TEST(DisplayListMaskFilter, BlurShared) {
-  DlBlurMaskFilter filter(SkBlurStyle::kNormal_SkBlurStyle, 5.0);
+  DlBlurMaskFilter filter(DlBlurStyle::kNormal, 5.0);
   ASSERT_NE(filter.shared().get(), &filter);
   ASSERT_EQ(*filter.shared(), filter);
 }
 
 TEST(DisplayListMaskFilter, BlurAsBlur) {
-  DlBlurMaskFilter filter(SkBlurStyle::kNormal_SkBlurStyle, 5.0);
+  DlBlurMaskFilter filter(DlBlurStyle::kNormal, 5.0);
   ASSERT_NE(filter.asBlur(), nullptr);
   ASSERT_EQ(filter.asBlur(), &filter);
 }
 
 TEST(DisplayListMaskFilter, BlurContents) {
-  DlBlurMaskFilter filter(SkBlurStyle::kNormal_SkBlurStyle, 5.0);
-  ASSERT_EQ(filter.style(), SkBlurStyle::kNormal_SkBlurStyle);
+  DlBlurMaskFilter filter(DlBlurStyle::kNormal, 5.0);
+  ASSERT_EQ(filter.style(), DlBlurStyle::kNormal);
   ASSERT_EQ(filter.sigma(), 5.0);
 }
 
 TEST(DisplayListMaskFilter, BlurEquals) {
-  DlBlurMaskFilter filter1(SkBlurStyle::kNormal_SkBlurStyle, 5.0);
-  DlBlurMaskFilter filter2(SkBlurStyle::kNormal_SkBlurStyle, 5.0);
+  DlBlurMaskFilter filter1(DlBlurStyle::kNormal, 5.0);
+  DlBlurMaskFilter filter2(DlBlurStyle::kNormal, 5.0);
   TestEquals(filter1, filter2);
 }
 
 TEST(DisplayListMaskFilter, BlurNotEquals) {
-  DlBlurMaskFilter filter1(SkBlurStyle::kNormal_SkBlurStyle, 5.0);
-  DlBlurMaskFilter filter2(SkBlurStyle::kInner_SkBlurStyle, 5.0);
-  DlBlurMaskFilter filter3(SkBlurStyle::kNormal_SkBlurStyle, 6.0);
+  DlBlurMaskFilter filter1(DlBlurStyle::kNormal, 5.0);
+  DlBlurMaskFilter filter2(DlBlurStyle::kInner, 5.0);
+  DlBlurMaskFilter filter3(DlBlurStyle::kNormal, 6.0);
   TestNotEquals(filter1, filter2, "Blur style differs");
   TestNotEquals(filter1, filter3, "blur radius differs");
 }
 
-TEST(DisplayListMaskFilter, UnknownConstructor) {
-  DlUnknownMaskFilter filter(
-      SkMaskFilter::MakeBlur(SkBlurStyle::kNormal_SkBlurStyle, 5.0));
-}
-
-TEST(DisplayListMaskFilter, UnknownShared) {
-  DlUnknownMaskFilter filter(
-      SkMaskFilter::MakeBlur(SkBlurStyle::kNormal_SkBlurStyle, 5.0));
-  ASSERT_NE(filter.shared().get(), &filter);
-  ASSERT_EQ(*filter.shared(), filter);
-}
-
-TEST(DisplayListMaskFilter, UnknownContents) {
-  sk_sp<SkMaskFilter> sk_filter =
-      SkMaskFilter::MakeBlur(SkBlurStyle::kNormal_SkBlurStyle, 5.0);
-  DlUnknownMaskFilter filter(sk_filter);
-  ASSERT_EQ(filter.skia_object(), sk_filter);
-  ASSERT_EQ(filter.skia_object().get(), sk_filter.get());
-}
-
-TEST(DisplayListMaskFilter, UnknownEquals) {
-  sk_sp<SkMaskFilter> sk_filter =
-      SkMaskFilter::MakeBlur(SkBlurStyle::kNormal_SkBlurStyle, 5.0);
-  DlUnknownMaskFilter filter1(sk_filter);
-  DlUnknownMaskFilter filter2(sk_filter);
-  TestEquals(filter1, filter2);
-}
-
-TEST(DisplayListMaskFilter, UnknownNotEquals) {
-  // Even though the filter is the same, it is a different instance
-  // and we cannot currently tell them apart because the Skia
-  // MaskFilter objects do not implement ==
-  DlUnknownMaskFilter filter1(
-      SkMaskFilter::MakeBlur(SkBlurStyle::kNormal_SkBlurStyle, 5.0));
-  DlUnknownMaskFilter filter2(
-      SkMaskFilter::MakeBlur(SkBlurStyle::kNormal_SkBlurStyle, 5.0));
-  TestNotEquals(filter1, filter2, "SkMaskFilter instance differs");
-}
-
 void testEquals(DlMaskFilter* a, DlMaskFilter* b) {
   // a and b have the same nullness or values
   ASSERT_TRUE(Equals(a, b));
@@ -167,9 +98,9 @@ void testNotEquals(const std::shared_ptr<const DlMaskFilter>& a,
 }
 
 TEST(DisplayListMaskFilter, ComparableTemplates) {
-  DlBlurMaskFilter filter1a(SkBlurStyle::kNormal_SkBlurStyle, 3.0);
-  DlBlurMaskFilter filter1b(SkBlurStyle::kNormal_SkBlurStyle, 3.0);
-  DlBlurMaskFilter filter2(SkBlurStyle::kNormal_SkBlurStyle, 5.0);
+  DlBlurMaskFilter filter1a(DlBlurStyle::kNormal, 3.0);
+  DlBlurMaskFilter filter1b(DlBlurStyle::kNormal, 3.0);
+  DlBlurMaskFilter filter2(DlBlurStyle::kNormal, 5.0);
   std::shared_ptr<DlMaskFilter> shared_null;
 
   // null to null
diff --git a/display_list/display_list_path_effect.cc b/display_list/effects/dl_path_effect.cc
similarity index 46%
rename from display_list/display_list_path_effect.cc
rename to display_list/effects/dl_path_effect.cc
index 72297464e4f15d3ef238cb46eecb44bafad716ad..658dd3b64dc7a3d0f9849847124164c0b81c9310 100644
--- a/display_list/display_list_path_effect.cc
+++ b/display_list/effects/dl_path_effect.cc
@@ -2,14 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/display_list/display_list_path_effect.h"
-
-#include <memory>
-#include <optional>
-#include <utility>
-
-#include "include/core/SkRefCnt.h"
-#include "include/core/SkScalar.h"
+#include "flutter/display_list/effects/dl_path_effect.h"
 
 namespace flutter {
 
@@ -22,26 +15,6 @@ static void DlPathEffectDeleter(void* p) {
   ::operator delete(p);
 }
 
-std::shared_ptr<DlPathEffect> DlPathEffect::From(SkPathEffect* sk_path_effect) {
-  if (sk_path_effect == nullptr) {
-    return nullptr;
-  }
-
-  SkPathEffect::DashInfo info;
-  if (SkPathEffect::DashType::kDash_DashType ==
-      sk_path_effect->asADash(&info)) {
-    auto dash_path_effect =
-        DlDashPathEffect::Make(nullptr, info.fCount, info.fPhase);
-    info.fIntervals =
-        reinterpret_cast<DlDashPathEffect*>(dash_path_effect.get())
-            ->intervals_unsafe();
-    sk_path_effect->asADash(&info);
-    return dash_path_effect;
-  }
-  // If not dash path effect, we will use UnknownPathEffect to wrap it.
-  return std::make_shared<DlUnknownPathEffect>(sk_ref_sp(sk_path_effect));
-}
-
 std::shared_ptr<DlPathEffect> DlDashPathEffect::Make(const SkScalar* intervals,
                                                      int count,
                                                      SkScalar phase) {
@@ -55,21 +28,8 @@ std::shared_ptr<DlPathEffect> DlDashPathEffect::Make(const SkScalar* intervals,
 }
 
 std::optional<SkRect> DlDashPathEffect::effect_bounds(SkRect& rect) const {
-  // SkDashPathEffect returns the original bounds as the bounds of the effect
-  // since the dashed path will always be a subset of the original.
+  // The dashed path will always be a subset of the original.
   return rect;
 }
 
-std::optional<SkRect> DlUnknownPathEffect::effect_bounds(SkRect& rect) const {
-  if (!rect.isSorted()) {
-    return std::nullopt;
-  }
-  SkPaint p;
-  p.setPathEffect(sk_path_effect_);
-  if (!p.canComputeFastBounds()) {
-    return std::nullopt;
-  }
-  return p.computeFastBounds(rect, &rect);
-}
-
 }  // namespace flutter
diff --git a/display_list/display_list_path_effect.h b/display_list/effects/dl_path_effect.h
similarity index 61%
rename from display_list/display_list_path_effect.h
rename to display_list/effects/dl_path_effect.h
index a6d2f02361df30bb01958ae912f22a122819ce8e..9c874fc203b3fd40c5cd389e11a091c3eebc53d6 100644
--- a/display_list/display_list_path_effect.h
+++ b/display_list/effects/dl_path_effect.h
@@ -2,15 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_PATH_EFFECT_H_
-#define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_PATH_EFFECT_H_
+#ifndef FLUTTER_DISPLAY_LIST_EFFECTS_DL_PATH_EFFECT_H_
+#define FLUTTER_DISPLAY_LIST_EFFECTS_DL_PATH_EFFECT_H_
 
-#include <cstring>
 #include <optional>
-#include "flutter/display_list/display_list_attributes.h"
-#include "flutter/display_list/types.h"
+
+#include "flutter/display_list/dl_attributes.h"
 #include "flutter/fml/logging.h"
-#include "include/core/SkScalar.h"
+#include "third_party/skia/include/core/SkRect.h"
 
 namespace flutter {
 
@@ -20,26 +19,13 @@ class DlDashPathEffect;
 // facilities and adheres to the design goals of the |DlAttribute| base
 // class.
 
-// An enumerated type for the recognized PathEffect operations.
-// In current Flutter we only use the DashPathEffect.
-// And another PathEffect outside of the recognized types is needed
-// then a |kUnknown| type that simply defers to an SkPathEffect is
-// provided as a fallback.
+// An enumerated type for the supported PathEffect operations.
 enum class DlPathEffectType {
   kDash,
-  kUnknown,
 };
 
-class DlPathEffect
-    : public DlAttribute<DlPathEffect, SkPathEffect, DlPathEffectType> {
+class DlPathEffect : public DlAttribute<DlPathEffect, DlPathEffectType> {
  public:
-  static std::shared_ptr<DlPathEffect> From(SkPathEffect* sk_path_effect);
-
-  static std::shared_ptr<DlPathEffect> From(
-      sk_sp<SkPathEffect> sk_path_effect) {
-    return From(sk_path_effect.get());
-  }
-
   virtual const DlDashPathEffect* asDash() const { return nullptr; }
 
   virtual std::optional<SkRect> effect_bounds(SkRect&) const = 0;
@@ -89,13 +75,11 @@ class DlDashPathEffect final : public DlPathEffect {
 
   const DlDashPathEffect* asDash() const override { return this; }
 
-  sk_sp<SkPathEffect> skia_object() const override {
-    return SkDashPathEffect::Make(intervals(), count_, phase_);
-  }
-
   const SkScalar* intervals() const {
     return reinterpret_cast<const SkScalar*>(this + 1);
   }
+  int count() const { return count_; }
+  SkScalar phase() const { return phase_; }
 
   std::optional<SkRect> effect_bounds(SkRect& rect) const override;
 
@@ -120,7 +104,7 @@ class DlDashPathEffect final : public DlPathEffect {
     }
   }
 
-  DlDashPathEffect(const DlDashPathEffect* dash_effect)
+  explicit DlDashPathEffect(const DlDashPathEffect* dash_effect)
       : DlDashPathEffect(dash_effect->intervals(),
                          dash_effect->count_,
                          dash_effect->phase_) {}
@@ -136,39 +120,6 @@ class DlDashPathEffect final : public DlPathEffect {
   FML_DISALLOW_COPY_ASSIGN_AND_MOVE(DlDashPathEffect);
 };
 
-class DlUnknownPathEffect final : public DlPathEffect {
- public:
-  DlUnknownPathEffect(sk_sp<SkPathEffect> effect)
-      : sk_path_effect_(std::move(effect)) {}
-  DlUnknownPathEffect(const DlUnknownPathEffect& effect)
-      : DlUnknownPathEffect(effect.sk_path_effect_) {}
-  DlUnknownPathEffect(const DlUnknownPathEffect* effect)
-      : DlUnknownPathEffect(effect->sk_path_effect_) {}
-
-  DlPathEffectType type() const override { return DlPathEffectType::kUnknown; }
-  size_t size() const override { return sizeof(*this); }
-
-  std::shared_ptr<DlPathEffect> shared() const override {
-    return std::make_shared<DlUnknownPathEffect>(this);
-  }
-
-  sk_sp<SkPathEffect> skia_object() const override { return sk_path_effect_; }
-
-  virtual ~DlUnknownPathEffect() = default;
-
-  std::optional<SkRect> effect_bounds(SkRect& rect) const override;
-
- protected:
-  bool equals_(const DlPathEffect& other) const override {
-    FML_DCHECK(other.type() == DlPathEffectType::kUnknown);
-    auto that = static_cast<DlUnknownPathEffect const*>(&other);
-    return sk_path_effect_ == that->sk_path_effect_;
-  }
-
- private:
-  sk_sp<SkPathEffect> sk_path_effect_;
-};
-
 }  // namespace flutter
 
-#endif  // FLUTTER_DISPLAY_LIST_DISPLAY_LIST_PATH_EFFECT_H_
+#endif  // FLUTTER_DISPLAY_LIST_EFFECTS_DL_PATH_EFFECT_H_
diff --git a/display_list/display_list_path_effect_unittests.cc b/display_list/effects/dl_path_effect_unittests.cc
similarity index 36%
rename from display_list/display_list_path_effect_unittests.cc
rename to display_list/effects/dl_path_effect_unittests.cc
index 9a89e2229a823e95f207db7987fb97ce0dac58cd..37675fd94a43efc4f1cd682ec923cf642362fb69 100644
--- a/display_list/display_list_path_effect_unittests.cc
+++ b/display_list/effects/dl_path_effect_unittests.cc
@@ -2,48 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/display_list/display_list_attributes_testing.h"
-#include "flutter/display_list/display_list_builder.h"
-#include "flutter/display_list/display_list_comparable.h"
-#include "flutter/display_list/types.h"
+#include "flutter/display_list/effects/dl_path_effect.h"
+#include "flutter/display_list/testing/dl_test_equality.h"
+#include "flutter/display_list/utils/dl_comparable.h"
 #include "gtest/gtest.h"
-#include "include/core/SkPath.h"
-#include "include/core/SkScalar.h"
+#include "third_party/skia/include/core/SkScalar.h"
 
 namespace flutter {
 namespace testing {
 
-TEST(DisplayListPathEffect, BuilderSetGet) {
-  const SkScalar test_dashes[] = {4.0, 2.0};
-  auto dash_path_effect = DlDashPathEffect::Make(test_dashes, 2, 0.0);
-  DisplayListBuilder builder;
-  ASSERT_EQ(builder.getPathEffect(), nullptr);
-  builder.setPathEffect(dash_path_effect.get());
-  ASSERT_NE(builder.getPathEffect(), nullptr);
-  ASSERT_TRUE(Equals(builder.getPathEffect(),
-                     static_cast<DlPathEffect*>(dash_path_effect.get())));
-  builder.setPathEffect(nullptr);
-  ASSERT_EQ(builder.getPathEffect(), nullptr);
-}
-
-TEST(DisplayListPathEffect, FromSkiaNullPathEffect) {
-  std::shared_ptr<DlPathEffect> path_effect = DlPathEffect::From(nullptr);
-  ASSERT_EQ(path_effect, nullptr);
-  ASSERT_EQ(path_effect.get(), nullptr);
-}
-
-TEST(DisplayListPathEffect, FromSkiaPathEffect) {
-  const SkScalar TestDashes2[] = {1.0, 1.5};
-  sk_sp<SkPathEffect> sk_path_effect =
-      SkDashPathEffect::Make(TestDashes2, 2, 0.0);
-  std::shared_ptr<DlPathEffect> dl_path_effect =
-      DlPathEffect::From(sk_path_effect);
-
-  ASSERT_EQ(dl_path_effect->type(), DlPathEffectType::kDash);
-  ASSERT_TRUE(
-      Equals(dl_path_effect, DlDashPathEffect::Make(TestDashes2, 2, 0.0)));
-}
-
 TEST(DisplayListPathEffect, EffectShared) {
   const SkScalar TestDashes2[] = {1.0, 1.5};
   auto effect = DlDashPathEffect::Make(TestDashes2, 2, 0.0);
@@ -81,44 +48,5 @@ TEST(DisplayListPathEffect, CheckEffectProperties) {
   TestNotEquals(*effect1, *effect5, "Dash phase differs");
 }
 
-TEST(DisplayListPathEffect, UnknownConstructor) {
-  const SkScalar test_dashes[] = {4.0, 2.0};
-  DlUnknownPathEffect path_effect(SkDashPathEffect::Make(test_dashes, 2, 0.0));
-}
-
-TEST(DisplayListPathEffect, UnknownShared) {
-  const SkScalar test_dashes[] = {4.0, 2.0};
-  DlUnknownPathEffect path_effect(SkDashPathEffect::Make(test_dashes, 2, 0.0));
-  ASSERT_NE(path_effect.shared().get(), &path_effect);
-  ASSERT_EQ(*path_effect.shared(), path_effect);
-}
-
-TEST(DisplayListPathEffect, UnknownContents) {
-  const SkScalar test_dashes[] = {4.0, 2.0};
-  sk_sp<SkPathEffect> sk_effect = SkDashPathEffect::Make(test_dashes, 2, 0.0);
-  DlUnknownPathEffect effect(sk_effect);
-  ASSERT_EQ(effect.skia_object(), sk_effect);
-  ASSERT_EQ(effect.skia_object().get(), sk_effect.get());
-}
-
-TEST(DisplayListPathEffect, UnknownEquals) {
-  const SkScalar test_dashes[] = {4.0, 2.0};
-  sk_sp<SkPathEffect> sk_effect = SkDashPathEffect::Make(test_dashes, 2, 0.0);
-  DlUnknownPathEffect effect1(sk_effect);
-  DlUnknownPathEffect effect2(sk_effect);
-  TestEquals(effect1, effect1);
-}
-
-TEST(DisplayListPathEffect, UnknownNotEquals) {
-  const SkScalar test_dashes[] = {4.0, 2.0};
-  // Even though the effect is the same, it is a different instance
-  // and we cannot currently tell them apart because the Skia
-  // DashEffect::Make objects do not implement ==
-  DlUnknownPathEffect path_effect1(SkDashPathEffect::Make(test_dashes, 2, 0.0));
-  DlUnknownPathEffect path_effect2(SkDashPathEffect::Make(test_dashes, 2, 0.0));
-  TestNotEquals(path_effect1, path_effect2,
-                "SkDashPathEffect instance differs");
-}
-
 }  // namespace testing
 }  // namespace flutter
diff --git a/display_list/display_list_runtime_effect.cc b/display_list/effects/dl_runtime_effect.cc
similarity index 96%
rename from display_list/display_list_runtime_effect.cc
rename to display_list/effects/dl_runtime_effect.cc
index 377bcea8b49813b4ca7816bfa9390a1ea55bab54..bad115d06b979487c2a1eceb55707208ca10210a 100644
--- a/display_list/display_list_runtime_effect.cc
+++ b/display_list/effects/dl_runtime_effect.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/display_list/display_list_runtime_effect.h"
+#include "flutter/display_list/effects/dl_runtime_effect.h"
 
 #include "third_party/skia/include/core/SkRefCnt.h"
 
diff --git a/display_list/display_list_runtime_effect.h b/display_list/effects/dl_runtime_effect.h
similarity index 92%
rename from display_list/display_list_runtime_effect.h
rename to display_list/effects/dl_runtime_effect.h
index 2a4cc704f3e205e94a496ed951c839e83de5cbdd..cfdf172eefec3ee0cc0513226628431488a9d057 100644
--- a/display_list/display_list_runtime_effect.h
+++ b/display_list/effects/dl_runtime_effect.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_RUNTIME_EFFECT_H_
-#define FLUTTER_DISPLAY_LIST_RUNTIME_EFFECT_H_
+#ifndef FLUTTER_DISPLAY_LIST_EFFECTS_DL_RUNTIME_EFFECT_H_
+#define FLUTTER_DISPLAY_LIST_EFFECTS_DL_RUNTIME_EFFECT_H_
 
 #include <memory>
 
@@ -82,4 +82,4 @@ class DlRuntimeEffectImpeller final : public DlRuntimeEffect {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_DISPLAY_LIST_RUNTIME_EFFECT_H_
+#endif  // FLUTTER_DISPLAY_LIST_EFFECTS_DL_RUNTIME_EFFECT_H_
diff --git a/display_list/geometry/dl_region.cc b/display_list/geometry/dl_region.cc
new file mode 100644
index 0000000000000000000000000000000000000000..3e900972fd71e2e6a473cde44208fe772c8bec9e
--- /dev/null
+++ b/display_list/geometry/dl_region.cc
@@ -0,0 +1,760 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/display_list/geometry/dl_region.h"
+
+#include "flutter/fml/logging.h"
+
+namespace flutter {
+
+// Threshold for switching from linear search through span lines to binary
+// search.
+const int kBinarySearchThreshold = 10;
+
+DlRegion::SpanBuffer::SpanBuffer(DlRegion::SpanBuffer&& m)
+    : capacity_(m.capacity_), size_(m.size_), spans_(m.spans_) {
+  m.size_ = 0;
+  m.capacity_ = 0;
+  m.spans_ = nullptr;
+};
+
+DlRegion::SpanBuffer::SpanBuffer(const DlRegion::SpanBuffer& m)
+    : capacity_(m.capacity_), size_(m.size_) {
+  if (m.spans_ == nullptr) {
+    spans_ = nullptr;
+  } else {
+    spans_ = static_cast<Span*>(std::malloc(capacity_ * sizeof(Span)));
+    memcpy(spans_, m.spans_, size_ * sizeof(Span));
+  }
+};
+
+DlRegion::SpanBuffer& DlRegion::SpanBuffer::operator=(
+    const DlRegion::SpanBuffer& buffer) {
+  SpanBuffer copy(buffer);
+  std::swap(*this, copy);
+  return *this;
+}
+
+DlRegion::SpanBuffer& DlRegion::SpanBuffer::operator=(
+    DlRegion::SpanBuffer&& buffer) {
+  std::swap(capacity_, buffer.capacity_);
+  std::swap(size_, buffer.size_);
+  std::swap(spans_, buffer.spans_);
+  return *this;
+}
+
+DlRegion::SpanBuffer::~SpanBuffer() {
+  free(spans_);
+}
+
+void DlRegion::SpanBuffer::reserve(size_t capacity) {
+  if (capacity_ < capacity) {
+    spans_ = static_cast<Span*>(std::realloc(spans_, capacity * sizeof(Span)));
+    capacity_ = capacity;
+  }
+}
+
+DlRegion::SpanChunkHandle DlRegion::SpanBuffer::storeChunk(const Span* begin,
+                                                           const Span* end) {
+  size_t chunk_size = end - begin;
+  size_t min_capacity = size_ + chunk_size + 1;
+  if (capacity_ < min_capacity) {
+    size_t new_capacity = std::max(min_capacity, capacity_ * 2);
+    new_capacity = std::max(new_capacity, size_t(512));
+    reserve(new_capacity);
+  }
+  SpanChunkHandle res = size_;
+  size_ += chunk_size + 1;
+  setChunkSize(res, chunk_size);
+
+  auto* dst = spans_ + res + 1;
+  memmove(dst, begin, chunk_size * sizeof(Span));
+
+  return res;
+}
+
+size_t DlRegion::SpanBuffer::getChunkSize(SpanChunkHandle handle) const {
+  FML_DCHECK(handle < size_);
+  return spans_[handle].left;
+}
+
+void DlRegion::SpanBuffer::setChunkSize(SpanChunkHandle handle, size_t size) {
+  FML_DCHECK(handle < size_);
+  FML_DCHECK(spans_ != nullptr);
+  // NOLINTNEXTLINE(clang-analyzer-core.NullDereference)
+  spans_[handle].left = size;
+}
+
+void DlRegion::SpanBuffer::getSpans(SpanChunkHandle handle,
+                                    const DlRegion::Span*& begin,
+                                    const DlRegion::Span*& end) const {
+  FML_DCHECK(handle < size_);
+  begin = spans_ + handle + 1;
+  end = begin + getChunkSize(handle);
+}
+
+DlRegion::DlRegion(const std::vector<SkIRect>& rects) {
+  setRects(rects);
+}
+
+DlRegion::DlRegion(const SkIRect& rect) : bounds_(rect) {
+  Span span{rect.left(), rect.right()};
+  lines_.push_back(makeLine(rect.top(), rect.bottom(), &span, &span + 1));
+}
+
+bool DlRegion::spansEqual(SpanLine& line,
+                          const Span* begin,
+                          const Span* end) const {
+  const Span *our_begin, *our_end;
+  span_buffer_.getSpans(line.chunk_handle, our_begin, our_end);
+  size_t our_size = our_end - our_begin;
+  size_t their_size = end - begin;
+  if (our_size != their_size) {
+    return false;
+  }
+
+  return memcmp(our_begin, begin, our_size * sizeof(Span)) == 0;
+}
+
+DlRegion::SpanLine DlRegion::makeLine(int32_t top,
+                                      int32_t bottom,
+                                      const SpanVec& v) {
+  return makeLine(top, bottom, v.data(), v.data() + v.size());
+}
+
+DlRegion::SpanLine DlRegion::makeLine(int32_t top,
+                                      int32_t bottom,
+                                      const Span* begin,
+                                      const Span* end) {
+  auto handle = span_buffer_.storeChunk(begin, end);
+  return {top, bottom, handle};
+}
+
+// Returns number of valid spans in res. For performance reasons res is never
+// downsized.
+size_t DlRegion::unionLineSpans(std::vector<Span>& res,
+                                const SpanBuffer& a_buffer,
+                                SpanChunkHandle a_handle,
+                                const SpanBuffer& b_buffer,
+                                SpanChunkHandle b_handle) {
+  class OrderedSpanAccumulator {
+   public:
+    explicit OrderedSpanAccumulator(std::vector<Span>& res) : res(res) {}
+
+    void accumulate(const Span& span) {
+      if (span.left > last_ || len == 0) {
+        res[len++] = span;
+        last_ = span.right;
+      } else if (span.right > last_) {
+        FML_DCHECK(len > 0);
+        res[len - 1].right = span.right;
+        last_ = span.right;
+      }
+    }
+
+    size_t len = 0;
+    std::vector<Span>& res;
+
+   private:
+    int32_t last_ = std::numeric_limits<int32_t>::min();
+  };
+
+  const Span *begin1, *end1;
+  a_buffer.getSpans(a_handle, begin1, end1);
+
+  const Span *begin2, *end2;
+  b_buffer.getSpans(b_handle, begin2, end2);
+
+  size_t min_size = (end1 - begin1) + (end2 - begin2);
+  if (res.size() < min_size) {
+    res.resize(min_size);
+  }
+
+  OrderedSpanAccumulator accumulator(res);
+
+  while (true) {
+    if (begin1->left < begin2->left) {
+      accumulator.accumulate(*begin1++);
+      if (begin1 == end1) {
+        break;
+      }
+    } else {
+      // Either 2 is first, or they are equal, in which case add 2 now
+      // and we might combine 1 with it next time around
+      accumulator.accumulate(*begin2++);
+      if (begin2 == end2) {
+        break;
+      }
+    }
+  }
+
+  FML_DCHECK(begin1 == end1 || begin2 == end2);
+
+  while (begin1 < end1) {
+    accumulator.accumulate(*begin1++);
+  }
+  while (begin2 < end2) {
+    accumulator.accumulate(*begin2++);
+  }
+
+  FML_DCHECK(begin1 == end1 && begin2 == end2);
+
+  return accumulator.len;
+}
+
+size_t DlRegion::intersectLineSpans(std::vector<Span>& res,
+                                    const SpanBuffer& a_buffer,
+                                    SpanChunkHandle a_handle,
+                                    const SpanBuffer& b_buffer,
+                                    SpanChunkHandle b_handle) {
+  const Span *begin1, *end1;
+  a_buffer.getSpans(a_handle, begin1, end1);
+
+  const Span *begin2, *end2;
+  b_buffer.getSpans(b_handle, begin2, end2);
+
+  // Worst case scenario, interleaved overlapping spans
+  //   AAAA  BBBB  CCCC
+  // XXX  YYYY  XXXX
+  size_t min_size = (end1 - begin1) + (end2 - begin2) - 1;
+  if (res.size() < min_size) {
+    res.resize(min_size);
+  }
+
+  // Pointer to the next span to be written.
+  Span* new_span = res.data();
+
+  while (begin1 != end1 && begin2 != end2) {
+    if (begin1->right <= begin2->left) {
+      ++begin1;
+    } else if (begin2->right <= begin1->left) {
+      ++begin2;
+    } else {
+      int32_t left = std::max(begin1->left, begin2->left);
+      int32_t right = std::min(begin1->right, begin2->right);
+      FML_DCHECK(left < right);
+      FML_DCHECK(new_span < res.data() + res.size());
+      *new_span++ = {left, right};
+      if (begin1->right == right) {
+        ++begin1;
+      }
+      if (begin2->right == right) {
+        ++begin2;
+      }
+    }
+  }
+
+  return new_span - res.data();
+}
+
+void DlRegion::setRects(const std::vector<SkIRect>& unsorted_rects) {
+  // setRects can only be called on empty regions.
+  FML_DCHECK(lines_.empty());
+
+  size_t count = unsorted_rects.size();
+  std::vector<const SkIRect*> rects(count);
+  for (size_t i = 0; i < count; i++) {
+    rects[i] = &unsorted_rects[i];
+    bounds_.join(unsorted_rects[i]);
+  }
+  std::sort(rects.begin(), rects.end(), [](const SkIRect* a, const SkIRect* b) {
+    if (a->top() < b->top()) {
+      return true;
+    }
+    if (a->top() > b->top()) {
+      return false;
+    }
+    return a->left() < b->left();
+  });
+
+  size_t active_end = 0;
+  size_t next_rect = 0;
+  int32_t cur_y = std::numeric_limits<int32_t>::min();
+  SpanVec working_spans;
+
+#ifdef DlRegion_DO_STATS
+  size_t active_rect_count = 0;
+  size_t span_count = 0;
+  int pass_count = 0;
+  int line_count = 0;
+#endif
+
+  while (next_rect < count || active_end > 0) {
+    // First prune passed rects out of the active list
+    size_t preserve_end = 0;
+    for (size_t i = 0; i < active_end; i++) {
+      const SkIRect* r = rects[i];
+      if (r->bottom() > cur_y) {
+        rects[preserve_end++] = r;
+      }
+    }
+    active_end = preserve_end;
+
+    // If we have no active rects any more, jump to the top of the
+    // next available input rect.
+    if (active_end == 0) {
+      if (next_rect >= count) {
+        // No active rects and no more rects to bring in. We are done.
+        break;
+      }
+      cur_y = rects[next_rect]->top();
+    }
+
+    // Next, insert any new rects we've reached into the active list
+    while (next_rect < count) {
+      const SkIRect* r = rects[next_rect];
+      if (r->isEmpty()) {
+        continue;
+      }
+      if (r->top() > cur_y) {
+        break;
+      }
+      // We now know that we will be inserting this rect into active list
+      next_rect++;
+      size_t insert_at = active_end++;
+      while (insert_at > 0) {
+        const SkIRect* ir = rects[insert_at - 1];
+        if (ir->left() <= r->left()) {
+          break;
+        }
+        rects[insert_at--] = ir;
+      }
+      rects[insert_at] = r;
+    }
+
+    // We either preserved some rects in the active list or added more from
+    // the remaining input rects, or we would have exited the loop above.
+    FML_DCHECK(active_end != 0);
+    working_spans.clear();
+    FML_DCHECK(working_spans.empty());
+
+#ifdef DlRegion_DO_STATS
+    active_rect_count += active_end;
+    pass_count++;
+#endif
+
+    // [start_x, end_x) always represents a valid span to be inserted
+    // [cur_y, end_y) is the intersecting range over which all spans are valid
+    int32_t start_x = rects[0]->left();
+    int32_t end_x = rects[0]->right();
+    int32_t end_y = rects[0]->bottom();
+    for (size_t i = 1; i < active_end; i++) {
+      const SkIRect* r = rects[i];
+      if (r->left() > end_x) {
+        working_spans.emplace_back(start_x, end_x);
+        start_x = r->left();
+        end_x = r->right();
+      } else if (end_x < r->right()) {
+        end_x = r->right();
+      }
+      if (end_y > r->bottom()) {
+        end_y = r->bottom();
+      }
+    }
+    working_spans.emplace_back(start_x, end_x);
+
+    // end_y must not pass by the top of the next input rect
+    if (next_rect < count && end_y > rects[next_rect]->top()) {
+      end_y = rects[next_rect]->top();
+    }
+
+    // If all of the rules above work out, we should never collapse the
+    // current range of Y coordinates to empty
+    FML_DCHECK(end_y > cur_y);
+
+    if (!lines_.empty() && lines_.back().bottom == cur_y &&
+        spansEqual(lines_.back(), working_spans.data(),
+                   working_spans.data() + working_spans.size())) {
+      lines_.back().bottom = end_y;
+    } else {
+#ifdef DlRegion_DO_STATS
+      span_count += working_spans.size();
+      line_count++;
+#endif
+      lines_.push_back(makeLine(cur_y, end_y, working_spans));
+    }
+    cur_y = end_y;
+  }
+
+#ifdef DlRegion_DO_STATS
+  double span_avg = ((double)span_count) / line_count;
+  double active_avg = ((double)active_rect_count) / pass_count;
+  FML_LOG(ERROR) << lines_.size() << " lines for " << count
+                 << " input rects, avg " << span_avg
+                 << " spans per line and avg " << active_avg
+                 << " active rects per loop";
+#endif
+}
+
+void DlRegion::appendLine(int32_t top,
+                          int32_t bottom,
+                          const Span* begin,
+                          const Span* end) {
+  if (lines_.empty()) {
+    lines_.push_back(makeLine(top, bottom, begin, end));
+  } else {
+    if (lines_.back().bottom == top && spansEqual(lines_.back(), begin, end)) {
+      lines_.back().bottom = bottom;
+    } else {
+      lines_.push_back(makeLine(top, bottom, begin, end));
+    }
+  }
+}
+
+DlRegion DlRegion::MakeUnion(const DlRegion& a, const DlRegion& b) {
+  if (a.isEmpty()) {
+    return b;
+  } else if (b.isEmpty()) {
+    return a;
+  } else if (a.isSimple() && a.bounds_.contains(b.bounds_)) {
+    return a;
+  } else if (b.isSimple() && b.bounds_.contains(a.bounds_)) {
+    return b;
+  }
+
+  DlRegion res;
+  res.bounds_ = a.bounds_;
+  res.bounds_.join(b.bounds_);
+  res.span_buffer_.reserve(a.span_buffer_.capacity() +
+                           b.span_buffer_.capacity());
+
+  auto& lines = res.lines_;
+  lines.reserve(a.lines_.size() + b.lines_.size());
+
+  auto a_it = a.lines_.begin();
+  auto b_it = b.lines_.begin();
+  auto a_end = a.lines_.end();
+  auto b_end = b.lines_.end();
+
+  FML_DCHECK(a_it != a_end && b_it != b_end);
+
+  auto& a_buffer = a.span_buffer_;
+  auto& b_buffer = b.span_buffer_;
+
+  std::vector<Span> tmp;
+
+  int32_t cur_top = std::numeric_limits<int32_t>::min();
+
+  while (a_it != a_end && b_it != b_end) {
+    auto a_top = std::max(cur_top, a_it->top);
+    auto b_top = std::max(cur_top, b_it->top);
+    if (a_it->bottom <= b_top) {
+      res.appendLine(a_top, a_it->bottom, a_buffer, a_it->chunk_handle);
+      ++a_it;
+    } else if (b_it->bottom <= a_top) {
+      res.appendLine(b_top, b_it->bottom, b_buffer, b_it->chunk_handle);
+      ++b_it;
+    } else {
+      if (a_top < b_top) {
+        res.appendLine(a_top, b_top, a_buffer, a_it->chunk_handle);
+        cur_top = b_top;
+        if (cur_top == a_it->bottom) {
+          ++a_it;
+        }
+      } else if (b_top < a_top) {
+        res.appendLine(b_top, a_top, b_buffer, b_it->chunk_handle);
+        cur_top = a_top;
+        if (cur_top == b_it->bottom) {
+          ++b_it;
+        }
+      } else {
+        auto new_bottom = std::min(a_it->bottom, b_it->bottom);
+        FML_DCHECK(a_top == b_top);
+        FML_DCHECK(new_bottom > a_top);
+        FML_DCHECK(new_bottom > b_top);
+        auto size = unionLineSpans(tmp, a_buffer, a_it->chunk_handle, b_buffer,
+                                   b_it->chunk_handle);
+        res.appendLine(a_top, new_bottom, tmp.data(), tmp.data() + size);
+        cur_top = new_bottom;
+        if (cur_top == a_it->bottom) {
+          ++a_it;
+        }
+        if (cur_top == b_it->bottom) {
+          ++b_it;
+        }
+      }
+    }
+  }
+
+  FML_DCHECK(a_it == a_end || b_it == b_end);
+
+  while (a_it != a_end) {
+    auto a_top = std::max(cur_top, a_it->top);
+    res.appendLine(a_top, a_it->bottom, a_buffer, a_it->chunk_handle);
+    ++a_it;
+  }
+
+  while (b_it != b_end) {
+    auto b_top = std::max(cur_top, b_it->top);
+    res.appendLine(b_top, b_it->bottom, b_buffer, b_it->chunk_handle);
+    ++b_it;
+  }
+
+  return res;
+}
+
+DlRegion DlRegion::MakeIntersection(const DlRegion& a, const DlRegion& b) {
+  if (!SkIRect::Intersects(a.bounds_, b.bounds_)) {
+    return DlRegion();
+  } else if (a.isSimple() && b.isSimple()) {
+    SkIRect r(a.bounds_);
+    auto res = r.intersect(b.bounds_);
+    (void)res;  // Suppress unused variable warning in release builds.
+    FML_DCHECK(res);
+    return DlRegion(r);
+  } else if (a.isSimple() && a.bounds_.contains(b.bounds_)) {
+    return b;
+  } else if (b.isSimple() && b.bounds_.contains(a.bounds_)) {
+    return a;
+  }
+
+  DlRegion res;
+  res.span_buffer_.reserve(
+      std::max(a.span_buffer_.capacity(), b.span_buffer_.capacity()));
+
+  auto& lines = res.lines_;
+  lines.reserve(std::min(a.lines_.size(), b.lines_.size()));
+
+  std::vector<SpanLine>::const_iterator a_it, b_it;
+  getIntersectionIterators(a.lines_, b.lines_, a_it, b_it);
+
+  auto a_end = a.lines_.end();
+  auto b_end = b.lines_.end();
+
+  auto& a_buffer = a.span_buffer_;
+  auto& b_buffer = b.span_buffer_;
+
+  std::vector<Span> tmp;
+
+  int32_t cur_top = std::numeric_limits<int32_t>::min();
+
+  while (a_it != a_end && b_it != b_end) {
+    auto a_top = std::max(cur_top, a_it->top);
+    auto b_top = std::max(cur_top, b_it->top);
+    if (a_it->bottom <= b_top) {
+      ++a_it;
+    } else if (b_it->bottom <= a_top) {
+      ++b_it;
+    } else {
+      auto top = std::max(a_top, b_top);
+      auto bottom = std::min(a_it->bottom, b_it->bottom);
+      FML_DCHECK(top < bottom);
+      auto size = intersectLineSpans(tmp, a_buffer, a_it->chunk_handle,
+                                     b_buffer, b_it->chunk_handle);
+      if (size > 0) {
+        res.appendLine(top, bottom, tmp.data(), tmp.data() + size);
+        res.bounds_.join(SkIRect::MakeLTRB(
+            tmp.data()->left, top, (tmp.data() + size - 1)->right, bottom));
+      }
+      cur_top = bottom;
+      if (cur_top == a_it->bottom) {
+        ++a_it;
+      }
+      if (cur_top == b_it->bottom) {
+        ++b_it;
+      }
+    }
+  }
+  FML_DCHECK(a_it == a_end || b_it == b_end);
+  return res;
+}
+
+std::vector<SkIRect> DlRegion::getRects(bool deband) const {
+  std::vector<SkIRect> rects;
+  if (isEmpty()) {
+    return rects;
+  } else if (isSimple()) {
+    rects.push_back(bounds_);
+    return rects;
+  }
+
+  size_t rect_count = 0;
+  size_t previous_span_end = 0;
+  for (const auto& line : lines_) {
+    rect_count += span_buffer_.getChunkSize(line.chunk_handle);
+  }
+  rects.reserve(rect_count);
+
+  for (const auto& line : lines_) {
+    const Span *span_begin, *span_end;
+    span_buffer_.getSpans(line.chunk_handle, span_begin, span_end);
+    for (const auto* span = span_begin; span < span_end; ++span) {
+      SkIRect rect{span->left, line.top, span->right, line.bottom};
+      if (deband) {
+        auto iter = rects.begin() + previous_span_end;
+        // If there is rectangle previously in rects on which this one is a
+        // vertical continuation, remove the previous rectangle and expand
+        // this one vertically to cover the area.
+        while (iter != rects.begin()) {
+          --iter;
+          if (iter->bottom() < rect.top()) {
+            // Went all the way to previous span line.
+            break;
+          } else if (iter->left() == rect.left() &&
+                     iter->right() == rect.right()) {
+            FML_DCHECK(iter->bottom() == rect.top());
+            rect.fTop = iter->fTop;
+            rects.erase(iter);
+            --previous_span_end;
+            break;
+          }
+        }
+      }
+      rects.push_back(rect);
+    }
+    previous_span_end = rects.size();
+  }
+  return rects;
+}
+
+bool DlRegion::isComplex() const {
+  return lines_.size() > 1 ||
+         (lines_.size() == 1 &&
+          span_buffer_.getChunkSize(lines_.front().chunk_handle) > 1);
+}
+
+bool DlRegion::intersects(const SkIRect& rect) const {
+  if (isEmpty()) {
+    return false;
+  }
+
+  auto bounds_intersect = SkIRect::Intersects(bounds_, rect);
+
+  if (isSimple()) {
+    return bounds_intersect;
+  }
+
+  if (!bounds_intersect) {
+    return false;
+  }
+
+  auto it = lines_.begin();
+  auto end = lines_.end();
+  if (lines_.size() > kBinarySearchThreshold &&
+      it[kBinarySearchThreshold].bottom <= rect.fTop) {
+    it = std::lower_bound(
+        lines_.begin() + kBinarySearchThreshold + 1, lines_.end(), rect.fTop,
+        [](const SpanLine& line, int32_t top) { return line.bottom <= top; });
+  } else {
+    while (it != end && it->bottom <= rect.fTop) {
+      ++it;
+      continue;
+    }
+  }
+  while (it != end && it->top < rect.fBottom) {
+    FML_DCHECK(rect.fTop < it->bottom && it->top < rect.fBottom);
+    const Span *begin, *end;
+    span_buffer_.getSpans(it->chunk_handle, begin, end);
+    while (begin != end && begin->left < rect.fRight) {
+      if (begin->right > rect.fLeft) {
+        return true;
+      }
+      ++begin;
+    }
+    ++it;
+  }
+
+  return false;
+}
+
+bool DlRegion::spansIntersect(const Span* begin1,
+                              const Span* end1,
+                              const Span* begin2,
+                              const Span* end2) {
+  while (begin1 != end1 && begin2 != end2) {
+    if (begin1->right <= begin2->left) {
+      ++begin1;
+    } else if (begin2->right <= begin1->left) {
+      ++begin2;
+    } else {
+      return true;
+    }
+  }
+  return false;
+}
+
+void DlRegion::getIntersectionIterators(
+    const std::vector<SpanLine>& a_lines,
+    const std::vector<SpanLine>& b_lines,
+    std::vector<SpanLine>::const_iterator& a_it,
+    std::vector<SpanLine>::const_iterator& b_it) {
+  a_it = a_lines.begin();
+  auto a_end = a_lines.end();
+  b_it = b_lines.begin();
+  auto b_end = b_lines.end();
+
+  FML_DCHECK(a_it != a_end && b_it != b_end);
+
+  auto a_len = a_end - a_it;
+  auto b_len = b_end - b_it;
+
+  if (a_len > kBinarySearchThreshold &&
+      a_it[kBinarySearchThreshold].bottom <= b_it->top) {
+    a_it = std::lower_bound(
+        a_lines.begin() + kBinarySearchThreshold + 1, a_lines.end(), b_it->top,
+        [](const SpanLine& line, int32_t top) { return line.bottom <= top; });
+  } else if (b_len > kBinarySearchThreshold &&
+             b_it[kBinarySearchThreshold].bottom <= a_it->top) {
+    b_it = std::lower_bound(
+        b_lines.begin() + kBinarySearchThreshold + 1, b_lines.end(), a_it->top,
+        [](const SpanLine& line, int32_t top) { return line.bottom <= top; });
+  }
+}
+
+bool DlRegion::intersects(const DlRegion& region) const {
+  if (isEmpty() || region.isEmpty()) {
+    return false;
+  }
+
+  auto our_complex = isComplex();
+  auto their_complex = region.isComplex();
+  auto bounds_intersect = SkIRect::Intersects(bounds_, region.bounds_);
+
+  if (!our_complex && !their_complex) {
+    return bounds_intersect;
+  }
+
+  if (!bounds_intersect) {
+    return false;
+  }
+
+  if (!our_complex) {
+    return region.intersects(bounds_);
+  }
+
+  if (!their_complex) {
+    return intersects(region.bounds_);
+  }
+
+  std::vector<SpanLine>::const_iterator ours, theirs;
+  getIntersectionIterators(lines_, region.lines_, ours, theirs);
+  auto ours_end = lines_.end();
+  auto theirs_end = region.lines_.end();
+
+  while (ours != ours_end && theirs != theirs_end) {
+    if (ours->bottom <= theirs->top) {
+      ++ours;
+    } else if (theirs->bottom <= ours->top) {
+      ++theirs;
+    } else {
+      FML_DCHECK(ours->top < theirs->bottom && theirs->top < ours->bottom);
+      const Span *ours_begin, *ours_end;
+      span_buffer_.getSpans(ours->chunk_handle, ours_begin, ours_end);
+      const Span *theirs_begin, *theirs_end;
+      region.span_buffer_.getSpans(theirs->chunk_handle, theirs_begin,
+                                   theirs_end);
+      if (spansIntersect(ours_begin, ours_end, theirs_begin, theirs_end)) {
+        return true;
+      }
+      if (ours->bottom < theirs->bottom) {
+        ++ours;
+      } else {
+        ++theirs;
+      }
+    }
+  }
+  return false;
+}
+
+}  // namespace flutter
diff --git a/display_list/geometry/dl_region.h b/display_list/geometry/dl_region.h
new file mode 100644
index 0000000000000000000000000000000000000000..170a67cbffa926082f8681ea7c5def0ca7ee1da3
--- /dev/null
+++ b/display_list/geometry/dl_region.h
@@ -0,0 +1,173 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_DISPLAY_LIST_GEOMETRY_DL_REGION_H_
+#define FLUTTER_DISPLAY_LIST_GEOMETRY_DL_REGION_H_
+
+#include "third_party/skia/include/core/SkRect.h"
+
+#include <memory>
+#include <vector>
+
+namespace flutter {
+
+/// Represents a region as a collection of non-overlapping rectangles.
+/// Implements a subset of SkRegion functionality optimized for quickly
+/// converting set of overlapping rectangles to non-overlapping rectangles.
+class DlRegion {
+ public:
+  /// Creates an empty region.
+  DlRegion() = default;
+
+  /// Creates region by bulk adding the rectangles.
+  /// Matches SkRegion::op(rect, SkRegion::kUnion_Op) behavior.
+  explicit DlRegion(const std::vector<SkIRect>& rects);
+
+  /// Creates region covering area of a rectangle.
+  explicit DlRegion(const SkIRect& rect);
+
+  DlRegion(const DlRegion&) = default;
+  DlRegion(DlRegion&&) = default;
+
+  DlRegion& operator=(const DlRegion&) = default;
+  DlRegion& operator=(DlRegion&&) = default;
+
+  /// Creates union region of region a and b.
+  /// Matches SkRegion a; a.op(b, SkRegion::kUnion_Op) behavior.
+  static DlRegion MakeUnion(const DlRegion& a, const DlRegion& b);
+
+  /// Creates intersection region of region a and b.
+  /// Matches SkRegion a; a.op(b, SkRegion::kIntersect_Op) behavior.
+  static DlRegion MakeIntersection(const DlRegion& a, const DlRegion& b);
+
+  /// Returns list of non-overlapping rectangles that cover current region.
+  /// If |deband| is false, each span line will result in separate rectangles,
+  /// closely matching SkRegion::Iterator behavior.
+  /// If |deband| is true, matching rectangles from adjacent span lines will be
+  /// merged into single rectangle.
+  std::vector<SkIRect> getRects(bool deband = true) const;
+
+  /// Returns maximum and minimum axis values of rectangles in this region.
+  /// If region is empty returns SKIRect::MakeEmpty().
+  const SkIRect& bounds() const { return bounds_; }
+
+  /// Returns whether this region intersects with a rectangle.
+  bool intersects(const SkIRect& rect) const;
+
+  /// Returns whether this region intersects with another region.
+  bool intersects(const DlRegion& region) const;
+
+  /// Returns true if region is empty (contains no rectangles).
+  bool isEmpty() const { return lines_.empty(); }
+
+  /// Returns true if region is not empty and contains more than one rectangle.
+  bool isComplex() const;
+
+  /// Returns true if region can be represented by single rectangle or is
+  /// empty.
+  bool isSimple() const { return !isComplex(); }
+
+ private:
+  typedef std::uint32_t SpanChunkHandle;
+
+  struct Span {
+    int32_t left;
+    int32_t right;
+
+    Span() = default;
+    Span(int32_t left, int32_t right) : left(left), right(right) {}
+  };
+
+  /// Holds spans for the region. Having custom allocated memory that doesn't
+  /// do zero initialization every time the buffer gets resized improves
+  /// performance measurably.
+  class SpanBuffer {
+   public:
+    SpanBuffer() = default;
+    SpanBuffer(const SpanBuffer&);
+    SpanBuffer(SpanBuffer&& m);
+    SpanBuffer& operator=(const SpanBuffer&);
+    SpanBuffer& operator=(SpanBuffer&& m);
+
+    void reserve(size_t capacity);
+    size_t capacity() const { return capacity_; }
+
+    SpanChunkHandle storeChunk(const Span* begin, const Span* end);
+    size_t getChunkSize(SpanChunkHandle handle) const;
+    void getSpans(SpanChunkHandle handle,
+                  const DlRegion::Span*& begin,
+                  const DlRegion::Span*& end) const;
+
+    ~SpanBuffer();
+
+   private:
+    void setChunkSize(SpanChunkHandle handle, size_t size);
+
+    size_t capacity_ = 0;
+    size_t size_ = 0;
+
+    // Spans for the region chunks. First span in each chunk contains the
+    // chunk size.
+    Span* spans_ = nullptr;
+  };
+
+  struct SpanLine {
+    int32_t top;
+    int32_t bottom;
+    SpanChunkHandle chunk_handle;
+  };
+
+  void setRects(const std::vector<SkIRect>& rects);
+
+  void appendLine(int32_t top,
+                  int32_t bottom,
+                  const Span* begin,
+                  const Span* end);
+  void appendLine(int32_t top,
+                  int32_t bottom,
+                  const SpanBuffer& buffer,
+                  SpanChunkHandle handle) {
+    const Span *begin, *end;
+    buffer.getSpans(handle, begin, end);
+    appendLine(top, bottom, begin, end);
+  }
+
+  typedef std::vector<Span> SpanVec;
+  SpanLine makeLine(int32_t top, int32_t bottom, const SpanVec&);
+  SpanLine makeLine(int32_t top,
+                    int32_t bottom,
+                    const Span* begin,
+                    const Span* end);
+  static size_t unionLineSpans(std::vector<Span>& res,
+                               const SpanBuffer& a_buffer,
+                               SpanChunkHandle a_handle,
+                               const SpanBuffer& b_buffer,
+                               SpanChunkHandle b_handle);
+  static size_t intersectLineSpans(std::vector<Span>& res,
+                                   const SpanBuffer& a_buffer,
+                                   SpanChunkHandle a_handle,
+                                   const SpanBuffer& b_buffer,
+                                   SpanChunkHandle b_handle);
+
+  bool spansEqual(SpanLine& line, const Span* begin, const Span* end) const;
+
+  static bool spansIntersect(const Span* begin1,
+                             const Span* end1,
+                             const Span* begin2,
+                             const Span* end2);
+
+  static void getIntersectionIterators(
+      const std::vector<SpanLine>& a_lines,
+      const std::vector<SpanLine>& b_lines,
+      std::vector<SpanLine>::const_iterator& a_it,
+      std::vector<SpanLine>::const_iterator& b_it);
+
+  std::vector<SpanLine> lines_;
+  SkIRect bounds_ = SkIRect::MakeEmpty();
+  SpanBuffer span_buffer_;
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_DISPLAY_LIST_GEOMETRY_DL_REGION_H_
diff --git a/display_list/geometry/dl_region_unittests.cc b/display_list/geometry/dl_region_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..1f03f89fc6d5ab25bee4e9362ccc1a9b8f05f8c3
--- /dev/null
+++ b/display_list/geometry/dl_region_unittests.cc
@@ -0,0 +1,433 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/display_list/geometry/dl_region.h"
+#include "gtest/gtest.h"
+
+#include "third_party/skia/include/core/SkRegion.h"
+
+#include <random>
+
+namespace flutter {
+namespace testing {
+
+TEST(DisplayListRegion, EmptyRegion) {
+  DlRegion region;
+  EXPECT_TRUE(region.isEmpty());
+  EXPECT_TRUE(region.getRects().empty());
+}
+
+TEST(DisplayListRegion, SingleRectangle) {
+  DlRegion region({SkIRect::MakeLTRB(10, 10, 50, 50)});
+  auto rects = region.getRects();
+  ASSERT_EQ(rects.size(), 1u);
+  EXPECT_EQ(rects.front(), SkIRect::MakeLTRB(10, 10, 50, 50));
+}
+
+TEST(DisplayListRegion, NonOverlappingRectangles1) {
+  std::vector<SkIRect> rects_in;
+  for (int i = 0; i < 10; ++i) {
+    SkIRect rect = SkIRect::MakeXYWH(50 * i, 50 * i, 50, 50);
+    rects_in.push_back(rect);
+  }
+  DlRegion region(rects_in);
+  auto rects = region.getRects();
+  std::vector<SkIRect> expected{
+      {0, 0, 50, 50},       {50, 50, 100, 100},   {100, 100, 150, 150},
+      {150, 150, 200, 200}, {200, 200, 250, 250}, {250, 250, 300, 300},
+      {300, 300, 350, 350}, {350, 350, 400, 400}, {400, 400, 450, 450},
+      {450, 450, 500, 500},
+  };
+  EXPECT_EQ(rects, expected);
+}
+
+TEST(DisplayListRegion, NonOverlappingRectangles2) {
+  DlRegion region({
+      SkIRect::MakeXYWH(5, 5, 10, 10),
+      SkIRect::MakeXYWH(25, 5, 10, 10),
+      SkIRect::MakeXYWH(5, 25, 10, 10),
+      SkIRect::MakeXYWH(25, 25, 10, 10),
+  });
+  auto rects = region.getRects();
+  std::vector<SkIRect> expected{
+      SkIRect::MakeXYWH(5, 5, 10, 10),
+      SkIRect::MakeXYWH(25, 5, 10, 10),
+      SkIRect::MakeXYWH(5, 25, 10, 10),
+      SkIRect::MakeXYWH(25, 25, 10, 10),
+  };
+  EXPECT_EQ(rects, expected);
+}
+
+TEST(DisplayListRegion, NonOverlappingRectangles3) {
+  DlRegion region({
+      SkIRect::MakeXYWH(0, 0, 10, 10),
+      SkIRect::MakeXYWH(-11, -11, 10, 10),
+      SkIRect::MakeXYWH(11, 11, 10, 10),
+      SkIRect::MakeXYWH(-11, 0, 10, 10),
+      SkIRect::MakeXYWH(0, 11, 10, 10),
+      SkIRect::MakeXYWH(0, -11, 10, 10),
+      SkIRect::MakeXYWH(11, 0, 10, 10),
+      SkIRect::MakeXYWH(11, -11, 10, 10),
+      SkIRect::MakeXYWH(-11, 11, 10, 10),
+  });
+  auto rects = region.getRects();
+  std::vector<SkIRect> expected{
+      SkIRect::MakeXYWH(-11, -11, 10, 10),  //
+      SkIRect::MakeXYWH(0, -11, 10, 10),    //
+      SkIRect::MakeXYWH(11, -11, 10, 10),   //
+      SkIRect::MakeXYWH(-11, 0, 10, 10),    //
+      SkIRect::MakeXYWH(0, 0, 10, 10),      //
+      SkIRect::MakeXYWH(11, 0, 10, 10),     //
+      SkIRect::MakeXYWH(-11, 11, 10, 10),   //
+      SkIRect::MakeXYWH(0, 11, 10, 10),     //
+      SkIRect::MakeXYWH(11, 11, 10, 10),
+  };
+  EXPECT_EQ(rects, expected);
+}
+
+TEST(DisplayListRegion, MergeTouchingRectangles) {
+  DlRegion region({
+      SkIRect::MakeXYWH(0, 0, 10, 10),
+      SkIRect::MakeXYWH(-10, -10, 10, 10),
+      SkIRect::MakeXYWH(10, 10, 10, 10),
+      SkIRect::MakeXYWH(-10, 0, 10, 10),
+      SkIRect::MakeXYWH(0, 10, 10, 10),
+      SkIRect::MakeXYWH(0, -10, 10, 10),
+      SkIRect::MakeXYWH(10, 0, 10, 10),
+      SkIRect::MakeXYWH(10, -10, 10, 10),
+      SkIRect::MakeXYWH(-10, 10, 10, 10),
+  });
+
+  auto rects = region.getRects();
+  std::vector<SkIRect> expected{
+      SkIRect::MakeXYWH(-10, -10, 30, 30),
+  };
+  EXPECT_EQ(rects, expected);
+}
+
+TEST(DisplayListRegion, OverlappingRectangles) {
+  std::vector<SkIRect> rects_in;
+  for (int i = 0; i < 10; ++i) {
+    SkIRect rect = SkIRect::MakeXYWH(10 * i, 10 * i, 50, 50);
+    rects_in.push_back(rect);
+  }
+  DlRegion region(rects_in);
+  auto rects = region.getRects();
+  std::vector<SkIRect> expected{
+      {0, 0, 50, 10},      {0, 10, 60, 20},     {0, 20, 70, 30},
+      {0, 30, 80, 40},     {0, 40, 90, 50},     {10, 50, 100, 60},
+      {20, 60, 110, 70},   {30, 70, 120, 80},   {40, 80, 130, 90},
+      {50, 90, 140, 100},  {60, 100, 140, 110}, {70, 110, 140, 120},
+      {80, 120, 140, 130}, {90, 130, 140, 140},
+  };
+
+  EXPECT_EQ(rects, expected);
+}
+
+TEST(DisplayListRegion, Deband) {
+  DlRegion region({
+      SkIRect::MakeXYWH(0, 0, 50, 50),
+      SkIRect::MakeXYWH(60, 0, 20, 20),
+      SkIRect::MakeXYWH(90, 0, 50, 50),
+  });
+
+  auto rects_with_deband = region.getRects(true);
+  std::vector<SkIRect> expected{
+      SkIRect::MakeXYWH(60, 0, 20, 20),
+      SkIRect::MakeXYWH(0, 0, 50, 50),
+      SkIRect::MakeXYWH(90, 0, 50, 50),
+  };
+  EXPECT_EQ(rects_with_deband, expected);
+
+  auto rects_without_deband = region.getRects(false);
+  std::vector<SkIRect> expected_without_deband{
+      SkIRect::MakeXYWH(0, 0, 50, 20),   //
+      SkIRect::MakeXYWH(60, 0, 20, 20),  //
+      SkIRect::MakeXYWH(90, 0, 50, 20),  //
+      SkIRect::MakeXYWH(0, 20, 50, 30),  //
+      SkIRect::MakeXYWH(90, 20, 50, 30),
+  };
+  EXPECT_EQ(rects_without_deband, expected_without_deband);
+}
+
+TEST(DisplayListRegion, Intersects1) {
+  DlRegion region1({
+      SkIRect::MakeXYWH(0, 0, 20, 20),
+      SkIRect::MakeXYWH(20, 20, 20, 20),
+  });
+  DlRegion region2({
+      SkIRect::MakeXYWH(20, 0, 20, 20),
+      SkIRect::MakeXYWH(0, 20, 20, 20),
+  });
+  EXPECT_FALSE(region1.intersects(region2));
+  EXPECT_FALSE(region2.intersects(region1));
+
+  EXPECT_TRUE(region1.intersects(region2.bounds()));
+  EXPECT_TRUE(region2.intersects(region1.bounds()));
+
+  EXPECT_TRUE(region1.intersects(SkIRect::MakeXYWH(0, 0, 20, 20)));
+  EXPECT_FALSE(region1.intersects(SkIRect::MakeXYWH(20, 0, 20, 20)));
+
+  EXPECT_TRUE(region1.intersects(
+      DlRegion(std::vector<SkIRect>{SkIRect::MakeXYWH(0, 0, 20, 20)})));
+  EXPECT_FALSE(region1.intersects(
+      DlRegion(std::vector<SkIRect>{SkIRect::MakeXYWH(20, 0, 20, 20)})));
+
+  EXPECT_FALSE(region1.intersects(SkIRect::MakeXYWH(-1, -1, 1, 1)));
+  EXPECT_TRUE(region1.intersects(SkIRect::MakeXYWH(0, 0, 1, 1)));
+
+  EXPECT_FALSE(region1.intersects(SkIRect::MakeXYWH(40, 40, 1, 1)));
+  EXPECT_TRUE(region1.intersects(SkIRect::MakeXYWH(39, 39, 1, 1)));
+}
+
+TEST(DisplayListRegion, Intersects2) {
+  DlRegion region1({
+      SkIRect::MakeXYWH(-10, -10, 20, 20),
+      SkIRect::MakeXYWH(-30, -30, 20, 20),
+  });
+  DlRegion region2({
+      SkIRect::MakeXYWH(20, 20, 5, 5),
+      SkIRect::MakeXYWH(0, 0, 20, 20),
+  });
+  EXPECT_TRUE(region1.intersects(region2));
+  EXPECT_TRUE(region2.intersects(region1));
+}
+
+TEST(DisplayListRegion, Intersection1) {
+  DlRegion region1({
+      SkIRect::MakeXYWH(0, 0, 20, 20),
+      SkIRect::MakeXYWH(20, 20, 20, 20),
+  });
+  DlRegion region2({
+      SkIRect::MakeXYWH(20, 0, 20, 20),
+      SkIRect::MakeXYWH(0, 20, 20, 20),
+  });
+  DlRegion i = DlRegion::MakeIntersection(region1, region2);
+  EXPECT_EQ(i.bounds(), SkIRect::MakeEmpty());
+  EXPECT_TRUE(i.isEmpty());
+  auto rects = i.getRects();
+  EXPECT_TRUE(rects.empty());
+}
+
+TEST(DisplayListRegion, Intersection2) {
+  DlRegion region1({
+      SkIRect::MakeXYWH(0, 0, 20, 20),
+      SkIRect::MakeXYWH(20, 20, 20, 20),
+  });
+  DlRegion region2({
+      SkIRect::MakeXYWH(0, 0, 20, 20),
+      SkIRect::MakeXYWH(20, 20, 20, 20),
+  });
+  DlRegion i = DlRegion::MakeIntersection(region1, region2);
+  EXPECT_EQ(i.bounds(), SkIRect::MakeXYWH(0, 0, 40, 40));
+  auto rects = i.getRects();
+  std::vector<SkIRect> expected{
+      SkIRect::MakeXYWH(0, 0, 20, 20),
+      SkIRect::MakeXYWH(20, 20, 20, 20),
+  };
+  EXPECT_EQ(rects, expected);
+}
+
+TEST(DisplayListRegion, Intersection3) {
+  DlRegion region1({
+      SkIRect::MakeXYWH(0, 0, 20, 20),
+  });
+  DlRegion region2({
+      SkIRect::MakeXYWH(-10, -10, 20, 20),
+      SkIRect::MakeXYWH(10, 10, 20, 20),
+  });
+  DlRegion i = DlRegion::MakeIntersection(region1, region2);
+  EXPECT_EQ(i.bounds(), SkIRect::MakeXYWH(0, 0, 20, 20));
+  auto rects = i.getRects();
+  std::vector<SkIRect> expected{
+      SkIRect::MakeXYWH(0, 0, 10, 10),
+      SkIRect::MakeXYWH(10, 10, 10, 10),
+  };
+  EXPECT_EQ(rects, expected);
+}
+
+TEST(DisplayListRegion, Union1) {
+  DlRegion region1({
+      SkIRect::MakeXYWH(0, 0, 20, 20),
+      SkIRect::MakeXYWH(20, 20, 20, 20),
+  });
+  DlRegion region2({
+      SkIRect::MakeXYWH(20, 0, 20, 20),
+      SkIRect::MakeXYWH(0, 20, 20, 20),
+  });
+  DlRegion u = DlRegion::MakeUnion(region1, region2);
+  EXPECT_EQ(u.bounds(), SkIRect::MakeXYWH(0, 0, 40, 40));
+  EXPECT_TRUE(u.isSimple());
+  auto rects = u.getRects();
+  std::vector<SkIRect> expected{
+      SkIRect::MakeXYWH(0, 0, 40, 40),  //
+  };
+  EXPECT_EQ(rects, expected);
+}
+
+TEST(DisplayListRegion, Union2) {
+  DlRegion region1({
+      SkIRect::MakeXYWH(0, 0, 20, 20),
+      SkIRect::MakeXYWH(21, 21, 20, 20),
+  });
+  DlRegion region2({
+      SkIRect::MakeXYWH(21, 0, 20, 20),
+      SkIRect::MakeXYWH(0, 21, 20, 20),
+  });
+  DlRegion u = DlRegion::MakeUnion(region1, region2);
+  EXPECT_EQ(u.bounds(), SkIRect::MakeXYWH(0, 0, 41, 41));
+  auto rects = u.getRects();
+  std::vector<SkIRect> expected{
+      SkIRect::MakeXYWH(0, 0, 20, 20),
+      SkIRect::MakeXYWH(21, 0, 20, 20),
+      SkIRect::MakeXYWH(0, 21, 20, 20),
+      SkIRect::MakeXYWH(21, 21, 20, 20),
+  };
+  EXPECT_EQ(rects, expected);
+}
+
+TEST(DisplayListRegion, Union3) {
+  DlRegion region1({
+      SkIRect::MakeXYWH(-10, -10, 20, 20),
+  });
+  DlRegion region2({
+      SkIRect::MakeXYWH(0, 0, 20, 20),
+  });
+  DlRegion u = DlRegion::MakeUnion(region1, region2);
+  EXPECT_EQ(u.bounds(), SkIRect::MakeXYWH(-10, -10, 30, 30));
+  auto rects = u.getRects();
+  std::vector<SkIRect> expected{
+      SkIRect::MakeXYWH(-10, -10, 20, 10),
+      SkIRect::MakeXYWH(-10, 0, 30, 10),
+      SkIRect::MakeXYWH(0, 10, 20, 10),
+  };
+  EXPECT_EQ(rects, expected);
+}
+
+TEST(DisplayListRegion, UnionEmpty) {
+  {
+    DlRegion region1(std::vector<SkIRect>{});
+    DlRegion region2(std::vector<SkIRect>{});
+    DlRegion u = DlRegion::MakeUnion(region1, region2);
+    EXPECT_EQ(u.bounds(), SkIRect::MakeEmpty());
+    EXPECT_TRUE(u.isEmpty());
+    auto rects = u.getRects();
+    EXPECT_TRUE(rects.empty());
+  }
+  {
+    DlRegion region1(std::vector<SkIRect>{});
+    DlRegion region2({
+        SkIRect::MakeXYWH(0, 0, 20, 20),
+    });
+    DlRegion u = DlRegion::MakeUnion(region1, region2);
+    EXPECT_EQ(u.bounds(), SkIRect::MakeXYWH(0, 0, 20, 20));
+    auto rects = u.getRects();
+    std::vector<SkIRect> expected{
+        SkIRect::MakeXYWH(0, 0, 20, 20),
+    };
+  }
+  {
+    DlRegion region1({
+        SkIRect::MakeXYWH(0, 0, 20, 20),
+    });
+    DlRegion region2(std::vector<SkIRect>{});
+    DlRegion u = DlRegion::MakeUnion(region1, region2);
+    EXPECT_EQ(u.bounds(), SkIRect::MakeXYWH(0, 0, 20, 20));
+    auto rects = u.getRects();
+    std::vector<SkIRect> expected{
+        SkIRect::MakeXYWH(0, 0, 20, 20),
+    };
+  }
+}
+
+void CheckEquality(const DlRegion& dl_region, const SkRegion& sk_region) {
+  EXPECT_EQ(dl_region.bounds(), sk_region.getBounds());
+
+  // Do not deband the rectangles - identical to SkRegion::Iterator
+  auto rects = dl_region.getRects(false);
+
+  std::vector<SkIRect> skia_rects;
+
+  auto iterator = SkRegion::Iterator(sk_region);
+  while (!iterator.done()) {
+    skia_rects.push_back(iterator.rect());
+    iterator.next();
+  }
+
+  EXPECT_EQ(rects, skia_rects);
+}
+
+TEST(DisplayListRegion, TestAgainstSkRegion) {
+  struct Settings {
+    int max_size;
+  };
+  std::vector<Settings> all_settings{{100}, {400}, {800}};
+
+  std::vector<size_t> iterations{1, 10, 100, 1000};
+
+  for (const auto& settings : all_settings) {
+    for (const auto iterations_1 : iterations) {
+      for (const auto iterations_2 : iterations) {
+        std::random_device d;
+        std::seed_seq seed{::testing::UnitTest::GetInstance()->random_seed()};
+        std::mt19937 rng(seed);
+
+        SkRegion sk_region1;
+        SkRegion sk_region2;
+
+        std::uniform_int_distribution pos(0, 4000);
+        std::uniform_int_distribution size(1, settings.max_size);
+
+        std::vector<SkIRect> rects_in1;
+        std::vector<SkIRect> rects_in2;
+
+        for (size_t i = 0; i < iterations_1; ++i) {
+          SkIRect rect =
+              SkIRect::MakeXYWH(pos(rng), pos(rng), size(rng), size(rng));
+          rects_in1.push_back(rect);
+        }
+
+        for (size_t i = 0; i < iterations_2; ++i) {
+          SkIRect rect =
+              SkIRect::MakeXYWH(pos(rng), pos(rng), size(rng), size(rng));
+          rects_in2.push_back(rect);
+        }
+
+        DlRegion region1(rects_in1);
+        sk_region1.setRects(rects_in1.data(), rects_in1.size());
+        CheckEquality(region1, sk_region1);
+
+        DlRegion region2(rects_in2);
+        sk_region2.setRects(rects_in2.data(), rects_in2.size());
+        CheckEquality(region2, sk_region2);
+
+        auto intersects_1 = region1.intersects(region2);
+        auto intersects_2 = region2.intersects(region1);
+        auto sk_intesects = sk_region1.intersects(sk_region2);
+        EXPECT_EQ(intersects_1, intersects_2);
+        EXPECT_EQ(intersects_1, sk_intesects);
+
+        {
+          auto rects = region2.getRects(true);
+          for (const auto& r : rects) {
+            EXPECT_EQ(region1.intersects(r), sk_region1.intersects(r));
+          }
+        }
+
+        DlRegion dl_union = DlRegion::MakeUnion(region1, region2);
+        SkRegion sk_union(sk_region1);
+        sk_union.op(sk_region2, SkRegion::kUnion_Op);
+        CheckEquality(dl_union, sk_union);
+
+        DlRegion dl_intersection = DlRegion::MakeIntersection(region1, region2);
+        SkRegion sk_intersection(sk_region1);
+        sk_intersection.op(sk_region2, SkRegion::kIntersect_Op);
+        CheckEquality(dl_intersection, sk_intersection);
+      }
+    }
+  }
+}
+
+}  // namespace testing
+}  // namespace flutter
diff --git a/display_list/geometry/dl_rtree.cc b/display_list/geometry/dl_rtree.cc
new file mode 100644
index 0000000000000000000000000000000000000000..1b51a436e2a3378070d2230e19763ef6b749a24f
--- /dev/null
+++ b/display_list/geometry/dl_rtree.cc
@@ -0,0 +1,224 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/display_list/geometry/dl_rtree.h"
+#include "flutter/display_list/geometry/dl_region.h"
+
+#include "flutter/fml/logging.h"
+
+namespace flutter {
+
+DlRTree::DlRTree(const SkRect rects[],
+                 int N,
+                 const int ids[],
+                 bool p(int),
+                 int invalid_id)
+    : invalid_id_(invalid_id) {
+  if (N <= 0) {
+    FML_DCHECK(N >= 0);
+    return;
+  }
+  FML_DCHECK(rects != nullptr);
+
+  // Count the number of rectangles we actually want to track,
+  // which includes only non-empty rectangles whose optional
+  // ID is not filtered by the predicate.
+  int leaf_count = 0;
+  for (int i = 0; i < N; i++) {
+    if (!rects[i].isEmpty()) {
+      if (ids == nullptr || p(ids[i])) {
+        leaf_count++;
+      }
+    }
+  }
+  leaf_count_ = leaf_count;
+
+  // Count the total number of nodes (leaf and internal) up front
+  // so we can resize the vector just once.
+  uint32_t total_node_count = leaf_count;
+  uint32_t gen_count = leaf_count;
+  while (gen_count > 1) {
+    uint32_t family_count = (gen_count + kMaxChildren - 1u) / kMaxChildren;
+    total_node_count += family_count;
+    gen_count = family_count;
+  }
+
+  nodes_.resize(total_node_count);
+
+  // Now place only the tracked rectangles into the nodes array
+  // in the first leaf_count_ entries.
+  int leaf_index = 0;
+  int id = invalid_id;
+  for (int i = 0; i < N; i++) {
+    if (!rects[i].isEmpty()) {
+      if (ids == nullptr || p(id = ids[i])) {
+        Node& node = nodes_[leaf_index++];
+        node.bounds = rects[i];
+        node.id = id;
+      }
+    }
+  }
+  FML_DCHECK(leaf_index == leaf_count);
+
+  // --- Implementation note ---
+  // Many R-Tree algorithms attempt to consolidate nearby rectangles
+  // into branches of the tree in order to maximize the benefit of
+  // bounds testing against whole sub-trees. The Skia code from which
+  // this was based, though, indicated that empirical tests against a
+  // browser client showed little gains in rendering performance while
+  // costing 17% performance in bulk loading the rects into the R-Tree:
+  // https://github.com/google/skia/blob/12b6bd042f7cdffb9012c90c3b4885601fc7be95/src/core/SkRTree.cpp#L96
+  //
+  // Given that this class will most often be used to track rendering
+  // operations that were drawn in an app that performs a type of
+  // "page layout" with rendering proceeding in a linear fashion from
+  // top to bottom (and left to right or right to left), the rectangles
+  // are likely nearly sorted when they are delivered to this constructor
+  // so leaving them in their original order should show similar results
+  // to what Skia found in their empirical browser tests.
+  // ---
+
+  // Continually process the previous level (generation) of nodes,
+  // combining them into a new generation of parent groups each grouping
+  // at most |kMaxChildren| children and joining their bounds into its
+  // parent bounds.
+  // Each generation will end up reduced by a factor of up to kMaxChildren
+  // until there is just one node left, which is the root node of
+  // the R-Tree.
+  uint32_t gen_start = 0;
+  gen_count = leaf_count;
+  while (gen_count > 1) {
+    uint32_t gen_end = gen_start + gen_count;
+
+    uint32_t family_count = (gen_count + kMaxChildren - 1u) / kMaxChildren;
+    FML_DCHECK(gen_end + family_count <= total_node_count);
+
+    // D here is similar to the variable in a Bresenham line algorithm where
+    // we want to slowly move |family_count| steps along the minor axis as
+    // we move |gen_count| steps along the major axis.
+    //
+    // Each inner loop increments D by family_count.
+    // The inner loop executes a total of gen_count times.
+    // Every time D exceeds 0 we subtract gen_count and move to a new parent.
+    // All told we will increment D by family_count a total of gen_count times.
+    // All told we will decrement D by gen_count a total of family_count times.
+    // This leaves D back at its starting value.
+    //
+    // We could bias/balance where the extra children are placed by varying
+    // the initial count of D from 0 to (1 - family_count), but we aren't
+    // looking at this process aesthetically so we just use 0 as an initial
+    // value. Using 0 provides a "greedy" allocation of the extra children.
+    // Bresenham also uses double the size of the steps we use here also to
+    // have better rounding of when the minor axis steps occur, but again we
+    // don't care about the distribution of the extra children.
+    int D = 0;
+
+    uint32_t sibling_index = gen_start;
+    uint32_t parent_index = gen_end;
+    Node* parent = nullptr;
+    while (sibling_index < gen_end) {
+      if ((D += family_count) > 0) {
+        D -= gen_count;
+        FML_DCHECK(parent_index < gen_end + family_count);
+        parent = &nodes_[parent_index++];
+        parent->bounds.setEmpty();
+        parent->child.index = sibling_index;
+        parent->child.count = 0;
+      }
+      FML_DCHECK(parent != nullptr);
+      parent->bounds.join(nodes_[sibling_index++].bounds);
+      parent->child.count++;
+    }
+    FML_DCHECK(D == 0);
+    FML_DCHECK(sibling_index == gen_end);
+    FML_DCHECK(parent_index == gen_end + family_count);
+    gen_start = gen_end;
+    gen_count = family_count;
+  }
+  FML_DCHECK(gen_start + gen_count == total_node_count);
+}
+
+void DlRTree::search(const SkRect& query, std::vector<int>* results) const {
+  FML_DCHECK(results != nullptr);
+  if (query.isEmpty()) {
+    return;
+  }
+  if (nodes_.size() <= 0) {
+    FML_DCHECK(leaf_count_ == 0);
+    return;
+  }
+  const Node& root = nodes_.back();
+  if (root.bounds.intersects(query)) {
+    if (nodes_.size() == 1) {
+      FML_DCHECK(leaf_count_ == 1);
+      // The root node is the only node and it is a leaf node
+      results->push_back(0);
+    } else {
+      search(root, query, results);
+    }
+  }
+}
+
+std::list<SkRect> DlRTree::searchAndConsolidateRects(const SkRect& query,
+                                                     bool deband) const {
+  // Get the indexes for the operations that intersect with the query rect.
+  std::vector<int> intermediary_results;
+  search(query, &intermediary_results);
+
+  std::vector<SkIRect> rects;
+  rects.reserve(intermediary_results.size());
+  for (int index : intermediary_results) {
+    SkIRect current_record_rect;
+    bounds(index).roundOut(&current_record_rect);
+    rects.push_back(current_record_rect);
+  }
+  DlRegion region(rects);
+
+  auto non_overlapping_rects = region.getRects(deband);
+  std::list<SkRect> final_results;
+  for (const auto& rect : non_overlapping_rects) {
+    final_results.push_back(SkRect::Make(rect));
+  }
+  return final_results;
+}
+
+void DlRTree::search(const Node& parent,
+                     const SkRect& query,
+                     std::vector<int>* results) const {
+  // Caller protects against empty query
+  int start = parent.child.index;
+  int end = start + parent.child.count;
+  for (int i = start; i < end; i++) {
+    const Node& node = nodes_[i];
+    if (node.bounds.intersects(query)) {
+      if (i < leaf_count_) {
+        results->push_back(i);
+      } else {
+        search(node, query, results);
+      }
+    }
+  }
+}
+
+const DlRegion& DlRTree::region() const {
+  if (!region_) {
+    std::vector<SkIRect> rects;
+    rects.resize(leaf_count_);
+    for (int i = 0; i < leaf_count_; i++) {
+      nodes_[i].bounds.roundOut(&rects[i]);
+    }
+    region_.emplace(rects);
+  }
+  return *region_;
+}
+
+const SkRect& DlRTree::bounds() const {
+  if (!nodes_.empty()) {
+    return nodes_.back().bounds;
+  } else {
+    return kEmpty;
+  }
+}
+
+}  // namespace flutter
diff --git a/display_list/geometry/dl_rtree.h b/display_list/geometry/dl_rtree.h
new file mode 100644
index 0000000000000000000000000000000000000000..a60e4e9d77c4478eaf29a6c373efe1bac535c34d
--- /dev/null
+++ b/display_list/geometry/dl_rtree.h
@@ -0,0 +1,154 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_DISPLAY_LIST_GEOMETRY_DL_RTREE_H_
+#define FLUTTER_DISPLAY_LIST_GEOMETRY_DL_RTREE_H_
+
+#include <list>
+#include <optional>
+#include <vector>
+
+#include "flutter/display_list/geometry/dl_region.h"
+#include "flutter/fml/logging.h"
+#include "third_party/skia/include/core/SkColorSpace.h"
+#include "third_party/skia/include/core/SkRect.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
+
+namespace flutter {
+
+/// An R-Tree that stores a list of bounding rectangles with optional
+/// associated IDs.
+///
+/// The R-Tree can be searched in one of two ways:
+/// - Query for a list of hits among the original rectangles
+///   @see |search|
+/// - Query for a set of non-overlapping rectangles that are joined
+///   from the original rectangles that intersect a query rect
+///   @see |searchAndConsolidateRects|
+class DlRTree : public SkRefCnt {
+ private:
+  static constexpr int kMaxChildren = 11;
+
+  // Leaf nodes at start of vector have an ID,
+  // Internal nodes after that have child index and count.
+  struct Node {
+    SkRect bounds;
+    union {
+      struct {
+        uint32_t index;
+        uint32_t count;
+      } child;
+      int id;
+    };
+  };
+
+ public:
+  /// Construct an R-Tree from the list of rectangles respecting the
+  /// order in which they appear in the list. An optional array of
+  /// IDs can be provided to tag each rectangle with information needed
+  /// by the caller as well as an optional predicate that can filter
+  /// out rectangles with IDs that should not be stored in the R-Tree.
+  ///
+  /// If an array of IDs is not specified then all leaf nodes will be
+  /// represented by the |invalid_id| (which defaults to -1).
+  ///
+  /// Invalid rects that are empty or contain a NaN value will not be
+  /// stored in the R-Tree. And, if a |predicate| function is provided,
+  /// that function will be called to query if the rectangle associated
+  /// with the ID should be included.
+  ///
+  /// Duplicate rectangles and IDs are allowed and not processed in any
+  /// way except to eliminate invalid rectangles and IDs that are rejected
+  /// by the optional predicate function.
+  DlRTree(
+      const SkRect rects[],
+      int N,
+      const int ids[] = nullptr,
+      bool predicate(int id) = [](int) { return true; },
+      int invalid_id = -1);
+
+  /// Search the rectangles and return a vector of leaf node indices for
+  /// rectangles that intersect the query.
+  ///
+  /// Note that the indices are internal indices of the stored data
+  /// and not the index of the rectangles or ids in the constructor.
+  /// The returned indices may not themselves be in numerical order,
+  /// but they will represent the rectangles and IDs in the order in
+  /// which they were passed into the constructor. The actual rectangle
+  /// and ID associated with each index can be retrieved using the
+  /// |DlRTree::id| and |DlRTree::bounds| methods.
+  void search(const SkRect& query, std::vector<int>* results) const;
+
+  /// Return the ID for the indicated result of a query or
+  /// invalid_id if the index is not a valid leaf node index.
+  int id(int result_index) const {
+    return (result_index >= 0 && result_index < leaf_count_)
+               ? nodes_[result_index].id
+               : invalid_id_;
+  }
+
+  /// Returns maximum and minimum axis values of rectangles in this R-Tree.
+  /// If R-Tree is empty returns an empty SkRect.
+  const SkRect& bounds() const;
+
+  /// Return the rectangle bounds for the indicated result of a query
+  /// or an empty rect if the index is not a valid leaf node index.
+  const SkRect& bounds(int result_index) const {
+    return (result_index >= 0 && result_index < leaf_count_)
+               ? nodes_[result_index].bounds
+               : kEmpty;
+  }
+
+  /// Returns the bytes used by the object and all of its node data.
+  size_t bytes_used() const {
+    return sizeof(DlRTree) + sizeof(Node) * nodes_.size();
+  }
+
+  /// Returns the number of leaf nodes corresponding to non-empty
+  /// rectangles that were passed in the constructor and not filtered
+  /// out by the predicate.
+  int leaf_count() const { return leaf_count_; }
+
+  /// Return the total number of nodes used in the R-Tree, both leaf
+  /// and internal consolidation nodes.
+  int node_count() const { return nodes_.size(); }
+
+  /// Finds the rects in the tree that intersect with the query rect.
+  ///
+  /// The returned list of rectangles will be non-overlapping.
+  /// In other words, the bounds of each rect in the result list are mutually
+  /// exclusive.
+  ///
+  /// If |deband| is true, then matching rectangles from adjacent DlRegion
+  /// spanlines will be joined together. This reduces the number of
+  /// rectangles returned, but requires some extra computation.
+  std::list<SkRect> searchAndConsolidateRects(const SkRect& query,
+                                              bool deband = true) const;
+
+  /// Returns DlRegion that represents the union of all rectangles in the
+  /// R-Tree.
+  const DlRegion& region() const;
+
+  /// Returns DlRegion that represents the union of all rectangles in the
+  /// R-Tree intersected with the query rect.
+  DlRegion region(const SkRect& query) const {
+    return DlRegion::MakeIntersection(region(), DlRegion(query.roundOut()));
+  }
+
+ private:
+  static constexpr SkRect kEmpty = SkRect::MakeEmpty();
+
+  void search(const Node& parent,
+              const SkRect& query,
+              std::vector<int>* results) const;
+
+  std::vector<Node> nodes_;
+  int leaf_count_ = 0;
+  int invalid_id_;
+  mutable std::optional<DlRegion> region_;
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_DISPLAY_LIST_GEOMETRY_DL_RTREE_H_
diff --git a/display_list/geometry/dl_rtree_unittests.cc b/display_list/geometry/dl_rtree_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..bc19fec8a5f79f1c439ead5fc76abf719c05dcf3
--- /dev/null
+++ b/display_list/geometry/dl_rtree_unittests.cc
@@ -0,0 +1,323 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/display_list/geometry/dl_rtree.h"
+#include "gtest/gtest.h"
+
+#include "third_party/skia/include/core/SkRect.h"
+
+namespace flutter {
+namespace testing {
+
+#ifndef NDEBUG
+TEST(DisplayListRTree, NullRectListNonZeroCount) {
+  EXPECT_DEATH_IF_SUPPORTED(new DlRTree(nullptr, 1), "rects != nullptr");
+}
+
+TEST(DisplayListRTree, NegativeCount) {
+  EXPECT_DEATH_IF_SUPPORTED(new DlRTree(nullptr, -1), "N >= 0");
+}
+
+TEST(DisplayListRTree, NullSearchResultVector) {
+  DlRTree tree(nullptr, 0);
+  EXPECT_DEATH_IF_SUPPORTED(tree.search(SkRect::MakeLTRB(0, 0, 1, 1), nullptr),
+                            "results != nullptr");
+}
+#endif
+
+TEST(DisplayListRTree, NullRectListZeroCount) {
+  DlRTree tree(nullptr, 0);
+  EXPECT_EQ(tree.leaf_count(), 0);
+  EXPECT_EQ(tree.node_count(), 0);
+  std::vector<int> results;
+  auto huge = SkRect::MakeLTRB(-1e6, -1e6, 1e6, 1e6);
+  tree.search(huge, &results);
+  EXPECT_EQ(results.size(), 0u);
+  auto list = tree.searchAndConsolidateRects(huge);
+  EXPECT_EQ(list.size(), 0u);
+}
+
+TEST(DisplayListRTree, ManySizes) {
+  // A diagonal of non-overlapping 10x10 rectangles spaced 20
+  // pixels apart.
+  // Rect 1 goes from  0 to 10
+  // Rect 2 goes from 20 to 30
+  // etc. in both dimensions
+  const int kMaxN = 250;
+  SkRect rects[kMaxN + 1];
+  int ids[kMaxN + 1];
+  for (int i = 0; i <= kMaxN; i++) {
+    rects[i].setXYWH(i * 20, i * 20, 10, 10);
+    ids[i] = i + 42;
+  }
+  std::vector<int> results;
+  for (int N = 0; N <= kMaxN; N++) {
+    DlRTree tree(rects, N, ids);
+    auto desc = "node count = " + std::to_string(N);
+    EXPECT_EQ(tree.leaf_count(), N) << desc;
+    EXPECT_GE(tree.node_count(), N) << desc;
+    EXPECT_EQ(tree.id(-1), -1) << desc;
+    EXPECT_EQ(tree.bounds(-1), SkRect::MakeEmpty()) << desc;
+    EXPECT_EQ(tree.id(N), -1) << desc;
+    EXPECT_EQ(tree.bounds(N), SkRect::MakeEmpty()) << desc;
+    results.clear();
+    tree.search(SkRect::MakeEmpty(), &results);
+    EXPECT_EQ(results.size(), 0u) << desc;
+    results.clear();
+    tree.search(SkRect::MakeLTRB(2, 2, 8, 8), &results);
+    if (N == 0) {
+      EXPECT_EQ(results.size(), 0u) << desc;
+    } else {
+      EXPECT_EQ(results.size(), 1u) << desc;
+      EXPECT_EQ(results[0], 0) << desc;
+      EXPECT_EQ(tree.id(results[0]), ids[0]) << desc;
+      EXPECT_EQ(tree.bounds(results[0]), rects[0]) << desc;
+      for (int i = 1; i < N; i++) {
+        results.clear();
+        auto query = SkRect::MakeXYWH(i * 20 + 2, i * 20 + 2, 6, 6);
+        tree.search(query, &results);
+        EXPECT_EQ(results.size(), 1u) << desc;
+        EXPECT_EQ(results[0], i) << desc;
+        EXPECT_EQ(tree.id(results[0]), ids[i]) << desc;
+        EXPECT_EQ(tree.bounds(results[0]), rects[i]) << desc;
+        auto list = tree.searchAndConsolidateRects(query);
+        EXPECT_EQ(list.size(), 1u);
+        EXPECT_EQ(list.front(), rects[i]);
+      }
+    }
+  }
+}
+
+TEST(DisplayListRTree, HugeSize) {
+  // A diagonal of non-overlapping 10x10 rectangles spaced 20
+  // pixels apart.
+  // Rect 1 goes from  0 to 10
+  // Rect 2 goes from 20 to 30
+  // etc. in both dimensions
+  const int N = 10000;
+  SkRect rects[N];
+  int ids[N];
+  for (int i = 0; i < N; i++) {
+    rects[i].setXYWH(i * 20, i * 20, 10, 10);
+    ids[i] = i + 42;
+  }
+  DlRTree tree(rects, N, ids);
+  EXPECT_EQ(tree.leaf_count(), N);
+  EXPECT_GE(tree.node_count(), N);
+  EXPECT_EQ(tree.id(-1), -1);
+  EXPECT_EQ(tree.bounds(-1), SkRect::MakeEmpty());
+  EXPECT_EQ(tree.id(N), -1);
+  EXPECT_EQ(tree.bounds(N), SkRect::MakeEmpty());
+  std::vector<int> results;
+  tree.search(SkRect::MakeEmpty(), &results);
+  EXPECT_EQ(results.size(), 0u);
+  for (int i = 0; i < N; i++) {
+    results.clear();
+    tree.search(SkRect::MakeXYWH(i * 20 + 2, i * 20 + 2, 6, 6), &results);
+    EXPECT_EQ(results.size(), 1u);
+    EXPECT_EQ(results[0], i);
+    EXPECT_EQ(tree.id(results[0]), ids[i]);
+    EXPECT_EQ(tree.bounds(results[0]), rects[i]);
+  }
+}
+
+TEST(DisplayListRTree, Grid) {
+  // Non-overlapping 10 x 10 rectangles starting at 5, 5 with
+  // 10 pixels between them.
+  // Rect 1 goes from  5 to 15
+  // Rect 2 goes from 25 to 35
+  // etc. in both dimensions
+  const int ROWS = 10;
+  const int COLS = 10;
+  const int N = ROWS * COLS;
+  SkRect rects[N];
+  int ids[N];
+  for (int r = 0; r < ROWS; r++) {
+    int y = r * 20 + 5;
+    for (int c = 0; c < COLS; c++) {
+      int x = c * 20 + 5;
+      int i = r * COLS + c;
+      rects[i] = SkRect::MakeXYWH(x, y, 10, 10);
+      ids[i] = i + 42;
+    }
+  }
+  DlRTree tree(rects, N, ids);
+  EXPECT_EQ(tree.leaf_count(), N);
+  EXPECT_GE(tree.node_count(), N);
+  EXPECT_EQ(tree.id(-1), -1);
+  EXPECT_EQ(tree.bounds(-1), SkRect::MakeEmpty());
+  EXPECT_EQ(tree.id(N), -1);
+  EXPECT_EQ(tree.bounds(N), SkRect::MakeEmpty());
+  std::vector<int> results;
+  tree.search(SkRect::MakeEmpty(), &results);
+  EXPECT_EQ(results.size(), 0u);
+  // Testing eqch rect for a single hit
+  for (int r = 0; r < ROWS; r++) {
+    int y = r * 20 + 5;
+    for (int c = 0; c < COLS; c++) {
+      int x = c * 20 + 5;
+      int i = r * COLS + c;
+      auto desc =
+          "row " + std::to_string(r + 1) + ", col " + std::to_string(c + 1);
+      results.clear();
+      auto query = SkRect::MakeXYWH(x + 2, y + 2, 6, 6);
+      tree.search(query, &results);
+      EXPECT_EQ(results.size(), 1u) << desc;
+      EXPECT_EQ(results[0], i) << desc;
+      EXPECT_EQ(tree.id(results[0]), ids[i]) << desc;
+      EXPECT_EQ(tree.bounds(results[0]), rects[i]) << desc;
+      auto list = tree.searchAndConsolidateRects(query);
+      EXPECT_EQ(list.size(), 1u);
+      EXPECT_EQ(list.front(), rects[i]);
+    }
+  }
+  // Testing inside each gap for no hits
+  for (int r = 1; r < ROWS; r++) {
+    int y = r * 20 + 5;
+    for (int c = 1; c < COLS; c++) {
+      int x = c * 20 + 5;
+      auto desc =
+          "row " + std::to_string(r + 1) + ", col " + std::to_string(c + 1);
+      results.clear();
+      auto query = SkRect::MakeXYWH(x - 8, y - 8, 6, 6);
+      tree.search(query, &results);
+      EXPECT_EQ(results.size(), 0u) << desc;
+      auto list = tree.searchAndConsolidateRects(query);
+      EXPECT_EQ(list.size(), 0u) << desc;
+    }
+  }
+  // Spanning each gap for a quad of hits
+  for (int r = 1; r < ROWS; r++) {
+    int y = r * 20 + 5;
+    for (int c = 1; c < COLS; c++) {
+      int x = c * 20 + 5;
+      // We will hit this rect and the ones above/left of us
+      int i = r * COLS + c;
+      auto desc =
+          "row " + std::to_string(r + 1) + ", col " + std::to_string(c + 1);
+      results.clear();
+      auto query = SkRect::MakeXYWH(x - 11, y - 11, 12, 12);
+      tree.search(query, &results);
+      EXPECT_EQ(results.size(), 4u) << desc;
+
+      // First rect is above and to the left
+      EXPECT_EQ(results[0], i - COLS - 1) << desc;
+      EXPECT_EQ(tree.id(results[0]), ids[i - COLS - 1]) << desc;
+      EXPECT_EQ(tree.bounds(results[0]), rects[i - COLS - 1]) << desc;
+
+      // Second rect is above
+      EXPECT_EQ(results[1], i - COLS) << desc;
+      EXPECT_EQ(tree.id(results[1]), ids[i - COLS]) << desc;
+      EXPECT_EQ(tree.bounds(results[1]), rects[i - COLS]) << desc;
+
+      // Third rect is left
+      EXPECT_EQ(results[2], i - 1) << desc;
+      EXPECT_EQ(tree.id(results[2]), ids[i - 1]) << desc;
+      EXPECT_EQ(tree.bounds(results[2]), rects[i - 1]) << desc;
+
+      // Fourth rect is us
+      EXPECT_EQ(results[3], i) << desc;
+      EXPECT_EQ(tree.id(results[3]), ids[i]) << desc;
+      EXPECT_EQ(tree.bounds(results[3]), rects[i]) << desc;
+
+      auto list = tree.searchAndConsolidateRects(query);
+      EXPECT_EQ(list.size(), 4u);
+      list.remove(rects[i - COLS - 1]);
+      list.remove(rects[i - COLS]);
+      list.remove(rects[i - 1]);
+      list.remove(rects[i]);
+      EXPECT_EQ(list.size(), 0u);
+    }
+  }
+}
+
+TEST(DisplayListRTree, OverlappingRects) {
+  // Rectangles are centered at coordinates 15, 35, and 55 and are 15 wide
+  // This gives them 10 pixels of overlap with the rectangles on either
+  // side of them and the 10 pixels around their center coordinate are
+  // exclusive to themselves.
+  // So, horizontally and vertically, they cover the following ranges:
+  // First  row/col:  0 to 30
+  // Second row/col: 20 to 50
+  // Third  row/col: 40 to 70
+  // Coords  0 to 20 are only the first row/col
+  // Coords 20 to 30 are both first and second row/col
+  // Coords 30 to 40 are only the second row/col
+  // Coords 40 to 50 are both second and third row/col
+  // Coords 50 to 70 are only the third row/col
+  //
+  // In either dimension:
+  // 0------------------20--------30--------40--------50------------------70
+  // |         rect1               |
+  //                     |  1 & 2  |
+  //                     |            rect2            |
+  //                                         |  2 & 3  |
+  //                                         |                rect3        |
+  SkRect rects[9];
+  for (int r = 0; r < 3; r++) {
+    int y = 15 + 20 * r;
+    for (int c = 0; c < 3; c++) {
+      int x = 15 + 20 * c;
+      rects[r * 3 + c].setLTRB(x - 15, y - 15, x + 15, y + 15);
+    }
+  }
+  DlRTree tree(rects, 9);
+  // Tiny rects only intersecting a single source rect
+  for (int r = 0; r < 3; r++) {
+    int y = 15 + 20 * r;
+    for (int c = 0; c < 3; c++) {
+      int x = 15 + 20 * c;
+      auto query = SkRect::MakeLTRB(x - 1, y - 1, x + 1, y + 1);
+      auto list = tree.searchAndConsolidateRects(query);
+      EXPECT_EQ(list.size(), 1u);
+      EXPECT_EQ(list.front(), rects[r * 3 + c]);
+    }
+  }
+  // Wide rects intersecting 3 source rects horizontally
+  for (int r = 0; r < 3; r++) {
+    int c = 1;
+    int y = 15 + 20 * r;
+    int x = 15 + 20 * c;
+    auto query = SkRect::MakeLTRB(x - 6, y - 1, x + 6, y + 1);
+    auto list = tree.searchAndConsolidateRects(query);
+    EXPECT_EQ(list.size(), 1u);
+    EXPECT_EQ(list.front(), SkRect::MakeLTRB(x - 35, y - 15, x + 35, y + 15));
+  }
+  // Tall rects intersecting 3 source rects vertically
+  for (int c = 0; c < 3; c++) {
+    int r = 1;
+    int x = 15 + 20 * c;
+    int y = 15 + 20 * r;
+    auto query = SkRect::MakeLTRB(x - 1, y - 6, x + 1, y + 6);
+    auto list = tree.searchAndConsolidateRects(query);
+    EXPECT_EQ(list.size(), 1u);
+    EXPECT_EQ(list.front(), SkRect::MakeLTRB(x - 15, y - 35, x + 15, y + 35));
+  }
+  // Finally intersecting all 9 rects
+  auto query = SkRect::MakeLTRB(35 - 6, 35 - 6, 35 + 6, 35 + 6);
+  auto list = tree.searchAndConsolidateRects(query);
+  EXPECT_EQ(list.size(), 1u);
+  EXPECT_EQ(list.front(), SkRect::MakeLTRB(0, 0, 70, 70));
+}
+
+TEST(DisplayListRTree, Region) {
+  SkRect rect[9];
+  for (int i = 0; i < 9; i++) {
+    rect[i] = SkRect::MakeXYWH(i * 10, i * 10, 20, 20);
+  }
+  DlRTree rtree(rect, 9);
+  const auto& region = rtree.region();
+  auto rects = region.getRects(true);
+  std::vector<SkIRect> expected_rects{
+      SkIRect::MakeLTRB(0, 0, 20, 10),    SkIRect::MakeLTRB(0, 10, 30, 20),
+      SkIRect::MakeLTRB(10, 20, 40, 30),  SkIRect::MakeLTRB(20, 30, 50, 40),
+      SkIRect::MakeLTRB(30, 40, 60, 50),  SkIRect::MakeLTRB(40, 50, 70, 60),
+      SkIRect::MakeLTRB(50, 60, 80, 70),  SkIRect::MakeLTRB(60, 70, 90, 80),
+      SkIRect::MakeLTRB(70, 80, 100, 90), SkIRect::MakeLTRB(80, 90, 100, 100),
+  };
+  EXPECT_EQ(rects.size(), expected_rects.size());
+}
+
+}  // namespace testing
+}  // namespace flutter
diff --git a/display_list/display_list_image.cc b/display_list/image/dl_image.cc
similarity index 87%
rename from display_list/display_list_image.cc
rename to display_list/image/dl_image.cc
index 7196a4e47cad1e243f9254c6d36afa8b789955e6..b4a0c4bfc443a0ffeb358c550a2f4662e71b23b4 100644
--- a/display_list/display_list_image.cc
+++ b/display_list/image/dl_image.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/display_list/display_list_image.h"
+#include "flutter/display_list/image/dl_image.h"
 
-#include "flutter/display_list/display_list_image_skia.h"
+#include "flutter/display_list/image/dl_image_skia.h"
 
 namespace flutter {
 
diff --git a/display_list/display_list_image.h b/display_list/image/dl_image.h
similarity index 84%
rename from display_list/display_list_image.h
rename to display_list/image/dl_image.h
index 19ae1d935bf6de1aac458baf2e846b7a1a874a5c..aecb58b8f76319560e42e0f268993ff296f11437 100644
--- a/display_list/display_list_image.h
+++ b/display_list/image/dl_image.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_IMAGE_H_
-#define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_IMAGE_H_
+#ifndef FLUTTER_DISPLAY_LIST_IMAGE_DL_IMAGE_H_
+#define FLUTTER_DISPLAY_LIST_IMAGE_DL_IMAGE_H_
 
 #include <memory>
 #include <optional>
 #include <string>
 
 #include "flutter/fml/macros.h"
-#include "include/core/SkRefCnt.h"
 #include "third_party/skia/include/core/SkImage.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
 
 namespace impeller {
 class Texture;
@@ -67,6 +67,16 @@ class DlImage : public SkRefCnt {
 
   virtual bool isTextureBacked() const = 0;
 
+  //----------------------------------------------------------------------------
+  /// @brief      If the underlying platform image held by this object has no
+  ///             threading requirements for the release of that image (or if
+  ///             arrangements have already been made to forward that image to
+  ///             the correct thread upon deletion), this method returns true.
+  ///
+  /// @return     True if the underlying image is held in a thread-safe manner.
+  ///
+  virtual bool isUIThreadSafe() const = 0;
+
   //----------------------------------------------------------------------------
   /// @return     The dimensions of the pixel grid.
   ///
@@ -121,7 +131,9 @@ class DlImage : public SkRefCnt {
 
   bool Equals(const DlImage& other) const { return Equals(&other); }
 
-  bool Equals(sk_sp<const DlImage> other) const { return Equals(other.get()); }
+  bool Equals(const sk_sp<const DlImage>& other) const {
+    return Equals(other.get());
+  }
 
  protected:
   DlImage();
@@ -129,4 +141,4 @@ class DlImage : public SkRefCnt {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_DISPLAY_LIST_DISPLAY_LIST_IMAGE_H_
+#endif  // FLUTTER_DISPLAY_LIST_IMAGE_DL_IMAGE_H_
diff --git a/display_list/display_list_image_skia.cc b/display_list/image/dl_image_skia.cc
similarity index 63%
rename from display_list/display_list_image_skia.cc
rename to display_list/image/dl_image_skia.cc
index 07fd84143b8fce982eee0c111c756dc2ad1f2e52..8c896e5c6f6f89e404010238b5536516bba47980 100644
--- a/display_list/display_list_image_skia.cc
+++ b/display_list/image/dl_image_skia.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/display_list/display_list_image_skia.h"
+#include "flutter/display_list/image/dl_image_skia.h"
 
 namespace flutter {
 
@@ -31,6 +31,17 @@ bool DlImageSkia::isTextureBacked() const {
   return image_ ? image_->isTextureBacked() : false;
 }
 
+// |DlImage|
+bool DlImageSkia::isUIThreadSafe() const {
+  // Technically if the image is null then we are thread-safe, and possibly
+  // if the image is constructed from a heap raster as well, but there
+  // should never be a leak of an instance of this class into any data that
+  // is shared with the UI thread, regardless of value.
+  // All images intended to be shared with the UI thread should be constructed
+  // via one of the DlImage subclasses designed for that purpose.
+  return false;
+}
+
 // |DlImage|
 SkISize DlImageSkia::dimensions() const {
   return image_ ? image_->dimensions() : SkISize::MakeEmpty();
@@ -38,10 +49,10 @@ SkISize DlImageSkia::dimensions() const {
 
 // |DlImage|
 size_t DlImageSkia::GetApproximateByteSize() const {
-  auto size = sizeof(this);
+  auto size = sizeof(*this);
   if (image_) {
     const auto& info = image_->imageInfo();
-    const auto kMipmapOverhead = 4.0 / 3.0;
+    const auto kMipmapOverhead = image_->hasMipmaps() ? 4.0 / 3.0 : 1.0;
     const size_t image_byte_size = info.computeMinByteSize() * kMipmapOverhead;
     size += image_byte_size;
   }
diff --git a/display_list/display_list_image_skia.h b/display_list/image/dl_image_skia.h
similarity index 72%
rename from display_list/display_list_image_skia.h
rename to display_list/image/dl_image_skia.h
index 7e76de802aa9754cb4e16bbe86338aa229eb62da..03bcfa144a83a8eafc4ffc569101a83f88d14115 100644
--- a/display_list/display_list_image_skia.h
+++ b/display_list/image/dl_image_skia.h
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_IMAGE_SKIA_H_
-#define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_IMAGE_SKIA_H_
+#ifndef FLUTTER_DISPLAY_LIST_IMAGE_DL_IMAGE_SKIA_H_
+#define FLUTTER_DISPLAY_LIST_IMAGE_DL_IMAGE_SKIA_H_
 
-#include "flutter/display_list/display_list_image.h"
+#include "flutter/display_list/image/dl_image.h"
 #include "flutter/fml/macros.h"
 
 namespace flutter {
 
 class DlImageSkia final : public DlImage {
  public:
-  DlImageSkia(sk_sp<SkImage> image);
+  explicit DlImageSkia(sk_sp<SkImage> image);
 
   // |DlImage|
   ~DlImageSkia() override;
@@ -29,6 +29,9 @@ class DlImageSkia final : public DlImage {
   // |DlImage|
   bool isTextureBacked() const override;
 
+  // |DlImage|
+  bool isUIThreadSafe() const override;
+
   // |DlImage|
   SkISize dimensions() const override;
 
@@ -43,4 +46,4 @@ class DlImageSkia final : public DlImage {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_DISPLAY_LIST_DISPLAY_LIST_IMAGE_SKIA_H_
+#endif  // FLUTTER_DISPLAY_LIST_IMAGE_DL_IMAGE_SKIA_H_
diff --git a/display_list/skia/dl_sk_canvas.cc b/display_list/skia/dl_sk_canvas.cc
new file mode 100644
index 0000000000000000000000000000000000000000..bc40ef13fa3ae9729b12fd497e5ec0869f89d2c0
--- /dev/null
+++ b/display_list/skia/dl_sk_canvas.cc
@@ -0,0 +1,354 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/display_list/skia/dl_sk_canvas.h"
+
+#include "flutter/display_list/skia/dl_sk_conversions.h"
+#include "flutter/display_list/skia/dl_sk_dispatcher.h"
+#include "flutter/fml/trace_event.h"
+
+#include "third_party/skia/include/core/SkColorFilter.h"
+#include "third_party/skia/include/gpu/GrDirectContext.h"
+#include "third_party/skia/include/gpu/GrRecordingContext.h"
+
+namespace flutter {
+
+class SkOptionalPaint {
+ public:
+  // SkOptionalPaint is only valid for ops that do not use the ColorSource
+  explicit SkOptionalPaint(const DlPaint* dl_paint) {
+    if (dl_paint && !dl_paint->isDefault()) {
+      sk_paint_ = ToNonShaderSk(*dl_paint);
+      ptr_ = &sk_paint_;
+    } else {
+      ptr_ = nullptr;
+    }
+  }
+
+  SkPaint* operator()() { return ptr_; }
+
+ private:
+  SkPaint sk_paint_;
+  SkPaint* ptr_;
+};
+
+void DlSkCanvasAdapter::set_canvas(SkCanvas* canvas) {
+  delegate_ = canvas;
+}
+
+SkISize DlSkCanvasAdapter::GetBaseLayerSize() const {
+  return delegate_->getBaseLayerSize();
+}
+
+SkImageInfo DlSkCanvasAdapter::GetImageInfo() const {
+  return delegate_->imageInfo();
+}
+
+void DlSkCanvasAdapter::Save() {
+  delegate_->save();
+}
+
+void DlSkCanvasAdapter::SaveLayer(const SkRect* bounds,
+                                  const DlPaint* paint,
+                                  const DlImageFilter* backdrop) {
+  sk_sp<SkImageFilter> sk_backdrop = ToSk(backdrop);
+  SkOptionalPaint sk_paint(paint);
+  TRACE_EVENT0("flutter", "Canvas::saveLayer");
+  delegate_->saveLayer(
+      SkCanvas::SaveLayerRec{bounds, sk_paint(), sk_backdrop.get(), 0});
+}
+
+void DlSkCanvasAdapter::Restore() {
+  delegate_->restore();
+}
+
+int DlSkCanvasAdapter::GetSaveCount() const {
+  return delegate_->getSaveCount();
+}
+
+void DlSkCanvasAdapter::RestoreToCount(int restore_count) {
+  delegate_->restoreToCount(restore_count);
+}
+
+void DlSkCanvasAdapter::Translate(SkScalar tx, SkScalar ty) {
+  delegate_->translate(tx, ty);
+}
+
+void DlSkCanvasAdapter::Scale(SkScalar sx, SkScalar sy) {
+  delegate_->scale(sx, sy);
+}
+
+void DlSkCanvasAdapter::Rotate(SkScalar degrees) {
+  delegate_->rotate(degrees);
+}
+
+void DlSkCanvasAdapter::Skew(SkScalar sx, SkScalar sy) {
+  delegate_->skew(sx, sy);
+}
+
+// clang-format off
+
+// 2x3 2D affine subset of a 4x4 transform in row major order
+void DlSkCanvasAdapter::Transform2DAffine(
+    SkScalar mxx, SkScalar mxy, SkScalar mxt,
+    SkScalar myx, SkScalar myy, SkScalar myt) {
+  delegate_->concat(SkMatrix::MakeAll(mxx, mxy, mxt, myx, myy, myt, 0, 0, 1));
+}
+
+// full 4x4 transform in row major order
+void DlSkCanvasAdapter::TransformFullPerspective(
+    SkScalar mxx, SkScalar mxy, SkScalar mxz, SkScalar mxt,
+    SkScalar myx, SkScalar myy, SkScalar myz, SkScalar myt,
+    SkScalar mzx, SkScalar mzy, SkScalar mzz, SkScalar mzt,
+    SkScalar mwx, SkScalar mwy, SkScalar mwz, SkScalar mwt) {
+  delegate_->concat(SkM44(mxx, mxy, mxz, mxt,
+                          myx, myy, myz, myt,
+                          mzx, mzy, mzz, mzt,
+                          mwx, mwy, mwz, mwt));
+}
+
+// clang-format on
+
+void DlSkCanvasAdapter::TransformReset() {
+  delegate_->resetMatrix();
+}
+
+void DlSkCanvasAdapter::Transform(const SkMatrix* matrix) {
+  delegate_->concat(*matrix);
+}
+
+void DlSkCanvasAdapter::Transform(const SkM44* matrix44) {
+  delegate_->concat(*matrix44);
+}
+
+void DlSkCanvasAdapter::SetTransform(const SkMatrix* matrix) {
+  delegate_->setMatrix(*matrix);
+}
+
+void DlSkCanvasAdapter::SetTransform(const SkM44* matrix44) {
+  delegate_->setMatrix(*matrix44);
+}
+
+/// Returns the 4x4 full perspective transform representing all transform
+/// operations executed so far in this DisplayList within the enclosing
+/// save stack.
+SkM44 DlSkCanvasAdapter::GetTransformFullPerspective() const {
+  return delegate_->getLocalToDevice();
+}
+
+/// Returns the 3x3 partial perspective transform representing all transform
+/// operations executed so far in this DisplayList within the enclosing
+/// save stack.
+SkMatrix DlSkCanvasAdapter::GetTransform() const {
+  return delegate_->getTotalMatrix();
+}
+
+void DlSkCanvasAdapter::ClipRect(const SkRect& rect,
+                                 ClipOp clip_op,
+                                 bool is_aa) {
+  delegate_->clipRect(rect, ToSk(clip_op), is_aa);
+}
+
+void DlSkCanvasAdapter::ClipRRect(const SkRRect& rrect,
+                                  ClipOp clip_op,
+                                  bool is_aa) {
+  delegate_->clipRRect(rrect, ToSk(clip_op), is_aa);
+}
+
+void DlSkCanvasAdapter::ClipPath(const SkPath& path,
+                                 ClipOp clip_op,
+                                 bool is_aa) {
+  delegate_->clipPath(path, ToSk(clip_op), is_aa);
+}
+
+/// Conservative estimate of the bounds of all outstanding clip operations
+/// measured in the coordinate space within which this DisplayList will
+/// be rendered.
+SkRect DlSkCanvasAdapter::GetDestinationClipBounds() const {
+  return SkRect::Make(delegate_->getDeviceClipBounds());
+}
+
+/// Conservative estimate of the bounds of all outstanding clip operations
+/// transformed into the local coordinate space in which currently
+/// recorded rendering operations are interpreted.
+SkRect DlSkCanvasAdapter::GetLocalClipBounds() const {
+  return delegate_->getLocalClipBounds();
+}
+
+/// Return true iff the supplied bounds are easily shown to be outside
+/// of the current clip bounds. This method may conservatively return
+/// false if it cannot make the determination.
+bool DlSkCanvasAdapter::QuickReject(const SkRect& bounds) const {
+  return delegate_->quickReject(bounds);
+}
+
+void DlSkCanvasAdapter::DrawPaint(const DlPaint& paint) {
+  delegate_->drawPaint(ToSk(paint));
+}
+
+void DlSkCanvasAdapter::DrawColor(DlColor color, DlBlendMode mode) {
+  delegate_->drawColor(ToSk(color), ToSk(mode));
+}
+
+void DlSkCanvasAdapter::DrawLine(const SkPoint& p0,
+                                 const SkPoint& p1,
+                                 const DlPaint& paint) {
+  delegate_->drawLine(p0, p1, ToStrokedSk(paint));
+}
+
+void DlSkCanvasAdapter::DrawRect(const SkRect& rect, const DlPaint& paint) {
+  delegate_->drawRect(rect, ToSk(paint));
+}
+
+void DlSkCanvasAdapter::DrawOval(const SkRect& bounds, const DlPaint& paint) {
+  delegate_->drawOval(bounds, ToSk(paint));
+}
+
+void DlSkCanvasAdapter::DrawCircle(const SkPoint& center,
+                                   SkScalar radius,
+                                   const DlPaint& paint) {
+  delegate_->drawCircle(center, radius, ToSk(paint));
+}
+
+void DlSkCanvasAdapter::DrawRRect(const SkRRect& rrect, const DlPaint& paint) {
+  delegate_->drawRRect(rrect, ToSk(paint));
+}
+
+void DlSkCanvasAdapter::DrawDRRect(const SkRRect& outer,
+                                   const SkRRect& inner,
+                                   const DlPaint& paint) {
+  delegate_->drawDRRect(outer, inner, ToSk(paint));
+}
+
+void DlSkCanvasAdapter::DrawPath(const SkPath& path, const DlPaint& paint) {
+  delegate_->drawPath(path, ToSk(paint));
+}
+
+void DlSkCanvasAdapter::DrawArc(const SkRect& bounds,
+                                SkScalar start,
+                                SkScalar sweep,
+                                bool useCenter,
+                                const DlPaint& paint) {
+  delegate_->drawArc(bounds, start, sweep, useCenter, ToSk(paint));
+}
+
+void DlSkCanvasAdapter::DrawPoints(PointMode mode,
+                                   uint32_t count,
+                                   const SkPoint pts[],
+                                   const DlPaint& paint) {
+  delegate_->drawPoints(ToSk(mode), count, pts, ToStrokedSk(paint));
+}
+
+void DlSkCanvasAdapter::DrawVertices(const DlVertices* vertices,
+                                     DlBlendMode mode,
+                                     const DlPaint& paint) {
+  delegate_->drawVertices(ToSk(vertices), ToSk(mode), ToSk(paint));
+}
+
+void DlSkCanvasAdapter::DrawImage(const sk_sp<DlImage>& image,
+                                  const SkPoint point,
+                                  DlImageSampling sampling,
+                                  const DlPaint* paint) {
+  SkOptionalPaint sk_paint(paint);
+  sk_sp<SkImage> sk_image = image->skia_image();
+  delegate_->drawImage(sk_image.get(), point.fX, point.fY, ToSk(sampling),
+                       sk_paint());
+}
+
+void DlSkCanvasAdapter::DrawImageRect(const sk_sp<DlImage>& image,
+                                      const SkRect& src,
+                                      const SkRect& dst,
+                                      DlImageSampling sampling,
+                                      const DlPaint* paint,
+                                      SrcRectConstraint constraint) {
+  SkOptionalPaint sk_paint(paint);
+  sk_sp<SkImage> sk_image = image->skia_image();
+  delegate_->drawImageRect(sk_image.get(), src, dst, ToSk(sampling), sk_paint(),
+                           ToSk(constraint));
+}
+
+void DlSkCanvasAdapter::DrawImageNine(const sk_sp<DlImage>& image,
+                                      const SkIRect& center,
+                                      const SkRect& dst,
+                                      DlFilterMode filter,
+                                      const DlPaint* paint) {
+  SkOptionalPaint sk_paint(paint);
+  sk_sp<SkImage> sk_image = image->skia_image();
+  delegate_->drawImageNine(sk_image.get(), center, dst, ToSk(filter),
+                           sk_paint());
+}
+
+void DlSkCanvasAdapter::DrawAtlas(const sk_sp<DlImage>& atlas,
+                                  const SkRSXform xform[],
+                                  const SkRect tex[],
+                                  const DlColor colors[],
+                                  int count,
+                                  DlBlendMode mode,
+                                  DlImageSampling sampling,
+                                  const SkRect* cullRect,
+                                  const DlPaint* paint) {
+  SkOptionalPaint sk_paint(paint);
+  sk_sp<SkImage> sk_image = atlas->skia_image();
+  const SkColor* sk_colors = reinterpret_cast<const SkColor*>(colors);
+  delegate_->drawAtlas(sk_image.get(), xform, tex, sk_colors, count, ToSk(mode),
+                       ToSk(sampling), cullRect, sk_paint());
+}
+
+void DlSkCanvasAdapter::DrawDisplayList(const sk_sp<DisplayList> display_list,
+                                        SkScalar opacity) {
+  const int restore_count = delegate_->getSaveCount();
+
+  // Figure out whether we can apply the opacity during dispatch or
+  // if we need a saveLayer.
+  if (opacity < SK_Scalar1 && !display_list->can_apply_group_opacity()) {
+    TRACE_EVENT0("flutter", "Canvas::saveLayer");
+    delegate_->saveLayerAlphaf(&display_list->bounds(), opacity);
+    opacity = SK_Scalar1;
+  } else {
+    delegate_->save();
+  }
+
+  DlSkCanvasDispatcher dispatcher(delegate_, opacity);
+  if (display_list->has_rtree()) {
+    display_list->Dispatch(dispatcher, delegate_->getLocalClipBounds());
+  } else {
+    display_list->Dispatch(dispatcher);
+  }
+
+  delegate_->restoreToCount(restore_count);
+}
+
+void DlSkCanvasAdapter::DrawTextBlob(const sk_sp<SkTextBlob>& blob,
+                                     SkScalar x,
+                                     SkScalar y,
+                                     const DlPaint& paint) {
+  delegate_->drawTextBlob(blob, x, y, ToSk(paint));
+}
+
+void DlSkCanvasAdapter::DrawTextFrame(
+    const std::shared_ptr<impeller::TextFrame>& text_frame,
+    SkScalar x,
+    SkScalar y,
+    const DlPaint& paint) {
+  FML_CHECK(false);
+}
+
+void DlSkCanvasAdapter::DrawShadow(const SkPath& path,
+                                   const DlColor color,
+                                   const SkScalar elevation,
+                                   bool transparent_occluder,
+                                   SkScalar dpr) {
+  DlSkCanvasDispatcher::DrawShadow(delegate_, path, color, elevation,
+                                   transparent_occluder, dpr);
+}
+
+void DlSkCanvasAdapter::Flush() {
+  auto dContext = GrAsDirectContext(delegate_->recordingContext());
+
+  if (dContext) {
+    dContext->flushAndSubmit();
+  }
+}
+
+}  // namespace flutter
diff --git a/display_list/skia/dl_sk_canvas.h b/display_list/skia/dl_sk_canvas.h
new file mode 100644
index 0000000000000000000000000000000000000000..f085d35ae8c9d4b5d4abb70dbd209fd431fb496a
--- /dev/null
+++ b/display_list/skia/dl_sk_canvas.h
@@ -0,0 +1,166 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_DISPLAY_LIST_SKIA_DL_SK_CANVAS_H_
+#define FLUTTER_DISPLAY_LIST_SKIA_DL_SK_CANVAS_H_
+
+#include "flutter/display_list/dl_canvas.h"
+#include "flutter/display_list/skia/dl_sk_types.h"
+#include "impeller/typographer/text_frame.h"
+
+namespace flutter {
+
+// -----------------------------------------------------------------------------
+/// @brief      Backend implementation of |DlCanvas| for |SkCanvas|.
+///
+/// @see        DlCanvas
+class DlSkCanvasAdapter final : public virtual DlCanvas {
+ public:
+  DlSkCanvasAdapter() : delegate_(nullptr) {}
+  explicit DlSkCanvasAdapter(SkCanvas* canvas) : delegate_(canvas) {}
+  ~DlSkCanvasAdapter() override = default;
+
+  void set_canvas(SkCanvas* canvas);
+  SkCanvas* canvas() { return delegate_; }
+
+  SkISize GetBaseLayerSize() const override;
+  SkImageInfo GetImageInfo() const override;
+
+  void Save() override;
+  void SaveLayer(const SkRect* bounds,
+                 const DlPaint* paint = nullptr,
+                 const DlImageFilter* backdrop = nullptr) override;
+  void Restore() override;
+  int GetSaveCount() const override;
+  void RestoreToCount(int restore_count) override;
+
+  void Translate(SkScalar tx, SkScalar ty) override;
+  void Scale(SkScalar sx, SkScalar sy) override;
+  void Rotate(SkScalar degrees) override;
+  void Skew(SkScalar sx, SkScalar sy) override;
+
+  // clang-format off
+
+  // 2x3 2D affine subset of a 4x4 transform in row major order
+  void Transform2DAffine(SkScalar mxx, SkScalar mxy, SkScalar mxt,
+                         SkScalar myx, SkScalar myy, SkScalar myt) override;
+  // full 4x4 transform in row major order
+  void TransformFullPerspective(
+      SkScalar mxx, SkScalar mxy, SkScalar mxz, SkScalar mxt,
+      SkScalar myx, SkScalar myy, SkScalar myz, SkScalar myt,
+      SkScalar mzx, SkScalar mzy, SkScalar mzz, SkScalar mzt,
+      SkScalar mwx, SkScalar mwy, SkScalar mwz, SkScalar mwt) override;
+  // clang-format on
+  void TransformReset() override;
+  void Transform(const SkMatrix* matrix) override;
+  void Transform(const SkM44* matrix44) override;
+  void SetTransform(const SkMatrix* matrix) override;
+  void SetTransform(const SkM44* matrix44) override;
+  using DlCanvas::SetTransform;
+  using DlCanvas::Transform;
+
+  /// Returns the 4x4 full perspective transform representing all transform
+  /// operations executed so far in this DisplayList within the enclosing
+  /// save stack.
+  SkM44 GetTransformFullPerspective() const override;
+  /// Returns the 3x3 partial perspective transform representing all transform
+  /// operations executed so far in this DisplayList within the enclosing
+  /// save stack.
+  SkMatrix GetTransform() const override;
+
+  void ClipRect(const SkRect& rect, ClipOp clip_op, bool is_aa) override;
+  void ClipRRect(const SkRRect& rrect, ClipOp clip_op, bool is_aa) override;
+  void ClipPath(const SkPath& path, ClipOp clip_op, bool is_aa) override;
+
+  /// Conservative estimate of the bounds of all outstanding clip operations
+  /// measured in the coordinate space within which this DisplayList will
+  /// be rendered.
+  SkRect GetDestinationClipBounds() const override;
+  /// Conservative estimate of the bounds of all outstanding clip operations
+  /// transformed into the local coordinate space in which currently
+  /// recorded rendering operations are interpreted.
+  SkRect GetLocalClipBounds() const override;
+
+  /// Return true iff the supplied bounds are easily shown to be outside
+  /// of the current clip bounds. This method may conservatively return
+  /// false if it cannot make the determination.
+  bool QuickReject(const SkRect& bounds) const override;
+
+  void DrawPaint(const DlPaint& paint) override;
+  void DrawColor(DlColor color, DlBlendMode mode) override;
+  void DrawLine(const SkPoint& p0,
+                const SkPoint& p1,
+                const DlPaint& paint) override;
+  void DrawRect(const SkRect& rect, const DlPaint& paint) override;
+  void DrawOval(const SkRect& bounds, const DlPaint& paint) override;
+  void DrawCircle(const SkPoint& center,
+                  SkScalar radius,
+                  const DlPaint& paint) override;
+  void DrawRRect(const SkRRect& rrect, const DlPaint& paint) override;
+  void DrawDRRect(const SkRRect& outer,
+                  const SkRRect& inner,
+                  const DlPaint& paint) override;
+  void DrawPath(const SkPath& path, const DlPaint& paint) override;
+  void DrawArc(const SkRect& bounds,
+               SkScalar start,
+               SkScalar sweep,
+               bool useCenter,
+               const DlPaint& paint) override;
+  void DrawPoints(PointMode mode,
+                  uint32_t count,
+                  const SkPoint pts[],
+                  const DlPaint& paint) override;
+  void DrawVertices(const DlVertices* vertices,
+                    DlBlendMode mode,
+                    const DlPaint& paint) override;
+  void DrawImage(const sk_sp<DlImage>& image,
+                 const SkPoint point,
+                 DlImageSampling sampling,
+                 const DlPaint* paint = nullptr) override;
+  void DrawImageRect(
+      const sk_sp<DlImage>& image,
+      const SkRect& src,
+      const SkRect& dst,
+      DlImageSampling sampling,
+      const DlPaint* paint = nullptr,
+      SrcRectConstraint constraint = SrcRectConstraint::kFast) override;
+  void DrawImageNine(const sk_sp<DlImage>& image,
+                     const SkIRect& center,
+                     const SkRect& dst,
+                     DlFilterMode filter,
+                     const DlPaint* paint = nullptr) override;
+  void DrawAtlas(const sk_sp<DlImage>& atlas,
+                 const SkRSXform xform[],
+                 const SkRect tex[],
+                 const DlColor colors[],
+                 int count,
+                 DlBlendMode mode,
+                 DlImageSampling sampling,
+                 const SkRect* cullRect,
+                 const DlPaint* paint = nullptr) override;
+  void DrawDisplayList(const sk_sp<DisplayList> display_list,
+                       SkScalar opacity = SK_Scalar1) override;
+  void DrawTextBlob(const sk_sp<SkTextBlob>& blob,
+                    SkScalar x,
+                    SkScalar y,
+                    const DlPaint& paint) override;
+  void DrawTextFrame(const std::shared_ptr<impeller::TextFrame>& text_frame,
+                     SkScalar x,
+                     SkScalar y,
+                     const DlPaint& paint) override;
+  void DrawShadow(const SkPath& path,
+                  const DlColor color,
+                  const SkScalar elevation,
+                  bool transparent_occluder,
+                  SkScalar dpr) override;
+
+  void Flush() override;
+
+ private:
+  SkCanvas* delegate_;
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_DISPLAY_LIST_SKIA_DL_SK_CANVAS_H_
diff --git a/display_list/skia/dl_sk_conversions.cc b/display_list/skia/dl_sk_conversions.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ca30d2ad6f91ea1e8f1b477b634d786fc1ac0934
--- /dev/null
+++ b/display_list/skia/dl_sk_conversions.cc
@@ -0,0 +1,301 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/display_list/skia/dl_sk_conversions.h"
+
+#include "third_party/skia/include/core/SkColorFilter.h"
+#include "third_party/skia/include/effects/SkGradientShader.h"
+#include "third_party/skia/include/effects/SkImageFilters.h"
+
+namespace flutter {
+
+// clang-format off
+constexpr float kInvertColorMatrix[20] = {
+  -1.0,    0,    0, 1.0, 0,
+     0, -1.0,    0, 1.0, 0,
+     0,    0, -1.0, 1.0, 0,
+   1.0,  1.0,  1.0, 1.0, 0
+};
+// clang-format on
+
+SkPaint ToSk(const DlPaint& paint) {
+  SkPaint sk_paint;
+
+  sk_paint.setAntiAlias(paint.isAntiAlias());
+  sk_paint.setColor(ToSk(paint.getColor()));
+  sk_paint.setBlendMode(ToSk(paint.getBlendMode()));
+  sk_paint.setStyle(ToSk(paint.getDrawStyle()));
+  sk_paint.setStrokeWidth(paint.getStrokeWidth());
+  sk_paint.setStrokeMiter(paint.getStrokeMiter());
+  sk_paint.setStrokeCap(ToSk(paint.getStrokeCap()));
+  sk_paint.setStrokeJoin(ToSk(paint.getStrokeJoin()));
+  sk_paint.setImageFilter(ToSk(paint.getImageFilterPtr()));
+  auto color_filter = ToSk(paint.getColorFilterPtr());
+  if (paint.isInvertColors()) {
+    auto invert_filter = SkColorFilters::Matrix(kInvertColorMatrix);
+    if (color_filter) {
+      invert_filter = invert_filter->makeComposed(color_filter);
+    }
+    color_filter = invert_filter;
+  }
+  sk_paint.setColorFilter(color_filter);
+
+  auto color_source = paint.getColorSourcePtr();
+  if (color_source) {
+    // Unconditionally set dither to true for gradient shaders.
+    sk_paint.setDither(color_source->isGradient());
+    sk_paint.setShader(ToSk(color_source));
+  }
+
+  sk_paint.setMaskFilter(ToSk(paint.getMaskFilterPtr()));
+  sk_paint.setPathEffect(ToSk(paint.getPathEffectPtr()));
+
+  return sk_paint;
+}
+
+SkPaint ToStrokedSk(const DlPaint& paint) {
+  DlPaint stroked_paint = paint;
+  stroked_paint.setDrawStyle(DlDrawStyle::kStroke);
+  return ToSk(stroked_paint);
+}
+
+SkPaint ToNonShaderSk(const DlPaint& paint) {
+  DlPaint non_shader_paint = paint;
+  non_shader_paint.setColorSource(nullptr);
+  return ToSk(non_shader_paint);
+}
+
+sk_sp<SkShader> ToSk(const DlColorSource* source) {
+  if (!source) {
+    return nullptr;
+  }
+  static auto ToSkColors = [](const DlGradientColorSourceBase* gradient) {
+    return reinterpret_cast<const SkColor*>(gradient->colors());
+  };
+  switch (source->type()) {
+    case DlColorSourceType::kColor: {
+      const DlColorColorSource* color_source = source->asColor();
+      FML_DCHECK(color_source != nullptr);
+      return SkShaders::Color(ToSk(color_source->color()));
+    }
+    case DlColorSourceType::kImage: {
+      const DlImageColorSource* image_source = source->asImage();
+      FML_DCHECK(image_source != nullptr);
+      auto image = image_source->image();
+      if (!image || !image->skia_image()) {
+        return nullptr;
+      }
+      return image->skia_image()->makeShader(
+          ToSk(image_source->horizontal_tile_mode()),
+          ToSk(image_source->vertical_tile_mode()),
+          ToSk(image_source->sampling()), image_source->matrix_ptr());
+    }
+    case DlColorSourceType::kLinearGradient: {
+      const DlLinearGradientColorSource* linear_source =
+          source->asLinearGradient();
+      FML_DCHECK(linear_source != nullptr);
+      SkPoint pts[] = {linear_source->start_point(),
+                       linear_source->end_point()};
+      return SkGradientShader::MakeLinear(
+          pts, ToSkColors(linear_source), linear_source->stops(),
+          linear_source->stop_count(), ToSk(linear_source->tile_mode()), 0,
+          linear_source->matrix_ptr());
+    }
+    case DlColorSourceType::kRadialGradient: {
+      const DlRadialGradientColorSource* radial_source =
+          source->asRadialGradient();
+      FML_DCHECK(radial_source != nullptr);
+      return SkGradientShader::MakeRadial(
+          radial_source->center(), radial_source->radius(),
+          ToSkColors(radial_source), radial_source->stops(),
+          radial_source->stop_count(), ToSk(radial_source->tile_mode()), 0,
+          radial_source->matrix_ptr());
+    }
+    case DlColorSourceType::kConicalGradient: {
+      const DlConicalGradientColorSource* conical_source =
+          source->asConicalGradient();
+      FML_DCHECK(conical_source != nullptr);
+      return SkGradientShader::MakeTwoPointConical(
+          conical_source->start_center(), conical_source->start_radius(),
+          conical_source->end_center(), conical_source->end_radius(),
+          ToSkColors(conical_source), conical_source->stops(),
+          conical_source->stop_count(), ToSk(conical_source->tile_mode()), 0,
+          conical_source->matrix_ptr());
+    }
+    case DlColorSourceType::kSweepGradient: {
+      const DlSweepGradientColorSource* sweep_source =
+          source->asSweepGradient();
+      FML_DCHECK(sweep_source != nullptr);
+      return SkGradientShader::MakeSweep(
+          sweep_source->center().x(), sweep_source->center().y(),
+          ToSkColors(sweep_source), sweep_source->stops(),
+          sweep_source->stop_count(), ToSk(sweep_source->tile_mode()),
+          sweep_source->start(), sweep_source->end(), 0,
+          sweep_source->matrix_ptr());
+    }
+    case DlColorSourceType::kRuntimeEffect: {
+      const DlRuntimeEffectColorSource* runtime_source =
+          source->asRuntimeEffect();
+      FML_DCHECK(runtime_source != nullptr);
+      auto runtime_effect = runtime_source->runtime_effect();
+      if (!runtime_effect || !runtime_effect->skia_runtime_effect()) {
+        return nullptr;
+      }
+
+      auto samplers = runtime_source->samplers();
+      std::vector<sk_sp<SkShader>> sk_samplers(samplers.size());
+      for (size_t i = 0; i < samplers.size(); i++) {
+        auto sampler = samplers[i];
+        if (sampler == nullptr) {
+          return nullptr;
+        }
+        sk_samplers[i] = ToSk(sampler);
+      }
+
+      auto uniform_data = runtime_source->uniform_data();
+      auto ref = new std::shared_ptr<std::vector<uint8_t>>(uniform_data);
+      auto sk_uniform_data = SkData::MakeWithProc(
+          uniform_data->data(), uniform_data->size(),
+          [](const void* ptr, void* context) {
+            delete reinterpret_cast<std::shared_ptr<std::vector<uint8_t>>*>(
+                context);
+          },
+          ref);
+
+      return runtime_effect->skia_runtime_effect()->makeShader(
+          sk_uniform_data, sk_samplers.data(), sk_samplers.size());
+    }
+#ifdef IMPELLER_ENABLE_3D
+    case DlColorSourceType::kScene: {
+      return nullptr;
+    }
+#endif  // IMPELLER_ENABLE_3D
+  }
+}
+
+sk_sp<SkImageFilter> ToSk(const DlImageFilter* filter) {
+  if (!filter) {
+    return nullptr;
+  }
+  switch (filter->type()) {
+    case DlImageFilterType::kBlur: {
+      const DlBlurImageFilter* blur_filter = filter->asBlur();
+      FML_DCHECK(blur_filter != nullptr);
+      return SkImageFilters::Blur(blur_filter->sigma_x(),
+                                  blur_filter->sigma_y(),
+                                  ToSk(blur_filter->tile_mode()), nullptr);
+    }
+    case DlImageFilterType::kDilate: {
+      const DlDilateImageFilter* dilate_filter = filter->asDilate();
+      FML_DCHECK(dilate_filter != nullptr);
+      return SkImageFilters::Dilate(dilate_filter->radius_x(),
+                                    dilate_filter->radius_y(), nullptr);
+    }
+    case DlImageFilterType::kErode: {
+      const DlErodeImageFilter* erode_filter = filter->asErode();
+      FML_DCHECK(erode_filter != nullptr);
+      return SkImageFilters::Erode(erode_filter->radius_x(),
+                                   erode_filter->radius_y(), nullptr);
+    }
+    case DlImageFilterType::kMatrix: {
+      const DlMatrixImageFilter* matrix_filter = filter->asMatrix();
+      FML_DCHECK(matrix_filter != nullptr);
+      return SkImageFilters::MatrixTransform(
+          matrix_filter->matrix(), ToSk(matrix_filter->sampling()), nullptr);
+    }
+    case DlImageFilterType::kCompose: {
+      const DlComposeImageFilter* compose_filter = filter->asCompose();
+      FML_DCHECK(compose_filter != nullptr);
+      return SkImageFilters::Compose(ToSk(compose_filter->outer()),
+                                     ToSk(compose_filter->inner()));
+    }
+    case DlImageFilterType::kColorFilter: {
+      const DlColorFilterImageFilter* cf_filter = filter->asColorFilter();
+      FML_DCHECK(cf_filter != nullptr);
+      return SkImageFilters::ColorFilter(ToSk(cf_filter->color_filter()),
+                                         nullptr);
+    }
+    case DlImageFilterType::kLocalMatrix: {
+      const DlLocalMatrixImageFilter* lm_filter = filter->asLocalMatrix();
+      FML_DCHECK(lm_filter != nullptr);
+      sk_sp<SkImageFilter> skia_filter = ToSk(lm_filter->image_filter());
+      // The image_filter property itself might have been null, or the
+      // construction of the SkImageFilter might be optimized to null
+      // for any number of reasons. In any case, if the filter is null
+      // or optimizaed away, let's then optimize away this local matrix
+      // case by returning null.
+      if (!skia_filter) {
+        return nullptr;
+      }
+      return skia_filter->makeWithLocalMatrix(lm_filter->matrix());
+    }
+  }
+}
+
+sk_sp<SkColorFilter> ToSk(const DlColorFilter* filter) {
+  if (!filter) {
+    return nullptr;
+  }
+  switch (filter->type()) {
+    case DlColorFilterType::kBlend: {
+      const DlBlendColorFilter* blend_filter = filter->asBlend();
+      FML_DCHECK(blend_filter != nullptr);
+      return SkColorFilters::Blend(ToSk(blend_filter->color()),
+                                   ToSk(blend_filter->mode()));
+    }
+    case DlColorFilterType::kMatrix: {
+      const DlMatrixColorFilter* matrix_filter = filter->asMatrix();
+      FML_DCHECK(matrix_filter != nullptr);
+      float matrix[20];
+      matrix_filter->get_matrix(matrix);
+      return SkColorFilters::Matrix(matrix);
+    }
+    case DlColorFilterType::kSrgbToLinearGamma: {
+      return SkColorFilters::SRGBToLinearGamma();
+    }
+    case DlColorFilterType::kLinearToSrgbGamma: {
+      return SkColorFilters::LinearToSRGBGamma();
+    }
+  }
+}
+
+sk_sp<SkMaskFilter> ToSk(const DlMaskFilter* filter) {
+  if (!filter) {
+    return nullptr;
+  }
+  switch (filter->type()) {
+    case DlMaskFilterType::kBlur: {
+      const DlBlurMaskFilter* blur_filter = filter->asBlur();
+      FML_DCHECK(blur_filter != nullptr);
+      return SkMaskFilter::MakeBlur(ToSk(blur_filter->style()),
+                                    blur_filter->sigma(),
+                                    blur_filter->respectCTM());
+    }
+  }
+}
+
+sk_sp<SkPathEffect> ToSk(const DlPathEffect* effect) {
+  if (!effect) {
+    return nullptr;
+  }
+  switch (effect->type()) {
+    case DlPathEffectType::kDash: {
+      const DlDashPathEffect* dash_effect = effect->asDash();
+      FML_DCHECK(dash_effect != nullptr);
+      return SkDashPathEffect::Make(dash_effect->intervals(),
+                                    dash_effect->count(), dash_effect->phase());
+    }
+  }
+}
+
+sk_sp<SkVertices> ToSk(const DlVertices* vertices) {
+  const SkColor* sk_colors =
+      reinterpret_cast<const SkColor*>(vertices->colors());
+  return SkVertices::MakeCopy(ToSk(vertices->mode()), vertices->vertex_count(),
+                              vertices->vertices(),
+                              vertices->texture_coordinates(), sk_colors,
+                              vertices->index_count(), vertices->indices());
+}
+
+}  // namespace flutter
diff --git a/display_list/skia/dl_sk_conversions.h b/display_list/skia/dl_sk_conversions.h
new file mode 100644
index 0000000000000000000000000000000000000000..b8970af7aa1fcc0140b2f5f32c0eea81c5a889d0
--- /dev/null
+++ b/display_list/skia/dl_sk_conversions.h
@@ -0,0 +1,137 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_DISPLAY_LIST_SKIA_DL_SK_CONVERSIONS_H_
+#define FLUTTER_DISPLAY_LIST_SKIA_DL_SK_CONVERSIONS_H_
+
+#include "flutter/display_list/dl_op_receiver.h"
+#include "flutter/display_list/skia/dl_sk_types.h"
+
+namespace flutter {
+
+SkPaint ToSk(const DlPaint& paint);
+SkPaint ToStrokedSk(const DlPaint& paint);
+SkPaint ToNonShaderSk(const DlPaint& paint);
+
+inline SkBlendMode ToSk(DlBlendMode mode) {
+  return static_cast<SkBlendMode>(mode);
+}
+
+inline SkColor ToSk(DlColor color) {
+  // This is safe because both SkColor and DlColor are backed by ARGB uint32_t.
+  // See dl_sk_conversions_unittests.cc.
+  return reinterpret_cast<SkColor&>(color);
+}
+
+inline SkPaint::Style ToSk(DlDrawStyle style) {
+  return static_cast<SkPaint::Style>(style);
+}
+
+inline SkPaint::Cap ToSk(DlStrokeCap cap) {
+  return static_cast<SkPaint::Cap>(cap);
+}
+
+inline SkPaint::Join ToSk(DlStrokeJoin join) {
+  return static_cast<SkPaint::Join>(join);
+}
+
+inline SkTileMode ToSk(DlTileMode dl_mode) {
+  return static_cast<SkTileMode>(dl_mode);
+}
+
+inline SkBlurStyle ToSk(const DlBlurStyle blur_style) {
+  return static_cast<SkBlurStyle>(blur_style);
+}
+
+inline SkFilterMode ToSk(const DlFilterMode filter_mode) {
+  return static_cast<SkFilterMode>(filter_mode);
+}
+
+inline SkVertices::VertexMode ToSk(DlVertexMode dl_mode) {
+  return static_cast<SkVertices::VertexMode>(dl_mode);
+}
+
+inline SkSamplingOptions ToSk(DlImageSampling sampling) {
+  switch (sampling) {
+    case DlImageSampling::kCubic:
+      return SkSamplingOptions(SkCubicResampler{1 / 3.0f, 1 / 3.0f});
+    case DlImageSampling::kLinear:
+      return SkSamplingOptions(SkFilterMode::kLinear);
+    case DlImageSampling::kMipmapLinear:
+      return SkSamplingOptions(SkFilterMode::kLinear, SkMipmapMode::kLinear);
+    case DlImageSampling::kNearestNeighbor:
+      return SkSamplingOptions(SkFilterMode::kNearest);
+  }
+}
+
+inline SkCanvas::SrcRectConstraint ToSk(
+    DlCanvas::SrcRectConstraint constraint) {
+  return static_cast<SkCanvas::SrcRectConstraint>(constraint);
+}
+
+inline SkClipOp ToSk(DlCanvas::ClipOp op) {
+  return static_cast<SkClipOp>(op);
+}
+
+inline SkCanvas::PointMode ToSk(DlCanvas::PointMode mode) {
+  return static_cast<SkCanvas::PointMode>(mode);
+}
+
+extern sk_sp<SkShader> ToSk(const DlColorSource* source);
+inline sk_sp<SkShader> ToSk(
+    const std::shared_ptr<const DlColorSource>& source) {
+  return ToSk(source.get());
+}
+inline sk_sp<SkShader> ToSk(const DlColorSource& source) {
+  return ToSk(&source);
+}
+
+extern sk_sp<SkImageFilter> ToSk(const DlImageFilter* filter);
+inline sk_sp<SkImageFilter> ToSk(
+    const std::shared_ptr<const DlImageFilter>& filter) {
+  return ToSk(filter.get());
+}
+inline sk_sp<SkImageFilter> ToSk(const DlImageFilter& filter) {
+  return ToSk(&filter);
+}
+
+extern sk_sp<SkColorFilter> ToSk(const DlColorFilter* filter);
+inline sk_sp<SkColorFilter> ToSk(
+    const std::shared_ptr<const DlColorFilter>& filter) {
+  return ToSk(filter.get());
+}
+inline sk_sp<SkColorFilter> ToSk(const DlColorFilter& filter) {
+  return ToSk(&filter);
+}
+
+extern sk_sp<SkMaskFilter> ToSk(const DlMaskFilter* filter);
+inline sk_sp<SkMaskFilter> ToSk(
+    const std::shared_ptr<const DlMaskFilter>& filter) {
+  return ToSk(filter.get());
+}
+inline sk_sp<SkMaskFilter> ToSk(const DlMaskFilter& filter) {
+  return ToSk(&filter);
+}
+
+extern sk_sp<SkPathEffect> ToSk(const DlPathEffect* effect);
+inline sk_sp<SkPathEffect> ToSk(
+    const std::shared_ptr<const DlPathEffect>& effect) {
+  return ToSk(effect.get());
+}
+inline sk_sp<SkPathEffect> ToSk(const DlPathEffect& effect) {
+  return ToSk(&effect);
+}
+
+extern sk_sp<SkVertices> ToSk(const DlVertices* vertices);
+inline sk_sp<SkVertices> ToSk(
+    const std::shared_ptr<const DlVertices>& vertices) {
+  return ToSk(vertices.get());
+}
+inline sk_sp<SkVertices> ToSk(const DlVertices& vertices) {
+  return ToSk(&vertices);
+}
+
+}  // namespace flutter
+
+#endif  // FLUTTER_DISPLAY_LIST_SKIA_DL_SK_CONVERSIONS_H_
diff --git a/display_list/skia/dl_sk_conversions_unittests.cc b/display_list/skia/dl_sk_conversions_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..f5adf4d2501b07975f32d22d514da5a0f56e4fef
--- /dev/null
+++ b/display_list/skia/dl_sk_conversions_unittests.cc
@@ -0,0 +1,329 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/display_list/dl_blend_mode.h"
+#include "flutter/display_list/dl_paint.h"
+#include "flutter/display_list/dl_sampling_options.h"
+#include "flutter/display_list/dl_tile_mode.h"
+#include "flutter/display_list/dl_vertices.h"
+#include "flutter/display_list/effects/dl_color_source.h"
+#include "flutter/display_list/skia/dl_sk_conversions.h"
+#include "gtest/gtest.h"
+#include "third_party/skia/include/core/SkColorSpace.h"
+#include "third_party/skia/include/core/SkSamplingOptions.h"
+#include "third_party/skia/include/core/SkTileMode.h"
+
+namespace flutter {
+namespace testing {
+
+TEST(DisplayListImageFilter, LocalImageSkiaNull) {
+  auto blur_filter =
+      std::make_shared<DlBlurImageFilter>(0, 0, DlTileMode::kClamp);
+  DlLocalMatrixImageFilter dl_local_matrix_filter(SkMatrix::RotateDeg(45),
+                                                  blur_filter);
+  // With sigmas set to zero on the blur filter, Skia will return a null filter.
+  // The local matrix filter should return nullptr instead of crashing.
+  ASSERT_EQ(ToSk(dl_local_matrix_filter), nullptr);
+}
+
+TEST(DisplayListSkConversions, ToSkColor) {
+  // Red
+  ASSERT_EQ(ToSk(DlColor::kRed()), SK_ColorRED);
+
+  // Green
+  ASSERT_EQ(ToSk(DlColor::kGreen()), SK_ColorGREEN);
+
+  // Blue
+  ASSERT_EQ(ToSk(DlColor::kBlue()), SK_ColorBLUE);
+
+  // Half transparent grey
+  auto const grey_hex_half_opaque = 0x7F999999;
+  ASSERT_EQ(ToSk(DlColor(grey_hex_half_opaque)), SkColor(grey_hex_half_opaque));
+}
+
+TEST(DisplayListSkConversions, ToSkTileMode) {
+  ASSERT_EQ(ToSk(DlTileMode::kClamp), SkTileMode::kClamp);
+  ASSERT_EQ(ToSk(DlTileMode::kRepeat), SkTileMode::kRepeat);
+  ASSERT_EQ(ToSk(DlTileMode::kMirror), SkTileMode::kMirror);
+  ASSERT_EQ(ToSk(DlTileMode::kDecal), SkTileMode::kDecal);
+}
+
+TEST(DisplayListSkConversions, ToSkBlurStyle) {
+  ASSERT_EQ(ToSk(DlBlurStyle::kInner), SkBlurStyle::kInner_SkBlurStyle);
+  ASSERT_EQ(ToSk(DlBlurStyle::kOuter), SkBlurStyle::kOuter_SkBlurStyle);
+  ASSERT_EQ(ToSk(DlBlurStyle::kSolid), SkBlurStyle::kSolid_SkBlurStyle);
+  ASSERT_EQ(ToSk(DlBlurStyle::kNormal), SkBlurStyle::kNormal_SkBlurStyle);
+}
+
+TEST(DisplayListSkConversions, ToSkDrawStyle) {
+  ASSERT_EQ(ToSk(DlDrawStyle::kFill), SkPaint::Style::kFill_Style);
+  ASSERT_EQ(ToSk(DlDrawStyle::kStroke), SkPaint::Style::kStroke_Style);
+  ASSERT_EQ(ToSk(DlDrawStyle::kStrokeAndFill),
+            SkPaint::Style::kStrokeAndFill_Style);
+}
+
+TEST(DisplayListSkConversions, ToSkStrokeCap) {
+  ASSERT_EQ(ToSk(DlStrokeCap::kButt), SkPaint::Cap::kButt_Cap);
+  ASSERT_EQ(ToSk(DlStrokeCap::kRound), SkPaint::Cap::kRound_Cap);
+  ASSERT_EQ(ToSk(DlStrokeCap::kSquare), SkPaint::Cap::kSquare_Cap);
+}
+
+TEST(DisplayListSkConversions, ToSkStrokeJoin) {
+  ASSERT_EQ(ToSk(DlStrokeJoin::kMiter), SkPaint::Join::kMiter_Join);
+  ASSERT_EQ(ToSk(DlStrokeJoin::kRound), SkPaint::Join::kRound_Join);
+  ASSERT_EQ(ToSk(DlStrokeJoin::kBevel), SkPaint::Join::kBevel_Join);
+}
+
+TEST(DisplayListSkConversions, ToSkVertexMode) {
+  ASSERT_EQ(ToSk(DlVertexMode::kTriangles),
+            SkVertices::VertexMode::kTriangles_VertexMode);
+  ASSERT_EQ(ToSk(DlVertexMode::kTriangleStrip),
+            SkVertices::VertexMode::kTriangleStrip_VertexMode);
+  ASSERT_EQ(ToSk(DlVertexMode::kTriangleFan),
+            SkVertices::VertexMode::kTriangleFan_VertexMode);
+}
+
+TEST(DisplayListSkConversions, ToSkFilterMode) {
+  ASSERT_EQ(ToSk(DlFilterMode::kLinear), SkFilterMode::kLinear);
+  ASSERT_EQ(ToSk(DlFilterMode::kNearest), SkFilterMode::kNearest);
+  ASSERT_EQ(ToSk(DlFilterMode::kLast), SkFilterMode::kLast);
+}
+
+TEST(DisplayListSkConversions, ToSkSrcRectConstraint) {
+  ASSERT_EQ(ToSk(DlCanvas::SrcRectConstraint::kFast),
+            SkCanvas::SrcRectConstraint::kFast_SrcRectConstraint);
+  ASSERT_EQ(ToSk(DlCanvas::SrcRectConstraint::kStrict),
+            SkCanvas::SrcRectConstraint::kStrict_SrcRectConstraint);
+}
+
+TEST(DisplayListSkConversions, ToSkSamplingOptions) {
+  ASSERT_EQ(ToSk(DlImageSampling::kLinear),
+            SkSamplingOptions(SkFilterMode::kLinear, SkMipmapMode::kNone));
+  ASSERT_EQ(ToSk(DlImageSampling::kMipmapLinear),
+            SkSamplingOptions(SkFilterMode::kLinear, SkMipmapMode::kLinear));
+  ASSERT_EQ(ToSk(DlImageSampling::kNearestNeighbor),
+            SkSamplingOptions(SkFilterMode::kNearest, SkMipmapMode::kNone));
+  ASSERT_EQ(ToSk(DlImageSampling::kCubic),
+            SkSamplingOptions(SkCubicResampler{1 / 3.0f, 1 / 3.0f}));
+}
+
+#define FOR_EACH_BLEND_MODE_ENUM(FUNC) \
+  FUNC(kSrc)                           \
+  FUNC(kClear)                         \
+  FUNC(kSrc)                           \
+  FUNC(kDst)                           \
+  FUNC(kSrcOver)                       \
+  FUNC(kDstOver)                       \
+  FUNC(kSrcIn)                         \
+  FUNC(kDstIn)                         \
+  FUNC(kSrcOut)                        \
+  FUNC(kDstOut)                        \
+  FUNC(kSrcATop)                       \
+  FUNC(kDstATop)                       \
+  FUNC(kXor)                           \
+  FUNC(kPlus)                          \
+  FUNC(kModulate)                      \
+  FUNC(kScreen)                        \
+  FUNC(kOverlay)                       \
+  FUNC(kDarken)                        \
+  FUNC(kLighten)                       \
+  FUNC(kColorDodge)                    \
+  FUNC(kColorBurn)                     \
+  FUNC(kHardLight)                     \
+  FUNC(kSoftLight)                     \
+  FUNC(kDifference)                    \
+  FUNC(kExclusion)                     \
+  FUNC(kMultiply)                      \
+  FUNC(kHue)                           \
+  FUNC(kSaturation)                    \
+  FUNC(kColor)                         \
+  FUNC(kLuminosity)                    \
+  FUNC(kLastCoeffMode)                 \
+  FUNC(kLastSeparableMode)             \
+  FUNC(kLastMode)
+
+TEST(DisplayListSkConversions, ToSkBlendMode){
+#define CHECK_TO_SKENUM(V) ASSERT_EQ(ToSk(DlBlendMode::V), SkBlendMode::V);
+    FOR_EACH_BLEND_MODE_ENUM(CHECK_TO_SKENUM)
+#undef CHECK_TO_SKENUM
+}
+
+TEST(DisplayListSkConversions, BlendColorFilterModifiesTransparency) {
+  auto test_mode_color = [](DlBlendMode mode, DlColor color) {
+    std::stringstream desc_str;
+    desc_str << "blend[" << static_cast<int>(mode) << ", " << color.argb()
+             << "]";
+    std::string desc = desc_str.str();
+    DlBlendColorFilter filter(color, mode);
+    auto srgb = SkColorSpace::MakeSRGB();
+    if (filter.modifies_transparent_black()) {
+      auto dl_filter = DlBlendColorFilter::Make(color, mode);
+      auto sk_filter = ToSk(filter);
+      ASSERT_NE(dl_filter, nullptr) << desc;
+      ASSERT_NE(sk_filter, nullptr) << desc;
+      ASSERT_TRUE(sk_filter->filterColor4f(SkColors::kTransparent, srgb.get(),
+                                           srgb.get()) !=
+                  SkColors::kTransparent)
+          << desc;
+    } else {
+      auto dl_filter = DlBlendColorFilter::Make(color, mode);
+      auto sk_filter = ToSk(filter);
+      EXPECT_EQ(dl_filter == nullptr, sk_filter == nullptr) << desc;
+      ASSERT_TRUE(sk_filter == nullptr ||
+                  sk_filter->filterColor4f(SkColors::kTransparent, srgb.get(),
+                                           srgb.get()) ==
+                      SkColors::kTransparent)
+          << desc;
+    }
+  };
+
+  auto test_mode = [&test_mode_color](DlBlendMode mode) {
+    test_mode_color(mode, DlColor::kTransparent());
+    test_mode_color(mode, DlColor::kWhite());
+    test_mode_color(mode, DlColor::kWhite().modulateOpacity(0.5));
+    test_mode_color(mode, DlColor::kBlack());
+    test_mode_color(mode, DlColor::kBlack().modulateOpacity(0.5));
+  };
+
+#define TEST_MODE(V) test_mode(DlBlendMode::V);
+  FOR_EACH_BLEND_MODE_ENUM(TEST_MODE)
+#undef TEST_MODE
+}
+
+#undef FOR_EACH_BLEND_MODE_ENUM
+
+TEST(DisplayListSkConversions, ConvertWithZeroAndNegativeVerticesAndIndices) {
+  std::shared_ptr<const DlVertices> vertices1 = DlVertices::Make(
+      DlVertexMode::kTriangles, 0, nullptr, nullptr, nullptr, 0, nullptr);
+  EXPECT_NE(vertices1, nullptr);
+  EXPECT_NE(ToSk(vertices1), nullptr);
+
+  std::shared_ptr<const DlVertices> vertices2 = DlVertices::Make(
+      DlVertexMode::kTriangles, -1, nullptr, nullptr, nullptr, -1, nullptr);
+  EXPECT_NE(vertices2, nullptr);
+  EXPECT_NE(ToSk(vertices2), nullptr);
+}
+
+TEST(DisplayListVertices, ConvertWithZeroAndNegativeVerticesAndIndices) {
+  DlVertices::Builder builder1(DlVertexMode::kTriangles, 0,
+                               DlVertices::Builder::kNone, 0);
+  EXPECT_TRUE(builder1.is_valid());
+  std::shared_ptr<DlVertices> vertices1 = builder1.build();
+  EXPECT_NE(vertices1, nullptr);
+  EXPECT_NE(ToSk(vertices1), nullptr);
+
+  DlVertices::Builder builder2(DlVertexMode::kTriangles, -1,
+                               DlVertices::Builder::kNone, -1);
+  EXPECT_TRUE(builder2.is_valid());
+  std::shared_ptr<DlVertices> vertices2 = builder2.build();
+  EXPECT_NE(vertices2, nullptr);
+  EXPECT_NE(ToSk(vertices2), nullptr);
+}
+
+TEST(DisplayListColorSource, ConvertRuntimeEffect) {
+  const sk_sp<DlRuntimeEffect> kTestRuntimeEffect1 = DlRuntimeEffect::MakeSkia(
+      SkRuntimeEffect::MakeForShader(
+          SkString("vec4 main(vec2 p) { return vec4(0); }"))
+          .effect);
+  const sk_sp<DlRuntimeEffect> kTestRuntimeEffect2 = DlRuntimeEffect::MakeSkia(
+      SkRuntimeEffect::MakeForShader(
+          SkString("vec4 main(vec2 p) { return vec4(1); }"))
+          .effect);
+  std::shared_ptr<DlRuntimeEffectColorSource> source1 =
+      DlColorSource::MakeRuntimeEffect(
+          kTestRuntimeEffect1, {}, std::make_shared<std::vector<uint8_t>>());
+  std::shared_ptr<DlRuntimeEffectColorSource> source2 =
+      DlColorSource::MakeRuntimeEffect(
+          kTestRuntimeEffect2, {}, std::make_shared<std::vector<uint8_t>>());
+  std::shared_ptr<DlRuntimeEffectColorSource> source3 =
+      DlColorSource::MakeRuntimeEffect(
+          nullptr, {}, std::make_shared<std::vector<uint8_t>>());
+
+  ASSERT_NE(ToSk(source1), nullptr);
+  ASSERT_NE(ToSk(source2), nullptr);
+  ASSERT_EQ(ToSk(source3), nullptr);
+}
+
+TEST(DisplayListColorSource, ConvertRuntimeEffectWithNullSampler) {
+  const sk_sp<DlRuntimeEffect> kTestRuntimeEffect1 = DlRuntimeEffect::MakeSkia(
+      SkRuntimeEffect::MakeForShader(
+          SkString("vec4 main(vec2 p) { return vec4(0); }"))
+          .effect);
+  std::shared_ptr<DlRuntimeEffectColorSource> source1 =
+      DlColorSource::MakeRuntimeEffect(
+          kTestRuntimeEffect1, {nullptr},
+          std::make_shared<std::vector<uint8_t>>());
+
+  ASSERT_EQ(ToSk(source1), nullptr);
+}
+
+TEST(DisplayListSkConversions, MatrixColorFilterModifiesTransparency) {
+  auto test_matrix = [](int element, SkScalar value) {
+    // clang-format off
+    float matrix[] = {
+        1, 0, 0, 0, 0,
+        0, 1, 0, 0, 0,
+        0, 0, 1, 0, 0,
+        0, 0, 0, 1, 0,
+    };
+    // clang-format on
+    std::string desc =
+        "matrix[" + std::to_string(element) + "] = " + std::to_string(value);
+    matrix[element] = value;
+    DlMatrixColorFilter filter(matrix);
+    auto dl_filter = DlMatrixColorFilter::Make(matrix);
+    auto sk_filter = ToSk(filter);
+    auto srgb = SkColorSpace::MakeSRGB();
+    EXPECT_EQ(dl_filter == nullptr, sk_filter == nullptr);
+    EXPECT_EQ(filter.modifies_transparent_black(),
+              sk_filter && sk_filter->filterColor4f(SkColors::kTransparent,
+                                                    srgb.get(), srgb.get()) !=
+                               SkColors::kTransparent);
+  };
+
+  // Tests identity (matrix[0] already == 1 in an identity filter)
+  test_matrix(0, 1);
+  // test_matrix(19, 1);
+  for (int i = 0; i < 20; i++) {
+    test_matrix(i, -0.25);
+    test_matrix(i, 0);
+    test_matrix(i, 0.25);
+    test_matrix(i, 1);
+    test_matrix(i, 1.25);
+    test_matrix(i, SK_ScalarNaN);
+    test_matrix(i, SK_ScalarInfinity);
+    test_matrix(i, -SK_ScalarInfinity);
+  }
+}
+
+TEST(DisplayListSkConversions, ToSkDitheringEnabledForGradients) {
+  // Test that when using the utility method "ToSk", the resulting SkPaint
+  // has "isDither" set to true, if the paint is a gradient, because it's
+  // a supported feature in the Impeller backend.
+
+  DlPaint dl_paint;
+
+  // Set the paint to be a gradient.
+  dl_paint.setColorSource(DlColorSource::MakeLinear(SkPoint::Make(0, 0),
+                                                    SkPoint::Make(100, 100), 0,
+                                                    0, 0, DlTileMode::kClamp));
+
+  {
+    SkPaint sk_paint = ToSk(dl_paint);
+    EXPECT_TRUE(sk_paint.isDither());
+  }
+
+  {
+    SkPaint sk_paint = ToStrokedSk(dl_paint);
+    EXPECT_TRUE(sk_paint.isDither());
+  }
+
+  {
+    SkPaint sk_paint = ToNonShaderSk(dl_paint);
+    EXPECT_FALSE(sk_paint.isDither());
+  }
+}
+
+}  // namespace testing
+}  // namespace flutter
diff --git a/display_list/display_list_canvas_dispatcher.cc b/display_list/skia/dl_sk_dispatcher.cc
similarity index 41%
rename from display_list/display_list_canvas_dispatcher.cc
rename to display_list/skia/dl_sk_dispatcher.cc
index 686dffdd24225d16bd3ae536ddff547eab5fd205..e75ccd96da4b9953715a823b9ae5ff724fd9abdc 100644
--- a/display_list/display_list_canvas_dispatcher.cc
+++ b/display_list/skia/dl_sk_dispatcher.cc
@@ -2,21 +2,25 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/display_list/display_list_canvas_dispatcher.h"
+#include "flutter/display_list/skia/dl_sk_dispatcher.h"
 
-#include "flutter/display_list/display_list_blend_mode.h"
+#include "flutter/display_list/dl_blend_mode.h"
+#include "flutter/display_list/skia/dl_sk_conversions.h"
+#include "flutter/display_list/skia/dl_sk_types.h"
 #include "flutter/fml/trace_event.h"
 
-namespace flutter {
+#include "third_party/skia/include/utils/SkShadowUtils.h"
 
-const SkScalar kLightHeight = 600;
-const SkScalar kLightRadius = 800;
+namespace flutter {
 
-const SkPaint* DisplayListCanvasDispatcher::safe_paint(bool use_attributes) {
+const SkPaint* DlSkCanvasDispatcher::safe_paint(bool use_attributes) {
   if (use_attributes) {
     // The accumulated SkPaint object will already have incorporated
     // any attribute overrides.
-    return &paint();
+    // Any rendering operation that uses an optional paint will ignore
+    // the shader in the paint so we inform that |paint()| method so
+    // that it can set the dither flag appropriately.
+    return &paint(false);
   } else if (has_opacity()) {
     temp_paint_.setAlphaf(opacity());
     return &temp_paint_;
@@ -25,7 +29,7 @@ const SkPaint* DisplayListCanvasDispatcher::safe_paint(bool use_attributes) {
   }
 }
 
-void DisplayListCanvasDispatcher::save() {
+void DlSkCanvasDispatcher::save() {
   canvas_->save();
   // save has no impact on attributes, but it needs to register a record
   // on the restore stack so that the eventual call to restore() will
@@ -35,14 +39,14 @@ void DisplayListCanvasDispatcher::save() {
   // the children and let the utility calls notice that it didn't change.
   save_opacity(opacity());
 }
-void DisplayListCanvasDispatcher::restore() {
+void DlSkCanvasDispatcher::restore() {
   canvas_->restore();
   restore_opacity();
 }
-void DisplayListCanvasDispatcher::saveLayer(const SkRect* bounds,
-                                            const SaveLayerOptions options,
-                                            const DlImageFilter* backdrop) {
-  if (bounds == nullptr && options.can_distribute_opacity() &&
+void DlSkCanvasDispatcher::saveLayer(const SkRect& bounds,
+                                     const SaveLayerOptions options,
+                                     const DlImageFilter* backdrop) {
+  if (!options.content_is_clipped() && options.can_distribute_opacity() &&
       backdrop == nullptr) {
     // We know that:
     // - no bounds is needed for clipping here
@@ -62,31 +66,31 @@ void DisplayListCanvasDispatcher::saveLayer(const SkRect* bounds,
   } else {
     TRACE_EVENT0("flutter", "Canvas::saveLayer");
     const SkPaint* paint = safe_paint(options.renders_with_attributes());
-    const sk_sp<SkImageFilter> sk_backdrop =
-        backdrop ? backdrop->skia_object() : nullptr;
+    const sk_sp<SkImageFilter> sk_backdrop = ToSk(backdrop);
+    const SkRect* sl_bounds = options.bounds_from_caller() ? &bounds : nullptr;
     canvas_->saveLayer(
-        SkCanvas::SaveLayerRec(bounds, paint, sk_backdrop.get(), 0));
+        SkCanvas::SaveLayerRec(sl_bounds, paint, sk_backdrop.get(), 0));
     // saveLayer will apply the current opacity on behalf of the children
     // so they will inherit an opaque opacity.
     save_opacity(SK_Scalar1);
   }
 }
 
-void DisplayListCanvasDispatcher::translate(SkScalar tx, SkScalar ty) {
+void DlSkCanvasDispatcher::translate(SkScalar tx, SkScalar ty) {
   canvas_->translate(tx, ty);
 }
-void DisplayListCanvasDispatcher::scale(SkScalar sx, SkScalar sy) {
+void DlSkCanvasDispatcher::scale(SkScalar sx, SkScalar sy) {
   canvas_->scale(sx, sy);
 }
-void DisplayListCanvasDispatcher::rotate(SkScalar degrees) {
+void DlSkCanvasDispatcher::rotate(SkScalar degrees) {
   canvas_->rotate(degrees);
 }
-void DisplayListCanvasDispatcher::skew(SkScalar sx, SkScalar sy) {
+void DlSkCanvasDispatcher::skew(SkScalar sx, SkScalar sy) {
   canvas_->skew(sx, sy);
 }
 // clang-format off
 // 2x3 2D affine subset of a 4x4 transform in row major order
-void DisplayListCanvasDispatcher::transform2DAffine(
+void DlSkCanvasDispatcher::transform2DAffine(
     SkScalar mxx, SkScalar mxy, SkScalar mxt,
     SkScalar myx, SkScalar myy, SkScalar myt) {
   // Internally concat(SkMatrix) gets redirected to concat(SkM44)
@@ -97,7 +101,7 @@ void DisplayListCanvasDispatcher::transform2DAffine(
                          0,   0,  0,  1));
 }
 // full 4x4 transform in row major order
-void DisplayListCanvasDispatcher::transformFullPerspective(
+void DlSkCanvasDispatcher::transformFullPerspective(
     SkScalar mxx, SkScalar mxy, SkScalar mxz, SkScalar mxt,
     SkScalar myx, SkScalar myy, SkScalar myz, SkScalar myt,
     SkScalar mzx, SkScalar mzy, SkScalar mzz, SkScalar mzt,
@@ -108,27 +112,27 @@ void DisplayListCanvasDispatcher::transformFullPerspective(
                         mwx, mwy, mwz, mwt));
 }
 // clang-format on
-void DisplayListCanvasDispatcher::transformReset() {
-  canvas_->resetMatrix();
+void DlSkCanvasDispatcher::transformReset() {
+  canvas_->setMatrix(original_transform_);
 }
 
-void DisplayListCanvasDispatcher::clipRect(const SkRect& rect,
-                                           SkClipOp clip_op,
-                                           bool is_aa) {
-  canvas_->clipRect(rect, clip_op, is_aa);
+void DlSkCanvasDispatcher::clipRect(const SkRect& rect,
+                                    ClipOp clip_op,
+                                    bool is_aa) {
+  canvas_->clipRect(rect, ToSk(clip_op), is_aa);
 }
-void DisplayListCanvasDispatcher::clipRRect(const SkRRect& rrect,
-                                            SkClipOp clip_op,
-                                            bool is_aa) {
-  canvas_->clipRRect(rrect, clip_op, is_aa);
+void DlSkCanvasDispatcher::clipRRect(const SkRRect& rrect,
+                                     ClipOp clip_op,
+                                     bool is_aa) {
+  canvas_->clipRRect(rrect, ToSk(clip_op), is_aa);
 }
-void DisplayListCanvasDispatcher::clipPath(const SkPath& path,
-                                           SkClipOp clip_op,
-                                           bool is_aa) {
-  canvas_->clipPath(path, clip_op, is_aa);
+void DlSkCanvasDispatcher::clipPath(const SkPath& path,
+                                    ClipOp clip_op,
+                                    bool is_aa) {
+  canvas_->clipPath(path, ToSk(clip_op), is_aa);
 }
 
-void DisplayListCanvasDispatcher::drawPaint() {
+void DlSkCanvasDispatcher::drawPaint() {
   const SkPaint& sk_paint = paint();
   SkImageFilter* filter = sk_paint.getImageFilter();
   if (filter && !filter->asColorFilter(nullptr)) {
@@ -138,80 +142,72 @@ void DisplayListCanvasDispatcher::drawPaint() {
   }
   canvas_->drawPaint(sk_paint);
 }
-void DisplayListCanvasDispatcher::drawColor(DlColor color, DlBlendMode mode) {
+void DlSkCanvasDispatcher::drawColor(DlColor color, DlBlendMode mode) {
   // SkCanvas::drawColor(SkColor) does the following conversion anyway
   // We do it here manually to increase precision on applying opacity
-  SkColor4f color4f = SkColor4f::FromColor(color);
+  SkColor4f color4f = SkColor4f::FromColor(ToSk(color));
   color4f.fA *= opacity();
   canvas_->drawColor(color4f, ToSk(mode));
 }
-void DisplayListCanvasDispatcher::drawLine(const SkPoint& p0,
-                                           const SkPoint& p1) {
+void DlSkCanvasDispatcher::drawLine(const SkPoint& p0, const SkPoint& p1) {
   canvas_->drawLine(p0, p1, paint());
 }
-void DisplayListCanvasDispatcher::drawRect(const SkRect& rect) {
+void DlSkCanvasDispatcher::drawRect(const SkRect& rect) {
   canvas_->drawRect(rect, paint());
 }
-void DisplayListCanvasDispatcher::drawOval(const SkRect& bounds) {
+void DlSkCanvasDispatcher::drawOval(const SkRect& bounds) {
   canvas_->drawOval(bounds, paint());
 }
-void DisplayListCanvasDispatcher::drawCircle(const SkPoint& center,
-                                             SkScalar radius) {
+void DlSkCanvasDispatcher::drawCircle(const SkPoint& center, SkScalar radius) {
   canvas_->drawCircle(center, radius, paint());
 }
-void DisplayListCanvasDispatcher::drawRRect(const SkRRect& rrect) {
+void DlSkCanvasDispatcher::drawRRect(const SkRRect& rrect) {
   canvas_->drawRRect(rrect, paint());
 }
-void DisplayListCanvasDispatcher::drawDRRect(const SkRRect& outer,
-                                             const SkRRect& inner) {
+void DlSkCanvasDispatcher::drawDRRect(const SkRRect& outer,
+                                      const SkRRect& inner) {
   canvas_->drawDRRect(outer, inner, paint());
 }
-void DisplayListCanvasDispatcher::drawPath(const SkPath& path) {
+void DlSkCanvasDispatcher::drawPath(const SkPath& path) {
   canvas_->drawPath(path, paint());
 }
-void DisplayListCanvasDispatcher::drawArc(const SkRect& bounds,
-                                          SkScalar start,
-                                          SkScalar sweep,
-                                          bool useCenter) {
+void DlSkCanvasDispatcher::drawArc(const SkRect& bounds,
+                                   SkScalar start,
+                                   SkScalar sweep,
+                                   bool useCenter) {
   canvas_->drawArc(bounds, start, sweep, useCenter, paint());
 }
-void DisplayListCanvasDispatcher::drawPoints(SkCanvas::PointMode mode,
-                                             uint32_t count,
-                                             const SkPoint pts[]) {
-  canvas_->drawPoints(mode, count, pts, paint());
-}
-void DisplayListCanvasDispatcher::drawSkVertices(
-    const sk_sp<SkVertices> vertices,
-    SkBlendMode mode) {
-  canvas_->drawVertices(vertices, mode, paint());
+void DlSkCanvasDispatcher::drawPoints(PointMode mode,
+                                      uint32_t count,
+                                      const SkPoint pts[]) {
+  canvas_->drawPoints(ToSk(mode), count, pts, paint());
 }
-void DisplayListCanvasDispatcher::drawVertices(const DlVertices* vertices,
-                                               DlBlendMode mode) {
-  canvas_->drawVertices(vertices->skia_object(), ToSk(mode), paint());
+void DlSkCanvasDispatcher::drawVertices(const DlVertices* vertices,
+                                        DlBlendMode mode) {
+  canvas_->drawVertices(ToSk(vertices), ToSk(mode), paint());
 }
-void DisplayListCanvasDispatcher::drawImage(const sk_sp<DlImage> image,
-                                            const SkPoint point,
-                                            DlImageSampling sampling,
-                                            bool render_with_attributes) {
+void DlSkCanvasDispatcher::drawImage(const sk_sp<DlImage> image,
+                                     const SkPoint point,
+                                     DlImageSampling sampling,
+                                     bool render_with_attributes) {
   canvas_->drawImage(image ? image->skia_image() : nullptr, point.fX, point.fY,
                      ToSk(sampling), safe_paint(render_with_attributes));
 }
-void DisplayListCanvasDispatcher::drawImageRect(
-    const sk_sp<DlImage> image,
-    const SkRect& src,
-    const SkRect& dst,
-    DlImageSampling sampling,
-    bool render_with_attributes,
-    SkCanvas::SrcRectConstraint constraint) {
+void DlSkCanvasDispatcher::drawImageRect(const sk_sp<DlImage> image,
+                                         const SkRect& src,
+                                         const SkRect& dst,
+                                         DlImageSampling sampling,
+                                         bool render_with_attributes,
+                                         SrcRectConstraint constraint) {
   canvas_->drawImageRect(image ? image->skia_image() : nullptr, src, dst,
                          ToSk(sampling), safe_paint(render_with_attributes),
-                         constraint);
+                         ToSk(constraint));
 }
-void DisplayListCanvasDispatcher::drawImageNine(const sk_sp<DlImage> image,
-                                                const SkIRect& center,
-                                                const SkRect& dst,
-                                                DlFilterMode filter,
-                                                bool render_with_attributes) {
+void DlSkCanvasDispatcher::drawImageNine(const sk_sp<DlImage> image,
+                                         const SkIRect& center,
+                                         const SkRect& dst,
+                                         DlFilterMode filter,
+                                         bool render_with_attributes) {
   if (!image) {
     return;
   }
@@ -222,31 +218,15 @@ void DisplayListCanvasDispatcher::drawImageNine(const sk_sp<DlImage> image,
   canvas_->drawImageNine(skia_image.get(), center, dst, ToSk(filter),
                          safe_paint(render_with_attributes));
 }
-void DisplayListCanvasDispatcher::drawImageLattice(
-    const sk_sp<DlImage> image,
-    const SkCanvas::Lattice& lattice,
-    const SkRect& dst,
-    DlFilterMode filter,
-    bool render_with_attributes) {
-  if (!image) {
-    return;
-  }
-  auto skia_image = image->skia_image();
-  if (!skia_image) {
-    return;
-  }
-  canvas_->drawImageLattice(skia_image.get(), lattice, dst, ToSk(filter),
-                            safe_paint(render_with_attributes));
-}
-void DisplayListCanvasDispatcher::drawAtlas(const sk_sp<DlImage> atlas,
-                                            const SkRSXform xform[],
-                                            const SkRect tex[],
-                                            const DlColor colors[],
-                                            int count,
-                                            DlBlendMode mode,
-                                            DlImageSampling sampling,
-                                            const SkRect* cullRect,
-                                            bool render_with_attributes) {
+void DlSkCanvasDispatcher::drawAtlas(const sk_sp<DlImage> atlas,
+                                     const SkRSXform xform[],
+                                     const SkRect tex[],
+                                     const DlColor colors[],
+                                     int count,
+                                     DlBlendMode mode,
+                                     DlImageSampling sampling,
+                                     const SkRect* cullRect,
+                                     bool render_with_attributes) {
   if (!atlas) {
     return;
   }
@@ -259,48 +239,54 @@ void DisplayListCanvasDispatcher::drawAtlas(const sk_sp<DlImage> atlas,
                      ToSk(sampling), cullRect,
                      safe_paint(render_with_attributes));
 }
-void DisplayListCanvasDispatcher::drawPicture(const sk_sp<SkPicture> picture,
-                                              const SkMatrix* matrix,
-                                              bool render_with_attributes) {
-  const SkPaint* paint = safe_paint(render_with_attributes);
-  if (paint) {
-    // drawPicture does an implicit saveLayer if an SkPaint is supplied.
+void DlSkCanvasDispatcher::drawDisplayList(
+    const sk_sp<DisplayList> display_list,
+    SkScalar opacity) {
+  const int restore_count = canvas_->getSaveCount();
+
+  // Compute combined opacity and figure out whether we can apply it
+  // during dispatch or if we need a saveLayer.
+  SkScalar combined_opacity = opacity * this->opacity();
+  if (combined_opacity < SK_Scalar1 &&
+      !display_list->can_apply_group_opacity()) {
     TRACE_EVENT0("flutter", "Canvas::saveLayer");
-    canvas_->drawPicture(picture, matrix, paint);
+    canvas_->saveLayerAlphaf(&display_list->bounds(), combined_opacity);
+    combined_opacity = SK_Scalar1;
   } else {
-    canvas_->drawPicture(picture, matrix, nullptr);
+    canvas_->save();
   }
+
+  // Create a new CanvasDispatcher to isolate the actions of the
+  // display_list from the current environment.
+  DlSkCanvasDispatcher dispatcher(canvas_, combined_opacity);
+  if (display_list->rtree()) {
+    display_list->Dispatch(dispatcher, canvas_->getLocalClipBounds());
+  } else {
+    display_list->Dispatch(dispatcher);
+  }
+
+  // Restore canvas state to what it was before dispatching.
+  canvas_->restoreToCount(restore_count);
 }
-void DisplayListCanvasDispatcher::drawDisplayList(
-    const sk_sp<DisplayList> display_list) {
-  int save_count = canvas_->save();
-  display_list->RenderTo(canvas_, opacity());
-  canvas_->restoreToCount(save_count);
-}
-void DisplayListCanvasDispatcher::drawTextBlob(const sk_sp<SkTextBlob> blob,
-                                               SkScalar x,
-                                               SkScalar y) {
+void DlSkCanvasDispatcher::drawTextBlob(const sk_sp<SkTextBlob> blob,
+                                        SkScalar x,
+                                        SkScalar y) {
   canvas_->drawTextBlob(blob, x, y, paint());
 }
 
-SkRect DisplayListCanvasDispatcher::ComputeShadowBounds(const SkPath& path,
-                                                        float elevation,
-                                                        SkScalar dpr,
-                                                        const SkMatrix& ctm) {
-  SkRect shadow_bounds(path.getBounds());
-  SkShadowUtils::GetLocalBounds(
-      ctm, path, SkPoint3::Make(0, 0, dpr * elevation),
-      SkPoint3::Make(0, -1, 1), kLightRadius / kLightHeight,
-      SkShadowFlags::kDirectionalLight_ShadowFlag, &shadow_bounds);
-  return shadow_bounds;
+void DlSkCanvasDispatcher::drawTextFrame(
+    const std::shared_ptr<impeller::TextFrame>& text_frame,
+    SkScalar x,
+    SkScalar y) {
+  FML_CHECK(false);
 }
 
-void DisplayListCanvasDispatcher::DrawShadow(SkCanvas* canvas,
-                                             const SkPath& path,
-                                             DlColor color,
-                                             float elevation,
-                                             bool transparentOccluder,
-                                             SkScalar dpr) {
+void DlSkCanvasDispatcher::DrawShadow(SkCanvas* canvas,
+                                      const SkPath& path,
+                                      DlColor color,
+                                      float elevation,
+                                      bool transparentOccluder,
+                                      SkScalar dpr) {
   const SkScalar kAmbientAlpha = 0.039f;
   const SkScalar kSpotAlpha = 0.25f;
 
@@ -308,22 +294,24 @@ void DisplayListCanvasDispatcher::DrawShadow(SkCanvas* canvas,
                        ? SkShadowFlags::kTransparentOccluder_ShadowFlag
                        : SkShadowFlags::kNone_ShadowFlag;
   flags |= SkShadowFlags::kDirectionalLight_ShadowFlag;
-  SkColor in_ambient = SkColorSetA(color, kAmbientAlpha * SkColorGetA(color));
-  SkColor in_spot = SkColorSetA(color, kSpotAlpha * SkColorGetA(color));
+  SkColor in_ambient =
+      SkColorSetA(ToSk(color), kAmbientAlpha * color.getAlpha());
+  SkColor in_spot = SkColorSetA(ToSk(color), kSpotAlpha * color.getAlpha());
   SkColor ambient_color, spot_color;
   SkShadowUtils::ComputeTonalColors(in_ambient, in_spot, &ambient_color,
                                     &spot_color);
-  SkShadowUtils::DrawShadow(canvas, path, SkPoint3::Make(0, 0, dpr * elevation),
-                            SkPoint3::Make(0, -1, 1),
-                            kLightRadius / kLightHeight, ambient_color,
-                            spot_color, flags);
+  SkShadowUtils::DrawShadow(
+      canvas, path, SkPoint3::Make(0, 0, dpr * elevation),
+      SkPoint3::Make(0, -1, 1),
+      DlCanvas::kShadowLightRadius / DlCanvas::kShadowLightHeight,
+      ambient_color, spot_color, flags);
 }
 
-void DisplayListCanvasDispatcher::drawShadow(const SkPath& path,
-                                             const DlColor color,
-                                             const SkScalar elevation,
-                                             bool transparent_occluder,
-                                             SkScalar dpr) {
+void DlSkCanvasDispatcher::drawShadow(const SkPath& path,
+                                      const DlColor color,
+                                      const SkScalar elevation,
+                                      bool transparent_occluder,
+                                      SkScalar dpr) {
   DrawShadow(canvas_, path, color, elevation, transparent_occluder, dpr);
 }
 
diff --git a/display_list/display_list_canvas_dispatcher.h b/display_list/skia/dl_sk_dispatcher.h
similarity index 63%
rename from display_list/display_list_canvas_dispatcher.h
rename to display_list/skia/dl_sk_dispatcher.h
index 2a1cd810357258e163727903d53973b499850860..0db4dce710d0f35a0fb3bb33cf7fc95d8ea2bff5 100644
--- a/display_list/display_list_canvas_dispatcher.h
+++ b/display_list/skia/dl_sk_dispatcher.h
@@ -2,35 +2,34 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_CANVAS_DISPATCHER_H_
-#define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_CANVAS_DISPATCHER_H_
+#ifndef FLUTTER_DISPLAY_LIST_SKIA_DL_SK_DISPATCHER_H_
+#define FLUTTER_DISPLAY_LIST_SKIA_DL_SK_DISPATCHER_H_
 
 #include "flutter/display_list/display_list.h"
-#include "flutter/display_list/display_list_blend_mode.h"
-#include "flutter/display_list/display_list_dispatcher.h"
-#include "flutter/display_list/display_list_utils.h"
+#include "flutter/display_list/dl_op_receiver.h"
+#include "flutter/display_list/skia/dl_sk_paint_dispatcher.h"
+#include "flutter/display_list/skia/dl_sk_types.h"
 #include "flutter/fml/macros.h"
 
 namespace flutter {
 
 //------------------------------------------------------------------------------
-/// Can be fed to the dispatch() method of a DisplayList to feed the resulting
-/// rendering operations to an SkCanvas instance.
+/// @brief      Backend implementation of |DlOpReceiver| for |SkCanvas|.
 ///
-/// Receives all methods on Dispatcher and sends them to an SkCanvas
-///
-class DisplayListCanvasDispatcher : public virtual Dispatcher,
-                                    public SkPaintDispatchHelper {
+/// @see       DlOpReceiver
+class DlSkCanvasDispatcher : public virtual DlOpReceiver,
+                             public DlSkPaintDispatchHelper {
  public:
-  explicit DisplayListCanvasDispatcher(SkCanvas* canvas,
-                                       SkScalar opacity = SK_Scalar1)
-      : SkPaintDispatchHelper(opacity), canvas_(canvas) {}
+  explicit DlSkCanvasDispatcher(SkCanvas* canvas, SkScalar opacity = SK_Scalar1)
+      : DlSkPaintDispatchHelper(opacity),
+        canvas_(canvas),
+        original_transform_(canvas->getLocalToDevice()) {}
 
   const SkPaint* safe_paint(bool use_attributes);
 
   void save() override;
   void restore() override;
-  void saveLayer(const SkRect* bounds,
+  void saveLayer(const SkRect& bounds,
                  const SaveLayerOptions options,
                  const DlImageFilter* backdrop) override;
 
@@ -51,9 +50,9 @@ class DisplayListCanvasDispatcher : public virtual Dispatcher,
   // clang-format on
   void transformReset() override;
 
-  void clipRect(const SkRect& rect, SkClipOp clip_op, bool is_aa) override;
-  void clipRRect(const SkRRect& rrect, SkClipOp clip_op, bool is_aa) override;
-  void clipPath(const SkPath& path, SkClipOp clip_op, bool is_aa) override;
+  void clipRect(const SkRect& rect, ClipOp clip_op, bool is_aa) override;
+  void clipRRect(const SkRRect& rrect, ClipOp clip_op, bool is_aa) override;
+  void clipPath(const SkPath& path, ClipOp clip_op, bool is_aa) override;
 
   void drawPaint() override;
   void drawColor(DlColor color, DlBlendMode mode) override;
@@ -68,11 +67,7 @@ class DisplayListCanvasDispatcher : public virtual Dispatcher,
                SkScalar start,
                SkScalar sweep,
                bool useCenter) override;
-  void drawPoints(SkCanvas::PointMode mode,
-                  uint32_t count,
-                  const SkPoint pts[]) override;
-  void drawSkVertices(const sk_sp<SkVertices> vertices,
-                      SkBlendMode mode) override;
+  void drawPoints(PointMode mode, uint32_t count, const SkPoint pts[]) override;
   void drawVertices(const DlVertices* vertices, DlBlendMode mode) override;
   void drawImage(const sk_sp<DlImage> image,
                  const SkPoint point,
@@ -83,17 +78,12 @@ class DisplayListCanvasDispatcher : public virtual Dispatcher,
                      const SkRect& dst,
                      DlImageSampling sampling,
                      bool render_with_attributes,
-                     SkCanvas::SrcRectConstraint constraint) override;
+                     SrcRectConstraint constraint) override;
   void drawImageNine(const sk_sp<DlImage> image,
                      const SkIRect& center,
                      const SkRect& dst,
                      DlFilterMode filter,
                      bool render_with_attributes) override;
-  void drawImageLattice(const sk_sp<DlImage> image,
-                        const SkCanvas::Lattice& lattice,
-                        const SkRect& dst,
-                        DlFilterMode filter,
-                        bool render_with_attributes) override;
   void drawAtlas(const sk_sp<DlImage> atlas,
                  const SkRSXform xform[],
                  const SkRect tex[],
@@ -103,24 +93,20 @@ class DisplayListCanvasDispatcher : public virtual Dispatcher,
                  DlImageSampling sampling,
                  const SkRect* cullRect,
                  bool render_with_attributes) override;
-  void drawPicture(const sk_sp<SkPicture> picture,
-                   const SkMatrix* matrix,
-                   bool render_with_attributes) override;
-  void drawDisplayList(const sk_sp<DisplayList> display_list) override;
+  void drawDisplayList(const sk_sp<DisplayList> display_list,
+                       SkScalar opacity) override;
   void drawTextBlob(const sk_sp<SkTextBlob> blob,
                     SkScalar x,
                     SkScalar y) override;
+  void drawTextFrame(const std::shared_ptr<impeller::TextFrame>& text_frame,
+                     SkScalar x,
+                     SkScalar y) override;
   void drawShadow(const SkPath& path,
                   const DlColor color,
                   const SkScalar elevation,
                   bool transparent_occluder,
                   SkScalar dpr) override;
 
-  static SkRect ComputeShadowBounds(const SkPath& path,
-                                    float elevation,
-                                    SkScalar dpr,
-                                    const SkMatrix& ctm);
-
   static void DrawShadow(SkCanvas* canvas,
                          const SkPath& path,
                          DlColor color,
@@ -130,9 +116,10 @@ class DisplayListCanvasDispatcher : public virtual Dispatcher,
 
  private:
   SkCanvas* canvas_;
+  const SkM44 original_transform_;
   SkPaint temp_paint_;
 };
 
 }  // namespace flutter
 
-#endif  // FLUTTER_DISPLAY_LIST_DISPLAY_LIST_CANVAS_DISPATCHER_H_
+#endif  // FLUTTER_DISPLAY_LIST_SKIA_DL_SK_DISPATCHER_H_
diff --git a/display_list/skia/dl_sk_paint_dispatcher.cc b/display_list/skia/dl_sk_paint_dispatcher.cc
new file mode 100644
index 0000000000000000000000000000000000000000..0e05739daff01e6850809c5da51dea532914abd4
--- /dev/null
+++ b/display_list/skia/dl_sk_paint_dispatcher.cc
@@ -0,0 +1,110 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/display_list/skia/dl_sk_paint_dispatcher.h"
+
+#include <math.h>
+#include <optional>
+#include <type_traits>
+
+#include "flutter/display_list/dl_blend_mode.h"
+#include "flutter/display_list/skia/dl_sk_conversions.h"
+#include "flutter/fml/logging.h"
+
+#include "third_party/skia/include/core/SkColorFilter.h"
+
+namespace flutter {
+
+// clang-format off
+constexpr float kInvertColorMatrix[20] = {
+  -1.0,    0,    0, 1.0, 0,
+     0, -1.0,    0, 1.0, 0,
+     0,    0, -1.0, 1.0, 0,
+   1.0,  1.0,  1.0, 1.0, 0
+};
+// clang-format on
+
+void DlSkPaintDispatchHelper::save_opacity(SkScalar child_opacity) {
+  save_stack_.emplace_back(opacity_);
+  set_opacity(child_opacity);
+}
+void DlSkPaintDispatchHelper::restore_opacity() {
+  if (save_stack_.empty()) {
+    return;
+  }
+  set_opacity(save_stack_.back().opacity);
+  save_stack_.pop_back();
+}
+
+void DlSkPaintDispatchHelper::setAntiAlias(bool aa) {
+  paint_.setAntiAlias(aa);
+}
+void DlSkPaintDispatchHelper::setInvertColors(bool invert) {
+  invert_colors_ = invert;
+  paint_.setColorFilter(makeColorFilter());
+}
+void DlSkPaintDispatchHelper::setStrokeCap(DlStrokeCap cap) {
+  paint_.setStrokeCap(ToSk(cap));
+}
+void DlSkPaintDispatchHelper::setStrokeJoin(DlStrokeJoin join) {
+  paint_.setStrokeJoin(ToSk(join));
+}
+void DlSkPaintDispatchHelper::setDrawStyle(DlDrawStyle style) {
+  paint_.setStyle(ToSk(style));
+}
+void DlSkPaintDispatchHelper::setStrokeWidth(SkScalar width) {
+  paint_.setStrokeWidth(width);
+}
+void DlSkPaintDispatchHelper::setStrokeMiter(SkScalar limit) {
+  paint_.setStrokeMiter(limit);
+}
+void DlSkPaintDispatchHelper::setColor(DlColor color) {
+  current_color_ = ToSk(color);
+  paint_.setColor(ToSk(color));
+  if (has_opacity()) {
+    paint_.setAlphaf(paint_.getAlphaf() * opacity());
+  }
+}
+void DlSkPaintDispatchHelper::setBlendMode(DlBlendMode mode) {
+  paint_.setBlendMode(ToSk(mode));
+}
+void DlSkPaintDispatchHelper::setColorSource(const DlColorSource* source) {
+  // On the Impeller backend, we only support dithering of *gradients*, and
+  // so we need to set the dither flag whenever we render a gradient.
+  //
+  // In this method we can determine whether or not the source is a gradient,
+  // but we don't have the other half of the information which is what
+  // rendering op is being performed. So, we simply record whether the
+  // source is a gradient here and let the |paint()| method figure out
+  // the rest (i.e. whether the color source will be used).
+  color_source_gradient_ = source && source->isGradient();
+  paint_.setShader(ToSk(source));
+}
+void DlSkPaintDispatchHelper::setImageFilter(const DlImageFilter* filter) {
+  paint_.setImageFilter(ToSk(filter));
+}
+void DlSkPaintDispatchHelper::setColorFilter(const DlColorFilter* filter) {
+  sk_color_filter_ = ToSk(filter);
+  paint_.setColorFilter(makeColorFilter());
+}
+void DlSkPaintDispatchHelper::setPathEffect(const DlPathEffect* effect) {
+  paint_.setPathEffect(ToSk(effect));
+}
+void DlSkPaintDispatchHelper::setMaskFilter(const DlMaskFilter* filter) {
+  paint_.setMaskFilter(ToSk(filter));
+}
+
+sk_sp<SkColorFilter> DlSkPaintDispatchHelper::makeColorFilter() const {
+  if (!invert_colors_) {
+    return sk_color_filter_;
+  }
+  sk_sp<SkColorFilter> invert_filter =
+      SkColorFilters::Matrix(kInvertColorMatrix);
+  if (sk_color_filter_) {
+    invert_filter = invert_filter->makeComposed(sk_color_filter_);
+  }
+  return invert_filter;
+}
+
+}  // namespace flutter
diff --git a/display_list/skia/dl_sk_paint_dispatcher.h b/display_list/skia/dl_sk_paint_dispatcher.h
new file mode 100644
index 0000000000000000000000000000000000000000..a027e7ee4777bf48ad0b24c2517566fe4690151e
--- /dev/null
+++ b/display_list/skia/dl_sk_paint_dispatcher.h
@@ -0,0 +1,101 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_DISPLAY_LIST_SKIA_DL_SK_PAINT_DISPATCHER_H_
+#define FLUTTER_DISPLAY_LIST_SKIA_DL_SK_PAINT_DISPATCHER_H_
+
+#include "flutter/display_list/dl_op_receiver.h"
+#include "flutter/display_list/skia/dl_sk_types.h"
+
+namespace flutter {
+
+// A utility class that will monitor the DlOpReceiver methods relating
+// to the rendering attributes and accumulate them into an SkPaint
+// which can be accessed at any time via paint().
+class DlSkPaintDispatchHelper : public virtual DlOpReceiver {
+ public:
+  explicit DlSkPaintDispatchHelper(SkScalar opacity = SK_Scalar1)
+      : current_color_(SK_ColorBLACK), opacity_(opacity) {
+    if (opacity < SK_Scalar1) {
+      paint_.setAlphaf(opacity);
+    }
+  }
+
+  void setAntiAlias(bool aa) override;
+  void setDrawStyle(DlDrawStyle style) override;
+  void setColor(DlColor color) override;
+  void setStrokeWidth(SkScalar width) override;
+  void setStrokeMiter(SkScalar limit) override;
+  void setStrokeCap(DlStrokeCap cap) override;
+  void setStrokeJoin(DlStrokeJoin join) override;
+  void setColorSource(const DlColorSource* source) override;
+  void setColorFilter(const DlColorFilter* filter) override;
+  void setInvertColors(bool invert) override;
+  void setBlendMode(DlBlendMode mode) override;
+  void setPathEffect(const DlPathEffect* effect) override;
+  void setMaskFilter(const DlMaskFilter* filter) override;
+  void setImageFilter(const DlImageFilter* filter) override;
+
+  const SkPaint& paint(bool uses_shader = true) {
+    // On the Impeller backend, we will only support dithering of *gradients*,
+    // and it will be enabled by default (without the option to disable it).
+    // Until Skia support is completely removed, we only want to respect the
+    // dither flag for gradients (otherwise it will also apply to, for
+    // example, image ops and image sources, which are not dithered in
+    // Impeller) and only on those operations that use the color source.
+    //
+    // The color_source_gradient_ flag lets us know if the color source is
+    // a gradient and then the uses_shader flag passed in to this method by
+    // the rendering op lets us know if the color source is used (and is
+    // therefore the primary source of colors for the op).
+    //
+    // See https://github.com/flutter/flutter/issues/112498.
+    paint_.setDither(uses_shader && color_source_gradient_);
+    return paint_;
+  }
+  /// Returns the current opacity attribute which is used to reduce
+  /// the alpha of all setColor calls encountered in the streeam
+  SkScalar opacity() { return opacity_; }
+  /// Returns the combined opacity that includes both the current
+  /// opacity attribute and the alpha of the most recent color.
+  /// The most recently set color will have combined the two and
+  /// stored the combined value in the alpha of the paint.
+  SkScalar combined_opacity() { return paint_.getAlphaf(); }
+  /// Returns true iff the current opacity attribute is not opaque,
+  /// irrespective of the alpha of the current color
+  bool has_opacity() { return opacity_ < SK_Scalar1; }
+
+ protected:
+  void save_opacity(SkScalar opacity_for_children);
+  void restore_opacity();
+
+ private:
+  SkPaint paint_;
+  bool color_source_gradient_ = false;
+  bool invert_colors_ = false;
+  sk_sp<SkColorFilter> sk_color_filter_;
+
+  sk_sp<SkColorFilter> makeColorFilter() const;
+
+  struct SaveInfo {
+    explicit SaveInfo(SkScalar opacity) : opacity(opacity) {}
+
+    SkScalar opacity;
+  };
+  std::vector<SaveInfo> save_stack_;
+
+  void set_opacity(SkScalar opacity) {
+    if (opacity_ != opacity) {
+      opacity_ = opacity;
+      setColor(DlColor(current_color_));
+    }
+  }
+
+  SkColor current_color_;
+  SkScalar opacity_;
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_DISPLAY_LIST_SKIA_DL_SK_PAINT_DISPATCHER_H_
diff --git a/display_list/skia/dl_sk_paint_dispatcher_unittests.cc b/display_list/skia/dl_sk_paint_dispatcher_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..808204dd33db229bb63868b389deb1191988dc6e
--- /dev/null
+++ b/display_list/skia/dl_sk_paint_dispatcher_unittests.cc
@@ -0,0 +1,116 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "display_list/effects/dl_color_source.h"
+#include "flutter/display_list/skia/dl_sk_paint_dispatcher.h"
+
+#include "flutter/display_list/skia/dl_sk_dispatcher.h"
+#include "flutter/display_list/testing/dl_test_snippets.h"
+#include "flutter/display_list/utils/dl_receiver_utils.h"
+#include "gtest/gtest.h"
+
+namespace flutter {
+namespace testing {
+
+class MockDispatchHelper final : public virtual DlOpReceiver,
+                                 public DlSkPaintDispatchHelper,
+                                 public IgnoreClipDispatchHelper,
+                                 public IgnoreTransformDispatchHelper,
+                                 public IgnoreDrawDispatchHelper {
+ public:
+  void save() override { DlSkPaintDispatchHelper::save_opacity(0.5f); }
+
+  void restore() override { DlSkPaintDispatchHelper::restore_opacity(); }
+};
+
+static const DlColor kTestColors[2] = {DlColor(0xFF000000),
+                                       DlColor(0xFFFFFFFF)};
+static const float kTestStops[2] = {0.0f, 1.0f};
+static const auto kTestLinearGradient =
+    DlColorSource::MakeLinear(SkPoint::Make(0.0f, 0.0f),
+                              SkPoint::Make(100.0f, 100.0f),
+                              2,
+                              kTestColors,
+                              kTestStops,
+                              DlTileMode::kClamp,
+                              nullptr);
+
+// Regression test for https://github.com/flutter/flutter/issues/100176.
+TEST(DisplayListUtils, OverRestore) {
+  MockDispatchHelper helper;
+  helper.save();
+  helper.restore();
+  // There should be a protection here for over-restore to keep the program from
+  // crashing.
+  helper.restore();
+}
+
+// https://github.com/flutter/flutter/issues/132860.
+TEST(DisplayListUtils, SetColorSourceDithersIfGradient) {
+  MockDispatchHelper helper;
+
+  helper.setColorSource(kTestLinearGradient.get());
+  EXPECT_TRUE(helper.paint(true).isDither());
+  EXPECT_FALSE(helper.paint(false).isDither());
+}
+
+// https://github.com/flutter/flutter/issues/132860.
+TEST(DisplayListUtils, SetColorSourceDoesNotDitherIfNotGradient) {
+  MockDispatchHelper helper;
+
+  helper.setColorSource(kTestLinearGradient.get());
+  helper.setColorSource(nullptr);
+  EXPECT_FALSE(helper.paint(true).isDither());
+  EXPECT_FALSE(helper.paint(false).isDither());
+
+  DlColorColorSource color_color_source(DlColor::kBlue());
+  helper.setColorSource(&color_color_source);
+  EXPECT_FALSE(helper.paint(true).isDither());
+  EXPECT_FALSE(helper.paint(false).isDither());
+
+  helper.setColorSource(&kTestSource1);
+  EXPECT_FALSE(helper.paint(true).isDither());
+  EXPECT_FALSE(helper.paint(false).isDither());
+}
+
+// https://github.com/flutter/flutter/issues/132860.
+TEST(DisplayListUtils, SkDispatcherSetColorSourceDithersIfGradient) {
+  SkCanvas canvas;
+  DlSkCanvasDispatcher dispatcher(&canvas);
+
+  dispatcher.setColorSource(kTestLinearGradient.get());
+  EXPECT_TRUE(dispatcher.paint(true).isDither());
+  EXPECT_FALSE(dispatcher.paint(false).isDither());
+  EXPECT_FALSE(dispatcher.safe_paint(true)->isDither());
+  // Calling safe_paint(false) returns a nullptr
+}
+
+// https://github.com/flutter/flutter/issues/132860.
+TEST(DisplayListUtils, SkDispatcherSetColorSourceDoesNotDitherIfNotGradient) {
+  SkCanvas canvas;
+  DlSkCanvasDispatcher dispatcher(&canvas);
+
+  dispatcher.setColorSource(kTestLinearGradient.get());
+  dispatcher.setColorSource(nullptr);
+  EXPECT_FALSE(dispatcher.paint(true).isDither());
+  EXPECT_FALSE(dispatcher.paint(false).isDither());
+  EXPECT_FALSE(dispatcher.safe_paint(true)->isDither());
+  // Calling safe_paint(false) returns a nullptr
+
+  DlColorColorSource color_color_source(DlColor::kBlue());
+  dispatcher.setColorSource(&color_color_source);
+  EXPECT_FALSE(dispatcher.paint(true).isDither());
+  EXPECT_FALSE(dispatcher.paint(false).isDither());
+  EXPECT_FALSE(dispatcher.safe_paint(true)->isDither());
+  // Calling safe_paint(false) returns a nullptr
+
+  dispatcher.setColorSource(&kTestSource1);
+  EXPECT_FALSE(dispatcher.paint(true).isDither());
+  EXPECT_FALSE(dispatcher.paint(false).isDither());
+  EXPECT_FALSE(dispatcher.safe_paint(true)->isDither());
+  // Calling safe_paint(false) returns a nullptr
+}
+
+}  // namespace testing
+}  // namespace flutter
diff --git a/display_list/types.h b/display_list/skia/dl_sk_types.h
similarity index 76%
rename from display_list/types.h
rename to display_list/skia/dl_sk_types.h
index 6d1e06971552b940b419e8b1dba6681135a9919a..3348c4ba0aa42329040e38458d38b158f171a2e4 100644
--- a/display_list/types.h
+++ b/display_list/skia/dl_sk_types.h
@@ -2,18 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_TYPES_H_
-#define FLUTTER_DISPLAY_LIST_TYPES_H_
+#ifndef FLUTTER_DISPLAY_LIST_SKIA_DL_SK_TYPES_H_
+#define FLUTTER_DISPLAY_LIST_SKIA_DL_SK_TYPES_H_
 
 #include "flutter/fml/macros.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "third_party/skia/include/core/SkBlender.h"
+#include "third_party/skia/include/core/SkBlendMode.h"
 #include "third_party/skia/include/core/SkBlurTypes.h"
 #include "third_party/skia/include/core/SkCanvas.h"
+#include "third_party/skia/include/core/SkClipOp.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
 #include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
 #include "third_party/skia/include/core/SkMaskFilter.h"
+#include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkPathEffect.h"
 #include "third_party/skia/include/core/SkPicture.h"
@@ -22,12 +24,13 @@
 #include "third_party/skia/include/core/SkRRect.h"
 #include "third_party/skia/include/core/SkRSXform.h"
 #include "third_party/skia/include/core/SkRect.h"
+#include "third_party/skia/include/core/SkSamplingOptions.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "third_party/skia/include/core/SkTextBlob.h"
+#include "third_party/skia/include/core/SkTileMode.h"
 #include "third_party/skia/include/core/SkVertices.h"
 #include "third_party/skia/include/effects/SkCornerPathEffect.h"
 #include "third_party/skia/include/effects/SkDashPathEffect.h"
 #include "third_party/skia/include/effects/SkDiscretePathEffect.h"
 #include "third_party/skia/include/gpu/GrTypes.h"
-#include "third_party/skia/include/utils/SkShadowUtils.h"
-#endif  // FLUTTER_DISPLAY_LIST_TYPES_H_
+#endif  // FLUTTER_DISPLAY_LIST_SKIA_DL_SK_TYPES_H_
diff --git a/display_list/testing/BUILD.gn b/display_list/testing/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..a438c22d45e2b43dcccea6072fab393b08d3ec8d
--- /dev/null
+++ b/display_list/testing/BUILD.gn
@@ -0,0 +1,113 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+# We only do software benchmarks on non-mobile platforms
+
+import("//flutter/impeller/tools/impeller.gni")
+
+source_set("display_list_testing") {
+  testonly = true
+
+  sources = [
+    "dl_test_equality.h",
+    "dl_test_snippets.cc",
+    "dl_test_snippets.h",
+  ]
+
+  deps = [
+    "//flutter/skia",
+    "//flutter/testing:testing_lib",
+    "//flutter/third_party/txt",
+  ]
+
+  public_deps = [ "//flutter/display_list:display_list" ]
+}
+
+surface_provider_include_software = !is_android && !is_ios && !is_ohos
+
+# iOS and Fuchsia and Windows don't support OpenGL
+# Note: Windows would need some work to support OpenGL
+# But, since benchmarks do not run on Windows and rendertests only
+# runs on SW by default, this restriction currently only limits the
+# ability to manually cross-check OpenGL on Windows for rendertests
+surface_provider_include_gl =
+    !is_fuchsia && !is_ios && !is_win && !is_mac && !is_ohos
+
+# TODO (https://github.com/flutter/flutter/issues/107357):
+# impeller_enable_vulkan currently requires skia to not use VMA, which in turn
+# causes linkage problems with swiftshader.
+if (impeller_enable_vulkan) {
+  surface_provider_include_gl = false
+}
+
+surface_provider_include_metal = is_mac || is_ios
+
+config("surface_provider_config") {
+  defines = []
+
+  if (surface_provider_include_software) {
+    defines += [ "ENABLE_SOFTWARE_BENCHMARKS" ]
+  }
+  if (surface_provider_include_gl) {
+    defines += [ "ENABLE_OPENGL_BENCHMARKS" ]
+  }
+  if (surface_provider_include_metal) {
+    defines += [ "ENABLE_METAL_BENCHMARKS" ]
+  }
+
+  # Don't snapshot test results on mobile platforms
+  if (is_android || is_ios) {
+    defines += [ "BENCHMARKS_NO_SNAPSHOT" ]
+  }
+}
+
+source_set("display_list_surface_provider") {
+  testonly = true
+
+  sources = [ "dl_test_surface_provider.cc" ]
+
+  deps = [
+    "//flutter/common/graphics",
+    "//flutter/testing:testing_lib",
+  ]
+
+  if (is_mac) {
+    deps += [ "//flutter/impeller/golden_tests:metal_screenshot" ]
+  }
+
+  public_configs = [ ":surface_provider_config" ]
+
+  if (is_android) {
+    libs = [
+      "android",
+      "EGL",
+      "GLESv2",
+    ]
+  }
+
+  if (surface_provider_include_software) {
+    sources += [
+      "dl_test_surface_software.cc",
+      "dl_test_surface_software.h",
+    ]
+  }
+
+  if (surface_provider_include_gl) {
+    sources += [
+      "dl_test_surface_gl.cc",
+      "dl_test_surface_gl.h",
+    ]
+    deps += [ "//flutter/testing:opengl" ]
+  }
+
+  if (surface_provider_include_metal) {
+    sources += [
+      "dl_test_surface_metal.cc",
+      "dl_test_surface_metal.h",
+    ]
+    deps += [
+      "//flutter/impeller/display_list",
+      "//flutter/testing:metal",
+    ]
+  }
+}
diff --git a/display_list/display_list_canvas_unittests.cc b/display_list/testing/dl_rendering_unittests.cc
similarity index 36%
rename from display_list/display_list_canvas_unittests.cc
rename to display_list/testing/dl_rendering_unittests.cc
index aebb618d424a1525d66d6b51862dba1117dd9b23..dc99b4f1e4e6e0852f016ea5e1641dca77966941 100644
--- a/display_list/display_list_canvas_unittests.cc
+++ b/display_list/testing/dl_rendering_unittests.cc
@@ -5,24 +5,45 @@
 #include <utility>
 
 #include "flutter/display_list/display_list.h"
-#include "flutter/display_list/display_list_canvas_dispatcher.h"
-#include "flutter/display_list/display_list_canvas_recorder.h"
-#include "flutter/display_list/display_list_comparable.h"
-#include "flutter/display_list/display_list_flags.h"
-#include "flutter/display_list/display_list_sampling_options.h"
+#include "flutter/display_list/dl_builder.h"
+#include "flutter/display_list/dl_op_flags.h"
+#include "flutter/display_list/dl_sampling_options.h"
+#include "flutter/display_list/skia/dl_sk_canvas.h"
+#include "flutter/display_list/skia/dl_sk_conversions.h"
+#include "flutter/display_list/skia/dl_sk_dispatcher.h"
+#include "flutter/display_list/testing/dl_test_snippets.h"
+#include "flutter/display_list/testing/dl_test_surface_provider.h"
+#include "flutter/display_list/utils/dl_comparable.h"
+#include "flutter/fml/file.h"
 #include "flutter/fml/math.h"
+#include "flutter/testing/display_list_testing.h"
 #include "flutter/testing/testing.h"
+#ifdef IMPELLER_SUPPORTS_RENDERING
+#include "flutter/impeller/typographer/backends/skia/text_frame_skia.h"
+#endif  // IMPELLER_SUPPORTS_RENDERING
+
+#include "third_party/skia/include/core/SkBBHFactory.h"
+#include "third_party/skia/include/core/SkColorFilter.h"
+#include "third_party/skia/include/core/SkColorSpace.h"
+#include "third_party/skia/include/core/SkFontMgr.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
+#include "third_party/skia/include/core/SkStream.h"
 #include "third_party/skia/include/core/SkSurface.h"
-#include "third_party/skia/include/effects/SkBlenders.h"
-#include "third_party/skia/include/effects/SkDashPathEffect.h"
-#include "third_party/skia/include/effects/SkDiscretePathEffect.h"
+#include "third_party/skia/include/core/SkTypeface.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "third_party/skia/include/effects/SkImageFilters.h"
+#include "third_party/skia/include/encode/SkPngEncoder.h"
+#include "third_party/skia/include/gpu/GrDirectContext.h"
+#include "third_party/skia/include/gpu/GrRecordingContext.h"
+#include "third_party/skia/include/gpu/GrTypes.h"
+#include "txt/platform.h"
 
 namespace flutter {
 namespace testing {
 
+using ClipOp = DlCanvas::ClipOp;
+using PointMode = DlCanvas::PointMode;
+
 constexpr int kTestWidth = 200;
 constexpr int kTestHeight = 200;
 constexpr int kRenderWidth = 100;
@@ -39,7 +60,7 @@ constexpr SkScalar kRenderRadius = std::min(kRenderWidth, kRenderHeight) / 2.0;
 constexpr SkScalar kRenderCornerRadius = kRenderRadius / 5.0;
 
 constexpr SkPoint kTestCenter = SkPoint::Make(kTestWidth / 2, kTestHeight / 2);
-constexpr SkRect kTestBounds = SkRect::MakeWH(kTestWidth, kTestHeight);
+constexpr SkRect kTestBounds2 = SkRect::MakeWH(kTestWidth, kTestHeight);
 constexpr SkRect kRenderBounds =
     SkRect::MakeLTRB(kRenderLeft, kRenderTop, kRenderRight, kRenderBottom);
 
@@ -134,6 +155,75 @@ const int kHorizontalMiterDiamondPointCount =
     (sizeof(kHorizontalMiterDiamondPoints) /
      sizeof(kHorizontalMiterDiamondPoints[0]));
 
+class SkImageSampling {
+ public:
+  static constexpr SkSamplingOptions kNearestNeighbor =
+      SkSamplingOptions(SkFilterMode::kNearest);
+  static constexpr SkSamplingOptions kLinear =
+      SkSamplingOptions(SkFilterMode::kLinear);
+  static constexpr SkSamplingOptions kMipmapLinear =
+      SkSamplingOptions(SkFilterMode::kLinear, SkMipmapMode::kLinear);
+  static constexpr SkSamplingOptions kCubic =
+      SkSamplingOptions(SkCubicResampler{1 / 3.0f, 1 / 3.0f});
+};
+
+static void DrawCheckerboard(DlCanvas* canvas) {
+  DlPaint p0, p1;
+  p0.setDrawStyle(DlDrawStyle::kFill);
+  p0.setColor(DlColor(0xff00fe00));  // off-green
+  p1.setDrawStyle(DlDrawStyle::kFill);
+  p1.setColor(DlColor::kBlue());
+  // Some pixels need some transparency for DstIn testing
+  p1.setAlpha(128);
+  int cbdim = 5;
+  int width = canvas->GetBaseLayerSize().width();
+  int height = canvas->GetBaseLayerSize().height();
+  for (int y = 0; y < width; y += cbdim) {
+    for (int x = 0; x < height; x += cbdim) {
+      DlPaint& cellp = ((x + y) & 1) == 0 ? p0 : p1;
+      canvas->DrawRect(SkRect::MakeXYWH(x, y, cbdim, cbdim), cellp);
+    }
+  }
+}
+
+static void DrawCheckerboard(SkCanvas* canvas) {
+  DlSkCanvasAdapter dl_canvas(canvas);
+  DrawCheckerboard(&dl_canvas);
+}
+
+static std::shared_ptr<DlImageColorSource> MakeColorSource(
+    const sk_sp<DlImage>& image) {
+  return std::make_shared<DlImageColorSource>(image,                //
+                                              DlTileMode::kRepeat,  //
+                                              DlTileMode::kRepeat,  //
+                                              DlImageSampling::kLinear);
+}
+
+static sk_sp<SkShader> MakeColorSource(const sk_sp<SkImage>& image) {
+  return image->makeShader(SkTileMode::kRepeat,  //
+                           SkTileMode::kRepeat,  //
+                           SkImageSampling::kLinear);
+}
+
+// Used to show "INFO" warnings about tests that are omitted on certain
+// backends, but only once for the entire test run to avoid warning spam
+class OncePerBackendWarning {
+ public:
+  explicit OncePerBackendWarning(const std::string& warning)
+      : warning_(warning) {}
+
+  void warn(const std::string& name) {
+    if (warnings_sent_.find(name) == warnings_sent_.end()) {
+      warnings_sent_.insert(name);
+      FML_LOG(INFO) << warning_ << " on " << name;
+    }
+  }
+
+ private:
+  std::string warning_;
+  std::set<std::string> warnings_sent_;
+};
+
 // A class to specify how much tolerance to allow in bounds estimates.
 // For some attributes, the machinery must make some conservative
 // assumptions as to the extent of the bounds, but some of our test
@@ -176,6 +266,13 @@ class BoundsTolerance {
     return copy;
   }
 
+  BoundsTolerance addPostClipPadding(SkScalar absolute_pad_x,
+                                     SkScalar absolute_pad_y) const {
+    BoundsTolerance copy = BoundsTolerance(*this);
+    copy.clip_pad_.offset(absolute_pad_x, absolute_pad_y);
+    return copy;
+  }
+
   BoundsTolerance addDiscreteOffset(SkScalar discrete_offset) const {
     BoundsTolerance copy = BoundsTolerance(*this);
     copy.discrete_offset_ += discrete_offset;
@@ -206,6 +303,7 @@ class BoundsTolerance {
     if (!allowed.intersect(clip_)) {
       allowed.setEmpty();
     }
+    allowed.outset(clip_pad_.fX, clip_pad_.fY);
     SkIRect rounded = allowed.roundOut();
     int pad_left = std::max(0, pix_bounds.fLeft - rounded.fLeft);
     int pad_top = std::max(0, pix_bounds.fTop - rounded.fTop);
@@ -215,7 +313,7 @@ class BoundsTolerance {
     int allowed_pad_y = std::max(pad_top, pad_bottom);
     if (worst_bounds_pad_x > allowed_pad_x ||
         worst_bounds_pad_y > allowed_pad_y) {
-      FML_LOG(ERROR) << "allowed pad: "  //
+      FML_LOG(ERROR) << "acceptable bounds padding: "  //
                      << allowed_pad_x << ", " << allowed_pad_y;
     }
     return (worst_bounds_pad_x > allowed_pad_x ||
@@ -224,155 +322,567 @@ class BoundsTolerance {
 
   SkScalar discrete_offset() const { return discrete_offset_; }
 
+  bool operator==(BoundsTolerance const& other) const {
+    return bounds_pad_ == other.bounds_pad_ && scale_ == other.scale_ &&
+           absolute_pad_ == other.absolute_pad_ && clip_ == other.clip_ &&
+           clip_pad_ == other.clip_pad_ &&
+           discrete_offset_ == other.discrete_offset_;
+  }
+
  private:
   SkPoint bounds_pad_ = {0, 0};
   SkPoint scale_ = {1, 1};
   SkPoint absolute_pad_ = {0, 0};
   SkRect clip_ = {-1E9, -1E9, 1E9, 1E9};
+  SkPoint clip_pad_ = {0, 0};
 
   SkScalar discrete_offset_ = 0;
 };
 
-typedef const std::function<void(SkCanvas*, SkPaint&)> CvSetup;
-typedef const std::function<void(SkCanvas*, const SkPaint&)> CvRenderer;
-typedef const std::function<void(DisplayListBuilder&)> DlRenderer;
-static void EmptyCvRenderer(SkCanvas*, const SkPaint&) {}
-static void EmptyDlRenderer(DisplayListBuilder&) {}
+template <typename C, typename P, typename I>
+struct RenderContext {
+  C canvas;
+  P paint;
+  I image;
+};
+using SkSetupContext = RenderContext<SkCanvas*, SkPaint&, sk_sp<SkImage>>;
+using DlSetupContext = RenderContext<DlCanvas*, DlPaint&, sk_sp<DlImage>>;
+using SkRenderContext =
+    RenderContext<SkCanvas*, const SkPaint&, sk_sp<SkImage>>;
+using DlRenderContext =
+    RenderContext<DlCanvas*, const DlPaint&, sk_sp<DlImage>>;
+
+using SkSetup = const std::function<void(const SkSetupContext&)>;
+using SkRenderer = const std::function<void(const SkRenderContext&)>;
+using DlSetup = const std::function<void(const DlSetupContext&)>;
+using DlRenderer = const std::function<void(const DlRenderContext&)>;
+static const SkSetup kEmptySkSetup = [](const SkSetupContext&) {};
+static const SkRenderer kEmptySkRenderer = [](const SkRenderContext&) {};
+static const DlSetup kEmptyDlSetup = [](const DlSetupContext&) {};
+static const DlRenderer kEmptyDlRenderer = [](const DlRenderContext&) {};
+
+using PixelFormat = DlSurfaceProvider::PixelFormat;
+using BackendType = DlSurfaceProvider::BackendType;
+
+class RenderResult {
+ public:
+  virtual ~RenderResult() = default;
+
+  virtual sk_sp<SkImage> image() const = 0;
+  virtual int width() const = 0;
+  virtual int height() const = 0;
+  virtual const uint32_t* addr32(int x, int y) const = 0;
+  virtual void write(const std::string& path) const = 0;
+};
 
-class RenderSurface {
+class SkRenderResult final : public RenderResult {
  public:
-  explicit RenderSurface(sk_sp<SkSurface> surface)
-      : surface_(std::move(surface)) {
-    EXPECT_EQ(canvas()->save(), 1);
-  }
-  ~RenderSurface() { sk_free(addr_); }
-
-  SkCanvas* canvas() { return surface_->getCanvas(); }
-
-  const SkPixmap* pixmap() {
-    if (!pixmap_.addr()) {
-      canvas()->restoreToCount(1);
-      SkImageInfo info = surface_->imageInfo();
-      if (info.colorType() != kN32_SkColorType ||
-          !surface_->peekPixels(&pixmap_)) {
-        info = SkImageInfo::MakeN32Premul(info.dimensions());
-        addr_ = malloc(info.computeMinByteSize() * info.height());
-        pixmap_.reset(info, addr_, info.minRowBytes());
-        EXPECT_TRUE(surface_->readPixels(pixmap_, 0, 0));
-      }
+  explicit SkRenderResult(const sk_sp<SkSurface>& surface,
+                          bool take_snapshot = false) {
+    SkImageInfo info = surface->imageInfo();
+    info = SkImageInfo::MakeN32Premul(info.dimensions());
+    addr_ = malloc(info.computeMinByteSize() * info.height());
+    pixmap_.reset(info, addr_, info.minRowBytes());
+    surface->readPixels(pixmap_, 0, 0);
+    if (take_snapshot) {
+      image_ = surface->makeImageSnapshot();
     }
-    return &pixmap_;
+  }
+  ~SkRenderResult() override { free(addr_); }
+
+  sk_sp<SkImage> image() const override { return image_; }
+  int width() const override { return pixmap_.width(); }
+  int height() const override { return pixmap_.height(); }
+  const uint32_t* addr32(int x, int y) const override {
+    return pixmap_.addr32(x, y);
+  }
+  void write(const std::string& path) const {
+    auto stream = SkFILEWStream(path.c_str());
+    SkPngEncoder::Options options;
+    SkPngEncoder::Encode(&stream, pixmap_, options);
+    stream.flush();
   }
 
  private:
-  sk_sp<SkSurface> surface_;
+  sk_sp<SkImage> image_;
   SkPixmap pixmap_;
   void* addr_ = nullptr;
 };
 
-class RenderEnvironment {
+class ImpellerRenderResult final : public RenderResult {
  public:
-  static RenderEnvironment Make565() {
-    return RenderEnvironment(
-        SkImageInfo::Make({1, 1}, kRGB_565_SkColorType, kOpaque_SkAlphaType));
+  explicit ImpellerRenderResult(sk_sp<DlPixelData> screenshot,
+                                SkRect render_bounds)
+      : screenshot_(std::move(screenshot)), render_bounds_(render_bounds) {}
+  ~ImpellerRenderResult() override = default;
+
+  sk_sp<SkImage> image() const override { return nullptr; };
+  int width() const override { return screenshot_->width(); };
+  int height() const override { return screenshot_->height(); }
+  const uint32_t* addr32(int x, int y) const override {
+    return screenshot_->addr32(x, y);
+  }
+  void write(const std::string& path) const override {
+    screenshot_->write(path);
   }
+  const SkRect& render_bounds() const { return render_bounds_; }
 
-  static RenderEnvironment MakeN32() {
-    return RenderEnvironment(SkImageInfo::MakeN32Premul(1, 1));
+ private:
+  const sk_sp<DlPixelData> screenshot_;
+  SkRect render_bounds_;
+};
+
+struct RenderJobInfo {
+  int width = kTestWidth;
+  int height = kTestHeight;
+  DlColor bg = DlColor::kTransparent();
+  SkScalar scale = SK_Scalar1;
+  SkScalar opacity = SK_Scalar1;
+};
+
+struct JobRenderer {
+  virtual void Render(SkCanvas* canvas, const RenderJobInfo& info) = 0;
+  virtual bool targets_impeller() const { return false; }
+};
+
+struct MatrixClipJobRenderer : public JobRenderer {
+ public:
+  const SkMatrix& setup_matrix() const {
+    FML_CHECK(is_setup_);
+    return setup_matrix_;
   }
 
-  std::unique_ptr<RenderSurface> MakeSurface(
-      const DlColor bg = DlColor::kTransparent(),
-      int width = kTestWidth,
-      int height = kTestHeight) const {
-    sk_sp<SkSurface> surface =
-        SkSurface::MakeRaster(info_.makeWH(width, height));
-    surface->getCanvas()->clear(bg);
-    return std::make_unique<RenderSurface>(surface);
+  const SkIRect& setup_clip_bounds() const {
+    FML_CHECK(is_setup_);
+    return setup_clip_bounds_;
   }
 
-  void init_ref(CvRenderer& cv_renderer, DlColor bg = DlColor::kTransparent()) {
-    init_ref([=](SkCanvas*, SkPaint&) {}, cv_renderer,
-             [=](DisplayListBuilder&) {}, bg);
+ protected:
+  bool is_setup_ = false;
+  SkMatrix setup_matrix_;
+  SkIRect setup_clip_bounds_;
+};
+
+struct SkJobRenderer : public MatrixClipJobRenderer {
+  explicit SkJobRenderer(const SkSetup& sk_setup,
+                         const SkRenderer& sk_render,
+                         const SkRenderer& sk_restore,
+                         const sk_sp<SkImage>& sk_image)
+      : sk_setup_(sk_setup),
+        sk_render_(sk_render),
+        sk_restore_(sk_restore),
+        sk_image_(sk_image) {}
+
+  void Render(SkCanvas* canvas, const RenderJobInfo& info) override {
+    FML_DCHECK(info.opacity == SK_Scalar1);
+    SkPaint paint;
+    sk_setup_({canvas, paint, sk_image_});
+    setup_paint_ = paint;
+    setup_matrix_ = canvas->getTotalMatrix();
+    setup_clip_bounds_ = canvas->getDeviceClipBounds();
+    is_setup_ = true;
+    sk_render_({canvas, paint, sk_image_});
+    sk_restore_({canvas, paint, sk_image_});
   }
 
-  void init_ref(CvSetup& cv_setup,
-                CvRenderer& cv_renderer,
-                DlRenderer& dl_setup,
+  sk_sp<SkPicture> MakePicture(const RenderJobInfo& info) {
+    SkPictureRecorder recorder;
+    SkRTreeFactory rtree_factory;
+    SkCanvas* cv = recorder.beginRecording(kTestBounds2, &rtree_factory);
+    Render(cv, info);
+    return recorder.finishRecordingAsPicture();
+  }
+
+  const SkPaint& setup_paint() const {
+    FML_CHECK(is_setup_);
+    return setup_paint_;
+  }
+
+ private:
+  const SkSetup sk_setup_;
+  const SkRenderer sk_render_;
+  const SkRenderer sk_restore_;
+  sk_sp<SkImage> sk_image_;
+  SkPaint setup_paint_;
+};
+
+struct DlJobRenderer : public MatrixClipJobRenderer {
+  explicit DlJobRenderer(const DlSetup& dl_setup,
+                         const DlRenderer& dl_render,
+                         const DlRenderer& dl_restore,
+                         const sk_sp<DlImage>& dl_image)
+      : dl_setup_(dl_setup),
+        dl_render_(dl_render),
+        dl_restore_(dl_restore),
+        dl_image_(dl_image) {}
+
+  void Render(SkCanvas* sk_canvas, const RenderJobInfo& info) override {
+    DlSkCanvasAdapter canvas(sk_canvas);
+    Render(&canvas, info);
+  }
+
+  void Render(DlCanvas* canvas, const RenderJobInfo& info) {
+    FML_DCHECK(info.opacity == SK_Scalar1);
+    DlPaint paint;
+    dl_setup_({canvas, paint, dl_image_});
+    setup_paint_ = paint;
+    setup_matrix_ = canvas->GetTransform();
+    setup_clip_bounds_ = canvas->GetDestinationClipBounds().roundOut();
+    is_setup_ = true;
+    dl_render_({canvas, paint, dl_image_});
+    dl_restore_({canvas, paint, dl_image_});
+  }
+
+  sk_sp<DisplayList> MakeDisplayList(const RenderJobInfo& info) {
+    DisplayListBuilder builder(kTestBounds2);
+    Render(&builder, info);
+    return builder.Build();
+  }
+
+  const DlPaint& setup_paint() const {
+    FML_CHECK(is_setup_);
+    return setup_paint_;
+  }
+
+  bool targets_impeller() const override {
+    return dl_image_->impeller_texture() != nullptr;
+  }
+
+ private:
+  const DlSetup dl_setup_;
+  const DlRenderer dl_render_;
+  const DlRenderer dl_restore_;
+  const sk_sp<DlImage> dl_image_;
+  DlPaint setup_paint_;
+};
+
+struct SkPictureJobRenderer : public JobRenderer {
+  explicit SkPictureJobRenderer(sk_sp<SkPicture> picture)
+      : picture_(std::move(picture)) {}
+
+  void Render(SkCanvas* canvas, const RenderJobInfo& info) {
+    FML_DCHECK(info.opacity == SK_Scalar1);
+    picture_->playback(canvas);
+  }
+
+ private:
+  sk_sp<SkPicture> picture_;
+};
+
+struct DisplayListJobRenderer : public JobRenderer {
+  explicit DisplayListJobRenderer(sk_sp<DisplayList> display_list)
+      : display_list_(std::move(display_list)) {}
+
+  void Render(SkCanvas* canvas, const RenderJobInfo& info) {
+    DlSkCanvasAdapter(canvas).DrawDisplayList(display_list_, info.opacity);
+  }
+
+ private:
+  sk_sp<DisplayList> display_list_;
+};
+
+class RenderEnvironment {
+ public:
+  RenderEnvironment(const DlSurfaceProvider* provider, PixelFormat format)
+      : provider_(provider), format_(format) {
+    if (provider->supports(format)) {
+      surface_1x_ =
+          provider->MakeOffscreenSurface(kTestWidth, kTestHeight, format);
+      surface_2x_ = provider->MakeOffscreenSurface(kTestWidth * 2,
+                                                   kTestHeight * 2, format);
+    }
+  }
+
+  static RenderEnvironment Make565(const DlSurfaceProvider* provider) {
+    return RenderEnvironment(provider, PixelFormat::k565PixelFormat);
+  }
+
+  static RenderEnvironment MakeN32(const DlSurfaceProvider* provider) {
+    return RenderEnvironment(provider, PixelFormat::kN32PremulPixelFormat);
+  }
+
+  void init_ref(SkSetup& sk_setup,
+                SkRenderer& sk_renderer,
+                DlSetup& dl_setup,
+                DlRenderer& dl_renderer,
+                DlRenderer& imp_renderer,
                 DlColor bg = DlColor::kTransparent()) {
-    ref_canvas()->clear(bg);
-    dl_setup(ref_attr_);
-    SkPaint paint;
-    cv_setup(ref_canvas(), paint);
-    ref_matrix_ = ref_canvas()->getTotalMatrix();
-    ref_clip_ = ref_canvas()->getDeviceClipBounds();
-    cv_renderer(ref_canvas(), paint);
-    ref_pixmap_ = ref_surface_->pixmap();
+    SkJobRenderer sk_job(sk_setup, sk_renderer, kEmptySkRenderer, kTestSkImage);
+    RenderJobInfo info = {
+        .bg = bg,
+    };
+    ref_sk_result_ = getResult(info, sk_job);
+    DlJobRenderer dl_job(dl_setup, dl_renderer, kEmptyDlRenderer, kTestDlImage);
+    ref_dl_result_ = getResult(info, dl_job);
+    ref_dl_paint_ = dl_job.setup_paint();
+    ref_matrix_ = dl_job.setup_matrix();
+    ref_clip_bounds_ = dl_job.setup_clip_bounds();
+    ASSERT_EQ(sk_job.setup_matrix(), ref_matrix_);
+    ASSERT_EQ(sk_job.setup_clip_bounds(), ref_clip_bounds_);
+    if (provider_->supports_impeller()) {
+      test_impeller_image_ = makeTestImpellerImage(provider_);
+      DlJobRenderer imp_job(dl_setup, imp_renderer, kEmptyDlRenderer,
+                            test_impeller_image_);
+      ref_impeller_result_ = getImpellerResult(info, imp_job);
+    }
+  }
+
+  std::unique_ptr<RenderResult> getResult(const RenderJobInfo& info,
+                                          JobRenderer& renderer) const {
+    auto surface = getSurface(info.width, info.height);
+    FML_DCHECK(surface != nullptr);
+    auto canvas = surface->getCanvas();
+    canvas->clear(ToSk(info.bg));
+
+    int restore_count = canvas->save();
+    canvas->scale(info.scale, info.scale);
+    renderer.Render(canvas, info);
+    canvas->restoreToCount(restore_count);
+
+    if (GrDirectContext* dContext =
+            GrAsDirectContext(surface->recordingContext())) {
+      dContext->flushAndSubmit(surface.get(), GrSyncCpu::kYes);
+    }
+    return std::make_unique<SkRenderResult>(surface);
+  }
+
+  std::unique_ptr<RenderResult> getResult(sk_sp<DisplayList> dl) const {
+    DisplayListJobRenderer job(std::move(dl));
+    RenderJobInfo info = {};
+    return getResult(info, job);
   }
 
-  const SkImageInfo& info() const { return info_; }
-  SkCanvas* ref_canvas() { return ref_surface_->canvas(); }
-  const DisplayListBuilder& ref_attr() const { return ref_attr_; }
+  std::unique_ptr<ImpellerRenderResult> getImpellerResult(
+      const RenderJobInfo& info,
+      DlJobRenderer& renderer) const {
+    FML_DCHECK(info.scale == SK_Scalar1);
+
+    DisplayListBuilder builder;
+    builder.Clear(info.bg);
+    auto render_dl = renderer.MakeDisplayList(info);
+    builder.DrawDisplayList(render_dl);
+    auto dl = builder.Build();
+    auto snap = provider_->ImpellerSnapshot(dl, kTestWidth, kTestHeight);
+    return std::make_unique<ImpellerRenderResult>(std::move(snap),
+                                                  render_dl->bounds());
+  }
+
+  const DlSurfaceProvider* provider() const { return provider_; }
+  bool valid() const { return provider_->supports(format_); }
+  const std::string backend_name() const { return provider_->backend_name(); }
+  bool supports_impeller() const { return provider_->supports_impeller(); }
+
+  PixelFormat format() const { return format_; }
+  const DlPaint& ref_dl_paint() const { return ref_dl_paint_; }
   const SkMatrix& ref_matrix() const { return ref_matrix_; }
-  const SkIRect& ref_clip_bounds() const { return ref_clip_; }
-  const SkPixmap* ref_pixmap() const { return ref_pixmap_; }
+  const SkIRect& ref_clip_bounds() const { return ref_clip_bounds_; }
+  const RenderResult* ref_sk_result() const { return ref_sk_result_.get(); }
+  const RenderResult* ref_dl_result() const { return ref_dl_result_.get(); }
+  const ImpellerRenderResult* ref_impeller_result() const {
+    return ref_impeller_result_.get();
+  }
+
+  const sk_sp<SkImage> sk_image() const { return kTestSkImage; }
+  const sk_sp<DlImage> dl_image() const { return kTestDlImage; }
+  const sk_sp<DlImage> impeller_image() const { return test_impeller_image_; }
 
  private:
-  explicit RenderEnvironment(const SkImageInfo& info) : info_(info) {
-    ref_surface_ = MakeSurface();
+  sk_sp<SkSurface> getSurface(int width, int height) const {
+    FML_DCHECK(valid());
+    FML_DCHECK(surface_1x_ != nullptr);
+    FML_DCHECK(surface_2x_ != nullptr);
+    if (width == kTestWidth && height == kTestHeight) {
+      return surface_1x_->sk_surface();
+    }
+    if (width == kTestWidth * 2 && height == kTestHeight * 2) {
+      return surface_2x_->sk_surface();
+    }
+    FML_LOG(ERROR) << "Test surface size (" << width << " x " << height
+                   << ") not supported.";
+    FML_DCHECK(false);
+    return nullptr;
   }
 
-  const SkImageInfo info_;
+  const DlSurfaceProvider* provider_;
+  const PixelFormat format_;
+  std::shared_ptr<DlSurfaceInstance> surface_1x_;
+  std::shared_ptr<DlSurfaceInstance> surface_2x_;
 
-  DisplayListBuilder ref_attr_;
+  DlPaint ref_dl_paint_;
   SkMatrix ref_matrix_;
-  SkIRect ref_clip_;
-  std::unique_ptr<RenderSurface> ref_surface_;
-  const SkPixmap* ref_pixmap_ = nullptr;
+  SkIRect ref_clip_bounds_;
+  std::unique_ptr<RenderResult> ref_sk_result_;
+  std::unique_ptr<RenderResult> ref_dl_result_;
+  std::unique_ptr<ImpellerRenderResult> ref_impeller_result_;
+  sk_sp<DlImage> test_impeller_image_;
+
+  static const sk_sp<SkImage> kTestSkImage;
+  static const sk_sp<DlImage> kTestDlImage;
+  static const sk_sp<SkImage> makeTestSkImage() {
+    sk_sp<SkSurface> surface = SkSurfaces::Raster(
+        SkImageInfo::MakeN32Premul(kRenderWidth, kRenderHeight));
+    DrawCheckerboard(surface->getCanvas());
+    return surface->makeImageSnapshot();
+  }
+  static const sk_sp<DlImage> makeTestImpellerImage(
+      const DlSurfaceProvider* provider) {
+    FML_DCHECK(provider->supports_impeller());
+    DisplayListBuilder builder(SkRect::MakeWH(kRenderWidth, kRenderHeight));
+    DrawCheckerboard(&builder);
+    return provider->MakeImpellerImage(builder.Build(),  //
+                                       kRenderWidth, kRenderHeight);
+  }
+};
+
+const sk_sp<SkImage> RenderEnvironment::kTestSkImage = makeTestSkImage();
+const sk_sp<DlImage> RenderEnvironment::kTestDlImage =
+    DlImage::Make(kTestSkImage);
+
+class CaseParameters {
+ public:
+  explicit CaseParameters(std::string info)
+      : CaseParameters(std::move(info), kEmptySkSetup, kEmptyDlSetup) {}
+
+  CaseParameters(std::string info, SkSetup& sk_setup, DlSetup& dl_setup)
+      : CaseParameters(std::move(info),
+                       sk_setup,
+                       dl_setup,
+                       kEmptySkRenderer,
+                       kEmptyDlRenderer,
+                       DlColor(SK_ColorTRANSPARENT),
+                       false,
+                       false,
+                       false) {}
+
+  CaseParameters(std::string info,
+                 SkSetup& sk_setup,
+                 DlSetup& dl_setup,
+                 SkRenderer& sk_restore,
+                 DlRenderer& dl_restore,
+                 DlColor bg,
+                 bool has_diff_clip,
+                 bool has_mutating_save_layer,
+                 bool fuzzy_compare_components)
+      : info_(std::move(info)),
+        bg_(bg),
+        sk_setup_(sk_setup),
+        dl_setup_(dl_setup),
+        sk_restore_(sk_restore),
+        dl_restore_(dl_restore),
+        has_diff_clip_(has_diff_clip),
+        has_mutating_save_layer_(has_mutating_save_layer),
+        fuzzy_compare_components_(fuzzy_compare_components) {}
+
+  CaseParameters with_restore(SkRenderer& sk_restore,
+                              DlRenderer& dl_restore,
+                              bool mutating_layer,
+                              bool fuzzy_compare_components = false) {
+    return CaseParameters(info_, sk_setup_, dl_setup_, sk_restore, dl_restore,
+                          bg_, has_diff_clip_, mutating_layer,
+                          fuzzy_compare_components);
+  }
+
+  CaseParameters with_bg(DlColor bg) {
+    return CaseParameters(info_, sk_setup_, dl_setup_, sk_restore_, dl_restore_,
+                          bg, has_diff_clip_, has_mutating_save_layer_,
+                          fuzzy_compare_components_);
+  }
+
+  CaseParameters with_diff_clip() {
+    return CaseParameters(info_, sk_setup_, dl_setup_, sk_restore_, dl_restore_,
+                          bg_, true, has_mutating_save_layer_,
+                          fuzzy_compare_components_);
+  }
+
+  std::string info() const { return info_; }
+  DlColor bg() const { return bg_; }
+  bool has_diff_clip() const { return has_diff_clip_; }
+  bool has_mutating_save_layer() const { return has_mutating_save_layer_; }
+  bool fuzzy_compare_components() const { return fuzzy_compare_components_; }
+
+  SkSetup sk_setup() const { return sk_setup_; }
+  DlSetup dl_setup() const { return dl_setup_; }
+  SkRenderer sk_restore() const { return sk_restore_; }
+  DlRenderer dl_restore() const { return dl_restore_; }
+
+ private:
+  const std::string info_;
+  const DlColor bg_;
+  const SkSetup sk_setup_;
+  const DlSetup dl_setup_;
+  const SkRenderer sk_restore_;
+  const DlRenderer dl_restore_;
+  const bool has_diff_clip_;
+  const bool has_mutating_save_layer_;
+  const bool fuzzy_compare_components_;
 };
 
 class TestParameters {
  public:
-  TestParameters(const CvRenderer& cv_renderer,
+  TestParameters(const SkRenderer& sk_renderer,
+                 const DlRenderer& dl_renderer,
+                 const DisplayListAttributeFlags& flags)
+      : TestParameters(sk_renderer, dl_renderer, dl_renderer, flags) {}
+
+  TestParameters(const SkRenderer& sk_renderer,
                  const DlRenderer& dl_renderer,
+                 const DlRenderer& imp_renderer,
                  const DisplayListAttributeFlags& flags)
-      : cv_renderer_(cv_renderer), dl_renderer_(dl_renderer), flags_(flags) {}
+      : sk_renderer_(sk_renderer),
+        dl_renderer_(dl_renderer),
+        imp_renderer_(imp_renderer),
+        flags_(flags) {}
 
   bool uses_paint() const { return !flags_.ignores_paint(); }
+  bool uses_gradient() const { return flags_.applies_shader(); }
+
+  bool impeller_compatible(const DlPaint& paint) const {
+    if (is_draw_text_blob()) {
+      // Non-color text is rendered as paths
+      if (paint.getColorSourcePtr() && !paint.getColorSourcePtr()->asColor()) {
+        return false;
+      }
+      // Non-filled text (stroke or stroke and fill) is rendered as paths
+      if (paint.getDrawStyle() != DlDrawStyle::kFill) {
+        return false;
+      }
+    }
+    return true;
+  }
 
   bool should_match(const RenderEnvironment& env,
-                    const DisplayListBuilder& attr,
-                    const SkMatrix& matrix,
-                    const SkIRect& device_clip,
-                    bool has_diff_clip,
-                    bool has_mutating_save_layer) const {
-    if (has_mutating_save_layer) {
+                    const CaseParameters& caseP,
+                    const DlPaint& attr,
+                    const MatrixClipJobRenderer& renderer) const {
+    if (caseP.has_mutating_save_layer()) {
       return false;
     }
-    if (env.ref_clip_bounds() != device_clip || has_diff_clip) {
+    if (env.ref_clip_bounds() != renderer.setup_clip_bounds() ||
+        caseP.has_diff_clip()) {
       return false;
     }
-    if (env.ref_matrix() != matrix && !flags_.is_flood()) {
+    if (env.ref_matrix() != renderer.setup_matrix() && !flags_.is_flood()) {
       return false;
     }
     if (flags_.ignores_paint()) {
       return true;
     }
-    const DisplayListBuilder& ref_attr = env.ref_attr();
+    const DlPaint& ref_attr = env.ref_dl_paint();
     if (flags_.applies_anti_alias() &&  //
         ref_attr.isAntiAlias() != attr.isAntiAlias()) {
-      return false;
-    }
-    if (flags_.applies_dither() &&  //
-        ref_attr.isDither() != attr.isDither()) {
-      return false;
+      if (renderer.targets_impeller()) {
+        // Impeller only does MSAA, ignoring the AA attribute
+        // https://github.com/flutter/flutter/issues/104721
+      } else {
+        return false;
+      }
     }
     if (flags_.applies_color() &&  //
         ref_attr.getColor() != attr.getColor()) {
       return false;
     }
     if (flags_.applies_blend() &&  //
-        ref_attr.getBlender() != attr.getBlender()) {
+        ref_attr.getBlendMode() != attr.getBlendMode()) {
       return false;
     }
     if (flags_.applies_color_filter() &&  //
@@ -393,21 +903,28 @@ class TestParameters {
       return false;
     }
 
+    bool is_stroked = flags_.is_stroked(attr.getDrawStyle());
+    if (flags_.is_stroked(ref_attr.getDrawStyle()) != is_stroked) {
+      return false;
+    }
     DisplayListSpecialGeometryFlags geo_flags =
-        flags_.WithPathEffect(attr.getPathEffect().get());
+        flags_.WithPathEffect(attr.getPathEffect().get(), is_stroked);
     if (flags_.applies_path_effect() &&  //
         ref_attr.getPathEffect() != attr.getPathEffect()) {
-      if (attr.getPathEffect()->asDash() == nullptr) {
-        return false;
-      }
-      if (!ignores_dashes()) {
-        return false;
+      if (renderer.targets_impeller()) {
+        // Impeller ignores DlPathEffect objects:
+        // https://github.com/flutter/flutter/issues/109736
+      } else {
+        switch (attr.getPathEffect()->type()) {
+          case DlPathEffectType::kDash: {
+            if (is_stroked && !ignores_dashes()) {
+              return false;
+            }
+            break;
+          }
+        }
       }
     }
-    bool is_stroked = flags_.is_stroked(ref_attr.getStyle());
-    if (flags_.is_stroked(attr.getStyle()) != is_stroked) {
-      return false;
-    }
     if (!is_stroked) {
       return true;
     }
@@ -437,7 +954,7 @@ class TestParameters {
     return true;
   }
 
-  DlStrokeCap getCap(const DisplayListBuilder& attr,
+  DlStrokeCap getCap(const DlPaint& attr,
                      DisplayListSpecialGeometryFlags geo_flags) const {
     DlStrokeCap cap = attr.getStrokeCap();
     if (geo_flags.butt_cap_becomes_square() && cap == DlStrokeCap::kButt) {
@@ -447,7 +964,7 @@ class TestParameters {
   }
 
   const BoundsTolerance adjust(const BoundsTolerance& tolerance,
-                               const SkPaint& paint,
+                               const DlPaint& paint,
                                const SkMatrix& matrix) const {
     if (is_draw_text_blob() && tolerance.discrete_offset() > 0) {
       // drawTextBlob needs just a little more leeway when using a
@@ -458,8 +975,8 @@ class TestParameters {
       return lineAdjust(tolerance, paint, matrix);
     }
     if (is_draw_arc_center()) {
-      if (paint.getStyle() != SkPaint::kFill_Style &&
-          paint.getStrokeJoin() == SkPaint::kMiter_Join) {
+      if (paint.getDrawStyle() != DlDrawStyle::kFill &&
+          paint.getStrokeJoin() == DlStrokeJoin::kMiter) {
         // the miter join at the center of an arc does not really affect
         // its bounds in any of our test cases, but the bounds code needs
         // to take it into account for the cases where it might, so we
@@ -473,7 +990,7 @@ class TestParameters {
   }
 
   const BoundsTolerance lineAdjust(const BoundsTolerance& tolerance,
-                                   const SkPaint& paint,
+                                   const DlPaint& paint,
                                    const SkMatrix& matrix) const {
     SkScalar adjust = 0.0;
     SkScalar half_width = paint.getStrokeWidth() * 0.5f;
@@ -488,11 +1005,11 @@ class TestParameters {
       adjust =
           half_width * paint.getStrokeMiter() + tolerance.discrete_offset();
     }
-    auto paint_effect = paint.refPathEffect();
+    auto path_effect = paint.getPathEffect();
 
     DisplayListSpecialGeometryFlags geo_flags =
-        flags_.WithPathEffect(DlPathEffect::From(paint.refPathEffect()).get());
-    if (paint.getStrokeCap() == SkPaint::kButt_Cap &&
+        flags_.WithPathEffect(path_effect.get(), true);
+    if (paint.getStrokeCap() == DlStrokeCap::kButt &&
         !geo_flags.butt_cap_becomes_square()) {
       adjust = std::max(adjust, half_width);
     }
@@ -519,24 +1036,10 @@ class TestParameters {
     return new_tolerance;
   }
 
-  const CvRenderer& cv_renderer() const { return cv_renderer_; }
-  void render_to(SkCanvas* canvas, SkPaint& paint) const {
-    cv_renderer_(canvas, paint);
-  }
-
+  const SkRenderer& sk_renderer() const { return sk_renderer_; }
   const DlRenderer& dl_renderer() const { return dl_renderer_; }
-  void render_to(DisplayListBuilder& builder) const {  //
-    dl_renderer_(builder);
-  }
-
-  // If a test is using any shadow operations then we cannot currently
-  // record those in an SkCanvas and play it back into a DisplayList
-  // because internally the operation gets encapsulated in a Skia
-  // ShadowRec which is not exposed by their headers. For operations
-  // that use shadows, we can perform a lot of tests, but not the tests
-  // that require SkCanvas->DisplayList transfers.
-  // See: https://bugs.chromium.org/p/skia/issues/detail?id=12125
-  bool is_draw_shadows() const { return is_draw_shadows_; }
+  const DlRenderer& imp_renderer() const { return imp_renderer_; }
+
   // Tests that call drawTextBlob with an sk_ref paint attribute will cause
   // those attributes to be stored in an internal Skia cache so we need
   // to expect that the |sk_ref.unique()| call will fail in those cases.
@@ -545,14 +1048,11 @@ class TestParameters {
   bool is_draw_display_list() const { return is_draw_display_list_; }
   bool is_draw_line() const { return is_draw_line_; }
   bool is_draw_arc_center() const { return is_draw_arc_center_; }
+  bool is_draw_path() const { return is_draw_path_; }
   bool is_horizontal_line() const { return is_horizontal_line_; }
   bool is_vertical_line() const { return is_vertical_line_; }
   bool ignores_dashes() const { return ignores_dashes_; }
 
-  TestParameters& set_draw_shadows() {
-    is_draw_shadows_ = true;
-    return *this;
-  }
   TestParameters& set_draw_text_blob() {
     is_draw_text_blob_ = true;
     return *this;
@@ -569,6 +1069,10 @@ class TestParameters {
     is_draw_arc_center_ = true;
     return *this;
   }
+  TestParameters& set_draw_path() {
+    is_draw_path_ = true;
+    return *this;
+  }
   TestParameters& set_ignores_dashes() {
     ignores_dashes_ = true;
     return *this;
@@ -583,129 +1087,80 @@ class TestParameters {
   }
 
  private:
-  const CvRenderer& cv_renderer_;
-  const DlRenderer& dl_renderer_;
-  const DisplayListAttributeFlags& flags_;
+  const SkRenderer sk_renderer_;
+  const DlRenderer dl_renderer_;
+  const DlRenderer imp_renderer_;
+  const DisplayListAttributeFlags flags_;
 
-  bool is_draw_shadows_ = false;
   bool is_draw_text_blob_ = false;
   bool is_draw_display_list_ = false;
   bool is_draw_line_ = false;
   bool is_draw_arc_center_ = false;
+  bool is_draw_path_ = false;
   bool ignores_dashes_ = false;
   bool is_horizontal_line_ = false;
   bool is_vertical_line_ = false;
 };
 
-class CaseParameters {
+class CanvasCompareTester {
  public:
-  explicit CaseParameters(std::string info)
-      : CaseParameters(std::move(info), EmptyCvRenderer, EmptyDlRenderer) {}
-
-  CaseParameters(std::string info, CvSetup& cv_setup, DlRenderer& dl_setup)
-      : CaseParameters(std::move(info),
-                       cv_setup,
-                       dl_setup,
-                       EmptyCvRenderer,
-                       EmptyDlRenderer,
-                       SK_ColorTRANSPARENT,
-                       false,
-                       false,
-                       false) {}
-
-  CaseParameters(std::string info,
-                 CvSetup& cv_setup,
-                 DlRenderer& dl_setup,
-                 CvRenderer& cv_restore,
-                 DlRenderer& dl_restore,
-                 DlColor bg,
-                 bool has_diff_clip,
-                 bool has_mutating_save_layer,
-                 bool fuzzy_compare_components)
-      : info_(std::move(info)),
-        bg_(bg),
-        cv_setup_(cv_setup),
-        dl_setup_(dl_setup),
-        cv_restore_(cv_restore),
-        dl_restore_(dl_restore),
-        has_diff_clip_(has_diff_clip),
-        has_mutating_save_layer_(has_mutating_save_layer),
-        fuzzy_compare_components_(fuzzy_compare_components) {}
-
-  CaseParameters with_restore(CvRenderer& cv_restore,
-                              DlRenderer& dl_restore,
-                              bool mutating_layer,
-                              bool fuzzy_compare_components = false) {
-    return CaseParameters(info_, cv_setup_, dl_setup_, cv_restore, dl_restore,
-                          bg_, has_diff_clip_, mutating_layer,
-                          fuzzy_compare_components);
-  }
-
-  CaseParameters with_bg(DlColor bg) {
-    return CaseParameters(info_, cv_setup_, dl_setup_, cv_restore_, dl_restore_,
-                          bg, has_diff_clip_, has_mutating_save_layer_,
-                          fuzzy_compare_components_);
-  }
-
-  CaseParameters with_diff_clip() {
-    return CaseParameters(info_, cv_setup_, dl_setup_, cv_restore_, dl_restore_,
-                          bg_, true, has_mutating_save_layer_,
-                          fuzzy_compare_components_);
-  }
-
-  std::string info() const { return info_; }
-  DlColor bg() const { return bg_; }
-  bool has_diff_clip() const { return has_diff_clip_; }
-  bool has_mutating_save_layer() const { return has_mutating_save_layer_; }
-  bool fuzzy_compare_components() const { return fuzzy_compare_components_; }
-
-  CvSetup cv_setup() const { return cv_setup_; }
-  DlRenderer dl_setup() const { return dl_setup_; }
-  CvRenderer cv_restore() const { return cv_restore_; }
-  DlRenderer dl_restore() const { return dl_restore_; }
-
-  const SkPaint render_to(SkCanvas* canvas,  //
-                          const TestParameters& testP) const {
-    SkPaint paint;
-    cv_setup_(canvas, paint);
-    testP.render_to(canvas, paint);
-    cv_restore_(canvas, paint);
-    return paint;
+  static std::vector<BackendType> TestBackends;
+  static std::string ImpellerFailureImageDirectory;
+  static bool SaveImpellerFailureImages;
+  static std::vector<std::string> ImpellerFailureImages;
+
+  static std::unique_ptr<DlSurfaceProvider> GetProvider(BackendType type) {
+    auto provider = DlSurfaceProvider::Create(type);
+    if (provider == nullptr) {
+      FML_LOG(ERROR) << "provider " << DlSurfaceProvider::BackendName(type)
+                     << " not supported (ignoring)";
+      return nullptr;
+    }
+    provider->InitializeSurface(kTestWidth, kTestHeight,
+                                PixelFormat::kN32PremulPixelFormat);
+    return provider;
   }
 
-  void render_to(DisplayListBuilder& builder,
-                 const TestParameters& testP) const {
-    dl_setup_(builder);
-    testP.render_to(builder);
-    dl_restore_(builder);
+  static bool AddProvider(BackendType type) {
+    auto provider = GetProvider(type);
+    if (!provider) {
+      return false;
+    }
+    CanvasCompareTester::TestBackends.push_back(type);
+    return true;
   }
 
- private:
-  const std::string info_;
-  const DlColor bg_;
-  const CvSetup cv_setup_;
-  const DlRenderer dl_setup_;
-  const CvRenderer cv_restore_;
-  const DlRenderer dl_restore_;
-  const bool has_diff_clip_;
-  const bool has_mutating_save_layer_;
-  const bool fuzzy_compare_components_;
-};
-
-class CanvasCompareTester {
- public:
   static BoundsTolerance DefaultTolerance;
 
   static void RenderAll(const TestParameters& params,
                         const BoundsTolerance& tolerance = DefaultTolerance) {
-    RenderEnvironment env = RenderEnvironment::MakeN32();
-    env.init_ref(params.cv_renderer());
-    RenderWithTransforms(params, env, tolerance);
-    RenderWithClips(params, env, tolerance);
-    RenderWithSaveRestore(params, env, tolerance);
-    // Only test attributes if the canvas version uses the paint object
-    if (params.uses_paint()) {
-      RenderWithAttributes(params, env, tolerance);
+    for (auto& back_end : TestBackends) {
+      auto provider = GetProvider(back_end);
+      RenderEnvironment env = RenderEnvironment::MakeN32(provider.get());
+      env.init_ref(kEmptySkSetup, params.sk_renderer(),  //
+                   kEmptyDlSetup, params.dl_renderer(), params.imp_renderer());
+      quickCompareToReference(env, "default");
+      if (env.supports_impeller()) {
+        auto impeller_result = env.ref_impeller_result();
+        if (!checkPixels(impeller_result, impeller_result->render_bounds(),
+                         "Impeller reference")) {
+          std::string test_name =
+              ::testing::UnitTest::GetInstance()->current_test_info()->name();
+          save_to_png(impeller_result, test_name + " (Impeller reference)",
+                      "base rendering was blank or out of bounds");
+        }
+      } else {
+        static OncePerBackendWarning warnings("No Impeller output tests");
+        warnings.warn(env.backend_name());
+      }
+
+      RenderWithTransforms(params, env, tolerance);
+      RenderWithClips(params, env, tolerance);
+      RenderWithSaveRestore(params, env, tolerance);
+      // Only test attributes if the canvas version uses the paint object
+      if (params.uses_paint()) {
+        RenderWithAttributes(params, env, tolerance);
+      }
     }
   }
 
@@ -716,109 +1171,115 @@ class CanvasCompareTester {
         SkRect::MakeXYWH(kRenderCenterX - 1, kRenderCenterY - 1, 2, 2);
     SkRect rect = SkRect::MakeXYWH(kRenderCenterX, kRenderCenterY, 10, 10);
     DlColor alpha_layer_color = DlColor::kCyan().withAlpha(0x7f);
-    DlColor default_color = DlPaint::kDefaultColor;
-    CvRenderer cv_safe_restore = [=](SkCanvas* cv, const SkPaint& p) {
+    SkRenderer sk_safe_restore = [=](const SkRenderContext& ctx) {
       // Draw another primitive to disable peephole optimizations
-      cv->drawRect(kRenderBounds.makeOffset(500, 500), p);
-      cv->restore();
+      ctx.canvas->drawRect(kRenderBounds.makeOffset(500, 500), SkPaint());
+      ctx.canvas->restore();
     };
-    DlRenderer dl_safe_restore = [=](DisplayListBuilder& b) {
+    DlRenderer dl_safe_restore = [=](const DlRenderContext& ctx) {
       // Draw another primitive to disable peephole optimizations
-      b.drawRect(kRenderBounds.makeOffset(500, 500));
-      b.restore();
+      // As the rendering op rejection in the DisplayList Builder
+      // gets smarter and smarter, this operation has had to get
+      // sneakier and sneakier about specifying an operation that
+      // won't practically show up in the output, but technically
+      // can't be culled.
+      ctx.canvas->DrawRect(
+          SkRect::MakeXYWH(kRenderCenterX, kRenderCenterY, 0.0001, 0.0001),
+          DlPaint());
+      ctx.canvas->Restore();
     };
-    CvRenderer cv_opt_restore = [=](SkCanvas* cv, const SkPaint& p) {
+    SkRenderer sk_opt_restore = [=](const SkRenderContext& ctx) {
       // Just a simple restore to allow peephole optimizations to occur
-      cv->restore();
+      ctx.canvas->restore();
     };
-    DlRenderer dl_opt_restore = [=](DisplayListBuilder& b) {
+    DlRenderer dl_opt_restore = [=](const DlRenderContext& ctx) {
       // Just a simple restore to allow peephole optimizations to occur
-      b.restore();
+      ctx.canvas->Restore();
     };
     SkRect layer_bounds = kRenderBounds.makeInset(15, 15);
     RenderWith(testP, env, tolerance,
                CaseParameters(
                    "With prior save/clip/restore",
-                   [=](SkCanvas* cv, SkPaint& p) {
-                     cv->save();
-                     cv->clipRect(clip, SkClipOp::kIntersect, false);
+                   [=](const SkSetupContext& ctx) {
+                     ctx.canvas->save();
+                     ctx.canvas->clipRect(clip, SkClipOp::kIntersect, false);
                      SkPaint p2;
-                     cv->drawRect(rect, p2);
+                     ctx.canvas->drawRect(rect, p2);
                      p2.setBlendMode(SkBlendMode::kClear);
-                     cv->drawRect(rect, p2);
-                     cv->restore();
+                     ctx.canvas->drawRect(rect, p2);
+                     ctx.canvas->restore();
                    },
-                   [=](DisplayListBuilder& b) {
-                     b.save();
-                     b.clipRect(clip, SkClipOp::kIntersect, false);
-                     b.drawRect(rect);
-                     b.setBlendMode(DlBlendMode::kClear);
-                     b.drawRect(rect);
-                     b.setBlendMode(DlBlendMode::kSrcOver);
-                     b.restore();
+                   [=](const DlSetupContext& ctx) {
+                     ctx.canvas->Save();
+                     ctx.canvas->ClipRect(clip, ClipOp::kIntersect, false);
+                     DlPaint p2;
+                     ctx.canvas->DrawRect(rect, p2);
+                     p2.setBlendMode(DlBlendMode::kClear);
+                     ctx.canvas->DrawRect(rect, p2);
+                     ctx.canvas->Restore();
                    }));
     RenderWith(testP, env, tolerance,
                CaseParameters(
                    "saveLayer no paint, no bounds",
-                   [=](SkCanvas* cv, SkPaint& p) {  //
-                     cv->saveLayer(nullptr, nullptr);
+                   [=](const SkSetupContext& ctx) {
+                     ctx.canvas->saveLayer(nullptr, nullptr);
                    },
-                   [=](DisplayListBuilder& b) {  //
-                     b.saveLayer(nullptr, false);
+                   [=](const DlSetupContext& ctx) {
+                     ctx.canvas->SaveLayer(nullptr, nullptr);
                    })
-                   .with_restore(cv_safe_restore, dl_safe_restore, false));
+                   .with_restore(sk_safe_restore, dl_safe_restore, false));
     RenderWith(testP, env, tolerance,
                CaseParameters(
                    "saveLayer no paint, with bounds",
-                   [=](SkCanvas* cv, SkPaint& p) {  //
-                     cv->saveLayer(layer_bounds, nullptr);
+                   [=](const SkSetupContext& ctx) {
+                     ctx.canvas->saveLayer(layer_bounds, nullptr);
                    },
-                   [=](DisplayListBuilder& b) {  //
-                     b.saveLayer(&layer_bounds, false);
+                   [=](const DlSetupContext& ctx) {
+                     ctx.canvas->SaveLayer(&layer_bounds, nullptr);
                    })
-                   .with_restore(cv_safe_restore, dl_safe_restore, true));
+                   .with_restore(sk_safe_restore, dl_safe_restore, true));
     RenderWith(testP, env, tolerance,
                CaseParameters(
                    "saveLayer with alpha, no bounds",
-                   [=](SkCanvas* cv, SkPaint& p) {
+                   [=](const SkSetupContext& ctx) {
                      SkPaint save_p;
-                     save_p.setColor(alpha_layer_color);
-                     cv->saveLayer(nullptr, &save_p);
+                     save_p.setColor(ToSk(alpha_layer_color));
+                     ctx.canvas->saveLayer(nullptr, &save_p);
                    },
-                   [=](DisplayListBuilder& b) {
-                     b.setColor(alpha_layer_color);
-                     b.saveLayer(nullptr, true);
-                     b.setColor(default_color);
+                   [=](const DlSetupContext& ctx) {
+                     DlPaint save_p;
+                     save_p.setColor(alpha_layer_color);
+                     ctx.canvas->SaveLayer(nullptr, &save_p);
                    })
-                   .with_restore(cv_safe_restore, dl_safe_restore, true));
+                   .with_restore(sk_safe_restore, dl_safe_restore, true));
     RenderWith(testP, env, tolerance,
                CaseParameters(
                    "saveLayer with peephole alpha, no bounds",
-                   [=](SkCanvas* cv, SkPaint& p) {
+                   [=](const SkSetupContext& ctx) {
                      SkPaint save_p;
-                     save_p.setColor(alpha_layer_color);
-                     cv->saveLayer(nullptr, &save_p);
+                     save_p.setColor(ToSk(alpha_layer_color));
+                     ctx.canvas->saveLayer(nullptr, &save_p);
                    },
-                   [=](DisplayListBuilder& b) {
-                     b.setColor(alpha_layer_color);
-                     b.saveLayer(nullptr, true);
-                     b.setColor(default_color);
+                   [=](const DlSetupContext& ctx) {
+                     DlPaint save_p;
+                     save_p.setColor(alpha_layer_color);
+                     ctx.canvas->SaveLayer(nullptr, &save_p);
                    })
-                   .with_restore(cv_opt_restore, dl_opt_restore, true, true));
+                   .with_restore(sk_opt_restore, dl_opt_restore, true, true));
     RenderWith(testP, env, tolerance,
                CaseParameters(
                    "saveLayer with alpha and bounds",
-                   [=](SkCanvas* cv, SkPaint& p) {
+                   [=](const SkSetupContext& ctx) {
                      SkPaint save_p;
-                     save_p.setColor(alpha_layer_color);
-                     cv->saveLayer(layer_bounds, &save_p);
+                     save_p.setColor(ToSk(alpha_layer_color));
+                     ctx.canvas->saveLayer(layer_bounds, &save_p);
                    },
-                   [=](DisplayListBuilder& b) {
-                     b.setColor(alpha_layer_color);
-                     b.saveLayer(&layer_bounds, true);
-                     b.setColor(default_color);
+                   [=](const DlSetupContext& ctx) {
+                     DlPaint save_p;
+                     save_p.setColor(alpha_layer_color);
+                     ctx.canvas->SaveLayer(&layer_bounds, &save_p);
                    })
-                   .with_restore(cv_safe_restore, dl_safe_restore, true));
+                   .with_restore(sk_safe_restore, dl_safe_restore, true));
     {
       // Being able to see a backdrop blur requires a non-default background
       // so we create a new environment for these tests that has a checkerboard
@@ -827,69 +1288,80 @@ class CanvasCompareTester {
       // so we set an alpha value which works for all primitives except for
       // drawColor which can override the alpha with its color, but it now uses
       // a non-opaque color to avoid that problem.
-      RenderEnvironment backdrop_env = RenderEnvironment::MakeN32();
-      CvSetup cv_backdrop_setup = [=](SkCanvas* cv, SkPaint& p) {
+      RenderEnvironment backdrop_env =
+          RenderEnvironment::MakeN32(env.provider());
+      SkSetup sk_backdrop_setup = [=](const SkSetupContext& ctx) {
         SkPaint setup_p;
-        setup_p.setShader(kTestImageColorSource.skia_object());
-        cv->drawPaint(setup_p);
-        p.setAlpha(p.getAlpha() / 2);
+        setup_p.setShader(MakeColorSource(ctx.image));
+        ctx.canvas->drawPaint(setup_p);
       };
-      DlRenderer dl_backdrop_setup = [=](DisplayListBuilder& b) {
-        b.setColorSource(&kTestImageColorSource);
-        b.drawPaint();
-        b.setColorSource(nullptr);
-        DlColor current_color = b.getColor();
-        b.setColor(current_color.withAlpha(current_color.getAlpha() / 2));
+      DlSetup dl_backdrop_setup = [=](const DlSetupContext& ctx) {
+        DlPaint setup_p;
+        setup_p.setColorSource(MakeColorSource(ctx.image));
+        ctx.canvas->DrawPaint(setup_p);
       };
-      backdrop_env.init_ref(cv_backdrop_setup, testP.cv_renderer(),
-                            dl_backdrop_setup);
-
-      DlBlurImageFilter backdrop(5, 5, DlTileMode::kDecal);
+      SkSetup sk_content_setup = [=](const SkSetupContext& ctx) {
+        ctx.paint.setAlpha(ctx.paint.getAlpha() / 2);
+      };
+      DlSetup dl_content_setup = [=](const DlSetupContext& ctx) {
+        ctx.paint.setAlpha(ctx.paint.getAlpha() / 2);
+      };
+      backdrop_env.init_ref(sk_backdrop_setup, testP.sk_renderer(),
+                            dl_backdrop_setup, testP.dl_renderer(),
+                            testP.imp_renderer());
+      quickCompareToReference(backdrop_env, "backdrop");
+
+      DlBlurImageFilter dl_backdrop(5, 5, DlTileMode::kDecal);
+      auto sk_backdrop =
+          SkImageFilters::Blur(5, 5, SkTileMode::kDecal, nullptr);
       RenderWith(testP, backdrop_env, tolerance,
                  CaseParameters(
                      "saveLayer with backdrop",
-                     [=](SkCanvas* cv, SkPaint& p) {
-                       cv_backdrop_setup(cv, p);
-                       cv->saveLayer(SkCanvas::SaveLayerRec(
-                           nullptr, nullptr, backdrop.skia_object().get(), 0));
+                     [=](const SkSetupContext& ctx) {
+                       sk_backdrop_setup(ctx);
+                       ctx.canvas->saveLayer(SkCanvas::SaveLayerRec(
+                           nullptr, nullptr, sk_backdrop.get(), 0));
+                       sk_content_setup(ctx);
                      },
-                     [=](DisplayListBuilder& b) {
-                       dl_backdrop_setup(b);
-                       b.saveLayer(nullptr, SaveLayerOptions::kNoAttributes,
-                                   &backdrop);
+                     [=](const DlSetupContext& ctx) {
+                       dl_backdrop_setup(ctx);
+                       ctx.canvas->SaveLayer(nullptr, nullptr, &dl_backdrop);
+                       dl_content_setup(ctx);
                      })
-                     .with_restore(cv_safe_restore, dl_safe_restore, true));
-      RenderWith(
-          testP, backdrop_env, tolerance,
-          CaseParameters(
-              "saveLayer with bounds and backdrop",
-              [=](SkCanvas* cv, SkPaint& p) {
-                cv_backdrop_setup(cv, p);
-                cv->saveLayer(SkCanvas::SaveLayerRec(
-                    &layer_bounds, nullptr, backdrop.skia_object().get(), 0));
-              },
-              [=](DisplayListBuilder& b) {
-                dl_backdrop_setup(b);
-                b.saveLayer(&layer_bounds, SaveLayerOptions::kNoAttributes,
-                            &backdrop);
-              })
-              .with_restore(cv_safe_restore, dl_safe_restore, true));
+                     .with_restore(sk_safe_restore, dl_safe_restore, true));
+      RenderWith(testP, backdrop_env, tolerance,
+                 CaseParameters(
+                     "saveLayer with bounds and backdrop",
+                     [=](const SkSetupContext& ctx) {
+                       sk_backdrop_setup(ctx);
+                       ctx.canvas->saveLayer(SkCanvas::SaveLayerRec(
+                           &layer_bounds, nullptr, sk_backdrop.get(), 0));
+                       sk_content_setup(ctx);
+                     },
+                     [=](const DlSetupContext& ctx) {
+                       dl_backdrop_setup(ctx);
+                       ctx.canvas->SaveLayer(&layer_bounds, nullptr,
+                                             &dl_backdrop);
+                       dl_content_setup(ctx);
+                     })
+                     .with_restore(sk_safe_restore, dl_safe_restore, true));
       RenderWith(testP, backdrop_env, tolerance,
                  CaseParameters(
                      "clipped saveLayer with backdrop",
-                     [=](SkCanvas* cv, SkPaint& p) {
-                       cv_backdrop_setup(cv, p);
-                       cv->clipRect(layer_bounds);
-                       cv->saveLayer(SkCanvas::SaveLayerRec(
-                           nullptr, nullptr, backdrop.skia_object().get(), 0));
+                     [=](const SkSetupContext& ctx) {
+                       sk_backdrop_setup(ctx);
+                       ctx.canvas->clipRect(layer_bounds);
+                       ctx.canvas->saveLayer(SkCanvas::SaveLayerRec(
+                           nullptr, nullptr, sk_backdrop.get(), 0));
+                       sk_content_setup(ctx);
                      },
-                     [=](DisplayListBuilder& b) {
-                       dl_backdrop_setup(b);
-                       b.clipRect(layer_bounds, SkClipOp::kIntersect, false);
-                       b.saveLayer(nullptr, SaveLayerOptions::kNoAttributes,
-                                   &backdrop);
+                     [=](const DlSetupContext& ctx) {
+                       dl_backdrop_setup(ctx);
+                       ctx.canvas->ClipRect(layer_bounds);
+                       ctx.canvas->SaveLayer(nullptr, nullptr, &dl_backdrop);
+                       dl_content_setup(ctx);
                      })
-                     .with_restore(cv_safe_restore, dl_safe_restore, true));
+                     .with_restore(sk_safe_restore, dl_safe_restore, true));
     }
 
     {
@@ -901,83 +1373,95 @@ class CanvasCompareTester {
           0, 0, 0, 0.5, 0,
       };
       // clang-format on
-      DlMatrixColorFilter filter(rotate_alpha_color_matrix);
+      DlMatrixColorFilter dl_alpha_rotate_filter(rotate_alpha_color_matrix);
+      auto sk_alpha_rotate_filter =
+          SkColorFilters::Matrix(rotate_alpha_color_matrix);
       {
         RenderWith(testP, env, tolerance,
                    CaseParameters(
                        "saveLayer ColorFilter, no bounds",
-                       [=](SkCanvas* cv, SkPaint& p) {
+                       [=](const SkSetupContext& ctx) {
                          SkPaint save_p;
-                         save_p.setColorFilter(filter.skia_object());
-                         cv->saveLayer(nullptr, &save_p);
-                         p.setStrokeWidth(5.0);
+                         save_p.setColorFilter(sk_alpha_rotate_filter);
+                         ctx.canvas->saveLayer(nullptr, &save_p);
+                         ctx.paint.setStrokeWidth(5.0);
                        },
-                       [=](DisplayListBuilder& b) {
-                         b.setColorFilter(&filter);
-                         b.saveLayer(nullptr, true);
-                         b.setColorFilter(nullptr);
-                         b.setStrokeWidth(5.0);
+                       [=](const DlSetupContext& ctx) {
+                         DlPaint save_p;
+                         save_p.setColorFilter(&dl_alpha_rotate_filter);
+                         ctx.canvas->SaveLayer(nullptr, &save_p);
+                         ctx.paint.setStrokeWidth(5.0);
                        })
-                       .with_restore(cv_safe_restore, dl_safe_restore, true));
+                       .with_restore(sk_safe_restore, dl_safe_restore, true));
       }
       {
         RenderWith(testP, env, tolerance,
                    CaseParameters(
                        "saveLayer ColorFilter and bounds",
-                       [=](SkCanvas* cv, SkPaint& p) {
+                       [=](const SkSetupContext& ctx) {
                          SkPaint save_p;
-                         save_p.setColorFilter(filter.skia_object());
-                         cv->saveLayer(kRenderBounds, &save_p);
-                         p.setStrokeWidth(5.0);
+                         save_p.setColorFilter(sk_alpha_rotate_filter);
+                         ctx.canvas->saveLayer(kRenderBounds, &save_p);
+                         ctx.paint.setStrokeWidth(5.0);
                        },
-                       [=](DisplayListBuilder& b) {
-                         b.setColorFilter(&filter);
-                         b.saveLayer(&kRenderBounds, true);
-                         b.setColorFilter(nullptr);
-                         b.setStrokeWidth(5.0);
+                       [=](const DlSetupContext& ctx) {
+                         DlPaint save_p;
+                         save_p.setColorFilter(&dl_alpha_rotate_filter);
+                         ctx.canvas->SaveLayer(&kRenderBounds, &save_p);
+                         ctx.paint.setStrokeWidth(5.0);
                        })
-                       .with_restore(cv_safe_restore, dl_safe_restore, true));
+                       .with_restore(sk_safe_restore, dl_safe_restore, true));
       }
     }
+
     {
-      sk_sp<SkImageFilter> sk_filter = SkImageFilters::Arithmetic(
-          0.1, 0.1, 0.1, 0.25, true, nullptr, nullptr);
-      DlUnknownImageFilter filter(sk_filter);
+      // clang-format off
+      constexpr float color_matrix[20] = {
+          0.5, 0, 0, 0, 0.5,
+          0, 0.5, 0, 0, 0.5,
+          0, 0, 0.5, 0, 0.5,
+          0, 0, 0, 1, 0,
+      };
+      // clang-format on
+      DlMatrixColorFilter dl_color_filter(color_matrix);
+      DlColorFilterImageFilter dl_cf_image_filter(dl_color_filter);
+      auto sk_cf_image_filter = SkImageFilters::ColorFilter(
+          SkColorFilters::Matrix(color_matrix), nullptr);
       {
         RenderWith(testP, env, tolerance,
                    CaseParameters(
                        "saveLayer ImageFilter, no bounds",
-                       [=](SkCanvas* cv, SkPaint& p) {
+                       [=](const SkSetupContext& ctx) {
                          SkPaint save_p;
-                         save_p.setImageFilter(filter.skia_object());
-                         cv->saveLayer(nullptr, &save_p);
-                         p.setStrokeWidth(5.0);
+                         save_p.setImageFilter(sk_cf_image_filter);
+                         ctx.canvas->saveLayer(nullptr, &save_p);
+                         ctx.paint.setStrokeWidth(5.0);
                        },
-                       [=](DisplayListBuilder& b) {
-                         b.setImageFilter(&filter);
-                         b.saveLayer(nullptr, true);
-                         b.setImageFilter(nullptr);
-                         b.setStrokeWidth(5.0);
+                       [=](const DlSetupContext& ctx) {
+                         DlPaint save_p;
+                         save_p.setImageFilter(&dl_cf_image_filter);
+                         ctx.canvas->SaveLayer(nullptr, &save_p);
+                         ctx.paint.setStrokeWidth(5.0);
                        })
-                       .with_restore(cv_safe_restore, dl_safe_restore, true));
+                       .with_restore(sk_safe_restore, dl_safe_restore, true));
       }
       {
         RenderWith(testP, env, tolerance,
                    CaseParameters(
                        "saveLayer ImageFilter and bounds",
-                       [=](SkCanvas* cv, SkPaint& p) {
+                       [=](const SkSetupContext& ctx) {
                          SkPaint save_p;
-                         save_p.setImageFilter(filter.skia_object());
-                         cv->saveLayer(kRenderBounds, &save_p);
-                         p.setStrokeWidth(5.0);
+                         save_p.setImageFilter(sk_cf_image_filter);
+                         ctx.canvas->saveLayer(kRenderBounds, &save_p);
+                         ctx.paint.setStrokeWidth(5.0);
                        },
-                       [=](DisplayListBuilder& b) {
-                         b.setImageFilter(&filter);
-                         b.saveLayer(&kRenderBounds, true);
-                         b.setImageFilter(nullptr);
-                         b.setStrokeWidth(5.0);
+                       [=](const DlSetupContext& ctx) {
+                         DlPaint save_p;
+                         save_p.setImageFilter(&dl_cf_image_filter);
+                         ctx.canvas->SaveLayer(&kRenderBounds, &save_p);
+                         ctx.paint.setStrokeWidth(5.0);
                        })
-                       .with_restore(cv_safe_restore, dl_safe_restore, true));
+                       .with_restore(sk_safe_restore, dl_safe_restore, true));
       }
     }
   }
@@ -991,98 +1475,59 @@ class CanvasCompareTester {
       // CPU renderer with default line width of 0 does not show antialiasing
       // for stroked primitives, so we make a new reference with a non-trivial
       // stroke width to demonstrate the differences
-      RenderEnvironment aa_env = RenderEnvironment::MakeN32();
+      RenderEnvironment aa_env = RenderEnvironment::MakeN32(env.provider());
       // Tweak the bounds tolerance for the displacement of 1/10 of a pixel
       const BoundsTolerance aa_tolerance = tolerance.addBoundsPadding(1, 1);
-      CvSetup cv_aa_setup = [=](SkCanvas* cv, SkPaint& p) {
-        cv->translate(0.1, 0.1);
-        p.setStrokeWidth(5.0);
+      auto sk_aa_setup = [=](SkSetupContext ctx, bool is_aa) {
+        ctx.canvas->translate(0.1, 0.1);
+        ctx.paint.setAntiAlias(is_aa);
+        ctx.paint.setStrokeWidth(5.0);
       };
-      DlRenderer dl_aa_setup = [=](DisplayListBuilder& b) {
-        b.translate(0.1, 0.1);
-        b.setStrokeWidth(5.0);
+      auto dl_aa_setup = [=](DlSetupContext ctx, bool is_aa) {
+        ctx.canvas->Translate(0.1, 0.1);
+        ctx.paint.setAntiAlias(is_aa);
+        ctx.paint.setStrokeWidth(5.0);
       };
-      aa_env.init_ref(cv_aa_setup, testP.cv_renderer(), dl_aa_setup);
-      RenderWith(testP, aa_env, aa_tolerance,
-                 CaseParameters(
-                     "AntiAlias == True",
-                     [=](SkCanvas* cv, SkPaint& p) {
-                       cv_aa_setup(cv, p);
-                       p.setAntiAlias(true);
-                     },
-                     [=](DisplayListBuilder& b) {
-                       dl_aa_setup(b);
-                       b.setAntiAlias(true);
-                     }));
-      RenderWith(testP, aa_env, aa_tolerance,
-                 CaseParameters(
-                     "AntiAlias == False",
-                     [=](SkCanvas* cv, SkPaint& p) {
-                       cv_aa_setup(cv, p);
-                       p.setAntiAlias(false);
-                     },
-                     [=](DisplayListBuilder& b) {
-                       dl_aa_setup(b);
-                       b.setAntiAlias(false);
-                     }));
-    }
-
-    {
-      // The CPU renderer does not always dither for solid colors and we
-      // need to use a non-default color (default is black) on an opaque
-      // surface, so we use a shader instead of a color. Also, thin stroked
-      // primitives (mainly drawLine and drawPoints) do not show much
-      // dithering so we use a non-trivial stroke width as well.
-      RenderEnvironment dither_env = RenderEnvironment::Make565();
-      DlColor dither_bg = DlColor::kBlack();
-      CvSetup cv_dither_setup = [=](SkCanvas*, SkPaint& p) {
-        p.setShader(kTestImageColorSource.skia_object());
-        p.setAlpha(0xf0);
-        p.setStrokeWidth(5.0);
-      };
-      DlRenderer dl_dither_setup = [=](DisplayListBuilder& b) {
-        b.setColorSource(&kTestImageColorSource);
-        b.setColor(DlColor(0xf0000000));
-        b.setStrokeWidth(5.0);
-      };
-      dither_env.init_ref(cv_dither_setup, testP.cv_renderer(),  //
-                          dl_dither_setup, dither_bg);
-      RenderWith(testP, dither_env, tolerance,
-                 CaseParameters(
-                     "Dither == True",
-                     [=](SkCanvas* cv, SkPaint& p) {
-                       cv_dither_setup(cv, p);
-                       p.setDither(true);
-                     },
-                     [=](DisplayListBuilder& b) {
-                       dl_dither_setup(b);
-                       b.setDither(true);
-                     })
-                     .with_bg(dither_bg));
-      RenderWith(testP, dither_env, tolerance,
-                 CaseParameters(
-                     "Dither = False",
-                     [=](SkCanvas* cv, SkPaint& p) {
-                       cv_dither_setup(cv, p);
-                       p.setDither(false);
-                     },
-                     [=](DisplayListBuilder& b) {
-                       dl_dither_setup(b);
-                       b.setDither(false);
-                     })
-                     .with_bg(dither_bg));
+      aa_env.init_ref(
+          [=](const SkSetupContext& ctx) { sk_aa_setup(ctx, false); },
+          testP.sk_renderer(),
+          [=](const DlSetupContext& ctx) { dl_aa_setup(ctx, false); },
+          testP.dl_renderer(), testP.imp_renderer());
+      quickCompareToReference(aa_env, "AntiAlias");
+      RenderWith(
+          testP, aa_env, aa_tolerance,
+          CaseParameters(
+              "AntiAlias == True",
+              [=](const SkSetupContext& ctx) { sk_aa_setup(ctx, true); },
+              [=](const DlSetupContext& ctx) { dl_aa_setup(ctx, true); }));
+      RenderWith(
+          testP, aa_env, aa_tolerance,
+          CaseParameters(
+              "AntiAlias == False",
+              [=](const SkSetupContext& ctx) { sk_aa_setup(ctx, false); },
+              [=](const DlSetupContext& ctx) { dl_aa_setup(ctx, false); }));
     }
 
-    RenderWith(testP, env, tolerance,
-               CaseParameters(
-                   "Color == Blue",
-                   [=](SkCanvas*, SkPaint& p) { p.setColor(SK_ColorBLUE); },
-                   [=](DisplayListBuilder& b) { b.setColor(SK_ColorBLUE); }));
-    RenderWith(testP, env, tolerance,
-               CaseParameters(
-                   "Color == Green",
-                   [=](SkCanvas*, SkPaint& p) { p.setColor(SK_ColorGREEN); },
-                   [=](DisplayListBuilder& b) { b.setColor(SK_ColorGREEN); }));
+    RenderWith(  //
+        testP, env, tolerance,
+        CaseParameters(
+            "Color == Blue",
+            [=](const SkSetupContext& ctx) {
+              ctx.paint.setColor(SK_ColorBLUE);
+            },
+            [=](const DlSetupContext& ctx) {
+              ctx.paint.setColor(DlColor::kBlue());
+            }));
+    RenderWith(  //
+        testP, env, tolerance,
+        CaseParameters(
+            "Color == Green",
+            [=](const SkSetupContext& ctx) {
+              ctx.paint.setColor(SK_ColorGREEN);
+            },
+            [=](const DlSetupContext& ctx) {
+              ctx.paint.setColor(DlColor::kGreen());
+            }));
 
     RenderWithStrokes(testP, env, tolerance);
 
@@ -1094,92 +1539,77 @@ class CanvasCompareTester {
       RenderWith(testP, env, tolerance,
                  CaseParameters(
                      "Blend == SrcIn",
-                     [=](SkCanvas*, SkPaint& p) {
-                       p.setBlendMode(SkBlendMode::kSrcIn);
-                       p.setColor(blendable_color);
+                     [=](const SkSetupContext& ctx) {
+                       ctx.paint.setBlendMode(SkBlendMode::kSrcIn);
+                       ctx.paint.setColor(blendable_color.argb());
                      },
-                     [=](DisplayListBuilder& b) {
-                       b.setBlendMode(DlBlendMode::kSrcIn);
-                       b.setColor(blendable_color);
+                     [=](const DlSetupContext& ctx) {
+                       ctx.paint.setBlendMode(DlBlendMode::kSrcIn);
+                       ctx.paint.setColor(blendable_color);
                      })
                      .with_bg(bg));
       RenderWith(testP, env, tolerance,
                  CaseParameters(
                      "Blend == DstIn",
-                     [=](SkCanvas*, SkPaint& p) {
-                       p.setBlendMode(SkBlendMode::kDstIn);
-                       p.setColor(blendable_color);
+                     [=](const SkSetupContext& ctx) {
+                       ctx.paint.setBlendMode(SkBlendMode::kDstIn);
+                       ctx.paint.setColor(blendable_color.argb());
                      },
-                     [=](DisplayListBuilder& b) {
-                       b.setBlendMode(DlBlendMode::kDstIn);
-                       b.setColor(blendable_color);
+                     [=](const DlSetupContext& ctx) {
+                       ctx.paint.setBlendMode(DlBlendMode::kDstIn);
+                       ctx.paint.setColor(blendable_color);
                      })
                      .with_bg(bg));
     }
 
-    {
-      sk_sp<SkBlender> blender =
-          SkBlenders::Arithmetic(0.25, 0.25, 0.25, 0.25, false);
-      {
-        RenderWith(testP, env, tolerance,
-                   CaseParameters(
-                       "Blender == Arithmetic 0.25-false",
-                       [=](SkCanvas*, SkPaint& p) { p.setBlender(blender); },
-                       [=](DisplayListBuilder& b) { b.setBlender(blender); }));
-      }
-      EXPECT_TRUE(blender->unique()) << "Blender Cleanup";
-      blender = SkBlenders::Arithmetic(0.25, 0.25, 0.25, 0.25, true);
-      {
-        RenderWith(testP, env, tolerance,
-                   CaseParameters(
-                       "Blender == Arithmetic 0.25-true",
-                       [=](SkCanvas*, SkPaint& p) { p.setBlender(blender); },
-                       [=](DisplayListBuilder& b) { b.setBlender(blender); }));
-      }
-      EXPECT_TRUE(blender->unique()) << "Blender Cleanup";
-    }
-
     {
       // Being able to see a blur requires some non-default attributes,
       // like a non-trivial stroke width and a shader rather than a color
       // (for drawPaint) so we create a new environment for these tests.
-      RenderEnvironment blur_env = RenderEnvironment::MakeN32();
-      CvSetup cv_blur_setup = [=](SkCanvas*, SkPaint& p) {
-        p.setShader(kTestImageColorSource.skia_object());
-        p.setStrokeWidth(5.0);
+      RenderEnvironment blur_env = RenderEnvironment::MakeN32(env.provider());
+      SkSetup sk_blur_setup = [=](const SkSetupContext& ctx) {
+        ctx.paint.setShader(MakeColorSource(ctx.image));
+        ctx.paint.setStrokeWidth(5.0);
       };
-      DlRenderer dl_blur_setup = [=](DisplayListBuilder& b) {
-        b.setColorSource(&kTestImageColorSource);
-        b.setStrokeWidth(5.0);
+      DlSetup dl_blur_setup = [=](const DlSetupContext& ctx) {
+        ctx.paint.setColorSource(MakeColorSource(ctx.image));
+        ctx.paint.setStrokeWidth(5.0);
       };
-      blur_env.init_ref(cv_blur_setup, testP.cv_renderer(), dl_blur_setup);
-      DlBlurImageFilter filter_decal_5(5.0, 5.0, DlTileMode::kDecal);
+      blur_env.init_ref(sk_blur_setup, testP.sk_renderer(),  //
+                        dl_blur_setup, testP.dl_renderer(),
+                        testP.imp_renderer());
+      quickCompareToReference(blur_env, "blur");
+      DlBlurImageFilter dl_filter_decal_5(5.0, 5.0, DlTileMode::kDecal);
+      auto sk_filter_decal_5 =
+          SkImageFilters::Blur(5.0, 5.0, SkTileMode::kDecal, nullptr);
       BoundsTolerance blur_5_tolerance = tolerance.addBoundsPadding(4, 4);
       {
         RenderWith(testP, blur_env, blur_5_tolerance,
                    CaseParameters(
                        "ImageFilter == Decal Blur 5",
-                       [=](SkCanvas* cv, SkPaint& p) {
-                         cv_blur_setup(cv, p);
-                         p.setImageFilter(filter_decal_5.skia_object());
+                       [=](const SkSetupContext& ctx) {
+                         sk_blur_setup(ctx);
+                         ctx.paint.setImageFilter(sk_filter_decal_5);
                        },
-                       [=](DisplayListBuilder& b) {
-                         dl_blur_setup(b);
-                         b.setImageFilter(&filter_decal_5);
+                       [=](const DlSetupContext& ctx) {
+                         dl_blur_setup(ctx);
+                         ctx.paint.setImageFilter(&dl_filter_decal_5);
                        }));
       }
-      DlBlurImageFilter filter_clamp_5(5.0, 5.0, DlTileMode::kClamp);
+      DlBlurImageFilter dl_filter_clamp_5(5.0, 5.0, DlTileMode::kClamp);
+      auto sk_filter_clamp_5 =
+          SkImageFilters::Blur(5.0, 5.0, SkTileMode::kClamp, nullptr);
       {
         RenderWith(testP, blur_env, blur_5_tolerance,
                    CaseParameters(
                        "ImageFilter == Clamp Blur 5",
-                       [=](SkCanvas* cv, SkPaint& p) {
-                         cv_blur_setup(cv, p);
-                         p.setImageFilter(filter_clamp_5.skia_object());
+                       [=](const SkSetupContext& ctx) {
+                         sk_blur_setup(ctx);
+                         ctx.paint.setImageFilter(sk_filter_clamp_5);
                        },
-                       [=](DisplayListBuilder& b) {
-                         dl_blur_setup(b);
-                         b.setImageFilter(&filter_clamp_5);
+                       [=](const DlSetupContext& ctx) {
+                         dl_blur_setup(ctx);
+                         ctx.paint.setImageFilter(&dl_filter_clamp_5);
                        }));
       }
     }
@@ -1188,28 +1618,31 @@ class CanvasCompareTester {
       // Being able to see a dilate requires some non-default attributes,
       // like a non-trivial stroke width and a shader rather than a color
       // (for drawPaint) so we create a new environment for these tests.
-      RenderEnvironment dilate_env = RenderEnvironment::MakeN32();
-      CvSetup cv_dilate_setup = [=](SkCanvas*, SkPaint& p) {
-        p.setShader(kTestImageColorSource.skia_object());
-        p.setStrokeWidth(5.0);
+      RenderEnvironment dilate_env = RenderEnvironment::MakeN32(env.provider());
+      SkSetup sk_dilate_setup = [=](const SkSetupContext& ctx) {
+        ctx.paint.setShader(MakeColorSource(ctx.image));
+        ctx.paint.setStrokeWidth(5.0);
       };
-      DlRenderer dl_dilate_setup = [=](DisplayListBuilder& b) {
-        b.setColorSource(&kTestImageColorSource);
-        b.setStrokeWidth(5.0);
+      DlSetup dl_dilate_setup = [=](const DlSetupContext& ctx) {
+        ctx.paint.setColorSource(MakeColorSource(ctx.image));
+        ctx.paint.setStrokeWidth(5.0);
       };
-      dilate_env.init_ref(cv_dilate_setup, testP.cv_renderer(),
-                          dl_dilate_setup);
-      DlDilateImageFilter filter_5(5.0, 5.0);
+      dilate_env.init_ref(sk_dilate_setup, testP.sk_renderer(),  //
+                          dl_dilate_setup, testP.dl_renderer(),
+                          testP.imp_renderer());
+      quickCompareToReference(dilate_env, "dilate");
+      DlDilateImageFilter dl_dilate_filter_5(5.0, 5.0);
+      auto sk_dilate_filter_5 = SkImageFilters::Dilate(5.0, 5.0, nullptr);
       RenderWith(testP, dilate_env, tolerance,
                  CaseParameters(
                      "ImageFilter == Dilate 5",
-                     [=](SkCanvas* cv, SkPaint& p) {
-                       cv_dilate_setup(cv, p);
-                       p.setImageFilter(filter_5.skia_object());
+                     [=](const SkSetupContext& ctx) {
+                       sk_dilate_setup(ctx);
+                       ctx.paint.setImageFilter(sk_dilate_filter_5);
                      },
-                     [=](DisplayListBuilder& b) {
-                       dl_dilate_setup(b);
-                       b.setImageFilter(&filter_5);
+                     [=](const DlSetupContext& ctx) {
+                       dl_dilate_setup(ctx);
+                       ctx.paint.setImageFilter(&dl_dilate_filter_5);
                      }));
     }
 
@@ -1217,29 +1650,33 @@ class CanvasCompareTester {
       // Being able to see an erode requires some non-default attributes,
       // like a non-trivial stroke width and a shader rather than a color
       // (for drawPaint) so we create a new environment for these tests.
-      RenderEnvironment erode_env = RenderEnvironment::MakeN32();
-      CvSetup cv_erode_setup = [=](SkCanvas*, SkPaint& p) {
-        p.setShader(kTestImageColorSource.skia_object());
-        p.setStrokeWidth(6.0);
+      RenderEnvironment erode_env = RenderEnvironment::MakeN32(env.provider());
+      SkSetup sk_erode_setup = [=](const SkSetupContext& ctx) {
+        ctx.paint.setShader(MakeColorSource(ctx.image));
+        ctx.paint.setStrokeWidth(6.0);
       };
-      DlRenderer dl_erode_setup = [=](DisplayListBuilder& b) {
-        b.setColorSource(&kTestImageColorSource);
-        b.setStrokeWidth(6.0);
+      DlSetup dl_erode_setup = [=](const DlSetupContext& ctx) {
+        ctx.paint.setColorSource(MakeColorSource(ctx.image));
+        ctx.paint.setStrokeWidth(6.0);
       };
-      erode_env.init_ref(cv_erode_setup, testP.cv_renderer(), dl_erode_setup);
+      erode_env.init_ref(sk_erode_setup, testP.sk_renderer(),  //
+                         dl_erode_setup, testP.dl_renderer(),
+                         testP.imp_renderer());
+      quickCompareToReference(erode_env, "erode");
       // do not erode too much, because some tests assert there are enough
       // pixels that are changed.
-      DlErodeImageFilter filter_1(1.0, 1.0);
+      DlErodeImageFilter dl_erode_filter_1(1.0, 1.0);
+      auto sk_erode_filter_1 = SkImageFilters::Erode(1.0, 1.0, nullptr);
       RenderWith(testP, erode_env, tolerance,
                  CaseParameters(
                      "ImageFilter == Erode 1",
-                     [=](SkCanvas* cv, SkPaint& p) {
-                       cv_erode_setup(cv, p);
-                       p.setImageFilter(filter_1.skia_object());
+                     [=](const SkSetupContext& ctx) {
+                       sk_erode_setup(ctx);
+                       ctx.paint.setImageFilter(sk_erode_filter_1);
                      },
-                     [=](DisplayListBuilder& b) {
-                       dl_erode_setup(b);
-                       b.setImageFilter(&filter_1);
+                     [=](const DlSetupContext& ctx) {
+                       dl_erode_setup(ctx);
+                       ctx.paint.setImageFilter(&dl_erode_filter_1);
                      }));
     }
 
@@ -1258,116 +1695,57 @@ class CanvasCompareTester {
          1.0,  1.0,  1.0, 1.0,   0,
       };
       // clang-format on
-      DlMatrixColorFilter filter(rotate_color_matrix);
+      DlMatrixColorFilter dl_color_filter(rotate_color_matrix);
+      auto sk_color_filter = SkColorFilters::Matrix(rotate_color_matrix);
       {
         DlColor bg = DlColor::kWhite();
         RenderWith(testP, env, tolerance,
                    CaseParameters(
                        "ColorFilter == RotateRGB",
-                       [=](SkCanvas*, SkPaint& p) {
-                         p.setColor(DlColor::kYellow());
-                         p.setColorFilter(filter.skia_object());
+                       [=](const SkSetupContext& ctx) {
+                         ctx.paint.setColor(SK_ColorYELLOW);
+                         ctx.paint.setColorFilter(sk_color_filter);
                        },
-                       [=](DisplayListBuilder& b) {
-                         b.setColor(DlColor::kYellow());
-                         b.setColorFilter(&filter);
+                       [=](const DlSetupContext& ctx) {
+                         ctx.paint.setColor(DlColor::kYellow());
+                         ctx.paint.setColorFilter(&dl_color_filter);
                        })
                        .with_bg(bg));
       }
-      filter = DlMatrixColorFilter(invert_color_matrix);
       {
         DlColor bg = DlColor::kWhite();
         RenderWith(testP, env, tolerance,
                    CaseParameters(
                        "ColorFilter == Invert",
-                       [=](SkCanvas*, SkPaint& p) {
-                         p.setColor(DlColor::kYellow());
-                         p.setColorFilter(filter.skia_object());
+                       [=](const SkSetupContext& ctx) {
+                         ctx.paint.setColor(SK_ColorYELLOW);
+                         ctx.paint.setColorFilter(
+                             SkColorFilters::Matrix(invert_color_matrix));
                        },
-                       [=](DisplayListBuilder& b) {
-                         b.setColor(DlColor::kYellow());
-                         b.setInvertColors(true);
+                       [=](const DlSetupContext& ctx) {
+                         ctx.paint.setColor(DlColor::kYellow());
+                         ctx.paint.setInvertColors(true);
                        })
                        .with_bg(bg));
       }
     }
 
     {
-      sk_sp<SkPathEffect> effect = SkDiscretePathEffect::Make(3, 5);
-      {
-        // Discrete path effects need a stroke width for drawPointsAsPoints
-        // to do something realistic
-        // And a Discrete(3, 5) effect produces miters that are near
-        // maximal for a miter limit of 3.0.
-        BoundsTolerance discrete_tolerance =
-            tolerance
-                // register the discrete offset so adjusters can compensate
-                .addDiscreteOffset(5)
-                // the miters in the 3-5 discrete effect don't always fill
-                // their conservative bounds, so tolerate a couple of pixels
-                .addBoundsPadding(2, 2);
-        RenderWith(testP, env, discrete_tolerance,
-                   CaseParameters(
-                       "PathEffect == Discrete-3-5",
-                       [=](SkCanvas*, SkPaint& p) {
-                         p.setStrokeWidth(5.0);
-                         p.setStrokeMiter(3.0);
-                         p.setPathEffect(effect);
-                       },
-                       [=](DisplayListBuilder& b) {
-                         b.setStrokeWidth(5.0);
-                         b.setStrokeMiter(3.0);
-                         b.setPathEffect(DlPathEffect::From(effect).get());
-                       }));
-      }
-      EXPECT_TRUE(testP.is_draw_text_blob() || effect->unique())
-          << "PathEffect == Discrete-3-5 Cleanup";
-      effect = SkDiscretePathEffect::Make(2, 3);
-      {
-        // Discrete path effects need a stroke width for drawPointsAsPoints
-        // to do something realistic
-        // And a Discrete(2, 3) effect produces miters that are near
-        // maximal for a miter limit of 2.5.
-        BoundsTolerance discrete_tolerance =
-            tolerance
-                // register the discrete offset so adjusters can compensate
-                .addDiscreteOffset(3)
-                // the miters in the 3-5 discrete effect don't always fill
-                // their conservative bounds, so tolerate a couple of pixels
-                .addBoundsPadding(2, 2);
-        RenderWith(testP, env, discrete_tolerance,
-                   CaseParameters(
-                       "PathEffect == Discrete-2-3",
-                       [=](SkCanvas*, SkPaint& p) {
-                         p.setStrokeWidth(5.0);
-                         p.setStrokeMiter(2.5);
-                         p.setPathEffect(effect);
-                       },
-                       [=](DisplayListBuilder& b) {
-                         b.setStrokeWidth(5.0);
-                         b.setStrokeMiter(2.5);
-                         b.setPathEffect(DlPathEffect::From(effect).get());
-                       }));
-      }
-      EXPECT_TRUE(testP.is_draw_text_blob() || effect->unique())
-          << "PathEffect == Discrete-2-3 Cleanup";
-    }
-
-    {
-      const DlBlurMaskFilter filter(kNormal_SkBlurStyle, 5.0);
+      const DlBlurMaskFilter dl_mask_filter(DlBlurStyle::kNormal, 5.0);
+      auto sk_mask_filter = SkMaskFilter::MakeBlur(kNormal_SkBlurStyle, 5.0);
       BoundsTolerance blur_5_tolerance = tolerance.addBoundsPadding(4, 4);
       {
         // Stroked primitives need some non-trivial stroke size to be blurred
         RenderWith(testP, env, blur_5_tolerance,
                    CaseParameters(
                        "MaskFilter == Blur 5",
-                       [=](SkCanvas*, SkPaint& p) {
-                         p.setStrokeWidth(5.0);
-                         p.setMaskFilter(filter.skia_object());
+                       [=](const SkSetupContext& ctx) {
+                         ctx.paint.setStrokeWidth(5.0);
+                         ctx.paint.setMaskFilter(sk_mask_filter);
                        },
-                       [=](DisplayListBuilder& b) {
-                         b.setStrokeWidth(5.0);
-                         b.setMaskFilter(&filter);
+                       [=](const DlSetupContext& ctx) {
+                         ctx.paint.setStrokeWidth(5.0);
+                         ctx.paint.setMaskFilter(&dl_mask_filter);
                        }));
       }
     }
@@ -1377,27 +1755,36 @@ class CanvasCompareTester {
           SkPoint::Make(kRenderBounds.fLeft, kRenderBounds.fTop),
           SkPoint::Make(kRenderBounds.fRight, kRenderBounds.fBottom),
       };
-      DlColor colors[] = {
+      DlColor dl_colors[] = {
           DlColor::kGreen(),
           DlColor::kYellow().withAlpha(0x7f),
           DlColor::kBlue(),
       };
+      SkColor sk_colors[] = {
+          SK_ColorGREEN,
+          SkColorSetA(SK_ColorYELLOW, 0x7f),
+          SK_ColorBLUE,
+      };
       float stops[] = {
           0.0,
           0.5,
           1.0,
       };
-      std::shared_ptr<DlColorSource> source = DlColorSource::MakeLinear(
-          end_points[0], end_points[1], 3, colors, stops, DlTileMode::kMirror);
+      auto dl_gradient =
+          DlColorSource::MakeLinear(end_points[0], end_points[1], 3, dl_colors,
+                                    stops, DlTileMode::kMirror);
+      auto sk_gradient = SkGradientShader::MakeLinear(
+          end_points, sk_colors, stops, 3, SkTileMode::kMirror, 0, nullptr);
       {
         RenderWith(testP, env, tolerance,
                    CaseParameters(
                        "LinearGradient GYB",
-                       [=](SkCanvas*, SkPaint& p) {
-                         p.setShader(source->skia_object());
+                       [=](const SkSetupContext& ctx) {
+                         ctx.paint.setShader(sk_gradient);
+                         ctx.paint.setDither(testP.uses_gradient());
                        },
-                       [=](DisplayListBuilder& b) {
-                         b.setColorSource(source.get());
+                       [=](const DlSetupContext& ctx) {
+                         ctx.paint.setColorSource(dl_gradient);
                        }));
       }
     }
@@ -1414,196 +1801,231 @@ class CanvasCompareTester {
     RenderWith(testP, env, tolerance,
                CaseParameters(
                    "Fill",
-                   [=](SkCanvas*, SkPaint& p) {  //
-                     p.setStyle(SkPaint::kFill_Style);
+                   [=](const SkSetupContext& ctx) {
+                     ctx.paint.setStyle(SkPaint::kFill_Style);
                    },
-                   [=](DisplayListBuilder& b) {  //
-                     b.setStyle(DlDrawStyle::kFill);
+                   [=](const DlSetupContext& ctx) {
+                     ctx.paint.setDrawStyle(DlDrawStyle::kFill);
                    }));
+    // Skia on HW produces a strong miter consistent with width=1.0
+    // for any width less than a pixel, but the bounds computations of
+    // both DL and SkPicture do not account for this. We will get
+    // OOB pixel errors for the highly mitered drawPath geometry if
+    // we don't set stroke width to 1.0 for that test on HW.
+    // See https://bugs.chromium.org/p/skia/issues/detail?id=14046
+    bool no_hairlines =
+        testP.is_draw_path() &&
+        env.provider()->backend_type() != BackendType::kSoftwareBackend;
     RenderWith(testP, env, tolerance,
                CaseParameters(
                    "Stroke + defaults",
-                   [=](SkCanvas*, SkPaint& p) {  //
-                     p.setStyle(SkPaint::kStroke_Style);
+                   [=](const SkSetupContext& ctx) {
+                     if (no_hairlines) {
+                       ctx.paint.setStrokeWidth(1.0);
+                     }
+                     ctx.paint.setStyle(SkPaint::kStroke_Style);
                    },
-                   [=](DisplayListBuilder& b) {  //
-                     b.setStyle(DlDrawStyle::kStroke);
+                   [=](const DlSetupContext& ctx) {
+                     if (no_hairlines) {
+                       ctx.paint.setStrokeWidth(1.0);
+                     }
+                     ctx.paint.setDrawStyle(DlDrawStyle::kStroke);
                    }));
 
     RenderWith(testP, env, tolerance,
                CaseParameters(
                    "Fill + unnecessary StrokeWidth 10",
-                   [=](SkCanvas*, SkPaint& p) {
-                     p.setStyle(SkPaint::kFill_Style);
-                     p.setStrokeWidth(10.0);
+                   [=](const SkSetupContext& ctx) {
+                     ctx.paint.setStyle(SkPaint::kFill_Style);
+                     ctx.paint.setStrokeWidth(10.0);
                    },
-                   [=](DisplayListBuilder& b) {
-                     b.setStyle(DlDrawStyle::kFill);
-                     b.setStrokeWidth(10.0);
+                   [=](const DlSetupContext& ctx) {
+                     ctx.paint.setDrawStyle(DlDrawStyle::kFill);
+                     ctx.paint.setStrokeWidth(10.0);
                    }));
 
-    RenderEnvironment stroke_base_env = RenderEnvironment::MakeN32();
-    CvSetup cv_stroke_setup = [=](SkCanvas*, SkPaint& p) {
-      p.setStyle(SkPaint::kStroke_Style);
-      p.setStrokeWidth(5.0);
+    RenderEnvironment stroke_base_env =
+        RenderEnvironment::MakeN32(env.provider());
+    SkSetup sk_stroke_setup = [=](const SkSetupContext& ctx) {
+      ctx.paint.setStyle(SkPaint::kStroke_Style);
+      ctx.paint.setStrokeWidth(5.0);
     };
-    DlRenderer dl_stroke_setup = [=](DisplayListBuilder& b) {
-      b.setStyle(DlDrawStyle::kStroke);
-      b.setStrokeWidth(5.0);
+    DlSetup dl_stroke_setup = [=](const DlSetupContext& ctx) {
+      ctx.paint.setDrawStyle(DlDrawStyle::kStroke);
+      ctx.paint.setStrokeWidth(5.0);
     };
-    stroke_base_env.init_ref(cv_stroke_setup, testP.cv_renderer(),
-                             dl_stroke_setup);
+    stroke_base_env.init_ref(sk_stroke_setup, testP.sk_renderer(),
+                             dl_stroke_setup, testP.dl_renderer(),
+                             testP.imp_renderer());
+    quickCompareToReference(stroke_base_env, "stroke");
 
     RenderWith(testP, stroke_base_env, tolerance,
                CaseParameters(
                    "Stroke Width 10",
-                   [=](SkCanvas*, SkPaint& p) {
-                     p.setStyle(SkPaint::kStroke_Style);
-                     p.setStrokeWidth(10.0);
+                   [=](const SkSetupContext& ctx) {
+                     ctx.paint.setStyle(SkPaint::kStroke_Style);
+                     ctx.paint.setStrokeWidth(10.0);
                    },
-                   [=](DisplayListBuilder& b) {
-                     b.setStyle(DlDrawStyle::kStroke);
-                     b.setStrokeWidth(10.0);
+                   [=](const DlSetupContext& ctx) {
+                     ctx.paint.setDrawStyle(DlDrawStyle::kStroke);
+                     ctx.paint.setStrokeWidth(10.0);
                    }));
     RenderWith(testP, stroke_base_env, tolerance,
                CaseParameters(
                    "Stroke Width 5",
-                   [=](SkCanvas*, SkPaint& p) {
-                     p.setStyle(SkPaint::kStroke_Style);
-                     p.setStrokeWidth(5.0);
+                   [=](const SkSetupContext& ctx) {
+                     ctx.paint.setStyle(SkPaint::kStroke_Style);
+                     ctx.paint.setStrokeWidth(5.0);
                    },
-                   [=](DisplayListBuilder& b) {
-                     b.setStyle(DlDrawStyle::kStroke);
-                     b.setStrokeWidth(5.0);
+                   [=](const DlSetupContext& ctx) {
+                     ctx.paint.setDrawStyle(DlDrawStyle::kStroke);
+                     ctx.paint.setStrokeWidth(5.0);
                    }));
 
     RenderWith(testP, stroke_base_env, tolerance,
                CaseParameters(
                    "Stroke Width 5, Square Cap",
-                   [=](SkCanvas*, SkPaint& p) {
-                     p.setStyle(SkPaint::kStroke_Style);
-                     p.setStrokeWidth(5.0);
-                     p.setStrokeCap(SkPaint::kSquare_Cap);
+                   [=](const SkSetupContext& ctx) {
+                     ctx.paint.setStyle(SkPaint::kStroke_Style);
+                     ctx.paint.setStrokeWidth(5.0);
+                     ctx.paint.setStrokeCap(SkPaint::kSquare_Cap);
                    },
-                   [=](DisplayListBuilder& b) {
-                     b.setStyle(DlDrawStyle::kStroke);
-                     b.setStrokeWidth(5.0);
-                     b.setStrokeCap(DlStrokeCap::kSquare);
+                   [=](const DlSetupContext& ctx) {
+                     ctx.paint.setDrawStyle(DlDrawStyle::kStroke);
+                     ctx.paint.setStrokeWidth(5.0);
+                     ctx.paint.setStrokeCap(DlStrokeCap::kSquare);
                    }));
     RenderWith(testP, stroke_base_env, tolerance,
                CaseParameters(
                    "Stroke Width 5, Round Cap",
-                   [=](SkCanvas*, SkPaint& p) {
-                     p.setStyle(SkPaint::kStroke_Style);
-                     p.setStrokeWidth(5.0);
-                     p.setStrokeCap(SkPaint::kRound_Cap);
+                   [=](const SkSetupContext& ctx) {
+                     ctx.paint.setStyle(SkPaint::kStroke_Style);
+                     ctx.paint.setStrokeWidth(5.0);
+                     ctx.paint.setStrokeCap(SkPaint::kRound_Cap);
                    },
-                   [=](DisplayListBuilder& b) {
-                     b.setStyle(DlDrawStyle::kStroke);
-                     b.setStrokeWidth(5.0);
-                     b.setStrokeCap(DlStrokeCap::kRound);
+                   [=](const DlSetupContext& ctx) {
+                     ctx.paint.setDrawStyle(DlDrawStyle::kStroke);
+                     ctx.paint.setStrokeWidth(5.0);
+                     ctx.paint.setStrokeCap(DlStrokeCap::kRound);
                    }));
 
     RenderWith(testP, stroke_base_env, tolerance,
                CaseParameters(
                    "Stroke Width 5, Bevel Join",
-                   [=](SkCanvas*, SkPaint& p) {
-                     p.setStyle(SkPaint::kStroke_Style);
-                     p.setStrokeWidth(5.0);
-                     p.setStrokeJoin(SkPaint::kBevel_Join);
+                   [=](const SkSetupContext& ctx) {
+                     ctx.paint.setStyle(SkPaint::kStroke_Style);
+                     ctx.paint.setStrokeWidth(5.0);
+                     ctx.paint.setStrokeJoin(SkPaint::kBevel_Join);
                    },
-                   [=](DisplayListBuilder& b) {
-                     b.setStyle(DlDrawStyle::kStroke);
-                     b.setStrokeWidth(5.0);
-                     b.setStrokeJoin(DlStrokeJoin::kBevel);
+                   [=](const DlSetupContext& ctx) {
+                     ctx.paint.setDrawStyle(DlDrawStyle::kStroke);
+                     ctx.paint.setStrokeWidth(5.0);
+                     ctx.paint.setStrokeJoin(DlStrokeJoin::kBevel);
                    }));
     RenderWith(testP, stroke_base_env, tolerance,
                CaseParameters(
                    "Stroke Width 5, Round Join",
-                   [=](SkCanvas*, SkPaint& p) {
-                     p.setStyle(SkPaint::kStroke_Style);
-                     p.setStrokeWidth(5.0);
-                     p.setStrokeJoin(SkPaint::kRound_Join);
+                   [=](const SkSetupContext& ctx) {
+                     ctx.paint.setStyle(SkPaint::kStroke_Style);
+                     ctx.paint.setStrokeWidth(5.0);
+                     ctx.paint.setStrokeJoin(SkPaint::kRound_Join);
                    },
-                   [=](DisplayListBuilder& b) {
-                     b.setStyle(DlDrawStyle::kStroke);
-                     b.setStrokeWidth(5.0);
-                     b.setStrokeJoin(DlStrokeJoin::kRound);
+                   [=](const DlSetupContext& ctx) {
+                     ctx.paint.setDrawStyle(DlDrawStyle::kStroke);
+                     ctx.paint.setStrokeWidth(5.0);
+                     ctx.paint.setStrokeJoin(DlStrokeJoin::kRound);
                    }));
 
     RenderWith(testP, stroke_base_env, tolerance,
                CaseParameters(
                    "Stroke Width 5, Miter 10",
-                   [=](SkCanvas*, SkPaint& p) {
-                     p.setStyle(SkPaint::kStroke_Style);
-                     p.setStrokeWidth(5.0);
-                     p.setStrokeMiter(10.0);
-                     p.setStrokeJoin(SkPaint::kMiter_Join);
+                   [=](const SkSetupContext& ctx) {
+                     ctx.paint.setStyle(SkPaint::kStroke_Style);
+                     ctx.paint.setStrokeWidth(5.0);
+                     ctx.paint.setStrokeMiter(10.0);
+                     ctx.paint.setStrokeJoin(SkPaint::kMiter_Join);
                    },
-                   [=](DisplayListBuilder& b) {
-                     b.setStyle(DlDrawStyle::kStroke);
-                     b.setStrokeWidth(5.0);
-                     b.setStrokeMiter(10.0);
-                     b.setStrokeJoin(DlStrokeJoin::kMiter);
+                   [=](const DlSetupContext& ctx) {
+                     ctx.paint.setDrawStyle(DlDrawStyle::kStroke);
+                     ctx.paint.setStrokeWidth(5.0);
+                     ctx.paint.setStrokeMiter(10.0);
+                     ctx.paint.setStrokeJoin(DlStrokeJoin::kMiter);
                    }));
 
     RenderWith(testP, stroke_base_env, tolerance,
                CaseParameters(
                    "Stroke Width 5, Miter 0",
-                   [=](SkCanvas*, SkPaint& p) {
-                     p.setStyle(SkPaint::kStroke_Style);
-                     p.setStrokeWidth(5.0);
-                     p.setStrokeMiter(0.0);
-                     p.setStrokeJoin(SkPaint::kMiter_Join);
+                   [=](const SkSetupContext& ctx) {
+                     ctx.paint.setStyle(SkPaint::kStroke_Style);
+                     ctx.paint.setStrokeWidth(5.0);
+                     ctx.paint.setStrokeMiter(0.0);
+                     ctx.paint.setStrokeJoin(SkPaint::kMiter_Join);
                    },
-                   [=](DisplayListBuilder& b) {
-                     b.setStyle(DlDrawStyle::kStroke);
-                     b.setStrokeWidth(5.0);
-                     b.setStrokeMiter(0.0);
-                     b.setStrokeJoin(DlStrokeJoin::kMiter);
+                   [=](const DlSetupContext& ctx) {
+                     ctx.paint.setDrawStyle(DlDrawStyle::kStroke);
+                     ctx.paint.setStrokeWidth(5.0);
+                     ctx.paint.setStrokeMiter(0.0);
+                     ctx.paint.setStrokeJoin(DlStrokeJoin::kMiter);
                    }));
 
     {
       const SkScalar test_dashes_1[] = {29.0, 2.0};
       const SkScalar test_dashes_2[] = {17.0, 1.5};
-      auto effect = DlDashPathEffect::Make(test_dashes_1, 2, 0.0f);
+      auto dl_dash_effect = DlDashPathEffect::Make(test_dashes_1, 2, 0.0f);
+      auto sk_dash_effect = SkDashPathEffect::Make(test_dashes_1, 2, 0.0f);
+      {
+        RenderWith(testP, stroke_base_env, tolerance,
+                   CaseParameters(
+                       "PathEffect without forced stroking == Dash-29-2",
+                       [=](const SkSetupContext& ctx) {
+                         // Provide some non-trivial stroke size to get dashed
+                         ctx.paint.setStrokeWidth(5.0);
+                         ctx.paint.setPathEffect(sk_dash_effect);
+                       },
+                       [=](const DlSetupContext& ctx) {
+                         // Provide some non-trivial stroke size to get dashed
+                         ctx.paint.setStrokeWidth(5.0);
+                         ctx.paint.setPathEffect(dl_dash_effect);
+                       }));
+      }
       {
         RenderWith(testP, stroke_base_env, tolerance,
                    CaseParameters(
                        "PathEffect == Dash-29-2",
-                       [=](SkCanvas*, SkPaint& p) {
+                       [=](const SkSetupContext& ctx) {
                          // Need stroke style to see dashing properly
-                         p.setStyle(SkPaint::kStroke_Style);
+                         ctx.paint.setStyle(SkPaint::kStroke_Style);
                          // Provide some non-trivial stroke size to get dashed
-                         p.setStrokeWidth(5.0);
-                         p.setPathEffect(effect->skia_object());
+                         ctx.paint.setStrokeWidth(5.0);
+                         ctx.paint.setPathEffect(sk_dash_effect);
                        },
-                       [=](DisplayListBuilder& b) {
+                       [=](const DlSetupContext& ctx) {
                          // Need stroke style to see dashing properly
-                         b.setStyle(DlDrawStyle::kStroke);
+                         ctx.paint.setDrawStyle(DlDrawStyle::kStroke);
                          // Provide some non-trivial stroke size to get dashed
-                         b.setStrokeWidth(5.0);
-                         b.setPathEffect(effect.get());
+                         ctx.paint.setStrokeWidth(5.0);
+                         ctx.paint.setPathEffect(dl_dash_effect);
                        }));
       }
-      effect = DlDashPathEffect::Make(test_dashes_2, 2, 0.0f);
+      dl_dash_effect = DlDashPathEffect::Make(test_dashes_2, 2, 0.0f);
+      sk_dash_effect = SkDashPathEffect::Make(test_dashes_2, 2, 0.0f);
       {
         RenderWith(testP, stroke_base_env, tolerance,
                    CaseParameters(
                        "PathEffect == Dash-17-1.5",
-                       [=](SkCanvas*, SkPaint& p) {
+                       [=](const SkSetupContext& ctx) {
                          // Need stroke style to see dashing properly
-                         p.setStyle(SkPaint::kStroke_Style);
+                         ctx.paint.setStyle(SkPaint::kStroke_Style);
                          // Provide some non-trivial stroke size to get dashed
-                         p.setStrokeWidth(5.0);
-                         p.setPathEffect(effect->skia_object());
+                         ctx.paint.setStrokeWidth(5.0);
+                         ctx.paint.setPathEffect(sk_dash_effect);
                        },
-                       [=](DisplayListBuilder& b) {
+                       [=](const DlSetupContext& ctx) {
                          // Need stroke style to see dashing properly
-                         b.setStyle(DlDrawStyle::kStroke);
+                         ctx.paint.setDrawStyle(DlDrawStyle::kStroke);
                          // Provide some non-trivial stroke size to get dashed
-                         b.setStrokeWidth(5.0);
-                         b.setPathEffect(effect.get());
+                         ctx.paint.setStrokeWidth(5.0);
+                         ctx.paint.setPathEffect(dl_dash_effect);
                        }));
       }
     }
@@ -1616,26 +2038,30 @@ class CanvasCompareTester {
     // bounds, then the estimate under rotation or skewing will be off
     // so we scale the padding by about 5% to compensate.
     BoundsTolerance skewed_tolerance = tolerance.mulScale(1.05, 1.05);
-    RenderWith(testP, env, tolerance,
-               CaseParameters(
-                   "Translate 5, 10",  //
-                   [=](SkCanvas* c, SkPaint&) { c->translate(5, 10); },
-                   [=](DisplayListBuilder& b) { b.translate(5, 10); }));
-    RenderWith(testP, env, tolerance,
-               CaseParameters(
-                   "Scale +5%",  //
-                   [=](SkCanvas* c, SkPaint&) { c->scale(1.05, 1.05); },
-                   [=](DisplayListBuilder& b) { b.scale(1.05, 1.05); }));
-    RenderWith(testP, env, skewed_tolerance,
-               CaseParameters(
-                   "Rotate 5 degrees",  //
-                   [=](SkCanvas* c, SkPaint&) { c->rotate(5); },
-                   [=](DisplayListBuilder& b) { b.rotate(5); }));
-    RenderWith(testP, env, skewed_tolerance,
-               CaseParameters(
-                   "Skew 5%",  //
-                   [=](SkCanvas* c, SkPaint&) { c->skew(0.05, 0.05); },
-                   [=](DisplayListBuilder& b) { b.skew(0.05, 0.05); }));
+    RenderWith(  //
+        testP, env, tolerance,
+        CaseParameters(
+            "Translate 5, 10",  //
+            [=](const SkSetupContext& ctx) { ctx.canvas->translate(5, 10); },
+            [=](const DlSetupContext& ctx) { ctx.canvas->Translate(5, 10); }));
+    RenderWith(  //
+        testP, env, tolerance,
+        CaseParameters(
+            "Scale +5%",  //
+            [=](const SkSetupContext& ctx) { ctx.canvas->scale(1.05, 1.05); },
+            [=](const DlSetupContext& ctx) { ctx.canvas->Scale(1.05, 1.05); }));
+    RenderWith(  //
+        testP, env, skewed_tolerance,
+        CaseParameters(
+            "Rotate 5 degrees",  //
+            [=](const SkSetupContext& ctx) { ctx.canvas->rotate(5); },
+            [=](const DlSetupContext& ctx) { ctx.canvas->Rotate(5); }));
+    RenderWith(  //
+        testP, env, skewed_tolerance,
+        CaseParameters(
+            "Skew 5%",  //
+            [=](const SkSetupContext& ctx) { ctx.canvas->skew(0.05, 0.05); },
+            [=](const DlSetupContext& ctx) { ctx.canvas->Skew(0.05, 0.05); }));
     {
       // This rather odd transform can cause slight differences in
       // computing in-bounds samples depending on which base rendering
@@ -1648,14 +2074,12 @@ class CanvasCompareTester {
       SkMatrix tx = SkMatrix::MakeAll(1.0 + tweak, tweak, 5,   //
                                       tweak, 1.0 + tweak, 10,  //
                                       0, 0, 1);
-      RenderWith(testP, env, skewed_tolerance,
-                 CaseParameters(
-                     "Transform 2D Affine",
-                     [=](SkCanvas* c, SkPaint&) { c->concat(tx); },
-                     [=](DisplayListBuilder& b) {
-                       b.transform2DAffine(tx[0], tx[1], tx[2],  //
-                                           tx[3], tx[4], tx[5]);
-                     }));
+      RenderWith(  //
+          testP, env, skewed_tolerance,
+          CaseParameters(
+              "Transform 2D Affine",
+              [=](const SkSetupContext& ctx) { ctx.canvas->concat(tx); },
+              [=](const DlSetupContext& ctx) { ctx.canvas->Transform(tx); }));
     }
     {
       SkM44 m44 = SkM44(1, 0, 0, kRenderCenterX,  //
@@ -1667,81 +2091,91 @@ class CanvasCompareTester {
       m44.preConcat(
           SkM44::Rotate({0, 1, 0}, math::kPi / 45));  // 4 degrees around Y
       m44.preTranslate(-kRenderCenterX, -kRenderCenterY);
-      RenderWith(
+      RenderWith(  //
           testP, env, skewed_tolerance,
           CaseParameters(
               "Transform Full Perspective",
-              [=](SkCanvas* c, SkPaint&) { c->concat(m44); },  //
-              [=](DisplayListBuilder& b) {
-                b.transformFullPerspective(
-                    m44.rc(0, 0), m44.rc(0, 1), m44.rc(0, 2), m44.rc(0, 3),
-                    m44.rc(1, 0), m44.rc(1, 1), m44.rc(1, 2), m44.rc(1, 3),
-                    m44.rc(2, 0), m44.rc(2, 1), m44.rc(2, 2), m44.rc(2, 3),
-                    m44.rc(3, 0), m44.rc(3, 1), m44.rc(3, 2), m44.rc(3, 3));
-              }));
+              [=](const SkSetupContext& ctx) { ctx.canvas->concat(m44); },
+              [=](const DlSetupContext& ctx) { ctx.canvas->Transform(m44); }));
     }
   }
 
   static void RenderWithClips(const TestParameters& testP,
                               const RenderEnvironment& env,
                               const BoundsTolerance& diff_tolerance) {
-    SkRect r_clip = kRenderBounds.makeInset(15.5, 15.5);
+    // We used to use an inset of 15.5 pixels here, but since Skia's rounding
+    // behavior at the center of pixels does not match between HW and SW, we
+    // ended up with some clips including different pixels between the two
+    // destinations and this interacted poorly with the carefully chosen
+    // geometry in some of the tests which was designed to have just the
+    // right features fully filling the clips based on the SW rounding. By
+    // moving to a 15.4 inset, the edge of the clip is never on the "rounding
+    // edge" of a pixel.
+    SkRect r_clip = kRenderBounds.makeInset(15.4, 15.4);
     BoundsTolerance intersect_tolerance = diff_tolerance.clip(r_clip);
+    intersect_tolerance = intersect_tolerance.addPostClipPadding(1, 1);
     RenderWith(testP, env, intersect_tolerance,
                CaseParameters(
-                   "Hard ClipRect inset by 15.5",
-                   [=](SkCanvas* c, SkPaint&) {
-                     c->clipRect(r_clip, SkClipOp::kIntersect, false);
+                   "Hard ClipRect inset by 15.4",
+                   [=](const SkSetupContext& ctx) {
+                     ctx.canvas->clipRect(r_clip, SkClipOp::kIntersect, false);
                    },
-                   [=](DisplayListBuilder& b) {
-                     b.clipRect(r_clip, SkClipOp::kIntersect, false);
+                   [=](const DlSetupContext& ctx) {
+                     ctx.canvas->ClipRect(r_clip, ClipOp::kIntersect, false);
                    }));
     RenderWith(testP, env, intersect_tolerance,
                CaseParameters(
-                   "AntiAlias ClipRect inset by 15.5",
-                   [=](SkCanvas* c, SkPaint&) {
-                     c->clipRect(r_clip, SkClipOp::kIntersect, true);
+                   "AntiAlias ClipRect inset by 15.4",
+                   [=](const SkSetupContext& ctx) {
+                     ctx.canvas->clipRect(r_clip, SkClipOp::kIntersect, true);
                    },
-                   [=](DisplayListBuilder& b) {
-                     b.clipRect(r_clip, SkClipOp::kIntersect, true);
+                   [=](const DlSetupContext& ctx) {
+                     ctx.canvas->ClipRect(r_clip, ClipOp::kIntersect, true);
                    }));
     RenderWith(testP, env, diff_tolerance,
                CaseParameters(
-                   "Hard ClipRect Diff, inset by 15.5",
-                   [=](SkCanvas* c, SkPaint&) {
-                     c->clipRect(r_clip, SkClipOp::kDifference, false);
+                   "Hard ClipRect Diff, inset by 15.4",
+                   [=](const SkSetupContext& ctx) {
+                     ctx.canvas->clipRect(r_clip, SkClipOp::kDifference, false);
                    },
-                   [=](DisplayListBuilder& b) {
-                     b.clipRect(r_clip, SkClipOp::kDifference, false);
+                   [=](const DlSetupContext& ctx) {
+                     ctx.canvas->ClipRect(r_clip, ClipOp::kDifference, false);
                    })
                    .with_diff_clip());
-    SkRRect rr_clip = SkRRect::MakeRectXY(r_clip, 1.8, 2.7);
+    // This test RR clip used to use very small radii, but due to
+    // optimizations in the HW rrect rasterization, this caused small
+    // bulges in the corners of the RRect which were interpreted as
+    // "clip overruns" by the clip OOB pixel testing code. Using less
+    // abusively small radii fixes the problem.
+    SkRRect rr_clip = SkRRect::MakeRectXY(r_clip, 9, 9);
     RenderWith(testP, env, intersect_tolerance,
                CaseParameters(
-                   "Hard ClipRRect inset by 15.5",
-                   [=](SkCanvas* c, SkPaint&) {
-                     c->clipRRect(rr_clip, SkClipOp::kIntersect, false);
+                   "Hard ClipRRect with radius of 15.4",
+                   [=](const SkSetupContext& ctx) {
+                     ctx.canvas->clipRRect(rr_clip, SkClipOp::kIntersect,
+                                           false);
                    },
-                   [=](DisplayListBuilder& b) {
-                     b.clipRRect(rr_clip, SkClipOp::kIntersect, false);
+                   [=](const DlSetupContext& ctx) {
+                     ctx.canvas->ClipRRect(rr_clip, ClipOp::kIntersect, false);
                    }));
     RenderWith(testP, env, intersect_tolerance,
                CaseParameters(
-                   "AntiAlias ClipRRect inset by 15.5",
-                   [=](SkCanvas* c, SkPaint&) {
-                     c->clipRRect(rr_clip, SkClipOp::kIntersect, true);
+                   "AntiAlias ClipRRect with radius of 15.4",
+                   [=](const SkSetupContext& ctx) {
+                     ctx.canvas->clipRRect(rr_clip, SkClipOp::kIntersect, true);
                    },
-                   [=](DisplayListBuilder& b) {
-                     b.clipRRect(rr_clip, SkClipOp::kIntersect, true);
+                   [=](const DlSetupContext& ctx) {
+                     ctx.canvas->ClipRRect(rr_clip, ClipOp::kIntersect, true);
                    }));
     RenderWith(testP, env, diff_tolerance,
                CaseParameters(
-                   "Hard ClipRRect Diff, inset by 15.5",
-                   [=](SkCanvas* c, SkPaint&) {
-                     c->clipRRect(rr_clip, SkClipOp::kDifference, false);
+                   "Hard ClipRRect Diff, with radius of 15.4",
+                   [=](const SkSetupContext& ctx) {
+                     ctx.canvas->clipRRect(rr_clip, SkClipOp::kDifference,
+                                           false);
                    },
-                   [=](DisplayListBuilder& b) {
-                     b.clipRRect(rr_clip, SkClipOp::kDifference, false);
+                   [=](const DlSetupContext& ctx) {
+                     ctx.canvas->ClipRRect(rr_clip, ClipOp::kDifference, false);
                    })
                    .with_diff_clip());
     SkPath path_clip = SkPath();
@@ -1750,88 +2184,202 @@ class CanvasCompareTester {
     path_clip.addCircle(kRenderCenterX, kRenderCenterY, 1.0);
     RenderWith(testP, env, intersect_tolerance,
                CaseParameters(
-                   "Hard ClipPath inset by 15.5",
-                   [=](SkCanvas* c, SkPaint&) {
-                     c->clipPath(path_clip, SkClipOp::kIntersect, false);
+                   "Hard ClipPath inset by 15.4",
+                   [=](const SkSetupContext& ctx) {
+                     ctx.canvas->clipPath(path_clip, SkClipOp::kIntersect,
+                                          false);
                    },
-                   [=](DisplayListBuilder& b) {
-                     b.clipPath(path_clip, SkClipOp::kIntersect, false);
+                   [=](const DlSetupContext& ctx) {
+                     ctx.canvas->ClipPath(path_clip, ClipOp::kIntersect, false);
                    }));
     RenderWith(testP, env, intersect_tolerance,
                CaseParameters(
-                   "AntiAlias ClipPath inset by 15.5",
-                   [=](SkCanvas* c, SkPaint&) {
-                     c->clipPath(path_clip, SkClipOp::kIntersect, true);
+                   "AntiAlias ClipPath inset by 15.4",
+                   [=](const SkSetupContext& ctx) {
+                     ctx.canvas->clipPath(path_clip, SkClipOp::kIntersect,
+                                          true);
                    },
-                   [=](DisplayListBuilder& b) {
-                     b.clipPath(path_clip, SkClipOp::kIntersect, true);
+                   [=](const DlSetupContext& ctx) {
+                     ctx.canvas->ClipPath(path_clip, ClipOp::kIntersect, true);
                    }));
-    RenderWith(testP, env, diff_tolerance,
-               CaseParameters(
-                   "Hard ClipPath Diff, inset by 15.5",
-                   [=](SkCanvas* c, SkPaint&) {
-                     c->clipPath(path_clip, SkClipOp::kDifference, false);
-                   },
-                   [=](DisplayListBuilder& b) {
-                     b.clipPath(path_clip, SkClipOp::kDifference, false);
-                   })
-                   .with_diff_clip());
+    RenderWith(
+        testP, env, diff_tolerance,
+        CaseParameters(
+            "Hard ClipPath Diff, inset by 15.4",
+            [=](const SkSetupContext& ctx) {
+              ctx.canvas->clipPath(path_clip, SkClipOp::kDifference, false);
+            },
+            [=](const DlSetupContext& ctx) {
+              ctx.canvas->ClipPath(path_clip, ClipOp::kDifference, false);
+            })
+            .with_diff_clip());
   }
 
-  static sk_sp<SkPicture> getSkPicture(const TestParameters& testP,
-                                       const CaseParameters& caseP) {
-    SkPictureRecorder recorder;
-    SkRTreeFactory rtree_factory;
-    SkCanvas* cv = recorder.beginRecording(kTestBounds, &rtree_factory);
-    caseP.render_to(cv, testP);
-    return recorder.finishRecordingAsPicture();
+  enum class DirectoryStatus {
+    kExisted,
+    kCreated,
+    kFailed,
+  };
+
+  static DirectoryStatus CheckDir(const std::string& dir) {
+    auto ret =
+        fml::OpenDirectory(dir.c_str(), false, fml::FilePermission::kRead);
+    if (ret.is_valid()) {
+      return DirectoryStatus::kExisted;
+    }
+    ret =
+        fml::OpenDirectory(dir.c_str(), true, fml::FilePermission::kReadWrite);
+    if (ret.is_valid()) {
+      return DirectoryStatus::kCreated;
+    }
+    FML_LOG(ERROR) << "Could not create directory (" << dir
+                   << ") for impeller failure images" << ", ret = " << ret.get()
+                   << ", errno = " << errno;
+    return DirectoryStatus::kFailed;
+  }
+
+  static void SetupImpellerFailureImageDirectory() {
+    std::string base_dir = "./impeller_failure_images";
+    if (CheckDir(base_dir) == DirectoryStatus::kFailed) {
+      return;
+    }
+    for (int i = 0; i < 10000; i++) {
+      std::string sub_dir = std::to_string(i);
+      while (sub_dir.length() < 4) {
+        sub_dir = "0" + sub_dir;
+      }
+      std::string try_dir = base_dir + "/" + sub_dir;
+      switch (CheckDir(try_dir)) {
+        case DirectoryStatus::kExisted:
+          break;
+        case DirectoryStatus::kCreated:
+          ImpellerFailureImageDirectory = try_dir;
+          return;
+        case DirectoryStatus::kFailed:
+          return;
+      }
+    }
+    FML_LOG(ERROR) << "Too many output directories for Impeller failure images";
+  }
+
+  static void save_to_png(const RenderResult* result,
+                          const std::string& op_desc,
+                          const std::string& reason) {
+    if (!SaveImpellerFailureImages) {
+      return;
+    }
+    if (ImpellerFailureImageDirectory.length() == 0) {
+      SetupImpellerFailureImageDirectory();
+      if (ImpellerFailureImageDirectory.length() == 0) {
+        SaveImpellerFailureImages = false;
+        return;
+      }
+    }
+
+    std::string filename = ImpellerFailureImageDirectory + "/";
+    for (const char& ch : op_desc) {
+      filename += (ch == ':' || ch == ' ') ? '_' : ch;
+    }
+    filename = filename + ".png";
+    result->write(filename);
+    ImpellerFailureImages.push_back(filename);
+    FML_LOG(ERROR) << reason << ": " << filename;
   }
 
   static void RenderWith(const TestParameters& testP,
                          const RenderEnvironment& env,
                          const BoundsTolerance& tolerance_in,
                          const CaseParameters& caseP) {
-    // sk_surface is a direct rendering via SkCanvas to SkSurface
-    // DisplayList mechanisms are not involved in this operation
-    const std::string info = caseP.info();
+    std::string test_name =
+        ::testing::UnitTest::GetInstance()->current_test_info()->name();
+    const std::string info =
+        env.backend_name() + ": " + test_name + " (" + caseP.info() + ")";
     const DlColor bg = caseP.bg();
-    std::unique_ptr<RenderSurface> sk_surface = env.MakeSurface(bg);
-    SkCanvas* sk_canvas = sk_surface->canvas();
-    SkPaint sk_paint;
-    caseP.cv_setup()(sk_canvas, sk_paint);
-    SkMatrix sk_matrix = sk_canvas->getTotalMatrix();
-    SkIRect sk_clip = sk_canvas->getDeviceClipBounds();
+    RenderJobInfo base_info = {
+        .bg = bg,
+    };
+
+    // sk_result is a direct rendering via SkCanvas to SkSurface
+    // DisplayList mechanisms are not involved in this operation
+    SkJobRenderer sk_job(caseP.sk_setup(),     //
+                         testP.sk_renderer(),  //
+                         caseP.sk_restore(),   //
+                         env.sk_image());
+    auto sk_result = env.getResult(base_info, sk_job);
+
+    DlJobRenderer dl_job(caseP.dl_setup(),     //
+                         testP.dl_renderer(),  //
+                         caseP.dl_restore(),   //
+                         env.dl_image());
+    auto dl_result = env.getResult(base_info, dl_job);
+
+    EXPECT_EQ(sk_job.setup_matrix(), dl_job.setup_matrix());
+    EXPECT_EQ(sk_job.setup_clip_bounds(), dl_job.setup_clip_bounds());
+    ASSERT_EQ(sk_result->width(), kTestWidth) << info;
+    ASSERT_EQ(sk_result->height(), kTestHeight) << info;
+    ASSERT_EQ(dl_result->width(), kTestWidth) << info;
+    ASSERT_EQ(dl_result->height(), kTestHeight) << info;
+
     const BoundsTolerance tolerance =
-        testP.adjust(tolerance_in, sk_paint, sk_canvas->getTotalMatrix());
-    testP.render_to(sk_canvas, sk_paint);
-    caseP.cv_restore()(sk_canvas, sk_paint);
-    const sk_sp<SkPicture> sk_picture = getSkPicture(testP, caseP);
+        testP.adjust(tolerance_in, dl_job.setup_paint(), dl_job.setup_matrix());
+    const sk_sp<SkPicture> sk_picture = sk_job.MakePicture(base_info);
+    const sk_sp<DisplayList> display_list = dl_job.MakeDisplayList(base_info);
+
     SkRect sk_bounds = sk_picture->cullRect();
-    const SkPixmap* sk_pixels = sk_surface->pixmap();
-    ASSERT_EQ(sk_pixels->width(), kTestWidth) << info;
-    ASSERT_EQ(sk_pixels->height(), kTestHeight) << info;
-    ASSERT_EQ(sk_pixels->info().bytesPerPixel(), 4) << info;
-    checkPixels(sk_pixels, sk_bounds, info + " (Skia reference)", bg);
-
-    DisplayListBuilder dl_attr;
-    caseP.dl_setup()(dl_attr);
-    if (testP.should_match(env, dl_attr, sk_matrix, sk_clip,
-                           caseP.has_diff_clip(),
-                           caseP.has_mutating_save_layer())) {
-      quickCompareToReference(env.ref_pixmap(), sk_pixels, true,
-                              info + " (attribute has no effect)");
+    checkPixels(sk_result.get(), sk_bounds, info + " (Skia reference)", bg);
+
+    if (testP.should_match(env, caseP, dl_job.setup_paint(), dl_job)) {
+      quickCompareToReference(env.ref_sk_result(), sk_result.get(), true,
+                              info + " (attribute should not have effect)");
     } else {
-      quickCompareToReference(env.ref_pixmap(), sk_pixels, false,
-                              info + " (attribute affects rendering)");
+      quickCompareToReference(env.ref_sk_result(), sk_result.get(), false,
+                              info + " (attribute should affect rendering)");
+    }
+
+    // If either the reference setup or the test setup contain attributes
+    // that Impeller doesn't support, we skip the Impeller testing. This
+    // is mostly stroked or patterned text which is vectored through drawPath
+    // for Impeller.
+    if (env.supports_impeller() &&
+        testP.impeller_compatible(dl_job.setup_paint()) &&
+        testP.impeller_compatible(env.ref_dl_paint())) {
+      DlJobRenderer imp_job(caseP.dl_setup(),      //
+                            testP.imp_renderer(),  //
+                            caseP.dl_restore(),    //
+                            env.impeller_image());
+      auto imp_result = env.getImpellerResult(base_info, imp_job);
+      std::string imp_info = info + " (Impeller)";
+      bool success = checkPixels(imp_result.get(), imp_result->render_bounds(),
+                                 imp_info, bg);
+      if (testP.should_match(env, caseP, imp_job.setup_paint(), imp_job)) {
+        success = success &&                //
+                  quickCompareToReference(  //
+                      env.ref_impeller_result(), imp_result.get(), true,
+                      imp_info + " (attribute should not have effect)");
+      } else {
+        success = success &&                //
+                  quickCompareToReference(  //
+                      env.ref_impeller_result(), imp_result.get(), false,
+                      imp_info + " (attribute should affect rendering)");
+      }
+      if (SaveImpellerFailureImages && !success) {
+        FML_LOG(ERROR) << "Impeller issue encountered for: "
+                       << *imp_job.MakeDisplayList(base_info);
+        save_to_png(imp_result.get(), info + " (Impeller Result)",
+                    "output saved in");
+        save_to_png(env.ref_impeller_result(), info + " (Impeller Reference)",
+                    "compare to reference without attributes");
+        save_to_png(sk_result.get(), info + " (Skia Result)",
+                    "and to Skia reference with attributes");
+        save_to_png(env.ref_sk_result(), info + " (Skia Reference)",
+                    "and to Skia reference without attributes");
+      }
     }
 
+    quickCompareToReference(sk_result.get(), dl_result.get(), true,
+                            info + " (DlCanvas output matches SkCanvas)");
+
     {
-      // This sequence plays the provided equivalently constructed
-      // DisplayList onto the SkCanvas of the surface
-      // DisplayList => direct rendering
-      DisplayListBuilder builder(kTestBounds);
-      caseP.render_to(builder, testP);
-      sk_sp<DisplayList> display_list = builder.Build();
       SkRect dl_bounds = display_list->bounds();
       if (!sk_bounds.roundOut().contains(dl_bounds)) {
         FML_LOG(ERROR) << "For " << info;
@@ -1844,7 +2392,8 @@ class CanvasCompareTester {
         if (!dl_bounds.contains(sk_bounds)) {
           FML_LOG(ERROR) << "DisplayList bounds are too small!";
         }
-        if (!sk_bounds.roundOut().contains(dl_bounds.roundOut())) {
+        if (!dl_bounds.isEmpty() &&
+            !sk_bounds.roundOut().contains(dl_bounds.roundOut())) {
           FML_LOG(ERROR) << "###### DisplayList bounds larger than reference!";
         }
       }
@@ -1864,72 +2413,59 @@ class CanvasCompareTester {
         EXPECT_EQ(static_cast<int>(display_list->op_count()),
                   sk_picture->approximateOpCount())
             << info;
+        EXPECT_EQ(static_cast<int>(display_list->op_count()),
+                  sk_picture->approximateOpCount())
+            << info;
+      }
+
+      DisplayListJobRenderer dl_builder_job(display_list);
+      auto dl_builder_result = env.getResult(base_info, dl_builder_job);
+      if (caseP.fuzzy_compare_components()) {
+        compareToReference(
+            dl_builder_result.get(), dl_result.get(),
+            info + " (DlCanvas DL output close to Builder Dl output)",
+            &dl_bounds, &tolerance, bg, true);
+      } else {
+        quickCompareToReference(
+            dl_builder_result.get(), dl_result.get(), true,
+            info + " (DlCanvas DL output matches Builder Dl output)");
       }
 
-      std::unique_ptr<RenderSurface> dl_surface = env.MakeSurface(bg);
-      display_list->RenderTo(dl_surface->canvas());
-      compareToReference(dl_surface->pixmap(), sk_pixels,
+      compareToReference(dl_result.get(), sk_result.get(),
                          info + " (DisplayList built directly -> surface)",
                          &dl_bounds, &tolerance, bg,
                          caseP.fuzzy_compare_components());
 
       if (display_list->can_apply_group_opacity()) {
-        checkGroupOpacity(env, display_list, dl_surface->pixmap(),
+        checkGroupOpacity(env, display_list, dl_result.get(),
                           info + " with Group Opacity", bg);
       }
     }
 
-    // This test cannot work if the rendering is using shadows until
-    // we can access the Skia ShadowRec via public headers.
-    if (!testP.is_draw_shadows()) {
-      // This sequence renders SkCanvas calls to a DisplayList and then
-      // plays them back on SkCanvas to SkSurface
-      // SkCanvas calls => DisplayList => rendering
-      std::unique_ptr<RenderSurface> cv_dl_surface = env.MakeSurface(bg);
-      DisplayListCanvasRecorder dl_recorder(kTestBounds);
-      caseP.render_to(&dl_recorder, testP);
-      dl_recorder.builder()->Build()->RenderTo(cv_dl_surface->canvas());
-      compareToReference(cv_dl_surface->pixmap(), sk_pixels,
-                         info + " (Skia calls -> DisplayList -> surface)",
-                         nullptr, nullptr, bg,
-                         caseP.fuzzy_compare_components());
-    }
-
     {
-      // This sequence renders the SkCanvas calls to an SkPictureRecorder and
-      // renders the DisplayList calls to a DisplayListBuilder and then
-      // renders both back under a transform (scale(2x)) to see if their
+      // This sequence uses an SkPicture generated previously from the SkCanvas
+      // calls and a DisplayList generated previously from the DlCanvas calls
+      // and renders both back under a transform (scale(2x)) to see if their
       // rendering is affected differently by a change of matrix between
       // recording time and rendering time.
       const int test_width_2 = kTestWidth * 2;
       const int test_height_2 = kTestHeight * 2;
       const SkScalar test_scale = 2.0;
 
-      SkPictureRecorder sk_x2_recorder;
-      SkCanvas* ref_canvas = sk_x2_recorder.beginRecording(kTestBounds);
-      SkPaint ref_paint;
-      caseP.render_to(ref_canvas, testP);
-      sk_sp<SkPicture> ref_x2_picture =
-          sk_x2_recorder.finishRecordingAsPicture();
-      std::unique_ptr<RenderSurface> ref_x2_surface =
-          env.MakeSurface(bg, test_width_2, test_height_2);
-      SkCanvas* ref_x2_canvas = ref_x2_surface->canvas();
-      ref_x2_canvas->scale(test_scale, test_scale);
-      ref_x2_picture->playback(ref_x2_canvas);
-      const SkPixmap* ref_x2_pixels = ref_x2_surface->pixmap();
-      ASSERT_EQ(ref_x2_pixels->width(), test_width_2) << info;
-      ASSERT_EQ(ref_x2_pixels->height(), test_height_2) << info;
-      ASSERT_EQ(ref_x2_pixels->info().bytesPerPixel(), 4) << info;
-
-      DisplayListBuilder builder_x2(kTestBounds);
-      caseP.render_to(builder_x2, testP);
-      sk_sp<DisplayList> display_list_x2 = builder_x2.Build();
-      std::unique_ptr<RenderSurface> test_x2_surface =
-          env.MakeSurface(bg, test_width_2, test_height_2);
-      SkCanvas* test_x2_canvas = test_x2_surface->canvas();
-      test_x2_canvas->scale(test_scale, test_scale);
-      display_list_x2->RenderTo(test_x2_canvas);
-      compareToReference(test_x2_surface->pixmap(), ref_x2_pixels,
+      SkPictureJobRenderer sk_job_x2(sk_picture);
+      RenderJobInfo info_2x = {
+          .width = test_width_2,
+          .height = test_height_2,
+          .bg = bg,
+          .scale = test_scale,
+      };
+      auto ref_x2_result = env.getResult(info_2x, sk_job_x2);
+      ASSERT_EQ(ref_x2_result->width(), test_width_2) << info;
+      ASSERT_EQ(ref_x2_result->height(), test_height_2) << info;
+
+      DisplayListJobRenderer dl_job_x2(display_list);
+      auto test_x2_result = env.getResult(info_2x, dl_job_x2);
+      compareToReference(test_x2_result.get(), ref_x2_result.get(),
                          info + " (Both rendered scaled 2x)", nullptr, nullptr,
                          bg, caseP.fuzzy_compare_components(),  //
                          test_width_2, test_height_2, false);
@@ -1947,28 +2483,40 @@ class CanvasCompareTester {
     return true;
   }
 
+  static int groupOpacityFudgeFactor(const RenderEnvironment& env) {
+    if (env.format() == PixelFormat::k565PixelFormat) {
+      return 9;
+    }
+    if (env.provider()->backend_type() == BackendType::kOpenGlBackend) {
+      // OpenGL gets a little fuzzy at times. Still, "within 5" (aka +/-4)
+      // for byte samples is not bad, though the other backends give +/-1
+      return 5;
+    }
+    return 2;
+  }
   static void checkGroupOpacity(const RenderEnvironment& env,
                                 const sk_sp<DisplayList>& display_list,
-                                const SkPixmap* ref_pixmap,
+                                const RenderResult* ref_result,
                                 const std::string& info,
                                 DlColor bg) {
     SkScalar opacity = 128.0 / 255.0;
 
-    std::unique_ptr<RenderSurface> group_opacity_surface = env.MakeSurface(bg);
-    SkCanvas* group_opacity_canvas = group_opacity_surface->canvas();
-    display_list->RenderTo(group_opacity_canvas, opacity);
-    const SkPixmap* group_opacity_pixmap = group_opacity_surface->pixmap();
+    DisplayListJobRenderer opacity_job(display_list);
+    RenderJobInfo opacity_info = {
+        .bg = bg,
+        .opacity = opacity,
+    };
+    auto group_opacity_result = env.getResult(opacity_info, opacity_job);
 
-    ASSERT_EQ(group_opacity_pixmap->width(), kTestWidth) << info;
-    ASSERT_EQ(group_opacity_pixmap->height(), kTestHeight) << info;
-    ASSERT_EQ(group_opacity_pixmap->info().bytesPerPixel(), 4) << info;
+    ASSERT_EQ(group_opacity_result->width(), kTestWidth) << info;
+    ASSERT_EQ(group_opacity_result->height(), kTestHeight) << info;
 
-    ASSERT_EQ(ref_pixmap->width(), kTestWidth) << info;
-    ASSERT_EQ(ref_pixmap->height(), kTestHeight) << info;
-    ASSERT_EQ(ref_pixmap->info().bytesPerPixel(), 4) << info;
+    ASSERT_EQ(ref_result->width(), kTestWidth) << info;
+    ASSERT_EQ(ref_result->height(), kTestHeight) << info;
 
     int pixels_touched = 0;
     int pixels_different = 0;
+    int max_diff = 0;
     // We need to allow some slight differences per component due to the
     // fact that rearranging discrete calculations can compound round off
     // errors. Off-by-2 is enough for 8 bit components, but for the 565
@@ -1977,21 +2525,25 @@ class CanvasCompareTester {
     // max step of 8 converting 5 bits to 8 bits, but it is really
     // converting 31 steps to 255 steps with an average step size of
     // 8.23 - 24 of the steps are by 8, but 7 of them are by 9.)
-    int fudge = env.info().bytesPerPixel() < 4 ? 9 : 2;
+    int fudge = groupOpacityFudgeFactor(env);
     for (int y = 0; y < kTestHeight; y++) {
-      const uint32_t* ref_row = ref_pixmap->addr32(0, y);
-      const uint32_t* test_row = group_opacity_pixmap->addr32(0, y);
+      const uint32_t* ref_row = ref_result->addr32(0, y);
+      const uint32_t* test_row = group_opacity_result->addr32(0, y);
       for (int x = 0; x < kTestWidth; x++) {
         uint32_t ref_pixel = ref_row[x];
         uint32_t test_pixel = test_row[x];
-        if (ref_pixel != bg.argb || test_pixel != bg.argb) {
+        if (ref_pixel != bg.argb() || test_pixel != bg.argb()) {
           pixels_touched++;
           for (int i = 0; i < 32; i += 8) {
             int ref_comp = (ref_pixel >> i) & 0xff;
-            int bg_comp = (bg.argb >> i) & 0xff;
+            int bg_comp = (bg.argb() >> i) & 0xff;
             SkScalar faded_comp = bg_comp + (ref_comp - bg_comp) * opacity;
             int test_comp = (test_pixel >> i) & 0xff;
             if (std::abs(faded_comp - test_comp) > fudge) {
+              int diff = std::abs(faded_comp - test_comp);
+              if (max_diff < diff) {
+                max_diff = diff;
+              }
               pixels_different++;
               break;
             }
@@ -2000,19 +2552,24 @@ class CanvasCompareTester {
       }
     }
     ASSERT_GT(pixels_touched, 20) << info;
+    if (pixels_different > 1) {
+      FML_LOG(ERROR) << "max diff == " << max_diff << " for " << info;
+    }
     ASSERT_LE(pixels_different, 1) << info;
   }
 
-  static void checkPixels(const SkPixmap* ref_pixels,
+  static bool checkPixels(const RenderResult* ref_result,
                           const SkRect ref_bounds,
                           const std::string& info,
-                          const DlColor bg) {
+                          const DlColor bg = DlColor::kTransparent()) {
     uint32_t untouched = bg.premultipliedArgb();
     int pixels_touched = 0;
     int pixels_oob = 0;
     SkIRect i_bounds = ref_bounds.roundOut();
+    EXPECT_EQ(ref_result->width(), kTestWidth) << info;
+    EXPECT_EQ(ref_result->height(), kTestWidth) << info;
     for (int y = 0; y < kTestHeight; y++) {
-      const uint32_t* ref_row = ref_pixels->addr32(0, y);
+      const uint32_t* ref_row = ref_result->addr32(0, y);
       for (int x = 0; x < kTestWidth; x++) {
         if (ref_row[x] != untouched) {
           pixels_touched++;
@@ -2022,25 +2579,49 @@ class CanvasCompareTester {
         }
       }
     }
-    ASSERT_EQ(pixels_oob, 0) << info;
-    ASSERT_GT(pixels_touched, 0) << info;
+    EXPECT_EQ(pixels_oob, 0) << info;
+    EXPECT_GT(pixels_touched, 0) << info;
+    return pixels_oob == 0 && pixels_touched > 0;
   }
 
-  static void quickCompareToReference(const SkPixmap* ref_pixels,
-                                      const SkPixmap* test_pixels,
+  static int countModifiedTransparentPixels(const RenderResult* ref_result,
+                                            const RenderResult* test_result) {
+    int count = 0;
+    for (int y = 0; y < kTestHeight; y++) {
+      const uint32_t* ref_row = ref_result->addr32(0, y);
+      const uint32_t* test_row = test_result->addr32(0, y);
+      for (int x = 0; x < kTestWidth; x++) {
+        if (ref_row[x] != test_row[x]) {
+          if (ref_row[x] == 0) {
+            count++;
+          }
+        }
+      }
+    }
+    return count;
+  }
+
+  static void quickCompareToReference(const RenderEnvironment& env,
+                                      const std::string& info) {
+    quickCompareToReference(env.ref_sk_result(), env.ref_dl_result(), true,
+                            info + " reference rendering");
+  }
+
+  static bool quickCompareToReference(const RenderResult* ref_result,
+                                      const RenderResult* test_result,
                                       bool should_match,
                                       const std::string& info) {
-    ASSERT_EQ(test_pixels->width(), ref_pixels->width()) << info;
-    ASSERT_EQ(test_pixels->height(), ref_pixels->height()) << info;
-    ASSERT_EQ(test_pixels->info().bytesPerPixel(), 4) << info;
-    ASSERT_EQ(ref_pixels->info().bytesPerPixel(), 4) << info;
+    int w = test_result->width();
+    int h = test_result->height();
+    EXPECT_EQ(w, ref_result->width()) << info;
+    EXPECT_EQ(h, ref_result->height()) << info;
     int pixels_different = 0;
-    for (int y = 0; y < test_pixels->height(); y++) {
-      const uint32_t* ref_row = ref_pixels->addr32(0, y);
-      const uint32_t* test_row = test_pixels->addr32(0, y);
-      for (int x = 0; x < test_pixels->width(); x++) {
+    for (int y = 0; y < h; y++) {
+      const uint32_t* ref_row = ref_result->addr32(0, y);
+      const uint32_t* test_row = test_result->addr32(0, y);
+      for (int x = 0; x < w; x++) {
         if (ref_row[x] != test_row[x]) {
-          if (should_match) {
+          if (should_match && pixels_different < 5) {
             FML_LOG(ERROR) << std::hex << ref_row[x] << " != " << test_row[x];
           }
           pixels_different++;
@@ -2048,14 +2629,16 @@ class CanvasCompareTester {
       }
     }
     if (should_match) {
-      ASSERT_EQ(pixels_different, 0) << info;
+      EXPECT_EQ(pixels_different, 0) << info;
+      return pixels_different == 0;
     } else {
-      ASSERT_NE(pixels_different, 0) << info;
+      EXPECT_NE(pixels_different, 0) << info;
+      return pixels_different != 0;
     }
   }
 
-  static void compareToReference(const SkPixmap* test_pixels,
-                                 const SkPixmap* ref_pixels,
+  static void compareToReference(const RenderResult* test_result,
+                                 const RenderResult* ref_result,
                                  const std::string& info,
                                  SkRect* bounds,
                                  const BoundsTolerance* tolerance,
@@ -2065,10 +2648,8 @@ class CanvasCompareTester {
                                  int height = kTestHeight,
                                  bool printMismatches = false) {
     uint32_t untouched = bg.premultipliedArgb();
-    ASSERT_EQ(test_pixels->width(), width) << info;
-    ASSERT_EQ(test_pixels->height(), height) << info;
-    ASSERT_EQ(test_pixels->info().bytesPerPixel(), 4) << info;
-    ASSERT_EQ(ref_pixels->info().bytesPerPixel(), 4) << info;
+    ASSERT_EQ(test_result->width(), width) << info;
+    ASSERT_EQ(test_result->height(), height) << info;
     SkIRect i_bounds =
         bounds ? bounds->roundOut() : SkIRect::MakeWH(width, height);
 
@@ -2079,8 +2660,8 @@ class CanvasCompareTester {
     int max_x = 0;
     int max_y = 0;
     for (int y = 0; y < height; y++) {
-      const uint32_t* ref_row = ref_pixels->addr32(0, y);
-      const uint32_t* test_row = test_pixels->addr32(0, y);
+      const uint32_t* ref_row = ref_result->addr32(0, y);
+      const uint32_t* test_row = test_result->addr32(0, y);
       for (int x = 0; x < width; x++) {
         if (bounds && test_row[x] != untouched) {
           if (min_x > x) {
@@ -2102,7 +2683,7 @@ class CanvasCompareTester {
         bool match = fuzzyCompares ? fuzzyCompare(test_row[x], ref_row[x], 1)
                                    : test_row[x] == ref_row[x];
         if (!match) {
-          if (printMismatches) {
+          if (printMismatches && pixels_different < 5) {
             FML_LOG(ERROR) << "pix[" << x << ", " << y
                            << "] mismatch: " << std::hex << test_row[x]
                            << "(test) != (ref)" << ref_row[x] << std::dec;
@@ -2146,7 +2727,7 @@ class CanvasCompareTester {
     int worst_pad_x = std::max(pad_left, pad_right);
     int worst_pad_y = std::max(pad_top, pad_bottom);
     if (tolerance->overflows(pix_bounds, worst_pad_x, worst_pad_y)) {
-      FML_LOG(ERROR) << "Overflow for " << info;
+      FML_LOG(ERROR) << "Computed bounds for " << info;
       FML_LOG(ERROR) << "pix bounds["                        //
                      << pixLeft << ", " << pixTop << " => "  //
                      << pixRight << ", " << pixBottom        //
@@ -2156,222 +2737,300 @@ class CanvasCompareTester {
                      << " => "                                   //
                      << bounds.fRight << ", " << bounds.fBottom  //
                      << "]";
-      FML_LOG(ERROR) << "Bounds overflowed by up to "              //
+      FML_LOG(ERROR) << "Bounds overly conservative by up to "     //
                      << worst_pad_x << ", " << worst_pad_y         //
                      << " (" << (worst_pad_x * 100.0 / pix_width)  //
                      << "%, " << (worst_pad_y * 100.0 / pix_height) << "%)";
       int pix_area = pix_size.area();
       int dl_area = bounds.width() * bounds.height();
       FML_LOG(ERROR) << "Total overflow area: " << (dl_area - pix_area)  //
-                     << " (+" << (dl_area * 100.0 / pix_area - 100.0) << "%)";
+                     << " (+" << (dl_area * 100.0 / pix_area - 100.0)    //
+                     << "% larger)";
       FML_LOG(ERROR);
     }
   }
 
-  static const sk_sp<SkImage> kTestImage;
-  static const sk_sp<SkImage> makeTestImage() {
-    sk_sp<SkSurface> surface =
-        SkSurface::MakeRasterN32Premul(kRenderWidth, kRenderHeight);
-    SkCanvas* canvas = surface->getCanvas();
-    SkPaint p0, p1;
-    p0.setStyle(SkPaint::kFill_Style);
-    p0.setColor(SkColorSetARGB(0xff, 0x00, 0xfe, 0x00));  // off-green
-    p1.setStyle(SkPaint::kFill_Style);
-    p1.setColor(SK_ColorBLUE);
-    // Some pixels need some transparency for DstIn testing
-    p1.setAlpha(128);
-    int cbdim = 5;
-    for (int y = 0; y < kRenderHeight; y += cbdim) {
-      for (int x = 0; x < kRenderWidth; x += cbdim) {
-        SkPaint& cellp = ((x + y) & 1) == 0 ? p0 : p1;
-        canvas->drawRect(SkRect::MakeXYWH(x, y, cbdim, cbdim), cellp);
-      }
-    }
-    return surface->makeImageSnapshot();
-  }
-
-  static const DlImageColorSource kTestImageColorSource;
-
   static sk_sp<SkTextBlob> MakeTextBlob(const std::string& string,
                                         SkScalar font_height) {
-    SkFont font(SkTypeface::MakeFromName("ahem", SkFontStyle::Normal()),
-                font_height);
+    SkFont font = CreateTestFontOfSize(font_height);
+    sk_sp<SkTypeface> face = font.refTypeface();
+    FML_CHECK(face);
+    FML_CHECK(face->countGlyphs() > 0) << "No glyphs in font";
     return SkTextBlob::MakeFromText(string.c_str(), string.size(), font,
                                     SkTextEncoding::kUTF8);
   }
 };
 
+std::vector<BackendType> CanvasCompareTester::TestBackends;
+std::string CanvasCompareTester::ImpellerFailureImageDirectory = "";
+bool CanvasCompareTester::SaveImpellerFailureImages = false;
+std::vector<std::string> CanvasCompareTester::ImpellerFailureImages;
+
 BoundsTolerance CanvasCompareTester::DefaultTolerance =
     BoundsTolerance().addAbsolutePadding(1, 1);
 
-const sk_sp<SkImage> CanvasCompareTester::kTestImage = makeTestImage();
-const DlImageColorSource CanvasCompareTester::kTestImageColorSource(
-    DlImage::Make(kTestImage),
-    DlTileMode::kRepeat,
-    DlTileMode::kRepeat,
-    DlImageSampling::kLinear);
-
 // Eventually this bare bones testing::Test fixture will subsume the
 // CanvasCompareTester and the TestParameters could then become just
 // configuration calls made upon the fixture.
 template <typename BaseT>
-class DisplayListCanvasTestBase : public BaseT, protected DisplayListOpFlags {
+class DisplayListRenderingTestBase : public BaseT,
+                                     protected DisplayListOpFlags {
  public:
-  DisplayListCanvasTestBase() = default;
+  DisplayListRenderingTestBase() = default;
+
+  static bool StartsWith(std::string str, std::string prefix) {
+    if (prefix.length() > str.length()) {
+      return false;
+    }
+    for (size_t i = 0; i < prefix.length(); i++) {
+      if (str[i] != prefix[i]) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  static void SetUpTestSuite() {
+    bool do_software = true;
+    bool do_opengl = false;
+    bool do_metal = false;
+    std::vector<std::string> args = ::testing::internal::GetArgvs();
+    for (auto p_arg = std::next(args.begin()); p_arg != args.end(); p_arg++) {
+      std::string arg = *p_arg;
+      bool enable = true;
+      if (arg == "--save-impeller-failures") {
+        CanvasCompareTester::SaveImpellerFailureImages = true;
+        continue;
+      }
+      if (StartsWith(arg, "--no")) {
+        enable = false;
+        arg = "-" + arg.substr(4);
+      }
+      if (arg == "--enable-software") {
+        do_software = enable;
+      } else if (arg == "--enable-opengl" || arg == "--enable-gl") {
+        do_opengl = enable;
+      } else if (arg == "--enable-metal") {
+        do_metal = enable;
+      }
+    }
+    if (do_software) {
+      CanvasCompareTester::AddProvider(BackendType::kSoftwareBackend);
+    }
+    if (do_opengl) {
+      CanvasCompareTester::AddProvider(BackendType::kOpenGlBackend);
+    }
+    if (do_metal) {
+      CanvasCompareTester::AddProvider(BackendType::kMetalBackend);
+    }
+    std::string providers = "";
+    for (auto& back_end : CanvasCompareTester::TestBackends) {
+      providers += " " + DlSurfaceProvider::BackendName(back_end);
+    }
+    FML_LOG(INFO) << "Running tests on [" << providers << " ]";
+  }
+
+  static void TearDownTestSuite() {
+    if (CanvasCompareTester::ImpellerFailureImages.size() > 0) {
+      FML_LOG(INFO);
+      FML_LOG(INFO) << CanvasCompareTester::ImpellerFailureImages.size()
+                    << " images saved in "
+                    << CanvasCompareTester::ImpellerFailureImageDirectory;
+      for (const auto& filename : CanvasCompareTester::ImpellerFailureImages) {
+        FML_LOG(INFO) << "  " << filename;
+      }
+      FML_LOG(INFO);
+    }
+  }
 
  private:
-  FML_DISALLOW_COPY_AND_ASSIGN(DisplayListCanvasTestBase);
+  FML_DISALLOW_COPY_AND_ASSIGN(DisplayListRenderingTestBase);
 };
-using DisplayListCanvas = DisplayListCanvasTestBase<::testing::Test>;
+using DisplayListRendering = DisplayListRenderingTestBase<::testing::Test>;
 
-TEST_F(DisplayListCanvas, DrawPaint) {
+TEST_F(DisplayListRendering, DrawPaint) {
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {  //
-            canvas->drawPaint(paint);
+          [=](const SkRenderContext& ctx) {  //
+            ctx.canvas->drawPaint(ctx.paint);
           },
-          [=](DisplayListBuilder& builder) {  //
-            builder.drawPaint();
+          [=](const DlRenderContext& ctx) {  //
+            ctx.canvas->DrawPaint(ctx.paint);
           },
           kDrawPaintFlags));
 }
 
-TEST_F(DisplayListCanvas, DrawColor) {
+TEST_F(DisplayListRendering, DrawOpaqueColor) {
+  // We use a non-opaque color to avoid obliterating any backdrop filter output
+  CanvasCompareTester::RenderAll(  //
+      TestParameters(
+          [=](const SkRenderContext& ctx) {
+            // DrawColor is not tested against attributes because it is supposed
+            // to ignore them. So, if the paint has an alpha, it is because we
+            // are doing a saveLayer+backdrop test and we need to not flood over
+            // the backdrop output with a solid color. So, we perform an alpha
+            // drawColor for that case only.
+            SkColor color = SkColorSetA(SK_ColorMAGENTA, ctx.paint.getAlpha());
+            ctx.canvas->drawColor(color);
+          },
+          [=](const DlRenderContext& ctx) {
+            // DrawColor is not tested against attributes because it is supposed
+            // to ignore them. So, if the paint has an alpha, it is because we
+            // are doing a saveLayer+backdrop test and we need to not flood over
+            // the backdrop output with a solid color. So, we transfer the alpha
+            // from the paint for that case only.
+            ctx.canvas->DrawColor(
+                DlColor::kMagenta().withAlpha(ctx.paint.getAlpha()));
+          },
+          kDrawColorFlags));
+}
+
+TEST_F(DisplayListRendering, DrawAlphaColor) {
   // We use a non-opaque color to avoid obliterating any backdrop filter output
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {
-            canvas->drawColor(0x7FFF00FF);
+          [=](const SkRenderContext& ctx) {
+            ctx.canvas->drawColor(0x7FFF00FF);
           },
-          [=](DisplayListBuilder& builder) {
-            builder.drawColor(0x7FFF00FF, DlBlendMode::kSrcOver);
+          [=](const DlRenderContext& ctx) {
+            ctx.canvas->DrawColor(DlColor(0x7FFF00FF));
           },
           kDrawColorFlags));
 }
 
-TEST_F(DisplayListCanvas, DrawDiagonalLines) {
+TEST_F(DisplayListRendering, DrawDiagonalLines) {
   SkPoint p1 = SkPoint::Make(kRenderLeft, kRenderTop);
   SkPoint p2 = SkPoint::Make(kRenderRight, kRenderBottom);
   SkPoint p3 = SkPoint::Make(kRenderLeft, kRenderBottom);
   SkPoint p4 = SkPoint::Make(kRenderRight, kRenderTop);
+  // Adding some edge center to edge center diagonals to better fill
+  // out the RRect Clip so bounds checking sees less empty bounds space.
+  SkPoint p5 = SkPoint::Make(kRenderCenterX, kRenderTop);
+  SkPoint p6 = SkPoint::Make(kRenderRight, kRenderCenterY);
+  SkPoint p7 = SkPoint::Make(kRenderLeft, kRenderCenterY);
+  SkPoint p8 = SkPoint::Make(kRenderCenterX, kRenderBottom);
 
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {  //
+          [=](const SkRenderContext& ctx) {  //
             // Skia requires kStroke style on horizontal and vertical
             // lines to get the bounds correct.
             // See https://bugs.chromium.org/p/skia/issues/detail?id=12446
-            SkPaint p = paint;
+            SkPaint p = ctx.paint;
             p.setStyle(SkPaint::kStroke_Style);
-            canvas->drawLine(p1, p2, p);
-            canvas->drawLine(p3, p4, p);
+            ctx.canvas->drawLine(p1, p2, p);
+            ctx.canvas->drawLine(p3, p4, p);
+            ctx.canvas->drawLine(p5, p6, p);
+            ctx.canvas->drawLine(p7, p8, p);
           },
-          [=](DisplayListBuilder& builder) {  //
-            builder.drawLine(p1, p2);
-            builder.drawLine(p3, p4);
+          [=](const DlRenderContext& ctx) {  //
+            ctx.canvas->DrawLine(p1, p2, ctx.paint);
+            ctx.canvas->DrawLine(p3, p4, ctx.paint);
+            ctx.canvas->DrawLine(p5, p6, ctx.paint);
+            ctx.canvas->DrawLine(p7, p8, ctx.paint);
           },
           kDrawLineFlags)
           .set_draw_line());
 }
 
-TEST_F(DisplayListCanvas, DrawHorizontalLine) {
+TEST_F(DisplayListRendering, DrawHorizontalLine) {
   SkPoint p1 = SkPoint::Make(kRenderLeft, kRenderCenterY);
   SkPoint p2 = SkPoint::Make(kRenderRight, kRenderCenterY);
 
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {  //
+          [=](const SkRenderContext& ctx) {  //
             // Skia requires kStroke style on horizontal and vertical
             // lines to get the bounds correct.
             // See https://bugs.chromium.org/p/skia/issues/detail?id=12446
-            SkPaint p = paint;
+            SkPaint p = ctx.paint;
             p.setStyle(SkPaint::kStroke_Style);
-            canvas->drawLine(p1, p2, p);
+            ctx.canvas->drawLine(p1, p2, p);
           },
-          [=](DisplayListBuilder& builder) {  //
-            builder.drawLine(p1, p2);
+          [=](const DlRenderContext& ctx) {  //
+            ctx.canvas->DrawLine(p1, p2, ctx.paint);
           },
           kDrawHVLineFlags)
           .set_draw_line()
           .set_horizontal_line());
 }
 
-TEST_F(DisplayListCanvas, DrawVerticalLine) {
+TEST_F(DisplayListRendering, DrawVerticalLine) {
   SkPoint p1 = SkPoint::Make(kRenderCenterX, kRenderTop);
   SkPoint p2 = SkPoint::Make(kRenderCenterY, kRenderBottom);
 
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {  //
+          [=](const SkRenderContext& ctx) {  //
             // Skia requires kStroke style on horizontal and vertical
             // lines to get the bounds correct.
             // See https://bugs.chromium.org/p/skia/issues/detail?id=12446
-            SkPaint p = paint;
+            SkPaint p = ctx.paint;
             p.setStyle(SkPaint::kStroke_Style);
-            canvas->drawLine(p1, p2, p);
+            ctx.canvas->drawLine(p1, p2, p);
           },
-          [=](DisplayListBuilder& builder) {  //
-            builder.drawLine(p1, p2);
+          [=](const DlRenderContext& ctx) {  //
+            ctx.canvas->DrawLine(p1, p2, ctx.paint);
           },
           kDrawHVLineFlags)
           .set_draw_line()
           .set_vertical_line());
 }
 
-TEST_F(DisplayListCanvas, DrawRect) {
+TEST_F(DisplayListRendering, DrawRect) {
   // Bounds are offset by 0.5 pixels to induce AA
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {  //
-            canvas->drawRect(kRenderBounds.makeOffset(0.5, 0.5), paint);
+          [=](const SkRenderContext& ctx) {  //
+            ctx.canvas->drawRect(kRenderBounds.makeOffset(0.5, 0.5), ctx.paint);
           },
-          [=](DisplayListBuilder& builder) {  //
-            builder.drawRect(kRenderBounds.makeOffset(0.5, 0.5));
+          [=](const DlRenderContext& ctx) {  //
+            ctx.canvas->DrawRect(kRenderBounds.makeOffset(0.5, 0.5), ctx.paint);
           },
           kDrawRectFlags));
 }
 
-TEST_F(DisplayListCanvas, DrawOval) {
+TEST_F(DisplayListRendering, DrawOval) {
   SkRect rect = kRenderBounds.makeInset(0, 10);
 
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {  //
-            canvas->drawOval(rect, paint);
+          [=](const SkRenderContext& ctx) {  //
+            ctx.canvas->drawOval(rect, ctx.paint);
           },
-          [=](DisplayListBuilder& builder) {  //
-            builder.drawOval(rect);
+          [=](const DlRenderContext& ctx) {  //
+            ctx.canvas->DrawOval(rect, ctx.paint);
           },
           kDrawOvalFlags));
 }
 
-TEST_F(DisplayListCanvas, DrawCircle) {
+TEST_F(DisplayListRendering, DrawCircle) {
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {  //
-            canvas->drawCircle(kTestCenter, kRenderRadius, paint);
+          [=](const SkRenderContext& ctx) {  //
+            ctx.canvas->drawCircle(kTestCenter, kRenderRadius, ctx.paint);
           },
-          [=](DisplayListBuilder& builder) {  //
-            builder.drawCircle(kTestCenter, kRenderRadius);
+          [=](const DlRenderContext& ctx) {  //
+            ctx.canvas->DrawCircle(kTestCenter, kRenderRadius, ctx.paint);
           },
           kDrawCircleFlags));
 }
 
-TEST_F(DisplayListCanvas, DrawRRect) {
+TEST_F(DisplayListRendering, DrawRRect) {
   SkRRect rrect = SkRRect::MakeRectXY(kRenderBounds, kRenderCornerRadius,
                                       kRenderCornerRadius);
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {  //
-            canvas->drawRRect(rrect, paint);
+          [=](const SkRenderContext& ctx) {  //
+            ctx.canvas->drawRRect(rrect, ctx.paint);
           },
-          [=](DisplayListBuilder& builder) {  //
-            builder.drawRRect(rrect);
+          [=](const DlRenderContext& ctx) {  //
+            ctx.canvas->DrawRRect(rrect, ctx.paint);
           },
           kDrawRRectFlags));
 }
 
-TEST_F(DisplayListCanvas, DrawDRRect) {
+TEST_F(DisplayListRendering, DrawDRRect) {
   SkRRect outer = SkRRect::MakeRectXY(kRenderBounds, kRenderCornerRadius,
                                       kRenderCornerRadius);
   SkRect inner_bounds = kRenderBounds.makeInset(30.0, 30.0);
@@ -2379,16 +3038,16 @@ TEST_F(DisplayListCanvas, DrawDRRect) {
                                       kRenderCornerRadius);
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {  //
-            canvas->drawDRRect(outer, inner, paint);
+          [=](const SkRenderContext& ctx) {  //
+            ctx.canvas->drawDRRect(outer, inner, ctx.paint);
           },
-          [=](DisplayListBuilder& builder) {  //
-            builder.drawDRRect(outer, inner);
+          [=](const DlRenderContext& ctx) {  //
+            ctx.canvas->DrawDRRect(outer, inner, ctx.paint);
           },
           kDrawDRRectFlags));
 }
 
-TEST_F(DisplayListCanvas, DrawPath) {
+TEST_F(DisplayListRendering, DrawPath) {
   SkPath path;
 
   // unclosed lines to show some caps
@@ -2413,28 +3072,29 @@ TEST_F(DisplayListCanvas, DrawPath) {
 
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {  //
-            canvas->drawPath(path, paint);
+          [=](const SkRenderContext& ctx) {  //
+            ctx.canvas->drawPath(path, ctx.paint);
           },
-          [=](DisplayListBuilder& builder) {  //
-            builder.drawPath(path);
+          [=](const DlRenderContext& ctx) {  //
+            ctx.canvas->DrawPath(path, ctx.paint);
           },
-          kDrawPathFlags));
+          kDrawPathFlags)
+          .set_draw_path());
 }
 
-TEST_F(DisplayListCanvas, DrawArc) {
+TEST_F(DisplayListRendering, DrawArc) {
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {  //
-            canvas->drawArc(kRenderBounds, 60, 330, false, paint);
+          [=](const SkRenderContext& ctx) {  //
+            ctx.canvas->drawArc(kRenderBounds, 60, 330, false, ctx.paint);
           },
-          [=](DisplayListBuilder& builder) {  //
-            builder.drawArc(kRenderBounds, 60, 330, false);
+          [=](const DlRenderContext& ctx) {  //
+            ctx.canvas->DrawArc(kRenderBounds, 60, 330, false, ctx.paint);
           },
           kDrawArcNoCenterFlags));
 }
 
-TEST_F(DisplayListCanvas, DrawArcCenter) {
+TEST_F(DisplayListRendering, DrawArcCenter) {
   // Center arcs that inscribe nearly a whole circle except for a small
   // arc extent gap have 2 angles that may appear or disappear at the
   // various miter limits tested (0, 4, and 10).
@@ -2447,17 +3107,17 @@ TEST_F(DisplayListCanvas, DrawArcCenter) {
   // Limit == 10, edge and center corners all miter
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {  //
-            canvas->drawArc(kRenderBounds, 60, 360 - 12, true, paint);
+          [=](const SkRenderContext& ctx) {  //
+            ctx.canvas->drawArc(kRenderBounds, 60, 360 - 12, true, ctx.paint);
           },
-          [=](DisplayListBuilder& builder) {  //
-            builder.drawArc(kRenderBounds, 60, 360 - 12, true);
+          [=](const DlRenderContext& ctx) {  //
+            ctx.canvas->DrawArc(kRenderBounds, 60, 360 - 12, true, ctx.paint);
           },
           kDrawArcWithCenterFlags)
           .set_draw_arc_center());
 }
 
-TEST_F(DisplayListCanvas, DrawPointsAsPoints) {
+TEST_F(DisplayListRendering, DrawPointsAsPoints) {
   // The +/- 16 points are designed to fall just inside the clips
   // that are tested against so we avoid lots of undrawn pixels
   // in the accumulated bounds.
@@ -2492,23 +3152,25 @@ TEST_F(DisplayListCanvas, DrawPointsAsPoints) {
 
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {  //
+          [=](const SkRenderContext& ctx) {
             // Skia requires kStroke style on horizontal and vertical
             // lines to get the bounds correct.
             // See https://bugs.chromium.org/p/skia/issues/detail?id=12446
-            SkPaint p = paint;
+            SkPaint p = ctx.paint;
             p.setStyle(SkPaint::kStroke_Style);
-            canvas->drawPoints(SkCanvas::kPoints_PointMode, count, points, p);
+            auto mode = SkCanvas::kPoints_PointMode;
+            ctx.canvas->drawPoints(mode, count, points, p);
           },
-          [=](DisplayListBuilder& builder) {  //
-            builder.drawPoints(SkCanvas::kPoints_PointMode, count, points);
+          [=](const DlRenderContext& ctx) {
+            auto mode = PointMode::kPoints;
+            ctx.canvas->DrawPoints(mode, count, points, ctx.paint);
           },
           kDrawPointsAsPointsFlags)
           .set_draw_line()
           .set_ignores_dashes());
 }
 
-TEST_F(DisplayListCanvas, DrawPointsAsLines) {
+TEST_F(DisplayListRendering, DrawPointsAsLines) {
   const SkScalar x0 = kRenderLeft + 1;
   const SkScalar x1 = kRenderLeft + 16;
   const SkScalar x2 = kRenderRight - 16;
@@ -2542,50 +3204,56 @@ TEST_F(DisplayListCanvas, DrawPointsAsLines) {
   ASSERT_TRUE((count & 1) == 0);
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {  //
+          [=](const SkRenderContext& ctx) {
             // Skia requires kStroke style on horizontal and vertical
             // lines to get the bounds correct.
             // See https://bugs.chromium.org/p/skia/issues/detail?id=12446
-            SkPaint p = paint;
+            SkPaint p = ctx.paint;
             p.setStyle(SkPaint::kStroke_Style);
-            canvas->drawPoints(SkCanvas::kLines_PointMode, count, points, p);
+            auto mode = SkCanvas::kLines_PointMode;
+            ctx.canvas->drawPoints(mode, count, points, p);
           },
-          [=](DisplayListBuilder& builder) {  //
-            builder.drawPoints(SkCanvas::kLines_PointMode, count, points);
+          [=](const DlRenderContext& ctx) {
+            auto mode = PointMode::kLines;
+            ctx.canvas->DrawPoints(mode, count, points, ctx.paint);
           },
           kDrawPointsAsLinesFlags));
 }
 
-TEST_F(DisplayListCanvas, DrawPointsAsPolygon) {
+TEST_F(DisplayListRendering, DrawPointsAsPolygon) {
   const SkPoint points1[] = {
-      // RenderBounds box with a diagonal
+      // RenderBounds box with a diamond
       SkPoint::Make(kRenderLeft, kRenderTop),
       SkPoint::Make(kRenderRight, kRenderTop),
       SkPoint::Make(kRenderRight, kRenderBottom),
       SkPoint::Make(kRenderLeft, kRenderBottom),
       SkPoint::Make(kRenderLeft, kRenderTop),
-      SkPoint::Make(kRenderRight, kRenderBottom),
+      SkPoint::Make(kRenderCenterX, kRenderTop),
+      SkPoint::Make(kRenderRight, kRenderCenterY),
+      SkPoint::Make(kRenderCenterX, kRenderBottom),
+      SkPoint::Make(kRenderLeft, kRenderCenterY),
   };
   const int count1 = sizeof(points1) / sizeof(points1[0]);
 
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {  //
+          [=](const SkRenderContext& ctx) {
             // Skia requires kStroke style on horizontal and vertical
             // lines to get the bounds correct.
             // See https://bugs.chromium.org/p/skia/issues/detail?id=12446
-            SkPaint p = paint;
+            SkPaint p = ctx.paint;
             p.setStyle(SkPaint::kStroke_Style);
-            canvas->drawPoints(SkCanvas::kPolygon_PointMode, count1, points1,
-                               p);
+            auto mode = SkCanvas::kPolygon_PointMode;
+            ctx.canvas->drawPoints(mode, count1, points1, p);
           },
-          [=](DisplayListBuilder& builder) {  //
-            builder.drawPoints(SkCanvas::kPolygon_PointMode, count1, points1);
+          [=](const DlRenderContext& ctx) {
+            auto mode = PointMode::kPolygon;
+            ctx.canvas->DrawPoints(mode, count1, points1, ctx.paint);
           },
           kDrawPointsAsPolygonFlags));
 }
 
-TEST_F(DisplayListCanvas, DrawVerticesWithColors) {
+TEST_F(DisplayListRendering, DrawVerticesWithColors) {
   // Cover as many sides of the box with only 6 vertices:
   // +----------+
   // |xxxxxxxxxx|
@@ -2605,26 +3273,34 @@ TEST_F(DisplayListCanvas, DrawVerticesWithColors) {
       SkPoint::Make(kRenderLeft, kRenderCenterY),
       SkPoint::Make(kRenderRight, kRenderBottom),
   };
-  const DlColor colors[6] = {
+  const DlColor dl_colors[6] = {
+      DlColor::kRed(),  DlColor::kBlue(),   DlColor::kGreen(),
+      DlColor::kCyan(), DlColor::kYellow(), DlColor::kMagenta(),
+  };
+  const SkColor sk_colors[6] = {
       SK_ColorRED,  SK_ColorBLUE,   SK_ColorGREEN,
       SK_ColorCYAN, SK_ColorYELLOW, SK_ColorMAGENTA,
   };
-  const std::shared_ptr<DlVertices> vertices =
-      DlVertices::Make(DlVertexMode::kTriangles, 6, pts, nullptr, colors);
+  const std::shared_ptr<DlVertices> dl_vertices =
+      DlVertices::Make(DlVertexMode::kTriangles, 6, pts, nullptr, dl_colors);
+  const auto sk_vertices =
+      SkVertices::MakeCopy(SkVertices::VertexMode::kTriangles_VertexMode, 6,
+                           pts, nullptr, sk_colors);
 
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {  //
-            canvas->drawVertices(vertices->skia_object(), SkBlendMode::kSrcOver,
-                                 paint);
+          [=](const SkRenderContext& ctx) {
+            ctx.canvas->drawVertices(sk_vertices, SkBlendMode::kSrcOver,
+                                     ctx.paint);
           },
-          [=](DisplayListBuilder& builder) {  //
-            builder.drawVertices(vertices, DlBlendMode::kSrcOver);
+          [=](const DlRenderContext& ctx) {
+            ctx.canvas->DrawVertices(dl_vertices, DlBlendMode::kSrcOver,
+                                     ctx.paint);
           },
           kDrawVerticesFlags));
 }
 
-TEST_F(DisplayListCanvas, DrawVerticesWithImage) {
+TEST_F(DisplayListRendering, DrawVerticesWithImage) {
   // Cover as many sides of the box with only 6 vertices:
   // +----------+
   // |xxxxxxxxxx|
@@ -2652,271 +3328,182 @@ TEST_F(DisplayListCanvas, DrawVerticesWithImage) {
       SkPoint::Make(0, 0),
       SkPoint::Make(kRenderWidth, 0),
   };
-  const std::shared_ptr<DlVertices> vertices =
+  const std::shared_ptr<DlVertices> dl_vertices =
       DlVertices::Make(DlVertexMode::kTriangles, 6, pts, tex, nullptr);
+  const auto sk_vertices = SkVertices::MakeCopy(
+      SkVertices::VertexMode::kTriangles_VertexMode, 6, pts, tex, nullptr);
 
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {  //
-            SkPaint v_paint = paint;
+          [=](const SkRenderContext& ctx) {  //
+            SkPaint v_paint = ctx.paint;
             if (v_paint.getShader() == nullptr) {
-              v_paint.setShader(
-                  CanvasCompareTester::kTestImageColorSource.skia_object());
+              v_paint.setShader(MakeColorSource(ctx.image));
             }
-            canvas->drawVertices(vertices->skia_object(), SkBlendMode::kSrcOver,
-                                 v_paint);
+            ctx.canvas->drawVertices(sk_vertices, SkBlendMode::kSrcOver,
+                                     v_paint);
           },
-          [=](DisplayListBuilder& builder) {  //
-            if (builder.getColorSource() == nullptr) {
-              builder.setColorSource(
-                  &CanvasCompareTester::kTestImageColorSource);
+          [=](const DlRenderContext& ctx) {  //
+            DlPaint v_paint = ctx.paint;
+            if (v_paint.getColorSource() == nullptr) {
+              v_paint.setColorSource(MakeColorSource(ctx.image));
             }
-            builder.drawVertices(vertices, DlBlendMode::kSrcOver);
+            ctx.canvas->DrawVertices(dl_vertices, DlBlendMode::kSrcOver,
+                                     v_paint);
           },
           kDrawVerticesFlags));
 }
 
-TEST_F(DisplayListCanvas, DrawImageNearest) {
+TEST_F(DisplayListRendering, DrawImageNearest) {
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {         //
-            canvas->drawImage(CanvasCompareTester::kTestImage,  //
-                              kRenderLeft, kRenderTop,
-                              ToSk(DlImageSampling::kNearestNeighbor), &paint);
+          [=](const SkRenderContext& ctx) {
+            ctx.canvas->drawImage(ctx.image, kRenderLeft, kRenderTop,
+                                  SkImageSampling::kNearestNeighbor,
+                                  &ctx.paint);
           },
-          [=](DisplayListBuilder& builder) {  //
-            builder.drawImage(DlImage::Make(CanvasCompareTester::kTestImage),
-                              SkPoint::Make(kRenderLeft, kRenderTop),
-                              DlImageSampling::kNearestNeighbor, true);
+          [=](const DlRenderContext& ctx) {
+            ctx.canvas->DrawImage(ctx.image,  //
+                                  SkPoint::Make(kRenderLeft, kRenderTop),
+                                  DlImageSampling::kNearestNeighbor,
+                                  &ctx.paint);
           },
           kDrawImageWithPaintFlags));
 }
 
-TEST_F(DisplayListCanvas, DrawImageNearestNoPaint) {
+TEST_F(DisplayListRendering, DrawImageNearestNoPaint) {
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {         //
-            canvas->drawImage(CanvasCompareTester::kTestImage,  //
-                              kRenderLeft, kRenderTop,
-                              ToSk(DlImageSampling::kNearestNeighbor), nullptr);
+          [=](const SkRenderContext& ctx) {
+            ctx.canvas->drawImage(ctx.image, kRenderLeft, kRenderTop,
+                                  SkImageSampling::kNearestNeighbor, nullptr);
           },
-          [=](DisplayListBuilder& builder) {  //
-            builder.drawImage(DlImage::Make(CanvasCompareTester::kTestImage),
-                              SkPoint::Make(kRenderLeft, kRenderTop),
-                              DlImageSampling::kNearestNeighbor, false);
+          [=](const DlRenderContext& ctx) {
+            ctx.canvas->DrawImage(ctx.image,
+                                  SkPoint::Make(kRenderLeft, kRenderTop),
+                                  DlImageSampling::kNearestNeighbor, nullptr);
           },
           kDrawImageFlags));
 }
 
-TEST_F(DisplayListCanvas, DrawImageLinear) {
+TEST_F(DisplayListRendering, DrawImageLinear) {
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {         //
-            canvas->drawImage(CanvasCompareTester::kTestImage,  //
-                              kRenderLeft, kRenderTop,
-                              ToSk(DlImageSampling::kLinear), &paint);
+          [=](const SkRenderContext& ctx) {
+            ctx.canvas->drawImage(ctx.image, kRenderLeft, kRenderTop,
+                                  SkImageSampling::kLinear, &ctx.paint);
           },
-          [=](DisplayListBuilder& builder) {  //
-            builder.drawImage(DlImage::Make(CanvasCompareTester::kTestImage),
-                              SkPoint::Make(kRenderLeft, kRenderTop),
-                              DlImageSampling::kLinear, true);
+          [=](const DlRenderContext& ctx) {
+            ctx.canvas->DrawImage(ctx.image,
+                                  SkPoint::Make(kRenderLeft, kRenderTop),
+                                  DlImageSampling::kLinear, &ctx.paint);
           },
           kDrawImageWithPaintFlags));
 }
 
-TEST_F(DisplayListCanvas, DrawImageRectNearest) {
+TEST_F(DisplayListRendering, DrawImageRectNearest) {
   SkRect src = SkRect::MakeIWH(kRenderWidth, kRenderHeight).makeInset(5, 5);
   SkRect dst = kRenderBounds.makeInset(10.5, 10.5);
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {  //
-            canvas->drawImageRect(CanvasCompareTester::kTestImage, src, dst,
-                                  ToSk(DlImageSampling::kNearestNeighbor),
-                                  &paint, SkCanvas::kFast_SrcRectConstraint);
+          [=](const SkRenderContext& ctx) {
+            ctx.canvas->drawImageRect(
+                ctx.image, src, dst, SkImageSampling::kNearestNeighbor,
+                &ctx.paint, SkCanvas::kFast_SrcRectConstraint);
           },
-          [=](DisplayListBuilder& builder) {  //
-            builder.drawImageRect(
-                DlImage::Make(CanvasCompareTester::kTestImage), src, dst,
-                DlImageSampling::kNearestNeighbor, true);
+          [=](const DlRenderContext& ctx) {
+            ctx.canvas->DrawImageRect(
+                ctx.image, src, dst, DlImageSampling::kNearestNeighbor,
+                &ctx.paint, DlCanvas::SrcRectConstraint::kFast);
           },
           kDrawImageRectWithPaintFlags));
 }
 
-TEST_F(DisplayListCanvas, DrawImageRectNearestNoPaint) {
+TEST_F(DisplayListRendering, DrawImageRectNearestNoPaint) {
   SkRect src = SkRect::MakeIWH(kRenderWidth, kRenderHeight).makeInset(5, 5);
   SkRect dst = kRenderBounds.makeInset(10.5, 10.5);
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {  //
-            canvas->drawImageRect(CanvasCompareTester::kTestImage, src, dst,
-                                  ToSk(DlImageSampling::kNearestNeighbor),
-                                  nullptr, SkCanvas::kFast_SrcRectConstraint);
+          [=](const SkRenderContext& ctx) {
+            ctx.canvas->drawImageRect(
+                ctx.image, src, dst, SkImageSampling::kNearestNeighbor,  //
+                nullptr, SkCanvas::kFast_SrcRectConstraint);
           },
-          [=](DisplayListBuilder& builder) {  //
-            builder.drawImageRect(
-                DlImage::Make(CanvasCompareTester::kTestImage), src, dst,
-                DlImageSampling::kNearestNeighbor, false);
+          [=](const DlRenderContext& ctx) {
+            ctx.canvas->DrawImageRect(
+                ctx.image, src, dst, DlImageSampling::kNearestNeighbor,  //
+                nullptr, DlCanvas::SrcRectConstraint::kFast);
           },
           kDrawImageRectFlags));
 }
 
-TEST_F(DisplayListCanvas, DrawImageRectLinear) {
+TEST_F(DisplayListRendering, DrawImageRectLinear) {
   SkRect src = SkRect::MakeIWH(kRenderWidth, kRenderHeight).makeInset(5, 5);
   SkRect dst = kRenderBounds.makeInset(10.5, 10.5);
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {  //
-            canvas->drawImageRect(CanvasCompareTester::kTestImage, src, dst,
-                                  ToSk(DlImageSampling::kLinear), &paint,
-                                  SkCanvas::kFast_SrcRectConstraint);
+          [=](const SkRenderContext& ctx) {
+            ctx.canvas->drawImageRect(
+                ctx.image, src, dst, SkImageSampling::kLinear,  //
+                &ctx.paint, SkCanvas::kFast_SrcRectConstraint);
           },
-          [=](DisplayListBuilder& builder) {  //
-            builder.drawImageRect(
-                DlImage::Make(CanvasCompareTester::kTestImage), src, dst,
-                DlImageSampling::kLinear, true);
+          [=](const DlRenderContext& ctx) {  //
+            ctx.canvas->DrawImageRect(
+                ctx.image, src, dst, DlImageSampling::kLinear,  //
+                &ctx.paint, DlCanvas::SrcRectConstraint::kFast);
           },
           kDrawImageRectWithPaintFlags));
 }
 
-TEST_F(DisplayListCanvas, DrawImageNineNearest) {
+TEST_F(DisplayListRendering, DrawImageNineNearest) {
   SkIRect src = SkIRect::MakeWH(kRenderWidth, kRenderHeight).makeInset(25, 25);
   SkRect dst = kRenderBounds.makeInset(10.5, 10.5);
-  sk_sp<SkImage> image = CanvasCompareTester::kTestImage;
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {
-            canvas->drawImageNine(image.get(), src, dst, SkFilterMode::kNearest,
-                                  &paint);
+          [=](const SkRenderContext& ctx) {
+            ctx.canvas->drawImageNine(ctx.image.get(), src, dst,
+                                      SkFilterMode::kNearest, &ctx.paint);
           },
-          [=](DisplayListBuilder& builder) {
-            builder.drawImageNine(DlImage::Make(image), src, dst,
-                                  DlFilterMode::kNearest, true);
+          [=](const DlRenderContext& ctx) {
+            ctx.canvas->DrawImageNine(ctx.image, src, dst,
+                                      DlFilterMode::kNearest, &ctx.paint);
           },
           kDrawImageNineWithPaintFlags));
 }
 
-TEST_F(DisplayListCanvas, DrawImageNineNearestNoPaint) {
+TEST_F(DisplayListRendering, DrawImageNineNearestNoPaint) {
   SkIRect src = SkIRect::MakeWH(kRenderWidth, kRenderHeight).makeInset(25, 25);
   SkRect dst = kRenderBounds.makeInset(10.5, 10.5);
-  sk_sp<SkImage> image = CanvasCompareTester::kTestImage;
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {
-            canvas->drawImageNine(image.get(), src, dst, SkFilterMode::kNearest,
-                                  nullptr);
+          [=](const SkRenderContext& ctx) {
+            ctx.canvas->drawImageNine(ctx.image.get(), src, dst,
+                                      SkFilterMode::kNearest, nullptr);
           },
-          [=](DisplayListBuilder& builder) {
-            builder.drawImageNine(DlImage::Make(image), src, dst,
-                                  DlFilterMode::kNearest, false);
+          [=](const DlRenderContext& ctx) {
+            ctx.canvas->DrawImageNine(ctx.image, src, dst,
+                                      DlFilterMode::kNearest, nullptr);
           },
           kDrawImageNineFlags));
 }
 
-TEST_F(DisplayListCanvas, DrawImageNineLinear) {
+TEST_F(DisplayListRendering, DrawImageNineLinear) {
   SkIRect src = SkIRect::MakeWH(kRenderWidth, kRenderHeight).makeInset(25, 25);
   SkRect dst = kRenderBounds.makeInset(10.5, 10.5);
-  sk_sp<SkImage> image = CanvasCompareTester::kTestImage;
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {
-            canvas->drawImageNine(image.get(), src, dst, SkFilterMode::kLinear,
-                                  &paint);
+          [=](const SkRenderContext& ctx) {
+            ctx.canvas->drawImageNine(ctx.image.get(), src, dst,
+                                      SkFilterMode::kLinear, &ctx.paint);
           },
-          [=](DisplayListBuilder& builder) {
-            builder.drawImageNine(DlImage::Make(image), src, dst,
-                                  DlFilterMode::kLinear, true);
+          [=](const DlRenderContext& ctx) {
+            ctx.canvas->DrawImageNine(ctx.image, src, dst,
+                                      DlFilterMode::kLinear, &ctx.paint);
           },
           kDrawImageNineWithPaintFlags));
 }
 
-TEST_F(DisplayListCanvas, DrawImageLatticeNearest) {
-  const SkRect dst = kRenderBounds.makeInset(10.5, 10.5);
-  const int div_x[] = {
-      kRenderWidth * 1 / 4,
-      kRenderWidth * 2 / 4,
-      kRenderWidth * 3 / 4,
-  };
-  const int div_y[] = {
-      kRenderHeight * 1 / 4,
-      kRenderHeight * 2 / 4,
-      kRenderHeight * 3 / 4,
-  };
-  SkCanvas::Lattice lattice = {
-      div_x, div_y, nullptr, 3, 3, nullptr, nullptr,
-  };
-  sk_sp<SkImage> image = CanvasCompareTester::kTestImage;
-  CanvasCompareTester::RenderAll(  //
-      TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {
-            canvas->drawImageLattice(image.get(), lattice, dst,
-                                     SkFilterMode::kNearest, &paint);
-          },
-          [=](DisplayListBuilder& builder) {
-            builder.drawImageLattice(DlImage::Make(image), lattice, dst,
-                                     DlFilterMode::kNearest, true);
-          },
-          kDrawImageLatticeWithPaintFlags));
-}
-
-TEST_F(DisplayListCanvas, DrawImageLatticeNearestNoPaint) {
-  const SkRect dst = kRenderBounds.makeInset(10.5, 10.5);
-  const int div_x[] = {
-      kRenderWidth * 1 / 4,
-      kRenderWidth * 2 / 4,
-      kRenderWidth * 3 / 4,
-  };
-  const int div_y[] = {
-      kRenderHeight * 1 / 4,
-      kRenderHeight * 2 / 4,
-      kRenderHeight * 3 / 4,
-  };
-  SkCanvas::Lattice lattice = {
-      div_x, div_y, nullptr, 3, 3, nullptr, nullptr,
-  };
-  sk_sp<SkImage> image = CanvasCompareTester::kTestImage;
-  CanvasCompareTester::RenderAll(  //
-      TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {
-            canvas->drawImageLattice(image.get(), lattice, dst,
-                                     SkFilterMode::kNearest, nullptr);
-          },
-          [=](DisplayListBuilder& builder) {
-            builder.drawImageLattice(DlImage::Make(image), lattice, dst,
-                                     DlFilterMode::kNearest, false);
-          },
-          kDrawImageLatticeFlags));
-}
-
-TEST_F(DisplayListCanvas, DrawImageLatticeLinear) {
-  const SkRect dst = kRenderBounds.makeInset(10.5, 10.5);
-  const int div_x[] = {
-      kRenderWidth / 4,
-      kRenderWidth / 2,
-      kRenderWidth * 3 / 4,
-  };
-  const int div_y[] = {
-      kRenderHeight / 4,
-      kRenderHeight / 2,
-      kRenderHeight * 3 / 4,
-  };
-  SkCanvas::Lattice lattice = {
-      div_x, div_y, nullptr, 3, 3, nullptr, nullptr,
-  };
-  sk_sp<SkImage> image = CanvasCompareTester::kTestImage;
-  CanvasCompareTester::RenderAll(  //
-      TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {
-            canvas->drawImageLattice(image.get(), lattice, dst,
-                                     SkFilterMode::kLinear, &paint);
-          },
-          [=](DisplayListBuilder& builder) {
-            builder.drawImageLattice(DlImage::Make(image), lattice, dst,
-                                     DlFilterMode::kLinear, true);
-          },
-          kDrawImageLatticeWithPaintFlags));
-}
-
-TEST_F(DisplayListCanvas, DrawAtlasNearest) {
+TEST_F(DisplayListRendering, DrawAtlasNearest) {
   const SkRSXform xform[] = {
       // clang-format off
       { 1.2f,  0.0f, kRenderLeft,  kRenderTop},
@@ -2933,31 +3520,36 @@ TEST_F(DisplayListCanvas, DrawAtlasNearest) {
       {0,                kRenderHalfHeight, kRenderHalfWidth, kRenderHeight},
       // clang-format on
   };
-  const DlColor colors[] = {
+  const SkColor sk_colors[] = {
       SK_ColorBLUE,
       SK_ColorGREEN,
       SK_ColorYELLOW,
       SK_ColorMAGENTA,
   };
-  const sk_sp<SkImage> image = CanvasCompareTester::kTestImage;
-  const DlImageSampling sampling = DlImageSampling::kNearestNeighbor;
+  const DlColor dl_colors[] = {
+      DlColor::kBlue(),
+      DlColor::kGreen(),
+      DlColor::kYellow(),
+      DlColor::kMagenta(),
+  };
+  const DlImageSampling dl_sampling = DlImageSampling::kNearestNeighbor;
+  const SkSamplingOptions sk_sampling = SkImageSampling::kNearestNeighbor;
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {
-            const SkColor* sk_colors = reinterpret_cast<const SkColor*>(colors);
-            canvas->drawAtlas(image.get(), xform, tex, sk_colors, 4,
-                              SkBlendMode::kSrcOver, ToSk(sampling), nullptr,
-                              &paint);
+          [=](const SkRenderContext& ctx) {
+            ctx.canvas->drawAtlas(ctx.image.get(), xform, tex, sk_colors, 4,
+                                  SkBlendMode::kSrcOver, sk_sampling, nullptr,
+                                  &ctx.paint);
           },
-          [=](DisplayListBuilder& builder) {
-            const DlColor* dl_colors = reinterpret_cast<const DlColor*>(colors);
-            builder.drawAtlas(DlImage::Make(image), xform, tex, dl_colors, 4,
-                              DlBlendMode::kSrcOver, sampling, nullptr, true);
+          [=](const DlRenderContext& ctx) {
+            ctx.canvas->DrawAtlas(ctx.image, xform, tex, dl_colors, 4,
+                                  DlBlendMode::kSrcOver, dl_sampling, nullptr,
+                                  &ctx.paint);
           },
           kDrawAtlasWithPaintFlags));
 }
 
-TEST_F(DisplayListCanvas, DrawAtlasNearestNoPaint) {
+TEST_F(DisplayListRendering, DrawAtlasNearestNoPaint) {
   const SkRSXform xform[] = {
       // clang-format off
       { 1.2f,  0.0f, kRenderLeft,  kRenderTop},
@@ -2974,32 +3566,36 @@ TEST_F(DisplayListCanvas, DrawAtlasNearestNoPaint) {
       {0,                kRenderHalfHeight, kRenderHalfWidth, kRenderHeight},
       // clang-format on
   };
-  const DlColor colors[] = {
+  const SkColor sk_colors[] = {
       SK_ColorBLUE,
       SK_ColorGREEN,
       SK_ColorYELLOW,
       SK_ColorMAGENTA,
   };
-  const sk_sp<SkImage> image = CanvasCompareTester::kTestImage;
-  const DlImageSampling sampling = DlImageSampling::kNearestNeighbor;
+  const DlColor dl_colors[] = {
+      DlColor::kBlue(),
+      DlColor::kGreen(),
+      DlColor::kYellow(),
+      DlColor::kMagenta(),
+  };
+  const DlImageSampling dl_sampling = DlImageSampling::kNearestNeighbor;
+  const SkSamplingOptions sk_sampling = SkImageSampling::kNearestNeighbor;
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {
-            const SkColor* sk_colors = reinterpret_cast<const SkColor*>(colors);
-            canvas->drawAtlas(image.get(), xform, tex, sk_colors, 4,
-                              SkBlendMode::kSrcOver, ToSk(sampling),  //
-                              nullptr, nullptr);
-          },
-          [=](DisplayListBuilder& builder) {
-            const DlColor* dl_colors = reinterpret_cast<const DlColor*>(colors);
-            builder.drawAtlas(DlImage::Make(image), xform, tex, dl_colors, 4,
-                              DlBlendMode::kSrcOver, sampling,  //
-                              nullptr, false);
+          [=](const SkRenderContext& ctx) {
+            ctx.canvas->drawAtlas(ctx.image.get(), xform, tex, sk_colors, 4,
+                                  SkBlendMode::kSrcOver, sk_sampling,  //
+                                  nullptr, nullptr);
+          },
+          [=](const DlRenderContext& ctx) {
+            ctx.canvas->DrawAtlas(ctx.image, xform, tex, dl_colors, 4,
+                                  DlBlendMode::kSrcOver, dl_sampling,  //
+                                  nullptr, nullptr);
           },
           kDrawAtlasFlags));
 }
 
-TEST_F(DisplayListCanvas, DrawAtlasLinear) {
+TEST_F(DisplayListRendering, DrawAtlasLinear) {
   const SkRSXform xform[] = {
       // clang-format off
       { 1.2f,  0.0f, kRenderLeft,  kRenderTop},
@@ -3016,140 +3612,104 @@ TEST_F(DisplayListCanvas, DrawAtlasLinear) {
       {0,                kRenderHalfHeight, kRenderHalfWidth, kRenderHeight},
       // clang-format on
   };
-  const DlColor colors[] = {
+  const SkColor sk_colors[] = {
       SK_ColorBLUE,
       SK_ColorGREEN,
       SK_ColorYELLOW,
       SK_ColorMAGENTA,
   };
-  const sk_sp<SkImage> image = CanvasCompareTester::kTestImage;
-  const DlImageSampling sampling = DlImageSampling::kLinear;
+  const DlColor dl_colors[] = {
+      DlColor::kBlue(),
+      DlColor::kGreen(),
+      DlColor::kYellow(),
+      DlColor::kMagenta(),
+  };
+  const DlImageSampling dl_sampling = DlImageSampling::kLinear;
+  const SkSamplingOptions sk_sampling = SkImageSampling::kLinear;
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {
-            const SkColor* sk_colors = reinterpret_cast<const SkColor*>(colors);
-            canvas->drawAtlas(image.get(), xform, tex, sk_colors, 2,  //
-                              SkBlendMode::kSrcOver, ToSk(sampling), nullptr,
-                              &paint);
+          [=](const SkRenderContext& ctx) {
+            ctx.canvas->drawAtlas(ctx.image.get(), xform, tex, sk_colors, 2,
+                                  SkBlendMode::kSrcOver, sk_sampling,  //
+                                  nullptr, &ctx.paint);
           },
-          [=](DisplayListBuilder& builder) {
-            const DlColor* dl_colors = reinterpret_cast<const DlColor*>(colors);
-            builder.drawAtlas(DlImage::Make(image), xform, tex, dl_colors, 2,
-                              DlBlendMode::kSrcOver, sampling, nullptr, true);
+          [=](const DlRenderContext& ctx) {
+            ctx.canvas->DrawAtlas(ctx.image, xform, tex, dl_colors, 2,
+                                  DlBlendMode::kSrcOver, dl_sampling,  //
+                                  nullptr, &ctx.paint);
           },
           kDrawAtlasWithPaintFlags));
 }
 
-sk_sp<SkPicture> makeTestPicture() {
-  SkPictureRecorder recorder;
-  SkCanvas* cv = recorder.beginRecording(kRenderBounds);
-  SkPaint p;
-  p.setStyle(SkPaint::kFill_Style);
-  p.setColor(SK_ColorRED);
-  cv->drawRect({kRenderLeft, kRenderTop, kRenderCenterX, kRenderCenterY}, p);
-  p.setColor(SK_ColorBLUE);
-  cv->drawRect({kRenderCenterX, kRenderTop, kRenderRight, kRenderCenterY}, p);
-  p.setColor(SK_ColorGREEN);
-  cv->drawRect({kRenderLeft, kRenderCenterY, kRenderCenterX, kRenderBottom}, p);
-  p.setColor(SK_ColorYELLOW);
-  cv->drawRect({kRenderCenterX, kRenderCenterY, kRenderRight, kRenderBottom},
-               p);
-  return recorder.finishRecordingAsPicture();
-}
-
-TEST_F(DisplayListCanvas, DrawPicture) {
-  sk_sp<SkPicture> picture = makeTestPicture();
-  CanvasCompareTester::RenderAll(  //
-      TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {  //
-            canvas->drawPicture(picture, nullptr, nullptr);
-          },
-          [=](DisplayListBuilder& builder) {  //
-            builder.drawPicture(picture, nullptr, false);
-          },
-          kDrawPictureFlags));
-}
-
-TEST_F(DisplayListCanvas, DrawPictureWithMatrix) {
-  sk_sp<SkPicture> picture = makeTestPicture();
-  SkMatrix matrix = SkMatrix::Scale(0.9, 0.9);
-  CanvasCompareTester::RenderAll(  //
-      TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {  //
-            canvas->drawPicture(picture, &matrix, nullptr);
-          },
-          [=](DisplayListBuilder& builder) {  //
-            builder.drawPicture(picture, &matrix, false);
-          },
-          kDrawPictureFlags));
-}
-
-TEST_F(DisplayListCanvas, DrawPictureWithPaint) {
-  sk_sp<SkPicture> picture = makeTestPicture();
-  CanvasCompareTester::RenderAll(  //
-      TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {  //
-            canvas->drawPicture(picture, nullptr, &paint);
-          },
-          [=](DisplayListBuilder& builder) {  //
-            builder.drawPicture(picture, nullptr, true);
-          },
-          kDrawPictureWithPaintFlags));
-}
-
 sk_sp<DisplayList> makeTestDisplayList() {
   DisplayListBuilder builder;
-  builder.setStyle(DlDrawStyle::kFill);
-  builder.setColor(SK_ColorRED);
-  builder.drawRect({kRenderLeft, kRenderTop, kRenderCenterX, kRenderCenterY});
-  builder.setColor(SK_ColorBLUE);
-  builder.drawRect({kRenderCenterX, kRenderTop, kRenderRight, kRenderCenterY});
-  builder.setColor(SK_ColorGREEN);
-  builder.drawRect(
-      {kRenderLeft, kRenderCenterY, kRenderCenterX, kRenderBottom});
-  builder.setColor(SK_ColorYELLOW);
-  builder.drawRect(
-      {kRenderCenterX, kRenderCenterY, kRenderRight, kRenderBottom});
+  DlPaint paint;
+  paint.setDrawStyle(DlDrawStyle::kFill);
+  paint.setColor(DlColor(SK_ColorRED));
+  builder.DrawRect({kRenderLeft, kRenderTop, kRenderCenterX, kRenderCenterY},
+                   paint);
+  paint.setColor(DlColor(SK_ColorBLUE));
+  builder.DrawRect({kRenderCenterX, kRenderTop, kRenderRight, kRenderCenterY},
+                   paint);
+  paint.setColor(DlColor(SK_ColorGREEN));
+  builder.DrawRect({kRenderLeft, kRenderCenterY, kRenderCenterX, kRenderBottom},
+                   paint);
+  paint.setColor(DlColor(SK_ColorYELLOW));
+  builder.DrawRect(
+      {kRenderCenterX, kRenderCenterY, kRenderRight, kRenderBottom}, paint);
   return builder.Build();
 }
 
-TEST_F(DisplayListCanvas, DrawDisplayList) {
+TEST_F(DisplayListRendering, DrawDisplayList) {
   sk_sp<DisplayList> display_list = makeTestDisplayList();
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {  //
-            display_list->RenderTo(canvas);
+          [=](const SkRenderContext& ctx) {  //
+            DlSkCanvasAdapter(ctx.canvas).DrawDisplayList(display_list);
           },
-          [=](DisplayListBuilder& builder) {  //
-            builder.drawDisplayList(display_list);
+          [=](const DlRenderContext& ctx) {  //
+            ctx.canvas->DrawDisplayList(display_list);
           },
           kDrawDisplayListFlags)
           .set_draw_display_list());
 }
 
-TEST_F(DisplayListCanvas, DrawTextBlob) {
+TEST_F(DisplayListRendering, DrawTextBlob) {
   // TODO(https://github.com/flutter/flutter/issues/82202): Remove once the
   // performance overlay can use Fuchsia's font manager instead of the empty
   // default.
 #if defined(OS_FUCHSIA)
   GTEST_SKIP() << "Rendering comparisons require a valid default font manager";
-#endif  // OS_FUCHSIA
+#else
   sk_sp<SkTextBlob> blob =
       CanvasCompareTester::MakeTextBlob("Testing", kRenderHeight * 0.33f);
+#ifdef IMPELLER_SUPPORTS_RENDERING
+  auto frame = impeller::MakeTextFrameFromTextBlobSkia(blob);
+#endif  // IMPELLER_SUPPORTS_RENDERING
   SkScalar render_y_1_3 = kRenderTop + kRenderHeight * 0.3;
   SkScalar render_y_2_3 = kRenderTop + kRenderHeight * 0.6;
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {  //
-            canvas->drawTextBlob(blob, kRenderLeft, render_y_1_3, paint);
-            canvas->drawTextBlob(blob, kRenderLeft, render_y_2_3, paint);
-            canvas->drawTextBlob(blob, kRenderLeft, kRenderBottom, paint);
+          [=](const SkRenderContext& ctx) {
+            auto paint = ctx.paint;
+            ctx.canvas->drawTextBlob(blob, kRenderLeft, render_y_1_3, paint);
+            ctx.canvas->drawTextBlob(blob, kRenderLeft, render_y_2_3, paint);
+            ctx.canvas->drawTextBlob(blob, kRenderLeft, kRenderBottom, paint);
+          },
+          [=](const DlRenderContext& ctx) {
+            auto paint = ctx.paint;
+            ctx.canvas->DrawTextBlob(blob, kRenderLeft, render_y_1_3, paint);
+            ctx.canvas->DrawTextBlob(blob, kRenderLeft, render_y_2_3, paint);
+            ctx.canvas->DrawTextBlob(blob, kRenderLeft, kRenderBottom, paint);
           },
-          [=](DisplayListBuilder& builder) {  //
-            builder.drawTextBlob(blob, kRenderLeft, render_y_1_3);
-            builder.drawTextBlob(blob, kRenderLeft, render_y_2_3);
-            builder.drawTextBlob(blob, kRenderLeft, kRenderBottom);
+#ifdef IMPELLER_SUPPORTS_RENDERING
+          [=](const DlRenderContext& ctx) {
+            auto paint = ctx.paint;
+            ctx.canvas->DrawTextFrame(frame, kRenderLeft, render_y_1_3, paint);
+            ctx.canvas->DrawTextFrame(frame, kRenderLeft, render_y_2_3, paint);
+            ctx.canvas->DrawTextFrame(frame, kRenderLeft, kRenderBottom, paint);
           },
+#endif  // IMPELLER_SUPPORTS_RENDERING
           kDrawTextBlobFlags)
           .set_draw_text_blob(),
       // From examining the bounds differential for the "Default" case, the
@@ -3158,9 +3718,10 @@ TEST_F(DisplayListCanvas, DrawTextBlob) {
       // padding to the tolerance
       CanvasCompareTester::DefaultTolerance.addBoundsPadding(33, 13));
   EXPECT_TRUE(blob->unique());
+#endif  // OS_FUCHSIA
 }
 
-TEST_F(DisplayListCanvas, DrawShadow) {
+TEST_F(DisplayListRendering, DrawShadow) {
   SkPath path;
   path.addRoundRect(
       {
@@ -3175,19 +3736,18 @@ TEST_F(DisplayListCanvas, DrawShadow) {
 
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {  //
-            DisplayListCanvasDispatcher::DrawShadow(canvas, path, color,
-                                                    elevation, false, 1.0);
+          [=](const SkRenderContext& ctx) {  //
+            DlSkCanvasDispatcher::DrawShadow(ctx.canvas, path, color, elevation,
+                                             false, 1.0);
           },
-          [=](DisplayListBuilder& builder) {  //
-            builder.drawShadow(path, color, elevation, false, 1.0);
+          [=](const DlRenderContext& ctx) {  //
+            ctx.canvas->DrawShadow(path, color, elevation, false, 1.0);
           },
-          kDrawShadowFlags)
-          .set_draw_shadows(),
+          kDrawShadowFlags),
       CanvasCompareTester::DefaultTolerance.addBoundsPadding(3, 3));
 }
 
-TEST_F(DisplayListCanvas, DrawShadowTransparentOccluder) {
+TEST_F(DisplayListRendering, DrawShadowTransparentOccluder) {
   SkPath path;
   path.addRoundRect(
       {
@@ -3202,19 +3762,18 @@ TEST_F(DisplayListCanvas, DrawShadowTransparentOccluder) {
 
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {  //
-            DisplayListCanvasDispatcher::DrawShadow(canvas, path, color,
-                                                    elevation, true, 1.0);
+          [=](const SkRenderContext& ctx) {  //
+            DlSkCanvasDispatcher::DrawShadow(ctx.canvas, path, color, elevation,
+                                             true, 1.0);
           },
-          [=](DisplayListBuilder& builder) {  //
-            builder.drawShadow(path, color, elevation, true, 1.0);
+          [=](const DlRenderContext& ctx) {  //
+            ctx.canvas->DrawShadow(path, color, elevation, true, 1.0);
           },
-          kDrawShadowFlags)
-          .set_draw_shadows(),
+          kDrawShadowFlags),
       CanvasCompareTester::DefaultTolerance.addBoundsPadding(3, 3));
 }
 
-TEST_F(DisplayListCanvas, DrawShadowDpr) {
+TEST_F(DisplayListRendering, DrawShadowDpr) {
   SkPath path;
   path.addRoundRect(
       {
@@ -3229,19 +3788,66 @@ TEST_F(DisplayListCanvas, DrawShadowDpr) {
 
   CanvasCompareTester::RenderAll(  //
       TestParameters(
-          [=](SkCanvas* canvas, const SkPaint& paint) {  //
-            DisplayListCanvasDispatcher::DrawShadow(canvas, path, color,
-                                                    elevation, false, 1.5);
+          [=](const SkRenderContext& ctx) {  //
+            DlSkCanvasDispatcher::DrawShadow(ctx.canvas, path, color, elevation,
+                                             false, 1.5);
           },
-          [=](DisplayListBuilder& builder) {  //
-            builder.drawShadow(path, color, elevation, false, 1.5);
+          [=](const DlRenderContext& ctx) {  //
+            ctx.canvas->DrawShadow(path, color, elevation, false, 1.5);
           },
-          kDrawShadowFlags)
-          .set_draw_shadows(),
+          kDrawShadowFlags),
       CanvasCompareTester::DefaultTolerance.addBoundsPadding(3, 3));
 }
 
-TEST_F(DisplayListCanvas, SaveLayerConsolidation) {
+TEST_F(DisplayListRendering, SaveLayerClippedContentStillFilters) {
+  // draw rect is just outside of render bounds on the right
+  const SkRect draw_rect = SkRect::MakeLTRB(  //
+      kRenderRight + 1,                       //
+      kRenderTop,                             //
+      kTestBounds2.fRight,                    //
+      kRenderBottom                           //
+  );
+  TestParameters test_params(
+      [=](const SkRenderContext& ctx) {
+        auto layer_filter =
+            SkImageFilters::Blur(10.0f, 10.0f, SkTileMode::kDecal, nullptr);
+        SkPaint layer_paint;
+        layer_paint.setImageFilter(layer_filter);
+        ctx.canvas->save();
+        ctx.canvas->clipRect(kRenderBounds, SkClipOp::kIntersect, false);
+        ctx.canvas->saveLayer(&kTestBounds2, &layer_paint);
+        ctx.canvas->drawRect(draw_rect, ctx.paint);
+        ctx.canvas->restore();
+        ctx.canvas->restore();
+      },
+      [=](const DlRenderContext& ctx) {
+        auto layer_filter =
+            DlBlurImageFilter::Make(10.0f, 10.0f, DlTileMode::kDecal);
+        DlPaint layer_paint;
+        layer_paint.setImageFilter(layer_filter);
+        ctx.canvas->Save();
+        ctx.canvas->ClipRect(kRenderBounds, ClipOp::kIntersect, false);
+        ctx.canvas->SaveLayer(&kTestBounds2, &layer_paint);
+        ctx.canvas->DrawRect(draw_rect, ctx.paint);
+        ctx.canvas->Restore();
+        ctx.canvas->Restore();
+      },
+      kSaveLayerWithPaintFlags);
+  CaseParameters case_params("Filtered SaveLayer with clipped content");
+  BoundsTolerance tolerance = BoundsTolerance().addAbsolutePadding(6.0f, 6.0f);
+
+  for (auto& back_end : CanvasCompareTester::TestBackends) {
+    auto provider = CanvasCompareTester::GetProvider(back_end);
+    RenderEnvironment env = RenderEnvironment::MakeN32(provider.get());
+    env.init_ref(kEmptySkSetup, test_params.sk_renderer(),  //
+                 kEmptyDlSetup, test_params.dl_renderer(),
+                 test_params.imp_renderer());
+    CanvasCompareTester::quickCompareToReference(env, "default");
+    CanvasCompareTester::RenderWith(test_params, env, tolerance, case_params);
+  }
+}
+
+TEST_F(DisplayListRendering, SaveLayerConsolidation) {
   float commutable_color_matrix[]{
       // clang-format off
       0, 1, 0, 0, 0,
@@ -3271,8 +3877,8 @@ TEST_F(DisplayListCanvas, SaveLayerConsolidation) {
                                            DlBlendMode::kSrcATop),
       std::make_shared<DlMatrixColorFilter>(commutable_color_matrix),
       std::make_shared<DlMatrixColorFilter>(non_commutable_color_matrix),
-      DlSrgbToLinearGammaColorFilter::instance,
-      DlLinearToSrgbGammaColorFilter::instance,
+      DlSrgbToLinearGammaColorFilter::kInstance,
+      DlLinearToSrgbGammaColorFilter::kInstance,
   };
   std::vector<std::shared_ptr<DlImageFilter>> image_filters = {
       std::make_shared<DlBlurImageFilter>(5.0f, 5.0f, DlTileMode::kDecal),
@@ -3281,67 +3887,76 @@ TEST_F(DisplayListCanvas, SaveLayerConsolidation) {
       std::make_shared<DlMatrixImageFilter>(contract_matrix,
                                             DlImageSampling::kLinear),
   };
-  RenderEnvironment env = RenderEnvironment::MakeN32();
 
   auto render_content = [](DisplayListBuilder& builder) {
-    builder.drawRect(
+    builder.DrawRect(
         SkRect{kRenderLeft, kRenderTop, kRenderCenterX, kRenderCenterY},
-        DlPaint().setColor(DlColor::kYellow()));
-    builder.drawRect(
+        DlPaint(DlColor::kYellow()));
+    builder.DrawRect(
         SkRect{kRenderCenterX, kRenderTop, kRenderRight, kRenderCenterY},
-        DlPaint().setColor(DlColor::kRed()));
-    builder.drawRect(
+        DlPaint(DlColor::kRed()));
+    builder.DrawRect(
         SkRect{kRenderLeft, kRenderCenterY, kRenderCenterX, kRenderBottom},
-        DlPaint().setColor(DlColor::kBlue()));
-    builder.drawRect(
+        DlPaint(DlColor::kBlue()));
+    builder.DrawRect(
         SkRect{kRenderCenterX, kRenderCenterY, kRenderRight, kRenderBottom},
-        DlPaint().setColor(DlColor::kRed().modulateOpacity(0.5f)));
+        DlPaint(DlColor::kRed().modulateOpacity(0.5f)));
   };
 
-  // clang-format off
-  auto test_attributes = [&env, render_content]
-      (DlPaint& paint1, DlPaint& paint2, const DlPaint& paint_both,
-       bool same, bool rev_same, const std::string& desc1,
-       const std::string& desc2) {
-    // clang-format on
-    DisplayListBuilder nested_builder;
-    nested_builder.saveLayer(&kTestBounds, &paint1);
-    nested_builder.saveLayer(&kTestBounds, &paint2);
-    render_content(nested_builder);
-    auto nested_surface = env.MakeSurface();
-    nested_builder.Build()->RenderTo(nested_surface->canvas());
-
-    DisplayListBuilder reverse_builder;
-    reverse_builder.saveLayer(&kTestBounds, &paint2);
-    reverse_builder.saveLayer(&kTestBounds, &paint1);
-    render_content(reverse_builder);
-    auto reverse_surface = env.MakeSurface();
-    reverse_builder.Build()->RenderTo(reverse_surface->canvas());
-
-    DisplayListBuilder combined_builder;
-    combined_builder.saveLayer(&kTestBounds, &paint_both);
-    render_content(combined_builder);
-    auto combined_surface = env.MakeSurface();
-    combined_builder.Build()->RenderTo(combined_surface->canvas());
-
-    // Set this boolean to true to test if combinations that are marked
-    // as incompatible actually are compatible despite our predictions.
-    // Some of the combinations that we treat as incompatible actually
-    // are compatible with swapping the order of the operations, but
-    // it would take a bit of new infrastructure to really identify
-    // those combinations. The only hard constraint to test here is
-    // when we claim that they are compatible and they aren't.
-    const bool always = false;
-
-    if (always || same) {
-      CanvasCompareTester::quickCompareToReference(
-          nested_surface->pixmap(), combined_surface->pixmap(), same,
-          "nested " + desc1 + " then " + desc2);
-    }
-    if (always || rev_same) {
-      CanvasCompareTester::quickCompareToReference(
-          reverse_surface->pixmap(), combined_surface->pixmap(), rev_same,
-          "nested " + desc2 + " then " + desc1);
+  auto test_attributes_env =
+      [render_content](DlPaint& paint1, DlPaint& paint2,
+                       const DlPaint& paint_both, bool same, bool rev_same,
+                       const std::string& desc1, const std::string& desc2,
+                       const RenderEnvironment* env) {
+        DisplayListBuilder nested_builder;
+        nested_builder.SaveLayer(&kTestBounds2, &paint1);
+        nested_builder.SaveLayer(&kTestBounds2, &paint2);
+        render_content(nested_builder);
+        auto nested_results = env->getResult(nested_builder.Build());
+
+        DisplayListBuilder reverse_builder;
+        reverse_builder.SaveLayer(&kTestBounds2, &paint2);
+        reverse_builder.SaveLayer(&kTestBounds2, &paint1);
+        render_content(reverse_builder);
+        auto reverse_results = env->getResult(reverse_builder.Build());
+
+        DisplayListBuilder combined_builder;
+        combined_builder.SaveLayer(&kTestBounds2, &paint_both);
+        render_content(combined_builder);
+        auto combined_results = env->getResult(combined_builder.Build());
+
+        // Set this boolean to true to test if combinations that are marked
+        // as incompatible actually are compatible despite our predictions.
+        // Some of the combinations that we treat as incompatible actually
+        // are compatible with swapping the order of the operations, but
+        // it would take a bit of new infrastructure to really identify
+        // those combinations. The only hard constraint to test here is
+        // when we claim that they are compatible and they aren't.
+        const bool always = false;
+
+        if (always || same) {
+          CanvasCompareTester::quickCompareToReference(
+              nested_results.get(), combined_results.get(), same,
+              "nested " + desc1 + " then " + desc2);
+        }
+        if (always || rev_same) {
+          CanvasCompareTester::quickCompareToReference(
+              reverse_results.get(), combined_results.get(), rev_same,
+              "nested " + desc2 + " then " + desc1);
+        }
+      };
+
+  auto test_attributes = [test_attributes_env](DlPaint& paint1, DlPaint& paint2,
+                                               const DlPaint& paint_both,
+                                               bool same, bool rev_same,
+                                               const std::string& desc1,
+                                               const std::string& desc2) {
+    for (auto& back_end : CanvasCompareTester::TestBackends) {
+      auto provider = CanvasCompareTester::GetProvider(back_end);
+      auto env = std::make_unique<RenderEnvironment>(
+          provider.get(), PixelFormat::kN32PremulPixelFormat);
+      test_attributes_env(paint1, paint2, paint_both,  //
+                          same, rev_same, desc1, desc2, env.get());
     }
   };
 
@@ -3412,5 +4027,678 @@ TEST_F(DisplayListCanvas, SaveLayerConsolidation) {
   }
 }
 
+TEST_F(DisplayListRendering, MatrixColorFilterModifyTransparencyCheck) {
+  auto test_matrix = [](int element, SkScalar value) {
+    // clang-format off
+    float matrix[] = {
+        1, 0, 0, 0, 0,
+        0, 1, 0, 0, 0,
+        0, 0, 1, 0, 0,
+        0, 0, 0, 1, 0,
+    };
+    // clang-format on
+    std::string desc =
+        "matrix[" + std::to_string(element) + "] = " + std::to_string(value);
+    float original_value = matrix[element];
+    matrix[element] = value;
+    DlMatrixColorFilter filter(matrix);
+    auto dl_filter = DlMatrixColorFilter::Make(matrix);
+    bool is_identity = (dl_filter == nullptr || original_value == value);
+
+    DlPaint paint(DlColor(0x7f7f7f7f));
+    DlPaint filter_save_paint = DlPaint().setColorFilter(&filter);
+
+    DisplayListBuilder builder1;
+    builder1.Translate(kTestCenter.fX, kTestCenter.fY);
+    builder1.Rotate(45);
+    builder1.Translate(-kTestCenter.fX, -kTestCenter.fY);
+    builder1.DrawRect(kRenderBounds, paint);
+    auto display_list1 = builder1.Build();
+
+    DisplayListBuilder builder2;
+    builder2.Translate(kTestCenter.fX, kTestCenter.fY);
+    builder2.Rotate(45);
+    builder2.Translate(-kTestCenter.fX, -kTestCenter.fY);
+    builder2.SaveLayer(&kTestBounds2, &filter_save_paint);
+    builder2.DrawRect(kRenderBounds, paint);
+    builder2.Restore();
+    auto display_list2 = builder2.Build();
+
+    for (auto& back_end : CanvasCompareTester::TestBackends) {
+      auto provider = CanvasCompareTester::GetProvider(back_end);
+      auto env = std::make_unique<RenderEnvironment>(
+          provider.get(), PixelFormat::kN32PremulPixelFormat);
+      auto results1 = env->getResult(display_list1);
+      auto results2 = env->getResult(display_list2);
+      CanvasCompareTester::quickCompareToReference(
+          results1.get(), results2.get(), is_identity,
+          desc + " filter affects rendering");
+      int modified_transparent_pixels =
+          CanvasCompareTester::countModifiedTransparentPixels(results1.get(),
+                                                              results2.get());
+      EXPECT_EQ(filter.modifies_transparent_black(),
+                modified_transparent_pixels != 0)
+          << desc;
+    }
+  };
+
+  // Tests identity (matrix[0] already == 1 in an identity filter)
+  test_matrix(0, 1);
+  // test_matrix(19, 1);
+  for (int i = 0; i < 20; i++) {
+    test_matrix(i, -0.25);
+    test_matrix(i, 0);
+    test_matrix(i, 0.25);
+    test_matrix(i, 1);
+    test_matrix(i, 1.25);
+    test_matrix(i, SK_ScalarNaN);
+    test_matrix(i, SK_ScalarInfinity);
+    test_matrix(i, -SK_ScalarInfinity);
+  }
+}
+
+TEST_F(DisplayListRendering, MatrixColorFilterOpacityCommuteCheck) {
+  auto test_matrix = [](int element, SkScalar value) {
+    // clang-format off
+    float matrix[] = {
+        1, 0, 0, 0, 0,
+        0, 1, 0, 0, 0,
+        0, 0, 1, 0, 0,
+        0, 0, 0, 1, 0,
+    };
+    // clang-format on
+    std::string desc =
+        "matrix[" + std::to_string(element) + "] = " + std::to_string(value);
+    matrix[element] = value;
+    auto filter = DlMatrixColorFilter::Make(matrix);
+    EXPECT_EQ(SkScalarIsFinite(value), filter != nullptr);
+
+    DlPaint paint(DlColor(0x80808080));
+    DlPaint opacity_save_paint = DlPaint().setOpacity(0.5);
+    DlPaint filter_save_paint = DlPaint().setColorFilter(filter);
+
+    DisplayListBuilder builder1;
+    builder1.SaveLayer(&kTestBounds2, &opacity_save_paint);
+    builder1.SaveLayer(&kTestBounds2, &filter_save_paint);
+    // builder1.DrawRect(kRenderBounds.makeOffset(20, 20), DlPaint());
+    builder1.DrawRect(kRenderBounds, paint);
+    builder1.Restore();
+    builder1.Restore();
+    auto display_list1 = builder1.Build();
+
+    DisplayListBuilder builder2;
+    builder2.SaveLayer(&kTestBounds2, &filter_save_paint);
+    builder2.SaveLayer(&kTestBounds2, &opacity_save_paint);
+    // builder1.DrawRect(kRenderBounds.makeOffset(20, 20), DlPaint());
+    builder2.DrawRect(kRenderBounds, paint);
+    builder2.Restore();
+    builder2.Restore();
+    auto display_list2 = builder2.Build();
+
+    for (auto& back_end : CanvasCompareTester::TestBackends) {
+      auto provider = CanvasCompareTester::GetProvider(back_end);
+      auto env = std::make_unique<RenderEnvironment>(
+          provider.get(), PixelFormat::kN32PremulPixelFormat);
+      auto results1 = env->getResult(display_list1);
+      auto results2 = env->getResult(display_list2);
+      if (!filter || filter->can_commute_with_opacity()) {
+        CanvasCompareTester::compareToReference(
+            results2.get(), results1.get(), desc, nullptr, nullptr,
+            DlColor::kTransparent(), true, kTestWidth, kTestHeight, true);
+      } else {
+        CanvasCompareTester::quickCompareToReference(
+            results1.get(), results2.get(), false, desc);
+      }
+    }
+  };
+
+  // Tests identity (matrix[0] already == 1 in an identity filter)
+  test_matrix(0, 1);
+  // test_matrix(19, 1);
+  for (int i = 0; i < 20; i++) {
+    test_matrix(i, -0.25);
+    test_matrix(i, 0);
+    test_matrix(i, 0.25);
+    test_matrix(i, 1);
+    test_matrix(i, 1.1);
+    test_matrix(i, SK_ScalarNaN);
+    test_matrix(i, SK_ScalarInfinity);
+    test_matrix(i, -SK_ScalarInfinity);
+  }
+}
+
+#define FOR_EACH_BLEND_MODE_ENUM(FUNC) \
+  FUNC(kClear)                         \
+  FUNC(kSrc)                           \
+  FUNC(kDst)                           \
+  FUNC(kSrcOver)                       \
+  FUNC(kDstOver)                       \
+  FUNC(kSrcIn)                         \
+  FUNC(kDstIn)                         \
+  FUNC(kSrcOut)                        \
+  FUNC(kDstOut)                        \
+  FUNC(kSrcATop)                       \
+  FUNC(kDstATop)                       \
+  FUNC(kXor)                           \
+  FUNC(kPlus)                          \
+  FUNC(kModulate)                      \
+  FUNC(kScreen)                        \
+  FUNC(kOverlay)                       \
+  FUNC(kDarken)                        \
+  FUNC(kLighten)                       \
+  FUNC(kColorDodge)                    \
+  FUNC(kColorBurn)                     \
+  FUNC(kHardLight)                     \
+  FUNC(kSoftLight)                     \
+  FUNC(kDifference)                    \
+  FUNC(kExclusion)                     \
+  FUNC(kMultiply)                      \
+  FUNC(kHue)                           \
+  FUNC(kSaturation)                    \
+  FUNC(kColor)                         \
+  FUNC(kLuminosity)
+
+// This function serves both to enhance error output below and to double
+// check that the macro supplies all modes (otherwise it won't compile)
+static std::string BlendModeToString(DlBlendMode mode) {
+  switch (mode) {
+#define MODE_CASE(m)   \
+  case DlBlendMode::m: \
+    return #m;
+    FOR_EACH_BLEND_MODE_ENUM(MODE_CASE)
+#undef MODE_CASE
+  }
+}
+
+TEST_F(DisplayListRendering, BlendColorFilterModifyTransparencyCheck) {
+  auto test_mode_color = [](DlBlendMode mode, DlColor color) {
+    std::stringstream desc_str;
+    std::string mode_string = BlendModeToString(mode);
+    desc_str << "blend[" << mode_string << ", " << color << "]";
+    std::string desc = desc_str.str();
+    DlBlendColorFilter filter(color, mode);
+    if (filter.modifies_transparent_black()) {
+      ASSERT_NE(DlBlendColorFilter::Make(color, mode), nullptr) << desc;
+    }
+
+    DlPaint paint(DlColor(0x7f7f7f7f));
+    DlPaint filter_save_paint = DlPaint().setColorFilter(&filter);
+
+    DisplayListBuilder builder1;
+    builder1.Translate(kTestCenter.fX, kTestCenter.fY);
+    builder1.Rotate(45);
+    builder1.Translate(-kTestCenter.fX, -kTestCenter.fY);
+    builder1.DrawRect(kRenderBounds, paint);
+    auto display_list1 = builder1.Build();
+
+    DisplayListBuilder builder2;
+    builder2.Translate(kTestCenter.fX, kTestCenter.fY);
+    builder2.Rotate(45);
+    builder2.Translate(-kTestCenter.fX, -kTestCenter.fY);
+    builder2.SaveLayer(&kTestBounds2, &filter_save_paint);
+    builder2.DrawRect(kRenderBounds, paint);
+    builder2.Restore();
+    auto display_list2 = builder2.Build();
+
+    for (auto& back_end : CanvasCompareTester::TestBackends) {
+      auto provider = CanvasCompareTester::GetProvider(back_end);
+      auto env = std::make_unique<RenderEnvironment>(
+          provider.get(), PixelFormat::kN32PremulPixelFormat);
+      auto results1 = env->getResult(display_list1);
+      auto results2 = env->getResult(display_list2);
+      int modified_transparent_pixels =
+          CanvasCompareTester::countModifiedTransparentPixels(results1.get(),
+                                                              results2.get());
+      EXPECT_EQ(filter.modifies_transparent_black(),
+                modified_transparent_pixels != 0)
+          << desc;
+    }
+  };
+
+  auto test_mode = [&test_mode_color](DlBlendMode mode) {
+    test_mode_color(mode, DlColor::kTransparent());
+    test_mode_color(mode, DlColor::kWhite());
+    test_mode_color(mode, DlColor::kWhite().modulateOpacity(0.5));
+    test_mode_color(mode, DlColor::kBlack());
+    test_mode_color(mode, DlColor::kBlack().modulateOpacity(0.5));
+  };
+
+#define TEST_MODE(V) test_mode(DlBlendMode::V);
+  FOR_EACH_BLEND_MODE_ENUM(TEST_MODE)
+#undef TEST_MODE
+}
+
+TEST_F(DisplayListRendering, BlendColorFilterOpacityCommuteCheck) {
+  auto test_mode_color = [](DlBlendMode mode, DlColor color) {
+    std::stringstream desc_str;
+    std::string mode_string = BlendModeToString(mode);
+    desc_str << "blend[" << mode_string << ", " << color << "]";
+    std::string desc = desc_str.str();
+    DlBlendColorFilter filter(color, mode);
+    if (filter.can_commute_with_opacity()) {
+      // If it can commute with opacity, then it might also be a NOP,
+      // so we won't necessarily get a non-null return from |::Make()|
+    } else {
+      ASSERT_NE(DlBlendColorFilter::Make(color, mode), nullptr) << desc;
+    }
+
+    DlPaint paint(DlColor(0x80808080));
+    DlPaint opacity_save_paint = DlPaint().setOpacity(0.5);
+    DlPaint filter_save_paint = DlPaint().setColorFilter(&filter);
+
+    DisplayListBuilder builder1;
+    builder1.SaveLayer(&kTestBounds2, &opacity_save_paint);
+    builder1.SaveLayer(&kTestBounds2, &filter_save_paint);
+    // builder1.DrawRect(kRenderBounds.makeOffset(20, 20), DlPaint());
+    builder1.DrawRect(kRenderBounds, paint);
+    builder1.Restore();
+    builder1.Restore();
+    auto display_list1 = builder1.Build();
+
+    DisplayListBuilder builder2;
+    builder2.SaveLayer(&kTestBounds2, &filter_save_paint);
+    builder2.SaveLayer(&kTestBounds2, &opacity_save_paint);
+    // builder1.DrawRect(kRenderBounds.makeOffset(20, 20), DlPaint());
+    builder2.DrawRect(kRenderBounds, paint);
+    builder2.Restore();
+    builder2.Restore();
+    auto display_list2 = builder2.Build();
+
+    for (auto& back_end : CanvasCompareTester::TestBackends) {
+      auto provider = CanvasCompareTester::GetProvider(back_end);
+      auto env = std::make_unique<RenderEnvironment>(
+          provider.get(), PixelFormat::kN32PremulPixelFormat);
+      auto results1 = env->getResult(display_list1);
+      auto results2 = env->getResult(display_list2);
+      if (filter.can_commute_with_opacity()) {
+        CanvasCompareTester::compareToReference(
+            results2.get(), results1.get(), desc, nullptr, nullptr,
+            DlColor::kTransparent(), true, kTestWidth, kTestHeight, true);
+      } else {
+        CanvasCompareTester::quickCompareToReference(
+            results1.get(), results2.get(), false, desc);
+      }
+    }
+  };
+
+  auto test_mode = [&test_mode_color](DlBlendMode mode) {
+    test_mode_color(mode, DlColor::kTransparent());
+    test_mode_color(mode, DlColor::kWhite());
+    test_mode_color(mode, DlColor::kWhite().modulateOpacity(0.5));
+    test_mode_color(mode, DlColor::kBlack());
+    test_mode_color(mode, DlColor::kBlack().modulateOpacity(0.5));
+  };
+
+#define TEST_MODE(V) test_mode(DlBlendMode::V);
+  FOR_EACH_BLEND_MODE_ENUM(TEST_MODE)
+#undef TEST_MODE
+}
+
+class DisplayListNopTest : public DisplayListRendering {
+  // The following code uses the acronym MTB for "modifies_transparent_black"
+
+ protected:
+  DisplayListNopTest() : DisplayListRendering() {
+    test_src_colors = {
+        DlColor::kBlack().withAlpha(0),     // transparent black
+        DlColor::kBlack().withAlpha(0x7f),  // half transparent black
+        DlColor::kWhite().withAlpha(0x7f),  // half transparent white
+        DlColor::kBlack(),                  // opaque black
+        DlColor::kWhite(),                  // opaque white
+        DlColor::kRed(),                    // opaque red
+        DlColor::kGreen(),                  // opaque green
+        DlColor::kBlue(),                   // opaque blue
+        DlColor::kDarkGrey(),               // dark grey
+        DlColor::kLightGrey(),              // light grey
+    };
+
+    // We test against a color cube of 3x3x3 colors [55,aa,ff]
+    // plus transparency as the first color/pixel
+    test_dst_colors.push_back(DlColor::kTransparent());
+    const int step = 0x55;
+    static_assert(step * 3 == 255);
+    for (int a = step; a < 256; a += step) {
+      for (int r = step; r < 256; r += step) {
+        for (int g = step; g < 256; g += step) {
+          for (int b = step; b < 256; b += step) {
+            test_dst_colors.push_back(DlColor(a << 24 | r << 16 | g << 8 | b));
+          }
+        }
+      }
+    }
+
+    static constexpr float color_filter_matrix_nomtb[] = {
+        0.0001, 0.0001, 0.0001, 0.9997, 0.0,  //
+        0.0001, 0.0001, 0.0001, 0.9997, 0.0,  //
+        0.0001, 0.0001, 0.0001, 0.9997, 0.0,  //
+        0.0001, 0.0001, 0.0001, 0.9997, 0.0,  //
+    };
+    static constexpr float color_filter_matrix_mtb[] = {
+        0.0001, 0.0001, 0.0001, 0.9997, 0.0,  //
+        0.0001, 0.0001, 0.0001, 0.9997, 0.0,  //
+        0.0001, 0.0001, 0.0001, 0.9997, 0.0,  //
+        0.0001, 0.0001, 0.0001, 0.9997, 0.1,  //
+    };
+    color_filter_nomtb = DlMatrixColorFilter::Make(color_filter_matrix_nomtb);
+    color_filter_mtb = DlMatrixColorFilter::Make(color_filter_matrix_mtb);
+    EXPECT_FALSE(color_filter_nomtb->modifies_transparent_black());
+    EXPECT_TRUE(color_filter_mtb->modifies_transparent_black());
+
+    test_data =
+        get_output(test_dst_colors.size(), 1, true, [this](SkCanvas* canvas) {
+          int x = 0;
+          for (DlColor color : test_dst_colors) {
+            SkPaint paint;
+            paint.setColor(ToSk(color));
+            paint.setBlendMode(SkBlendMode::kSrc);
+            canvas->drawRect(SkRect::MakeXYWH(x, 0, 1, 1), paint);
+            x++;
+          }
+        });
+
+    // For image-on-image tests, the src and dest images will have repeated
+    // rows/columns that have every color, but laid out at right angles to
+    // each other so we see an interaction with every test color against
+    // every other test color.
+    int data_count = test_data->image()->width();
+    test_image_dst_data = get_output(
+        data_count, data_count, true, [this, data_count](SkCanvas* canvas) {
+          ASSERT_EQ(test_data->width(), data_count);
+          ASSERT_EQ(test_data->height(), 1);
+          for (int y = 0; y < data_count; y++) {
+            canvas->drawImage(test_data->image().get(), 0, y);
+          }
+        });
+    test_image_src_data = get_output(
+        data_count, data_count, true, [this, data_count](SkCanvas* canvas) {
+          ASSERT_EQ(test_data->width(), data_count);
+          ASSERT_EQ(test_data->height(), 1);
+          canvas->translate(data_count, 0);
+          canvas->rotate(90);
+          for (int y = 0; y < data_count; y++) {
+            canvas->drawImage(test_data->image().get(), 0, y);
+          }
+        });
+    // Double check that the pixel data is laid out in orthogonal stripes
+    for (int y = 0; y < data_count; y++) {
+      for (int x = 0; x < data_count; x++) {
+        EXPECT_EQ(*test_image_dst_data->addr32(x, y), *test_data->addr32(x, 0));
+        EXPECT_EQ(*test_image_src_data->addr32(x, y), *test_data->addr32(y, 0));
+      }
+    }
+  }
+
+  // These flags are 0 by default until they encounter a counter-example
+  // result and get set.
+  static constexpr int kWasNotNop = 0x1;  // Some tested pixel was modified
+  static constexpr int kWasMTB = 0x2;     // A transparent pixel was modified
+
+  std::vector<DlColor> test_src_colors;
+  std::vector<DlColor> test_dst_colors;
+
+  std::shared_ptr<DlColorFilter> color_filter_nomtb;
+  std::shared_ptr<DlColorFilter> color_filter_mtb;
+
+  // A 1-row image containing every color in test_dst_colors
+  std::unique_ptr<RenderResult> test_data;
+
+  // A square image containing test_data duplicated in each row
+  std::unique_ptr<RenderResult> test_image_dst_data;
+
+  // A square image containing test_data duplicated in each column
+  std::unique_ptr<RenderResult> test_image_src_data;
+
+  std::unique_ptr<RenderResult> get_output(
+      int w,
+      int h,
+      bool snapshot,
+      const std::function<void(SkCanvas*)>& renderer) {
+    auto surface = SkSurfaces::Raster(SkImageInfo::MakeN32Premul(w, h));
+    SkCanvas* canvas = surface->getCanvas();
+    renderer(canvas);
+    return std::make_unique<SkRenderResult>(surface, snapshot);
+  }
+
+  int check_color_result(DlColor dst_color,
+                         DlColor result_color,
+                         const sk_sp<DisplayList>& dl,
+                         const std::string& desc) {
+    int ret = 0;
+    bool is_error = false;
+    if (dst_color.isTransparent() && !result_color.isTransparent()) {
+      ret |= kWasMTB;
+      is_error = !dl->modifies_transparent_black();
+    }
+    if (result_color != dst_color) {
+      ret |= kWasNotNop;
+      is_error = (dl->op_count() == 0u);
+    }
+    if (is_error) {
+      FML_LOG(ERROR) << std::hex << dst_color << " filters to " << result_color
+                     << desc;
+    }
+    return ret;
+  }
+
+  int check_image_result(const std::unique_ptr<RenderResult>& dst_data,
+                         const std::unique_ptr<RenderResult>& result_data,
+                         const sk_sp<DisplayList>& dl,
+                         const std::string& desc) {
+    EXPECT_EQ(dst_data->width(), result_data->width());
+    EXPECT_EQ(dst_data->height(), result_data->height());
+    int all_flags = 0;
+    for (int y = 0; y < dst_data->height(); y++) {
+      const uint32_t* dst_pixels = dst_data->addr32(0, y);
+      const uint32_t* result_pixels = result_data->addr32(0, y);
+      for (int x = 0; x < dst_data->width(); x++) {
+        all_flags |= check_color_result(DlColor(dst_pixels[x]),
+                                        DlColor(result_pixels[x]), dl, desc);
+      }
+    }
+    return all_flags;
+  }
+
+  void report_results(int all_flags,
+                      const sk_sp<DisplayList>& dl,
+                      const std::string& desc) {
+    if (!dl->modifies_transparent_black()) {
+      EXPECT_TRUE((all_flags & kWasMTB) == 0);
+    } else if ((all_flags & kWasMTB) == 0) {
+      FML_LOG(INFO) << "combination does not affect transparency: " << desc;
+    }
+    if (dl->op_count() == 0u) {
+      EXPECT_TRUE((all_flags & kWasNotNop) == 0);
+    } else if ((all_flags & kWasNotNop) == 0) {
+      FML_LOG(INFO) << "combination could be classified as a nop: " << desc;
+    }
+  };
+
+  void test_mode_color_via_filter(DlBlendMode mode, DlColor color) {
+    std::stringstream desc_stream;
+    desc_stream << " using SkColorFilter::filterColor() with: ";
+    desc_stream << BlendModeToString(mode);
+    desc_stream << "/" << color;
+    std::string desc = desc_stream.str();
+    DisplayListBuilder builder({0.0f, 0.0f, 100.0f, 100.0f});
+    DlPaint paint = DlPaint(color).setBlendMode(mode);
+    builder.DrawRect({0.0f, 0.0f, 10.0f, 10.0f}, paint);
+    auto dl = builder.Build();
+    if (dl->modifies_transparent_black()) {
+      ASSERT_TRUE(dl->op_count() != 0u);
+    }
+
+    auto sk_mode = static_cast<SkBlendMode>(mode);
+    auto sk_color_filter = SkColorFilters::Blend(ToSk(color), sk_mode);
+    auto srgb = SkColorSpace::MakeSRGB();
+    int all_flags = 0;
+    if (sk_color_filter) {
+      for (DlColor dst_color : test_dst_colors) {
+        SkColor4f dst_color_f = SkColor4f::FromColor(ToSk(dst_color));
+        DlColor result = DlColor(
+            sk_color_filter->filterColor4f(dst_color_f, srgb.get(), srgb.get())
+                .toSkColor());
+        all_flags |= check_color_result(dst_color, result, dl, desc);
+      }
+      if ((all_flags & kWasMTB) != 0) {
+        EXPECT_FALSE(sk_color_filter->isAlphaUnchanged());
+      }
+    }
+    report_results(all_flags, dl, desc);
+  };
+
+  void test_mode_color_via_rendering(DlBlendMode mode, DlColor color) {
+    std::stringstream desc_stream;
+    desc_stream << " rendering with: ";
+    desc_stream << BlendModeToString(mode);
+    desc_stream << "/" << color;
+    std::string desc = desc_stream.str();
+    auto test_image = test_data->image();
+    SkRect test_bounds =
+        SkRect::MakeWH(test_image->width(), test_image->height());
+    DisplayListBuilder builder(test_bounds);
+    DlPaint dl_paint = DlPaint(color).setBlendMode(mode);
+    builder.DrawRect(test_bounds, dl_paint);
+    auto dl = builder.Build();
+    bool dl_is_elided = dl->op_count() == 0u;
+    bool dl_affects_transparent_pixels = dl->modifies_transparent_black();
+    ASSERT_TRUE(!dl_is_elided || !dl_affects_transparent_pixels);
+
+    auto sk_mode = static_cast<SkBlendMode>(mode);
+    SkPaint sk_paint;
+    sk_paint.setBlendMode(sk_mode);
+    sk_paint.setColor(ToSk(color));
+    for (auto& back_end : CanvasCompareTester::TestBackends) {
+      auto provider = CanvasCompareTester::GetProvider(back_end);
+      auto result_surface = provider->MakeOffscreenSurface(
+          test_image->width(), test_image->height(),
+          DlSurfaceProvider::kN32PremulPixelFormat);
+      SkCanvas* result_canvas = result_surface->sk_surface()->getCanvas();
+      result_canvas->clear(SK_ColorTRANSPARENT);
+      result_canvas->drawImage(test_image.get(), 0, 0);
+      result_canvas->drawRect(test_bounds, sk_paint);
+      if (GrDirectContext* direct_context = GrAsDirectContext(
+              result_surface->sk_surface()->recordingContext())) {
+        direct_context->flushAndSubmit();
+        direct_context->flushAndSubmit(result_surface->sk_surface().get(),
+                                       GrSyncCpu::kYes);
+      }
+      const std::unique_ptr<RenderResult> result_pixels =
+          std::make_unique<SkRenderResult>(result_surface->sk_surface());
+
+      int all_flags = check_image_result(test_data, result_pixels, dl, desc);
+      report_results(all_flags, dl, desc);
+    }
+  };
+
+  void test_attributes_image(DlBlendMode mode,
+                             DlColor color,
+                             DlColorFilter* color_filter,
+                             DlImageFilter* image_filter) {
+    // if (true) { return; }
+    std::stringstream desc_stream;
+    desc_stream << " rendering with: ";
+    desc_stream << BlendModeToString(mode);
+    desc_stream << "/" << color;
+    std::string cf_mtb = color_filter
+                             ? color_filter->modifies_transparent_black()
+                                   ? "modifies transparency"
+                                   : "preserves transparency"
+                             : "no filter";
+    desc_stream << ", CF: " << cf_mtb;
+    std::string if_mtb = image_filter
+                             ? image_filter->modifies_transparent_black()
+                                   ? "modifies transparency"
+                                   : "preserves transparency"
+                             : "no filter";
+    desc_stream << ", IF: " << if_mtb;
+    std::string desc = desc_stream.str();
+
+    DisplayListBuilder builder({0.0f, 0.0f, 100.0f, 100.0f});
+    DlPaint paint = DlPaint(color)                     //
+                        .setBlendMode(mode)            //
+                        .setColorFilter(color_filter)  //
+                        .setImageFilter(image_filter);
+    builder.DrawImage(DlImage::Make(test_image_src_data->image()), {0, 0},
+                      DlImageSampling::kNearestNeighbor, &paint);
+    auto dl = builder.Build();
+
+    int w = test_image_src_data->width();
+    int h = test_image_src_data->height();
+    auto sk_mode = static_cast<SkBlendMode>(mode);
+    SkPaint sk_paint;
+    sk_paint.setBlendMode(sk_mode);
+    sk_paint.setColor(ToSk(color));
+    sk_paint.setColorFilter(ToSk(color_filter));
+    sk_paint.setImageFilter(ToSk(image_filter));
+    for (auto& back_end : CanvasCompareTester::TestBackends) {
+      auto provider = CanvasCompareTester::GetProvider(back_end);
+      auto result_surface = provider->MakeOffscreenSurface(
+          w, h, DlSurfaceProvider::kN32PremulPixelFormat);
+      SkCanvas* result_canvas = result_surface->sk_surface()->getCanvas();
+      result_canvas->clear(SK_ColorTRANSPARENT);
+      result_canvas->drawImage(test_image_dst_data->image(), 0, 0);
+      result_canvas->drawImage(test_image_src_data->image(), 0, 0,
+                               SkSamplingOptions(), &sk_paint);
+      if (GrDirectContext* direct_context = GrAsDirectContext(
+              result_surface->sk_surface()->recordingContext())) {
+        direct_context->flushAndSubmit();
+        direct_context->flushAndSubmit(result_surface->sk_surface().get(),
+                                       GrSyncCpu::kYes);
+      }
+      std::unique_ptr<RenderResult> result_pixels =
+          std::make_unique<SkRenderResult>(result_surface->sk_surface());
+
+      int all_flags =
+          check_image_result(test_image_dst_data, result_pixels, dl, desc);
+      report_results(all_flags, dl, desc);
+    }
+  };
+};
+
+TEST_F(DisplayListNopTest, BlendModeAndColorViaColorFilter) {
+  auto test_mode_filter = [this](DlBlendMode mode) {
+    for (DlColor color : test_src_colors) {
+      test_mode_color_via_filter(mode, color);
+    }
+  };
+
+#define TEST_MODE(V) test_mode_filter(DlBlendMode::V);
+  FOR_EACH_BLEND_MODE_ENUM(TEST_MODE)
+#undef TEST_MODE
+}
+
+TEST_F(DisplayListNopTest, BlendModeAndColorByRendering) {
+  auto test_mode_render = [this](DlBlendMode mode) {
+    // First check rendering a variety of colors onto image
+    for (DlColor color : test_src_colors) {
+      test_mode_color_via_rendering(mode, color);
+    }
+  };
+
+#define TEST_MODE(V) test_mode_render(DlBlendMode::V);
+  FOR_EACH_BLEND_MODE_ENUM(TEST_MODE)
+#undef TEST_MODE
+}
+
+TEST_F(DisplayListNopTest, BlendModeAndColorAndFiltersByRendering) {
+  auto test_mode_render = [this](DlBlendMode mode) {
+    auto image_filter_nomtb = DlColorFilterImageFilter(color_filter_nomtb);
+    auto image_filter_mtb = DlColorFilterImageFilter(color_filter_mtb);
+    for (DlColor color : test_src_colors) {
+      test_attributes_image(mode, color, nullptr, nullptr);
+      test_attributes_image(mode, color, color_filter_nomtb.get(), nullptr);
+      test_attributes_image(mode, color, color_filter_mtb.get(), nullptr);
+      test_attributes_image(mode, color, nullptr, &image_filter_nomtb);
+      test_attributes_image(mode, color, nullptr, &image_filter_mtb);
+    }
+  };
+
+#define TEST_MODE(V) test_mode_render(DlBlendMode::V);
+  FOR_EACH_BLEND_MODE_ENUM(TEST_MODE)
+#undef TEST_MODE
+}
+
+#undef FOR_EACH_BLEND_MODE_ENUM
+
 }  // namespace testing
 }  // namespace flutter
diff --git a/display_list/display_list_attributes_testing.h b/display_list/testing/dl_test_equality.h
similarity index 72%
rename from display_list/display_list_attributes_testing.h
rename to display_list/testing/dl_test_equality.h
index 37ef0154746c38ed4ea1238e5c53dfd3690f95f6..84dcaff5e281448a36d98c3784983d5215f41288 100644
--- a/display_list/display_list_attributes_testing.h
+++ b/display_list/testing/dl_test_equality.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_ATTRIBUTES_TESTING_H_
-#define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_ATTRIBUTES_TESTING_H_
+#ifndef FLUTTER_DISPLAY_LIST_TESTING_DL_TEST_EQUALITY_H_
+#define FLUTTER_DISPLAY_LIST_TESTING_DL_TEST_EQUALITY_H_
 
-#include "flutter/display_list/display_list_attributes.h"
-#include "flutter/display_list/display_list_comparable.h"
+#include "flutter/display_list/dl_attributes.h"
+#include "flutter/display_list/utils/dl_comparable.h"
 #include "gtest/gtest.h"
 
 namespace flutter {
@@ -25,7 +25,7 @@ static void TestEquals(T& source1, T& source2) {
 }
 
 template <class T>
-static void TestNotEquals(T& source1, T& source2, std::string label) {
+static void TestNotEquals(T& source1, T& source2, const std::string& label) {
   ASSERT_FALSE(source1 == source2) << label;
   ASSERT_FALSE(source2 == source1) << label;
   ASSERT_TRUE(source1 != source2) << label;
@@ -39,4 +39,4 @@ static void TestNotEquals(T& source1, T& source2, std::string label) {
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // FLUTTER_DISPLAY_LIST_DISPLAY_LIST_ATTRIBUTES_TESTING_H_
+#endif  // FLUTTER_DISPLAY_LIST_TESTING_DL_TEST_EQUALITY_H_
diff --git a/display_list/display_list_test_utils.cc b/display_list/testing/dl_test_snippets.cc
similarity index 35%
rename from display_list/display_list_test_utils.cc
rename to display_list/testing/dl_test_snippets.cc
index 144fe140d74902d8727597bb40ad85aa7938fd02..4757833f99ef6629cf7cf1971075b7f9bd5cd9ef 100644
--- a/display_list/display_list_test_utils.cc
+++ b/display_list/testing/dl_test_snippets.cc
@@ -2,36 +2,41 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/display_list/display_list_test_utils.h"
-#include "flutter/display_list/display_list_builder.h"
+#include "flutter/display_list/testing/dl_test_snippets.h"
+#include "flutter/display_list/dl_builder.h"
+#include "flutter/display_list/dl_op_receiver.h"
+#include "third_party/skia/include/core/SkFontMgr.h"
+#include "third_party/skia/include/core/SkTypeface.h"
+#include "txt/platform.h"
 
 namespace flutter {
 namespace testing {
 
 sk_sp<DisplayList> GetSampleDisplayList() {
   DisplayListBuilder builder(SkRect::MakeWH(150, 100));
-  builder.setColor(SK_ColorRED);
-  builder.drawRect(SkRect::MakeXYWH(10, 10, 80, 80));
+  builder.DrawRect(SkRect::MakeXYWH(10, 10, 80, 80), DlPaint(DlColor::kRed()));
   return builder.Build();
 }
 
 sk_sp<DisplayList> GetSampleNestedDisplayList() {
   DisplayListBuilder builder(SkRect::MakeWH(150, 100));
+  DlPaint paint;
   for (int y = 10; y <= 60; y += 10) {
     for (int x = 10; x <= 60; x += 10) {
-      builder.setColor(((x + y) % 20) == 10 ? SK_ColorRED : SK_ColorBLUE);
-      builder.drawRect(SkRect::MakeXYWH(x, y, 80, 80));
+      paint.setColor(((x + y) % 20) == 10 ? DlColor(SK_ColorRED)
+                                          : DlColor(SK_ColorBLUE));
+      builder.DrawRect(SkRect::MakeXYWH(x, y, 80, 80), paint);
     }
   }
   DisplayListBuilder outer_builder(SkRect::MakeWH(150, 100));
-  outer_builder.drawDisplayList(builder.Build());
+  outer_builder.DrawDisplayList(builder.Build());
   return outer_builder.Build();
 }
 
 sk_sp<DisplayList> GetSampleDisplayList(int ops) {
   DisplayListBuilder builder(SkRect::MakeWH(150, 100));
   for (int i = 0; i < ops; i++) {
-    builder.drawColor(SK_ColorRED, DlBlendMode::kSrc);
+    builder.DrawColor(DlColor::kRed(), DlBlendMode::kSrc);
   }
   return builder.Build();
 }
@@ -44,258 +49,201 @@ std::vector<DisplayListInvocationGroup> CreateAllAttributesOps() {
   return {
       {"SetAntiAlias",
        {
-           {0, 8, 0, 0, [](DisplayListBuilder& b) { b.setAntiAlias(true); }},
-           {0, 0, 0, 0, [](DisplayListBuilder& b) { b.setAntiAlias(false); }},
-       }},
-      {"SetDither",
-       {
-           {0, 8, 0, 0, [](DisplayListBuilder& b) { b.setDither(true); }},
-           {0, 0, 0, 0, [](DisplayListBuilder& b) { b.setDither(false); }},
+           {0, 8, 0, 0, [](DlOpReceiver& r) { r.setAntiAlias(true); }},
+           {0, 0, 0, 0, [](DlOpReceiver& r) { r.setAntiAlias(false); }},
        }},
       {"SetInvertColors",
        {
-           {0, 8, 0, 0, [](DisplayListBuilder& b) { b.setInvertColors(true); }},
-           {0, 0, 0, 0,
-            [](DisplayListBuilder& b) { b.setInvertColors(false); }},
+           {0, 8, 0, 0, [](DlOpReceiver& r) { r.setInvertColors(true); }},
+           {0, 0, 0, 0, [](DlOpReceiver& r) { r.setInvertColors(false); }},
        }},
       {"SetStrokeCap",
        {
            {0, 8, 0, 0,
-            [](DisplayListBuilder& b) { b.setStrokeCap(DlStrokeCap::kRound); }},
+            [](DlOpReceiver& r) { r.setStrokeCap(DlStrokeCap::kRound); }},
            {0, 8, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setStrokeCap(DlStrokeCap::kSquare);
-            }},
+            [](DlOpReceiver& r) { r.setStrokeCap(DlStrokeCap::kSquare); }},
            {0, 0, 0, 0,
-            [](DisplayListBuilder& b) { b.setStrokeCap(DlStrokeCap::kButt); }},
+            [](DlOpReceiver& r) { r.setStrokeCap(DlStrokeCap::kButt); }},
        }},
       {"SetStrokeJoin",
        {
            {0, 8, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setStrokeJoin(DlStrokeJoin::kBevel);
-            }},
+            [](DlOpReceiver& r) { r.setStrokeJoin(DlStrokeJoin::kBevel); }},
            {0, 8, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setStrokeJoin(DlStrokeJoin::kRound);
-            }},
+            [](DlOpReceiver& r) { r.setStrokeJoin(DlStrokeJoin::kRound); }},
            {0, 0, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setStrokeJoin(DlStrokeJoin::kMiter);
-            }},
+            [](DlOpReceiver& r) { r.setStrokeJoin(DlStrokeJoin::kMiter); }},
        }},
       {"SetStyle",
        {
            {0, 8, 0, 0,
-            [](DisplayListBuilder& b) { b.setStyle(DlDrawStyle::kStroke); }},
+            [](DlOpReceiver& r) { r.setDrawStyle(DlDrawStyle::kStroke); }},
            {0, 8, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setStyle(DlDrawStyle::kStrokeAndFill);
+            [](DlOpReceiver& r) {
+              r.setDrawStyle(DlDrawStyle::kStrokeAndFill);
             }},
            {0, 0, 0, 0,
-            [](DisplayListBuilder& b) { b.setStyle(DlDrawStyle::kFill); }},
+            [](DlOpReceiver& r) { r.setDrawStyle(DlDrawStyle::kFill); }},
        }},
       {"SetStrokeWidth",
        {
-           {0, 8, 0, 0, [](DisplayListBuilder& b) { b.setStrokeWidth(1.0); }},
-           {0, 8, 0, 0, [](DisplayListBuilder& b) { b.setStrokeWidth(5.0); }},
-           {0, 0, 0, 0, [](DisplayListBuilder& b) { b.setStrokeWidth(0.0); }},
+           {0, 8, 0, 0, [](DlOpReceiver& r) { r.setStrokeWidth(1.0); }},
+           {0, 8, 0, 0, [](DlOpReceiver& r) { r.setStrokeWidth(5.0); }},
+           {0, 0, 0, 0, [](DlOpReceiver& r) { r.setStrokeWidth(0.0); }},
        }},
       {"SetStrokeMiter",
        {
-           {0, 8, 0, 0, [](DisplayListBuilder& b) { b.setStrokeMiter(0.0); }},
-           {0, 8, 0, 0, [](DisplayListBuilder& b) { b.setStrokeMiter(5.0); }},
-           {0, 0, 0, 0, [](DisplayListBuilder& b) { b.setStrokeMiter(4.0); }},
+           {0, 8, 0, 0, [](DlOpReceiver& r) { r.setStrokeMiter(0.0); }},
+           {0, 8, 0, 0, [](DlOpReceiver& r) { r.setStrokeMiter(5.0); }},
+           {0, 0, 0, 0, [](DlOpReceiver& r) { r.setStrokeMiter(4.0); }},
        }},
       {"SetColor",
        {
            {0, 8, 0, 0,
-            [](DisplayListBuilder& b) { b.setColor(SK_ColorGREEN); }},
+            [](DlOpReceiver& r) { r.setColor(DlColor(SK_ColorGREEN)); }},
            {0, 8, 0, 0,
-            [](DisplayListBuilder& b) { b.setColor(SK_ColorBLUE); }},
+            [](DlOpReceiver& r) { r.setColor(DlColor(SK_ColorBLUE)); }},
            {0, 0, 0, 0,
-            [](DisplayListBuilder& b) { b.setColor(SK_ColorBLACK); }},
+            [](DlOpReceiver& r) { r.setColor(DlColor(SK_ColorBLACK)); }},
        }},
-      {"SetBlendModeOrBlender",
+      {"SetBlendMode",
        {
            {0, 8, 0, 0,
-            [](DisplayListBuilder& b) { b.setBlendMode(DlBlendMode::kSrcIn); }},
+            [](DlOpReceiver& r) { r.setBlendMode(DlBlendMode::kSrcIn); }},
            {0, 8, 0, 0,
-            [](DisplayListBuilder& b) { b.setBlendMode(DlBlendMode::kDstIn); }},
-           {0, 16, 0, 0,
-            [](DisplayListBuilder& b) { b.setBlender(kTestBlender1); }},
-           {0, 16, 0, 0,
-            [](DisplayListBuilder& b) { b.setBlender(kTestBlender2); }},
-           {0, 16, 0, 0,
-            [](DisplayListBuilder& b) { b.setBlender(kTestBlender3); }},
+            [](DlOpReceiver& r) { r.setBlendMode(DlBlendMode::kDstIn); }},
            {0, 0, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setBlendMode(DlBlendMode::kSrcOver);
-            }},
-           {0, 0, 0, 0, [](DisplayListBuilder& b) { b.setBlender(nullptr); }},
+            [](DlOpReceiver& r) { r.setBlendMode(DlBlendMode::kSrcOver); }},
        }},
       {"SetColorSource",
        {
            {0, 96, 0, 0,
-            [](DisplayListBuilder& b) { b.setColorSource(&kTestSource1); }},
+            [](DlOpReceiver& r) { r.setColorSource(&kTestSource1); }},
            // stop_count * (sizeof(float) + sizeof(uint32_t)) = 80
            {0, 80 + 6 * 4, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setColorSource(kTestSource2.get());
-            }},
+            [](DlOpReceiver& r) { r.setColorSource(kTestSource2.get()); }},
            {0, 80 + 6 * 4, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setColorSource(kTestSource3.get());
-            }},
+            [](DlOpReceiver& r) { r.setColorSource(kTestSource3.get()); }},
            {0, 88 + 6 * 4, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setColorSource(kTestSource4.get());
-            }},
+            [](DlOpReceiver& r) { r.setColorSource(kTestSource4.get()); }},
            {0, 80 + 6 * 4, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setColorSource(kTestSource5.get());
-            }},
-           {0, 0, 0, 0,
-            [](DisplayListBuilder& b) { b.setColorSource(nullptr); }},
+            [](DlOpReceiver& r) { r.setColorSource(kTestSource5.get()); }},
+           {0, 0, 0, 0, [](DlOpReceiver& r) { r.setColorSource(nullptr); }},
        }},
       {"SetImageFilter",
        {
            {0, 32, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setImageFilter(&kTestBlurImageFilter1);
-            }},
+            [](DlOpReceiver& r) { r.setImageFilter(&kTestBlurImageFilter1); }},
            {0, 32, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setImageFilter(&kTestBlurImageFilter2);
-            }},
+            [](DlOpReceiver& r) { r.setImageFilter(&kTestBlurImageFilter2); }},
            {0, 32, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setImageFilter(&kTestBlurImageFilter3);
-            }},
+            [](DlOpReceiver& r) { r.setImageFilter(&kTestBlurImageFilter3); }},
            {0, 32, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setImageFilter(&kTestBlurImageFilter4);
-            }},
+            [](DlOpReceiver& r) { r.setImageFilter(&kTestBlurImageFilter4); }},
            {0, 24, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setImageFilter(&kTestDilateImageFilter1);
+            [](DlOpReceiver& r) {
+              r.setImageFilter(&kTestDilateImageFilter1);
             }},
            {0, 24, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setImageFilter(&kTestDilateImageFilter2);
+            [](DlOpReceiver& r) {
+              r.setImageFilter(&kTestDilateImageFilter2);
             }},
            {0, 24, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setImageFilter(&kTestDilateImageFilter3);
+            [](DlOpReceiver& r) {
+              r.setImageFilter(&kTestDilateImageFilter3);
             }},
            {0, 24, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setImageFilter(&kTestErodeImageFilter1);
-            }},
+            [](DlOpReceiver& r) { r.setImageFilter(&kTestErodeImageFilter1); }},
            {0, 24, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setImageFilter(&kTestErodeImageFilter2);
-            }},
+            [](DlOpReceiver& r) { r.setImageFilter(&kTestErodeImageFilter2); }},
            {0, 24, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setImageFilter(&kTestErodeImageFilter3);
-            }},
+            [](DlOpReceiver& r) { r.setImageFilter(&kTestErodeImageFilter3); }},
            {0, 64, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setImageFilter(&kTestMatrixImageFilter1);
+            [](DlOpReceiver& r) {
+              r.setImageFilter(&kTestMatrixImageFilter1);
             }},
            {0, 64, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setImageFilter(&kTestMatrixImageFilter2);
+            [](DlOpReceiver& r) {
+              r.setImageFilter(&kTestMatrixImageFilter2);
             }},
            {0, 64, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setImageFilter(&kTestMatrixImageFilter3);
+            [](DlOpReceiver& r) {
+              r.setImageFilter(&kTestMatrixImageFilter3);
             }},
            {0, 24, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setImageFilter(&kTestComposeImageFilter1);
+            [](DlOpReceiver& r) {
+              r.setImageFilter(&kTestComposeImageFilter1);
             }},
            {0, 24, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setImageFilter(&kTestComposeImageFilter2);
+            [](DlOpReceiver& r) {
+              r.setImageFilter(&kTestComposeImageFilter2);
             }},
            {0, 24, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setImageFilter(&kTestComposeImageFilter3);
+            [](DlOpReceiver& r) {
+              r.setImageFilter(&kTestComposeImageFilter3);
             }},
            {0, 24, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setImageFilter(&kTestCFImageFilter1);
-            }},
+            [](DlOpReceiver& r) { r.setImageFilter(&kTestCFImageFilter1); }},
+           {0, 24, 0, 0,
+            [](DlOpReceiver& r) { r.setImageFilter(&kTestCFImageFilter2); }},
+           {0, 0, 0, 0, [](DlOpReceiver& r) { r.setImageFilter(nullptr); }},
            {0, 24, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setImageFilter(&kTestCFImageFilter2);
+            [](DlOpReceiver& r) {
+              r.setImageFilter(
+                  kTestBlurImageFilter1
+                      .makeWithLocalMatrix(SkMatrix::Translate(2, 2))
+                      .get());
             }},
-           {0, 0, 0, 0,
-            [](DisplayListBuilder& b) { b.setImageFilter(nullptr); }},
        }},
       {"SetColorFilter",
        {
            {0, 24, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setColorFilter(&kTestBlendColorFilter1);
-            }},
+            [](DlOpReceiver& r) { r.setColorFilter(&kTestBlendColorFilter1); }},
            {0, 24, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setColorFilter(&kTestBlendColorFilter2);
-            }},
+            [](DlOpReceiver& r) { r.setColorFilter(&kTestBlendColorFilter2); }},
            {0, 24, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setColorFilter(&kTestBlendColorFilter3);
-            }},
+            [](DlOpReceiver& r) { r.setColorFilter(&kTestBlendColorFilter3); }},
            {0, 96, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setColorFilter(&kTestMatrixColorFilter1);
+            [](DlOpReceiver& r) {
+              r.setColorFilter(&kTestMatrixColorFilter1);
             }},
            {0, 96, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setColorFilter(&kTestMatrixColorFilter2);
+            [](DlOpReceiver& r) {
+              r.setColorFilter(&kTestMatrixColorFilter2);
             }},
            {0, 16, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setColorFilter(DlSrgbToLinearGammaColorFilter::instance.get());
+            [](DlOpReceiver& r) {
+              r.setColorFilter(DlSrgbToLinearGammaColorFilter::kInstance.get());
             }},
            {0, 16, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setColorFilter(DlLinearToSrgbGammaColorFilter::instance.get());
+            [](DlOpReceiver& r) {
+              r.setColorFilter(DlLinearToSrgbGammaColorFilter::kInstance.get());
             }},
-           {0, 0, 0, 0,
-            [](DisplayListBuilder& b) { b.setColorFilter(nullptr); }},
+           {0, 0, 0, 0, [](DlOpReceiver& r) { r.setColorFilter(nullptr); }},
        }},
       {"SetPathEffect",
        {
            // sizeof(DlDashPathEffect) + 2 * sizeof(SkScalar)
            {0, 32, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setPathEffect(kTestPathEffect1.get());
-            }},
+            [](DlOpReceiver& r) { r.setPathEffect(kTestPathEffect1.get()); }},
            {0, 32, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.setPathEffect(kTestPathEffect2.get());
-            }},
-           {0, 0, 0, 0,
-            [](DisplayListBuilder& b) { b.setPathEffect(nullptr); }},
+            [](DlOpReceiver& r) { r.setPathEffect(kTestPathEffect2.get()); }},
+           {0, 0, 0, 0, [](DlOpReceiver& r) { r.setPathEffect(nullptr); }},
        }},
       {"SetMaskFilter",
        {
            {0, 32, 0, 0,
-            [](DisplayListBuilder& b) { b.setMaskFilter(&kTestMaskFilter1); }},
+            [](DlOpReceiver& r) { r.setMaskFilter(&kTestMaskFilter1); }},
            {0, 32, 0, 0,
-            [](DisplayListBuilder& b) { b.setMaskFilter(&kTestMaskFilter2); }},
+            [](DlOpReceiver& r) { r.setMaskFilter(&kTestMaskFilter2); }},
            {0, 32, 0, 0,
-            [](DisplayListBuilder& b) { b.setMaskFilter(&kTestMaskFilter3); }},
+            [](DlOpReceiver& r) { r.setMaskFilter(&kTestMaskFilter3); }},
            {0, 32, 0, 0,
-            [](DisplayListBuilder& b) { b.setMaskFilter(&kTestMaskFilter4); }},
+            [](DlOpReceiver& r) { r.setMaskFilter(&kTestMaskFilter4); }},
            {0, 32, 0, 0,
-            [](DisplayListBuilder& b) { b.setMaskFilter(&kTestMaskFilter5); }},
-           {0, 0, 0, 0,
-            [](DisplayListBuilder& b) { b.setMaskFilter(nullptr); }},
+            [](DlOpReceiver& r) { r.setMaskFilter(&kTestMaskFilter5); }},
+           {0, 0, 0, 0, [](DlOpReceiver& r) { r.setMaskFilter(nullptr); }},
        }},
   };
 }
@@ -304,14 +252,14 @@ std::vector<DisplayListInvocationGroup> CreateAllSaveRestoreOps() {
   return {
       {"Save(Layer)+Restore",
        {
-           {5, 104, 5, 104,
-            [](DisplayListBuilder& b) {
-              b.saveLayer(nullptr, SaveLayerOptions::kNoAttributes,
+           {5, 128, 5, 128,
+            [](DlOpReceiver& r) {
+              r.saveLayer(nullptr, SaveLayerOptions::kNoAttributes,
                           &kTestCFImageFilter1);
-              b.clipRect({0, 0, 25, 25}, SkClipOp::kIntersect, true);
-              b.drawRect({5, 5, 15, 15});
-              b.drawRect({10, 10, 20, 20});
-              b.restore();
+              r.clipRect({0, 0, 25, 25}, DlCanvas::ClipOp::kIntersect, true);
+              r.drawRect({5, 5, 15, 15});
+              r.drawRect({10, 10, 20, 20});
+              r.restore();
             }},
            // There are many reasons that save and restore can elide content,
            // including whether or not there are any draw operations between
@@ -320,81 +268,81 @@ std::vector<DisplayListInvocationGroup> CreateAllSaveRestoreOps() {
            // attributes to be distributed to the children. To prevent those
            // cases we include at least one clip operation and 2 overlapping
            // rendering primitives between each save/restore pair.
-           {5, 88, 5, 88,
-            [](DisplayListBuilder& b) {
-              b.save();
-              b.clipRect({0, 0, 25, 25}, SkClipOp::kIntersect, true);
-              b.drawRect({5, 5, 15, 15});
-              b.drawRect({10, 10, 20, 20});
-              b.restore();
-            }},
-           {5, 88, 5, 88,
-            [](DisplayListBuilder& b) {
-              b.saveLayer(nullptr, false);
-              b.clipRect({0, 0, 25, 25}, SkClipOp::kIntersect, true);
-              b.drawRect({5, 5, 15, 15});
-              b.drawRect({10, 10, 20, 20});
-              b.restore();
-            }},
-           {5, 88, 5, 88,
-            [](DisplayListBuilder& b) {
-              b.saveLayer(nullptr, true);
-              b.clipRect({0, 0, 25, 25}, SkClipOp::kIntersect, true);
-              b.drawRect({5, 5, 15, 15});
-              b.drawRect({10, 10, 20, 20});
-              b.restore();
-            }},
-           {5, 104, 5, 104,
-            [](DisplayListBuilder& b) {
-              b.saveLayer(&kTestBounds, false);
-              b.clipRect({0, 0, 25, 25}, SkClipOp::kIntersect, true);
-              b.drawRect({5, 5, 15, 15});
-              b.drawRect({10, 10, 20, 20});
-              b.restore();
-            }},
-           {5, 104, 5, 104,
-            [](DisplayListBuilder& b) {
-              b.saveLayer(&kTestBounds, true);
-              b.clipRect({0, 0, 25, 25}, SkClipOp::kIntersect, true);
-              b.drawRect({5, 5, 15, 15});
-              b.drawRect({10, 10, 20, 20});
-              b.restore();
+           {5, 96, 5, 96,
+            [](DlOpReceiver& r) {
+              r.save();
+              r.clipRect({0, 0, 25, 25}, DlCanvas::ClipOp::kIntersect, true);
+              r.drawRect({5, 5, 15, 15});
+              r.drawRect({10, 10, 20, 20});
+              r.restore();
+            }},
+           {5, 112, 5, 112,
+            [](DlOpReceiver& r) {
+              r.saveLayer(nullptr, SaveLayerOptions::kNoAttributes);
+              r.clipRect({0, 0, 25, 25}, DlCanvas::ClipOp::kIntersect, true);
+              r.drawRect({5, 5, 15, 15});
+              r.drawRect({10, 10, 20, 20});
+              r.restore();
+            }},
+           {5, 112, 5, 112,
+            [](DlOpReceiver& r) {
+              r.saveLayer(nullptr, SaveLayerOptions::kWithAttributes);
+              r.clipRect({0, 0, 25, 25}, DlCanvas::ClipOp::kIntersect, true);
+              r.drawRect({5, 5, 15, 15});
+              r.drawRect({10, 10, 20, 20});
+              r.restore();
+            }},
+           {5, 112, 5, 112,
+            [](DlOpReceiver& r) {
+              r.saveLayer(&kTestBounds, SaveLayerOptions::kNoAttributes);
+              r.clipRect({0, 0, 25, 25}, DlCanvas::ClipOp::kIntersect, true);
+              r.drawRect({5, 5, 15, 15});
+              r.drawRect({10, 10, 20, 20});
+              r.restore();
+            }},
+           {5, 112, 5, 112,
+            [](DlOpReceiver& r) {
+              r.saveLayer(&kTestBounds, SaveLayerOptions::kWithAttributes);
+              r.clipRect({0, 0, 25, 25}, DlCanvas::ClipOp::kIntersect, true);
+              r.drawRect({5, 5, 15, 15});
+              r.drawRect({10, 10, 20, 20});
+              r.restore();
             }},
            // backdrop variants - using the TestCFImageFilter because it can be
            // reconstituted in the DL->SkCanvas->DL stream
-           // {5, 104, 5, 104, [](DisplayListBuilder& b) {
-           //   b.saveLayer(nullptr, SaveLayerOptions::kNoAttributes,
-           //   &kTestCFImageFilter1); b.clipRect({0, 0, 25, 25},
-           //   SkClipOp::kIntersect, true); b.drawRect({5, 5, 15, 15});
-           //   b.drawRect({10, 10, 20, 20});
-           //   b.restore();
+           // {5, 104, 5, 104, [](DlOpReceiver& r) {
+           //   r.saveLayer(nullptr, SaveLayerOptions::kNoAttributes,
+           //   &kTestCFImageFilter1); r.clipRect({0, 0, 25, 25},
+           //   SkClipOp::kIntersect, true); r.drawRect({5, 5, 15, 15});
+           //   r.drawRect({10, 10, 20, 20});
+           //   r.restore();
            // }},
-           {5, 104, 5, 104,
-            [](DisplayListBuilder& b) {
-              b.saveLayer(nullptr, SaveLayerOptions::kWithAttributes,
+           {5, 128, 5, 128,
+            [](DlOpReceiver& r) {
+              r.saveLayer(nullptr, SaveLayerOptions::kWithAttributes,
                           &kTestCFImageFilter1);
-              b.clipRect({0, 0, 25, 25}, SkClipOp::kIntersect, true);
-              b.drawRect({5, 5, 15, 15});
-              b.drawRect({10, 10, 20, 20});
-              b.restore();
-            }},
-           {5, 120, 5, 120,
-            [](DisplayListBuilder& b) {
-              b.saveLayer(&kTestBounds, SaveLayerOptions::kNoAttributes,
+              r.clipRect({0, 0, 25, 25}, DlCanvas::ClipOp::kIntersect, true);
+              r.drawRect({5, 5, 15, 15});
+              r.drawRect({10, 10, 20, 20});
+              r.restore();
+            }},
+           {5, 128, 5, 128,
+            [](DlOpReceiver& r) {
+              r.saveLayer(&kTestBounds, SaveLayerOptions::kNoAttributes,
                           &kTestCFImageFilter1);
-              b.clipRect({0, 0, 25, 25}, SkClipOp::kIntersect, true);
-              b.drawRect({5, 5, 15, 15});
-              b.drawRect({10, 10, 20, 20});
-              b.restore();
-            }},
-           {5, 120, 5, 120,
-            [](DisplayListBuilder& b) {
-              b.saveLayer(&kTestBounds, SaveLayerOptions::kWithAttributes,
+              r.clipRect({0, 0, 25, 25}, DlCanvas::ClipOp::kIntersect, true);
+              r.drawRect({5, 5, 15, 15});
+              r.drawRect({10, 10, 20, 20});
+              r.restore();
+            }},
+           {5, 128, 5, 128,
+            [](DlOpReceiver& r) {
+              r.saveLayer(&kTestBounds, SaveLayerOptions::kWithAttributes,
                           &kTestCFImageFilter1);
-              b.clipRect({0, 0, 25, 25}, SkClipOp::kIntersect, true);
-              b.drawRect({5, 5, 15, 15});
-              b.drawRect({10, 10, 20, 20});
-              b.restore();
+              r.clipRect({0, 0, 25, 25}, DlCanvas::ClipOp::kIntersect, true);
+              r.drawRect({5, 5, 15, 15});
+              r.drawRect({10, 10, 20, 20});
+              r.restore();
             }},
        }},
   };
@@ -405,65 +353,61 @@ std::vector<DisplayListInvocationGroup> CreateAllTransformOps() {
       {"Translate",
        {
            // cv.translate(0, 0) is ignored
-           {1, 16, 1, 16, [](DisplayListBuilder& b) { b.translate(10, 10); }},
-           {1, 16, 1, 16, [](DisplayListBuilder& b) { b.translate(10, 15); }},
-           {1, 16, 1, 16, [](DisplayListBuilder& b) { b.translate(15, 10); }},
-           {0, 0, 0, 0, [](DisplayListBuilder& b) { b.translate(0, 0); }},
+           {1, 16, 1, 16, [](DlOpReceiver& r) { r.translate(10, 10); }},
+           {1, 16, 1, 16, [](DlOpReceiver& r) { r.translate(10, 15); }},
+           {1, 16, 1, 16, [](DlOpReceiver& r) { r.translate(15, 10); }},
+           {0, 0, 0, 0, [](DlOpReceiver& r) { r.translate(0, 0); }},
        }},
       {"Scale",
        {
            // cv.scale(1, 1) is ignored
-           {1, 16, 1, 16, [](DisplayListBuilder& b) { b.scale(2, 2); }},
-           {1, 16, 1, 16, [](DisplayListBuilder& b) { b.scale(2, 3); }},
-           {1, 16, 1, 16, [](DisplayListBuilder& b) { b.scale(3, 2); }},
-           {0, 0, 0, 0, [](DisplayListBuilder& b) { b.scale(1, 1); }},
+           {1, 16, 1, 16, [](DlOpReceiver& r) { r.scale(2, 2); }},
+           {1, 16, 1, 16, [](DlOpReceiver& r) { r.scale(2, 3); }},
+           {1, 16, 1, 16, [](DlOpReceiver& r) { r.scale(3, 2); }},
+           {0, 0, 0, 0, [](DlOpReceiver& r) { r.scale(1, 1); }},
        }},
       {"Rotate",
        {
            // cv.rotate(0) is ignored, otherwise expressed as concat(rotmatrix)
-           {1, 8, 1, 32, [](DisplayListBuilder& b) { b.rotate(30); }},
-           {1, 8, 1, 32, [](DisplayListBuilder& b) { b.rotate(45); }},
-           {0, 0, 0, 0, [](DisplayListBuilder& b) { b.rotate(0); }},
-           {0, 0, 0, 0, [](DisplayListBuilder& b) { b.rotate(360); }},
+           {1, 8, 1, 32, [](DlOpReceiver& r) { r.rotate(30); }},
+           {1, 8, 1, 32, [](DlOpReceiver& r) { r.rotate(45); }},
+           {0, 0, 0, 0, [](DlOpReceiver& r) { r.rotate(0); }},
+           {0, 0, 0, 0, [](DlOpReceiver& r) { r.rotate(360); }},
        }},
       {"Skew",
        {
            // cv.skew(0, 0) is ignored, otherwise expressed as
            // concat(skewmatrix)
-           {1, 16, 1, 32, [](DisplayListBuilder& b) { b.skew(0.1, 0.1); }},
-           {1, 16, 1, 32, [](DisplayListBuilder& b) { b.skew(0.1, 0.2); }},
-           {1, 16, 1, 32, [](DisplayListBuilder& b) { b.skew(0.2, 0.1); }},
-           {0, 0, 0, 0, [](DisplayListBuilder& b) { b.skew(0, 0); }},
+           {1, 16, 1, 32, [](DlOpReceiver& r) { r.skew(0.1, 0.1); }},
+           {1, 16, 1, 32, [](DlOpReceiver& r) { r.skew(0.1, 0.2); }},
+           {1, 16, 1, 32, [](DlOpReceiver& r) { r.skew(0.2, 0.1); }},
+           {0, 0, 0, 0, [](DlOpReceiver& r) { r.skew(0, 0); }},
        }},
       {"Transform2DAffine",
        {
            {1, 32, 1, 32,
-            [](DisplayListBuilder& b) {
-              b.transform2DAffine(0, 1, 12, 1, 0, 33);
-            }},
-           // b.transform(identity) is ignored
+            [](DlOpReceiver& r) { r.transform2DAffine(0, 1, 12, 1, 0, 33); }},
+           // r.transform(identity) is ignored
            {0, 0, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.transform2DAffine(1, 0, 0, 0, 1, 0);
-            }},
+            [](DlOpReceiver& r) { r.transform2DAffine(1, 0, 0, 0, 1, 0); }},
        }},
       {"TransformFullPerspective",
        {
            {1, 72, 1, 72,
-            [](DisplayListBuilder& b) {
-              b.transformFullPerspective(0, 1, 0, 12, 1, 0, 0, 33, 3, 2, 5, 29,
+            [](DlOpReceiver& r) {
+              r.transformFullPerspective(0, 1, 0, 12, 1, 0, 0, 33, 3, 2, 5, 29,
                                          0, 0, 0, 12);
             }},
-           // b.transform(2D affine) is reduced to 2x3
+           // r.transform(2D affine) is reduced to 2x3
            {1, 32, 1, 32,
-            [](DisplayListBuilder& b) {
-              b.transformFullPerspective(2, 1, 0, 4, 1, 3, 0, 5, 0, 0, 1, 0, 0,
+            [](DlOpReceiver& r) {
+              r.transformFullPerspective(2, 1, 0, 4, 1, 3, 0, 5, 0, 0, 1, 0, 0,
                                          0, 0, 1);
             }},
-           // b.transform(identity) is ignored
+           // r.transform(identity) is ignored
            {0, 0, 0, 0,
-            [](DisplayListBuilder& b) {
-              b.transformFullPerspective(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0,
+            [](DlOpReceiver& r) {
+              r.transformFullPerspective(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0,
                                          0, 0, 1);
             }},
        }},
@@ -475,86 +419,86 @@ std::vector<DisplayListInvocationGroup> CreateAllClipOps() {
       {"ClipRect",
        {
            {1, 24, 1, 24,
-            [](DisplayListBuilder& b) {
-              b.clipRect(kTestBounds, SkClipOp::kIntersect, true);
+            [](DlOpReceiver& r) {
+              r.clipRect(kTestBounds, DlCanvas::ClipOp::kIntersect, true);
             }},
            {1, 24, 1, 24,
-            [](DisplayListBuilder& b) {
-              b.clipRect(kTestBounds.makeOffset(1, 1), SkClipOp::kIntersect,
-                         true);
+            [](DlOpReceiver& r) {
+              r.clipRect(kTestBounds.makeOffset(1, 1),
+                         DlCanvas::ClipOp::kIntersect, true);
             }},
            {1, 24, 1, 24,
-            [](DisplayListBuilder& b) {
-              b.clipRect(kTestBounds, SkClipOp::kIntersect, false);
+            [](DlOpReceiver& r) {
+              r.clipRect(kTestBounds, DlCanvas::ClipOp::kIntersect, false);
             }},
            {1, 24, 1, 24,
-            [](DisplayListBuilder& b) {
-              b.clipRect(kTestBounds, SkClipOp::kDifference, true);
+            [](DlOpReceiver& r) {
+              r.clipRect(kTestBounds, DlCanvas::ClipOp::kDifference, true);
             }},
            {1, 24, 1, 24,
-            [](DisplayListBuilder& b) {
-              b.clipRect(kTestBounds, SkClipOp::kDifference, false);
+            [](DlOpReceiver& r) {
+              r.clipRect(kTestBounds, DlCanvas::ClipOp::kDifference, false);
             }},
        }},
       {"ClipRRect",
        {
            {1, 64, 1, 64,
-            [](DisplayListBuilder& b) {
-              b.clipRRect(kTestRRect, SkClipOp::kIntersect, true);
+            [](DlOpReceiver& r) {
+              r.clipRRect(kTestRRect, DlCanvas::ClipOp::kIntersect, true);
             }},
            {1, 64, 1, 64,
-            [](DisplayListBuilder& b) {
-              b.clipRRect(kTestRRect.makeOffset(1, 1), SkClipOp::kIntersect,
-                          true);
+            [](DlOpReceiver& r) {
+              r.clipRRect(kTestRRect.makeOffset(1, 1),
+                          DlCanvas::ClipOp::kIntersect, true);
             }},
            {1, 64, 1, 64,
-            [](DisplayListBuilder& b) {
-              b.clipRRect(kTestRRect, SkClipOp::kIntersect, false);
+            [](DlOpReceiver& r) {
+              r.clipRRect(kTestRRect, DlCanvas::ClipOp::kIntersect, false);
             }},
            {1, 64, 1, 64,
-            [](DisplayListBuilder& b) {
-              b.clipRRect(kTestRRect, SkClipOp::kDifference, true);
+            [](DlOpReceiver& r) {
+              r.clipRRect(kTestRRect, DlCanvas::ClipOp::kDifference, true);
             }},
            {1, 64, 1, 64,
-            [](DisplayListBuilder& b) {
-              b.clipRRect(kTestRRect, SkClipOp::kDifference, false);
+            [](DlOpReceiver& r) {
+              r.clipRRect(kTestRRect, DlCanvas::ClipOp::kDifference, false);
             }},
        }},
       {"ClipPath",
        {
-           {1, 24, 1, 24,
-            [](DisplayListBuilder& b) {
-              b.clipPath(kTestPath1, SkClipOp::kIntersect, true);
+           {1, 40, 1, 40,
+            [](DlOpReceiver& r) {
+              r.clipPath(kTestPath1, DlCanvas::ClipOp::kIntersect, true);
             }},
-           {1, 24, 1, 24,
-            [](DisplayListBuilder& b) {
-              b.clipPath(kTestPath2, SkClipOp::kIntersect, true);
+           {1, 40, 1, 40,
+            [](DlOpReceiver& r) {
+              r.clipPath(kTestPath2, DlCanvas::ClipOp::kIntersect, true);
             }},
-           {1, 24, 1, 24,
-            [](DisplayListBuilder& b) {
-              b.clipPath(kTestPath3, SkClipOp::kIntersect, true);
+           {1, 40, 1, 40,
+            [](DlOpReceiver& r) {
+              r.clipPath(kTestPath3, DlCanvas::ClipOp::kIntersect, true);
             }},
-           {1, 24, 1, 24,
-            [](DisplayListBuilder& b) {
-              b.clipPath(kTestPath1, SkClipOp::kIntersect, false);
+           {1, 40, 1, 40,
+            [](DlOpReceiver& r) {
+              r.clipPath(kTestPath1, DlCanvas::ClipOp::kIntersect, false);
             }},
-           {1, 24, 1, 24,
-            [](DisplayListBuilder& b) {
-              b.clipPath(kTestPath1, SkClipOp::kDifference, true);
+           {1, 40, 1, 40,
+            [](DlOpReceiver& r) {
+              r.clipPath(kTestPath1, DlCanvas::ClipOp::kDifference, true);
             }},
-           {1, 24, 1, 24,
-            [](DisplayListBuilder& b) {
-              b.clipPath(kTestPath1, SkClipOp::kDifference, false);
+           {1, 40, 1, 40,
+            [](DlOpReceiver& r) {
+              r.clipPath(kTestPath1, DlCanvas::ClipOp::kDifference, false);
             }},
            // clipPath(rect) becomes clipRect
            {1, 24, 1, 24,
-            [](DisplayListBuilder& b) {
-              b.clipPath(kTestPathRect, SkClipOp::kIntersect, true);
+            [](DlOpReceiver& r) {
+              r.clipPath(kTestPathRect, DlCanvas::ClipOp::kIntersect, true);
             }},
            // clipPath(oval) becomes clipRRect
            {1, 64, 1, 64,
-            [](DisplayListBuilder& b) {
-              b.clipPath(kTestPathOval, SkClipOp::kIntersect, true);
+            [](DlOpReceiver& r) {
+              r.clipPath(kTestPathOval, DlCanvas::ClipOp::kIntersect, true);
             }},
        }},
   };
@@ -564,501 +508,417 @@ std::vector<DisplayListInvocationGroup> CreateAllRenderingOps() {
   return {
       {"DrawPaint",
        {
-           {1, 8, 1, 8, [](DisplayListBuilder& b) { b.drawPaint(); }},
+           {1, 8, 1, 8, [](DlOpReceiver& r) { r.drawPaint(); }},
        }},
       {"DrawColor",
        {
            // cv.drawColor becomes cv.drawPaint(paint)
            {1, 16, 1, 24,
-            [](DisplayListBuilder& b) {
-              b.drawColor(SK_ColorBLUE, DlBlendMode::kSrcIn);
+            [](DlOpReceiver& r) {
+              r.drawColor(DlColor(SK_ColorBLUE), DlBlendMode::kSrcIn);
             }},
            {1, 16, 1, 24,
-            [](DisplayListBuilder& b) {
-              b.drawColor(SK_ColorBLUE, DlBlendMode::kDstIn);
+            [](DlOpReceiver& r) {
+              r.drawColor(DlColor(SK_ColorBLUE), DlBlendMode::kDstOut);
             }},
            {1, 16, 1, 24,
-            [](DisplayListBuilder& b) {
-              b.drawColor(SK_ColorCYAN, DlBlendMode::kSrcIn);
+            [](DlOpReceiver& r) {
+              r.drawColor(DlColor(SK_ColorCYAN), DlBlendMode::kSrcIn);
             }},
        }},
       {"DrawLine",
        {
            {1, 24, 1, 24,
-            [](DisplayListBuilder& b) {
-              b.drawLine({0, 0}, {10, 10});
+            [](DlOpReceiver& r) {
+              r.drawLine({0, 0}, {10, 10});
             }},
            {1, 24, 1, 24,
-            [](DisplayListBuilder& b) {
-              b.drawLine({0, 1}, {10, 10});
+            [](DlOpReceiver& r) {
+              r.drawLine({0, 1}, {10, 10});
             }},
            {1, 24, 1, 24,
-            [](DisplayListBuilder& b) {
-              b.drawLine({0, 0}, {20, 10});
+            [](DlOpReceiver& r) {
+              r.drawLine({0, 0}, {20, 10});
             }},
            {1, 24, 1, 24,
-            [](DisplayListBuilder& b) {
-              b.drawLine({0, 0}, {10, 20});
+            [](DlOpReceiver& r) {
+              r.drawLine({0, 0}, {10, 20});
             }},
        }},
       {"DrawRect",
        {
            {1, 24, 1, 24,
-            [](DisplayListBuilder& b) {
-              b.drawRect({0, 0, 10, 10});
+            [](DlOpReceiver& r) {
+              r.drawRect({0, 0, 10, 10});
             }},
            {1, 24, 1, 24,
-            [](DisplayListBuilder& b) {
-              b.drawRect({0, 1, 10, 10});
+            [](DlOpReceiver& r) {
+              r.drawRect({0, 1, 10, 10});
             }},
            {1, 24, 1, 24,
-            [](DisplayListBuilder& b) {
-              b.drawRect({0, 0, 20, 10});
+            [](DlOpReceiver& r) {
+              r.drawRect({0, 0, 20, 10});
             }},
            {1, 24, 1, 24,
-            [](DisplayListBuilder& b) {
-              b.drawRect({0, 0, 10, 20});
+            [](DlOpReceiver& r) {
+              r.drawRect({0, 0, 10, 20});
             }},
        }},
       {"DrawOval",
        {
            {1, 24, 1, 24,
-            [](DisplayListBuilder& b) {
-              b.drawOval({0, 0, 10, 10});
+            [](DlOpReceiver& r) {
+              r.drawOval({0, 0, 10, 10});
             }},
            {1, 24, 1, 24,
-            [](DisplayListBuilder& b) {
-              b.drawOval({0, 1, 10, 10});
+            [](DlOpReceiver& r) {
+              r.drawOval({0, 1, 10, 10});
             }},
            {1, 24, 1, 24,
-            [](DisplayListBuilder& b) {
-              b.drawOval({0, 0, 20, 10});
+            [](DlOpReceiver& r) {
+              r.drawOval({0, 0, 20, 10});
             }},
            {1, 24, 1, 24,
-            [](DisplayListBuilder& b) {
-              b.drawOval({0, 0, 10, 20});
+            [](DlOpReceiver& r) {
+              r.drawOval({0, 0, 10, 20});
             }},
        }},
       {"DrawCircle",
        {
            // cv.drawCircle becomes cv.drawOval
            {1, 16, 1, 24,
-            [](DisplayListBuilder& b) {
-              b.drawCircle({0, 0}, 10);
+            [](DlOpReceiver& r) {
+              r.drawCircle({0, 0}, 10);
             }},
            {1, 16, 1, 24,
-            [](DisplayListBuilder& b) {
-              b.drawCircle({0, 5}, 10);
+            [](DlOpReceiver& r) {
+              r.drawCircle({0, 5}, 10);
             }},
            {1, 16, 1, 24,
-            [](DisplayListBuilder& b) {
-              b.drawCircle({0, 0}, 20);
+            [](DlOpReceiver& r) {
+              r.drawCircle({0, 0}, 20);
             }},
        }},
       {"DrawRRect",
        {
+           {1, 56, 1, 56, [](DlOpReceiver& r) { r.drawRRect(kTestRRect); }},
            {1, 56, 1, 56,
-            [](DisplayListBuilder& b) { b.drawRRect(kTestRRect); }},
-           {1, 56, 1, 56,
-            [](DisplayListBuilder& b) {
-              b.drawRRect(kTestRRect.makeOffset(5, 5));
-            }},
+            [](DlOpReceiver& r) { r.drawRRect(kTestRRect.makeOffset(5, 5)); }},
        }},
       {"DrawDRRect",
        {
            {1, 112, 1, 112,
-            [](DisplayListBuilder& b) {
-              b.drawDRRect(kTestRRect, kTestInnerRRect);
-            }},
+            [](DlOpReceiver& r) { r.drawDRRect(kTestRRect, kTestInnerRRect); }},
            {1, 112, 1, 112,
-            [](DisplayListBuilder& b) {
-              b.drawDRRect(kTestRRect.makeOffset(5, 5),
+            [](DlOpReceiver& r) {
+              r.drawDRRect(kTestRRect.makeOffset(5, 5),
                            kTestInnerRRect.makeOffset(4, 4));
             }},
        }},
       {"DrawPath",
        {
-           {1, 24, 1, 24,
-            [](DisplayListBuilder& b) { b.drawPath(kTestPath1); }},
-           {1, 24, 1, 24,
-            [](DisplayListBuilder& b) { b.drawPath(kTestPath2); }},
-           {1, 24, 1, 24,
-            [](DisplayListBuilder& b) { b.drawPath(kTestPath3); }},
-           {1, 24, 1, 24,
-            [](DisplayListBuilder& b) { b.drawPath(kTestPathRect); }},
-           {1, 24, 1, 24,
-            [](DisplayListBuilder& b) { b.drawPath(kTestPathOval); }},
+           {1, 40, 1, 40, [](DlOpReceiver& r) { r.drawPath(kTestPath1); }},
+           {1, 40, 1, 40, [](DlOpReceiver& r) { r.drawPath(kTestPath2); }},
+           {1, 40, 1, 40, [](DlOpReceiver& r) { r.drawPath(kTestPath3); }},
+           {1, 40, 1, 40, [](DlOpReceiver& r) { r.drawPath(kTestPathRect); }},
+           {1, 40, 1, 40, [](DlOpReceiver& r) { r.drawPath(kTestPathOval); }},
        }},
       {"DrawArc",
        {
            {1, 32, 1, 32,
-            [](DisplayListBuilder& b) {
-              b.drawArc(kTestBounds, 45, 270, false);
-            }},
+            [](DlOpReceiver& r) { r.drawArc(kTestBounds, 45, 270, false); }},
            {1, 32, 1, 32,
-            [](DisplayListBuilder& b) {
-              b.drawArc(kTestBounds.makeOffset(1, 1), 45, 270, false);
+            [](DlOpReceiver& r) {
+              r.drawArc(kTestBounds.makeOffset(1, 1), 45, 270, false);
             }},
            {1, 32, 1, 32,
-            [](DisplayListBuilder& b) {
-              b.drawArc(kTestBounds, 30, 270, false);
-            }},
+            [](DlOpReceiver& r) { r.drawArc(kTestBounds, 30, 270, false); }},
            {1, 32, 1, 32,
-            [](DisplayListBuilder& b) {
-              b.drawArc(kTestBounds, 45, 260, false);
-            }},
+            [](DlOpReceiver& r) { r.drawArc(kTestBounds, 45, 260, false); }},
            {1, 32, 1, 32,
-            [](DisplayListBuilder& b) {
-              b.drawArc(kTestBounds, 45, 270, true);
-            }},
+            [](DlOpReceiver& r) { r.drawArc(kTestBounds, 45, 270, true); }},
        }},
       {"DrawPoints",
        {
            {1, 8 + TestPointCount * 8, 1, 8 + TestPointCount * 8,
-            [](DisplayListBuilder& b) {
-              b.drawPoints(SkCanvas::kPoints_PointMode, TestPointCount,
-                           TestPoints);
+            [](DlOpReceiver& r) {
+              r.drawPoints(DlCanvas::PointMode::kPoints, TestPointCount,
+                           kTestPoints);
             }},
            {1, 8 + (TestPointCount - 1) * 8, 1, 8 + (TestPointCount - 1) * 8,
-            [](DisplayListBuilder& b) {
-              b.drawPoints(SkCanvas::kPoints_PointMode, TestPointCount - 1,
-                           TestPoints);
+            [](DlOpReceiver& r) {
+              r.drawPoints(DlCanvas::PointMode::kPoints, TestPointCount - 1,
+                           kTestPoints);
             }},
            {1, 8 + TestPointCount * 8, 1, 8 + TestPointCount * 8,
-            [](DisplayListBuilder& b) {
-              b.drawPoints(SkCanvas::kLines_PointMode, TestPointCount,
-                           TestPoints);
+            [](DlOpReceiver& r) {
+              r.drawPoints(DlCanvas::PointMode::kLines, TestPointCount,
+                           kTestPoints);
             }},
            {1, 8 + TestPointCount * 8, 1, 8 + TestPointCount * 8,
-            [](DisplayListBuilder& b) {
-              b.drawPoints(SkCanvas::kPolygon_PointMode, TestPointCount,
-                           TestPoints);
+            [](DlOpReceiver& r) {
+              r.drawPoints(DlCanvas::PointMode::kPolygon, TestPointCount,
+                           kTestPoints);
             }},
        }},
       {"DrawVertices",
        {
            {1, 112, 1, 16,
-            [](DisplayListBuilder& b) {
-              b.drawVertices(TestVertices1, DlBlendMode::kSrcIn);
+            [](DlOpReceiver& r) {
+              r.drawVertices(TestVertices1.get(), DlBlendMode::kSrcIn);
             }},
            {1, 112, 1, 16,
-            [](DisplayListBuilder& b) {
-              b.drawVertices(TestVertices1, DlBlendMode::kDstIn);
+            [](DlOpReceiver& r) {
+              r.drawVertices(TestVertices1.get(), DlBlendMode::kDstIn);
             }},
            {1, 112, 1, 16,
-            [](DisplayListBuilder& b) {
-              b.drawVertices(TestVertices2, DlBlendMode::kSrcIn);
+            [](DlOpReceiver& r) {
+              r.drawVertices(TestVertices2.get(), DlBlendMode::kSrcIn);
             }},
        }},
       {"DrawImage",
        {
            {1, 24, -1, 48,
-            [](DisplayListBuilder& b) {
-              b.drawImage(TestImage1, {10, 10}, kNearestSampling, false);
+            [](DlOpReceiver& r) {
+              r.drawImage(TestImage1, {10, 10}, kNearestSampling, false);
+            }},
+           {1, 24, -1, 48,
+            [](DlOpReceiver& r) {
+              r.drawImage(TestImage1, {10, 10}, kNearestSampling, true);
             }},
            {1, 24, -1, 48,
-            [](DisplayListBuilder& b) {
-              b.drawImage(TestImage1, {10, 10}, kNearestSampling, true);
+            [](DlOpReceiver& r) {
+              r.drawImage(TestImage1, {20, 10}, kNearestSampling, false);
             }},
            {1, 24, -1, 48,
-            [](DisplayListBuilder& b) {
-              b.drawImage(TestImage1, {20, 10}, kNearestSampling, false);
+            [](DlOpReceiver& r) {
+              r.drawImage(TestImage1, {10, 20}, kNearestSampling, false);
             }},
            {1, 24, -1, 48,
-            [](DisplayListBuilder& b) {
-              b.drawImage(TestImage1, {10, 20}, kNearestSampling, false);
+            [](DlOpReceiver& r) {
+              r.drawImage(TestImage1, {10, 10}, kLinearSampling, false);
             }},
            {1, 24, -1, 48,
-            [](DisplayListBuilder& b) {
-              b.drawImage(TestImage1, {10, 10}, kLinearSampling, false);
+            [](DlOpReceiver& r) {
+              r.drawImage(TestImage2, {10, 10}, kNearestSampling, false);
             }},
            {1, 24, -1, 48,
-            [](DisplayListBuilder& b) {
-              b.drawImage(TestImage2, {10, 10}, kNearestSampling, false);
+            [](DlOpReceiver& r) {
+              auto dl_image = DlImage::Make(TestSkImage);
+              r.drawImage(dl_image, {10, 10}, kNearestSampling, false);
             }},
        }},
       {"DrawImageRect",
        {
            {1, 56, -1, 80,
-            [](DisplayListBuilder& b) {
-              b.drawImageRect(TestImage1, {10, 10, 20, 20}, {10, 10, 80, 80},
-                              kNearestSampling, false);
+            [](DlOpReceiver& r) {
+              r.drawImageRect(TestImage1, {10, 10, 20, 20}, {10, 10, 80, 80},
+                              kNearestSampling, false,
+                              DlCanvas::SrcRectConstraint::kFast);
             }},
            {1, 56, -1, 80,
-            [](DisplayListBuilder& b) {
-              b.drawImageRect(TestImage1, {10, 10, 20, 20}, {10, 10, 80, 80},
-                              kNearestSampling, true);
+            [](DlOpReceiver& r) {
+              r.drawImageRect(TestImage1, {10, 10, 20, 20}, {10, 10, 80, 80},
+                              kNearestSampling, true,
+                              DlCanvas::SrcRectConstraint::kFast);
             }},
            {1, 56, -1, 80,
-            [](DisplayListBuilder& b) {
-              b.drawImageRect(
-                  TestImage1, {10, 10, 20, 20}, {10, 10, 80, 80},
-                  kNearestSampling, false,
-                  SkCanvas::SrcRectConstraint::kStrict_SrcRectConstraint);
+            [](DlOpReceiver& r) {
+              r.drawImageRect(TestImage1, {10, 10, 20, 20}, {10, 10, 80, 80},
+                              kNearestSampling, false,
+                              DlCanvas::SrcRectConstraint::kStrict);
             }},
            {1, 56, -1, 80,
-            [](DisplayListBuilder& b) {
-              b.drawImageRect(TestImage1, {10, 10, 25, 20}, {10, 10, 80, 80},
-                              kNearestSampling, false);
+            [](DlOpReceiver& r) {
+              r.drawImageRect(TestImage1, {10, 10, 25, 20}, {10, 10, 80, 80},
+                              kNearestSampling, false,
+                              DlCanvas::SrcRectConstraint::kFast);
             }},
            {1, 56, -1, 80,
-            [](DisplayListBuilder& b) {
-              b.drawImageRect(TestImage1, {10, 10, 20, 20}, {10, 10, 85, 80},
-                              kNearestSampling, false);
+            [](DlOpReceiver& r) {
+              r.drawImageRect(TestImage1, {10, 10, 20, 20}, {10, 10, 85, 80},
+                              kNearestSampling, false,
+                              DlCanvas::SrcRectConstraint::kFast);
             }},
            {1, 56, -1, 80,
-            [](DisplayListBuilder& b) {
-              b.drawImageRect(TestImage1, {10, 10, 20, 20}, {10, 10, 80, 80},
-                              kLinearSampling, false);
+            [](DlOpReceiver& r) {
+              r.drawImageRect(TestImage1, {10, 10, 20, 20}, {10, 10, 80, 80},
+                              kLinearSampling, false,
+                              DlCanvas::SrcRectConstraint::kFast);
             }},
            {1, 56, -1, 80,
-            [](DisplayListBuilder& b) {
-              b.drawImageRect(TestImage2, {10, 10, 15, 15}, {10, 10, 80, 80},
-                              kNearestSampling, false);
+            [](DlOpReceiver& r) {
+              r.drawImageRect(TestImage2, {10, 10, 15, 15}, {10, 10, 80, 80},
+                              kNearestSampling, false,
+                              DlCanvas::SrcRectConstraint::kFast);
+            }},
+           {1, 56, -1, 80,
+            [](DlOpReceiver& r) {
+              auto dl_image = DlImage::Make(TestSkImage);
+              r.drawImageRect(dl_image, {10, 10, 15, 15}, {10, 10, 80, 80},
+                              kNearestSampling, false,
+                              DlCanvas::SrcRectConstraint::kFast);
             }},
        }},
       {"DrawImageNine",
        {
-           // SkVanvas::drawImageNine is immediately converted to
+           // SkCanvas::drawImageNine is immediately converted to
            // drawImageLattice
            {1, 48, -1, 80,
-            [](DisplayListBuilder& b) {
-              b.drawImageNine(TestImage1, {10, 10, 20, 20}, {10, 10, 80, 80},
+            [](DlOpReceiver& r) {
+              r.drawImageNine(TestImage1, {10, 10, 20, 20}, {10, 10, 80, 80},
                               DlFilterMode::kNearest, false);
             }},
            {1, 48, -1, 80,
-            [](DisplayListBuilder& b) {
-              b.drawImageNine(TestImage1, {10, 10, 20, 20}, {10, 10, 80, 80},
+            [](DlOpReceiver& r) {
+              r.drawImageNine(TestImage1, {10, 10, 20, 20}, {10, 10, 80, 80},
                               DlFilterMode::kNearest, true);
             }},
            {1, 48, -1, 80,
-            [](DisplayListBuilder& b) {
-              b.drawImageNine(TestImage1, {10, 10, 25, 20}, {10, 10, 80, 80},
+            [](DlOpReceiver& r) {
+              r.drawImageNine(TestImage1, {10, 10, 25, 20}, {10, 10, 80, 80},
                               DlFilterMode::kNearest, false);
             }},
            {1, 48, -1, 80,
-            [](DisplayListBuilder& b) {
-              b.drawImageNine(TestImage1, {10, 10, 20, 20}, {10, 10, 85, 80},
+            [](DlOpReceiver& r) {
+              r.drawImageNine(TestImage1, {10, 10, 20, 20}, {10, 10, 85, 80},
                               DlFilterMode::kNearest, false);
             }},
            {1, 48, -1, 80,
-            [](DisplayListBuilder& b) {
-              b.drawImageNine(TestImage1, {10, 10, 20, 20}, {10, 10, 80, 80},
+            [](DlOpReceiver& r) {
+              r.drawImageNine(TestImage1, {10, 10, 20, 20}, {10, 10, 80, 80},
                               DlFilterMode::kLinear, false);
             }},
            {1, 48, -1, 80,
-            [](DisplayListBuilder& b) {
-              b.drawImageNine(TestImage2, {10, 10, 15, 15}, {10, 10, 80, 80},
+            [](DlOpReceiver& r) {
+              r.drawImageNine(TestImage2, {10, 10, 15, 15}, {10, 10, 80, 80},
                               DlFilterMode::kNearest, false);
             }},
-       }},
-      {"DrawImageLattice",
-       {
-           // Lattice:
-           // const int*      fXDivs;     //!< x-axis values dividing bitmap
-           // const int*      fYDivs;     //!< y-axis values dividing bitmap
-           // const RectType* fRectTypes; //!< array of fill types
-           // int             fXCount;    //!< number of x-coordinates
-           // int             fYCount;    //!< number of y-coordinates
-           // const SkIRect*  fBounds;    //!< source bounds to draw from
-           // const SkColor*  fColors;    //!< array of colors
-           // size = 64 + fXCount * 4 + fYCount * 4
-           // if fColors and fRectTypes are not null, add (fXCount + 1) *
-           // (fYCount + 1) * 5
-           {1, 88, -1, 88,
-            [](DisplayListBuilder& b) {
-              b.drawImageLattice(
-                  TestImage1,
-                  {kTestDivs1, kTestDivs1, nullptr, 3, 3, nullptr, nullptr},
-                  {10, 10, 40, 40}, DlFilterMode::kNearest, false);
-            }},
-           {1, 88, -1, 88,
-            [](DisplayListBuilder& b) {
-              b.drawImageLattice(
-                  TestImage1,
-                  {kTestDivs1, kTestDivs1, nullptr, 3, 3, nullptr, nullptr},
-                  {10, 10, 40, 45}, DlFilterMode::kNearest, false);
-            }},
-           {1, 88, -1, 88,
-            [](DisplayListBuilder& b) {
-              b.drawImageLattice(
-                  TestImage1,
-                  {kTestDivs2, kTestDivs1, nullptr, 3, 3, nullptr, nullptr},
-                  {10, 10, 40, 40}, DlFilterMode::kNearest, false);
-            }},
-           // One less yDiv does not change the allocation due to 8-byte
-           // alignment
-           {1, 88, -1, 88,
-            [](DisplayListBuilder& b) {
-              b.drawImageLattice(
-                  TestImage1,
-                  {kTestDivs1, kTestDivs1, nullptr, 3, 2, nullptr, nullptr},
-                  {10, 10, 40, 40}, DlFilterMode::kNearest, false);
-            }},
-           {1, 88, -1, 88,
-            [](DisplayListBuilder& b) {
-              b.drawImageLattice(
-                  TestImage1,
-                  {kTestDivs1, kTestDivs1, nullptr, 3, 3, nullptr, nullptr},
-                  {10, 10, 40, 40}, DlFilterMode::kLinear, false);
-            }},
-           {1, 96, -1, 96,
-            [](DisplayListBuilder& b) {
-              b.setColor(SK_ColorMAGENTA);
-              b.drawImageLattice(
-                  TestImage1,
-                  {kTestDivs1, kTestDivs1, nullptr, 3, 3, nullptr, nullptr},
-                  {10, 10, 40, 40}, DlFilterMode::kNearest, true);
-            }},
-           {1, 88, -1, 88,
-            [](DisplayListBuilder& b) {
-              b.drawImageLattice(
-                  TestImage2,
-                  {kTestDivs1, kTestDivs1, nullptr, 3, 3, nullptr, nullptr},
-                  {10, 10, 40, 40}, DlFilterMode::kNearest, false);
-            }},
-           // Supplying fBounds does not change size because the Op record
-           // always includes it
-           {1, 88, -1, 88,
-            [](DisplayListBuilder& b) {
-              b.drawImageLattice(TestImage1,
-                                 {kTestDivs1, kTestDivs1, nullptr, 3, 3,
-                                  &kTestLatticeSrcRect, nullptr},
-                                 {10, 10, 40, 40}, DlFilterMode::kNearest,
-                                 false);
-            }},
-           {1, 128, -1, 128,
-            [](DisplayListBuilder& b) {
-              b.drawImageLattice(TestImage1,
-                                 {kTestDivs3, kTestDivs3, kTestRTypes, 2, 2,
-                                  nullptr, kTestLatticeColors},
-                                 {10, 10, 40, 40}, DlFilterMode::kNearest,
-                                 false);
+           {1, 48, -1, 80,
+            [](DlOpReceiver& r) {
+              auto dl_image = DlImage::Make(TestSkImage);
+              r.drawImageNine(dl_image, {10, 10, 15, 15}, {10, 10, 80, 80},
+                              DlFilterMode::kNearest, false);
             }},
        }},
       {"DrawAtlas",
        {
            {1, 48 + 32 + 8, -1, 48 + 32 + 32,
-            [](DisplayListBuilder& b) {
+            [](DlOpReceiver& r) {
               static SkRSXform xforms[] = {{1, 0, 0, 0}, {0, 1, 0, 0}};
               static SkRect texs[] = {{10, 10, 20, 20}, {20, 20, 30, 30}};
-              b.drawAtlas(TestImage1, xforms, texs, nullptr, 2,
+              r.drawAtlas(TestImage1, xforms, texs, nullptr, 2,
                           DlBlendMode::kSrcIn, kNearestSampling, nullptr,
                           false);
             }},
            {1, 48 + 32 + 8, -1, 48 + 32 + 32,
-            [](DisplayListBuilder& b) {
+            [](DlOpReceiver& r) {
               static SkRSXform xforms[] = {{1, 0, 0, 0}, {0, 1, 0, 0}};
               static SkRect texs[] = {{10, 10, 20, 20}, {20, 20, 30, 30}};
-              b.drawAtlas(TestImage1, xforms, texs, nullptr, 2,
+              r.drawAtlas(TestImage1, xforms, texs, nullptr, 2,
                           DlBlendMode::kSrcIn, kNearestSampling, nullptr, true);
             }},
            {1, 48 + 32 + 8, -1, 48 + 32 + 32,
-            [](DisplayListBuilder& b) {
+            [](DlOpReceiver& r) {
               static SkRSXform xforms[] = {{0, 1, 0, 0}, {0, 1, 0, 0}};
               static SkRect texs[] = {{10, 10, 20, 20}, {20, 20, 30, 30}};
-              b.drawAtlas(TestImage1, xforms, texs, nullptr, 2,
+              r.drawAtlas(TestImage1, xforms, texs, nullptr, 2,
                           DlBlendMode::kSrcIn, kNearestSampling, nullptr,
                           false);
             }},
            {1, 48 + 32 + 8, -1, 48 + 32 + 32,
-            [](DisplayListBuilder& b) {
+            [](DlOpReceiver& r) {
               static SkRSXform xforms[] = {{1, 0, 0, 0}, {0, 1, 0, 0}};
               static SkRect texs[] = {{10, 10, 20, 20}, {20, 25, 30, 30}};
-              b.drawAtlas(TestImage1, xforms, texs, nullptr, 2,
+              r.drawAtlas(TestImage1, xforms, texs, nullptr, 2,
                           DlBlendMode::kSrcIn, kNearestSampling, nullptr,
                           false);
             }},
            {1, 48 + 32 + 8, -1, 48 + 32 + 32,
-            [](DisplayListBuilder& b) {
+            [](DlOpReceiver& r) {
               static SkRSXform xforms[] = {{1, 0, 0, 0}, {0, 1, 0, 0}};
               static SkRect texs[] = {{10, 10, 20, 20}, {20, 20, 30, 30}};
-              b.drawAtlas(TestImage1, xforms, texs, nullptr, 2,
+              r.drawAtlas(TestImage1, xforms, texs, nullptr, 2,
                           DlBlendMode::kSrcIn, kLinearSampling, nullptr, false);
             }},
            {1, 48 + 32 + 8, -1, 48 + 32 + 32,
-            [](DisplayListBuilder& b) {
+            [](DlOpReceiver& r) {
               static SkRSXform xforms[] = {{1, 0, 0, 0}, {0, 1, 0, 0}};
               static SkRect texs[] = {{10, 10, 20, 20}, {20, 20, 30, 30}};
-              b.drawAtlas(TestImage1, xforms, texs, nullptr, 2,
+              r.drawAtlas(TestImage1, xforms, texs, nullptr, 2,
                           DlBlendMode::kDstIn, kNearestSampling, nullptr,
                           false);
             }},
            {1, 64 + 32 + 8, -1, 64 + 32 + 32,
-            [](DisplayListBuilder& b) {
+            [](DlOpReceiver& r) {
               static SkRSXform xforms[] = {{1, 0, 0, 0}, {0, 1, 0, 0}};
               static SkRect texs[] = {{10, 10, 20, 20}, {20, 20, 30, 30}};
               static SkRect cull_rect = {0, 0, 200, 200};
-              b.drawAtlas(TestImage2, xforms, texs, nullptr, 2,
+              r.drawAtlas(TestImage2, xforms, texs, nullptr, 2,
                           DlBlendMode::kSrcIn, kNearestSampling, &cull_rect,
                           false);
             }},
            {1, 48 + 32 + 8 + 8, -1, 48 + 32 + 32 + 8,
-            [](DisplayListBuilder& b) {
+            [](DlOpReceiver& r) {
               static SkRSXform xforms[] = {{1, 0, 0, 0}, {0, 1, 0, 0}};
               static SkRect texs[] = {{10, 10, 20, 20}, {20, 20, 30, 30}};
               static DlColor colors[] = {DlColor::kBlue(), DlColor::kGreen()};
-              b.drawAtlas(TestImage1, xforms, texs, colors, 2,
+              r.drawAtlas(TestImage1, xforms, texs, colors, 2,
                           DlBlendMode::kSrcIn, kNearestSampling, nullptr,
                           false);
             }},
            {1, 64 + 32 + 8 + 8, -1, 64 + 32 + 32 + 8,
-            [](DisplayListBuilder& b) {
+            [](DlOpReceiver& r) {
               static SkRSXform xforms[] = {{1, 0, 0, 0}, {0, 1, 0, 0}};
               static SkRect texs[] = {{10, 10, 20, 20}, {20, 20, 30, 30}};
               static DlColor colors[] = {DlColor::kBlue(), DlColor::kGreen()};
               static SkRect cull_rect = {0, 0, 200, 200};
-              b.drawAtlas(TestImage1, xforms, texs, colors, 2,
+              r.drawAtlas(TestImage1, xforms, texs, colors, 2,
                           DlBlendMode::kSrcIn, kNearestSampling, &cull_rect,
                           false);
             }},
-       }},
-      {"DrawPicture",
-       {
-           // cv.drawPicture cannot be compared as SkCanvas may inline it
-           {1, 16, -1, 16,
-            [](DisplayListBuilder& b) {
-              b.drawPicture(TestPicture1, nullptr, false);
-            }},
-           {1, 16, -1, 16,
-            [](DisplayListBuilder& b) {
-              b.drawPicture(TestPicture2, nullptr, false);
-            }},
-           {1, 16, -1, 16,
-            [](DisplayListBuilder& b) {
-              b.drawPicture(TestPicture1, nullptr, true);
-            }},
-           {1, 56, -1, 56,
-            [](DisplayListBuilder& b) {
-              b.drawPicture(TestPicture1, &kTestMatrix1, false);
-            }},
-           {1, 56, -1, 56,
-            [](DisplayListBuilder& b) {
-              b.drawPicture(TestPicture1, &kTestMatrix2, false);
-            }},
-           {1, 56, -1, 56,
-            [](DisplayListBuilder& b) {
-              b.drawPicture(TestPicture1, &kTestMatrix1, true);
+           {1, 48 + 32 + 8, -1, 48 + 32 + 32,
+            [](DlOpReceiver& r) {
+              auto dl_image = DlImage::Make(TestSkImage);
+              static SkRSXform xforms[] = {{1, 0, 0, 0}, {0, 1, 0, 0}};
+              static SkRect texs[] = {{10, 10, 20, 20}, {20, 20, 30, 30}};
+              r.drawAtlas(dl_image, xforms, texs, nullptr, 2,
+                          DlBlendMode::kSrcIn, kNearestSampling, nullptr,
+                          false);
             }},
        }},
       {"DrawDisplayList",
        {
            // cv.drawDL does not exist
            {1, 16, -1, 16,
-            [](DisplayListBuilder& b) { b.drawDisplayList(TestDisplayList1); }},
+            [](DlOpReceiver& r) { r.drawDisplayList(TestDisplayList1, 1.0); }},
+           {1, 16, -1, 16,
+            [](DlOpReceiver& r) { r.drawDisplayList(TestDisplayList1, 0.5); }},
            {1, 16, -1, 16,
-            [](DisplayListBuilder& b) { b.drawDisplayList(TestDisplayList2); }},
+            [](DlOpReceiver& r) { r.drawDisplayList(TestDisplayList2, 1.0); }},
+           {1, 16, -1, 16,
+            [](DlOpReceiver& r) {
+              r.drawDisplayList(MakeTestDisplayList(10, 10, SK_ColorRED), 1.0);
+            }},
        }},
       {"DrawTextBlob",
        {
            {1, 24, 1, 24,
-            [](DisplayListBuilder& b) { b.drawTextBlob(TestBlob1, 10, 10); }},
+            [](DlOpReceiver& r) {
+              r.drawTextBlob(GetTestTextBlob(1), 10, 10);
+            }},
            {1, 24, 1, 24,
-            [](DisplayListBuilder& b) { b.drawTextBlob(TestBlob1, 20, 10); }},
+            [](DlOpReceiver& r) {
+              r.drawTextBlob(GetTestTextBlob(1), 20, 10);
+            }},
            {1, 24, 1, 24,
-            [](DisplayListBuilder& b) { b.drawTextBlob(TestBlob1, 10, 20); }},
+            [](DlOpReceiver& r) {
+              r.drawTextBlob(GetTestTextBlob(1), 10, 20);
+            }},
            {1, 24, 1, 24,
-            [](DisplayListBuilder& b) { b.drawTextBlob(TestBlob2, 10, 10); }},
+            [](DlOpReceiver& r) {
+              r.drawTextBlob(GetTestTextBlob(2), 10, 10);
+            }},
        }},
       // The -1 op counts below are to indicate to the framework not to test
       // SkCanvas conversion of these ops as it converts the operation into a
@@ -1069,29 +929,29 @@ std::vector<DisplayListInvocationGroup> CreateAllRenderingOps() {
        {
            // cv shadows are turned into an opaque ShadowRec which is not
            // exposed
-           {1, 32, -1, 32,
-            [](DisplayListBuilder& b) {
-              b.drawShadow(kTestPath1, SK_ColorGREEN, 1.0, false, 1.0);
+           {1, 48, -1, 48,
+            [](DlOpReceiver& r) {
+              r.drawShadow(kTestPath1, DlColor(SK_ColorGREEN), 1.0, false, 1.0);
             }},
-           {1, 32, -1, 32,
-            [](DisplayListBuilder& b) {
-              b.drawShadow(kTestPath2, SK_ColorGREEN, 1.0, false, 1.0);
+           {1, 48, -1, 48,
+            [](DlOpReceiver& r) {
+              r.drawShadow(kTestPath2, DlColor(SK_ColorGREEN), 1.0, false, 1.0);
             }},
-           {1, 32, -1, 32,
-            [](DisplayListBuilder& b) {
-              b.drawShadow(kTestPath1, SK_ColorBLUE, 1.0, false, 1.0);
+           {1, 48, -1, 48,
+            [](DlOpReceiver& r) {
+              r.drawShadow(kTestPath1, DlColor(SK_ColorBLUE), 1.0, false, 1.0);
             }},
-           {1, 32, -1, 32,
-            [](DisplayListBuilder& b) {
-              b.drawShadow(kTestPath1, SK_ColorGREEN, 2.0, false, 1.0);
+           {1, 48, -1, 48,
+            [](DlOpReceiver& r) {
+              r.drawShadow(kTestPath1, DlColor(SK_ColorGREEN), 2.0, false, 1.0);
             }},
-           {1, 32, -1, 32,
-            [](DisplayListBuilder& b) {
-              b.drawShadow(kTestPath1, SK_ColorGREEN, 1.0, true, 1.0);
+           {1, 48, -1, 48,
+            [](DlOpReceiver& r) {
+              r.drawShadow(kTestPath1, DlColor(SK_ColorGREEN), 1.0, true, 1.0);
             }},
-           {1, 32, -1, 32,
-            [](DisplayListBuilder& b) {
-              b.drawShadow(kTestPath1, SK_ColorGREEN, 1.0, false, 2.5);
+           {1, 48, -1, 48,
+            [](DlOpReceiver& r) {
+              r.drawShadow(kTestPath1, DlColor(SK_ColorGREEN), 1.0, false, 2.5);
             }},
        }},
   };
@@ -1117,5 +977,26 @@ std::vector<DisplayListInvocationGroup> CreateAllGroups() {
   return result;
 }
 
+SkFont CreateTestFontOfSize(SkScalar scalar) {
+  static constexpr const char* kTestFontFixture = "Roboto-Regular.ttf";
+  auto mapping = flutter::testing::OpenFixtureAsSkData(kTestFontFixture);
+  FML_CHECK(mapping);
+  return SkFont{txt::GetDefaultFontManager()->makeFromData(mapping), scalar};
+}
+
+sk_sp<SkTextBlob> GetTestTextBlob(int index) {
+  static std::map<int, sk_sp<SkTextBlob>> text_blobs;
+  auto it = text_blobs.find(index);
+  if (it != text_blobs.end()) {
+    return it->second;
+  }
+  std::string text = "TestBlob" + std::to_string(index);
+  sk_sp<SkTextBlob> blob =
+      SkTextBlob::MakeFromText(text.c_str(), text.size(),
+                               CreateTestFontOfSize(20), SkTextEncoding::kUTF8);
+  text_blobs.insert(std::make_pair(index, blob));
+  return blob;
+}
+
 }  // namespace testing
 }  // namespace flutter
diff --git a/display_list/display_list_test_utils.h b/display_list/testing/dl_test_snippets.h
similarity index 67%
rename from display_list/display_list_test_utils.h
rename to display_list/testing/dl_test_snippets.h
index 711b7182a5815b50858ead9a796bd47d4e6a3af6..aa3bf23619a838cbcc231ec71f5c4bf28e0347e1 100644
--- a/display_list/display_list_test_utils.h
+++ b/display_list/testing/dl_test_snippets.h
@@ -2,16 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLOW_DISPLAY_LIST_COMPLEXITY_UNITTESTS_H_
-#define FLUTTER_FLOW_DISPLAY_LIST_COMPLEXITY_UNITTESTS_H_
+#ifndef FLUTTER_DISPLAY_LIST_TESTING_DL_TEST_SNIPPETS_H_
+#define FLUTTER_DISPLAY_LIST_TESTING_DL_TEST_SNIPPETS_H_
 
 #include "flutter/display_list/display_list.h"
-#include "flutter/display_list/display_list_builder.h"
+#include "flutter/display_list/dl_builder.h"
+#include "flutter/testing/testing.h"
 
-#include "third_party/skia/include/core/SkPicture.h"
-#include "third_party/skia/include/core/SkPictureRecorder.h"
+#include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkSurface.h"
-#include "third_party/skia/include/effects/SkBlenders.h"
 #include "third_party/skia/include/effects/SkDashPathEffect.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "third_party/skia/include/effects/SkImageFilters.h"
@@ -23,7 +22,7 @@ sk_sp<DisplayList> GetSampleDisplayList();
 sk_sp<DisplayList> GetSampleDisplayList(int ops);
 sk_sp<DisplayList> GetSampleNestedDisplayList();
 
-typedef const std::function<void(DisplayListBuilder&)> DlInvoker;
+typedef const std::function<void(DlOpReceiver&)> DlInvoker;
 
 constexpr SkPoint kEndPoints[] = {
     {0, 0},
@@ -39,8 +38,6 @@ constexpr float kStops[] = {
     0.5,
     1.0,
 };
-static std::vector<uint32_t> color_vector(kColors, kColors + 3);
-static std::vector<float> stops_vector(kStops, kStops + 3);
 
 // clang-format off
 constexpr float kRotateColorMatrix[20] = {
@@ -60,19 +57,20 @@ constexpr float kInvertColorMatrix[20] = {
 const SkScalar kTestDashes1[] = {4.0, 2.0};
 const SkScalar kTestDashes2[] = {1.0, 1.5};
 
-constexpr SkPoint TestPoints[] = {
+constexpr SkPoint kTestPoints[] = {
     {10, 10},
     {20, 20},
     {10, 20},
     {20, 10},
 };
-#define TestPointCount sizeof(TestPoints) / (sizeof(TestPoints[0]))
+#define TestPointCount sizeof(kTestPoints) / (sizeof(kTestPoints[0]))
 
 static DlImageSampling kNearestSampling = DlImageSampling::kNearestNeighbor;
 static DlImageSampling kLinearSampling = DlImageSampling::kLinear;
 
 static sk_sp<DlImage> MakeTestImage(int w, int h, int checker_size) {
-  sk_sp<SkSurface> surface = SkSurface::MakeRasterN32Premul(w, h);
+  sk_sp<SkSurface> surface =
+      SkSurfaces::Raster(SkImageInfo::MakeN32Premul(w, h));
   SkCanvas* canvas = surface->getCanvas();
   SkPaint p0, p1;
   p0.setStyle(SkPaint::kFill_Style);
@@ -92,13 +90,8 @@ static sk_sp<DlImage> MakeTestImage(int w, int h, int checker_size) {
 
 static auto TestImage1 = MakeTestImage(40, 40, 5);
 static auto TestImage2 = MakeTestImage(50, 50, 5);
+static auto TestSkImage = MakeTestImage(30, 30, 5)->skia_image();
 
-static const sk_sp<SkBlender> kTestBlender1 =
-    SkBlenders::Arithmetic(0.2, 0.2, 0.2, 0.2, false);
-static const sk_sp<SkBlender> kTestBlender2 =
-    SkBlenders::Arithmetic(0.2, 0.2, 0.2, 0.2, true);
-static const sk_sp<SkBlender> kTestBlender3 =
-    SkBlenders::Arithmetic(0.3, 0.3, 0.3, 0.3, true);
 static const DlImageColorSource kTestSource1(TestImage1,
                                              DlTileMode::kClamp,
                                              DlTileMode::kMirror,
@@ -157,9 +150,9 @@ static const DlBlurImageFilter kTestBlurImageFilter4(5.0,
 static const DlDilateImageFilter kTestDilateImageFilter1(5.0, 5.0);
 static const DlDilateImageFilter kTestDilateImageFilter2(6.0, 5.0);
 static const DlDilateImageFilter kTestDilateImageFilter3(5.0, 6.0);
-static const DlErodeImageFilter kTestErodeImageFilter1(5.0, 5.0);
-static const DlErodeImageFilter kTestErodeImageFilter2(6.0, 5.0);
-static const DlErodeImageFilter kTestErodeImageFilter3(5.0, 6.0);
+static const DlErodeImageFilter kTestErodeImageFilter1(4.0, 4.0);
+static const DlErodeImageFilter kTestErodeImageFilter2(4.0, 3.0);
+static const DlErodeImageFilter kTestErodeImageFilter3(3.0, 4.0);
 static const DlMatrixImageFilter kTestMatrixImageFilter1(
     SkMatrix::RotateDeg(45),
     kNearestSampling);
@@ -186,11 +179,11 @@ static const std::shared_ptr<DlPathEffect> kTestPathEffect1 =
     DlDashPathEffect::Make(kTestDashes1, 2, 0.0f);
 static const std::shared_ptr<DlPathEffect> kTestPathEffect2 =
     DlDashPathEffect::Make(kTestDashes2, 2, 0.0f);
-static const DlBlurMaskFilter kTestMaskFilter1(kNormal_SkBlurStyle, 3.0);
-static const DlBlurMaskFilter kTestMaskFilter2(kNormal_SkBlurStyle, 5.0);
-static const DlBlurMaskFilter kTestMaskFilter3(kSolid_SkBlurStyle, 3.0);
-static const DlBlurMaskFilter kTestMaskFilter4(kInner_SkBlurStyle, 3.0);
-static const DlBlurMaskFilter kTestMaskFilter5(kOuter_SkBlurStyle, 3.0);
+static const DlBlurMaskFilter kTestMaskFilter1(DlBlurStyle::kNormal, 3.0);
+static const DlBlurMaskFilter kTestMaskFilter2(DlBlurStyle::kNormal, 5.0);
+static const DlBlurMaskFilter kTestMaskFilter3(DlBlurStyle::kSolid, 3.0);
+static const DlBlurMaskFilter kTestMaskFilter4(DlBlurStyle::kInner, 3.0);
+static const DlBlurMaskFilter kTestMaskFilter5(DlBlurStyle::kOuter, 3.0);
 constexpr SkRect kTestBounds = SkRect::MakeLTRB(10, 10, 50, 60);
 static const SkRRect kTestRRect = SkRRect::MakeRectXY(kTestBounds, 5, 5);
 static const SkRRect kTestRRectRect = SkRRect::MakeRect(kTestBounds);
@@ -210,54 +203,19 @@ static const SkMatrix kTestMatrix2 = SkMatrix::RotateDeg(45);
 static std::shared_ptr<const DlVertices> TestVertices1 =
     DlVertices::Make(DlVertexMode::kTriangles,  //
                      3,
-                     TestPoints,
+                     kTestPoints,
                      nullptr,
                      kColors);
 static std::shared_ptr<const DlVertices> TestVertices2 =
     DlVertices::Make(DlVertexMode::kTriangleFan,  //
                      3,
-                     TestPoints,
+                     kTestPoints,
                      nullptr,
                      kColors);
 
-static constexpr int kTestDivs1[] = {10, 20, 30};
-static constexpr int kTestDivs2[] = {15, 20, 25};
-static constexpr int kTestDivs3[] = {15, 25};
-static constexpr SkCanvas::Lattice::RectType kTestRTypes[] = {
-    SkCanvas::Lattice::RectType::kDefault,
-    SkCanvas::Lattice::RectType::kTransparent,
-    SkCanvas::Lattice::RectType::kFixedColor,
-    SkCanvas::Lattice::RectType::kDefault,
-    SkCanvas::Lattice::RectType::kTransparent,
-    SkCanvas::Lattice::RectType::kFixedColor,
-    SkCanvas::Lattice::RectType::kDefault,
-    SkCanvas::Lattice::RectType::kTransparent,
-    SkCanvas::Lattice::RectType::kFixedColor,
-};
-static constexpr SkColor kTestLatticeColors[] = {
-    SK_ColorBLUE, SK_ColorGREEN, SK_ColorYELLOW,
-    SK_ColorBLUE, SK_ColorGREEN, SK_ColorYELLOW,
-    SK_ColorBLUE, SK_ColorGREEN, SK_ColorYELLOW,
-};
-static constexpr SkIRect kTestLatticeSrcRect = {1, 1, 39, 39};
-
-static sk_sp<SkPicture> MakeTestPicture(int w, int h, SkColor color) {
-  SkPictureRecorder recorder;
-  SkRTreeFactory rtree_factory;
-  SkCanvas* cv = recorder.beginRecording(kTestBounds, &rtree_factory);
-  SkPaint paint;
-  paint.setColor(color);
-  paint.setStyle(SkPaint::kFill_Style);
-  cv->drawRect(SkRect::MakeWH(w, h), paint);
-  return recorder.finishRecordingAsPicture();
-}
-static sk_sp<SkPicture> TestPicture1 = MakeTestPicture(20, 20, SK_ColorGREEN);
-static sk_sp<SkPicture> TestPicture2 = MakeTestPicture(25, 25, SK_ColorBLUE);
-
 static sk_sp<DisplayList> MakeTestDisplayList(int w, int h, SkColor color) {
   DisplayListBuilder builder;
-  builder.setColor(color);
-  builder.drawRect(SkRect::MakeWH(w, h));
+  builder.DrawRect(SkRect::MakeWH(w, h), DlPaint(DlColor(color)));
   return builder.Build();
 }
 static sk_sp<DisplayList> TestDisplayList1 =
@@ -265,12 +223,9 @@ static sk_sp<DisplayList> TestDisplayList1 =
 static sk_sp<DisplayList> TestDisplayList2 =
     MakeTestDisplayList(25, 25, SK_ColorBLUE);
 
-static sk_sp<SkTextBlob> MakeTextBlob(std::string string) {
-  return SkTextBlob::MakeFromText(string.c_str(), string.size(), SkFont(),
-                                  SkTextEncoding::kUTF8);
-}
-static sk_sp<SkTextBlob> TestBlob1 = MakeTextBlob("TestBlob1");
-static sk_sp<SkTextBlob> TestBlob2 = MakeTextBlob("TestBlob2");
+SkFont CreateTestFontOfSize(SkScalar scalar);
+
+sk_sp<SkTextBlob> GetTestTextBlob(int index);
 
 struct DisplayListInvocation {
   unsigned int op_count_;
@@ -285,18 +240,6 @@ struct DisplayListInvocation {
   DlInvoker invoker;
   bool supports_group_opacity_ = false;
 
-  bool sk_version_matches() {
-    return (static_cast<int>(op_count_) == sk_op_count_ &&
-            byte_count_ == sk_byte_count_);
-  }
-
-  // A negative sk_op_count means "do not test this op".
-  // Used mainly for these cases:
-  // - we cannot encode a DrawShadowRec (Skia private header)
-  // - SkCanvas cannot receive a DisplayList
-  // - SkCanvas may or may not inline an SkPicture
-  bool sk_testing_invalid() { return sk_op_count_ < 0; }
-
   bool is_empty() { return byte_count_ == 0; }
 
   bool supports_group_opacity() { return supports_group_opacity_; }
@@ -308,18 +251,13 @@ struct DisplayListInvocation {
   // to |DisplayList.byte_count().
   size_t byte_count() { return sizeof(DisplayList) + byte_count_; }
 
-  int sk_op_count() { return sk_op_count_; }
-  // byte count for the ops with DisplayList overhead as translated
-  // through an SkCanvas interface, comparable to |DisplayList.byte_count().
-  size_t sk_byte_count() { return sizeof(DisplayList) + sk_byte_count_; }
-
-  void Invoke(DisplayListBuilder& builder) { invoker(builder); }
+  void Invoke(DlOpReceiver& builder) { invoker(builder); }
 
-  sk_sp<DisplayList> Build() {
-    DisplayListBuilder builder;
-    invoker(builder);
-    return builder.Build();
-  }
+  // sk_sp<DisplayList> Build() {
+  //   DisplayListBuilder builder;
+  //   invoker(builder.asReceiver());
+  //   return builder.Build();
+  // }
 };
 
 struct DisplayListInvocationGroup {
@@ -333,4 +271,4 @@ std::vector<DisplayListInvocationGroup> CreateAllGroups();
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // FLUTTER_FLOW_DISPLAY_LIST_COMPLEXITY_UNITTESTS_H_
+#endif  // FLUTTER_DISPLAY_LIST_TESTING_DL_TEST_SNIPPETS_H_
diff --git a/display_list/display_list_benchmarks_gl.cc b/display_list/testing/dl_test_surface_gl.cc
similarity index 30%
rename from display_list/display_list_benchmarks_gl.cc
rename to display_list/testing/dl_test_surface_gl.cc
index 256dcfd34b77fdb7014d04597097acdf09bd5638..952fc5b1e1ba22cfc9f03d1e4b0fd73a435c24ac 100644
--- a/display_list/display_list_benchmarks_gl.cc
+++ b/display_list/testing/dl_test_surface_gl.cc
@@ -2,50 +2,47 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/display_list/display_list_benchmarks_gl.h"
-#include "flutter/display_list/display_list_benchmarks.h"
+#include "flutter/display_list/testing/dl_test_surface_gl.h"
 
 #include "third_party/skia/include/core/SkCanvas.h"
+#include "third_party/skia/include/core/SkSurface.h"
+#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
 
 namespace flutter {
 namespace testing {
 
-void OpenGLCanvasProvider::InitializeSurface(const size_t width,
-                                             const size_t height) {
-  surface_size_ = SkISize::Make(width, height);
+using PixelFormat = DlSurfaceProvider::PixelFormat;
 
-  gl_surface_ = std::make_unique<TestGLSurface>(surface_size_);
+bool DlOpenGLSurfaceProvider::InitializeSurface(size_t width,
+                                                size_t height,
+                                                PixelFormat format) {
+  gl_surface_ = std::make_unique<TestGLSurface>(SkISize::Make(width, height));
   gl_surface_->MakeCurrent();
 
-  const auto image_info = SkImageInfo::MakeN32Premul(surface_size_);
-  surface_ = SkSurface::MakeRenderTarget(
-      gl_surface_->GetGrContext().get(), SkBudgeted::kNo, image_info, 1,
-      kTopLeft_GrSurfaceOrigin, nullptr, false);
-  surface_->getCanvas()->clear(SK_ColorTRANSPARENT);
+  primary_ = MakeOffscreenSurface(width, height, format);
+  return true;
 }
 
-sk_sp<SkSurface> OpenGLCanvasProvider::GetSurface() {
+std::shared_ptr<DlSurfaceInstance> DlOpenGLSurfaceProvider::GetPrimarySurface()
+    const {
   if (!gl_surface_->MakeCurrent()) {
     return nullptr;
   }
-  return surface_;
+  return primary_;
 }
 
-sk_sp<SkSurface> OpenGLCanvasProvider::MakeOffscreenSurface(
-    const size_t width,
-    const size_t height) {
-  surface_size_ = SkISize::Make(width, height);
-  const auto image_info = SkImageInfo::MakeN32Premul(surface_size_);
-
-  auto offscreen_surface = SkSurface::MakeRenderTarget(
-      gl_surface_->GetGrContext().get(), SkBudgeted::kNo, image_info, 1,
+std::shared_ptr<DlSurfaceInstance>
+DlOpenGLSurfaceProvider::MakeOffscreenSurface(size_t width,
+                                              size_t height,
+                                              PixelFormat format) const {
+  auto offscreen_surface = SkSurfaces::RenderTarget(
+      (GrRecordingContext*)gl_surface_->GetGrContext().get(),
+      skgpu::Budgeted::kNo, MakeInfo(format, width, height), 1,
       kTopLeft_GrSurfaceOrigin, nullptr, false);
 
   offscreen_surface->getCanvas()->clear(SK_ColorTRANSPARENT);
-  return offscreen_surface;
+  return std::make_shared<DlSurfaceInstanceBase>(offscreen_surface);
 }
 
-RUN_DISPLAYLIST_BENCHMARKS(OpenGL)
-
 }  // namespace testing
 }  // namespace flutter
diff --git a/display_list/testing/dl_test_surface_gl.h b/display_list/testing/dl_test_surface_gl.h
new file mode 100644
index 0000000000000000000000000000000000000000..82677c9be749dcb6e9b0e9b679f5115f5b225efe
--- /dev/null
+++ b/display_list/testing/dl_test_surface_gl.h
@@ -0,0 +1,42 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_DISPLAY_LIST_TESTING_DL_TEST_SURFACE_GL_H_
+#define FLUTTER_DISPLAY_LIST_TESTING_DL_TEST_SURFACE_GL_H_
+
+#include "flutter/display_list/testing/dl_test_surface_provider.h"
+
+#include "flutter/testing/test_gl_surface.h"
+
+namespace flutter {
+namespace testing {
+
+class DlOpenGLSurfaceProvider : public DlSurfaceProvider {
+ public:
+  DlOpenGLSurfaceProvider() : DlSurfaceProvider() {}
+  virtual ~DlOpenGLSurfaceProvider() = default;
+
+  bool InitializeSurface(size_t width,
+                         size_t height,
+                         PixelFormat format) override;
+  std::shared_ptr<DlSurfaceInstance> GetPrimarySurface() const override;
+  std::shared_ptr<DlSurfaceInstance> MakeOffscreenSurface(
+      size_t width,
+      size_t height,
+      PixelFormat format) const override;
+  const std::string backend_name() const override { return "OpenGL"; }
+  BackendType backend_type() const override { return kOpenGlBackend; }
+  bool supports(PixelFormat format) const override {
+    return format == kN32PremulPixelFormat;
+  }
+
+ private:
+  std::shared_ptr<DlSurfaceInstance> primary_;
+  std::unique_ptr<TestGLSurface> gl_surface_;
+};
+
+}  // namespace testing
+}  // namespace flutter
+
+#endif  // FLUTTER_DISPLAY_LIST_TESTING_DL_TEST_SURFACE_GL_H_
diff --git a/display_list/testing/dl_test_surface_metal.cc b/display_list/testing/dl_test_surface_metal.cc
new file mode 100644
index 0000000000000000000000000000000000000000..b7d7f7047bd418c4d99975a8559fdb8988f6b20b
--- /dev/null
+++ b/display_list/testing/dl_test_surface_metal.cc
@@ -0,0 +1,126 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/display_list/testing/dl_test_surface_metal.h"
+#include "flutter/impeller/display_list/dl_dispatcher.h"
+#include "flutter/impeller/display_list/dl_image_impeller.h"
+#include "flutter/impeller/typographer/backends/skia/typographer_context_skia.h"
+
+#include "third_party/skia/include/core/SkCanvas.h"
+#include "third_party/skia/include/core/SkSurface.h"
+
+namespace flutter {
+namespace testing {
+
+class DlMetalSurfaceInstance : public DlSurfaceInstance {
+ public:
+  explicit DlMetalSurfaceInstance(
+      std::unique_ptr<TestMetalSurface> metal_surface)
+      : metal_surface_(std::move(metal_surface)) {}
+  ~DlMetalSurfaceInstance() = default;
+
+  sk_sp<SkSurface> sk_surface() const override {
+    return metal_surface_->GetSurface();
+  }
+
+ private:
+  std::unique_ptr<TestMetalSurface> metal_surface_;
+};
+
+bool DlMetalSurfaceProvider::InitializeSurface(size_t width,
+                                               size_t height,
+                                               PixelFormat format) {
+  if (format != kN32PremulPixelFormat) {
+    return false;
+  }
+  metal_context_ = std::make_unique<TestMetalContext>();
+  metal_surface_ = MakeOffscreenSurface(width, height, format);
+  return true;
+}
+
+std::shared_ptr<DlSurfaceInstance> DlMetalSurfaceProvider::GetPrimarySurface()
+    const {
+  if (!metal_surface_) {
+    return nullptr;
+  }
+  return metal_surface_;
+}
+
+std::shared_ptr<DlSurfaceInstance> DlMetalSurfaceProvider::MakeOffscreenSurface(
+    size_t width,
+    size_t height,
+    PixelFormat format) const {
+  auto surface =
+      TestMetalSurface::Create(*metal_context_, SkISize::Make(width, height));
+  surface->GetSurface()->getCanvas()->clear(SK_ColorTRANSPARENT);
+  return std::make_shared<DlMetalSurfaceInstance>(std::move(surface));
+}
+
+class DlMetalPixelData : public DlPixelData {
+ public:
+  explicit DlMetalPixelData(
+      std::unique_ptr<impeller::testing::Screenshot> screenshot)
+      : screenshot_(std::move(screenshot)),
+        addr_(reinterpret_cast<const uint32_t*>(screenshot_->GetBytes())),
+        ints_per_row_(screenshot_->GetBytesPerRow() / 4) {
+    FML_DCHECK(screenshot_->GetBytesPerRow() == ints_per_row_ * 4);
+  }
+  ~DlMetalPixelData() override = default;
+
+  const uint32_t* addr32(int x, int y) const override {
+    return addr_ + (y * ints_per_row_) + x;
+  }
+  size_t width() const override { return screenshot_->GetWidth(); }
+  size_t height() const override { return screenshot_->GetHeight(); }
+  void write(const std::string& path) const override {
+    screenshot_->WriteToPNG(path);
+  }
+
+ private:
+  std::unique_ptr<impeller::testing::Screenshot> screenshot_;
+  const uint32_t* addr_;
+  const uint32_t ints_per_row_;
+};
+
+sk_sp<DlPixelData> DlMetalSurfaceProvider::ImpellerSnapshot(
+    const sk_sp<DisplayList>& list,
+    int width,
+    int height) const {
+  InitScreenShotter();
+  impeller::DlDispatcher dispatcher;
+  dispatcher.drawColor(flutter::DlColor::kTransparent(),
+                       flutter::DlBlendMode::kSrc);
+  list->Dispatch(dispatcher);
+  auto picture = dispatcher.EndRecordingAsPicture();
+  return sk_make_sp<DlMetalPixelData>(snapshotter_->MakeScreenshot(
+      *aiks_context_, picture, {width, height}, false));
+}
+
+sk_sp<DlImage> DlMetalSurfaceProvider::MakeImpellerImage(
+    const sk_sp<DisplayList>& list,
+    int width,
+    int height) const {
+  InitScreenShotter();
+  impeller::DlDispatcher dispatcher;
+  dispatcher.drawColor(flutter::DlColor::kTransparent(),
+                       flutter::DlBlendMode::kSrc);
+  list->Dispatch(dispatcher);
+  auto picture = dispatcher.EndRecordingAsPicture();
+  std::shared_ptr<impeller::Image> image =
+      picture.ToImage(*aiks_context_, {width, height});
+  std::shared_ptr<impeller::Texture> texture = image->GetTexture();
+  return impeller::DlImageImpeller::Make(texture);
+}
+
+void DlMetalSurfaceProvider::InitScreenShotter() const {
+  if (!snapshotter_) {
+    snapshotter_.reset(new MetalScreenshotter());
+    auto typographer = impeller::TypographerContextSkia::Make();
+    aiks_context_.reset(new impeller::AiksContext(
+        snapshotter_->GetPlayground().GetContext(), typographer));
+  }
+}
+
+}  // namespace testing
+}  // namespace flutter
diff --git a/display_list/testing/dl_test_surface_metal.h b/display_list/testing/dl_test_surface_metal.h
new file mode 100644
index 0000000000000000000000000000000000000000..04843066bdc7576f91c74c595647759f86e71516
--- /dev/null
+++ b/display_list/testing/dl_test_surface_metal.h
@@ -0,0 +1,60 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_DISPLAY_LIST_TESTING_DL_TEST_SURFACE_METAL_H_
+#define FLUTTER_DISPLAY_LIST_TESTING_DL_TEST_SURFACE_METAL_H_
+
+#include "flutter/display_list/testing/dl_test_surface_provider.h"
+#include "flutter/fml/platform/darwin/scoped_nsautorelease_pool.h"
+#include "flutter/impeller/golden_tests/metal_screenshotter.h"
+#include "flutter/testing/test_metal_surface.h"
+
+namespace flutter {
+namespace testing {
+
+using MetalScreenshotter = impeller::testing::MetalScreenshotter;
+
+class DlMetalSurfaceProvider : public DlSurfaceProvider {
+ public:
+  explicit DlMetalSurfaceProvider() : DlSurfaceProvider() {}
+  virtual ~DlMetalSurfaceProvider() = default;
+
+  bool InitializeSurface(size_t width,
+                         size_t height,
+                         PixelFormat format) override;
+  std::shared_ptr<DlSurfaceInstance> GetPrimarySurface() const override;
+  std::shared_ptr<DlSurfaceInstance> MakeOffscreenSurface(
+      size_t width,
+      size_t height,
+      PixelFormat format) const override;
+  const std::string backend_name() const override { return "Metal"; }
+  BackendType backend_type() const override { return kMetalBackend; }
+  bool supports(PixelFormat format) const override {
+    return format == kN32PremulPixelFormat;
+  }
+  bool supports_impeller() const override { return true; }
+  sk_sp<DlPixelData> ImpellerSnapshot(const sk_sp<DisplayList>& list,
+                                      int width,
+                                      int height) const override;
+  virtual sk_sp<DlImage> MakeImpellerImage(const sk_sp<DisplayList>& list,
+                                           int width,
+                                           int height) const override;
+
+ private:
+  // This must be placed before any other members that may use the
+  // autorelease pool.
+  fml::ScopedNSAutoreleasePool autorelease_pool_;
+
+  std::unique_ptr<TestMetalContext> metal_context_;
+  std::shared_ptr<DlSurfaceInstance> metal_surface_;
+  mutable std::unique_ptr<MetalScreenshotter> snapshotter_;
+  mutable std::unique_ptr<impeller::AiksContext> aiks_context_;
+
+  void InitScreenShotter() const;
+};
+
+}  // namespace testing
+}  // namespace flutter
+
+#endif  // FLUTTER_DISPLAY_LIST_TESTING_DL_TEST_SURFACE_METAL_H_
diff --git a/display_list/testing/dl_test_surface_provider.cc b/display_list/testing/dl_test_surface_provider.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ab7d75c0901e753115322ba61ef092dce74982b6
--- /dev/null
+++ b/display_list/testing/dl_test_surface_provider.cc
@@ -0,0 +1,82 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/display_list/testing/dl_test_surface_provider.h"
+
+#include "third_party/skia/include/core/SkCanvas.h"
+#include "third_party/skia/include/core/SkData.h"
+#include "third_party/skia/include/core/SkImage.h"
+#include "third_party/skia/include/core/SkSurface.h"
+#include "third_party/skia/include/encode/SkPngEncoder.h"
+
+#ifdef ENABLE_SOFTWARE_BENCHMARKS
+#include "flutter/display_list/testing/dl_test_surface_software.h"
+#endif
+#ifdef ENABLE_OPENGL_BENCHMARKS
+#include "flutter/display_list/testing/dl_test_surface_gl.h"
+#endif
+#ifdef ENABLE_METAL_BENCHMARKS
+#include "flutter/display_list/testing/dl_test_surface_metal.h"
+#endif
+
+namespace flutter {
+namespace testing {
+
+std::string DlSurfaceProvider::BackendName(BackendType type) {
+  switch (type) {
+    case kMetalBackend:
+      return "Metal";
+    case kOpenGlBackend:
+      return "OpenGL";
+    case kSoftwareBackend:
+      return "Software";
+  }
+}
+
+std::unique_ptr<DlSurfaceProvider> DlSurfaceProvider::Create(
+    BackendType backend_type) {
+  switch (backend_type) {
+#ifdef ENABLE_SOFTWARE_BENCHMARKS
+    case kSoftwareBackend:
+      return std::make_unique<DlSoftwareSurfaceProvider>();
+#endif
+#ifdef ENABLE_OPENGL_BENCHMARKS
+    case kOpenGLBackend:
+      return std::make_unique<DlOpenGLSurfaceProvider>();
+#endif
+#ifdef ENABLE_METAL_BENCHMARKS
+    case kMetalBackend:
+      return std::make_unique<DlMetalSurfaceProvider>();
+#endif
+    default:
+      return nullptr;
+  }
+
+  return nullptr;
+}
+
+bool DlSurfaceProvider::Snapshot(std::string& filename) const {
+#ifdef BENCHMARKS_NO_SNAPSHOT
+  return false;
+#else
+  auto image = GetPrimarySurface()->sk_surface()->makeImageSnapshot();
+  if (!image) {
+    return false;
+  }
+  auto raster = image->makeRasterImage();
+  if (!raster) {
+    return false;
+  }
+  auto data = SkPngEncoder::Encode(nullptr, raster.get(), {});
+  if (!data) {
+    return false;
+  }
+  fml::NonOwnedMapping mapping(static_cast<const uint8_t*>(data->data()),
+                               data->size());
+  return WriteAtomically(OpenFixturesDirectory(), filename.c_str(), mapping);
+#endif
+}
+
+}  // namespace testing
+}  // namespace flutter
diff --git a/display_list/testing/dl_test_surface_provider.h b/display_list/testing/dl_test_surface_provider.h
new file mode 100644
index 0000000000000000000000000000000000000000..1ad4af789cb4353d42594fd3036579e4e8ef152d
--- /dev/null
+++ b/display_list/testing/dl_test_surface_provider.h
@@ -0,0 +1,105 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_DISPLAY_LIST_TESTING_DL_TEST_SURFACE_PROVIDER_H_
+#define FLUTTER_DISPLAY_LIST_TESTING_DL_TEST_SURFACE_PROVIDER_H_
+
+#include <utility>
+
+#include "flutter/display_list/display_list.h"
+#include "flutter/display_list/image/dl_image.h"
+#include "flutter/fml/mapping.h"
+#include "flutter/testing/testing.h"
+
+#include "third_party/skia/include/core/SkSurface.h"
+
+namespace flutter {
+namespace testing {
+
+class DlPixelData : public SkRefCnt {
+ public:
+  virtual ~DlPixelData() = default;
+
+  virtual const uint32_t* addr32(int x, int y) const = 0;
+  virtual size_t width() const = 0;
+  virtual size_t height() const = 0;
+  virtual void write(const std::string& path) const = 0;
+};
+
+class DlSurfaceInstance {
+ public:
+  virtual ~DlSurfaceInstance() = default;
+
+  virtual sk_sp<SkSurface> sk_surface() const = 0;
+
+  int width() const { return sk_surface()->width(); }
+  int height() const { return sk_surface()->height(); }
+};
+
+class DlSurfaceInstanceBase : public DlSurfaceInstance {
+ public:
+  explicit DlSurfaceInstanceBase(sk_sp<SkSurface> surface)
+      : surface_(std::move(surface)) {}
+  ~DlSurfaceInstanceBase() = default;
+
+  sk_sp<SkSurface> sk_surface() const override { return surface_; }
+
+ private:
+  sk_sp<SkSurface> surface_;
+};
+
+class DlSurfaceProvider {
+ public:
+  typedef enum { kN32PremulPixelFormat, k565PixelFormat } PixelFormat;
+  typedef enum { kSoftwareBackend, kOpenGlBackend, kMetalBackend } BackendType;
+
+  static SkImageInfo MakeInfo(PixelFormat format, int w, int h) {
+    switch (format) {
+      case kN32PremulPixelFormat:
+        return SkImageInfo::MakeN32Premul(w, h);
+      case k565PixelFormat:
+        return SkImageInfo::Make(SkISize::Make(w, h), kRGB_565_SkColorType,
+                                 kOpaque_SkAlphaType);
+    }
+    FML_DCHECK(false);
+  }
+
+  static std::string BackendName(BackendType type);
+  static std::unique_ptr<DlSurfaceProvider> Create(BackendType backend_type);
+
+  virtual ~DlSurfaceProvider() = default;
+  virtual const std::string backend_name() const = 0;
+  virtual BackendType backend_type() const = 0;
+  virtual bool supports(PixelFormat format) const = 0;
+  virtual bool supports_impeller() const { return false; }
+  virtual bool InitializeSurface(
+      size_t width,
+      size_t height,
+      PixelFormat format = kN32PremulPixelFormat) = 0;
+  virtual std::shared_ptr<DlSurfaceInstance> GetPrimarySurface() const = 0;
+  virtual std::shared_ptr<DlSurfaceInstance> MakeOffscreenSurface(
+      size_t width,
+      size_t height,
+      PixelFormat format = kN32PremulPixelFormat) const = 0;
+
+  virtual bool Snapshot(std::string& filename) const;
+  virtual sk_sp<DlPixelData> ImpellerSnapshot(const sk_sp<DisplayList>& list,
+                                              int width,
+                                              int height) const {
+    return nullptr;
+  }
+  virtual sk_sp<DlImage> MakeImpellerImage(const sk_sp<DisplayList>& list,
+                                           int width,
+                                           int height) const {
+    return nullptr;
+  }
+
+ protected:
+  DlSurfaceProvider() = default;
+};
+
+}  // namespace testing
+}  // namespace flutter
+
+#endif  // FLUTTER_DISPLAY_LIST_TESTING_DL_TEST_SURFACE_PROVIDER_H_
diff --git a/display_list/testing/dl_test_surface_software.cc b/display_list/testing/dl_test_surface_software.cc
new file mode 100644
index 0000000000000000000000000000000000000000..803e661740aae4bc99310f6c8561352d0f3a871c
--- /dev/null
+++ b/display_list/testing/dl_test_surface_software.cc
@@ -0,0 +1,32 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/display_list/testing/dl_test_surface_software.h"
+
+#include "third_party/skia/include/core/SkCanvas.h"
+#include "third_party/skia/include/core/SkSurface.h"
+
+namespace flutter {
+namespace testing {
+
+using PixelFormat = DlSurfaceProvider::PixelFormat;
+
+bool DlSoftwareSurfaceProvider::InitializeSurface(size_t width,
+                                                  size_t height,
+                                                  PixelFormat format) {
+  primary_ = MakeOffscreenSurface(width, height, format);
+  return primary_ != nullptr;
+}
+
+std::shared_ptr<DlSurfaceInstance>
+DlSoftwareSurfaceProvider::MakeOffscreenSurface(size_t width,
+                                                size_t height,
+                                                PixelFormat format) const {
+  auto surface = SkSurfaces::Raster(MakeInfo(format, width, height));
+  surface->getCanvas()->clear(SK_ColorTRANSPARENT);
+  return std::make_shared<DlSurfaceInstanceBase>(surface);
+}
+
+}  // namespace testing
+}  // namespace flutter
diff --git a/display_list/testing/dl_test_surface_software.h b/display_list/testing/dl_test_surface_software.h
new file mode 100644
index 0000000000000000000000000000000000000000..d341079b0adaf8f8bc630acc20a8ff77c36c82c2
--- /dev/null
+++ b/display_list/testing/dl_test_surface_software.h
@@ -0,0 +1,39 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_DISPLAY_LIST_TESTING_DL_TEST_SURFACE_SOFTWARE_H_
+#define FLUTTER_DISPLAY_LIST_TESTING_DL_TEST_SURFACE_SOFTWARE_H_
+
+#include "flutter/display_list/testing/dl_test_surface_provider.h"
+
+namespace flutter {
+namespace testing {
+
+class DlSoftwareSurfaceProvider : public DlSurfaceProvider {
+ public:
+  DlSoftwareSurfaceProvider() = default;
+  virtual ~DlSoftwareSurfaceProvider() = default;
+
+  bool InitializeSurface(size_t width,
+                         size_t height,
+                         PixelFormat format) override;
+  std::shared_ptr<DlSurfaceInstance> GetPrimarySurface() const override {
+    return primary_;
+  }
+  std::shared_ptr<DlSurfaceInstance> MakeOffscreenSurface(
+      size_t width,
+      size_t height,
+      PixelFormat format) const override;
+  const std::string backend_name() const override { return "Software"; }
+  BackendType backend_type() const override { return kSoftwareBackend; }
+  bool supports(PixelFormat format) const override { return true; }
+
+ private:
+  std::shared_ptr<DlSurfaceInstance> primary_;
+};
+
+}  // namespace testing
+}  // namespace flutter
+
+#endif  // FLUTTER_DISPLAY_LIST_TESTING_DL_TEST_SURFACE_SOFTWARE_H_
diff --git a/display_list/utils/dl_bounds_accumulator.cc b/display_list/utils/dl_bounds_accumulator.cc
new file mode 100644
index 0000000000000000000000000000000000000000..34750ed4bd529442d579a0c7fd44074692e1e541
--- /dev/null
+++ b/display_list/utils/dl_bounds_accumulator.cc
@@ -0,0 +1,134 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/display_list/utils/dl_bounds_accumulator.h"
+
+namespace flutter {
+
+void RectBoundsAccumulator::accumulate(const SkRect& r, int index) {
+  if (r.fLeft < r.fRight && r.fTop < r.fBottom) {
+    rect_.accumulate(r.fLeft, r.fTop);
+    rect_.accumulate(r.fRight, r.fBottom);
+  }
+}
+
+void RectBoundsAccumulator::save() {
+  saved_rects_.emplace_back(rect_);
+  rect_ = AccumulationRect();
+}
+void RectBoundsAccumulator::restore() {
+  if (!saved_rects_.empty()) {
+    SkRect layer_bounds = rect_.bounds();
+    pop_and_accumulate(layer_bounds, nullptr);
+  }
+}
+bool RectBoundsAccumulator::restore(
+    std::function<bool(const SkRect&, SkRect&)> mapper,
+    const SkRect* clip) {
+  bool success = true;
+  if (!saved_rects_.empty()) {
+    SkRect layer_bounds = rect_.bounds();
+    success = mapper(layer_bounds, layer_bounds);
+    pop_and_accumulate(layer_bounds, clip);
+  }
+  return success;
+}
+void RectBoundsAccumulator::pop_and_accumulate(SkRect& layer_bounds,
+                                               const SkRect* clip) {
+  FML_DCHECK(!saved_rects_.empty());
+
+  rect_ = saved_rects_.back();
+  saved_rects_.pop_back();
+
+  if (clip == nullptr || layer_bounds.intersect(*clip)) {
+    accumulate(layer_bounds, -1);
+  }
+}
+
+RectBoundsAccumulator::AccumulationRect::AccumulationRect() {
+  min_x_ = std::numeric_limits<SkScalar>::infinity();
+  min_y_ = std::numeric_limits<SkScalar>::infinity();
+  max_x_ = -std::numeric_limits<SkScalar>::infinity();
+  max_y_ = -std::numeric_limits<SkScalar>::infinity();
+}
+void RectBoundsAccumulator::AccumulationRect::accumulate(SkScalar x,
+                                                         SkScalar y) {
+  if (min_x_ > x) {
+    min_x_ = x;
+  }
+  if (min_y_ > y) {
+    min_y_ = y;
+  }
+  if (max_x_ < x) {
+    max_x_ = x;
+  }
+  if (max_y_ < y) {
+    max_y_ = y;
+  }
+}
+SkRect RectBoundsAccumulator::AccumulationRect::bounds() const {
+  return (max_x_ >= min_x_ && max_y_ >= min_y_)
+             ? SkRect::MakeLTRB(min_x_, min_y_, max_x_, max_y_)
+             : SkRect::MakeEmpty();
+}
+
+void RTreeBoundsAccumulator::accumulate(const SkRect& r, int index) {
+  if (r.fLeft < r.fRight && r.fTop < r.fBottom) {
+    rects_.push_back(r);
+    rect_indices_.push_back(index);
+  }
+}
+void RTreeBoundsAccumulator::save() {
+  saved_offsets_.push_back(rects_.size());
+}
+void RTreeBoundsAccumulator::restore() {
+  if (saved_offsets_.empty()) {
+    return;
+  }
+
+  saved_offsets_.pop_back();
+}
+bool RTreeBoundsAccumulator::restore(
+    std::function<bool(const SkRect& original, SkRect& modified)> map,
+    const SkRect* clip) {
+  if (saved_offsets_.empty()) {
+    return true;
+  }
+
+  size_t previous_size = saved_offsets_.back();
+  saved_offsets_.pop_back();
+
+  bool success = true;
+  for (size_t i = previous_size; i < rects_.size(); i++) {
+    SkRect original = rects_[i];
+    if (!map(original, original)) {
+      success = false;
+    }
+    if (clip == nullptr || original.intersect(*clip)) {
+      rect_indices_[previous_size] = rect_indices_[i];
+      rects_[previous_size] = original;
+      previous_size++;
+    }
+  }
+  rects_.resize(previous_size);
+  rect_indices_.resize(previous_size);
+  return success;
+}
+
+SkRect RTreeBoundsAccumulator::bounds() const {
+  FML_DCHECK(saved_offsets_.empty());
+  RectBoundsAccumulator accumulator;
+  for (auto& rect : rects_) {
+    accumulator.accumulate(rect, 0);
+  }
+  return accumulator.bounds();
+}
+
+sk_sp<DlRTree> RTreeBoundsAccumulator::rtree() const {
+  FML_DCHECK(saved_offsets_.empty());
+  return sk_make_sp<DlRTree>(rects_.data(), rects_.size(), rect_indices_.data(),
+                             [](int id) { return id >= 0; });
+}
+
+}  // namespace flutter
diff --git a/display_list/utils/dl_bounds_accumulator.h b/display_list/utils/dl_bounds_accumulator.h
new file mode 100644
index 0000000000000000000000000000000000000000..db4ceda2698b632ecf3b43d2e0be57804b92a344
--- /dev/null
+++ b/display_list/utils/dl_bounds_accumulator.h
@@ -0,0 +1,168 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_DISPLAY_LIST_UTILS_DL_BOUNDS_ACCUMULATOR_H_
+#define FLUTTER_DISPLAY_LIST_UTILS_DL_BOUNDS_ACCUMULATOR_H_
+
+#include <functional>
+
+#include "flutter/display_list/geometry/dl_rtree.h"
+#include "flutter/fml/logging.h"
+
+// This file contains various utility classes to ease implementing
+// a Flutter DisplayList DlOpReceiver, including:
+//
+// IgnoreAttributeDispatchHelper:
+// IgnoreClipDispatchHelper:
+// IgnoreTransformDispatchHelper
+//     Empty overrides of all of the associated methods of DlOpReceiver
+//     for receivers that only track some of the rendering operations
+
+namespace flutter {
+
+enum class BoundsAccumulatorType {
+  kRect,
+  kRTree,
+};
+
+class BoundsAccumulator {
+ public:
+  /// function definition for modifying the bounds of a rectangle
+  /// during a restore operation. The function is used primarily
+  /// to account for the bounds impact of an ImageFilter on a
+  /// saveLayer on a per-rect basis. The implementation may apply
+  /// this function at whatever granularity it can manage easily
+  /// (for example, a Rect accumulator might apply it to the entire
+  /// local bounds being restored, whereas an RTree accumulator might
+  /// apply it individually to each element in the local RTree).
+  ///
+  /// The function will do a best faith attempt at determining the
+  /// modified bounds and store the results in the supplied |dest|
+  /// rectangle and return true. If the function is unable to
+  /// accurately determine the modifed bounds, it will set the
+  /// |dest| rectangle to a copy of the input bounds (or a best
+  /// guess) and return false to indicate that the bounds should not
+  /// be trusted.
+  typedef bool BoundsModifier(const SkRect& original, SkRect* dest);
+
+  virtual ~BoundsAccumulator() = default;
+
+  virtual void accumulate(const SkRect& r, int index = 0) = 0;
+
+  /// Save aside the rects/bounds currently being accumulated and start
+  /// accumulating a new set of rects/bounds. When restore is called,
+  /// some additional modifications may be applied to these new bounds
+  /// before they are accumulated back into the surrounding bounds.
+  virtual void save() = 0;
+
+  /// Restore to the previous accumulation and incorporate the bounds of
+  /// the primitives that were recorded since the last save (if needed).
+  virtual void restore() = 0;
+
+  /// Restore the previous set of accumulation rects/bounds and accumulate
+  /// the current rects/bounds that were accumulated since the most recent
+  /// call to |save| into them with modifications specified by the |map|
+  /// parameter and clipping to the clip parameter if it is not null.
+  ///
+  /// The indicated map function is applied to the various rects and bounds
+  /// that have been accumulated in this save/restore cycle before they
+  /// are then accumulated into the previous accumulations. The granularity
+  /// of the application of the map function to the rectangles that were
+  /// accumulated during the save period is left up to the implementation.
+  ///
+  /// This method will return true if the map function returned true on
+  /// every single invocation. A false return value means that the
+  /// bounds accumulated during this restore may not be trusted (as
+  /// determined by the map function).
+  ///
+  /// If there are no saved accumulations to restore to, this method will
+  /// NOP ignoring the map function and the optional clip entirely.
+  virtual bool restore(
+      std::function<bool(const SkRect& original, SkRect& modified)> map,
+      const SkRect* clip = nullptr) = 0;
+
+  virtual SkRect bounds() const = 0;
+
+  virtual sk_sp<DlRTree> rtree() const = 0;
+
+  virtual BoundsAccumulatorType type() const = 0;
+};
+
+class RectBoundsAccumulator final : public virtual BoundsAccumulator {
+ public:
+  void accumulate(SkScalar x, SkScalar y) { rect_.accumulate(x, y); }
+  void accumulate(const SkPoint& p) { rect_.accumulate(p.fX, p.fY); }
+  void accumulate(const SkRect& r, int index) override;
+
+  bool is_empty() const { return rect_.is_empty(); }
+  bool is_not_empty() const { return rect_.is_not_empty(); }
+
+  void save() override;
+  void restore() override;
+  bool restore(std::function<bool(const SkRect&, SkRect&)> mapper,
+               const SkRect* clip) override;
+
+  SkRect bounds() const override {
+    FML_DCHECK(saved_rects_.empty());
+    return rect_.bounds();
+  }
+
+  BoundsAccumulatorType type() const override {
+    return BoundsAccumulatorType::kRect;
+  }
+
+  sk_sp<DlRTree> rtree() const override { return nullptr; }
+
+ private:
+  class AccumulationRect {
+   public:
+    AccumulationRect();
+
+    void accumulate(SkScalar x, SkScalar y);
+
+    bool is_empty() const { return min_x_ >= max_x_ || min_y_ >= max_y_; }
+    bool is_not_empty() const { return min_x_ < max_x_ && min_y_ < max_y_; }
+
+    SkRect bounds() const;
+
+   private:
+    SkScalar min_x_;
+    SkScalar min_y_;
+    SkScalar max_x_;
+    SkScalar max_y_;
+  };
+
+  void pop_and_accumulate(SkRect& layer_bounds, const SkRect* clip);
+
+  AccumulationRect rect_;
+  std::vector<AccumulationRect> saved_rects_;
+};
+
+class RTreeBoundsAccumulator final : public virtual BoundsAccumulator {
+ public:
+  void accumulate(const SkRect& r, int index) override;
+  void save() override;
+  void restore() override;
+
+  bool restore(
+      std::function<bool(const SkRect& original, SkRect& modified)> map,
+      const SkRect* clip = nullptr) override;
+
+  SkRect bounds() const override;
+
+  sk_sp<DlRTree> rtree() const override;
+
+  BoundsAccumulatorType type() const override {
+    return BoundsAccumulatorType::kRTree;
+  }
+
+ private:
+  std::vector<SkRect> rects_;
+  std::vector<int> rect_indices_;
+  std::vector<size_t> saved_offsets_;
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_DISPLAY_LIST_UTILS_DL_BOUNDS_ACCUMULATOR_H_
diff --git a/display_list/display_list_comparable.h b/display_list/utils/dl_comparable.h
similarity index 92%
rename from display_list/display_list_comparable.h
rename to display_list/utils/dl_comparable.h
index 5d3c6e99d3f7d2d18aaa4fb766ddb983982cdb90..6273bc703f70f797e84d25b8c36a09b467141598 100644
--- a/display_list/display_list_comparable.h
+++ b/display_list/utils/dl_comparable.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_COMPARABLE_H_
-#define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_COMPARABLE_H_
+#ifndef FLUTTER_DISPLAY_LIST_UTILS_DL_COMPARABLE_H_
+#define FLUTTER_DISPLAY_LIST_UTILS_DL_COMPARABLE_H_
 
-#include "flutter/display_list/types.h"
+#include <memory>
 
 namespace flutter {
 
@@ -113,4 +113,4 @@ bool NotEquals(std::shared_ptr<T> a, std::shared_ptr<T> b) {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_DISPLAY_LIST_DISPLAY_LIST_COMPARABLE_H_
+#endif  // FLUTTER_DISPLAY_LIST_UTILS_DL_COMPARABLE_H_
diff --git a/display_list/display_list_matrix_clip_tracker.cc b/display_list/utils/dl_matrix_clip_tracker.cc
similarity index 63%
rename from display_list/display_list_matrix_clip_tracker.cc
rename to display_list/utils/dl_matrix_clip_tracker.cc
index 49f653f396c417bca9f96ff5efe8a4ba03f141bc..c4023aa8400895dc63f1fb5ee5341edb1f58ab66 100644
--- a/display_list/display_list_matrix_clip_tracker.cc
+++ b/display_list/utils/dl_matrix_clip_tracker.cc
@@ -2,11 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/display_list/display_list_matrix_clip_tracker.h"
+#include "flutter/display_list/utils/dl_matrix_clip_tracker.h"
 
-#include "flutter/display_list/display_list_builder.h"
+#include "flutter/display_list/dl_builder.h"
 #include "flutter/fml/logging.h"
-#include "third_party/skia/include/core/SkPath.h"
 
 namespace flutter {
 
@@ -39,12 +38,13 @@ class Data4x4 : public DisplayListMatrixClipTracker::Data {
   void setTransform(const SkMatrix& matrix) override { m44_ = SkM44(matrix); }
   void setTransform(const SkM44& m44) override { m44_ = m44; }
   void setIdentity() override { m44_.setIdentity(); }
+  bool mapRect(const SkRect& rect, SkRect* mapped) const override {
+    return m44_.asM33().mapRect(mapped, rect);
+  }
+  bool canBeInverted() const override { return m44_.asM33().invert(nullptr); }
 
  protected:
   bool has_perspective() const override;
-  bool map_rect(const SkRect& rect, SkRect* mapped) const override {
-    return m44_.asM33().mapRect(mapped, rect);
-  }
 
  private:
   SkM44 m44_;
@@ -80,18 +80,19 @@ class Data3x3 : public DisplayListMatrixClipTracker::Data {
     FML_CHECK(false) << "SkM44 was set without upgrading Data";
   }
   void setIdentity() override { matrix_.setIdentity(); }
+  bool mapRect(const SkRect& rect, SkRect* mapped) const override {
+    return matrix_.mapRect(mapped, rect);
+  }
+  bool canBeInverted() const override { return matrix_.invert(nullptr); }
 
  protected:
   bool has_perspective() const override { return matrix_.hasPerspective(); }
-  bool map_rect(const SkRect& rect, SkRect* mapped) const override {
-    return matrix_.mapRect(mapped, rect);
-  }
 
  private:
   SkMatrix matrix_;
 };
 
-static bool is_3x3(const SkM44& m) {
+bool DisplayListMatrixClipTracker::is_3x3(const SkM44& m) {
   // clang-format off
   return (                                      m.rc(0, 2) == 0 &&
                                                 m.rc(1, 2) == 0 &&
@@ -102,22 +103,69 @@ static bool is_3x3(const SkM44& m) {
 
 DisplayListMatrixClipTracker::DisplayListMatrixClipTracker(
     const SkRect& cull_rect,
-    const SkMatrix& matrix) {
-  saved_.emplace_back(std::make_unique<Data3x3>(matrix, cull_rect));
+    const SkMatrix& matrix)
+    : original_cull_rect_(cull_rect) {
+  // isEmpty protects us against NaN as we normalize any empty cull rects
+  SkRect cull = cull_rect.isEmpty() ? SkRect::MakeEmpty() : cull_rect;
+  saved_.emplace_back(std::make_unique<Data3x3>(matrix, cull));
   current_ = saved_.back().get();
+  save();  // saved_[0] will always be the initial settings
 }
 
 DisplayListMatrixClipTracker::DisplayListMatrixClipTracker(
     const SkRect& cull_rect,
-    const SkM44& m44) {
+    const SkM44& m44)
+    : original_cull_rect_(cull_rect) {
+  // isEmpty protects us against NaN as we normalize any empty cull rects
+  SkRect cull = cull_rect.isEmpty() ? SkRect::MakeEmpty() : cull_rect;
   if (is_3x3(m44)) {
-    saved_.emplace_back(std::make_unique<Data3x3>(m44.asM33(), cull_rect));
+    saved_.emplace_back(std::make_unique<Data3x3>(m44.asM33(), cull));
   } else {
-    saved_.emplace_back(std::make_unique<Data4x4>(m44, cull_rect));
+    saved_.emplace_back(std::make_unique<Data4x4>(m44, cull));
   }
   current_ = saved_.back().get();
+  save();  // saved_[0] will always be the initial settings
 }
 
+// clang-format off
+void DisplayListMatrixClipTracker::transform2DAffine(
+    SkScalar mxx, SkScalar mxy, SkScalar mxt,
+    SkScalar myx, SkScalar myy, SkScalar myt) {
+  if (!current_->is_4x4()) {
+    transform(SkMatrix::MakeAll(mxx, mxy, mxt,
+                                myx, myy, myt,
+                                0,   0,   1));
+  } else {
+    transform(SkM44(mxx, mxy, 0, mxt,
+                    myx, myy, 0, myt,
+                    0,   0,   1, 0,
+                    0,   0,   0, 1));
+  }
+}
+void DisplayListMatrixClipTracker::transformFullPerspective(
+    SkScalar mxx, SkScalar mxy, SkScalar mxz, SkScalar mxt,
+    SkScalar myx, SkScalar myy, SkScalar myz, SkScalar myt,
+    SkScalar mzx, SkScalar mzy, SkScalar mzz, SkScalar mzt,
+    SkScalar mwx, SkScalar mwy, SkScalar mwz, SkScalar mwt) {
+  if (!current_->is_4x4()) {
+    if (                        mxz == 0 &&
+                                myz == 0 &&
+        mzx == 0 && mzy == 0 && mzz == 1 && mzt == 0 &&
+                                mwz == 0) {
+        transform(SkMatrix::MakeAll(mxx, mxy, mxt,
+                                    myx, myy, myt,
+                                    mwx, mwy, mwt));
+        return;
+    }
+  }
+
+  transform(SkM44(mxx, mxy, mxz, mxt,
+                  myx, myy, myz, myt,
+                  mzx, mzy, mzz, mzt,
+                  mwx, mwy, mwz, mwt));
+}
+// clang-format on
+
 void DisplayListMatrixClipTracker::save() {
   if (current_->is_4x4()) {
     saved_.emplace_back(std::make_unique<Data4x4>(current_));
@@ -128,8 +176,18 @@ void DisplayListMatrixClipTracker::save() {
 }
 
 void DisplayListMatrixClipTracker::restore() {
-  saved_.pop_back();
-  current_ = saved_.back().get();
+  if (saved_.size() > 2) {
+    saved_.pop_back();
+    current_ = saved_.back().get();
+  }
+}
+
+void DisplayListMatrixClipTracker::reset() {
+  while (saved_.size() > 1) {
+    saved_.pop_back();
+    current_ = saved_.back().get();
+  }
+  save();  // saved_[0] will always be the initial settings
 }
 
 void DisplayListMatrixClipTracker::restoreToCount(int restore_count) {
@@ -166,13 +224,31 @@ void DisplayListMatrixClipTracker::setTransform(const SkM44& m44) {
   current_->setTransform(m44);
 }
 
+bool DisplayListMatrixClipTracker::inverseTransform(
+    const DisplayListMatrixClipTracker& tracker_) {
+  if (tracker_.using_4x4_matrix()) {
+    SkM44 inverse;
+    if (tracker_.matrix_4x4().invert(&inverse)) {
+      transform(inverse);
+      return true;
+    }
+  } else {
+    SkMatrix inverse;
+    if (tracker_.matrix_3x3().invert(&inverse)) {
+      transform(inverse);
+      return true;
+    }
+  }
+  return false;
+}
+
 void DisplayListMatrixClipTracker::clipRRect(const SkRRect& rrect,
-                                             SkClipOp op,
+                                             ClipOp op,
                                              bool is_aa) {
   switch (op) {
-    case SkClipOp::kIntersect:
+    case ClipOp::kIntersect:
       break;
-    case SkClipOp::kDifference:
+    case ClipOp::kDifference:
       if (!rrect.isRect()) {
         return;
       }
@@ -181,14 +257,27 @@ void DisplayListMatrixClipTracker::clipRRect(const SkRRect& rrect,
   current_->clipBounds(rrect.getBounds(), op, is_aa);
 }
 void DisplayListMatrixClipTracker::clipPath(const SkPath& path,
-                                            SkClipOp op,
+                                            ClipOp op,
                                             bool is_aa) {
+  // Map "kDifference of inverse path" to "kIntersect of the original path" and
+  // map "kIntersect of inverse path" to "kDifference of the original path"
+  if (path.isInverseFillType()) {
+    switch (op) {
+      case ClipOp::kIntersect:
+        op = ClipOp::kDifference;
+        break;
+      case ClipOp::kDifference:
+        op = ClipOp::kIntersect;
+        break;
+    }
+  }
+
   SkRect bounds;
   switch (op) {
-    case SkClipOp::kIntersect:
+    case ClipOp::kIntersect:
       bounds = path.getBounds();
       break;
-    case SkClipOp::kDifference:
+    case ClipOp::kDifference:
       if (!path.isRect(&bounds)) {
         return;
       }
@@ -202,16 +291,31 @@ bool DisplayListMatrixClipTracker::Data::content_culled(
   if (cull_rect_.isEmpty() || content_bounds.isEmpty()) {
     return true;
   }
+  if (!canBeInverted()) {
+    return true;
+  }
   if (has_perspective()) {
     return false;
   }
   SkRect mapped;
-  map_rect(content_bounds, &mapped);
+  mapRect(content_bounds, &mapped);
   return !mapped.intersects(cull_rect_);
 }
 
+void DisplayListMatrixClipTracker::Data::resetBounds(const SkRect& cull_rect) {
+  if (!cull_rect.isEmpty()) {
+    SkRect rect;
+    mapRect(cull_rect, &rect);
+    if (!rect.isEmpty()) {
+      cull_rect_ = rect;
+      return;
+    }
+  }
+  cull_rect_.setEmpty();
+}
+
 void DisplayListMatrixClipTracker::Data::clipBounds(const SkRect& clip,
-                                                    SkClipOp op,
+                                                    ClipOp op,
                                                     bool is_aa) {
   if (cull_rect_.isEmpty()) {
     // No point in intersecting further.
@@ -222,13 +326,13 @@ void DisplayListMatrixClipTracker::Data::clipBounds(const SkRect& clip,
     return;
   }
   switch (op) {
-    case SkClipOp::kIntersect: {
+    case ClipOp::kIntersect: {
       if (clip.isEmpty()) {
         cull_rect_.setEmpty();
         break;
       }
       SkRect rect;
-      map_rect(clip, &rect);
+      mapRect(clip, &rect);
       if (is_aa) {
         rect.roundOut(&rect);
       }
@@ -237,13 +341,13 @@ void DisplayListMatrixClipTracker::Data::clipBounds(const SkRect& clip,
       }
       break;
     }
-    case SkClipOp::kDifference: {
-      if (clip.isEmpty() || !clip.intersects(cull_rect_)) {
+    case ClipOp::kDifference: {
+      if (clip.isEmpty()) {
         break;
       }
       SkRect rect;
-      if (map_rect(clip, &rect)) {
-        // This technique only works if it is rect -> rect
+      if (mapRect(clip, &rect)) {
+        // This technique only works if the transform is rect -> rect
         if (is_aa) {
           SkIRect rounded;
           rect.round(&rounded);
@@ -252,13 +356,22 @@ void DisplayListMatrixClipTracker::Data::clipBounds(const SkRect& clip,
           }
           rect.set(rounded);
         }
+        if (!rect.intersects(cull_rect_)) {
+          break;
+        }
         if (rect.fLeft <= cull_rect_.fLeft &&
             rect.fRight >= cull_rect_.fRight) {
           // bounds spans entire width of cull_rect_
           // therefore we can slice off a top or bottom
           // edge of the cull_rect_.
-          SkScalar top = std::max(rect.fBottom, cull_rect_.fTop);
-          SkScalar btm = std::min(rect.fTop, cull_rect_.fBottom);
+          SkScalar top = cull_rect_.fTop;
+          SkScalar btm = cull_rect_.fBottom;
+          if (rect.fTop <= top) {
+            top = rect.fBottom;
+          }
+          if (rect.fBottom >= btm) {
+            btm = rect.fTop;
+          }
           if (top < btm) {
             cull_rect_.fTop = top;
             cull_rect_.fBottom = btm;
@@ -270,8 +383,14 @@ void DisplayListMatrixClipTracker::Data::clipBounds(const SkRect& clip,
           // bounds spans entire height of cull_rect_
           // therefore we can slice off a left or right
           // edge of the cull_rect_.
-          SkScalar lft = std::max(rect.fRight, cull_rect_.fLeft);
-          SkScalar rgt = std::min(rect.fLeft, cull_rect_.fRight);
+          SkScalar lft = cull_rect_.fLeft;
+          SkScalar rgt = cull_rect_.fRight;
+          if (rect.fLeft <= lft) {
+            lft = rect.fRight;
+          }
+          if (rect.fRight >= rgt) {
+            rgt = rect.fLeft;
+          }
           if (lft < rgt) {
             cull_rect_.fLeft = lft;
             cull_rect_.fRight = rgt;
diff --git a/display_list/display_list_matrix_clip_tracker.h b/display_list/utils/dl_matrix_clip_tracker.h
similarity index 44%
rename from display_list/display_list_matrix_clip_tracker.h
rename to display_list/utils/dl_matrix_clip_tracker.h
index 5e82f624a9ea95ef663add1c75e42a59f3c33b33..ca71e78b3df34f09630a3f2c3831772cc354815e 100644
--- a/display_list/display_list_matrix_clip_tracker.h
+++ b/display_list/utils/dl_matrix_clip_tracker.h
@@ -2,24 +2,49 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_MATRIX_CLIP_TRACKER_H_
-#define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_MATRIX_CLIP_TRACKER_H_
+#ifndef FLUTTER_DISPLAY_LIST_UTILS_DL_MATRIX_CLIP_TRACKER_H_
+#define FLUTTER_DISPLAY_LIST_UTILS_DL_MATRIX_CLIP_TRACKER_H_
 
 #include <vector>
 
+#include "flutter/display_list/dl_canvas.h"
 #include "flutter/fml/logging.h"
-#include "third_party/skia/include/core/SkClipOp.h"
+
 #include "third_party/skia/include/core/SkM44.h"
+#include "third_party/skia/include/core/SkMatrix.h"
+#include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkRRect.h"
+#include "third_party/skia/include/core/SkRect.h"
+#include "third_party/skia/include/core/SkScalar.h"
 
 namespace flutter {
 
 class DisplayListMatrixClipTracker {
+ private:
+  using ClipOp = DlCanvas::ClipOp;
+
  public:
   DisplayListMatrixClipTracker(const SkRect& cull_rect, const SkMatrix& matrix);
   DisplayListMatrixClipTracker(const SkRect& cull_rect, const SkM44& matrix);
 
-  bool using_4x4_matrix() { return current_->is_4x4(); }
+  // This method should almost never be used as it breaks the encapsulation
+  // of the enclosing clips. However it is needed for practical purposes in
+  // some rare cases - such as when a saveLayer is collecting rendering
+  // operations prior to applying a filter on the entire layer bounds and
+  // some of those operations fall outside the enclosing clip, but their
+  // filtered content will spread out from where they were rendered on the
+  // layer into the enclosing clipped area.
+  // Omitting the |cull_rect| argument, or passing nullptr, will restore the
+  // cull rect to the initial value it had when the tracker was constructed.
+  void resetCullRect(const SkRect* cull_rect = nullptr) {
+    current_->resetBounds(cull_rect ? *cull_rect : original_cull_rect_);
+  }
+
+  static bool is_3x3(const SkM44& m44);
+
+  SkRect base_device_cull_rect() const { return saved_[0]->device_cull_rect(); }
+
+  bool using_4x4_matrix() const { return current_->is_4x4(); }
 
   SkM44 matrix_4x4() const { return current_->matrix_4x4(); }
   SkMatrix matrix_3x3() const { return current_->matrix_3x3(); }
@@ -28,10 +53,16 @@ class DisplayListMatrixClipTracker {
   bool content_culled(const SkRect& content_bounds) const {
     return current_->content_culled(content_bounds);
   }
+  bool is_cull_rect_empty() const { return current_->is_cull_rect_empty(); }
 
   void save();
   void restore();
-  int getSaveCount() { return saved_.size(); }
+  void reset();
+  int getSaveCount() {
+    // saved_[0] is always the untouched initial conditions
+    // saved_[1] is the first editable stack entry
+    return saved_.size() - 1;
+  }
   void restoreToCount(int restore_count);
 
   void translate(SkScalar tx, SkScalar ty) { current_->translate(tx, ty); }
@@ -40,15 +71,34 @@ class DisplayListMatrixClipTracker {
   void rotate(SkScalar degrees) { current_->rotate(degrees); }
   void transform(const SkM44& m44);
   void transform(const SkMatrix& matrix) { current_->transform(matrix); }
+  // clang-format off
+  void transform2DAffine(
+      SkScalar mxx, SkScalar mxy, SkScalar mxt,
+      SkScalar myx, SkScalar myy, SkScalar myt);
+  void transformFullPerspective(
+      SkScalar mxx, SkScalar mxy, SkScalar mxz, SkScalar mxt,
+      SkScalar myx, SkScalar myy, SkScalar myz, SkScalar myt,
+      SkScalar mzx, SkScalar mzy, SkScalar mzz, SkScalar mzt,
+      SkScalar mwx, SkScalar mwy, SkScalar mwz, SkScalar mwt);
+  // clang-format on
   void setTransform(const SkMatrix& matrix) { current_->setTransform(matrix); }
   void setTransform(const SkM44& m44);
   void setIdentity() { current_->setIdentity(); }
+  // If the matrix in |other_tracker| is invertible then transform this
+  // tracker by the inverse of its matrix and return true. Otherwise,
+  // return false and leave this tracker unmodified.
+  bool inverseTransform(const DisplayListMatrixClipTracker& other_tracker);
+
+  bool mapRect(SkRect* rect) const { return current_->mapRect(*rect, rect); }
+  bool mapRect(const SkRect& src, SkRect* mapped) {
+    return current_->mapRect(src, mapped);
+  }
 
-  void clipRect(const SkRect& rect, SkClipOp op, bool is_aa) {
+  void clipRect(const SkRect& rect, ClipOp op, bool is_aa) {
     current_->clipBounds(rect, op, is_aa);
   }
-  void clipRRect(const SkRRect& rrect, SkClipOp op, bool is_aa);
-  void clipPath(const SkPath& path, SkClipOp op, bool is_aa);
+  void clipRRect(const SkRRect& rrect, ClipOp op, bool is_aa);
+  void clipPath(const SkPath& path, ClipOp op, bool is_aa);
 
  private:
   class Data {
@@ -60,9 +110,10 @@ class DisplayListMatrixClipTracker {
     virtual SkMatrix matrix_3x3() const = 0;
     virtual SkM44 matrix_4x4() const = 0;
 
-    virtual SkRect device_cull_rect() const { return cull_rect_; }
+    SkRect device_cull_rect() const { return cull_rect_; }
     virtual SkRect local_cull_rect() const = 0;
     virtual bool content_culled(const SkRect& content_bounds) const;
+    bool is_cull_rect_empty() const { return cull_rect_.isEmpty(); }
 
     virtual void translate(SkScalar tx, SkScalar ty) = 0;
     virtual void scale(SkScalar sx, SkScalar sy) = 0;
@@ -73,24 +124,28 @@ class DisplayListMatrixClipTracker {
     virtual void setTransform(const SkMatrix& matrix) = 0;
     virtual void setTransform(const SkM44& m44) = 0;
     virtual void setIdentity() = 0;
+    virtual bool mapRect(const SkRect& rect, SkRect* mapped) const = 0;
+    virtual bool canBeInverted() const = 0;
+
+    virtual void clipBounds(const SkRect& clip, ClipOp op, bool is_aa);
 
-    virtual void clipBounds(const SkRect& clip, SkClipOp op, bool is_aa);
+    virtual void resetBounds(const SkRect& cull_rect);
 
    protected:
-    Data(const SkRect& rect) : cull_rect_(rect) {}
+    explicit Data(const SkRect& rect) : cull_rect_(rect) {}
 
     virtual bool has_perspective() const = 0;
-    virtual bool map_rect(const SkRect& rect, SkRect* mapped) const = 0;
 
     SkRect cull_rect_;
   };
   friend class Data3x3;
   friend class Data4x4;
 
+  SkRect original_cull_rect_;
   Data* current_;
   std::vector<std::unique_ptr<Data>> saved_;
 };
 
 }  // namespace flutter
 
-#endif  // FLUTTER_DISPLAY_LIST_DISPLAY_LIST_MATRIX_CLIP_TRACKER_H_
+#endif  // FLUTTER_DISPLAY_LIST_UTILS_DL_MATRIX_CLIP_TRACKER_H_
diff --git a/display_list/display_list_matrix_clip_tracker_unittests.cc b/display_list/utils/dl_matrix_clip_tracker_unittests.cc
similarity index 45%
rename from display_list/display_list_matrix_clip_tracker_unittests.cc
rename to display_list/utils/dl_matrix_clip_tracker_unittests.cc
index c4ffb18310505446cb23799bad868ea79a53bc11..5cfda293148160f99805afa1501ac586b1ef1a63 100644
--- a/display_list/display_list_matrix_clip_tracker_unittests.cc
+++ b/display_list/utils/dl_matrix_clip_tracker_unittests.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/display_list/display_list_matrix_clip_tracker.h"
+#include "flutter/display_list/utils/dl_matrix_clip_tracker.h"
 #include "gtest/gtest.h"
 
 namespace flutter {
@@ -225,5 +225,228 @@ TEST(DisplayListMatrixClipTracker, Rotate) {
   ASSERT_EQ(tracker2.matrix_4x4(), rotated_m44);
 }
 
+TEST(DisplayListMatrixClipTracker, Transform2DAffine) {
+  const SkRect cull_rect = SkRect::MakeLTRB(20, 20, 60, 60);
+  const SkMatrix matrix = SkMatrix::Scale(4, 4);
+  const SkM44 m44 = SkM44::Scale(4, 4);
+
+  const SkMatrix transformed_matrix =
+      SkMatrix::Concat(matrix, SkMatrix::MakeAll(2, 0, 5,  //
+                                                 0, 2, 6,  //
+                                                 0, 0, 1));
+  const SkM44 transformed_m44 = SkM44(transformed_matrix);
+  const SkRect local_cull_rect = SkRect::MakeLTRB(0, -0.5, 5, 4.5);
+
+  DisplayListMatrixClipTracker tracker1(cull_rect, matrix);
+  DisplayListMatrixClipTracker tracker2(cull_rect, m44);
+  tracker1.transform2DAffine(2, 0, 5,  //
+                             0, 2, 6);
+  tracker2.transform2DAffine(2, 0, 5,  //
+                             0, 2, 6);
+  ASSERT_FALSE(tracker1.using_4x4_matrix());
+  ASSERT_EQ(tracker1.device_cull_rect(), cull_rect);
+  ASSERT_EQ(tracker1.local_cull_rect(), local_cull_rect);
+  ASSERT_EQ(tracker1.matrix_3x3(), transformed_matrix);
+  ASSERT_EQ(tracker1.matrix_4x4(), transformed_m44);
+
+  ASSERT_FALSE(tracker2.using_4x4_matrix());
+  ASSERT_EQ(tracker2.device_cull_rect(), cull_rect);
+  ASSERT_EQ(tracker2.local_cull_rect(), local_cull_rect);
+  ASSERT_EQ(tracker2.matrix_3x3(), transformed_matrix);
+  ASSERT_EQ(tracker2.matrix_4x4(), transformed_m44);
+}
+
+TEST(DisplayListMatrixClipTracker, TransformFullPerspectiveUsing3x3Matrix) {
+  const SkRect cull_rect = SkRect::MakeLTRB(20, 20, 60, 60);
+  const SkMatrix matrix = SkMatrix::Scale(4, 4);
+  const SkM44 m44 = SkM44::Scale(4, 4);
+
+  const SkMatrix transformed_matrix =
+      SkMatrix::Concat(matrix, SkMatrix::MakeAll(2, 0, 5,  //
+                                                 0, 2, 6,  //
+                                                 0, 0, 1));
+  const SkM44 transformed_m44 = SkM44(transformed_matrix);
+  const SkRect local_cull_rect = SkRect::MakeLTRB(0, -0.5, 5, 4.5);
+
+  DisplayListMatrixClipTracker tracker1(cull_rect, matrix);
+  DisplayListMatrixClipTracker tracker2(cull_rect, m44);
+  tracker1.transformFullPerspective(2, 0, 0, 5,  //
+                                    0, 2, 0, 6,  //
+                                    0, 0, 1, 0,  //
+                                    0, 0, 0, 1);
+  tracker2.transformFullPerspective(2, 0, 0, 5,  //
+                                    0, 2, 0, 6,  //
+                                    0, 0, 1, 0,  //
+                                    0, 0, 0, 1);
+  ASSERT_FALSE(tracker1.using_4x4_matrix());
+  ASSERT_EQ(tracker1.device_cull_rect(), cull_rect);
+  ASSERT_EQ(tracker1.local_cull_rect(), local_cull_rect);
+  ASSERT_EQ(tracker1.matrix_3x3(), transformed_matrix);
+  ASSERT_EQ(tracker1.matrix_4x4(), transformed_m44);
+
+  ASSERT_FALSE(tracker2.using_4x4_matrix());
+  ASSERT_EQ(tracker2.device_cull_rect(), cull_rect);
+  ASSERT_EQ(tracker2.local_cull_rect(), local_cull_rect);
+  ASSERT_EQ(tracker2.matrix_3x3(), transformed_matrix);
+  ASSERT_EQ(tracker2.matrix_4x4(), transformed_m44);
+}
+
+TEST(DisplayListMatrixClipTracker, TransformFullPerspectiveUsing4x4Matrix) {
+  const SkRect cull_rect = SkRect::MakeLTRB(20, 20, 60, 60);
+  const SkMatrix matrix = SkMatrix::Scale(4, 4);
+  const SkM44 m44 = SkM44::Scale(4, 4);
+
+  const SkM44 transformed_m44 = SkM44(m44, SkM44(2, 0, 0, 5,  //
+                                                 0, 2, 0, 6,  //
+                                                 0, 0, 1, 7,  //
+                                                 0, 0, 0, 1));
+  const SkRect local_cull_rect = SkRect::MakeLTRB(0, -0.5, 5, 4.5);
+
+  DisplayListMatrixClipTracker tracker1(cull_rect, matrix);
+  DisplayListMatrixClipTracker tracker2(cull_rect, m44);
+  tracker1.transformFullPerspective(2, 0, 0, 5,  //
+                                    0, 2, 0, 6,  //
+                                    0, 0, 1, 7,  //
+                                    0, 0, 0, 1);
+  tracker2.transformFullPerspective(2, 0, 0, 5,  //
+                                    0, 2, 0, 6,  //
+                                    0, 0, 1, 7,  //
+                                    0, 0, 0, 1);
+  ASSERT_TRUE(tracker1.using_4x4_matrix());
+  ASSERT_EQ(tracker1.device_cull_rect(), cull_rect);
+  ASSERT_EQ(tracker1.local_cull_rect(), local_cull_rect);
+  ASSERT_EQ(tracker1.matrix_4x4(), transformed_m44);
+
+  ASSERT_TRUE(tracker2.using_4x4_matrix());
+  ASSERT_EQ(tracker2.device_cull_rect(), cull_rect);
+  ASSERT_EQ(tracker2.local_cull_rect(), local_cull_rect);
+  ASSERT_EQ(tracker2.matrix_4x4(), transformed_m44);
+}
+
+TEST(DisplayListMatrixClipTracker, ClipDifference) {
+  SkRect cull_rect = SkRect::MakeLTRB(20, 20, 40, 40);
+
+  auto non_reducing = [&cull_rect](const SkRect& diff_rect,
+                                   const std::string& label) {
+    {
+      DisplayListMatrixClipTracker tracker(cull_rect, SkMatrix::I());
+      tracker.clipRect(diff_rect, DlCanvas::ClipOp::kDifference, false);
+      ASSERT_EQ(tracker.device_cull_rect(), cull_rect) << label;
+    }
+    {
+      DisplayListMatrixClipTracker tracker(cull_rect, SkMatrix::I());
+      const SkRRect diff_rrect = SkRRect::MakeRect(diff_rect);
+      tracker.clipRRect(diff_rrect, DlCanvas::ClipOp::kDifference, false);
+      ASSERT_EQ(tracker.device_cull_rect(), cull_rect) << label << " (RRect)";
+    }
+    {
+      DisplayListMatrixClipTracker tracker(cull_rect, SkMatrix::I());
+      const SkPath diff_path = SkPath().addRect(diff_rect);
+      tracker.clipPath(diff_path, DlCanvas::ClipOp::kDifference, false);
+      ASSERT_EQ(tracker.device_cull_rect(), cull_rect) << label << " (RRect)";
+    }
+  };
+
+  auto reducing = [&cull_rect](const SkRect& diff_rect,
+                               const SkRect& result_rect,
+                               const std::string& label) {
+    ASSERT_TRUE(result_rect.isEmpty() || cull_rect.contains(result_rect));
+    {
+      DisplayListMatrixClipTracker tracker(cull_rect, SkMatrix::I());
+      tracker.clipRect(diff_rect, DlCanvas::ClipOp::kDifference, false);
+      ASSERT_EQ(tracker.device_cull_rect(), result_rect) << label;
+    }
+    {
+      DisplayListMatrixClipTracker tracker(cull_rect, SkMatrix::I());
+      const SkRRect diff_rrect = SkRRect::MakeRect(diff_rect);
+      tracker.clipRRect(diff_rrect, DlCanvas::ClipOp::kDifference, false);
+      ASSERT_EQ(tracker.device_cull_rect(), result_rect) << label << " (RRect)";
+    }
+    {
+      DisplayListMatrixClipTracker tracker(cull_rect, SkMatrix::I());
+      const SkPath diff_path = SkPath().addRect(diff_rect);
+      tracker.clipPath(diff_path, DlCanvas::ClipOp::kDifference, false);
+      ASSERT_EQ(tracker.device_cull_rect(), result_rect) << label << " (RRect)";
+    }
+  };
+
+  // Skim the corners and edge
+  non_reducing(SkRect::MakeLTRB(10, 10, 20, 20), "outside UL corner");
+  non_reducing(SkRect::MakeLTRB(20, 10, 40, 20), "Above");
+  non_reducing(SkRect::MakeLTRB(40, 10, 50, 20), "outside UR corner");
+  non_reducing(SkRect::MakeLTRB(40, 20, 50, 40), "Right");
+  non_reducing(SkRect::MakeLTRB(40, 40, 50, 50), "outside LR corner");
+  non_reducing(SkRect::MakeLTRB(20, 40, 40, 50), "Below");
+  non_reducing(SkRect::MakeLTRB(10, 40, 20, 50), "outside LR corner");
+  non_reducing(SkRect::MakeLTRB(10, 20, 20, 40), "Left");
+
+  // Overlap corners
+  non_reducing(SkRect::MakeLTRB(15, 15, 25, 25), "covering UL corner");
+  non_reducing(SkRect::MakeLTRB(35, 15, 45, 25), "covering UR corner");
+  non_reducing(SkRect::MakeLTRB(35, 35, 45, 45), "covering LR corner");
+  non_reducing(SkRect::MakeLTRB(15, 35, 25, 45), "covering LL corner");
+
+  // Overlap edges, but not across an entire side
+  non_reducing(SkRect::MakeLTRB(20, 15, 39, 25), "Top edge left-biased");
+  non_reducing(SkRect::MakeLTRB(21, 15, 40, 25), "Top edge, right biased");
+  non_reducing(SkRect::MakeLTRB(35, 20, 45, 39), "Right edge, top-biased");
+  non_reducing(SkRect::MakeLTRB(35, 21, 45, 40), "Right edge, bottom-biased");
+  non_reducing(SkRect::MakeLTRB(20, 35, 39, 45), "Bottom edge, left-biased");
+  non_reducing(SkRect::MakeLTRB(21, 35, 40, 45), "Bottom edge, right-biased");
+  non_reducing(SkRect::MakeLTRB(15, 20, 25, 39), "Left edge, top-biased");
+  non_reducing(SkRect::MakeLTRB(15, 21, 25, 40), "Left edge, bottom-biased");
+
+  // Slice all the way through the middle
+  non_reducing(SkRect::MakeLTRB(25, 15, 35, 45), "Vertical interior slice");
+  non_reducing(SkRect::MakeLTRB(15, 25, 45, 35), "Horizontal interior slice");
+
+  // Slice off each edge
+  reducing(SkRect::MakeLTRB(20, 15, 40, 25),  //
+           SkRect::MakeLTRB(20, 25, 40, 40),  //
+           "Slice off top");
+  reducing(SkRect::MakeLTRB(35, 20, 45, 40),  //
+           SkRect::MakeLTRB(20, 20, 35, 40),  //
+           "Slice off right");
+  reducing(SkRect::MakeLTRB(20, 35, 40, 45),  //
+           SkRect::MakeLTRB(20, 20, 40, 35),  //
+           "Slice off bottom");
+  reducing(SkRect::MakeLTRB(15, 20, 25, 40),  //
+           SkRect::MakeLTRB(25, 20, 40, 40),  //
+           "Slice off left");
+
+  // cull rect contains diff rect
+  non_reducing(SkRect::MakeLTRB(21, 21, 39, 39), "Contained, non-covering");
+
+  // cull rect equals diff rect
+  reducing(cull_rect, SkRect::MakeEmpty(), "Perfectly covering");
+
+  // diff rect contains cull rect
+  reducing(SkRect::MakeLTRB(15, 15, 45, 45), SkRect::MakeEmpty(), "Smothering");
+}
+
+TEST(DisplayListMatrixClipTracker, ClipPathWithInvertFillType) {
+  SkRect cull_rect = SkRect::MakeLTRB(0, 0, 100.0, 100.0);
+  DisplayListMatrixClipTracker builder(cull_rect, SkMatrix::I());
+  SkPath clip = SkPath().addCircle(10.2, 11.3, 2).addCircle(20.4, 25.7, 2);
+  clip.setFillType(SkPathFillType::kInverseWinding);
+  builder.clipPath(clip, DlCanvas::ClipOp::kIntersect, false);
+
+  ASSERT_EQ(builder.local_cull_rect(), cull_rect);
+  ASSERT_EQ(builder.device_cull_rect(), cull_rect);
+}
+
+TEST(DisplayListMatrixClipTracker, DiffClipPathWithInvertFillType) {
+  SkRect cull_rect = SkRect::MakeLTRB(0, 0, 100.0, 100.0);
+  DisplayListMatrixClipTracker tracker(cull_rect, SkMatrix::I());
+
+  SkPath clip = SkPath().addCircle(10.2, 11.3, 2).addCircle(20.4, 25.7, 2);
+  clip.setFillType(SkPathFillType::kInverseWinding);
+  SkRect clip_bounds = SkRect::MakeLTRB(8.2, 9.3, 22.4, 27.7);
+  tracker.clipPath(clip, DlCanvas::ClipOp::kDifference, false);
+
+  ASSERT_EQ(tracker.local_cull_rect(), clip_bounds);
+  ASSERT_EQ(tracker.device_cull_rect(), clip_bounds);
+}
+
 }  // namespace testing
 }  // namespace flutter
diff --git a/display_list/utils/dl_receiver_utils.cc b/display_list/utils/dl_receiver_utils.cc
new file mode 100644
index 0000000000000000000000000000000000000000..9b49b9dc5ead833eb59778653b0562d0ec99830b
--- /dev/null
+++ b/display_list/utils/dl_receiver_utils.cc
@@ -0,0 +1,11 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/display_list/utils/dl_receiver_utils.h"
+
+namespace flutter {
+
+// Just exists to ensure that the header can be cleanly imported.
+
+}  // namespace flutter
diff --git a/display_list/utils/dl_receiver_utils.h b/display_list/utils/dl_receiver_utils.h
new file mode 100644
index 0000000000000000000000000000000000000000..a3b5bb156de867eaf32ef651857bcd354a657ebe
--- /dev/null
+++ b/display_list/utils/dl_receiver_utils.h
@@ -0,0 +1,143 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_DISPLAY_LIST_UTILS_DL_RECEIVER_UTILS_H_
+#define FLUTTER_DISPLAY_LIST_UTILS_DL_RECEIVER_UTILS_H_
+
+#include "flutter/display_list/dl_op_receiver.h"
+#include "flutter/fml/logging.h"
+
+// This file contains various utility classes to ease implementing
+// a Flutter DisplayList DlOpReceiver, including:
+//
+// IgnoreAttributeDispatchHelper:
+// IgnoreClipDispatchHelper:
+// IgnoreTransformDispatchHelper
+//     Empty overrides of all of the associated methods of DlOpReceiver
+//     for receivers that only track some of the rendering operations
+
+namespace flutter {
+
+// A utility class that will ignore all DlOpReceiver methods relating
+// to the setting of attributes.
+class IgnoreAttributeDispatchHelper : public virtual DlOpReceiver {
+ public:
+  void setAntiAlias(bool aa) override {}
+  void setInvertColors(bool invert) override {}
+  void setStrokeCap(DlStrokeCap cap) override {}
+  void setStrokeJoin(DlStrokeJoin join) override {}
+  void setDrawStyle(DlDrawStyle style) override {}
+  void setStrokeWidth(float width) override {}
+  void setStrokeMiter(float limit) override {}
+  void setColor(DlColor color) override {}
+  void setBlendMode(DlBlendMode mode) override {}
+  void setColorSource(const DlColorSource* source) override {}
+  void setImageFilter(const DlImageFilter* filter) override {}
+  void setColorFilter(const DlColorFilter* filter) override {}
+  void setPathEffect(const DlPathEffect* effect) override {}
+  void setMaskFilter(const DlMaskFilter* filter) override {}
+};
+
+// A utility class that will ignore all DlOpReceiver methods relating
+// to setting a clip.
+class IgnoreClipDispatchHelper : public virtual DlOpReceiver {
+  void clipRect(const SkRect& rect,
+                DlCanvas::ClipOp clip_op,
+                bool is_aa) override {}
+  void clipRRect(const SkRRect& rrect,
+                 DlCanvas::ClipOp clip_op,
+                 bool is_aa) override {}
+  void clipPath(const SkPath& path,
+                DlCanvas::ClipOp clip_op,
+                bool is_aa) override {}
+};
+
+// A utility class that will ignore all DlOpReceiver methods relating
+// to modifying the transform.
+class IgnoreTransformDispatchHelper : public virtual DlOpReceiver {
+ public:
+  void translate(SkScalar tx, SkScalar ty) override {}
+  void scale(SkScalar sx, SkScalar sy) override {}
+  void rotate(SkScalar degrees) override {}
+  void skew(SkScalar sx, SkScalar sy) override {}
+  // clang-format off
+  // 2x3 2D affine subset of a 4x4 transform in row major order
+  void transform2DAffine(SkScalar mxx, SkScalar mxy, SkScalar mxt,
+                         SkScalar myx, SkScalar myy, SkScalar myt) override {}
+  // full 4x4 transform in row major order
+  void transformFullPerspective(
+      SkScalar mxx, SkScalar mxy, SkScalar mxz, SkScalar mxt,
+      SkScalar myx, SkScalar myy, SkScalar myz, SkScalar myt,
+      SkScalar mzx, SkScalar mzy, SkScalar mzz, SkScalar mzt,
+      SkScalar mwx, SkScalar mwy, SkScalar mwz, SkScalar mwt) override {}
+  // clang-format on
+  void transformReset() override {}
+};
+
+class IgnoreDrawDispatchHelper : public virtual DlOpReceiver {
+ public:
+  void save() override {}
+  void saveLayer(const SkRect& bounds,
+                 const SaveLayerOptions options,
+                 const DlImageFilter* backdrop) override {}
+  void restore() override {}
+  void drawColor(DlColor color, DlBlendMode mode) override {}
+  void drawPaint() override {}
+  void drawLine(const SkPoint& p0, const SkPoint& p1) override {}
+  void drawRect(const SkRect& rect) override {}
+  void drawOval(const SkRect& bounds) override {}
+  void drawCircle(const SkPoint& center, SkScalar radius) override {}
+  void drawRRect(const SkRRect& rrect) override {}
+  void drawDRRect(const SkRRect& outer, const SkRRect& inner) override {}
+  void drawPath(const SkPath& path) override {}
+  void drawArc(const SkRect& oval_bounds,
+               SkScalar start_degrees,
+               SkScalar sweep_degrees,
+               bool use_center) override {}
+  void drawPoints(DlCanvas::PointMode mode,
+                  uint32_t count,
+                  const SkPoint points[]) override {}
+  void drawVertices(const DlVertices* vertices, DlBlendMode mode) override {}
+  void drawImage(const sk_sp<DlImage> image,
+                 const SkPoint point,
+                 DlImageSampling sampling,
+                 bool render_with_attributes) override {}
+  void drawImageRect(const sk_sp<DlImage> image,
+                     const SkRect& src,
+                     const SkRect& dst,
+                     DlImageSampling sampling,
+                     bool render_with_attributes,
+                     SrcRectConstraint constraint) override {}
+  void drawImageNine(const sk_sp<DlImage> image,
+                     const SkIRect& center,
+                     const SkRect& dst,
+                     DlFilterMode filter,
+                     bool render_with_attributes) override {}
+  void drawAtlas(const sk_sp<DlImage> atlas,
+                 const SkRSXform xform[],
+                 const SkRect tex[],
+                 const DlColor colors[],
+                 int count,
+                 DlBlendMode mode,
+                 DlImageSampling sampling,
+                 const SkRect* cull_rect,
+                 bool render_with_attributes) override {}
+  void drawDisplayList(const sk_sp<DisplayList> display_list,
+                       SkScalar opacity) override {}
+  void drawTextBlob(const sk_sp<SkTextBlob> blob,
+                    SkScalar x,
+                    SkScalar y) override {}
+  void drawTextFrame(const std::shared_ptr<impeller::TextFrame>& text_frame,
+                     SkScalar x,
+                     SkScalar y) override {}
+  void drawShadow(const SkPath& path,
+                  const DlColor color,
+                  const SkScalar elevation,
+                  bool transparent_occluder,
+                  SkScalar dpr) override {}
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_DISPLAY_LIST_UTILS_DL_RECEIVER_UTILS_H_
diff --git a/docs/Doxyfile.template b/docs/Doxyfile.template
new file mode 100644
index 0000000000000000000000000000000000000000..129cff8b2b5dfe4efb8c2dbd63e4bff5676fd772
--- /dev/null
+++ b/docs/Doxyfile.template
@@ -0,0 +1,2747 @@
+# Doxyfile 1.9.4
+
+# This file is a template for the Doxyfile used to generate Flutter
+# documentation for the Engine code using Doxygen. Fields with
+# @@FIELD_NAME@@ as the value will be substituted by the
+# tools/gen_docs.sh script to contain the appropriate values for a
+# specific documentation section configured in the script.
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+#
+# Note:
+#
+# Use doxygen to compare the used configuration file with the template
+# configuration file:
+# doxygen -x [configFile]
+# Use doxygen to compare the used configuration file with the template
+# configuration file without replacing the environment variables or CMake type
+# replacement variables:
+# doxygen -x_noenv [configFile]
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the configuration
+# file that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# https://www.gnu.org/software/libiconv/ for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME           = "@@PROJECT_NAME@@"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER         =
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          =
+
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
+
+PROJECT_LOGO           = ./docs/flutter_logo.png
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = "@@OUTPUT_DIRECTORY@@"
+
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096
+# sub-directories (in 2 levels) under the output directory of each output format
+# and will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to
+# control the number of sub-directories.
+# The default value is: NO.
+
+# For Flutter, this should be NO, so that URLs remain stable across versions.
+CREATE_SUBDIRS         = NO
+
+# Controls the number of sub-directories that will be created when
+# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every
+# level increment doubles the number of directories, resulting in 4096
+# directories at level 8 which is the default and also the maximum value. The
+# sub-directories are organized in 2 levels, the first level always has a fixed
+# number of 16 directories.
+# Minimum value: 0, maximum value: 8, default value: 8.
+# This tag requires that the tag CREATE_SUBDIRS is set to YES.
+
+CREATE_SUBDIRS_LEVEL   = 8
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian,
+# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English
+# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek,
+# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with
+# English messages), Korean, Korean-en (Korean with English messages), Latvian,
+# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese,
+# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish,
+# Swedish, Turkish, Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
+FULL_PATH_NAMES        = YES
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH        =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the JAVADOC_BANNER tag is set to YES then doxygen will interpret a line
+# such as
+# /***************
+# as being the beginning of a Javadoc-style comment "banner". If set to NO, the
+# Javadoc-style will behave just like regular comments and it will not be
+# interpreted by doxygen.
+# The default value is: NO.
+
+JAVADOC_BANNER         = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
+TAB_SIZE               = 4
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:^^"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
+
+ALIASES                =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Set the OPTIMIZE_OUTPUT_SLICE tag to YES if your project consists of Slice
+# sources only. Doxygen will then generate output that is more tailored for that
+# language. For instance, namespaces will be presented as modules, types will be
+# separated into more groups, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_SLICE  = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
+# tries to guess whether the code is fixed or free formatted code, this is the
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
+#
+# Note: For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen. When specifying no_extension you should add
+# * to the FILE_PATTERNS.
+#
+# Note see also the list of default file extension mappings.
+
+EXTENSION_MAPPING      =
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See https://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
+# to that level are automatically included in the table of contents, even if
+# they do not have an id attribute.
+# Note: This feature currently applies only to Markdown headings.
+# Minimum value: 0, maximum value: 99, default value: 5.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+TOC_INCLUDE_HEADINGS   = 0
+
+# The MARKDOWN_ID_STYLE tag can be used to specify the algorithm used to
+# generate identifiers for the Markdown headings. Note: Every identifier is
+# unique.
+# Possible values are: DOXYGEN Use a fixed 'autotoc_md' string followed by a
+# sequence number starting at 0. and GITHUB Use the lower case version of title
+# with any whitespace replaced by '-' and punctations characters removed..
+# The default value is: DOXYGEN.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+MARKDOWN_ID_STYLE      = DOXYGEN
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
+
+# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# than 0 to get more control over the balance between CPU load and processing
+# speed. At this moment only the input processing can be done using multiple
+# threads. Since this is still an experimental feature the default is set to 1,
+# which effectively disables parallel processing. Please report any issues you
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
+# If the TIMESTAMP tag is set different from NO then each generated page will
+# contain the date or date and time when the page was generated. Setting this to
+# NO can help when comparing the output of multiple runs.
+# Possible values are: YES, NO, DATETIME and DATE.
+# The default value is: NO.
+
+TIMESTAMP              = YES
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_PRIV_VIRTUAL tag is set to YES, documented private virtual
+# methods of a class will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIV_VIRTUAL   = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC         = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If this flag is set to YES, the name of an unnamed parameter in a declaration
+# will be determined by the corresponding definition. By default unnamed
+# parameters remain unnamed in the output.
+# The default value is: YES.
+
+RESOLVE_UNNAMED_PARAMS = YES
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# will also hide undocumented C++ concepts if enabled. This option has no effect
+# if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS          = NO
+
+# With the correct setting of option CASE_SENSE_NAMES doxygen will better be
+# able to match the capabilities of the underlying filesystem. In case the
+# filesystem is case sensitive (i.e. it supports files in the same directory
+# whose names only differ in casing), the option must be set to YES to properly
+# deal with such files in case they appear in the input. For filesystems that
+# are not case sensitive the option should be set to NO to properly deal with
+# output files written for symbols that only differ in casing, such as for two
+# classes, one named CLASS and the other named Class, and to also support
+# references to files without having to specify the exact matching casing. On
+# Windows (including Cygwin) and MacOS, users should typically set this option
+# to NO, whereas on Linux or other Unix flavors it should typically be set to
+# YES.
+# Possible values are: SYSTEM, NO and YES.
+# The default value is: SYSTEM.
+
+CASE_SENSE_NAMES       = NO
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= NO
+
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST      = NO
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST      = NO
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
+GENERATE_BUGLIST       = NO
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
+GENERATE_DEPRECATEDLIST= NO
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES, the
+# list will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
+SHOW_USED_FILES        = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
+
+CITE_BIB_FILES         =
+
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
+WARNINGS               = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
+# The default value is: YES.
+
+WARN_IF_DOC_ERROR      = YES
+
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
+# The default value is: NO.
+
+WARN_NO_PARAMDOC       = NO
+
+# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about
+# undocumented enumeration values. If set to NO, doxygen will accept
+# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: NO.
+
+WARN_IF_UNDOC_ENUM_VAL = NO
+
+# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS
+# then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but
+# at the end of the doxygen process doxygen will return with a non-zero status.
+# If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS_PRINT then doxygen behaves
+# like FAIL_ON_WARNINGS but in case no WARN_LOGFILE is defined doxygen will not
+# write the warning messages in between other messages but write them at the end
+# of a run, in case a WARN_LOGFILE is defined the warning messages will be
+# besides being in the defined file also be shown at the end of a run, unless
+# the WARN_LOGFILE is defined as - i.e. standard output (stdout) in that case
+# the behavior will remain as with the setting FAIL_ON_WARNINGS.
+# Possible values are: NO, YES, FAIL_ON_WARNINGS and FAIL_ON_WARNINGS_PRINT.
+# The default value is: NO.
+
+WARN_AS_ERROR          = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# See also: WARN_LINE_FORMAT
+# The default value is: $file:$line: $text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# In the $text part of the WARN_FORMAT command it is possible that a reference
+# to a more specific place is given. To make it easier to jump to this place
+# (outside of doxygen) the user can define a custom "cut" / "paste" string.
+# Example:
+# WARN_LINE_FORMAT = "'vi $file +$line'"
+# See also: WARN_FORMAT
+# The default value is: at line $line of file $file.
+
+WARN_LINE_FORMAT       = "at line $line of file $file"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr). In case the file specified cannot be opened for writing the
+# warning and error messages are written to standard error. When as file - is
+# specified the warning and error messages are written to standard output
+# (stdout).
+
+WARN_LOGFILE           = "@@LOG_FILE@@"
+
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
+# Note: If this tag is empty the current directory is searched.
+
+INPUT                  = @@INPUT_DIRECTORIES@@
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see:
+# https://www.gnu.org/software/libiconv/) for the list of possible encodings.
+# See also: INPUT_FILE_ENCODING
+# The default value is: UTF-8.
+
+INPUT_ENCODING         = UTF-8
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify
+# character encoding on a per file pattern basis. Doxygen will compare the file
+# name with each pattern and apply the encoding instead of the default
+# INPUT_ENCODING) if there is a match. The character encodings are a list of the
+# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding
+# "INPUT_ENCODING" for further information on supported encodings.
+
+INPUT_FILE_ENCODING    =
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# read by doxygen.
+#
+# Note the list of default checked file patterns might differ from the list of
+# default file extension mappings.
+#
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
+# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
+
+FILE_PATTERNS          = *.h \
+                         *.c \
+                         *.cc \
+                         *.m \
+                         *.mm \
+                         *.cpp \
+                         *.cxx \
+                         *.hh \
+                         *.hxx \
+                         *.hpp \
+                         *.c++ \
+                         *.h++
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE                =
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       = */tests/* \
+                         */testing/* \
+                         */test/* \
+                         */test_utils/*
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# ANamespace::AClass, ANamespace::*Test
+
+EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
+EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
+EXAMPLE_PATTERNS       = *
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
+IMAGE_PATH             =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+#
+# Note that doxygen will use the data processed and written to standard output
+# for further processing, therefore nothing else, like debug statements or used
+# commands (so in case of a Windows batch file always use @echo OFF), should be
+# written to standard output.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE = ./README.md
+
+# The Fortran standard specifies that for fixed formatted Fortran code all
+# characters from position 72 are to be considered as comment. A common
+# extension is to allow longer lines before the automatic comment starts. The
+# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can
+# be processed before the automatic comment starts.
+# Minimum value: 7, maximum value: 10000, default value: 72.
+
+FORTRAN_COMMENT_AFTER  = 72
+
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
+SOURCE_BROWSER         = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
+INLINE_SOURCES         = YES
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
+STRIP_CODE_COMMENTS    = NO
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# entity all documented functions referencing it will be listed.
+# The default value is: NO.
+
+REFERENCED_BY_RELATION = YES
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
+REFERENCES_RELATION    = YES
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see https://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the configuration file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
+
+ALPHABETICAL_INDEX     = YES
+
+# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes)
+# that should be ignored while generating the index headers. The IGNORE_PREFIX
+# tag works for classes, function and member names. The entity will be placed in
+# the alphabetical list under the first letter of the entity name that remains
+# after removing the prefix.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# Note: Since the styling of scrollbars can currently not be overruled in
+# Webkit/Chromium, the styling will be left out of the default doxygen.css if
+# one or more extra stylesheets have been specified. So if scrollbar
+# customization is desired it has to be added explicitly. For an example see the
+# documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output
+# should be rendered with a dark or light theme.
+# Possible values are: LIGHT always generate light mode output, DARK always
+# generate dark mode output, AUTO_LIGHT automatically set the mode according to
+# the user preference, use light mode if no preference is set (the default),
+# AUTO_DARK automatically set the mode according to the user preference, use
+# dark mode if no preference is set and TOGGLE allow to user to switch between
+# light and dark mode via a button.
+# The default value is: AUTO_LIGHT.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE        = AUTO_LIGHT
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a color-wheel, see
+# https://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE    = 212
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT    = 183
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA  = 100
+
+# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
+# documentation will contain a main index with vertical navigation menus that
+# are dynamically created via JavaScript. If disabled, the navigation index will
+# consists of multiple levels of tabs that are statically embedded in every HTML
+# page. Disable this option to support browsers that do not have JavaScript,
+# like the Qt help browser.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_MENUS     = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see:
+# https://developer.apple.com/xcode/), introduced with OSX 10.5 (Leopard). To
+# create a documentation set, doxygen will generate a Makefile in the HTML
+# output directory. Running make will produce the docset in that directory and
+# running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy
+# genXcode/_index.html for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET        = YES
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME        = "@@DOCSET_FEEDNAME@@"
+
+# This tag determines the URL of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDURL         =
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID       = io.flutter.engine
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID    = io.flutter.engine
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME  = Flutter
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_HTMLHELP      = NO
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_FILE               =
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+HHC_LOCATION           =
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the main .chm file (NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+GENERATE_CHI           = NO
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING     =
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+TOC_EXPAND             = NO
+
+# The SITEMAP_URL tag is used to specify the full URL of the place where the
+# generated documentation will be placed on the server by the user during the
+# deployment of the documentation. The generated sitemap is called sitemap.xml
+# and placed on the directory specified by HTML_OUTPUT. In case no SITEMAP_URL
+# is specified no sitemap is generated. For information about the sitemap
+# protocol see https://www.sitemaps.org
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SITEMAP_URL            =
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE          = io.flutter.engine
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# The QHG_LOCATION tag can be used to specify the location (absolute path
+# including file name) of Qt's qhelpgenerator. If non-empty doxygen will try to
+# run qhelpgenerator on the generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID         = io.flutter.engine
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+DISABLE_INDEX          = YES
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_TREEVIEW      = YES
+
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATE_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+ENUM_VALUES_PER_LINE   = 1
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+TREEVIEW_WIDTH         = 250
+
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email
+# addresses.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+OBFUSCATE_EMAILS       = YES
+
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE       = 10
+
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE           = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using JavaScript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see:
+# https://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see:
+# https://xapian.org/). See the section "External Indexing and Searching" for
+# details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# The default value is: YES.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when not enabling USE_PDFLATEX the default is latex when enabling
+# USE_PDFLATEX the default is pdflatex and when in the later case latex is
+# chosen this is overwritten by pdflatex. For specific output languages the
+# default can have been set differently, this depends on the implementation of
+# the output language.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_CMD_NAME         =
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# Note: This tag is used in the Makefile / make.bat.
+# See also: LATEX_MAKEINDEX_CMD for the part in the generated output file
+# (.tex).
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# The LATEX_MAKEINDEX_CMD tag can be used to specify the command name to
+# generate index for LaTeX. In case there is no backslash (\) as first character
+# it will be automatically added in the LaTeX code.
+# Note: This tag is used in the generated output file (.tex).
+# See also: MAKEINDEX_CMD_NAME for the part in the Makefile / make.bat.
+# The default value is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_MAKEINDEX_CMD    = makeindex
+
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PAPER_TYPE             = a4
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
+#
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           =
+
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_STYLESHEET =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PDF_HYPERLINKS         = YES
+
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+USE_PDFLATEX           = YES
+
+# The LATEX_BATCHMODE tag ignals the behavior of LaTeX in case of an error.
+# Possible values are: NO same as ERROR_STOP, YES same as BATCH, BATCH In batch
+# mode nothing is printed on the terminal, errors are scrolled as if <return> is
+# hit at every error; missing files that TeX tries to input or request from
+# keyboard input (\read on a not open input stream) cause the job to abort,
+# NON_STOP In nonstop mode the diagnostic message will appear on the terminal,
+# but there is no possibility of user interaction just like in batch mode,
+# SCROLL In scroll mode, TeX will stop only for missing files to input or if
+# keyboard input is necessary and ERROR_STOP In errorstop mode, TeX will stop at
+# each error, asking for user intervention.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BATCHMODE        = NO
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HIDE_INDICES     = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
+# The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute)
+# path from which the emoji images will be read. If a relative path is entered,
+# it will be relative to the LATEX_OUTPUT directory. If left blank the
+# LATEX_OUTPUT directory will be used.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EMOJI_DIRECTORY  =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# configuration file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's configuration file. A template extensions file can be
+# generated using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_EXTENSIONS_FILE    =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_EXTENSION          = .3
+
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             =
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_OUTPUT             = xml
+
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_PROGRAMLISTING     = YES
+
+# If the XML_NS_MEMB_FILE_SCOPE tag is set to YES, doxygen will include
+# namespace members in file scope as well, matching the HTML output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_NS_MEMB_FILE_SCOPE = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see https://autogen.sourceforge.net/) file that captures
+# the structure of the code including all documentation. Note that this feature
+# is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO, the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of
+# RECURSIVE has no effect here.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
+INCLUDE_PATH           =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+INCLUDE_FILE_PATTERNS  =
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+PREDEFINED             =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
+GENERATE_TAGFILE       =
+
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
+# The default value is: NO.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
+EXTERNAL_GROUPS        = YES
+
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to diagram generator tools
+#---------------------------------------------------------------------------
+
+# If set to YES the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# https://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: NO.
+
+HAVE_DOT               = NO
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS        = 0
+
+# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of
+# subgraphs. When you want a differently looking font in the dot files that
+# doxygen generates you can specify fontname, fontcolor and fontsize attributes.
+# For details please see <a href=https://graphviz.org/doc/info/attrs.html>Node,
+# Edge and Graph Attributes specification</a> You need to make sure dot is able
+# to find the font, which can be done by putting it in a standard location or by
+# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
+# directory containing the font. Default graphviz fontsize is 14.
+# The default value is: fontname=Helvetica,fontsize=10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_COMMON_ATTR        = "fontname=Helvetica,fontsize=10"
+
+# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can
+# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. <a
+# href=https://graphviz.org/doc/info/arrows.html>Complete documentation about
+# arrows shapes.</a>
+# The default value is: labelfontname=Helvetica,labelfontsize=10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_EDGE_ATTR          = "labelfontname=Helvetica,labelfontsize=10"
+
+# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes
+# around nodes set 'shape=plain' or 'shape=plaintext' <a
+# href=https://www.graphviz.org/doc/info/shapes.html>Shapes specification</a>
+# The default value is: shape=box,height=0.2,width=0.4.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NODE_ATTR          = "shape=box,height=0.2,width=0.4"
+
+# You can set the path where dot can find font specified with fontname in
+# DOT_COMMON_ATTR and others dot attributes.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH tag is set to YES or GRAPH or BUILTIN then doxygen will
+# generate a graph for each documented class showing the direct and indirect
+# inheritance relations. In case the CLASS_GRAPH tag is set to YES or GRAPH and
+# HAVE_DOT is enabled as well, then dot will be used to draw the graph. In case
+# the CLASS_GRAPH tag is set to YES and HAVE_DOT is disabled or if the
+# CLASS_GRAPH tag is set to BUILTIN, then the built-in generator will be used.
+# If the CLASS_GRAPH tag is set to TEXT the direct and indirect inheritance
+# relations will be shown as texts / links.
+# Possible values are: NO, YES, TEXT, GRAPH and BUILTIN.
+# The default value is: YES.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies. See also the chapter Grouping
+# in the manual.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LOOK               = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag UML_LOOK is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the DOT_UML_DETAILS tag is set to NO, doxygen will show attributes and
+# methods without types and arguments in the UML graphs. If the DOT_UML_DETAILS
+# tag is set to YES, doxygen will add type and arguments for attributes and
+# methods in the UML graphs. If the DOT_UML_DETAILS tag is set to NONE, doxygen
+# will not generate fields with class member information in the UML graphs. The
+# class diagrams will look similar to the default class diagrams but using UML
+# notation for the relationships.
+# Possible values are: NO, YES and NONE.
+# The default value is: NO.
+# This tag requires that the tag UML_LOOK is set to YES.
+
+DOT_UML_DETAILS        = NO
+
+# The DOT_WRAP_THRESHOLD tag can be used to set the maximum number of characters
+# to display on a single line. If the actual line length exceeds this threshold
+# significantly it will wrapped across multiple lines. Some heuristics are apply
+# to avoid ugly line breaks.
+# Minimum value: 0, maximum value: 1000, default value: 17.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_WRAP_THRESHOLD     = 17
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDE_GRAPH          = YES
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DIRECTORY_GRAPH        = YES
+
+# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels
+# of child directories generated in directory dependency graphs by dot.
+# Minimum value: 1, maximum value: 25, default value: 1.
+# This tag requires that the tag DIRECTORY_GRAPH is set to YES.
+
+DIR_GRAPH_MAX_DEPTH    = 1
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# https://www.graphviz.org/)).
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_IMAGE_FORMAT       = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = NO
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS           =
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file or to the filename of jar file
+# to be used. If left blank, it is assumed PlantUML is not used or called during
+# a preprocessing step. Doxygen will generate a warning when it encounters a
+# \startuml command in this case and will not generate output for the diagram.
+
+PLANTUML_JAR_PATH      =
+
+# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
+# configuration file for plantuml.
+
+PLANTUML_CFG_FILE      =
+
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
+PLANTUML_INCLUDE_PATH  =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal
+# graphical representation for inheritance and collaboration diagrams is used.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
+# files that are used to generate the various graphs.
+#
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
+# The default value is: YES.
+
+DOT_CLEANUP            = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. If the MSCGEN_TOOL tag is left empty (the default), then doxygen will
+# use a built-in version of mscgen tool to produce the charts. Alternatively,
+# the MSCGEN_TOOL tag can also specify the name an external tool. For instance,
+# specifying prog as the value, doxygen will call the tool as prog -T
+# <outfile_format> -o <outputfile> <inputfile>. The external tool should support
+# output file formats "png", "eps", "svg", and "ismap".
+
+MSCGEN_TOOL            =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           =
diff --git a/docs/app_anatomy.svg b/docs/app_anatomy.svg
new file mode 100644
index 0000000000000000000000000000000000000000..619c5de9dfe249b00dc8be58245b7ba5f3f5a6b5
--- /dev/null
+++ b/docs/app_anatomy.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 338.879 499.199" fill="none" stroke-linecap="square" stroke-miterlimit="10" xmlns="http://www.w3.org/2000/svg"><clipPath id="a"><path d="M0 0h338.88v499.2H0V0z"/></clipPath><g clip-path="url(#a)"><path fill="#fff" d="M0 0h338.88v499.2H0z" fill-rule="evenodd"/><path fill="none" d="M299.832 5.853a7.89 7.89 0 0 1 7.89 7.89V144.45a7.89 7.89 0 0 0 7.89 7.89 7.89 7.89 0 0 0-7.89 7.89V290.94a7.89 7.89 0 0 1-7.89 7.89z"/><path fill="none" d="M299.832 5.853a7.89 7.89 0 0 1 7.89 7.89V144.45a7.89 7.89 0 0 0 7.89 7.89 7.89 7.89 0 0 0-7.89 7.89V290.94a7.89 7.89 0 0 1-7.89 7.89"/><path stroke="#595959" stroke-linejoin="round" stroke-linecap="butt" d="M299.832 5.853a7.89 7.89 0 0 1 7.89 7.89V144.45a7.89 7.89 0 0 0 7.89 7.89 7.89 7.89 0 0 0-7.89 7.89V290.94a7.89 7.89 0 0 1-7.89 7.89"/><path fill="none" d="M299.83 302.297a7.89 7.89 0 0 1 7.89 7.89v78.393a7.89 7.89 0 0 0 7.889 7.89 7.89 7.89 0 0 0-7.89 7.89v78.393a7.89 7.89 0 0 1-7.89 7.89z"/><path fill="none" d="M299.83 302.297a7.89 7.89 0 0 1 7.89 7.89v78.393a7.89 7.89 0 0 0 7.889 7.89 7.89 7.89 0 0 0-7.89 7.89v78.393a7.89 7.89 0 0 1-7.89 7.89"/><path stroke="#595959" stroke-linejoin="round" stroke-linecap="butt" d="M299.83 302.297a7.89 7.89 0 0 1 7.89 7.89v78.393a7.89 7.89 0 0 0 7.889 7.89 7.89 7.89 0 0 0-7.89 7.89v78.393a7.89 7.89 0 0 1-7.89 7.89"/><path fill="none" d="M96.932 301.75c-10.672 0-19.323-8.65-19.323-19.322v-28.22c0-10.672-8.651-19.323-19.323-19.323 10.672 0 19.323-8.652 19.323-19.323v-28.22c0-10.673 8.651-19.324 19.323-19.324z"/><path fill="none" d="M96.932 301.75c-10.672 0-19.323-8.65-19.323-19.322v-28.22c0-10.672-8.651-19.323-19.323-19.323 10.672 0 19.323-8.652 19.323-19.323v-28.22c0-10.673 8.651-19.324 19.323-19.324"/><path stroke="#595959" stroke-linejoin="round" stroke-linecap="butt" d="M96.932 301.75c-10.672 0-19.323-8.65-19.323-19.322v-28.22c0-10.672-8.651-19.323-19.323-19.323 10.672 0 19.323-8.652 19.323-19.323v-28.22c0-10.673 8.651-19.324 19.323-19.324"/><path fill="#d9d2e9" d="M101.64 167.278h193.48V301.01H101.64z" fill-rule="evenodd"/><path stroke="#595959" stroke-width="2" stroke-linejoin="round" stroke-linecap="butt" d="M101.64 167.278h193.48V301.01H101.64z"/><path fill="#b4a7d6" d="M101.64 166.501h193.48v20.347H101.64zM101.64 281.194h193.48v20.347H101.64z" fill-rule="evenodd"/><path fill="#b6d7a8" d="M101.64 301.759h193.48V419.71H101.64z" fill-rule="evenodd"/><path stroke="#595959" stroke-width="2" stroke-linejoin="round" stroke-linecap="butt" d="M101.64 301.759h193.48V419.71H101.64z"/><path fill="#fce5cd" d="M101.64 419.373h193.48v71.18H101.64z" fill-rule="evenodd"/><path stroke="#595959" stroke-width="2" stroke-linejoin="round" stroke-linecap="butt" d="M101.64 419.373h193.48v71.18H101.64z"/><path fill="#fce5cd" d="M101.64 5.853h193.48v71.181H101.64z" fill-rule="evenodd"/><path stroke="#595959" stroke-width="2" stroke-linejoin="round" stroke-linecap="butt" d="M101.64 5.853h193.48v71.181H101.64z"/><path fill="#c9daf8" d="M101.64 76.105h193.48v89.48H101.64z" fill-rule="evenodd"/><path stroke="#595959" stroke-width="2" stroke-linejoin="round" stroke-linecap="butt" d="M101.64 76.105h193.48v89.48H101.64z"/><path fill="#6aa84f" d="M101.64 399.612h193.48v19.023H101.64z" fill-rule="evenodd"/><path fill="none" d="M101.724 5.543h193.48v485.733h-193.48z"/><path stroke="#595959" stroke-width="2" stroke-linejoin="round" stroke-linecap="butt" d="M101.724 5.543h193.48v485.733h-193.48z"/><path fill="none" d="M97.097 164.974c-10.672 0-19.323-8.651-19.323-19.323v-40.693c0-10.672-8.65-19.323-19.323-19.323 10.672 0 19.323-8.651 19.323-19.323V25.62c0-10.671 8.651-19.322 19.323-19.322z"/><path fill="none" d="M97.097 164.974c-10.672 0-19.323-8.651-19.323-19.323v-40.693c0-10.672-8.65-19.323-19.323-19.323 10.672 0 19.323-8.651 19.323-19.323V25.62c0-10.671 8.651-19.322 19.323-19.322"/><path stroke="#595959" stroke-linejoin="round" stroke-linecap="butt" d="M97.097 164.974c-10.672 0-19.323-8.651-19.323-19.323v-40.693c0-10.672-8.65-19.323-19.323-19.323 10.672 0 19.323-8.651 19.323-19.323V25.62c0-10.671 8.651-19.322 19.323-19.322"/><path fill="none" d="M22.278 70.28h40.82v30.71h-40.82z"/><path fill="#000" d="M34.595 88.24V81.57h2.297q.781 0 1.188.094.578.125.984.468.531.454.781 1.157.266.687.266 1.578 0 .765-.172 1.36-.172.577-.453.968-.281.375-.61.594-.328.218-.796.343-.47.11-1.079.11h-2.406zm.89-.78h1.423q.656 0 1.031-.125.375-.125.61-.344.312-.328.484-.844.172-.531.172-1.297 0-1.047-.344-1.61-.344-.562-.828-.75-.36-.14-1.157-.14h-1.39v5.11zm8.894.187q-.454.39-.875.547-.422.156-.907.156-.797 0-1.218-.39-.422-.391-.422-1 0-.344.156-.641.156-.297.422-.469.265-.187.594-.281.234-.063.718-.11 1-.124 1.47-.28v-.22q0-.5-.235-.703-.313-.28-.922-.28-.578 0-.86.202-.28.203-.406.72l-.797-.11q.11-.516.36-.828.25-.329.718-.5.47-.172 1.094-.172.625 0 1 .156.39.14.578.36.188.218.25.562.047.203.047.75v1.094q0 1.14.047 1.453.063.297.219.578h-.86q-.125-.25-.171-.594zm-.063-1.828q-.453.172-1.344.297-.5.078-.718.172-.204.093-.313.265-.11.172-.11.391 0 .328.235.547.25.219.734.219.47 0 .829-.204.375-.218.562-.578.125-.265.125-.812v-.297zm2.094 2.422v-4.844h.735v.734q.28-.515.515-.671.25-.172.531-.172.422 0 .844.265l-.281.766q-.297-.172-.61-.172-.265 0-.484.156-.203.157-.297.453-.14.438-.14.954v2.53h-.813zm4.903-.735.11.72q-.344.077-.61.077-.453 0-.703-.14-.234-.14-.343-.36-.094-.234-.094-.984v-2.781h-.61v-.64h.61V82.21l.812-.5v1.687h.828v.64h-.828v2.829q0 .36.047.469.047.093.14.156.095.047.282.047.14 0 .36-.032z"/><path fill="none" d="M97.097 489.945c-10.672 0-19.323-8.651-19.323-19.323v-54.3c0-10.67-8.65-19.322-19.323-19.322 10.672 0 19.323-8.651 19.323-19.323v-54.299c0-10.672 8.651-19.323 19.323-19.323z"/><path fill="none" d="M97.097 489.945c-10.672 0-19.323-8.651-19.323-19.323v-54.3c0-10.67-8.65-19.322-19.323-19.322 10.672 0 19.323-8.651 19.323-19.323v-54.299c0-10.672 8.651-19.323 19.323-19.323"/><path stroke="#595959" stroke-linejoin="round" stroke-linecap="butt" d="M97.097 489.945c-10.672 0-19.323-8.651-19.323-19.323v-54.3c0-10.67-8.65-19.322-19.323-19.322 10.672 0 19.323-8.651 19.323-19.323v-54.299c0-10.672 8.651-19.323 19.323-19.323"/><path fill="none" d="M-.549 373.234h66.11v42.015H-.548z"/><path fill="#000" d="M14.715 393.053v-6.703h.75v.64q.265-.375.593-.562.344-.188.813-.188.625 0 1.094.329.468.312.703.906.25.578.25 1.265 0 .735-.266 1.329-.265.593-.781.921-.5.313-1.063.313-.406 0-.734-.172-.328-.172-.531-.437v2.359h-.828zm.75-4.25q0 .937.375 1.39.375.438.922.438.546 0 .921-.453.391-.469.391-1.438 0-.937-.375-1.39-.375-.453-.906-.453t-.938.484q-.39.484-.39 1.422zm4.422 2.39v-6.671h.828v6.672h-.828zm5.244-.593q-.453.39-.875.547-.422.156-.906.156-.797 0-1.219-.39-.422-.391-.422-1 0-.344.157-.641.156-.297.422-.469.265-.188.593-.281.235-.063.719-.11 1-.125 1.469-.28v-.22q0-.5-.235-.703-.312-.281-.921-.281-.579 0-.86.203t-.406.719l-.797-.11q.11-.515.36-.828.25-.328.718-.5.469-.172 1.094-.172.625 0 1 .157.39.14.578.36.188.218.25.562.047.203.047.75v1.093q0 1.141.047 1.453.062.297.219.579h-.86q-.125-.25-.172-.594zm-.062-1.828q-.453.172-1.344.297-.5.078-.719.171-.203.094-.312.266-.11.172-.11.39 0 .329.235.548.25.218.734.218.469 0 .828-.203.375-.219.563-.578.125-.266.125-.812v-.297zm3.89 1.687.11.719q-.344.078-.61.078-.452 0-.702-.14-.235-.141-.344-.36-.094-.234-.094-.984v-2.782h-.61v-.64h.61v-1.188l.813-.5v1.688h.828v.64h-.828v2.829q0 .359.047.468.046.094.14.157.094.046.281.046.141 0 .36-.03zm.999.735v-4.204h-.72v-.64h.72v-.516q0-.484.078-.719.125-.312.422-.515t.843-.203q.344 0 .766.093l-.125.704q-.266-.047-.484-.047-.375 0-.532.172-.156.156-.156.593v.438h.938v.64h-.938v4.204h-.812zm2.091-2.422q0-1.344.75-1.985.625-.547 1.516-.547 1 0 1.625.657.64.656.64 1.812 0 .938-.28 1.469-.282.531-.813.828-.531.297-1.172.297-1.016 0-1.64-.64-.626-.657-.626-1.891zm.844 0q0 .937.406 1.406.407.453 1.016.453.61 0 1.016-.469.406-.468.406-1.422 0-.89-.406-1.343-.407-.469-1.016-.469-.61 0-1.016.469-.406.453-.406 1.375zm4.641 2.422v-4.844h.734v.734q.282-.515.516-.672.25-.172.531-.172.422 0 .844.266l-.281.766q-.297-.172-.61-.172-.265 0-.484.156-.203.156-.297.453-.14.438-.14.953v2.532h-.813zm3.106 0v-4.844h.735v.687q.234-.359.61-.578.374-.219.859-.219.546 0 .89.235.344.219.485.625.562-.86 1.484-.86.719 0 1.11.407.39.39.39 1.218v3.329h-.813v-3.047q0-.485-.093-.703-.078-.22-.282-.344-.203-.14-.484-.14-.516 0-.86.343-.327.328-.327 1.078v2.813h-.829v-3.141q0-.547-.203-.813-.187-.28-.656-.28-.344 0-.64.187-.282.172-.422.531-.125.344-.125 1v2.516h-.829zm7.458-2v-.829h2.516v.829h-2.516zM14.21 402.394v-.61q-.454.719-1.344.719-.579 0-1.063-.313-.484-.328-.766-.89-.265-.578-.265-1.313 0-.734.234-1.312.25-.594.735-.906.484-.329 1.078-.329.437 0 .78.188.345.187.563.484v-2.39h.813v6.672h-.766zm-2.594-2.407q0 .922.39 1.391.39.453.938.453.53 0 .906-.437.375-.438.375-1.344 0-1-.39-1.453-.376-.469-.938-.469-.547 0-.922.453-.36.438-.36 1.406zm7.953.844.844.11q-.188.75-.735 1.156-.546.406-1.39.406-1.063 0-1.688-.656-.61-.657-.61-1.828 0-1.22.626-1.891.625-.688 1.625-.688.984 0 1.594.672.609.657.609 1.86v.218h-3.61q.048.797.454 1.22.406.421 1.015.421.454 0 .766-.234.313-.235.5-.766zm-2.687-1.328h2.703q-.063-.61-.313-.906-.39-.469-1.015-.469-.563 0-.954.375-.375.375-.421 1zm4.562 4.75v-6.703h.75v.64q.266-.375.594-.562.344-.188.813-.188.625 0 1.093.329.47.312.703.906.25.578.25 1.265 0 .735-.265 1.329-.266.593-.781.921-.5.313-1.063.313-.406 0-.734-.172-.328-.172-.532-.437v2.359h-.828zm.75-4.25q0 .937.375 1.39.375.438.922.438t.922-.453q.39-.469.39-1.438 0-.937-.374-1.39-.375-.453-.907-.453-.53 0-.937.484-.39.484-.39 1.422zm7.75.828.844.11q-.187.75-.734 1.156-.547.406-1.39.406-1.063 0-1.688-.656-.61-.657-.61-1.828 0-1.22.626-1.891.625-.688 1.625-.688.984 0 1.593.672.61.657.61 1.86v.218h-3.61q.047.797.453 1.22.407.421 1.016.421.453 0 .766-.234.312-.235.5-.766zm-2.687-1.328h2.703q-.062-.61-.312-.906-.39-.469-1.016-.469-.562 0-.953.375-.375.375-.422 1zm4.563 2.89v-4.843h.75v.687q.531-.797 1.531-.797.438 0 .797.172.375.157.547.407.188.25.266.609.047.219.047.797v2.969h-.829v-2.938q0-.5-.093-.75-.094-.25-.344-.39-.234-.157-.563-.157-.515 0-.906.328-.375.328-.375 1.266v2.64h-.828zm8.329 0v-.609q-.454.719-1.344.719-.578 0-1.063-.313-.484-.328-.765-.89-.266-.578-.266-1.313 0-.734.234-1.312.25-.594.735-.906.484-.329 1.078-.329.437 0 .781.188.344.187.563.484v-2.39h.812v6.672h-.765zm-2.594-2.406q0 .922.39 1.391.391.453.938.453.531 0 .906-.437.375-.438.375-1.344 0-1-.39-1.453-.375-.469-.938-.469-.547 0-.922.453-.36.438-.36 1.406zm7.953.844.844.11q-.187.75-.734 1.156-.547.406-1.39.406-1.063 0-1.688-.656-.61-.657-.61-1.828 0-1.22.625-1.891.625-.688 1.625-.688.985 0 1.594.672.61.657.61 1.86v.218h-3.61q.047.797.453 1.22.406.421 1.016.421.453 0 .765-.234.313-.235.5-.766zm-2.687-1.328h2.703q-.063-.61-.313-.906-.39-.469-1.015-.469-.563 0-.953.375-.375.375-.422 1zm4.563 2.89v-4.843h.75v.687q.531-.797 1.531-.797.437 0 .797.172.375.157.547.407.187.25.265.609.047.219.047.797v2.969h-.828v-2.938q0-.5-.094-.75-.093-.25-.343-.39-.235-.157-.563-.157-.516 0-.906.328-.375.328-.375 1.266v2.64h-.828zm6.984-.734.11.719q-.344.078-.61.078-.453 0-.703-.14-.234-.141-.343-.36-.094-.234-.094-.984v-2.782h-.61v-.64h.61v-1.188l.812-.5v1.688h.828v.64h-.828v2.829q0 .359.047.468.047.094.14.157.095.046.282.046.14 0 .36-.03z"/><path fill="none" d="M16.643 218.877h48.976v30.708H16.643z"/><path fill="#000" d="m33.136 234.493.89.219q-.28 1.093-1.015 1.672-.719.562-1.75.562-1.094 0-1.766-.437-.672-.438-1.031-1.266-.344-.844-.344-1.797 0-1.047.39-1.812.407-.782 1.141-1.188.735-.406 1.61-.406 1.015 0 1.687.515.688.516.953 1.438l-.859.203q-.234-.734-.687-1.062-.438-.329-1.11-.329-.765 0-1.281.375-.516.36-.734.985-.204.625-.204 1.281 0 .844.25 1.484.25.641.766.954.531.312 1.14.312.735 0 1.25-.422.516-.437.704-1.281zm1.252 2.453 1.937-6.906h.657l-1.938 6.906h-.656zm8.076-2.453.89.219q-.28 1.093-1.015 1.672-.719.562-1.75.562-1.094 0-1.766-.437-.672-.438-1.03-1.266-.345-.844-.345-1.797 0-1.047.391-1.812.406-.782 1.14-1.188.735-.406 1.61-.406 1.016 0 1.687.515.688.516.954 1.438l-.86.203q-.234-.734-.687-1.062-.438-.329-1.11-.329-.765 0-1.28.375-.517.36-.735.985-.203.625-.203 1.281 0 .844.25 1.484.25.641.765.954.531.312 1.14.312.735 0 1.25-.422.516-.437.704-1.281zm3.596 1.266v-1.829h-1.828v-.765h1.828v-1.828h.765v1.828h1.813v.765h-1.813v1.829h-.765zm5.447 0v-1.829H49.68v-.765h1.828v-1.828h.766v1.828h1.812v.765h-1.812v1.829h-.766z"/><path fill="none" d="M78.932 300.226V165.643h30.708v134.583z"/><path fill="#85200c" d="M96.892 259.088h-4.203v.72h-.641v-.72h-.516q-.484 0-.718-.078-.313-.125-.516-.422t-.203-.843q0-.344.094-.766l.703.125q-.047.266-.047.484 0 .375.172.532.156.156.594.156h.437v-.938h.64v.938h4.204v.812zm0-2.373H90.22v-.828h6.672v.828zm0-5.26h-.703q.812.563.812 1.532 0 .422-.156.797-.172.375-.422.562-.25.172-.61.25-.234.047-.765.047h-3v-.828h2.688q.64 0 .875-.047.312-.078.5-.328.187-.25.187-.61 0-.375-.187-.703-.188-.328-.516-.453-.328-.14-.953-.14h-2.594v-.813h4.844v.734zm-.735-3.812.72-.11q.077.344.077.61 0 .453-.14.703-.141.234-.36.344-.234.093-.984.093h-2.781v.61h-.641v-.61h-1.187l-.5-.812h1.687v-.828h.64v.828h2.829q.36 0 .469-.047.093-.047.156-.14.047-.094.047-.282 0-.14-.032-.36zm0-2.592.72-.11q.077.344.077.61 0 .453-.14.703-.141.234-.36.344-.234.094-.984.094h-2.781v.609h-.641v-.61h-1.187l-.5-.812h1.687v-.828h.64v.828h2.829q.36 0 .469-.047.093-.047.156-.14.047-.094.047-.282 0-.14-.032-.359zm-.828-4.107.11-.844q.75.187 1.156.734.406.547.406 1.39 0 1.063-.656 1.688-.656.61-1.828.61-1.219 0-1.89-.625-.688-.625-.688-1.625 0-.985.672-1.594.656-.61 1.859-.61h.219v3.61q.797-.047 1.218-.453.422-.406.422-1.016 0-.453-.234-.765-.234-.313-.766-.5zm-1.328 2.687v-2.703q-.61.063-.906.313-.469.39-.469 1.015 0 .563.375.953.375.375 1 .422zm2.89-4.563h-4.843v-.734h.734q-.515-.281-.671-.516-.172-.25-.172-.53 0-.423.265-.845l.766.282q-.172.296-.172.609 0 .266.156.484.157.203.453.297.438.14.954.14h2.53v.813zm.11-2.497-6.906-1.937v-.656L97 235.915v.656zm-1.672-6.513.11-.844q.75.188 1.156.734.406.547.406 1.391 0 1.063-.656 1.688-.656.609-1.828.609-1.219 0-1.89-.625-.688-.625-.688-1.625 0-.984.672-1.594.656-.61 1.859-.61h.219v3.61q.797-.047 1.218-.453.422-.406.422-1.016 0-.453-.234-.765-.234-.313-.766-.5zm-1.328 2.687v-2.703q-.61.063-.906.313-.469.39-.469 1.015 0 .563.375.953.375.375 1 .422zm2.89-4.563h-4.843v-.75h.688q-.797-.53-.797-1.53 0-.438.172-.798.156-.375.406-.547.25-.187.61-.265.218-.047.796-.047h2.969v.828h-2.938q-.5 0-.75.094t-.39.344q-.157.234-.157.562 0 .516.329.906.328.375 1.265.375h2.64v.828zm.407-5.047.11-.797q.374-.047.546-.28.219-.298.219-.829 0-.563-.234-.875-.22-.313-.625-.422-.25-.062-1.063-.062.64.546.64 1.343 0 1-.718 1.547-.719.547-1.734.547-.688 0-1.266-.25-.594-.25-.906-.719-.328-.484-.328-1.125 0-.859.703-1.422h-.594v-.75h4.188q1.125 0 1.593.235.485.219.75.719.282.5.282 1.234 0 .86-.391 1.39-.39.532-1.172.516zm-2.906-.672q.953 0 1.39-.375.438-.39.438-.953 0-.562-.438-.937-.437-.39-1.375-.39-.875 0-1.328.39-.453.39-.453.953 0 .547.453.937.438.375 1.313.375zm-3.235-4.672h-.937v-.812h.937v.812zm5.735 0h-4.844v-.812h4.844v.812zm0-2.057h-4.844v-.75h.688q-.797-.53-.797-1.53 0-.438.172-.798.156-.375.406-.547.25-.187.61-.265.218-.047.796-.047h2.969v.828h-2.938q-.5 0-.75.094-.25.093-.39.343-.157.235-.157.563 0 .516.329.906.328.375 1.265.375h2.64v.828zm-1.563-8.5.11-.844q.75.188 1.156.735.406.546.406 1.39 0 1.063-.656 1.688-.656.61-1.828.61-1.219 0-1.89-.626-.688-.625-.688-1.625 0-.984.672-1.594.656-.61 1.859-.61h.219v3.61q.797-.047 1.218-.453.422-.406.422-1.015 0-.454-.234-.766-.234-.313-.766-.5zm-1.328 2.687v-2.703q-.61.063-.906.313-.469.39-.469 1.015 0 .563.375.954.375.375 1 .421z"/><path fill="none" d="M151.467 215.648h93.827v37.166h-93.827z"/><path fill="#000" d="M176.719 238.728v-10.484h7.593v1.234h-6.203v3.203h5.797v1.235h-5.797v3.578h6.438v1.234h-7.828zm9.588 0v-7.593h1.156v1.078q.844-1.25 2.422-1.25.687 0 1.266.25.578.234.859.64.281.407.406.953.063.36.063 1.25v4.672h-1.282v-4.625q0-.781-.156-1.172-.156-.39-.547-.625-.375-.234-.89-.234-.813 0-1.422.531-.594.516-.594 1.969v4.156h-1.281zm7.917.625 1.25.188q.078.578.437.844.469.359 1.313.359.89 0 1.375-.36.484-.359.656-1 .11-.39.094-1.656-.844 1-2.11 1-1.562 0-2.422-1.125-.86-1.14-.86-2.718 0-1.094.392-2 .406-.922 1.14-1.422.75-.5 1.766-.5 1.344 0 2.219 1.078v-.906h1.187v6.562q0 1.781-.36 2.516-.359.734-1.156 1.156-.78.437-1.921.437-1.36 0-2.204-.609-.828-.61-.796-1.844zm1.062-4.562q0 1.5.594 2.187.594.688 1.484.688t1.485-.688q.609-.687.609-2.14 0-1.391-.625-2.094-.61-.719-1.484-.719-.86 0-1.47.703-.593.688-.593 2.063zm7.323-5.078v-1.47h1.297v1.47h-1.297zm0 9.015v-7.593h1.297v7.593h-1.297zm3.256 0v-7.593h1.156v1.078q.844-1.25 2.422-1.25.688 0 1.266.25.578.234.86.64.28.407.406.953.062.36.062 1.25v4.672h-1.281v-4.625q0-.781-.156-1.172-.157-.39-.547-.625-.375-.234-.89-.234-.813 0-1.423.531-.594.516-.594 1.969v4.156h-1.28zm13.354-2.453 1.329.172q-.313 1.172-1.172 1.813-.844.64-2.172.64-1.672 0-2.656-1.015-.97-1.032-.97-2.891 0-1.922.985-2.969 1-1.062 2.578-1.062 1.516 0 2.485 1.03.968 1.032.968 2.923 0 .11-.015.344h-5.656q.062 1.25.703 1.921.64.657 1.593.657.704 0 1.204-.36.5-.375.796-1.203zm-4.234-2.078h4.25q-.094-.953-.484-1.437-.625-.75-1.61-.75-.875 0-1.484.593-.61.594-.672 1.594z"/><path fill="none" d="M101.64 159.205h193.48v33.921H101.64z"/><path fill="#000" d="M186.533 179.725v-.782q-.594.922-1.734.922-.75 0-1.375-.406-.625-.422-.97-1.156-.343-.735-.343-1.688 0-.922.313-1.687.312-.766.937-1.156.625-.407 1.39-.407.563 0 1 .235.438.234.72.61v-3.079h1.046v8.594h-.984zm-3.328-3.11q0 1.203.5 1.797.5.578 1.187.578.688 0 1.172-.562.485-.563.485-1.719 0-1.281-.5-1.875-.485-.594-1.204-.594-.703 0-1.171.578-.47.563-.47 1.797zm10.033 2.344q-.594.5-1.14.703-.532.203-1.157.203-1.031 0-1.578-.5-.547-.5-.547-1.28 0-.454.203-.829.203-.39.547-.61.344-.234.766-.343.297-.094.937-.172 1.266-.14 1.875-.36v-.265q0-.656-.297-.922-.406-.344-1.203-.344-.734 0-1.093.266-.36.25-.532.906l-1.031-.14q.14-.657.469-1.063.328-.406.937-.625.61-.219 1.407-.219.796 0 1.296.188.5.187.735.469.234.28.328.718.047.266.047.97v1.405q0 1.47.062 1.86.078.39.282.75h-1.11q-.156-.328-.203-.766zm-.094-2.36q-.578.235-1.718.407-.657.094-.922.219-.266.11-.422.328-.14.219-.14.5 0 .422.312.703.328.281.937.281.61 0 1.078-.265.485-.266.703-.735.172-.36.172-1.047v-.39zm2.69 3.126v-6.219h.953v.937q.36-.656.656-.859.313-.219.688-.219.53 0 1.078.328l-.36.985q-.39-.235-.765-.235-.36 0-.64.22-.267.202-.376.577-.187.563-.187 1.22v3.265h-1.047zm6.308-.938.157.922q-.454.094-.797.094-.578 0-.89-.172-.313-.188-.454-.484-.125-.297-.125-1.25v-3.579h-.766v-.812h.766v-1.547l1.047-.625v2.172h1.062v.812h-1.062v3.641q0 .453.047.578.062.125.187.203.125.078.36.078.187 0 .468-.03zm1.319-4.078v-1.203h1.203v1.203h-1.203zm0 5.016v-1.203h1.203v1.203h-1.203zm7.13 0v-.922q-.734 1.062-1.984 1.062-.547 0-1.031-.203-.469-.219-.703-.531-.235-.328-.328-.797-.063-.297-.063-.984v-3.844h1.063v3.453q0 .813.062 1.11.094.406.406.656.329.234.813.234.469 0 .875-.234.422-.25.594-.672.187-.422.187-1.219v-3.328h1.047v6.219h-.937zm2.596-7.375v-1.219h1.063v1.219h-1.063zm0 7.375v-6.219h1.063v6.219h-1.063z"/><path fill="none" d="M101.64 275.336h193.48v33.921H101.64z"/><path fill="#000" d="M123.29 295.856v-8.594h6.204v1.016h-5.063v2.625h4.75v1.015h-4.75v2.922h5.266v1.016h-6.406zm7.848 0v-6.219h.938v.875q.297-.469.781-.734.485-.281 1.11-.281.687 0 1.125.28.453.282.625.798.75-1.078 1.921-1.078.938 0 1.422.515.5.5.5 1.578v4.266h-1.047v-3.922q0-.625-.109-.906-.094-.281-.36-.453-.265-.172-.64-.172-.656 0-1.094.437-.422.438-.422 1.407v3.609h-1.062v-4.047q0-.703-.266-1.047-.25-.36-.828-.36-.453 0-.828.235-.375.235-.547.688-.172.453-.172 1.297v3.234h-1.047zm10.965 0h-.984v-8.594h1.062v3.063q.672-.828 1.703-.828.579 0 1.079.234.515.219.843.64.344.422.532 1.016.187.594.187 1.266 0 1.594-.797 2.469-.797.875-1.89.875-1.11 0-1.735-.922v.781zm-.015-3.156q0 1.11.312 1.61.5.812 1.344.812.687 0 1.187-.594.516-.594.516-1.797 0-1.219-.484-1.797-.485-.578-1.172-.578-.688 0-1.203.61-.5.593-.5 1.734zm9.97 1.156 1.094.125q-.25.953-.953 1.484-.703.532-1.781.532-1.36 0-2.172-.844-.797-.844-.797-2.36 0-1.562.812-2.421.813-.875 2.094-.875 1.25 0 2.031.843.797.844.797 2.391v.281h-4.64q.062 1.031.578 1.578.515.532 1.297.532.578 0 .984-.297.422-.313.656-.969zm-3.453-1.703h3.469q-.063-.797-.39-1.188-.516-.609-1.313-.609-.735 0-1.235.484-.484.485-.53 1.313zm9.908 3.703v-.781q-.593.922-1.734.922-.75 0-1.375-.407-.625-.422-.969-1.156-.343-.734-.343-1.687 0-.922.312-1.688.313-.766.938-1.156.625-.406 1.39-.406.563 0 1 .234.438.234.719.61v-3.079h1.047v8.594h-.985zm-3.328-3.11q0 1.204.5 1.797.5.579 1.188.579.687 0 1.172-.563.484-.562.484-1.719 0-1.28-.5-1.875-.484-.593-1.203-.593-.703 0-1.172.578-.469.562-.469 1.797zm10.002 3.11v-.781q-.594.922-1.734.922-.75 0-1.375-.407-.625-.422-.969-1.156t-.344-1.687q0-.922.313-1.688.312-.766.937-1.156.625-.406 1.391-.406.562 0 1 .234.437.234.719.61v-3.079h1.047v8.594h-.985zm-3.328-3.11q0 1.204.5 1.797.5.579 1.188.579.687 0 1.171-.563.485-.562.485-1.719 0-1.28-.5-1.875-.485-.593-1.203-.593-.703 0-1.172.578-.469.562-.469 1.797zm10.22 1.11 1.095.125q-.25.953-.954 1.484-.703.532-1.78.532-1.36 0-2.173-.844-.797-.844-.797-2.36 0-1.562.813-2.421.812-.875 2.094-.875 1.25 0 2.03.843.798.844.798 2.391v.281h-4.64q.062 1.031.577 1.578.516.532 1.297.532.578 0 .985-.297.421-.313.656-.969zm-3.452-1.703h3.468q-.062-.797-.39-1.188-.516-.609-1.313-.609-.734 0-1.234.484-.484.485-.531 1.313zm5.861 3.703v-6.219h.953v.938q.36-.657.656-.86.313-.218.688-.218.531 0 1.078.328l-.36.984q-.39-.234-.765-.234-.36 0-.64.218-.266.204-.376.579-.187.562-.187 1.218v3.266h-1.047zm5.871 0 3.297-8.594h1.219l3.515 8.594h-1.28l-1.017-2.61h-3.578l-.953 2.61h-1.203zm2.484-3.531h2.907l-.89-2.375q-.423-1.078-.61-1.782-.172.829-.469 1.641l-.938 2.516zm6.458 3.531v-8.594h3.25q.843 0 1.296.078.641.11 1.063.407.437.296.687.828.266.531.266 1.172 0 1.093-.703 1.859-.688.75-2.516.75h-2.203v3.5h-1.14zm1.14-4.5h2.219q1.11 0 1.562-.406.47-.422.47-1.172 0-.531-.282-.906-.266-.391-.703-.516-.297-.078-1.063-.078h-2.203v3.078zm7.067 4.5v-8.594h1.125v8.594h-1.125zm8.355 2.531q-.875-1.11-1.484-2.578-.594-1.484-.594-3.062 0-1.391.437-2.672.532-1.485 1.641-2.953h.75q-.703 1.218-.937 1.734-.36.812-.563 1.687-.25 1.094-.25 2.204 0 2.828 1.75 5.64h-.75zm6.23-4.531 1.094.125q-.25.953-.953 1.484-.703.532-1.781.532-1.36 0-2.172-.844-.797-.844-.797-2.36 0-1.562.813-2.421.812-.875 2.093-.875 1.25 0 2.032.843.796.844.796 2.391v.281h-4.64q.062 1.031.578 1.578.516.532 1.297.532.578 0 .984-.297.422-.313.656-.969zm-3.453-1.703h3.47q-.063-.797-.392-1.188-.515-.609-1.312-.609-.734 0-1.234.484-.485.485-.532 1.313zm5.877 3.703v-6.219h.938v.875q.297-.469.781-.734.484-.281 1.11-.281.687 0 1.124.28.454.282.625.798.75-1.078 1.922-1.078.938 0 1.422.515.5.5.5 1.578v4.266h-1.047v-3.922q0-.625-.11-.906-.093-.281-.358-.453-.266-.172-.641-.172-.656 0-1.094.437-.422.438-.422 1.407v3.609h-1.062v-4.047q0-.703-.266-1.047-.25-.36-.828-.36-.453 0-.828.235-.375.235-.547.688-.172.453-.172 1.297v3.234h-1.047zm10.965 0h-.984v-8.594h1.062v3.063q.672-.828 1.703-.828.579 0 1.079.234.515.219.843.64.344.422.532 1.016.187.594.187 1.266 0 1.594-.797 2.469-.797.875-1.89.875-1.11 0-1.735-.922v.781zm-.015-3.156q0 1.11.312 1.61.5.812 1.344.812.687 0 1.187-.594.516-.594.516-1.797 0-1.219-.484-1.797-.485-.578-1.172-.578-.688 0-1.203.61-.5.593-.5 1.734zm9.97 1.156 1.094.125q-.25.953-.953 1.484-.703.532-1.781.532-1.36 0-2.172-.844-.797-.844-.797-2.36 0-1.562.812-2.421.813-.875 2.094-.875 1.25 0 2.031.843.797.844.797 2.391v.281h-4.64q.062 1.031.578 1.578.515.532 1.297.532.578 0 .984-.297.422-.313.656-.969zm-3.453-1.703h3.469q-.063-.797-.39-1.188-.516-.609-1.313-.609-.735 0-1.235.484-.484.485-.53 1.313zm9.908 3.703v-.781q-.593.922-1.734.922-.75 0-1.375-.407-.625-.422-.969-1.156t-.344-1.687q0-.922.313-1.688.312-.766.937-1.156.625-.406 1.391-.406.563 0 1 .234.438.234.719.61v-3.079h1.047v8.594h-.985zm-3.328-3.11q0 1.204.5 1.797.5.579 1.188.579.687 0 1.172-.563.484-.562.484-1.719 0-1.28-.5-1.875-.484-.593-1.203-.593-.703 0-1.172.578-.469.562-.469 1.797zm10.002 3.11v-.781q-.594.922-1.734.922-.75 0-1.375-.407-.625-.422-.969-1.156t-.344-1.687q0-.922.313-1.688.312-.766.937-1.156.625-.406 1.39-.406.563 0 1 .234.438.234.72.61v-3.079h1.047v8.594h-.985zm-3.328-3.11q0 1.204.5 1.797.5.579 1.188.579.687 0 1.171-.563.485-.562.485-1.719 0-1.28-.5-1.875-.485-.593-1.203-.593-.703 0-1.172.578-.469.562-.469 1.797zm10.22 1.11 1.094.125q-.25.953-.953 1.484-.703.532-1.78.532-1.36 0-2.173-.844-.797-.844-.797-2.36 0-1.562.813-2.421.812-.875 2.094-.875 1.25 0 2.03.843.798.844.798 2.391v.281h-4.64q.062 1.031.577 1.578.516.532 1.297.532.578 0 .984-.297.422-.313.657-.969zm-3.452-1.703h3.468q-.062-.797-.39-1.188-.516-.609-1.313-.609-.734 0-1.234.484-.485.485-.531 1.313zm5.86 3.703v-6.219h.954v.938q.36-.657.656-.86.313-.218.688-.218.531 0 1.078.328l-.36.984q-.39-.234-.765-.234-.36 0-.64.218-.266.204-.376.579-.187.562-.187 1.218v3.266h-1.047zm3.647 0v-1.203h1.204v1.203h-1.204zm3.038 0v-8.594h1.046v3.078q.735-.843 1.86-.843.703 0 1.203.28.516.266.734.75.219.47.219 1.391v3.938h-1.047v-3.938q0-.796-.344-1.156-.343-.36-.968-.36-.47 0-.891.25-.406.235-.594.657-.172.406-.172 1.14v3.407h-1.046zm7.36 2.531h-.75q1.75-2.812 1.75-5.64 0-1.094-.25-2.188-.202-.875-.562-1.687-.234-.516-.937-1.75h.75q1.094 1.468 1.625 2.953.453 1.281.453 2.672 0 1.578-.61 3.062-.609 1.469-1.468 2.578z"/><path fill="none" d="M78.932 418.756V301.59h30.708v117.165z"/><path fill="#85200c" d="M96.892 386.327h-4.203v.719h-.641v-.719h-.516q-.484 0-.718-.078-.313-.125-.516-.422t-.203-.844q0-.343.094-.765l.703.125q-.047.265-.047.484 0 .375.172.531.156.157.594.157h.437v-.938h.64v.938h4.204v.812zm0-2.373H90.22v-.828h6.672v.828zm0-5.26h-.703q.812.563.812 1.532 0 .421-.156.796-.172.375-.422.563-.25.172-.61.25-.234.047-.765.047h-3v-.828h2.688q.64 0 .875-.047.312-.078.5-.328.187-.25.187-.61 0-.375-.187-.703-.188-.328-.516-.453-.328-.14-.953-.14h-2.594v-.813h4.844v.734zm-.735-3.813.72-.109q.077.344.077.61 0 .453-.14.703-.141.234-.36.343-.234.094-.984.094h-2.781v.61h-.641v-.61h-1.187l-.5-.812h1.687v-.829h.64v.829h2.829q.36 0 .469-.047.093-.047.156-.14.047-.095.047-.282 0-.14-.032-.36zm0-2.591.72-.11q.077.344.077.61 0 .453-.14.703-.141.234-.36.344-.234.093-.984.093h-2.781v.61h-.641v-.61h-1.187l-.5-.812h1.687v-.828h.64v.828h2.829q.36 0 .469-.047.093-.047.156-.14.047-.094.047-.282 0-.14-.032-.36zm-.828-4.107.11-.844q.75.187 1.156.734.406.547.406 1.39 0 1.063-.656 1.688-.656.61-1.828.61-1.219 0-1.89-.625-.688-.625-.688-1.625 0-.985.672-1.594.656-.61 1.859-.61h.219v3.61q.797-.047 1.218-.453.422-.406.422-1.016 0-.453-.234-.765-.234-.313-.766-.5zm-1.328 2.687v-2.703q-.61.062-.906.312-.469.391-.469 1.016 0 .563.375.953.375.375 1 .422zm2.89-4.563h-4.843v-.734h.734q-.515-.281-.671-.516-.172-.25-.172-.531 0-.422.265-.844l.766.281q-.172.297-.172.61 0 .265.156.484.157.203.453.297.438.14.954.14h2.53v.813zm.11-2.497-6.906-1.937v-.657L97 363.154v.656zm-1.672-6.513.11-.844q.75.187 1.156.734.406.547.406 1.39 0 1.063-.656 1.688-.656.61-1.828.61-1.219 0-1.89-.625-.688-.625-.688-1.625 0-.985.672-1.594.656-.61 1.859-.61h.219v3.61q.797-.047 1.218-.453.422-.406.422-1.016 0-.453-.234-.765-.234-.313-.766-.5zm-1.328 2.687v-2.703q-.61.063-.906.313-.469.39-.469 1.015 0 .563.375.953.375.375 1 .422zm2.89-4.563h-4.843v-.75h.688q-.797-.531-.797-1.531 0-.437.172-.797.156-.375.406-.547.25-.187.61-.265.218-.047.796-.047h2.969v.828h-2.938q-.5 0-.75.094-.25.093-.39.343-.157.235-.157.563 0 .516.329.906.328.375 1.265.375h2.64v.828zm.407-5.047.11-.797q.374-.047.546-.281.219-.297.219-.828 0-.563-.234-.875-.22-.313-.625-.422-.25-.063-1.063-.063.64.547.64 1.344 0 1-.718 1.547-.719.547-1.734.547-.688 0-1.266-.25-.594-.25-.906-.719-.328-.484-.328-1.125 0-.86.703-1.422h-.594v-.75h4.188q1.125 0 1.593.235.485.218.75.718.282.5.282 1.235 0 .86-.391 1.39-.39.532-1.172.516zm-2.906-.672q.953 0 1.39-.375.438-.39.438-.953 0-.562-.438-.937-.437-.391-1.375-.391-.875 0-1.328.39-.453.391-.453.954 0 .547.453.937.438.375 1.313.375zm-3.235-4.672h-.937v-.813h.937v.813zm5.735 0h-4.844v-.813h4.844v.813zm0-2.057h-4.844v-.75h.688q-.797-.531-.797-1.531 0-.438.172-.797.156-.375.406-.547.25-.187.61-.265.218-.047.796-.047h2.969v.828h-2.938q-.5 0-.75.094-.25.093-.39.343-.157.235-.157.563 0 .515.329.906.328.375 1.265.375h2.64v.828zm-1.563-8.5.11-.844q.75.188 1.156.734.406.547.406 1.391 0 1.063-.656 1.688-.656.609-1.828.609-1.219 0-1.89-.625-.688-.625-.688-1.625 0-.984.672-1.594.656-.61 1.859-.61h.219v3.61q.797-.047 1.218-.453.422-.406.422-1.016 0-.453-.234-.765-.234-.313-.766-.5zm-1.328 2.687v-2.703q-.61.063-.906.313-.469.39-.469 1.015 0 .563.375.953.375.375 1 .422z"/><path fill="none" d="M101.64 393.36h193.48v33.92H101.64z"/><path fill="#000" d="M143.952 413.88v-8.594h3.25q.844 0 1.297.078.64.11 1.062.406.438.297.688.828.265.532.265 1.172 0 1.094-.703 1.86-.687.75-2.515.75h-2.204v3.5h-1.14zm1.14-4.5h2.22q1.109 0 1.562-.407.468-.422.468-1.172 0-.53-.28-.906-.266-.39-.704-.515-.297-.079-1.062-.079h-2.204v3.079zm6.708 4.5v-8.594h1.062v8.594H151.8zm6.76-.766q-.594.5-1.141.703-.532.203-1.157.203-1.03 0-1.578-.5-.547-.5-.547-1.281 0-.453.204-.828.203-.39.546-.61.344-.234.766-.343.297-.094.938-.172 1.265-.14 1.875-.36v-.265q0-.656-.297-.922-.407-.344-1.203-.344-.735 0-1.094.266-.36.25-.531.906l-1.032-.14q.14-.657.469-1.063.328-.406.938-.625.609-.219 1.406-.219.797 0 1.297.188.5.187.734.468.234.282.328.72.047.265.047.968v1.406q0 1.469.063 1.86.078.39.28.75h-1.109q-.156-.329-.203-.766zm-.094-2.36q-.579.235-1.72.407-.655.094-.921.219-.266.109-.422.328-.14.218-.14.5 0 .422.312.703.328.281.937.281.61 0 1.079-.266.484-.265.703-.734.172-.36.172-1.047v-.39zm5.001 2.188.157.922q-.453.094-.797.094-.578 0-.89-.172-.313-.188-.454-.485-.125-.296-.125-1.25v-3.578h-.766v-.812h.766v-1.547l1.047-.625v2.172h1.062v.812h-1.062v3.641q0 .453.047.578.062.125.187.203.125.078.36.078.187 0 .468-.03zm1.288.938v-5.407h-.938v-.812h.938v-.672q0-.625.109-.922.156-.422.531-.672.39-.25 1.078-.25.453 0 .985.11l-.157.906q-.328-.047-.625-.047-.484 0-.687.203-.188.203-.188.766v.578h1.22v.812h-1.22v5.407h-1.046zm2.693-3.11q0-1.734.953-2.562.797-.688 1.953-.688 1.281 0 2.094.844.828.828.828 2.312 0 1.204-.36 1.891-.359.688-1.062 1.078-.687.375-1.5.375-1.297 0-2.11-.828-.796-.844-.796-2.422zm1.078 0q0 1.188.516 1.781.531.594 1.312.594.797 0 1.313-.594.515-.593.515-1.812 0-1.156-.53-1.75-.517-.594-1.298-.594t-1.312.594q-.516.578-.516 1.781zm5.97 3.11v-6.22h.954v.938q.36-.656.656-.859.313-.219.688-.219.53 0 1.078.328l-.36.985q-.39-.235-.765-.235-.36 0-.64.22-.266.202-.376.577-.187.563-.187 1.219v3.266h-1.047zm4.013 0v-6.22h.937v.876q.297-.469.781-.735.485-.28 1.11-.28.687 0 1.125.28.453.282.625.797.75-1.078 1.922-1.078.937 0 1.421.516.5.5.5 1.578v4.266h-1.046v-3.922q0-.625-.11-.907-.094-.28-.36-.453-.265-.172-.64-.172-.656 0-1.094.438-.421.437-.421 1.406v3.61h-1.063v-4.047q0-.703-.266-1.047-.25-.36-.828-.36-.453 0-.828.235-.375.234-.547.687-.172.453-.172 1.297v3.235h-1.046zm9.574-2.579v-1.062h3.25v1.062h-3.25zm3.996.72 1.031-.157q.094.625.484.953.407.328 1.141.328.719 0 1.063-.281.359-.297.359-.703 0-.36-.313-.563-.218-.14-1.078-.359-1.156-.297-1.61-.5-.437-.219-.67-.594-.235-.375-.235-.844 0-.406.187-.765.188-.36.516-.594.25-.172.672-.297.422-.125.922-.125.718 0 1.265.219.563.203.828.562.266.36.36.954l-1.032.14q-.062-.469-.406-.734-.328-.281-.953-.281-.719 0-1.031.25-.313.234-.313.562 0 .203.125.36.14.171.407.28.156.063.937.266 1.125.313 1.563.5.437.188.687.547.25.36.25.906 0 .532-.312 1-.297.454-.875.72-.579.25-1.313.25-1.219 0-1.86-.5-.624-.516-.796-1.5zm6.422 4.25v-8.61h.953v.797q.344-.469.765-.703.438-.235 1.047-.235.797 0 1.407.406.609.407.906 1.157.312.75.312 1.64 0 .953-.343 1.72-.329.765-.985 1.171-.656.406-1.375.406-.531 0-.953-.219-.422-.234-.687-.562v3.031H198.5zm.953-5.47q0 1.204.484 1.782.485.562 1.172.562.703 0 1.203-.594.5-.593.5-1.843 0-1.188-.484-1.766-.485-.594-1.172-.594-.672 0-1.188.625-.515.625-.515 1.828zm9.97 1.079 1.094.125q-.25.953-.953 1.484t-1.781.531q-1.36 0-2.172-.844-.797-.843-.797-2.359 0-1.562.813-2.422.812-.875 2.093-.875 1.25 0 2.032.844.797.844.797 2.39v.282h-4.641q.062 1.031.578 1.578.516.531 1.297.531.578 0 .984-.297.422-.312.657-.968zm-3.453-1.704h3.47q-.063-.796-.391-1.187-.516-.61-1.313-.61-.734 0-1.234.485-.485.484-.532 1.312zm9.94 1.422 1.031.141q-.172 1.062-.875 1.672-.703.61-1.719.61-1.28 0-2.062-.829-.766-.844-.766-2.406 0-1 .328-1.75.344-.766 1.016-1.14.687-.376 1.5-.376 1 0 1.64.516.657.5.844 1.453l-1.03.156q-.142-.625-.517-.937-.375-.328-.906-.328-.797 0-1.297.578-.5.562-.5 1.797 0 1.265.485 1.828.484.562 1.25.562.625 0 1.031-.375.422-.375.547-1.172zm1.937-5.093v-1.22h1.063v1.22h-1.063zm0 7.375v-6.22h1.063v6.22h-1.063zm2.916 0v-5.407h-.937v-.812h.937v-.672q0-.625.11-.922.156-.422.531-.672.39-.25 1.078-.25.453 0 .984.11l-.156.906q-.328-.047-.625-.047-.484 0-.687.203-.188.203-.188.766v.578h1.219v.812h-1.219v5.407h-1.047zm3.084-7.375v-1.22h1.063v1.22h-1.063zm0 7.375v-6.22h1.063v6.22h-1.063zm6.729-2.282 1.031.141q-.172 1.062-.875 1.672-.703.61-1.719.61-1.28 0-2.062-.829-.766-.844-.766-2.406 0-1 .328-1.75.344-.766 1.016-1.14.687-.376 1.5-.376 1 0 1.64.516.657.5.844 1.453l-1.03.156q-.142-.625-.517-.937-.375-.328-.906-.328-.797 0-1.297.578-.5.562-.5 1.797 0 1.265.485 1.828.484.562 1.25.562.625 0 1.031-.375.422-.375.547-1.172zm3.797 2.282 3.297-8.594h1.218l3.516 8.594h-1.281l-1.016-2.61h-3.578l-.953 2.61h-1.203zm2.484-3.532h2.906l-.89-2.375q-.422-1.078-.61-1.78-.172.827-.468 1.64l-.938 2.515zm6.457 3.532v-8.594h3.25q.844 0 1.297.078.64.11 1.063.406.437.297.687.828.266.532.266 1.172 0 1.094-.703 1.86-.688.75-2.516.75h-2.203v3.5h-1.14zm1.14-4.5h2.22q1.109 0 1.562-.407.469-.422.469-1.172 0-.53-.281-.906-.266-.39-.704-.515-.296-.079-1.062-.079h-2.203v3.079zm7.067 4.5v-8.594h1.125v8.594h-1.125z"/><path fill="none" d="M151.467 343.776h93.827v37.165h-93.827z"/><path fill="#000" d="M165.727 366.856V356.37h7.593v1.235h-6.203v3.203h5.797v1.234h-5.797v3.578h6.438v1.235h-7.828zm9.588 0v-7.594h1.156v1.062q.344-.562.937-.89.61-.344 1.36-.344.844 0 1.375.344.547.343.765.984.907-1.328 2.36-1.328 1.125 0 1.734.625.61.625.61 1.922v5.219h-1.282v-4.782q0-.78-.125-1.109-.125-.344-.453-.547-.328-.219-.781-.219-.797 0-1.328.532-.531.53-.531 1.703v4.422h-1.282v-4.938q0-.86-.312-1.281-.313-.438-1.031-.438-.547 0-1.016.297-.453.281-.672.828-.203.547-.203 1.594v3.938h-1.281zm13.396 0h-1.203V356.37h1.297v3.735q.812-1.016 2.078-1.016.703 0 1.328.281.625.281 1.031.797.406.5.625 1.234.235.72.235 1.532 0 1.968-.97 3.031-.952 1.062-2.312 1.062-1.343 0-2.11-1.125v.954zm-.016-3.86q0 1.375.375 1.985.61.984 1.64.984.845 0 1.454-.734.625-.735.625-2.188 0-1.484-.594-2.187-.593-.72-1.422-.72-.843 0-1.468.735-.61.735-.61 2.125zm12.183 1.406 1.328.172q-.313 1.172-1.172 1.813-.844.64-2.172.64-1.672 0-2.656-1.015-.969-1.031-.969-2.89 0-1.923.984-2.97 1-1.062 2.579-1.062 1.515 0 2.484 1.031.969 1.031.969 2.922 0 .11-.016.344h-5.656q.062 1.25.703 1.922.64.656 1.594.656.703 0 1.203-.36.5-.374.797-1.203zm-4.235-2.078h4.25q-.093-.953-.484-1.437-.625-.75-1.61-.75-.874 0-1.484.594-.61.593-.672 1.593zm12.105 4.532v-.954q-.72 1.125-2.125 1.125-.907 0-1.672-.5-.75-.5-1.172-1.39-.422-.906-.422-2.078 0-1.14.375-2.063.39-.922 1.14-1.406.766-.5 1.704-.5.687 0 1.218.297.532.281.875.734v-3.75h1.282v10.485h-1.203zm-4.063-3.797q0 1.468.61 2.187.624.719 1.453.719.843 0 1.437-.688.594-.687.594-2.109 0-1.562-.61-2.281-.593-.735-1.484-.735-.844 0-1.422.704-.578.703-.578 2.203zm12.214 3.797v-.954q-.72 1.125-2.125 1.125-.907 0-1.672-.5-.75-.5-1.172-1.39-.422-.906-.422-2.078 0-1.14.375-2.063.39-.922 1.14-1.406.766-.5 1.704-.5.687 0 1.218.297.532.281.875.734v-3.75h1.282v10.485h-1.203zm-4.063-3.797q0 1.468.61 2.187.624.719 1.453.719.843 0 1.437-.688.594-.687.594-2.109 0-1.562-.61-2.281-.593-.735-1.484-.735-.844 0-1.422.704-.578.703-.578 2.203zm12.495 1.343 1.328.172q-.312 1.172-1.172 1.813-.844.64-2.172.64-1.672 0-2.656-1.015-.969-1.031-.969-2.89 0-1.923.985-2.97 1-1.062 2.578-1.062 1.515 0 2.484 1.031.969 1.031.969 2.922 0 .11-.016.344h-5.656q.063 1.25.703 1.922.64.656 1.594.656.703 0 1.203-.36.5-.374.797-1.203zm-4.234-2.078h4.25q-.094-.953-.485-1.437-.625-.75-1.61-.75-.874 0-1.484.594-.609.593-.671 1.593zm7.166 4.532v-7.594h1.157v1.14q.453-.796.828-1.046.375-.266.812-.266.656 0 1.328.406l-.437 1.203q-.469-.28-.953-.28-.422 0-.766.25-.328.25-.469.702-.218.688-.218 1.5v3.985h-1.282z"/><path fill="none" d="M78.932 491.283v-71.905h30.708v71.905z"/><path fill="#bf9000" d="M96.298 469.978q.39.453.547.875.156.422.156.906 0 .797-.39 1.219-.391.422-1 .422-.344 0-.641-.157-.297-.156-.469-.422-.187-.265-.281-.593-.063-.235-.11-.719-.124-1-.28-1.469h-.22q-.5 0-.703.235-.28.312-.28.921 0 .579.202.86.203.281.719.406l-.11.797q-.515-.11-.827-.36-.329-.25-.5-.718-.172-.469-.172-1.094 0-.625.156-1 .14-.39.36-.578.218-.188.562-.25.203-.047.75-.047h1.094q1.14 0 1.453-.047.297-.062.578-.219v.86q-.25.125-.594.172zm-1.828.062q.172.453.297 1.344.078.5.172.719.093.203.265.312.172.11.39.11.329 0 .548-.235.219-.25.219-.734 0-.469-.204-.828-.218-.375-.578-.563-.265-.125-.812-.125h-.297zm4.281-2.094h-6.703v-.75h.64q-.374-.266-.562-.594-.187-.343-.187-.812 0-.625.328-1.094.312-.469.906-.703.578-.25 1.266-.25.734 0 1.328.266.594.265.922.78.312.5.312 1.063 0 .407-.172.735t-.437.531h2.36v.828zm-4.25-.75q.938 0 1.39-.375.438-.375.438-.922t-.453-.922q-.469-.39-1.437-.39-.938 0-1.391.375-.453.375-.453.906t.484.937q.485.391 1.422.391zm4.25-4.438h-6.703v-.75h.64q-.374-.265-.562-.594-.187-.343-.187-.812 0-.625.328-1.094.312-.469.906-.703.578-.25 1.266-.25.734 0 1.328.266.594.265.922.781.312.5.312 1.062 0 .407-.172.735t-.437.531h2.36v.828zm-4.25-.75q.938 0 1.39-.375.438-.375.438-.922t-.453-.922q-.469-.39-1.437-.39-.938 0-1.391.375-.453.375-.453.906t.484.938q.485.39 1.422.39zm2.39-7.03h-4.843v-.734h.734q-.515-.28-.671-.515-.172-.25-.172-.532 0-.421.265-.843l.766.28q-.172.298-.172.61 0 .266.156.485.157.203.453.297.438.14.954.14h2.53v.813zm-1.562-6.418.11-.844q.75.188 1.156.734.406.547.406 1.391 0 1.063-.656 1.688-.656.609-1.828.609-1.219 0-1.89-.625-.688-.625-.688-1.625 0-.984.672-1.594.656-.61 1.859-.61h.219v3.61q.797-.047 1.218-.453.422-.406.422-1.016 0-.453-.234-.765-.234-.313-.766-.5zm-1.328 2.687v-2.703q-.61.063-.906.313-.469.39-.469 1.015 0 .563.375.953.375.375 1 .422zm4.75-4.563h-6.703v-.75h.64q-.374-.265-.562-.593-.187-.344-.187-.813 0-.625.328-1.094.312-.468.906-.703.578-.25 1.266-.25.734 0 1.328.266.594.266.922.781.312.5.312 1.063 0 .406-.172.734-.172.328-.437.531h2.36v.828zm-4.25-.75q.938 0 1.39-.375.438-.375.438-.921 0-.547-.453-.922-.469-.39-1.437-.39-.938 0-1.391.374-.453.375-.453.906 0 .532.484.938.485.39 1.422.39zm-.031-4.14q-1.344 0-1.984-.75-.547-.626-.547-1.516 0-1 .656-1.625.656-.64 1.812-.64.938 0 1.47.28.53.282.827.813.297.531.297 1.172 0 1.015-.64 1.64-.657.625-1.891.625zm0-.844q.937 0 1.406-.407.453-.406.453-1.015 0-.61-.468-1.016-.47-.406-1.422-.406-.891 0-1.344.406-.469.406-.469 1.016t.469 1.015q.453.407 1.375.407z"/><path fill="none" d="M155.152 436.38h86.457v37.166h-86.457z"/><path fill="#000" d="M175.502 459.46v-10.484h4.64q1.407 0 2.141.281.735.282 1.172 1 .438.704.438 1.579 0 1.109-.735 1.875-.718.765-2.234.984.563.25.844.516.61.562 1.156 1.39l1.813 2.86h-1.735l-1.39-2.188q-.61-.937-1-1.437-.391-.5-.704-.704-.312-.203-.64-.28-.235-.048-.766-.048h-1.61v4.657h-1.39zm1.39-5.859h2.985q.938 0 1.469-.187.547-.203.828-.64.281-.438.281-.938 0-.75-.547-1.22-.53-.484-1.703-.484h-3.312v3.47zm13.991 5.86v-1.11q-.89 1.281-2.422 1.281-.671 0-1.25-.25-.578-.265-.875-.656-.28-.39-.39-.953-.078-.375-.078-1.203v-4.703h1.28v4.203q0 1.016.079 1.36.125.515.516.812.406.281.984.281t1.078-.297q.516-.297.719-.812.219-.516.219-1.485v-4.062h1.28v7.594h-1.14zm3.167 0v-7.594h1.156v1.078q.844-1.25 2.422-1.25.688 0 1.266.25.578.234.86.64.28.407.405.954.063.36.063 1.25v4.672h-1.281v-4.625q0-.782-.157-1.172-.156-.39-.546-.625-.375-.235-.891-.235-.813 0-1.422.532-.594.515-.594 1.968v4.157h-1.281zm8.151 0v-7.594h1.156v1.078q.844-1.25 2.422-1.25.688 0 1.266.25.578.234.86.64.28.407.406.954.062.36.062 1.25v4.672h-1.281v-4.625q0-.782-.156-1.172-.157-.39-.547-.625-.375-.235-.891-.235-.812 0-1.422.532-.594.515-.594 1.968v4.157h-1.28zm13.354-2.454 1.328.172q-.312 1.172-1.171 1.813-.844.64-2.172.64-1.672 0-2.657-1.015-.968-1.031-.968-2.89 0-1.923.984-2.97 1-1.062 2.578-1.062 1.516 0 2.485 1.031.968 1.031.968 2.922 0 .11-.015.344h-5.657q.063 1.25.704 1.922.64.656 1.593.656.703 0 1.203-.36.5-.374.797-1.203zm-4.234-2.078h4.25q-.094-.953-.484-1.437-.625-.75-1.61-.75-.875 0-1.484.594-.61.593-.672 1.593zm7.167 4.532v-7.594h1.156v1.14q.453-.796.828-1.046.375-.266.813-.266.656 0 1.328.406l-.438 1.203q-.469-.28-.953-.28-.422 0-.766.25-.328.25-.468.702-.219.688-.219 1.5v3.985h-1.281z"/><path fill="none" d="M151.466 19.113h93.827v37.165h-93.827z"/><path fill="#000" d="M170.99 42.193V31.708h3.625q1.219 0 1.86.141.906.203 1.546.75.828.703 1.235 1.797.406 1.094.406 2.5 0 1.187-.281 2.11-.266.921-.704 1.53-.437.61-.968.954-.516.343-1.25.531-.719.172-1.672.172h-3.797zm1.39-1.235h2.25q1.032 0 1.626-.187.593-.203.937-.547.5-.5.766-1.328.281-.844.281-2.031 0-1.64-.547-2.516-.531-.89-1.312-1.187-.547-.22-1.797-.22h-2.203v8.016zm13.991.297q-.719.61-1.375.86t-1.422.25q-1.25 0-1.922-.61-.671-.609-.671-1.562 0-.563.25-1.016.25-.469.656-.75.422-.281.937-.422.375-.093 1.14-.187 1.563-.188 2.298-.453.015-.266.015-.328 0-.797-.375-1.11-.484-.437-1.453-.437-.922 0-1.36.328-.421.312-.624 1.11l-1.266-.173q.172-.797.563-1.297.39-.5 1.14-.765.75-.266 1.72-.266.984 0 1.593.235.61.218.89.562.282.344.407.875.062.328.062 1.188v1.718q0 1.797.078 2.282.079.468.329.906h-1.344q-.203-.406-.266-.938zm-.11-2.875q-.702.282-2.093.485-.797.11-1.125.265-.328.141-.516.422-.171.266-.171.594 0 .516.39.86.39.343 1.14.343.735 0 1.313-.312.594-.329.86-.891.203-.438.203-1.297v-.469zm3.292 3.813v-7.594h1.157v1.14q.453-.796.828-1.046.375-.266.812-.266.657 0 1.328.406l-.437 1.204q-.469-.282-.953-.282-.422 0-.766.25-.328.25-.469.703-.218.688-.218 1.5v3.985h-1.282zm7.71-1.156.187 1.14q-.547.11-.985.11-.687 0-1.078-.22-.39-.218-.547-.577-.156-.36-.156-1.516V35.6h-.953v-1h.953v-1.89l1.281-.766v2.656h1.297v1h-1.297v4.438q0 .546.063.718.078.157.219.25.156.078.453.078.203 0 .562-.046zm3.537 1.156 4.016-10.485h1.5l4.297 10.485h-1.579L207.8 39.02h-4.375l-1.156 3.172H200.8zm3.016-4.313h3.562l-1.094-2.906q-.5-1.312-.75-2.172-.203 1.016-.562 2l-1.156 3.078zm7.744 7.22V34.6h1.172v.983q.422-.578.937-.859.516-.297 1.266-.297.969 0 1.719.5.75.5 1.125 1.422.375.906.375 1.984 0 1.172-.422 2.11-.406.922-1.219 1.422-.797.5-1.672.5-.64 0-1.156-.266-.516-.281-.844-.687v3.687h-1.28zm1.156-6.657q0 1.453.594 2.156.61.703 1.453.703.86 0 1.469-.719.61-.734.61-2.25 0-1.453-.61-2.171-.594-.735-1.422-.735-.812 0-1.453.781-.64.766-.64 2.235zm6.995 6.656V34.6h1.172v.984q.422-.578.938-.859.515-.297 1.265-.297.969 0 1.719.5.75.5 1.125 1.422.375.906.375 1.984 0 1.172-.422 2.11-.406.922-1.219 1.422-.797.5-1.672.5-.64 0-1.156-.266-.515-.281-.844-.687v3.687h-1.28zm1.156-6.656q0 1.453.594 2.156.61.703 1.453.703.86 0 1.47-.719.608-.734.608-2.25 0-1.453-.609-2.171-.594-.735-1.422-.735-.812 0-1.453.781-.64.766-.64 2.235z"/><path fill="none" d="M78.93 78.64V6.83h30.71v71.81z"/><path fill="#bf9000" d="M96.297 57.382q.39.453.547.875.156.422.156.906 0 .797-.39 1.219-.391.422-1 .422-.345 0-.641-.156-.297-.157-.47-.422-.187-.266-.28-.594-.063-.234-.11-.719-.125-1-.281-1.469h-.219q-.5 0-.703.235-.281.312-.281.922 0 .578.203.859t.719.406l-.11.797q-.515-.11-.828-.36-.328-.25-.5-.718-.172-.469-.172-1.094 0-.625.157-1 .14-.39.359-.578.219-.187.562-.25.204-.047.75-.047h1.094q1.14 0 1.453-.047.297-.062.578-.218v.859q-.25.125-.593.172zm-1.828.062q.171.454.296 1.344.079.5.172.719.094.203.266.312.172.11.39.11.329 0 .547-.235.22-.25.22-.734 0-.469-.204-.828-.219-.375-.578-.563-.266-.125-.813-.125h-.296zm4.28-2.094h-6.702v-.75h.64q-.375-.265-.562-.593-.188-.344-.188-.813 0-.625.328-1.094.313-.468.907-.703.578-.25 1.265-.25.735 0 1.328.266.594.265.922.781.313.5.313 1.063 0 .406-.172.734-.172.328-.438.531h2.36v.828zm-4.25-.75q.938 0 1.391-.375.438-.375.438-.922 0-.546-.453-.921-.469-.391-1.438-.391-.937 0-1.39.375-.453.375-.453.906t.484.938q.484.39 1.422.39zm4.25-4.438h-6.702v-.75h.64q-.375-.265-.562-.593-.188-.344-.188-.813 0-.625.328-1.094.313-.468.907-.703.578-.25 1.265-.25.735 0 1.328.266.594.266.922.781.313.5.313 1.063 0 .406-.172.734-.172.328-.438.531h2.36v.828zm-4.25-.75q.938 0 1.391-.375.438-.375.438-.921 0-.547-.453-.922-.469-.391-1.438-.391-.937 0-1.39.375-.453.375-.453.906 0 .532.484.938.484.39 1.422.39zm2.391-7.03h-4.843v-.734h.734q-.516-.28-.672-.515-.172-.25-.172-.531 0-.422.266-.844l.766.281q-.172.297-.172.61 0 .265.156.484.156.203.453.297.438.14.953.14h2.531v.813zm-1.562-6.418.11-.844q.75.188 1.156.735.406.547.406 1.39 0 1.063-.656 1.688-.657.61-1.829.61-1.218 0-1.89-.626-.688-.625-.688-1.625 0-.984.672-1.594.656-.609 1.86-.609h.218v3.61q.797-.047 1.22-.454.42-.406.42-1.015 0-.453-.233-.766-.235-.312-.766-.5zM94 38.652v-2.704q-.61.063-.906.313-.47.39-.47 1.016 0 .562.376.953.375.375 1 .422zm4.75-4.563h-6.703v-.75h.64q-.375-.266-.562-.594-.188-.344-.188-.813 0-.625.328-1.093.313-.47.907-.703.578-.25 1.265-.25.735 0 1.328.265.594.266.922.781.313.5.313 1.063 0 .406-.172.734-.172.328-.438.532h2.36v.828zm-4.25-.75q.937 0 1.39-.375.438-.375.438-.922t-.453-.922q-.469-.39-1.438-.39-.937 0-1.39.374-.453.375-.453.907 0 .53.484.937.484.39 1.422.39zm-.031-4.141q-1.344 0-1.985-.75-.547-.625-.547-1.516 0-1 .657-1.625.656-.64 1.812-.64.938 0 1.469.28.531.282.828.813.297.531.297 1.172 0 1.016-.64 1.64-.657.626-1.891.626zm0-.844q.937 0 1.406-.406.453-.407.453-1.016 0-.61-.469-1.016t-1.422-.406q-.89 0-1.343.406-.47.407-.47 1.016 0 .61.47 1.016.453.406 1.375.406z"/><path fill="none" d="M78.93 166.339V76.102h30.71v90.237z"/><path fill="#0b5394" d="M96.89 145.033h-4.203v.719h-.64v-.719h-.516q-.484 0-.719-.078-.312-.125-.515-.422t-.203-.843q0-.344.093-.766l.703.125q-.046.266-.046.484 0 .375.171.532.157.156.594.156h.438v-.938h.64v.938h4.203v.812zm0-2.373H90.22v-.828h6.671v.828zm0-5.26h-.703q.813.563.813 1.532 0 .422-.156.797-.172.375-.422.562-.25.172-.61.25-.234.047-.765.047h-3v-.828h2.687q.64 0 .875-.047.313-.078.5-.328.188-.25.188-.61 0-.375-.188-.703-.187-.328-.515-.453-.329-.14-.954-.14h-2.593v-.813h4.843v.734zm-.734-3.812.719-.11q.078.344.078.61 0 .453-.14.703-.141.234-.36.343-.234.094-.984.094h-2.782v.61h-.64v-.61h-1.188l-.5-.812h1.688v-.828h.64v.828h2.828q.36 0 .47-.047.093-.047.155-.14.047-.095.047-.282 0-.14-.03-.36zm0-2.592.719-.11q.078.344.078.61 0 .453-.14.703-.141.234-.36.344-.234.094-.984.094h-2.782v.609h-.64v-.61h-1.188l-.5-.812h1.688v-.828h.64v.828h2.828q.36 0 .47-.047.093-.047.155-.14.047-.094.047-.282 0-.14-.03-.36zm-.828-4.107.11-.844q.75.187 1.156.734.406.547.406 1.39 0 1.063-.656 1.688-.657.61-1.829.61-1.218 0-1.89-.625-.688-.625-.688-1.625 0-.985.672-1.594.656-.61 1.86-.61h.218v3.61q.797-.047 1.22-.453.42-.406.42-1.016 0-.453-.233-.765-.235-.313-.766-.5zM94 129.576v-2.703q-.61.063-.906.313-.47.39-.47 1.015 0 .563.376.953.375.375 1 .422zm2.89-4.563h-4.843v-.734h.734q-.516-.281-.672-.516-.172-.25-.172-.531 0-.422.266-.844l.766.282q-.172.296-.172.609 0 .266.156.484.156.203.453.297.438.14.953.14h2.531v.813zm.11-2.497-6.906-1.937v-.656L97 121.86v.656zm-.11-3.404h-4.203v.719h-.64v-.719h-.516q-.484 0-.719-.078-.312-.125-.515-.422t-.203-.844q0-.343.093-.765l.703.125q-.046.265-.046.484 0 .375.171.531.157.157.594.157h.438v-.938h.64v.938h4.203v.812zm0-2.373H90.22v-.828h6.671v.828zm0-5.26h-.703q.813.563.813 1.532 0 .421-.156.796-.172.375-.422.563-.25.172-.61.25-.234.047-.765.047h-3v-.828h2.687q.64 0 .875-.047.313-.078.5-.328.188-.25.188-.61 0-.375-.188-.703-.187-.328-.515-.453-.329-.14-.954-.14h-2.593v-.813h4.843v.734zm-.734-3.813.719-.109q.078.344.078.61 0 .453-.14.703-.141.234-.36.343-.234.094-.984.094h-2.782v.61h-.64v-.61h-1.188l-.5-.812h1.688v-.829h.64v.829h2.828q.36 0 .47-.047.093-.047.155-.14.047-.095.047-.282 0-.14-.03-.36zm0-2.591.719-.11q.078.344.078.61 0 .453-.14.703-.141.234-.36.344-.234.093-.984.093h-2.782v.61h-.64v-.61h-1.188l-.5-.812h1.688v-.828h.64v.828h2.828q.36 0 .47-.047.093-.047.155-.14.047-.094.047-.282 0-.14-.03-.36zm-.828-4.107.11-.844q.75.187 1.156.734.406.547.406 1.39 0 1.063-.656 1.688-.657.61-1.829.61-1.218 0-1.89-.625-.688-.625-.688-1.625 0-.985.672-1.594.656-.61 1.86-.61h.218v3.61q.797-.047 1.22-.453.42-.406.42-1.016 0-.453-.233-.765-.235-.313-.766-.5zM94 103.655v-2.703q-.61.062-.906.312-.47.391-.47 1.016 0 .563.376.953.375.375 1 .422zm2.89-4.563h-4.843v-.734h.734q-.516-.281-.672-.516-.172-.25-.172-.531 0-.422.266-.844l.766.281q-.172.297-.172.61 0 .265.156.484.156.203.453.297.438.14.953.14h2.531v.813z"/><path fill="none" d="M151.466 105.016h93.827v37.165h-93.827z"/><path fill="#000" d="M162.938 128.096V117.61h7.078v1.235h-5.687v3.25h4.922v1.234h-4.922v4.766h-1.39zm8.703 0v-7.594h1.156v1.14q.453-.796.828-1.046.375-.266.813-.266.656 0 1.328.406l-.438 1.204q-.468-.282-.953-.282-.422 0-.765.25-.329.25-.47.703-.218.688-.218 1.5v3.985h-1.281zm9.85-.938q-.72.61-1.376.86-.656.25-1.422.25-1.25 0-1.922-.61-.671-.61-.671-1.562 0-.563.25-1.016.25-.469.656-.75.422-.281.937-.422.375-.093 1.141-.187 1.562-.188 2.297-.453.015-.266.015-.328 0-.797-.375-1.11-.484-.437-1.453-.437-.922 0-1.359.328-.422.312-.625 1.11l-1.266-.173q.172-.797.563-1.297.39-.5 1.14-.765.75-.266 1.72-.266.984 0 1.593.235.61.218.89.562.282.344.407.875.062.328.062 1.188v1.718q0 1.797.078 2.282.079.468.329.906h-1.344q-.203-.406-.266-.938zm-.11-2.875q-.703.282-2.094.485-.797.109-1.125.265-.328.14-.516.422-.171.266-.171.594 0 .516.39.86.39.343 1.14.343.735 0 1.313-.312.594-.329.86-.891.203-.438.203-1.297v-.469zm3.307 3.813v-7.594h1.156v1.063q.344-.563.938-.891.61-.344 1.36-.344.843 0 1.374.344.547.344.766.984.906-1.328 2.36-1.328 1.124 0 1.734.625.61.625.61 1.922v5.219h-1.282v-4.781q0-.782-.125-1.11-.125-.344-.453-.547-.328-.218-.782-.218-.796 0-1.328.53-.53.532-.53 1.704v4.422h-1.282v-4.938q0-.86-.313-1.281-.312-.437-1.03-.437-.548 0-1.017.296-.453.282-.671.829-.204.546-.204 1.593v3.938h-1.28zm17.412-2.453 1.328.172q-.312 1.171-1.172 1.812-.843.64-2.172.64-1.671 0-2.656-1.015-.969-1.031-.969-2.89 0-1.922.985-2.97 1-1.062 2.578-1.062 1.516 0 2.484 1.031.97 1.032.97 2.922 0 .11-.017.344h-5.656q.063 1.25.703 1.922.641.656 1.594.656.703 0 1.203-.36.5-.374.797-1.202zm-4.234-2.078h4.25q-.094-.954-.485-1.438-.625-.75-1.609-.75-.875 0-1.484.594-.61.594-.672 1.594zm8.588 4.53-2.328-7.593h1.328l1.203 4.375.454 1.64.39-1.577 1.219-4.438h1.328l1.125 4.406.39 1.453.438-1.468 1.297-4.391h1.25l-2.375 7.594h-1.344l-1.203-4.547-.297-1.297-1.53 5.844h-1.345zm8.694-3.796q0-2.11 1.172-3.125.984-.844 2.39-.844 1.579 0 2.563 1.031 1 1.016 1 2.829 0 1.468-.438 2.312-.437.828-1.28 1.297-.845.469-1.845.469-1.593 0-2.578-1.016-.984-1.031-.984-2.953zm1.328 0q0 1.453.625 2.187.64.72 1.61.72.968 0 1.593-.72.64-.734.64-2.234 0-1.406-.64-2.125-.64-.734-1.594-.734-.968 0-1.609.718-.625.72-.625 2.188zm7.292 3.797v-7.594h1.156v1.14q.453-.796.828-1.046.375-.266.813-.266.656 0 1.328.406l-.438 1.204q-.468-.282-.953-.282-.422 0-.765.25-.329.25-.47.703-.218.688-.218 1.5v3.985h-1.281zm4.896 0V117.61h1.297v5.97l3.047-3.079h1.672l-2.907 2.813 3.188 4.78h-1.578l-2.516-3.89-.906.875v3.016h-1.297z"/><path fill="none" d="M307.598 205.488v-99.401h30.71v99.401z"/><path fill="#000" d="M327.418 190.951h-6.703v-.75h.64q-.375-.266-.562-.594-.188-.343-.188-.812 0-.625.328-1.094.313-.469.907-.703.578-.25 1.265-.25.735 0 1.328.266.594.265.922.78.313.5.313 1.063 0 .407-.172.735t-.438.53h2.36v.83zm-4.25-.75q.937 0 1.39-.375.438-.375.438-.922t-.453-.922q-.469-.39-1.438-.39-.937 0-1.39.375-.453.375-.453.906t.484.937q.484.391 1.422.391zm2.39-4.422h-6.671v-.828h6.671v.828zm-.593-5.244q.39.453.547.875.156.421.156.906 0 .797-.39 1.219-.391.421-1 .421-.345 0-.641-.156-.297-.156-.47-.422-.187-.265-.28-.593-.063-.235-.11-.72-.125-1-.281-1.468h-.219q-.5 0-.703.234-.281.313-.281.922 0 .578.203.86.203.28.719.406l-.11.797q-.515-.11-.828-.36-.328-.25-.5-.718-.172-.47-.172-1.094 0-.625.157-1 .14-.39.359-.578.219-.188.562-.25.204-.047.75-.047h1.094q1.14 0 1.453-.047.297-.062.578-.219v.86q-.25.125-.593.172zm-1.828.062q.171.453.296 1.344.079.5.172.719.094.203.266.312.172.11.39.11.329 0 .547-.235.22-.25.22-.734 0-.47-.204-.828-.219-.375-.578-.563-.266-.125-.813-.125h-.296zm1.687-3.891.719-.11q.078.344.078.61 0 .453-.14.703-.141.235-.36.344-.234.094-.984.094h-2.782v.609h-.64v-.61h-1.188l-.5-.812h1.688v-.828h.64v.828h2.828q.36 0 .47-.047.093-.047.155-.14.047-.094.047-.282 0-.14-.031-.359zm.734-.998h-4.203v.719h-.64v-.719h-.516q-.484 0-.719-.078-.312-.125-.515-.422t-.203-.844q0-.343.093-.765l.703.125q-.046.265-.046.484 0 .375.171.531.157.157.594.157h.438v-.938h.64v.938h4.203v.812zm-2.421-2.092q-1.344 0-1.985-.75-.547-.625-.547-1.515 0-1 .657-1.625.656-.64 1.812-.64.938 0 1.469.28.531.282.828.813.297.531.297 1.172 0 1.015-.64 1.64-.657.625-1.891.625zm0-.843q.937 0 1.406-.407.453-.406.453-1.015 0-.61-.469-1.016t-1.422-.406q-.89 0-1.343.406-.47.406-.47 1.016t.47 1.015q.453.407 1.375.407zm2.421-4.641h-4.843v-.735h.734q-.516-.28-.672-.515-.172-.25-.172-.532 0-.421.266-.843l.766.281q-.172.297-.172.61 0 .265.156.484.156.203.453.297.438.14.953.14h2.531v.813zm0-3.107h-4.843v-.734h.687q-.36-.234-.578-.61-.219-.374-.219-.859 0-.547.235-.89.218-.344.625-.485-.86-.562-.86-1.484 0-.719.407-1.11.39-.39 1.218-.39h3.328v.812h-3.046q-.485 0-.704.094-.218.078-.343.281-.14.204-.14.485 0 .515.343.86.328.327 1.078.327h2.812v.828h-3.14q-.547 0-.813.204-.281.187-.281.656 0 .344.188.64.171.282.53.422.345.125 1 .125h2.516v.828zm-2-7.458h-.828v-2.515h.828v2.515zm1.407-6.575q.39.454.547.875.156.422.156.907 0 .797-.39 1.218-.391.422-1 .422-.345 0-.641-.156-.297-.156-.47-.422-.187-.265-.28-.594-.063-.234-.11-.718-.125-1-.281-1.47h-.219q-.5 0-.703.235-.281.313-.281.922 0 .578.203.86.203.28.719.406l-.11.797q-.515-.11-.828-.36-.328-.25-.5-.718-.172-.47-.172-1.094 0-.625.157-1 .14-.39.359-.578.219-.188.562-.25.204-.047.75-.047h1.094q1.14 0 1.453-.047.297-.063.578-.219v.86q-.25.125-.593.171zm-1.828.063q.171.453.296 1.344.079.5.172.718.094.204.266.313.172.11.39.11.329 0 .547-.235.22-.25.22-.734 0-.47-.204-.829-.219-.375-.578-.562-.266-.125-.813-.125h-.296zm2.828-1.954.11-.796q.374-.047.546-.282.219-.297.219-.828 0-.562-.235-.875-.218-.312-.625-.422-.25-.062-1.062-.062.64.547.64 1.344 0 1-.718 1.546-.72.547-1.735.547-.687 0-1.265-.25-.594-.25-.907-.718-.328-.485-.328-1.125 0-.86.703-1.422h-.593v-.75h4.187q1.125 0 1.594.234.484.219.75.719.281.5.281 1.234 0 .86-.39 1.39-.391.532-1.172.516zm-2.907-.671q.954 0 1.391-.375.438-.391.438-.954 0-.562-.438-.937-.437-.39-1.375-.39-.875 0-1.328.39-.453.39-.453.953 0 .547.453.938.437.375 1.312.375zm2.5-4.657h-4.843v-.75h.687q-.797-.531-.797-1.531 0-.438.172-.797.156-.375.406-.547.25-.188.61-.266.219-.047.797-.047h2.968v.829h-2.937q-.5 0-.75.093-.25.094-.39.344-.157.234-.157.563 0 .515.328.906.328.375 1.266.375h2.64v.828zm-2.421-4.891q-1.344 0-1.985-.75-.547-.625-.547-1.516 0-1 .657-1.625.656-.64 1.812-.64.938 0 1.469.28.531.282.828.813.297.532.297 1.172 0 1.016-.64 1.64-.657.626-1.891.626zm0-.844q.937 0 1.406-.406.453-.406.453-1.016t-.469-1.015q-.469-.407-1.422-.407-.89 0-1.343.407-.47.406-.47 1.015 0 .61.47 1.016.453.406 1.375.406zm.984-4.313-.14-.812q.5-.078.765-.39.25-.313.25-.86 0-.578-.234-.844-.235-.281-.532-.281-.281 0-.437.25-.11.172-.281.844-.235.89-.391 1.25-.172.343-.469.53-.297.173-.64.173-.329 0-.594-.14-.281-.157-.469-.407-.14-.203-.234-.531-.11-.329-.11-.704 0-.578.172-1 .156-.437.438-.64.28-.203.75-.281l.11.796q-.376.063-.58.329-.202.265-.202.734 0 .562.187.812.172.235.438.235.156 0 .281-.094.125-.11.219-.312.047-.125.203-.735.234-.86.39-1.203.141-.344.422-.531.282-.203.704-.203.406 0 .78.234.36.234.563.688.188.453.188 1.015 0 .953-.39 1.453-.391.485-1.157.625zm.703-6.789.719-.11q.078.345.078.61 0 .453-.14.703-.141.235-.36.344-.234.094-.984.094h-2.782v.61h-.64v-.61h-1.188l-.5-.813h1.688v-.828h.64v.828h2.828q.36 0 .47-.046.093-.047.155-.141.047-.094.047-.281 0-.141-.031-.36zm-5-.81h-.937v-.813h.937v.813zm5.734 0h-4.843v-.813h4.843v.813zm-1.765-5.213.094-.813q.843.125 1.312.672.469.547.469 1.344 0 .984-.64 1.594-.657.61-1.876.61-.781 0-1.36-.267-.593-.265-.89-.78-.297-.532-.297-1.157 0-.797.407-1.297.39-.5 1.125-.64l.125.796q-.485.11-.72.407-.25.28-.25.703 0 .61.438 1t1.407.39q.968 0 1.421-.375.438-.375.438-.984 0-.469-.297-.797-.297-.328-.906-.406z"/><path fill="none" d="M307.596 452.83v-99.402h30.708v99.401z"/><path fill="#000" d="M327.415 436.473h-6.703v-.75h.64q-.374-.266-.562-.594-.187-.344-.187-.813 0-.625.328-1.093.312-.47.906-.703.578-.25 1.266-.25.734 0 1.328.265.594.266.922.781.312.5.312 1.063 0 .406-.172.734-.172.328-.437.532h2.36v.828zm-4.25-.75q.938 0 1.39-.375.438-.375.438-.922t-.453-.922q-.469-.39-1.437-.39-.938 0-1.391.374-.453.375-.453.907 0 .53.484.937.485.39 1.422.39zm2.39-4.423h-6.671v-.828h6.672v.828zm-.593-5.244q.39.453.547.875.156.422.156.906 0 .797-.39 1.22-.391.421-1 .421-.344 0-.641-.156-.297-.156-.469-.422-.187-.266-.281-.594-.063-.234-.11-.719-.124-1-.28-1.468h-.22q-.5 0-.703.234-.28.313-.28.922 0 .578.202.86.203.28.719.406l-.11.796q-.515-.109-.827-.359-.329-.25-.5-.719-.172-.468-.172-1.093t.156-1q.14-.391.36-.579.218-.187.562-.25.203-.046.75-.046h1.094q1.14 0 1.453-.047.297-.063.578-.22v.86q-.25.125-.594.172zm-1.828.063q.172.453.297 1.343.078.5.172.72.093.202.265.312.172.109.39.109.329 0 .548-.234.219-.25.219-.735 0-.468-.204-.828-.218-.375-.578-.562-.265-.125-.812-.125h-.297zm1.687-3.891.72-.11q.077.344.077.61 0 .453-.14.703-.141.234-.36.344-.234.093-.984.093h-2.781v.61h-.641v-.61h-1.187l-.5-.812h1.687v-.828h.64v.828h2.829q.36 0 .469-.047.093-.047.156-.14.047-.094.047-.282 0-.14-.032-.36zm.735-.998h-4.203v.718h-.641v-.718h-.516q-.484 0-.718-.078-.313-.125-.516-.422t-.203-.844q0-.344.094-.766l.703.125q-.047.266-.047.485 0 .375.172.531.156.156.594.156h.437v-.937h.64v.937h4.204v.813zm-2.422-2.092q-1.344 0-1.984-.75-.547-.625-.547-1.516 0-1 .656-1.625.656-.64 1.812-.64.938 0 1.47.281.53.281.827.813.297.53.297 1.171 0 1.016-.64 1.641-.657.625-1.891.625zm0-.844q.937 0 1.406-.406.453-.406.453-1.016 0-.609-.468-1.015-.47-.406-1.422-.406-.891 0-1.344.406-.469.406-.469 1.015 0 .61.469 1.016.453.406 1.375.406zm2.422-4.64h-4.844v-.735h.734q-.515-.281-.671-.516-.172-.25-.172-.53 0-.423.265-.845l.766.282q-.172.296-.172.609 0 .266.156.484.157.203.453.297.438.14.954.14h2.53v.813zm0-3.107h-4.844v-.734h.688q-.36-.235-.579-.61-.218-.375-.218-.86 0-.546.234-.89.219-.344.625-.484-.86-.563-.86-1.485 0-.718.407-1.109.39-.39 1.219-.39h3.328v.812h-3.047q-.484 0-.703.094-.219.078-.344.281-.14.203-.14.484 0 .516.343.86.328.328 1.078.328h2.813v.828h-3.14q-.548 0-.813.203-.282.188-.282.656 0 .344.188.641.172.281.531.422.344.125 1 .125h2.516v.828zm-2-7.458h-.828v-2.516h.828v2.516zm.562-3.09-.14-.813q.5-.078.765-.39.25-.313.25-.86 0-.578-.234-.844-.234-.281-.531-.281-.282 0-.438.25-.11.172-.281.844-.234.89-.39 1.25-.173.343-.47.53-.296.173-.64.173-.328 0-.594-.14-.281-.157-.469-.407-.14-.203-.234-.531-.11-.329-.11-.704 0-.578.173-1 .156-.437.437-.64t.75-.281l.11.796q-.376.063-.579.329-.203.265-.203.734 0 .562.188.812.172.235.437.235.156 0 .281-.094.125-.11.22-.312.046-.125.202-.735.235-.86.39-1.203.142-.344.423-.531.281-.203.703-.203.406 0 .781.234.36.234.563.688.187.453.187 1.015 0 .953-.39 1.453-.391.485-1.157.625zm3.297-4.993h-6.703v-.75h.64q-.374-.265-.562-.594-.187-.343-.187-.812 0-.625.328-1.094.312-.469.906-.703.578-.25 1.266-.25.734 0 1.328.266.594.265.922.78.312.5.312 1.063 0 .407-.172.735t-.437.531h2.36v.828zm-4.25-.75q.938 0 1.39-.375.438-.375.438-.922t-.453-.922q-.469-.39-1.437-.39-.938 0-1.391.375-.453.375-.453.906t.484.938q.485.39 1.422.39zm.828-7.75.11-.844q.75.188 1.156.734.406.547.406 1.391 0 1.063-.656 1.688-.656.609-1.828.609-1.219 0-1.89-.625-.688-.625-.688-1.625 0-.984.672-1.594.656-.61 1.859-.61h.219v3.61q.797-.047 1.218-.453.422-.406.422-1.016 0-.453-.234-.765-.234-.313-.766-.5zm-1.328 2.687v-2.703q-.61.063-.906.313-.469.39-.469 1.015 0 .563.375.953.375.375 1 .422zm1.125-7.719.094-.812q.844.125 1.312.672.47.546.47 1.343 0 .985-.641 1.594-.657.61-1.875.61-.782 0-1.36-.266-.594-.266-.89-.781-.297-.532-.297-1.157 0-.797.406-1.297.39-.5 1.125-.64l.125.797q-.484.11-.719.406-.25.281-.25.703 0 .61.438 1 .437.39 1.406.39.969 0 1.422-.374.437-.375.437-.985 0-.468-.297-.797-.296-.328-.906-.406zm-3.969-1.523h-.937v-.813h.937v.813zm5.735 0h-4.844v-.813h4.844v.813zm0-2.26h-4.203v.719h-.641v-.72h-.516q-.484 0-.718-.077-.313-.125-.516-.422t-.203-.844q0-.344.094-.766l.703.125q-.047.266-.047.485 0 .375.172.531.156.156.594.156h.437v-.937h.64v.937h4.204v.813zm-5.735-2.404h-.937v-.813h.937v.813zm5.735 0h-4.844v-.813h4.844v.813zm-1.766-5.213.094-.813q.844.125 1.312.672.47.547.47 1.344 0 .984-.641 1.594-.657.609-1.875.609-.782 0-1.36-.266-.594-.265-.89-.781-.297-.531-.297-1.156 0-.797.406-1.297.39-.5 1.125-.64l.125.796q-.484.11-.719.406-.25.282-.25.704 0 .609.438 1 .437.39 1.406.39.969 0 1.422-.375.437-.375.437-.984 0-.469-.297-.797-.296-.328-.906-.406z"/></g></svg>
\ No newline at end of file
diff --git a/docs/flutter-doxygen.css b/docs/flutter-doxygen.css
deleted file mode 100644
index d7ad92a69c61925d9f51172fd7a39409d015418b..0000000000000000000000000000000000000000
--- a/docs/flutter-doxygen.css
+++ /dev/null
@@ -1,1764 +0,0 @@
-/* The standard CSS for doxygen 1.8.15 */
-
-body, table, div, p, dl {
-  font: 400 14px/22px Roboto,sans-serif;
-}
-
-p.reference, p.definition {
-  font: 400 14px/22px Roboto,sans-serif;
-}
-
-/* @group Heading Levels */
-
-h1.groupheader {
-  font-size: 150%;
-}
-
-.title {
-  font: 400 14px/28px Roboto,sans-serif;
-  font-size: 150%;
-  font-weight: bold;
-  margin: 10px 2px;
-}
-
-h2.groupheader {
-  border-bottom: 1px solid #879ECB;
-  color: #354C7B;
-  font-size: 150%;
-  font-weight: normal;
-  margin-top: 1.75em;
-  padding-top: 8px;
-  padding-bottom: 4px;
-  width: 100%;
-}
-
-h3.groupheader {
-  font-size: 100%;
-}
-
-h1, h2, h3, h4, h5, h6 {
-  -webkit-transition: text-shadow 0.5s linear;
-  -moz-transition: text-shadow 0.5s linear;
-  -ms-transition: text-shadow 0.5s linear;
-  -o-transition: text-shadow 0.5s linear;
-  transition: text-shadow 0.5s linear;
-  margin-right: 15px;
-}
-
-h1.glow, h2.glow, h3.glow, h4.glow, h5.glow, h6.glow {
-  text-shadow: 0 0 15px cyan;
-}
-
-dt {
-  font-weight: bold;
-}
-
-div.multicol {
-  -moz-column-gap: 1em;
-  -webkit-column-gap: 1em;
-  -moz-column-count: 3;
-  -webkit-column-count: 3;
-}
-
-p.startli, p.startdd {
-  margin-top: 2px;
-}
-
-p.starttd {
-  margin-top: 0px;
-}
-
-p.endli {
-  margin-bottom: 0px;
-}
-
-p.enddd {
-  margin-bottom: 4px;
-}
-
-p.endtd {
-  margin-bottom: 2px;
-}
-
-p.interli {
-}
-
-p.interdd {
-}
-
-p.intertd {
-}
-
-/* @end */
-
-caption {
-  font-weight: bold;
-}
-
-span.legend {
-        font-size: 70%;
-        text-align: center;
-}
-
-h3.version {
-        font-size: 90%;
-        text-align: center;
-}
-
-div.qindex, div.navtab{
-  background-color: #EBEFF6;
-  border: 1px solid #A3B4D7;
-  text-align: center;
-}
-
-div.qindex, div.navpath {
-  width: 100%;
-  line-height: 140%;
-}
-
-div.navtab {
-  margin-right: 15px;
-}
-
-/* @group Link Styling */
-
-a {
-  color: #3D578C;
-  font-weight: normal;
-  text-decoration: none;
-}
-
-.contents a:visited {
-  color: #4665A2;
-}
-
-a:hover {
-  text-decoration: underline;
-}
-
-a.qindex {
-  font-weight: bold;
-}
-
-a.qindexHL {
-  font-weight: bold;
-  background-color: #9CAFD4;
-  color: #FFFFFF;
-  border: 1px double #869DCA;
-}
-
-.contents a.qindexHL:visited {
-        color: #FFFFFF;
-}
-
-a.el {
-  font-weight: bold;
-}
-
-a.elRef {
-}
-
-a.code, a.code:visited, a.line, a.line:visited {
-  color: #4665A2;
-}
-
-a.codeRef, a.codeRef:visited, a.lineRef, a.lineRef:visited {
-  color: #4665A2;
-}
-
-/* @end */
-
-dl.el {
-  margin-left: -1cm;
-}
-
-ul {
-  overflow: hidden; /*Fixed: list item bullets overlap floating elements*/
-}
-
-#side-nav ul {
-  overflow: visible; /* reset ul rule for scroll bar in GENERATE_TREEVIEW window */
-}
-
-#main-nav ul {
-  overflow: visible; /* reset ul rule for the navigation bar drop down lists */
-}
-
-.fragment {
-  text-align: left;
-  direction: ltr;
-  overflow-x: auto; /*Fixed: fragment lines overlap floating elements*/
-  overflow-y: hidden;
-}
-
-pre.fragment {
-        border: 1px solid #C4CFE5;
-        background-color: #FBFCFD;
-        padding: 4px 6px;
-        margin: 4px 8px 4px 2px;
-        overflow: auto;
-        word-wrap: break-word;
-        font-size:  9pt;
-        line-height: 125%;
-        font-family: monospace, fixed;
-        font-size: 105%;
-}
-
-div.fragment {
-  padding: 0 0 1px 0; /*Fixed: last line underline overlap border*/
-  margin: 4px 8px 4px 2px;
-  background-color: #FBFCFD;
-  border: 1px solid #C4CFE5;
-}
-
-div.line {
-  font-family: monospace, fixed;
-        font-size: 13px;
-  min-height: 13px;
-  line-height: 1.0;
-  text-wrap: unrestricted;
-  white-space: -moz-pre-wrap; /* Moz */
-  white-space: -pre-wrap;     /* Opera 4-6 */
-  white-space: -o-pre-wrap;   /* Opera 7 */
-  white-space: pre-wrap;      /* CSS3  */
-  word-wrap: break-word;      /* IE 5.5+ */
-  text-indent: -53px;
-  padding-left: 53px;
-  padding-bottom: 0px;
-  margin: 0px;
-  -webkit-transition-property: background-color, box-shadow;
-  -webkit-transition-duration: 0.5s;
-  -moz-transition-property: background-color, box-shadow;
-  -moz-transition-duration: 0.5s;
-  -ms-transition-property: background-color, box-shadow;
-  -ms-transition-duration: 0.5s;
-  -o-transition-property: background-color, box-shadow;
-  -o-transition-duration: 0.5s;
-  transition-property: background-color, box-shadow;
-  transition-duration: 0.5s;
-}
-
-div.line:after {
-    content:"\000A";
-    white-space: pre;
-}
-
-div.line.glow {
-  background-color: cyan;
-  box-shadow: 0 0 10px cyan;
-}
-
-
-span.lineno {
-  padding-right: 4px;
-  text-align: right;
-  border-right: 2px solid #0F0;
-  background-color: #E8E8E8;
-        white-space: pre;
-}
-span.lineno a {
-  background-color: #D8D8D8;
-}
-
-span.lineno a:hover {
-  background-color: #C8C8C8;
-}
-
-.lineno {
-  -webkit-touch-callout: none;
-  -webkit-user-select: none;
-  -khtml-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
-div.ah, span.ah {
-  background-color: black;
-  font-weight: bold;
-  color: #FFFFFF;
-  margin-bottom: 3px;
-  margin-top: 3px;
-  padding: 0.2em;
-  border: solid thin #333;
-  border-radius: 0.5em;
-  -webkit-border-radius: .5em;
-  -moz-border-radius: .5em;
-  box-shadow: 2px 2px 3px #999;
-  -webkit-box-shadow: 2px 2px 3px #999;
-  -moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#eee), to(#000),color-stop(0.3, #444));
-  background-image: -moz-linear-gradient(center top, #eee 0%, #444 40%, #000 110%);
-}
-
-div.classindex ul {
-        list-style: none;
-        padding-left: 0;
-}
-
-div.classindex span.ai {
-        display: inline-block;
-}
-
-div.groupHeader {
-  margin-left: 16px;
-  margin-top: 12px;
-  font-weight: bold;
-}
-
-div.groupText {
-  margin-left: 16px;
-  font-style: italic;
-}
-
-body {
-  background-color: white;
-  color: black;
-        margin: 0;
-}
-
-div.contents {
-  margin-top: 10px;
-  margin-left: 12px;
-  margin-right: 8px;
-}
-
-td.indexkey {
-  background-color: #EBEFF6;
-  font-weight: bold;
-  border: 1px solid #C4CFE5;
-  margin: 2px 0px 2px 0;
-  padding: 2px 10px;
-        white-space: nowrap;
-        vertical-align: top;
-}
-
-td.indexvalue {
-  background-color: #EBEFF6;
-  border: 1px solid #C4CFE5;
-  padding: 2px 10px;
-  margin: 2px 0px;
-}
-
-tr.memlist {
-  background-color: #EEF1F7;
-}
-
-p.formulaDsp {
-  text-align: center;
-}
-
-img.formulaDsp {
-
-}
-
-img.formulaInl, img.inline {
-  vertical-align: middle;
-}
-
-div.center {
-  text-align: center;
-        margin-top: 0px;
-        margin-bottom: 0px;
-        padding: 0px;
-}
-
-div.center img {
-  border: 0px;
-}
-
-address.footer {
-  text-align: right;
-  padding-right: 12px;
-}
-
-img.footer {
-  border: 0px;
-  vertical-align: middle;
-}
-
-/* @group Code Colorization */
-
-span.keyword {
-  color: #008000
-}
-
-span.keywordtype {
-  color: #604020
-}
-
-span.keywordflow {
-  color: #e08000
-}
-
-span.comment {
-  color: #800000
-}
-
-span.preprocessor {
-  color: #806020
-}
-
-span.stringliteral {
-  color: #002080
-}
-
-span.charliteral {
-  color: #008080
-}
-
-span.vhdldigit {
-  color: #ff00ff
-}
-
-span.vhdlchar {
-  color: #000000
-}
-
-span.vhdlkeyword {
-  color: #700070
-}
-
-span.vhdllogic {
-  color: #ff0000
-}
-
-blockquote {
-        background-color: #F7F8FB;
-        border-left: 2px solid #9CAFD4;
-        margin: 0 24px 0 4px;
-        padding: 0 12px 0 16px;
-}
-
-blockquote.DocNodeRTL {
-   border-left: 0;
-   border-right: 2px solid #9CAFD4;
-   margin: 0 4px 0 24px;
-   padding: 0 16px 0 12px;
-}
-
-/* @end */
-
-/*
-.search {
-  color: #003399;
-  font-weight: bold;
-}
-
-form.search {
-  margin-bottom: 0px;
-  margin-top: 0px;
-}
-
-input.search {
-  font-size: 75%;
-  color: #000080;
-  font-weight: normal;
-  background-color: #e8eef2;
-}
-*/
-
-td.tiny {
-  font-size: 75%;
-}
-
-.dirtab {
-  padding: 4px;
-  border-collapse: collapse;
-  border: 1px solid #A3B4D7;
-}
-
-th.dirtab {
-  background: #EBEFF6;
-  font-weight: bold;
-}
-
-hr {
-  height: 0px;
-  border: none;
-  border-top: 1px solid #4A6AAA;
-}
-
-hr.footer {
-  height: 1px;
-}
-
-/* @group Member Descriptions */
-
-table.memberdecls {
-  border-spacing: 0px;
-  padding: 0px;
-}
-
-.memberdecls td, .fieldtable tr {
-  -webkit-transition-property: background-color, box-shadow;
-  -webkit-transition-duration: 0.5s;
-  -moz-transition-property: background-color, box-shadow;
-  -moz-transition-duration: 0.5s;
-  -ms-transition-property: background-color, box-shadow;
-  -ms-transition-duration: 0.5s;
-  -o-transition-property: background-color, box-shadow;
-  -o-transition-duration: 0.5s;
-  transition-property: background-color, box-shadow;
-  transition-duration: 0.5s;
-}
-
-.memberdecls td.glow, .fieldtable tr.glow {
-  background-color: cyan;
-  box-shadow: 0 0 15px cyan;
-}
-
-.mdescLeft, .mdescRight,
-.memItemLeft, .memItemRight,
-.memTemplItemLeft, .memTemplItemRight, .memTemplParams {
-  background-color: #F9FAFC;
-  border: none;
-  margin: 4px;
-  padding: 1px 0 0 8px;
-}
-
-.mdescLeft, .mdescRight {
-  padding: 0px 8px 4px 8px;
-  color: #555;
-}
-
-.memSeparator {
-        border-bottom: 1px solid #DEE4F0;
-        line-height: 1px;
-        margin: 0px;
-        padding: 0px;
-}
-
-.memItemLeft, .memTemplItemLeft {
-        white-space: nowrap;
-}
-
-.memItemRight {
-  width: 100%;
-}
-
-.memTemplParams {
-  color: #4665A2;
-        white-space: nowrap;
-  font-size: 80%;
-}
-
-/* @end */
-
-/* @group Member Details */
-
-/* Styles for detailed member documentation */
-
-.memtitle {
-  padding: 8px;
-  border-top: 1px solid #A8B8D9;
-  border-left: 1px solid #A8B8D9;
-  border-right: 1px solid #A8B8D9;
-  border-top-right-radius: 4px;
-  border-top-left-radius: 4px;
-  margin-bottom: -1px;
-  background-image: url('nav_f.png');
-  background-repeat: repeat-x;
-  background-color: #E2E8F2;
-  line-height: 1.25;
-  font-weight: 300;
-  float:left;
-}
-
-.permalink
-{
-        font-size: 65%;
-        display: inline-block;
-        vertical-align: middle;
-}
-
-.memtemplate {
-  font-size: 80%;
-  color: #4665A2;
-  font-weight: normal;
-  margin-left: 9px;
-}
-
-.memnav {
-  background-color: #EBEFF6;
-  border: 1px solid #A3B4D7;
-  text-align: center;
-  margin: 2px;
-  margin-right: 15px;
-  padding: 2px;
-}
-
-.mempage {
-  width: 100%;
-}
-
-.memitem {
-  padding: 0;
-  margin-bottom: 10px;
-  margin-right: 5px;
-        -webkit-transition: box-shadow 0.5s linear;
-        -moz-transition: box-shadow 0.5s linear;
-        -ms-transition: box-shadow 0.5s linear;
-        -o-transition: box-shadow 0.5s linear;
-        transition: box-shadow 0.5s linear;
-        display: table !important;
-        width: 100%;
-}
-
-.memitem.glow {
-         box-shadow: 0 0 15px cyan;
-}
-
-.memname {
-        font-weight: 400;
-        margin-left: 6px;
-}
-
-.memname td {
-  vertical-align: bottom;
-}
-
-.memproto, dl.reflist dt {
-        border-top: 1px solid #A8B8D9;
-        border-left: 1px solid #A8B8D9;
-        border-right: 1px solid #A8B8D9;
-        padding: 6px 0px 6px 0px;
-        color: #253555;
-        font-weight: bold;
-        text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9);
-        background-color: #DFE5F1;
-        /* opera specific markup */
-        box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-        border-top-right-radius: 4px;
-        /* firefox specific markup */
-        -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
-        -moz-border-radius-topright: 4px;
-        /* webkit specific markup */
-        -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-        -webkit-border-top-right-radius: 4px;
-
-}
-
-.overload {
-        font-family: "courier new",courier,monospace;
-  font-size: 65%;
-}
-
-.memdoc, dl.reflist dd {
-        border-bottom: 1px solid #A8B8D9;
-        border-left: 1px solid #A8B8D9;
-        border-right: 1px solid #A8B8D9;
-        padding: 6px 10px 2px 10px;
-        background-color: #FBFCFD;
-        border-top-width: 0;
-        background-image:url('nav_g.png');
-        background-repeat:repeat-x;
-        background-color: #FFFFFF;
-        /* opera specific markup */
-        border-bottom-left-radius: 4px;
-        border-bottom-right-radius: 4px;
-        box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-        /* firefox specific markup */
-        -moz-border-radius-bottomleft: 4px;
-        -moz-border-radius-bottomright: 4px;
-        -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
-        /* webkit specific markup */
-        -webkit-border-bottom-left-radius: 4px;
-        -webkit-border-bottom-right-radius: 4px;
-        -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-}
-
-dl.reflist dt {
-        padding: 5px;
-}
-
-dl.reflist dd {
-        margin: 0px 0px 10px 0px;
-        padding: 5px;
-}
-
-.paramkey {
-  text-align: right;
-}
-
-.paramtype {
-  white-space: nowrap;
-}
-
-.paramname {
-  color: #602020;
-  white-space: nowrap;
-}
-.paramname em {
-  font-style: normal;
-}
-.paramname code {
-        line-height: 14px;
-}
-
-.params, .retval, .exception, .tparams {
-        margin-left: 0px;
-        padding-left: 0px;
-}
-
-.params .paramname, .retval .paramname, .tparams .paramname {
-        font-weight: bold;
-        vertical-align: top;
-}
-
-.params .paramtype, .tparams .paramtype {
-        font-style: italic;
-        vertical-align: top;
-}
-
-.params .paramdir, .tparams .paramdir {
-        font-family: "courier new",courier,monospace;
-        vertical-align: top;
-}
-
-table.mlabels {
-  border-spacing: 0px;
-}
-
-td.mlabels-left {
-  width: 100%;
-  padding: 0px;
-}
-
-td.mlabels-right {
-  vertical-align: bottom;
-  padding: 0px;
-  white-space: nowrap;
-}
-
-span.mlabels {
-        margin-left: 8px;
-}
-
-span.mlabel {
-        background-color: #728DC1;
-        border-top:1px solid #5373B4;
-        border-left:1px solid #5373B4;
-        border-right:1px solid #C4CFE5;
-        border-bottom:1px solid #C4CFE5;
-  text-shadow: none;
-  color: white;
-  margin-right: 4px;
-  padding: 2px 3px;
-  border-radius: 3px;
-  font-size: 7pt;
-  white-space: nowrap;
-  vertical-align: middle;
-}
-
-
-
-/* @end */
-
-/* these are for tree view inside a (index) page */
-
-div.directory {
-        margin: 10px 0px;
-        border-top: 1px solid #9CAFD4;
-        border-bottom: 1px solid #9CAFD4;
-        width: 100%;
-}
-
-.directory table {
-        border-collapse:collapse;
-}
-
-.directory td {
-        margin: 0px;
-        padding: 0px;
-  vertical-align: top;
-}
-
-.directory td.entry {
-        white-space: nowrap;
-        padding-right: 6px;
-  padding-top: 3px;
-}
-
-.directory td.entry a {
-        outline:none;
-}
-
-.directory td.entry a img {
-        border: none;
-}
-
-.directory td.desc {
-        width: 100%;
-        padding-left: 6px;
-  padding-right: 6px;
-  padding-top: 3px;
-  border-left: 1px solid rgba(0,0,0,0.05);
-}
-
-.directory tr.even {
-  padding-left: 6px;
-  background-color: #F7F8FB;
-}
-
-.directory img {
-  vertical-align: -30%;
-}
-
-.directory .levels {
-        white-space: nowrap;
-        width: 100%;
-        text-align: right;
-        font-size: 9pt;
-}
-
-.directory .levels span {
-        cursor: pointer;
-        padding-left: 2px;
-        padding-right: 2px;
-  color: #3D578C;
-}
-
-.arrow {
-    color: #9CAFD4;
-    -webkit-user-select: none;
-    -khtml-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-    cursor: pointer;
-    font-size: 80%;
-    display: inline-block;
-    width: 16px;
-    height: 22px;
-}
-
-.icon {
-    font-family: Arial, Helvetica;
-    font-weight: bold;
-    font-size: 12px;
-    height: 14px;
-    width: 16px;
-    display: inline-block;
-    background-color: #728DC1;
-    color: white;
-    text-align: center;
-    border-radius: 4px;
-    margin-left: 2px;
-    margin-right: 2px;
-}
-
-.icona {
-    width: 24px;
-    height: 22px;
-    display: inline-block;
-}
-
-.iconfopen {
-    width: 24px;
-    height: 18px;
-    margin-bottom: 4px;
-    background-image:url('folderopen.png');
-    background-position: 0px -4px;
-    background-repeat: repeat-y;
-    vertical-align:top;
-    display: inline-block;
-}
-
-.iconfclosed {
-    width: 24px;
-    height: 18px;
-    margin-bottom: 4px;
-    background-image:url('folderclosed.png');
-    background-position: 0px -4px;
-    background-repeat: repeat-y;
-    vertical-align:top;
-    display: inline-block;
-}
-
-.icondoc {
-    width: 24px;
-    height: 18px;
-    margin-bottom: 4px;
-    background-image:url('doc.png');
-    background-position: 0px -4px;
-    background-repeat: repeat-y;
-    vertical-align:top;
-    display: inline-block;
-}
-
-table.directory {
-    font: 400 14px Roboto,sans-serif;
-}
-
-/* @end */
-
-div.dynheader {
-        margin-top: 8px;
-  -webkit-touch-callout: none;
-  -webkit-user-select: none;
-  -khtml-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
-address {
-  font-style: normal;
-  color: #2A3D61;
-}
-
-table.doxtable caption {
-  caption-side: top;
-}
-
-table.doxtable {
-  border-collapse:collapse;
-        margin-top: 4px;
-        margin-bottom: 4px;
-}
-
-table.doxtable td, table.doxtable th {
-  border: 1px solid #2D4068;
-  padding: 3px 7px 2px;
-}
-
-table.doxtable th {
-  background-color: #374F7F;
-  color: #FFFFFF;
-  font-size: 110%;
-  padding-bottom: 4px;
-  padding-top: 5px;
-}
-
-table.fieldtable {
-        /*width: 100%;*/
-        margin-bottom: 10px;
-        border: 1px solid #A8B8D9;
-        border-spacing: 0px;
-        -moz-border-radius: 4px;
-        -webkit-border-radius: 4px;
-        border-radius: 4px;
-        -moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px;
-        -webkit-box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15);
-        box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15);
-}
-
-.fieldtable td, .fieldtable th {
-        padding: 3px 7px 2px;
-}
-
-.fieldtable td.fieldtype, .fieldtable td.fieldname {
-        white-space: nowrap;
-        border-right: 1px solid #A8B8D9;
-        border-bottom: 1px solid #A8B8D9;
-        vertical-align: top;
-}
-
-.fieldtable td.fieldname {
-        padding-top: 3px;
-}
-
-.fieldtable td.fielddoc {
-        border-bottom: 1px solid #A8B8D9;
-        /*width: 100%;*/
-}
-
-.fieldtable td.fielddoc p:first-child {
-        margin-top: 0px;
-}
-
-.fieldtable td.fielddoc p:last-child {
-        margin-bottom: 2px;
-}
-
-.fieldtable tr:last-child td {
-        border-bottom: none;
-}
-
-.fieldtable th {
-        background-image:url('nav_f.png');
-        background-repeat:repeat-x;
-        background-color: #E2E8F2;
-        font-size: 90%;
-        color: #253555;
-        padding-bottom: 4px;
-        padding-top: 5px;
-        text-align:left;
-        font-weight: 400;
-        -moz-border-radius-topleft: 4px;
-        -moz-border-radius-topright: 4px;
-        -webkit-border-top-left-radius: 4px;
-        -webkit-border-top-right-radius: 4px;
-        border-top-left-radius: 4px;
-        border-top-right-radius: 4px;
-        border-bottom: 1px solid #A8B8D9;
-}
-
-
-.tabsearch {
-  top: 0px;
-  left: 10px;
-  height: 36px;
-  background-image: url('tab_b.png');
-  z-index: 101;
-  overflow: hidden;
-  font-size: 13px;
-}
-
-.navpath ul
-{
-  font-size: 11px;
-  background-image:url('tab_b.png');
-  background-repeat:repeat-x;
-  background-position: 0 -5px;
-  height:30px;
-  line-height:30px;
-  color:#8AA0CC;
-  border:solid 1px #C2CDE4;
-  overflow:hidden;
-  margin:0px;
-  padding:0px;
-}
-
-.navpath li
-{
-  list-style-type:none;
-  float:left;
-  padding-left:10px;
-  padding-right:15px;
-  background-image:url('bc_s.png');
-  background-repeat:no-repeat;
-  background-position:right;
-  color:#364D7C;
-}
-
-.navpath li.navelem a
-{
-  height:32px;
-  display:block;
-  text-decoration: none;
-  outline: none;
-  color: #283A5D;
-  font-family: 'Lucida Grande',Geneva,Helvetica,Arial,sans-serif;
-  text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9);
-  text-decoration: none;
-}
-
-.navpath li.navelem a:hover
-{
-  color:#6884BD;
-}
-
-.navpath li.footer
-{
-        list-style-type:none;
-        float:right;
-        padding-left:10px;
-        padding-right:15px;
-        background-image:none;
-        background-repeat:no-repeat;
-        background-position:right;
-        color:#364D7C;
-        font-size: 8pt;
-}
-
-
-div.summary
-{
-  float: right;
-  font-size: 8pt;
-  padding-right: 5px;
-  width: 50%;
-  text-align: right;
-}
-
-div.summary a
-{
-  white-space: nowrap;
-}
-
-table.classindex
-{
-        margin: 10px;
-        white-space: nowrap;
-        margin-left: 3%;
-        margin-right: 3%;
-        width: 94%;
-        border: 0;
-        border-spacing: 0;
-        padding: 0;
-}
-
-div.ingroups
-{
-  font-size: 8pt;
-  width: 50%;
-  text-align: left;
-}
-
-div.ingroups a
-{
-  white-space: nowrap;
-}
-
-div.header
-{
-        background-image:url('nav_h.png');
-        background-repeat:repeat-x;
-  background-color: #F9FAFC;
-  margin:  0px;
-  border-bottom: 1px solid #C4CFE5;
-}
-
-div.headertitle
-{
-  padding: 5px 5px 5px 10px;
-}
-
-.PageDocRTL-title div.headertitle {
-  text-align: right;
-  direction: rtl;
-}
-
-dl {
-        padding: 0 0 0 0;
-}
-
-/* dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated, dl.todo, dl.test, dl.bug, dl.examples */
-dl.section {
-  margin-left: 0px;
-  padding-left: 0px;
-}
-
-dl.section.DocNodeRTL {
-  margin-right: 0px;
-  padding-right: 0px;
-}
-
-dl.note {
-  margin-left: -7px;
-  padding-left: 3px;
-  border-left: 4px solid;
-  border-color: #D0C000;
-}
-
-dl.note.DocNodeRTL {
-  margin-left: 0;
-  padding-left: 0;
-  border-left: 0;
-  margin-right: -7px;
-  padding-right: 3px;
-  border-right: 4px solid;
-  border-color: #D0C000;
-}
-
-dl.warning, dl.attention {
-  margin-left: -7px;
-  padding-left: 3px;
-  border-left: 4px solid;
-  border-color: #FF0000;
-}
-
-dl.warning.DocNodeRTL, dl.attention.DocNodeRTL {
-  margin-left: 0;
-  padding-left: 0;
-  border-left: 0;
-  margin-right: -7px;
-  padding-right: 3px;
-  border-right: 4px solid;
-  border-color: #FF0000;
-}
-
-dl.pre, dl.post, dl.invariant {
-  margin-left: -7px;
-  padding-left: 3px;
-  border-left: 4px solid;
-  border-color: #00D000;
-}
-
-dl.pre.DocNodeRTL, dl.post.DocNodeRTL, dl.invariant.DocNodeRTL {
-  margin-left: 0;
-  padding-left: 0;
-  border-left: 0;
-  margin-right: -7px;
-  padding-right: 3px;
-  border-right: 4px solid;
-  border-color: #00D000;
-}
-
-dl.deprecated {
-  margin-left: -7px;
-  padding-left: 3px;
-  border-left: 4px solid;
-  border-color: #505050;
-}
-
-dl.deprecated.DocNodeRTL {
-  margin-left: 0;
-  padding-left: 0;
-  border-left: 0;
-  margin-right: -7px;
-  padding-right: 3px;
-  border-right: 4px solid;
-  border-color: #505050;
-}
-
-dl.todo {
-  margin-left: -7px;
-  padding-left: 3px;
-  border-left: 4px solid;
-  border-color: #00C0E0;
-}
-
-dl.todo.DocNodeRTL {
-  margin-left: 0;
-  padding-left: 0;
-  border-left: 0;
-  margin-right: -7px;
-  padding-right: 3px;
-  border-right: 4px solid;
-  border-color: #00C0E0;
-}
-
-dl.test {
-  margin-left: -7px;
-  padding-left: 3px;
-  border-left: 4px solid;
-  border-color: #3030E0;
-}
-
-dl.test.DocNodeRTL {
-  margin-left: 0;
-  padding-left: 0;
-  border-left: 0;
-  margin-right: -7px;
-  padding-right: 3px;
-  border-right: 4px solid;
-  border-color: #3030E0;
-}
-
-dl.bug {
-  margin-left: -7px;
-  padding-left: 3px;
-  border-left: 4px solid;
-  border-color: #C08050;
-}
-
-dl.bug.DocNodeRTL {
-  margin-left: 0;
-  padding-left: 0;
-  border-left: 0;
-  margin-right: -7px;
-  padding-right: 3px;
-  border-right: 4px solid;
-  border-color: #C08050;
-}
-
-dl.section dd {
-  margin-bottom: 6px;
-}
-
-
-#projectlogo
-{
-  text-align: center;
-  vertical-align: bottom;
-  border-collapse: separate;
-}
-
-#projectlogo img
-{
-  border: 0px none;
-}
-
-#projectalign
-{
-        vertical-align: middle;
-}
-
-#projectname
-{
-  font: 300% Tahoma, Arial,sans-serif;
-  margin: 0px;
-  padding: 2px 0px;
-}
-
-#projectbrief
-{
-  font: 120% Tahoma, Arial,sans-serif;
-  margin: 0px;
-  padding: 0px;
-}
-
-#projectnumber
-{
-  font: 50% Tahoma, Arial,sans-serif;
-  margin: 0px;
-  padding: 0px;
-}
-
-#titlearea
-{
-  padding: 0px;
-  margin: 0px;
-  width: 100%;
-  border-bottom: 1px solid #5373B4;
-}
-
-.image
-{
-        text-align: center;
-}
-
-.dotgraph
-{
-        text-align: center;
-}
-
-.mscgraph
-{
-        text-align: center;
-}
-
-.plantumlgraph
-{
-        text-align: center;
-}
-
-.diagraph
-{
-        text-align: center;
-}
-
-.caption
-{
-  font-weight: bold;
-}
-
-div.zoom
-{
-  border: 1px solid #90A5CE;
-}
-
-dl.citelist {
-        margin-bottom:50px;
-}
-
-dl.citelist dt {
-        color:#334975;
-        float:left;
-        font-weight:bold;
-        margin-right:10px;
-        padding:5px;
-}
-
-dl.citelist dd {
-        margin:2px 0;
-        padding:5px 0;
-}
-
-div.toc {
-        padding: 14px 25px;
-        background-color: #F4F6FA;
-        border: 1px solid #D8DFEE;
-        border-radius: 7px 7px 7px 7px;
-        float: right;
-        height: auto;
-        margin: 0 8px 10px 10px;
-        width: 200px;
-}
-
-.PageDocRTL-title div.toc {
-  float: left !important;
-  text-align: right;
-}
-
-div.toc li {
-        background: url("bdwn.png") no-repeat scroll 0 5px transparent;
-        font: 10px/1.2 Verdana,DejaVu Sans,Geneva,sans-serif;
-        margin-top: 5px;
-        padding-left: 10px;
-        padding-top: 2px;
-}
-
-.PageDocRTL-title div.toc li {
-  background-position-x: right !important;
-  padding-left: 0 !important;
-  padding-right: 10px;
-}
-
-div.toc h3 {
-        font: bold 12px/1.2 Arial,FreeSans,sans-serif;
-  color: #4665A2;
-        border-bottom: 0 none;
-        margin: 0;
-}
-
-div.toc ul {
-        list-style: none outside none;
-        border: medium none;
-        padding: 0px;
-}
-
-div.toc li.level1 {
-        margin-left: 0px;
-}
-
-div.toc li.level2 {
-        margin-left: 15px;
-}
-
-div.toc li.level3 {
-        margin-left: 30px;
-}
-
-div.toc li.level4 {
-        margin-left: 45px;
-}
-
-.PageDocRTL-title div.toc li.level1 {
-  margin-left: 0 !important;
-  margin-right: 0;
-}
-
-.PageDocRTL-title div.toc li.level2 {
-  margin-left: 0 !important;
-  margin-right: 15px;
-}
-
-.PageDocRTL-title div.toc li.level3 {
-  margin-left: 0 !important;
-  margin-right: 30px;
-}
-
-.PageDocRTL-title div.toc li.level4 {
-  margin-left: 0 !important;
-  margin-right: 45px;
-}
-
-.inherit_header {
-        font-weight: bold;
-        color: gray;
-        cursor: pointer;
-  -webkit-touch-callout: none;
-  -webkit-user-select: none;
-  -khtml-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
-.inherit_header td {
-        padding: 6px 0px 2px 5px;
-}
-
-.inherit {
-        display: none;
-}
-
-tr.heading h2 {
-        margin-top: 12px;
-        margin-bottom: 4px;
-}
-
-/* tooltip related style info */
-
-.ttc {
-        position: absolute;
-        display: none;
-}
-
-#powerTip {
-  cursor: default;
-  white-space: nowrap;
-  background-color: white;
-  border: 1px solid gray;
-  border-radius: 4px 4px 4px 4px;
-  box-shadow: 1px 1px 7px gray;
-  display: none;
-  font-size: smaller;
-  max-width: 80%;
-  opacity: 0.9;
-  padding: 1ex 1em 1em;
-  position: absolute;
-  z-index: 2147483647;
-}
-
-#powerTip div.ttdoc {
-        color: grey;
-  font-style: italic;
-}
-
-#powerTip div.ttname a {
-        font-weight: bold;
-}
-
-#powerTip div.ttname {
-        font-weight: bold;
-}
-
-#powerTip div.ttdeci {
-        color: #006318;
-}
-
-#powerTip div {
-        margin: 0px;
-        padding: 0px;
-        font: 12px/16px Roboto,sans-serif;
-}
-
-#powerTip:before, #powerTip:after {
-  content: "";
-  position: absolute;
-  margin: 0px;
-}
-
-#powerTip.n:after,  #powerTip.n:before,
-#powerTip.s:after,  #powerTip.s:before,
-#powerTip.w:after,  #powerTip.w:before,
-#powerTip.e:after,  #powerTip.e:before,
-#powerTip.ne:after, #powerTip.ne:before,
-#powerTip.se:after, #powerTip.se:before,
-#powerTip.nw:after, #powerTip.nw:before,
-#powerTip.sw:after, #powerTip.sw:before {
-  border: solid transparent;
-  content: " ";
-  height: 0;
-  width: 0;
-  position: absolute;
-}
-
-#powerTip.n:after,  #powerTip.s:after,
-#powerTip.w:after,  #powerTip.e:after,
-#powerTip.nw:after, #powerTip.ne:after,
-#powerTip.sw:after, #powerTip.se:after {
-  border-color: rgba(255, 255, 255, 0);
-}
-
-#powerTip.n:before,  #powerTip.s:before,
-#powerTip.w:before,  #powerTip.e:before,
-#powerTip.nw:before, #powerTip.ne:before,
-#powerTip.sw:before, #powerTip.se:before {
-  border-color: rgba(128, 128, 128, 0);
-}
-
-#powerTip.n:after,  #powerTip.n:before,
-#powerTip.ne:after, #powerTip.ne:before,
-#powerTip.nw:after, #powerTip.nw:before {
-  top: 100%;
-}
-
-#powerTip.n:after, #powerTip.ne:after, #powerTip.nw:after {
-  border-top-color: #FFFFFF;
-  border-width: 10px;
-  margin: 0px -10px;
-}
-#powerTip.n:before {
-  border-top-color: #808080;
-  border-width: 11px;
-  margin: 0px -11px;
-}
-#powerTip.n:after, #powerTip.n:before {
-  left: 50%;
-}
-
-#powerTip.nw:after, #powerTip.nw:before {
-  right: 14px;
-}
-
-#powerTip.ne:after, #powerTip.ne:before {
-  left: 14px;
-}
-
-#powerTip.s:after,  #powerTip.s:before,
-#powerTip.se:after, #powerTip.se:before,
-#powerTip.sw:after, #powerTip.sw:before {
-  bottom: 100%;
-}
-
-#powerTip.s:after, #powerTip.se:after, #powerTip.sw:after {
-  border-bottom-color: #FFFFFF;
-  border-width: 10px;
-  margin: 0px -10px;
-}
-
-#powerTip.s:before, #powerTip.se:before, #powerTip.sw:before {
-  border-bottom-color: #808080;
-  border-width: 11px;
-  margin: 0px -11px;
-}
-
-#powerTip.s:after, #powerTip.s:before {
-  left: 50%;
-}
-
-#powerTip.sw:after, #powerTip.sw:before {
-  right: 14px;
-}
-
-#powerTip.se:after, #powerTip.se:before {
-  left: 14px;
-}
-
-#powerTip.e:after, #powerTip.e:before {
-  left: 100%;
-}
-#powerTip.e:after {
-  border-left-color: #FFFFFF;
-  border-width: 10px;
-  top: 50%;
-  margin-top: -10px;
-}
-#powerTip.e:before {
-  border-left-color: #808080;
-  border-width: 11px;
-  top: 50%;
-  margin-top: -11px;
-}
-
-#powerTip.w:after, #powerTip.w:before {
-  right: 100%;
-}
-#powerTip.w:after {
-  border-right-color: #FFFFFF;
-  border-width: 10px;
-  top: 50%;
-  margin-top: -10px;
-}
-#powerTip.w:before {
-  border-right-color: #808080;
-  border-width: 11px;
-  top: 50%;
-  margin-top: -11px;
-}
-
-@media print
-{
-  #top { display: none; }
-  #side-nav { display: none; }
-  #nav-path { display: none; }
-  body { overflow:visible; }
-  h1, h2, h3, h4, h5, h6 { page-break-after: avoid; }
-  .summary { display: none; }
-  .memitem { page-break-inside: avoid; }
-  #doc-content
-  {
-    margin-left:0 !important;
-    height:auto !important;
-    width:auto !important;
-    overflow:inherit;
-    display:inline;
-  }
-}
-
-/* @group Markdown */
-
-/*
-table.markdownTable {
-  border-collapse:collapse;
-        margin-top: 4px;
-        margin-bottom: 4px;
-}
-
-table.markdownTable td, table.markdownTable th {
-  border: 1px solid #2D4068;
-  padding: 3px 7px 2px;
-}
-
-table.markdownTableHead tr {
-}
-
-table.markdownTableBodyLeft td, table.markdownTable th {
-  border: 1px solid #2D4068;
-  padding: 3px 7px 2px;
-}
-
-th.markdownTableHeadLeft th.markdownTableHeadRight th.markdownTableHeadCenter th.markdownTableHeadNone {
-  background-color: #374F7F;
-  color: #FFFFFF;
-  font-size: 110%;
-  padding-bottom: 4px;
-  padding-top: 5px;
-}
-
-th.markdownTableHeadLeft {
-  text-align: left
-}
-
-th.markdownTableHeadRight {
-  text-align: right
-}
-
-th.markdownTableHeadCenter {
-  text-align: center
-}
-*/
-
-table.markdownTable {
-  border-collapse:collapse;
-        margin-top: 4px;
-        margin-bottom: 4px;
-}
-
-table.markdownTable td, table.markdownTable th {
-  border: 1px solid #2D4068;
-  padding: 3px 7px 2px;
-}
-
-table.markdownTable tr {
-}
-
-th.markdownTableHeadLeft, th.markdownTableHeadRight, th.markdownTableHeadCenter, th.markdownTableHeadNone {
-  background-color: #374F7F;
-  color: #FFFFFF;
-  font-size: 110%;
-  padding-bottom: 4px;
-  padding-top: 5px;
-}
-
-th.markdownTableHeadLeft, td.markdownTableBodyLeft {
-  text-align: left
-}
-
-th.markdownTableHeadRight, td.markdownTableBodyRight {
-  text-align: right
-}
-
-th.markdownTableHeadCenter, td.markdownTableBodyCenter {
-  text-align: center
-}
-
-.DocNodeRTL {
-  text-align: right;
-  direction: rtl;
-}
-
-.DocNodeLTR {
-  text-align: left;
-  direction: ltr;
-}
-
-table.DocNodeRTL {
-   width: auto;
-   margin-right: 0;
-   margin-left: auto;
-}
-
-table.DocNodeLTR {
-   width: auto;
-   margin-right: auto;
-   margin-left: 0;
-}
-
-tt, code, kbd, samp
-{
-  display: inline-block;
-  direction:ltr;
-}
-/* @end */
-
-u {
-  text-decoration: underline;
-}
-
diff --git a/docs/footer.html b/docs/footer.html
deleted file mode 100644
index 0a63dd2e11953112204e575ea5585af2fa6b23e3..0000000000000000000000000000000000000000
--- a/docs/footer.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- HTML footer for doxygen 1.8.15-->
-<!-- start footer part -->
-<!--BEGIN GENERATE_TREEVIEW-->
-<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
-  <ul>
-    $navpath
-    <li class="footer">$generatedby
-    <a href="http://www.doxygen.org/index.html">
-    <img class="footer" src="$relpath^doxygen.png" alt="doxygen"/></a> $doxygenversion </li>
-  </ul>
-</div>
-<!--END GENERATE_TREEVIEW-->
-<!--BEGIN !GENERATE_TREEVIEW-->
-<hr class="footer"/><address class="footer"><small>
-$generatedby &#160;<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="$relpath^doxygen.png" alt="doxygen"/>
-</a> $doxygenversion
-</small></address>
-<!--END !GENERATE_TREEVIEW-->
-</body>
-</html>
diff --git a/docs/header.html b/docs/header.html
deleted file mode 100644
index 9f98f4a6157dd773bb17d2d47f687c6b472a68be..0000000000000000000000000000000000000000
--- a/docs/header.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!-- HTML header for doxygen 1.8.15-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen $doxygenversion"/>
-<meta name="viewport" content="width=device-width, initial-scale=1"/>
-<!--BEGIN PROJECT_NAME--><title>$projectname: $title</title><!--END PROJECT_NAME-->
-<!--BEGIN !PROJECT_NAME--><title>$title</title><!--END !PROJECT_NAME-->
-<link href="$relpath^tabs.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="$relpath^jquery.js"></script>
-<script type="text/javascript" src="$relpath^dynsections.js"></script>
-$treeview
-$search
-$mathjax
-<link href="$relpath^$stylesheet" rel="stylesheet" type="text/css" />
-$extrastylesheet
-</head>
-<body>
-<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
-
-<!--BEGIN TITLEAREA-->
-<div id="titlearea">
-<table cellspacing="0" cellpadding="0">
- <tbody>
- <tr style="height: 56px;">
-  <!--BEGIN PROJECT_LOGO-->
-  <td id="projectlogo"><img alt="Logo" src="$relpath^$projectlogo"/></td>
-  <!--END PROJECT_LOGO-->
-  <!--BEGIN PROJECT_NAME-->
-  <td id="projectalign" style="padding-left: 0.5em;">
-   <div id="projectname">$projectname
-   <!--BEGIN PROJECT_NUMBER-->&#160;<span id="projectnumber">$projectnumber</span><!--END PROJECT_NUMBER-->
-   </div>
-   <!--BEGIN PROJECT_BRIEF--><div id="projectbrief">$projectbrief</div><!--END PROJECT_BRIEF-->
-  </td>
-  <!--END PROJECT_NAME-->
-  <!--BEGIN !PROJECT_NAME-->
-   <!--BEGIN PROJECT_BRIEF-->
-    <td style="padding-left: 0.5em;">
-    <div id="projectbrief">$projectbrief</div>
-    </td>
-   <!--END PROJECT_BRIEF-->
-  <!--END !PROJECT_NAME-->
-  <!--BEGIN DISABLE_INDEX-->
-   <!--BEGIN SEARCHENGINE-->
-   <td>$searchbox</td>
-   <!--END SEARCHENGINE-->
-  <!--END DISABLE_INDEX-->
- </tr>
- </tbody>
-</table>
-</div>
-<!--END TITLEAREA-->
-<!-- end header part -->
diff --git a/examples/glfw/BUILD.gn b/examples/glfw/BUILD.gn
index 2ff312c0ee8b51f651b7f4242cc431c87eb18235..178bac61e4e05187d824865e5347ce26ebbdecc0 100644
--- a/examples/glfw/BUILD.gn
+++ b/examples/glfw/BUILD.gn
@@ -12,7 +12,7 @@ if (build_embedder_examples) {
 
     deps = [
       "//flutter/shell/platform/embedder:embedder",
-      "//third_party/glfw",
+      "//flutter/third_party/glfw",
     ]
   }
 }
diff --git a/examples/glfw/CMakeLists.txt b/examples/glfw/CMakeLists.txt
index 53bca275dc673c7e7451dfb90d3221c17cbc04aa..336e5943cf11266ea3d9ca35b20c62f67ddd7f3e 100644
--- a/examples/glfw/CMakeLists.txt
+++ b/examples/glfw/CMakeLists.txt
@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 3.15)
 project(FlutterEmbedderGLFW)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" )
+set(FLUTTER_ENGINE_VARIANT "host_debug_unopt" CACHE STRING "")
 
 add_executable(flutter_glfw FlutterEmbedderGLFW.cc)
 
@@ -11,9 +12,9 @@ option(GLFW_BUILD_EXAMPLES "" OFF)
 option(GLFW_BUILD_TESTS "" OFF)
 option(GLFW_BUILD_DOCS "" OFF)
 option(GLFW_INSTALL "" OFF)
-add_subdirectory(${CMAKE_SOURCE_DIR}/../../../third_party/glfw glfw)
+add_subdirectory(${CMAKE_SOURCE_DIR}/../../third_party/glfw glfw)
 target_link_libraries(flutter_glfw glfw)
-include_directories(${CMAKE_SOURCE_DIR}/../../../third_party/glfw/include)
+include_directories(${CMAKE_SOURCE_DIR}/../../third_party/glfw/include)
 
 ############################################################
 # Flutter Engine
@@ -21,7 +22,7 @@ include_directories(${CMAKE_SOURCE_DIR}/../../../third_party/glfw/include)
 # This is assuming you've built a local version of the Flutter Engine.  If you
 # downloaded yours is from the internet you'll have to change this.
 include_directories(${CMAKE_SOURCE_DIR}/../../shell/platform/embedder)
-find_library(FLUTTER_LIB flutter_engine PATHS ${CMAKE_SOURCE_DIR}/../../../out/host_debug_unopt)
+find_library(FLUTTER_LIB flutter_engine PATHS ${CMAKE_SOURCE_DIR}/../../../out/${FLUTTER_ENGINE_VARIANT})
 target_link_libraries(flutter_glfw ${FLUTTER_LIB})
 
 # Copy the flutter library here since the shared library
diff --git a/examples/glfw/FlutterEmbedderGLFW.cc b/examples/glfw/FlutterEmbedderGLFW.cc
index 8b17b25958fc11b85c53eda01777019ce57de962..a5e5e636438090fa63d98025f73ff10f8da57e4a 100644
--- a/examples/glfw/FlutterEmbedderGLFW.cc
+++ b/examples/glfw/FlutterEmbedderGLFW.cc
@@ -13,6 +13,7 @@
 static double g_pixelRatio = 1.0;
 static const size_t kInitialWindowWidth = 800;
 static const size_t kInitialWindowHeight = 600;
+static constexpr FlutterViewId kImplicitViewId = 0;
 
 static_assert(FLUTTER_ENGINE_VERSION == 1,
               "This Flutter Embedder was authored against the stable Flutter "
@@ -33,6 +34,9 @@ void GLFWcursorPositionCallbackAtPhase(GLFWwindow* window,
       std::chrono::duration_cast<std::chrono::microseconds>(
           std::chrono::high_resolution_clock::now().time_since_epoch())
           .count();
+  // This example only supports a single window, therefore we assume the pointer
+  // event occurred in the only view, the implicit view.
+  event.view_id = kImplicitViewId;
   FlutterEngineSendPointerEvent(
       reinterpret_cast<FlutterEngine>(glfwGetWindowUserPointer(window)), &event,
       1);
@@ -77,6 +81,9 @@ void GLFWwindowSizeCallback(GLFWwindow* window, int width, int height) {
   event.width = width * g_pixelRatio;
   event.height = height * g_pixelRatio;
   event.pixel_ratio = g_pixelRatio;
+  // This example only supports a single window, therefore we assume the event
+  // occurred in the only view, the implicit view.
+  event.view_id = kImplicitViewId;
   FlutterEngineSendWindowMetricsEvent(
       reinterpret_cast<FlutterEngine>(glfwGetWindowUserPointer(window)),
       &event);
diff --git a/examples/glfw/run.sh b/examples/glfw/run.sh
index 70a4f41fafc0d0642b7a5a14afcf0be48819292e..5fa0d0f8ea6620a60d88db087c1dba97c2fff1a0 100755
--- a/examples/glfw/run.sh
+++ b/examples/glfw/run.sh
@@ -1,6 +1,12 @@
 #!/bin/bash
 set -e # Exit if any program returns an error.
 
+if uname -m | grep "arm64"; then
+    variant="host_debug_unopt_arm64"
+else
+    variant="host_debug_unopt"
+fi
+
 #################################################################
 # Make the host C++ project.
 #################################################################
@@ -8,7 +14,7 @@ if [ ! -d debug ]; then
     mkdir debug
 fi
 cd debug
-cmake -DCMAKE_BUILD_TYPE=Debug ..
+cmake -DCMAKE_BUILD_TYPE=Debug -DFLUTTER_ENGINE_VARIANT=$variant ..
 make
 
 #################################################################
@@ -17,11 +23,13 @@ make
 if [ ! -d myapp ]; then
     flutter create myapp
 fi
+
 cd myapp
 cp ../../main.dart lib/main.dart
 flutter build bundle \
         --local-engine-src-path ../../../../../ \
-        --local-engine=host_debug_unopt
+        --local-engine=$variant \
+        --local-engine-host=$variant
 cd -
 
 #################################################################
diff --git a/examples/glfw_drm/BUILD.gn b/examples/glfw_drm/BUILD.gn
index 784e5654e5e69abb6923d82564ff2d967dc36fc0..afa204c76c70979dae1ddf35c039227fbe13ac3b 100644
--- a/examples/glfw_drm/BUILD.gn
+++ b/examples/glfw_drm/BUILD.gn
@@ -12,7 +12,7 @@ if (build_embedder_examples) {
 
     deps = [
       "//flutter/shell/platform/embedder:embedder",
-      "//third_party/glfw",
+      "//flutter/third_party/glfw",
     ]
 
     libs = [ "EGL" ]
diff --git a/examples/glfw_drm/CMakeLists.txt b/examples/glfw_drm/CMakeLists.txt
index 2563bd8bee05a2dae6d4306e7392c8c9b3075f68..6ec0cbd2aba4d06b3227b97818aa01e791666cc2 100644
--- a/examples/glfw_drm/CMakeLists.txt
+++ b/examples/glfw_drm/CMakeLists.txt
@@ -13,9 +13,9 @@ option(GLFW_BUILD_DOCS "" OFF)
 option(GLFW_INSTALL "" OFF)
 find_package(OpenGL REQUIRED COMPONENTS EGL)
 include_directories(${OPENGL_INCLUDE_DIRS})
-add_subdirectory(${CMAKE_SOURCE_DIR}/../../../third_party/glfw glfw)
+add_subdirectory(${CMAKE_SOURCE_DIR}/../../third_party/glfw glfw)
 target_link_libraries(flutter_glfw glfw OpenGL::EGL)
-include_directories(${CMAKE_SOURCE_DIR}/../../../third_party/glfw/include)
+include_directories(${CMAKE_SOURCE_DIR}/../../third_party/glfw/include)
 
 ############################################################
 # Flutter Engine
diff --git a/examples/glfw_drm/FlutterEmbedderGLFW.cc b/examples/glfw_drm/FlutterEmbedderGLFW.cc
index d75811092f9275d2e698e86302d4d85304973ef2..79caba2dc2fefc6a74ad49a12c1709cafb2c5148 100644
--- a/examples/glfw_drm/FlutterEmbedderGLFW.cc
+++ b/examples/glfw_drm/FlutterEmbedderGLFW.cc
@@ -26,6 +26,7 @@ static const size_t kInitialWindowHeight = 600;
 // Maximum damage history - for triple buffering we need to store damage for
 // last two frames; Some Android devices (Pixel 4) use quad buffering.
 static const int kMaxHistorySize = 10;
+static constexpr FlutterViewId kImplicitViewId = 0;
 
 // Keeps track of the most recent frame damages so that existing damage can
 // be easily computed.
@@ -56,6 +57,9 @@ void GLFWcursorPositionCallbackAtPhase(GLFWwindow* window,
       std::chrono::duration_cast<std::chrono::microseconds>(
           std::chrono::high_resolution_clock::now().time_since_epoch())
           .count();
+  // This example only supports a single window, therefore we assume the pointer
+  // event occurred in the only view, the implicit view.
+  event.view_id = kImplicitViewId;
   FlutterEngineSendPointerEvent(
       reinterpret_cast<FlutterEngine>(glfwGetWindowUserPointer(window)), &event,
       1);
@@ -100,6 +104,9 @@ void GLFWwindowSizeCallback(GLFWwindow* window, int width, int height) {
   event.width = width * g_pixelRatio;
   event.height = height * g_pixelRatio;
   event.pixel_ratio = g_pixelRatio;
+  // This example only supports a single window, therefore we assume the event
+  // occurred in the only view, the implicit view.
+  event.view_id = kImplicitViewId;
   FlutterEngineSendWindowMetricsEvent(
       reinterpret_cast<FlutterEngine>(glfwGetWindowUserPointer(window)),
       &event);
@@ -153,7 +160,10 @@ bool RunFlutter(GLFWwindow* window,
   config.open_gl.present_with_info =
       [](void* userdata, const FlutterPresentInfo* info) -> bool {
     // Free the existing damage that was allocated to this frame.
-    free(existing_damage_map_[info->fbo_id]);
+    if (existing_damage_map_[info->fbo_id] != nullptr) {
+      free(existing_damage_map_[info->fbo_id]);
+      existing_damage_map_[info->fbo_id] = nullptr;
+    }
 
     // Get list of extensions.
     const char* extensions = eglQueryString(display_, EGL_EXTENSIONS);
diff --git a/examples/glfw_drm/run.sh b/examples/glfw_drm/run.sh
index 0ae097e4cc9905827028d5f50783fc128b67cb3a..5b4d9d4e4657fe464931baca6018e6f778a5d8e6 100755
--- a/examples/glfw_drm/run.sh
+++ b/examples/glfw_drm/run.sh
@@ -24,7 +24,8 @@ cd myapp
 cp ../../main.dart lib/main.dart
 flutter build bundle \
         --local-engine-src-path ../../../../../ \
-        --local-engine=host_debug_unopt
+        --local-engine=host_debug_unopt \
+        --local-engine-host=host_debug_unopt
 cd -
 
 #################################################################
diff --git a/examples/vulkan_glfw/BUILD.gn b/examples/vulkan_glfw/BUILD.gn
index 7930eff4bebe15a15ecd5a6cb73298ff40021075..92ce821ffe815cb22564581351fd3048d4878b6f 100644
--- a/examples/vulkan_glfw/BUILD.gn
+++ b/examples/vulkan_glfw/BUILD.gn
@@ -5,13 +5,14 @@
 executable("vulkan_glfw") {
   output_name = "embedder_example_vulkan"
 
-  sources = [ "src/main.cc" ]
+  configs -= [ "//build/config/compiler:chromium_code" ]
+  configs += [ "//build/config/compiler:no_chromium_code" ]
 
-  configs += [ "//flutter/vulkan:vulkan_config" ]
+  sources = [ "src/main.cc" ]
 
   deps = [
     "//flutter/shell/platform/embedder:embedder",
-    "//third_party/glfw",
-    "//third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
+    "//flutter/third_party/glfw",
+    "//flutter/third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
   ]
 }
diff --git a/examples/vulkan_glfw/CMakeLists.txt b/examples/vulkan_glfw/CMakeLists.txt
index 6b6a1ed1b72eb7aafb8dacbe1eb1940f8dbea0c5..30f0859799ef12a53d87cb9ece751660a7622e5b 100644
--- a/examples/vulkan_glfw/CMakeLists.txt
+++ b/examples/vulkan_glfw/CMakeLists.txt
@@ -30,7 +30,7 @@ target_link_libraries(${EXE_NAME} PRIVATE Vulkan::Vulkan)
 
 # Dependency: GLFW
 
-set(GLFW_REPOSITORY ${CMAKE_SOURCE_DIR}/../../../third_party/glfw)
+set(GLFW_REPOSITORY ${CMAKE_SOURCE_DIR}/../../third_party/glfw)
 
 set(BUILD_SHARED_LIBS OFF)
 set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE)
@@ -40,7 +40,7 @@ set(GLFW_VULKAN_STATIC OFF CACHE BOOL "" FORCE)
 add_subdirectory(${GLFW_REPOSITORY} build_glfw)
 
 target_link_libraries(${EXE_NAME} PRIVATE glfw)
-target_include_directories(${EXE_NAME} PRIVATE $(GLFW_REPOSITORY)/include)
+target_include_directories(${EXE_NAME} PRIVATE ${GLFW_REPOSITORY}/include)
 
 
 # Dependency: Flutter Engine
diff --git a/examples/vulkan_glfw/run.sh b/examples/vulkan_glfw/run.sh
index 7438dc34addc54e3ba7f6e7e7cc9c2ce278b4449..c2841dd88c4ce953d0daa54d9e51be08c5bbd43d 100755
--- a/examples/vulkan_glfw/run.sh
+++ b/examples/vulkan_glfw/run.sh
@@ -18,7 +18,8 @@ pushd myapp > /dev/null
 #cp ../../main.dart lib/main.dart
 flutter build bundle \
         --local-engine-src-path ../../../../../ \
-        --local-engine=host_debug_unopt
+        --local-engine=host_debug_unopt \
+        --local-engine-host=host_debug_unopt
 popd > /dev/null
 
 #################################################################
diff --git a/examples/vulkan_glfw/src/main.cc b/examples/vulkan_glfw/src/main.cc
index e97a874afdd95bd9d3511db011552665f879d15e..ebd55dec02e9d39b932b900f7a1acba491654c33 100644
--- a/examples/vulkan_glfw/src/main.cc
+++ b/examples/vulkan_glfw/src/main.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <chrono>
 #include <cstdlib>
 #include <iostream>
 #include <optional>
@@ -31,6 +32,7 @@ static const size_t kInitialWindowHeight = 600;
 // `VK_PRESENT_MODE_MAILBOX_KHR` for continual swap without horizontal tearing,
 // or `VK_PRESENT_MODE_IMMEDIATE_KHR` for no vsync.
 static const VkPresentModeKHR kPreferredPresentMode = VK_PRESENT_MODE_FIFO_KHR;
+static constexpr FlutterViewId kImplicitViewId = 0;
 
 static_assert(FLUTTER_ENGINE_VERSION == 1,
               "This Flutter Embedder was authored against the stable Flutter "
@@ -85,6 +87,9 @@ void GLFWcursorPositionCallbackAtPhase(GLFWwindow* window,
       std::chrono::duration_cast<std::chrono::microseconds>(
           std::chrono::high_resolution_clock::now().time_since_epoch())
           .count();
+  // This example only supports a single window, therefore we assume the event
+  // occurred in the only view, the implicit view.
+  event.view_id = kImplicitViewId;
   FlutterEngineSendPointerEvent(g_state.engine, &event, 1);
 }
 
@@ -129,6 +134,9 @@ void GLFWframebufferSizeCallback(GLFWwindow* window, int width, int height) {
   event.width = width;
   event.height = height;
   event.pixel_ratio = g_pixelRatio;
+  // This example only supports a single window, therefore we assume the event
+  // occurred in the only view, the implicit view.
+  event.view_id = kImplicitViewId;
   FlutterEngineSendWindowMetricsEvent(g_state.engine, &event);
 }
 
@@ -511,7 +519,7 @@ int main(int argc, char** argv) {
   }
 
   // Load instance procs.
-  VULKAN_HPP_DEFAULT_DISPATCHER.init(g_state.instance);
+  VULKAN_HPP_DEFAULT_DISPATCHER.init(vk::Instance(g_state.instance));
 
   /// --------------------------------------------------------------------------
   /// Create the window surface.
diff --git a/flow/BUILD.gn b/flow/BUILD.gn
index 09ed594157cab57c9cb299499a6ae2b84ae0ec52..4a1aade9b5f75171f5193ba35de09adab250b156 100644
--- a/flow/BUILD.gn
+++ b/flow/BUILD.gn
@@ -2,10 +2,15 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/fuchsia/sdk.gni")
 import("//flutter/common/config.gni")
+import("//flutter/impeller/tools/impeller.gni")
+import("//flutter/shell/config.gni")
 import("//flutter/testing/testing.gni")
 
+if (is_fuchsia) {
+  import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
+}
+
 source_set("flow") {
   sources = [
     "compositor_context.cc",
@@ -16,8 +21,6 @@ source_set("flow") {
     "embedded_views.h",
     "frame_timings.cc",
     "frame_timings.h",
-    "instrumentation.cc",
-    "instrumentation.h",
     "layer_snapshot_store.cc",
     "layer_snapshot_store.h",
     "layers/backdrop_filter_layer.cc",
@@ -55,8 +58,6 @@ source_set("flow") {
     "layers/opacity_layer.h",
     "layers/performance_overlay_layer.cc",
     "layers/performance_overlay_layer.h",
-    "layers/physical_shape_layer.cc",
-    "layers/physical_shape_layer.h",
     "layers/platform_view_layer.cc",
     "layers/platform_view_layer.h",
     "layers/shader_mask_layer.cc",
@@ -76,33 +77,43 @@ source_set("flow") {
     "raster_cache_key.h",
     "raster_cache_util.cc",
     "raster_cache_util.h",
-    "rtree.cc",
-    "rtree.h",
     "skia_gpu_object.h",
+    "stopwatch.cc",
+    "stopwatch.h",
+    "stopwatch_dl.cc",
+    "stopwatch_dl.h",
+    "stopwatch_sk.cc",
+    "stopwatch_sk.h",
     "surface.cc",
     "surface.h",
     "surface_frame.cc",
     "surface_frame.h",
   ]
 
-  public_configs = [
-    "//flutter:config",
-    "//flutter/vulkan:vulkan_config",
-  ]
+  public_configs = [ "//flutter:config" ]
 
-  deps = [
+  public_deps = [
     "//flutter/common",
     "//flutter/common/graphics",
+    "//flutter/display_list",
     "//flutter/fml",
-    "//third_party/skia",
+    "//flutter/third_party/txt",
   ]
 
-  public_deps = [ "//flutter/display_list" ]
+  deps = [ "//flutter/skia" ]
+
+  if (impeller_supports_rendering) {
+    deps += [
+      "//flutter/impeller",
+      "//flutter/impeller/typographer/backends/skia:typographer_skia_backend",
+    ]
+  }
 }
 
 if (enable_unittests) {
   test_fixtures("flow_fixtures") {
-    fixtures = []
+    fixtures =
+        [ "//flutter/third_party/txt/third_party/fonts/Roboto-Regular.ttf" ]
   }
 
   source_set("flow_testing") {
@@ -122,13 +133,11 @@ if (enable_unittests) {
       "testing/mock_raster_cache.h",
       "testing/mock_texture.cc",
       "testing/mock_texture.h",
-      "testing/skia_gpu_object_layer_test.cc",
-      "testing/skia_gpu_object_layer_test.h",
     ]
 
     public_deps = [
       "//flutter/testing:skia",
-      "//third_party/googletest:gtest",
+      "//flutter/third_party/googletest:gtest",
     ]
 
     deps = [
@@ -148,7 +157,6 @@ if (enable_unittests) {
       "flow_test_utils.h",
       "frame_timings_recorder_unittests.cc",
       "gl_context_switch_unittests.cc",
-      "instrumentation_unittests.cc",
       "layers/backdrop_filter_layer_unittests.cc",
       "layers/checkerboard_layertree_unittests.cc",
       "layers/clip_path_layer_unittests.cc",
@@ -163,15 +171,15 @@ if (enable_unittests) {
       "layers/offscreen_surface_unittests.cc",
       "layers/opacity_layer_unittests.cc",
       "layers/performance_overlay_layer_unittests.cc",
-      "layers/physical_shape_layer_unittests.cc",
       "layers/platform_view_layer_unittests.cc",
       "layers/shader_mask_layer_unittests.cc",
       "layers/texture_layer_unittests.cc",
       "layers/transform_layer_unittests.cc",
       "mutators_stack_unittests.cc",
       "raster_cache_unittests.cc",
-      "rtree_unittests.cc",
       "skia_gpu_object_unittests.cc",
+      "stopwatch_dl_unittests.cc",
+      "stopwatch_unittests.cc",
       "surface_frame_unittests.cc",
       "testing/mock_layer_unittests.cc",
       "testing/mock_texture_unittests.cc",
@@ -182,14 +190,15 @@ if (enable_unittests) {
       ":flow",
       ":flow_fixtures",
       ":flow_testing",
+      "$dart_src/runtime:libdart_jit",  # for tracing
       "//flutter/common/graphics",
-      "//flutter/display_list:display_list_testing",
+      "//flutter/display_list/testing:display_list_testing",
       "//flutter/fml",
+      "//flutter/shell/common:base64",
+      "//flutter/skia",
       "//flutter/testing:skia",
       "//flutter/testing:testing_lib",
-      "//third_party/dart/runtime:libdart_jit",  # for tracing
-      "//third_party/googletest:gtest",
-      "//third_party/skia",
+      "//flutter/third_party/googletest:gtest",
     ]
 
     if (!defined(defines)) {
diff --git a/flow/compositor_context.cc b/flow/compositor_context.cc
index 90dcc6ac4228230cac1b2ef97ac464592dfcb5dd..2c7593c1625e8e9f234554b8c2ecd5fc8faa3bda 100644
--- a/flow/compositor_context.cc
+++ b/flow/compositor_context.cc
@@ -13,15 +13,14 @@ namespace flutter {
 
 std::optional<SkRect> FrameDamage::ComputeClipRect(
     flutter::LayerTree& layer_tree,
-    bool has_raster_cache) {
+    bool has_raster_cache,
+    bool impeller_enabled) {
   if (layer_tree.root_layer()) {
     PaintRegionMap empty_paint_region_map;
-    DiffContext context(layer_tree.frame_size(),
-                        layer_tree.device_pixel_ratio(),
-                        layer_tree.paint_region_map(),
+    DiffContext context(layer_tree.frame_size(), layer_tree.paint_region_map(),
                         prev_layer_tree_ ? prev_layer_tree_->paint_region_map()
                                          : empty_paint_region_map,
-                        has_raster_cache);
+                        has_raster_cache, impeller_enabled);
     context.PushCullRect(SkRect::MakeIWH(layer_tree.frame_size().width(),
                                          layer_tree.frame_size().height()));
     {
@@ -43,9 +42,8 @@ std::optional<SkRect> FrameDamage::ComputeClipRect(
         context.ComputeDamage(additional_damage_, horizontal_clip_alignment_,
                               vertical_clip_alignment_);
     return SkRect::Make(damage_->buffer_damage);
-  } else {
-    return std::nullopt;
   }
+  return std::nullopt;
 }
 
 CompositorContext::CompositorContext()
@@ -76,36 +74,33 @@ void CompositorContext::EndFrame(ScopedFrame& frame,
 
 std::unique_ptr<CompositorContext::ScopedFrame> CompositorContext::AcquireFrame(
     GrDirectContext* gr_context,
-    SkCanvas* canvas,
+    DlCanvas* canvas,
     ExternalViewEmbedder* view_embedder,
     const SkMatrix& root_surface_transformation,
     bool instrumentation_enabled,
     bool surface_supports_readback,
     fml::RefPtr<fml::RasterThreadMerger>
         raster_thread_merger,  // NOLINT(performance-unnecessary-value-param)
-    DisplayListBuilder* display_list_builder,
     impeller::AiksContext* aiks_context) {
   return std::make_unique<ScopedFrame>(
       *this, gr_context, canvas, view_embedder, root_surface_transformation,
       instrumentation_enabled, surface_supports_readback, raster_thread_merger,
-      display_list_builder, aiks_context);
+      aiks_context);
 }
 
 CompositorContext::ScopedFrame::ScopedFrame(
     CompositorContext& context,
     GrDirectContext* gr_context,
-    SkCanvas* canvas,
+    DlCanvas* canvas,
     ExternalViewEmbedder* view_embedder,
     const SkMatrix& root_surface_transformation,
     bool instrumentation_enabled,
     bool surface_supports_readback,
     fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger,
-    DisplayListBuilder* display_list_builder,
     impeller::AiksContext* aiks_context)
     : context_(context),
       gr_context_(gr_context),
       canvas_(canvas),
-      display_list_builder_(display_list_builder),
       aiks_context_(aiks_context),
       view_embedder_(view_embedder),
       root_surface_transformation_(root_surface_transformation),
@@ -125,10 +120,17 @@ RasterStatus CompositorContext::ScopedFrame::Raster(
     FrameDamage* frame_damage) {
   TRACE_EVENT0("flutter", "CompositorContext::ScopedFrame::Raster");
 
-  std::optional<SkRect> clip_rect =
-      frame_damage
-          ? frame_damage->ComputeClipRect(layer_tree, !ignore_raster_cache)
-          : std::nullopt;
+  std::optional<SkRect> clip_rect;
+  if (frame_damage) {
+    clip_rect = frame_damage->ComputeClipRect(layer_tree, !ignore_raster_cache,
+                                              !gr_context_);
+
+    if (aiks_context_ &&
+        !ShouldPerformPartialRepaint(clip_rect, layer_tree.frame_size())) {
+      clip_rect = std::nullopt;
+      frame_damage->Reset();
+    }
+  }
 
   bool root_needs_readback = layer_tree.Preroll(
       *this, ignore_raster_cache, clip_rect ? *clip_rect : kGiantRect);
@@ -146,29 +148,78 @@ RasterStatus CompositorContext::ScopedFrame::Raster(
     return RasterStatus::kSkipAndRetry;
   }
 
-  SkAutoCanvasRestore restore(canvas(), clip_rect.has_value());
+  if (aiks_context_) {
+    PaintLayerTreeImpeller(layer_tree, clip_rect, ignore_raster_cache);
+  } else {
+    PaintLayerTreeSkia(layer_tree, clip_rect, needs_save_layer,
+                       ignore_raster_cache);
+  }
+  return RasterStatus::kSuccess;
+}
+
+void CompositorContext::ScopedFrame::PaintLayerTreeSkia(
+    flutter::LayerTree& layer_tree,
+    std::optional<SkRect> clip_rect,
+    bool needs_save_layer,
+    bool ignore_raster_cache) {
+  DlAutoCanvasRestore restore(canvas(), clip_rect.has_value());
 
-  // Clearing canvas after preroll reduces one render target switch when preroll
-  // paints some raster cache.
   if (canvas()) {
     if (clip_rect) {
-      canvas()->clipRect(*clip_rect);
+      canvas()->ClipRect(*clip_rect);
     }
 
     if (needs_save_layer) {
       TRACE_EVENT0("flutter", "Canvas::saveLayer");
       SkRect bounds = SkRect::Make(layer_tree.frame_size());
-      SkPaint paint;
-      paint.setBlendMode(SkBlendMode::kSrc);
-      canvas()->saveLayer(&bounds, &paint);
+      DlPaint paint;
+      paint.setBlendMode(DlBlendMode::kSrc);
+      canvas()->SaveLayer(&bounds, &paint);
     }
-    canvas()->clear(SK_ColorTRANSPARENT);
+    canvas()->Clear(DlColor::kTransparent());
   }
+
+  // The canvas()->Restore() is taken care of by the DlAutoCanvasRestore
   layer_tree.Paint(*this, ignore_raster_cache);
-  if (canvas() && needs_save_layer) {
-    canvas()->restore();
+}
+
+void CompositorContext::ScopedFrame::PaintLayerTreeImpeller(
+    flutter::LayerTree& layer_tree,
+    std::optional<SkRect> clip_rect,
+    bool ignore_raster_cache) {
+  if (canvas() && clip_rect) {
+    canvas()->Translate(-clip_rect->x(), -clip_rect->y());
   }
-  return RasterStatus::kSuccess;
+
+  layer_tree.Paint(*this, ignore_raster_cache);
+}
+
+/// @brief The max ratio of pixel width or height to size that is dirty which
+///        results in a partial repaint.
+///
+///        Performing a partial repaint has a small overhead - Impeller needs to
+///        allocate a fairly large resolve texture for the root pass instead of
+///        using the drawable texture, and a final blit must be performed. At a
+///        minimum, if the damage rect is the entire buffer, we must not perform
+///        a partial repaint. Beyond that, we could only experimentally
+///        determine what this value should be. From looking at the Flutter
+///        Gallery, we noticed that there are occassionally small partial
+///        repaints which shave off trivial numbers of pixels.
+constexpr float kImpellerRepaintRatio = 0.7f;
+
+bool CompositorContext::ShouldPerformPartialRepaint(
+    std::optional<SkRect> damage_rect,
+    SkISize layer_tree_size) {
+  if (!damage_rect.has_value()) {
+    return false;
+  }
+  if (damage_rect->width() >= layer_tree_size.width() &&
+      damage_rect->height() >= layer_tree_size.height()) {
+    return false;
+  }
+  auto rx = damage_rect->width() / layer_tree_size.width();
+  auto ry = damage_rect->height() / layer_tree_size.height();
+  return rx <= kImpellerRepaintRatio || ry <= kImpellerRepaintRatio;
 }
 
 void CompositorContext::OnGrContextCreated() {
diff --git a/flow/compositor_context.h b/flow/compositor_context.h
index 3e9552bd94f7f3e814668fb66476da5e4ad3c6c1..453259cd67279422bd24bf11bf27097ecf48acec 100644
--- a/flow/compositor_context.h
+++ b/flow/compositor_context.h
@@ -11,9 +11,9 @@
 #include "flutter/common/graphics/texture.h"
 #include "flutter/flow/diff_context.h"
 #include "flutter/flow/embedded_views.h"
-#include "flutter/flow/instrumentation.h"
 #include "flutter/flow/layer_snapshot_store.h"
 #include "flutter/flow/raster_cache.h"
+#include "flutter/flow/stopwatch.h"
 #include "flutter/fml/macros.h"
 #include "flutter/fml/raster_thread_merger.h"
 #include "third_party/skia/include/core/SkCanvas.h"
@@ -23,37 +23,28 @@ namespace flutter {
 
 class LayerTree;
 
+// The result status of CompositorContext::ScopedFrame::Raster.
 enum class RasterStatus {
   // Frame has been successfully rasterized.
   kSuccess,
-  // Frame is submitted twice. This is only used on Android when
-  // switching the background surface to FlutterImageView.
+  // Frame has been submited, but must be submitted again. This is only used
+  // on Android when switching the background surface to FlutterImageView.
   //
   // On Android, the first frame doesn't make the image available
   // to the ImageReader right away. The second frame does.
   //
   // TODO(egarciad): https://github.com/flutter/flutter/issues/65652
   kResubmit,
-  // Frame is dropped and a new frame with the same layer tree is
+  // Frame has be dropped and a new frame with the same layer tree must be
   // attempted.
   //
   // This is currently used to wait for the thread merger to merge
   // the raster and platform threads.
   //
-  // Since the thread merger may be disabled,
+  // Since the thread merger may be disabled, the system will proceed
+  // with separate threads for rasterization and platform tasks,
+  // potentially leading to different performance characteristics.
   kSkipAndRetry,
-  // Frame has been successfully rasterized, but "there are additional items in
-  // the pipeline waiting to be consumed. This is currently
-  // only used when thread configuration change occurs.
-  kEnqueuePipeline,
-  // Failed to rasterize the frame.
-  kFailed,
-  // Layer tree was discarded due to LayerTreeDiscardCallback or inability to
-  // access the GPU.
-  kDiscarded,
-  // Drawing was yielded to allow the correct thread to draw as a result of the
-  // RasterThreadMerger.
-  kYielded,
 };
 
 class FrameDamage {
@@ -82,7 +73,8 @@ class FrameDamage {
   // but the paint region of layer_tree will be calculated so that it can be
   // used for diffing of subsequent frames.
   std::optional<SkRect> ComputeClipRect(flutter::LayerTree& layer_tree,
-                                        bool has_raster_cache);
+                                        bool has_raster_cache,
+                                        bool impeller_enabled);
 
   // See Damage::frame_damage.
   std::optional<SkIRect> GetFrameDamage() const {
@@ -91,15 +83,24 @@ class FrameDamage {
 
   // See Damage::buffer_damage.
   std::optional<SkIRect> GetBufferDamage() {
-    return damage_ ? std::make_optional(damage_->buffer_damage) : std::nullopt;
+    return (damage_ && !ignore_damage_)
+               ? std::make_optional(damage_->buffer_damage)
+               : std::nullopt;
   }
 
+  // Remove reported buffer_damage to inform clients that a partial repaint
+  // should not be performed on this frame.
+  // frame_damage is required to correctly track accumulated damage for
+  // subsequent frames.
+  void Reset() { ignore_damage_ = true; }
+
  private:
   SkIRect additional_damage_ = SkIRect::MakeEmpty();
   std::optional<Damage> damage_;
   const LayerTree* prev_layer_tree_ = nullptr;
   int vertical_clip_alignment_ = 1;
   int horizontal_clip_alignment_ = 1;
+  bool ignore_damage_ = false;
 };
 
 class CompositorContext {
@@ -108,22 +109,17 @@ class CompositorContext {
    public:
     ScopedFrame(CompositorContext& context,
                 GrDirectContext* gr_context,
-                SkCanvas* canvas,
+                DlCanvas* canvas,
                 ExternalViewEmbedder* view_embedder,
                 const SkMatrix& root_surface_transformation,
                 bool instrumentation_enabled,
                 bool surface_supports_readback,
                 fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger,
-                DisplayListBuilder* display_list_builder,
                 impeller::AiksContext* aiks_context);
 
     virtual ~ScopedFrame();
 
-    SkCanvas* canvas() { return canvas_; }
-
-    DisplayListBuilder* display_list_builder() const {
-      return display_list_builder_;
-    }
+    DlCanvas* canvas() { return canvas_; }
 
     ExternalViewEmbedder* view_embedder() { return view_embedder_; }
 
@@ -144,10 +140,18 @@ class CompositorContext {
                                 FrameDamage* frame_damage);
 
    private:
+    void PaintLayerTreeSkia(flutter::LayerTree& layer_tree,
+                            std::optional<SkRect> clip_rect,
+                            bool needs_save_layer,
+                            bool ignore_raster_cache);
+
+    void PaintLayerTreeImpeller(flutter::LayerTree& layer_tree,
+                                std::optional<SkRect> clip_rect,
+                                bool ignore_raster_cache);
+
     CompositorContext& context_;
     GrDirectContext* gr_context_;
-    SkCanvas* canvas_;
-    DisplayListBuilder* display_list_builder_;
+    DlCanvas* canvas_;
     impeller::AiksContext* aiks_context_;
     ExternalViewEmbedder* view_embedder_;
     const SkMatrix& root_surface_transformation_;
@@ -166,13 +170,12 @@ class CompositorContext {
 
   virtual std::unique_ptr<ScopedFrame> AcquireFrame(
       GrDirectContext* gr_context,
-      SkCanvas* canvas,
+      DlCanvas* canvas,
       ExternalViewEmbedder* view_embedder,
       const SkMatrix& root_surface_transformation,
       bool instrumentation_enabled,
       bool surface_supports_readback,
       fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger,
-      DisplayListBuilder* display_list_builder,
       impeller::AiksContext* aiks_context);
 
   void OnGrContextCreated();
@@ -205,6 +208,12 @@ class CompositorContext {
 
   void EndFrame(ScopedFrame& frame, bool enable_instrumentation);
 
+  /// @brief  Whether Impeller shouild attempt a partial repaint.
+  ///         The Impeller backend requires an additional blit pass, which may
+  ///         not be worthwhile if the damage region is large.
+  static bool ShouldPerformPartialRepaint(std::optional<SkRect> damage_rect,
+                                          SkISize layer_tree_size);
+
   FML_DISALLOW_COPY_AND_ASSIGN(CompositorContext);
 };
 
diff --git a/flow/diff_context.cc b/flow/diff_context.cc
index a828dcef968d261b3feb43285a6c4e401ccbbd15..8bfec18230aa05c2221cabe889a4639900c39eee 100644
--- a/flow/diff_context.cc
+++ b/flow/diff_context.cc
@@ -8,25 +8,32 @@
 namespace flutter {
 
 DiffContext::DiffContext(SkISize frame_size,
-                         double frame_device_pixel_ratio,
                          PaintRegionMap& this_frame_paint_region_map,
                          const PaintRegionMap& last_frame_paint_region_map,
-                         bool has_raster_cache)
-    : rects_(std::make_shared<std::vector<SkRect>>()),
+                         bool has_raster_cache,
+                         bool impeller_enabled)
+    : clip_tracker_(DisplayListMatrixClipTracker(kGiantRect, SkMatrix::I())),
+      rects_(std::make_shared<std::vector<SkRect>>()),
       frame_size_(frame_size),
-      frame_device_pixel_ratio_(frame_device_pixel_ratio),
       this_frame_paint_region_map_(this_frame_paint_region_map),
       last_frame_paint_region_map_(last_frame_paint_region_map),
-      has_raster_cache_(has_raster_cache) {}
+      has_raster_cache_(has_raster_cache),
+      impeller_enabled_(impeller_enabled) {}
 
 void DiffContext::BeginSubtree() {
   state_stack_.push_back(state_);
-  state_.rect_index_ = rects_->size();
+
+  bool had_integral_transform = state_.integral_transform;
+  state_.rect_index = rects_->size();
   state_.has_filter_bounds_adjustment = false;
   state_.has_texture = false;
-  if (state_.transform_override) {
-    state_.transform = *state_.transform_override;
-    state_.transform_override = std::nullopt;
+  state_.integral_transform = false;
+
+  state_.clip_tracker_save_count = clip_tracker_.getSaveCount();
+  clip_tracker_.save();
+
+  if (had_integral_transform) {
+    MakeCurrentTransformIntegral();
   }
 }
 
@@ -35,23 +42,37 @@ void DiffContext::EndSubtree() {
   if (state_.has_filter_bounds_adjustment) {
     filter_bounds_adjustment_stack_.pop_back();
   }
+  clip_tracker_.restoreToCount(state_.clip_tracker_save_count);
   state_ = state_stack_.back();
   state_stack_.pop_back();
 }
 
-DiffContext::State::State()
-    : dirty(false),
-      cull_rect(kGiantRect),
-      rect_index_(0),
-      has_filter_bounds_adjustment(false),
-      has_texture(false) {}
+DiffContext::State::State() {}
 
 void DiffContext::PushTransform(const SkMatrix& transform) {
-  state_.transform.preConcat(transform);
+  clip_tracker_.transform(transform);
+}
+
+void DiffContext::PushTransform(const SkM44& transform) {
+  clip_tracker_.transform(transform);
 }
 
-void DiffContext::SetTransform(const SkMatrix& transform) {
-  state_.transform_override = transform;
+void DiffContext::MakeCurrentTransformIntegral() {
+  // TODO(knopp): This is duplicated from LayerStack. Maybe should be part of
+  // clip tracker?
+  if (clip_tracker_.using_4x4_matrix()) {
+    SkM44 integral;
+    if (RasterCacheUtil::ComputeIntegralTransCTM(clip_tracker_.matrix_4x4(),
+                                                 &integral)) {
+      clip_tracker_.setTransform(integral);
+    }
+  } else {
+    SkMatrix integral;
+    if (RasterCacheUtil::ComputeIntegralTransCTM(clip_tracker_.matrix_3x3(),
+                                                 &integral)) {
+      clip_tracker_.setTransform(integral);
+    }
+  }
 }
 
 void DiffContext::PushFilterBoundsAdjustment(
@@ -102,12 +123,16 @@ Damage DiffContext::ComputeDamage(const SkIRect& accumulated_buffer_damage,
   SkRect frame_damage(damage_);
 
   for (const auto& r : readbacks_) {
-    SkRect rect = SkRect::Make(r.rect);
-    if (rect.intersects(frame_damage)) {
-      frame_damage.join(rect);
-    }
-    if (rect.intersects(buffer_damage)) {
-      buffer_damage.join(rect);
+    SkRect paint_rect = SkRect::Make(r.paint_rect);
+    SkRect readback_rect = SkRect::Make(r.readback_rect);
+    // Changes either in readback or paint rect require repainting both readback
+    // and paint rect.
+    if (paint_rect.intersects(frame_damage) ||
+        readback_rect.intersects(frame_damage)) {
+      frame_damage.join(readback_rect);
+      frame_damage.join(paint_rect);
+      buffer_damage.join(readback_rect);
+      buffer_damage.join(paint_rect);
     }
   }
 
@@ -128,21 +153,23 @@ Damage DiffContext::ComputeDamage(const SkIRect& accumulated_buffer_damage,
   return res;
 }
 
+SkRect DiffContext::MapRect(const SkRect& rect) {
+  SkRect mapped_rect(rect);
+  clip_tracker_.mapRect(&mapped_rect);
+  return mapped_rect;
+}
+
 bool DiffContext::PushCullRect(const SkRect& clip) {
-  SkRect cull_rect = state_.transform.mapRect(clip);
-  return state_.cull_rect.intersect(cull_rect);
+  clip_tracker_.clipRect(clip, DlCanvas::ClipOp::kIntersect, false);
+  return !clip_tracker_.device_cull_rect().isEmpty();
+}
+
+SkMatrix DiffContext::GetTransform3x3() const {
+  return clip_tracker_.matrix_3x3();
 }
 
 SkRect DiffContext::GetCullRect() const {
-  SkMatrix inverse_transform;
-  // Perspective projections don't produce rectangles that are useful for
-  // culling for some reason.
-  if (!state_.transform.hasPerspective() &&
-      state_.transform.invert(&inverse_transform)) {
-    return inverse_transform.mapRect(state_.cull_rect);
-  } else {
-    return kGiantRect;
-  }
+  return clip_tracker_.local_cull_rect();
 }
 
 void DiffContext::MarkSubtreeDirty(const PaintRegion& previous_paint_region) {
@@ -163,16 +190,17 @@ void DiffContext::AddLayerBounds(const SkRect& rect) {
   // During painting we cull based on non-overriden transform and then
   // override the transform right before paint. Do the same thing here to get
   // identical paint rect.
-  auto transformed_rect =
-      ApplyFilterBoundsAdjustment(state_.transform.mapRect(rect));
-  if (transformed_rect.intersects(state_.cull_rect)) {
-    auto paint_rect = state_.transform_override
-                          ? ApplyFilterBoundsAdjustment(
-                                state_.transform_override->mapRect(rect))
-                          : transformed_rect;
-    rects_->push_back(paint_rect);
+  auto transformed_rect = ApplyFilterBoundsAdjustment(MapRect(rect));
+  if (transformed_rect.intersects(clip_tracker_.device_cull_rect())) {
+    if (state_.integral_transform) {
+      clip_tracker_.save();
+      MakeCurrentTransformIntegral();
+      transformed_rect = ApplyFilterBoundsAdjustment(MapRect(rect));
+      clip_tracker_.restore();
+    }
+    rects_->push_back(transformed_rect);
     if (IsSubtreeDirty()) {
-      AddDamage(paint_rect);
+      AddDamage(transformed_rect);
     }
   }
 }
@@ -196,9 +224,11 @@ void DiffContext::AddExistingPaintRegion(const PaintRegion& region) {
   }
 }
 
-void DiffContext::AddReadbackRegion(const SkIRect& rect) {
+void DiffContext::AddReadbackRegion(const SkIRect& paint_rect,
+                                    const SkIRect& readback_rect) {
   Readback readback;
-  readback.rect = rect;
+  readback.paint_rect = paint_rect;
+  readback.readback_rect = readback_rect;
   readback.position = rects_->size();
   // Push empty rect as a placeholder for position in current subtree
   rects_->push_back(SkRect::MakeEmpty());
@@ -208,8 +238,8 @@ void DiffContext::AddReadbackRegion(const SkIRect& rect) {
 PaintRegion DiffContext::CurrentSubtreeRegion() const {
   bool has_readback = std::any_of(
       readbacks_.begin(), readbacks_.end(),
-      [&](const Readback& r) { return r.position >= state_.rect_index_; });
-  return PaintRegion(rects_, state_.rect_index_, rects_->size(), has_readback,
+      [&](const Readback& r) { return r.position >= state_.rect_index; });
+  return PaintRegion(rects_, state_.rect_index, rects_->size(), has_readback,
                      state_.has_texture);
 }
 
diff --git a/flow/diff_context.h b/flow/diff_context.h
index 6688bdd5549f0c052d8a019017040d49b732e625..edec336ab6e0c25318938f679666fe5c04e1d6ad 100644
--- a/flow/diff_context.h
+++ b/flow/diff_context.h
@@ -9,9 +9,10 @@
 #include <map>
 #include <optional>
 #include <vector>
+#include "display_list/utils/dl_matrix_clip_tracker.h"
 #include "flutter/flow/paint_region.h"
-#include "flutter/fml/logging.h"
 #include "flutter/fml/macros.h"
+#include "third_party/skia/include/core/SkM44.h"
 #include "third_party/skia/include/core/SkMatrix.h"
 #include "third_party/skia/include/core/SkRect.h"
 
@@ -43,10 +44,10 @@ using PaintRegionMap = std::map<uint64_t, PaintRegion>;
 class DiffContext {
  public:
   explicit DiffContext(SkISize frame_size,
-                       double device_pixel_aspect_ratio,
                        PaintRegionMap& this_frame_paint_region_map,
                        const PaintRegionMap& last_frame_paint_region_map,
-                       bool has_raster_cache);
+                       bool has_raster_cache,
+                       bool impeller_enabled);
 
   // Starts a new subtree.
   void BeginSubtree();
@@ -71,6 +72,7 @@ class DiffContext {
 
   // Pushes additional transform for current subtree
   void PushTransform(const SkMatrix& transform);
+  void PushTransform(const SkM44& transform);
 
   // Pushes cull rect for current subtree
   bool PushCullRect(const SkRect& clip);
@@ -83,16 +85,16 @@ class DiffContext {
   // subtree will have bounds adjusted by this function.
   void PushFilterBoundsAdjustment(const FilterBoundsAdjustment& filter);
 
-  // Returns transform matrix for current subtree
-  const SkMatrix& GetTransform() const { return state_.transform; }
+  // Instruct DiffContext that current layer will paint with integral transform.
+  void WillPaintWithIntegralTransform() { state_.integral_transform = true; }
 
-  // Overrides transform matrix for current subtree
-  void SetTransform(const SkMatrix& transform);
+  // Returns current transform as SkMatrix.
+  SkMatrix GetTransform3x3() const;
 
-  // Return cull rect for current subtree (in local coordinates)
+  // Return cull rect for current subtree (in local coordinates).
   SkRect GetCullRect() const;
 
-  // Sets the dirty flag on current subtree;
+  // Sets the dirty flag on current subtree.
   //
   // previous_paint_region, which should represent region of previous subtree
   // at this level will be added to damage area.
@@ -121,8 +123,12 @@ class DiffContext {
   // The idea of readback region is that if any part of the readback region
   // needs to be repainted, then the whole readback region must be repainted;
   //
-  // Readback rect is in screen coordinates.
-  void AddReadbackRegion(const SkIRect& rect);
+  // paint_rect - rectangle where the filter paints contents (in screen
+  //              coordinates)
+  // readback_rect - rectangle where the filter samples from (in screen
+  //                 coordinates)
+  void AddReadbackRegion(const SkIRect& paint_rect,
+                         const SkIRect& readback_rect);
 
   // Returns the paint region for current subtree; Each rect in paint region is
   // in screen coordinates; Once a layer accumulates the paint regions of its
@@ -141,8 +147,6 @@ class DiffContext {
                        int horizontal_clip_alignment = 0,
                        int vertical_clip_alignment = 0) const;
 
-  double frame_device_pixel_ratio() const { return frame_device_pixel_ratio_; };
-
   // Adds the region to current damage. Used for removed layers, where instead
   // of diffing the layer its paint region is direcly added to damage.
   void AddDamage(const PaintRegion& damage);
@@ -162,6 +166,8 @@ class DiffContext {
   // cached.
   bool has_raster_cache() const { return has_raster_cache_; }
 
+  bool impeller_enabled() const { return impeller_enabled_; }
+
   class Statistics {
    public:
     // Picture replaced by different picture
@@ -196,37 +202,44 @@ class DiffContext {
 
   Statistics& statistics() { return statistics_; }
 
+  SkRect MapRect(const SkRect& rect);
+
  private:
   struct State {
     State();
 
-    bool dirty;
-    SkRect cull_rect;  // in screen coordinates
-
-    // In order to replicate paint process closely, we need both the original
-    // transform, and the overriden transform (set for layers that need to paint
-    // on integer coordinates). The reason for this is that during paint the
-    // transform matrix is overriden only after layer passes the cull check
-    // first (with original transform). So to cull layer we use transform, but
-    // to get paint coordinates we use transform_override. Child layers are
-    // painted after transform override, so if set we use transform_override as
-    // base when diffing child layers.
-    SkMatrix transform;
-    std::optional<SkMatrix> transform_override;
-    size_t rect_index_;
+    bool dirty = false;
+
+    size_t rect_index = 0;
+
+    // In order to replicate paint process closely, DiffContext needs to take
+    // into account that some layers are painted with transform translation
+    // snapped to integral coordinates.
+    //
+    // It's not possible to simply snap the transform itself, because culling
+    // needs to happen with original (unsnapped) transform, just like it does
+    // during paint. This means the integral coordinates must be applied after
+    // culling before painting the layer content (either the layer itself, or
+    // when starting subtree to paint layer children).
+    bool integral_transform = false;
+
+    // Used to restoring clip tracker when popping state.
+    int clip_tracker_save_count = 0;
 
     // Whether this subtree has filter bounds adjustment function. If so,
     // it will need to be removed from stack when subtree is closed.
-    bool has_filter_bounds_adjustment;
+    bool has_filter_bounds_adjustment = false;
 
     // Whether there is a texture layer in this subtree.
-    bool has_texture;
+    bool has_texture = false;
   };
 
+  void MakeCurrentTransformIntegral();
+
+  DisplayListMatrixClipTracker clip_tracker_;
   std::shared_ptr<std::vector<SkRect>> rects_;
   State state_;
   SkISize frame_size_;
-  double frame_device_pixel_ratio_;
   std::vector<State> state_stack_;
   std::vector<FilterBoundsAdjustment> filter_bounds_adjustment_stack_;
 
@@ -239,6 +252,7 @@ class DiffContext {
   PaintRegionMap& this_frame_paint_region_map_;
   const PaintRegionMap& last_frame_paint_region_map_;
   bool has_raster_cache_;
+  bool impeller_enabled_;
 
   void AddDamage(const SkRect& rect);
 
@@ -251,8 +265,11 @@ class DiffContext {
     // determine if subtree has any readback
     size_t position;
 
-    // readback area, in screen coordinates
-    SkIRect rect;
+    // Paint region of the filter performing readback, in screen coordinates.
+    SkIRect paint_rect;
+
+    // Readback area of the filter, in screen coordinates.
+    SkIRect readback_rect;
   };
 
   std::vector<Readback> readbacks_;
diff --git a/flow/diff_context_unittests.cc b/flow/diff_context_unittests.cc
index e981258ef1a03dd03db752cc6d2ea31e3a4b219a..d8b78a94070c041cb2aab378df2d427c93fcdbfb 100644
--- a/flow/diff_context_unittests.cc
+++ b/flow/diff_context_unittests.cc
@@ -10,7 +10,7 @@ namespace testing {
 TEST_F(DiffContextTest, ClipAlignment) {
   MockLayerTree t1;
   t1.root()->Add(CreateDisplayListLayer(
-      CreateDisplayList(SkRect::MakeLTRB(30, 30, 50, 50), 1)));
+      CreateDisplayList(SkRect::MakeLTRB(30, 30, 50, 50))));
   auto damage = DiffLayerTree(t1, MockLayerTree(), SkIRect::MakeEmpty(), 0, 0);
   EXPECT_EQ(damage.frame_damage, SkIRect::MakeLTRB(30, 30, 50, 50));
   EXPECT_EQ(damage.buffer_damage, SkIRect::MakeLTRB(30, 30, 50, 50));
diff --git a/flow/embedded_views.cc b/flow/embedded_views.cc
index f3388bab4641b6c37eed966c917fb4b27a7fbdbc..ddb85acd2b0c785db398d713867f7fc0e3c8c5b8 100644
--- a/flow/embedded_views.cc
+++ b/flow/embedded_views.cc
@@ -6,98 +6,80 @@
 
 namespace flutter {
 
-SkPictureEmbedderViewSlice::SkPictureEmbedderViewSlice(SkRect view_bounds) {
-  auto rtree_factory = RTreeFactory();
-  rtree_ = rtree_factory.getInstance();
-
-  recorder_ = std::make_unique<SkPictureRecorder>();
-  recorder_->beginRecording(view_bounds, &rtree_factory);
-}
-
-SkCanvas* SkPictureEmbedderViewSlice::canvas() {
-  return recorder_->getRecordingCanvas();
-}
-
-DisplayListBuilder* SkPictureEmbedderViewSlice::builder() {
-  return nullptr;
-}
-
-void SkPictureEmbedderViewSlice::end_recording() {
-  picture_ = recorder_->finishRecordingAsPicture();
-}
-
-std::list<SkRect> SkPictureEmbedderViewSlice::searchNonOverlappingDrawnRects(
-    const SkRect& query) const {
-  return rtree_->searchNonOverlappingDrawnRects(query);
+DisplayListEmbedderViewSlice::DisplayListEmbedderViewSlice(SkRect view_bounds) {
+  builder_ = std::make_unique<DisplayListBuilder>(
+      /*bounds=*/view_bounds,
+      /*prepare_rtree=*/true);
 }
 
-void SkPictureEmbedderViewSlice::render_into(SkCanvas* canvas) {
-  canvas->drawPicture(picture_);
+DlCanvas* DisplayListEmbedderViewSlice::canvas() {
+  return builder_ ? builder_.get() : nullptr;
 }
 
-void SkPictureEmbedderViewSlice::render_into(DisplayListBuilder* builder) {
-  builder->drawPicture(picture_, nullptr, false);
+void DisplayListEmbedderViewSlice::end_recording() {
+  display_list_ = builder_->Build();
+  FML_DCHECK(display_list_->has_rtree());
+  builder_ = nullptr;
 }
 
-DisplayListEmbedderViewSlice::DisplayListEmbedderViewSlice(SkRect view_bounds) {
-  recorder_ = std::make_unique<DisplayListCanvasRecorder>(view_bounds);
+const DlRegion& DisplayListEmbedderViewSlice::getRegion() const {
+  return display_list_->rtree()->region();
 }
 
-SkCanvas* DisplayListEmbedderViewSlice::canvas() {
-  return recorder_ ? recorder_.get() : nullptr;
+void DisplayListEmbedderViewSlice::render_into(DlCanvas* canvas) {
+  canvas->DrawDisplayList(display_list_);
 }
 
-DisplayListBuilder* DisplayListEmbedderViewSlice::builder() {
-  return recorder_ ? recorder_->builder().get() : nullptr;
+void DisplayListEmbedderViewSlice::dispatch(DlOpReceiver& receiver) {
+  display_list_->Dispatch(receiver);
 }
 
-void DisplayListEmbedderViewSlice::end_recording() {
-  display_list_ = recorder_->Build();
-  recorder_ = nullptr;
+bool DisplayListEmbedderViewSlice::is_empty() {
+  return display_list_->bounds().isEmpty();
 }
 
-std::list<SkRect> DisplayListEmbedderViewSlice::searchNonOverlappingDrawnRects(
-    const SkRect& query) const {
-  return display_list_->rtree()->searchNonOverlappingDrawnRects(query);
+bool DisplayListEmbedderViewSlice::recording_ended() {
+  return builder_ == nullptr;
 }
 
-void DisplayListEmbedderViewSlice::render_into(SkCanvas* canvas) {
-  display_list_->RenderTo(canvas);
+void ExternalViewEmbedder::SubmitFlutterView(
+    int64_t flutter_view_id,
+    GrDirectContext* context,
+    const std::shared_ptr<impeller::AiksContext>& aiks_context,
+    std::unique_ptr<SurfaceFrame> frame) {
+  frame->Submit();
 }
 
-void DisplayListEmbedderViewSlice::render_into(DisplayListBuilder* builder) {
-  builder->drawDisplayList(display_list_);
+bool ExternalViewEmbedder::SupportsDynamicThreadMerging() {
+  return false;
 }
 
-void ExternalViewEmbedder::SubmitFrame(GrDirectContext* context,
-                                       std::unique_ptr<SurfaceFrame> frame) {
-  frame->Submit();
-};
+void ExternalViewEmbedder::Teardown() {}
 
 void MutatorsStack::PushClipRect(const SkRect& rect) {
   std::shared_ptr<Mutator> element = std::make_shared<Mutator>(rect);
   vector_.push_back(element);
-};
+}
 
 void MutatorsStack::PushClipRRect(const SkRRect& rrect) {
   std::shared_ptr<Mutator> element = std::make_shared<Mutator>(rrect);
   vector_.push_back(element);
-};
+}
 
 void MutatorsStack::PushClipPath(const SkPath& path) {
   std::shared_ptr<Mutator> element = std::make_shared<Mutator>(path);
   vector_.push_back(element);
-};
+}
 
 void MutatorsStack::PushTransform(const SkMatrix& matrix) {
   std::shared_ptr<Mutator> element = std::make_shared<Mutator>(matrix);
   vector_.push_back(element);
-};
+}
 
 void MutatorsStack::PushOpacity(const int& alpha) {
   std::shared_ptr<Mutator> element = std::make_shared<Mutator>(alpha);
   vector_.push_back(element);
-};
+}
 
 void MutatorsStack::PushBackdropFilter(
     const std::shared_ptr<const DlImageFilter>& filter,
@@ -105,11 +87,11 @@ void MutatorsStack::PushBackdropFilter(
   std::shared_ptr<Mutator> element =
       std::make_shared<Mutator>(filter, filter_rect);
   vector_.push_back(element);
-};
+}
 
 void MutatorsStack::Pop() {
   vector_.pop_back();
-};
+}
 
 void MutatorsStack::PopTo(size_t stack_count) {
   while (vector_.size() > stack_count) {
@@ -120,27 +102,21 @@ void MutatorsStack::PopTo(size_t stack_count) {
 const std::vector<std::shared_ptr<Mutator>>::const_reverse_iterator
 MutatorsStack::Top() const {
   return vector_.rend();
-};
+}
 
 const std::vector<std::shared_ptr<Mutator>>::const_reverse_iterator
 MutatorsStack::Bottom() const {
   return vector_.rbegin();
-};
+}
 
 const std::vector<std::shared_ptr<Mutator>>::const_iterator
 MutatorsStack::Begin() const {
   return vector_.begin();
-};
+}
 
 const std::vector<std::shared_ptr<Mutator>>::const_iterator MutatorsStack::End()
     const {
   return vector_.end();
-};
-
-bool ExternalViewEmbedder::SupportsDynamicThreadMerging() {
-  return false;
 }
 
-void ExternalViewEmbedder::Teardown() {}
-
 }  // namespace flutter
diff --git a/flow/embedded_views.h b/flow/embedded_views.h
index 84ad68f41faa6fed0b376f068f397609867a3a7e..89a2aa7e5eddf52dab3881b7df7a252fc8b2dfa0 100644
--- a/flow/embedded_views.h
+++ b/flow/embedded_views.h
@@ -5,21 +5,32 @@
 #ifndef FLUTTER_FLOW_EMBEDDED_VIEWS_H_
 #define FLUTTER_FLOW_EMBEDDED_VIEWS_H_
 
+#include <memory>
+#include <utility>
 #include <vector>
 
-#include "flutter/display_list/display_list_builder.h"
-#include "flutter/flow/rtree.h"
+#include "flutter/display_list/dl_builder.h"
+#include "flutter/display_list/skia/dl_sk_canvas.h"
 #include "flutter/flow/surface_frame.h"
 #include "flutter/fml/memory/ref_counted.h"
 #include "flutter/fml/raster_thread_merger.h"
-#include "third_party/skia/include/core/SkCanvas.h"
+#include "third_party/skia/include/core/SkMatrix.h"
 #include "third_party/skia/include/core/SkPath.h"
-#include "third_party/skia/include/core/SkPictureRecorder.h"
-#include "third_party/skia/include/core/SkPoint.h"
 #include "third_party/skia/include/core/SkRRect.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "third_party/skia/include/core/SkSize.h"
-#include "third_party/skia/include/core/SkSurface.h"
+
+#if IMPELLER_SUPPORTS_RENDERING
+#include "flutter/impeller/aiks/aiks_context.h"  // nogncheck
+#include "flutter/impeller/renderer/context.h"   // nogncheck
+#else                                            // IMPELLER_SUPPORTS_RENDERING
+namespace impeller {
+class Context;
+class AiksContext;
+}  // namespace impeller
+#endif                                           // !IMPELLER_SUPPORTS_RENDERING
+
+class GrDirectContext;
 
 namespace flutter {
 
@@ -41,7 +52,7 @@ class ImageFilterMutation {
  public:
   ImageFilterMutation(std::shared_ptr<const DlImageFilter> filter,
                       const SkRect& filter_rect)
-      : filter_(filter), filter_rect_(filter_rect) {}
+      : filter_(std::move(filter)), filter_rect_(filter_rect) {}
 
   const DlImageFilter& GetFilter() const { return *filter_; }
   const SkRect& GetFilterRect() const { return filter_rect_; }
@@ -100,7 +111,7 @@ class Mutator {
   explicit Mutator(const SkMatrix& matrix)
       : type_(kTransform), matrix_(matrix) {}
   explicit Mutator(const int& alpha) : type_(kOpacity), alpha_(alpha) {}
-  explicit Mutator(std::shared_ptr<const DlImageFilter> filter,
+  explicit Mutator(const std::shared_ptr<const DlImageFilter>& filter,
                    const SkRect& filter_rect)
       : type_(kBackdropFilter),
         filter_mutation_(
@@ -115,7 +126,7 @@ class Mutator {
     return *filter_mutation_;
   }
   const int& GetAlpha() const { return alpha_; }
-  float GetAlphaFloat() const { return (alpha_ / 255.0); }
+  float GetAlphaFloat() const { return (alpha_ / 255.0f); }
 
   bool operator==(const Mutator& other) const {
     if (type_ != other.type_) {
@@ -185,6 +196,7 @@ class MutatorsStack {
   void PushClipPath(const SkPath& path);
   void PushTransform(const SkMatrix& matrix);
   void PushOpacity(const int& alpha);
+  // `filter_rect` is in global coordinates.
   void PushBackdropFilter(const std::shared_ptr<const DlImageFilter>& filter,
                           const SkRect& filter_rect);
 
@@ -256,12 +268,10 @@ class EmbeddedViewParams {
 
   EmbeddedViewParams(SkMatrix matrix,
                      SkSize size_points,
-                     MutatorsStack mutators_stack,
-                     bool display_list_enabled = false)
+                     MutatorsStack mutators_stack)
       : matrix_(matrix),
         size_points_(size_points),
-        mutators_stack_(mutators_stack),
-        display_list_enabled_(display_list_enabled) {
+        mutators_stack_(std::move(mutators_stack)) {
     SkPath path;
     SkRect starting_rect = SkRect::MakeSize(size_points);
     path.addRect(starting_rect);
@@ -284,15 +294,13 @@ class EmbeddedViewParams {
   const SkRect& finalBoundingRect() const { return final_bounding_rect_; }
 
   // Pushes the stored DlImageFilter object to the mutators stack.
-  void PushImageFilter(std::shared_ptr<const DlImageFilter> filter,
+  //
+  // `filter_rect` is in global coordinates.
+  void PushImageFilter(const std::shared_ptr<const DlImageFilter>& filter,
                        const SkRect& filter_rect) {
     mutators_stack_.PushBackdropFilter(filter, filter_rect);
   }
 
-  // Whether the embedder should construct DisplayList objects to hold the
-  // rendering commands for each between-view slice of the layer tree.
-  bool display_list_enabled() const { return display_list_enabled_; }
-
   bool operator==(const EmbeddedViewParams& other) const {
     return size_points_ == other.size_points_ &&
            mutators_stack_ == other.mutators_stack_ &&
@@ -305,7 +313,6 @@ class EmbeddedViewParams {
   SkSize size_points_;
   MutatorsStack mutators_stack_;
   SkRect final_bounding_rect_;
-  bool display_list_enabled_;
 };
 
 enum class PostPrerollResult {
@@ -320,67 +327,41 @@ enum class PostPrerollResult {
   kSkipAndRetryFrame
 };
 
-// The |PlatformViewLayer| calls |CompositeEmbeddedView| in its |Paint|
-// method to replace the leaf_nodes_canvas and leaf_nodes_builder in its
-// |PaintContext| for subsequent layers in the frame to render into.
-// The builder value will only be supplied if the associated ScopedFrame
-// is being rendered to DisplayLists. The |EmbedderPaintContext| struct
-// allows the method to return both values.
-struct EmbedderPaintContext {
-  SkCanvas* canvas;
-  DisplayListBuilder* builder;
-};
-
 // The |EmbedderViewSlice| represents the details of recording all of
 // the layer tree rendering operations that appear between before, after
-// and between the embedded views. The Slice may be recorded into an
-// SkPicture or a DisplayListBuilder depending on the ScopedFrame.
+// and between the embedded views. The Slice used to abstract away
+// implementations that were based on either an SkPicture or a
+// DisplayListBuilder but more recently all of the embedder recordings
+// have standardized on the DisplayList.
 class EmbedderViewSlice {
  public:
   virtual ~EmbedderViewSlice() = default;
-  virtual SkCanvas* canvas() = 0;
-  virtual DisplayListBuilder* builder() = 0;
+  virtual DlCanvas* canvas() = 0;
   virtual void end_recording() = 0;
-  virtual std::list<SkRect> searchNonOverlappingDrawnRects(
-      const SkRect& query) const = 0;
-  virtual void render_into(SkCanvas* canvas) = 0;
-  virtual void render_into(DisplayListBuilder* builder) = 0;
-};
-
-class SkPictureEmbedderViewSlice : public EmbedderViewSlice {
- public:
-  SkPictureEmbedderViewSlice(SkRect view_bounds);
-  ~SkPictureEmbedderViewSlice() override = default;
-
-  SkCanvas* canvas() override;
-  DisplayListBuilder* builder() override;
-  void end_recording() override;
-  std::list<SkRect> searchNonOverlappingDrawnRects(
-      const SkRect& query) const override;
-  void render_into(SkCanvas* canvas) override;
-  void render_into(DisplayListBuilder* builder) override;
+  virtual const DlRegion& getRegion() const = 0;
+  DlRegion region(const SkRect& query) const {
+    return DlRegion::MakeIntersection(getRegion(), DlRegion(query.roundOut()));
+  }
 
- private:
-  std::unique_ptr<SkPictureRecorder> recorder_;
-  sk_sp<RTree> rtree_;
-  sk_sp<SkPicture> picture_;
+  virtual void render_into(DlCanvas* canvas) = 0;
 };
 
 class DisplayListEmbedderViewSlice : public EmbedderViewSlice {
  public:
-  DisplayListEmbedderViewSlice(SkRect view_bounds);
+  explicit DisplayListEmbedderViewSlice(SkRect view_bounds);
   ~DisplayListEmbedderViewSlice() override = default;
 
-  SkCanvas* canvas() override;
-  DisplayListBuilder* builder() override;
+  DlCanvas* canvas() override;
   void end_recording() override;
-  std::list<SkRect> searchNonOverlappingDrawnRects(
-      const SkRect& query) const override;
-  void render_into(SkCanvas* canvas) override;
-  void render_into(DisplayListBuilder* builder) override;
+  const DlRegion& getRegion() const override;
+
+  void render_into(DlCanvas* canvas) override;
+  void dispatch(DlOpReceiver& receiver);
+  bool is_empty();
+  bool recording_ended();
 
  private:
-  std::unique_ptr<DisplayListCanvasRecorder> recorder_;
+  std::unique_ptr<DisplayListBuilder> builder_;
   sk_sp<DisplayList> display_list_;
 };
 
@@ -388,6 +369,29 @@ class DisplayListEmbedderViewSlice : public EmbedderViewSlice {
 //
 // Used on iOS, Android (hybrid composite mode), and on embedded platforms
 // that provide a system compositor as part of the project arguments.
+//
+// There are two kinds of "view IDs" in the context of ExternalViewEmbedder, and
+// specific names are used to avoid ambiguation:
+//
+// * ExternalViewEmbedder composites a stack of layers. Each layer's content
+//   might be from Flutter widgets, or a platform view, which displays platform
+//   native components. Each platform view is labeled by a view ID, which
+//   corresponds to the ID from `PlatformViewsRegistry.getNextPlatformViewId`
+//   from the framework. In the context of `ExternalViewEmbedder`, this ID is
+//   called platform_view_id.
+// * The layers are compositied into a single rectangular surface, displayed by
+//   taking up an entire native window or part of a window. Each such surface
+//   is labeled by a view ID, which corresponds to `FlutterView.viewID` from
+//   dart:ui. In the context of `ExternalViewEmbedder`, this ID is called
+//   flutter_view_id.
+//
+// The lifecycle of drawing a frame using ExternalViewEmbedder is:
+//
+//   1. At the start of a frame, call |BeginFrame|, then |SetUsedThisFrame| to
+//      true.
+//   2. For each view to be drawn, call |PrepareFlutterView|, then
+//   |SubmitFlutterView|.
+//   3. At the end of a frame, if |GetUsedThisFrame| is true, call |EndFrame|.
 class ExternalViewEmbedder {
   // TODO(cyanglaz): Make embedder own the `EmbeddedViewParams`.
 
@@ -400,9 +404,9 @@ class ExternalViewEmbedder {
   // the view embedder wants to provide a canvas to the rasterizer, it may
   // return one here. This canvas takes priority over the canvas materialized
   // from the on-screen render target.
-  virtual SkCanvas* GetRootCanvas() = 0;
+  virtual DlCanvas* GetRootCanvas() = 0;
 
-  // Call this in-lieu of |SubmitFrame| to clear pre-roll state and
+  // Call this in-lieu of |SubmitFlutterView| to clear pre-roll state and
   // sets the stage for the next pre-roll.
   virtual void CancelFrame() = 0;
 
@@ -411,13 +415,11 @@ class ExternalViewEmbedder {
   // The `raster_thread_merger` will be null if |SupportsDynamicThreadMerging|
   // returns false.
   virtual void BeginFrame(
-      SkISize frame_size,
       GrDirectContext* context,
-      double device_pixel_ratio,
-      fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) = 0;
+      const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) = 0;
 
   virtual void PrerollCompositeEmbeddedView(
-      int view_id,
+      int64_t platform_view_id,
       std::unique_ptr<EmbeddedViewParams> params) = 0;
 
   // This needs to get called after |Preroll| finishes on the layer tree.
@@ -425,23 +427,30 @@ class ExternalViewEmbedder {
   // after it does any requisite tasks needed to bring itself to a valid state.
   // Returns kSuccess if the view embedder is already in a valid state.
   virtual PostPrerollResult PostPrerollAction(
-      fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
+      const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {
     return PostPrerollResult::kSuccess;
   }
 
-  virtual std::vector<SkCanvas*> GetCurrentCanvases() = 0;
-  virtual std::vector<DisplayListBuilder*> GetCurrentBuilders() = 0;
-
   // Must be called on the UI thread.
-  virtual EmbedderPaintContext CompositeEmbeddedView(int view_id) = 0;
+  virtual DlCanvas* CompositeEmbeddedView(int64_t platform_view_id) = 0;
+
+  // Prepare for a view to be drawn.
+  virtual void PrepareFlutterView(SkISize frame_size,
+                                  double device_pixel_ratio) = 0;
 
+  // Submits the content stored since |PrepareFlutterView| to the specified
+  // Flutter view.
+  //
   // Implementers must submit the frame by calling frame.Submit().
   //
   // This method can mutate the root Skia canvas before submitting the frame.
   //
   // It can also allocate frames for overlay surfaces to compose hybrid views.
-  virtual void SubmitFrame(GrDirectContext* context,
-                           std::unique_ptr<SurfaceFrame> frame);
+  virtual void SubmitFlutterView(
+      int64_t flutter_view_id,
+      GrDirectContext* context,
+      const std::shared_ptr<impeller::AiksContext>& aiks_context,
+      std::unique_ptr<SurfaceFrame> frame);
 
   // This method provides the embedder a way to do additional tasks after
   // |SubmitFrame|. For example, merge task runners if `should_resubmit_frame`
@@ -456,7 +465,7 @@ class ExternalViewEmbedder {
   // returns false.
   virtual void EndFrame(
       bool should_resubmit_frame,
-      fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {}
+      const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {}
 
   // Whether the embedder should support dynamic thread merging.
   //
@@ -482,15 +491,17 @@ class ExternalViewEmbedder {
 
   // Pushes the platform view id of a visited platform view to a list of
   // visited platform views.
-  virtual void PushVisitedPlatformView(int64_t view_id) {}
+  virtual void PushVisitedPlatformView(int64_t platform_view_id) {}
 
   // Pushes a DlImageFilter object to each platform view within a list of
   // visited platform views.
   //
+  // `filter_rect` is in global coordinates.
+  //
   // See also: |PushVisitedPlatformView| for pushing platform view ids to the
   // visited platform views list.
   virtual void PushFilterToVisitedPlatformViews(
-      std::shared_ptr<const DlImageFilter> filter,
+      const std::shared_ptr<const DlImageFilter>& filter,
       const SkRect& filter_rect) {}
 
  private:
diff --git a/flow/flow_test_utils.h b/flow/flow_test_utils.h
index ed4ca287fe7dd41572166c478c7fff0ab15c73a5..4948f288761ea555ce4969adce354bf6476d7644 100644
--- a/flow/flow_test_utils.h
+++ b/flow/flow_test_utils.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_FLOW_FLOW_TEST_UTILS_H_
+#define FLUTTER_FLOW_FLOW_TEST_UTILS_H_
+
 #include <string>
 
 namespace flutter {
@@ -15,3 +18,5 @@ const std::string& GetFontFile();
 void SetFontFile(const std::string& dir);
 
 }  // namespace flutter
+
+#endif  // FLUTTER_FLOW_FLOW_TEST_UTILS_H_
diff --git a/flow/frame_timings.cc b/flow/frame_timings.cc
index 7b5c0f908f49aae3b22eb7dfc0c05a6f1be097df..07a398a81c42e8c88a0b99eddeed149a157d56e5 100644
--- a/flow/frame_timings.cc
+++ b/flow/frame_timings.cc
@@ -13,6 +13,31 @@
 
 namespace flutter {
 
+namespace {
+
+const char* StateToString(FrameTimingsRecorder::State state) {
+#ifndef NDEBUG
+  switch (state) {
+    case FrameTimingsRecorder::State::kUninitialized:
+      return "kUninitialized";
+    case FrameTimingsRecorder::State::kVsync:
+      return "kVsync";
+    case FrameTimingsRecorder::State::kBuildStart:
+      return "kBuildStart";
+    case FrameTimingsRecorder::State::kBuildEnd:
+      return "kBuildEnd";
+    case FrameTimingsRecorder::State::kRasterStart:
+      return "kRasterStart";
+    case FrameTimingsRecorder::State::kRasterEnd:
+      return "kRasterEnd";
+  };
+  FML_UNREACHABLE();
+#endif
+  return "";
+}
+
+}  // namespace
+
 std::atomic<uint64_t> FrameTimingsRecorder::frame_number_gen_ = {1};
 
 FrameTimingsRecorder::FrameTimingsRecorder()
@@ -103,32 +128,75 @@ size_t FrameTimingsRecorder::GetPictureCacheBytes() const {
 
 void FrameTimingsRecorder::RecordVsync(fml::TimePoint vsync_start,
                                        fml::TimePoint vsync_target) {
+  fml::Status status = RecordVsyncImpl(vsync_start, vsync_target);
+  FML_DCHECK(status.ok());
+  (void)status;
+}
+
+void FrameTimingsRecorder::RecordBuildStart(fml::TimePoint build_start) {
+  fml::Status status = RecordBuildStartImpl(build_start);
+  FML_DCHECK(status.ok());
+  (void)status;
+}
+
+void FrameTimingsRecorder::RecordBuildEnd(fml::TimePoint build_end) {
+  fml::Status status = RecordBuildEndImpl(build_end);
+  FML_DCHECK(status.ok());
+  (void)status;
+}
+
+void FrameTimingsRecorder::RecordRasterStart(fml::TimePoint raster_start) {
+  fml::Status status = RecordRasterStartImpl(raster_start);
+  FML_DCHECK(status.ok());
+  (void)status;
+}
+
+fml::Status FrameTimingsRecorder::RecordVsyncImpl(fml::TimePoint vsync_start,
+                                                  fml::TimePoint vsync_target) {
   std::scoped_lock state_lock(state_mutex_);
-  FML_DCHECK(state_ == State::kUninitialized);
+  if (state_ != State::kUninitialized) {
+    return fml::Status(fml::StatusCode::kFailedPrecondition,
+                       "Check failed: state_ == State::kUninitialized.");
+  }
   state_ = State::kVsync;
   vsync_start_ = vsync_start;
   vsync_target_ = vsync_target;
+  return fml::Status();
 }
 
-void FrameTimingsRecorder::RecordBuildStart(fml::TimePoint build_start) {
+fml::Status FrameTimingsRecorder::RecordBuildStartImpl(
+    fml::TimePoint build_start) {
   std::scoped_lock state_lock(state_mutex_);
-  FML_DCHECK(state_ == State::kVsync);
+  if (state_ != State::kVsync) {
+    return fml::Status(fml::StatusCode::kFailedPrecondition,
+                       "Check failed: state_ == State::kVsync.");
+  }
   state_ = State::kBuildStart;
   build_start_ = build_start;
+  return fml::Status();
 }
 
-void FrameTimingsRecorder::RecordBuildEnd(fml::TimePoint build_end) {
+fml::Status FrameTimingsRecorder::RecordBuildEndImpl(fml::TimePoint build_end) {
   std::scoped_lock state_lock(state_mutex_);
-  FML_DCHECK(state_ == State::kBuildStart);
+  if (state_ != State::kBuildStart) {
+    return fml::Status(fml::StatusCode::kFailedPrecondition,
+                       "Check failed: state_ == State::kBuildStart.");
+  }
   state_ = State::kBuildEnd;
   build_end_ = build_end;
+  return fml::Status();
 }
 
-void FrameTimingsRecorder::RecordRasterStart(fml::TimePoint raster_start) {
+fml::Status FrameTimingsRecorder::RecordRasterStartImpl(
+    fml::TimePoint raster_start) {
   std::scoped_lock state_lock(state_mutex_);
-  FML_DCHECK(state_ == State::kBuildEnd);
+  if (state_ != State::kBuildEnd) {
+    return fml::Status(fml::StatusCode::kFailedPrecondition,
+                       "Check failed: state_ == State::kBuildEnd.");
+  }
   state_ = State::kRasterStart;
   raster_start_ = raster_start;
+  return fml::Status();
 }
 
 FrameTiming FrameTimingsRecorder::RecordRasterEnd(const RasterCache* cache) {
@@ -211,4 +279,9 @@ const char* FrameTimingsRecorder::GetFrameNumberTraceArg() const {
   return frame_number_trace_arg_val_.c_str();
 }
 
+void FrameTimingsRecorder::AssertInState(State state) const {
+  FML_DCHECK(state_ == state) << "Expected state " << StateToString(state)
+                              << ", actual state " << StateToString(state_);
+}
+
 }  // namespace flutter
diff --git a/flow/frame_timings.h b/flow/frame_timings.h
index 8d39bb61457d8d19d2cae7f986c9d81b22b8727e..ccccd89dddb888a10a88bf84c2e7fa71ebc562a9 100644
--- a/flow/frame_timings.h
+++ b/flow/frame_timings.h
@@ -10,12 +10,15 @@
 #include "flutter/common/settings.h"
 #include "flutter/flow/raster_cache.h"
 #include "flutter/fml/macros.h"
+#include "flutter/fml/status.h"
 #include "flutter/fml/time/time_delta.h"
 #include "flutter/fml/time/time_point.h"
 
-#define TRACE_EVENT_WITH_FRAME_NUMBER(recorder, category_group, name) \
-  TRACE_EVENT1(category_group, name, "frame_number",                  \
-               recorder->GetFrameNumberTraceArg())
+#define TRACE_EVENT_WITH_FRAME_NUMBER(recorder, category_group, name,       \
+                                      flow_id_count, flow_ids)              \
+  TRACE_EVENT1_WITH_FLOW_IDS(category_group, name, flow_id_count, flow_ids, \
+                             "frame_number",                                \
+                             recorder->GetFrameNumberTraceArg())
 
 namespace flutter {
 
@@ -28,6 +31,7 @@ class FrameTimingsRecorder {
  public:
   /// Various states that the recorder can be in. When created the recorder is
   /// in an unitialized state and transtions in sequential order of the states.
+  // After adding an item to this enum, modify StateToString accordingly.
   enum class State : uint32_t {
     kUninitialized,
     kVsync,
@@ -113,7 +117,26 @@ class FrameTimingsRecorder {
   /// Returns the recorded time from when `RecordRasterEnd` is called.
   FrameTiming GetRecordedTime() const;
 
+  /// Asserts in unopt builds that the recorder is current at the specified
+  /// state.
+  ///
+  /// Instead of adding a `GetState` method and asserting on the result, this
+  /// method prevents other logic from relying on the state.
+  ///
+  /// In release builds, this call is a no-op.
+  void AssertInState(State state) const;
+
  private:
+  FML_FRIEND_TEST(FrameTimingsRecorderTest, ThrowWhenRecordBuildBeforeVsync);
+  FML_FRIEND_TEST(FrameTimingsRecorderTest,
+                  ThrowWhenRecordRasterBeforeBuildEnd);
+
+  [[nodiscard]] fml::Status RecordVsyncImpl(fml::TimePoint vsync_start,
+                                            fml::TimePoint vsync_target);
+  [[nodiscard]] fml::Status RecordBuildStartImpl(fml::TimePoint build_start);
+  [[nodiscard]] fml::Status RecordBuildEndImpl(fml::TimePoint build_end);
+  [[nodiscard]] fml::Status RecordRasterStartImpl(fml::TimePoint raster_start);
+
   static std::atomic<uint64_t> frame_number_gen_;
 
   mutable std::mutex state_mutex_;
diff --git a/flow/frame_timings_recorder_unittests.cc b/flow/frame_timings_recorder_unittests.cc
index ab1ef1ebc7eda809c961e04aafc052cc210f8678..c7fa7390a4c6edb651e3e1b8d836bd7fc449cab4 100644
--- a/flow/frame_timings_recorder_unittests.cc
+++ b/flow/frame_timings_recorder_unittests.cc
@@ -2,13 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <thread>
 #include "flutter/flow/frame_timings.h"
 #include "flutter/flow/testing/layer_test.h"
 #include "flutter/flow/testing/mock_layer.h"
 #include "flutter/flow/testing/mock_raster_cache.h"
-#include "third_party/skia/include/core/SkPictureRecorder.h"
-
-#include <thread>
 
 #include "flutter/fml/time/time_delta.h"
 #include "flutter/fml/time/time_point.h"
@@ -16,7 +14,8 @@
 #include "gtest/gtest.h"
 
 namespace flutter {
-namespace testing {
+
+using testing::MockRasterCache;
 
 TEST(FrameTimingsRecorderTest, RecordVsync) {
   auto recorder = std::make_unique<FrameTimingsRecorder>();
@@ -130,9 +129,9 @@ TEST(FrameTimingsRecorderTest, ThrowWhenRecordBuildBeforeVsync) {
   auto recorder = std::make_unique<FrameTimingsRecorder>();
 
   const auto build_start = fml::TimePoint::Now();
-  EXPECT_EXIT(recorder->RecordBuildStart(build_start),
-              ::testing::KilledBySignal(SIGABRT),
-              "Check failed: state_ == State::kVsync.");
+  fml::Status status = recorder->RecordBuildStartImpl(build_start);
+  EXPECT_FALSE(status.ok());
+  EXPECT_EQ(status.message(), "Check failed: state_ == State::kVsync.");
 }
 
 TEST(FrameTimingsRecorderTest, ThrowWhenRecordRasterBeforeBuildEnd) {
@@ -143,9 +142,9 @@ TEST(FrameTimingsRecorderTest, ThrowWhenRecordRasterBeforeBuildEnd) {
   recorder->RecordVsync(st, en);
 
   const auto raster_start = fml::TimePoint::Now();
-  EXPECT_EXIT(recorder->RecordRasterStart(raster_start),
-              ::testing::KilledBySignal(SIGABRT),
-              "Check failed: state_ == State::kBuildEnd.");
+  fml::Status status = recorder->RecordRasterStartImpl(raster_start);
+  EXPECT_FALSE(status.ok());
+  EXPECT_EQ(status.message(), "Check failed: state_ == State::kBuildEnd.");
 }
 
 #endif
@@ -297,5 +296,4 @@ TEST(FrameTimingsRecorderTest, FrameNumberTraceArgIsValid) {
   ASSERT_EQ(actual_arg, expected_arg);
 }
 
-}  // namespace testing
 }  // namespace flutter
diff --git a/flow/layer_snapshot_store.h b/flow/layer_snapshot_store.h
index eb444d2dcc390b73390a604f6e00f795e31d96c9..2c38c859f4809fa022a46b9a5cd65d279f771086 100644
--- a/flow/layer_snapshot_store.h
+++ b/flow/layer_snapshot_store.h
@@ -10,12 +10,9 @@
 #include "flutter/fml/logging.h"
 #include "flutter/fml/time/time_delta.h"
 
-#include "third_party/skia/include/core/SkImageEncoder.h"
-#include "third_party/skia/include/core/SkPictureRecorder.h"
-#include "third_party/skia/include/core/SkSerialProcs.h"
-#include "third_party/skia/include/core/SkSurface.h"
-#include "third_party/skia/include/core/SkSurfaceCharacterization.h"
-#include "third_party/skia/include/utils/SkBase64.h"
+#include "third_party/skia/include/core/SkData.h"
+#include "third_party/skia/include/core/SkRect.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
 
 namespace flutter {
 
diff --git a/flow/layers/backdrop_filter_layer.cc b/flow/layers/backdrop_filter_layer.cc
index 7091e4f5c69dde0ffaad47fb4e0eaf37ca268a86..32707c4f77e6d15b42e7cf56965fb3affae2f3bf 100644
--- a/flow/layers/backdrop_filter_layer.cc
+++ b/flow/layers/backdrop_filter_layer.cc
@@ -26,12 +26,12 @@ void BackdropFilterLayer::Diff(DiffContext* context, const Layer* old_layer) {
   context->AddLayerBounds(paint_bounds);
 
   if (filter_) {
-    context->GetTransform().mapRect(&paint_bounds);
+    paint_bounds = context->MapRect(paint_bounds);
     auto filter_target_bounds = paint_bounds.roundOut();
     SkIRect filter_input_bounds;  // in screen coordinates
     filter_->get_input_device_bounds(
-        filter_target_bounds, context->GetTransform(), filter_input_bounds);
-    context->AddReadbackRegion(filter_input_bounds);
+        filter_target_bounds, context->GetTransform3x3(), filter_input_bounds);
+    context->AddReadbackRegion(filter_target_bounds, filter_input_bounds);
   }
 
   DiffChildren(context, prev);
@@ -42,9 +42,9 @@ void BackdropFilterLayer::Diff(DiffContext* context, const Layer* old_layer) {
 void BackdropFilterLayer::Preroll(PrerollContext* context) {
   Layer::AutoPrerollSaveLayerState save =
       Layer::AutoPrerollSaveLayerState::Create(context, true, bool(filter_));
-  if (context->view_embedder != nullptr) {
+  if (filter_ && context->view_embedder != nullptr) {
     context->view_embedder->PushFilterToVisitedPlatformViews(
-        filter_, context->state_stack.local_cull_rect());
+        filter_, context->state_stack.device_cull_rect());
   }
   SkRect child_paint_bounds = SkRect::MakeEmpty();
   PrerollChildren(context, &child_paint_bounds);
diff --git a/flow/layers/backdrop_filter_layer_unittests.cc b/flow/layers/backdrop_filter_layer_unittests.cc
index 0697682e44cc518d29ac66d5c0ee8868a825adeb..8dacf8ed3216f369fd8435b658a66efe685454ce 100644
--- a/flow/layers/backdrop_filter_layer_unittests.cc
+++ b/flow/layers/backdrop_filter_layer_unittests.cc
@@ -11,9 +11,6 @@
 #include "flutter/flow/testing/layer_test.h"
 #include "flutter/flow/testing/mock_layer.h"
 #include "flutter/fml/macros.h"
-#include "flutter/testing/mock_canvas.h"
-#include "third_party/skia/include/core/SkImageFilter.h"
-#include "third_party/skia/include/effects/SkImageFilters.h"
 
 namespace flutter {
 namespace testing {
@@ -25,7 +22,7 @@ TEST_F(BackdropFilterLayerTest, PaintingEmptyLayerDies) {
   auto filter = DlBlurImageFilter(5, 5, DlTileMode::kClamp);
   auto layer = std::make_shared<BackdropFilterLayer>(filter.shared(),
                                                      DlBlendMode::kSrcOver);
-  auto parent = std::make_shared<ClipRectLayer>(kEmptyRect, Clip::hardEdge);
+  auto parent = std::make_shared<ClipRectLayer>(kEmptyRect, Clip::kHardEdge);
   parent->Add(layer);
 
   parent->Preroll(preroll_context());
@@ -57,12 +54,12 @@ TEST_F(BackdropFilterLayerTest, EmptyFilter) {
   const SkMatrix initial_transform = SkMatrix::Translate(0.5f, 1.0f);
   const SkRect child_bounds = SkRect::MakeLTRB(5.0f, 6.0f, 20.5f, 21.5f);
   const SkPath child_path = SkPath().addRect(child_bounds);
-  const SkPaint child_paint = SkPaint(SkColors::kYellow);
+  const DlPaint child_paint = DlPaint(DlColor::kYellow());
   auto mock_layer = std::make_shared<MockLayer>(child_path, child_paint);
   auto layer =
       std::make_shared<BackdropFilterLayer>(nullptr, DlBlendMode::kSrcOver);
   layer->Add(mock_layer);
-  auto parent = std::make_shared<ClipRectLayer>(child_bounds, Clip::hardEdge);
+  auto parent = std::make_shared<ClipRectLayer>(child_bounds, Clip::kHardEdge);
   parent->Add(layer);
 
   preroll_context()->state_stack.set_preroll_delegate(initial_transform);
@@ -72,29 +69,44 @@ TEST_F(BackdropFilterLayerTest, EmptyFilter) {
   EXPECT_TRUE(layer->needs_painting(paint_context()));
   EXPECT_EQ(mock_layer->parent_matrix(), initial_transform);
 
-  layer->Paint(paint_context());
-  EXPECT_EQ(
-      mock_canvas().draw_calls(),
-      std::vector({MockCanvas::DrawCall{
-                       0, MockCanvas::SaveLayerData{child_bounds, SkPaint(),
-                                                    nullptr, 1}},
-                   MockCanvas::DrawCall{
-                       1, MockCanvas::DrawPathData{child_path, child_paint}},
-                   MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
+  parent->Paint(display_list_paint_context());
+  DisplayListBuilder expected_builder;
+  /* (ClipRect)parent::Paint */ {
+    expected_builder.Save();
+    {
+      expected_builder.ClipRect(child_bounds, DlCanvas::ClipOp::kIntersect,
+                                false);
+      /* (BackdropFilter)layer::Paint */ {
+        expected_builder.Save();
+        {
+          expected_builder.SaveLayer(&child_bounds, nullptr, nullptr);
+          {
+            /* mock_layer::Paint */ {
+              expected_builder.DrawPath(child_path, child_paint);
+            }
+          }
+          expected_builder.Restore();
+        }
+        expected_builder.Restore();
+      }
+    }
+    expected_builder.Restore();
+  }
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
 }
 
 TEST_F(BackdropFilterLayerTest, SimpleFilter) {
   const SkMatrix initial_transform = SkMatrix::Translate(0.5f, 1.0f);
   const SkRect child_bounds = SkRect::MakeLTRB(5.0f, 6.0f, 20.5f, 21.5f);
   const SkPath child_path = SkPath().addRect(child_bounds);
-  const SkPaint child_paint = SkPaint(SkColors::kYellow);
-  auto layer_filter = SkImageFilters::Shader(
-      SkShaders::Color(SkColors::kMagenta, /*colorSpace=*/nullptr));
+  const DlPaint child_paint = DlPaint(DlColor::kYellow());
+  auto layer_filter =
+      std::make_shared<DlBlurImageFilter>(2.5, 3.2, DlTileMode::kClamp);
   auto mock_layer = std::make_shared<MockLayer>(child_path, child_paint);
-  auto layer = std::make_shared<BackdropFilterLayer>(
-      DlImageFilter::From(layer_filter), DlBlendMode::kSrcOver);
+  auto layer = std::make_shared<BackdropFilterLayer>(layer_filter,
+                                                     DlBlendMode::kSrcOver);
   layer->Add(mock_layer);
-  auto parent = std::make_shared<ClipRectLayer>(child_bounds, Clip::hardEdge);
+  auto parent = std::make_shared<ClipRectLayer>(child_bounds, Clip::kHardEdge);
   parent->Add(layer);
 
   preroll_context()->state_stack.set_preroll_delegate(initial_transform);
@@ -104,29 +116,45 @@ TEST_F(BackdropFilterLayerTest, SimpleFilter) {
   EXPECT_TRUE(layer->needs_painting(paint_context()));
   EXPECT_EQ(mock_layer->parent_matrix(), initial_transform);
 
-  layer->Paint(paint_context());
-  EXPECT_EQ(
-      mock_canvas().draw_calls(),
-      std::vector({MockCanvas::DrawCall{
-                       0, MockCanvas::SaveLayerData{child_bounds, SkPaint(),
-                                                    layer_filter, 1}},
-                   MockCanvas::DrawCall{
-                       1, MockCanvas::DrawPathData{child_path, child_paint}},
-                   MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
+  parent->Paint(display_list_paint_context());
+  DisplayListBuilder expected_builder;
+  /* (ClipRect)parent::Paint */ {
+    expected_builder.Save();
+    {
+      expected_builder.ClipRect(child_bounds, DlCanvas::ClipOp::kIntersect,
+                                false);
+      /* (BackdropFilter)layer::Paint */ {
+        expected_builder.Save();
+        {
+          expected_builder.SaveLayer(&child_bounds, nullptr,
+                                     layer_filter.get());
+          {
+            /* mock_layer::Paint */ {
+              expected_builder.DrawPath(child_path, child_paint);
+            }
+          }
+          expected_builder.Restore();
+        }
+        expected_builder.Restore();
+      }
+    }
+    expected_builder.Restore();
+  }
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
 }
 
 TEST_F(BackdropFilterLayerTest, NonSrcOverBlend) {
   const SkMatrix initial_transform = SkMatrix::Translate(0.5f, 1.0f);
   const SkRect child_bounds = SkRect::MakeLTRB(5.0f, 6.0f, 20.5f, 21.5f);
   const SkPath child_path = SkPath().addRect(child_bounds);
-  const SkPaint child_paint = SkPaint(SkColors::kYellow);
-  auto layer_filter = SkImageFilters::Shader(
-      SkShaders::Color(SkColors::kMagenta, /*colorSpace=*/nullptr));
+  const DlPaint child_paint = DlPaint(DlColor::kYellow());
+  auto layer_filter =
+      std::make_shared<DlBlurImageFilter>(2.5, 3.2, DlTileMode::kClamp);
   auto mock_layer = std::make_shared<MockLayer>(child_path, child_paint);
-  auto layer = std::make_shared<BackdropFilterLayer>(
-      DlImageFilter::From(layer_filter), DlBlendMode::kSrc);
+  auto layer =
+      std::make_shared<BackdropFilterLayer>(layer_filter, DlBlendMode::kSrc);
   layer->Add(mock_layer);
-  auto parent = std::make_shared<ClipRectLayer>(child_bounds, Clip::hardEdge);
+  auto parent = std::make_shared<ClipRectLayer>(child_bounds, Clip::kHardEdge);
   parent->Add(layer);
 
   preroll_context()->state_stack.set_preroll_delegate(initial_transform);
@@ -136,18 +164,35 @@ TEST_F(BackdropFilterLayerTest, NonSrcOverBlend) {
   EXPECT_TRUE(layer->needs_painting(paint_context()));
   EXPECT_EQ(mock_layer->parent_matrix(), initial_transform);
 
-  SkPaint filter_paint = SkPaint();
-  filter_paint.setBlendMode(SkBlendMode::kSrc);
-
-  layer->Paint(paint_context());
-  EXPECT_EQ(
-      mock_canvas().draw_calls(),
-      std::vector({MockCanvas::DrawCall{
-                       0, MockCanvas::SaveLayerData{child_bounds, filter_paint,
-                                                    layer_filter, 1}},
-                   MockCanvas::DrawCall{
-                       1, MockCanvas::DrawPathData{child_path, child_paint}},
-                   MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
+  DlPaint filter_paint = DlPaint();
+  filter_paint.setBlendMode(DlBlendMode::kSrc);
+
+  parent->Paint(display_list_paint_context());
+  DisplayListBuilder expected_builder;
+  /* (ClipRect)parent::Paint */ {
+    expected_builder.Save();
+    {
+      expected_builder.ClipRect(child_bounds, DlCanvas::ClipOp::kIntersect,
+                                false);
+      /* (BackdropFilter)layer::Paint */ {
+        expected_builder.Save();
+        {
+          DlPaint save_paint = DlPaint().setBlendMode(DlBlendMode::kSrc);
+          expected_builder.SaveLayer(&child_bounds, &save_paint,
+                                     layer_filter.get());
+          {
+            /* mock_layer::Paint */ {
+              expected_builder.DrawPath(child_path, child_paint);
+            }
+          }
+          expected_builder.Restore();
+        }
+        expected_builder.Restore();
+      }
+    }
+    expected_builder.Restore();
+  }
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
 }
 
 TEST_F(BackdropFilterLayerTest, MultipleChildren) {
@@ -156,20 +201,20 @@ TEST_F(BackdropFilterLayerTest, MultipleChildren) {
   const SkPath child_path1 = SkPath().addRect(child_bounds);
   const SkPath child_path2 =
       SkPath().addRect(child_bounds.makeOffset(3.0f, 0.0f));
-  const SkPaint child_paint1 = SkPaint(SkColors::kYellow);
-  const SkPaint child_paint2 = SkPaint(SkColors::kCyan);
+  const DlPaint child_paint1 = DlPaint(DlColor::kYellow());
+  const DlPaint child_paint2 = DlPaint(DlColor::kCyan());
   SkRect children_bounds = child_path1.getBounds();
   children_bounds.join(child_path2.getBounds());
-  auto layer_filter = SkImageFilters::Shader(
-      SkShaders::Color(SkColors::kMagenta, /*colorSpace=*/nullptr));
+  auto layer_filter =
+      std::make_shared<DlBlurImageFilter>(2.5, 3.2, DlTileMode::kClamp);
   auto mock_layer1 = std::make_shared<MockLayer>(child_path1, child_paint1);
   auto mock_layer2 = std::make_shared<MockLayer>(child_path2, child_paint2);
-  auto layer = std::make_shared<BackdropFilterLayer>(
-      DlImageFilter::From(layer_filter), DlBlendMode::kSrcOver);
+  auto layer = std::make_shared<BackdropFilterLayer>(layer_filter,
+                                                     DlBlendMode::kSrcOver);
   layer->Add(mock_layer1);
   layer->Add(mock_layer2);
   auto parent =
-      std::make_shared<ClipRectLayer>(children_bounds, Clip::hardEdge);
+      std::make_shared<ClipRectLayer>(children_bounds, Clip::kHardEdge);
   parent->Add(layer);
 
   preroll_context()->state_stack.set_preroll_delegate(initial_transform);
@@ -184,17 +229,34 @@ TEST_F(BackdropFilterLayerTest, MultipleChildren) {
   EXPECT_EQ(mock_layer1->parent_matrix(), initial_transform);
   EXPECT_EQ(mock_layer2->parent_matrix(), initial_transform);
 
-  layer->Paint(paint_context());
-  EXPECT_EQ(
-      mock_canvas().draw_calls(),
-      std::vector({MockCanvas::DrawCall{
-                       0, MockCanvas::SaveLayerData{children_bounds, SkPaint(),
-                                                    layer_filter, 1}},
-                   MockCanvas::DrawCall{
-                       1, MockCanvas::DrawPathData{child_path1, child_paint1}},
-                   MockCanvas::DrawCall{
-                       1, MockCanvas::DrawPathData{child_path2, child_paint2}},
-                   MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
+  parent->Paint(display_list_paint_context());
+  DisplayListBuilder expected_builder;
+  /* (ClipRect)parent::Paint */ {
+    expected_builder.Save();
+    {
+      expected_builder.ClipRect(children_bounds, DlCanvas::ClipOp::kIntersect,
+                                false);
+      /* (BackdropFilter)layer::Paint */ {
+        expected_builder.Save();
+        {
+          expected_builder.SaveLayer(&children_bounds, nullptr,
+                                     layer_filter.get());
+          {
+            /* mock_layer1::Paint */ {
+              expected_builder.DrawPath(child_path1, child_paint1);
+            }
+            /* mock_layer2::Paint */ {
+              expected_builder.DrawPath(child_path2, child_paint2);
+            }
+          }
+          expected_builder.Restore();
+        }
+        expected_builder.Restore();
+      }
+    }
+    expected_builder.Restore();
+  }
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
 }
 
 TEST_F(BackdropFilterLayerTest, Nested) {
@@ -203,25 +265,25 @@ TEST_F(BackdropFilterLayerTest, Nested) {
   const SkPath child_path1 = SkPath().addRect(child_bounds);
   const SkPath child_path2 =
       SkPath().addRect(child_bounds.makeOffset(3.0f, 0.0f));
-  const SkPaint child_paint1 = SkPaint(SkColors::kYellow);
-  const SkPaint child_paint2 = SkPaint(SkColors::kCyan);
+  const DlPaint child_paint1 = DlPaint(DlColor::kYellow());
+  const DlPaint child_paint2 = DlPaint(DlColor::kCyan());
   SkRect children_bounds = child_path1.getBounds();
   children_bounds.join(child_path2.getBounds());
-  auto layer_filter1 = SkImageFilters::Shader(
-      SkShaders::Color(SkColors::kMagenta, /*colorSpace=*/nullptr));
-  auto layer_filter2 = SkImageFilters::Shader(
-      SkShaders::Color(SkColors::kDkGray, /*colorSpace=*/nullptr));
+  auto layer_filter1 =
+      std::make_shared<DlBlurImageFilter>(2.5, 3.2, DlTileMode::kClamp);
+  auto layer_filter2 =
+      std::make_shared<DlBlurImageFilter>(2.7, 3.1, DlTileMode::kDecal);
   auto mock_layer1 = std::make_shared<MockLayer>(child_path1, child_paint1);
   auto mock_layer2 = std::make_shared<MockLayer>(child_path2, child_paint2);
-  auto layer1 = std::make_shared<BackdropFilterLayer>(
-      DlImageFilter::From(layer_filter1), DlBlendMode::kSrcOver);
-  auto layer2 = std::make_shared<BackdropFilterLayer>(
-      DlImageFilter::From(layer_filter2), DlBlendMode::kSrcOver);
+  auto layer1 = std::make_shared<BackdropFilterLayer>(layer_filter1,
+                                                      DlBlendMode::kSrcOver);
+  auto layer2 = std::make_shared<BackdropFilterLayer>(layer_filter2,
+                                                      DlBlendMode::kSrcOver);
   layer2->Add(mock_layer2);
   layer1->Add(mock_layer1);
   layer1->Add(layer2);
   auto parent =
-      std::make_shared<ClipRectLayer>(children_bounds, Clip::hardEdge);
+      std::make_shared<ClipRectLayer>(children_bounds, Clip::kHardEdge);
   parent->Add(layer1);
 
   preroll_context()->state_stack.set_preroll_delegate(initial_transform);
@@ -238,21 +300,45 @@ TEST_F(BackdropFilterLayerTest, Nested) {
   EXPECT_EQ(mock_layer1->parent_matrix(), initial_transform);
   EXPECT_EQ(mock_layer2->parent_matrix(), initial_transform);
 
-  layer1->Paint(paint_context());
-  EXPECT_EQ(
-      mock_canvas().draw_calls(),
-      std::vector({MockCanvas::DrawCall{
-                       0, MockCanvas::SaveLayerData{children_bounds, SkPaint(),
-                                                    layer_filter1, 1}},
-                   MockCanvas::DrawCall{
-                       1, MockCanvas::DrawPathData{child_path1, child_paint1}},
-                   MockCanvas::DrawCall{
-                       1, MockCanvas::SaveLayerData{children_bounds, SkPaint(),
-                                                    layer_filter2, 2}},
-                   MockCanvas::DrawCall{
-                       2, MockCanvas::DrawPathData{child_path2, child_paint2}},
-                   MockCanvas::DrawCall{2, MockCanvas::RestoreData{1}},
-                   MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
+  parent->Paint(display_list_paint_context());
+  DisplayListBuilder expected_builder;
+  /* (ClipRect)parent::Paint */ {
+    expected_builder.Save();
+    {
+      expected_builder.ClipRect(children_bounds, DlCanvas::ClipOp::kIntersect,
+                                false);
+      /* (BackdropFilter)layer1::Paint */ {
+        expected_builder.Save();
+        {
+          expected_builder.SaveLayer(&children_bounds, nullptr,
+                                     layer_filter1.get());
+          {
+            /* mock_layer1::Paint */ {
+              expected_builder.DrawPath(child_path1, child_paint1);
+            }
+            /* (BackdropFilter)layer2::Paint */ {
+              expected_builder.Save();
+              {
+                expected_builder.SaveLayer(&children_bounds, nullptr,
+                                           layer_filter2.get());
+                {
+                  /* mock_layer2::Paint */ {
+                    expected_builder.DrawPath(child_path2, child_paint2);
+                  }
+                }
+                expected_builder.Restore();
+              }
+              expected_builder.Restore();
+            }
+          }
+          expected_builder.Restore();
+        }
+        expected_builder.Restore();
+      }
+    }
+    expected_builder.Restore();
+  }
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
 }
 
 TEST_F(BackdropFilterLayerTest, Readback) {
@@ -281,7 +367,7 @@ TEST_F(BackdropFilterLayerTest, Readback) {
   EXPECT_TRUE(preroll_context()->surface_needs_readback);
 
   // BDF with no filter blocks child with readback
-  auto mock_layer = std::make_shared<MockLayer>(SkPath(), SkPaint());
+  auto mock_layer = std::make_shared<MockLayer>(SkPath(), DlPaint());
   mock_layer->set_fake_reads_surface(true);
   layer2->Add(mock_layer);
   preroll_context()->surface_needs_readback = false;
@@ -292,10 +378,10 @@ TEST_F(BackdropFilterLayerTest, Readback) {
 TEST_F(BackdropFilterLayerTest, OpacityInheritance) {
   auto backdrop_filter = DlBlurImageFilter(5, 5, DlTileMode::kClamp);
   const SkPath mock_path = SkPath().addRect(SkRect::MakeLTRB(0, 0, 10, 10));
-  const SkPaint mock_paint = SkPaint(SkColors::kRed);
+  const DlPaint mock_paint = DlPaint(DlColor::kRed());
   const SkRect clip_rect = SkRect::MakeLTRB(0, 0, 100, 100);
 
-  auto clip = std::make_shared<ClipRectLayer>(clip_rect, Clip::hardEdge);
+  auto clip = std::make_shared<ClipRectLayer>(clip_rect, Clip::kHardEdge);
   auto parent = std::make_shared<OpacityLayer>(128, SkPoint::Make(0, 0));
   auto layer = std::make_shared<BackdropFilterLayer>(backdrop_filter.shared(),
                                                      DlBlendMode::kSrcOver);
@@ -310,27 +396,27 @@ TEST_F(BackdropFilterLayerTest, OpacityInheritance) {
 
   DisplayListBuilder expected_builder(clip_rect);
   /* ClipRectLayer::Paint */ {
-    expected_builder.save();
+    expected_builder.Save();
     {
-      expected_builder.clipRect(clip_rect, SkClipOp::kIntersect, false);
+      expected_builder.ClipRect(clip_rect, DlCanvas::ClipOp::kIntersect, false);
       /* OpacityLayer::Paint */ {
         // NOP - it hands opacity down to BackdropFilterLayer
         /* BackdropFilterLayer::Paint */ {
           DlPaint save_paint;
           save_paint.setAlpha(128);
-          expected_builder.saveLayer(&clip_rect, &save_paint, &backdrop_filter);
+          expected_builder.SaveLayer(&clip_rect, &save_paint, &backdrop_filter);
           {
             /* MockLayer::Paint */ {
               DlPaint child_paint;
               child_paint.setColor(DlColor::kRed());
-              expected_builder.drawPath(mock_path, child_paint);
+              expected_builder.DrawPath(mock_path, child_paint);
             }
           }
-          expected_builder.restore();
+          expected_builder.Restore();
         }
       }
     }
-    expected_builder.restore();
+    expected_builder.Restore();
   }
   EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
 }
@@ -360,7 +446,7 @@ TEST_F(BackdropLayerDiffTest, BackdropLayer) {
   MockLayerTree l2(SkISize::Make(100, 100));
 
   auto clip = std::make_shared<ClipRectLayer>(SkRect::MakeLTRB(20, 20, 60, 60),
-                                              Clip::hardEdge);
+                                              Clip::kHardEdge);
   clip->Add(std::make_shared<BackdropFilterLayer>(filter.shared(),
                                                   DlBlendMode::kSrcOver));
   l2.root()->Add(clip);
@@ -395,6 +481,31 @@ TEST_F(BackdropLayerDiffTest, BackdropLayer) {
   EXPECT_EQ(damage.frame_damage, SkIRect::MakeLTRB(0, 0, 190, 190));
 }
 
+TEST_F(BackdropLayerDiffTest, ReadbackOutsideOfPaintArea) {
+  auto filter = DlMatrixImageFilter(SkMatrix::Translate(50, 50),
+                                    DlImageSampling::kLinear);
+
+  MockLayerTree l1(SkISize::Make(100, 100));
+
+  auto clip = std::make_shared<ClipRectLayer>(SkRect::MakeLTRB(60, 60, 80, 80),
+                                              Clip::kHardEdge);
+  clip->Add(std::make_shared<BackdropFilterLayer>(filter.shared(),
+                                                  DlBlendMode::kSrcOver));
+  l1.root()->Add(clip);
+  auto damage = DiffLayerTree(l1, MockLayerTree(SkISize::Make(100, 100)));
+
+  EXPECT_EQ(damage.frame_damage, SkIRect::MakeLTRB(60 - 50, 60 - 50, 80, 80));
+
+  MockLayerTree l2(SkISize::Make(100, 100));
+  // path inside readback area must trigger whole readback repaint + filter
+  // repaint.
+  auto path2 = SkPath().addRect(SkRect::MakeXYWH(60 - 50, 60 - 50, 10, 10));
+  l2.root()->Add(clip);
+  l2.root()->Add(std::make_shared<MockLayer>(path2));
+  damage = DiffLayerTree(l2, l1);
+  EXPECT_EQ(damage.frame_damage, SkIRect::MakeLTRB(60 - 50, 60 - 50, 80, 80));
+}
+
 TEST_F(BackdropLayerDiffTest, BackdropLayerInvalidTransform) {
   auto filter = DlBlurImageFilter(10, 10, DlTileMode::kClamp);
 
diff --git a/flow/layers/cacheable_layer.cc b/flow/layers/cacheable_layer.cc
index 6c485e89dc155348e6dde7cafbcfc4a235c773fb..7cdfacfb7d4c71ff801e51e6c4e661d7e3f415d2 100644
--- a/flow/layers/cacheable_layer.cc
+++ b/flow/layers/cacheable_layer.cc
@@ -3,8 +3,6 @@
 // found in the LICENSE file.
 
 #include "flutter/flow/layers/cacheable_layer.h"
-#include "flutter/flow/raster_cache.h"
-#include "flutter/flow/raster_cache_item.h"
 
 namespace flutter {
 
diff --git a/flow/layers/cacheable_layer.h b/flow/layers/cacheable_layer.h
index c4aa392460cb4b9182c90a316e74001700f82068..856ce47546ec3d901e051de76b18293c5636e065 100644
--- a/flow/layers/cacheable_layer.h
+++ b/flow/layers/cacheable_layer.h
@@ -8,7 +8,6 @@
 #include <memory>
 
 #include "flutter/flow/layers/container_layer.h"
-#include "flutter/flow/layers/display_list_raster_cache_item.h"
 #include "flutter/flow/layers/layer_raster_cache_item.h"
 
 namespace flutter {
diff --git a/flow/layers/checkerboard_layertree_unittests.cc b/flow/layers/checkerboard_layertree_unittests.cc
index 2a75ad5c5091d7a24bceb766421ff142dae7ffac..c1173d968c3e71e2dbf5418d111b62d23068c0fb 100644
--- a/flow/layers/checkerboard_layertree_unittests.cc
+++ b/flow/layers/checkerboard_layertree_unittests.cc
@@ -2,11 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/display_list/display_list_canvas_dispatcher.h"
 #include "flutter/flow/layers/clip_path_layer.h"
 #include "flutter/flow/layers/clip_rect_layer.h"
 #include "flutter/flow/layers/clip_rrect_layer.h"
-#include "flutter/flow/layers/physical_shape_layer.h"
 #include "flutter/flow/testing/layer_test.h"
 #include "flutter/flow/testing/mock_layer.h"
 #include "flutter/fml/macros.h"
@@ -17,16 +15,18 @@ namespace testing {
 
 using CheckerBoardLayerTest = LayerTest;
 
+using ClipOp = DlCanvas::ClipOp;
+
 #ifndef NDEBUG
 TEST_F(CheckerBoardLayerTest, ClipRectSaveLayerCheckBoard) {
   const SkMatrix initial_matrix = SkMatrix::Translate(0.5f, 1.0f);
   const SkRect child_bounds = SkRect::MakeXYWH(1.0, 2.0, 2.0, 2.0);
   const SkRect layer_bounds = SkRect::MakeXYWH(0.5, 1.0, 5.0, 6.0);
   const SkPath child_path = SkPath().addRect(child_bounds);
-  const SkPaint child_paint = SkPaint(SkColors::kYellow);
+  const DlPaint child_paint = DlPaint(DlColor::kYellow());
   auto mock_layer = std::make_shared<MockLayer>(child_path, child_paint);
   auto layer = std::make_shared<ClipRectLayer>(layer_bounds,
-                                               Clip::antiAliasWithSaveLayer);
+                                               Clip::kAntiAliasWithSaveLayer);
   layer->Add(mock_layer);
 
   preroll_context()->state_stack.set_preroll_delegate(initial_matrix);
@@ -46,43 +46,52 @@ TEST_F(CheckerBoardLayerTest, ClipRectSaveLayerCheckBoard) {
   EXPECT_EQ(mock_layer->parent_mutators(),
             std::vector({Mutator(layer_bounds)}));
 
-  layer->Paint(paint_context());
-  EXPECT_EQ(
-      mock_canvas().draw_calls(),
-      std::vector(
-          {MockCanvas::DrawCall{0, MockCanvas::SaveData{1}},
-           MockCanvas::DrawCall{
-               1, MockCanvas::ClipRectData{layer_bounds, SkClipOp::kIntersect,
-                                           MockCanvas::kSoft_ClipEdgeStyle}},
-           MockCanvas::DrawCall{
-               1,
-               MockCanvas::SaveLayerData{child_bounds, SkPaint(), nullptr, 2}},
-           MockCanvas::DrawCall{
-               2, MockCanvas::DrawPathData{child_path, child_paint}},
-           MockCanvas::DrawCall{2, MockCanvas::RestoreData{1}},
-           MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
-
-  mock_canvas().reset_draw_calls();
-
+  layer->Paint(display_list_paint_context());
+  {
+    DisplayListBuilder expected_builder;
+    /* (ClipRect)layer::Paint */ {
+      expected_builder.Save();
+      {
+        expected_builder.ClipRect(layer_bounds, DlCanvas::ClipOp::kIntersect,
+                                  true);
+        expected_builder.SaveLayer(&child_bounds);
+        {
+          /* mock_layer::Paint */ {
+            expected_builder.DrawPath(child_path, child_paint);
+          }
+        }
+        expected_builder.Restore();
+      }
+      expected_builder.Restore();
+    }
+    EXPECT_TRUE(
+        DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
+  }
+
+  reset_display_list();
   layer->Paint(checkerboard_context());
-  EXPECT_EQ(
-      mock_canvas().draw_calls(),
-      std::vector(
-          {MockCanvas::DrawCall{0, MockCanvas::SaveData{1}},
-           MockCanvas::DrawCall{
-               1, MockCanvas::ClipRectData{layer_bounds, SkClipOp::kIntersect,
-                                           MockCanvas::kSoft_ClipEdgeStyle}},
-           MockCanvas::DrawCall{
-               1,
-               MockCanvas::SaveLayerData{child_bounds, SkPaint(), nullptr, 2}},
-           MockCanvas::DrawCall{
-               2, MockCanvas::DrawPathData{child_path, child_paint}},
-           // start DrawCheckerboard calls
-           MockCanvas::DrawCall{
-               2, MockCanvas::DrawRectData{child_bounds, checkerboard_paint()}},
-           // end DrawCheckerboard calls
-           MockCanvas::DrawCall{2, MockCanvas::RestoreData{1}},
-           MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
+  {
+    DisplayListBuilder expected_builder;
+    /* (ClipRect)layer::Paint */ {
+      expected_builder.Save();
+      {
+        expected_builder.ClipRect(layer_bounds, DlCanvas::ClipOp::kIntersect,
+                                  true);
+        expected_builder.SaveLayer(&child_bounds);
+        {
+          /* mock_layer::Paint */ {
+            expected_builder.DrawPath(child_path, child_paint);
+          }
+          expected_builder.DrawRect(child_path.getBounds(),
+                                    checkerboard_paint());
+        }
+        expected_builder.Restore();
+      }
+      expected_builder.Restore();
+    }
+    EXPECT_TRUE(
+        DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
+  }
 }
 
 TEST_F(CheckerBoardLayerTest, ClipPathSaveLayerCheckBoard) {
@@ -92,11 +101,11 @@ TEST_F(CheckerBoardLayerTest, ClipPathSaveLayerCheckBoard) {
   const SkPath child_path = SkPath().addRect(child_bounds);
   const SkPath layer_path =
       SkPath().addRect(layer_bounds).addRect(layer_bounds);
-  const SkPaint child_paint = SkPaint(SkColors::kYellow);
-  const SkPaint clip_paint;
+  const DlPaint child_paint = DlPaint(DlColor::kYellow());
+  const DlPaint clip_paint;
   auto mock_layer = std::make_shared<MockLayer>(child_path, child_paint);
-  auto layer =
-      std::make_shared<ClipPathLayer>(layer_path, Clip::antiAliasWithSaveLayer);
+  auto layer = std::make_shared<ClipPathLayer>(layer_path,
+                                               Clip::kAntiAliasWithSaveLayer);
   layer->Add(mock_layer);
 
   preroll_context()->state_stack.set_preroll_delegate(initial_matrix);
@@ -114,43 +123,52 @@ TEST_F(CheckerBoardLayerTest, ClipPathSaveLayerCheckBoard) {
   EXPECT_EQ(mock_layer->parent_matrix(), initial_matrix);
   EXPECT_EQ(mock_layer->parent_mutators(), std::vector({Mutator(layer_path)}));
 
-  layer->Paint(paint_context());
-  EXPECT_EQ(
-      mock_canvas().draw_calls(),
-      std::vector(
-          {MockCanvas::DrawCall{0, MockCanvas::SaveData{1}},
-           MockCanvas::DrawCall{
-               1, MockCanvas::ClipPathData{layer_path, SkClipOp::kIntersect,
-                                           MockCanvas::kSoft_ClipEdgeStyle}},
-           MockCanvas::DrawCall{
-               1,
-               MockCanvas::SaveLayerData{child_bounds, clip_paint, nullptr, 2}},
-           MockCanvas::DrawCall{
-               2, MockCanvas::DrawPathData{child_path, child_paint}},
-           MockCanvas::DrawCall{2, MockCanvas::RestoreData{1}},
-           MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
-
-  mock_canvas().reset_draw_calls();
-
+  layer->Paint(display_list_paint_context());
+  {
+    DisplayListBuilder expected_builder;
+    /* (ClipRect)layer::Paint */ {
+      expected_builder.Save();
+      {
+        expected_builder.ClipPath(layer_path, DlCanvas::ClipOp::kIntersect,
+                                  true);
+        expected_builder.SaveLayer(&child_bounds);
+        {
+          /* mock_layer::Paint */ {
+            expected_builder.DrawPath(child_path, child_paint);
+          }
+        }
+        expected_builder.Restore();
+      }
+      expected_builder.Restore();
+    }
+    EXPECT_TRUE(
+        DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
+  }
+
+  reset_display_list();
   layer->Paint(checkerboard_context());
-  EXPECT_EQ(
-      mock_canvas().draw_calls(),
-      std::vector(
-          {MockCanvas::DrawCall{0, MockCanvas::SaveData{1}},
-           MockCanvas::DrawCall{
-               1, MockCanvas::ClipPathData{layer_path, SkClipOp::kIntersect,
-                                           MockCanvas::kSoft_ClipEdgeStyle}},
-           MockCanvas::DrawCall{
-               1,
-               MockCanvas::SaveLayerData{child_bounds, clip_paint, nullptr, 2}},
-           MockCanvas::DrawCall{
-               2, MockCanvas::DrawPathData{child_path, child_paint}},
-           // start DrawCheckerboard calls
-           MockCanvas::DrawCall{
-               2, MockCanvas::DrawRectData{child_bounds, checkerboard_paint()}},
-           // end DrawCheckerboard calls
-           MockCanvas::DrawCall{2, MockCanvas::RestoreData{1}},
-           MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
+  {
+    DisplayListBuilder expected_builder;
+    /* (ClipRect)layer::Paint */ {
+      expected_builder.Save();
+      {
+        expected_builder.ClipPath(layer_path, DlCanvas::ClipOp::kIntersect,
+                                  true);
+        expected_builder.SaveLayer(&child_bounds);
+        {
+          /* mock_layer::Paint */ {
+            expected_builder.DrawPath(child_path, child_paint);
+          }
+          expected_builder.DrawRect(child_path.getBounds(),
+                                    checkerboard_paint());
+        }
+        expected_builder.Restore();
+      }
+      expected_builder.Restore();
+    }
+    EXPECT_TRUE(
+        DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
+  }
 }
 
 TEST_F(CheckerBoardLayerTest, ClipRRectSaveLayerCheckBoard) {
@@ -159,11 +177,11 @@ TEST_F(CheckerBoardLayerTest, ClipRRectSaveLayerCheckBoard) {
   const SkRect layer_bounds = SkRect::MakeXYWH(0.5, 1.0, 5.0, 6.0);
   const SkPath child_path = SkPath().addRect(child_bounds);
   const SkRRect layer_rrect = SkRRect::MakeRectXY(layer_bounds, .1, .1);
-  const SkPaint child_paint = SkPaint(SkColors::kYellow);
-  const SkPaint clip_paint;
+  const DlPaint child_paint = DlPaint(DlColor::kYellow());
+  const DlPaint clip_paint;
   auto mock_layer = std::make_shared<MockLayer>(child_path, child_paint);
   auto layer = std::make_shared<ClipRRectLayer>(layer_rrect,
-                                                Clip::antiAliasWithSaveLayer);
+                                                Clip::kAntiAliasWithSaveLayer);
   layer->Add(mock_layer);
 
   preroll_context()->state_stack.set_preroll_delegate(initial_matrix);
@@ -181,105 +199,52 @@ TEST_F(CheckerBoardLayerTest, ClipRRectSaveLayerCheckBoard) {
   EXPECT_EQ(mock_layer->parent_matrix(), initial_matrix);
   EXPECT_EQ(mock_layer->parent_mutators(), std::vector({Mutator(layer_rrect)}));
 
-  layer->Paint(paint_context());
-  EXPECT_EQ(
-      mock_canvas().draw_calls(),
-      std::vector(
-          {MockCanvas::DrawCall{0, MockCanvas::SaveData{1}},
-           MockCanvas::DrawCall{
-               1, MockCanvas::ClipRRectData{layer_rrect, SkClipOp::kIntersect,
-                                            MockCanvas::kSoft_ClipEdgeStyle}},
-           MockCanvas::DrawCall{
-               1,
-               MockCanvas::SaveLayerData{child_bounds, clip_paint, nullptr, 2}},
-           MockCanvas::DrawCall{
-               2, MockCanvas::DrawPathData{child_path, child_paint}},
-           MockCanvas::DrawCall{2, MockCanvas::RestoreData{1}},
-           MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
-
-  mock_canvas().reset_draw_calls();
-
-  layer->Paint(checkerboard_context());
-  EXPECT_EQ(
-      mock_canvas().draw_calls(),
-      std::vector(
-          {MockCanvas::DrawCall{0, MockCanvas::SaveData{1}},
-           MockCanvas::DrawCall{
-               1, MockCanvas::ClipRRectData{layer_rrect, SkClipOp::kIntersect,
-                                            MockCanvas::kSoft_ClipEdgeStyle}},
-           MockCanvas::DrawCall{
-               1,
-               MockCanvas::SaveLayerData{child_bounds, clip_paint, nullptr, 2}},
-           MockCanvas::DrawCall{
-               2, MockCanvas::DrawPathData{child_path, child_paint}},
-           // start DrawCheckerboard calls
-           MockCanvas::DrawCall{
-               2, MockCanvas::DrawRectData{child_bounds, checkerboard_paint()}},
-           // end DrawCheckerboard calls
-           MockCanvas::DrawCall{2, MockCanvas::RestoreData{1}},
-           MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
-}
-
-TEST_F(CheckerBoardLayerTest, PhysicalSaveLayerCheckBoard) {
-  constexpr float initial_elevation = 20.0f;
-  SkPath layer_path;
-  layer_path.addRect(0, 0, 8, 8).close();
-  auto layer = std::make_shared<PhysicalShapeLayer>(
-      SK_ColorGREEN, SK_ColorBLACK, initial_elevation, layer_path,
-      Clip::antiAliasWithSaveLayer);
-
-  layer->Preroll(preroll_context());
-  // The Fuchsia system compositor handles all elevated PhysicalShapeLayers and
-  // their shadows , so we do not do any painting there.
-  EXPECT_EQ(layer->paint_bounds(),
-            DisplayListCanvasDispatcher::ComputeShadowBounds(
-                layer_path, initial_elevation, 1.0f, SkMatrix()));
-  EXPECT_TRUE(layer->needs_painting(paint_context()));
-  EXPECT_EQ(layer->elevation(), initial_elevation);
-
-  const SkRect paint_bounds = SkRect::MakeXYWH(0, 0, 8, 8);
-  const SkPaint clip_paint;
-  SkPaint layer_paint;
-  layer_paint.setColor(SK_ColorGREEN);
-  layer_paint.setAntiAlias(true);
-  layer->Paint(paint_context());
-  EXPECT_EQ(
-      mock_canvas().draw_calls(),
-      std::vector(
-          {MockCanvas::DrawCall{0, MockCanvas::DrawShadowData{layer_path}},
-           MockCanvas::DrawCall{0, MockCanvas::SaveData{1}},
-           MockCanvas::DrawCall{
-               1, MockCanvas::ClipRectData{paint_bounds, SkClipOp::kIntersect,
-                                           MockCanvas::kSoft_ClipEdgeStyle}},
-           MockCanvas::DrawCall{
-               1, MockCanvas::SaveLayerData{layer->paint_bounds(), clip_paint,
-                                            nullptr, 2}},
-           MockCanvas::DrawCall{2, MockCanvas::DrawPaint{layer_paint}},
-           MockCanvas::DrawCall{2, MockCanvas::RestoreData{1}},
-           MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
-
-  mock_canvas().reset_draw_calls();
-
+  layer->Paint(display_list_paint_context());
+  {
+    DisplayListBuilder expected_builder;
+    /* (ClipRect)layer::Paint */ {
+      expected_builder.Save();
+      {
+        expected_builder.ClipRRect(layer_rrect, DlCanvas::ClipOp::kIntersect,
+                                   true);
+        expected_builder.SaveLayer(&child_bounds);
+        {
+          /* mock_layer::Paint */ {
+            expected_builder.DrawPath(child_path, child_paint);
+          }
+        }
+        expected_builder.Restore();
+      }
+      expected_builder.Restore();
+    }
+    EXPECT_TRUE(
+        DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
+  }
+
+  reset_display_list();
   layer->Paint(checkerboard_context());
-  EXPECT_EQ(
-      mock_canvas().draw_calls(),
-      std::vector(
-          {MockCanvas::DrawCall{0, MockCanvas::DrawShadowData{layer_path}},
-           MockCanvas::DrawCall{0, MockCanvas::SaveData{1}},
-           MockCanvas::DrawCall{
-               1, MockCanvas::ClipRectData{paint_bounds, SkClipOp::kIntersect,
-                                           MockCanvas::kSoft_ClipEdgeStyle}},
-           MockCanvas::DrawCall{
-               1, MockCanvas::SaveLayerData{layer->paint_bounds(), clip_paint,
-                                            nullptr, 2}},
-           MockCanvas::DrawCall{2, MockCanvas::DrawPaint{layer_paint}},
-           // start DrawCheckerboard calls
-           MockCanvas::DrawCall{2,
-                                MockCanvas::DrawRectData{layer->paint_bounds(),
-                                                         checkerboard_paint()}},
-           // end DrawCheckerboard calls
-           MockCanvas::DrawCall{2, MockCanvas::RestoreData{1}},
-           MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
+  {
+    DisplayListBuilder expected_builder;
+    /* (ClipRect)layer::Paint */ {
+      expected_builder.Save();
+      {
+        expected_builder.ClipRRect(layer_rrect, DlCanvas::ClipOp::kIntersect,
+                                   true);
+        expected_builder.SaveLayer(&child_bounds);
+        {
+          /* mock_layer::Paint */ {
+            expected_builder.DrawPath(child_path, child_paint);
+          }
+          expected_builder.DrawRect(child_path.getBounds(),
+                                    checkerboard_paint());
+        }
+        expected_builder.Restore();
+      }
+      expected_builder.Restore();
+    }
+    EXPECT_TRUE(
+        DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
+  }
 }
 
 #endif
diff --git a/flow/layers/clip_path_layer.cc b/flow/layers/clip_path_layer.cc
index 5a8961fced9c66cf52c27f4805d0747cdb610cbf..acd633a7073c067dfaf1a7cdb615ff83207e9aa6 100644
--- a/flow/layers/clip_path_layer.cc
+++ b/flow/layers/clip_path_layer.cc
@@ -14,7 +14,7 @@ const SkRect& ClipPathLayer::clip_shape_bounds() const {
 }
 
 void ClipPathLayer::ApplyClip(LayerStateStack::MutatorContext& mutator) const {
-  mutator.clipPath(clip_shape(), clip_behavior() != Clip::hardEdge);
+  mutator.clipPath(clip_shape(), clip_behavior() != Clip::kHardEdge);
 }
 
 }  // namespace flutter
diff --git a/flow/layers/clip_path_layer.h b/flow/layers/clip_path_layer.h
index 5a1cbffcb6f927e484a330d578e27711c9de0419..e183a48fd82baef59f6e6ea48b67752ebaa81d2b 100644
--- a/flow/layers/clip_path_layer.h
+++ b/flow/layers/clip_path_layer.h
@@ -12,7 +12,7 @@ namespace flutter {
 class ClipPathLayer : public ClipShapeLayer<SkPath> {
  public:
   explicit ClipPathLayer(const SkPath& clip_path,
-                         Clip clip_behavior = Clip::antiAlias);
+                         Clip clip_behavior = Clip::kAntiAlias);
 
  protected:
   const SkRect& clip_shape_bounds() const override;
diff --git a/flow/layers/clip_path_layer_unittests.cc b/flow/layers/clip_path_layer_unittests.cc
index 2b1ddad6c701bf4479f28d92a622e52b5171b9ac..62ce30ce91f7cb41cea9a1e904a88543692f9620 100644
--- a/flow/layers/clip_path_layer_unittests.cc
+++ b/flow/layers/clip_path_layer_unittests.cc
@@ -11,25 +11,27 @@
 #include "flutter/flow/testing/layer_test.h"
 #include "flutter/flow/testing/mock_embedder.h"
 #include "flutter/flow/testing/mock_layer.h"
-#include "flutter/fml/macros.h"
-#include "flutter/testing/mock_canvas.h"
 #include "gtest/gtest.h"
-#include "include/core/SkPaint.h"
+
+// TODO(zanderso): https://github.com/flutter/flutter/issues/127701
+// NOLINTBEGIN(bugprone-unchecked-optional-access)
 
 namespace flutter {
 namespace testing {
 
 using ClipPathLayerTest = LayerTest;
 
+using ClipOp = DlCanvas::ClipOp;
+
 #ifndef NDEBUG
 TEST_F(ClipPathLayerTest, ClipNoneBehaviorDies) {
   EXPECT_DEATH_IF_SUPPORTED(
-      auto clip = std::make_shared<ClipPathLayer>(SkPath(), Clip::none),
-      "clip_behavior != Clip::none");
+      auto clip = std::make_shared<ClipPathLayer>(SkPath(), Clip::kNone),
+      "clip_behavior != Clip::kNone");
 }
 
 TEST_F(ClipPathLayerTest, PaintingEmptyLayerDies) {
-  auto layer = std::make_shared<ClipPathLayer>(SkPath(), Clip::hardEdge);
+  auto layer = std::make_shared<ClipPathLayer>(SkPath(), Clip::kHardEdge);
 
   layer->Preroll(preroll_context());
 
@@ -48,7 +50,7 @@ TEST_F(ClipPathLayerTest, PaintingEmptyLayerDies) {
 TEST_F(ClipPathLayerTest, PaintBeforePrerollDies) {
   const SkRect layer_bounds = SkRect::MakeXYWH(0.5, 1.0, 5.0, 6.0);
   const SkPath layer_path = SkPath().addRect(layer_bounds);
-  auto layer = std::make_shared<ClipPathLayer>(layer_path, Clip::hardEdge);
+  auto layer = std::make_shared<ClipPathLayer>(layer_path, Clip::kHardEdge);
   EXPECT_EQ(layer->paint_bounds(), kEmptyRect);
   EXPECT_EQ(layer->child_paint_bounds(), kEmptyRect);
   EXPECT_FALSE(layer->needs_painting(paint_context()));
@@ -65,7 +67,7 @@ TEST_F(ClipPathLayerTest, PaintingCulledLayerDies) {
   const SkPath child_path = SkPath().addRect(child_bounds);
   const SkPath layer_path = SkPath().addRect(layer_bounds);
   auto mock_layer = std::make_shared<MockLayer>(child_path);
-  auto layer = std::make_shared<ClipPathLayer>(layer_path, Clip::hardEdge);
+  auto layer = std::make_shared<ClipPathLayer>(layer_path, Clip::kHardEdge);
   layer->Add(mock_layer);
 
   // Cull these children
@@ -103,9 +105,9 @@ TEST_F(ClipPathLayerTest, ChildOutsideBounds) {
   const SkRect clip_bounds = SkRect::MakeXYWH(0.5, 1.0, 5.0, 6.0);
   const SkPath child_path = SkPath().addRect(child_bounds);
   const SkPath clip_path = SkPath().addRect(clip_bounds);
-  const SkPaint child_paint = SkPaint(SkColors::kYellow);
+  const DlPaint child_paint = DlPaint(DlColor::kYellow());
   auto mock_layer = std::make_shared<MockLayer>(child_path, child_paint);
-  auto layer = std::make_shared<ClipPathLayer>(clip_path, Clip::hardEdge);
+  auto layer = std::make_shared<ClipPathLayer>(clip_path, Clip::kHardEdge);
   layer->Add(mock_layer);
 
   SkRect clip_cull_rect = local_cull_bounds;
@@ -116,8 +118,8 @@ TEST_F(ClipPathLayerTest, ChildOutsideBounds) {
   // Set up both contexts to cull clipped child
   preroll_context()->state_stack.set_preroll_delegate(device_cull_bounds,
                                                       initial_matrix);
-  paint_context().canvas->clipRect(device_cull_bounds);
-  paint_context().canvas->concat(initial_matrix);
+  paint_context().canvas->ClipRect(device_cull_bounds);
+  paint_context().canvas->Transform(initial_matrix);
 
   layer->Preroll(preroll_context());
   // Untouched
@@ -144,11 +146,13 @@ TEST_F(ClipPathLayerTest, FullyContainedChild) {
   const SkMatrix initial_matrix = SkMatrix::Translate(0.5f, 1.0f);
   const SkRect child_bounds = SkRect::MakeXYWH(1.0, 2.0, 2.0, 2.0);
   const SkRect layer_bounds = SkRect::MakeXYWH(0.5, 1.0, 5.0, 6.0);
-  const SkPath child_path = SkPath().addRect(child_bounds);
-  const SkPath layer_path = SkPath().addRect(layer_bounds);
-  const SkPaint child_paint = SkPaint(SkColors::kYellow);
+  const SkPath child_path =
+      SkPath().addRect(child_bounds).addOval(child_bounds.makeInset(0.1, 0.1));
+  const SkPath layer_path =
+      SkPath().addRect(layer_bounds).addOval(layer_bounds.makeInset(0.1, 0.1));
+  const DlPaint child_paint = DlPaint(DlColor::kYellow());
   auto mock_layer = std::make_shared<MockLayer>(child_path, child_paint);
-  auto layer = std::make_shared<ClipPathLayer>(layer_path, Clip::hardEdge);
+  auto layer = std::make_shared<ClipPathLayer>(layer_path, Clip::kHardEdge);
   layer->Add(mock_layer);
 
   preroll_context()->state_stack.set_preroll_delegate(initial_matrix);
@@ -167,17 +171,19 @@ TEST_F(ClipPathLayerTest, FullyContainedChild) {
   EXPECT_EQ(mock_layer->parent_matrix(), initial_matrix);
   EXPECT_EQ(mock_layer->parent_mutators(), std::vector({Mutator(layer_path)}));
 
-  layer->Paint(paint_context());
-  EXPECT_EQ(
-      mock_canvas().draw_calls(),
-      std::vector(
-          {MockCanvas::DrawCall{0, MockCanvas::SaveData{1}},
-           MockCanvas::DrawCall{
-               1, MockCanvas::ClipRectData{layer_bounds, SkClipOp::kIntersect,
-                                           MockCanvas::kHard_ClipEdgeStyle}},
-           MockCanvas::DrawCall{
-               1, MockCanvas::DrawPathData{child_path, child_paint}},
-           MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
+  layer->Paint(display_list_paint_context());
+  DisplayListBuilder expected_builder;
+  /* (ClipPath)layer::Paint */ {
+    expected_builder.Save();
+    {
+      expected_builder.ClipPath(layer_path);
+      /* mock_layer::Paint */ {
+        expected_builder.DrawPath(child_path, child_paint);
+      }
+    }
+    expected_builder.Restore();
+  }
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
 }
 
 TEST_F(ClipPathLayerTest, PartiallyContainedChild) {
@@ -186,11 +192,13 @@ TEST_F(ClipPathLayerTest, PartiallyContainedChild) {
   const SkRect device_cull_bounds = initial_matrix.mapRect(local_cull_bounds);
   const SkRect child_bounds = SkRect::MakeXYWH(2.5, 5.0, 4.5, 4.0);
   const SkRect clip_bounds = SkRect::MakeXYWH(0.5, 1.0, 5.0, 6.0);
-  const SkPath child_path = SkPath().addRect(child_bounds);
-  const SkPath clip_path = SkPath().addRect(clip_bounds);
-  const SkPaint child_paint = SkPaint(SkColors::kYellow);
+  const SkPath child_path =
+      SkPath().addRect(child_bounds).addOval(child_bounds.makeInset(0.1, 0.1));
+  const SkPath clip_path =
+      SkPath().addRect(clip_bounds).addOval(clip_bounds.makeInset(0.1, 0.1));
+  const DlPaint child_paint = DlPaint(DlColor::kYellow());
   auto mock_layer = std::make_shared<MockLayer>(child_path, child_paint);
-  auto layer = std::make_shared<ClipPathLayer>(clip_path, Clip::hardEdge);
+  auto layer = std::make_shared<ClipPathLayer>(clip_path, Clip::kHardEdge);
   layer->Add(mock_layer);
 
   SkRect clip_cull_rect = local_cull_bounds;
@@ -219,17 +227,19 @@ TEST_F(ClipPathLayerTest, PartiallyContainedChild) {
   EXPECT_EQ(mock_layer->parent_matrix(), initial_matrix);
   EXPECT_EQ(mock_layer->parent_mutators(), std::vector({Mutator(clip_path)}));
 
-  layer->Paint(paint_context());
-  EXPECT_EQ(
-      mock_canvas().draw_calls(),
-      std::vector(
-          {MockCanvas::DrawCall{0, MockCanvas::SaveData{1}},
-           MockCanvas::DrawCall{
-               1, MockCanvas::ClipRectData{clip_bounds, SkClipOp::kIntersect,
-                                           MockCanvas::kHard_ClipEdgeStyle}},
-           MockCanvas::DrawCall{
-               1, MockCanvas::DrawPathData{child_path, child_paint}},
-           MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
+  layer->Paint(display_list_paint_context());
+  DisplayListBuilder expected_builder;
+  /* (ClipPath)layer::Paint */ {
+    expected_builder.Save();
+    {
+      expected_builder.ClipPath(clip_path);
+      /* mock_layer::Paint */ {
+        expected_builder.DrawPath(child_path, child_paint);
+      }
+    }
+    expected_builder.Restore();
+  }
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
 }
 
 static bool ReadbackResult(PrerollContext* context,
@@ -250,11 +260,11 @@ static bool ReadbackResult(PrerollContext* context,
 TEST_F(ClipPathLayerTest, Readback) {
   PrerollContext* context = preroll_context();
   SkPath path;
-  SkPaint paint;
+  DlPaint paint;
 
-  const Clip hard = Clip::hardEdge;
-  const Clip soft = Clip::antiAlias;
-  const Clip save_layer = Clip::antiAliasWithSaveLayer;
+  const Clip hard = Clip::kHardEdge;
+  const Clip soft = Clip::kAntiAlias;
+  const Clip save_layer = Clip::kAntiAliasWithSaveLayer;
 
   std::shared_ptr<MockLayer> nochild;
   auto reader = std::make_shared<MockLayer>(path, paint);
@@ -299,7 +309,7 @@ TEST_F(ClipPathLayerTest, OpacityInheritance) {
                         .addRect(SkRect::MakeLTRB(5, 5, 25, 25))
                         .addOval(SkRect::MakeLTRB(20, 20, 40, 50));
   auto clip_path_layer =
-      std::make_shared<ClipPathLayer>(layer_clip, Clip::hardEdge);
+      std::make_shared<ClipPathLayer>(layer_clip, Clip::kHardEdge);
   clip_path_layer->Add(mock1);
 
   // ClipRectLayer will pass through compatibility from a compatible child
@@ -330,7 +340,7 @@ TEST_F(ClipPathLayerTest, OpacityInheritance) {
   {
     // ClipRectLayer(aa with saveLayer) will always be compatible
     auto clip_path_savelayer = std::make_shared<ClipPathLayer>(
-        layer_clip, Clip::antiAliasWithSaveLayer);
+        layer_clip, Clip::kAntiAliasWithSaveLayer);
     clip_path_savelayer->Add(mock1);
     clip_path_savelayer->Add(mock2);
 
@@ -351,7 +361,7 @@ TEST_F(ClipPathLayerTest, OpacityInheritance) {
   {
     // ClipRectLayer with incompatible child will not be compatible
     auto clip_path_bad_child =
-        std::make_shared<ClipPathLayer>(layer_clip, Clip::hardEdge);
+        std::make_shared<ClipPathLayer>(layer_clip, Clip::kHardEdge);
     clip_path_bad_child->Add(mock1);
     clip_path_bad_child->Add(mock2);
 
@@ -371,7 +381,7 @@ TEST_F(ClipPathLayerTest, OpacityInheritance) {
   {
     // ClipRectLayer(aa with saveLayer) will always be compatible
     auto clip_path_savelayer_bad_child = std::make_shared<ClipPathLayer>(
-        layer_clip, Clip::antiAliasWithSaveLayer);
+        layer_clip, Clip::kAntiAliasWithSaveLayer);
     clip_path_savelayer_bad_child->Add(mock1);
     clip_path_savelayer_bad_child->Add(mock2);
 
@@ -395,7 +405,7 @@ TEST_F(ClipPathLayerTest, OpacityInheritancePainting) {
                         .addRect(SkRect::MakeLTRB(5, 5, 25, 25))
                         .addOval(SkRect::MakeLTRB(45, 45, 55, 55));
   auto clip_path_layer =
-      std::make_shared<ClipPathLayer>(layer_clip, Clip::antiAlias);
+      std::make_shared<ClipPathLayer>(layer_clip, Clip::kAntiAlias);
   clip_path_layer->Add(mock1);
   clip_path_layer->Add(mock2);
 
@@ -415,22 +425,22 @@ TEST_F(ClipPathLayerTest, OpacityInheritancePainting) {
 
   DisplayListBuilder expected_builder;
   /* OpacityLayer::Paint() */ {
-    expected_builder.save();
+    expected_builder.Save();
     {
-      expected_builder.translate(offset.fX, offset.fY);
+      expected_builder.Translate(offset.fX, offset.fY);
       /* ClipRectLayer::Paint() */ {
-        expected_builder.save();
-        expected_builder.clipPath(layer_clip, SkClipOp::kIntersect, true);
+        expected_builder.Save();
+        expected_builder.ClipPath(layer_clip, ClipOp::kIntersect, true);
         /* child layer1 paint */ {
-          expected_builder.drawPath(path1, DlPaint().setAlpha(opacity_alpha));
+          expected_builder.DrawPath(path1, DlPaint().setAlpha(opacity_alpha));
         }
         /* child layer2 paint */ {
-          expected_builder.drawPath(path2, DlPaint().setAlpha(opacity_alpha));
+          expected_builder.DrawPath(path2, DlPaint().setAlpha(opacity_alpha));
         }
-        expected_builder.restore();
+        expected_builder.Restore();
       }
     }
-    expected_builder.restore();
+    expected_builder.Restore();
   }
 
   opacity_layer->Paint(display_list_paint_context());
@@ -447,8 +457,8 @@ TEST_F(ClipPathLayerTest, OpacityInheritanceSaveLayerPainting) {
   auto layer_clip = SkPath()
                         .addRect(SkRect::MakeLTRB(5, 5, 25, 25))
                         .addOval(SkRect::MakeLTRB(20, 20, 40, 50));
-  auto clip_path_layer =
-      std::make_shared<ClipPathLayer>(layer_clip, Clip::antiAliasWithSaveLayer);
+  auto clip_path_layer = std::make_shared<ClipPathLayer>(
+      layer_clip, Clip::kAntiAliasWithSaveLayer);
   clip_path_layer->Add(mock1);
   clip_path_layer->Add(mock2);
 
@@ -467,25 +477,24 @@ TEST_F(ClipPathLayerTest, OpacityInheritanceSaveLayerPainting) {
 
   DisplayListBuilder expected_builder;
   /* OpacityLayer::Paint() */ {
-    expected_builder.save();
+    expected_builder.Save();
     {
-      expected_builder.translate(offset.fX, offset.fY);
+      expected_builder.Translate(offset.fX, offset.fY);
       /* ClipRectLayer::Paint() */ {
-        expected_builder.save();
-        expected_builder.clipPath(layer_clip, SkClipOp::kIntersect, true);
-        expected_builder.setColor(opacity_alpha << 24);
-        expected_builder.saveLayer(&children_bounds, true);
+        expected_builder.Save();
+        expected_builder.ClipPath(layer_clip, ClipOp::kIntersect, true);
+        expected_builder.SaveLayer(&children_bounds,
+                                   &DlPaint().setAlpha(opacity_alpha));
         /* child layer1 paint */ {
-          expected_builder.setColor(0xFF000000);
-          expected_builder.drawPath(path1);
+          expected_builder.DrawPath(path1, DlPaint());
         }
         /* child layer2 paint */ {  //
-          expected_builder.drawPath(path2);
+          expected_builder.DrawPath(path2, DlPaint());
         }
-        expected_builder.restore();
+        expected_builder.Restore();
       }
     }
-    expected_builder.restore();
+    expected_builder.Restore();
   }
 
   opacity_layer->Paint(display_list_paint_context());
@@ -498,14 +507,14 @@ TEST_F(ClipPathLayerTest, LayerCached) {
   auto layer_clip = SkPath()
                         .addRect(SkRect::MakeLTRB(5, 5, 25, 25))
                         .addOval(SkRect::MakeLTRB(20, 20, 40, 50));
-  auto layer =
-      std::make_shared<ClipPathLayer>(layer_clip, Clip::antiAliasWithSaveLayer);
+  auto layer = std::make_shared<ClipPathLayer>(layer_clip,
+                                               Clip::kAntiAliasWithSaveLayer);
   layer->Add(mock1);
 
   auto initial_transform = SkMatrix::Translate(50.0, 25.5);
   SkMatrix cache_ctm = initial_transform;
-  SkCanvas cache_canvas;
-  cache_canvas.setMatrix(cache_ctm);
+  DisplayListBuilder cache_canvas;
+  cache_canvas.Transform(cache_ctm);
 
   use_mock_raster_cache();
   preroll_context()->state_stack.set_preroll_delegate(initial_transform);
@@ -530,7 +539,7 @@ TEST_F(ClipPathLayerTest, LayerCached) {
   EXPECT_EQ(raster_cache()->GetLayerCachedEntriesCount(), (size_t)1);
   EXPECT_EQ(clip_cache_item->cache_state(),
             RasterCacheItem::CacheState::kCurrent);
-  SkPaint paint;
+  DlPaint paint;
   EXPECT_TRUE(raster_cache()->Draw(clip_cache_item->GetId().value(),
                                    cache_canvas, &paint));
 }
@@ -543,13 +552,13 @@ TEST_F(ClipPathLayerTest, EmptyClipDoesNotCullPlatformView) {
       std::make_shared<PlatformViewLayer>(view_offset, view_size, view_id);
 
   auto layer_clip = SkPath().addRect(kEmptyRect);
-  auto clip =
-      std::make_shared<ClipPathLayer>(layer_clip, Clip::antiAliasWithSaveLayer);
+  auto clip = std::make_shared<ClipPathLayer>(layer_clip,
+                                              Clip::kAntiAliasWithSaveLayer);
   clip->Add(platform_view);
 
   auto embedder = MockViewEmbedder();
-  SkCanvas fake_overlay_canvas;
-  embedder.AddCanvas(&fake_overlay_canvas);
+  DisplayListBuilder fake_overlay_builder;
+  embedder.AddCanvas(&fake_overlay_builder);
   preroll_context()->view_embedder = &embedder;
   paint_context().view_embedder = &embedder;
 
@@ -562,3 +571,5 @@ TEST_F(ClipPathLayerTest, EmptyClipDoesNotCullPlatformView) {
 
 }  // namespace testing
 }  // namespace flutter
+
+// NOLINTEND(bugprone-unchecked-optional-access)
diff --git a/flow/layers/clip_rect_layer.cc b/flow/layers/clip_rect_layer.cc
index b141ec83e3a010573accff62dff00c5f1f1d3925..dfb0293f76c428c2dcb0cca5b7d34ab2e7624a50 100644
--- a/flow/layers/clip_rect_layer.cc
+++ b/flow/layers/clip_rect_layer.cc
@@ -14,7 +14,7 @@ const SkRect& ClipRectLayer::clip_shape_bounds() const {
 }
 
 void ClipRectLayer::ApplyClip(LayerStateStack::MutatorContext& mutator) const {
-  mutator.clipRect(clip_shape(), clip_behavior() != Clip::hardEdge);
+  mutator.clipRect(clip_shape(), clip_behavior() != Clip::kHardEdge);
 }
 
 }  // namespace flutter
diff --git a/flow/layers/clip_rect_layer_unittests.cc b/flow/layers/clip_rect_layer_unittests.cc
index 5363539290cd8943c42d14cddb9a0480558e6ec2..c1d0d80a2b57e97c1354cbc7bb595e7980ae9459 100644
--- a/flow/layers/clip_rect_layer_unittests.cc
+++ b/flow/layers/clip_rect_layer_unittests.cc
@@ -11,22 +11,26 @@
 #include "flutter/flow/testing/mock_embedder.h"
 #include "flutter/flow/testing/mock_layer.h"
 #include "flutter/fml/macros.h"
-#include "flutter/testing/mock_canvas.h"
+
+// TODO(zanderso): https://github.com/flutter/flutter/issues/127701
+// NOLINTBEGIN(bugprone-unchecked-optional-access)
 
 namespace flutter {
 namespace testing {
 
 using ClipRectLayerTest = LayerTest;
 
+using ClipOp = DlCanvas::ClipOp;
+
 #ifndef NDEBUG
 TEST_F(ClipRectLayerTest, ClipNoneBehaviorDies) {
   EXPECT_DEATH_IF_SUPPORTED(
-      auto clip = std::make_shared<ClipRectLayer>(kEmptyRect, Clip::none),
-      "clip_behavior != Clip::none");
+      auto clip = std::make_shared<ClipRectLayer>(kEmptyRect, Clip::kNone),
+      "clip_behavior != Clip::kNone");
 }
 
 TEST_F(ClipRectLayerTest, PaintingEmptyLayerDies) {
-  auto layer = std::make_shared<ClipRectLayer>(kEmptyRect, Clip::hardEdge);
+  auto layer = std::make_shared<ClipRectLayer>(kEmptyRect, Clip::kHardEdge);
 
   layer->Preroll(preroll_context());
 
@@ -44,7 +48,7 @@ TEST_F(ClipRectLayerTest, PaintingEmptyLayerDies) {
 
 TEST_F(ClipRectLayerTest, PaintBeforePrerollDies) {
   const SkRect layer_bounds = SkRect::MakeXYWH(0.5, 1.0, 5.0, 6.0);
-  auto layer = std::make_shared<ClipRectLayer>(layer_bounds, Clip::hardEdge);
+  auto layer = std::make_shared<ClipRectLayer>(layer_bounds, Clip::kHardEdge);
   EXPECT_EQ(layer->paint_bounds(), kEmptyRect);
   EXPECT_EQ(layer->child_paint_bounds(), kEmptyRect);
   EXPECT_FALSE(layer->needs_painting(paint_context()));
@@ -60,7 +64,7 @@ TEST_F(ClipRectLayerTest, PaintingCulledLayerDies) {
   const SkRect distant_bounds = SkRect::MakeXYWH(100.0, 100.0, 10.0, 10.0);
   const SkPath child_path = SkPath().addRect(child_bounds);
   auto mock_layer = std::make_shared<MockLayer>(child_path);
-  auto layer = std::make_shared<ClipRectLayer>(layer_bounds, Clip::hardEdge);
+  auto layer = std::make_shared<ClipRectLayer>(layer_bounds, Clip::kHardEdge);
   layer->Add(mock_layer);
 
   // Cull these children
@@ -98,9 +102,9 @@ TEST_F(ClipRectLayerTest, ChildOutsideBounds) {
   const SkRect child_bounds = SkRect::MakeXYWH(2.5, 5.0, 4.5, 4.0);
   const SkRect clip_rect = SkRect::MakeXYWH(0.5, 1.0, 5.0, 6.0);
   const SkPath child_path = SkPath().addRect(child_bounds);
-  const SkPaint child_paint = SkPaint(SkColors::kYellow);
+  const DlPaint child_paint = DlPaint(DlColor::kYellow());
   auto mock_layer = std::make_shared<MockLayer>(child_path, child_paint);
-  auto layer = std::make_shared<ClipRectLayer>(clip_rect, Clip::hardEdge);
+  auto layer = std::make_shared<ClipRectLayer>(clip_rect, Clip::kHardEdge);
   layer->Add(mock_layer);
 
   SkRect clip_cull_rect = local_cull_bounds;
@@ -111,8 +115,8 @@ TEST_F(ClipRectLayerTest, ChildOutsideBounds) {
   // Set up both contexts to cull clipped child
   preroll_context()->state_stack.set_preroll_delegate(device_cull_bounds,
                                                       initial_matrix);
-  paint_context().canvas->clipRect(device_cull_bounds);
-  paint_context().canvas->concat(initial_matrix);
+  paint_context().canvas->ClipRect(device_cull_bounds);
+  paint_context().canvas->Transform(initial_matrix);
 
   layer->Preroll(preroll_context());
   // Untouched
@@ -140,9 +144,9 @@ TEST_F(ClipRectLayerTest, FullyContainedChild) {
   const SkRect child_bounds = SkRect::MakeXYWH(1.0, 2.0, 2.0, 2.0);
   const SkRect layer_bounds = SkRect::MakeXYWH(0.5, 1.0, 5.0, 6.0);
   const SkPath child_path = SkPath().addRect(child_bounds);
-  const SkPaint child_paint = SkPaint(SkColors::kYellow);
+  const DlPaint child_paint = DlPaint(DlColor::kYellow());
   auto mock_layer = std::make_shared<MockLayer>(child_path, child_paint);
-  auto layer = std::make_shared<ClipRectLayer>(layer_bounds, Clip::hardEdge);
+  auto layer = std::make_shared<ClipRectLayer>(layer_bounds, Clip::kHardEdge);
   layer->Add(mock_layer);
 
   preroll_context()->state_stack.set_preroll_delegate(initial_matrix);
@@ -162,17 +166,19 @@ TEST_F(ClipRectLayerTest, FullyContainedChild) {
   EXPECT_EQ(mock_layer->parent_mutators(),
             std::vector({Mutator(layer_bounds)}));
 
-  layer->Paint(paint_context());
-  EXPECT_EQ(
-      mock_canvas().draw_calls(),
-      std::vector(
-          {MockCanvas::DrawCall{0, MockCanvas::SaveData{1}},
-           MockCanvas::DrawCall{
-               1, MockCanvas::ClipRectData{layer_bounds, SkClipOp::kIntersect,
-                                           MockCanvas::kHard_ClipEdgeStyle}},
-           MockCanvas::DrawCall{
-               1, MockCanvas::DrawPathData{child_path, child_paint}},
-           MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
+  layer->Paint(display_list_paint_context());
+  DisplayListBuilder expected_builder;
+  /* (ClipRect)layer::Paint */ {
+    expected_builder.Save();
+    {
+      expected_builder.ClipRect(layer_bounds);
+      /* mock_layer::Paint */ {
+        expected_builder.DrawPath(child_path, child_paint);
+      }
+    }
+    expected_builder.Restore();
+  }
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
 }
 
 TEST_F(ClipRectLayerTest, PartiallyContainedChild) {
@@ -182,9 +188,9 @@ TEST_F(ClipRectLayerTest, PartiallyContainedChild) {
   const SkRect child_bounds = SkRect::MakeXYWH(2.5, 5.0, 4.5, 4.0);
   const SkRect clip_rect = SkRect::MakeXYWH(0.5, 1.0, 5.0, 6.0);
   const SkPath child_path = SkPath().addRect(child_bounds);
-  const SkPaint child_paint = SkPaint(SkColors::kYellow);
+  const DlPaint child_paint = DlPaint(DlColor::kYellow());
   auto mock_layer = std::make_shared<MockLayer>(child_path, child_paint);
-  auto layer = std::make_shared<ClipRectLayer>(clip_rect, Clip::hardEdge);
+  auto layer = std::make_shared<ClipRectLayer>(clip_rect, Clip::kHardEdge);
   layer->Add(mock_layer);
 
   SkRect clip_cull_rect = clip_rect;
@@ -211,17 +217,19 @@ TEST_F(ClipRectLayerTest, PartiallyContainedChild) {
   EXPECT_EQ(mock_layer->parent_matrix(), initial_matrix);
   EXPECT_EQ(mock_layer->parent_mutators(), std::vector({Mutator(clip_rect)}));
 
-  layer->Paint(paint_context());
-  EXPECT_EQ(
-      mock_canvas().draw_calls(),
-      std::vector(
-          {MockCanvas::DrawCall{0, MockCanvas::SaveData{1}},
-           MockCanvas::DrawCall{
-               1, MockCanvas::ClipRectData{clip_rect, SkClipOp::kIntersect,
-                                           MockCanvas::kHard_ClipEdgeStyle}},
-           MockCanvas::DrawCall{
-               1, MockCanvas::DrawPathData{child_path, child_paint}},
-           MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
+  layer->Paint(display_list_paint_context());
+  DisplayListBuilder expected_builder;
+  /* (ClipRect)layer::Paint */ {
+    expected_builder.Save();
+    {
+      expected_builder.ClipRect(clip_rect);
+      /* mock_layer::Paint */ {
+        expected_builder.DrawPath(child_path, child_paint);
+      }
+    }
+    expected_builder.Restore();
+  }
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
 }
 
 static bool ReadbackResult(PrerollContext* context,
@@ -241,11 +249,11 @@ static bool ReadbackResult(PrerollContext* context,
 TEST_F(ClipRectLayerTest, Readback) {
   PrerollContext* context = preroll_context();
   SkPath path;
-  SkPaint paint;
+  DlPaint paint;
 
-  const Clip hard = Clip::hardEdge;
-  const Clip soft = Clip::antiAlias;
-  const Clip save_layer = Clip::antiAliasWithSaveLayer;
+  const Clip hard = Clip::kHardEdge;
+  const Clip soft = Clip::kAntiAlias;
+  const Clip save_layer = Clip::kAntiAliasWithSaveLayer;
 
   std::shared_ptr<MockLayer> nochild;
   auto reader = std::make_shared<MockLayer>(path, paint);
@@ -288,7 +296,7 @@ TEST_F(ClipRectLayerTest, OpacityInheritance) {
   auto mock1 = MockLayer::MakeOpacityCompatible(path1);
   SkRect clip_rect = SkRect::MakeWH(500, 500);
   auto clip_rect_layer =
-      std::make_shared<ClipRectLayer>(clip_rect, Clip::hardEdge);
+      std::make_shared<ClipRectLayer>(clip_rect, Clip::kHardEdge);
   clip_rect_layer->Add(mock1);
 
   // ClipRectLayer will pass through compatibility from a compatible child
@@ -319,7 +327,7 @@ TEST_F(ClipRectLayerTest, OpacityInheritance) {
   {
     // ClipRectLayer(aa with saveLayer) will always be compatible
     auto clip_path_savelayer = std::make_shared<ClipRectLayer>(
-        clip_rect, Clip::antiAliasWithSaveLayer);
+        clip_rect, Clip::kAntiAliasWithSaveLayer);
     clip_path_savelayer->Add(mock1);
     clip_path_savelayer->Add(mock2);
 
@@ -340,7 +348,7 @@ TEST_F(ClipRectLayerTest, OpacityInheritance) {
   {
     // ClipRectLayer with incompatible child will not be compatible
     auto clip_rect_bad_child =
-        std::make_shared<ClipRectLayer>(clip_rect, Clip::hardEdge);
+        std::make_shared<ClipRectLayer>(clip_rect, Clip::kHardEdge);
     clip_rect_bad_child->Add(mock1);
     clip_rect_bad_child->Add(mock2);
 
@@ -360,7 +368,7 @@ TEST_F(ClipRectLayerTest, OpacityInheritance) {
   {
     // ClipRectLayer(aa with saveLayer) will always be compatible
     auto clip_path_savelayer_bad_child = std::make_shared<ClipRectLayer>(
-        clip_rect, Clip::antiAliasWithSaveLayer);
+        clip_rect, Clip::kAntiAliasWithSaveLayer);
     clip_path_savelayer_bad_child->Add(mock1);
     clip_path_savelayer_bad_child->Add(mock2);
 
@@ -382,7 +390,7 @@ TEST_F(ClipRectLayerTest, OpacityInheritancePainting) {
   auto mock2 = MockLayer::MakeOpacityCompatible(path2);
   SkRect clip_rect = SkRect::MakeWH(500, 500);
   auto clip_rect_layer =
-      std::make_shared<ClipRectLayer>(clip_rect, Clip::antiAlias);
+      std::make_shared<ClipRectLayer>(clip_rect, Clip::kAntiAlias);
   clip_rect_layer->Add(mock1);
   clip_rect_layer->Add(mock2);
 
@@ -402,22 +410,22 @@ TEST_F(ClipRectLayerTest, OpacityInheritancePainting) {
 
   DisplayListBuilder expected_builder;
   /* OpacityLayer::Paint() */ {
-    expected_builder.save();
+    expected_builder.Save();
     {
-      expected_builder.translate(offset.fX, offset.fY);
+      expected_builder.Translate(offset.fX, offset.fY);
       /* ClipRectLayer::Paint() */ {
-        expected_builder.save();
-        expected_builder.clipRect(clip_rect, SkClipOp::kIntersect, true);
+        expected_builder.Save();
+        expected_builder.ClipRect(clip_rect, ClipOp::kIntersect, true);
         /* child layer1 paint */ {
-          expected_builder.drawPath(path1, DlPaint().setAlpha(opacity_alpha));
+          expected_builder.DrawPath(path1, DlPaint().setAlpha(opacity_alpha));
         }
         /* child layer2 paint */ {
-          expected_builder.drawPath(path2, DlPaint().setAlpha(opacity_alpha));
+          expected_builder.DrawPath(path2, DlPaint().setAlpha(opacity_alpha));
         }
-        expected_builder.restore();
+        expected_builder.Restore();
       }
     }
-    expected_builder.restore();
+    expected_builder.Restore();
   }
 
   opacity_layer->Paint(display_list_paint_context());
@@ -433,7 +441,7 @@ TEST_F(ClipRectLayerTest, OpacityInheritanceSaveLayerPainting) {
   children_bounds.join(path2.getBounds());
   SkRect clip_rect = SkRect::MakeWH(500, 500);
   auto clip_rect_layer =
-      std::make_shared<ClipRectLayer>(clip_rect, Clip::antiAliasWithSaveLayer);
+      std::make_shared<ClipRectLayer>(clip_rect, Clip::kAntiAliasWithSaveLayer);
   clip_rect_layer->Add(mock1);
   clip_rect_layer->Add(mock2);
 
@@ -452,25 +460,24 @@ TEST_F(ClipRectLayerTest, OpacityInheritanceSaveLayerPainting) {
 
   DisplayListBuilder expected_builder;
   /* OpacityLayer::Paint() */ {
-    expected_builder.save();
+    expected_builder.Save();
     {
-      expected_builder.translate(offset.fX, offset.fY);
+      expected_builder.Translate(offset.fX, offset.fY);
       /* ClipRectLayer::Paint() */ {
-        expected_builder.save();
-        expected_builder.clipRect(clip_rect, SkClipOp::kIntersect, true);
-        expected_builder.setColor(opacity_alpha << 24);
-        expected_builder.saveLayer(&children_bounds, true);
+        expected_builder.Save();
+        expected_builder.ClipRect(clip_rect, ClipOp::kIntersect, true);
+        expected_builder.SaveLayer(&children_bounds,
+                                   &DlPaint().setAlpha(opacity_alpha));
         /* child layer1 paint */ {
-          expected_builder.setColor(0xFF000000);
-          expected_builder.drawPath(path1);
+          expected_builder.DrawPath(path1, DlPaint());
         }
         /* child layer2 paint */ {  //
-          expected_builder.drawPath(path2);
+          expected_builder.DrawPath(path2, DlPaint());
         }
-        expected_builder.restore();
+        expected_builder.Restore();
       }
     }
-    expected_builder.restore();
+    expected_builder.Restore();
   }
 
   opacity_layer->Paint(display_list_paint_context());
@@ -482,13 +489,13 @@ TEST_F(ClipRectLayerTest, LayerCached) {
   auto mock1 = MockLayer::MakeOpacityCompatible(path1);
   SkRect clip_rect = SkRect::MakeWH(500, 500);
   auto layer =
-      std::make_shared<ClipRectLayer>(clip_rect, Clip::antiAliasWithSaveLayer);
+      std::make_shared<ClipRectLayer>(clip_rect, Clip::kAntiAliasWithSaveLayer);
   layer->Add(mock1);
 
   auto initial_transform = SkMatrix::Translate(50.0, 25.5);
   SkMatrix cache_ctm = initial_transform;
-  SkCanvas cache_canvas;
-  cache_canvas.setMatrix(cache_ctm);
+  DisplayListBuilder cache_canvas;
+  cache_canvas.Transform(cache_ctm);
 
   use_mock_raster_cache();
   preroll_context()->state_stack.set_preroll_delegate(initial_transform);
@@ -511,7 +518,7 @@ TEST_F(ClipRectLayerTest, LayerCached) {
   EXPECT_EQ(raster_cache()->GetLayerCachedEntriesCount(), (size_t)1);
   EXPECT_EQ(clip_cache_item->cache_state(),
             RasterCacheItem::CacheState::kCurrent);
-  SkPaint paint;
+  DlPaint paint;
   EXPECT_TRUE(raster_cache()->Draw(clip_cache_item->GetId().value(),
                                    cache_canvas, &paint));
 }
@@ -523,12 +530,12 @@ TEST_F(ClipRectLayerTest, EmptyClipDoesNotCullPlatformView) {
   auto platform_view =
       std::make_shared<PlatformViewLayer>(view_offset, view_size, view_id);
 
-  auto clip = std::make_shared<ClipRectLayer>(kEmptyRect, Clip::hardEdge);
+  auto clip = std::make_shared<ClipRectLayer>(kEmptyRect, Clip::kHardEdge);
   clip->Add(platform_view);
 
   auto embedder = MockViewEmbedder();
-  SkCanvas fake_overlay_canvas;
-  embedder.AddCanvas(&fake_overlay_canvas);
+  DisplayListBuilder fake_overlay_builder;
+  embedder.AddCanvas(&fake_overlay_builder);
   preroll_context()->view_embedder = &embedder;
   paint_context().view_embedder = &embedder;
 
@@ -541,3 +548,5 @@ TEST_F(ClipRectLayerTest, EmptyClipDoesNotCullPlatformView) {
 
 }  // namespace testing
 }  // namespace flutter
+
+// NOLINTEND(bugprone-unchecked-optional-access)
diff --git a/flow/layers/clip_rrect_layer.cc b/flow/layers/clip_rrect_layer.cc
index 735d02720330336791576f3e972ed8eeae1c1d47..87262cba5662d7d43bfe046aeb6d15f31ebf29cc 100644
--- a/flow/layers/clip_rrect_layer.cc
+++ b/flow/layers/clip_rrect_layer.cc
@@ -14,7 +14,7 @@ const SkRect& ClipRRectLayer::clip_shape_bounds() const {
 }
 
 void ClipRRectLayer::ApplyClip(LayerStateStack::MutatorContext& mutator) const {
-  mutator.clipRRect(clip_shape(), clip_behavior() != Clip::hardEdge);
+  mutator.clipRRect(clip_shape(), clip_behavior() != Clip::kHardEdge);
 }
 
 }  // namespace flutter
diff --git a/flow/layers/clip_rrect_layer_unittests.cc b/flow/layers/clip_rrect_layer_unittests.cc
index ada85a008fbc990c0e5d9649ebc8df8e9ef814e1..3fc556d53b6570851096322beb60f3bf0d3403c4 100644
--- a/flow/layers/clip_rrect_layer_unittests.cc
+++ b/flow/layers/clip_rrect_layer_unittests.cc
@@ -11,24 +11,28 @@
 #include "flutter/flow/testing/mock_embedder.h"
 #include "flutter/flow/testing/mock_layer.h"
 #include "flutter/fml/macros.h"
-#include "flutter/testing/mock_canvas.h"
+
+// TODO(zanderso): https://github.com/flutter/flutter/issues/127701
+// NOLINTBEGIN(bugprone-unchecked-optional-access)
 
 namespace flutter {
 namespace testing {
 
 using ClipRRectLayerTest = LayerTest;
 
+using ClipOp = DlCanvas::ClipOp;
+
 #ifndef NDEBUG
 TEST_F(ClipRRectLayerTest, ClipNoneBehaviorDies) {
   const SkRRect layer_rrect = SkRRect::MakeEmpty();
   EXPECT_DEATH_IF_SUPPORTED(
-      auto clip = std::make_shared<ClipRRectLayer>(layer_rrect, Clip::none),
-      "clip_behavior != Clip::none");
+      auto clip = std::make_shared<ClipRRectLayer>(layer_rrect, Clip::kNone),
+      "clip_behavior != Clip::kNone");
 }
 
 TEST_F(ClipRRectLayerTest, PaintingEmptyLayerDies) {
   const SkRRect layer_rrect = SkRRect::MakeEmpty();
-  auto layer = std::make_shared<ClipRRectLayer>(layer_rrect, Clip::hardEdge);
+  auto layer = std::make_shared<ClipRRectLayer>(layer_rrect, Clip::kHardEdge);
 
   layer->Preroll(preroll_context());
 
@@ -47,7 +51,7 @@ TEST_F(ClipRRectLayerTest, PaintingEmptyLayerDies) {
 TEST_F(ClipRRectLayerTest, PaintBeforePrerollDies) {
   const SkRect layer_bounds = SkRect::MakeXYWH(0.5, 1.0, 5.0, 6.0);
   const SkRRect layer_rrect = SkRRect::MakeRect(layer_bounds);
-  auto layer = std::make_shared<ClipRRectLayer>(layer_rrect, Clip::hardEdge);
+  auto layer = std::make_shared<ClipRRectLayer>(layer_rrect, Clip::kHardEdge);
   EXPECT_EQ(layer->paint_bounds(), kEmptyRect);
   EXPECT_EQ(layer->child_paint_bounds(), kEmptyRect);
   EXPECT_FALSE(layer->needs_painting(paint_context()));
@@ -63,9 +67,9 @@ TEST_F(ClipRRectLayerTest, PaintingCulledLayerDies) {
   const SkRect distant_bounds = SkRect::MakeXYWH(100.0, 100.0, 10.0, 10.0);
   const SkPath child_path = SkPath().addRect(child_bounds);
   const SkRRect layer_rrect = SkRRect::MakeRect(layer_bounds);
-  const SkPaint child_paint = SkPaint(SkColors::kYellow);
+  const DlPaint child_paint = DlPaint(DlColor::kYellow());
   auto mock_layer = std::make_shared<MockLayer>(child_path, child_paint);
-  auto layer = std::make_shared<ClipRRectLayer>(layer_rrect, Clip::hardEdge);
+  auto layer = std::make_shared<ClipRRectLayer>(layer_rrect, Clip::kHardEdge);
   layer->Add(mock_layer);
 
   // Cull these children
@@ -103,9 +107,9 @@ TEST_F(ClipRRectLayerTest, ChildOutsideBounds) {
   const SkRect clip_bounds = SkRect::MakeXYWH(0.5, 1.0, 5.0, 6.0);
   const SkPath child_path = SkPath().addRect(child_bounds);
   const SkRRect clip_rrect = SkRRect::MakeRect(clip_bounds);
-  const SkPaint child_paint = SkPaint(SkColors::kYellow);
+  const DlPaint child_paint = DlPaint(DlColor::kYellow());
   auto mock_layer = std::make_shared<MockLayer>(child_path, child_paint);
-  auto layer = std::make_shared<ClipRRectLayer>(clip_rrect, Clip::hardEdge);
+  auto layer = std::make_shared<ClipRRectLayer>(clip_rrect, Clip::kHardEdge);
   layer->Add(mock_layer);
 
   SkRect clip_cull_rect = clip_bounds;
@@ -116,8 +120,8 @@ TEST_F(ClipRRectLayerTest, ChildOutsideBounds) {
   // Set up both contexts to cull clipped child
   preroll_context()->state_stack.set_preroll_delegate(device_cull_bounds,
                                                       initial_matrix);
-  paint_context().canvas->clipRect(device_cull_bounds);
-  paint_context().canvas->concat(initial_matrix);
+  paint_context().canvas->ClipRect(device_cull_bounds);
+  paint_context().canvas->Transform(initial_matrix);
 
   layer->Preroll(preroll_context());
   // Untouched
@@ -144,11 +148,12 @@ TEST_F(ClipRRectLayerTest, FullyContainedChild) {
   const SkMatrix initial_matrix = SkMatrix::Translate(0.5f, 1.0f);
   const SkRect child_bounds = SkRect::MakeXYWH(1.0, 2.0, 2.0, 2.0);
   const SkRect layer_bounds = SkRect::MakeXYWH(0.5, 1.0, 5.0, 6.0);
-  const SkPath child_path = SkPath().addRect(child_bounds);
-  const SkRRect layer_rrect = SkRRect::MakeRect(layer_bounds);
-  const SkPaint child_paint = SkPaint(SkColors::kYellow);
+  const SkPath child_path =
+      SkPath().addRect(child_bounds).addOval(child_bounds.makeInset(0.1, 0.1));
+  const SkRRect layer_rrect = SkRRect::MakeRectXY(layer_bounds, 0.1, 0.1);
+  const DlPaint child_paint = DlPaint(DlColor::kYellow());
   auto mock_layer = std::make_shared<MockLayer>(child_path, child_paint);
-  auto layer = std::make_shared<ClipRRectLayer>(layer_rrect, Clip::hardEdge);
+  auto layer = std::make_shared<ClipRRectLayer>(layer_rrect, Clip::kHardEdge);
   layer->Add(mock_layer);
 
   preroll_context()->state_stack.set_preroll_delegate(initial_matrix);
@@ -167,17 +172,19 @@ TEST_F(ClipRRectLayerTest, FullyContainedChild) {
   EXPECT_EQ(mock_layer->parent_matrix(), initial_matrix);
   EXPECT_EQ(mock_layer->parent_mutators(), std::vector({Mutator(layer_rrect)}));
 
-  layer->Paint(paint_context());
-  EXPECT_EQ(
-      mock_canvas().draw_calls(),
-      std::vector(
-          {MockCanvas::DrawCall{0, MockCanvas::SaveData{1}},
-           MockCanvas::DrawCall{
-               1, MockCanvas::ClipRectData{layer_bounds, SkClipOp::kIntersect,
-                                           MockCanvas::kHard_ClipEdgeStyle}},
-           MockCanvas::DrawCall{
-               1, MockCanvas::DrawPathData{child_path, child_paint}},
-           MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
+  layer->Paint(display_list_paint_context());
+  DisplayListBuilder expected_builder;
+  /* (ClipRRect)layer::Paint */ {
+    expected_builder.Save();
+    {
+      expected_builder.ClipRRect(layer_rrect);
+      /* mock_layer::Paint */ {
+        expected_builder.DrawPath(child_path, child_paint);
+      }
+    }
+    expected_builder.Restore();
+  }
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
 }
 
 TEST_F(ClipRRectLayerTest, PartiallyContainedChild) {
@@ -186,11 +193,12 @@ TEST_F(ClipRRectLayerTest, PartiallyContainedChild) {
   const SkRect device_cull_bounds = initial_matrix.mapRect(local_cull_bounds);
   const SkRect child_bounds = SkRect::MakeXYWH(2.5, 5.0, 4.5, 4.0);
   const SkRect clip_bounds = SkRect::MakeXYWH(0.5, 1.0, 5.0, 6.0);
-  const SkPath child_path = SkPath().addRect(child_bounds);
-  const SkRRect clip_rrect = SkRRect::MakeRect(clip_bounds);
-  const SkPaint child_paint = SkPaint(SkColors::kYellow);
+  const SkPath child_path =
+      SkPath().addRect(child_bounds).addOval(child_bounds.makeInset(0.1, 0.1));
+  const SkRRect clip_rrect = SkRRect::MakeRectXY(clip_bounds, 0.1, 0.1);
+  const DlPaint child_paint = DlPaint(DlColor::kYellow());
   auto mock_layer = std::make_shared<MockLayer>(child_path, child_paint);
-  auto layer = std::make_shared<ClipRRectLayer>(clip_rrect, Clip::hardEdge);
+  auto layer = std::make_shared<ClipRRectLayer>(clip_rrect, Clip::kHardEdge);
   layer->Add(mock_layer);
 
   SkRect clip_cull_rect = clip_bounds;
@@ -216,19 +224,19 @@ TEST_F(ClipRRectLayerTest, PartiallyContainedChild) {
   EXPECT_EQ(mock_layer->parent_matrix(), initial_matrix);
   EXPECT_EQ(mock_layer->parent_mutators(), std::vector({Mutator(clip_rrect)}));
 
-  EXPECT_TRUE(mock_layer->needs_painting(paint_context()));
-  EXPECT_TRUE(layer->needs_painting(paint_context()));
-  layer->Paint(paint_context());
-  EXPECT_EQ(
-      mock_canvas().draw_calls(),
-      std::vector(
-          {MockCanvas::DrawCall{0, MockCanvas::SaveData{1}},
-           MockCanvas::DrawCall{
-               1, MockCanvas::ClipRectData{clip_bounds, SkClipOp::kIntersect,
-                                           MockCanvas::kHard_ClipEdgeStyle}},
-           MockCanvas::DrawCall{
-               1, MockCanvas::DrawPathData{child_path, child_paint}},
-           MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
+  layer->Paint(display_list_paint_context());
+  DisplayListBuilder expected_builder;
+  /* (ClipRRect)layer::Paint */ {
+    expected_builder.Save();
+    {
+      expected_builder.ClipRRect(clip_rrect);
+      /* mock_layer::Paint */ {
+        expected_builder.DrawPath(child_path, child_paint);
+      }
+    }
+    expected_builder.Restore();
+  }
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
 }
 
 static bool ReadbackResult(PrerollContext* context,
@@ -249,11 +257,11 @@ static bool ReadbackResult(PrerollContext* context,
 TEST_F(ClipRRectLayerTest, Readback) {
   PrerollContext* context = preroll_context();
   SkPath path;
-  SkPaint paint;
+  DlPaint paint;
 
-  const Clip hard = Clip::hardEdge;
-  const Clip soft = Clip::antiAlias;
-  const Clip save_layer = Clip::antiAliasWithSaveLayer;
+  const Clip hard = Clip::kHardEdge;
+  const Clip soft = Clip::kAntiAlias;
+  const Clip save_layer = Clip::kAntiAliasWithSaveLayer;
 
   std::shared_ptr<MockLayer> nochild;
   auto reader = std::make_shared<MockLayer>(path, paint);
@@ -297,7 +305,7 @@ TEST_F(ClipRRectLayerTest, OpacityInheritance) {
   SkRect clip_rect = SkRect::MakeWH(500, 500);
   SkRRect clip_rrect = SkRRect::MakeRectXY(clip_rect, 20, 20);
   auto clip_rrect_layer =
-      std::make_shared<ClipRRectLayer>(clip_rrect, Clip::hardEdge);
+      std::make_shared<ClipRRectLayer>(clip_rrect, Clip::kHardEdge);
   clip_rrect_layer->Add(mock1);
 
   // ClipRectLayer will pass through compatibility from a compatible child
@@ -328,7 +336,7 @@ TEST_F(ClipRRectLayerTest, OpacityInheritance) {
   {
     // ClipRectLayer(aa with saveLayer) will always be compatible
     auto clip_rrect_savelayer = std::make_shared<ClipRRectLayer>(
-        clip_rrect, Clip::antiAliasWithSaveLayer);
+        clip_rrect, Clip::kAntiAliasWithSaveLayer);
     clip_rrect_savelayer->Add(mock1);
     clip_rrect_savelayer->Add(mock2);
 
@@ -349,7 +357,7 @@ TEST_F(ClipRRectLayerTest, OpacityInheritance) {
   {
     // ClipRectLayer with incompatible child will not be compatible
     auto clip_rrect_bad_child =
-        std::make_shared<ClipRRectLayer>(clip_rrect, Clip::hardEdge);
+        std::make_shared<ClipRRectLayer>(clip_rrect, Clip::kHardEdge);
     clip_rrect_bad_child->Add(mock1);
     clip_rrect_bad_child->Add(mock2);
 
@@ -369,7 +377,7 @@ TEST_F(ClipRRectLayerTest, OpacityInheritance) {
   {
     // ClipRectLayer(aa with saveLayer) will always be compatible
     auto clip_rrect_savelayer_bad_child = std::make_shared<ClipRRectLayer>(
-        clip_rrect, Clip::antiAliasWithSaveLayer);
+        clip_rrect, Clip::kAntiAliasWithSaveLayer);
     clip_rrect_savelayer_bad_child->Add(mock1);
     clip_rrect_savelayer_bad_child->Add(mock2);
 
@@ -392,7 +400,7 @@ TEST_F(ClipRRectLayerTest, OpacityInheritancePainting) {
   SkRect clip_rect = SkRect::MakeWH(500, 500);
   SkRRect clip_rrect = SkRRect::MakeRectXY(clip_rect, 20, 20);
   auto clip_rect_layer =
-      std::make_shared<ClipRRectLayer>(clip_rrect, Clip::antiAlias);
+      std::make_shared<ClipRRectLayer>(clip_rrect, Clip::kAntiAlias);
   clip_rect_layer->Add(mock1);
   clip_rect_layer->Add(mock2);
 
@@ -412,22 +420,22 @@ TEST_F(ClipRRectLayerTest, OpacityInheritancePainting) {
 
   DisplayListBuilder expected_builder;
   /* OpacityLayer::Paint() */ {
-    expected_builder.save();
+    expected_builder.Save();
     {
-      expected_builder.translate(offset.fX, offset.fY);
+      expected_builder.Translate(offset.fX, offset.fY);
       /* ClipRectLayer::Paint() */ {
-        expected_builder.save();
-        expected_builder.clipRRect(clip_rrect, SkClipOp::kIntersect, true);
+        expected_builder.Save();
+        expected_builder.ClipRRect(clip_rrect, ClipOp::kIntersect, true);
         /* child layer1 paint */ {
-          expected_builder.drawPath(path1, DlPaint().setAlpha(opacity_alpha));
+          expected_builder.DrawPath(path1, DlPaint().setAlpha(opacity_alpha));
         }
         /* child layer2 paint */ {
-          expected_builder.drawPath(path2, DlPaint().setAlpha(opacity_alpha));
+          expected_builder.DrawPath(path2, DlPaint().setAlpha(opacity_alpha));
         }
-        expected_builder.restore();
+        expected_builder.Restore();
       }
     }
-    expected_builder.restore();
+    expected_builder.Restore();
   }
 
   opacity_layer->Paint(display_list_paint_context());
@@ -444,7 +452,7 @@ TEST_F(ClipRRectLayerTest, OpacityInheritanceSaveLayerPainting) {
   SkRect clip_rect = SkRect::MakeWH(500, 500);
   SkRRect clip_rrect = SkRRect::MakeRectXY(clip_rect, 20, 20);
   auto clip_rrect_layer = std::make_shared<ClipRRectLayer>(
-      clip_rrect, Clip::antiAliasWithSaveLayer);
+      clip_rrect, Clip::kAntiAliasWithSaveLayer);
   clip_rrect_layer->Add(mock1);
   clip_rrect_layer->Add(mock2);
 
@@ -463,25 +471,24 @@ TEST_F(ClipRRectLayerTest, OpacityInheritanceSaveLayerPainting) {
 
   DisplayListBuilder expected_builder;
   /* OpacityLayer::Paint() */ {
-    expected_builder.save();
+    expected_builder.Save();
     {
-      expected_builder.translate(offset.fX, offset.fY);
+      expected_builder.Translate(offset.fX, offset.fY);
       /* ClipRectLayer::Paint() */ {
-        expected_builder.save();
-        expected_builder.clipRRect(clip_rrect, SkClipOp::kIntersect, true);
-        expected_builder.setColor(opacity_alpha << 24);
-        expected_builder.saveLayer(&children_bounds, true);
+        expected_builder.Save();
+        expected_builder.ClipRRect(clip_rrect, ClipOp::kIntersect, true);
+        expected_builder.SaveLayer(&children_bounds,
+                                   &DlPaint().setAlpha(opacity_alpha));
         /* child layer1 paint */ {
-          expected_builder.setColor(0xFF000000);
-          expected_builder.drawPath(path1);
+          expected_builder.DrawPath(path1, DlPaint());
         }
         /* child layer2 paint */ {  //
-          expected_builder.drawPath(path2);
+          expected_builder.DrawPath(path2, DlPaint());
         }
-        expected_builder.restore();
+        expected_builder.Restore();
       }
     }
-    expected_builder.restore();
+    expected_builder.Restore();
   }
 
   opacity_layer->Paint(display_list_paint_context());
@@ -490,18 +497,18 @@ TEST_F(ClipRRectLayerTest, OpacityInheritanceSaveLayerPainting) {
 
 TEST_F(ClipRRectLayerTest, LayerCached) {
   auto path1 = SkPath().addRect({10, 10, 30, 30});
-  SkPaint paint = SkPaint();
+  DlPaint paint = DlPaint();
   auto mock1 = MockLayer::MakeOpacityCompatible(path1);
   SkRect clip_rect = SkRect::MakeWH(500, 500);
   SkRRect clip_rrect = SkRRect::MakeRectXY(clip_rect, 20, 20);
   auto layer = std::make_shared<ClipRRectLayer>(clip_rrect,
-                                                Clip::antiAliasWithSaveLayer);
+                                                Clip::kAntiAliasWithSaveLayer);
   layer->Add(mock1);
 
   auto initial_transform = SkMatrix::Translate(50.0, 25.5);
   SkMatrix cache_ctm = initial_transform;
-  SkCanvas cache_canvas;
-  cache_canvas.setMatrix(cache_ctm);
+  DisplayListBuilder cache_canvas;
+  cache_canvas.Transform(cache_ctm);
 
   use_mock_raster_cache();
   preroll_context()->state_stack.set_preroll_delegate(initial_transform);
@@ -534,7 +541,7 @@ TEST_F(ClipRRectLayerTest, NoSaveLayerShouldNotCache) {
   auto mock1 = MockLayer::MakeOpacityCompatible(path1);
   SkRect clip_rect = SkRect::MakeWH(500, 500);
   SkRRect clip_rrect = SkRRect::MakeRectXY(clip_rect, 20, 20);
-  auto layer = std::make_shared<ClipRRectLayer>(clip_rrect, Clip::antiAlias);
+  auto layer = std::make_shared<ClipRRectLayer>(clip_rrect, Clip::kAntiAlias);
   layer->Add(mock1);
 
   auto initial_transform = SkMatrix::Translate(50.0, 25.5);
@@ -572,12 +579,12 @@ TEST_F(ClipRRectLayerTest, EmptyClipDoesNotCullPlatformView) {
       std::make_shared<PlatformViewLayer>(view_offset, view_size, view_id);
 
   SkRRect clip_rrect = SkRRect::MakeRectXY(kEmptyRect, 20, 20);
-  auto clip = std::make_shared<ClipRRectLayer>(clip_rrect, Clip::antiAlias);
+  auto clip = std::make_shared<ClipRRectLayer>(clip_rrect, Clip::kAntiAlias);
   clip->Add(platform_view);
 
   auto embedder = MockViewEmbedder();
-  SkCanvas fake_overlay_canvas;
-  embedder.AddCanvas(&fake_overlay_canvas);
+  DisplayListBuilder fake_overlay_builder;
+  embedder.AddCanvas(&fake_overlay_builder);
   preroll_context()->view_embedder = &embedder;
   paint_context().view_embedder = &embedder;
 
@@ -590,3 +597,5 @@ TEST_F(ClipRRectLayerTest, EmptyClipDoesNotCullPlatformView) {
 
 }  // namespace testing
 }  // namespace flutter
+
+// NOLINTEND(bugprone-unchecked-optional-access)
diff --git a/flow/layers/clip_shape_layer.h b/flow/layers/clip_shape_layer.h
index b8c6ddbf68e7d87f0a772b661c385cf372c13d95..45106713ec9888d0d7373fb5cd7d73121c511e3b 100644
--- a/flow/layers/clip_shape_layer.h
+++ b/flow/layers/clip_shape_layer.h
@@ -19,7 +19,7 @@ class ClipShapeLayer : public CacheableContainerLayer {
       : CacheableContainerLayer(),
         clip_shape_(clip_shape),
         clip_behavior_(clip_behavior) {
-    FML_DCHECK(clip_behavior != Clip::none);
+    FML_DCHECK(clip_behavior != Clip::kNone);
   }
 
   void Diff(DiffContext* context, const Layer* old_layer) override {
@@ -33,8 +33,7 @@ class ClipShapeLayer : public CacheableContainerLayer {
       }
     }
     if (UsesSaveLayer() && context->has_raster_cache()) {
-      context->SetTransform(
-          RasterCacheUtil::GetIntegralTransCTM(context->GetTransform()));
+      context->WillPaintWithIntegralTransform();
     }
     if (context->PushCullRect(clip_shape_bounds())) {
       DiffChildren(context, prev);
@@ -89,7 +88,7 @@ class ClipShapeLayer : public CacheableContainerLayer {
       auto restore_apply = context.state_stack.applyState(
           paint_bounds(), LayerStateStack::kCallerCanApplyOpacity);
 
-      SkPaint paint;
+      DlPaint paint;
       if (layer_raster_cache_item_->Draw(context,
                                          context.state_stack.fill(paint))) {
         return;
@@ -101,7 +100,7 @@ class ClipShapeLayer : public CacheableContainerLayer {
   }
 
   bool UsesSaveLayer() const {
-    return clip_behavior_ == Clip::antiAliasWithSaveLayer;
+    return clip_behavior_ == Clip::kAntiAliasWithSaveLayer;
   }
 
  protected:
diff --git a/flow/layers/color_filter_layer.cc b/flow/layers/color_filter_layer.cc
index a5966e4542c36c276d7c71aa423ef72278277a62..056efa7472dc761c346ff1a4d521b62ced7a153e 100644
--- a/flow/layers/color_filter_layer.cc
+++ b/flow/layers/color_filter_layer.cc
@@ -4,8 +4,8 @@
 
 #include "flutter/flow/layers/color_filter_layer.h"
 
-#include "flutter/display_list/display_list_comparable.h"
-#include "flutter/display_list/display_list_paint.h"
+#include "flutter/display_list/dl_paint.h"
+#include "flutter/display_list/utils/dl_comparable.h"
 #include "flutter/flow/raster_cache_item.h"
 #include "flutter/flow/raster_cache_util.h"
 
@@ -28,8 +28,7 @@ void ColorFilterLayer::Diff(DiffContext* context, const Layer* old_layer) {
   }
 
   if (context->has_raster_cache()) {
-    context->SetTransform(
-        RasterCacheUtil::GetIntegralTransCTM(context->GetTransform()));
+    context->WillPaintWithIntegralTransform();
   }
 
   DiffChildren(context, prev);
@@ -75,9 +74,9 @@ void ColorFilterLayer::Paint(PaintContext& context) const {
     // Try drawing the layer cache item from the cache before applying the
     // color filter if it was cached with the filter applied.
     if (!layer_raster_cache_item_->IsCacheChildren()) {
-      SkPaint sk_paint;
+      DlPaint paint;
       if (layer_raster_cache_item_->Draw(context,
-                                         context.state_stack.fill(sk_paint))) {
+                                         context.state_stack.fill(paint))) {
         return;
       }
     }
@@ -88,9 +87,9 @@ void ColorFilterLayer::Paint(PaintContext& context) const {
   mutator.applyColorFilter(paint_bounds(), filter_);
 
   if (context.raster_cache && layer_raster_cache_item_->IsCacheChildren()) {
-    SkPaint sk_paint;
+    DlPaint paint;
     if (layer_raster_cache_item_->Draw(context,
-                                       context.state_stack.fill(sk_paint))) {
+                                       context.state_stack.fill(paint))) {
       return;
     }
   }
diff --git a/flow/layers/color_filter_layer.h b/flow/layers/color_filter_layer.h
index e105e125500291656288092d4d11e08ab6bce875..ee456cd93eb564c10c6c4f60e9afd31081ee9a99 100644
--- a/flow/layers/color_filter_layer.h
+++ b/flow/layers/color_filter_layer.h
@@ -5,10 +5,10 @@
 #ifndef FLUTTER_FLOW_LAYERS_COLOR_FILTER_LAYER_H_
 #define FLUTTER_FLOW_LAYERS_COLOR_FILTER_LAYER_H_
 
-#include "flutter/display_list/display_list_color_filter.h"
+#include "flutter/display_list/effects/dl_color_filter.h"
 #include "flutter/flow/layers/cacheable_layer.h"
 #include "flutter/flow/layers/layer.h"
-#include "third_party/skia/include/core/SkColorFilter.h"
+
 namespace flutter {
 
 class ColorFilterLayer : public CacheableContainerLayer {
diff --git a/flow/layers/color_filter_layer_unittests.cc b/flow/layers/color_filter_layer_unittests.cc
index 093ee3546f3c15567ae177f89af701f7640eb158..209ca2b22733a0d9775dcb211a92e98964077a9d 100644
--- a/flow/layers/color_filter_layer_unittests.cc
+++ b/flow/layers/color_filter_layer_unittests.cc
@@ -3,12 +3,12 @@
 // found in the LICENSE file.
 
 #include "flutter/display_list/display_list.h"
-#include "flutter/display_list/display_list_color.h"
-#include "flutter/display_list/display_list_paint.h"
+#include "flutter/display_list/dl_color.h"
+#include "flutter/display_list/dl_paint.h"
 #include "flutter/flow/compositor_context.h"
 #include "flutter/flow/layers/color_filter_layer.h"
 
-#include "flutter/display_list/display_list_color_filter.h"
+#include "flutter/display_list/effects/dl_color_filter.h"
 #include "flutter/flow/layers/layer_tree.h"
 #include "flutter/flow/layers/opacity_layer.h"
 #include "flutter/flow/raster_cache.h"
@@ -16,10 +16,9 @@
 #include "flutter/flow/testing/layer_test.h"
 #include "flutter/flow/testing/mock_layer.h"
 #include "flutter/fml/macros.h"
-#include "flutter/testing/mock_canvas.h"
-#include "include/core/SkColor.h"
-#include "third_party/skia/include/core/SkColorFilter.h"
-#include "third_party/skia/include/effects/SkColorMatrixFilter.h"
+
+// TODO(zanderso): https://github.com/flutter/flutter/issues/127701
+// NOLINTBEGIN(bugprone-unchecked-optional-access)
 
 namespace flutter {
 namespace testing {
@@ -28,8 +27,7 @@ using ColorFilterLayerTest = LayerTest;
 
 #ifndef NDEBUG
 TEST_F(ColorFilterLayerTest, PaintingEmptyLayerDies) {
-  auto layer = std::make_shared<ColorFilterLayer>(
-      std::make_shared<DlUnknownColorFilter>(sk_sp<SkColorFilter>()));
+  auto layer = std::make_shared<ColorFilterLayer>(nullptr);
 
   layer->Preroll(preroll_context());
   EXPECT_EQ(layer->paint_bounds(), kEmptyRect);
@@ -45,8 +43,7 @@ TEST_F(ColorFilterLayerTest, PaintBeforePrerollDies) {
   const SkPath child_path = SkPath().addRect(child_bounds);
   auto mock_layer = std::make_shared<MockLayer>(child_path);
 
-  auto layer = std::make_shared<ColorFilterLayer>(
-      std::make_shared<DlUnknownColorFilter>(sk_sp<SkColorFilter>()));
+  auto layer = std::make_shared<ColorFilterLayer>(nullptr);
   layer->Add(mock_layer);
 
   EXPECT_EQ(layer->paint_bounds(), kEmptyRect);
@@ -60,7 +57,7 @@ TEST_F(ColorFilterLayerTest, EmptyFilter) {
   const SkMatrix initial_transform = SkMatrix::Translate(0.5f, 1.0f);
   const SkRect child_bounds = SkRect::MakeLTRB(5.0f, 6.0f, 20.5f, 21.5f);
   const SkPath child_path = SkPath().addRect(child_bounds);
-  const SkPaint child_paint = SkPaint(SkColors::kYellow);
+  const DlPaint child_paint = DlPaint(DlColor::kYellow());
   auto mock_layer = std::make_shared<MockLayer>(child_path, child_paint);
   auto layer = std::make_shared<ColorFilterLayer>(nullptr);
   layer->Add(mock_layer);
@@ -72,23 +69,27 @@ TEST_F(ColorFilterLayerTest, EmptyFilter) {
   EXPECT_TRUE(layer->needs_painting(paint_context()));
   EXPECT_EQ(mock_layer->parent_matrix(), initial_transform);
 
-  SkPaint filter_paint;
-  filter_paint.setColorFilter(nullptr);
-  layer->Paint(paint_context());
-  EXPECT_EQ(mock_canvas().draw_calls(),
-            std::vector({
-                MockCanvas::DrawCall{
-                    0, MockCanvas::DrawPathData{child_path, child_paint}},
-            }));
+  layer->Paint(display_list_paint_context());
+  DisplayListBuilder expected_builder;
+  /* (ColorFilter)layer::Paint */ {
+    expected_builder.Save();
+    {
+      /* mock_layer::Paint */ {
+        expected_builder.DrawPath(child_path, child_paint);
+      }
+    }
+    expected_builder.Restore();
+  }
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
 }
 
 TEST_F(ColorFilterLayerTest, SimpleFilter) {
   const SkMatrix initial_transform = SkMatrix::Translate(0.5f, 1.0f);
   const SkRect child_bounds = SkRect::MakeLTRB(5.0f, 6.0f, 20.5f, 21.5f);
   const SkPath child_path = SkPath().addRect(child_bounds);
-  const SkPaint child_paint = SkPaint(SkColors::kYellow);
+  const DlPaint child_paint = DlPaint(DlColor::kYellow());
 
-  auto dl_color_filter = DlLinearToSrgbGammaColorFilter::instance;
+  auto dl_color_filter = DlLinearToSrgbGammaColorFilter::kInstance;
   auto mock_layer = std::make_shared<MockLayer>(child_path, child_paint);
   auto layer = std::make_shared<ColorFilterLayer>(dl_color_filter);
   layer->Add(mock_layer);
@@ -104,15 +105,14 @@ TEST_F(ColorFilterLayerTest, SimpleFilter) {
   /* ColorFilterLayer::Paint() */ {
     DlPaint dl_paint;
     dl_paint.setColorFilter(dl_color_filter.get());
-    expected_builder.saveLayer(&child_bounds, &dl_paint);
+    expected_builder.SaveLayer(&child_bounds, &dl_paint);
     {
       /* MockLayer::Paint() */ {
-        expected_builder.drawPath(child_path,
-                                  DlPaint().setColor(DlColor::kYellow()));
+        expected_builder.DrawPath(child_path, DlPaint(DlColor::kYellow()));
       }
     }
   }
-  expected_builder.restore();
+  expected_builder.Restore();
   auto expected_display_list = expected_builder.Build();
 
   layer->Paint(display_list_paint_context());
@@ -125,11 +125,11 @@ TEST_F(ColorFilterLayerTest, MultipleChildren) {
   const SkPath child_path1 = SkPath().addRect(child_bounds);
   const SkPath child_path2 =
       SkPath().addRect(child_bounds.makeOffset(3.0f, 0.0f));
-  const SkPaint child_paint1 = SkPaint(SkColors::kYellow);
-  const SkPaint child_paint2 = SkPaint(SkColors::kCyan);
+  const DlPaint child_paint1 = DlPaint(DlColor::kYellow());
+  const DlPaint child_paint2 = DlPaint(DlColor::kCyan());
   auto mock_layer1 = std::make_shared<MockLayer>(child_path1, child_paint1);
   auto mock_layer2 = std::make_shared<MockLayer>(child_path2, child_paint2);
-  auto dl_color_filter = DlSrgbToLinearGammaColorFilter::instance;
+  auto dl_color_filter = DlSrgbToLinearGammaColorFilter::kInstance;
   auto layer = std::make_shared<ColorFilterLayer>(dl_color_filter);
   layer->Add(mock_layer1);
   layer->Add(mock_layer2);
@@ -152,19 +152,17 @@ TEST_F(ColorFilterLayerTest, MultipleChildren) {
   /* ColorFilterLayer::Paint() */ {
     DlPaint dl_paint;
     dl_paint.setColorFilter(dl_color_filter.get());
-    expected_builder.saveLayer(&children_bounds, &dl_paint);
+    expected_builder.SaveLayer(&children_bounds, &dl_paint);
     {
       /* MockLayer::Paint() */ {
-        expected_builder.drawPath(child_path1,
-                                  DlPaint().setColor(DlColor::kYellow()));
+        expected_builder.DrawPath(child_path1, DlPaint(DlColor::kYellow()));
       }
       /* MockLayer::Paint() */ {
-        expected_builder.drawPath(child_path2,
-                                  DlPaint().setColor(DlColor::kCyan()));
+        expected_builder.DrawPath(child_path2, DlPaint(DlColor::kCyan()));
       }
     }
   }
-  expected_builder.restore();
+  expected_builder.Restore();
   auto expected_display_list = expected_builder.Build();
 
   layer->Paint(display_list_paint_context());
@@ -177,11 +175,11 @@ TEST_F(ColorFilterLayerTest, Nested) {
   const SkPath child_path1 = SkPath().addRect(child_bounds);
   const SkPath child_path2 =
       SkPath().addRect(child_bounds.makeOffset(3.0f, 0.0f));
-  const SkPaint child_paint1 = SkPaint(SkColors::kYellow);
-  const SkPaint child_paint2 = SkPaint(SkColors::kCyan);
+  const DlPaint child_paint1 = DlPaint(DlColor::kYellow());
+  const DlPaint child_paint2 = DlPaint(DlColor::kCyan());
   auto mock_layer1 = std::make_shared<MockLayer>(child_path1, child_paint1);
   auto mock_layer2 = std::make_shared<MockLayer>(child_path2, child_paint2);
-  auto dl_color_filter = DlSrgbToLinearGammaColorFilter::instance;
+  auto dl_color_filter = DlSrgbToLinearGammaColorFilter::kInstance;
   auto layer1 = std::make_shared<ColorFilterLayer>(dl_color_filter);
 
   auto layer2 = std::make_shared<ColorFilterLayer>(dl_color_filter);
@@ -210,27 +208,25 @@ TEST_F(ColorFilterLayerTest, Nested) {
   /* ColorFilterLayer::Paint() */ {
     DlPaint dl_paint;
     dl_paint.setColorFilter(dl_color_filter.get());
-    expected_builder.saveLayer(&children_bounds, &dl_paint);
+    expected_builder.SaveLayer(&children_bounds, &dl_paint);
     {
       /* MockLayer::Paint() */ {
-        expected_builder.drawPath(child_path1,
-                                  DlPaint().setColor(DlColor::kYellow()));
+        expected_builder.DrawPath(child_path1, DlPaint(DlColor::kYellow()));
       }
       /* ColorFilter::Paint() */ {
         DlPaint child_dl_paint;
         child_dl_paint.setColor(DlColor::kBlack());
         child_dl_paint.setColorFilter(dl_color_filter.get());
-        expected_builder.saveLayer(&child_path2.getBounds(), &child_dl_paint);
+        expected_builder.SaveLayer(&child_path2.getBounds(), &child_dl_paint);
 
         /* MockLayer::Paint() */ {
-          expected_builder.drawPath(child_path2,
-                                    DlPaint().setColor(DlColor::kCyan()));
+          expected_builder.DrawPath(child_path2, DlPaint(DlColor::kCyan()));
         }
-        expected_builder.restore();
+        expected_builder.Restore();
       }
     }
   }
-  expected_builder.restore();
+  expected_builder.Restore();
 
   auto expected_display_list = expected_builder.Build();
 
@@ -243,14 +239,14 @@ TEST_F(ColorFilterLayerTest, Readback) {
 
   // ColorFilterLayer does not read from surface
   auto layer = std::make_shared<ColorFilterLayer>(
-      DlLinearToSrgbGammaColorFilter::instance);
+      DlLinearToSrgbGammaColorFilter::kInstance);
   preroll_context()->surface_needs_readback = false;
   preroll_context()->state_stack.set_preroll_delegate(initial_transform);
   layer->Preroll(preroll_context());
   EXPECT_FALSE(preroll_context()->surface_needs_readback);
 
   // ColorFilterLayer blocks child with readback
-  auto mock_layer = std::make_shared<MockLayer>(SkPath(), SkPaint());
+  auto mock_layer = std::make_shared<MockLayer>(SkPath(), DlPaint());
   mock_layer->set_fake_reads_surface(true);
   layer->Add(mock_layer);
   preroll_context()->surface_needs_readback = false;
@@ -259,20 +255,20 @@ TEST_F(ColorFilterLayerTest, Readback) {
 }
 
 TEST_F(ColorFilterLayerTest, CacheChild) {
-  auto layer_filter = DlSrgbToLinearGammaColorFilter::instance;
+  auto layer_filter = DlSrgbToLinearGammaColorFilter::kInstance;
   auto initial_transform = SkMatrix::Translate(50.0, 25.5);
   auto other_transform = SkMatrix::Scale(1.0, 2.0);
   const SkPath child_path = SkPath().addRect(SkRect::MakeWH(5.0f, 5.0f));
-  SkPaint paint = SkPaint();
+  DlPaint paint = DlPaint();
   auto mock_layer = std::make_shared<MockLayer>(child_path);
   auto layer = std::make_shared<ColorFilterLayer>(layer_filter);
   layer->Add(mock_layer);
 
   SkMatrix cache_ctm = initial_transform;
-  SkCanvas cache_canvas;
-  cache_canvas.setMatrix(cache_ctm);
-  SkCanvas other_canvas;
-  other_canvas.setMatrix(other_transform);
+  DisplayListBuilder cache_canvas;
+  cache_canvas.Transform(cache_ctm);
+  DisplayListBuilder other_canvas;
+  other_canvas.Transform(other_transform);
 
   use_mock_raster_cache();
   const auto* cacheable_color_filter_item = layer->raster_cache_item();
@@ -300,7 +296,7 @@ TEST_F(ColorFilterLayerTest, CacheChild) {
 }
 
 TEST_F(ColorFilterLayerTest, CacheChildren) {
-  auto layer_filter = DlSrgbToLinearGammaColorFilter::instance;
+  auto layer_filter = DlSrgbToLinearGammaColorFilter::kInstance;
   auto initial_transform = SkMatrix::Translate(50.0, 25.5);
   auto other_transform = SkMatrix::Scale(1.0, 2.0);
   const SkPath child_path1 = SkPath().addRect(SkRect::MakeWH(5.0f, 5.0f));
@@ -310,13 +306,13 @@ TEST_F(ColorFilterLayerTest, CacheChildren) {
   auto layer = std::make_shared<ColorFilterLayer>(layer_filter);
   layer->Add(mock_layer1);
   layer->Add(mock_layer2);
-  SkPaint paint = SkPaint();
+  DlPaint paint = DlPaint();
 
   SkMatrix cache_ctm = initial_transform;
-  SkCanvas cache_canvas;
-  cache_canvas.setMatrix(cache_ctm);
-  SkCanvas other_canvas;
-  other_canvas.setMatrix(other_transform);
+  DisplayListBuilder cache_canvas;
+  cache_canvas.Transform(cache_ctm);
+  DisplayListBuilder other_canvas;
+  other_canvas.Transform(other_transform);
 
   use_mock_raster_cache();
 
@@ -346,7 +342,7 @@ TEST_F(ColorFilterLayerTest, CacheChildren) {
 }
 
 TEST_F(ColorFilterLayerTest, CacheColorFilterLayerSelf) {
-  auto layer_filter = DlSrgbToLinearGammaColorFilter::instance;
+  auto layer_filter = DlSrgbToLinearGammaColorFilter::kInstance;
   auto initial_transform = SkMatrix::Translate(50.0, 25.5);
   auto other_transform = SkMatrix::Scale(1.0, 2.0);
   const SkPath child_path1 = SkPath().addRect(SkRect::MakeWH(5.0f, 5.0f));
@@ -356,13 +352,13 @@ TEST_F(ColorFilterLayerTest, CacheColorFilterLayerSelf) {
   auto layer = std::make_shared<ColorFilterLayer>(layer_filter);
   layer->Add(mock_layer1);
   layer->Add(mock_layer2);
-  SkPaint paint = SkPaint();
+  DlPaint paint = DlPaint();
 
   SkMatrix cache_ctm = initial_transform;
-  SkCanvas cache_canvas;
-  cache_canvas.setMatrix(cache_ctm);
-  SkCanvas other_canvas;
-  other_canvas.setMatrix(other_transform);
+  DisplayListBuilder cache_canvas;
+  cache_canvas.Transform(cache_ctm);
+  DisplayListBuilder other_canvas;
+  other_canvas.Transform(other_transform);
 
   use_mock_raster_cache();
   preroll_context()->state_stack.set_preroll_delegate(initial_transform);
@@ -438,21 +434,21 @@ TEST_F(ColorFilterLayerTest, OpacityInheritance) {
 
   DisplayListBuilder expected_builder;
   /* OpacityLayer::Paint() */ {
-    expected_builder.save();
+    expected_builder.Save();
     {
-      expected_builder.translate(offset.fX, offset.fY);
+      expected_builder.Translate(offset.fX, offset.fY);
       /* ColorFilterLayer::Paint() */ {
         DlPaint dl_paint;
-        dl_paint.setColor(opacity_alpha << 24);
+        dl_paint.setColor(DlColor(opacity_alpha << 24));
         dl_paint.setColorFilter(&layer_filter);
-        expected_builder.saveLayer(&child_path.getBounds(), &dl_paint);
+        expected_builder.SaveLayer(&child_path.getBounds(), &dl_paint);
         /* MockLayer::Paint() */ {
-          expected_builder.drawPath(child_path, DlPaint().setColor(0xFF000000));
+          expected_builder.DrawPath(child_path, DlPaint(DlColor(0xFF000000)));
         }
-        expected_builder.restore();
+        expected_builder.Restore();
       }
     }
-    expected_builder.restore();
+    expected_builder.Restore();
   }
 
   opacity_layer->Paint(display_list_paint_context());
@@ -461,3 +457,5 @@ TEST_F(ColorFilterLayerTest, OpacityInheritance) {
 
 }  // namespace testing
 }  // namespace flutter
+
+// NOLINTEND(bugprone-unchecked-optional-access)
diff --git a/flow/layers/container_layer_unittests.cc b/flow/layers/container_layer_unittests.cc
index f9e72debdbd92c8c880fe2d47675a875092e6aa7..206be009966a7a50404d403112031dd89fb13590 100644
--- a/flow/layers/container_layer_unittests.cc
+++ b/flow/layers/container_layer_unittests.cc
@@ -10,11 +10,12 @@
 #include "flutter/flow/testing/layer_test.h"
 #include "flutter/flow/testing/mock_layer.h"
 #include "flutter/fml/macros.h"
-#include "flutter/testing/mock_canvas.h"
 #include "gtest/gtest.h"
-#include "include/core/SkCanvas.h"
 #include "include/core/SkMatrix.h"
 
+// TODO(zanderso): https://github.com/flutter/flutter/issues/127701
+// NOLINTBEGIN(bugprone-unchecked-optional-access)
+
 namespace flutter {
 namespace testing {
 
@@ -68,8 +69,8 @@ TEST_F(ContainerLayerTest, LayerWithParentHasTextureLayerNeedsResetFlag) {
   child_path1.addRect(5.0f, 6.0f, 20.5f, 21.5f);
   SkPath child_path2;
   child_path2.addRect(8.0f, 2.0f, 16.5f, 14.5f);
-  SkPaint child_paint1(SkColors::kGray);
-  SkPaint child_paint2(SkColors::kGreen);
+  DlPaint child_paint1 = DlPaint(DlColor::kMidGrey());
+  DlPaint child_paint2 = DlPaint(DlColor::kGreen());
 
   auto mock_layer1 = std::make_shared<MockLayer>(child_path1, child_paint1);
   mock_layer1->set_fake_has_texture_layer(true);
@@ -93,7 +94,7 @@ TEST_F(ContainerLayerTest, LayerWithParentHasTextureLayerNeedsResetFlag) {
 TEST_F(ContainerLayerTest, Simple) {
   SkPath child_path;
   child_path.addRect(5.0f, 6.0f, 20.5f, 21.5f);
-  SkPaint child_paint(SkColors::kGreen);
+  DlPaint child_paint = DlPaint(DlColor::kGreen());
   SkMatrix initial_transform = SkMatrix::Translate(-0.5f, -0.5f);
 
   auto mock_layer = std::make_shared<MockLayer>(child_path, child_paint);
@@ -111,10 +112,14 @@ TEST_F(ContainerLayerTest, Simple) {
   EXPECT_EQ(mock_layer->parent_matrix(), initial_transform);
   EXPECT_EQ(mock_layer->parent_cull_rect(), kGiantRect);
 
-  layer->Paint(paint_context());
-  EXPECT_EQ(mock_canvas().draw_calls(),
-            std::vector({MockCanvas::DrawCall{
-                0, MockCanvas::DrawPathData{child_path, child_paint}}}));
+  layer->Paint(display_list_paint_context());
+  DisplayListBuilder expected_builder;
+  /* (Container)layer::Paint */ {
+    /* mock_layer::Paint */ {
+      expected_builder.DrawPath(child_path, child_paint);
+    }
+  }
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
 }
 
 TEST_F(ContainerLayerTest, Multiple) {
@@ -122,8 +127,8 @@ TEST_F(ContainerLayerTest, Multiple) {
   child_path1.addRect(5.0f, 6.0f, 20.5f, 21.5f);
   SkPath child_path2;
   child_path2.addRect(8.0f, 2.0f, 16.5f, 14.5f);
-  SkPaint child_paint1(SkColors::kGray);
-  SkPaint child_paint2(SkColors::kGreen);
+  DlPaint child_paint1 = DlPaint(DlColor::kMidGrey());
+  DlPaint child_paint2 = DlPaint(DlColor::kGreen());
   SkMatrix initial_transform = SkMatrix::Translate(-0.5f, -0.5f);
 
   auto mock_layer1 = std::make_shared<MockLayer>(child_path1, child_paint1);
@@ -151,20 +156,24 @@ TEST_F(ContainerLayerTest, Multiple) {
   EXPECT_EQ(mock_layer2->parent_cull_rect(),
             kGiantRect);  // Siblings are independent
 
-  layer->Paint(paint_context());
-  EXPECT_EQ(
-      mock_canvas().draw_calls(),
-      std::vector({MockCanvas::DrawCall{
-                       0, MockCanvas::DrawPathData{child_path1, child_paint1}},
-                   MockCanvas::DrawCall{0, MockCanvas::DrawPathData{
-                                               child_path2, child_paint2}}}));
+  layer->Paint(display_list_paint_context());
+  DisplayListBuilder expected_builder;
+  /* (Container)layer::Paint */ {
+    /* mock_layer1::Paint */ {
+      expected_builder.DrawPath(child_path1, child_paint1);
+    }
+    /* mock_layer2::Paint */ {
+      expected_builder.DrawPath(child_path2, child_paint2);
+    }
+  }
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
 }
 
 TEST_F(ContainerLayerTest, MultipleWithEmpty) {
   SkPath child_path1;
   child_path1.addRect(5.0f, 6.0f, 20.5f, 21.5f);
-  SkPaint child_paint1(SkColors::kGray);
-  SkPaint child_paint2(SkColors::kGreen);
+  DlPaint child_paint1 = DlPaint(DlColor::kMidGrey());
+  DlPaint child_paint2 = DlPaint(DlColor::kGreen());
   SkMatrix initial_transform = SkMatrix::Translate(-0.5f, -0.5f);
 
   auto mock_layer1 = std::make_shared<MockLayer>(child_path1, child_paint1);
@@ -188,10 +197,15 @@ TEST_F(ContainerLayerTest, MultipleWithEmpty) {
   EXPECT_EQ(mock_layer1->parent_cull_rect(), kGiantRect);
   EXPECT_EQ(mock_layer2->parent_cull_rect(), kGiantRect);
 
-  layer->Paint(paint_context());
-  EXPECT_EQ(mock_canvas().draw_calls(),
-            std::vector({MockCanvas::DrawCall{
-                0, MockCanvas::DrawPathData{child_path1, child_paint1}}}));
+  layer->Paint(display_list_paint_context());
+  DisplayListBuilder expected_builder;
+  /* (Container)layer::Paint */ {
+    /* mock_layer1::Paint */ {
+      expected_builder.DrawPath(child_path1, child_paint1);
+    }
+    // mock_layer2 not drawn due to needs_painting() returning false
+  }
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
 }
 
 TEST_F(ContainerLayerTest, NeedsSystemComposite) {
@@ -199,8 +213,8 @@ TEST_F(ContainerLayerTest, NeedsSystemComposite) {
   child_path1.addRect(5.0f, 6.0f, 20.5f, 21.5f);
   SkPath child_path2;
   child_path2.addRect(8.0f, 2.0f, 16.5f, 14.5f);
-  SkPaint child_paint1(SkColors::kGray);
-  SkPaint child_paint2(SkColors::kGreen);
+  DlPaint child_paint1 = DlPaint(DlColor::kMidGrey());
+  DlPaint child_paint2 = DlPaint(DlColor::kGreen());
   SkMatrix initial_transform = SkMatrix::Translate(-0.5f, -0.5f);
 
   auto mock_layer1 = std::make_shared<MockLayer>(child_path1, child_paint1);
@@ -227,13 +241,17 @@ TEST_F(ContainerLayerTest, NeedsSystemComposite) {
   EXPECT_EQ(mock_layer1->parent_cull_rect(), kGiantRect);
   EXPECT_EQ(mock_layer2->parent_cull_rect(), kGiantRect);
 
-  layer->Paint(paint_context());
-  EXPECT_EQ(
-      mock_canvas().draw_calls(),
-      std::vector({MockCanvas::DrawCall{
-                       0, MockCanvas::DrawPathData{child_path1, child_paint1}},
-                   MockCanvas::DrawCall{0, MockCanvas::DrawPathData{
-                                               child_path2, child_paint2}}}));
+  layer->Paint(display_list_paint_context());
+  DisplayListBuilder expected_builder;
+  /* (Container)layer::Paint */ {
+    /* mock_layer1::Paint */ {
+      expected_builder.DrawPath(child_path1, child_paint1);
+    }
+    /* mock_layer2::Paint */ {
+      expected_builder.DrawPath(child_path2, child_paint2);
+    }
+  }
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
 }
 
 TEST_F(ContainerLayerTest, RasterCacheTest) {
@@ -241,9 +259,9 @@ TEST_F(ContainerLayerTest, RasterCacheTest) {
   const SkPath child_path1 = SkPath().addRect(5.0f, 6.0f, 20.5f, 21.5f);
   const SkPath child_path2 = SkPath().addRect(21.0f, 6.0f, 25.5f, 21.5f);
   const SkPath child_path3 = SkPath().addRect(26.0f, 6.0f, 30.5f, 21.5f);
-  const SkPaint child_paint1(SkColors::kGray);
-  const SkPaint child_paint2(SkColors::kGreen);
-  const SkPaint paint;
+  const DlPaint child_paint1 = DlPaint(DlColor::kMidGrey());
+  const DlPaint child_paint2 = DlPaint(DlColor::kGreen());
+  const DlPaint paint;
   auto cacheable_container_layer1 =
       MockCacheableContainerLayer::CacheLayerOrChildren();
   auto cacheable_container_layer2 =
@@ -286,8 +304,8 @@ TEST_F(ContainerLayerTest, RasterCacheTest) {
   layer->Add(mock_layer2);
   layer->Add(cacheable_container_layer2);
 
-  SkCanvas cache_canvas;
-  cache_canvas.setMatrix(SkMatrix::I());
+  DisplayListBuilder cache_canvas;
+  cache_canvas.TransformReset();
 
   // Initial Preroll for check the layer paint bounds
   layer->Preroll(preroll_context());
@@ -510,7 +528,7 @@ TEST_F(ContainerLayerTest, OpacityInheritance) {
 TEST_F(ContainerLayerTest, CollectionCacheableLayer) {
   SkPath child_path;
   child_path.addRect(5.0f, 6.0f, 20.5f, 21.5f);
-  SkPaint child_paint(SkColors::kGreen);
+  DlPaint child_paint = DlPaint(DlColor::kGreen());
   SkMatrix initial_transform = SkMatrix::Translate(-0.5f, -0.5f);
 
   auto mock_layer1 = std::make_shared<MockLayer>(SkPath(), child_paint);
@@ -546,9 +564,9 @@ using ContainerLayerDiffTest = DiffContextTest;
 
 // Insert PictureLayer amongst container layers
 TEST_F(ContainerLayerDiffTest, PictureLayerInsertion) {
-  auto pic1 = CreateDisplayList(SkRect::MakeLTRB(0, 0, 50, 50), 1);
-  auto pic2 = CreateDisplayList(SkRect::MakeLTRB(100, 0, 150, 50), 1);
-  auto pic3 = CreateDisplayList(SkRect::MakeLTRB(200, 0, 250, 50), 1);
+  auto pic1 = CreateDisplayList(SkRect::MakeLTRB(0, 0, 50, 50));
+  auto pic2 = CreateDisplayList(SkRect::MakeLTRB(100, 0, 150, 50));
+  auto pic3 = CreateDisplayList(SkRect::MakeLTRB(200, 0, 250, 50));
 
   MockLayerTree t1;
 
@@ -598,9 +616,9 @@ TEST_F(ContainerLayerDiffTest, PictureLayerInsertion) {
 
 // Insert picture layer amongst other picture layers
 TEST_F(ContainerLayerDiffTest, PictureInsertion) {
-  auto pic1 = CreateDisplayList(SkRect::MakeLTRB(0, 0, 50, 50), 1);
-  auto pic2 = CreateDisplayList(SkRect::MakeLTRB(100, 0, 150, 50), 1);
-  auto pic3 = CreateDisplayList(SkRect::MakeLTRB(200, 0, 250, 50), 1);
+  auto pic1 = CreateDisplayList(SkRect::MakeLTRB(0, 0, 50, 50));
+  auto pic2 = CreateDisplayList(SkRect::MakeLTRB(100, 0, 150, 50));
+  auto pic3 = CreateDisplayList(SkRect::MakeLTRB(200, 0, 250, 50));
 
   MockLayerTree t1;
   t1.root()->Add(CreateDisplayListLayer(pic1));
@@ -747,3 +765,5 @@ TEST_F(ContainerLayerDiffTest, ReplaceLayer) {
 
 }  // namespace testing
 }  // namespace flutter
+
+// NOLINTEND(bugprone-unchecked-optional-access)
diff --git a/flow/layers/display_list_layer.cc b/flow/layers/display_list_layer.cc
index cf2b314d8e35966c5da31128d5daf49c96935c28..543af526be64df747ed55b50572635a69cb76734 100644
--- a/flow/layers/display_list_layer.cc
+++ b/flow/layers/display_list_layer.cc
@@ -6,8 +6,7 @@
 
 #include <utility>
 
-#include "flutter/display_list/display_list_builder.h"
-#include "flutter/display_list/display_list_flags.h"
+#include "flutter/display_list/dl_builder.h"
 #include "flutter/flow/layer_snapshot_store.h"
 #include "flutter/flow/layers/cacheable_layer.h"
 #include "flutter/flow/layers/offscreen_surface.h"
@@ -17,15 +16,14 @@
 namespace flutter {
 
 DisplayListLayer::DisplayListLayer(const SkPoint& offset,
-                                   SkiaGPUObject<DisplayList> display_list,
+                                   sk_sp<DisplayList> display_list,
                                    bool is_complex,
                                    bool will_change)
     : offset_(offset), display_list_(std::move(display_list)) {
-  if (display_list_.skia_object() != nullptr) {
-    bounds_ = display_list_.skia_object()->bounds().makeOffset(offset_.x(),
-                                                               offset_.y());
+  if (display_list_) {
+    bounds_ = display_list_->bounds().makeOffset(offset_.x(), offset_.y());
     display_list_raster_cache_item_ = DisplayListRasterCacheItem::Make(
-        display_list_.skia_object().get(), offset_, is_complex, will_change);
+        display_list_, offset_, is_complex, will_change);
   }
 }
 
@@ -53,8 +51,7 @@ void DisplayListLayer::Diff(DiffContext* context, const Layer* old_layer) {
   }
   context->PushTransform(SkMatrix::Translate(offset_.x(), offset_.y()));
   if (context->has_raster_cache()) {
-    context->SetTransform(
-        RasterCacheUtil::GetIntegralTransCTM(context->GetTransform()));
+    context->WillPaintWithIntegralTransform();
   }
   context->AddLayerBounds(display_list()->bounds());
   context->SetLayerPaintRegion(this, context->CurrentSubtreeRegion());
@@ -63,8 +60,8 @@ void DisplayListLayer::Diff(DiffContext* context, const Layer* old_layer) {
 bool DisplayListLayer::Compare(DiffContext::Statistics& statistics,
                                const DisplayListLayer* l1,
                                const DisplayListLayer* l2) {
-  const auto& dl1 = l1->display_list_.skia_object();
-  const auto& dl2 = l2->display_list_.skia_object();
+  const auto& dl1 = l1->display_list_;
+  const auto& dl2 = l2->display_list_;
   if (dl1.get() == dl2.get()) {
     statistics.AddSameInstancePicture();
     return true;
@@ -107,7 +104,7 @@ void DisplayListLayer::Preroll(PrerollContext* context) {
 }
 
 void DisplayListLayer::Paint(PaintContext& context) const {
-  FML_DCHECK(display_list_.skia_object());
+  FML_DCHECK(display_list_);
   FML_DCHECK(needs_painting(context));
 
   auto mutator = context.state_stack.save();
@@ -119,7 +116,7 @@ void DisplayListLayer::Paint(PaintContext& context) const {
     mutator.integralTransform();
 
     if (display_list_raster_cache_item_) {
-      SkPaint paint;
+      DlPaint paint;
       if (display_list_raster_cache_item_->Draw(
               context, context.state_stack.fill(paint))) {
         TRACE_EVENT_INSTANT0("flutter", "raster cache hit");
@@ -131,21 +128,23 @@ void DisplayListLayer::Paint(PaintContext& context) const {
   SkScalar opacity = context.state_stack.outstanding_opacity();
 
   if (context.enable_leaf_layer_tracing) {
-    const auto canvas_size = context.canvas->getBaseLayerSize();
+    const auto canvas_size = context.canvas->GetBaseLayerSize();
     auto offscreen_surface =
         std::make_unique<OffscreenSurface>(context.gr_context, canvas_size);
 
-    const auto& ctm = context.canvas->getTotalMatrix();
+    const auto& ctm = context.canvas->GetTransform();
 
     const auto start_time = fml::TimePoint::Now();
     {
       // render display list to offscreen surface.
       auto* canvas = offscreen_surface->GetCanvas();
-      SkAutoCanvasRestore save(canvas, true);
-      canvas->clear(SK_ColorTRANSPARENT);
-      canvas->setMatrix(ctm);
-      display_list()->RenderTo(canvas, opacity);
-      canvas->flush();
+      {
+        DlAutoCanvasRestore save(canvas, true);
+        canvas->Clear(DlColor::kTransparent());
+        canvas->SetTransform(ctm);
+        canvas->DrawDisplayList(display_list_, opacity);
+      }
+      canvas->Flush();
     }
     const fml::TimeDelta offscreen_render_time =
         fml::TimePoint::Now() - start_time;
@@ -158,13 +157,7 @@ void DisplayListLayer::Paint(PaintContext& context) const {
     context.layer_snapshot_store->Add(snapshot_data);
   }
 
-  if (context.builder) {
-    auto display_list = display_list_.skia_object();
-    auto restore = context.state_stack.applyState(display_list->bounds(), 0);
-    context.builder->drawDisplayList(display_list);
-  } else {
-    display_list()->RenderTo(context.canvas, opacity);
-  }
+  context.canvas->DrawDisplayList(display_list_, opacity);
 }
 
 }  // namespace flutter
diff --git a/flow/layers/display_list_layer.h b/flow/layers/display_list_layer.h
index fd981e167a556912913c100d6451db56737b3169..d7efe4e8ee0b98d927eaf4799f199c5b013e2ba6 100644
--- a/flow/layers/display_list_layer.h
+++ b/flow/layers/display_list_layer.h
@@ -11,7 +11,6 @@
 #include "flutter/flow/layers/display_list_raster_cache_item.h"
 #include "flutter/flow/layers/layer.h"
 #include "flutter/flow/raster_cache_item.h"
-#include "flutter/flow/skia_gpu_object.h"
 
 namespace flutter {
 
@@ -20,13 +19,11 @@ class DisplayListLayer : public Layer {
   static constexpr size_t kMaxBytesToCompare = 10000;
 
   DisplayListLayer(const SkPoint& offset,
-                   SkiaGPUObject<DisplayList> display_list,
+                   sk_sp<DisplayList> display_list,
                    bool is_complex,
                    bool will_change);
 
-  DisplayList* display_list() const {
-    return display_list_.skia_object().get();
-  }
+  DisplayList* display_list() const { return display_list_.get(); }
 
   bool IsReplacing(DiffContext* context, const Layer* layer) const override;
 
@@ -55,7 +52,7 @@ class DisplayListLayer : public Layer {
   SkPoint offset_;
   SkRect bounds_;
 
-  flutter::SkiaGPUObject<DisplayList> display_list_;
+  sk_sp<DisplayList> display_list_;
 
   static bool Compare(DiffContext::Statistics& statistics,
                       const DisplayListLayer* l1,
diff --git a/flow/layers/display_list_layer_unittests.cc b/flow/layers/display_list_layer_unittests.cc
index 9cc4dbcd69e53f1a1aea78a5009a2e80167ad655..2552cf79c41f57d34807030f40bf648961154bda 100644
--- a/flow/layers/display_list_layer_unittests.cc
+++ b/flow/layers/display_list_layer_unittests.cc
@@ -6,37 +6,36 @@
 
 #include "flutter/flow/layers/display_list_layer.h"
 
-#include "flutter/display_list/display_list_builder.h"
+#include "flutter/display_list/dl_builder.h"
 #include "flutter/flow/layers/layer_tree.h"
 #include "flutter/flow/testing/diff_context_test.h"
-#include "flutter/flow/testing/skia_gpu_object_layer_test.h"
 #include "flutter/fml/macros.h"
-#include "flutter/testing/mock_canvas.h"
+
+// TODO(zanderso): https://github.com/flutter/flutter/issues/127701
+// NOLINTBEGIN(bugprone-unchecked-optional-access)
 
 namespace flutter {
 namespace testing {
 
-using DisplayListLayerTest = SkiaGPUObjectLayerTest;
+using DisplayListLayerTest = LayerTest;
 
 #ifndef NDEBUG
 TEST_F(DisplayListLayerTest, PaintBeforePrerollInvalidDisplayListDies) {
   const SkPoint layer_offset = SkPoint::Make(0.0f, 0.0f);
   auto layer = std::make_shared<DisplayListLayer>(
-      layer_offset, SkiaGPUObject<DisplayList>(), false, false);
+      layer_offset, sk_sp<DisplayList>(), false, false);
 
-  EXPECT_DEATH_IF_SUPPORTED(layer->Paint(paint_context()),
-                            "display_list_\\.skia_object\\(\\)");
+  EXPECT_DEATH_IF_SUPPORTED(layer->Paint(paint_context()), "display_list_");
 }
 
 TEST_F(DisplayListLayerTest, PaintBeforePrerollDies) {
   const SkPoint layer_offset = SkPoint::Make(0.0f, 0.0f);
   const SkRect picture_bounds = SkRect::MakeLTRB(5.0f, 6.0f, 20.5f, 21.5f);
   DisplayListBuilder builder;
-  builder.drawRect(picture_bounds);
+  builder.DrawRect(picture_bounds, DlPaint());
   auto display_list = builder.Build();
-  auto layer = std::make_shared<DisplayListLayer>(
-      layer_offset, SkiaGPUObject<DisplayList>(display_list, unref_queue()),
-      false, false);
+  auto layer = std::make_shared<DisplayListLayer>(layer_offset, display_list,
+                                                  false, false);
 
   EXPECT_EQ(layer->paint_bounds(), SkRect::MakeEmpty());
   EXPECT_DEATH_IF_SUPPORTED(layer->Paint(paint_context()),
@@ -47,11 +46,10 @@ TEST_F(DisplayListLayerTest, PaintingEmptyLayerDies) {
   const SkPoint layer_offset = SkPoint::Make(0.0f, 0.0f);
   const SkRect picture_bounds = SkRect::MakeEmpty();
   DisplayListBuilder builder;
-  builder.drawRect(picture_bounds);
+  builder.DrawRect(picture_bounds, DlPaint());
   auto display_list = builder.Build();
-  auto layer = std::make_shared<DisplayListLayer>(
-      layer_offset, SkiaGPUObject<DisplayList>(display_list, unref_queue()),
-      false, false);
+  auto layer = std::make_shared<DisplayListLayer>(layer_offset, display_list,
+                                                  false, false);
 
   layer->Preroll(preroll_context());
   EXPECT_EQ(layer->paint_bounds(), SkRect::MakeEmpty());
@@ -64,7 +62,7 @@ TEST_F(DisplayListLayerTest, PaintingEmptyLayerDies) {
 TEST_F(DisplayListLayerTest, InvalidDisplayListDies) {
   const SkPoint layer_offset = SkPoint::Make(0.0f, 0.0f);
   auto layer = std::make_shared<DisplayListLayer>(
-      layer_offset, SkiaGPUObject<DisplayList>(), false, false);
+      layer_offset, sk_sp<DisplayList>(), false, false);
 
   // Crashes reading a nullptr.
   EXPECT_DEATH_IF_SUPPORTED(layer->Preroll(preroll_context()), "");
@@ -73,14 +71,12 @@ TEST_F(DisplayListLayerTest, InvalidDisplayListDies) {
 
 TEST_F(DisplayListLayerTest, SimpleDisplayList) {
   const SkPoint layer_offset = SkPoint::Make(1.5f, -0.5f);
-  const SkMatrix layer_offset_matrix =
-      SkMatrix::Translate(layer_offset.fX, layer_offset.fY);
   const SkRect picture_bounds = SkRect::MakeLTRB(5.0f, 6.0f, 20.5f, 21.5f);
   DisplayListBuilder builder;
-  builder.drawRect(picture_bounds);
+  builder.DrawRect(picture_bounds, DlPaint());
   auto display_list = builder.Build();
-  auto layer = std::make_shared<DisplayListLayer>(
-      layer_offset, SkiaGPUObject(display_list, unref_queue()), false, false);
+  auto layer = std::make_shared<DisplayListLayer>(layer_offset, display_list,
+                                                  false, false);
 
   layer->Preroll(preroll_context());
   EXPECT_EQ(layer->paint_bounds(),
@@ -88,24 +84,27 @@ TEST_F(DisplayListLayerTest, SimpleDisplayList) {
   EXPECT_EQ(layer->display_list(), display_list.get());
   EXPECT_TRUE(layer->needs_painting(paint_context()));
 
-  layer->Paint(paint_context());
-  auto expected_draw_calls = std::vector(
-      {MockCanvas::DrawCall{0, MockCanvas::SaveData{1}},
-       MockCanvas::DrawCall{
-           1, MockCanvas::ConcatMatrixData{SkM44(layer_offset_matrix)}},
-       MockCanvas::DrawCall{
-           1, MockCanvas::DrawRectData{picture_bounds, SkPaint()}},
-       MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}});
-  EXPECT_EQ(mock_canvas().draw_calls(), expected_draw_calls);
+  layer->Paint(display_list_paint_context());
+  DisplayListBuilder expected_builder;
+  /* (DisplayList)layer::Paint */ {
+    expected_builder.Save();
+    {
+      expected_builder.Translate(layer_offset.fX, layer_offset.fY);
+      expected_builder.DrawDisplayList(display_list);
+    }
+    expected_builder.Restore();
+  }
+  EXPECT_TRUE(
+      DisplayListsEQ_Verbose(this->display_list(), expected_builder.Build()));
 }
 
 TEST_F(DisplayListLayerTest, CachingDoesNotChangeCullRect) {
   const SkPoint layer_offset = SkPoint::Make(10, 10);
   DisplayListBuilder builder;
-  builder.drawRect({10, 10, 20, 20});
+  builder.DrawRect({10, 10, 20, 20}, DlPaint());
   auto display_list = builder.Build();
-  auto layer = std::make_shared<DisplayListLayer>(
-      layer_offset, SkiaGPUObject(display_list, unref_queue()), true, false);
+  auto layer = std::make_shared<DisplayListLayer>(layer_offset, display_list,
+                                                  true, false);
 
   SkRect original_cull_rect = preroll_context()->state_stack.device_cull_rect();
   use_mock_raster_cache();
@@ -118,10 +117,10 @@ TEST_F(DisplayListLayerTest, SimpleDisplayListOpacityInheritance) {
   const SkPoint layer_offset = SkPoint::Make(1.5f, -0.5f);
   const SkRect picture_bounds = SkRect::MakeLTRB(5.0f, 6.0f, 20.5f, 21.5f);
   DisplayListBuilder builder;
-  builder.drawRect(picture_bounds);
+  builder.DrawRect(picture_bounds, DlPaint());
   auto display_list = builder.Build();
   auto display_list_layer = std::make_shared<DisplayListLayer>(
-      layer_offset, SkiaGPUObject(display_list, unref_queue()), false, false);
+      layer_offset, display_list, false, false);
   EXPECT_TRUE(display_list->can_apply_group_opacity());
 
   auto context = preroll_context();
@@ -130,6 +129,7 @@ TEST_F(DisplayListLayerTest, SimpleDisplayListOpacityInheritance) {
             LayerStateStack::kCallerCanApplyOpacity);
 
   int opacity_alpha = 0x7F;
+  SkScalar opacity = opacity_alpha / 255.0;
   SkPoint opacity_offset = SkPoint::Make(10, 10);
   auto opacity_layer =
       std::make_shared<OpacityLayer>(opacity_alpha, opacity_offset);
@@ -138,29 +138,24 @@ TEST_F(DisplayListLayerTest, SimpleDisplayListOpacityInheritance) {
   EXPECT_TRUE(opacity_layer->children_can_accept_opacity());
 
   DisplayListBuilder child_builder;
-  child_builder.drawRect(picture_bounds);
+  child_builder.DrawRect(picture_bounds, DlPaint());
   auto child_display_list = child_builder.Build();
 
   DisplayListBuilder expected_builder;
   /* opacity_layer::Paint() */ {
-    expected_builder.save();
+    expected_builder.Save();
     {
-      expected_builder.translate(opacity_offset.fX, opacity_offset.fY);
+      expected_builder.Translate(opacity_offset.fX, opacity_offset.fY);
       /* display_list_layer::Paint() */ {
-        expected_builder.save();
+        expected_builder.Save();
         {
-          expected_builder.translate(layer_offset.fX, layer_offset.fY);
-          expected_builder.setColor(opacity_alpha << 24);
-          expected_builder.saveLayer(&picture_bounds, true);
-          /* display_list contents */ {  //
-            expected_builder.drawDisplayList(child_display_list);
-          }
-          expected_builder.restore();
+          expected_builder.Translate(layer_offset.fX, layer_offset.fY);
+          expected_builder.DrawDisplayList(child_display_list, opacity);
         }
-        expected_builder.restore();
+        expected_builder.Restore();
       }
     }
-    expected_builder.restore();
+    expected_builder.Restore();
   }
 
   opacity_layer->Paint(display_list_paint_context());
@@ -173,11 +168,11 @@ TEST_F(DisplayListLayerTest, IncompatibleDisplayListOpacityInheritance) {
   const SkRect picture1_bounds = SkRect::MakeLTRB(5.0f, 6.0f, 20.5f, 21.5f);
   const SkRect picture2_bounds = SkRect::MakeLTRB(10.0f, 15.0f, 30.0f, 35.0f);
   DisplayListBuilder builder;
-  builder.drawRect(picture1_bounds);
-  builder.drawRect(picture2_bounds);
+  builder.DrawRect(picture1_bounds, DlPaint());
+  builder.DrawRect(picture2_bounds, DlPaint());
   auto display_list = builder.Build();
   auto display_list_layer = std::make_shared<DisplayListLayer>(
-      layer_offset, SkiaGPUObject(display_list, unref_queue()), false, false);
+      layer_offset, display_list, false, false);
   EXPECT_FALSE(display_list->can_apply_group_opacity());
 
   auto context = preroll_context();
@@ -193,8 +188,8 @@ TEST_F(DisplayListLayerTest, IncompatibleDisplayListOpacityInheritance) {
   EXPECT_FALSE(opacity_layer->children_can_accept_opacity());
 
   DisplayListBuilder child_builder;
-  child_builder.drawRect(picture1_bounds);
-  child_builder.drawRect(picture2_bounds);
+  child_builder.DrawRect(picture1_bounds, DlPaint());
+  child_builder.DrawRect(picture2_bounds, DlPaint());
   auto child_display_list = child_builder.Build();
 
   auto display_list_bounds = picture1_bounds;
@@ -203,24 +198,24 @@ TEST_F(DisplayListLayerTest, IncompatibleDisplayListOpacityInheritance) {
       display_list_bounds.makeOffset(layer_offset.fX, layer_offset.fY);
   DisplayListBuilder expected_builder;
   /* opacity_layer::Paint() */ {
-    expected_builder.save();
+    expected_builder.Save();
     {
-      expected_builder.translate(opacity_offset.fX, opacity_offset.fY);
-      expected_builder.setColor(opacity_alpha << 24);
-      expected_builder.saveLayer(&save_layer_bounds, true);
+      expected_builder.Translate(opacity_offset.fX, opacity_offset.fY);
+      expected_builder.SaveLayer(&save_layer_bounds,
+                                 &DlPaint().setAlpha(opacity_alpha));
       {
         /* display_list_layer::Paint() */ {
-          expected_builder.save();
+          expected_builder.Save();
           {
-            expected_builder.translate(layer_offset.fX, layer_offset.fY);
-            expected_builder.drawDisplayList(child_display_list);
+            expected_builder.Translate(layer_offset.fX, layer_offset.fY);
+            expected_builder.DrawDisplayList(child_display_list);
           }
-          expected_builder.restore();
+          expected_builder.Restore();
         }
       }
-      expected_builder.restore();
+      expected_builder.Restore();
     }
-    expected_builder.restore();
+    expected_builder.Restore();
   }
 
   opacity_layer->Paint(display_list_paint_context());
@@ -233,11 +228,11 @@ TEST_F(DisplayListLayerTest, CachedIncompatibleDisplayListOpacityInheritance) {
   const SkRect picture1_bounds = SkRect::MakeLTRB(5.0f, 6.0f, 20.5f, 21.5f);
   const SkRect picture2_bounds = SkRect::MakeLTRB(10.0f, 15.0f, 30.0f, 35.0f);
   DisplayListBuilder builder;
-  builder.drawRect(picture1_bounds);
-  builder.drawRect(picture2_bounds);
+  builder.DrawRect(picture1_bounds, DlPaint());
+  builder.DrawRect(picture2_bounds, DlPaint());
   auto display_list = builder.Build();
   auto display_list_layer = std::make_shared<DisplayListLayer>(
-      layer_offset, SkiaGPUObject(display_list, unref_queue()), true, false);
+      layer_offset, display_list, true, false);
   EXPECT_FALSE(display_list->can_apply_group_opacity());
 
   use_skia_raster_cache();
@@ -254,62 +249,113 @@ TEST_F(DisplayListLayerTest, CachedIncompatibleDisplayListOpacityInheritance) {
                               &paint_context(), false);
 
   int opacity_alpha = 0x7F;
-  SkPoint opacity_offset = SkPoint::Make(10, 10);
+  SkPoint opacity_offset = SkPoint::Make(10.2, 10.2);
   auto opacity_layer =
       std::make_shared<OpacityLayer>(opacity_alpha, opacity_offset);
   opacity_layer->Add(display_list_layer);
   opacity_layer->Preroll(context);
   EXPECT_TRUE(opacity_layer->children_can_accept_opacity());
 
-  // The following would be a great test of the painting of the above
-  // setup, but for the fact that the raster cache stores raw pointers
-  // to sk_sp<SkImage> and the canvas recorder then wraps each of those
-  // in a unique DlImage - which means the DisplayList objects will not
-  // compare with the Equals method since the addresses of the two
-  // DlImage objects will not be equal even if they point to the same
-  // SkImage on each frame.
-  // See https://github.com/flutter/flutter/issues/102331
-  //   auto display_list_bounds = picture1_bounds;
-  //   display_list_bounds.join(picture2_bounds);
-  //   auto save_layer_bounds =
-  //       display_list_bounds.makeOffset(layer_offset.fX, layer_offset.fY);
-  //   save_layer_bounds.roundOut(&save_layer_bounds);
-  //   auto opacity_integral_matrix =
-  //       RasterCacheUtil::GetIntegralTransCTM(SkMatrix::Translate(opacity_offset));
-  //   SkMatrix layer_offset_matrix = opacity_integral_matrix;
-  //   layer_offset_matrix.postTranslate(layer_offset.fX, layer_offset.fY);
-  //   auto layer_offset_integral_matrix =
-  //       RasterCacheUtil::GetIntegralTransCTM(layer_offset_matrix);
-  //   // Using a recorder instead of a DisplayListBuilder so we can hand it
-  //   // off to the RasterCache::Draw() method
-  //   DisplayListCanvasRecorder recorder(SkRect::MakeWH(1000, 1000));
-  //   /* opacity_layer::Paint() */ {
-  //     recorder.save();
-  //     {
-  //       recorder.translate(opacity_offset.fX, opacity_offset.fY);
-  //       /* display_list_layer::Paint() */ {
-  //         recorder.save();
-  //         {
-  //           recorder.translate(layer_offset.fX, layer_offset.fY);
-  //           SkPaint p;
-  //           p.setAlpha(opacity_alpha);
-  //           context->raster_cache->Draw(*display_list, recorder, &p);
-  //         }
-  //         recorder.restore();
-  //       }
-  //     }
-  //     recorder.restore();
-  //   }
-
-  //   opacity_layer->Paint(display_list_paint_context());
-  //   EXPECT_TRUE(
-  //       DisplayListsEQ_Verbose(recorder.Build(), this->display_list()));
+  auto display_list_bounds = picture1_bounds;
+  display_list_bounds.join(picture2_bounds);
+  auto save_layer_bounds =
+      display_list_bounds.makeOffset(layer_offset.fX, layer_offset.fY);
+  save_layer_bounds.roundOut(&save_layer_bounds);
+  auto opacity_integral_matrix =
+      RasterCacheUtil::GetIntegralTransCTM(SkMatrix::Translate(opacity_offset));
+  SkMatrix layer_offset_matrix = opacity_integral_matrix;
+  layer_offset_matrix.postTranslate(layer_offset.fX, layer_offset.fY);
+  auto layer_offset_integral_matrix =
+      RasterCacheUtil::GetIntegralTransCTM(layer_offset_matrix);
+  DisplayListBuilder expected(SkRect::MakeWH(1000, 1000));
+  /* opacity_layer::Paint() */ {
+    expected.Save();
+    {
+      expected.Translate(opacity_offset.fX, opacity_offset.fY);
+      expected.TransformReset();
+      expected.Transform(opacity_integral_matrix);
+      /* display_list_layer::Paint() */ {
+        expected.Save();
+        {
+          expected.Translate(layer_offset.fX, layer_offset.fY);
+          expected.TransformReset();
+          expected.Transform(layer_offset_integral_matrix);
+          context->raster_cache->Draw(display_list_layer->caching_key_id(),
+                                      expected,
+                                      &DlPaint().setAlpha(opacity_alpha));
+        }
+        expected.Restore();
+      }
+    }
+    expected.Restore();
+  }
+
+  opacity_layer->Paint(display_list_paint_context());
+  EXPECT_TRUE(DisplayListsEQ_Verbose(expected.Build(), this->display_list()));
 }
 
+TEST_F(DisplayListLayerTest, RasterCachePreservesRTree) {
+  const SkRect picture1_bounds = SkRect::MakeXYWH(10, 10, 10, 10);
+  const SkRect picture2_bounds = SkRect::MakeXYWH(15, 15, 10, 10);
+  DisplayListBuilder builder(true);
+  builder.DrawRect(picture1_bounds, DlPaint());
+  builder.DrawRect(picture2_bounds, DlPaint());
+  auto display_list = builder.Build();
+  auto display_list_layer = std::make_shared<DisplayListLayer>(
+      SkPoint::Make(3, 3), display_list, true, false);
+
+  use_skia_raster_cache();
+
+  auto context = preroll_context();
+  {
+    auto mutator = context->state_stack.save();
+    mutator.transform(SkMatrix::Scale(2.0, 2.0));
+    display_list_layer->Preroll(preroll_context());
+    EXPECT_EQ(context->renderable_state_flags, 0);
+
+    // Pump the DisplayListLayer until it is ready to cache its DL
+    display_list_layer->Preroll(preroll_context());
+    display_list_layer->Preroll(preroll_context());
+    display_list_layer->Preroll(preroll_context());
+    LayerTree::TryToRasterCache(*preroll_context()->raster_cached_entries,
+                                &paint_context(), false);
+  }
+
+  DisplayListBuilder expected_root_canvas(true);
+  expected_root_canvas.Scale(2.0, 2.0);
+  ASSERT_TRUE(context->raster_cache->Draw(display_list_layer->caching_key_id(),
+                                          expected_root_canvas, nullptr,
+                                          false));
+  auto root_canvas_dl = expected_root_canvas.Build();
+  const auto root_canvas_rects =
+      root_canvas_dl->rtree()->searchAndConsolidateRects(kGiantRect, true);
+  std::list<SkRect> root_canvas_rects_expected = {
+      SkRect::MakeLTRB(26, 26, 56, 56),
+  };
+  EXPECT_EQ(root_canvas_rects_expected, root_canvas_rects);
+
+  DisplayListBuilder expected_overlay_canvas(true);
+  expected_overlay_canvas.Scale(2.0, 2.0);
+  ASSERT_TRUE(context->raster_cache->Draw(display_list_layer->caching_key_id(),
+                                          expected_overlay_canvas, nullptr,
+                                          true));
+  auto overlay_canvas_dl = expected_overlay_canvas.Build();
+  const auto overlay_canvas_rects =
+      overlay_canvas_dl->rtree()->searchAndConsolidateRects(kGiantRect, true);
+
+  // Same bounds as root canvas, but preserves individual rects.
+  std::list<SkRect> overlay_canvas_rects_expected = {
+      SkRect::MakeLTRB(26, 26, 46, 36),
+      SkRect::MakeLTRB(26, 36, 56, 46),
+      SkRect::MakeLTRB(36, 46, 56, 56),
+  };
+  EXPECT_EQ(overlay_canvas_rects_expected, overlay_canvas_rects);
+};
+
 using DisplayListLayerDiffTest = DiffContextTest;
 
 TEST_F(DisplayListLayerDiffTest, SimpleDisplayList) {
-  auto display_list = CreateDisplayList(SkRect::MakeLTRB(10, 10, 60, 60), 1);
+  auto display_list = CreateDisplayList(SkRect::MakeLTRB(10, 10, 60, 60));
 
   MockLayerTree tree1;
   tree1.root()->Add(CreateDisplayListLayer(display_list));
@@ -329,7 +375,7 @@ TEST_F(DisplayListLayerDiffTest, SimpleDisplayList) {
 }
 
 TEST_F(DisplayListLayerDiffTest, FractionalTranslation) {
-  auto display_list = CreateDisplayList(SkRect::MakeLTRB(10, 10, 60, 60), 1);
+  auto display_list = CreateDisplayList(SkRect::MakeLTRB(10, 10, 60, 60));
 
   MockLayerTree tree1;
   tree1.root()->Add(
@@ -342,7 +388,7 @@ TEST_F(DisplayListLayerDiffTest, FractionalTranslation) {
 }
 
 TEST_F(DisplayListLayerDiffTest, FractionalTranslationWithRasterCache) {
-  auto display_list = CreateDisplayList(SkRect::MakeLTRB(10, 10, 60, 60), 1);
+  auto display_list = CreateDisplayList(SkRect::MakeLTRB(10, 10, 60, 60));
 
   MockLayerTree tree1;
   tree1.root()->Add(
@@ -356,21 +402,25 @@ TEST_F(DisplayListLayerDiffTest, FractionalTranslationWithRasterCache) {
 
 TEST_F(DisplayListLayerDiffTest, DisplayListCompare) {
   MockLayerTree tree1;
-  auto display_list1 = CreateDisplayList(SkRect::MakeLTRB(10, 10, 60, 60), 1);
+  auto display_list1 =
+      CreateDisplayList(SkRect::MakeLTRB(10, 10, 60, 60), DlColor::kGreen());
   tree1.root()->Add(CreateDisplayListLayer(display_list1));
 
   auto damage = DiffLayerTree(tree1, MockLayerTree());
   EXPECT_EQ(damage.frame_damage, SkIRect::MakeLTRB(10, 10, 60, 60));
 
   MockLayerTree tree2;
-  auto display_list2 = CreateDisplayList(SkRect::MakeLTRB(10, 10, 60, 60), 1);
+  // same DL, same offset
+  auto display_list2 =
+      CreateDisplayList(SkRect::MakeLTRB(10, 10, 60, 60), DlColor::kGreen());
   tree2.root()->Add(CreateDisplayListLayer(display_list2));
 
   damage = DiffLayerTree(tree2, tree1);
   EXPECT_EQ(damage.frame_damage, SkIRect::MakeEmpty());
 
   MockLayerTree tree3;
-  auto display_list3 = CreateDisplayList(SkRect::MakeLTRB(10, 10, 60, 60), 1);
+  auto display_list3 =
+      CreateDisplayList(SkRect::MakeLTRB(10, 10, 60, 60), DlColor::kGreen());
   // add offset
   tree3.root()->Add(
       CreateDisplayListLayer(display_list3, SkPoint::Make(10, 10)));
@@ -380,7 +430,8 @@ TEST_F(DisplayListLayerDiffTest, DisplayListCompare) {
 
   MockLayerTree tree4;
   // different color
-  auto display_list4 = CreateDisplayList(SkRect::MakeLTRB(10, 10, 60, 60), 2);
+  auto display_list4 =
+      CreateDisplayList(SkRect::MakeLTRB(10, 10, 60, 60), DlColor::kRed());
   tree4.root()->Add(
       CreateDisplayListLayer(display_list4, SkPoint::Make(10, 10)));
 
@@ -392,10 +443,10 @@ TEST_F(DisplayListLayerTest, LayerTreeSnapshotsWhenEnabled) {
   const SkPoint layer_offset = SkPoint::Make(1.5f, -0.5f);
   const SkRect picture_bounds = SkRect::MakeLTRB(5.0f, 6.0f, 20.5f, 21.5f);
   DisplayListBuilder builder;
-  builder.drawRect(picture_bounds);
+  builder.DrawRect(picture_bounds, DlPaint());
   auto display_list = builder.Build();
-  auto layer = std::make_shared<DisplayListLayer>(
-      layer_offset, SkiaGPUObject(display_list, unref_queue()), false, false);
+  auto layer = std::make_shared<DisplayListLayer>(layer_offset, display_list,
+                                                  false, false);
 
   layer->Preroll(preroll_context());
 
@@ -411,10 +462,10 @@ TEST_F(DisplayListLayerTest, NoLayerTreeSnapshotsWhenDisabledByDefault) {
   const SkPoint layer_offset = SkPoint::Make(1.5f, -0.5f);
   const SkRect picture_bounds = SkRect::MakeLTRB(5.0f, 6.0f, 20.5f, 21.5f);
   DisplayListBuilder builder;
-  builder.drawRect(picture_bounds);
+  builder.DrawRect(picture_bounds, DlPaint());
   auto display_list = builder.Build();
-  auto layer = std::make_shared<DisplayListLayer>(
-      layer_offset, SkiaGPUObject(display_list, unref_queue()), false, false);
+  auto layer = std::make_shared<DisplayListLayer>(layer_offset, display_list,
+                                                  false, false);
 
   layer->Preroll(preroll_context());
   layer->Paint(paint_context());
@@ -429,10 +480,10 @@ TEST_F(DisplayListLayerTest, DisplayListAccessCountDependsOnVisibility) {
   const SkRect missed_cull_rect = SkRect::MakeLTRB(100, 100, 200, 200);
   const SkRect hit_cull_rect = SkRect::MakeLTRB(0, 0, 200, 200);
   DisplayListBuilder builder;
-  builder.drawRect(picture_bounds);
+  builder.DrawRect(picture_bounds, DlPaint());
   auto display_list = builder.Build();
-  auto layer = std::make_shared<DisplayListLayer>(
-      layer_offset, SkiaGPUObject(display_list, unref_queue()), true, false);
+  auto layer = std::make_shared<DisplayListLayer>(layer_offset, display_list,
+                                                  true, false);
 
   auto raster_cache_item = layer->raster_cache_item();
   use_mock_raster_cache();
@@ -523,22 +574,22 @@ TEST_F(DisplayListLayerTest, OverflowCachedDisplayListOpacityInheritance) {
   use_mock_raster_cache();
   PrerollContext* context = preroll_context();
   int per_frame =
-      RasterCacheUtil::kDefaultPictureAndDispLayListCacheLimitPerFrame;
+      RasterCacheUtil::kDefaultPictureAndDisplayListCacheLimitPerFrame;
   int layer_count = per_frame + 1;
   SkPoint opacity_offset = {10, 10};
   auto opacity_layer = std::make_shared<OpacityLayer>(0.5f, opacity_offset);
-  std::shared_ptr<DisplayListLayer> layers[layer_count];
+  std::vector<std::shared_ptr<DisplayListLayer>> layers;
   for (int i = 0; i < layer_count; i++) {
-    DisplayListBuilder builder;
-    builder.drawRect({0, 0, 100, 100});
-    builder.drawRect({50, 50, 100, 100});
+    DisplayListBuilder builder(false);
+    builder.DrawRect({0, 0, 100, 100}, DlPaint());
+    builder.DrawRect({50, 50, 100, 100}, DlPaint());
     auto display_list = builder.Build();
     ASSERT_FALSE(display_list->can_apply_group_opacity());
     SkPoint offset = {i * 200.0f, 0};
 
-    layers[i] = std::make_shared<DisplayListLayer>(
-        offset, SkiaGPUObject(display_list, unref_queue()), true, false);
-    opacity_layer->Add(layers[i]);
+    layers.push_back(
+        std::make_shared<DisplayListLayer>(offset, display_list, true, false));
+    opacity_layer->Add(layers.back());
   }
   for (size_t j = 0; j < context->raster_cache->access_threshold(); j++) {
     context->raster_cache->BeginFrame();
@@ -585,3 +636,5 @@ TEST_F(DisplayListLayerTest, OverflowCachedDisplayListOpacityInheritance) {
 
 }  // namespace testing
 }  // namespace flutter
+
+// NOLINTEND(bugprone-unchecked-optional-access)
diff --git a/flow/layers/display_list_raster_cache_item.cc b/flow/layers/display_list_raster_cache_item.cc
index 045ea1811219efe4adedb67c2cc17e16cf7d63e7..c0675785f724b8bc853ae1712b89e94873dfb222 100644
--- a/flow/layers/display_list_raster_cache_item.cc
+++ b/flow/layers/display_list_raster_cache_item.cc
@@ -7,18 +7,19 @@
 #include <optional>
 #include <utility>
 
+#include "flutter/display_list/benchmarking/dl_complexity.h"
 #include "flutter/display_list/display_list.h"
 #include "flutter/flow/layers/layer.h"
 #include "flutter/flow/raster_cache.h"
 #include "flutter/flow/raster_cache_item.h"
 #include "flutter/flow/raster_cache_key.h"
 #include "flutter/flow/raster_cache_util.h"
-#include "flutter/flow/skia_gpu_object.h"
+#include "third_party/skia/include/gpu/GrDirectContext.h"
 
 namespace flutter {
 
 static bool IsDisplayListWorthRasterizing(
-    DisplayList* display_list,
+    const DisplayList* display_list,
     bool will_change,
     bool is_complex,
     DisplayListComplexityCalculator* complexity_calculator) {
@@ -46,7 +47,7 @@ static bool IsDisplayListWorthRasterizing(
 }
 
 DisplayListRasterCacheItem::DisplayListRasterCacheItem(
-    DisplayList* display_list,
+    const sk_sp<DisplayList>& display_list,
     const SkPoint& offset,
     bool is_complex,
     bool will_change)
@@ -59,7 +60,7 @@ DisplayListRasterCacheItem::DisplayListRasterCacheItem(
       will_change_(will_change) {}
 
 std::unique_ptr<DisplayListRasterCacheItem> DisplayListRasterCacheItem::Make(
-    DisplayList* display_list,
+    const sk_sp<DisplayList>& display_list,
     const SkPoint& offset,
     bool is_complex,
     bool will_change) {
@@ -75,7 +76,7 @@ void DisplayListRasterCacheItem::PrerollSetup(PrerollContext* context,
                                 context->gr_context->backend())
                           : DisplayListComplexityCalculator::GetForSoftware();
 
-  if (!IsDisplayListWorthRasterizing(display_list_, will_change_, is_complex_,
+  if (!IsDisplayListWorthRasterizing(display_list(), will_change_, is_complex_,
                                      complexity_calculator)) {
     // We only deal with display lists that are worthy of rasterization.
     return;
@@ -104,10 +105,6 @@ void DisplayListRasterCacheItem::PrerollFinalize(PrerollContext* context,
   }
   auto* raster_cache = context->raster_cache;
   SkRect bounds = display_list_->bounds().makeOffset(offset_.x(), offset_.y());
-  // We must to create an entry whenever if the react is intersect.
-  // if the rect is intersect we will get the entry access_count to confirm if
-  // it great than the threshold. Otherwise we only increase the entry
-  // access_count.
   bool visible = !context->state_stack.content_culled(bounds);
   RasterCache::CacheInfo cache_info =
       raster_cache->MarkSeen(key_id_, matrix, visible);
@@ -125,18 +122,19 @@ void DisplayListRasterCacheItem::PrerollFinalize(PrerollContext* context,
 }
 
 bool DisplayListRasterCacheItem::Draw(const PaintContext& context,
-                                      const SkPaint* paint) const {
+                                      const DlPaint* paint) const {
   return Draw(context, context.canvas, paint);
 }
 
 bool DisplayListRasterCacheItem::Draw(const PaintContext& context,
-                                      SkCanvas* canvas,
-                                      const SkPaint* paint) const {
+                                      DlCanvas* canvas,
+                                      const DlPaint* paint) const {
   if (!context.raster_cache || !canvas) {
     return false;
   }
   if (cache_state_ == CacheState::kCurrent) {
-    return context.raster_cache->Draw(key_id_, *canvas, paint);
+    return context.raster_cache->Draw(key_id_, *canvas, paint,
+                                      context.rendering_above_platform_view);
   }
   return false;
 }
@@ -152,8 +150,10 @@ bool DisplayListRasterCacheItem::TryToPrepareRasterCache(
   // display_list or picture_list to calculate the memory they used, we
   // shouldn't cache the current node if the memory is more significant than the
   // limit.
+  auto id = GetId();
+  FML_DCHECK(id.has_value());
   if (cache_state_ == kNone || !context.raster_cache || parent_cached ||
-      !context.raster_cache->GenerateNewCacheInThisFrame()) {
+      !context.raster_cache->GenerateNewCacheInThisFrame() || !id.has_value()) {
     return false;
   }
   SkRect bounds = display_list_->bounds().makeOffset(offset_.x(), offset_.y());
@@ -167,9 +167,10 @@ bool DisplayListRasterCacheItem::TryToPrepareRasterCache(
       // clang-format on
   };
   return context.raster_cache->UpdateCacheEntry(
-      GetId().value(), r_context,
-      [display_list = display_list_](SkCanvas* canvas) {
-        display_list->RenderTo(canvas);
-      });
+      id.value(), r_context,
+      [display_list = display_list_](DlCanvas* canvas) {
+        canvas->DrawDisplayList(display_list);
+      },
+      display_list_->rtree());
 }
 }  // namespace flutter
diff --git a/flow/layers/display_list_raster_cache_item.h b/flow/layers/display_list_raster_cache_item.h
index 65d838939e92d9025578ee55359aef8a979b457c..e8d8d47c0eb4017544ff8ebcc9d2c513f620ed54 100644
--- a/flow/layers/display_list_raster_cache_item.h
+++ b/flow/layers/display_list_raster_cache_item.h
@@ -2,47 +2,43 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLOW_DISPLAY_LIST_RASTER_CACHE_ITEM_H_
-#define FLUTTER_FLOW_DISPLAY_LIST_RASTER_CACHE_ITEM_H_
+#ifndef FLUTTER_FLOW_LAYERS_DISPLAY_LIST_RASTER_CACHE_ITEM_H_
+#define FLUTTER_FLOW_LAYERS_DISPLAY_LIST_RASTER_CACHE_ITEM_H_
 
 #include <memory>
 #include <optional>
 
 #include "flutter/display_list/display_list.h"
-#include "flutter/display_list/display_list_utils.h"
 #include "flutter/flow/embedded_views.h"
 #include "flutter/flow/raster_cache_item.h"
-#include "include/core/SkCanvas.h"
-#include "include/core/SkColorSpace.h"
-#include "include/core/SkMatrix.h"
-#include "include/core/SkPicture.h"
-#include "include/core/SkPoint.h"
-#include "include/core/SkRect.h"
+#include "third_party/skia/include/core/SkMatrix.h"
+#include "third_party/skia/include/core/SkPoint.h"
 
 namespace flutter {
 
 class DisplayListRasterCacheItem : public RasterCacheItem {
  public:
-  DisplayListRasterCacheItem(DisplayList* display_list,
+  DisplayListRasterCacheItem(const sk_sp<DisplayList>& display_list,
                              const SkPoint& offset,
                              bool is_complex = true,
                              bool will_change = false);
 
-  static std::unique_ptr<DisplayListRasterCacheItem> Make(DisplayList*,
-                                                          const SkPoint& offset,
-                                                          bool is_complex,
-                                                          bool will_change);
+  static std::unique_ptr<DisplayListRasterCacheItem> Make(
+      const sk_sp<DisplayList>&,
+      const SkPoint& offset,
+      bool is_complex,
+      bool will_change);
 
   void PrerollSetup(PrerollContext* context, const SkMatrix& matrix) override;
 
   void PrerollFinalize(PrerollContext* context,
                        const SkMatrix& matrix) override;
 
-  bool Draw(const PaintContext& context, const SkPaint* paint) const override;
+  bool Draw(const PaintContext& context, const DlPaint* paint) const override;
 
   bool Draw(const PaintContext& context,
-            SkCanvas* canvas,
-            const SkPaint* paint) const override;
+            DlCanvas* canvas,
+            const DlPaint* paint) const override;
 
   bool TryToPrepareRasterCache(const PaintContext& context,
                                bool parent_cached = false) const override;
@@ -51,11 +47,11 @@ class DisplayListRasterCacheItem : public RasterCacheItem {
     matrix_ = matrix_.preTranslate(offset.x(), offset.y());
   }
 
-  const DisplayList* display_list() const { return display_list_; }
+  const DisplayList* display_list() const { return display_list_.get(); }
 
  private:
   SkMatrix transformation_matrix_;
-  DisplayList* display_list_;
+  sk_sp<DisplayList> display_list_;
   SkPoint offset_;
   bool is_complex_;
   bool will_change_;
@@ -63,4 +59,4 @@ class DisplayListRasterCacheItem : public RasterCacheItem {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_FLOW_DISPLAY_LIST_RASTER_CACHE_ITEM_H_
+#endif  // FLUTTER_FLOW_LAYERS_DISPLAY_LIST_RASTER_CACHE_ITEM_H_
diff --git a/flow/layers/image_filter_layer.cc b/flow/layers/image_filter_layer.cc
index 456ada3afcd0d95cf6749d00e95d10230bd77106..834df45ce857ded5a85cbef81839264aeb245c6f 100644
--- a/flow/layers/image_filter_layer.cc
+++ b/flow/layers/image_filter_layer.cc
@@ -3,7 +3,8 @@
 // found in the LICENSE file.
 
 #include "flutter/flow/layers/image_filter_layer.h"
-#include "flutter/display_list/display_list_comparable.h"
+
+#include "flutter/display_list/utils/dl_comparable.h"
 #include "flutter/flow/layers/layer.h"
 #include "flutter/flow/raster_cache_util.h"
 
@@ -29,12 +30,11 @@ void ImageFilterLayer::Diff(DiffContext* context, const Layer* old_layer) {
 
   context->PushTransform(SkMatrix::Translate(offset_.fX, offset_.fY));
   if (context->has_raster_cache()) {
-    context->SetTransform(
-        RasterCacheUtil::GetIntegralTransCTM(context->GetTransform()));
+    context->WillPaintWithIntegralTransform();
   }
 
   if (filter_) {
-    auto filter = filter_->makeWithLocalMatrix(context->GetTransform());
+    auto filter = filter_->makeWithLocalMatrix(context->GetTransform3x3());
     if (filter) {
       // This transform will be applied to every child rect in the subtree
       context->PushFilterBoundsAdjustment([filter](SkRect rect) {
@@ -64,6 +64,7 @@ void ImageFilterLayer::Preroll(PrerollContext* context) {
   PrerollChildren(context, &child_bounds);
 
   if (!filter_) {
+    child_bounds.offset(offset_);
     set_paint_bounds(child_bounds);
     return;
   }
@@ -104,9 +105,9 @@ void ImageFilterLayer::Paint(PaintContext& context) const {
     // Try drawing the layer cache item from the cache before applying the
     // image filter if it was cached with the filter applied.
     if (!layer_raster_cache_item_->IsCacheChildren()) {
-      SkPaint sk_paint;
+      DlPaint paint;
       if (layer_raster_cache_item_->Draw(context,
-                                         context.state_stack.fill(sk_paint))) {
+                                         context.state_stack.fill(paint))) {
         return;
       }
     }
@@ -124,10 +125,10 @@ void ImageFilterLayer::Paint(PaintContext& context) const {
     // transformed version of the filter so we must process it into the
     // cache paint object manually.
     FML_DCHECK(transformed_filter_ != nullptr);
-    SkPaint sk_paint;
-    context.state_stack.fill(sk_paint);
-    sk_paint.setImageFilter(transformed_filter_->skia_object());
-    if (layer_raster_cache_item_->Draw(context, &sk_paint)) {
+    DlPaint paint;
+    context.state_stack.fill(paint);
+    paint.setImageFilter(transformed_filter_);
+    if (layer_raster_cache_item_->Draw(context, &paint)) {
       return;
     }
   }
diff --git a/flow/layers/image_filter_layer.h b/flow/layers/image_filter_layer.h
index b8e64b8cc73ec1b48abde2feb0ad62faf517d18f..b96937da1425aece140e2764179ef6c74effad84 100644
--- a/flow/layers/image_filter_layer.h
+++ b/flow/layers/image_filter_layer.h
@@ -7,9 +7,6 @@
 
 #include <memory>
 #include "flutter/flow/layers/cacheable_layer.h"
-#include "flutter/flow/layers/layer.h"
-#include "include/core/SkRefCnt.h"
-#include "third_party/skia/include/core/SkImageFilter.h"
 
 namespace flutter {
 
diff --git a/flow/layers/image_filter_layer_unittests.cc b/flow/layers/image_filter_layer_unittests.cc
index c0bb30930b370ccc6164f710e99bed10ab0dd55c..17ed929dd3b08bb80eacc16b9658c265d1efc782 100644
--- a/flow/layers/image_filter_layer_unittests.cc
+++ b/flow/layers/image_filter_layer_unittests.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/display_list/display_list_tile_mode.h"
+#include "flutter/display_list/dl_tile_mode.h"
 #include "flutter/flow/layers/image_filter_layer.h"
 
 #include "flutter/flow/layers/layer_tree.h"
@@ -11,12 +11,13 @@
 #include "flutter/flow/testing/layer_test.h"
 #include "flutter/flow/testing/mock_layer.h"
 #include "flutter/fml/macros.h"
-#include "flutter/testing/mock_canvas.h"
 #include "gtest/gtest.h"
-#include "include/core/SkPaint.h"
 #include "include/core/SkPath.h"
 #include "third_party/skia/include/effects/SkImageFilters.h"
 
+// TODO(zanderso): https://github.com/flutter/flutter/issues/127701
+// NOLINTBEGIN(bugprone-unchecked-optional-access)
+
 namespace flutter {
 namespace testing {
 
@@ -52,7 +53,7 @@ TEST_F(ImageFilterLayerTest, EmptyFilter) {
   const SkMatrix initial_transform = SkMatrix::Translate(0.5f, 1.0f);
   const SkRect child_bounds = SkRect::MakeLTRB(5.0f, 6.0f, 20.5f, 21.5f);
   const SkPath child_path = SkPath().addRect(child_bounds);
-  const SkPaint child_paint = SkPaint(SkColors::kYellow);
+  const DlPaint child_paint = DlPaint(DlColor::kYellow());
   auto mock_layer = std::make_shared<MockLayer>(child_path, child_paint);
   auto layer = std::make_shared<ImageFilterLayer>(nullptr);
   layer->Add(mock_layer);
@@ -64,21 +65,23 @@ TEST_F(ImageFilterLayerTest, EmptyFilter) {
   EXPECT_TRUE(layer->needs_painting(paint_context()));
   EXPECT_EQ(mock_layer->parent_matrix(), initial_transform);
 
-  SkPaint filter_paint;
-  filter_paint.setImageFilter(nullptr);
-  layer->Paint(paint_context());
-  EXPECT_EQ(mock_canvas().draw_calls(),
-            std::vector({
-                MockCanvas::DrawCall{
-                    0, MockCanvas::DrawPathData{child_path, child_paint}},
-            }));
+  layer->Paint(display_list_paint_context());
+  DisplayListBuilder expected_builder;
+  /* (ImageFilter)layer::Paint */ {
+    expected_builder.Save();
+    /* mock_layer1::Paint */ {
+      expected_builder.DrawPath(child_path, child_paint);
+    }
+    expected_builder.Restore();
+  }
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
 }
 
 TEST_F(ImageFilterLayerTest, SimpleFilter) {
   const SkMatrix initial_transform = SkMatrix::Translate(0.5f, 1.0f);
   const SkRect child_bounds = SkRect::MakeLTRB(5.0f, 6.0f, 20.5f, 21.5f);
   const SkPath child_path = SkPath().addRect(child_bounds);
-  const SkPaint child_paint = SkPaint(SkColors::kYellow);
+  const DlPaint child_paint = DlPaint(DlColor::kYellow());
   auto dl_image_filter = std::make_shared<DlMatrixImageFilter>(
       SkMatrix(), DlImageSampling::kMipmapLinear);
   auto mock_layer = std::make_shared<MockLayer>(child_path, child_paint);
@@ -99,15 +102,14 @@ TEST_F(ImageFilterLayerTest, SimpleFilter) {
   /* ImageFilterLayer::Paint() */ {
     DlPaint dl_paint;
     dl_paint.setImageFilter(dl_image_filter.get());
-    expected_builder.saveLayer(&child_bounds, &dl_paint);
+    expected_builder.SaveLayer(&child_bounds, &dl_paint);
     {
       /* MockLayer::Paint() */ {
-        expected_builder.drawPath(child_path,
-                                  DlPaint().setColor(DlColor::kYellow()));
+        expected_builder.DrawPath(child_path, DlPaint(DlColor::kYellow()));
       }
     }
   }
-  expected_builder.restore();
+  expected_builder.Restore();
   auto expected_display_list = expected_builder.Build();
 
   layer->Paint(display_list_paint_context());
@@ -119,7 +121,7 @@ TEST_F(ImageFilterLayerTest, SimpleFilterWithOffset) {
   const SkRect initial_cull_rect = SkRect::MakeLTRB(0, 0, 100, 100);
   const SkRect child_bounds = SkRect::MakeLTRB(5.0f, 6.0f, 20.5f, 21.5f);
   const SkPath child_path = SkPath().addRect(child_bounds);
-  const SkPaint child_paint = SkPaint(SkColors::kYellow);
+  const DlPaint child_paint = DlPaint(DlColor::kYellow());
   const SkPoint layer_offset = SkPoint::Make(5.5, 6.5);
   auto dl_image_filter = std::make_shared<DlMatrixImageFilter>(
       SkMatrix(), DlImageSampling::kMipmapLinear);
@@ -145,21 +147,20 @@ TEST_F(ImageFilterLayerTest, SimpleFilterWithOffset) {
 
   DisplayListBuilder expected_builder;
   /* ImageFilterLayer::Paint() */ {
-    expected_builder.save();
+    expected_builder.Save();
     {
-      expected_builder.translate(layer_offset.fX, layer_offset.fY);
+      expected_builder.Translate(layer_offset.fX, layer_offset.fY);
       DlPaint dl_paint;
       dl_paint.setImageFilter(dl_image_filter.get());
-      expected_builder.saveLayer(&child_bounds, &dl_paint);
+      expected_builder.SaveLayer(&child_bounds, &dl_paint);
       {
         /* MockLayer::Paint() */ {
-          expected_builder.drawPath(child_path,
-                                    DlPaint().setColor(DlColor::kYellow()));
+          expected_builder.DrawPath(child_path, DlPaint(DlColor::kYellow()));
         }
       }
-      expected_builder.restore();
+      expected_builder.Restore();
     }
-    expected_builder.restore();
+    expected_builder.Restore();
   }
   auto expected_display_list = expected_builder.Build();
 
@@ -171,7 +172,7 @@ TEST_F(ImageFilterLayerTest, SimpleFilterBounds) {
   const SkMatrix initial_transform = SkMatrix::Translate(0.5f, 1.0f);
   const SkRect child_bounds = SkRect::MakeLTRB(5.0f, 6.0f, 20.5f, 21.5f);
   const SkPath child_path = SkPath().addRect(child_bounds);
-  const SkPaint child_paint = SkPaint(SkColors::kYellow);
+  const DlPaint child_paint = DlPaint(DlColor::kYellow());
   const SkMatrix filter_transform = SkMatrix::Scale(2.0, 2.0);
 
   auto dl_image_filter = std::make_shared<DlMatrixImageFilter>(
@@ -193,15 +194,14 @@ TEST_F(ImageFilterLayerTest, SimpleFilterBounds) {
   /* ImageFilterLayer::Paint() */ {
     DlPaint dl_paint;
     dl_paint.setImageFilter(dl_image_filter.get());
-    expected_builder.saveLayer(&child_bounds, &dl_paint);
+    expected_builder.SaveLayer(&child_bounds, &dl_paint);
     {
       /* MockLayer::Paint() */ {
-        expected_builder.drawPath(child_path,
-                                  DlPaint().setColor(DlColor::kYellow()));
+        expected_builder.DrawPath(child_path, DlPaint(DlColor::kYellow()));
       }
     }
   }
-  expected_builder.restore();
+  expected_builder.Restore();
   auto expected_display_list = expected_builder.Build();
 
   layer->Paint(display_list_paint_context());
@@ -214,8 +214,8 @@ TEST_F(ImageFilterLayerTest, MultipleChildren) {
   const SkPath child_path1 = SkPath().addRect(child_bounds);
   const SkPath child_path2 =
       SkPath().addRect(child_bounds.makeOffset(3.0f, 0.0f));
-  const SkPaint child_paint1 = SkPaint(SkColors::kYellow);
-  const SkPaint child_paint2 = SkPaint(SkColors::kCyan);
+  const DlPaint child_paint1 = DlPaint(DlColor::kYellow());
+  const DlPaint child_paint2 = DlPaint(DlColor::kCyan());
   auto dl_image_filter = std::make_shared<DlMatrixImageFilter>(
       SkMatrix(), DlImageSampling::kMipmapLinear);
   auto mock_layer1 = std::make_shared<MockLayer>(child_path1, child_paint1);
@@ -244,19 +244,17 @@ TEST_F(ImageFilterLayerTest, MultipleChildren) {
   /* ImageFilterLayer::Paint() */ {
     DlPaint dl_paint;
     dl_paint.setImageFilter(dl_image_filter.get());
-    expected_builder.saveLayer(&children_bounds, &dl_paint);
+    expected_builder.SaveLayer(&children_bounds, &dl_paint);
     {
       /* MockLayer::Paint() */ {
-        expected_builder.drawPath(child_path1,
-                                  DlPaint().setColor(DlColor::kYellow()));
+        expected_builder.DrawPath(child_path1, DlPaint(DlColor::kYellow()));
       }
       /* MockLayer::Paint() */ {
-        expected_builder.drawPath(child_path2,
-                                  DlPaint().setColor(DlColor::kCyan()));
+        expected_builder.DrawPath(child_path2, DlPaint(DlColor::kCyan()));
       }
     }
   }
-  expected_builder.restore();
+  expected_builder.Restore();
   auto expected_display_list = expected_builder.Build();
 
   layer->Paint(display_list_paint_context());
@@ -269,8 +267,8 @@ TEST_F(ImageFilterLayerTest, Nested) {
   const SkPath child_path1 = SkPath().addRect(child_bounds);
   const SkPath child_path2 =
       SkPath().addRect(child_bounds.makeOffset(3.0f, 0.0f));
-  const SkPaint child_paint1 = SkPaint(SkColors::kYellow);
-  const SkPaint child_paint2 = SkPaint(SkColors::kCyan);
+  const DlPaint child_paint1 = DlPaint(DlColor::kYellow());
+  const DlPaint child_paint2 = DlPaint(DlColor::kCyan());
   auto dl_image_filter1 = std::make_shared<DlMatrixImageFilter>(
       SkMatrix(), DlImageSampling::kMipmapLinear);
   auto dl_image_filter2 = std::make_shared<DlMatrixImageFilter>(
@@ -309,25 +307,23 @@ TEST_F(ImageFilterLayerTest, Nested) {
   /* ImageFilterLayer::Paint() */ {
     DlPaint dl_paint;
     dl_paint.setImageFilter(dl_image_filter1.get());
-    expected_builder.saveLayer(&children_bounds, &dl_paint);
+    expected_builder.SaveLayer(&children_bounds, &dl_paint);
     {
       /* MockLayer::Paint() */ {
-        expected_builder.drawPath(child_path1,
-                                  DlPaint().setColor(DlColor::kYellow()));
+        expected_builder.DrawPath(child_path1, DlPaint(DlColor::kYellow()));
       }
       /* ImageFilterLayer::Paint() */ {
         DlPaint child_paint;
         child_paint.setImageFilter(dl_image_filter2.get());
-        expected_builder.saveLayer(&child_path2.getBounds(), &child_paint);
+        expected_builder.SaveLayer(&child_path2.getBounds(), &child_paint);
         /* MockLayer::Paint() */ {
-          expected_builder.drawPath(child_path2,
-                                    DlPaint().setColor(DlColor::kCyan()));
+          expected_builder.DrawPath(child_path2, DlPaint(DlColor::kCyan()));
         }
-        expected_builder.restore();
+        expected_builder.Restore();
       }
     }
   }
-  expected_builder.restore();
+  expected_builder.Restore();
   auto expected_display_list = expected_builder.Build();
 
   layer1->Paint(display_list_paint_context());
@@ -345,7 +341,7 @@ TEST_F(ImageFilterLayerTest, Readback) {
   EXPECT_FALSE(preroll_context()->surface_needs_readback);
 
   // ImageFilterLayer blocks child with readback
-  auto mock_layer = std::make_shared<MockLayer>(SkPath(), SkPaint());
+  auto mock_layer = std::make_shared<MockLayer>(SkPath(), DlPaint());
   mock_layer->set_fake_reads_surface(true);
   layer->Add(mock_layer);
   preroll_context()->surface_needs_readback = false;
@@ -364,11 +360,11 @@ TEST_F(ImageFilterLayerTest, CacheChild) {
   layer->Add(mock_layer);
 
   SkMatrix cache_ctm = initial_transform;
-  SkCanvas cache_canvas;
-  cache_canvas.setMatrix(cache_ctm);
-  SkCanvas other_canvas;
-  other_canvas.setMatrix(other_transform);
-  SkPaint paint = SkPaint();
+  DisplayListBuilder cache_canvas;
+  cache_canvas.Transform(cache_ctm);
+  DisplayListBuilder other_canvas;
+  other_canvas.Transform(other_transform);
+  DlPaint paint;
 
   use_mock_raster_cache();
   const auto* cacheable_image_filter_item = layer->raster_cache_item();
@@ -399,7 +395,7 @@ TEST_F(ImageFilterLayerTest, CacheChildren) {
       SkMatrix(), DlImageSampling::kMipmapLinear);
   auto initial_transform = SkMatrix::Translate(50.0, 25.5);
   auto other_transform = SkMatrix::Scale(1.0, 2.0);
-  SkPaint paint = SkPaint();
+  DlPaint paint;
   const SkPath child_path1 = SkPath().addRect(SkRect::MakeWH(5.0f, 5.0f));
   const SkPath child_path2 = SkPath().addRect(SkRect::MakeWH(5.0f, 5.0f));
   auto mock_layer1 = std::make_shared<MockLayer>(child_path1);
@@ -410,10 +406,10 @@ TEST_F(ImageFilterLayerTest, CacheChildren) {
   layer->Add(mock_layer2);
 
   SkMatrix cache_ctm = initial_transform;
-  SkCanvas cache_canvas;
-  cache_canvas.setMatrix(cache_ctm);
-  SkCanvas other_canvas;
-  other_canvas.setMatrix(other_transform);
+  DisplayListBuilder cache_canvas;
+  cache_canvas.Transform(cache_ctm);
+  DisplayListBuilder other_canvas;
+  other_canvas.Transform(other_transform);
 
   use_mock_raster_cache();
 
@@ -440,34 +436,35 @@ TEST_F(ImageFilterLayerTest, CacheChildren) {
   EXPECT_FALSE(raster_cache()->Draw(
       cacheable_image_filter_item->GetId().value(), other_canvas, &paint));
 
-  mock_canvas().reset_draw_calls();
   layer->Preroll(preroll_context());
-  layer->Paint(paint_context());
-  EXPECT_EQ(mock_canvas().draw_calls().size(), 8UL);
-  auto call0 = MockCanvas::DrawCall{0, MockCanvas::SaveData{1}};
-  EXPECT_EQ(mock_canvas().draw_calls()[0], call0);
-  auto call1 = MockCanvas::DrawCall{
-      1, MockCanvas::ConcatMatrixData{SkM44(SkMatrix::Translate(offset))}};
-  EXPECT_EQ(mock_canvas().draw_calls()[1], call1);
-  auto call2 = MockCanvas::DrawCall{
-      1, MockCanvas::SetMatrixData{SkM44(SkMatrix::Translate(offset))}};
-  EXPECT_EQ(mock_canvas().draw_calls()[2], call2);
-  auto call3 = MockCanvas::DrawCall{1, MockCanvas::SaveData{2}};
-  EXPECT_EQ(mock_canvas().draw_calls()[3], call3);
-  auto call4 = MockCanvas::DrawCall{
-      2, MockCanvas::SetMatrixData{SkM44(SkMatrix::Translate(0.0, 0.0))}};
-  EXPECT_EQ(mock_canvas().draw_calls()[4], call4);
-  EXPECT_EQ(mock_canvas().draw_calls()[5].layer, 2);
-  EXPECT_TRUE(std::holds_alternative<MockCanvas::DrawImageData>(
-      mock_canvas().draw_calls()[5].data));
-  auto call5_data =
-      std::get<MockCanvas::DrawImageData>(mock_canvas().draw_calls()[5].data);
-  EXPECT_EQ(call5_data.x, offset.fX);
-  EXPECT_EQ(call5_data.y, offset.fY);
-  auto call6 = MockCanvas::DrawCall{2, MockCanvas::RestoreData{1}};
-  EXPECT_EQ(mock_canvas().draw_calls()[6], call6);
-  auto call7 = MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}};
-  EXPECT_EQ(mock_canvas().draw_calls()[7], call7);
+
+  SkRect children_bounds = child_path1.getBounds();
+  children_bounds.join(child_path2.getBounds());
+  SkMatrix snapped_matrix = SkMatrix::MakeAll(  //
+      1, 0, SkScalarRoundToScalar(offset.fX),   //
+      0, 1, SkScalarRoundToScalar(offset.fY),   //
+      0, 0, 1);
+  SkMatrix cache_matrix = initial_transform;
+  cache_matrix.preConcat(snapped_matrix);
+  auto transformed_filter = dl_image_filter->makeWithLocalMatrix(cache_matrix);
+
+  layer->Paint(display_list_paint_context());
+  DisplayListBuilder expected_builder;
+  /* (ImageFilter)layer::Paint() */ {
+    expected_builder.Save();
+    {
+      expected_builder.Translate(offset.fX, offset.fY);
+      // translation components already snapped to pixels, intent to
+      // use raster cache won't change them
+      DlPaint dl_paint;
+      dl_paint.setImageFilter(transformed_filter.get());
+      raster_cache()->Draw(cacheable_image_filter_item->GetId().value(),
+                           expected_builder, &dl_paint);
+    }
+    expected_builder.Restore();
+  }
+  expected_builder.Restore();
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
 }
 
 TEST_F(ImageFilterLayerTest, CacheImageFilterLayerSelf) {
@@ -480,53 +477,58 @@ TEST_F(ImageFilterLayerTest, CacheImageFilterLayerSelf) {
   const SkPath child_path = SkPath().addRect(child_rect);
   auto mock_layer = std::make_shared<MockLayer>(child_path);
   auto offset = SkPoint::Make(53.8, 24.4);
-  auto offset_rounded =
-      SkPoint::Make(std::round(offset.x()), std::round(offset.y()));
-  auto offset_rounded_out =
-      SkPoint::Make(std::floor(offset.x()), std::floor(offset.y()));
   auto layer = std::make_shared<ImageFilterLayer>(dl_image_filter, offset);
   layer->Add(mock_layer);
 
   SkMatrix cache_ctm = initial_transform;
-  SkCanvas cache_canvas;
-  cache_canvas.setMatrix(cache_ctm);
-  SkCanvas other_canvas;
-  other_canvas.setMatrix(other_transform);
-  SkPaint paint = SkPaint();
+  DisplayListBuilder cache_canvas;
+  cache_canvas.Transform(cache_ctm);
+  DisplayListBuilder other_canvas;
+  other_canvas.Transform(other_transform);
+  DlPaint paint;
+
+  SkMatrix snapped_matrix = SkMatrix::MakeAll(  //
+      1, 0, SkScalarRoundToScalar(offset.fX),   //
+      0, 1, SkScalarRoundToScalar(offset.fY),   //
+      0, 0, 1);
 
   use_mock_raster_cache();
   preroll_context()->state_stack.set_preroll_delegate(initial_transform);
   const auto* cacheable_image_filter_item = layer->raster_cache_item();
   // frame 1.
   layer->Preroll(preroll_context());
-  layer->Paint(paint_context());
-  EXPECT_EQ(mock_canvas().draw_calls().size(), 7UL);
-  auto uncached_call0 = MockCanvas::DrawCall{0, MockCanvas::SaveData{1}};
-  EXPECT_EQ(mock_canvas().draw_calls()[0], uncached_call0);
-  auto uncached_call1 = MockCanvas::DrawCall{
-      1, MockCanvas::ConcatMatrixData{SkM44(SkMatrix::Translate(offset))}};
-  EXPECT_EQ(mock_canvas().draw_calls()[1], uncached_call1);
-  auto uncached_call2 = MockCanvas::DrawCall{
-      1, MockCanvas::SetMatrixData{SkM44(SkMatrix::Translate(offset_rounded))}};
-  EXPECT_EQ(mock_canvas().draw_calls()[2], uncached_call2);
-  EXPECT_EQ(mock_canvas().draw_calls()[3].layer, 1);
-  auto uncached_call3_data =
-      std::get<MockCanvas::SaveLayerData>(mock_canvas().draw_calls()[3].data);
-  EXPECT_EQ(uncached_call3_data.save_bounds, child_rect);
-  EXPECT_EQ(uncached_call3_data.save_to_layer, 2);
-  auto uncached_call4 =
-      MockCanvas::DrawCall{2, MockCanvas::DrawPathData{child_path, SkPaint()}};
-  EXPECT_EQ(mock_canvas().draw_calls()[4], uncached_call4);
-  auto uncached_call5 = MockCanvas::DrawCall{2, MockCanvas::RestoreData{1}};
-  EXPECT_EQ(mock_canvas().draw_calls()[5], uncached_call5);
-  auto uncached_call6 = MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}};
-  EXPECT_EQ(mock_canvas().draw_calls()[6], uncached_call6);
+
+  layer->Paint(display_list_paint_context());
+  {
+    DisplayListBuilder expected_builder;
+    /* (ImageFilter)layer::Paint */ {
+      expected_builder.Save();
+      {
+        expected_builder.Translate(offset.fX, offset.fY);
+        // Snap to pixel translation due to use of raster cache
+        expected_builder.TransformReset();
+        expected_builder.Transform(snapped_matrix);
+        DlPaint save_paint = DlPaint().setImageFilter(dl_image_filter);
+        expected_builder.SaveLayer(&child_rect, &save_paint);
+        {
+          /* mock_layer::Paint */ {
+            expected_builder.DrawPath(child_path, DlPaint());
+          }
+        }
+        expected_builder.Restore();
+      }
+      expected_builder.Restore();
+    }
+    EXPECT_TRUE(
+        DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
+  }
+
   // frame 2.
   layer->Preroll(preroll_context());
-  layer->Paint(paint_context());
+  layer->Paint(display_list_paint_context());
   // frame 3.
   layer->Preroll(preroll_context());
-  layer->Paint(paint_context());
+  layer->Paint(display_list_paint_context());
 
   LayerTree::TryToRasterCache(cacheable_items(), &paint_context());
   // frame1,2 cache the ImageFilter's children layer, frame3 cache the
@@ -543,31 +545,31 @@ TEST_F(ImageFilterLayerTest, CacheImageFilterLayerSelf) {
   EXPECT_FALSE(raster_cache()->Draw(
       cacheable_image_filter_item->GetId().value(), other_canvas, &paint));
 
-  mock_canvas().reset_draw_calls();
   layer->Preroll(preroll_context());
-  layer->Paint(paint_context());
-  EXPECT_EQ(mock_canvas().draw_calls().size(), 4UL);
-  auto cached_call0 = MockCanvas::DrawCall{0, MockCanvas::SaveData{1}};
-  EXPECT_EQ(mock_canvas().draw_calls()[0], cached_call0);
-  auto cached_call1 = MockCanvas::DrawCall{
-      1, MockCanvas::SetMatrixData{SkM44(SkMatrix::Translate(0.0, 0.0))}};
-  EXPECT_EQ(mock_canvas().draw_calls()[1], cached_call1);
-  EXPECT_EQ(mock_canvas().draw_calls()[2].layer, 1);
-  EXPECT_TRUE(std::holds_alternative<MockCanvas::DrawImageDataNoPaint>(
-      mock_canvas().draw_calls()[2].data));
-  auto cached_call2_data = std::get<MockCanvas::DrawImageDataNoPaint>(
-      mock_canvas().draw_calls()[2].data);
-  EXPECT_EQ(cached_call2_data.x, offset_rounded_out.fX);
-  EXPECT_EQ(cached_call2_data.y, offset_rounded_out.fY);
-  auto cached_call3 = MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}};
-  EXPECT_EQ(mock_canvas().draw_calls()[3], cached_call3);
+
+  reset_display_list();
+  layer->Paint(display_list_paint_context());
+  {
+    DisplayListBuilder expected_builder;
+    /* (ImageFilter)layer::Paint */ {
+      expected_builder.Save();
+      {
+        EXPECT_TRUE(
+            raster_cache()->Draw(cacheable_image_filter_item->GetId().value(),
+                                 expected_builder, nullptr));
+      }
+      expected_builder.Restore();
+    }
+    EXPECT_TRUE(
+        DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
+  }
 }
 
 TEST_F(ImageFilterLayerTest, OpacityInheritance) {
   const SkMatrix initial_transform = SkMatrix::Translate(0.5f, 1.0f);
   const SkRect child_bounds = SkRect::MakeLTRB(5.0f, 6.0f, 20.5f, 21.5f);
   const SkPath child_path = SkPath().addRect(child_bounds);
-  const SkPaint child_paint = SkPaint(SkColors::kYellow);
+  const DlPaint child_paint = DlPaint(DlColor::kYellow());
   auto dl_image_filter = std::make_shared<DlMatrixImageFilter>(
       SkMatrix(), DlImageSampling::kMipmapLinear);
 
@@ -595,23 +597,23 @@ TEST_F(ImageFilterLayerTest, OpacityInheritance) {
 
   DisplayListBuilder expected_builder;
   /* OpacityLayer::Paint() */ {
-    expected_builder.save();
+    expected_builder.Save();
     {
-      expected_builder.translate(offset.fX, offset.fY);
+      expected_builder.Translate(offset.fX, offset.fY);
       /* ImageFilterLayer::Paint() */ {
         DlPaint image_filter_paint;
-        image_filter_paint.setColor(opacity_alpha << 24);
+        image_filter_paint.setColor(DlColor(opacity_alpha << 24));
         image_filter_paint.setImageFilter(dl_image_filter.get());
-        expected_builder.saveLayer(&child_path.getBounds(),
+        expected_builder.SaveLayer(&child_path.getBounds(),
                                    &image_filter_paint);
         /* MockLayer::Paint() */ {
-          expected_builder.drawPath(child_path,
-                                    DlPaint().setColor(child_paint.getColor()));
+          expected_builder.DrawPath(child_path,
+                                    DlPaint(child_paint.getColor()));
         }
-        expected_builder.restore();
+        expected_builder.Restore();
       }
     }
-    expected_builder.restore();
+    expected_builder.Restore();
   }
 
   opacity_layer->Paint(display_list_paint_context());
@@ -687,7 +689,7 @@ TEST_F(ImageFilterLayerDiffTest, ImageFilterLayerInflatestChildSize) {
   filter_layer_1_1->Add(filter_layer_1_2);
   auto path = SkPath().addRect(SkRect::MakeLTRB(100, 100, 110, 110));
   filter_layer_1_2->Add(
-      std::make_shared<MockLayer>(path, SkPaint(SkColors::kYellow)));
+      std::make_shared<MockLayer>(path, DlPaint(DlColor::kYellow())));
   l1.root()->Add(filter_layer_1_1);
 
   // second layer tree with identical filter layers but different child layer
@@ -698,7 +700,7 @@ TEST_F(ImageFilterLayerDiffTest, ImageFilterLayerInflatestChildSize) {
   filter_layer2_2->AssignOldLayer(filter_layer_1_2.get());
   filter_layer2_1->Add(filter_layer2_2);
   filter_layer2_2->Add(
-      std::make_shared<MockLayer>(path, SkPaint(SkColors::kRed)));
+      std::make_shared<MockLayer>(path, DlPaint(DlColor::kRed())));
   l2.root()->Add(filter_layer2_1);
 
   DiffLayerTree(l1, MockLayerTree());
@@ -708,5 +710,20 @@ TEST_F(ImageFilterLayerDiffTest, ImageFilterLayerInflatestChildSize) {
   EXPECT_EQ(damage.frame_damage, SkIRect::MakeLTRB(40, 40, 170, 170));
 }
 
+TEST_F(ImageFilterLayerTest, EmptyFilterWithOffset) {
+  const SkRect child_bounds = SkRect::MakeLTRB(10.0f, 11.0f, 19.0f, 20.0f);
+  const SkPath child_path = SkPath().addRect(child_bounds);
+  const DlPaint child_paint = DlPaint(DlColor::kYellow());
+  auto mock_layer = std::make_shared<MockLayer>(child_path, child_paint);
+  const SkPoint offset = SkPoint::Make(5.0f, 6.0f);
+  auto layer = std::make_shared<ImageFilterLayer>(nullptr, offset);
+  layer->Add(mock_layer);
+
+  layer->Preroll(preroll_context());
+  EXPECT_EQ(layer->paint_bounds(), child_bounds.makeOffset(offset));
+}
+
 }  // namespace testing
 }  // namespace flutter
+
+// NOLINTEND(bugprone-unchecked-optional-access)
diff --git a/flow/layers/layer.cc b/flow/layers/layer.cc
index 2e8beec7e628945310425a670a8a356c764664e6..d673bf0f383b52d96d2abf7ddb832acb3e472122 100644
--- a/flow/layers/layer.cc
+++ b/flow/layers/layer.cc
@@ -5,15 +5,13 @@
 #include "flutter/flow/layers/layer.h"
 
 #include "flutter/flow/paint_utils.h"
-#include "third_party/skia/include/core/SkColorFilter.h"
 
 namespace flutter {
 
 Layer::Layer()
     : paint_bounds_(SkRect::MakeEmpty()),
       unique_id_(NextUniqueID()),
-      original_layer_id_(unique_id_),
-      subtree_has_platform_view_(false) {}
+      original_layer_id_(unique_id_) {}
 
 Layer::~Layer() = default;
 
diff --git a/flow/layers/layer.h b/flow/layers/layer.h
index 234d3c3db9ff88a39ae46732afd86ea1fa852100..943bb968c718c7bc3fcc484a3a60bd4ec6b8cf8c 100644
--- a/flow/layers/layer.h
+++ b/flow/layers/layer.h
@@ -11,13 +11,13 @@
 #include <vector>
 
 #include "flutter/common/graphics/texture.h"
-#include "flutter/display_list/display_list_builder_multiplexer.h"
+#include "flutter/display_list/dl_canvas.h"
 #include "flutter/flow/diff_context.h"
 #include "flutter/flow/embedded_views.h"
-#include "flutter/flow/instrumentation.h"
 #include "flutter/flow/layer_snapshot_store.h"
 #include "flutter/flow/layers/layer_state_stack.h"
 #include "flutter/flow/raster_cache.h"
+#include "flutter/flow/stopwatch.h"
 #include "flutter/fml/build_config.h"
 #include "flutter/fml/compiler_specific.h"
 #include "flutter/fml/logging.h"
@@ -32,6 +32,8 @@
 #include "third_party/skia/include/core/SkRect.h"
 #include "third_party/skia/include/utils/SkNWayCanvas.h"
 
+class GrDirectContext;
+
 namespace flutter {
 
 namespace testing {
@@ -47,21 +49,20 @@ class RasterCacheItem;
 static constexpr SkRect kGiantRect = SkRect::MakeLTRB(-1E9F, -1E9F, 1E9F, 1E9F);
 
 // This should be an exact copy of the Clip enum in painting.dart.
-enum Clip { none, hardEdge, antiAlias, antiAliasWithSaveLayer };
+enum Clip { kNone, kHardEdge, kAntiAlias, kAntiAliasWithSaveLayer };
 
 struct PrerollContext {
   RasterCache* raster_cache;
   GrDirectContext* gr_context;
   ExternalViewEmbedder* view_embedder;
   LayerStateStack& state_stack;
-  SkColorSpace* dst_color_space;
+  sk_sp<SkColorSpace> dst_color_space;
   bool surface_needs_readback;
 
   // These allow us to paint in the end of subtree Preroll.
   const Stopwatch& raster_time;
   const Stopwatch& ui_time;
   std::shared_ptr<TextureRegistry> texture_registry;
-  const float frame_device_pixel_ratio = 1.0f;
 
   // These allow us to track properties like elevation, opacity, and the
   // presence of a platform view during Preroll.
@@ -81,12 +82,6 @@ struct PrerollContext {
   int renderable_state_flags = 0;
 
   std::vector<RasterCacheItem*>* raster_cached_entries;
-
-  // This flag will be set to true iff the frame will be constructing
-  // a DisplayList for the layer tree. This flag is mostly of note to
-  // the embedders that must decide between creating SkPicture or
-  // DisplayList objects for the inter-view slices of the layer tree.
-  bool display_list_enabled = false;
 };
 
 struct PaintContext {
@@ -103,22 +98,26 @@ struct PaintContext {
   // allowing leaf layers to report that they can handle rendering some of
   // its state attributes themselves via the |applyState| method.
   LayerStateStack& state_stack;
-  SkCanvas* canvas;
-  DisplayListBuilder* builder = nullptr;
+  DlCanvas* canvas;
+
+  // Whether current canvas is an overlay canvas. Used to determine if the
+  // raster cache is painting to a surface that will be displayed above a
+  // platform view, in which case it will attempt to preserve the R-Tree.
+  bool rendering_above_platform_view = false;
 
   GrDirectContext* gr_context;
-  SkColorSpace* dst_color_space;
+  sk_sp<SkColorSpace> dst_color_space;
   ExternalViewEmbedder* view_embedder;
   const Stopwatch& raster_time;
   const Stopwatch& ui_time;
   std::shared_ptr<TextureRegistry> texture_registry;
   const RasterCache* raster_cache;
-  const float frame_device_pixel_ratio = 1.0f;
 
   // Snapshot store to collect leaf layer snapshots. The store is non-null
   // only when leaf layer tracing is enabled.
   LayerSnapshotStore* layer_snapshot_store = nullptr;
   bool enable_leaf_layer_tracing = false;
+  bool impeller_enabled = false;
   impeller::AiksContext* aiks_context;
 };
 
@@ -267,7 +266,7 @@ class Layer {
   SkRect paint_bounds_;
   uint64_t unique_id_;
   uint64_t original_layer_id_;
-  bool subtree_has_platform_view_;
+  bool subtree_has_platform_view_ = false;
 
   static uint64_t NextUniqueID();
 
diff --git a/flow/layers/layer_raster_cache_item.cc b/flow/layers/layer_raster_cache_item.cc
index 826c0eb2203a0179505a4d4d5538ce6a0e37d787..de5a5e6ac1d6049362b164a54c154360e583910b 100644
--- a/flow/layers/layer_raster_cache_item.cc
+++ b/flow/layers/layer_raster_cache_item.cc
@@ -6,6 +6,7 @@
 #include "flutter/flow/layers/container_layer.h"
 #include "flutter/flow/raster_cache_item.h"
 #include "flutter/flow/raster_cache_util.h"
+#include "third_party/skia/include/core/SkColorSpace.h"
 
 namespace flutter {
 
@@ -101,7 +102,7 @@ const SkRect* LayerRasterCacheItem::GetPaintBoundsFromLayer() const {
 bool Rasterize(RasterCacheItem::CacheState cache_state,
                Layer* layer,
                const PaintContext& paint_context,
-               SkCanvas* canvas) {
+               DlCanvas* canvas) {
   FML_DCHECK(cache_state != RasterCacheItem::CacheState::kNone);
   LayerStateStack state_stack;
   state_stack.set_delegate(canvas);
@@ -118,7 +119,6 @@ bool Rasterize(RasterCacheItem::CacheState cache_state,
       .ui_time                       = paint_context.ui_time,
       .texture_registry              = paint_context.texture_registry,
       .raster_cache                  = paint_context.raster_cache,
-      .frame_device_pixel_ratio      = paint_context.frame_device_pixel_ratio,
       // clang-format on
   };
 
@@ -141,7 +141,8 @@ static const auto* flow_type = "RasterCacheFlow::Layer";
 
 bool LayerRasterCacheItem::TryToPrepareRasterCache(const PaintContext& context,
                                                    bool parent_cached) const {
-  if (!context.raster_cache || parent_cached) {
+  auto maybe_id = GetId();
+  if (!maybe_id.has_value() || !context.raster_cache || parent_cached) {
     return false;
   }
   if (cache_state_ != kNone) {
@@ -155,10 +156,11 @@ bool LayerRasterCacheItem::TryToPrepareRasterCache(const PaintContext& context,
           .flow_type          = flow_type,
           // clang-format on
       };
+      auto id = maybe_id.value();
       return context.raster_cache->UpdateCacheEntry(
-          GetId().value(), r_context,
+          id, r_context,
           [ctx = context, cache_state = cache_state_,
-           layer = layer_](SkCanvas* canvas) {
+           layer = layer_](DlCanvas* canvas) {
             Rasterize(cache_state, layer, ctx, canvas);
           });
     }
@@ -167,13 +169,13 @@ bool LayerRasterCacheItem::TryToPrepareRasterCache(const PaintContext& context,
 }
 
 bool LayerRasterCacheItem::Draw(const PaintContext& context,
-                                const SkPaint* paint) const {
+                                const DlPaint* paint) const {
   return Draw(context, context.canvas, paint);
 }
 
 bool LayerRasterCacheItem::Draw(const PaintContext& context,
-                                SkCanvas* canvas,
-                                const SkPaint* paint) const {
+                                DlCanvas* canvas,
+                                const DlPaint* paint) const {
   if (!context.raster_cache || !canvas) {
     return false;
   }
@@ -181,11 +183,16 @@ bool LayerRasterCacheItem::Draw(const PaintContext& context,
     case RasterCacheItem::kNone:
       return false;
     case RasterCacheItem::kCurrent: {
-      return context.raster_cache->Draw(key_id_, *canvas, paint);
+      return context.raster_cache->Draw(key_id_, *canvas, paint,
+                                        context.rendering_above_platform_view);
     }
     case RasterCacheItem::kChildren: {
+      if (!layer_children_id_.has_value()) {
+        return false;
+      }
       return context.raster_cache->Draw(layer_children_id_.value(), *canvas,
-                                        paint);
+                                        paint,
+                                        context.rendering_above_platform_view);
     }
   }
 }
diff --git a/flow/layers/layer_raster_cache_item.h b/flow/layers/layer_raster_cache_item.h
index 3588abdf3b6276509e50375cce73f722d28c8e8b..a99faa7ad4e36eaa661178e487cce0b77bd9aa22 100644
--- a/flow/layers/layer_raster_cache_item.h
+++ b/flow/layers/layer_raster_cache_item.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLOW_LAYER_RASTER_CACHE_ITEM_H_
-#define FLUTTER_FLOW_LAYER_RASTER_CACHE_ITEM_H_
+#ifndef FLUTTER_FLOW_LAYERS_LAYER_RASTER_CACHE_ITEM_H_
+#define FLUTTER_FLOW_LAYERS_LAYER_RASTER_CACHE_ITEM_H_
 
 #include <memory>
 #include <optional>
@@ -36,11 +36,11 @@ class LayerRasterCacheItem : public RasterCacheItem {
   void PrerollFinalize(PrerollContext* context,
                        const SkMatrix& matrix) override;
 
-  bool Draw(const PaintContext& context, const SkPaint* paint) const override;
+  bool Draw(const PaintContext& context, const DlPaint* paint) const override;
 
   bool Draw(const PaintContext& context,
-            SkCanvas* canvas,
-            const SkPaint* paint) const override;
+            DlCanvas* canvas,
+            const DlPaint* paint) const override;
 
   bool TryToPrepareRasterCache(const PaintContext& context,
                                bool parent_cached = false) const override;
@@ -69,4 +69,4 @@ class LayerRasterCacheItem : public RasterCacheItem {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_FLOW_LAYER_RASTER_CACHE_ITEM_H_
+#endif  // FLUTTER_FLOW_LAYERS_LAYER_RASTER_CACHE_ITEM_H_
diff --git a/flow/layers/layer_state_stack.cc b/flow/layers/layer_state_stack.cc
index 154172659462c816afa61a27d9de324814af7dde..492931278bd880faec78fb9bbb3f244f36311936 100644
--- a/flow/layers/layer_state_stack.cc
+++ b/flow/layers/layer_state_stack.cc
@@ -4,7 +4,7 @@
 
 #include "flutter/flow/layers/layer_state_stack.h"
 
-#include "flutter/display_list/display_list_matrix_clip_tracker.h"
+#include "flutter/display_list/utils/dl_matrix_clip_tracker.h"
 #include "flutter/flow/layers/layer.h"
 #include "flutter/flow/paint_utils.h"
 #include "flutter/flow/raster_cache_util.h"
@@ -60,9 +60,9 @@ class DummyDelegate : public LayerStateStack::Delegate {
   void transform(const SkMatrix& matrix) override {}
   void integralTransform() override {}
 
-  void clipRect(const SkRect& rect, SkClipOp op, bool is_aa) override {}
-  void clipRRect(const SkRRect& rrect, SkClipOp op, bool is_aa) override {}
-  void clipPath(const SkPath& path, SkClipOp op, bool is_aa) override {}
+  void clipRect(const SkRect& rect, ClipOp op, bool is_aa) override {}
+  void clipRRect(const SkRRect& rrect, ClipOp op, bool is_aa) override {}
+  void clipPath(const SkPath& path, ClipOp op, bool is_aa) override {}
 
  private:
   static void error() {
@@ -72,129 +72,66 @@ class DummyDelegate : public LayerStateStack::Delegate {
 const std::shared_ptr<DummyDelegate> DummyDelegate::kInstance =
     std::make_shared<DummyDelegate>();
 
-class SkCanvasDelegate : public LayerStateStack::Delegate {
+class DlCanvasDelegate : public LayerStateStack::Delegate {
  public:
-  explicit SkCanvasDelegate(SkCanvas* canvas)
-      : canvas_(canvas), initial_save_level_(canvas->getSaveCount()) {}
+  explicit DlCanvasDelegate(DlCanvas* canvas)
+      : canvas_(canvas), initial_save_level_(canvas->GetSaveCount()) {}
 
-  void decommission() override { canvas_->restoreToCount(initial_save_level_); }
+  void decommission() override { canvas_->RestoreToCount(initial_save_level_); }
 
-  SkCanvas* canvas() const override { return canvas_; }
+  DlCanvas* canvas() const override { return canvas_; }
 
   SkRect local_cull_rect() const override {
-    return canvas_->getLocalClipBounds();
+    return canvas_->GetLocalClipBounds();
   }
   SkRect device_cull_rect() const override {
-    return SkRect::Make(canvas_->getDeviceClipBounds());
-  }
-  SkM44 matrix_4x4() const override { return canvas_->getLocalToDevice(); }
-  SkMatrix matrix_3x3() const override {
-    return canvas_->getLocalToDeviceAs3x3();
-  }
-  bool content_culled(const SkRect& content_bounds) const override {
-    return canvas_->quickReject(content_bounds);
-  }
-
-  void save() override { canvas_->save(); }
-  void saveLayer(const SkRect& bounds,
-                 LayerStateStack::RenderingAttributes& attributes,
-                 DlBlendMode blend_mode,
-                 const DlImageFilter* backdrop) override {
-    TRACE_EVENT0("flutter", "Canvas::saveLayer");
-    SkPaint paint;
-    sk_sp<SkImageFilter> backdrop_filter =
-        backdrop ? backdrop->skia_object() : nullptr;
-    canvas_->saveLayer(SkCanvas::SaveLayerRec(
-        &bounds, attributes.fill(paint, blend_mode), backdrop_filter.get(), 0));
-  }
-  void restore() override { canvas_->restore(); }
-
-  void translate(SkScalar tx, SkScalar ty) override {
-    canvas_->translate(tx, ty);
-  }
-  void transform(const SkM44& m44) override { canvas_->concat(m44); }
-  void transform(const SkMatrix& matrix) override { canvas_->concat(matrix); }
-  void integralTransform() override {
-    SkM44 matrix = RasterCacheUtil::GetIntegralTransCTM(matrix_4x4());
-    canvas_->setMatrix(matrix);
-  }
-
-  void clipRect(const SkRect& rect, SkClipOp op, bool is_aa) override {
-    canvas_->clipRect(rect, op, is_aa);
-  }
-  void clipRRect(const SkRRect& rrect, SkClipOp op, bool is_aa) override {
-    canvas_->clipRRect(rrect, op, is_aa);
-  }
-  void clipPath(const SkPath& path, SkClipOp op, bool is_aa) override {
-    canvas_->clipPath(path, op, is_aa);
-  }
-
- private:
-  SkCanvas* canvas_;
-  const int initial_save_level_;
-};
-
-class DlBuilderDelegate : public LayerStateStack::Delegate {
- public:
-  explicit DlBuilderDelegate(DisplayListBuilder* builder)
-      : builder_(builder), initial_save_level_(builder->getSaveCount()) {}
-
-  void decommission() override {
-    builder_->restoreToCount(initial_save_level_);
-  }
-
-  DisplayListBuilder* builder() const override { return builder_; }
-
-  SkRect local_cull_rect() const override {
-    return builder_->getLocalClipBounds();
-  }
-  SkRect device_cull_rect() const override {
-    return builder_->getDestinationClipBounds();
+    return canvas_->GetDestinationClipBounds();
   }
   SkM44 matrix_4x4() const override {
-    return builder_->getTransformFullPerspective();
+    return canvas_->GetTransformFullPerspective();
   }
-  SkMatrix matrix_3x3() const override { return builder_->getTransform(); }
+  SkMatrix matrix_3x3() const override { return canvas_->GetTransform(); }
   bool content_culled(const SkRect& content_bounds) const override {
-    return builder_->quickReject(content_bounds);
+    return canvas_->QuickReject(content_bounds);
   }
 
-  void save() override { builder_->save(); }
+  void save() override { canvas_->Save(); }
   void saveLayer(const SkRect& bounds,
                  LayerStateStack::RenderingAttributes& attributes,
                  DlBlendMode blend_mode,
                  const DlImageFilter* backdrop) override {
     TRACE_EVENT0("flutter", "Canvas::saveLayer");
     DlPaint paint;
-    builder_->saveLayer(&bounds, attributes.fill(paint, blend_mode), backdrop);
+    canvas_->SaveLayer(&bounds, attributes.fill(paint, blend_mode), backdrop);
   }
-  void restore() override { builder_->restore(); }
+  void restore() override { canvas_->Restore(); }
 
   void translate(SkScalar tx, SkScalar ty) override {
-    builder_->translate(tx, ty);
+    canvas_->Translate(tx, ty);
   }
-  void transform(const SkM44& m44) override { builder_->transform(m44); }
+  void transform(const SkM44& m44) override { canvas_->Transform(m44); }
   void transform(const SkMatrix& matrix) override {
-    builder_->transform(matrix);
+    canvas_->Transform(matrix);
   }
   void integralTransform() override {
-    SkM44 matrix = RasterCacheUtil::GetIntegralTransCTM(matrix_4x4());
-    builder_->transformReset();
-    builder_->transform(matrix);
+    SkM44 integral;
+    if (RasterCacheUtil::ComputeIntegralTransCTM(matrix_4x4(), &integral)) {
+      canvas_->SetTransform(integral);
+    }
   }
 
-  void clipRect(const SkRect& rect, SkClipOp op, bool is_aa) override {
-    builder_->clipRect(rect, op, is_aa);
+  void clipRect(const SkRect& rect, ClipOp op, bool is_aa) override {
+    canvas_->ClipRect(rect, op, is_aa);
   }
-  void clipRRect(const SkRRect& rrect, SkClipOp op, bool is_aa) override {
-    builder_->clipRRect(rrect, op, is_aa);
+  void clipRRect(const SkRRect& rrect, ClipOp op, bool is_aa) override {
+    canvas_->ClipRRect(rrect, op, is_aa);
   }
-  void clipPath(const SkPath& path, SkClipOp op, bool is_aa) override {
-    builder_->clipPath(path, op, is_aa);
+  void clipPath(const SkPath& path, ClipOp op, bool is_aa) override {
+    canvas_->ClipPath(path, op, is_aa);
   }
 
  private:
-  DisplayListBuilder* builder_;
+  DlCanvas* canvas_;
   const int initial_save_level_;
 };
 
@@ -233,21 +170,27 @@ class PrerollDelegate : public LayerStateStack::Delegate {
   }
   void integralTransform() override {
     if (tracker_.using_4x4_matrix()) {
-      tracker_.setTransform(
-          RasterCacheUtil::GetIntegralTransCTM(tracker_.matrix_4x4()));
+      SkM44 integral;
+      if (RasterCacheUtil::ComputeIntegralTransCTM(tracker_.matrix_4x4(),
+                                                   &integral)) {
+        tracker_.setTransform(integral);
+      }
     } else {
-      tracker_.setTransform(
-          RasterCacheUtil::GetIntegralTransCTM(tracker_.matrix_3x3()));
+      SkMatrix integral;
+      if (RasterCacheUtil::ComputeIntegralTransCTM(tracker_.matrix_3x3(),
+                                                   &integral)) {
+        tracker_.setTransform(integral);
+      }
     }
   }
 
-  void clipRect(const SkRect& rect, SkClipOp op, bool is_aa) override {
+  void clipRect(const SkRect& rect, ClipOp op, bool is_aa) override {
     tracker_.clipRect(rect, op, is_aa);
   }
-  void clipRRect(const SkRRect& rrect, SkClipOp op, bool is_aa) override {
+  void clipRRect(const SkRRect& rrect, ClipOp op, bool is_aa) override {
     tracker_.clipRRect(rrect, op, is_aa);
   }
-  void clipPath(const SkPath& path, SkClipOp op, bool is_aa) override {
+  void clipPath(const SkPath& path, ClipOp op, bool is_aa) override {
     tracker_.clipPath(path, op, is_aa);
   }
 
@@ -287,8 +230,10 @@ class SaveLayerEntry : public LayerStateStack::StateEntry {
   }
   void restore(LayerStateStack* stack) const override {
     if (stack->checkerboard_func_) {
-      (*stack->checkerboard_func_)(stack->canvas_delegate(),
-                                   stack->builder_delegate(), bounds_);
+      DlCanvas* canvas = stack->canvas_delegate();
+      if (canvas != nullptr) {
+        (*stack->checkerboard_func_)(canvas, bounds_);
+      }
     }
     stack->delegate_->restore();
     stack->outstanding_ = old_attributes_;
@@ -499,7 +444,8 @@ class ClipRectEntry : public LayerStateStack::StateEntry {
       : clip_rect_(clip_rect), is_aa_(is_aa) {}
 
   void apply(LayerStateStack* stack) const override {
-    stack->delegate_->clipRect(clip_rect_, SkClipOp::kIntersect, is_aa_);
+    stack->delegate_->clipRect(clip_rect_, DlCanvas::ClipOp::kIntersect,
+                               is_aa_);
   }
   void update_mutators(MutatorsStack* mutators_stack) const override {
     mutators_stack->PushClipRect(clip_rect_);
@@ -518,7 +464,8 @@ class ClipRRectEntry : public LayerStateStack::StateEntry {
       : clip_rrect_(clip_rrect), is_aa_(is_aa) {}
 
   void apply(LayerStateStack* stack) const override {
-    stack->delegate_->clipRRect(clip_rrect_, SkClipOp::kIntersect, is_aa_);
+    stack->delegate_->clipRRect(clip_rrect_, DlCanvas::ClipOp::kIntersect,
+                                is_aa_);
   }
   void update_mutators(MutatorsStack* mutators_stack) const override {
     mutators_stack->PushClipRRect(clip_rrect_);
@@ -538,7 +485,8 @@ class ClipPathEntry : public LayerStateStack::StateEntry {
   ~ClipPathEntry() override = default;
 
   void apply(LayerStateStack* stack) const override {
-    stack->delegate_->clipPath(clip_path_, SkClipOp::kIntersect, is_aa_);
+    stack->delegate_->clipPath(clip_path_, DlCanvas::ClipOp::kIntersect,
+                               is_aa_);
   }
   void update_mutators(MutatorsStack* mutators_stack) const override {
     mutators_stack->PushClipPath(clip_path_);
@@ -555,34 +503,6 @@ class ClipPathEntry : public LayerStateStack::StateEntry {
 // RenderingAttributes methods
 // ==============================================================
 
-SkPaint* LayerStateStack::RenderingAttributes::fill(SkPaint& paint,
-                                                    DlBlendMode mode) const {
-  SkPaint* ret = nullptr;
-  if (opacity < SK_Scalar1) {
-    paint.setAlphaf(std::max(opacity, 0.0f));
-    ret = &paint;
-  } else {
-    paint.setAlphaf(SK_Scalar1);
-  }
-  if (color_filter) {
-    paint.setColorFilter(color_filter->skia_object());
-    ret = &paint;
-  } else {
-    paint.setColorFilter(nullptr);
-  }
-  if (image_filter) {
-    paint.setImageFilter(image_filter->skia_object());
-    ret = &paint;
-  } else {
-    paint.setImageFilter(nullptr);
-  }
-  paint.setBlendMode(ToSk(mode));
-  if (mode != DlBlendMode::kSrcOver) {
-    ret = &paint;
-  }
-  return ret;
-}
-
 DlPaint* LayerStateStack::RenderingAttributes::fill(DlPaint& paint,
                                                     DlBlendMode mode) const {
   DlPaint* ret = nullptr;
@@ -665,9 +585,13 @@ void MutatorContext::transform(const SkMatrix& matrix) {
 }
 
 void MutatorContext::transform(const SkM44& m44) {
-  layer_state_stack_->maybe_save_layer_for_transform(save_needed_);
-  save_needed_ = false;
-  layer_state_stack_->push_transform(m44);
+  if (DisplayListMatrixClipTracker::is_3x3(m44)) {
+    transform(m44.asM33());
+  } else {
+    layer_state_stack_->maybe_save_layer_for_transform(save_needed_);
+    save_needed_ = false;
+    layer_state_stack_->push_transform(m44);
+  }
 }
 
 void MutatorContext::integralTransform() {
@@ -705,7 +629,7 @@ void LayerStateStack::clear_delegate() {
   delegate_ = DummyDelegate::kInstance;
 }
 
-void LayerStateStack::set_delegate(SkCanvas* canvas) {
+void LayerStateStack::set_delegate(DlCanvas* canvas) {
   if (delegate_) {
     if (canvas == delegate_->canvas()) {
       return;
@@ -713,20 +637,7 @@ void LayerStateStack::set_delegate(SkCanvas* canvas) {
     clear_delegate();
   }
   if (canvas) {
-    delegate_ = std::make_shared<SkCanvasDelegate>(canvas);
-    reapply_all();
-  }
-}
-
-void LayerStateStack::set_delegate(DisplayListBuilder* builder) {
-  if (delegate_) {
-    if (builder == delegate_->builder()) {
-      return;
-    }
-    clear_delegate();
-  }
-  if (builder) {
-    delegate_ = std::make_shared<DlBuilderDelegate>(builder);
+    delegate_ = std::make_shared<DlCanvasDelegate>(canvas);
     reapply_all();
   }
 }
@@ -739,6 +650,7 @@ void LayerStateStack::set_preroll_delegate(const SkMatrix& matrix) {
 }
 void LayerStateStack::set_preroll_delegate(const SkRect& cull_rect,
                                            const SkMatrix& matrix) {
+  clear_delegate();
   delegate_ = std::make_shared<PrerollDelegate>(cull_rect, matrix);
   reapply_all();
 }
diff --git a/flow/layers/layer_state_stack.h b/flow/layers/layer_state_stack.h
index 4a5e19e40779d7728d5c0cf853486b803b5faa1a..ec5ea4932b8ce6f970559ea2e388aa864942e3b9 100644
--- a/flow/layers/layer_state_stack.h
+++ b/flow/layers/layer_state_stack.h
@@ -5,11 +5,9 @@
 #ifndef FLUTTER_FLOW_LAYERS_LAYER_STATE_STACK_H_
 #define FLUTTER_FLOW_LAYERS_LAYER_STATE_STACK_H_
 
-#include "flutter/display_list/display_list_builder.h"
-#include "flutter/display_list/display_list_canvas_recorder.h"
+#include "flutter/display_list/dl_canvas.h"
 #include "flutter/flow/embedded_views.h"
 #include "flutter/flow/paint_utils.h"
-#include "third_party/skia/include/core/SkCanvas.h"
 
 namespace flutter {
 
@@ -41,10 +39,7 @@ namespace flutter {
 /// The delegate can be any one of:
 ///   - Preroll delegate: used during Preroll to remember the outstanding
 ///                       state for embedded platform layers
-///   - SkCanvas: used during Paint for the default output to a Skia
-///               surface
-///   - DisplayListBuilder: used during Paint to construct a DisplayList
-///                         for Impeller output
+///   - DlCanvas: used during Paint for rendering output
 /// The stack will know which state needs to be conveyed to any of these
 /// delegates and when is the best time to convey that state (i.e. lazy
 /// saveLayer calls for example).
@@ -114,39 +109,20 @@ class LayerStateStack {
   // Clears out any old delegate to make room for a new one.
   void clear_delegate();
 
-  // Return the SkCanvas delegate if the state stack has such a delegate.
+  // Return the DlCanvas delegate if the state stack has such a delegate.
   // The state stack will only have one delegate at a time holding either
-  // an SkCanvas, DisplayListBuilder, or a preroll accumulator.
-  // See also |builder_delegate|.
-  SkCanvas* canvas_delegate() { return delegate_->canvas(); }
-
-  // Return the DisplayListBuilder delegate if the state stack has such a
-  // delegate.
-  // The state stack will only have one delegate at a time holding either
-  // an SkCanvas, DisplayListBuilder, or a preroll accumulator.
-  // See also |builder_delegate|.
-  DisplayListBuilder* builder_delegate() { return delegate_->builder(); }
+  // a DlCanvas or a preroll accumulator.
+  DlCanvas* canvas_delegate() { return delegate_->canvas(); }
 
   // Clears the old delegate and sets the canvas delegate to the indicated
-  // canvas (if not nullptr). This ensures that only one delegate - either a
-  // canvas, a builder, or a preroll accumulator - is present at any one time.
-  void set_delegate(SkCanvas* canvas);
-
-  // Clears the old delegate and sets the builder delegate to the indicated
-  // buider (if not nullptr). This ensures that only one delegate - either a
-  // canvas, a builder, or a preroll accumulator - is present at any one time.
-  void set_delegate(DisplayListBuilder* builder);
-  void set_delegate(sk_sp<DisplayListBuilder> builder) {
-    set_delegate(builder.get());
-  }
-  void set_delegate(DisplayListCanvasRecorder& recorder) {
-    set_delegate(recorder.builder().get());
-  }
+  // DL canvas (if not nullptr). This ensures that only one delegate - either
+  // a DlCanvas or a preroll accumulator - is present at any one time.
+  void set_delegate(DlCanvas* canvas);
 
   // Clears the old delegate and sets the state stack up to accumulate
   // clip and transform information for a Preroll phase. This ensures
-  // that only one delegate - either a canvas, a builder, or a preroll
-  // accumulator - is present at any one time.
+  // that only one delegate - either a DlCanvas or a preroll accumulator -
+  // is present at any one time.
   void set_preroll_delegate(const SkRect& cull_rect, const SkMatrix& matrix);
   void set_preroll_delegate(const SkRect& cull_rect);
   void set_preroll_delegate(const SkMatrix& matrix);
@@ -241,15 +217,14 @@ class LayerStateStack {
     void clipPath(const SkPath& path, bool is_aa);
 
    private:
-    MutatorContext(LayerStateStack* stack)
+    explicit MutatorContext(LayerStateStack* stack)
         : layer_state_stack_(stack),
-          stack_restore_count_(stack->stack_count()),
-          save_needed_(true) {}
+          stack_restore_count_(stack->stack_count()) {}
     friend class LayerStateStack;
 
     LayerStateStack* layer_state_stack_;
     const size_t stack_restore_count_;
-    bool save_needed_;
+    bool save_needed_ = true;
 
     FML_DISALLOW_COPY_ASSIGN_AND_MOVE(MutatorContext);
   };
@@ -296,11 +271,6 @@ class LayerStateStack {
   // bounds received will be sufficient to apply all outstanding attributes.
   SkRect outstanding_bounds() const { return outstanding_.save_layer_bounds; }
 
-  // Fill the provided paint object with any oustanding attributes and
-  // return a pointer to it, or return a nullptr if there were no
-  // outstanding attributes to paint with.
-  SkPaint* fill(SkPaint& paint) const { return outstanding_.fill(paint); }
-
   // Fill the provided paint object with any oustanding attributes and
   // return a pointer to it, or return a nullptr if there were no
   // outstanding attributes to paint with.
@@ -416,8 +386,6 @@ class LayerStateStack {
     std::shared_ptr<const DlColorFilter> color_filter;
     std::shared_ptr<const DlImageFilter> image_filter;
 
-    SkPaint* fill(SkPaint& paint,
-                  DlBlendMode mode = DlBlendMode::kSrcOver) const;
     DlPaint* fill(DlPaint& paint,
                   DlBlendMode mode = DlBlendMode::kSrcOver) const;
 
@@ -459,6 +427,9 @@ class LayerStateStack {
   friend class ClipPathEntry;
 
   class Delegate {
+   protected:
+    using ClipOp = DlCanvas::ClipOp;
+
    public:
     virtual ~Delegate() = default;
 
@@ -471,8 +442,7 @@ class LayerStateStack {
     // state and finalize all outstanding save or saveLayer operations.
     virtual void decommission() = 0;
 
-    virtual SkCanvas* canvas() const { return nullptr; }
-    virtual DisplayListBuilder* builder() const { return nullptr; }
+    virtual DlCanvas* canvas() const { return nullptr; }
 
     virtual SkRect local_cull_rect() const = 0;
     virtual SkRect device_cull_rect() const = 0;
@@ -492,13 +462,12 @@ class LayerStateStack {
     virtual void transform(const SkMatrix& matrix) = 0;
     virtual void integralTransform() = 0;
 
-    virtual void clipRect(const SkRect& rect, SkClipOp op, bool is_aa) = 0;
-    virtual void clipRRect(const SkRRect& rrect, SkClipOp op, bool is_aa) = 0;
-    virtual void clipPath(const SkPath& path, SkClipOp op, bool is_aa) = 0;
+    virtual void clipRect(const SkRect& rect, ClipOp op, bool is_aa) = 0;
+    virtual void clipRRect(const SkRRect& rrect, ClipOp op, bool is_aa) = 0;
+    virtual void clipPath(const SkPath& path, ClipOp op, bool is_aa) = 0;
   };
   friend class DummyDelegate;
-  friend class SkCanvasDelegate;
-  friend class DlBuilderDelegate;
+  friend class DlCanvasDelegate;
   friend class PrerollDelegate;
 
   std::vector<std::unique_ptr<StateEntry>> state_stack_;
diff --git a/flow/layers/layer_state_stack_unittests.cc b/flow/layers/layer_state_stack_unittests.cc
index 9d48776d04231240aa2c963d37355a0d2639858a..73ed2d3cc8dbfdfef9dc1c34f3f8f3db418dfb88 100644
--- a/flow/layers/layer_state_stack_unittests.cc
+++ b/flow/layers/layer_state_stack_unittests.cc
@@ -4,12 +4,11 @@
 
 #include "gtest/gtest.h"
 
-#include "flutter/display_list/display_list_color_filter.h"
-#include "flutter/display_list/display_list_image_filter.h"
+#include "flutter/display_list/effects/dl_color_filter.h"
+#include "flutter/display_list/effects/dl_image_filter.h"
 #include "flutter/flow/layers/layer.h"
 #include "flutter/flow/layers/layer_state_stack.h"
 #include "flutter/testing/display_list_testing.h"
-#include "flutter/testing/mock_canvas.h"
 
 namespace flutter {
 namespace testing {
@@ -42,7 +41,6 @@ TEST(LayerStateStack, Defaults) {
   LayerStateStack state_stack;
 
   ASSERT_EQ(state_stack.canvas_delegate(), nullptr);
-  ASSERT_EQ(state_stack.builder_delegate(), nullptr);
   ASSERT_EQ(state_stack.checkerboard_func(), nullptr);
   ASSERT_EQ(state_stack.outstanding_opacity(), SK_Scalar1);
   ASSERT_EQ(state_stack.outstanding_color_filter(), nullptr);
@@ -55,10 +53,6 @@ TEST(LayerStateStack, Defaults) {
   ASSERT_EQ(state_stack.transform_3x3(), SkMatrix::I());
   ASSERT_EQ(state_stack.transform_4x4(), SkM44());
 
-  SkPaint sk_paint;
-  state_stack.fill(sk_paint);
-  ASSERT_EQ(sk_paint, SkPaint());
-
   DlPaint dl_paint;
   state_stack.fill(dl_paint);
   ASSERT_EQ(dl_paint, DlPaint());
@@ -67,36 +61,75 @@ TEST(LayerStateStack, Defaults) {
 TEST(LayerStateStack, SingularDelegate) {
   LayerStateStack state_stack;
   ASSERT_EQ(state_stack.canvas_delegate(), nullptr);
-  ASSERT_EQ(state_stack.builder_delegate(), nullptr);
 
+  // Two different DlCanvas implementators
   DisplayListBuilder builder;
-  MockCanvas canvas;
+  DisplayListBuilder builder2;
+  DlCanvas& canvas = builder2;
 
   // no delegate -> builder delegate
   state_stack.set_delegate(&builder);
-  ASSERT_EQ(state_stack.canvas_delegate(), nullptr);
-  ASSERT_EQ(state_stack.builder_delegate(), &builder);
+  ASSERT_EQ(state_stack.canvas_delegate(), &builder);
 
-  // builder delegate -> canvas delegate
+  // builder delegate -> DlCanvas delegate
   state_stack.set_delegate(&canvas);
   ASSERT_EQ(state_stack.canvas_delegate(), &canvas);
-  ASSERT_EQ(state_stack.builder_delegate(), nullptr);
 
-  // canvas delegate -> builder delegate
+  // DlCanvas delegate -> builder delegate
   state_stack.set_delegate(&builder);
-  ASSERT_EQ(state_stack.canvas_delegate(), nullptr);
-  ASSERT_EQ(state_stack.builder_delegate(), &builder);
+  ASSERT_EQ(state_stack.canvas_delegate(), &builder);
 
   // builder delegate -> no delegate
   state_stack.clear_delegate();
   ASSERT_EQ(state_stack.canvas_delegate(), nullptr);
-  ASSERT_EQ(state_stack.builder_delegate(), nullptr);
 
-  // canvas delegate -> no delegate
+  // DlCanvas delegate -> no delegate
   state_stack.set_delegate(&canvas);
   state_stack.clear_delegate();
   ASSERT_EQ(state_stack.canvas_delegate(), nullptr);
-  ASSERT_EQ(state_stack.builder_delegate(), nullptr);
+}
+
+TEST(LayerStateStack, OldDelegateIsRolledBack) {
+  LayerStateStack state_stack;
+  DisplayListBuilder builder;
+  DisplayListBuilder builder2;
+  DlCanvas& canvas = builder2;
+
+  ASSERT_TRUE(builder.GetTransform().isIdentity());
+  ASSERT_TRUE(canvas.GetTransform().isIdentity());
+
+  state_stack.set_delegate(&builder);
+
+  ASSERT_TRUE(builder.GetTransform().isIdentity());
+  ASSERT_TRUE(canvas.GetTransform().isIdentity());
+
+  auto mutator = state_stack.save();
+  mutator.translate({10, 10});
+
+  ASSERT_EQ(builder.GetTransform(), SkMatrix::Translate(10, 10));
+  ASSERT_TRUE(canvas.GetTransform().isIdentity());
+
+  state_stack.set_delegate(&canvas);
+
+  ASSERT_TRUE(builder.GetTransform().isIdentity());
+  ASSERT_EQ(canvas.GetTransform(), SkMatrix::Translate(10, 10));
+
+  state_stack.set_preroll_delegate(SkRect::MakeWH(100, 100));
+
+  ASSERT_TRUE(builder.GetTransform().isIdentity());
+  ASSERT_TRUE(canvas.GetTransform().isIdentity());
+
+  state_stack.set_delegate(&builder);
+  state_stack.clear_delegate();
+
+  ASSERT_TRUE(builder.GetTransform().isIdentity());
+  ASSERT_TRUE(canvas.GetTransform().isIdentity());
+
+  state_stack.set_delegate(&canvas);
+  state_stack.clear_delegate();
+
+  ASSERT_TRUE(builder.GetTransform().isIdentity());
+  ASSERT_TRUE(canvas.GetTransform().isIdentity());
 }
 
 TEST(LayerStateStack, Opacity) {
@@ -130,16 +163,16 @@ TEST(LayerStateStack, Opacity) {
 
           DlPaint paint;
           state_stack.fill(paint);
-          builder.drawRect(rect, paint);
+          builder.DrawRect(rect, paint);
         }
         state_stack.clear_delegate();
 
         DisplayListBuilder expected;
         DlPaint save_paint =
             DlPaint().setOpacity(state_stack.outstanding_opacity());
-        expected.saveLayer(&rect, &save_paint);
-        expected.drawRect(rect, DlPaint());
-        expected.restore();
+        expected.SaveLayer(&rect, &save_paint);
+        expected.DrawRect(rect, DlPaint());
+        expected.Restore();
         ASSERT_TRUE(DisplayListsEQ_Verbose(builder.Build(), expected.Build()));
       }
 
@@ -155,12 +188,12 @@ TEST(LayerStateStack, Opacity) {
 
           DlPaint paint;
           state_stack.fill(paint);
-          builder.drawRect(rect, paint);
+          builder.DrawRect(rect, paint);
         }
         state_stack.clear_delegate();
 
         DisplayListBuilder expected;
-        expected.drawRect(rect, DlPaint().setOpacity(0.25f));
+        expected.DrawRect(rect, DlPaint().setOpacity(0.25f));
         ASSERT_TRUE(DisplayListsEQ_Verbose(builder.Build(), expected.Build()));
       }
     }
@@ -207,18 +240,18 @@ TEST(LayerStateStack, ColorFilter) {
 
           DlPaint paint;
           state_stack.fill(paint);
-          builder.drawRect(rect, paint);
+          builder.DrawRect(rect, paint);
         }
         state_stack.clear_delegate();
 
         DisplayListBuilder expected;
         DlPaint outer_save_paint = DlPaint().setColorFilter(outer_filter);
         DlPaint inner_save_paint = DlPaint().setColorFilter(inner_filter);
-        expected.saveLayer(&rect, &outer_save_paint);
-        expected.saveLayer(&rect, &inner_save_paint);
-        expected.drawRect(rect, DlPaint());
-        expected.restore();
-        expected.restore();
+        expected.SaveLayer(&rect, &outer_save_paint);
+        expected.SaveLayer(&rect, &inner_save_paint);
+        expected.DrawRect(rect, DlPaint());
+        expected.Restore();
+        expected.Restore();
         ASSERT_TRUE(DisplayListsEQ_Verbose(builder.Build(), expected.Build()));
       }
 
@@ -234,15 +267,15 @@ TEST(LayerStateStack, ColorFilter) {
 
           DlPaint paint;
           state_stack.fill(paint);
-          builder.drawRect(rect, paint);
+          builder.DrawRect(rect, paint);
         }
         state_stack.clear_delegate();
 
         DisplayListBuilder expected;
         DlPaint save_paint = DlPaint().setColorFilter(outer_filter);
         DlPaint draw_paint = DlPaint().setColorFilter(inner_filter);
-        expected.saveLayer(&rect, &save_paint);
-        expected.drawRect(rect, draw_paint);
+        expected.SaveLayer(&rect, &save_paint);
+        expected.DrawRect(rect, draw_paint);
         ASSERT_TRUE(DisplayListsEQ_Verbose(builder.Build(), expected.Build()));
       }
     }
@@ -289,18 +322,18 @@ TEST(LayerStateStack, ImageFilter) {
 
           DlPaint paint;
           state_stack.fill(paint);
-          builder.drawRect(rect, paint);
+          builder.DrawRect(rect, paint);
         }
         state_stack.clear_delegate();
 
         DisplayListBuilder expected;
         DlPaint outer_save_paint = DlPaint().setImageFilter(outer_filter);
         DlPaint inner_save_paint = DlPaint().setImageFilter(inner_filter);
-        expected.saveLayer(&outer_src_rect, &outer_save_paint);
-        expected.saveLayer(&inner_src_rect, &inner_save_paint);
-        expected.drawRect(rect, DlPaint());
-        expected.restore();
-        expected.restore();
+        expected.SaveLayer(&outer_src_rect, &outer_save_paint);
+        expected.SaveLayer(&inner_src_rect, &inner_save_paint);
+        expected.DrawRect(rect, DlPaint());
+        expected.Restore();
+        expected.Restore();
         ASSERT_TRUE(DisplayListsEQ_Verbose(builder.Build(), expected.Build()));
       }
 
@@ -316,15 +349,15 @@ TEST(LayerStateStack, ImageFilter) {
 
           DlPaint paint;
           state_stack.fill(paint);
-          builder.drawRect(rect, paint);
+          builder.DrawRect(rect, paint);
         }
         state_stack.clear_delegate();
 
         DisplayListBuilder expected;
         DlPaint save_paint = DlPaint().setImageFilter(outer_filter);
         DlPaint draw_paint = DlPaint().setImageFilter(inner_filter);
-        expected.saveLayer(&outer_src_rect, &save_paint);
-        expected.drawRect(rect, draw_paint);
+        expected.SaveLayer(&outer_src_rect, &save_paint);
+        expected.DrawRect(rect, draw_paint);
         ASSERT_TRUE(DisplayListsEQ_Verbose(builder.Build(), expected.Build()));
       }
     }
@@ -344,53 +377,53 @@ TEST(LayerStateStack, OpacityAndColorFilterInteraction) {
   DisplayListBuilder builder;
   LayerStateStack state_stack;
   state_stack.set_delegate(&builder);
-  ASSERT_EQ(builder.getSaveCount(), 1);
+  ASSERT_EQ(builder.GetSaveCount(), 1);
 
   {
     auto mutator1 = state_stack.save();
-    ASSERT_EQ(builder.getSaveCount(), 1);
+    ASSERT_EQ(builder.GetSaveCount(), 1);
     mutator1.applyOpacity(rect, 0.5f);
-    ASSERT_EQ(builder.getSaveCount(), 1);
+    ASSERT_EQ(builder.GetSaveCount(), 1);
 
     {
       auto mutator2 = state_stack.save();
-      ASSERT_EQ(builder.getSaveCount(), 1);
+      ASSERT_EQ(builder.GetSaveCount(), 1);
       mutator2.applyColorFilter(rect, color_filter);
 
       // The opacity will have been resolved by a saveLayer
-      ASSERT_EQ(builder.getSaveCount(), 2);
+      ASSERT_EQ(builder.GetSaveCount(), 2);
       ASSERT_EQ(state_stack.outstanding_color_filter(), color_filter);
       ASSERT_EQ(state_stack.outstanding_opacity(), SK_Scalar1);
     }
-    ASSERT_EQ(builder.getSaveCount(), 1);
+    ASSERT_EQ(builder.GetSaveCount(), 1);
     ASSERT_EQ(state_stack.outstanding_color_filter(), nullptr);
     ASSERT_EQ(state_stack.outstanding_opacity(), 0.5f);
   }
-  ASSERT_EQ(builder.getSaveCount(), 1);
+  ASSERT_EQ(builder.GetSaveCount(), 1);
   ASSERT_EQ(state_stack.outstanding_color_filter(), nullptr);
   ASSERT_EQ(state_stack.outstanding_opacity(), SK_Scalar1);
 
   {
     auto mutator1 = state_stack.save();
-    ASSERT_EQ(builder.getSaveCount(), 1);
+    ASSERT_EQ(builder.GetSaveCount(), 1);
     mutator1.applyColorFilter(rect, color_filter);
-    ASSERT_EQ(builder.getSaveCount(), 1);
+    ASSERT_EQ(builder.GetSaveCount(), 1);
 
     {
       auto mutator2 = state_stack.save();
-      ASSERT_EQ(builder.getSaveCount(), 1);
+      ASSERT_EQ(builder.GetSaveCount(), 1);
       mutator2.applyOpacity(rect, 0.5f);
 
       // color filter applied to opacity can be applied together
-      ASSERT_EQ(builder.getSaveCount(), 1);
+      ASSERT_EQ(builder.GetSaveCount(), 1);
       ASSERT_EQ(state_stack.outstanding_color_filter(), color_filter);
       ASSERT_EQ(state_stack.outstanding_opacity(), 0.5f);
     }
-    ASSERT_EQ(builder.getSaveCount(), 1);
+    ASSERT_EQ(builder.GetSaveCount(), 1);
     ASSERT_EQ(state_stack.outstanding_color_filter(), color_filter);
     ASSERT_EQ(state_stack.outstanding_opacity(), SK_Scalar1);
   }
-  ASSERT_EQ(builder.getSaveCount(), 1);
+  ASSERT_EQ(builder.GetSaveCount(), 1);
   ASSERT_EQ(state_stack.outstanding_color_filter(), nullptr);
   ASSERT_EQ(state_stack.outstanding_opacity(), SK_Scalar1);
 }
@@ -403,53 +436,53 @@ TEST(LayerStateStack, OpacityAndImageFilterInteraction) {
   DisplayListBuilder builder;
   LayerStateStack state_stack;
   state_stack.set_delegate(&builder);
-  ASSERT_EQ(builder.getSaveCount(), 1);
+  ASSERT_EQ(builder.GetSaveCount(), 1);
 
   {
     auto mutator1 = state_stack.save();
-    ASSERT_EQ(builder.getSaveCount(), 1);
+    ASSERT_EQ(builder.GetSaveCount(), 1);
     mutator1.applyOpacity(rect, 0.5f);
-    ASSERT_EQ(builder.getSaveCount(), 1);
+    ASSERT_EQ(builder.GetSaveCount(), 1);
 
     {
       auto mutator2 = state_stack.save();
-      ASSERT_EQ(builder.getSaveCount(), 1);
+      ASSERT_EQ(builder.GetSaveCount(), 1);
       mutator2.applyImageFilter(rect, image_filter);
 
       // opacity applied to image filter can be applied together
-      ASSERT_EQ(builder.getSaveCount(), 1);
+      ASSERT_EQ(builder.GetSaveCount(), 1);
       ASSERT_EQ(state_stack.outstanding_image_filter(), image_filter);
       ASSERT_EQ(state_stack.outstanding_opacity(), 0.5f);
     }
-    ASSERT_EQ(builder.getSaveCount(), 1);
+    ASSERT_EQ(builder.GetSaveCount(), 1);
     ASSERT_EQ(state_stack.outstanding_image_filter(), nullptr);
     ASSERT_EQ(state_stack.outstanding_opacity(), 0.5f);
   }
-  ASSERT_EQ(builder.getSaveCount(), 1);
+  ASSERT_EQ(builder.GetSaveCount(), 1);
   ASSERT_EQ(state_stack.outstanding_image_filter(), nullptr);
   ASSERT_EQ(state_stack.outstanding_opacity(), SK_Scalar1);
 
   {
     auto mutator1 = state_stack.save();
-    ASSERT_EQ(builder.getSaveCount(), 1);
+    ASSERT_EQ(builder.GetSaveCount(), 1);
     mutator1.applyImageFilter(rect, image_filter);
-    ASSERT_EQ(builder.getSaveCount(), 1);
+    ASSERT_EQ(builder.GetSaveCount(), 1);
 
     {
       auto mutator2 = state_stack.save();
-      ASSERT_EQ(builder.getSaveCount(), 1);
+      ASSERT_EQ(builder.GetSaveCount(), 1);
       mutator2.applyOpacity(rect, 0.5f);
 
       // The image filter will have been resolved by a saveLayer
-      ASSERT_EQ(builder.getSaveCount(), 2);
+      ASSERT_EQ(builder.GetSaveCount(), 2);
       ASSERT_EQ(state_stack.outstanding_image_filter(), nullptr);
       ASSERT_EQ(state_stack.outstanding_opacity(), 0.5f);
     }
-    ASSERT_EQ(builder.getSaveCount(), 1);
+    ASSERT_EQ(builder.GetSaveCount(), 1);
     ASSERT_EQ(state_stack.outstanding_image_filter(), image_filter);
     ASSERT_EQ(state_stack.outstanding_opacity(), SK_Scalar1);
   }
-  ASSERT_EQ(builder.getSaveCount(), 1);
+  ASSERT_EQ(builder.GetSaveCount(), 1);
   ASSERT_EQ(state_stack.outstanding_image_filter(), nullptr);
   ASSERT_EQ(state_stack.outstanding_opacity(), SK_Scalar1);
 }
@@ -465,53 +498,53 @@ TEST(LayerStateStack, ColorFilterAndImageFilterInteraction) {
   DisplayListBuilder builder;
   LayerStateStack state_stack;
   state_stack.set_delegate(&builder);
-  ASSERT_EQ(builder.getSaveCount(), 1);
+  ASSERT_EQ(builder.GetSaveCount(), 1);
 
   {
     auto mutator1 = state_stack.save();
-    ASSERT_EQ(builder.getSaveCount(), 1);
+    ASSERT_EQ(builder.GetSaveCount(), 1);
     mutator1.applyColorFilter(rect, color_filter);
-    ASSERT_EQ(builder.getSaveCount(), 1);
+    ASSERT_EQ(builder.GetSaveCount(), 1);
 
     {
       auto mutator2 = state_stack.save();
-      ASSERT_EQ(builder.getSaveCount(), 1);
+      ASSERT_EQ(builder.GetSaveCount(), 1);
       mutator2.applyImageFilter(rect, image_filter);
 
       // color filter applied to image filter can be applied together
-      ASSERT_EQ(builder.getSaveCount(), 1);
+      ASSERT_EQ(builder.GetSaveCount(), 1);
       ASSERT_EQ(state_stack.outstanding_image_filter(), image_filter);
       ASSERT_EQ(state_stack.outstanding_color_filter(), color_filter);
     }
-    ASSERT_EQ(builder.getSaveCount(), 1);
+    ASSERT_EQ(builder.GetSaveCount(), 1);
     ASSERT_EQ(state_stack.outstanding_image_filter(), nullptr);
     ASSERT_EQ(state_stack.outstanding_color_filter(), color_filter);
   }
-  ASSERT_EQ(builder.getSaveCount(), 1);
+  ASSERT_EQ(builder.GetSaveCount(), 1);
   ASSERT_EQ(state_stack.outstanding_image_filter(), nullptr);
   ASSERT_EQ(state_stack.outstanding_color_filter(), nullptr);
 
   {
     auto mutator1 = state_stack.save();
-    ASSERT_EQ(builder.getSaveCount(), 1);
+    ASSERT_EQ(builder.GetSaveCount(), 1);
     mutator1.applyImageFilter(rect, image_filter);
-    ASSERT_EQ(builder.getSaveCount(), 1);
+    ASSERT_EQ(builder.GetSaveCount(), 1);
 
     {
       auto mutator2 = state_stack.save();
-      ASSERT_EQ(builder.getSaveCount(), 1);
+      ASSERT_EQ(builder.GetSaveCount(), 1);
       mutator2.applyColorFilter(rect, color_filter);
 
       // The image filter will have been resolved by a saveLayer
-      ASSERT_EQ(builder.getSaveCount(), 2);
+      ASSERT_EQ(builder.GetSaveCount(), 2);
       ASSERT_EQ(state_stack.outstanding_image_filter(), nullptr);
       ASSERT_EQ(state_stack.outstanding_color_filter(), color_filter);
     }
-    ASSERT_EQ(builder.getSaveCount(), 1);
+    ASSERT_EQ(builder.GetSaveCount(), 1);
     ASSERT_EQ(state_stack.outstanding_image_filter(), image_filter);
     ASSERT_EQ(state_stack.outstanding_color_filter(), nullptr);
   }
-  ASSERT_EQ(builder.getSaveCount(), 1);
+  ASSERT_EQ(builder.GetSaveCount(), 1);
   ASSERT_EQ(state_stack.outstanding_image_filter(), nullptr);
   ASSERT_EQ(state_stack.outstanding_color_filter(), nullptr);
 }
diff --git a/flow/layers/layer_tree.cc b/flow/layers/layer_tree.cc
index 62d4c2d5dd286005f8fd71f6fa961ae8931c9aa2..d9e26e7ce3162f1b5640bfb0b7ec7ac95bc916d3 100644
--- a/flow/layers/layer_tree.cc
+++ b/flow/layers/layer_tree.cc
@@ -4,32 +4,30 @@
 
 #include "flutter/flow/layers/layer_tree.h"
 
+#include "flutter/display_list/skia/dl_sk_canvas.h"
 #include "flutter/flow/embedded_views.h"
 #include "flutter/flow/frame_timings.h"
 #include "flutter/flow/layer_snapshot_store.h"
-#include "flutter/flow/layers/cacheable_layer.h"
 #include "flutter/flow/layers/layer.h"
 #include "flutter/flow/paint_utils.h"
 #include "flutter/flow/raster_cache.h"
+#include "flutter/flow/raster_cache_item.h"
 #include "flutter/fml/time/time_point.h"
 #include "flutter/fml/trace_event.h"
-#include "include/core/SkMatrix.h"
-#include "third_party/skia/include/core/SkPictureRecorder.h"
-#include "third_party/skia/include/utils/SkNWayCanvas.h"
+#include "include/core/SkColorSpace.h"
 
 namespace flutter {
 
-LayerTree::LayerTree(const SkISize& frame_size, float device_pixel_ratio)
-    : frame_size_(frame_size),
-      device_pixel_ratio_(device_pixel_ratio),
-      rasterizer_tracing_threshold_(0),
-      checkerboard_raster_cache_images_(false),
-      checkerboard_offscreen_layers_(false) {
-  FML_CHECK(device_pixel_ratio_ != 0.0f);
-}
+LayerTree::LayerTree(const Config& config, const SkISize& frame_size)
+    : root_layer_(config.root_layer),
+      frame_size_(frame_size),
+      rasterizer_tracing_threshold_(config.rasterizer_tracing_threshold),
+      checkerboard_raster_cache_images_(
+          config.checkerboard_raster_cache_images),
+      checkerboard_offscreen_layers_(config.checkerboard_offscreen_layers) {}
 
-inline SkColorSpace* GetColorSpace(SkCanvas* canvas) {
-  return canvas ? canvas->imageInfo().colorSpace() : nullptr;
+inline SkColorSpace* GetColorSpace(DlCanvas* canvas) {
+  return canvas ? canvas->GetImageInfo().colorSpace() : nullptr;
 }
 
 bool LayerTree::Preroll(CompositorContext::ScopedFrame& frame,
@@ -58,14 +56,12 @@ bool LayerTree::Preroll(CompositorContext::ScopedFrame& frame,
       .gr_context                    = frame.gr_context(),
       .view_embedder                 = frame.view_embedder(),
       .state_stack                   = state_stack,
-      .dst_color_space               = color_space,
+      .dst_color_space               = sk_ref_sp<SkColorSpace>(color_space),
       .surface_needs_readback        = false,
       .raster_time                   = frame.context().raster_time(),
       .ui_time                       = frame.context().ui_time(),
       .texture_registry              = frame.context().texture_registry(),
-      .frame_device_pixel_ratio      = device_pixel_ratio_,
       .raster_cached_entries         = &raster_cache_items_,
-      .display_list_enabled          = frame.display_list_builder() != nullptr,
       // clang-format on
   };
 
@@ -112,16 +108,14 @@ void LayerTree::Paint(CompositorContext::ScopedFrame& frame,
   }
 
   LayerStateStack state_stack;
-  if (checkerboard_offscreen_layers_) {
+
+  // DrawCheckerboard is not supported on Impeller.
+  if (checkerboard_offscreen_layers_ && !frame.aiks_context()) {
     state_stack.set_checkerboard_func(DrawCheckerboard);
   }
 
-  DisplayListBuilder* builder = frame.display_list_builder();
-  if (builder) {
-    state_stack.set_delegate(builder);
-  } else {
-    state_stack.set_delegate(frame.canvas());
-  }
+  DlCanvas* canvas = frame.canvas();
+  state_stack.set_delegate(canvas);
 
   // clear the previous snapshots.
   LayerSnapshotStore* snapshot_store = nullptr;
@@ -136,18 +130,17 @@ void LayerTree::Paint(CompositorContext::ScopedFrame& frame,
   PaintContext context = {
       // clang-format off
       .state_stack                   = state_stack,
-      .canvas                        = frame.canvas(),
-      .builder                       = builder,
+      .canvas                        = canvas,
       .gr_context                    = frame.gr_context(),
-      .dst_color_space               = color_space,
+      .dst_color_space               = sk_ref_sp(color_space),
       .view_embedder                 = frame.view_embedder(),
       .raster_time                   = frame.context().raster_time(),
       .ui_time                       = frame.context().ui_time(),
       .texture_registry              = frame.context().texture_registry(),
       .raster_cache                  = cache,
-      .frame_device_pixel_ratio      = device_pixel_ratio_,
       .layer_snapshot_store          = snapshot_store,
       .enable_leaf_layer_tracing     = enable_leaf_layer_tracing_,
+      .impeller_enabled              = !!frame.aiks_context(),
       .aiks_context                  = frame.aiks_context(),
       // clang-format on
   };
@@ -168,7 +161,7 @@ sk_sp<DisplayList> LayerTree::Flatten(
     GrDirectContext* gr_context) {
   TRACE_EVENT0("flutter", "LayerTree::Flatten");
 
-  DisplayListCanvasRecorder recorder(bounds);
+  DisplayListBuilder builder(bounds);
 
   const FixedRefreshRateStopwatch unused_stopwatch;
 
@@ -186,17 +179,15 @@ sk_sp<DisplayList> LayerTree::Flatten(
       .raster_time                   = unused_stopwatch,
       .ui_time                       = unused_stopwatch,
       .texture_registry              = texture_registry,
-      .frame_device_pixel_ratio      = device_pixel_ratio_
       // clang-format on
   };
 
   LayerStateStack paint_state_stack;
-  paint_state_stack.set_delegate(recorder);
+  paint_state_stack.set_delegate(&builder);
   PaintContext paint_context = {
       // clang-format off
       .state_stack                   = paint_state_stack,
-      .canvas                        = &recorder,
-      .builder                       = recorder.builder().get(),
+      .canvas                        = &builder,
       .gr_context                    = gr_context,
       .dst_color_space               = nullptr,
       .view_embedder                 = nullptr,
@@ -204,7 +195,6 @@ sk_sp<DisplayList> LayerTree::Flatten(
       .ui_time                       = unused_stopwatch,
       .texture_registry              = texture_registry,
       .raster_cache                  = nullptr,
-      .frame_device_pixel_ratio      = device_pixel_ratio_,
       .layer_snapshot_store          = nullptr,
       .enable_leaf_layer_tracing     = false,
       // clang-format on
@@ -221,7 +211,7 @@ sk_sp<DisplayList> LayerTree::Flatten(
     }
   }
 
-  return recorder.Build();
+  return builder.Build();
 }
 
 }  // namespace flutter
diff --git a/flow/layers/layer_tree.h b/flow/layers/layer_tree.h
index fba4180975e443c3cc9953cb996cadae1fe3033d..416096860d08c8c48b3b38e7f2373ff239a02b5e 100644
--- a/flow/layers/layer_tree.h
+++ b/flow/layers/layer_tree.h
@@ -14,14 +14,21 @@
 #include "flutter/flow/raster_cache.h"
 #include "flutter/fml/macros.h"
 #include "flutter/fml/time/time_delta.h"
-#include "third_party/skia/include/core/SkPicture.h"
-#include "third_party/skia/include/core/SkSize.h"
+
+class GrDirectContext;
 
 namespace flutter {
 
 class LayerTree {
  public:
-  LayerTree(const SkISize& frame_size, float device_pixel_ratio);
+  struct Config {
+    std::shared_ptr<Layer> root_layer;
+    uint32_t rasterizer_tracing_threshold = 0;
+    bool checkerboard_raster_cache_images = false;
+    bool checkerboard_offscreen_layers = false;
+  };
+
+  LayerTree(const Config& config, const SkISize& frame_size);
 
   // Perform a preroll pass on the tree and return information about
   // the tree that affects rendering this frame.
@@ -48,39 +55,23 @@ class LayerTree {
       GrDirectContext* gr_context = nullptr);
 
   Layer* root_layer() const { return root_layer_.get(); }
-
-  void set_root_layer(std::shared_ptr<Layer> root_layer) {
-    root_layer_ = std::move(root_layer);
-  }
-
   const SkISize& frame_size() const { return frame_size_; }
-  float device_pixel_ratio() const { return device_pixel_ratio_; }
 
   const PaintRegionMap& paint_region_map() const { return paint_region_map_; }
   PaintRegionMap& paint_region_map() { return paint_region_map_; }
 
   // The number of frame intervals missed after which the compositor must
-  // trace the rasterized picture to a trace file. Specify 0 to disable all
-  // tracing
-  void set_rasterizer_tracing_threshold(uint32_t interval) {
-    rasterizer_tracing_threshold_ = interval;
-  }
-
+  // trace the rasterized picture to a trace file. 0 stands for disabling all
+  // tracing.
   uint32_t rasterizer_tracing_threshold() const {
     return rasterizer_tracing_threshold_;
   }
 
-  void set_checkerboard_raster_cache_images(bool checkerboard) {
-    checkerboard_raster_cache_images_ = checkerboard;
-  }
-
-  void set_checkerboard_offscreen_layers(bool checkerboard) {
-    checkerboard_offscreen_layers_ = checkerboard;
-  }
-
   /// When `Paint` is called, if leaf layer tracing is enabled, additional
   /// metadata around raterization of leaf layers is collected.
   ///
+  /// This is not supported in the Impeller backend.
+  ///
   /// See: `LayerSnapshotStore`
   void enable_leaf_layer_tracing(bool enable) {
     enable_leaf_layer_tracing_ = enable;
@@ -93,7 +84,6 @@ class LayerTree {
  private:
   std::shared_ptr<Layer> root_layer_;
   SkISize frame_size_ = SkISize::MakeEmpty();  // Physical pixels.
-  const float device_pixel_ratio_;  // Logical / Physical pixels ratio.
   uint32_t rasterizer_tracing_threshold_;
   bool checkerboard_raster_cache_images_;
   bool checkerboard_offscreen_layers_;
@@ -106,6 +96,27 @@ class LayerTree {
   FML_DISALLOW_COPY_AND_ASSIGN(LayerTree);
 };
 
+// The information to draw a layer tree to a specified view.
+struct LayerTreeTask {
+ public:
+  LayerTreeTask(int64_t view_id,
+                std::unique_ptr<LayerTree> layer_tree,
+                float device_pixel_ratio)
+      : view_id(view_id),
+        layer_tree(std::move(layer_tree)),
+        device_pixel_ratio(device_pixel_ratio) {}
+
+  /// The target view to draw to.
+  int64_t view_id;
+  /// The target layer tree to be drawn.
+  std::unique_ptr<LayerTree> layer_tree;
+  /// The pixel ratio of the target view.
+  float device_pixel_ratio;
+
+ private:
+  FML_DISALLOW_COPY_AND_ASSIGN(LayerTreeTask);
+};
+
 }  // namespace flutter
 
 #endif  // FLUTTER_FLOW_LAYERS_LAYER_TREE_H_
diff --git a/flow/layers/layer_tree_unittests.cc b/flow/layers/layer_tree_unittests.cc
index 113f253d439100d7d9ee51f0c006ecd9c5bfd1d9..08facb40a0d2e6b75731e57e9304c2a99bd7a5e3 100644
--- a/flow/layers/layer_tree_unittests.cc
+++ b/flow/layers/layer_tree_unittests.cc
@@ -19,8 +19,7 @@ namespace testing {
 class LayerTreeTest : public CanvasTest {
  public:
   LayerTreeTest()
-      : layer_tree_(SkISize::Make(64, 64), 1.0f),
-        root_transform_(SkMatrix::Translate(1.0f, 1.0f)),
+      : root_transform_(SkMatrix::Translate(1.0f, 1.0f)),
         scoped_frame_(compositor_context_.AcquireFrame(nullptr,
                                                        &mock_canvas(),
                                                        nullptr,
@@ -28,15 +27,16 @@ class LayerTreeTest : public CanvasTest {
                                                        false,
                                                        true,
                                                        nullptr,
-                                                       nullptr,
                                                        nullptr)) {}
 
-  LayerTree& layer_tree() { return layer_tree_; }
   CompositorContext::ScopedFrame& frame() { return *scoped_frame_.get(); }
   const SkMatrix& root_transform() { return root_transform_; }
 
+  std::unique_ptr<LayerTree> BuildLayerTree(const LayerTree::Config& config) {
+    return std::make_unique<LayerTree>(config, SkISize::Make(64, 64));
+  }
+
  private:
-  LayerTree layer_tree_;
   CompositorContext compositor_context_;
   SkMatrix root_transform_;
   std::unique_ptr<CompositorContext::ScopedFrame> scoped_frame_;
@@ -45,12 +45,14 @@ class LayerTreeTest : public CanvasTest {
 TEST_F(LayerTreeTest, PaintingEmptyLayerDies) {
   auto layer = std::make_shared<ContainerLayer>();
 
-  layer_tree().set_root_layer(layer);
-  layer_tree().Preroll(frame());
+  auto layer_tree = BuildLayerTree(LayerTree::Config{
+      .root_layer = layer,
+  });
+  layer_tree->Preroll(frame());
   EXPECT_EQ(layer->paint_bounds(), SkRect::MakeEmpty());
   EXPECT_TRUE(layer->is_empty());
 
-  layer_tree().Paint(frame());
+  layer_tree->Paint(frame());
 }
 
 TEST_F(LayerTreeTest, PaintBeforePrerollDies) {
@@ -61,33 +63,37 @@ TEST_F(LayerTreeTest, PaintBeforePrerollDies) {
   auto layer = std::make_shared<ContainerLayer>();
   layer->Add(mock_layer);
 
-  layer_tree().set_root_layer(layer);
+  auto layer_tree = BuildLayerTree(LayerTree::Config{
+      .root_layer = layer,
+  });
   EXPECT_EQ(mock_layer->paint_bounds(), kEmptyRect);
   EXPECT_EQ(layer->paint_bounds(), kEmptyRect);
   EXPECT_TRUE(mock_layer->is_empty());
   EXPECT_TRUE(layer->is_empty());
 
-  layer_tree().Paint(frame());
+  layer_tree->Paint(frame());
   EXPECT_EQ(mock_canvas().draw_calls(), std::vector<MockCanvas::DrawCall>());
 }
 
 TEST_F(LayerTreeTest, Simple) {
   const SkRect child_bounds = SkRect::MakeLTRB(5.0f, 6.0f, 20.5f, 21.5f);
   const SkPath child_path = SkPath().addRect(child_bounds);
-  const SkPaint child_paint = SkPaint(SkColors::kCyan);
+  const DlPaint child_paint = DlPaint(DlColor::kCyan());
   auto mock_layer = std::make_shared<MockLayer>(child_path, child_paint);
   auto layer = std::make_shared<ContainerLayer>();
   layer->Add(mock_layer);
 
-  layer_tree().set_root_layer(layer);
-  layer_tree().Preroll(frame());
+  auto layer_tree = BuildLayerTree(LayerTree::Config{
+      .root_layer = layer,
+  });
+  layer_tree->Preroll(frame());
   EXPECT_EQ(mock_layer->paint_bounds(), child_bounds);
   EXPECT_EQ(layer->paint_bounds(), mock_layer->paint_bounds());
   EXPECT_FALSE(mock_layer->is_empty());
   EXPECT_FALSE(layer->is_empty());
   EXPECT_EQ(mock_layer->parent_matrix(), root_transform());
 
-  layer_tree().Paint(frame());
+  layer_tree->Paint(frame());
   EXPECT_EQ(mock_canvas().draw_calls(),
             std::vector({MockCanvas::DrawCall{
                 0, MockCanvas::DrawPathData{child_path, child_paint}}}));
@@ -96,8 +102,8 @@ TEST_F(LayerTreeTest, Simple) {
 TEST_F(LayerTreeTest, Multiple) {
   const SkPath child_path1 = SkPath().addRect(5.0f, 6.0f, 20.5f, 21.5f);
   const SkPath child_path2 = SkPath().addRect(8.0f, 2.0f, 16.5f, 14.5f);
-  const SkPaint child_paint1(SkColors::kGray);
-  const SkPaint child_paint2(SkColors::kGreen);
+  const DlPaint child_paint1 = DlPaint(DlColor::kMidGrey());
+  const DlPaint child_paint2 = DlPaint(DlColor::kGreen());
   auto mock_layer1 = std::make_shared<MockLayer>(child_path1, child_paint1);
   mock_layer1->set_fake_has_platform_view(true);
   auto mock_layer2 = std::make_shared<MockLayer>(child_path2, child_paint2);
@@ -107,8 +113,10 @@ TEST_F(LayerTreeTest, Multiple) {
 
   SkRect expected_total_bounds = child_path1.getBounds();
   expected_total_bounds.join(child_path2.getBounds());
-  layer_tree().set_root_layer(layer);
-  layer_tree().Preroll(frame());
+  auto layer_tree = BuildLayerTree(LayerTree::Config{
+      .root_layer = layer,
+  });
+  layer_tree->Preroll(frame());
   EXPECT_EQ(mock_layer1->paint_bounds(), child_path1.getBounds());
   EXPECT_EQ(mock_layer2->paint_bounds(), child_path2.getBounds());
   EXPECT_EQ(layer->paint_bounds(), expected_total_bounds);
@@ -121,7 +129,7 @@ TEST_F(LayerTreeTest, Multiple) {
   EXPECT_EQ(mock_layer2->parent_cull_rect(),
             kGiantRect);  // Siblings are independent
 
-  layer_tree().Paint(frame());
+  layer_tree->Paint(frame());
   EXPECT_EQ(
       mock_canvas().draw_calls(),
       std::vector({MockCanvas::DrawCall{
@@ -132,16 +140,18 @@ TEST_F(LayerTreeTest, Multiple) {
 
 TEST_F(LayerTreeTest, MultipleWithEmpty) {
   const SkPath child_path1 = SkPath().addRect(5.0f, 6.0f, 20.5f, 21.5f);
-  const SkPaint child_paint1(SkColors::kGray);
-  const SkPaint child_paint2(SkColors::kGreen);
+  const DlPaint child_paint1 = DlPaint(DlColor::kMidGrey());
+  const DlPaint child_paint2 = DlPaint(DlColor::kGreen());
   auto mock_layer1 = std::make_shared<MockLayer>(child_path1, child_paint1);
   auto mock_layer2 = std::make_shared<MockLayer>(SkPath(), child_paint2);
   auto layer = std::make_shared<ContainerLayer>();
   layer->Add(mock_layer1);
   layer->Add(mock_layer2);
 
-  layer_tree().set_root_layer(layer);
-  layer_tree().Preroll(frame());
+  auto layer_tree = BuildLayerTree(LayerTree::Config{
+      .root_layer = layer,
+  });
+  layer_tree->Preroll(frame());
   EXPECT_EQ(mock_layer1->paint_bounds(), child_path1.getBounds());
   EXPECT_EQ(mock_layer2->paint_bounds(), SkPath().getBounds());
   EXPECT_EQ(layer->paint_bounds(), child_path1.getBounds());
@@ -153,7 +163,7 @@ TEST_F(LayerTreeTest, MultipleWithEmpty) {
   EXPECT_EQ(mock_layer1->parent_cull_rect(), kGiantRect);
   EXPECT_EQ(mock_layer2->parent_cull_rect(), kGiantRect);
 
-  layer_tree().Paint(frame());
+  layer_tree->Paint(frame());
   EXPECT_EQ(mock_canvas().draw_calls(),
             std::vector({MockCanvas::DrawCall{
                 0, MockCanvas::DrawPathData{child_path1, child_paint1}}}));
@@ -162,8 +172,8 @@ TEST_F(LayerTreeTest, MultipleWithEmpty) {
 TEST_F(LayerTreeTest, NeedsSystemComposite) {
   const SkPath child_path1 = SkPath().addRect(5.0f, 6.0f, 20.5f, 21.5f);
   const SkPath child_path2 = SkPath().addRect(8.0f, 2.0f, 16.5f, 14.5f);
-  const SkPaint child_paint1(SkColors::kGray);
-  const SkPaint child_paint2(SkColors::kGreen);
+  const DlPaint child_paint1 = DlPaint(DlColor::kMidGrey());
+  const DlPaint child_paint2 = DlPaint(DlColor::kGreen());
   auto mock_layer1 = std::make_shared<MockLayer>(child_path1, child_paint1);
   auto mock_layer2 = std::make_shared<MockLayer>(child_path2, child_paint2);
   auto layer = std::make_shared<ContainerLayer>();
@@ -172,8 +182,10 @@ TEST_F(LayerTreeTest, NeedsSystemComposite) {
 
   SkRect expected_total_bounds = child_path1.getBounds();
   expected_total_bounds.join(child_path2.getBounds());
-  layer_tree().set_root_layer(layer);
-  layer_tree().Preroll(frame());
+  auto layer_tree = BuildLayerTree(LayerTree::Config{
+      .root_layer = layer,
+  });
+  layer_tree->Preroll(frame());
   EXPECT_EQ(mock_layer1->paint_bounds(), child_path1.getBounds());
   EXPECT_EQ(mock_layer2->paint_bounds(), child_path2.getBounds());
   EXPECT_EQ(layer->paint_bounds(), expected_total_bounds);
@@ -185,7 +197,7 @@ TEST_F(LayerTreeTest, NeedsSystemComposite) {
   EXPECT_EQ(mock_layer1->parent_cull_rect(), kGiantRect);
   EXPECT_EQ(mock_layer2->parent_cull_rect(), kGiantRect);
 
-  layer_tree().Paint(frame());
+  layer_tree->Paint(frame());
   EXPECT_EQ(
       mock_canvas().draw_calls(),
       std::vector({MockCanvas::DrawCall{
@@ -216,7 +228,6 @@ TEST_F(LayerTreeTest, PrerollContextInitialization) {
     EXPECT_EQ(&context.raster_time, &mock_raster_time);
     EXPECT_EQ(&context.ui_time, &mock_ui_time);
     EXPECT_EQ(context.texture_registry.get(), mock_registry.get());
-    EXPECT_EQ(context.frame_device_pixel_ratio, 1.0f);
 
     EXPECT_EQ(context.has_platform_view, false);
     EXPECT_EQ(context.has_texture_layer, false);
@@ -245,7 +256,6 @@ TEST_F(LayerTreeTest, PaintContextInitialization) {
                           &mock_registry](const PaintContext& context) {
     EXPECT_EQ(&context.state_stack, &state_stack);
     EXPECT_EQ(context.canvas, nullptr);
-    EXPECT_EQ(context.builder, nullptr);
     EXPECT_EQ(context.gr_context, nullptr);
     EXPECT_EQ(context.view_embedder, nullptr);
     EXPECT_EQ(&context.raster_time, &mock_raster_time);
@@ -253,7 +263,6 @@ TEST_F(LayerTreeTest, PaintContextInitialization) {
     EXPECT_EQ(context.texture_registry.get(), mock_registry.get());
     EXPECT_EQ(context.raster_cache, nullptr);
     EXPECT_EQ(context.state_stack.checkerboard_func(), nullptr);
-    EXPECT_EQ(context.frame_device_pixel_ratio, 1.0f);
 
     EXPECT_EQ(context.enable_leaf_layer_tracing, false);
     EXPECT_EQ(context.layer_snapshot_store, nullptr);
diff --git a/flow/layers/offscreen_surface.cc b/flow/layers/offscreen_surface.cc
index cb29360e576ad2fb64a6091dbf0dbe77f74b04f8..58046292d282adb163d3e2c541650ded108ec74b 100644
--- a/flow/layers/offscreen_surface.cc
+++ b/flow/layers/offscreen_surface.cc
@@ -4,12 +4,14 @@
 
 #include "flutter/flow/layers/offscreen_surface.h"
 
-#include "third_party/skia/include/core/SkImageEncoder.h"
-#include "third_party/skia/include/core/SkPictureRecorder.h"
-#include "third_party/skia/include/core/SkSerialProcs.h"
-#include "third_party/skia/include/core/SkSurface.h"
-#include "third_party/skia/include/core/SkSurfaceCharacterization.h"
-#include "third_party/skia/include/utils/SkBase64.h"
+#include "third_party/skia/include/core/SkColorSpace.h"
+#include "third_party/skia/include/core/SkData.h"
+#include "third_party/skia/include/core/SkImage.h"
+#include "third_party/skia/include/core/SkImageInfo.h"
+#include "third_party/skia/include/core/SkPixmap.h"
+#include "third_party/skia/include/encode/SkPngEncoder.h"
+#include "third_party/skia/include/gpu/GrDirectContext.h"
+#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
 
 namespace flutter {
 
@@ -20,14 +22,13 @@ static sk_sp<SkSurface> CreateSnapshotSurface(GrDirectContext* surface_context,
   if (surface_context) {
     // There is a rendering surface that may contain textures that are going to
     // be referenced in the layer tree about to be drawn.
-    return SkSurface::MakeRenderTarget(
-        reinterpret_cast<GrRecordingContext*>(surface_context), SkBudgeted::kNo,
-        image_info);
+    return SkSurfaces::RenderTarget(surface_context, skgpu::Budgeted::kNo,
+                                    image_info);
   }
 
   // There is no rendering surface, assume no GPU textures are present and
   // create a raster surface.
-  return SkSurface::MakeRaster(image_info);
+  return SkSurfaces::Raster(image_info);
 }
 
 /// Returns a buffer containing a snapshot of the surface.
@@ -53,7 +54,7 @@ static sk_sp<SkData> GetRasterData(const sk_sp<SkSurface>& offscreen_surface,
   // If the caller want the pixels to be compressed, there is a Skia utility to
   // compress to PNG. Use that.
   if (compressed) {
-    return cpu_snapshot->encodeToData();
+    return SkPngEncoder::Encode(nullptr, cpu_snapshot.get(), {});
   }
 
   // Copy it into a bitmap and return the same.
@@ -68,14 +69,17 @@ static sk_sp<SkData> GetRasterData(const sk_sp<SkSurface>& offscreen_surface,
 OffscreenSurface::OffscreenSurface(GrDirectContext* surface_context,
                                    const SkISize& size) {
   offscreen_surface_ = CreateSnapshotSurface(surface_context, size);
+  if (offscreen_surface_) {
+    adapter_.set_canvas(offscreen_surface_->getCanvas());
+  }
 }
 
 sk_sp<SkData> OffscreenSurface::GetRasterData(bool compressed) const {
   return flutter::GetRasterData(offscreen_surface_, compressed);
 }
 
-SkCanvas* OffscreenSurface::GetCanvas() const {
-  return offscreen_surface_->getCanvas();
+DlCanvas* OffscreenSurface::GetCanvas() {
+  return &adapter_;
 }
 
 bool OffscreenSurface::IsValid() const {
diff --git a/flow/layers/offscreen_surface.h b/flow/layers/offscreen_surface.h
index bfa192fb85e9332eaf610b878481ae384d799743..6dabfb9eda63d760ae6bc247bcba57ee3ab6f25e 100644
--- a/flow/layers/offscreen_surface.h
+++ b/flow/layers/offscreen_surface.h
@@ -8,8 +8,15 @@
 #include "flutter/fml/logging.h"
 #include "flutter/fml/macros.h"
 
+#include "flutter/display_list/dl_canvas.h"
+#include "flutter/display_list/skia/dl_sk_canvas.h"
+#include "third_party/skia/include/core/SkData.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
+#include "third_party/skia/include/core/SkSize.h"
 #include "third_party/skia/include/core/SkSurface.h"
 
+class GrDirectContext;
+
 namespace flutter {
 
 class OffscreenSurface {
@@ -21,12 +28,13 @@ class OffscreenSurface {
 
   sk_sp<SkData> GetRasterData(bool compressed) const;
 
-  SkCanvas* GetCanvas() const;
+  DlCanvas* GetCanvas();
 
   bool IsValid() const;
 
  private:
   sk_sp<SkSurface> offscreen_surface_;
+  DlSkCanvasAdapter adapter_;
 
   FML_DISALLOW_COPY_AND_ASSIGN(OffscreenSurface);
 };
diff --git a/flow/layers/offscreen_surface_unittests.cc b/flow/layers/offscreen_surface_unittests.cc
index 64063b0001cb52060eb6b0093da3ff4664e816b2..780ea310009c363caecc869845c2f873996f1949 100644
--- a/flow/layers/offscreen_surface_unittests.cc
+++ b/flow/layers/offscreen_surface_unittests.cc
@@ -29,9 +29,9 @@ TEST(OffscreenSurfaceTest, PaintSurfaceBlack) {
   auto surface =
       std::make_unique<OffscreenSurface>(nullptr, SkISize::Make(1, 1));
 
-  SkCanvas* canvas = surface->GetCanvas();
-  canvas->clear(SK_ColorBLACK);
-  canvas->flush();
+  DlCanvas* canvas = surface->GetCanvas();
+  canvas->Clear(DlColor::kBlack());
+  canvas->Flush();
 
   auto raster_data = surface->GetRasterData(false);
   const uint32_t* actual =
diff --git a/flow/layers/opacity_layer.cc b/flow/layers/opacity_layer.cc
index 71a6073f6f3313203022475cfe86ffe1e172e603..144b29bcf1acf4b41d649776bf7551ac5aa813ba 100644
--- a/flow/layers/opacity_layer.cc
+++ b/flow/layers/opacity_layer.cc
@@ -15,8 +15,7 @@ namespace flutter {
 OpacityLayer::OpacityLayer(SkAlpha alpha, const SkPoint& offset)
     : CacheableContainerLayer(std::numeric_limits<int>::max(), true),
       alpha_(alpha),
-      offset_(offset),
-      children_can_accept_opacity_(false) {}
+      offset_(offset) {}
 
 void OpacityLayer::Diff(DiffContext* context, const Layer* old_layer) {
   DiffContext::AutoSubtreeRestore subtree(context);
@@ -29,16 +28,13 @@ void OpacityLayer::Diff(DiffContext* context, const Layer* old_layer) {
   }
   context->PushTransform(SkMatrix::Translate(offset_.fX, offset_.fY));
   if (context->has_raster_cache()) {
-    context->SetTransform(
-        RasterCacheUtil::GetIntegralTransCTM(context->GetTransform()));
+    context->WillPaintWithIntegralTransform();
   }
   DiffChildren(context, prev);
   context->SetLayerPaintRegion(this, context->CurrentSubtreeRegion());
 }
 
 void OpacityLayer::Preroll(PrerollContext* context) {
-  FML_DCHECK(!layers().empty());  // We can't be a leaf.
-
   auto mutator = context->state_stack.save();
   mutator.translate(offset_);
   mutator.applyOpacity(SkRect(), DlColor::toOpacity(alpha_));
@@ -80,7 +76,7 @@ void OpacityLayer::Paint(PaintContext& context) const {
   mutator.applyOpacity(child_paint_bounds(), opacity());
 
   if (!children_can_accept_opacity()) {
-    SkPaint paint;
+    DlPaint paint;
     if (layer_raster_cache_item_->Draw(context,
                                        context.state_stack.fill(paint))) {
       return;
diff --git a/flow/layers/opacity_layer.h b/flow/layers/opacity_layer.h
index 041efcef41938705674792647849e62202fc6d5e..52131b1fec98b66e7352a0c617795de76ac1f1cc 100644
--- a/flow/layers/opacity_layer.h
+++ b/flow/layers/opacity_layer.h
@@ -45,12 +45,12 @@ class OpacityLayer : public CacheableContainerLayer {
     children_can_accept_opacity_ = value;
   }
 
-  SkScalar opacity() const { return alpha_ * 1.0 / SK_AlphaOPAQUE; }
+  SkScalar opacity() const { return alpha_ * 1.0f / SK_AlphaOPAQUE; }
 
  private:
   SkAlpha alpha_;
   SkPoint offset_;
-  bool children_can_accept_opacity_;
+  bool children_can_accept_opacity_ = false;
 
   FML_DISALLOW_COPY_AND_ASSIGN(OpacityLayer);
 };
diff --git a/flow/layers/opacity_layer_unittests.cc b/flow/layers/opacity_layer_unittests.cc
index df5bfecb1d4228edb52e1337326eb3b57af6d5c6..e9c0db8a9a714765364265e13e5190f6da06677e 100644
--- a/flow/layers/opacity_layer_unittests.cc
+++ b/flow/layers/opacity_layer_unittests.cc
@@ -16,9 +16,10 @@
 #include "flutter/flow/testing/mock_layer.h"
 #include "flutter/fml/macros.h"
 #include "flutter/testing/display_list_testing.h"
-#include "flutter/testing/mock_canvas.h"
 #include "gtest/gtest.h"
-#include "include/core/SkPaint.h"
+
+// TODO(zanderso): https://github.com/flutter/flutter/issues/127701
+// NOLINTBEGIN(bugprone-unchecked-optional-access)
 
 namespace flutter {
 namespace testing {
@@ -26,14 +27,6 @@ namespace testing {
 using OpacityLayerTest = LayerTest;
 
 #ifndef NDEBUG
-TEST_F(OpacityLayerTest, LeafLayer) {
-  auto layer =
-      std::make_shared<OpacityLayer>(SK_AlphaOPAQUE, SkPoint::Make(0.0f, 0.0f));
-
-  EXPECT_DEATH_IF_SUPPORTED(layer->Preroll(preroll_context()),
-                            "\\!layers\\(\\)\\.empty\\(\\)");
-}
-
 TEST_F(OpacityLayerTest, PaintingEmptyLayerDies) {
   auto mock_layer = std::make_shared<MockLayer>(SkPath());
   auto layer =
@@ -67,7 +60,7 @@ TEST_F(OpacityLayerTest, PaintBeforePrerollDies) {
 TEST_F(OpacityLayerTest, TranslateChildren) {
   SkPath child_path1;
   child_path1.addRect(10.0f, 10.0f, 20.0f, 20.f);
-  SkPaint child_paint1(SkColors::kGray);
+  DlPaint child_paint1 = DlPaint(DlColor::kMidGrey());
   auto layer = std::make_shared<OpacityLayer>(0.5, SkPoint::Make(10, 10));
   auto mock_layer1 = std::make_shared<MockLayer>(child_path1, child_paint1);
   layer->Add(mock_layer1);
@@ -91,13 +84,13 @@ TEST_F(OpacityLayerTest, CacheChild) {
   auto layer =
       std::make_shared<OpacityLayer>(alpha_half, SkPoint::Make(0.0f, 0.0f));
   layer->Add(mock_layer);
-  SkPaint paint;
+  DlPaint paint;
 
   SkMatrix cache_ctm = initial_transform;
-  SkCanvas cache_canvas;
-  cache_canvas.setMatrix(cache_ctm);
-  SkCanvas other_canvas;
-  other_canvas.setMatrix(other_transform);
+  DisplayListBuilder cache_canvas;
+  cache_canvas.Transform(cache_ctm);
+  DisplayListBuilder other_canvas;
+  other_canvas.Transform(other_transform);
 
   use_mock_raster_cache();
 
@@ -134,7 +127,7 @@ TEST_F(OpacityLayerTest, CacheChildren) {
   auto other_transform = SkMatrix::Scale(1.0, 2.0);
   const SkPath child_path1 = SkPath().addRect(SkRect::MakeWH(5.0f, 5.0f));
   const SkPath child_path2 = SkPath().addRect(SkRect::MakeWH(5.0f, 5.0f));
-  SkPaint paint;
+  DlPaint paint;
   auto mock_layer1 = std::make_shared<MockLayer>(child_path1);
   auto mock_layer2 = std::make_shared<MockLayer>(child_path2);
   auto layer =
@@ -143,10 +136,10 @@ TEST_F(OpacityLayerTest, CacheChildren) {
   layer->Add(mock_layer2);
 
   SkMatrix cache_ctm = initial_transform;
-  SkCanvas cache_canvas;
-  cache_canvas.setMatrix(cache_ctm);
-  SkCanvas other_canvas;
-  other_canvas.setMatrix(other_transform);
+  DisplayListBuilder cache_canvas;
+  cache_canvas.Transform(cache_ctm);
+  DisplayListBuilder other_canvas;
+  other_canvas.Transform(other_transform);
 
   use_mock_raster_cache();
 
@@ -178,7 +171,7 @@ TEST_F(OpacityLayerTest, CacheChildren) {
 }
 
 TEST_F(OpacityLayerTest, ShouldNotCacheChildren) {
-  SkPaint paint;
+  DlPaint paint;
   auto opacity_layer =
       std::make_shared<OpacityLayer>(128, SkPoint::Make(20, 20));
   auto mock_layer = MockLayer::MakeOpacityCompatible(SkPath());
@@ -215,7 +208,7 @@ TEST_F(OpacityLayerTest, FullyOpaque) {
   const SkMatrix initial_transform = SkMatrix::Translate(0.5f, 0.5f);
   const SkMatrix layer_transform =
       SkMatrix::Translate(layer_offset.fX, layer_offset.fY);
-  const SkPaint child_paint = SkPaint(SkColors::kGreen);
+  const DlPaint child_paint = DlPaint(DlColor::kGreen());
   const SkRect expected_layer_bounds =
       layer_transform.mapRect(child_path.getBounds());
   auto mock_layer = std::make_shared<MockLayer>(child_path, child_paint);
@@ -234,28 +227,30 @@ TEST_F(OpacityLayerTest, FullyOpaque) {
   EXPECT_EQ(mock_layer->parent_mutators(),
             std::vector({Mutator(layer_transform)}));
 
-  const SkPaint opacity_paint = SkPaint(SkColors::kBlack);  // A = 1.0f
-  SkRect opacity_bounds;
-  expected_layer_bounds.makeOffset(-layer_offset.fX, -layer_offset.fY)
-      .roundOut(&opacity_bounds);
-  auto expected_draw_calls =
-      std::vector({MockCanvas::DrawCall{0, MockCanvas::SaveData{1}},
-                   MockCanvas::DrawCall{
-                       1, MockCanvas::ConcatMatrixData{SkM44(layer_transform)}},
-                   MockCanvas::DrawCall{
-                       1, MockCanvas::DrawPathData{child_path, child_paint}},
-                   MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}});
-  layer->Paint(paint_context());
-  EXPECT_EQ(mock_canvas().draw_calls(), expected_draw_calls);
+  DisplayListBuilder expected_builder;
+  /* (Opacity)layer::Paint */ {
+    expected_builder.Save();
+    {
+      expected_builder.Translate(layer_offset.fX, layer_offset.fY);
+      // Opaque alpha needs no SaveLayer, just recurse into painting mock_layer
+      /* mock_layer::Paint */ {
+        expected_builder.DrawPath(child_path, child_paint);
+      }
+    }
+    expected_builder.Restore();
+  }
+  layer->Paint(display_list_paint_context());
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
 }
 
 TEST_F(OpacityLayerTest, FullyTransparent) {
-  const SkPath child_path = SkPath().addRect(SkRect::MakeWH(5.0f, 5.0f));
+  const SkRect child_bounds = SkRect::MakeWH(5.0f, 5.0f);
+  const SkPath child_path = SkPath().addRect(child_bounds);
   const SkPoint layer_offset = SkPoint::Make(0.5f, 1.5f);
   const SkMatrix initial_transform = SkMatrix::Translate(0.5f, 0.5f);
   const SkMatrix layer_transform =
       SkMatrix::Translate(layer_offset.fX, layer_offset.fY);
-  const SkPaint child_paint = SkPaint(SkColors::kGreen);
+  const DlPaint child_paint = DlPaint(DlColor::kGreen());
   const SkRect expected_layer_bounds =
       layer_transform.mapRect(child_path.getBounds());
   auto mock_layer = std::make_shared<MockLayer>(child_path, child_paint);
@@ -276,18 +271,24 @@ TEST_F(OpacityLayerTest, FullyTransparent) {
       mock_layer->parent_mutators(),
       std::vector({Mutator(layer_transform), Mutator(SK_AlphaTRANSPARENT)}));
 
-  auto expected_draw_calls = std::vector(
-      {MockCanvas::DrawCall{0, MockCanvas::SaveData{1}},
-       MockCanvas::DrawCall{
-           1, MockCanvas::ConcatMatrixData{SkM44(layer_transform)}},
-       MockCanvas::DrawCall{1, MockCanvas::SaveData{2}},
-       MockCanvas::DrawCall{
-           2, MockCanvas::ClipRectData{kEmptyRect, SkClipOp::kIntersect,
-                                       MockCanvas::kHard_ClipEdgeStyle}},
-       MockCanvas::DrawCall{2, MockCanvas::RestoreData{1}},
-       MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}});
-  layer->Paint(paint_context());
-  EXPECT_EQ(mock_canvas().draw_calls(), expected_draw_calls);
+  DisplayListBuilder expected_builder;
+  /* (Opacity)layer::Paint */ {
+    expected_builder.Save();
+    {
+      expected_builder.Translate(layer_offset.fX, layer_offset.fY);
+      /* (Opacity)layer::PaintChildren */ {
+        DlPaint save_paint(DlPaint().setOpacity(layer->opacity()));
+        expected_builder.SaveLayer(&child_bounds, &save_paint);
+        /* mock_layer::Paint */ {
+          expected_builder.DrawPath(child_path, child_paint);
+        }
+        expected_builder.Restore();
+      }
+    }
+    expected_builder.Restore();
+  }
+  layer->Paint(display_list_paint_context());
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
 }
 
 TEST_F(OpacityLayerTest, HalfTransparent) {
@@ -296,7 +297,7 @@ TEST_F(OpacityLayerTest, HalfTransparent) {
   const SkMatrix initial_transform = SkMatrix::Translate(0.5f, 0.5f);
   const SkMatrix layer_transform =
       SkMatrix::Translate(layer_offset.fX, layer_offset.fY);
-  const SkPaint child_paint = SkPaint(SkColors::kGreen);
+  const DlPaint child_paint = DlPaint(DlColor::kGreen());
   const SkRect expected_layer_bounds =
       layer_transform.mapRect(child_path.getBounds());
   const SkAlpha alpha_half = 255 / 2;
@@ -320,15 +321,21 @@ TEST_F(OpacityLayerTest, HalfTransparent) {
   expected_layer_bounds.makeOffset(-layer_offset.fX, -layer_offset.fY)
       .roundOut(&opacity_bounds);
   DlPaint save_paint = DlPaint().setAlpha(alpha_half);
-  DlPaint child_dl_paint = DlPaint().setColor(DlColor::kGreen());
+  DlPaint child_dl_paint = DlPaint(DlColor::kGreen());
 
   auto expected_builder = DisplayListBuilder();
-  expected_builder.save();
-  expected_builder.translate(layer_offset.fX, layer_offset.fY);
-  expected_builder.saveLayer(&opacity_bounds, &save_paint);
-  expected_builder.drawPath(child_path, child_dl_paint);
-  expected_builder.restore();
-  expected_builder.restore();
+  /* (Opacity)layer::Paint */ {
+    expected_builder.Save();
+    expected_builder.Translate(layer_offset.fX, layer_offset.fY);
+    /* (Opacity)layer::PaintChildren */ {
+      expected_builder.SaveLayer(&opacity_bounds, &save_paint);
+      /* mock_layer::Paint */ {
+        expected_builder.DrawPath(child_path, child_dl_paint);
+      }
+      expected_builder.Restore();
+    }
+    expected_builder.Restore();
+  }
   sk_sp<DisplayList> expected_display_list = expected_builder.Build();
 
   layer->Paint(display_list_paint_context());
@@ -346,9 +353,9 @@ TEST_F(OpacityLayerTest, Nested) {
       SkMatrix::Translate(layer1_offset.fX, layer1_offset.fY);
   const SkMatrix layer2_transform =
       SkMatrix::Translate(layer2_offset.fX, layer2_offset.fY);
-  const SkPaint child1_paint = SkPaint(SkColors::kRed);
-  const SkPaint child2_paint = SkPaint(SkColors::kBlue);
-  const SkPaint child3_paint = SkPaint(SkColors::kGreen);
+  const DlPaint child1_paint = DlPaint(DlColor::kRed());
+  const DlPaint child2_paint = DlPaint(DlColor::kBlue());
+  const DlPaint child3_paint = DlPaint(DlColor::kGreen());
   const SkAlpha alpha1 = 155;
   const SkAlpha alpha2 = 224;
   auto mock_layer1 = std::make_shared<MockLayer>(child1_path, child1_paint);
@@ -383,53 +390,65 @@ TEST_F(OpacityLayerTest, Nested) {
   EXPECT_TRUE(layer2->needs_painting(paint_context()));
   EXPECT_EQ(mock_layer1->parent_matrix(),
             SkMatrix::Concat(initial_transform, layer1_transform));
-  //   EXPECT_EQ(mock_layer1->parent_mutators(),
-  //             std::vector({Mutator(layer1_transform), Mutator(alpha1)}));
+  EXPECT_EQ(mock_layer1->parent_mutators(),
+            std::vector({Mutator(layer1_transform), Mutator(alpha1)}));
   EXPECT_EQ(
       mock_layer2->parent_matrix(),
       SkMatrix::Concat(SkMatrix::Concat(initial_transform, layer1_transform),
                        layer2_transform));
-  //   EXPECT_EQ(mock_layer2->parent_mutators(),
-  //             std::vector({Mutator(layer1_transform), Mutator(alpha1),
-  //                          Mutator(layer2_transform), Mutator(alpha2)}));
+  EXPECT_EQ(mock_layer2->parent_mutators(),
+            std::vector({Mutator(layer1_transform), Mutator(alpha1),
+                         Mutator(layer2_transform), Mutator(alpha2)}));
   EXPECT_EQ(mock_layer3->parent_matrix(),
             SkMatrix::Concat(initial_transform, layer1_transform));
-  //   EXPECT_EQ(mock_layer3->parent_mutators(),
-  //             std::vector({Mutator(layer1_transform), Mutator(alpha1)}));
+  EXPECT_EQ(mock_layer3->parent_mutators(),
+            std::vector({Mutator(layer1_transform), Mutator(alpha1)}));
 
-  SkPaint opacity1_paint;
-  opacity1_paint.setAlphaf(alpha1 * (1.0 / SK_AlphaOPAQUE));
-  SkPaint opacity2_paint;
-  opacity2_paint.setAlphaf(alpha2 * (1.0 / SK_AlphaOPAQUE));
   SkRect opacity1_bounds =
       expected_layer1_bounds.makeOffset(-layer1_offset.fX, -layer1_offset.fY);
   SkRect opacity2_bounds =
       expected_layer2_bounds.makeOffset(-layer2_offset.fX, -layer2_offset.fY);
-  auto expected_draw_calls = std::vector(
-      {MockCanvas::DrawCall{0, MockCanvas::SaveData{1}},
-       MockCanvas::DrawCall{
-           1, MockCanvas::ConcatMatrixData{SkM44(layer1_transform)}},
-       MockCanvas::DrawCall{
-           1, MockCanvas::SaveLayerData{opacity1_bounds, opacity1_paint,
-                                        nullptr, 2}},
-       MockCanvas::DrawCall{
-           2, MockCanvas::DrawPathData{child1_path, child1_paint}},
-       MockCanvas::DrawCall{2, MockCanvas::SaveData{3}},
-       MockCanvas::DrawCall{
-           3, MockCanvas::ConcatMatrixData{SkM44(layer2_transform)}},
-       MockCanvas::DrawCall{
-           3, MockCanvas::SaveLayerData{opacity2_bounds, opacity2_paint,
-                                        nullptr, 4}},
-       MockCanvas::DrawCall{
-           4, MockCanvas::DrawPathData{child2_path, child2_paint}},
-       MockCanvas::DrawCall{4, MockCanvas::RestoreData{3}},
-       MockCanvas::DrawCall{3, MockCanvas::RestoreData{2}},
-       MockCanvas::DrawCall{
-           2, MockCanvas::DrawPathData{child3_path, child3_paint}},
-       MockCanvas::DrawCall{2, MockCanvas::RestoreData{1}},
-       MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}});
-  layer1->Paint(paint_context());
-  EXPECT_EQ(mock_canvas().draw_calls(), expected_draw_calls);
+  DlPaint opacity1_paint;
+  opacity1_paint.setOpacity(alpha1 * (1.0 / SK_AlphaOPAQUE));
+  DlPaint opacity2_paint;
+  opacity2_paint.setOpacity(alpha2 * (1.0 / SK_AlphaOPAQUE));
+
+  DisplayListBuilder expected_builder;
+  /* (Opacity)layer1::Paint */ {
+    expected_builder.Save();
+    {
+      expected_builder.Translate(layer1_offset.fX, layer1_offset.fY);
+      /* (Opacity)layer1::PaintChildren */ {
+        expected_builder.SaveLayer(&opacity1_bounds, &opacity1_paint);
+        /* mock_layer1::Paint */ {
+          expected_builder.DrawPath(child1_path, child1_paint);
+        }
+        /* (Opacity)layer2::Paint */ {
+          expected_builder.Save();
+          {
+            expected_builder.Translate(layer2_offset.fX, layer2_offset.fY);
+            /* (Opacity)layer2::PaintChidren */ {
+              expected_builder.SaveLayer(&opacity2_bounds, &opacity2_paint);
+              {
+                /* mock_layer2::Paint */ {
+                  expected_builder.DrawPath(child2_path, child2_paint);
+                }
+              }
+              expected_builder.Restore();
+            }
+          }
+          expected_builder.Restore();
+        }
+        /* mock_layer3::Paint */ {
+          expected_builder.DrawPath(child3_path, child3_paint);
+        }
+        expected_builder.Restore();
+      }
+    }
+    expected_builder.Restore();
+  }
+  layer1->Paint(display_list_paint_context());
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
 }
 
 TEST_F(OpacityLayerTest, Readback) {
@@ -442,7 +461,7 @@ TEST_F(OpacityLayerTest, Readback) {
   EXPECT_FALSE(preroll_context()->surface_needs_readback);
 
   // OpacityLayer blocks child with readback
-  auto mock_layer = std::make_shared<MockLayer>(SkPath(), SkPaint());
+  auto mock_layer = std::make_shared<MockLayer>(SkPath(), DlPaint());
   mock_layer->set_fake_reads_surface(true);
   layer->Add(mock_layer);
   preroll_context()->surface_needs_readback = false;
@@ -452,7 +471,7 @@ TEST_F(OpacityLayerTest, Readback) {
 
 TEST_F(OpacityLayerTest, CullRectIsTransformed) {
   auto clip_rect_layer = std::make_shared<ClipRectLayer>(
-      SkRect::MakeLTRB(0, 0, 10, 10), flutter::hardEdge);
+      SkRect::MakeLTRB(0, 0, 10, 10), Clip::kHardEdge);
   auto opacity_layer =
       std::make_shared<OpacityLayer>(128, SkPoint::Make(20, 20));
   auto mock_layer = std::make_shared<MockLayer>(SkPath());
@@ -552,29 +571,29 @@ TEST_F(OpacityLayerTest, OpacityInheritanceNestedWithCompatibleChild) {
   EXPECT_TRUE(opacity_layer_1->children_can_accept_opacity());
   EXPECT_TRUE(opacity_layer_2->children_can_accept_opacity());
 
-  SkPaint savelayer_paint;
+  DlPaint savelayer_paint;
   SkScalar inherited_opacity = 128 * 1.0 / SK_AlphaOPAQUE;
   inherited_opacity *= 64 * 1.0 / SK_AlphaOPAQUE;
-  savelayer_paint.setAlphaf(inherited_opacity);
+  savelayer_paint.setOpacity(inherited_opacity);
 
   DisplayListBuilder expected_builder;
   /* opacity_layer_1::Paint */ {
-    expected_builder.save();
+    expected_builder.Save();
     {
-      expected_builder.translate(offset1.fX, offset1.fY);
+      expected_builder.Translate(offset1.fX, offset1.fY);
       /* opacity_layer_2::Paint */ {
-        expected_builder.save();
+        expected_builder.Save();
         {
-          expected_builder.translate(offset2.fX, offset2.fY);
+          expected_builder.Translate(offset2.fX, offset2.fY);
           /* mock_layer::Paint */ {
-            expected_builder.drawPath(mock_path,
+            expected_builder.DrawPath(mock_path,
                                       DlPaint().setOpacity(inherited_opacity));
           }
         }
-        expected_builder.restore();
+        expected_builder.Restore();
       }
     }
-    expected_builder.restore();
+    expected_builder.Restore();
   }
 
   opacity_layer_1->Paint(display_list_paint_context());
@@ -598,31 +617,30 @@ TEST_F(OpacityLayerTest, OpacityInheritanceNestedWithIncompatibleChild) {
   EXPECT_TRUE(opacity_layer_1->children_can_accept_opacity());
   EXPECT_FALSE(opacity_layer_2->children_can_accept_opacity());
 
-  SkPaint savelayer_paint;
+  DlPaint savelayer_paint;
   SkScalar inherited_opacity = 128 * 1.0 / SK_AlphaOPAQUE;
   inherited_opacity *= 64 * 1.0 / SK_AlphaOPAQUE;
-  savelayer_paint.setAlphaf(inherited_opacity);
+  savelayer_paint.setOpacity(inherited_opacity);
 
   DisplayListBuilder expected_builder;
   /* opacity_layer_1::Paint */ {
-    expected_builder.save();
+    expected_builder.Save();
     {
-      expected_builder.translate(offset1.fX, offset1.fY);
+      expected_builder.Translate(offset1.fX, offset1.fY);
       /* opacity_layer_2::Paint */ {
-        expected_builder.save();
+        expected_builder.Save();
         {
-          expected_builder.translate(offset2.fX, offset2.fY);
-          expected_builder.setColor(savelayer_paint.getAlpha() << 24);
-          expected_builder.saveLayer(&mock_layer->paint_bounds(), true);
+          expected_builder.Translate(offset2.fX, offset2.fY);
+          expected_builder.SaveLayer(&mock_layer->paint_bounds(),
+                                     &savelayer_paint);
           /* mock_layer::Paint */ {
-            expected_builder.setColor(0xFF000000);
-            expected_builder.drawPath(mock_path);
+            expected_builder.DrawPath(mock_path, DlPaint());
           }
         }
-        expected_builder.restore();
+        expected_builder.Restore();
       }
     }
-    expected_builder.restore();
+    expected_builder.Restore();
   }
 
   opacity_layer_1->Paint(display_list_paint_context());
@@ -633,7 +651,7 @@ using OpacityLayerDiffTest = DiffContextTest;
 
 TEST_F(OpacityLayerDiffTest, FractionalTranslation) {
   auto picture = CreateDisplayListLayer(
-      CreateDisplayList(SkRect::MakeLTRB(10, 10, 60, 60), 1));
+      CreateDisplayList(SkRect::MakeLTRB(10, 10, 60, 60)));
   auto layer = CreateOpacityLater({picture}, 128, SkPoint::Make(0.5, 0.5));
 
   MockLayerTree tree1;
@@ -646,7 +664,7 @@ TEST_F(OpacityLayerDiffTest, FractionalTranslation) {
 
 TEST_F(OpacityLayerDiffTest, FractionalTranslationWithRasterCache) {
   auto picture = CreateDisplayListLayer(
-      CreateDisplayList(SkRect::MakeLTRB(10, 10, 60, 60), 1));
+      CreateDisplayList(SkRect::MakeLTRB(10, 10, 60, 60)));
   auto layer = CreateOpacityLater({picture}, 128, SkPoint::Make(0.5, 0.5));
 
   MockLayerTree tree1;
@@ -658,16 +676,12 @@ TEST_F(OpacityLayerDiffTest, FractionalTranslationWithRasterCache) {
 }
 
 TEST_F(OpacityLayerTest, FullyOpaqueWithFractionalValues) {
-  use_mock_raster_cache();  // Ensure non-fractional alignment.
+  use_mock_raster_cache();  // Ensure pixel-snapped alignment.
 
   const SkPath child_path = SkPath().addRect(SkRect::MakeWH(5.0f, 5.0f));
   const SkPoint layer_offset = SkPoint::Make(0.5f, 1.5f);
   const SkMatrix initial_transform = SkMatrix::Translate(0.5f, 0.5f);
-  const SkMatrix layer_transform =
-      SkMatrix::Translate(layer_offset.fX, layer_offset.fY);
-  const SkPaint child_paint = SkPaint(SkColors::kGreen);
-  const SkRect expected_layer_bounds =
-      layer_transform.mapRect(child_path.getBounds());
+  const DlPaint child_paint = DlPaint(DlColor::kGreen());
   auto mock_layer = std::make_shared<MockLayer>(child_path, child_paint);
   auto layer = std::make_shared<OpacityLayer>(SK_AlphaOPAQUE, layer_offset);
   layer->Add(mock_layer);
@@ -675,22 +689,25 @@ TEST_F(OpacityLayerTest, FullyOpaqueWithFractionalValues) {
   preroll_context()->state_stack.set_preroll_delegate(initial_transform);
   layer->Preroll(preroll_context());
 
-  const SkPaint opacity_paint = SkPaint(SkColors::kBlack);  // A = 1.0f
-  SkRect opacity_bounds;
-  expected_layer_bounds.makeOffset(-layer_offset.fX, -layer_offset.fY)
-      .roundOut(&opacity_bounds);
-  auto expected_draw_calls = std::vector(
-      {MockCanvas::DrawCall{0, MockCanvas::SaveData{1}},
-       MockCanvas::DrawCall{
-           1, MockCanvas::ConcatMatrixData{SkM44(layer_transform)}},
-       MockCanvas::DrawCall{
-           1, MockCanvas::SetMatrixData{SkM44(
-                  RasterCacheUtil::GetIntegralTransCTM(layer_transform))}},
-       MockCanvas::DrawCall{1,
-                            MockCanvas::DrawPathData{child_path, child_paint}},
-       MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}});
-  layer->Paint(paint_context());
-  EXPECT_EQ(mock_canvas().draw_calls(), expected_draw_calls);
+  auto expected_builder = DisplayListBuilder();
+  /* (Opacity)layer::Paint */ {
+    expected_builder.Save();
+    expected_builder.Translate(layer_offset.fX, layer_offset.fY);
+    // Opaque alpha needs no SaveLayer, just recurse into painting mock_layer
+    // but since we use the mock raster cache we pixel snap the transform
+    expected_builder.TransformReset();
+    expected_builder.Transform2DAffine(
+        1, 0, SkScalarRoundToScalar(layer_offset.fX),  //
+        0, 1, SkScalarRoundToScalar(layer_offset.fY));
+    /* mock_layer::Paint */ {
+      expected_builder.DrawPath(child_path, child_paint);
+    }
+    expected_builder.Restore();
+  }
+  sk_sp<DisplayList> expected_display_list = expected_builder.Build();
+
+  layer->Paint(display_list_paint_context());
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_display_list));
 }
 
 TEST_F(OpacityLayerTest, FullyTransparentDoesNotCullPlatformView) {
@@ -706,8 +723,8 @@ TEST_F(OpacityLayerTest, FullyTransparentDoesNotCullPlatformView) {
   opacity->Add(platform_view);
 
   auto embedder = MockViewEmbedder();
-  SkCanvas fake_overlay_canvas;
-  embedder.AddCanvas(&fake_overlay_canvas);
+  DisplayListBuilder fake_overlay_builder;
+  embedder.AddCanvas(&fake_overlay_builder);
   preroll_context()->view_embedder = &embedder;
   paint_context().view_embedder = &embedder;
 
@@ -720,3 +737,5 @@ TEST_F(OpacityLayerTest, FullyTransparentDoesNotCullPlatformView) {
 
 }  // namespace testing
 }  // namespace flutter
+
+// NOLINTEND(bugprone-unchecked-optional-access)
diff --git a/flow/layers/performance_overlay_layer.cc b/flow/layers/performance_overlay_layer.cc
index 680873c5cab3fa6182b9574af56049c90a1bfae5..63e41dd1fd4e2ece07045703b9fa2d6863427881 100644
--- a/flow/layers/performance_overlay_layer.cc
+++ b/flow/layers/performance_overlay_layer.cc
@@ -6,15 +6,26 @@
 
 #include <iomanip>
 #include <iostream>
+#include <memory>
 #include <string>
 
+#include "flow/stopwatch.h"
+#include "flow/stopwatch_dl.h"
+#include "flow/stopwatch_sk.h"
 #include "third_party/skia/include/core/SkFont.h"
+#include "third_party/skia/include/core/SkFontMgr.h"
 #include "third_party/skia/include/core/SkTextBlob.h"
+#include "third_party/skia/include/core/SkTypeface.h"
+#include "txt/platform.h"
+#ifdef IMPELLER_SUPPORTS_RENDERING
+#include "impeller/typographer/backends/skia/text_frame_skia.h"  // nogncheck
+#endif  // IMPELLER_SUPPORTS_RENDERING
 
 namespace flutter {
 namespace {
 
-void VisualizeStopWatch(SkCanvas* canvas,
+void VisualizeStopWatch(DlCanvas* canvas,
+                        const bool impeller_enabled,
                         const Stopwatch& stopwatch,
                         SkScalar x,
                         SkScalar y,
@@ -29,15 +40,30 @@ void VisualizeStopWatch(SkCanvas* canvas,
 
   if (show_graph) {
     SkRect visualization_rect = SkRect::MakeXYWH(x, y, width, height);
-    stopwatch.Visualize(canvas, visualization_rect);
+    std::unique_ptr<StopwatchVisualizer> visualizer;
+
+    if (impeller_enabled) {
+      visualizer = std::make_unique<DlStopwatchVisualizer>(stopwatch);
+    } else {
+      visualizer = std::make_unique<SkStopwatchVisualizer>(stopwatch);
+    }
+
+    visualizer->Visualize(canvas, visualization_rect);
   }
 
   if (show_labels) {
     auto text = PerformanceOverlayLayer::MakeStatisticsText(
         stopwatch, label_prefix, font_path);
-    SkPaint paint;
-    paint.setColor(SK_ColorGRAY);
-    canvas->drawTextBlob(text, x + label_x, y + height + label_y, paint);
+    // Historically SK_ColorGRAY (== 0xFF888888) was used here
+    DlPaint paint(DlColor(0xFF888888));
+#ifdef IMPELLER_SUPPORTS_RENDERING
+    if (impeller_enabled) {
+      canvas->DrawTextFrame(impeller::MakeTextFrameFromTextBlobSkia(text),
+                            x + label_x, y + height + label_y, paint);
+      return;
+    }
+#endif  // IMPELLER_SUPPORTS_RENDERING
+    canvas->DrawTextBlob(text, x + label_x, y + height + label_y, paint);
   }
 }
 
@@ -48,18 +74,28 @@ sk_sp<SkTextBlob> PerformanceOverlayLayer::MakeStatisticsText(
     const std::string& label_prefix,
     const std::string& font_path) {
   SkFont font;
-  if (font_path != "") {
-    font = SkFont(SkTypeface::MakeFromFile(font_path.c_str()));
+  sk_sp<SkFontMgr> font_mgr = txt::GetDefaultFontManager();
+  if (font_path == "") {
+    if (sk_sp<SkTypeface> face = font_mgr->matchFamilyStyle(nullptr, {})) {
+      font = SkFont(face, 15);
+    } else {
+      // In Skia's Android fontmgr, matchFamilyStyle can return null instead
+      // of falling back to a default typeface. If that's the case, we can use
+      // legacyMakeTypeface, which *does* use that default typeface.
+      font = SkFont(font_mgr->legacyMakeTypeface(nullptr, {}), 15);
+    }
+  } else {
+    font = SkFont(font_mgr->makeFromFile(font_path.c_str()), 15);
   }
-  font.setSize(15);
+  // Make sure there's not an empty typeface returned, or we won't see any text.
+  FML_DCHECK(font.getTypeface()->countGlyphs() > 0);
 
   double max_ms_per_frame = stopwatch.MaxDelta().ToMillisecondsF();
   double average_ms_per_frame = stopwatch.AverageDelta().ToMillisecondsF();
   std::stringstream stream;
   stream.setf(std::ios::fixed | std::ios::showpoint);
   stream << std::setprecision(1);
-  stream << label_prefix << "  "
-         << "max " << max_ms_per_frame << " ms/frame, "
+  stream << label_prefix << "  " << "max " << max_ms_per_frame << " ms/frame, "
          << "avg " << average_ms_per_frame << " ms/frame";
   auto text = stream.str();
   return SkTextBlob::MakeFromText(text.c_str(), text.size(), font,
@@ -100,12 +136,13 @@ void PerformanceOverlayLayer::Paint(PaintContext& context) const {
   auto mutator = context.state_stack.save();
 
   VisualizeStopWatch(
-      context.canvas, context.raster_time, x, y, width, height - padding,
-      options_ & kVisualizeRasterizerStatistics,
+      context.canvas, context.impeller_enabled, context.raster_time, x, y,
+      width, height - padding, options_ & kVisualizeRasterizerStatistics,
       options_ & kDisplayRasterizerStatistics, "Raster", font_path_);
 
-  VisualizeStopWatch(context.canvas, context.ui_time, x, y + height, width,
-                     height - padding, options_ & kVisualizeEngineStatistics,
+  VisualizeStopWatch(context.canvas, context.impeller_enabled, context.ui_time,
+                     x, y + height, width, height - padding,
+                     options_ & kVisualizeEngineStatistics,
                      options_ & kDisplayEngineStatistics, "UI", font_path_);
 }
 
diff --git a/flow/layers/performance_overlay_layer.h b/flow/layers/performance_overlay_layer.h
index 62f26754574e0d553cfa13b2dafaede90ac9c7e1..5fd1c712cb39730ae666e8638109f22def6decb6 100644
--- a/flow/layers/performance_overlay_layer.h
+++ b/flow/layers/performance_overlay_layer.h
@@ -7,8 +7,8 @@
 
 #include <string>
 
-#include "flutter/flow/instrumentation.h"
 #include "flutter/flow/layers/layer.h"
+#include "flutter/flow/stopwatch.h"
 #include "flutter/fml/macros.h"
 
 class SkTextBlob;
diff --git a/flow/layers/performance_overlay_layer_unittests.cc b/flow/layers/performance_overlay_layer_unittests.cc
index 7c2f1edbe82655dad1b0ba8ed75197bbef9103f1..82f1e87fd3badd3acaf0b5491c6e6ef23422f0be 100644
--- a/flow/layers/performance_overlay_layer_unittests.cc
+++ b/flow/layers/performance_overlay_layer_unittests.cc
@@ -10,13 +10,15 @@
 #include "flutter/flow/flow_test_utils.h"
 #include "flutter/flow/raster_cache.h"
 #include "flutter/flow/testing/layer_test.h"
+#include "flutter/shell/common/base64.h"
 #include "flutter/testing/mock_canvas.h"
 #include "third_party/skia/include/core/SkData.h"
+#include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkSerialProcs.h"
 #include "third_party/skia/include/core/SkStream.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/core/SkTextBlob.h"
-#include "third_party/skia/include/utils/SkBase64.h"
+#include "third_party/skia/include/encode/SkPngEncoder.h"
 
 namespace flutter {
 namespace testing {
@@ -36,9 +38,8 @@ static std::string GetGoldenFilePath(int refresh_rate, bool is_new) {
   std::stringstream ss;
   // This unit test should only be run on Linux (not even on Mac since it's a
   // golden test). Hence we don't have to worry about the "/" vs. "\".
-  ss << flutter::GetGoldenDir() << "/"
-     << "performance_overlay_gold_" << refresh_rate << "fps"
-     << (is_new ? "_new" : "") << ".png";
+  ss << flutter::GetGoldenDir() << "/" << "performance_overlay_gold_"
+     << refresh_rate << "fps" << (is_new ? "_new" : "") << ".png";
   return ss.str();
 }
 
@@ -54,22 +55,24 @@ static void TestPerformanceOverlayLayerGold(int refresh_rate) {
   }
 
   const SkImageInfo image_info = SkImageInfo::MakeN32Premul(1000, 1000);
-  sk_sp<SkSurface> surface = SkSurface::MakeRaster(image_info);
+  sk_sp<SkSurface> surface = SkSurfaces::Raster(image_info);
+  DlSkCanvasAdapter canvas(surface->getCanvas());
 
   ASSERT_TRUE(surface != nullptr);
 
   LayerStateStack state_stack;
+  state_stack.set_delegate(&canvas);
+
   flutter::PaintContext paint_context = {
       // clang-format off
       .state_stack                   = state_stack,
-      .canvas                        = surface->getCanvas(),
+      .canvas                        = &canvas,
       .gr_context                    = nullptr,
       .view_embedder                 = nullptr,
       .raster_time                   = mock_stopwatch,
       .ui_time                       = mock_stopwatch,
       .texture_registry              = nullptr,
       .raster_cache                  = nullptr,
-      .frame_device_pixel_ratio      = 1.0f,
       // clang-format on
   };
 
@@ -86,7 +89,8 @@ static void TestPerformanceOverlayLayerGold(int refresh_rate) {
   layer.Paint(paint_context);
 
   sk_sp<SkImage> snapshot = surface->makeImageSnapshot();
-  sk_sp<SkData> snapshot_data = snapshot->encodeToData();
+  sk_sp<SkData> snapshot_data =
+      SkPngEncoder::Encode(nullptr, snapshot.get(), {});
 
   sk_sp<SkData> golden_data =
       SkData::MakeFromFileName(golden_file_path.c_str());
@@ -99,28 +103,28 @@ static void TestPerformanceOverlayLayerGold(int refresh_rate) {
   // platforms.
 #if !defined(FML_OS_LINUX)
   GTEST_SKIP() << "Skipping golden tests on non-Linux OSes";
-#endif  // FML_OS_LINUX
+#else
   const bool golden_data_matches = golden_data->equals(snapshot_data.get());
   if (!golden_data_matches) {
     SkFILEWStream wstream(new_golden_file_path.c_str());
     wstream.write(snapshot_data->data(), snapshot_data->size());
     wstream.flush();
 
-    size_t b64_size =
-        SkBase64::Encode(snapshot_data->data(), snapshot_data->size(), nullptr);
+    size_t b64_size = Base64::EncodedSize(snapshot_data->size());
     sk_sp<SkData> b64_data = SkData::MakeUninitialized(b64_size + 1);
     char* b64_char = static_cast<char*>(b64_data->writable_data());
-    SkBase64::Encode(snapshot_data->data(), snapshot_data->size(), b64_char);
+    Base64::Encode(snapshot_data->data(), snapshot_data->size(), b64_char);
     b64_char[b64_size] = 0;  // make it null terminated for printing
 
     EXPECT_TRUE(golden_data_matches)
-        << "Golden file mismatch. Please check "
-        << "the difference between " << golden_file_path << " and "
-        << new_golden_file_path << ", and  replace the former "
+        << "Golden file mismatch. Please check " << "the difference between "
+        << golden_file_path << " and " << new_golden_file_path
+        << ", and  replace the former "
         << "with the latter if the difference looks good.\nS\n"
         << "See also the base64 encoded " << new_golden_file_path << ":\n"
         << b64_char;
   }
+#endif  // FML_OS_LINUX
 }
 
 }  // namespace
@@ -174,8 +178,8 @@ TEST_F(PerformanceOverlayLayerTest, SimpleRasterizerStatistics) {
   auto overlay_text = PerformanceOverlayLayer::MakeStatisticsText(
       paint_context().raster_time, "Raster", "");
   auto overlay_text_data = overlay_text->serialize(SkSerialProcs{});
-  SkPaint text_paint;
-  text_paint.setColor(SK_ColorGRAY);
+  // Historically SK_ColorGRAY (== 0xFF888888) was used here
+  DlPaint text_paint(DlColor(0xFF888888));
   SkPoint text_position = SkPoint::Make(16.0f, 22.0f);
 
   // TODO(https://github.com/flutter/flutter/issues/82202): Remove once the
diff --git a/flow/layers/physical_shape_layer.cc b/flow/layers/physical_shape_layer.cc
deleted file mode 100644
index 77f347271e28e59dfe551790a51295263944b3d3..0000000000000000000000000000000000000000
--- a/flow/layers/physical_shape_layer.cc
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "flutter/flow/layers/physical_shape_layer.h"
-
-#include "flutter/display_list/display_list_canvas_dispatcher.h"
-#include "flutter/flow/paint_utils.h"
-
-namespace flutter {
-
-PhysicalShapeLayer::PhysicalShapeLayer(SkColor color,
-                                       SkColor shadow_color,
-                                       float elevation,
-                                       const SkPath& path,
-                                       Clip clip_behavior)
-    : color_(color),
-      shadow_color_(shadow_color),
-      elevation_(elevation),
-      path_(path),
-      clip_behavior_(clip_behavior) {}
-
-void PhysicalShapeLayer::Diff(DiffContext* context, const Layer* old_layer) {
-  DiffContext::AutoSubtreeRestore subtree(context);
-  auto* prev = static_cast<const PhysicalShapeLayer*>(old_layer);
-  if (!context->IsSubtreeDirty()) {
-    FML_DCHECK(prev);
-    if (color_ != prev->color_ || shadow_color_ != prev->shadow_color_ ||
-        elevation_ != prev->elevation() || path_ != prev->path_ ||
-        clip_behavior_ != prev->clip_behavior_) {
-      context->MarkSubtreeDirty(context->GetOldLayerPaintRegion(old_layer));
-    }
-  }
-
-  SkRect bounds;
-  if (elevation_ == 0) {
-    bounds = path_.getBounds();
-  } else {
-    bounds = DisplayListCanvasDispatcher::ComputeShadowBounds(
-        path_, elevation_, context->frame_device_pixel_ratio(),
-        context->GetTransform());
-  }
-
-  context->AddLayerBounds(bounds);
-
-  // Only push cull rect if there is clip.
-  if (clip_behavior_ == Clip::none || context->PushCullRect(bounds)) {
-    DiffChildren(context, prev);
-  }
-  context->SetLayerPaintRegion(this, context->CurrentSubtreeRegion());
-}
-
-void PhysicalShapeLayer::Preroll(PrerollContext* context) {
-  Layer::AutoPrerollSaveLayerState save =
-      Layer::AutoPrerollSaveLayerState::Create(context, UsesSaveLayer());
-
-  SkRect child_paint_bounds = SkRect::MakeEmpty();
-  PrerollChildren(context, &child_paint_bounds);
-  context->renderable_state_flags =
-      UsesSaveLayer() ? Layer::kSaveLayerRenderFlags : 0;
-
-  SkRect paint_bounds;
-  if (elevation_ == 0) {
-    paint_bounds = path_.getBounds();
-  } else {
-    // We will draw the shadow in Paint(), so add some margin to the paint
-    // bounds to leave space for the shadow.
-    paint_bounds = DisplayListCanvasDispatcher::ComputeShadowBounds(
-        path_, elevation_, context->frame_device_pixel_ratio,
-        context->state_stack.transform_3x3());
-  }
-
-  if (clip_behavior_ == Clip::none) {
-    paint_bounds.join(child_paint_bounds);
-  }
-
-  set_paint_bounds(paint_bounds);
-}
-
-void PhysicalShapeLayer::Paint(PaintContext& context) const {
-  FML_DCHECK(needs_painting(context));
-
-  if (elevation_ != 0) {
-    DisplayListCanvasDispatcher::DrawShadow(
-        context.canvas, path_, shadow_color_, elevation_,
-        SkColorGetA(color_) != 0xff, context.frame_device_pixel_ratio);
-  }
-
-  // Call drawPath without clip if possible for better performance.
-  SkPaint paint;
-  paint.setColor(color_);
-  paint.setAntiAlias(true);
-  if (clip_behavior_ != Clip::antiAliasWithSaveLayer) {
-    context.canvas->drawPath(path_, paint);
-  }
-
-  auto mutator = context.state_stack.save();
-  switch (clip_behavior_) {
-    case Clip::hardEdge:
-      mutator.clipPath(path_, false);
-      break;
-    case Clip::antiAlias:
-      mutator.clipPath(path_, true);
-      break;
-    case Clip::antiAliasWithSaveLayer: {
-      TRACE_EVENT0("flutter", "Canvas::saveLayer");
-      mutator.clipPath(path_, true);
-      mutator.saveLayer(paint_bounds());
-    } break;
-    case Clip::none:
-      break;
-  }
-
-  if (UsesSaveLayer()) {
-    // If we want to avoid the bleeding edge artifact
-    // (https://github.com/flutter/flutter/issues/18057#issue-328003931)
-    // using saveLayer, we have to call drawPaint instead of drawPath as
-    // anti-aliased drawPath will always have such artifacts.
-    context.canvas->drawPaint(paint);
-  }
-
-  PaintChildren(context);
-}
-
-}  // namespace flutter
diff --git a/flow/layers/physical_shape_layer.h b/flow/layers/physical_shape_layer.h
deleted file mode 100644
index b4a90785f6585a1636f0a03f8e57be0df4ea925c..0000000000000000000000000000000000000000
--- a/flow/layers/physical_shape_layer.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_FLOW_LAYERS_PHYSICAL_SHAPE_LAYER_H_
-#define FLUTTER_FLOW_LAYERS_PHYSICAL_SHAPE_LAYER_H_
-
-#include "flutter/flow/layers/container_layer.h"
-
-namespace flutter {
-
-class PhysicalShapeLayer : public ContainerLayer {
- public:
-  PhysicalShapeLayer(SkColor color,
-                     SkColor shadow_color,
-                     float elevation,
-                     const SkPath& path,
-                     Clip clip_behavior);
-
-  void Diff(DiffContext* context, const Layer* old_layer) override;
-
-  void Preroll(PrerollContext* context) override;
-
-  void Paint(PaintContext& context) const override;
-
-  bool UsesSaveLayer() const {
-    return clip_behavior_ == Clip::antiAliasWithSaveLayer;
-  }
-
-  float elevation() const { return elevation_; }
-
- private:
-  SkColor color_;
-  SkColor shadow_color_;
-  float elevation_ = 0.0f;
-  SkPath path_;
-  Clip clip_behavior_;
-};
-
-}  // namespace flutter
-
-#endif  // FLUTTER_FLOW_LAYERS_PHYSICAL_SHAPE_LAYER_H_
diff --git a/flow/layers/physical_shape_layer_unittests.cc b/flow/layers/physical_shape_layer_unittests.cc
deleted file mode 100644
index f51d8d5ca2fae936a5d9e0e27c4e9421658531d1..0000000000000000000000000000000000000000
--- a/flow/layers/physical_shape_layer_unittests.cc
+++ /dev/null
@@ -1,493 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "flutter/flow/layers/physical_shape_layer.h"
-
-#include "flutter/display_list/display_list_canvas_dispatcher.h"
-#include "flutter/flow/testing/diff_context_test.h"
-#include "flutter/flow/testing/layer_test.h"
-#include "flutter/flow/testing/mock_layer.h"
-#include "flutter/fml/macros.h"
-#include "flutter/testing/mock_canvas.h"
-
-namespace flutter {
-namespace testing {
-
-using PhysicalShapeLayerTest = LayerTest;
-
-#ifndef NDEBUG
-TEST_F(PhysicalShapeLayerTest, PaintingEmptyLayerDies) {
-  auto layer =
-      std::make_shared<PhysicalShapeLayer>(SK_ColorBLACK, SK_ColorBLACK,
-                                           0.0f,  // elevation
-                                           SkPath(), Clip::none);
-
-  layer->Preroll(preroll_context());
-  EXPECT_EQ(layer->paint_bounds(), SkRect::MakeEmpty());
-  EXPECT_EQ(layer->child_paint_bounds(), SkRect::MakeEmpty());
-  EXPECT_FALSE(layer->needs_painting(paint_context()));
-
-  EXPECT_DEATH_IF_SUPPORTED(layer->Paint(paint_context()),
-                            "needs_painting\\(context\\)");
-}
-
-TEST_F(PhysicalShapeLayerTest, PaintBeforePrerollDies) {
-  SkPath child_path;
-  child_path.addRect(5.0f, 6.0f, 20.5f, 21.5f);
-  auto mock_layer = std::make_shared<MockLayer>(child_path, SkPaint());
-  auto layer =
-      std::make_shared<PhysicalShapeLayer>(SK_ColorBLACK, SK_ColorBLACK,
-                                           0.0f,  // elevation
-                                           SkPath(), Clip::none);
-  layer->Add(mock_layer);
-
-  EXPECT_DEATH_IF_SUPPORTED(layer->Paint(paint_context()),
-                            "needs_painting\\(context\\)");
-}
-#endif
-
-TEST_F(PhysicalShapeLayerTest, NonEmptyLayer) {
-  SkPath layer_path;
-  layer_path.addRect(5.0f, 6.0f, 20.5f, 21.5f);
-  auto layer =
-      std::make_shared<PhysicalShapeLayer>(SK_ColorGREEN, SK_ColorBLACK,
-                                           0.0f,  // elevation
-                                           layer_path, Clip::none);
-  layer->Preroll(preroll_context());
-  EXPECT_EQ(layer->paint_bounds(), layer_path.getBounds());
-  EXPECT_EQ(layer->child_paint_bounds(), SkRect::MakeEmpty());
-  EXPECT_TRUE(layer->needs_painting(paint_context()));
-
-  SkPaint layer_paint;
-  layer_paint.setColor(SK_ColorGREEN);
-  layer_paint.setAntiAlias(true);
-  layer->Paint(paint_context());
-  EXPECT_EQ(mock_canvas().draw_calls(),
-            std::vector({MockCanvas::DrawCall{
-                0, MockCanvas::DrawPathData{layer_path, layer_paint}}}));
-}
-
-TEST_F(PhysicalShapeLayerTest, ChildrenLargerThanPathClip) {
-  SkPath layer_path;
-  layer_path.addRect(5.0f, 6.0f, 20.5f, 21.5f);
-  SkPath child1_path;
-  child1_path.addRect(4, 0, 12, 12).close();
-  SkPath child2_path;
-  child2_path.addRect(3, 2, 5, 15).close();
-  auto child1 = std::make_shared<PhysicalShapeLayer>(SK_ColorRED, SK_ColorBLACK,
-                                                     0.0f,  // elevation
-                                                     child1_path, Clip::none);
-  auto child2 =
-      std::make_shared<PhysicalShapeLayer>(SK_ColorBLUE, SK_ColorBLACK,
-                                           0.0f,  // elevation
-                                           child2_path, Clip::none);
-  auto layer =
-      std::make_shared<PhysicalShapeLayer>(SK_ColorGREEN, SK_ColorBLACK,
-                                           0.0f,  // elevation
-                                           layer_path, Clip::hardEdge);
-  layer->Add(child1);
-  layer->Add(child2);
-
-  SkRect child_paint_bounds = SkRect::MakeEmpty();
-  layer->Preroll(preroll_context());
-  child_paint_bounds.join(child1->paint_bounds());
-  child_paint_bounds.join(child2->paint_bounds());
-  EXPECT_EQ(layer->paint_bounds(), layer_path.getBounds());
-  EXPECT_NE(layer->paint_bounds(), child_paint_bounds);
-  EXPECT_EQ(layer->child_paint_bounds(), child_paint_bounds);
-  EXPECT_TRUE(layer->needs_painting(paint_context()));
-
-  SkPaint layer_paint;
-  layer_paint.setColor(SK_ColorGREEN);
-  layer_paint.setAntiAlias(true);
-  SkPaint child1_paint;
-  child1_paint.setColor(SK_ColorRED);
-  child1_paint.setAntiAlias(true);
-  SkPaint child2_paint;
-  child2_paint.setColor(SK_ColorBLUE);
-  child2_paint.setAntiAlias(true);
-  layer->Paint(paint_context());
-  EXPECT_EQ(mock_canvas().draw_calls(),
-            std::vector({
-                MockCanvas::DrawCall{
-                    0, MockCanvas::DrawPathData{layer_path, layer_paint}},
-                MockCanvas::DrawCall{0, MockCanvas::SaveData{1}},
-                MockCanvas::DrawCall{
-                    1, MockCanvas::ClipRectData{layer_path.getBounds(),
-                                                SkClipOp::kIntersect}},
-                MockCanvas::DrawCall{
-                    1, MockCanvas::DrawPathData{child1_path, child1_paint}},
-                // Child 2 is rendered when using Skia as a state delegate
-                // because the quickReject tests are conservative.
-                MockCanvas::DrawCall{
-                    1, MockCanvas::DrawPathData{child2_path, child2_paint}},
-                MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}},
-            }));
-  DisplayListBuilder expected_builder;
-  {  // layer::Paint()
-    expected_builder.drawPath(
-        layer_path, DlPaint().setColor(DlColor::kGreen()).setAntiAlias(true));
-    expected_builder.save();
-    {
-      expected_builder.clipPath(layer_path, SkClipOp::kIntersect, false);
-      {  // child1::Paint()
-        expected_builder.drawPath(
-            child1_path,
-            DlPaint().setColor(DlColor::kRed()).setAntiAlias(true));
-      }
-      // child2::Paint() is not called due to layer cullling
-      // This is the expected and intended behavior.
-    }
-    expected_builder.restore();
-  }
-  layer->Paint(display_list_paint_context());
-  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
-}
-
-TEST_F(PhysicalShapeLayerTest, ChildrenLargerThanPathNoClip) {
-  SkPath layer_path;
-  layer_path.addRect(5.0f, 6.0f, 20.5f, 21.5f);
-  SkPath child1_path;
-  child1_path.addRect(4, 0, 12, 12).close();
-  SkPath child2_path;
-  child2_path.addRect(3, 2, 5, 15).close();
-  auto child1 = std::make_shared<PhysicalShapeLayer>(SK_ColorRED, SK_ColorBLACK,
-                                                     0.0f,  // elevation
-                                                     child1_path, Clip::none);
-  auto child2 =
-      std::make_shared<PhysicalShapeLayer>(SK_ColorBLUE, SK_ColorBLACK,
-                                           0.0f,  // elevation
-                                           child2_path, Clip::none);
-  auto layer =
-      std::make_shared<PhysicalShapeLayer>(SK_ColorGREEN, SK_ColorBLACK,
-                                           0.0f,  // elevation
-                                           layer_path, Clip::none);
-  layer->Add(child1);
-  layer->Add(child2);
-
-  layer->Preroll(preroll_context());
-  SkRect child_bounds = child1->paint_bounds();
-  child_bounds.join(child2->paint_bounds());
-  SkRect total_bounds = child_bounds;
-  total_bounds.join(layer_path.getBounds());
-  EXPECT_NE(layer->paint_bounds(), layer_path.getBounds());
-  EXPECT_EQ(layer->paint_bounds(), total_bounds);
-  EXPECT_EQ(layer->child_paint_bounds(), child_bounds);
-  EXPECT_TRUE(layer->needs_painting(paint_context()));
-
-  SkPaint layer_paint;
-  layer_paint.setColor(SK_ColorGREEN);
-  layer_paint.setAntiAlias(true);
-  SkPaint child1_paint;
-  child1_paint.setColor(SK_ColorRED);
-  child1_paint.setAntiAlias(true);
-  SkPaint child2_paint;
-  child2_paint.setColor(SK_ColorBLUE);
-  child2_paint.setAntiAlias(true);
-  layer->Paint(paint_context());
-  EXPECT_EQ(
-      mock_canvas().draw_calls(),
-      std::vector({MockCanvas::DrawCall{
-                       0, MockCanvas::DrawPathData{layer_path, layer_paint}},
-                   MockCanvas::DrawCall{
-                       0, MockCanvas::DrawPathData{child1_path, child1_paint}},
-                   MockCanvas::DrawCall{0, MockCanvas::DrawPathData{
-                                               child2_path, child2_paint}}}));
-}
-
-TEST_F(PhysicalShapeLayerTest, ElevationSimple) {
-  constexpr float initial_elevation = 20.0f;
-  SkPath layer_path;
-  layer_path.addRect(0, 0, 8, 8).close();
-  auto layer = std::make_shared<PhysicalShapeLayer>(
-      SK_ColorGREEN, SK_ColorBLACK, initial_elevation, layer_path, Clip::none);
-
-  layer->Preroll(preroll_context());
-  // The Fuchsia system compositor handles all elevated PhysicalShapeLayers and
-  // their shadows , so we do not do any painting there.
-  EXPECT_EQ(layer->paint_bounds(),
-            DisplayListCanvasDispatcher::ComputeShadowBounds(
-                layer_path, initial_elevation, 1.0f, SkMatrix()));
-  EXPECT_TRUE(layer->needs_painting(paint_context()));
-  EXPECT_EQ(layer->elevation(), initial_elevation);
-
-  SkPaint layer_paint;
-  layer_paint.setColor(SK_ColorGREEN);
-  layer_paint.setAntiAlias(true);
-  layer->Paint(paint_context());
-  EXPECT_EQ(
-      mock_canvas().draw_calls(),
-      std::vector(
-          {MockCanvas::DrawCall{0, MockCanvas::DrawShadowData{layer_path}},
-           MockCanvas::DrawCall{
-               0, MockCanvas::DrawPathData{layer_path, layer_paint}}}));
-}
-
-TEST_F(PhysicalShapeLayerTest, ElevationComplex) {
-  // The layer tree should look like this:
-  // layers[0] +1.0f = 1.0f
-  // |       \
-  // |        \
-  // |         \
-  // |       layers[2] +3.0f = 4.0f
-  // |          |
-  // |       layers[3] +4.0f = 8.0f
-  // |
-  // |
-  // layers[1] + 2.0f = 3.0f
-  constexpr float initial_elevations[4] = {1.0f, 2.0f, 3.0f, 4.0f};
-  SkPath layer_path;
-  layer_path.addRect(0, 0, 80, 80).close();
-
-  std::shared_ptr<PhysicalShapeLayer> layers[4];
-  for (int i = 0; i < 4; i += 1) {
-    layers[i] = std::make_shared<PhysicalShapeLayer>(
-        SK_ColorBLACK, SK_ColorBLACK, initial_elevations[i], layer_path,
-        Clip::none);
-  }
-  layers[0]->Add(layers[1]);
-  layers[0]->Add(layers[2]);
-  layers[2]->Add(layers[3]);
-
-  layers[0]->Preroll(preroll_context());
-  for (int i = 0; i < 4; i += 1) {
-    // On Fuchsia, the system compositor handles all elevated
-    // PhysicalShapeLayers and their shadows , so we do not do any painting
-    // there.
-    SkRect paint_bounds = DisplayListCanvasDispatcher::ComputeShadowBounds(
-        layer_path, initial_elevations[i], 1.0f /* pixel_ratio */, SkMatrix());
-
-    // Without clipping the children will be painted as well
-    for (auto layer : layers[i]->layers()) {
-      paint_bounds.join(layer->paint_bounds());
-    }
-    EXPECT_EQ(layers[i]->paint_bounds(), paint_bounds);
-    EXPECT_TRUE(layers[i]->needs_painting(paint_context()));
-  }
-
-  SkPaint layer_paint;
-  layer_paint.setColor(SK_ColorBLACK);
-  layer_paint.setAntiAlias(true);
-  layers[0]->Paint(paint_context());
-  EXPECT_EQ(
-      mock_canvas().draw_calls(),
-      std::vector(
-          {MockCanvas::DrawCall{0, MockCanvas::DrawShadowData{layer_path}},
-           MockCanvas::DrawCall{
-               0, MockCanvas::DrawPathData{layer_path, layer_paint}},
-           MockCanvas::DrawCall{0, MockCanvas::DrawShadowData{layer_path}},
-           MockCanvas::DrawCall{
-               0, MockCanvas::DrawPathData{layer_path, layer_paint}},
-           MockCanvas::DrawCall{0, MockCanvas::DrawShadowData{layer_path}},
-           MockCanvas::DrawCall{
-               0, MockCanvas::DrawPathData{layer_path, layer_paint}},
-           MockCanvas::DrawCall{0, MockCanvas::DrawShadowData{layer_path}},
-           MockCanvas::DrawCall{
-               0, MockCanvas::DrawPathData{layer_path, layer_paint}}}));
-}
-
-TEST_F(PhysicalShapeLayerTest, ShadowNotDependsCtm) {
-  constexpr SkScalar elevations[] = {1, 2, 3, 4, 5, 10};
-  constexpr SkScalar scales[] = {0.5, 1, 1.5, 2, 3, 5};
-  constexpr SkScalar translates[] = {0, 1, -1, 0.5, 2, 10};
-
-  SkPath path;
-  path.addRect(0, 0, 8, 8).close();
-
-  for (SkScalar elevation : elevations) {
-    SkRect baseline_bounds = DisplayListCanvasDispatcher::ComputeShadowBounds(
-        path, elevation, 1.0f, SkMatrix());
-    for (SkScalar scale : scales) {
-      for (SkScalar translate_x : translates) {
-        for (SkScalar translate_y : translates) {
-          SkMatrix ctm;
-          ctm.setScaleTranslate(scale, scale, translate_x, translate_y);
-          SkRect bounds = DisplayListCanvasDispatcher::ComputeShadowBounds(
-              path, elevation, scale, ctm);
-          EXPECT_FLOAT_EQ(bounds.fLeft, baseline_bounds.fLeft);
-          EXPECT_FLOAT_EQ(bounds.fTop, baseline_bounds.fTop);
-          EXPECT_FLOAT_EQ(bounds.fRight, baseline_bounds.fRight);
-          EXPECT_FLOAT_EQ(bounds.fBottom, baseline_bounds.fBottom);
-        }
-      }
-    }
-  }
-}
-
-static int RasterizedDifferenceInPixels(
-    const std::function<void(SkCanvas*)>& actual_draw_function,
-    const std::function<void(SkCanvas*)>& expected_draw_function,
-    const SkSize& canvas_size) {
-  sk_sp<SkSurface> actual_surface =
-      SkSurface::MakeRasterN32Premul(canvas_size.width(), canvas_size.height());
-  sk_sp<SkSurface> expected_surface =
-      SkSurface::MakeRasterN32Premul(canvas_size.width(), canvas_size.height());
-
-  actual_surface->getCanvas()->drawColor(SK_ColorWHITE);
-  expected_surface->getCanvas()->drawColor(SK_ColorWHITE);
-
-  actual_draw_function(actual_surface->getCanvas());
-  expected_draw_function(expected_surface->getCanvas());
-
-  SkPixmap actual_pixels;
-  EXPECT_TRUE(actual_surface->peekPixels(&actual_pixels));
-
-  SkPixmap expected_pixels;
-  EXPECT_TRUE(expected_surface->peekPixels(&expected_pixels));
-
-  int different_pixels = 0;
-  for (int y = 0; y < canvas_size.height(); y++) {
-    const uint32_t* actual_row = actual_pixels.addr32(0, y);
-    const uint32_t* expected_row = expected_pixels.addr32(0, y);
-    for (int x = 0; x < canvas_size.width(); x++) {
-      if (actual_row[x] != expected_row[x]) {
-        different_pixels++;
-      }
-    }
-  }
-  return different_pixels;
-}
-
-TEST_F(PhysicalShapeLayerTest, ShadowNotDependsPathSize) {
-  constexpr SkRect test_cases[][2] = {
-      {{20, -100, 80, 80}, {20, -1000, 80, 80}},
-      {{20, 20, 80, 200}, {20, 20, 80, 2000}},
-  };
-
-  for (const SkRect* test_case : test_cases) {
-    EXPECT_EQ(RasterizedDifferenceInPixels(
-                  [=](SkCanvas* canvas) {
-                    SkPath path;
-                    path.addRect(test_case[0]).close();
-                    DisplayListCanvasDispatcher::DrawShadow(
-                        canvas, path, SK_ColorBLACK, 1.0f, false, 1.0f);
-                  },
-                  [=](SkCanvas* canvas) {
-                    SkPath path;
-                    path.addRect(test_case[1]).close();
-                    DisplayListCanvasDispatcher::DrawShadow(
-                        canvas, path, SK_ColorBLACK, 1.0f, false, 1.0f);
-                  },
-                  SkSize::Make(100, 100)),
-              0);
-  }
-}
-
-static bool ReadbackResult(PrerollContext* context,
-                           Clip clip_behavior,
-                           const std::shared_ptr<Layer>& child,
-                           bool before) {
-  const SkRect layer_bounds = SkRect::MakeXYWH(0.5, 1.0, 5.0, 6.0);
-  const SkPath layer_path = SkPath().addRect(layer_bounds);
-  auto layer =
-      std::make_shared<PhysicalShapeLayer>(SK_ColorGREEN, SK_ColorBLACK,
-                                           0.0f,  // elevation
-                                           layer_path, clip_behavior);
-  if (child != nullptr) {
-    layer->Add(child);
-  }
-  context->surface_needs_readback = before;
-  layer->Preroll(context);
-  return context->surface_needs_readback;
-}
-
-TEST_F(PhysicalShapeLayerTest, Readback) {
-  PrerollContext* context = preroll_context();
-  SkPath path;
-  SkPaint paint;
-
-  const Clip hard = Clip::hardEdge;
-  const Clip soft = Clip::antiAlias;
-  const Clip save_layer = Clip::antiAliasWithSaveLayer;
-
-  std::shared_ptr<MockLayer> nochild;
-  auto reader = std::make_shared<MockLayer>(path, paint);
-  reader->set_fake_reads_surface(true);
-  auto nonreader = std::make_shared<MockLayer>(path, paint);
-
-  // No children, no prior readback -> no readback after
-  EXPECT_FALSE(ReadbackResult(context, hard, nochild, false));
-  EXPECT_FALSE(ReadbackResult(context, soft, nochild, false));
-  EXPECT_FALSE(ReadbackResult(context, save_layer, nochild, false));
-
-  // No children, prior readback -> readback after
-  EXPECT_TRUE(ReadbackResult(context, hard, nochild, true));
-  EXPECT_TRUE(ReadbackResult(context, soft, nochild, true));
-  EXPECT_TRUE(ReadbackResult(context, save_layer, nochild, true));
-
-  // Non readback child, no prior readback -> no readback after
-  EXPECT_FALSE(ReadbackResult(context, hard, nonreader, false));
-  EXPECT_FALSE(ReadbackResult(context, soft, nonreader, false));
-  EXPECT_FALSE(ReadbackResult(context, save_layer, nonreader, false));
-
-  // Non readback child, prior readback -> readback after
-  EXPECT_TRUE(ReadbackResult(context, hard, nonreader, true));
-  EXPECT_TRUE(ReadbackResult(context, soft, nonreader, true));
-  EXPECT_TRUE(ReadbackResult(context, save_layer, nonreader, true));
-
-  // Readback child, no prior readback -> readback after unless SaveLayer
-  EXPECT_TRUE(ReadbackResult(context, hard, reader, false));
-  EXPECT_TRUE(ReadbackResult(context, soft, reader, false));
-  EXPECT_FALSE(ReadbackResult(context, save_layer, reader, false));
-
-  // Readback child, prior readback -> readback after
-  EXPECT_TRUE(ReadbackResult(context, hard, reader, true));
-  EXPECT_TRUE(ReadbackResult(context, soft, reader, true));
-  EXPECT_TRUE(ReadbackResult(context, save_layer, reader, true));
-}
-
-TEST_F(PhysicalShapeLayerTest, OpacityInheritance) {
-  SkPath layer_path;
-  layer_path.addRect(5.0f, 6.0f, 20.5f, 21.5f);
-  auto layer =
-      std::make_shared<PhysicalShapeLayer>(SK_ColorGREEN, SK_ColorBLACK,
-                                           0.0f,  // elevation
-                                           layer_path, Clip::none);
-
-  PrerollContext* context = preroll_context();
-  context->renderable_state_flags = 0;
-  layer->Preroll(context);
-  EXPECT_EQ(context->renderable_state_flags, 0);
-}
-
-using PhysicalShapeLayerDiffTest = DiffContextTest;
-
-TEST_F(PhysicalShapeLayerDiffTest, NoClipPaintRegion) {
-  MockLayerTree tree1;
-  const SkPath layer_path = SkPath().addRect(SkRect::MakeXYWH(0, 0, 100, 100));
-  auto layer =
-      std::make_shared<PhysicalShapeLayer>(SK_ColorGREEN, SK_ColorBLACK,
-                                           0.0f,  // elevation
-                                           layer_path, Clip::none);
-
-  const SkPath layer_path2 =
-      SkPath().addRect(SkRect::MakeXYWH(200, 200, 200, 200));
-  auto layer2 = std::make_shared<MockLayer>(layer_path2);
-  layer->Add(layer2);
-  tree1.root()->Add(layer);
-
-  auto damage = DiffLayerTree(tree1, MockLayerTree());
-  EXPECT_EQ(damage.frame_damage, SkIRect::MakeLTRB(0, 0, 400, 400));
-}
-
-TEST_F(PhysicalShapeLayerDiffTest, ClipPaintRegion) {
-  MockLayerTree tree1;
-  const SkPath layer_path = SkPath().addRect(SkRect::MakeXYWH(0, 0, 100, 100));
-  auto layer =
-      std::make_shared<PhysicalShapeLayer>(SK_ColorGREEN, SK_ColorBLACK,
-                                           0.0f,  // elevation
-                                           layer_path, Clip::hardEdge);
-
-  const SkPath layer_path2 =
-      SkPath().addRect(SkRect::MakeXYWH(200, 200, 200, 200));
-  auto layer2 = std::make_shared<MockLayer>(layer_path2);
-  layer->Add(layer2);
-  tree1.root()->Add(layer);
-
-  auto damage = DiffLayerTree(tree1, MockLayerTree());
-  EXPECT_EQ(damage.frame_damage, SkIRect::MakeLTRB(0, 0, 100, 100));
-}
-
-}  // namespace testing
-}  // namespace flutter
diff --git a/flow/layers/platform_view_layer.cc b/flow/layers/platform_view_layer.cc
index 1996ec430b184744db0a2e6830031f79f31784d4..d641a12665d3896b6bda30599a07a2aacdc73556 100644
--- a/flow/layers/platform_view_layer.cc
+++ b/flow/layers/platform_view_layer.cc
@@ -4,6 +4,8 @@
 
 #include "flutter/flow/layers/platform_view_layer.h"
 
+#include "flutter/display_list/skia/dl_sk_canvas.h"
+
 namespace flutter {
 
 PlatformViewLayer::PlatformViewLayer(const SkPoint& offset,
@@ -16,8 +18,8 @@ void PlatformViewLayer::Preroll(PrerollContext* context) {
                                     size_.height()));
 
   if (context->view_embedder == nullptr) {
-    FML_LOG(ERROR) << "Trying to embed a platform view but the PrerollContext "
-                      "does not support embedding";
+    FML_DLOG(ERROR) << "Trying to embed a platform view but the PrerollContext "
+                       "does not support embedding";
     return;
   }
   context->has_platform_view = true;
@@ -26,8 +28,7 @@ void PlatformViewLayer::Preroll(PrerollContext* context) {
   context->state_stack.fill(&mutators);
   std::unique_ptr<EmbeddedViewParams> params =
       std::make_unique<EmbeddedViewParams>(context->state_stack.transform_3x3(),
-                                           size_, mutators,
-                                           context->display_list_enabled);
+                                           size_, mutators);
   context->view_embedder->PrerollCompositeEmbeddedView(view_id_,
                                                        std::move(params));
   context->view_embedder->PushVisitedPlatformView(view_id_);
@@ -35,19 +36,14 @@ void PlatformViewLayer::Preroll(PrerollContext* context) {
 
 void PlatformViewLayer::Paint(PaintContext& context) const {
   if (context.view_embedder == nullptr) {
-    FML_LOG(ERROR) << "Trying to embed a platform view but the PaintContext "
-                      "does not support embedding";
+    FML_DLOG(ERROR) << "Trying to embed a platform view but the PaintContext "
+                       "does not support embedding";
     return;
   }
-  EmbedderPaintContext embedder_context =
-      context.view_embedder->CompositeEmbeddedView(view_id_);
-  context.canvas = embedder_context.canvas;
-  context.builder = embedder_context.builder;
-  if (context.builder) {
-    context.state_stack.set_delegate(context.builder);
-  } else {
-    context.state_stack.set_delegate(context.canvas);
-  }
+  DlCanvas* canvas = context.view_embedder->CompositeEmbeddedView(view_id_);
+  context.canvas = canvas;
+  context.state_stack.set_delegate(canvas);
+  context.rendering_above_platform_view = true;
 }
 
 }  // namespace flutter
diff --git a/flow/layers/platform_view_layer.h b/flow/layers/platform_view_layer.h
index f812e52901ca0400157b1697b81872b07d19265b..ac5792af55872b3fc53e01e0cc0407ada6e8ffbd 100644
--- a/flow/layers/platform_view_layer.h
+++ b/flow/layers/platform_view_layer.h
@@ -5,6 +5,7 @@
 #ifndef FLUTTER_FLOW_LAYERS_PLATFORM_VIEW_LAYER_H_
 #define FLUTTER_FLOW_LAYERS_PLATFORM_VIEW_LAYER_H_
 
+#include "flutter/display_list/skia/dl_sk_canvas.h"
 #include "flutter/flow/layers/layer.h"
 #include "third_party/skia/include/core/SkPoint.h"
 #include "third_party/skia/include/core/SkSize.h"
diff --git a/flow/layers/platform_view_layer_unittests.cc b/flow/layers/platform_view_layer_unittests.cc
index 3fc19c23cd94dbc6ca196ac72a3e43c4ccf974da..b89447f3a589e62e6f19699c1385c87aa945823d 100644
--- a/flow/layers/platform_view_layer_unittests.cc
+++ b/flow/layers/platform_view_layer_unittests.cc
@@ -17,6 +17,8 @@ namespace testing {
 
 using PlatformViewLayerTest = LayerTest;
 
+using ClipOp = DlCanvas::ClipOp;
+
 TEST_F(PlatformViewLayerTest, NullViewEmbedderDoesntPrerollCompositeOrPaint) {
   const SkPoint layer_offset = SkPoint::Make(0.0f, 0.0f);
   const SkSize layer_size = SkSize::Make(8.0f, 8.0f);
@@ -46,9 +48,9 @@ TEST_F(PlatformViewLayerTest, ClippedPlatformViewPrerollsAndPaintsNothing) {
   auto layer =
       std::make_shared<PlatformViewLayer>(layer_offset, layer_size, view_id);
   auto child_clip_layer =
-      std::make_shared<ClipRectLayer>(child_clip, Clip::hardEdge);
+      std::make_shared<ClipRectLayer>(child_clip, Clip::kHardEdge);
   auto parent_clip_layer =
-      std::make_shared<ClipRectLayer>(parent_clip, Clip::hardEdge);
+      std::make_shared<ClipRectLayer>(parent_clip, Clip::kHardEdge);
   parent_clip_layer->Add(child_clip_layer);
   child_clip_layer->Add(layer);
 
@@ -74,12 +76,12 @@ TEST_F(PlatformViewLayerTest, ClippedPlatformViewPrerollsAndPaintsNothing) {
       std::vector(
           {MockCanvas::DrawCall{0, MockCanvas::SaveData{1}},
            MockCanvas::DrawCall{
-               1, MockCanvas::ClipRectData{parent_clip, SkClipOp::kIntersect,
-                                           MockCanvas::kHard_ClipEdgeStyle}},
+               1, MockCanvas::ClipRectData{parent_clip, ClipOp::kIntersect,
+                                           MockCanvas::kHardClipEdgeStyle}},
            MockCanvas::DrawCall{1, MockCanvas::SaveData{2}},
            MockCanvas::DrawCall{
-               2, MockCanvas::ClipRectData{child_clip, SkClipOp::kIntersect,
-                                           MockCanvas::kHard_ClipEdgeStyle}},
+               2, MockCanvas::ClipRectData{child_clip, ClipOp::kIntersect,
+                                           MockCanvas::kHardClipEdgeStyle}},
            MockCanvas::DrawCall{2, MockCanvas::RestoreData{1}},
            MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
 }
@@ -125,8 +127,8 @@ TEST_F(PlatformViewLayerTest, StateTransfer) {
   transform_layer2->Add(child2);
 
   auto embedder = MockViewEmbedder();
-  DisplayListCanvasRecorder recorder({0, 0, 500, 500});
-  embedder.AddRecorder(&recorder);
+  DisplayListBuilder builder({0, 0, 500, 500});
+  embedder.AddCanvas(&builder);
 
   PrerollContext* preroll_ctx = preroll_context();
   preroll_ctx->view_embedder = &embedder;
diff --git a/flow/layers/shader_mask_layer.cc b/flow/layers/shader_mask_layer.cc
index d22c41b1b27f62d5cb311721af152da20d2ec8f4..bf7b81f400521d5b3b1c9579f0e9e86087595162 100644
--- a/flow/layers/shader_mask_layer.cc
+++ b/flow/layers/shader_mask_layer.cc
@@ -27,8 +27,7 @@ void ShaderMaskLayer::Diff(DiffContext* context, const Layer* old_layer) {
     }
   }
   if (context->has_raster_cache()) {
-    context->SetTransform(
-        RasterCacheUtil::GetIntegralTransCTM(context->GetTransform()));
+    context->WillPaintWithIntegralTransform();
   }
   DiffChildren(context, prev);
 
@@ -55,35 +54,25 @@ void ShaderMaskLayer::Paint(PaintContext& context) const {
   if (context.raster_cache) {
     mutator.integralTransform();
 
-    SkPaint sk_paint;
+    DlPaint paint;
     if (layer_raster_cache_item_->Draw(context,
-                                       context.state_stack.fill(sk_paint))) {
+                                       context.state_stack.fill(paint))) {
       return;
     }
   }
   auto shader_rect = SkRect::MakeWH(mask_rect_.width(), mask_rect_.height());
 
   mutator.saveLayer(paint_bounds());
-  if (context.builder) {
-    PaintChildren(context);
 
-    DlPaint dl_paint;
-    dl_paint.setBlendMode(blend_mode_);
-    if (color_source_) {
-      dl_paint.setColorSource(color_source_.get());
-    }
-    context.builder->translate(mask_rect_.left(), mask_rect_.top());
-    context.builder->drawRect(shader_rect, dl_paint);
-  } else {
-    PaintChildren(context);
-    SkPaint paint;
-    paint.setBlendMode(ToSk(blend_mode_));
-    if (color_source_) {
-      paint.setShader(color_source_->skia_object());
-    }
-    context.canvas->translate(mask_rect_.left(), mask_rect_.top());
-    context.canvas->drawRect(shader_rect, paint);
+  PaintChildren(context);
+
+  DlPaint dl_paint;
+  dl_paint.setBlendMode(blend_mode_);
+  if (color_source_) {
+    dl_paint.setColorSource(color_source_.get());
   }
+  context.canvas->Translate(mask_rect_.left(), mask_rect_.top());
+  context.canvas->DrawRect(shader_rect, dl_paint);
 }
 
 }  // namespace flutter
diff --git a/flow/layers/shader_mask_layer.h b/flow/layers/shader_mask_layer.h
index ae3b1d6accea5607702de8441c279fa524b8b811..fadb5d12d1d5aae2555dc2cc86aa9be3b94edbe8 100644
--- a/flow/layers/shader_mask_layer.h
+++ b/flow/layers/shader_mask_layer.h
@@ -5,7 +5,7 @@
 #ifndef FLUTTER_FLOW_LAYERS_SHADER_MASK_LAYER_H_
 #define FLUTTER_FLOW_LAYERS_SHADER_MASK_LAYER_H_
 
-#include "flutter/display_list/display_list_color_source.h"
+#include "flutter/display_list/effects/dl_color_source.h"
 #include "flutter/flow/layers/cacheable_layer.h"
 
 namespace flutter {
diff --git a/flow/layers/shader_mask_layer_unittests.cc b/flow/layers/shader_mask_layer_unittests.cc
index db37ae3430fb7535a99c4c749e60696c179fb5a9..933ba706648356b9b976db4873cea77eb6bb2307 100644
--- a/flow/layers/shader_mask_layer_unittests.cc
+++ b/flow/layers/shader_mask_layer_unittests.cc
@@ -11,16 +11,29 @@
 #include "flutter/flow/testing/layer_test.h"
 #include "flutter/flow/testing/mock_layer.h"
 #include "flutter/fml/macros.h"
-#include "flutter/testing/mock_canvas.h"
 #include "gtest/gtest.h"
-#include "third_party/skia/include/core/SkShader.h"
-#include "third_party/skia/include/effects/SkPerlinNoiseShader.h"
+
+// TODO(zanderso): https://github.com/flutter/flutter/issues/127701
+// NOLINTBEGIN(bugprone-unchecked-optional-access)
 
 namespace flutter {
 namespace testing {
 
 using ShaderMaskLayerTest = LayerTest;
 
+static std::shared_ptr<DlColorSource> MakeFilter(DlColor color) {
+  DlColor colors[] = {
+      color.withAlpha(0x7f),
+      color,
+  };
+  float stops[] = {
+      0,
+      1,
+  };
+  return DlColorSource::MakeLinear(SkPoint::Make(0, 0), SkPoint::Make(10, 10),
+                                   2, colors, stops, DlTileMode::kRepeat);
+}
+
 #ifndef NDEBUG
 TEST_F(ShaderMaskLayerTest, PaintingEmptyLayerDies) {
   auto layer =
@@ -55,7 +68,7 @@ TEST_F(ShaderMaskLayerTest, EmptyFilter) {
   const SkRect child_bounds = SkRect::MakeLTRB(5.0f, 6.0f, 20.5f, 21.5f);
   const SkRect layer_bounds = SkRect::MakeLTRB(2.0f, 4.0f, 6.5f, 6.5f);
   const SkPath child_path = SkPath().addRect(child_bounds);
-  const SkPaint child_paint = SkPaint(SkColors::kYellow);
+  const DlPaint child_paint = DlPaint(DlColor::kYellow());
   auto mock_layer = std::make_shared<MockLayer>(child_path, child_paint);
   auto layer = std::make_shared<ShaderMaskLayer>(nullptr, layer_bounds,
                                                  DlBlendMode::kSrc);
@@ -70,26 +83,30 @@ TEST_F(ShaderMaskLayerTest, EmptyFilter) {
   EXPECT_TRUE(layer->needs_painting(paint_context()));
   EXPECT_EQ(mock_layer->parent_matrix(), initial_transform);
 
-  SkPaint filter_paint;
-  filter_paint.setBlendMode(SkBlendMode::kSrc);
-  filter_paint.setShader(nullptr);
-  layer->Paint(paint_context());
-  EXPECT_EQ(
-      mock_canvas().draw_calls(),
-      std::vector({MockCanvas::DrawCall{
-                       0, MockCanvas::SaveLayerData{child_bounds, SkPaint(),
-                                                    nullptr, 1}},
-                   MockCanvas::DrawCall{
-                       1, MockCanvas::DrawPathData{child_path, child_paint}},
-                   MockCanvas::DrawCall{
-                       1, MockCanvas::ConcatMatrixData{SkM44::Translate(
-                              layer_bounds.fLeft, layer_bounds.fTop)}},
-                   MockCanvas::DrawCall{
-                       1, MockCanvas::DrawRectData{SkRect::MakeWH(
-                                                       layer_bounds.width(),
-                                                       layer_bounds.height()),
-                                                   filter_paint}},
-                   MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
+  DlPaint filter_paint;
+  filter_paint.setBlendMode(DlBlendMode::kSrc);
+  filter_paint.setColorSource(nullptr);
+
+  layer->Paint(display_list_paint_context());
+  DisplayListBuilder expected_builder;
+  /* (ShaderMask)layer::Paint */ {
+    expected_builder.Save();
+    {
+      expected_builder.SaveLayer(&child_bounds);
+      {
+        /* mock_layer::Paint */ {
+          expected_builder.DrawPath(child_path, child_paint);
+        }
+        expected_builder.Translate(layer_bounds.fLeft, layer_bounds.fTop);
+        expected_builder.DrawRect(
+            SkRect::MakeWH(layer_bounds.width(), layer_bounds.height()),
+            filter_paint);
+      }
+      expected_builder.Restore();
+    }
+    expected_builder.Restore();
+  }
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
 }
 
 TEST_F(ShaderMaskLayerTest, SimpleFilter) {
@@ -97,10 +114,8 @@ TEST_F(ShaderMaskLayerTest, SimpleFilter) {
   const SkRect child_bounds = SkRect::MakeLTRB(5.0f, 6.0f, 20.5f, 21.5f);
   const SkRect layer_bounds = SkRect::MakeLTRB(2.0f, 4.0f, 6.5f, 6.5f);
   const SkPath child_path = SkPath().addRect(child_bounds);
-  const SkPaint child_paint = SkPaint(SkColors::kYellow);
-  auto layer_filter =
-      SkPerlinNoiseShader::MakeFractalNoise(1.0f, 1.0f, 1, 1.0f);
-  auto dl_filter = DlColorSource::From(layer_filter);
+  const DlPaint child_paint = DlPaint(DlColor::kYellow());
+  auto dl_filter = MakeFilter(DlColor::kBlue());
   auto mock_layer = std::make_shared<MockLayer>(child_path, child_paint);
   auto layer = std::make_shared<ShaderMaskLayer>(dl_filter, layer_bounds,
                                                  DlBlendMode::kSrc);
@@ -113,26 +128,30 @@ TEST_F(ShaderMaskLayerTest, SimpleFilter) {
   EXPECT_TRUE(layer->needs_painting(paint_context()));
   EXPECT_EQ(mock_layer->parent_matrix(), initial_transform);
 
-  SkPaint filter_paint;
-  filter_paint.setBlendMode(SkBlendMode::kSrc);
-  filter_paint.setShader(layer_filter);
-  layer->Paint(paint_context());
-  EXPECT_EQ(
-      mock_canvas().draw_calls(),
-      std::vector({MockCanvas::DrawCall{
-                       0, MockCanvas::SaveLayerData{child_bounds, SkPaint(),
-                                                    nullptr, 1}},
-                   MockCanvas::DrawCall{
-                       1, MockCanvas::DrawPathData{child_path, child_paint}},
-                   MockCanvas::DrawCall{
-                       1, MockCanvas::ConcatMatrixData{SkM44::Translate(
-                              layer_bounds.fLeft, layer_bounds.fTop)}},
-                   MockCanvas::DrawCall{
-                       1, MockCanvas::DrawRectData{SkRect::MakeWH(
-                                                       layer_bounds.width(),
-                                                       layer_bounds.height()),
-                                                   filter_paint}},
-                   MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
+  DlPaint filter_paint;
+  filter_paint.setBlendMode(DlBlendMode::kSrc);
+  filter_paint.setColorSource(dl_filter);
+
+  layer->Paint(display_list_paint_context());
+  DisplayListBuilder expected_builder;
+  /* (ShaderMask)layer::Paint */ {
+    expected_builder.Save();
+    {
+      expected_builder.SaveLayer(&child_bounds);
+      {
+        /* mock_layer::Paint */ {
+          expected_builder.DrawPath(child_path, child_paint);
+        }
+        expected_builder.Translate(layer_bounds.fLeft, layer_bounds.fTop);
+        expected_builder.DrawRect(
+            SkRect::MakeWH(layer_bounds.width(), layer_bounds.height()),
+            filter_paint);
+      }
+      expected_builder.Restore();
+    }
+    expected_builder.Restore();
+  }
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
 }
 
 TEST_F(ShaderMaskLayerTest, MultipleChildren) {
@@ -142,11 +161,9 @@ TEST_F(ShaderMaskLayerTest, MultipleChildren) {
   const SkPath child_path1 = SkPath().addRect(child_bounds);
   const SkPath child_path2 =
       SkPath().addRect(child_bounds.makeOffset(3.0f, 0.0f));
-  const SkPaint child_paint1 = SkPaint(SkColors::kYellow);
-  const SkPaint child_paint2 = SkPaint(SkColors::kCyan);
-  auto layer_filter =
-      SkPerlinNoiseShader::MakeFractalNoise(1.0f, 1.0f, 1, 1.0f);
-  auto dl_filter = DlColorSource::From(layer_filter);
+  const DlPaint child_paint1 = DlPaint(DlColor::kYellow());
+  const DlPaint child_paint2 = DlPaint(DlColor::kCyan());
+  auto dl_filter = MakeFilter(DlColor::kBlue());
   auto mock_layer1 = std::make_shared<MockLayer>(child_path1, child_paint1);
   auto mock_layer2 = std::make_shared<MockLayer>(child_path2, child_paint2);
   auto layer = std::make_shared<ShaderMaskLayer>(dl_filter, layer_bounds,
@@ -168,28 +185,33 @@ TEST_F(ShaderMaskLayerTest, MultipleChildren) {
   EXPECT_EQ(mock_layer1->parent_matrix(), initial_transform);
   EXPECT_EQ(mock_layer2->parent_matrix(), initial_transform);
 
-  SkPaint filter_paint;
-  filter_paint.setBlendMode(SkBlendMode::kSrc);
-  filter_paint.setShader(layer_filter);
-  layer->Paint(paint_context());
-  EXPECT_EQ(
-      mock_canvas().draw_calls(),
-      std::vector({MockCanvas::DrawCall{
-                       0, MockCanvas::SaveLayerData{children_bounds, SkPaint(),
-                                                    nullptr, 1}},
-                   MockCanvas::DrawCall{
-                       1, MockCanvas::DrawPathData{child_path1, child_paint1}},
-                   MockCanvas::DrawCall{
-                       1, MockCanvas::DrawPathData{child_path2, child_paint2}},
-                   MockCanvas::DrawCall{
-                       1, MockCanvas::ConcatMatrixData{SkM44::Translate(
-                              layer_bounds.fLeft, layer_bounds.fTop)}},
-                   MockCanvas::DrawCall{
-                       1, MockCanvas::DrawRectData{SkRect::MakeWH(
-                                                       layer_bounds.width(),
-                                                       layer_bounds.height()),
-                                                   filter_paint}},
-                   MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
+  DlPaint filter_paint;
+  filter_paint.setBlendMode(DlBlendMode::kSrc);
+  filter_paint.setColorSource(dl_filter);
+
+  layer->Paint(display_list_paint_context());
+  DisplayListBuilder expected_builder;
+  /* (ShaderMask)layer::Paint */ {
+    expected_builder.Save();
+    {
+      expected_builder.SaveLayer(&children_bounds);
+      {
+        /* mock_layer1::Paint */ {
+          expected_builder.DrawPath(child_path1, child_paint1);
+        }
+        /* mock_layer2::Paint */ {
+          expected_builder.DrawPath(child_path2, child_paint2);
+        }
+        expected_builder.Translate(layer_bounds.fLeft, layer_bounds.fTop);
+        expected_builder.DrawRect(
+            SkRect::MakeWH(layer_bounds.width(), layer_bounds.height()),
+            filter_paint);
+      }
+      expected_builder.Restore();
+    }
+    expected_builder.Restore();
+  }
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
 }
 
 TEST_F(ShaderMaskLayerTest, Nested) {
@@ -199,14 +221,10 @@ TEST_F(ShaderMaskLayerTest, Nested) {
   const SkPath child_path1 = SkPath().addRect(child_bounds);
   const SkPath child_path2 =
       SkPath().addRect(child_bounds.makeOffset(3.0f, 0.0f));
-  const SkPaint child_paint1 = SkPaint(SkColors::kYellow);
-  const SkPaint child_paint2 = SkPaint(SkColors::kCyan);
-  auto layer_filter1 =
-      SkPerlinNoiseShader::MakeFractalNoise(1.0f, 1.0f, 1, 1.0f);
-  auto dl_filter1 = DlColorSource::From(layer_filter1);
-  auto layer_filter2 =
-      SkPerlinNoiseShader::MakeFractalNoise(2.0f, 2.0f, 2, 2.0f);
-  auto dl_filter2 = DlColorSource::From(layer_filter2);
+  const DlPaint child_paint1 = DlPaint(DlColor::kYellow());
+  const DlPaint child_paint2 = DlPaint(DlColor::kCyan());
+  auto dl_filter1 = MakeFilter(DlColor::kGreen());
+  auto dl_filter2 = MakeFilter(DlColor::kMagenta());
   auto mock_layer1 = std::make_shared<MockLayer>(child_path1, child_paint1);
   auto mock_layer2 = std::make_shared<MockLayer>(child_path2, child_paint2);
   auto layer1 = std::make_shared<ShaderMaskLayer>(dl_filter1, layer_bounds,
@@ -234,50 +252,54 @@ TEST_F(ShaderMaskLayerTest, Nested) {
   EXPECT_EQ(mock_layer1->parent_matrix(), initial_transform);
   EXPECT_EQ(mock_layer2->parent_matrix(), initial_transform);
 
-  SkPaint filter_paint1, filter_paint2;
-  filter_paint1.setBlendMode(SkBlendMode::kSrc);
-  filter_paint2.setBlendMode(SkBlendMode::kSrc);
-  filter_paint1.setShader(layer_filter1);
-  filter_paint2.setShader(layer_filter2);
-  layer1->Paint(paint_context());
-  EXPECT_EQ(
-      mock_canvas().draw_calls(),
-      std::vector(
-          {MockCanvas::DrawCall{
-               0, MockCanvas::SaveLayerData{children_bounds, SkPaint(), nullptr,
-                                            1}},
-           MockCanvas::DrawCall{
-               1, MockCanvas::DrawPathData{child_path1, child_paint1}},
-           MockCanvas::DrawCall{
-               1, MockCanvas::SaveLayerData{child_path2.getBounds(), SkPaint(),
-                                            nullptr, 2}},
-           MockCanvas::DrawCall{
-               2, MockCanvas::DrawPathData{child_path2, child_paint2}},
-           MockCanvas::DrawCall{2,
-                                MockCanvas::ConcatMatrixData{SkM44::Translate(
-                                    layer_bounds.fLeft, layer_bounds.fTop)}},
-           MockCanvas::DrawCall{
-               2,
-               MockCanvas::DrawRectData{
-                   SkRect::MakeWH(layer_bounds.width(), layer_bounds.height()),
-                   filter_paint2}},
-           MockCanvas::DrawCall{2, MockCanvas::RestoreData{1}},
-           MockCanvas::DrawCall{1,
-                                MockCanvas::ConcatMatrixData{SkM44::Translate(
-                                    layer_bounds.fLeft, layer_bounds.fTop)}},
-           MockCanvas::DrawCall{
-               1,
-               MockCanvas::DrawRectData{
-                   SkRect::MakeWH(layer_bounds.width(), layer_bounds.height()),
-                   filter_paint1}},
-           MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
+  DlPaint filter_paint1, filter_paint2;
+  filter_paint1.setBlendMode(DlBlendMode::kSrc);
+  filter_paint2.setBlendMode(DlBlendMode::kSrc);
+  filter_paint1.setColorSource(dl_filter1);
+  filter_paint2.setColorSource(dl_filter2);
+
+  layer1->Paint(display_list_paint_context());
+  DisplayListBuilder expected_builder;
+  /* (ShaderMask)layer1::Paint */ {
+    expected_builder.Save();
+    {
+      expected_builder.SaveLayer(&children_bounds);
+      {
+        /* mock_layer1::Paint */ {
+          expected_builder.DrawPath(child_path1, child_paint1);
+        }
+        /* (ShaderMask)layer2::Paint */ {
+          expected_builder.Save();
+          {
+            expected_builder.SaveLayer(&child_path2.getBounds());
+            {
+              /* mock_layer2::Paint */ {
+                expected_builder.DrawPath(child_path2, child_paint2);
+              }
+              expected_builder.Translate(layer_bounds.fLeft, layer_bounds.fTop);
+              expected_builder.DrawRect(
+                  SkRect::MakeWH(layer_bounds.width(), layer_bounds.height()),
+                  filter_paint2);
+            }
+            expected_builder.Restore();
+          }
+          expected_builder.Restore();
+        }
+        expected_builder.Translate(layer_bounds.fLeft, layer_bounds.fTop);
+        expected_builder.DrawRect(
+            SkRect::MakeWH(layer_bounds.width(), layer_bounds.height()),
+            filter_paint1);
+      }
+      expected_builder.Restore();
+    }
+    expected_builder.Restore();
+  }
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
 }
 
 TEST_F(ShaderMaskLayerTest, Readback) {
   const SkRect layer_bounds = SkRect::MakeLTRB(2.0f, 4.0f, 20.5f, 20.5f);
-  auto layer_filter =
-      SkPerlinNoiseShader::MakeFractalNoise(1.0f, 1.0f, 1, 1.0f);
-  auto dl_filter = DlColorSource::From(layer_filter);
+  auto dl_filter = MakeFilter(DlColor::kBlue());
   auto layer = std::make_shared<ShaderMaskLayer>(dl_filter, layer_bounds,
                                                  DlBlendMode::kSrc);
 
@@ -287,7 +309,7 @@ TEST_F(ShaderMaskLayerTest, Readback) {
   EXPECT_FALSE(preroll_context()->surface_needs_readback);
 
   // ShaderMaskLayer blocks child with readback
-  auto mock_layer = std::make_shared<MockLayer>(SkPath(), SkPaint());
+  auto mock_layer = std::make_shared<MockLayer>(SkPath(), DlPaint());
   mock_layer->set_fake_reads_surface(true);
   layer->Add(mock_layer);
   preroll_context()->surface_needs_readback = false;
@@ -296,10 +318,8 @@ TEST_F(ShaderMaskLayerTest, Readback) {
 }
 
 TEST_F(ShaderMaskLayerTest, LayerCached) {
-  auto layer_filter =
-      SkPerlinNoiseShader::MakeFractalNoise(1.0f, 1.0f, 1, 1.0f);
-  auto dl_filter = DlColorSource::From(layer_filter);
-  SkPaint paint;
+  auto dl_filter = MakeFilter(DlColor::kBlue());
+  DlPaint paint;
   const SkRect layer_bounds = SkRect::MakeLTRB(2.0f, 4.0f, 20.5f, 20.5f);
   auto initial_transform = SkMatrix::Translate(50.0, 25.5);
   const SkPath child_path = SkPath().addRect(SkRect::MakeWH(5.0f, 5.0f));
@@ -309,8 +329,8 @@ TEST_F(ShaderMaskLayerTest, LayerCached) {
   layer->Add(mock_layer);
 
   SkMatrix cache_ctm = initial_transform;
-  SkCanvas cache_canvas;
-  cache_canvas.setMatrix(cache_ctm);
+  DisplayListBuilder cache_canvas;
+  cache_canvas.Transform(cache_ctm);
 
   use_mock_raster_cache();
   preroll_context()->state_stack.set_preroll_delegate(initial_transform);
@@ -372,42 +392,40 @@ TEST_F(ShaderMaskLayerTest, OpacityInheritance) {
 
   DisplayListBuilder expected_builder;
   /* OpacityLayer::Paint() */ {
-    expected_builder.save();
+    expected_builder.Save();
     {
-      expected_builder.translate(offset.fX, offset.fY);
+      expected_builder.Translate(offset.fX, offset.fY);
       /* ShaderMaskLayer::Paint() */ {
-        DlPaint sl_paint = DlPaint().setColor(opacity_alpha << 24);
-        expected_builder.saveLayer(&child_path.getBounds(), &sl_paint);
+        DlPaint sl_paint = DlPaint(DlColor(opacity_alpha << 24));
+        expected_builder.SaveLayer(&child_path.getBounds(), &sl_paint);
         {
           /* child layer paint */ {
-            expected_builder.drawPath(child_path, DlPaint());
+            expected_builder.DrawPath(child_path, DlPaint());
           }
-          expected_builder.translate(mask_rect.fLeft, mask_rect.fTop);
-          expected_builder.drawRect(
+          expected_builder.Translate(mask_rect.fLeft, mask_rect.fTop);
+          expected_builder.DrawRect(
               SkRect::MakeWH(mask_rect.width(), mask_rect.height()),
               DlPaint().setBlendMode(DlBlendMode::kSrc));
         }
-        expected_builder.restore();
+        expected_builder.Restore();
       }
     }
-    expected_builder.restore();
+    expected_builder.Restore();
   }
 
   opacity_layer->Paint(display_list_paint_context());
   EXPECT_TRUE(DisplayListsEQ_Verbose(expected_builder.Build(), display_list()));
 }
 
-TEST_F(ShaderMaskLayerTest, SimpleFilterWithRasterCache) {
+TEST_F(ShaderMaskLayerTest, SimpleFilterWithRasterCacheLayerNotCached) {
   use_mock_raster_cache();  // Ensure non-fractional alignment.
 
   const SkMatrix initial_transform = SkMatrix::Translate(0.5f, 1.0f);
   const SkRect child_bounds = SkRect::MakeLTRB(5.0f, 6.0f, 20.5f, 21.5f);
   const SkRect layer_bounds = SkRect::MakeLTRB(2.0f, 4.0f, 6.5f, 6.5f);
   const SkPath child_path = SkPath().addRect(child_bounds);
-  const SkPaint child_paint = SkPaint(SkColors::kYellow);
-  auto layer_filter =
-      SkPerlinNoiseShader::MakeFractalNoise(1.0f, 1.0f, 1, 1.0f);
-  auto dl_filter = DlColorSource::From(layer_filter);
+  const DlPaint child_paint = DlPaint(DlColor::kYellow());
+  auto dl_filter = MakeFilter(DlColor::kBlue());
   auto mock_layer = std::make_shared<MockLayer>(child_path, child_paint);
   auto layer = std::make_shared<ShaderMaskLayer>(dl_filter, layer_bounds,
                                                  DlBlendMode::kSrc);
@@ -416,31 +434,37 @@ TEST_F(ShaderMaskLayerTest, SimpleFilterWithRasterCache) {
   preroll_context()->state_stack.set_preroll_delegate(initial_transform);
   layer->Preroll(preroll_context());
 
-  SkPaint filter_paint;
-  filter_paint.setBlendMode(SkBlendMode::kSrc);
-  filter_paint.setShader(layer_filter);
-  layer->Paint(paint_context());
-  EXPECT_EQ(
-      mock_canvas().draw_calls(),
-      std::vector({MockCanvas::DrawCall{0, MockCanvas::SaveData{1}},
-                   MockCanvas::DrawCall{1, MockCanvas::SetMatrixData{SkM44(
-                                               SkMatrix::Translate(0.0, 0.0))}},
-                   MockCanvas::DrawCall{
-                       1, MockCanvas::SaveLayerData{child_bounds, SkPaint(),
-                                                    nullptr, 2}},
-                   MockCanvas::DrawCall{
-                       2, MockCanvas::DrawPathData{child_path, child_paint}},
-                   MockCanvas::DrawCall{
-                       2, MockCanvas::ConcatMatrixData{SkM44::Translate(
-                              layer_bounds.fLeft, layer_bounds.fTop)}},
-                   MockCanvas::DrawCall{
-                       2, MockCanvas::DrawRectData{SkRect::MakeWH(
-                                                       layer_bounds.width(),
-                                                       layer_bounds.height()),
-                                                   filter_paint}},
-                   MockCanvas::DrawCall{2, MockCanvas::RestoreData{1}},
-                   MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
+  DlPaint filter_paint;
+  filter_paint.setBlendMode(DlBlendMode::kSrc);
+  filter_paint.setColorSource(dl_filter);
+
+  layer->Paint(display_list_paint_context());
+  DisplayListBuilder expected_builder;
+  /* (ShaderMask)layer::Paint */ {
+    expected_builder.Save();
+    {
+      // The layer will notice that the CTM is already an integer matrix
+      // and will not perform an Integral CTM operation.
+      // expected_builder.TransformReset();
+      // expected_builder.Transform(SkMatrix());
+      expected_builder.SaveLayer(&child_bounds);
+      {
+        /* mock_layer::Paint */ {
+          expected_builder.DrawPath(child_path, child_paint);
+        }
+        expected_builder.Translate(layer_bounds.fLeft, layer_bounds.fTop);
+        expected_builder.DrawRect(
+            SkRect::MakeWH(layer_bounds.width(), layer_bounds.height()),
+            filter_paint);
+      }
+      expected_builder.Restore();
+    }
+    expected_builder.Restore();
+  }
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
 }
 
 }  // namespace testing
 }  // namespace flutter
+
+// NOLINTEND(bugprone-unchecked-optional-access)
diff --git a/flow/layers/texture_layer.cc b/flow/layers/texture_layer.cc
index 52892c4ea6b207f2d205117a045b74f18b9c263c..c36a5eb6274d47a1460cdd79b06d2229f2675ff1 100644
--- a/flow/layers/texture_layer.cc
+++ b/flow/layers/texture_layer.cc
@@ -58,17 +58,14 @@ void TextureLayer::Paint(PaintContext& context) const {
     TRACE_EVENT_INSTANT0("flutter", "null texture");
     return;
   }
-  SkPaint sk_paint;
-  DlPaint dl_paint;
+  DlPaint paint;
   Texture::PaintContext ctx{
       .canvas = context.canvas,
-      .builder = context.builder,
       .gr_context = context.gr_context,
       .aiks_context = context.aiks_context,
-      .sk_paint = context.state_stack.fill(sk_paint),
-      .dl_paint = context.state_stack.fill(dl_paint),
+      .paint = context.state_stack.fill(paint),
   };
-  texture->Paint(ctx, paint_bounds(), freeze_, ToSk(sampling_));
+  texture->Paint(ctx, paint_bounds(), freeze_, sampling_);
 }
 
 }  // namespace flutter
diff --git a/flow/layers/texture_layer_unittests.cc b/flow/layers/texture_layer_unittests.cc
index 0862a81da9ab32eb9d94661b79ca3374beca961c..01da461eb77c4fb31d5ad3eed940c418001f8669 100644
--- a/flow/layers/texture_layer_unittests.cc
+++ b/flow/layers/texture_layer_unittests.cc
@@ -9,7 +9,7 @@
 #include "flutter/flow/testing/mock_layer.h"
 #include "flutter/flow/testing/mock_texture.h"
 #include "flutter/fml/macros.h"
-#include "flutter/testing/mock_canvas.h"
+#include "flutter/testing/display_list_testing.h"
 
 namespace flutter {
 namespace testing {
@@ -28,8 +28,8 @@ TEST_F(TextureLayerTest, InvalidTexture) {
                  .makeOffset(layer_offset.fX, layer_offset.fY)));
   EXPECT_TRUE(layer->needs_painting(paint_context()));
 
-  layer->Paint(paint_context());
-  EXPECT_EQ(mock_canvas().draw_calls(), std::vector<MockCanvas::DrawCall>());
+  layer->Paint(display_list_paint_context());
+  EXPECT_TRUE(display_list()->Equals(DisplayList()));
 }
 
 #ifndef NDEBUG
@@ -72,8 +72,11 @@ TEST_F(TextureLayerTest, PaintBeforePrerollDies) {
 TEST_F(TextureLayerTest, PaintingWithLinearSampling) {
   const SkPoint layer_offset = SkPoint::Make(0.0f, 0.0f);
   const SkSize layer_size = SkSize::Make(8.0f, 8.0f);
+  const SkRect layer_bounds =
+      SkRect::MakeSize(layer_size).makeOffset(layer_offset.fX, layer_offset.fY);
   const int64_t texture_id = 0;
-  auto mock_texture = std::make_shared<MockTexture>(texture_id);
+  const auto texture_image = MockTexture::MakeTestTexture(20, 20, 5);
+  auto mock_texture = std::make_shared<MockTexture>(texture_id, texture_image);
   auto layer = std::make_shared<TextureLayer>(
       layer_offset, layer_size, texture_id, false, DlImageSampling::kLinear);
 
@@ -81,17 +84,16 @@ TEST_F(TextureLayerTest, PaintingWithLinearSampling) {
   preroll_context()->texture_registry->RegisterTexture(mock_texture);
 
   layer->Preroll(preroll_context());
-  EXPECT_EQ(layer->paint_bounds(),
-            (SkRect::MakeSize(layer_size)
-                 .makeOffset(layer_offset.fX, layer_offset.fY)));
+  EXPECT_EQ(layer->paint_bounds(), layer_bounds);
   EXPECT_TRUE(layer->needs_painting(paint_context()));
 
-  layer->Paint(paint_context());
-  EXPECT_EQ(mock_texture->paint_calls(),
-            std::vector({MockTexture::PaintCall{
-                mock_canvas(), layer->paint_bounds(), false, nullptr,
-                SkSamplingOptions(SkFilterMode::kLinear)}}));
-  EXPECT_EQ(mock_canvas().draw_calls(), std::vector<MockCanvas::DrawCall>());
+  layer->Paint(display_list_paint_context());
+  DisplayListBuilder expected_builder;
+  /* (Texture)layer::Paint */ {
+    expected_builder.DrawImageRect(texture_image, layer_bounds,
+                                   DlImageSampling::kLinear);
+  }
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
 }
 
 using TextureLayerDiffTest = DiffContextTest;
@@ -118,24 +120,50 @@ TEST_F(TextureLayerDiffTest, TextureInRetainedLayer) {
 TEST_F(TextureLayerTest, OpacityInheritance) {
   const SkPoint layer_offset = SkPoint::Make(0.0f, 0.0f);
   const SkSize layer_size = SkSize::Make(8.0f, 8.0f);
+  const SkRect layer_bounds =
+      SkRect::MakeSize(layer_size).makeOffset(layer_offset.fX, layer_offset.fY);
   const int64_t texture_id = 0;
-  auto mock_texture = std::make_shared<MockTexture>(texture_id);
-  auto layer = std::make_shared<TextureLayer>(
+  const auto texture_image = MockTexture::MakeTestTexture(20, 20, 5);
+  auto mock_texture = std::make_shared<MockTexture>(texture_id, texture_image);
+  SkAlpha alpha = 0x7f;
+  auto texture_layer = std::make_shared<TextureLayer>(
       layer_offset, layer_size, texture_id, false, DlImageSampling::kLinear);
+  auto layer = std::make_shared<OpacityLayer>(alpha, SkPoint::Make(0.0f, 0.0f));
+  layer->Add(texture_layer);
 
   // Ensure the texture is located by the Layer.
-  preroll_context()->texture_registry->RegisterTexture(mock_texture);
-
-  // The texture layer always reports opacity compatibility.
   PrerollContext* context = preroll_context();
   context->texture_registry->RegisterTexture(mock_texture);
+
+  // The texture layer always reports opacity compatibility.
+  texture_layer->Preroll(context);
+  EXPECT_EQ(context->renderable_state_flags,
+            LayerStateStack::kCallerCanApplyOpacity);
+
+  // Reset has_texture_layer since it is not supposed to be sent as we
+  // descend a tree in Preroll, but it was set by the previous test.
+  context->has_texture_layer = false;
   layer->Preroll(context);
   EXPECT_EQ(context->renderable_state_flags,
             LayerStateStack::kCallerCanApplyOpacity);
 
-  // MockTexture has no actual textur to render into the
-  // PaintContext canvas so we have no way to verify its
-  // rendering.
+  DlPaint texture_paint;
+  texture_paint.setAlpha(alpha);
+
+  layer->Paint(display_list_paint_context());
+  DisplayListBuilder expected_builder;
+  /* (Opacity)layer::Paint */ {
+    expected_builder.Save();
+    {
+      /* texture_layer::Paint */ {
+        expected_builder.DrawImageRect(texture_image, layer_bounds,
+                                       DlImageSampling::kLinear,
+                                       &texture_paint);
+      }
+    }
+    expected_builder.Restore();
+  }
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
 }
 
 }  // namespace testing
diff --git a/flow/layers/transform_layer.cc b/flow/layers/transform_layer.cc
index 0c72924fd65cf0e48e54f22e214a1dce6bc7f1bc..ec371a06099ec70ad8f307934cdc797f3dfbaef0 100644
--- a/flow/layers/transform_layer.cc
+++ b/flow/layers/transform_layer.cc
@@ -8,9 +8,8 @@
 
 namespace flutter {
 
-TransformLayer::TransformLayer(const SkMatrix& transform)
-    : transform_(transform) {
-  // Checks (in some degree) that SkMatrix transform_ is valid and initialized.
+TransformLayer::TransformLayer(const SkM44& transform) : transform_(transform) {
+  // Checks (in some degree) that SkM44 transform_ is valid and initialized.
   //
   // If transform_ is uninitialized, this assert may look flaky as it doesn't
   // fail all the time, and some rerun may make it pass. But don't ignore it and
@@ -47,7 +46,22 @@ void TransformLayer::Preroll(PrerollContext* context) {
   SkRect child_paint_bounds = SkRect::MakeEmpty();
   PrerollChildren(context, &child_paint_bounds);
 
-  transform_.mapRect(&child_paint_bounds);
+  // We convert to a 3x3 matrix here primarily because the SkM44 object
+  // does not support a mapRect operation.
+  // https://bugs.chromium.org/p/skia/issues/detail?id=11720&q=mapRect&can=2
+  //
+  // All geometry is X,Y only which means the 3rd row of the 4x4 matrix
+  // is ignored and the output of the 3rd column is also ignored.
+  // So we can transform the rectangle using just the 3x3 SkMatrix
+  // equivalent without any loss of information.
+  //
+  // Performance consideration:
+  // Skia has an internal mapRect for their SkM44 object that is faster
+  // than what SkMatrix does when it has perspective elements. But SkMatrix
+  // is otherwise optimal for non-perspective matrices. If SkM44 ever exposes
+  // a mapRect operation, or if SkMatrix ever optimizes its handling of
+  // the perspective elements, this issue will become moot.
+  transform_.asM33().mapRect(&child_paint_bounds);
   set_paint_bounds(child_paint_bounds);
 }
 
diff --git a/flow/layers/transform_layer.h b/flow/layers/transform_layer.h
index cb4c712d7bfd7ad104af1815a684ca94f0a438b1..6403a02dc2ade4cbc2bb47f450f181aa8fb3a7d2 100644
--- a/flow/layers/transform_layer.h
+++ b/flow/layers/transform_layer.h
@@ -13,7 +13,9 @@ namespace flutter {
 // at all. Hence |set_transform| must be called with an initialized SkMatrix.
 class TransformLayer : public ContainerLayer {
  public:
-  explicit TransformLayer(const SkMatrix& transform);
+  explicit TransformLayer(const SkMatrix& transform)
+      : TransformLayer(SkM44(transform)) {}
+  explicit TransformLayer(const SkM44& transform);
 
   void Diff(DiffContext* context, const Layer* old_layer) override;
 
@@ -22,7 +24,7 @@ class TransformLayer : public ContainerLayer {
   void Paint(PaintContext& context) const override;
 
  private:
-  SkMatrix transform_;
+  SkM44 transform_;
 
   FML_DISALLOW_COPY_AND_ASSIGN(TransformLayer);
 };
diff --git a/flow/layers/transform_layer_unittests.cc b/flow/layers/transform_layer_unittests.cc
index e1c2522a9c563c77dbbf9e10d875904ede06ed48..14e5aff9a6fa1f5c5311db9fddc6044f18923374 100644
--- a/flow/layers/transform_layer_unittests.cc
+++ b/flow/layers/transform_layer_unittests.cc
@@ -8,7 +8,6 @@
 #include "flutter/flow/testing/layer_test.h"
 #include "flutter/flow/testing/mock_layer.h"
 #include "flutter/fml/macros.h"
-#include "flutter/testing/mock_canvas.h"
 
 namespace flutter {
 namespace testing {
@@ -31,7 +30,7 @@ TEST_F(TransformLayerTest, PaintingEmptyLayerDies) {
 TEST_F(TransformLayerTest, PaintBeforePrerollDies) {
   SkPath child_path;
   child_path.addRect(5.0f, 6.0f, 20.5f, 21.5f);
-  auto mock_layer = std::make_shared<MockLayer>(child_path, SkPaint());
+  auto mock_layer = std::make_shared<MockLayer>(child_path, DlPaint());
   auto layer = std::make_shared<TransformLayer>(SkMatrix());  // identity
   layer->Add(mock_layer);
 
@@ -44,7 +43,7 @@ TEST_F(TransformLayerTest, Identity) {
   SkPath child_path;
   child_path.addRect(5.0f, 6.0f, 20.5f, 21.5f);
   SkRect cull_rect = SkRect::MakeXYWH(2.0f, 2.0f, 14.0f, 14.0f);
-  auto mock_layer = std::make_shared<MockLayer>(child_path, SkPaint());
+  auto mock_layer = std::make_shared<MockLayer>(child_path, DlPaint());
   auto layer = std::make_shared<TransformLayer>(SkMatrix());  // identity
   layer->Add(mock_layer);
 
@@ -57,12 +56,22 @@ TEST_F(TransformLayerTest, Identity) {
   EXPECT_TRUE(layer->needs_painting(paint_context()));
   EXPECT_EQ(mock_layer->parent_matrix(), SkMatrix());  // identity
   EXPECT_EQ(mock_layer->parent_cull_rect(), cull_rect);
+  EXPECT_EQ(mock_layer->parent_mutators().stack_count(), 0u);
   EXPECT_EQ(mock_layer->parent_mutators(), MutatorsStack());
 
-  layer->Paint(paint_context());
-  EXPECT_EQ(mock_canvas().draw_calls(),
-            std::vector({MockCanvas::DrawCall{
-                0, MockCanvas::DrawPathData{child_path, SkPaint()}}}));
+  layer->Paint(display_list_paint_context());
+  DisplayListBuilder expected_builder;
+  /* (Transform)layer::Paint */ {
+    expected_builder.Save();
+    {
+      expected_builder.Transform(SkMatrix());
+      /* mock_layer::Paint */ {
+        expected_builder.DrawPath(child_path, DlPaint());
+      }
+    }
+    expected_builder.Restore();
+  }
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
 }
 
 TEST_F(TransformLayerTest, Simple) {
@@ -75,7 +84,7 @@ TEST_F(TransformLayerTest, Simple) {
   SkMatrix inverse_layer_transform;
   EXPECT_TRUE(layer_transform.invert(&inverse_layer_transform));
 
-  auto mock_layer = std::make_shared<MockLayer>(child_path, SkPaint());
+  auto mock_layer = std::make_shared<MockLayer>(child_path, DlPaint());
   auto layer = std::make_shared<TransformLayer>(layer_transform);
   layer->Add(mock_layer);
 
@@ -95,15 +104,115 @@ TEST_F(TransformLayerTest, Simple) {
   EXPECT_EQ(mock_layer->parent_mutators(),
             std::vector({Mutator(layer_transform)}));
 
-  layer->Paint(paint_context());
-  EXPECT_EQ(
-      mock_canvas().draw_calls(),
-      std::vector({MockCanvas::DrawCall{0, MockCanvas::SaveData{1}},
-                   MockCanvas::DrawCall{
-                       1, MockCanvas::ConcatMatrixData{SkM44(layer_transform)}},
-                   MockCanvas::DrawCall{
-                       1, MockCanvas::DrawPathData{child_path, SkPaint()}},
-                   MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
+  layer->Paint(display_list_paint_context());
+  DisplayListBuilder expected_builder;
+  /* (Transform)layer::Paint */ {
+    expected_builder.Save();
+    {
+      expected_builder.Transform(layer_transform);
+      /* mock_layer::Paint */ {
+        expected_builder.DrawPath(child_path, DlPaint());
+      }
+    }
+    expected_builder.Restore();
+  }
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
+}
+
+TEST_F(TransformLayerTest, SimpleM44) {
+  SkPath child_path;
+  child_path.addRect(5.0f, 6.0f, 20.5f, 21.5f);
+  SkMatrix initial_transform = SkMatrix::Translate(-0.5f, -0.5f);
+  SkRect local_cull_rect = SkRect::MakeXYWH(2.0f, 2.0f, 14.0f, 14.0f);
+  SkRect device_cull_rect = initial_transform.mapRect(local_cull_rect);
+  SkMatrix layer_transform = SkMatrix::Translate(2.5f, 3.5f);
+  SkMatrix inverse_layer_transform;
+  EXPECT_TRUE(layer_transform.invert(&inverse_layer_transform));
+
+  auto mock_layer = std::make_shared<MockLayer>(child_path, DlPaint());
+  auto layer = std::make_shared<TransformLayer>(SkM44::Translate(2.5f, 3.5f));
+  layer->Add(mock_layer);
+
+  preroll_context()->state_stack.set_preroll_delegate(device_cull_rect,
+                                                      initial_transform);
+  layer->Preroll(preroll_context());
+  EXPECT_EQ(mock_layer->paint_bounds(), child_path.getBounds());
+  EXPECT_EQ(layer->paint_bounds(),
+            layer_transform.mapRect(mock_layer->paint_bounds()));
+  EXPECT_EQ(layer->child_paint_bounds(), mock_layer->paint_bounds());
+  EXPECT_TRUE(mock_layer->needs_painting(paint_context()));
+  EXPECT_TRUE(layer->needs_painting(paint_context()));
+  EXPECT_EQ(mock_layer->parent_matrix(),
+            SkMatrix::Concat(initial_transform, layer_transform));
+  EXPECT_EQ(mock_layer->parent_cull_rect(),
+            inverse_layer_transform.mapRect(local_cull_rect));
+  EXPECT_EQ(mock_layer->parent_mutators(),
+            std::vector({Mutator(layer_transform)}));
+
+  layer->Paint(display_list_paint_context());
+  DisplayListBuilder expected_builder;
+  /* (Transform)layer::Paint */ {
+    expected_builder.Save();
+    {
+      expected_builder.Transform(layer_transform);
+      /* mock_layer::Paint */ {
+        expected_builder.DrawPath(child_path, DlPaint());
+      }
+    }
+    expected_builder.Restore();
+  }
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
+}
+
+TEST_F(TransformLayerTest, ComplexM44) {
+  SkPath child_path;
+  child_path.addRect(5.0f, 6.0f, 20.5f, 21.5f);
+  SkMatrix initial_transform = SkMatrix::Translate(-0.5f, -0.5f);
+  SkRect local_cull_rect = SkRect::MakeXYWH(2.0f, 2.0f, 14.0f, 14.0f);
+  SkRect device_cull_rect = initial_transform.mapRect(local_cull_rect);
+  SkM44 layer_transform44 = SkM44();
+  layer_transform44.preTranslate(2.5f, 2.5f);
+  // 20 degrees around the X axis
+  layer_transform44.preConcat(SkM44::Rotate({1.0f, 0.0f, 0.0f}, M_PI / 9.0f));
+  // 10 degrees around the Y axis
+  layer_transform44.preConcat(SkM44::Rotate({0.0f, 1.0f, 0.0f}, M_PI / 18.0f));
+  SkMatrix layer_transform = layer_transform44.asM33();
+  SkMatrix inverse_layer_transform;
+  EXPECT_TRUE(layer_transform.invert(&inverse_layer_transform));
+
+  auto mock_layer = std::make_shared<MockLayer>(child_path, DlPaint());
+  auto layer = std::make_shared<TransformLayer>(layer_transform44);
+  layer->Add(mock_layer);
+
+  preroll_context()->state_stack.set_preroll_delegate(device_cull_rect,
+                                                      initial_transform);
+  layer->Preroll(preroll_context());
+  EXPECT_EQ(mock_layer->paint_bounds(), child_path.getBounds());
+  EXPECT_EQ(layer->paint_bounds(),
+            layer_transform.mapRect(mock_layer->paint_bounds()));
+  EXPECT_EQ(layer->child_paint_bounds(), mock_layer->paint_bounds());
+  EXPECT_TRUE(mock_layer->needs_painting(paint_context()));
+  EXPECT_TRUE(layer->needs_painting(paint_context()));
+  EXPECT_EQ(mock_layer->parent_matrix(),
+            SkMatrix::Concat(initial_transform, layer_transform));
+  EXPECT_EQ(mock_layer->parent_cull_rect(),
+            inverse_layer_transform.mapRect(local_cull_rect));
+  EXPECT_EQ(mock_layer->parent_mutators(),
+            std::vector({Mutator(layer_transform)}));
+
+  layer->Paint(display_list_paint_context());
+  DisplayListBuilder expected_builder;
+  /* (Transform)layer::Paint */ {
+    expected_builder.Save();
+    {
+      expected_builder.Transform(layer_transform44);
+      /* mock_layer::Paint */ {
+        expected_builder.DrawPath(child_path, DlPaint());
+      }
+    }
+    expected_builder.Restore();
+  }
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
 }
 
 TEST_F(TransformLayerTest, Nested) {
@@ -113,12 +222,12 @@ TEST_F(TransformLayerTest, Nested) {
   SkRect local_cull_rect = SkRect::MakeXYWH(2.0f, 2.0f, 14.0f, 14.0f);
   SkRect device_cull_rect = initial_transform.mapRect(local_cull_rect);
   SkMatrix layer1_transform = SkMatrix::Translate(2.5f, 2.5f);
-  SkMatrix layer2_transform = SkMatrix::Translate(2.5f, 2.5f);
+  SkMatrix layer2_transform = SkMatrix::Translate(3.5f, 3.5f);
   SkMatrix inverse_layer1_transform, inverse_layer2_transform;
   EXPECT_TRUE(layer1_transform.invert(&inverse_layer1_transform));
   EXPECT_TRUE(layer2_transform.invert(&inverse_layer2_transform));
 
-  auto mock_layer = std::make_shared<MockLayer>(child_path, SkPaint());
+  auto mock_layer = std::make_shared<MockLayer>(child_path, DlPaint());
   auto layer1 = std::make_shared<TransformLayer>(layer1_transform);
   auto layer2 = std::make_shared<TransformLayer>(layer2_transform);
   layer1->Add(layer2);
@@ -146,21 +255,28 @@ TEST_F(TransformLayerTest, Nested) {
                 inverse_layer1_transform.mapRect(local_cull_rect)));
   EXPECT_EQ(
       mock_layer->parent_mutators(),
-      std::vector({Mutator(layer2_transform), Mutator(layer1_transform)}));
-
-  layer1->Paint(paint_context());
-  EXPECT_EQ(mock_canvas().draw_calls(),
-            std::vector(
-                {MockCanvas::DrawCall{0, MockCanvas::SaveData{1}},
-                 MockCanvas::DrawCall{
-                     1, MockCanvas::ConcatMatrixData{SkM44(layer1_transform)}},
-                 MockCanvas::DrawCall{1, MockCanvas::SaveData{2}},
-                 MockCanvas::DrawCall{
-                     2, MockCanvas::ConcatMatrixData{SkM44(layer2_transform)}},
-                 MockCanvas::DrawCall{
-                     2, MockCanvas::DrawPathData{child_path, SkPaint()}},
-                 MockCanvas::DrawCall{2, MockCanvas::RestoreData{1}},
-                 MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
+      std::vector({Mutator(layer1_transform), Mutator(layer2_transform)}));
+
+  layer1->Paint(display_list_paint_context());
+  DisplayListBuilder expected_builder;
+  /* (Transform)layer1::Paint */ {
+    expected_builder.Save();
+    {
+      expected_builder.Transform(layer1_transform);
+      /* (Transform)layer1::Paint */ {
+        expected_builder.Save();
+        {
+          expected_builder.Transform(layer2_transform);
+          /* mock_layer::Paint */ {
+            expected_builder.DrawPath(child_path, DlPaint());
+          }
+        }
+        expected_builder.Restore();
+      }
+    }
+    expected_builder.Restore();
+  }
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
 }
 
 TEST_F(TransformLayerTest, NestedSeparated) {
@@ -170,15 +286,15 @@ TEST_F(TransformLayerTest, NestedSeparated) {
   SkRect local_cull_rect = SkRect::MakeXYWH(2.0f, 2.0f, 14.0f, 14.0f);
   SkRect device_cull_rect = initial_transform.mapRect(local_cull_rect);
   SkMatrix layer1_transform = SkMatrix::Translate(2.5f, 2.5f);
-  SkMatrix layer2_transform = SkMatrix::Translate(2.5f, 2.5f);
+  SkMatrix layer2_transform = SkMatrix::Translate(3.5f, 3.5f);
   SkMatrix inverse_layer1_transform, inverse_layer2_transform;
   EXPECT_TRUE(layer1_transform.invert(&inverse_layer1_transform));
   EXPECT_TRUE(layer2_transform.invert(&inverse_layer2_transform));
+  DlPaint child_paint1(DlColor::kBlue());
+  DlPaint child_paint2(DlColor::kGreen());
 
-  auto mock_layer1 =
-      std::make_shared<MockLayer>(child_path, SkPaint(SkColors::kBlue));
-  auto mock_layer2 =
-      std::make_shared<MockLayer>(child_path, SkPaint(SkColors::kGreen));
+  auto mock_layer1 = std::make_shared<MockLayer>(child_path, child_paint1);
+  auto mock_layer2 = std::make_shared<MockLayer>(child_path, child_paint2);
   auto layer1 = std::make_shared<TransformLayer>(layer1_transform);
   auto layer2 = std::make_shared<TransformLayer>(layer2_transform);
   layer1->Add(mock_layer1);
@@ -219,25 +335,31 @@ TEST_F(TransformLayerTest, NestedSeparated) {
             std::vector({Mutator(layer1_transform)}));
   EXPECT_EQ(
       mock_layer2->parent_mutators(),
-      std::vector({Mutator(layer2_transform), Mutator(layer1_transform)}));
-
-  layer1->Paint(paint_context());
-  EXPECT_EQ(mock_canvas().draw_calls(),
-            std::vector(
-                {MockCanvas::DrawCall{0, MockCanvas::SaveData{1}},
-                 MockCanvas::DrawCall{
-                     1, MockCanvas::ConcatMatrixData{SkM44(layer1_transform)}},
-                 MockCanvas::DrawCall{
-                     1, MockCanvas::DrawPathData{child_path,
-                                                 SkPaint(SkColors::kBlue)}},
-                 MockCanvas::DrawCall{1, MockCanvas::SaveData{2}},
-                 MockCanvas::DrawCall{
-                     2, MockCanvas::ConcatMatrixData{SkM44(layer2_transform)}},
-                 MockCanvas::DrawCall{
-                     2, MockCanvas::DrawPathData{child_path,
-                                                 SkPaint(SkColors::kGreen)}},
-                 MockCanvas::DrawCall{2, MockCanvas::RestoreData{1}},
-                 MockCanvas::DrawCall{1, MockCanvas::RestoreData{0}}}));
+      std::vector({Mutator(layer1_transform), Mutator(layer2_transform)}));
+
+  layer1->Paint(display_list_paint_context());
+  DisplayListBuilder expected_builder;
+  /* (Transform)layer1::Paint */ {
+    expected_builder.Save();
+    {
+      expected_builder.Transform(layer1_transform);
+      /* mock_layer::Paint */ {
+        expected_builder.DrawPath(child_path, child_paint1);
+      }
+      /* (Transform)layer1::Paint */ {
+        expected_builder.Save();
+        {
+          expected_builder.Transform(layer2_transform);
+          /* mock_layer::Paint */ {
+            expected_builder.DrawPath(child_path, child_paint2);
+          }
+        }
+        expected_builder.Restore();
+      }
+    }
+    expected_builder.Restore();
+  }
+  EXPECT_TRUE(DisplayListsEQ_Verbose(display_list(), expected_builder.Build()));
 }
 
 TEST_F(TransformLayerTest, OpacityInheritance) {
@@ -316,22 +438,22 @@ TEST_F(TransformLayerTest, OpacityInheritancePainting) {
 
   DisplayListBuilder expected_builder;
   /* opacity_layer paint */ {
-    expected_builder.save();
+    expected_builder.Save();
     {
-      expected_builder.translate(offset.fX, offset.fY);
+      expected_builder.Translate(offset.fX, offset.fY);
       /* transform_layer paint */ {
-        expected_builder.save();
-        expected_builder.transform(transform);
+        expected_builder.Save();
+        expected_builder.Transform(transform);
         /* child layer1 paint */ {
-          expected_builder.drawPath(path1, DlPaint().setAlpha(opacity_alpha));
+          expected_builder.DrawPath(path1, DlPaint().setAlpha(opacity_alpha));
         }
         /* child layer2 paint */ {
-          expected_builder.drawPath(path2, DlPaint().setAlpha(opacity_alpha));
+          expected_builder.DrawPath(path2, DlPaint().setAlpha(opacity_alpha));
         }
-        expected_builder.restore();
+        expected_builder.Restore();
       }
     }
-    expected_builder.restore();
+    expected_builder.Restore();
   }
 
   opacity_layer->Paint(display_list_paint_context());
diff --git a/flow/paint_region.h b/flow/paint_region.h
index 1fd8896b68bd9c6326be62af28c204c1c30cc610..52f29762f67adbbbc34c18fbba129248b3948044 100644
--- a/flow/paint_region.h
+++ b/flow/paint_region.h
@@ -2,6 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_FLOW_PAINT_REGION_H_
+#define FLUTTER_FLOW_PAINT_REGION_H_
+
+#include <utility>
 #include <vector>
 #include "flutter/fml/logging.h"
 #include "third_party/skia/include/core/SkRect.h"
@@ -27,7 +31,7 @@ class PaintRegion {
               size_t to,
               bool has_readback,
               bool has_texture)
-      : rects_(rects),
+      : rects_(std::move(rects)),
         from_(from),
         to_(to),
         has_readback_(has_readback),
@@ -65,3 +69,5 @@ class PaintRegion {
 };
 
 }  // namespace flutter
+
+#endif  // FLUTTER_FLOW_PAINT_REGION_H_
diff --git a/flow/paint_utils.cc b/flow/paint_utils.cc
index 2d1d6f65029efc45ec65ed892dc86936c6024a78..eab62daad1d7aac88d3d690f46d2e52a2e090c99 100644
--- a/flow/paint_utils.cc
+++ b/flow/paint_utils.cc
@@ -7,64 +7,32 @@
 #include <stdlib.h>
 
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "third_party/skia/include/core/SkPaint.h"
-#include "third_party/skia/include/core/SkShader.h"
+#include "third_party/skia/include/core/SkImage.h"
 
 namespace flutter {
 
 namespace {
 
-sk_sp<SkShader> CreateCheckerboardShader(SkColor c1, SkColor c2, int size) {
+std::shared_ptr<DlColorSource> CreateCheckerboardShader(SkColor c1,
+                                                        SkColor c2,
+                                                        int size) {
   SkBitmap bm;
   bm.allocN32Pixels(2 * size, 2 * size);
   bm.eraseColor(c1);
   bm.eraseArea(SkIRect::MakeLTRB(0, 0, size, size), c2);
   bm.eraseArea(SkIRect::MakeLTRB(size, size, 2 * size, 2 * size), c2);
-  return bm.makeShader(SkTileMode::kRepeat, SkTileMode::kRepeat,
-                       SkSamplingOptions());
+  auto image = DlImage::Make(SkImages::RasterFromBitmap(bm));
+  return std::make_shared<DlImageColorSource>(
+      image, DlTileMode::kRepeat, DlTileMode::kRepeat,
+      DlImageSampling::kNearestNeighbor);
 }
 
 }  // anonymous namespace
 
-void DrawCheckerboard(SkCanvas* canvas,
-                      DisplayListBuilder* builder,
-                      const SkRect& rect) {
-  if (canvas) {
-    DrawCheckerboard(canvas, rect);
-  }
-  if (builder) {
-    DrawCheckerboard(builder, rect);
-  }
-}
-
-void DrawCheckerboard(SkCanvas* canvas, const SkRect& rect) {
-  // Draw a checkerboard
-  canvas->save();
-  canvas->clipRect(rect);
-
-  // Secure random number generation isn't needed here.
-  // NOLINTBEGIN(clang-analyzer-security.insecureAPI.rand)
-  auto checkerboard_color =
-      SkColorSetARGB(64, rand() % 256, rand() % 256, rand() % 256);
-  // NOLINTEND(clang-analyzer-security.insecureAPI.rand)
-
-  SkPaint paint;
-  paint.setShader(CreateCheckerboardShader(checkerboard_color, 0x00000000, 12));
-  canvas->drawPaint(paint);
-  canvas->restore();
-
-  // Stroke the drawn area
-  SkPaint debug_paint;
-  debug_paint.setStrokeWidth(8);
-  debug_paint.setColor(SkColorSetA(checkerboard_color, 255));
-  debug_paint.setStyle(SkPaint::kStroke_Style);
-  canvas->drawRect(rect, debug_paint);
-}
-
-void DrawCheckerboard(DisplayListBuilder* builder, const SkRect& rect) {
+void DrawCheckerboard(DlCanvas* canvas, const SkRect& rect) {
   // Draw a checkerboard
-  builder->save();
-  builder->clipRect(rect, SkClipOp::kIntersect, false);
+  canvas->Save();
+  canvas->ClipRect(rect, DlCanvas::ClipOp::kIntersect, false);
 
   // Secure random number generation isn't needed here.
   // NOLINTBEGIN(clang-analyzer-security.insecureAPI.rand)
@@ -73,17 +41,17 @@ void DrawCheckerboard(DisplayListBuilder* builder, const SkRect& rect) {
   // NOLINTEND(clang-analyzer-security.insecureAPI.rand)
 
   DlPaint paint;
-  paint.setColorSource(DlColorSource::From(
-      CreateCheckerboardShader(checkerboard_color, 0x00000000, 12)));
-  builder->drawPaint(paint);
-  builder->restore();
+  paint.setColorSource(
+      CreateCheckerboardShader(checkerboard_color, 0x00000000, 12));
+  canvas->DrawPaint(paint);
+  canvas->Restore();
 
   // Stroke the drawn area
   DlPaint debug_paint;
   debug_paint.setStrokeWidth(8);
-  debug_paint.setColor(SkColorSetA(checkerboard_color, 255));
+  debug_paint.setColor(DlColor(SkColorSetA(checkerboard_color, 255)));
   debug_paint.setDrawStyle(DlDrawStyle::kStroke);
-  builder->drawRect(rect, debug_paint);
+  canvas->DrawRect(rect, debug_paint);
 }
 
 }  // namespace flutter
diff --git a/flow/paint_utils.h b/flow/paint_utils.h
index c01d7d1a8c5f4fd0bcdbc6df740885fd9215ddb6..705d3a2b6c0fe6f4162bac611a49a4a065b92a1b 100644
--- a/flow/paint_utils.h
+++ b/flow/paint_utils.h
@@ -5,20 +5,16 @@
 #ifndef FLUTTER_FLOW_PAINT_UTILS_H_
 #define FLUTTER_FLOW_PAINT_UTILS_H_
 
-#include "flutter/display_list/display_list_builder.h"
+#include "flutter/display_list/dl_canvas.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkRect.h"
 
 namespace flutter {
 
-typedef void (*CheckerboardFunc)(SkCanvas*, DisplayListBuilder*, const SkRect&);
+typedef void (*CheckerboardFunc)(DlCanvas*, const SkRect&);
 
-void DrawCheckerboard(SkCanvas* canvas,
-                      DisplayListBuilder* builder,
-                      const SkRect& rect);
-void DrawCheckerboard(SkCanvas* canvas, const SkRect& rect);
-void DrawCheckerboard(DisplayListBuilder* builder, const SkRect& rect);
+void DrawCheckerboard(DlCanvas* canvas, const SkRect& rect);
 
 }  // namespace flutter
 
diff --git a/flow/raster_cache.cc b/flow/raster_cache.cc
index 6dc4c1f804ac66146b9098fd720af1b5943e2053..73ed478772df8d4342031efb34c1d128417e9346 100644
--- a/flow/raster_cache.cc
+++ b/flow/raster_cache.cc
@@ -8,6 +8,7 @@
 #include <vector>
 
 #include "flutter/common/constants.h"
+#include "flutter/display_list/skia/dl_sk_dispatcher.h"
 #include "flutter/flow/layers/container_layer.h"
 #include "flutter/flow/layers/layer.h"
 #include "flutter/flow/paint_utils.h"
@@ -17,83 +18,112 @@
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColorSpace.h"
 #include "third_party/skia/include/core/SkImage.h"
-#include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
+#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
 
 namespace flutter {
 
-RasterCacheResult::RasterCacheResult(sk_sp<SkImage> image,
+RasterCacheResult::RasterCacheResult(sk_sp<DlImage> image,
                                      const SkRect& logical_rect,
-                                     const char* type)
-    : image_(std::move(image)), logical_rect_(logical_rect), flow_(type) {}
-
-void RasterCacheResult::draw(SkCanvas& canvas, const SkPaint* paint) const {
-  SkAutoCanvasRestore auto_restore(&canvas, true);
-
-  auto matrix = RasterCacheUtil::GetIntegralTransCTM(canvas.getTotalMatrix());
+                                     const char* type,
+                                     sk_sp<const DlRTree> rtree)
+    : image_(std::move(image)),
+      logical_rect_(logical_rect),
+      flow_(type),
+      rtree_(std::move(rtree)) {}
+
+void RasterCacheResult::draw(DlCanvas& canvas,
+                             const DlPaint* paint,
+                             bool preserve_rtree) const {
+  DlAutoCanvasRestore auto_restore(&canvas, true);
+
+  auto matrix = RasterCacheUtil::GetIntegralTransCTM(canvas.GetTransform());
   SkRect bounds =
       RasterCacheUtil::GetRoundedOutDeviceBounds(logical_rect_, matrix);
   FML_DCHECK(std::abs(bounds.width() - image_->dimensions().width()) <= 1 &&
              std::abs(bounds.height() - image_->dimensions().height()) <= 1);
-  canvas.resetMatrix();
+  canvas.TransformReset();
   flow_.Step();
-  canvas.drawImage(image_, bounds.fLeft, bounds.fTop, SkSamplingOptions(),
-                   paint);
+  if (!preserve_rtree || !rtree_) {
+    canvas.DrawImage(image_, {bounds.fLeft, bounds.fTop},
+                     DlImageSampling::kNearestNeighbor, paint);
+  } else {
+    // On some platforms RTree from overlay layers is used for unobstructed
+    // platform views and hit testing. To preserve the RTree raster cache must
+    // paint individual rects instead of the whole image.
+    auto rects = rtree_->region().getRects(true);
+
+    canvas.Translate(bounds.fLeft, bounds.fTop);
+
+    SkRect rtree_bounds =
+        RasterCacheUtil::GetRoundedOutDeviceBounds(rtree_->bounds(), matrix);
+    for (auto rect : rects) {
+      SkRect device_rect = RasterCacheUtil::GetRoundedOutDeviceBounds(
+          SkRect::Make(rect), matrix);
+      device_rect.offset(-rtree_bounds.fLeft, -rtree_bounds.fTop);
+      canvas.DrawImageRect(image_, device_rect, device_rect,
+                           DlImageSampling::kNearestNeighbor, paint);
+    }
+  }
 }
 
 RasterCache::RasterCache(size_t access_threshold,
                          size_t display_list_cache_limit_per_frame)
     : access_threshold_(access_threshold),
-      display_list_cache_limit_per_frame_(display_list_cache_limit_per_frame),
-      checkerboard_images_(false) {}
+      display_list_cache_limit_per_frame_(display_list_cache_limit_per_frame) {}
 
 /// @note Procedure doesn't copy all closures.
 std::unique_ptr<RasterCacheResult> RasterCache::Rasterize(
     const RasterCache::Context& context,
-    const std::function<void(SkCanvas*)>& draw_function,
-    const std::function<void(SkCanvas*, const SkRect& rect)>& draw_checkerboard)
+    sk_sp<const DlRTree> rtree,
+    const std::function<void(DlCanvas*)>& draw_function,
+    const std::function<void(DlCanvas*, const SkRect& rect)>& draw_checkerboard)
     const {
   auto matrix = RasterCacheUtil::GetIntegralTransCTM(context.matrix);
   SkRect dest_rect =
       RasterCacheUtil::GetRoundedOutDeviceBounds(context.logical_rect, matrix);
 
-  const SkImageInfo image_info =
-      SkImageInfo::MakeN32Premul(dest_rect.width(), dest_rect.height(),
-                                 sk_ref_sp(context.dst_color_space));
+  const SkImageInfo image_info = SkImageInfo::MakeN32Premul(
+      dest_rect.width(), dest_rect.height(), context.dst_color_space);
 
   sk_sp<SkSurface> surface =
-      context.gr_context ? SkSurface::MakeRenderTarget(
-                               context.gr_context, SkBudgeted::kYes, image_info)
-                         : SkSurface::MakeRaster(image_info);
+      context.gr_context
+          ? SkSurfaces::RenderTarget(context.gr_context, skgpu::Budgeted::kYes,
+                                     image_info)
+          : SkSurfaces::Raster(image_info);
 
   if (!surface) {
     return nullptr;
   }
 
-  SkCanvas* canvas = surface->getCanvas();
-  canvas->clear(SK_ColorTRANSPARENT);
-  canvas->translate(-dest_rect.left(), -dest_rect.top());
-  canvas->concat(matrix);
-  draw_function(canvas);
+  DlSkCanvasAdapter canvas(surface->getCanvas());
+  canvas.Clear(DlColor::kTransparent());
+
+  canvas.Translate(-dest_rect.left(), -dest_rect.top());
+  canvas.Transform(matrix);
+  draw_function(&canvas);
 
   if (checkerboard_images_) {
-    draw_checkerboard(canvas, context.logical_rect);
+    draw_checkerboard(&canvas, context.logical_rect);
   }
 
+  auto image = DlImage::Make(surface->makeImageSnapshot());
   return std::make_unique<RasterCacheResult>(
-      surface->makeImageSnapshot(), context.logical_rect, context.flow_type);
+      image, context.logical_rect, context.flow_type, std::move(rtree));
 }
 
 bool RasterCache::UpdateCacheEntry(
     const RasterCacheKeyID& id,
     const Context& raster_cache_context,
-    const std::function<void(SkCanvas*)>& render_function) const {
+    const std::function<void(DlCanvas*)>& render_function,
+    sk_sp<const DlRTree> rtree) const {
   RasterCacheKey key = RasterCacheKey(id, raster_cache_context.matrix);
   Entry& entry = cache_[key];
   if (!entry.image) {
-    void (*func)(SkCanvas*, const SkRect& rect) = DrawCheckerboard;
-    entry.image = Rasterize(raster_cache_context, render_function, func);
+    void (*func)(DlCanvas*, const SkRect& rect) = DrawCheckerboard;
+    entry.image = Rasterize(raster_cache_context, std::move(rtree),
+                            render_function, func);
     if (entry.image != nullptr) {
       switch (id.type()) {
         case RasterCacheKeyType::kDisplayList: {
@@ -142,9 +172,10 @@ bool RasterCache::HasEntry(const RasterCacheKeyID& id,
 }
 
 bool RasterCache::Draw(const RasterCacheKeyID& id,
-                       SkCanvas& canvas,
-                       const SkPaint* paint) const {
-  auto it = cache_.find(RasterCacheKey(id, canvas.getTotalMatrix()));
+                       DlCanvas& canvas,
+                       const DlPaint* paint,
+                       bool preserve_rtree) const {
+  auto it = cache_.find(RasterCacheKey(id, canvas.GetTransform()));
   if (it == cache_.end()) {
     return false;
   }
@@ -152,7 +183,7 @@ bool RasterCache::Draw(const RasterCacheKeyID& id,
   Entry& entry = it->second;
 
   if (entry.image) {
-    entry.image->draw(canvas, paint);
+    entry.image->draw(canvas, paint, preserve_rtree);
     return true;
   }
 
diff --git a/flow/raster_cache.h b/flow/raster_cache.h
index 8f51b3f52ae89c0ca1c81c1e9332dfc0a22f2f30..8e58bc9f563152ce456b8e926816746349aa8b0f 100644
--- a/flow/raster_cache.h
+++ b/flow/raster_cache.h
@@ -8,19 +8,16 @@
 #include <memory>
 #include <unordered_map>
 
-#include "flutter/display_list/display_list.h"
-#include "flutter/display_list/display_list_complexity.h"
+#include "flutter/display_list/dl_canvas.h"
 #include "flutter/flow/raster_cache_key.h"
 #include "flutter/flow/raster_cache_util.h"
 #include "flutter/fml/macros.h"
 #include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/fml/trace_event.h"
-#include "include/core/SkCanvas.h"
-#include "include/core/SkMatrix.h"
-#include "include/core/SkRect.h"
-#include "third_party/skia/include/core/SkImage.h"
-#include "third_party/skia/include/core/SkSize.h"
+#include "third_party/skia/include/core/SkMatrix.h"
+#include "third_party/skia/include/core/SkRect.h"
 
+class GrDirectContext;
 class SkColorSpace;
 
 namespace flutter {
@@ -29,26 +26,30 @@ enum class RasterCacheLayerStrategy { kLayer, kLayerChildren };
 
 class RasterCacheResult {
  public:
-  RasterCacheResult(sk_sp<SkImage> image,
+  RasterCacheResult(sk_sp<DlImage> image,
                     const SkRect& logical_rect,
-                    const char* type);
+                    const char* type,
+                    sk_sp<const DlRTree> rtree = nullptr);
 
   virtual ~RasterCacheResult() = default;
 
-  virtual void draw(SkCanvas& canvas, const SkPaint* paint) const;
+  virtual void draw(DlCanvas& canvas,
+                    const DlPaint* paint,
+                    bool preserve_rtree) const;
 
   virtual SkISize image_dimensions() const {
     return image_ ? image_->dimensions() : SkISize::Make(0, 0);
   };
 
   virtual int64_t image_bytes() const {
-    return image_ ? image_->imageInfo().computeMinByteSize() : 0;
+    return image_ ? image_->GetApproximateByteSize() : 0;
   };
 
  private:
-  sk_sp<SkImage> image_;
+  sk_sp<DlImage> image_;
   SkRect logical_rect_;
   fml::tracing::TraceFlow flow_;
+  sk_sp<const DlRTree> rtree_;
 };
 
 class Layer;
@@ -116,7 +117,7 @@ class RasterCache {
  public:
   struct Context {
     GrDirectContext* gr_context;
-    const SkColorSpace* dst_color_space;
+    const sk_sp<SkColorSpace> dst_color_space;
     const SkMatrix& matrix;
     const SkRect& logical_rect;
     const char* flow_type;
@@ -128,14 +129,15 @@ class RasterCache {
 
   std::unique_ptr<RasterCacheResult> Rasterize(
       const RasterCache::Context& context,
-      const std::function<void(SkCanvas*)>& draw_function,
-      const std::function<void(SkCanvas*, const SkRect& rect)>&
+      sk_sp<const DlRTree> rtree,
+      const std::function<void(DlCanvas*)>& draw_function,
+      const std::function<void(DlCanvas*, const SkRect& rect)>&
           draw_checkerboard) const;
 
   explicit RasterCache(
       size_t access_threshold = 3,
       size_t picture_and_display_list_cache_limit_per_frame =
-          RasterCacheUtil::kDefaultPictureAndDispLayListCacheLimitPerFrame);
+          RasterCacheUtil::kDefaultPictureAndDisplayListCacheLimitPerFrame);
 
   virtual ~RasterCache() = default;
 
@@ -144,9 +146,15 @@ class RasterCache {
   // if the item was disabled due to conditions discovered during |Preroll|
   // or if the attempt to populate the entry failed due to bounds overflow
   // conditions.
+  // If |preserve_rtree| is true, the raster cache will preserve the original
+  // RTree of cached content by blitting individual rectangles from the cached
+  // image to the canvas according to the original layer R-Tree (if present).
+  // This is to ensure that the target surface R-Tree will not be clobbered with
+  // one large blit as it can affect platform view overlays and hit testing.
   bool Draw(const RasterCacheKeyID& id,
-            SkCanvas& canvas,
-            const SkPaint* paint) const;
+            DlCanvas& canvas,
+            const DlPaint* paint,
+            bool preserve_rtree = false) const;
 
   bool HasEntry(const RasterCacheKeyID& id, const SkMatrix&) const;
 
@@ -172,16 +180,14 @@ class RasterCache {
   size_t GetLayerCachedEntriesCount() const;
 
   /**
-   * Return the number of map entries in the picture caches (SkPicture and
-   * DisplayList) regardless of whether the entries have been populated with
-   * an image.
+   * Return the number of map entries in the picture (DisplayList) cache
+   * regardless of whether the entries have been populated with an image.
    */
   size_t GetPictureCachedEntriesCount() const;
 
   /**
    * @brief Estimate how much memory is used by picture raster cache entries in
-   * bytes, including cache entries in the SkPicture cache and the DisplayList
-   * cache.
+   * bytes.
    *
    * Only SkImage's memory usage is counted as other objects are often much
    * smaller compared to SkImage. SkImageInfo::computeMinByteSize is used to
@@ -235,10 +241,10 @@ class RasterCache {
    */
   int GetAccessCount(const RasterCacheKeyID& id, const SkMatrix& matrix) const;
 
-  bool UpdateCacheEntry(
-      const RasterCacheKeyID& id,
-      const Context& raster_cache_context,
-      const std::function<void(SkCanvas*)>& render_function) const;
+  bool UpdateCacheEntry(const RasterCacheKeyID& id,
+                        const Context& raster_cache_context,
+                        const std::function<void(DlCanvas*)>& render_function,
+                        sk_sp<const DlRTree> rtree = nullptr) const;
 
  private:
   struct Entry {
@@ -258,7 +264,7 @@ class RasterCache {
   RasterCacheMetrics layer_metrics_;
   RasterCacheMetrics picture_metrics_;
   mutable RasterCacheKey::Map<Entry> cache_;
-  bool checkerboard_images_;
+  bool checkerboard_images_ = false;
 
   void TraceStatsToTimeline() const;
 
diff --git a/flow/raster_cache_item.h b/flow/raster_cache_item.h
index 8509775589077695775979b73b06ef8bccfe2586..e88abd3f0730e988da04406aaca15ab62ef4d7d1 100644
--- a/flow/raster_cache_item.h
+++ b/flow/raster_cache_item.h
@@ -7,12 +7,10 @@
 
 #include <memory>
 #include <optional>
+#include <utility>
 
+#include "flutter/display_list/dl_canvas.h"
 #include "flutter/flow/raster_cache_key.h"
-#include "include/core/SkCanvas.h"
-#include "include/core/SkPaint.h"
-#include "include/core/SkPicture.h"
-#include "include/core/SkPoint.h"
 
 namespace flutter {
 
@@ -22,7 +20,6 @@ class DisplayList;
 class RasterCache;
 class LayerRasterCacheItem;
 class DisplayListRasterCacheItem;
-class SkPictureRasterCacheItem;
 
 class RasterCacheItem {
  public:
@@ -35,7 +32,7 @@ class RasterCacheItem {
   explicit RasterCacheItem(RasterCacheKeyID key_id,
                            CacheState cache_state = CacheState::kNone,
                            unsigned child_entries = 0)
-      : key_id_(key_id),
+      : key_id_(std::move(key_id)),
         cache_state_(cache_state),
         child_items_(child_entries) {}
 
@@ -46,11 +43,11 @@ class RasterCacheItem {
                                const SkMatrix& matrix) = 0;
 
   virtual bool Draw(const PaintContext& context,
-                    const SkPaint* paint) const = 0;
+                    const DlPaint* paint) const = 0;
 
   virtual bool Draw(const PaintContext& context,
-                    SkCanvas* canvas,
-                    const SkPaint* paint) const = 0;
+                    DlCanvas* canvas,
+                    const DlPaint* paint) const = 0;
 
   virtual std::optional<RasterCacheKeyID> GetId() const { return key_id_; }
 
diff --git a/flow/raster_cache_unittests.cc b/flow/raster_cache_unittests.cc
index 90d31ef08fd15d50550f37f6ff4b57e01a62d7b3..7f07aacd44bbd543242bba5d2f923eea384106c6 100644
--- a/flow/raster_cache_unittests.cc
+++ b/flow/raster_cache_unittests.cc
@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "flutter/display_list/benchmarking/dl_complexity.h"
 #include "flutter/display_list/display_list.h"
-#include "flutter/display_list/display_list_builder.h"
-#include "flutter/display_list/display_list_test_utils.h"
+#include "flutter/display_list/dl_builder.h"
+#include "flutter/display_list/testing/dl_test_snippets.h"
 #include "flutter/flow/layers/container_layer.h"
 #include "flutter/flow/layers/display_list_layer.h"
 #include "flutter/flow/layers/image_filter_layer.h"
@@ -12,16 +13,15 @@
 #include "flutter/flow/layers/transform_layer.h"
 #include "flutter/flow/raster_cache.h"
 #include "flutter/flow/raster_cache_item.h"
+#include "flutter/flow/testing/layer_test.h"
 #include "flutter/flow/testing/mock_raster_cache.h"
-#include "flutter/flow/testing/skia_gpu_object_layer_test.h"
 #include "flutter/testing/assertions_skia.h"
 #include "gtest/gtest.h"
-#include "include/core/SkMatrix.h"
-#include "include/core/SkPoint.h"
-#include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkPaint.h"
-#include "third_party/skia/include/core/SkPicture.h"
-#include "third_party/skia/include/core/SkPictureRecorder.h"
+#include "third_party/skia/include/core/SkMatrix.h"
+#include "third_party/skia/include/core/SkPoint.h"
+
+// TODO(zanderso): https://github.com/flutter/flutter/issues/127701
+// NOLINTBEGIN(bugprone-unchecked-optional-access)
 
 namespace flutter {
 namespace testing {
@@ -39,8 +39,8 @@ TEST(RasterCache, MetricsOmitUnpopulatedEntries) {
 
   auto display_list = GetSampleDisplayList();
 
-  SkCanvas dummy_canvas(1000, 1000);
-  SkPaint paint;
+  MockCanvas dummy_canvas(1000, 1000);
+  DlPaint paint;
 
   LayerStateStack preroll_state_stack;
   preroll_state_stack.set_preroll_delegate(kGiantRect, matrix);
@@ -57,8 +57,8 @@ TEST(RasterCache, MetricsOmitUnpopulatedEntries) {
   auto& paint_context = paint_context_holder.paint_context;
 
   cache.BeginFrame();
-  DisplayListRasterCacheItem display_list_item(display_list.get(), SkPoint(),
-                                               true, false);
+  DisplayListRasterCacheItem display_list_item(display_list, SkPoint(), true,
+                                               false);
 
   // 1st access.
   ASSERT_FALSE(RasterCacheItemPrerollAndTryToRasterCache(
@@ -87,8 +87,8 @@ TEST(RasterCache, MetricsOmitUnpopulatedEntries) {
 
   cache.EndFrame();
   ASSERT_EQ(cache.picture_metrics().total_count(), 1u);
-  // 150w * 100h * 4bpp
-  ASSERT_EQ(cache.picture_metrics().total_bytes(), 25600u);
+  // 80w * 80h * 4bpp + image object overhead
+  ASSERT_EQ(cache.picture_metrics().total_bytes(), 25624u);
 }
 
 TEST(RasterCache, ThresholdIsRespectedForDisplayList) {
@@ -99,8 +99,8 @@ TEST(RasterCache, ThresholdIsRespectedForDisplayList) {
 
   auto display_list = GetSampleDisplayList();
 
-  SkCanvas dummy_canvas(1000, 1000);
-  SkPaint paint;
+  MockCanvas dummy_canvas(1000, 1000);
+  DlPaint paint;
 
   LayerStateStack preroll_state_stack;
   preroll_state_stack.set_preroll_delegate(kGiantRect, matrix);
@@ -118,8 +118,8 @@ TEST(RasterCache, ThresholdIsRespectedForDisplayList) {
 
   cache.BeginFrame();
 
-  DisplayListRasterCacheItem display_list_item(display_list.get(), SkPoint(),
-                                               true, false);
+  DisplayListRasterCacheItem display_list_item(display_list, SkPoint(), true,
+                                               false);
 
   // 1st access.
   ASSERT_FALSE(RasterCacheItemPrerollAndTryToRasterCache(
@@ -158,9 +158,9 @@ TEST(RasterCache, SetCheckboardCacheImages) {
   PaintContextHolder paint_context_holder = GetSamplePaintContextHolder(
       preroll_state_stack, &cache, &raster_time, &ui_time);
   auto& paint_context = paint_context_holder.paint_context;
-  auto dummy_draw_function = [](SkCanvas* canvas) {};
+  auto dummy_draw_function = [](DlCanvas* canvas) {};
   bool did_draw_checkerboard = false;
-  auto draw_checkerboard = [&](SkCanvas* canvas, const SkRect&) {
+  auto draw_checkerboard = [&](DlCanvas* canvas, const SkRect&) {
     did_draw_checkerboard = true;
   };
   RasterCache::Context r_context = {
@@ -174,47 +174,14 @@ TEST(RasterCache, SetCheckboardCacheImages) {
   };
 
   cache.SetCheckboardCacheImages(false);
-  cache.Rasterize(r_context, dummy_draw_function, draw_checkerboard);
+  cache.Rasterize(r_context, nullptr, dummy_draw_function, draw_checkerboard);
   ASSERT_FALSE(did_draw_checkerboard);
 
   cache.SetCheckboardCacheImages(true);
-  cache.Rasterize(r_context, dummy_draw_function, draw_checkerboard);
+  cache.Rasterize(r_context, nullptr, dummy_draw_function, draw_checkerboard);
   ASSERT_TRUE(did_draw_checkerboard);
 }
 
-TEST(RasterCache, AccessThresholdOfZeroDisablesCachingForSkPicture) {
-  size_t threshold = 0;
-  flutter::RasterCache cache(threshold);
-
-  SkMatrix matrix = SkMatrix::I();
-
-  auto display_list = GetSampleDisplayList();
-
-  SkCanvas dummy_canvas(1000, 1000);
-  SkPaint paint;
-
-  LayerStateStack preroll_state_stack;
-  preroll_state_stack.set_preroll_delegate(kGiantRect, matrix);
-  LayerStateStack paint_state_stack;
-  preroll_state_stack.set_delegate(&dummy_canvas);
-
-  FixedRefreshRateStopwatch raster_time;
-  FixedRefreshRateStopwatch ui_time;
-  PrerollContextHolder preroll_context_holder = GetSamplePrerollContextHolder(
-      preroll_state_stack, &cache, &raster_time, &ui_time);
-  PaintContextHolder paint_context_holder = GetSamplePaintContextHolder(
-      paint_state_stack, &cache, &raster_time, &ui_time);
-  auto& preroll_context = preroll_context_holder.preroll_context;
-  auto& paint_context = paint_context_holder.paint_context;
-
-  cache.BeginFrame();
-  DisplayListRasterCacheItem display_list_item(display_list.get(), SkPoint(),
-                                               true, false);
-  ASSERT_FALSE(RasterCacheItemPrerollAndTryToRasterCache(
-      display_list_item, preroll_context, paint_context, matrix));
-  ASSERT_FALSE(display_list_item.Draw(paint_context, &dummy_canvas, &paint));
-}
-
 TEST(RasterCache, AccessThresholdOfZeroDisablesCachingForDisplayList) {
   size_t threshold = 0;
   flutter::RasterCache cache(threshold);
@@ -223,8 +190,8 @@ TEST(RasterCache, AccessThresholdOfZeroDisablesCachingForDisplayList) {
 
   auto display_list = GetSampleDisplayList();
 
-  SkCanvas dummy_canvas(1000, 1000);
-  SkPaint paint;
+  MockCanvas dummy_canvas(1000, 1000);
+  DlPaint paint;
 
   LayerStateStack preroll_state_stack;
   preroll_state_stack.set_preroll_delegate(kGiantRect, matrix);
@@ -242,48 +209,8 @@ TEST(RasterCache, AccessThresholdOfZeroDisablesCachingForDisplayList) {
 
   cache.BeginFrame();
 
-  DisplayListRasterCacheItem display_list_item(display_list.get(), SkPoint(),
-                                               true, false);
-  ASSERT_FALSE(RasterCacheItemPrerollAndTryToRasterCache(
-      display_list_item, preroll_context, paint_context, matrix));
-  ASSERT_FALSE(display_list_item.Draw(paint_context, &dummy_canvas, &paint));
-}
-
-TEST(RasterCache, PictureCacheLimitPerFrameIsRespectedWhenZeroForSkPicture) {
-  size_t picture_cache_limit_per_frame = 0;
-  flutter::RasterCache cache(3, picture_cache_limit_per_frame);
-
-  SkMatrix matrix = SkMatrix::I();
-
-  auto display_list = GetSampleDisplayList();
-
-  SkCanvas dummy_canvas(1000, 1000);
-  SkPaint paint;
-
-  LayerStateStack preroll_state_stack;
-  preroll_state_stack.set_preroll_delegate(kGiantRect, matrix);
-  LayerStateStack paint_state_stack;
-  preroll_state_stack.set_delegate(&dummy_canvas);
-
-  FixedRefreshRateStopwatch raster_time;
-  FixedRefreshRateStopwatch ui_time;
-  PrerollContextHolder preroll_context_holder = GetSamplePrerollContextHolder(
-      preroll_state_stack, &cache, &raster_time, &ui_time);
-  PaintContextHolder paint_context_holder = GetSamplePaintContextHolder(
-      paint_state_stack, &cache, &raster_time, &ui_time);
-  auto& preroll_context = preroll_context_holder.preroll_context;
-  auto& paint_context = paint_context_holder.paint_context;
-
-  cache.BeginFrame();
-
-  DisplayListRasterCacheItem display_list_item(display_list.get(), SkPoint(),
-                                               true, false);
-  ASSERT_FALSE(RasterCacheItemPrerollAndTryToRasterCache(
-      display_list_item, preroll_context, paint_context, matrix));
-  ASSERT_FALSE(display_list_item.Draw(paint_context, &dummy_canvas, &paint));
-  ASSERT_FALSE(RasterCacheItemPrerollAndTryToRasterCache(
-      display_list_item, preroll_context, paint_context, matrix));
-  ASSERT_FALSE(display_list_item.Draw(paint_context, &dummy_canvas, &paint));
+  DisplayListRasterCacheItem display_list_item(display_list, SkPoint(), true,
+                                               false);
   ASSERT_FALSE(RasterCacheItemPrerollAndTryToRasterCache(
       display_list_item, preroll_context, paint_context, matrix));
   ASSERT_FALSE(display_list_item.Draw(paint_context, &dummy_canvas, &paint));
@@ -297,8 +224,8 @@ TEST(RasterCache, PictureCacheLimitPerFrameIsRespectedWhenZeroForDisplayList) {
 
   auto display_list = GetSampleDisplayList();
 
-  SkCanvas dummy_canvas(1000, 1000);
-  SkPaint paint;
+  MockCanvas dummy_canvas(1000, 1000);
+  DlPaint paint;
 
   LayerStateStack preroll_state_stack;
   preroll_state_stack.set_preroll_delegate(kGiantRect, matrix);
@@ -316,8 +243,8 @@ TEST(RasterCache, PictureCacheLimitPerFrameIsRespectedWhenZeroForDisplayList) {
 
   cache.BeginFrame();
 
-  DisplayListRasterCacheItem display_list_item(display_list.get(), SkPoint(),
-                                               true, false);
+  DisplayListRasterCacheItem display_list_item(display_list, SkPoint(), true,
+                                               false);
   // 1st access.
   ASSERT_FALSE(RasterCacheItemPrerollAndTryToRasterCache(
       display_list_item, preroll_context, paint_context, matrix));
@@ -332,7 +259,7 @@ TEST(RasterCache, PictureCacheLimitPerFrameIsRespectedWhenZeroForDisplayList) {
   ASSERT_FALSE(display_list_item.Draw(paint_context, &dummy_canvas, &paint));
 }
 
-TEST(RasterCache, EvitUnusedCacheEntries) {
+TEST(RasterCache, EvictUnusedCacheEntries) {
   size_t threshold = 1;
   flutter::RasterCache cache(threshold);
 
@@ -341,8 +268,8 @@ TEST(RasterCache, EvitUnusedCacheEntries) {
   auto display_list_1 = GetSampleDisplayList();
   auto display_list_2 = GetSampleDisplayList();
 
-  SkCanvas dummy_canvas(1000, 1000);
-  SkPaint paint;
+  MockCanvas dummy_canvas(1000, 1000);
+  DlPaint paint;
 
   LayerStateStack preroll_state_stack;
   preroll_state_stack.set_preroll_delegate(kGiantRect, matrix);
@@ -358,10 +285,10 @@ TEST(RasterCache, EvitUnusedCacheEntries) {
   auto& preroll_context = preroll_context_holder.preroll_context;
   auto& paint_context = paint_context_holder.paint_context;
 
-  DisplayListRasterCacheItem display_list_item_1(display_list_1.get(),
-                                                 SkPoint(), true, false);
-  DisplayListRasterCacheItem display_list_item_2(display_list_2.get(),
-                                                 SkPoint(), true, false);
+  DisplayListRasterCacheItem display_list_item_1(display_list_1, SkPoint(),
+                                                 true, false);
+  DisplayListRasterCacheItem display_list_item_2(display_list_2, SkPoint(),
+                                                 true, false);
 
   cache.BeginFrame();
   RasterCacheItemPreroll(display_list_item_1, preroll_context, matrix);
@@ -390,28 +317,28 @@ TEST(RasterCache, EvitUnusedCacheEntries) {
       RasterCacheItemTryToRasterCache(display_list_item_1, paint_context));
   ASSERT_TRUE(
       RasterCacheItemTryToRasterCache(display_list_item_2, paint_context));
-  ASSERT_EQ(cache.EstimatePictureCacheByteSize(), 51200u);
+  ASSERT_EQ(cache.EstimatePictureCacheByteSize(), 51248u);
   ASSERT_TRUE(display_list_item_1.Draw(paint_context, &dummy_canvas, &paint));
   ASSERT_TRUE(display_list_item_2.Draw(paint_context, &dummy_canvas, &paint));
   cache.EndFrame();
 
-  ASSERT_EQ(cache.EstimatePictureCacheByteSize(), 51200u);
+  ASSERT_EQ(cache.EstimatePictureCacheByteSize(), 51248u);
   ASSERT_EQ(cache.picture_metrics().total_count(), 2u);
-  ASSERT_EQ(cache.picture_metrics().total_bytes(), 51200u);
+  ASSERT_EQ(cache.picture_metrics().total_bytes(), 51248u);
 
   cache.BeginFrame();
   RasterCacheItemPreroll(display_list_item_1, preroll_context, matrix);
   cache.EvictUnusedCacheEntries();
-  ASSERT_EQ(cache.EstimatePictureCacheByteSize(), 25600u);
+  ASSERT_EQ(cache.EstimatePictureCacheByteSize(), 25624u);
   ASSERT_TRUE(
       RasterCacheItemTryToRasterCache(display_list_item_1, paint_context));
-  ASSERT_EQ(cache.EstimatePictureCacheByteSize(), 25600u);
+  ASSERT_EQ(cache.EstimatePictureCacheByteSize(), 25624u);
   ASSERT_TRUE(display_list_item_1.Draw(paint_context, &dummy_canvas, &paint));
   cache.EndFrame();
 
-  ASSERT_EQ(cache.EstimatePictureCacheByteSize(), 25600u);
+  ASSERT_EQ(cache.EstimatePictureCacheByteSize(), 25624u);
   ASSERT_EQ(cache.picture_metrics().total_count(), 1u);
-  ASSERT_EQ(cache.picture_metrics().total_bytes(), 25600u);
+  ASSERT_EQ(cache.picture_metrics().total_bytes(), 25624u);
 
   cache.BeginFrame();
   cache.EvictUnusedCacheEntries();
@@ -448,15 +375,14 @@ TEST(RasterCache, DeviceRectRoundOutForDisplayList) {
 
   SkRect logical_rect = SkRect::MakeLTRB(28, 0, 354.56731, 310.288);
   DisplayListBuilder builder(logical_rect);
-  builder.setColor(SK_ColorRED);
-  builder.drawRect(logical_rect);
+  builder.DrawRect(logical_rect, DlPaint(DlColor::kRed()));
   sk_sp<DisplayList> display_list = builder.Build();
 
   SkMatrix ctm = SkMatrix::MakeAll(1.3312, 0, 233, 0, 1.3312, 206, 0, 0, 1);
-  SkPaint paint;
+  DlPaint paint;
 
-  SkCanvas canvas(1000, 1000, nullptr);
-  canvas.setMatrix(ctm);
+  MockCanvas canvas(1000, 1000);
+  canvas.SetTransform(ctm);
 
   LayerStateStack preroll_state_stack;
   preroll_state_stack.set_preroll_delegate(kGiantRect, ctm);
@@ -473,8 +399,8 @@ TEST(RasterCache, DeviceRectRoundOutForDisplayList) {
   auto& paint_context = paint_context_holder.paint_context;
 
   cache.BeginFrame();
-  DisplayListRasterCacheItem display_list_item(display_list.get(), SkPoint(),
-                                               true, false);
+  DisplayListRasterCacheItem display_list_item(display_list, SkPoint(), true,
+                                               false);
 
   ASSERT_FALSE(RasterCacheItemPrerollAndTryToRasterCache(
       display_list_item, preroll_context, paint_context, ctm));
@@ -487,7 +413,7 @@ TEST(RasterCache, DeviceRectRoundOutForDisplayList) {
       display_list_item, preroll_context, paint_context, ctm));
   ASSERT_TRUE(display_list_item.Draw(paint_context, &canvas, &paint));
 
-  canvas.translate(248, 0);
+  canvas.Translate(248, 0);
   ASSERT_TRUE(cache.Draw(display_list_item.GetId().value(), canvas, &paint));
   ASSERT_TRUE(display_list_item.Draw(paint_context, &canvas, &paint));
 }
@@ -502,8 +428,8 @@ TEST(RasterCache, NestedOpCountMetricUsedForDisplayList) {
   ASSERT_EQ(display_list->op_count(), 1u);
   ASSERT_EQ(display_list->op_count(true), 36u);
 
-  SkCanvas dummy_canvas(1000, 1000);
-  SkPaint paint;
+  MockCanvas dummy_canvas(1000, 1000);
+  DlPaint paint;
 
   LayerStateStack preroll_state_stack;
   preroll_state_stack.set_preroll_delegate(kGiantRect, matrix);
@@ -521,8 +447,8 @@ TEST(RasterCache, NestedOpCountMetricUsedForDisplayList) {
 
   cache.BeginFrame();
 
-  DisplayListRasterCacheItem display_list_item(display_list.get(), SkPoint(),
-                                               false, false);
+  DisplayListRasterCacheItem display_list_item(display_list, SkPoint(), false,
+                                               false);
 
   ASSERT_FALSE(RasterCacheItemPrerollAndTryToRasterCache(
       display_list_item, preroll_context, paint_context, matrix));
@@ -553,8 +479,8 @@ TEST(RasterCache, NaiveComplexityScoringDisplayList) {
   ASSERT_EQ(display_list->op_count(), 5u);
   ASSERT_FALSE(calculator->ShouldBeCached(complexity_score));
 
-  SkCanvas dummy_canvas(1000, 1000);
-  SkPaint paint;
+  MockCanvas dummy_canvas(1000, 1000);
+  DlPaint paint;
 
   LayerStateStack preroll_state_stack;
   preroll_state_stack.set_preroll_delegate(kGiantRect, matrix);
@@ -572,8 +498,8 @@ TEST(RasterCache, NaiveComplexityScoringDisplayList) {
 
   cache.BeginFrame();
 
-  DisplayListRasterCacheItem display_list_item(display_list.get(), SkPoint(),
-                                               false, false);
+  DisplayListRasterCacheItem display_list_item(display_list, SkPoint(), false,
+                                               false);
 
   ASSERT_FALSE(RasterCacheItemPrerollAndTryToRasterCache(
       display_list_item, preroll_context, paint_context, matrix));
@@ -595,7 +521,7 @@ TEST(RasterCache, NaiveComplexityScoringDisplayList) {
   ASSERT_TRUE(calculator->ShouldBeCached(complexity_score));
 
   DisplayListRasterCacheItem display_list_item_2 =
-      DisplayListRasterCacheItem(display_list.get(), SkPoint(), false, false);
+      DisplayListRasterCacheItem(display_list, SkPoint(), false, false);
   cache.BeginFrame();
 
   ASSERT_FALSE(RasterCacheItemPrerollAndTryToRasterCache(
@@ -623,8 +549,8 @@ TEST(RasterCache, DisplayListWithSingularMatrixIsNotCached) {
 
   auto display_list = GetSampleDisplayList();
 
-  SkCanvas dummy_canvas(1000, 1000);
-  SkPaint paint;
+  MockCanvas dummy_canvas(1000, 1000);
+  DlPaint paint;
 
   LayerStateStack preroll_state_stack;
   preroll_state_stack.set_preroll_delegate(kGiantRect, SkMatrix::I());
@@ -640,8 +566,8 @@ TEST(RasterCache, DisplayListWithSingularMatrixIsNotCached) {
   auto& preroll_context = preroll_context_holder.preroll_context;
   auto& paint_context = paint_context_holder.paint_context;
 
-  DisplayListRasterCacheItem display_list_item(display_list.get(), SkPoint(),
-                                               true, false);
+  DisplayListRasterCacheItem display_list_item(display_list, SkPoint(), true,
+                                               false);
 
   for (int i = 0; i < 10; i++) {
     cache.BeginFrame();
@@ -653,7 +579,7 @@ TEST(RasterCache, DisplayListWithSingularMatrixIsNotCached) {
     }
 
     for (int j = 0; j < matrix_count; j++) {
-      dummy_canvas.setMatrix(matrices[j]);
+      dummy_canvas.SetTransform(matrices[j]);
       ASSERT_FALSE(
           display_list_item.Draw(paint_context, &dummy_canvas, &paint));
     }
@@ -680,7 +606,7 @@ TEST(RasterCache, PrepareLayerTransform) {
 
   size_t threshold = 2;
   MockRasterCache cache(threshold);
-  SkCanvas dummy_canvas(1000, 1000);
+  MockCanvas dummy_canvas(1000, 1000);
 
   LayerStateStack preroll_state_stack;
   preroll_state_stack.set_preroll_delegate(kGiantRect, matrix);
@@ -858,7 +784,7 @@ TEST(RasterCache, RasterCacheKeyIDHashCode) {
   ASSERT_EQ(fourth_hash, fourth.GetHash());
 }
 
-using RasterCacheTest = SkiaGPUObjectLayerTest;
+using RasterCacheTest = LayerTest;
 
 TEST_F(RasterCacheTest, RasterCacheKeyIDLayerChildrenIds) {
   auto layer = std::make_shared<ContainerLayer>();
@@ -869,8 +795,7 @@ TEST_F(RasterCacheTest, RasterCacheKeyIDLayerChildrenIds) {
 
   auto display_list = GetSampleDisplayList();
   auto display_list_layer = std::make_shared<DisplayListLayer>(
-      SkPoint::Make(0.0f, 0.0f),
-      SkiaGPUObject<DisplayList>(display_list, unref_queue()), false, false);
+      SkPoint::Make(0.0f, 0.0f), display_list, false, false);
   layer->Add(display_list_layer);
 
   auto ids = RasterCacheKeyID::LayerChildrenIds(layer.get()).value();
@@ -884,5 +809,283 @@ TEST_F(RasterCacheTest, RasterCacheKeyIDLayerChildrenIds) {
   ASSERT_EQ(ids, expected_ids);
 }
 
+TEST(RasterCacheUtilsTest, SkMatrixIntegralTransCTM) {
+#define EXPECT_EQ_WITH_TRANSLATE(test, expected, expected_tx, expected_ty) \
+  do {                                                                     \
+    EXPECT_EQ(test[SkMatrix::kMScaleX], expected[SkMatrix::kMScaleX]);     \
+    EXPECT_EQ(test[SkMatrix::kMSkewX], expected[SkMatrix::kMSkewX]);       \
+    EXPECT_EQ(test[SkMatrix::kMScaleY], expected[SkMatrix::kMScaleY]);     \
+    EXPECT_EQ(test[SkMatrix::kMSkewY], expected[SkMatrix::kMSkewY]);       \
+    EXPECT_EQ(test[SkMatrix::kMSkewX], expected[SkMatrix::kMSkewX]);       \
+    EXPECT_EQ(test[SkMatrix::kMPersp0], expected[SkMatrix::kMPersp0]);     \
+    EXPECT_EQ(test[SkMatrix::kMPersp1], expected[SkMatrix::kMPersp1]);     \
+    EXPECT_EQ(test[SkMatrix::kMPersp2], expected[SkMatrix::kMPersp2]);     \
+    EXPECT_EQ(test[SkMatrix::kMTransX], expected_tx);                      \
+    EXPECT_EQ(test[SkMatrix::kMTransY], expected_ty);                      \
+  } while (0)
+
+#define EXPECT_NON_INTEGER_TRANSLATION(matrix)                        \
+  EXPECT_TRUE(SkScalarFraction(matrix[SkMatrix::kMTransX]) != 0.0f || \
+              SkScalarFraction(matrix[SkMatrix::kMTransY]) != 0.0f)
+
+  {
+    // Identity
+    SkMatrix matrix = SkMatrix::I();
+    SkMatrix get = RasterCacheUtil::GetIntegralTransCTM(matrix);
+    SkMatrix compute;
+    EXPECT_FALSE(RasterCacheUtil::ComputeIntegralTransCTM(matrix, &compute));
+    EXPECT_EQ(get, matrix);
+  }
+  {
+    // Integer translate
+    SkMatrix matrix = SkMatrix::Translate(10.0f, 12.0f);
+    SkMatrix get = RasterCacheUtil::GetIntegralTransCTM(matrix);
+    SkMatrix compute;
+    EXPECT_FALSE(RasterCacheUtil::ComputeIntegralTransCTM(matrix, &compute));
+    EXPECT_EQ(get, matrix);
+  }
+  {
+    // Fractional x translate
+    SkMatrix matrix = SkMatrix::Translate(10.2f, 12.0f);
+    EXPECT_NON_INTEGER_TRANSLATION(matrix);
+    SkMatrix get = RasterCacheUtil::GetIntegralTransCTM(matrix);
+    SkMatrix compute;
+    EXPECT_TRUE(RasterCacheUtil::ComputeIntegralTransCTM(matrix, &compute));
+    EXPECT_EQ_WITH_TRANSLATE(get, matrix, 10.0f, 12.0f);
+    EXPECT_EQ(get, compute);
+  }
+  {
+    // Fractional y translate
+    SkMatrix matrix = SkMatrix::Translate(10.0f, 12.3f);
+    EXPECT_NON_INTEGER_TRANSLATION(matrix);
+    SkMatrix get = RasterCacheUtil::GetIntegralTransCTM(matrix);
+    SkMatrix compute;
+    EXPECT_TRUE(RasterCacheUtil::ComputeIntegralTransCTM(matrix, &compute));
+    EXPECT_EQ_WITH_TRANSLATE(get, matrix, 10.0f, 12.0f);
+    EXPECT_EQ(get, compute);
+  }
+  {
+    // Fractional x & y translate
+    SkMatrix matrix = SkMatrix::Translate(10.7f, 12.3f);
+    EXPECT_NON_INTEGER_TRANSLATION(matrix);
+    SkMatrix get = RasterCacheUtil::GetIntegralTransCTM(matrix);
+    SkMatrix compute;
+    EXPECT_TRUE(RasterCacheUtil::ComputeIntegralTransCTM(matrix, &compute));
+    EXPECT_EQ_WITH_TRANSLATE(get, matrix, 11.0f, 12.0f);
+    EXPECT_EQ(get, compute);
+  }
+  {
+    // Scale
+    SkMatrix matrix = SkMatrix::Scale(2.0f, 3.0f);
+    SkMatrix get = RasterCacheUtil::GetIntegralTransCTM(matrix);
+    SkMatrix compute;
+    EXPECT_FALSE(RasterCacheUtil::ComputeIntegralTransCTM(matrix, &compute));
+    EXPECT_EQ(get, matrix);
+  }
+  {
+    // Scale, Integer translate
+    SkMatrix matrix = SkMatrix::Scale(2.0f, 3.0f);
+    matrix.preTranslate(10.0f, 12.0f);
+    SkMatrix get = RasterCacheUtil::GetIntegralTransCTM(matrix);
+    SkMatrix compute;
+    EXPECT_FALSE(RasterCacheUtil::ComputeIntegralTransCTM(matrix, &compute));
+    EXPECT_EQ(get, matrix);
+  }
+  {
+    // Scale, Fractional translate
+    SkMatrix matrix = SkMatrix::Scale(2.0f, 3.0f);
+    matrix.preTranslate(10.7f, 12.1f);
+    EXPECT_NON_INTEGER_TRANSLATION(matrix);
+    SkMatrix get = RasterCacheUtil::GetIntegralTransCTM(matrix);
+    SkMatrix compute;
+    EXPECT_TRUE(RasterCacheUtil::ComputeIntegralTransCTM(matrix, &compute));
+    EXPECT_EQ_WITH_TRANSLATE(get, matrix, 21.0f, 36.0f);
+    EXPECT_EQ(get, compute);
+  }
+  {
+    // Skew
+    SkMatrix matrix = SkMatrix::Skew(0.5f, 0.1f);
+    SkMatrix get = RasterCacheUtil::GetIntegralTransCTM(matrix);
+    SkMatrix compute;
+    EXPECT_FALSE(RasterCacheUtil::ComputeIntegralTransCTM(matrix, &compute));
+    EXPECT_EQ(get, matrix);
+  }
+  {
+    // Skew, Fractional translate - should be NOP
+    SkMatrix matrix = SkMatrix::Skew(0.5f, 0.1f);
+    matrix.preTranslate(10.7f, 12.1f);
+    EXPECT_NON_INTEGER_TRANSLATION(matrix);
+    SkMatrix get = RasterCacheUtil::GetIntegralTransCTM(matrix);
+    SkMatrix compute;
+    EXPECT_FALSE(RasterCacheUtil::ComputeIntegralTransCTM(matrix, &compute));
+    EXPECT_EQ(get, matrix);
+  }
+  {
+    // Rotate
+    SkMatrix matrix = SkMatrix::RotateDeg(45);
+    SkMatrix get = RasterCacheUtil::GetIntegralTransCTM(matrix);
+    SkMatrix compute;
+    EXPECT_FALSE(RasterCacheUtil::ComputeIntegralTransCTM(matrix, &compute));
+    EXPECT_EQ(get, matrix);
+  }
+  {
+    // Rotate, Fractional Translate - should be NOP
+    SkMatrix matrix = SkMatrix::RotateDeg(45);
+    matrix.preTranslate(10.7f, 12.1f);
+    EXPECT_NON_INTEGER_TRANSLATION(matrix);
+    SkMatrix get = RasterCacheUtil::GetIntegralTransCTM(matrix);
+    SkMatrix compute;
+    EXPECT_FALSE(RasterCacheUtil::ComputeIntegralTransCTM(matrix, &compute));
+    EXPECT_EQ(get, matrix);
+  }
+  {
+    // Perspective x
+    SkMatrix matrix = SkMatrix::I();
+    matrix.setPerspX(0.1);
+    SkMatrix get = RasterCacheUtil::GetIntegralTransCTM(matrix);
+    SkMatrix compute;
+    EXPECT_FALSE(RasterCacheUtil::ComputeIntegralTransCTM(matrix, &compute));
+    EXPECT_EQ(get, matrix);
+  }
+  {
+    // Perspective x, Fractional Translate - should be NOP
+    SkMatrix matrix = SkMatrix::I();
+    matrix.setPerspX(0.1);
+    matrix.preTranslate(10.7f, 12.1f);
+    EXPECT_NON_INTEGER_TRANSLATION(matrix);
+    SkMatrix get = RasterCacheUtil::GetIntegralTransCTM(matrix);
+    SkMatrix compute;
+    EXPECT_FALSE(RasterCacheUtil::ComputeIntegralTransCTM(matrix, &compute));
+    EXPECT_EQ(get, matrix);
+  }
+  {
+    // Perspective y
+    SkMatrix matrix = SkMatrix::I();
+    matrix.setPerspY(0.1);
+    SkMatrix get = RasterCacheUtil::GetIntegralTransCTM(matrix);
+    SkMatrix compute;
+    EXPECT_FALSE(RasterCacheUtil::ComputeIntegralTransCTM(matrix, &compute));
+    EXPECT_EQ(get, matrix);
+  }
+  {
+    // Perspective y, Fractional Translate - should be NOP
+    SkMatrix matrix = SkMatrix::I();
+    matrix.setPerspY(0.1);
+    matrix.preTranslate(10.7f, 12.1f);
+    EXPECT_NON_INTEGER_TRANSLATION(matrix);
+    SkMatrix get = RasterCacheUtil::GetIntegralTransCTM(matrix);
+    SkMatrix compute;
+    EXPECT_FALSE(RasterCacheUtil::ComputeIntegralTransCTM(matrix, &compute));
+    EXPECT_EQ(get, matrix);
+  }
+  {
+    // Perspective weight
+    // clang-format off
+    SkMatrix matrix = SkMatrix::MakeAll(
+        1.0f, 0.0f, 0.0f,
+        0.0f, 1.0f, 0.0f,
+        0.0f, 0.0f, 0.9f);
+    // clang-format on
+    SkMatrix get = RasterCacheUtil::GetIntegralTransCTM(matrix);
+    SkMatrix compute;
+    EXPECT_FALSE(RasterCacheUtil::ComputeIntegralTransCTM(matrix, &compute));
+    EXPECT_EQ(get, matrix);
+  }
+  {
+    // Perspective weight, Fractional Translate - should be NOP
+    // clang-format off
+    SkMatrix matrix = SkMatrix::MakeAll(
+        1.0f, 0.0f, 0.0f,
+        0.0f, 1.0f, 0.0f,
+        0.0f, 0.0f, 0.9f);
+    // clang-format on
+    matrix.preTranslate(10.7f, 12.1f);
+    EXPECT_NON_INTEGER_TRANSLATION(matrix);
+    SkMatrix get = RasterCacheUtil::GetIntegralTransCTM(matrix);
+    SkMatrix compute;
+    EXPECT_FALSE(RasterCacheUtil::ComputeIntegralTransCTM(matrix, &compute));
+    EXPECT_EQ(get, matrix);
+  }
+#undef EXPECT_NON_INTEGER_TRANSLATION
+#undef EXPECT_EQ_WITH_TRANSLATE
+}
+
+TEST(RasterCacheUtilsTest, SkM44IntegralTransCTM) {
+#define EXPECT_EQ_WITH_TRANSLATE(test, expected, tx, ty, label) \
+  do {                                                          \
+    EXPECT_EQ(test.rc(0, 0), expected.rc(0, 0)) << label;       \
+    EXPECT_EQ(test.rc(0, 1), expected.rc(0, 1)) << label;       \
+    EXPECT_EQ(test.rc(0, 2), expected.rc(0, 2)) << label;       \
+    EXPECT_EQ(test.rc(0, 3), tx) << label;                      \
+    EXPECT_EQ(test.rc(1, 0), expected.rc(1, 0)) << label;       \
+    EXPECT_EQ(test.rc(1, 1), expected.rc(1, 1)) << label;       \
+    EXPECT_EQ(test.rc(1, 2), expected.rc(1, 2)) << label;       \
+    EXPECT_EQ(test.rc(1, 3), ty) << label;                      \
+    EXPECT_EQ(test.rc(2, 0), expected.rc(2, 0)) << label;       \
+    EXPECT_EQ(test.rc(2, 1), expected.rc(2, 1)) << label;       \
+    EXPECT_EQ(test.rc(2, 2), expected.rc(2, 2)) << label;       \
+    EXPECT_EQ(test.rc(2, 3), expected.rc(2, 3)) << label;       \
+    EXPECT_EQ(test.rc(3, 0), expected.rc(3, 0)) << label;       \
+    EXPECT_EQ(test.rc(3, 1), expected.rc(3, 1)) << label;       \
+    EXPECT_EQ(test.rc(3, 2), expected.rc(3, 2)) << label;       \
+    EXPECT_EQ(test.rc(3, 3), expected.rc(3, 3)) << label;       \
+  } while (0)
+
+#define EXPECT_NON_INTEGER_TRANSLATION(matrix)             \
+  EXPECT_TRUE(SkScalarFraction(matrix.rc(0, 3)) != 0.0f || \
+              SkScalarFraction(matrix.rc(1, 3)) != 0.0f)
+
+  for (int r = 0; r < 4; r++) {
+    for (int c = 0; c < 4; c++) {
+      bool snaps;
+      switch (r) {
+        case 0:  // X equation
+          if (c == 3) {
+            continue;  // TranslateX, the value we are testing, skip
+          }
+          snaps = (c == 0);  // X Scale value yes, Skew by Y or Z no
+          break;
+        case 1:  // Y equation
+          if (c == 3) {
+            continue;  // TranslateY, the value we are testing, skip
+          }
+          snaps = (c == 1);  // Y Scale value yes, Skew by X or Z no
+          break;
+        case 2:  // Z equation, ignored, will snap
+          snaps = true;
+          break;
+        case 3:  // W equation, modifications prevent snapping
+          snaps = false;
+          break;
+        default:
+          snaps = false;
+          FML_UNREACHABLE();
+      }
+      auto label = std::to_string(r) + ", " + std::to_string(c);
+      SkM44 matrix = SkM44::Translate(10.7f, 12.1f);
+      EXPECT_NON_INTEGER_TRANSLATION(matrix) << label;
+      matrix.setRC(r, c, 0.5f);
+      if (snaps) {
+        SkM44 compute;
+        SkM44 get = RasterCacheUtil::GetIntegralTransCTM(matrix);
+        EXPECT_TRUE(RasterCacheUtil::ComputeIntegralTransCTM(matrix, &compute))
+            << label;
+        EXPECT_EQ_WITH_TRANSLATE(get, matrix, 11.0f, 12.0f, label);
+        EXPECT_EQ(get, compute) << label;
+      } else {
+        SkM44 compute;
+        SkM44 get = RasterCacheUtil::GetIntegralTransCTM(matrix);
+        EXPECT_FALSE(RasterCacheUtil::ComputeIntegralTransCTM(matrix, &compute))
+            << label;
+        EXPECT_EQ(get, matrix) << label;
+      }
+    }
+  }
+#undef EXPECT_NON_INTEGER_TRANSLATION
+#undef EXPECT_EQ_WITH_TRANSLATE
+}
+
 }  // namespace testing
 }  // namespace flutter
+
+// NOLINTEND(bugprone-unchecked-optional-access)
diff --git a/flow/raster_cache_util.cc b/flow/raster_cache_util.cc
index 25061f29f07b89d343b9790b90de95150fb867b8..8fbd19cb1a2a29ac681c65927fad46e1642c83c6 100644
--- a/flow/raster_cache_util.cc
+++ b/flow/raster_cache_util.cc
@@ -4,4 +4,67 @@
 
 #include "flutter/flow/raster_cache_util.h"
 
-namespace flutter {}
+namespace flutter {
+
+bool RasterCacheUtil::ComputeIntegralTransCTM(const SkMatrix& in,
+                                              SkMatrix* out) {
+  // Avoid integral snapping if the matrix has complex transformation to avoid
+  // the artifact observed in https://github.com/flutter/flutter/issues/41654.
+  if (!in.isScaleTranslate()) {
+    return false;
+  }
+
+  SkScalar in_tx = in.getTranslateX();
+  SkScalar in_ty = in.getTranslateY();
+  SkScalar out_tx = SkScalarRoundToScalar(in_tx);
+  SkScalar out_ty = SkScalarRoundToScalar(in_ty);
+  if (out_tx != in_tx || out_ty != in_ty) {
+    // As a side effect of those tests we also know that neither translation
+    // component was a NaN
+    *out = in;
+    (*out)[SkMatrix::kMTransX] = out_tx;
+    (*out)[SkMatrix::kMTransY] = out_ty;
+    return true;
+  }
+
+  return false;
+}
+
+bool RasterCacheUtil::ComputeIntegralTransCTM(const SkM44& in, SkM44* out) {
+  // Avoid integral snapping if the matrix has complex transformation to avoid
+  // the artifact observed in https://github.com/flutter/flutter/issues/41654.
+  if (in.rc(0, 1) != 0 || in.rc(0, 2) != 0) {
+    // X multiplied by either Y or Z
+    return false;
+  }
+  if (in.rc(1, 0) != 0 || in.rc(1, 2) != 0) {
+    // Y multiplied by either X or Z
+    return false;
+  }
+  if (in.rc(3, 0) != 0 || in.rc(3, 1) != 0 || in.rc(3, 2) != 0 ||
+      in.rc(3, 3) != 1) {
+    // W not identity row, therefore perspective is applied
+    return false;
+  }
+  // We do not need to worry about the Z row unless the W row
+  // has perspective entries, which we've just eliminated...
+
+  SkScalar in_tx = in.rc(0, 3);
+  SkScalar in_ty = in.rc(1, 3);
+  SkScalar out_tx = SkScalarRoundToScalar(in_tx);
+  SkScalar out_ty = SkScalarRoundToScalar(in_ty);
+  if (out_tx != in_tx || out_ty != in_ty) {
+    // As a side effect of those tests we also know that neither translation
+    // component was a NaN
+    *out = in;
+    out->setRC(0, 3, out_tx);
+    out->setRC(1, 3, out_ty);
+    // No need to worry about Z translation because it has no effect
+    // without perspective entries...
+    return true;
+  }
+
+  return false;
+}
+
+}  // namespace flutter
diff --git a/flow/raster_cache_util.h b/flow/raster_cache_util.h
index 18019fc83192fc7d84a7c2f8b7d13b89890753b6..4df70494cb4f5758bac6648dddaba3c1ded5b6c4 100644
--- a/flow/raster_cache_util.h
+++ b/flow/raster_cache_util.h
@@ -17,7 +17,7 @@ struct RasterCacheUtil {
   // generated per frame. Generating too many caches in one frame may cause jank
   // on that frame. This limit allows us to throttle the cache and distribute
   // the work across multiple frames.
-  static constexpr int kDefaultPictureAndDispLayListCacheLimitPerFrame = 3;
+  static constexpr int kDefaultPictureAndDisplayListCacheLimitPerFrame = 3;
 
   // The ImageFilterLayer might cache the filtered output of this layer
   // if the layer remains stable (if it is not animating for instance).
@@ -78,17 +78,29 @@ struct RasterCacheUtil {
    * @return SkMatrix the snapped transformation matrix.
    */
   static SkMatrix GetIntegralTransCTM(const SkMatrix& ctm) {
-    // Avoid integral snapping if the matrix has complex transformation to avoid
-    // the artifact observed in https://github.com/flutter/flutter/issues/41654.
-    if (!ctm.isScaleTranslate()) {
-      return ctm;
-    }
-    SkMatrix result = ctm;
-    result[SkMatrix::kMTransX] = SkScalarRoundToScalar(ctm.getTranslateX());
-    result[SkMatrix::kMTransY] = SkScalarRoundToScalar(ctm.getTranslateY());
-    return result;
+    SkMatrix integral;
+    return ComputeIntegralTransCTM(ctm, &integral) ? integral : ctm;
   }
 
+  /**
+   * @brief Snap the translation components of the |in| matrix to integers
+   *        and store the snapped matrix in |out|.
+   *
+   * The snapping will only happen if the matrix only has scale and translation
+   * transformations. This is used, along with GetRoundedOutDeviceBounds, to
+   * ensure that the textures drawn by the raster cache are exactly aligned to
+   * physical pixels. Any layers that participate in raster caching must align
+   * themselves to physical pixels even when not cached to prevent a change in
+   * apparent location if caching is later applied.
+   *
+   * The |out| matrix will not be modified if this method returns false.
+   *
+   * @param in the current transformation matrix.
+   * @param out the storage for the snapped matrix.
+   * @return true if the integral modification was needed, false otherwise.
+   */
+  static bool ComputeIntegralTransCTM(const SkMatrix& in, SkMatrix* out);
+
   /**
    * @brief Snap the translation components of the matrix to integers.
    *
@@ -103,31 +115,28 @@ struct RasterCacheUtil {
    * @return SkM44 the snapped transformation matrix.
    */
   static SkM44 GetIntegralTransCTM(const SkM44& ctm) {
-    // Avoid integral snapping if the matrix has complex transformation to avoid
-    // the artifact observed in https://github.com/flutter/flutter/issues/41654.
-    if (ctm.rc(0, 1) != 0 || ctm.rc(0, 2) != 0) {
-      // X multiplied by either Y or Z
-      return ctm;
-    }
-    if (ctm.rc(1, 0) != 0 || ctm.rc(1, 2) != 0) {
-      // Y multiplied by either X or Z
-      return ctm;
-    }
-    // We do not need to worry about the Z row unless the W row
-    // has perspective entries...
-    if (ctm.rc(3, 0) != 0 || ctm.rc(3, 1) != 0 || ctm.rc(3, 2) != 0 ||
-        ctm.rc(3, 3) != 1) {
-      // W not identity row, therefore perspective is applied
-      return ctm;
-    }
-
-    SkM44 result = ctm;
-    result.setRC(0, 3, SkScalarRoundToScalar(ctm.rc(0, 3)));
-    result.setRC(1, 3, SkScalarRoundToScalar(ctm.rc(1, 3)));
-    // No need to worry about Z translation because it has no effect
-    // without perspective entries...
-    return result;
+    SkM44 integral;
+    return ComputeIntegralTransCTM(ctm, &integral) ? integral : ctm;
   }
+
+  /**
+   * @brief Snap the translation components of the |in| matrix to integers
+   *        and store the snapped matrix in |out|.
+   *
+   * The snapping will only happen if the matrix only has scale and translation
+   * transformations. This is used, along with GetRoundedOutDeviceBounds, to
+   * ensure that the textures drawn by the raster cache are exactly aligned to
+   * physical pixels. Any layers that participate in raster caching must align
+   * themselves to physical pixels even when not cached to prevent a change in
+   * apparent location if caching is later applied.
+   *
+   * The |out| matrix will not be modified if this method returns false.
+   *
+   * @param in the current transformation matrix.
+   * @param out the storage for the snapped matrix.
+   * @return true if the integral modification was needed, false otherwise.
+   */
+  static bool ComputeIntegralTransCTM(const SkM44& in, SkM44* out);
 };
 
 }  // namespace flutter
diff --git a/flow/skia_gpu_object.h b/flow/skia_gpu_object.h
index 16251ec56f8232ef182a63c3b969b254714d1ca2..0d4cc516c25e44f724f3c8a82c77e908d1c35e5a 100644
--- a/flow/skia_gpu_object.h
+++ b/flow/skia_gpu_object.h
@@ -13,7 +13,9 @@
 #include "flutter/fml/task_runner.h"
 #include "flutter/fml/trace_event.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
+#include "third_party/skia/include/gpu/GrBackendSurface.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
+#include "third_party/skia/include/gpu/GrTypes.h"
 
 namespace flutter {
 
@@ -25,6 +27,10 @@ class UnrefQueue : public fml::RefCountedThreadSafe<UnrefQueue<T>> {
   using ResourceContext = T;
 
   void Unref(SkRefCnt* object) {
+    if (drain_immediate_) {
+      object->unref();
+      return;
+    }
     std::scoped_lock lock(mutex_);
     objects_.push_back(object);
     if (!drain_pending_) {
@@ -34,7 +40,9 @@ class UnrefQueue : public fml::RefCountedThreadSafe<UnrefQueue<T>> {
     }
   }
 
-  void DeleteTexture(GrBackendTexture texture) {
+  void DeleteTexture(const GrBackendTexture& texture) {
+    // drain_immediate_ should only be used on Impeller.
+    FML_DCHECK(!drain_immediate_);
     std::scoped_lock lock(mutex_);
     textures_.push_back(texture);
     if (!drain_pending_) {
@@ -72,19 +80,23 @@ class UnrefQueue : public fml::RefCountedThreadSafe<UnrefQueue<T>> {
   std::mutex mutex_;
   std::deque<SkRefCnt*> objects_;
   std::deque<GrBackendTexture> textures_;
-  bool drain_pending_;
+  bool drain_pending_ = false;
   sk_sp<ResourceContext> context_;
+  // Enabled when there is an impeller context, which removes the usage of
+  // the queue altogether.
+  bool drain_immediate_;
 
   // The `GrDirectContext* context` is only used for signaling Skia to
   // performDeferredCleanup. It can be nullptr when such signaling is not needed
   // (e.g., in unit tests).
   UnrefQueue(fml::RefPtr<fml::TaskRunner> task_runner,
              fml::TimeDelta delay,
-             sk_sp<ResourceContext> context = nullptr)
+             sk_sp<ResourceContext> context = nullptr,
+             bool drain_immediate = false)
       : task_runner_(std::move(task_runner)),
         drain_delay_(delay),
-        drain_pending_(false),
-        context_(context) {}
+        context_(context),
+        drain_immediate_(drain_immediate) {}
 
   ~UnrefQueue() {
     // The ResourceContext must be deleted on the task runner thread.
@@ -109,13 +121,15 @@ class UnrefQueue : public fml::RefCountedThreadSafe<UnrefQueue<T>> {
     }
 
     if (context) {
-      for (GrBackendTexture texture : textures) {
+      for (const GrBackendTexture& texture : textures) {
         context->deleteBackendTexture(texture);
       }
 
       if (!skia_objects.empty()) {
         context->performDeferredCleanup(std::chrono::milliseconds(0));
       }
+
+      context->flushAndSubmit(GrSyncCpu::kYes);
     }
   }
 
diff --git a/flow/skia_gpu_object_unittests.cc b/flow/skia_gpu_object_unittests.cc
index b6b439ffba830b24bef34cf1b6f79fb229cfb9db..ec29e96f57d32e9cfff38a05e1e7213005dfed92 100644
--- a/flow/skia_gpu_object_unittests.cc
+++ b/flow/skia_gpu_object_unittests.cc
@@ -13,6 +13,7 @@
 #include "flutter/testing/thread_test.h"
 #include "gtest/gtest.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
+#include "third_party/skia/include/gpu/GrTypes.h"
 
 namespace flutter {
 namespace testing {
@@ -43,6 +44,7 @@ class TestResourceContext : public TestSkObject {
   ~TestResourceContext() = default;
   void performDeferredCleanup(std::chrono::milliseconds msNotUsed) {}
   void deleteBackendTexture(const GrBackendTexture& texture) {}
+  void flushAndSubmit(GrSyncCpu sync) {}
 };
 
 class SkiaGpuObjectTest : public ThreadTest {
diff --git a/flow/stopwatch.cc b/flow/stopwatch.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ac0e25ca05cfe24781fcddfbbac366b5b689c37e
--- /dev/null
+++ b/flow/stopwatch.cc
@@ -0,0 +1,96 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/flow/stopwatch.h"
+
+namespace flutter {
+
+static const size_t kMaxSamples = 120;
+
+Stopwatch::Stopwatch(const RefreshRateUpdater& updater)
+    : refresh_rate_updater_(updater), start_(fml::TimePoint::Now()) {
+  const fml::TimeDelta delta = fml::TimeDelta::Zero();
+  laps_.resize(kMaxSamples, delta);
+}
+
+Stopwatch::~Stopwatch() = default;
+
+FixedRefreshRateStopwatch::FixedRefreshRateStopwatch(
+    fml::Milliseconds frame_budget)
+    : Stopwatch(fixed_delegate_), fixed_delegate_(frame_budget) {}
+
+FixedRefreshRateUpdater::FixedRefreshRateUpdater(
+    fml::Milliseconds fixed_frame_budget)
+    : fixed_frame_budget_(fixed_frame_budget) {}
+
+void Stopwatch::Start() {
+  start_ = fml::TimePoint::Now();
+  current_sample_ = (current_sample_ + 1) % kMaxSamples;
+}
+
+void Stopwatch::Stop() {
+  laps_[current_sample_] = fml::TimePoint::Now() - start_;
+}
+
+void Stopwatch::SetLapTime(const fml::TimeDelta& delta) {
+  current_sample_ = (current_sample_ + 1) % kMaxSamples;
+  laps_[current_sample_] = delta;
+}
+
+const fml::TimeDelta& Stopwatch::LastLap() const {
+  return laps_[(current_sample_ - 1) % kMaxSamples];
+}
+
+const fml::TimeDelta& Stopwatch::GetLap(size_t index) const {
+  return laps_[index];
+}
+
+size_t Stopwatch::GetLapsCount() const {
+  return laps_.size();
+}
+
+size_t Stopwatch::GetCurrentSample() const {
+  return current_sample_;
+}
+
+double StopwatchVisualizer::UnitFrameInterval(double raster_time_ms) const {
+  return raster_time_ms / frame_budget_.count();
+}
+
+double StopwatchVisualizer::UnitHeight(double raster_time_ms,
+                                       double max_unit_interval) const {
+  double unit_height = UnitFrameInterval(raster_time_ms) / max_unit_interval;
+  if (unit_height > 1.0) {
+    unit_height = 1.0;
+  }
+  return unit_height;
+}
+
+fml::TimeDelta Stopwatch::MaxDelta() const {
+  fml::TimeDelta max_delta;
+  for (size_t i = 0; i < kMaxSamples; i++) {
+    if (laps_[i] > max_delta) {
+      max_delta = laps_[i];
+    }
+  }
+  return max_delta;
+}
+
+fml::TimeDelta Stopwatch::AverageDelta() const {
+  fml::TimeDelta sum;  // default to 0
+  for (size_t i = 0; i < kMaxSamples; i++) {
+    sum = sum + laps_[i];
+  }
+  return sum / kMaxSamples;
+}
+
+fml::Milliseconds Stopwatch::GetFrameBudget() const {
+  return refresh_rate_updater_.GetFrameBudget();
+}
+
+fml::Milliseconds FixedRefreshRateUpdater::GetFrameBudget() const {
+  return fixed_frame_budget_;
+}
+
+}  // namespace flutter
diff --git a/flow/instrumentation.h b/flow/stopwatch.h
similarity index 49%
rename from flow/instrumentation.h
rename to flow/stopwatch.h
index 618197efc7a7f93bcc2a129e5a3694578ec85161..50d731a4e40161fa015ff566536a0f8e2bdc8fed 100644
--- a/flow/instrumentation.h
+++ b/flow/stopwatch.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLOW_INSTRUMENTATION_H_
-#define FLUTTER_FLOW_INSTRUMENTATION_H_
+#ifndef FLUTTER_FLOW_STOPWATCH_H_
+#define FLUTTER_FLOW_STOPWATCH_H_
 
 #include <vector>
 
+#include "flutter/display_list/dl_canvas.h"
 #include "flutter/fml/macros.h"
 #include "flutter/fml/time/time_delta.h"
 #include "flutter/fml/time/time_point.h"
-#include "third_party/skia/include/core/SkCanvas.h"
 
 namespace flutter {
 
@@ -30,16 +30,19 @@ class Stopwatch {
 
   ~Stopwatch();
 
+  const fml::TimeDelta& GetLap(size_t index) const;
+
+  /// Return a reference to all the laps.
+  size_t GetLapsCount() const;
+
+  size_t GetCurrentSample() const;
+
   const fml::TimeDelta& LastLap() const;
 
   fml::TimeDelta MaxDelta() const;
 
   fml::TimeDelta AverageDelta() const;
 
-  void InitVisualizeSurface(const SkRect& rect) const;
-
-  void Visualize(SkCanvas* canvas, const SkRect& rect) const;
-
   void Start();
 
   void Stop();
@@ -50,19 +53,10 @@ class Stopwatch {
   fml::Milliseconds GetFrameBudget() const;
 
  private:
-  inline double UnitFrameInterval(double time_ms) const;
-  inline double UnitHeight(double time_ms, double max_height) const;
-
   const RefreshRateUpdater& refresh_rate_updater_;
   fml::TimePoint start_;
   std::vector<fml::TimeDelta> laps_;
-  size_t current_sample_;
-
-  // Mutable data cache for performance optimization of the graphs. Prevents
-  // expensive redrawing of old data.
-  mutable bool cache_dirty_;
-  mutable sk_sp<SkSurface> visualize_cache_surface_;
-  mutable size_t prev_drawn_sample_index_;
+  size_t current_sample_ = 0;
 
   FML_DISALLOW_COPY_AND_ASSIGN(Stopwatch);
 };
@@ -89,6 +83,46 @@ class FixedRefreshRateStopwatch : public Stopwatch {
   FixedRefreshRateUpdater fixed_delegate_;
 };
 
+//------------------------------------------------------------------------------
+/// @brief        Abstract class for visualizing (i.e. drawing) a stopwatch.
+///
+/// @note         This was originally folded into the |Stopwatch| class, but
+///               was separated out to make it easier to change the underlying
+///               implementation (which relied directly on Skia, not showing on
+///               Impeller: https://github.com/flutter/flutter/issues/126009).
+class StopwatchVisualizer {
+ public:
+  explicit StopwatchVisualizer(const Stopwatch& stopwatch)
+      : stopwatch_(stopwatch) {
+    // Looking up the frame budget from the stopwatch delegate class may call
+    // into JNI or make platform calls which are slow. This value is safe to
+    // cache since the StopwatchVisualizer is recreated on each frame.
+    frame_budget_ = stopwatch_.GetFrameBudget();
+  }
+
+  virtual ~StopwatchVisualizer() = default;
+
+  /// @brief      Renders the stopwatch as a graph.
+  ///
+  /// @param      canvas  The canvas to draw on.
+  /// @param[in]  rect    The rectangle to draw in.
+  virtual void Visualize(DlCanvas* canvas, const SkRect& rect) const = 0;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(StopwatchVisualizer);
+
+ protected:
+  /// @brief      Converts a raster time to a unit interval.
+  double UnitFrameInterval(double time_ms) const;
+
+  /// @brief      Converts a raster time to a unit height.
+  double UnitHeight(double time_ms, double max_height) const;
+
+  fml::Milliseconds GetFrameBudget() const { return frame_budget_; }
+
+  const Stopwatch& stopwatch_;
+  fml::Milliseconds frame_budget_;
+};
+
 }  // namespace flutter
 
-#endif  // FLUTTER_FLOW_INSTRUMENTATION_H_
+#endif  // FLUTTER_FLOW_STOPWATCH_H_
diff --git a/flow/stopwatch_dl.cc b/flow/stopwatch_dl.cc
new file mode 100644
index 0000000000000000000000000000000000000000..9f7fa3f37aef8d38b4ede198d5ba658db5329951
--- /dev/null
+++ b/flow/stopwatch_dl.cc
@@ -0,0 +1,153 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/flow/stopwatch_dl.h"
+#include <memory>
+#include <vector>
+#include "display_list/dl_blend_mode.h"
+#include "display_list/dl_canvas.h"
+#include "display_list/dl_color.h"
+#include "display_list/dl_paint.h"
+#include "display_list/dl_vertices.h"
+#include "include/core/SkRect.h"
+
+namespace flutter {
+
+static const size_t kMaxSamples = 120;
+static const size_t kMaxFrameMarkers = 8;
+
+void DlStopwatchVisualizer::Visualize(DlCanvas* canvas,
+                                      const SkRect& rect) const {
+  auto painter = DlVertexPainter();
+  DlPaint paint;
+
+  // Establish the graph position.
+  auto const x = rect.x();
+  auto const y = rect.y();
+  auto const width = rect.width();
+  auto const height = rect.height();
+  auto const bottom = rect.bottom();
+
+  // Scale the graph to show time frames up to those that are 3x the frame time.
+  auto const one_frame_ms = GetFrameBudget().count();
+  auto const max_interval = one_frame_ms * 3.0;
+  auto const max_unit_interval = UnitFrameInterval(max_interval);
+  auto const sample_unit_width = (1.0 / kMaxSamples);
+
+  // Provide a semi-transparent background for the graph.
+  painter.DrawRect(rect, DlColor(0x99FFFFFF));
+
+  // Prepare a path for the data; we start at the height of the last point so
+  // it looks like we wrap around.
+  {
+    for (auto i = size_t(0); i < stopwatch_.GetLapsCount(); i++) {
+      auto const sample_unit_height =
+          (1.0 - UnitHeight(stopwatch_.GetLap(i).ToMillisecondsF(),
+                            max_unit_interval));
+
+      auto const bar_width = width * sample_unit_width;
+      auto const bar_height = height * sample_unit_height;
+      auto const bar_left = x + width * sample_unit_width * i;
+
+      painter.DrawRect(SkRect::MakeLTRB(/*l=*/bar_left,
+                                        /*t=*/y + bar_height,
+                                        /*r=*/bar_left + bar_width,
+                                        /*b=*/bottom),
+                       DlColor(0xAA0000FF));
+    }
+  }
+
+  // Draw horizontal frame markers.
+  {
+    if (max_interval > one_frame_ms) {
+      // Paint the horizontal markers.
+      auto count = static_cast<size_t>(max_interval / one_frame_ms);
+
+      // Limit the number of markers to a reasonable amount.
+      if (count > kMaxFrameMarkers) {
+        count = 1;
+      }
+
+      for (auto i = size_t(0); i < count; i++) {
+        auto const frame_height =
+            height * (1.0 - (UnitFrameInterval(i + 1) * one_frame_ms) /
+                                max_unit_interval);
+
+        // Draw a skinny rectangle (i.e. a line).
+        painter.DrawRect(SkRect::MakeLTRB(/*l=*/x,
+                                          /*t=*/y + frame_height,
+                                          /*r=*/width,
+                                          /*b=*/y + frame_height + 1),
+                         DlColor(0xCC000000));
+      }
+    }
+  }
+
+  // Paint the vertical marker for the current frame.
+  {
+    DlColor color = DlColor::kGreen();
+    if (UnitFrameInterval(stopwatch_.LastLap().ToMillisecondsF()) > 1.0) {
+      // budget exceeded.
+      color = DlColor::kRed();
+    }
+    auto const l =
+        x + width * (static_cast<double>(stopwatch_.GetCurrentSample()) /
+                     kMaxSamples);
+    auto const t = y;
+    auto const r = l + width * sample_unit_width;
+    auto const b = rect.bottom();
+    painter.DrawRect(SkRect::MakeLTRB(l, t, r, b), color);
+  }
+
+  // Actually draw.
+  // Use kSrcOver blend mode so that elements under the performance overlay are
+  // partially visible.
+  paint.setBlendMode(DlBlendMode::kSrcOver);
+  // The second blend mode does nothing since the paint has no additional color
+  // sources like a tiled image or gradient.
+  canvas->DrawVertices(painter.IntoVertices(), DlBlendMode::kSrcOver, paint);
+}
+
+void DlVertexPainter::DrawRect(const SkRect& rect, const DlColor& color) {
+  // Draw 6 vertices representing 2 triangles.
+  auto const left = rect.x();
+  auto const top = rect.y();
+  auto const right = rect.right();
+  auto const bottom = rect.bottom();
+
+  auto const vertices = std::array<SkPoint, 6>{
+      SkPoint::Make(left, top),      // tl tr
+      SkPoint::Make(right, top),     //    br
+      SkPoint::Make(right, bottom),  //
+      SkPoint::Make(right, bottom),  // tl
+      SkPoint::Make(left, bottom),   // bl br
+      SkPoint::Make(left, top)       //
+  };
+
+  auto const colors = std::array<DlColor, 6>{
+      color,  // tl tr
+      color,  //    br
+      color,  //
+      color,  // tl
+      color,  // bl br
+      color   //
+  };
+
+  vertices_.insert(vertices_.end(), vertices.begin(), vertices.end());
+  colors_.insert(colors_.end(), colors.begin(), colors.end());
+}
+
+std::shared_ptr<DlVertices> DlVertexPainter::IntoVertices() {
+  auto const result = DlVertices::Make(
+      /*mode=*/DlVertexMode::kTriangles,
+      /*vertex_count=*/vertices_.size(),
+      /*vertices=*/vertices_.data(),
+      /*texture_coordinates=*/nullptr,
+      /*colors=*/colors_.data());
+  vertices_.clear();
+  colors_.clear();
+  return result;
+}
+
+}  // namespace flutter
diff --git a/flow/stopwatch_dl.h b/flow/stopwatch_dl.h
new file mode 100644
index 0000000000000000000000000000000000000000..d15dc40b49473de8de98b3a3e7494acaf3e286ad
--- /dev/null
+++ b/flow/stopwatch_dl.h
@@ -0,0 +1,56 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_FLOW_STOPWATCH_DL_H_
+#define FLUTTER_FLOW_STOPWATCH_DL_H_
+
+#include "flow/stopwatch.h"
+
+namespace flutter {
+
+//------------------------------------------------------------------------------
+/// A stopwatch visualizer that uses DisplayList (|DlCanvas|) to draw.
+///
+/// @note This is the newer non-backend specific version, that works in both
+///       Skia and Impeller. The older Skia-specific version is
+///       |SkStopwatchVisualizer|, which still should be used for Skia-specific
+///       optimizations.
+class DlStopwatchVisualizer : public StopwatchVisualizer {
+ public:
+  explicit DlStopwatchVisualizer(const Stopwatch& stopwatch)
+      : StopwatchVisualizer(stopwatch) {}
+
+  void Visualize(DlCanvas* canvas, const SkRect& rect) const override;
+};
+
+/// @brief Provides canvas-like painting methods that actually build vertices.
+///
+/// The goal is minimally invasive rendering for the performance monitor.
+///
+/// The methods in this class are intended to be used by |DlStopwatchVisualizer|
+/// only. The rationale is the creating lines, rectangles, and paths (while OK
+/// for general apps) would cause non-trivial work for the performance monitor
+/// due to tessellation per-frame.
+///
+/// @note A goal of this class was to make updating the performance monitor
+/// (and keeping it in sync with the |SkStopwatchVisualizer|) as easy as
+/// possible (i.e. not having to do triangle-math).
+class DlVertexPainter final {
+ public:
+  /// Draws a rectangle with the given color to a buffer.
+  void DrawRect(const SkRect& rect, const DlColor& color);
+
+  /// Converts the buffered vertices into a |DlVertices| object.
+  ///
+  /// @note This method clears the buffer.
+  std::shared_ptr<DlVertices> IntoVertices();
+
+ private:
+  std::vector<SkPoint> vertices_;
+  std::vector<DlColor> colors_;
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_FLOW_STOPWATCH_DL_H_
diff --git a/flow/stopwatch_dl_unittests.cc b/flow/stopwatch_dl_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..f8d2900f84674f8ffd6796748fb949f07ffd0b69
--- /dev/null
+++ b/flow/stopwatch_dl_unittests.cc
@@ -0,0 +1,73 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/flow/stopwatch_dl.h"
+#include "gtest/gtest.h"
+
+namespace flutter {
+namespace testing {
+
+static SkRect MakeRectFromVertices(SkPoint vertices[6]) {
+  // "Combine" the vertices to form a rectangle.
+  auto const left = std::min(vertices[0].x(), vertices[5].x());
+  auto const top = std::min(vertices[0].y(), vertices[1].y());
+  auto const right = std::max(vertices[1].x(), vertices[2].x());
+  auto const bottom = std::max(vertices[2].y(), vertices[3].y());
+
+  return SkRect::MakeLTRB(left, top, right, bottom);
+}
+
+TEST(DlVertexPainter, DrawRectIntoVertices) {
+  auto painter = DlVertexPainter();
+
+  // Paint a red rectangle.
+  painter.DrawRect(SkRect::MakeLTRB(0, 0, 10, 10), DlColor::kRed());
+
+  // Paint a blue rectangle.
+  painter.DrawRect(SkRect::MakeLTRB(10, 10, 20, 20), DlColor::kBlue());
+
+  // Convert the buffered vertices into a |DlVertices| object.
+  auto vertices = painter.IntoVertices();
+
+  // Verify the vertices.
+  EXPECT_EQ(vertices->mode(), DlVertexMode::kTriangles);
+  EXPECT_EQ(vertices->vertex_count(), 3 * 2 * 2);
+
+  auto const points = vertices->vertices();
+
+  {
+    // Extract the first 6 vertices (first rectangle).
+    SkPoint first_rect_vertices[6];
+    std::copy(points, points + 6, first_rect_vertices);
+    EXPECT_EQ(MakeRectFromVertices(first_rect_vertices),
+              SkRect::MakeLTRB(0, 0, 10, 10));
+  }
+
+  {
+    // Extract the next 6 vertices (second rectangle).
+    SkPoint second_rect_vertices[6];
+    std::copy(points + 6, points + 12, second_rect_vertices);
+    EXPECT_EQ(MakeRectFromVertices(second_rect_vertices),
+              SkRect::MakeLTRB(10, 10, 20, 20));
+  }
+
+  // Verify the colors (first 6 vertices are red, next 6 are blue).
+  auto const colors = vertices->colors();
+  EXPECT_EQ(colors[0], DlColor::kRed());
+  EXPECT_EQ(colors[1], DlColor::kRed());
+  EXPECT_EQ(colors[2], DlColor::kRed());
+  EXPECT_EQ(colors[3], DlColor::kRed());
+  EXPECT_EQ(colors[4], DlColor::kRed());
+  EXPECT_EQ(colors[5], DlColor::kRed());
+
+  EXPECT_EQ(colors[6], DlColor::kBlue());
+  EXPECT_EQ(colors[7], DlColor::kBlue());
+  EXPECT_EQ(colors[8], DlColor::kBlue());
+  EXPECT_EQ(colors[9], DlColor::kBlue());
+  EXPECT_EQ(colors[10], DlColor::kBlue());
+  EXPECT_EQ(colors[11], DlColor::kBlue());
+}
+
+}  // namespace testing
+}  // namespace flutter
diff --git a/flow/instrumentation.cc b/flow/stopwatch_sk.cc
similarity index 55%
rename from flow/instrumentation.cc
rename to flow/stopwatch_sk.cc
index 1c18f7b041f8a6848998c9a29dfabec86c4c3f77..91d5bf94b2a05e73e109a4ded6b6cfd40d51ac8e 100644
--- a/flow/instrumentation.cc
+++ b/flow/stopwatch_sk.cc
@@ -2,94 +2,24 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/flow/instrumentation.h"
-
-#include <algorithm>
-
-#include "third_party/skia/include/core/SkPath.h"
-#include "third_party/skia/include/core/SkSurface.h"
+#include "flutter/flow/stopwatch_sk.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkPath.h"
+#include "include/core/SkSize.h"
+#include "include/core/SkSurface.h"
 
 namespace flutter {
 
 static const size_t kMaxSamples = 120;
 static const size_t kMaxFrameMarkers = 8;
 
-Stopwatch::Stopwatch(const RefreshRateUpdater& updater)
-    : refresh_rate_updater_(updater),
-      start_(fml::TimePoint::Now()),
-      current_sample_(0) {
-  const fml::TimeDelta delta = fml::TimeDelta::Zero();
-  laps_.resize(kMaxSamples, delta);
-  cache_dirty_ = true;
-  prev_drawn_sample_index_ = 0;
-}
-
-Stopwatch::~Stopwatch() = default;
-
-FixedRefreshRateStopwatch::FixedRefreshRateStopwatch(
-    fml::Milliseconds frame_budget)
-    : Stopwatch(fixed_delegate_), fixed_delegate_(frame_budget) {}
-
-FixedRefreshRateUpdater::FixedRefreshRateUpdater(
-    fml::Milliseconds fixed_frame_budget)
-    : fixed_frame_budget_(fixed_frame_budget) {}
-
-void Stopwatch::Start() {
-  start_ = fml::TimePoint::Now();
-  current_sample_ = (current_sample_ + 1) % kMaxSamples;
-}
-
-void Stopwatch::Stop() {
-  laps_[current_sample_] = fml::TimePoint::Now() - start_;
-}
-
-void Stopwatch::SetLapTime(const fml::TimeDelta& delta) {
-  current_sample_ = (current_sample_ + 1) % kMaxSamples;
-  laps_[current_sample_] = delta;
-}
-
-const fml::TimeDelta& Stopwatch::LastLap() const {
-  return laps_[(current_sample_ - 1) % kMaxSamples];
-}
-
-double Stopwatch::UnitFrameInterval(double raster_time_ms) const {
-  return raster_time_ms / GetFrameBudget().count();
-}
-
-double Stopwatch::UnitHeight(double raster_time_ms,
-                             double max_unit_interval) const {
-  double unit_height = UnitFrameInterval(raster_time_ms) / max_unit_interval;
-  if (unit_height > 1.0) {
-    unit_height = 1.0;
-  }
-  return unit_height;
-}
-
-fml::TimeDelta Stopwatch::MaxDelta() const {
-  fml::TimeDelta max_delta;
-  for (size_t i = 0; i < kMaxSamples; i++) {
-    if (laps_[i] > max_delta) {
-      max_delta = laps_[i];
-    }
-  }
-  return max_delta;
-}
-
-fml::TimeDelta Stopwatch::AverageDelta() const {
-  fml::TimeDelta sum;  // default to 0
-  for (size_t i = 0; i < kMaxSamples; i++) {
-    sum = sum + laps_[i];
-  }
-  return sum / kMaxSamples;
-}
-
-// Initialize the SkSurface for drawing into. Draws the base background and any
-// timing data from before the initial Visualize() call.
-void Stopwatch::InitVisualizeSurface(const SkRect& rect) const {
+void SkStopwatchVisualizer::InitVisualizeSurface(SkISize size) const {
   // Mark as dirty if the size has changed.
   if (visualize_cache_surface_) {
-    if (rect.width() != visualize_cache_surface_->width() ||
-        rect.height() != visualize_cache_surface_->height()) {
+    if (size.width() != visualize_cache_surface_->width() ||
+        size.height() != visualize_cache_surface_->height()) {
       cache_dirty_ = true;
     };
   }
@@ -101,15 +31,15 @@ void Stopwatch::InitVisualizeSurface(const SkRect& rect) const {
 
   // TODO(garyq): Use a GPU surface instead of a CPU surface.
   visualize_cache_surface_ =
-      SkSurface::MakeRasterN32Premul(rect.width(), rect.height());
+      SkSurfaces::Raster(SkImageInfo::MakeN32Premul(size));
 
   SkCanvas* cache_canvas = visualize_cache_surface_->getCanvas();
 
   // Establish the graph position.
   const SkScalar x = 0;
   const SkScalar y = 0;
-  const SkScalar width = rect.width();
-  const SkScalar height = rect.height();
+  const SkScalar width = size.width();
+  const SkScalar height = size.height();
 
   SkPaint paint;
   paint.setColor(0x99FFFFFF);
@@ -127,23 +57,26 @@ void Stopwatch::InitVisualizeSurface(const SkRect& rect) const {
   SkPath path;
   path.setIsVolatile(true);
   path.moveTo(x, height);
-  path.lineTo(x, y + height * (1.0 - UnitHeight(laps_[0].ToMillisecondsF(),
-                                                max_unit_interval)));
+  path.lineTo(
+      x, y + height * (1.0 - UnitHeight(stopwatch_.GetLap(0).ToMillisecondsF(),
+                                        max_unit_interval)));
   double unit_x;
   double unit_next_x = 0.0;
   for (size_t i = 0; i < kMaxSamples; i += 1) {
     unit_x = unit_next_x;
     unit_next_x = (static_cast<double>(i + 1) / kMaxSamples);
     const double sample_y =
-        y + height * (1.0 - UnitHeight(laps_[i].ToMillisecondsF(),
+        y + height * (1.0 - UnitHeight(stopwatch_.GetLap(i).ToMillisecondsF(),
                                        max_unit_interval));
     path.lineTo(x + width * unit_x, sample_y);
     path.lineTo(x + width * unit_next_x, sample_y);
   }
   path.lineTo(
       width,
-      y + height * (1.0 - UnitHeight(laps_[kMaxSamples - 1].ToMillisecondsF(),
-                                     max_unit_interval)));
+      y + height *
+              (1.0 -
+               UnitHeight(stopwatch_.GetLap(kMaxSamples - 1).ToMillisecondsF(),
+                          max_unit_interval)));
   path.lineTo(width, height);
   path.close();
 
@@ -152,9 +85,10 @@ void Stopwatch::InitVisualizeSurface(const SkRect& rect) const {
   cache_canvas->drawPath(path, paint);
 }
 
-void Stopwatch::Visualize(SkCanvas* canvas, const SkRect& rect) const {
+void SkStopwatchVisualizer::Visualize(DlCanvas* canvas,
+                                      const SkRect& rect) const {
   // Initialize visualize cache if it has not yet been initialized.
-  InitVisualizeSurface(rect);
+  InitVisualizeSurface(SkISize::Make(rect.width(), rect.height()));
 
   SkCanvas* cache_canvas = visualize_cache_surface_->getCanvas();
   SkPaint paint;
@@ -162,8 +96,8 @@ void Stopwatch::Visualize(SkCanvas* canvas, const SkRect& rect) const {
   // Establish the graph position.
   const SkScalar x = 0;
   const SkScalar y = 0;
-  const SkScalar width = rect.width();
-  const SkScalar height = rect.height();
+  const SkScalar width = visualize_cache_surface_->width();
+  const SkScalar height = visualize_cache_surface_->height();
 
   // Scale the graph to show frame times up to those that are 3 times the frame
   // time.
@@ -188,11 +122,14 @@ void Stopwatch::Visualize(SkCanvas* canvas, const SkRect& rect) const {
   paint.setBlendMode(SkBlendMode::kSrcOver);
   const auto bar_rect = SkRect::MakeLTRB(
       sample_x,
-      y + height * (1.0 -
-                    UnitHeight(laps_[current_sample_ == 0 ? kMaxSamples - 1
-                                                          : current_sample_ - 1]
-                                   .ToMillisecondsF(),
-                               max_unit_interval)),
+      y + height *
+              (1.0 -
+               UnitHeight(stopwatch_
+                              .GetLap(stopwatch_.GetCurrentSample() == 0
+                                          ? kMaxSamples - 1
+                                          : stopwatch_.GetCurrentSample() - 1)
+                              .ToMillisecondsF(),
+                          max_unit_interval)),
       sample_x + width * sample_unit_width, height);
   cache_canvas->drawRect(bar_rect, paint);
 
@@ -227,29 +164,24 @@ void Stopwatch::Visualize(SkCanvas* canvas, const SkRect& rect) const {
   // paint this we don't yet have all the times for the current frame.
   paint.setStyle(SkPaint::Style::kFill_Style);
   paint.setBlendMode(SkBlendMode::kSrcOver);
-  if (UnitFrameInterval(LastLap().ToMillisecondsF()) > 1.0) {
+  if (UnitFrameInterval(stopwatch_.LastLap().ToMillisecondsF()) > 1.0) {
     // budget exceeded
     paint.setColor(SK_ColorRED);
   } else {
     // within budget
     paint.setColor(SK_ColorGREEN);
   }
-  sample_x = x + width * (static_cast<double>(current_sample_) / kMaxSamples);
+  sample_x = x + width * (static_cast<double>(stopwatch_.GetCurrentSample()) /
+                          kMaxSamples);
   const auto marker_rect = SkRect::MakeLTRB(
       sample_x, y, sample_x + width * sample_unit_width, height);
   cache_canvas->drawRect(marker_rect, paint);
-  prev_drawn_sample_index_ = current_sample_;
+  prev_drawn_sample_index_ = stopwatch_.GetCurrentSample();
 
   // Draw the cached surface onto the output canvas.
-  visualize_cache_surface_->draw(canvas, rect.x(), rect.y());
-}
-
-fml::Milliseconds Stopwatch::GetFrameBudget() const {
-  return refresh_rate_updater_.GetFrameBudget();
-}
-
-fml::Milliseconds FixedRefreshRateUpdater::GetFrameBudget() const {
-  return fixed_frame_budget_;
+  auto image = DlImage::Make(visualize_cache_surface_->makeImageSnapshot());
+  canvas->DrawImage(image, {rect.x(), rect.y()},
+                    DlImageSampling::kNearestNeighbor);
 }
 
 }  // namespace flutter
diff --git a/flow/stopwatch_sk.h b/flow/stopwatch_sk.h
new file mode 100644
index 0000000000000000000000000000000000000000..c1dfb24307d33e12fe9aca1244e0c125a484c803
--- /dev/null
+++ b/flow/stopwatch_sk.h
@@ -0,0 +1,40 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_FLOW_STOPWATCH_SK_H_
+#define FLUTTER_FLOW_STOPWATCH_SK_H_
+
+#include "flow/stopwatch.h"
+#include "include/core/SkSurface.h"
+
+namespace flutter {
+
+//------------------------------------------------------------------------------
+/// A stopwatch visualizer that uses Skia (|SkCanvas|) to draw the stopwatch.
+///
+/// @see DlStopwatchVisualizer for the newer non-backend specific version.
+class SkStopwatchVisualizer : public StopwatchVisualizer {
+ public:
+  explicit SkStopwatchVisualizer(const Stopwatch& stopwatch)
+      : StopwatchVisualizer(stopwatch) {}
+
+  void Visualize(DlCanvas* canvas, const SkRect& rect) const override;
+
+ private:
+  /// Initializes the |SkSurface| used for drawing the stopwatch.
+  ///
+  /// Draws the base background and any timing data from before the initial
+  /// call to |Visualize|.
+  void InitVisualizeSurface(SkISize size) const;
+
+  // Mutable data cache for performance optimization of the graphs.
+  // Prevents expensive redrawing of old data.
+  mutable bool cache_dirty_ = true;
+  mutable sk_sp<SkSurface> visualize_cache_surface_;
+  mutable size_t prev_drawn_sample_index_ = 0;
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_FLOW_STOPWATCH_SK_H_
diff --git a/flow/instrumentation_unittests.cc b/flow/stopwatch_unittests.cc
similarity index 49%
rename from flow/instrumentation_unittests.cc
rename to flow/stopwatch_unittests.cc
index 77f684752e153fb94efbca35ff92662c0feeb26c..c8fae3e0479078aa72950e90a1a8cac71b5380fd 100644
--- a/flow/instrumentation_unittests.cc
+++ b/flow/stopwatch_unittests.cc
@@ -2,8 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/flow/instrumentation.h"
-#include "gmock/gmock.h"
+#include "flutter/flow/stopwatch.h"
+#include "fml/time/time_delta.h"
+#include "gmock/gmock.h"  // IWYU pragma: keep
 #include "gtest/gtest.h"
 
 using testing::Return;
@@ -11,9 +12,14 @@ using testing::Return;
 namespace flutter {
 namespace testing {
 
-class MockRefreshRateUpdater : public Stopwatch::RefreshRateUpdater {
+class FakeRefreshRateUpdater : public Stopwatch::RefreshRateUpdater {
  public:
-  MOCK_CONST_METHOD0(GetFrameBudget, fml::Milliseconds());
+  fml::Milliseconds GetFrameBudget() const override { return budget_; }
+
+  void SetFrameBudget(fml::Milliseconds budget) { budget_ = budget; }
+
+ private:
+  fml::Milliseconds budget_;
 };
 
 TEST(Instrumentation, GetDefaultFrameBudgetTest) {
@@ -32,15 +38,36 @@ TEST(Instrumentation, GetOneShotFrameBudgetTest) {
 }
 
 TEST(Instrumentation, GetFrameBudgetFromUpdaterTest) {
-  MockRefreshRateUpdater updater;
+  FakeRefreshRateUpdater updater;
   fml::Milliseconds frame_budget_90fps = fml::RefreshRateToFrameBudget(90);
-  EXPECT_CALL(updater, GetFrameBudget())
-      .Times(1)
-      .WillOnce(Return(frame_budget_90fps));
+  updater.SetFrameBudget(frame_budget_90fps);
+
   Stopwatch stopwatch(updater);
   fml::Milliseconds actual_frame_budget = stopwatch.GetFrameBudget();
   EXPECT_EQ(frame_budget_90fps, actual_frame_budget);
 }
 
+TEST(Instrumentation, GetLapByIndexTest) {
+  fml::Milliseconds frame_budget_90fps = fml::RefreshRateToFrameBudget(90);
+  FixedRefreshRateStopwatch stopwatch(frame_budget_90fps);
+  stopwatch.SetLapTime(fml::TimeDelta::FromMilliseconds(10));
+  EXPECT_EQ(stopwatch.GetLap(1), fml::TimeDelta::FromMilliseconds(10));
+}
+
+TEST(Instrumentation, GetCurrentSampleTest) {
+  fml::Milliseconds frame_budget_90fps = fml::RefreshRateToFrameBudget(90);
+  FixedRefreshRateStopwatch stopwatch(frame_budget_90fps);
+  stopwatch.Start();
+  stopwatch.Stop();
+  EXPECT_EQ(stopwatch.GetCurrentSample(), size_t(1));
+}
+
+TEST(Instrumentation, GetLapsCount) {
+  fml::Milliseconds frame_budget_90fps = fml::RefreshRateToFrameBudget(90);
+  FixedRefreshRateStopwatch stopwatch(frame_budget_90fps);
+  stopwatch.SetLapTime(fml::TimeDelta::FromMilliseconds(10));
+  EXPECT_EQ(stopwatch.GetLapsCount(), size_t(120));
+}
+
 }  // namespace testing
 }  // namespace flutter
diff --git a/flow/surface.cc b/flow/surface.cc
index 61d1fc87d1281784e50b5d094cb8fb7e4bc69b51..795d74780d8fc1f1791c9a203f06fb4d052cd644 100644
--- a/flow/surface.cc
+++ b/flow/surface.cc
@@ -26,8 +26,12 @@ bool Surface::EnableRasterCache() const {
   return true;
 }
 
-impeller::AiksContext* Surface::GetAiksContext() const {
+std::shared_ptr<impeller::AiksContext> Surface::GetAiksContext() const {
   return nullptr;
 }
 
+Surface::SurfaceData Surface::GetSurfaceData() const {
+  return {};
+}
+
 }  // namespace flutter
diff --git a/flow/surface.h b/flow/surface.h
index 8db5d1f90b233672128992fddefa210c3d27e2a9..f824e0eb9bd8ea38e7f0ea2aa4f18ea40636e9d6 100644
--- a/flow/surface.h
+++ b/flow/surface.h
@@ -12,6 +12,8 @@
 #include "flutter/flow/surface_frame.h"
 #include "flutter/fml/macros.h"
 
+class GrDirectContext;
+
 namespace impeller {
 class AiksContext;
 }  // namespace impeller
@@ -21,6 +23,12 @@ namespace flutter {
 /// Abstract Base Class that represents where we will be rendering content.
 class Surface {
  public:
+  /// A screenshot of the surface's raw data.
+  struct SurfaceData {
+    std::string pixel_format;
+    sk_sp<SkData> data;
+  };
+
   Surface();
 
   virtual ~Surface();
@@ -41,7 +49,13 @@ class Surface {
 
   virtual bool EnableRasterCache() const;
 
-  virtual impeller::AiksContext* GetAiksContext() const;
+  virtual std::shared_ptr<impeller::AiksContext> GetAiksContext() const;
+
+  /// Capture the `SurfaceData` currently present in the surface.
+  ///
+  /// Not guaranteed to work on all setups and not intended to be used in
+  /// production. The data field will be null if it was unable to work.
+  virtual SurfaceData GetSurfaceData() const;
 
  private:
   FML_DISALLOW_COPY_AND_ASSIGN(Surface);
diff --git a/flow/surface_frame.cc b/flow/surface_frame.cc
index f9b162f8f98e964f4bea2d1562c71a3991683208..7f7e8a8da8773bad9dd2dd486162e651af79dbe6 100644
--- a/flow/surface_frame.cc
+++ b/flow/surface_frame.cc
@@ -9,6 +9,8 @@
 
 #include "flutter/fml/logging.h"
 #include "flutter/fml/trace_event.h"
+
+#include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/utils/SkNWayCanvas.h"
 
 namespace flutter {
@@ -25,12 +27,18 @@ SurfaceFrame::SurfaceFrame(sk_sp<SkSurface> surface,
       context_result_(std::move(context_result)) {
   FML_DCHECK(submit_callback_);
   if (surface_) {
-    canvas_ = surface_->getCanvas();
+    adapter_.set_canvas(surface_->getCanvas());
+    canvas_ = &adapter_;
   } else if (display_list_fallback) {
     FML_DCHECK(!frame_size.isEmpty());
-    dl_recorder_ =
-        sk_make_sp<DisplayListCanvasRecorder>(SkRect::Make(frame_size));
-    canvas_ = dl_recorder_.get();
+    // The root frame of a surface will be filled by the layer_tree which
+    // performs branch culling so it will be unlikely to need an rtree for
+    // further culling during `DisplayList::Dispatch`. Further, this canvas
+    // will live underneath any platform views so we do not need to compute
+    // exact coverage to describe "pixel ownership" to the platform.
+    dl_builder_ = sk_make_sp<DisplayListBuilder>(SkRect::Make(frame_size),
+                                                 /*prepare_rtree=*/false);
+    canvas_ = dl_builder_.get();
   }
 }
 
@@ -49,7 +57,7 @@ bool SurfaceFrame::IsSubmitted() const {
   return submitted_;
 }
 
-SkCanvas* SurfaceFrame::SkiaCanvas() {
+DlCanvas* SurfaceFrame::Canvas() {
   return canvas_;
 }
 
@@ -62,20 +70,16 @@ bool SurfaceFrame::PerformSubmit() {
     return false;
   }
 
-  if (submit_callback_(*this, SkiaCanvas())) {
+  if (submit_callback_(*this, Canvas())) {
     return true;
   }
 
   return false;
 }
 
-sk_sp<DisplayListBuilder> SurfaceFrame::GetDisplayListBuilder() {
-  return dl_recorder_ ? dl_recorder_->builder() : nullptr;
-}
-
 sk_sp<DisplayList> SurfaceFrame::BuildDisplayList() {
   TRACE_EVENT0("impeller", "SurfaceFrame::BuildDisplayList");
-  return dl_recorder_ ? dl_recorder_->Build() : nullptr;
+  return dl_builder_ ? dl_builder_->Build() : nullptr;
 }
 
 }  // namespace flutter
diff --git a/flow/surface_frame.h b/flow/surface_frame.h
index f97281ac9281c7670186e7d0b0892a0554c996b8..1abf75e5732236d379a75c6f230c87d7a1eb53d1 100644
--- a/flow/surface_frame.h
+++ b/flow/surface_frame.h
@@ -9,9 +9,11 @@
 #include <optional>
 
 #include "flutter/common/graphics/gl_context_switch.h"
-#include "flutter/display_list/display_list_canvas_recorder.h"
+#include "flutter/display_list/dl_builder.h"
+#include "flutter/display_list/skia/dl_sk_canvas.h"
 #include "flutter/fml/macros.h"
 #include "flutter/fml/time/time_point.h"
+
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkSurface.h"
 
@@ -22,7 +24,7 @@ namespace flutter {
 class SurfaceFrame {
  public:
   using SubmitCallback =
-      std::function<bool(SurfaceFrame& surface_frame, SkCanvas* canvas)>;
+      std::function<bool(SurfaceFrame& surface_frame, DlCanvas* canvas)>;
 
   // Information about the underlying framebuffer
   struct FramebufferInfo {
@@ -86,7 +88,7 @@ class SurfaceFrame {
 
   sk_sp<SkSurface> SkiaSurface() const;
 
-  SkCanvas* SkiaCanvas();
+  DlCanvas* Canvas();
 
   const FramebufferInfo& framebuffer_info() const { return framebuffer_info_; }
 
@@ -95,16 +97,15 @@ class SurfaceFrame {
   }
   const SubmitInfo& submit_info() const { return submit_info_; }
 
-  sk_sp<DisplayListBuilder> GetDisplayListBuilder();
-
   sk_sp<DisplayList> BuildDisplayList();
 
  private:
   bool submitted_ = false;
 
-  sk_sp<DisplayListCanvasRecorder> dl_recorder_;
+  DlSkCanvasAdapter adapter_;
+  sk_sp<DisplayListBuilder> dl_builder_;
   sk_sp<SkSurface> surface_;
-  SkCanvas* canvas_ = nullptr;
+  DlCanvas* canvas_ = nullptr;
   FramebufferInfo framebuffer_info_;
   SubmitInfo submit_info_;
   SubmitCallback submit_callback_;
diff --git a/flow/surface_frame_unittests.cc b/flow/surface_frame_unittests.cc
index c025c662bceaf4a5098ab226221da6dc8e356d45..81516ad266ddaf28fcd08c86c1e497438a2b94dd 100644
--- a/flow/surface_frame_unittests.cc
+++ b/flow/surface_frame_unittests.cc
@@ -11,28 +11,45 @@ namespace flutter {
 
 TEST(FlowTest, SurfaceFrameDoesNotSubmitInDtor) {
   SurfaceFrame::FramebufferInfo framebuffer_info;
+  auto callback = [](const SurfaceFrame&, DlCanvas*) {
+    EXPECT_FALSE(true);
+    return true;
+  };
   auto surface_frame = std::make_unique<SurfaceFrame>(
-      /*surface=*/nullptr, framebuffer_info,
-      /*submit_callback=*/
-      [](const SurfaceFrame&, SkCanvas*) {
-        EXPECT_FALSE(true);
-        return true;
-      },
-      SkISize::Make(800, 600));
+      /*surface=*/nullptr,
+      /*framebuffer_info=*/framebuffer_info,
+      /*submit_callback=*/callback,
+      /*frame_size=*/SkISize::Make(800, 600));
   surface_frame.reset();
 }
 
 TEST(FlowTest, SurfaceFrameDoesNotHaveEmptyCanvas) {
   SurfaceFrame::FramebufferInfo framebuffer_info;
+  auto callback = [](const SurfaceFrame&, DlCanvas*) { return true; };
   SurfaceFrame frame(
-      /*surface=*/nullptr, framebuffer_info,
-      /*submit_callback=*/[](const SurfaceFrame&, SkCanvas*) { return true; },
+      /*surface=*/nullptr,
+      /*framebuffer_info=*/framebuffer_info,
+      /*submit_callback=*/callback,
       /*frame_size=*/SkISize::Make(800, 600),
-      /*context_result=*/nullptr, /*display_list_fallback=*/true);
+      /*context_result=*/nullptr,
+      /*display_list_fallback=*/true);
 
-  EXPECT_FALSE(frame.SkiaCanvas()->getLocalClipBounds().isEmpty());
-  EXPECT_FALSE(
-      frame.SkiaCanvas()->quickReject(SkRect::MakeLTRB(10, 10, 50, 50)));
+  EXPECT_FALSE(frame.Canvas()->GetLocalClipBounds().isEmpty());
+  EXPECT_FALSE(frame.Canvas()->QuickReject(SkRect::MakeLTRB(10, 10, 50, 50)));
+}
+
+TEST(FlowTest, SurfaceFrameDoesNotPrepareRtree) {
+  SurfaceFrame::FramebufferInfo framebuffer_info;
+  auto callback = [](const SurfaceFrame&, DlCanvas*) { return true; };
+  auto surface_frame = std::make_unique<SurfaceFrame>(
+      /*surface=*/nullptr,
+      /*framebuffer_info=*/framebuffer_info,
+      /*submit_callback=*/callback,
+      /*frame_size=*/SkISize::Make(800, 600),
+      /*context_result=*/nullptr,
+      /*display_list_fallback=*/true);
+  surface_frame->Canvas()->DrawRect(SkRect::MakeWH(100, 100), DlPaint());
+  EXPECT_FALSE(surface_frame->BuildDisplayList()->has_rtree());
 }
 
 }  // namespace flutter
diff --git a/flow/testing/diff_context_test.cc b/flow/testing/diff_context_test.cc
index 888923af483ca63b18eb5da7aa311aa3348eced6..26b2a67f28d094f8b4fdf08bd8f8ed8a41d0b2ae 100644
--- a/flow/testing/diff_context_test.cc
+++ b/flow/testing/diff_context_test.cc
@@ -5,26 +5,25 @@
 #include "diff_context_test.h"
 
 #include <utility>
-#include "flutter/display_list/display_list_builder.h"
+#include "flutter/display_list/dl_builder.h"
 
 namespace flutter {
 namespace testing {
 
-DiffContextTest::DiffContextTest()
-    : unref_queue_(fml::MakeRefCounted<SkiaUnrefQueue>(
-          GetCurrentTaskRunner(),
-          fml::TimeDelta::FromSeconds(0))) {}
+DiffContextTest::DiffContextTest() {}
 
 Damage DiffContextTest::DiffLayerTree(MockLayerTree& layer_tree,
                                       const MockLayerTree& old_layer_tree,
                                       const SkIRect& additional_damage,
                                       int horizontal_clip_alignment,
                                       int vertical_clip_alignment,
-                                      bool use_raster_cache) {
+                                      bool use_raster_cache,
+                                      bool impeller_enabled) {
   FML_CHECK(layer_tree.size() == old_layer_tree.size());
 
-  DiffContext dc(layer_tree.size(), 1, layer_tree.paint_region_map(),
-                 old_layer_tree.paint_region_map(), use_raster_cache);
+  DiffContext dc(layer_tree.size(), layer_tree.paint_region_map(),
+                 old_layer_tree.paint_region_map(), use_raster_cache,
+                 impeller_enabled);
   dc.PushCullRect(
       SkRect::MakeIWH(layer_tree.size().width(), layer_tree.size().height()));
   layer_tree.root()->Diff(&dc, old_layer_tree.root());
@@ -33,19 +32,16 @@ Damage DiffContextTest::DiffLayerTree(MockLayerTree& layer_tree,
 }
 
 sk_sp<DisplayList> DiffContextTest::CreateDisplayList(const SkRect& bounds,
-                                                      SkColor color) {
+                                                      DlColor color) {
   DisplayListBuilder builder;
-  builder.setColor(color);
-  builder.drawRect(bounds);
+  builder.DrawRect(bounds, DlPaint().setColor(color));
   return builder.Build();
 }
 
 std::shared_ptr<DisplayListLayer> DiffContextTest::CreateDisplayListLayer(
-    sk_sp<DisplayList> display_list,
+    const sk_sp<DisplayList>& display_list,
     const SkPoint& offset) {
-  return std::make_shared<DisplayListLayer>(
-      offset, SkiaGPUObject(std::move(display_list), unref_queue()), false,
-      false);
+  return std::make_shared<DisplayListLayer>(offset, display_list, false, false);
 }
 
 std::shared_ptr<ContainerLayer> DiffContextTest::CreateContainerLayer(
diff --git a/flow/testing/diff_context_test.h b/flow/testing/diff_context_test.h
index 0401b3232028ddc9cf75431d28eb1ad31f24964d..d626be1523910b5076bbe7c0119b2255846a22ba 100644
--- a/flow/testing/diff_context_test.h
+++ b/flow/testing/diff_context_test.h
@@ -2,12 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_FLOW_TESTING_DIFF_CONTEXT_TEST_H_
+#define FLUTTER_FLOW_TESTING_DIFF_CONTEXT_TEST_H_
+
+#include <utility>
+
 #include "flutter/flow/layers/container_layer.h"
 #include "flutter/flow/layers/display_list_layer.h"
 #include "flutter/flow/layers/opacity_layer.h"
-#include "flutter/flow/testing/skia_gpu_object_layer_test.h"
-#include "third_party/skia/include/core/SkPicture.h"
-#include "third_party/skia/include/core/SkPictureRecorder.h"
+#include "flutter/flow/testing/layer_test.h"
 
 namespace flutter {
 namespace testing {
@@ -31,7 +34,7 @@ class MockLayerTree {
   SkISize size_;
 };
 
-class DiffContextTest : public ThreadTest {
+class DiffContextTest : public LayerTest {
  public:
   DiffContextTest();
 
@@ -40,14 +43,16 @@ class DiffContextTest : public ThreadTest {
                        const SkIRect& additional_damage = SkIRect::MakeEmpty(),
                        int horizontal_clip_alignment = 0,
                        int vertical_alignment = 0,
-                       bool use_raster_cache = true);
+                       bool use_raster_cache = true,
+                       bool impeller_enabled = false);
 
   // Create display list consisting of filled rect with given color; Being able
   // to specify different color is useful to test deep comparison of pictures
-  sk_sp<DisplayList> CreateDisplayList(const SkRect& bounds, uint32_t color);
+  sk_sp<DisplayList> CreateDisplayList(const SkRect& bounds,
+                                       DlColor color = DlColor::kBlack());
 
   std::shared_ptr<DisplayListLayer> CreateDisplayListLayer(
-      sk_sp<DisplayList> display_list,
+      const sk_sp<DisplayList>& display_list,
       const SkPoint& offset = SkPoint::Make(0, 0));
 
   std::shared_ptr<ContainerLayer> CreateContainerLayer(
@@ -55,19 +60,16 @@ class DiffContextTest : public ThreadTest {
 
   std::shared_ptr<ContainerLayer> CreateContainerLayer(
       std::shared_ptr<Layer> l) {
-    return CreateContainerLayer({l});
+    return CreateContainerLayer({std::move(l)});
   }
 
   std::shared_ptr<OpacityLayer> CreateOpacityLater(
       std::initializer_list<std::shared_ptr<Layer>> layers,
       SkAlpha alpha,
       const SkPoint& offset = SkPoint::Make(0, 0));
-
-  fml::RefPtr<SkiaUnrefQueue> unref_queue() { return unref_queue_; }
-
- private:
-  fml::RefPtr<SkiaUnrefQueue> unref_queue_;
 };
 
 }  // namespace testing
 }  // namespace flutter
+
+#endif  // FLUTTER_FLOW_TESTING_DIFF_CONTEXT_TEST_H_
diff --git a/flow/testing/gl_context_switch_test.cc b/flow/testing/gl_context_switch_test.cc
index d049d0c6e432c6291e3b8f8d73dc6f8b7d8902ed..8a98ae882e23ca0ea79adef06d648251e4c23455 100644
--- a/flow/testing/gl_context_switch_test.cc
+++ b/flow/testing/gl_context_switch_test.cc
@@ -4,12 +4,10 @@
 
 #include "gl_context_switch_test.h"
 
-#include "flutter/fml/thread_local.h"
-
 namespace flutter {
 namespace testing {
 
-FML_THREAD_LOCAL fml::ThreadLocalUniquePtr<int> current_context;
+static thread_local std::unique_ptr<int> current_context;
 
 TestSwitchableGLContext::TestSwitchableGLContext(int context)
     : context_(context){};
diff --git a/flow/testing/gl_context_switch_test.h b/flow/testing/gl_context_switch_test.h
index a2d182d86f7144364a4692d21711fed00d229307..0f933d2bf9f80fb5cac399f775a647cb61c693cf 100644
--- a/flow/testing/gl_context_switch_test.h
+++ b/flow/testing/gl_context_switch_test.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_RENDERER_CONTEXT_TEST_H_
-#define FLUTTER_SHELL_RENDERER_CONTEXT_TEST_H_
+#ifndef FLUTTER_FLOW_TESTING_GL_CONTEXT_SWITCH_TEST_H_
+#define FLUTTER_FLOW_TESTING_GL_CONTEXT_SWITCH_TEST_H_
 
 #include "flutter/common/graphics/gl_context_switch.h"
 #include "gtest/gtest.h"
@@ -42,4 +42,4 @@ class TestSwitchableGLContext : public SwitchableGLContext {
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_RENDERER_CONTEXT_TEST_H_
+#endif  // FLUTTER_FLOW_TESTING_GL_CONTEXT_SWITCH_TEST_H_
diff --git a/flow/testing/layer_test.h b/flow/testing/layer_test.h
index 16de7afcbdf4481d2f7cc600842d4596d51cd504..00b08fdc56c0a6f41356afdff0879a12a172e67f 100644
--- a/flow/testing/layer_test.h
+++ b/flow/testing/layer_test.h
@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLOW_TESTING_LAYER_TEST_H_
-#define FLOW_TESTING_LAYER_TEST_H_
+#ifndef FLUTTER_FLOW_TESTING_LAYER_TEST_H_
+#define FLUTTER_FLOW_TESTING_LAYER_TEST_H_
 
+#include "display_list/dl_color.h"
 #include "flutter/flow/layer_snapshot_store.h"
 #include "flutter/flow/layers/layer.h"
 
@@ -12,7 +13,6 @@
 #include <utility>
 #include <vector>
 
-#include "flutter/display_list/display_list_builder_multiplexer.h"
 #include "flutter/flow/testing/mock_raster_cache.h"
 #include "flutter/fml/macros.h"
 #include "flutter/testing/canvas_test.h"
@@ -41,7 +41,7 @@ template <typename BaseT>
 class LayerTestBase : public CanvasTestBase<BaseT> {
   using TestT = CanvasTestBase<BaseT>;
 
-  const SkRect kDlBounds = SkRect::MakeWH(500, 500);
+  const SkRect k_dl_bounds_ = SkRect::MakeWH(500, 500);
 
  public:
   LayerTestBase()
@@ -57,7 +57,6 @@ class LayerTestBase : public CanvasTestBase<BaseT> {
             .raster_time                   = raster_time_,
             .ui_time                       = ui_time_,
             .texture_registry              = texture_registry_,
-            .frame_device_pixel_ratio      = 1.0f,
             .has_platform_view             = false,
             .raster_cached_entries         = &cacheable_items_,
             // clang-format on
@@ -72,44 +71,40 @@ class LayerTestBase : public CanvasTestBase<BaseT> {
             .ui_time                       = ui_time_,
             .texture_registry              = texture_registry_,
             .raster_cache                  = nullptr,
-            .frame_device_pixel_ratio      = 1.0f,
             // clang-format on
         },
-        display_list_recorder_(kDlBounds),
+        display_list_builder_(k_dl_bounds_),
         display_list_paint_context_{
             // clang-format off
             .state_stack                   = display_list_state_stack_,
-            .canvas                        = &display_list_recorder_,
-            .builder                       = display_list_recorder_.builder().get(),
+            .canvas                        = &display_list_builder_,
             .gr_context                    = nullptr,
             .view_embedder                 = nullptr,
             .raster_time                   = raster_time_,
             .ui_time                       = ui_time_,
             .texture_registry              = texture_registry_,
             .raster_cache                  = nullptr,
-            .frame_device_pixel_ratio      = 1.0f,
             // clang-format on
         },
         checkerboard_context_{
             // clang-format off
             .state_stack                   = checkerboard_state_stack_,
-            .canvas                        = &TestT::mock_canvas(),
+            .canvas                        = &display_list_builder_,
             .gr_context                    = nullptr,
             .view_embedder                 = nullptr,
             .raster_time                   = raster_time_,
             .ui_time                       = ui_time_,
             .texture_registry              = texture_registry_,
             .raster_cache                  = nullptr,
-            .frame_device_pixel_ratio      = 1.0f,
             // clang-format on
         } {
     use_null_raster_cache();
     preroll_state_stack_.set_preroll_delegate(kGiantRect, SkMatrix::I());
     paint_state_stack_.set_delegate(&TestT::mock_canvas());
-    display_list_state_stack_.set_delegate(display_list_recorder_);
-    checkerboard_state_stack_.set_delegate(&TestT::mock_canvas());
+    display_list_state_stack_.set_delegate(&display_list_builder_);
+    checkerboard_state_stack_.set_delegate(&display_list_builder_);
     checkerboard_state_stack_.set_checkerboard_func(draw_checkerboard);
-    checkerboard_paint_.setColor(checkerboard_color_);
+    checkerboard_paint_.setColor(kCheckerboardColor);
   }
 
   /**
@@ -172,22 +167,25 @@ class LayerTestBase : public CanvasTestBase<BaseT> {
   PaintContext& display_list_paint_context() {
     return display_list_paint_context_;
   }
-  const SkPaint& checkerboard_paint() { return checkerboard_paint_; }
+  const DlPaint& checkerboard_paint() { return checkerboard_paint_; }
   PaintContext& checkerboard_context() { return checkerboard_context_; }
   LayerSnapshotStore& layer_snapshot_store() { return snapshot_store_; }
 
   sk_sp<DisplayList> display_list() {
     if (display_list_ == nullptr) {
-      // null out the canvas and recorder fields of the PaintContext
-      // and the delegate of the state_stack to prevent future use.
-      display_list_paint_context_.state_stack.clear_delegate();
-      display_list_paint_context_.canvas = nullptr;
-      display_list_paint_context_.builder = nullptr;
-      display_list_ = display_list_recorder_.Build();
+      display_list_ = display_list_builder_.Build();
     }
     return display_list_;
   }
 
+  void reset_display_list() {
+    display_list_ = nullptr;
+    // Build() will leave the builder in a state to start recording a new DL
+    display_list_builder_.Build();
+    // Make sure we are starting from a fresh state stack
+    FML_DCHECK(display_list_state_stack_.is_empty());
+  }
+
   void enable_leaf_layer_tracing() {
     paint_context_.enable_leaf_layer_tracing = true;
     paint_context_.layer_snapshot_store = &snapshot_store_;
@@ -206,20 +204,13 @@ class LayerTestBase : public CanvasTestBase<BaseT> {
     display_list_paint_context_.raster_cache = raster_cache_.get();
   }
 
-  static constexpr SkColor checkerboard_color_ = 0x42424242;
+  static constexpr DlColor kCheckerboardColor = DlColor(0x42424242);
 
-  static void draw_checkerboard(SkCanvas* canvas,
-                                DisplayListBuilder* builder,
-                                const SkRect& rect) {
+  static void draw_checkerboard(DlCanvas* canvas, const SkRect& rect) {
     if (canvas) {
-      SkPaint paint;
-      paint.setColor(checkerboard_color_);
-      canvas->drawRect(rect, paint);
-    }
-    if (builder) {
       DlPaint paint;
-      paint.setColor(checkerboard_color_);
-      builder->drawRect(rect, paint);
+      paint.setColor(kCheckerboardColor);
+      canvas->DrawRect(rect, paint);
     }
   }
 
@@ -233,11 +224,11 @@ class LayerTestBase : public CanvasTestBase<BaseT> {
   std::unique_ptr<RasterCache> raster_cache_;
   PrerollContext preroll_context_;
   PaintContext paint_context_;
-  DisplayListCanvasRecorder display_list_recorder_;
+  DisplayListBuilder display_list_builder_;
   LayerStateStack display_list_state_stack_;
   sk_sp<DisplayList> display_list_;
   PaintContext display_list_paint_context_;
-  SkPaint checkerboard_paint_;
+  DlPaint checkerboard_paint_;
   PaintContext checkerboard_context_;
   LayerSnapshotStore snapshot_store_;
 
@@ -250,4 +241,4 @@ using LayerTest = LayerTestBase<::testing::Test>;
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // FLOW_TESTING_LAYER_TEST_H_
+#endif  // FLUTTER_FLOW_TESTING_LAYER_TEST_H_
diff --git a/flow/testing/mock_embedder.cc b/flow/testing/mock_embedder.cc
index efd3c12824d5b4fde3c3a4633d18694dc1040135..2e74d2691602d8e2509defdac0dc89bb243fdceb 100644
--- a/flow/testing/mock_embedder.cc
+++ b/flow/testing/mock_embedder.cc
@@ -11,17 +11,12 @@ MockViewEmbedder::MockViewEmbedder() = default;
 
 MockViewEmbedder::~MockViewEmbedder() = default;
 
-void MockViewEmbedder::AddCanvas(SkCanvas* canvas) {
-  contexts_.emplace_back(EmbedderPaintContext{canvas, nullptr});
-}
-
-void MockViewEmbedder::AddRecorder(DisplayListCanvasRecorder* recorder) {
-  contexts_.emplace_back(
-      EmbedderPaintContext{recorder, recorder->builder().get()});
+void MockViewEmbedder::AddCanvas(DlCanvas* canvas) {
+  contexts_.emplace_back(canvas);
 }
 
 // |ExternalViewEmbedder|
-SkCanvas* MockViewEmbedder::GetRootCanvas() {
+DlCanvas* MockViewEmbedder::GetRootCanvas() {
   return nullptr;
 }
 
@@ -30,34 +25,26 @@ void MockViewEmbedder::CancelFrame() {}
 
 // |ExternalViewEmbedder|
 void MockViewEmbedder::BeginFrame(
-    SkISize frame_size,
     GrDirectContext* context,
-    double device_pixel_ratio,
-    fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {}
+    const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {}
+
+// |ExternalViewEmbedder|
+void MockViewEmbedder::PrepareFlutterView(SkISize frame_size,
+                                          double device_pixel_ratio) {}
 
 // |ExternalViewEmbedder|
 void MockViewEmbedder::PrerollCompositeEmbeddedView(
-    int view_id,
+    int64_t view_id,
     std::unique_ptr<EmbeddedViewParams> params) {
   prerolled_views_.emplace_back(view_id);
 }
 
 // |ExternalViewEmbedder|
-std::vector<SkCanvas*> MockViewEmbedder::GetCurrentCanvases() {
-  return std::vector<SkCanvas*>({});
-}
-
-// |ExternalViewEmbedder|
-std::vector<DisplayListBuilder*> MockViewEmbedder::GetCurrentBuilders() {
-  return std::vector<DisplayListBuilder*>({});
-}
-
-// |ExternalViewEmbedder|
-EmbedderPaintContext MockViewEmbedder::CompositeEmbeddedView(int view_id) {
+DlCanvas* MockViewEmbedder::CompositeEmbeddedView(int64_t view_id) {
   painted_views_.emplace_back(view_id);
-  EmbedderPaintContext context = contexts_.front();
+  DlCanvas* canvas = contexts_.front();
   contexts_.pop_front();
-  return context;
+  return canvas;
 }
 
 }  // namespace testing
diff --git a/flow/testing/mock_embedder.h b/flow/testing/mock_embedder.h
index 8a82c3341c71a2e81f0c5dc019570abba1f76c84..1812083fd8960abb133aca6e8c245ec5c91ff056 100644
--- a/flow/testing/mock_embedder.h
+++ b/flow/testing/mock_embedder.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLOW_TESTING_MOCK_EMBEDDER_H_
-#define FLOW_TESTING_MOCK_EMBEDDER_H_
+#ifndef FLUTTER_FLOW_TESTING_MOCK_EMBEDDER_H_
+#define FLUTTER_FLOW_TESTING_MOCK_EMBEDDER_H_
 
 #include "flutter/flow/embedded_views.h"
 
@@ -16,41 +16,36 @@ class MockViewEmbedder : public ExternalViewEmbedder {
 
   ~MockViewEmbedder();
 
-  void AddCanvas(SkCanvas* canvas);
-  void AddRecorder(DisplayListCanvasRecorder* recorder);
+  void AddCanvas(DlCanvas* canvas);
 
   // |ExternalViewEmbedder|
-  SkCanvas* GetRootCanvas() override;
+  DlCanvas* GetRootCanvas() override;
 
   // |ExternalViewEmbedder|
   void CancelFrame() override;
 
   // |ExternalViewEmbedder|
-  void BeginFrame(
-      SkISize frame_size,
-      GrDirectContext* context,
-      double device_pixel_ratio,
-      fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) override;
+  void BeginFrame(GrDirectContext* context,
+                  const fml::RefPtr<fml::RasterThreadMerger>&
+                      raster_thread_merger) override;
 
   // |ExternalViewEmbedder|
-  void PrerollCompositeEmbeddedView(
-      int view_id,
-      std::unique_ptr<EmbeddedViewParams> params) override;
-
-  // |ExternalViewEmbedder|
-  std::vector<SkCanvas*> GetCurrentCanvases() override;
+  void PrepareFlutterView(SkISize frame_size,
+                          double device_pixel_ratio) override;
 
   // |ExternalViewEmbedder|
-  std::vector<DisplayListBuilder*> GetCurrentBuilders() override;
+  void PrerollCompositeEmbeddedView(
+      int64_t view_id,
+      std::unique_ptr<EmbeddedViewParams> params) override;
 
   // |ExternalViewEmbedder|
-  EmbedderPaintContext CompositeEmbeddedView(int view_id) override;
+  DlCanvas* CompositeEmbeddedView(int64_t view_id) override;
 
   std::vector<int64_t> prerolled_views() const { return prerolled_views_; }
   std::vector<int64_t> painted_views() const { return painted_views_; }
 
  private:
-  std::deque<EmbedderPaintContext> contexts_;
+  std::deque<DlCanvas*> contexts_;
   std::vector<int64_t> prerolled_views_;
   std::vector<int64_t> painted_views_;
 };
@@ -58,4 +53,4 @@ class MockViewEmbedder : public ExternalViewEmbedder {
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // FLOW_TESTING_MOCK_EMBEDDER_H_
+#endif  // FLUTTER_FLOW_TESTING_MOCK_EMBEDDER_H_
diff --git a/flow/testing/mock_layer.cc b/flow/testing/mock_layer.cc
index be09af1627e66fa875d19baf51062060b536d7e9..4f0453c3835788781dd3e9a1b89fe58ad6195d00 100644
--- a/flow/testing/mock_layer.cc
+++ b/flow/testing/mock_layer.cc
@@ -12,7 +12,7 @@
 namespace flutter {
 namespace testing {
 
-MockLayer::MockLayer(const SkPath& path, SkPaint paint)
+MockLayer::MockLayer(const SkPath& path, DlPaint paint)
     : fake_paint_path_(path), fake_paint_(std::move(paint)) {}
 
 bool MockLayer::IsReplacing(DiffContext* context, const Layer* layer) const {
@@ -53,15 +53,14 @@ void MockLayer::Paint(PaintContext& context) const {
   FML_DCHECK(needs_painting(context));
 
   if (expected_paint_matrix_.has_value()) {
-    SkMatrix matrix = context.builder ? context.builder->getTransform()
-                                      : context.canvas->getTotalMatrix();
+    SkMatrix matrix = context.canvas->GetTransform();
 
     EXPECT_EQ(matrix, expected_paint_matrix_.value());
   }
 
-  SkPaint sk_paint = fake_paint_;
-  context.state_stack.fill(sk_paint);
-  context.canvas->drawPath(fake_paint_path_, sk_paint);
+  DlPaint paint = fake_paint_;
+  context.state_stack.fill(paint);
+  context.canvas->DrawPath(fake_paint_path_, paint);
 }
 
 void MockCacheableContainerLayer::Preroll(PrerollContext* context) {
diff --git a/flow/testing/mock_layer.h b/flow/testing/mock_layer.h
index 804e8379422182af3a5ebea90c6272708b990a1f..953a8860bda4339a0ea993ef876d1944a958f0f5 100644
--- a/flow/testing/mock_layer.h
+++ b/flow/testing/mock_layer.h
@@ -2,11 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLOW_TESTING_MOCK_LAYER_H_
-#define FLOW_TESTING_MOCK_LAYER_H_
+#ifndef FLUTTER_FLOW_TESTING_MOCK_LAYER_H_
+#define FLUTTER_FLOW_TESTING_MOCK_LAYER_H_
 
 #include <functional>
 #include <memory>
+#include <utility>
 #include "flutter/flow/diff_context.h"
 #include "flutter/flow/layers/cacheable_layer.h"
 #include "flutter/flow/layers/container_layer.h"
@@ -24,15 +25,15 @@ namespace testing {
 // verify the data against expected values.
 class MockLayer : public Layer {
  public:
-  explicit MockLayer(const SkPath& path, SkPaint paint = SkPaint());
+  explicit MockLayer(const SkPath& path, DlPaint paint = DlPaint());
 
-  static std::shared_ptr<MockLayer> Make(SkPath path,
-                                         SkPaint paint = SkPaint()) {
-    return std::make_shared<MockLayer>(path, paint);
+  static std::shared_ptr<MockLayer> Make(const SkPath& path,
+                                         DlPaint paint = DlPaint()) {
+    return std::make_shared<MockLayer>(path, std::move(paint));
   }
 
-  static std::shared_ptr<MockLayer> MakeOpacityCompatible(SkPath path) {
-    auto mock_layer = std::make_shared<MockLayer>(path, SkPaint());
+  static std::shared_ptr<MockLayer> MakeOpacityCompatible(const SkPath& path) {
+    auto mock_layer = std::make_shared<MockLayer>(path, DlPaint());
     mock_layer->set_fake_opacity_compatible(true);
     return mock_layer;
   }
@@ -111,7 +112,7 @@ class MockLayer : public Layer {
   SkMatrix parent_matrix_;
   SkRect parent_cull_rect_ = SkRect::MakeEmpty();
   SkPath fake_paint_path_;
-  SkPaint fake_paint_;
+  DlPaint fake_paint_;
   std::optional<SkMatrix> expected_paint_matrix_;
 
   static constexpr int kParentHasPlatformView = 1 << 0;
@@ -152,10 +153,10 @@ class MockLayerCacheableItem : public LayerRasterCacheItem {
 };
 class MockCacheableLayer : public MockLayer {
  public:
-  explicit MockCacheableLayer(SkPath path,
-                              SkPaint paint = SkPaint(),
+  explicit MockCacheableLayer(const SkPath& path,
+                              DlPaint paint = DlPaint(),
                               int render_limit = 3)
-      : MockLayer(path, paint) {
+      : MockLayer(path, std::move(paint)) {
     raster_cache_item_ =
         std::make_unique<MockLayerCacheableItem>(this, render_limit);
   }
@@ -173,4 +174,4 @@ class MockCacheableLayer : public MockLayer {
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // FLOW_TESTING_MOCK_LAYER_H_
+#endif  // FLUTTER_FLOW_TESTING_MOCK_LAYER_H_
diff --git a/flow/testing/mock_layer_unittests.cc b/flow/testing/mock_layer_unittests.cc
index bc70271102001e3e110c62e7a3993915d04f50e5..125bcb1c83c91d2fb60362a6ea1c7d03c79386c3 100644
--- a/flow/testing/mock_layer_unittests.cc
+++ b/flow/testing/mock_layer_unittests.cc
@@ -16,14 +16,14 @@ using MockLayerTest = LayerTest;
 #ifndef NDEBUG
 TEST_F(MockLayerTest, PaintBeforePrerollDies) {
   SkPath path = SkPath().addRect(5.0f, 6.0f, 20.5f, 21.5f);
-  auto layer = std::make_shared<MockLayer>(path, SkPaint());
+  auto layer = std::make_shared<MockLayer>(path, DlPaint());
 
   EXPECT_DEATH_IF_SUPPORTED(layer->Paint(paint_context()),
                             "needs_painting\\(context\\)");
 }
 
 TEST_F(MockLayerTest, PaintingEmptyLayerDies) {
-  auto layer = std::make_shared<MockLayer>(SkPath(), SkPaint());
+  auto layer = std::make_shared<MockLayer>(SkPath(), DlPaint());
 
   layer->Preroll(preroll_context());
   EXPECT_EQ(layer->paint_bounds(), SkPath().getBounds());
@@ -35,7 +35,7 @@ TEST_F(MockLayerTest, PaintingEmptyLayerDies) {
 
 TEST_F(MockLayerTest, SimpleParams) {
   const SkPath path = SkPath().addRect(5.0f, 6.0f, 20.5f, 21.5f);
-  const SkPaint paint = SkPaint(SkColors::kBlue);
+  const DlPaint paint = DlPaint(DlColor::kBlue());
   const SkMatrix start_matrix = SkMatrix::Translate(1.0f, 2.0f);
   const SkMatrix scale_matrix = SkMatrix::Scale(0.5f, 0.5f);
   const SkMatrix combined_matrix = SkMatrix::Concat(start_matrix, scale_matrix);
@@ -65,7 +65,7 @@ TEST_F(MockLayerTest, SimpleParams) {
 }
 
 TEST_F(MockLayerTest, FakePlatformView) {
-  auto layer = std::make_shared<MockLayer>(SkPath(), SkPaint());
+  auto layer = std::make_shared<MockLayer>(SkPath(), DlPaint());
   layer->set_fake_has_platform_view(true);
   EXPECT_EQ(preroll_context()->has_platform_view, false);
 
@@ -74,7 +74,7 @@ TEST_F(MockLayerTest, FakePlatformView) {
 }
 
 TEST_F(MockLayerTest, SaveLayerOnLeafNodesCanvas) {
-  auto layer = std::make_shared<MockLayer>(SkPath(), SkPaint());
+  auto layer = std::make_shared<MockLayer>(SkPath(), DlPaint());
   layer->set_fake_has_platform_view(true);
   EXPECT_EQ(preroll_context()->has_platform_view, false);
 
diff --git a/flow/testing/mock_raster_cache.cc b/flow/testing/mock_raster_cache.cc
index ca8cb71ccf0898c479c889601ba3648b7580650a..aa99f25434a3b2e92926439c650eb2ea812043aa 100644
--- a/flow/testing/mock_raster_cache.cc
+++ b/flow/testing/mock_raster_cache.cc
@@ -8,10 +8,7 @@
 #include "flutter/flow/layers/layer.h"
 #include "flutter/flow/raster_cache.h"
 #include "flutter/flow/raster_cache_item.h"
-#include "include/core/SkCanvas.h"
 #include "include/core/SkMatrix.h"
-#include "include/core/SkPoint.h"
-#include "third_party/skia/include/core/SkPictureRecorder.h"
 
 namespace flutter {
 namespace testing {
@@ -26,7 +23,7 @@ void MockRasterCache::AddMockLayer(int width, int height) {
   path.addRect(100, 100, 100 + width, 100 + height);
   int layer_cached_threshold = 1;
   MockCacheableLayer layer =
-      MockCacheableLayer(path, SkPaint(), layer_cached_threshold);
+      MockCacheableLayer(path, DlPaint(), layer_cached_threshold);
   layer.Preroll(&preroll_context_);
   layer.raster_cache_item()->TryToPrepareRasterCache(paint_context_);
   RasterCache::Context r_context = {
@@ -39,7 +36,7 @@ void MockRasterCache::AddMockLayer(int width, int height) {
   };
   UpdateCacheEntry(
       RasterCacheKeyID(layer.unique_id(), RasterCacheKeyType::kLayer),
-      r_context, [&](SkCanvas* canvas) {
+      r_context, [&](DlCanvas* canvas) {
         SkRect cache_rect = RasterCacheUtil::GetDeviceBounds(
             r_context.logical_rect, r_context.matrix);
         return std::make_unique<MockRasterCacheResult>(cache_rect);
@@ -49,12 +46,11 @@ void MockRasterCache::AddMockLayer(int width, int height) {
 void MockRasterCache::AddMockPicture(int width, int height) {
   FML_DCHECK(access_threshold() > 0);
   SkMatrix ctm = SkMatrix::I();
-  DisplayListCanvasRecorder recorder(
-      SkRect::MakeLTRB(0, 0, 200 + width, 200 + height));
+  DisplayListBuilder builder(SkRect::MakeLTRB(0, 0, 200 + width, 200 + height));
   SkPath path;
   path.addRect(100, 100, 100 + width, 100 + height);
-  recorder.drawPath(path, SkPaint());
-  sk_sp<DisplayList> display_list = recorder.Build();
+  builder.DrawPath(path, DlPaint());
+  sk_sp<DisplayList> display_list = builder.Build();
 
   FixedRefreshRateStopwatch raster_time;
   FixedRefreshRateStopwatch ui_time;
@@ -63,8 +59,8 @@ void MockRasterCache::AddMockPicture(int width, int height) {
       GetSamplePaintContextHolder(state_stack, this, &raster_time, &ui_time);
   holder.paint_context.dst_color_space = color_space_;
 
-  DisplayListRasterCacheItem display_list_item(display_list.get(), SkPoint(),
-                                               true, false);
+  DisplayListRasterCacheItem display_list_item(display_list, SkPoint(), true,
+                                               false);
   for (size_t i = 0; i < access_threshold(); i++) {
     AutoCache(&display_list_item, &preroll_context_, ctm);
   }
@@ -78,7 +74,7 @@ void MockRasterCache::AddMockPicture(int width, int height) {
   };
   UpdateCacheEntry(RasterCacheKeyID(display_list->unique_id(),
                                     RasterCacheKeyType::kDisplayList),
-                   r_context, [&](SkCanvas* canvas) {
+                   r_context, [&](DlCanvas* canvas) {
                      SkRect cache_rect = RasterCacheUtil::GetDeviceBounds(
                          r_context.logical_rect, r_context.matrix);
                      return std::make_unique<MockRasterCacheResult>(cache_rect);
@@ -99,12 +95,11 @@ PrerollContextHolder GetSamplePrerollContextHolder(
           .gr_context                    = nullptr,
           .view_embedder                 = nullptr,
           .state_stack                   = state_stack,
-          .dst_color_space               = srgb.get(),
+          .dst_color_space               = srgb,
           .surface_needs_readback        = false,
           .raster_time                   = *raster_time,
           .ui_time                       = *ui_time,
           .texture_registry              = nullptr,
-          .frame_device_pixel_ratio      = 1.0f,
           .has_platform_view             = false,
           .has_texture_layer             = false,
           .raster_cached_entries         = &raster_cache_items_,
@@ -126,13 +121,12 @@ PaintContextHolder GetSamplePaintContextHolder(
         .state_stack                   = state_stack,
         .canvas                        = nullptr,
         .gr_context                    = nullptr,
-        .dst_color_space               = srgb.get(),
+        .dst_color_space               = srgb,
         .view_embedder                 = nullptr,
         .raster_time                   = *raster_time,
         .ui_time                       = *ui_time,
         .texture_registry              = nullptr,
         .raster_cache                  = raster_cache,
-        .frame_device_pixel_ratio      = 1.0f,
     },
                                // clang-format on
                                srgb};
diff --git a/flow/testing/mock_raster_cache.h b/flow/testing/mock_raster_cache.h
index b75234e69bfedf89e14dac8d65f35c9c4c0bb0d8..de6c5b6bf7f7304fbce97a87ae7f81d96e425318 100644
--- a/flow/testing/mock_raster_cache.h
+++ b/flow/testing/mock_raster_cache.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLOW_TESTING_MOCK_RASTER_CACHE_H_
-#define FLOW_TESTING_MOCK_RASTER_CACHE_H_
+#ifndef FLUTTER_FLOW_TESTING_MOCK_RASTER_CACHE_H_
+#define FLUTTER_FLOW_TESTING_MOCK_RASTER_CACHE_H_
 
 #include <vector>
 #include "flutter/flow/layers/layer.h"
@@ -11,18 +11,16 @@
 #include "flutter/flow/raster_cache_item.h"
 #include "flutter/flow/testing/mock_layer.h"
 #include "flutter/testing/mock_canvas.h"
-#include "include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColorSpace.h"
-#include "third_party/skia/include/core/SkColorType.h"
-#include "third_party/skia/include/core/SkImage.h"
-#include "third_party/skia/include/core/SkPicture.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
+#include "third_party/skia/include/core/SkSize.h"
 
 namespace flutter {
 namespace testing {
 
 /**
  * @brief A RasterCacheResult implementation that represents a cached Layer or
- * SkPicture without the overhead of storage.
+ * DisplayList without the overhead of storage.
  *
  * This implementation is used by MockRasterCache only for testing proper usage
  * of the RasterCache in layer unit tests.
@@ -31,7 +29,9 @@ class MockRasterCacheResult : public RasterCacheResult {
  public:
   explicit MockRasterCacheResult(SkRect device_rect);
 
-  void draw(SkCanvas& canvas, const SkPaint* paint = nullptr) const override{};
+  void draw(DlCanvas& canvas,
+            const DlPaint* paint = nullptr,
+            bool preserve_rtree = false) const override {};
 
   SkISize image_dimensions() const override {
     return SkSize::Make(device_rect_.width(), device_rect_.height()).toCeil();
@@ -50,7 +50,7 @@ static std::vector<RasterCacheItem*> raster_cache_items_;
 
 /**
  * @brief A RasterCache implementation that simulates the act of rendering a
- * Layer or SkPicture without the overhead of rasterization or pixel storage.
+ * Layer or DisplayList without the overhead of rasterization or pixel storage.
  * This implementation is used only for testing proper usage of the RasterCache
  * in layer unit tests.
  */
@@ -59,7 +59,7 @@ class MockRasterCache : public RasterCache {
   explicit MockRasterCache(
       size_t access_threshold = 3,
       size_t picture_and_display_list_cache_limit_per_frame =
-          RasterCacheUtil::kDefaultPictureAndDispLayListCacheLimitPerFrame)
+          RasterCacheUtil::kDefaultPictureAndDisplayListCacheLimitPerFrame)
       : RasterCache(access_threshold,
                     picture_and_display_list_cache_limit_per_frame) {
     preroll_state_stack_.set_preroll_delegate(SkMatrix::I());
@@ -73,7 +73,7 @@ class MockRasterCache : public RasterCache {
   LayerStateStack preroll_state_stack_;
   LayerStateStack paint_state_stack_;
   MockCanvas mock_canvas_;
-  SkColorSpace* color_space_ = mock_canvas_.imageInfo().colorSpace();
+  sk_sp<SkColorSpace> color_space_ = SkColorSpace::MakeSRGB();
   MutatorsStack mutators_stack_;
   FixedRefreshRateStopwatch raster_time_;
   FixedRefreshRateStopwatch ui_time_;
@@ -89,7 +89,6 @@ class MockRasterCache : public RasterCache {
       .raster_time                   = raster_time_,
       .ui_time                       = ui_time_,
       .texture_registry              = texture_registry_,
-      .frame_device_pixel_ratio      = 1.0f,
       .has_platform_view             = false,
       .has_texture_layer             = false,
       .raster_cached_entries         = &raster_cache_items_
@@ -107,7 +106,6 @@ class MockRasterCache : public RasterCache {
       .ui_time                       = ui_time_,
       .texture_registry              = texture_registry_,
       .raster_cache                  = nullptr,
-      .frame_device_pixel_ratio      = 1.0f,
       // clang-format on
   };
 };
@@ -151,4 +149,4 @@ bool RasterCacheItemTryToRasterCache(
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // FLOW_TESTING_MOCK_RASTER_CACHE_H_
+#endif  // FLUTTER_FLOW_TESTING_MOCK_RASTER_CACHE_H_
diff --git a/flow/testing/mock_texture.cc b/flow/testing/mock_texture.cc
index 3fe4fd116813cd73be3ccf639571dc32ba2d625c..662d1109b4498a1d7d3224d23688faf408401556 100644
--- a/flow/testing/mock_texture.cc
+++ b/flow/testing/mock_texture.cc
@@ -4,32 +4,47 @@
 
 #include "flutter/flow/testing/mock_texture.h"
 #include "flutter/flow/layers/layer.h"
-#include "flutter/flow/testing/skia_gpu_object_layer_test.h"
+#include "flutter/testing/display_list_testing.h"
 
 namespace flutter {
 namespace testing {
 
-MockTexture::MockTexture(int64_t textureId) : Texture(textureId) {}
+sk_sp<DlImage> MockTexture::MakeTestTexture(int w, int h, int checker_size) {
+  sk_sp<SkSurface> surface =
+      SkSurfaces::Raster(SkImageInfo::MakeN32Premul(w, h));
+  SkCanvas* canvas = surface->getCanvas();
+  SkPaint p0, p1;
+  p0.setStyle(SkPaint::kFill_Style);
+  p0.setColor(SK_ColorGREEN);
+  p1.setStyle(SkPaint::kFill_Style);
+  p1.setColor(SK_ColorBLUE);
+  p1.setAlpha(128);
+  for (int y = 0; y < w; y += checker_size) {
+    for (int x = 0; x < h; x += checker_size) {
+      SkPaint& cellp = ((x + y) & 1) == 0 ? p0 : p1;
+      canvas->drawRect(SkRect::MakeXYWH(x, y, checker_size, checker_size),
+                       cellp);
+    }
+  }
+  return DlImage::Make(surface->makeImageSnapshot());
+}
+
+MockTexture::MockTexture(int64_t textureId, const sk_sp<DlImage>& texture)
+    : Texture(textureId), texture_(texture) {}
 
 void MockTexture::Paint(PaintContext& context,
                         const SkRect& bounds,
                         bool freeze,
-                        const SkSamplingOptions& sampling) {
-  paint_calls_.emplace_back(PaintCall{*(context.canvas), bounds, freeze,
-                                      context.gr_context, sampling,
-                                      context.sk_paint});
-}
-
-bool operator==(const MockTexture::PaintCall& a,
-                const MockTexture::PaintCall& b) {
-  return &a.canvas == &b.canvas && a.bounds == b.bounds &&
-         a.context == b.context && a.freeze == b.freeze &&
-         a.sampling == b.sampling && a.paint == b.paint;
-}
-
-std::ostream& operator<<(std::ostream& os, const MockTexture::PaintCall& data) {
-  return os << &data.canvas << " " << data.bounds << " " << data.context << " "
-            << data.freeze << " " << data.sampling << " " << data.paint;
+                        const DlImageSampling sampling) {
+  // MockTexture objects that are not painted are allowed to have a null
+  // texture, but when we get to this method we must have a non-null texture.
+  FML_DCHECK(texture_ != nullptr);
+  SkRect src = SkRect::Make(texture_->bounds());
+  if (freeze) {
+    FML_DCHECK(src.width() > 2.0f && src.height() > 2.0f);
+    src = src.makeInset(1.0f, 1.0f);
+  }
+  context.canvas->DrawImageRect(texture_, src, bounds, sampling, context.paint);
 }
 
 }  // namespace testing
diff --git a/flow/testing/mock_texture.h b/flow/testing/mock_texture.h
index 8b1dfb05b493d41d02feaa32335d78bfb8f728f1..1c3dd1cdc57fc5fb0bb79314a6966f11c9eef820 100644
--- a/flow/testing/mock_texture.h
+++ b/flow/testing/mock_texture.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_FLOW_TESTING_MOCK_TEXTURE_H_
+#define FLUTTER_FLOW_TESTING_MOCK_TEXTURE_H_
+
 #include <ostream>
 #include <vector>
 
@@ -16,44 +19,34 @@ namespace testing {
 // later verify them against expected data.
 class MockTexture : public Texture {
  public:
-  struct PaintCall {
-    SkCanvas& canvas;
-    SkRect bounds;
-    bool freeze;
-    GrDirectContext* context;
-    SkSamplingOptions sampling;
-    const SkPaint* paint;
-  };
+  static sk_sp<DlImage> MakeTestTexture(int w, int h, int checker_size);
 
-  explicit MockTexture(int64_t textureId);
+  explicit MockTexture(int64_t textureId,
+                       const sk_sp<DlImage>& texture = nullptr);
 
   // Called from raster thread.
   void Paint(PaintContext& context,
              const SkRect& bounds,
              bool freeze,
-             const SkSamplingOptions& sampling) override;
+             const DlImageSampling sampling) override;
 
   void OnGrContextCreated() override { gr_context_created_ = true; }
   void OnGrContextDestroyed() override { gr_context_destroyed_ = true; }
   void MarkNewFrameAvailable() override {}
   void OnTextureUnregistered() override { unregistered_ = true; }
 
-  const std::vector<PaintCall>& paint_calls() { return paint_calls_; }
   bool gr_context_created() { return gr_context_created_; }
   bool gr_context_destroyed() { return gr_context_destroyed_; }
   bool unregistered() { return unregistered_; }
 
  private:
-  std::vector<PaintCall> paint_calls_;
+  sk_sp<DlImage> texture_;
   bool gr_context_created_ = false;
   bool gr_context_destroyed_ = false;
   bool unregistered_ = false;
 };
 
-extern bool operator==(const MockTexture::PaintCall& a,
-                       const MockTexture::PaintCall& b);
-extern std::ostream& operator<<(std::ostream& os,
-                                const MockTexture::PaintCall& data);
-
 }  // namespace testing
 }  // namespace flutter
+
+#endif  // FLUTTER_FLOW_TESTING_MOCK_TEXTURE_H_
diff --git a/flow/testing/mock_texture_unittests.cc b/flow/testing/mock_texture_unittests.cc
index 5dd12f82cfeea6969ee0d4d013f48952b9ef3bbb..5f5bab254dd6e2801d0ee67894f6fc423012e35b 100644
--- a/flow/testing/mock_texture_unittests.cc
+++ b/flow/testing/mock_texture_unittests.cc
@@ -4,6 +4,8 @@
 
 #include "flutter/flow/testing/mock_texture.h"
 
+#include "flutter/display_list/dl_builder.h"
+#include "flutter/testing/display_list_testing.h"
 #include "gtest/gtest.h"
 
 namespace flutter {
@@ -26,37 +28,51 @@ TEST(MockTextureTest, Callbacks) {
 }
 
 TEST(MockTextureTest, PaintCalls) {
-  SkCanvas canvas;
+  DisplayListBuilder builder;
   const SkRect paint_bounds1 = SkRect::MakeWH(1.0f, 1.0f);
   const SkRect paint_bounds2 = SkRect::MakeWH(2.0f, 2.0f);
-  const SkSamplingOptions sampling;
-  const auto expected_paint_calls = std::vector{
-      MockTexture::PaintCall{canvas, paint_bounds1, false, nullptr, sampling},
-      MockTexture::PaintCall{canvas, paint_bounds2, true, nullptr, sampling}};
-  auto texture = std::make_shared<MockTexture>(0);
+  const DlImageSampling sampling = DlImageSampling::kNearestNeighbor;
+  const auto texture_image = MockTexture::MakeTestTexture(20, 20, 5);
+  auto texture = std::make_shared<MockTexture>(0, texture_image);
+
   Texture::PaintContext context{
-      .canvas = &canvas,
+      .canvas = &builder,
   };
   texture->Paint(context, paint_bounds1, false, sampling);
   texture->Paint(context, paint_bounds2, true, sampling);
-  EXPECT_EQ(texture->paint_calls(), expected_paint_calls);
+
+  SkRect src1 = SkRect::Make(texture_image->bounds());
+  SkRect src2 = src1.makeInset(1.0, 1.0f);
+
+  DisplayListBuilder expected_builder;
+  expected_builder.DrawImageRect(texture_image, src1, paint_bounds1, sampling);
+  expected_builder.DrawImageRect(texture_image, src2, paint_bounds2, sampling);
+  EXPECT_TRUE(
+      DisplayListsEQ_Verbose(builder.Build(), expected_builder.Build()));
 }
 
 TEST(MockTextureTest, PaintCallsWithLinearSampling) {
-  SkCanvas canvas;
+  DisplayListBuilder builder;
   const SkRect paint_bounds1 = SkRect::MakeWH(1.0f, 1.0f);
   const SkRect paint_bounds2 = SkRect::MakeWH(2.0f, 2.0f);
-  const auto sampling = SkSamplingOptions(SkFilterMode::kLinear);
-  const auto expected_paint_calls = std::vector{
-      MockTexture::PaintCall{canvas, paint_bounds1, false, nullptr, sampling},
-      MockTexture::PaintCall{canvas, paint_bounds2, true, nullptr, sampling}};
-  auto texture = std::make_shared<MockTexture>(0);
+  const auto sampling = DlImageSampling::kLinear;
+  const auto texture_image = MockTexture::MakeTestTexture(20, 20, 5);
+  auto texture = std::make_shared<MockTexture>(0, texture_image);
+
   Texture::PaintContext context{
-      .canvas = &canvas,
+      .canvas = &builder,
   };
   texture->Paint(context, paint_bounds1, false, sampling);
   texture->Paint(context, paint_bounds2, true, sampling);
-  EXPECT_EQ(texture->paint_calls(), expected_paint_calls);
+
+  SkRect src1 = SkRect::Make(texture_image->bounds());
+  SkRect src2 = src1.makeInset(1.0, 1.0f);
+
+  DisplayListBuilder expected_builder;
+  expected_builder.DrawImageRect(texture_image, src1, paint_bounds1, sampling);
+  expected_builder.DrawImageRect(texture_image, src2, paint_bounds2, sampling);
+  EXPECT_TRUE(
+      DisplayListsEQ_Verbose(builder.Build(), expected_builder.Build()));
 }
 
 }  // namespace testing
diff --git a/flow/testing/skia_gpu_object_layer_test.h b/flow/testing/skia_gpu_object_layer_test.h
deleted file mode 100644
index d573ac0b41007de69cf72a15332b12df2e32b9a0..0000000000000000000000000000000000000000
--- a/flow/testing/skia_gpu_object_layer_test.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLOW_TESTING_SKIA_GPU_OBJECT_LAYER_TEST_H_
-#define FLOW_TESTING_SKIA_GPU_OBJECT_LAYER_TEST_H_
-
-#include "flutter/flow/skia_gpu_object.h"
-#include "flutter/flow/testing/layer_test.h"
-#include "flutter/testing/thread_test.h"
-
-namespace flutter {
-namespace testing {
-
-// This fixture allows generating tests that create |SkiaGPUObject|'s which
-// are destroyed on a |SkiaUnrefQueue|.
-class SkiaGPUObjectLayerTest : public LayerTestBase<ThreadTest> {
- public:
-  SkiaGPUObjectLayerTest();
-
-  fml::RefPtr<SkiaUnrefQueue> unref_queue() { return unref_queue_; }
-
- private:
-  fml::RefPtr<SkiaUnrefQueue> unref_queue_;
-};
-
-}  // namespace testing
-}  // namespace flutter
-
-#endif  // FLOW_TESTING_SKIA_GPU_OBJECT_LAYER_TEST_H_
diff --git a/flow/texture_unittests.cc b/flow/texture_unittests.cc
index bb39dbfb39347f249ae7f795e7bbd8bb765df24e..0339be1d524f829732ec2668c4338a5f48900c0f 100644
--- a/flow/texture_unittests.cc
+++ b/flow/texture_unittests.cc
@@ -4,12 +4,36 @@
 
 #include "flutter/common/graphics/texture.h"
 
+#include <functional>
+
 #include "flutter/flow/testing/mock_texture.h"
+#include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
 namespace flutter {
 namespace testing {
 
+namespace {
+using int_closure = std::function<void(int)>;
+
+struct TestContextListener : public ContextListener {
+  TestContextListener(uintptr_t p_id,
+                      int_closure p_create,
+                      int_closure p_destroy)
+      : id(p_id), create(std::move(p_create)), destroy(std::move(p_destroy)) {}
+
+  virtual ~TestContextListener() = default;
+
+  const uintptr_t id;
+  int_closure create;
+  int_closure destroy;
+
+  void OnGrContextCreated() override { create(id); }
+
+  void OnGrContextDestroyed() override { destroy(id); }
+};
+}  // namespace
+
 TEST(TextureRegistryTest, UnregisterTextureCallbackTriggered) {
   TextureRegistry registry;
   auto mock_texture1 = std::make_shared<MockTexture>(0);
@@ -95,5 +119,24 @@ TEST(TextureRegistryTest, ReuseSameTextureSlot) {
   ASSERT_TRUE(mock_texture2->unregistered());
 }
 
+TEST(TextureRegistryTest, CallsOnGrContextCreatedInInsertionOrder) {
+  TextureRegistry registry;
+  std::vector<int> create_order;
+  std::vector<int> destroy_order;
+  auto create = [&](int id) { create_order.push_back(id); };
+  auto destroy = [&](int id) { destroy_order.push_back(id); };
+  auto a = std::make_shared<TestContextListener>(5, create, destroy);
+  auto b = std::make_shared<TestContextListener>(4, create, destroy);
+  auto c = std::make_shared<TestContextListener>(3, create, destroy);
+  registry.RegisterContextListener(a->id, a);
+  registry.RegisterContextListener(b->id, b);
+  registry.RegisterContextListener(c->id, c);
+  registry.OnGrContextDestroyed();
+  registry.OnGrContextCreated();
+
+  EXPECT_THAT(create_order, ::testing::ElementsAre(5, 4, 3));
+  EXPECT_THAT(destroy_order, ::testing::ElementsAre(5, 4, 3));
+}
+
 }  // namespace testing
 }  // namespace flutter
diff --git a/flutter_frontend_server/BUILD.gn b/flutter_frontend_server/BUILD.gn
index 9e986066595ab40072878dcefa754a4382ab89e9..9ba5ee2713478904f988d187b7a1c47ae2b44c52 100644
--- a/flutter_frontend_server/BUILD.gn
+++ b/flutter_frontend_server/BUILD.gn
@@ -2,19 +2,18 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//flutter/build/dart/rules.gni")
+import("//flutter/build/dart/dart.gni")
+import("//flutter/common/config.gni")
 
-application_snapshot("frontend_server") {
-  main_dart = "bin/starter.dart"
-  deps = [ "//flutter/lib/snapshot:kernel_platform_files" ]
+copy("frontend_server") {
+  if (flutter_prebuilt_dart_sdk) {
+    snapshot =
+        "$host_prebuilt_dart_sdk/bin/snapshots/frontend_server.dart.snapshot"
+  } else {
+    deps = [ "$dart_src/utils/kernel-service:frontend_server" ]
+    snapshot = "$root_out_dir/frontend_server.dart.snapshot"
+  }
 
-  package_config = rebase_path(".dart_tool/package_config.json")
-  flutter_patched_sdk = rebase_path("$root_out_dir/flutter_patched_sdk")
-  training_args = [
-    "--train",
-    "--sdk-root=$flutter_patched_sdk",
-    rebase_path(main_dart),
-  ]
-
-  inputs = frontend_server_files
+  sources = [ snapshot ]
+  outputs = [ "$root_gen_dir/frontend_server.dart.snapshot" ]
 }
diff --git a/flutter_frontend_server/README.md b/flutter_frontend_server/README.md
deleted file mode 100644
index 3007831b924c6a190f64c905f97609b1ba33e19a..0000000000000000000000000000000000000000
--- a/flutter_frontend_server/README.md
+++ /dev/null
@@ -1,71 +0,0 @@
-# Frontend Server
-
-Frontend server is simple wrapper around Dart Frontend. It is a Dart application
-that compiles Dart source into Dart Kernel binary (.dill-file).
-Documentation on Dart Kernel (semantic, binary format, etc) can be found here:
-https://github.com/dart-lang/sdk/wiki/Kernel-Documentation.
-
-Frontend server runs in two modes:
- - immediate mode, where Dart source file name is provided as command line
- argument;
- - interactive mode, where communication is happening over stdin/stdout.
-
-## Interactive mode instructions
-
-### Compile/Recompile
-```
-compile <input.dart>
-```
- Compiles <input.dart> Dart source file with Dart Frontend. Replies with `result` response.
-
-```
-recompile <boundary-key>
-<path/to/updated/file1.dart>
-<path/to/updated/file2.dart>
-...
-<boundary-key>
-```
- Incrementally recompiles Dart program previously compiled in current session, taking into account
- changes in the listed files. Replies with `result` response.
-
- Relative paths should be relative to current working directory for the shell that launched
- Frontend Server.
-
-### Accept/Reject
-```
-accept
-```
- Accepts results of incremental compilation, so that on next recompilation request Dart Frontend
- will not include these recompiled files.
-```
-reject
-```
- Rejects results of incremental compilation, so that on next recompilation request Dart Frontend
- will include compilation results from previously rejected recompilation in addition to what it
- will recompile based on newly changed files.
- Small technical detail is that Dart Frontend will not recompile files from previously rejected
- recompilation attempts (unless they were changed since then), it will just include appropriate
- kernel binaries it kept around from those previously rejected compilation requests.
-
- One use of `accept` and `reject` instructions is in the context of Dart VM hot-reload. Dart VM can
- reject user-provided incremental change to what is currently running. It could happen for variety
- of Dart VM internal reasons. For example, if incremental update changes some `class` to `enum`,
- such update can not be hot-reloaded by VM at this point, will be rejected.
-
-### Quit
-```
-quit
-```
- Stops the server.
-
-## Response from the server
-
-```
-result <boundary-key>
-<compiler output>
-<boundary-key> [<output.dill>]
-```
-Response from the Dart Frontend compiler is bracketed by `<boundary-key>` tags. If the compiler
-was able to produce a Dart Kernel file, the name of this file `<output.dill>` is provided too.
-If the compiler encountered unrecoverable errors, there will be no output file name provided.
-
diff --git a/flutter_frontend_server/lib/server.dart b/flutter_frontend_server/lib/server.dart
deleted file mode 100644
index 49f8ffd08d2e5a3352d4a917b9b880ca27c33f0b..0000000000000000000000000000000000000000
--- a/flutter_frontend_server/lib/server.dart
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// ignore_for_file: avoid_print
-
-library flutter_frontend_server;
-
-import 'dart:async';
-import 'dart:io' hide FileSystemEntity;
-
-import 'package:args/args.dart';
-import 'package:frontend_server/frontend_server.dart' as frontend
-    show
-        CompilerInterface,
-        FrontendCompiler,
-        argParser,
-        listenAndCompile,
-        usage;
-import 'package:path/path.dart' as path;
-
-/// Entry point for this module, that creates `FrontendCompiler` instance and
-/// processes user input.
-/// `compiler` is an optional parameter so it can be replaced with mocked
-/// version for testing.
-Future<int> starter(
-  List<String> args, {
-  frontend.CompilerInterface? compiler,
-  Stream<List<int>>? input,
-  StringSink? output,
-}) async {
-  ArgResults options;
-  try {
-    options = frontend.argParser.parse(args);
-  } catch (error) {
-    print('ERROR: $error\n');
-    print(frontend.usage);
-    return 1;
-  }
-
-  if (options['train'] as bool) {
-    if (!options.rest.isNotEmpty) {
-      throw Exception('Must specify input.dart');
-    }
-
-    final String input = options.rest[0];
-    final String sdkRoot = options['sdk-root'] as String;
-    final Directory temp =
-        Directory.systemTemp.createTempSync('train_frontend_server');
-    try {
-      for (int i = 0; i < 3; i++) {
-        final String outputTrainingDill = path.join(temp.path, 'app.dill');
-        options = frontend.argParser.parse(<String>[
-          '--incremental',
-          '--sdk-root=$sdkRoot',
-          '--output-dill=$outputTrainingDill',
-          '--target=flutter',
-          '--track-widget-creation',
-          '--enable-asserts',
-        ]);
-        compiler ??= frontend.FrontendCompiler(output);
-
-        await compiler.compile(input, options);
-        compiler.acceptLastDelta();
-        await compiler.recompileDelta();
-        compiler.acceptLastDelta();
-        compiler.resetIncrementalCompiler();
-        await compiler.recompileDelta();
-        compiler.acceptLastDelta();
-        await compiler.recompileDelta();
-        compiler.acceptLastDelta();
-      }
-      return 0;
-    } finally {
-      temp.deleteSync(recursive: true);
-    }
-  }
-
-  compiler ??= frontend.FrontendCompiler(output,
-      useDebuggerModuleNames: options['debugger-module-names'] as bool,
-      emitDebugMetadata: options['experimental-emit-debug-metadata'] as bool,
-      unsafePackageSerialization:
-          options['unsafe-package-serialization'] as bool);
-
-  if (options.rest.isNotEmpty) {
-    return await compiler.compile(options.rest[0], options) ? 0 : 254;
-  }
-
-  final Completer<int> completer = Completer<int>();
-  frontend.listenAndCompile(compiler, input ?? stdin, options, completer);
-  return completer.future;
-}
diff --git a/flutter_frontend_server/pubspec.yaml b/flutter_frontend_server/pubspec.yaml
index 4f5bc2056d3fa3fa87c3f3099f5c6cf3637af776..16fd3ad7ee56622d317c51b4f75541b6b5395954 100644
--- a/flutter_frontend_server/pubspec.yaml
+++ b/flutter_frontend_server/pubspec.yaml
@@ -18,96 +18,22 @@ homepage: https://flutter.dev
 # relative to this directory into //third_party/dart
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
-
-dependencies:
-  args: any
-  frontend_server: any
-  path: any
+  sdk: '>=3.2.0-0 <4.0.0'
 
 dev_dependencies:
   litetest: any
+  path: any
 
 dependency_overrides:
-  _fe_analyzer_shared:
-    path: ../../third_party/dart/pkg/_fe_analyzer_shared
-  _js_interop_checks:
-    path: ../../third_party/dart/pkg/_js_interop_checks
-  args:
-    path: ../../third_party/dart/third_party/pkg/args
-  async:
-    path: ../../third_party/dart/third_party/pkg/async
   async_helper:
     path: ../../third_party/dart/pkg/async_helper
-  bazel_worker:
-    path: ../../third_party/dart/third_party/pkg/bazel_worker
-  build_integration:
-    path: ../../third_party/dart/pkg/build_integration
-  collection:
-    path: ../../third_party/dart/third_party/pkg/collection
-  compiler:
-    path: ../../third_party/dart/pkg/compiler
-  crypto:
-    path: ../../third_party/dart/third_party/pkg/crypto
-  dart2js_info:
-    path: ../../third_party/dart/pkg/dart2js_info
-  dev_compiler:
-    path: ../../third_party/dart/pkg/dev_compiler
   expect:
     path: ../../third_party/dart/pkg/expect
-  ffi:
-    path: ../../third_party/dart/third_party/pkg/ffi
-  fixnum:
-    path: ../../third_party/dart/third_party/pkg/fixnum
-  front_end:
-    path: ../../third_party/dart/pkg/front_end
-  frontend_server:
-    path: ../../third_party/dart/pkg/frontend_server
-  http_parser:
-    path: ../../third_party/dart/third_party/pkg/http_parser
-  js_ast:
-    path: ../../third_party/dart/pkg/js_ast
-  js_runtime:
-    path: ../../third_party/dart/pkg/js_runtime
-  js_shared:
-    path: ../../third_party/dart/pkg/js_shared
-  kernel:
-    path: ../../third_party/dart/pkg/kernel
   litetest:
     path: ../testing/litetest
   meta:
     path: ../../third_party/dart/pkg/meta
-  package_config:
-    path: ../../third_party/dart/third_party/pkg/package_config
   path:
     path: ../../third_party/dart/third_party/pkg/path
-  protobuf:
-    path: ../../third_party/dart/third_party/pkg/protobuf/protobuf
-  shelf:
-    path: ../../third_party/dart/third_party/pkg/shelf/pkgs/shelf
   smith:
     path: ../../third_party/dart/pkg/smith
-  source_maps:
-    path: ../../third_party/dart/third_party/pkg/source_maps
-  source_span:
-    path: ../../third_party/dart/third_party/pkg/source_span
-  stack_trace:
-    path: ../../third_party/dart/third_party/pkg/stack_trace
-  stream_channel:
-    path: ../../third_party/dart/third_party/pkg/stream_channel
-  string_scanner:
-    path: ../../third_party/dart/third_party/pkg/string_scanner
-  term_glyph:
-    path: ../../third_party/dart/third_party/pkg/term_glyph
-  typed_data:
-    path: ../../third_party/dart/third_party/pkg/typed_data
-  usage:
-    path: ../../third_party/dart/third_party/pkg/usage
-  vm:
-    path: ../../third_party/dart/pkg/vm
-  vm_service:
-    path: ../../third_party/dart/pkg/vm_service
-  vm_snapshot_analysis:
-    path: ../../third_party/dart/pkg/vm_snapshot_analysis
-  yaml:
-    path: ../../third_party/dart/third_party/pkg/yaml
diff --git a/flutter_vma/BUILD.gn b/flutter_vma/BUILD.gn
index 26e6566a3d60c5c8324149028da0c6379c152e72..a1823de0ab62c75fb4bceacdbbfe49a752dc0a59 100644
--- a/flutter_vma/BUILD.gn
+++ b/flutter_vma/BUILD.gn
@@ -14,9 +14,10 @@ source_set("flutter_vma") {
     defines = [ "VMA_USE_STL_SHARED_MUTEX=0" ]
   }
 
-  deps = [
-    "//third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
-    "//third_party/vulkan_memory_allocator",
+  public_deps = [
+    "//flutter/fml",
+    "//flutter/third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
+    "//flutter/third_party/vulkan_memory_allocator",
   ]
 
   public_configs = [ "//flutter:config" ]
@@ -28,13 +29,10 @@ source_set("flutter_skia_vma") {
     "flutter_skia_vma.h",
   ]
 
-  public_deps = [ ":flutter_vma" ]
-
-  deps = [
+  public_deps = [
+    ":flutter_vma",
     "//flutter/fml",
+    "//flutter/skia",
     "//flutter/vulkan/procs",
-    "//third_party/skia",
-    "//third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
-    "//third_party/vulkan_memory_allocator",
   ]
 }
diff --git a/flutter_vma/flutter_skia_vma.cc b/flutter_vma/flutter_skia_vma.cc
index 5b4eb89ae4a399365cff2e88af3ca7839267b40c..c6437fa0c265263586533f28a436345fa6e6c89b 100644
--- a/flutter_vma/flutter_skia_vma.cc
+++ b/flutter_vma/flutter_skia_vma.cc
@@ -212,7 +212,7 @@ void FlutterSkiaVulkanMemoryAllocator::getAllocInfo(
   if (VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT & memFlags) {
     flags |= skgpu::VulkanAlloc::kMappable_Flag;
   }
-  if (!SkToBool(VK_MEMORY_PROPERTY_HOST_COHERENT_BIT & memFlags)) {
+  if (!(VK_MEMORY_PROPERTY_HOST_COHERENT_BIT & memFlags)) {
     flags |= skgpu::VulkanAlloc::kNoncoherent_Flag;
   }
   if (VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT & memFlags) {
@@ -259,16 +259,12 @@ VkResult FlutterSkiaVulkanMemoryAllocator::invalidateMemory(
   return vmaInvalidateAllocation(allocator_, allocation, offset, size);
 }
 
-uint64_t FlutterSkiaVulkanMemoryAllocator::totalUsedMemory() const {
+std::pair<uint64_t, uint64_t>
+FlutterSkiaVulkanMemoryAllocator::totalAllocatedAndUsedMemory() const {
   VmaTotalStatistics stats;
   vmaCalculateStatistics(allocator_, &stats);
-  return stats.total.statistics.allocationBytes;
-}
-
-uint64_t FlutterSkiaVulkanMemoryAllocator::totalAllocatedMemory() const {
-  VmaTotalStatistics stats;
-  vmaCalculateStatistics(allocator_, &stats);
-  return stats.total.statistics.blockBytes;
+  return {stats.total.statistics.blockBytes,
+          stats.total.statistics.allocationBytes};
 }
 
 }  // namespace flutter
diff --git a/flutter_vma/flutter_skia_vma.h b/flutter_vma/flutter_skia_vma.h
index fd6a6078d4e3982377ddc260abbc6b9623c82abf..4a9bdaf9c6ed81077248cb2e87c66aa566fb06dc 100644
--- a/flutter_vma/flutter_skia_vma.h
+++ b/flutter_vma/flutter_skia_vma.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_FLUTTER_VMA_FLUTTER_SKIA_VMA_H_
+#define FLUTTER_FLUTTER_VMA_FLUTTER_SKIA_VMA_H_
 
 #include "flutter/flutter_vma/flutter_vma.h"
 
@@ -48,8 +49,7 @@ class FlutterSkiaVulkanMemoryAllocator : public skgpu::VulkanMemoryAllocator {
                             VkDeviceSize offset,
                             VkDeviceSize size) override;
 
-  uint64_t totalUsedMemory() const override;
-  uint64_t totalAllocatedMemory() const override;
+  std::pair<uint64_t, uint64_t> totalAllocatedAndUsedMemory() const override;
 
  private:
   FlutterSkiaVulkanMemoryAllocator(
@@ -68,3 +68,5 @@ class FlutterSkiaVulkanMemoryAllocator : public skgpu::VulkanMemoryAllocator {
 };
 
 }  // namespace flutter
+
+#endif  // FLUTTER_FLUTTER_VMA_FLUTTER_SKIA_VMA_H_
diff --git a/flutter_vma/flutter_vma.cc b/flutter_vma/flutter_vma.cc
index 81df956c1daede2a52d6ea897a0474fe747fd03a..d81b40d48f7c185a4d51669fc5ce7555b52485ef 100644
--- a/flutter_vma/flutter_vma.cc
+++ b/flutter_vma/flutter_vma.cc
@@ -16,4 +16,26 @@
 
 #define VMA_IMPLEMENTATION
 
+// Enable this to dump a list of all pending allocations to the log. This comes
+// in handy if you are tracking a leak of a resource after context shutdown.
+#if 0
+#include "flutter/fml/logging.h"  // nogncheck
+#define VMA_DEBUG_LOG VMADebugPrint
+void VMADebugPrint(const char* message, ...) {
+  va_list args;
+  va_start(args, message);
+  char buffer[256];
+  vsnprintf(buffer, sizeof(buffer) - 1, message, args);
+  va_end(args);
+  FML_DLOG(INFO) << buffer;
+}
+#endif
+
+#include "flutter/fml/logging.h"
+
+#define VMA_ASSERT(expr) \
+  FML_DCHECK((expr)) << "Vulkan Memory Allocator Failure!"
+#define VMA_HEAVY_ASSERT(expr) \
+  FML_DCHECK((expr)) << "Vulkan Memory Allocator Failure!"
+
 #include "flutter/flutter_vma/flutter_vma.h"
diff --git a/flutter_vma/flutter_vma.h b/flutter_vma/flutter_vma.h
index f218c7a876121135ad816ef1c8cadcc668f8d527..75b4e82744b77480d9aa3231e5eaf17ddfdb13fd 100644
--- a/flutter_vma/flutter_vma.h
+++ b/flutter_vma/flutter_vma.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_FLUTTER_VMA_FLUTTER_VMA_H_
+#define FLUTTER_FLUTTER_VMA_FLUTTER_VMA_H_
 
 #include "vk_mem_alloc.h"
+
+#endif  // FLUTTER_FLUTTER_VMA_FLUTTER_VMA_H_
diff --git a/fml/BUILD.gn b/fml/BUILD.gn
index ddcb7cb64b195e140aa02c5fd69c6cd95fce8966..255617d020bc4b1c71604678cb44787b7cafc84c 100644
--- a/fml/BUILD.gn
+++ b/fml/BUILD.gn
@@ -2,10 +2,13 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/fuchsia/sdk.gni")
 import("//flutter/common/config.gni")
 import("//flutter/testing/testing.gni")
 
+if (is_fuchsia) {
+  import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
+}
+
 source_set("fml") {
   sources = [
     "ascii_trie.cc",
@@ -19,6 +22,8 @@ source_set("fml") {
     "concurrent_message_loop.cc",
     "concurrent_message_loop.h",
     "container.h",
+    "cpu_affinity.cc",
+    "cpu_affinity.h",
     "delayed_task.cc",
     "delayed_task.h",
     "eintr_wrapper.h",
@@ -47,6 +52,7 @@ source_set("fml") {
     "memory/ref_ptr_internal.h",
     "memory/task_runner_checker.cc",
     "memory/task_runner_checker.h",
+    "memory/thread_checker.cc",
     "memory/thread_checker.h",
     "memory/weak_ptr.h",
     "memory/weak_ptr_internal.cc",
@@ -61,11 +67,14 @@ source_set("fml") {
     "paths.cc",
     "paths.h",
     "posix_wrappers.h",
+    "process.h",
     "raster_thread_merger.cc",
     "raster_thread_merger.h",
     "shared_thread_merger.cc",
     "shared_thread_merger.h",
     "size.h",
+    "status.h",
+    "status_or.h",
     "synchronization/atomic_object.h",
     "synchronization/count_down_latch.cc",
     "synchronization/count_down_latch.h",
@@ -83,8 +92,6 @@ source_set("fml") {
     "task_source.h",
     "thread.cc",
     "thread.h",
-    "thread_local.cc",
-    "thread_local.h",
     "time/time_delta.h",
     "time/time_point.cc",
     "time/time_point.h",
@@ -97,13 +104,8 @@ source_set("fml") {
     "wakeable.h",
   ]
 
-  if( is_ohos){
-    sources += [ "backtrace_stub.cc" ]
-  }else if ( is_linux){
-    sources += [ "backtrace_stub.cc" ]
-  }else if (is_mac || is_linux || is_win || (is_ios && is_debug)) {
-    #sources += [ "backtrace.cc" ]
-    sources += [ "backtrace_stub.cc" ]
+  if (enable_backtrace) {
+    sources += [ "backtrace.cc" ]
   } else {
     sources += [ "backtrace_stub.cc" ]
   }
@@ -115,18 +117,18 @@ source_set("fml") {
   ]
 
   deps = [
-    "//third_party/dart/runtime:dart_api",
+    "$dart_src/runtime:dart_api",
 
     # These need to be in sync with the Fuchsia buildroot.
-    "//third_party/icu",
+    "//flutter/third_party/icu",
   ]
 
-  if (is_mac || is_linux || is_win || (is_ios && is_debug)) {
+  if (enable_backtrace) {
     # This abseil dependency is only used by backtrace.cc.
-    deps += [ "//third_party/abseil-cpp/absl/debugging:symbolize" ]
+    deps += [ "//flutter/third_party/abseil-cpp/absl/debugging:symbolize" ]
   }
 
-  configs += [ "//third_party/icu:icu_config" ]
+  configs += [ "//flutter/third_party/icu:icu_config" ]
 
   public_configs = [
     "//flutter:config",
@@ -136,9 +138,15 @@ source_set("fml") {
   libs = []
 
   if (is_ios || is_mac) {
-    sources += [ "platform/posix/shared_mutex_posix.cc" ]
+    sources += [
+      "platform/darwin/concurrent_message_loop_factory.mm",
+      "platform/posix/shared_mutex_posix.cc",
+    ]
   } else {
-    sources += [ "synchronization/shared_mutex_std.cc" ]
+    sources += [
+      "concurrent_message_loop_factory.cc",
+      "synchronization/shared_mutex_std.cc",
+    ]
   }
 
   if (is_ios || is_mac) {
@@ -155,10 +163,16 @@ source_set("fml") {
       "platform/darwin/platform_version.mm",
       "platform/darwin/scoped_block.h",
       "platform/darwin/scoped_block.mm",
+      "platform/darwin/scoped_nsautorelease_pool.cc",
+      "platform/darwin/scoped_nsautorelease_pool.h",
       "platform/darwin/scoped_nsobject.h",
       "platform/darwin/scoped_nsobject.mm",
+      "platform/darwin/scoped_policy.h",
+      "platform/darwin/scoped_typeref.h",
       "platform/darwin/string_range_sanitization.h",
       "platform/darwin/string_range_sanitization.mm",
+      "platform/darwin/weak_nsobject.h",
+      "platform/darwin/weak_nsobject.mm",
     ]
 
     frameworks = [ "Foundation.framework" ]
@@ -166,6 +180,8 @@ source_set("fml") {
 
   if (is_android) {
     sources += [
+      "platform/android/cpu_affinity.cc",
+      "platform/android/cpu_affinity.h",
       "platform/android/jni_util.cc",
       "platform/android/jni_util.h",
       "platform/android/jni_weak_ref.cc",
@@ -190,6 +206,8 @@ source_set("fml") {
 
   if (is_ohos) {
     sources += [
+      "platform/ohos/hisysevent_c.cc",
+      "platform/ohos/hisysevent_c.h",
       "platform/ohos/message_loop_ohos.cc",
       "platform/ohos/message_loop_ohos.h",
       "platform/ohos/paths_ohos.cc",
@@ -216,6 +234,10 @@ source_set("fml") {
 
   if (is_fuchsia) {
     sources += [
+      "platform/fuchsia/log_interest_listener.cc",
+      "platform/fuchsia/log_interest_listener.h",
+      "platform/fuchsia/log_state.cc",
+      "platform/fuchsia/log_state.h",
       "platform/fuchsia/message_loop_fuchsia.cc",
       "platform/fuchsia/message_loop_fuchsia.h",
       "platform/fuchsia/paths_fuchsia.cc",
@@ -224,13 +246,16 @@ source_set("fml") {
     ]
 
     public_deps += [
-      "$fuchsia_sdk_root/pkg:async-cpp",
-      "$fuchsia_sdk_root/pkg:async-loop-cpp",
-      "$fuchsia_sdk_root/pkg:async-loop-default",
-      "$fuchsia_sdk_root/pkg:syslog",
-      "$fuchsia_sdk_root/pkg:trace",
-      "$fuchsia_sdk_root/pkg:trace-engine",
-      "$fuchsia_sdk_root/pkg:zx",
+      "${fuchsia_sdk}/fidl/fuchsia.diagnostics:fuchsia.diagnostics_cpp",
+      "${fuchsia_sdk}/fidl/fuchsia.logger:fuchsia.logger_cpp",
+      "${fuchsia_sdk}/pkg/async-cpp",
+      "${fuchsia_sdk}/pkg/async-loop-cpp",
+      "${fuchsia_sdk}/pkg/async-loop-default",
+      "${fuchsia_sdk}/pkg/component_incoming_cpp",
+      "${fuchsia_sdk}/pkg/syslog_structured_backend",
+      "${fuchsia_sdk}/pkg/trace",
+      "${fuchsia_sdk}/pkg/trace-engine",
+      "${fuchsia_sdk}/pkg/zx",
     ]
   }
 
@@ -246,6 +271,7 @@ source_set("fml") {
       "platform/win/native_library_win.cc",
       "platform/win/paths_win.cc",
       "platform/win/posix_wrappers_win.cc",
+      "platform/win/process_win.cc",
     ]
   } else {
     sources += [
@@ -255,6 +281,7 @@ source_set("fml") {
       "platform/posix/native_library_posix.cc",
       "platform/posix/paths_posix.cc",
       "platform/posix/posix_wrappers_posix.cc",
+      "platform/posix/process_posix.cc",
     ]
   }
 }
@@ -331,8 +358,10 @@ if (enable_unittests) {
       "ascii_trie_unittests.cc",
       "backtrace_unittests.cc",
       "base32_unittest.cc",
+      "closure_unittests.cc",
       "command_line_unittest.cc",
       "container_unittests.cc",
+      "cpu_affinity_unittests.cc",
       "endianness_unittests.cc",
       "file_unittest.cc",
       "hash_combine_unittests.cc",
@@ -343,7 +372,6 @@ if (enable_unittests) {
       "memory/ref_counted_unittest.cc",
       "memory/task_runner_checker_unittest.cc",
       "memory/weak_ptr_unittest.cc",
-      "message_loop_impl_unittests.cc",
       "message_loop_task_queues_merge_unmerge_unittests.cc",
       "message_loop_task_queues_unittests.cc",
       "message_loop_unittests.cc",
@@ -355,7 +383,6 @@ if (enable_unittests) {
       "synchronization/sync_switch_unittest.cc",
       "synchronization/waitable_event_unittest.cc",
       "task_source_unittests.cc",
-      "thread_local_unittests.cc",
       "thread_unittests.cc",
       "time/chrono_timestamp_provider.cc",
       "time/chrono_timestamp_provider.h",
@@ -371,23 +398,58 @@ if (enable_unittests) {
       ]
     }
 
+    if (is_mac || is_ios) {
+      sources += [
+        "platform/darwin/scoped_nsobject_unittests.mm",
+        "platform/darwin/weak_nsobject_unittests.mm",
+      ]
+    }
+
+    if (is_fuchsia) {
+      sources += [ "platform/fuchsia/log_interest_listener_unittests.cc" ]
+    }
+
     if (is_win) {
-      sources += [ "platform/win/wstring_conversion_unittests.cc" ]
+      sources += [
+        "platform/win/file_win_unittests.cc",
+        "platform/win/wstring_conversion_unittests.cc",
+      ]
     }
 
     deps = [
       ":fml_fixtures",
       "//flutter/fml",
-      "//flutter/fml/dart",
       "//flutter/runtime",
       "//flutter/runtime:libdart",
       "//flutter/testing",
     ]
 
-    # This is needed for //third_party/googletest for linking zircon symbols.
     if (is_fuchsia) {
-      libs =
-          [ "${fuchsia_sdk_path}/arch/${target_cpu}/sysroot/lib/libzircon.so" ]
+      deps += [
+        "${fuchsia_sdk}/pkg/async-loop-testing",
+        "${fuchsia_sdk}/pkg/sys_component_cpp_testing",
+      ]
+
+      # This is needed for //flutter/third_party/googletest for linking zircon
+      # symbols.
+      libs = [ "${fuchsia_arch_root}/sysroot/lib/libzircon.so" ]
     }
   }
+
+  executable("fml_arc_unittests") {
+    testonly = true
+    if (is_mac || is_ios) {
+      cflags_objcc = flutter_cflags_objc_arc
+      sources = [
+        "platform/darwin/scoped_nsobject_arc_unittests.mm",
+        "platform/darwin/weak_nsobject_arc_unittests.mm",
+      ]
+    }
+
+    deps = [
+      ":fml_fixtures",
+      "//flutter/fml",
+      "//flutter/testing",
+    ]
+  }
 }
diff --git a/fml/ascii_trie.h b/fml/ascii_trie.h
index eafbeec8bba911f2bb7a4c867d6417e6310dce60..1c4b52fa54bac5e2f7d1edc2e8dff71cc6985973 100644
--- a/fml/ascii_trie.h
+++ b/fml/ascii_trie.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FML_ASCIITRIE_H_
-#define FLUTTER_FML_ASCIITRIE_H_
+#ifndef FLUTTER_FML_ASCII_TRIE_H_
+#define FLUTTER_FML_ASCII_TRIE_H_
 
 #include <memory>
 #include <string>
@@ -37,4 +37,4 @@ class AsciiTrie {
 };
 }  // namespace fml
 
-#endif
+#endif  // FLUTTER_FML_ASCII_TRIE_H_
diff --git a/fml/backtrace.cc b/fml/backtrace.cc
index 264fa7d0bcda5099689a42f5d4f5831d18b3a0b9..aa87c36bcc7bf8dac82b05569e60d2fc419c3e4d 100644
--- a/fml/backtrace.cc
+++ b/fml/backtrace.cc
@@ -10,7 +10,7 @@
 #include "flutter/fml/build_config.h"
 #include "flutter/fml/logging.h"
 #include "flutter/fml/paths.h"
-#include "third_party/abseil-cpp/absl/debugging/symbolize.h"
+#include "flutter/third_party/abseil-cpp/absl/debugging/symbolize.h"
 
 #ifdef FML_OS_WIN
 #include <Windows.h>
diff --git a/fml/base32.cc b/fml/base32.cc
index 6138f0f817bde7d92573f1db833ceeb8ad63bf3d..57472c6efba7d05ca42e9f7bce878ce1335c61d2 100644
--- a/fml/base32.cc
+++ b/fml/base32.cc
@@ -4,6 +4,7 @@
 
 #include "flutter/fml/base32.h"
 
+#include <cstdint>  // uint8_t
 #include <limits>
 #include <string>
 
diff --git a/fml/base32.h b/fml/base32.h
index aacbdc696e3ada360cfdb0ed058ad8f6d6a9a8fe..7892aaddb348413a86ea392f2c8f709af0b5339e 100644
--- a/fml/base32.h
+++ b/fml/base32.h
@@ -25,7 +25,7 @@ class BitConverter {
   int Extract() {
     FML_DCHECK(CanExtract());
     int result = Peek();
-    buffer_ = (buffer_ << to_length) & mask_;
+    buffer_ = (buffer_ << to_length) & kMask;
     lower_free_bits_ += to_length;
     return result;
   }
@@ -40,7 +40,7 @@ class BitConverter {
   static_assert(buffer_length >= 2 * to_length);
   static_assert(buffer_length < sizeof(int) * 8);
 
-  static constexpr int mask_ = (1 << buffer_length) - 1;
+  static constexpr int kMask = (1 << buffer_length) - 1;
 
   int buffer_ = 0;
   int lower_free_bits_ = buffer_length;
diff --git a/fml/build_config.h b/fml/build_config.h
index a43431f1a03266454a84b06d2e7639b78d5b6dfe..f1481b22c322953b7d46b581088134b99a15779e 100644
--- a/fml/build_config.h
+++ b/fml/build_config.h
@@ -30,6 +30,10 @@
 #define FML_OS_IOS 1
 #endif  // defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
 
+#if defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR
+#define FML_OS_IOS_SIMULATOR 1
+#endif  // defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+
 #elif defined(__OHOS_FAMILY__)
 #define FML_OS_OHOS 1
 // include a system header to pull in features.h for glibc/uclibc macros.
diff --git a/fml/closure.h b/fml/closure.h
index 7631f3a7be439bb27bce002f058e2fcac4d0bc25..3a0de0dcbbc6d927eb4b76642bb0a93982764bf3 100644
--- a/fml/closure.h
+++ b/fml/closure.h
@@ -29,10 +29,19 @@ using closure = std::function<void()>;
 ///             automatically at the end of the scope. This covers the cases
 ///             where there are early returns as well.
 ///
-class ScopedCleanupClosure {
+class ScopedCleanupClosure final {
  public:
   ScopedCleanupClosure() = default;
 
+  ScopedCleanupClosure(ScopedCleanupClosure&& other) {
+    closure_ = other.Release();
+  }
+
+  ScopedCleanupClosure& operator=(ScopedCleanupClosure&& other) {
+    closure_ = other.Release();
+    return *this;
+  }
+
   explicit ScopedCleanupClosure(const fml::closure& closure)
       : closure_(closure) {}
 
diff --git a/fml/closure_unittests.cc b/fml/closure_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..37124d9ae16c6e7e748e7228adaf83bba6b479d0
--- /dev/null
+++ b/fml/closure_unittests.cc
@@ -0,0 +1,71 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "fml/closure.h"
+#include "gtest/gtest.h"
+
+TEST(ScopedCleanupClosureTest, DestructorDoesNothingWhenNoClosureSet) {
+  fml::ScopedCleanupClosure cleanup;
+
+  // Nothing should happen.
+}
+
+TEST(ScopedCleanupClosureTest, ReleaseDoesNothingWhenNoClosureSet) {
+  fml::ScopedCleanupClosure cleanup;
+
+  // Nothing should happen.
+  EXPECT_EQ(nullptr, cleanup.Release());
+}
+
+TEST(ScopedCleanupClosureTest, ClosureInvokedOnDestructorWhenSetInConstructor) {
+  auto invoked = false;
+
+  {
+    fml::ScopedCleanupClosure cleanup([&invoked]() { invoked = true; });
+
+    EXPECT_FALSE(invoked);
+  }
+
+  EXPECT_TRUE(invoked);
+}
+
+TEST(ScopedCleanupClosureTest, ClosureInvokedOnDestructorWhenSet) {
+  auto invoked = false;
+
+  {
+    fml::ScopedCleanupClosure cleanup;
+    cleanup.SetClosure([&invoked]() { invoked = true; });
+
+    EXPECT_FALSE(invoked);
+  }
+
+  EXPECT_TRUE(invoked);
+}
+
+TEST(ScopedCleanupClosureTest, ClosureNotInvokedWhenMoved) {
+  auto invoked = 0;
+
+  {
+    fml::ScopedCleanupClosure cleanup([&invoked]() { invoked++; });
+    fml::ScopedCleanupClosure cleanup2(std::move(cleanup));
+
+    EXPECT_EQ(0, invoked);
+  }
+
+  EXPECT_EQ(1, invoked);
+}
+
+TEST(ScopedCleanupClosureTest, ClosureNotInvokedWhenMovedViaAssignment) {
+  auto invoked = 0;
+
+  {
+    fml::ScopedCleanupClosure cleanup([&invoked]() { invoked++; });
+    fml::ScopedCleanupClosure cleanup2;
+    cleanup2 = std::move(cleanup);
+
+    EXPECT_EQ(0, invoked);
+  }
+
+  EXPECT_EQ(1, invoked);
+}
diff --git a/fml/command_line.h b/fml/command_line.h
index c920da4023b650e109053da4bb2a81bf4bc597d9..67bb7a6129183664cd6e561986e4e191d6eb9e93 100644
--- a/fml/command_line.h
+++ b/fml/command_line.h
@@ -33,8 +33,8 @@
 // mostly explains a.), c. it makes parsing "subcommands", like "my_program
 // --flag_for_my_program subcommand --flag_for_subcommand" saner.
 
-#ifndef LIB_FML_COMMAND_LINE_H_
-#define LIB_FML_COMMAND_LINE_H_
+#ifndef FLUTTER_FML_COMMAND_LINE_H_
+#define FLUTTER_FML_COMMAND_LINE_H_
 
 #include <cstddef>
 #include <initializer_list>
@@ -263,4 +263,4 @@ std::vector<std::string> CommandLineToArgv(const CommandLine& command_line);
 
 }  // namespace fml
 
-#endif  // LIB_FML_COMMAND_LINE_H_
+#endif  // FLUTTER_FML_COMMAND_LINE_H_
diff --git a/fml/concurrent_message_loop.cc b/fml/concurrent_message_loop.cc
index 681b983fca3ed9d322b8c71ed0cbc4aadb40cfd9..ace1985c24a156a6b4c824a69d9c119af1041164 100644
--- a/fml/concurrent_message_loop.cc
+++ b/fml/concurrent_message_loop.cc
@@ -11,12 +11,6 @@
 
 namespace fml {
 
-std::shared_ptr<ConcurrentMessageLoop> ConcurrentMessageLoop::Create(
-    size_t worker_count) {
-  return std::shared_ptr<ConcurrentMessageLoop>{
-      new ConcurrentMessageLoop(worker_count)};
-}
-
 ConcurrentMessageLoop::ConcurrentMessageLoop(size_t worker_count)
     : worker_count_(std::max<size_t>(worker_count, 1ul)) {
   for (size_t i = 0; i < worker_count_; ++i) {
@@ -35,6 +29,7 @@ ConcurrentMessageLoop::ConcurrentMessageLoop(size_t worker_count)
 ConcurrentMessageLoop::~ConcurrentMessageLoop() {
   Terminate();
   for (auto& worker : workers_) {
+    FML_DCHECK(worker.joinable());
     worker.join();
   }
 }
@@ -60,7 +55,7 @@ void ConcurrentMessageLoop::PostTask(const fml::closure& task) {
         << "Tried to post a task to shutdown concurrent message "
            "loop. The task will be executed on the callers thread.";
     lock.unlock();
-    task();
+    ExecuteTask(task);
     return;
   }
 
@@ -103,12 +98,12 @@ void ConcurrentMessageLoop::WorkerMain() {
     TRACE_EVENT0("flutter", "ConcurrentWorkerWake");
     // Execute the primary task we woke up for.
     if (task) {
-      task();
+      ExecuteTask(task);
     }
 
     // Execute any thread tasks.
     for (const auto& thread_task : thread_tasks) {
-      thread_task();
+      ExecuteTask(thread_task);
     }
 
     if (shutdown_now) {
@@ -117,6 +112,10 @@ void ConcurrentMessageLoop::WorkerMain() {
   }
 }
 
+void ConcurrentMessageLoop::ExecuteTask(const fml::closure& task) {
+  task();
+}
+
 void ConcurrentMessageLoop::Terminate() {
   std::scoped_lock lock(tasks_mutex_);
   shutdown_ = true;
@@ -170,4 +169,14 @@ void ConcurrentTaskRunner::PostTask(const fml::closure& task) {
   task();
 }
 
+bool ConcurrentMessageLoop::RunsTasksOnCurrentThread() {
+  std::scoped_lock lock(tasks_mutex_);
+  for (const auto& worker_thread_id : worker_thread_ids_) {
+    if (worker_thread_id == std::this_thread::get_id()) {
+      return true;
+    }
+  }
+  return false;
+}
+
 }  // namespace fml
diff --git a/fml/concurrent_message_loop.h b/fml/concurrent_message_loop.h
index c043705935e5773cdb25fb3a95328614e5c6ddb7..2d1e2dafab3e97827902df9026805a2c258a7689 100644
--- a/fml/concurrent_message_loop.h
+++ b/fml/concurrent_message_loop.h
@@ -24,7 +24,7 @@ class ConcurrentMessageLoop
   static std::shared_ptr<ConcurrentMessageLoop> Create(
       size_t worker_count = std::thread::hardware_concurrency());
 
-  ~ConcurrentMessageLoop();
+  virtual ~ConcurrentMessageLoop();
 
   size_t GetWorkerCount() const;
 
@@ -34,6 +34,12 @@ class ConcurrentMessageLoop
 
   void PostTaskToAllWorkers(const fml::closure& task);
 
+  bool RunsTasksOnCurrentThread();
+
+ protected:
+  explicit ConcurrentMessageLoop(size_t worker_count);
+  virtual void ExecuteTask(const fml::closure& task);
+
  private:
   friend ConcurrentTaskRunner;
 
@@ -46,8 +52,6 @@ class ConcurrentMessageLoop
   std::map<std::thread::id, std::vector<fml::closure>> thread_tasks_;
   bool shutdown_ = false;
 
-  explicit ConcurrentMessageLoop(size_t worker_count);
-
   void WorkerMain();
 
   void PostTask(const fml::closure& task);
diff --git a/fml/concurrent_message_loop_factory.cc b/fml/concurrent_message_loop_factory.cc
new file mode 100644
index 0000000000000000000000000000000000000000..e5f879efd765f72a32cdeeccc77b71705178bb7e
--- /dev/null
+++ b/fml/concurrent_message_loop_factory.cc
@@ -0,0 +1,15 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/fml/concurrent_message_loop.h"
+
+namespace fml {
+
+std::shared_ptr<ConcurrentMessageLoop> ConcurrentMessageLoop::Create(
+    size_t worker_count) {
+  return std::shared_ptr<ConcurrentMessageLoop>{
+      new ConcurrentMessageLoop(worker_count)};
+}
+
+}  // namespace fml
diff --git a/fml/cpu_affinity.cc b/fml/cpu_affinity.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ccb2e89686581b3e791ca065fb1d31cf75aa93b5
--- /dev/null
+++ b/fml/cpu_affinity.cc
@@ -0,0 +1,100 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/fml/cpu_affinity.h"
+#include "flutter/fml/build_config.h"
+
+#include <fstream>
+#include <optional>
+#include <string>
+
+#ifdef FML_OS_ANDROID
+#include "flutter/fml/platform/android/cpu_affinity.h"
+#endif  // FML_OS_ANDROID
+
+namespace fml {
+
+std::optional<size_t> EfficiencyCoreCount() {
+#ifdef FML_OS_ANDROID
+  return AndroidEfficiencyCoreCount();
+#else
+  return std::nullopt;
+#endif
+}
+
+bool RequestAffinity(CpuAffinity affinity) {
+#ifdef FML_OS_ANDROID
+  return AndroidRequestAffinity(affinity);
+#else
+  return true;
+#endif
+}
+
+CPUSpeedTracker::CPUSpeedTracker(std::vector<CpuIndexAndSpeed> data)
+    : cpu_speeds_(std::move(data)) {
+  std::optional<int64_t> max_speed = std::nullopt;
+  std::optional<int64_t> min_speed = std::nullopt;
+  for (const auto& data : cpu_speeds_) {
+    if (!max_speed.has_value() || data.speed > max_speed.value()) {
+      max_speed = data.speed;
+    }
+    if (!min_speed.has_value() || data.speed < min_speed.value()) {
+      min_speed = data.speed;
+    }
+  }
+  if (!max_speed.has_value() || !min_speed.has_value() ||
+      min_speed.value() == max_speed.value()) {
+    return;
+  }
+  const int64_t max_speed_value = max_speed.value();
+  const int64_t min_speed_value = min_speed.value();
+
+  for (const auto& data : cpu_speeds_) {
+    if (data.speed == max_speed_value) {
+      performance_.push_back(data.index);
+    } else {
+      not_performance_.push_back(data.index);
+    }
+    if (data.speed == min_speed_value) {
+      efficiency_.push_back(data.index);
+    }
+  }
+
+  valid_ = true;
+}
+
+bool CPUSpeedTracker::IsValid() const {
+  return valid_;
+}
+
+const std::vector<size_t>& CPUSpeedTracker::GetIndices(
+    CpuAffinity affinity) const {
+  switch (affinity) {
+    case CpuAffinity::kPerformance:
+      return performance_;
+    case CpuAffinity::kEfficiency:
+      return efficiency_;
+    case CpuAffinity::kNotPerformance:
+      return not_performance_;
+  }
+}
+
+// Get the size of the cpuinfo file by reading it until the end. This is
+// required because files under /proc do not always return a valid size
+// when using fseek(0, SEEK_END) + ftell(). Nor can they be mmap()-ed.
+std::optional<int64_t> ReadIntFromFile(const std::string& path) {
+  std::ifstream file;
+  file.open(path.c_str());
+
+  // Dont use stoi because if this data isnt a parseable number then it
+  // will abort, as we compile with exceptions disabled.
+  int64_t speed = 0;
+  file >> speed;
+  if (speed > 0) {
+    return speed;
+  }
+  return std::nullopt;
+}
+
+}  // namespace fml
diff --git a/fml/cpu_affinity.h b/fml/cpu_affinity.h
new file mode 100644
index 0000000000000000000000000000000000000000..b4c54c7bbf187801e7ab3de7fc11f84c9d0356a7
--- /dev/null
+++ b/fml/cpu_affinity.h
@@ -0,0 +1,89 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_FML_CPU_AFFINITY_H_
+#define FLUTTER_FML_CPU_AFFINITY_H_
+
+#include <optional>
+#include <string>
+#include <vector>
+
+namespace fml {
+
+/// The CPU Affinity provides a hint to the operating system on which cores a
+/// particular thread should be scheduled on. The operating system may or may
+/// not honor these requests.
+enum class CpuAffinity {
+  /// @brief Request CPU affinity for the performance cores.
+  ///
+  ///        Generally speaking, only the UI and Raster thread should
+  ///        use this option.
+  kPerformance,
+
+  /// @brief Request CPU affinity for the efficiency cores.
+  kEfficiency,
+
+  /// @brief Request affinity for all non-performance cores.
+  kNotPerformance,
+};
+
+/// @brief Request count of efficiency cores.
+///
+///        Efficiency cores are defined as those with the lowest reported
+///        cpu_max_freq. If the CPU speed could not be determined, or if all
+///        cores have the same reported speed then this returns std::nullopt.
+///        That is, the result will never be 0.
+std::optional<size_t> EfficiencyCoreCount();
+
+/// @brief Request the given affinity for the current thread.
+///
+///        Returns true if successfull, or if it was a no-op. This function is
+///        only supported on Android devices.
+///
+///        Affinity requests are based on documented CPU speed. This speed data
+///        is parsed from cpuinfo_max_freq files, see also:
+///        https://www.kernel.org/doc/Documentation/cpu-freq/user-guide.txt
+bool RequestAffinity(CpuAffinity affinity);
+
+struct CpuIndexAndSpeed {
+  // The index of the given CPU.
+  size_t index;
+  // CPU speed in kHZ
+  int64_t speed;
+};
+
+/// @brief A class that computes the correct CPU indices for a requested CPU
+///        affinity.
+///
+/// @note  This is visible for testing.
+class CPUSpeedTracker {
+ public:
+  explicit CPUSpeedTracker(std::vector<CpuIndexAndSpeed> data);
+
+  /// @brief The class is valid if it has more than one CPU index and a distinct
+  ///        set of efficiency or performance CPUs.
+  ///
+  ///        If all CPUs are the same speed this returns false, and all requests
+  ///        to set affinity are ignored.
+  bool IsValid() const;
+
+  /// @brief Return the set of CPU indices for the requested CPU affinity.
+  ///
+  ///        If the tracker is valid, this will always return a non-empty set.
+  const std::vector<size_t>& GetIndices(CpuAffinity affinity) const;
+
+ private:
+  bool valid_ = false;
+  std::vector<CpuIndexAndSpeed> cpu_speeds_;
+  std::vector<size_t> efficiency_;
+  std::vector<size_t> performance_;
+  std::vector<size_t> not_performance_;
+};
+
+/// @note Visible for testing.
+std::optional<int64_t> ReadIntFromFile(const std::string& path);
+
+}  // namespace fml
+
+#endif  // FLUTTER_FML_CPU_AFFINITY_H_
diff --git a/fml/cpu_affinity_unittests.cc b/fml/cpu_affinity_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..8a5c90687ed243b845cee3dbbaffbe4ada50487e
--- /dev/null
+++ b/fml/cpu_affinity_unittests.cc
@@ -0,0 +1,95 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "cpu_affinity.h"
+
+#include "fml/file.h"
+#include "fml/mapping.h"
+#include "gtest/gtest.h"
+#include "logging.h"
+
+namespace fml {
+namespace testing {
+
+TEST(CpuAffinity, NonAndroidPlatformDefaults) {
+  ASSERT_FALSE(fml::EfficiencyCoreCount().has_value());
+  ASSERT_TRUE(fml::RequestAffinity(fml::CpuAffinity::kEfficiency));
+}
+
+TEST(CpuAffinity, NormalSlowMedFastCores) {
+  auto speeds = {CpuIndexAndSpeed{.index = 0, .speed = 1},
+                 CpuIndexAndSpeed{.index = 1, .speed = 2},
+                 CpuIndexAndSpeed{.index = 2, .speed = 3}};
+  auto tracker = CPUSpeedTracker(speeds);
+
+  ASSERT_TRUE(tracker.IsValid());
+  ASSERT_EQ(tracker.GetIndices(CpuAffinity::kEfficiency)[0], 0u);
+  ASSERT_EQ(tracker.GetIndices(CpuAffinity::kPerformance)[0], 2u);
+  ASSERT_EQ(tracker.GetIndices(CpuAffinity::kNotPerformance).size(), 2u);
+  ASSERT_EQ(tracker.GetIndices(CpuAffinity::kNotPerformance)[0], 0u);
+  ASSERT_EQ(tracker.GetIndices(CpuAffinity::kNotPerformance)[1], 1u);
+}
+
+TEST(CpuAffinity, NoCpuData) {
+  auto tracker = CPUSpeedTracker({});
+
+  ASSERT_FALSE(tracker.IsValid());
+}
+
+TEST(CpuAffinity, AllSameSpeed) {
+  auto speeds = {CpuIndexAndSpeed{.index = 0, .speed = 1},
+                 CpuIndexAndSpeed{.index = 1, .speed = 1},
+                 CpuIndexAndSpeed{.index = 2, .speed = 1}};
+  auto tracker = CPUSpeedTracker(speeds);
+
+  ASSERT_FALSE(tracker.IsValid());
+}
+
+TEST(CpuAffinity, SingleCore) {
+  auto speeds = {CpuIndexAndSpeed{.index = 0, .speed = 1}};
+  auto tracker = CPUSpeedTracker(speeds);
+
+  ASSERT_FALSE(tracker.IsValid());
+}
+
+TEST(CpuAffinity, FileParsing) {
+  fml::ScopedTemporaryDirectory base_dir;
+  ASSERT_TRUE(base_dir.fd().is_valid());
+
+  // Generate a fake CPU speed file
+  fml::DataMapping test_data(std::string("12345"));
+  ASSERT_TRUE(fml::WriteAtomically(base_dir.fd(), "test_file", test_data));
+
+  auto file = fml::OpenFileReadOnly(base_dir.fd(), "test_file");
+  ASSERT_TRUE(file.is_valid());
+
+  // Open file and parse speed.
+  auto result = ReadIntFromFile(base_dir.path() + "/test_file");
+  ASSERT_TRUE(result.has_value());
+  ASSERT_EQ(result.value_or(0), 12345);
+}
+
+TEST(CpuAffinity, FileParsingWithNonNumber) {
+  fml::ScopedTemporaryDirectory base_dir;
+  ASSERT_TRUE(base_dir.fd().is_valid());
+
+  // Generate a fake CPU speed file
+  fml::DataMapping test_data(std::string("whoa this isnt a number"));
+  ASSERT_TRUE(fml::WriteAtomically(base_dir.fd(), "test_file", test_data));
+
+  auto file = fml::OpenFileReadOnly(base_dir.fd(), "test_file");
+  ASSERT_TRUE(file.is_valid());
+
+  // Open file and parse speed.
+  auto result = ReadIntFromFile(base_dir.path() + "/test_file");
+  ASSERT_FALSE(result.has_value());
+}
+
+TEST(CpuAffinity, MissingFileParsing) {
+  auto result = ReadIntFromFile("/does_not_exist");
+  ASSERT_FALSE(result.has_value());
+}
+
+}  // namespace testing
+}  // namespace fml
diff --git a/fml/dart/dart_converter.h b/fml/dart/dart_converter.h
deleted file mode 100644
index ccdd2422abed63f18e58b28dbd41bd986c5c078b..0000000000000000000000000000000000000000
--- a/fml/dart/dart_converter.h
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_FML_DART_DART_CONVERTER_H_
-#define FLUTTER_FML_DART_DART_CONVERTER_H_
-
-#include <memory>
-#include <vector>
-
-#include "flutter/fml/mapping.h"
-#include "third_party/dart/runtime/include/dart_api.h"
-#include "third_party/tonic/converter/dart_converter.h"
-
-namespace tonic {
-
-using DartConverterMapping = std::unique_ptr<fml::Mapping>;
-
-template <>
-struct DartConverter<DartConverterMapping> {
-  static Dart_Handle ToDart(const DartConverterMapping& val) {
-    if (!val) {
-      return Dart_Null();
-    }
-
-    auto dart_list_handle = Dart_NewListOfTypeFilled(
-        ToDartTypeHandle<size_t>(),                 // type
-        CreateZeroInitializedDartObject<size_t>(),  // sentinel
-        val->GetSize()                              // size
-    );
-
-    if (Dart_IsError(dart_list_handle)) {
-      FML_LOG(ERROR) << "Error while attempting to allocate a list: "
-                     << Dart_GetError(dart_list_handle);
-      return dart_list_handle;
-    }
-
-    if (val->GetSize() == 0) {
-      // Nothing to copy. Just return the zero sized list.
-      return dart_list_handle;
-    }
-
-    auto result = Dart_ListSetAsBytes(dart_list_handle,   // list
-                                      0,                  // offset
-                                      val->GetMapping(),  // native array,
-                                      val->GetSize()      // length
-    );
-
-    if (Dart_IsError(result)) {
-      FML_LOG(ERROR) << "Error while attempting to create a Dart list: "
-                     << Dart_GetError(result);
-      return result;
-    }
-
-    return dart_list_handle;
-  }
-
-  static void SetReturnValue(Dart_NativeArguments args,
-                             const DartConverterMapping& val) {
-    Dart_SetReturnValue(args, ToDart(val));
-  }
-
-  static DartConverterMapping FromDart(Dart_Handle dart_list) {
-    if (Dart_IsNull(dart_list)) {
-      return nullptr;
-    }
-
-    if (Dart_IsError(dart_list)) {
-      FML_LOG(ERROR) << "Cannot convert an error handle to a list: "
-                     << Dart_GetError(dart_list);
-      return nullptr;
-    }
-
-    if (!Dart_IsList(dart_list)) {
-      FML_LOG(ERROR) << "Dart handle was not a list.";
-      return nullptr;
-    }
-
-    intptr_t length = 0;
-    auto handle = Dart_ListLength(dart_list, &length);
-
-    if (Dart_IsError(handle)) {
-      FML_LOG(ERROR) << "Could not get the length of the Dart list: "
-                     << Dart_GetError(handle);
-      return nullptr;
-    }
-
-    if (length == 0) {
-      // Return a valid zero sized mapping.
-      return std::make_unique<fml::NonOwnedMapping>(nullptr, 0);
-    }
-
-    auto mapping_buffer = ::malloc(length);
-
-    if (!mapping_buffer) {
-      FML_LOG(ERROR)
-          << "Out of memory while attempting to allocate a mapping of size: "
-          << length;
-      return nullptr;
-    }
-
-    auto mapping = std::make_unique<fml::NonOwnedMapping>(
-        static_cast<const uint8_t*>(mapping_buffer), length,
-        [](const uint8_t* data, size_t size) {
-          ::free(const_cast<uint8_t*>(data));
-        });
-
-    handle = Dart_ListGetAsBytes(
-        dart_list,                              // list
-        0,                                      // offset
-        static_cast<uint8_t*>(mapping_buffer),  // native array
-        length                                  // length
-    );
-
-    if (Dart_IsError(handle)) {
-      FML_LOG(ERROR) << "Could not copy Dart list to native buffer: "
-                     << Dart_GetError(handle);
-      return nullptr;
-    }
-
-    return mapping;
-  }
-};
-
-}  // namespace tonic
-
-#endif  // FLUTTER_FML_DART_DART_CONVERTER_H_
diff --git a/fml/endianness.h b/fml/endianness.h
index 269b461492184641f31422d909fd02ac7ee61762..18758b7b6949297b1638f66b8727acedcbdf3f60 100644
--- a/fml/endianness.h
+++ b/fml/endianness.h
@@ -26,9 +26,17 @@
 
 namespace fml {
 
+template <typename T>
+struct IsByteSwappable
+    : public std::
+          integral_constant<bool, std::is_integral_v<T> || std::is_enum_v<T>> {
+};
+template <typename T>
+constexpr bool kIsByteSwappableV = IsByteSwappable<T>::value;
+
 /// @brief  Flips the endianness of the given value.
 ///         The given value must be an integral type of size 1, 2, 4, or 8.
-template <typename T, class = std::enable_if_t<std::is_integral_v<T>>>
+template <typename T, class = std::enable_if_t<kIsByteSwappableV<T>>>
 constexpr T ByteSwap(T n) {
   if constexpr (sizeof(T) == 1) {
     return n;
@@ -47,7 +55,7 @@ constexpr T ByteSwap(T n) {
 ///         current architecture. This is effectively a cross platform
 ///         ntohl/ntohs (as network byte order is always Big Endian).
 ///         The given value must be an integral type of size 1, 2, 4, or 8.
-template <typename T, class = std::enable_if_t<std::is_integral_v<T>>>
+template <typename T, class = std::enable_if_t<kIsByteSwappableV<T>>>
 constexpr T BigEndianToArch(T n) {
 #if FML_ARCH_CPU_LITTLE_ENDIAN
   return ByteSwap<T>(n);
@@ -59,7 +67,7 @@ constexpr T BigEndianToArch(T n) {
 /// @brief  Convert a known little endian value to match the endianness of the
 ///         current architecture.
 ///         The given value must be an integral type of size 1, 2, 4, or 8.
-template <typename T, class = std::enable_if_t<std::is_integral_v<T>>>
+template <typename T, class = std::enable_if_t<kIsByteSwappableV<T>>>
 constexpr T LittleEndianToArch(T n) {
 #if !FML_ARCH_CPU_LITTLE_ENDIAN
   return ByteSwap<T>(n);
diff --git a/fml/hex_codec.cc b/fml/hex_codec.cc
index 7c5fb0f27bc612b4caeea4d4f21d8cbb8071b2b1..7a3f4f102cb6129a828cff0ca8a44edd89ec4b17 100644
--- a/fml/hex_codec.cc
+++ b/fml/hex_codec.cc
@@ -4,6 +4,7 @@
 
 #include "flutter/fml/base32.h"
 
+#include <cstdint>  // uint8_t
 #include <string>
 
 namespace fml {
diff --git a/fml/log_level.h b/fml/log_level.h
index 79316f86b657a66114aab8ff2a926335912f97f7..a53b4ab44cde27a593eab1b82eb4a51e98a7cc70 100644
--- a/fml/log_level.h
+++ b/fml/log_level.h
@@ -7,30 +7,62 @@
 
 namespace fml {
 
+// Default log levels. Negative values can be used for verbose log levels.
 typedef int LogSeverity;
 
-// Default log levels. Negative values can be used for verbose log levels.
-constexpr LogSeverity LOG_INFO = 0;
-constexpr LogSeverity LOG_WARNING = 1;
-constexpr LogSeverity LOG_ERROR = 2;
-constexpr LogSeverity LOG_FATAL = 3;
-constexpr LogSeverity LOG_NUM_SEVERITIES = 4;
-constexpr LogSeverity LOG_DEBUG= 4;
+constexpr LogSeverity kLogInfo = 0;
+constexpr LogSeverity kLogWarning = 1;
+constexpr LogSeverity kLogError = 2;
+// A log that is not an error, is important enough to display even if ordinary
+// info is hidden.
+constexpr LogSeverity kLogImportant = 3;
+constexpr LogSeverity kLogFatal = 4;
+constexpr LogSeverity kLogNumSeverities = 5;
+
+// DEPRECATED: Use |kLogInfo|.
+// Ignoring Clang Tidy because this is used in a very common substitution macro.
+// NOLINTNEXTLINE(readability-identifier-naming)
+constexpr LogSeverity LOG_INFO = kLogInfo;
+
+// DEPRECATED: Use |kLogWarning|.
+// Ignoring Clang Tidy because this is used in a very common substitution macro.
+// NOLINTNEXTLINE(readability-identifier-naming)
+constexpr LogSeverity LOG_WARNING = kLogWarning;
+
+// DEPRECATED: Use |kLogError|.
+// Ignoring Clang Tidy because this is used in a very common substitution macro.
+// NOLINTNEXTLINE(readability-identifier-naming)
+constexpr LogSeverity LOG_ERROR = kLogError;
+
+// DEPRECATED: Use |kLogImportant|.
+// Ignoring Clang Tidy because this is used in a very common substitution macro.
+// NOLINTNEXTLINE(readability-identifier-naming)
+constexpr LogSeverity LOG_IMPORTANT = kLogImportant;
+
+// DEPRECATED: Use |kLogFatal|.
+// Ignoring Clang Tidy because this is used in a very common substitution macro.
+// NOLINTNEXTLINE(readability-identifier-naming)
+constexpr LogSeverity LOG_FATAL = kLogFatal;
 
 // One of the Windows headers defines ERROR to 0. This makes the token
 // concatenation in FML_LOG(ERROR) to resolve to LOG_0. We define this back to
 // the appropriate log level.
 #ifdef _WIN32
-#define LOG_0 LOG_ERROR
+#define LOG_0 kLogError
 #endif
 
-// LOG_DFATAL is LOG_FATAL in debug mode, ERROR in normal mode
+// kLogDFatal is kLogFatal in debug mode, kLogError in normal mode
 #ifdef NDEBUG
-const LogSeverity LOG_DFATAL = LOG_ERROR;
+const LogSeverity kLogDFatal = kLogError;
 #else
-const LogSeverity LOG_DFATAL = LOG_FATAL;
+const LogSeverity kLogDFatal = kLogFatal;
 #endif
 
+// DEPRECATED: Use |kLogDFatal|.
+// Ignoring Clang Tidy because this is used in a very common substitution macro.
+// NOLINTNEXTLINE(readability-identifier-naming)
+const LogSeverity LOG_DFATAL = kLogDFatal;
+
 }  // namespace fml
 
 #endif  // FLUTTER_FML_LOG_LEVEL_H_
diff --git a/fml/log_settings.cc b/fml/log_settings.cc
index 93df3d4f237199829053275d1453cfda7e2ae08c..8584517c1a16dc10811deaae56d9be9a33eb3761 100644
--- a/fml/log_settings.cc
+++ b/fml/log_settings.cc
@@ -12,12 +12,9 @@
 #include <limits>
 
 #include "flutter/fml/build_config.h"
+#include "flutter/fml/log_level.h"
 #include "flutter/fml/logging.h"
 
-#if defined(OS_FUCHSIA)
-#include <lib/syslog/global.h>
-#endif
-
 namespace fml {
 namespace state {
 
@@ -29,15 +26,7 @@ extern LogSettings g_log_settings;
 void SetLogSettings(const LogSettings& settings) {
   // Validate the new settings as we set them.
   state::g_log_settings.min_log_level =
-      std::min(LOG_FATAL, settings.min_log_level);
-#if defined(OS_FUCHSIA)
-  // Syslog should accept all logs, since filtering by severity is done by fml.
-  fx_logger_t* logger = fx_log_get_logger();
-  if (logger) {
-    fx_logger_set_min_severity(logger,
-                               std::numeric_limits<fx_log_severity_t>::min());
-  }
-#endif
+      std::min(kLogFatal, settings.min_log_level);
 }
 
 LogSettings GetLogSettings() {
@@ -45,7 +34,7 @@ LogSettings GetLogSettings() {
 }
 
 int GetMinLogLevel() {
-  return std::min(state::g_log_settings.min_log_level, LOG_FATAL);
+  return std::min(state::g_log_settings.min_log_level, kLogFatal);
 }
 
 ScopedSetLogSettings::ScopedSetLogSettings(const LogSettings& settings) {
diff --git a/fml/log_settings.h b/fml/log_settings.h
index 6a3664f0d3989fd2f7583d0601d881f63e4b5670..91587aaf82a0635a3f2983528c2d07e496b75535 100644
--- a/fml/log_settings.h
+++ b/fml/log_settings.h
@@ -17,12 +17,12 @@ struct LogSettings {
   // Anything at or above this level will be logged (if applicable).
   // Anything below this level will be silently ignored.
   //
-  // The log level defaults to 0 (LOG_INFO).
+  // The log level defaults to 0 (kLogInfo).
   //
   // Log messages for FML_VLOG(x) (from flutter/fml/logging.h) are logged
   // at level -x, so setting the min log level to negative values enables
   // verbose logging.
-  LogSeverity min_log_level = LOG_INFO;
+  LogSeverity min_log_level = kLogInfo;
 };
 
 // Gets the active log settings for the current process.
@@ -32,7 +32,7 @@ void SetLogSettings(const LogSettings& settings);
 LogSettings GetLogSettings();
 
 // Gets the minimum log level for the current process. Never returs a value
-// higher than LOG_FATAL.
+// higher than kLogFatal.
 int GetMinLogLevel();
 
 class ScopedSetLogSettings {
diff --git a/fml/logging.cc b/fml/logging.cc
index 84c465a1f84be356fe4bccdd4d4ae6949b7ff004..7672eb13c55759772eacc1bf911e75670ac770a8 100644
--- a/fml/logging.cc
+++ b/fml/logging.cc
@@ -7,6 +7,7 @@
 #include <iostream>
 
 #include "flutter/fml/build_config.h"
+#include "flutter/fml/log_level.h"
 #include "flutter/fml/log_settings.h"
 #include "flutter/fml/logging.h"
 
@@ -15,7 +16,10 @@
 #elif defined(FML_OS_IOS)
 #include <syslog.h>
 #elif defined(OS_FUCHSIA)
-#include <lib/syslog/global.h>
+#include <lib/syslog/structured_backend/cpp/fuchsia_syslog.h>
+#include <lib/syslog/structured_backend/fuchsia_syslog.h>
+#include <zircon/process.h>
+#include "flutter/fml/platform/fuchsia/log_state.h"
 #endif
 
 #ifdef FML_OS_OHOS
@@ -62,15 +66,16 @@ namespace fml {
 namespace {
 
 #if !defined(OS_FUCHSIA)
-const char* const kLogSeverityNames[LOG_NUM_SEVERITIES] = {"INFO", "WARNING",
-                                                           "ERROR", "FATAL"};
+const char* const kLogSeverityNames[kLogNumSeverities] = {
+    "INFO", "WARNING", "ERROR", "IMPORTANT", "FATAL"};
 
 const char* GetNameForLogSeverity(LogSeverity severity) {
-  if (severity >= LOG_INFO && severity < LOG_NUM_SEVERITIES) {
+  if (severity >= kLogInfo && severity < kLogNumSeverities) {
     return kLogSeverityNames[severity];
   }
   return "UNKNOWN";
 }
+#endif
 
 const char* StripDots(const char* path) {
   while (strncmp(path, "../", 3) == 0) {
@@ -79,13 +84,43 @@ const char* StripDots(const char* path) {
   return path;
 }
 
-const char* StripPath(const char* path) {
-  auto* p = strrchr(path, '/');
-  if (p) {
-    return p + 1;
+#if defined(OS_FUCHSIA)
+
+zx_koid_t GetKoid(zx_handle_t handle) {
+  zx_info_handle_basic_t info;
+  zx_status_t status = zx_object_get_info(handle, ZX_INFO_HANDLE_BASIC, &info,
+                                          sizeof(info), nullptr, nullptr);
+  return status == ZX_OK ? info.koid : ZX_KOID_INVALID;
+}
+
+thread_local zx_koid_t tls_thread_koid{ZX_KOID_INVALID};
+
+zx_koid_t GetCurrentThreadKoid() {
+  if (unlikely(tls_thread_koid == ZX_KOID_INVALID)) {
+    tls_thread_koid = GetKoid(zx_thread_self());
   }
-  return path;
+  ZX_DEBUG_ASSERT(tls_thread_koid != ZX_KOID_INVALID);
+  return tls_thread_koid;
 }
+
+static zx_koid_t pid = GetKoid(zx_process_self());
+
+static thread_local zx_koid_t tid = GetCurrentThreadKoid();
+
+std::string GetProcessName(zx_handle_t handle) {
+  char process_name[ZX_MAX_NAME_LEN];
+  zx_status_t status = zx_object_get_property(
+      handle, ZX_PROP_NAME, &process_name, sizeof(process_name));
+  if (status != ZX_OK) {
+    process_name[0] = '\0';
+  }
+  return process_name;
+}
+
+static std::string process_name = GetProcessName(zx_process_self());
+
+static const zx::socket& socket = LogState::Default().socket();
+
 #endif
 
 }  // namespace
@@ -94,16 +129,15 @@ LogMessage::LogMessage(LogSeverity severity,
                        const char* file,
                        int line,
                        const char* condition)
-    : severity_(severity), file_(file), line_(line) {
+    : severity_(severity), file_(StripDots(file)), line_(line) {
 #if !defined(OS_FUCHSIA)
   stream_ << "[";
-  if (severity >= LOG_INFO) {
+  if (severity >= kLogInfo) {
     stream_ << GetNameForLogSeverity(severity);
   } else {
     stream_ << "VERBOSE" << -severity;
   }
-  stream_ << ":" << (severity > LOG_INFO ? StripDots(file_) : StripPath(file_))
-          << "(" << line_ << ")] ";
+  stream_ << ":" << file_ << "(" << line_ << ")] ";
 #endif
 
   if (condition) {
@@ -111,56 +145,97 @@ LogMessage::LogMessage(LogSeverity severity,
   }
 }
 
+// static
+thread_local std::ostringstream* LogMessage::capture_next_log_stream_ = nullptr;
+
+namespace testing {
+
+LogCapture::LogCapture() {
+  fml::LogMessage::CaptureNextLog(&stream_);
+}
+
+LogCapture::~LogCapture() {
+  fml::LogMessage::CaptureNextLog(nullptr);
+}
+
+std::string LogCapture::str() const {
+  return stream_.str();
+}
+
+}  // namespace testing
+
+// static
+void LogMessage::CaptureNextLog(std::ostringstream* stream) {
+  LogMessage::capture_next_log_stream_ = stream;
+}
+
 LogMessage::~LogMessage() {
 #if !defined(OS_FUCHSIA)
   stream_ << std::endl;
 #endif
-
+  if (capture_next_log_stream_) {
+    *capture_next_log_stream_ << stream_.str();
+    capture_next_log_stream_ = nullptr;
+  } else {
 #if defined(FML_OS_ANDROID)
-  android_LogPriority priority =
-      (severity_ < 0) ? ANDROID_LOG_VERBOSE : ANDROID_LOG_UNKNOWN;
-  switch (severity_) {
-    case LOG_INFO:
-      priority = ANDROID_LOG_INFO;
-      break;
-    case LOG_WARNING:
-      priority = ANDROID_LOG_WARN;
-      break;
-    case LOG_ERROR:
-      priority = ANDROID_LOG_ERROR;
-      break;
-    case LOG_FATAL:
-      priority = ANDROID_LOG_FATAL;
-      break;
-  }
-  __android_log_write(priority, "flutter", stream_.str().c_str());
+    android_LogPriority priority =
+        (severity_ < 0) ? ANDROID_LOG_VERBOSE : ANDROID_LOG_UNKNOWN;
+    switch (severity_) {
+      case kLogImportant:
+      case kLogInfo:
+        priority = ANDROID_LOG_INFO;
+        break;
+      case kLogWarning:
+        priority = ANDROID_LOG_WARN;
+        break;
+      case kLogError:
+        priority = ANDROID_LOG_ERROR;
+        break;
+      case kLogFatal:
+        priority = ANDROID_LOG_FATAL;
+        break;
+    }
+    __android_log_write(priority, "flutter", stream_.str().c_str());
 #elif defined(FML_OS_IOS)
-  syslog(LOG_ALERT, "%s", stream_.str().c_str());
+    syslog(LOG_ALERT, "%s", stream_.str().c_str());
 #elif defined(OS_FUCHSIA)
-  fx_log_severity_t fx_severity;
-  switch (severity_) {
-    case LOG_INFO:
-      fx_severity = FX_LOG_INFO;
-      break;
-    case LOG_WARNING:
-      fx_severity = FX_LOG_WARNING;
-      break;
-    case LOG_ERROR:
-      fx_severity = FX_LOG_ERROR;
-      break;
-    case LOG_FATAL:
-      fx_severity = FX_LOG_FATAL;
-      break;
-    default:
-      if (severity_ < 0) {
-        fx_severity = fx_log_severity_from_verbosity(-severity_);
-      } else {
-        // Unknown severity. Use INFO.
-        fx_severity = FX_LOG_INFO;
+    FuchsiaLogSeverity severity;
+    switch (severity_) {
+      case kLogImportant:
+      case kLogInfo:
+        severity = FUCHSIA_LOG_INFO;
+        break;
+      case kLogWarning:
+        severity = FUCHSIA_LOG_WARNING;
+        break;
+      case kLogError:
+        severity = FUCHSIA_LOG_ERROR;
+        break;
+      case kLogFatal:
+        severity = FUCHSIA_LOG_FATAL;
+        break;
+      default:
+        if (severity_ < 0) {
+          severity = FUCHSIA_LOG_DEBUG;
+        } else {
+          // Unknown severity. Use INFO.
+          severity = FUCHSIA_LOG_INFO;
+        }
+        break;
+    }
+    fuchsia_syslog::LogBuffer buffer;
+    buffer.BeginRecord(severity, std::string_view(file_), line_,
+                       std::string_view(stream_.str()), socket.borrow(), 0, pid,
+                       tid);
+    if (!process_name.empty()) {
+      buffer.WriteKeyValue("tag", process_name);
+    }
+    if (auto tags_ptr = LogState::Default().tags()) {
+      for (auto& tag : *tags_ptr) {
+        buffer.WriteKeyValue("tag", tag);
       }
-  }
-  fx_logger_log_with_source(fx_log_get_logger(), fx_severity, nullptr, file_,
-                            line_, stream_.str().c_str());
+    }
+    buffer.FlushRecord();
 #elif defined(FML_OS_OHOS)
   HiLog_LogLevel fx_severity;
 
@@ -185,18 +260,21 @@ LogMessage::~LogMessage() {
 
   std::cerr << stream_.str();
   std::cerr.flush();
+   
 #else
-  std::cerr << stream_.str();
-  std::cerr.flush();
+    // Don't use std::cerr here, because it may not be initialized properly yet.
+    fprintf(stderr, "%s", stream_.str().c_str());
+    fflush(stderr);
 #endif
+  }
 
-  if (severity_ >= LOG_FATAL) {
+  if (severity_ >= kLogFatal) {
     KillProcess();
   }
 }
 
 int GetVlogVerbosity() {
-  return std::max(-1, LOG_INFO - GetMinLogLevel());
+  return std::max(-1, kLogInfo - GetMinLogLevel());
 }
 
 bool ShouldCreateLogMessage(LogSeverity severity) {
diff --git a/fml/logging.h b/fml/logging.h
index 76457f5f1003d1568234db9451925ca0354bc43f..51d249bcad5459c14e7ddaa0e1b3fd0dde173a58 100644
--- a/fml/logging.h
+++ b/fml/logging.h
@@ -12,6 +12,18 @@
 
 namespace fml {
 
+namespace testing {
+struct LogCapture {
+  LogCapture();
+  ~LogCapture();
+
+  std::string str() const;
+
+ private:
+  std::ostringstream stream_;
+};
+}  // namespace testing
+
 class LogMessageVoidify {
  public:
   void operator&(std::ostream&) {}
@@ -27,7 +39,12 @@ class LogMessage {
 
   std::ostream& stream() { return stream_; }
 
+  static void CaptureNextLog(std::ostringstream* stream);
+
  private:
+  // This is a raw pointer so that we avoid having a non-trivially-destructible
+  // static. It is only ever for use in unit tests.
+  static thread_local std::ostringstream* capture_next_log_stream_;
   std::ostringstream stream_;
   const LogSeverity severity_;
   const char* file_;
@@ -40,7 +57,7 @@ class LogMessage {
 int GetVlogVerbosity();
 
 // Returns true if |severity| is at or above the current minimum log level.
-// LOG_FATAL and above is always true.
+// kLogFatal and above is always true.
 bool ShouldCreateLogMessage(LogSeverity severity);
 
 void KillProcess();
@@ -57,7 +74,7 @@ void KillProcess();
   true || (ignored)                        \
       ? (void)0                            \
       : ::fml::LogMessageVoidify() &       \
-            ::fml::LogMessage(::fml::LOG_FATAL, 0, 0, nullptr).stream()
+            ::fml::LogMessage(::fml::kLogFatal, 0, 0, nullptr).stream()
 
 #define FML_LOG_IS_ON(severity) \
   (::fml::ShouldCreateLogMessage(::fml::LOG_##severity))
@@ -67,7 +84,7 @@ void KillProcess();
 
 #define FML_CHECK(condition)                                              \
   FML_LAZY_STREAM(                                                        \
-      ::fml::LogMessage(::fml::LOG_FATAL, __FILE__, __LINE__, #condition) \
+      ::fml::LogMessage(::fml::kLogFatal, __FILE__, __LINE__, #condition) \
           .stream(),                                                      \
       !(condition))
 
diff --git a/fml/logging_unittests.cc b/fml/logging_unittests.cc
index 74caf80d71735d5a80c619c0dd00f4810b796189..e8772a2990d7cfab38195f04aa778ea00b0df8cf 100644
--- a/fml/logging_unittests.cc
+++ b/fml/logging_unittests.cc
@@ -2,35 +2,66 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <signal.h>
+
 #include "flutter/fml/build_config.h"
 #include "flutter/fml/log_settings.h"
 #include "flutter/fml/logging.h"
+#include "fml/log_level.h"
 #include "gtest/gtest.h"
 
-#if defined(OS_FUCHSIA)
-#include <lib/syslog/global.h>
-#include <lib/syslog/logger.h>
-#include <lib/syslog/wire_format.h>
-#include <lib/zx/socket.h>
+namespace fml {
+namespace testing {
 
-#include "gmock/gmock.h"
-#endif
+static_assert(fml::kLogFatal == fml::kLogNumSeverities - 1);
+static_assert(fml::kLogImportant < fml::kLogFatal);
+static_assert(fml::kLogImportant > fml::kLogError);
+
+#ifndef OS_FUCHSIA
+class MakeSureFmlLogDoesNotSegfaultWhenStaticallyCalled {
+ public:
+  MakeSureFmlLogDoesNotSegfaultWhenStaticallyCalled() {
+    SegfaultCatcher catcher;
+    // If this line causes a segfault, FML is using a method of logging that is
+    // not safe from static initialization on your platform.
+    FML_LOG(INFO)
+        << "This log exists to verify that static logging from FML works.";
+  }
 
-#ifdef __clang__
-#pragma clang diagnostic ignored "-Wreturn-type"
-#endif
+ private:
+  struct SegfaultCatcher {
+    typedef void (*sighandler_t)(int);
 
-namespace fml {
-namespace testing {
+    SegfaultCatcher() {
+      handler = ::signal(SIGSEGV, SegfaultHandler);
+      FML_CHECK(handler != SIG_ERR);
+    }
+
+    ~SegfaultCatcher() { FML_CHECK(::signal(SIGSEGV, handler) != SIG_ERR); }
+
+    static void SegfaultHandler(int signal) {
+      fprintf(stderr,
+              "FML failed to handle logging from static initialization.\n");
+      exit(signal);
+    }
+
+    sighandler_t handler;
+  };
+};
+
+static MakeSureFmlLogDoesNotSegfaultWhenStaticallyCalled fml_log_static_check_;
+#endif  // !defined(OS_FUCHSIA)
 
 int UnreachableScopeWithoutReturnDoesNotMakeCompilerMad() {
   KillProcess();
   // return 0; <--- Missing but compiler is fine.
+  return 0;
 }
 
 int UnreachableScopeWithMacroWithoutReturnDoesNotMakeCompilerMad() {
   FML_UNREACHABLE();
   // return 0; <--- Missing but compiler is fine.
+  return 0;
 }
 
 TEST(LoggingTest, UnreachableKillProcess) {
@@ -43,97 +74,30 @@ TEST(LoggingTest, UnreachableKillProcessWithMacro) {
   ASSERT_DEATH({ FML_UNREACHABLE(); }, "");
 }
 
-#if defined(OS_FUCHSIA)
-
-struct LogPacket {
-  fx_log_metadata_t metadata;
-  std::vector<std::string> tags;
-  std::string message;
-};
-
-class LoggingSocketTest : public ::testing::Test {
- protected:
-  void SetUp() override {
-    zx::socket local;
-    ASSERT_EQ(ZX_OK, zx::socket::create(ZX_SOCKET_DATAGRAM, &local, &socket_));
-
-    fx_logger_config_t config = {
-        .min_severity = FX_LOG_INFO,
-        .log_sink_socket = local.release(),
-        .tags = nullptr,
-        .num_tags = 0,
-    };
-
-    fx_log_reconfigure(&config);
-  }
-
-  LogPacket ReadPacket() {
-    LogPacket result;
-    fx_log_packet_t packet;
-    zx_status_t res = socket_.read(0, &packet, sizeof(packet), nullptr);
-    EXPECT_EQ(ZX_OK, res);
-    result.metadata = packet.metadata;
-    int pos = 0;
-    while (packet.data[pos]) {
-      int tag_len = packet.data[pos++];
-      result.tags.emplace_back(packet.data + pos, tag_len);
-      pos += tag_len;
+#ifndef OS_FUCHSIA
+TEST(LoggingTest, SanityTests) {
+  ::testing::FLAGS_gtest_death_test_style = "threadsafe";
+  std::vector<std::string> severities = {"INFO", "WARNING", "ERROR",
+                                         "IMPORTANT"};
+
+  for (size_t i = 0; i < severities.size(); i++) {
+    LogCapture capture;
+    {
+      LogMessage log(i, "path/to/file.cc", 4, nullptr);
+      log.stream() << "Hello!";
     }
-    result.message.append(packet.data + pos + 1);
-    return result;
+    EXPECT_EQ(capture.str(), std::string("[" + severities[i] +
+                                         ":path/to/file.cc(4)] Hello!\n"));
   }
 
-  void ReadPacketAndCompare(fx_log_severity_t severity,
-                            const std::string& message,
-                            const std::vector<std::string>& tags = {}) {
-    LogPacket packet = ReadPacket();
-    EXPECT_EQ(severity, packet.metadata.severity);
-    EXPECT_THAT(packet.message, ::testing::EndsWith(message));
-    EXPECT_EQ(tags, packet.tags);
-  }
-
-  void CheckSocketEmpty() {
-    zx_info_socket_t info = {};
-    zx_status_t status =
-        socket_.get_info(ZX_INFO_SOCKET, &info, sizeof(info), nullptr, nullptr);
-    ASSERT_EQ(ZX_OK, status);
-    EXPECT_EQ(0u, info.rx_buf_available);
-  }
-
-  zx::socket socket_;
-};
-
-TEST_F(LoggingSocketTest, UseSyslogOnFuchsia) {
-  const char* msg1 = "test message";
-  const char* msg2 = "hello";
-  const char* msg3 = "logging";
-  const char* msg4 = "Another message";
-  const char* msg5 = "Foo";
-
-  fml::SetLogSettings({.min_log_level = -1});
-
-  FML_LOG(INFO) << msg1;
-  ReadPacketAndCompare(FX_LOG_INFO, msg1);
-  CheckSocketEmpty();
-
-  FML_LOG(WARNING) << msg2;
-  ReadPacketAndCompare(FX_LOG_WARNING, msg2);
-  CheckSocketEmpty();
-
-  FML_LOG(ERROR) << msg3;
-  ReadPacketAndCompare(FX_LOG_ERROR, msg3);
-  CheckSocketEmpty();
-
-  FML_VLOG(1) << msg4;
-  ReadPacketAndCompare(fx_log_severity_from_verbosity(1), msg4);
-  CheckSocketEmpty();
-
-  // VLOG(2) is not enabled so the log gets dropped.
-  FML_VLOG(2) << msg5;
-  CheckSocketEmpty();
+  ASSERT_DEATH(
+      {
+        LogMessage log(kLogFatal, "path/to/file.cc", 5, nullptr);
+        log.stream() << "Goodbye";
+      },
+      R"(\[FATAL:path/to/file.cc\(5\)\] Goodbye)");
 }
-
-#endif
+#endif  // !OS_FUCHSIA
 
 }  // namespace testing
 }  // namespace fml
diff --git a/fml/macros.h b/fml/macros.h
index 0158d0e18c73ec89fc4e617baaf80540a6c47fec..7de4ddf1f1f420166c4bae8d015a8b3c7dea0bef 100644
--- a/fml/macros.h
+++ b/fml/macros.h
@@ -38,4 +38,7 @@
   TypeName() = delete;                               \
   FML_DISALLOW_COPY_ASSIGN_AND_MOVE(TypeName)
 
+#define FML_FRIEND_TEST(test_case_name, test_name) \
+  friend class test_case_name##_##test_name##_Test
+
 #endif  // FLUTTER_FML_MACROS_H_
diff --git a/fml/math.h b/fml/math.h
index 848f161f5781c3691588f12fbd077e75443e933d..57dced6630b3b2878a833ff523d9f7cb0589ebd9 100644
--- a/fml/math.h
+++ b/fml/math.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_FML_MATH_H_
+#define FLUTTER_FML_MATH_H_
+
 namespace flutter {
 namespace math {
 
@@ -9,16 +12,16 @@ namespace math {
 constexpr float kE = 2.7182818284590452354;
 
 // log_2 e
-constexpr float kLog2_E = 1.4426950408889634074;
+constexpr float kLog2E = 1.4426950408889634074;
 
 // log_10 e
-constexpr float kLog10_E = 0.43429448190325182765;
+constexpr float kLog10E = 0.43429448190325182765;
 
 // log_e 2
-constexpr float klogE_2 = 0.69314718055994530942;
+constexpr float kLogE2 = 0.69314718055994530942;
 
 // log_e 10
-constexpr float klogE_10 = 2.30258509299404568402;
+constexpr float kLogE10 = 2.30258509299404568402;
 
 // pi
 constexpr float kPi = 3.14159265358979323846;
@@ -46,3 +49,5 @@ constexpr float k1OverSqrt2 = 0.70710678118654752440;
 
 }  // namespace math
 }  // namespace flutter
+
+#endif  // FLUTTER_FML_MATH_H_
diff --git a/fml/math_unittests.cc b/fml/math_unittests.cc
index 0e627e28bb615320f19d30fee78265f03554ae3d..020d886037bbdab23182bccc8e7781a03f90cc5d 100644
--- a/fml/math_unittests.cc
+++ b/fml/math_unittests.cc
@@ -12,9 +12,9 @@ namespace testing {
 
 TEST(MathTest, Constants) {
   // Don't use the constants in cmath as those aren't portable.
-  EXPECT_FLOAT_EQ(std::log2(math::kE), math::kLog2_E);
-  EXPECT_FLOAT_EQ(std::log10(math::kE), math::kLog10_E);
-  EXPECT_FLOAT_EQ(std::log(2.0f), math::klogE_2);
+  EXPECT_FLOAT_EQ(std::log2(math::kE), math::kLog2E);
+  EXPECT_FLOAT_EQ(std::log10(math::kE), math::kLog10E);
+  EXPECT_FLOAT_EQ(std::log(2.0f), math::kLogE2);
   EXPECT_FLOAT_EQ(math::kPi / 2.0f, math::kPiOver2);
   EXPECT_FLOAT_EQ(math::kPi / 4.0f, math::kPiOver4);
   EXPECT_FLOAT_EQ(1.0f / math::kPi, math::k1OverPi);
diff --git a/fml/memory/ref_counted_internal.h b/fml/memory/ref_counted_internal.h
index a5c5fe04d6280aa57d5614ea78b0b2fd4beb8834..95f9e6fe75d63a597b75548646b6905c8fb42be1 100644
--- a/fml/memory/ref_counted_internal.h
+++ b/fml/memory/ref_counted_internal.h
@@ -76,8 +76,8 @@ class RefCountedThreadSafeBase {
   mutable std::atomic_uint_fast32_t ref_count_;
 
 #ifndef NDEBUG
-  mutable bool adoption_required_;
-  mutable bool destruction_started_;
+  mutable bool adoption_required_ = false;
+  mutable bool destruction_started_ = false;
 #endif
 
   FML_DISALLOW_COPY_AND_ASSIGN(RefCountedThreadSafeBase);
@@ -87,8 +87,7 @@ inline RefCountedThreadSafeBase::RefCountedThreadSafeBase()
     : ref_count_(1u)
 #ifndef NDEBUG
       ,
-      adoption_required_(true),
-      destruction_started_(false)
+      adoption_required_(true)
 #endif
 {
 }
diff --git a/fml/memory/ref_counted_unittest.cc b/fml/memory/ref_counted_unittest.cc
index 461fd44c708176d080b6281f2d310acbd552dd40..cda149a33a8fa481418cd3fcf21f149148f0f797 100644
--- a/fml/memory/ref_counted_unittest.cc
+++ b/fml/memory/ref_counted_unittest.cc
@@ -128,6 +128,7 @@ TEST(RefCountedTest, Constructors) {
     was_destroyed = false;
     RefPtr<MyClass> r1(MakeRefCounted<MyClass>(&created, &was_destroyed));
     // Copy.
+    // NOLINTNEXTLINE(performance-unnecessary-copy-initialization)
     RefPtr<MyClass> r2(r1);
     EXPECT_TRUE(created);
     EXPECT_EQ(created, r1.get());
@@ -543,6 +544,7 @@ TEST(RefCountedTest, Mix) {
     RefPtr<MyClass> r3 = r2;
     EXPECT_FALSE(created->HasOneRef());
     {
+      // NOLINTNEXTLINE(performance-unnecessary-copy-initialization)
       RefPtr<MyClass> r4(r3);
       r2 = nullptr;
       ASSERT_FALSE(was_destroyed);
diff --git a/fml/memory/ref_ptr.h b/fml/memory/ref_ptr.h
index c426a4901d7a2b385299d6de486b675671620786..2b829fc4f9f78acdba0db8b0586fff5aca5a8cc0 100644
--- a/fml/memory/ref_ptr.h
+++ b/fml/memory/ref_ptr.h
@@ -108,6 +108,7 @@ class RefPtr final {
   // Destructor.
   ~RefPtr() {
     if (ptr_) {
+      // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDelete)
       ptr_->Release();
     }
   }
@@ -205,7 +206,7 @@ class RefPtr final {
 
   friend RefPtr<T> AdoptRef<T>(T*);
 
-  enum AdoptTag { ADOPT };
+  enum AdoptTag { kAdopt };
   RefPtr(T* ptr, AdoptTag) : ptr_(ptr) { FML_DCHECK(ptr_); }
 
   T* ptr_;
@@ -222,7 +223,7 @@ inline RefPtr<T> AdoptRef(T* ptr) {
 #ifndef NDEBUG
   ptr->Adopt();
 #endif
-  return RefPtr<T>(ptr, RefPtr<T>::ADOPT);
+  return RefPtr<T>(ptr, RefPtr<T>::kAdopt);
 }
 
 // Constructs a |RefPtr<T>| from a plain pointer (to an object that must
diff --git a/fml/memory/task_runner_checker.h b/fml/memory/task_runner_checker.h
index 42dbd60cf411d4e576ef7e066e9d09ca56405c2b..67e09b5e1c597847dbde293be6ce62837b1af2ae 100644
--- a/fml/memory/task_runner_checker.h
+++ b/fml/memory/task_runner_checker.h
@@ -38,4 +38,4 @@ class TaskRunnerChecker final {
 
 }  // namespace fml
 
-#endif  // FLUTTER_FML_MEMORY_THREAD_CHECKER_H_
+#endif  // FLUTTER_FML_MEMORY_TASK_RUNNER_CHECKER_H_
diff --git a/impeller/entity/shaders/blending/advanced_blend_hue.frag b/fml/memory/thread_checker.cc
similarity index 56%
rename from impeller/entity/shaders/blending/advanced_blend_hue.frag
rename to fml/memory/thread_checker.cc
index c0355b4b00d341d78a902957c169c3a89988f04c..8a7e02385a1072f7277eac8a463be1d21311d4e2 100644
--- a/impeller/entity/shaders/blending/advanced_blend_hue.frag
+++ b/fml/memory/thread_checker.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <impeller/blending.glsl>
+#include "flutter/fml/memory/thread_checker.h"
 
-vec3 Blend(vec3 dst, vec3 src) {
-  return IPBlendHue(dst, src);
-}
+namespace fml {
+
+thread_local bool ThreadChecker::disable_next_failure_ = false;
 
-#include "advanced_blend.glsl"
+}
diff --git a/fml/memory/thread_checker.h b/fml/memory/thread_checker.h
index a5aed0d2b7c0ce52b1eb64cd9554bff1770591d7..220ea6fb67782d7651fd527dca4498ef1be85a8b 100644
--- a/fml/memory/thread_checker.h
+++ b/fml/memory/thread_checker.h
@@ -29,12 +29,25 @@ namespace fml {
 // |CalledOnValidThread()| that lies in Release builds seems bad. Moreover,
 // there's a small space cost to having even an empty class. )
 class ThreadChecker final {
+ public:
+  static void DisableNextThreadCheckFailure() { disable_next_failure_ = true; }
+
+ private:
+  static thread_local bool disable_next_failure_;
+
  public:
 #if defined(FML_OS_WIN)
   ThreadChecker() : self_(GetCurrentThreadId()) {}
   ~ThreadChecker() {}
 
-  bool IsCreationThreadCurrent() const { return GetCurrentThreadId() == self_; }
+  bool IsCreationThreadCurrent() const {
+    bool result = GetCurrentThreadId() == self_;
+    if (!result && disable_next_failure_) {
+      disable_next_failure_ = false;
+      return true;
+    }
+    return result;
+  }
 
  private:
   DWORD self_;
@@ -48,6 +61,10 @@ class ThreadChecker final {
   bool IsCreationThreadCurrent() const {
     pthread_t current_thread = pthread_self();
     bool is_creation_thread_current = !!pthread_equal(current_thread, self_);
+    if (disable_next_failure_ && !is_creation_thread_current) {
+      disable_next_failure_ = false;
+      return true;
+    }
 #ifdef __APPLE__
     // TODO(https://github.com/flutter/flutter/issues/45272): Implement for
     // other platforms.
@@ -58,9 +75,10 @@ class ThreadChecker final {
       if (0 == pthread_getname_np(current_thread, actual_thread,
                                   buffer_length) &&
           0 == pthread_getname_np(self_, expected_thread, buffer_length)) {
-        FML_DLOG(ERROR) << "IsCreationThreadCurrent expected thread: '"
-                        << expected_thread << "' actual thread:'"
-                        << actual_thread << "'";
+        FML_DLOG(ERROR) << "Object referenced on a thread other than the one "
+                           "on which it was created. Expected thread: '"
+                        << expected_thread << "'. Actual thread: '"
+                        << actual_thread << "'.";
       }
     }
 #endif  // __APPLE__
diff --git a/fml/memory/weak_ptr.h b/fml/memory/weak_ptr.h
index 8507b8aefed9fbe7f47b5f619ef019534f2183f4..bd09610cf309cacc386e30626ab2b0326f5be0f3 100644
--- a/fml/memory/weak_ptr.h
+++ b/fml/memory/weak_ptr.h
@@ -117,7 +117,7 @@ class WeakPtr {
 
   explicit WeakPtr(T* ptr,
                    fml::RefPtr<fml::internal::WeakPtrFlag>&& flag,
-                   DebugThreadChecker checker)
+                   const DebugThreadChecker& checker)
       : ptr_(ptr), flag_(std::move(flag)), checker_(checker) {}
   T* ptr_;
   fml::RefPtr<fml::internal::WeakPtrFlag> flag_;
@@ -203,7 +203,7 @@ class TaskRunnerAffineWeakPtr {
   explicit TaskRunnerAffineWeakPtr(
       T* ptr,
       fml::RefPtr<fml::internal::WeakPtrFlag>&& flag,
-      DebugTaskRunnerChecker checker)
+      const DebugTaskRunnerChecker& checker)
       : ptr_(ptr), flag_(std::move(flag)), checker_(checker) {}
 
   T* ptr_;
diff --git a/fml/memory/weak_ptr_internal.h b/fml/memory/weak_ptr_internal.h
index 28d1fca6d4f57f0dbeeea0ec65db10ec5ff2069d..d94ce7c6fa588a39ce625b612b9bb4f7780e2531 100644
--- a/fml/memory/weak_ptr_internal.h
+++ b/fml/memory/weak_ptr_internal.h
@@ -30,7 +30,7 @@ class WeakPtrFlag : public fml::RefCountedThreadSafe<WeakPtrFlag> {
   void Invalidate();
 
  private:
-  bool is_valid_;
+  bool is_valid_ = false;
 
   FML_DISALLOW_COPY_AND_ASSIGN(WeakPtrFlag);
 };
diff --git a/fml/memory/weak_ptr_unittest.cc b/fml/memory/weak_ptr_unittest.cc
index 3fda8a2c36bfcddb93797fe714ff6ad072baa77e..d995ec993cfb9ca217a626d4fa8d2bec72b0bd3f 100644
--- a/fml/memory/weak_ptr_unittest.cc
+++ b/fml/memory/weak_ptr_unittest.cc
@@ -28,7 +28,7 @@ TEST(WeakPtrTest, CopyConstruction) {
   int data = 0;
   WeakPtrFactory<int> factory(&data);
   WeakPtr<int> ptr = factory.GetWeakPtr();
-  WeakPtr<int> ptr2(ptr);
+  const WeakPtr<int>& ptr2(ptr);
   EXPECT_EQ(&data, ptr.get());
   EXPECT_EQ(&data, ptr2.get());
 }
diff --git a/fml/message_loop.cc b/fml/message_loop.cc
index 615165b2f919538081b6fc9ddc08aa857d56635d..a4a90dab6449018ce8cdeacf182cf608ca7766a2 100644
--- a/fml/message_loop.cc
+++ b/fml/message_loop.cc
@@ -4,17 +4,17 @@
 
 #include "flutter/fml/message_loop.h"
 
+#include <memory>
 #include <utility>
 
 #include "flutter/fml/memory/ref_counted.h"
 #include "flutter/fml/memory/ref_ptr.h"
 #include "flutter/fml/message_loop_impl.h"
 #include "flutter/fml/task_runner.h"
-#include "flutter/fml/thread_local.h"
 
 namespace fml {
 
-FML_THREAD_LOCAL ThreadLocalUniquePtr<MessageLoop> tls_message_loop;
+static thread_local std::unique_ptr<MessageLoop> tls_message_loop;
 
 MessageLoop& MessageLoop::GetCurrent() {
   auto* loop = tls_message_loop.get();
diff --git a/fml/message_loop_impl_unittests.cc b/fml/message_loop_impl_unittests.cc
deleted file mode 100644
index 4225ef84e5f5bbd2108b70a1ae9807be9fd42fab..0000000000000000000000000000000000000000
--- a/fml/message_loop_impl_unittests.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#define FML_USED_ON_EMBEDDER
-
-#include "flutter/fml/message_loop_impl.h"
-
-#include "flutter/fml/time/time_delta.h"
-#include "flutter/fml/time/time_point.h"
-#include "gtest/gtest.h"
-
-#define TIMESENSITIVE(x) TimeSensitiveTest_##x
-
-TEST(MessageLoopImpl, TIMESENSITIVE(WakeUpTimersAreSingletons)) {
-  auto loop_impl = fml::MessageLoopImpl::Create(nullptr);
-
-  const auto t1 = fml::TimeDelta::FromMilliseconds(10);
-  const auto t2 = fml::TimeDelta::FromMilliseconds(30);
-
-  const auto begin = fml::TimePoint::Now();
-
-  // Register a task scheduled in the future. This schedules a WakeUp call on
-  // the MessageLoopImpl with that fml::TimePoint.
-  loop_impl->PostTask(
-      [&]() {
-        auto delta = fml::TimePoint::Now() - begin;
-        auto ms = delta.ToMillisecondsF();
-        ASSERT_GE(ms, 20);
-        ASSERT_LE(ms, 40);
-
-        loop_impl->Terminate();
-      },
-      begin + t1);
-
-  // Call WakeUp manually to change the WakeUp time further in the future. If
-  // the timer is correctly set up to be rearmed instead of a task being
-  // scheduled for each WakeUp, the above task will be executed at t2 instead of
-  // t1 now.
-  loop_impl->WakeUp(begin + t2);
-
-  loop_impl->Run();
-}
diff --git a/fml/message_loop_task_queues.cc b/fml/message_loop_task_queues.cc
index 61f38751b5ebebed94ab8821ad6285e188d83ddb..bc017cc00c2e72b93b888b573a717c55915b98e8 100644
--- a/fml/message_loop_task_queues.cc
+++ b/fml/message_loop_task_queues.cc
@@ -13,7 +13,6 @@
 
 #include "flutter/fml/make_copyable.h"
 #include "flutter/fml/task_source.h"
-#include "flutter/fml/thread_local.h"
 
 namespace fml {
 
@@ -32,11 +31,11 @@ class TaskSourceGradeHolder {
 };
 }  // namespace
 
-FML_THREAD_LOCAL ThreadLocalUniquePtr<TaskSourceGradeHolder>
+static thread_local std::unique_ptr<TaskSourceGradeHolder>
     tls_task_source_grade;
 
 TaskQueueEntry::TaskQueueEntry(TaskQueueId created_for_arg)
-    : subsumed_by(_kUnmerged), created_for(created_for_arg) {
+    : subsumed_by(kUnmerged), created_for(created_for_arg) {
   wakeable = NULL;
   task_observers = TaskObservers();
   task_source = std::make_unique<TaskSource>(created_for);
@@ -55,8 +54,7 @@ TaskQueueId MessageLoopTaskQueues::CreateTaskQueue() {
   return loop_id;
 }
 
-MessageLoopTaskQueues::MessageLoopTaskQueues()
-    : task_queue_id_counter_(0), order_(0) {
+MessageLoopTaskQueues::MessageLoopTaskQueues() : order_(0) {
   tls_task_source_grade.reset(
       new TaskSourceGradeHolder{TaskSourceGrade::kUnspecified});
 }
@@ -66,7 +64,7 @@ MessageLoopTaskQueues::~MessageLoopTaskQueues() = default;
 void MessageLoopTaskQueues::Dispose(TaskQueueId queue_id) {
   std::lock_guard guard(queue_mutex_);
   const auto& queue_entry = queue_entries_.at(queue_id);
-  FML_DCHECK(queue_entry->subsumed_by == _kUnmerged);
+  FML_DCHECK(queue_entry->subsumed_by == kUnmerged);
   auto& subsumed_set = queue_entry->owner_of;
   for (auto& subsumed : subsumed_set) {
     queue_entries_.erase(subsumed);
@@ -78,7 +76,7 @@ void MessageLoopTaskQueues::Dispose(TaskQueueId queue_id) {
 void MessageLoopTaskQueues::DisposeTasks(TaskQueueId queue_id) {
   std::lock_guard guard(queue_mutex_);
   const auto& queue_entry = queue_entries_.at(queue_id);
-  FML_DCHECK(queue_entry->subsumed_by == _kUnmerged);
+  FML_DCHECK(queue_entry->subsumed_by == kUnmerged);
   auto& subsumed_set = queue_entry->owner_of;
   queue_entry->task_source->ShutDown();
   for (auto& subsumed : subsumed_set) {
@@ -101,7 +99,7 @@ void MessageLoopTaskQueues::RegisterTask(
   queue_entry->task_source->RegisterTask(
       {order, task, target_time, task_source_grade});
   TaskQueueId loop_to_wake = queue_id;
-  if (queue_entry->subsumed_by != _kUnmerged) {
+  if (queue_entry->subsumed_by != kUnmerged) {
     loop_to_wake = queue_entry->subsumed_by;
   }
 
@@ -151,7 +149,7 @@ void MessageLoopTaskQueues::WakeUpUnlocked(TaskQueueId queue_id,
 size_t MessageLoopTaskQueues::GetNumPendingTasks(TaskQueueId queue_id) const {
   std::lock_guard guard(queue_mutex_);
   const auto& queue_entry = queue_entries_.at(queue_id);
-  if (queue_entry->subsumed_by != _kUnmerged) {
+  if (queue_entry->subsumed_by != kUnmerged) {
     return 0;
   }
 
@@ -185,7 +183,7 @@ std::vector<fml::closure> MessageLoopTaskQueues::GetObserversToNotify(
   std::lock_guard guard(queue_mutex_);
   std::vector<fml::closure> observers;
 
-  if (queue_entries_.at(queue_id)->subsumed_by != _kUnmerged) {
+  if (queue_entries_.at(queue_id)->subsumed_by != kUnmerged) {
     return observers;
   }
 
@@ -226,8 +224,8 @@ bool MessageLoopTaskQueues::Merge(TaskQueueId owner, TaskQueueId subsumed) {
   // Won't check owner_entry->owner_of, because it may contains items when
   // merged with other different queues.
 
-  // Ensure owner_entry->subsumed_by being _kUnmerged
-  if (owner_entry->subsumed_by != _kUnmerged) {
+  // Ensure owner_entry->subsumed_by being kUnmerged
+  if (owner_entry->subsumed_by != kUnmerged) {
     FML_LOG(WARNING) << "Thread merging failed: owner_entry was already "
                         "subsumed by others, owner="
                      << owner << ", subsumed=" << subsumed
@@ -242,8 +240,8 @@ bool MessageLoopTaskQueues::Merge(TaskQueueId owner, TaskQueueId subsumed) {
         << ", subsumed->owner_of.size()=" << subsumed_entry->owner_of.size();
     return false;
   }
-  // Ensure subsumed_entry->subsumed_by being _kUnmerged
-  if (subsumed_entry->subsumed_by != _kUnmerged) {
+  // Ensure subsumed_entry->subsumed_by being kUnmerged
+  if (subsumed_entry->subsumed_by != kUnmerged) {
     FML_LOG(WARNING) << "Thread merging failed: subsumed_entry was already "
                         "subsumed by others, owner="
                      << owner << ", subsumed=" << subsumed
@@ -271,14 +269,14 @@ bool MessageLoopTaskQueues::Unmerge(TaskQueueId owner, TaskQueueId subsumed) {
         << owner << ", subsumed=" << subsumed;
     return false;
   }
-  if (owner_entry->subsumed_by != _kUnmerged) {
+  if (owner_entry->subsumed_by != kUnmerged) {
     FML_LOG(WARNING)
         << "Thread unmerging failed: owner_entry was subsumed by others, owner="
         << owner << ", subsumed=" << subsumed
         << ", owner_entry->subsumed_by=" << owner_entry->subsumed_by;
     return false;
   }
-  if (queue_entries_.at(subsumed)->subsumed_by == _kUnmerged) {
+  if (queue_entries_.at(subsumed)->subsumed_by == kUnmerged) {
     FML_LOG(WARNING) << "Thread unmerging failed: subsumed_entry wasn't "
                         "subsumed by others, owner="
                      << owner << ", subsumed=" << subsumed;
@@ -291,7 +289,7 @@ bool MessageLoopTaskQueues::Unmerge(TaskQueueId owner, TaskQueueId subsumed) {
     return false;
   }
 
-  queue_entries_.at(subsumed)->subsumed_by = _kUnmerged;
+  queue_entries_.at(subsumed)->subsumed_by = kUnmerged;
   owner_entry->owner_of.erase(subsumed);
 
   if (HasPendingTasksUnlocked(owner)) {
@@ -308,7 +306,7 @@ bool MessageLoopTaskQueues::Unmerge(TaskQueueId owner, TaskQueueId subsumed) {
 bool MessageLoopTaskQueues::Owns(TaskQueueId owner,
                                  TaskQueueId subsumed) const {
   std::lock_guard guard(queue_mutex_);
-  if (owner == _kUnmerged || subsumed == _kUnmerged) {
+  if (owner == kUnmerged || subsumed == kUnmerged) {
     return false;
   }
   auto& subsumed_set = queue_entries_.at(owner)->owner_of;
@@ -340,7 +338,7 @@ void MessageLoopTaskQueues::ResumeSecondarySource(TaskQueueId queue_id) {
 bool MessageLoopTaskQueues::HasPendingTasksUnlocked(
     TaskQueueId queue_id) const {
   const auto& entry = queue_entries_.at(queue_id);
-  bool is_subsumed = entry->subsumed_by != _kUnmerged;
+  bool is_subsumed = entry->subsumed_by != kUnmerged;
   if (is_subsumed) {
     return false;
   }
@@ -393,6 +391,8 @@ TaskSource::TopTask MessageLoopTaskQueues::PeekNextTaskUnlocked(
   // At least one task at the top because PeekNextTaskUnlocked() is called after
   // HasPendingTasksUnlocked()
   FML_CHECK(top_task.has_value());
+  // Covered by FML_CHECK.
+  // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
   return top_task.value();
 }
 
diff --git a/fml/message_loop_task_queues.h b/fml/message_loop_task_queues.h
index 2d89caac305abe13bad206230193d52873d50cf7..b3c9a63314af64dd5ebbe357e11a89becdf8de1f 100644
--- a/fml/message_loop_task_queues.h
+++ b/fml/message_loop_task_queues.h
@@ -22,7 +22,7 @@
 
 namespace fml {
 
-static const TaskQueueId _kUnmerged = TaskQueueId(TaskQueueId::kUnmerged);
+static const TaskQueueId kUnmerged = TaskQueueId(TaskQueueId::kUnmerged);
 
 /// A collection of tasks and observers associated with one TaskQueue.
 ///
@@ -40,7 +40,7 @@ class TaskQueueEntry {
   /// empty, this TaskQueue does not own any other TaskQueues.
   std::set<TaskQueueId> owner_of;
 
-  /// Identifies the TaskQueue that subsumes this TaskQueue. If it is _kUnmerged
+  /// Identifies the TaskQueue that subsumes this TaskQueue. If it is kUnmerged
   /// it indicates that this TaskQueue is not owned by any other TaskQueue.
   TaskQueueId subsumed_by;
 
@@ -155,7 +155,7 @@ class MessageLoopTaskQueues {
   mutable std::mutex queue_mutex_;
   std::map<TaskQueueId, std::unique_ptr<TaskQueueEntry>> queue_entries_;
 
-  size_t task_queue_id_counter_;
+  size_t task_queue_id_counter_ = 0;
 
   std::atomic_int order_;
 
diff --git a/fml/message_loop_task_queues_benchmark.cc b/fml/message_loop_task_queues_benchmark.cc
index a2db6c0b2f8eeed08e29d5ccaded8c95f05386bf..8824255a7f6df1a3cdcc8694137a18271875a1a1 100644
--- a/fml/message_loop_task_queues_benchmark.cc
+++ b/fml/message_loop_task_queues_benchmark.cc
@@ -32,12 +32,12 @@ static void BM_RegisterAndGetTasks(benchmark::State& state) {  // NOLINT
     CountDownLatch tasks_registered(num_task_queues);
     CountDownLatch tasks_done(num_task_queues);
 
+    threads.reserve(num_task_queues);
     for (int i = 0; i < num_task_queues; i++) {
       threads.emplace_back([task_runner_id = i, &task_queue, past, &tasks_done,
                             &tasks_registered]() {
         for (int j = 0; j < num_tasks_per_queue; j++) {
-          task_queue->RegisterTask(
-              TaskQueueId(task_runner_id), [] {}, past);
+          task_queue->RegisterTask(TaskQueueId(task_runner_id), [] {}, past);
         }
         tasks_registered.CountDown();
         tasks_registered.Wait();
diff --git a/fml/message_loop_task_queues_merge_unmerge_unittests.cc b/fml/message_loop_task_queues_merge_unmerge_unittests.cc
index e3e40d4f4a8d430b77f42b01cb1b0e4eefb9d5f8..8f17b2b9ac792caf4a6debec3dd2c469b9dca360 100644
--- a/fml/message_loop_task_queues_merge_unmerge_unittests.cc
+++ b/fml/message_loop_task_queues_merge_unmerge_unittests.cc
@@ -54,13 +54,11 @@ TEST(MessageLoopTaskQueueMergeUnmerge,
   auto queue_id_1 = task_queue->CreateTaskQueue();
   auto queue_id_2 = task_queue->CreateTaskQueue();
 
-  task_queue->RegisterTask(
-      queue_id_1, []() {}, ChronoTicksSinceEpoch());
+  task_queue->RegisterTask(queue_id_1, []() {}, ChronoTicksSinceEpoch());
   ASSERT_EQ(1u, task_queue->GetNumPendingTasks(queue_id_1));
 
   task_queue->Merge(queue_id_1, queue_id_2);
-  task_queue->RegisterTask(
-      queue_id_1, []() {}, ChronoTicksSinceEpoch());
+  task_queue->RegisterTask(queue_id_1, []() {}, ChronoTicksSinceEpoch());
 
   ASSERT_EQ(2u, task_queue->GetNumPendingTasks(queue_id_1));
   ASSERT_EQ(0u, task_queue->GetNumPendingTasks(queue_id_2));
@@ -73,8 +71,7 @@ TEST(MessageLoopTaskQueueMergeUnmerge,
   auto queue_id_1 = task_queue->CreateTaskQueue();
   auto queue_id_2 = task_queue->CreateTaskQueue();
 
-  task_queue->RegisterTask(
-      queue_id_2, []() {}, ChronoTicksSinceEpoch());
+  task_queue->RegisterTask(queue_id_2, []() {}, ChronoTicksSinceEpoch());
   ASSERT_EQ(1u, task_queue->GetNumPendingTasks(queue_id_2));
 
   task_queue->Merge(queue_id_1, queue_id_2);
@@ -88,10 +85,8 @@ TEST(MessageLoopTaskQueueMergeUnmerge, MergeUnmergeTasksPreserved) {
   auto queue_id_1 = task_queue->CreateTaskQueue();
   auto queue_id_2 = task_queue->CreateTaskQueue();
 
-  task_queue->RegisterTask(
-      queue_id_1, []() {}, ChronoTicksSinceEpoch());
-  task_queue->RegisterTask(
-      queue_id_2, []() {}, ChronoTicksSinceEpoch());
+  task_queue->RegisterTask(queue_id_1, []() {}, ChronoTicksSinceEpoch());
+  task_queue->RegisterTask(queue_id_2, []() {}, ChronoTicksSinceEpoch());
 
   ASSERT_EQ(1u, task_queue->GetNumPendingTasks(queue_id_1));
   ASSERT_EQ(1u, task_queue->GetNumPendingTasks(queue_id_2));
@@ -200,8 +195,7 @@ TEST(MessageLoopTaskQueueMergeUnmerge, MergeInvokesBothWakeables) {
   task_queue->SetWakeable(queue_id_1, wakeable1.get());
   task_queue->SetWakeable(queue_id_2, wakeable2.get());
 
-  task_queue->RegisterTask(
-      queue_id_1, []() {}, ChronoTicksSinceEpoch());
+  task_queue->RegisterTask(queue_id_1, []() {}, ChronoTicksSinceEpoch());
 
   task_queue->Merge(queue_id_1, queue_id_2);
 
@@ -227,10 +221,8 @@ TEST(MessageLoopTaskQueueMergeUnmerge,
   task_queue->SetWakeable(queue_id_1, wakeable1.get());
   task_queue->SetWakeable(queue_id_2, wakeable2.get());
 
-  task_queue->RegisterTask(
-      queue_id_1, []() {}, ChronoTicksSinceEpoch());
-  task_queue->RegisterTask(
-      queue_id_2, []() {}, ChronoTicksSinceEpoch());
+  task_queue->RegisterTask(queue_id_1, []() {}, ChronoTicksSinceEpoch());
+  task_queue->RegisterTask(queue_id_2, []() {}, ChronoTicksSinceEpoch());
 
   task_queue->Merge(queue_id_1, queue_id_2);
   task_queue->Unmerge(queue_id_1, queue_id_2);
@@ -258,8 +250,7 @@ TEST(MessageLoopTaskQueueMergeUnmerge, GetTasksToRunNowBlocksMerge) {
     wake_up_end.Wait();
   });
 
-  task_queue->RegisterTask(
-      queue_id_1, []() {}, ChronoTicksSinceEpoch());
+  task_queue->RegisterTask(queue_id_1, []() {}, ChronoTicksSinceEpoch());
   task_queue->SetWakeable(queue_id_1, wakeable.get());
 
   std::thread tasks_to_run_now_thread(
@@ -307,8 +298,7 @@ TEST(MessageLoopTaskQueueMergeUnmerge,
       queue_id_2, [&]() { task_queue->Merge(queue_id_1, queue_id_2); },
       ChronoTicksSinceEpoch());
 
-  task_queue->RegisterTask(
-      queue_id_2, []() {}, ChronoTicksSinceEpoch());
+  task_queue->RegisterTask(queue_id_2, []() {}, ChronoTicksSinceEpoch());
 
   ASSERT_EQ(CountRemainingTasks(task_queue, queue_id_2, true), 1);
   ASSERT_EQ(CountRemainingTasks(task_queue, queue_id_1, true), 1);
diff --git a/fml/message_loop_task_queues_unittests.cc b/fml/message_loop_task_queues_unittests.cc
index f9753ea8ad34c8f622ca78aeafd5db72e59f3c96..135af2303413ba9178acf35d595796a2d27c8fab 100644
--- a/fml/message_loop_task_queues_unittests.cc
+++ b/fml/message_loop_task_queues_unittests.cc
@@ -46,8 +46,7 @@ TEST(MessageLoopTaskQueue, RegisterOneTask) {
       [&time](fml::TimePoint wake_time) { ASSERT_TRUE(wake_time == time); });
   task_queue->SetWakeable(queue_id, wakeable.get());
 
-  task_queue->RegisterTask(
-      queue_id, [] {}, time);
+  task_queue->RegisterTask(queue_id, [] {}, time);
   ASSERT_TRUE(task_queue->HasPendingTasks(queue_id));
   ASSERT_TRUE(task_queue->GetNumPendingTasks(queue_id) == 1);
 }
@@ -55,10 +54,8 @@ TEST(MessageLoopTaskQueue, RegisterOneTask) {
 TEST(MessageLoopTaskQueue, RegisterTwoTasksAndCount) {
   auto task_queue = fml::MessageLoopTaskQueues::GetInstance();
   auto queue_id = task_queue->CreateTaskQueue();
-  task_queue->RegisterTask(
-      queue_id, [] {}, ChronoTicksSinceEpoch());
-  task_queue->RegisterTask(
-      queue_id, [] {}, fml::TimePoint::Max());
+  task_queue->RegisterTask(queue_id, [] {}, ChronoTicksSinceEpoch());
+  task_queue->RegisterTask(queue_id, [] {}, fml::TimePoint::Max());
   ASSERT_TRUE(task_queue->HasPendingTasks(queue_id));
   ASSERT_TRUE(task_queue->GetNumPendingTasks(queue_id) == 2);
 }
@@ -68,11 +65,9 @@ TEST(MessageLoopTaskQueue, RegisterTasksOnMergedQueuesAndCount) {
   auto platform_queue = task_queue->CreateTaskQueue();
   auto raster_queue = task_queue->CreateTaskQueue();
   // A task in platform_queue
-  task_queue->RegisterTask(
-      platform_queue, []() {}, fml::TimePoint::Now());
+  task_queue->RegisterTask(platform_queue, []() {}, fml::TimePoint::Now());
   // A task in raster_queue
-  task_queue->RegisterTask(
-      raster_queue, []() {}, fml::TimePoint::Now());
+  task_queue->RegisterTask(raster_queue, []() {}, fml::TimePoint::Now());
   ASSERT_TRUE(task_queue->GetNumPendingTasks(platform_queue) == 1);
   ASSERT_TRUE(task_queue->GetNumPendingTasks(raster_queue) == 1);
 
@@ -270,10 +265,8 @@ TEST(MessageLoopTaskQueue, WakeUpIndependentOfTime) {
       [&num_wakes](fml::TimePoint wake_time) { ++num_wakes; });
   task_queue->SetWakeable(queue_id, wakeable.get());
 
-  task_queue->RegisterTask(
-      queue_id, []() {}, ChronoTicksSinceEpoch());
-  task_queue->RegisterTask(
-      queue_id, []() {}, fml::TimePoint::Max());
+  task_queue->RegisterTask(queue_id, []() {}, ChronoTicksSinceEpoch());
+  task_queue->RegisterTask(queue_id, []() {}, fml::TimePoint::Max());
 
   ASSERT_TRUE(num_wakes == 2);
 }
@@ -293,13 +286,11 @@ TEST(MessageLoopTaskQueue, WokenUpWithNewerTime) {
 
   task_queue->SetWakeable(queue_id, wakeable.get());
 
-  task_queue->RegisterTask(
-      queue_id, []() {}, fml::TimePoint::Max());
+  task_queue->RegisterTask(queue_id, []() {}, fml::TimePoint::Max());
 
   const auto now = ChronoTicksSinceEpoch();
   expected = now;
-  task_queue->RegisterTask(
-      queue_id, []() {}, now);
+  task_queue->RegisterTask(queue_id, []() {}, now);
 
   latch.Wait();
 }
@@ -338,9 +329,9 @@ TEST(MessageLoopTaskQueue, QueueDoNotOwnItself) {
 
 TEST(MessageLoopTaskQueue, QueueDoNotOwnUnmergedTaskQueueId) {
   auto task_queue = fml::MessageLoopTaskQueues::GetInstance();
-  ASSERT_FALSE(task_queue->Owns(task_queue->CreateTaskQueue(), _kUnmerged));
-  ASSERT_FALSE(task_queue->Owns(_kUnmerged, task_queue->CreateTaskQueue()));
-  ASSERT_FALSE(task_queue->Owns(_kUnmerged, _kUnmerged));
+  ASSERT_FALSE(task_queue->Owns(task_queue->CreateTaskQueue(), kUnmerged));
+  ASSERT_FALSE(task_queue->Owns(kUnmerged, task_queue->CreateTaskQueue()));
+  ASSERT_FALSE(task_queue->Owns(kUnmerged, kUnmerged));
 }
 
 TEST(MessageLoopTaskQueue, QueueOwnsMergedTaskQueueId) {
@@ -435,16 +426,14 @@ TEST(MessageLoopTaskQueue, RegisterTaskWakesUpOwnerQueue) {
 
   ASSERT_EQ(0UL, wakes.size());
 
-  task_queue->RegisterTask(
-      platform_queue, []() {}, time1);
+  task_queue->RegisterTask(platform_queue, []() {}, time1);
 
   ASSERT_EQ(1UL, wakes.size());
   ASSERT_EQ(time1, wakes[0]);
 
   task_queue->Merge(platform_queue, raster_queue);
 
-  task_queue->RegisterTask(
-      raster_queue, []() {}, time2);
+  task_queue->RegisterTask(raster_queue, []() {}, time2);
 
   ASSERT_EQ(3UL, wakes.size());
   ASSERT_EQ(time1, wakes[1]);
diff --git a/fml/message_loop_unittests.cc b/fml/message_loop_unittests.cc
index 7b9d14df89831d66d4d505216f1e5f46f094f767..df762f4249f3ed61687f615dd711e3bf15277711 100644
--- a/fml/message_loop_unittests.cc
+++ b/fml/message_loop_unittests.cc
@@ -17,13 +17,6 @@
 #include "flutter/fml/time/chrono_timestamp_provider.h"
 #include "gtest/gtest.h"
 
-#define TIMESENSITIVE(x) TimeSensitiveTest_##x
-#if FML_OS_WIN
-#define PLATFORM_SPECIFIC_CAPTURE(...) [ __VA_ARGS__, count ]
-#else
-#define PLATFORM_SPECIFIC_CAPTURE(...) [__VA_ARGS__]
-#endif
-
 TEST(MessageLoop, GetCurrent) {
   std::thread thread([]() {
     fml::MessageLoop::EnsureInitializedForCurrentThread();
@@ -89,15 +82,14 @@ TEST(MessageLoop, NonDelayedTasksAreRunInOrder) {
     auto& loop = fml::MessageLoop::GetCurrent();
     size_t current = 0;
     for (size_t i = 0; i < count; i++) {
-      loop.GetTaskRunner()->PostTask(
-          PLATFORM_SPECIFIC_CAPTURE(&terminated, i, &current)() {
-            ASSERT_EQ(current, i);
-            current++;
-            if (count == i + 1) {
-              fml::MessageLoop::GetCurrent().Terminate();
-              terminated = true;
-            }
-          });
+      loop.GetTaskRunner()->PostTask([&terminated, i, &current]() {
+        ASSERT_EQ(current, i);
+        current++;
+        if (count == i + 1) {
+          fml::MessageLoop::GetCurrent().Terminate();
+          terminated = true;
+        }
+      });
     }
     loop.Run();
     ASSERT_EQ(current, count);
@@ -120,7 +112,7 @@ TEST(MessageLoop, DelayedTasksAtSameTimeAreRunInOrder) {
         fml::ChronoTicksSinceEpoch() + fml::TimeDelta::FromMilliseconds(2);
     for (size_t i = 0; i < count; i++) {
       loop.GetTaskRunner()->PostTaskForTime(
-          PLATFORM_SPECIFIC_CAPTURE(&terminated, i, &current)() {
+          [&terminated, i, &current]() {
             ASSERT_EQ(current, i);
             current++;
             if (count == i + 1) {
@@ -155,124 +147,6 @@ TEST(MessageLoop, CheckRunsTaskOnCurrentThread) {
   thread.join();
 }
 
-TEST(MessageLoop, TIMESENSITIVE(SingleDelayedTaskByDelta)) {
-#if defined(OS_FUCHSIA)
-  GTEST_SKIP()
-      << "This test does not work on Fuchsia. https://fxbug.dev/110020 ";
-#endif  // OS_FUCHSIA
-
-  bool checked = false;
-  std::thread thread([&checked]() {
-    fml::MessageLoop::EnsureInitializedForCurrentThread();
-    auto& loop = fml::MessageLoop::GetCurrent();
-    auto begin = fml::ChronoTicksSinceEpoch();
-    loop.GetTaskRunner()->PostDelayedTask(
-        [begin, &checked]() {
-          auto delta = fml::ChronoTicksSinceEpoch() - begin;
-          auto ms = delta.ToMillisecondsF();
-          ASSERT_GE(ms, 3);
-          ASSERT_LE(ms, 7);
-          checked = true;
-          fml::MessageLoop::GetCurrent().Terminate();
-        },
-        fml::TimeDelta::FromMilliseconds(5));
-    loop.Run();
-  });
-  thread.join();
-  ASSERT_TRUE(checked);
-}
-
-TEST(MessageLoop, TIMESENSITIVE(SingleDelayedTaskForTime)) {
-#if defined(OS_FUCHSIA)
-  GTEST_SKIP()
-      << "This test does not work on Fuchsia. https://fxbug.dev/110020 ";
-#endif  // OS_FUCHSIA
-
-  bool checked = false;
-  std::thread thread([&checked]() {
-    fml::MessageLoop::EnsureInitializedForCurrentThread();
-    auto& loop = fml::MessageLoop::GetCurrent();
-    auto begin = fml::ChronoTicksSinceEpoch();
-    loop.GetTaskRunner()->PostTaskForTime(
-        [begin, &checked]() {
-          auto delta = fml::ChronoTicksSinceEpoch() - begin;
-          auto ms = delta.ToMillisecondsF();
-          ASSERT_GE(ms, 3);
-          ASSERT_LE(ms, 7);
-          checked = true;
-          fml::MessageLoop::GetCurrent().Terminate();
-        },
-        fml::ChronoTicksSinceEpoch() + fml::TimeDelta::FromMilliseconds(5));
-    loop.Run();
-  });
-  thread.join();
-  ASSERT_TRUE(checked);
-}
-
-TEST(MessageLoop, TIMESENSITIVE(MultipleDelayedTasksWithIncreasingDeltas)) {
-#if defined(OS_FUCHSIA)
-  GTEST_SKIP()
-      << "This test does not work on Fuchsia. https://fxbug.dev/110020 ";
-#endif  // OS_FUCHSIA
-
-  const auto count = 10;
-  int checked = false;
-  std::thread thread(PLATFORM_SPECIFIC_CAPTURE(&checked)() {
-    fml::MessageLoop::EnsureInitializedForCurrentThread();
-    auto& loop = fml::MessageLoop::GetCurrent();
-    for (int target_ms = 0 + 2; target_ms < count + 2; target_ms++) {
-      auto begin = fml::ChronoTicksSinceEpoch();
-      loop.GetTaskRunner()->PostDelayedTask(
-          PLATFORM_SPECIFIC_CAPTURE(begin, target_ms, &checked)() {
-            auto delta = fml::ChronoTicksSinceEpoch() - begin;
-            auto ms = delta.ToMillisecondsF();
-            ASSERT_GE(ms, target_ms - 2);
-            ASSERT_LE(ms, target_ms + 2);
-            checked++;
-            if (checked == count) {
-              fml::MessageLoop::GetCurrent().Terminate();
-            }
-          },
-          fml::TimeDelta::FromMilliseconds(target_ms));
-    }
-    loop.Run();
-  });
-  thread.join();
-  ASSERT_EQ(checked, count);
-}
-
-TEST(MessageLoop, TIMESENSITIVE(MultipleDelayedTasksWithDecreasingDeltas)) {
-#if defined(OS_FUCHSIA)
-  GTEST_SKIP()
-      << "This test does not work on Fuchsia. https://fxbug.dev/110020 ";
-#endif  // OS_FUCHSIA
-
-  const auto count = 10;
-  int checked = false;
-  std::thread thread(PLATFORM_SPECIFIC_CAPTURE(&checked)() {
-    fml::MessageLoop::EnsureInitializedForCurrentThread();
-    auto& loop = fml::MessageLoop::GetCurrent();
-    for (int target_ms = count + 2; target_ms > 0 + 2; target_ms--) {
-      auto begin = fml::ChronoTicksSinceEpoch();
-      loop.GetTaskRunner()->PostDelayedTask(
-          PLATFORM_SPECIFIC_CAPTURE(begin, target_ms, &checked)() {
-            auto delta = fml::ChronoTicksSinceEpoch() - begin;
-            auto ms = delta.ToMillisecondsF();
-            ASSERT_GE(ms, target_ms - 2);
-            ASSERT_LE(ms, target_ms + 2);
-            checked++;
-            if (checked == count) {
-              fml::MessageLoop::GetCurrent().Terminate();
-            }
-          },
-          fml::TimeDelta::FromMilliseconds(target_ms));
-    }
-    loop.Run();
-  });
-  thread.join();
-  ASSERT_EQ(checked, count);
-}
-
 TEST(MessageLoop, TaskObserverFire) {
   bool started = false;
   bool terminated = false;
@@ -282,19 +156,16 @@ TEST(MessageLoop, TaskObserverFire) {
     auto& loop = fml::MessageLoop::GetCurrent();
     size_t task_count = 0;
     size_t obs_count = 0;
-    auto obs = PLATFORM_SPECIFIC_CAPTURE(&obs_count)() {
-      obs_count++;
-    };
+    auto obs = [&obs_count]() { obs_count++; };
     for (size_t i = 0; i < count; i++) {
-      loop.GetTaskRunner()->PostTask(
-          PLATFORM_SPECIFIC_CAPTURE(&terminated, i, &task_count)() {
-            ASSERT_EQ(task_count, i);
-            task_count++;
-            if (count == i + 1) {
-              fml::MessageLoop::GetCurrent().Terminate();
-              terminated = true;
-            }
-          });
+      loop.GetTaskRunner()->PostTask([&terminated, i, &task_count]() {
+        ASSERT_EQ(task_count, i);
+        task_count++;
+        if (count == i + 1) {
+          fml::MessageLoop::GetCurrent().Terminate();
+          terminated = true;
+        }
+      });
     }
     loop.AddTaskObserver(0, obs);
     loop.Run();
@@ -331,8 +202,10 @@ TEST(MessageLoop, CanCreateConcurrentMessageLoop) {
     task_runner->PostTask([&]() {
       std::this_thread::sleep_for(std::chrono::seconds(1));
       std::cout << "Ran on thread: " << std::this_thread::get_id() << std::endl;
-      std::scoped_lock lock(thread_ids_mutex);
-      thread_ids.insert(std::this_thread::get_id());
+      {
+        std::scoped_lock lock(thread_ids_mutex);
+        thread_ids.insert(std::this_thread::get_id());
+      }
       latch.CountDown();
     });
   }
diff --git a/fml/platform/android/cpu_affinity.cc b/fml/platform/android/cpu_affinity.cc
new file mode 100644
index 0000000000000000000000000000000000000000..f7477e97de3b04e58ea19904f00254be9ba0343a
--- /dev/null
+++ b/fml/platform/android/cpu_affinity.cc
@@ -0,0 +1,72 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/fml/platform/android/cpu_affinity.h"
+
+#include <pthread.h>
+#include <sys/resource.h>
+#include <sys/time.h>
+#include <unistd.h>
+#include <mutex>
+#include <optional>
+#include <thread>
+#include "flutter/fml/logging.h"
+
+namespace fml {
+
+/// The CPUSpeedTracker is initialized once the first time a thread affinity is
+/// requested.
+std::once_flag gCPUTrackerFlag;
+static CPUSpeedTracker* gCPUTracker;
+
+// For each CPU index provided, attempts to open the file
+// /sys/devices/system/cpu/cpu$NUM/cpufreq/cpuinfo_max_freq and parse a number
+// containing the CPU frequency.
+void InitCPUInfo(size_t cpu_count) {
+  std::vector<CpuIndexAndSpeed> cpu_speeds;
+
+  for (auto i = 0u; i < cpu_count; i++) {
+    auto path = "/sys/devices/system/cpu/cpu" + std::to_string(i) +
+                "/cpufreq/cpuinfo_max_freq";
+    auto speed = ReadIntFromFile(path);
+    if (speed.has_value()) {
+      cpu_speeds.push_back({.index = i, .speed = speed.value()});
+    }
+  }
+  gCPUTracker = new CPUSpeedTracker(cpu_speeds);
+}
+
+bool SetUpCPUTracker() {
+  // Populate CPU Info if uninitialized.
+  auto count = std::thread::hardware_concurrency();
+  std::call_once(gCPUTrackerFlag, [count]() { InitCPUInfo(count); });
+  if (gCPUTracker == nullptr || !gCPUTracker->IsValid()) {
+    return false;
+  }
+  return true;
+}
+
+std::optional<size_t> AndroidEfficiencyCoreCount() {
+  if (!SetUpCPUTracker()) {
+    return true;
+  }
+  auto result = gCPUTracker->GetIndices(CpuAffinity::kEfficiency).size();
+  FML_DCHECK(result > 0);
+  return result;
+}
+
+bool AndroidRequestAffinity(CpuAffinity affinity) {
+  if (!SetUpCPUTracker()) {
+    return true;
+  }
+
+  cpu_set_t set;
+  CPU_ZERO(&set);
+  for (const auto index : gCPUTracker->GetIndices(affinity)) {
+    CPU_SET(index, &set);
+  }
+  return sched_setaffinity(gettid(), sizeof(set), &set) == 0;
+}
+
+}  // namespace fml
diff --git a/fml/platform/android/cpu_affinity.h b/fml/platform/android/cpu_affinity.h
new file mode 100644
index 0000000000000000000000000000000000000000..3b7c41dcfb1079a47942c663e281a9d9fa344dcd
--- /dev/null
+++ b/fml/platform/android/cpu_affinity.h
@@ -0,0 +1,20 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_FML_PLATFORM_ANDROID_CPU_AFFINITY_H_
+#define FLUTTER_FML_PLATFORM_ANDROID_CPU_AFFINITY_H_
+
+#include "flutter/fml/cpu_affinity.h"
+
+namespace fml {
+
+/// @brief Android specific implementation of EfficiencyCoreCount.
+std::optional<size_t> AndroidEfficiencyCoreCount();
+
+/// @brief Android specific implementation of RequestAffinity.
+bool AndroidRequestAffinity(CpuAffinity affinity);
+
+}  // namespace fml
+
+#endif  // FLUTTER_FML_PLATFORM_ANDROID_CPU_AFFINITY_H_
diff --git a/fml/platform/android/jni_util.cc b/fml/platform/android/jni_util.cc
index 407c0de9e04470dc41af12660d29dd50c35164b5..018ac7affd4d45547777689504b2cc0a83580bde 100644
--- a/fml/platform/android/jni_util.cc
+++ b/fml/platform/android/jni_util.cc
@@ -6,11 +6,11 @@
 
 #include <sys/prctl.h>
 
+#include <memory>
 #include <string>
 
 #include "flutter/fml/logging.h"
 #include "flutter/fml/string_conversion.h"
-#include "flutter/fml/thread_local.h"
 
 namespace fml {
 namespace jni {
@@ -24,7 +24,7 @@ struct JNIDetach {
 };
 
 // Thread-local object that will detach from JNI during thread shutdown;
-FML_THREAD_LOCAL fml::ThreadLocalUniquePtr<JNIDetach> tls_jni_detach;
+static thread_local std::unique_ptr<JNIDetach> tls_jni_detach;
 
 void InitJavaVM(JavaVM* vm) {
   FML_DCHECK(g_jvm == nullptr);
@@ -185,11 +185,13 @@ bool HasException(JNIEnv* env) {
   return env->ExceptionCheck() != JNI_FALSE;
 }
 
-bool ClearException(JNIEnv* env) {
+bool ClearException(JNIEnv* env, bool silent) {
   if (!HasException(env)) {
     return false;
   }
-  env->ExceptionDescribe();
+  if (!silent) {
+    env->ExceptionDescribe();
+  }
   env->ExceptionClear();
   return true;
 }
diff --git a/fml/platform/android/jni_util.h b/fml/platform/android/jni_util.h
index 0fb2be7c2fa4f4c1d5d7e92e46942b95b24b1d67..6ece7fbd1b409b7151cdee56bd7dddb3ee74ce78 100644
--- a/fml/platform/android/jni_util.h
+++ b/fml/platform/android/jni_util.h
@@ -42,7 +42,7 @@ ScopedJavaLocalRef<jobjectArray> VectorToBufferArray(
 
 bool HasException(JNIEnv* env);
 
-bool ClearException(JNIEnv* env);
+bool ClearException(JNIEnv* env, bool silent = false);
 
 bool CheckException(JNIEnv* env);
 std::string GetJavaExceptionInfo(JNIEnv* env, jthrowable java_throwable);
diff --git a/fml/platform/android/message_loop_android.cc b/fml/platform/android/message_loop_android.cc
index b4c5982181a540106ae0648bedfc805b9745cd2f..747a5b4563dc8811a862e9ba04ab34bd885ca631 100644
--- a/fml/platform/android/message_loop_android.cc
+++ b/fml/platform/android/message_loop_android.cc
@@ -30,8 +30,7 @@ static ALooper* AcquireLooperForThread() {
 
 MessageLoopAndroid::MessageLoopAndroid()
     : looper_(AcquireLooperForThread()),
-      timer_fd_(::timerfd_create(kClockType, TFD_NONBLOCK | TFD_CLOEXEC)),
-      running_(false) {
+      timer_fd_(::timerfd_create(kClockType, TFD_NONBLOCK | TFD_CLOEXEC)) {
   FML_CHECK(looper_.is_valid());
   FML_CHECK(timer_fd_.is_valid());
 
diff --git a/fml/platform/android/message_loop_android.h b/fml/platform/android/message_loop_android.h
index 6ff26be0fd37371eca32f3af641ec24f7d6c5457..a1bdad38a384038e9c766d676edd57e06c6ecab4 100644
--- a/fml/platform/android/message_loop_android.h
+++ b/fml/platform/android/message_loop_android.h
@@ -29,7 +29,7 @@ class MessageLoopAndroid : public MessageLoopImpl {
  private:
   fml::UniqueObject<ALooper*, UniqueLooperTraits> looper_;
   fml::UniqueFD timer_fd_;
-  bool running_;
+  bool running_ = false;
 
   MessageLoopAndroid();
 
diff --git a/fml/platform/darwin/concurrent_message_loop_factory.mm b/fml/platform/darwin/concurrent_message_loop_factory.mm
new file mode 100644
index 0000000000000000000000000000000000000000..4abd1e1048e4edb6f1de51fd1bbd7910321cb3b8
--- /dev/null
+++ b/fml/platform/darwin/concurrent_message_loop_factory.mm
@@ -0,0 +1,26 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/fml/concurrent_message_loop.h"
+
+namespace fml {
+
+class ConcurrentMessageLoopDarwin : public ConcurrentMessageLoop {
+  friend class ConcurrentMessageLoop;
+
+ protected:
+  explicit ConcurrentMessageLoopDarwin(size_t worker_count) : ConcurrentMessageLoop(worker_count) {}
+
+  void ExecuteTask(const fml::closure& task) override {
+    @autoreleasepool {
+      task();
+    }
+  }
+};
+
+std::shared_ptr<ConcurrentMessageLoop> ConcurrentMessageLoop::Create(size_t worker_count) {
+  return std::shared_ptr<ConcurrentMessageLoop>{new ConcurrentMessageLoopDarwin(worker_count)};
+}
+
+}  // namespace fml
diff --git a/fml/platform/darwin/scoped_block.h b/fml/platform/darwin/scoped_block.h
index 2608d1ef3149ee17b0b6428c4709ad78be642a95..031266af0d0655aa55f5c63cf0194f21e578c6e9 100644
--- a/fml/platform/darwin/scoped_block.h
+++ b/fml/platform/darwin/scoped_block.h
@@ -8,86 +8,40 @@
 #include <Block.h>
 
 #include "flutter/fml/compiler_specific.h"
+#include "flutter/fml/platform/darwin/scoped_typeref.h"
 
-namespace fml {
-
-// ScopedBlock<> is patterned after ScopedCFTypeRef<>, but uses Block_copy() and
-// Block_release() instead of CFRetain() and CFRelease().
+#if defined(__has_feature) && __has_feature(objc_arc)
+#define BASE_MAC_BRIDGE_CAST(TYPE, VALUE) (__bridge TYPE)(VALUE)
+#else
+#define BASE_MAC_BRIDGE_CAST(TYPE, VALUE) VALUE
+#endif
 
-enum class OwnershipPolicy {
-  // The scoped object takes ownership of an object by taking over an existing
-  // ownership claim.
-  Assume,
+namespace fml {
 
-  // The scoped object will retain the object and any initial ownership is
-  // not changed.
-  Retain,
-};
+namespace internal {
 
 template <typename B>
-class ScopedBlock {
- public:
-  explicit ScopedBlock(B block = nullptr,
-                       OwnershipPolicy policy = OwnershipPolicy::Assume)
-      : block_(block) {
-    if (block_ && policy == OwnershipPolicy::Retain) {
-      block_ = Block_copy(block);
-    }
+struct ScopedBlockTraits {
+  static B InvalidValue() { return nullptr; }
+  static B Retain(B block) {
+    return BASE_MAC_BRIDGE_CAST(
+        B, Block_copy(BASE_MAC_BRIDGE_CAST(const void*, block)));
   }
-
-  ScopedBlock(const ScopedBlock<B>& that) : block_(that.block_) {
-    if (block_) {
-      block_ = Block_copy(block_);
-    }
-  }
-
-  ~ScopedBlock() {
-    if (block_) {
-      Block_release(block_);
-    }
-  }
-
-  ScopedBlock& operator=(const ScopedBlock<B>& that) {
-    reset(that.get(), OwnershipPolicy::Retain);
-    return *this;
-  }
-
-  void reset(B block = nullptr,
-             OwnershipPolicy policy = OwnershipPolicy::Assume) {
-    if (block && policy == OwnershipPolicy::Retain) {
-      block = Block_copy(block);
-    }
-    if (block_) {
-      Block_release(block_);
-    }
-    block_ = block;
+  static void Release(B block) {
+    Block_release(BASE_MAC_BRIDGE_CAST(const void*, block));
   }
+};
 
-  bool operator==(B that) const { return block_ == that; }
-
-  bool operator!=(B that) const { return block_ != that; }
-
-  // NOLINTNEXTLINE(google-explicit-constructor)
-  operator B() const { return block_; }
-
-  B get() const { return block_; }
-
-  void swap(ScopedBlock& that) {
-    B temp = that.block_;
-    that.block_ = block_;
-    block_ = temp;
-  }
+}  // namespace internal
 
-  [[nodiscard]] B release() {
-    B temp = block_;
-    block_ = nullptr;
-    return temp;
-  }
+// ScopedBlock<> is patterned after ScopedCFTypeRef<>, but uses Block_copy() and
+// Block_release() instead of CFRetain() and CFRelease().
 
- private:
-  B block_;
-};
+template <typename B>
+using ScopedBlock = ScopedTypeRef<B, internal::ScopedBlockTraits<B>>;
 
 }  // namespace fml
 
+#undef BASE_MAC_BRIDGE_CAST
+
 #endif  // FLUTTER_FML_PLATFORM_DARWIN_SCOPED_BLOCK_H_
diff --git a/fml/platform/darwin/scoped_nsautorelease_pool.cc b/fml/platform/darwin/scoped_nsautorelease_pool.cc
new file mode 100644
index 0000000000000000000000000000000000000000..e7191d6ff7d63dbd4879c02207db40d6dbc17552
--- /dev/null
+++ b/fml/platform/darwin/scoped_nsautorelease_pool.cc
@@ -0,0 +1,26 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/fml/platform/darwin/scoped_nsautorelease_pool.h"
+
+#include <objc/message.h>
+#include <objc/runtime.h>
+
+namespace {
+typedef id (*msg_send)(void*, SEL);
+}  // anonymous namespace
+
+namespace fml {
+
+ScopedNSAutoreleasePool::ScopedNSAutoreleasePool() {
+  autorelease_pool_ = reinterpret_cast<msg_send>(objc_msgSend)(
+      objc_getClass("NSAutoreleasePool"), sel_getUid("new"));
+}
+
+ScopedNSAutoreleasePool::~ScopedNSAutoreleasePool() {
+  reinterpret_cast<msg_send>(objc_msgSend)(autorelease_pool_,
+                                           sel_getUid("drain"));
+}
+
+}  // namespace fml
diff --git a/impeller/base/work_queue_common.h b/fml/platform/darwin/scoped_nsautorelease_pool.h
similarity index 32%
rename from impeller/base/work_queue_common.h
rename to fml/platform/darwin/scoped_nsautorelease_pool.h
index 952f6ecbadacd630dec0dd7016fc0f48559e5621..8ea4ed7f6213fdec209cfa78a5b76383937fc7aa 100644
--- a/impeller/base/work_queue_common.h
+++ b/fml/platform/darwin/scoped_nsautorelease_pool.h
@@ -2,32 +2,25 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_FML_PLATFORM_DARWIN_SCOPED_NSAUTORELEASE_POOL_H_
+#define FLUTTER_FML_PLATFORM_DARWIN_SCOPED_NSAUTORELEASE_POOL_H_
 
-#include <memory>
-
-#include "flutter/fml/concurrent_message_loop.h"
 #include "flutter/fml/macros.h"
-#include "impeller/base/work_queue.h"
 
-namespace impeller {
+namespace fml {
 
-class WorkQueueCommon : public WorkQueue {
+// Pushes an autorelease pool when constructed and pops it when destructed.
+class ScopedNSAutoreleasePool {
  public:
-  static std::shared_ptr<WorkQueueCommon> Create();
-
-  // |WorkQueue|
-  ~WorkQueueCommon();
+  ScopedNSAutoreleasePool();
+  ~ScopedNSAutoreleasePool();
 
  private:
-  std::shared_ptr<fml::ConcurrentMessageLoop> loop_;
-
-  WorkQueueCommon();
+  void* autorelease_pool_;
 
-  // |WorkQueue|
-  void PostTask(fml::closure task) override;
-
-  FML_DISALLOW_COPY_AND_ASSIGN(WorkQueueCommon);
+  FML_DISALLOW_COPY_AND_ASSIGN(ScopedNSAutoreleasePool);
 };
 
-}  // namespace impeller
+}  // namespace fml
+
+#endif  // FLUTTER_FML_PLATFORM_DARWIN_SCOPED_NSAUTORELEASE_POOL_H_
diff --git a/fml/platform/darwin/scoped_nsobject.h b/fml/platform/darwin/scoped_nsobject.h
index 9f910e44f31eda730326314c15cd41bff3b28a82..86dd16481b587d4cf4a88058efa90aea754c75da 100644
--- a/fml/platform/darwin/scoped_nsobject.h
+++ b/fml/platform/darwin/scoped_nsobject.h
@@ -5,6 +5,9 @@
 #ifndef FLUTTER_FML_PLATFORM_DARWIN_SCOPED_NSOBJECT_H_
 #define FLUTTER_FML_PLATFORM_DARWIN_SCOPED_NSOBJECT_H_
 
+#include <type_traits>
+#include <utility>
+
 // Include NSObject.h directly because Foundation.h pulls in many dependencies.
 // (Approx 100k lines of code versus 1.5k for NSObject.h). scoped_nsobject gets
 // singled out because it is most typically included from other header files.
@@ -12,8 +15,11 @@
 
 #include "flutter/fml/compiler_specific.h"
 #include "flutter/fml/macros.h"
+#include "flutter/fml/platform/darwin/scoped_typeref.h"
 
+#if !defined(__has_feature) || !__has_feature(objc_arc)
 @class NSAutoreleasePool;
+#endif
 
 namespace fml {
 
@@ -36,60 +42,93 @@ namespace fml {
 // scoped_nsautorelease_pool.h instead.
 // We check for bad uses of scoped_nsobject and NSAutoreleasePool at compile
 // time with a template specialization (see below).
+//
+// If Automatic Reference Counting (aka ARC) is enabled then the ownership
+// policy is not controllable by the user as ARC make it really difficult to
+// transfer ownership (the reference passed to scoped_nsobject constructor is
+// sunk by ARC and __attribute((ns_consumed)) appears to not work correctly
+// with Objective-C++ see https://llvm.org/bugs/show_bug.cgi?id=27887). Due to
+// that, the policy is always to |RETAIN| when using ARC.
+
+namespace internal {
+
+id ScopedNSProtocolTraitsRetain(__unsafe_unretained id obj)
+    __attribute((ns_returns_not_retained));
+id ScopedNSProtocolTraitsAutoRelease(__unsafe_unretained id obj)
+    __attribute((ns_returns_not_retained));
+void ScopedNSProtocolTraitsRelease(__unsafe_unretained id obj);
+
+// Traits for ScopedTypeRef<>. As this class may be compiled from file with
+// Automatic Reference Counting enable or not all methods have annotation to
+// enforce the same code generation in both case (in particular, the Retain
+// method uses ns_returns_not_retained to prevent ARC to insert a -release
+// call on the returned value and thus defeating the -retain).
+template <typename NST>
+struct ScopedNSProtocolTraits {
+  static NST InvalidValue() __attribute((ns_returns_not_retained)) {
+    return nil;
+  }
+  static NST Retain(__unsafe_unretained NST nst)
+      __attribute((ns_returns_not_retained)) {
+    return ScopedNSProtocolTraitsRetain(nst);
+  }
+  static void Release(__unsafe_unretained NST nst) {
+    ScopedNSProtocolTraitsRelease(nst);
+  }
+};
+
+}  // namespace internal
 
 template <typename NST>
-class scoped_nsprotocol {
+class scoped_nsprotocol
+    : public ScopedTypeRef<NST, internal::ScopedNSProtocolTraits<NST>> {
  public:
-  explicit scoped_nsprotocol(NST object = nil) : object_(object) {}
-
-  scoped_nsprotocol(const scoped_nsprotocol<NST>& that) : object_([that.object_ retain]) {}
+  using Traits = internal::ScopedNSProtocolTraits<NST>;
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+  explicit scoped_nsprotocol(NST object = Traits::InvalidValue(),
+                             scoped_policy::OwnershipPolicy policy =
+                                 scoped_policy::OwnershipPolicy::kAssume)
+      : ScopedTypeRef<NST, Traits>(object, policy) {}
+#else
+  explicit scoped_nsprotocol(NST object = Traits::InvalidValue())
+      : ScopedTypeRef<NST, Traits>(object,
+                                   scoped_policy::OwnershipPolicy::kRetain) {}
+#endif
 
-  template <typename NSU>
   // NOLINTNEXTLINE(google-explicit-constructor)
-  scoped_nsprotocol(const scoped_nsprotocol<NSU>& that) : object_([that.get() retain]) {}
+  scoped_nsprotocol(const scoped_nsprotocol<NST>& that)
+      : ScopedTypeRef<NST, Traits>(that) {}
 
-  ~scoped_nsprotocol() { [object_ release]; }
+  template <typename NSR>
+  explicit scoped_nsprotocol(const scoped_nsprotocol<NSR>& that_as_subclass)
+      : ScopedTypeRef<NST, Traits>(that_as_subclass) {}
+
+  // NOLINTNEXTLINE(google-explicit-constructor)
+  scoped_nsprotocol(scoped_nsprotocol<NST>&& that)
+      : ScopedTypeRef<NST, Traits>(std::move(that)) {}
 
   scoped_nsprotocol& operator=(const scoped_nsprotocol<NST>& that) {
-    reset([that.get() retain]);
+    ScopedTypeRef<NST, Traits>::operator=(that);
     return *this;
   }
 
-  void reset(NST object = nil) {
-    // We intentionally do not check that object != object_ as the caller must
-    // either already have an ownership claim over whatever it passes to this
-    // method, or call it with the |RETAIN| policy which will have ensured that
-    // the object is retained once more when reaching this point.
-    [object_ release];
-    object_ = object;
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+  void reset(NST object = Traits::InvalidValue(),
+             scoped_policy::OwnershipPolicy policy =
+                 scoped_policy::OwnershipPolicy::kAssume) {
+    ScopedTypeRef<NST, Traits>::reset(object, policy);
   }
-
-  bool operator==(NST that) const { return object_ == that; }
-  bool operator!=(NST that) const { return object_ != that; }
-
-  operator NST() const { return object_; }  // NOLINT(google-explicit-constructor)
-
-  NST get() const { return object_; }
-
-  void swap(scoped_nsprotocol& that) {
-    NST temp = that.object_;
-    that.object_ = object_;
-    object_ = temp;
+#else
+  void reset(NST object = Traits::InvalidValue()) {
+    ScopedTypeRef<NST, Traits>::reset(object,
+                                      scoped_policy::OwnershipPolicy::kRetain);
   }
+#endif
 
   // Shift reference to the autorelease pool to be released later.
-  NST autorelease() { return [release() autorelease]; }
-
- private:
-  NST object_;
-
-  // scoped_nsprotocol<>::release() is like scoped_ptr<>::release.  It is NOT a
-  // wrapper for [object_ release].  To force a scoped_nsprotocol<> to call
-  // [object_ release], use scoped_nsprotocol<>::reset().
-  [[nodiscard]] NST release() {
-    NST temp = object_;
-    object_ = nil;
-    return temp;
+  NST autorelease() __attribute((ns_returns_not_retained)) {
+    return internal::ScopedNSProtocolTraitsAutoRelease(this->release());
   }
 };
 
@@ -112,46 +151,97 @@ bool operator!=(C p1, const scoped_nsprotocol<C>& p2) {
 template <typename NST>
 class scoped_nsobject : public scoped_nsprotocol<NST*> {
  public:
-  explicit scoped_nsobject(NST* object = nil) : scoped_nsprotocol<NST*>(object) {}
+  using Traits = typename scoped_nsprotocol<NST*>::Traits;
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+  explicit scoped_nsobject(NST* object = Traits::InvalidValue(),
+                           scoped_policy::OwnershipPolicy policy =
+                               scoped_policy::OwnershipPolicy::kAssume)
+      : scoped_nsprotocol<NST*>(object, policy) {}
+#else
+  explicit scoped_nsobject(NST* object = Traits::InvalidValue())
+      : scoped_nsprotocol<NST*>(object) {}
+#endif
+
+  // NOLINTNEXTLINE(google-explicit-constructor)
+  scoped_nsobject(const scoped_nsobject<NST>& that)
+      : scoped_nsprotocol<NST*>(that) {}
 
-  scoped_nsobject(const scoped_nsobject<NST>& that) : scoped_nsprotocol<NST*>(that) {}
+  template <typename NSR>
+  explicit scoped_nsobject(const scoped_nsobject<NSR>& that_as_subclass)
+      : scoped_nsprotocol<NST*>(that_as_subclass) {}
 
-  template <typename NSU>
   // NOLINTNEXTLINE(google-explicit-constructor)
-  scoped_nsobject(const scoped_nsobject<NSU>& that) : scoped_nsprotocol<NST*>(that) {}
+  scoped_nsobject(scoped_nsobject<NST>&& that)
+      : scoped_nsprotocol<NST*>(std::move(that)) {}
 
   scoped_nsobject& operator=(const scoped_nsobject<NST>& that) {
     scoped_nsprotocol<NST*>::operator=(that);
     return *this;
   }
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+  void reset(NST* object = Traits::InvalidValue(),
+             scoped_policy::OwnershipPolicy policy =
+                 scoped_policy::OwnershipPolicy::kAssume) {
+    scoped_nsprotocol<NST*>::reset(object, policy);
+  }
+#else
+  void reset(NST* object = Traits::InvalidValue()) {
+    scoped_nsprotocol<NST*>::reset(object);
+  }
+#endif
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+  static_assert(std::is_same<NST, NSAutoreleasePool>::value == false,
+                "Use ScopedNSAutoreleasePool instead");
+#endif
 };
 
 // Specialization to make scoped_nsobject<id> work.
 template <>
 class scoped_nsobject<id> : public scoped_nsprotocol<id> {
  public:
-  explicit scoped_nsobject(id object = nil) : scoped_nsprotocol<id>(object) {}
+  using Traits = typename scoped_nsprotocol<id>::Traits;
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+  explicit scoped_nsobject(id object = Traits::InvalidValue(),
+                           scoped_policy::OwnershipPolicy policy =
+                               scoped_policy::OwnershipPolicy::kAssume)
+      : scoped_nsprotocol<id>(object, policy) {}
+#else
+  explicit scoped_nsobject(id object = Traits::InvalidValue())
+      : scoped_nsprotocol<id>(object) {}
+#endif
 
-  scoped_nsobject(const scoped_nsobject<id>& that) : scoped_nsprotocol<id>(that) {}
+  // NOLINTNEXTLINE(google-explicit-constructor)
+  scoped_nsobject(const scoped_nsobject<id>& that)
+      : scoped_nsprotocol<id>(that) {}
+
+  template <typename NSR>
+  explicit scoped_nsobject(const scoped_nsobject<NSR>& that_as_subclass)
+      : scoped_nsprotocol<id>(that_as_subclass) {}
 
-  template <typename NSU>
   // NOLINTNEXTLINE(google-explicit-constructor)
-  scoped_nsobject(const scoped_nsobject<NSU>& that) : scoped_nsprotocol<id>(that) {}
+  scoped_nsobject(scoped_nsobject<id>&& that)
+      : scoped_nsprotocol<id>(std::move(that)) {}
 
   scoped_nsobject& operator=(const scoped_nsobject<id>& that) {
     scoped_nsprotocol<id>::operator=(that);
     return *this;
   }
-};
 
-// Do not use scoped_nsobject for NSAutoreleasePools, use
-// ScopedNSAutoreleasePool instead. This is a compile time check. See details
-// at top of header.
-template <>
-class scoped_nsobject<NSAutoreleasePool> {
- private:
-  explicit scoped_nsobject(NSAutoreleasePool* object = nil);
-  FML_DISALLOW_COPY_AND_ASSIGN(scoped_nsobject);
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+  void reset(id object = Traits::InvalidValue(),
+             scoped_policy::OwnershipPolicy policy =
+                 scoped_policy::OwnershipPolicy::kAssume) {
+    scoped_nsprotocol<id>::reset(object, policy);
+  }
+#else
+  void reset(id object = Traits::InvalidValue()) {
+    scoped_nsprotocol<id>::reset(object);
+  }
+#endif
 };
 
 }  // namespace fml
diff --git a/fml/platform/darwin/scoped_nsobject.mm b/fml/platform/darwin/scoped_nsobject.mm
index 8ff8d2934f57d7ad13aca170e5ff0d62d6eaaf91..0645420b32df408eadb788e64061ad1338bab29c 100644
--- a/fml/platform/darwin/scoped_nsobject.mm
+++ b/fml/platform/darwin/scoped_nsobject.mm
@@ -6,6 +6,19 @@
 
 namespace fml {
 
-//
+namespace internal {
 
+id ScopedNSProtocolTraitsRetain(id obj) {
+  return [obj retain];
+}
+
+id ScopedNSProtocolTraitsAutoRelease(id obj) {
+  return [obj autorelease];
+}
+
+void ScopedNSProtocolTraitsRelease(id obj) {
+  return [obj release];
+}
+
+}  // namespace internal
 }  // namespace fml
diff --git a/fml/platform/darwin/scoped_nsobject_arc_unittests.mm b/fml/platform/darwin/scoped_nsobject_arc_unittests.mm
new file mode 100644
index 0000000000000000000000000000000000000000..cde666a00f354a7557e8fb68f1813f19f7754120
--- /dev/null
+++ b/fml/platform/darwin/scoped_nsobject_arc_unittests.mm
@@ -0,0 +1,131 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <vector>
+
+#import <CoreFoundation/CoreFoundation.h>
+
+#include "flutter/fml/platform/darwin/scoped_nsobject.h"
+#include "fml/logging.h"
+#include "gtest/gtest.h"
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
+namespace {
+
+template <typename NST>
+CFIndex GetRetainCount(const fml::scoped_nsobject<NST>& nst) {
+  @autoreleasepool {
+    return CFGetRetainCount((__bridge CFTypeRef)nst.get()) - 1;
+  }
+}
+
+#if __has_feature(objc_arc_weak)
+TEST(ScopedNSObjectTestARC, DefaultPolicyIsRetain) {
+  __weak id o;
+  @autoreleasepool {
+    fml::scoped_nsprotocol<id> p([[NSObject alloc] init]);
+    o = p.get();
+    EXPECT_EQ(o, p.get());
+  }
+  EXPECT_EQ(o, nil);
+}
+#endif
+
+TEST(ScopedNSObjectTestARC, ScopedNSObject) {
+  fml::scoped_nsobject<NSObject> p1([[NSObject alloc] init]);
+  @autoreleasepool {
+    EXPECT_TRUE(p1.get());
+    EXPECT_TRUE(p1.get());
+  }
+  EXPECT_EQ(1, GetRetainCount(p1));
+  EXPECT_EQ(1, GetRetainCount(p1));
+  fml::scoped_nsobject<NSObject> p2(p1);
+  @autoreleasepool {
+    EXPECT_EQ(p1.get(), p2.get());
+  }
+  EXPECT_EQ(2, GetRetainCount(p1));
+  p2.reset();
+  EXPECT_EQ(nil, p2.get());
+  EXPECT_EQ(1, GetRetainCount(p1));
+  {
+    fml::scoped_nsobject<NSObject> p3 = p1;
+    @autoreleasepool {
+      EXPECT_EQ(p1.get(), p3.get());
+    }
+    EXPECT_EQ(2, GetRetainCount(p1));
+    p3 = p1;
+    @autoreleasepool {
+      EXPECT_EQ(p1.get(), p3.get());
+    }
+    EXPECT_EQ(2, GetRetainCount(p1));
+  }
+  EXPECT_EQ(1, GetRetainCount(p1));
+  fml::scoped_nsobject<NSObject> p4;
+  @autoreleasepool {
+    p4 = fml::scoped_nsobject<NSObject>(p1.get());
+  }
+  EXPECT_EQ(2, GetRetainCount(p1));
+  @autoreleasepool {
+    EXPECT_TRUE(p1 == p1.get());
+    EXPECT_TRUE(p1 == p1);
+    EXPECT_FALSE(p1 != p1);
+    EXPECT_FALSE(p1 != p1.get());
+  }
+  fml::scoped_nsobject<NSObject> p5([[NSObject alloc] init]);
+  @autoreleasepool {
+    EXPECT_TRUE(p1 != p5);
+    EXPECT_TRUE(p1 != p5.get());
+    EXPECT_FALSE(p1 == p5);
+    EXPECT_FALSE(p1 == p5.get());
+  }
+
+  fml::scoped_nsobject<NSObject> p6 = p1;
+  EXPECT_EQ(3, GetRetainCount(p6));
+  @autoreleasepool {
+    p6.autorelease();
+    EXPECT_EQ(nil, p6.get());
+  }
+  EXPECT_EQ(2, GetRetainCount(p1));
+}
+
+TEST(ScopedNSObjectTestARC, ScopedNSObjectInContainer) {
+  fml::scoped_nsobject<id> p([[NSObject alloc] init]);
+  @autoreleasepool {
+    EXPECT_TRUE(p.get());
+  }
+  EXPECT_EQ(1, GetRetainCount(p));
+  @autoreleasepool {
+    std::vector<fml::scoped_nsobject<id>> objects;
+    objects.push_back(p);
+    EXPECT_EQ(2, GetRetainCount(p));
+    @autoreleasepool {
+      EXPECT_EQ(p.get(), objects[0].get());
+    }
+    objects.push_back(fml::scoped_nsobject<id>([[NSObject alloc] init]));
+    @autoreleasepool {
+      EXPECT_TRUE(objects[1].get());
+    }
+    EXPECT_EQ(1, GetRetainCount(objects[1]));
+  }
+  EXPECT_EQ(1, GetRetainCount(p));
+}
+
+TEST(ScopedNSObjectTestARC, ScopedNSObjectFreeFunctions) {
+  fml::scoped_nsobject<id> p1([[NSObject alloc] init]);
+  id o1 = p1.get();
+  EXPECT_TRUE(o1 == p1);
+  EXPECT_FALSE(o1 != p1);
+  fml::scoped_nsobject<id> p2([[NSObject alloc] init]);
+  EXPECT_TRUE(o1 != p2);
+  EXPECT_FALSE(o1 == p2);
+  id o2 = p2.get();
+  swap(p1, p2);
+  EXPECT_EQ(o2, p1.get());
+  EXPECT_EQ(o1, p2.get());
+}
+
+}  // namespace
diff --git a/fml/platform/darwin/scoped_nsobject_unittests.mm b/fml/platform/darwin/scoped_nsobject_unittests.mm
new file mode 100644
index 0000000000000000000000000000000000000000..566fcfd988923bf222845dac50043565e8ca4130
--- /dev/null
+++ b/fml/platform/darwin/scoped_nsobject_unittests.mm
@@ -0,0 +1,106 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <vector>
+
+#include "flutter/fml/platform/darwin/scoped_nsautorelease_pool.h"
+#include "flutter/fml/platform/darwin/scoped_nsobject.h"
+#include "gtest/gtest.h"
+
+namespace {
+
+// This is to suppress the bugprone-use-after-move warning.
+// This strategy is recommanded here:
+// https://clang.llvm.org/extra/clang-tidy/checks/bugprone/use-after-move.html#silencing-erroneous-warnings
+template <class T>
+void IS_INITIALIZED(T&) {}
+
+TEST(ScopedNSObjectTest, ScopedNSObject) {
+  fml::scoped_nsobject<NSObject> p1([[NSObject alloc] init]);
+  ASSERT_TRUE(p1.get());
+  ASSERT_EQ(1u, [p1 retainCount]);
+  fml::scoped_nsobject<NSObject> p2(p1);
+  ASSERT_EQ(p1.get(), p2.get());
+  ASSERT_EQ(2u, [p1 retainCount]);
+  p2.reset();
+  ASSERT_EQ(nil, p2.get());
+  ASSERT_EQ(1u, [p1 retainCount]);
+  {
+    fml::scoped_nsobject<NSObject> p3 = p1;
+    ASSERT_EQ(p1.get(), p3.get());
+    ASSERT_EQ(2u, [p1 retainCount]);
+    p3 = p1;
+    ASSERT_EQ(p1.get(), p3.get());
+    ASSERT_EQ(2u, [p1 retainCount]);
+  }
+  ASSERT_EQ(1u, [p1 retainCount]);
+  fml::scoped_nsobject<NSObject> p4([p1.get() retain]);
+  ASSERT_EQ(2u, [p1 retainCount]);
+  ASSERT_TRUE(p1 == p1.get());
+  ASSERT_TRUE(p1 == p1);
+  ASSERT_FALSE(p1 != p1);
+  ASSERT_FALSE(p1 != p1.get());
+  fml::scoped_nsobject<NSObject> p5([[NSObject alloc] init]);
+  ASSERT_TRUE(p1 != p5);
+  ASSERT_TRUE(p1 != p5.get());
+  ASSERT_FALSE(p1 == p5);
+  ASSERT_FALSE(p1 == p5.get());
+
+  fml::scoped_nsobject<NSObject> p6 = p1;
+  ASSERT_EQ(3u, [p6 retainCount]);
+  {
+    fml::ScopedNSAutoreleasePool pool;
+    p6.autorelease();
+    ASSERT_EQ(nil, p6.get());
+    ASSERT_EQ(3u, [p1 retainCount]);
+  }
+  ASSERT_EQ(2u, [p1 retainCount]);
+
+  fml::scoped_nsobject<NSObject> p7([[NSObject alloc] init]);
+  fml::scoped_nsobject<NSObject> p8(std::move(p7));
+  ASSERT_TRUE(p8);
+  ASSERT_EQ(1u, [p8 retainCount]);
+  IS_INITIALIZED(p7);
+  ASSERT_FALSE(p7.get());
+}
+
+// Instantiating scoped_nsobject<> with T=NSAutoreleasePool should trip a
+// static_assert.
+#if 0
+TEST(ScopedNSObjectTest, FailToCreateScopedNSObjectAutoreleasePool) {
+  fml::scoped_nsobject<NSAutoreleasePool> pool;
+}
+#endif
+
+TEST(ScopedNSObjectTest, ScopedNSObjectInContainer) {
+  fml::scoped_nsobject<id> p([[NSObject alloc] init]);
+  ASSERT_TRUE(p.get());
+  ASSERT_EQ(1u, [p retainCount]);
+  {
+    std::vector<fml::scoped_nsobject<id>> objects;
+    objects.push_back(p);
+    ASSERT_EQ(2u, [p retainCount]);
+    ASSERT_EQ(p.get(), objects[0].get());
+    objects.push_back(fml::scoped_nsobject<id>([[NSObject alloc] init]));
+    ASSERT_TRUE(objects[1].get());
+    ASSERT_EQ(1u, [objects[1] retainCount]);
+  }
+  ASSERT_EQ(1u, [p retainCount]);
+}
+
+TEST(ScopedNSObjectTest, ScopedNSObjectFreeFunctions) {
+  fml::scoped_nsobject<id> p1([[NSObject alloc] init]);
+  id o1 = p1.get();
+  ASSERT_TRUE(o1 == p1);
+  ASSERT_FALSE(o1 != p1);
+  fml::scoped_nsobject<id> p2([[NSObject alloc] init]);
+  ASSERT_TRUE(o1 != p2);
+  ASSERT_FALSE(o1 == p2);
+  id o2 = p2.get();
+  swap(p1, p2);
+  ASSERT_EQ(o2, p1.get());
+  ASSERT_EQ(o1, p2.get());
+}
+
+}  // namespace
diff --git a/fml/platform/darwin/scoped_policy.h b/fml/platform/darwin/scoped_policy.h
new file mode 100644
index 0000000000000000000000000000000000000000..fb4985871adae07bfc4c6ed37d980d79903db185
--- /dev/null
+++ b/fml/platform/darwin/scoped_policy.h
@@ -0,0 +1,25 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_FML_PLATFORM_DARWIN_SCOPED_POLICY_H_
+#define FLUTTER_FML_PLATFORM_DARWIN_SCOPED_POLICY_H_
+
+namespace fml {
+namespace scoped_policy {
+
+// Defines the ownership policy for a scoped object.
+enum OwnershipPolicy {
+  // The scoped object takes ownership of an object by taking over an existing
+  // ownership claim.
+  kAssume,
+
+  // The scoped object will retain the the object and any initial ownership is
+  // not changed.
+  kRetain
+};
+
+}  // namespace scoped_policy
+}  // namespace fml
+
+#endif  // FLUTTER_FML_PLATFORM_DARWIN_SCOPED_POLICY_H_
diff --git a/fml/platform/darwin/scoped_typeref.h b/fml/platform/darwin/scoped_typeref.h
new file mode 100644
index 0000000000000000000000000000000000000000..e4728d43cd0bb59ee235aa0ba28acae39971f994
--- /dev/null
+++ b/fml/platform/darwin/scoped_typeref.h
@@ -0,0 +1,147 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_FML_PLATFORM_DARWIN_SCOPED_TYPEREF_H_
+#define FLUTTER_FML_PLATFORM_DARWIN_SCOPED_TYPEREF_H_
+
+#include "flutter/fml/compiler_specific.h"
+#include "flutter/fml/platform/darwin/scoped_policy.h"
+
+namespace fml {
+
+// ScopedTypeRef<> is patterned after std::unique_ptr<>, but maintains ownership
+// of a reference to any type that is maintained by Retain and Release methods.
+//
+// The Traits structure must provide the Retain and Release methods for type T.
+// A default ScopedTypeRefTraits is used but not defined, and should be defined
+// for each type to use this interface. For example, an appropriate definition
+// of ScopedTypeRefTraits for CGLContextObj would be:
+//
+//   template<>
+//   struct ScopedTypeRefTraits<CGLContextObj> {
+//     static CGLContextObj InvalidValue() { return nullptr; }
+//     static CGLContextObj Retain(CGLContextObj object) {
+//       CGLContextRetain(object);
+//       return object;
+//     }
+//     static void Release(CGLContextObj object) { CGLContextRelease(object); }
+//   };
+//
+// For the many types that have pass-by-pointer create functions, the function
+// InitializeInto() is provided to allow direct initialization and assumption
+// of ownership of the object. For example, continuing to use the above
+// CGLContextObj specialization:
+//
+//   fml::ScopedTypeRef<CGLContextObj> context;
+//   CGLCreateContext(pixel_format, share_group, context.InitializeInto());
+//
+// For initialization with an existing object, the caller may specify whether
+// the ScopedTypeRef<> being initialized is assuming the caller's existing
+// ownership of the object (and should not call Retain in initialization) or if
+// it should not assume this ownership and must create its own (by calling
+// Retain in initialization). This behavior is based on the |policy| parameter,
+// with |kAssume| for the former and |kRetain| for the latter. The default
+// policy is to |kAssume|.
+
+template <typename T>
+struct ScopedTypeRefTraits;
+
+template <typename T, typename Traits = ScopedTypeRefTraits<T>>
+class ScopedTypeRef {
+ public:
+  typedef T element_type;
+
+  explicit ScopedTypeRef(
+      __unsafe_unretained T object = Traits::InvalidValue(),
+      fml::scoped_policy::OwnershipPolicy policy = fml::scoped_policy::kAssume)
+      : object_(object) {
+    if (object_ && policy == fml::scoped_policy::kRetain) {
+      object_ = Traits::Retain(object_);
+    }
+  }
+
+  // NOLINTNEXTLINE(google-explicit-constructor)
+  ScopedTypeRef(const ScopedTypeRef<T, Traits>& that) : object_(that.object_) {
+    if (object_) {
+      object_ = Traits::Retain(object_);
+    }
+  }
+
+  // This allows passing an object to a function that takes its superclass.
+  template <typename R, typename RTraits>
+  explicit ScopedTypeRef(const ScopedTypeRef<R, RTraits>& that_as_subclass)
+      : object_(that_as_subclass.get()) {
+    if (object_) {
+      object_ = Traits::Retain(object_);
+    }
+  }
+
+  // NOLINTNEXTLINE(google-explicit-constructor)
+  ScopedTypeRef(ScopedTypeRef<T, Traits>&& that) : object_(that.object_) {
+    that.object_ = Traits::InvalidValue();
+  }
+
+  ~ScopedTypeRef() {
+    if (object_) {
+      Traits::Release(object_);
+    }
+  }
+
+  ScopedTypeRef& operator=(const ScopedTypeRef<T, Traits>& that) {
+    reset(that.get(), fml::scoped_policy::kRetain);
+    return *this;
+  }
+
+  // This is to be used only to take ownership of objects that are created
+  // by pass-by-pointer create functions. To enforce this, require that the
+  // object be reset to NULL before this may be used.
+  [[nodiscard]] T* InitializeInto() {
+    FML_DCHECK(!object_);
+    return &object_;
+  }
+
+  void reset(__unsafe_unretained T object = Traits::InvalidValue(),
+             fml::scoped_policy::OwnershipPolicy policy =
+                 fml::scoped_policy::kAssume) {
+    if (object && policy == fml::scoped_policy::kRetain) {
+      object = Traits::Retain(object);
+    }
+    if (object_) {
+      Traits::Release(object_);
+    }
+    object_ = object;
+  }
+
+  bool operator==(__unsafe_unretained T that) const { return object_ == that; }
+
+  bool operator!=(__unsafe_unretained T that) const { return object_ != that; }
+
+  // NOLINTNEXTLINE(google-explicit-constructor)
+  operator T() const __attribute((ns_returns_not_retained)) { return object_; }
+
+  T get() const __attribute((ns_returns_not_retained)) { return object_; }
+
+  void swap(ScopedTypeRef& that) {
+    __unsafe_unretained T temp = that.object_;
+    that.object_ = object_;
+    object_ = temp;
+  }
+
+ protected:
+  // ScopedTypeRef<>::release() is like std::unique_ptr<>::release.  It is NOT
+  // a wrapper for Release().  To force a ScopedTypeRef<> object to call
+  // Release(), use ScopedTypeRef<>::reset().
+  [[nodiscard]] T release() __attribute((ns_returns_not_retained)) {
+    __unsafe_unretained T temp = object_;
+    object_ = Traits::InvalidValue();
+    return temp;
+  }
+
+ private:
+  __unsafe_unretained T object_;
+};
+
+}  // namespace fml
+
+#endif  // FLUTTER_FML_PLATFORM_DARWIN_SCOPED_TYPEREF_H_
diff --git a/fml/platform/darwin/string_range_sanitization.h b/fml/platform/darwin/string_range_sanitization.h
index 95c28b76b6380eefbc20635abad90dee6c602a62..1290fdd73c0aecce32437928b0a9d07fb33ea0a0 100644
--- a/fml/platform/darwin/string_range_sanitization.h
+++ b/fml/platform/darwin/string_range_sanitization.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FML_STRING_RANGE_SANITIZATION_H_
-#define FLUTTER_FML_STRING_RANGE_SANITIZATION_H_
+#ifndef FLUTTER_FML_PLATFORM_DARWIN_STRING_RANGE_SANITIZATION_H_
+#define FLUTTER_FML_PLATFORM_DARWIN_STRING_RANGE_SANITIZATION_H_
 
 #include <Foundation/Foundation.h>
 
@@ -26,4 +26,4 @@ NSRange RangeForCharactersInRange(NSString* text, NSRange range);
 
 }  // namespace fml
 
-#endif  // FLUTTER_FML_STRING_RANGE_SANITIZATION_H_
+#endif  // FLUTTER_FML_PLATFORM_DARWIN_STRING_RANGE_SANITIZATION_H_
diff --git a/fml/platform/darwin/weak_nsobject.h b/fml/platform/darwin/weak_nsobject.h
new file mode 100644
index 0000000000000000000000000000000000000000..cf657d0b5d9e88d06684112dd346ac9521b5123e
--- /dev/null
+++ b/fml/platform/darwin/weak_nsobject.h
@@ -0,0 +1,282 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_FML_PLATFORM_DARWIN_WEAK_NSOBJECT_H_
+#define FLUTTER_FML_PLATFORM_DARWIN_WEAK_NSOBJECT_H_
+
+#import <Foundation/Foundation.h>
+#import <objc/runtime.h>
+
+#include <stdlib.h>
+
+#include <utility>
+#include "flutter/fml/compiler_specific.h"
+#include "flutter/fml/logging.h"
+#include "flutter/fml/memory/ref_counted.h"
+#include "flutter/fml/memory/ref_ptr.h"
+#include "flutter/fml/memory/thread_checker.h"
+
+namespace debug {
+struct DebugThreadChecker {
+  FML_DECLARE_THREAD_CHECKER(checker);
+};
+}  // namespace debug
+
+// WeakNSObject<> is patterned after scoped_nsobject<>, but instead of
+// maintaining ownership of an NSObject subclass object, it will nil itself out
+// when the object is deallocated.
+//
+// WeakNSProtocol<> has the same behavior as WeakNSObject, but can be used
+// with protocols.
+//
+// Example usage (fml::WeakNSObject<T>):
+//   WeakNSObjectFactory factory([[Foo alloc] init]);
+//   WeakNSObject<Foo> weak_foo;  // No pointer
+//   weak_foo = factory.GetWeakNSObject() // Now a weak reference is kept.
+//   [weak_foo description];  // Returns [foo description].
+//   foo.reset();  // The reference is released.
+//   [weak_foo description];  // Returns nil, as weak_foo is pointing to nil.
+//
+//
+// Implementation wise a WeakNSObject keeps a reference to a refcounted
+// WeakContainer. There is one unique instance of a WeakContainer per watched
+// NSObject, this relationship is maintained via the ObjectiveC associated
+// object API, indirectly via an ObjectiveC CRBWeakNSProtocolSentinel class.
+//
+// Threading restrictions:
+// - Several WeakNSObject pointing to the same underlying object must all be
+//   created and dereferenced on the same thread;
+// - thread safety is enforced by the implementation, except:
+//     - it is allowed to destroy a WeakNSObject on any thread;
+// - the implementation assumes that the tracked object will be released on the
+//   same thread that the WeakNSObject is created on.
+//
+// fml specifics:
+// WeakNSObjects can only originate from a |WeakNSObjectFactory| (see below), though WeakNSObjects
+// are copyable and movable.
+//
+// WeakNSObjects are not in general thread-safe. They may only be *used* on
+// a single thread, namely the same thread as the "originating"
+// |WeakNSObjectFactory| (which can invalidate the WeakNSObjects that it
+// generates).
+//
+// However, WeakNSObject may be passed to other threads, reset on other
+// threads, or destroyed on other threads. They may also be reassigned on
+// other threads (in which case they should then only be used on the thread
+// corresponding to the new "originating" |WeakNSObjectFactory|).
+namespace fml {
+
+// Forward declaration, so |WeakNSObject<NST>| can friend it.
+template <typename NST>
+class WeakNSObjectFactory;
+
+// WeakContainer keeps a weak pointer to an object and clears it when it
+// receives nullify() from the object's sentinel.
+class WeakContainer : public fml::RefCountedThreadSafe<WeakContainer> {
+ public:
+  explicit WeakContainer(id object, const debug::DebugThreadChecker& checker);
+
+  id object() {
+    CheckThreadSafety();
+    return object_;
+  }
+
+  void nullify() { object_ = nil; }
+
+ private:
+  friend fml::RefCountedThreadSafe<WeakContainer>;
+  ~WeakContainer();
+
+  __unsafe_unretained id object_;
+
+  void CheckThreadSafety() const { FML_DCHECK_CREATION_THREAD_IS_CURRENT(checker_.checker); }
+
+// checker_ is unused in non-unopt mode.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-private-field"
+  debug::DebugThreadChecker checker_;
+#pragma clang diagnostic pop
+};
+
+}  // namespace fml
+
+// Sentinel for observing the object contained in the weak pointer. The object
+// will be deleted when the weak object is deleted and will notify its
+// container.
+@interface CRBWeakNSProtocolSentinel : NSObject
+// Return the only associated container for this object. There can be only one.
+// Will return null if object is nil .
++ (fml::RefPtr<fml::WeakContainer>)containerForObject:(id)object
+                                        threadChecker:(debug::DebugThreadChecker)checker;
+@end
+
+namespace fml {
+
+// Base class for all WeakNSObject derivatives.
+template <typename NST>
+class WeakNSProtocol {
+ public:
+  WeakNSProtocol() = default;
+
+  // A WeakNSProtocol object can be copied on one thread and used on
+  // another.
+  WeakNSProtocol(const WeakNSProtocol<NST>& that)
+      : container_(that.container_), checker_(that.checker_) {}
+
+  ~WeakNSProtocol() = default;
+
+  void reset() {
+    container_ = [CRBWeakNSProtocolSentinel containerForObject:nil threadChecker:checker_];
+  }
+
+  NST get() const {
+    CheckThreadSafety();
+    if (!container_.get()) {
+      return nil;
+    }
+    return container_->object();
+  }
+
+  WeakNSProtocol& operator=(const WeakNSProtocol<NST>& that) {
+    // A WeakNSProtocol object can be copied on one thread and used on
+    // another.
+    container_ = that.container_;
+    checker_ = that.checker_;
+    return *this;
+  }
+
+  bool operator==(NST that) const {
+    CheckThreadSafety();
+    return get() == that;
+  }
+
+  bool operator!=(NST that) const {
+    CheckThreadSafety();
+    return get() != that;
+  }
+
+  // This appears to be intentional to allow truthiness?
+  // NOLINTNEXTLINE(google-explicit-constructor)
+  operator NST() const {
+    CheckThreadSafety();
+    return get();
+  }
+
+ protected:
+  friend class WeakNSObjectFactory<NST>;
+
+  explicit WeakNSProtocol(RefPtr<fml::WeakContainer> container,
+                          const debug::DebugThreadChecker& checker)
+      : container_(std::move(container)), checker_(checker) {}
+
+  // Refecounted reference to the container tracking the ObjectiveC object this
+  // class encapsulates.
+  RefPtr<fml::WeakContainer> container_;
+  void CheckThreadSafety() const { FML_DCHECK_CREATION_THREAD_IS_CURRENT(checker_.checker); }
+
+  debug::DebugThreadChecker checker_;
+};
+
+// Free functions
+template <class NST>
+bool operator==(NST p1, const WeakNSProtocol<NST>& p2) {
+  return p1 == p2.get();
+}
+
+template <class NST>
+bool operator!=(NST p1, const WeakNSProtocol<NST>& p2) {
+  return p1 != p2.get();
+}
+
+template <typename NST>
+class WeakNSObject : public WeakNSProtocol<NST*> {
+ public:
+  WeakNSObject() = default;
+  WeakNSObject(const WeakNSObject<NST>& that) : WeakNSProtocol<NST*>(that) {}
+
+  WeakNSObject& operator=(const WeakNSObject<NST>& that) {
+    WeakNSProtocol<NST*>::operator=(that);
+    return *this;
+  }
+
+ private:
+  friend class WeakNSObjectFactory<NST>;
+
+  explicit WeakNSObject(RefPtr<fml::WeakContainer> container, debug::DebugThreadChecker checker)
+      : WeakNSProtocol<NST*>(container, checker) {}
+};
+
+// Specialization to make WeakNSObject<id> work.
+template <>
+class WeakNSObject<id> : public WeakNSProtocol<id> {
+ public:
+  WeakNSObject() = default;
+  WeakNSObject(const WeakNSObject<id>& that) : WeakNSProtocol<id>(that) {}
+
+  WeakNSObject& operator=(const WeakNSObject<id>& that) {
+    WeakNSProtocol<id>::operator=(that);
+    return *this;
+  }
+
+ private:
+  friend class WeakNSObjectFactory<id>;
+
+  explicit WeakNSObject(const RefPtr<fml::WeakContainer>& container,
+                        const debug::DebugThreadChecker& checker)
+      : WeakNSProtocol<id>(container, checker) {}
+};
+
+// Class that produces (valid) |WeakNSObject<NST>|s. Typically, this is used as a
+// member variable of |NST| (preferably the last one -- see below), and |NST|'s
+// methods control how WeakNSObjects to it are vended. This class is not
+// thread-safe, and should only be created, destroyed and used on a single
+// thread.
+//
+// Example:
+//
+// ```objc
+// @implementation Controller {
+//  std::unique_ptr<fml::WeakNSObjectFactory<Controller>> _weakFactory;
+// }
+//
+// - (instancetype)init {
+//   self = [super init];
+//   _weakFactory = std::make_unique<fml::WeakNSObjectFactory<Controller>>(self)
+// }
+
+// - (fml::WeakNSObject<Controller>) {
+//   return _weakFactory->GetWeakNSObject()
+// }
+//
+// @end
+// ```
+template <typename NST>
+class WeakNSObjectFactory {
+ public:
+  explicit WeakNSObjectFactory(NST* object) {
+    FML_DCHECK(object);
+    container_ = [CRBWeakNSProtocolSentinel containerForObject:object threadChecker:checker_];
+  }
+
+  ~WeakNSObjectFactory() { CheckThreadSafety(); }
+
+  // Gets a new weak pointer, which will be valid until this object is
+  // destroyed.e
+  WeakNSObject<NST> GetWeakNSObject() const { return WeakNSObject<NST>(container_, checker_); }
+
+ private:
+  // Refecounted reference to the container tracking the ObjectiveC object this
+  // class encapsulates.
+  RefPtr<fml::WeakContainer> container_;
+
+  void CheckThreadSafety() const { FML_DCHECK_CREATION_THREAD_IS_CURRENT(checker_.checker); }
+
+  debug::DebugThreadChecker checker_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(WeakNSObjectFactory);
+};
+
+}  // namespace fml
+
+#endif  // FLUTTER_FML_PLATFORM_DARWIN_WEAK_NSOBJECT_H_
diff --git a/fml/platform/darwin/weak_nsobject.mm b/fml/platform/darwin/weak_nsobject.mm
new file mode 100644
index 0000000000000000000000000000000000000000..e255515cafa219ac05da1fc18788dc077c23770c
--- /dev/null
+++ b/fml/platform/darwin/weak_nsobject.mm
@@ -0,0 +1,67 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/fml/platform/darwin/weak_nsobject.h"
+#include "flutter/fml/platform/darwin/scoped_nsautorelease_pool.h"
+#include "flutter/fml/platform/darwin/scoped_nsobject.h"
+
+namespace {
+// The key needed by objc_setAssociatedObject.
+char sentinelObserverKey_;
+}  // namespace
+
+namespace fml {
+
+WeakContainer::WeakContainer(id object, const debug::DebugThreadChecker& checker)
+    : object_(object), checker_(checker) {}
+
+WeakContainer::~WeakContainer() {}
+
+}  // namespace fml
+
+@interface CRBWeakNSProtocolSentinel ()
+// Container to notify on dealloc.
+@property(readonly, assign) fml::RefPtr<fml::WeakContainer> container;
+// Designed initializer.
+- (id)initWithContainer:(fml::RefPtr<fml::WeakContainer>)container;
+@end
+
+@implementation CRBWeakNSProtocolSentinel
+
++ (fml::RefPtr<fml::WeakContainer>)containerForObject:(id)object
+                                        threadChecker:(debug::DebugThreadChecker)checker {
+  if (object == nil) {
+    return nullptr;
+  }
+  // The autoreleasePool is needed here as the call to objc_getAssociatedObject
+  // returns an autoreleased object which is better released sooner than later.
+  fml::ScopedNSAutoreleasePool pool;
+  CRBWeakNSProtocolSentinel* sentinel = objc_getAssociatedObject(object, &sentinelObserverKey_);
+  if (!sentinel) {
+    fml::scoped_nsobject<CRBWeakNSProtocolSentinel> newSentinel([[CRBWeakNSProtocolSentinel alloc]
+        initWithContainer:AdoptRef(new fml::WeakContainer(object, checker))]);
+    sentinel = newSentinel;
+    objc_setAssociatedObject(object, &sentinelObserverKey_, sentinel, OBJC_ASSOCIATION_RETAIN);
+    // The retain count is 2. One retain is due to the alloc, the other to the
+    // association with the weak object.
+    FML_DCHECK(2u == [sentinel retainCount]);
+  }
+  return [sentinel container];
+}
+
+- (id)initWithContainer:(fml::RefPtr<fml::WeakContainer>)container {
+  FML_DCHECK(container.get());
+  self = [super init];
+  if (self) {
+    _container = container;
+  }
+  return self;
+}
+
+- (void)dealloc {
+  _container->nullify();
+  [super dealloc];
+}
+
+@end
diff --git a/fml/platform/darwin/weak_nsobject_arc_unittests.mm b/fml/platform/darwin/weak_nsobject_arc_unittests.mm
new file mode 100644
index 0000000000000000000000000000000000000000..7e09b746d5d89c8f814b90c1bae045314e91dab4
--- /dev/null
+++ b/fml/platform/darwin/weak_nsobject_arc_unittests.mm
@@ -0,0 +1,121 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/fml/message_loop.h"
+#include "flutter/fml/platform/darwin/scoped_nsobject.h"
+#include "flutter/fml/platform/darwin/weak_nsobject.h"
+#include "flutter/fml/task_runner.h"
+#include "flutter/fml/thread.h"
+#include "gtest/gtest.h"
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
+namespace fml {
+namespace {
+
+TEST(WeakNSObjectTestARC, WeakNSObject) {
+  scoped_nsobject<NSObject> p1;
+  WeakNSObject<NSObject> w1;
+  @autoreleasepool {
+    p1.reset(([[NSObject alloc] init]));
+    WeakNSObjectFactory factory(p1.get());
+    w1 = factory.GetWeakNSObject();
+    EXPECT_TRUE(w1);
+    p1.reset();
+  }
+  EXPECT_FALSE(w1);
+}
+
+TEST(WeakNSObjectTestARC, MultipleWeakNSObject) {
+  scoped_nsobject<NSObject> p1;
+  WeakNSObject<NSObject> w1;
+  WeakNSObject<NSObject> w2;
+  @autoreleasepool {
+    p1.reset([[NSObject alloc] init]);
+    WeakNSObjectFactory factory(p1.get());
+    w1 = factory.GetWeakNSObject();
+    // NOLINTNEXTLINE(performance-unnecessary-copy-initialization)
+    w2 = w1;
+    EXPECT_TRUE(w1);
+    EXPECT_TRUE(w2);
+    EXPECT_TRUE(w1.get() == w2.get());
+    p1.reset();
+  }
+  EXPECT_FALSE(w1);
+  EXPECT_FALSE(w2);
+}
+
+TEST(WeakNSObjectTestARC, WeakNSObjectDies) {
+  scoped_nsobject<NSObject> p1([[NSObject alloc] init]);
+  WeakNSObjectFactory factory(p1.get());
+  {
+    WeakNSObject<NSObject> w1 = factory.GetWeakNSObject();
+    EXPECT_TRUE(w1);
+  }
+}
+
+TEST(WeakNSObjectTestARC, WeakNSObjectReset) {
+  scoped_nsobject<NSObject> p1([[NSObject alloc] init]);
+  WeakNSObjectFactory factory(p1.get());
+  WeakNSObject<NSObject> w1 = factory.GetWeakNSObject();
+  EXPECT_TRUE(w1);
+  w1.reset();
+  EXPECT_FALSE(w1);
+  EXPECT_TRUE(p1);
+  EXPECT_TRUE([p1 description]);
+}
+
+TEST(WeakNSObjectTestARC, WeakNSObjectEmpty) {
+  scoped_nsobject<NSObject> p1;
+  WeakNSObject<NSObject> w1;
+  @autoreleasepool {
+    scoped_nsobject<NSObject> p1([[NSObject alloc] init]);
+    EXPECT_FALSE(w1);
+    WeakNSObjectFactory factory(p1.get());
+    w1 = factory.GetWeakNSObject();
+    EXPECT_TRUE(w1);
+    p1.reset();
+  }
+  EXPECT_FALSE(w1);
+}
+
+TEST(WeakNSObjectTestARC, WeakNSObjectCopy) {
+  scoped_nsobject<NSObject> p1;
+  WeakNSObject<NSObject> w1;
+  WeakNSObject<NSObject> w2;
+  @autoreleasepool {
+    scoped_nsobject<NSObject> p1([[NSObject alloc] init]);
+    WeakNSObjectFactory factory(p1.get());
+    w1 = factory.GetWeakNSObject();
+    // NOLINTNEXTLINE(performance-unnecessary-copy-initialization)
+    w2 = w1;
+    EXPECT_TRUE(w1);
+    EXPECT_TRUE(w2);
+    p1.reset();
+  }
+  EXPECT_FALSE(w1);
+  EXPECT_FALSE(w2);
+}
+
+TEST(WeakNSObjectTestARC, WeakNSObjectAssignment) {
+  scoped_nsobject<NSObject> p1;
+  WeakNSObject<NSObject> w1;
+  WeakNSObject<NSObject> w2;
+  @autoreleasepool {
+    scoped_nsobject<NSObject> p1([[NSObject alloc] init]);
+    WeakNSObjectFactory factory(p1.get());
+    w1 = factory.GetWeakNSObject();
+    // NOLINTNEXTLINE(performance-unnecessary-copy-initialization)
+    w2 = w1;
+    EXPECT_TRUE(w1);
+    EXPECT_TRUE(w2);
+    p1.reset();
+  }
+  EXPECT_FALSE(w1);
+  EXPECT_FALSE(w2);
+}
+}  // namespace
+}  // namespace fml
diff --git a/fml/platform/darwin/weak_nsobject_unittests.mm b/fml/platform/darwin/weak_nsobject_unittests.mm
new file mode 100644
index 0000000000000000000000000000000000000000..0b93cdf449ec778a749d18357b91a6389306b58a
--- /dev/null
+++ b/fml/platform/darwin/weak_nsobject_unittests.mm
@@ -0,0 +1,95 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/fml/message_loop.h"
+#include "flutter/fml/platform/darwin/scoped_nsobject.h"
+#include "flutter/fml/platform/darwin/weak_nsobject.h"
+#include "flutter/fml/task_runner.h"
+#include "flutter/fml/thread.h"
+#include "gtest/gtest.h"
+
+namespace fml {
+namespace {
+
+TEST(WeakNSObjectTest, WeakNSObject) {
+  scoped_nsobject<NSObject> p1([[NSObject alloc] init]);
+  WeakNSObjectFactory factory(p1.get());
+  WeakNSObject<NSObject> w1 = factory.GetWeakNSObject();
+  EXPECT_TRUE(w1);
+  p1.reset();
+  EXPECT_FALSE(w1);
+}
+
+TEST(WeakNSObjectTest, MultipleWeakNSObject) {
+  scoped_nsobject<NSObject> p1([[NSObject alloc] init]);
+  WeakNSObjectFactory factory(p1.get());
+  WeakNSObject<NSObject> w1 = factory.GetWeakNSObject();
+  // NOLINTNEXTLINE(performance-unnecessary-copy-initialization)
+  WeakNSObject<NSObject> w2(w1);
+  EXPECT_TRUE(w1);
+  EXPECT_TRUE(w2);
+  EXPECT_TRUE(w1.get() == w2.get());
+  p1.reset();
+  EXPECT_FALSE(w1);
+  EXPECT_FALSE(w2);
+}
+
+TEST(WeakNSObjectTest, WeakNSObjectDies) {
+  scoped_nsobject<NSObject> p1([[NSObject alloc] init]);
+  WeakNSObjectFactory factory(p1.get());
+  {
+    WeakNSObject<NSObject> w1 = factory.GetWeakNSObject();
+    EXPECT_TRUE(w1);
+  }
+}
+
+TEST(WeakNSObjectTest, WeakNSObjectReset) {
+  scoped_nsobject<NSObject> p1([[NSObject alloc] init]);
+  WeakNSObjectFactory factory(p1.get());
+  WeakNSObject<NSObject> w1 = factory.GetWeakNSObject();
+  EXPECT_TRUE(w1);
+  w1.reset();
+  EXPECT_FALSE(w1);
+  EXPECT_TRUE(p1);
+  EXPECT_TRUE([p1 description]);
+}
+
+TEST(WeakNSObjectTest, WeakNSObjectEmpty) {
+  scoped_nsobject<NSObject> p1([[NSObject alloc] init]);
+  WeakNSObject<NSObject> w1;
+  EXPECT_FALSE(w1);
+  WeakNSObjectFactory factory(p1.get());
+  w1 = factory.GetWeakNSObject();
+  EXPECT_TRUE(w1);
+  p1.reset();
+  EXPECT_FALSE(w1);
+}
+
+TEST(WeakNSObjectTest, WeakNSObjectCopy) {
+  scoped_nsobject<NSObject> p1([[NSObject alloc] init]);
+  WeakNSObjectFactory factory(p1.get());
+  WeakNSObject<NSObject> w1 = factory.GetWeakNSObject();
+  // NOLINTNEXTLINE(performance-unnecessary-copy-initialization)
+  WeakNSObject<NSObject> w2(w1);
+  EXPECT_TRUE(w1);
+  EXPECT_TRUE(w2);
+  p1.reset();
+  EXPECT_FALSE(w1);
+  EXPECT_FALSE(w2);
+}
+
+TEST(WeakNSObjectTest, WeakNSObjectAssignment) {
+  scoped_nsobject<NSObject> p1([[NSObject alloc] init]);
+  WeakNSObjectFactory factory(p1.get());
+  WeakNSObject<NSObject> w1 = factory.GetWeakNSObject();
+  // NOLINTNEXTLINE(performance-unnecessary-copy-initialization)
+  WeakNSObject<NSObject> w2 = w1;
+  EXPECT_TRUE(w1);
+  EXPECT_TRUE(w2);
+  p1.reset();
+  EXPECT_FALSE(w1);
+  EXPECT_FALSE(w2);
+}
+}  // namespace
+}  // namespace fml
diff --git a/fml/platform/fuchsia/log_interest_listener.cc b/fml/platform/fuchsia/log_interest_listener.cc
new file mode 100644
index 0000000000000000000000000000000000000000..fe123c5a37a1e584dfca88bd41fce17bc0653103
--- /dev/null
+++ b/fml/platform/fuchsia/log_interest_listener.cc
@@ -0,0 +1,50 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/fml/platform/fuchsia/log_interest_listener.h"
+
+#include <fidl/fuchsia.diagnostics/cpp/fidl.h>
+#include <fidl/fuchsia.logger/cpp/fidl.h>
+#include <zircon/assert.h>
+
+#include "flutter/fml/log_level.h"
+#include "flutter/fml/log_settings.h"
+
+namespace fml {
+
+void LogInterestListener::AsyncWaitForInterestChanged() {
+  log_sink_->WaitForInterestChange().Then(
+      [this](fidl::Result<fuchsia_logger::LogSink::WaitForInterestChange>&
+                 interest_result) {
+        if (interest_result.is_error()) {
+          // Gracefully terminate on loop shutdown
+          auto error = interest_result.error_value();
+          ZX_ASSERT_MSG(error.is_framework_error() &&
+                            error.framework_error().is_dispatcher_shutdown(),
+                        "%s", error.FormatDescription().c_str());
+          return;
+        }
+        HandleInterestChange(interest_result->data());
+        AsyncWaitForInterestChanged();
+      });
+}
+
+void LogInterestListener::HandleInterestChange(
+    const fuchsia_diagnostics::Interest& interest) {
+  auto severity =
+      interest.min_severity().value_or(fuchsia_diagnostics::Severity::kInfo);
+  if (severity <= fuchsia_diagnostics::Severity::kDebug) {
+    fml::SetLogSettings({.min_log_level = -1});  // Verbose
+  } else if (severity <= fuchsia_diagnostics::Severity::kInfo) {
+    fml::SetLogSettings({.min_log_level = kLogInfo});
+  } else if (severity <= fuchsia_diagnostics::Severity::kWarn) {
+    fml::SetLogSettings({.min_log_level = kLogWarning});
+  } else if (severity <= fuchsia_diagnostics::Severity::kError) {
+    fml::SetLogSettings({.min_log_level = kLogError});
+  } else {
+    fml::SetLogSettings({.min_log_level = kLogFatal});
+  }
+}
+
+}  // namespace fml
diff --git a/fml/platform/fuchsia/log_interest_listener.h b/fml/platform/fuchsia/log_interest_listener.h
new file mode 100644
index 0000000000000000000000000000000000000000..1cdee950ec5f6873933ecd88102c2f4c6cdb74d3
--- /dev/null
+++ b/fml/platform/fuchsia/log_interest_listener.h
@@ -0,0 +1,37 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_FML_PLATFORM_FUCHSIA_LOG_INTEREST_LISTENER_H_
+#define FLUTTER_FML_PLATFORM_FUCHSIA_LOG_INTEREST_LISTENER_H_
+
+#include <fidl/fuchsia.diagnostics/cpp/fidl.h>
+#include <fidl/fuchsia.logger/cpp/fidl.h>
+#include <lib/fidl/cpp/client.h>
+
+namespace fml {
+
+// Class to monitor the Fuchsia LogSink service for log interest changes (i.e.
+// when the Fuchsia OS requests a change to the minimum log level).
+//
+// Care should be taken to always use this object on the same thread.
+class LogInterestListener {
+ public:
+  LogInterestListener(fidl::ClientEnd<::fuchsia_logger::LogSink> client_end,
+                      async_dispatcher_t* dispatcher)
+      : log_sink_(std::move(client_end), dispatcher) {}
+
+  // Schedules async task to monitor the log sink for log interest changes.
+  void AsyncWaitForInterestChanged();
+
+  // Updates the global log settings in response to a log interest change.
+  static void HandleInterestChange(
+      const fuchsia_diagnostics::Interest& interest);
+
+ private:
+  fidl::Client<::fuchsia_logger::LogSink> log_sink_;
+};
+
+}  // namespace fml
+
+#endif  // FLUTTER_FML_PLATFORM_FUCHSIA_LOG_INTEREST_LISTENER_H_
diff --git a/fml/platform/fuchsia/log_interest_listener_unittests.cc b/fml/platform/fuchsia/log_interest_listener_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..3f2ae38160d60aa3d19bcf461bbe3799566aca71
--- /dev/null
+++ b/fml/platform/fuchsia/log_interest_listener_unittests.cc
@@ -0,0 +1,127 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <fidl/fuchsia.diagnostics/cpp/fidl.h>
+#include <fidl/fuchsia.logger/cpp/fidl.h>
+#include <lib/async-loop/cpp/loop.h>
+#include <lib/async-loop/default.h>
+#include <lib/async-loop/testing/cpp/real_loop.h>
+#include <lib/async/dispatcher.h>
+#include <lib/component/incoming/cpp/protocol.h>
+#include <lib/fidl/cpp/client.h>
+#include <lib/fidl/cpp/wire/channel.h>
+#include <lib/fidl/cpp/wire/connect_service.h>
+#include <lib/fit/defer.h>
+#include <lib/fit/result.h>
+#include <lib/sys/component/cpp/testing/realm_builder.h>
+#include <lib/sys/component/cpp/testing/realm_builder_types.h>
+#include <zircon/errors.h>
+
+#include "flutter/fml/log_settings.h"
+#include "flutter/fml/platform/fuchsia/log_interest_listener.h"
+#include "gtest/gtest.h"
+
+namespace fml {
+namespace testing {
+
+constexpr static char kLogSink[] = "log_sink";
+
+class LogInterestListenerFuchsia : public ::loop_fixture::RealLoop,
+                                   public ::testing::Test {};
+
+TEST_F(LogInterestListenerFuchsia, SeverityChanges) {
+  ScopedSetLogSettings backup({.min_log_level = kLogInfo});
+  {
+    ::fuchsia_diagnostics::Interest interest;
+    interest.min_severity(::fuchsia_diagnostics::Severity::kTrace);
+    LogInterestListener::HandleInterestChange(interest);
+    EXPECT_EQ(GetMinLogLevel(), -1);  // VERBOSE
+  }
+  {
+    ::fuchsia_diagnostics::Interest interest;
+    interest.min_severity(::fuchsia_diagnostics::Severity::kInfo);
+    LogInterestListener::HandleInterestChange(interest);
+    EXPECT_EQ(GetMinLogLevel(), kLogInfo);
+  }
+  {
+    ::fuchsia_diagnostics::Interest interest;
+    interest.min_severity(::fuchsia_diagnostics::Severity::kError);
+    LogInterestListener::HandleInterestChange(interest);
+    EXPECT_EQ(GetMinLogLevel(), kLogError);
+  }
+}
+
+// Class to mock the server end of a LogSink.
+class MockLogSink : public component_testing::LocalComponentImpl,
+                    public fidl::Server<fuchsia_logger::LogSink> {
+ public:
+  MockLogSink(fit::closure quitLoop, async_dispatcher_t* dispatcher)
+      : quit_loop_(std::move(quitLoop)), dispatcher_(dispatcher) {}
+
+  void WaitForInterestChange(
+      WaitForInterestChangeCompleter::Sync& completer) override {
+    if (first_call_) {
+      // If it has not been called before, then return a result right away.
+      fuchsia_logger::LogSinkWaitForInterestChangeResponse response = {
+          {.data = {{.min_severity = fuchsia_diagnostics::Severity::kWarn}}}};
+      completer.Reply(fit::ok(response));
+      first_call_ = false;
+    } else {
+      // On the second call, don't return a result.
+      completer_.emplace(completer.ToAsync());
+      quit_loop_();
+    }
+  }
+
+  void Connect(fuchsia_logger::LogSinkConnectRequest& request,
+               ConnectCompleter::Sync& completer) override {}
+
+  void ConnectStructured(
+      fuchsia_logger::LogSinkConnectStructuredRequest& request,
+      ConnectStructuredCompleter::Sync& completer) override {}
+
+  void OnStart() override {
+    ASSERT_EQ(outgoing()->AddProtocol<fuchsia_logger::LogSink>(
+                  bindings_.CreateHandler(this, dispatcher_,
+                                          fidl::kIgnoreBindingClosure)),
+              ZX_OK);
+  }
+
+ private:
+  bool first_call_ = true;
+  fit::closure quit_loop_;
+  async_dispatcher_t* dispatcher_;
+  fidl::ServerBindingGroup<fuchsia_logger::LogSink> bindings_;
+  std::optional<WaitForInterestChangeCompleter::Async> completer_;
+};
+
+TEST_F(LogInterestListenerFuchsia, AsyncWaitForInterestChange) {
+  ScopedSetLogSettings backup({.min_log_level = kLogInfo});
+  auto realm_builder = component_testing::RealmBuilder::Create();
+  realm_builder.AddLocalChild(kLogSink, [&]() {
+    return std::make_unique<MockLogSink>(QuitLoopClosure(), dispatcher());
+  });
+  realm_builder.AddRoute(component_testing::Route{
+      .capabilities = {component_testing::Protocol{
+          fidl::DiscoverableProtocolName<fuchsia_logger::LogSink>}},
+      .source = component_testing::ChildRef{kLogSink},
+      .targets = {component_testing::ParentRef()}});
+
+  auto realm = realm_builder.Build(dispatcher());
+  auto cleanup = fit::defer([&]() {
+    bool complete = false;
+    realm.Teardown([&](auto result) { complete = true; });
+    RunLoopUntil([&]() { return complete; });
+  });
+  auto client_end = realm.component().Connect<fuchsia_logger::LogSink>();
+  ASSERT_TRUE(client_end.is_ok());
+  LogInterestListener listener(std::move(client_end.value()), dispatcher());
+  listener.AsyncWaitForInterestChanged();
+  RunLoop();
+
+  EXPECT_EQ(GetMinLogLevel(), kLogWarning);
+}
+
+}  // namespace testing
+}  // namespace fml
diff --git a/fml/platform/fuchsia/log_state.cc b/fml/platform/fuchsia/log_state.cc
new file mode 100644
index 0000000000000000000000000000000000000000..92e27c48b4624fa9731b99238f6ce8d887839895
--- /dev/null
+++ b/fml/platform/fuchsia/log_state.cc
@@ -0,0 +1,66 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/fml/platform/fuchsia/log_state.h"
+
+#include <fidl/fuchsia.logger/cpp/fidl.h>
+#include <lib/component/incoming/cpp/protocol.h>
+#include <lib/fidl/cpp/channel.h>
+#include <lib/fidl/cpp/wire/internal/transport_channel.h>
+#include <lib/zx/socket.h>
+#include <zircon/assert.h>
+#include <zircon/types.h>
+
+#include <atomic>
+#include <initializer_list>
+#include <memory>
+#include <mutex>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "flutter/fml/platform/fuchsia/log_interest_listener.h"
+
+namespace fml {
+
+LogState::LogState() {
+  // Get channel to log sink
+  auto client_end = component::Connect<fuchsia_logger::LogSink>();
+  ZX_ASSERT(client_end.is_ok());
+  fidl::SyncClient log_sink(std::move(*client_end));
+
+  // Attempts to create a kernel socket object should never fail.
+  zx::socket local, remote;
+  zx::socket::create(ZX_SOCKET_DATAGRAM, &local, &remote);
+  auto result = log_sink->ConnectStructured({{.socket = std::move(remote)}});
+  ZX_ASSERT_MSG(result.is_ok(), "%s",
+                result.error_value().FormatDescription().c_str());
+
+  // Wait for the first interest change to set the initial minimum logging
+  // level (should return quickly).
+  auto interest_result = log_sink->WaitForInterestChange();
+  ZX_ASSERT_MSG(interest_result.is_ok(), "%s",
+                interest_result.error_value().FormatDescription().c_str());
+  LogInterestListener::HandleInterestChange(interest_result->data());
+
+  socket_ = std::move(local);
+  client_end_ = log_sink.TakeClientEnd();
+}
+
+fidl::ClientEnd<::fuchsia_logger::LogSink> LogState::TakeClientEnd() {
+  std::lock_guard lock(mutex_);
+  return std::move(client_end_);
+}
+
+void LogState::SetTags(const std::initializer_list<std::string>& tags) {
+  std::atomic_store(&tags_,
+                    std::make_shared<const std::vector<std::string>>(tags));
+}
+
+LogState& LogState::Default() {
+  static LogState* instance = new LogState();
+  return *instance;
+}
+
+}  // namespace fml
diff --git a/fml/platform/fuchsia/log_state.h b/fml/platform/fuchsia/log_state.h
new file mode 100644
index 0000000000000000000000000000000000000000..2521a4e0e95f6f54dd4a2ca2c1df09b24c5078c4
--- /dev/null
+++ b/fml/platform/fuchsia/log_state.h
@@ -0,0 +1,55 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_FML_PLATFORM_FUCHSIA_LOG_STATE_H_
+#define FLUTTER_FML_PLATFORM_FUCHSIA_LOG_STATE_H_
+
+#include <fidl/fuchsia.logger/cpp/fidl.h>
+#include <lib/fidl/cpp/wire/internal/transport_channel.h>
+#include <lib/zx/socket.h>
+
+#include <atomic>
+#include <initializer_list>
+#include <memory>
+#include <mutex>
+#include <string>
+#include <vector>
+
+namespace fml {
+
+// Class for holding the global connection to the Fuchsia LogSink service.
+class LogState {
+ public:
+  // Connects to the Fuchsia LogSink service.
+  LogState();
+
+  // Get the socket for sending log messages.
+  const zx::socket& socket() const { return socket_; }
+
+  // Get the current list of tags.
+  std::shared_ptr<const std::vector<std::string>> tags() const {
+    return std::atomic_load(&tags_);
+  }
+
+  // Take ownership of the log sink channel (e.g. for LogInterestListener).
+  // This is thread-safe.
+  fidl::ClientEnd<::fuchsia_logger::LogSink> TakeClientEnd();
+
+  // Updates the default tags.
+  // This is thread-safe.
+  void SetTags(const std::initializer_list<std::string>& tags);
+
+  // Get the default instance of LogState.
+  static LogState& Default();
+
+ private:
+  std::mutex mutex_;
+  fidl::ClientEnd<::fuchsia_logger::LogSink> client_end_;
+  zx::socket socket_;
+  std::shared_ptr<const std::vector<std::string>> tags_;
+};
+
+}  // namespace fml
+
+#endif  // FLUTTER_FML_PLATFORM_FUCHSIA_LOG_STATE_H_
diff --git a/fml/platform/fuchsia/task_observers.h b/fml/platform/fuchsia/task_observers.h
index de3c2e47317fe677b2609a839ca07e7270323a81..21596ad299fcec200f1d728a2e681683a38b290d 100644
--- a/fml/platform/fuchsia/task_observers.h
+++ b/fml/platform/fuchsia/task_observers.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_TASK_OBSERVERS_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_TASK_OBSERVERS_H_
+#ifndef FLUTTER_FML_PLATFORM_FUCHSIA_TASK_OBSERVERS_H_
+#define FLUTTER_FML_PLATFORM_FUCHSIA_TASK_OBSERVERS_H_
 
 #include <lib/fit/function.h>
 
@@ -37,4 +37,4 @@ void CurrentMessageLoopRemoveAfterTaskObserver(intptr_t key);
 
 }  // namespace fml
 
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_TASK_OBSERVERS_H_
+#endif  // FLUTTER_FML_PLATFORM_FUCHSIA_TASK_OBSERVERS_H_
diff --git a/fml/platform/linux/message_loop_linux.cc b/fml/platform/linux/message_loop_linux.cc
index 6e6febc2201f6299f36d0ea0275b59da138b6cd8..61a261dba1eb2d3f2f87366b0ce855d2ec760dce 100644
--- a/fml/platform/linux/message_loop_linux.cc
+++ b/fml/platform/linux/message_loop_linux.cc
@@ -16,8 +16,7 @@ static constexpr int kClockType = CLOCK_MONOTONIC;
 
 MessageLoopLinux::MessageLoopLinux()
     : epoll_fd_(FML_HANDLE_EINTR(::epoll_create(1 /* unused */))),
-      timer_fd_(::timerfd_create(kClockType, TFD_NONBLOCK | TFD_CLOEXEC)),
-      running_(false) {
+      timer_fd_(::timerfd_create(kClockType, TFD_NONBLOCK | TFD_CLOEXEC)) {
   FML_CHECK(epoll_fd_.is_valid());
   FML_CHECK(timer_fd_.is_valid());
   bool added_source = AddOrRemoveTimerSource(true);
diff --git a/fml/platform/linux/message_loop_linux.h b/fml/platform/linux/message_loop_linux.h
index 5563328b2f5a30c2b09a5d5c56320b453b2d9e9a..f9099486823ab376e996895fee7801940f42421a 100644
--- a/fml/platform/linux/message_loop_linux.h
+++ b/fml/platform/linux/message_loop_linux.h
@@ -17,7 +17,7 @@ class MessageLoopLinux : public MessageLoopImpl {
  private:
   fml::UniqueFD epoll_fd_;
   fml::UniqueFD timer_fd_;
-  bool running_;
+  bool running_ = false;
 
   MessageLoopLinux();
 
diff --git a/fml/platform/linux/timerfd.h b/fml/platform/linux/timerfd.h
index 7ec58ae9df16a10c338bc41dd4ff7e7127d7fa48..ed035a527aa180459edefa13284e11f94880d5e0 100644
--- a/fml/platform/linux/timerfd.h
+++ b/fml/platform/linux/timerfd.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FML_PLATFORM_LINUX_TIMER_FD_H_
-#define FLUTTER_FML_PLATFORM_LINUX_TIMER_FD_H_
+#ifndef FLUTTER_FML_PLATFORM_LINUX_TIMERFD_H_
+#define FLUTTER_FML_PLATFORM_LINUX_TIMERFD_H_
 
 #include "flutter/fml/time/time_point.h"
 
@@ -53,4 +53,4 @@ bool TimerDrain(int fd);
 
 }  // namespace fml
 
-#endif  // FLUTTER_FML_PLATFORM_LINUX_TIMER_FD_H_
+#endif  // FLUTTER_FML_PLATFORM_LINUX_TIMERFD_H_
diff --git a/fml/platform/ohos/hisysevent_c.cc b/fml/platform/ohos/hisysevent_c.cc
new file mode 100644
index 0000000000000000000000000000000000000000..858f8061c49bf7b94b3497c4ee6cd3172679ec99
--- /dev/null
+++ b/fml/platform/ohos/hisysevent_c.cc
@@ -0,0 +1,113 @@
+#include "flutter/fml/platform/ohos/hisysevent_c.h"
+
+namespace fml {
+
+static void* handle = NULL;
+static HiSysEvent_Write_Def HiSysEvent_Write  = NULL;
+
+static const char* domain_ = "PERFORMANCE";
+static const char* event_ = "INTERACTION_HITCH_TIME_RATIO";
+static const HiSysEventEventType type_ = HISYSEVENT_BEHAVIOR;
+static HiSysEventParam params_[12] = {
+    {
+        .name = "SCENE_ID",
+        .t = HISYSEVENT_STRING,
+        .v = { .s = "" },
+        .arraySize = 0,
+    },
+    {
+        .name = "PROCESS_NAME",
+        .t = HISYSEVENT_STRING,
+        .v = { .s = "" },
+        .arraySize = 0,
+    },
+    {
+        .name = "MODULE_NAME",
+        .t = HISYSEVENT_STRING,
+        .v = { .s = "" },
+        .arraySize = 0,
+    },
+    {
+        .name = "ABILITY_NAME",
+        .t = HISYSEVENT_STRING,
+        .v = { .s = "" },
+        .arraySize = 0,
+    },
+    {
+        .name = "PAGE_URL",
+        .t = HISYSEVENT_STRING,
+        .v = { .s = "" },
+        .arraySize = 0,
+    },
+    {
+        .name = "UI_START_TIME",
+        .t = HISYSEVENT_UINT64,
+        .v = { .ui64 = 0 },
+        .arraySize = 0,
+    },
+    {
+        .name = "RS_START_TIME",
+        .t = HISYSEVENT_UINT64,
+        .v = { .ui64 = 0 },
+        .arraySize = 0,
+    },
+    {
+        .name = "DURATION",
+        .t = HISYSEVENT_UINT64,
+        .v = { .ui64 = 0 },
+        .arraySize = 0,
+    },
+    {
+        .name = "HITCH_TIME",
+        .t = HISYSEVENT_UINT64,
+        .v = { .ui64 = 0 },
+        .arraySize = 0,
+    },
+    {
+        .name = "HITCH_TIME_RATIO",
+        .t = HISYSEVENT_FLOAT,
+        .v = { .f = 0 },
+        .arraySize = 0,
+    },
+    {
+        .name = "IS_FOLD_DISP",
+        .t = HISYSEVENT_BOOL,
+        .v = { .b = false },
+        .arraySize = 0,
+    },
+    {
+        .name = "BUNDLE_NAME_EX",
+        .t = HISYSEVENT_STRING,
+        .v = { .s = "" },
+        .arraySize = 0,
+    },
+};
+static const size_t size_ = 12;
+
+int HiSysEventWrite(const char* name, uint64_t time) {
+    if (handle == NULL && HiSysEvent_Write == NULL) {
+        handle = dlopen("/system/lib64/chipset-pub-sdk/libhisysevent.z.so", RTLD_LAZY);
+        if (handle != NULL) {
+            HiSysEvent_Write = reinterpret_cast<HiSysEvent_Write_Def>(dlsym(handle, "HiSysEvent_Write"));
+            if (HiSysEvent_Write == NULL) {
+                FML_DLOG(ERROR) << "dlsym HiSysEvent_Write return NULL\n";
+                dlclose(handle);
+                handle = NULL;
+            }
+        } else {
+            FML_DLOG(ERROR) << "dlopen libhisysevent.z.so return NULL\n";
+        }
+    }
+
+    if (HiSysEvent_Write != NULL) {
+        params_[3].v.s = name;
+        params_[7].v.ui64 = time;
+        int ret = HiSysEvent_Write(__FUNCTION__, __LINE__, domain_, event_, type_, params_, size_);
+        return ret;
+    } else {
+        FML_DLOG(ERROR) << "HiSysEvent_Write is NULL\n";
+        return -1;
+    }
+}
+
+}  // namespace fml
diff --git a/fml/platform/ohos/hisysevent_c.h b/fml/platform/ohos/hisysevent_c.h
new file mode 100644
index 0000000000000000000000000000000000000000..7ef5a02609407b49a87510ef997be1060a192f28
--- /dev/null
+++ b/fml/platform/ohos/hisysevent_c.h
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef HISYSEVENT_INTERFACES_NATIVE_INNERKITS_HISYSEVENT_INCLUDE_HISYSEVENT_C_H
+#define HISYSEVENT_INTERFACES_NATIVE_INNERKITS_HISYSEVENT_INCLUDE_HISYSEVENT_C_H
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <dlfcn.h>
+#include <time.h>
+
+#include "flutter/fml/logging.h"
+
+#if !FLUTTER_RELEASE && defined(FML_OS_OHOS)
+#define HISYSEVENT_WRITE_SINGLE(name)  \
+    ::fml::HiSysEventWrite(name, 0);
+#define HISYSEVENT_WRITE_DURATION(name)   \
+    ::fml::HiSysEventTrace __FML__TOKEN_CAT__2(hisysevent, __LINE__)(name);
+
+#else
+#define HISYSEVENT_WRITE_SINGLE(name)
+#define HISYSEVENT_WRITE_DURATION(name)
+
+#endif
+
+namespace fml {
+
+#define MAX_LENGTH_OF_PARAM_NAME 49
+
+/**
+ * @brief Define the type of the param.
+ */
+enum HiSysEventParamType {
+    HISYSEVENT_INVALID = 0,
+    HISYSEVENT_BOOL = 1,
+    HISYSEVENT_INT8 = 2,
+    HISYSEVENT_UINT8 = 3,
+    HISYSEVENT_INT16 = 4,
+    HISYSEVENT_UINT16 = 5,
+    HISYSEVENT_INT32 = 6,
+    HISYSEVENT_UINT32 = 7,
+    HISYSEVENT_INT64 = 8,
+    HISYSEVENT_UINT64 = 9,
+    HISYSEVENT_FLOAT = 10,
+    HISYSEVENT_DOUBLE = 11,
+    HISYSEVENT_STRING = 12,
+    HISYSEVENT_BOOL_ARRAY = 13,
+    HISYSEVENT_INT8_ARRAY = 14,
+    HISYSEVENT_UINT8_ARRAY = 15,
+    HISYSEVENT_INT16_ARRAY = 16,
+    HISYSEVENT_UINT16_ARRAY = 17,
+    HISYSEVENT_INT32_ARRAY = 18,
+    HISYSEVENT_UINT32_ARRAY = 19,
+    HISYSEVENT_INT64_ARRAY = 20,
+    HISYSEVENT_UINT64_ARRAY = 21,
+    HISYSEVENT_FLOAT_ARRAY = 22,
+    HISYSEVENT_DOUBLE_ARRAY = 23,
+    HISYSEVENT_STRING_ARRAY = 24
+};
+typedef enum HiSysEventParamType HiSysEventParamType;
+
+/**
+ * @brief Define the value of the param.
+ */
+union HiSysEventParamValue {
+    bool b;
+    int8_t i8;
+    uint8_t ui8;
+    int16_t i16;
+    uint16_t ui16;
+    int32_t i32;
+    uint32_t ui32;
+    int64_t i64;
+    uint64_t ui64;
+    float f;
+    double d;
+    const char *s;
+    void *array;
+};
+typedef union HiSysEventParamValue HiSysEventParamValue;
+
+/**
+ * @brief Define param struct.
+ */
+struct HiSysEventParam {
+    char name[MAX_LENGTH_OF_PARAM_NAME];
+    HiSysEventParamType t;
+    HiSysEventParamValue v;
+    size_t arraySize;
+};
+typedef struct HiSysEventParam HiSysEventParam;
+
+/**
+ * @brief Event type.
+ */
+enum HiSysEventEventType {
+    HISYSEVENT_FAULT = 1,
+    HISYSEVENT_STATISTIC = 2,
+    HISYSEVENT_SECURITY = 3,
+    HISYSEVENT_BEHAVIOR = 4
+};
+typedef enum HiSysEventEventType HiSysEventEventType;
+
+/**
+ * @brief Write system event.
+ * @param domain event domain.
+ * @param name   event name.
+ * @param type   event type.
+ * @param params event params.
+ * @param size   the size of param list.
+ * @return 0 means success, less than 0 means failure, greater than 0 means invalid params.
+ */
+// #define OH_HiSysEvent_Write(domain, name, type, params, size) \
+//     HiSysEvent_Write(__FUNCTION__, __LINE__, domain, name, type, params, size)
+
+// int HiSysEvent_Write(const char* func, int64_t line, const char* domain, const char* name,
+//     HiSysEventEventType type, const HiSysEventParam params[], size_t size);
+
+typedef int (*HiSysEvent_Write_Def)(const char* func, int64_t line, const char* domain, const char* name,
+    HiSysEventEventType type, const HiSysEventParam params[], size_t size);
+
+int HiSysEventWrite(const char* name, uint64_t time);
+
+class HiSysEventTrace {
+private:
+    const char* name_;
+    struct timespec begin_time_;
+    struct timespec end_time_;
+
+public:
+    explicit HiSysEventTrace(const char* name) {
+        if (name != NULL) {
+            name_ = name;
+        } else {
+            name_ = "flutter default trace name";
+        }
+        clock_gettime(CLOCK_MONOTONIC, &begin_time_);
+    }
+    ~HiSysEventTrace() {
+        clock_gettime(CLOCK_MONOTONIC, &end_time_);
+        int ret = HiSysEventWrite(name_, (end_time_.tv_sec - begin_time_.tv_sec) * 1e6 +
+                                  (end_time_.tv_nsec - begin_time_.tv_nsec) / 1000); // us
+        FML_DLOG(INFO) << "HiSysEventWrite return " << ret;
+    }
+};
+
+}  // namespace fml
+
+#endif // HISYSEVENT_INTERFACES_NATIVE_INNERKITS_HISYSEVENT_INCLUDE_HISYSEVENT_C_H
diff --git a/fml/platform/ohos/message_loop_ohos.cc b/fml/platform/ohos/message_loop_ohos.cc
index ed2d44d2a6c898158846451935dd3fb6a491bc0d..5e528abe9991ce6d8d7a6b48d4ca7be19db9532a 100644
--- a/fml/platform/ohos/message_loop_ohos.cc
+++ b/fml/platform/ohos/message_loop_ohos.cc
@@ -14,14 +14,21 @@
  */
 
 #include "flutter/fml/platform/ohos/message_loop_ohos.h"
+#include <sys/epoll.h>
 #include "flutter/fml/eintr_wrapper.h"
 #include "flutter/fml/logging.h"
-#include "flutter/fml/platform/ohos/timerfd.h"
+#include "flutter/fml/platform/linux/timerfd.h"
 
 namespace fml {
 
 static constexpr int kClockType = CLOCK_MONOTONIC;
 
+void MessageLoopOhos::OnAsyncCallback(uv_async_t* handle) {
+  reinterpret_cast<MessageLoopOhos*>(handle->data)->OnEventFired();
+}
+
+void MessageLoopOhos::OnAsyncHandleClose(uv_handle_t* handle) {}
+
 void MessageLoopOhos::OnPollCallback(uv_poll_t* handle,
                                      int status,
                                      int events) {
@@ -36,38 +43,61 @@ void MessageLoopOhos::OnPollCallback(uv_poll_t* handle,
 }
 
 MessageLoopOhos::MessageLoopOhos(void* platform_loop)
-    : timer_fd_(::timerfd_create(kClockType, TFD_NONBLOCK | TFD_CLOEXEC)),
-      running_(false) {
+    : epoll_fd_(FML_HANDLE_EINTR(::epoll_create(1 /* unused */))),
+      timer_fd_(::timerfd_create(kClockType, TFD_NONBLOCK | TFD_CLOEXEC)),
+      running_(false),
+      isPlatformLoop(false) {
+  FML_CHECK(epoll_fd_.is_valid());
+  FML_CHECK(timer_fd_.is_valid());
+  bool added_source = AddOrRemoveTimerSource(true);
+  FML_CHECK(added_source);
+  async_handle_.data = this;
   if (platform_loop != nullptr) {
+    isPlatformLoop = true;
     uv_loop_t* loop = reinterpret_cast<uv_loop_t*>(platform_loop);
-    uv_poll_init(loop, &poll_handle_, timer_fd_.get());
+    uv_async_init(loop, &async_handle_,
+                  OnAsyncCallback);  // ohos after API12 not allow use uv_poll
+    timerhandleThread = std::thread([this]() {
+      running_ = true;
+      TimerFdWatcher();
+    });
   } else {
     uv_loop_init(&loop_);
     uv_poll_init(&loop_, &poll_handle_, timer_fd_.get());
+    poll_handle_.data = this;
+    uv_poll_start(&poll_handle_, UV_READABLE, OnPollCallback);
   }
-  poll_handle_.data = this;
-  uv_poll_start(&poll_handle_, UV_READABLE, OnPollCallback);
-  FML_CHECK(timer_fd_.is_valid());
 }
 
 MessageLoopOhos::~MessageLoopOhos() {
-  uv_poll_stop(&poll_handle_);
-  if (uv_loop_alive(&loop_)) {
-    uv_loop_close(&loop_);
+  if (isPlatformLoop) {
+    bool removed_source = AddOrRemoveTimerSource(false);
+    FML_CHECK(removed_source);
+  } else {
+    if (uv_loop_alive(&loop_)) {
+      uv_loop_close(&loop_);
+    }
   }
 }
 
 // |fml::MessageLoopImpl|
 void MessageLoopOhos::Run() {
-  running_ = true;
   uv_run(&loop_, UV_RUN_DEFAULT);
 }
 
 // |fml::MessageLoopImpl|
 void MessageLoopOhos::Terminate() {
   running_ = false;
-  // WakeUp(fml::TimePoint::Now());
-  uv_poll_stop(&poll_handle_);
+  WakeUp(fml::TimePoint::Now());
+  if (isPlatformLoop) {
+    if (timerhandleThread.joinable()) {
+      timerhandleThread.join();
+    }
+    uv_close((uv_handle_t*)&async_handle_, OnAsyncHandleClose);
+  } else {
+    uv_poll_stop(&poll_handle_);
+    uv_stop(&loop_);
+  }
 }
 
 // |fml::MessageLoopImpl|
@@ -83,4 +113,44 @@ void MessageLoopOhos::OnEventFired() {
   }
 }
 
+void MessageLoopOhos::TimerFdWatcher() {
+  while (running_) {
+    struct epoll_event event = {};
+
+    int epoll_result = FML_HANDLE_EINTR(
+        ::epoll_wait(epoll_fd_.get(), &event, 1, -1 /* timeout */));
+
+    // Errors are fatal.
+    if (event.events & (EPOLLERR | EPOLLHUP)) {
+      running_ = false;
+      continue;
+    }
+
+    // Timeouts are fatal since we specified an infinite timeout already.
+    // Likewise, > 1 is not possible since we waited for one result.
+    if (epoll_result != 1) {
+      running_ = false;
+      continue;
+    }
+
+    if (event.data.fd == timer_fd_.get()) {
+      uv_async_send(&async_handle_);
+    }
+  }
+}
+
+bool MessageLoopOhos::AddOrRemoveTimerSource(bool add) {
+  struct epoll_event event = {};
+
+  event.events = EPOLLIN;
+  // The data is just for informational purposes so we know when we were worken
+  // by the FD.
+  event.data.fd = timer_fd_.get();
+
+  int ctl_result =
+      ::epoll_ctl(epoll_fd_.get(), add ? EPOLL_CTL_ADD : EPOLL_CTL_DEL,
+                  timer_fd_.get(), &event);
+  return ctl_result == 0;
+}
+
 }  // namespace fml
diff --git a/fml/platform/ohos/message_loop_ohos.h b/fml/platform/ohos/message_loop_ohos.h
index 448a2bf67990d3e7974e4e9e2c10ace7010c7317..dcb826f62d8411d094cbaa73bd11ee1f6a589bd7 100644
--- a/fml/platform/ohos/message_loop_ohos.h
+++ b/fml/platform/ohos/message_loop_ohos.h
@@ -16,21 +16,25 @@
 #ifndef FLUTTER_FML_PLATFORM_OHOS_MESSAGE_LOOP_OHOS_H_
 #define FLUTTER_FML_PLATFORM_OHOS_MESSAGE_LOOP_OHOS_H_
 
-#include <atomic>
-
 #include <uv.h>
 #include "flutter/fml/macros.h"
 #include "flutter/fml/message_loop_impl.h"
 #include "flutter/fml/unique_fd.h"
+#include <thread>
+#include <atomic>
 
 namespace fml {
 
 class MessageLoopOhos : public MessageLoopImpl {
  private:
-  uv_poll_t poll_handle_;
+  uv_async_t async_handle_;
+	uv_poll_t poll_handle_;
   uv_loop_t loop_;
+	fml::UniqueFD epoll_fd_;
   fml::UniqueFD timer_fd_;
-  bool running_;
+  std::atomic<bool> running_;
+  std::thread timerhandleThread;
+	bool isPlatformLoop;
 
   MessageLoopOhos(void* platform_loop);
 
@@ -47,12 +51,18 @@ class MessageLoopOhos : public MessageLoopImpl {
 
   void OnEventFired();
 
+  void TimerFdWatcher();
+
+  bool AddOrRemoveTimerSource(bool add);
+
   FML_FRIEND_MAKE_REF_COUNTED(MessageLoopOhos);
   FML_FRIEND_REF_COUNTED_THREAD_SAFE(MessageLoopOhos);
   FML_DISALLOW_COPY_AND_ASSIGN(MessageLoopOhos);
 
  public:
-  static void OnPollCallback(uv_poll_t* handle, int status, int events);
+  static void OnAsyncCallback(uv_async_t* handle);
+  static void OnAsyncHandleClose(uv_handle_t* handle);
+	static void OnPollCallback(uv_poll_t* handle, int status, int events);
 };
 
 }  // namespace fml
diff --git a/fml/dart/dart_converter.cc b/fml/platform/posix/process_posix.cc
similarity index 70%
rename from fml/dart/dart_converter.cc
rename to fml/platform/posix/process_posix.cc
index 7e17bd8bb3c302bd0c40ec83cbec121ab8cd0677..38262ffb3536c7d39580ebca99c0bf4a07a46908 100644
--- a/fml/dart/dart_converter.cc
+++ b/fml/platform/posix/process_posix.cc
@@ -2,10 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/fml/dart/dart_converter.h"
+#include <unistd.h>
 
 namespace fml {
 
-//
+int GetCurrentProcId() {
+  return static_cast<int>(getpid());
+}
 
 }  // namespace fml
diff --git a/fml/platform/posix/shared_mutex_posix.h b/fml/platform/posix/shared_mutex_posix.h
index ff1a298f1a09dd4a851ea0a3b6ed0404597b1ff6..6694a33598d8e87073d18fda6338a4c57f01b8fc 100644
--- a/fml/platform/posix/shared_mutex_posix.h
+++ b/fml/platform/posix/shared_mutex_posix.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FML_SYNCHRONIZATION_SHARED_MUTEX_POSIX_H_
-#define FLUTTER_FML_SYNCHRONIZATION_SHARED_MUTEX_POSIX_H_
+#ifndef FLUTTER_FML_PLATFORM_POSIX_SHARED_MUTEX_POSIX_H_
+#define FLUTTER_FML_PLATFORM_POSIX_SHARED_MUTEX_POSIX_H_
 
 #include <shared_mutex>
 
@@ -27,4 +27,4 @@ class SharedMutexPosix : public SharedMutex {
 
 }  // namespace fml
 
-#endif  // FLUTTER_FML_SYNCHRONIZATION_SHARED_MUTEX_POSIX_H_
+#endif  // FLUTTER_FML_PLATFORM_POSIX_SHARED_MUTEX_POSIX_H_
diff --git a/fml/platform/win/file_win.cc b/fml/platform/win/file_win.cc
index 5034b214453725243f00f9d187ccb7abc3031325..674a343c8f1b172ea9e265278ac81f5b5a3a27b3 100644
--- a/fml/platform/win/file_win.cc
+++ b/fml/platform/win/file_win.cc
@@ -85,11 +85,11 @@ static DWORD GetDesiredAccessFlags(FilePermission permission) {
 static DWORD GetShareFlags(FilePermission permission) {
   switch (permission) {
     case FilePermission::kRead:
-      return FILE_SHARE_READ;
+      return FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE;
     case FilePermission::kWrite:
-      return FILE_SHARE_WRITE;
+      return 0;
     case FilePermission::kReadWrite:
-      return FILE_SHARE_READ | FILE_SHARE_WRITE;
+      return 0;
   }
   return FILE_SHARE_READ;
 }
diff --git a/fml/platform/win/file_win_unittests.cc b/fml/platform/win/file_win_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..f4240b918816aa2803337ba2171973d39c486c05
--- /dev/null
+++ b/fml/platform/win/file_win_unittests.cc
@@ -0,0 +1,32 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/fml/file.h"
+
+#include <Fileapi.h>
+
+#include "flutter/fml/platform/win/wstring_conversion.h"
+#include "gtest/gtest.h"
+
+namespace fml {
+namespace testing {
+
+TEST(FileWin, OpenDirectoryShare) {
+  fml::ScopedTemporaryDirectory temp_dir;
+  auto temp_path = Utf8ToWideString({temp_dir.path()});
+  fml::UniqueFD handle(
+      CreateFile(temp_path.c_str(), GENERIC_WRITE,
+                 FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr, OPEN_EXISTING,
+                 FILE_ATTRIBUTE_NORMAL | FILE_FLAG_BACKUP_SEMANTICS, nullptr));
+  ASSERT_TRUE(handle.is_valid());
+
+  // Check that fml::OpenDirectory(FilePermission::kRead) works with a
+  // directory that has also been opened for writing.
+  auto dir = fml::OpenDirectory(temp_dir.path().c_str(), false,
+                                fml::FilePermission::kRead);
+  ASSERT_TRUE(dir.is_valid());
+}
+
+}  // namespace testing
+}  // namespace fml
\ No newline at end of file
diff --git a/fml/platform/win/message_loop_win.h b/fml/platform/win/message_loop_win.h
index 233a90a4526b19fd778826753a5df1d367e8f393..2210bb1d85a735cce5a6c5e2eee9550efcad30e9 100644
--- a/fml/platform/win/message_loop_win.h
+++ b/fml/platform/win/message_loop_win.h
@@ -44,4 +44,4 @@ class MessageLoopWin : public MessageLoopImpl {
 
 }  // namespace fml
 
-#endif  // FLUTTER_FML_PLATFORM_GENERIC_MESSAGE_LOOP_GENERIC_H_
+#endif  // FLUTTER_FML_PLATFORM_WIN_MESSAGE_LOOP_WIN_H_
diff --git a/impeller/entity/shaders/blending/advanced_blend_color.frag b/fml/platform/win/process_win.cc
similarity index 55%
rename from impeller/entity/shaders/blending/advanced_blend_color.frag
rename to fml/platform/win/process_win.cc
index 225bd3f098122a1e0f8812b85b90381d737a3036..96749326a40f0014b49072dd0e0dec595b120e2d 100644
--- a/impeller/entity/shaders/blending/advanced_blend_color.frag
+++ b/fml/platform/win/process_win.cc
@@ -2,10 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <impeller/blending.glsl>
+#include <windows.h>
 
-vec3 Blend(vec3 dst, vec3 src) {
-  return IPBlendColor(dst, src);
+namespace fml {
+
+int GetCurrentProcId() {
+  return static_cast<int>(::GetCurrentProcessId());
 }
 
-#include "advanced_blend.glsl"
+}  // namespace fml
diff --git a/fml/platform/win/wstring_conversion.cc b/fml/platform/win/wstring_conversion.cc
index 6e4e36e8cf6297e23997267c63fa519c9accb706..ef87f60e89e6bf876c96e7a26f39d8665032137c 100644
--- a/fml/platform/win/wstring_conversion.cc
+++ b/fml/platform/win/wstring_conversion.cc
@@ -23,4 +23,16 @@ std::wstring Utf8ToWideString(const std::string_view str) {
   return converter.from_bytes(str.data());
 }
 
+std::u16string WideStringToUtf16(const std::wstring_view str) {
+  static_assert(sizeof(std::wstring::value_type) ==
+                sizeof(std::u16string::value_type));
+  return {begin(str), end(str)};
+}
+
+std::wstring Utf16ToWideString(const std::u16string_view str) {
+  static_assert(sizeof(std::wstring::value_type) ==
+                sizeof(std::u16string::value_type));
+  return {begin(str), end(str)};
+}
+
 }  // namespace fml
diff --git a/fml/platform/win/wstring_conversion.h b/fml/platform/win/wstring_conversion.h
index 4e7c110685491428f5a4bc00089f870650ee1577..cc5dbb680ae608d0f7335fafe195b0b15b0873df 100644
--- a/fml/platform/win/wstring_conversion.h
+++ b/fml/platform/win/wstring_conversion.h
@@ -16,6 +16,12 @@ std::string WideStringToUtf8(const std::wstring_view str);
 // string.
 std::wstring Utf8ToWideString(const std::string_view str);
 
+// Returns a UTF-16 encoded equivalent of a UTF-16 encoded wide string.
+std::u16string WideStringToUtf16(const std::wstring_view str);
+
+// Returns a UTF-16 encoded wide string equivalent of a UTF-16 string.
+std::wstring Utf16ToWideString(const std::u16string_view str);
+
 }  // namespace fml
 
 #endif  // FLUTTER_FML_PLATFORM_WIN_WSTRING_CONVERSION_H_
diff --git a/fml/platform/win/wstring_conversion_unittests.cc b/fml/platform/win/wstring_conversion_unittests.cc
index 81af2594ce94c1d7f2adbae53449c4f584afa88a..1f726720fc51120ec253fc38ff4e0c7d219af316 100644
--- a/fml/platform/win/wstring_conversion_unittests.cc
+++ b/fml/platform/win/wstring_conversion_unittests.cc
@@ -9,7 +9,7 @@
 namespace fml {
 namespace testing {
 
-TEST(StringConversion, Utf16ToWideStringEmpty) {
+TEST(StringConversion, Utf8ToWideStringEmpty) {
   EXPECT_EQ(Utf8ToWideString(""), L"");
 }
 
@@ -33,5 +33,29 @@ TEST(StringConversion, WideStringToUtf8Unicode) {
   EXPECT_EQ(WideStringToUtf8(L"\x2603"), "\xe2\x98\x83");
 }
 
+TEST(StringConversion, WideStringToUtf16Empty) {
+  EXPECT_EQ(WideStringToUtf16(L""), u"");
+}
+
+TEST(StringConversion, WideStringToUtf16Ascii) {
+  EXPECT_EQ(WideStringToUtf16(L"abc123"), u"abc123");
+}
+
+TEST(StringConversion, WideStringToUtf16Unicode) {
+  EXPECT_EQ(WideStringToUtf16(L"\xe2\x98\x83"), u"\xe2\x98\x83");
+}
+
+TEST(StringConversion, Utf16ToWideStringEmpty) {
+  EXPECT_EQ(Utf16ToWideString(u""), L"");
+}
+
+TEST(StringConversion, Utf16ToWideStringAscii) {
+  EXPECT_EQ(Utf16ToWideString(u"abc123"), L"abc123");
+}
+
+TEST(StringConversion, Utf16ToWideStringUtf8Unicode) {
+  EXPECT_EQ(Utf16ToWideString(u"\xe2\x98\x83"), L"\xe2\x98\x83");
+}
+
 }  // namespace testing
 }  // namespace fml
diff --git a/fml/process.h b/fml/process.h
new file mode 100644
index 0000000000000000000000000000000000000000..2ca6ebb48e1c045c6c20317b0286cb5197dfd270
--- /dev/null
+++ b/fml/process.h
@@ -0,0 +1,14 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_FML_PROCESS_H_
+#define FLUTTER_FML_PROCESS_H_
+
+namespace fml {
+
+int GetCurrentProcId();
+
+}  // namespace fml
+
+#endif  // FLUTTER_FML_PROCESS_H_
diff --git a/fml/raster_thread_merger.h b/fml/raster_thread_merger.h
index 3ad4a4e27da0c3a6a2daf7561bd434c4ffe82964..56d60407f24dbcc696801eb36b15b16ee382d215 100644
--- a/fml/raster_thread_merger.h
+++ b/fml/raster_thread_merger.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FML_SHELL_COMMON_TASK_RUNNER_MERGER_H_
-#define FML_SHELL_COMMON_TASK_RUNNER_MERGER_H_
+#ifndef FLUTTER_FML_RASTER_THREAD_MERGER_H_
+#define FLUTTER_FML_RASTER_THREAD_MERGER_H_
 
 #include <condition_variable>
 #include <mutex>
@@ -53,10 +53,10 @@ class RasterThreadMerger
       TaskQueueId platform_id,
       TaskQueueId raster_id);
 
-  // Un-merges the threads now if current caller is the last merge caller,
-  // and it resets the lease term to 0, otherwise it will remove the caller
-  // record and return. The multiple caller records were recorded after
-  // |MergeWithLease| or |ExtendLeaseTo| method.
+  // Un-merges the threads now if current caller is the last merged caller,
+  // and it resets the lease term to 0, otherwise it will remove
+  // the caller record and return. The multiple caller records were recorded
+  // after |MergeWithLease| or |ExtendLeaseTo| method.
   //
   // Must be executed on the raster task runner.
   //
@@ -143,4 +143,4 @@ class RasterThreadMerger
 
 }  // namespace fml
 
-#endif  // FML_SHELL_COMMON_TASK_RUNNER_MERGER_H_
+#endif  // FLUTTER_FML_RASTER_THREAD_MERGER_H_
diff --git a/fml/raster_thread_merger_unittests.cc b/fml/raster_thread_merger_unittests.cc
index 43beb63947e1fa8ea70b9858e805c4f2f4f13c49..b4b9621d23196286872efd0630c2da97151dc96f 100644
--- a/fml/raster_thread_merger_unittests.cc
+++ b/fml/raster_thread_merger_unittests.cc
@@ -594,6 +594,42 @@ TEST(RasterThreadMerger, TheLastCallerOfMultipleMergersCanUnmergeNow) {
   ASSERT_FALSE(raster_thread_merger2->IsMerged());
 }
 
+TEST(RasterThreadMerger, TheLastMergedCallerOfMultipleMergersCanUnmergeNow) {
+  TaskQueueWrapper queue1;
+  TaskQueueWrapper queue2;
+  fml::TaskQueueId qid1 = queue1.GetTaskQueueId();
+  fml::TaskQueueId qid2 = queue2.GetTaskQueueId();
+  // Two mergers will share one same inner merger
+  const auto raster_thread_merger1 =
+      fml::RasterThreadMerger::CreateOrShareThreadMerger(nullptr, qid1, qid2);
+
+  const size_t kNumFramesMerged = 1;
+  ASSERT_FALSE(raster_thread_merger1->IsMerged());
+
+  // Merge using the mergers
+  raster_thread_merger1->MergeWithLease(kNumFramesMerged);
+  ASSERT_TRUE(raster_thread_merger1->IsMerged());
+
+  for (size_t i = 0; i < kNumFramesMerged; i++) {
+    // Un-merge thread merger 1.
+    raster_thread_merger1->DecrementLease();
+  }
+  ASSERT_FALSE(raster_thread_merger1->IsMerged());
+
+  const auto raster_thread_merger2 =
+      fml::RasterThreadMerger::CreateOrShareThreadMerger(raster_thread_merger1,
+                                                         qid1, qid2);
+  ASSERT_FALSE(raster_thread_merger2->IsMerged());
+  raster_thread_merger2->MergeWithLease(kNumFramesMerged);
+  ASSERT_TRUE(raster_thread_merger2->IsMerged());
+
+  // One caller state becomes no callers left.
+  raster_thread_merger2->UnMergeNowIfLastOne();
+  // Check if unmerged
+  ASSERT_FALSE(raster_thread_merger1->IsMerged());
+  ASSERT_FALSE(raster_thread_merger2->IsMerged());
+}
+
 /// This case tests multiple standalone engines using independent merger to
 /// merge two different raster threads into the same platform thread.
 TEST(RasterThreadMerger,
diff --git a/fml/shared_thread_merger.cc b/fml/shared_thread_merger.cc
index 15fac3e2fa0c2fb3c6acd1205c05290a7155e583..0b56b229d48344db1c34d8604eefb36813a0131b 100644
--- a/fml/shared_thread_merger.cc
+++ b/fml/shared_thread_merger.cc
@@ -44,10 +44,10 @@ bool SharedThreadMerger::UnMergeNowUnSafe() {
 bool SharedThreadMerger::UnMergeNowIfLastOne(RasterThreadMergerId caller) {
   std::scoped_lock lock(mutex_);
   lease_term_by_caller_.erase(caller);
-  if (!lease_term_by_caller_.empty()) {
-    return true;
+  if (lease_term_by_caller_.empty() || IsAllLeaseTermsZeroUnSafe()) {
+    return UnMergeNowUnSafe();
   }
-  return UnMergeNowUnSafe();
+  return true;
 }
 
 bool SharedThreadMerger::DecrementLease(RasterThreadMergerId caller) {
diff --git a/fml/shared_thread_merger.h b/fml/shared_thread_merger.h
index 3f8ae9a6367f8cedb6d2c6951081c1e19db743f4..ed361edb7f062fe6ee30ea28f1b7e10f1765adf9 100644
--- a/fml/shared_thread_merger.h
+++ b/fml/shared_thread_merger.h
@@ -59,7 +59,7 @@ class SharedThreadMerger
   fml::TaskQueueId subsumed_;
   fml::MessageLoopTaskQueues* task_queues_;
   std::mutex mutex_;
-  bool enabled_;
+  bool enabled_ = false;
 
   /// The |MergeWithLease| or |ExtendLeaseTo| method will record the caller
   /// into this lease_term_by_caller_ map, |UnMergeNowIfLastOne|
diff --git a/fml/status.h b/fml/status.h
index 8eed10823f144b479ea2ffe0746560a19eae6727..c47352826185e9ce14d42a883bd2ddd1053fb4db 100644
--- a/fml/status.h
+++ b/fml/status.h
@@ -78,4 +78,4 @@ inline std::string_view Status::message() const {
 
 }  // namespace fml
 
-#endif  // FLUTTER_FML_SIZE_H_
+#endif  // FLUTTER_FML_STATUS_H_
diff --git a/fml/status_or.h b/fml/status_or.h
new file mode 100644
index 0000000000000000000000000000000000000000..4a51b1595343c07f999850a1d5dca4418819a33b
--- /dev/null
+++ b/fml/status_or.h
@@ -0,0 +1,100 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_FML_STATUS_OR_H_
+#define FLUTTER_FML_STATUS_OR_H_
+
+#include <optional>
+
+#include "flutter/fml/logging.h"
+#include "flutter/fml/status.h"
+
+namespace fml {
+
+// TODO(https://github.com/flutter/flutter/issues/134741): Replace with
+// absl::StatusOr.
+/// Represents a union type of an object of type `T` and an fml::Status.
+///
+/// This is often used as a replacement for C++ exceptions where a function that
+/// could fail may return an error or a result. These are typically used for
+/// errors that are meant to be recovered from. If there is no recovery
+/// available `FML_CHECK` is more appropriate.
+///
+/// Example:
+/// StatusOr<int> div(int n, int d) {
+///   if (d == 0) {
+///     return Status(StatusCode::kFailedPrecondition, "div by zero");
+///   }
+///   return n / d;
+/// }
+template <typename T>
+class StatusOr {
+ public:
+  // These constructors are intended be compatible with absl::status_or.
+  // NOLINTNEXTLINE(google-explicit-constructor)
+  StatusOr(const T& value) : status_(), value_(value) {}
+
+  // These constructors are intended be compatible with absl::status_or.
+  // NOLINTNEXTLINE(google-explicit-constructor)
+  StatusOr(const Status& status) : status_(status), value_() {
+    // It's not valid to construct a StatusOr with an OK status and no value.
+    FML_CHECK(!status_.ok());
+  }
+
+  StatusOr(const StatusOr&) = default;
+  StatusOr(StatusOr&&) = default;
+
+  StatusOr& operator=(const StatusOr&) = default;
+  StatusOr& operator=(StatusOr&&) = default;
+
+  StatusOr& operator=(const T& value) {
+    status_ = Status();
+    value_ = value;
+    return *this;
+  }
+
+  StatusOr& operator=(const T&& value) {
+    status_ = Status();
+    value_ = std::move(value);
+    return *this;
+  }
+
+  StatusOr& operator=(const Status& value) {
+    status_ = value;
+    value_ = std::nullopt;
+    return *this;
+  }
+
+  const Status& status() const { return status_; }
+
+  bool ok() const { return status_.ok(); }
+
+  const T& value() const {
+    if (value_.has_value()) {
+      FML_DCHECK(status_.ok());
+      return value_.value();
+    }
+    FML_LOG(FATAL) << "StatusOr::value() called on error Status";
+    FML_UNREACHABLE();
+    return value_.value();
+  }
+
+  T& value() {
+    if (value_.has_value()) {
+      FML_DCHECK(status_.ok());
+      return value_.value();
+    }
+    FML_LOG(FATAL) << "StatusOr::value() called on error Status";
+    FML_UNREACHABLE();
+    return value_.value();
+  }
+
+ private:
+  Status status_;
+  std::optional<T> value_;
+};
+
+}  // namespace fml
+
+#endif  // FLUTTER_FML_STATUS_OR_H_
diff --git a/fml/synchronization/semaphore.cc b/fml/synchronization/semaphore.cc
index 8ffaab76cac298d0c09dcd4d809de8a62bc0dd52..9746c19f21f97ec11dd01973cf5788eb5aa85fbe 100644
--- a/fml/synchronization/semaphore.cc
+++ b/fml/synchronization/semaphore.cc
@@ -170,24 +170,24 @@ class PlatformSemaphore {
 
 namespace fml {
 
-Semaphore::Semaphore(uint32_t count) : _impl(new PlatformSemaphore(count)) {}
+Semaphore::Semaphore(uint32_t count) : impl_(new PlatformSemaphore(count)) {}
 
 Semaphore::~Semaphore() = default;
 
 bool Semaphore::IsValid() const {
-  return _impl->IsValid();
+  return impl_->IsValid();
 }
 
 bool Semaphore::Wait() {
-  return _impl->Wait();
+  return impl_->Wait();
 }
 
 bool Semaphore::TryWait() {
-  return _impl->TryWait();
+  return impl_->TryWait();
 }
 
 void Semaphore::Signal() {
-  return _impl->Signal();
+  return impl_->Signal();
 }
 
 }  // namespace fml
diff --git a/fml/synchronization/semaphore.h b/fml/synchronization/semaphore.h
index b88be468ee27c7f9d515166d04ee583972ebe423..1207f59a6f3d22571ddb78387f6c68dfd155d8ae 100644
--- a/fml/synchronization/semaphore.h
+++ b/fml/synchronization/semaphore.h
@@ -67,7 +67,7 @@ class Semaphore {
   ///             Which makes doing the validity check before this call doubly
   ///             important.
   ///
-  /// @return     If the count could be decrement.
+  /// @return     If the count could be decremented.
   ///
   [[nodiscard]] bool TryWait();
 
@@ -78,7 +78,7 @@ class Semaphore {
   void Signal();
 
  private:
-  std::unique_ptr<PlatformSemaphore> _impl;
+  std::unique_ptr<PlatformSemaphore> impl_;
 
   FML_DISALLOW_COPY_AND_ASSIGN(Semaphore);
 };
diff --git a/fml/synchronization/sync_switch.cc b/fml/synchronization/sync_switch.cc
index ac951062267f8390004347e6f7780c92fc3f8879..7340086af95b367d7ce2be22913d29e680b21ef3 100644
--- a/fml/synchronization/sync_switch.cc
+++ b/fml/synchronization/sync_switch.cc
@@ -32,8 +32,26 @@ void SyncSwitch::Execute(const SyncSwitch::Handlers& handlers) const {
 }
 
 void SyncSwitch::SetSwitch(bool value) {
+  {
+    fml::UniqueLock lock(*mutex_);
+    value_ = value;
+  }
+  for (Observer* observer : observers_) {
+    observer->OnSyncSwitchUpdate(value);
+  }
+}
+
+void SyncSwitch::AddObserver(Observer* observer) const {
   fml::UniqueLock lock(*mutex_);
-  value_ = value;
+  if (std::find(observers_.begin(), observers_.end(), observer) ==
+      observers_.end()) {
+    observers_.push_back(observer);
+  }
 }
 
+void SyncSwitch::RemoveObserver(Observer* observer) const {
+  fml::UniqueLock lock(*mutex_);
+  observers_.erase(std::remove(observers_.begin(), observers_.end(), observer),
+                   observers_.end());
+}
 }  // namespace fml
diff --git a/fml/synchronization/sync_switch.h b/fml/synchronization/sync_switch.h
index 470072fe4f25d8003d1f61df217f0eb82ae8fcd1..d9b0807afd9c3d5e03904a82768ba6bd82a69480 100644
--- a/fml/synchronization/sync_switch.h
+++ b/fml/synchronization/sync_switch.h
@@ -5,9 +5,9 @@
 #ifndef FLUTTER_FML_SYNCHRONIZATION_SYNC_SWITCH_H_
 #define FLUTTER_FML_SYNCHRONIZATION_SYNC_SWITCH_H_
 
-#include <forward_list>
 #include <functional>
 #include <memory>
+#include <vector>
 
 #include "flutter/fml/macros.h"
 #include "flutter/fml/synchronization/shared_mutex.h"
@@ -21,6 +21,16 @@ namespace fml {
 /// at a time.
 class SyncSwitch {
  public:
+  /// Observes changes to the SyncSwitch.
+  class Observer {
+   public:
+    virtual ~Observer() = default;
+    /// `new_is_disabled` not guaranteed to be the value of the SyncSwitch
+    /// during execution, it should be checked with calls to
+    /// SyncSwitch::Execute.
+    virtual void OnSyncSwitchUpdate(bool new_is_disabled) = 0;
+  };
+
   /// Represents the 2 code paths available when calling |SyncSwitch::Execute|.
   struct Handlers {
     /// Sets the handler that will be executed if the |SyncSwitch| is true.
@@ -53,8 +63,15 @@ class SyncSwitch {
   /// @param[in]  value  New value for the |SyncSwitch|.
   void SetSwitch(bool value);
 
+  /// Threadsafe.
+  void AddObserver(Observer* observer) const;
+
+  /// Threadsafe.
+  void RemoveObserver(Observer* observer) const;
+
  private:
   mutable std::unique_ptr<fml::SharedMutex> mutex_;
+  mutable std::vector<Observer*> observers_;
   bool value_;
 
   FML_DISALLOW_COPY_AND_ASSIGN(SyncSwitch);
diff --git a/fml/task_source.cc b/fml/task_source.cc
index e62e1952e65a583fd9123a5f81f230f918704ddb..ced398a0015fce0099b8f3711a80c234fe212baa 100644
--- a/fml/task_source.cc
+++ b/fml/task_source.cc
@@ -28,7 +28,7 @@ void TaskSource::RegisterTask(const DelayedTask& task) {
     case TaskSourceGrade::kUnspecified:
       primary_task_queue_.push(task);
       break;
-    case TaskSourceGrade::kDartMicroTasks:
+    case TaskSourceGrade::kDartEventLoop:
       secondary_task_queue_.push(task);
       break;
   }
@@ -42,7 +42,7 @@ void TaskSource::PopTask(TaskSourceGrade grade) {
     case TaskSourceGrade::kUnspecified:
       primary_task_queue_.pop();
       break;
-    case TaskSourceGrade::kDartMicroTasks:
+    case TaskSourceGrade::kDartEventLoop:
       secondary_task_queue_.pop();
       break;
   }
diff --git a/fml/task_source_grade.h b/fml/task_source_grade.h
index d7447f511f1e56a40c34c3c3bc7913d52049cd6b..c292c34131b3ba7aa4af56d475ebd3fae5f02397 100644
--- a/fml/task_source_grade.h
+++ b/fml/task_source_grade.h
@@ -17,8 +17,8 @@ enum class TaskSourceGrade {
   /// interaction.
   kUserInteraction,
   /// This `TaskSourceGrade` indicates that a task corresponds to servicing a
-  /// dart micro task. These aren't critical to user interaction.
-  kDartMicroTasks,
+  /// dart event loop task. These aren't critical to user interaction.
+  kDartEventLoop,
   /// The absence of a specialized `TaskSourceGrade`.
   kUnspecified,
 };
diff --git a/fml/task_source_unittests.cc b/fml/task_source_unittests.cc
index 09e37be2854e18ffad186e3c15d2355883cdd41a..ed45bba4d4644911f9238ffb6f787704c985739f 100644
--- a/fml/task_source_unittests.cc
+++ b/fml/task_source_unittests.cc
@@ -29,7 +29,7 @@ TEST(TaskSourceTests, MultipleTaskGrades) {
   task_source.RegisterTask(
       {2, [] {}, ChronoTicksSinceEpoch(), TaskSourceGrade::kUserInteraction});
   task_source.RegisterTask(
-      {3, [] {}, ChronoTicksSinceEpoch(), TaskSourceGrade::kDartMicroTasks});
+      {3, [] {}, ChronoTicksSinceEpoch(), TaskSourceGrade::kDartEventLoop});
   ASSERT_EQ(task_source.GetNumPendingTasks(), 3u);
 }
 
@@ -55,7 +55,7 @@ TEST(TaskSourceTests, SimpleOrderingMultiTaskHeaps) {
   auto time_stamp = ChronoTicksSinceEpoch();
   int value = 0;
   task_source.RegisterTask(
-      {1, [&] { value = 1; }, time_stamp, TaskSourceGrade::kDartMicroTasks});
+      {1, [&] { value = 1; }, time_stamp, TaskSourceGrade::kDartEventLoop});
   task_source.RegisterTask({2, [&] { value = 7; },
                             time_stamp + fml::TimeDelta::FromMilliseconds(1),
                             TaskSourceGrade::kUserInteraction});
@@ -75,7 +75,7 @@ TEST(TaskSourceTests, OrderingMultiTaskHeapsSecondaryPaused) {
   auto time_stamp = ChronoTicksSinceEpoch();
   int value = 0;
   task_source.RegisterTask(
-      {1, [&] { value = 1; }, time_stamp, TaskSourceGrade::kDartMicroTasks});
+      {1, [&] { value = 1; }, time_stamp, TaskSourceGrade::kDartEventLoop});
   task_source.RegisterTask({2, [&] { value = 7; },
                             time_stamp + fml::TimeDelta::FromMilliseconds(1),
                             TaskSourceGrade::kUserInteraction});
diff --git a/fml/thread.cc b/fml/thread.cc
index e74e8ab5b41f88bb2f1d2658f6bcc60e0698ac33..6d48b0d035dff836233fffb38854b9224936f4bd 100644
--- a/fml/thread.cc
+++ b/fml/thread.cc
@@ -25,6 +25,71 @@
 
 namespace fml {
 
+typedef std::function<void()> ThreadFunction;
+
+class ThreadHandle {
+ public:
+  explicit ThreadHandle(ThreadFunction&& function);
+  ~ThreadHandle();
+
+  void Join();
+
+ private:
+#if defined(FML_OS_WIN)
+  HANDLE thread_;
+#else
+  pthread_t thread_;
+#endif
+};
+
+#if defined(FML_OS_WIN)
+ThreadHandle::ThreadHandle(ThreadFunction&& function) {
+  thread_ = (HANDLE*)_beginthreadex(
+      nullptr, Thread::GetDefaultStackSize(),
+      [](void* arg) -> unsigned {
+        std::unique_ptr<ThreadFunction> function(
+            reinterpret_cast<ThreadFunction*>(arg));
+        (*function)();
+        return 0;
+      },
+      new ThreadFunction(std::move(function)), 0, nullptr);
+  FML_CHECK(thread_ != nullptr);
+}
+
+void ThreadHandle::Join() {
+  WaitForSingleObjectEx(thread_, INFINITE, FALSE);
+}
+
+ThreadHandle::~ThreadHandle() {
+  CloseHandle(thread_);
+}
+#else
+ThreadHandle::ThreadHandle(ThreadFunction&& function) {
+  pthread_attr_t attr;
+  pthread_attr_init(&attr);
+  int result = pthread_attr_setstacksize(&attr, Thread::GetDefaultStackSize());
+  FML_CHECK(result == 0);
+  result = pthread_create(
+      &thread_, &attr,
+      [](void* arg) -> void* {
+        std::unique_ptr<ThreadFunction> function(
+            reinterpret_cast<ThreadFunction*>(arg));
+        (*function)();
+        return nullptr;
+      },
+      new ThreadFunction(std::move(function)));
+  FML_CHECK(result == 0);
+  result = pthread_attr_destroy(&attr);
+  FML_CHECK(result == 0);
+}
+
+void ThreadHandle::Join() {
+  pthread_join(thread_, nullptr);
+}
+
+ThreadHandle::~ThreadHandle() {}
+#endif
+
 #if defined(FML_OS_WIN)
 // The information on how to set the thread name comes from
 // a MSDN article: http://msdn2.microsoft.com/en-us/library/xcb2z8hs.aspx
@@ -44,7 +109,11 @@ void SetThreadName(const std::string& name) {
 #if defined(FML_OS_MACOSX)
   pthread_setname_np(name.c_str());
 #elif defined(FML_OS_LINUX) || defined(FML_OS_ANDROID) || defined(FML_OS_OHOS)
-  pthread_setname_np(pthread_self(), name.c_str());
+  // Linux thread names are limited to 16 characters including the terminating
+  // null.
+  constexpr std::string::size_type kLinuxMaxThreadNameLen = 15;
+  pthread_setname_np(pthread_self(),
+                     name.substr(0, kLinuxMaxThreadNameLen).c_str());
   FML_DLOG(INFO) << "set the thread name to '" << name;
 #elif defined(FML_OS_WIN)
   THREADNAME_INFO info;
@@ -77,7 +146,7 @@ Thread::Thread(const ThreadConfigSetter& setter, const ThreadConfig& config)
   fml::AutoResetWaitableEvent latch;
   fml::RefPtr<fml::TaskRunner> runner;
 
-  thread_ = std::make_unique<std::thread>(
+  thread_ = std::make_unique<ThreadHandle>(
       [&latch, &runner, setter, config]() -> void {
         setter(config);
         fml::MessageLoop::EnsureInitializedForCurrentThread();
@@ -104,7 +173,11 @@ void Thread::Join() {
   }
   joined_ = true;
   task_runner_->PostTask([]() { MessageLoop::GetCurrent().Terminate(); });
-  thread_->join();
+  thread_->Join();
+}
+
+size_t Thread::GetDefaultStackSize() {
+  return 1024 * 1024 * 2;
 }
 
 }  // namespace fml
diff --git a/fml/thread.h b/fml/thread.h
index 0b176c2ff5d6f93b8669012c7f1f55990f1349ef..b7d09d182ba434174c4f18143403532de5c23e06 100644
--- a/fml/thread.h
+++ b/fml/thread.h
@@ -9,25 +9,26 @@
 #include <functional>
 #include <memory>
 #include <string>
-#include <thread>
 
 #include "flutter/fml/macros.h"
 #include "flutter/fml/task_runner.h"
 
 namespace fml {
 
+class ThreadHandle;
+
 class Thread {
  public:
   /// Valid values for priority of Thread.
   enum class ThreadPriority : int {
     /// Suitable for threads that shouldn't disrupt high priority work.
-    BACKGROUND,
+    kBackground,
     /// Default priority level.
-    NORMAL,
+    kNormal,
     /// Suitable for threads which generate data for the display.
-    DISPLAY,
+    kDisplay,
     /// Suitable for thread which raster data.
-    RASTER,
+    kRaster,
   };
 
   /// The ThreadConfig is the thread info include thread name, thread priority.
@@ -36,9 +37,9 @@ class Thread {
         : name(name), priority(priority) {}
 
     explicit ThreadConfig(const std::string& name)
-        : ThreadConfig(name, ThreadPriority::NORMAL) {}
+        : ThreadConfig(name, ThreadPriority::kNormal) {}
 
-    ThreadConfig() : ThreadConfig("", ThreadPriority::NORMAL) {}
+    ThreadConfig() : ThreadConfig("", ThreadPriority::kNormal) {}
 
     std::string name;
     ThreadPriority priority;
@@ -59,8 +60,10 @@ class Thread {
 
   static void SetCurrentThreadName(const ThreadConfig& config);
 
+  static size_t GetDefaultStackSize();
+
  private:
-  std::unique_ptr<std::thread> thread_;
+  std::unique_ptr<ThreadHandle> thread_;
 
   fml::RefPtr<fml::TaskRunner> task_runner_;
 
diff --git a/fml/thread_local.cc b/fml/thread_local.cc
deleted file mode 100644
index 862a34331d2f93d74067d336357fe3d33aed0c5c..0000000000000000000000000000000000000000
--- a/fml/thread_local.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "flutter/fml/thread_local.h"
-
-#if FML_THREAD_LOCAL_PTHREADS
-
-#include <cstring>
-
-#include "flutter/fml/logging.h"
-
-namespace fml {
-namespace internal {
-
-ThreadLocalPointer::ThreadLocalPointer(void (*destroy)(void*)) {
-  FML_CHECK(pthread_key_create(&key_, destroy) == 0);
-}
-
-ThreadLocalPointer::~ThreadLocalPointer() {
-  FML_CHECK(pthread_key_delete(key_) == 0);
-}
-
-void* ThreadLocalPointer::get() const {
-  return pthread_getspecific(key_);
-}
-
-void* ThreadLocalPointer::swap(void* ptr) {
-  void* old_ptr = get();
-  int err = pthread_setspecific(key_, ptr);
-  if (err) {
-    FML_CHECK(false) << "pthread_setspecific failed (" << err
-                     << "): " << strerror(err);
-  }
-  return old_ptr;
-}
-
-}  // namespace internal
-}  // namespace fml
-
-#endif  // FML_THREAD_LOCAL_PTHREADS
diff --git a/fml/thread_local.h b/fml/thread_local.h
deleted file mode 100644
index a5f3ba08e2d31ca357ee76e21979bca092cdc723..0000000000000000000000000000000000000000
--- a/fml/thread_local.h
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_FML_THREAD_LOCAL_H_
-#define FLUTTER_FML_THREAD_LOCAL_H_
-
-#include <memory>
-
-#include "flutter/fml/build_config.h"
-#include "flutter/fml/macros.h"
-
-#define FML_THREAD_LOCAL_PTHREADS \
-  FML_OS_MACOSX || FML_OS_LINUX || FML_OS_ANDROID || FML_OS_OHOS 
-
-#if FML_THREAD_LOCAL_PTHREADS
-#include <pthread.h>
-#endif
-
-namespace fml {
-
-#if FML_THREAD_LOCAL_PTHREADS
-
-#define FML_THREAD_LOCAL static
-
-namespace internal {
-
-class ThreadLocalPointer {
- public:
-  explicit ThreadLocalPointer(void (*destroy)(void*));
-  ~ThreadLocalPointer();
-
-  void* get() const;
-  void* swap(void* ptr);
-
- private:
-  pthread_key_t key_;
-
-  FML_DISALLOW_COPY_AND_ASSIGN(ThreadLocalPointer);
-};
-
-}  // namespace internal
-
-template <typename T>
-class ThreadLocalUniquePtr {
- public:
-  ThreadLocalUniquePtr() : ptr_(destroy) {}
-
-  T* get() const { return reinterpret_cast<T*>(ptr_.get()); }
-  void reset(T* ptr) { destroy(ptr_.swap(ptr)); }
-
- private:
-  static void destroy(void* ptr) { delete reinterpret_cast<T*>(ptr); }
-
-  internal::ThreadLocalPointer ptr_;
-
-  FML_DISALLOW_COPY_AND_ASSIGN(ThreadLocalUniquePtr);
-};
-
-#else  // FML_THREAD_LOCAL_PTHREADS
-
-#define FML_THREAD_LOCAL static thread_local
-
-template <typename T>
-class ThreadLocalUniquePtr {
- public:
-  ThreadLocalUniquePtr() = default;
-
-  T* get() const { return ptr_.get(); }
-  void reset(T* ptr) { ptr_.reset(ptr); }
-
- private:
-  std::unique_ptr<T> ptr_;
-
-  FML_DISALLOW_COPY_AND_ASSIGN(ThreadLocalUniquePtr);
-};
-
-#endif  // FML_THREAD_LOCAL_PTHREADS
-
-#ifndef FML_THREAD_LOCAL
-
-#error Thread local storage unavailable on the platform.
-
-#endif  // FML_THREAD_LOCAL
-
-}  // namespace fml
-
-#endif  // FLUTTER_FML_THREAD_LOCAL_H_
diff --git a/fml/thread_local_unittests.cc b/fml/thread_local_unittests.cc
deleted file mode 100644
index 88e2bda1db6ce5d3c8ef0650b238b02e181eb1bc..0000000000000000000000000000000000000000
--- a/fml/thread_local_unittests.cc
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <atomic>
-#include <thread>
-
-#include "flutter/fml/macros.h"
-#include "flutter/fml/thread_local.h"
-#include "gtest/gtest.h"
-
-namespace {
-
-class Box {
- public:
-  explicit Box(int value, std::atomic_int* destroys = nullptr)
-      : value_(value), destroys_(destroys) {}
-  ~Box() {
-    if (destroys_) {
-      ++*destroys_;
-    }
-  }
-
-  int value() const { return value_; }
-
- private:
-  int value_;
-  std::atomic_int* destroys_;
-
-  FML_DISALLOW_COPY_AND_ASSIGN(Box);
-};
-
-FML_THREAD_LOCAL fml::ThreadLocalUniquePtr<Box> local;
-
-}  // namespace
-
-TEST(ThreadLocal, SimpleInitialization) {
-  std::thread thread([&] {
-    ASSERT_EQ(local.get(), nullptr);
-    auto value = 100;
-    local.reset(new Box(value));
-    ASSERT_EQ(local.get()->value(), value);
-  });
-  thread.join();
-}
-
-TEST(ThreadLocal, SimpleInitializationCheckInAnother) {
-  std::thread thread([&] {
-    ASSERT_EQ(local.get(), nullptr);
-    auto value = 100;
-    local.reset(new Box(value));
-    ASSERT_EQ(local.get()->value(), value);
-    std::thread thread2([&]() { ASSERT_EQ(local.get(), nullptr); });
-    thread2.join();
-  });
-  thread.join();
-}
-
-TEST(ThreadLocal, DestroyCallback) {
-  std::atomic_int destroys{0};
-  std::thread thread([&] {
-    ASSERT_EQ(local.get(), nullptr);
-    auto value = 100;
-    local.reset(new Box(value, &destroys));
-    ASSERT_EQ(local.get()->value(), value);
-    ASSERT_EQ(destroys.load(), 0);
-  });
-  thread.join();
-  ASSERT_EQ(destroys.load(), 1);
-}
-
-TEST(ThreadLocal, DestroyCallback2) {
-  std::atomic_int destroys{0};
-  std::thread thread([&] {
-    local.reset(new Box(100, &destroys));
-    ASSERT_EQ(local.get()->value(), 100);
-    ASSERT_EQ(destroys.load(), 0);
-    local.reset(new Box(200, &destroys));
-    ASSERT_EQ(local.get()->value(), 200);
-    ASSERT_EQ(destroys.load(), 1);
-  });
-  thread.join();
-  ASSERT_EQ(destroys.load(), 2);
-}
-
-TEST(ThreadLocal, DestroyThreadTimeline) {
-  std::atomic_int destroys{0};
-  std::thread thread([&] {
-    std::thread thread2([&]() {
-      local.reset(new Box(100, &destroys));
-      ASSERT_EQ(local.get()->value(), 100);
-      ASSERT_EQ(destroys.load(), 0);
-      local.reset(new Box(200, &destroys));
-      ASSERT_EQ(local.get()->value(), 200);
-      ASSERT_EQ(destroys.load(), 1);
-    });
-    ASSERT_EQ(local.get(), nullptr);
-    thread2.join();
-    ASSERT_EQ(local.get(), nullptr);
-    ASSERT_EQ(destroys.load(), 2);
-  });
-  thread.join();
-  ASSERT_EQ(destroys.load(), 2);
-}
diff --git a/fml/thread_unittests.cc b/fml/thread_unittests.cc
index 095fc2dad42537ef5798495dbb4235a98081f1e6..42e9faebac6b2363527d09eb7c09e477d2224642 100644
--- a/fml/thread_unittests.cc
+++ b/fml/thread_unittests.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "flutter/fml/build_config.h"
 #include "flutter/fml/thread.h"
 
 #if defined(FML_OS_MACOSX) || defined(FML_OS_LINUX) || defined(FML_OS_ANDROID) || defined(FML_OS_OHOS)
@@ -15,6 +16,11 @@
 #else
 #endif
 
+#if defined(FML_OS_WIN)
+#include <windows.h>
+#endif
+
+#include <algorithm>
 #include <memory>
 #include "gtest/gtest.h"
 
@@ -37,6 +43,35 @@ TEST(Thread, HasARunningMessageLoop) {
   ASSERT_TRUE(done);
 }
 
+TEST(Thread, HasExpectedStackSize) {
+  size_t stack_size = 0;
+  fml::Thread thread;
+
+  thread.GetTaskRunner()->PostTask([&stack_size]() {
+#if defined(FML_OS_WIN)
+    ULONG_PTR low_limit;
+    ULONG_PTR high_limit;
+    GetCurrentThreadStackLimits(&low_limit, &high_limit);
+    stack_size = high_limit - low_limit;
+#elif defined(FML_OS_MACOSX)
+    stack_size = pthread_get_stacksize_np(pthread_self());
+#else
+    pthread_attr_t attr;
+    pthread_getattr_np(pthread_self(), &attr);
+    pthread_attr_getstacksize(&attr, &stack_size);
+    pthread_attr_destroy(&attr);
+#endif
+  });
+  thread.Join();
+
+  // Actual stack size will be aligned to page size, this assumes no supported
+  // platform has a page size larger than 16k. On Linux reducing the default
+  // stack size (8MB) does not seem to have any effect.
+  const size_t kPageSize = 16384;
+  ASSERT_TRUE(stack_size / kPageSize >=
+              fml::Thread::GetDefaultStackSize() / kPageSize);
+}
+
 #if FLUTTER_PTHREAD_SUPPORTED
 TEST(Thread, ThreadNameCreatedWithConfig) {
   const std::string name = "Thread1";
@@ -45,15 +80,20 @@ TEST(Thread, ThreadNameCreatedWithConfig) {
   bool done = false;
   thread.GetTaskRunner()->PostTask([&done, &name]() {
     done = true;
-    char thread_name[8];
+    char thread_name[16];
     pthread_t current_thread = pthread_self();
-    pthread_getname_np(current_thread, thread_name, 8);
+    pthread_getname_np(current_thread, thread_name, 16);
     ASSERT_EQ(thread_name, name);
   });
   thread.Join();
   ASSERT_TRUE(done);
 }
 
+static int clamp_priority(int priority, int policy) {
+  return std::clamp(priority, sched_get_priority_min(policy),
+                    sched_get_priority_max(policy));
+}
+
 static void MockThreadConfigSetter(const fml::Thread::ThreadConfig& config) {
   // set thread name
   fml::Thread::SetCurrentThreadName(config);
@@ -62,11 +102,11 @@ static void MockThreadConfigSetter(const fml::Thread::ThreadConfig& config) {
   struct sched_param param;
   int policy = SCHED_OTHER;
   switch (config.priority) {
-    case fml::Thread::ThreadPriority::DISPLAY:
-      param.sched_priority = 10;
+    case fml::Thread::ThreadPriority::kDisplay:
+      param.sched_priority = clamp_priority(10, policy);
       break;
     default:
-      param.sched_priority = 1;
+      param.sched_priority = clamp_priority(1, policy);
   }
   pthread_setschedparam(tid, policy, &param);
 }
@@ -77,36 +117,51 @@ TEST(Thread, ThreadPriorityCreatedWithConfig) {
 
   fml::Thread thread(MockThreadConfigSetter,
                      fml::Thread::ThreadConfig(
-                         thread1_name, fml::Thread::ThreadPriority::NORMAL));
+                         thread1_name, fml::Thread::ThreadPriority::kNormal));
   bool done = false;
 
   struct sched_param param;
   int policy;
   thread.GetTaskRunner()->PostTask([&]() {
     done = true;
-    char thread_name[8];
+    char thread_name[16];
     pthread_t current_thread = pthread_self();
-    pthread_getname_np(current_thread, thread_name, 8);
+    pthread_getname_np(current_thread, thread_name, 16);
     pthread_getschedparam(current_thread, &policy, &param);
     ASSERT_EQ(thread_name, thread1_name);
     ASSERT_EQ(policy, SCHED_OTHER);
-    ASSERT_EQ(param.sched_priority, 1);
+    ASSERT_EQ(param.sched_priority, clamp_priority(1, policy));
   });
 
   fml::Thread thread2(MockThreadConfigSetter,
                       fml::Thread::ThreadConfig(
-                          thread2_name, fml::Thread::ThreadPriority::DISPLAY));
+                          thread2_name, fml::Thread::ThreadPriority::kDisplay));
   thread2.GetTaskRunner()->PostTask([&]() {
     done = true;
-    char thread_name[8];
+    char thread_name[16];
     pthread_t current_thread = pthread_self();
-    pthread_getname_np(current_thread, thread_name, 8);
+    pthread_getname_np(current_thread, thread_name, 16);
     pthread_getschedparam(current_thread, &policy, &param);
     ASSERT_EQ(thread_name, thread2_name);
     ASSERT_EQ(policy, SCHED_OTHER);
-    ASSERT_EQ(param.sched_priority, 10);
+    ASSERT_EQ(param.sched_priority, clamp_priority(10, policy));
   });
   thread.Join();
   ASSERT_TRUE(done);
 }
-#endif
+#endif  // FLUTTER_PTHREAD_SUPPORTED
+
+#if defined(FML_OS_LINUX)
+TEST(Thread, LinuxLongThreadNameTruncated) {
+  const std::string name = "VeryLongThreadNameTest";
+  fml::Thread thread(name);
+
+  thread.GetTaskRunner()->PostTask([&name]() {
+    constexpr size_t kThreadNameLen = 16;
+    char thread_name[kThreadNameLen];
+    pthread_getname_np(pthread_self(), thread_name, kThreadNameLen);
+    ASSERT_EQ(thread_name, name.substr(0, kThreadNameLen - 1));
+  });
+  thread.Join();
+}
+#endif  // FML_OS_LINUX
diff --git a/fml/trace_event.cc b/fml/trace_event.cc
index 7ec9adbab3118a41f1c4a2b12d9fd638012c2719..28e7105f0aec03327b8affb86bd67eed84a275f5 100644
--- a/fml/trace_event.cc
+++ b/fml/trace_event.cc
@@ -30,6 +30,8 @@ std::atomic<TimelineMicrosSource> gTimelineMicrosSource = DefaultMicrosSource;
 inline void FlutterTimelineEvent(const char* label,
                                  int64_t timestamp0,
                                  int64_t timestamp1_or_async_id,
+                                 intptr_t flow_id_count,
+                                 const int64_t* flow_ids,
                                  Dart_Timeline_Event_Type type,
                                  intptr_t argument_count,
                                  const char** argument_names,
@@ -37,8 +39,8 @@ inline void FlutterTimelineEvent(const char* label,
   TimelineEventHandler handler =
       gTimelineEventHandler.load(std::memory_order_relaxed);
   if (handler && gAllowlist.Query(label)) {
-    handler(label, timestamp0, timestamp1_or_async_id, type, argument_count,
-            argument_names, argument_values);
+    handler(label, timestamp0, timestamp1_or_async_id, flow_id_count, flow_ids,
+            type, argument_count, argument_names, argument_values);
   }
 }
 }  // namespace
@@ -73,6 +75,8 @@ void TraceTimelineEvent(TraceArg category_group,
                         TraceArg name,
                         int64_t timestamp_micros,
                         TraceIDArg identifier,
+                        size_t flow_id_count,
+                        const uint64_t* flow_ids,
                         Dart_Timeline_Event_Type type,
                         const std::vector<const char*>& c_names,
                         const std::vector<std::string>& values) {
@@ -86,19 +90,23 @@ void TraceTimelineEvent(TraceArg category_group,
   }
 
   FlutterTimelineEvent(
-      name,                                      // label
-      timestamp_micros,                          // timestamp0
-      identifier,                                // timestamp1_or_async_id
-      type,                                      // event type
-      argument_count,                            // argument_count
-      const_cast<const char**>(c_names.data()),  // argument_names
-      c_values.data()                            // argument_values
+      name,                                        // label
+      timestamp_micros,                            // timestamp0
+      identifier,                                  // timestamp1_or_async_id
+      flow_id_count,                               // flow_id_count
+      reinterpret_cast<const int64_t*>(flow_ids),  // flow_ids
+      type,                                        // event type
+      argument_count,                              // argument_count
+      const_cast<const char**>(c_names.data()),    // argument_names
+      c_values.data()                              // argument_values
   );
 }
 
 void TraceTimelineEvent(TraceArg category_group,
                         TraceArg name,
                         TraceIDArg identifier,
+                        size_t flow_id_count,
+                        const uint64_t* flow_ids,
                         Dart_Timeline_Event_Type type,
                         const std::vector<const char*>& c_names,
                         const std::vector<std::string>& values) {
@@ -106,16 +114,23 @@ void TraceTimelineEvent(TraceArg category_group,
                      name,                            // name
                      gTimelineMicrosSource.load()(),  // timestamp_micros
                      identifier,                      // identifier
+                     flow_id_count,                   // flow_id_count
+                     flow_ids,                        // flow_ids
                      type,                            // type
                      c_names,                         // names
                      values                           // values
   );
 }
 
-void TraceEvent0(TraceArg category_group, TraceArg name) {
+void TraceEvent0(TraceArg category_group,
+                 TraceArg name,
+                 size_t flow_id_count,
+                 const uint64_t* flow_ids) {
   FlutterTimelineEvent(name,                            // label
                        gTimelineMicrosSource.load()(),  // timestamp0
-                       0,                          // timestamp1_or_async_id
+                       0,              // timestamp1_or_async_id
+                       flow_id_count,  // flow_id_count
+                       reinterpret_cast<const int64_t*>(flow_ids),  // flow_ids
                        Dart_Timeline_Event_Begin,  // event type
                        0,                          // argument_count
                        nullptr,                    // argument_names
@@ -125,13 +140,17 @@ void TraceEvent0(TraceArg category_group, TraceArg name) {
 
 void TraceEvent1(TraceArg category_group,
                  TraceArg name,
+                 size_t flow_id_count,
+                 const uint64_t* flow_ids,
                  TraceArg arg1_name,
                  TraceArg arg1_val) {
   const char* arg_names[] = {arg1_name};
   const char* arg_values[] = {arg1_val};
   FlutterTimelineEvent(name,                            // label
                        gTimelineMicrosSource.load()(),  // timestamp0
-                       0,                          // timestamp1_or_async_id
+                       0,              // timestamp1_or_async_id
+                       flow_id_count,  // flow_id_count
+                       reinterpret_cast<const int64_t*>(flow_ids),  // flow_ids
                        Dart_Timeline_Event_Begin,  // event type
                        1,                          // argument_count
                        arg_names,                  // argument_names
@@ -141,6 +160,8 @@ void TraceEvent1(TraceArg category_group,
 
 void TraceEvent2(TraceArg category_group,
                  TraceArg name,
+                 size_t flow_id_count,
+                 const uint64_t* flow_ids,
                  TraceArg arg1_name,
                  TraceArg arg1_val,
                  TraceArg arg2_name,
@@ -149,7 +170,9 @@ void TraceEvent2(TraceArg category_group,
   const char* arg_values[] = {arg1_val, arg2_val};
   FlutterTimelineEvent(name,                            // label
                        gTimelineMicrosSource.load()(),  // timestamp0
-                       0,                          // timestamp1_or_async_id
+                       0,              // timestamp1_or_async_id
+                       flow_id_count,  // flow_id_count
+                       reinterpret_cast<const int64_t*>(flow_ids),  // flow_ids
                        Dart_Timeline_Event_Begin,  // event type
                        2,                          // argument_count
                        arg_names,                  // argument_names
@@ -161,6 +184,8 @@ void TraceEventEnd(TraceArg name) {
   FlutterTimelineEvent(name,                            // label
                        gTimelineMicrosSource.load()(),  // timestamp0
                        0,                        // timestamp1_or_async_id
+                       0,                        // flow_id_count
+                       nullptr,                  // flow_ids
                        Dart_Timeline_Event_End,  // event type
                        0,                        // argument_count
                        nullptr,                  // argument_names
@@ -170,10 +195,14 @@ void TraceEventEnd(TraceArg name) {
 
 void TraceEventAsyncBegin0(TraceArg category_group,
                            TraceArg name,
-                           TraceIDArg id) {
+                           TraceIDArg id,
+                           size_t flow_id_count,
+                           const uint64_t* flow_ids) {
   FlutterTimelineEvent(name,                            // label
                        gTimelineMicrosSource.load()(),  // timestamp0
-                       id,  // timestamp1_or_async_id
+                       id,             // timestamp1_or_async_id
+                       flow_id_count,  // flow_id_count
+                       reinterpret_cast<const int64_t*>(flow_ids),  // flow_ids
                        Dart_Timeline_Event_Async_Begin,  // event type
                        0,                                // argument_count
                        nullptr,                          // argument_names
@@ -187,6 +216,8 @@ void TraceEventAsyncEnd0(TraceArg category_group,
   FlutterTimelineEvent(name,                            // label
                        gTimelineMicrosSource.load()(),  // timestamp0
                        id,                             // timestamp1_or_async_id
+                       0,                              // flow_id_count
+                       nullptr,                        // flow_ids
                        Dart_Timeline_Event_Async_End,  // event type
                        0,                              // argument_count
                        nullptr,                        // argument_names
@@ -197,13 +228,17 @@ void TraceEventAsyncEnd0(TraceArg category_group,
 void TraceEventAsyncBegin1(TraceArg category_group,
                            TraceArg name,
                            TraceIDArg id,
+                           size_t flow_id_count,
+                           const uint64_t* flow_ids,
                            TraceArg arg1_name,
                            TraceArg arg1_val) {
   const char* arg_names[] = {arg1_name};
   const char* arg_values[] = {arg1_val};
   FlutterTimelineEvent(name,                            // label
                        gTimelineMicrosSource.load()(),  // timestamp0
-                       id,  // timestamp1_or_async_id
+                       id,             // timestamp1_or_async_id
+                       flow_id_count,  // flow_id_count
+                       reinterpret_cast<const int64_t*>(flow_ids),  // flow_ids
                        Dart_Timeline_Event_Async_Begin,  // event type
                        1,                                // argument_count
                        arg_names,                        // argument_names
@@ -221,6 +256,8 @@ void TraceEventAsyncEnd1(TraceArg category_group,
   FlutterTimelineEvent(name,                            // label
                        gTimelineMicrosSource.load()(),  // timestamp0
                        id,                             // timestamp1_or_async_id
+                       0,                              // flow_id_count
+                       nullptr,                        // flow_ids
                        Dart_Timeline_Event_Async_End,  // event type
                        1,                              // argument_count
                        arg_names,                      // argument_names
@@ -228,10 +265,15 @@ void TraceEventAsyncEnd1(TraceArg category_group,
   );
 }
 
-void TraceEventInstant0(TraceArg category_group, TraceArg name) {
+void TraceEventInstant0(TraceArg category_group,
+                        TraceArg name,
+                        size_t flow_id_count,
+                        const uint64_t* flow_ids) {
   FlutterTimelineEvent(name,                            // label
                        gTimelineMicrosSource.load()(),  // timestamp0
-                       0,                            // timestamp1_or_async_id
+                       0,              // timestamp1_or_async_id
+                       flow_id_count,  // flow_id_count
+                       reinterpret_cast<const int64_t*>(flow_ids),  // flow_ids
                        Dart_Timeline_Event_Instant,  // event type
                        0,                            // argument_count
                        nullptr,                      // argument_names
@@ -241,13 +283,17 @@ void TraceEventInstant0(TraceArg category_group, TraceArg name) {
 
 void TraceEventInstant1(TraceArg category_group,
                         TraceArg name,
+                        size_t flow_id_count,
+                        const uint64_t* flow_ids,
                         TraceArg arg1_name,
                         TraceArg arg1_val) {
   const char* arg_names[] = {arg1_name};
   const char* arg_values[] = {arg1_val};
   FlutterTimelineEvent(name,                            // label
                        gTimelineMicrosSource.load()(),  // timestamp0
-                       0,                            // timestamp1_or_async_id
+                       0,              // timestamp1_or_async_id
+                       flow_id_count,  // flow_id_count
+                       reinterpret_cast<const int64_t*>(flow_ids),  // flow_ids
                        Dart_Timeline_Event_Instant,  // event type
                        1,                            // argument_count
                        arg_names,                    // argument_names
@@ -257,6 +303,8 @@ void TraceEventInstant1(TraceArg category_group,
 
 void TraceEventInstant2(TraceArg category_group,
                         TraceArg name,
+                        size_t flow_id_count,
+                        const uint64_t* flow_ids,
                         TraceArg arg1_name,
                         TraceArg arg1_val,
                         TraceArg arg2_name,
@@ -265,7 +313,9 @@ void TraceEventInstant2(TraceArg category_group,
   const char* arg_values[] = {arg1_val, arg2_val};
   FlutterTimelineEvent(name,                            // label
                        gTimelineMicrosSource.load()(),  // timestamp0
-                       0,                            // timestamp1_or_async_id
+                       0,              // timestamp1_or_async_id
+                       flow_id_count,  // flow_id_count
+                       reinterpret_cast<const int64_t*>(flow_ids),  // flow_ids
                        Dart_Timeline_Event_Instant,  // event type
                        2,                            // argument_count
                        arg_names,                    // argument_names
@@ -278,7 +328,9 @@ void TraceEventFlowBegin0(TraceArg category_group,
                           TraceIDArg id) {
   FlutterTimelineEvent(name,                            // label
                        gTimelineMicrosSource.load()(),  // timestamp0
-                       id,  // timestamp1_or_async_id
+                       id,       // timestamp1_or_async_id
+                       0,        // flow_id_count
+                       nullptr,  // flow_ids
                        Dart_Timeline_Event_Flow_Begin,  // event type
                        0,                               // argument_count
                        nullptr,                         // argument_names
@@ -292,6 +344,8 @@ void TraceEventFlowStep0(TraceArg category_group,
   FlutterTimelineEvent(name,                            // label
                        gTimelineMicrosSource.load()(),  // timestamp0
                        id,                             // timestamp1_or_async_id
+                       0,                              // flow_id_count
+                       nullptr,                        // flow_ids
                        Dart_Timeline_Event_Flow_Step,  // event type
                        0,                              // argument_count
                        nullptr,                        // argument_names
@@ -303,6 +357,8 @@ void TraceEventFlowEnd0(TraceArg category_group, TraceArg name, TraceIDArg id) {
   FlutterTimelineEvent(name,                            // label
                        gTimelineMicrosSource.load()(),  // timestamp0
                        id,                            // timestamp1_or_async_id
+                       0,                             // flow_id_count
+                       nullptr,                       // flow_ids
                        Dart_Timeline_Event_Flow_End,  // event type
                        0,                             // argument_count
                        nullptr,                       // argument_names
@@ -334,6 +390,8 @@ void TraceTimelineEvent(TraceArg category_group,
                         TraceArg name,
                         int64_t timestamp_micros,
                         TraceIDArg identifier,
+                        size_t flow_id_count,
+                        const uint64_t* flow_ids,
                         Dart_Timeline_Event_Type type,
                         const std::vector<const char*>& c_names,
                         const std::vector<std::string>& values) {}
@@ -341,19 +399,28 @@ void TraceTimelineEvent(TraceArg category_group,
 void TraceTimelineEvent(TraceArg category_group,
                         TraceArg name,
                         TraceIDArg identifier,
+                        size_t flow_id_count,
+                        const uint64_t* flow_ids,
                         Dart_Timeline_Event_Type type,
                         const std::vector<const char*>& c_names,
                         const std::vector<std::string>& values) {}
 
-void TraceEvent0(TraceArg category_group, TraceArg name) {}
+void TraceEvent0(TraceArg category_group,
+                 TraceArg name,
+                 size_t flow_id_count,
+                 const uint64_t* flow_ids) {}
 
 void TraceEvent1(TraceArg category_group,
                  TraceArg name,
+                 size_t flow_id_count,
+                 const uint64_t* flow_ids,
                  TraceArg arg1_name,
                  TraceArg arg1_val) {}
 
 void TraceEvent2(TraceArg category_group,
                  TraceArg name,
+                 size_t flow_id_count,
+                 const uint64_t* flow_ids,
                  TraceArg arg1_name,
                  TraceArg arg1_val,
                  TraceArg arg2_name,
@@ -368,7 +435,9 @@ void TraceEventAsyncComplete(TraceArg category_group,
 
 void TraceEventAsyncBegin0(TraceArg category_group,
                            TraceArg name,
-                           TraceIDArg id) {}
+                           TraceIDArg id,
+                           size_t flow_id_count,
+                           const uint64_t* flow_ids) {}
 
 void TraceEventAsyncEnd0(TraceArg category_group,
                          TraceArg name,
@@ -377,6 +446,8 @@ void TraceEventAsyncEnd0(TraceArg category_group,
 void TraceEventAsyncBegin1(TraceArg category_group,
                            TraceArg name,
                            TraceIDArg id,
+                           size_t flow_id_count,
+                           const uint64_t* flow_ids,
                            TraceArg arg1_name,
                            TraceArg arg1_val) {}
 
@@ -386,15 +457,22 @@ void TraceEventAsyncEnd1(TraceArg category_group,
                          TraceArg arg1_name,
                          TraceArg arg1_val) {}
 
-void TraceEventInstant0(TraceArg category_group, TraceArg name) {}
+void TraceEventInstant0(TraceArg category_group,
+                        TraceArg name,
+                        size_t flow_id_count,
+                        const uint64_t* flow_ids) {}
 
 void TraceEventInstant1(TraceArg category_group,
                         TraceArg name,
+                        size_t flow_id_count,
+                        const uint64_t* flow_ids,
                         TraceArg arg1_name,
                         TraceArg arg1_val) {}
 
 void TraceEventInstant2(TraceArg category_group,
                         TraceArg name,
+                        size_t flow_id_count,
+                        const uint64_t* flow_ids,
                         TraceArg arg1_name,
                         TraceArg arg1_val,
                         TraceArg arg2_name,
diff --git a/fml/trace_event.h b/fml/trace_event.h
index d6749e61acb87515d58274214dc49fc4e5eb3ed1..415fad05aaccb9580381ee53c56c1c7393bfff5a 100644
--- a/fml/trace_event.h
+++ b/fml/trace_event.h
@@ -21,11 +21,27 @@
   ::fml::tracing::TraceCounterNopHACK((a), (b), (c), (arg1), __VA_ARGS__);
 
 #define FML_TRACE_EVENT(a, b, args...) TRACE_DURATION(a, b)
+// On Fuchsia, the flow_id arguments to this macro are ignored.
+#define FML_TRACE_EVENT_WITH_FLOW_IDS(category_group, name, flow_id_count, \
+                                      flow_ids, ...)                       \
+  FML_TRACE_EVENT(category_group, name)
 
 #define TRACE_EVENT0(a, b) TRACE_DURATION(a, b)
+// On Fuchsia, the flow_id arguments to this macro are ignored.
+#define TRACE_EVENT0_WITH_FLOW_IDS(category_group, name, flow_id_count, \
+                                   flow_ids)                            \
+  TRACE_EVENT0(category_group, name)
 #define TRACE_EVENT1(a, b, c, d) TRACE_DURATION(a, b, c, d)
+// On Fuchsia, the flow_id arguments to this macro are ignored.
+#define TRACE_EVENT1_WITH_FLOW_IDS(category_group, name, flow_id_count, \
+                                   flow_ids, arg1_name, arg1_val)       \
+  TRACE_EVENT1(category_group, name, arg1_name, arg1_val)
 #define TRACE_EVENT2(a, b, c, d, e, f) TRACE_DURATION(a, b, c, d, e, f)
 #define TRACE_EVENT_ASYNC_BEGIN0(a, b, c) TRACE_ASYNC_BEGIN(a, b, c)
+// On Fuchsia, the flow_id arguments to this macro are ignored.
+#define TRACE_EVENT_ASYNC_BEGIN0_WITH_FLOW_IDS(category_group, name, id, \
+                                               flow_id_count, flow_ids)  \
+  TRACE_EVENT_ASYNC_BEGIN0(category_group, name, id)
 #define TRACE_EVENT_ASYNC_END0(a, b, c) TRACE_ASYNC_END(a, b, c)
 #define TRACE_EVENT_ASYNC_BEGIN1(a, b, c, d, e) TRACE_ASYNC_BEGIN(a, b, c, d, e)
 #define TRACE_EVENT_ASYNC_END1(a, b, c, d, e) TRACE_ASYNC_END(a, b, c, d, e)
@@ -83,49 +99,93 @@
 // ```
 //
 // Instead, either use different `name` or `arg1` parameter names.
-#define FML_TRACE_EVENT(category_group, name, ...)                   \
-  ::fml::tracing::TraceEvent((category_group), (name), __VA_ARGS__); \
+#define FML_TRACE_EVENT_WITH_FLOW_IDS(category_group, name, flow_id_count, \
+                                      flow_ids, ...)                       \
+  ::fml::tracing::TraceEvent((category_group), (name), (flow_id_count),    \
+                             (flow_ids), __VA_ARGS__);                     \
   __FML__AUTO_TRACE_END(name)
 
-#define TRACE_EVENT0(category_group, name)           \
-  ::fml::tracing::TraceEvent0(category_group, name); \
+// Avoid using the same `name` and `argX_name` for nested traces, which can
+// lead to double free errors. E.g. the following code should be avoided:
+//
+// ```cpp
+// {
+//    TRACE_EVENT1("flutter", "Foo::Bar", "count", "initial_count_value");
+//    ...
+//    TRACE_EVENT_INSTANT1("flutter", "Foo::Bar",
+//                         "count", "updated_count_value");
+// }
+// ```
+//
+// Instead, either use different `name` or `arg1` parameter names.
+#define FML_TRACE_EVENT(category_group, name, ...)                             \
+  FML_TRACE_EVENT_WITH_FLOW_IDS((category_group), (name),                      \
+                                /*flow_id_count=*/(0), /*flow_ids=*/(nullptr), \
+                                __VA_ARGS__)
+
+#define TRACE_EVENT0_WITH_FLOW_IDS(category_group, name, flow_id_count,       \
+                                   flow_ids)                                  \
+  ::fml::tracing::TraceEvent0(category_group, name, flow_id_count, flow_ids); \
   __FML__AUTO_TRACE_END(name)
 
-#define TRACE_EVENT1(category_group, name, arg1_name, arg1_val)           \
-  ::fml::tracing::TraceEvent1(category_group, name, arg1_name, arg1_val); \
+#define TRACE_EVENT0(category_group, name)                              \
+  TRACE_EVENT0_WITH_FLOW_IDS(category_group, name, /*flow_id_count=*/0, \
+                             /*flow_ids=*/nullptr)
+
+#define TRACE_EVENT1_WITH_FLOW_IDS(category_group, name, flow_id_count,      \
+                                   flow_ids, arg1_name, arg1_val)            \
+  ::fml::tracing::TraceEvent1(category_group, name, flow_id_count, flow_ids, \
+                              arg1_name, arg1_val);                          \
   __FML__AUTO_TRACE_END(name)
 
+#define TRACE_EVENT1(category_group, name, arg1_name, arg1_val)         \
+  TRACE_EVENT1_WITH_FLOW_IDS(category_group, name, /*flow_id_count=*/0, \
+                             /*flow_ids=*/nullptr, arg1_name, arg1_val)
+
 #define TRACE_EVENT2(category_group, name, arg1_name, arg1_val, arg2_name, \
                      arg2_val)                                             \
-  ::fml::tracing::TraceEvent2(category_group, name, arg1_name, arg1_val,   \
+  ::fml::tracing::TraceEvent2(category_group, name, /*flow_id_count=*/0,   \
+                              /*flow_ids=*/nullptr, arg1_name, arg1_val,   \
                               arg2_name, arg2_val);                        \
   __FML__AUTO_TRACE_END(name)
 
+#define TRACE_EVENT_ASYNC_BEGIN0_WITH_FLOW_IDS(category_group, name, id, \
+                                               flow_id_count, flow_ids)  \
+  ::fml::tracing::TraceEventAsyncBegin0(category_group, name, id,        \
+                                        flow_id_count, flow_ids);
+
 #define TRACE_EVENT_ASYNC_BEGIN0(category_group, name, id) \
-  ::fml::tracing::TraceEventAsyncBegin0(category_group, name, id);
+  TRACE_EVENT_ASYNC_BEGIN0_WITH_FLOW_IDS(                  \
+      category_group, name, id, /*flow_id_count=*/0, /*flow_ids=*/nullptr)
 
 #define TRACE_EVENT_ASYNC_END0(category_group, name, id) \
   ::fml::tracing::TraceEventAsyncEnd0(category_group, name, id);
 
-#define TRACE_EVENT_ASYNC_BEGIN1(category_group, name, id, arg1_name,        \
-                                 arg1_val)                                   \
-  ::fml::tracing::TraceEventAsyncBegin1(category_group, name, id, arg1_name, \
-                                        arg1_val);
+#define TRACE_EVENT_ASYNC_BEGIN1(category_group, name, id, arg1_name,      \
+                                 arg1_val)                                 \
+  ::fml::tracing::TraceEventAsyncBegin1(                                   \
+      category_group, name, id, /*flow_id_count=*/0, /*flow_ids=*/nullptr, \
+      arg1_name, arg1_val);
 
 #define TRACE_EVENT_ASYNC_END1(category_group, name, id, arg1_name, arg1_val) \
-  ::fml::tracing::TraceEventAsyncEnd1(category_group, name, id, arg1_name,    \
-                                      arg1_val);
+  ::fml::tracing::TraceEventAsyncEnd1(                                        \
+      category_group, name, id, /*flow_id_count=*/0, /*flow_ids=*/nullptr,    \
+      arg1_name, arg1_val);
 
 #define TRACE_EVENT_INSTANT0(category_group, name) \
-  ::fml::tracing::TraceEventInstant0(category_group, name);
+  ::fml::tracing::TraceEventInstant0(              \
+      category_group, name, /*flow_id_count=*/0, /*flow_ids=*/nullptr);
 
 #define TRACE_EVENT_INSTANT1(category_group, name, arg1_name, arg1_val) \
-  ::fml::tracing::TraceEventInstant1(category_group, name, arg1_name, arg1_val);
+  ::fml::tracing::TraceEventInstant1(                                   \
+      category_group, name, /*flow_id_count=*/0, /*flow_ids=*/nullptr,  \
+      arg1_name, arg1_val);
 
 #define TRACE_EVENT_INSTANT2(category_group, name, arg1_name, arg1_val, \
                              arg2_name, arg2_val)                       \
-  ::fml::tracing::TraceEventInstant2(category_group, name, arg1_name,   \
-                                     arg1_val, arg2_name, arg2_val);
+  ::fml::tracing::TraceEventInstant2(                                   \
+      category_group, name, /*flow_id_count=*/0, /*flow_ids=*/nullptr,  \
+      arg1_name, arg1_val, arg2_name, arg2_val);
 
 #define TRACE_FLOW_BEGIN(category, name, id) \
   ::fml::tracing::TraceEventFlowBegin0(category, name, id);
@@ -139,6 +199,13 @@
 #endif  // TRACE_EVENT_HIDE_MACROS
 #endif  // !defined(OS_FUCHSIA)
 
+#define TRACE_EVENT2_INT(category_group, name, arg1_name, arg1_val, arg2_name, \
+                         arg2_val)                                             \
+  const auto __arg1_val_str = std::to_string(arg1_val);                        \
+  const auto __arg2_val_str = std::to_string(arg2_val);                        \
+  TRACE_EVENT2(category_group, name, arg1_name, __arg1_val_str.c_str(),        \
+               arg2_name, __arg2_val_str.c_str());
+
 namespace fml {
 namespace tracing {
 
@@ -150,6 +217,8 @@ void TraceSetAllowlist(const std::vector<std::string>& allowlist);
 typedef void (*TimelineEventHandler)(const char*,
                                      int64_t,
                                      int64_t,
+                                     intptr_t,
+                                     const int64_t*,
                                      Dart_Timeline_Event_Type,
                                      intptr_t,
                                      const char**,
@@ -169,6 +238,8 @@ void TraceTimelineEvent(TraceArg category_group,
                         TraceArg name,
                         int64_t timestamp_micros,
                         TraceIDArg id,
+                        size_t flow_id_count,
+                        const uint64_t* flow_ids,
                         Dart_Timeline_Event_Type type,
                         const std::vector<const char*>& names,
                         const std::vector<std::string>& values);
@@ -176,6 +247,8 @@ void TraceTimelineEvent(TraceArg category_group,
 void TraceTimelineEvent(TraceArg category_group,
                         TraceArg name,
                         TraceIDArg id,
+                        size_t flow_id_count,
+                        const uint64_t* flow_ids,
                         Dart_Timeline_Event_Type type,
                         const std::vector<const char*>& names,
                         const std::vector<std::string>& values);
@@ -234,7 +307,8 @@ void TraceCounter(TraceArg category,
                   Args... args) {
 #if FLUTTER_TIMELINE_ENABLED
   auto split = SplitArguments(args...);
-  TraceTimelineEvent(category, name, identifier, Dart_Timeline_Event_Counter,
+  TraceTimelineEvent(category, name, identifier, /*flow_id_count=*/0,
+                     /*flow_ids=*/nullptr, Dart_Timeline_Event_Counter,
                      split.first, split.second);
 #endif  // FLUTTER_TIMELINE_ENABLED
 }
@@ -248,23 +322,34 @@ void TraceCounterNopHACK(TraceArg category,
                          Args... args) {}
 
 template <typename... Args>
-void TraceEvent(TraceArg category, TraceArg name, Args... args) {
+void TraceEvent(TraceArg category,
+                TraceArg name,
+                size_t flow_id_count,
+                const uint64_t* flow_ids,
+                Args... args) {
 #if FLUTTER_TIMELINE_ENABLED
   auto split = SplitArguments(args...);
-  TraceTimelineEvent(category, name, 0, Dart_Timeline_Event_Begin, split.first,
-                     split.second);
+  TraceTimelineEvent(category, name, 0, flow_id_count, flow_ids,
+                     Dart_Timeline_Event_Begin, split.first, split.second);
 #endif  // FLUTTER_TIMELINE_ENABLED
 }
 
-void TraceEvent0(TraceArg category_group, TraceArg name);
+void TraceEvent0(TraceArg category_group,
+                 TraceArg name,
+                 size_t flow_id_count,
+                 const uint64_t* flow_ids);
 
 void TraceEvent1(TraceArg category_group,
                  TraceArg name,
+                 size_t flow_id_count,
+                 const uint64_t* flow_ids,
                  TraceArg arg1_name,
                  TraceArg arg1_val);
 
 void TraceEvent2(TraceArg category_group,
                  TraceArg name,
+                 size_t flow_id_count,
+                 const uint64_t* flow_ids,
                  TraceArg arg1_name,
                  TraceArg arg1_val,
                  TraceArg arg2_name,
@@ -293,6 +378,8 @@ void TraceEventAsyncComplete(TraceArg category_group,
                      name,                             // name
                      begin_micros,                     // timestamp_micros
                      identifier,                       // identifier
+                     0,                                // flow_id_count
+                     nullptr,                          // flow_ids
                      Dart_Timeline_Event_Async_Begin,  // type
                      split.first,                      // names
                      split.second                      // values
@@ -302,6 +389,8 @@ void TraceEventAsyncComplete(TraceArg category_group,
                      name,                           // name
                      end_micros,                     // timestamp_micros
                      identifier,                     // identifier
+                     0,                              // flow_id_count
+                     nullptr,                        // flow_ids
                      Dart_Timeline_Event_Async_End,  // type
                      split.first,                    // names
                      split.second                    // values
@@ -311,13 +400,17 @@ void TraceEventAsyncComplete(TraceArg category_group,
 
 void TraceEventAsyncBegin0(TraceArg category_group,
                            TraceArg name,
-                           TraceIDArg id);
+                           TraceIDArg id,
+                           size_t flow_id_count,
+                           const uint64_t* flow_ids);
 
 void TraceEventAsyncEnd0(TraceArg category_group, TraceArg name, TraceIDArg id);
 
 void TraceEventAsyncBegin1(TraceArg category_group,
                            TraceArg name,
                            TraceIDArg id,
+                           size_t flow_id_count,
+                           const uint64_t* flow_ids,
                            TraceArg arg1_name,
                            TraceArg arg1_val);
 
@@ -327,15 +420,22 @@ void TraceEventAsyncEnd1(TraceArg category_group,
                          TraceArg arg1_name,
                          TraceArg arg1_val);
 
-void TraceEventInstant0(TraceArg category_group, TraceArg name);
+void TraceEventInstant0(TraceArg category_group,
+                        TraceArg name,
+                        size_t flow_id_count,
+                        const uint64_t* flow_ids);
 
 void TraceEventInstant1(TraceArg category_group,
                         TraceArg name,
+                        size_t flow_id_count,
+                        const uint64_t* flow_ids,
                         TraceArg arg1_name,
                         TraceArg arg1_val);
 
 void TraceEventInstant2(TraceArg category_group,
                         TraceArg name,
+                        size_t flow_id_count,
+                        const uint64_t* flow_ids,
                         TraceArg arg1_name,
                         TraceArg arg1_val,
                         TraceArg arg2_name,
@@ -369,7 +469,10 @@ class ScopedInstantEnd {
 class TraceFlow {
  public:
   explicit TraceFlow(const char* label) : label_(label), nonce_(TraceNonce()) {
+    TraceEvent0("flutter", label_, /*flow_id_count=*/1,
+                /*flow_ids=*/&nonce_);
     TraceEventFlowBegin0("flutter", label_, nonce_);
+    TraceEventEnd(label_);
   }
 
   ~TraceFlow() { End(label_); }
@@ -379,19 +482,25 @@ class TraceFlow {
   }
 
   void Step(const char* label = nullptr) const {
+    TraceEvent0("flutter", label ? label : label_, /*flow_id_count=*/1,
+                /*flow_ids=*/&nonce_);
     TraceEventFlowStep0("flutter", label ? label : label_, nonce_);
+    TraceEventEnd(label ? label : label_);
   }
 
   void End(const char* label = nullptr) {
     if (nonce_ != 0) {
+      TraceEvent0("flutter", label ? label : label_, /*flow_id_count=*/1,
+                  /*flow_ids=*/&nonce_);
       TraceEventFlowEnd0("flutter", label ? label : label_, nonce_);
+      TraceEventEnd(label ? label : label_);
       nonce_ = 0;
     }
   }
 
  private:
   const char* label_;
-  size_t nonce_;
+  uint64_t nonce_;
 
   FML_DISALLOW_COPY_AND_ASSIGN(TraceFlow);
 };
diff --git a/impeller/BUILD.gn b/impeller/BUILD.gn
index 2920b94f9194958e87fcf0cabf45cb67f44f47a2..f5e2ce7bf3388abeb6a580225a19ebb75395155a 100644
--- a/impeller/BUILD.gn
+++ b/impeller/BUILD.gn
@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//flutter/third_party/glfw/glfw_args.gni")
 import("tools/impeller.gni")
 
 config("impeller_public_config") {
@@ -9,6 +10,14 @@ config("impeller_public_config") {
 
   defines = []
 
+  if (impeller_debug) {
+    defines += [ "IMPELLER_DEBUG=1" ]
+  }
+
+  if (impeller_capture) {
+    defines += [ "IMPELLER_ENABLE_CAPTURE=1" ]
+  }
+
   if (impeller_supports_rendering) {
     defines += [ "IMPELLER_SUPPORTS_RENDERING=1" ]
   }
@@ -29,21 +38,20 @@ config("impeller_public_config") {
     defines += [ "IMPELLER_TRACE_ALL_GL_CALLS" ]
   }
 
-  if (impeller_error_check_all_gl_calls) {
-    defines += [ "IMPELLER_ERROR_CHECK_ALL_GL_CALLS" ]
-  }
-
   if (is_win) {
     defines += [
       # TODO(dnfield): https://github.com/flutter/flutter/issues/50053
       "_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING",
     ]
   }
+
+  if (impeller_enable_3d) {
+    defines += [ "IMPELLER_ENABLE_3D" ]
+  }
 }
 
 group("impeller") {
   public_deps = [
-    "archivist",
     "base",
     "geometry",
     "tessellator",
@@ -54,10 +62,9 @@ group("impeller") {
       "aiks",
       "display_list",
       "entity",
-      "image",
       "renderer",
       "renderer/backend",
-      "typographer",
+      "typographer/backends/skia:typographer_skia_backend",
     ]
   }
 }
@@ -68,12 +75,15 @@ impeller_component("impeller_unittests") {
   testonly = true
 
   deps = [
-    "archivist:archivist_unittests",
     "base:base_unittests",
-    "blobcat:blobcat_unittests",
     "compiler:compiler_unittests",
+    "core:allocator_unittests",
+    "display_list:skia_conversions_unittests",
     "geometry:geometry_unittests",
+    "renderer/backend/metal:metal_unittests",
     "runtime_stage:runtime_stage_unittests",
+    "scene/importer:importer_unittests",
+    "shader_archive:shader_archive_unittests",
     "tessellator:tessellator_unittests",
   ]
 
@@ -83,11 +93,42 @@ impeller_component("impeller_unittests") {
       "display_list:display_list_unittests",
       "entity:entity_unittests",
       "fixtures",
-      "image:image_unittests",
+      "geometry:geometry_unittests",
       "playground",
       "renderer:renderer_unittests",
       "scene:scene_unittests",
       "typographer:typographer_unittests",
     ]
   }
+
+  if (impeller_enable_vulkan) {
+    deps += [ "//flutter/impeller/renderer/backend/vulkan:vulkan_unittests" ]
+  }
+
+  if (impeller_enable_opengles) {
+    deps += [ "//flutter/impeller/renderer/backend/gles:gles_unittests" ]
+  }
+
+  if (glfw_vulkan_library != "") {
+    deps += [
+      "//flutter/third_party/swiftshader",
+      "//flutter/third_party/vulkan-deps/vulkan-loader/src:libvulkan",
+      "//third_party/vulkan_validation_layers",
+      "//third_party/vulkan_validation_layers:vulkan_gen_json_files",
+    ]
+  }
+
+  if (impeller_enable_compute) {
+    deps += [ "renderer:compute_tessellation_unittests" ]
+  }
+}
+
+if (impeller_supports_rendering) {
+  impeller_component("impeller_dart_unittests") {
+    target_type = "executable"
+
+    testonly = true
+
+    deps = [ "renderer:renderer_dart_unittests" ]
+  }
 }
diff --git a/impeller/README.md b/impeller/README.md
index 386511ae7ab327557153a8d9a25b30af5b41182b..adeb8a3fd054cce432c0337e52292ecef427d01d 100644
--- a/impeller/README.md
+++ b/impeller/README.md
@@ -13,8 +13,6 @@
 
 ![Impeller](docs/assets/showcase.png)
 
-⚠️ Impeller is a Prototype and Work-In-Progress. Proceed with caution. ⚠️
-
 Impeller is a rendering runtime for Flutter with the following objectives:
 
 * **Predictable Performance**: All shader compilation and reflection is
@@ -62,12 +60,6 @@ states of completion:
       for a specific client rendering API. The interfaces in these targets are
       meant to be private for non-WSI user targets. No Impeller sub-frameworks
       may depend on these targets.
-* **`//impeller/archivist`**: Allows persisting objects to disk as performantly
-  as possible (usually on a background thread). The framework is meant to be
-  used for storing frame meta-data and related profiling/instrumentation
-  information. Collection of information should succeed despite process crashes
-  and retrieval of traces must not use inordinate amounts of time or memory
-  (which usually leads to crashes).
 * **`//impeller/geometry`**: All (or, most of) the math! This C++ mathematics
   library is used extensively by Impeller and its clients. The reasonably
   interesting bit about this library is that all types can be used
@@ -102,23 +94,39 @@ states of completion:
   package agnosticism in the Impeller interface. This sub-framework primarily
   provides a custom implementation of the `flutter::DisplayListDispatcher` that
   forwards Flutter rendering intent to Impeller.
+* **`//impeller/typographer`**: Contains a backend agnostic interface for
+  rendering typefaces. While Impeller does **not** do any text layout or
+  shaping, it does render shaped glyph runs. The application specifies these
+  glyph runs to Impeller using the Typographer subsystem.
+  * **`//impeller/typographer/backend`**: Contains code that interfaces with an
+    underlying (usually platform-specific) library or toolkit to render glyphs
+    in typefaces into texture atlases. Impeller will then reference these glyphs
+    when rendering shaped glyph runs. No Impeller sub-frameworks may depend on
+    these targets. There may be multiple typographer backends.
 * **`//impeller/base`**: Contains C++ utilities that are used throughout the
   Impeller family of frameworks. Ideally, these should go in `//flutter/fml` but
   their use is probably not widespread enough to at this time.
-* **`//impeller/image`**: The Impeller renderer works with textures whose memory
-  is resident in device memory. However, pending the migration of
-  `//flutter/display_list` to graphics package agnosticism and the subsequent
-  migration of the image decoders to work with the package agnostic types, there
-  needs to be a way for tests and such to decode compressed image data. This
-  sub-framework provides that functionality. This sub-framework is slated for
-  removal and must not be used outside of tests.
 * **`//fixtures`**: Contains test fixtures used by the various test harnesses.
   This depends on `//flutter/testing`.
-* **`//tools`**: Contains all GN rules and python scripts for working with
-  Impeller. These include GN rules processing GLSL shaders, including reflected
-  shader information as source set targets, and, including compiled shader
-  intermediate representations into the final executable as binary blobs for
-  easier packaging.
+* **`//impeller/tools`**: Contains all GN rules and python scripts for working
+  with Impeller. These include GN rules processing GLSL shaders, including
+  reflected shader information as source set targets, and, including compiled
+  shader intermediate representations into the final executable as binary blobs
+  for easier packaging.
+* **`//impeller/toolkit`**: Contains Impeller agnostic toolkits that provide
+  more ergonomic  wrappers around certain APIs like EGL. Toolkits must be
+  dependency free so that an external component using a toolkit doesn't have to
+  pull in a significant portion of Impeller itself.
+* **`//impeller/shader_archive`**: Create a persistent library of shader blobs.
+  This is primarily used by rendering backends that don't have the notion of a
+  shader library. In Impeller, all shaders are packaged into a single library
+  that contains a manifest of the shaders in the library along with the
+  pre-compiled shaders themselves. Unlike Metal, backends like OpenGL ES and
+  Vulkan don't have such a concept. For these backends, `//impeller/blobcat` is
+  used to create a single shader library to be packaged with the engine.
+* **`//impeller/scene`**: Contains an experimental 3D model renderer. This is
+  currently only exposed via [a special build of the Flutter
+  Engine](https://github.com/flutter/flutter/wiki/Impeller-Scene).
 
 ## The Offline Shader Compilation Pipeline
 
@@ -150,17 +158,37 @@ states of completion:
   necessary. It is possible for callers to perform reflection at runtime but
   there are no Impeller components that do this currently.
 
-![Shader Compilation Pipeline](docs/assets/shader_pipeline.png)
+```mermaid
+flowchart TD
+    glsl_460[GLSL ES 4.60] -- Stage 1 Compiler --> spirv[SPIRV]
+
+    spirv -- SPIRV Optimizer --> optimized_spirv[Optimized SPIRV]
+
+    optimized_spirv -- Metal Stage 2 Compiler --> metal_sources[Metal Shader Sources]
+    metal_sources -- Metal Linker --> metal_library[Metal Library]
+
+    optimized_spirv -- Vulkan Stage 2 Compiler --> vulkan_spirv[Vulkan SPIRV]
+    vulkan_spirv -- Shader Archiver --> vulkan_shader_archive[Vulkan Shader Archive]
+
+    optimized_spirv -- GLSL ES Stage 2 Compiler --> glsl_es_100[GLSL ES 1.00]
+    glsl_es_100 -- Shader Archiver --> gles_shader_archive[OpenGL ES Shader Archive]
+
+    spirv -- Reflector --> cxx_sources[C++ Sources]
+    cxx_sources -- Ninja Build --> cxx_library[C++ Library]
+
+    vulkan_shader_archive -- Multi Arch Archiver --> multi_arch_archive[Multi Architecture Archive]
+    gles_shader_archive -- Multi Arch Archiver --> multi_arch_archive
+```
 
 ## Try Impeller in Flutter
 
-Impeller is available under the `--enable-impeller` flag on iOS and Android.
-This flag can be specified to `flutter run`.
+Impeller is available under the `--enable-impeller` flag on iOS, Android, and
+macOS Desktop. This flag can be specified to `flutter run`.
 
 If the application needs to be launched with Impeller enabled without using the
 Flutter tool, follow the platform specific steps below.
 
-### iOS
+### iOS and macOS Desktop
 
 To your `Info.plist` file, add under the top-level `<dict>` tag:
 ```
@@ -189,3 +217,6 @@ To your `AndroidManifest.xml` file, add under the `<application>` tag:
 * [Guidance for writing efficient shaders](docs/shader_optimization.md)
 * [How color blending works in Impeller](docs/blending.md)
 * [Enabling Vulkan Validation Layers on Android](docs/android_validation_layers.md)
+* [Important Benchmarks](docs/benchmarks.md)
+* [Threading in the Vulkan Backend](docs/vulkan_threading.md)
+* [Android Rendering Backend Selection](docs/android.md)
diff --git a/impeller/aiks/BUILD.gn b/impeller/aiks/BUILD.gn
index 744e1a9633c25b67c7c3158bd14ab062303a360f..10b0a57c79f5e2b76bc97835df7d92c1c27d6ee3 100644
--- a/impeller/aiks/BUILD.gn
+++ b/impeller/aiks/BUILD.gn
@@ -4,14 +4,26 @@
 
 import("../tools/impeller.gni")
 
+config("impeller_canvas_recorder_config") {
+  defines = [ "IMPELLER_TRACE_CANVAS" ]
+}
+
 impeller_component("aiks") {
   sources = [
     "aiks_context.cc",
     "aiks_context.h",
     "canvas.cc",
     "canvas.h",
+    "canvas_recorder.h",
+    "canvas_type.h",
+    "color_filter.cc",
+    "color_filter.h",
+    "color_source.cc",
+    "color_source.h",
     "image.cc",
     "image.h",
+    "image_filter.cc",
+    "image_filter.h",
     "paint.cc",
     "paint.h",
     "paint_pass_delegate.cc",
@@ -20,6 +32,7 @@ impeller_component("aiks") {
     "picture.h",
     "picture_recorder.cc",
     "picture_recorder.h",
+    "trace_serializer.h",
   ]
 
   public_deps = [
@@ -29,19 +42,112 @@ impeller_component("aiks") {
   ]
 
   deps = [ "//flutter/fml" ]
+
+  if (impeller_trace_canvas) {
+    sources += [ "trace_serializer.cc" ]
+    public_configs = [ ":impeller_canvas_recorder_config" ]
+  }
 }
 
-impeller_component("aiks_unittests") {
+impeller_component("aiks_playground") {
   testonly = true
+
   sources = [
     "aiks_playground.cc",
     "aiks_playground.h",
-    "aiks_unittests.cc",
+    "aiks_playground_inspector.cc",
+    "aiks_playground_inspector.h",
   ]
   deps = [
     ":aiks",
-    "../geometry:geometry_unittests",
     "../playground:playground_test",
-    "//flutter/testing",
+  ]
+  public_deps = [
+    "//flutter/impeller/typographer/backends/skia:typographer_skia_backend",
+  ]
+}
+
+impeller_component("context_spy") {
+  testonly = true
+
+  sources = [
+    "testing/context_mock.h",
+    "testing/context_spy.cc",
+    "testing/context_spy.h",
+  ]
+  deps = [
+    "//flutter/impeller/entity:entity_test_helpers",
+    "//flutter/impeller/renderer",
+    "//flutter/testing:testing_lib",
+  ]
+}
+
+template("aiks_unittests_component") {
+  target_name = invoker.target_name
+  predefined_sources = [
+    "aiks_blur_unittests.cc",
+    "aiks_gradient_unittests.cc",
+    "aiks_path_unittests.cc",
+    "aiks_unittests.cc",
+    "aiks_unittests.h",
+  ]
+  additional_sources = []
+  if (defined(invoker.sources)) {
+    additional_sources = invoker.sources
+  }
+  impeller_component(target_name) {
+    testonly = true
+    if (defined(invoker.defines)) {
+      defines = invoker.defines
+    } else {
+      defines = []
+    }
+    defines += [ "_USE_MATH_DEFINES" ]
+
+    sources = predefined_sources + additional_sources
+    deps = [
+      ":aiks",
+      ":aiks_playground",
+      ":context_spy",
+      "//flutter/impeller/geometry:geometry_asserts",
+      "//flutter/impeller/golden_tests:golden_playground_test",
+      "//flutter/impeller/playground:playground_test",
+      "//flutter/impeller/scene",
+      "//flutter/impeller/typographer/backends/stb:typographer_stb_backend",
+      "//flutter/testing:testing_lib",
+      "//flutter/third_party/txt",
+    ]
+    if (defined(invoker.public_configs)) {
+      public_configs = invoker.public_configs
+    }
+  }
+}
+
+aiks_unittests_component("aiks_unittests") {
+  sources = [
+    "canvas_recorder_unittests.cc",
+    "canvas_unittests.cc",
+    "trace_serializer_unittests.cc",
+  ]
+
+  if (!impeller_trace_canvas) {
+    sources += [ "trace_serializer.cc" ]
+    public_configs = [ ":impeller_canvas_recorder_config" ]
+  }
+}
+
+aiks_unittests_component("aiks_unittests_golden") {
+  defines = [
+    "IMPELLER_GOLDEN_TESTS",
+    "IMPELLER_ENABLE_VALIDATION=1",
+  ]
+}
+
+executable("canvas_benchmarks") {
+  testonly = true
+  sources = [ "canvas_benchmarks.cc" ]
+  deps = [
+    ":aiks",
+    "//flutter/benchmarking",
   ]
 }
diff --git a/impeller/aiks/aiks_blur_unittests.cc b/impeller/aiks/aiks_blur_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..09e6e188a880164963ddf8d5739fce2b52bd1ab1
--- /dev/null
+++ b/impeller/aiks/aiks_blur_unittests.cc
@@ -0,0 +1,1185 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/impeller/aiks/aiks_unittests.h"
+
+#include "impeller/aiks/canvas.h"
+#include "impeller/entity/contents/filters/gaussian_blur_filter_contents.h"
+#include "impeller/entity/render_target_cache.h"
+#include "impeller/geometry/path_builder.h"
+#include "impeller/playground/widgets.h"
+#include "impeller/renderer/testing/mocks.h"
+#include "third_party/imgui/imgui.h"
+
+////////////////////////////////////////////////////////////////////////////////
+// This is for tests of Canvas that are interested the results of rendering
+// blurs.
+////////////////////////////////////////////////////////////////////////////////
+
+namespace impeller {
+namespace testing {
+
+TEST_P(AiksTest, CanRenderMaskBlurHugeSigma) {
+  Canvas canvas;
+  canvas.DrawCircle({400, 400}, 300,
+                    {.color = Color::Green(),
+                     .mask_blur_descriptor = Paint::MaskBlurDescriptor{
+                         .style = FilterContents::BlurStyle::kNormal,
+                         .sigma = Sigma(99999),
+                     }});
+  canvas.Restore();
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, CanRenderForegroundBlendWithMaskBlur) {
+  // This case triggers the ForegroundPorterDuffBlend path. The color filter
+  // should apply to the color only, and respect the alpha mask.
+  Canvas canvas;
+  canvas.ClipRect(Rect::MakeXYWH(100, 150, 400, 400));
+  canvas.DrawCircle({400, 400}, 200,
+                    {
+                        .color = Color::White(),
+                        .color_filter = ColorFilter::MakeBlend(
+                            BlendMode::kSource, Color::Green()),
+                        .mask_blur_descriptor =
+                            Paint::MaskBlurDescriptor{
+                                .style = FilterContents::BlurStyle::kNormal,
+                                .sigma = Radius(20),
+                            },
+                    });
+  canvas.Restore();
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, CanRenderForegroundAdvancedBlendWithMaskBlur) {
+  // This case triggers the ForegroundAdvancedBlend path. The color filter
+  // should apply to the color only, and respect the alpha mask.
+  Canvas canvas;
+  canvas.ClipRect(Rect::MakeXYWH(100, 150, 400, 400));
+  canvas.DrawCircle({400, 400}, 200,
+                    {
+                        .color = Color::Grey(),
+                        .color_filter = ColorFilter::MakeBlend(
+                            BlendMode::kColor, Color::Green()),
+                        .mask_blur_descriptor =
+                            Paint::MaskBlurDescriptor{
+                                .style = FilterContents::BlurStyle::kNormal,
+                                .sigma = Radius(20),
+                            },
+                    });
+  canvas.Restore();
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, CanRenderBackdropBlurInteractive) {
+  auto callback = [&](AiksContext& renderer) -> std::optional<Picture> {
+    static PlaygroundPoint point_a(Point(50, 50), 30, Color::White());
+    static PlaygroundPoint point_b(Point(300, 200), 30, Color::White());
+    auto [a, b] = DrawPlaygroundLine(point_a, point_b);
+
+    Canvas canvas;
+    canvas.DrawCircle({100, 100}, 50, {.color = Color::CornflowerBlue()});
+    canvas.DrawCircle({300, 200}, 100, {.color = Color::GreenYellow()});
+    canvas.DrawCircle({140, 170}, 75, {.color = Color::DarkMagenta()});
+    canvas.DrawCircle({180, 120}, 100, {.color = Color::OrangeRed()});
+    canvas.ClipRRect(Rect::MakeLTRB(a.x, a.y, b.x, b.y), {20, 20});
+    canvas.SaveLayer({.blend_mode = BlendMode::kSource}, std::nullopt,
+                     ImageFilter::MakeBlur(Sigma(20.0), Sigma(20.0),
+                                           FilterContents::BlurStyle::kNormal,
+                                           Entity::TileMode::kClamp));
+    canvas.Restore();
+
+    return canvas.EndRecordingAsPicture();
+  };
+
+  ASSERT_TRUE(OpenPlaygroundHere(callback));
+}
+
+TEST_P(AiksTest, CanRenderBackdropBlur) {
+  Canvas canvas;
+  canvas.DrawCircle({100, 100}, 50, {.color = Color::CornflowerBlue()});
+  canvas.DrawCircle({300, 200}, 100, {.color = Color::GreenYellow()});
+  canvas.DrawCircle({140, 170}, 75, {.color = Color::DarkMagenta()});
+  canvas.DrawCircle({180, 120}, 100, {.color = Color::OrangeRed()});
+  canvas.ClipRRect(Rect::MakeLTRB(75, 50, 375, 275), {20, 20});
+  canvas.SaveLayer({.blend_mode = BlendMode::kSource}, std::nullopt,
+                   ImageFilter::MakeBlur(Sigma(30.0), Sigma(30.0),
+                                         FilterContents::BlurStyle::kNormal,
+                                         Entity::TileMode::kClamp));
+  canvas.Restore();
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, CanRenderBackdropBlurHugeSigma) {
+  Canvas canvas;
+  canvas.DrawCircle({400, 400}, 300, {.color = Color::Green()});
+  canvas.SaveLayer({.blend_mode = BlendMode::kSource}, std::nullopt,
+                   ImageFilter::MakeBlur(Sigma(999999), Sigma(999999),
+                                         FilterContents::BlurStyle::kNormal,
+                                         Entity::TileMode::kClamp));
+  canvas.Restore();
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, CanRenderClippedBlur) {
+  Canvas canvas;
+  canvas.ClipRect(Rect::MakeXYWH(100, 150, 400, 400));
+  canvas.DrawCircle(
+      {400, 400}, 200,
+      {
+          .color = Color::Green(),
+          .image_filter = ImageFilter::MakeBlur(
+              Sigma(20.0), Sigma(20.0), FilterContents::BlurStyle::kNormal,
+              Entity::TileMode::kDecal),
+      });
+  canvas.Restore();
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, ClippedBlurFilterRendersCorrectlyInteractive) {
+  auto callback = [&](AiksContext& renderer) -> std::optional<Picture> {
+    static PlaygroundPoint playground_point(Point(400, 400), 20,
+                                            Color::Green());
+    auto point = DrawPlaygroundPoint(playground_point);
+
+    Canvas canvas;
+    canvas.Translate(point - Point(400, 400));
+    Paint paint;
+    paint.mask_blur_descriptor = Paint::MaskBlurDescriptor{
+        .style = FilterContents::BlurStyle::kNormal,
+        .sigma = Radius{120 * 3},
+    };
+    paint.color = Color::Red();
+    PathBuilder builder{};
+    builder.AddRect(Rect::MakeLTRB(0, 0, 800, 800));
+    canvas.DrawPath(builder.TakePath(), paint);
+    return canvas.EndRecordingAsPicture();
+  };
+  ASSERT_TRUE(OpenPlaygroundHere(callback));
+}
+
+TEST_P(AiksTest, ClippedBlurFilterRendersCorrectly) {
+  Canvas canvas;
+  canvas.Translate(Point(0, -400));
+  Paint paint;
+  paint.mask_blur_descriptor = Paint::MaskBlurDescriptor{
+      .style = FilterContents::BlurStyle::kNormal,
+      .sigma = Radius{120 * 3},
+  };
+  paint.color = Color::Red();
+  PathBuilder builder{};
+  builder.AddRect(Rect::MakeLTRB(0, 0, 800, 800));
+  canvas.DrawPath(builder.TakePath(), paint);
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, ClearBlendWithBlur) {
+  Canvas canvas;
+  Paint white;
+  white.color = Color::Blue();
+  canvas.DrawRect(Rect::MakeXYWH(0, 0, 600.0, 600.0), white);
+
+  Paint clear;
+  clear.blend_mode = BlendMode::kClear;
+  clear.mask_blur_descriptor = Paint::MaskBlurDescriptor{
+      .style = FilterContents::BlurStyle::kNormal,
+      .sigma = Sigma(20),
+  };
+
+  canvas.DrawCircle(Point::MakeXY(300.0, 300.0), 200.0, clear);
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, BlurHasNoEdge) {
+  Canvas canvas;
+  canvas.Scale(GetContentScale());
+  canvas.DrawPaint({});
+  Paint blur = {
+      .color = Color::Green(),
+      .mask_blur_descriptor =
+          Paint::MaskBlurDescriptor{
+              .style = FilterContents::BlurStyle::kNormal,
+              .sigma = Sigma(47.6),
+          },
+  };
+  canvas.DrawRect(Rect::MakeXYWH(300, 300, 200, 200), blur);
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, BlurredRectangleWithShader) {
+  Canvas canvas;
+  canvas.Scale(GetContentScale());
+
+  auto paint_lines = [&canvas](Scalar dx, Scalar dy, Paint paint) {
+    auto draw_line = [&canvas, &paint](Point a, Point b) {
+      canvas.DrawPath(PathBuilder{}.AddLine(a, b).TakePath(), paint);
+    };
+    paint.stroke_width = 5;
+    paint.style = Paint::Style::kStroke;
+    draw_line(Point(dx + 100, dy + 100), Point(dx + 200, dy + 200));
+    draw_line(Point(dx + 100, dy + 200), Point(dx + 200, dy + 100));
+    draw_line(Point(dx + 150, dy + 100), Point(dx + 200, dy + 150));
+    draw_line(Point(dx + 100, dy + 150), Point(dx + 150, dy + 200));
+  };
+
+  AiksContext renderer(GetContext(), nullptr);
+  Canvas recorder_canvas;
+  for (int x = 0; x < 5; ++x) {
+    for (int y = 0; y < 5; ++y) {
+      Rect rect = Rect::MakeXYWH(x * 20, y * 20, 20, 20);
+      Paint paint{.color =
+                      ((x + y) & 1) == 0 ? Color::Yellow() : Color::Blue()};
+      recorder_canvas.DrawRect(rect, paint);
+    }
+  }
+  Picture picture = recorder_canvas.EndRecordingAsPicture();
+  std::shared_ptr<Texture> texture =
+      picture.ToImage(renderer, ISize{100, 100})->GetTexture();
+
+  ColorSource image_source = ColorSource::MakeImage(
+      texture, Entity::TileMode::kRepeat, Entity::TileMode::kRepeat, {}, {});
+  std::shared_ptr<ImageFilter> blur_filter = ImageFilter::MakeBlur(
+      Sigma(5), Sigma(5), FilterContents::BlurStyle::kNormal,
+      Entity::TileMode::kDecal);
+  canvas.DrawRect(Rect::MakeLTRB(0, 0, 300, 600),
+                  Paint{.color = Color::DarkGreen()});
+  canvas.DrawRect(Rect::MakeLTRB(100, 100, 200, 200),
+                  Paint{.color_source = image_source});
+  canvas.DrawRect(Rect::MakeLTRB(300, 0, 600, 600),
+                  Paint{.color = Color::Red()});
+  canvas.DrawRect(
+      Rect::MakeLTRB(400, 100, 500, 200),
+      Paint{.color_source = image_source, .image_filter = blur_filter});
+  paint_lines(0, 300, Paint{.color_source = image_source});
+  paint_lines(300, 300,
+              Paint{.color_source = image_source, .image_filter = blur_filter});
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, MaskBlurWithZeroSigmaIsSkipped) {
+  Canvas canvas;
+
+  Paint paint = {
+      .color = Color::Blue(),
+      .mask_blur_descriptor =
+          Paint::MaskBlurDescriptor{
+              .style = FilterContents::BlurStyle::kNormal,
+              .sigma = Sigma(0),
+          },
+  };
+
+  canvas.DrawCircle({300, 300}, 200, paint);
+  canvas.DrawRect(Rect::MakeLTRB(100, 300, 500, 600), paint);
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+struct MaskBlurTestConfig {
+  FilterContents::BlurStyle style = FilterContents::BlurStyle::kNormal;
+  Scalar sigma = 1.0f;
+  Scalar alpha = 1.0f;
+  std::shared_ptr<ImageFilter> image_filter;
+  bool invert_colors = false;
+  BlendMode blend_mode = BlendMode::kSourceOver;
+};
+
+static Picture MaskBlurVariantTest(const AiksTest& test_context,
+                                   const MaskBlurTestConfig& config) {
+  Canvas canvas;
+  canvas.Scale(test_context.GetContentScale());
+  canvas.Scale(Vector2{0.8f, 0.8f});
+  Paint paint;
+  paint.mask_blur_descriptor = Paint::MaskBlurDescriptor{
+      .style = FilterContents::BlurStyle::kNormal,
+      .sigma = Sigma{1},
+  };
+
+  canvas.DrawPaint({.color = Color::AntiqueWhite()});
+
+  paint.mask_blur_descriptor->style = config.style;
+  paint.mask_blur_descriptor->sigma = Sigma{config.sigma};
+  paint.image_filter = config.image_filter;
+  paint.invert_colors = config.invert_colors;
+  paint.blend_mode = config.blend_mode;
+
+  const Scalar x = 50;
+  const Scalar radius = 20.0f;
+  const Scalar y_spacing = 100.0f;
+
+  Scalar y = 50;
+  paint.color = Color::Crimson().WithAlpha(config.alpha);
+  canvas.DrawRect(Rect::MakeXYWH(x + 25 - radius / 2, y + radius / 2,  //
+                                 radius, 60.0f - radius),
+                  paint);
+
+  y += y_spacing;
+  paint.color = Color::Blue().WithAlpha(config.alpha);
+  canvas.DrawCircle({x + 25, y + 25}, radius, paint);
+
+  y += y_spacing;
+  paint.color = Color::Green().WithAlpha(config.alpha);
+  canvas.DrawOval(Rect::MakeXYWH(x + 25 - radius / 2, y + radius / 2,  //
+                                 radius, 60.0f - radius),
+                  paint);
+
+  y += y_spacing;
+  paint.color = Color::Purple().WithAlpha(config.alpha);
+  canvas.DrawRRect(Rect::MakeXYWH(x, y, 60.0f, 60.0f),  //
+                   {radius, radius},                    //
+                   paint);
+
+  y += y_spacing;
+  paint.color = Color::Orange().WithAlpha(config.alpha);
+  canvas.DrawRRect(Rect::MakeXYWH(x, y, 60.0f, 60.0f),  //
+                   {radius, 5.0f}, paint);
+
+  y += y_spacing;
+  paint.color = Color::Maroon().WithAlpha(config.alpha);
+  canvas.DrawPath(PathBuilder{}
+                      .MoveTo({x + 0, y + 60})
+                      .LineTo({x + 30, y + 0})
+                      .LineTo({x + 60, y + 60})
+                      .Close()
+                      .TakePath(),
+                  paint);
+
+  y += y_spacing;
+  paint.color = Color::Maroon().WithAlpha(config.alpha);
+  canvas.DrawPath(PathBuilder{}
+                      .AddArc(Rect::MakeXYWH(x + 5, y, 50, 50),
+                              Radians{kPi / 2}, Radians{kPi})
+                      .AddArc(Rect::MakeXYWH(x + 25, y, 50, 50),
+                              Radians{kPi / 2}, Radians{kPi})
+                      .Close()
+                      .TakePath(),
+                  paint);
+
+  return canvas.EndRecordingAsPicture();
+}
+
+static const std::map<std::string, MaskBlurTestConfig> kPaintVariations = {
+    // 1. Normal style, translucent, zero sigma.
+    {"NormalTranslucentZeroSigma",
+     {.style = FilterContents::BlurStyle::kNormal,
+      .sigma = 0.0f,
+      .alpha = 0.5f}},
+    // 2. Normal style, translucent.
+    {"NormalTranslucent",
+     {.style = FilterContents::BlurStyle::kNormal,
+      .sigma = 8.0f,
+      .alpha = 0.5f}},
+    // 3. Solid style, translucent.
+    {"SolidTranslucent",
+     {.style = FilterContents::BlurStyle::kSolid,
+      .sigma = 8.0f,
+      .alpha = 0.5f}},
+    // 4. Solid style, opaque.
+    {"SolidOpaque",
+     {.style = FilterContents::BlurStyle::kSolid, .sigma = 8.0f}},
+    // 5. Solid style, translucent, color & image filtered.
+    {"SolidTranslucentWithFilters",
+     {.style = FilterContents::BlurStyle::kSolid,
+      .sigma = 8.0f,
+      .alpha = 0.5f,
+      .image_filter = ImageFilter::MakeBlur(Sigma{3},
+                                            Sigma{3},
+                                            FilterContents::BlurStyle::kNormal,
+                                            Entity::TileMode::kClamp),
+      .invert_colors = true}},
+    // 6. Solid style, translucent, exclusion blended.
+    {"SolidTranslucentExclusionBlend",
+     {.style = FilterContents::BlurStyle::kSolid,
+      .sigma = 8.0f,
+      .alpha = 0.5f,
+      .blend_mode = BlendMode::kExclusion}},
+    // 7. Inner style, translucent.
+    {"InnerTranslucent",
+     {.style = FilterContents::BlurStyle::kInner,
+      .sigma = 8.0f,
+      .alpha = 0.5f}},
+    // 8. Inner style, translucent, blurred.
+    {"InnerTranslucentWithBlurImageFilter",
+     {.style = FilterContents::BlurStyle::kInner,
+      .sigma = 8.0f,
+      .alpha = 0.5f,
+      .image_filter = ImageFilter::MakeBlur(Sigma{3},
+                                            Sigma{3},
+                                            FilterContents::BlurStyle::kNormal,
+                                            Entity::TileMode::kClamp)}},
+    // 9. Outer style, translucent.
+    {"OuterTranslucent",
+     {.style = FilterContents::BlurStyle::kOuter,
+      .sigma = 8.0f,
+      .alpha = 0.5f}},
+    // 10. Outer style, opaque, image filtered.
+    {"OuterOpaqueWithBlurImageFilter",
+     {.style = FilterContents::BlurStyle::kOuter,
+      .sigma = 8.0f,
+      .image_filter = ImageFilter::MakeBlur(Sigma{3},
+                                            Sigma{3},
+                                            FilterContents::BlurStyle::kNormal,
+                                            Entity::TileMode::kClamp)}},
+};
+
+#define MASK_BLUR_VARIANT_TEST(config)                              \
+  TEST_P(AiksTest, MaskBlurVariantTest##config) {                   \
+    ASSERT_TRUE(OpenPlaygroundHere(                                 \
+        MaskBlurVariantTest(*this, kPaintVariations.at(#config)))); \
+  }
+
+MASK_BLUR_VARIANT_TEST(NormalTranslucentZeroSigma)
+MASK_BLUR_VARIANT_TEST(NormalTranslucent)
+MASK_BLUR_VARIANT_TEST(SolidTranslucent)
+MASK_BLUR_VARIANT_TEST(SolidOpaque)
+MASK_BLUR_VARIANT_TEST(SolidTranslucentWithFilters)
+MASK_BLUR_VARIANT_TEST(SolidTranslucentExclusionBlend)
+MASK_BLUR_VARIANT_TEST(InnerTranslucent)
+MASK_BLUR_VARIANT_TEST(InnerTranslucentWithBlurImageFilter)
+MASK_BLUR_VARIANT_TEST(OuterTranslucent)
+MASK_BLUR_VARIANT_TEST(OuterOpaqueWithBlurImageFilter)
+
+#undef MASK_BLUR_VARIANT_TEST
+
+TEST_P(AiksTest, GaussianBlurAtPeripheryVertical) {
+  Canvas canvas;
+
+  canvas.Scale(GetContentScale());
+  canvas.DrawRRect(Rect::MakeLTRB(0, 0, GetWindowSize().width, 100),
+                   Size(10, 10), Paint{.color = Color::LimeGreen()});
+  canvas.DrawRRect(Rect::MakeLTRB(0, 110, GetWindowSize().width, 210),
+                   Size(10, 10), Paint{.color = Color::Magenta()});
+  canvas.ClipRect(Rect::MakeLTRB(100, 0, 200, GetWindowSize().height));
+  canvas.SaveLayer({.blend_mode = BlendMode::kSource}, std::nullopt,
+                   ImageFilter::MakeBlur(Sigma(20.0), Sigma(20.0),
+                                         FilterContents::BlurStyle::kNormal,
+                                         Entity::TileMode::kClamp));
+  canvas.Restore();
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, GaussianBlurAtPeripheryHorizontal) {
+  Canvas canvas;
+
+  canvas.Scale(GetContentScale());
+  std::shared_ptr<Texture> boston = CreateTextureForFixture("boston.jpg");
+  canvas.DrawImageRect(
+      std::make_shared<Image>(boston),
+      Rect::MakeXYWH(0, 0, boston->GetSize().width, boston->GetSize().height),
+      Rect::MakeLTRB(0, 0, GetWindowSize().width, 100), Paint{});
+  canvas.DrawRRect(Rect::MakeLTRB(0, 110, GetWindowSize().width, 210),
+                   Size(10, 10), Paint{.color = Color::Magenta()});
+  canvas.ClipRect(Rect::MakeLTRB(0, 50, GetWindowSize().width, 150));
+  canvas.SaveLayer({.blend_mode = BlendMode::kSource}, std::nullopt,
+                   ImageFilter::MakeBlur(Sigma(20.0), Sigma(20.0),
+                                         FilterContents::BlurStyle::kNormal,
+                                         Entity::TileMode::kClamp));
+  canvas.Restore();
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+#define FLT_FORWARD(mock, real, method) \
+  EXPECT_CALL(*mock, method())          \
+      .WillRepeatedly(::testing::Return(real->method()));
+
+TEST_P(AiksTest, GaussianBlurWithoutDecalSupport) {
+  if (GetParam() != PlaygroundBackend::kMetal) {
+    GTEST_SKIP_(
+        "This backend doesn't yet support setting device capabilities.");
+  }
+  if (!WillRenderSomething()) {
+    // Sometimes these tests are run without playgrounds enabled which is
+    // pointless for this test since we are asserting that
+    // `SupportsDecalSamplerAddressMode` is called.
+    GTEST_SKIP_("This test requires playgrounds.");
+  }
+
+  std::shared_ptr<const Capabilities> old_capabilities =
+      GetContext()->GetCapabilities();
+  auto mock_capabilities = std::make_shared<MockCapabilities>();
+  EXPECT_CALL(*mock_capabilities, SupportsDecalSamplerAddressMode())
+      .Times(::testing::AtLeast(1))
+      .WillRepeatedly(::testing::Return(false));
+  FLT_FORWARD(mock_capabilities, old_capabilities, GetDefaultColorFormat);
+  FLT_FORWARD(mock_capabilities, old_capabilities, GetDefaultStencilFormat);
+  FLT_FORWARD(mock_capabilities, old_capabilities,
+              GetDefaultDepthStencilFormat);
+  FLT_FORWARD(mock_capabilities, old_capabilities, SupportsOffscreenMSAA);
+  FLT_FORWARD(mock_capabilities, old_capabilities,
+              SupportsImplicitResolvingMSAA);
+  FLT_FORWARD(mock_capabilities, old_capabilities, SupportsReadFromResolve);
+  FLT_FORWARD(mock_capabilities, old_capabilities, SupportsFramebufferFetch);
+  FLT_FORWARD(mock_capabilities, old_capabilities, SupportsSSBO);
+  FLT_FORWARD(mock_capabilities, old_capabilities, SupportsCompute);
+  FLT_FORWARD(mock_capabilities, old_capabilities,
+              SupportsTextureToTextureBlits);
+  FLT_FORWARD(mock_capabilities, old_capabilities, GetDefaultGlyphAtlasFormat);
+  ASSERT_TRUE(SetCapabilities(mock_capabilities).ok());
+
+  auto texture = std::make_shared<Image>(CreateTextureForFixture("boston.jpg"));
+  Canvas canvas;
+  canvas.Scale(GetContentScale() * 0.5);
+  canvas.DrawPaint({.color = Color::Black()});
+  canvas.DrawImage(
+      texture, Point(200, 200),
+      {
+          .image_filter = ImageFilter::MakeBlur(
+              Sigma(20.0), Sigma(20.0), FilterContents::BlurStyle::kNormal,
+              Entity::TileMode::kDecal),
+      });
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, GaussianBlurOneDimension) {
+  Canvas canvas;
+
+  canvas.Scale(GetContentScale());
+  canvas.Scale({0.5, 0.5, 1.0});
+  std::shared_ptr<Texture> boston = CreateTextureForFixture("boston.jpg");
+  canvas.DrawImage(std::make_shared<Image>(boston), Point(100, 100), Paint{});
+  canvas.SaveLayer({.blend_mode = BlendMode::kSource}, std::nullopt,
+                   ImageFilter::MakeBlur(Sigma(50.0), Sigma(0.0),
+                                         FilterContents::BlurStyle::kNormal,
+                                         Entity::TileMode::kClamp));
+  canvas.Restore();
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+// Smoketest to catch issues with the coverage hint.
+// Draws a rotated blurred image within a rectangle clip. The center of the clip
+// rectangle is the center of the rotated image. The entire area of the clip
+// rectangle should be filled with opaque colors output by the blur.
+TEST_P(AiksTest, GaussianBlurRotatedAndClipped) {
+  Canvas canvas;
+  std::shared_ptr<Texture> boston = CreateTextureForFixture("boston.jpg");
+  Rect bounds =
+      Rect::MakeXYWH(0, 0, boston->GetSize().width, boston->GetSize().height);
+  Vector2 image_center = Vector2(bounds.GetSize() / 2);
+  Paint paint = {.image_filter =
+                     ImageFilter::MakeBlur(Sigma(20.0), Sigma(20.0),
+                                           FilterContents::BlurStyle::kNormal,
+                                           Entity::TileMode::kDecal)};
+  Vector2 clip_size = {150, 75};
+  Vector2 center = Vector2(1024, 768) / 2;
+  canvas.Scale(GetContentScale());
+  canvas.ClipRect(
+      Rect::MakeLTRB(center.x, center.y, center.x, center.y).Expand(clip_size));
+  canvas.Translate({center.x, center.y, 0});
+  canvas.Scale({0.6, 0.6, 1});
+  canvas.Rotate(Degrees(25));
+
+  canvas.DrawImageRect(std::make_shared<Image>(boston), /*source=*/bounds,
+                       /*dest=*/bounds.Shift(-image_center), paint);
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, GaussianBlurScaledAndClipped) {
+  Canvas canvas;
+  std::shared_ptr<Texture> boston = CreateTextureForFixture("boston.jpg");
+  Rect bounds =
+      Rect::MakeXYWH(0, 0, boston->GetSize().width, boston->GetSize().height);
+  Vector2 image_center = Vector2(bounds.GetSize() / 2);
+  Paint paint = {.image_filter =
+                     ImageFilter::MakeBlur(Sigma(20.0), Sigma(20.0),
+                                           FilterContents::BlurStyle::kNormal,
+                                           Entity::TileMode::kDecal)};
+  Vector2 clip_size = {150, 75};
+  Vector2 center = Vector2(1024, 768) / 2;
+  canvas.Scale(GetContentScale());
+  canvas.ClipRect(
+      Rect::MakeLTRB(center.x, center.y, center.x, center.y).Expand(clip_size));
+  canvas.Translate({center.x, center.y, 0});
+  canvas.Scale({0.6, 0.6, 1});
+
+  canvas.DrawImageRect(std::make_shared<Image>(boston), /*source=*/bounds,
+                       /*dest=*/bounds.Shift(-image_center), paint);
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, GaussianBlurRotatedAndClippedInteractive) {
+  std::shared_ptr<Texture> boston = CreateTextureForFixture("boston.jpg");
+
+  auto callback = [&](AiksContext& renderer) -> std::optional<Picture> {
+    const char* tile_mode_names[] = {"Clamp", "Repeat", "Mirror", "Decal"};
+    const Entity::TileMode tile_modes[] = {
+        Entity::TileMode::kClamp, Entity::TileMode::kRepeat,
+        Entity::TileMode::kMirror, Entity::TileMode::kDecal};
+
+    static float rotation = 0;
+    static float scale = 0.6;
+    static int selected_tile_mode = 3;
+
+    if (AiksTest::ImGuiBegin("Controls", nullptr,
+                             ImGuiWindowFlags_AlwaysAutoResize)) {
+      ImGui::SliderFloat("Rotation (degrees)", &rotation, -180, 180);
+      ImGui::SliderFloat("Scale", &scale, 0, 2.0);
+      ImGui::Combo("Tile mode", &selected_tile_mode, tile_mode_names,
+                   sizeof(tile_mode_names) / sizeof(char*));
+      ImGui::End();
+    }
+
+    Canvas canvas;
+    Rect bounds =
+        Rect::MakeXYWH(0, 0, boston->GetSize().width, boston->GetSize().height);
+    Vector2 image_center = Vector2(bounds.GetSize() / 2);
+    Paint paint = {.image_filter =
+                       ImageFilter::MakeBlur(Sigma(20.0), Sigma(20.0),
+                                             FilterContents::BlurStyle::kNormal,
+                                             tile_modes[selected_tile_mode])};
+    static PlaygroundPoint point_a(Point(362, 309), 20, Color::Red());
+    static PlaygroundPoint point_b(Point(662, 459), 20, Color::Red());
+    auto [handle_a, handle_b] = DrawPlaygroundLine(point_a, point_b);
+    Vector2 center = Vector2(1024, 768) / 2;
+    canvas.Scale(GetContentScale());
+    canvas.ClipRect(
+        Rect::MakeLTRB(handle_a.x, handle_a.y, handle_b.x, handle_b.y));
+    canvas.Translate({center.x, center.y, 0});
+    canvas.Scale({scale, scale, 1});
+    canvas.Rotate(Degrees(rotation));
+
+    canvas.DrawImageRect(std::make_shared<Image>(boston), /*source=*/bounds,
+                         /*dest=*/bounds.Shift(-image_center), paint);
+    return canvas.EndRecordingAsPicture();
+  };
+
+  ASSERT_TRUE(OpenPlaygroundHere(callback));
+}
+
+// This addresses a bug where tiny blurs could result in mip maps that beyond
+// the limits for the textures used for blurring.
+// See also: b/323402168
+TEST_P(AiksTest, GaussianBlurSolidColorTinyMipMap) {
+  for (int32_t i = 1; i < 5; ++i) {
+    Canvas canvas;
+    Scalar fi = i;
+    canvas.DrawPath(
+        PathBuilder{}
+            .MoveTo({100, 100})
+            .LineTo({100.f + fi, 100.f + fi})
+            .TakePath(),
+        {.color = Color::Chartreuse(),
+         .image_filter = ImageFilter::MakeBlur(
+             Sigma(0.1), Sigma(0.1), FilterContents::BlurStyle::kNormal,
+             Entity::TileMode::kClamp)});
+
+    Picture picture = canvas.EndRecordingAsPicture();
+    std::shared_ptr<RenderTargetCache> cache =
+        std::make_shared<RenderTargetCache>(
+            GetContext()->GetResourceAllocator());
+    AiksContext aiks_context(GetContext(), nullptr, cache);
+    std::shared_ptr<Image> image = picture.ToImage(aiks_context, {1024, 768});
+    EXPECT_TRUE(image) << " length " << i;
+  }
+}
+
+// This addresses a bug where tiny blurs could result in mip maps that beyond
+// the limits for the textures used for blurring.
+// See also: b/323402168
+TEST_P(AiksTest, GaussianBlurBackdropTinyMipMap) {
+  for (int32_t i = 0; i < 5; ++i) {
+    Canvas canvas;
+    ISize clip_size = ISize(i, i);
+    canvas.ClipRect(
+        Rect::MakeXYWH(400, 400, clip_size.width, clip_size.height));
+    canvas.DrawCircle(
+        {400, 400}, 200,
+        {
+            .color = Color::Green(),
+            .image_filter = ImageFilter::MakeBlur(
+                Sigma(0.1), Sigma(0.1), FilterContents::BlurStyle::kNormal,
+                Entity::TileMode::kDecal),
+        });
+    canvas.Restore();
+
+    Picture picture = canvas.EndRecordingAsPicture();
+    std::shared_ptr<RenderTargetCache> cache =
+        std::make_shared<RenderTargetCache>(
+            GetContext()->GetResourceAllocator());
+    AiksContext aiks_context(GetContext(), nullptr, cache);
+    std::shared_ptr<Image> image = picture.ToImage(aiks_context, {1024, 768});
+    EXPECT_TRUE(image) << " clip rect " << i;
+  }
+}
+
+TEST_P(AiksTest, GaussianBlurAnimatedBackdrop) {
+  // This test is for checking out how stable rendering is when content is
+  // translated underneath a blur.  Animating under a blur can cause
+  // *shimmering* to happen as a result of pixel alignment.
+  // See also: https://github.com/flutter/flutter/issues/140193
+  auto boston = std::make_shared<Image>(
+      CreateTextureForFixture("boston.jpg", /*enable_mipmapping=*/true));
+  ASSERT_TRUE(boston);
+  int64_t count = 0;
+  Scalar sigma = 20.0;
+  Scalar freq = 0.1;
+  Scalar amp = 50.0;
+  auto callback = [&](AiksContext& renderer) -> std::optional<Picture> {
+    if (AiksTest::ImGuiBegin("Controls", nullptr,
+                             ImGuiWindowFlags_AlwaysAutoResize)) {
+      ImGui::SliderFloat("Sigma", &sigma, 0, 200);
+      ImGui::SliderFloat("Frequency", &freq, 0.01, 2.0);
+      ImGui::SliderFloat("Amplitude", &amp, 1, 100);
+      ImGui::End();
+    }
+
+    Canvas canvas;
+    canvas.Scale(GetContentScale());
+    Scalar y = amp * sin(freq * 2.0 * M_PI * count / 60);
+    canvas.DrawImage(boston,
+                     Point(1024 / 2 - boston->GetSize().width / 2,
+                           (768 / 2 - boston->GetSize().height / 2) + y),
+                     {});
+    static PlaygroundPoint point_a(Point(100, 100), 20, Color::Red());
+    static PlaygroundPoint point_b(Point(900, 700), 20, Color::Red());
+    auto [handle_a, handle_b] = DrawPlaygroundLine(point_a, point_b);
+    canvas.ClipRect(
+        Rect::MakeLTRB(handle_a.x, handle_a.y, handle_b.x, handle_b.y));
+    canvas.ClipRect(Rect::MakeLTRB(100, 100, 900, 700));
+    canvas.SaveLayer({.blend_mode = BlendMode::kSource}, std::nullopt,
+                     ImageFilter::MakeBlur(Sigma(sigma), Sigma(sigma),
+                                           FilterContents::BlurStyle::kNormal,
+                                           Entity::TileMode::kClamp));
+    count += 1;
+    return canvas.EndRecordingAsPicture();
+  };
+  ASSERT_TRUE(OpenPlaygroundHere(callback));
+}
+
+TEST_P(AiksTest, GaussianBlurStyleInnerGradient) {
+  Canvas canvas;
+  canvas.Scale(GetContentScale());
+
+  canvas.DrawPaint({.color = Color(0.1, 0.1, 0.1, 1.0)});
+
+  std::vector<Color> colors = {Color{0.9568, 0.2627, 0.2118, 1.0},
+                               Color{0.7568, 0.2627, 0.2118, 1.0}};
+  std::vector<Scalar> stops = {0.0, 1.0};
+
+  Paint paint;
+  paint.color_source = ColorSource::MakeLinearGradient(
+      {0, 0}, {200, 200}, std::move(colors), std::move(stops),
+      Entity::TileMode::kMirror, {});
+  paint.mask_blur_descriptor = Paint::MaskBlurDescriptor{
+      .style = FilterContents::BlurStyle::kInner,
+      .sigma = Sigma(30),
+  };
+  canvas.DrawPath(PathBuilder()
+                      .MoveTo({200, 200})
+                      .LineTo({300, 400})
+                      .LineTo({100, 400})
+                      .Close()
+                      .TakePath(),
+                  paint);
+
+  // Draw another thing to make sure the clip area is reset.
+  Paint red;
+  red.color = Color::Red();
+  canvas.DrawRect(Rect::MakeXYWH(0, 0, 200, 200), red);
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, GaussianBlurStyleSolidGradient) {
+  Canvas canvas;
+  canvas.Scale(GetContentScale());
+
+  canvas.DrawPaint({.color = Color(0.1, 0.1, 0.1, 1.0)});
+
+  std::vector<Color> colors = {Color{0.9568, 0.2627, 0.2118, 1.0},
+                               Color{0.7568, 0.2627, 0.2118, 1.0}};
+  std::vector<Scalar> stops = {0.0, 1.0};
+
+  Paint paint;
+  paint.color_source = ColorSource::MakeLinearGradient(
+      {0, 0}, {200, 200}, std::move(colors), std::move(stops),
+      Entity::TileMode::kMirror, {});
+  paint.mask_blur_descriptor = Paint::MaskBlurDescriptor{
+      .style = FilterContents::BlurStyle::kSolid,
+      .sigma = Sigma(30),
+  };
+  canvas.DrawPath(PathBuilder()
+                      .MoveTo({200, 200})
+                      .LineTo({300, 400})
+                      .LineTo({100, 400})
+                      .Close()
+                      .TakePath(),
+                  paint);
+
+  // Draw another thing to make sure the clip area is reset.
+  Paint red;
+  red.color = Color::Red();
+  canvas.DrawRect(Rect::MakeXYWH(0, 0, 200, 200), red);
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, GaussianBlurStyleOuterGradient) {
+  Canvas canvas;
+  canvas.Scale(GetContentScale());
+
+  canvas.DrawPaint({.color = Color(0.1, 0.1, 0.1, 1.0)});
+
+  std::vector<Color> colors = {Color{0.9568, 0.2627, 0.2118, 1.0},
+                               Color{0.7568, 0.2627, 0.2118, 1.0}};
+  std::vector<Scalar> stops = {0.0, 1.0};
+
+  Paint paint;
+  paint.color_source = ColorSource::MakeLinearGradient(
+      {0, 0}, {200, 200}, std::move(colors), std::move(stops),
+      Entity::TileMode::kMirror, {});
+  paint.mask_blur_descriptor = Paint::MaskBlurDescriptor{
+      .style = FilterContents::BlurStyle::kOuter,
+      .sigma = Sigma(30),
+  };
+  canvas.DrawPath(PathBuilder()
+                      .MoveTo({200, 200})
+                      .LineTo({300, 400})
+                      .LineTo({100, 400})
+                      .Close()
+                      .TakePath(),
+                  paint);
+
+  // Draw another thing to make sure the clip area is reset.
+  Paint red;
+  red.color = Color::Red();
+  canvas.DrawRect(Rect::MakeXYWH(0, 0, 200, 200), red);
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, GaussianBlurStyleInner) {
+  Canvas canvas;
+  canvas.Scale(GetContentScale());
+
+  canvas.DrawPaint({.color = Color(0.1, 0.1, 0.1, 1.0)});
+
+  Paint paint;
+  paint.color = Color::Green();
+  paint.mask_blur_descriptor = Paint::MaskBlurDescriptor{
+      .style = FilterContents::BlurStyle::kInner,
+      .sigma = Sigma(30),
+  };
+  canvas.DrawPath(PathBuilder()
+                      .MoveTo({200, 200})
+                      .LineTo({300, 400})
+                      .LineTo({100, 400})
+                      .Close()
+                      .TakePath(),
+                  paint);
+
+  // Draw another thing to make sure the clip area is reset.
+  Paint red;
+  red.color = Color::Red();
+  canvas.DrawRect(Rect::MakeXYWH(0, 0, 200, 200), red);
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, GaussianBlurStyleOuter) {
+  Canvas canvas;
+  canvas.Scale(GetContentScale());
+
+  canvas.DrawPaint({.color = Color(0.1, 0.1, 0.1, 1.0)});
+
+  Paint paint;
+  paint.color = Color::Green();
+  paint.mask_blur_descriptor = Paint::MaskBlurDescriptor{
+      .style = FilterContents::BlurStyle::kOuter,
+      .sigma = Sigma(30),
+  };
+  canvas.DrawPath(PathBuilder()
+                      .MoveTo({200, 200})
+                      .LineTo({300, 400})
+                      .LineTo({100, 400})
+                      .Close()
+                      .TakePath(),
+                  paint);
+
+  // Draw another thing to make sure the clip area is reset.
+  Paint red;
+  red.color = Color::Red();
+  canvas.DrawRect(Rect::MakeXYWH(0, 0, 200, 200), red);
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, GaussianBlurStyleSolid) {
+  Canvas canvas;
+  canvas.Scale(GetContentScale());
+
+  canvas.DrawPaint({.color = Color(0.1, 0.1, 0.1, 1.0)});
+
+  Paint paint;
+  paint.color = Color::Green();
+  paint.mask_blur_descriptor = Paint::MaskBlurDescriptor{
+      .style = FilterContents::BlurStyle::kSolid,
+      .sigma = Sigma(30),
+  };
+  canvas.DrawPath(PathBuilder()
+                      .MoveTo({200, 200})
+                      .LineTo({300, 400})
+                      .LineTo({100, 400})
+                      .Close()
+                      .TakePath(),
+                  paint);
+
+  // Draw another thing to make sure the clip area is reset.
+  Paint red;
+  red.color = Color::Red();
+  canvas.DrawRect(Rect::MakeXYWH(0, 0, 200, 200), red);
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, MaskBlurTexture) {
+  Scalar sigma = 30;
+  auto callback = [&](AiksContext& renderer) -> std::optional<Picture> {
+    if (AiksTest::ImGuiBegin("Controls", nullptr,
+                             ImGuiWindowFlags_AlwaysAutoResize)) {
+      ImGui::SliderFloat("Sigma", &sigma, 0, 500);
+      ImGui::End();
+    }
+    Canvas canvas;
+    canvas.Scale(GetContentScale());
+    Paint paint;
+    paint.color = Color::Green();
+    paint.mask_blur_descriptor = Paint::MaskBlurDescriptor{
+        .style = FilterContents::BlurStyle::kNormal,
+        .sigma = Sigma(sigma),
+    };
+    std::shared_ptr<Texture> boston = CreateTextureForFixture("boston.jpg");
+    canvas.DrawImage(std::make_shared<Image>(boston), {200, 200}, paint);
+    Paint red;
+    red.color = Color::Red();
+    canvas.DrawRect(Rect::MakeXYWH(0, 0, 200, 200), red);
+    return canvas.EndRecordingAsPicture();
+  };
+  ASSERT_TRUE(OpenPlaygroundHere(callback));
+}
+
+TEST_P(AiksTest, GuassianBlurUpdatesMipmapContents) {
+  // This makes sure if mip maps are recycled across invocations of blurs the
+  // contents get updated each frame correctly. If they aren't updated the color
+  // inside the blur and outside the blur will be different.
+  //
+  // If there is some change to render target caching this could display a false
+  // positive in the future.  Also, if the LOD that is rendered is 1 it could
+  // present a false positive.
+  int32_t count = 0;
+  auto callback = [&](AiksContext& renderer) -> std::optional<Picture> {
+    Canvas canvas;
+    if (count++ == 0) {
+      canvas.DrawCircle({100, 100}, 50, {.color = Color::CornflowerBlue()});
+    } else {
+      canvas.DrawCircle({100, 100}, 50, {.color = Color::Chartreuse()});
+    }
+    canvas.ClipRRect(Rect::MakeLTRB(75, 50, 375, 275), {20, 20});
+    canvas.SaveLayer({.blend_mode = BlendMode::kSource}, std::nullopt,
+                     ImageFilter::MakeBlur(Sigma(30.0), Sigma(30.0),
+                                           FilterContents::BlurStyle::kNormal,
+                                           Entity::TileMode::kClamp));
+    canvas.Restore();
+    return canvas.EndRecordingAsPicture();
+  };
+
+  ASSERT_TRUE(OpenPlaygroundHere(callback));
+}
+
+TEST_P(AiksTest, GaussianBlurSetsMipCountOnPass) {
+  Canvas canvas;
+  canvas.DrawCircle({100, 100}, 50, {.color = Color::CornflowerBlue()});
+  canvas.SaveLayer({}, std::nullopt,
+                   ImageFilter::MakeBlur(Sigma(3), Sigma(3),
+                                         FilterContents::BlurStyle::kNormal,
+                                         Entity::TileMode::kClamp));
+  canvas.Restore();
+
+  Picture picture = canvas.EndRecordingAsPicture();
+  EXPECT_EQ(4, picture.pass->GetRequiredMipCount());
+}
+
+TEST_P(AiksTest, GaussianBlurAllocatesCorrectMipCountRenderTarget) {
+  size_t blur_required_mip_count =
+      GetParam() == PlaygroundBackend::kOpenGLES ? 1 : 4;
+
+  Canvas canvas;
+  canvas.DrawCircle({100, 100}, 50, {.color = Color::CornflowerBlue()});
+  canvas.SaveLayer({}, std::nullopt,
+                   ImageFilter::MakeBlur(Sigma(3), Sigma(3),
+                                         FilterContents::BlurStyle::kNormal,
+                                         Entity::TileMode::kClamp));
+  canvas.Restore();
+
+  Picture picture = canvas.EndRecordingAsPicture();
+  std::shared_ptr<RenderTargetCache> cache =
+      std::make_shared<RenderTargetCache>(GetContext()->GetResourceAllocator());
+  AiksContext aiks_context(GetContext(), nullptr, cache);
+  picture.ToImage(aiks_context, {100, 100});
+
+  size_t max_mip_count = 0;
+  for (auto it = cache->GetRenderTargetDataBegin();
+       it != cache->GetRenderTargetDataEnd(); ++it) {
+    max_mip_count = std::max(it->config.mip_count, max_mip_count);
+  }
+  EXPECT_EQ(max_mip_count, blur_required_mip_count);
+}
+
+TEST_P(AiksTest, GaussianBlurMipMapNestedLayer) {
+  fml::testing::LogCapture log_capture;
+  size_t blur_required_mip_count =
+      GetParam() == PlaygroundBackend::kOpenGLES ? 1 : 4;
+
+  Canvas canvas;
+  canvas.DrawPaint({.color = Color::Wheat()});
+  canvas.SaveLayer({.blend_mode = BlendMode::kMultiply});
+  canvas.DrawCircle({100, 100}, 50, {.color = Color::CornflowerBlue()});
+  canvas.SaveLayer({}, std::nullopt,
+                   ImageFilter::MakeBlur(Sigma(30), Sigma(30),
+                                         FilterContents::BlurStyle::kNormal,
+                                         Entity::TileMode::kClamp));
+  canvas.DrawCircle({200, 200}, 50, {.color = Color::Chartreuse()});
+
+  Picture picture = canvas.EndRecordingAsPicture();
+  std::shared_ptr<RenderTargetCache> cache =
+      std::make_shared<RenderTargetCache>(GetContext()->GetResourceAllocator());
+  AiksContext aiks_context(GetContext(), nullptr, cache);
+  picture.ToImage(aiks_context, {100, 100});
+
+  size_t max_mip_count = 0;
+  for (auto it = cache->GetRenderTargetDataBegin();
+       it != cache->GetRenderTargetDataEnd(); ++it) {
+    max_mip_count = std::max(it->config.mip_count, max_mip_count);
+  }
+  EXPECT_EQ(max_mip_count, blur_required_mip_count);
+  // The log is FML_DLOG, so only check in debug builds.
+#ifndef NDEBUG
+  if (GetParam() != PlaygroundBackend::kOpenGLES) {
+    EXPECT_EQ(log_capture.str().find(GaussianBlurFilterContents::kNoMipsError),
+              std::string::npos);
+  } else {
+    EXPECT_NE(log_capture.str().find(GaussianBlurFilterContents::kNoMipsError),
+              std::string::npos);
+  }
+#endif
+}
+
+TEST_P(AiksTest, GaussianBlurMipMapImageFilter) {
+  size_t blur_required_mip_count =
+      GetParam() == PlaygroundBackend::kOpenGLES ? 1 : 4;
+  fml::testing::LogCapture log_capture;
+  Canvas canvas;
+  canvas.SaveLayer(
+      {.image_filter = ImageFilter::MakeBlur(Sigma(30), Sigma(30),
+                                             FilterContents::BlurStyle::kNormal,
+                                             Entity::TileMode::kClamp)});
+  canvas.DrawCircle({200, 200}, 50, {.color = Color::Chartreuse()});
+
+  Picture picture = canvas.EndRecordingAsPicture();
+  std::shared_ptr<RenderTargetCache> cache =
+      std::make_shared<RenderTargetCache>(GetContext()->GetResourceAllocator());
+  AiksContext aiks_context(GetContext(), nullptr, cache);
+  picture.ToImage(aiks_context, {1024, 768});
+
+  size_t max_mip_count = 0;
+  for (auto it = cache->GetRenderTargetDataBegin();
+       it != cache->GetRenderTargetDataEnd(); ++it) {
+    max_mip_count = std::max(it->config.mip_count, max_mip_count);
+  }
+  EXPECT_EQ(max_mip_count, blur_required_mip_count);
+  // The log is FML_DLOG, so only check in debug builds.
+#ifndef NDEBUG
+  if (GetParam() != PlaygroundBackend::kOpenGLES) {
+    EXPECT_EQ(log_capture.str().find(GaussianBlurFilterContents::kNoMipsError),
+              std::string::npos);
+  } else {
+    EXPECT_NE(log_capture.str().find(GaussianBlurFilterContents::kNoMipsError),
+              std::string::npos);
+  }
+#endif
+}
+
+TEST_P(AiksTest, GaussianBlurMipMapSolidColor) {
+  size_t blur_required_mip_count =
+      GetParam() == PlaygroundBackend::kOpenGLES ? 1 : 4;
+  fml::testing::LogCapture log_capture;
+  Canvas canvas;
+  canvas.DrawPath(PathBuilder{}
+                      .MoveTo({100, 100})
+                      .LineTo({200, 100})
+                      .LineTo({150, 200})
+                      .LineTo({50, 200})
+                      .Close()
+                      .TakePath(),
+                  {.color = Color::Chartreuse(),
+                   .image_filter = ImageFilter::MakeBlur(
+                       Sigma(30), Sigma(30), FilterContents::BlurStyle::kNormal,
+                       Entity::TileMode::kClamp)});
+
+  Picture picture = canvas.EndRecordingAsPicture();
+  std::shared_ptr<RenderTargetCache> cache =
+      std::make_shared<RenderTargetCache>(GetContext()->GetResourceAllocator());
+  AiksContext aiks_context(GetContext(), nullptr, cache);
+  picture.ToImage(aiks_context, {1024, 768});
+
+  size_t max_mip_count = 0;
+  for (auto it = cache->GetRenderTargetDataBegin();
+       it != cache->GetRenderTargetDataEnd(); ++it) {
+    max_mip_count = std::max(it->config.mip_count, max_mip_count);
+  }
+  EXPECT_EQ(max_mip_count, blur_required_mip_count);
+  // The log is FML_DLOG, so only check in debug builds.
+#ifndef NDEBUG
+  if (GetParam() != PlaygroundBackend::kOpenGLES) {
+    EXPECT_EQ(log_capture.str().find(GaussianBlurFilterContents::kNoMipsError),
+              std::string::npos);
+  } else {
+    EXPECT_NE(log_capture.str().find(GaussianBlurFilterContents::kNoMipsError),
+              std::string::npos);
+  }
+#endif
+}
+
+TEST_P(AiksTest, MaskBlurDoesntStretchContents) {
+  Scalar sigma = 70;
+  auto callback = [&](AiksContext& renderer) -> std::optional<Picture> {
+    if (AiksTest::ImGuiBegin("Controls", nullptr,
+                             ImGuiWindowFlags_AlwaysAutoResize)) {
+      ImGui::SliderFloat("Sigma", &sigma, 0, 500);
+      ImGui::End();
+    }
+    Canvas canvas;
+    canvas.Scale(GetContentScale());
+    canvas.DrawPaint({.color = Color(0.1, 0.1, 0.1, 1.0)});
+
+    std::shared_ptr<Texture> boston = CreateTextureForFixture("boston.jpg");
+    ColorSource image_source = ColorSource::MakeImage(
+        boston, Entity::TileMode::kRepeat, Entity::TileMode::kRepeat, {}, {});
+
+    canvas.Transform(Matrix::MakeTranslation({100, 100, 0}) *
+                     Matrix::MakeScale({0.5, 0.5, 1.0}));
+    Paint paint = {
+        .color_source = image_source,
+        .mask_blur_descriptor =
+            Paint::MaskBlurDescriptor{
+                .style = FilterContents::BlurStyle::kNormal,
+                .sigma = Sigma(sigma),
+            },
+    };
+    canvas.DrawRect(
+        Rect::MakeXYWH(0, 0, boston->GetSize().width, boston->GetSize().height),
+        paint);
+
+    return canvas.EndRecordingAsPicture();
+  };
+  ASSERT_TRUE(OpenPlaygroundHere(callback));
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/aiks/aiks_context.cc b/impeller/aiks/aiks_context.cc
index fd504cbe03ca3cb646a8fa3f8420e9a0e9dba18f..3be53f953713b418dbba56315b53c9f559475588 100644
--- a/impeller/aiks/aiks_context.cc
+++ b/impeller/aiks/aiks_context.cc
@@ -4,17 +4,26 @@
 
 #include "impeller/aiks/aiks_context.h"
 
+#include "fml/closure.h"
 #include "impeller/aiks/picture.h"
+#include "impeller/typographer/typographer_context.h"
 
 namespace impeller {
 
-AiksContext::AiksContext(std::shared_ptr<Context> context)
+AiksContext::AiksContext(
+    std::shared_ptr<Context> context,
+    std::shared_ptr<TypographerContext> typographer_context,
+    std::optional<std::shared_ptr<RenderTargetAllocator>>
+        render_target_allocator)
     : context_(std::move(context)) {
   if (!context_ || !context_->IsValid()) {
     return;
   }
 
-  content_context_ = std::make_unique<ContentContext>(context_);
+  content_context_ = std::make_unique<ContentContext>(
+      context_, std::move(typographer_context),
+      render_target_allocator.has_value() ? render_target_allocator.value()
+                                          : nullptr);
   if (!content_context_->IsValid()) {
     return;
   }
@@ -32,15 +41,22 @@ std::shared_ptr<Context> AiksContext::GetContext() const {
   return context_;
 }
 
-const ContentContext& AiksContext::GetContentContext() const {
+ContentContext& AiksContext::GetContentContext() const {
   return *content_context_;
 }
 
-bool AiksContext::Render(const Picture& picture, RenderTarget& render_target) {
+bool AiksContext::Render(const Picture& picture,
+                         RenderTarget& render_target,
+                         bool reset_host_buffer) {
   if (!IsValid()) {
     return false;
   }
 
+  fml::ScopedCleanupClosure closure([&]() {
+    if (reset_host_buffer) {
+      content_context_->GetTransientsBuffer().Reset();
+    }
+  });
   if (picture.pass) {
     return picture.pass->Render(*content_context_, render_target);
   }
diff --git a/impeller/aiks/aiks_context.h b/impeller/aiks/aiks_context.h
index d748f3156fcbab07079e4304663c8a378bcbc0a5..5b35b63def700694f0975f4d9b0072b430763e0b 100644
--- a/impeller/aiks/aiks_context.h
+++ b/impeller/aiks/aiks_context.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_AIKS_AIKS_CONTEXT_H_
+#define FLUTTER_IMPELLER_AIKS_AIKS_CONTEXT_H_
 
 #include <memory>
 
@@ -10,15 +11,29 @@
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/renderer/context.h"
 #include "impeller/renderer/render_target.h"
+#include "impeller/typographer/typographer_context.h"
 
 namespace impeller {
 
 struct Picture;
-class RenderPass;
 
 class AiksContext {
  public:
-  AiksContext(std::shared_ptr<Context> context);
+  /// Construct a new AiksContext.
+  ///
+  /// @param context              The Impeller context that Aiks should use for
+  ///                             allocating resources and executing device
+  ///                             commands. Required.
+  /// @param typographer_context  The text backend to use for rendering text. If
+  ///                             `nullptr` is supplied, then attempting to draw
+  ///                             text with Aiks will result in validation
+  ///                             errors.
+  /// @param render_target_allocator Injects a render target allocator or
+  ///                                allocates its own if none is supplied.
+  AiksContext(std::shared_ptr<Context> context,
+              std::shared_ptr<TypographerContext> typographer_context,
+              std::optional<std::shared_ptr<RenderTargetAllocator>>
+                  render_target_allocator = std::nullopt);
 
   ~AiksContext();
 
@@ -26,16 +41,22 @@ class AiksContext {
 
   std::shared_ptr<Context> GetContext() const;
 
-  const ContentContext& GetContentContext() const;
+  ContentContext& GetContentContext() const;
 
-  bool Render(const Picture& picture, RenderTarget& render_target);
+  bool Render(const Picture& picture,
+              RenderTarget& render_target,
+              bool reset_host_buffer);
 
  private:
   std::shared_ptr<Context> context_;
   std::unique_ptr<ContentContext> content_context_;
   bool is_valid_ = false;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(AiksContext);
+  AiksContext(const AiksContext&) = delete;
+
+  AiksContext& operator=(const AiksContext&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_AIKS_AIKS_CONTEXT_H_
diff --git a/impeller/aiks/aiks_gradient_unittests.cc b/impeller/aiks/aiks_gradient_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..7938fb60f9f3cc539b2d20cbe8fed48b773658f3
--- /dev/null
+++ b/impeller/aiks/aiks_gradient_unittests.cc
@@ -0,0 +1,738 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/impeller/aiks/aiks_unittests.h"
+
+#include "impeller/aiks/canvas.h"
+#include "impeller/entity/contents/conical_gradient_contents.h"
+#include "impeller/entity/contents/linear_gradient_contents.h"
+#include "impeller/entity/contents/radial_gradient_contents.h"
+#include "impeller/entity/contents/sweep_gradient_contents.h"
+#include "impeller/geometry/geometry_asserts.h"
+#include "impeller/geometry/path_builder.h"
+#include "impeller/playground/widgets.h"
+#include "third_party/imgui/imgui.h"
+
+////////////////////////////////////////////////////////////////////////////////
+// This is for tests of Canvas that are interested the results of rendering
+// gradients.
+////////////////////////////////////////////////////////////////////////////////
+
+namespace impeller {
+namespace testing {
+
+namespace {
+void CanRenderLinearGradient(AiksTest* aiks_test, Entity::TileMode tile_mode) {
+  Canvas canvas;
+  canvas.Scale(aiks_test->GetContentScale());
+  Paint paint;
+  canvas.Translate({100.0f, 0, 0});
+
+  std::vector<Color> colors = {Color{0.9568, 0.2627, 0.2118, 1.0},
+                               Color{0.1294, 0.5882, 0.9529, 0.0}};
+  std::vector<Scalar> stops = {0.0, 1.0};
+
+  paint.color_source = ColorSource::MakeLinearGradient(
+      {0, 0}, {200, 200}, std::move(colors), std::move(stops), tile_mode, {});
+
+  paint.color = Color(1.0, 1.0, 1.0, 1.0);
+  canvas.DrawRect(Rect::MakeXYWH(0, 0, 600, 600), paint);
+  ASSERT_TRUE(aiks_test->OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+}  // namespace
+
+TEST_P(AiksTest, CanRenderLinearGradientClamp) {
+  CanRenderLinearGradient(this, Entity::TileMode::kClamp);
+}
+TEST_P(AiksTest, CanRenderLinearGradientRepeat) {
+  CanRenderLinearGradient(this, Entity::TileMode::kRepeat);
+}
+TEST_P(AiksTest, CanRenderLinearGradientMirror) {
+  CanRenderLinearGradient(this, Entity::TileMode::kMirror);
+}
+TEST_P(AiksTest, CanRenderLinearGradientDecal) {
+  CanRenderLinearGradient(this, Entity::TileMode::kDecal);
+}
+
+TEST_P(AiksTest, CanRenderLinearGradientDecalWithColorFilter) {
+  Canvas canvas;
+  canvas.Scale(GetContentScale());
+  Paint paint;
+  canvas.Translate({100.0f, 0, 0});
+
+  std::vector<Color> colors = {Color{0.9568, 0.2627, 0.2118, 1.0},
+                               Color{0.1294, 0.5882, 0.9529, 0.0}};
+  std::vector<Scalar> stops = {0.0, 1.0};
+
+  paint.color_source = ColorSource::MakeLinearGradient(
+      {0, 0}, {200, 200}, std::move(colors), std::move(stops),
+      Entity::TileMode::kDecal, {});
+  // Overlay the gradient with 25% green. This should appear as the entire
+  // rectangle being drawn with 25% green, including the border area outside the
+  // decal gradient.
+  paint.color_filter = ColorFilter::MakeBlend(BlendMode::kSourceOver,
+                                              Color::Green().WithAlpha(0.25));
+
+  paint.color = Color(1.0, 1.0, 1.0, 1.0);
+  canvas.DrawRect(Rect::MakeXYWH(0, 0, 600, 600), paint);
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+static void CanRenderLinearGradientWithDithering(AiksTest* aiks_test,
+                                                 bool use_dithering) {
+  Canvas canvas;
+  Paint paint;
+  canvas.Translate({100.0, 100.0, 0});
+
+  // 0xffcccccc --> 0xff333333, taken from
+  // https://github.com/flutter/flutter/issues/118073#issue-1521699748
+  std::vector<Color> colors = {Color{0.8, 0.8, 0.8, 1.0},
+                               Color{0.2, 0.2, 0.2, 1.0}};
+  std::vector<Scalar> stops = {0.0, 1.0};
+
+  paint.color_source = ColorSource::MakeLinearGradient(
+      {0, 0}, {800, 500}, std::move(colors), std::move(stops),
+      Entity::TileMode::kClamp, {});
+  paint.dither = use_dithering;
+  canvas.DrawRect(Rect::MakeXYWH(0, 0, 800, 500), paint);
+  ASSERT_TRUE(aiks_test->OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, CanRenderLinearGradientWithDitheringDisabled) {
+  CanRenderLinearGradientWithDithering(this, false);
+}
+
+TEST_P(AiksTest, CanRenderLinearGradientWithDitheringEnabled) {
+  CanRenderLinearGradientWithDithering(this, true);
+}  // namespace
+
+static void CanRenderRadialGradientWithDithering(AiksTest* aiks_test,
+                                                 bool use_dithering) {
+  Canvas canvas;
+  Paint paint;
+  canvas.Translate({100.0, 100.0, 0});
+
+  // #FFF -> #000
+  std::vector<Color> colors = {Color{1.0, 1.0, 1.0, 1.0},
+                               Color{0.0, 0.0, 0.0, 1.0}};
+  std::vector<Scalar> stops = {0.0, 1.0};
+
+  paint.color_source = ColorSource::MakeRadialGradient(
+      {600, 600}, 600, std::move(colors), std::move(stops),
+      Entity::TileMode::kClamp, {});
+  paint.dither = use_dithering;
+  canvas.DrawRect(Rect::MakeXYWH(0, 0, 1200, 1200), paint);
+  ASSERT_TRUE(aiks_test->OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, CanRenderRadialGradientWithDitheringDisabled) {
+  CanRenderRadialGradientWithDithering(this, false);
+}
+
+TEST_P(AiksTest, CanRenderRadialGradientWithDitheringEnabled) {
+  CanRenderRadialGradientWithDithering(this, true);
+}
+
+static void CanRenderSweepGradientWithDithering(AiksTest* aiks_test,
+                                                bool use_dithering) {
+  Canvas canvas;
+  canvas.Scale(aiks_test->GetContentScale());
+  Paint paint;
+  canvas.Translate({100.0, 100.0, 0});
+
+  // #FFF -> #000
+  std::vector<Color> colors = {Color{1.0, 1.0, 1.0, 1.0},
+                               Color{0.0, 0.0, 0.0, 1.0}};
+  std::vector<Scalar> stops = {0.0, 1.0};
+
+  paint.color_source = ColorSource::MakeSweepGradient(
+      {100, 100}, Degrees(45), Degrees(135), std::move(colors),
+      std::move(stops), Entity::TileMode::kMirror, {});
+  paint.dither = use_dithering;
+
+  canvas.DrawRect(Rect::MakeXYWH(0, 0, 600, 600), paint);
+  ASSERT_TRUE(aiks_test->OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, CanRenderSweepGradientWithDitheringDisabled) {
+  CanRenderSweepGradientWithDithering(this, false);
+}
+
+TEST_P(AiksTest, CanRenderSweepGradientWithDitheringEnabled) {
+  CanRenderSweepGradientWithDithering(this, true);
+}
+
+static void CanRenderConicalGradientWithDithering(AiksTest* aiks_test,
+                                                  bool use_dithering) {
+  Canvas canvas;
+  canvas.Scale(aiks_test->GetContentScale());
+  Paint paint;
+  canvas.Translate({100.0, 100.0, 0});
+
+  // #FFF -> #000
+  std::vector<Color> colors = {Color{1.0, 1.0, 1.0, 1.0},
+                               Color{0.0, 0.0, 0.0, 1.0}};
+  std::vector<Scalar> stops = {0.0, 1.0};
+
+  paint.color_source = ColorSource::MakeConicalGradient(
+      {100, 100}, 100, std::move(colors), std::move(stops), {0, 1}, 0,
+      Entity::TileMode::kMirror, {});
+  paint.dither = use_dithering;
+
+  canvas.DrawRect(Rect::MakeXYWH(0, 0, 600, 600), paint);
+  ASSERT_TRUE(aiks_test->OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, CanRenderConicalGradientWithDitheringDisabled) {
+  CanRenderConicalGradientWithDithering(this, false);
+}
+
+TEST_P(AiksTest, CanRenderConicalGradientWithDitheringEnabled) {
+  CanRenderConicalGradientWithDithering(this, true);
+}
+
+namespace {
+void CanRenderLinearGradientWithOverlappingStops(AiksTest* aiks_test,
+                                                 Entity::TileMode tile_mode) {
+  Canvas canvas;
+  Paint paint;
+  canvas.Translate({100.0, 100.0, 0});
+
+  std::vector<Color> colors = {
+      Color{0.9568, 0.2627, 0.2118, 1.0}, Color{0.9568, 0.2627, 0.2118, 1.0},
+      Color{0.1294, 0.5882, 0.9529, 1.0}, Color{0.1294, 0.5882, 0.9529, 1.0}};
+  std::vector<Scalar> stops = {0.0, 0.5, 0.5, 1.0};
+
+  paint.color_source = ColorSource::MakeLinearGradient(
+      {0, 0}, {500, 500}, std::move(colors), std::move(stops), tile_mode, {});
+
+  paint.color = Color(1.0, 1.0, 1.0, 1.0);
+  canvas.DrawRect(Rect::MakeXYWH(0, 0, 500, 500), paint);
+  ASSERT_TRUE(aiks_test->OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+}  // namespace
+
+// Only clamp is necessary. All tile modes are the same output.
+TEST_P(AiksTest, CanRenderLinearGradientWithOverlappingStopsClamp) {
+  CanRenderLinearGradientWithOverlappingStops(this, Entity::TileMode::kClamp);
+}
+
+namespace {
+void CanRenderLinearGradientManyColors(AiksTest* aiks_test,
+                                       Entity::TileMode tile_mode) {
+  Canvas canvas;
+  canvas.Scale(aiks_test->GetContentScale());
+  Paint paint;
+  canvas.Translate({100, 100, 0});
+
+  std::vector<Color> colors = {
+      Color{0x1f / 255.0, 0.0, 0x5c / 255.0, 1.0},
+      Color{0x5b / 255.0, 0.0, 0x60 / 255.0, 1.0},
+      Color{0x87 / 255.0, 0x01 / 255.0, 0x60 / 255.0, 1.0},
+      Color{0xac / 255.0, 0x25 / 255.0, 0x53 / 255.0, 1.0},
+      Color{0xe1 / 255.0, 0x6b / 255.0, 0x5c / 255.0, 1.0},
+      Color{0xf3 / 255.0, 0x90 / 255.0, 0x60 / 255.0, 1.0},
+      Color{0xff / 255.0, 0xb5 / 255.0, 0x6b / 250.0, 1.0}};
+  std::vector<Scalar> stops = {
+      0.0,
+      (1.0 / 6.0) * 1,
+      (1.0 / 6.0) * 2,
+      (1.0 / 6.0) * 3,
+      (1.0 / 6.0) * 4,
+      (1.0 / 6.0) * 5,
+      1.0,
+  };
+
+  paint.color_source = ColorSource::MakeLinearGradient(
+      {0, 0}, {200, 200}, std::move(colors), std::move(stops), tile_mode, {});
+
+  paint.color = Color(1.0, 1.0, 1.0, 1.0);
+  canvas.DrawRect(Rect::MakeXYWH(0, 0, 600, 600), paint);
+  canvas.Restore();
+  ASSERT_TRUE(aiks_test->OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+}  // namespace
+
+TEST_P(AiksTest, CanRenderLinearGradientManyColorsClamp) {
+  CanRenderLinearGradientManyColors(this, Entity::TileMode::kClamp);
+}
+TEST_P(AiksTest, CanRenderLinearGradientManyColorsRepeat) {
+  CanRenderLinearGradientManyColors(this, Entity::TileMode::kRepeat);
+}
+TEST_P(AiksTest, CanRenderLinearGradientManyColorsMirror) {
+  CanRenderLinearGradientManyColors(this, Entity::TileMode::kMirror);
+}
+TEST_P(AiksTest, CanRenderLinearGradientManyColorsDecal) {
+  CanRenderLinearGradientManyColors(this, Entity::TileMode::kDecal);
+}
+
+namespace {
+void CanRenderLinearGradientWayManyColors(AiksTest* aiks_test,
+                                          Entity::TileMode tile_mode) {
+  Canvas canvas;
+  Paint paint;
+  canvas.Translate({100.0, 100.0, 0});
+  auto color = Color{0x1f / 255.0, 0.0, 0x5c / 255.0, 1.0};
+  std::vector<Color> colors;
+  std::vector<Scalar> stops;
+  auto current_stop = 0.0;
+  for (int i = 0; i < 2000; i++) {
+    colors.push_back(color);
+    stops.push_back(current_stop);
+    current_stop += 1 / 2000.0;
+  }
+  stops[2000 - 1] = 1.0;
+
+  paint.color_source = ColorSource::MakeLinearGradient(
+      {0, 0}, {200, 200}, std::move(colors), std::move(stops), tile_mode, {});
+
+  canvas.DrawRect(Rect::MakeXYWH(0, 0, 600, 600), paint);
+  ASSERT_TRUE(aiks_test->OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+}  // namespace
+
+// Only test clamp on purpose since they all look the same.
+TEST_P(AiksTest, CanRenderLinearGradientWayManyColorsClamp) {
+  CanRenderLinearGradientWayManyColors(this, Entity::TileMode::kClamp);
+}
+
+TEST_P(AiksTest, CanRenderLinearGradientManyColorsUnevenStops) {
+  auto callback = [&](AiksContext& renderer) -> std::optional<Picture> {
+    const char* tile_mode_names[] = {"Clamp", "Repeat", "Mirror", "Decal"};
+    const Entity::TileMode tile_modes[] = {
+        Entity::TileMode::kClamp, Entity::TileMode::kRepeat,
+        Entity::TileMode::kMirror, Entity::TileMode::kDecal};
+
+    static int selected_tile_mode = 0;
+    static Matrix matrix = {
+        1, 0, 0, 0,  //
+        0, 1, 0, 0,  //
+        0, 0, 1, 0,  //
+        0, 0, 0, 1   //
+    };
+    if (AiksTest::ImGuiBegin("Controls", nullptr,
+                             ImGuiWindowFlags_AlwaysAutoResize)) {
+      ImGui::Combo("Tile mode", &selected_tile_mode, tile_mode_names,
+                   sizeof(tile_mode_names) / sizeof(char*));
+      std::string label = "##1";
+      for (int i = 0; i < 4; i++) {
+        ImGui::InputScalarN(label.c_str(), ImGuiDataType_Float,
+                            &(matrix.vec[i]), 4, NULL, NULL, "%.2f", 0);
+        label[2]++;
+      }
+      ImGui::End();
+    }
+
+    Canvas canvas;
+    Paint paint;
+    canvas.Translate({100.0, 100.0, 0});
+    auto tile_mode = tile_modes[selected_tile_mode];
+
+    std::vector<Color> colors = {
+        Color{0x1f / 255.0, 0.0, 0x5c / 255.0, 1.0},
+        Color{0x5b / 255.0, 0.0, 0x60 / 255.0, 1.0},
+        Color{0x87 / 255.0, 0x01 / 255.0, 0x60 / 255.0, 1.0},
+        Color{0xac / 255.0, 0x25 / 255.0, 0x53 / 255.0, 1.0},
+        Color{0xe1 / 255.0, 0x6b / 255.0, 0x5c / 255.0, 1.0},
+        Color{0xf3 / 255.0, 0x90 / 255.0, 0x60 / 255.0, 1.0},
+        Color{0xff / 255.0, 0xb5 / 255.0, 0x6b / 250.0, 1.0}};
+    std::vector<Scalar> stops = {
+        0.0, 2.0 / 62.0, 4.0 / 62.0, 8.0 / 62.0, 16.0 / 62.0, 32.0 / 62.0, 1.0,
+    };
+
+    paint.color_source = ColorSource::MakeLinearGradient(
+        {0, 0}, {200, 200}, std::move(colors), std::move(stops), tile_mode, {});
+
+    canvas.DrawRect(Rect::MakeXYWH(0, 0, 600, 600), paint);
+    return canvas.EndRecordingAsPicture();
+  };
+  ASSERT_TRUE(OpenPlaygroundHere(callback));
+}
+
+TEST_P(AiksTest, CanRenderLinearGradientMaskBlur) {
+  Canvas canvas;
+
+  Paint paint = {
+      .color = Color::White(),
+      .color_source = ColorSource::MakeLinearGradient(
+          {200, 200}, {400, 400},
+          {Color::Red(), Color::White(), Color::Red(), Color::White(),
+           Color::Red(), Color::White(), Color::Red(), Color::White(),
+           Color::Red(), Color::White(), Color::Red()},
+          {0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0},
+          Entity::TileMode::kClamp, {}),
+      .mask_blur_descriptor =
+          Paint::MaskBlurDescriptor{
+              .style = FilterContents::BlurStyle::kNormal,
+              .sigma = Sigma(20),
+          },
+  };
+
+  canvas.DrawCircle({300, 300}, 200, paint);
+  canvas.DrawRect(Rect::MakeLTRB(100, 300, 500, 600), paint);
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, CanRenderRadialGradient) {
+  auto callback = [&](AiksContext& renderer) -> std::optional<Picture> {
+    const char* tile_mode_names[] = {"Clamp", "Repeat", "Mirror", "Decal"};
+    const Entity::TileMode tile_modes[] = {
+        Entity::TileMode::kClamp, Entity::TileMode::kRepeat,
+        Entity::TileMode::kMirror, Entity::TileMode::kDecal};
+
+    static int selected_tile_mode = 0;
+    static Matrix matrix = {
+        1, 0, 0, 0,  //
+        0, 1, 0, 0,  //
+        0, 0, 1, 0,  //
+        0, 0, 0, 1   //
+    };
+    if (AiksTest::ImGuiBegin("Controls", nullptr,
+                             ImGuiWindowFlags_AlwaysAutoResize)) {
+      ImGui::Combo("Tile mode", &selected_tile_mode, tile_mode_names,
+                   sizeof(tile_mode_names) / sizeof(char*));
+      std::string label = "##1";
+      for (int i = 0; i < 4; i++) {
+        ImGui::InputScalarN(label.c_str(), ImGuiDataType_Float,
+                            &(matrix.vec[i]), 4, NULL, NULL, "%.2f", 0);
+        label[2]++;
+      }
+      ImGui::End();
+    }
+
+    Canvas canvas;
+    Paint paint;
+    canvas.Translate({100.0, 100.0, 0});
+    auto tile_mode = tile_modes[selected_tile_mode];
+
+    std::vector<Color> colors = {Color{0.9568, 0.2627, 0.2118, 1.0},
+                                 Color{0.1294, 0.5882, 0.9529, 1.0}};
+    std::vector<Scalar> stops = {0.0, 1.0};
+
+    paint.color_source = ColorSource::MakeRadialGradient(
+        {100, 100}, 100, std::move(colors), std::move(stops), tile_mode, {});
+
+    canvas.DrawRect(Rect::MakeXYWH(0, 0, 600, 600), paint);
+    return canvas.EndRecordingAsPicture();
+  };
+  ASSERT_TRUE(OpenPlaygroundHere(callback));
+}
+
+TEST_P(AiksTest, CanRenderRadialGradientManyColors) {
+  auto callback = [&](AiksContext& renderer) -> std::optional<Picture> {
+    const char* tile_mode_names[] = {"Clamp", "Repeat", "Mirror", "Decal"};
+    const Entity::TileMode tile_modes[] = {
+        Entity::TileMode::kClamp, Entity::TileMode::kRepeat,
+        Entity::TileMode::kMirror, Entity::TileMode::kDecal};
+
+    static int selected_tile_mode = 0;
+    static Matrix matrix = {
+        1, 0, 0, 0,  //
+        0, 1, 0, 0,  //
+        0, 0, 1, 0,  //
+        0, 0, 0, 1   //
+    };
+    if (AiksTest::ImGuiBegin("Controls", nullptr,
+                             ImGuiWindowFlags_AlwaysAutoResize)) {
+      ImGui::Combo("Tile mode", &selected_tile_mode, tile_mode_names,
+                   sizeof(tile_mode_names) / sizeof(char*));
+      std::string label = "##1";
+      for (int i = 0; i < 4; i++) {
+        ImGui::InputScalarN(label.c_str(), ImGuiDataType_Float,
+                            &(matrix.vec[i]), 4, NULL, NULL, "%.2f", 0);
+        label[2]++;
+      }
+      ImGui::End();
+    }
+
+    Canvas canvas;
+    Paint paint;
+    canvas.Translate({100.0, 100.0, 0});
+    auto tile_mode = tile_modes[selected_tile_mode];
+
+    std::vector<Color> colors = {
+        Color{0x1f / 255.0, 0.0, 0x5c / 255.0, 1.0},
+        Color{0x5b / 255.0, 0.0, 0x60 / 255.0, 1.0},
+        Color{0x87 / 255.0, 0x01 / 255.0, 0x60 / 255.0, 1.0},
+        Color{0xac / 255.0, 0x25 / 255.0, 0x53 / 255.0, 1.0},
+        Color{0xe1 / 255.0, 0x6b / 255.0, 0x5c / 255.0, 1.0},
+        Color{0xf3 / 255.0, 0x90 / 255.0, 0x60 / 255.0, 1.0},
+        Color{0xff / 255.0, 0xb5 / 255.0, 0x6b / 250.0, 1.0}};
+    std::vector<Scalar> stops = {
+        0.0,
+        (1.0 / 6.0) * 1,
+        (1.0 / 6.0) * 2,
+        (1.0 / 6.0) * 3,
+        (1.0 / 6.0) * 4,
+        (1.0 / 6.0) * 5,
+        1.0,
+    };
+
+    paint.color_source = ColorSource::MakeRadialGradient(
+        {100, 100}, 100, std::move(colors), std::move(stops), tile_mode, {});
+
+    canvas.DrawRect(Rect::MakeXYWH(0, 0, 600, 600), paint);
+    return canvas.EndRecordingAsPicture();
+  };
+  ASSERT_TRUE(OpenPlaygroundHere(callback));
+}
+
+namespace {
+void CanRenderSweepGradient(AiksTest* aiks_test, Entity::TileMode tile_mode) {
+  Canvas canvas;
+  canvas.Scale(aiks_test->GetContentScale());
+  Paint paint;
+  canvas.Translate({100, 100, 0});
+
+  std::vector<Color> colors = {Color{0.9568, 0.2627, 0.2118, 1.0},
+                               Color{0.1294, 0.5882, 0.9529, 1.0}};
+  std::vector<Scalar> stops = {0.0, 1.0};
+
+  paint.color_source = ColorSource::MakeSweepGradient(
+      {100, 100}, Degrees(45), Degrees(135), std::move(colors),
+      std::move(stops), tile_mode, {});
+
+  canvas.DrawRect(Rect::MakeXYWH(0, 0, 600, 600), paint);
+  ASSERT_TRUE(aiks_test->OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+}  // namespace
+
+TEST_P(AiksTest, CanRenderSweepGradientClamp) {
+  CanRenderSweepGradient(this, Entity::TileMode::kClamp);
+}
+TEST_P(AiksTest, CanRenderSweepGradientRepeat) {
+  CanRenderSweepGradient(this, Entity::TileMode::kRepeat);
+}
+TEST_P(AiksTest, CanRenderSweepGradientMirror) {
+  CanRenderSweepGradient(this, Entity::TileMode::kMirror);
+}
+TEST_P(AiksTest, CanRenderSweepGradientDecal) {
+  CanRenderSweepGradient(this, Entity::TileMode::kDecal);
+}
+
+namespace {
+void CanRenderSweepGradientManyColors(AiksTest* aiks_test,
+                                      Entity::TileMode tile_mode) {
+  Canvas canvas;
+  Paint paint;
+  canvas.Translate({100.0, 100.0, 0});
+
+  std::vector<Color> colors = {
+      Color{0x1f / 255.0, 0.0, 0x5c / 255.0, 1.0},
+      Color{0x5b / 255.0, 0.0, 0x60 / 255.0, 1.0},
+      Color{0x87 / 255.0, 0x01 / 255.0, 0x60 / 255.0, 1.0},
+      Color{0xac / 255.0, 0x25 / 255.0, 0x53 / 255.0, 1.0},
+      Color{0xe1 / 255.0, 0x6b / 255.0, 0x5c / 255.0, 1.0},
+      Color{0xf3 / 255.0, 0x90 / 255.0, 0x60 / 255.0, 1.0},
+      Color{0xff / 255.0, 0xb5 / 255.0, 0x6b / 250.0, 1.0}};
+  std::vector<Scalar> stops = {
+      0.0,
+      (1.0 / 6.0) * 1,
+      (1.0 / 6.0) * 2,
+      (1.0 / 6.0) * 3,
+      (1.0 / 6.0) * 4,
+      (1.0 / 6.0) * 5,
+      1.0,
+  };
+
+  paint.color_source = ColorSource::MakeSweepGradient(
+      {100, 100}, Degrees(45), Degrees(135), std::move(colors),
+      std::move(stops), tile_mode, {});
+
+  canvas.DrawRect(Rect::MakeXYWH(0, 0, 600, 600), paint);
+  ASSERT_TRUE(aiks_test->OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+}  // namespace
+
+TEST_P(AiksTest, CanRenderSweepGradientManyColorsClamp) {
+  CanRenderSweepGradientManyColors(this, Entity::TileMode::kClamp);
+}
+TEST_P(AiksTest, CanRenderSweepGradientManyColorsRepeat) {
+  CanRenderSweepGradientManyColors(this, Entity::TileMode::kRepeat);
+}
+TEST_P(AiksTest, CanRenderSweepGradientManyColorsMirror) {
+  CanRenderSweepGradientManyColors(this, Entity::TileMode::kMirror);
+}
+TEST_P(AiksTest, CanRenderSweepGradientManyColorsDecal) {
+  CanRenderSweepGradientManyColors(this, Entity::TileMode::kDecal);
+}
+
+TEST_P(AiksTest, CanRenderConicalGradient) {
+  Scalar size = 256;
+  Canvas canvas;
+  Paint paint;
+  paint.color = Color::White();
+  canvas.DrawRect(Rect::MakeXYWH(0, 0, size * 3, size * 3), paint);
+  std::vector<Color> colors = {Color::MakeRGBA8(0xF4, 0x43, 0x36, 0xFF),
+                               Color::MakeRGBA8(0xFF, 0xEB, 0x3B, 0xFF),
+                               Color::MakeRGBA8(0x4c, 0xAF, 0x50, 0xFF),
+                               Color::MakeRGBA8(0x21, 0x96, 0xF3, 0xFF)};
+  std::vector<Scalar> stops = {0.0, 1.f / 3.f, 2.f / 3.f, 1.0};
+  std::array<std::tuple<Point, float, Point, float>, 8> array{
+      std::make_tuple(Point{size / 2.f, size / 2.f}, 0.f,
+                      Point{size / 2.f, size / 2.f}, size / 2.f),
+      std::make_tuple(Point{size / 2.f, size / 2.f}, size / 4.f,
+                      Point{size / 2.f, size / 2.f}, size / 2.f),
+      std::make_tuple(Point{size / 4.f, size / 4.f}, 0.f,
+                      Point{size / 2.f, size / 2.f}, size / 2.f),
+      std::make_tuple(Point{size / 4.f, size / 4.f}, size / 2.f,
+                      Point{size / 2.f, size / 2.f}, 0),
+      std::make_tuple(Point{size / 4.f, size / 4.f}, size / 4.f,
+                      Point{size / 2.f, size / 2.f}, size / 2.f),
+      std::make_tuple(Point{size / 4.f, size / 4.f}, size / 16.f,
+                      Point{size / 2.f, size / 2.f}, size / 8.f),
+      std::make_tuple(Point{size / 4.f, size / 4.f}, size / 8.f,
+                      Point{size / 2.f, size / 2.f}, size / 16.f),
+      std::make_tuple(Point{size / 8.f, size / 8.f}, size / 8.f,
+                      Point{size / 2.f, size / 2.f}, size / 8.f),
+  };
+  for (int i = 0; i < 8; i++) {
+    canvas.Save();
+    canvas.Translate({(i % 3) * size, i / 3 * size, 0});
+    paint.color_source = ColorSource::MakeConicalGradient(
+        std::get<0>(array[i]), std::get<1>(array[i]), colors, stops,
+        std::get<2>(array[i]), std::get<3>(array[i]), Entity::TileMode::kClamp,
+        {});
+    canvas.DrawRect(Rect::MakeXYWH(0, 0, size, size), paint);
+    canvas.Restore();
+  }
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, CanRenderGradientDecalWithBackground) {
+  std::vector<Color> colors = {Color::MakeRGBA8(0xF4, 0x43, 0x36, 0xFF),
+                               Color::MakeRGBA8(0xFF, 0xEB, 0x3B, 0xFF),
+                               Color::MakeRGBA8(0x4c, 0xAF, 0x50, 0xFF),
+                               Color::MakeRGBA8(0x21, 0x96, 0xF3, 0xFF)};
+  std::vector<Scalar> stops = {0.0, 1.f / 3.f, 2.f / 3.f, 1.0};
+
+  std::array<ColorSource, 3> color_sources = {
+      ColorSource::MakeLinearGradient({0, 0}, {100, 100}, colors, stops,
+                                      Entity::TileMode::kDecal, {}),
+      ColorSource::MakeRadialGradient({100, 100}, 100, colors, stops,
+                                      Entity::TileMode::kDecal, {}),
+      ColorSource::MakeSweepGradient({100, 100}, Degrees(45), Degrees(135),
+                                     colors, stops, Entity::TileMode::kDecal,
+                                     {}),
+  };
+
+  Canvas canvas;
+  Paint paint;
+  paint.color = Color::White();
+  canvas.DrawRect(Rect::MakeLTRB(0, 0, 605, 205), paint);
+  for (int i = 0; i < 3; i++) {
+    canvas.Save();
+    canvas.Translate({i * 200.0f, 0, 0});
+    paint.color_source = color_sources[i];
+    canvas.DrawRect(Rect::MakeLTRB(0, 0, 200, 200), paint);
+    canvas.Restore();
+  }
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+#define APPLY_COLOR_FILTER_GRADIENT_TEST(name)                                 \
+  TEST_P(AiksTest, name##GradientApplyColorFilter) {                           \
+    auto contents = name##GradientContents();                                  \
+    contents.SetColors({Color::CornflowerBlue().WithAlpha(0.75)});             \
+    auto result = contents.ApplyColorFilter([](const Color& color) {           \
+      return color.Blend(Color::LimeGreen().WithAlpha(0.75),                   \
+                         BlendMode::kScreen);                                  \
+    });                                                                        \
+    ASSERT_TRUE(result);                                                       \
+                                                                               \
+    std::vector<Color> expected = {Color(0.433247, 0.879523, 0.825324, 0.75)}; \
+    ASSERT_COLORS_NEAR(contents.GetColors(), expected);                        \
+  }
+
+APPLY_COLOR_FILTER_GRADIENT_TEST(Linear);
+APPLY_COLOR_FILTER_GRADIENT_TEST(Radial);
+APPLY_COLOR_FILTER_GRADIENT_TEST(Conical);
+APPLY_COLOR_FILTER_GRADIENT_TEST(Sweep);
+
+TEST_P(AiksTest, GradientStrokesRenderCorrectly) {
+  // Compare with https://fiddle.skia.org/c/027392122bec8ac2b5d5de00a4b9bbe2
+  auto callback = [&](AiksContext& renderer) -> std::optional<Picture> {
+    static float scale = 3;
+    static bool add_circle_clip = true;
+    const char* tile_mode_names[] = {"Clamp", "Repeat", "Mirror", "Decal"};
+    const Entity::TileMode tile_modes[] = {
+        Entity::TileMode::kClamp, Entity::TileMode::kRepeat,
+        Entity::TileMode::kMirror, Entity::TileMode::kDecal};
+    static int selected_tile_mode = 0;
+    static float alpha = 1;
+
+    if (AiksTest::ImGuiBegin("Controls", nullptr,
+                             ImGuiWindowFlags_AlwaysAutoResize)) {
+      ImGui::SliderFloat("Scale", &scale, 0, 6);
+      ImGui::Checkbox("Circle clip", &add_circle_clip);
+      ImGui::SliderFloat("Alpha", &alpha, 0, 1);
+      ImGui::Combo("Tile mode", &selected_tile_mode, tile_mode_names,
+                   sizeof(tile_mode_names) / sizeof(char*));
+      ImGui::End();
+    }
+
+    Canvas canvas;
+    canvas.Scale(GetContentScale());
+    Paint paint;
+    paint.color = Color::White();
+    canvas.DrawPaint(paint);
+
+    paint.style = Paint::Style::kStroke;
+    paint.color = Color(1.0, 1.0, 1.0, alpha);
+    paint.stroke_width = 10;
+    auto tile_mode = tile_modes[selected_tile_mode];
+
+    std::vector<Color> colors = {Color{0.9568, 0.2627, 0.2118, 1.0},
+                                 Color{0.1294, 0.5882, 0.9529, 1.0}};
+    std::vector<Scalar> stops = {0.0, 1.0};
+
+    paint.color_source = ColorSource::MakeLinearGradient(
+        {0, 0}, {50, 50}, std::move(colors), std::move(stops), tile_mode, {});
+
+    Path path = PathBuilder{}
+                    .MoveTo({20, 20})
+                    .QuadraticCurveTo({60, 20}, {60, 60})
+                    .Close()
+                    .MoveTo({60, 20})
+                    .QuadraticCurveTo({60, 60}, {20, 60})
+                    .TakePath();
+
+    canvas.Scale(Vector2(scale, scale));
+
+    if (add_circle_clip) {
+      static PlaygroundPoint circle_clip_point_a(Point(60, 300), 20,
+                                                 Color::Red());
+      static PlaygroundPoint circle_clip_point_b(Point(600, 300), 20,
+                                                 Color::Red());
+      auto [handle_a, handle_b] =
+          DrawPlaygroundLine(circle_clip_point_a, circle_clip_point_b);
+
+      auto screen_to_canvas = canvas.GetCurrentTransform().Invert();
+      Point point_a = screen_to_canvas * handle_a * GetContentScale();
+      Point point_b = screen_to_canvas * handle_b * GetContentScale();
+
+      Point middle = (point_a + point_b) / 2;
+      auto radius = point_a.GetDistance(middle);
+      canvas.ClipPath(PathBuilder{}.AddCircle(middle, radius).TakePath());
+    }
+
+    for (auto join : {Join::kBevel, Join::kRound, Join::kMiter}) {
+      paint.stroke_join = join;
+      for (auto cap : {Cap::kButt, Cap::kSquare, Cap::kRound}) {
+        paint.stroke_cap = cap;
+        canvas.DrawPath(path, paint);
+        canvas.Translate({80, 0});
+      }
+      canvas.Translate({-240, 60});
+    }
+
+    return canvas.EndRecordingAsPicture();
+  };
+
+  ASSERT_TRUE(OpenPlaygroundHere(callback));
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/aiks/aiks_path_unittests.cc b/impeller/aiks/aiks_path_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..85d617856c533824fdf29ac00da1c079c6078633
--- /dev/null
+++ b/impeller/aiks/aiks_path_unittests.cc
@@ -0,0 +1,454 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/impeller/aiks/aiks_unittests.h"
+
+#include "impeller/aiks/canvas.h"
+#include "impeller/geometry/path_builder.h"
+#include "impeller/playground/widgets.h"
+#include "third_party/imgui/imgui.h"
+
+////////////////////////////////////////////////////////////////////////////////
+// This is for tests of Canvas that are interested the results of rendering
+// paths.
+////////////////////////////////////////////////////////////////////////////////
+
+namespace impeller {
+namespace testing {
+
+TEST_P(AiksTest, RotateColorFilteredPath) {
+  Canvas canvas;
+  canvas.Concat(Matrix::MakeTranslation({300, 300}));
+  canvas.Concat(Matrix::MakeRotationZ(Radians(kPiOver2)));
+  auto arrow_stem =
+      PathBuilder{}.MoveTo({120, 190}).LineTo({120, 50}).TakePath();
+  auto arrow_head = PathBuilder{}
+                        .MoveTo({50, 120})
+                        .LineTo({120, 190})
+                        .LineTo({190, 120})
+                        .TakePath();
+  auto paint = Paint{
+      .stroke_width = 15.0,
+      .stroke_cap = Cap::kRound,
+      .stroke_join = Join::kRound,
+      .style = Paint::Style::kStroke,
+      .color_filter =
+          ColorFilter::MakeBlend(BlendMode::kSourceIn, Color::AliceBlue()),
+  };
+
+  canvas.DrawPath(arrow_stem, paint);
+  canvas.DrawPath(arrow_head, paint);
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, CanRenderStrokes) {
+  Canvas canvas;
+  Paint paint;
+  paint.color = Color::Red();
+  paint.stroke_width = 20.0;
+  paint.style = Paint::Style::kStroke;
+  canvas.DrawPath(PathBuilder{}.AddLine({200, 100}, {800, 100}).TakePath(),
+                  paint);
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, CanRenderCurvedStrokes) {
+  Canvas canvas;
+  Paint paint;
+  paint.color = Color::Red();
+  paint.stroke_width = 25.0;
+  paint.style = Paint::Style::kStroke;
+  canvas.DrawPath(PathBuilder{}.AddCircle({500, 500}, 250).TakePath(), paint);
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, CanRenderThickCurvedStrokes) {
+  Canvas canvas;
+  Paint paint;
+  paint.color = Color::Red();
+  paint.stroke_width = 100.0;
+  paint.style = Paint::Style::kStroke;
+  canvas.DrawPath(PathBuilder{}.AddCircle({100, 100}, 50).TakePath(), paint);
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, CanRenderStrokePathThatEndsAtSharpTurn) {
+  Canvas canvas;
+
+  Paint paint;
+  paint.color = Color::Red();
+  paint.style = Paint::Style::kStroke;
+  paint.stroke_width = 200;
+
+  Rect rect = Rect::MakeXYWH(100, 100, 200, 200);
+  PathBuilder builder;
+  builder.AddArc(rect, Degrees(0), Degrees(90), false);
+
+  canvas.DrawPath(builder.TakePath(), paint);
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, CanRenderStrokePathWithCubicLine) {
+  Canvas canvas;
+
+  Paint paint;
+  paint.color = Color::Red();
+  paint.style = Paint::Style::kStroke;
+  paint.stroke_width = 20;
+
+  PathBuilder builder;
+  builder.AddCubicCurve({0, 200}, {50, 400}, {350, 0}, {400, 200});
+
+  canvas.DrawPath(builder.TakePath(), paint);
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, CanRenderDifferencePaths) {
+  Canvas canvas;
+
+  Paint paint;
+  paint.color = Color::Red();
+
+  PathBuilder builder;
+
+  PathBuilder::RoundingRadii radii;
+  radii.top_left = {50, 25};
+  radii.top_right = {25, 50};
+  radii.bottom_right = {50, 25};
+  radii.bottom_left = {25, 50};
+
+  builder.AddRoundedRect(Rect::MakeXYWH(100, 100, 200, 200), radii);
+  builder.AddCircle({200, 200}, 50);
+  auto path = builder.TakePath(FillType::kOdd);
+
+  canvas.DrawImage(
+      std::make_shared<Image>(CreateTextureForFixture("boston.jpg")), {10, 10},
+      Paint{});
+  canvas.DrawPath(path, paint);
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+// Regression test for https://github.com/flutter/flutter/issues/134816.
+//
+// It should be possible to draw 3 lines, and not have an implicit close path.
+TEST_P(AiksTest, CanDrawAnOpenPath) {
+  Canvas canvas;
+
+  // Starting at (50, 50), draw lines from:
+  // 1. (50, height)
+  // 2. (width, height)
+  // 3. (width, 50)
+  PathBuilder builder;
+  builder.MoveTo({50, 50});
+  builder.LineTo({50, 100});
+  builder.LineTo({100, 100});
+  builder.LineTo({100, 50});
+
+  Paint paint;
+  paint.color = Color::Red();
+  paint.style = Paint::Style::kStroke;
+  paint.stroke_width = 10;
+
+  canvas.DrawPath(builder.TakePath(), paint);
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, CanDrawAnOpenPathThatIsntARect) {
+  Canvas canvas;
+
+  // Draw a stroked path that is explicitly closed to verify
+  // It doesn't become a rectangle.
+  PathBuilder builder;
+  builder.MoveTo({50, 50});
+  builder.LineTo({520, 120});
+  builder.LineTo({300, 310});
+  builder.LineTo({100, 50});
+  builder.Close();
+
+  Paint paint;
+  paint.color = Color::Red();
+  paint.style = Paint::Style::kStroke;
+  paint.stroke_width = 10;
+
+  canvas.DrawPath(builder.TakePath(), paint);
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, SolidStrokesRenderCorrectly) {
+  // Compare with https://fiddle.skia.org/c/027392122bec8ac2b5d5de00a4b9bbe2
+  auto callback = [&](AiksContext& renderer) -> std::optional<Picture> {
+    static Color color = Color::Black().WithAlpha(0.5);
+    static float scale = 3;
+    static bool add_circle_clip = true;
+
+    if (AiksTest::ImGuiBegin("Controls", nullptr,
+                             ImGuiWindowFlags_AlwaysAutoResize)) {
+      ImGui::ColorEdit4("Color", reinterpret_cast<float*>(&color));
+      ImGui::SliderFloat("Scale", &scale, 0, 6);
+      ImGui::Checkbox("Circle clip", &add_circle_clip);
+      ImGui::End();
+    }
+
+    Canvas canvas;
+    canvas.Scale(GetContentScale());
+    Paint paint;
+
+    paint.color = Color::White();
+    canvas.DrawPaint(paint);
+
+    paint.color = color;
+    paint.style = Paint::Style::kStroke;
+    paint.stroke_width = 10;
+
+    Path path = PathBuilder{}
+                    .MoveTo({20, 20})
+                    .QuadraticCurveTo({60, 20}, {60, 60})
+                    .Close()
+                    .MoveTo({60, 20})
+                    .QuadraticCurveTo({60, 60}, {20, 60})
+                    .TakePath();
+
+    canvas.Scale(Vector2(scale, scale));
+
+    if (add_circle_clip) {
+      static PlaygroundPoint circle_clip_point_a(Point(60, 300), 20,
+                                                 Color::Red());
+      static PlaygroundPoint circle_clip_point_b(Point(600, 300), 20,
+                                                 Color::Red());
+      auto [handle_a, handle_b] =
+          DrawPlaygroundLine(circle_clip_point_a, circle_clip_point_b);
+
+      auto screen_to_canvas = canvas.GetCurrentTransform().Invert();
+      Point point_a = screen_to_canvas * handle_a * GetContentScale();
+      Point point_b = screen_to_canvas * handle_b * GetContentScale();
+
+      Point middle = (point_a + point_b) / 2;
+      auto radius = point_a.GetDistance(middle);
+      canvas.ClipPath(PathBuilder{}.AddCircle(middle, radius).TakePath());
+    }
+
+    for (auto join : {Join::kBevel, Join::kRound, Join::kMiter}) {
+      paint.stroke_join = join;
+      for (auto cap : {Cap::kButt, Cap::kSquare, Cap::kRound}) {
+        paint.stroke_cap = cap;
+        canvas.DrawPath(path, paint);
+        canvas.Translate({80, 0});
+      }
+      canvas.Translate({-240, 60});
+    }
+
+    return canvas.EndRecordingAsPicture();
+  };
+
+  ASSERT_TRUE(OpenPlaygroundHere(callback));
+}
+
+TEST_P(AiksTest, DrawLinesRenderCorrectly) {
+  Canvas canvas;
+  canvas.Scale(GetContentScale());
+  Paint paint;
+  paint.color = Color::Blue();
+  paint.stroke_width = 10;
+
+  auto draw = [&canvas](Paint& paint) {
+    for (auto cap : {Cap::kButt, Cap::kSquare, Cap::kRound}) {
+      paint.stroke_cap = cap;
+      Point origin = {100, 100};
+      Point p0 = {50, 0};
+      Point p1 = {150, 0};
+      canvas.DrawLine({150, 100}, {250, 100}, paint);
+      for (int d = 15; d < 90; d += 15) {
+        Matrix m = Matrix::MakeRotationZ(Degrees(d));
+        canvas.DrawLine(origin + m * p0, origin + m * p1, paint);
+      }
+      canvas.DrawLine({100, 150}, {100, 250}, paint);
+      canvas.DrawCircle({origin}, 35, paint);
+
+      canvas.DrawLine({250, 250}, {250, 250}, paint);
+
+      canvas.Translate({250, 0});
+    }
+    canvas.Translate({-750, 250});
+  };
+
+  std::vector<Color> colors = {
+      Color{0x1f / 255.0, 0.0, 0x5c / 255.0, 1.0},
+      Color{0x5b / 255.0, 0.0, 0x60 / 255.0, 1.0},
+      Color{0x87 / 255.0, 0x01 / 255.0, 0x60 / 255.0, 1.0},
+      Color{0xac / 255.0, 0x25 / 255.0, 0x53 / 255.0, 1.0},
+      Color{0xe1 / 255.0, 0x6b / 255.0, 0x5c / 255.0, 1.0},
+      Color{0xf3 / 255.0, 0x90 / 255.0, 0x60 / 255.0, 1.0},
+      Color{0xff / 255.0, 0xb5 / 255.0, 0x6b / 250.0, 1.0}};
+  std::vector<Scalar> stops = {
+      0.0,
+      (1.0 / 6.0) * 1,
+      (1.0 / 6.0) * 2,
+      (1.0 / 6.0) * 3,
+      (1.0 / 6.0) * 4,
+      (1.0 / 6.0) * 5,
+      1.0,
+  };
+
+  auto texture = CreateTextureForFixture("airplane.jpg",
+                                         /*enable_mipmapping=*/true);
+
+  draw(paint);
+
+  paint.color_source = ColorSource::MakeRadialGradient(
+      {100, 100}, 200, std::move(colors), std::move(stops),
+      Entity::TileMode::kMirror, {});
+  draw(paint);
+
+  paint.color_source = ColorSource::MakeImage(
+      texture, Entity::TileMode::kRepeat, Entity::TileMode::kRepeat, {},
+      Matrix::MakeTranslation({-150, 75}));
+  draw(paint);
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, DrawRectStrokesRenderCorrectly) {
+  Canvas canvas;
+  Paint paint;
+  paint.color = Color::Red();
+  paint.style = Paint::Style::kStroke;
+  paint.stroke_width = 10;
+
+  canvas.Translate({100, 100});
+  canvas.DrawPath(
+      PathBuilder{}.AddRect(Rect::MakeSize(Size{100, 100})).TakePath(),
+      {paint});
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, DrawRectStrokesWithBevelJoinRenderCorrectly) {
+  Canvas canvas;
+  Paint paint;
+  paint.color = Color::Red();
+  paint.style = Paint::Style::kStroke;
+  paint.stroke_width = 10;
+  paint.stroke_join = Join::kBevel;
+
+  canvas.Translate({100, 100});
+  canvas.DrawPath(
+      PathBuilder{}.AddRect(Rect::MakeSize(Size{100, 100})).TakePath(),
+      {paint});
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, CanDrawMultiContourConvexPath) {
+  PathBuilder builder = {};
+  for (auto i = 0; i < 10; i++) {
+    if (i % 2 == 0) {
+      builder.AddCircle(Point(100 + 50 * i, 100 + 50 * i), 100);
+    } else {
+      builder.MoveTo({100.f + 50.f * i - 100, 100.f + 50.f * i});
+      builder.LineTo({100.f + 50.f * i, 100.f + 50.f * i - 100});
+      builder.LineTo({100.f + 50.f * i - 100, 100.f + 50.f * i - 100});
+      builder.Close();
+    }
+  }
+  builder.SetConvexity(Convexity::kConvex);
+
+  Canvas canvas;
+  canvas.DrawPath(builder.TakePath(), {.color = Color::Red().WithAlpha(0.4)});
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, ArcWithZeroSweepAndBlur) {
+  Canvas canvas;
+  canvas.Scale(GetContentScale());
+
+  Paint paint;
+  paint.color = Color::Red();
+  std::vector<Color> colors = {Color{1.0, 0.0, 0.0, 1.0},
+                               Color{0.0, 0.0, 0.0, 1.0}};
+  std::vector<Scalar> stops = {0.0, 1.0};
+  paint.color_source = ColorSource::MakeSweepGradient(
+      {100, 100}, Degrees(45), Degrees(135), std::move(colors),
+      std::move(stops), Entity::TileMode::kMirror, {});
+  paint.mask_blur_descriptor = Paint::MaskBlurDescriptor{
+      .style = FilterContents::BlurStyle::kNormal,
+      .sigma = Sigma(20),
+  };
+
+  PathBuilder builder;
+  builder.AddArc(Rect::MakeXYWH(10, 10, 100, 100), Degrees(0), Degrees(0),
+                 false);
+  canvas.DrawPath(builder.TakePath(), paint);
+
+  // Check that this empty picture can be created without crashing.
+  canvas.EndRecordingAsPicture();
+}
+
+TEST_P(AiksTest, CanRenderClips) {
+  Canvas canvas;
+  Paint paint;
+  paint.color = Color::Fuchsia();
+  canvas.ClipPath(
+      PathBuilder{}.AddRect(Rect::MakeXYWH(0, 0, 500, 500)).TakePath());
+  canvas.DrawPath(PathBuilder{}.AddCircle({500, 500}, 250).TakePath(), paint);
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, CanRenderOverlappingMultiContourPath) {
+  Canvas canvas;
+
+  Paint paint;
+  paint.color = Color::Red();
+
+  PathBuilder::RoundingRadii radii;
+  radii.top_left = {50, 50};
+  radii.top_right = {50, 50};
+  radii.bottom_right = {50, 50};
+  radii.bottom_left = {50, 50};
+
+  const Scalar kTriangleHeight = 100;
+  canvas.Translate(Vector2(200, 200));
+  // Form a path similar to the Material drop slider value indicator. Both
+  // shapes should render identically side-by-side.
+  {
+    auto path =
+        PathBuilder{}
+            .MoveTo({0, kTriangleHeight})
+            .LineTo({-kTriangleHeight / 2.0f, 0})
+            .LineTo({kTriangleHeight / 2.0f, 0})
+            .Close()
+            .AddRoundedRect(
+                Rect::MakeXYWH(-kTriangleHeight / 2.0f, -kTriangleHeight / 2.0f,
+                               kTriangleHeight, kTriangleHeight),
+                radii)
+            .TakePath();
+
+    canvas.DrawPath(path, paint);
+  }
+  canvas.Translate(Vector2(100, 0));
+  {
+    auto path =
+        PathBuilder{}
+            .MoveTo({0, kTriangleHeight})
+            .LineTo({-kTriangleHeight / 2.0f, 0})
+            .LineTo({0, -10})
+            .LineTo({kTriangleHeight / 2.0f, 0})
+            .Close()
+            .AddRoundedRect(
+                Rect::MakeXYWH(-kTriangleHeight / 2.0f, -kTriangleHeight / 2.0f,
+                               kTriangleHeight, kTriangleHeight),
+                radii)
+            .TakePath();
+
+    canvas.DrawPath(path, paint);
+  }
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/aiks/aiks_playground.cc b/impeller/aiks/aiks_playground.cc
index dab73f5839615627286e4875191f40f45fc5ed3d..db1545425f77169953fa80424ce4156c20cb904b 100644
--- a/impeller/aiks/aiks_playground.cc
+++ b/impeller/aiks/aiks_playground.cc
@@ -4,36 +4,63 @@
 
 #include "impeller/aiks/aiks_playground.h"
 
+#include <memory>
+
 #include "impeller/aiks/aiks_context.h"
+#include "impeller/typographer/backends/skia/typographer_context_skia.h"
+#include "impeller/typographer/typographer_context.h"
 
 namespace impeller {
 
-AiksPlayground::AiksPlayground() = default;
+AiksPlayground::AiksPlayground()
+    : typographer_context_(TypographerContextSkia::Make()) {}
 
 AiksPlayground::~AiksPlayground() = default;
 
-bool AiksPlayground::OpenPlaygroundHere(const Picture& picture) {
-  return OpenPlaygroundHere(
-      [&picture](AiksContext& renderer, RenderTarget& render_target) -> bool {
-        return renderer.Render(picture, render_target);
-      });
+void AiksPlayground::SetTypographerContext(
+    std::shared_ptr<TypographerContext> typographer_context) {
+  typographer_context_ = std::move(typographer_context);
+}
+
+void AiksPlayground::TearDown() {
+  inspector_.HackResetDueToTextureLeaks();
+  PlaygroundTest::TearDown();
+}
+
+bool AiksPlayground::OpenPlaygroundHere(Picture picture) {
+  return OpenPlaygroundHere([&picture](AiksContext& renderer) -> Picture {
+    return std::move(picture);
+  });
 }
 
 bool AiksPlayground::OpenPlaygroundHere(AiksPlaygroundCallback callback) {
-  if (!Playground::is_enabled()) {
+  if (!switches_.enable_playground) {
     return true;
   }
 
-  AiksContext renderer(GetContext());
+  AiksContext renderer(GetContext(), typographer_context_);
 
   if (!renderer.IsValid()) {
     return false;
   }
 
   return Playground::OpenPlaygroundHere(
-      [&renderer, &callback](RenderTarget& render_target) -> bool {
-        return callback(renderer, render_target);
+      [this, &renderer, &callback](RenderTarget& render_target) -> bool {
+        const std::optional<Picture>& picture = inspector_.RenderInspector(
+            renderer, [&]() { return callback(renderer); });
+
+        if (!picture.has_value()) {
+          return false;
+        }
+        return renderer.Render(*picture, render_target, true);
       });
 }
 
+bool AiksPlayground::ImGuiBegin(const char* name,
+                                bool* p_open,
+                                ImGuiWindowFlags flags) {
+  ImGui::Begin(name, p_open, flags);
+  return true;
+}
+
 }  // namespace impeller
diff --git a/impeller/aiks/aiks_playground.h b/impeller/aiks/aiks_playground.h
index 02647faa7e3b11c154344c4c0bbcad52dc366f3f..9a6bfc90beb09cd3f514a4e263c52c887dfb4091 100644
--- a/impeller/aiks/aiks_playground.h
+++ b/impeller/aiks/aiks_playground.h
@@ -2,30 +2,50 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_AIKS_AIKS_PLAYGROUND_H_
+#define FLUTTER_IMPELLER_AIKS_AIKS_PLAYGROUND_H_
 
 #include "flutter/fml/macros.h"
 #include "impeller/aiks/aiks_context.h"
+#include "impeller/aiks/aiks_playground_inspector.h"
 #include "impeller/aiks/picture.h"
 #include "impeller/playground/playground_test.h"
+#include "impeller/typographer/typographer_context.h"
+#include "third_party/imgui/imgui.h"
 
 namespace impeller {
 
 class AiksPlayground : public PlaygroundTest {
  public:
   using AiksPlaygroundCallback =
-      std::function<bool(AiksContext& renderer, RenderTarget& render_target)>;
+      std::function<std::optional<Picture>(AiksContext& renderer)>;
 
   AiksPlayground();
 
   ~AiksPlayground();
 
-  bool OpenPlaygroundHere(const Picture& picture);
+  void TearDown() override;
+
+  void SetTypographerContext(
+      std::shared_ptr<TypographerContext> typographer_context);
+
+  bool OpenPlaygroundHere(Picture picture);
 
   bool OpenPlaygroundHere(AiksPlaygroundCallback callback);
 
+  static bool ImGuiBegin(const char* name,
+                         bool* p_open,
+                         ImGuiWindowFlags flags);
+
  private:
-  FML_DISALLOW_COPY_AND_ASSIGN(AiksPlayground);
+  std::shared_ptr<TypographerContext> typographer_context_;
+  AiksInspector inspector_;
+
+  AiksPlayground(const AiksPlayground&) = delete;
+
+  AiksPlayground& operator=(const AiksPlayground&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_AIKS_AIKS_PLAYGROUND_H_
diff --git a/impeller/aiks/aiks_playground_inspector.cc b/impeller/aiks/aiks_playground_inspector.cc
new file mode 100644
index 0000000000000000000000000000000000000000..89ace8c5d12839198da265bfa3e95a6c8b0376cf
--- /dev/null
+++ b/impeller/aiks/aiks_playground_inspector.cc
@@ -0,0 +1,277 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/aiks/aiks_playground_inspector.h"
+
+#include <initializer_list>
+
+#include "impeller/core/capture.h"
+#include "impeller/entity/entity_pass.h"
+#include "impeller/renderer/context.h"
+#include "third_party/imgui/imgui.h"
+#include "third_party/imgui/imgui_internal.h"
+
+namespace impeller {
+
+static const char* kElementsWindowName = "Elements";
+static const char* kPropertiesWindowName = "Properties";
+
+static const std::initializer_list<std::string> kSupportedDocuments = {
+    EntityPass::kCaptureDocumentName};
+
+AiksInspector::AiksInspector() = default;
+
+const std::optional<Picture>& AiksInspector::RenderInspector(
+    AiksContext& aiks_context,
+    const std::function<std::optional<Picture>()>& picture_callback) {
+  //----------------------------------------------------------------------------
+  /// Configure the next frame.
+  ///
+
+  RenderCapture(aiks_context.GetContext()->capture);
+
+  //----------------------------------------------------------------------------
+  /// Configure the next frame.
+  ///
+
+  if (ImGui::IsKeyPressed(ImGuiKey_Z)) {
+    wireframe_ = !wireframe_;
+    aiks_context.GetContentContext().SetWireframe(wireframe_);
+  }
+
+  if (ImGui::IsKeyPressed(ImGuiKey_C)) {
+    capturing_ = !capturing_;
+    if (capturing_) {
+      aiks_context.GetContext()->capture =
+          CaptureContext::MakeAllowlist({kSupportedDocuments});
+    }
+  }
+  if (!capturing_) {
+    hovered_element_ = nullptr;
+    selected_element_ = nullptr;
+    aiks_context.GetContext()->capture = CaptureContext::MakeInactive();
+    std::optional<Picture> new_picture = picture_callback();
+
+    // If the new picture doesn't have a pass, that means it was already moved
+    // into the inspector. Simply re-emit the last received valid picture.
+    if (!new_picture.has_value() || new_picture->pass) {
+      last_picture_ = std::move(new_picture);
+    }
+  }
+
+  return last_picture_;
+}
+
+void AiksInspector::HackResetDueToTextureLeaks() {
+  last_picture_.reset();
+}
+
+static const auto kPropertiesProcTable = CaptureProcTable{
+    .boolean =
+        [](CaptureBooleanProperty& p) {
+          ImGui::Checkbox(p.label.c_str(), &p.value);
+        },
+    .integer =
+        [](CaptureIntegerProperty& p) {
+          if (p.options.range.has_value()) {
+            ImGui::SliderInt(p.label.c_str(), &p.value,
+                             static_cast<int>(p.options.range->min),
+                             static_cast<int>(p.options.range->max));
+            return;
+          }
+          ImGui::InputInt(p.label.c_str(), &p.value);
+        },
+    .scalar =
+        [](CaptureScalarProperty& p) {
+          if (p.options.range.has_value()) {
+            ImGui::SliderFloat(p.label.c_str(), &p.value, p.options.range->min,
+                               p.options.range->max);
+            return;
+          }
+          ImGui::DragFloat(p.label.c_str(), &p.value, 0.01);
+        },
+    .point =
+        [](CapturePointProperty& p) {
+          if (p.options.range.has_value()) {
+            ImGui::SliderFloat2(p.label.c_str(),
+                                reinterpret_cast<float*>(&p.value),
+                                p.options.range->min, p.options.range->max);
+            return;
+          }
+          ImGui::DragFloat2(p.label.c_str(), reinterpret_cast<float*>(&p.value),
+                            0.01);
+        },
+    .vector3 =
+        [](CaptureVector3Property& p) {
+          if (p.options.range.has_value()) {
+            ImGui::SliderFloat3(p.label.c_str(),
+                                reinterpret_cast<float*>(&p.value),
+                                p.options.range->min, p.options.range->max);
+            return;
+          }
+          ImGui::DragFloat3(p.label.c_str(), reinterpret_cast<float*>(&p.value),
+                            0.01);
+        },
+    .rect =
+        [](CaptureRectProperty& p) {
+          ImGui::DragFloat4(p.label.c_str(), reinterpret_cast<float*>(&p.value),
+                            0.01);
+        },
+    .color =
+        [](CaptureColorProperty& p) {
+          ImGui::ColorEdit4(p.label.c_str(),
+                            reinterpret_cast<float*>(&p.value));
+        },
+    .matrix =
+        [](CaptureMatrixProperty& p) {
+          float* pointer = reinterpret_cast<float*>(&p.value);
+          ImGui::DragFloat4((p.label + " X basis").c_str(), pointer, 0.001);
+          ImGui::DragFloat4((p.label + " Y basis").c_str(), pointer + 4, 0.001);
+          ImGui::DragFloat4((p.label + " Z basis").c_str(), pointer + 8, 0.001);
+          ImGui::DragFloat4((p.label + " Translation").c_str(), pointer + 12,
+                            0.001);
+        },
+    .string =
+        [](CaptureStringProperty& p) {
+          ImGui::InputTextEx(p.label.c_str(), "",
+                             // Fine as long as it's read-only.
+                             const_cast<char*>(p.value.c_str()), p.value.size(),
+                             ImVec2(0, 0), ImGuiInputTextFlags_ReadOnly);
+        },
+};
+
+void AiksInspector::RenderCapture(CaptureContext& capture_context) {
+  if (!capturing_) {
+    return;
+  }
+
+  auto document = capture_context.GetDocument(EntityPass::kCaptureDocumentName);
+
+  //----------------------------------------------------------------------------
+  /// Setup a shared dockspace to collect the capture windows.
+  ///
+
+  ImGui::SetNextWindowBgAlpha(0.5);
+  ImGui::Begin("Capture");
+  auto dockspace_id = ImGui::GetID("CaptureDockspace");
+  if (!ImGui::DockBuilderGetNode(dockspace_id)) {
+    ImGui::SetWindowSize(ImVec2(370, 680));
+    ImGui::SetWindowPos(ImVec2(640, 55));
+
+    ImGui::DockBuilderRemoveNode(dockspace_id);
+    ImGui::DockBuilderAddNode(dockspace_id);
+
+    ImGuiID opposite_id;
+    ImGuiID up_id = ImGui::DockBuilderSplitNode(dockspace_id, ImGuiDir_Up, 0.6,
+                                                nullptr, &opposite_id);
+    ImGuiID down_id = ImGui::DockBuilderSplitNode(opposite_id, ImGuiDir_Down,
+                                                  0.0, nullptr, nullptr);
+    ImGui::DockBuilderDockWindow(kElementsWindowName, up_id);
+    ImGui::DockBuilderDockWindow(kPropertiesWindowName, down_id);
+
+    ImGui::DockBuilderFinish(dockspace_id);
+  }
+  ImGui::DockSpace(dockspace_id);
+  ImGui::End();  // Capture window.
+
+  //----------------------------------------------------------------------------
+  /// Element hierarchy window.
+  ///
+
+  ImGui::Begin(kElementsWindowName);
+  auto root_element = document.GetElement();
+  hovered_element_ = nullptr;
+  if (root_element) {
+    RenderCaptureElement(*root_element);
+  }
+  ImGui::End();  // Hierarchy window.
+
+  if (selected_element_) {
+    //----------------------------------------------------------------------------
+    /// Properties window.
+    ///
+
+    ImGui::Begin(kPropertiesWindowName);
+    {
+      selected_element_->properties.Iterate([&](CaptureProperty& property) {
+        property.Invoke(kPropertiesProcTable);
+      });
+    }
+    ImGui::End();  // Inspector window.
+
+    //----------------------------------------------------------------------------
+    /// Selected coverage highlighting.
+    ///
+
+    auto coverage_property =
+        selected_element_->properties.FindFirstByLabel("Coverage");
+    if (coverage_property) {
+      auto coverage = coverage_property->AsRect();
+      if (coverage.has_value()) {
+        Scalar scale = ImGui::GetWindowDpiScale();
+        ImGui::GetBackgroundDrawList()->AddRect(
+            ImVec2(coverage->GetLeft() / scale,
+                   coverage->GetTop() / scale),  // p_min
+            ImVec2(coverage->GetRight() / scale,
+                   coverage->GetBottom() / scale),  // p_max
+            0x992222FF,                             // col
+            0.0,                                    // rounding
+            ImDrawFlags_None,                       // flags
+            8.0);                                   // thickness
+      }
+    }
+  }
+
+  //----------------------------------------------------------------------------
+  /// Hover coverage highlight.
+  ///
+
+  if (hovered_element_) {
+    auto coverage_property =
+        hovered_element_->properties.FindFirstByLabel("Coverage");
+    if (coverage_property) {
+      auto coverage = coverage_property->AsRect();
+      if (coverage.has_value()) {
+        Scalar scale = ImGui::GetWindowDpiScale();
+        ImGui::GetBackgroundDrawList()->AddRect(
+            ImVec2(coverage->GetLeft() / scale,
+                   coverage->GetTop() / scale),  // p_min
+            ImVec2(coverage->GetRight() / scale,
+                   coverage->GetBottom() / scale),  // p_max
+            0x66FF2222,                             // col
+            0.0,                                    // rounding
+            ImDrawFlags_None,                       // flags
+            8.0);                                   // thickness
+      }
+    }
+  }
+}
+
+void AiksInspector::RenderCaptureElement(CaptureElement& element) {
+  ImGui::PushID(&element);
+
+  bool is_selected = selected_element_ == &element;
+  bool has_children = element.children.Count() > 0;
+
+  bool opened = ImGui::TreeNodeEx(
+      element.label.c_str(), (is_selected ? ImGuiTreeNodeFlags_Selected : 0) |
+                                 (has_children ? 0 : ImGuiTreeNodeFlags_Leaf) |
+                                 ImGuiTreeNodeFlags_SpanFullWidth |
+                                 ImGuiTreeNodeFlags_OpenOnArrow |
+                                 ImGuiTreeNodeFlags_DefaultOpen);
+  if (ImGui::IsItemClicked()) {
+    selected_element_ = &element;
+  }
+  if (ImGui::IsItemHovered()) {
+    hovered_element_ = &element;
+  }
+  if (opened) {
+    element.children.Iterate(
+        [&](CaptureElement& child) { RenderCaptureElement(child); });
+    ImGui::TreePop();
+  }
+  ImGui::PopID();
+}
+
+}  // namespace impeller
diff --git a/impeller/aiks/aiks_playground_inspector.h b/impeller/aiks/aiks_playground_inspector.h
new file mode 100644
index 0000000000000000000000000000000000000000..297fb16b64e698d9593335d543eee8daa22c7e73
--- /dev/null
+++ b/impeller/aiks/aiks_playground_inspector.h
@@ -0,0 +1,55 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_AIKS_AIKS_PLAYGROUND_INSPECTOR_H_
+#define FLUTTER_IMPELLER_AIKS_AIKS_PLAYGROUND_INSPECTOR_H_
+
+#include <functional>
+#include <optional>
+
+#include "flutter/fml/macros.h"
+#include "impeller/aiks/aiks_context.h"
+#include "impeller/aiks/picture.h"
+#include "impeller/core/capture.h"
+#include "impeller/renderer/context.h"
+
+namespace impeller {
+
+class AiksInspector {
+ public:
+  AiksInspector();
+
+  const std::optional<Picture>& RenderInspector(
+      AiksContext& aiks_context,
+      const std::function<std::optional<Picture>()>& picture_callback);
+
+  // Resets (releases) the underlying |Picture| object.
+  //
+  // Underlying issue: <https://github.com/flutter/flutter/issues/134678>.
+  //
+  // The tear-down code is not running in the right order; we still have a
+  // reference to the |Picture| object when the |Context| is being destroyed,
+  // which causes the |Texture| objects to leak.
+  //
+  // TODO(matanlurey): https://github.com/flutter/flutter/issues/134748.
+  void HackResetDueToTextureLeaks();
+
+ private:
+  void RenderCapture(CaptureContext& capture_context);
+  void RenderCaptureElement(CaptureElement& element);
+
+  bool capturing_ = false;
+  bool wireframe_ = false;
+  CaptureElement* hovered_element_ = nullptr;
+  CaptureElement* selected_element_ = nullptr;
+  std::optional<Picture> last_picture_;
+
+  AiksInspector(const AiksInspector&) = delete;
+
+  AiksInspector& operator=(const AiksInspector&) = delete;
+};
+
+};  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_AIKS_AIKS_PLAYGROUND_INSPECTOR_H_
diff --git a/impeller/aiks/aiks_unittests.cc b/impeller/aiks/aiks_unittests.cc
index 05d92280ce4a486b3f4bde7781aa63883af31c01..7df6ebd554cb6dc1714f41a3de6e99ac40266be1 100644
--- a/impeller/aiks/aiks_unittests.cc
+++ b/impeller/aiks/aiks_unittests.cc
@@ -2,42 +2,58 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "flutter/impeller/aiks/aiks_unittests.h"
+
+#include <algorithm>
 #include <array>
 #include <cmath>
-#include <iostream>
+#include <cstdlib>
+#include <memory>
 #include <tuple>
 #include <utility>
+#include <vector>
 
 #include "flutter/testing/testing.h"
-#include "impeller/aiks/aiks_playground.h"
 #include "impeller/aiks/canvas.h"
+#include "impeller/aiks/color_filter.h"
 #include "impeller/aiks/image.h"
-#include "impeller/entity/contents/filters/inputs/filter_input.h"
-#include "impeller/entity/contents/tiled_texture_contents.h"
+#include "impeller/aiks/image_filter.h"
+#include "impeller/aiks/paint_pass_delegate.h"
+#include "impeller/aiks/testing/context_spy.h"
+#include "impeller/core/capture.h"
+#include "impeller/entity/contents/solid_color_contents.h"
+#include "impeller/entity/render_target_cache.h"
 #include "impeller/geometry/color.h"
 #include "impeller/geometry/constants.h"
-#include "impeller/geometry/geometry_unittests.h"
+#include "impeller/geometry/geometry_asserts.h"
 #include "impeller/geometry/matrix.h"
+#include "impeller/geometry/path.h"
 #include "impeller/geometry/path_builder.h"
+#include "impeller/geometry/rect.h"
+#include "impeller/geometry/size.h"
 #include "impeller/playground/widgets.h"
 #include "impeller/renderer/command_buffer.h"
 #include "impeller/renderer/snapshot.h"
 #include "impeller/typographer/backends/skia/text_frame_skia.h"
-#include "impeller/typographer/backends/skia/text_render_context_skia.h"
-#include "third_party/skia/include/core/SkData.h"
+#include "impeller/typographer/backends/skia/typographer_context_skia.h"
+#include "impeller/typographer/backends/stb/text_frame_stb.h"
+#include "impeller/typographer/backends/stb/typeface_stb.h"
+#include "impeller/typographer/backends/stb/typographer_context_stb.h"
+#include "third_party/imgui/imgui.h"
+#include "third_party/skia/include/core/SkFontMgr.h"
+#include "txt/platform.h"
 
 namespace impeller {
 namespace testing {
 
-using AiksTest = AiksPlayground;
 INSTANTIATE_PLAYGROUND_SUITE(AiksTest);
 
 TEST_P(AiksTest, CanvasCTMCanBeUpdated) {
   Canvas canvas;
   Matrix identity;
-  ASSERT_MATRIX_NEAR(canvas.GetCurrentTransformation(), identity);
+  ASSERT_MATRIX_NEAR(canvas.GetCurrentTransform(), identity);
   canvas.Translate(Size{100, 100});
-  ASSERT_MATRIX_NEAR(canvas.GetCurrentTransformation(),
+  ASSERT_MATRIX_NEAR(canvas.GetCurrentTransform(),
                      Matrix::MakeTranslation({100.0, 100.0, 0.0}));
 }
 
@@ -49,11 +65,11 @@ TEST_P(AiksTest, CanvasCanPushPopCTM) {
   canvas.Translate(Size{100, 100});
   canvas.Save();
   ASSERT_EQ(canvas.GetSaveCount(), 2u);
-  ASSERT_MATRIX_NEAR(canvas.GetCurrentTransformation(),
+  ASSERT_MATRIX_NEAR(canvas.GetCurrentTransform(),
                      Matrix::MakeTranslation({100.0, 100.0, 0.0}));
   ASSERT_TRUE(canvas.Restore());
   ASSERT_EQ(canvas.GetSaveCount(), 1u);
-  ASSERT_MATRIX_NEAR(canvas.GetCurrentTransformation(),
+  ASSERT_MATRIX_NEAR(canvas.GetCurrentTransform(),
                      Matrix::MakeTranslation({100.0, 100.0, 0.0}));
 }
 
@@ -77,6 +93,66 @@ TEST_P(AiksTest, CanRenderImage) {
   ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
 }
 
+TEST_P(AiksTest, CanRenderInvertedImageWithColorFilter) {
+  Canvas canvas;
+  Paint paint;
+  auto image = std::make_shared<Image>(CreateTextureForFixture("kalimba.jpg"));
+  paint.color = Color::Red();
+  paint.color_filter =
+      ColorFilter::MakeBlend(BlendMode::kSourceOver, Color::Yellow());
+  paint.invert_colors = true;
+
+  canvas.DrawImage(image, Point::MakeXY(100.0, 100.0), paint);
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, CanRenderColorFilterWithInvertColors) {
+  Canvas canvas;
+  Paint paint;
+  paint.color = Color::Red();
+  paint.color_filter =
+      ColorFilter::MakeBlend(BlendMode::kSourceOver, Color::Yellow());
+  paint.invert_colors = true;
+
+  canvas.DrawRect(Rect::MakeLTRB(0, 0, 100, 100), paint);
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, CanRenderColorFilterWithInvertColorsDrawPaint) {
+  Canvas canvas;
+  Paint paint;
+  paint.color = Color::Red();
+  paint.color_filter =
+      ColorFilter::MakeBlend(BlendMode::kSourceOver, Color::Yellow());
+  paint.invert_colors = true;
+
+  canvas.DrawPaint(paint);
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, CanRenderAdvancedBlendColorFilterWithSaveLayer) {
+  Canvas canvas;
+
+  Rect layer_rect = Rect::MakeXYWH(0, 0, 500, 500);
+  canvas.ClipRect(layer_rect);
+
+  canvas.SaveLayer(
+      {
+          .color_filter = ColorFilter::MakeBlend(BlendMode::kDifference,
+                                                 Color(0, 1, 0, 0.5)),
+      },
+      layer_rect);
+
+  Paint paint;
+  canvas.DrawPaint({.color = Color::Black()});
+  canvas.DrawRect(Rect::MakeXYWH(100, 100, 300, 300),
+                  {.color = Color::White()});
+  canvas.Restore();
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+namespace {
 bool GenerateMipmap(const std::shared_ptr<Context>& context,
                     std::shared_ptr<Texture> texture,
                     std::string label) {
@@ -89,130 +165,174 @@ bool GenerateMipmap(const std::shared_ptr<Context>& context,
     return false;
   }
   pass->GenerateMipmap(std::move(texture), std::move(label));
+
   pass->EncodeCommands(context->GetResourceAllocator());
-  return true;
+  return context->GetCommandQueue()->Submit({buffer}).ok();
 }
 
-TEST_P(AiksTest, CanRenderTiledTexture) {
-  auto context = GetContext();
+void CanRenderTiledTexture(AiksTest* aiks_test,
+                           Entity::TileMode tile_mode,
+                           Matrix local_matrix = {}) {
+  auto context = aiks_test->GetContext();
   ASSERT_TRUE(context);
-  bool first_frame = true;
-  auto texture = CreateTextureForFixture("table_mountain_nx.png",
-                                         /*enable_mipmapping=*/true);
-  auto callback = [&](AiksContext& renderer, RenderTarget& render_target) {
-    if (first_frame) {
-      first_frame = false;
-      GenerateMipmap(context, texture, "table_mountain_nx");
-    }
+  auto texture = aiks_test->CreateTextureForFixture("table_mountain_nx.png",
+                                                    /*enable_mipmapping=*/true);
+  GenerateMipmap(context, texture, "table_mountain_nx");
+  Canvas canvas;
+  canvas.Scale(aiks_test->GetContentScale());
+  canvas.Translate({100.0f, 100.0f, 0});
+  Paint paint;
+  paint.color_source =
+      ColorSource::MakeImage(texture, tile_mode, tile_mode, {}, local_matrix);
+  paint.color = Color(1, 1, 1, 1);
+  canvas.DrawRect(Rect::MakeXYWH(0, 0, 600, 600), paint);
 
-    const char* tile_mode_names[] = {"Clamp", "Repeat", "Mirror", "Decal"};
-    const Entity::TileMode tile_modes[] = {
-        Entity::TileMode::kClamp, Entity::TileMode::kRepeat,
-        Entity::TileMode::kMirror, Entity::TileMode::kDecal};
-    const char* mip_filter_names[] = {"None", "Nearest", "Linear"};
-    const MipFilter mip_filters[] = {MipFilter::kNone, MipFilter::kNearest,
-                                     MipFilter::kLinear};
-    const char* min_mag_filter_names[] = {"Nearest", "Linear"};
-    const MinMagFilter min_mag_filters[] = {MinMagFilter::kNearest,
-                                            MinMagFilter::kLinear};
-    static int selected_x_tile_mode = 0;
-    static int selected_y_tile_mode = 0;
-    static int selected_mip_filter = 0;
-    static int selected_min_mag_filter = 0;
-    static float alpha = 1.0;
-    ImGui::Begin("Controls", nullptr, ImGuiWindowFlags_AlwaysAutoResize);
-    ImGui::SliderFloat("Alpha", &alpha, 0.0, 1.0);
-    ImGui::Combo("X tile mode", &selected_x_tile_mode, tile_mode_names,
-                 sizeof(tile_mode_names) / sizeof(char*));
-    ImGui::Combo("Y tile mode", &selected_y_tile_mode, tile_mode_names,
-                 sizeof(tile_mode_names) / sizeof(char*));
-    ImGui::Combo("Mip filter", &selected_mip_filter, mip_filter_names,
-                 sizeof(mip_filter_names) / sizeof(char*));
-    ImGui::Combo("Min Mag filter", &selected_min_mag_filter,
-                 min_mag_filter_names,
-                 sizeof(min_mag_filter_names) / sizeof(char*));
-    static Matrix matrix = {
-        1, 0, 0, 0,  //
-        0, 1, 0, 0,  //
-        0, 0, 1, 0,  //
-        0, 0, 0, 1   //
-    };
-    std::string label = "##1";
-    for (int i = 0; i < 4; i++) {
-      ImGui::InputScalarN(label.c_str(), ImGuiDataType_Float, &(matrix.vec[i]),
-                          4, NULL, NULL, "%.2f", 0);
-      label[2]++;
-    }
-    ImGui::End();
+  // Should not change the image.
+  constexpr auto stroke_width = 64;
+  paint.style = Paint::Style::kStroke;
+  paint.stroke_width = stroke_width;
+  if (tile_mode == Entity::TileMode::kDecal) {
+    canvas.DrawRect(Rect::MakeXYWH(stroke_width, stroke_width, 600, 600),
+                    paint);
+  } else {
+    canvas.DrawRect(Rect::MakeXYWH(0, 0, 600, 600), paint);
+  }
 
-    Canvas canvas;
-    Paint paint;
-    canvas.Translate({100.0, 100.0, 0});
-    auto x_tile_mode = tile_modes[selected_x_tile_mode];
-    auto y_tile_mode = tile_modes[selected_y_tile_mode];
-    SamplerDescriptor descriptor;
-    descriptor.mip_filter = mip_filters[selected_mip_filter];
-    descriptor.min_filter = min_mag_filters[selected_min_mag_filter];
-    descriptor.mag_filter = min_mag_filters[selected_min_mag_filter];
-    paint.color_source = [texture, x_tile_mode, y_tile_mode, descriptor]() {
-      auto contents = std::make_shared<TiledTextureContents>();
-      contents->SetTexture(texture);
-      contents->SetTileModes(x_tile_mode, y_tile_mode);
-      contents->SetSamplerDescriptor(descriptor);
-      contents->SetMatrix(matrix);
-      return contents;
-    };
-    paint.color = Color(1, 1, 1, alpha);
-    canvas.DrawRect({0, 0, 600, 600}, paint);
-    return renderer.Render(canvas.EndRecordingAsPicture(), render_target);
-  };
-  ASSERT_TRUE(OpenPlaygroundHere(callback));
+  {
+    // Should not change the image.
+    PathBuilder path_builder;
+    path_builder.AddCircle({150, 150}, 150);
+    path_builder.AddRoundedRect(Rect::MakeLTRB(300, 300, 600, 600), 10);
+    paint.style = Paint::Style::kFill;
+    canvas.DrawPath(path_builder.TakePath(), paint);
+  }
+
+  {
+    // Should not change the image. Tests the Convex short-cut code.
+    PathBuilder path_builder;
+    path_builder.AddCircle({150, 450}, 150);
+    path_builder.SetConvexity(Convexity::kConvex);
+    paint.style = Paint::Style::kFill;
+    canvas.DrawPath(path_builder.TakePath(), paint);
+  }
+
+  ASSERT_TRUE(aiks_test->OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+}  // namespace
+
+TEST_P(AiksTest, CanRenderTiledTextureClamp) {
+  CanRenderTiledTexture(this, Entity::TileMode::kClamp);
+}
+
+TEST_P(AiksTest, CanRenderTiledTextureRepeat) {
+  CanRenderTiledTexture(this, Entity::TileMode::kRepeat);
+}
+
+TEST_P(AiksTest, CanRenderTiledTextureMirror) {
+  CanRenderTiledTexture(this, Entity::TileMode::kMirror);
+}
+
+TEST_P(AiksTest, CanRenderTiledTextureDecal) {
+  CanRenderTiledTexture(this, Entity::TileMode::kDecal);
+}
+
+TEST_P(AiksTest, CanRenderTiledTextureClampWithTranslate) {
+  CanRenderTiledTexture(this, Entity::TileMode::kClamp,
+                        Matrix::MakeTranslation({172.f, 172.f, 0.f}));
 }
 
 TEST_P(AiksTest, CanRenderImageRect) {
   Canvas canvas;
   Paint paint;
   auto image = std::make_shared<Image>(CreateTextureForFixture("kalimba.jpg"));
-  auto source_rect = Rect::MakeSize(Size(image->GetSize()));
+  Size image_half_size = Size(image->GetSize()) * 0.5;
 
   // Render the bottom right quarter of the source image in a stretched rect.
-  source_rect.size.width /= 2;
-  source_rect.size.height /= 2;
-  source_rect.origin.x += source_rect.size.width;
-  source_rect.origin.y += source_rect.size.height;
+  auto source_rect = Rect::MakeSize(image_half_size);
+  source_rect = source_rect.Shift(Point(image_half_size));
+
   canvas.DrawImageRect(image, source_rect, Rect::MakeXYWH(100, 100, 600, 600),
                        paint);
   ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
 }
 
-TEST_P(AiksTest, CanRenderStrokes) {
+TEST_P(AiksTest, CanRenderSimpleClips) {
   Canvas canvas;
+  canvas.Scale(GetContentScale());
   Paint paint;
-  paint.color = Color::Red();
-  paint.stroke_width = 20.0;
-  paint.style = Paint::Style::kStroke;
-  canvas.DrawPath(PathBuilder{}.AddLine({200, 100}, {800, 100}).TakePath(),
-                  paint);
-  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
-}
 
-TEST_P(AiksTest, CanRenderCurvedStrokes) {
-  Canvas canvas;
-  Paint paint;
-  paint.color = Color::Red();
-  paint.stroke_width = 25.0;
-  paint.style = Paint::Style::kStroke;
-  canvas.DrawPath(PathBuilder{}.AddCircle({500, 500}, 250).TakePath(), paint);
-  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
-}
+  paint.color = Color::White();
+  canvas.DrawPaint(paint);
+
+  auto draw = [&canvas](const Paint& paint, Scalar x, Scalar y) {
+    canvas.Save();
+    canvas.Translate({x, y});
+    {
+      canvas.Save();
+      canvas.ClipRect(Rect::MakeLTRB(50, 50, 150, 150));
+      canvas.DrawPaint(paint);
+      canvas.Restore();
+    }
+    {
+      canvas.Save();
+      canvas.ClipOval(Rect::MakeLTRB(200, 50, 300, 150));
+      canvas.DrawPaint(paint);
+      canvas.Restore();
+    }
+    {
+      canvas.Save();
+      canvas.ClipRRect(Rect::MakeLTRB(50, 200, 150, 300), {20, 20});
+      canvas.DrawPaint(paint);
+      canvas.Restore();
+    }
+    {
+      canvas.Save();
+      canvas.ClipRRect(Rect::MakeLTRB(200, 230, 300, 270), {20, 20});
+      canvas.DrawPaint(paint);
+      canvas.Restore();
+    }
+    {
+      canvas.Save();
+      canvas.ClipRRect(Rect::MakeLTRB(230, 200, 270, 300), {20, 20});
+      canvas.DrawPaint(paint);
+      canvas.Restore();
+    }
+    canvas.Restore();
+  };
+
+  paint.color = Color::Blue();
+  draw(paint, 0, 0);
+
+  std::vector<Color> gradient_colors = {
+      Color{0x1f / 255.0, 0.0, 0x5c / 255.0, 1.0},
+      Color{0x5b / 255.0, 0.0, 0x60 / 255.0, 1.0},
+      Color{0x87 / 255.0, 0x01 / 255.0, 0x60 / 255.0, 1.0},
+      Color{0xac / 255.0, 0x25 / 255.0, 0x53 / 255.0, 1.0},
+      Color{0xe1 / 255.0, 0x6b / 255.0, 0x5c / 255.0, 1.0},
+      Color{0xf3 / 255.0, 0x90 / 255.0, 0x60 / 255.0, 1.0},
+      Color{0xff / 255.0, 0xb5 / 255.0, 0x6b / 250.0, 1.0}};
+  std::vector<Scalar> stops = {
+      0.0,
+      (1.0 / 6.0) * 1,
+      (1.0 / 6.0) * 2,
+      (1.0 / 6.0) * 3,
+      (1.0 / 6.0) * 4,
+      (1.0 / 6.0) * 5,
+      1.0,
+  };
+  auto texture = CreateTextureForFixture("airplane.jpg",
+                                         /*enable_mipmapping=*/true);
+
+  paint.color_source = ColorSource::MakeRadialGradient(
+      {500, 600}, 75, std::move(gradient_colors), std::move(stops),
+      Entity::TileMode::kMirror, {});
+  draw(paint, 0, 300);
+
+  paint.color_source = ColorSource::MakeImage(
+      texture, Entity::TileMode::kRepeat, Entity::TileMode::kRepeat, {},
+      Matrix::MakeTranslation({0, 0}));
+  draw(paint, 300, 0);
 
-TEST_P(AiksTest, CanRenderClips) {
-  Canvas canvas;
-  Paint paint;
-  paint.color = Color::Fuchsia();
-  canvas.ClipPath(
-      PathBuilder{}.AddRect(Rect::MakeXYWH(0, 0, 500, 500)).TakePath());
-  canvas.DrawPath(PathBuilder{}.AddCircle({500, 500}, 250).TakePath(), paint);
   ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
 }
 
@@ -302,7 +422,7 @@ TEST_P(AiksTest, ClipsUseCurrentTransform) {
 
     paint.color = colors[i % colors.size()];
     canvas.ClipPath(PathBuilder{}.AddCircle({0, 0}, 300).TakePath());
-    canvas.DrawRect(Rect(-300, -300, 600, 600), paint);
+    canvas.DrawRect(Rect::MakeXYWH(-300, -300, 600, 600), paint);
   }
   ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
 }
@@ -325,473 +445,24 @@ TEST_P(AiksTest, CanSaveLayerStandalone) {
   ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
 }
 
-TEST_P(AiksTest, CanRenderLinearGradient) {
-  auto callback = [&](AiksContext& renderer, RenderTarget& render_target) {
-    const char* tile_mode_names[] = {"Clamp", "Repeat", "Mirror", "Decal"};
-    const Entity::TileMode tile_modes[] = {
-        Entity::TileMode::kClamp, Entity::TileMode::kRepeat,
-        Entity::TileMode::kMirror, Entity::TileMode::kDecal};
-
-    static int selected_tile_mode = 0;
-    static float alpha = 1;
-    ImGui::Begin("Controls", nullptr, ImGuiWindowFlags_AlwaysAutoResize);
-    ImGui::SliderFloat("Alpha", &alpha, 0, 1);
-    ImGui::Combo("Tile mode", &selected_tile_mode, tile_mode_names,
-                 sizeof(tile_mode_names) / sizeof(char*));
-    static Matrix matrix = {
-        1, 0, 0, 0,  //
-        0, 1, 0, 0,  //
-        0, 0, 1, 0,  //
-        0, 0, 0, 1   //
-    };
-    std::string label = "##1";
-    for (int i = 0; i < 4; i++) {
-      ImGui::InputScalarN(label.c_str(), ImGuiDataType_Float, &(matrix.vec[i]),
-                          4, NULL, NULL, "%.2f", 0);
-      label[2]++;
-    }
-    ImGui::End();
-
-    Canvas canvas;
-    Paint paint;
-    canvas.Translate({100.0, 100.0, 0});
-    auto tile_mode = tile_modes[selected_tile_mode];
-    paint.color_source = [tile_mode]() {
-      std::vector<Color> colors = {Color{0.9568, 0.2627, 0.2118, 1.0},
-                                   Color{0.1294, 0.5882, 0.9529, 0.0}};
-      std::vector<Scalar> stops = {0.0, 1.0};
-
-      auto contents = std::make_shared<LinearGradientContents>();
-      contents->SetEndPoints({0, 0}, {200, 200});
-      contents->SetColors(std::move(colors));
-      contents->SetStops(std::move(stops));
-      contents->SetTileMode(tile_mode);
-      contents->SetMatrix(matrix);
-      return contents;
-    };
-    paint.color = Color(1.0, 1.0, 1.0, alpha);
-    canvas.DrawRect({0, 0, 600, 600}, paint);
-    return renderer.Render(canvas.EndRecordingAsPicture(), render_target);
-  };
-  ASSERT_TRUE(OpenPlaygroundHere(callback));
-}
-
-TEST_P(AiksTest, CanRenderLinearGradientManyColors) {
-  auto callback = [&](AiksContext& renderer, RenderTarget& render_target) {
-    const char* tile_mode_names[] = {"Clamp", "Repeat", "Mirror", "Decal"};
-    const Entity::TileMode tile_modes[] = {
-        Entity::TileMode::kClamp, Entity::TileMode::kRepeat,
-        Entity::TileMode::kMirror, Entity::TileMode::kDecal};
-
-    static int selected_tile_mode = 0;
-    static float alpha = 1;
-    ImGui::Begin("Controls", nullptr, ImGuiWindowFlags_AlwaysAutoResize);
-    ImGui::SliderFloat("Alpha", &alpha, 0, 1);
-    ImGui::Combo("Tile mode", &selected_tile_mode, tile_mode_names,
-                 sizeof(tile_mode_names) / sizeof(char*));
-    static Matrix matrix = {
-        1, 0, 0, 0,  //
-        0, 1, 0, 0,  //
-        0, 0, 1, 0,  //
-        0, 0, 0, 1   //
-    };
-    std::string label = "##1";
-    for (int i = 0; i < 4; i++) {
-      ImGui::InputScalarN(label.c_str(), ImGuiDataType_Float, &(matrix.vec[i]),
-                          4, NULL, NULL, "%.2f", 0);
-      label[2]++;
-    }
-    ImGui::End();
-
-    Canvas canvas;
-    Paint paint;
-    canvas.Translate({100.0, 100.0, 0});
-    auto tile_mode = tile_modes[selected_tile_mode];
-    paint.color_source = [tile_mode]() {
-      std::vector<Color> colors = {
-          Color{0x1f / 255.0, 0.0, 0x5c / 255.0, 1.0},
-          Color{0x5b / 255.0, 0.0, 0x60 / 255.0, 1.0},
-          Color{0x87 / 255.0, 0x01 / 255.0, 0x60 / 255.0, 1.0},
-          Color{0xac / 255.0, 0x25 / 255.0, 0x53 / 255.0, 1.0},
-          Color{0xe1 / 255.0, 0x6b / 255.0, 0x5c / 255.0, 1.0},
-          Color{0xf3 / 255.0, 0x90 / 255.0, 0x60 / 255.0, 1.0},
-          Color{0xff / 255.0, 0xb5 / 255.0, 0x6b / 250.0, 1.0}};
-      std::vector<Scalar> stops = {
-          0.0,
-          (1.0 / 6.0) * 1,
-          (1.0 / 6.0) * 2,
-          (1.0 / 6.0) * 3,
-          (1.0 / 6.0) * 4,
-          (1.0 / 6.0) * 5,
-          1.0,
-      };
-
-      auto contents = std::make_shared<LinearGradientContents>();
-      contents->SetEndPoints({0, 0}, {200, 200});
-      contents->SetColors(std::move(colors));
-      contents->SetStops(std::move(stops));
-      contents->SetTileMode(tile_mode);
-      contents->SetMatrix(matrix);
-      return contents;
-    };
-    paint.color = Color(1.0, 1.0, 1.0, alpha);
-    canvas.DrawRect({0, 0, 600, 600}, paint);
-    return renderer.Render(canvas.EndRecordingAsPicture(), render_target);
-  };
-  ASSERT_TRUE(OpenPlaygroundHere(callback));
-}
-
-TEST_P(AiksTest, CanRenderLinearGradientWayManyColors) {
-  auto callback = [&](AiksContext& renderer, RenderTarget& render_target) {
-    const char* tile_mode_names[] = {"Clamp", "Repeat", "Mirror", "Decal"};
-    const Entity::TileMode tile_modes[] = {
-        Entity::TileMode::kClamp, Entity::TileMode::kRepeat,
-        Entity::TileMode::kMirror, Entity::TileMode::kDecal};
-
-    static int selected_tile_mode = 0;
-    ImGui::Begin("Controls", nullptr, ImGuiWindowFlags_AlwaysAutoResize);
-    ImGui::Combo("Tile mode", &selected_tile_mode, tile_mode_names,
-                 sizeof(tile_mode_names) / sizeof(char*));
-    static Matrix matrix = {
-        1, 0, 0, 0,  //
-        0, 1, 0, 0,  //
-        0, 0, 1, 0,  //
-        0, 0, 0, 1   //
-    };
-    std::string label = "##1";
-    for (int i = 0; i < 4; i++) {
-      ImGui::InputScalarN(label.c_str(), ImGuiDataType_Float, &(matrix.vec[i]),
-                          4, NULL, NULL, "%.2f", 0);
-      label[2]++;
-    }
-    ImGui::End();
-
-    Canvas canvas;
-    Paint paint;
-    canvas.Translate({100.0, 100.0, 0});
-    auto tile_mode = tile_modes[selected_tile_mode];
-    auto color = Color{0x1f / 255.0, 0.0, 0x5c / 255.0, 1.0};
-    std::vector<Color> colors;
-    std::vector<Scalar> stops;
-    auto current_stop = 0.0;
-    for (int i = 0; i < 2000; i++) {
-      colors.push_back(color);
-      stops.push_back(current_stop);
-      current_stop += 1 / 2000.0;
-    }
-    stops[2000 - 1] = 1.0;
-    paint.color_source = [tile_mode, stops = std::move(stops),
-                          colors = std::move(colors)]() {
-      auto contents = std::make_shared<LinearGradientContents>();
-      contents->SetEndPoints({0, 0}, {200, 200});
-      contents->SetColors(colors);
-      contents->SetStops(stops);
-      contents->SetTileMode(tile_mode);
-      contents->SetMatrix(matrix);
-      return contents;
-    };
-    canvas.DrawRect({0, 0, 600, 600}, paint);
-    return renderer.Render(canvas.EndRecordingAsPicture(), render_target);
-  };
-  ASSERT_TRUE(OpenPlaygroundHere(callback));
-}
-
-TEST_P(AiksTest, CanRenderLinearGradientManyColorsUnevenStops) {
-  auto callback = [&](AiksContext& renderer, RenderTarget& render_target) {
-    const char* tile_mode_names[] = {"Clamp", "Repeat", "Mirror", "Decal"};
-    const Entity::TileMode tile_modes[] = {
-        Entity::TileMode::kClamp, Entity::TileMode::kRepeat,
-        Entity::TileMode::kMirror, Entity::TileMode::kDecal};
-
-    static int selected_tile_mode = 0;
-    ImGui::Begin("Controls", nullptr, ImGuiWindowFlags_AlwaysAutoResize);
-    ImGui::Combo("Tile mode", &selected_tile_mode, tile_mode_names,
-                 sizeof(tile_mode_names) / sizeof(char*));
-    static Matrix matrix = {
-        1, 0, 0, 0,  //
-        0, 1, 0, 0,  //
-        0, 0, 1, 0,  //
-        0, 0, 0, 1   //
-    };
-    std::string label = "##1";
-    for (int i = 0; i < 4; i++) {
-      ImGui::InputScalarN(label.c_str(), ImGuiDataType_Float, &(matrix.vec[i]),
-                          4, NULL, NULL, "%.2f", 0);
-      label[2]++;
-    }
-    ImGui::End();
-
-    Canvas canvas;
-    Paint paint;
-    canvas.Translate({100.0, 100.0, 0});
-    auto tile_mode = tile_modes[selected_tile_mode];
-    paint.color_source = [tile_mode]() {
-      std::vector<Color> colors = {
-          Color{0x1f / 255.0, 0.0, 0x5c / 255.0, 1.0},
-          Color{0x5b / 255.0, 0.0, 0x60 / 255.0, 1.0},
-          Color{0x87 / 255.0, 0x01 / 255.0, 0x60 / 255.0, 1.0},
-          Color{0xac / 255.0, 0x25 / 255.0, 0x53 / 255.0, 1.0},
-          Color{0xe1 / 255.0, 0x6b / 255.0, 0x5c / 255.0, 1.0},
-          Color{0xf3 / 255.0, 0x90 / 255.0, 0x60 / 255.0, 1.0},
-          Color{0xff / 255.0, 0xb5 / 255.0, 0x6b / 250.0, 1.0}};
-      std::vector<Scalar> stops = {
-          0.0,         2.0 / 62.0,  4.0 / 62.0, 8.0 / 62.0,
-          16.0 / 62.0, 32.0 / 62.0, 1.0,
-      };
-
-      auto contents = std::make_shared<LinearGradientContents>();
-      contents->SetEndPoints({0, 0}, {200, 200});
-      contents->SetColors(std::move(colors));
-      contents->SetStops(std::move(stops));
-      contents->SetTileMode(tile_mode);
-      contents->SetMatrix(matrix);
-      return contents;
-    };
-    canvas.DrawRect({0, 0, 600, 600}, paint);
-    return renderer.Render(canvas.EndRecordingAsPicture(), render_target);
-  };
-  ASSERT_TRUE(OpenPlaygroundHere(callback));
-}
-
-TEST_P(AiksTest, CanRenderRadialGradient) {
-  auto callback = [&](AiksContext& renderer, RenderTarget& render_target) {
-    const char* tile_mode_names[] = {"Clamp", "Repeat", "Mirror", "Decal"};
-    const Entity::TileMode tile_modes[] = {
-        Entity::TileMode::kClamp, Entity::TileMode::kRepeat,
-        Entity::TileMode::kMirror, Entity::TileMode::kDecal};
-
-    static int selected_tile_mode = 0;
-    ImGui::Begin("Controls", nullptr, ImGuiWindowFlags_AlwaysAutoResize);
-    ImGui::Combo("Tile mode", &selected_tile_mode, tile_mode_names,
-                 sizeof(tile_mode_names) / sizeof(char*));
-    static Matrix matrix = {
-        1, 0, 0, 0,  //
-        0, 1, 0, 0,  //
-        0, 0, 1, 0,  //
-        0, 0, 0, 1   //
-    };
-    std::string label = "##1";
-    for (int i = 0; i < 4; i++) {
-      ImGui::InputScalarN(label.c_str(), ImGuiDataType_Float, &(matrix.vec[i]),
-                          4, NULL, NULL, "%.2f", 0);
-      label[2]++;
-    }
-    ImGui::End();
-
-    Canvas canvas;
-    Paint paint;
-    canvas.Translate({100.0, 100.0, 0});
-    auto tile_mode = tile_modes[selected_tile_mode];
-    paint.color_source = [tile_mode]() {
-      std::vector<Color> colors = {Color{0.9568, 0.2627, 0.2118, 1.0},
-                                   Color{0.1294, 0.5882, 0.9529, 1.0}};
-      std::vector<Scalar> stops = {0.0, 1.0};
-
-      auto contents = std::make_shared<RadialGradientContents>();
-      contents->SetCenterAndRadius({100, 100}, 100);
-      contents->SetColors(std::move(colors));
-      contents->SetStops(std::move(stops));
-      contents->SetTileMode(tile_mode);
-      contents->SetMatrix(matrix);
-      return contents;
-    };
-    canvas.DrawRect({0, 0, 600, 600}, paint);
-    return renderer.Render(canvas.EndRecordingAsPicture(), render_target);
-  };
-  ASSERT_TRUE(OpenPlaygroundHere(callback));
-}
-
-TEST_P(AiksTest, CanRenderRadialGradientManyColors) {
-  auto callback = [&](AiksContext& renderer, RenderTarget& render_target) {
-    const char* tile_mode_names[] = {"Clamp", "Repeat", "Mirror", "Decal"};
-    const Entity::TileMode tile_modes[] = {
-        Entity::TileMode::kClamp, Entity::TileMode::kRepeat,
-        Entity::TileMode::kMirror, Entity::TileMode::kDecal};
-
-    static int selected_tile_mode = 0;
-    ImGui::Begin("Controls", nullptr, ImGuiWindowFlags_AlwaysAutoResize);
-    ImGui::Combo("Tile mode", &selected_tile_mode, tile_mode_names,
-                 sizeof(tile_mode_names) / sizeof(char*));
-    static Matrix matrix = {
-        1, 0, 0, 0,  //
-        0, 1, 0, 0,  //
-        0, 0, 1, 0,  //
-        0, 0, 0, 1   //
-    };
-    std::string label = "##1";
-    for (int i = 0; i < 4; i++) {
-      ImGui::InputScalarN(label.c_str(), ImGuiDataType_Float, &(matrix.vec[i]),
-                          4, NULL, NULL, "%.2f", 0);
-      label[2]++;
-    }
-    ImGui::End();
-
-    Canvas canvas;
-    Paint paint;
-    canvas.Translate({100.0, 100.0, 0});
-    auto tile_mode = tile_modes[selected_tile_mode];
-    paint.color_source = [tile_mode]() {
-      std::vector<Color> colors = {
-          Color{0x1f / 255.0, 0.0, 0x5c / 255.0, 1.0},
-          Color{0x5b / 255.0, 0.0, 0x60 / 255.0, 1.0},
-          Color{0x87 / 255.0, 0x01 / 255.0, 0x60 / 255.0, 1.0},
-          Color{0xac / 255.0, 0x25 / 255.0, 0x53 / 255.0, 1.0},
-          Color{0xe1 / 255.0, 0x6b / 255.0, 0x5c / 255.0, 1.0},
-          Color{0xf3 / 255.0, 0x90 / 255.0, 0x60 / 255.0, 1.0},
-          Color{0xff / 255.0, 0xb5 / 255.0, 0x6b / 250.0, 1.0}};
-      std::vector<Scalar> stops = {
-          0.0,
-          (1.0 / 6.0) * 1,
-          (1.0 / 6.0) * 2,
-          (1.0 / 6.0) * 3,
-          (1.0 / 6.0) * 4,
-          (1.0 / 6.0) * 5,
-          1.0,
-      };
-
-      auto contents = std::make_shared<RadialGradientContents>();
-      contents->SetCenterAndRadius({100, 100}, 100);
-      contents->SetColors(std::move(colors));
-      contents->SetStops(std::move(stops));
-      contents->SetTileMode(tile_mode);
-      contents->SetMatrix(matrix);
-      return contents;
-    };
-    canvas.DrawRect({0, 0, 600, 600}, paint);
-    return renderer.Render(canvas.EndRecordingAsPicture(), render_target);
-  };
-  ASSERT_TRUE(OpenPlaygroundHere(callback));
-}
-
-TEST_P(AiksTest, CanRenderSweepGradient) {
-  auto callback = [&](AiksContext& renderer, RenderTarget& render_target) {
-    const char* tile_mode_names[] = {"Clamp", "Repeat", "Mirror", "Decal"};
-    const Entity::TileMode tile_modes[] = {
-        Entity::TileMode::kClamp, Entity::TileMode::kRepeat,
-        Entity::TileMode::kMirror, Entity::TileMode::kDecal};
-
-    static int selected_tile_mode = 0;
-    ImGui::Begin("Controls", nullptr, ImGuiWindowFlags_AlwaysAutoResize);
-    ImGui::Combo("Tile mode", &selected_tile_mode, tile_mode_names,
-                 sizeof(tile_mode_names) / sizeof(char*));
-    static Matrix matrix = {
-        1, 0, 0, 0,  //
-        0, 1, 0, 0,  //
-        0, 0, 1, 0,  //
-        0, 0, 0, 1   //
-    };
-    std::string label = "##1";
-    for (int i = 0; i < 4; i++) {
-      ImGui::InputScalarN(label.c_str(), ImGuiDataType_Float, &(matrix.vec[i]),
-                          4, NULL, NULL, "%.2f", 0);
-      label[2]++;
-    }
-    ImGui::End();
-
-    Canvas canvas;
-    Paint paint;
-    canvas.Translate({100.0, 100.0, 0});
-    auto tile_mode = tile_modes[selected_tile_mode];
-    paint.color_source = [tile_mode]() {
-      auto contents = std::make_shared<SweepGradientContents>();
-      contents->SetCenterAndAngles({100, 100}, Degrees(45), Degrees(135));
-      std::vector<Color> colors = {Color{0.9568, 0.2627, 0.2118, 1.0},
-                                   Color{0.1294, 0.5882, 0.9529, 1.0}};
-      std::vector<Scalar> stops = {0.0, 1.0};
-      contents->SetColors(std::move(colors));
-      contents->SetStops(std::move(stops));
-      contents->SetTileMode(tile_mode);
-      contents->SetMatrix(matrix);
-      return contents;
-    };
-    canvas.DrawRect({0, 0, 600, 600}, paint);
-    return renderer.Render(canvas.EndRecordingAsPicture(), render_target);
-  };
-  ASSERT_TRUE(OpenPlaygroundHere(callback));
-}
-
-TEST_P(AiksTest, CanRenderSweepGradientManyColors) {
-  auto callback = [&](AiksContext& renderer, RenderTarget& render_target) {
-    const char* tile_mode_names[] = {"Clamp", "Repeat", "Mirror", "Decal"};
-    const Entity::TileMode tile_modes[] = {
-        Entity::TileMode::kClamp, Entity::TileMode::kRepeat,
-        Entity::TileMode::kMirror, Entity::TileMode::kDecal};
-
-    static int selected_tile_mode = 0;
-    ImGui::Begin("Controls", nullptr, ImGuiWindowFlags_AlwaysAutoResize);
-    ImGui::Combo("Tile mode", &selected_tile_mode, tile_mode_names,
-                 sizeof(tile_mode_names) / sizeof(char*));
-    static Matrix matrix = {
-        1, 0, 0, 0,  //
-        0, 1, 0, 0,  //
-        0, 0, 1, 0,  //
-        0, 0, 0, 1   //
-    };
-    std::string label = "##1";
-    for (int i = 0; i < 4; i++) {
-      ImGui::InputScalarN(label.c_str(), ImGuiDataType_Float, &(matrix.vec[i]),
-                          4, NULL, NULL, "%.2f", 0);
-      label[2]++;
-    }
-    ImGui::End();
-
-    Canvas canvas;
-    Paint paint;
-    canvas.Translate({100.0, 100.0, 0});
-    auto tile_mode = tile_modes[selected_tile_mode];
-    paint.color_source = [tile_mode]() {
-      auto contents = std::make_shared<SweepGradientContents>();
-      contents->SetCenterAndAngles({100, 100}, Degrees(45), Degrees(135));
-      std::vector<Color> colors = {
-          Color{0x1f / 255.0, 0.0, 0x5c / 255.0, 1.0},
-          Color{0x5b / 255.0, 0.0, 0x60 / 255.0, 1.0},
-          Color{0x87 / 255.0, 0x01 / 255.0, 0x60 / 255.0, 1.0},
-          Color{0xac / 255.0, 0x25 / 255.0, 0x53 / 255.0, 1.0},
-          Color{0xe1 / 255.0, 0x6b / 255.0, 0x5c / 255.0, 1.0},
-          Color{0xf3 / 255.0, 0x90 / 255.0, 0x60 / 255.0, 1.0},
-          Color{0xff / 255.0, 0xb5 / 255.0, 0x6b / 250.0, 1.0}};
-      std::vector<Scalar> stops = {
-          0.0,
-          (1.0 / 6.0) * 1,
-          (1.0 / 6.0) * 2,
-          (1.0 / 6.0) * 3,
-          (1.0 / 6.0) * 4,
-          (1.0 / 6.0) * 5,
-          1.0,
-      };
-
-      contents->SetStops(std::move(stops));
-      contents->SetColors(std::move(colors));
-      contents->SetTileMode(tile_mode);
-      contents->SetMatrix(matrix);
-      return contents;
-    };
-    canvas.DrawRect({0, 0, 600, 600}, paint);
-    return renderer.Render(canvas.EndRecordingAsPicture(), render_target);
-  };
-  ASSERT_TRUE(OpenPlaygroundHere(callback));
-}
-
 TEST_P(AiksTest, CanRenderDifferentShapesWithSameColorSource) {
   Canvas canvas;
   Paint paint;
-  paint.color_source = []() {
-    auto contents = std::make_shared<LinearGradientContents>();
-    contents->SetEndPoints({0, 0}, {100, 100});
-    std::vector<Color> colors = {Color{0.9568, 0.2627, 0.2118, 1.0},
-                                 Color{0.1294, 0.5882, 0.9529, 1.0}};
-    std::vector<Scalar> stops = {
-        0.0,
-        1.0,
-    };
-    contents->SetColors(std::move(colors));
-    contents->SetStops(std::move(stops));
-    contents->SetTileMode(Entity::TileMode::kRepeat);
-    return contents;
+
+  std::vector<Color> colors = {Color{0.9568, 0.2627, 0.2118, 1.0},
+                               Color{0.1294, 0.5882, 0.9529, 1.0}};
+  std::vector<Scalar> stops = {
+      0.0,
+      1.0,
   };
+
+  paint.color_source = ColorSource::MakeLinearGradient(
+      {0, 0}, {100, 100}, std::move(colors), std::move(stops),
+      Entity::TileMode::kRepeat, {});
+
   canvas.Save();
   canvas.Translate({100, 100, 0});
-  canvas.DrawRect({0, 0, 200, 200}, paint);
+  canvas.DrawRect(Rect::MakeXYWH(0, 0, 200, 200), paint);
   canvas.Restore();
 
   canvas.Save();
@@ -802,33 +473,48 @@ TEST_P(AiksTest, CanRenderDifferentShapesWithSameColorSource) {
 }
 
 TEST_P(AiksTest, CanPictureConvertToImage) {
-  auto callback = [&](AiksContext& renderer, RenderTarget& render_target) {
-    static int size[2] = {1000, 1000};
-    ImGui::Begin("Controls", nullptr, ImGuiWindowFlags_AlwaysAutoResize);
-    ImGui::SliderInt2("Size", size, 0, 1000);
-    ImGui::End();
+  Canvas recorder_canvas;
+  Paint paint;
+  paint.color = Color{0.9568, 0.2627, 0.2118, 1.0};
+  recorder_canvas.DrawRect(Rect::MakeXYWH(100.0, 100.0, 600, 600), paint);
+  paint.color = Color{0.1294, 0.5882, 0.9529, 1.0};
+  recorder_canvas.DrawRect(Rect::MakeXYWH(200.0, 200.0, 600, 600), paint);
 
-    Canvas recorder_canvas;
-    Paint paint;
-    paint.color = Color{0.9568, 0.2627, 0.2118, 1.0};
-    recorder_canvas.DrawRect({100.0, 100.0, 600, 600}, paint);
-    paint.color = Color{0.1294, 0.5882, 0.9529, 1.0};
-    recorder_canvas.DrawRect({200.0, 200.0, 600, 600}, paint);
+  Canvas canvas;
+  AiksContext renderer(GetContext(), nullptr);
+  paint.color = Color::BlackTransparent();
+  canvas.DrawPaint(paint);
+  Picture picture = recorder_canvas.EndRecordingAsPicture();
+  auto image = picture.ToImage(renderer, ISize{1000, 1000});
+  if (image) {
+    canvas.DrawImage(image, Point(), Paint());
+    paint.color = Color{0.1, 0.1, 0.1, 0.2};
+    canvas.DrawRect(Rect::MakeSize(ISize{1000, 1000}), paint);
+  }
 
-    Canvas canvas;
-    paint.color = Color::BlackTransparent();
-    canvas.DrawPaint(paint);
-    Picture picture = recorder_canvas.EndRecordingAsPicture();
-    auto image = picture.ToImage(renderer, ISize{size[0], size[1]});
-    if (image) {
-      canvas.DrawImage(image, Point(), Paint());
-      paint.color = Color{0.1, 0.1, 0.1, 0.2};
-      canvas.DrawRect(Rect::MakeSize(ISize{size[0], size[1]}), paint);
-    }
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
 
-    return renderer.Render(canvas.EndRecordingAsPicture(), render_target);
-  };
-  ASSERT_TRUE(OpenPlaygroundHere(callback));
+// Regression test for https://github.com/flutter/flutter/issues/142358 .
+// Without a change to force render pass construction the image is left in an
+// undefined layout and triggers a validation error.
+TEST_P(AiksTest, CanEmptyPictureConvertToImage) {
+  Canvas recorder_canvas;
+
+  Canvas canvas;
+  AiksContext renderer(GetContext(), nullptr);
+  Paint paint;
+  paint.color = Color::BlackTransparent();
+  canvas.DrawPaint(paint);
+  Picture picture = recorder_canvas.EndRecordingAsPicture();
+  auto image = picture.ToImage(renderer, ISize{1000, 1000});
+  if (image) {
+    canvas.DrawImage(image, Point(), Paint());
+    paint.color = Color{0.1, 0.1, 0.1, 0.2};
+    canvas.DrawRect(Rect::MakeSize(ISize{1000, 1000}), paint);
+  }
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
 }
 
 TEST_P(AiksTest, BlendModeShouldCoverWholeScreen) {
@@ -842,13 +528,13 @@ TEST_P(AiksTest, BlendModeShouldCoverWholeScreen) {
   canvas.SaveLayer(paint);
 
   paint.color = Color::White();
-  canvas.DrawRect({100, 100, 400, 400}, paint);
+  canvas.DrawRect(Rect::MakeXYWH(100, 100, 400, 400), paint);
 
   paint.blend_mode = BlendMode::kSource;
   canvas.SaveLayer(paint);
 
   paint.color = Color::Blue();
-  canvas.DrawRect({200, 200, 200, 200}, paint);
+  canvas.DrawRect(Rect::MakeXYWH(200, 200, 200, 200), paint);
 
   canvas.Restore();
   canvas.Restore();
@@ -871,9 +557,9 @@ TEST_P(AiksTest, CanRenderGroupOpacity) {
 
   canvas.SaveLayer(alpha);
 
-  canvas.DrawRect({000, 000, 100, 100}, red);
-  canvas.DrawRect({020, 020, 100, 100}, green);
-  canvas.DrawRect({040, 040, 100, 100}, blue);
+  canvas.DrawRect(Rect::MakeXYWH(000, 000, 100, 100), red);
+  canvas.DrawRect(Rect::MakeXYWH(020, 020, 100, 100), green);
+  canvas.DrawRect(Rect::MakeXYWH(040, 040, 100, 100), blue);
 
   canvas.Restore();
 
@@ -911,9 +597,9 @@ TEST_P(AiksTest, CoordinateConversionsAreCorrect) {
 
     canvas.SaveLayer(alpha);
 
-    canvas.DrawRect({000, 000, 100, 100}, red);
-    canvas.DrawRect({020, 020, 100, 100}, green);
-    canvas.DrawRect({040, 040, 100, 100}, blue);
+    canvas.DrawRect(Rect::MakeXYWH(000, 000, 100, 100), red);
+    canvas.DrawRect(Rect::MakeXYWH(020, 020, 100, 100), green);
+    canvas.DrawRect(Rect::MakeXYWH(040, 040, 100, 100), blue);
 
     canvas.Restore();
   }
@@ -959,11 +645,11 @@ TEST_P(AiksTest, CanPerformSaveLayerWithBounds) {
   Paint save;
   save.color = Color::Black();
 
-  canvas.SaveLayer(save, Rect{0, 0, 50, 50});
+  canvas.SaveLayer(save, Rect::MakeXYWH(0, 0, 50, 50));
 
-  canvas.DrawRect({0, 0, 100, 100}, red);
-  canvas.DrawRect({10, 10, 100, 100}, green);
-  canvas.DrawRect({20, 20, 100, 100}, blue);
+  canvas.DrawRect(Rect::MakeXYWH(0, 0, 100, 100), red);
+  canvas.DrawRect(Rect::MakeXYWH(10, 10, 100, 100), green);
+  canvas.DrawRect(Rect::MakeXYWH(20, 20, 100, 100), blue);
 
   canvas.Restore();
 
@@ -986,11 +672,11 @@ TEST_P(AiksTest,
   Paint save;
   save.color = Color::Black().WithAlpha(0.5);
 
-  canvas.SaveLayer(save, Rect{0, 0, 100000, 100000});
+  canvas.SaveLayer(save, Rect::MakeXYWH(0, 0, 100000, 100000));
 
-  canvas.DrawRect({0, 0, 100, 100}, red);
-  canvas.DrawRect({10, 10, 100, 100}, green);
-  canvas.DrawRect({20, 20, 100, 100}, blue);
+  canvas.DrawRect(Rect::MakeXYWH(0, 0, 100, 100), red);
+  canvas.DrawRect(Rect::MakeXYWH(10, 10, 100, 100), green);
+  canvas.DrawRect(Rect::MakeXYWH(20, 20, 100, 100), blue);
 
   canvas.Restore();
 
@@ -1009,133 +695,220 @@ TEST_P(AiksTest, CanRenderRoundedRectWithNonUniformRadii) {
   radii.bottom_right = {50, 25};
   radii.bottom_left = {25, 50};
 
-  auto path =
-      PathBuilder{}.AddRoundedRect(Rect{100, 100, 500, 500}, radii).TakePath();
-
-  canvas.DrawPath(path, paint);
-
-  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
-}
-
-TEST_P(AiksTest, CanRenderDifferencePaths) {
-  Canvas canvas;
-
-  Paint paint;
-  paint.color = Color::Red();
-
-  PathBuilder builder;
-
-  PathBuilder::RoundingRadii radii;
-  radii.top_left = {50, 25};
-  radii.top_right = {25, 50};
-  radii.bottom_right = {50, 25};
-  radii.bottom_left = {25, 50};
-
-  builder.AddRoundedRect({100, 100, 200, 200}, radii);
-  builder.AddCircle({200, 200}, 50);
-  auto path = builder.TakePath(FillType::kOdd);
+  auto path = PathBuilder{}
+                  .AddRoundedRect(Rect::MakeXYWH(100, 100, 500, 500), radii)
+                  .TakePath();
 
-  canvas.DrawImage(
-      std::make_shared<Image>(CreateTextureForFixture("boston.jpg")), {10, 10},
-      Paint{});
   canvas.DrawPath(path, paint);
 
   ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
 }
 
-static sk_sp<SkData> OpenFixtureAsSkData(const char* fixture_name) {
-  auto mapping = flutter::testing::OpenFixtureAsMapping(fixture_name);
-  if (!mapping) {
-    return nullptr;
-  }
-  auto data = SkData::MakeWithProc(
-      mapping->GetMapping(), mapping->GetSize(),
-      [](const void* ptr, void* context) {
-        delete reinterpret_cast<fml::Mapping*>(context);
-      },
-      mapping.get());
-  mapping.release();
-  return data;
-}
-
-bool RenderTextInCanvas(const std::shared_ptr<Context>& context,
-                        Canvas& canvas,
-                        const std::string& text,
-                        const std::string& font_fixture,
-                        Scalar font_size = 50.0) {
-  Scalar baseline = 200.0;
-  Point text_position = {100, baseline};
-
+struct TextRenderOptions {
+  Scalar font_size = 50;
+  Color color = Color::Yellow();
+  Point position = Vector2(100, 200);
+  std::optional<Paint::MaskBlurDescriptor> mask_blur_descriptor;
+};
+
+bool RenderTextInCanvasSkia(const std::shared_ptr<Context>& context,
+                            Canvas& canvas,
+                            const std::string& text,
+                            const std::string_view& font_fixture,
+                            TextRenderOptions options = {}) {
   // Draw the baseline.
-  canvas.DrawRect({50, baseline, 900, 10},
-                  Paint{.color = Color::Aqua().WithAlpha(0.25)});
+  canvas.DrawRect(
+      Rect::MakeXYWH(options.position.x - 50, options.position.y, 900, 10),
+      Paint{.color = Color::Aqua().WithAlpha(0.25)});
 
   // Mark the point at which the text is drawn.
-  canvas.DrawCircle(text_position, 5.0,
+  canvas.DrawCircle(options.position, 5.0,
                     Paint{.color = Color::Red().WithAlpha(0.25)});
 
   // Construct the text blob.
-  auto mapping = OpenFixtureAsSkData(font_fixture.c_str());
+  auto c_font_fixture = std::string(font_fixture);
+  auto mapping = flutter::testing::OpenFixtureAsSkData(c_font_fixture.c_str());
   if (!mapping) {
     return false;
   }
-  SkFont sk_font(SkTypeface::MakeFromData(mapping), 50.0);
+  sk_sp<SkFontMgr> font_mgr = txt::GetDefaultFontManager();
+  SkFont sk_font(font_mgr->makeFromData(mapping), options.font_size);
   auto blob = SkTextBlob::MakeFromString(text.c_str(), sk_font);
   if (!blob) {
     return false;
   }
 
   // Create the Impeller text frame and draw it at the designated baseline.
-  auto frame = TextFrameFromTextBlob(blob);
+  auto frame = MakeTextFrameFromTextBlobSkia(blob);
 
   Paint text_paint;
-  text_paint.color = Color::Yellow();
-  canvas.DrawTextFrame(frame, text_position, text_paint);
+  text_paint.color = options.color;
+  text_paint.mask_blur_descriptor = options.mask_blur_descriptor;
+  canvas.DrawTextFrame(frame, options.position, text_paint);
+  return true;
+}
+
+bool RenderTextInCanvasSTB(const std::shared_ptr<Context>& context,
+                           Canvas& canvas,
+                           const std::string& text,
+                           const std::string& font_fixture,
+                           TextRenderOptions options = {}) {
+  // Draw the baseline.
+  canvas.DrawRect(
+      Rect::MakeXYWH(options.position.x - 50, options.position.y, 900, 10),
+      Paint{.color = Color::Aqua().WithAlpha(0.25)});
+
+  // Mark the point at which the text is drawn.
+  canvas.DrawCircle(options.position, 5.0,
+                    Paint{.color = Color::Red().WithAlpha(0.25)});
+
+  // Construct the text blob.
+  auto mapping = flutter::testing::OpenFixtureAsMapping(font_fixture.c_str());
+  if (!mapping) {
+    return false;
+  }
+  auto typeface_stb = std::make_shared<TypefaceSTB>(std::move(mapping));
+
+  auto frame = MakeTextFrameSTB(
+      typeface_stb, Font::Metrics{.point_size = options.font_size}, text);
+
+  Paint text_paint;
+  text_paint.color = options.color;
+  canvas.DrawTextFrame(frame, options.position, text_paint);
   return true;
 }
 
 TEST_P(AiksTest, CanRenderTextFrame) {
   Canvas canvas;
-  ASSERT_TRUE(RenderTextInCanvas(
+  canvas.DrawPaint({.color = Color(0.1, 0.1, 0.1, 1.0)});
+  ASSERT_TRUE(RenderTextInCanvasSkia(
+      GetContext(), canvas, "the quick brown fox jumped over the lazy dog!.?",
+      "Roboto-Regular.ttf"));
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, CanRenderTextFrameSTB) {
+  Canvas canvas;
+  canvas.DrawPaint({.color = Color(0.1, 0.1, 0.1, 1.0)});
+  ASSERT_TRUE(RenderTextInCanvasSTB(
       GetContext(), canvas, "the quick brown fox jumped over the lazy dog!.?",
       "Roboto-Regular.ttf"));
+
+  SetTypographerContext(TypographerContextSTB::Make());
   ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
 }
 
+TEST_P(AiksTest, TextFrameSubpixelAlignment) {
+  // "Random" numbers between 0 and 1. Hardcoded to avoid flakiness in goldens.
+  std::array<Scalar, 20> phase_offsets = {
+      7.82637e-06, 0.131538,  0.755605,   0.45865,   0.532767,
+      0.218959,    0.0470446, 0.678865,   0.679296,  0.934693,
+      0.383502,    0.519416,  0.830965,   0.0345721, 0.0534616,
+      0.5297,      0.671149,  0.00769819, 0.383416,  0.0668422};
+  auto callback = [&](AiksContext& renderer) -> std::optional<Picture> {
+    static float font_size = 20;
+    static float phase_variation = 0.2;
+    static float speed = 0.5;
+    static float magnitude = 100;
+    if (AiksTest::ImGuiBegin("Controls", nullptr,
+                             ImGuiWindowFlags_AlwaysAutoResize)) {
+      ImGui::SliderFloat("Font size", &font_size, 5, 50);
+      ImGui::SliderFloat("Phase variation", &phase_variation, 0, 1);
+      ImGui::SliderFloat("Oscillation speed", &speed, 0, 2);
+      ImGui::SliderFloat("Oscillation magnitude", &magnitude, 0, 300);
+      ImGui::End();
+    }
+
+    Canvas canvas;
+    canvas.Scale(GetContentScale());
+
+    for (size_t i = 0; i < phase_offsets.size(); i++) {
+      auto position =
+          Point(200 + magnitude *
+                          std::sin((-phase_offsets[i] * k2Pi * phase_variation +
+                                    GetSecondsElapsed() * speed)),  //
+                200 + i * font_size * 1.1                           //
+          );
+      if (!RenderTextInCanvasSkia(
+              GetContext(), canvas,
+              "the quick brown fox jumped over "
+              "the lazy dog!.?",
+              "Roboto-Regular.ttf",
+              {.font_size = font_size, .position = position})) {
+        return std::nullopt;
+      }
+    }
+    return canvas.EndRecordingAsPicture();
+  };
+
+  ASSERT_TRUE(OpenPlaygroundHere(callback));
+}
+
 TEST_P(AiksTest, CanRenderItalicizedText) {
   Canvas canvas;
-  ASSERT_TRUE(RenderTextInCanvas(
+  canvas.DrawPaint({.color = Color(0.1, 0.1, 0.1, 1.0)});
+
+  ASSERT_TRUE(RenderTextInCanvasSkia(
       GetContext(), canvas, "the quick brown fox jumped over the lazy dog!.?",
       "HomemadeApple.ttf"));
   ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
 }
 
-TEST_P(AiksTest, CanRenderEmojiTextFrame) {
-  Canvas canvas;
-  ASSERT_TRUE(RenderTextInCanvas(GetContext(), canvas, "😀 😃 😄 😁 😆 😅 😂 🤣 🥲 😊",
+static constexpr std::string_view kFontFixture =
 #if FML_OS_MACOSX
-                                 "Apple Color Emoji.ttc"));
+    "Apple Color Emoji.ttc";
 #else
-                                 "NotoColorEmoji.ttf"));
+    "NotoColorEmoji.ttf";
 #endif
+
+TEST_P(AiksTest, CanRenderEmojiTextFrame) {
+  Canvas canvas;
+  canvas.DrawPaint({.color = Color(0.1, 0.1, 0.1, 1.0)});
+
+  ASSERT_TRUE(RenderTextInCanvasSkia(
+      GetContext(), canvas, "😀 😃 😄 😁 😆 😅 😂 🤣 🥲 😊", kFontFixture));
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, CanRenderEmojiTextFrameWithBlur) {
+  Canvas canvas;
+  canvas.DrawPaint({.color = Color(0.1, 0.1, 0.1, 1.0)});
+
+  ASSERT_TRUE(RenderTextInCanvasSkia(
+      GetContext(), canvas, "😀 😃 😄 😁 😆 😅 😂 🤣 🥲 😊", kFontFixture,
+      TextRenderOptions{.color = Color::Blue(),
+                        .mask_blur_descriptor = Paint::MaskBlurDescriptor{
+                            .style = FilterContents::BlurStyle::kNormal,
+                            .sigma = Sigma(4)}}));
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, CanRenderEmojiTextFrameWithAlpha) {
+  Canvas canvas;
+  canvas.DrawPaint({.color = Color(0.1, 0.1, 0.1, 1.0)});
+
+  ASSERT_TRUE(RenderTextInCanvasSkia(
+      GetContext(), canvas, "😀 😃 😄 😁 😆 😅 😂 🤣 🥲 😊", kFontFixture,
+      {.color = Color::Black().WithAlpha(0.5)}));
   ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
 }
 
 TEST_P(AiksTest, CanRenderTextInSaveLayer) {
   Canvas canvas;
-  canvas.DrawPaint({.color = Color::White()});
+  canvas.DrawPaint({.color = Color(0.1, 0.1, 0.1, 1.0)});
+
   canvas.Translate({100, 100});
   canvas.Scale(Vector2{0.5, 0.5});
 
   // Blend the layer with the parent pass using kClear to expose the coverage.
   canvas.SaveLayer({.blend_mode = BlendMode::kClear});
-  ASSERT_TRUE(RenderTextInCanvas(
+  ASSERT_TRUE(RenderTextInCanvasSkia(
       GetContext(), canvas, "the quick brown fox jumped over the lazy dog!.?",
       "Roboto-Regular.ttf"));
   canvas.Restore();
 
   // Render the text again over the cleared coverage rect.
-  ASSERT_TRUE(RenderTextInCanvas(
+  ASSERT_TRUE(RenderTextInCanvasSkia(
       GetContext(), canvas, "the quick brown fox jumped over the lazy dog!.?",
       "Roboto-Regular.ttf"));
 
@@ -1147,14 +920,15 @@ TEST_P(AiksTest, CanRenderTextOutsideBoundaries) {
   canvas.Translate({200, 150});
 
   // Construct the text blob.
-  auto mapping = OpenFixtureAsSkData("wtf.otf");
+  auto mapping = flutter::testing::OpenFixtureAsSkData("wtf.otf");
   ASSERT_NE(mapping, nullptr);
 
   Scalar font_size = 80;
-  SkFont sk_font(SkTypeface::MakeFromData(mapping), font_size);
+  sk_sp<SkFontMgr> font_mgr = txt::GetDefaultFontManager();
+  SkFont sk_font(font_mgr->makeFromData(mapping), font_size);
 
   Paint text_paint;
-  text_paint.color = Color::White().WithAlpha(0.8);
+  text_paint.color = Color::Blue().WithAlpha(0.8);
 
   struct {
     Point position;
@@ -1170,7 +944,7 @@ TEST_P(AiksTest, CanRenderTextOutsideBoundaries) {
     {
       auto blob = SkTextBlob::MakeFromString(t.text, sk_font);
       ASSERT_NE(blob, nullptr);
-      auto frame = TextFrameFromTextBlob(blob);
+      auto frame = MakeTextFrameFromTextBlobSkia(blob);
       canvas.DrawTextFrame(frame, Point(), text_paint);
     }
     canvas.Restore();
@@ -1181,12 +955,14 @@ TEST_P(AiksTest, CanRenderTextOutsideBoundaries) {
 
 TEST_P(AiksTest, TextRotated) {
   Canvas canvas;
-  canvas.Transform(Matrix(0.5, -0.3, 0, -0.002,  //
-                          0, 1, 0, 0,            //
-                          0, 0, 0.3, 0,          //
-                          100, 100, 0, 1.3));
+  canvas.Scale(GetContentScale());
+  canvas.DrawPaint({.color = Color(0.1, 0.1, 0.1, 1.0)});
 
-  ASSERT_TRUE(RenderTextInCanvas(
+  canvas.Transform(Matrix(0.25, -0.3, 0, -0.002,  //
+                          0, 0.5, 0, 0,           //
+                          0, 0, 0.3, 0,           //
+                          100, 100, 0, 1.3));
+  ASSERT_TRUE(RenderTextInCanvasSkia(
       GetContext(), canvas, "the quick brown fox jumped over the lazy dog!.?",
       "Roboto-Regular.ttf"));
 
@@ -1194,14 +970,119 @@ TEST_P(AiksTest, TextRotated) {
 }
 
 TEST_P(AiksTest, CanDrawPaint) {
-  Paint paint;
-  paint.color = Color::MediumTurquoise();
   Canvas canvas;
   canvas.Scale(Vector2(0.2, 0.2));
-  canvas.DrawPaint(paint);
+  canvas.DrawPaint({.color = Color::MediumTurquoise()});
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, CanDrawPaintMultipleTimes) {
+  Canvas canvas;
+  canvas.Scale(Vector2(0.2, 0.2));
+  canvas.DrawPaint({.color = Color::MediumTurquoise()});
+  canvas.DrawPaint({.color = Color::Color::OrangeRed().WithAlpha(0.5)});
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, CanDrawPaintWithAdvancedBlend) {
+  Canvas canvas;
+  canvas.Scale(Vector2(0.2, 0.2));
+  canvas.DrawPaint({.color = Color::MediumTurquoise()});
+  canvas.DrawPaint({.color = Color::Color::OrangeRed().WithAlpha(0.5),
+                    .blend_mode = BlendMode::kHue});
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, DrawPaintWithAdvancedBlendOverFilter) {
+  Paint filtered = {
+      .color = Color::Black(),
+      .mask_blur_descriptor =
+          Paint::MaskBlurDescriptor{
+              .style = FilterContents::BlurStyle::kNormal,
+              .sigma = Sigma(60),
+          },
+  };
+
+  Canvas canvas;
+  canvas.DrawPaint({.color = Color::White()});
+  canvas.DrawCircle({300, 300}, 200, filtered);
+  canvas.DrawPaint({.color = Color::Green(), .blend_mode = BlendMode::kScreen});
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, DrawAdvancedBlendPartlyOffscreen) {
+  std::vector<Color> colors = {Color{0.9568, 0.2627, 0.2118, 1.0},
+                               Color{0.1294, 0.5882, 0.9529, 1.0}};
+  std::vector<Scalar> stops = {0.0, 1.0};
+
+  Paint paint = {
+      .color_source = ColorSource::MakeLinearGradient(
+          {0, 0}, {100, 100}, std::move(colors), std::move(stops),
+          Entity::TileMode::kRepeat, Matrix::MakeScale(Vector3(0.3, 0.3, 0.3))),
+      .blend_mode = BlendMode::kLighten,
+  };
+
+  Canvas canvas;
+  canvas.DrawPaint({.color = Color::Blue()});
+  canvas.Scale(Vector2(2, 2));
+  canvas.ClipRect(Rect::MakeLTRB(0, 0, 200, 200));
+  canvas.DrawCircle({100, 100}, 100, paint);
   ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
 }
 
+#define BLEND_MODE_TUPLE(blend_mode) {#blend_mode, BlendMode::k##blend_mode},
+
+struct BlendModeSelection {
+  std::vector<const char*> blend_mode_names;
+  std::vector<BlendMode> blend_mode_values;
+};
+
+static BlendModeSelection GetBlendModeSelection() {
+  std::vector<const char*> blend_mode_names;
+  std::vector<BlendMode> blend_mode_values;
+  {
+    const std::vector<std::tuple<const char*, BlendMode>> blends = {
+        IMPELLER_FOR_EACH_BLEND_MODE(BLEND_MODE_TUPLE)};
+    assert(blends.size() ==
+           static_cast<size_t>(Entity::kLastAdvancedBlendMode) + 1);
+    for (const auto& [name, mode] : blends) {
+      blend_mode_names.push_back(name);
+      blend_mode_values.push_back(mode);
+    }
+  }
+
+  return {blend_mode_names, blend_mode_values};
+}
+
+TEST_P(AiksTest, CanDrawPaintMultipleTimesInteractive) {
+  auto modes = GetBlendModeSelection();
+
+  auto callback = [&](AiksContext& renderer) -> std::optional<Picture> {
+    static Color background = Color::MediumTurquoise();
+    static Color foreground = Color::Color::OrangeRed().WithAlpha(0.5);
+    static int current_blend_index = 3;
+
+    if (AiksTest::ImGuiBegin("Controls", nullptr,
+                             ImGuiWindowFlags_AlwaysAutoResize)) {
+      ImGui::ColorEdit4("Background", reinterpret_cast<float*>(&background));
+      ImGui::ColorEdit4("Foreground", reinterpret_cast<float*>(&foreground));
+      ImGui::ListBox("Blend mode", &current_blend_index,
+                     modes.blend_mode_names.data(),
+                     modes.blend_mode_names.size());
+      ImGui::End();
+    }
+
+    Canvas canvas;
+    canvas.Scale(Vector2(0.2, 0.2));
+    canvas.DrawPaint({.color = background});
+    canvas.DrawPaint(
+        {.color = foreground,
+         .blend_mode = static_cast<BlendMode>(current_blend_index)});
+    return canvas.EndRecordingAsPicture();
+  };
+  ASSERT_TRUE(OpenPlaygroundHere(callback));
+}
+
 TEST_P(AiksTest, PaintBlendModeIsRespected) {
   Paint paint;
   Canvas canvas;
@@ -1224,49 +1105,7 @@ TEST_P(AiksTest, PaintBlendModeIsRespected) {
 TEST_P(AiksTest, ColorWheel) {
   // Compare with https://fiddle.skia.org/c/@BlendModes
 
-  std::vector<const char*> blend_mode_names;
-  std::vector<BlendMode> blend_mode_values;
-  {
-    const std::vector<std::tuple<const char*, BlendMode>> blends = {
-        // Pipeline blends (Porter-Duff alpha compositing)
-        {"Clear", BlendMode::kClear},
-        {"Source", BlendMode::kSource},
-        {"Destination", BlendMode::kDestination},
-        {"SourceOver", BlendMode::kSourceOver},
-        {"DestinationOver", BlendMode::kDestinationOver},
-        {"SourceIn", BlendMode::kSourceIn},
-        {"DestinationIn", BlendMode::kDestinationIn},
-        {"SourceOut", BlendMode::kSourceOut},
-        {"DestinationOut", BlendMode::kDestinationOut},
-        {"SourceATop", BlendMode::kSourceATop},
-        {"DestinationATop", BlendMode::kDestinationATop},
-        {"Xor", BlendMode::kXor},
-        {"Plus", BlendMode::kPlus},
-        {"Modulate", BlendMode::kModulate},
-        // Advanced blends (color component blends)
-        {"Screen", BlendMode::kScreen},
-        {"Overlay", BlendMode::kOverlay},
-        {"Darken", BlendMode::kDarken},
-        {"Lighten", BlendMode::kLighten},
-        {"ColorDodge", BlendMode::kColorDodge},
-        {"ColorBurn", BlendMode::kColorBurn},
-        {"HardLight", BlendMode::kHardLight},
-        {"SoftLight", BlendMode::kSoftLight},
-        {"Difference", BlendMode::kDifference},
-        {"Exclusion", BlendMode::kExclusion},
-        {"Multiply", BlendMode::kMultiply},
-        {"Hue", BlendMode::kHue},
-        {"Saturation", BlendMode::kSaturation},
-        {"Color", BlendMode::kColor},
-        {"Luminosity", BlendMode::kLuminosity},
-    };
-    assert(blends.size() ==
-           static_cast<size_t>(Entity::kLastAdvancedBlendMode) + 1);
-    for (const auto& [name, mode] : blends) {
-      blend_mode_names.push_back(name);
-      blend_mode_values.push_back(mode);
-    }
-  }
+  BlendModeSelection blend_modes = GetBlendModeSelection();
 
   auto draw_color_wheel = [](Canvas& canvas) {
     /// color_wheel_sampler: r=0 -> fuchsia, r=2pi/3 -> yellow, r=4pi/3 ->
@@ -1308,8 +1147,9 @@ TEST_P(AiksTest, ColorWheel) {
   std::shared_ptr<Image> color_wheel_image;
   Matrix color_wheel_transform;
 
-  auto callback = [&](AiksContext& renderer, RenderTarget& render_target) {
+  auto callback = [&](AiksContext& renderer) -> std::optional<Picture> {
     // UI state.
+    static bool cache_the_wheel = true;
     static int current_blend_index = 3;
     static float dst_alpha = 1;
     static float src_alpha = 1;
@@ -1317,22 +1157,24 @@ TEST_P(AiksTest, ColorWheel) {
     static Color color1 = Color::Green();
     static Color color2 = Color::Blue();
 
-    ImGui::Begin("Controls", nullptr, ImGuiWindowFlags_AlwaysAutoResize);
-    {
+    if (AiksTest::ImGuiBegin("Controls", nullptr,
+                             ImGuiWindowFlags_AlwaysAutoResize)) {
+      ImGui::Checkbox("Cache the wheel", &cache_the_wheel);
       ImGui::ListBox("Blending mode", &current_blend_index,
-                     blend_mode_names.data(), blend_mode_names.size());
+                     blend_modes.blend_mode_names.data(),
+                     blend_modes.blend_mode_names.size());
       ImGui::SliderFloat("Source alpha", &src_alpha, 0, 1);
       ImGui::ColorEdit4("Color A", reinterpret_cast<float*>(&color0));
       ImGui::ColorEdit4("Color B", reinterpret_cast<float*>(&color1));
       ImGui::ColorEdit4("Color C", reinterpret_cast<float*>(&color2));
       ImGui::SliderFloat("Destination alpha", &dst_alpha, 0, 1);
+      ImGui::End();
     }
-    ImGui::End();
 
     static Point content_scale;
     Point new_content_scale = GetContentScale();
 
-    if (new_content_scale != content_scale) {
+    if (!cache_the_wheel || new_content_scale != content_scale) {
       content_scale = new_content_scale;
 
       // Render the color wheel to an image.
@@ -1347,7 +1189,7 @@ TEST_P(AiksTest, ColorWheel) {
       auto color_wheel_picture = canvas.EndRecordingAsPicture();
       auto snapshot = color_wheel_picture.Snapshot(renderer);
       if (!snapshot.has_value() || !snapshot->texture) {
-        return false;
+        return std::nullopt;
       }
       color_wheel_image = std::make_shared<Image>(snapshot->texture);
       color_wheel_transform = snapshot->transform;
@@ -1373,8 +1215,9 @@ TEST_P(AiksTest, ColorWheel) {
     canvas.Scale(Vector2(3, 3));
 
     // Draw 3 circles to a subpass and blend it in.
-    canvas.SaveLayer({.color = Color::White().WithAlpha(src_alpha),
-                      .blend_mode = blend_mode_values[current_blend_index]});
+    canvas.SaveLayer(
+        {.color = Color::White().WithAlpha(src_alpha),
+         .blend_mode = blend_modes.blend_mode_values[current_blend_index]});
     {
       Paint paint;
       paint.blend_mode = BlendMode::kPlus;
@@ -1389,7 +1232,7 @@ TEST_P(AiksTest, ColorWheel) {
     }
     canvas.Restore();
 
-    return renderer.Render(canvas.EndRecordingAsPicture(), render_target);
+    return canvas.EndRecordingAsPicture();
   };
 
   ASSERT_TRUE(OpenPlaygroundHere(callback));
@@ -1397,12 +1240,12 @@ TEST_P(AiksTest, ColorWheel) {
 
 TEST_P(AiksTest, TransformMultipliesCorrectly) {
   Canvas canvas;
-  ASSERT_MATRIX_NEAR(canvas.GetCurrentTransformation(), Matrix());
+  ASSERT_MATRIX_NEAR(canvas.GetCurrentTransform(), Matrix());
 
   // clang-format off
   canvas.Translate(Vector3(100, 200));
   ASSERT_MATRIX_NEAR(
-    canvas.GetCurrentTransformation(),
+    canvas.GetCurrentTransform(),
     Matrix(  1,   0,   0,   0,
              0,   1,   0,   0,
              0,   0,   1,   0,
@@ -1410,7 +1253,7 @@ TEST_P(AiksTest, TransformMultipliesCorrectly) {
 
   canvas.Rotate(Radians(kPiOver2));
   ASSERT_MATRIX_NEAR(
-    canvas.GetCurrentTransformation(),
+    canvas.GetCurrentTransform(),
     Matrix(  0,   1,   0,   0,
             -1,   0,   0,   0,
              0,   0,   1,   0,
@@ -1418,7 +1261,7 @@ TEST_P(AiksTest, TransformMultipliesCorrectly) {
 
   canvas.Scale(Vector3(2, 3));
   ASSERT_MATRIX_NEAR(
-    canvas.GetCurrentTransformation(),
+    canvas.GetCurrentTransform(),
     Matrix(  0,   2,   0,   0,
             -3,   0,   0,   0,
              0,   0,   0,   0,
@@ -1426,7 +1269,7 @@ TEST_P(AiksTest, TransformMultipliesCorrectly) {
 
   canvas.Translate(Vector3(100, 200));
   ASSERT_MATRIX_NEAR(
-    canvas.GetCurrentTransformation(),
+    canvas.GetCurrentTransform(),
     Matrix(   0,   2,   0,   0,
              -3,   0,   0,   0,
               0,   0,   0,   0,
@@ -1434,159 +1277,436 @@ TEST_P(AiksTest, TransformMultipliesCorrectly) {
   // clang-format on
 }
 
-TEST_P(AiksTest, SolidStrokesRenderCorrectly) {
-  // Compare with https://fiddle.skia.org/c/027392122bec8ac2b5d5de00a4b9bbe2
-  auto callback = [&](AiksContext& renderer, RenderTarget& render_target) {
-    static Color color = Color::Black().WithAlpha(0.5);
-    static float scale = 3;
-    static bool add_circle_clip = true;
+TEST_P(AiksTest, FilledCirclesRenderCorrectly) {
+  Canvas canvas;
+  canvas.Scale(GetContentScale());
+  Paint paint;
+  const int color_count = 3;
+  Color colors[color_count] = {
+      Color::Blue(),
+      Color::Green(),
+      Color::Crimson(),
+  };
+
+  paint.color = Color::White();
+  canvas.DrawPaint(paint);
 
-    ImGui::Begin("Controls", nullptr, ImGuiWindowFlags_AlwaysAutoResize);
-    ImGui::ColorEdit4("Color", reinterpret_cast<float*>(&color));
-    ImGui::SliderFloat("Scale", &scale, 0, 6);
-    ImGui::Checkbox("Circle clip", &add_circle_clip);
-    ImGui::End();
+  int c_index = 0;
+  int radius = 600;
+  while (radius > 0) {
+    paint.color = colors[(c_index++) % color_count];
+    canvas.DrawCircle({10, 10}, radius, paint);
+    if (radius > 30) {
+      radius -= 10;
+    } else {
+      radius -= 2;
+    }
+  }
 
-    Canvas canvas;
-    canvas.Scale(GetContentScale());
-    Paint paint;
+  std::vector<Color> gradient_colors = {
+      Color{0x1f / 255.0, 0.0, 0x5c / 255.0, 1.0},
+      Color{0x5b / 255.0, 0.0, 0x60 / 255.0, 1.0},
+      Color{0x87 / 255.0, 0x01 / 255.0, 0x60 / 255.0, 1.0},
+      Color{0xac / 255.0, 0x25 / 255.0, 0x53 / 255.0, 1.0},
+      Color{0xe1 / 255.0, 0x6b / 255.0, 0x5c / 255.0, 1.0},
+      Color{0xf3 / 255.0, 0x90 / 255.0, 0x60 / 255.0, 1.0},
+      Color{0xff / 255.0, 0xb5 / 255.0, 0x6b / 250.0, 1.0}};
+  std::vector<Scalar> stops = {
+      0.0,
+      (1.0 / 6.0) * 1,
+      (1.0 / 6.0) * 2,
+      (1.0 / 6.0) * 3,
+      (1.0 / 6.0) * 4,
+      (1.0 / 6.0) * 5,
+      1.0,
+  };
+  auto texture = CreateTextureForFixture("airplane.jpg",
+                                         /*enable_mipmapping=*/true);
 
-    paint.color = Color::White();
-    canvas.DrawPaint(paint);
+  paint.color_source = ColorSource::MakeRadialGradient(
+      {500, 600}, 75, std::move(gradient_colors), std::move(stops),
+      Entity::TileMode::kMirror, {});
+  canvas.DrawCircle({500, 600}, 100, paint);
 
-    paint.color = color;
-    paint.style = Paint::Style::kStroke;
-    paint.stroke_width = 10;
+  paint.color_source = ColorSource::MakeImage(
+      texture, Entity::TileMode::kRepeat, Entity::TileMode::kRepeat, {},
+      Matrix::MakeTranslation({700, 200}));
+  canvas.DrawCircle({800, 300}, 100, paint);
 
-    Path path = PathBuilder{}
-                    .MoveTo({20, 20})
-                    .QuadraticCurveTo({60, 20}, {60, 60})
-                    .Close()
-                    .MoveTo({60, 20})
-                    .QuadraticCurveTo({60, 60}, {20, 60})
-                    .TakePath();
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
 
-    canvas.Scale(Vector2(scale, scale));
+TEST_P(AiksTest, StrokedCirclesRenderCorrectly) {
+  Canvas canvas;
+  canvas.Scale(GetContentScale());
+  Paint paint;
+  const int color_count = 3;
+  Color colors[color_count] = {
+      Color::Blue(),
+      Color::Green(),
+      Color::Crimson(),
+  };
 
-    if (add_circle_clip) {
-      auto [handle_a, handle_b] = IMPELLER_PLAYGROUND_LINE(
-          Point(60, 300), Point(600, 300), 20, Color::Red(), Color::Red());
+  paint.color = Color::White();
+  canvas.DrawPaint(paint);
 
-      auto screen_to_canvas = canvas.GetCurrentTransformation().Invert();
-      Point point_a = screen_to_canvas * handle_a * GetContentScale();
-      Point point_b = screen_to_canvas * handle_b * GetContentScale();
+  int c_index = 0;
 
-      Point middle = (point_a + point_b) / 2;
-      auto radius = point_a.GetDistance(middle);
-      canvas.ClipPath(PathBuilder{}.AddCircle(middle, radius).TakePath());
+  auto draw = [&paint, &colors, &c_index](Canvas& canvas, Point center,
+                                          Scalar r, Scalar dr, int n) {
+    for (int i = 0; i < n; i++) {
+      paint.color = colors[(c_index++) % color_count];
+      canvas.DrawCircle(center, r, paint);
+      r += dr;
     }
+  };
 
-    for (auto join : {Join::kBevel, Join::kRound, Join::kMiter}) {
-      paint.stroke_join = join;
-      for (auto cap : {Cap::kButt, Cap::kSquare, Cap::kRound}) {
-        paint.stroke_cap = cap;
-        canvas.DrawPath(path, paint);
-        canvas.Translate({80, 0});
-      }
-      canvas.Translate({-240, 60});
+  paint.style = Paint::Style::kStroke;
+  paint.stroke_width = 1;
+  draw(canvas, {10, 10}, 2, 2, 14);  // r = [2, 28], covers [1,29]
+  paint.stroke_width = 5;
+  draw(canvas, {10, 10}, 35, 10, 56);  // r = [35, 585], covers [30,590]
+
+  std::vector<Color> gradient_colors = {
+      Color{0x1f / 255.0, 0.0, 0x5c / 255.0, 1.0},
+      Color{0x5b / 255.0, 0.0, 0x60 / 255.0, 1.0},
+      Color{0x87 / 255.0, 0x01 / 255.0, 0x60 / 255.0, 1.0},
+      Color{0xac / 255.0, 0x25 / 255.0, 0x53 / 255.0, 1.0},
+      Color{0xe1 / 255.0, 0x6b / 255.0, 0x5c / 255.0, 1.0},
+      Color{0xf3 / 255.0, 0x90 / 255.0, 0x60 / 255.0, 1.0},
+      Color{0xff / 255.0, 0xb5 / 255.0, 0x6b / 250.0, 1.0}};
+  std::vector<Scalar> stops = {
+      0.0,
+      (1.0 / 6.0) * 1,
+      (1.0 / 6.0) * 2,
+      (1.0 / 6.0) * 3,
+      (1.0 / 6.0) * 4,
+      (1.0 / 6.0) * 5,
+      1.0,
+  };
+  auto texture = CreateTextureForFixture("airplane.jpg",
+                                         /*enable_mipmapping=*/true);
+
+  paint.color_source = ColorSource::MakeRadialGradient(
+      {500, 600}, 75, std::move(gradient_colors), std::move(stops),
+      Entity::TileMode::kMirror, {});
+  draw(canvas, {500, 600}, 5, 10, 10);
+
+  paint.color_source = ColorSource::MakeImage(
+      texture, Entity::TileMode::kRepeat, Entity::TileMode::kRepeat, {},
+      Matrix::MakeTranslation({700, 200}));
+  draw(canvas, {800, 300}, 5, 10, 10);
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, FilledEllipsesRenderCorrectly) {
+  Canvas canvas;
+  canvas.Scale(GetContentScale());
+  Paint paint;
+  const int color_count = 3;
+  Color colors[color_count] = {
+      Color::Blue(),
+      Color::Green(),
+      Color::Crimson(),
+  };
+
+  paint.color = Color::White();
+  canvas.DrawPaint(paint);
+
+  int c_index = 0;
+  int long_radius = 600;
+  int short_radius = 600;
+  while (long_radius > 0 && short_radius > 0) {
+    paint.color = colors[(c_index++) % color_count];
+    canvas.DrawOval(Rect::MakeXYWH(10 - long_radius, 10 - short_radius,
+                                   long_radius * 2, short_radius * 2),
+                    paint);
+    canvas.DrawOval(Rect::MakeXYWH(1000 - short_radius, 750 - long_radius,
+                                   short_radius * 2, long_radius * 2),
+                    paint);
+    if (short_radius > 30) {
+      short_radius -= 10;
+      long_radius -= 5;
+    } else {
+      short_radius -= 2;
+      long_radius -= 1;
     }
+  }
 
-    return renderer.Render(canvas.EndRecordingAsPicture(), render_target);
+  std::vector<Color> gradient_colors = {
+      Color{0x1f / 255.0, 0.0, 0x5c / 255.0, 1.0},
+      Color{0x5b / 255.0, 0.0, 0x60 / 255.0, 1.0},
+      Color{0x87 / 255.0, 0x01 / 255.0, 0x60 / 255.0, 1.0},
+      Color{0xac / 255.0, 0x25 / 255.0, 0x53 / 255.0, 1.0},
+      Color{0xe1 / 255.0, 0x6b / 255.0, 0x5c / 255.0, 1.0},
+      Color{0xf3 / 255.0, 0x90 / 255.0, 0x60 / 255.0, 1.0},
+      Color{0xff / 255.0, 0xb5 / 255.0, 0x6b / 250.0, 1.0}};
+  std::vector<Scalar> stops = {
+      0.0,
+      (1.0 / 6.0) * 1,
+      (1.0 / 6.0) * 2,
+      (1.0 / 6.0) * 3,
+      (1.0 / 6.0) * 4,
+      (1.0 / 6.0) * 5,
+      1.0,
   };
+  auto texture = CreateTextureForFixture("airplane.jpg",
+                                         /*enable_mipmapping=*/true);
 
-  ASSERT_TRUE(OpenPlaygroundHere(callback));
+  paint.color = Color::White().WithAlpha(0.5);
+
+  paint.color_source = ColorSource::MakeRadialGradient(
+      {300, 650}, 75, std::move(gradient_colors), std::move(stops),
+      Entity::TileMode::kMirror, {});
+  canvas.DrawOval(Rect::MakeXYWH(200, 625, 200, 50), paint);
+  canvas.DrawOval(Rect::MakeXYWH(275, 550, 50, 200), paint);
+
+  paint.color_source = ColorSource::MakeImage(
+      texture, Entity::TileMode::kRepeat, Entity::TileMode::kRepeat, {},
+      Matrix::MakeTranslation({610, 15}));
+  canvas.DrawOval(Rect::MakeXYWH(610, 90, 200, 50), paint);
+  canvas.DrawOval(Rect::MakeXYWH(685, 15, 50, 200), paint);
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
 }
 
-TEST_P(AiksTest, GradientStrokesRenderCorrectly) {
-  // Compare with https://fiddle.skia.org/c/027392122bec8ac2b5d5de00a4b9bbe2
-  auto callback = [&](AiksContext& renderer, RenderTarget& render_target) {
-    static float scale = 3;
-    static bool add_circle_clip = true;
-    const char* tile_mode_names[] = {"Clamp", "Repeat", "Mirror", "Decal"};
-    const Entity::TileMode tile_modes[] = {
-        Entity::TileMode::kClamp, Entity::TileMode::kRepeat,
-        Entity::TileMode::kMirror, Entity::TileMode::kDecal};
-    static int selected_tile_mode = 0;
-    static float alpha = 1;
-
-    ImGui::Begin("Controls", nullptr, ImGuiWindowFlags_AlwaysAutoResize);
-    ImGui::SliderFloat("Scale", &scale, 0, 6);
-    ImGui::Checkbox("Circle clip", &add_circle_clip);
-    ImGui::SliderFloat("Alpha", &alpha, 0, 1);
-    ImGui::Combo("Tile mode", &selected_tile_mode, tile_mode_names,
-                 sizeof(tile_mode_names) / sizeof(char*));
-    ImGui::End();
+TEST_P(AiksTest, FilledRoundRectsRenderCorrectly) {
+  Canvas canvas;
+  canvas.Scale(GetContentScale());
+  Paint paint;
+  const int color_count = 3;
+  Color colors[color_count] = {
+      Color::Blue(),
+      Color::Green(),
+      Color::Crimson(),
+  };
+
+  paint.color = Color::White();
+  canvas.DrawPaint(paint);
 
-    Canvas canvas;
-    canvas.Scale(GetContentScale());
-    Paint paint;
-    paint.color = Color::White();
-    canvas.DrawPaint(paint);
+  int c_index = 0;
+  for (int i = 0; i < 4; i++) {
+    for (int j = 0; j < 4; j++) {
+      paint.color = colors[(c_index++) % color_count];
+      canvas.DrawRRect(Rect::MakeXYWH(i * 100 + 10, j * 100 + 20, 80, 80),
+                       Size(i * 5 + 10, j * 5 + 10), paint);
+    }
+  }
+  paint.color = colors[(c_index++) % color_count];
+  canvas.DrawRRect(Rect::MakeXYWH(10, 420, 380, 80), Size(40, 40), paint);
+  paint.color = colors[(c_index++) % color_count];
+  canvas.DrawRRect(Rect::MakeXYWH(410, 20, 80, 380), Size(40, 40), paint);
+
+  std::vector<Color> gradient_colors = {
+      Color{0x1f / 255.0, 0.0, 0x5c / 255.0, 1.0},
+      Color{0x5b / 255.0, 0.0, 0x60 / 255.0, 1.0},
+      Color{0x87 / 255.0, 0x01 / 255.0, 0x60 / 255.0, 1.0},
+      Color{0xac / 255.0, 0x25 / 255.0, 0x53 / 255.0, 1.0},
+      Color{0xe1 / 255.0, 0x6b / 255.0, 0x5c / 255.0, 1.0},
+      Color{0xf3 / 255.0, 0x90 / 255.0, 0x60 / 255.0, 1.0},
+      Color{0xff / 255.0, 0xb5 / 255.0, 0x6b / 250.0, 1.0}};
+  std::vector<Scalar> stops = {
+      0.0,
+      (1.0 / 6.0) * 1,
+      (1.0 / 6.0) * 2,
+      (1.0 / 6.0) * 3,
+      (1.0 / 6.0) * 4,
+      (1.0 / 6.0) * 5,
+      1.0,
+  };
+  auto texture = CreateTextureForFixture("airplane.jpg",
+                                         /*enable_mipmapping=*/true);
 
-    paint.style = Paint::Style::kStroke;
-    paint.color = Color(1.0, 1.0, 1.0, alpha);
-    paint.stroke_width = 10;
-    auto tile_mode = tile_modes[selected_tile_mode];
-    paint.color_source = [tile_mode]() {
-      std::vector<Color> colors = {Color{0.9568, 0.2627, 0.2118, 1.0},
-                                   Color{0.1294, 0.5882, 0.9529, 1.0}};
-      std::vector<Scalar> stops = {0.0, 1.0};
-      Matrix matrix = {
-          1, 0, 0, 0,  //
-          0, 1, 0, 0,  //
-          0, 0, 1, 0,  //
-          0, 0, 0, 1   //
-      };
-      auto contents = std::make_shared<LinearGradientContents>();
-      contents->SetEndPoints({0, 0}, {50, 50});
-      contents->SetColors(std::move(colors));
-      contents->SetStops(std::move(stops));
-      contents->SetTileMode(tile_mode);
-      contents->SetMatrix(matrix);
-      return contents;
-    };
+  paint.color = Color::White().WithAlpha(0.1);
+  paint.color_source = ColorSource::MakeRadialGradient(
+      {550, 550}, 75, gradient_colors, stops, Entity::TileMode::kMirror, {});
+  for (int i = 1; i <= 10; i++) {
+    int j = 11 - i;
+    canvas.DrawRRect(Rect::MakeLTRB(550 - i * 20, 550 - j * 20,  //
+                                    550 + i * 20, 550 + j * 20),
+                     Size(i * 10, j * 10), paint);
+  }
+  paint.color = Color::White().WithAlpha(0.5);
+  paint.color_source = ColorSource::MakeRadialGradient(
+      {200, 650}, 75, std::move(gradient_colors), std::move(stops),
+      Entity::TileMode::kMirror, {});
+  canvas.DrawRRect(Rect::MakeLTRB(100, 610, 300, 690), Size(40, 40), paint);
+  canvas.DrawRRect(Rect::MakeLTRB(160, 550, 240, 750), Size(40, 40), paint);
+
+  paint.color = Color::White().WithAlpha(0.1);
+  paint.color_source = ColorSource::MakeImage(
+      texture, Entity::TileMode::kRepeat, Entity::TileMode::kRepeat, {},
+      Matrix::MakeTranslation({520, 20}));
+  for (int i = 1; i <= 10; i++) {
+    int j = 11 - i;
+    canvas.DrawRRect(Rect::MakeLTRB(720 - i * 20, 220 - j * 20,  //
+                                    720 + i * 20, 220 + j * 20),
+                     Size(i * 10, j * 10), paint);
+  }
+  paint.color = Color::White().WithAlpha(0.5);
+  paint.color_source = ColorSource::MakeImage(
+      texture, Entity::TileMode::kRepeat, Entity::TileMode::kRepeat, {},
+      Matrix::MakeTranslation({800, 300}));
+  canvas.DrawRRect(Rect::MakeLTRB(800, 410, 1000, 490), Size(40, 40), paint);
+  canvas.DrawRRect(Rect::MakeLTRB(860, 350, 940, 550), Size(40, 40), paint);
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
 
-    Path path = PathBuilder{}
-                    .MoveTo({20, 20})
-                    .QuadraticCurveTo({60, 20}, {60, 60})
-                    .Close()
-                    .MoveTo({60, 20})
-                    .QuadraticCurveTo({60, 60}, {20, 60})
-                    .TakePath();
+TEST_P(AiksTest, SolidColorCirclesOvalsRRectsMaskBlurCorrectly) {
+  Canvas canvas;
+  canvas.Scale(GetContentScale());
+  Paint paint;
+  paint.mask_blur_descriptor = Paint::MaskBlurDescriptor{
+      .style = FilterContents::BlurStyle::kNormal,
+      .sigma = Sigma{1},
+  };
 
-    canvas.Scale(Vector2(scale, scale));
+  canvas.DrawPaint({.color = Color::White()});
 
-    if (add_circle_clip) {
-      auto [handle_a, handle_b] = IMPELLER_PLAYGROUND_LINE(
-          Point(60, 300), Point(600, 300), 20, Color::Red(), Color::Red());
+  paint.color = Color::Crimson();
+  Scalar y = 100.0f;
+  for (int i = 0; i < 5; i++) {
+    Scalar x = (i + 1) * 100;
+    Scalar radius = x / 10.0f;
+    canvas.DrawRect(Rect::MakeXYWH(x + 25 - radius / 2, y + radius / 2,  //
+                                   radius, 60.0f - radius),
+                    paint);
+  }
 
-      auto screen_to_canvas = canvas.GetCurrentTransformation().Invert();
-      Point point_a = screen_to_canvas * handle_a * GetContentScale();
-      Point point_b = screen_to_canvas * handle_b * GetContentScale();
+  paint.color = Color::Blue();
+  y += 100.0f;
+  for (int i = 0; i < 5; i++) {
+    Scalar x = (i + 1) * 100;
+    Scalar radius = x / 10.0f;
+    canvas.DrawCircle({x + 25, y + 25}, radius, paint);
+  }
 
-      Point middle = (point_a + point_b) / 2;
-      auto radius = point_a.GetDistance(middle);
-      canvas.ClipPath(PathBuilder{}.AddCircle(middle, radius).TakePath());
-    }
+  paint.color = Color::Green();
+  y += 100.0f;
+  for (int i = 0; i < 5; i++) {
+    Scalar x = (i + 1) * 100;
+    Scalar radius = x / 10.0f;
+    canvas.DrawOval(Rect::MakeXYWH(x + 25 - radius / 2, y + radius / 2,  //
+                                   radius, 60.0f - radius),
+                    paint);
+  }
 
-    for (auto join : {Join::kBevel, Join::kRound, Join::kMiter}) {
-      paint.stroke_join = join;
-      for (auto cap : {Cap::kButt, Cap::kSquare, Cap::kRound}) {
-        paint.stroke_cap = cap;
-        canvas.DrawPath(path, paint);
-        canvas.Translate({80, 0});
-      }
-      canvas.Translate({-240, 60});
-    }
+  paint.color = Color::Purple();
+  y += 100.0f;
+  for (int i = 0; i < 5; i++) {
+    Scalar x = (i + 1) * 100;
+    Scalar radius = x / 20.0f;
+    canvas.DrawRRect(Rect::MakeXYWH(x, y, 60.0f, 60.0f),  //
+                     {radius, radius},                    //
+                     paint);
+  }
+
+  paint.color = Color::Orange();
+  y += 100.0f;
+  for (int i = 0; i < 5; i++) {
+    Scalar x = (i + 1) * 100;
+    Scalar radius = x / 20.0f;
+    canvas.DrawRRect(Rect::MakeXYWH(x, y, 60.0f, 60.0f),  //
+                     {radius, 5.0f}, paint);
+  }
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, FilledRoundRectPathsRenderCorrectly) {
+  Canvas canvas;
+  canvas.Scale(GetContentScale());
+  Paint paint;
+  const int color_count = 3;
+  Color colors[color_count] = {
+      Color::Blue(),
+      Color::Green(),
+      Color::Crimson(),
+  };
+
+  paint.color = Color::White();
+  canvas.DrawPaint(paint);
 
-    return renderer.Render(canvas.EndRecordingAsPicture(), render_target);
+  auto draw_rrect_as_path = [&canvas](const Rect& rect, const Size& radii,
+                                      const Paint& paint) {
+    PathBuilder builder = PathBuilder();
+    builder.AddRoundedRect(rect, radii);
+    canvas.DrawPath(builder.TakePath(), paint);
   };
 
-  ASSERT_TRUE(OpenPlaygroundHere(callback));
+  int c_index = 0;
+  for (int i = 0; i < 4; i++) {
+    for (int j = 0; j < 4; j++) {
+      paint.color = colors[(c_index++) % color_count];
+      draw_rrect_as_path(Rect::MakeXYWH(i * 100 + 10, j * 100 + 20, 80, 80),
+                         Size(i * 5 + 10, j * 5 + 10), paint);
+    }
+  }
+  paint.color = colors[(c_index++) % color_count];
+  draw_rrect_as_path(Rect::MakeXYWH(10, 420, 380, 80), Size(40, 40), paint);
+  paint.color = colors[(c_index++) % color_count];
+  draw_rrect_as_path(Rect::MakeXYWH(410, 20, 80, 380), Size(40, 40), paint);
+
+  std::vector<Color> gradient_colors = {
+      Color{0x1f / 255.0, 0.0, 0x5c / 255.0, 1.0},
+      Color{0x5b / 255.0, 0.0, 0x60 / 255.0, 1.0},
+      Color{0x87 / 255.0, 0x01 / 255.0, 0x60 / 255.0, 1.0},
+      Color{0xac / 255.0, 0x25 / 255.0, 0x53 / 255.0, 1.0},
+      Color{0xe1 / 255.0, 0x6b / 255.0, 0x5c / 255.0, 1.0},
+      Color{0xf3 / 255.0, 0x90 / 255.0, 0x60 / 255.0, 1.0},
+      Color{0xff / 255.0, 0xb5 / 255.0, 0x6b / 250.0, 1.0}};
+  std::vector<Scalar> stops = {
+      0.0,
+      (1.0 / 6.0) * 1,
+      (1.0 / 6.0) * 2,
+      (1.0 / 6.0) * 3,
+      (1.0 / 6.0) * 4,
+      (1.0 / 6.0) * 5,
+      1.0,
+  };
+  auto texture = CreateTextureForFixture("airplane.jpg",
+                                         /*enable_mipmapping=*/true);
+
+  paint.color = Color::White().WithAlpha(0.1);
+  paint.color_source = ColorSource::MakeRadialGradient(
+      {550, 550}, 75, gradient_colors, stops, Entity::TileMode::kMirror, {});
+  for (int i = 1; i <= 10; i++) {
+    int j = 11 - i;
+    draw_rrect_as_path(Rect::MakeLTRB(550 - i * 20, 550 - j * 20,  //
+                                      550 + i * 20, 550 + j * 20),
+                       Size(i * 10, j * 10), paint);
+  }
+  paint.color = Color::White().WithAlpha(0.5);
+  paint.color_source = ColorSource::MakeRadialGradient(
+      {200, 650}, 75, std::move(gradient_colors), std::move(stops),
+      Entity::TileMode::kMirror, {});
+  draw_rrect_as_path(Rect::MakeLTRB(100, 610, 300, 690), Size(40, 40), paint);
+  draw_rrect_as_path(Rect::MakeLTRB(160, 550, 240, 750), Size(40, 40), paint);
+
+  paint.color = Color::White().WithAlpha(0.1);
+  paint.color_source = ColorSource::MakeImage(
+      texture, Entity::TileMode::kRepeat, Entity::TileMode::kRepeat, {},
+      Matrix::MakeTranslation({520, 20}));
+  for (int i = 1; i <= 10; i++) {
+    int j = 11 - i;
+    draw_rrect_as_path(Rect::MakeLTRB(720 - i * 20, 220 - j * 20,  //
+                                      720 + i * 20, 220 + j * 20),
+                       Size(i * 10, j * 10), paint);
+  }
+  paint.color = Color::White().WithAlpha(0.5);
+  paint.color_source = ColorSource::MakeImage(
+      texture, Entity::TileMode::kRepeat, Entity::TileMode::kRepeat, {},
+      Matrix::MakeTranslation({800, 300}));
+  draw_rrect_as_path(Rect::MakeLTRB(800, 410, 1000, 490), Size(40, 40), paint);
+  draw_rrect_as_path(Rect::MakeLTRB(860, 350, 940, 550), Size(40, 40), paint);
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
 }
 
 TEST_P(AiksTest, CoverageOriginShouldBeAccountedForInSubpasses) {
-  auto callback = [&](AiksContext& renderer, RenderTarget& render_target) {
+  auto callback = [&](AiksContext& renderer) -> std::optional<Picture> {
     Canvas canvas;
     canvas.Scale(GetContentScale());
 
@@ -1597,8 +1717,9 @@ TEST_P(AiksTest, CoverageOriginShouldBeAccountedForInSubpasses) {
     const auto offset = Point{25, 25};
     const auto size = Size(100, 100);
 
-    auto [b0, b1] = IMPELLER_PLAYGROUND_LINE(Point(40, 40), Point(160, 160), 10,
-                                             Color::White(), Color::White());
+    static PlaygroundPoint point_a(Point(40, 40), 10, Color::White());
+    static PlaygroundPoint point_b(Point(160, 160), 10, Color::White());
+    auto [b0, b1] = DrawPlaygroundLine(point_a, point_b);
     auto bounds = Rect::MakeLTRB(b0.x, b0.y, b1.x, b1.y);
 
     canvas.DrawRect(bounds, Paint{.color = Color::Yellow(),
@@ -1607,40 +1728,28 @@ TEST_P(AiksTest, CoverageOriginShouldBeAccountedForInSubpasses) {
 
     canvas.SaveLayer(alpha, bounds);
 
-    canvas.DrawRect({current, size}, Paint{.color = Color::Red()});
-    canvas.DrawRect({current += offset, size}, Paint{.color = Color::Green()});
-    canvas.DrawRect({current += offset, size}, Paint{.color = Color::Blue()});
+    canvas.DrawRect(Rect::MakeOriginSize(current, size),
+                    Paint{.color = Color::Red()});
+    canvas.DrawRect(Rect::MakeOriginSize(current += offset, size),
+                    Paint{.color = Color::Green()});
+    canvas.DrawRect(Rect::MakeOriginSize(current += offset, size),
+                    Paint{.color = Color::Blue()});
 
     canvas.Restore();
 
-    return renderer.Render(canvas.EndRecordingAsPicture(), render_target);
+    return canvas.EndRecordingAsPicture();
   };
 
   ASSERT_TRUE(OpenPlaygroundHere(callback));
 }
 
-TEST_P(AiksTest, DrawRectStrokesRenderCorrectly) {
-  Canvas canvas;
-  Paint paint;
-  paint.color = Color::Red();
-  paint.style = Paint::Style::kStroke;
-  paint.stroke_width = 10;
-
-  canvas.Translate({100, 100});
-  canvas.DrawPath(
-      PathBuilder{}.AddRect(Rect::MakeSize(Size{100, 100})).TakePath(),
-      {paint});
-
-  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
-}
-
 TEST_P(AiksTest, SaveLayerDrawsBehindSubsequentEntities) {
   // Compare with https://fiddle.skia.org/c/9e03de8567ffb49e7e83f53b64bcf636
   Canvas canvas;
   Paint paint;
 
   paint.color = Color::Black();
-  Rect rect(25, 25, 25, 25);
+  Rect rect = Rect::MakeXYWH(25, 25, 25, 25);
   canvas.DrawRect(rect, paint);
 
   canvas.Translate({10, 10});
@@ -1661,7 +1770,7 @@ TEST_P(AiksTest, SaveLayerDrawsBehindSubsequentEntities) {
 TEST_P(AiksTest, SiblingSaveLayerBoundsAreRespected) {
   Canvas canvas;
   Paint paint;
-  Rect rect(0, 0, 1000, 1000);
+  Rect rect = Rect::MakeXYWH(0, 0, 1000, 1000);
 
   // Black, green, and red squares offset by [10, 10].
   {
@@ -1704,9 +1813,12 @@ TEST_P(AiksTest, CanRenderClippedLayers) {
     canvas.DrawRect(Rect::MakeSize(Size{400, 400}), {.color = Color::White()});
     // Fill the layer with green, but do so with a color blend that can't be
     // collapsed into the parent pass.
+    // TODO(jonahwilliams): this blend mode was changed from color burn to
+    // hardlight to work around https://github.com/flutter/flutter/issues/136554
+    // .
     canvas.DrawRect(
         Rect::MakeSize(Size{400, 400}),
-        {.color = Color::Green(), .blend_mode = BlendMode::kColorBurn});
+        {.color = Color::Green(), .blend_mode = BlendMode::kHardLight});
   }
 
   ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
@@ -1738,5 +1850,1623 @@ TEST_P(AiksTest, SaveLayerFiltersScaleWithTransform) {
   ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
 }
 
-}  // namespace testing
-}  // namespace impeller
+#if IMPELLER_ENABLE_3D
+TEST_P(AiksTest, SceneColorSource) {
+  // Load up the scene.
+  auto mapping =
+      flutter::testing::OpenFixtureAsMapping("flutter_logo_baked.glb.ipscene");
+  ASSERT_NE(mapping, nullptr);
+
+  std::shared_ptr<scene::Node> gltf_scene = scene::Node::MakeFromFlatbuffer(
+      *mapping, *GetContext()->GetResourceAllocator());
+  ASSERT_NE(gltf_scene, nullptr);
+
+  auto callback = [&](AiksContext& renderer) -> std::optional<Picture> {
+    Paint paint;
+
+    static Scalar distance = 2;
+    static Scalar y_pos = 0;
+    static Scalar fov = 45;
+    if (AiksTest::ImGuiBegin("Controls", nullptr,
+                             ImGuiWindowFlags_AlwaysAutoResize)) {
+      ImGui::SliderFloat("Distance", &distance, 0, 4);
+      ImGui::SliderFloat("Y", &y_pos, -3, 3);
+      ImGui::SliderFloat("FOV", &fov, 1, 180);
+      ImGui::End();
+    }
+
+    Scalar angle = GetSecondsElapsed();
+    auto camera_position =
+        Vector3(distance * std::sin(angle), y_pos, -distance * std::cos(angle));
+
+    paint.color_source = ColorSource::MakeScene(
+        gltf_scene,
+        Matrix::MakePerspective(Degrees(fov), GetWindowSize(), 0.1, 1000) *
+            Matrix::MakeLookAt(camera_position, {0, 0, 0}, {0, 1, 0}));
+
+    Canvas canvas;
+    canvas.DrawPaint(Paint{.color = Color::MakeRGBA8(0xf9, 0xf9, 0xf9, 0xff)});
+    canvas.Scale(GetContentScale());
+    canvas.DrawPaint(paint);
+    return canvas.EndRecordingAsPicture();
+  };
+
+  ASSERT_TRUE(OpenPlaygroundHere(callback));
+}
+#endif  // IMPELLER_ENABLE_3D
+
+TEST_P(AiksTest, PaintWithFilters) {
+  // validate that a paint with a color filter "HasFilters", no other filters
+  // impact this setting.
+  Paint paint;
+
+  ASSERT_FALSE(paint.HasColorFilter());
+
+  paint.color_filter =
+      ColorFilter::MakeBlend(BlendMode::kSourceOver, Color::Blue());
+
+  ASSERT_TRUE(paint.HasColorFilter());
+
+  paint.image_filter = ImageFilter::MakeBlur(Sigma(1.0), Sigma(1.0),
+                                             FilterContents::BlurStyle::kNormal,
+                                             Entity::TileMode::kClamp);
+
+  ASSERT_TRUE(paint.HasColorFilter());
+
+  paint.mask_blur_descriptor = {};
+
+  ASSERT_TRUE(paint.HasColorFilter());
+
+  paint.color_filter = nullptr;
+
+  ASSERT_FALSE(paint.HasColorFilter());
+}
+
+TEST_P(AiksTest, OpacityPeepHoleApplicationTest) {
+  auto entity_pass = std::make_shared<EntityPass>();
+  auto rect = Rect::MakeLTRB(0, 0, 100, 100);
+  Paint paint;
+  paint.color = Color::White().WithAlpha(0.5);
+  paint.color_filter =
+      ColorFilter::MakeBlend(BlendMode::kSourceOver, Color::Blue());
+
+  // Paint has color filter, can't elide.
+  auto delegate = std::make_shared<OpacityPeepholePassDelegate>(paint);
+  ASSERT_FALSE(delegate->CanCollapseIntoParentPass(entity_pass.get()));
+
+  paint.color_filter = nullptr;
+  paint.image_filter = ImageFilter::MakeBlur(Sigma(1.0), Sigma(1.0),
+                                             FilterContents::BlurStyle::kNormal,
+                                             Entity::TileMode::kClamp);
+
+  // Paint has image filter, can't elide.
+  delegate = std::make_shared<OpacityPeepholePassDelegate>(paint);
+  ASSERT_FALSE(delegate->CanCollapseIntoParentPass(entity_pass.get()));
+
+  paint.image_filter = nullptr;
+  paint.color = Color::Red();
+
+  // Paint has no alpha, can't elide;
+  delegate = std::make_shared<OpacityPeepholePassDelegate>(paint);
+  ASSERT_FALSE(delegate->CanCollapseIntoParentPass(entity_pass.get()));
+
+  // Positive test.
+  Entity entity;
+  entity.SetContents(SolidColorContents::Make(
+      PathBuilder{}.AddRect(rect).TakePath(), Color::Red()));
+  entity_pass->AddEntity(std::move(entity));
+  paint.color = Color::Red().WithAlpha(0.5);
+
+  delegate = std::make_shared<OpacityPeepholePassDelegate>(paint);
+  ASSERT_TRUE(delegate->CanCollapseIntoParentPass(entity_pass.get()));
+}
+
+TEST_P(AiksTest, DrawPaintAbsorbsClears) {
+  Canvas canvas;
+  canvas.DrawPaint({.color = Color::Red(), .blend_mode = BlendMode::kSource});
+  canvas.DrawPaint({.color = Color::CornflowerBlue().WithAlpha(0.75),
+                    .blend_mode = BlendMode::kSourceOver});
+
+  Picture picture = canvas.EndRecordingAsPicture();
+  auto expected = Color::Red().Blend(Color::CornflowerBlue().WithAlpha(0.75),
+                                     BlendMode::kSourceOver);
+  ASSERT_EQ(picture.pass->GetClearColor(), expected);
+
+  std::shared_ptr<ContextSpy> spy = ContextSpy::Make();
+  std::shared_ptr<Context> real_context = GetContext();
+  std::shared_ptr<ContextMock> mock_context = spy->MakeContext(real_context);
+  AiksContext renderer(mock_context, nullptr);
+  std::shared_ptr<Image> image = picture.ToImage(renderer, {300, 300});
+
+  ASSERT_EQ(spy->render_passes_.size(), 1llu);
+  std::shared_ptr<RenderPass> render_pass = spy->render_passes_[0];
+  ASSERT_EQ(render_pass->GetCommands().size(), 0llu);
+}
+
+// This is important to enforce with texture reuse, since cached textures need
+// to be cleared before reuse.
+TEST_P(AiksTest,
+       ParentSaveLayerCreatesRenderPassWhenChildBackdropFilterIsPresent) {
+  Canvas canvas;
+  canvas.SaveLayer({}, std::nullopt, ImageFilter::MakeMatrix(Matrix(), {}));
+  canvas.DrawPaint({.color = Color::Red(), .blend_mode = BlendMode::kSource});
+  canvas.DrawPaint({.color = Color::CornflowerBlue().WithAlpha(0.75),
+                    .blend_mode = BlendMode::kSourceOver});
+  canvas.Restore();
+
+  Picture picture = canvas.EndRecordingAsPicture();
+
+  std::shared_ptr<ContextSpy> spy = ContextSpy::Make();
+  std::shared_ptr<Context> real_context = GetContext();
+  std::shared_ptr<ContextMock> mock_context = spy->MakeContext(real_context);
+  AiksContext renderer(mock_context, nullptr);
+  std::shared_ptr<Image> image = picture.ToImage(renderer, {300, 300});
+
+  ASSERT_EQ(spy->render_passes_.size(),
+            GetBackend() == PlaygroundBackend::kOpenGLES ? 4llu : 3llu);
+  std::shared_ptr<RenderPass> render_pass = spy->render_passes_[0];
+  ASSERT_EQ(render_pass->GetCommands().size(), 0llu);
+}
+
+TEST_P(AiksTest, DrawRectAbsorbsClears) {
+  Canvas canvas;
+  canvas.DrawRect(Rect::MakeXYWH(0, 0, 300, 300),
+                  {.color = Color::Red(), .blend_mode = BlendMode::kSource});
+  canvas.DrawRect(Rect::MakeXYWH(0, 0, 300, 300),
+                  {.color = Color::CornflowerBlue().WithAlpha(0.75),
+                   .blend_mode = BlendMode::kSourceOver});
+
+  std::shared_ptr<ContextSpy> spy = ContextSpy::Make();
+  Picture picture = canvas.EndRecordingAsPicture();
+  std::shared_ptr<Context> real_context = GetContext();
+  std::shared_ptr<ContextMock> mock_context = spy->MakeContext(real_context);
+  AiksContext renderer(mock_context, nullptr);
+  std::shared_ptr<Image> image = picture.ToImage(renderer, {300, 300});
+
+  ASSERT_EQ(spy->render_passes_.size(), 1llu);
+  std::shared_ptr<RenderPass> render_pass = spy->render_passes_[0];
+  ASSERT_EQ(render_pass->GetCommands().size(), 0llu);
+}
+
+TEST_P(AiksTest, DrawRectAbsorbsClearsNegativeRRect) {
+  Canvas canvas;
+  canvas.DrawRRect(Rect::MakeXYWH(0, 0, 300, 300), {5.0, 5.0},
+                   {.color = Color::Red(), .blend_mode = BlendMode::kSource});
+  canvas.DrawRRect(Rect::MakeXYWH(0, 0, 300, 300), {5.0, 5.0},
+                   {.color = Color::CornflowerBlue().WithAlpha(0.75),
+                    .blend_mode = BlendMode::kSourceOver});
+
+  std::shared_ptr<ContextSpy> spy = ContextSpy::Make();
+  Picture picture = canvas.EndRecordingAsPicture();
+  std::shared_ptr<Context> real_context = GetContext();
+  std::shared_ptr<ContextMock> mock_context = spy->MakeContext(real_context);
+  AiksContext renderer(mock_context, nullptr);
+  std::shared_ptr<Image> image = picture.ToImage(renderer, {300, 300});
+
+  ASSERT_EQ(spy->render_passes_.size(), 1llu);
+  std::shared_ptr<RenderPass> render_pass = spy->render_passes_[0];
+  ASSERT_EQ(render_pass->GetCommands().size(), 2llu);
+}
+
+TEST_P(AiksTest, DrawRectAbsorbsClearsNegativeRotation) {
+  Canvas canvas;
+  canvas.Translate(Vector3(150.0, 150.0, 0.0));
+  canvas.Rotate(Degrees(45.0));
+  canvas.Translate(Vector3(-150.0, -150.0, 0.0));
+  canvas.DrawRect(Rect::MakeXYWH(0, 0, 300, 300),
+                  {.color = Color::Red(), .blend_mode = BlendMode::kSource});
+
+  std::shared_ptr<ContextSpy> spy = ContextSpy::Make();
+  Picture picture = canvas.EndRecordingAsPicture();
+  std::shared_ptr<Context> real_context = GetContext();
+  std::shared_ptr<ContextMock> mock_context = spy->MakeContext(real_context);
+  AiksContext renderer(mock_context, nullptr);
+  std::shared_ptr<Image> image = picture.ToImage(renderer, {300, 300});
+
+  ASSERT_EQ(spy->render_passes_.size(), 1llu);
+  std::shared_ptr<RenderPass> render_pass = spy->render_passes_[0];
+  ASSERT_EQ(render_pass->GetCommands().size(), 1llu);
+}
+
+TEST_P(AiksTest, DrawRectAbsorbsClearsNegative) {
+  Canvas canvas;
+  canvas.DrawRect(Rect::MakeXYWH(0, 0, 300, 300),
+                  {.color = Color::Red(), .blend_mode = BlendMode::kSource});
+  canvas.DrawRect(Rect::MakeXYWH(0, 0, 300, 300),
+                  {.color = Color::CornflowerBlue().WithAlpha(0.75),
+                   .blend_mode = BlendMode::kSourceOver});
+
+  std::shared_ptr<ContextSpy> spy = ContextSpy::Make();
+  Picture picture = canvas.EndRecordingAsPicture();
+  std::shared_ptr<Context> real_context = GetContext();
+  std::shared_ptr<ContextMock> mock_context = spy->MakeContext(real_context);
+  AiksContext renderer(mock_context, nullptr);
+  std::shared_ptr<Image> image = picture.ToImage(renderer, {301, 301});
+
+  ASSERT_EQ(spy->render_passes_.size(), 1llu);
+  std::shared_ptr<RenderPass> render_pass = spy->render_passes_[0];
+  ASSERT_EQ(render_pass->GetCommands().size(), 2llu);
+}
+
+TEST_P(AiksTest, ClipRectElidesNoOpClips) {
+  Canvas canvas(Rect::MakeXYWH(0, 0, 100, 100));
+  canvas.ClipRect(Rect::MakeXYWH(0, 0, 100, 100));
+  canvas.ClipRect(Rect::MakeXYWH(-100, -100, 300, 300));
+  canvas.DrawPaint({.color = Color::Red(), .blend_mode = BlendMode::kSource});
+  canvas.DrawPaint({.color = Color::CornflowerBlue().WithAlpha(0.75),
+                    .blend_mode = BlendMode::kSourceOver});
+
+  Picture picture = canvas.EndRecordingAsPicture();
+  auto expected = Color::Red().Blend(Color::CornflowerBlue().WithAlpha(0.75),
+                                     BlendMode::kSourceOver);
+  ASSERT_EQ(picture.pass->GetClearColor(), expected);
+
+  std::shared_ptr<ContextSpy> spy = ContextSpy::Make();
+  std::shared_ptr<Context> real_context = GetContext();
+  std::shared_ptr<ContextMock> mock_context = spy->MakeContext(real_context);
+  AiksContext renderer(mock_context, nullptr);
+  std::shared_ptr<Image> image = picture.ToImage(renderer, {300, 300});
+
+  ASSERT_EQ(spy->render_passes_.size(), 1llu);
+  std::shared_ptr<RenderPass> render_pass = spy->render_passes_[0];
+  ASSERT_EQ(render_pass->GetCommands().size(), 0llu);
+}
+
+TEST_P(AiksTest, ClearColorOptimizationDoesNotApplyForBackdropFilters) {
+  Canvas canvas;
+  canvas.SaveLayer({}, std::nullopt,
+                   ImageFilter::MakeBlur(Sigma(3), Sigma(3),
+                                         FilterContents::BlurStyle::kNormal,
+                                         Entity::TileMode::kClamp));
+  canvas.DrawPaint({.color = Color::Red(), .blend_mode = BlendMode::kSource});
+  canvas.DrawPaint({.color = Color::CornflowerBlue().WithAlpha(0.75),
+                    .blend_mode = BlendMode::kSourceOver});
+  canvas.Restore();
+
+  Picture picture = canvas.EndRecordingAsPicture();
+
+  std::optional<Color> actual_color;
+  bool found_subpass = false;
+  picture.pass->IterateAllElements([&](EntityPass::Element& element) -> bool {
+    if (auto subpass = std::get_if<std::unique_ptr<EntityPass>>(&element)) {
+      actual_color = subpass->get()->GetClearColor();
+      found_subpass = true;
+    }
+    // Fail if the first element isn't a subpass.
+    return true;
+  });
+
+  EXPECT_TRUE(found_subpass);
+  EXPECT_FALSE(actual_color.has_value());
+}
+
+TEST_P(AiksTest, CollapsedDrawPaintInSubpass) {
+  Canvas canvas;
+  canvas.DrawPaint(
+      {.color = Color::Yellow(), .blend_mode = BlendMode::kSource});
+  canvas.SaveLayer({.blend_mode = BlendMode::kMultiply});
+  canvas.DrawPaint({.color = Color::CornflowerBlue().WithAlpha(0.75),
+                    .blend_mode = BlendMode::kSourceOver});
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, CollapsedDrawPaintInSubpassBackdropFilter) {
+  // Bug: https://github.com/flutter/flutter/issues/131576
+  Canvas canvas;
+  canvas.DrawPaint(
+      {.color = Color::Yellow(), .blend_mode = BlendMode::kSource});
+  canvas.SaveLayer({}, {},
+                   ImageFilter::MakeBlur(Sigma(20.0), Sigma(20.0),
+                                         FilterContents::BlurStyle::kNormal,
+                                         Entity::TileMode::kDecal));
+  canvas.DrawPaint(
+      {.color = Color::CornflowerBlue(), .blend_mode = BlendMode::kSourceOver});
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, ForegroundBlendSubpassCollapseOptimization) {
+  Canvas canvas;
+
+  canvas.SaveLayer({
+      .color_filter =
+          ColorFilter::MakeBlend(BlendMode::kColorDodge, Color::Red()),
+  });
+
+  canvas.Translate({500, 300, 0});
+  canvas.Rotate(Radians(2 * kPi / 3));
+  canvas.DrawRect(Rect::MakeXYWH(100, 100, 200, 200), {.color = Color::Blue()});
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, ColorMatrixFilterSubpassCollapseOptimization) {
+  Canvas canvas;
+
+  canvas.SaveLayer({
+      .color_filter =
+          ColorFilter::MakeMatrix({.array =
+                                       {
+                                           -1.0, 0,    0,    1.0, 0,  //
+                                           0,    -1.0, 0,    1.0, 0,  //
+                                           0,    0,    -1.0, 1.0, 0,  //
+                                           1.0,  1.0,  1.0,  1.0, 0   //
+                                       }}),
+  });
+
+  canvas.Translate({500, 300, 0});
+  canvas.Rotate(Radians(2 * kPi / 3));
+  canvas.DrawRect(Rect::MakeXYWH(100, 100, 200, 200), {.color = Color::Blue()});
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, LinearToSrgbFilterSubpassCollapseOptimization) {
+  Canvas canvas;
+
+  canvas.SaveLayer({
+      .color_filter = ColorFilter::MakeLinearToSrgb(),
+  });
+
+  canvas.Translate({500, 300, 0});
+  canvas.Rotate(Radians(2 * kPi / 3));
+  canvas.DrawRect(Rect::MakeXYWH(100, 100, 200, 200), {.color = Color::Blue()});
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, SrgbToLinearFilterSubpassCollapseOptimization) {
+  Canvas canvas;
+
+  canvas.SaveLayer({
+      .color_filter = ColorFilter::MakeSrgbToLinear(),
+  });
+
+  canvas.Translate({500, 300, 0});
+  canvas.Rotate(Radians(2 * kPi / 3));
+  canvas.DrawRect(Rect::MakeXYWH(100, 100, 200, 200), {.color = Color::Blue()});
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+static Picture BlendModeTest(Vector2 content_scale,
+                             BlendMode blend_mode,
+                             const std::shared_ptr<Image>& src_image,
+                             const std::shared_ptr<Image>& dst_image) {
+  Color destination_color = Color::CornflowerBlue().WithAlpha(0.75);
+  auto source_colors = std::vector<Color>({Color::White().WithAlpha(0.75),
+                                           Color::LimeGreen().WithAlpha(0.75),
+                                           Color::Black().WithAlpha(0.75)});
+
+  Canvas canvas;
+  canvas.DrawPaint({.color = Color::Black()});
+  // TODO(bdero): Why does this cause the left image to double scale on high DPI
+  //              displays.
+  // canvas.Scale(content_scale);
+
+  //----------------------------------------------------------------------------
+  /// 1. Save layer blending (top squares).
+  ///
+
+  canvas.Save();
+  for (const auto& color : source_colors) {
+    canvas.Save();
+    {
+      canvas.ClipRect(Rect::MakeXYWH(25, 25, 100, 100));
+      // Perform the blend in a SaveLayer so that the initial backdrop color is
+      // fully transparent black. SourceOver blend the result onto the parent
+      // pass.
+      canvas.SaveLayer({});
+      {
+        canvas.DrawPaint({.color = destination_color});
+        // Draw the source color in an offscreen pass and blend it to the parent
+        // pass.
+        canvas.SaveLayer({.blend_mode = blend_mode});
+        {  //
+          canvas.DrawRect(Rect::MakeXYWH(25, 25, 100, 100), {.color = color});
+        }
+        canvas.Restore();
+      }
+      canvas.Restore();
+    }
+    canvas.Restore();
+    canvas.Translate(Vector2(100, 0));
+  }
+  canvas.RestoreToCount(0);
+
+  //----------------------------------------------------------------------------
+  /// 2. CPU blend modes (bottom squares).
+  ///
+
+  canvas.Save();
+  canvas.Translate({0, 100});
+  // Perform the blend in a SaveLayer so that the initial backdrop color is
+  // fully transparent black. SourceOver blend the result onto the parent pass.
+  canvas.SaveLayer({});
+  for (const auto& color : source_colors) {
+    // Simply write the CPU blended color to the pass.
+    canvas.DrawRect(Rect::MakeXYWH(25, 25, 100, 100),
+                    {.color = destination_color.Blend(color, blend_mode),
+                     .blend_mode = BlendMode::kSourceOver});
+    canvas.Translate(Vector2(100, 0));
+  }
+  canvas.Restore();
+  canvas.Restore();
+
+  //----------------------------------------------------------------------------
+  /// 3. Image blending (bottom images).
+  ///
+  /// Compare these results with the images in the Flutter blend mode
+  /// documentation: https://api.flutter.dev/flutter/dart-ui/BlendMode.html
+  ///
+
+  canvas.Translate({0, 250});
+
+  // Draw grid behind the images.
+  canvas.DrawRect(Rect::MakeLTRB(0, 0, 800, 400),
+                  {.color = Color::MakeRGBA8(41, 41, 41, 255)});
+  Paint square_paint = {.color = Color::MakeRGBA8(15, 15, 15, 255)};
+  for (int y = 0; y < 400 / 8; y++) {
+    for (int x = 0; x < 800 / 16; x++) {
+      canvas.DrawRect(Rect::MakeXYWH(x * 16 + (y % 2) * 8, y * 8, 8, 8),
+                      square_paint);
+    }
+  }
+
+  // Uploaded image source (left image).
+  canvas.Save();
+  canvas.SaveLayer({.blend_mode = BlendMode::kSourceOver});
+  {
+    canvas.DrawImage(dst_image, {0, 0}, {.blend_mode = BlendMode::kSourceOver});
+    canvas.DrawImage(src_image, {0, 0}, {.blend_mode = blend_mode});
+  }
+  canvas.Restore();
+  canvas.Restore();
+
+  // Rendered image source (right image).
+  canvas.Save();
+  canvas.SaveLayer({.blend_mode = BlendMode::kSourceOver});
+  {
+    canvas.DrawImage(dst_image, {400, 0},
+                     {.blend_mode = BlendMode::kSourceOver});
+    canvas.SaveLayer({.blend_mode = blend_mode});
+    {
+      canvas.DrawImage(src_image, {400, 0},
+                       {.blend_mode = BlendMode::kSourceOver});
+    }
+    canvas.Restore();
+  }
+  canvas.Restore();
+  canvas.Restore();
+
+  return canvas.EndRecordingAsPicture();
+}
+
+#define BLEND_MODE_TEST(blend_mode)                                          \
+  TEST_P(AiksTest, BlendMode##blend_mode) {                                  \
+    auto src_image = std::make_shared<Image>(                                \
+        CreateTextureForFixture("blend_mode_src.png"));                      \
+    auto dst_image = std::make_shared<Image>(                                \
+        CreateTextureForFixture("blend_mode_dst.png"));                      \
+    OpenPlaygroundHere(BlendModeTest(                                        \
+        GetContentScale(), BlendMode::k##blend_mode, src_image, dst_image)); \
+  }
+IMPELLER_FOR_EACH_BLEND_MODE(BLEND_MODE_TEST)
+
+TEST_P(AiksTest, TranslucentSaveLayerDrawsCorrectly) {
+  Canvas canvas;
+
+  canvas.DrawRect(Rect::MakeXYWH(100, 100, 300, 300), {.color = Color::Blue()});
+
+  canvas.SaveLayer({.color = Color::Black().WithAlpha(0.5)});
+  canvas.DrawRect(Rect::MakeXYWH(100, 500, 300, 300), {.color = Color::Blue()});
+  canvas.Restore();
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, TranslucentSaveLayerWithBlendColorFilterDrawsCorrectly) {
+  Canvas canvas;
+
+  canvas.DrawRect(Rect::MakeXYWH(100, 100, 300, 300), {.color = Color::Blue()});
+
+  canvas.SaveLayer({
+      .color = Color::Black().WithAlpha(0.5),
+      .color_filter =
+          ColorFilter::MakeBlend(BlendMode::kDestinationOver, Color::Red()),
+  });
+  canvas.DrawRect(Rect::MakeXYWH(100, 500, 300, 300), {.color = Color::Blue()});
+  canvas.Restore();
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, TranslucentSaveLayerWithBlendImageFilterDrawsCorrectly) {
+  Canvas canvas;
+
+  canvas.DrawRect(Rect::MakeXYWH(100, 100, 300, 300), {.color = Color::Blue()});
+
+  canvas.SaveLayer({
+      .color = Color::Black().WithAlpha(0.5),
+      .image_filter = ImageFilter::MakeFromColorFilter(
+          *ColorFilter::MakeBlend(BlendMode::kDestinationOver, Color::Red())),
+  });
+
+  canvas.DrawRect(Rect::MakeXYWH(100, 500, 300, 300), {.color = Color::Blue()});
+  canvas.Restore();
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, TranslucentSaveLayerWithColorAndImageFilterDrawsCorrectly) {
+  Canvas canvas;
+
+  canvas.DrawRect(Rect::MakeXYWH(100, 100, 300, 300), {.color = Color::Blue()});
+
+  canvas.SaveLayer({
+      .color = Color::Black().WithAlpha(0.5),
+      .color_filter =
+          ColorFilter::MakeBlend(BlendMode::kDestinationOver, Color::Red()),
+  });
+
+  canvas.DrawRect(Rect::MakeXYWH(100, 500, 300, 300), {.color = Color::Blue()});
+  canvas.Restore();
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, ImageFilteredSaveLayerWithUnboundedContents) {
+  Canvas canvas;
+  canvas.Scale(GetContentScale());
+
+  auto test = [&canvas](const std::shared_ptr<ImageFilter>& filter) {
+    auto DrawLine = [&canvas](const Point& p0, const Point& p1,
+                              const Paint& p) {
+      auto path = PathBuilder{}
+                      .AddLine(p0, p1)
+                      .SetConvexity(Convexity::kConvex)
+                      .TakePath();
+      Paint paint = p;
+      paint.style = Paint::Style::kStroke;
+      canvas.DrawPath(path, paint);
+    };
+    // Registration marks for the edge of the SaveLayer
+    DrawLine(Point(75, 100), Point(225, 100), {.color = Color::White()});
+    DrawLine(Point(75, 200), Point(225, 200), {.color = Color::White()});
+    DrawLine(Point(100, 75), Point(100, 225), {.color = Color::White()});
+    DrawLine(Point(200, 75), Point(200, 225), {.color = Color::White()});
+
+    canvas.SaveLayer({.image_filter = filter},
+                     Rect::MakeLTRB(100, 100, 200, 200));
+    {
+      // DrawPaint to verify correct behavior when the contents are unbounded.
+      canvas.DrawPaint({.color = Color::Yellow()});
+
+      // Contrasting rectangle to see interior blurring
+      canvas.DrawRect(Rect::MakeLTRB(125, 125, 175, 175),
+                      {.color = Color::Blue()});
+    }
+    canvas.Restore();
+  };
+
+  test(ImageFilter::MakeBlur(Sigma{10.0}, Sigma{10.0},
+                             FilterContents::BlurStyle::kNormal,
+                             Entity::TileMode::kDecal));
+
+  canvas.Translate({200.0, 0.0});
+
+  test(ImageFilter::MakeDilate(Radius{10.0}, Radius{10.0}));
+
+  canvas.Translate({200.0, 0.0});
+
+  test(ImageFilter::MakeErode(Radius{10.0}, Radius{10.0}));
+
+  canvas.Translate({-400.0, 200.0});
+
+  auto rotate_filter =
+      ImageFilter::MakeMatrix(Matrix::MakeTranslation({150, 150}) *
+                                  Matrix::MakeRotationZ(Degrees{10.0}) *
+                                  Matrix::MakeTranslation({-150, -150}),
+                              SamplerDescriptor{});
+  test(rotate_filter);
+
+  canvas.Translate({200.0, 0.0});
+
+  auto rgb_swap_filter = ImageFilter::MakeFromColorFilter(
+      *ColorFilter::MakeMatrix({.array = {
+                                    0, 1, 0, 0, 0,  //
+                                    0, 0, 1, 0, 0,  //
+                                    1, 0, 0, 0, 0,  //
+                                    0, 0, 0, 1, 0   //
+                                }}));
+  test(rgb_swap_filter);
+
+  canvas.Translate({200.0, 0.0});
+
+  test(ImageFilter::MakeCompose(*rotate_filter, *rgb_swap_filter));
+
+  canvas.Translate({-400.0, 200.0});
+
+  test(ImageFilter::MakeLocalMatrix(Matrix::MakeTranslation({25.0, 25.0}),
+                                    *rotate_filter));
+
+  canvas.Translate({200.0, 0.0});
+
+  test(ImageFilter::MakeLocalMatrix(Matrix::MakeTranslation({25.0, 25.0}),
+                                    *rgb_swap_filter));
+
+  canvas.Translate({200.0, 0.0});
+
+  test(ImageFilter::MakeLocalMatrix(
+      Matrix::MakeTranslation({25.0, 25.0}),
+      *ImageFilter::MakeCompose(*rotate_filter, *rgb_swap_filter)));
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, ImageFilteredUnboundedSaveLayerWithUnboundedContents) {
+  Canvas canvas;
+  canvas.Scale(GetContentScale());
+
+  auto blur_filter = ImageFilter::MakeBlur(Sigma{10.0}, Sigma{10.0},
+                                           FilterContents::BlurStyle::kNormal,
+                                           Entity::TileMode::kDecal);
+
+  canvas.SaveLayer({.image_filter = blur_filter}, std::nullopt);
+  {
+    // DrawPaint to verify correct behavior when the contents are unbounded.
+    canvas.DrawPaint({.color = Color::Yellow()});
+
+    // Contrasting rectangle to see interior blurring
+    canvas.DrawRect(Rect::MakeLTRB(125, 125, 175, 175),
+                    {.color = Color::Blue()});
+  }
+  canvas.Restore();
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, TranslucentSaveLayerImageDrawsCorrectly) {
+  Canvas canvas;
+
+  auto image = std::make_shared<Image>(CreateTextureForFixture("airplane.jpg"));
+  canvas.DrawImage(image, {100, 100}, {});
+
+  canvas.SaveLayer({.color = Color::Black().WithAlpha(0.5)});
+  canvas.DrawImage(image, {100, 500}, {});
+  canvas.Restore();
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, TranslucentSaveLayerWithColorMatrixColorFilterDrawsCorrectly) {
+  Canvas canvas;
+
+  auto image = std::make_shared<Image>(CreateTextureForFixture("airplane.jpg"));
+  canvas.DrawImage(image, {100, 100}, {});
+
+  canvas.SaveLayer({
+      .color = Color::Black().WithAlpha(0.5),
+      .color_filter = ColorFilter::MakeMatrix({.array =
+                                                   {
+                                                       1, 0, 0, 0, 0,  //
+                                                       0, 1, 0, 0, 0,  //
+                                                       0, 0, 1, 0, 0,  //
+                                                       0, 0, 0, 2, 0   //
+                                                   }}),
+  });
+  canvas.DrawImage(image, {100, 500}, {});
+  canvas.Restore();
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, TranslucentSaveLayerWithColorMatrixImageFilterDrawsCorrectly) {
+  Canvas canvas;
+
+  auto image = std::make_shared<Image>(CreateTextureForFixture("airplane.jpg"));
+  canvas.DrawImage(image, {100, 100}, {});
+
+  canvas.SaveLayer({
+      .color = Color::Black().WithAlpha(0.5),
+      .image_filter = ImageFilter::MakeFromColorFilter(
+          *ColorFilter::MakeMatrix({.array =
+                                        {
+                                            1, 0, 0, 0, 0,  //
+                                            0, 1, 0, 0, 0,  //
+                                            0, 0, 1, 0, 0,  //
+                                            0, 0, 0, 2, 0   //
+                                        }})),
+  });
+  canvas.DrawImage(image, {100, 500}, {});
+  canvas.Restore();
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest,
+       TranslucentSaveLayerWithColorFilterAndImageFilterDrawsCorrectly) {
+  Canvas canvas;
+
+  auto image = std::make_shared<Image>(CreateTextureForFixture("airplane.jpg"));
+  canvas.DrawImage(image, {100, 100}, {});
+
+  canvas.SaveLayer({
+      .color = Color::Black().WithAlpha(0.5),
+      .image_filter = ImageFilter::MakeFromColorFilter(
+          *ColorFilter::MakeMatrix({.array =
+                                        {
+                                            1, 0,   0, 0,   0,  //
+                                            0, 1,   0, 0,   0,  //
+                                            0, 0.2, 1, 0,   0,  //
+                                            0, 0,   0, 0.5, 0   //
+                                        }})),
+      .color_filter =
+          ColorFilter::MakeBlend(BlendMode::kModulate, Color::Green()),
+  });
+  canvas.DrawImage(image, {100, 500}, {});
+  canvas.Restore();
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, TranslucentSaveLayerWithAdvancedBlendModeDrawsCorrectly) {
+  Canvas canvas;
+  canvas.DrawRect(Rect::MakeXYWH(0, 0, 400, 400), {.color = Color::Red()});
+  canvas.SaveLayer({
+      .color = Color::Black().WithAlpha(0.5),
+      .blend_mode = BlendMode::kLighten,
+  });
+  canvas.DrawCircle({200, 200}, 100, {.color = Color::Green()});
+  canvas.Restore();
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+/// This is a regression check for https://github.com/flutter/engine/pull/41129
+/// The entire screen is green if successful. If failing, no frames will render,
+/// or the entire screen will be transparent black.
+TEST_P(AiksTest, CanRenderTinyOverlappingSubpasses) {
+  Canvas canvas;
+  canvas.DrawPaint({.color = Color::Red()});
+
+  // Draw two overlapping subpixel circles.
+  canvas.SaveLayer({});
+  canvas.DrawCircle({100, 100}, 0.1, {.color = Color::Yellow()});
+  canvas.Restore();
+  canvas.SaveLayer({});
+  canvas.DrawCircle({100, 100}, 0.1, {.color = Color::Yellow()});
+  canvas.Restore();
+
+  canvas.DrawPaint({.color = Color::Green()});
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+/// Tests that the debug checkerboard displays for offscreen textures when
+/// enabled. Most of the complexity here is just to future proof by making pass
+/// collapsing hard.
+TEST_P(AiksTest, CanRenderOffscreenCheckerboard) {
+  Canvas canvas;
+  canvas.debug_options.offscreen_texture_checkerboard = true;
+
+  canvas.DrawPaint({.color = Color::AntiqueWhite()});
+  canvas.DrawCircle({400, 300}, 200,
+                    {.color = Color::CornflowerBlue().WithAlpha(0.75)});
+
+  canvas.SaveLayer({.blend_mode = BlendMode::kMultiply});
+  {
+    canvas.DrawCircle({500, 400}, 200,
+                      {.color = Color::DarkBlue().WithAlpha(0.75)});
+    canvas.DrawCircle({550, 450}, 200,
+                      {.color = Color::LightCoral().WithAlpha(0.75),
+                       .blend_mode = BlendMode::kLuminosity});
+  }
+  canvas.Restore();
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, OpaqueEntitiesGetCoercedToSource) {
+  Canvas canvas;
+  canvas.Scale(Vector2(1.618, 1.618));
+  canvas.DrawCircle(Point(), 10,
+                    {
+                        .color = Color::CornflowerBlue(),
+                        .blend_mode = BlendMode::kSourceOver,
+                    });
+  Picture picture = canvas.EndRecordingAsPicture();
+
+  // Extract the SolidColorSource.
+  // Entity entity;
+  std::vector<Entity> entity;
+  std::shared_ptr<SolidColorContents> contents;
+  picture.pass->IterateAllEntities([e = &entity, &contents](Entity& entity) {
+    if (ScalarNearlyEqual(entity.GetTransform().GetScale().x, 1.618f)) {
+      contents =
+          std::static_pointer_cast<SolidColorContents>(entity.GetContents());
+      e->emplace_back(entity.Clone());
+      return false;
+    }
+    return true;
+  });
+
+  ASSERT_TRUE(entity.size() >= 1);
+  ASSERT_TRUE(contents->IsOpaque());
+  ASSERT_EQ(entity[0].GetBlendMode(), BlendMode::kSource);
+}
+
+TEST_P(AiksTest, CanRenderDestructiveSaveLayer) {
+  Canvas canvas;
+
+  canvas.DrawPaint({.color = Color::Red()});
+  // Draw an empty savelayer with a destructive blend mode, which will replace
+  // the entire red screen with fully transparent black, except for the green
+  // circle drawn within the layer.
+  canvas.SaveLayer({.blend_mode = BlendMode::kSource});
+  canvas.DrawCircle({300, 300}, 100, {.color = Color::Green()});
+  canvas.Restore();
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+// Regression test for https://github.com/flutter/flutter/issues/126701 .
+TEST_P(AiksTest, CanRenderClippedRuntimeEffects) {
+  auto runtime_stages =
+      OpenAssetAsRuntimeStage("runtime_stage_example.frag.iplr");
+
+  auto runtime_stage =
+      runtime_stages[PlaygroundBackendToRuntimeStageBackend(GetBackend())];
+  ASSERT_TRUE(runtime_stage);
+  ASSERT_TRUE(runtime_stage->IsDirty());
+
+  struct FragUniforms {
+    Vector2 iResolution;
+    Scalar iTime;
+  } frag_uniforms = {.iResolution = Vector2(400, 400), .iTime = 100.0};
+  auto uniform_data = std::make_shared<std::vector<uint8_t>>();
+  uniform_data->resize(sizeof(FragUniforms));
+  memcpy(uniform_data->data(), &frag_uniforms, sizeof(FragUniforms));
+
+  std::vector<RuntimeEffectContents::TextureInput> texture_inputs;
+
+  Paint paint;
+  paint.color_source = ColorSource::MakeRuntimeEffect(
+      runtime_stage, uniform_data, texture_inputs);
+
+  Canvas canvas;
+  canvas.Save();
+  canvas.ClipRRect(Rect::MakeXYWH(0, 0, 400, 400), {10.0, 10.0},
+                   Entity::ClipOperation::kIntersect);
+  canvas.DrawRect(Rect::MakeXYWH(0, 0, 400, 400), paint);
+  canvas.Restore();
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, DrawPaintTransformsBounds) {
+  auto runtime_stages = OpenAssetAsRuntimeStage("gradient.frag.iplr");
+  auto runtime_stage =
+      runtime_stages[PlaygroundBackendToRuntimeStageBackend(GetBackend())];
+  ASSERT_TRUE(runtime_stage);
+  ASSERT_TRUE(runtime_stage->IsDirty());
+
+  struct FragUniforms {
+    Size size;
+  } frag_uniforms = {.size = Size::MakeWH(400, 400)};
+  auto uniform_data = std::make_shared<std::vector<uint8_t>>();
+  uniform_data->resize(sizeof(FragUniforms));
+  memcpy(uniform_data->data(), &frag_uniforms, sizeof(FragUniforms));
+
+  std::vector<RuntimeEffectContents::TextureInput> texture_inputs;
+
+  Paint paint;
+  paint.color_source = ColorSource::MakeRuntimeEffect(
+      runtime_stage, uniform_data, texture_inputs);
+
+  Canvas canvas;
+  canvas.Save();
+  canvas.Scale(GetContentScale());
+  canvas.DrawPaint(paint);
+  canvas.Restore();
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, CanDrawPoints) {
+  std::vector<Point> points = {
+      {0, 0},      //
+      {100, 100},  //
+      {100, 0},    //
+      {0, 100},    //
+      {0, 0},      //
+      {48, 48},    //
+      {52, 52},    //
+  };
+  std::vector<PointStyle> caps = {
+      PointStyle::kRound,
+      PointStyle::kSquare,
+  };
+  Paint paint;
+  paint.color = Color::Yellow().WithAlpha(0.5);
+
+  Paint background;
+  background.color = Color::Black();
+
+  Canvas canvas;
+  canvas.DrawPaint(background);
+  canvas.Translate({200, 200});
+  canvas.DrawPoints(points, 10, paint, PointStyle::kRound);
+  canvas.Translate({150, 0});
+  canvas.DrawPoints(points, 10, paint, PointStyle::kSquare);
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+// Regression test for https://github.com/flutter/flutter/issues/127374.
+TEST_P(AiksTest, DrawAtlasWithColorAdvancedAndTransform) {
+  // Draws the image as four squares stiched together.
+  auto atlas = CreateTextureForFixture("bay_bridge.jpg");
+  auto size = atlas->GetSize();
+  auto image = std::make_shared<Image>(atlas);
+  // Divide image into four quadrants.
+  Scalar half_width = size.width / 2;
+  Scalar half_height = size.height / 2;
+  std::vector<Rect> texture_coordinates = {
+      Rect::MakeLTRB(0, 0, half_width, half_height),
+      Rect::MakeLTRB(half_width, 0, size.width, half_height),
+      Rect::MakeLTRB(0, half_height, half_width, size.height),
+      Rect::MakeLTRB(half_width, half_height, size.width, size.height)};
+  // Position quadrants adjacent to eachother.
+  std::vector<Matrix> transforms = {
+      Matrix::MakeTranslation({0, 0, 0}),
+      Matrix::MakeTranslation({half_width, 0, 0}),
+      Matrix::MakeTranslation({0, half_height, 0}),
+      Matrix::MakeTranslation({half_width, half_height, 0})};
+  std::vector<Color> colors = {Color::Red(), Color::Green(), Color::Blue(),
+                               Color::Yellow()};
+
+  Paint paint;
+
+  Canvas canvas;
+  canvas.Scale({0.25, 0.25, 1.0});
+  canvas.DrawAtlas(image, transforms, texture_coordinates, colors,
+                   BlendMode::kModulate, {}, std::nullopt, paint);
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+// Regression test for https://github.com/flutter/flutter/issues/127374.
+TEST_P(AiksTest, DrawAtlasAdvancedAndTransform) {
+  // Draws the image as four squares stiched together.
+  auto atlas = CreateTextureForFixture("bay_bridge.jpg");
+  auto size = atlas->GetSize();
+  auto image = std::make_shared<Image>(atlas);
+  // Divide image into four quadrants.
+  Scalar half_width = size.width / 2;
+  Scalar half_height = size.height / 2;
+  std::vector<Rect> texture_coordinates = {
+      Rect::MakeLTRB(0, 0, half_width, half_height),
+      Rect::MakeLTRB(half_width, 0, size.width, half_height),
+      Rect::MakeLTRB(0, half_height, half_width, size.height),
+      Rect::MakeLTRB(half_width, half_height, size.width, size.height)};
+  // Position quadrants adjacent to eachother.
+  std::vector<Matrix> transforms = {
+      Matrix::MakeTranslation({0, 0, 0}),
+      Matrix::MakeTranslation({half_width, 0, 0}),
+      Matrix::MakeTranslation({0, half_height, 0}),
+      Matrix::MakeTranslation({half_width, half_height, 0})};
+
+  Paint paint;
+
+  Canvas canvas;
+  canvas.Scale({0.25, 0.25, 1.0});
+  canvas.DrawAtlas(image, transforms, texture_coordinates, {},
+                   BlendMode::kModulate, {}, std::nullopt, paint);
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, CanDrawPointsWithTextureMap) {
+  auto texture = CreateTextureForFixture("table_mountain_nx.png",
+                                         /*enable_mipmapping=*/true);
+
+  std::vector<Point> points = {
+      {0, 0},      //
+      {100, 100},  //
+      {100, 0},    //
+      {0, 100},    //
+      {0, 0},      //
+      {48, 48},    //
+      {52, 52},    //
+  };
+  std::vector<PointStyle> caps = {
+      PointStyle::kRound,
+      PointStyle::kSquare,
+  };
+  Paint paint;
+  paint.color_source = ColorSource::MakeImage(texture, Entity::TileMode::kClamp,
+                                              Entity::TileMode::kClamp, {}, {});
+
+  Canvas canvas;
+  canvas.Translate({200, 200});
+  canvas.DrawPoints(points, 100, paint, PointStyle::kRound);
+  canvas.Translate({150, 0});
+  canvas.DrawPoints(points, 100, paint, PointStyle::kSquare);
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+// This currently renders solid blue, as the support for text color sources was
+// moved into DLDispatching. Path data requires the SkTextBlobs which are not
+// used in impeller::TextFrames.
+TEST_P(AiksTest, TextForegroundShaderWithTransform) {
+  auto mapping = flutter::testing::OpenFixtureAsSkData("Roboto-Regular.ttf");
+  ASSERT_NE(mapping, nullptr);
+
+  Scalar font_size = 100;
+  sk_sp<SkFontMgr> font_mgr = txt::GetDefaultFontManager();
+  SkFont sk_font(font_mgr->makeFromData(mapping), font_size);
+
+  Paint text_paint;
+  text_paint.color = Color::Blue();
+
+  std::vector<Color> colors = {Color{0.9568, 0.2627, 0.2118, 1.0},
+                               Color{0.1294, 0.5882, 0.9529, 1.0}};
+  std::vector<Scalar> stops = {
+      0.0,
+      1.0,
+  };
+  text_paint.color_source = ColorSource::MakeLinearGradient(
+      {0, 0}, {100, 100}, std::move(colors), std::move(stops),
+      Entity::TileMode::kRepeat, {});
+
+  Canvas canvas;
+  canvas.Translate({100, 100});
+  canvas.Rotate(Radians(kPi / 4));
+
+  auto blob = SkTextBlob::MakeFromString("Hello", sk_font);
+  ASSERT_NE(blob, nullptr);
+  auto frame = MakeTextFrameFromTextBlobSkia(blob);
+  canvas.DrawTextFrame(frame, Point(), text_paint);
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, MatrixSaveLayerFilter) {
+  Canvas canvas;
+  canvas.DrawPaint({.color = Color::Black()});
+  canvas.SaveLayer({}, std::nullopt);
+  {
+    canvas.DrawCircle(Point(200, 200), 100,
+                      {.color = Color::Green().WithAlpha(0.5),
+                       .blend_mode = BlendMode::kPlus});
+    // Should render a second circle, centered on the bottom-right-most edge of
+    // the circle.
+    canvas.SaveLayer({.image_filter = ImageFilter::MakeMatrix(
+                          Matrix::MakeTranslation(Vector2(1, 1) *
+                                                  (200 + 100 * k1OverSqrt2)) *
+                              Matrix::MakeScale(Vector2(1, 1) * 0.5) *
+                              Matrix::MakeTranslation(Vector2(-200, -200)),
+                          SamplerDescriptor{})},
+                     std::nullopt);
+    canvas.DrawCircle(Point(200, 200), 100,
+                      {.color = Color::Green().WithAlpha(0.5),
+                       .blend_mode = BlendMode::kPlus});
+    canvas.Restore();
+  }
+  canvas.Restore();
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, MatrixBackdropFilter) {
+  Canvas canvas;
+  canvas.DrawPaint({.color = Color::Black()});
+  canvas.SaveLayer({}, std::nullopt);
+  {
+    canvas.DrawCircle(Point(200, 200), 100,
+                      {.color = Color::Green().WithAlpha(0.5),
+                       .blend_mode = BlendMode::kPlus});
+    // Should render a second circle, centered on the bottom-right-most edge of
+    // the circle.
+    canvas.SaveLayer(
+        {}, std::nullopt,
+        ImageFilter::MakeMatrix(
+            Matrix::MakeTranslation(Vector2(1, 1) * (100 + 100 * k1OverSqrt2)) *
+                Matrix::MakeScale(Vector2(1, 1) * 0.5) *
+                Matrix::MakeTranslation(Vector2(-100, -100)),
+            SamplerDescriptor{}));
+    canvas.Restore();
+  }
+  canvas.Restore();
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, SolidColorApplyColorFilter) {
+  auto contents = SolidColorContents();
+  contents.SetColor(Color::CornflowerBlue().WithAlpha(0.75));
+  auto result = contents.ApplyColorFilter([](const Color& color) {
+    return color.Blend(Color::LimeGreen().WithAlpha(0.75), BlendMode::kScreen);
+  });
+  ASSERT_TRUE(result);
+  ASSERT_COLOR_NEAR(contents.GetColor(),
+                    Color(0.424452, 0.828743, 0.79105, 0.9375));
+}
+
+TEST_P(AiksTest, DrawScaledTextWithPerspectiveNoSaveLayer) {
+  Canvas canvas;
+  canvas.Transform(Matrix(1.0, 0.0, 0.0, 0.0,    //
+                          0.0, 1.0, 0.0, 0.0,    //
+                          0.0, 0.0, 1.0, 0.01,   //
+                          0.0, 0.0, 0.0, 1.0) *  //
+                   Matrix::MakeRotationY({Degrees{10}}));
+
+  ASSERT_TRUE(RenderTextInCanvasSkia(GetContext(), canvas, "Hello world",
+                                     "Roboto-Regular.ttf"));
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, DrawScaledTextWithPerspectiveSaveLayer) {
+  Canvas canvas;
+  Paint save_paint;
+  canvas.SaveLayer(save_paint);
+  canvas.Transform(Matrix(1.0, 0.0, 0.0, 0.0,    //
+                          0.0, 1.0, 0.0, 0.0,    //
+                          0.0, 0.0, 1.0, 0.01,   //
+                          0.0, 0.0, 0.0, 1.0) *  //
+                   Matrix::MakeRotationY({Degrees{10}}));
+
+  ASSERT_TRUE(RenderTextInCanvasSkia(GetContext(), canvas, "Hello world",
+                                     "Roboto-Regular.ttf"));
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, PipelineBlendSingleParameter) {
+  Canvas canvas;
+
+  // Should render a green square in the middle of a blue circle.
+  canvas.SaveLayer({});
+  {
+    canvas.Translate(Point(100, 100));
+    canvas.DrawCircle(Point(200, 200), 200, {.color = Color::Blue()});
+    canvas.ClipRect(Rect::MakeXYWH(100, 100, 200, 200));
+    canvas.DrawCircle(Point(200, 200), 200,
+                      {
+                          .color = Color::Green(),
+                          .blend_mode = BlendMode::kSourceOver,
+                          .image_filter = ImageFilter::MakeFromColorFilter(
+                              *ColorFilter::MakeBlend(BlendMode::kDestination,
+                                                      Color::White())),
+                      });
+    canvas.Restore();
+  }
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, CaptureContext) {
+  auto capture_context = CaptureContext::MakeAllowlist({"TestDocument"});
+
+  auto callback = [&](AiksContext& renderer) -> std::optional<Picture> {
+    Canvas canvas;
+
+    capture_context.Rewind();
+    auto document = capture_context.GetDocument("TestDocument");
+
+    auto color = document.AddColor("Background color", Color::CornflowerBlue());
+    canvas.DrawPaint({.color = color});
+
+    if (AiksTest::ImGuiBegin("TestDocument", nullptr,
+                             ImGuiWindowFlags_AlwaysAutoResize)) {
+      document.GetElement()->properties.Iterate([](CaptureProperty& property) {
+        property.Invoke({.color = [](CaptureColorProperty& p) {
+          ImGui::ColorEdit4(p.label.c_str(),
+                            reinterpret_cast<float*>(&p.value));
+        }});
+      });
+      ImGui::End();
+    }
+
+    return canvas.EndRecordingAsPicture();
+  };
+  OpenPlaygroundHere(callback);
+}
+
+TEST_P(AiksTest, CaptureInactivatedByDefault) {
+  ASSERT_FALSE(GetContext()->capture.IsActive());
+}
+
+// Regression test for https://github.com/flutter/flutter/issues/134678.
+TEST_P(AiksTest, ReleasesTextureOnTeardown) {
+  auto context = MakeContext();
+  std::weak_ptr<Texture> weak_texture;
+
+  {
+    auto texture = CreateTextureForFixture("table_mountain_nx.png");
+
+    Canvas canvas;
+    canvas.Scale(GetContentScale());
+    canvas.Translate({100.0f, 100.0f, 0});
+
+    Paint paint;
+    paint.color_source = ColorSource::MakeImage(
+        texture, Entity::TileMode::kClamp, Entity::TileMode::kClamp, {}, {});
+    canvas.DrawRect(Rect::MakeXYWH(0, 0, 600, 600), paint);
+
+    ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+  }
+
+  // See https://github.com/flutter/flutter/issues/134751.
+  //
+  // If the fence waiter was working this may not be released by the end of the
+  // scope above. Adding a manual shutdown so that future changes to the fence
+  // waiter will not flake this test.
+  context->Shutdown();
+
+  // The texture should be released by now.
+  ASSERT_TRUE(weak_texture.expired()) << "When the texture is no longer in use "
+                                         "by the backend, it should be "
+                                         "released.";
+}
+
+// Regression test for https://github.com/flutter/flutter/issues/135441 .
+TEST_P(AiksTest, VerticesGeometryUVPositionData) {
+  Canvas canvas;
+  Paint paint;
+  auto texture = CreateTextureForFixture("table_mountain_nx.png");
+
+  paint.color_source = ColorSource::MakeImage(texture, Entity::TileMode::kClamp,
+                                              Entity::TileMode::kClamp, {}, {});
+
+  auto vertices = {Point(0, 0), Point(texture->GetSize().width, 0),
+                   Point(0, texture->GetSize().height)};
+  std::vector<uint16_t> indices = {0u, 1u, 2u};
+  std::vector<Point> texture_coordinates = {};
+  std::vector<Color> vertex_colors = {};
+  auto geometry = std::make_shared<VerticesGeometry>(
+      vertices, indices, texture_coordinates, vertex_colors,
+      Rect::MakeLTRB(0, 0, 1, 1), VerticesGeometry::VertexMode::kTriangleStrip);
+
+  canvas.DrawVertices(geometry, BlendMode::kSourceOver, paint);
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+// Regression test for https://github.com/flutter/flutter/issues/135441 .
+TEST_P(AiksTest, VerticesGeometryUVPositionDataWithTranslate) {
+  Canvas canvas;
+  Paint paint;
+  auto texture = CreateTextureForFixture("table_mountain_nx.png");
+
+  paint.color_source = ColorSource::MakeImage(
+      texture, Entity::TileMode::kClamp, Entity::TileMode::kClamp, {},
+      Matrix::MakeTranslation({100.0, 100.0}));
+
+  auto vertices = {Point(0, 0), Point(texture->GetSize().width, 0),
+                   Point(0, texture->GetSize().height)};
+  std::vector<uint16_t> indices = {0u, 1u, 2u};
+  std::vector<Point> texture_coordinates = {};
+  std::vector<Color> vertex_colors = {};
+  auto geometry = std::make_shared<VerticesGeometry>(
+      vertices, indices, texture_coordinates, vertex_colors,
+      Rect::MakeLTRB(0, 0, 1, 1), VerticesGeometry::VertexMode::kTriangleStrip);
+
+  canvas.DrawVertices(geometry, BlendMode::kSourceOver, paint);
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, ClearBlend) {
+  Canvas canvas;
+  Paint white;
+  white.color = Color::Blue();
+  canvas.DrawRect(Rect::MakeXYWH(0, 0, 600.0, 600.0), white);
+
+  Paint clear;
+  clear.blend_mode = BlendMode::kClear;
+
+  canvas.DrawCircle(Point::MakeXY(300.0, 300.0), 200.0, clear);
+}
+
+TEST_P(AiksTest, MatrixImageFilterMagnify) {
+  Canvas canvas;
+  canvas.Scale(GetContentScale());
+  auto image = std::make_shared<Image>(CreateTextureForFixture("airplane.jpg"));
+  canvas.Translate({600, -200});
+  canvas.SaveLayer({
+      .image_filter = std::make_shared<MatrixImageFilter>(
+          Matrix::MakeScale({2, 2, 2}), SamplerDescriptor{}),
+  });
+  canvas.DrawImage(image, {0, 0},
+                   Paint{.color = Color::White().WithAlpha(0.5)});
+  canvas.Restore();
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+// Render a white circle at the top left corner of the screen.
+TEST_P(AiksTest, MatrixImageFilterDoesntCullWhenTranslatedFromOffscreen) {
+  Canvas canvas;
+  canvas.Scale(GetContentScale());
+  canvas.Translate({100, 100});
+  // Draw a circle in a SaveLayer at -300, but move it back on-screen with a
+  // +300 translation applied by a SaveLayer image filter.
+  canvas.SaveLayer({
+      .image_filter = std::make_shared<MatrixImageFilter>(
+          Matrix::MakeTranslation({300, 0}), SamplerDescriptor{}),
+  });
+  canvas.DrawCircle({-300, 0}, 100, {.color = Color::Green()});
+  canvas.Restore();
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+// Render a white circle at the top left corner of the screen.
+TEST_P(AiksTest,
+       MatrixImageFilterDoesntCullWhenScaledAndTranslatedFromOffscreen) {
+  Canvas canvas;
+  canvas.Scale(GetContentScale());
+  canvas.Translate({100, 100});
+  // Draw a circle in a SaveLayer at -300, but move it back on-screen with a
+  // +300 translation applied by a SaveLayer image filter.
+  canvas.SaveLayer({
+      .image_filter = std::make_shared<MatrixImageFilter>(
+          Matrix::MakeTranslation({300, 0}) * Matrix::MakeScale({2, 2, 2}),
+          SamplerDescriptor{}),
+  });
+  canvas.DrawCircle({-150, 0}, 50, {.color = Color::Green()});
+  canvas.Restore();
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+// This should be solid red, if you see a little red box this is broken.
+TEST_P(AiksTest, ClearColorOptimizationWhenSubpassIsBiggerThanParentPass) {
+  SetWindowSize({400, 400});
+  Canvas canvas;
+  canvas.Scale(GetContentScale());
+  canvas.DrawRect(Rect::MakeLTRB(200, 200, 300, 300), {.color = Color::Red()});
+  canvas.SaveLayer({
+      .image_filter = std::make_shared<MatrixImageFilter>(
+          Matrix::MakeScale({2, 2, 1}), SamplerDescriptor{}),
+  });
+  // Draw a rectangle that would fully cover the parent pass size, but not
+  // the subpass that it is rendered in.
+  canvas.DrawRect(Rect::MakeLTRB(0, 0, 400, 400), {.color = Color::Green()});
+  // Draw a bigger rectangle to force the subpass to be bigger.
+  canvas.DrawRect(Rect::MakeLTRB(0, 0, 800, 800), {.color = Color::Red()});
+  canvas.Restore();
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, EmptySaveLayerIgnoresPaint) {
+  Canvas canvas;
+  canvas.Scale(GetContentScale());
+  canvas.DrawPaint(Paint{.color = Color::Red()});
+  canvas.ClipRect(Rect::MakeXYWH(100, 100, 200, 200));
+  canvas.SaveLayer(Paint{.color = Color::Blue()});
+  canvas.Restore();
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, EmptySaveLayerRendersWithClear) {
+  Canvas canvas;
+  canvas.Scale(GetContentScale());
+  auto image = std::make_shared<Image>(CreateTextureForFixture("airplane.jpg"));
+  canvas.DrawImage(image, {10, 10}, {});
+  canvas.ClipRect(Rect::MakeXYWH(100, 100, 200, 200));
+  canvas.SaveLayer(Paint{.blend_mode = BlendMode::kClear});
+  canvas.Restore();
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, SubpassWithClearColorOptimization) {
+  Canvas canvas;
+
+  // Use a non-srcOver blend mode to ensure that we don't detect this as an
+  // opacity peephole optimization.
+  canvas.SaveLayer(
+      {.color = Color::Blue().WithAlpha(0.5), .blend_mode = BlendMode::kSource},
+      Rect::MakeLTRB(0, 0, 200, 200));
+  canvas.DrawPaint(
+      {.color = Color::BlackTransparent(), .blend_mode = BlendMode::kSource});
+  canvas.Restore();
+
+  canvas.SaveLayer(
+      {.color = Color::Blue(), .blend_mode = BlendMode::kDestinationOver});
+  canvas.Restore();
+
+  // This playground should appear blank on CI since we are only drawing
+  // transparent black. If the clear color optimization is broken, the texture
+  // will be filled with NaNs and may produce a magenta texture on macOS or iOS.
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, ImageColorSourceEffectTransform) {
+  // Compare with https://fiddle.skia.org/c/6cdc5aefb291fda3833b806ca347a885
+
+  Canvas canvas;
+  auto texture = CreateTextureForFixture("monkey.png");
+
+  canvas.DrawPaint({.color = Color::White()});
+
+  // Translation
+  {
+    Paint paint;
+    paint.color_source = ColorSource::MakeImage(
+        texture, Entity::TileMode::kRepeat, Entity::TileMode::kRepeat, {},
+        Matrix::MakeTranslation({50, 50}));
+    canvas.DrawRect(Rect::MakeLTRB(0, 0, 100, 100), paint);
+  }
+
+  // Rotation/skew
+  {
+    canvas.Save();
+    canvas.Rotate(Degrees(45));
+    Paint paint;
+    paint.color_source = ColorSource::MakeImage(
+        texture, Entity::TileMode::kRepeat, Entity::TileMode::kRepeat, {},
+        Matrix(1, -1, 0, 0,  //
+               1, 1, 0, 0,   //
+               0, 0, 1, 0,   //
+               0, 0, 0, 1)   //
+    );
+    canvas.DrawRect(Rect::MakeLTRB(100, 0, 200, 100), paint);
+    canvas.Restore();
+  }
+
+  // Scale
+  {
+    canvas.Translate(Vector2(100, 0));
+    canvas.Scale(Vector2(100, 100));
+    Paint paint;
+    paint.color_source = ColorSource::MakeImage(
+        texture, Entity::TileMode::kRepeat, Entity::TileMode::kRepeat, {},
+        Matrix::MakeScale(Vector2(0.005, 0.005)));
+    canvas.DrawRect(Rect::MakeLTRB(0, 0, 1, 1), paint);
+  }
+
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+TEST_P(AiksTest, CorrectClipDepthAssignedToEntities) {
+  Canvas canvas;  // Depth 1 (base pass)
+  canvas.DrawRRect(Rect::MakeLTRB(0, 0, 100, 100), {10, 10}, {});  // Depth 2
+  canvas.Save();
+  {
+    canvas.ClipRRect(Rect::MakeLTRB(0, 0, 50, 50), {10, 10}, {});  // Depth 4
+    canvas.SaveLayer({});                                          // Depth 4
+    {
+      canvas.DrawRRect(Rect::MakeLTRB(0, 0, 50, 50), {10, 10}, {});  // Depth 3
+    }
+    canvas.Restore();  // Restore the savelayer.
+  }
+  canvas.Restore();  // Depth 5 -- this will no longer append a restore entity
+                     //            once we switch to the clip depth approach.
+
+  auto picture = canvas.EndRecordingAsPicture();
+
+  std::vector<uint32_t> expected = {
+      2,  // DrawRRect
+      4,  // ClipRRect -- Has a depth value equal to the max depth of all the
+          //              content it affect. In this case, the SaveLayer and all
+          //              its contents are affected.
+      4,  // SaveLayer -- The SaveLayer is drawn to the parent pass after its
+          //              contents are rendered, so it should have a depth value
+          //              greater than all its contents.
+      3,  // DrawRRect
+      5,  // Restore (no longer necessary when clipping on the depth buffer)
+  };
+
+  std::vector<uint32_t> actual;
+
+  picture.pass->IterateAllElements([&](EntityPass::Element& element) -> bool {
+    if (auto* subpass = std::get_if<std::unique_ptr<EntityPass>>(&element)) {
+      actual.push_back(subpass->get()->GetNewClipDepth());
+    }
+    if (Entity* entity = std::get_if<Entity>(&element)) {
+      actual.push_back(entity->GetNewClipDepth());
+    }
+    return true;
+  });
+
+  ASSERT_EQ(actual.size(), expected.size());
+  for (size_t i = 0; i < expected.size(); i++) {
+    EXPECT_EQ(expected[i], actual[i]) << "Index: " << i;
+  }
+}
+
+TEST_P(AiksTest, CanDrawPerspectiveTransformWithClips) {
+  // Avoiding `GetSecondsElapsed()` to reduce risk of golden flakiness.
+  int time = 0;
+  auto callback = [&](AiksContext& renderer) -> std::optional<Picture> {
+    Canvas canvas;
+
+    canvas.Save();
+    {
+      canvas.Translate({300, 300});
+
+      // 1. Draw/restore a clip before drawing the image, which will get drawn
+      //    to the depth buffer behind the image.
+      canvas.Save();
+      {
+        canvas.DrawPaint({.color = Color::Green()});
+        canvas.ClipRect(Rect::MakeLTRB(-180, -180, 180, 180),
+                        Entity::ClipOperation::kDifference);
+        canvas.DrawPaint({.color = Color::Black()});
+      }
+      canvas.Restore();  // Restore rectangle difference clip.
+
+      canvas.Save();
+      {
+        // 2. Draw an oval clip that applies to the image, which will get drawn
+        //    in front of the image on the depth buffer.
+        canvas.ClipOval(Rect::MakeLTRB(-200, -200, 200, 200));
+
+        // 3. Draw the rotating image with a perspective transform.
+        canvas.Transform(
+            Matrix(1.0, 0.0, 0.0, 0.0,    //
+                   0.0, 1.0, 0.0, 0.0,    //
+                   0.0, 0.0, 1.0, 0.003,  //
+                   0.0, 0.0, 0.0, 1.0) *  //
+            Matrix::MakeRotationY({Radians{-1.0f + (time++ / 60.0f)}}));
+        auto image =
+            std::make_shared<Image>(CreateTextureForFixture("airplane.jpg"));
+        canvas.DrawImage(image, -Point(image->GetSize()) / 2, {});
+      }
+      canvas.Restore();  // Restore oval intersect clip.
+
+      // 4. Draw a semi-translucent blue circle atop all previous draws.
+      canvas.DrawCircle({}, 230, {.color = Color::Blue().WithAlpha(0.4)});
+    }
+    canvas.Restore();  // Restore translation.
+
+    return canvas.EndRecordingAsPicture();
+  };
+  ASSERT_TRUE(OpenPlaygroundHere(callback));
+}
+
+TEST_P(AiksTest, CanRenderClippedBackdropFilter) {
+  Canvas canvas;
+  Paint paint;
+
+  canvas.Scale(GetContentScale());
+
+  // Draw something interesting in the background.
+  std::vector<Color> colors = {Color{0.9568, 0.2627, 0.2118, 1.0},
+                               Color{0.1294, 0.5882, 0.9529, 1.0}};
+  std::vector<Scalar> stops = {
+      0.0,
+      1.0,
+  };
+  paint.color_source = ColorSource::MakeLinearGradient(
+      {0, 0}, {100, 100}, std::move(colors), std::move(stops),
+      Entity::TileMode::kRepeat, {});
+  canvas.DrawPaint(paint);
+
+  Rect clip_rect = Rect::MakeLTRB(50, 50, 400, 300);
+
+  // Draw a clipped SaveLayer, where the clip coverage and SaveLayer size are
+  // the same.
+  canvas.ClipRRect(clip_rect, Size(100, 100),
+                   Entity::ClipOperation::kIntersect);
+  canvas.SaveLayer({}, clip_rect,
+                   ImageFilter::MakeFromColorFilter(*ColorFilter::MakeBlend(
+                       BlendMode::kExclusion, Color::Red())));
+  ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
+}
+
+}  // namespace testing
+}  // namespace impeller
+
+// █████████████████████████████████████████████████████████████████████████████
+// █ NOTICE: Before adding new tests to this file consider adding it to one of
+// █         the subdivisions of AiksTest to avoid having one massive file.
+// █
+// █ Subdivisions:
+// █ - aiks_blur_unittests.cc
+// █ - aiks_gradient_unittests.cc
+// █ - aiks_path_unittests.cc
+// █████████████████████████████████████████████████████████████████████████████
diff --git a/impeller/aiks/aiks_unittests.h b/impeller/aiks/aiks_unittests.h
new file mode 100644
index 0000000000000000000000000000000000000000..44301f9459b1b4bd5f6c2daad70523446ccedf31
--- /dev/null
+++ b/impeller/aiks/aiks_unittests.h
@@ -0,0 +1,23 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_AIKS_AIKS_UNITTESTS_H_
+#define FLUTTER_IMPELLER_AIKS_AIKS_UNITTESTS_H_
+
+#include "impeller/aiks/aiks_playground.h"
+#include "impeller/golden_tests/golden_playground_test.h"
+
+namespace impeller {
+namespace testing {
+
+#ifdef IMPELLER_GOLDEN_TESTS
+using AiksTest = GoldenPlaygroundTest;
+#else
+using AiksTest = AiksPlayground;
+#endif
+
+}  // namespace testing
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_AIKS_AIKS_UNITTESTS_H_
diff --git a/impeller/aiks/canvas.cc b/impeller/aiks/canvas.cc
index 835748d0110d7038fad2576daf8a93e1ce992ac4..22a698474d2acaa316c25480ce2ab05954408e7d 100644
--- a/impeller/aiks/canvas.cc
+++ b/impeller/aiks/canvas.cc
@@ -4,33 +4,124 @@
 
 #include "impeller/aiks/canvas.h"
 
-#include <algorithm>
 #include <optional>
 #include <utility>
 
 #include "flutter/fml/logging.h"
+#include "flutter/fml/trace_event.h"
+#include "impeller/aiks/image_filter.h"
 #include "impeller/aiks/paint_pass_delegate.h"
 #include "impeller/entity/contents/atlas_contents.h"
 #include "impeller/entity/contents/clip_contents.h"
-#include "impeller/entity/contents/rrect_shadow_contents.h"
+#include "impeller/entity/contents/color_source_contents.h"
+#include "impeller/entity/contents/filters/filter_contents.h"
+#include "impeller/entity/contents/solid_rrect_blur_contents.h"
 #include "impeller/entity/contents/text_contents.h"
 #include "impeller/entity/contents/texture_contents.h"
 #include "impeller/entity/contents/vertices_contents.h"
-#include "impeller/entity/geometry.h"
+#include "impeller/entity/geometry/geometry.h"
+#include "impeller/geometry/constants.h"
 #include "impeller/geometry/path_builder.h"
 
 namespace impeller {
 
+namespace {
+
+static std::shared_ptr<Contents> CreateContentsForGeometryWithFilters(
+    const Paint& paint,
+    std::shared_ptr<Geometry> geometry) {
+  std::shared_ptr<ColorSourceContents> contents =
+      paint.color_source.GetContents(paint);
+
+  // Attempt to apply the color filter on the CPU first.
+  // Note: This is not just an optimization; some color sources rely on
+  //       CPU-applied color filters to behave properly.
+  bool needs_color_filter = paint.HasColorFilter();
+  if (needs_color_filter) {
+    auto color_filter = paint.GetColorFilter();
+    if (contents->ApplyColorFilter(color_filter->GetCPUColorFilterProc())) {
+      needs_color_filter = false;
+    }
+  }
+
+  bool can_apply_mask_filter = geometry->CanApplyMaskFilter();
+  contents->SetGeometry(std::move(geometry));
+
+  if (can_apply_mask_filter && paint.mask_blur_descriptor.has_value()) {
+    // If there's a mask blur and we need to apply the color filter on the GPU,
+    // we need to be careful to only apply the color filter to the source
+    // colors. CreateMaskBlur is able to handle this case.
+    return paint.mask_blur_descriptor->CreateMaskBlur(
+        contents, needs_color_filter ? paint.GetColorFilter() : nullptr);
+  }
+
+  std::shared_ptr<Contents> contents_copy = std::move(contents);
+  // Image input types will directly set their color filter,
+  // if any. See `TiledTextureContents.SetColorFilter`.
+  if (needs_color_filter &&
+      paint.color_source.GetType() != ColorSource::Type::kImage) {
+    std::shared_ptr<ColorFilter> color_filter = paint.GetColorFilter();
+    contents_copy = color_filter->WrapWithGPUColorFilter(
+        FilterInput::Make(std::move(contents_copy)),
+        ColorFilterContents::AbsorbOpacity::kYes);
+  }
+
+  if (paint.image_filter) {
+    std::shared_ptr<FilterContents> filter = paint.image_filter->WrapInput(
+        FilterInput::Make(std::move(contents_copy)));
+    filter->SetRenderingMode(Entity::RenderingMode::kDirect);
+    return filter;
+  }
+
+  return contents_copy;
+}
+
+static std::shared_ptr<Contents> CreatePathContentsWithFilters(
+    const Paint& paint,
+    const Path& path) {
+  std::shared_ptr<Geometry> geometry;
+  switch (paint.style) {
+    case Paint::Style::kFill:
+      geometry = Geometry::MakeFillPath(path);
+      break;
+    case Paint::Style::kStroke:
+      geometry =
+          Geometry::MakeStrokePath(path, paint.stroke_width, paint.stroke_miter,
+                                   paint.stroke_cap, paint.stroke_join);
+      break;
+  }
+
+  return CreateContentsForGeometryWithFilters(paint, std::move(geometry));
+}
+
+static std::shared_ptr<Contents> CreateCoverContentsWithFilters(
+    const Paint& paint) {
+  return CreateContentsForGeometryWithFilters(paint, Geometry::MakeCover());
+}
+
+}  // namespace
+
 Canvas::Canvas() {
-  Initialize();
+  Initialize(std::nullopt);
+}
+
+Canvas::Canvas(Rect cull_rect) {
+  Initialize(cull_rect);
+}
+
+Canvas::Canvas(IRect cull_rect) {
+  Initialize(Rect::MakeLTRB(cull_rect.GetLeft(), cull_rect.GetTop(),
+                            cull_rect.GetRight(), cull_rect.GetBottom()));
 }
 
 Canvas::~Canvas() = default;
 
-void Canvas::Initialize() {
+void Canvas::Initialize(std::optional<Rect> cull_rect) {
+  initial_cull_rect_ = cull_rect;
   base_pass_ = std::make_unique<EntityPass>();
+  base_pass_->SetNewClipDepth(++current_depth_);
   current_pass_ = base_pass_.get();
-  xformation_stack_.emplace_back(CanvasStackEntry{});
+  transform_stack_.emplace_back(CanvasStackEntry{.cull_rect = cull_rect});
   FML_DCHECK(GetSaveCount() == 1u);
   FML_DCHECK(base_pass_->GetSubpassesDepth() == 1u);
 }
@@ -38,70 +129,132 @@ void Canvas::Initialize() {
 void Canvas::Reset() {
   base_pass_ = nullptr;
   current_pass_ = nullptr;
-  xformation_stack_ = {};
+  current_depth_ = 0u;
+  transform_stack_ = {};
 }
 
 void Canvas::Save() {
   Save(false);
 }
 
-void Canvas::Save(
-    bool create_subpass,
-    BlendMode blend_mode,
-    std::optional<EntityPass::BackdropFilterProc> backdrop_filter) {
+namespace {
+class MipCountVisitor : public ImageFilterVisitor {
+ public:
+  virtual void Visit(const BlurImageFilter& filter) {
+    required_mip_count_ = FilterContents::kBlurFilterRequiredMipCount;
+  }
+  virtual void Visit(const LocalMatrixImageFilter& filter) {
+    required_mip_count_ = 1;
+  }
+  virtual void Visit(const DilateImageFilter& filter) {
+    required_mip_count_ = 1;
+  }
+  virtual void Visit(const ErodeImageFilter& filter) {
+    required_mip_count_ = 1;
+  }
+  virtual void Visit(const MatrixImageFilter& filter) {
+    required_mip_count_ = 1;
+  }
+  virtual void Visit(const ComposeImageFilter& filter) {
+    required_mip_count_ = 1;
+  }
+  virtual void Visit(const ColorImageFilter& filter) {
+    required_mip_count_ = 1;
+  }
+  int32_t GetRequiredMipCount() const { return required_mip_count_; }
+
+ private:
+  int32_t required_mip_count_ = -1;
+};
+}  // namespace
+
+void Canvas::Save(bool create_subpass,
+                  BlendMode blend_mode,
+                  const std::shared_ptr<ImageFilter>& backdrop_filter) {
   auto entry = CanvasStackEntry{};
-  entry.xformation = xformation_stack_.back().xformation;
-  entry.stencil_depth = xformation_stack_.back().stencil_depth;
+  entry.transform = transform_stack_.back().transform;
+  entry.cull_rect = transform_stack_.back().cull_rect;
+  entry.clip_depth = transform_stack_.back().clip_depth;
   if (create_subpass) {
-    entry.is_subpass = true;
+    entry.rendering_mode = Entity::RenderingMode::kSubpass;
     auto subpass = std::make_unique<EntityPass>();
-    subpass->SetBackdropFilter(std::move(backdrop_filter));
+    subpass->SetEnableOffscreenCheckerboard(
+        debug_options.offscreen_texture_checkerboard);
+    if (backdrop_filter) {
+      EntityPass::BackdropFilterProc backdrop_filter_proc =
+          [backdrop_filter = backdrop_filter->Clone()](
+              const FilterInput::Ref& input, const Matrix& effect_transform,
+              Entity::RenderingMode rendering_mode) {
+            auto filter = backdrop_filter->WrapInput(input);
+            filter->SetEffectTransform(effect_transform);
+            filter->SetRenderingMode(rendering_mode);
+            return filter;
+          };
+      subpass->SetBackdropFilter(backdrop_filter_proc);
+      MipCountVisitor mip_count_visitor;
+      backdrop_filter->Visit(mip_count_visitor);
+      current_pass_->SetRequiredMipCount(
+          std::max(current_pass_->GetRequiredMipCount(),
+                   mip_count_visitor.GetRequiredMipCount()));
+    }
     subpass->SetBlendMode(blend_mode);
     current_pass_ = GetCurrentPass().AddSubpass(std::move(subpass));
-    current_pass_->SetTransformation(xformation_stack_.back().xformation);
-    current_pass_->SetStencilDepth(xformation_stack_.back().stencil_depth);
+    current_pass_->SetTransform(transform_stack_.back().transform);
+    current_pass_->SetClipDepth(transform_stack_.back().clip_depth);
   }
-  xformation_stack_.emplace_back(entry);
+  transform_stack_.emplace_back(entry);
 }
 
 bool Canvas::Restore() {
-  FML_DCHECK(xformation_stack_.size() > 0);
-  if (xformation_stack_.size() == 1) {
+  FML_DCHECK(transform_stack_.size() > 0);
+  if (transform_stack_.size() == 1) {
     return false;
   }
-  if (xformation_stack_.back().is_subpass) {
+  size_t num_clips = transform_stack_.back().num_clips;
+  current_pass_->PopClips(num_clips, current_depth_);
+
+  if (transform_stack_.back().rendering_mode ==
+      Entity::RenderingMode::kSubpass) {
+    current_pass_->SetNewClipDepth(++current_depth_);
     current_pass_ = GetCurrentPass().GetSuperpass();
     FML_DCHECK(current_pass_);
   }
 
-  bool contains_clips = xformation_stack_.back().contains_clips;
-  xformation_stack_.pop_back();
-
-  if (contains_clips) {
+  transform_stack_.pop_back();
+  if (num_clips > 0) {
     RestoreClip();
   }
 
   return true;
 }
 
-void Canvas::Concat(const Matrix& xformation) {
-  xformation_stack_.back().xformation = GetCurrentTransformation() * xformation;
+void Canvas::Concat(const Matrix& transform) {
+  transform_stack_.back().transform = GetCurrentTransform() * transform;
 }
 
-void Canvas::PreConcat(const Matrix& xformation) {
-  xformation_stack_.back().xformation = xformation * GetCurrentTransformation();
+void Canvas::PreConcat(const Matrix& transform) {
+  transform_stack_.back().transform = transform * GetCurrentTransform();
 }
 
 void Canvas::ResetTransform() {
-  xformation_stack_.back().xformation = {};
+  transform_stack_.back().transform = {};
 }
 
-void Canvas::Transform(const Matrix& xformation) {
-  Concat(xformation);
+void Canvas::Transform(const Matrix& transform) {
+  Concat(transform);
 }
 
-const Matrix& Canvas::GetCurrentTransformation() const {
-  return xformation_stack_.back().xformation;
+const Matrix& Canvas::GetCurrentTransform() const {
+  return transform_stack_.back().transform;
+}
+
+const std::optional<Rect> Canvas::GetCurrentLocalCullingBounds() const {
+  auto cull_rect = transform_stack_.back().cull_rect;
+  if (cull_rect.has_value()) {
+    Matrix inverse = transform_stack_.back().transform.Invert();
+    cull_rect = cull_rect.value().TransformBounds(inverse);
+  }
+  return cull_rect;
 }
 
 void Canvas::Translate(const Vector3& offset) {
@@ -125,7 +278,7 @@ void Canvas::Rotate(Radians radians) {
 }
 
 size_t Canvas::GetSaveCount() const {
-  return xformation_stack_.size();
+  return transform_stack_.size();
 }
 
 void Canvas::RestoreToCount(size_t count) {
@@ -138,137 +291,413 @@ void Canvas::RestoreToCount(size_t count) {
 
 void Canvas::DrawPath(const Path& path, const Paint& paint) {
   Entity entity;
-  entity.SetTransformation(GetCurrentTransformation());
-  entity.SetStencilDepth(GetStencilDepth());
+  entity.SetTransform(GetCurrentTransform());
+  entity.SetClipDepth(GetClipDepth());
   entity.SetBlendMode(paint.blend_mode);
-  entity.SetContents(paint.WithFilters(paint.CreateContentsForEntity(path)));
+  entity.SetContents(CreatePathContentsWithFilters(paint, path));
 
-  GetCurrentPass().AddEntity(entity);
+  AddEntityToCurrentPass(std::move(entity));
 }
 
 void Canvas::DrawPaint(const Paint& paint) {
   Entity entity;
-  entity.SetTransformation(GetCurrentTransformation());
-  entity.SetStencilDepth(GetStencilDepth());
+  entity.SetTransform(GetCurrentTransform());
+  entity.SetClipDepth(GetClipDepth());
   entity.SetBlendMode(paint.blend_mode);
-  entity.SetContents(paint.CreateContentsForEntity({}, true));
+  entity.SetContents(CreateCoverContentsWithFilters(paint));
 
-  GetCurrentPass().AddEntity(entity);
+  AddEntityToCurrentPass(std::move(entity));
 }
 
 bool Canvas::AttemptDrawBlurredRRect(const Rect& rect,
-                                     Scalar corner_radius,
+                                     Size corner_radii,
                                      const Paint& paint) {
-  if (paint.color_source == nullptr ||
-      paint.color_source_type != Paint::ColorSourceType::kColor ||
+  if (paint.color_source.GetType() != ColorSource::Type::kColor ||
       paint.style != Paint::Style::kFill) {
     return false;
   }
 
-  if (!paint.mask_blur_descriptor.has_value() ||
-      paint.mask_blur_descriptor->style != FilterContents::BlurStyle::kNormal) {
+  if (!paint.mask_blur_descriptor.has_value()) {
     return false;
   }
 
-  Paint new_paint = paint;
+  // A blur sigma that is not positive enough should not result in a blur.
+  if (paint.mask_blur_descriptor->sigma.sigma <= kEhCloseEnough) {
+    return false;
+  }
 
   // For symmetrically mask blurred solid RRects, absorb the mask blur and use
   // a faster SDF approximation.
 
-  auto contents = std::make_shared<RRectShadowContents>();
-  contents->SetColor(new_paint.color);
-  contents->SetSigma(new_paint.mask_blur_descriptor->sigma);
-  contents->SetRRect(rect, corner_radius);
+  Color rrect_color =
+      paint.HasColorFilter()
+          // Absorb the color filter, if any.
+          ? paint.GetColorFilter()->GetCPUColorFilterProc()(paint.color)
+          : paint.color;
+
+  Paint rrect_paint = {.mask_blur_descriptor = paint.mask_blur_descriptor};
+
+  // In some cases, we need to render the mask blur to a separate layer.
+  //
+  //   1. If the blur style is normal, we'll be drawing using one draw call and
+  //      no clips. And so we can just wrap the RRect contents with the
+  //      ImageFilter, which will get applied to the result as per usual.
+  //
+  //   2. If the blur style is solid, we combine the non-blurred RRect with the
+  //      blurred RRect via two separate draw calls, and so we need to defer any
+  //      fancy blending, translucency, or image filtering until after these two
+  //      draws have been combined in a separate layer.
+  //
+  //   3. If the blur style is outer or inner, we apply the blur style via a
+  //      clip. The ImageFilter needs to be applied to the mask blurred result.
+  //      And so if there's an ImageFilter, we need to defer applying it until
+  //      after the clipped RRect blur has been drawn to a separate texture.
+  //      However, since there's only one draw call that produces color, we
+  //      don't need to worry about the blend mode or translucency (unlike with
+  //      BlurStyle::kSolid).
+  //
+  if ((paint.mask_blur_descriptor->style !=
+           FilterContents::BlurStyle::kNormal &&
+       paint.image_filter) ||
+      (paint.mask_blur_descriptor->style == FilterContents::BlurStyle::kSolid &&
+       (!rrect_color.IsOpaque() ||
+        paint.blend_mode != BlendMode::kSourceOver))) {
+    // Defer the alpha, blend mode, and image filter to a separate layer.
+    SaveLayer({.color = Color::White().WithAlpha(rrect_color.alpha),
+               .blend_mode = paint.blend_mode,
+               .image_filter = paint.image_filter});
+    rrect_paint.color = rrect_color.WithAlpha(1);
+  } else {
+    rrect_paint.color = rrect_color;
+    rrect_paint.blend_mode = paint.blend_mode;
+    rrect_paint.image_filter = paint.image_filter;
+    Save();
+  }
+
+  auto draw_blurred_rrect = [this, &rect, &corner_radii, &rrect_paint]() {
+    auto contents = std::make_shared<SolidRRectBlurContents>();
 
-  new_paint.mask_blur_descriptor = std::nullopt;
+    contents->SetColor(rrect_paint.color);
+    contents->SetSigma(rrect_paint.mask_blur_descriptor->sigma);
+    contents->SetRRect(rect, corner_radii);
 
-  Entity entity;
-  entity.SetTransformation(GetCurrentTransformation());
-  entity.SetStencilDepth(GetStencilDepth());
-  entity.SetBlendMode(new_paint.blend_mode);
-  entity.SetContents(new_paint.WithFilters(std::move(contents)));
+    Entity blurred_rrect_entity;
+    blurred_rrect_entity.SetTransform(GetCurrentTransform());
+    blurred_rrect_entity.SetClipDepth(GetClipDepth());
+    blurred_rrect_entity.SetBlendMode(rrect_paint.blend_mode);
 
-  GetCurrentPass().AddEntity(entity);
+    rrect_paint.mask_blur_descriptor = std::nullopt;
+    blurred_rrect_entity.SetContents(
+        rrect_paint.WithFilters(std::move(contents)));
+    AddEntityToCurrentPass(std::move(blurred_rrect_entity));
+  };
+
+  switch (rrect_paint.mask_blur_descriptor->style) {
+    case FilterContents::BlurStyle::kNormal: {
+      draw_blurred_rrect();
+      break;
+    }
+    case FilterContents::BlurStyle::kSolid: {
+      // First, draw the blurred RRect.
+      draw_blurred_rrect();
+      // Then, draw the non-blurred RRect on top.
+      Entity entity;
+      entity.SetTransform(GetCurrentTransform());
+      entity.SetClipDepth(GetClipDepth());
+      entity.SetBlendMode(rrect_paint.blend_mode);
+      entity.SetContents(CreateContentsForGeometryWithFilters(
+          rrect_paint, Geometry::MakeRoundRect(rect, corner_radii)));
+      AddEntityToCurrentPass(std::move(entity));
+      break;
+    }
+    case FilterContents::BlurStyle::kOuter: {
+      ClipRRect(rect, corner_radii, Entity::ClipOperation::kDifference);
+      draw_blurred_rrect();
+      break;
+    }
+    case FilterContents::BlurStyle::kInner: {
+      ClipRRect(rect, corner_radii, Entity::ClipOperation::kIntersect);
+      draw_blurred_rrect();
+      break;
+    }
+  }
+
+  Restore();
 
   return true;
 }
 
-void Canvas::DrawRect(Rect rect, const Paint& paint) {
+void Canvas::DrawLine(const Point& p0, const Point& p1, const Paint& paint) {
+  Entity entity;
+  entity.SetTransform(GetCurrentTransform());
+  entity.SetClipDepth(GetClipDepth());
+  entity.SetBlendMode(paint.blend_mode);
+  entity.SetContents(CreateContentsForGeometryWithFilters(
+      paint, Geometry::MakeLine(p0, p1, paint.stroke_width, paint.stroke_cap)));
+
+  AddEntityToCurrentPass(std::move(entity));
+}
+
+void Canvas::DrawRect(const Rect& rect, const Paint& paint) {
   if (paint.style == Paint::Style::kStroke) {
     DrawPath(PathBuilder{}.AddRect(rect).TakePath(), paint);
     return;
   }
 
-  if (AttemptDrawBlurredRRect(rect, 0, paint)) {
+  if (AttemptDrawBlurredRRect(rect, {}, paint)) {
     return;
   }
 
   Entity entity;
-  entity.SetTransformation(GetCurrentTransformation());
-  entity.SetStencilDepth(GetStencilDepth());
+  entity.SetTransform(GetCurrentTransform());
+  entity.SetClipDepth(GetClipDepth());
   entity.SetBlendMode(paint.blend_mode);
-  entity.SetContents(paint.WithFilters(
-      paint.CreateContentsForGeometry(Geometry::MakeRect(rect))));
+  entity.SetContents(
+      CreateContentsForGeometryWithFilters(paint, Geometry::MakeRect(rect)));
 
-  GetCurrentPass().AddEntity(entity);
+  AddEntityToCurrentPass(std::move(entity));
 }
 
-void Canvas::DrawRRect(Rect rect, Scalar corner_radius, const Paint& paint) {
-  if (AttemptDrawBlurredRRect(rect, corner_radius, paint)) {
+void Canvas::DrawOval(const Rect& rect, const Paint& paint) {
+  if (rect.IsSquare()) {
+    // Circles have slightly less overhead and can do stroking
+    DrawCircle(rect.GetCenter(), rect.GetWidth() * 0.5f, paint);
+    return;
+  }
+
+  if (paint.style == Paint::Style::kStroke) {
+    // No stroked ellipses yet
+    DrawPath(PathBuilder{}.AddOval(rect).TakePath(), paint);
+    return;
+  }
+
+  if (AttemptDrawBlurredRRect(rect, rect.GetSize() * 0.5f, paint)) {
     return;
   }
-  DrawPath(PathBuilder{}.AddRoundedRect(rect, corner_radius).TakePath(), paint);
+
+  Entity entity;
+  entity.SetTransform(GetCurrentTransform());
+  entity.SetClipDepth(GetClipDepth());
+  entity.SetBlendMode(paint.blend_mode);
+  entity.SetContents(
+      CreateContentsForGeometryWithFilters(paint, Geometry::MakeOval(rect)));
+
+  AddEntityToCurrentPass(std::move(entity));
 }
 
-void Canvas::DrawCircle(Point center, Scalar radius, const Paint& paint) {
+void Canvas::DrawRRect(const Rect& rect,
+                       const Size& corner_radii,
+                       const Paint& paint) {
+  if (AttemptDrawBlurredRRect(rect, corner_radii, paint)) {
+    return;
+  }
+
+  if (paint.style == Paint::Style::kFill) {
+    Entity entity;
+    entity.SetTransform(GetCurrentTransform());
+    entity.SetClipDepth(GetClipDepth());
+    entity.SetBlendMode(paint.blend_mode);
+    entity.SetContents(CreateContentsForGeometryWithFilters(
+        paint, Geometry::MakeRoundRect(rect, corner_radii)));
+
+    AddEntityToCurrentPass(std::move(entity));
+    return;
+  }
+
+  auto path = PathBuilder{}
+                  .SetConvexity(Convexity::kConvex)
+                  .AddRoundedRect(rect, corner_radii)
+                  .SetBounds(rect)
+                  .TakePath();
+  DrawPath(path, paint);
+}
+
+void Canvas::DrawCircle(const Point& center,
+                        Scalar radius,
+                        const Paint& paint) {
   Size half_size(radius, radius);
-  if (AttemptDrawBlurredRRect(Rect(center - half_size, half_size * 2), radius,
-                              paint)) {
+  if (AttemptDrawBlurredRRect(
+          Rect::MakeOriginSize(center - half_size, half_size * 2),
+          {radius, radius}, paint)) {
     return;
   }
-  DrawPath(PathBuilder{}.AddCircle(center, radius).TakePath(), paint);
+
+  Entity entity;
+  entity.SetTransform(GetCurrentTransform());
+  entity.SetClipDepth(GetClipDepth());
+  entity.SetBlendMode(paint.blend_mode);
+  auto geometry =
+      paint.style == Paint::Style::kStroke
+          ? Geometry::MakeStrokedCircle(center, radius, paint.stroke_width)
+          : Geometry::MakeCircle(center, radius);
+  entity.SetContents(
+      CreateContentsForGeometryWithFilters(paint, std::move(geometry)));
+
+  AddEntityToCurrentPass(std::move(entity));
 }
 
 void Canvas::ClipPath(const Path& path, Entity::ClipOperation clip_op) {
+  auto bounds = path.GetBoundingBox();
+  ClipGeometry(Geometry::MakeFillPath(path), clip_op);
+  if (clip_op == Entity::ClipOperation::kIntersect) {
+    if (bounds.has_value()) {
+      IntersectCulling(bounds.value());
+    }
+  }
+}
+
+void Canvas::ClipRect(const Rect& rect, Entity::ClipOperation clip_op) {
+  auto geometry = Geometry::MakeRect(rect);
+  auto& cull_rect = transform_stack_.back().cull_rect;
+  if (clip_op == Entity::ClipOperation::kIntersect &&                      //
+      cull_rect.has_value() &&                                             //
+      geometry->CoversArea(transform_stack_.back().transform, *cull_rect)  //
+  ) {
+    return;  // This clip will do nothing, so skip it.
+  }
+
+  ClipGeometry(geometry, clip_op);
+  switch (clip_op) {
+    case Entity::ClipOperation::kIntersect:
+      IntersectCulling(rect);
+      break;
+    case Entity::ClipOperation::kDifference:
+      SubtractCulling(rect);
+      break;
+  }
+}
+
+void Canvas::ClipOval(const Rect& bounds, Entity::ClipOperation clip_op) {
+  auto geometry = Geometry::MakeOval(bounds);
+  auto& cull_rect = transform_stack_.back().cull_rect;
+  if (clip_op == Entity::ClipOperation::kIntersect &&                      //
+      cull_rect.has_value() &&                                             //
+      geometry->CoversArea(transform_stack_.back().transform, *cull_rect)  //
+  ) {
+    return;  // This clip will do nothing, so skip it.
+  }
+
+  ClipGeometry(geometry, clip_op);
+  switch (clip_op) {
+    case Entity::ClipOperation::kIntersect:
+      IntersectCulling(bounds);
+      break;
+    case Entity::ClipOperation::kDifference:
+      break;
+  }
+}
+
+void Canvas::ClipRRect(const Rect& rect,
+                       const Size& corner_radii,
+                       Entity::ClipOperation clip_op) {
+  // Does the rounded rect have a flat part on the top/bottom or left/right?
+  bool flat_on_TB = corner_radii.width * 2 < rect.GetWidth();
+  bool flat_on_LR = corner_radii.height * 2 < rect.GetHeight();
+  auto geometry = Geometry::MakeRoundRect(rect, corner_radii);
+  auto& cull_rect = transform_stack_.back().cull_rect;
+  if (clip_op == Entity::ClipOperation::kIntersect &&                      //
+      cull_rect.has_value() &&                                             //
+      geometry->CoversArea(transform_stack_.back().transform, *cull_rect)  //
+  ) {
+    return;  // This clip will do nothing, so skip it.
+  }
+
+  ClipGeometry(geometry, clip_op);
+  switch (clip_op) {
+    case Entity::ClipOperation::kIntersect:
+      IntersectCulling(rect);
+      break;
+    case Entity::ClipOperation::kDifference:
+      if (corner_radii.IsEmpty()) {
+        SubtractCulling(rect);
+      } else {
+        // We subtract the inner "tall" and "wide" rectangle pieces
+        // that fit inside the corners which cover the greatest area
+        // without involving the curved corners
+        // Since this is a subtract operation, we can subtract each
+        // rectangle piece individually without fear of interference.
+        if (flat_on_TB) {
+          SubtractCulling(rect.Expand(Size{-corner_radii.width, 0.0}));
+        }
+        if (flat_on_LR) {
+          SubtractCulling(rect.Expand(Size{0.0, -corner_radii.height}));
+        }
+      }
+      break;
+  }
+}
+
+void Canvas::ClipGeometry(const std::shared_ptr<Geometry>& geometry,
+                          Entity::ClipOperation clip_op) {
   auto contents = std::make_shared<ClipContents>();
-  contents->SetGeometry(Geometry::MakeFillPath(path));
+  contents->SetGeometry(geometry);
   contents->SetClipOperation(clip_op);
 
   Entity entity;
-  entity.SetTransformation(GetCurrentTransformation());
+  entity.SetTransform(GetCurrentTransform());
   entity.SetContents(std::move(contents));
-  entity.SetStencilDepth(GetStencilDepth());
+  entity.SetClipDepth(GetClipDepth());
 
-  GetCurrentPass().AddEntity(entity);
+  GetCurrentPass().PushClip(std::move(entity));
 
-  ++xformation_stack_.back().stencil_depth;
-  xformation_stack_.back().contains_clips = true;
+  ++transform_stack_.back().clip_depth;
+  ++transform_stack_.back().num_clips;
+}
+
+void Canvas::IntersectCulling(Rect clip_rect) {
+  clip_rect = clip_rect.TransformBounds(GetCurrentTransform());
+  std::optional<Rect>& cull_rect = transform_stack_.back().cull_rect;
+  if (cull_rect.has_value()) {
+    cull_rect = cull_rect
+                    .value()                  //
+                    .Intersection(clip_rect)  //
+                    .value_or(Rect{});
+  } else {
+    cull_rect = clip_rect;
+  }
+}
+
+void Canvas::SubtractCulling(Rect clip_rect) {
+  std::optional<Rect>& cull_rect = transform_stack_.back().cull_rect;
+  if (cull_rect.has_value()) {
+    clip_rect = clip_rect.TransformBounds(GetCurrentTransform());
+    cull_rect = cull_rect
+                    .value()            //
+                    .Cutout(clip_rect)  //
+                    .value_or(Rect{});
+  }
+  // else (no cull) diff (any clip) is non-rectangular
 }
 
 void Canvas::RestoreClip() {
   Entity entity;
-  entity.SetTransformation(GetCurrentTransformation());
+  entity.SetTransform(GetCurrentTransform());
   // This path is empty because ClipRestoreContents just generates a quad that
   // takes up the full render target.
   entity.SetContents(std::make_shared<ClipRestoreContents>());
-  entity.SetStencilDepth(GetStencilDepth());
+  entity.SetClipDepth(GetClipDepth());
 
-  GetCurrentPass().AddEntity(entity);
+  AddEntityToCurrentPass(std::move(entity));
 }
 
-void Canvas::DrawPicture(Picture picture) {
-  if (!picture.pass) {
+void Canvas::DrawPoints(std::vector<Point> points,
+                        Scalar radius,
+                        const Paint& paint,
+                        PointStyle point_style) {
+  if (radius <= 0) {
     return;
   }
-  // Clone the base pass and account for the CTM updates.
-  auto pass = picture.pass->Clone();
-  pass->IterateAllEntities([&](auto& entity) -> bool {
-    entity.IncrementStencilDepth(GetStencilDepth());
-    entity.SetTransformation(GetCurrentTransformation() *
-                             entity.GetTransformation());
-    return true;
-  });
-  return;
+
+  Entity entity;
+  entity.SetTransform(GetCurrentTransform());
+  entity.SetClipDepth(GetClipDepth());
+  entity.SetBlendMode(paint.blend_mode);
+  entity.SetContents(CreateContentsForGeometryWithFilters(
+      paint,
+      Geometry::MakePointField(std::move(points), radius,
+                               /*round=*/point_style == PointStyle::kRound)));
+
+  AddEntityToCurrentPass(std::move(entity));
 }
 
 void Canvas::DrawImage(const std::shared_ptr<Image>& image,
@@ -280,8 +709,7 @@ void Canvas::DrawImage(const std::shared_ptr<Image>& image,
   }
 
   const auto source = Rect::MakeSize(image->GetSize());
-  const auto dest =
-      Rect::MakeXYWH(offset.x, offset.y, source.size.width, source.size.height);
+  const auto dest = source.Shift(offset);
 
   DrawImageRect(image, source, dest, paint, std::move(sampler));
 }
@@ -290,8 +718,9 @@ void Canvas::DrawImageRect(const std::shared_ptr<Image>& image,
                            Rect source,
                            Rect dest,
                            const Paint& paint,
-                           SamplerDescriptor sampler) {
-  if (!image || source.size.IsEmpty() || dest.size.IsEmpty()) {
+                           SamplerDescriptor sampler,
+                           SourceRectConstraint src_rect_constraint) {
+  if (!image || source.IsEmpty() || dest.IsEmpty()) {
     return;
   }
 
@@ -301,27 +730,41 @@ void Canvas::DrawImageRect(const std::shared_ptr<Image>& image,
     return;
   }
 
-  auto contents = TextureContents::MakeRect(dest);
-  contents->SetTexture(image->GetTexture());
-  contents->SetSourceRect(source);
-  contents->SetSamplerDescriptor(std::move(sampler));
-  contents->SetOpacity(paint.color.alpha);
+  auto texture_contents = TextureContents::MakeRect(dest);
+  texture_contents->SetTexture(image->GetTexture());
+  texture_contents->SetSourceRect(source);
+  texture_contents->SetStrictSourceRect(src_rect_constraint ==
+                                        SourceRectConstraint::kStrict);
+  texture_contents->SetSamplerDescriptor(std::move(sampler));
+  texture_contents->SetOpacity(paint.color.alpha);
+  texture_contents->SetDeferApplyingOpacity(paint.HasColorFilter());
+
+  std::shared_ptr<Contents> contents = texture_contents;
+  if (paint.mask_blur_descriptor.has_value()) {
+    contents = paint.mask_blur_descriptor->CreateMaskBlur(texture_contents);
+  }
 
   Entity entity;
   entity.SetBlendMode(paint.blend_mode);
-  entity.SetStencilDepth(GetStencilDepth());
-  entity.SetContents(paint.WithFilters(contents, false));
-  entity.SetTransformation(GetCurrentTransformation());
+  entity.SetClipDepth(GetClipDepth());
+  entity.SetContents(paint.WithFilters(contents));
+  entity.SetTransform(GetCurrentTransform());
 
-  GetCurrentPass().AddEntity(entity);
+  AddEntityToCurrentPass(std::move(entity));
 }
 
 Picture Canvas::EndRecordingAsPicture() {
+  // Assign clip depths to any outstanding clip entities.
+  while (current_pass_ != nullptr) {
+    current_pass_->PopAllClips(current_depth_);
+    current_pass_ = current_pass_->GetSuperpass();
+  }
+
   Picture picture;
   picture.pass = std::move(base_pass_);
 
   Reset();
-  Initialize();
+  Initialize(initial_cull_rect_);
 
   return picture;
 }
@@ -331,76 +774,152 @@ EntityPass& Canvas::GetCurrentPass() {
   return *current_pass_;
 }
 
-size_t Canvas::GetStencilDepth() const {
-  return xformation_stack_.back().stencil_depth;
+size_t Canvas::GetClipDepth() const {
+  return transform_stack_.back().clip_depth;
 }
 
-void Canvas::SaveLayer(
-    const Paint& paint,
-    std::optional<Rect> bounds,
-    const std::optional<Paint::ImageFilterProc>& backdrop_filter) {
+void Canvas::AddEntityToCurrentPass(Entity entity) {
+  entity.SetNewClipDepth(++current_depth_);
+  GetCurrentPass().AddEntity(std::move(entity));
+}
+
+void Canvas::SaveLayer(const Paint& paint,
+                       std::optional<Rect> bounds,
+                       const std::shared_ptr<ImageFilter>& backdrop_filter,
+                       ContentBoundsPromise bounds_promise) {
+  TRACE_EVENT0("flutter", "Canvas::saveLayer");
   Save(true, paint.blend_mode, backdrop_filter);
 
+  // The DisplayList bounds/rtree doesn't account for filters applied to parent
+  // layers, and so sub-DisplayLists are getting culled as if no filters are
+  // applied.
+  // See also: https://github.com/flutter/flutter/issues/139294
+  if (paint.image_filter) {
+    transform_stack_.back().cull_rect = std::nullopt;
+  }
+
   auto& new_layer_pass = GetCurrentPass();
-  new_layer_pass.SetDelegate(
-      std::make_unique<PaintPassDelegate>(paint, bounds));
+  if (bounds) {
+    new_layer_pass.SetBoundsLimit(bounds, bounds_promise);
+  }
 
-  if (bounds.has_value() && !backdrop_filter.has_value()) {
-    // Render target switches due to a save layer can be elided. In such cases
-    // where passes are collapsed into their parent, the clipping effect to
-    // the size of the render target that would have been allocated will be
-    // absent. Explicitly add back a clip to reproduce that behavior. Since
-    // clips never require a render target switch, this is a cheap operation.
-    ClipPath(PathBuilder{}.AddRect(bounds.value()).TakePath());
+  if (paint.image_filter) {
+    MipCountVisitor mip_count_visitor;
+    paint.image_filter->Visit(mip_count_visitor);
+    new_layer_pass.SetRequiredMipCount(mip_count_visitor.GetRequiredMipCount());
+  }
+
+  // Only apply opacity peephole on default blending.
+  if (paint.blend_mode == BlendMode::kSourceOver) {
+    new_layer_pass.SetDelegate(
+        std::make_shared<OpacityPeepholePassDelegate>(paint));
+  } else {
+    new_layer_pass.SetDelegate(std::make_shared<PaintPassDelegate>(paint));
   }
 }
 
-void Canvas::DrawTextFrame(const TextFrame& text_frame,
+void Canvas::DrawTextFrame(const std::shared_ptr<TextFrame>& text_frame,
                            Point position,
                            const Paint& paint) {
-  auto lazy_glyph_atlas = GetCurrentPass().GetLazyGlyphAtlas();
-
-  lazy_glyph_atlas->AddTextFrame(text_frame);
+  Entity entity;
+  entity.SetClipDepth(GetClipDepth());
+  entity.SetBlendMode(paint.blend_mode);
 
   auto text_contents = std::make_shared<TextContents>();
   text_contents->SetTextFrame(text_frame);
-  text_contents->SetGlyphAtlas(std::move(lazy_glyph_atlas));
   text_contents->SetColor(paint.color);
-
-  Entity entity;
-  entity.SetTransformation(GetCurrentTransformation() *
-                           Matrix::MakeTranslation(position));
-  entity.SetStencilDepth(GetStencilDepth());
-  entity.SetBlendMode(paint.blend_mode);
-  entity.SetContents(paint.WithFilters(std::move(text_contents), true));
-
-  GetCurrentPass().AddEntity(entity);
+  text_contents->SetForceTextColor(paint.mask_blur_descriptor.has_value());
+
+  entity.SetTransform(GetCurrentTransform() *
+                      Matrix::MakeTranslation(position));
+
+  // TODO(bdero): This mask blur application is a hack. It will always wind up
+  //              doing a gaussian blur that affects the color source itself
+  //              instead of just the mask. The color filter text support
+  //              needs to be reworked in order to interact correctly with
+  //              mask filters.
+  //              https://github.com/flutter/flutter/issues/133297
+  entity.SetContents(
+      paint.WithFilters(paint.WithMaskBlur(std::move(text_contents), true)));
+
+  AddEntityToCurrentPass(std::move(entity));
+}
+
+static bool UseColorSourceContents(
+    const std::shared_ptr<VerticesGeometry>& vertices,
+    const Paint& paint) {
+  // If there are no vertex color or texture coordinates. Or if there
+  // are vertex coordinates then only if the contents are an image or
+  // a solid color.
+  if (vertices->HasVertexColors()) {
+    return false;
+  }
+  if (vertices->HasTextureCoordinates() &&
+      (paint.color_source.GetType() == ColorSource::Type::kImage ||
+       paint.color_source.GetType() == ColorSource::Type::kColor)) {
+    return true;
+  }
+  return !vertices->HasTextureCoordinates();
 }
 
-void Canvas::DrawVertices(std::unique_ptr<VerticesGeometry> vertices,
+void Canvas::DrawVertices(const std::shared_ptr<VerticesGeometry>& vertices,
                           BlendMode blend_mode,
-                          Paint paint) {
+                          const Paint& paint) {
+  // Override the blend mode with kDestination in order to match the behavior
+  // of Skia's SK_LEGACY_IGNORE_DRAW_VERTICES_BLEND_WITH_NO_SHADER flag, which
+  // is enabled when the Flutter engine builds Skia.
+  if (paint.color_source.GetType() == ColorSource::Type::kColor) {
+    blend_mode = BlendMode::kDestination;
+  }
+
   Entity entity;
-  entity.SetTransformation(GetCurrentTransformation());
-  entity.SetStencilDepth(GetStencilDepth());
+  entity.SetTransform(GetCurrentTransform());
+  entity.SetClipDepth(GetClipDepth());
   entity.SetBlendMode(paint.blend_mode);
 
-  if (paint.color_source.has_value()) {
-    auto& source = paint.color_source.value();
-    auto contents = source();
-    contents->SetGeometry(std::move(vertices));
-    contents->SetAlpha(paint.color.alpha);
-    entity.SetContents(paint.WithFilters(std::move(contents), true));
-  } else {
-    std::shared_ptr<VerticesContents> contents =
-        std::make_shared<VerticesContents>();
-    contents->SetColor(paint.color);
-    contents->SetBlendMode(blend_mode);
-    contents->SetGeometry(std::move(vertices));
-    entity.SetContents(paint.WithFilters(std::move(contents), true));
+  // If there are no vertex color or texture coordinates. Or if there
+  // are vertex coordinates then only if the contents are an image.
+  if (UseColorSourceContents(vertices, paint)) {
+    entity.SetContents(CreateContentsForGeometryWithFilters(paint, vertices));
+    AddEntityToCurrentPass(std::move(entity));
+    return;
   }
 
-  GetCurrentPass().AddEntity(entity);
+  auto src_paint = paint;
+  src_paint.color = paint.color.WithAlpha(1.0);
+
+  std::shared_ptr<Contents> src_contents =
+      src_paint.CreateContentsForGeometry(vertices);
+  if (vertices->HasTextureCoordinates()) {
+    // If the color source has an intrinsic size, then we use that to
+    // create the src contents as a simplification. Otherwise we use
+    // the extent of the texture coordinates to determine how large
+    // the src contents should be. If neither has a value we fall back
+    // to using the geometry coverage data.
+    Rect src_coverage;
+    auto size = src_contents->GetColorSourceSize();
+    if (size.has_value()) {
+      src_coverage = Rect::MakeXYWH(0, 0, size->width, size->height);
+    } else {
+      auto cvg = vertices->GetCoverage(Matrix{});
+      FML_CHECK(cvg.has_value());
+      src_coverage =
+          // Covered by FML_CHECK.
+          // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
+          vertices->GetTextureCoordinateCoverge().value_or(cvg.value());
+    }
+    src_contents =
+        src_paint.CreateContentsForGeometry(Geometry::MakeRect(src_coverage));
+  }
+
+  auto contents = std::make_shared<VerticesContents>();
+  contents->SetAlpha(paint.color.alpha);
+  contents->SetBlendMode(blend_mode);
+  contents->SetGeometry(vertices);
+  contents->SetSourceContents(std::move(src_contents));
+  entity.SetContents(paint.WithFilters(std::move(contents)));
+
+  AddEntityToCurrentPass(std::move(entity));
 }
 
 void Canvas::DrawAtlas(const std::shared_ptr<Image>& atlas,
@@ -414,11 +933,6 @@ void Canvas::DrawAtlas(const std::shared_ptr<Image>& atlas,
   if (!atlas) {
     return;
   }
-  auto size = atlas->GetSize();
-
-  if (size.IsEmpty()) {
-    return;
-  }
 
   std::shared_ptr<AtlasContents> contents = std::make_shared<AtlasContents>();
   contents->SetColors(std::move(colors));
@@ -431,12 +945,12 @@ void Canvas::DrawAtlas(const std::shared_ptr<Image>& atlas,
   contents->SetAlpha(paint.color.alpha);
 
   Entity entity;
-  entity.SetTransformation(GetCurrentTransformation());
-  entity.SetStencilDepth(GetStencilDepth());
+  entity.SetTransform(GetCurrentTransform());
+  entity.SetClipDepth(GetClipDepth());
   entity.SetBlendMode(paint.blend_mode);
-  entity.SetContents(paint.WithFilters(contents, false));
+  entity.SetContents(paint.WithFilters(contents));
 
-  GetCurrentPass().AddEntity(entity);
+  AddEntityToCurrentPass(std::move(entity));
 }
 
 }  // namespace impeller
diff --git a/impeller/aiks/canvas.h b/impeller/aiks/canvas.h
index 456948b99139c102a2eb73251d68fcbcfc568d46..36ba4639b264dcb9d6ea06e035c22afa65587da0 100644
--- a/impeller/aiks/canvas.h
+++ b/impeller/aiks/canvas.h
@@ -2,43 +2,84 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_AIKS_CANVAS_H_
+#define FLUTTER_IMPELLER_AIKS_CANVAS_H_
 
 #include <deque>
+#include <functional>
 #include <memory>
 #include <optional>
 #include <vector>
 
-#include "flutter/fml/macros.h"
 #include "impeller/aiks/image.h"
+#include "impeller/aiks/image_filter.h"
 #include "impeller/aiks/paint.h"
 #include "impeller/aiks/picture.h"
+#include "impeller/core/sampler_descriptor.h"
+#include "impeller/entity/entity.h"
 #include "impeller/entity/entity_pass.h"
-#include "impeller/entity/geometry.h"
+#include "impeller/entity/geometry/geometry.h"
+#include "impeller/entity/geometry/vertices_geometry.h"
 #include "impeller/geometry/matrix.h"
 #include "impeller/geometry/path.h"
 #include "impeller/geometry/point.h"
 #include "impeller/geometry/vector.h"
-#include "impeller/renderer/sampler_descriptor.h"
-#include "impeller/typographer/glyph_atlas.h"
 #include "impeller/typographer/text_frame.h"
 
 namespace impeller {
 
-class Entity;
+struct CanvasStackEntry {
+  Matrix transform;
+  // |cull_rect| is conservative screen-space bounds of the clipped output area
+  std::optional<Rect> cull_rect;
+  size_t clip_depth = 0u;
+  // The number of clips tracked for this canvas stack entry.
+  size_t num_clips = 0u;
+  Entity::RenderingMode rendering_mode = Entity::RenderingMode::kDirect;
+};
+
+enum class PointStyle {
+  /// @brief Points are drawn as squares.
+  kRound,
+
+  /// @brief Points are drawn as circles.
+  kSquare,
+};
+
+/// Controls the behavior of the source rectangle given to DrawImageRect.
+enum class SourceRectConstraint {
+  /// @brief Faster, but may sample outside the bounds of the source rectangle.
+  kFast,
+
+  /// @brief Sample only within the source rectangle. May be slower.
+  kStrict,
+};
 
 class Canvas {
  public:
+  struct DebugOptions {
+    /// When enabled, layers that are rendered to an offscreen texture
+    /// internally get a translucent checkerboard pattern painted over them.
+    ///
+    /// Requires the `IMPELLER_DEBUG` preprocessor flag.
+    bool offscreen_texture_checkerboard = false;
+  } debug_options;
+
   Canvas();
 
+  explicit Canvas(Rect cull_rect);
+
+  explicit Canvas(IRect cull_rect);
+
   ~Canvas();
 
   void Save();
 
-  void SaveLayer(const Paint& paint,
-                 std::optional<Rect> bounds = std::nullopt,
-                 const std::optional<Paint::ImageFilterProc>& backdrop_filter =
-                     std::nullopt);
+  void SaveLayer(
+      const Paint& paint,
+      std::optional<Rect> bounds = std::nullopt,
+      const std::shared_ptr<ImageFilter>& backdrop_filter = nullptr,
+      ContentBoundsPromise bounds_promise = ContentBoundsPromise::kUnknown);
 
   bool Restore();
 
@@ -46,15 +87,17 @@ class Canvas {
 
   void RestoreToCount(size_t count);
 
-  const Matrix& GetCurrentTransformation() const;
+  const Matrix& GetCurrentTransform() const;
+
+  const std::optional<Rect> GetCurrentLocalCullingBounds() const;
 
   void ResetTransform();
 
-  void Transform(const Matrix& xformation);
+  void Transform(const Matrix& transform);
 
-  void Concat(const Matrix& xformation);
+  void Concat(const Matrix& transform);
 
-  void PreConcat(const Matrix& xformation);
+  void PreConcat(const Matrix& transform);
 
   void Translate(const Vector3& offset);
 
@@ -70,36 +113,60 @@ class Canvas {
 
   void DrawPaint(const Paint& paint);
 
-  void DrawRect(Rect rect, const Paint& paint);
+  void DrawLine(const Point& p0, const Point& p1, const Paint& paint);
+
+  void DrawRect(const Rect& rect, const Paint& paint);
 
-  void DrawRRect(Rect rect, Scalar corner_radius, const Paint& paint);
+  void DrawOval(const Rect& rect, const Paint& paint);
 
-  void DrawCircle(Point center, Scalar radius, const Paint& paint);
+  void DrawRRect(const Rect& rect,
+                 const Size& corner_radii,
+                 const Paint& paint);
+
+  void DrawCircle(const Point& center, Scalar radius, const Paint& paint);
+
+  void DrawPoints(std::vector<Point> points,
+                  Scalar radius,
+                  const Paint& paint,
+                  PointStyle point_style);
 
   void DrawImage(const std::shared_ptr<Image>& image,
                  Point offset,
                  const Paint& paint,
                  SamplerDescriptor sampler = {});
 
-  void DrawImageRect(const std::shared_ptr<Image>& image,
-                     Rect source,
-                     Rect dest,
-                     const Paint& paint,
-                     SamplerDescriptor sampler = {});
+  void DrawImageRect(
+      const std::shared_ptr<Image>& image,
+      Rect source,
+      Rect dest,
+      const Paint& paint,
+      SamplerDescriptor sampler = {},
+      SourceRectConstraint src_rect_constraint = SourceRectConstraint::kFast);
 
   void ClipPath(
       const Path& path,
       Entity::ClipOperation clip_op = Entity::ClipOperation::kIntersect);
 
-  void DrawPicture(Picture picture);
+  void ClipRect(
+      const Rect& rect,
+      Entity::ClipOperation clip_op = Entity::ClipOperation::kIntersect);
+
+  void ClipOval(
+      const Rect& bounds,
+      Entity::ClipOperation clip_op = Entity::ClipOperation::kIntersect);
+
+  void ClipRRect(
+      const Rect& rect,
+      const Size& corner_radii,
+      Entity::ClipOperation clip_op = Entity::ClipOperation::kIntersect);
 
-  void DrawTextFrame(const TextFrame& text_frame,
+  void DrawTextFrame(const std::shared_ptr<TextFrame>& text_frame,
                      Point position,
                      const Paint& paint);
 
-  void DrawVertices(std::unique_ptr<VerticesGeometry> vertices,
+  void DrawVertices(const std::shared_ptr<VerticesGeometry>& vertices,
                     BlendMode blend_mode,
-                    Paint paint);
+                    const Paint& paint);
 
   void DrawAtlas(const std::shared_ptr<Image>& atlas,
                  std::vector<Matrix> transforms,
@@ -115,28 +182,41 @@ class Canvas {
  private:
   std::unique_ptr<EntityPass> base_pass_;
   EntityPass* current_pass_ = nullptr;
-  std::deque<CanvasStackEntry> xformation_stack_;
+  uint64_t current_depth_ = 0u;
+  std::deque<CanvasStackEntry> transform_stack_;
+  std::optional<Rect> initial_cull_rect_;
 
-  void Initialize();
+  void Initialize(std::optional<Rect> cull_rect);
 
   void Reset();
 
   EntityPass& GetCurrentPass();
 
-  size_t GetStencilDepth() const;
+  size_t GetClipDepth() const;
+
+  void AddEntityToCurrentPass(Entity entity);
+
+  void ClipGeometry(const std::shared_ptr<Geometry>& geometry,
+                    Entity::ClipOperation clip_op);
+
+  void IntersectCulling(Rect clip_bounds);
+  void SubtractCulling(Rect clip_bounds);
 
   void Save(bool create_subpass,
             BlendMode = BlendMode::kSourceOver,
-            std::optional<EntityPass::BackdropFilterProc> backdrop_filter =
-                std::nullopt);
+            const std::shared_ptr<ImageFilter>& backdrop_filter = nullptr);
 
   void RestoreClip();
 
   bool AttemptDrawBlurredRRect(const Rect& rect,
-                               Scalar corner_radius,
+                               Size corner_radii,
                                const Paint& paint);
 
-  FML_DISALLOW_COPY_AND_ASSIGN(Canvas);
+  Canvas(const Canvas&) = delete;
+
+  Canvas& operator=(const Canvas&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_AIKS_CANVAS_H_
diff --git a/impeller/aiks/canvas_benchmarks.cc b/impeller/aiks/canvas_benchmarks.cc
new file mode 100644
index 0000000000000000000000000000000000000000..8f4a310e0ceb7306d356fae1db14f078cdba6a3d
--- /dev/null
+++ b/impeller/aiks/canvas_benchmarks.cc
@@ -0,0 +1,63 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/benchmarking/benchmarking.h"
+
+#include "impeller/aiks/canvas.h"
+
+namespace impeller {
+
+namespace {
+
+using CanvasCallback = size_t (*)(Canvas&);
+
+size_t DrawRect(Canvas& canvas) {
+  for (auto i = 0; i < 500; i++) {
+    canvas.DrawRect(Rect::MakeLTRB(0, 0, 100, 100),
+                    {.color = Color::DarkKhaki()});
+  }
+  return 500;
+}
+
+size_t DrawCircle(Canvas& canvas) {
+  for (auto i = 0; i < 500; i++) {
+    canvas.DrawCircle({100, 100}, 5, {.color = Color::DarkKhaki()});
+  }
+  return 500;
+}
+
+size_t DrawLine(Canvas& canvas) {
+  for (auto i = 0; i < 500; i++) {
+    canvas.DrawLine({0, 0}, {100, 100}, {.color = Color::DarkKhaki()});
+  }
+  return 500;
+}
+}  // namespace
+
+// A set of benchmarks that measures the CPU cost of encoding canvas operations.
+// These benchmarks do not measure the cost of conversion through the HAL, no
+// do they measure the GPU side cost of executing the required shader programs.
+template <class... Args>
+static void BM_CanvasRecord(benchmark::State& state, Args&&... args) {
+  auto args_tuple = std::make_tuple(std::move(args)...);
+  auto test_proc = std::get<CanvasCallback>(args_tuple);
+
+  size_t op_count = 0u;
+  size_t canvas_count = 0u;
+  while (state.KeepRunning()) {
+    // A new canvas is allocated for each iteration to avoid the benchmark
+    // becoming a measurement of only the entity vector re-allocation time.
+    Canvas canvas;
+    op_count += test_proc(canvas);
+    canvas_count++;
+  }
+  state.counters["TotalOpCount"] = op_count;
+  state.counters["TotalCanvasCount"] = canvas_count;
+}
+
+BENCHMARK_CAPTURE(BM_CanvasRecord, draw_rect, &DrawRect);
+BENCHMARK_CAPTURE(BM_CanvasRecord, draw_circle, &DrawCircle);
+BENCHMARK_CAPTURE(BM_CanvasRecord, draw_line, &DrawLine);
+
+}  // namespace impeller
diff --git a/impeller/aiks/canvas_recorder.h b/impeller/aiks/canvas_recorder.h
new file mode 100644
index 0000000000000000000000000000000000000000..526050547453f1a425874a1084c67fb31dbb5bbb
--- /dev/null
+++ b/impeller/aiks/canvas_recorder.h
@@ -0,0 +1,326 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_AIKS_CANVAS_RECORDER_H_
+#define FLUTTER_IMPELLER_AIKS_CANVAS_RECORDER_H_
+
+#include <cstdint>
+
+#include "impeller/aiks/canvas.h"
+
+#define FLT_CANVAS_RECORDER_OP_ARG(name) \
+  CanvasRecorderOp::k##name, &Canvas::name
+
+namespace impeller {
+/// TODO(tbd): These are very similar to `flutter::DisplayListOpType`. When
+/// golden tests can be written at a higher level, migrate these to
+/// flutter::DisplayListOpType.
+enum CanvasRecorderOp : uint16_t {
+  kNew,
+  kSave,
+  kSaveLayer,
+  kRestore,
+  kRestoreToCount,
+  kResetTransform,
+  kTransform,
+  kConcat,
+  kPreConcat,
+  kTranslate,
+  kScale2,
+  kScale3,
+  kSkew,
+  kRotate,
+  kDrawPath,
+  kDrawPaint,
+  kDrawLine,
+  kDrawRect,
+  kDrawOval,
+  kDrawRRect,
+  kDrawCircle,
+  kDrawPoints,
+  kDrawImage,
+  kDrawImageRect,
+  kClipPath,
+  kClipRect,
+  kClipOval,
+  kClipRRect,
+  kDrawTextFrame,
+  kDrawVertices,
+  kDrawAtlas,
+};
+
+// Canvas recorder should only be used when IMPELLER_TRACE_CANVAS is defined
+// (never in production code).
+#ifdef IMPELLER_TRACE_CANVAS
+/// Static polymorphic replacement for impeller::Canvas that records methods
+/// called on an impeller::Canvas and forwards it to a real instance.
+/// TODO(https://github.com/flutter/flutter/issues/135718): Move this recorder
+/// to the DisplayList level when golden tests can be written at the ui.Canvas
+/// layer.
+template <typename Serializer>
+class CanvasRecorder {
+ public:
+  CanvasRecorder() : canvas_() { serializer_.Write(CanvasRecorderOp::kNew); }
+
+  explicit CanvasRecorder(Rect cull_rect) : canvas_(cull_rect) {
+    serializer_.Write(CanvasRecorderOp::kNew);
+  }
+
+  explicit CanvasRecorder(IRect cull_rect) : canvas_(cull_rect) {
+    serializer_.Write(CanvasRecorderOp::kNew);
+  }
+
+  ~CanvasRecorder() {}
+
+  const Serializer& GetSerializer() const { return serializer_; }
+
+  template <typename ReturnType>
+  ReturnType ExecuteAndSerialize(CanvasRecorderOp op,
+                                 ReturnType (Canvas::*canvasMethod)()) {
+    serializer_.Write(op);
+    return (canvas_.*canvasMethod)();
+  }
+
+  template <typename FuncType, typename... Args>
+  auto ExecuteAndSerialize(CanvasRecorderOp op,
+                           FuncType canvasMethod,
+                           Args&&... args)
+      -> decltype((std::declval<Canvas>().*
+                   canvasMethod)(std::forward<Args>(args)...)) {
+    // Serialize each argument
+    (serializer_.Write(std::forward<Args>(args)), ...);
+    serializer_.Write(op);
+    return (canvas_.*canvasMethod)(std::forward<Args>(args)...);
+  }
+
+  template <typename FuncType, typename... Args>
+  auto ExecuteAndSkipArgSerialize(CanvasRecorderOp op,
+                                  FuncType canvasMethod,
+                                  Args&&... args)
+      -> decltype((std::declval<Canvas>().*
+                   canvasMethod)(std::forward<Args>(args)...)) {
+    serializer_.Write(op);
+    return (canvas_.*canvasMethod)(std::forward<Args>(args)...);
+  }
+
+  //////////////////////////////////////////////////////////////////////////////
+  // Canvas Static Polymorphism
+  // ////////////////////////////////////////////////
+  //////////////////////////////////////////////////////////////////////////////
+
+  void Save() {
+    return ExecuteAndSerialize(CanvasRecorderOp::kSave, &Canvas::Save);
+  }
+
+  void SaveLayer(
+      const Paint& paint,
+      std::optional<Rect> bounds = std::nullopt,
+      const std::shared_ptr<ImageFilter>& backdrop_filter = nullptr,
+      ContentBoundsPromise bounds_promise = ContentBoundsPromise::kUnknown) {
+    return ExecuteAndSerialize(FLT_CANVAS_RECORDER_OP_ARG(SaveLayer), paint,
+                               bounds, backdrop_filter, bounds_promise);
+  }
+
+  bool Restore() {
+    return ExecuteAndSerialize(FLT_CANVAS_RECORDER_OP_ARG(Restore));
+  }
+
+  size_t GetSaveCount() const { return canvas_.GetSaveCount(); }
+
+  void RestoreToCount(size_t count) {
+    return ExecuteAndSerialize(FLT_CANVAS_RECORDER_OP_ARG(RestoreToCount),
+                               count);
+  }
+
+  const Matrix& GetCurrentTransform() const {
+    return canvas_.GetCurrentTransform();
+  }
+
+  const std::optional<Rect> GetCurrentLocalCullingBounds() const {
+    return canvas_.GetCurrentLocalCullingBounds();
+  }
+
+  void ResetTransform() {
+    return ExecuteAndSerialize(FLT_CANVAS_RECORDER_OP_ARG(ResetTransform));
+  }
+
+  void Transform(const Matrix& transform) {
+    return ExecuteAndSerialize(FLT_CANVAS_RECORDER_OP_ARG(Transform),
+                               transform);
+  }
+
+  void Concat(const Matrix& transform) {
+    return ExecuteAndSerialize(FLT_CANVAS_RECORDER_OP_ARG(Concat), transform);
+  }
+
+  void PreConcat(const Matrix& transform) {
+    return ExecuteAndSerialize(FLT_CANVAS_RECORDER_OP_ARG(PreConcat),
+                               transform);
+  }
+
+  void Translate(const Vector3& offset) {
+    return ExecuteAndSerialize(FLT_CANVAS_RECORDER_OP_ARG(Translate), offset);
+  }
+
+  void Scale(const Vector2& scale) {
+    return ExecuteAndSerialize(
+        CanvasRecorderOp::kScale2,
+        static_cast<void (Canvas::*)(const Vector2&)>(&Canvas::Scale), scale);
+  }
+
+  void Scale(const Vector3& scale) {
+    return ExecuteAndSerialize(
+        CanvasRecorderOp::kScale3,
+        static_cast<void (Canvas::*)(const Vector3&)>(&Canvas::Scale), scale);
+  }
+
+  void Skew(Scalar sx, Scalar sy) {
+    return ExecuteAndSerialize(FLT_CANVAS_RECORDER_OP_ARG(Skew), sx, sy);
+  }
+
+  void Rotate(Radians radians) {
+    return ExecuteAndSerialize(FLT_CANVAS_RECORDER_OP_ARG(Rotate), radians);
+  }
+
+  void DrawPath(Path path, const Paint& paint) {
+    serializer_.Write(path);
+    serializer_.Write(paint);
+    return ExecuteAndSkipArgSerialize(FLT_CANVAS_RECORDER_OP_ARG(DrawPath),
+                                      std::move(path), paint);
+  }
+
+  void DrawPaint(const Paint& paint) {
+    return ExecuteAndSerialize(FLT_CANVAS_RECORDER_OP_ARG(DrawPaint), paint);
+  }
+
+  void DrawLine(const Point& p0, const Point& p1, const Paint& paint) {
+    return ExecuteAndSerialize(FLT_CANVAS_RECORDER_OP_ARG(DrawLine), p0, p1,
+                               paint);
+  }
+
+  void DrawRect(Rect rect, const Paint& paint) {
+    return ExecuteAndSerialize(FLT_CANVAS_RECORDER_OP_ARG(DrawRect), rect,
+                               paint);
+  }
+
+  void DrawOval(const Rect& rect, const Paint& paint) {
+    return ExecuteAndSerialize(FLT_CANVAS_RECORDER_OP_ARG(DrawOval), rect,
+                               paint);
+  }
+
+  void DrawRRect(const Rect& rect,
+                 const Size& corner_radii,
+                 const Paint& paint) {
+    return ExecuteAndSerialize(FLT_CANVAS_RECORDER_OP_ARG(DrawRRect), rect,
+                               corner_radii, paint);
+  }
+
+  void DrawCircle(Point center, Scalar radius, const Paint& paint) {
+    return ExecuteAndSerialize(FLT_CANVAS_RECORDER_OP_ARG(DrawCircle), center,
+                               radius, paint);
+  }
+
+  void DrawPoints(std::vector<Point> points,
+                  Scalar radius,
+                  const Paint& paint,
+                  PointStyle point_style) {
+    return ExecuteAndSerialize(FLT_CANVAS_RECORDER_OP_ARG(DrawPoints), points,
+                               radius, paint, point_style);
+  }
+
+  void DrawImage(const std::shared_ptr<Image>& image,
+                 Point offset,
+                 const Paint& paint,
+                 SamplerDescriptor sampler = {}) {
+    return ExecuteAndSerialize(FLT_CANVAS_RECORDER_OP_ARG(DrawImage), image,
+                               offset, paint, sampler);
+  }
+
+  void DrawImageRect(
+      const std::shared_ptr<Image>& image,
+      Rect source,
+      Rect dest,
+      const Paint& paint,
+      SamplerDescriptor sampler = {},
+      SourceRectConstraint src_rect_constraint = SourceRectConstraint::kFast) {
+    return ExecuteAndSerialize(FLT_CANVAS_RECORDER_OP_ARG(DrawImageRect), image,
+                               source, dest, paint, sampler,
+                               src_rect_constraint);
+  }
+
+  void ClipPath(
+      Path path,
+      Entity::ClipOperation clip_op = Entity::ClipOperation::kIntersect) {
+    serializer_.Write(path);
+    serializer_.Write(clip_op);
+    return ExecuteAndSkipArgSerialize(FLT_CANVAS_RECORDER_OP_ARG(ClipPath),
+                                      std::move(path), clip_op);
+  }
+
+  void ClipRect(
+      const Rect& rect,
+      Entity::ClipOperation clip_op = Entity::ClipOperation::kIntersect) {
+    return ExecuteAndSerialize(FLT_CANVAS_RECORDER_OP_ARG(ClipRect), rect,
+                               clip_op);
+  }
+
+  void ClipOval(
+      const Rect& bounds,
+      Entity::ClipOperation clip_op = Entity::ClipOperation::kIntersect) {
+    return ExecuteAndSerialize(FLT_CANVAS_RECORDER_OP_ARG(ClipOval), bounds,
+                               clip_op);
+  }
+
+  void ClipRRect(
+      const Rect& rect,
+      const Size& corner_radii,
+      Entity::ClipOperation clip_op = Entity::ClipOperation::kIntersect) {
+    return ExecuteAndSerialize(FLT_CANVAS_RECORDER_OP_ARG(ClipRRect), rect,
+                               corner_radii, clip_op);
+  }
+
+  void DrawTextFrame(const std::shared_ptr<TextFrame>& text_frame,
+                     Point position,
+                     const Paint& paint) {
+    return ExecuteAndSerialize(FLT_CANVAS_RECORDER_OP_ARG(DrawTextFrame),
+                               text_frame, position, paint);
+  }
+
+  void DrawVertices(const std::shared_ptr<VerticesGeometry>& vertices,
+                    BlendMode blend_mode,
+                    const Paint& paint) {
+    return ExecuteAndSerialize(FLT_CANVAS_RECORDER_OP_ARG(DrawVertices),
+                               vertices, blend_mode, paint);
+  }
+
+  void DrawAtlas(const std::shared_ptr<Image>& atlas,
+                 std::vector<Matrix> transforms,
+                 std::vector<Rect> texture_coordinates,
+                 std::vector<Color> colors,
+                 BlendMode blend_mode,
+                 SamplerDescriptor sampler,
+                 std::optional<Rect> cull_rect,
+                 const Paint& paint) {
+    return ExecuteAndSerialize(FLT_CANVAS_RECORDER_OP_ARG(DrawAtlas),  //
+                               atlas,                                  //
+                               transforms,                             //
+                               texture_coordinates,                    //
+                               colors,                                 //
+                               blend_mode,                             //
+                               sampler,                                //
+                               cull_rect,                              //
+                               paint);
+  }
+
+  Picture EndRecordingAsPicture() { return canvas_.EndRecordingAsPicture(); }
+
+ private:
+  Canvas canvas_;
+  Serializer serializer_;
+};
+#endif
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_AIKS_CANVAS_RECORDER_H_
diff --git a/impeller/aiks/canvas_recorder_unittests.cc b/impeller/aiks/canvas_recorder_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a18e092aab9e2665136f760b648647952d4093a1
--- /dev/null
+++ b/impeller/aiks/canvas_recorder_unittests.cc
@@ -0,0 +1,254 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/testing/testing.h"
+#include "impeller/aiks/canvas_recorder.h"
+namespace impeller {
+namespace testing {
+
+namespace {
+class Serializer {
+ public:
+  void Write(CanvasRecorderOp op) { last_op_ = op; }
+
+  void Write(const Paint& paint) {}
+
+  void Write(const std::optional<Rect> optional_rect) {}
+
+  void Write(const std::shared_ptr<ImageFilter>& image_filter) {}
+
+  void Write(size_t size) {}
+
+  void Write(const Matrix& matrix) {}
+
+  void Write(const Vector3& vec3) {}
+
+  void Write(const Vector2& vec2) {}
+
+  void Write(const Radians& vec2) {}
+
+  void Write(const Path& path) {}
+
+  void Write(const std::vector<Point>& points) {}
+
+  void Write(const PointStyle& point_style) {}
+
+  void Write(const std::shared_ptr<Image>& image) {}
+
+  void Write(const SamplerDescriptor& sampler) {}
+
+  void Write(const Entity::ClipOperation& clip_op) {}
+
+  void Write(const Picture& clip_op) {}
+
+  void Write(const std::shared_ptr<TextFrame>& text_frame) {}
+
+  void Write(const std::shared_ptr<VerticesGeometry>& vertices) {}
+
+  void Write(const BlendMode& blend_mode) {}
+
+  void Write(const std::vector<Matrix>& matrices) {}
+
+  void Write(const std::vector<Rect>& matrices) {}
+
+  void Write(const std::vector<Color>& matrices) {}
+
+  void Write(const SourceRectConstraint& src_rect_constraint) {}
+
+  void Write(const ContentBoundsPromise& promise) {}
+
+  CanvasRecorderOp last_op_;
+};
+}  // namespace
+
+TEST(CanvasRecorder, Save) {
+  CanvasRecorder<Serializer> recorder;
+  recorder.Save();
+  ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kSave);
+}
+
+TEST(CanvasRecorder, SaveLayer) {
+  CanvasRecorder<Serializer> recorder;
+  Paint paint;
+  recorder.SaveLayer(paint);
+  ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kSaveLayer);
+}
+
+TEST(CanvasRecorder, Restore) {
+  CanvasRecorder<Serializer> recorder;
+  recorder.Restore();
+  ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kRestore);
+}
+
+TEST(CanvasRecorder, RestoreToCount) {
+  CanvasRecorder<Serializer> recorder;
+  recorder.Save();
+  recorder.RestoreToCount(0);
+  ASSERT_EQ(recorder.GetSerializer().last_op_,
+            CanvasRecorderOp::kRestoreToCount);
+}
+
+TEST(CanvasRecorder, ResetTransform) {
+  CanvasRecorder<Serializer> recorder;
+  recorder.ResetTransform();
+  ASSERT_EQ(recorder.GetSerializer().last_op_,
+            CanvasRecorderOp::kResetTransform);
+}
+
+TEST(CanvasRecorder, Transform) {
+  CanvasRecorder<Serializer> recorder;
+  recorder.Transform(Matrix());
+  ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kTransform);
+}
+
+TEST(CanvasRecorder, Concat) {
+  CanvasRecorder<Serializer> recorder;
+  recorder.Concat(Matrix());
+  ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kConcat);
+}
+
+TEST(CanvasRecorder, PreConcat) {
+  CanvasRecorder<Serializer> recorder;
+  recorder.PreConcat(Matrix());
+  ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kPreConcat);
+}
+
+TEST(CanvasRecorder, Translate) {
+  CanvasRecorder<Serializer> recorder;
+  recorder.Translate(Vector3());
+  ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kTranslate);
+}
+
+TEST(CanvasRecorder, Scale2) {
+  CanvasRecorder<Serializer> recorder;
+  recorder.Scale(Vector2());
+  ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kScale2);
+}
+
+TEST(CanvasRecorder, Scale3) {
+  CanvasRecorder<Serializer> recorder;
+  recorder.Scale(Vector3());
+  ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kScale3);
+}
+
+TEST(CanvasRecorder, Skew) {
+  CanvasRecorder<Serializer> recorder;
+  recorder.Skew(0, 0);
+  ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kSkew);
+}
+
+TEST(CanvasRecorder, Rotate) {
+  CanvasRecorder<Serializer> recorder;
+  recorder.Rotate(Radians(0));
+  ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kRotate);
+}
+
+TEST(CanvasRecorder, DrawPath) {
+  CanvasRecorder<Serializer> recorder;
+  recorder.DrawPath(Path(), Paint());
+  ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kDrawPath);
+}
+
+TEST(CanvasRecorder, DrawPaint) {
+  CanvasRecorder<Serializer> recorder;
+  recorder.DrawPaint(Paint());
+  ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kDrawPaint);
+}
+
+TEST(CanvasRecorder, DrawLine) {
+  CanvasRecorder<Serializer> recorder;
+  recorder.DrawLine(Point(), Point(), Paint());
+  ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kDrawLine);
+}
+
+TEST(CanvasRecorder, DrawRect) {
+  CanvasRecorder<Serializer> recorder;
+  recorder.DrawRect(Rect(), Paint());
+  ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kDrawRect);
+}
+
+TEST(CanvasRecorder, DrawOval) {
+  CanvasRecorder<Serializer> recorder;
+  recorder.DrawOval(Rect(), Paint());
+  ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kDrawOval);
+}
+
+TEST(CanvasRecorder, DrawRRect) {
+  CanvasRecorder<Serializer> recorder;
+  recorder.DrawRRect(Rect(), {}, Paint());
+  ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kDrawRRect);
+}
+
+TEST(CanvasRecorder, DrawCircle) {
+  CanvasRecorder<Serializer> recorder;
+  recorder.DrawCircle(Point(), 0, Paint());
+  ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kDrawCircle);
+}
+
+TEST(CanvasRecorder, DrawPoints) {
+  CanvasRecorder<Serializer> recorder;
+  recorder.DrawPoints(std::vector<Point>{}, 0, Paint(), PointStyle::kRound);
+  ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kDrawPoints);
+}
+
+TEST(CanvasRecorder, DrawImage) {
+  CanvasRecorder<Serializer> recorder;
+  recorder.DrawImage({}, {}, {}, {});
+  ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kDrawImage);
+}
+
+TEST(CanvasRecorder, DrawImageRect) {
+  CanvasRecorder<Serializer> recorder;
+  recorder.DrawImageRect({}, {}, {}, {}, {}, SourceRectConstraint::kFast);
+  ASSERT_EQ(recorder.GetSerializer().last_op_,
+            CanvasRecorderOp::kDrawImageRect);
+}
+
+TEST(CanvasRecorder, ClipPath) {
+  CanvasRecorder<Serializer> recorder;
+  recorder.ClipPath({});
+  ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kClipPath);
+}
+
+TEST(CanvasRecorder, ClipRect) {
+  CanvasRecorder<Serializer> recorder;
+  recorder.ClipRect({});
+  ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kClipRect);
+}
+
+TEST(CanvasRecorder, ClipOval) {
+  CanvasRecorder<Serializer> recorder;
+  recorder.ClipOval({});
+  ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kClipOval);
+}
+
+TEST(CanvasRecorder, ClipRRect) {
+  CanvasRecorder<Serializer> recorder;
+  recorder.ClipRRect({}, {});
+  ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kClipRRect);
+}
+
+TEST(CanvasRecorder, DrawTextFrame) {
+  CanvasRecorder<Serializer> recorder;
+  recorder.DrawTextFrame({}, {}, {});
+  ASSERT_EQ(recorder.GetSerializer().last_op_,
+            CanvasRecorderOp::kDrawTextFrame);
+}
+
+TEST(CanvasRecorder, DrawVertices) {
+  CanvasRecorder<Serializer> recorder;
+  auto geometry = std::shared_ptr<VerticesGeometry>(
+      new VerticesGeometry({}, {}, {}, {}, {}, {}));
+  recorder.DrawVertices(geometry, {}, {});
+  ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kDrawVertices);
+}
+
+TEST(CanvasRecorder, DrawAtlas) {
+  CanvasRecorder<Serializer> recorder;
+  recorder.DrawAtlas({}, {}, {}, {}, {}, {}, {}, {});
+  ASSERT_EQ(recorder.GetSerializer().last_op_, CanvasRecorderOp::kDrawAtlas);
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/aiks/canvas_type.h b/impeller/aiks/canvas_type.h
new file mode 100644
index 0000000000000000000000000000000000000000..c9402c0526d2700273a8e3cda509e5203b2cf95e
--- /dev/null
+++ b/impeller/aiks/canvas_type.h
@@ -0,0 +1,25 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_AIKS_CANVAS_TYPE_H_
+#define FLUTTER_IMPELLER_AIKS_CANVAS_TYPE_H_
+
+#include "impeller/aiks/canvas.h"
+#include "impeller/aiks/canvas_recorder.h"
+#include "impeller/aiks/trace_serializer.h"
+
+namespace impeller {
+
+/// CanvasType defines what is the concrete type of the Canvas to be used. When
+/// the recorder is enabled it will be swapped out in place of the Canvas at
+/// compile-time.
+#ifdef IMPELLER_TRACE_CANVAS
+using CanvasType = CanvasRecorder<TraceSerializer>;
+#else
+using CanvasType = Canvas;
+#endif
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_AIKS_CANVAS_TYPE_H_
diff --git a/impeller/aiks/canvas_unittests.cc b/impeller/aiks/canvas_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a2deabcb9006b058101861958ce6227e685c6704
--- /dev/null
+++ b/impeller/aiks/canvas_unittests.cc
@@ -0,0 +1,360 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/testing/testing.h"
+#include "impeller/aiks/canvas.h"
+#include "impeller/aiks/image_filter.h"
+#include "impeller/geometry/path_builder.h"
+
+// TODO(zanderso): https://github.com/flutter/flutter/issues/127701
+// NOLINTBEGIN(bugprone-unchecked-optional-access)
+
+namespace impeller {
+namespace testing {
+
+using AiksCanvasTest = ::testing::Test;
+
+TEST(AiksCanvasTest, EmptyCullRect) {
+  Canvas canvas;
+
+  ASSERT_FALSE(canvas.GetCurrentLocalCullingBounds().has_value());
+}
+
+TEST(AiksCanvasTest, InitialCullRect) {
+  Rect initial_cull = Rect::MakeXYWH(0, 0, 10, 10);
+
+  Canvas canvas(initial_cull);
+
+  ASSERT_TRUE(canvas.GetCurrentLocalCullingBounds().has_value());
+  ASSERT_EQ(canvas.GetCurrentLocalCullingBounds().value(), initial_cull);
+}
+
+TEST(AiksCanvasTest, TranslatedCullRect) {
+  Rect initial_cull = Rect::MakeXYWH(5, 5, 10, 10);
+  Rect translated_cull = Rect::MakeXYWH(0, 0, 10, 10);
+
+  Canvas canvas(initial_cull);
+  canvas.Translate(Vector3(5, 5, 0));
+
+  ASSERT_TRUE(canvas.GetCurrentLocalCullingBounds().has_value());
+  ASSERT_EQ(canvas.GetCurrentLocalCullingBounds().value(), translated_cull);
+}
+
+TEST(AiksCanvasTest, ScaledCullRect) {
+  Rect initial_cull = Rect::MakeXYWH(5, 5, 10, 10);
+  Rect scaled_cull = Rect::MakeXYWH(10, 10, 20, 20);
+
+  Canvas canvas(initial_cull);
+  canvas.Scale(Vector2(0.5, 0.5));
+
+  ASSERT_TRUE(canvas.GetCurrentLocalCullingBounds().has_value());
+  ASSERT_EQ(canvas.GetCurrentLocalCullingBounds().value(), scaled_cull);
+}
+
+TEST(AiksCanvasTest, RectClipIntersectAgainstEmptyCullRect) {
+  Rect rect_clip = Rect::MakeXYWH(5, 5, 10, 10);
+
+  Canvas canvas;
+  canvas.ClipRect(rect_clip, Entity::ClipOperation::kIntersect);
+
+  ASSERT_TRUE(canvas.GetCurrentLocalCullingBounds().has_value());
+  ASSERT_EQ(canvas.GetCurrentLocalCullingBounds().value(), rect_clip);
+}
+
+TEST(AiksCanvasTest, RectClipDiffAgainstEmptyCullRect) {
+  Rect rect_clip = Rect::MakeXYWH(5, 5, 10, 10);
+
+  Canvas canvas;
+  canvas.ClipRect(rect_clip, Entity::ClipOperation::kDifference);
+
+  ASSERT_FALSE(canvas.GetCurrentLocalCullingBounds().has_value());
+}
+
+TEST(AiksCanvasTest, RectClipIntersectAgainstCullRect) {
+  Rect initial_cull = Rect::MakeXYWH(0, 0, 10, 10);
+  Rect rect_clip = Rect::MakeXYWH(5, 5, 10, 10);
+  Rect result_cull = Rect::MakeXYWH(5, 5, 5, 5);
+
+  Canvas canvas(initial_cull);
+  canvas.ClipRect(rect_clip, Entity::ClipOperation::kIntersect);
+
+  ASSERT_TRUE(canvas.GetCurrentLocalCullingBounds().has_value());
+  ASSERT_EQ(canvas.GetCurrentLocalCullingBounds().value(), result_cull);
+}
+
+TEST(AiksCanvasTest, RectClipDiffAgainstNonCoveredCullRect) {
+  Rect initial_cull = Rect::MakeXYWH(0, 0, 10, 10);
+  Rect rect_clip = Rect::MakeXYWH(5, 5, 10, 10);
+  Rect result_cull = Rect::MakeXYWH(0, 0, 10, 10);
+
+  Canvas canvas(initial_cull);
+  canvas.ClipRect(rect_clip, Entity::ClipOperation::kDifference);
+
+  ASSERT_TRUE(canvas.GetCurrentLocalCullingBounds().has_value());
+  ASSERT_EQ(canvas.GetCurrentLocalCullingBounds().value(), result_cull);
+}
+
+TEST(AiksCanvasTest, RectClipDiffAboveCullRect) {
+  Rect initial_cull = Rect::MakeXYWH(5, 5, 10, 10);
+  Rect rect_clip = Rect::MakeXYWH(0, 0, 20, 4);
+  Rect result_cull = Rect::MakeXYWH(5, 5, 10, 10);
+
+  Canvas canvas(initial_cull);
+  canvas.ClipRect(rect_clip, Entity::ClipOperation::kDifference);
+
+  ASSERT_TRUE(canvas.GetCurrentLocalCullingBounds().has_value());
+  ASSERT_EQ(canvas.GetCurrentLocalCullingBounds().value(), result_cull);
+}
+
+TEST(AiksCanvasTest, RectClipDiffBelowCullRect) {
+  Rect initial_cull = Rect::MakeXYWH(5, 5, 10, 10);
+  Rect rect_clip = Rect::MakeXYWH(0, 16, 20, 4);
+  Rect result_cull = Rect::MakeXYWH(5, 5, 10, 10);
+
+  Canvas canvas(initial_cull);
+  canvas.ClipRect(rect_clip, Entity::ClipOperation::kDifference);
+
+  ASSERT_TRUE(canvas.GetCurrentLocalCullingBounds().has_value());
+  ASSERT_EQ(canvas.GetCurrentLocalCullingBounds().value(), result_cull);
+}
+
+TEST(AiksCanvasTest, RectClipDiffLeftOfCullRect) {
+  Rect initial_cull = Rect::MakeXYWH(5, 5, 10, 10);
+  Rect rect_clip = Rect::MakeXYWH(0, 0, 4, 20);
+  Rect result_cull = Rect::MakeXYWH(5, 5, 10, 10);
+
+  Canvas canvas(initial_cull);
+  canvas.ClipRect(rect_clip, Entity::ClipOperation::kDifference);
+
+  ASSERT_TRUE(canvas.GetCurrentLocalCullingBounds().has_value());
+  ASSERT_EQ(canvas.GetCurrentLocalCullingBounds().value(), result_cull);
+}
+
+TEST(AiksCanvasTest, RectClipDiffRightOfCullRect) {
+  Rect initial_cull = Rect::MakeXYWH(5, 5, 10, 10);
+  Rect rect_clip = Rect::MakeXYWH(16, 0, 4, 20);
+  Rect result_cull = Rect::MakeXYWH(5, 5, 10, 10);
+
+  Canvas canvas(initial_cull);
+  canvas.ClipRect(rect_clip, Entity::ClipOperation::kDifference);
+
+  ASSERT_TRUE(canvas.GetCurrentLocalCullingBounds().has_value());
+  ASSERT_EQ(canvas.GetCurrentLocalCullingBounds().value(), result_cull);
+}
+
+TEST(AiksCanvasTest, RectClipDiffAgainstVCoveredCullRect) {
+  Rect initial_cull = Rect::MakeXYWH(0, 0, 10, 10);
+  Rect rect_clip = Rect::MakeXYWH(5, 0, 10, 10);
+  Rect result_cull = Rect::MakeXYWH(0, 0, 5, 10);
+
+  Canvas canvas(initial_cull);
+  canvas.ClipRect(rect_clip, Entity::ClipOperation::kDifference);
+
+  ASSERT_TRUE(canvas.GetCurrentLocalCullingBounds().has_value());
+  ASSERT_EQ(canvas.GetCurrentLocalCullingBounds().value(), result_cull);
+}
+
+TEST(AiksCanvasTest, RectClipDiffAgainstHCoveredCullRect) {
+  Rect initial_cull = Rect::MakeXYWH(0, 0, 10, 10);
+  Rect rect_clip = Rect::MakeXYWH(0, 5, 10, 10);
+  Rect result_cull = Rect::MakeXYWH(0, 0, 10, 5);
+
+  Canvas canvas(initial_cull);
+  canvas.ClipRect(rect_clip, Entity::ClipOperation::kDifference);
+
+  ASSERT_TRUE(canvas.GetCurrentLocalCullingBounds().has_value());
+  ASSERT_EQ(canvas.GetCurrentLocalCullingBounds().value(), result_cull);
+}
+
+TEST(AiksCanvasTest, RRectClipIntersectAgainstEmptyCullRect) {
+  Rect rect_clip = Rect::MakeXYWH(5, 5, 10, 10);
+
+  Canvas canvas;
+  canvas.ClipRRect(rect_clip, {1, 1}, Entity::ClipOperation::kIntersect);
+
+  ASSERT_TRUE(canvas.GetCurrentLocalCullingBounds().has_value());
+  ASSERT_EQ(canvas.GetCurrentLocalCullingBounds().value(), rect_clip);
+}
+
+TEST(AiksCanvasTest, RRectClipDiffAgainstEmptyCullRect) {
+  Rect rect_clip = Rect::MakeXYWH(5, 5, 10, 10);
+
+  Canvas canvas;
+  canvas.ClipRRect(rect_clip, {1, 1}, Entity::ClipOperation::kDifference);
+
+  ASSERT_FALSE(canvas.GetCurrentLocalCullingBounds().has_value());
+}
+
+TEST(AiksCanvasTest, RRectClipIntersectAgainstCullRect) {
+  Rect initial_cull = Rect::MakeXYWH(0, 0, 10, 10);
+  Rect rect_clip = Rect::MakeXYWH(5, 5, 10, 10);
+  Rect result_cull = Rect::MakeXYWH(5, 5, 5, 5);
+
+  Canvas canvas(initial_cull);
+  canvas.ClipRRect(rect_clip, {1, 1}, Entity::ClipOperation::kIntersect);
+
+  ASSERT_TRUE(canvas.GetCurrentLocalCullingBounds().has_value());
+  ASSERT_EQ(canvas.GetCurrentLocalCullingBounds().value(), result_cull);
+}
+
+TEST(AiksCanvasTest, RRectClipDiffAgainstNonCoveredCullRect) {
+  Rect initial_cull = Rect::MakeXYWH(0, 0, 10, 10);
+  Rect rect_clip = Rect::MakeXYWH(5, 5, 10, 10);
+  Rect result_cull = Rect::MakeXYWH(0, 0, 10, 10);
+
+  Canvas canvas(initial_cull);
+  canvas.ClipRRect(rect_clip, {1, 1}, Entity::ClipOperation::kDifference);
+
+  ASSERT_TRUE(canvas.GetCurrentLocalCullingBounds().has_value());
+  ASSERT_EQ(canvas.GetCurrentLocalCullingBounds().value(), result_cull);
+}
+
+TEST(AiksCanvasTest, RRectClipDiffAgainstVPartiallyCoveredCullRect) {
+  Rect initial_cull = Rect::MakeXYWH(0, 0, 10, 10);
+  Rect rect_clip = Rect::MakeXYWH(5, 0, 10, 10);
+  Rect result_cull = Rect::MakeXYWH(0, 0, 6, 10);
+
+  Canvas canvas(initial_cull);
+  canvas.ClipRRect(rect_clip, {1, 1}, Entity::ClipOperation::kDifference);
+
+  ASSERT_TRUE(canvas.GetCurrentLocalCullingBounds().has_value());
+  ASSERT_EQ(canvas.GetCurrentLocalCullingBounds().value(), result_cull);
+}
+
+TEST(AiksCanvasTest, RRectClipDiffAgainstVFullyCoveredCullRect) {
+  Rect initial_cull = Rect::MakeXYWH(0, 0, 10, 10);
+  Rect rect_clip = Rect::MakeXYWH(5, -2, 10, 14);
+  Rect result_cull = Rect::MakeXYWH(0, 0, 5, 10);
+
+  Canvas canvas(initial_cull);
+  canvas.ClipRRect(rect_clip, {1, 1}, Entity::ClipOperation::kDifference);
+
+  ASSERT_TRUE(canvas.GetCurrentLocalCullingBounds().has_value());
+  ASSERT_EQ(canvas.GetCurrentLocalCullingBounds().value(), result_cull);
+}
+
+TEST(AiksCanvasTest, RRectClipDiffAgainstHPartiallyCoveredCullRect) {
+  Rect initial_cull = Rect::MakeXYWH(0, 0, 10, 10);
+  Rect rect_clip = Rect::MakeXYWH(0, 5, 10, 10);
+  Rect result_cull = Rect::MakeXYWH(0, 0, 10, 6);
+
+  Canvas canvas(initial_cull);
+  canvas.ClipRRect(rect_clip, {1, 1}, Entity::ClipOperation::kDifference);
+
+  ASSERT_TRUE(canvas.GetCurrentLocalCullingBounds().has_value());
+  ASSERT_EQ(canvas.GetCurrentLocalCullingBounds().value(), result_cull);
+}
+
+TEST(AiksCanvasTest, RRectClipDiffAgainstHFullyCoveredCullRect) {
+  Rect initial_cull = Rect::MakeXYWH(0, 0, 10, 10);
+  Rect rect_clip = Rect::MakeXYWH(-2, 5, 14, 10);
+  Rect result_cull = Rect::MakeXYWH(0, 0, 10, 5);
+
+  Canvas canvas(initial_cull);
+  canvas.ClipRRect(rect_clip, {1, 1}, Entity::ClipOperation::kDifference);
+
+  ASSERT_TRUE(canvas.GetCurrentLocalCullingBounds().has_value());
+  ASSERT_EQ(canvas.GetCurrentLocalCullingBounds().value(), result_cull);
+}
+
+TEST(AiksCanvasTest, PathClipIntersectAgainstEmptyCullRect) {
+  PathBuilder builder;
+  builder.AddRect(Rect::MakeXYWH(5, 5, 1, 1));
+  builder.AddRect(Rect::MakeXYWH(5, 14, 1, 1));
+  builder.AddRect(Rect::MakeXYWH(14, 5, 1, 1));
+  builder.AddRect(Rect::MakeXYWH(14, 14, 1, 1));
+  Path path = builder.TakePath();
+  Rect rect_clip = Rect::MakeXYWH(5, 5, 10, 10);
+
+  Canvas canvas;
+  canvas.ClipPath(path, Entity::ClipOperation::kIntersect);
+
+  ASSERT_TRUE(canvas.GetCurrentLocalCullingBounds().has_value());
+  ASSERT_EQ(canvas.GetCurrentLocalCullingBounds().value(), rect_clip);
+}
+
+TEST(AiksCanvasTest, PathClipDiffAgainstEmptyCullRect) {
+  PathBuilder builder;
+  builder.AddRect(Rect::MakeXYWH(5, 5, 1, 1));
+  builder.AddRect(Rect::MakeXYWH(5, 14, 1, 1));
+  builder.AddRect(Rect::MakeXYWH(14, 5, 1, 1));
+  builder.AddRect(Rect::MakeXYWH(14, 14, 1, 1));
+  Path path = builder.TakePath();
+
+  Canvas canvas;
+  canvas.ClipPath(path, Entity::ClipOperation::kDifference);
+
+  ASSERT_FALSE(canvas.GetCurrentLocalCullingBounds().has_value());
+}
+
+TEST(AiksCanvasTest, PathClipIntersectAgainstCullRect) {
+  Rect initial_cull = Rect::MakeXYWH(0, 0, 10, 10);
+  PathBuilder builder;
+  builder.AddRect(Rect::MakeXYWH(5, 5, 1, 1));
+  builder.AddRect(Rect::MakeXYWH(5, 14, 1, 1));
+  builder.AddRect(Rect::MakeXYWH(14, 5, 1, 1));
+  builder.AddRect(Rect::MakeXYWH(14, 14, 1, 1));
+  Path path = builder.TakePath();
+  Rect result_cull = Rect::MakeXYWH(5, 5, 5, 5);
+
+  Canvas canvas(initial_cull);
+  canvas.ClipPath(path, Entity::ClipOperation::kIntersect);
+
+  ASSERT_TRUE(canvas.GetCurrentLocalCullingBounds().has_value());
+  ASSERT_EQ(canvas.GetCurrentLocalCullingBounds().value(), result_cull);
+}
+
+TEST(AiksCanvasTest, PathClipDiffAgainstNonCoveredCullRect) {
+  Rect initial_cull = Rect::MakeXYWH(0, 0, 10, 10);
+  PathBuilder builder;
+  builder.AddRect(Rect::MakeXYWH(5, 5, 1, 1));
+  builder.AddRect(Rect::MakeXYWH(5, 14, 1, 1));
+  builder.AddRect(Rect::MakeXYWH(14, 5, 1, 1));
+  builder.AddRect(Rect::MakeXYWH(14, 14, 1, 1));
+  Path path = builder.TakePath();
+  Rect result_cull = Rect::MakeXYWH(0, 0, 10, 10);
+
+  Canvas canvas(initial_cull);
+  canvas.ClipPath(path, Entity::ClipOperation::kDifference);
+
+  ASSERT_TRUE(canvas.GetCurrentLocalCullingBounds().has_value());
+  ASSERT_EQ(canvas.GetCurrentLocalCullingBounds().value(), result_cull);
+}
+
+TEST(AiksCanvasTest, PathClipDiffAgainstFullyCoveredCullRect) {
+  Rect initial_cull = Rect::MakeXYWH(5, 5, 10, 10);
+  PathBuilder builder;
+  builder.AddRect(Rect::MakeXYWH(0, 0, 100, 100));
+  Path path = builder.TakePath();
+  // Diff clip of Paths is ignored due to complexity
+  Rect result_cull = Rect::MakeXYWH(5, 5, 10, 10);
+
+  Canvas canvas(initial_cull);
+  canvas.ClipPath(path, Entity::ClipOperation::kDifference);
+
+  ASSERT_TRUE(canvas.GetCurrentLocalCullingBounds().has_value());
+  ASSERT_EQ(canvas.GetCurrentLocalCullingBounds().value(), result_cull);
+}
+
+TEST(AiksCanvasTest, DisableLocalBoundsRectForFilteredSaveLayers) {
+  Rect initial_cull = Rect::MakeXYWH(0, 0, 10, 10);
+
+  Canvas canvas(initial_cull);
+  ASSERT_TRUE(canvas.GetCurrentLocalCullingBounds().has_value());
+
+  canvas.Save();
+  canvas.SaveLayer(
+      Paint{.image_filter = ImageFilter::MakeBlur(
+                Sigma(10), Sigma(10), FilterContents::BlurStyle::kNormal,
+                Entity::TileMode::kDecal)});
+  ASSERT_FALSE(canvas.GetCurrentLocalCullingBounds().has_value());
+
+  canvas.Restore();
+  ASSERT_TRUE(canvas.GetCurrentLocalCullingBounds().has_value());
+}
+
+}  // namespace testing
+}  // namespace impeller
+
+// NOLINTEND(bugprone-unchecked-optional-access)
diff --git a/impeller/aiks/color_filter.cc b/impeller/aiks/color_filter.cc
new file mode 100644
index 0000000000000000000000000000000000000000..b5498a195408bcc774b3e8e30852b5f8168335e6
--- /dev/null
+++ b/impeller/aiks/color_filter.cc
@@ -0,0 +1,190 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/aiks/color_filter.h"
+
+#include <utility>
+#include "impeller/entity/contents/filters/color_filter_contents.h"
+#include "impeller/entity/contents/filters/filter_contents.h"
+#include "impeller/entity/contents/filters/inputs/filter_input.h"
+#include "impeller/geometry/color.h"
+
+namespace impeller {
+
+/*******************************************************************************
+ ******* ColorFilter
+ ******************************************************************************/
+
+ColorFilter::ColorFilter() = default;
+
+ColorFilter::~ColorFilter() = default;
+
+std::shared_ptr<ColorFilter> ColorFilter::MakeBlend(BlendMode blend_mode,
+                                                    Color color) {
+  return std::make_shared<BlendColorFilter>(blend_mode, color);
+}
+
+std::shared_ptr<ColorFilter> ColorFilter::MakeMatrix(ColorMatrix color_matrix) {
+  return std::make_shared<MatrixColorFilter>(color_matrix);
+}
+
+std::shared_ptr<ColorFilter> ColorFilter::MakeSrgbToLinear() {
+  return std::make_shared<SrgbToLinearColorFilter>();
+}
+
+std::shared_ptr<ColorFilter> ColorFilter::MakeLinearToSrgb() {
+  return std::make_shared<LinearToSrgbColorFilter>();
+}
+
+std::shared_ptr<ColorFilter> ColorFilter::MakeComposed(
+    const std::shared_ptr<ColorFilter>& outer,
+    const std::shared_ptr<ColorFilter>& inner) {
+  return std::make_shared<ComposedColorFilter>(outer, inner);
+}
+
+/*******************************************************************************
+ ******* BlendColorFilter
+ ******************************************************************************/
+
+BlendColorFilter::BlendColorFilter(BlendMode blend_mode, Color color)
+    : blend_mode_(blend_mode), color_(color) {}
+
+BlendColorFilter::~BlendColorFilter() = default;
+
+std::shared_ptr<ColorFilterContents> BlendColorFilter::WrapWithGPUColorFilter(
+    std::shared_ptr<FilterInput> input,
+    ColorFilterContents::AbsorbOpacity absorb_opacity) const {
+  auto filter =
+      ColorFilterContents::MakeBlend(blend_mode_, {std::move(input)}, color_);
+  filter->SetAbsorbOpacity(absorb_opacity);
+  return filter;
+}
+
+ColorFilter::ColorFilterProc BlendColorFilter::GetCPUColorFilterProc() const {
+  return [filter_blend_mode = blend_mode_, filter_color = color_](Color color) {
+    return color.Blend(filter_color, filter_blend_mode);
+  };
+}
+
+std::shared_ptr<ColorFilter> BlendColorFilter::Clone() const {
+  return std::make_shared<BlendColorFilter>(*this);
+}
+
+/*******************************************************************************
+ ******* MatrixColorFilter
+ ******************************************************************************/
+
+MatrixColorFilter::MatrixColorFilter(ColorMatrix color_matrix)
+    : color_matrix_(color_matrix) {}
+
+MatrixColorFilter::~MatrixColorFilter() = default;
+
+std::shared_ptr<ColorFilterContents> MatrixColorFilter::WrapWithGPUColorFilter(
+    std::shared_ptr<FilterInput> input,
+    ColorFilterContents::AbsorbOpacity absorb_opacity) const {
+  auto filter =
+      ColorFilterContents::MakeColorMatrix({std::move(input)}, color_matrix_);
+  filter->SetAbsorbOpacity(absorb_opacity);
+  return filter;
+}
+
+ColorFilter::ColorFilterProc MatrixColorFilter::GetCPUColorFilterProc() const {
+  return [color_matrix = color_matrix_](Color color) {
+    return color.ApplyColorMatrix(color_matrix);
+  };
+}
+
+std::shared_ptr<ColorFilter> MatrixColorFilter::Clone() const {
+  return std::make_shared<MatrixColorFilter>(*this);
+}
+
+/*******************************************************************************
+ ******* SrgbToLinearColorFilter
+ ******************************************************************************/
+
+SrgbToLinearColorFilter::SrgbToLinearColorFilter() = default;
+
+SrgbToLinearColorFilter::~SrgbToLinearColorFilter() = default;
+
+std::shared_ptr<ColorFilterContents>
+SrgbToLinearColorFilter::WrapWithGPUColorFilter(
+    std::shared_ptr<FilterInput> input,
+    ColorFilterContents::AbsorbOpacity absorb_opacity) const {
+  auto filter = ColorFilterContents::MakeSrgbToLinearFilter({std::move(input)});
+  filter->SetAbsorbOpacity(absorb_opacity);
+  return filter;
+}
+
+ColorFilter::ColorFilterProc SrgbToLinearColorFilter::GetCPUColorFilterProc()
+    const {
+  return [](Color color) { return color.SRGBToLinear(); };
+}
+
+std::shared_ptr<ColorFilter> SrgbToLinearColorFilter::Clone() const {
+  return std::make_shared<SrgbToLinearColorFilter>(*this);
+}
+
+/*******************************************************************************
+ ******* LinearToSrgbColorFilter
+ ******************************************************************************/
+
+LinearToSrgbColorFilter::LinearToSrgbColorFilter() = default;
+
+LinearToSrgbColorFilter::~LinearToSrgbColorFilter() = default;
+
+std::shared_ptr<ColorFilterContents>
+LinearToSrgbColorFilter::WrapWithGPUColorFilter(
+    std::shared_ptr<FilterInput> input,
+    ColorFilterContents::AbsorbOpacity absorb_opacity) const {
+  auto filter = ColorFilterContents::MakeSrgbToLinearFilter({std::move(input)});
+  filter->SetAbsorbOpacity(absorb_opacity);
+  return filter;
+}
+
+ColorFilter::ColorFilterProc LinearToSrgbColorFilter::GetCPUColorFilterProc()
+    const {
+  return [](Color color) { return color.LinearToSRGB(); };
+}
+
+std::shared_ptr<ColorFilter> LinearToSrgbColorFilter::Clone() const {
+  return std::make_shared<LinearToSrgbColorFilter>(*this);
+}
+
+/*******************************************************************************
+ ******* ComposedColorFilter
+ ******************************************************************************/
+
+ComposedColorFilter::ComposedColorFilter(
+    const std::shared_ptr<ColorFilter>& outer,
+    const std::shared_ptr<ColorFilter>& inner)
+    : outer_(outer), inner_(inner) {}
+
+ComposedColorFilter::~ComposedColorFilter() = default;
+
+std::shared_ptr<ColorFilterContents>
+ComposedColorFilter::WrapWithGPUColorFilter(
+    std::shared_ptr<FilterInput> input,
+    ColorFilterContents::AbsorbOpacity absorb_opacity) const {
+  std::shared_ptr<FilterContents> inner = inner_->WrapWithGPUColorFilter(
+      input, ColorFilterContents::AbsorbOpacity::kNo);
+  return outer_->WrapWithGPUColorFilter(FilterInput::Make(inner),
+                                        absorb_opacity);
+}
+
+// |ColorFilter|
+ColorFilter::ColorFilterProc ComposedColorFilter::GetCPUColorFilterProc()
+    const {
+  return [inner = inner_, outer = outer_](Color color) {
+    auto inner_proc = inner->GetCPUColorFilterProc();
+    auto outer_proc = outer->GetCPUColorFilterProc();
+    return outer_proc(inner_proc(color));
+  };
+}
+
+// |ColorFilter|
+std::shared_ptr<ColorFilter> ComposedColorFilter::Clone() const {
+  return std::make_shared<ComposedColorFilter>(outer_, inner_);
+}
+
+}  // namespace impeller
diff --git a/impeller/aiks/color_filter.h b/impeller/aiks/color_filter.h
new file mode 100644
index 0000000000000000000000000000000000000000..4ed24b81b10cbe3bce7e03dfc7f57569c2ea47d4
--- /dev/null
+++ b/impeller/aiks/color_filter.h
@@ -0,0 +1,181 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_AIKS_COLOR_FILTER_H_
+#define FLUTTER_IMPELLER_AIKS_COLOR_FILTER_H_
+
+#include "impeller/entity/contents/filters/color_filter_contents.h"
+#include "impeller/geometry/color.h"
+
+namespace impeller {
+
+struct Paint;
+
+/*******************************************************************************
+ ******* ColorFilter
+ ******************************************************************************/
+
+class ColorFilter {
+ public:
+  /// A procedure that filters a given unpremultiplied color to produce a new
+  /// unpremultiplied color.
+  using ColorFilterProc = std::function<Color(Color)>;
+
+  ColorFilter();
+
+  virtual ~ColorFilter();
+
+  static std::shared_ptr<ColorFilter> MakeBlend(BlendMode blend_mode,
+                                                Color color);
+
+  static std::shared_ptr<ColorFilter> MakeMatrix(ColorMatrix color_matrix);
+
+  static std::shared_ptr<ColorFilter> MakeSrgbToLinear();
+
+  static std::shared_ptr<ColorFilter> MakeLinearToSrgb();
+
+  static std::shared_ptr<ColorFilter> MakeComposed(
+      const std::shared_ptr<ColorFilter>& outer,
+      const std::shared_ptr<ColorFilter>& inner);
+
+  /// @brief  Wraps the given filter input with a GPU-based filter that will
+  ///         perform the color operation. The given input will first be
+  ///         rendered to a texture and then filtered.
+  ///
+  ///         Note that this operation has no consideration for the original
+  ///         geometry mask of the filter input. And the entire input texture is
+  ///         treated as color information.
+  virtual std::shared_ptr<ColorFilterContents> WrapWithGPUColorFilter(
+      std::shared_ptr<FilterInput> input,
+      ColorFilterContents::AbsorbOpacity absorb_opacity) const = 0;
+
+  /// @brief Returns a function that can be used to filter unpremultiplied
+  ///        Impeller Colors on the CPU.
+  virtual ColorFilterProc GetCPUColorFilterProc() const = 0;
+
+  virtual std::shared_ptr<ColorFilter> Clone() const = 0;
+};
+
+/*******************************************************************************
+ ******* BlendColorFilter
+ ******************************************************************************/
+
+class BlendColorFilter final : public ColorFilter {
+ public:
+  BlendColorFilter(BlendMode blend_mode, Color color);
+
+  ~BlendColorFilter() override;
+
+  // |ColorFilter|
+  std::shared_ptr<ColorFilterContents> WrapWithGPUColorFilter(
+      std::shared_ptr<FilterInput> input,
+      ColorFilterContents::AbsorbOpacity absorb_opacity) const override;
+
+  // |ColorFilter|
+  ColorFilterProc GetCPUColorFilterProc() const override;
+
+  // |ColorFilter|
+  std::shared_ptr<ColorFilter> Clone() const override;
+
+ private:
+  BlendMode blend_mode_;
+  Color color_;
+};
+
+/*******************************************************************************
+ ******* MatrixColorFilter
+ ******************************************************************************/
+
+class MatrixColorFilter final : public ColorFilter {
+ public:
+  explicit MatrixColorFilter(ColorMatrix color_matrix);
+
+  ~MatrixColorFilter() override;
+
+  // |ColorFilter|
+  std::shared_ptr<ColorFilterContents> WrapWithGPUColorFilter(
+      std::shared_ptr<FilterInput> input,
+      ColorFilterContents::AbsorbOpacity absorb_opacity) const override;
+
+  // |ColorFilter|
+  ColorFilterProc GetCPUColorFilterProc() const override;
+
+  // |ColorFilter|
+  std::shared_ptr<ColorFilter> Clone() const override;
+
+ private:
+  ColorMatrix color_matrix_;
+};
+
+/*******************************************************************************
+ ******* SrgbToLinearColorFilter
+ ******************************************************************************/
+
+class SrgbToLinearColorFilter final : public ColorFilter {
+ public:
+  explicit SrgbToLinearColorFilter();
+
+  ~SrgbToLinearColorFilter() override;
+
+  // |ColorFilter|
+  std::shared_ptr<ColorFilterContents> WrapWithGPUColorFilter(
+      std::shared_ptr<FilterInput> input,
+      ColorFilterContents::AbsorbOpacity absorb_opacity) const override;
+
+  // |ColorFilter|
+  ColorFilterProc GetCPUColorFilterProc() const override;
+
+  // |ColorFilter|
+  std::shared_ptr<ColorFilter> Clone() const override;
+};
+
+/*******************************************************************************
+ ******* LinearToSrgbColorFilter
+ ******************************************************************************/
+
+class LinearToSrgbColorFilter final : public ColorFilter {
+ public:
+  explicit LinearToSrgbColorFilter();
+
+  ~LinearToSrgbColorFilter() override;
+
+  // |ColorFilter|
+  std::shared_ptr<ColorFilterContents> WrapWithGPUColorFilter(
+      std::shared_ptr<FilterInput> input,
+      ColorFilterContents::AbsorbOpacity absorb_opacity) const override;
+
+  // |ColorFilter|
+  ColorFilterProc GetCPUColorFilterProc() const override;
+
+  // |ColorFilter|
+  std::shared_ptr<ColorFilter> Clone() const override;
+};
+
+/// @brief Applies color filters as f(g(x)), where x is the input color.
+class ComposedColorFilter final : public ColorFilter {
+ public:
+  ComposedColorFilter(const std::shared_ptr<ColorFilter>& outer,
+                      const std::shared_ptr<ColorFilter>& inner);
+
+  ~ComposedColorFilter() override;
+
+  // |ColorFilter|
+  std::shared_ptr<ColorFilterContents> WrapWithGPUColorFilter(
+      std::shared_ptr<FilterInput> input,
+      ColorFilterContents::AbsorbOpacity absorb_opacity) const override;
+
+  // |ColorFilter|
+  ColorFilterProc GetCPUColorFilterProc() const override;
+
+  // |ColorFilter|
+  std::shared_ptr<ColorFilter> Clone() const override;
+
+ private:
+  std::shared_ptr<ColorFilter> outer_;
+  std::shared_ptr<ColorFilter> inner_;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_AIKS_COLOR_FILTER_H_
diff --git a/impeller/aiks/color_source.cc b/impeller/aiks/color_source.cc
new file mode 100644
index 0000000000000000000000000000000000000000..b07ac1e0181f1104a74ac92be9ff43b6ac400698
--- /dev/null
+++ b/impeller/aiks/color_source.cc
@@ -0,0 +1,239 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/aiks/color_source.h"
+
+#include <memory>
+#include <vector>
+
+#include "impeller/aiks/paint.h"
+#include "impeller/core/sampler_descriptor.h"
+#include "impeller/entity/contents/conical_gradient_contents.h"
+#include "impeller/entity/contents/filters/color_filter_contents.h"
+#include "impeller/entity/contents/linear_gradient_contents.h"
+#include "impeller/entity/contents/radial_gradient_contents.h"
+#include "impeller/entity/contents/runtime_effect_contents.h"
+#include "impeller/entity/contents/solid_color_contents.h"
+#include "impeller/entity/contents/sweep_gradient_contents.h"
+#include "impeller/entity/contents/tiled_texture_contents.h"
+#include "impeller/geometry/color.h"
+#include "impeller/geometry/matrix.h"
+#include "impeller/geometry/scalar.h"
+#include "impeller/runtime_stage/runtime_stage.h"
+
+#if IMPELLER_ENABLE_3D
+#include "impeller/entity/contents/scene_contents.h"  // nogncheck
+#include "impeller/scene/node.h"                      // nogncheck
+#endif                                                // IMPELLER_ENABLE_3D
+
+namespace impeller {
+
+ColorSource::ColorSource() noexcept
+    : proc_([](const Paint& paint) -> std::shared_ptr<ColorSourceContents> {
+        auto contents = std::make_shared<SolidColorContents>();
+        contents->SetColor(paint.color);
+        return contents;
+      }){};
+
+ColorSource::~ColorSource() = default;
+
+ColorSource ColorSource::MakeColor() {
+  return {};
+}
+
+ColorSource ColorSource::MakeLinearGradient(Point start_point,
+                                            Point end_point,
+                                            std::vector<Color> colors,
+                                            std::vector<Scalar> stops,
+                                            Entity::TileMode tile_mode,
+                                            Matrix effect_transform) {
+  ColorSource result;
+  result.type_ = Type::kLinearGradient;
+  result.proc_ = [start_point, end_point, colors = std::move(colors),
+                  stops = std::move(stops), tile_mode,
+                  effect_transform](const Paint& paint) {
+    auto contents = std::make_shared<LinearGradientContents>();
+    contents->SetOpacityFactor(paint.color.alpha);
+    contents->SetColors(colors);
+    contents->SetStops(stops);
+    contents->SetEndPoints(start_point, end_point);
+    contents->SetTileMode(tile_mode);
+    contents->SetEffectTransform(effect_transform);
+
+    std::vector<Point> bounds{start_point, end_point};
+    auto intrinsic_size = Rect::MakePointBounds(bounds.begin(), bounds.end());
+    if (intrinsic_size.has_value()) {
+      contents->SetColorSourceSize(intrinsic_size->GetSize());
+    }
+    return contents;
+  };
+  return result;
+}
+
+ColorSource ColorSource::MakeConicalGradient(Point center,
+                                             Scalar radius,
+                                             std::vector<Color> colors,
+                                             std::vector<Scalar> stops,
+                                             Point focus_center,
+                                             Scalar focus_radius,
+                                             Entity::TileMode tile_mode,
+                                             Matrix effect_transform) {
+  ColorSource result;
+  result.type_ = Type::kConicalGradient;
+  result.proc_ = [center, radius, colors = std::move(colors),
+                  stops = std::move(stops), focus_center, focus_radius,
+                  tile_mode, effect_transform](const Paint& paint) {
+    std::shared_ptr<ConicalGradientContents> contents =
+        std::make_shared<ConicalGradientContents>();
+    contents->SetOpacityFactor(paint.color.alpha);
+    contents->SetColors(colors);
+    contents->SetStops(stops);
+    contents->SetCenterAndRadius(center, radius);
+    contents->SetTileMode(tile_mode);
+    contents->SetEffectTransform(effect_transform);
+    contents->SetFocus(focus_center, focus_radius);
+
+    auto radius_pt = Point(radius, radius);
+    std::vector<Point> bounds{center + radius_pt, center - radius_pt};
+    auto intrinsic_size = Rect::MakePointBounds(bounds.begin(), bounds.end());
+    if (intrinsic_size.has_value()) {
+      contents->SetColorSourceSize(intrinsic_size->GetSize());
+    }
+    return contents;
+  };
+  return result;
+}
+
+ColorSource ColorSource::MakeRadialGradient(Point center,
+                                            Scalar radius,
+                                            std::vector<Color> colors,
+                                            std::vector<Scalar> stops,
+                                            Entity::TileMode tile_mode,
+                                            Matrix effect_transform) {
+  ColorSource result;
+  result.type_ = Type::kRadialGradient;
+  result.proc_ = [center, radius, colors = std::move(colors),
+                  stops = std::move(stops), tile_mode,
+                  effect_transform](const Paint& paint) {
+    auto contents = std::make_shared<RadialGradientContents>();
+    contents->SetOpacityFactor(paint.color.alpha);
+    contents->SetColors(colors);
+    contents->SetStops(stops);
+    contents->SetCenterAndRadius(center, radius);
+    contents->SetTileMode(tile_mode);
+    contents->SetEffectTransform(effect_transform);
+
+    auto radius_pt = Point(radius, radius);
+    std::vector<Point> bounds{center + radius_pt, center - radius_pt};
+    auto intrinsic_size = Rect::MakePointBounds(bounds.begin(), bounds.end());
+    if (intrinsic_size.has_value()) {
+      contents->SetColorSourceSize(intrinsic_size->GetSize());
+    }
+    return contents;
+  };
+  return result;
+}
+
+ColorSource ColorSource::MakeSweepGradient(Point center,
+                                           Degrees start_angle,
+                                           Degrees end_angle,
+                                           std::vector<Color> colors,
+                                           std::vector<Scalar> stops,
+                                           Entity::TileMode tile_mode,
+                                           Matrix effect_transform) {
+  ColorSource result;
+  result.type_ = Type::kSweepGradient;
+  result.proc_ = [center, start_angle, end_angle, colors = std::move(colors),
+                  stops = std::move(stops), tile_mode,
+                  effect_transform](const Paint& paint) {
+    auto contents = std::make_shared<SweepGradientContents>();
+    contents->SetOpacityFactor(paint.color.alpha);
+    contents->SetCenterAndAngles(center, start_angle, end_angle);
+    contents->SetColors(colors);
+    contents->SetStops(stops);
+    contents->SetTileMode(tile_mode);
+    contents->SetEffectTransform(effect_transform);
+
+    return contents;
+  };
+  return result;
+}
+
+ColorSource ColorSource::MakeImage(std::shared_ptr<Texture> texture,
+                                   Entity::TileMode x_tile_mode,
+                                   Entity::TileMode y_tile_mode,
+                                   SamplerDescriptor sampler_descriptor,
+                                   Matrix effect_transform) {
+  ColorSource result;
+  result.type_ = Type::kImage;
+  result.proc_ = [texture = std::move(texture), x_tile_mode, y_tile_mode,
+                  sampler_descriptor = std::move(sampler_descriptor),
+                  effect_transform](const Paint& paint) {
+    auto contents = std::make_shared<TiledTextureContents>();
+    contents->SetOpacityFactor(paint.color.alpha);
+    contents->SetTexture(texture);
+    contents->SetTileModes(x_tile_mode, y_tile_mode);
+    contents->SetSamplerDescriptor(sampler_descriptor);
+    contents->SetEffectTransform(effect_transform);
+    if (paint.color_filter) {
+      TiledTextureContents::ColorFilterProc filter_proc =
+          [color_filter = paint.color_filter](FilterInput::Ref input) {
+            return color_filter->WrapWithGPUColorFilter(
+                std::move(input), ColorFilterContents::AbsorbOpacity::kNo);
+          };
+      contents->SetColorFilter(filter_proc);
+    }
+    contents->SetColorSourceSize(Size::Ceil(texture->GetSize()));
+    return contents;
+  };
+  return result;
+}
+
+ColorSource ColorSource::MakeRuntimeEffect(
+    std::shared_ptr<RuntimeStage> runtime_stage,
+    std::shared_ptr<std::vector<uint8_t>> uniform_data,
+    std::vector<RuntimeEffectContents::TextureInput> texture_inputs) {
+  ColorSource result;
+  result.type_ = Type::kRuntimeEffect;
+  result.proc_ = [runtime_stage = std::move(runtime_stage),
+                  uniform_data = std::move(uniform_data),
+                  texture_inputs =
+                      std::move(texture_inputs)](const Paint& paint) {
+    auto contents = std::make_shared<RuntimeEffectContents>();
+    contents->SetOpacityFactor(paint.color.alpha);
+    contents->SetRuntimeStage(runtime_stage);
+    contents->SetUniformData(uniform_data);
+    contents->SetTextureInputs(texture_inputs);
+    return contents;
+  };
+  return result;
+}
+
+#if IMPELLER_ENABLE_3D
+ColorSource ColorSource::MakeScene(std::shared_ptr<scene::Node> scene_node,
+                                   Matrix camera_transform) {
+  ColorSource result;
+  result.type_ = Type::kScene;
+  result.proc_ = [scene_node = std::move(scene_node),
+                  camera_transform](const Paint& paint) {
+    auto contents = std::make_shared<SceneContents>();
+    contents->SetOpacityFactor(paint.color.alpha);
+    contents->SetNode(scene_node);
+    contents->SetCameraTransform(camera_transform);
+    return contents;
+  };
+  return result;
+}
+#endif  // IMPELLER_ENABLE_3D
+
+ColorSource::Type ColorSource::GetType() const {
+  return type_;
+}
+
+std::shared_ptr<ColorSourceContents> ColorSource::GetContents(
+    const Paint& paint) const {
+  return proc_(paint);
+}
+
+}  // namespace impeller
diff --git a/impeller/aiks/color_source.h b/impeller/aiks/color_source.h
new file mode 100644
index 0000000000000000000000000000000000000000..868362d99c48ce663527735c7961c9af74d572cc
--- /dev/null
+++ b/impeller/aiks/color_source.h
@@ -0,0 +1,108 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_AIKS_COLOR_SOURCE_H_
+#define FLUTTER_IMPELLER_AIKS_COLOR_SOURCE_H_
+
+#include <functional>
+#include <memory>
+#include <vector>
+
+#include "flutter/fml/macros.h"
+#include "impeller/entity/contents/runtime_effect_contents.h"
+#include "impeller/entity/entity.h"
+#include "impeller/geometry/color.h"
+#include "impeller/geometry/matrix.h"
+#include "impeller/geometry/point.h"
+#include "impeller/runtime_stage/runtime_stage.h"
+
+#if IMPELLER_ENABLE_3D
+#include "impeller/scene/node.h"  // nogncheck
+#endif                            // IMPELLER_ENABLE_3D
+
+namespace impeller {
+
+struct Paint;
+
+class ColorSource {
+ public:
+  enum class Type {
+    kColor,
+    kImage,
+    kLinearGradient,
+    kRadialGradient,
+    kConicalGradient,
+    kSweepGradient,
+    kRuntimeEffect,
+    kScene,
+  };
+
+  using ColorSourceProc =
+      std::function<std::shared_ptr<ColorSourceContents>(const Paint& paint)>;
+
+  ColorSource() noexcept;
+
+  ~ColorSource();
+
+  static ColorSource MakeColor();
+
+  static ColorSource MakeLinearGradient(Point start_point,
+                                        Point end_point,
+                                        std::vector<Color> colors,
+                                        std::vector<Scalar> stops,
+                                        Entity::TileMode tile_mode,
+                                        Matrix effect_transform);
+
+  static ColorSource MakeConicalGradient(Point center,
+                                         Scalar radius,
+                                         std::vector<Color> colors,
+                                         std::vector<Scalar> stops,
+                                         Point focus_center,
+                                         Scalar focus_radius,
+                                         Entity::TileMode tile_mode,
+                                         Matrix effect_transform);
+
+  static ColorSource MakeRadialGradient(Point center,
+                                        Scalar radius,
+                                        std::vector<Color> colors,
+                                        std::vector<Scalar> stops,
+                                        Entity::TileMode tile_mode,
+                                        Matrix effect_transform);
+
+  static ColorSource MakeSweepGradient(Point center,
+                                       Degrees start_angle,
+                                       Degrees end_angle,
+                                       std::vector<Color> colors,
+                                       std::vector<Scalar> stops,
+                                       Entity::TileMode tile_mode,
+                                       Matrix effect_transform);
+
+  static ColorSource MakeImage(std::shared_ptr<Texture> texture,
+                               Entity::TileMode x_tile_mode,
+                               Entity::TileMode y_tile_mode,
+                               SamplerDescriptor sampler_descriptor,
+                               Matrix effect_transform);
+
+  static ColorSource MakeRuntimeEffect(
+      std::shared_ptr<RuntimeStage> runtime_stage,
+      std::shared_ptr<std::vector<uint8_t>> uniform_data,
+      std::vector<RuntimeEffectContents::TextureInput> texture_inputs);
+
+#if IMPELLER_ENABLE_3D
+  static ColorSource MakeScene(std::shared_ptr<scene::Node> scene_node,
+                               Matrix camera_transform);
+#endif  // IMPELLER_ENABLE_3D
+
+  Type GetType() const;
+
+  std::shared_ptr<ColorSourceContents> GetContents(const Paint& paint) const;
+
+ private:
+  Type type_ = Type::kColor;
+  ColorSourceProc proc_;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_AIKS_COLOR_SOURCE_H_
diff --git a/impeller/aiks/image.h b/impeller/aiks/image.h
index aa124f2ed7dd1ecfa50a52547d69192d9968c497..534506880b2d456141341f45e05b2d3eacf75c71 100644
--- a/impeller/aiks/image.h
+++ b/impeller/aiks/image.h
@@ -2,18 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_AIKS_IMAGE_H_
+#define FLUTTER_IMPELLER_AIKS_IMAGE_H_
 
 #include <memory>
 
 #include "flutter/fml/macros.h"
-#include "impeller/renderer/texture.h"
+#include "impeller/core/texture.h"
 
 namespace impeller {
 
 class Image {
  public:
-  Image(std::shared_ptr<Texture> texture);
+  explicit Image(std::shared_ptr<Texture> texture);
 
   ~Image();
 
@@ -24,7 +25,11 @@ class Image {
  private:
   const std::shared_ptr<Texture> texture_;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(Image);
+  Image(const Image&) = delete;
+
+  Image& operator=(const Image&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_AIKS_IMAGE_H_
diff --git a/impeller/aiks/image_filter.cc b/impeller/aiks/image_filter.cc
new file mode 100644
index 0000000000000000000000000000000000000000..10e0d72cef676f4ad8be0dcfe610870afbeeeb42
--- /dev/null
+++ b/impeller/aiks/image_filter.cc
@@ -0,0 +1,208 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/aiks/image_filter.h"
+#include "impeller/entity/contents/filters/color_filter_contents.h"
+#include "impeller/entity/contents/filters/filter_contents.h"
+#include "impeller/entity/contents/filters/inputs/filter_input.h"
+
+namespace impeller {
+
+/*******************************************************************************
+ ******* ImageFilter
+ ******************************************************************************/
+
+ImageFilter::ImageFilter() = default;
+
+ImageFilter::~ImageFilter() = default;
+
+std::shared_ptr<ImageFilter> ImageFilter::MakeBlur(
+    Sigma sigma_x,
+    Sigma sigma_y,
+    FilterContents::BlurStyle blur_style,
+    Entity::TileMode tile_mode) {
+  return std::make_shared<BlurImageFilter>(sigma_x, sigma_y, blur_style,
+                                           tile_mode);
+}
+
+std::shared_ptr<ImageFilter> ImageFilter::MakeDilate(Radius radius_x,
+                                                     Radius radius_y) {
+  return std::make_shared<DilateImageFilter>(radius_x, radius_y);
+}
+
+std::shared_ptr<ImageFilter> ImageFilter::MakeErode(Radius radius_x,
+                                                    Radius radius_y) {
+  return std::make_shared<ErodeImageFilter>(radius_x, radius_y);
+}
+
+std::shared_ptr<ImageFilter> ImageFilter::MakeMatrix(
+    const Matrix& matrix,
+    SamplerDescriptor sampler_descriptor) {
+  return std::make_shared<MatrixImageFilter>(matrix,
+                                             std::move(sampler_descriptor));
+}
+
+std::shared_ptr<ImageFilter> ImageFilter::MakeCompose(
+    const ImageFilter& inner,
+    const ImageFilter& outer) {
+  return std::make_shared<ComposeImageFilter>(inner, outer);
+}
+
+std::shared_ptr<ImageFilter> ImageFilter::MakeFromColorFilter(
+    const ColorFilter& color_filter) {
+  return std::make_shared<ColorImageFilter>(color_filter);
+}
+
+std::shared_ptr<ImageFilter> ImageFilter::MakeLocalMatrix(
+    const Matrix& matrix,
+    const ImageFilter& internal_filter) {
+  return std::make_shared<LocalMatrixImageFilter>(matrix, internal_filter);
+}
+
+std::shared_ptr<FilterContents> ImageFilter::GetFilterContents() const {
+  return WrapInput(FilterInput::Make(Rect()));
+}
+
+/*******************************************************************************
+ ******* BlurImageFilter
+ ******************************************************************************/
+
+BlurImageFilter::BlurImageFilter(Sigma sigma_x,
+                                 Sigma sigma_y,
+                                 FilterContents::BlurStyle blur_style,
+                                 Entity::TileMode tile_mode)
+    : sigma_x_(sigma_x),
+      sigma_y_(sigma_y),
+      blur_style_(blur_style),
+      tile_mode_(tile_mode) {}
+
+BlurImageFilter::~BlurImageFilter() = default;
+
+std::shared_ptr<FilterContents> BlurImageFilter::WrapInput(
+    const FilterInput::Ref& input) const {
+  return FilterContents::MakeGaussianBlur(input, sigma_x_, sigma_y_, tile_mode_,
+                                          blur_style_);
+}
+
+std::shared_ptr<ImageFilter> BlurImageFilter::Clone() const {
+  return std::make_shared<BlurImageFilter>(*this);
+}
+
+/*******************************************************************************
+ ******* DilateImageFilter
+ ******************************************************************************/
+
+DilateImageFilter::DilateImageFilter(Radius radius_x, Radius radius_y)
+    : radius_x_(radius_x), radius_y_(radius_y) {}
+
+DilateImageFilter::~DilateImageFilter() = default;
+
+std::shared_ptr<FilterContents> DilateImageFilter::WrapInput(
+    const FilterInput::Ref& input) const {
+  return FilterContents::MakeMorphology(input, radius_x_, radius_y_,
+                                        FilterContents::MorphType::kDilate);
+}
+
+std::shared_ptr<ImageFilter> DilateImageFilter::Clone() const {
+  return std::make_shared<DilateImageFilter>(*this);
+}
+
+/*******************************************************************************
+ ******* ErodeImageFilter
+ ******************************************************************************/
+
+ErodeImageFilter::ErodeImageFilter(Radius radius_x, Radius radius_y)
+    : radius_x_(radius_x), radius_y_(radius_y) {}
+
+ErodeImageFilter::~ErodeImageFilter() = default;
+
+std::shared_ptr<FilterContents> ErodeImageFilter::WrapInput(
+    const FilterInput::Ref& input) const {
+  return FilterContents::MakeMorphology(input, radius_x_, radius_y_,
+                                        FilterContents::MorphType::kErode);
+}
+
+std::shared_ptr<ImageFilter> ErodeImageFilter::Clone() const {
+  return std::make_shared<ErodeImageFilter>(*this);
+}
+
+/*******************************************************************************
+ ******* MatrixImageFilter
+ ******************************************************************************/
+
+MatrixImageFilter::MatrixImageFilter(const Matrix& matrix,
+                                     SamplerDescriptor sampler_descriptor)
+    : matrix_(matrix), sampler_descriptor_(std::move(sampler_descriptor)) {}
+
+MatrixImageFilter::~MatrixImageFilter() = default;
+
+std::shared_ptr<FilterContents> MatrixImageFilter::WrapInput(
+    const FilterInput::Ref& input) const {
+  return FilterContents::MakeMatrixFilter(input, matrix_, sampler_descriptor_);
+}
+
+std::shared_ptr<ImageFilter> MatrixImageFilter::Clone() const {
+  return std::make_shared<MatrixImageFilter>(*this);
+}
+
+/*******************************************************************************
+ ******* ComposeImageFilter
+ ******************************************************************************/
+
+ComposeImageFilter::ComposeImageFilter(const ImageFilter& inner,
+                                       const ImageFilter& outer)
+    : inner_(inner.Clone()), outer_(outer.Clone()) {}
+
+ComposeImageFilter::~ComposeImageFilter() = default;
+
+std::shared_ptr<FilterContents> ComposeImageFilter::WrapInput(
+    const FilterInput::Ref& input) const {
+  return outer_->WrapInput(FilterInput::Make(inner_->WrapInput(input)));
+}
+
+std::shared_ptr<ImageFilter> ComposeImageFilter::Clone() const {
+  return std::make_shared<ComposeImageFilter>(*this);
+}
+
+/*******************************************************************************
+ ******* ColorImageFilter
+ ******************************************************************************/
+
+ColorImageFilter::ColorImageFilter(const ColorFilter& color_filter)
+    : color_filter_(color_filter.Clone()) {}
+
+ColorImageFilter::~ColorImageFilter() = default;
+
+std::shared_ptr<FilterContents> ColorImageFilter::WrapInput(
+    const FilterInput::Ref& input) const {
+  return color_filter_->WrapWithGPUColorFilter(
+      input, ColorFilterContents::AbsorbOpacity::kNo);
+}
+
+std::shared_ptr<ImageFilter> ColorImageFilter::Clone() const {
+  return std::make_shared<ColorImageFilter>(*this);
+}
+
+/*******************************************************************************
+ ******* LocalMatrixImageFilter
+ ******************************************************************************/
+
+LocalMatrixImageFilter::LocalMatrixImageFilter(
+    const Matrix& matrix,
+    const ImageFilter& internal_filter)
+    : matrix_(matrix), internal_filter_(internal_filter.Clone()) {}
+
+LocalMatrixImageFilter::~LocalMatrixImageFilter() = default;
+
+std::shared_ptr<FilterContents> LocalMatrixImageFilter::WrapInput(
+    const FilterInput::Ref& input) const {
+  return FilterContents::MakeLocalMatrixFilter(
+      FilterInput::Make(internal_filter_->WrapInput(input)), matrix_);
+}
+
+std::shared_ptr<ImageFilter> LocalMatrixImageFilter::Clone() const {
+  return std::make_shared<LocalMatrixImageFilter>(*this);
+}
+
+}  // namespace impeller
diff --git a/impeller/aiks/image_filter.h b/impeller/aiks/image_filter.h
new file mode 100644
index 0000000000000000000000000000000000000000..9d72c14d1a522c12e8a7e0826f8160d87d0d17ef
--- /dev/null
+++ b/impeller/aiks/image_filter.h
@@ -0,0 +1,276 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_AIKS_IMAGE_FILTER_H_
+#define FLUTTER_IMPELLER_AIKS_IMAGE_FILTER_H_
+
+#include "impeller/aiks/color_filter.h"
+#include "impeller/core/sampler_descriptor.h"
+#include "impeller/entity/contents/filters/filter_contents.h"
+#include "impeller/entity/entity.h"
+#include "impeller/geometry/matrix.h"
+#include "impeller/geometry/sigma.h"
+
+namespace impeller {
+
+struct Paint;
+
+class LocalMatrixImageFilter;
+class BlurImageFilter;
+class DilateImageFilter;
+class ErodeImageFilter;
+class MatrixImageFilter;
+class ComposeImageFilter;
+class ColorImageFilter;
+
+class ImageFilterVisitor {
+ public:
+  virtual void Visit(const BlurImageFilter& filter) = 0;
+  virtual void Visit(const LocalMatrixImageFilter& filter) = 0;
+  virtual void Visit(const DilateImageFilter& filter) = 0;
+  virtual void Visit(const ErodeImageFilter& filter) = 0;
+  virtual void Visit(const MatrixImageFilter& filter) = 0;
+  virtual void Visit(const ComposeImageFilter& filter) = 0;
+  virtual void Visit(const ColorImageFilter& filter) = 0;
+};
+
+/*******************************************************************************
+ ******* ImageFilter
+ ******************************************************************************/
+
+class ImageFilter {
+ public:
+  ImageFilter();
+
+  virtual ~ImageFilter();
+
+  static std::shared_ptr<ImageFilter> MakeBlur(
+      Sigma sigma_x,
+      Sigma sigma_y,
+      FilterContents::BlurStyle blur_style,
+      Entity::TileMode tile_mode);
+
+  static std::shared_ptr<ImageFilter> MakeDilate(Radius radius_x,
+                                                 Radius radius_y);
+
+  static std::shared_ptr<ImageFilter> MakeErode(Radius radius_x,
+                                                Radius radius_y);
+
+  static std::shared_ptr<ImageFilter> MakeMatrix(
+      const Matrix& matrix,
+      SamplerDescriptor sampler_descriptor);
+
+  static std::shared_ptr<ImageFilter> MakeCompose(const ImageFilter& inner,
+                                                  const ImageFilter& outer);
+
+  static std::shared_ptr<ImageFilter> MakeFromColorFilter(
+      const ColorFilter& color_filter);
+
+  static std::shared_ptr<ImageFilter> MakeLocalMatrix(
+      const Matrix& matrix,
+      const ImageFilter& internal_filter);
+
+  /// @brief  Generate a new FilterContents using this filter's configuration.
+  ///
+  ///         This is the same as WrapInput, except no input is set. The input
+  ///         for the filter chain can be set later using.
+  ///         FilterContents::SetLeafInputs().
+  ///
+  /// @see    `FilterContents::SetLeafInputs`
+  std::shared_ptr<FilterContents> GetFilterContents() const;
+
+  /// @brief  Wraps the given filter input with a GPU-based image filter.
+  virtual std::shared_ptr<FilterContents> WrapInput(
+      const FilterInput::Ref& input) const = 0;
+
+  virtual std::shared_ptr<ImageFilter> Clone() const = 0;
+
+  virtual void Visit(ImageFilterVisitor& visitor) = 0;
+};
+
+/*******************************************************************************
+ ******* BlurImageFilter
+ ******************************************************************************/
+
+class BlurImageFilter : public ImageFilter {
+ public:
+  BlurImageFilter(Sigma sigma_x,
+                  Sigma sigma_y,
+                  FilterContents::BlurStyle blur_style,
+                  Entity::TileMode tile_mode);
+
+  ~BlurImageFilter() override;
+
+  // |ImageFilter|
+  std::shared_ptr<FilterContents> WrapInput(
+      const FilterInput::Ref& input) const override;
+
+  // |ImageFilter|
+  std::shared_ptr<ImageFilter> Clone() const override;
+
+  // |ImageFilter|
+  void Visit(ImageFilterVisitor& visitor) override { visitor.Visit(*this); }
+
+ private:
+  Sigma sigma_x_;
+  Sigma sigma_y_;
+  FilterContents::BlurStyle blur_style_;
+  Entity::TileMode tile_mode_;
+};
+
+/*******************************************************************************
+ ******* DilateImageFilter
+ ******************************************************************************/
+
+class DilateImageFilter : public ImageFilter {
+ public:
+  DilateImageFilter(Radius radius_x, Radius radius_y);
+
+  ~DilateImageFilter() override;
+
+  // |ImageFilter|
+  std::shared_ptr<FilterContents> WrapInput(
+      const FilterInput::Ref& input) const override;
+
+  // |ImageFilter|
+  std::shared_ptr<ImageFilter> Clone() const override;
+
+  // |ImageFilter|
+  void Visit(ImageFilterVisitor& visitor) override { visitor.Visit(*this); }
+
+ private:
+  Radius radius_x_;
+  Radius radius_y_;
+};
+
+/*******************************************************************************
+ ******* ErodeImageFilter
+ ******************************************************************************/
+
+class ErodeImageFilter : public ImageFilter {
+ public:
+  ErodeImageFilter(Radius radius_x, Radius radius_y);
+
+  ~ErodeImageFilter() override;
+
+  // |ImageFilter|
+  std::shared_ptr<FilterContents> WrapInput(
+      const FilterInput::Ref& input) const override;
+
+  // |ImageFilter|
+  std::shared_ptr<ImageFilter> Clone() const override;
+
+  // |ImageFilter|
+  void Visit(ImageFilterVisitor& visitor) override { visitor.Visit(*this); }
+
+ private:
+  Radius radius_x_;
+  Radius radius_y_;
+};
+
+/*******************************************************************************
+ ******* MatrixImageFilter
+ ******************************************************************************/
+
+class MatrixImageFilter : public ImageFilter {
+ public:
+  MatrixImageFilter(const Matrix& matrix, SamplerDescriptor sampler_descriptor);
+
+  ~MatrixImageFilter() override;
+
+  // |ImageFilter|
+  std::shared_ptr<FilterContents> WrapInput(
+      const FilterInput::Ref& input) const override;
+
+  // |ImageFilter|
+  std::shared_ptr<ImageFilter> Clone() const override;
+
+  // |ImageFilter|
+  void Visit(ImageFilterVisitor& visitor) override { visitor.Visit(*this); }
+
+  const Matrix& GetMatrix() const { return matrix_; }
+
+ private:
+  Matrix matrix_;
+  SamplerDescriptor sampler_descriptor_;
+};
+
+/*******************************************************************************
+ ******* ComposeImageFilter
+ ******************************************************************************/
+
+class ComposeImageFilter : public ImageFilter {
+ public:
+  ComposeImageFilter(const ImageFilter& inner, const ImageFilter& outer);
+
+  ~ComposeImageFilter() override;
+
+  // |ImageFilter|
+  std::shared_ptr<FilterContents> WrapInput(
+      const FilterInput::Ref& input) const override;
+
+  // |ImageFilter|
+  std::shared_ptr<ImageFilter> Clone() const override;
+
+  // |ImageFilter|
+  void Visit(ImageFilterVisitor& visitor) override { visitor.Visit(*this); }
+
+ private:
+  std::shared_ptr<ImageFilter> inner_;
+  std::shared_ptr<ImageFilter> outer_;
+};
+
+/*******************************************************************************
+ ******* ColorImageFilter
+ ******************************************************************************/
+
+class ColorImageFilter : public ImageFilter {
+ public:
+  explicit ColorImageFilter(const ColorFilter& color_filter);
+
+  ~ColorImageFilter() override;
+
+  // |ImageFilter|
+  std::shared_ptr<FilterContents> WrapInput(
+      const FilterInput::Ref& input) const override;
+
+  // |ImageFilter|
+  std::shared_ptr<ImageFilter> Clone() const override;
+
+  // |ImageFilter|
+  void Visit(ImageFilterVisitor& visitor) override { visitor.Visit(*this); }
+
+ private:
+  std::shared_ptr<ColorFilter> color_filter_;
+};
+
+/*******************************************************************************
+ ******* LocalMatrixImageFilter
+ ******************************************************************************/
+
+class LocalMatrixImageFilter : public ImageFilter {
+ public:
+  LocalMatrixImageFilter(const Matrix& matrix,
+                         const ImageFilter& internal_filter);
+
+  ~LocalMatrixImageFilter() override;
+
+  // |ImageFilter|
+  std::shared_ptr<FilterContents> WrapInput(
+      const FilterInput::Ref& input) const override;
+
+  // |ImageFilter|
+  std::shared_ptr<ImageFilter> Clone() const override;
+
+  // |ImageFilter|
+  void Visit(ImageFilterVisitor& visitor) override { visitor.Visit(*this); }
+
+ private:
+  Matrix matrix_;
+  std::shared_ptr<ImageFilter> internal_filter_;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_AIKS_IMAGE_FILTER_H_
diff --git a/impeller/aiks/paint.cc b/impeller/aiks/paint.cc
index 04b93e248bea13efa51b79d56bccdcea95c29c17..1efb587601e0d57881620fd08225145fb057884c 100644
--- a/impeller/aiks/paint.cc
+++ b/impeller/aiks/paint.cc
@@ -3,108 +3,229 @@
 // found in the LICENSE file.
 
 #include "impeller/aiks/paint.h"
+
+#include <memory>
+
+#include "impeller/entity/contents/color_source_contents.h"
+#include "impeller/entity/contents/filters/color_filter_contents.h"
+#include "impeller/entity/contents/filters/filter_contents.h"
+#include "impeller/entity/contents/filters/gaussian_blur_filter_contents.h"
 #include "impeller/entity/contents/solid_color_contents.h"
-#include "impeller/entity/geometry.h"
+#include "impeller/entity/geometry/geometry.h"
 
 namespace impeller {
 
-std::shared_ptr<Contents> Paint::CreateContentsForEntity(const Path& path,
-                                                         bool cover) const {
-  std::unique_ptr<Geometry> geometry;
-  switch (style) {
-    case Style::kFill:
-      geometry = cover ? Geometry::MakeCover() : Geometry::MakeFillPath(path);
-      break;
-    case Style::kStroke:
-      geometry =
-          cover ? Geometry::MakeCover()
-                : Geometry::MakeStrokePath(path, stroke_width, stroke_miter,
-                                           stroke_cap, stroke_join);
-      break;
-  }
-  return CreateContentsForGeometry(std::move(geometry));
-}
+/// A color matrix which inverts colors.
+// clang-format off
+constexpr ColorMatrix kColorInversion = {
+  .array = {
+    -1.0,    0,    0, 1.0, 0, //
+       0, -1.0,    0, 1.0, 0, //
+       0,    0, -1.0, 1.0, 0, //
+     1.0,  1.0,  1.0, 1.0, 0  //
+  }
+};
+// clang-format on
 
 std::shared_ptr<Contents> Paint::CreateContentsForGeometry(
-    std::unique_ptr<Geometry> geometry) const {
-  if (color_source.has_value()) {
-    auto& source = color_source.value();
-    auto contents = source();
-    contents->SetGeometry(std::move(geometry));
-    contents->SetAlpha(color.alpha);
-    return contents;
-  }
-  auto solid_color = std::make_shared<SolidColorContents>();
-  solid_color->SetGeometry(std::move(geometry));
-  solid_color->SetColor(color);
-  return solid_color;
+    const std::shared_ptr<Geometry>& geometry) const {
+  auto contents = color_source.GetContents(*this);
+
+  // Attempt to apply the color filter on the CPU first.
+  // Note: This is not just an optimization; some color sources rely on
+  //       CPU-applied color filters to behave properly.
+  auto color_filter = GetColorFilter();
+  bool needs_color_filter = !!color_filter;
+  if (color_filter &&
+      contents->ApplyColorFilter(color_filter->GetCPUColorFilterProc())) {
+    needs_color_filter = false;
+  }
+
+  contents->SetGeometry(geometry);
+  if (mask_blur_descriptor.has_value()) {
+    // If there's a mask blur and we need to apply the color filter on the GPU,
+    // we need to be careful to only apply the color filter to the source
+    // colors. CreateMaskBlur is able to handle this case.
+    return mask_blur_descriptor->CreateMaskBlur(
+        contents, needs_color_filter ? color_filter : nullptr);
+  }
+
+  return contents;
 }
 
 std::shared_ptr<Contents> Paint::WithFilters(
-    std::shared_ptr<Contents> input,
-    std::optional<bool> is_solid_color,
-    const Matrix& effect_transform) const {
-  bool is_solid_color_val = is_solid_color.value_or(!color_source);
-  input = WithColorFilter(input);
-  input = WithMaskBlur(input, is_solid_color_val, effect_transform);
-  input = WithImageFilter(input, effect_transform);
+    std::shared_ptr<Contents> input) const {
+  input = WithColorFilter(input, ColorFilterContents::AbsorbOpacity::kYes);
+  auto image_filter =
+      WithImageFilter(input, Matrix(), Entity::RenderingMode::kDirect);
+  if (image_filter) {
+    input = image_filter;
+  }
   return input;
 }
 
 std::shared_ptr<Contents> Paint::WithFiltersForSubpassTarget(
     std::shared_ptr<Contents> input,
     const Matrix& effect_transform) const {
-  input = WithMaskBlur(input, false, effect_transform);
-  input = WithImageFilter(input, effect_transform);
-  input = WithColorFilter(input, /**absorb_opacity=*/true);
+  auto image_filter =
+      WithImageFilter(input, effect_transform, Entity::RenderingMode::kSubpass);
+  if (image_filter) {
+    input = image_filter;
+  }
+  input = WithColorFilter(input, ColorFilterContents::AbsorbOpacity::kYes);
   return input;
 }
 
-std::shared_ptr<Contents> Paint::WithMaskBlur(
-    std::shared_ptr<Contents> input,
-    bool is_solid_color,
-    const Matrix& effect_transform) const {
+std::shared_ptr<Contents> Paint::WithMaskBlur(std::shared_ptr<Contents> input,
+                                              bool is_solid_color) const {
   if (mask_blur_descriptor.has_value()) {
-    input = mask_blur_descriptor->CreateMaskBlur(
-        FilterInput::Make(input), is_solid_color, effect_transform);
+    input = mask_blur_descriptor->CreateMaskBlur(FilterInput::Make(input),
+                                                 is_solid_color);
   }
   return input;
 }
 
-std::shared_ptr<Contents> Paint::WithImageFilter(
-    std::shared_ptr<Contents> input,
-    const Matrix& effect_transform) const {
-  if (image_filter.has_value()) {
-    const ImageFilterProc& filter = image_filter.value();
-    input = filter(FilterInput::Make(input), effect_transform);
+std::shared_ptr<FilterContents> Paint::WithImageFilter(
+    const FilterInput::Variant& input,
+    const Matrix& effect_transform,
+    Entity::RenderingMode rendering_mode) const {
+  if (!image_filter) {
+    return nullptr;
   }
-  return input;
+  auto filter = image_filter->WrapInput(FilterInput::Make(input));
+  filter->SetRenderingMode(rendering_mode);
+  filter->SetEffectTransform(effect_transform);
+  return filter;
 }
 
 std::shared_ptr<Contents> Paint::WithColorFilter(
     std::shared_ptr<Contents> input,
-    bool absorb_opacity) const {
-  if (color_filter.has_value()) {
-    const ColorFilterProc& filter = color_filter.value();
-    auto color_filter_contents = filter(FilterInput::Make(input));
-    if (color_filter_contents) {
-      color_filter_contents->SetAbsorbOpacity(absorb_opacity);
-    }
-    input = color_filter_contents;
+    ColorFilterContents::AbsorbOpacity absorb_opacity) const {
+  // Image input types will directly set their color filter,
+  // if any. See `TiledTextureContents.SetColorFilter`.
+  if (color_source.GetType() == ColorSource::Type::kImage) {
+    return input;
   }
-  return input;
+
+  auto color_filter = GetColorFilter();
+  if (!color_filter) {
+    return input;
+  }
+
+  // Attempt to apply the color filter on the CPU first.
+  // Note: This is not just an optimization; some color sources rely on
+  //       CPU-applied color filters to behave properly.
+  if (input->ApplyColorFilter(color_filter->GetCPUColorFilterProc())) {
+    return input;
+  }
+  return color_filter->WrapWithGPUColorFilter(FilterInput::Make(input),
+                                              absorb_opacity);
+}
+
+std::shared_ptr<FilterContents> Paint::MaskBlurDescriptor::CreateMaskBlur(
+    std::shared_ptr<TextureContents> texture_contents) const {
+  Scalar expand_amount = GaussianBlurFilterContents::CalculateBlurRadius(
+      GaussianBlurFilterContents::ScaleSigma(sigma.sigma));
+  texture_contents->SetSourceRect(
+      texture_contents->GetSourceRect().Expand(expand_amount, expand_amount));
+  auto mask = std::make_shared<SolidColorContents>();
+  mask->SetColor(Color::White());
+  std::optional<Rect> coverage = texture_contents->GetCoverage({});
+  std::shared_ptr<Geometry> geometry;
+  if (coverage) {
+    texture_contents->SetDestinationRect(
+        coverage.value().Expand(expand_amount, expand_amount));
+    geometry = Geometry::MakeRect(coverage.value());
+  }
+  mask->SetGeometry(geometry);
+  auto descriptor = texture_contents->GetSamplerDescriptor();
+  texture_contents->SetSamplerDescriptor(descriptor);
+  std::shared_ptr<FilterContents> blurred_mask =
+      FilterContents::MakeGaussianBlur(FilterInput::Make(mask), sigma, sigma,
+                                       Entity::TileMode::kDecal, style,
+                                       geometry);
+
+  return ColorFilterContents::MakeBlend(
+      BlendMode::kSourceIn,
+      {FilterInput::Make(blurred_mask), FilterInput::Make(texture_contents)});
+}
+
+std::shared_ptr<FilterContents> Paint::MaskBlurDescriptor::CreateMaskBlur(
+    std::shared_ptr<ColorSourceContents> color_source_contents,
+    const std::shared_ptr<ColorFilter>& color_filter) const {
+  // If it's a solid color and there is no color filter, then we can just get
+  // away with doing one Gaussian blur.
+  if (color_source_contents->IsSolidColor() && !color_filter) {
+    return FilterContents::MakeGaussianBlur(
+        FilterInput::Make(color_source_contents), sigma, sigma,
+        Entity::TileMode::kDecal, style, color_source_contents->GetGeometry());
+  }
+
+  /// 1. Create an opaque white mask of the original geometry.
+
+  auto mask = std::make_shared<SolidColorContents>();
+  mask->SetColor(Color::White());
+  mask->SetGeometry(color_source_contents->GetGeometry());
+
+  /// 2. Blur the mask.
+
+  auto blurred_mask = FilterContents::MakeGaussianBlur(
+      FilterInput::Make(mask), sigma, sigma, Entity::TileMode::kDecal, style,
+      color_source_contents->GetGeometry());
+
+  /// 3. Replace the geometry of the original color source with a rectangle that
+  ///    covers the full region of the blurred mask. Note that geometry is in
+  ///    local bounds.
+
+  auto expanded_local_bounds = blurred_mask->GetCoverage({});
+  if (!expanded_local_bounds.has_value()) {
+    expanded_local_bounds = Rect();
+  }
+  color_source_contents->SetGeometry(
+      Geometry::MakeRect(*expanded_local_bounds));
+  std::shared_ptr<Contents> color_contents = color_source_contents;
+
+  /// 4. Apply the user set color filter on the GPU, if applicable.
+
+  if (color_filter) {
+    color_contents = color_filter->WrapWithGPUColorFilter(
+        FilterInput::Make(color_source_contents),
+        ColorFilterContents::AbsorbOpacity::kYes);
+  }
+
+  /// 5. Composite the color source with the blurred mask.
+
+  return ColorFilterContents::MakeBlend(
+      BlendMode::kSourceIn,
+      {FilterInput::Make(blurred_mask), FilterInput::Make(color_contents)});
 }
 
 std::shared_ptr<FilterContents> Paint::MaskBlurDescriptor::CreateMaskBlur(
     const FilterInput::Ref& input,
-    bool is_solid_color,
-    const Matrix& effect_transform) const {
+    bool is_solid_color) const {
   if (is_solid_color) {
-    return FilterContents::MakeGaussianBlur(
-        input, sigma, sigma, style, Entity::TileMode::kDecal, effect_transform);
+    return FilterContents::MakeGaussianBlur(input, sigma, sigma,
+                                            Entity::TileMode::kDecal, style);
   }
-  return FilterContents::MakeBorderMaskBlur(input, sigma, sigma, style,
-                                            effect_transform);
+  return FilterContents::MakeBorderMaskBlur(input, sigma, sigma, style);
+}
+
+std::shared_ptr<ColorFilter> Paint::GetColorFilter() const {
+  if (invert_colors && color_filter) {
+    auto filter = ColorFilter::MakeMatrix(kColorInversion);
+    return ColorFilter::MakeComposed(filter, color_filter);
+  }
+  if (invert_colors) {
+    return ColorFilter::MakeMatrix(kColorInversion);
+  }
+  if (color_filter) {
+    return color_filter;
+  }
+  return nullptr;
+}
+
+bool Paint::HasColorFilter() const {
+  return !!color_filter || invert_colors;
 }
 
 }  // namespace impeller
diff --git a/impeller/aiks/paint.h b/impeller/aiks/paint.h
index 6f3784112e94c28ddaa30e58a1864c826dbf5c68..10b46dc99c05aaf23b991fd7ec503e8b7925be56 100644
--- a/impeller/aiks/paint.h
+++ b/impeller/aiks/paint.h
@@ -2,19 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_AIKS_PAINT_H_
+#define FLUTTER_IMPELLER_AIKS_PAINT_H_
 
 #include <memory>
 
-#include "flutter/fml/macros.h"
+#include "impeller/aiks/color_filter.h"
+#include "impeller/aiks/color_source.h"
+#include "impeller/aiks/image_filter.h"
 #include "impeller/entity/contents/contents.h"
 #include "impeller/entity/contents/filters/color_filter_contents.h"
 #include "impeller/entity/contents/filters/filter_contents.h"
-#include "impeller/entity/contents/linear_gradient_contents.h"
-#include "impeller/entity/contents/radial_gradient_contents.h"
-#include "impeller/entity/contents/sweep_gradient_contents.h"
+#include "impeller/entity/contents/texture_contents.h"
 #include "impeller/entity/entity.h"
-#include "impeller/entity/geometry.h"
+#include "impeller/entity/geometry/geometry.h"
 #include "impeller/geometry/color.h"
 
 namespace impeller {
@@ -22,9 +23,8 @@ namespace impeller {
 struct Paint {
   using ImageFilterProc = std::function<std::shared_ptr<FilterContents>(
       FilterInput::Ref,
-      const Matrix& effect_transform)>;
-  using ColorFilterProc =
-      std::function<std::shared_ptr<ColorFilterContents>(FilterInput::Ref)>;
+      const Matrix& effect_transform,
+      Entity::RenderingMode rendering_mode)>;
   using MaskFilterProc = std::function<std::shared_ptr<FilterContents>(
       FilterInput::Ref,
       bool is_solid_color,
@@ -36,29 +36,25 @@ struct Paint {
     kStroke,
   };
 
-  enum class ColorSourceType {
-    kColor,
-    kImage,
-    kLinearGradient,
-    kRadialGradient,
-    kConicalGradient,
-    kSweepGradient,
-    kRuntimeEffect,
-  };
-
   struct MaskBlurDescriptor {
     FilterContents::BlurStyle style;
     Sigma sigma;
 
+    std::shared_ptr<FilterContents> CreateMaskBlur(
+        std::shared_ptr<ColorSourceContents> color_source_contents,
+        const std::shared_ptr<ColorFilter>& color_filter) const;
+
+    std::shared_ptr<FilterContents> CreateMaskBlur(
+        std::shared_ptr<TextureContents> texture_contents) const;
+
     std::shared_ptr<FilterContents> CreateMaskBlur(
         const FilterInput::Ref& input,
-        bool is_solid_color,
-        const Matrix& effect_matrix) const;
+        bool is_solid_color) const;
   };
 
   Color color = Color::Black();
-  std::optional<ColorSourceProc> color_source;
-  ColorSourceType color_source_type = ColorSourceType::kColor;
+  ColorSource color_source;
+  bool dither = false;
 
   Scalar stroke_width = 0.0;
   Cap stroke_cap = Cap::kButt;
@@ -66,26 +62,20 @@ struct Paint {
   Scalar stroke_miter = 4.0;
   Style style = Style::kFill;
   BlendMode blend_mode = BlendMode::kSourceOver;
+  bool invert_colors = false;
 
-  std::optional<ImageFilterProc> image_filter;
-  std::optional<ColorFilterProc> color_filter;
+  std::shared_ptr<ImageFilter> image_filter;
+  std::shared_ptr<ColorFilter> color_filter;
   std::optional<MaskBlurDescriptor> mask_blur_descriptor;
 
+  std::shared_ptr<ColorFilter> GetColorFilter() const;
+
   /// @brief      Wrap this paint's configured filters to the given contents.
   /// @param[in]  input           The contents to wrap with paint's filters.
-  /// @param[in]  is_solid_color  Affects mask blurring behavior. If false, use
-  ///                             the image border for mask blurring. If true,
-  ///                             do a Gaussian blur to achieve the mask
-  ///                             blurring effect for arbitrary paths. If unset,
-  ///                             use the current paint configuration to infer
-  ///                             the result.
   /// @return     The filter-wrapped contents. If there are no filters that need
   ///             to be wrapped for the current paint configuration, the
   ///             original contents is returned.
-  std::shared_ptr<Contents> WithFilters(
-      std::shared_ptr<Contents> input,
-      std::optional<bool> is_solid_color = std::nullopt,
-      const Matrix& effect_transform = Matrix()) const;
+  std::shared_ptr<Contents> WithFilters(std::shared_ptr<Contents> input) const;
 
   /// @brief      Wrap this paint's configured filters to the given contents of
   ///             subpass target.
@@ -99,23 +89,27 @@ struct Paint {
       std::shared_ptr<Contents> input,
       const Matrix& effect_transform = Matrix()) const;
 
-  std::shared_ptr<Contents> CreateContentsForEntity(const Path& path = {},
-                                                    bool cover = false) const;
-
   std::shared_ptr<Contents> CreateContentsForGeometry(
-      std::unique_ptr<Geometry> geometry) const;
+      const std::shared_ptr<Geometry>& geometry) const;
+
+  /// @brief   Whether this paint has a color filter that can apply opacity
+  bool HasColorFilter() const;
 
- private:
   std::shared_ptr<Contents> WithMaskBlur(std::shared_ptr<Contents> input,
-                                         bool is_solid_color,
-                                         const Matrix& effect_transform) const;
+                                         bool is_solid_color) const;
 
-  std::shared_ptr<Contents> WithImageFilter(
-      std::shared_ptr<Contents> input,
-      const Matrix& effect_transform) const;
+  std::shared_ptr<FilterContents> WithImageFilter(
+      const FilterInput::Variant& input,
+      const Matrix& effect_transform,
+      Entity::RenderingMode rendering_mode) const;
 
-  std::shared_ptr<Contents> WithColorFilter(std::shared_ptr<Contents> input,
-                                            bool absorb_opacity = false) const;
+ private:
+  std::shared_ptr<Contents> WithColorFilter(
+      std::shared_ptr<Contents> input,
+      ColorFilterContents::AbsorbOpacity absorb_opacity =
+          ColorFilterContents::AbsorbOpacity::kNo) const;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_AIKS_PAINT_H_
diff --git a/impeller/aiks/paint_pass_delegate.cc b/impeller/aiks/paint_pass_delegate.cc
index a06128a534ba2abe0affdeee981b7a71ae9e7a1c..34610488f5a246baacd8ea42cb484151aff913b4 100644
--- a/impeller/aiks/paint_pass_delegate.cc
+++ b/impeller/aiks/paint_pass_delegate.cc
@@ -4,22 +4,22 @@
 
 #include "impeller/aiks/paint_pass_delegate.h"
 
+#include "impeller/core/formats.h"
+#include "impeller/core/sampler_descriptor.h"
 #include "impeller/entity/contents/contents.h"
 #include "impeller/entity/contents/texture_contents.h"
-#include "impeller/geometry/path_builder.h"
+#include "impeller/entity/entity_pass.h"
+#include "impeller/geometry/color.h"
 
 namespace impeller {
 
-PaintPassDelegate::PaintPassDelegate(Paint paint, std::optional<Rect> coverage)
-    : paint_(std::move(paint)), coverage_(coverage) {}
+/// PaintPassDelegate
+/// ----------------------------------------------
 
-// |EntityPassDelgate|
-PaintPassDelegate::~PaintPassDelegate() = default;
+PaintPassDelegate::PaintPassDelegate(Paint paint) : paint_(std::move(paint)) {}
 
 // |EntityPassDelgate|
-std::optional<Rect> PaintPassDelegate::GetCoverageRect() {
-  return coverage_;
-}
+PaintPassDelegate::~PaintPassDelegate() = default;
 
 // |EntityPassDelgate|
 bool PaintPassDelegate::CanElide() {
@@ -27,7 +27,7 @@ bool PaintPassDelegate::CanElide() {
 }
 
 // |EntityPassDelgate|
-bool PaintPassDelegate::CanCollapseIntoParentPass() {
+bool PaintPassDelegate::CanCollapseIntoParentPass(EntityPass* entity_pass) {
   return false;
 }
 
@@ -37,11 +37,123 @@ std::shared_ptr<Contents> PaintPassDelegate::CreateContentsForSubpassTarget(
     const Matrix& effect_transform) {
   auto contents = TextureContents::MakeRect(Rect::MakeSize(target->GetSize()));
   contents->SetTexture(target);
+  contents->SetLabel("Subpass");
   contents->SetSourceRect(Rect::MakeSize(target->GetSize()));
   contents->SetOpacity(paint_.color.alpha);
   contents->SetDeferApplyingOpacity(true);
+
   return paint_.WithFiltersForSubpassTarget(std::move(contents),
                                             effect_transform);
 }
 
+// |EntityPassDelgate|
+std::shared_ptr<FilterContents> PaintPassDelegate::WithImageFilter(
+    const FilterInput::Variant& input,
+    const Matrix& effect_transform) const {
+  return paint_.WithImageFilter(input, effect_transform,
+                                Entity::RenderingMode::kSubpass);
+}
+
+/// OpacityPeepholePassDelegate
+/// ----------------------------------------------
+
+OpacityPeepholePassDelegate::OpacityPeepholePassDelegate(Paint paint)
+    : paint_(std::move(paint)) {}
+
+// |EntityPassDelgate|
+OpacityPeepholePassDelegate::~OpacityPeepholePassDelegate() = default;
+
+// |EntityPassDelgate|
+bool OpacityPeepholePassDelegate::CanElide() {
+  return paint_.blend_mode == BlendMode::kDestination;
+}
+
+// |EntityPassDelgate|
+bool OpacityPeepholePassDelegate::CanCollapseIntoParentPass(
+    EntityPass* entity_pass) {
+  // Passes with enforced bounds that clip the contents can not be safely
+  // collapsed.
+  if (entity_pass->GetBoundsLimitMightClipContent()) {
+    return false;
+  }
+
+  // OpacityPeepholePassDelegate will only get used if the pass's blend mode is
+  // SourceOver, so no need to check here.
+  if (paint_.color.alpha <= 0.0 || paint_.color.alpha >= 1.0 ||
+      paint_.image_filter || paint_.color_filter) {
+    return false;
+  }
+
+  // Note: determing whether any coverage intersects has quadradic complexity in
+  // the number of rectangles, and depending on whether or not we cache at
+  // different levels of the entity tree may end up cubic. In the interest of
+  // proving whether or not this optimization is valuable, we only consider very
+  // simple peephole optimizations here - where there is a single drawing
+  // command wrapped in save layer. This would indicate something like an
+  // Opacity or FadeTransition wrapping a very simple widget, like in the
+  // CupertinoPicker.
+  if (entity_pass->GetElementCount() > 3) {
+    // Single paint command with a save layer would be:
+    // 1. clip
+    // 2. draw command
+    // 3. restore.
+    return false;
+  }
+  bool all_can_accept = true;
+  std::vector<Rect> all_coverages;
+  auto had_subpass = entity_pass->IterateUntilSubpass(
+      [&all_coverages, &all_can_accept](Entity& entity) {
+        const auto& contents = entity.GetContents();
+        if (!entity.CanInheritOpacity()) {
+          all_can_accept = false;
+          return false;
+        }
+        auto maybe_coverage = contents->GetCoverage(entity);
+        if (maybe_coverage.has_value()) {
+          auto coverage = maybe_coverage.value();
+          for (const auto& cv : all_coverages) {
+            if (cv.IntersectsWithRect(coverage)) {
+              all_can_accept = false;
+              return false;
+            }
+          }
+          all_coverages.push_back(coverage);
+        }
+        return true;
+      });
+  if (had_subpass || !all_can_accept) {
+    return false;
+  }
+  auto alpha = paint_.color.alpha;
+  entity_pass->IterateUntilSubpass([&alpha](Entity& entity) {
+    entity.SetInheritedOpacity(alpha);
+    return true;
+  });
+  return true;
+}
+
+// |EntityPassDelgate|
+std::shared_ptr<Contents>
+OpacityPeepholePassDelegate::CreateContentsForSubpassTarget(
+    std::shared_ptr<Texture> target,
+    const Matrix& effect_transform) {
+  auto contents = TextureContents::MakeRect(Rect::MakeSize(target->GetSize()));
+  contents->SetLabel("Subpass");
+  contents->SetTexture(target);
+  contents->SetSourceRect(Rect::MakeSize(target->GetSize()));
+  contents->SetOpacity(paint_.color.alpha);
+  contents->SetDeferApplyingOpacity(true);
+
+  return paint_.WithFiltersForSubpassTarget(std::move(contents),
+                                            effect_transform);
+}
+
+// |EntityPassDelgate|
+std::shared_ptr<FilterContents> OpacityPeepholePassDelegate::WithImageFilter(
+    const FilterInput::Variant& input,
+    const Matrix& effect_transform) const {
+  return paint_.WithImageFilter(input, effect_transform,
+                                Entity::RenderingMode::kSubpass);
+}
+
 }  // namespace impeller
diff --git a/impeller/aiks/paint_pass_delegate.h b/impeller/aiks/paint_pass_delegate.h
index 128f7b6abb14ac802234b4fabf3897d877cf676e..6209f56bcd19067dc941ecd688bd05d9c4eea595 100644
--- a/impeller/aiks/paint_pass_delegate.h
+++ b/impeller/aiks/paint_pass_delegate.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_AIKS_PAINT_PASS_DELEGATE_H_
+#define FLUTTER_IMPELLER_AIKS_PAINT_PASS_DELEGATE_H_
 
 #include <optional>
 
@@ -14,30 +15,72 @@ namespace impeller {
 
 class PaintPassDelegate final : public EntityPassDelegate {
  public:
-  PaintPassDelegate(Paint paint, std::optional<Rect> coverage);
+  explicit PaintPassDelegate(Paint paint);
 
   // |EntityPassDelgate|
   ~PaintPassDelegate() override;
 
-  // |EntityPassDelegate|
-  std::optional<Rect> GetCoverageRect() override;
+  // |EntityPassDelgate|
+  bool CanElide() override;
+
+  // |EntityPassDelgate|
+  bool CanCollapseIntoParentPass(EntityPass* entity_pass) override;
+
+  // |EntityPassDelgate|
+  std::shared_ptr<Contents> CreateContentsForSubpassTarget(
+      std::shared_ptr<Texture> target,
+      const Matrix& effect_transform) override;
+
+  // |EntityPassDelgate|
+  std::shared_ptr<FilterContents> WithImageFilter(
+      const FilterInput::Variant& input,
+      const Matrix& effect_transform) const override;
+
+ private:
+  const Paint paint_;
+
+  PaintPassDelegate(const PaintPassDelegate&) = delete;
+
+  PaintPassDelegate& operator=(const PaintPassDelegate&) = delete;
+};
+
+/// A delegate that attempts to forward opacity from a save layer to
+/// child contents.
+///
+/// Currently this has a hardcoded limit of 3 entities in a pass, and
+/// cannot forward to child subpass delegates.
+class OpacityPeepholePassDelegate final : public EntityPassDelegate {
+ public:
+  explicit OpacityPeepholePassDelegate(Paint paint);
+
+  // |EntityPassDelgate|
+  ~OpacityPeepholePassDelegate() override;
 
   // |EntityPassDelgate|
   bool CanElide() override;
 
   // |EntityPassDelgate|
-  bool CanCollapseIntoParentPass() override;
+  bool CanCollapseIntoParentPass(EntityPass* entity_pass) override;
 
   // |EntityPassDelgate|
   std::shared_ptr<Contents> CreateContentsForSubpassTarget(
       std::shared_ptr<Texture> target,
       const Matrix& effect_transform) override;
 
+  // |EntityPassDelgate|
+  std::shared_ptr<FilterContents> WithImageFilter(
+      const FilterInput::Variant& input,
+      const Matrix& effect_transform) const override;
+
  private:
   const Paint paint_;
-  const std::optional<Rect> coverage_;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(PaintPassDelegate);
+  OpacityPeepholePassDelegate(const OpacityPeepholePassDelegate&) = delete;
+
+  OpacityPeepholePassDelegate& operator=(const OpacityPeepholePassDelegate&) =
+      delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_AIKS_PAINT_PASS_DELEGATE_H_
diff --git a/impeller/aiks/picture.cc b/impeller/aiks/picture.cc
index 29737411c0740e77e478f31352c654c4214179e9..64ea0c19aea7ab993c7a6b10bfa6b6091352282f 100644
--- a/impeller/aiks/picture.cc
+++ b/impeller/aiks/picture.cc
@@ -20,15 +20,16 @@ std::optional<Snapshot> Picture::Snapshot(AiksContext& context) {
     return std::nullopt;
   }
 
-  const auto translate = Matrix::MakeTranslation(-coverage.value().origin);
+  const auto translate = Matrix::MakeTranslation(-coverage->GetOrigin());
   auto texture =
-      RenderToTexture(context, ISize(coverage.value().size), translate);
+      RenderToTexture(context, ISize(coverage->GetSize()), translate);
   return impeller::Snapshot{
       .texture = std::move(texture),
-      .transform = Matrix::MakeTranslation(coverage.value().origin)};
+      .transform = Matrix::MakeTranslation(coverage->GetOrigin())};
 }
 
-std::shared_ptr<Image> Picture::ToImage(AiksContext& context, ISize size) {
+std::shared_ptr<Image> Picture::ToImage(AiksContext& context,
+                                        ISize size) const {
   if (size.IsEmpty()) {
     return nullptr;
   }
@@ -39,32 +40,49 @@ std::shared_ptr<Image> Picture::ToImage(AiksContext& context, ISize size) {
 std::shared_ptr<Texture> Picture::RenderToTexture(
     AiksContext& context,
     ISize size,
-    std::optional<const Matrix> translate) {
+    std::optional<const Matrix> translate) const {
   FML_DCHECK(!size.IsEmpty());
 
   pass->IterateAllEntities([&translate](auto& entity) -> bool {
     auto matrix = translate.has_value()
-                      ? translate.value() * entity.GetTransformation()
-                      : entity.GetTransformation();
-    entity.SetTransformation(matrix);
+                      ? translate.value() * entity.GetTransform()
+                      : entity.GetTransform();
+    entity.SetTransform(matrix);
     return true;
   });
 
   // This texture isn't host visible, but we might want to add host visible
   // features to Image someday.
-  auto impeller_context = context.GetContext();
+  const std::shared_ptr<Context>& impeller_context = context.GetContext();
+  // Do not use the render target cache as the lifecycle of this texture
+  // will outlive a particular frame.
+  RenderTargetAllocator render_target_allocator =
+      RenderTargetAllocator(impeller_context->GetResourceAllocator());
   RenderTarget target;
-  if (impeller_context->SupportsOffscreenMSAA()) {
-    target = RenderTarget::CreateOffscreenMSAA(*impeller_context, size);
+  if (impeller_context->GetCapabilities()->SupportsOffscreenMSAA()) {
+    target = render_target_allocator.CreateOffscreenMSAA(
+        *impeller_context,  // context
+        size,               // size
+        /*mip_count=*/1,
+        "Picture Snapshot MSAA",  // label
+        RenderTarget::
+            kDefaultColorAttachmentConfigMSAA  // color_attachment_config
+    );
   } else {
-    target = RenderTarget::CreateOffscreen(*impeller_context, size);
+    target = render_target_allocator.CreateOffscreen(
+        *impeller_context,  // context
+        size,               // size
+        /*mip_count=*/1,
+        "Picture Snapshot",                          // label
+        RenderTarget::kDefaultColorAttachmentConfig  // color_attachment_config
+    );
   }
   if (!target.IsValid()) {
     VALIDATION_LOG << "Could not create valid RenderTarget.";
     return nullptr;
   }
 
-  if (!context.Render(*this, target)) {
+  if (!context.Render(*this, target, false)) {
     VALIDATION_LOG << "Could not render Picture to Texture.";
     return nullptr;
   }
diff --git a/impeller/aiks/picture.h b/impeller/aiks/picture.h
index 7224af3a7b1be3bf22fbfe360a4bf664bf93ad36..8419d203e972faed281694acbcfcb66c665f5fcc 100644
--- a/impeller/aiks/picture.h
+++ b/impeller/aiks/picture.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_AIKS_PICTURE_H_
+#define FLUTTER_IMPELLER_AIKS_PICTURE_H_
 
 #include <deque>
 #include <memory>
@@ -21,13 +22,15 @@ struct Picture {
 
   std::optional<Snapshot> Snapshot(AiksContext& context);
 
-  std::shared_ptr<Image> ToImage(AiksContext& context, ISize size);
+  std::shared_ptr<Image> ToImage(AiksContext& context, ISize size) const;
 
  private:
   std::shared_ptr<Texture> RenderToTexture(
       AiksContext& context,
       ISize size,
-      std::optional<const Matrix> translate = std::nullopt);
+      std::optional<const Matrix> translate = std::nullopt) const;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_AIKS_PICTURE_H_
diff --git a/impeller/aiks/picture_recorder.h b/impeller/aiks/picture_recorder.h
index 739792a2df1b54836fe5b509d25727daff683f7e..ab561d437e87ac2b3591c0f12f0d8b8381c7d43d 100644
--- a/impeller/aiks/picture_recorder.h
+++ b/impeller/aiks/picture_recorder.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_AIKS_PICTURE_RECORDER_H_
+#define FLUTTER_IMPELLER_AIKS_PICTURE_RECORDER_H_
 
 #include "flutter/fml/macros.h"
 #include "impeller/aiks/canvas.h"
@@ -25,3 +26,5 @@ class PictureRecorder {
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_AIKS_PICTURE_RECORDER_H_
diff --git a/impeller/aiks/testing/context_mock.h b/impeller/aiks/testing/context_mock.h
new file mode 100644
index 0000000000000000000000000000000000000000..424090295c0112e25b2aa80f04536ef24b2d3531
--- /dev/null
+++ b/impeller/aiks/testing/context_mock.h
@@ -0,0 +1,130 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_AIKS_TESTING_CONTEXT_MOCK_H_
+#define FLUTTER_IMPELLER_AIKS_TESTING_CONTEXT_MOCK_H_
+
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "gmock/gmock-function-mocker.h"
+#include "gmock/gmock.h"
+#include "impeller/renderer/command_buffer.h"
+#include "impeller/renderer/context.h"
+#include "impeller/renderer/render_target.h"
+
+namespace impeller {
+namespace testing {
+
+class CommandBufferMock : public CommandBuffer {
+ public:
+  explicit CommandBufferMock(std::weak_ptr<const Context> context)
+      : CommandBuffer(std::move(context)) {}
+
+  MOCK_METHOD(bool, IsValid, (), (const, override));
+
+  MOCK_METHOD(void, SetLabel, (const std::string& label), (const, override));
+
+  MOCK_METHOD(std::shared_ptr<RenderPass>,
+              OnCreateRenderPass,
+              (RenderTarget render_target),
+              (override));
+
+  static std::shared_ptr<RenderPass> ForwardOnCreateRenderPass(
+      CommandBuffer* command_buffer,
+      const RenderTarget& render_target) {
+    return command_buffer->OnCreateRenderPass(render_target);
+  }
+
+  MOCK_METHOD(std::shared_ptr<BlitPass>, OnCreateBlitPass, (), (override));
+  static std::shared_ptr<BlitPass> ForwardOnCreateBlitPass(
+      CommandBuffer* command_buffer) {
+    return command_buffer->OnCreateBlitPass();
+  }
+
+  MOCK_METHOD(bool,
+              OnSubmitCommands,
+              (CompletionCallback callback),
+              (override));
+  static bool ForwardOnSubmitCommands(CommandBuffer* command_buffer,
+                                      CompletionCallback callback) {
+    return command_buffer->OnSubmitCommands(std::move(callback));
+  }
+
+  MOCK_METHOD(void, OnWaitUntilScheduled, (), (override));
+  static void ForwardOnWaitUntilScheduled(CommandBuffer* command_buffer) {
+    return command_buffer->OnWaitUntilScheduled();
+  }
+
+  MOCK_METHOD(std::shared_ptr<ComputePass>,
+              OnCreateComputePass,
+              (),
+              (override));
+  static std::shared_ptr<ComputePass> ForwardOnCreateComputePass(
+      CommandBuffer* command_buffer) {
+    return command_buffer->OnCreateComputePass();
+  }
+};
+
+class ContextMock : public Context {
+ public:
+  MOCK_METHOD(std::string, DescribeGpuModel, (), (const, override));
+
+  MOCK_METHOD(Context::BackendType, GetBackendType, (), (const, override));
+
+  MOCK_METHOD(bool, IsValid, (), (const, override));
+
+  MOCK_METHOD(const std::shared_ptr<const Capabilities>&,
+              GetCapabilities,
+              (),
+              (const, override));
+
+  MOCK_METHOD(bool,
+              UpdateOffscreenLayerPixelFormat,
+              (PixelFormat format),
+              (override));
+
+  MOCK_METHOD(std::shared_ptr<Allocator>,
+              GetResourceAllocator,
+              (),
+              (const, override));
+
+  MOCK_METHOD(std::shared_ptr<ShaderLibrary>,
+              GetShaderLibrary,
+              (),
+              (const, override));
+
+  MOCK_METHOD(std::shared_ptr<SamplerLibrary>,
+              GetSamplerLibrary,
+              (),
+              (const, override));
+
+  MOCK_METHOD(std::shared_ptr<PipelineLibrary>,
+              GetPipelineLibrary,
+              (),
+              (const, override));
+
+  MOCK_METHOD(std::shared_ptr<CommandBuffer>,
+              CreateCommandBuffer,
+              (),
+              (const, override));
+
+  MOCK_METHOD(std::shared_ptr<CommandQueue>,
+              GetCommandQueue,
+              (),
+              (const override));
+
+  MOCK_METHOD(void, Shutdown, (), (override));
+
+  MOCK_METHOD(void,
+              InitializeCommonlyUsedShadersIfNeeded,
+              (),
+              (const, override));
+};
+
+}  // namespace testing
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_AIKS_TESTING_CONTEXT_MOCK_H_
diff --git a/impeller/aiks/testing/context_spy.cc b/impeller/aiks/testing/context_spy.cc
new file mode 100644
index 0000000000000000000000000000000000000000..bb3d528eea14491f27f25de0e971ff1350151a6d
--- /dev/null
+++ b/impeller/aiks/testing/context_spy.cc
@@ -0,0 +1,130 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <memory>
+#include "impeller/renderer/command_buffer.h"
+#include "impeller/renderer/command_queue.h"
+
+#include "impeller/aiks/testing/context_spy.h"
+
+namespace impeller {
+namespace testing {
+
+fml::Status NoopCommandQueue::Submit(
+    const std::vector<std::shared_ptr<CommandBuffer>>& buffers,
+    const CompletionCallback& completion_callback) {
+  if (completion_callback) {
+    completion_callback(CommandBuffer::Status::kCompleted);
+  }
+  return fml::Status();
+}
+
+std::shared_ptr<ContextSpy> ContextSpy::Make() {
+  return std::shared_ptr<ContextSpy>(new ContextSpy());
+}
+
+std::shared_ptr<ContextMock> ContextSpy::MakeContext(
+    const std::shared_ptr<Context>& real_context) {
+  std::shared_ptr<ContextMock> mock_context =
+      std::make_shared<::testing::NiceMock<ContextMock>>();
+  std::shared_ptr<ContextSpy> shared_this = shared_from_this();
+
+  ON_CALL(*mock_context, IsValid).WillByDefault([real_context]() {
+    return real_context->IsValid();
+  });
+
+  ON_CALL(*mock_context, GetBackendType)
+      .WillByDefault([real_context]() -> Context::BackendType {
+        return real_context->GetBackendType();
+      });
+
+  ON_CALL(*mock_context, GetCapabilities)
+      .WillByDefault(
+          [real_context]() -> const std::shared_ptr<const Capabilities>& {
+            return real_context->GetCapabilities();
+          });
+
+  ON_CALL(*mock_context, UpdateOffscreenLayerPixelFormat)
+      .WillByDefault([real_context](PixelFormat format) {
+        return real_context->UpdateOffscreenLayerPixelFormat(format);
+      });
+
+  ON_CALL(*mock_context, GetResourceAllocator).WillByDefault([real_context]() {
+    return real_context->GetResourceAllocator();
+  });
+
+  ON_CALL(*mock_context, GetShaderLibrary).WillByDefault([real_context]() {
+    return real_context->GetShaderLibrary();
+  });
+
+  ON_CALL(*mock_context, GetSamplerLibrary).WillByDefault([real_context]() {
+    return real_context->GetSamplerLibrary();
+  });
+
+  ON_CALL(*mock_context, GetPipelineLibrary).WillByDefault([real_context]() {
+    return real_context->GetPipelineLibrary();
+  });
+
+  ON_CALL(*mock_context, GetCommandQueue).WillByDefault([shared_this]() {
+    return shared_this->command_queue_;
+  });
+
+  ON_CALL(*mock_context, CreateCommandBuffer)
+      .WillByDefault([real_context, shared_this]() {
+        auto real_buffer = real_context->CreateCommandBuffer();
+        auto spy = std::make_shared<::testing::NiceMock<CommandBufferMock>>(
+            real_context);
+
+        ON_CALL(*spy, IsValid).WillByDefault([real_buffer]() {
+          return real_buffer->IsValid();
+        });
+
+        ON_CALL(*spy, SetLabel)
+            .WillByDefault([real_buffer](const std::string& label) {
+              return real_buffer->SetLabel(label);
+            });
+
+        ON_CALL(*spy, OnCreateRenderPass)
+            .WillByDefault([real_buffer, shared_this,
+                            real_context](const RenderTarget& render_target) {
+              std::shared_ptr<RenderPass> result =
+                  CommandBufferMock::ForwardOnCreateRenderPass(
+                      real_buffer.get(), render_target);
+              std::shared_ptr<RecordingRenderPass> recorder =
+                  std::make_shared<RecordingRenderPass>(result, real_context,
+                                                        render_target);
+              shared_this->render_passes_.push_back(recorder);
+              return recorder;
+            });
+
+        ON_CALL(*spy, OnCreateBlitPass).WillByDefault([real_buffer]() {
+          return CommandBufferMock::ForwardOnCreateBlitPass(real_buffer.get());
+        });
+
+        ON_CALL(*spy, OnSubmitCommands)
+            .WillByDefault(
+                [real_buffer](CommandBuffer::CompletionCallback callback) {
+                  return CommandBufferMock::ForwardOnSubmitCommands(
+                      real_buffer.get(), std::move(callback));
+                });
+
+        ON_CALL(*spy, OnWaitUntilScheduled).WillByDefault([real_buffer]() {
+          return CommandBufferMock::ForwardOnWaitUntilScheduled(
+              real_buffer.get());
+        });
+
+        ON_CALL(*spy, OnCreateComputePass).WillByDefault([real_buffer]() {
+          return CommandBufferMock::ForwardOnCreateComputePass(
+              real_buffer.get());
+        });
+
+        return spy;
+      });
+
+  return mock_context;
+}
+
+}  // namespace testing
+
+}  // namespace impeller
diff --git a/impeller/aiks/testing/context_spy.h b/impeller/aiks/testing/context_spy.h
new file mode 100644
index 0000000000000000000000000000000000000000..c4fb6c84fa9475b97b3fdfc96482f96afccdaa2e
--- /dev/null
+++ b/impeller/aiks/testing/context_spy.h
@@ -0,0 +1,45 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_AIKS_TESTING_CONTEXT_SPY_H_
+#define FLUTTER_IMPELLER_AIKS_TESTING_CONTEXT_SPY_H_
+
+#include <memory>
+
+#include "impeller/aiks/testing/context_mock.h"
+#include "impeller/entity/contents/test/recording_render_pass.h"
+#include "impeller/renderer/command_queue.h"
+
+namespace impeller {
+namespace testing {
+
+class NoopCommandQueue : public CommandQueue {
+ public:
+  fml::Status Submit(
+      const std::vector<std::shared_ptr<CommandBuffer>>& buffers,
+      const CompletionCallback& completion_callback = {}) override;
+};
+
+/// Forwards calls to a real Context but can store information about how
+/// the Context was used.
+class ContextSpy : public std::enable_shared_from_this<ContextSpy> {
+ public:
+  static std::shared_ptr<ContextSpy> Make();
+
+  std::shared_ptr<ContextMock> MakeContext(
+      const std::shared_ptr<Context>& real_context);
+
+  std::vector<std::shared_ptr<RecordingRenderPass>> render_passes_;
+  std::shared_ptr<CommandQueue> command_queue_ =
+      std::make_shared<NoopCommandQueue>();
+
+ private:
+  ContextSpy() = default;
+};
+
+}  // namespace testing
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_AIKS_TESTING_CONTEXT_SPY_H_
diff --git a/impeller/aiks/trace_serializer.cc b/impeller/aiks/trace_serializer.cc
new file mode 100644
index 0000000000000000000000000000000000000000..7600760406b1b434da72ce805527b737a6205dc9
--- /dev/null
+++ b/impeller/aiks/trace_serializer.cc
@@ -0,0 +1,265 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/aiks/trace_serializer.h"
+#include "flutter/fml/logging.h"
+
+namespace impeller {
+
+namespace {
+
+class ImageFilterTraceVisitor : public ImageFilterVisitor {
+ public:
+  explicit ImageFilterTraceVisitor(std::ostream& os) : os_(os) {}
+  void Visit(const BlurImageFilter& filter) override {
+    os_ << "BlurImageFilter";
+  }
+  void Visit(const LocalMatrixImageFilter& filter) override {
+    os_ << "LocalMatrixImageFilter";
+  }
+  void Visit(const DilateImageFilter& filter) override {
+    os_ << "DilateImageFilter";
+  }
+  void Visit(const ErodeImageFilter& filter) override {
+    os_ << "ErodeImageFilter";
+  }
+  void Visit(const MatrixImageFilter& filter) override {
+    os_ << "{MatrixImageFilter matrix: " << filter.GetMatrix() << "}";
+  }
+  void Visit(const ComposeImageFilter& filter) override {
+    os_ << "ComposeImageFilter";
+  }
+  void Visit(const ColorImageFilter& filter) override {
+    os_ << "ColorImageFilter";
+  }
+
+ private:
+  std::ostream& os_;
+};
+
+std::ostream& operator<<(std::ostream& os,
+                         const std::shared_ptr<ImageFilter>& image_filter) {
+  if (image_filter) {
+    os << "[";
+    ImageFilterTraceVisitor visitor(os);
+    image_filter->Visit(visitor);
+    os << "]";
+  } else {
+    os << "[None]";
+  }
+  return os;
+}
+
+std::ostream& operator<<(std::ostream& os, const ColorSource& color_source) {
+  os << "{ type: ";
+  switch (color_source.GetType()) {
+    case ColorSource::Type::kColor:
+      os << "kColor";
+      break;
+    case ColorSource::Type::kImage:
+      os << "kImage";
+      break;
+    case ColorSource::Type::kLinearGradient:
+      os << "kLinearGradient";
+      break;
+    case ColorSource::Type::kRadialGradient:
+      os << "kRadialGradient";
+      break;
+    case ColorSource::Type::kConicalGradient:
+      os << "kConicalGradient";
+      break;
+    case ColorSource::Type::kSweepGradient:
+      os << "kSweepGradient";
+      break;
+    case ColorSource::Type::kRuntimeEffect:
+      os << "kRuntimeEffect";
+      break;
+    case ColorSource::Type::kScene:
+      os << "kScene";
+      break;
+  }
+  os << " }";
+  return os;
+}
+
+std::ostream& operator<<(std::ostream& os, const Paint& paint) {
+  os << "{" << std::endl;
+  os << "  color: [" << paint.color << "]" << std::endl;
+  os << "  color_source:" << "[" << paint.color_source << "]" << std::endl;
+  os << "  dither: [" << paint.dither << "]" << std::endl;
+  os << "  stroke_width: [" << paint.stroke_width << "]" << std::endl;
+  os << "  stroke_cap: " << "[Paint::Cap]" << std::endl;
+  os << "  stroke_join: " << "[Paint::Join]" << std::endl;
+  os << "  stroke_miter: [" << paint.stroke_miter << "]" << std::endl;
+  os << "  style:" << "[Paint::Style]" << std::endl;
+  os << "  blend_mode: [" << BlendModeToString(paint.blend_mode) << "]"
+     << std::endl;
+  os << "  invert_colors: [" << paint.invert_colors << "]" << std::endl;
+  os << "  image_filter: " << paint.image_filter << std::endl;
+  os << "  color_filter: " << paint.color_filter << std::endl;
+  os << "  mask_blur_descriptor: " << "[std::optional<MaskBlurDescriptor>]"
+     << std::endl;
+  os << "}";
+  return os;
+}
+}  // namespace
+
+#define FLT_CANVAS_RECORDER_OP_TO_STRING(name) \
+  case CanvasRecorderOp::name:                 \
+    return #name
+
+namespace {
+std::string_view CanvasRecorderOpToString(CanvasRecorderOp op) {
+  switch (op) {
+    FLT_CANVAS_RECORDER_OP_TO_STRING(kNew);
+    FLT_CANVAS_RECORDER_OP_TO_STRING(kSave);
+    FLT_CANVAS_RECORDER_OP_TO_STRING(kSaveLayer);
+    FLT_CANVAS_RECORDER_OP_TO_STRING(kRestore);
+    FLT_CANVAS_RECORDER_OP_TO_STRING(kRestoreToCount);
+    FLT_CANVAS_RECORDER_OP_TO_STRING(kResetTransform);
+    FLT_CANVAS_RECORDER_OP_TO_STRING(kTransform);
+    FLT_CANVAS_RECORDER_OP_TO_STRING(kConcat);
+    FLT_CANVAS_RECORDER_OP_TO_STRING(kPreConcat);
+    FLT_CANVAS_RECORDER_OP_TO_STRING(kTranslate);
+    FLT_CANVAS_RECORDER_OP_TO_STRING(kScale2);
+    FLT_CANVAS_RECORDER_OP_TO_STRING(kScale3);
+    FLT_CANVAS_RECORDER_OP_TO_STRING(kSkew);
+    FLT_CANVAS_RECORDER_OP_TO_STRING(kRotate);
+    FLT_CANVAS_RECORDER_OP_TO_STRING(kDrawPath);
+    FLT_CANVAS_RECORDER_OP_TO_STRING(kDrawPaint);
+    FLT_CANVAS_RECORDER_OP_TO_STRING(kDrawLine);
+    FLT_CANVAS_RECORDER_OP_TO_STRING(kDrawRect);
+    FLT_CANVAS_RECORDER_OP_TO_STRING(kDrawOval);
+    FLT_CANVAS_RECORDER_OP_TO_STRING(kDrawRRect);
+    FLT_CANVAS_RECORDER_OP_TO_STRING(kDrawCircle);
+    FLT_CANVAS_RECORDER_OP_TO_STRING(kDrawPoints);
+    FLT_CANVAS_RECORDER_OP_TO_STRING(kDrawImage);
+    FLT_CANVAS_RECORDER_OP_TO_STRING(kDrawImageRect);
+    FLT_CANVAS_RECORDER_OP_TO_STRING(kClipPath);
+    FLT_CANVAS_RECORDER_OP_TO_STRING(kClipRect);
+    FLT_CANVAS_RECORDER_OP_TO_STRING(kClipOval);
+    FLT_CANVAS_RECORDER_OP_TO_STRING(kClipRRect);
+    FLT_CANVAS_RECORDER_OP_TO_STRING(kDrawTextFrame);
+    FLT_CANVAS_RECORDER_OP_TO_STRING(kDrawVertices);
+    FLT_CANVAS_RECORDER_OP_TO_STRING(kDrawAtlas);
+  }
+}
+}  // namespace
+
+TraceSerializer::TraceSerializer() {}
+
+void TraceSerializer::Write(CanvasRecorderOp op) {
+  if (op == CanvasRecorderOp::kNew) {
+    FML_LOG(ERROR) << "######################################################";
+  } else {
+    FML_LOG(ERROR) << CanvasRecorderOpToString(op) << ":" << buffer_.str();
+    buffer_.str("");
+    buffer_.clear();
+  }
+}
+
+void TraceSerializer::Write(const Paint& paint) {
+  buffer_ << "[" << paint << "] ";
+}
+
+void TraceSerializer::Write(const std::optional<Rect> optional_rect) {
+  if (optional_rect.has_value()) {
+    buffer_ << "[" << optional_rect.value() << "] ";
+  } else {
+    buffer_ << "[None] ";
+  }
+}
+
+void TraceSerializer::Write(const std::shared_ptr<ImageFilter>& image_filter) {
+  buffer_ << image_filter << " ";
+}
+
+void TraceSerializer::Write(size_t size) {
+  buffer_ << "[" << size << "] ";
+}
+
+void TraceSerializer::Write(const Matrix& matrix) {
+  buffer_ << "[" << matrix << "] ";
+}
+
+void TraceSerializer::Write(const Vector3& vec3) {
+  buffer_ << "[" << vec3 << "] ";
+}
+
+void TraceSerializer::Write(const Vector2& vec2) {
+  buffer_ << "[" << vec2 << "] ";
+}
+
+void TraceSerializer::Write(const Radians& radians) {
+  buffer_ << "[" << radians.radians << "] ";
+}
+
+void TraceSerializer::Write(const Path& path) {
+  buffer_ << "[Path] ";
+}
+
+void TraceSerializer::Write(const std::vector<Point>& points) {
+  buffer_ << "[std::vector<Point>] ";
+}
+
+void TraceSerializer::Write(const PointStyle& point_style) {
+  buffer_ << "[PointStyle] ";
+}
+
+void TraceSerializer::Write(const std::shared_ptr<Image>& image) {
+  buffer_ << "[std::shared_ptr<Image>] ";
+}
+
+void TraceSerializer::Write(const SamplerDescriptor& sampler) {
+  buffer_ << "[SamplerDescriptor] ";
+}
+
+void TraceSerializer::Write(const Entity::ClipOperation& clip_op) {
+  switch (clip_op) {
+    case Entity::ClipOperation::kDifference:
+      buffer_ << "[kDifference] ";
+      break;
+    case Entity::ClipOperation::kIntersect:
+      buffer_ << "[kIntersect] ";
+      break;
+  }
+}
+
+void TraceSerializer::Write(const Picture& clip_op) {
+  buffer_ << "[Picture] ";
+}
+
+void TraceSerializer::Write(const std::shared_ptr<TextFrame>& text_frame) {
+  buffer_ << "[std::shared_ptr<TextFrame>] ";
+}
+
+void TraceSerializer::Write(const std::shared_ptr<VerticesGeometry>& vertices) {
+  buffer_ << "[std::shared_ptr<VerticesGeometry>] ";
+}
+
+void TraceSerializer::Write(const BlendMode& blend_mode) {
+  buffer_ << "[" << BlendModeToString(blend_mode) << "] ";
+}
+
+void TraceSerializer::Write(const std::vector<Matrix>& matrices) {
+  buffer_ << "[std::vector<Matrix>] ";
+}
+
+void TraceSerializer::Write(const std::vector<Rect>& matrices) {
+  buffer_ << "[std::vector<Rect>] ";
+}
+
+void TraceSerializer::Write(const std::vector<Color>& matrices) {
+  buffer_ << "[std::vector<Color>] ";
+}
+
+void TraceSerializer::Write(const SourceRectConstraint& src_rect_constraint) {
+  buffer_ << "[SourceRectConstraint] ";
+}
+
+void TraceSerializer::Write(const ContentBoundsPromise& promise) {
+  buffer_ << "[SaveLayerBoundsPromise]";
+}
+
+}  // namespace impeller
diff --git a/impeller/aiks/trace_serializer.h b/impeller/aiks/trace_serializer.h
new file mode 100644
index 0000000000000000000000000000000000000000..32abcdcddcdb438844a9170ad77850aedb38821d
--- /dev/null
+++ b/impeller/aiks/trace_serializer.h
@@ -0,0 +1,71 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_AIKS_TRACE_SERIALIZER_H_
+#define FLUTTER_IMPELLER_AIKS_TRACE_SERIALIZER_H_
+
+#include <iostream>
+#include "impeller/aiks/canvas_recorder.h"
+
+namespace impeller {
+
+class TraceSerializer {
+ public:
+  TraceSerializer();
+
+  void Write(CanvasRecorderOp op);
+
+  void Write(const Paint& paint);
+
+  void Write(const std::optional<Rect> optional_rect);
+
+  void Write(const std::shared_ptr<ImageFilter>& image_filter);
+
+  void Write(size_t size);
+
+  void Write(const Matrix& matrix);
+
+  void Write(const Vector3& vec3);
+
+  void Write(const Vector2& vec2);
+
+  void Write(const Radians& vec2);
+
+  void Write(const Path& path);
+
+  void Write(const std::vector<Point>& points);
+
+  void Write(const PointStyle& point_style);
+
+  void Write(const std::shared_ptr<Image>& image);
+
+  void Write(const SamplerDescriptor& sampler);
+
+  void Write(const Entity::ClipOperation& clip_op);
+
+  void Write(const Picture& clip_op);
+
+  void Write(const std::shared_ptr<TextFrame>& text_frame);
+
+  void Write(const std::shared_ptr<VerticesGeometry>& vertices);
+
+  void Write(const BlendMode& blend_mode);
+
+  void Write(const std::vector<Matrix>& matrices);
+
+  void Write(const std::vector<Rect>& matrices);
+
+  void Write(const std::vector<Color>& matrices);
+
+  void Write(const SourceRectConstraint& src_rect_constraint);
+
+  void Write(const ContentBoundsPromise& promise);
+
+ private:
+  std::stringstream buffer_;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_AIKS_TRACE_SERIALIZER_H_
diff --git a/impeller/archivist/archivist_fixture.h b/impeller/aiks/trace_serializer_unittests.cc
similarity index 40%
rename from impeller/archivist/archivist_fixture.h
rename to impeller/aiks/trace_serializer_unittests.cc
index 2f444add6bdd2bdf122863c1466afc9e4538c3f5..8bfaa47629becb39b9e31c26ec8b6663c0da25bb 100644
--- a/impeller/archivist/archivist_fixture.h
+++ b/impeller/aiks/trace_serializer_unittests.cc
@@ -2,35 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
-
-#include "flutter/fml/macros.h"
+#include <sstream>
 #include "flutter/testing/testing.h"
-
+#include "impeller/aiks/trace_serializer.h"
 namespace impeller {
 namespace testing {
 
-class ArchivistFixture : public ::testing::Test {
- public:
-  ArchivistFixture();
-
-  ~ArchivistFixture();
-
-  // |::testing::Test|
-  void SetUp() override;
-
-  // |::testing::Test|
-  void TearDown() override;
-
-  const std::string GetArchiveFileName() const;
-
- private:
-  std::string archive_file_name_;
-
-  void DeleteArchiveFile() const;
-
-  FML_DISALLOW_COPY_AND_ASSIGN(ArchivistFixture);
-};
+TEST(TraceSerializer, Save) {
+  CanvasRecorder<TraceSerializer> recorder;
+  std::ostringstream ss;
+  fml::LogMessage::CaptureNextLog(&ss);
+  recorder.Save();
+  ASSERT_TRUE(ss.str().size() > 0);
+}
 
 }  // namespace testing
 }  // namespace impeller
diff --git a/impeller/archivist/BUILD.gn b/impeller/archivist/BUILD.gn
deleted file mode 100644
index 92b9402c9e3d32448b30d0e098b1ce2cebc96343..0000000000000000000000000000000000000000
--- a/impeller/archivist/BUILD.gn
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2013 The Flutter Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("../tools/impeller.gni")
-
-impeller_component("archivist") {
-  public = [
-    "archivable.h",
-    "archive.h",
-    "archive_location.h",
-  ]
-
-  sources = [
-    "archivable.cc",
-    "archivable.h",
-    "archive.cc",
-    "archive.h",
-    "archive_class_registration.cc",
-    "archive_class_registration.h",
-    "archive_database.cc",
-    "archive_database.h",
-    "archive_location.cc",
-    "archive_statement.cc",
-    "archive_statement.h",
-    "archive_transaction.cc",
-    "archive_transaction.h",
-    "archive_vector.cc",
-    "archive_vector.h",
-  ]
-
-  public_deps = [ "../base" ]
-
-  deps = [
-    "//flutter/fml",
-    "//third_party/sqlite",
-  ]
-}
-
-impeller_component("archivist_unittests") {
-  testonly = true
-  sources = [
-    "archivist_fixture.cc",
-    "archivist_fixture.h",
-    "archivist_unittests.cc",
-  ]
-  deps = [
-    ":archivist",
-    "//flutter/testing",
-  ]
-}
diff --git a/impeller/archivist/archive.cc b/impeller/archivist/archive.cc
deleted file mode 100644
index 022b30de51485e4f5c249e6c94d936b3b76b4cf5..0000000000000000000000000000000000000000
--- a/impeller/archivist/archive.cc
+++ /dev/null
@@ -1,175 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "impeller/archivist/archive.h"
-
-#include <iterator>
-
-#include "flutter/fml/logging.h"
-#include "impeller/archivist/archive_class_registration.h"
-#include "impeller/archivist/archive_database.h"
-#include "impeller/archivist/archive_location.h"
-#include "impeller/base/validation.h"
-
-namespace impeller {
-
-Archive::Archive(const std::string& path)
-    : database_(std::make_unique<ArchiveDatabase>(path)) {}
-
-Archive::~Archive() {
-  FML_DCHECK(transaction_count_ == 0)
-      << "There must be no pending transactions";
-}
-
-bool Archive::IsValid() const {
-  return database_->IsValid();
-}
-
-std::optional<int64_t /* row id */> Archive::ArchiveInstance(
-    const ArchiveDef& definition,
-    const Archivable& archivable) {
-  if (!IsValid()) {
-    return std::nullopt;
-  }
-
-  auto transaction = database_->CreateTransaction(transaction_count_);
-
-  const auto* registration =
-      database_->GetRegistrationForDefinition(definition);
-
-  if (registration == nullptr) {
-    return std::nullopt;
-  }
-
-  auto statement = registration->CreateInsertStatement();
-
-  if (!statement.IsValid() || !statement.Reset()) {
-    /*
-     *  Must be able to reset the statement for a new write
-     */
-    return std::nullopt;
-  }
-
-  auto primary_key = archivable.GetPrimaryKey();
-
-  /*
-   *  The lifecycle of the archive item is tied to this scope and there is no
-   *  way for the user to create an instance of an archive item. So its safe
-   *  for its members to be references. It does not manage the lifetimes of
-   *  anything.
-   */
-  ArchiveLocation item(*this, statement, *registration, primary_key);
-
-  /*
-   *  If the item provides its own primary key, we need to bind it now.
-   * Otherwise, one will be automatically assigned to it.
-   */
-  if (primary_key.has_value() &&
-      !statement.WriteValue(ArchiveClassRegistration::kPrimaryKeyIndex,
-                            primary_key.value())) {
-    return std::nullopt;
-  }
-
-  if (!archivable.Write(item)) {
-    return std::nullopt;
-  }
-
-  if (statement.Execute() != ArchiveStatement::Result::kDone) {
-    return std::nullopt;
-  }
-
-  int64_t lastInsert = database_->GetLastInsertRowID();
-
-  if (primary_key.has_value() &&
-      lastInsert != static_cast<int64_t>(primary_key.value())) {
-    return std::nullopt;
-  }
-
-  /*
-   *  If any of the nested calls fail, we would have already checked for the
-   *  failure and returned.
-   */
-  transaction.MarkWritesAsReadyForCommit();
-
-  return lastInsert;
-}
-
-bool Archive::UnarchiveInstance(const ArchiveDef& definition,
-                                PrimaryKey name,
-                                Archivable& archivable) {
-  UnarchiveStep stepper = [&archivable](ArchiveLocation& item) {
-    archivable.Read(item);
-    return false /* no-more after single read */;
-  };
-
-  return UnarchiveInstances(definition, stepper, name) == 1;
-}
-
-size_t Archive::UnarchiveInstances(const ArchiveDef& definition,
-                                   const Archive::UnarchiveStep& stepper,
-                                   PrimaryKey primary_key) {
-  if (!IsValid()) {
-    return 0;
-  }
-
-  const auto* registration =
-      database_->GetRegistrationForDefinition(definition);
-
-  if (registration == nullptr) {
-    return 0;
-  }
-
-  const bool isQueryingSingle = primary_key.has_value();
-
-  auto statement = registration->CreateQueryStatement(isQueryingSingle);
-
-  if (!statement.IsValid() || !statement.Reset()) {
-    return 0;
-  }
-
-  if (isQueryingSingle) {
-    /*
-     *  If a single statement is being queried for, bind the primary key as a
-     * statement argument.
-     */
-    if (!statement.WriteValue(ArchiveClassRegistration::kPrimaryKeyIndex,
-                              primary_key.value())) {
-      return 0;
-    }
-  }
-
-  if (statement.GetColumnCount() !=
-      registration->GetMemberCount() + 1 /* primary key */) {
-    return 0;
-  }
-
-  /*
-   *  Acquire a transaction but never mark it successful since we will never
-   *  be committing any writes to the database during unarchiving.
-   */
-  auto transaction = database_->CreateTransaction(transaction_count_);
-
-  size_t itemsRead = 0;
-
-  while (statement.Execute() == ArchiveStatement::Result::kRow) {
-    itemsRead++;
-
-    /*
-     *  Prepare a fresh archive item for the given statement
-     */
-    ArchiveLocation item(*this, statement, *registration, primary_key);
-
-    if (!stepper(item)) {
-      break;
-    }
-
-    if (isQueryingSingle) {
-      break;
-    }
-  }
-
-  return itemsRead;
-}
-
-}  // namespace impeller
diff --git a/impeller/archivist/archive.h b/impeller/archivist/archive.h
deleted file mode 100644
index a8907935317f72cde04e51c0832ec9a47c66c8d6..0000000000000000000000000000000000000000
--- a/impeller/archivist/archive.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#pragma once
-
-#include <functional>
-#include <memory>
-#include <optional>
-#include <string>
-#include <type_traits>
-#include <vector>
-
-#include "flutter/fml/macros.h"
-#include "impeller/archivist/archivable.h"
-
-namespace impeller {
-
-class ArchiveLocation;
-class ArchiveDatabase;
-
-class Archive {
- public:
-  Archive(const std::string& path);
-
-  ~Archive();
-
-  bool IsValid() const;
-
-  template <class T,
-            class = std::enable_if_t<std::is_base_of<Archivable, T>::value>>
-  [[nodiscard]] bool Write(const T& archivable) {
-    const ArchiveDef& def = T::kArchiveDefinition;
-    return ArchiveInstance(def, archivable).has_value();
-  }
-
-  template <class T,
-            class = std::enable_if_t<std::is_base_of<Archivable, T>::value>>
-  [[nodiscard]] bool Read(PrimaryKey name, T& archivable) {
-    const ArchiveDef& def = T::kArchiveDefinition;
-    return UnarchiveInstance(def, name, archivable);
-  }
-
-  using UnarchiveStep = std::function<bool(ArchiveLocation&)>;
-
-  template <class T,
-            class = std::enable_if_t<std::is_base_of<Archivable, T>::value>>
-  [[nodiscard]] size_t Read(UnarchiveStep stepper) {
-    const ArchiveDef& def = T::kArchiveDefinition;
-    return UnarchiveInstances(def, stepper);
-  }
-
- private:
-  std::unique_ptr<ArchiveDatabase> database_;
-  int64_t transaction_count_ = 0;
-
-  friend class ArchiveLocation;
-
-  std::optional<int64_t /* row id */> ArchiveInstance(
-      const ArchiveDef& definition,
-      const Archivable& archivable);
-
-  bool UnarchiveInstance(const ArchiveDef& definition,
-                         PrimaryKey name,
-                         Archivable& archivable);
-
-  size_t UnarchiveInstances(const ArchiveDef& definition,
-                            const UnarchiveStep& stepper,
-                            PrimaryKey primary_key = std::nullopt);
-
-  FML_DISALLOW_COPY_AND_ASSIGN(Archive);
-};
-
-}  // namespace impeller
diff --git a/impeller/archivist/archive_class_registration.cc b/impeller/archivist/archive_class_registration.cc
deleted file mode 100644
index f988879437c85502d675a322d24be36bc7aa2e80..0000000000000000000000000000000000000000
--- a/impeller/archivist/archive_class_registration.cc
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "impeller/archivist/archive_class_registration.h"
-
-#include <sstream>
-
-#include "impeller/archivist/archive_database.h"
-#include "impeller/archivist/archive_statement.h"
-#include "impeller/base/validation.h"
-
-namespace impeller {
-
-static constexpr const char* kArchivePrimaryKeyColumnName = "primary_key";
-
-ArchiveClassRegistration::ArchiveClassRegistration(ArchiveDatabase& database,
-                                                   ArchiveDef definition)
-    : database_(database), definition_(std::move(definition)) {
-  for (size_t i = 0; i < definition_.members.size(); i++) {
-    // The first index entry is the primary key. So add one to the index.
-    column_map_[definition_.members[i]] = i + 1;
-  }
-  is_valid_ = CreateTable();
-}
-
-const std::string& ArchiveClassRegistration::GetClassName() const {
-  return definition_.table_name;
-}
-
-size_t ArchiveClassRegistration::GetMemberCount() const {
-  return column_map_.size();
-}
-
-bool ArchiveClassRegistration::IsValid() const {
-  return is_valid_;
-}
-
-std::optional<size_t> ArchiveClassRegistration::FindColumnIndex(
-    const std::string& member) const {
-  auto found = column_map_.find(member);
-  if (found == column_map_.end()) {
-    VALIDATION_LOG << "No member named '" << member << "' in class '"
-                   << definition_.table_name
-                   << "'. Did you forget to register it?";
-    return std::nullopt;
-  }
-  return found->second;
-}
-
-bool ArchiveClassRegistration::CreateTable() {
-  if (definition_.table_name.empty() || definition_.members.empty()) {
-    return false;
-  }
-
-  std::stringstream stream;
-
-  /*
-   *  Table names cannot participate in parameter substitution, so we prepare
-   *  a statement and check its validity before running.
-   */
-  stream << "CREATE TABLE IF NOT EXISTS " << definition_.table_name << " ("
-         << kArchivePrimaryKeyColumnName << " INTEGER PRIMARY KEY, ";
-
-  for (size_t i = 0, columns = definition_.members.size(); i < columns; i++) {
-    stream << definition_.members[i];
-    if (i != columns - 1) {
-      stream << ", ";
-    }
-  }
-  stream << ");";
-
-  auto statement = database_.CreateStatement(stream.str());
-
-  if (!statement.IsValid()) {
-    return false;
-  }
-
-  if (!statement.Reset()) {
-    return false;
-  }
-
-  return statement.Execute() == ArchiveStatement::Result::kDone;
-}
-
-ArchiveStatement ArchiveClassRegistration::CreateQueryStatement(
-    bool single) const {
-  std::stringstream stream;
-  stream << "SELECT " << kArchivePrimaryKeyColumnName << ", ";
-  for (size_t i = 0, columns = definition_.members.size(); i < columns; i++) {
-    stream << definition_.members[i];
-    if (i != columns - 1) {
-      stream << ",";
-    }
-  }
-  stream << " FROM " << definition_.table_name;
-
-  if (single) {
-    stream << " WHERE " << kArchivePrimaryKeyColumnName << " = ?";
-  } else {
-    stream << " ORDER BY  " << kArchivePrimaryKeyColumnName << " ASC";
-  }
-
-  stream << ";";
-
-  return database_.CreateStatement(stream.str());
-}
-
-ArchiveStatement ArchiveClassRegistration::CreateInsertStatement() const {
-  std::stringstream stream;
-  stream << "INSERT OR REPLACE INTO " << definition_.table_name
-         << " VALUES ( ?, ";
-  for (size_t i = 0, columns = definition_.members.size(); i < columns; i++) {
-    stream << "?";
-    if (i != columns - 1) {
-      stream << ", ";
-    }
-  }
-  stream << ");";
-
-  return database_.CreateStatement(stream.str());
-}
-
-}  // namespace impeller
diff --git a/impeller/archivist/archive_class_registration.h b/impeller/archivist/archive_class_registration.h
deleted file mode 100644
index d290a46f5bbb2b51172c529d142de8e32958b369..0000000000000000000000000000000000000000
--- a/impeller/archivist/archive_class_registration.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <map>
-#include <optional>
-
-#include "flutter/fml/macros.h"
-#include "impeller/archivist/archive.h"
-#include "impeller/archivist/archive_statement.h"
-
-namespace impeller {
-
-class ArchiveClassRegistration {
- public:
-  static constexpr size_t kPrimaryKeyIndex = 0u;
-
-  bool IsValid() const;
-
-  std::optional<size_t> FindColumnIndex(const std::string& member) const;
-
-  const std::string& GetClassName() const;
-
-  size_t GetMemberCount() const;
-
-  ArchiveStatement CreateInsertStatement() const;
-
-  ArchiveStatement CreateQueryStatement(bool single) const;
-
- private:
-  using MemberColumnMap = std::map<std::string, size_t>;
-
-  friend class ArchiveDatabase;
-
-  ArchiveClassRegistration(ArchiveDatabase& database, ArchiveDef definition);
-
-  bool CreateTable();
-
-  ArchiveDatabase& database_;
-  const ArchiveDef definition_;
-  MemberColumnMap column_map_;
-  bool is_valid_ = false;
-
-  FML_DISALLOW_COPY_AND_ASSIGN(ArchiveClassRegistration);
-};
-
-}  // namespace impeller
diff --git a/impeller/archivist/archive_database.cc b/impeller/archivist/archive_database.cc
deleted file mode 100644
index 07c9d7f10bf91de599f5b4b9b4589fd533bb2e2a..0000000000000000000000000000000000000000
--- a/impeller/archivist/archive_database.cc
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "impeller/archivist/archive_database.h"
-
-#include "third_party/sqlite/sqlite3.h"
-
-#include <sstream>
-#include <string>
-
-#include "impeller/archivist/archive.h"
-#include "impeller/archivist/archive_class_registration.h"
-#include "impeller/archivist/archive_statement.h"
-#include "impeller/base/validation.h"
-
-namespace impeller {
-
-struct ArchiveDatabase::Handle {
-  explicit Handle(const std::string& filename) {
-    if (::sqlite3_initialize() != SQLITE_OK) {
-      VALIDATION_LOG << "Could not initialize sqlite.";
-      return;
-    }
-
-    sqlite3* db = nullptr;
-    auto res = ::sqlite3_open(filename.c_str(), &db);
-
-    if (res != SQLITE_OK || db == nullptr) {
-      return;
-    }
-
-    handle_ = db;
-  }
-
-  ~Handle() {
-    if (handle_ == nullptr) {
-      return;
-    }
-    ::sqlite3_close(handle_);
-  }
-
-  ::sqlite3* Get() const { return handle_; }
-
-  bool IsValid() const { return handle_ != nullptr; }
-
- private:
-  ::sqlite3* handle_ = nullptr;
-
-  FML_DISALLOW_COPY_AND_ASSIGN(Handle);
-};
-
-ArchiveDatabase::ArchiveDatabase(const std::string& filename)
-    : handle_(std::make_unique<Handle>(filename)) {
-  if (!handle_->IsValid()) {
-    handle_.reset();
-    return;
-  }
-
-  begin_transaction_stmt_ = std::unique_ptr<ArchiveStatement>(
-      new ArchiveStatement(handle_->Get(), "BEGIN TRANSACTION;"));
-
-  if (!begin_transaction_stmt_->IsValid()) {
-    return;
-  }
-
-  end_transaction_stmt_ = std::unique_ptr<ArchiveStatement>(
-      new ArchiveStatement(handle_->Get(), "END TRANSACTION;"));
-
-  if (!end_transaction_stmt_->IsValid()) {
-    return;
-  }
-
-  rollback_transaction_stmt_ = std::unique_ptr<ArchiveStatement>(
-      new ArchiveStatement(handle_->Get(), "ROLLBACK TRANSACTION;"));
-
-  if (!rollback_transaction_stmt_->IsValid()) {
-    return;
-  }
-}
-
-ArchiveDatabase::~ArchiveDatabase() = default;
-
-bool ArchiveDatabase::IsValid() const {
-  return handle_ != nullptr;
-}
-
-int64_t ArchiveDatabase::GetLastInsertRowID() {
-  if (!IsValid()) {
-    return 0u;
-  }
-  return ::sqlite3_last_insert_rowid(handle_->Get());
-}
-
-static inline const ArchiveClassRegistration* RegistrationIfReady(
-    const ArchiveClassRegistration* registration) {
-  if (registration == nullptr) {
-    return nullptr;
-  }
-  return registration->IsValid() ? registration : nullptr;
-}
-
-const ArchiveClassRegistration* ArchiveDatabase::GetRegistrationForDefinition(
-    const ArchiveDef& definition) {
-  auto found = registrations_.find(definition.table_name);
-  if (found != registrations_.end()) {
-    /*
-     *  This class has already been registered.
-     */
-    return RegistrationIfReady(found->second.get());
-  }
-
-  /*
-   *  Initialize a new class registration for the given class definition.
-   */
-  auto registration = std::unique_ptr<ArchiveClassRegistration>(
-      new ArchiveClassRegistration(*this, definition));
-  auto res =
-      registrations_.emplace(definition.table_name, std::move(registration));
-
-  /*
-   *  If the new class registration is ready, return it to the caller.
-   */
-  return res.second ? RegistrationIfReady((*(res.first)).second.get())
-                    : nullptr;
-}
-
-ArchiveStatement ArchiveDatabase::CreateStatement(
-    const std::string& statementString) const {
-  return ArchiveStatement{handle_ ? handle_->Get() : nullptr, statementString};
-}
-
-ArchiveTransaction ArchiveDatabase::CreateTransaction(
-    int64_t& transactionCount) {
-  return ArchiveTransaction{transactionCount,          //
-                            *begin_transaction_stmt_,  //
-                            *end_transaction_stmt_,    //
-                            *rollback_transaction_stmt_};
-}
-
-}  // namespace impeller
diff --git a/impeller/archivist/archive_database.h b/impeller/archivist/archive_database.h
deleted file mode 100644
index 6f87686eded1982b973da3740612d9515f9fb8b6..0000000000000000000000000000000000000000
--- a/impeller/archivist/archive_database.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#pragma once
-
-#include <map>
-#include <memory>
-#include <string>
-
-#include "flutter/fml/macros.h"
-#include "impeller/archivist/archive_transaction.h"
-
-namespace impeller {
-
-class ArchiveStatement;
-class ArchiveClassRegistration;
-struct ArchiveDef;
-
-//------------------------------------------------------------------------------
-/// @brief      A handle to the underlying database connection for an archive.
-///
-class ArchiveDatabase {
- public:
-  ArchiveDatabase(const std::string& filename);
-
-  ~ArchiveDatabase();
-
-  bool IsValid() const;
-
-  int64_t GetLastInsertRowID();
-
-  const ArchiveClassRegistration* GetRegistrationForDefinition(
-      const ArchiveDef& definition);
-
-  ArchiveTransaction CreateTransaction(int64_t& transactionCount);
-
- private:
-  struct Handle;
-  std::unique_ptr<Handle> handle_;
-  std::map<std::string, std::unique_ptr<ArchiveClassRegistration>>
-      registrations_;
-  std::unique_ptr<ArchiveStatement> begin_transaction_stmt_;
-  std::unique_ptr<ArchiveStatement> end_transaction_stmt_;
-  std::unique_ptr<ArchiveStatement> rollback_transaction_stmt_;
-
-  friend class ArchiveClassRegistration;
-
-  ArchiveStatement CreateStatement(const std::string& statementString) const;
-
-  FML_DISALLOW_COPY_AND_ASSIGN(ArchiveDatabase);
-};
-
-}  // namespace impeller
diff --git a/impeller/archivist/archive_location.cc b/impeller/archivist/archive_location.cc
deleted file mode 100644
index 906174809b7127264d2155a4598c1769b8fb9358..0000000000000000000000000000000000000000
--- a/impeller/archivist/archive_location.cc
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "impeller/archivist/archive_location.h"
-
-#include "impeller/archivist/archive_class_registration.h"
-#include "impeller/archivist/archive_vector.h"
-
-namespace impeller {
-
-ArchiveLocation::ArchiveLocation(Archive& context,
-                                 ArchiveStatement& statement,
-                                 const ArchiveClassRegistration& registration,
-                                 PrimaryKey name)
-    : context_(context),
-      statement_(statement),
-      registration_(registration),
-      primary_key_(name) {}
-
-PrimaryKey ArchiveLocation::GetPrimaryKey() const {
-  return primary_key_;
-}
-
-bool ArchiveLocation::Write(const std::string& member,
-                            const std::string& item) {
-  auto index = registration_.FindColumnIndex(member);
-  return index.has_value() ? statement_.WriteValue(index.value(), item) : false;
-}
-
-bool ArchiveLocation::WriteIntegral(const std::string& member, int64_t item) {
-  auto index = registration_.FindColumnIndex(member);
-  return index.has_value() ? statement_.WriteValue(index.value(), item) : false;
-}
-
-bool ArchiveLocation::Write(const std::string& member, double item) {
-  auto index = registration_.FindColumnIndex(member);
-  return index.has_value() ? statement_.WriteValue(index.value(), item) : false;
-}
-
-bool ArchiveLocation::Write(const std::string& member, const Allocation& item) {
-  auto index = registration_.FindColumnIndex(member);
-  return index.has_value() ? statement_.WriteValue(index.value(), item) : false;
-}
-
-bool ArchiveLocation::Write(const std::string& member,
-                            const ArchiveDef& otherDef,
-                            const Archivable& other) {
-  auto index = registration_.FindColumnIndex(member);
-
-  if (!index.has_value()) {
-    return false;
-  }
-
-  /*
-   *  We need to fully archive the other instance first because it could
-   *  have a name that is auto assigned. In that case, we cannot ask it before
-   *  archival (via `other.archiveName()`).
-   */
-  auto row_id = context_.ArchiveInstance(otherDef, other);
-  if (!row_id.has_value()) {
-    return false;
-  }
-
-  /*
-   *  Bind the name of the serializable
-   */
-  if (!statement_.WriteValue(index.value(), row_id.value())) {
-    return false;
-  }
-
-  return true;
-}
-
-std::optional<int64_t> ArchiveLocation::WriteVectorKeys(
-    std::vector<int64_t>&& members) {
-  ArchiveVector vector(std::move(members));
-  return context_.ArchiveInstance(ArchiveVector::kArchiveDefinition, vector);
-}
-
-bool ArchiveLocation::ReadVectorKeys(PrimaryKey name,
-                                     std::vector<int64_t>& members) {
-  ArchiveVector vector;
-  if (!context_.UnarchiveInstance(ArchiveVector::kArchiveDefinition, name,
-                                  vector)) {
-    return false;
-  }
-  const auto& keys = vector.GetKeys();
-  std::move(keys.begin(), keys.end(), std::back_inserter(members));
-  return true;
-}
-
-bool ArchiveLocation::Read(const std::string& member, std::string& item) {
-  auto index = registration_.FindColumnIndex(member);
-  return index.has_value() ? statement_.ReadValue(index.value(), item) : false;
-}
-
-bool ArchiveLocation::ReadIntegral(const std::string& member, int64_t& item) {
-  auto index = registration_.FindColumnIndex(member);
-  return index.has_value() ? statement_.ReadValue(index.value(), item) : false;
-}
-
-bool ArchiveLocation::Read(const std::string& member, double& item) {
-  auto index = registration_.FindColumnIndex(member);
-  return index.has_value() ? statement_.ReadValue(index.value(), item) : false;
-}
-
-bool ArchiveLocation::Read(const std::string& member, Allocation& item) {
-  auto index = registration_.FindColumnIndex(member);
-  return index.has_value() ? statement_.ReadValue(index.value(), item) : false;
-}
-
-bool ArchiveLocation::Read(const std::string& member,
-                           const ArchiveDef& otherDef,
-                           Archivable& other) {
-  auto index = registration_.FindColumnIndex(member);
-
-  /*
-   *  Make sure a member is present at that column
-   */
-  if (!index.has_value()) {
-    return false;
-  }
-
-  /*
-   *  Try to find the foreign key in the current items row
-   */
-  int64_t foreignKey = 0;
-  if (!statement_.ReadValue(index.value(), foreignKey)) {
-    return false;
-  }
-
-  /*
-   *  Find the other item and unarchive by this foreign key
-   */
-  if (!context_.UnarchiveInstance(otherDef, foreignKey, other)) {
-    return false;
-  }
-
-  return true;
-}
-
-}  // namespace impeller
diff --git a/impeller/archivist/archive_location.h b/impeller/archivist/archive_location.h
deleted file mode 100644
index 63428dfa94dfe5d224f3ab99bafe76ab09d9006c..0000000000000000000000000000000000000000
--- a/impeller/archivist/archive_location.h
+++ /dev/null
@@ -1,172 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#pragma once
-
-#include <optional>
-#include <type_traits>
-
-#include "flutter/fml/macros.h"
-#include "impeller/archivist/archivable.h"
-#include "impeller/archivist/archive.h"
-#include "impeller/base/allocation.h"
-
-namespace impeller {
-
-class Archive;
-class ArchiveClassRegistration;
-class ArchiveStatement;
-
-class ArchiveLocation {
- public:
-  PrimaryKey GetPrimaryKey() const;
-
-  template <class T, class = std::enable_if_t<std::is_integral<T>::value>>
-  bool Write(const std::string& member, T item) {
-    return WriteIntegral(member, static_cast<int64_t>(item));
-  }
-
-  bool Write(const std::string& member, double item);
-
-  bool Write(const std::string& member, const std::string& item);
-
-  bool Write(const std::string& member, const Allocation& allocation);
-
-  template <class T,
-            class = std::enable_if_t<std::is_base_of<Archivable, T>::value>>
-  bool WriteArchivable(const std::string& member, const T& other) {
-    const ArchiveDef& otherDef = T::ArchiveDefinition;
-    return Write(member, otherDef, other);
-  }
-
-  template <class T, class = std::enable_if_t<std::is_enum<T>::value>>
-  bool WriteEnum(const std::string& member, const T& item) {
-    return WriteIntegral(member, static_cast<int64_t>(item));
-  }
-
-  template <class T,
-            class = std::enable_if_t<std::is_base_of<Archivable, T>::value>>
-  bool Write(const std::string& member, const std::vector<T>& items) {
-    /*
-     *  All items in the vector are individually encoded and their keys noted
-     */
-    std::vector<int64_t> members;
-    members.reserve(items.size());
-
-    const ArchiveDef& itemDefinition = T::kArchiveDefinition;
-    for (const auto& item : items) {
-      auto row_id = context_.ArchiveInstance(itemDefinition, item);
-      if (!row_id.has_value()) {
-        return false;
-      }
-      members.emplace_back(row_id.value());
-    }
-
-    /*
-     *  The keys are flattened into the vectors table. Write to that table
-     */
-    auto vectorInsert = WriteVectorKeys(std::move(members));
-
-    if (!vectorInsert.has_value()) {
-      return false;
-    }
-
-    return WriteIntegral(member, vectorInsert.value());
-  }
-
-  template <class T, class = std::enable_if_t<std::is_integral<T>::value>>
-  bool Read(const std::string& member, T& item) {
-    int64_t decoded = 0;
-    auto result = ReadIntegral(member, decoded);
-    item = static_cast<T>(decoded);
-    return result;
-  }
-
-  bool Read(const std::string& member, double& item);
-
-  bool Read(const std::string& member, std::string& item);
-
-  bool Read(const std::string& member, Allocation& allocation);
-
-  template <class T,
-            class = std::enable_if_t<std::is_base_of<Archivable, T>::value>>
-  bool ReadArchivable(const std::string& member, T& other) {
-    const ArchiveDef& otherDef = T::ArchiveDefinition;
-    return decode(member, otherDef, other);
-  }
-
-  template <class T, class = std::enable_if_t<std::is_enum<T>::value>>
-  bool ReadEnum(const std::string& member, T& item) {
-    int64_t desugared = 0;
-    if (ReadIntegral(member, desugared)) {
-      item = static_cast<T>(desugared);
-      return true;
-    }
-    return false;
-  }
-
-  template <class T,
-            class = std::enable_if_t<std::is_base_of<Archivable, T>::value>>
-  bool Read(const std::string& member, std::vector<T>& items) {
-    /*
-     *  From the member, find the foreign key of the vector
-     */
-    int64_t vectorForeignKey = 0;
-    if (!ReadIntegral(member, vectorForeignKey)) {
-      return false;
-    }
-
-    /*
-     *  Get vector keys
-     */
-    std::vector<int64_t> keys;
-    if (!ReadVectorKeys(vectorForeignKey, keys)) {
-      return false;
-    }
-
-    const ArchiveDef& otherDef = T::kArchiveDefinition;
-    for (const auto& key : keys) {
-      items.emplace_back();
-
-      if (!context_.UnarchiveInstance(otherDef, key, items.back())) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
- private:
-  Archive& context_;
-  ArchiveStatement& statement_;
-  const ArchiveClassRegistration& registration_;
-  PrimaryKey primary_key_;
-
-  friend class Archive;
-
-  ArchiveLocation(Archive& context,
-                  ArchiveStatement& statement,
-                  const ArchiveClassRegistration& registration,
-                  PrimaryKey name);
-
-  bool WriteIntegral(const std::string& member, int64_t item);
-
-  bool ReadIntegral(const std::string& member, int64_t& item);
-
-  std::optional<int64_t> WriteVectorKeys(std::vector<int64_t>&& members);
-
-  bool ReadVectorKeys(PrimaryKey name, std::vector<int64_t>& members);
-
-  bool Write(const std::string& member,
-             const ArchiveDef& otherDef,
-             const Archivable& other);
-
-  bool Read(const std::string& member,
-            const ArchiveDef& otherDef,
-            Archivable& other);
-
-  FML_DISALLOW_COPY_AND_ASSIGN(ArchiveLocation);
-};
-
-}  // namespace impeller
diff --git a/impeller/archivist/archive_statement.cc b/impeller/archivist/archive_statement.cc
deleted file mode 100644
index d6f6f5722fc5a936aea7f8a1c29a0b07476416bc..0000000000000000000000000000000000000000
--- a/impeller/archivist/archive_statement.cc
+++ /dev/null
@@ -1,229 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "impeller/archivist/archive_statement.h"
-
-#include <string>
-
-#include "flutter/fml/logging.h"
-#include "third_party/sqlite/sqlite3.h"
-
-namespace impeller {
-
-struct ArchiveStatement::Handle {
-  Handle(void* db, const std::string& statememt) {
-    if (db == nullptr) {
-      return;
-    }
-    ::sqlite3_stmt* handle = nullptr;
-    if (::sqlite3_prepare_v2(reinterpret_cast<sqlite3*>(db),      //
-                             statememt.c_str(),                   //
-                             static_cast<int>(statememt.size()),  //
-                             &handle,                             //
-                             nullptr) == SQLITE_OK) {
-      handle_ = handle;
-    }
-  }
-
-  ~Handle() {
-    if (handle_ == nullptr) {
-      return;
-    }
-    auto res = ::sqlite3_finalize(handle_);
-    FML_CHECK(res == SQLITE_OK) << "Unable to finalize the archive.";
-  }
-
-  bool IsValid() const { return handle_ != nullptr; }
-
-  ::sqlite3_stmt* Get() const { return handle_; }
-
- private:
-  ::sqlite3_stmt* handle_ = nullptr;
-
-  FML_DISALLOW_COPY_AND_ASSIGN(Handle);
-};
-
-ArchiveStatement::ArchiveStatement(void* db, const std::string& statememt)
-    : statement_handle_(std::make_unique<Handle>(db, statememt)) {
-  if (!statement_handle_->IsValid()) {
-    statement_handle_.reset();
-  }
-}
-
-ArchiveStatement::~ArchiveStatement() = default;
-
-bool ArchiveStatement::IsValid() const {
-  return statement_handle_ != nullptr;
-}
-
-bool ArchiveStatement::Reset() {
-  if (!IsValid()) {
-    return false;
-  }
-  if (::sqlite3_reset(statement_handle_->Get()) != SQLITE_OK) {
-    return false;
-  }
-
-  if (::sqlite3_clear_bindings(statement_handle_->Get()) != SQLITE_OK) {
-    return false;
-  }
-
-  return true;
-}
-
-static constexpr int ToParam(size_t index) {
-  /*
-   *  sqlite parameters begin from 1
-   */
-  return static_cast<int>(index + 1);
-}
-
-static constexpr int ToColumn(size_t index) {
-  /*
-   *  sqlite columns begin from 0
-   */
-  return static_cast<int>(index);
-}
-
-size_t ArchiveStatement::GetColumnCount() {
-  if (!IsValid()) {
-    return 0u;
-  }
-  return ::sqlite3_column_count(statement_handle_->Get());
-}
-
-/*
- *  Bind Variants
- */
-bool ArchiveStatement::WriteValue(size_t index, const std::string& item) {
-  if (!IsValid()) {
-    return false;
-  }
-  return ::sqlite3_bind_text(statement_handle_->Get(),       //
-                             ToParam(index),                 //
-                             item.data(),                    //
-                             static_cast<int>(item.size()),  //
-                             SQLITE_TRANSIENT) == SQLITE_OK;
-}
-
-bool ArchiveStatement::BindIntegral(size_t index, int64_t item) {
-  if (!IsValid()) {
-    return false;
-  }
-  return ::sqlite3_bind_int64(statement_handle_->Get(),  //
-                              ToParam(index),            //
-                              item) == SQLITE_OK;
-}
-
-bool ArchiveStatement::WriteValue(size_t index, double item) {
-  if (!IsValid()) {
-    return false;
-  }
-  return ::sqlite3_bind_double(statement_handle_->Get(),  //
-                               ToParam(index),            //
-                               item) == SQLITE_OK;
-}
-
-bool ArchiveStatement::WriteValue(size_t index, const Allocation& item) {
-  if (!IsValid()) {
-    return false;
-  }
-  return ::sqlite3_bind_blob(statement_handle_->Get(),            //
-                             ToParam(index),                      //
-                             item.GetBuffer(),                    //
-                             static_cast<int>(item.GetLength()),  //
-                             SQLITE_TRANSIENT) == SQLITE_OK;
-}
-
-/*
- *  Column Variants
- */
-bool ArchiveStatement::ColumnIntegral(size_t index, int64_t& item) {
-  if (!IsValid()) {
-    return false;
-  }
-  item = ::sqlite3_column_int64(statement_handle_->Get(), ToColumn(index));
-  return true;
-}
-
-bool ArchiveStatement::ReadValue(size_t index, double& item) {
-  if (!IsValid()) {
-    return false;
-  }
-  item = ::sqlite3_column_double(statement_handle_->Get(), ToColumn(index));
-  return true;
-}
-
-/*
- *  For cases where byte sizes of column data is necessary, the
- *  recommendations in https://www.sqlite.org/c3ref/column_blob.html regarding
- *  type conversions are followed.
- *
- *  TL;DR: Access blobs then bytes.
- */
-
-bool ArchiveStatement::ReadValue(size_t index, std::string& item) {
-  if (!IsValid()) {
-    return false;
-  }
-  /*
-   *  Get the character data
-   */
-  auto chars = reinterpret_cast<const char*>(
-      ::sqlite3_column_text(statement_handle_->Get(), ToColumn(index)));
-
-  /*
-   *  Get the length of the string (in bytes)
-   */
-  size_t textByteSize =
-      ::sqlite3_column_bytes(statement_handle_->Get(), ToColumn(index));
-
-  std::string text(chars, textByteSize);
-  item.swap(text);
-
-  return true;
-}
-
-bool ArchiveStatement::ReadValue(size_t index, Allocation& item) {
-  if (!IsValid()) {
-    return false;
-  }
-  /*
-   *  Get a blob pointer
-   */
-  auto blob = reinterpret_cast<const uint8_t*>(
-      ::sqlite3_column_blob(statement_handle_->Get(), ToColumn(index)));
-
-  /*
-   *  Decode the number of bytes in the blob
-   */
-  size_t byteSize =
-      ::sqlite3_column_bytes(statement_handle_->Get(), ToColumn(index));
-
-  /*
-   *  Reszie the host allocation and move the blob contents into it
-   */
-  if (!item.Truncate(byteSize, false /* npot */)) {
-    return false;
-  }
-
-  memmove(item.GetBuffer(), blob, byteSize);
-  return true;
-}
-
-ArchiveStatement::Result ArchiveStatement::Execute() {
-  if (!IsValid()) {
-    return Result::kFailure;
-  }
-  switch (::sqlite3_step(statement_handle_->Get())) {
-    case SQLITE_DONE:
-      return Result::kDone;
-    case SQLITE_ROW:
-      return Result::kRow;
-    default:
-      return Result::kFailure;
-  }
-}
-
-}  // namespace impeller
diff --git a/impeller/archivist/archive_statement.h b/impeller/archivist/archive_statement.h
deleted file mode 100644
index 34856c7f24218e277e3128a26c14dfe0921db976..0000000000000000000000000000000000000000
--- a/impeller/archivist/archive_statement.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#pragma once
-
-#include <memory>
-#include <type_traits>
-
-#include "flutter/fml/macros.h"
-#include "impeller/base/allocation.h"
-
-namespace impeller {
-
-//------------------------------------------------------------------------------
-/// @brief      Represents a read/write query to an archive database. Statements
-///             are expensive to create and must be cached for as long as
-///             possible.
-///
-class ArchiveStatement {
- public:
-  ~ArchiveStatement();
-
-  bool IsValid() const;
-
-  enum class Result {
-    //--------------------------------------------------------------------------
-    /// The statement is done executing.
-    ///
-    kDone,
-    //--------------------------------------------------------------------------
-    /// The statement found a row of information ready for reading.
-    ///
-    kRow,
-    //--------------------------------------------------------------------------
-    /// Statement execution was a failure.
-    ///
-    kFailure,
-  };
-
-  //----------------------------------------------------------------------------
-  /// @brief      Execute the given statement with the provided data.
-  ///
-  /// @return     Is the execution was succeessful.
-  ///
-  [[nodiscard]] Result Execute();
-
-  //----------------------------------------------------------------------------
-  /// @brief      All writes after the last successfull `Run` call are reset.
-  ///             Since statements are expensive to create, reset them for new
-  ///             writes instead of creating new statements.
-  ///
-  /// @return     If the statement writes were reset.
-  ///
-  bool Reset();
-
-  bool WriteValue(size_t index, const std::string& item);
-
-  template <class T, class = std::enable_if<std::is_integral<T>::value>>
-  bool WriteValue(size_t index, T item) {
-    return BindIntegral(index, static_cast<int64_t>(item));
-  }
-
-  bool WriteValue(size_t index, double item);
-
-  bool WriteValue(size_t index, const Allocation& item);
-
-  template <class T, class = std::enable_if<std::is_integral<T>::value>>
-  bool ReadValue(size_t index, T& item) {
-    return ColumnIntegral(index, item);
-  }
-
-  bool ReadValue(size_t index, double& item);
-
-  bool ReadValue(size_t index, std::string& item);
-
-  bool ReadValue(size_t index, Allocation& item);
-
-  size_t GetColumnCount();
-
- private:
-  struct Handle;
-  std::unique_ptr<Handle> statement_handle_;
-
-  friend class ArchiveDatabase;
-
-  ArchiveStatement(void* db, const std::string& statement);
-
-  bool BindIntegral(size_t index, int64_t item);
-
-  bool ColumnIntegral(size_t index, int64_t& item);
-
-  FML_DISALLOW_COPY_AND_ASSIGN(ArchiveStatement);
-};
-
-}  // namespace impeller
diff --git a/impeller/archivist/archive_transaction.cc b/impeller/archivist/archive_transaction.cc
deleted file mode 100644
index bc546ff88f2662dfe15554d34a153e84b0abc0ac..0000000000000000000000000000000000000000
--- a/impeller/archivist/archive_transaction.cc
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "impeller/archivist/archive_transaction.h"
-
-#include "flutter/fml/logging.h"
-#include "impeller/archivist/archive_statement.h"
-
-namespace impeller {
-
-ArchiveTransaction::ArchiveTransaction(int64_t& transactionCount,
-                                       ArchiveStatement& beginStatement,
-                                       ArchiveStatement& endStatement,
-                                       ArchiveStatement& rollbackStatement)
-    : end_stmt_(endStatement),
-      rollback_stmt_(rollbackStatement),
-      transaction_count_(transactionCount) {
-  if (transaction_count_ == 0) {
-    cleanup_ = beginStatement.Execute() == ArchiveStatement::Result::kDone;
-  }
-  transaction_count_++;
-}
-
-ArchiveTransaction::ArchiveTransaction(ArchiveTransaction&& other)
-    : end_stmt_(other.end_stmt_),
-      rollback_stmt_(other.rollback_stmt_),
-      transaction_count_(other.transaction_count_),
-      cleanup_(other.cleanup_),
-      successful_(other.successful_) {
-  other.abandoned_ = true;
-}
-
-ArchiveTransaction::~ArchiveTransaction() {
-  if (abandoned_) {
-    return;
-  }
-
-  FML_CHECK(transaction_count_ != 0);
-  if (transaction_count_ == 1 && cleanup_) {
-    auto res = successful_ ? end_stmt_.Execute() : rollback_stmt_.Execute();
-    FML_CHECK(res == ArchiveStatement::Result::kDone)
-        << "Must be able to commit the nested transaction";
-  }
-  transaction_count_--;
-}
-
-void ArchiveTransaction::MarkWritesAsReadyForCommit() {
-  successful_ = true;
-}
-
-}  // namespace impeller
diff --git a/impeller/archivist/archive_transaction.h b/impeller/archivist/archive_transaction.h
deleted file mode 100644
index 74fe132d7db66c05d3f398de5cdda508645fc1d8..0000000000000000000000000000000000000000
--- a/impeller/archivist/archive_transaction.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-#pragma once
-
-#include <cstdint>
-
-#include "flutter/fml/macros.h"
-
-namespace impeller {
-
-class ArchiveStatement;
-
-//------------------------------------------------------------------------------
-/// @brief      All writes made to the archive within a transaction that is not
-///             marked as ready for commit will be rolled back with the
-///             transaction ends.
-///
-///             All transactions are obtained from the `ArchiveDatabase`.
-///
-/// @see        `ArchiveDatabase`
-///
-class ArchiveTransaction {
- public:
-  ArchiveTransaction(ArchiveTransaction&& transaction);
-
-  ~ArchiveTransaction();
-
-  void MarkWritesAsReadyForCommit();
-
- private:
-  ArchiveStatement& end_stmt_;
-  ArchiveStatement& rollback_stmt_;
-  int64_t& transaction_count_;
-  bool cleanup_ = false;
-  bool successful_ = false;
-  bool abandoned_ = false;
-
-  friend class ArchiveDatabase;
-
-  ArchiveTransaction(int64_t& transactionCount,
-                     ArchiveStatement& beginStatement,
-                     ArchiveStatement& endStatement,
-                     ArchiveStatement& rollbackStatement);
-
-  FML_DISALLOW_COPY_AND_ASSIGN(ArchiveTransaction);
-};
-
-}  // namespace impeller
diff --git a/impeller/archivist/archive_vector.cc b/impeller/archivist/archive_vector.cc
deleted file mode 100644
index 57a83724aa154d490f6cc59d4d8dd85e986021c6..0000000000000000000000000000000000000000
--- a/impeller/archivist/archive_vector.cc
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "impeller/archivist/archive_vector.h"
-
-#include <sstream>
-
-#include "impeller/archivist/archive_location.h"
-
-namespace impeller {
-
-ArchiveVector::ArchiveVector(std::vector<int64_t> keys)
-    : keys_(std::move(keys)) {}
-
-ArchiveVector::ArchiveVector() {}
-
-static constexpr const char* kVectorKeys = "keys";
-
-ArchiveDef ArchiveVector::kArchiveDefinition = {
-    .table_name = "IPLR_vectors",
-    .members = {kVectorKeys},
-};
-
-PrimaryKey ArchiveVector::GetPrimaryKey() const {
-  // Archive definition says the keys will be auto assigned.
-  return std::nullopt;
-}
-
-const std::vector<int64_t> ArchiveVector::GetKeys() const {
-  return keys_;
-}
-
-bool ArchiveVector::Write(ArchiveLocation& item) const {
-  std::stringstream stream;
-  for (size_t i = 0, count = keys_.size(); i < count; i++) {
-    stream << keys_[i];
-    if (i != count - 1) {
-      stream << ",";
-    }
-  }
-  return item.Write(kVectorKeys, stream.str());
-}
-
-bool ArchiveVector::Read(ArchiveLocation& item) {
-  std::string flattened;
-  if (!item.Read(kVectorKeys, flattened)) {
-    return false;
-  }
-
-  std::stringstream stream(flattened);
-  int64_t single = 0;
-  while (stream >> single) {
-    keys_.emplace_back(single);
-    stream.ignore();
-  }
-
-  return true;
-}
-
-}  // namespace impeller
diff --git a/impeller/archivist/archive_vector.h b/impeller/archivist/archive_vector.h
deleted file mode 100644
index 556dd3c31c21aedbb67b0a324e265dcf50079da8..0000000000000000000000000000000000000000
--- a/impeller/archivist/archive_vector.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#pragma once
-
-#include "flutter/fml/macros.h"
-#include "impeller/archivist/archive.h"
-
-namespace impeller {
-
-class ArchiveVector : public Archivable {
- public:
-  static ArchiveDef kArchiveDefinition;
-
-  PrimaryKey GetPrimaryKey() const override;
-
-  const std::vector<int64_t> GetKeys() const;
-
-  bool Write(ArchiveLocation& item) const override;
-
-  bool Read(ArchiveLocation& item) override;
-
- private:
-  std::vector<int64_t> keys_;
-
-  friend class ArchiveLocation;
-
-  ArchiveVector();
-
-  ArchiveVector(std::vector<int64_t> keys);
-
-  FML_DISALLOW_COPY_AND_ASSIGN(ArchiveVector);
-};
-
-}  // namespace impeller
diff --git a/impeller/archivist/archivist_fixture.cc b/impeller/archivist/archivist_fixture.cc
deleted file mode 100644
index 4bb0413a575ee0167400306fdb5e9a7ff6ce5e8c..0000000000000000000000000000000000000000
--- a/impeller/archivist/archivist_fixture.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "impeller/archivist/archivist_fixture.h"
-
-#include "flutter/fml/paths.h"
-
-namespace impeller {
-namespace testing {
-
-ArchivistFixture::ArchivistFixture() {
-  std::stringstream stream;
-  stream << "Test" << flutter::testing::GetCurrentTestName() << ".db";
-  archive_file_name_ = stream.str();
-}
-
-ArchivistFixture::~ArchivistFixture() = default;
-
-const std::string ArchivistFixture::GetArchiveFileName() const {
-  return fml::paths::JoinPaths(
-      {flutter::testing::GetFixturesPath(), archive_file_name_});
-}
-
-void ArchivistFixture::SetUp() {
-  DeleteArchiveFile();
-}
-
-void ArchivistFixture::TearDown() {
-  DeleteArchiveFile();
-}
-
-void ArchivistFixture::DeleteArchiveFile() const {
-  auto fixtures = flutter::testing::OpenFixturesDirectory();
-  if (fml::FileExists(fixtures, archive_file_name_.c_str())) {
-    fml::UnlinkFile(fixtures, archive_file_name_.c_str());
-  }
-}
-
-}  // namespace testing
-}  // namespace impeller
diff --git a/impeller/archivist/archivist_unittests.cc b/impeller/archivist/archivist_unittests.cc
deleted file mode 100644
index dbd210afa0ff4c671fbfe9576b6b255c5dac023d..0000000000000000000000000000000000000000
--- a/impeller/archivist/archivist_unittests.cc
+++ /dev/null
@@ -1,200 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <cstdio>
-#include <thread>
-
-#include "flutter/fml/macros.h"
-#include "flutter/testing/testing.h"
-#include "impeller/archivist/archive.h"
-#include "impeller/archivist/archive_location.h"
-#include "impeller/archivist/archivist_fixture.h"
-
-namespace impeller {
-namespace testing {
-
-static int64_t LastSample = 0;
-
-class Sample : public Archivable {
- public:
-  explicit Sample(uint64_t count = 42) : some_data_(count) {}
-
-  Sample(Sample&&) = default;
-
-  uint64_t GetSomeData() const { return some_data_; }
-
-  // |Archivable|
-  PrimaryKey GetPrimaryKey() const override { return name_; }
-
-  // |Archivable|
-  bool Write(ArchiveLocation& item) const override {
-    return item.Write("some_data", some_data_);
-  };
-
-  // |Archivable|
-  bool Read(ArchiveLocation& item) override {
-    name_ = item.GetPrimaryKey();
-    return item.Read("some_data", some_data_);
-  };
-
-  static const ArchiveDef kArchiveDefinition;
-
- private:
-  uint64_t some_data_;
-  PrimaryKey name_ = ++LastSample;
-
-  FML_DISALLOW_COPY_AND_ASSIGN(Sample);
-};
-
-const ArchiveDef Sample::kArchiveDefinition = {
-    .table_name = "Sample",
-    .members = {"some_data"},
-};
-
-class SampleWithVector : public Archivable {
- public:
-  SampleWithVector() = default;
-
-  // |Archivable|
-  PrimaryKey GetPrimaryKey() const override { return std::nullopt; }
-
-  // |Archivable|
-  bool Write(ArchiveLocation& item) const override {
-    std::vector<Sample> samples;
-    for (size_t i = 0; i < 50u; i++) {
-      samples.emplace_back(Sample{1988 + i});
-    }
-    return item.Write("hello", "world") && item.Write("samples", samples);
-  };
-
-  // |Archivable|
-  bool Read(ArchiveLocation& item) override {
-    std::string str;
-    auto str_result = item.Read("hello", str);
-    std::vector<Sample> samples;
-    auto vec_result = item.Read("samples", samples);
-
-    if (!str_result || str != "world" || !vec_result || samples.size() != 50) {
-      return false;
-    }
-
-    size_t current = 1988;
-    for (const auto& sample : samples) {
-      if (sample.GetSomeData() != current++) {
-        return false;
-      }
-    }
-    return true;
-  };
-
-  static const ArchiveDef kArchiveDefinition;
-
- private:
-  std::vector<Sample> samples_;
-  FML_DISALLOW_COPY_AND_ASSIGN(SampleWithVector);
-};
-
-const ArchiveDef SampleWithVector::kArchiveDefinition = {
-    .table_name = "SampleWithVector",
-    .members = {"hello", "samples"},
-};
-
-using ArchiveTest = ArchivistFixture;
-
-TEST_F(ArchiveTest, SimpleInitialization) {
-  Archive archive(GetArchiveFileName().c_str());
-  ASSERT_TRUE(archive.IsValid());
-}
-
-TEST_F(ArchiveTest, AddStorageClass) {
-  Archive archive(GetArchiveFileName().c_str());
-  ASSERT_TRUE(archive.IsValid());
-}
-
-TEST_F(ArchiveTest, AddData) {
-  Archive archive(GetArchiveFileName().c_str());
-  ASSERT_TRUE(archive.IsValid());
-  Sample sample;
-  ASSERT_TRUE(archive.Write(sample));
-}
-
-TEST_F(ArchiveTest, AddDataMultiple) {
-  Archive archive(GetArchiveFileName().c_str());
-  ASSERT_TRUE(archive.IsValid());
-
-  for (size_t i = 0; i < 100; i++) {
-    Sample sample(i + 1);
-    ASSERT_TRUE(archive.Write(sample));
-  }
-}
-
-TEST_F(ArchiveTest, ReadData) {
-  Archive archive(GetArchiveFileName().c_str());
-  ASSERT_TRUE(archive.IsValid());
-
-  size_t count = 50;
-
-  std::vector<PrimaryKey::value_type> keys;
-  std::vector<uint64_t> values;
-
-  for (size_t i = 0; i < count; i++) {
-    Sample sample(i + 1);
-    keys.push_back(sample.GetPrimaryKey().value());
-    values.push_back(sample.GetSomeData());
-    ASSERT_TRUE(archive.Write(sample));
-  }
-
-  for (size_t i = 0; i < count; i++) {
-    Sample sample;
-    ASSERT_TRUE(archive.Read(keys[i], sample));
-    ASSERT_EQ(values[i], sample.GetSomeData());
-  }
-}
-
-TEST_F(ArchiveTest, ReadDataWithNames) {
-  Archive archive(GetArchiveFileName().c_str());
-  ASSERT_TRUE(archive.IsValid());
-
-  size_t count = 8;
-
-  std::vector<PrimaryKey::value_type> keys;
-  std::vector<uint64_t> values;
-
-  keys.reserve(count);
-  values.reserve(count);
-
-  for (size_t i = 0; i < count; i++) {
-    Sample sample(i + 1);
-    keys.push_back(sample.GetPrimaryKey().value());
-    values.push_back(sample.GetSomeData());
-    ASSERT_TRUE(archive.Write(sample));
-  }
-
-  for (size_t i = 0; i < count; i++) {
-    Sample sample;
-    ASSERT_TRUE(archive.Read(keys[i], sample));
-    ASSERT_EQ(values[i], sample.GetSomeData());
-    ASSERT_EQ(keys[i], sample.GetPrimaryKey());
-  }
-}
-
-TEST_F(ArchiveTest, CanReadWriteVectorOfArchivables) {
-  Archive archive(GetArchiveFileName().c_str());
-  ASSERT_TRUE(archive.IsValid());
-
-  SampleWithVector sample_with_vector;
-  ASSERT_TRUE(archive.Write(sample_with_vector));
-  bool read_success = false;
-  ASSERT_EQ(
-      archive.Read<SampleWithVector>([&](ArchiveLocation& location) -> bool {
-        SampleWithVector other_sample_with_vector;
-        read_success = other_sample_with_vector.Read(location);
-        return true;  // Always keep continuing but assert that we only get one.
-      }),
-      1u);
-  ASSERT_TRUE(read_success);
-}
-
-}  // namespace testing
-}  // namespace impeller
diff --git a/impeller/base/BUILD.gn b/impeller/base/BUILD.gn
index 4edd4e1a154f9a2265e7f40f02c7fafec521dc49..03ee14f645658f4e9d8982165f22dc731f528fa8 100644
--- a/impeller/base/BUILD.gn
+++ b/impeller/base/BUILD.gn
@@ -12,6 +12,7 @@ impeller_component("base") {
     "comparable.cc",
     "comparable.h",
     "config.h",
+    "mask.h",
     "promise.cc",
     "promise.h",
     "strings.cc",
@@ -20,23 +21,13 @@ impeller_component("base") {
     "thread.h",
     "thread_safety.cc",
     "thread_safety.h",
+    "timing.h",
     "validation.cc",
     "validation.h",
     "version.cc",
     "version.h",
-    "work_queue.cc",
-    "work_queue.h",
-    "work_queue_common.cc",
-    "work_queue_common.h",
   ]
 
-  if (is_ios || is_mac) {
-    sources += [
-      "platform/darwin/work_queue_darwin.cc",
-      "platform/darwin/work_queue_darwin.h",
-    ]
-  }
-
   deps = [ "//flutter/fml" ]
 }
 
diff --git a/impeller/base/allocation.cc b/impeller/base/allocation.cc
index 06af6f22442a8d6b7dd751df9203654f3f20f0a4..c7f65d416f10ba35925edb0be08e64b22a45d938 100644
--- a/impeller/base/allocation.cc
+++ b/impeller/base/allocation.cc
@@ -7,7 +7,6 @@
 #include <algorithm>
 #include <cstring>
 
-#include "flutter/fml/logging.h"
 #include "impeller/base/validation.h"
 
 namespace impeller {
@@ -62,7 +61,7 @@ bool Allocation::ReserveNPOT(size_t reserved) {
 }
 
 bool Allocation::Reserve(size_t reserved) {
-  if (reserved == reserved_) {
+  if (reserved <= reserved_) {
     return true;
   }
 
diff --git a/impeller/base/allocation.h b/impeller/base/allocation.h
index e352837d11362d06d09f43c9727934053c2864ec..bd9b2370ef7fb3200e450200827676930fc4e929 100644
--- a/impeller/base/allocation.h
+++ b/impeller/base/allocation.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_BASE_ALLOCATION_H_
+#define FLUTTER_IMPELLER_BASE_ALLOCATION_H_
 
-#include <limits>
+#include <cstdint>
 #include <memory>
 
-#include "flutter/fml/macros.h"
 #include "flutter/fml/mapping.h"
 
 namespace impeller {
@@ -37,7 +37,9 @@ class Allocation {
 
   [[nodiscard]] bool ReserveNPOT(size_t reserved);
 
-  FML_DISALLOW_COPY_AND_ASSIGN(Allocation);
+  Allocation(const Allocation&) = delete;
+
+  Allocation& operator=(const Allocation&) = delete;
 };
 
 std::shared_ptr<fml::Mapping> CreateMappingWithCopy(const uint8_t* contents,
@@ -52,3 +54,5 @@ std::shared_ptr<fml::Mapping> CreateMappingWithString(
 std::shared_ptr<fml::Mapping> CreateMappingWithString(std::string string);
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_BASE_ALLOCATION_H_
diff --git a/impeller/base/backend_cast.h b/impeller/base/backend_cast.h
index c3044bb2ac71c7105bc5ec07b800eddf9c5244e1..a67e4e3dd866355914ec3dee046fdff38c4aab52 100644
--- a/impeller/base/backend_cast.h
+++ b/impeller/base/backend_cast.h
@@ -2,9 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
-
-#include "flutter/fml/macros.h"
+#ifndef FLUTTER_IMPELLER_BASE_BACKEND_CAST_H_
+#define FLUTTER_IMPELLER_BASE_BACKEND_CAST_H_
 
 namespace impeller {
 
@@ -25,3 +24,5 @@ class BackendCast {
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_BASE_BACKEND_CAST_H_
diff --git a/impeller/base/base_unittests.cc b/impeller/base/base_unittests.cc
index 181401fca52ec6b875d606be9543a3d10b79b313..6a865a9eac8db6f8575cab1912f2cae35364c027 100644
--- a/impeller/base/base_unittests.cc
+++ b/impeller/base/base_unittests.cc
@@ -3,9 +3,24 @@
 // found in the LICENSE file.
 
 #include "flutter/testing/testing.h"
+#include "impeller/base/mask.h"
+#include "impeller/base/promise.h"
+#include "impeller/base/strings.h"
 #include "impeller/base/thread.h"
 
 namespace impeller {
+
+enum class MyMaskBits : uint32_t {
+  kFoo = 0,
+  kBar = 1 << 0,
+  kBaz = 1 << 1,
+  kBang = 1 << 2,
+};
+
+using MyMask = Mask<MyMaskBits>;
+
+IMPELLER_ENUM_IS_MASK(MyMaskBits);
+
 namespace testing {
 
 struct Foo {
@@ -68,5 +83,369 @@ TEST(ThreadTest, CanCreateRWMutexLock) {
   // f.mtx.UnlockReader(); <--- Static analysis error.
 }
 
+TEST(StringsTest, CanSPrintF) {
+  ASSERT_EQ(SPrintF("%sx%d", "Hello", 12), "Hellox12");
+  ASSERT_EQ(SPrintF(""), "");
+  ASSERT_EQ(SPrintF("Hello"), "Hello");
+  ASSERT_EQ(SPrintF("%sx%.2f", "Hello", 12.122222), "Hellox12.12");
+}
+
+struct CVTest {
+  Mutex mutex;
+  ConditionVariable cv;
+  uint32_t rando_ivar IPLR_GUARDED_BY(mutex) = 0;
+};
+
+TEST(ConditionVariableTest, WaitUntil) {
+  CVTest test;
+  // test.rando_ivar = 12; // <--- Static analysis error
+  for (size_t i = 0; i < 2; ++i) {
+    test.mutex.Lock();  // <--- Static analysis error without this.
+    auto result = test.cv.WaitUntil(
+        test.mutex,
+        std::chrono::high_resolution_clock::now() +
+            std::chrono::milliseconds{10},
+        [&]() IPLR_REQUIRES(test.mutex) {
+          test.rando_ivar = 12;  // <-- Static analysics error without the
+                                 // IPLR_REQUIRES on the pred.
+          return false;
+        });
+    test.mutex.Unlock();
+    ASSERT_FALSE(result);
+  }
+  Lock lock(test.mutex);  // <--- Static analysis error without this.
+  // The predicate never returns true. So return has to be due to a non-spurious
+  // wake.
+  ASSERT_EQ(test.rando_ivar, 12u);
+}
+
+TEST(ConditionVariableTest, WaitFor) {
+  CVTest test;
+  // test.rando_ivar = 12; // <--- Static analysis error
+  for (size_t i = 0; i < 2; ++i) {
+    test.mutex.Lock();  // <--- Static analysis error without this.
+    auto result = test.cv.WaitFor(
+        test.mutex, std::chrono::milliseconds{10},
+        [&]() IPLR_REQUIRES(test.mutex) {
+          test.rando_ivar = 12;  // <-- Static analysics error without the
+                                 // IPLR_REQUIRES on the pred.
+          return false;
+        });
+    test.mutex.Unlock();
+    ASSERT_FALSE(result);
+  }
+  Lock lock(test.mutex);  // <--- Static analysis error without this.
+  // The predicate never returns true. So return has to be due to a non-spurious
+  // wake.
+  ASSERT_EQ(test.rando_ivar, 12u);
+}
+
+TEST(ConditionVariableTest, WaitForever) {
+  CVTest test;
+  // test.rando_ivar = 12; // <--- Static analysis error
+  for (size_t i = 0; i < 2; ++i) {
+    test.mutex.Lock();  // <--- Static analysis error without this.
+    test.cv.Wait(test.mutex, [&]() IPLR_REQUIRES(test.mutex) {
+      test.rando_ivar = 12;  // <-- Static analysics error without
+                             // the IPLR_REQUIRES on the pred.
+      return true;
+    });
+    test.mutex.Unlock();
+  }
+  Lock lock(test.mutex);  // <--- Static analysis error without this.
+  // The wake only happens when the predicate returns true.
+  ASSERT_EQ(test.rando_ivar, 12u);
+}
+
+TEST(ConditionVariableTest, TestsCriticalSectionAfterWaitForUntil) {
+  std::vector<std::thread> threads;
+  const auto kThreadCount = 10u;
+
+  Mutex mtx;
+  ConditionVariable cv;
+  size_t sum = 0u;
+
+  std::condition_variable start_cv;
+  std::mutex start_mtx;
+  bool start = false;
+  auto start_predicate = [&start]() { return start; };
+  auto thread_main = [&]() {
+    {
+      std::unique_lock start_lock(start_mtx);
+      start_cv.wait(start_lock, start_predicate);
+    }
+
+    mtx.Lock();
+    cv.WaitFor(mtx, std::chrono::milliseconds{0u}, []() { return true; });
+    auto old_val = sum;
+    std::this_thread::sleep_for(std::chrono::milliseconds{100u});
+    sum = old_val + 1u;
+    mtx.Unlock();
+  };
+  // Launch all threads. They will wait for the start CV to be signaled.
+  for (size_t i = 0; i < kThreadCount; i++) {
+    threads.emplace_back(thread_main);
+  }
+  // Notify all threads that the test may start.
+  {
+    {
+      std::scoped_lock start_lock(start_mtx);
+      start = true;
+    }
+    start_cv.notify_all();
+  }
+  // Join all threads.
+  ASSERT_EQ(threads.size(), kThreadCount);
+  for (size_t i = 0; i < kThreadCount; i++) {
+    threads[i].join();
+  }
+  ASSERT_EQ(sum, kThreadCount);
+}
+
+TEST(ConditionVariableTest, TestsCriticalSectionAfterWait) {
+  std::vector<std::thread> threads;
+  const auto kThreadCount = 10u;
+
+  Mutex mtx;
+  ConditionVariable cv;
+  size_t sum = 0u;
+
+  std::condition_variable start_cv;
+  std::mutex start_mtx;
+  bool start = false;
+  auto start_predicate = [&start]() { return start; };
+  auto thread_main = [&]() {
+    {
+      std::unique_lock start_lock(start_mtx);
+      start_cv.wait(start_lock, start_predicate);
+    }
+
+    mtx.Lock();
+    cv.Wait(mtx, []() { return true; });
+    auto old_val = sum;
+    std::this_thread::sleep_for(std::chrono::milliseconds{100u});
+    sum = old_val + 1u;
+    mtx.Unlock();
+  };
+  // Launch all threads. They will wait for the start CV to be signaled.
+  for (size_t i = 0; i < kThreadCount; i++) {
+    threads.emplace_back(thread_main);
+  }
+  // Notify all threads that the test may start.
+  {
+    {
+      std::scoped_lock start_lock(start_mtx);
+      start = true;
+    }
+    start_cv.notify_all();
+  }
+  // Join all threads.
+  ASSERT_EQ(threads.size(), kThreadCount);
+  for (size_t i = 0; i < kThreadCount; i++) {
+    threads[i].join();
+  }
+  ASSERT_EQ(sum, kThreadCount);
+}
+
+TEST(BaseTest, NoExceptionPromiseValue) {
+  NoExceptionPromise<int> wrapper;
+  std::future future = wrapper.get_future();
+  wrapper.set_value(123);
+  ASSERT_EQ(future.get(), 123);
+}
+
+TEST(BaseTest, NoExceptionPromiseEmpty) {
+  auto wrapper = std::make_shared<NoExceptionPromise<int>>();
+  std::future future = wrapper->get_future();
+
+  // Destroy the empty promise with the future still pending. Verify that the
+  // process does not abort while destructing the promise.
+  wrapper.reset();
+}
+
+TEST(BaseTest, CanUseTypedMasks) {
+  {
+    MyMask mask;
+    ASSERT_EQ(static_cast<uint32_t>(mask), 0u);
+    ASSERT_FALSE(mask);
+  }
+
+  {
+    MyMask mask(MyMaskBits::kBar);
+    ASSERT_EQ(static_cast<uint32_t>(mask), 1u);
+    ASSERT_TRUE(mask);
+  }
+
+  {
+    MyMask mask2(MyMaskBits::kBar);
+    MyMask mask(mask2);
+    ASSERT_EQ(static_cast<uint32_t>(mask), 1u);
+    ASSERT_TRUE(mask);
+  }
+
+  {
+    MyMask mask2(MyMaskBits::kBar);
+    MyMask mask(std::move(mask2));  // NOLINT
+    ASSERT_EQ(static_cast<uint32_t>(mask), 1u);
+    ASSERT_TRUE(mask);
+  }
+
+  ASSERT_LT(MyMaskBits::kBar, MyMaskBits::kBaz);
+  ASSERT_LE(MyMaskBits::kBar, MyMaskBits::kBaz);
+  ASSERT_GT(MyMaskBits::kBaz, MyMaskBits::kBar);
+  ASSERT_GE(MyMaskBits::kBaz, MyMaskBits::kBar);
+  ASSERT_EQ(MyMaskBits::kBaz, MyMaskBits::kBaz);
+  ASSERT_NE(MyMaskBits::kBaz, MyMaskBits::kBang);
+
+  {
+    MyMask m1(MyMaskBits::kBar);
+    MyMask m2(MyMaskBits::kBaz);
+    ASSERT_EQ(static_cast<uint32_t>(m1 & m2), 0u);
+    ASSERT_FALSE(m1 & m2);
+  }
+
+  {
+    MyMask m1(MyMaskBits::kBar);
+    MyMask m2(MyMaskBits::kBaz);
+    ASSERT_EQ(static_cast<uint32_t>(m1 | m2), ((1u << 0u) | (1u << 1u)));
+    ASSERT_TRUE(m1 | m2);
+  }
+
+  {
+    MyMask m1(MyMaskBits::kBar);
+    MyMask m2(MyMaskBits::kBaz);
+    ASSERT_EQ(static_cast<uint32_t>(m1 ^ m2), ((1u << 0u) ^ (1u << 1u)));
+    ASSERT_TRUE(m1 ^ m2);
+  }
+
+  {
+    MyMask m1(MyMaskBits::kBar);
+    ASSERT_EQ(static_cast<uint32_t>(~m1), (~(1u << 0u)));
+    ASSERT_TRUE(m1);
+  }
+
+  {
+    MyMask m1 = MyMaskBits::kBar;
+    MyMask m2 = MyMaskBits::kBaz;
+    m2 = m1;
+    ASSERT_EQ(m2, MyMaskBits::kBar);
+  }
+
+  {
+    MyMask m = MyMaskBits::kBar | MyMaskBits::kBaz;
+    ASSERT_TRUE(m);
+  }
+
+  {
+    MyMask m = MyMaskBits::kBar & MyMaskBits::kBaz;
+    ASSERT_FALSE(m);
+  }
+
+  {
+    MyMask m = MyMaskBits::kBar ^ MyMaskBits::kBaz;
+    ASSERT_TRUE(m);
+  }
+
+  {
+    MyMask m = ~MyMaskBits::kBar;
+    ASSERT_TRUE(m);
+  }
+
+  {
+    MyMask m1 = MyMaskBits::kBar;
+    MyMask m2 = MyMaskBits::kBaz;
+    m2 |= m1;
+    ASSERT_EQ(m1, MyMaskBits::kBar);
+    MyMask pred = MyMaskBits::kBar | MyMaskBits::kBaz;
+    ASSERT_EQ(m2, pred);
+  }
+
+  {
+    MyMask m1 = MyMaskBits::kBar;
+    MyMask m2 = MyMaskBits::kBaz;
+    m2 &= m1;
+    ASSERT_EQ(m1, MyMaskBits::kBar);
+    MyMask pred = MyMaskBits::kBar & MyMaskBits::kBaz;
+    ASSERT_EQ(m2, pred);
+  }
+
+  {
+    MyMask m1 = MyMaskBits::kBar;
+    MyMask m2 = MyMaskBits::kBaz;
+    m2 ^= m1;
+    ASSERT_EQ(m1, MyMaskBits::kBar);
+    MyMask pred = MyMaskBits::kBar ^ MyMaskBits::kBaz;
+    ASSERT_EQ(m2, pred);
+  }
+
+  {
+    MyMask x = MyMaskBits::kBar;
+    MyMask m = x | MyMaskBits::kBaz;
+    ASSERT_TRUE(m);
+  }
+
+  {
+    MyMask x = MyMaskBits::kBar;
+    MyMask m = MyMaskBits::kBaz | x;
+    ASSERT_TRUE(m);
+  }
+
+  {
+    MyMask x = MyMaskBits::kBar;
+    MyMask m = x & MyMaskBits::kBaz;
+    ASSERT_FALSE(m);
+  }
+
+  {
+    MyMask x = MyMaskBits::kBar;
+    MyMask m = MyMaskBits::kBaz & x;
+    ASSERT_FALSE(m);
+  }
+
+  {
+    MyMask x = MyMaskBits::kBar;
+    MyMask m = x ^ MyMaskBits::kBaz;
+    ASSERT_TRUE(m);
+  }
+
+  {
+    MyMask x = MyMaskBits::kBar;
+    MyMask m = MyMaskBits::kBaz ^ x;
+    ASSERT_TRUE(m);
+  }
+
+  {
+    MyMask x = MyMaskBits::kBar;
+    MyMask m = ~x;
+    ASSERT_TRUE(m);
+  }
+
+  {
+    MyMaskBits x = MyMaskBits::kBar;
+    MyMask m = MyMaskBits::kBaz;
+    ASSERT_TRUE(x < m);
+    ASSERT_TRUE(x <= m);
+  }
+
+  {
+    MyMaskBits x = MyMaskBits::kBar;
+    MyMask m = MyMaskBits::kBaz;
+    ASSERT_FALSE(x == m);
+  }
+
+  {
+    MyMaskBits x = MyMaskBits::kBar;
+    MyMask m = MyMaskBits::kBaz;
+    ASSERT_TRUE(x != m);
+  }
+
+  {
+    MyMaskBits x = MyMaskBits::kBar;
+    MyMask m = MyMaskBits::kBaz;
+    ASSERT_FALSE(x > m);
+    ASSERT_FALSE(x >= m);
+  }
+}
+
 }  // namespace testing
 }  // namespace impeller
diff --git a/impeller/base/comparable.h b/impeller/base/comparable.h
index 1937aebf2e0b3a806d45c347b2b073f3520d9df6..2f0c6e1e6513f6bca17552938b18aeea95e3ba2f 100644
--- a/impeller/base/comparable.h
+++ b/impeller/base/comparable.h
@@ -2,18 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_BASE_COMPARABLE_H_
+#define FLUTTER_IMPELLER_BASE_COMPARABLE_H_
 
 #include <cstddef>
 #include <functional>
 #include <map>
 #include <memory>
-#include <string>
 #include <type_traits>
 
-#include "flutter/fml/hash_combine.h"
-#include "flutter/fml/macros.h"
-
 namespace impeller {
 
 struct UniqueID {
@@ -113,3 +110,5 @@ struct less<impeller::UniqueID> {
 };
 
 }  // namespace std
+
+#endif  // FLUTTER_IMPELLER_BASE_COMPARABLE_H_
diff --git a/impeller/base/config.h b/impeller/base/config.h
index 610661a48db3307b987bcf672f8a735b10aeb11b..06c91869402d74c83ba8e937d431c3322fc1e10d 100644
--- a/impeller/base/config.h
+++ b/impeller/base/config.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_BASE_CONFIG_H_
+#define FLUTTER_IMPELLER_BASE_CONFIG_H_
 
 #include <cstdlib>
 
@@ -35,3 +36,5 @@ namespace impeller {
 }
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_BASE_CONFIG_H_
diff --git a/impeller/base/mask.h b/impeller/base/mask.h
new file mode 100644
index 0000000000000000000000000000000000000000..97f30d7a7418e1837220210189d3ffae5131924b
--- /dev/null
+++ b/impeller/base/mask.h
@@ -0,0 +1,230 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_BASE_MASK_H_
+#define FLUTTER_IMPELLER_BASE_MASK_H_
+
+#include <type_traits>
+
+namespace impeller {
+
+template <typename EnumType_>
+struct MaskTraits {
+  static constexpr bool kIsMask = false;
+};
+
+//------------------------------------------------------------------------------
+/// @brief      Declare this in the "impeller" namespace to make the enum
+///             maskable.
+///
+#define IMPELLER_ENUM_IS_MASK(enum_name)  \
+  template <>                             \
+  struct MaskTraits<enum_name> {          \
+    static constexpr bool kIsMask = true; \
+  };
+
+//------------------------------------------------------------------------------
+/// @brief      A mask of typed enums.
+///
+/// @tparam     EnumType_  The type of the enum. Must be an enum class.
+///
+template <typename EnumType_>
+struct Mask {
+  using EnumType = EnumType_;
+  using MaskType = typename std::underlying_type<EnumType>::type;
+
+  constexpr Mask() = default;
+
+  constexpr Mask(const Mask<EnumType>& other) = default;
+
+  constexpr Mask(Mask<EnumType>&& other) = default;
+
+  constexpr Mask(EnumType type)  // NOLINT(google-explicit-constructor)
+      : mask_(static_cast<MaskType>(type)) {}
+
+  explicit constexpr Mask(MaskType mask) : mask_(static_cast<MaskType>(mask)) {}
+
+  // All casts must be explicit.
+
+  explicit constexpr operator MaskType() const { return mask_; }
+
+  explicit constexpr operator bool() const { return !!mask_; }
+
+  // The following relational operators can be replaced with a defaulted
+  // spaceship operator post C++20.
+
+  constexpr bool operator<(const Mask<EnumType>& other) const {
+    return mask_ < other.mask_;
+  }
+
+  constexpr bool operator>(const Mask<EnumType>& other) const {
+    return mask_ > other.mask_;
+  }
+
+  constexpr bool operator>=(const Mask<EnumType>& other) const {
+    return mask_ >= other.mask_;
+  }
+
+  constexpr bool operator<=(const Mask<EnumType>& other) const {
+    return mask_ <= other.mask_;
+  }
+
+  constexpr bool operator==(const Mask<EnumType>& other) const {
+    return mask_ == other.mask_;
+  }
+
+  constexpr bool operator!=(const Mask<EnumType>& other) const {
+    return mask_ != other.mask_;
+  }
+
+  // Logical operators.
+
+  constexpr bool operator!() const { return !mask_; }
+
+  // Bitwise operators.
+
+  constexpr Mask<EnumType> operator&(const Mask<EnumType>& other) const {
+    return Mask<EnumType>{mask_ & other.mask_};
+  }
+
+  constexpr Mask<EnumType> operator|(const Mask<EnumType>& other) const {
+    return Mask<EnumType>{mask_ | other.mask_};
+  }
+
+  constexpr Mask<EnumType> operator^(const Mask<EnumType>& other) const {
+    return Mask<EnumType>{mask_ ^ other.mask_};
+  }
+
+  constexpr Mask<EnumType> operator~() const { return Mask<EnumType>{~mask_}; }
+
+  // Assignment operators.
+
+  constexpr Mask<EnumType>& operator=(const Mask<EnumType>&) = default;
+
+  constexpr Mask<EnumType>& operator=(Mask<EnumType>&&) = default;
+
+  constexpr Mask<EnumType>& operator|=(const Mask<EnumType>& other) {
+    mask_ |= other.mask_;
+    return *this;
+  }
+
+  constexpr Mask<EnumType>& operator&=(const Mask<EnumType>& other) {
+    mask_ &= other.mask_;
+    return *this;
+  }
+
+  constexpr Mask<EnumType>& operator^=(const Mask<EnumType>& other) {
+    mask_ ^= other.mask_;
+    return *this;
+  }
+
+ private:
+  MaskType mask_ = {};
+};
+
+// Construction from Enum Types
+
+template <
+    typename EnumType,
+    typename std::enable_if<MaskTraits<EnumType>::kIsMask, bool>::type = true>
+inline constexpr Mask<EnumType> operator|(const EnumType& lhs,
+                                          const EnumType& rhs) {
+  return Mask<EnumType>{lhs} | rhs;
+}
+
+template <
+    typename EnumType,
+    typename std::enable_if<MaskTraits<EnumType>::kIsMask, bool>::type = true>
+inline constexpr Mask<EnumType> operator&(const EnumType& lhs,
+                                          const EnumType& rhs) {
+  return Mask<EnumType>{lhs} & rhs;
+}
+
+template <
+    typename EnumType,
+    typename std::enable_if<MaskTraits<EnumType>::kIsMask, bool>::type = true>
+inline constexpr Mask<EnumType> operator^(const EnumType& lhs,
+                                          const EnumType& rhs) {
+  return Mask<EnumType>{lhs} ^ rhs;
+}
+
+template <
+    typename EnumType,
+    typename std::enable_if<MaskTraits<EnumType>::kIsMask, bool>::type = true>
+inline constexpr Mask<EnumType> operator~(const EnumType& other) {
+  return ~Mask<EnumType>{other};
+}
+
+template <
+    typename EnumType,
+    typename std::enable_if<MaskTraits<EnumType>::kIsMask, bool>::type = true>
+inline constexpr Mask<EnumType> operator|(const EnumType& lhs,
+                                          const Mask<EnumType>& rhs) {
+  return Mask<EnumType>{lhs} | rhs;
+}
+
+template <
+    typename EnumType,
+    typename std::enable_if<MaskTraits<EnumType>::kIsMask, bool>::type = true>
+inline constexpr Mask<EnumType> operator&(const EnumType& lhs,
+                                          const Mask<EnumType>& rhs) {
+  return Mask<EnumType>{lhs} & rhs;
+}
+
+template <
+    typename EnumType,
+    typename std::enable_if<MaskTraits<EnumType>::kIsMask, bool>::type = true>
+inline constexpr Mask<EnumType> operator^(const EnumType& lhs,
+                                          const Mask<EnumType>& rhs) {
+  return Mask<EnumType>{lhs} ^ rhs;
+}
+
+// Relational operators with EnumType promotion. These can be replaced by a
+// defaulted spaceship operator post C++20.
+
+template <typename EnumType,
+          typename std::enable_if_t<MaskTraits<EnumType>::kIsMask, bool> = true>
+inline constexpr bool operator<(const EnumType& lhs,
+                                const Mask<EnumType>& rhs) {
+  return Mask<EnumType>{lhs} < rhs;
+}
+
+template <typename EnumType,
+          typename std::enable_if_t<MaskTraits<EnumType>::kIsMask, bool> = true>
+inline constexpr bool operator>(const EnumType& lhs,
+                                const Mask<EnumType>& rhs) {
+  return Mask<EnumType>{lhs} > rhs;
+}
+
+template <typename EnumType,
+          typename std::enable_if_t<MaskTraits<EnumType>::kIsMask, bool> = true>
+inline constexpr bool operator<=(const EnumType& lhs,
+                                 const Mask<EnumType>& rhs) {
+  return Mask<EnumType>{lhs} <= rhs;
+}
+
+template <typename EnumType,
+          typename std::enable_if_t<MaskTraits<EnumType>::kIsMask, bool> = true>
+inline constexpr bool operator>=(const EnumType& lhs,
+                                 const Mask<EnumType>& rhs) {
+  return Mask<EnumType>{lhs} >= rhs;
+}
+
+template <typename EnumType,
+          typename std::enable_if_t<MaskTraits<EnumType>::kIsMask, bool> = true>
+inline constexpr bool operator==(const EnumType& lhs,
+                                 const Mask<EnumType>& rhs) {
+  return Mask<EnumType>{lhs} == rhs;
+}
+
+template <typename EnumType,
+          typename std::enable_if_t<MaskTraits<EnumType>::kIsMask, bool> = true>
+inline constexpr bool operator!=(const EnumType& lhs,
+                                 const Mask<EnumType>& rhs) {
+  return Mask<EnumType>{lhs} != rhs;
+}
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_BASE_MASK_H_
diff --git a/impeller/base/platform/darwin/work_queue_darwin.cc b/impeller/base/platform/darwin/work_queue_darwin.cc
deleted file mode 100644
index 6ac76520530ed0e7318428216eea4147a2ef4030..0000000000000000000000000000000000000000
--- a/impeller/base/platform/darwin/work_queue_darwin.cc
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "impeller/base/platform/darwin/work_queue_darwin.h"
-
-namespace impeller {
-
-std::shared_ptr<WorkQueueDarwin> WorkQueueDarwin::Create() {
-  auto queue = std::shared_ptr<WorkQueueDarwin>(new WorkQueueDarwin());
-  if (!queue->IsValid()) {
-    return nullptr;
-  }
-  return queue;
-}
-
-WorkQueueDarwin::WorkQueueDarwin()
-    : queue_(::dispatch_queue_create(
-          "io.flutter.impeller.wq",
-          ::dispatch_queue_attr_make_with_qos_class(
-              DISPATCH_QUEUE_CONCURRENT_WITH_AUTORELEASE_POOL,
-              QOS_CLASS_USER_INITIATED,
-              -1))) {}
-
-WorkQueueDarwin::~WorkQueueDarwin() = default;
-
-bool WorkQueueDarwin::IsValid() const {
-  return queue_ != NULL;
-}
-
-// |WorkQueue|
-void WorkQueueDarwin::PostTask(fml::closure task) {
-  dispatch_async(queue_, ^() {
-    task();
-  });
-}
-
-}  // namespace impeller
diff --git a/impeller/base/promise.h b/impeller/base/promise.h
index 04b0cc962bd605b996ab772b76755c7adecda323..9f7205eaab60b94d80b98ab259d20c16c5c1f1e1 100644
--- a/impeller/base/promise.h
+++ b/impeller/base/promise.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_BASE_PROMISE_H_
+#define FLUTTER_IMPELLER_BASE_PROMISE_H_
 
 #include <future>
 
@@ -16,4 +17,34 @@ std::future<T> RealizedFuture(T t) {
   return future;
 }
 
+// Wraps a std::promise and completes the promise with a value during
+// destruction if the promise does not already have a value.
+//
+// By default the std::promise destructor will complete an empty promise with an
+// exception. This will fail because Flutter is built without exception support.
+template <typename T>
+class NoExceptionPromise {
+ public:
+  NoExceptionPromise() = default;
+
+  ~NoExceptionPromise() {
+    if (!value_set_) {
+      promise_.set_value({});
+    }
+  }
+
+  std::future<T> get_future() { return promise_.get_future(); }
+
+  void set_value(const T& value) {
+    promise_.set_value(value);
+    value_set_ = true;
+  }
+
+ private:
+  std::promise<T> promise_;
+  bool value_set_ = false;
+};
+
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_BASE_PROMISE_H_
diff --git a/impeller/base/strings.cc b/impeller/base/strings.cc
index 7b6349157e3ce6e23fbf1ff54b8e68a68ed33358..9623a11827966b80d25031d555810802798971cd 100644
--- a/impeller/base/strings.cc
+++ b/impeller/base/strings.cc
@@ -10,12 +10,21 @@ namespace impeller {
 
 IMPELLER_PRINTF_FORMAT(1, 2)
 std::string SPrintF(const char* format, ...) {
+  std::string ret_val;
   va_list list;
+  va_list list2;
   va_start(list, format);
-  char buffer[64] = {0};
-  ::vsnprintf(buffer, sizeof(buffer), format, list);
+  va_copy(list2, list);
+  if (auto string_length = ::vsnprintf(nullptr, 0, format, list);
+      string_length >= 0) {
+    auto buffer = reinterpret_cast<char*>(::malloc(string_length + 1));
+    ::vsnprintf(buffer, string_length + 1, format, list2);
+    ret_val = std::string{buffer, static_cast<size_t>(string_length)};
+    ::free(buffer);
+  }
+  va_end(list2);
   va_end(list);
-  return buffer;
+  return ret_val;
 }
 
 bool HasPrefix(const std::string& string, const std::string& prefix) {
diff --git a/impeller/base/strings.h b/impeller/base/strings.h
index 085bb1263d8230c3ae8e169f3bfe8f86fa9c4787..cefe10343eb0e4c8ed180b434811dea5db92574b 100644
--- a/impeller/base/strings.h
+++ b/impeller/base/strings.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_BASE_STRINGS_H_
+#define FLUTTER_IMPELLER_BASE_STRINGS_H_
 
 #include <string>
 
@@ -20,3 +21,5 @@ bool HasSuffix(const std::string& string, const std::string& suffix);
 std::string StripPrefix(const std::string& string, const std::string& to_strip);
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_BASE_STRINGS_H_
diff --git a/impeller/base/thread.h b/impeller/base/thread.h
index 9d44b7681cc9330077701948f4d9ffbf8f4c28d9..c9f3fcb24548d3c2173493dd8aa767a8b49de1b8 100644
--- a/impeller/base/thread.h
+++ b/impeller/base/thread.h
@@ -2,18 +2,25 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_BASE_THREAD_H_
+#define FLUTTER_IMPELLER_BASE_THREAD_H_
 
+#include <chrono>
+#include <condition_variable>
+#include <functional>
 #include <memory>
 #include <mutex>
 #include <thread>
 
+#include "flutter/fml/logging.h"
 #include "flutter/fml/macros.h"
 #include "flutter/fml/synchronization/shared_mutex.h"
 #include "impeller/base/thread_safety.h"
 
 namespace impeller {
 
+class ConditionVariable;
+
 class IPLR_CAPABILITY("mutex") Mutex {
  public:
   Mutex() = default;
@@ -25,9 +32,17 @@ class IPLR_CAPABILITY("mutex") Mutex {
   void Unlock() IPLR_RELEASE() { mutex_.unlock(); }
 
  private:
+  friend class ConditionVariable;
+
   std::mutex mutex_;
 
-  FML_DISALLOW_COPY_ASSIGN_AND_MOVE(Mutex);
+  Mutex(const Mutex&) = delete;
+
+  Mutex(Mutex&&) = delete;
+
+  Mutex& operator=(const Mutex&) = delete;
+
+  Mutex& operator=(Mutex&&) = delete;
 };
 
 class IPLR_CAPABILITY("mutex") RWMutex {
@@ -48,24 +63,39 @@ class IPLR_CAPABILITY("mutex") RWMutex {
  private:
   std::unique_ptr<fml::SharedMutex> mutex_;
 
-  FML_DISALLOW_COPY_ASSIGN_AND_MOVE(RWMutex);
+  RWMutex(const RWMutex&) = delete;
+
+  RWMutex(RWMutex&&) = delete;
+
+  RWMutex& operator=(const RWMutex&) = delete;
+
+  RWMutex& operator=(RWMutex&&) = delete;
 };
 
 class IPLR_SCOPED_CAPABILITY Lock {
  public:
-  Lock(Mutex& mutex) IPLR_ACQUIRE(mutex) : mutex_(mutex) { mutex_.Lock(); }
+  explicit Lock(Mutex& mutex) IPLR_ACQUIRE(mutex) : mutex_(mutex) {
+    mutex_.Lock();
+  }
 
   ~Lock() IPLR_RELEASE() { mutex_.Unlock(); }
 
  private:
   Mutex& mutex_;
 
-  FML_DISALLOW_COPY_ASSIGN_AND_MOVE(Lock);
+  Lock(const Lock&) = delete;
+
+  Lock(Lock&&) = delete;
+
+  Lock& operator=(const Lock&) = delete;
+
+  Lock& operator=(Lock&&) = delete;
 };
 
 class IPLR_SCOPED_CAPABILITY ReaderLock {
  public:
-  ReaderLock(RWMutex& mutex) IPLR_ACQUIRE_SHARED(mutex) : mutex_(mutex) {
+  explicit ReaderLock(RWMutex& mutex) IPLR_ACQUIRE_SHARED(mutex)
+      : mutex_(mutex) {
     mutex_.LockReader();
   }
 
@@ -74,12 +104,18 @@ class IPLR_SCOPED_CAPABILITY ReaderLock {
  private:
   RWMutex& mutex_;
 
-  FML_DISALLOW_COPY_ASSIGN_AND_MOVE(ReaderLock);
+  ReaderLock(const ReaderLock&) = delete;
+
+  ReaderLock(ReaderLock&&) = delete;
+
+  ReaderLock& operator=(const ReaderLock&) = delete;
+
+  ReaderLock& operator=(ReaderLock&&) = delete;
 };
 
 class IPLR_SCOPED_CAPABILITY WriterLock {
  public:
-  WriterLock(RWMutex& mutex) IPLR_ACQUIRE(mutex) : mutex_(mutex) {
+  explicit WriterLock(RWMutex& mutex) IPLR_ACQUIRE(mutex) : mutex_(mutex) {
     mutex_.LockWriter();
   }
 
@@ -88,7 +124,150 @@ class IPLR_SCOPED_CAPABILITY WriterLock {
  private:
   RWMutex& mutex_;
 
-  FML_DISALLOW_COPY_ASSIGN_AND_MOVE(WriterLock);
+  WriterLock(const WriterLock&) = delete;
+
+  WriterLock(WriterLock&&) = delete;
+
+  WriterLock& operator=(const WriterLock&) = delete;
+
+  WriterLock& operator=(WriterLock&&) = delete;
+};
+
+//------------------------------------------------------------------------------
+/// @brief      A condition variable exactly similar to the one in libcxx with
+///             two major differences:
+///
+///             * On the Wait, WaitFor, and WaitUntil calls, static analysis
+///               annotation are respected.
+///             * There is no ability to wait on a condition variable and also
+///               be susceptible to spurious wakes. This is because the
+///               predicate is mandatory.
+///
+class ConditionVariable {
+ public:
+  ConditionVariable() = default;
+
+  ~ConditionVariable() = default;
+
+  ConditionVariable(const ConditionVariable&) = delete;
+
+  ConditionVariable& operator=(const ConditionVariable&) = delete;
+
+  void NotifyOne() { cv_.notify_one(); }
+
+  void NotifyAll() { cv_.notify_all(); }
+
+  using Predicate = std::function<bool()>;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Atomically unlocks the mutex and waits on the condition
+  ///             variable up to a specified time point. Lock will be reacquired
+  ///             when the wait exits. Spurious wakes may happen before the time
+  ///             point is reached. In such cases the predicate is invoked and
+  ///             it must return `false` for the wait to continue. The predicate
+  ///             will be invoked with the mutex locked.
+  ///
+  /// @note       Since the predicate is invoked with the mutex locked, if it
+  ///             accesses other guarded resources, the predicate itself must be
+  ///             decorated with the IPLR_REQUIRES directive. For instance,
+  ///
+  ///             ```c++
+  ///                [] () IPLR_REQUIRES(mutex) {
+  ///                return my_guarded_resource.should_stop_waiting;
+  ///              }
+  ///              ```
+  ///
+  /// @param      mutex                The mutex.
+  /// @param[in]  time_point           The time point to wait to.
+  /// @param[in]  should_stop_waiting  The predicate invoked on spurious wakes.
+  ///                                  Must return false for the wait to
+  ///                                  continue.
+  ///
+  /// @tparam     Clock                The clock type.
+  /// @tparam     Duration             The duration type.
+  ///
+  /// @return     The value of the predicate at the end of the wait.
+  ///
+  template <class Clock, class Duration>
+  bool WaitUntil(Mutex& mutex,
+                 const std::chrono::time_point<Clock, Duration>& time_point,
+                 const Predicate& should_stop_waiting) IPLR_REQUIRES(mutex) {
+    std::unique_lock lock(mutex.mutex_, std::adopt_lock);
+    const auto result = cv_.wait_until(lock, time_point, should_stop_waiting);
+    lock.release();
+    return result;
+  }
+
+  //----------------------------------------------------------------------------
+  /// @brief      Atomically unlocks the mutex and waits on the condition
+  ///             variable for a designated duration. Lock will be reacquired
+  ///             when the wait exits. Spurious wakes may happen before the time
+  ///             point is reached. In such cases the predicate is invoked and
+  ///             it must return `false` for the wait to continue. The predicate
+  ///             will be invoked with the mutex locked.
+  ///
+  /// @note       Since the predicate is invoked with the mutex locked, if it
+  ///             accesses other guarded resources, the predicate itself must be
+  ///             decorated with the IPLR_REQUIRES directive. For instance,
+  ///
+  ///             ```c++
+  ///                [] () IPLR_REQUIRES(mutex) {
+  ///                return my_guarded_resource.should_stop_waiting;
+  ///              }
+  ///              ```
+  ///
+  /// @param      mutex                The mutex.
+  /// @param[in]  duration             The duration to wait for.
+  /// @param[in]  should_stop_waiting  The predicate invoked on spurious wakes.
+  ///                                  Must return false for the wait to
+  ///                                  continue.
+  ///
+  /// @tparam     Representation       The duration representation type.
+  /// @tparam     Period               The duration period type.
+  ///
+  /// @return     The value of the predicate at the end of the wait.
+  ///
+  template <class Representation, class Period>
+  bool WaitFor(Mutex& mutex,
+               const std::chrono::duration<Representation, Period>& duration,
+               const Predicate& should_stop_waiting) IPLR_REQUIRES(mutex) {
+    return WaitUntil(mutex, std::chrono::steady_clock::now() + duration,
+                     should_stop_waiting);
+  }
+
+  //----------------------------------------------------------------------------
+  /// @brief      Atomically unlocks the mutex and waits on the condition
+  ///             variable indefinitely till the predicate determines that the
+  ///             wait must end. Lock will be reacquired when the wait exits.
+  ///             Spurious wakes may happen before the time point is reached. In
+  ///             such cases the predicate is invoked and it must return `false`
+  ///             for the wait to continue. The predicate will be invoked with
+  ///             the mutex locked.
+  ///
+  /// @note       Since the predicate is invoked with the mutex locked, if it
+  ///             accesses other guarded resources, the predicate itself must be
+  ///             decorated with the IPLR_REQUIRES directive. For instance,
+  ///
+  ///             ```c++
+  ///                [] () IPLR_REQUIRES(mutex) {
+  ///                return my_guarded_resource.should_stop_waiting;
+  ///              }
+  ///              ```
+  ///
+  /// @param      mutex                The mutex
+  /// @param[in]  should_stop_waiting  The should stop waiting
+  ///
+  void Wait(Mutex& mutex, const Predicate& should_stop_waiting)
+      IPLR_REQUIRES(mutex) {
+    std::unique_lock lock(mutex.mutex_, std::adopt_lock);
+    cv_.wait(lock, should_stop_waiting);
+    lock.release();
+  }
+
+ private:
+  std::condition_variable cv_;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_BASE_THREAD_H_
diff --git a/impeller/base/thread_safety.h b/impeller/base/thread_safety.h
index 8d1f0aa02ccf256b2b3c2e5a34fcfb69fca8948a..da1aed3b5e7a5692f9a6e10ce58c73d3b6dec97c 100644
--- a/impeller/base/thread_safety.h
+++ b/impeller/base/thread_safety.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_BASE_THREAD_SAFETY_H_
+#define FLUTTER_IMPELLER_BASE_THREAD_SAFETY_H_
 
 #if defined(__clang__)
 #define IPLR_THREAD_ANNOTATION_ATTRIBUTE__(x) __attribute__((x))
@@ -67,3 +68,5 @@
 
 #define IPLR_NO_THREAD_SAFETY_ANALYSIS \
   IPLR_THREAD_ANNOTATION_ATTRIBUTE__(no_thread_safety_analysis)
+
+#endif  // FLUTTER_IMPELLER_BASE_THREAD_SAFETY_H_
diff --git a/impeller/base/timing.h b/impeller/base/timing.h
new file mode 100644
index 0000000000000000000000000000000000000000..86ac48ceba327ae63c29c73a19cd933bb4296a93
--- /dev/null
+++ b/impeller/base/timing.h
@@ -0,0 +1,19 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_BASE_TIMING_H_
+#define FLUTTER_IMPELLER_BASE_TIMING_H_
+
+#include <chrono>
+
+namespace impeller {
+
+using MillisecondsF = std::chrono::duration<float, std::milli>;
+using SecondsF = std::chrono::duration<float>;
+using Clock = std::chrono::high_resolution_clock;
+using TimePoint = std::chrono::time_point<std::chrono::high_resolution_clock>;
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_BASE_TIMING_H_
diff --git a/impeller/base/validation.cc b/impeller/base/validation.cc
index 94e35fc84f2622fd1cdd823f1f2a21dd84b5b5a3..d95a84c811c89d4d0a7ab327ff5ed9392ab3c2fa 100644
--- a/impeller/base/validation.cc
+++ b/impeller/base/validation.cc
@@ -11,6 +11,11 @@
 namespace impeller {
 
 static std::atomic_int32_t sValidationLogsDisabledCount = 0;
+static std::atomic_int32_t sValidationLogsAreFatal = 0;
+
+void ImpellerValidationErrorsSetFatal(bool fatal) {
+  sValidationLogsAreFatal = fatal;
+}
 
 ScopedValidationDisable::ScopedValidationDisable() {
   sValidationLogsDisabledCount++;
@@ -20,16 +25,19 @@ ScopedValidationDisable::~ScopedValidationDisable() {
   sValidationLogsDisabledCount--;
 }
 
+ScopedValidationFatal::ScopedValidationFatal() {
+  sValidationLogsAreFatal++;
+}
+
+ScopedValidationFatal::~ScopedValidationFatal() {
+  sValidationLogsAreFatal--;
+}
+
 ValidationLog::ValidationLog() = default;
 
 ValidationLog::~ValidationLog() {
   if (sValidationLogsDisabledCount <= 0) {
-#if (FLUTTER_RUNTIME_MODE == FLUTTER_RUNTIME_MODE_RELEASE)
-    FML_LOG(ERROR) << stream_.str();
-    ImpellerValidationBreak();
-#else
-    FML_LOG(FATAL) << stream_.str();
-#endif
+    ImpellerValidationBreak(stream_.str().c_str());
   }
 }
 
@@ -37,10 +45,23 @@ std::ostream& ValidationLog::GetStream() {
   return stream_;
 }
 
-void ImpellerValidationBreak() {
-  // Nothing to do. Exists for the debugger.
-  FML_LOG(ERROR) << "Break on " << __FUNCTION__
-                 << " to inspect point of failure.";
+void ImpellerValidationBreak(const char* message) {
+  std::stringstream stream;
+#if FLUTTER_RELEASE
+  stream << "Impeller validation: " << message;
+#else
+  stream << "Break on '" << __FUNCTION__
+         << "' to inspect point of failure: " << message;
+#endif
+  if (sValidationLogsAreFatal > 0) {
+    FML_LOG(FATAL) << stream.str();
+  } else {
+    FML_LOG(ERROR) << stream.str();
+  }
+}
+
+bool ImpellerValidationErrorsAreFatal() {
+  return sValidationLogsAreFatal;
 }
 
 }  // namespace impeller
diff --git a/impeller/base/validation.h b/impeller/base/validation.h
index 18bb1b5b4a22d03203370509392b2cc6a731e832..6d3ca3a52d19f83df8ff4d76d37e39a81309ca5e 100644
--- a/impeller/base/validation.h
+++ b/impeller/base/validation.h
@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_BASE_VALIDATION_H_
+#define FLUTTER_IMPELLER_BASE_VALIDATION_H_
 
 #include <sstream>
 
-#include "flutter/fml/macros.h"
-
 namespace impeller {
 
 class ValidationLog {
@@ -21,19 +20,56 @@ class ValidationLog {
  private:
   std::ostringstream stream_;
 
-  FML_DISALLOW_COPY_ASSIGN_AND_MOVE(ValidationLog);
+  ValidationLog(const ValidationLog&) = delete;
+
+  ValidationLog(ValidationLog&&) = delete;
+
+  ValidationLog& operator=(const ValidationLog&) = delete;
+
+  ValidationLog& operator=(ValidationLog&&) = delete;
 };
 
-void ImpellerValidationBreak();
+void ImpellerValidationBreak(const char* message);
+
+void ImpellerValidationErrorsSetFatal(bool fatal);
+
+bool ImpellerValidationErrorsAreFatal();
 
 struct ScopedValidationDisable {
   ScopedValidationDisable();
 
   ~ScopedValidationDisable();
 
-  FML_DISALLOW_COPY_AND_ASSIGN(ScopedValidationDisable);
+  ScopedValidationDisable(const ScopedValidationDisable&) = delete;
+
+  ScopedValidationDisable& operator=(const ScopedValidationDisable&) = delete;
+};
+
+struct ScopedValidationFatal {
+  ScopedValidationFatal();
+
+  ~ScopedValidationFatal();
+
+  ScopedValidationFatal(const ScopedValidationFatal&) = delete;
+
+  ScopedValidationFatal& operator=(const ScopedValidationFatal&) = delete;
 };
 
 }  // namespace impeller
 
+//------------------------------------------------------------------------------
+/// Get a stream to the log Impeller uses for all validation errors. The
+/// behavior of these logs is as follows:
+///
+/// * Validation error are completely ignored in the Flutter release
+///   runtime-mode.
+/// * In non-release runtime-modes, validation logs are redirected to the
+///   Flutter `INFO` log. These logs typically show up when verbose logging is
+///   enabled.
+/// * If `ImpellerValidationErrorsSetFatal` is set to `true`, validation logs
+///   are fatal. The runtime-mode restriction still applies. This usually
+///   happens in test environments.
+///
 #define VALIDATION_LOG ::impeller::ValidationLog{}.GetStream()
+
+#endif  // FLUTTER_IMPELLER_BASE_VALIDATION_H_
diff --git a/impeller/base/version.h b/impeller/base/version.h
index 8be914f6ba505e962febb7579de79570ddd9c0dc..d2c67575bff3006ac989c4dd7aee9e96f97cbb20 100644
--- a/impeller/base/version.h
+++ b/impeller/base/version.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_BASE_VERSION_H_
+#define FLUTTER_IMPELLER_BASE_VERSION_H_
 
 #include <cstddef>
 #include <optional>
@@ -18,14 +19,16 @@ struct Version {
   size_t minor_version;
   size_t patch_version;
 
-  constexpr Version(size_t p_major = 0, size_t p_minor = 0, size_t p_patch = 0)
+  constexpr explicit Version(size_t p_major = 0,
+                             size_t p_minor = 0,
+                             size_t p_patch = 0)
       : major_version(p_major),
         minor_version(p_minor),
         patch_version(p_patch) {}
 
   static std::optional<Version> FromVector(const std::vector<size_t>& version);
 
-  constexpr bool IsAtLeast(const Version& other) {
+  constexpr bool IsAtLeast(const Version& other) const {
     return std::tie(major_version, minor_version, patch_version) >=
            std::tie(other.major_version, other.minor_version,
                     other.patch_version);
@@ -35,3 +38,5 @@ struct Version {
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_BASE_VERSION_H_
diff --git a/impeller/blobcat/blobcat_unittests.cc b/impeller/blobcat/blobcat_unittests.cc
deleted file mode 100644
index 6fc8783f652bd92285028d509482277d042c71ca..0000000000000000000000000000000000000000
--- a/impeller/blobcat/blobcat_unittests.cc
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <string>
-
-#include "flutter/fml/mapping.h"
-#include "flutter/testing/testing.h"
-#include "impeller/blobcat/blob_library.h"
-#include "impeller/blobcat/blob_writer.h"
-
-namespace impeller {
-namespace testing {
-
-static std::shared_ptr<fml::Mapping> CreateMappingFromString(
-    std::string p_string) {
-  auto string = std::make_shared<std::string>(std::move(p_string));
-  return std::make_shared<fml::NonOwnedMapping>(
-      reinterpret_cast<const uint8_t*>(string->data()), string->size(),
-      [string](auto, auto) {});
-}
-
-const std::string CreateStringFromMapping(const fml::Mapping& mapping) {
-  return std::string{reinterpret_cast<const char*>(mapping.GetMapping()),
-                     mapping.GetSize()};
-}
-
-TEST(BlobTest, CanReadAndWriteBlobs) {
-  BlobWriter writer;
-  ASSERT_TRUE(writer.AddBlob(BlobShaderType::kVertex, "Hello",
-                             CreateMappingFromString("World")));
-  ASSERT_TRUE(writer.AddBlob(BlobShaderType::kFragment, "Foo",
-                             CreateMappingFromString("Bar")));
-  ASSERT_TRUE(writer.AddBlob(BlobShaderType::kVertex, "Baz",
-                             CreateMappingFromString("Bang")));
-  ASSERT_TRUE(writer.AddBlob(BlobShaderType::kVertex, "Ping",
-                             CreateMappingFromString("Pong")));
-  ASSERT_TRUE(writer.AddBlob(BlobShaderType::kFragment, "Pang",
-                             CreateMappingFromString("World")));
-
-  auto mapping = writer.CreateMapping();
-  ASSERT_NE(mapping, nullptr);
-
-  BlobLibrary library(mapping);
-  ASSERT_TRUE(library.IsValid());
-  ASSERT_EQ(library.GetShaderCount(), 5u);
-
-  // Wrong type.
-  ASSERT_EQ(library.GetMapping(BlobShaderType::kFragment, "Hello"), nullptr);
-
-  auto hello_vtx = library.GetMapping(BlobShaderType::kVertex, "Hello");
-  ASSERT_NE(hello_vtx, nullptr);
-  ASSERT_EQ(CreateStringFromMapping(*hello_vtx), "World");
-}
-
-}  // namespace testing
-}  // namespace impeller
diff --git a/impeller/compiler/BUILD.gn b/impeller/compiler/BUILD.gn
index 3098941bf611d7744f8312c49c35712dffd520e0..5ea4c05b3e17e165be5aea87bf458715761aa05d 100644
--- a/impeller/compiler/BUILD.gn
+++ b/impeller/compiler/BUILD.gn
@@ -5,8 +5,26 @@
 import("//flutter/impeller/tools/impeller.gni")
 import("//flutter/shell/version/version.gni")
 
+impeller_component("utilities") {
+  # Current versions of libcxx have deprecated some of the UTF-16 string
+  # conversion APIs.
+  defines = [ "_LIBCPP_DISABLE_DEPRECATION_WARNINGS" ]
+
+  sources = [
+    "utilities.cc",
+    "utilities.h",
+  ]
+
+  public_deps = [
+    "../base",
+    "../geometry",
+    "../runtime_stage",
+    "//flutter/fml",
+  ]
+}
+
 impeller_component("compiler_lib") {
-  include_dirs = [ "//third_party/vulkan-deps/spirv-cross/src/" ]
+  include_dirs = [ "//flutter/third_party/vulkan-deps/spirv-cross/src/" ]
 
   # Current versions of libcxx have deprecated some of the UTF-16 string
   # conversion APIs.
@@ -18,6 +36,8 @@ impeller_component("compiler_lib") {
     "compiler.h",
     "compiler_backend.cc",
     "compiler_backend.h",
+    "constants.cc",
+    "constants.h",
     "include_dir.h",
     "includer.cc",
     "includer.h",
@@ -26,69 +46,39 @@ impeller_component("compiler_lib") {
     "reflector.h",
     "runtime_stage_data.cc",
     "runtime_stage_data.h",
+    "shader_bundle.cc",
+    "shader_bundle.h",
+    "shader_bundle_data.cc",
+    "shader_bundle_data.h",
     "source_options.cc",
     "source_options.h",
+    "spirv_compiler.cc",
+    "spirv_compiler.h",
     "spirv_sksl.cc",
     "spirv_sksl.h",
     "switches.cc",
     "switches.h",
     "types.cc",
     "types.h",
-    "utilities.cc",
-    "utilities.h",
+    "uniform_sorter.cc",
+    "uniform_sorter.h",
   ]
 
   public_deps = [
+    ":utilities",
     "../base",
     "../geometry",
     "../runtime_stage",
     "//flutter/fml",
+    "//flutter/impeller/shader_bundle:shader_bundle_flatbuffers",
 
-    # All third_party deps must be reflected below in the impellerc_license
-    # target.
+    # All third_party deps must be included by the global license script.
     "//third_party/inja",
     "//third_party/shaderc_flutter",
     "//third_party/spirv_cross_flutter",
   ]
 }
 
-generated_file("impellerc_license") {
-  source_path = rebase_path(".", "//flutter")
-  git_url = "https://github.com/flutter/engine/tree/$engine_version"
-  outputs = [ "$target_gen_dir/LICENSE.impellerc.md" ]
-  contents = [
-    "# impellerc",
-    "",
-    "This tool is used by the Flutter SDK to compile shaders.",
-    "",
-    "Source code for this tool: [flutter/engine/$source_path]($git_url/$source_path).",
-    "",
-    "## Licenses",
-    "",
-    "### impellerc",
-    "",
-    read_file("//flutter/sky/packages/sky_engine/LICENSE", "string"),
-    "",
-
-    # These licenses are ignored by the main license checker, since they are not
-    # shipped to end-application binaries and only shipped as part of developer
-    # tooling in impellerc. Add them here.
-    "## Additional open source licenses",
-    "",
-    "### inja",
-    "",
-    read_file("//third_party/inja/LICENSE", "string"),
-    "",
-    "### shaderc",
-    "",
-    read_file("//third_party/shaderc/LICENSE", "string"),
-    "",
-    "### spirv_cross",
-    "",
-    read_file("//third_party/vulkan-deps/spirv-cross/src/LICENSE", "string"),
-  ]
-}
-
 impeller_component("impellerc") {
   target_type = "executable"
 
@@ -105,10 +95,7 @@ impeller_component("impellerc") {
 }
 
 group("compiler") {
-  deps = [
-    ":impellerc",
-    ":impellerc_license",
-  ]
+  deps = [ ":impellerc" ]
 }
 
 impeller_component("compiler_unittests") {
@@ -120,6 +107,7 @@ impeller_component("compiler_unittests") {
     "compiler_test.cc",
     "compiler_test.h",
     "compiler_unittests.cc",
+    "shader_bundle_unittests.cc",
     "switches_unittests.cc",
   ]
 
diff --git a/impeller/compiler/code_gen_template.h b/impeller/compiler/code_gen_template.h
index d2708052d1838a73f5277488919ef23b92507922..dbef3017c0e41654694de65956e1b8a4bc24977a 100644
--- a/impeller/compiler/code_gen_template.h
+++ b/impeller/compiler/code_gen_template.h
@@ -16,19 +16,15 @@ constexpr std::string_view kReflectionHeaderTemplate =
 {# Note: The nogncheck decorations are only to make GN not mad at the template#}
 {# this file is generated from. There are no GN rule violations in the generated#}
 {# file itself and the no-check declarations will be stripped in generated files.#}
-#include "impeller/renderer/buffer_view.h"                {# // nogncheck #}
+#include "impeller/core/buffer_view.h"                {# // nogncheck #}
 
-#include "impeller/renderer/command.h"                    {# // nogncheck #}
+#include "impeller/core/sampler.h"                    {# // nogncheck #}
 
-#include "impeller/renderer/compute_command.h"            {# // nogncheck #}
+#include "impeller/core/shader_types.h"               {# // nogncheck #}
 
-#include "impeller/renderer/descriptor_set_layout.h"      {# // nogncheck #}
+#include "impeller/core/resource_binder.h"            {# // nogncheck #}
 
-#include "impeller/renderer/sampler.h"                    {# // nogncheck #}
-
-#include "impeller/renderer/shader_types.h"               {# // nogncheck #}
-
-#include "impeller/renderer/texture.h"                    {# // nogncheck #}
+#include "impeller/core/texture.h"                    {# // nogncheck #}
 
 
 namespace impeller {
@@ -90,7 +86,8 @@ struct {{camel_case(shader_name)}}{{camel_case(shader_stage)}}Shader {
     {{stage_input.type.type_name}},     // type
     {{stage_input.type.bit_width}}u,    // bit width of type
     {{stage_input.type.vec_size}}u,     // vec size
-    {{stage_input.type.columns}}u       // number of columns
+    {{stage_input.type.columns}}u,      // number of columns
+    {{stage_input.offset}}u,            // offset for interleaved layout
   };
 {% endfor %}
 {% endif %}
@@ -101,6 +98,20 @@ struct {{camel_case(shader_name)}}{{camel_case(shader_stage)}}Shader {
 {% endfor %}
   };
 
+{% if shader_stage == "vertex" %}
+  static constexpr auto kInterleavedLayout = ShaderStageBufferLayout {
+{% if length(stage_inputs) > 0 %}
+    sizeof(PerVertexData),                 // stride for interleaved layout
+{% else %}
+    0u,
+{% endif %}
+    0u,                                    // attribute binding
+  };
+  static constexpr std::array<const ShaderStageBufferLayout*, 1> kInterleavedBufferLayout = {
+    &kInterleavedLayout
+  };
+{% endif %}
+
 {% if length(sampled_images) > 0 %}
   // ===========================================================================
   // Sampled Images ============================================================
@@ -109,10 +120,9 @@ struct {{camel_case(shader_name)}}{{camel_case(shader_stage)}}Shader {
 
   static constexpr auto kResource{{camel_case(sampled_image.name)}} = SampledImageSlot { // {{sampled_image.name}}
     "{{sampled_image.name}}",      // name
-    {{sampled_image.ext_res_0}}u,  // texture
-    {{sampled_image.ext_res_1}}u,  // sampler
-    {{sampled_image.binding}}u,    // binding
+    {{sampled_image.ext_res_0}}u,  // ext_res_0
     {{sampled_image.set}}u,        // set
+    {{sampled_image.binding}}u,    // binding
   };
   static ShaderMetadata kMetadata{{camel_case(sampled_image.name)}};
 {% endfor %}
@@ -151,7 +161,7 @@ struct {{camel_case(shader_name)}}{{camel_case(shader_stage)}}Shader {
 {% endfor %}) {
     return {{ proto.args.0.argument_name }}.BindResource({% for arg in proto.args %}
   {% if loop.is_first %}
-{{to_shader_stage(shader_stage)}}, kResource{{ proto.name }}, kMetadata{{ proto.name }}, {% else %}
+{{to_shader_stage(shader_stage)}}, {{ proto.descriptor_type }}, kResource{{ proto.name }}, kMetadata{{ proto.name }}, {% else %}
 std::move({{ arg.argument_name }}){% if not loop.is_last %}, {% endif %}
   {% endif %}
   {% endfor %});
@@ -162,21 +172,26 @@ std::move({{ arg.argument_name }}){% if not loop.is_last %}, {% endif %}
   // ===========================================================================
   // Metadata for Vulkan =======================================================
   // ===========================================================================
-  static constexpr std::array<DescriptorSetLayout,{{length(buffers)+length(sampled_images)}}> kDescriptorSetLayouts{
+  static constexpr std::array<DescriptorSetLayout,{{length(buffers)+length(sampled_images)+length(subpass_inputs)}}> kDescriptorSetLayouts{
+{% for subpass_input in subpass_inputs %}
+    DescriptorSetLayout{
+      {{subpass_input.binding}}, // binding = {{subpass_input.binding}}
+      {{subpass_input.descriptor_type}}, // descriptor_type = {{subpass_input.descriptor_type}}
+      {{to_shader_stage(shader_stage)}}, // shader_stage = {{to_shader_stage(shader_stage)}}
+    },
+{% endfor %}
 {% for buffer in buffers %}
     DescriptorSetLayout{
       {{buffer.binding}}, // binding = {{buffer.binding}}
-      DescriptorType::kUniformBuffer, // descriptorType = Uniform Buffer
-      1, // descriptorCount = 1
-      {{to_shader_stage(shader_stage)}}, // stageFlags = {{to_shader_stage(shader_stage)}}
+      {{buffer.descriptor_type}}, // descriptor_type = {{buffer.descriptor_type}}
+      {{to_shader_stage(shader_stage)}}, // shader_stage = {{to_shader_stage(shader_stage)}}
     },
 {% endfor %}
 {% for sampled_image in sampled_images %}
     DescriptorSetLayout{
       {{sampled_image.binding}}, // binding = {{sampled_image.binding}}
-      DescriptorType::kSampledImage, // descriptorType = Sampled Image
-      1, // descriptorCount = 1
-      {{to_shader_stage(shader_stage)}}, // stageFlags = {{to_shader_stage(shader_stage)}}
+      {{sampled_image.descriptor_type}}, // descriptor_type = {{sampled_image.descriptor_type}}
+      {{to_shader_stage(shader_stage)}}, // shader_stage = {{to_shader_stage(shader_stage)}}
     },
 {% endfor %}
   };
diff --git a/impeller/compiler/compiler.cc b/impeller/compiler/compiler.cc
index fdb9ebd8f9130b91f6e29d8856ca8202ff539bdf..6123ad3f15982cecbb202286fe0d2e4aebc7219e 100644
--- a/impeller/compiler/compiler.cc
+++ b/impeller/compiler/compiler.cc
@@ -4,90 +4,174 @@
 
 #include "impeller/compiler/compiler.h"
 
-#include <array>
+#include <cstdint>
 #include <filesystem>
 #include <memory>
+#include <optional>
 #include <sstream>
+#include <string>
 #include <utility>
 
 #include "flutter/fml/paths.h"
 #include "impeller/base/allocation.h"
 #include "impeller/compiler/compiler_backend.h"
+#include "impeller/compiler/constants.h"
 #include "impeller/compiler/includer.h"
 #include "impeller/compiler/logger.h"
+#include "impeller/compiler/spirv_compiler.h"
 #include "impeller/compiler/types.h"
+#include "impeller/compiler/uniform_sorter.h"
+#include "impeller/compiler/utilities.h"
 
 namespace impeller {
 namespace compiler {
 
-const uint32_t kFragBindingBase = 128;
-const size_t kNumUniformKinds =
-    static_cast<int>(shaderc_uniform_kind::shaderc_uniform_kind_buffer) + 1;
+static uint32_t ParseMSLVersion(const std::string& msl_version) {
+  std::stringstream sstream(msl_version);
+  std::string version_part;
+  uint32_t major = 1;
+  uint32_t minor = 2;
+  uint32_t patch = 0;
+  if (std::getline(sstream, version_part, '.')) {
+    major = std::stoi(version_part);
+    if (std::getline(sstream, version_part, '.')) {
+      minor = std::stoi(version_part);
+      if (std::getline(sstream, version_part, '.')) {
+        patch = std::stoi(version_part);
+      }
+    }
+  }
+  if (major < 1 || (major == 1 && minor < 2)) {
+    std::cerr << "--metal-version version must be at least 1.2. Have "
+              << msl_version << std::endl;
+  }
+  return spirv_cross::CompilerMSL::Options::make_msl_version(major, minor,
+                                                             patch);
+}
 
-static CompilerBackend CreateMSLCompiler(const spirv_cross::ParsedIR& ir,
-                                         const SourceOptions& source_options) {
+static CompilerBackend CreateMSLCompiler(
+    const spirv_cross::ParsedIR& ir,
+    const SourceOptions& source_options,
+    std::optional<uint32_t> msl_version_override = {}) {
   auto sl_compiler = std::make_shared<spirv_cross::CompilerMSL>(ir);
   spirv_cross::CompilerMSL::Options sl_options;
   sl_options.platform =
       TargetPlatformToMSLPlatform(source_options.target_platform);
-  // If this version specification changes, the GN rules that process the
-  // Metal to AIR must be updated as well.
-  sl_options.msl_version =
-      spirv_cross::CompilerMSL::Options::make_msl_version(1, 2);
+  sl_options.msl_version = msl_version_override.value_or(
+      ParseMSLVersion(source_options.metal_version));
+  sl_options.ios_use_simdgroup_functions =
+      sl_options.is_ios() &&
+      sl_options.msl_version >=
+          spirv_cross::CompilerMSL::Options::make_msl_version(2, 4, 0);
+  sl_options.use_framebuffer_fetch_subpasses = true;
   sl_compiler->set_msl_options(sl_options);
 
-  // Set metal resource mappings to be consistent with location based mapping
-  // used on other backends when creating fragment shaders. This doesn't seem
-  // to work with the generated bindings for compute shaders, nor for certain
-  // shaders in the flutter/engine tree.
-  if (source_options.remap_samplers) {
-    std::vector<uint32_t> sampler_offsets;
-    ir.for_each_typed_id<spirv_cross::SPIRVariable>(
-        [&](uint32_t, const spirv_cross::SPIRVariable& var) {
-          if (var.storage != spv::StorageClassUniformConstant) {
-            return;
-          }
-          const auto spir_type = sl_compiler->get_type(var.basetype);
-          auto location = sl_compiler->get_decoration(
-              var.self, spv::Decoration::DecorationLocation);
-          if (spir_type.basetype ==
-              spirv_cross::SPIRType::BaseType::SampledImage) {
-            sampler_offsets.push_back(location);
-          }
-        });
-    if (sampler_offsets.size() > 0) {
-      auto start_offset =
-          *std::min_element(sampler_offsets.begin(), sampler_offsets.end());
-      for (auto offset : sampler_offsets) {
-        sl_compiler->add_msl_resource_binding({
-            .stage = spv::ExecutionModel::ExecutionModelFragment,
-            .basetype = spirv_cross::SPIRType::BaseType::SampledImage,
-            .binding = offset,
-            .count = 1u,
-            // A sampled image is both an image and a sampler, so both
-            // offsets need to be set or depending on the partiular shader
-            // the bindings may be incorrect.
-            .msl_texture = offset - start_offset,
-            .msl_sampler = offset - start_offset,
-        });
-      }
-    }
+  // Sort the float and sampler uniforms according to their declared/decorated
+  // order. For user authored fragment shaders, the API for setting uniform
+  // values uses the index of the uniform in the declared order. By default, the
+  // metal backend of spirv-cross will order uniforms according to usage. To fix
+  // this, we use the sorted order and the add_msl_resource_binding API to force
+  // the ordering to match the declared order. Note that while this code runs
+  // for all compiled shaders, it will only affect vertex and fragment shaders
+  // due to the specified stage.
+  auto floats =
+      SortUniforms(&ir, sl_compiler.get(), spirv_cross::SPIRType::Float);
+  auto images =
+      SortUniforms(&ir, sl_compiler.get(), spirv_cross::SPIRType::SampledImage);
+
+  spv::ExecutionModel execution_model =
+      spv::ExecutionModel::ExecutionModelFragment;
+  if (source_options.type == SourceType::kVertexShader) {
+    execution_model = spv::ExecutionModel::ExecutionModelVertex;
+  }
+
+  uint32_t buffer_offset = 0;
+  uint32_t sampler_offset = 0;
+  for (auto& float_id : floats) {
+    sl_compiler->add_msl_resource_binding(
+        {.stage = execution_model,
+         .basetype = spirv_cross::SPIRType::BaseType::Float,
+         .desc_set = sl_compiler->get_decoration(float_id,
+                                                 spv::DecorationDescriptorSet),
+         .binding =
+             sl_compiler->get_decoration(float_id, spv::DecorationBinding),
+         .count = 1u,
+         .msl_buffer = buffer_offset});
+    buffer_offset++;
+  }
+  for (auto& image_id : images) {
+    sl_compiler->add_msl_resource_binding({
+        .stage = execution_model,
+        .basetype = spirv_cross::SPIRType::BaseType::SampledImage,
+        .desc_set =
+            sl_compiler->get_decoration(image_id, spv::DecorationDescriptorSet),
+        .binding =
+            sl_compiler->get_decoration(image_id, spv::DecorationBinding),
+        .count = 1u,
+        // A sampled image is both an image and a sampler, so both
+        // offsets need to be set or depending on the partiular shader
+        // the bindings may be incorrect.
+        .msl_texture = sampler_offset,
+        .msl_sampler = sampler_offset,
+    });
+    sampler_offset++;
   }
 
   return CompilerBackend(sl_compiler);
 }
 
+static CompilerBackend CreateVulkanCompiler(
+    const spirv_cross::ParsedIR& ir,
+    const SourceOptions& source_options) {
+  auto gl_compiler = std::make_shared<spirv_cross::CompilerGLSL>(ir);
+  spirv_cross::CompilerGLSL::Options sl_options;
+  sl_options.force_zero_initialized_variables = true;
+  sl_options.vertex.fixup_clipspace = true;
+  sl_options.vulkan_semantics = true;
+  gl_compiler->set_common_options(sl_options);
+  return CompilerBackend(gl_compiler);
+}
+
 static CompilerBackend CreateGLSLCompiler(const spirv_cross::ParsedIR& ir,
                                           const SourceOptions& source_options) {
   auto gl_compiler = std::make_shared<spirv_cross::CompilerGLSL>(ir);
+
+  // Walk the variables and insert the external image extension if any of them
+  // begins with the external texture prefix. Unfortunately, we can't walk
+  // `gl_compiler->get_shader_resources().separate_samplers` until the compiler
+  // is further along.
+  //
+  // Unfortunately, we can't just let the shader author add this extension and
+  // use `samplerExternalOES` directly because compiling to spirv requires the
+  // source language profile to be at least 310 ES, but this extension is
+  // incompatible with ES 310+.
+  for (auto& id : ir.ids_for_constant_or_variable) {
+    if (StringStartsWith(ir.get_name(id), kExternalTexturePrefix)) {
+      gl_compiler->require_extension("GL_OES_EGL_image_external");
+      break;
+    }
+  }
+
   spirv_cross::CompilerGLSL::Options sl_options;
   sl_options.force_zero_initialized_variables = true;
   sl_options.vertex.fixup_clipspace = true;
-  if (source_options.target_platform == TargetPlatform::kOpenGLES) {
+  if (source_options.target_platform == TargetPlatform::kOpenGLES ||
+      source_options.target_platform == TargetPlatform::kRuntimeStageGLES) {
     sl_options.version = source_options.gles_language_version > 0
                              ? source_options.gles_language_version
                              : 100;
     sl_options.es = true;
+    if (source_options.require_framebuffer_fetch &&
+        source_options.type == SourceType::kFragmentShader) {
+      gl_compiler->remap_ext_framebuffer_fetch(0, 0, true);
+    }
+    gl_compiler->set_variable_type_remap_callback(
+        [&](const spirv_cross::SPIRType& type, const std::string& var_name,
+            std::string& name_of_type) {
+          if (StringStartsWith(var_name, kExternalTexturePrefix)) {
+            name_of_type = "samplerExternalOES";
+          }
+        });
   } else {
     sl_options.version = source_options.gles_language_version > 0
                              ? source_options.gles_language_version
@@ -112,6 +196,7 @@ static bool EntryPointMustBeNamedMain(TargetPlatform platform) {
     case TargetPlatform::kMetalIOS:
     case TargetPlatform::kVulkan:
     case TargetPlatform::kRuntimeStageMetal:
+    case TargetPlatform::kRuntimeStageVulkan:
       return false;
     case TargetPlatform::kSkSL:
     case TargetPlatform::kOpenGLES:
@@ -129,13 +214,16 @@ static CompilerBackend CreateCompiler(const spirv_cross::ParsedIR& ir,
     case TargetPlatform::kMetalDesktop:
     case TargetPlatform::kMetalIOS:
     case TargetPlatform::kRuntimeStageMetal:
-    case TargetPlatform::kRuntimeStageGLES:
-    case TargetPlatform::kVulkan:
       compiler = CreateMSLCompiler(ir, source_options);
       break;
+    case TargetPlatform::kVulkan:
+    case TargetPlatform::kRuntimeStageVulkan:
+      compiler = CreateVulkanCompiler(ir, source_options);
+      break;
     case TargetPlatform::kUnknown:
     case TargetPlatform::kOpenGLES:
     case TargetPlatform::kOpenGLDesktop:
+    case TargetPlatform::kRuntimeStageGLES:
       compiler = CreateGLSLCompiler(ir, source_options);
       break;
     case TargetPlatform::kSkSL:
@@ -153,296 +241,143 @@ static CompilerBackend CreateCompiler(const spirv_cross::ParsedIR& ir,
   return compiler;
 }
 
-static void SetLimitations(shaderc::CompileOptions& compiler_opts) {
-  using Limit = std::pair<shaderc_limit, int>;
-  static constexpr std::array<Limit, 83> limits = {
-      Limit{shaderc_limit::shaderc_limit_max_lights, 8},
-      Limit{shaderc_limit::shaderc_limit_max_clip_planes, 6},
-      Limit{shaderc_limit::shaderc_limit_max_texture_units, 2},
-      Limit{shaderc_limit::shaderc_limit_max_texture_coords, 8},
-      Limit{shaderc_limit::shaderc_limit_max_vertex_attribs, 16},
-      Limit{shaderc_limit::shaderc_limit_max_vertex_uniform_components, 4096},
-      Limit{shaderc_limit::shaderc_limit_max_varying_floats, 60},
-      Limit{shaderc_limit::shaderc_limit_max_vertex_texture_image_units, 16},
-      Limit{shaderc_limit::shaderc_limit_max_combined_texture_image_units, 80},
-      Limit{shaderc_limit::shaderc_limit_max_texture_image_units, 16},
-      Limit{shaderc_limit::shaderc_limit_max_fragment_uniform_components, 1024},
-      Limit{shaderc_limit::shaderc_limit_max_draw_buffers, 8},
-      Limit{shaderc_limit::shaderc_limit_max_vertex_uniform_vectors, 256},
-      Limit{shaderc_limit::shaderc_limit_max_varying_vectors, 15},
-      Limit{shaderc_limit::shaderc_limit_max_fragment_uniform_vectors, 256},
-      Limit{shaderc_limit::shaderc_limit_max_vertex_output_vectors, 16},
-      Limit{shaderc_limit::shaderc_limit_max_fragment_input_vectors, 15},
-      Limit{shaderc_limit::shaderc_limit_min_program_texel_offset, -8},
-      Limit{shaderc_limit::shaderc_limit_max_program_texel_offset, 7},
-      Limit{shaderc_limit::shaderc_limit_max_clip_distances, 8},
-      Limit{shaderc_limit::shaderc_limit_max_compute_work_group_count_x, 65535},
-      Limit{shaderc_limit::shaderc_limit_max_compute_work_group_count_y, 65535},
-      Limit{shaderc_limit::shaderc_limit_max_compute_work_group_count_z, 65535},
-      Limit{shaderc_limit::shaderc_limit_max_compute_work_group_size_x, 1024},
-      Limit{shaderc_limit::shaderc_limit_max_compute_work_group_size_y, 1024},
-      Limit{shaderc_limit::shaderc_limit_max_compute_work_group_size_z, 64},
-      Limit{shaderc_limit::shaderc_limit_max_compute_uniform_components, 512},
-      Limit{shaderc_limit::shaderc_limit_max_compute_texture_image_units, 16},
-      Limit{shaderc_limit::shaderc_limit_max_compute_image_uniforms, 8},
-      Limit{shaderc_limit::shaderc_limit_max_compute_atomic_counters, 8},
-      Limit{shaderc_limit::shaderc_limit_max_compute_atomic_counter_buffers, 1},
-      Limit{shaderc_limit::shaderc_limit_max_varying_components, 60},
-      Limit{shaderc_limit::shaderc_limit_max_vertex_output_components, 64},
-      Limit{shaderc_limit::shaderc_limit_max_geometry_input_components, 64},
-      Limit{shaderc_limit::shaderc_limit_max_geometry_output_components, 128},
-      Limit{shaderc_limit::shaderc_limit_max_fragment_input_components, 128},
-      Limit{shaderc_limit::shaderc_limit_max_image_units, 8},
-      Limit{shaderc_limit::
-                shaderc_limit_max_combined_image_units_and_fragment_outputs,
-            8},
-      Limit{shaderc_limit::shaderc_limit_max_combined_shader_output_resources,
-            8},
-      Limit{shaderc_limit::shaderc_limit_max_image_samples, 0},
-      Limit{shaderc_limit::shaderc_limit_max_vertex_image_uniforms, 0},
-      Limit{shaderc_limit::shaderc_limit_max_tess_control_image_uniforms, 0},
-      Limit{shaderc_limit::shaderc_limit_max_tess_evaluation_image_uniforms, 0},
-      Limit{shaderc_limit::shaderc_limit_max_geometry_image_uniforms, 0},
-      Limit{shaderc_limit::shaderc_limit_max_fragment_image_uniforms, 8},
-      Limit{shaderc_limit::shaderc_limit_max_combined_image_uniforms, 8},
-      Limit{shaderc_limit::shaderc_limit_max_geometry_texture_image_units, 16},
-      Limit{shaderc_limit::shaderc_limit_max_geometry_output_vertices, 256},
-      Limit{shaderc_limit::shaderc_limit_max_geometry_total_output_components,
-            1024},
-      Limit{shaderc_limit::shaderc_limit_max_geometry_uniform_components, 512},
-      Limit{shaderc_limit::shaderc_limit_max_geometry_varying_components, 60},
-      Limit{shaderc_limit::shaderc_limit_max_tess_control_input_components,
-            128},
-      Limit{shaderc_limit::shaderc_limit_max_tess_control_output_components,
-            128},
-      Limit{shaderc_limit::shaderc_limit_max_tess_control_texture_image_units,
-            16},
-      Limit{shaderc_limit::shaderc_limit_max_tess_control_uniform_components,
-            1024},
-      Limit{
-          shaderc_limit::shaderc_limit_max_tess_control_total_output_components,
-          4096},
-      Limit{shaderc_limit::shaderc_limit_max_tess_evaluation_input_components,
-            128},
-      Limit{shaderc_limit::shaderc_limit_max_tess_evaluation_output_components,
-            128},
-      Limit{
-          shaderc_limit::shaderc_limit_max_tess_evaluation_texture_image_units,
-          16},
-      Limit{shaderc_limit::shaderc_limit_max_tess_evaluation_uniform_components,
-            1024},
-      Limit{shaderc_limit::shaderc_limit_max_tess_patch_components, 120},
-      Limit{shaderc_limit::shaderc_limit_max_patch_vertices, 32},
-      Limit{shaderc_limit::shaderc_limit_max_tess_gen_level, 64},
-      Limit{shaderc_limit::shaderc_limit_max_viewports, 16},
-      Limit{shaderc_limit::shaderc_limit_max_vertex_atomic_counters, 0},
-      Limit{shaderc_limit::shaderc_limit_max_tess_control_atomic_counters, 0},
-      Limit{shaderc_limit::shaderc_limit_max_tess_evaluation_atomic_counters,
-            0},
-      Limit{shaderc_limit::shaderc_limit_max_geometry_atomic_counters, 0},
-      Limit{shaderc_limit::shaderc_limit_max_fragment_atomic_counters, 8},
-      Limit{shaderc_limit::shaderc_limit_max_combined_atomic_counters, 8},
-      Limit{shaderc_limit::shaderc_limit_max_atomic_counter_bindings, 1},
-      Limit{shaderc_limit::shaderc_limit_max_vertex_atomic_counter_buffers, 0},
-      Limit{
-          shaderc_limit::shaderc_limit_max_tess_control_atomic_counter_buffers,
-          0},
-      Limit{shaderc_limit::
-                shaderc_limit_max_tess_evaluation_atomic_counter_buffers,
-            0},
-      Limit{shaderc_limit::shaderc_limit_max_geometry_atomic_counter_buffers,
-            0},
-      Limit{shaderc_limit::shaderc_limit_max_fragment_atomic_counter_buffers,
-            0},
-      Limit{shaderc_limit::shaderc_limit_max_combined_atomic_counter_buffers,
-            1},
-      Limit{shaderc_limit::shaderc_limit_max_atomic_counter_buffer_size, 32},
-      Limit{shaderc_limit::shaderc_limit_max_transform_feedback_buffers, 4},
-      Limit{shaderc_limit::
-                shaderc_limit_max_transform_feedback_interleaved_components,
-            64},
-      Limit{shaderc_limit::shaderc_limit_max_cull_distances, 8},
-      Limit{shaderc_limit::shaderc_limit_max_combined_clip_and_cull_distances,
-            8},
-      Limit{shaderc_limit::shaderc_limit_max_samples, 4},
-  };
-  for (auto& [limit, value] : limits) {
-    compiler_opts.SetLimit(limit, value);
-  }
-}
-
-void Compiler::SetBindingBase(shaderc::CompileOptions& compiler_opts) const {
-  for (size_t uniform_kind = 0; uniform_kind < kNumUniformKinds;
-       uniform_kind++) {
-    compiler_opts.SetBindingBaseForStage(
-        ToShaderCShaderKind(SourceType::kFragmentShader),
-        static_cast<shaderc_uniform_kind>(uniform_kind), kFragBindingBase);
-  }
-}
-
-Compiler::Compiler(const fml::Mapping& source_mapping,
+Compiler::Compiler(const std::shared_ptr<const fml::Mapping>& source_mapping,
                    const SourceOptions& source_options,
                    Reflector::Options reflector_options)
     : options_(source_options) {
-  if (source_mapping.GetMapping() == nullptr) {
-    COMPILER_ERROR
+  if (!source_mapping || source_mapping->GetMapping() == nullptr) {
+    COMPILER_ERROR(error_stream_)
         << "Could not read shader source or shader source was empty.";
     return;
   }
 
   if (source_options.target_platform == TargetPlatform::kUnknown) {
-    COMPILER_ERROR << "Target platform not specified.";
-    return;
-  }
-
-  auto shader_kind = ToShaderCShaderKind(source_options.type);
-
-  if (shader_kind == shaderc_shader_kind::shaderc_glsl_infer_from_source) {
-    COMPILER_ERROR << "Could not figure out shader stage.";
+    COMPILER_ERROR(error_stream_) << "Target platform not specified.";
     return;
   }
 
-  shaderc::CompileOptions spirv_options;
+  SPIRVCompilerOptions spirv_options;
 
   // Make sure reflection is as effective as possible. The generated shaders
-  // will be processed later by backend specific compilers. So optimizations
-  // here are irrelevant and get in the way of generating reflection code.
-  spirv_options.SetGenerateDebugInfo();
+  // will be processed later by backend specific compilers.
+  spirv_options.generate_debug_info = true;
 
   switch (options_.source_language) {
     case SourceLanguage::kGLSL:
       // Expects GLSL 4.60 (Core Profile).
       // https://www.khronos.org/registry/OpenGL/specs/gl/GLSLangSpec.4.60.pdf
-      spirv_options.SetSourceLanguage(
-          shaderc_source_language::shaderc_source_language_glsl);
-      spirv_options.SetForcedVersionProfile(
-          460, shaderc_profile::shaderc_profile_core);
+      spirv_options.source_langauge =
+          shaderc_source_language::shaderc_source_language_glsl;
+      spirv_options.source_profile = SPIRVCompilerSourceProfile{
+          shaderc_profile::shaderc_profile_core,  //
+          460,                                    //
+      };
       break;
     case SourceLanguage::kHLSL:
-      spirv_options.SetSourceLanguage(
-          shaderc_source_language::shaderc_source_language_hlsl);
+      spirv_options.source_langauge =
+          shaderc_source_language::shaderc_source_language_hlsl;
       break;
     case SourceLanguage::kUnknown:
-      COMPILER_ERROR << "Source language invalid.";
+      COMPILER_ERROR(error_stream_) << "Source language invalid.";
       return;
   }
 
-  SetLimitations(spirv_options);
-
   switch (source_options.target_platform) {
     case TargetPlatform::kMetalDesktop:
-    case TargetPlatform::kMetalIOS:
+    case TargetPlatform::kMetalIOS: {
+      SPIRVCompilerTargetEnv target;
+
+      if (source_options.use_half_textures) {
+        target.env = shaderc_target_env::shaderc_target_env_opengl;
+        target.version = shaderc_env_version::shaderc_env_version_opengl_4_5;
+        target.spirv_version = shaderc_spirv_version::shaderc_spirv_version_1_0;
+      } else {
+        target.env = shaderc_target_env::shaderc_target_env_vulkan;
+        target.version = shaderc_env_version::shaderc_env_version_vulkan_1_1;
+        target.spirv_version = shaderc_spirv_version::shaderc_spirv_version_1_3;
+      }
+
+      spirv_options.target = target;
+    } break;
     case TargetPlatform::kOpenGLES:
     case TargetPlatform::kOpenGLDesktop:
-      spirv_options.SetOptimizationLevel(
-          shaderc_optimization_level::shaderc_optimization_level_performance);
-      spirv_options.SetTargetEnvironment(
-          shaderc_target_env::shaderc_target_env_vulkan,
-          shaderc_env_version::shaderc_env_version_vulkan_1_1);
-      spirv_options.SetTargetSpirv(
-          shaderc_spirv_version::shaderc_spirv_version_1_3);
-      break;
     case TargetPlatform::kVulkan:
-      spirv_options.SetOptimizationLevel(
-          shaderc_optimization_level::shaderc_optimization_level_performance);
-      spirv_options.SetTargetEnvironment(
-          shaderc_target_env::shaderc_target_env_vulkan,
-          shaderc_env_version::shaderc_env_version_vulkan_1_0);
-      spirv_options.SetTargetSpirv(
-          shaderc_spirv_version::shaderc_spirv_version_1_0);
-      break;
+    case TargetPlatform::kRuntimeStageVulkan: {
+      SPIRVCompilerTargetEnv target;
+
+      target.env = shaderc_target_env::shaderc_target_env_vulkan;
+      target.version = shaderc_env_version::shaderc_env_version_vulkan_1_1;
+      target.spirv_version = shaderc_spirv_version::shaderc_spirv_version_1_3;
+
+      if (source_options.target_platform ==
+          TargetPlatform::kRuntimeStageVulkan) {
+        spirv_options.macro_definitions.push_back("IMPELLER_GRAPHICS_BACKEND");
+        spirv_options.relaxed_vulkan_rules = true;
+      }
+      spirv_options.target = target;
+    } break;
     case TargetPlatform::kRuntimeStageMetal:
-    case TargetPlatform::kRuntimeStageGLES:
-      spirv_options.SetOptimizationLevel(
-          shaderc_optimization_level::shaderc_optimization_level_performance);
-      spirv_options.SetTargetEnvironment(
-          shaderc_target_env::shaderc_target_env_opengl,
-          shaderc_env_version::shaderc_env_version_opengl_4_5);
-      spirv_options.SetTargetSpirv(
-          shaderc_spirv_version::shaderc_spirv_version_1_0);
-      spirv_options.AddMacroDefinition("IMPELLER_GRAPHICS_BACKEND");
-      break;
-    case TargetPlatform::kSkSL:
+    case TargetPlatform::kRuntimeStageGLES: {
+      SPIRVCompilerTargetEnv target;
+
+      target.env = shaderc_target_env::shaderc_target_env_opengl;
+      target.version = shaderc_env_version::shaderc_env_version_opengl_4_5;
+      target.spirv_version = shaderc_spirv_version::shaderc_spirv_version_1_0;
+
+      spirv_options.target = target;
+      spirv_options.macro_definitions.push_back("IMPELLER_GRAPHICS_BACKEND");
+    } break;
+    case TargetPlatform::kSkSL: {
+      SPIRVCompilerTargetEnv target;
+
+      target.env = shaderc_target_env::shaderc_target_env_opengl;
+      target.version = shaderc_env_version::shaderc_env_version_opengl_4_5;
+      target.spirv_version = shaderc_spirv_version::shaderc_spirv_version_1_0;
+
       // When any optimization level above 'zero' is enabled, the phi merges at
       // loop continue blocks are rendered using syntax that is supported in
       // GLSL, but not in SkSL.
       // https://bugs.chromium.org/p/skia/issues/detail?id=13518.
-      spirv_options.SetOptimizationLevel(
-          shaderc_optimization_level::shaderc_optimization_level_zero);
-      spirv_options.SetTargetEnvironment(
-          shaderc_target_env::shaderc_target_env_opengl,
-          shaderc_env_version::shaderc_env_version_opengl_4_5);
-      spirv_options.SetTargetSpirv(
-          shaderc_spirv_version::shaderc_spirv_version_1_0);
-      spirv_options.AddMacroDefinition("SKIA_GRAPHICS_BACKEND");
-      break;
+      spirv_options.optimization_level =
+          shaderc_optimization_level::shaderc_optimization_level_zero;
+      spirv_options.target = target;
+      spirv_options.macro_definitions.push_back("SKIA_GRAPHICS_BACKEND");
+    } break;
     case TargetPlatform::kUnknown:
-      COMPILER_ERROR << "Target platform invalid.";
+      COMPILER_ERROR(error_stream_) << "Target platform invalid.";
       return;
   }
 
   // Implicit definition that indicates that this compilation is for the device
   // (instead of the host).
-  spirv_options.AddMacroDefinition("IMPELLER_DEVICE");
+  spirv_options.macro_definitions.push_back("IMPELLER_DEVICE");
   for (const auto& define : source_options.defines) {
-    spirv_options.AddMacroDefinition(define);
+    spirv_options.macro_definitions.push_back(define);
   }
 
-  spirv_options.SetAutoBindUniforms(true);
-#ifdef IMPELLER_ENABLE_VULKAN
-  SetBindingBase(spirv_options);
-#endif
-  spirv_options.SetAutoMapLocations(true);
-
   std::vector<std::string> included_file_names;
-  spirv_options.SetIncluder(std::make_unique<Includer>(
+  spirv_options.includer = std::make_shared<Includer>(
       options_.working_directory, options_.include_dirs,
       [&included_file_names](auto included_name) {
         included_file_names.emplace_back(std::move(included_name));
-      }));
-
-  shaderc::Compiler spv_compiler;
-  if (!spv_compiler.IsValid()) {
-    COMPILER_ERROR << "Could not initialize the "
-                   << SourceLanguageToString(options_.source_language)
-                   << " to SPIRV compiler.";
-    return;
-  }
+      });
 
   // SPIRV Generation.
-  spv_result_ = std::make_shared<shaderc::SpvCompilationResult>(
-      spv_compiler.CompileGlslToSpv(
-          reinterpret_cast<const char*>(
-              source_mapping.GetMapping()),         // source_text
-          source_mapping.GetSize(),                 // source_text_size
-          shader_kind,                              // shader_kind
-          source_options.file_name.c_str(),         // input_file_name
-          source_options.entry_point_name.c_str(),  // entry_point_name
-          spirv_options                             // options
-          ));
-  if (spv_result_->GetCompilationStatus() !=
-      shaderc_compilation_status::shaderc_compilation_status_success) {
-    COMPILER_ERROR << SourceLanguageToString(options_.source_language)
-                   << " to SPIRV failed; "
-                   << ShaderCErrorToString(spv_result_->GetCompilationStatus())
-                   << ". " << spv_result_->GetNumErrors() << " error(s) and "
-                   << spv_result_->GetNumWarnings() << " warning(s).";
-    if (spv_result_->GetNumErrors() > 0 || spv_result_->GetNumWarnings() > 0) {
-      COMPILER_ERROR_NO_PREFIX << spv_result_->GetErrorMessage();
-    }
+  SPIRVCompiler spv_compiler(source_options, source_mapping);
+
+  spirv_assembly_ = spv_compiler.CompileToSPV(
+      error_stream_, spirv_options.BuildShadercOptions());
+
+  if (!spirv_assembly_) {
     return;
   } else {
     included_file_names_ = std::move(included_file_names);
   }
 
-  if (!TargetPlatformNeedsSL(source_options.target_platform)) {
-    is_valid_ = true;
-    return;
-  }
-
   // SL Generation.
-  spirv_cross::Parser parser(spv_result_->cbegin(),
-                             spv_result_->cend() - spv_result_->cbegin());
+  spirv_cross::Parser parser(
+      reinterpret_cast<const uint32_t*>(spirv_assembly_->GetMapping()),
+      spirv_assembly_->GetSize() / sizeof(uint32_t));
   // The parser and compiler must be run separately because the parser contains
   // meta information (like type member names) that are useful for reflection.
   parser.parse();
@@ -453,7 +388,8 @@ Compiler::Compiler(const fml::Mapping& source_mapping,
   auto sl_compiler = CreateCompiler(*parsed_ir, options_);
 
   if (!sl_compiler) {
-    COMPILER_ERROR << "Could not create compiler for target platform.";
+    COMPILER_ERROR(error_stream_)
+        << "Could not create compiler for target platform.";
     return;
   }
 
@@ -464,14 +400,20 @@ Compiler::Compiler(const fml::Mapping& source_mapping,
       CreateMappingWithString(sl_compiler.GetCompiler()->compile());
 
   // If the target is Vulkan, our shading language is SPIRV which we already
-  // have. If it isn't, we need to invoke the appropriate compiler to compile
-  // the SPIRV to the target SL.
-  sl_mapping_ = source_options.target_platform == TargetPlatform::kVulkan
-                    ? GetSPIRVAssembly()
-                    : sl_compilation_result;
+  // have. We just need to strip it of debug information. If it isn't, we need
+  // to invoke the appropriate compiler to compile the SPIRV to the target SL.
+  if (source_options.target_platform == TargetPlatform::kVulkan ||
+      source_options.target_platform == TargetPlatform::kRuntimeStageVulkan) {
+    auto stripped_spirv_options = spirv_options;
+    stripped_spirv_options.generate_debug_info = false;
+    sl_mapping_ = spv_compiler.CompileToSPV(
+        error_stream_, stripped_spirv_options.BuildShadercOptions());
+  } else {
+    sl_mapping_ = sl_compilation_result;
+  }
 
   if (!sl_mapping_) {
-    COMPILER_ERROR << "Could not generate SL from SPIRV";
+    COMPILER_ERROR(error_stream_) << "Could not generate SL from SPIRV";
     return;
   }
 
@@ -482,7 +424,8 @@ Compiler::Compiler(const fml::Mapping& source_mapping,
   );
 
   if (!reflector_->IsValid()) {
-    COMPILER_ERROR << "Could not complete reflection on generated shader.";
+    COMPILER_ERROR(error_stream_)
+        << "Could not complete reflection on generated shader.";
     return;
   }
 
@@ -491,17 +434,8 @@ Compiler::Compiler(const fml::Mapping& source_mapping,
 
 Compiler::~Compiler() = default;
 
-std::unique_ptr<fml::Mapping> Compiler::GetSPIRVAssembly() const {
-  if (!spv_result_) {
-    return nullptr;
-  }
-  const auto data_length =
-      (spv_result_->cend() - spv_result_->cbegin()) *
-      sizeof(decltype(spv_result_)::element_type::element_type);
-
-  return std::make_unique<fml::NonOwnedMapping>(
-      reinterpret_cast<const uint8_t*>(spv_result_->cbegin()), data_length,
-      [result = spv_result_](auto, auto) mutable { result.reset(); });
+std::shared_ptr<fml::Mapping> Compiler::GetSPIRVAssembly() const {
+  return spirv_assembly_;
 }
 
 std::shared_ptr<fml::Mapping> Compiler::GetSLShaderSource() const {
diff --git a/impeller/compiler/compiler.h b/impeller/compiler/compiler.h
index d79f0c5e574a43051e70df692d482a31bebf439a..8447983005562093ef5bb526626be1e82bc3f12c 100644
--- a/impeller/compiler/compiler.h
+++ b/impeller/compiler/compiler.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_COMPILER_COMPILER_H_
+#define FLUTTER_IMPELLER_COMPILER_COMPILER_H_
 
 #include <initializer_list>
 #include <sstream>
@@ -13,8 +14,8 @@
 #include "impeller/compiler/include_dir.h"
 #include "impeller/compiler/reflector.h"
 #include "impeller/compiler/source_options.h"
+#include "impeller/compiler/spirv_compiler.h"
 #include "impeller/compiler/types.h"
-#include "shaderc/shaderc.hpp"
 #include "spirv_msl.hpp"
 #include "spirv_parser.hpp"
 
@@ -23,7 +24,7 @@ namespace compiler {
 
 class Compiler {
  public:
-  Compiler(const fml::Mapping& source_mapping,
+  Compiler(const std::shared_ptr<const fml::Mapping>& source_mapping,
            const SourceOptions& options,
            Reflector::Options reflector_options);
 
@@ -31,7 +32,7 @@ class Compiler {
 
   bool IsValid() const;
 
-  std::unique_ptr<fml::Mapping> GetSPIRVAssembly() const;
+  std::shared_ptr<fml::Mapping> GetSPIRVAssembly() const;
 
   std::shared_ptr<fml::Mapping> GetSLShaderSource() const;
 
@@ -46,7 +47,7 @@ class Compiler {
 
  private:
   SourceOptions options_;
-  std::shared_ptr<shaderc::SpvCompilationResult> spv_result_;
+  std::shared_ptr<fml::Mapping> spirv_assembly_;
   std::shared_ptr<fml::Mapping> sl_mapping_;
   std::stringstream error_stream_;
   std::unique_ptr<Reflector> reflector_;
@@ -57,10 +58,12 @@ class Compiler {
 
   std::string GetDependencyNames(const std::string& separator) const;
 
-  void SetBindingBase(shaderc::CompileOptions& compiler_opts) const;
+  Compiler(const Compiler&) = delete;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(Compiler);
+  Compiler& operator=(const Compiler&) = delete;
 };
 
 }  // namespace compiler
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_COMPILER_COMPILER_H_
diff --git a/impeller/compiler/compiler_backend.cc b/impeller/compiler/compiler_backend.cc
index d6111c9f232e5157077fbfdfcac72cec5d8a379d..58afead588383b3d9ce4ff815700e185f7735614 100644
--- a/impeller/compiler/compiler_backend.cc
+++ b/impeller/compiler/compiler_backend.cc
@@ -13,7 +13,10 @@ CompilerBackend::CompilerBackend(MSLCompiler compiler)
     : CompilerBackend(Type::kMSL, compiler) {}
 
 CompilerBackend::CompilerBackend(GLSLCompiler compiler)
-    : CompilerBackend(Type::kGLSL, compiler) {}
+    : CompilerBackend(compiler->get_common_options().vulkan_semantics
+                          ? Type::kGLSLVulkan
+                          : Type::kGLSL,
+                      compiler) {}
 
 CompilerBackend::CompilerBackend(SkSLCompiler compiler)
     : CompilerBackend(Type::kSkSL, compiler) {}
diff --git a/impeller/compiler/compiler_backend.h b/impeller/compiler/compiler_backend.h
index b8225fce186ef641768073cb49f4d162ed3f3a4a..d2918177fa98341c9804a890d173960357057993 100644
--- a/impeller/compiler/compiler_backend.h
+++ b/impeller/compiler/compiler_backend.h
@@ -2,8 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_COMPILER_COMPILER_BACKEND_H_
+#define FLUTTER_IMPELLER_COMPILER_COMPILER_BACKEND_H_
 
+#include <cstdint>
 #include <memory>
 #include <variant>
 
@@ -25,6 +27,7 @@ struct CompilerBackend {
   enum class Type {
     kMSL,
     kGLSL,
+    kGLSLVulkan,
     kSkSL,
   };
 
@@ -44,7 +47,9 @@ struct CompilerBackend {
 
   const spirv_cross::Compiler* operator->() const;
 
-  operator bool() const;
+  spirv_cross::Compiler* GetCompiler();
+
+  explicit operator bool() const;
 
   enum class ExtendedResourceIndex {
     kPrimary,
@@ -55,8 +60,6 @@ struct CompilerBackend {
 
   const spirv_cross::Compiler* GetCompiler() const;
 
-  spirv_cross::Compiler* GetCompiler();
-
  private:
   Type type_ = Type::kMSL;
   Compiler compiler_;
@@ -70,3 +73,5 @@ struct CompilerBackend {
 
 }  // namespace compiler
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_COMPILER_COMPILER_BACKEND_H_
diff --git a/impeller/compiler/compiler_test.cc b/impeller/compiler/compiler_test.cc
index f77825790b2fa252f202b43d60e345f112cfbc78..06e2602611104407500894cb8d481aac05ebd5cd 100644
--- a/impeller/compiler/compiler_test.cc
+++ b/impeller/compiler/compiler_test.cc
@@ -3,29 +3,39 @@
 // found in the LICENSE file.
 
 #include "impeller/compiler/compiler_test.h"
+#include "flutter/fml/paths.h"
+#include "flutter/fml/process.h"
 
 #include <algorithm>
+#include <filesystem>
 
 namespace impeller {
 namespace compiler {
 namespace testing {
 
-static fml::UniqueFD CreateIntermediatesDirectory() {
+static std::string GetIntermediatesPath() {
   auto test_name = flutter::testing::GetCurrentTestName();
   std::replace(test_name.begin(), test_name.end(), '/', '_');
   std::replace(test_name.begin(), test_name.end(), '.', '_');
-  return fml::OpenDirectory(flutter::testing::OpenFixturesDirectory(),
-                            test_name.c_str(),
-                            true,  // create if necessary
-                            fml::FilePermission::kReadWrite);
+  std::stringstream dir_name;
+  dir_name << test_name << "_" << std::to_string(fml::GetCurrentProcId());
+  return fml::paths::JoinPaths(
+      {flutter::testing::GetFixturesPath(), dir_name.str()});
 }
 
-CompilerTest::CompilerTest()
-    : intermediates_directory_(CreateIntermediatesDirectory()) {
+CompilerTest::CompilerTest() : intermediates_path_(GetIntermediatesPath()) {
+  intermediates_directory_ =
+      fml::OpenDirectory(intermediates_path_.c_str(),
+                         true,  // create if necessary
+                         fml::FilePermission::kReadWrite);
   FML_CHECK(intermediates_directory_.is_valid());
 }
 
-CompilerTest::~CompilerTest() = default;
+CompilerTest::~CompilerTest() {
+  intermediates_directory_.reset();
+
+  std::filesystem::remove_all(std::filesystem::path(intermediates_path_));
+}
 
 static std::string ReflectionHeaderName(const char* fixture_name) {
   std::stringstream stream;
@@ -65,11 +75,20 @@ std::unique_ptr<fml::FileMapping> CompilerTest::GetReflectionJson(
   return fml::FileMapping::CreateReadOnly(fd);
 }
 
+std::unique_ptr<fml::FileMapping> CompilerTest::GetShaderFile(
+    const char* fixture_name,
+    TargetPlatform platform) const {
+  auto filename = SLFileName(fixture_name, platform);
+  auto fd = fml::OpenFileReadOnly(intermediates_directory_, filename.c_str());
+  return fml::FileMapping::CreateReadOnly(fd);
+}
+
 bool CompilerTest::CanCompileAndReflect(const char* fixture_name,
                                         SourceType source_type,
                                         SourceLanguage source_language,
                                         const char* entry_point_name) const {
-  auto fixture = flutter::testing::OpenFixtureAsMapping(fixture_name);
+  std::shared_ptr<fml::Mapping> fixture =
+      flutter::testing::OpenFixtureAsMapping(fixture_name);
   if (!fixture || !fixture->GetMapping()) {
     VALIDATION_LOG << "Could not find shader in fixtures: " << fixture_name;
     return false;
@@ -88,7 +107,7 @@ bool CompilerTest::CanCompileAndReflect(const char* fixture_name,
   reflector_options.header_file_name = ReflectionHeaderName(fixture_name);
   reflector_options.shader_name = "shader_name";
 
-  Compiler compiler(*fixture.get(), source_options, reflector_options);
+  Compiler compiler(fixture, source_options, reflector_options);
   if (!compiler.IsValid()) {
     VALIDATION_LOG << "Compilation failed: " << compiler.GetErrorMessages();
     return false;
@@ -107,19 +126,17 @@ bool CompilerTest::CanCompileAndReflect(const char* fixture_name,
     return false;
   }
 
-  if (TargetPlatformNeedsSL(GetParam())) {
-    auto sl_source = compiler.GetSLShaderSource();
-    if (!sl_source) {
-      VALIDATION_LOG << "No SL source was generated.";
-      return false;
-    }
+  auto sl_source = compiler.GetSLShaderSource();
+  if (!sl_source) {
+    VALIDATION_LOG << "No SL source was generated.";
+    return false;
+  }
 
-    if (!fml::WriteAtomically(intermediates_directory_,
-                              SLFileName(fixture_name, GetParam()).c_str(),
-                              *sl_source)) {
-      VALIDATION_LOG << "Could not write SL intermediates.";
-      return false;
-    }
+  if (!fml::WriteAtomically(intermediates_directory_,
+                            SLFileName(fixture_name, GetParam()).c_str(),
+                            *sl_source)) {
+    VALIDATION_LOG << "Could not write SL intermediates.";
+    return false;
   }
 
   if (TargetPlatformNeedsReflection(GetParam())) {
diff --git a/impeller/compiler/compiler_test.h b/impeller/compiler/compiler_test.h
index 37196c1fb30f68100c8c09e2dfc96ac9ff7a9f5e..3eb0101893115ec32fea165cb1ba5fb454b26e22 100644
--- a/impeller/compiler/compiler_test.h
+++ b/impeller/compiler/compiler_test.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_COMPILER_COMPILER_TEST_H_
+#define FLUTTER_IMPELLER_COMPILER_COMPILER_TEST_H_
 
 #include "flutter/fml/macros.h"
 #include "flutter/testing/testing.h"
@@ -24,6 +25,10 @@ class CompilerTest : public ::testing::TestWithParam<TargetPlatform> {
   std::unique_ptr<fml::FileMapping> GetReflectionJson(
       const char* fixture_name) const;
 
+  std::unique_ptr<fml::FileMapping> GetShaderFile(
+      const char* fixture_name,
+      TargetPlatform platform) const;
+
   bool CanCompileAndReflect(
       const char* fixture_name,
       SourceType source_type = SourceType::kUnknown,
@@ -31,11 +36,16 @@ class CompilerTest : public ::testing::TestWithParam<TargetPlatform> {
       const char* entry_point_name = "main") const;
 
  private:
+  std::string intermediates_path_;
   fml::UniqueFD intermediates_directory_;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(CompilerTest);
+  CompilerTest(const CompilerTest&) = delete;
+
+  CompilerTest& operator=(const CompilerTest&) = delete;
 };
 
 }  // namespace testing
 }  // namespace compiler
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_COMPILER_COMPILER_TEST_H_
diff --git a/impeller/compiler/compiler_unittests.cc b/impeller/compiler/compiler_unittests.cc
index ed59fb8e5d20e41644a7f0d93dd1a12528b7d2ad..87e1344cdb6a090d8fa3b9529e923c65071573b8 100644
--- a/impeller/compiler/compiler_unittests.cc
+++ b/impeller/compiler/compiler_unittests.cc
@@ -2,7 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <cstring>
 #include "flutter/testing/testing.h"
+#include "gtest/gtest.h"
 #include "impeller/base/validation.h"
 #include "impeller/compiler/compiler.h"
 #include "impeller/compiler/compiler_test.h"
@@ -16,16 +18,15 @@ namespace testing {
 TEST(CompilerTest, ShaderKindMatchingIsSuccessful) {
   ASSERT_EQ(SourceTypeFromFileName("hello.vert"), SourceType::kVertexShader);
   ASSERT_EQ(SourceTypeFromFileName("hello.frag"), SourceType::kFragmentShader);
-  ASSERT_EQ(SourceTypeFromFileName("hello.tesc"),
-            SourceType::kTessellationControlShader);
-  ASSERT_EQ(SourceTypeFromFileName("hello.tese"),
-            SourceType::kTessellationEvaluationShader);
   ASSERT_EQ(SourceTypeFromFileName("hello.comp"), SourceType::kComputeShader);
   ASSERT_EQ(SourceTypeFromFileName("hello.msl"), SourceType::kUnknown);
   ASSERT_EQ(SourceTypeFromFileName("hello.glsl"), SourceType::kUnknown);
 }
 
 TEST_P(CompilerTest, CanCompile) {
+  if (GetParam() == TargetPlatform::kSkSL) {
+    GTEST_SKIP() << "Not supported with SkSL";
+  }
   ASSERT_TRUE(CanCompileAndReflect("sample.vert"));
   ASSERT_TRUE(CanCompileAndReflect("sample.vert", SourceType::kVertexShader));
   ASSERT_TRUE(CanCompileAndReflect("sample.vert", SourceType::kVertexShader,
@@ -33,11 +34,17 @@ TEST_P(CompilerTest, CanCompile) {
 }
 
 TEST_P(CompilerTest, CanCompileHLSL) {
+  if (GetParam() == TargetPlatform::kSkSL) {
+    GTEST_SKIP() << "Not supported with SkSL";
+  }
   ASSERT_TRUE(CanCompileAndReflect(
       "simple.vert.hlsl", SourceType::kVertexShader, SourceLanguage::kHLSL));
 }
 
 TEST_P(CompilerTest, CanCompileHLSLWithMultipleStages) {
+  if (GetParam() == TargetPlatform::kSkSL) {
+    GTEST_SKIP() << "Not supported with SkSL";
+  }
   ASSERT_TRUE(CanCompileAndReflect("multiple_stages.hlsl",
                                    SourceType::kVertexShader,
                                    SourceLanguage::kHLSL, "VertexShader"));
@@ -46,18 +53,6 @@ TEST_P(CompilerTest, CanCompileHLSLWithMultipleStages) {
                                    SourceLanguage::kHLSL, "FragmentShader"));
 }
 
-TEST_P(CompilerTest, CanCompileTessellationControlShader) {
-  ASSERT_TRUE(CanCompileAndReflect("sample.tesc"));
-  ASSERT_TRUE(CanCompileAndReflect("sample.tesc",
-                                   SourceType::kTessellationControlShader));
-}
-
-TEST_P(CompilerTest, CanCompileTessellationEvaluationShader) {
-  ASSERT_TRUE(CanCompileAndReflect("sample.tese"));
-  ASSERT_TRUE(CanCompileAndReflect("sample.tese",
-                                   SourceType::kTessellationEvaluationShader));
-}
-
 TEST_P(CompilerTest, CanCompileComputeShader) {
   if (!TargetPlatformIsMetal(GetParam())) {
     GTEST_SKIP_("Only enabled on Metal backends till ES 3.2 support is added.");
@@ -67,20 +62,26 @@ TEST_P(CompilerTest, CanCompileComputeShader) {
 }
 
 TEST_P(CompilerTest, MustFailDueToExceedingResourcesLimit) {
+  if (GetParam() == TargetPlatform::kSkSL) {
+    GTEST_SKIP() << "Not supported with SkSL";
+  }
   ScopedValidationDisable disable_validation;
   ASSERT_FALSE(
       CanCompileAndReflect("resources_limit.vert", SourceType::kVertexShader));
 }
 
 TEST_P(CompilerTest, MustFailDueToMultipleLocationPerStructMember) {
+  if (GetParam() == TargetPlatform::kSkSL) {
+    GTEST_SKIP() << "Not supported with SkSL";
+  }
   ScopedValidationDisable disable_validation;
   ASSERT_FALSE(CanCompileAndReflect("struct_def_bug.vert"));
 }
 
 TEST_P(CompilerTest, BindingBaseForFragShader) {
-#ifndef IMPELLER_ENABLE_VULKAN
-  GTEST_SKIP();
-#endif
+  if (!TargetPlatformIsVulkan(GetParam())) {
+    GTEST_SKIP();
+  }
 
   ASSERT_TRUE(CanCompileAndReflect("sample.vert", SourceType::kVertexShader));
   ASSERT_TRUE(CanCompileAndReflect("sample.frag", SourceType::kFragmentShader));
@@ -98,6 +99,9 @@ TEST_P(CompilerTest, BindingBaseForFragShader) {
 }
 
 TEST_P(CompilerTest, UniformsHaveBindingAndSet) {
+  if (GetParam() == TargetPlatform::kSkSL) {
+    GTEST_SKIP() << "Not supported with SkSL";
+  }
   ASSERT_TRUE(CanCompileAndReflect("sample_with_binding.vert",
                                    SourceType::kVertexShader));
   ASSERT_TRUE(CanCompileAndReflect("sample.frag", SourceType::kFragmentShader));
@@ -123,14 +127,40 @@ TEST_P(CompilerTest, UniformsHaveBindingAndSet) {
   ASSERT_EQ(vert_uniform_binding.binding, 17u);
 }
 
-#define INSTANTIATE_TARGET_PLATFORM_TEST_SUITE_P(suite_name)              \
-  INSTANTIATE_TEST_SUITE_P(                                               \
-      suite_name, CompilerTest,                                           \
-      ::testing::Values(                                                  \
-          TargetPlatform::kOpenGLES, TargetPlatform::kOpenGLDesktop,      \
-          TargetPlatform::kMetalDesktop, TargetPlatform::kMetalIOS),      \
-      [](const ::testing::TestParamInfo<CompilerTest::ParamType>& info) { \
-        return TargetPlatformToString(info.param);                        \
+TEST_P(CompilerTest, SkSLTextureLookUpOrderOfOperations) {
+  if (GetParam() != TargetPlatform::kSkSL) {
+    GTEST_SKIP() << "Only supported on SkSL";
+  }
+  ASSERT_TRUE(
+      CanCompileAndReflect("texture_lookup.frag", SourceType::kFragmentShader));
+
+  auto shader = GetShaderFile("texture_lookup.frag", GetParam());
+  std::string_view shader_mapping(
+      reinterpret_cast<const char*>(shader->GetMapping()), shader->GetSize());
+
+  constexpr std::string_view expected =
+      "textureA.eval(textureA_size * ( vec2(1.0) + flutter_FragCoord.xy));";
+
+  EXPECT_NE(shader_mapping.find(expected), std::string::npos);
+}
+
+TEST_P(CompilerTest, CanCompileStructs) {
+  if (GetParam() != TargetPlatform::kSkSL) {
+    GTEST_SKIP() << "Only supported on SkSL";
+  }
+  ASSERT_TRUE(CanCompileAndReflect("struct_internal.frag",
+                                   SourceType::kFragmentShader));
+}
+
+#define INSTANTIATE_TARGET_PLATFORM_TEST_SUITE_P(suite_name)               \
+  INSTANTIATE_TEST_SUITE_P(                                                \
+      suite_name, CompilerTest,                                            \
+      ::testing::Values(TargetPlatform::kOpenGLES,                         \
+                        TargetPlatform::kOpenGLDesktop,                    \
+                        TargetPlatform::kMetalDesktop,                     \
+                        TargetPlatform::kMetalIOS, TargetPlatform::kSkSL), \
+      [](const ::testing::TestParamInfo<CompilerTest::ParamType>& info) {  \
+        return TargetPlatformToString(info.param);                         \
       });
 
 INSTANTIATE_TARGET_PLATFORM_TEST_SUITE_P(CompilerSuite);
diff --git a/impeller/compiler/constants.cc b/impeller/compiler/constants.cc
new file mode 100644
index 0000000000000000000000000000000000000000..e6ef34596a6f02c968c186836c61f835b22b4b52
--- /dev/null
+++ b/impeller/compiler/constants.cc
@@ -0,0 +1,13 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/compiler/constants.h"
+
+namespace impeller {
+namespace compiler {
+
+//
+
+}  // namespace compiler
+}  // namespace impeller
diff --git a/impeller/renderer/buffer.h b/impeller/compiler/constants.h
similarity index 45%
rename from impeller/renderer/buffer.h
rename to impeller/compiler/constants.h
index d29e32e1be70bceed9bd45c3438b31946285118a..958a643aca542e23488e1e881e9984b43d8da0fa 100644
--- a/impeller/renderer/buffer.h
+++ b/impeller/compiler/constants.h
@@ -2,21 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
-
-#include <memory>
+#ifndef FLUTTER_IMPELLER_COMPILER_CONSTANTS_H_
+#define FLUTTER_IMPELLER_COMPILER_CONSTANTS_H_
 
 namespace impeller {
+namespace compiler {
 
-class DeviceBuffer;
-class Allocator;
-
-class Buffer {
- public:
-  virtual ~Buffer();
-
-  virtual std::shared_ptr<const DeviceBuffer> GetDeviceBuffer(
-      Allocator& allocator) const = 0;
-};
+constexpr char kExternalTexturePrefix[] = "SAMPLER_EXTERNAL_OES_";
 
+}  // namespace compiler
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_COMPILER_CONSTANTS_H_
diff --git a/impeller/compiler/impellerc_main.cc b/impeller/compiler/impellerc_main.cc
index f412c21d86495203abb5db3ef6dabd7ad905baf8..f9ecc73d6cdf568021ecdf2ffb8f25489a98af78 100644
--- a/impeller/compiler/impellerc_main.cc
+++ b/impeller/compiler/impellerc_main.cc
@@ -8,166 +8,146 @@
 #include "flutter/fml/backtrace.h"
 #include "flutter/fml/command_line.h"
 #include "flutter/fml/file.h"
-#include "flutter/fml/macros.h"
 #include "flutter/fml/mapping.h"
-#include "impeller/base/strings.h"
 #include "impeller/compiler/compiler.h"
+#include "impeller/compiler/runtime_stage_data.h"
+#include "impeller/compiler/shader_bundle.h"
 #include "impeller/compiler/source_options.h"
 #include "impeller/compiler/switches.h"
 #include "impeller/compiler/types.h"
 #include "impeller/compiler/utilities.h"
-#include "third_party/shaderc/libshaderc/include/shaderc/shaderc.hpp"
 
 namespace impeller {
 namespace compiler {
 
-// Sets the file access mode of the file at path 'p' to 0644.
-static bool SetPermissiveAccess(const std::filesystem::path& p) {
-  auto permissions =
-      std::filesystem::perms::owner_read | std::filesystem::perms::owner_write |
-      std::filesystem::perms::group_read | std::filesystem::perms::others_read;
-  std::error_code error;
-  std::filesystem::permissions(p, permissions, error);
-  if (error) {
-    std::cerr << "Failed to set access on file '" << p
-              << "': " << error.message() << std::endl;
-    return false;
-  }
-  return true;
+static Reflector::Options CreateReflectorOptions(const SourceOptions& options,
+                                                 const Switches& switches) {
+  Reflector::Options reflector_options;
+  reflector_options.target_platform = options.target_platform;
+  reflector_options.entry_point_name = options.entry_point_name;
+  reflector_options.shader_name =
+      InferShaderNameFromPath(switches.source_file_name);
+  reflector_options.header_file_name = Utf8FromPath(
+      std::filesystem::path{switches.reflection_header_name}.filename());
+  return reflector_options;
 }
 
-bool Main(const fml::CommandLine& command_line) {
-  fml::InstallCrashHandler();
-  if (command_line.HasOption("help")) {
-    Switches::PrintHelp(std::cout);
-    return true;
-  }
+/// Run the shader compiler to geneate SkSL reflection data.
+/// If there is an error, prints error text and returns `nullptr`.
+static std::shared_ptr<RuntimeStageData::Shader> CompileSkSL(
+    std::shared_ptr<fml::Mapping> source_file_mapping,
+    const Switches& switches) {
+  auto options = switches.CreateSourceOptions(TargetPlatform::kSkSL);
 
-  Switches switches(command_line);
-  if (!switches.AreValid(std::cerr)) {
-    std::cerr << "Invalid flags specified." << std::endl;
-    Switches::PrintHelp(std::cerr);
-    return false;
+  Reflector::Options sksl_reflector_options =
+      CreateReflectorOptions(options, switches);
+  sksl_reflector_options.target_platform = TargetPlatform::kSkSL;
+
+  Compiler sksl_compiler =
+      Compiler(std::move(source_file_mapping), options, sksl_reflector_options);
+  if (!sksl_compiler.IsValid()) {
+    std::cerr << "Compilation to SkSL failed." << std::endl;
+    std::cerr << sksl_compiler.GetErrorMessages() << std::endl;
+    return nullptr;
   }
+  return sksl_compiler.GetReflector()->GetRuntimeStageShaderData();
+}
 
-  auto source_file_mapping =
-      fml::FileMapping::CreateReadOnly(switches.source_file_name);
-  if (!source_file_mapping) {
-    std::cerr << "Could not open input file." << std::endl;
-    return false;
+static bool OutputIPLR(
+    const Switches& switches,
+    const std::shared_ptr<fml::Mapping>& source_file_mapping) {
+  FML_DCHECK(switches.iplr);
+
+  RuntimeStageData stages;
+  std::shared_ptr<RuntimeStageData::Shader> sksl_shader;
+  if (TargetPlatformBundlesSkSL(switches.SelectDefaultTargetPlatform())) {
+    sksl_shader = CompileSkSL(source_file_mapping, switches);
+    if (!sksl_shader) {
+      return false;
+    }
+    stages.AddShader(sksl_shader);
   }
 
-  SourceOptions options;
-  options.target_platform = switches.target_platform;
-  options.source_language = switches.source_language;
-  if (switches.input_type == SourceType::kUnknown) {
-    options.type = SourceTypeFromFileName(switches.source_file_name);
-  } else {
-    options.type = switches.input_type;
-  }
-  options.working_directory = switches.working_directory;
-  options.file_name = switches.source_file_name;
-  options.include_dirs = switches.include_directories;
-  options.defines = switches.defines;
-  options.entry_point_name = EntryPointFunctionNameFromSourceName(
-      switches.source_file_name, options.type, options.source_language,
-      switches.entry_point);
-  options.json_format = switches.json_format;
-  options.remap_samplers = switches.remap_samplers;
-  options.gles_language_version = switches.gles_language_version;
+  for (const auto& platform : switches.PlatformsToCompile()) {
+    if (platform == TargetPlatform::kSkSL) {
+      // Already handled above.
+      continue;
+    }
+    SourceOptions options = switches.CreateSourceOptions(platform);
 
-  Reflector::Options reflector_options;
-  reflector_options.target_platform = switches.target_platform;
-  reflector_options.entry_point_name = options.entry_point_name;
-  reflector_options.shader_name =
-      InferShaderNameFromPath(switches.source_file_name);
-  reflector_options.header_file_name = Utf8FromPath(
-      std::filesystem::path{switches.reflection_header_name}.filename());
+    // Invoke the compiler and generate reflection data for a single shader.
 
-  // Generate SkSL if needed.
-  std::shared_ptr<fml::Mapping> sksl_mapping;
-  if (switches.iplr && TargetPlatformBundlesSkSL(switches.target_platform)) {
-    SourceOptions sksl_options = options;
-    sksl_options.target_platform = TargetPlatform::kSkSL;
+    Reflector::Options reflector_options =
+        CreateReflectorOptions(options, switches);
+    Compiler compiler(source_file_mapping, options, reflector_options);
+    if (!compiler.IsValid()) {
+      std::cerr << "Compilation failed." << std::endl;
+      std::cerr << compiler.GetErrorMessages() << std::endl;
+      return false;
+    }
 
-    Reflector::Options sksl_reflector_options = reflector_options;
-    sksl_reflector_options.target_platform = TargetPlatform::kSkSL;
+    auto reflector = compiler.GetReflector();
+    if (reflector == nullptr) {
+      std::cerr << "Could not create reflector." << std::endl;
+      return false;
+    }
 
-    Compiler sksl_compiler =
-        Compiler(*source_file_mapping, sksl_options, sksl_reflector_options);
-    if (!sksl_compiler.IsValid()) {
-      std::cerr << "Compilation to SkSL failed." << std::endl;
-      std::cerr << sksl_compiler.GetErrorMessages() << std::endl;
+    auto stage_data = reflector->GetRuntimeStageShaderData();
+    if (!stage_data) {
+      std::cerr << "Runtime stage information was nil." << std::endl;
       return false;
     }
-    sksl_mapping = sksl_compiler.GetSLShaderSource();
+
+    stages.AddShader(stage_data);
   }
 
-  Compiler compiler(*source_file_mapping, options, reflector_options);
-  if (!compiler.IsValid()) {
-    std::cerr << "Compilation failed." << std::endl;
-    std::cerr << compiler.GetErrorMessages() << std::endl;
+  auto stage_data_mapping = switches.json_format ? stages.CreateJsonMapping()
+                                                 : stages.CreateMapping();
+  if (!stage_data_mapping) {
+    std::cerr << "Runtime stage data could not be created." << std::endl;
+    return false;
+  }
+  if (!fml::WriteAtomically(*switches.working_directory,                  //
+                            Utf8FromPath(switches.sl_file_name).c_str(),  //
+                            *stage_data_mapping                           //
+                            )) {
+    std::cerr << "Could not write file to " << switches.sl_file_name
+              << std::endl;
     return false;
   }
+  // Tools that consume the runtime stage data expect the access mode to
+  // be 0644.
+  if (!SetPermissiveAccess(switches.sl_file_name)) {
+    return false;
+  }
+  return true;
+}
 
-  auto spriv_file_name = std::filesystem::absolute(
-      std::filesystem::current_path() / switches.spirv_file_name);
+static bool OutputSLFile(const Compiler& compiler, const Switches& switches) {
+  // --------------------------------------------------------------------------
+  /// 2. Output the source file. When in IPLR/RuntimeStage mode, output the
+  ///    serialized IPLR flatbuffer.
+  ///
+
+  auto sl_file_name = std::filesystem::absolute(
+      std::filesystem::current_path() / switches.sl_file_name);
   if (!fml::WriteAtomically(*switches.working_directory,
-                            Utf8FromPath(spriv_file_name).c_str(),
-                            *compiler.GetSPIRVAssembly())) {
-    std::cerr << "Could not write file to " << switches.spirv_file_name
+                            Utf8FromPath(sl_file_name).c_str(),
+                            *compiler.GetSLShaderSource())) {
+    std::cerr << "Could not write file to " << switches.sl_file_name
               << std::endl;
     return false;
   }
+  return true;
+}
 
-  if (TargetPlatformNeedsSL(options.target_platform)) {
-    auto sl_file_name = std::filesystem::absolute(
-        std::filesystem::current_path() / switches.sl_file_name);
-    const bool is_runtime_stage_data = switches.iplr;
-    if (is_runtime_stage_data) {
-      auto reflector = compiler.GetReflector();
-      if (reflector == nullptr) {
-        std::cerr << "Could not create reflector." << std::endl;
-        return false;
-      }
-      auto stage_data = reflector->GetRuntimeStageData();
-      if (!stage_data) {
-        std::cerr << "Runtime stage information was nil." << std::endl;
-        return false;
-      }
-      if (sksl_mapping) {
-        stage_data->SetSkSLData(sksl_mapping);
-      }
-      auto stage_data_mapping = options.json_format
-                                    ? stage_data->CreateJsonMapping()
-                                    : stage_data->CreateMapping();
-      if (!stage_data_mapping) {
-        std::cerr << "Runtime stage data could not be created." << std::endl;
-        return false;
-      }
-      if (!fml::WriteAtomically(*switches.working_directory,         //
-                                Utf8FromPath(sl_file_name).c_str(),  //
-                                *stage_data_mapping                  //
-                                )) {
-        std::cerr << "Could not write file to " << switches.sl_file_name
-                  << std::endl;
-        return false;
-      }
-      // Tools that consume the runtime stage data expect the access mode to
-      // be 0644.
-      if (!SetPermissiveAccess(sl_file_name)) {
-        return false;
-      }
-    } else {
-      if (!fml::WriteAtomically(*switches.working_directory,
-                                Utf8FromPath(sl_file_name).c_str(),
-                                *compiler.GetSLShaderSource())) {
-        std::cerr << "Could not write file to " << switches.sl_file_name
-                  << std::endl;
-        return false;
-      }
-    }
-  }
+static bool OutputReflectionData(const Compiler& compiler,
+                                 const Switches& switches,
+                                 const SourceOptions& options) {
+  // --------------------------------------------------------------------------
+  /// 3. Output shader reflection data.
+  ///    May include a JSON file, a C++ header, and/or a C++ TU.
+  ///
 
   if (TargetPlatformNeedsReflection(options.target_platform)) {
     if (!switches.reflection_json_name.empty()) {
@@ -210,16 +190,24 @@ bool Main(const fml::CommandLine& command_line) {
       }
     }
   }
+  return true;
+}
+
+static bool OutputDepfile(const Compiler& compiler, const Switches& switches) {
+  // --------------------------------------------------------------------------
+  /// 4. Output a depfile.
+  ///
 
   if (!switches.depfile_path.empty()) {
     std::string result_file;
-    switch (switches.target_platform) {
+    switch (switches.SelectDefaultTargetPlatform()) {
       case TargetPlatform::kMetalDesktop:
       case TargetPlatform::kMetalIOS:
       case TargetPlatform::kOpenGLES:
       case TargetPlatform::kOpenGLDesktop:
       case TargetPlatform::kRuntimeStageMetal:
       case TargetPlatform::kRuntimeStageGLES:
+      case TargetPlatform::kRuntimeStageVulkan:
       case TargetPlatform::kSkSL:
       case TargetPlatform::kVulkan:
         result_file = switches.sl_file_name;
@@ -242,6 +230,82 @@ bool Main(const fml::CommandLine& command_line) {
   return true;
 }
 
+bool Main(const fml::CommandLine& command_line) {
+  fml::InstallCrashHandler();
+  if (command_line.HasOption("help")) {
+    Switches::PrintHelp(std::cout);
+    return true;
+  }
+
+  Switches switches(command_line);
+  if (!switches.AreValid(std::cerr)) {
+    std::cerr << "Invalid flags specified." << std::endl;
+    Switches::PrintHelp(std::cerr);
+    return false;
+  }
+
+  if (!switches.shader_bundle.empty()) {
+    // Invoke the compiler multiple times to build a shader bundle with the
+    // given shader_bundle spec.
+    return GenerateShaderBundle(switches);
+  }
+
+  std::shared_ptr<fml::FileMapping> source_file_mapping =
+      fml::FileMapping::CreateReadOnly(switches.source_file_name);
+  if (!source_file_mapping) {
+    std::cerr << "Could not open input file." << std::endl;
+    return false;
+  }
+
+  if (switches.iplr && !OutputIPLR(switches, source_file_mapping)) {
+    return false;
+  }
+
+  // Create at least one compiler to output the SL file, reflection data, and a
+  // depfile.
+  // TODO(dnfield): This seems off. We should more explicitly handle how we
+  // generate reflection and depfile data for the runtime stage case.
+  // https://github.com/flutter/flutter/issues/140841
+
+  SourceOptions options = switches.CreateSourceOptions();
+
+  // Invoke the compiler and generate reflection data for a single shader.
+
+  Reflector::Options reflector_options =
+      CreateReflectorOptions(options, switches);
+
+  Compiler compiler(source_file_mapping, options, reflector_options);
+  if (!compiler.IsValid()) {
+    std::cerr << "Compilation failed." << std::endl;
+    std::cerr << compiler.GetErrorMessages() << std::endl;
+    return false;
+  }
+
+  auto spriv_file_name = std::filesystem::absolute(
+      std::filesystem::current_path() / switches.spirv_file_name);
+  if (!fml::WriteAtomically(*switches.working_directory,
+                            Utf8FromPath(spriv_file_name).c_str(),
+                            *compiler.GetSPIRVAssembly())) {
+    std::cerr << "Could not write file to " << switches.spirv_file_name
+              << std::endl;
+    return false;
+  }
+
+  if (!switches.iplr && !OutputSLFile(compiler, switches)) {
+    return false;
+  }
+
+  if (!OutputReflectionData(compiler, switches, options)) {
+    return false;
+  }
+
+  if (!OutputDepfile(compiler, switches)) {
+    return false;
+  }
+
+  return true;
+}
+
 }  // namespace compiler
 }  // namespace impeller
 
diff --git a/impeller/compiler/include_dir.h b/impeller/compiler/include_dir.h
index 0c7927a47ffef3dd96f3043762610d8d14474141..2a40dd0e36973d3bb65b775e1eea79f2d0a70a3a 100644
--- a/impeller/compiler/include_dir.h
+++ b/impeller/compiler/include_dir.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_COMPILER_INCLUDE_DIR_H_
+#define FLUTTER_IMPELLER_COMPILER_INCLUDE_DIR_H_
 
 #include <memory>
 #include <string>
@@ -19,3 +20,5 @@ struct IncludeDir {
 
 }  // namespace compiler
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_COMPILER_INCLUDE_DIR_H_
diff --git a/impeller/compiler/includer.h b/impeller/compiler/includer.h
index 0c373a6b3dd2f6d02ad53200ac122ee445dcf923..70123148006e23470c34aa9bbc6810815df29f10 100644
--- a/impeller/compiler/includer.h
+++ b/impeller/compiler/includer.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_COMPILER_INCLUDER_H_
+#define FLUTTER_IMPELLER_COMPILER_INCLUDER_H_
 
 #include <string>
 
-#include "flutter/fml/macros.h"
 #include "flutter/fml/mapping.h"
 #include "impeller/compiler/include_dir.h"
 #include "shaderc/shaderc.hpp"
@@ -52,8 +52,12 @@ class Includer final : public shaderc::CompileOptions::IncluderInterface {
   std::unique_ptr<fml::FileMapping> FindFirstMapping(
       const char* requested_source);
 
-  FML_DISALLOW_COPY_AND_ASSIGN(Includer);
+  Includer(const Includer&) = delete;
+
+  Includer& operator=(const Includer&) = delete;
 };
 
 }  // namespace compiler
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_COMPILER_INCLUDER_H_
diff --git a/impeller/compiler/logger.h b/impeller/compiler/logger.h
index fb07dd079bd2353bbd8be7a0f307c6ed68a9fef0..11232d83a8449fef215d6b934d4b838b4254aed0 100644
--- a/impeller/compiler/logger.h
+++ b/impeller/compiler/logger.h
@@ -2,20 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_COMPILER_LOGGER_H_
+#define FLUTTER_IMPELLER_COMPILER_LOGGER_H_
 
 #include <sstream>
 #include <string>
 
 #include "flutter/fml/logging.h"
-#include "flutter/fml/macros.h"
 
 namespace impeller {
 namespace compiler {
 
 class AutoLogger {
  public:
-  AutoLogger(std::stringstream& logger) : logger_(logger) {}
+  explicit AutoLogger(std::stringstream& logger) : logger_(logger) {}
 
   ~AutoLogger() {
     logger_ << std::endl;
@@ -31,13 +31,18 @@ class AutoLogger {
  private:
   std::stringstream& logger_;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(AutoLogger);
+  AutoLogger(const AutoLogger&) = delete;
+
+  AutoLogger& operator=(const AutoLogger&) = delete;
 };
 
-#define COMPILER_ERROR \
-  ::impeller::compiler::AutoLogger(error_stream_) << GetSourcePrefix()
+#define COMPILER_ERROR(stream) \
+  ::impeller::compiler::AutoLogger(stream) << GetSourcePrefix()
 
-#define COMPILER_ERROR_NO_PREFIX ::impeller::compiler::AutoLogger(error_stream_)
+#define COMPILER_ERROR_NO_PREFIX(stream) \
+  ::impeller::compiler::AutoLogger(stream)
 
 }  // namespace compiler
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_COMPILER_LOGGER_H_
diff --git a/impeller/compiler/reflector.cc b/impeller/compiler/reflector.cc
index 9b911dfef4dedbb49c14b0bbb8ed3f6c0f891c4d..1fd6ba2e0d204c80de8d5e847670e53d3d8dd772 100644
--- a/impeller/compiler/reflector.cc
+++ b/impeller/compiler/reflector.cc
@@ -11,72 +11,31 @@
 #include <set>
 #include <sstream>
 
-#include "flutter/fml/closure.h"
 #include "flutter/fml/logging.h"
+#include "fml/backtrace.h"
 #include "impeller/base/strings.h"
 #include "impeller/base/validation.h"
 #include "impeller/compiler/code_gen_template.h"
+#include "impeller/compiler/shader_bundle_data.h"
+#include "impeller/compiler/types.h"
+#include "impeller/compiler/uniform_sorter.h"
 #include "impeller/compiler/utilities.h"
+#include "impeller/core/runtime_types.h"
+#include "impeller/geometry/half.h"
 #include "impeller/geometry/matrix.h"
 #include "impeller/geometry/scalar.h"
+#include "impeller/runtime_stage/runtime_stage.h"
+#include "spirv_common.hpp"
 
 namespace impeller {
 namespace compiler {
 
-static std::string BaseTypeToString(spirv_cross::SPIRType::BaseType type) {
-  using Type = spirv_cross::SPIRType::BaseType;
-  switch (type) {
-    case Type::Void:
-      return "ShaderType::kVoid";
-    case Type::Boolean:
-      return "ShaderType::kBoolean";
-    case Type::SByte:
-      return "ShaderType::kSignedByte";
-    case Type::UByte:
-      return "ShaderType::kUnsignedByte";
-    case Type::Short:
-      return "ShaderType::kSignedShort";
-    case Type::UShort:
-      return "ShaderType::kUnsignedShort";
-    case Type::Int:
-      return "ShaderType::kSignedInt";
-    case Type::UInt:
-      return "ShaderType::kUnsignedInt";
-    case Type::Int64:
-      return "ShaderType::kSignedInt64";
-    case Type::UInt64:
-      return "ShaderType::kUnsignedInt64";
-    case Type::AtomicCounter:
-      return "ShaderType::kAtomicCounter";
-    case Type::Half:
-      return "ShaderType::kHalfFloat";
-    case Type::Float:
-      return "ShaderType::kFloat";
-    case Type::Double:
-      return "ShaderType::kDouble";
-    case Type::Struct:
-      return "ShaderType::kStruct";
-    case Type::Image:
-      return "ShaderType::kImage";
-    case Type::SampledImage:
-      return "ShaderType::kSampledImage";
-    case Type::Sampler:
-      return "ShaderType::kSampler";
-    default:
-      return "ShaderType::kUnknown";
-  }
-}
-
 static std::string ExecutionModelToString(spv::ExecutionModel model) {
   switch (model) {
     case spv::ExecutionModel::ExecutionModelVertex:
       return "vertex";
     case spv::ExecutionModel::ExecutionModelFragment:
       return "fragment";
-    case spv::ExecutionModel::ExecutionModelTessellationControl:
-      return "tessellation_control";
-    case spv::ExecutionModel::ExecutionModelTessellationEvaluation:
-      return "tessellation_evaluation";
     case spv::ExecutionModel::ExecutionModelGLCompute:
       return "compute";
     default:
@@ -84,22 +43,7 @@ static std::string ExecutionModelToString(spv::ExecutionModel model) {
   }
 }
 
-static std::string ExecutionModelToCommandTypeName(
-    spv::ExecutionModel execution_model) {
-  switch (execution_model) {
-    case spv::ExecutionModel::ExecutionModelVertex:
-    case spv::ExecutionModel::ExecutionModelFragment:
-    case spv::ExecutionModel::ExecutionModelTessellationControl:
-    case spv::ExecutionModel::ExecutionModelTessellationEvaluation:
-      return "Command&";
-    case spv::ExecutionModel::ExecutionModelGLCompute:
-      return "ComputeCommand&";
-    default:
-      return "unsupported";
-  }
-}
-
-static std::string StringToShaderStage(std::string str) {
+static std::string StringToShaderStage(const std::string& str) {
   if (str == "vertex") {
     return "ShaderStage::kVertex";
   }
@@ -108,14 +52,6 @@ static std::string StringToShaderStage(std::string str) {
     return "ShaderStage::kFragment";
   }
 
-  if (str == "tessellation_control") {
-    return "ShaderStage::kTessellationControl";
-  }
-
-  if (str == "tessellation_evaluation") {
-    return "ShaderStage::kTessellationEvaluation";
-  }
-
   if (str == "compute") {
     return "ShaderStage::kCompute";
   }
@@ -123,36 +59,14 @@ static std::string StringToShaderStage(std::string str) {
   return "ShaderStage::kUnknown";
 }
 
-static std::string StringToVkShaderStage(std::string str) {
-  if (str == "vertex") {
-    return "VK_SHADER_STAGE_VERTEX_BIT";
-  }
-  if (str == "fragment") {
-    return "VK_SHADER_STAGE_FRAGMENT_BIT";
-  }
-
-  if (str == "tessellation_control") {
-    return "VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT";
-  }
-
-  if (str == "tessellation_evaluation") {
-    return "VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT";
-  }
-
-  if (str == "compute") {
-    return "VK_SHADER_STAGE_COMPUTE_BIT";
-  }
-  return "VK_SHADER_STAGE_ALL_GRAPHICS";
-}
-
 Reflector::Reflector(Options options,
-                     std::shared_ptr<const spirv_cross::ParsedIR> ir,
-                     std::shared_ptr<fml::Mapping> shader_data,
-                     CompilerBackend compiler)
+                     const std::shared_ptr<const spirv_cross::ParsedIR>& ir,
+                     const std::shared_ptr<fml::Mapping>& shader_data,
+                     const CompilerBackend& compiler)
     : options_(std::move(options)),
-      ir_(std::move(ir)),
-      shader_data_(std::move(shader_data)),
-      compiler_(std::move(compiler)) {
+      ir_(ir),
+      shader_data_(shader_data),
+      compiler_(compiler) {
   if (!ir_ || !compiler_) {
     return;
   }
@@ -175,8 +89,10 @@ Reflector::Reflector(Options options,
     return;
   }
 
-  runtime_stage_data_ = GenerateRuntimeStageData();
-  if (!runtime_stage_data_) {
+  runtime_stage_shader_ = GenerateRuntimeStageData();
+
+  shader_bundle_data_ = GenerateShaderBundleData();
+  if (!shader_bundle_data_) {
     return;
   }
 
@@ -210,8 +126,13 @@ std::shared_ptr<fml::Mapping> Reflector::GetReflectionCC() const {
   return reflection_cc_;
 }
 
-std::shared_ptr<RuntimeStageData> Reflector::GetRuntimeStageData() const {
-  return runtime_stage_data_;
+std::shared_ptr<RuntimeStageData::Shader> Reflector::GetRuntimeStageShaderData()
+    const {
+  return runtime_stage_shader_;
+}
+
+std::shared_ptr<ShaderBundleData> Reflector::GetShaderBundleData() const {
+  return shader_bundle_data_;
 }
 
 std::optional<nlohmann::json> Reflector::GenerateTemplateArguments() const {
@@ -234,13 +155,29 @@ std::optional<nlohmann::json> Reflector::GenerateTemplateArguments() const {
 
   const auto shader_resources = compiler_->get_shader_resources();
 
+  // Subpass Inputs.
+  {
+    auto& subpass_inputs = root["subpass_inputs"] = nlohmann::json::array_t{};
+    if (auto subpass_inputs_json =
+            ReflectResources(shader_resources.subpass_inputs);
+        subpass_inputs_json.has_value()) {
+      for (auto subpass_input : subpass_inputs_json.value()) {
+        subpass_input["descriptor_type"] = "DescriptorType::kInputAttachment";
+        subpass_inputs.emplace_back(std::move(subpass_input));
+      }
+    } else {
+      return std::nullopt;
+    }
+  }
+
   // Uniform and storage buffers.
   {
     auto& buffers = root["buffers"] = nlohmann::json::array_t{};
     if (auto uniform_buffers_json =
             ReflectResources(shader_resources.uniform_buffers);
         uniform_buffers_json.has_value()) {
-      for (const auto& uniform_buffer : uniform_buffers_json.value()) {
+      for (auto uniform_buffer : uniform_buffers_json.value()) {
+        uniform_buffer["descriptor_type"] = "DescriptorType::kUniformBuffer";
         buffers.emplace_back(std::move(uniform_buffer));
       }
     } else {
@@ -249,7 +186,8 @@ std::optional<nlohmann::json> Reflector::GenerateTemplateArguments() const {
     if (auto storage_buffers_json =
             ReflectResources(shader_resources.storage_buffers);
         storage_buffers_json.has_value()) {
-      for (const auto& uniform_buffer : storage_buffers_json.value()) {
+      for (auto uniform_buffer : storage_buffers_json.value()) {
+        uniform_buffer["descriptor_type"] = "DescriptorType::kStorageBuffer";
         buffers.emplace_back(std::move(uniform_buffer));
       }
     } else {
@@ -259,8 +197,9 @@ std::optional<nlohmann::json> Reflector::GenerateTemplateArguments() const {
 
   {
     auto& stage_inputs = root["stage_inputs"] = nlohmann::json::array_t{};
-    if (auto stage_inputs_json =
-            ReflectResources(shader_resources.stage_inputs);
+    if (auto stage_inputs_json = ReflectResources(
+            shader_resources.stage_inputs,
+            /*compute_offsets=*/execution_model == spv::ExecutionModelVertex);
         stage_inputs_json.has_value()) {
       stage_inputs = std::move(stage_inputs_json.value());
     } else {
@@ -279,12 +218,15 @@ std::optional<nlohmann::json> Reflector::GenerateTemplateArguments() const {
     }
     auto& sampled_images = root["sampled_images"] = nlohmann::json::array_t{};
     for (auto value : combined_sampled_images.value()) {
+      value["descriptor_type"] = "DescriptorType::kSampledImage";
       sampled_images.emplace_back(std::move(value));
     }
     for (auto value : images.value()) {
+      value["descriptor_type"] = "DescriptorType::kImage";
       sampled_images.emplace_back(std::move(value));
     }
     for (auto value : samplers.value()) {
+      value["descriptor_type"] = "DescriptorType::kSampledSampler";
       sampled_images.emplace_back(std::move(value));
     }
   }
@@ -316,6 +258,18 @@ std::optional<nlohmann::json> Reflector::GenerateTemplateArguments() const {
     std::set<spirv_cross::ID> known_structs;
     ir_->for_each_typed_id<spirv_cross::SPIRType>(
         [&](uint32_t, const spirv_cross::SPIRType& type) {
+          if (type.basetype != spirv_cross::SPIRType::BaseType::Struct) {
+            return;
+          }
+          // Skip structs that do not have layout offset decorations.
+          // These structs are used internally within the shader and are not
+          // part of the shader's interface.
+          for (size_t i = 0; i < type.member_types.size(); i++) {
+            if (!compiler_->has_member_decoration(type.self, i,
+                                                  spv::DecorationOffset)) {
+              return;
+            }
+          }
           if (known_structs.find(type.self) != known_structs.end()) {
             // Iterating over types this way leads to duplicates which may cause
             // duplicate struct definitions.
@@ -344,38 +298,245 @@ std::shared_ptr<fml::Mapping> Reflector::GenerateReflectionCC() const {
   return InflateTemplate(kReflectionCCTemplate);
 }
 
-std::shared_ptr<RuntimeStageData> Reflector::GenerateRuntimeStageData() const {
+static std::optional<RuntimeStageBackend> GetRuntimeStageBackend(
+    TargetPlatform target_platform) {
+  switch (target_platform) {
+    case TargetPlatform::kUnknown:
+    case TargetPlatform::kMetalDesktop:
+    case TargetPlatform::kMetalIOS:
+    case TargetPlatform::kOpenGLES:
+    case TargetPlatform::kOpenGLDesktop:
+    case TargetPlatform::kVulkan:
+      return std::nullopt;
+    case TargetPlatform::kRuntimeStageMetal:
+      return RuntimeStageBackend::kMetal;
+    case TargetPlatform::kRuntimeStageGLES:
+      return RuntimeStageBackend::kOpenGLES;
+    case TargetPlatform::kRuntimeStageVulkan:
+      return RuntimeStageBackend::kVulkan;
+    case TargetPlatform::kSkSL:
+      return RuntimeStageBackend::kSkSL;
+  }
+  FML_UNREACHABLE();
+}
+
+std::shared_ptr<RuntimeStageData::Shader> Reflector::GenerateRuntimeStageData()
+    const {
+  auto backend = GetRuntimeStageBackend(options_.target_platform);
+  if (!backend.has_value()) {
+    return nullptr;
+  }
+
+  const auto& entrypoints = compiler_->get_entry_points_and_stages();
+  if (entrypoints.size() != 1u) {
+    VALIDATION_LOG << "Single entrypoint not found.";
+    return nullptr;
+  }
+  auto data = std::make_unique<RuntimeStageData::Shader>();
+  data->entrypoint = options_.entry_point_name;
+  data->stage = entrypoints.front().execution_model;
+  data->shader = shader_data_;
+  data->backend = backend.value();
+
+  // Sort the IR so that the uniforms are in declaration order.
+  std::vector<spirv_cross::ID> uniforms =
+      SortUniforms(ir_.get(), compiler_.GetCompiler());
+  for (auto& sorted_id : uniforms) {
+    auto var = ir_->ids[sorted_id].get<spirv_cross::SPIRVariable>();
+    const auto spir_type = compiler_->get_type(var.basetype);
+    UniformDescription uniform_description;
+    uniform_description.name = compiler_->get_name(var.self);
+    uniform_description.location = compiler_->get_decoration(
+        var.self, spv::Decoration::DecorationLocation);
+    uniform_description.type = spir_type.basetype;
+    uniform_description.rows = spir_type.vecsize;
+    uniform_description.columns = spir_type.columns;
+    uniform_description.bit_width = spir_type.width;
+    uniform_description.array_elements = GetArrayElements(spir_type);
+    FML_CHECK(data->backend != RuntimeStageBackend::kVulkan ||
+              spir_type.basetype ==
+                  spirv_cross::SPIRType::BaseType::SampledImage)
+        << "Vulkan runtime effect had unexpected uniforms outside of the "
+           "uniform buffer object.";
+    data->uniforms.emplace_back(std::move(uniform_description));
+  }
+
+  const auto ubos = compiler_->get_shader_resources().uniform_buffers;
+  if (data->backend == RuntimeStageBackend::kVulkan && !ubos.empty()) {
+    if (ubos.size() != 1 && ubos[0].name != RuntimeStage::kVulkanUBOName) {
+      VALIDATION_LOG << "Expected a single UBO resource named "
+                        "'"
+                     << RuntimeStage::kVulkanUBOName
+                     << "' "
+                        "for Vulkan runtime stage backend.";
+      return nullptr;
+    }
+
+    const auto& ubo = ubos[0];
+
+    auto members = ReadStructMembers(ubo.type_id);
+    std::vector<uint8_t> struct_layout;
+    size_t float_count = 0;
+
+    for (size_t i = 0; i < members.size(); i += 1) {
+      const auto& member = members[i];
+      std::vector<int> bytes;
+      switch (member.underlying_type) {
+        case StructMember::UnderlyingType::kPadding: {
+          size_t padding_count =
+              (member.size + sizeof(float) - 1) / sizeof(float);
+          while (padding_count > 0) {
+            struct_layout.push_back(0);
+            padding_count--;
+          }
+          break;
+        }
+        case StructMember::UnderlyingType::kFloat: {
+          size_t member_float_count = member.byte_length / sizeof(float);
+          float_count += member_float_count;
+          while (member_float_count > 0) {
+            struct_layout.push_back(1);
+            member_float_count--;
+          }
+          break;
+        }
+        case StructMember::UnderlyingType::kOther:
+          VALIDATION_LOG << "Non-floating-type struct member " << member.name
+                         << " is not supported.";
+          return nullptr;
+      }
+    }
+    data->uniforms.emplace_back(UniformDescription{
+        .name = ubo.name,
+        .location = 64,  // Magic constant that must match the descriptor set
+                         // location for fragment programs.
+        .type = spirv_cross::SPIRType::Struct,
+        .struct_layout = std::move(struct_layout),
+        .struct_float_count = float_count,
+    });
+  }
+
+  // We only need to worry about storing vertex attributes.
+  if (entrypoints.front().execution_model == spv::ExecutionModelVertex) {
+    const auto inputs = compiler_->get_shader_resources().stage_inputs;
+    auto input_offsets = ComputeOffsets(inputs);
+    for (const auto& input : inputs) {
+      std::optional<size_t> offset = GetOffset(input.id, input_offsets);
+
+      const auto type = compiler_->get_type(input.type_id);
+
+      InputDescription input_description;
+      input_description.name = input.name;
+      input_description.location = compiler_->get_decoration(
+          input.id, spv::Decoration::DecorationLocation);
+      input_description.set = compiler_->get_decoration(
+          input.id, spv::Decoration::DecorationDescriptorSet);
+      input_description.binding = compiler_->get_decoration(
+          input.id, spv::Decoration::DecorationBinding);
+      input_description.type = type.basetype;
+      input_description.bit_width = type.width;
+      input_description.vec_size = type.vecsize;
+      input_description.columns = type.columns;
+      input_description.offset = offset.value_or(0u);
+      data->inputs.emplace_back(std::move(input_description));
+    }
+  }
+
+  return data;
+}
+
+std::shared_ptr<ShaderBundleData> Reflector::GenerateShaderBundleData() const {
   const auto& entrypoints = compiler_->get_entry_points_and_stages();
   if (entrypoints.size() != 1u) {
     VALIDATION_LOG << "Single entrypoint not found.";
     return nullptr;
   }
-  auto data = std::make_shared<RuntimeStageData>(
+  auto data = std::make_shared<ShaderBundleData>(
       options_.entry_point_name,            //
       entrypoints.front().execution_model,  //
       options_.target_platform              //
   );
   data->SetShaderData(shader_data_);
-  if (sksl_data_) {
-    data->SetSkSLData(sksl_data_);
+
+  const auto uniforms = compiler_->get_shader_resources().uniform_buffers;
+  for (const auto& uniform : uniforms) {
+    ShaderBundleData::ShaderUniformStruct uniform_struct;
+    uniform_struct.name = uniform.name;
+    uniform_struct.ext_res_0 = compiler_.GetExtendedMSLResourceBinding(
+        CompilerBackend::ExtendedResourceIndex::kPrimary, uniform.id);
+    uniform_struct.set = compiler_->get_decoration(
+        uniform.id, spv::Decoration::DecorationDescriptorSet);
+    uniform_struct.binding = compiler_->get_decoration(
+        uniform.id, spv::Decoration::DecorationBinding);
+
+    const auto type = compiler_->get_type(uniform.type_id);
+    if (type.basetype != spirv_cross::SPIRType::BaseType::Struct) {
+      std::cerr << "Error: Uniform \"" << uniform.name
+                << "\" is not a struct. All Flutter GPU shader uniforms must "
+                   "be structs."
+                << std::endl;
+      return nullptr;
+    }
+
+    size_t size_in_bytes = 0;
+    for (const auto& struct_member : ReadStructMembers(uniform.type_id)) {
+      size_in_bytes += struct_member.byte_length;
+      if (StringStartsWith(struct_member.name, "_PADDING_")) {
+        continue;
+      }
+      ShaderBundleData::ShaderUniformStructField uniform_struct_field;
+      uniform_struct_field.name = struct_member.name;
+      uniform_struct_field.type = struct_member.base_type;
+      uniform_struct_field.offset_in_bytes = struct_member.offset;
+      uniform_struct_field.element_size_in_bytes = struct_member.size;
+      uniform_struct_field.total_size_in_bytes = struct_member.byte_length;
+      uniform_struct_field.array_elements = struct_member.array_elements;
+      uniform_struct.fields.push_back(uniform_struct_field);
+    }
+    uniform_struct.size_in_bytes = size_in_bytes;
+
+    data->AddUniformStruct(uniform_struct);
   }
-  ir_->for_each_typed_id<spirv_cross::SPIRVariable>(
-      [&](uint32_t, const spirv_cross::SPIRVariable& var) {
-        if (var.storage != spv::StorageClassUniformConstant) {
-          return;
-        }
-        const auto spir_type = compiler_->get_type(var.basetype);
-        UniformDescription uniform_description;
-        uniform_description.name = compiler_->get_name(var.self);
-        uniform_description.location = compiler_->get_decoration(
-            var.self, spv::Decoration::DecorationLocation);
-        uniform_description.type = spir_type.basetype;
-        uniform_description.rows = spir_type.vecsize;
-        uniform_description.columns = spir_type.columns;
-        uniform_description.bit_width = spir_type.width;
-        uniform_description.array_elements = GetArrayElements(spir_type);
-        data->AddUniformDescription(std::move(uniform_description));
-      });
+
+  const auto sampled_images = compiler_->get_shader_resources().sampled_images;
+  for (const auto& image : sampled_images) {
+    ShaderBundleData::ShaderUniformTexture uniform_texture;
+    uniform_texture.name = image.name;
+    uniform_texture.ext_res_0 = compiler_.GetExtendedMSLResourceBinding(
+        CompilerBackend::ExtendedResourceIndex::kPrimary, image.id);
+    uniform_texture.set = compiler_->get_decoration(
+        image.id, spv::Decoration::DecorationDescriptorSet);
+    uniform_texture.binding =
+        compiler_->get_decoration(image.id, spv::Decoration::DecorationBinding);
+    data->AddUniformTexture(uniform_texture);
+  }
+
+  // We only need to worry about storing vertex attributes.
+  if (entrypoints.front().execution_model == spv::ExecutionModelVertex) {
+    const auto inputs = compiler_->get_shader_resources().stage_inputs;
+    auto input_offsets = ComputeOffsets(inputs);
+    for (const auto& input : inputs) {
+      std::optional<size_t> offset = GetOffset(input.id, input_offsets);
+
+      const auto type = compiler_->get_type(input.type_id);
+
+      InputDescription input_description;
+      input_description.name = input.name;
+      input_description.location = compiler_->get_decoration(
+          input.id, spv::Decoration::DecorationLocation);
+      input_description.set = compiler_->get_decoration(
+          input.id, spv::Decoration::DecorationDescriptorSet);
+      input_description.binding = compiler_->get_decoration(
+          input.id, spv::Decoration::DecorationBinding);
+      input_description.type = type.basetype;
+      input_description.bit_width = type.width;
+      input_description.vec_size = type.vecsize;
+      input_description.columns = type.columns;
+      input_description.offset = offset.value_or(0u);
+      data->AddInputDescription(std::move(input_description));
+    }
+  }
+
   return data;
 }
 
@@ -397,6 +558,8 @@ static std::string ToString(CompilerBackend::Type type) {
       return "Metal Shading Language";
     case CompilerBackend::Type::kGLSL:
       return "OpenGL Shading Language";
+    case CompilerBackend::Type::kGLSLVulkan:
+      return "OpenGL Shading Language (Relaxed Vulkan Semantics)";
     case CompilerBackend::Type::kSkSL:
       return "SkSL Shading Language";
   }
@@ -410,7 +573,7 @@ std::shared_ptr<fml::Mapping> Reflector::InflateTemplate(
   env.set_lstrip_blocks(true);
 
   env.add_callback("camel_case", 1u, [](inja::Arguments& args) {
-    return ConvertToCamelCase(args.at(0u)->get<std::string>());
+    return ToCamelCase(args.at(0u)->get<std::string>());
   });
 
   env.add_callback("to_shader_stage", 1u, [](inja::Arguments& args) {
@@ -421,10 +584,6 @@ std::shared_ptr<fml::Mapping> Reflector::InflateTemplate(
                    [type = compiler_.GetType()](inja::Arguments& args) {
                      return ToString(type);
                    });
-  env.add_callback(
-      "to_vk_shader_stage_flag_bits", 1u, [](inja::Arguments& args) {
-        return StringToVkShaderStage(args.at(0u)->get<std::string>());
-      });
 
   auto inflated_template =
       std::make_shared<std::string>(env.render(tmpl, *template_arguments_));
@@ -434,8 +593,47 @@ std::shared_ptr<fml::Mapping> Reflector::InflateTemplate(
       inflated_template->size(), [inflated_template](auto, auto) {});
 }
 
+std::vector<size_t> Reflector::ComputeOffsets(
+    const spirv_cross::SmallVector<spirv_cross::Resource>& resources) const {
+  std::vector<size_t> offsets(resources.size(), 0);
+  if (resources.size() == 0) {
+    return offsets;
+  }
+  for (const auto& resource : resources) {
+    const auto type = compiler_->get_type(resource.type_id);
+    auto location = compiler_->get_decoration(
+        resource.id, spv::Decoration::DecorationLocation);
+    // Malformed shader, will be caught later on.
+    if (location >= resources.size() || location < 0) {
+      location = 0;
+    }
+    offsets[location] = (type.width * type.vecsize) / 8;
+  }
+  for (size_t i = 1; i < resources.size(); i++) {
+    offsets[i] += offsets[i - 1];
+  }
+  for (size_t i = resources.size() - 1; i > 0; i--) {
+    offsets[i] = offsets[i - 1];
+  }
+  offsets[0] = 0;
+
+  return offsets;
+}
+
+std::optional<size_t> Reflector::GetOffset(
+    spirv_cross::ID id,
+    const std::vector<size_t>& offsets) const {
+  uint32_t location =
+      compiler_->get_decoration(id, spv::Decoration::DecorationLocation);
+  if (location >= offsets.size()) {
+    return std::nullopt;
+  }
+  return offsets[location];
+}
+
 std::optional<nlohmann::json::object_t> Reflector::ReflectResource(
-    const spirv_cross::Resource& resource) const {
+    const spirv_cross::Resource& resource,
+    std::optional<size_t> offset) const {
   nlohmann::json::object_t result;
 
   result["name"] = resource.name;
@@ -458,6 +656,7 @@ std::optional<nlohmann::json::object_t> Reflector::ReflectResource(
     return std::nullopt;
   }
   result["type"] = std::move(type.value());
+  result["offset"] = offset.value_or(0u);
   return result;
 }
 
@@ -467,7 +666,7 @@ std::optional<nlohmann::json::object_t> Reflector::ReflectType(
 
   const auto type = compiler_->get_type(type_id);
 
-  result["type_name"] = BaseTypeToString(type.basetype);
+  result["type_name"] = StructMember::BaseTypeToString(type.basetype);
   result["bit_width"] = type.width;
   result["vec_size"] = type.vecsize;
   result["columns"] = type.columns;
@@ -477,7 +676,8 @@ std::optional<nlohmann::json::object_t> Reflector::ReflectType(
       auto member = nlohmann::json::object_t{};
       member["name"] = struct_member.name;
       member["type"] = struct_member.type;
-      member["base_type"] = struct_member.base_type;
+      member["base_type"] =
+          StructMember::BaseTypeToString(struct_member.base_type);
       member["offset"] = struct_member.offset;
       member["size"] = struct_member.size;
       member["byte_length"] = struct_member.byte_length;
@@ -494,11 +694,21 @@ std::optional<nlohmann::json::object_t> Reflector::ReflectType(
 }
 
 std::optional<nlohmann::json::array_t> Reflector::ReflectResources(
-    const spirv_cross::SmallVector<spirv_cross::Resource>& resources) const {
+    const spirv_cross::SmallVector<spirv_cross::Resource>& resources,
+    bool compute_offsets) const {
   nlohmann::json::array_t result;
   result.reserve(resources.size());
+  std::vector<size_t> offsets;
+  if (compute_offsets) {
+    offsets = ComputeOffsets(resources);
+  }
   for (const auto& resource : resources) {
-    if (auto reflected = ReflectResource(resource); reflected.has_value()) {
+    std::optional<size_t> maybe_offset = std::nullopt;
+    if (compute_offsets) {
+      maybe_offset = GetOffset(resource.id, offsets);
+    }
+    if (auto reflected = ReflectResource(resource, maybe_offset);
+        reflected.has_value()) {
       result.emplace_back(std::move(reflected.value()));
     } else {
       return std::nullopt;
@@ -531,6 +741,11 @@ static std::optional<KnownType> ReadKnownScalarType(
           .name = "Scalar",
           .byte_size = sizeof(Scalar),
       };
+    case spirv_cross::SPIRType::BaseType::Half:
+      return KnownType{
+          .name = "Half",
+          .byte_size = sizeof(Half),
+      };
     case spirv_cross::SPIRType::BaseType::UInt:
       return KnownType{
           .name = "uint32_t",
@@ -587,8 +802,8 @@ std::vector<StructMember> Reflector::ReadStructMembers(
     if (struct_member_offset > current_byte_offset) {
       const auto alignment_pad = struct_member_offset - current_byte_offset;
       result.emplace_back(StructMember{
-          TypeNameWithPaddingOfSize(alignment_pad),                 // type
-          BaseTypeToString(spirv_cross::SPIRType::BaseType::Void),  // basetype
+          TypeNameWithPaddingOfSize(alignment_pad),  // type
+          spirv_cross::SPIRType::BaseType::Void,     // basetype
           SPrintF("_PADDING_%s_",
                   GetMemberNameAtIndex(struct_type, i).c_str()),  // name
           current_byte_offset,                                    // offset
@@ -617,7 +832,7 @@ std::vector<StructMember> Reflector::ReadStructMembers(
       uint32_t element_padding = stride - size;
       result.emplace_back(StructMember{
           compiler_->get_name(member.self),      // type
-          BaseTypeToString(member.basetype),     // basetype
+          member.basetype,                       // basetype
           GetMemberNameAtIndex(struct_type, i),  // name
           struct_member_offset,                  // offset
           size,                                  // size
@@ -640,7 +855,7 @@ std::vector<StructMember> Reflector::ReadStructMembers(
       uint32_t element_padding = stride - sizeof(Matrix);
       result.emplace_back(StructMember{
           "Matrix",                              // type
-          BaseTypeToString(member.basetype),     // basetype
+          member.basetype,                       // basetype
           GetMemberNameAtIndex(struct_type, i),  // name
           struct_member_offset,                  // offset
           sizeof(Matrix),                        // size
@@ -663,7 +878,7 @@ std::vector<StructMember> Reflector::ReadStructMembers(
       uint32_t element_padding = stride - sizeof(UintPoint32);
       result.emplace_back(StructMember{
           "UintPoint32",                         // type
-          BaseTypeToString(member.basetype),     // basetype
+          member.basetype,                       // basetype
           GetMemberNameAtIndex(struct_type, i),  // name
           struct_member_offset,                  // offset
           sizeof(UintPoint32),                   // size
@@ -686,7 +901,7 @@ std::vector<StructMember> Reflector::ReadStructMembers(
       uint32_t element_padding = stride - sizeof(IPoint32);
       result.emplace_back(StructMember{
           "IPoint32",                            // type
-          BaseTypeToString(member.basetype),     // basetype
+          member.basetype,                       // basetype
           GetMemberNameAtIndex(struct_type, i),  // name
           struct_member_offset,                  // offset
           sizeof(IPoint32),                      // size
@@ -708,7 +923,7 @@ std::vector<StructMember> Reflector::ReadStructMembers(
       uint32_t element_padding = stride - sizeof(Point);
       result.emplace_back(StructMember{
           "Point",                               // type
-          BaseTypeToString(member.basetype),     // basetype
+          member.basetype,                       // basetype
           GetMemberNameAtIndex(struct_type, i),  // name
           struct_member_offset,                  // offset
           sizeof(Point),                         // size
@@ -730,7 +945,7 @@ std::vector<StructMember> Reflector::ReadStructMembers(
       uint32_t element_padding = stride - sizeof(Vector3);
       result.emplace_back(StructMember{
           "Vector3",                             // type
-          BaseTypeToString(member.basetype),     // basetype
+          member.basetype,                       // basetype
           GetMemberNameAtIndex(struct_type, i),  // name
           struct_member_offset,                  // offset
           sizeof(Vector3),                       // size
@@ -752,7 +967,7 @@ std::vector<StructMember> Reflector::ReadStructMembers(
       uint32_t element_padding = stride - sizeof(Vector4);
       result.emplace_back(StructMember{
           "Vector4",                             // type
-          BaseTypeToString(member.basetype),     // basetype
+          member.basetype,                       // basetype
           GetMemberNameAtIndex(struct_type, i),  // name
           struct_member_offset,                  // offset
           sizeof(Vector4),                       // size
@@ -764,6 +979,75 @@ std::vector<StructMember> Reflector::ReadStructMembers(
       continue;
     }
 
+    // Tightly packed half Point (vec2).
+    if (member.basetype == spirv_cross::SPIRType::BaseType::Half &&  //
+        member.width == sizeof(Half) * 8 &&                          //
+        member.columns == 1 &&                                       //
+        member.vecsize == 2                                          //
+    ) {
+      uint32_t stride =
+          GetArrayStride<sizeof(HalfVector2)>(struct_type, member, i);
+      uint32_t element_padding = stride - sizeof(HalfVector2);
+      result.emplace_back(StructMember{
+          "HalfVector2",                         // type
+          member.basetype,                       // basetype
+          GetMemberNameAtIndex(struct_type, i),  // name
+          struct_member_offset,                  // offset
+          sizeof(HalfVector2),                   // size
+          stride * array_elements.value_or(1),   // byte_length
+          array_elements,                        // array_elements
+          element_padding,                       // element_padding
+      });
+      current_byte_offset += stride * array_elements.value_or(1);
+      continue;
+    }
+
+    // Tightly packed Half Float Vector3.
+    if (member.basetype == spirv_cross::SPIRType::BaseType::Half &&  //
+        member.width == sizeof(Half) * 8 &&                          //
+        member.columns == 1 &&                                       //
+        member.vecsize == 3                                          //
+    ) {
+      uint32_t stride =
+          GetArrayStride<sizeof(HalfVector3)>(struct_type, member, i);
+      uint32_t element_padding = stride - sizeof(HalfVector3);
+      result.emplace_back(StructMember{
+          "HalfVector3",                         // type
+          member.basetype,                       // basetype
+          GetMemberNameAtIndex(struct_type, i),  // name
+          struct_member_offset,                  // offset
+          sizeof(HalfVector3),                   // size
+          stride * array_elements.value_or(1),   // byte_length
+          array_elements,                        // array_elements
+          element_padding,                       // element_padding
+      });
+      current_byte_offset += stride * array_elements.value_or(1);
+      continue;
+    }
+
+    // Tightly packed Half Float Vector4.
+    if (member.basetype == spirv_cross::SPIRType::BaseType::Half &&  //
+        member.width == sizeof(Half) * 8 &&                          //
+        member.columns == 1 &&                                       //
+        member.vecsize == 4                                          //
+    ) {
+      uint32_t stride =
+          GetArrayStride<sizeof(HalfVector4)>(struct_type, member, i);
+      uint32_t element_padding = stride - sizeof(HalfVector4);
+      result.emplace_back(StructMember{
+          "HalfVector4",                         // type
+          member.basetype,                       // basetype
+          GetMemberNameAtIndex(struct_type, i),  // name
+          struct_member_offset,                  // offset
+          sizeof(HalfVector4),                   // size
+          stride * array_elements.value_or(1),   // byte_length
+          array_elements,                        // array_elements
+          element_padding,                       // element_padding
+      });
+      current_byte_offset += stride * array_elements.value_or(1);
+      continue;
+    }
+
     // Other isolated scalars (like bool, int, float/Scalar, etc..).
     {
       auto maybe_known_type = ReadKnownScalarType(member.basetype);
@@ -779,7 +1063,7 @@ std::vector<StructMember> Reflector::ReadStructMembers(
         // Add the type directly.
         result.emplace_back(StructMember{
             maybe_known_type.value().name,         // type
-            BaseTypeToString(member.basetype),     // basetype
+            member.basetype,                       // basetype
             GetMemberNameAtIndex(struct_type, i),  // name
             struct_member_offset,                  // offset
             maybe_known_type.value().byte_size,    // size
@@ -803,7 +1087,7 @@ std::vector<StructMember> Reflector::ReadStructMembers(
       auto element_padding = stride - size;
       result.emplace_back(StructMember{
           TypeNameWithPaddingOfSize(size),       // type
-          BaseTypeToString(member.basetype),     // basetype
+          member.basetype,                       // basetype
           GetMemberNameAtIndex(struct_type, i),  // name
           struct_member_offset,                  // offset
           size,                                  // size
@@ -823,15 +1107,14 @@ std::vector<StructMember> Reflector::ReadStructMembers(
       if (excess != 0) {
         const auto padding = max_member_alignment - excess;
         result.emplace_back(StructMember{
-            TypeNameWithPaddingOfSize(padding),  // type
-            BaseTypeToString(
-                spirv_cross::SPIRType::BaseType::Void),  // basetype
-            "_PADDING_",                                 // name
-            current_byte_offset,                         // offset
-            padding,                                     // size
-            padding,                                     // byte_length
-            std::nullopt,                                // array_elements
-            0,                                           // element_padding
+            TypeNameWithPaddingOfSize(padding),     // type
+            spirv_cross::SPIRType::BaseType::Void,  // basetype
+            "_PADDING_",                            // name
+            current_byte_offset,                    // offset
+            padding,                                // size
+            padding,                                // byte_length
+            std::nullopt,                           // array_elements
+            0,                                      // element_padding
         });
       }
     }
@@ -872,7 +1155,8 @@ nlohmann::json::object_t Reflector::EmitStructDefinition(
     auto& member = members.emplace_back(nlohmann::json::object_t{});
     member["name"] = struct_member.name;
     member["type"] = struct_member.type;
-    member["base_type"] = struct_member.base_type;
+    member["base_type"] =
+        StructMember::BaseTypeToString(struct_member.base_type);
     member["offset"] = struct_member.offset;
     member["byte_length"] = struct_member.byte_length;
     if (struct_member.array_elements.has_value()) {
@@ -887,7 +1171,7 @@ nlohmann::json::object_t Reflector::EmitStructDefinition(
 
 struct VertexType {
   std::string type_name;
-  std::string base_type_name;
+  spirv_cross::SPIRType::BaseType base_type;
   std::string variable_name;
   size_t byte_length = 0u;
 };
@@ -897,8 +1181,8 @@ static VertexType VertexTypeFromInputResource(
     const spirv_cross::Resource* resource) {
   VertexType result;
   result.variable_name = resource->name;
-  const auto type = compiler.get_type(resource->type_id);
-  result.base_type_name = BaseTypeToString(type.basetype);
+  const auto& type = compiler.get_type(resource->type_id);
+  result.base_type = type.basetype;
   const auto total_size = type.columns * type.vecsize * type.width / 8u;
   result.byte_length = total_size;
 
@@ -987,14 +1271,14 @@ Reflector::ReflectPerVertexStructDefinition(
         VertexTypeFromInputResource(*compiler_.GetCompiler(), resource);
 
     auto member = StructMember{
-        vertex_type.type_name,       // type
-        vertex_type.base_type_name,  // base type
-        vertex_type.variable_name,   // name
-        struc.byte_length,           // offset
-        vertex_type.byte_length,     // size
-        vertex_type.byte_length,     // byte_length
-        std::nullopt,                // array_elements
-        0,                           // element_padding
+        vertex_type.type_name,      // type
+        vertex_type.base_type,      // base type
+        vertex_type.variable_name,  // name
+        struc.byte_length,          // offset
+        vertex_type.byte_length,    // size
+        vertex_type.byte_length,    // byte_length
+        std::nullopt,               // array_elements
+        0,                          // element_padding
     };
     struc.byte_length += vertex_type.byte_length;
     struc.members.emplace_back(std::move(member));
@@ -1040,7 +1324,8 @@ std::vector<Reflector::BindPrototype> Reflector::ReflectBindPrototypes(
   for (const auto& uniform_buffer : resources.uniform_buffers) {
     auto& proto = prototypes.emplace_back(BindPrototype{});
     proto.return_type = "bool";
-    proto.name = ConvertToCamelCase(uniform_buffer.name);
+    proto.name = ToCamelCase(uniform_buffer.name);
+    proto.descriptor_type = "DescriptorType::kUniformBuffer";
     {
       std::stringstream stream;
       stream << "Bind uniform buffer for resource named " << uniform_buffer.name
@@ -1048,7 +1333,7 @@ std::vector<Reflector::BindPrototype> Reflector::ReflectBindPrototypes(
       proto.docstring = stream.str();
     }
     proto.args.push_back(BindPrototypeArgument{
-        .type_name = ExecutionModelToCommandTypeName(execution_model),
+        .type_name = "ResourceBinder&",
         .argument_name = "command",
     });
     proto.args.push_back(BindPrototypeArgument{
@@ -1059,7 +1344,8 @@ std::vector<Reflector::BindPrototype> Reflector::ReflectBindPrototypes(
   for (const auto& storage_buffer : resources.storage_buffers) {
     auto& proto = prototypes.emplace_back(BindPrototype{});
     proto.return_type = "bool";
-    proto.name = ConvertToCamelCase(storage_buffer.name);
+    proto.name = ToCamelCase(storage_buffer.name);
+    proto.descriptor_type = "DescriptorType::kStorageBuffer";
     {
       std::stringstream stream;
       stream << "Bind storage buffer for resource named " << storage_buffer.name
@@ -1067,7 +1353,7 @@ std::vector<Reflector::BindPrototype> Reflector::ReflectBindPrototypes(
       proto.docstring = stream.str();
     }
     proto.args.push_back(BindPrototypeArgument{
-        .type_name = ExecutionModelToCommandTypeName(execution_model),
+        .type_name = "ResourceBinder&",
         .argument_name = "command",
     });
     proto.args.push_back(BindPrototypeArgument{
@@ -1078,7 +1364,8 @@ std::vector<Reflector::BindPrototype> Reflector::ReflectBindPrototypes(
   for (const auto& sampled_image : resources.sampled_images) {
     auto& proto = prototypes.emplace_back(BindPrototype{});
     proto.return_type = "bool";
-    proto.name = ConvertToCamelCase(sampled_image.name);
+    proto.name = ToCamelCase(sampled_image.name);
+    proto.descriptor_type = "DescriptorType::kSampledImage";
     {
       std::stringstream stream;
       stream << "Bind combined image sampler for resource named "
@@ -1086,7 +1373,7 @@ std::vector<Reflector::BindPrototype> Reflector::ReflectBindPrototypes(
       proto.docstring = stream.str();
     }
     proto.args.push_back(BindPrototypeArgument{
-        .type_name = ExecutionModelToCommandTypeName(execution_model),
+        .type_name = "ResourceBinder&",
         .argument_name = "command",
     });
     proto.args.push_back(BindPrototypeArgument{
@@ -1094,14 +1381,15 @@ std::vector<Reflector::BindPrototype> Reflector::ReflectBindPrototypes(
         .argument_name = "texture",
     });
     proto.args.push_back(BindPrototypeArgument{
-        .type_name = "std::shared_ptr<const Sampler>",
+        .type_name = "const std::unique_ptr<const Sampler>&",
         .argument_name = "sampler",
     });
   }
   for (const auto& separate_image : resources.separate_images) {
     auto& proto = prototypes.emplace_back(BindPrototype{});
     proto.return_type = "bool";
-    proto.name = ConvertToCamelCase(separate_image.name);
+    proto.name = ToCamelCase(separate_image.name);
+    proto.descriptor_type = "DescriptorType::kImage";
     {
       std::stringstream stream;
       stream << "Bind separate image for resource named " << separate_image.name
@@ -1120,7 +1408,8 @@ std::vector<Reflector::BindPrototype> Reflector::ReflectBindPrototypes(
   for (const auto& separate_sampler : resources.separate_samplers) {
     auto& proto = prototypes.emplace_back(BindPrototype{});
     proto.return_type = "bool";
-    proto.name = ConvertToCamelCase(separate_sampler.name);
+    proto.name = ToCamelCase(separate_sampler.name);
+    proto.descriptor_type = "DescriptorType::kSampler";
     {
       std::stringstream stream;
       stream << "Bind separate sampler for resource named "
@@ -1149,6 +1438,7 @@ nlohmann::json::array_t Reflector::EmitBindPrototypes(
     item["return_type"] = res.return_type;
     item["name"] = res.name;
     item["docstring"] = res.docstring;
+    item["descriptor_type"] = res.descriptor_type;
     auto& args = item["args"] = nlohmann::json::array_t{};
     for (const auto& arg : res.args) {
       auto& json_arg = args.emplace_back(nlohmann::json::object_t{});
diff --git a/impeller/compiler/reflector.h b/impeller/compiler/reflector.h
index 69b550c7b9697ec7718af4e25463938ff3bf3f22..b246ada5b439958e522b23d38be934b462e1c413 100644
--- a/impeller/compiler/reflector.h
+++ b/impeller/compiler/reflector.h
@@ -2,16 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_COMPILER_REFLECTOR_H_
+#define FLUTTER_IMPELLER_COMPILER_REFLECTOR_H_
 
+#include <cstdint>
 #include <memory>
 #include <optional>
 
 #include "flutter/fml/macros.h"
 #include "flutter/fml/mapping.h"
+#include "fml/logging.h"
+#include "impeller/base/strings.h"
 #include "impeller/compiler/compiler_backend.h"
 #include "impeller/compiler/runtime_stage_data.h"
+#include "impeller/compiler/shader_bundle_data.h"
 #include "inja/inja.hpp"
+#include "spirv_common.hpp"
 #include "spirv_msl.hpp"
 #include "spirv_parser.hpp"
 
@@ -19,31 +25,122 @@ namespace impeller {
 namespace compiler {
 
 struct StructMember {
+  // Runtime stages on Vulkan use this information to validate that a struct
+  // only contains floats and encode where padding gets inserted.
+  enum class UnderlyingType {
+    kPadding,
+    kFloat,
+    kOther,
+  };
+
   std::string type;
-  std::string base_type;
+  spirv_cross::SPIRType::BaseType base_type;
   std::string name;
   size_t offset = 0u;
   size_t size = 0u;
   size_t byte_length = 0u;
   std::optional<size_t> array_elements = std::nullopt;
   size_t element_padding = 0u;
+  UnderlyingType underlying_type = UnderlyingType::kOther;
+
+  static std::string BaseTypeToString(spirv_cross::SPIRType::BaseType type) {
+    using Type = spirv_cross::SPIRType::BaseType;
+    switch (type) {
+      case Type::Void:
+        return "ShaderType::kVoid";
+      case Type::Boolean:
+        return "ShaderType::kBoolean";
+      case Type::SByte:
+        return "ShaderType::kSignedByte";
+      case Type::UByte:
+        return "ShaderType::kUnsignedByte";
+      case Type::Short:
+        return "ShaderType::kSignedShort";
+      case Type::UShort:
+        return "ShaderType::kUnsignedShort";
+      case Type::Int:
+        return "ShaderType::kSignedInt";
+      case Type::UInt:
+        return "ShaderType::kUnsignedInt";
+      case Type::Int64:
+        return "ShaderType::kSignedInt64";
+      case Type::UInt64:
+        return "ShaderType::kUnsignedInt64";
+      case Type::AtomicCounter:
+        return "ShaderType::kAtomicCounter";
+      case Type::Half:
+        return "ShaderType::kHalfFloat";
+      case Type::Float:
+        return "ShaderType::kFloat";
+      case Type::Double:
+        return "ShaderType::kDouble";
+      case Type::Struct:
+        return "ShaderType::kStruct";
+      case Type::Image:
+        return "ShaderType::kImage";
+      case Type::SampledImage:
+        return "ShaderType::kSampledImage";
+      case Type::Sampler:
+        return "ShaderType::kSampler";
+      default:
+        return "ShaderType::kUnknown";
+    }
+    FML_UNREACHABLE();
+  }
+
+  static UnderlyingType DetermineUnderlyingType(
+      spirv_cross::SPIRType::BaseType type) {
+    switch (type) {
+      case spirv_cross::SPIRType::Void:
+        return UnderlyingType::kPadding;
+      case spirv_cross::SPIRType::Float:
+        return UnderlyingType::kFloat;
+      case spirv_cross::SPIRType::Unknown:
+      case spirv_cross::SPIRType::Boolean:
+      case spirv_cross::SPIRType::SByte:
+      case spirv_cross::SPIRType::UByte:
+      case spirv_cross::SPIRType::Short:
+      case spirv_cross::SPIRType::UShort:
+      case spirv_cross::SPIRType::Int:
+      case spirv_cross::SPIRType::UInt:
+      case spirv_cross::SPIRType::Int64:
+      case spirv_cross::SPIRType::UInt64:
+      case spirv_cross::SPIRType::AtomicCounter:
+      case spirv_cross::SPIRType::Half:
+      case spirv_cross::SPIRType::Double:
+      case spirv_cross::SPIRType::Struct:
+      case spirv_cross::SPIRType::Image:
+      case spirv_cross::SPIRType::SampledImage:
+      case spirv_cross::SPIRType::Sampler:
+      case spirv_cross::SPIRType::AccelerationStructure:
+      case spirv_cross::SPIRType::RayQuery:
+      case spirv_cross::SPIRType::ControlPointArray:
+      case spirv_cross::SPIRType::Interpolant:
+      case spirv_cross::SPIRType::Char:
+      default:
+        return UnderlyingType::kOther;
+    }
+    FML_UNREACHABLE();
+  }
 
   StructMember(std::string p_type,
-               std::string p_base_type,
+               spirv_cross::SPIRType::BaseType p_base_type,
                std::string p_name,
                size_t p_offset,
                size_t p_size,
                size_t p_byte_length,
                std::optional<size_t> p_array_elements,
-               size_t p_element_padding)
+               size_t p_element_padding,
+               UnderlyingType p_underlying_type = UnderlyingType::kOther)
       : type(std::move(p_type)),
-        base_type(std::move(p_base_type)),
+        base_type(p_base_type),
         name(std::move(p_name)),
         offset(p_offset),
         size(p_size),
         byte_length(p_byte_length),
         array_elements(p_array_elements),
-        element_padding(p_element_padding) {}
+        element_padding(p_element_padding),
+        underlying_type(DetermineUnderlyingType(p_base_type)) {}
 };
 
 class Reflector {
@@ -56,9 +153,9 @@ class Reflector {
   };
 
   Reflector(Options options,
-            std::shared_ptr<const spirv_cross::ParsedIR> ir,
-            std::shared_ptr<fml::Mapping> shader_data,
-            CompilerBackend compiler);
+            const std::shared_ptr<const spirv_cross::ParsedIR>& ir,
+            const std::shared_ptr<fml::Mapping>& shader_data,
+            const CompilerBackend& compiler);
 
   ~Reflector();
 
@@ -70,7 +167,9 @@ class Reflector {
 
   std::shared_ptr<fml::Mapping> GetReflectionCC() const;
 
-  std::shared_ptr<RuntimeStageData> GetRuntimeStageData() const;
+  std::shared_ptr<RuntimeStageData::Shader> GetRuntimeStageShaderData() const;
+
+  std::shared_ptr<ShaderBundleData> GetShaderBundleData() const;
 
  private:
   struct StructDefinition {
@@ -88,18 +187,19 @@ class Reflector {
     std::string name;
     std::string return_type;
     std::string docstring;
+    std::string descriptor_type = "";
     std::vector<BindPrototypeArgument> args;
   };
 
   const Options options_;
   const std::shared_ptr<const spirv_cross::ParsedIR> ir_;
   const std::shared_ptr<fml::Mapping> shader_data_;
-  const std::shared_ptr<fml::Mapping> sksl_data_;
   const CompilerBackend compiler_;
   std::unique_ptr<const nlohmann::json> template_arguments_;
   std::shared_ptr<fml::Mapping> reflection_header_;
   std::shared_ptr<fml::Mapping> reflection_cc_;
-  std::shared_ptr<RuntimeStageData> runtime_stage_data_;
+  std::shared_ptr<RuntimeStageData::Shader> runtime_stage_shader_;
+  std::shared_ptr<ShaderBundleData> shader_bundle_data_;
   bool is_valid_ = false;
 
   std::optional<nlohmann::json> GenerateTemplateArguments() const;
@@ -108,16 +208,26 @@ class Reflector {
 
   std::shared_ptr<fml::Mapping> GenerateReflectionCC() const;
 
-  std::shared_ptr<RuntimeStageData> GenerateRuntimeStageData() const;
+  std::shared_ptr<RuntimeStageData::Shader> GenerateRuntimeStageData() const;
+
+  std::shared_ptr<ShaderBundleData> GenerateShaderBundleData() const;
 
   std::shared_ptr<fml::Mapping> InflateTemplate(std::string_view tmpl) const;
 
   std::optional<nlohmann::json::object_t> ReflectResource(
-      const spirv_cross::Resource& resource) const;
+      const spirv_cross::Resource& resource,
+      std::optional<size_t> offset) const;
 
   std::optional<nlohmann::json::array_t> ReflectResources(
+      const spirv_cross::SmallVector<spirv_cross::Resource>& resources,
+      bool compute_offsets = false) const;
+
+  std::vector<size_t> ComputeOffsets(
       const spirv_cross::SmallVector<spirv_cross::Resource>& resources) const;
 
+  std::optional<size_t> GetOffset(spirv_cross::ID id,
+                                  const std::vector<size_t>& offsets) const;
+
   std::optional<nlohmann::json::object_t> ReflectType(
       const spirv_cross::TypeID& type_id) const;
 
@@ -164,8 +274,12 @@ class Reflector {
     return compiler_->type_struct_member_array_stride(struct_type, index);
   };
 
-  FML_DISALLOW_COPY_AND_ASSIGN(Reflector);
+  Reflector(const Reflector&) = delete;
+
+  Reflector& operator=(const Reflector&) = delete;
 };
 
 }  // namespace compiler
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_COMPILER_REFLECTOR_H_
diff --git a/impeller/compiler/runtime_stage_data.cc b/impeller/compiler/runtime_stage_data.cc
index 838fd805a57a669eaeac8652329d050eac0c341f..b45926305f55b0f268d42fd14526e7bac1903141 100644
--- a/impeller/compiler/runtime_stage_data.cc
+++ b/impeller/compiler/runtime_stage_data.cc
@@ -5,35 +5,29 @@
 #include "impeller/compiler/runtime_stage_data.h"
 
 #include <array>
+#include <cstdint>
+#include <memory>
 #include <optional>
 
+#include "fml/backtrace.h"
+#include "impeller/core/runtime_types.h"
 #include "inja/inja.hpp"
 
 #include "impeller/base/validation.h"
 #include "impeller/runtime_stage/runtime_stage_flatbuffers.h"
+#include "runtime_stage_types_flatbuffers.h"
 
 namespace impeller {
 namespace compiler {
 
-RuntimeStageData::RuntimeStageData(std::string entrypoint,
-                                   spv::ExecutionModel stage,
-                                   TargetPlatform target_platform)
-    : entrypoint_(std::move(entrypoint)),
-      stage_(stage),
-      target_platform_(target_platform) {}
+RuntimeStageData::RuntimeStageData() = default;
 
 RuntimeStageData::~RuntimeStageData() = default;
 
-void RuntimeStageData::AddUniformDescription(UniformDescription uniform) {
-  uniforms_.emplace_back(std::move(uniform));
-}
-
-void RuntimeStageData::SetShaderData(std::shared_ptr<fml::Mapping> shader) {
-  shader_ = std::move(shader);
-}
-
-void RuntimeStageData::SetSkSLData(std::shared_ptr<fml::Mapping> sksl) {
-  sksl_ = std::move(sksl);
+void RuntimeStageData::AddShader(const std::shared_ptr<Shader>& data) {
+  FML_DCHECK(data);
+  FML_DCHECK(data_.find(data->backend) == data_.end());
+  data_[data->backend] = data;
 }
 
 static std::optional<fb::Stage> ToStage(spv::ExecutionModel stage) {
@@ -44,102 +38,46 @@ static std::optional<fb::Stage> ToStage(spv::ExecutionModel stage) {
       return fb::Stage::kFragment;
     case spv::ExecutionModel::ExecutionModelGLCompute:
       return fb::Stage::kCompute;
-    case spv::ExecutionModel::ExecutionModelTessellationControl:
-      return fb::Stage::kTessellationControl;
-    case spv::ExecutionModel::ExecutionModelTessellationEvaluation:
-      return fb::Stage::kTessellationEvaluation;
     default:
       return std::nullopt;
   }
   FML_UNREACHABLE();
 }
 
-static std::optional<uint32_t> ToJsonStage(spv::ExecutionModel stage) {
+static std::optional<fb::Stage> ToJsonStage(spv::ExecutionModel stage) {
   switch (stage) {
     case spv::ExecutionModel::ExecutionModelVertex:
-      return 0;  // fb::Stage::kVertex;
+      return fb::Stage::kVertex;
     case spv::ExecutionModel::ExecutionModelFragment:
-      return 1;  // fb::Stage::kFragment;
+      return fb::Stage::kFragment;
     case spv::ExecutionModel::ExecutionModelGLCompute:
-      return 2;  // fb::Stage::kCompute;
-    case spv::ExecutionModel::ExecutionModelTessellationControl:
-      return 3;  // fb::Stage::kTessellationControl;
-    case spv::ExecutionModel::ExecutionModelTessellationEvaluation:
-      return 4;  // fb::Stage::kTessellationEvaluation;
+      return fb::Stage::kCompute;
     default:
       return std::nullopt;
   }
   FML_UNREACHABLE();
 }
 
-static std::optional<fb::TargetPlatform> ToTargetPlatform(
-    TargetPlatform platform) {
-  switch (platform) {
-    case TargetPlatform::kUnknown:
-    case TargetPlatform::kMetalDesktop:
-    case TargetPlatform::kMetalIOS:
-    case TargetPlatform::kOpenGLES:
-    case TargetPlatform::kOpenGLDesktop:
-    case TargetPlatform::kVulkan:
-      return std::nullopt;
-    case TargetPlatform::kSkSL:
-      return fb::TargetPlatform::kSkSL;
-    case TargetPlatform::kRuntimeStageMetal:
-      return fb::TargetPlatform::kMetal;
-    case TargetPlatform::kRuntimeStageGLES:
-      return fb::TargetPlatform::kOpenGLES;
-  }
-  FML_UNREACHABLE();
-}
-
-static std::optional<uint32_t> ToJsonTargetPlatform(TargetPlatform platform) {
-  switch (platform) {
-    case TargetPlatform::kUnknown:
-    case TargetPlatform::kMetalDesktop:
-    case TargetPlatform::kMetalIOS:
-    case TargetPlatform::kOpenGLES:
-    case TargetPlatform::kOpenGLDesktop:
-    case TargetPlatform::kVulkan:
-      return std::nullopt;
-    case TargetPlatform::kSkSL:
-      return 0;  // fb::TargetPlatform::kSkSL;
-    case TargetPlatform::kRuntimeStageMetal:
-      return 1;  // fb::TargetPlatform::kMetal;
-    case TargetPlatform::kRuntimeStageGLES:
-      return 2;  // fb::TargetPlatform::kOpenGLES;
-  }
-  FML_UNREACHABLE();
-}
-
-static std::optional<fb::UniformDataType> ToType(
+static std::optional<fb::UniformDataType> ToUniformType(
     spirv_cross::SPIRType::BaseType type) {
   switch (type) {
+    case spirv_cross::SPIRType::Float:
+      return fb::UniformDataType::kFloat;
+    case spirv_cross::SPIRType::SampledImage:
+      return fb::UniformDataType::kSampledImage;
+    case spirv_cross::SPIRType::Struct:
+      return fb::UniformDataType::kStruct;
     case spirv_cross::SPIRType::Boolean:
-      return fb::UniformDataType::kBoolean;
     case spirv_cross::SPIRType::SByte:
-      return fb::UniformDataType::kSignedByte;
     case spirv_cross::SPIRType::UByte:
-      return fb::UniformDataType::kUnsignedByte;
     case spirv_cross::SPIRType::Short:
-      return fb::UniformDataType::kSignedShort;
     case spirv_cross::SPIRType::UShort:
-      return fb::UniformDataType::kUnsignedShort;
     case spirv_cross::SPIRType::Int:
-      return fb::UniformDataType::kSignedInt;
     case spirv_cross::SPIRType::UInt:
-      return fb::UniformDataType::kUnsignedInt;
     case spirv_cross::SPIRType::Int64:
-      return fb::UniformDataType::kSignedInt64;
     case spirv_cross::SPIRType::UInt64:
-      return fb::UniformDataType::kUnsignedInt64;
     case spirv_cross::SPIRType::Half:
-      return fb::UniformDataType::kHalfFloat;
-    case spirv_cross::SPIRType::Float:
-      return fb::UniformDataType::kFloat;
     case spirv_cross::SPIRType::Double:
-      return fb::UniformDataType::kDouble;
-    case spirv_cross::SPIRType::SampledImage:
-      return fb::UniformDataType::kSampledImage;
     case spirv_cross::SPIRType::AccelerationStructure:
     case spirv_cross::SPIRType::AtomicCounter:
     case spirv_cross::SPIRType::Char:
@@ -148,13 +86,54 @@ static std::optional<fb::UniformDataType> ToType(
     case spirv_cross::SPIRType::Interpolant:
     case spirv_cross::SPIRType::RayQuery:
     case spirv_cross::SPIRType::Sampler:
-    case spirv_cross::SPIRType::Struct:
     case spirv_cross::SPIRType::Unknown:
     case spirv_cross::SPIRType::Void:
       return std::nullopt;
   }
   FML_UNREACHABLE();
 }
+static std::optional<fb::InputDataType> ToInputType(
+    spirv_cross::SPIRType::BaseType type) {
+  switch (type) {
+    case spirv_cross::SPIRType::Boolean:
+      return fb::InputDataType::kBoolean;
+    case spirv_cross::SPIRType::SByte:
+      return fb::InputDataType::kSignedByte;
+    case spirv_cross::SPIRType::UByte:
+      return fb::InputDataType::kUnsignedByte;
+    case spirv_cross::SPIRType::Short:
+      return fb::InputDataType::kSignedShort;
+    case spirv_cross::SPIRType::UShort:
+      return fb::InputDataType::kUnsignedShort;
+    case spirv_cross::SPIRType::Int:
+      return fb::InputDataType::kSignedInt;
+    case spirv_cross::SPIRType::UInt:
+      return fb::InputDataType::kUnsignedInt;
+    case spirv_cross::SPIRType::Int64:
+      return fb::InputDataType::kSignedInt64;
+    case spirv_cross::SPIRType::UInt64:
+      return fb::InputDataType::kUnsignedInt64;
+    case spirv_cross::SPIRType::Float:
+      return fb::InputDataType::kFloat;
+    case spirv_cross::SPIRType::Double:
+      return fb::InputDataType::kDouble;
+    case spirv_cross::SPIRType::Unknown:
+    case spirv_cross::SPIRType::Void:
+    case spirv_cross::SPIRType::Half:
+    case spirv_cross::SPIRType::AtomicCounter:
+    case spirv_cross::SPIRType::Struct:
+    case spirv_cross::SPIRType::Image:
+    case spirv_cross::SPIRType::SampledImage:
+    case spirv_cross::SPIRType::Sampler:
+    case spirv_cross::SPIRType::AccelerationStructure:
+    case spirv_cross::SPIRType::RayQuery:
+    case spirv_cross::SPIRType::ControlPointArray:
+    case spirv_cross::SPIRType::Interpolant:
+    case spirv_cross::SPIRType::Char:
+      return std::nullopt;
+  }
+  FML_UNREACHABLE();
+}
 
 static std::optional<uint32_t> ToJsonType(
     spirv_cross::SPIRType::BaseType type) {
@@ -185,6 +164,8 @@ static std::optional<uint32_t> ToJsonType(
       return 11;  // fb::UniformDataType::kDouble;
     case spirv_cross::SPIRType::SampledImage:
       return 12;  // fb::UniformDataType::kSampledImage;
+    case spirv_cross::SPIRType::Struct:
+      return 13;
     case spirv_cross::SPIRType::AccelerationStructure:
     case spirv_cross::SPIRType::AtomicCounter:
     case spirv_cross::SPIRType::Char:
@@ -193,7 +174,6 @@ static std::optional<uint32_t> ToJsonType(
     case spirv_cross::SPIRType::Interpolant:
     case spirv_cross::SPIRType::RayQuery:
     case spirv_cross::SPIRType::Sampler:
-    case spirv_cross::SPIRType::Struct:
     case spirv_cross::SPIRType::Unknown:
     case spirv_cross::SPIRType::Void:
       return std::nullopt;
@@ -205,7 +185,7 @@ static const char* kStageKey = "stage";
 static const char* kTargetPlatformKey = "target_platform";
 static const char* kEntrypointKey = "entrypoint";
 static const char* kUniformsKey = "uniforms";
-static const char* kShaderKey = "sksl";
+static const char* kShaderKey = "shader";
 static const char* kUniformNameKey = "name";
 static const char* kUniformLocationKey = "location";
 static const char* kUniformTypeKey = "type";
@@ -214,71 +194,83 @@ static const char* kUniformColumnsKey = "columns";
 static const char* kUniformBitWidthKey = "bit_width";
 static const char* kUniformArrayElementsKey = "array_elements";
 
+static std::string RuntimeStageBackendToString(RuntimeStageBackend backend) {
+  switch (backend) {
+    case RuntimeStageBackend::kSkSL:
+      return "sksl";
+    case RuntimeStageBackend::kMetal:
+      return "metal";
+    case RuntimeStageBackend::kOpenGLES:
+      return "opengles";
+    case RuntimeStageBackend::kVulkan:
+      return "vulkan";
+  }
+}
+
 std::shared_ptr<fml::Mapping> RuntimeStageData::CreateJsonMapping() const {
   // Runtime Stage Data JSON format
   //   {
-  //      "stage": 0,
-  //      "target_platform": "",
-  //      "entrypoint": "",
-  //      "shader": "",
-  //      "sksl": "",
-  //      "uniforms": [
-  //        {
-  //           "name": "..",
-  //           "location": 0,
-  //           "type": 0,
-  //           "rows": 0,
-  //           "columns": 0,
-  //           "bit_width": 0,
-  //           "array_elements": 0,
-  //        }
-  //      ]
+  //      "sksl": {
+  //        "stage": 0,
+  //        "entrypoint": "",
+  //        "shader": "",
+  //        "uniforms": [
+  //          {
+  //             "name": "..",
+  //             "location": 0,
+  //             "type": 0,
+  //             "rows": 0,
+  //             "columns": 0,
+  //             "bit_width": 0,
+  //             "array_elements": 0,
+  //          }
+  //        ]
+  //      },
+  //      "metal": ...
   //   },
   nlohmann::json root;
 
-  const auto stage = ToJsonStage(stage_);
-  if (!stage.has_value()) {
-    VALIDATION_LOG << "Invalid runtime stage.";
-    return nullptr;
-  }
-  root[kStageKey] = stage.value();
+  for (const auto& kvp : data_) {
+    nlohmann::json platform_object;
 
-  const auto target_platform = ToJsonTargetPlatform(target_platform_);
-  if (!target_platform.has_value()) {
-    VALIDATION_LOG << "Invalid target platform for runtime stage.";
-    return nullptr;
-  }
-  root[kTargetPlatformKey] = target_platform.value();
+    const auto stage = ToJsonStage(kvp.second->stage);
+    if (!stage.has_value()) {
+      VALIDATION_LOG << "Invalid runtime stage.";
+      return nullptr;
+    }
+    platform_object[kStageKey] = static_cast<uint32_t>(stage.value());
+    platform_object[kEntrypointKey] = kvp.second->entrypoint;
 
-  if (shader_->GetSize() > 0u) {
-    std::string shader(reinterpret_cast<const char*>(shader_->GetMapping()),
-                       shader_->GetSize());
-    root[kShaderKey] = shader.c_str();
-  }
+    if (kvp.second->shader->GetSize() > 0u) {
+      std::string shader(
+          reinterpret_cast<const char*>(kvp.second->shader->GetMapping()),
+          kvp.second->shader->GetSize());
+      platform_object[kShaderKey] = shader.c_str();
+    }
 
-  auto& uniforms = root[kUniformsKey] = nlohmann::json::array_t{};
-  for (const auto& uniform : uniforms_) {
-    nlohmann::json uniform_object;
-    uniform_object[kUniformNameKey] = uniform.name.c_str();
-    uniform_object[kUniformLocationKey] = uniform.location;
-    uniform_object[kUniformRowsKey] = uniform.rows;
-    uniform_object[kUniformColumnsKey] = uniform.columns;
+    auto& uniforms = platform_object[kUniformsKey] = nlohmann::json::array_t{};
+    for (const auto& uniform : kvp.second->uniforms) {
+      nlohmann::json uniform_object;
+      uniform_object[kUniformNameKey] = uniform.name.c_str();
+      uniform_object[kUniformLocationKey] = uniform.location;
+      uniform_object[kUniformRowsKey] = uniform.rows;
+      uniform_object[kUniformColumnsKey] = uniform.columns;
 
-    auto uniform_type = ToJsonType(uniform.type);
-    if (!uniform_type.has_value()) {
-      VALIDATION_LOG << "Invalid uniform type for runtime stage.";
-      return nullptr;
-    }
+      auto uniform_type = ToJsonType(uniform.type);
+      if (!uniform_type.has_value()) {
+        VALIDATION_LOG << "Invalid uniform type for runtime stage.";
+        return nullptr;
+      }
 
-    uniform_object[kUniformTypeKey] = uniform_type.value();
-    uniform_object[kUniformBitWidthKey] = uniform.bit_width;
+      uniform_object[kUniformTypeKey] = uniform_type.value();
+      uniform_object[kUniformBitWidthKey] = uniform.bit_width;
+      uniform_object[kUniformArrayElementsKey] =
+          uniform.array_elements.value_or(0);
 
-    if (uniform.array_elements.has_value()) {
-      uniform_object[kUniformArrayElementsKey] = uniform.array_elements.value();
-    } else {
-      uniform_object[kUniformArrayElementsKey] = 0;
+      uniforms.push_back(uniform_object);
     }
-    uniforms.push_back(uniform_object);
+
+    root[RuntimeStageBackendToString(kvp.first)] = platform_object;
   }
 
   auto json_string = std::make_shared<std::string>(root.dump(2u));
@@ -288,37 +280,31 @@ std::shared_ptr<fml::Mapping> RuntimeStageData::CreateJsonMapping() const {
       json_string->size(), [json_string](auto, auto) {});
 }
 
-std::shared_ptr<fml::Mapping> RuntimeStageData::CreateMapping() const {
-  // The high level object API is used here for writing to the buffer. This is
-  // just a convenience.
-  fb::RuntimeStageT runtime_stage;
-  runtime_stage.entrypoint = entrypoint_;
-  const auto stage = ToStage(stage_);
-  if (!stage.has_value()) {
-    VALIDATION_LOG << "Invalid runtime stage.";
+std::unique_ptr<fb::RuntimeStageT> RuntimeStageData::CreateStageFlatbuffer(
+    impeller::RuntimeStageBackend backend) const {
+  auto kvp = data_.find(backend);
+  if (kvp == data_.end()) {
     return nullptr;
   }
-  runtime_stage.stage = stage.value();
-  const auto target_platform = ToTargetPlatform(target_platform_);
-  if (!target_platform.has_value()) {
-    VALIDATION_LOG << "Invalid target platform for runtime stage.";
+
+  auto runtime_stage = std::make_unique<fb::RuntimeStageT>();
+  runtime_stage->entrypoint = kvp->second->entrypoint;
+  const auto stage = ToStage(kvp->second->stage);
+  if (!stage.has_value()) {
+    VALIDATION_LOG << "Invalid runtime stage.";
     return nullptr;
   }
-  runtime_stage.target_platform = target_platform.value();
-  if (!shader_) {
+  runtime_stage->stage = stage.value();
+  if (!kvp->second->shader) {
     VALIDATION_LOG << "No shader specified for runtime stage.";
     return nullptr;
   }
-  if (shader_->GetSize() > 0u) {
-    runtime_stage.shader = {shader_->GetMapping(),
-                            shader_->GetMapping() + shader_->GetSize()};
+  if (kvp->second->shader->GetSize() > 0u) {
+    runtime_stage->shader = {
+        kvp->second->shader->GetMapping(),
+        kvp->second->shader->GetMapping() + kvp->second->shader->GetSize()};
   }
-  // It is not an error for the SkSL to be ommitted.
-  if (sksl_->GetSize() > 0u) {
-    runtime_stage.sksl = {sksl_->GetMapping(),
-                          sksl_->GetMapping() + sksl_->GetSize()};
-  }
-  for (const auto& uniform : uniforms_) {
+  for (const auto& uniform : kvp->second->uniforms) {
     auto desc = std::make_unique<fb::UniformDescriptionT>();
 
     desc->name = uniform.name;
@@ -329,7 +315,7 @@ std::shared_ptr<fml::Mapping> RuntimeStageData::CreateMapping() const {
     desc->location = uniform.location;
     desc->rows = uniform.rows;
     desc->columns = uniform.columns;
-    auto uniform_type = ToType(uniform.type);
+    auto uniform_type = ToUniformType(uniform.type);
     if (!uniform_type.has_value()) {
       VALIDATION_LOG << "Invalid uniform type for runtime stage.";
       return nullptr;
@@ -340,11 +326,78 @@ std::shared_ptr<fml::Mapping> RuntimeStageData::CreateMapping() const {
       desc->array_elements = uniform.array_elements.value();
     }
 
-    runtime_stage.uniforms.emplace_back(std::move(desc));
+    for (const auto& byte_type : uniform.struct_layout) {
+      desc->struct_layout.push_back(static_cast<fb::StructByteType>(byte_type));
+    }
+    desc->struct_float_count = uniform.struct_float_count;
+
+    runtime_stage->uniforms.emplace_back(std::move(desc));
+  }
+
+  for (const auto& input : kvp->second->inputs) {
+    auto desc = std::make_unique<fb::StageInputT>();
+
+    desc->name = input.name;
+
+    if (desc->name.empty()) {
+      VALIDATION_LOG << "Stage input name cannot be empty.";
+      return nullptr;
+    }
+    desc->location = input.location;
+    desc->set = input.set;
+    desc->binding = input.binding;
+    auto input_type = ToInputType(input.type);
+    if (!input_type.has_value()) {
+      VALIDATION_LOG << "Invalid uniform type for runtime stage.";
+      return nullptr;
+    }
+    desc->type = input_type.value();
+    desc->bit_width = input.bit_width;
+    desc->vec_size = input.vec_size;
+    desc->columns = input.columns;
+    desc->offset = input.offset;
+
+    runtime_stage->inputs.emplace_back(std::move(desc));
   }
+
+  return runtime_stage;
+}
+
+std::unique_ptr<fb::RuntimeStagesT>
+RuntimeStageData::CreateMultiStageFlatbuffer() const {
+  // The high level object API is used here for writing to the buffer. This is
+  // just a convenience.
+  auto runtime_stages = std::make_unique<fb::RuntimeStagesT>();
+
+  for (const auto& kvp : data_) {
+    auto runtime_stage = CreateStageFlatbuffer(kvp.first);
+    switch (kvp.first) {
+      case RuntimeStageBackend::kSkSL:
+        runtime_stages->sksl = std::move(runtime_stage);
+        break;
+      case RuntimeStageBackend::kMetal:
+        runtime_stages->metal = std::move(runtime_stage);
+        break;
+      case RuntimeStageBackend::kOpenGLES:
+        runtime_stages->opengles = std::move(runtime_stage);
+        break;
+      case RuntimeStageBackend::kVulkan:
+        runtime_stages->vulkan = std::move(runtime_stage);
+        break;
+    }
+  }
+  return runtime_stages;
+}
+
+std::shared_ptr<fml::Mapping> RuntimeStageData::CreateMapping() const {
+  auto runtime_stages = CreateMultiStageFlatbuffer();
+  if (!runtime_stages) {
+    return nullptr;
+  }
+
   auto builder = std::make_shared<flatbuffers::FlatBufferBuilder>();
-  builder->Finish(fb::RuntimeStage::Pack(*builder.get(), &runtime_stage),
-                  fb::RuntimeStageIdentifier());
+  builder->Finish(fb::RuntimeStages::Pack(*builder.get(), runtime_stages.get()),
+                  fb::RuntimeStagesIdentifier());
   return std::make_shared<fml::NonOwnedMapping>(builder->GetBufferPointer(),
                                                 builder->GetSize(),
                                                 [builder](auto, auto) {});
diff --git a/impeller/compiler/runtime_stage_data.h b/impeller/compiler/runtime_stage_data.h
index 4ec5a9eba2a5441091735020eb34341fa650e8fb..0cd006b143d796ac10b9e68ba31786809ca9f58d 100644
--- a/impeller/compiler/runtime_stage_data.h
+++ b/impeller/compiler/runtime_stage_data.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_COMPILER_RUNTIME_STAGE_DATA_H_
+#define FLUTTER_IMPELLER_COMPILER_RUNTIME_STAGE_DATA_H_
 
 #include <memory>
 #include <vector>
@@ -10,49 +11,53 @@
 #include "flutter/fml/macros.h"
 #include "flutter/fml/mapping.h"
 #include "impeller/compiler/types.h"
+#include "impeller/core/runtime_types.h"
+#include "runtime_stage_types_flatbuffers.h"
 #include "spirv_parser.hpp"
 
 namespace impeller {
 namespace compiler {
 
-struct UniformDescription {
-  std::string name;
-  size_t location = 0u;
-  spirv_cross::SPIRType::BaseType type = spirv_cross::SPIRType::BaseType::Float;
-  size_t rows = 0u;
-  size_t columns = 0u;
-  size_t bit_width = 0u;
-  std::optional<size_t> array_elements = std::nullopt;
-};
-
 class RuntimeStageData {
  public:
-  RuntimeStageData(std::string entrypoint,
-                   spv::ExecutionModel stage,
-                   TargetPlatform target_platform);
+  struct Shader {
+    Shader() = default;
 
-  ~RuntimeStageData();
+    std::string entrypoint;
+    spv::ExecutionModel stage;
+    std::vector<UniformDescription> uniforms;
+    std::vector<InputDescription> inputs;
+    std::shared_ptr<fml::Mapping> shader;
+    RuntimeStageBackend backend;
 
-  void AddUniformDescription(UniformDescription uniform);
+    Shader(const Shader&) = delete;
+    Shader& operator=(const Shader&) = delete;
+  };
 
-  void SetShaderData(std::shared_ptr<fml::Mapping> shader);
+  RuntimeStageData();
 
-  void SetSkSLData(std::shared_ptr<fml::Mapping> sksl);
+  ~RuntimeStageData();
 
-  std::shared_ptr<fml::Mapping> CreateMapping() const;
+  void AddShader(const std::shared_ptr<Shader>& data);
+
+  std::unique_ptr<fb::RuntimeStageT> CreateStageFlatbuffer(
+      impeller::RuntimeStageBackend backend) const;
+
+  std::unique_ptr<fb::RuntimeStagesT> CreateMultiStageFlatbuffer() const;
 
   std::shared_ptr<fml::Mapping> CreateJsonMapping() const;
 
+  std::shared_ptr<fml::Mapping> CreateMapping() const;
+
  private:
-  const std::string entrypoint_;
-  const spv::ExecutionModel stage_;
-  const TargetPlatform target_platform_;
-  std::vector<UniformDescription> uniforms_;
-  std::shared_ptr<fml::Mapping> shader_;
-  std::shared_ptr<fml::Mapping> sksl_;
-
-  FML_DISALLOW_COPY_AND_ASSIGN(RuntimeStageData);
+  std::map<RuntimeStageBackend, std::shared_ptr<Shader>> data_;
+
+  RuntimeStageData(const RuntimeStageData&) = delete;
+
+  RuntimeStageData& operator=(const RuntimeStageData&) = delete;
 };
 
 }  // namespace compiler
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_COMPILER_RUNTIME_STAGE_DATA_H_
diff --git a/impeller/compiler/shader_bundle.cc b/impeller/compiler/shader_bundle.cc
new file mode 100644
index 0000000000000000000000000000000000000000..155029148cc51c73e8d55d346beb9b509cc9e0a9
--- /dev/null
+++ b/impeller/compiler/shader_bundle.cc
@@ -0,0 +1,256 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/compiler/shader_bundle.h"
+#include "impeller/compiler/compiler.h"
+#include "impeller/compiler/reflector.h"
+#include "impeller/compiler/source_options.h"
+#include "impeller/compiler/types.h"
+
+#include "impeller/compiler/utilities.h"
+#include "impeller/runtime_stage/runtime_stage.h"
+#include "impeller/shader_bundle/shader_bundle_flatbuffers.h"
+#include "third_party/json/include/nlohmann/json.hpp"
+
+namespace impeller {
+namespace compiler {
+
+std::optional<ShaderBundleConfig> ParseShaderBundleConfig(
+    const std::string& bundle_config_json,
+    std::ostream& error_stream) {
+  auto json = nlohmann::json::parse(bundle_config_json, nullptr, false);
+  if (json.is_discarded() || !json.is_object()) {
+    error_stream << "The shader bundle is not a valid JSON object."
+                 << std::endl;
+    return std::nullopt;
+  }
+
+  ShaderBundleConfig bundle;
+  for (auto& [shader_name, shader_value] : json.items()) {
+    if (bundle.find(shader_name) != bundle.end()) {
+      error_stream << "Duplicate shader \"" << shader_name << "\"."
+                   << std::endl;
+      return std::nullopt;
+    }
+    if (!shader_value.is_object()) {
+      error_stream << "Invalid shader entry \"" << shader_name
+                   << "\": Entry is not a JSON object." << std::endl;
+      return std::nullopt;
+    }
+
+    ShaderConfig shader;
+
+    if (!shader_value.contains("file")) {
+      error_stream << "Invalid shader entry \"" << shader_name
+                   << "\": Missing required \"file\" field." << std::endl;
+      return std::nullopt;
+    }
+    shader.source_file_name = shader_value["file"];
+
+    if (!shader_value.contains("type")) {
+      error_stream << "Invalid shader entry \"" << shader_name
+                   << "\": Missing required \"type\" field." << std::endl;
+      return std::nullopt;
+    }
+    shader.type = SourceTypeFromString(shader_value["type"]);
+    if (shader.type == SourceType::kUnknown) {
+      error_stream << "Invalid shader entry \"" << shader_name
+                   << "\": Shader type " << shader_value["type"]
+                   << " is unknown." << std::endl;
+      return std::nullopt;
+    }
+
+    shader.language = shader_value.contains("language")
+                          ? ToSourceLanguage(shader_value["language"])
+                          : SourceLanguage::kGLSL;
+    if (shader.language == SourceLanguage::kUnknown) {
+      error_stream << "Invalid shader entry \"" << shader_name
+                   << "\": Unknown language type " << shader_value["language"]
+                   << "." << std::endl;
+      return std::nullopt;
+    }
+
+    shader.entry_point = shader_value.contains("entry_point")
+                             ? shader_value["entry_point"]
+                             : "main";
+
+    bundle[shader_name] = shader;
+  }
+
+  return bundle;
+}
+
+static std::unique_ptr<fb::shaderbundle::BackendShaderT>
+GenerateShaderBackendFB(TargetPlatform target_platform,
+                        SourceOptions& options,
+                        const std::string& shader_name,
+                        const ShaderConfig& shader_config) {
+  auto result = std::make_unique<fb::shaderbundle::BackendShaderT>();
+
+  std::shared_ptr<fml::FileMapping> source_file_mapping =
+      fml::FileMapping::CreateReadOnly(shader_config.source_file_name);
+  if (!source_file_mapping) {
+    std::cerr << "Could not open file for bundled shader \"" << shader_name
+              << "\"." << std::endl;
+    return nullptr;
+  }
+
+  /// Override options.
+  options.target_platform = target_platform;
+  options.file_name = shader_name;  // This is just used for error messages.
+  options.type = shader_config.type;
+  options.source_language = shader_config.language;
+  options.entry_point_name = EntryPointFunctionNameFromSourceName(
+      shader_config.source_file_name, options.type, options.source_language,
+      shader_config.entry_point);
+
+  Reflector::Options reflector_options;
+  reflector_options.target_platform = options.target_platform;
+  reflector_options.entry_point_name = options.entry_point_name;
+  reflector_options.shader_name = shader_name;
+
+  Compiler compiler(source_file_mapping, options, reflector_options);
+  if (!compiler.IsValid()) {
+    std::cerr << "Compilation failed for bundled shader \"" << shader_name
+              << "\"." << std::endl;
+    std::cerr << compiler.GetErrorMessages() << std::endl;
+    return nullptr;
+  }
+
+  auto reflector = compiler.GetReflector();
+  if (reflector == nullptr) {
+    std::cerr << "Could not create reflector for bundled shader \""
+              << shader_name << "\"." << std::endl;
+    return nullptr;
+  }
+
+  auto bundle_data = reflector->GetShaderBundleData();
+  if (!bundle_data) {
+    std::cerr << "Bundled shader information was nil for \"" << shader_name
+              << "\"." << std::endl;
+    return nullptr;
+  }
+
+  result = bundle_data->CreateFlatbuffer();
+  if (!result) {
+    std::cerr << "Failed to create flatbuffer for bundled shader \""
+              << shader_name << "\"." << std::endl;
+    return nullptr;
+  }
+
+  return result;
+}
+
+static std::unique_ptr<fb::shaderbundle::ShaderT> GenerateShaderFB(
+    SourceOptions options,
+    const std::string& shader_name,
+    const ShaderConfig& shader_config) {
+  auto result = std::make_unique<fb::shaderbundle::ShaderT>();
+  result->name = shader_name;
+  result->metal_ios = GenerateShaderBackendFB(
+      TargetPlatform::kMetalIOS, options, shader_name, shader_config);
+  if (!result->metal_ios) {
+    return nullptr;
+  }
+  result->metal_desktop = GenerateShaderBackendFB(
+      TargetPlatform::kMetalDesktop, options, shader_name, shader_config);
+  if (!result->metal_desktop) {
+    return nullptr;
+  }
+  result->opengl_es = GenerateShaderBackendFB(
+      TargetPlatform::kOpenGLES, options, shader_name, shader_config);
+  if (!result->opengl_es) {
+    return nullptr;
+  }
+  result->opengl_desktop = GenerateShaderBackendFB(
+      TargetPlatform::kOpenGLDesktop, options, shader_name, shader_config);
+  if (!result->opengl_desktop) {
+    return nullptr;
+  }
+  result->vulkan = GenerateShaderBackendFB(TargetPlatform::kVulkan, options,
+                                           shader_name, shader_config);
+  if (!result->vulkan) {
+    return nullptr;
+  }
+  return result;
+}
+
+std::optional<fb::shaderbundle::ShaderBundleT> GenerateShaderBundleFlatbuffer(
+    const std::string& bundle_config_json,
+    const SourceOptions& options) {
+  // --------------------------------------------------------------------------
+  /// 1. Parse the bundle configuration.
+  ///
+
+  std::optional<ShaderBundleConfig> bundle_config =
+      ParseShaderBundleConfig(bundle_config_json, std::cerr);
+  if (!bundle_config) {
+    return std::nullopt;
+  }
+
+  // --------------------------------------------------------------------------
+  /// 2. Build the deserialized shader bundle.
+  ///
+
+  fb::shaderbundle::ShaderBundleT shader_bundle;
+
+  for (const auto& [shader_name, shader_config] : bundle_config.value()) {
+    std::unique_ptr<fb::shaderbundle::ShaderT> shader =
+        GenerateShaderFB(options, shader_name, shader_config);
+    if (!shader) {
+      return std::nullopt;
+    }
+    shader_bundle.shaders.push_back(std::move(shader));
+  }
+
+  return shader_bundle;
+}
+
+bool GenerateShaderBundle(Switches& switches) {
+  // --------------------------------------------------------------------------
+  /// 1. Parse the shader bundle and generate the flatbuffer result.
+  ///
+
+  auto shader_bundle = GenerateShaderBundleFlatbuffer(
+      switches.shader_bundle, switches.CreateSourceOptions());
+  if (!shader_bundle.has_value()) {
+    // Specific error messages are already handled by
+    // GenerateShaderBundleFlatbuffer.
+    return false;
+  }
+
+  // --------------------------------------------------------------------------
+  /// 2. Serialize the shader bundle and write to disk.
+  ///
+
+  auto builder = std::make_shared<flatbuffers::FlatBufferBuilder>();
+  builder->Finish(fb::shaderbundle::ShaderBundle::Pack(*builder.get(),
+                                                       &shader_bundle.value()),
+                  fb::shaderbundle::ShaderBundleIdentifier());
+  auto mapping = std::make_shared<fml::NonOwnedMapping>(
+      builder->GetBufferPointer(), builder->GetSize(),
+      [builder](auto, auto) {});
+
+  auto sl_file_name = std::filesystem::absolute(
+      std::filesystem::current_path() / switches.sl_file_name);
+
+  if (!fml::WriteAtomically(*switches.working_directory,         //
+                            Utf8FromPath(sl_file_name).c_str(),  //
+                            *mapping                             //
+                            )) {
+    std::cerr << "Could not write file to " << switches.sl_file_name
+              << std::endl;
+    return false;
+  }
+  // Tools that consume the runtime stage data expect the access mode to
+  // be 0644.
+  if (!SetPermissiveAccess(sl_file_name)) {
+    return false;
+  }
+
+  return true;
+}
+
+}  // namespace compiler
+}  // namespace impeller
diff --git a/impeller/compiler/shader_bundle.h b/impeller/compiler/shader_bundle.h
new file mode 100644
index 0000000000000000000000000000000000000000..abdf528ec5f31a9060bfffbeeed7a3277ea6b689
--- /dev/null
+++ b/impeller/compiler/shader_bundle.h
@@ -0,0 +1,40 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_COMPILER_SHADER_BUNDLE_H_
+#define FLUTTER_IMPELLER_COMPILER_SHADER_BUNDLE_H_
+
+#include "impeller/compiler/source_options.h"
+#include "impeller/compiler/switches.h"
+#include "impeller/shader_bundle/shader_bundle_flatbuffers.h"
+
+namespace impeller {
+namespace compiler {
+
+/// @brief  Parse a shader bundle configuration from a given JSON string.
+///
+/// @note   Exposed only for testing purposes. Use `GenerateShaderBundle`
+///         directly.
+std::optional<ShaderBundleConfig> ParseShaderBundleConfig(
+    const std::string& bundle_config_json,
+    std::ostream& error_stream);
+
+/// @brief  Parses the JSON shader bundle configuration and invokes the
+///         compiler multiple times to produce a shader bundle flatbuffer.
+///
+/// @note   Exposed only for testing purposes. Use `GenerateShaderBundle`
+///         directly.
+std::optional<fb::shaderbundle::ShaderBundleT> GenerateShaderBundleFlatbuffer(
+    const std::string& bundle_config_json,
+    const SourceOptions& options);
+
+/// @brief  Parses the JSON shader bundle configuration and invokes the
+///         compiler multiple times to produce a shader bundle flatbuffer, which
+///         is then output to the `sl` file.
+bool GenerateShaderBundle(Switches& switches);
+
+}  // namespace compiler
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_COMPILER_SHADER_BUNDLE_H_
diff --git a/impeller/compiler/shader_bundle_data.cc b/impeller/compiler/shader_bundle_data.cc
new file mode 100644
index 0000000000000000000000000000000000000000..f84afa479fac3845dd513dc5b36cc81bd0fd82ec
--- /dev/null
+++ b/impeller/compiler/shader_bundle_data.cc
@@ -0,0 +1,241 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/compiler/shader_bundle_data.h"
+
+#include <optional>
+
+#include "impeller/shader_bundle/shader_bundle_flatbuffers.h"
+
+#include "impeller/base/validation.h"
+
+namespace impeller {
+namespace compiler {
+
+ShaderBundleData::ShaderBundleData(std::string entrypoint,
+                                   spv::ExecutionModel stage,
+                                   TargetPlatform target_platform)
+    : entrypoint_(std::move(entrypoint)),
+      stage_(stage),
+      target_platform_(target_platform) {}
+
+ShaderBundleData::~ShaderBundleData() = default;
+
+void ShaderBundleData::AddUniformStruct(ShaderUniformStruct uniform_struct) {
+  uniform_structs_.emplace_back(std::move(uniform_struct));
+}
+
+void ShaderBundleData::AddUniformTexture(ShaderUniformTexture uniform_texture) {
+  uniform_textures_.emplace_back(std::move(uniform_texture));
+}
+
+void ShaderBundleData::AddInputDescription(InputDescription input) {
+  inputs_.emplace_back(std::move(input));
+}
+
+void ShaderBundleData::SetShaderData(std::shared_ptr<fml::Mapping> shader) {
+  shader_ = std::move(shader);
+}
+
+static std::optional<fb::shaderbundle::ShaderStage> ToStage(
+    spv::ExecutionModel stage) {
+  switch (stage) {
+    case spv::ExecutionModel::ExecutionModelVertex:
+      return fb::shaderbundle::ShaderStage::kVertex;
+    case spv::ExecutionModel::ExecutionModelFragment:
+      return fb::shaderbundle::ShaderStage::kFragment;
+    case spv::ExecutionModel::ExecutionModelGLCompute:
+      return fb::shaderbundle::ShaderStage::kCompute;
+    default:
+      return std::nullopt;
+  }
+  FML_UNREACHABLE();
+}
+
+static std::optional<fb::shaderbundle::UniformDataType> ToUniformType(
+    spirv_cross::SPIRType::BaseType type) {
+  switch (type) {
+    case spirv_cross::SPIRType::Boolean:
+      return fb::shaderbundle::UniformDataType::kBoolean;
+    case spirv_cross::SPIRType::SByte:
+      return fb::shaderbundle::UniformDataType::kSignedByte;
+    case spirv_cross::SPIRType::UByte:
+      return fb::shaderbundle::UniformDataType::kUnsignedByte;
+    case spirv_cross::SPIRType::Short:
+      return fb::shaderbundle::UniformDataType::kSignedShort;
+    case spirv_cross::SPIRType::UShort:
+      return fb::shaderbundle::UniformDataType::kUnsignedShort;
+    case spirv_cross::SPIRType::Int:
+      return fb::shaderbundle::UniformDataType::kSignedInt;
+    case spirv_cross::SPIRType::UInt:
+      return fb::shaderbundle::UniformDataType::kUnsignedInt;
+    case spirv_cross::SPIRType::Int64:
+      return fb::shaderbundle::UniformDataType::kSignedInt64;
+    case spirv_cross::SPIRType::UInt64:
+      return fb::shaderbundle::UniformDataType::kUnsignedInt64;
+    case spirv_cross::SPIRType::Half:
+      return fb::shaderbundle::UniformDataType::kHalfFloat;
+    case spirv_cross::SPIRType::Float:
+      return fb::shaderbundle::UniformDataType::kFloat;
+    case spirv_cross::SPIRType::Double:
+      return fb::shaderbundle::UniformDataType::kDouble;
+    case spirv_cross::SPIRType::SampledImage:
+      return fb::shaderbundle::UniformDataType::kSampledImage;
+    case spirv_cross::SPIRType::AccelerationStructure:
+    case spirv_cross::SPIRType::AtomicCounter:
+    case spirv_cross::SPIRType::Char:
+    case spirv_cross::SPIRType::ControlPointArray:
+    case spirv_cross::SPIRType::Image:
+    case spirv_cross::SPIRType::Interpolant:
+    case spirv_cross::SPIRType::RayQuery:
+    case spirv_cross::SPIRType::Sampler:
+    case spirv_cross::SPIRType::Struct:
+    case spirv_cross::SPIRType::Unknown:
+    case spirv_cross::SPIRType::Void:
+      return std::nullopt;
+  }
+  FML_UNREACHABLE();
+}
+static std::optional<fb::shaderbundle::InputDataType> ToInputType(
+    spirv_cross::SPIRType::BaseType type) {
+  switch (type) {
+    case spirv_cross::SPIRType::Boolean:
+      return fb::shaderbundle::InputDataType::kBoolean;
+    case spirv_cross::SPIRType::SByte:
+      return fb::shaderbundle::InputDataType::kSignedByte;
+    case spirv_cross::SPIRType::UByte:
+      return fb::shaderbundle::InputDataType::kUnsignedByte;
+    case spirv_cross::SPIRType::Short:
+      return fb::shaderbundle::InputDataType::kSignedShort;
+    case spirv_cross::SPIRType::UShort:
+      return fb::shaderbundle::InputDataType::kUnsignedShort;
+    case spirv_cross::SPIRType::Int:
+      return fb::shaderbundle::InputDataType::kSignedInt;
+    case spirv_cross::SPIRType::UInt:
+      return fb::shaderbundle::InputDataType::kUnsignedInt;
+    case spirv_cross::SPIRType::Int64:
+      return fb::shaderbundle::InputDataType::kSignedInt64;
+    case spirv_cross::SPIRType::UInt64:
+      return fb::shaderbundle::InputDataType::kUnsignedInt64;
+    case spirv_cross::SPIRType::Float:
+      return fb::shaderbundle::InputDataType::kFloat;
+    case spirv_cross::SPIRType::Double:
+      return fb::shaderbundle::InputDataType::kDouble;
+    case spirv_cross::SPIRType::Unknown:
+    case spirv_cross::SPIRType::Void:
+    case spirv_cross::SPIRType::Half:
+    case spirv_cross::SPIRType::AtomicCounter:
+    case spirv_cross::SPIRType::Struct:
+    case spirv_cross::SPIRType::Image:
+    case spirv_cross::SPIRType::SampledImage:
+    case spirv_cross::SPIRType::Sampler:
+    case spirv_cross::SPIRType::AccelerationStructure:
+    case spirv_cross::SPIRType::RayQuery:
+    case spirv_cross::SPIRType::ControlPointArray:
+    case spirv_cross::SPIRType::Interpolant:
+    case spirv_cross::SPIRType::Char:
+      return std::nullopt;
+  }
+  FML_UNREACHABLE();
+}
+
+std::unique_ptr<fb::shaderbundle::BackendShaderT>
+ShaderBundleData::CreateFlatbuffer() const {
+  auto shader_bundle = std::make_unique<fb::shaderbundle::BackendShaderT>();
+
+  // The high level object API is used here for writing to the buffer. This is
+  // just a convenience.
+  shader_bundle->entrypoint = entrypoint_;
+  const auto stage = ToStage(stage_);
+  if (!stage.has_value()) {
+    VALIDATION_LOG << "Invalid shader bundle.";
+    return nullptr;
+  }
+  shader_bundle->stage = stage.value();
+  // This field is ignored, so just set it to anything.
+  if (!shader_) {
+    VALIDATION_LOG << "No shader specified for shader bundle.";
+    return nullptr;
+  }
+  if (shader_->GetSize() > 0u) {
+    shader_bundle->shader = {shader_->GetMapping(),
+                             shader_->GetMapping() + shader_->GetSize()};
+  }
+  for (const auto& uniform : uniform_structs_) {
+    auto desc = std::make_unique<fb::shaderbundle::ShaderUniformStructT>();
+
+    desc->name = uniform.name;
+    if (desc->name.empty()) {
+      VALIDATION_LOG << "Uniform name cannot be empty.";
+      return nullptr;
+    }
+    desc->ext_res_0 = uniform.ext_res_0;
+    desc->set = uniform.set;
+    desc->binding = uniform.binding;
+    desc->size_in_bytes = uniform.size_in_bytes;
+
+    for (const auto& field : uniform.fields) {
+      auto field_desc =
+          std::make_unique<fb::shaderbundle::ShaderUniformStructFieldT>();
+      field_desc->name = field.name;
+      auto type = ToUniformType(field.type);
+      if (!type.has_value()) {
+        VALIDATION_LOG << " Invalid shader type " << field.type << ".";
+        return nullptr;
+      }
+      field_desc->type = type.value();
+      field_desc->offset_in_bytes = field.offset_in_bytes;
+      field_desc->element_size_in_bytes = field.element_size_in_bytes;
+      field_desc->total_size_in_bytes = field.total_size_in_bytes;
+      field_desc->array_elements = field.array_elements.value_or(0);
+      desc->fields.push_back(std::move(field_desc));
+    }
+
+    shader_bundle->uniform_structs.emplace_back(std::move(desc));
+  }
+
+  for (const auto& texture : uniform_textures_) {
+    auto desc = std::make_unique<fb::shaderbundle::ShaderUniformTextureT>();
+    desc->name = texture.name;
+    if (desc->name.empty()) {
+      VALIDATION_LOG << "Uniform name cannot be empty.";
+      return nullptr;
+    }
+    desc->ext_res_0 = texture.ext_res_0;
+    desc->set = texture.set;
+    desc->binding = texture.binding;
+    shader_bundle->uniform_textures.emplace_back(std::move(desc));
+  }
+
+  for (const auto& input : inputs_) {
+    auto desc = std::make_unique<fb::shaderbundle::ShaderInputT>();
+
+    desc->name = input.name;
+
+    if (desc->name.empty()) {
+      VALIDATION_LOG << "Stage input name cannot be empty.";
+      return nullptr;
+    }
+    desc->location = input.location;
+    desc->set = input.set;
+    desc->binding = input.binding;
+    auto input_type = ToInputType(input.type);
+    if (!input_type.has_value()) {
+      VALIDATION_LOG << "Invalid uniform type for runtime stage.";
+      return nullptr;
+    }
+    desc->type = input_type.value();
+    desc->bit_width = input.bit_width;
+    desc->vec_size = input.vec_size;
+    desc->columns = input.columns;
+    desc->offset = input.offset;
+
+    shader_bundle->inputs.emplace_back(std::move(desc));
+  }
+
+  return shader_bundle;
+}
+
+}  // namespace compiler
+}  // namespace impeller
diff --git a/impeller/compiler/shader_bundle_data.h b/impeller/compiler/shader_bundle_data.h
new file mode 100644
index 0000000000000000000000000000000000000000..f33c54792e2f7f3eeed1e67cbded2ac049ae1373
--- /dev/null
+++ b/impeller/compiler/shader_bundle_data.h
@@ -0,0 +1,82 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_COMPILER_SHADER_BUNDLE_DATA_H_
+#define FLUTTER_IMPELLER_COMPILER_SHADER_BUNDLE_DATA_H_
+
+#include <memory>
+#include <vector>
+
+#include "flutter/fml/mapping.h"
+#include "impeller/compiler/types.h"
+#include "impeller/shader_bundle/shader_bundle_flatbuffers.h"
+
+namespace impeller {
+namespace compiler {
+
+class ShaderBundleData {
+ public:
+  struct ShaderUniformStructField {
+    std::string name;
+    spirv_cross::SPIRType::BaseType type =
+        spirv_cross::SPIRType::BaseType::Float;
+    size_t offset_in_bytes = 0u;
+    size_t element_size_in_bytes = 0u;
+    size_t total_size_in_bytes = 0u;
+    std::optional<size_t> array_elements = std::nullopt;
+  };
+
+  struct ShaderUniformStruct {
+    std::string name;
+    size_t ext_res_0 = 0u;
+    size_t set = 0u;
+    size_t binding = 0u;
+    size_t size_in_bytes = 0u;
+    std::vector<ShaderUniformStructField> fields;
+  };
+
+  struct ShaderUniformTexture {
+    std::string name;
+    size_t ext_res_0 = 0u;
+    size_t set = 0u;
+    size_t binding = 0u;
+  };
+
+  ShaderBundleData(std::string entrypoint,
+                   spv::ExecutionModel stage,
+                   TargetPlatform target_platform);
+
+  ~ShaderBundleData();
+
+  void AddUniformStruct(ShaderUniformStruct uniform_struct);
+
+  void AddUniformTexture(ShaderUniformTexture uniform_texture);
+
+  void AddInputDescription(InputDescription input);
+
+  void SetShaderData(std::shared_ptr<fml::Mapping> shader);
+
+  void SetSkSLData(std::shared_ptr<fml::Mapping> sksl);
+
+  std::unique_ptr<fb::shaderbundle::BackendShaderT> CreateFlatbuffer() const;
+
+ private:
+  const std::string entrypoint_;
+  const spv::ExecutionModel stage_;
+  const TargetPlatform target_platform_;
+  std::vector<ShaderUniformStruct> uniform_structs_;
+  std::vector<ShaderUniformTexture> uniform_textures_;
+  std::vector<InputDescription> inputs_;
+  std::shared_ptr<fml::Mapping> shader_;
+  std::shared_ptr<fml::Mapping> sksl_;
+
+  ShaderBundleData(const ShaderBundleData&) = delete;
+
+  ShaderBundleData& operator=(const ShaderBundleData&) = delete;
+};
+
+}  // namespace compiler
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_COMPILER_SHADER_BUNDLE_DATA_H_
diff --git a/impeller/compiler/shader_bundle_unittests.cc b/impeller/compiler/shader_bundle_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..4d79c2aa5d4a4b6a4e92de24abaa6152d7fd2e2f
--- /dev/null
+++ b/impeller/compiler/shader_bundle_unittests.cc
@@ -0,0 +1,218 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "gtest/gtest.h"
+#include "impeller/compiler/shader_bundle.h"
+
+#include "flutter/testing/testing.h"
+#include "impeller/compiler/source_options.h"
+#include "impeller/compiler/types.h"
+#include "impeller/shader_bundle/shader_bundle_flatbuffers.h"
+
+namespace impeller {
+namespace compiler {
+namespace testing {
+
+const std::string kUnlitFragmentBundleConfig =
+    "\"UnlitFragment\": {\"type\": \"fragment\", \"file\": "
+    "\"shaders/flutter_gpu_unlit.frag\"}";
+const std::string kUnlitVertexBundleConfig =
+    "\"UnlitVertex\": {\"type\": \"vertex\", \"file\": "
+    "\"shaders/flutter_gpu_unlit.vert\"}";
+
+TEST(ShaderBundleTest, ParseShaderBundleConfigFailsForInvalidJSON) {
+  std::string bundle = "";
+  std::stringstream error;
+  auto result = ParseShaderBundleConfig(bundle, error);
+  ASSERT_FALSE(result.has_value());
+  ASSERT_STREQ(error.str().c_str(),
+               "The shader bundle is not a valid JSON object.\n");
+}
+
+TEST(ShaderBundleTest, ParseShaderBundleConfigFailsWhenEntryNotObject) {
+  std::string bundle = "{\"UnlitVertex\": []}";
+  std::stringstream error;
+  auto result = ParseShaderBundleConfig(bundle, error);
+  ASSERT_FALSE(result.has_value());
+  ASSERT_STREQ(
+      error.str().c_str(),
+      "Invalid shader entry \"UnlitVertex\": Entry is not a JSON object.\n");
+}
+
+TEST(ShaderBundleTest, ParseShaderBundleConfigFailsWhenMissingFile) {
+  std::string bundle = "{\"UnlitVertex\": {\"type\": \"vertex\"}}";
+  std::stringstream error;
+  auto result = ParseShaderBundleConfig(bundle, error);
+  ASSERT_FALSE(result.has_value());
+  ASSERT_STREQ(error.str().c_str(),
+               "Invalid shader entry \"UnlitVertex\": Missing required "
+               "\"file\" field.\n");
+}
+
+TEST(ShaderBundleTest, ParseShaderBundleConfigFailsWhenMissingType) {
+  std::string bundle =
+      "{\"UnlitVertex\": {\"file\": \"shaders/flutter_gpu_unlit.vert\"}}";
+  std::stringstream error;
+  auto result = ParseShaderBundleConfig(bundle, error);
+  ASSERT_FALSE(result.has_value());
+  ASSERT_STREQ(error.str().c_str(),
+               "Invalid shader entry \"UnlitVertex\": Missing required "
+               "\"type\" field.\n");
+}
+
+TEST(ShaderBundleTest, ParseShaderBundleConfigFailsForInvalidType) {
+  std::string bundle =
+      "{\"UnlitVertex\": {\"type\": \"invalid\", \"file\": "
+      "\"shaders/flutter_gpu_unlit.vert\"}}";
+  std::stringstream error;
+  auto result = ParseShaderBundleConfig(bundle, error);
+  ASSERT_FALSE(result.has_value());
+  ASSERT_STREQ(error.str().c_str(),
+               "Invalid shader entry \"UnlitVertex\": Shader type "
+               "\"invalid\" is unknown.\n");
+}
+
+TEST(ShaderBundleTest, ParseShaderBundleConfigFailsForInvalidLanguage) {
+  std::string bundle =
+      "{\"UnlitVertex\": {\"type\": \"vertex\", \"language\": \"invalid\", "
+      "\"file\": \"shaders/flutter_gpu_unlit.vert\"}}";
+  std::stringstream error;
+  auto result = ParseShaderBundleConfig(bundle, error);
+  ASSERT_FALSE(result.has_value());
+  ASSERT_STREQ(error.str().c_str(),
+               "Invalid shader entry \"UnlitVertex\": Unknown language type "
+               "\"invalid\".\n");
+}
+
+TEST(ShaderBundleTest, ParseShaderBundleConfigReturnsExpectedConfig) {
+  std::string bundle =
+      "{" + kUnlitVertexBundleConfig + ", " + kUnlitFragmentBundleConfig + "}";
+  std::stringstream error;
+  auto result = ParseShaderBundleConfig(bundle, error);
+  ASSERT_TRUE(result.has_value());
+  ASSERT_STREQ(error.str().c_str(), "");
+
+  // NOLINTBEGIN(bugprone-unchecked-optional-access)
+  auto maybe_vertex = result->find("UnlitVertex");
+  auto maybe_fragment = result->find("UnlitFragment");
+  ASSERT_TRUE(maybe_vertex != result->end());
+  ASSERT_TRUE(maybe_fragment != result->end());
+  auto vertex = maybe_vertex->second;
+  auto fragment = maybe_fragment->second;
+  // NOLINTEND(bugprone-unchecked-optional-access)
+
+  EXPECT_EQ(vertex.type, SourceType::kVertexShader);
+  EXPECT_EQ(vertex.language, SourceLanguage::kGLSL);
+  EXPECT_STREQ(vertex.entry_point.c_str(), "main");
+  EXPECT_STREQ(vertex.source_file_name.c_str(),
+               "shaders/flutter_gpu_unlit.vert");
+
+  EXPECT_EQ(fragment.type, SourceType::kFragmentShader);
+  EXPECT_EQ(fragment.language, SourceLanguage::kGLSL);
+  EXPECT_STREQ(fragment.entry_point.c_str(), "main");
+  EXPECT_STREQ(fragment.source_file_name.c_str(),
+               "shaders/flutter_gpu_unlit.frag");
+}
+
+template <typename T>
+const T* FindByName(const std::vector<std::unique_ptr<T>>& collection,
+                    const std::string& name) {
+  const auto maybe = std::find_if(
+      collection.begin(), collection.end(),
+      [&name](const std::unique_ptr<T>& value) { return value->name == name; });
+  if (maybe == collection.end()) {
+    return nullptr;
+  }
+  return maybe->get();
+}
+
+TEST(ShaderBundleTest, GenerateShaderBundleFlatbufferProducesCorrectResult) {
+  std::string fixtures_path = flutter::testing::GetFixturesPath();
+  std::string config =
+      "{\"UnlitFragment\": {\"type\": \"fragment\", \"file\": \"" +
+      fixtures_path +
+      "/flutter_gpu_unlit.frag\"}, \"UnlitVertex\": {\"type\": "
+      "\"vertex\", \"file\": \"" +
+      fixtures_path + "/flutter_gpu_unlit.vert\"}}";
+
+  SourceOptions options;
+  options.target_platform = TargetPlatform::kRuntimeStageMetal;
+  options.source_language = SourceLanguage::kGLSL;
+
+  std::optional<fb::shaderbundle::ShaderBundleT> bundle =
+      GenerateShaderBundleFlatbuffer(config, options);
+  ASSERT_TRUE(bundle.has_value());
+
+  // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
+  const auto& shaders = bundle->shaders;
+  const auto* vertex = FindByName(shaders, "UnlitVertex");
+  const auto* fragment = FindByName(shaders, "UnlitFragment");
+  ASSERT_NE(vertex, nullptr);
+  ASSERT_NE(fragment, nullptr);
+
+  // --------------------------------------------------------------------------
+  /// Verify vertex shader.
+  ///
+
+  EXPECT_STREQ(vertex->metal_desktop->entrypoint.c_str(),
+               "flutter_gpu_unlit_vertex_main");
+  EXPECT_EQ(vertex->metal_desktop->stage,
+            fb::shaderbundle::ShaderStage::kVertex);
+
+  // Inputs.
+  ASSERT_EQ(vertex->metal_desktop->inputs.size(), 1u);
+  const auto& v_in_position = vertex->metal_desktop->inputs[0];
+  EXPECT_STREQ(v_in_position->name.c_str(), "position");
+  EXPECT_EQ(v_in_position->location, 0u);
+  EXPECT_EQ(v_in_position->set, 0u);
+  EXPECT_EQ(v_in_position->binding, 0u);
+  EXPECT_EQ(v_in_position->type, fb::shaderbundle::InputDataType::kFloat);
+  EXPECT_EQ(v_in_position->bit_width, 32u);
+  EXPECT_EQ(v_in_position->vec_size, 2u);
+  EXPECT_EQ(v_in_position->columns, 1u);
+  EXPECT_EQ(v_in_position->offset, 0u);
+
+  // Uniforms.
+  ASSERT_EQ(vertex->metal_desktop->uniform_structs.size(), 1u);
+  const auto* vert_info =
+      FindByName(vertex->metal_desktop->uniform_structs, "VertInfo");
+  ASSERT_NE(vert_info, nullptr);
+  EXPECT_EQ(vert_info->ext_res_0, 0u);
+  EXPECT_EQ(vert_info->set, 0u);
+  EXPECT_EQ(vert_info->binding, 0u);
+  ASSERT_EQ(vert_info->fields.size(), 2u);
+  const auto& mvp = vert_info->fields[0];
+  EXPECT_STREQ(mvp->name.c_str(), "mvp");
+  EXPECT_EQ(mvp->type, fb::shaderbundle::UniformDataType::kFloat);
+  EXPECT_EQ(mvp->offset_in_bytes, 0u);
+  EXPECT_EQ(mvp->element_size_in_bytes, 64u);
+  EXPECT_EQ(mvp->total_size_in_bytes, 64u);
+  EXPECT_EQ(mvp->array_elements, 0u);
+  const auto& color = vert_info->fields[1];
+  EXPECT_STREQ(color->name.c_str(), "color");
+  EXPECT_EQ(color->type, fb::shaderbundle::UniformDataType::kFloat);
+  EXPECT_EQ(color->offset_in_bytes, 64u);
+  EXPECT_EQ(color->element_size_in_bytes, 16u);
+  EXPECT_EQ(color->total_size_in_bytes, 16u);
+  EXPECT_EQ(color->array_elements, 0u);
+
+  // --------------------------------------------------------------------------
+  /// Verify fragment shader.
+  ///
+
+  EXPECT_STREQ(fragment->metal_desktop->entrypoint.c_str(),
+               "flutter_gpu_unlit_fragment_main");
+  EXPECT_EQ(fragment->metal_desktop->stage,
+            fb::shaderbundle::ShaderStage::kFragment);
+
+  // Inputs (not recorded for fragment shaders).
+  ASSERT_EQ(fragment->metal_desktop->inputs.size(), 0u);
+
+  // Uniforms.
+  ASSERT_EQ(fragment->metal_desktop->inputs.size(), 0u);
+}
+
+}  // namespace testing
+}  // namespace compiler
+}  // namespace impeller
diff --git a/impeller/compiler/shader_lib/flutter/runtime_effect.glsl b/impeller/compiler/shader_lib/flutter/runtime_effect.glsl
index 3e5740c10312c75c9463a7819a85b781bfca131a..4a06bf45530988f1ea9c8c1ab016b15c3c8dfb95 100644
--- a/impeller/compiler/shader_lib/flutter/runtime_effect.glsl
+++ b/impeller/compiler/shader_lib/flutter/runtime_effect.glsl
@@ -7,6 +7,9 @@
 
 #if defined(IMPELLER_GRAPHICS_BACKEND)
 
+// Note: The GLES backend uses name matching for attribute locations. This name
+// must match the name of the attribute output in:
+// impeller/entity/shaders/runtime_effect.vert
 in vec2 _fragCoord;
 vec2 FlutterFragCoord() {
   return _fragCoord;
diff --git a/impeller/compiler/shader_lib/impeller/BUILD.gn b/impeller/compiler/shader_lib/impeller/BUILD.gn
index 99ca69f472f7ccac6c1271572f696357885e13d1..08b2121ee5448fbebc5cb5f16e9c9ef79a452ae8 100644
--- a/impeller/compiler/shader_lib/impeller/BUILD.gn
+++ b/impeller/compiler/shader_lib/impeller/BUILD.gn
@@ -8,9 +8,14 @@ copy("impeller") {
     "branching.glsl",
     "color.glsl",
     "constants.glsl",
+    "conversions.glsl",
+    "dithering.glsl",
+    "external_texture_oes.glsl",
     "gaussian.glsl",
     "gradient.glsl",
+    "path.glsl",
     "texture.glsl",
+    "tile_mode.glsl",
     "transform.glsl",
     "types.glsl",
   ]
diff --git a/impeller/compiler/shader_lib/impeller/blending.glsl b/impeller/compiler/shader_lib/impeller/blending.glsl
index f92e6bc4ab9a08ed4182a1dfac1645ae3dcb98a2..59352f2bd22d208f2cbcf2216bd79d03d872e4eb 100644
--- a/impeller/compiler/shader_lib/impeller/blending.glsl
+++ b/impeller/compiler/shader_lib/impeller/blending.glsl
@@ -6,47 +6,68 @@
 #define BLENDING_GLSL_
 
 #include <impeller/branching.glsl>
+#include <impeller/color.glsl>
 #include <impeller/constants.glsl>
+#include <impeller/types.glsl>
+
+/// Composite a blended color onto the destination.
+/// All three parameters are unpremultiplied. Returns a premultiplied result.
+///
+/// This routine is the same as `ApplyBlendedColor` in
+/// `impeller/geometry/color.cc`.
+f16vec4 IPApplyBlendedColor(f16vec4 dst, f16vec4 src, f16vec3 blend_result) {
+  dst = IPHalfPremultiply(dst);
+  src =
+      // Use the blended color for areas where the source and destination
+      // colors overlap.
+      IPHalfPremultiply(f16vec4(blend_result, src.a * dst.a)) +
+      // Use the original source color for any remaining non-overlapping areas.
+      IPHalfPremultiply(src) * (1.0hf - dst.a);
+
+  // Source-over composite the blended source color atop the destination.
+  return src + dst * (1.0hf - src.a);
+}
 
 //------------------------------------------------------------------------------
 /// HSV utilities.
 ///
 
-float IPLuminosity(vec3 color) {
-  return color.r * 0.3 + color.g * 0.59 + color.b * 0.11;
+float16_t IPLuminosity(f16vec3 color) {
+  return color.r * 0.3hf + color.g * 0.59hf + color.b * 0.11hf;
 }
 
 /// Scales the color's luma by the amount necessary to place the color
 /// components in a 1-0 range.
-vec3 IPClipColor(vec3 color) {
-  float lum = IPLuminosity(color);
-  float mn = min(min(color.r, color.g), color.b);
-  float mx = max(max(color.r, color.g), color.b);
+f16vec3 IPClipColor(f16vec3 color) {
+  float16_t lum = IPLuminosity(color);
+  float16_t mn = min(min(color.r, color.g), color.b);
+  float16_t mx = max(max(color.r, color.g), color.b);
   // `lum - mn` and `mx - lum` will always be >= 0 in the following conditions,
   // so adding a tiny value is enough to make these divisions safe.
-  if (mn < 0) {
-    color = lum + (((color - lum) * lum) / (lum - mn + kEhCloseEnough));
+  if (mn < 0.0hf) {
+    color = lum + (((color - lum) * lum) / (lum - mn + kEhCloseEnoughHalf));
   }
-  if (mx > 1) {
-    color = lum + (((color - lum) * (1 - lum)) / (mx - lum + kEhCloseEnough));
+  if (mx > 1.0hf) {
+    color = lum +
+            (((color - lum) * (1.0hf - lum)) / (mx - lum + kEhCloseEnoughHalf));
   }
   return color;
 }
 
-vec3 IPSetLuminosity(vec3 color, float luminosity) {
-  float relative_lum = luminosity - IPLuminosity(color);
+f16vec3 IPSetLuminosity(f16vec3 color, float16_t luminosity) {
+  float16_t relative_lum = luminosity - IPLuminosity(color);
   return IPClipColor(color + relative_lum);
 }
 
-float IPSaturation(vec3 color) {
+float16_t IPSaturation(f16vec3 color) {
   return max(max(color.r, color.g), color.b) -
          min(min(color.r, color.g), color.b);
 }
 
-vec3 IPSetSaturation(vec3 color, float saturation) {
-  float mn = min(min(color.r, color.g), color.b);
-  float mx = max(max(color.r, color.g), color.b);
-  return (mn < mx) ? ((color - mn) * saturation) / (mx - mn) : vec3(0);
+f16vec3 IPSetSaturation(f16vec3 color, float16_t saturation) {
+  float16_t mn = min(min(color.r, color.g), color.b);
+  float16_t mx = max(max(color.r, color.g), color.b);
+  return (mn < mx) ? ((color - mn) * saturation) / (mx - mn) : f16vec3(0.0hf);
 }
 
 //------------------------------------------------------------------------------
@@ -58,134 +79,136 @@ vec3 IPSetSaturation(vec3 color, float saturation) {
 /// applied to the destination using `SourceOver` alpha compositing.
 ///
 
-vec3 IPBlendScreen(vec3 dst, vec3 src) {
+f16vec3 IPBlendScreen(f16vec3 dst, f16vec3 src) {
   // https://www.w3.org/TR/compositing-1/#blendingscreen
   return dst + src - (dst * src);
 }
 
-vec3 IPBlendHardLight(vec3 dst, vec3 src) {
+f16vec3 IPBlendHardLight(f16vec3 dst, f16vec3 src) {
   // https://www.w3.org/TR/compositing-1/#blendinghardlight
-  return IPVec3Choose(dst * (2 * src), IPBlendScreen(dst, 2 * src - 1), src);
+  return IPHalfVec3Choose(dst * (2.0hf * src),
+                          IPBlendScreen(dst, 2.0hf * src - 1.0hf), src);
 }
 
-vec3 IPBlendOverlay(vec3 dst, vec3 src) {
+f16vec3 IPBlendOverlay(f16vec3 dst, f16vec3 src) {
   // https://www.w3.org/TR/compositing-1/#blendingoverlay
   // HardLight, but with reversed parameters.
   return IPBlendHardLight(src, dst);
 }
 
-vec3 IPBlendDarken(vec3 dst, vec3 src) {
+f16vec3 IPBlendDarken(f16vec3 dst, f16vec3 src) {
   // https://www.w3.org/TR/compositing-1/#blendingdarken
   return min(dst, src);
 }
 
-vec3 IPBlendLighten(vec3 dst, vec3 src) {
+f16vec3 IPBlendLighten(f16vec3 dst, f16vec3 src) {
   // https://www.w3.org/TR/compositing-1/#blendinglighten
   return max(dst, src);
 }
 
-vec3 IPBlendColorDodge(vec3 dst, vec3 src) {
+f16vec3 IPBlendColorDodge(f16vec3 dst, f16vec3 src) {
   // https://www.w3.org/TR/compositing-1/#blendingcolordodge
 
-  vec3 color = min(vec3(1), dst / (1 - src));
+  f16vec3 color = min(f16vec3(1.0hf), dst / (1.0hf - src));
 
-  if (dst.r < kEhCloseEnough) {
-    color.r = 0;
+  if (dst.r < kEhCloseEnoughHalf) {
+    color.r = 0.0hf;
   }
-  if (dst.g < kEhCloseEnough) {
-    color.g = 0;
+  if (dst.g < kEhCloseEnoughHalf) {
+    color.g = 0.0hf;
   }
-  if (dst.b < kEhCloseEnough) {
-    color.b = 0;
+  if (dst.b < kEhCloseEnoughHalf) {
+    color.b = 0.0hf;
   }
 
-  if (1 - src.r < kEhCloseEnough) {
-    color.r = 1;
+  if (1.0hf - src.r < kEhCloseEnoughHalf) {
+    color.r = 1.0hf;
   }
-  if (1 - src.g < kEhCloseEnough) {
-    color.g = 1;
+  if (1.0hf - src.g < kEhCloseEnoughHalf) {
+    color.g = 1.0hf;
   }
-  if (1 - src.b < kEhCloseEnough) {
-    color.b = 1;
+  if (1.0hf - src.b < kEhCloseEnoughHalf) {
+    color.b = 1.0hf;
   }
 
   return color;
 }
 
-vec3 IPBlendColorBurn(vec3 dst, vec3 src) {
+f16vec3 IPBlendColorBurn(f16vec3 dst, f16vec3 src) {
   // https://www.w3.org/TR/compositing-1/#blendingcolorburn
 
-  vec3 color = 1 - min(vec3(1), (1 - dst) / src);
+  f16vec3 color = 1.0hf - min(f16vec3(1.0hf), (1.0hf - dst) / src);
 
-  if (1 - dst.r < kEhCloseEnough) {
-    color.r = 1;
+  if (1.0hf - dst.r < kEhCloseEnoughHalf) {
+    color.r = 1.0hf;
   }
-  if (1 - dst.g < kEhCloseEnough) {
-    color.g = 1;
+  if (1.0hf - dst.g < kEhCloseEnoughHalf) {
+    color.g = 1.0hf;
   }
-  if (1 - dst.b < kEhCloseEnough) {
-    color.b = 1;
+  if (1.0hf - dst.b < kEhCloseEnoughHalf) {
+    color.b = 1.0hf;
   }
 
-  if (src.r < kEhCloseEnough) {
-    color.r = 0;
+  if (src.r < kEhCloseEnoughHalf) {
+    color.r = 0.0hf;
   }
-  if (src.g < kEhCloseEnough) {
-    color.g = 0;
+  if (src.g < kEhCloseEnoughHalf) {
+    color.g = 0.0hf;
   }
-  if (src.b < kEhCloseEnough) {
-    color.b = 0;
+  if (src.b < kEhCloseEnoughHalf) {
+    color.b = 0.0hf;
   }
 
   return color;
 }
 
-vec3 IPBlendSoftLight(vec3 dst, vec3 src) {
+f16vec3 IPBlendSoftLight(f16vec3 dst, f16vec3 src) {
   // https://www.w3.org/TR/compositing-1/#blendingsoftlight
 
-  vec3 D = IPVec3ChooseCutoff(((16 * dst - 12) * dst + 4) * dst,  //
-                              sqrt(dst),                          //
-                              dst,                                //
-                              0.25);
+  f16vec3 D =
+      IPHalfVec3ChooseCutoff(((16.0hf * dst - 12.0hf) * dst + 4.0hf) * dst,  //
+                             sqrt(dst),                                      //
+                             dst,                                            //
+                             0.25hf);
 
-  return IPVec3Choose(dst - (1 - 2 * src) * dst * (1 - dst),  //
-                      dst + (2 * src - 1) * (D - dst),        //
-                      src);
+  return IPHalfVec3Choose(dst - (1.0hf - 2.0hf * src) * dst * (1.0hf - dst),  //
+                          dst + (2.0hf * src - 1.0hf) * (D - dst),            //
+                          src);
 }
 
-vec3 IPBlendDifference(vec3 dst, vec3 src) {
+f16vec3 IPBlendDifference(f16vec3 dst, f16vec3 src) {
   // https://www.w3.org/TR/compositing-1/#blendingdifference
   return abs(dst - src);
 }
 
-vec3 IPBlendExclusion(vec3 dst, vec3 src) {
+f16vec3 IPBlendExclusion(f16vec3 dst, f16vec3 src) {
   // https://www.w3.org/TR/compositing-1/#blendingexclusion
-  return dst + src - 2 * dst * src;
+  return dst + src - 2.0hf * dst * src;
 }
 
-vec3 IPBlendMultiply(vec3 dst, vec3 src) {
+f16vec3 IPBlendMultiply(f16vec3 dst, f16vec3 src) {
   // https://www.w3.org/TR/compositing-1/#blendingmultiply
   return dst * src;
 }
 
-vec3 IPBlendHue(vec3 dst, vec3 src) {
+f16vec3 IPBlendHue(f16vec3 dst, f16vec3 src) {
   // https://www.w3.org/TR/compositing-1/#blendinghue
   return IPSetLuminosity(IPSetSaturation(src, IPSaturation(dst)),
                          IPLuminosity(dst));
 }
 
-vec3 IPBlendSaturation(vec3 dst, vec3 src) {
+f16vec3 IPBlendSaturation(f16vec3 dst, f16vec3 src) {
   // https://www.w3.org/TR/compositing-1/#blendingsaturation
   return IPSetLuminosity(IPSetSaturation(dst, IPSaturation(src)),
                          IPLuminosity(dst));
 }
 
-vec3 IPBlendColor(vec3 dst, vec3 src) {
+f16vec3 IPBlendColor(f16vec3 dst, f16vec3 src) {
   // https://www.w3.org/TR/compositing-1/#blendingcolor
   return IPSetLuminosity(src, IPLuminosity(dst));
 }
 
-vec3 IPBlendLuminosity(vec3 dst, vec3 src) {
+f16vec3 IPBlendLuminosity(f16vec3 dst, f16vec3 src) {
   // https://www.w3.org/TR/compositing-1/#blendingluminosity
   return IPSetLuminosity(dst, IPLuminosity(src));
 }
diff --git a/impeller/compiler/shader_lib/impeller/branching.glsl b/impeller/compiler/shader_lib/impeller/branching.glsl
index bfa00b62dc5f13c8cea3d85f233b34b0cf0a0e71..4441e6a5618277862c1375dde44c0bab8a716e5f 100644
--- a/impeller/compiler/shader_lib/impeller/branching.glsl
+++ b/impeller/compiler/shader_lib/impeller/branching.glsl
@@ -49,4 +49,24 @@ vec3 IPVec3Choose(vec3 a, vec3 b, vec3 value) {
   return IPVec3ChooseCutoff(a, b, value, 0.5);
 }
 
+/// Perform a branchless greater than check for each vec3 component.
+///
+/// Returns 1.0 if x > y, otherwise 0.0.
+f16vec3 IPHalfVec3IsGreaterThan(f16vec3 x, f16vec3 y) {
+  return max(sign(x - y), float16_t(0.0hf));
+}
+
+/// For each vec3 component, if value > cutoff, return b, otherwise return a.
+f16vec3 IPHalfVec3ChooseCutoff(f16vec3 a,
+                               f16vec3 b,
+                               f16vec3 value,
+                               float16_t cutoff) {
+  return mix(a, b, IPHalfVec3IsGreaterThan(value, f16vec3(cutoff)));
+}
+
+/// For each vec3 component, if value > 0.5, return b, otherwise return a.
+f16vec3 IPHalfVec3Choose(f16vec3 a, f16vec3 b, f16vec3 value) {
+  return IPHalfVec3ChooseCutoff(a, b, value, float16_t(0.5hf));
+}
+
 #endif
diff --git a/impeller/compiler/shader_lib/impeller/color.glsl b/impeller/compiler/shader_lib/impeller/color.glsl
index 303b68e4c4570273eba0709945014a8d66ea20d7..310e22e779f76f18598ebd52a4ea9522e0319a59 100644
--- a/impeller/compiler/shader_lib/impeller/color.glsl
+++ b/impeller/compiler/shader_lib/impeller/color.glsl
@@ -6,6 +6,7 @@
 #define COLOR_GLSL_
 
 #include <impeller/branching.glsl>
+#include <impeller/types.glsl>
 
 /// Convert a premultiplied color (a color which has its color components
 /// multiplied with its alpha value) to an unpremultiplied color.
@@ -18,6 +19,17 @@ vec4 IPUnpremultiply(vec4 color) {
   return vec4(color.rgb / color.a, color.a);
 }
 
+/// Convert a premultiplied color (a color which has its color components
+/// multiplied with its alpha value) to an unpremultiplied color.
+///
+/// Returns (0, 0, 0, 0) if the alpha component is 0.
+f16vec4 IPHalfUnpremultiply(f16vec4 color) {
+  if (color.a == 0.0hf) {
+    return f16vec4(0.0hf);
+  }
+  return f16vec4(color.rgb / color.a, color.a);
+}
+
 /// Convert an unpremultiplied color (a color which has its color components
 /// separated from its alpha value) to a premultiplied color.
 ///
@@ -26,4 +38,12 @@ vec4 IPPremultiply(vec4 color) {
   return vec4(color.rgb * color.a, color.a);
 }
 
+/// Convert an unpremultiplied color (a color which has its color components
+/// separated from its alpha value) to a premultiplied color.
+///
+/// Returns (0, 0, 0, 0) if the alpha component is 0.
+f16vec4 IPHalfPremultiply(f16vec4 color) {
+  return f16vec4(color.rgb * color.a, color.a);
+}
+
 #endif
diff --git a/impeller/compiler/shader_lib/impeller/constants.glsl b/impeller/compiler/shader_lib/impeller/constants.glsl
index fe9367a926eae89cf049d928268a1a0a23f291aa..ccb73b5df9bbfadb2158a5accde9be9fe589d6dd 100644
--- a/impeller/compiler/shader_lib/impeller/constants.glsl
+++ b/impeller/compiler/shader_lib/impeller/constants.glsl
@@ -5,8 +5,13 @@
 #ifndef CONSTANTS_GLSL_
 #define CONSTANTS_GLSL_
 
+#include <impeller/types.glsl>
+
 const float kEhCloseEnough = 0.000001;
 
+// 1/1024.
+const float16_t kEhCloseEnoughHalf = 0.0009765625hf;
+
 // 1 / (2 * pi)
 const float k1Over2Pi = 0.1591549430918;
 
@@ -16,4 +21,14 @@ const float kSqrtTwoPi = 2.50662827463;
 // sqrt(2) / 2 == 1 / sqrt(2)
 const float kHalfSqrtTwo = 0.70710678118;
 
+// sqrt(3)
+const float kSqrtThree = 1.73205080757;
+
+// The default mip bias to use when sampling textures.
+// This value biases towards sampling from a lower mip level (bigger size),
+// which results in sharper looking images when mip sampling is enabled. This is
+// the same constant that Skia uses.
+const float kDefaultMipBias = -0.475;
+const float kDefaultMipBiasHalf = -0.475hf;
+
 #endif
diff --git a/impeller/compiler/shader_lib/impeller/conversions.glsl b/impeller/compiler/shader_lib/impeller/conversions.glsl
new file mode 100644
index 0000000000000000000000000000000000000000..1a84771678da6d8f892cf2532c7a045aa6735a2f
--- /dev/null
+++ b/impeller/compiler/shader_lib/impeller/conversions.glsl
@@ -0,0 +1,15 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CONVERSIONS_GLSL_
+#define CONVERSIONS_GLSL_
+
+vec2 IPRemapCoords(vec2 coords, float y_coord_scale) {
+  if (y_coord_scale < 0.0) {
+    coords.y = 1.0 - coords.y;
+  }
+  return coords;
+}
+
+#endif
diff --git a/impeller/compiler/shader_lib/impeller/dithering.glsl b/impeller/compiler/shader_lib/impeller/dithering.glsl
new file mode 100644
index 0000000000000000000000000000000000000000..e8e4e8439ce674c970a82deae5a18e4dd1b01a8a
--- /dev/null
+++ b/impeller/compiler/shader_lib/impeller/dithering.glsl
@@ -0,0 +1,54 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef DITHERING_GLSL_
+#define DITHERING_GLSL_
+
+#include <impeller/types.glsl>
+
+/// The dithering rate, which is 1.0 / 64.0, or 0.015625.
+const float kDitherRate = 1.0 / 64.0;
+
+/// Returns the closest color to the input color using 8x8 ordered dithering.
+///
+/// Ordered dithering divides the output into a grid of cells, and then assigns
+/// a different threshold to each cell. The threshold is used to determine if
+/// the color should be rounded up (white) or down (black).
+//
+/// This technique was chosen mostly because Skia also uses it:
+/// https://github.com/google/skia/blob/f9de059517a6f58951510fc7af0cba21e13dd1a8/src/opts/SkRasterPipeline_opts.h#L1717
+///
+/// See also:
+/// - https://en.wikipedia.org/wiki/Ordered_dithering
+/// - https://surma.dev/things/ditherpunk/
+/// - https://shader-tutorial.dev/advanced/color-banding-dithering/
+vec4 IPOrderedDither8x8(vec4 color, vec2 dest) {
+  // Get the x and y coordinates of the pixel in the 8x8 grid.
+  uint x = uint(dest.x) % 8;
+  uint y = uint(dest.y);
+  y ^= x;
+
+  // Get the dither value from the matrix.
+  uint m = (y & 1) << 5 |  //
+           (x & 1) << 4 |  //
+           (y & 2) << 2 |  //
+           (x & 2) << 1 |  //
+           (y & 4) >> 1 |  //
+           (x & 4) >> 2;   //
+
+  // Scale that dither to [0,1), then (-0.5,+0.5), here using 63/128 = 0.4921875
+  // as 0.5-epsilon. We want to make sure our dither is less than 0.5 in either
+  // direction to keep exact values like 0 and 1 unchanged after rounding.
+  float dither = float(m) * (2.0 / 128.0) - (63.0 / 128.0);
+
+  // Apply the dither to the color.
+  color.rgb += dither * kDitherRate;
+
+  // Clamp the color values to [0,1].
+  color.rgb = clamp(color.rgb, 0.0, 1.0);
+
+  return color;
+}
+
+#endif
diff --git a/impeller/compiler/shader_lib/impeller/external_texture_oes.glsl b/impeller/compiler/shader_lib/impeller/external_texture_oes.glsl
new file mode 100644
index 0000000000000000000000000000000000000000..ece31ed69aa0e81c3aa43910ff3cb17f6f8e2537
--- /dev/null
+++ b/impeller/compiler/shader_lib/impeller/external_texture_oes.glsl
@@ -0,0 +1,36 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <impeller/tile_mode.glsl>
+
+/// A triangle wave. 0->0, 1->1, 2->0, and so on... works with negative numbers.
+float TriangleWave(float x) {
+  return abs(mod(x + 1, 2) - 1);
+}
+
+/// OES_EGL_image_external states that only CLAMP_TO_EDGE is valid, so we
+/// emulate all other tile modes here by remapping the texture coordinates.
+vec4 IPSampleWithTileModeOES(sampler2D tex,
+                             vec2 coords,
+                             float x_tile_mode,
+                             float y_tile_mode) {
+  if (x_tile_mode == kTileModeDecal && (coords.x < 0 || coords.x >= 1) ||
+      y_tile_mode == kTileModeDecal && (coords.y < 0 || coords.y >= 1)) {
+    return vec4(0);
+  }
+
+  if (x_tile_mode == kTileModeRepeat) {
+    coords.x = mod(coords.x, 1);
+  } else if (x_tile_mode == kTileModeMirror) {
+    coords.x = TriangleWave(coords.x);
+  }
+
+  if (y_tile_mode == kTileModeRepeat) {
+    coords.y = mod(coords.y, 1);
+  } else if (y_tile_mode == kTileModeMirror) {
+    coords.y = TriangleWave(coords.y);
+  }
+
+  return texture(tex, coords);
+}
diff --git a/impeller/compiler/shader_lib/impeller/gaussian.glsl b/impeller/compiler/shader_lib/impeller/gaussian.glsl
index 7b8b4e438dea9d1edbf5f1e3c23e8aa0dbb5b948..f5ab4b9c7bdb730042d8de3178989dd43baaff02 100644
--- a/impeller/compiler/shader_lib/impeller/gaussian.glsl
+++ b/impeller/compiler/shader_lib/impeller/gaussian.glsl
@@ -6,49 +6,64 @@
 #define GAUSSIAN_GLSL_
 
 #include <impeller/constants.glsl>
+#include <impeller/types.glsl>
 
 /// Gaussian distribution function.
 float IPGaussian(float x, float sigma) {
   float variance = sigma * sigma;
-  return exp(-0.5 * x * x / variance) / (kSqrtTwoPi * sigma);
+  return exp(-0.5f * x * x / variance) / (kSqrtTwoPi * sigma);
+}
+
+/// Gaussian distribution function.
+float16_t IPHalfGaussian(float16_t x, float16_t sigma) {
+  float16_t variance = sigma * sigma;
+  return exp(-0.5hf * x * x / variance) / (float16_t(kSqrtTwoPi) * sigma);
 }
 
 /// Abramowitz and Stegun erf approximation.
-float IPErf(float x) {
-  float a = abs(x);
+float16_t IPErf(float16_t x) {
+  float16_t a = abs(x);
   // 0.278393*x + 0.230389*x^2 + 0.078108*x^4 + 1
-  float b = (0.278393 + (0.230389 + 0.078108 * a * a) * a) * a + 1.0;
-  return sign(x) * (1 - 1 / (b * b * b * b));
+  float16_t b =
+      (0.278393hf + (0.230389hf + 0.078108hf * a * a) * a) * a + 1.0hf;
+  return sign(x) * (1.0hf - 1.0hf / (b * b * b * b));
 }
 
 /// Vec2 variation for the Abramowitz and Stegun erf approximation.
-vec2 IPVec2Erf(vec2 x) {
-  vec2 a = abs(x);
+f16vec2 IPVec2Erf(f16vec2 x) {
+  f16vec2 a = abs(x);
   // 0.278393*x + 0.230389*x^2 + 0.078108*x^4 + 1
-  vec2 b = (0.278393 + (0.230389 + 0.078108 * a * a) * a) * a + 1.0;
-  return sign(x) * (1 - 1 / (b * b * b * b));
+  f16vec2 b = (0.278393hf + (0.230389hf + 0.078108hf * a * a) * a) * a + 1.0hf;
+  return sign(x) * (1.0hf - 1.0hf / (b * b * b * b));
 }
 
-/// Indefinite integral of the Gaussian function (with constant range 0->1).
-float IPGaussianIntegral(float x, float sigma) {
+/// The indefinite integral of the Gaussian function.
+/// Uses a very close approximation of Erf.
+float16_t IPGaussianIntegral(float16_t x, float16_t sigma) {
   // ( 1 + erf( x * (sqrt(2) / (2 * sigma) ) ) / 2
-  // Because this sigmoid is always > 1, we remap it (n * 1.07 - 0.07)
-  // so that it always fades to zero before it reaches the blur radius.
-  return 0.535 * IPErf(x * (kHalfSqrtTwo / sigma)) + 0.465;
+  return (1.0hf + IPErf(x * (float16_t(kHalfSqrtTwo) / sigma))) * 0.5hf;
 }
 
-/// Vec2 variation for the indefinite integral of the Gaussian function (with
-/// constant range 0->1).
-vec2 IPVec2GaussianIntegral(vec2 x, float sigma) {
+/// Vec2 variation for the indefinite integral of the Gaussian function.
+/// Uses a very close approximation of Erf.
+f16vec2 IPVec2GaussianIntegral(f16vec2 x, float16_t sigma) {
   // ( 1 + erf( x * (sqrt(2) / (2 * sigma) ) ) / 2
-  // Because this sigmoid is always > 1, we remap it (n * 1.07 - 0.07)
-  // so that it always fades to zero before it reaches the blur radius.
-  return 0.535 * IPVec2Erf(x * (kHalfSqrtTwo / sigma)) + 0.465;
+  return (1.0hf + IPVec2Erf(x * (float16_t(kHalfSqrtTwo) / sigma))) * 0.5hf;
+}
+
+/// Simpler (but less accurate) approximation of the Gaussian integral.
+vec2 IPVec2FastGaussianIntegral(vec2 x, float sigma) {
+  return 1.0 / (1.0 + exp(-kSqrtThree / sigma * x));
+}
+
+/// Simpler (but less accurate) approximation of the Gaussian integral.
+f16vec2 IPHalfVec2FastGaussianIntegral(f16vec2 x, float16_t sigma) {
+  return 1.0hf / (1.0hf + exp(float16_t(-kSqrtThree) / sigma * x));
 }
 
 /// Simple logistic sigmoid with a domain of [-1, 1] and range of [0, 1].
-float IPSigmoid(float x) {
-  return 1.03731472073 / (1 + exp(-4 * x)) - 0.0186573603638;
+float16_t IPSigmoid(float16_t x) {
+  return 1.03731472073hf / (1.0hf + exp(-4.0hf * x)) - 0.0186573603638hf;
 }
 
 #endif
diff --git a/impeller/compiler/shader_lib/impeller/gradient.glsl b/impeller/compiler/shader_lib/impeller/gradient.glsl
index 2c64edd35098bf5f31cc5ea49a91c523f6329e3b..15647aee5fd9ee4496f38453358beb1b0743c672 100644
--- a/impeller/compiler/shader_lib/impeller/gradient.glsl
+++ b/impeller/compiler/shader_lib/impeller/gradient.glsl
@@ -6,6 +6,130 @@
 #define GRADIENT_GLSL_
 
 #include <impeller/texture.glsl>
+#include <impeller/transform.glsl>
+
+mat3 IPMapToUnitX(vec2 p0, vec2 p1) {
+  // Returns a matrix that maps [p0, p1] to [(0, 0), (1, 0)]. Results are
+  // undefined if p0 = p1.
+  return mat3(0.0, -1.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0) *
+         IPMat3Inverse(mat3(p1.y - p0.y, p0.x - p1.x, 0.0, p1.x - p0.x,
+                            p1.y - p0.y, 0.0, p0.x, p0.y, 1.0));
+}
+
+/// Compute the t value for a conical gradient at point `p` between the 2
+/// circles defined by (c0, r0) and (c1, r1). The returned vec2 encapsulates 't'
+/// as its x component and validity status as its y component, with positive y
+/// indicating a valid result.
+///
+/// The code is migrated from Skia Graphite. See
+/// https://github.com/google/skia/blob/ddf987d2ab3314ee0e80ac1ae7dbffb44a87d394/src/sksl/sksl_graphite_frag.sksl#L541-L666.
+vec2 IPComputeConicalT(vec2 c0, float r0, vec2 c1, float r1, vec2 pos) {
+  const float scalar_nearly_zero = 1.0 / float(1 << 12);
+  float d_center = distance(c0, c1);
+  float d_radius = r1 - r0;
+
+  // Degenerate case: a radial gradient (p0 = p1).
+  bool radial = d_center < scalar_nearly_zero;
+
+  // Degenerate case: a strip with bandwidth 2r (r0 = r1).
+  bool strip = abs(d_radius) < scalar_nearly_zero;
+
+  if (radial) {
+    if (strip) {
+      // The start and end inputs are the same in both position and radius.
+      // We don't expect to see this input, but just in case we avoid dividing
+      // by zero.
+      return vec2(0.0, -1.0);
+    }
+
+    float scale = 1.0 / d_radius;
+    float scale_sign = sign(d_radius);
+    float bias = r0 / d_radius;
+
+    vec2 pt = (pos - c0) * scale;
+    float t = length(pt) * scale_sign - bias;
+    return vec2(t, 1.0);
+
+  } else if (strip) {
+    mat3 transform = IPMapToUnitX(c0, c1);
+    float r = r0 / d_center;
+    float r_2 = r * r;
+
+    vec2 pt = (transform * vec3(pos.xy, 1.0)).xy;
+    float t = r_2 - pt.y * pt.y;
+    if (t < 0.0) {
+      return vec2(0.0, -1.0);
+    }
+    t = pt.x + sqrt(t);
+    return vec2(t, 1.0);
+
+  } else {
+    // See https://skia.org/docs/dev/design/conical/ for details on how this
+    // algorithm works. Calculate f and swap inputs if necessary (steps 1 and
+    // 2).
+    float f = r0 / (r0 - r1);
+
+    bool is_swapped = abs(f - 1.0) < scalar_nearly_zero;
+    if (is_swapped) {
+      vec2 tmp_pt = c0;
+      c0 = c1;
+      c1 = tmp_pt;
+      f = 0.0;
+    }
+
+    // Apply mapping from [Cf, C1] to unit x, and apply the precalculations from
+    // steps 3 and 4, all in the same transform.
+    vec2 cf = c0 * (1.0 - f) + c1 * f;
+    mat3 transform = IPMapToUnitX(cf, c1);
+
+    float scale_x = abs(1.0 - f);
+    float scale_y = scale_x;
+    float r1 = abs(r1 - r0) / d_center;
+    bool is_focal_on_circle = abs(r1 - 1.0) < scalar_nearly_zero;
+    if (is_focal_on_circle) {
+      scale_x *= 0.5;
+      scale_y *= 0.5;
+    } else {
+      scale_x *= r1 / (r1 * r1 - 1.0);
+      scale_y /= sqrt(abs(r1 * r1 - 1.0));
+    }
+    transform =
+        mat3(scale_x, 0.0, 0.0, 0.0, scale_y, 0.0, 0.0, 0.0, 1.0) * transform;
+
+    vec2 pt = (transform * vec3(pos.xy, 1.0)).xy;
+
+    // Continue with step 5 onward.
+    float inv_r1 = 1.0 / r1;
+    float d_radius_sign = sign(1.0 - f);
+    bool is_well_behaved = !is_focal_on_circle && r1 > 1.0;
+
+    float x_t = -1.0;
+    if (is_focal_on_circle) {
+      x_t = dot(pt, pt) / pt.x;
+    } else if (is_well_behaved) {
+      x_t = length(pt) - pt.x * inv_r1;
+    } else {
+      float temp = pt.x * pt.x - pt.y * pt.y;
+      if (temp >= 0.0) {
+        if (is_swapped || d_radius_sign < 0.0) {
+          x_t = -sqrt(temp) - pt.x * inv_r1;
+        } else {
+          x_t = sqrt(temp) - pt.x * inv_r1;
+        }
+      }
+    }
+
+    if (!is_well_behaved && x_t < 0.0) {
+      return vec2(0.0, -1.0);
+    }
+
+    float t = f + d_radius_sign * x_t;
+    if (is_swapped) {
+      t = 1.0 - t;
+    }
+    return vec2(t, 1.0);
+  }
+}
 
 /// Compute the indexes and mix coefficient used to mix colors for an
 /// arbitrarily sized color gradient.
diff --git a/impeller/compiler/shader_lib/impeller/path.glsl b/impeller/compiler/shader_lib/impeller/path.glsl
new file mode 100644
index 0000000000000000000000000000000000000000..1705d7427089ec5f338b2b16c1a447fea27c00e6
--- /dev/null
+++ b/impeller/compiler/shader_lib/impeller/path.glsl
@@ -0,0 +1,165 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef PATH_GLSL_
+#define PATH_GLSL_
+
+struct LineData {
+  vec2 p1;
+  vec2 p2;
+};
+
+struct QuadData {
+  vec2 p1;
+  vec2 cp;
+  vec2 p2;
+};
+
+struct CubicData {
+  vec2 p1;
+  vec2 cp1;
+  vec2 cp2;
+  vec2 p2;
+};
+
+struct QuadDecomposition {
+  float a0;
+  float a2;
+  float u0;
+  float u_scale;
+  uint line_count;
+  float steps;
+};
+
+struct PathComponent {
+  uint index;  // Location in buffer
+  uint count;  // Number of points. 4 = cubic, 3 = quad, 2 = line.
+};
+
+/// Solve for point on a quadratic Bezier curve defined by starting point `p1`,
+/// control point `cp`, and end point `p2` at time `t`.
+vec2 QuadraticSolve(QuadData quad, float t) {
+  return (1.0 - t) * (1.0 - t) * quad.p1 +  //
+         2.0 * (1.0 - t) * t * quad.cp +    //
+         t * t * quad.p2;
+}
+
+vec2 CubicSolve(CubicData cubic, float t) {
+  return (1. - t) * (1. - t) * (1. - t) * cubic.p1 +  //
+         3 * (1. - t) * (1. - t) * t * cubic.cp1 +    //
+         3 * (1. - t) * t * t * cubic.cp2 +           //
+         t * t * t * cubic.p2;
+}
+
+/// Used to approximate quadratic curves using parabola.
+///
+/// See
+/// https://raphlinus.github.io/graphics/curves/2019/12/23/flatten-quadbez.html
+float ApproximateParabolaIntegral(float x) {
+  float d = 0.67;
+  return x / (1.0 - d + sqrt(sqrt(pow(d, 4) + 0.25 * x * x)));
+}
+
+bool isfinite(float f) {
+  return !isnan(f) && !isinf(f);
+}
+
+float Cross(vec2 p1, vec2 p2) {
+  return p1.x * p2.y - p1.y * p2.x;
+}
+
+QuadData GenerateQuadraticFromCubic(CubicData cubic,
+                                    uint index,
+                                    float quad_count) {
+  float t0 = index / quad_count;
+  float t1 = (index + 1) / quad_count;
+
+  // calculate the subsegment
+  vec2 sub_p1 = CubicSolve(cubic, t0);
+  vec2 sub_p2 = CubicSolve(cubic, t1);
+  QuadData quad = QuadData(3.0 * (cubic.cp1 - cubic.p1),   //
+                           3.0 * (cubic.cp2 - cubic.cp1),  //
+                           3.0 * (cubic.p2 - cubic.cp2));
+  float sub_scale = (t1 - t0) * (1.0 / 3.0);
+  vec2 sub_cp1 = sub_p1 + sub_scale * QuadraticSolve(quad, t0);
+  vec2 sub_cp2 = sub_p2 - sub_scale * QuadraticSolve(quad, t1);
+
+  vec2 quad_p1x2 = 3.0 * sub_cp1 - sub_p1;
+  vec2 quad_p2x2 = 3.0 * sub_cp2 - sub_p2;
+
+  return QuadData(sub_p1,                           //
+                  ((quad_p1x2 + quad_p2x2) / 4.0),  //
+                  sub_p2);
+}
+
+uint EstimateQuadraticCount(CubicData cubic, float accuracy) {
+  // The maximum error, as a vector from the cubic to the best approximating
+  // quadratic, is proportional to the third derivative, which is constant
+  // across the segment. Thus, the error scales down as the third power of
+  // the number of subdivisions. Our strategy then is to subdivide `t` evenly.
+  //
+  // This is an overestimate of the error because only the component
+  // perpendicular to the first derivative is important. But the simplicity is
+  // appealing.
+
+  // This magic number is the square of 36 / sqrt(3).
+  // See: http://caffeineowl.com/graphics/2d/vectorial/cubic2quad01.html
+  float max_hypot2 = 432.0 * accuracy * accuracy;
+
+  vec2 err_v = (3.0 * cubic.cp2 - cubic.p2) - (3.0 * cubic.cp1 - cubic.p1);
+  float err = dot(err_v, err_v);
+  return uint(max(1., ceil(pow(err * (1.0 / max_hypot2), 1. / 6.0))));
+}
+
+QuadDecomposition DecomposeQuad(QuadData quad, float tolerance) {
+  float sqrt_tolerance = sqrt(tolerance);
+
+  vec2 d01 = quad.cp - quad.p1;
+  vec2 d12 = quad.p2 - quad.cp;
+  vec2 dd = d01 - d12;
+  // This should never happen, but if it does happen be more defensive -
+  // otherwise we'll get NaNs down the line.
+  if (dd == vec2(0.)) {
+    return QuadDecomposition(0., 0., 0., 0., 0, 0.);
+  }
+  float c = Cross(quad.p2 - quad.p1, dd);
+  float x0 = dot(d01, dd) * 1. / c;
+  float x2 = dot(d12, dd) * 1. / c;
+  float scale = abs(c / (sqrt(dd.x * dd.x + dd.y * dd.y) * (x2 - x0)));
+
+  float a0 = ApproximateParabolaIntegral(x0);
+  float a2 = ApproximateParabolaIntegral(x2);
+  float val = 0.f;
+  if (isfinite(scale)) {
+    float da = abs(a2 - a0);
+    float sqrt_scale = sqrt(scale);
+    if ((x0 < 0 && x2 < 0) || (x0 >= 0 && x2 >= 0)) {
+      val = da * sqrt_scale;
+    } else {
+      // cusp case
+      float xmin = sqrt_tolerance / sqrt_scale;
+      val = sqrt_tolerance * da / ApproximateParabolaIntegral(xmin);
+    }
+  }
+  float u0 = ApproximateParabolaIntegral(a0);
+  float u2 = ApproximateParabolaIntegral(a2);
+  float u_scale = 1. / (u2 - u0);
+
+  uint line_count = uint(max(1., ceil(0.5 * val / sqrt_tolerance)) + 1.);
+  float steps = 1. / line_count;
+
+  return QuadDecomposition(a0, a2, u0, u_scale, line_count, steps);
+}
+
+vec2 GenerateLineFromQuad(QuadData quad,
+                          uint index,
+                          QuadDecomposition decomposition) {
+  float u = index * decomposition.steps;
+  float a = decomposition.a0 + (decomposition.a2 - decomposition.a0) * u;
+  float t = (ApproximateParabolaIntegral(a) - decomposition.u0) *
+            decomposition.u_scale;
+  return QuadraticSolve(quad, t);
+}
+
+#endif
diff --git a/impeller/compiler/shader_lib/impeller/prefix_sum.glsl b/impeller/compiler/shader_lib/impeller/prefix_sum.glsl
new file mode 100644
index 0000000000000000000000000000000000000000..a232d4da5dd85d5a15ba1a7c6bc3df115f1f60ed
--- /dev/null
+++ b/impeller/compiler/shader_lib/impeller/prefix_sum.glsl
@@ -0,0 +1,38 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Parallel exclusive prefix sum computes the prefix in place in storage.
+// BLOCK_SIZE is the overall storage size while ident must be the global
+// x identifier.
+#define ExclusivePrefixSum(ident, storage, BLOCK_SIZE) \
+  do {                                                 \
+    uint offset = 1;                                   \
+    for (uint n = BLOCK_SIZE / 2; n > 0; n /= 2) {     \
+      if (ident < n) {                                 \
+        uint ai = offset * (2 * ident + 1) - 1;        \
+        uint bi = offset * (2 * ident + 2) - 1;        \
+        storage[bi] += storage[ai];                    \
+      }                                                \
+      offset *= 2;                                     \
+      barrier();                                       \
+    }                                                  \
+                                                       \
+    if (ident == 0) {                                  \
+      storage[BLOCK_SIZE - 1] = 0;                     \
+    }                                                  \
+    barrier();                                         \
+                                                       \
+    for (uint n = 1; n < BLOCK_SIZE; n *= 2) {         \
+      offset /= 2;                                     \
+      barrier();                                       \
+      if (ident < n) {                                 \
+        uint ai = offset * (2 * ident + 1) - 1;        \
+        uint bi = offset * (2 * ident + 2) - 1;        \
+        uint temp = storage[ai];                       \
+        storage[ai] = storage[bi];                     \
+        storage[bi] += temp;                           \
+      }                                                \
+    }                                                  \
+    barrier();                                         \
+  } while (false)
diff --git a/impeller/compiler/shader_lib/impeller/texture.glsl b/impeller/compiler/shader_lib/impeller/texture.glsl
index e91eaabb269627a04407c32bee08528c4d8a5f23..56be817085db3e9bfdd663d18b3a52d321fcb8ea 100644
--- a/impeller/compiler/shader_lib/impeller/texture.glsl
+++ b/impeller/compiler/shader_lib/impeller/texture.glsl
@@ -6,24 +6,21 @@
 #define TEXTURE_GLSL_
 
 #include <impeller/branching.glsl>
+#include <impeller/conversions.glsl>
+#include <impeller/tile_mode.glsl>
+#include <impeller/types.glsl>
 
 /// Sample from a texture.
 ///
 /// If `y_coord_scale` < 0.0, the Y coordinate is flipped. This is useful
 /// for Impeller graphics backends that use a flipped framebuffer coordinate
 /// space.
+///
+/// A negative mip bias is applied to improve the sharpness of scaled down
+/// images when mip sampling is enabled. See `kDefaultMipBias` for more detail.
 vec4 IPSample(sampler2D texture_sampler, vec2 coords, float y_coord_scale) {
-  if (y_coord_scale < 0.0) {
-    coords.y = 1.0 - coords.y;
-  }
-  return texture(texture_sampler, coords);
-}
-
-vec2 IPRemapCoords(vec2 coords, float y_coord_scale) {
-  if (y_coord_scale < 0.0) {
-    coords.y = 1.0 - coords.y;
-  }
-  return coords;
+  return texture(texture_sampler, IPRemapCoords(coords, y_coord_scale),
+                 kDefaultMipBias);
 }
 
 /// Sample from a texture.
@@ -31,7 +28,7 @@ vec2 IPRemapCoords(vec2 coords, float y_coord_scale) {
 /// If `y_coord_scale` < 0.0, the Y coordinate is flipped. This is useful
 /// for Impeller graphics backends that use a flipped framebuffer coordinate
 /// space.
-/// The range of `coods` will be mapped from [0, 1] to [half_texel, 1 -
+/// The range of `coords` will be mapped from [0, 1] to [half_texel, 1 -
 /// half_texel]
 vec4 IPSampleLinear(sampler2D texture_sampler,
                     vec2 coords,
@@ -42,13 +39,6 @@ vec4 IPSampleLinear(sampler2D texture_sampler,
   return IPSample(texture_sampler, coords, y_coord_scale);
 }
 
-// These values must correspond to the order of the items in the
-// 'Entity::TileMode' enum class.
-const float kTileModeClamp = 0;
-const float kTileModeRepeat = 1;
-const float kTileModeMirror = 2;
-const float kTileModeDecal = 3;
-
 /// Remap a float using a tiling mode.
 ///
 /// When `tile_mode` is `kTileModeDecal`, no tiling is applied and `t` is
@@ -82,7 +72,6 @@ vec2 IPVec2Tile(vec2 coords, float x_tile_mode, float y_tile_mode) {
 /// for Decal.
 vec4 IPSampleWithTileMode(sampler2D tex,
                           vec2 coords,
-                          float y_coord_scale,
                           float x_tile_mode,
                           float y_tile_mode) {
   if (x_tile_mode == kTileModeDecal && (coords.x < 0 || coords.x >= 1) ||
@@ -90,36 +79,43 @@ vec4 IPSampleWithTileMode(sampler2D tex,
     return vec4(0);
   }
 
-  return IPSample(tex, IPVec2Tile(coords, x_tile_mode, y_tile_mode),
-                  y_coord_scale);
+  return texture(tex, coords, kDefaultMipBias);
 }
 
+const float16_t kTileModeDecalHf = 3.0hf;
+
 /// Sample a texture, emulating a specific tile mode.
 ///
 /// This is useful for Impeller graphics backend that don't have native support
 /// for Decal.
-vec4 IPSampleWithTileMode(sampler2D tex,
-                          vec2 coords,
-                          float y_coord_scale,
-                          float tile_mode) {
-  return IPSampleWithTileMode(tex, coords, y_coord_scale, tile_mode, tile_mode);
+f16vec4 IPHalfSampleWithTileMode(f16sampler2D tex,
+                                 vec2 coords,
+                                 float16_t x_tile_mode,
+                                 float16_t y_tile_mode) {
+  if (x_tile_mode == kTileModeDecalHf && (coords.x < 0.0 || coords.x >= 1.0) ||
+      y_tile_mode == kTileModeDecalHf && (coords.y < 0.0 || coords.y >= 1.0)) {
+    return f16vec4(0.0hf);
+  }
+
+  return texture(tex, coords, kDefaultMipBiasHalf);
 }
 
 /// Sample a texture, emulating a specific tile mode.
 ///
 /// This is useful for Impeller graphics backend that don't have native support
 /// for Decal.
-/// The range of `coods` will be mapped from [0, 1] to [half_texel, 1 -
+/// The range of `coords` will be mapped from [0, 1] to [half_texel, 1 -
 /// half_texel]
 vec4 IPSampleLinearWithTileMode(sampler2D tex,
                                 vec2 coords,
                                 float y_coord_scale,
                                 vec2 half_texel,
                                 float x_tile_mode,
-                                float y_tile_mode) {
+                                float y_tile_mode,
+                                vec4 decal_border_color) {
   if (x_tile_mode == kTileModeDecal && (coords.x < 0 || coords.x >= 1) ||
       y_tile_mode == kTileModeDecal && (coords.y < 0 || coords.y >= 1)) {
-    return vec4(0);
+    return decal_border_color;
   }
 
   return IPSampleLinear(tex, IPVec2Tile(coords, x_tile_mode, y_tile_mode),
@@ -132,22 +128,32 @@ vec4 IPSampleDecal(sampler2D texture_sampler, vec2 coords) {
       any(greaterThanEqual(coords, vec2(1)))) {
     return vec4(0);
   }
-  return texture(texture_sampler, coords);
+  return texture(texture_sampler, coords, kDefaultMipBias);
+}
+
+/// Sample a texture with decal tile mode.
+f16vec4 IPHalfSampleDecal(f16sampler2D texture_sampler, vec2 coords) {
+  if (any(lessThan(coords, vec2(0))) ||
+      any(greaterThanEqual(coords, vec2(1)))) {
+    return f16vec4(0.0);
+  }
+  return texture(texture_sampler, coords, kDefaultMipBiasHalf);
 }
 
 /// Sample a texture, emulating a specific tile mode.
 ///
 /// This is useful for Impeller graphics backend that don't have native support
 /// for Decal.
-/// The range of `coods` will be mapped from [0, 1] to [half_texel, 1 -
+/// The range of `coords` will be mapped from [0, 1] to [half_texel, 1 -
 /// half_texel]
 vec4 IPSampleLinearWithTileMode(sampler2D tex,
                                 vec2 coords,
                                 float y_coord_scale,
                                 vec2 half_texel,
-                                float tile_mode) {
+                                float tile_mode,
+                                vec4 decal_border_color) {
   return IPSampleLinearWithTileMode(tex, coords, y_coord_scale, half_texel,
-                                    tile_mode, tile_mode);
+                                    tile_mode, tile_mode, decal_border_color);
 }
 
 #endif
diff --git a/impeller/compiler/shader_lib/impeller/tile_mode.glsl b/impeller/compiler/shader_lib/impeller/tile_mode.glsl
new file mode 100644
index 0000000000000000000000000000000000000000..31e2bd576538ba2e9eb91953ade5e85f862fc9a0
--- /dev/null
+++ b/impeller/compiler/shader_lib/impeller/tile_mode.glsl
@@ -0,0 +1,10 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// These values must correspond to the order of the items in the
+// 'Entity::TileMode' enum class.
+const float kTileModeClamp = 0;
+const float kTileModeRepeat = 1;
+const float kTileModeMirror = 2;
+const float kTileModeDecal = 3;
diff --git a/impeller/compiler/shader_lib/impeller/transform.glsl b/impeller/compiler/shader_lib/impeller/transform.glsl
index bfe033137ca31b4626b58deba411343b9b7f3b6f..f84696d96ff3013ef201d29a73f107c2202d5c12 100644
--- a/impeller/compiler/shader_lib/impeller/transform.glsl
+++ b/impeller/compiler/shader_lib/impeller/transform.glsl
@@ -26,4 +26,33 @@ vec4 IPPositionForGlyphPosition(mat4 mvp,
               unit_position.y * destination_size.y, 0.0, 1.0);
 }
 
-#endif
+#ifdef IMPELLER_TARGET_OPENGLES
+
+// Shim matrix `inverse` for versions that lack it.
+// TODO: This could be gated on GLSL < 1.4.
+mat3 IPMat3Inverse(mat3 m) {
+  float a00 = m[0][0], a01 = m[0][1], a02 = m[0][2];
+  float a10 = m[1][0], a11 = m[1][1], a12 = m[1][2];
+  float a20 = m[2][0], a21 = m[2][1], a22 = m[2][2];
+
+  float b01 = a22 * a11 - a12 * a21;
+  float b11 = -a22 * a10 + a12 * a20;
+  float b21 = a21 * a10 - a11 * a20;
+
+  float det = a00 * b01 + a01 * b11 + a02 * b21;
+
+  return mat3(b01, (-a22 * a01 + a02 * a21), (a12 * a01 - a02 * a11), b11,
+              (a22 * a00 - a02 * a20), (-a12 * a00 + a02 * a10), b21,
+              (-a21 * a00 + a01 * a20), (a11 * a00 - a01 * a10)) /
+         det;
+}
+
+#else  // IMPELLER_TARGET_OPENGLES
+
+mat3 IPMat3Inverse(mat3 m) {
+  return inverse(m);
+}
+
+#endif  // IMPELLER_TARGET_OPENGLES
+
+#endif  // TRANSFORM_GLSL_
diff --git a/impeller/compiler/shader_lib/impeller/types.glsl b/impeller/compiler/shader_lib/impeller/types.glsl
index 87c7eee666c69cbf6f342a657d502e1a49fdcffd..b0ce4188d08eeee6d07f3b31dc178abc21152c8c 100644
--- a/impeller/compiler/shader_lib/impeller/types.glsl
+++ b/impeller/compiler/shader_lib/impeller/types.glsl
@@ -6,17 +6,25 @@
 #define TYPES_GLSL_
 
 #extension GL_AMD_gpu_shader_half_float : enable
+#extension GL_AMD_gpu_shader_half_float_fetch : enable
+#extension GL_EXT_shader_explicit_arithmetic_types_float16 : enable
 
-#ifndef IMPELLER_TARGET_METAL
+#ifdef IMPELLER_TARGET_OPENGLES
+#define IMPELLER_MAYBE_FLAT
+#else
+#define IMPELLER_MAYBE_FLAT flat
+#endif
+
+#ifndef IMPELLER_TARGET_METAL_IOS
 
 precision mediump sampler2D;
-precision mediump float;
 
 #define float16_t float
 #define f16vec2 vec2
 #define f16vec3 vec3
 #define f16vec4 vec4
 #define f16mat4 mat4
+#define f16sampler2D sampler2D
 
 #endif  // IMPELLER_TARGET_METAL
 
diff --git a/impeller/compiler/source_options.h b/impeller/compiler/source_options.h
index 100462ea0d0955d202d315413d4e555357542688..89011f7158892dd5136493b34f4994e0295ab420 100644
--- a/impeller/compiler/source_options.h
+++ b/impeller/compiler/source_options.h
@@ -2,13 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_COMPILER_SOURCE_OPTIONS_H_
+#define FLUTTER_IMPELLER_COMPILER_SOURCE_OPTIONS_H_
 
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "flutter/fml/macros.h"
 #include "flutter/fml/unique_fd.h"
 #include "impeller/compiler/include_dir.h"
 #include "impeller/compiler/types.h"
@@ -27,7 +28,16 @@ struct SourceOptions {
   uint32_t gles_language_version = 100;
   std::vector<std::string> defines;
   bool json_format = false;
-  bool remap_samplers = false;
+  std::string metal_version;
+
+  /// @brief Whether half-precision textures should be supported, requiring
+  /// opengl semantics. Only used on metal targets.
+  bool use_half_textures = false;
+
+  /// @brief Whether the GLSL framebuffer fetch extension will be required.
+  ///
+  /// Only used on OpenGLES targets.
+  bool require_framebuffer_fetch = false;
 
   SourceOptions();
 
@@ -39,3 +49,5 @@ struct SourceOptions {
 
 }  // namespace compiler
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_COMPILER_SOURCE_OPTIONS_H_
diff --git a/impeller/compiler/spirv_compiler.cc b/impeller/compiler/spirv_compiler.cc
new file mode 100644
index 0000000000000000000000000000000000000000..211073ab5ddcac72554aea0e5441106e27fa2d16
--- /dev/null
+++ b/impeller/compiler/spirv_compiler.cc
@@ -0,0 +1,319 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/compiler/spirv_compiler.h"
+
+#include <array>
+
+#include "impeller/compiler/logger.h"
+#include "impeller/compiler/types.h"
+
+namespace impeller {
+namespace compiler {
+
+SPIRVCompiler::SPIRVCompiler(const SourceOptions& options,
+                             std::shared_ptr<const fml::Mapping> sources)
+    : options_(options), sources_(std::move(sources)) {}
+
+SPIRVCompiler::~SPIRVCompiler() = default;
+
+std::shared_ptr<fml::Mapping> SPIRVCompiler::CompileToSPV(
+    std::stringstream& stream,
+    const shaderc::CompileOptions& spirv_options) const {
+  if (!sources_ || sources_->GetMapping() == nullptr) {
+    COMPILER_ERROR(stream) << "Invalid sources for SPIRV Compiler.";
+    return nullptr;
+  }
+
+  shaderc::Compiler spv_compiler;
+  if (!spv_compiler.IsValid()) {
+    COMPILER_ERROR(stream) << "Could not initialize the "
+                           << SourceLanguageToString(options_.source_language)
+                           << " to SPIRV compiler.";
+    return nullptr;
+  }
+
+  const auto shader_kind = ToShaderCShaderKind(options_.type);
+
+  if (shader_kind == shaderc_shader_kind::shaderc_glsl_infer_from_source) {
+    COMPILER_ERROR(stream) << "Could not figure out shader stage.";
+    return nullptr;
+  }
+
+  auto result = std::make_shared<shaderc::SpvCompilationResult>(
+      spv_compiler.CompileGlslToSpv(
+          reinterpret_cast<const char*>(sources_->GetMapping()),  // source_text
+          sources_->GetSize(),                // source_text_size
+          shader_kind,                        // shader_kind
+          options_.file_name.c_str(),         // input_file_name
+          options_.entry_point_name.c_str(),  // entry_point_name
+          spirv_options                       // options
+          ));
+  if (result->GetCompilationStatus() !=
+      shaderc_compilation_status::shaderc_compilation_status_success) {
+    COMPILER_ERROR(stream) << SourceLanguageToString(options_.source_language)
+                           << " to SPIRV failed; "
+                           << ShaderCErrorToString(
+                                  result->GetCompilationStatus())
+                           << ". " << result->GetNumErrors() << " error(s) and "
+                           << result->GetNumWarnings() << " warning(s).";
+    // It should normally be enough to check that there are errors or warnings,
+    // but some cases result in no errors or warnings and still have an error
+    // message. If there's a message we should print it.
+    if (result->GetNumErrors() > 0 || result->GetNumWarnings() > 0 ||
+        !result->GetErrorMessage().empty()) {
+      COMPILER_ERROR_NO_PREFIX(stream) << result->GetErrorMessage();
+    }
+    return nullptr;
+  }
+
+  if (!result) {
+    COMPILER_ERROR(stream) << "Could not fetch SPIRV from compile job.";
+    return nullptr;
+  }
+
+  const auto data_length = (result->cend() - result->cbegin()) *
+                           sizeof(decltype(result)::element_type::element_type);
+
+  return std::make_unique<fml::NonOwnedMapping>(
+      reinterpret_cast<const uint8_t*>(result->cbegin()),  //
+      data_length,                                         //
+      [result](auto, auto) {}                              //
+  );
+}
+
+std::string SPIRVCompiler::GetSourcePrefix() const {
+  std::stringstream stream;
+  stream << options_.file_name << ": ";
+  return stream.str();
+}
+
+static void SetDefaultLimitations(shaderc::CompileOptions& compiler_opts) {
+  using Limit = std::pair<shaderc_limit, int>;
+  static constexpr std::array<Limit, 83> limits = {
+      Limit{shaderc_limit::shaderc_limit_max_lights, 8},
+      Limit{shaderc_limit::shaderc_limit_max_clip_planes, 6},
+      Limit{shaderc_limit::shaderc_limit_max_texture_units, 2},
+      Limit{shaderc_limit::shaderc_limit_max_texture_coords, 8},
+      Limit{shaderc_limit::shaderc_limit_max_vertex_attribs, 16},
+      Limit{shaderc_limit::shaderc_limit_max_vertex_uniform_components, 4096},
+      Limit{shaderc_limit::shaderc_limit_max_varying_floats, 60},
+      Limit{shaderc_limit::shaderc_limit_max_vertex_texture_image_units, 16},
+      Limit{shaderc_limit::shaderc_limit_max_combined_texture_image_units, 80},
+      Limit{shaderc_limit::shaderc_limit_max_texture_image_units, 16},
+      Limit{shaderc_limit::shaderc_limit_max_fragment_uniform_components, 1024},
+      Limit{shaderc_limit::shaderc_limit_max_draw_buffers, 8},
+      Limit{shaderc_limit::shaderc_limit_max_vertex_uniform_vectors, 256},
+      Limit{shaderc_limit::shaderc_limit_max_varying_vectors, 15},
+      Limit{shaderc_limit::shaderc_limit_max_fragment_uniform_vectors, 256},
+      Limit{shaderc_limit::shaderc_limit_max_vertex_output_vectors, 16},
+      Limit{shaderc_limit::shaderc_limit_max_fragment_input_vectors, 15},
+      Limit{shaderc_limit::shaderc_limit_min_program_texel_offset, -8},
+      Limit{shaderc_limit::shaderc_limit_max_program_texel_offset, 7},
+      Limit{shaderc_limit::shaderc_limit_max_clip_distances, 8},
+      Limit{shaderc_limit::shaderc_limit_max_compute_work_group_count_x, 65535},
+      Limit{shaderc_limit::shaderc_limit_max_compute_work_group_count_y, 65535},
+      Limit{shaderc_limit::shaderc_limit_max_compute_work_group_count_z, 65535},
+      Limit{shaderc_limit::shaderc_limit_max_compute_work_group_size_x, 1024},
+      Limit{shaderc_limit::shaderc_limit_max_compute_work_group_size_y, 1024},
+      Limit{shaderc_limit::shaderc_limit_max_compute_work_group_size_z, 64},
+      Limit{shaderc_limit::shaderc_limit_max_compute_uniform_components, 512},
+      Limit{shaderc_limit::shaderc_limit_max_compute_texture_image_units, 16},
+      Limit{shaderc_limit::shaderc_limit_max_compute_image_uniforms, 8},
+      Limit{shaderc_limit::shaderc_limit_max_compute_atomic_counters, 8},
+      Limit{shaderc_limit::shaderc_limit_max_compute_atomic_counter_buffers, 1},
+      Limit{shaderc_limit::shaderc_limit_max_varying_components, 60},
+      Limit{shaderc_limit::shaderc_limit_max_vertex_output_components, 64},
+      Limit{shaderc_limit::shaderc_limit_max_geometry_input_components, 64},
+      Limit{shaderc_limit::shaderc_limit_max_geometry_output_components, 128},
+      Limit{shaderc_limit::shaderc_limit_max_fragment_input_components, 128},
+      Limit{shaderc_limit::shaderc_limit_max_image_units, 8},
+      Limit{shaderc_limit::
+                shaderc_limit_max_combined_image_units_and_fragment_outputs,
+            8},
+      Limit{shaderc_limit::shaderc_limit_max_combined_shader_output_resources,
+            8},
+      Limit{shaderc_limit::shaderc_limit_max_image_samples, 0},
+      Limit{shaderc_limit::shaderc_limit_max_vertex_image_uniforms, 0},
+      Limit{shaderc_limit::shaderc_limit_max_tess_control_image_uniforms, 0},
+      Limit{shaderc_limit::shaderc_limit_max_tess_evaluation_image_uniforms, 0},
+      Limit{shaderc_limit::shaderc_limit_max_geometry_image_uniforms, 0},
+      Limit{shaderc_limit::shaderc_limit_max_fragment_image_uniforms, 8},
+      Limit{shaderc_limit::shaderc_limit_max_combined_image_uniforms, 8},
+      Limit{shaderc_limit::shaderc_limit_max_geometry_texture_image_units, 16},
+      Limit{shaderc_limit::shaderc_limit_max_geometry_output_vertices, 256},
+      Limit{shaderc_limit::shaderc_limit_max_geometry_total_output_components,
+            1024},
+      Limit{shaderc_limit::shaderc_limit_max_geometry_uniform_components, 512},
+      Limit{shaderc_limit::shaderc_limit_max_geometry_varying_components, 60},
+      Limit{shaderc_limit::shaderc_limit_max_tess_control_input_components,
+            128},
+      Limit{shaderc_limit::shaderc_limit_max_tess_control_output_components,
+            128},
+      Limit{shaderc_limit::shaderc_limit_max_tess_control_texture_image_units,
+            16},
+      Limit{shaderc_limit::shaderc_limit_max_tess_control_uniform_components,
+            1024},
+      Limit{
+          shaderc_limit::shaderc_limit_max_tess_control_total_output_components,
+          4096},
+      Limit{shaderc_limit::shaderc_limit_max_tess_evaluation_input_components,
+            128},
+      Limit{shaderc_limit::shaderc_limit_max_tess_evaluation_output_components,
+            128},
+      Limit{
+          shaderc_limit::shaderc_limit_max_tess_evaluation_texture_image_units,
+          16},
+      Limit{shaderc_limit::shaderc_limit_max_tess_evaluation_uniform_components,
+            1024},
+      Limit{shaderc_limit::shaderc_limit_max_tess_patch_components, 120},
+      Limit{shaderc_limit::shaderc_limit_max_patch_vertices, 32},
+      Limit{shaderc_limit::shaderc_limit_max_tess_gen_level, 64},
+      Limit{shaderc_limit::shaderc_limit_max_viewports, 16},
+      Limit{shaderc_limit::shaderc_limit_max_vertex_atomic_counters, 0},
+      Limit{shaderc_limit::shaderc_limit_max_tess_control_atomic_counters, 0},
+      Limit{shaderc_limit::shaderc_limit_max_tess_evaluation_atomic_counters,
+            0},
+      Limit{shaderc_limit::shaderc_limit_max_geometry_atomic_counters, 0},
+      Limit{shaderc_limit::shaderc_limit_max_fragment_atomic_counters, 8},
+      Limit{shaderc_limit::shaderc_limit_max_combined_atomic_counters, 8},
+      Limit{shaderc_limit::shaderc_limit_max_atomic_counter_bindings, 1},
+      Limit{shaderc_limit::shaderc_limit_max_vertex_atomic_counter_buffers, 0},
+      Limit{
+          shaderc_limit::shaderc_limit_max_tess_control_atomic_counter_buffers,
+          0},
+      Limit{shaderc_limit::
+                shaderc_limit_max_tess_evaluation_atomic_counter_buffers,
+            0},
+      Limit{shaderc_limit::shaderc_limit_max_geometry_atomic_counter_buffers,
+            0},
+      Limit{shaderc_limit::shaderc_limit_max_fragment_atomic_counter_buffers,
+            0},
+      Limit{shaderc_limit::shaderc_limit_max_combined_atomic_counter_buffers,
+            1},
+      Limit{shaderc_limit::shaderc_limit_max_atomic_counter_buffer_size, 32},
+      Limit{shaderc_limit::shaderc_limit_max_transform_feedback_buffers, 4},
+      Limit{shaderc_limit::
+                shaderc_limit_max_transform_feedback_interleaved_components,
+            64},
+      Limit{shaderc_limit::shaderc_limit_max_cull_distances, 8},
+      Limit{shaderc_limit::shaderc_limit_max_combined_clip_and_cull_distances,
+            8},
+      Limit{shaderc_limit::shaderc_limit_max_samples, 4},
+  };
+  for (auto& [limit, value] : limits) {
+    compiler_opts.SetLimit(limit, value);
+  }
+}
+
+static void SetBindingBaseOffset(shaderc::CompileOptions& options) {
+  constexpr uint32_t kBindingBaseOffset = 64;
+  static const shaderc_uniform_kind kUniformKinds[] = {
+      shaderc_uniform_kind::shaderc_uniform_kind_sampler,
+      shaderc_uniform_kind::shaderc_uniform_kind_texture,
+      shaderc_uniform_kind::shaderc_uniform_kind_image,
+      shaderc_uniform_kind::shaderc_uniform_kind_buffer,          // UBOs
+      shaderc_uniform_kind::shaderc_uniform_kind_storage_buffer,  // SSBOs
+  };
+
+  for (size_t i = 0u; i < sizeof(kUniformKinds) / sizeof(shaderc_uniform_kind);
+       i++) {
+    options.SetBindingBaseForStage(
+        shaderc_shader_kind::shaderc_fragment_shader,  //
+        kUniformKinds[i],                              //
+        kBindingBaseOffset                             //
+    );
+  }
+}
+
+//------------------------------------------------------------------------------
+/// @brief      Wraps a shared includer so unique includers may be created to
+///             satisfy the shaderc API. This is a simple proxy object and does
+///             nothing.
+///
+class UniqueIncluder final : public shaderc::CompileOptions::IncluderInterface {
+ public:
+  static std::unique_ptr<UniqueIncluder> Make(
+      std::shared_ptr<Includer> includer) {
+    return std::unique_ptr<UniqueIncluder>(
+        new UniqueIncluder(std::move(includer)));
+  }
+
+  // |shaderc::CompileOptions::IncluderInterface|
+  ~UniqueIncluder() = default;
+
+  // |shaderc::CompileOptions::IncluderInterface|
+  shaderc_include_result* GetInclude(const char* requested_source,
+                                     shaderc_include_type type,
+                                     const char* requesting_source,
+                                     size_t include_depth) override {
+    return includer_->GetInclude(requested_source,   //
+                                 type,               //
+                                 requesting_source,  //
+                                 include_depth       //
+    );
+  }
+
+  // |shaderc::CompileOptions::IncluderInterface|
+  void ReleaseInclude(shaderc_include_result* data) override {
+    return includer_->ReleaseInclude(data);
+  }
+
+ private:
+  std::shared_ptr<Includer> includer_;
+
+  explicit UniqueIncluder(std::shared_ptr<Includer> includer)
+      : includer_(std::move(includer)) {
+    FML_CHECK(includer_);
+  }
+
+  UniqueIncluder(const UniqueIncluder&) = delete;
+
+  UniqueIncluder& operator=(const UniqueIncluder&) = delete;
+};
+
+shaderc::CompileOptions SPIRVCompilerOptions::BuildShadercOptions() const {
+  shaderc::CompileOptions options;
+
+  SetDefaultLimitations(options);
+  SetBindingBaseOffset(options);
+
+  options.SetAutoBindUniforms(true);
+  options.SetAutoMapLocations(true);
+
+  options.SetOptimizationLevel(optimization_level);
+
+  if (generate_debug_info) {
+    options.SetGenerateDebugInfo();
+  }
+
+  if (source_langauge.has_value()) {
+    options.SetSourceLanguage(source_langauge.value());
+  }
+
+  if (source_profile.has_value()) {
+    options.SetForcedVersionProfile(source_profile->version,
+                                    source_profile->profile);
+  }
+
+  if (target.has_value()) {
+    options.SetTargetEnvironment(target->env, target->version);
+    options.SetTargetSpirv(target->spirv_version);
+  }
+
+  for (const auto& macro : macro_definitions) {
+    options.AddMacroDefinition(macro);
+  }
+
+  if (includer) {
+    options.SetIncluder(UniqueIncluder::Make(includer));
+  }
+
+  options.SetVulkanRulesRelaxed(relaxed_vulkan_rules);
+
+  return options;
+}
+
+}  // namespace compiler
+}  // namespace impeller
diff --git a/impeller/compiler/spirv_compiler.h b/impeller/compiler/spirv_compiler.h
new file mode 100644
index 0000000000000000000000000000000000000000..3798b6d53601d4bf2413fa915894a4c602c5c5f7
--- /dev/null
+++ b/impeller/compiler/spirv_compiler.h
@@ -0,0 +1,82 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_COMPILER_SPIRV_COMPILER_H_
+#define FLUTTER_IMPELLER_COMPILER_SPIRV_COMPILER_H_
+
+#include <cstdint>
+#include <vector>
+
+#include "flutter/fml/mapping.h"
+#include "impeller/compiler/includer.h"
+#include "impeller/compiler/source_options.h"
+#include "shaderc/shaderc.hpp"
+
+namespace impeller {
+namespace compiler {
+
+struct SPIRVCompilerSourceProfile {
+  shaderc_profile profile = shaderc_profile_core;
+  uint32_t version = 460;
+};
+
+struct SPIRVCompilerTargetEnv {
+  shaderc_target_env env = shaderc_target_env::shaderc_target_env_vulkan;
+  shaderc_env_version version =
+      shaderc_env_version::shaderc_env_version_vulkan_1_1;
+  shaderc_spirv_version spirv_version =
+      shaderc_spirv_version::shaderc_spirv_version_1_3;
+};
+
+struct SPIRVCompilerOptions {
+  bool generate_debug_info = true;
+  //----------------------------------------------------------------------------
+  // Source Options.
+  //----------------------------------------------------------------------------
+  std::optional<shaderc_source_language> source_langauge;
+  std::optional<SPIRVCompilerSourceProfile> source_profile;
+
+  shaderc_optimization_level optimization_level =
+      shaderc_optimization_level::shaderc_optimization_level_performance;
+
+  //----------------------------------------------------------------------------
+  // Target Options.
+  //----------------------------------------------------------------------------
+  std::optional<SPIRVCompilerTargetEnv> target;
+
+  std::vector<std::string> macro_definitions;
+
+  std::shared_ptr<Includer> includer;
+
+  bool relaxed_vulkan_rules = false;
+
+  shaderc::CompileOptions BuildShadercOptions() const;
+};
+
+class SPIRVCompiler {
+ public:
+  SPIRVCompiler(const SourceOptions& options,
+                std::shared_ptr<const fml::Mapping> sources);
+
+  ~SPIRVCompiler();
+
+  std::shared_ptr<fml::Mapping> CompileToSPV(
+      std::stringstream& error_stream,
+      const shaderc::CompileOptions& spirv_options) const;
+
+ private:
+  SourceOptions options_;
+  const std::shared_ptr<const fml::Mapping> sources_;
+
+  std::string GetSourcePrefix() const;
+
+  SPIRVCompiler(const SPIRVCompiler&) = delete;
+
+  SPIRVCompiler& operator=(const SPIRVCompiler&) = delete;
+};
+
+}  // namespace compiler
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_COMPILER_SPIRV_COMPILER_H_
diff --git a/impeller/compiler/spirv_sksl.cc b/impeller/compiler/spirv_sksl.cc
index 643f90e8d1da6a2aaed6db134b595b11d8ca22d7..b91df96e0e4868219b90767c5c1594453f177441 100644
--- a/impeller/compiler/spirv_sksl.cc
+++ b/impeller/compiler/spirv_sksl.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "impeller/compiler/spirv_sksl.h"
+#include "impeller/compiler/uniform_sorter.h"
 
 using namespace spv;
 using namespace SPIRV_CROSS_NAMESPACE;
@@ -219,47 +220,14 @@ bool CompilerSkSL::emit_uniform_resources() {
   bool emitted = false;
 
   // Output Uniform Constants (values, samplers, images, etc).
-  std::vector<ID> regular_uniforms;
-  std::vector<ID> shader_uniforms;
-  for (auto& id : ir.ids) {
-    if (id.get_type() == TypeVariable) {
-      auto& var = id.get<SPIRVariable>();
-      auto& type = get<SPIRType>(var.basetype);
-      if (var.storage != StorageClassFunction && !is_hidden_variable(var) &&
-          type.pointer &&
-          (type.storage == StorageClassUniformConstant ||
-           type.storage == StorageClassAtomicCounter)) {
-        // Separate out the uniforms that will be of SkSL 'shader' type since
-        // we need to make sure they are emitted only after the other uniforms.
-        if (type.basetype == SPIRType::SampledImage) {
-          shader_uniforms.push_back(var.self);
-        } else {
-          regular_uniforms.push_back(var.self);
-        }
-        emitted = true;
-      }
-    }
+  std::vector<ID> regular_uniforms =
+      SortUniforms(&ir, this, SPIRType::SampledImage, /*include=*/false);
+  std::vector<ID> shader_uniforms =
+      SortUniforms(&ir, this, SPIRType::SampledImage);
+  if (regular_uniforms.size() > 0 || shader_uniforms.size() > 0) {
+    emitted = true;
   }
 
-  // Sort uniforms by location.
-  auto compare_locations = [this](ID id1, ID id2) {
-    auto& flags1 = get_decoration_bitset(id1);
-    auto& flags2 = get_decoration_bitset(id2);
-    // Put the uniforms with no location after the ones that have a location.
-    if (!flags1.get(DecorationLocation)) {
-      return false;
-    }
-    if (!flags2.get(DecorationLocation)) {
-      return true;
-    }
-    // Sort in increasing order of location.
-    return get_decoration(id1, DecorationLocation) <
-           get_decoration(id2, DecorationLocation);
-  };
-  std::sort(regular_uniforms.begin(), regular_uniforms.end(),
-            compare_locations);
-  std::sort(shader_uniforms.begin(), shader_uniforms.end(), compare_locations);
-
   for (const auto& id : regular_uniforms) {
     auto& var = get<SPIRVariable>(id);
     emit_uniform(var);
@@ -327,6 +295,30 @@ bool CompilerSkSL::emit_global_variable_resources() {
   return emitted;
 }
 
+bool CompilerSkSL::emit_undefined_values() {
+  bool emitted = false;
+
+  ir.for_each_typed_id<SPIRUndef>([&](uint32_t, const SPIRUndef& undef) {
+    auto& type = this->get<SPIRType>(undef.basetype);
+    // OpUndef can be void for some reason ...
+    if (type.basetype == SPIRType::Void) {
+      return;
+    }
+
+    std::string initializer;
+    if (options.force_zero_initialized_variables &&
+        type_can_zero_initialize(type)) {
+      initializer = join(" = ", to_zero_initialized_expression(undef.basetype));
+    }
+
+    statement(variable_decl(type, to_name(undef.self), undef.self), initializer,
+              ";");
+    emitted = true;
+  });
+
+  return emitted;
+}
+
 void CompilerSkSL::emit_resources() {
   detect_unsupported_resources();
 
@@ -350,7 +342,9 @@ void CompilerSkSL::emit_resources() {
     statement("");
   }
 
-  declare_undefined_values();
+  if (emit_undefined_values()) {
+    statement("");
+  }
 }
 
 void CompilerSkSL::emit_interface_block(const SPIRVariable& var) {
@@ -402,7 +396,9 @@ void CompilerSkSL::emit_function_prototype(SPIRFunction& func,
   statement("void FLT_main()");
 }
 
-std::string CompilerSkSL::image_type_glsl(const SPIRType& type, uint32_t id) {
+std::string CompilerSkSL::image_type_glsl(const SPIRType& type,
+                                          uint32_t id,
+                                          bool member) {
   if (type.basetype != SPIRType::SampledImage || type.image.dim != Dim2D) {
     FLUTTER_CROSS_THROW("Only sampler2D uniform image types are supported.");
     return "???";
@@ -450,9 +446,8 @@ std::string CompilerSkSL::to_function_args(const TextureFunctionArguments& args,
   std::string glsl_args = CompilerGLSL::to_function_args(args, p_forward);
   // SkSL only supports coordinates. All other arguments to texture are
   // unsupported and will generate invalid SkSL.
-  if (args.grad_x || args.grad_y || args.lod || args.coffset || args.offset ||
-      args.sample || args.min_lod || args.sparse_texel || args.bias ||
-      args.component) {
+  if (args.grad_x || args.grad_y || args.lod || args.offset || args.sample ||
+      args.min_lod || args.sparse_texel || args.bias || args.component) {
     FLUTTER_CROSS_THROW(
         "Only sampler and position arguments are supported in texture() "
         "calls.");
@@ -473,7 +468,7 @@ std::string CompilerSkSL::to_function_args(const TextureFunctionArguments& args,
     return "()";
   }
 
-  return name + "_size * " + no_shader;
+  return name + "_size * (" + no_shader + ")";
 }
 
 }  // namespace compiler
diff --git a/impeller/compiler/spirv_sksl.h b/impeller/compiler/spirv_sksl.h
index 7469ba37df4c23c72c24b8dc22cc180e9043a096..0c21c4ee5ea271968268a35f7725b6ddf8587877 100644
--- a/impeller/compiler/spirv_sksl.h
+++ b/impeller/compiler/spirv_sksl.h
@@ -2,14 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_COMPILER_SPIRV_SKSL_H_
+#define FLUTTER_IMPELLER_COMPILER_SPIRV_SKSL_H_
 
+#include <cstdint>
 #include <memory>
 #include <utility>
 #include <variant>
 
 #include "flutter/fml/logging.h"
-#include "flutter/fml/macros.h"
 #include "spirv_glsl.hpp"
 
 namespace impeller {
@@ -46,6 +47,7 @@ class CompilerSkSL : public spirv_cross::CompilerGLSL {
   bool emit_uniform_resources();
   bool emit_output_resources();
   bool emit_global_variable_resources();
+  bool emit_undefined_values();
   void emit_resources();
 
   void emit_interface_block(const spirv_cross::SPIRVariable& var);
@@ -55,7 +57,8 @@ class CompilerSkSL : public spirv_cross::CompilerGLSL {
       const spirv_cross::Bitset& return_flags) override;
 
   std::string image_type_glsl(const spirv_cross::SPIRType& type,
-                              uint32_t id = 0) override;
+                              uint32_t id = 0,
+                              bool member = false) override;
 
   std::string builtin_to_glsl(spv::BuiltIn builtin,
                               spv::StorageClass storage) override;
@@ -77,3 +80,5 @@ class CompilerSkSL : public spirv_cross::CompilerGLSL {
 
 }  // namespace compiler
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_COMPILER_SPIRV_SKSL_H_
diff --git a/impeller/compiler/switches.cc b/impeller/compiler/switches.cc
index f37bf41ac5054e08d44416f6ab715b0a02b77b22..31ae74170786473b26f6283829c02e6fc267cb9a 100644
--- a/impeller/compiler/switches.cc
+++ b/impeller/compiler/switches.cc
@@ -10,6 +10,7 @@
 #include <map>
 
 #include "flutter/fml/file.h"
+#include "fml/command_line.h"
 #include "impeller/compiler/types.h"
 #include "impeller/compiler/utilities.h"
 
@@ -22,58 +23,93 @@ static const std::map<std::string, TargetPlatform> kKnownPlatforms = {
     {"vulkan", TargetPlatform::kVulkan},
     {"opengl-es", TargetPlatform::kOpenGLES},
     {"opengl-desktop", TargetPlatform::kOpenGLDesktop},
+};
+
+static const std::map<std::string, TargetPlatform> kKnownRuntimeStages = {
     {"sksl", TargetPlatform::kSkSL},
     {"runtime-stage-metal", TargetPlatform::kRuntimeStageMetal},
     {"runtime-stage-gles", TargetPlatform::kRuntimeStageGLES},
+    {"runtime-stage-vulkan", TargetPlatform::kRuntimeStageVulkan},
 };
 
 static const std::map<std::string, SourceType> kKnownSourceTypes = {
     {"vert", SourceType::kVertexShader},
     {"frag", SourceType::kFragmentShader},
-    {"tesc", SourceType::kTessellationControlShader},
-    {"tese", SourceType::kTessellationEvaluationShader},
     {"comp", SourceType::kComputeShader},
 };
 
 void Switches::PrintHelp(std::ostream& stream) {
+  // clang-format off
+  const std::string optional_prefix =          "[optional]          ";
+  const std::string optional_multiple_prefix = "[optional,multiple] ";
+  // clang-format on
+
   stream << std::endl;
   stream << "ImpellerC is an offline shader processor and reflection engine."
          << std::endl;
   stream << "---------------------------------------------------------------"
          << std::endl;
-  stream << "Valid Argument are:" << std::endl;
+  stream << "Expected invocation is:" << std::endl << std::endl;
+  stream << "./impellerc <One platform or multiple runtime stages> "
+            "--input=<source_file> --sl=<sl_output_file> <optional arguments>"
+         << std::endl
+         << std::endl;
+
+  stream << "Valid platforms are:" << std::endl << std::endl;
   stream << "One of [";
   for (const auto& platform : kKnownPlatforms) {
     stream << " --" << platform.first;
   }
-  stream << " ]" << std::endl;
-  stream << "--input=<source_file>" << std::endl;
-  stream << "[optional] --input-kind={";
+  stream << " ]" << std::endl << std::endl;
+
+  stream << "Valid runtime stages are:" << std::endl << std::endl;
+  stream << "At least one of [";
+  for (const auto& platform : kKnownRuntimeStages) {
+    stream << " --" << platform.first;
+  }
+  stream << " ]" << std::endl << std::endl;
+
+  stream << "Optional arguments:" << std::endl << std::endl;
+  stream << optional_prefix
+         << "--spirv=<spirv_output_file> (ignored for --shader-bundle)"
+         << std::endl;
+  stream << optional_prefix << "--input-type={";
   for (const auto& source_type : kKnownSourceTypes) {
     stream << source_type.first << ", ";
   }
   stream << "}" << std::endl;
-  stream << "--sl=<sl_output_file>" << std::endl;
-  stream << "--spirv=<spirv_output_file>" << std::endl;
-  stream << "[optional] --source-language=glsl|hlsl (default: glsl)"
+  stream << optional_prefix << "--source-language=glsl|hlsl (default: glsl)"
          << std::endl;
-  stream << "[optional] --entry-point=<entry_point_name> (default: main; "
+  stream << optional_prefix
+         << "--entry-point=<entry_point_name> (default: main; "
             "ignored for glsl)"
          << std::endl;
-  stream << "[optional] --iplr (causes --sl file to be emitted in iplr format)"
+  stream << optional_prefix
+         << "--iplr (causes --sl file to be emitted in "
+            "iplr format)"
          << std::endl;
-  stream << "[optional] --reflection-json=<reflection_json_file>" << std::endl;
-  stream << "[optional] --reflection-header=<reflection_header_file>"
+  stream << optional_prefix
+         << "--shader-bundle=<bundle_spec> (causes --sl "
+            "file to be "
+            "emitted in Flutter GPU's shader bundle format)"
          << std::endl;
-  stream << "[optional] --reflection-cc=<reflection_cc_file>" << std::endl;
-  stream << "[optional,multiple] --include=<include_directory>" << std::endl;
-  stream << "[optional,multiple] --define=<define>" << std::endl;
-  stream << "[optional] --depfile=<depfile_path>" << std::endl;
-  stream << "[optional] --gles-language-verision=<number>" << std::endl;
-  stream << "[optional] --json" << std::endl;
-  stream << "[optional] --remap-samplers (force metal sampler index to match "
-            "declared order)"
+  stream << optional_prefix << "--reflection-json=<reflection_json_file>"
          << std::endl;
+  stream << optional_prefix << "--reflection-header=<reflection_header_file>"
+         << std::endl;
+  stream << optional_prefix << "--reflection-cc=<reflection_cc_file>"
+         << std::endl;
+  stream << optional_multiple_prefix << "--include=<include_directory>"
+         << std::endl;
+  stream << optional_multiple_prefix << "--define=<define>" << std::endl;
+  stream << optional_prefix << "--depfile=<depfile_path>" << std::endl;
+  stream << optional_prefix << "--gles-language-version=<number>" << std::endl;
+  stream << optional_prefix << "--json" << std::endl;
+  stream << optional_prefix
+         << "--use-half-textures (force openGL semantics when "
+            "targeting metal)"
+         << std::endl;
+  stream << optional_prefix << "--require-framebuffer-fetch" << std::endl;
 }
 
 Switches::Switches() = default;
@@ -98,6 +134,17 @@ static TargetPlatform TargetPlatformFromCommandLine(
   return target;
 }
 
+static std::vector<TargetPlatform> RuntimeStagesFromCommandLine(
+    const fml::CommandLine& command_line) {
+  std::vector<TargetPlatform> stages;
+  for (const auto& platform : kKnownRuntimeStages) {
+    if (command_line.HasOption(platform.first)) {
+      stages.push_back(platform.second);
+    }
+  }
+  return stages;
+}
+
 static SourceType SourceTypeFromCommandLine(
     const fml::CommandLine& command_line) {
   auto source_type_option =
@@ -110,8 +157,7 @@ static SourceType SourceTypeFromCommandLine(
 }
 
 Switches::Switches(const fml::CommandLine& command_line)
-    : target_platform(TargetPlatformFromCommandLine(command_line)),
-      working_directory(std::make_shared<fml::UniqueFD>(fml::OpenDirectory(
+    : working_directory(std::make_shared<fml::UniqueFD>(fml::OpenDirectory(
           Utf8FromPath(std::filesystem::current_path()).c_str(),
           false,  // create if necessary,
           fml::FilePermission::kRead))),
@@ -119,6 +165,8 @@ Switches::Switches(const fml::CommandLine& command_line)
       input_type(SourceTypeFromCommandLine(command_line)),
       sl_file_name(command_line.GetOptionValueWithDefault("sl", "")),
       iplr(command_line.HasOption("iplr")),
+      shader_bundle(
+          command_line.GetOptionValueWithDefault("shader-bundle", "")),
       spirv_file_name(command_line.GetOptionValueWithDefault("spirv", "")),
       reflection_json_name(
           command_line.GetOptionValueWithDefault("reflection-json", "")),
@@ -128,26 +176,27 @@ Switches::Switches(const fml::CommandLine& command_line)
           command_line.GetOptionValueWithDefault("reflection-cc", "")),
       depfile_path(command_line.GetOptionValueWithDefault("depfile", "")),
       json_format(command_line.HasOption("json")),
-      remap_samplers(command_line.HasOption("remap-samplers")),
       gles_language_version(
           stoi(command_line.GetOptionValueWithDefault("gles-language-version",
                                                       "0"))),
+      metal_version(
+          command_line.GetOptionValueWithDefault("metal-version", "1.2")),
       entry_point(
-          command_line.GetOptionValueWithDefault("entry-point", "main")) {
+          command_line.GetOptionValueWithDefault("entry-point", "main")),
+      use_half_textures(command_line.HasOption("use-half-textures")),
+      require_framebuffer_fetch(
+          command_line.HasOption("require-framebuffer-fetch")),
+      target_platform_(TargetPlatformFromCommandLine(command_line)),
+      runtime_stages_(RuntimeStagesFromCommandLine(command_line)) {
+  auto language = ToLowerCase(
+      command_line.GetOptionValueWithDefault("source-language", "glsl"));
+
+  source_language = ToSourceLanguage(language);
+
   if (!working_directory || !working_directory->is_valid()) {
     return;
   }
 
-  auto language =
-      command_line.GetOptionValueWithDefault("source-language", "glsl");
-  std::transform(language.begin(), language.end(), language.begin(),
-                 [](char x) { return std::tolower(x); });
-  if (language == "glsl") {
-    source_language = SourceLanguage::kGLSL;
-  } else if (language == "hlsl") {
-    source_language = SourceLanguage::kHLSL;
-  }
-
   for (const auto& include_dir_path : command_line.GetOptionValues("include")) {
     if (!include_dir_path.data()) {
       continue;
@@ -188,38 +237,97 @@ Switches::Switches(const fml::CommandLine& command_line)
 }
 
 bool Switches::AreValid(std::ostream& explain) const {
+  // When producing a shader bundle, all flags related to single shader inputs
+  // and outputs such as `--input` and `--spirv-file-name` are ignored. Instead,
+  // input files are read from the shader bundle spec and a single flatbuffer
+  // containing all compiled shaders and reflection state is output to `--sl`.
+  const bool shader_bundle_mode = !shader_bundle.empty();
+
   bool valid = true;
-  if (target_platform == TargetPlatform::kUnknown) {
-    explain << "The target platform (only one) was not specified." << std::endl;
+  if (target_platform_ == TargetPlatform::kUnknown && runtime_stages_.empty() &&
+      !shader_bundle_mode) {
+    explain << "Either a target platform was not specified, or no runtime "
+               "stages were specified."
+            << std::endl;
     valid = false;
   }
 
-  if (source_language == SourceLanguage::kUnknown) {
+  if (source_language == SourceLanguage::kUnknown && !shader_bundle_mode) {
     explain << "Invalid source language type." << std::endl;
     valid = false;
   }
 
   if (!working_directory || !working_directory->is_valid()) {
-    explain << "Could not figure out working directory." << std::endl;
+    explain << "Could not open the working directory: \""
+            << Utf8FromPath(std::filesystem::current_path()).c_str() << "\""
+            << std::endl;
     valid = false;
   }
 
-  if (source_file_name.empty()) {
+  if (source_file_name.empty() && !shader_bundle_mode) {
     explain << "Input file name was empty." << std::endl;
     valid = false;
   }
 
-  if (sl_file_name.empty() && TargetPlatformNeedsSL(target_platform)) {
+  if (sl_file_name.empty()) {
     explain << "Target shading language file name was empty." << std::endl;
     valid = false;
   }
 
-  if (spirv_file_name.empty()) {
+  if (spirv_file_name.empty() && !shader_bundle_mode) {
     explain << "Spirv file name was empty." << std::endl;
     valid = false;
   }
+
+  if (iplr && shader_bundle_mode) {
+    explain << "--iplr and --shader-bundle flag cannot be specified at the "
+               "same time"
+            << std::endl;
+    valid = false;
+  }
+
   return valid;
 }
 
+std::vector<TargetPlatform> Switches::PlatformsToCompile() const {
+  if (target_platform_ == TargetPlatform::kUnknown) {
+    return runtime_stages_;
+  }
+  return {target_platform_};
+}
+
+TargetPlatform Switches::SelectDefaultTargetPlatform() const {
+  if (target_platform_ == TargetPlatform::kUnknown &&
+      !runtime_stages_.empty()) {
+    return runtime_stages_.front();
+  }
+  return target_platform_;
+}
+
+SourceOptions Switches::CreateSourceOptions(
+    std::optional<TargetPlatform> target_platform) const {
+  SourceOptions options;
+  options.target_platform =
+      target_platform.value_or(SelectDefaultTargetPlatform());
+  options.source_language = source_language;
+  if (input_type == SourceType::kUnknown) {
+    options.type = SourceTypeFromFileName(source_file_name);
+  } else {
+    options.type = input_type;
+  }
+  options.working_directory = working_directory;
+  options.file_name = source_file_name;
+  options.include_dirs = include_directories;
+  options.defines = defines;
+  options.entry_point_name = EntryPointFunctionNameFromSourceName(
+      source_file_name, options.type, options.source_language, entry_point);
+  options.json_format = json_format;
+  options.gles_language_version = gles_language_version;
+  options.metal_version = metal_version;
+  options.use_half_textures = use_half_textures;
+  options.require_framebuffer_fetch = require_framebuffer_fetch;
+  return options;
+}
+
 }  // namespace compiler
 }  // namespace impeller
diff --git a/impeller/compiler/switches.h b/impeller/compiler/switches.h
index 198c67590443efc2e4f1c12732a5d7e3cd54ce84..dd78bcddd7c88d13d28654b9eb0908f1a6a0194a 100644
--- a/impeller/compiler/switches.h
+++ b/impeller/compiler/switches.h
@@ -2,51 +2,75 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_COMPILER_SWITCHES_H_
+#define FLUTTER_IMPELLER_COMPILER_SWITCHES_H_
 
+#include <cstdint>
 #include <iostream>
 #include <memory>
 
 #include "flutter/fml/command_line.h"
-#include "flutter/fml/macros.h"
 #include "flutter/fml/unique_fd.h"
-#include "impeller/compiler/compiler.h"
 #include "impeller/compiler/include_dir.h"
+#include "impeller/compiler/source_options.h"
 #include "impeller/compiler/types.h"
 
 namespace impeller {
 namespace compiler {
 
-struct Switches {
-  TargetPlatform target_platform = TargetPlatform::kUnknown;
-  std::shared_ptr<fml::UniqueFD> working_directory;
-  std::vector<IncludeDir> include_directories;
-  std::string source_file_name;
-  SourceType input_type;
-  std::string sl_file_name;
-  bool iplr;
-  std::string spirv_file_name;
-  std::string reflection_json_name;
-  std::string reflection_header_name;
-  std::string reflection_cc_name;
-  std::string depfile_path;
-  std::vector<std::string> defines;
-  bool json_format;
-  bool remap_samplers;
+class Switches {
+ public:
+  std::shared_ptr<fml::UniqueFD> working_directory = nullptr;
+  std::vector<IncludeDir> include_directories = {};
+  std::string source_file_name = "";
+  SourceType input_type = SourceType::kUnknown;
+  /// The raw shader file output by the compiler. For --iplr and
+  /// --shader-bundle modes, this is used as the filename for the output
+  /// flatbuffer output.
+  std::string sl_file_name = "";
+  bool iplr = false;
+  std::string shader_bundle = "";
+  std::string spirv_file_name = "";
+  std::string reflection_json_name = "";
+  std::string reflection_header_name = "";
+  std::string reflection_cc_name = "";
+  std::string depfile_path = "";
+  std::vector<std::string> defines = {};
+  bool json_format = false;
   SourceLanguage source_language = SourceLanguage::kUnknown;
-  uint32_t gles_language_version;
-  std::string entry_point;
+  uint32_t gles_language_version = 0;
+  std::string metal_version = "";
+  std::string entry_point = "";
+  bool use_half_textures = false;
+  bool require_framebuffer_fetch = false;
 
   Switches();
 
   ~Switches();
 
-  Switches(const fml::CommandLine& command_line);
+  explicit Switches(const fml::CommandLine& command_line);
 
   bool AreValid(std::ostream& explain) const;
 
+  /// A vector containing at least one valid platform.
+  std::vector<TargetPlatform> PlatformsToCompile() const;
+  TargetPlatform SelectDefaultTargetPlatform() const;
+
+  // Creates source options from these switches for the specified
+  // TargetPlatform. Uses SelectDefaultTargetPlatform if not specified.
+  SourceOptions CreateSourceOptions(
+      std::optional<TargetPlatform> target_platform = std::nullopt) const;
+
   static void PrintHelp(std::ostream& stream);
+
+ private:
+  // Use |SelectDefaultTargetPlatform|.
+  TargetPlatform target_platform_ = TargetPlatform::kUnknown;
+  // Use |PlatformsToCompile|.
+  std::vector<TargetPlatform> runtime_stages_;
 };
 
 }  // namespace compiler
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_COMPILER_SWITCHES_H_
diff --git a/impeller/compiler/switches_unittests.cc b/impeller/compiler/switches_unittests.cc
index b86efe30403febc35b7f45cdef82fca999815755..fd1591e193f0d117e556bbbae74be608e9f3196d 100644
--- a/impeller/compiler/switches_unittests.cc
+++ b/impeller/compiler/switches_unittests.cc
@@ -69,6 +69,30 @@ TEST(SwitchesTest, EntryPointCanBeSetForHLSL) {
   ASSERT_EQ(switches.entry_point, "CustomEntryPoint");
 }
 
+TEST(SwitchesTEst, ConvertToEntrypointName) {
+  ASSERT_EQ(ConvertToEntrypointName("mandelbrot_unrolled"),
+            "mandelbrot_unrolled");
+  ASSERT_EQ(ConvertToEntrypointName("mandelbrot-unrolled"),
+            "mandelbrotunrolled");
+  ASSERT_EQ(ConvertToEntrypointName("7_"), "i_7_");
+  ASSERT_EQ(ConvertToEntrypointName("415"), "i_415");
+  ASSERT_EQ(ConvertToEntrypointName("#$%"), "i_");
+  ASSERT_EQ(ConvertToEntrypointName(""), "");
+}
+
+TEST(SwitchesTest, ShaderBundleModeValid) {
+  // Shader bundles process multiple shaders, and so the single-file input/spirv
+  // flags are not required.
+  std::vector<const char*> options = {
+      "--shader-bundle={}", "--sl=test.shaderbundle", "--runtime-stage-metal"};
+
+  auto cl = fml::CommandLineFromIteratorsWithArgv0("impellerc", options.begin(),
+                                                   options.end());
+  Switches switches(cl);
+  ASSERT_TRUE(switches.AreValid(std::cout));
+  ASSERT_EQ(switches.shader_bundle, "{}");
+}
+
 }  // namespace testing
 }  // namespace compiler
 }  // namespace impeller
diff --git a/impeller/compiler/types.cc b/impeller/compiler/types.cc
index 08b4eb9b14c7abf679ed049224047bcf3860c646..2368bcd20fbec4f12644f21955cd0ed561a6e96a 100644
--- a/impeller/compiler/types.cc
+++ b/impeller/compiler/types.cc
@@ -4,6 +4,7 @@
 
 #include "impeller/compiler/types.h"
 
+#include <cctype>
 #include <filesystem>
 #include <sstream>
 
@@ -35,21 +36,41 @@ SourceType SourceTypeFromFileName(const std::string& file_name) {
     return SourceType::kFragmentShader;
   }
 
-  if (StringEndWith(file_name, ".tesc")) {
-    return SourceType::kTessellationControlShader;
+  if (StringEndWith(file_name, ".comp")) {
+    return SourceType::kComputeShader;
   }
 
-  if (StringEndWith(file_name, ".tese")) {
-    return SourceType::kTessellationEvaluationShader;
+  return SourceType::kUnknown;
+}
+
+SourceType SourceTypeFromString(std::string name) {
+  name = ToLowerCase(name);
+
+  if (name == "vertex") {
+    return SourceType::kVertexShader;
   }
 
-  if (StringEndWith(file_name, ".comp")) {
+  if (name == "fragment") {
+    return SourceType::kFragmentShader;
+  }
+
+  if (name == "compute") {
     return SourceType::kComputeShader;
   }
 
   return SourceType::kUnknown;
 }
 
+SourceLanguage ToSourceLanguage(const std::string& source_language) {
+  if (source_language == "glsl") {
+    return SourceLanguage::kGLSL;
+  }
+  if (source_language == "hlsl") {
+    return SourceLanguage::kHLSL;
+  }
+  return SourceLanguage::kUnknown;
+}
+
 std::string TargetPlatformToString(TargetPlatform platform) {
   switch (platform) {
     case TargetPlatform::kUnknown:
@@ -68,6 +89,8 @@ std::string TargetPlatformToString(TargetPlatform platform) {
       return "RuntimeStageMetal";
     case TargetPlatform::kRuntimeStageGLES:
       return "RuntimeStageGLES";
+    case TargetPlatform::kRuntimeStageVulkan:
+      return "RuntimeStageVulkan";
     case TargetPlatform::kSkSL:
       return "SkSL";
   }
@@ -96,7 +119,7 @@ std::string EntryPointFunctionNameFromSourceName(
 
   std::stringstream stream;
   std::filesystem::path file_path(file_name);
-  stream << Utf8FromPath(file_path.stem()) << "_";
+  stream << ConvertToEntrypointName(Utf8FromPath(file_path.stem())) << "_";
   switch (type) {
     case SourceType::kUnknown:
       stream << "unknown";
@@ -107,12 +130,6 @@ std::string EntryPointFunctionNameFromSourceName(
     case SourceType::kFragmentShader:
       stream << "fragment";
       break;
-    case SourceType::kTessellationControlShader:
-      stream << "tess_control";
-      break;
-    case SourceType::kTessellationEvaluationShader:
-      stream << "tess_eval";
-      break;
     case SourceType::kComputeShader:
       stream << "compute";
       break;
@@ -121,23 +138,6 @@ std::string EntryPointFunctionNameFromSourceName(
   return stream.str();
 }
 
-bool TargetPlatformNeedsSL(TargetPlatform platform) {
-  switch (platform) {
-    case TargetPlatform::kMetalIOS:
-    case TargetPlatform::kMetalDesktop:
-    case TargetPlatform::kOpenGLES:
-    case TargetPlatform::kOpenGLDesktop:
-    case TargetPlatform::kRuntimeStageMetal:
-    case TargetPlatform::kRuntimeStageGLES:
-    case TargetPlatform::kSkSL:
-    case TargetPlatform::kVulkan:
-      return true;
-    case TargetPlatform::kUnknown:
-      return false;
-  }
-  FML_UNREACHABLE();
-}
-
 bool TargetPlatformNeedsReflection(TargetPlatform platform) {
   switch (platform) {
     case TargetPlatform::kMetalIOS:
@@ -146,6 +146,7 @@ bool TargetPlatformNeedsReflection(TargetPlatform platform) {
     case TargetPlatform::kOpenGLDesktop:
     case TargetPlatform::kRuntimeStageMetal:
     case TargetPlatform::kRuntimeStageGLES:
+    case TargetPlatform::kRuntimeStageVulkan:
     case TargetPlatform::kVulkan:
       return true;
     case TargetPlatform::kUnknown:
@@ -173,7 +174,7 @@ std::string ShaderCErrorToString(shaderc_compilation_status status) {
     case Status::shaderc_compilation_status_validation_error:
       return "Validation error";
     case Status::shaderc_compilation_status_transformation_error:
-      return "Transformation error";
+      return "Transform error";
     case Status::shaderc_compilation_status_configuration_error:
       return "Configuration error";
   }
@@ -186,10 +187,6 @@ shaderc_shader_kind ToShaderCShaderKind(SourceType type) {
       return shaderc_shader_kind::shaderc_vertex_shader;
     case SourceType::kFragmentShader:
       return shaderc_shader_kind::shaderc_fragment_shader;
-    case SourceType::kTessellationControlShader:
-      return shaderc_shader_kind::shaderc_tess_control_shader;
-    case SourceType::kTessellationEvaluationShader:
-      return shaderc_shader_kind::shaderc_tess_evaluation_shader;
     case SourceType::kComputeShader:
       return shaderc_shader_kind::shaderc_compute_shader;
     case SourceType::kUnknown:
@@ -204,10 +201,6 @@ spv::ExecutionModel ToExecutionModel(SourceType type) {
       return spv::ExecutionModel::ExecutionModelVertex;
     case SourceType::kFragmentShader:
       return spv::ExecutionModel::ExecutionModelFragment;
-    case SourceType::kTessellationControlShader:
-      return spv::ExecutionModel::ExecutionModelTessellationControl;
-    case SourceType::kTessellationEvaluationShader:
-      return spv::ExecutionModel::ExecutionModelTessellationEvaluation;
     case SourceType::kComputeShader:
       return spv::ExecutionModel::ExecutionModelGLCompute;
     case SourceType::kUnknown:
@@ -228,6 +221,7 @@ spirv_cross::CompilerMSL::Options::Platform TargetPlatformToMSLPlatform(
     case TargetPlatform::kOpenGLES:
     case TargetPlatform::kOpenGLDesktop:
     case TargetPlatform::kRuntimeStageGLES:
+    case TargetPlatform::kRuntimeStageVulkan:
     case TargetPlatform::kVulkan:
     case TargetPlatform::kUnknown:
       return spirv_cross::CompilerMSL::Options::Platform::macOS;
@@ -243,10 +237,6 @@ std::string SourceTypeToString(SourceType type) {
       return "vert";
     case SourceType::kFragmentShader:
       return "frag";
-    case SourceType::kTessellationControlShader:
-      return "tesc";
-    case SourceType::kTessellationEvaluationShader:
-      return "tese";
     case SourceType::kComputeShader:
       return "comp";
   }
@@ -267,6 +257,7 @@ std::string TargetPlatformSLExtension(TargetPlatform platform) {
     case TargetPlatform::kRuntimeStageGLES:
       return "glsl";
     case TargetPlatform::kVulkan:
+    case TargetPlatform::kRuntimeStageVulkan:
       return "vk.spirv";
   }
   FML_UNREACHABLE();
@@ -280,6 +271,7 @@ bool TargetPlatformIsOpenGL(TargetPlatform platform) {
       return true;
     case TargetPlatform::kMetalDesktop:
     case TargetPlatform::kRuntimeStageMetal:
+    case TargetPlatform::kRuntimeStageVulkan:
     case TargetPlatform::kMetalIOS:
     case TargetPlatform::kUnknown:
     case TargetPlatform::kSkSL:
@@ -300,7 +292,26 @@ bool TargetPlatformIsMetal(TargetPlatform platform) {
     case TargetPlatform::kOpenGLES:
     case TargetPlatform::kOpenGLDesktop:
     case TargetPlatform::kRuntimeStageGLES:
+    case TargetPlatform::kRuntimeStageVulkan:
+    case TargetPlatform::kVulkan:
+      return false;
+  }
+  FML_UNREACHABLE();
+}
+
+bool TargetPlatformIsVulkan(TargetPlatform platform) {
+  switch (platform) {
+    case TargetPlatform::kRuntimeStageVulkan:
     case TargetPlatform::kVulkan:
+      return true;
+    case TargetPlatform::kMetalDesktop:
+    case TargetPlatform::kMetalIOS:
+    case TargetPlatform::kRuntimeStageMetal:
+    case TargetPlatform::kUnknown:
+    case TargetPlatform::kSkSL:
+    case TargetPlatform::kOpenGLES:
+    case TargetPlatform::kOpenGLDesktop:
+    case TargetPlatform::kRuntimeStageGLES:
       return false;
   }
   FML_UNREACHABLE();
@@ -311,6 +322,7 @@ bool TargetPlatformBundlesSkSL(TargetPlatform platform) {
     case TargetPlatform::kSkSL:
     case TargetPlatform::kRuntimeStageMetal:
     case TargetPlatform::kRuntimeStageGLES:
+    case TargetPlatform::kRuntimeStageVulkan:
       return true;
     case TargetPlatform::kMetalDesktop:
     case TargetPlatform::kMetalIOS:
diff --git a/impeller/compiler/types.h b/impeller/compiler/types.h
index 78a630805a6cc5ec720e1e7cf1a37792c15f4f7f..c41423014071f6a5f44ec8fa24395160a9b47a30 100644
--- a/impeller/compiler/types.h
+++ b/impeller/compiler/types.h
@@ -2,10 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_COMPILER_TYPES_H_
+#define FLUTTER_IMPELLER_COMPILER_TYPES_H_
 
 #include <codecvt>
 #include <locale>
+#include <map>
+#include <optional>
 #include <string>
 
 #include "flutter/fml/macros.h"
@@ -20,8 +23,6 @@ enum class SourceType {
   kUnknown,
   kVertexShader,
   kFragmentShader,
-  kTessellationControlShader,
-  kTessellationEvaluationShader,
   kComputeShader,
 };
 
@@ -34,6 +35,7 @@ enum class TargetPlatform {
   kVulkan,
   kRuntimeStageMetal,
   kRuntimeStageGLES,
+  kRuntimeStageVulkan,
   kSkSL,
 };
 
@@ -43,16 +45,57 @@ enum class SourceLanguage {
   kHLSL,
 };
 
+struct UniformDescription {
+  std::string name;
+  size_t location = 0u;
+  spirv_cross::SPIRType::BaseType type = spirv_cross::SPIRType::BaseType::Float;
+  size_t rows = 0u;
+  size_t columns = 0u;
+  size_t bit_width = 0u;
+  std::optional<size_t> array_elements = std::nullopt;
+  std::vector<uint8_t> struct_layout = {};
+  size_t struct_float_count = 0u;
+};
+
+struct InputDescription {
+  std::string name;
+  size_t location;
+  size_t set;
+  size_t binding;
+  spirv_cross::SPIRType::BaseType type =
+      spirv_cross::SPIRType::BaseType::Unknown;
+  size_t bit_width;
+  size_t vec_size;
+  size_t columns;
+  size_t offset;
+};
+
+/// A shader config parsed as part of a ShaderBundleConfig.
+struct ShaderConfig {
+  std::string source_file_name;
+  SourceType type;
+  SourceLanguage language;
+  std::string entry_point;
+};
+
+using ShaderBundleConfig = std::unordered_map<std::string, ShaderConfig>;
+
 bool TargetPlatformIsMetal(TargetPlatform platform);
 
 bool TargetPlatformIsOpenGL(TargetPlatform platform);
 
+bool TargetPlatformIsVulkan(TargetPlatform platform);
+
 SourceType SourceTypeFromFileName(const std::string& file_name);
 
+SourceType SourceTypeFromString(std::string name);
+
 std::string SourceTypeToString(SourceType type);
 
 std::string TargetPlatformToString(TargetPlatform platform);
 
+SourceLanguage ToSourceLanguage(const std::string& source_language);
+
 std::string SourceLanguageToString(SourceLanguage source_language);
 
 std::string TargetPlatformSLExtension(TargetPlatform platform);
@@ -63,8 +106,6 @@ std::string EntryPointFunctionNameFromSourceName(
     SourceLanguage source_language,
     const std::string& entry_point_name);
 
-bool TargetPlatformNeedsSL(TargetPlatform platform);
-
 bool TargetPlatformNeedsReflection(TargetPlatform platform);
 
 bool TargetPlatformBundlesSkSL(TargetPlatform platform);
@@ -80,3 +121,5 @@ spirv_cross::CompilerMSL::Options::Platform TargetPlatformToMSLPlatform(
 
 }  // namespace compiler
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_COMPILER_TYPES_H_
diff --git a/impeller/compiler/uniform_sorter.cc b/impeller/compiler/uniform_sorter.cc
new file mode 100644
index 0000000000000000000000000000000000000000..83b8619cef6e5ce3c033a5f0532f50866230d99d
--- /dev/null
+++ b/impeller/compiler/uniform_sorter.cc
@@ -0,0 +1,50 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/compiler/uniform_sorter.h"
+
+#include <cstdint>
+
+namespace impeller {
+
+std::vector<spirv_cross::ID> SortUniforms(
+    const spirv_cross::ParsedIR* ir,
+    const spirv_cross::Compiler* compiler,
+    std::optional<spirv_cross::SPIRType::BaseType> type_filter,
+    bool include) {
+  // Sort the IR so that the uniforms are in declaration order.
+  std::vector<spirv_cross::ID> uniforms;
+  ir->for_each_typed_id<spirv_cross::SPIRVariable>(
+      [&](uint32_t, const spirv_cross::SPIRVariable& var) {
+        if (var.storage != spv::StorageClassUniformConstant) {
+          return;
+        }
+        const auto& type = compiler->get_type(var.basetype);
+        if (!type_filter.has_value() ||
+            (include && type_filter.value() == type.basetype) ||
+            (!include && type_filter.value() != type.basetype)) {
+          uniforms.push_back(var.self);
+        }
+      });
+
+  auto compare_locations = [&ir](spirv_cross::ID id1, spirv_cross::ID id2) {
+    auto& flags1 = ir->get_decoration_bitset(id1);
+    auto& flags2 = ir->get_decoration_bitset(id2);
+    // Put the uniforms with no location after the ones that have a location.
+    if (!flags1.get(spv::Decoration::DecorationLocation)) {
+      return false;
+    }
+    if (!flags2.get(spv::Decoration::DecorationLocation)) {
+      return true;
+    }
+    // Sort in increasing order of location.
+    return ir->get_decoration(id1, spv::Decoration::DecorationLocation) <
+           ir->get_decoration(id2, spv::Decoration::DecorationLocation);
+  };
+  std::sort(uniforms.begin(), uniforms.end(), compare_locations);
+
+  return uniforms;
+}
+
+}  // namespace impeller
diff --git a/impeller/compiler/uniform_sorter.h b/impeller/compiler/uniform_sorter.h
new file mode 100644
index 0000000000000000000000000000000000000000..3493f60b38b3320e3159ec5bd2257dc1d98f7941
--- /dev/null
+++ b/impeller/compiler/uniform_sorter.h
@@ -0,0 +1,30 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_COMPILER_UNIFORM_SORTER_H_
+#define FLUTTER_IMPELLER_COMPILER_UNIFORM_SORTER_H_
+
+#include <optional>
+
+#include "impeller/compiler/compiler_backend.h"
+
+#include "spirv_msl.hpp"
+#include "spirv_parser.hpp"
+
+namespace impeller {
+
+/// @brief Sorts uniform declarations in an IR according to decoration order.
+///
+/// The [type_filter] may be optionally supplied to limit which types are
+/// returned The [include] value can be set to false change this filter to
+/// exclude instead of include.
+std::vector<spirv_cross::ID> SortUniforms(
+    const spirv_cross::ParsedIR* ir,
+    const spirv_cross::Compiler* compiler,
+    std::optional<spirv_cross::SPIRType::BaseType> type_filter = std::nullopt,
+    bool include = true);
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_COMPILER_UNIFORM_SORTER_H_
diff --git a/impeller/compiler/utilities.cc b/impeller/compiler/utilities.cc
index 50dd3192f23d4e10082e03358d3aedb9b0704e6f..ef24dc1681a5d422a3561fda64ba629fa94cf00e 100644
--- a/impeller/compiler/utilities.cc
+++ b/impeller/compiler/utilities.cc
@@ -4,13 +4,29 @@
 
 #include "impeller/compiler/utilities.h"
 
+#include <algorithm>
 #include <cctype>
 #include <filesystem>
+#include <iostream>
 #include <sstream>
 
 namespace impeller {
 namespace compiler {
 
+bool SetPermissiveAccess(const std::filesystem::path& p) {
+  auto permissions =
+      std::filesystem::perms::owner_read | std::filesystem::perms::owner_write |
+      std::filesystem::perms::group_read | std::filesystem::perms::others_read;
+  std::error_code error;
+  std::filesystem::permissions(p, permissions, error);
+  if (error) {
+    std::cerr << "Failed to set access on file '" << p
+              << "': " << error.message() << std::endl;
+    return false;
+  }
+  return true;
+}
+
 std::string Utf8FromPath(const std::filesystem::path& path) {
   return reinterpret_cast<const char*>(path.u8string().c_str());
 }
@@ -20,7 +36,7 @@ std::string InferShaderNameFromPath(std::string_view path) {
   return Utf8FromPath(p);
 }
 
-std::string ConvertToCamelCase(std::string_view string) {
+std::string ToCamelCase(std::string_view string) {
   if (string.empty()) {
     return "";
   }
@@ -43,5 +59,42 @@ std::string ConvertToCamelCase(std::string_view string) {
   return stream.str();
 }
 
+std::string ToLowerCase(std::string_view string) {
+  std::string result = std::string(string);
+  std::transform(result.begin(), result.end(), result.begin(),
+                 [](char x) { return std::tolower(x); });
+  return result;
+}
+
+std::string ConvertToEntrypointName(std::string_view string) {
+  if (string.empty()) {
+    return "";
+  }
+  std::stringstream stream;
+  // Append a prefix if the first character is not a letter.
+  if (!std::isalpha(string.data()[0])) {
+    stream << "i_";
+  }
+  for (size_t i = 0, count = string.length(); i < count; i++) {
+    auto ch = string.data()[i];
+    if (std::isalnum(ch) || ch == '_') {
+      stream << ch;
+    }
+  }
+  return stream.str();
+}
+
+bool StringStartsWith(const std::string& target, const std::string& prefix) {
+  if (prefix.length() > target.length()) {
+    return false;
+  }
+  for (size_t i = 0; i < prefix.length(); i++) {
+    if (target[i] != prefix[i]) {
+      return false;
+    }
+  }
+  return true;
+}
+
 }  // namespace compiler
 }  // namespace impeller
diff --git a/impeller/compiler/utilities.h b/impeller/compiler/utilities.h
index 61af436a87401a116432a4cb5eccb13920c8b23e..6da83478ece7961492e11853ce6470d132671fcd 100644
--- a/impeller/compiler/utilities.h
+++ b/impeller/compiler/utilities.h
@@ -2,17 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_COMPILER_UTILITIES_H_
+#define FLUTTER_IMPELLER_COMPILER_UTILITIES_H_
 
 #include <filesystem>
 #include <string>
 #include <string_view>
 
-#include "flutter/fml/macros.h"
-
 namespace impeller {
 namespace compiler {
 
+/// @brief  Sets the file access mode of the file at path 'p' to 0644.
+bool SetPermissiveAccess(const std::filesystem::path& p);
+
 /// @brief  Converts a native format path to a utf8 string.
 ///
 ///         This utility uses `path::u8string()` to convert native paths to
@@ -23,7 +25,17 @@ std::string Utf8FromPath(const std::filesystem::path& path);
 
 std::string InferShaderNameFromPath(std::string_view path);
 
-std::string ConvertToCamelCase(std::string_view string);
+std::string ToCamelCase(std::string_view string);
+
+std::string ToLowerCase(std::string_view string);
+
+/// @brief  Ensure that the entrypoint name is a valid identifier in the target
+///         language.
+std::string ConvertToEntrypointName(std::string_view string);
+
+bool StringStartsWith(const std::string& target, const std::string& prefix);
 
 }  // namespace compiler
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_COMPILER_UTILITIES_H_
diff --git a/impeller/core/BUILD.gn b/impeller/core/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..e4587bda12a832f132f0d92a34ea66b086cf299c
--- /dev/null
+++ b/impeller/core/BUILD.gn
@@ -0,0 +1,62 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//flutter/impeller/tools/impeller.gni")
+
+impeller_component("core") {
+  sources = [
+    "allocator.cc",
+    "allocator.h",
+    "buffer_view.cc",
+    "buffer_view.h",
+    "capture.cc",
+    "capture.h",
+    "device_buffer.cc",
+    "device_buffer.h",
+    "device_buffer_descriptor.cc",
+    "device_buffer_descriptor.h",
+    "formats.cc",
+    "formats.h",
+    "host_buffer.cc",
+    "host_buffer.h",
+    "platform.cc",
+    "platform.h",
+    "range.cc",
+    "range.h",
+    "resource_binder.cc",
+    "resource_binder.h",
+    "runtime_types.cc",
+    "runtime_types.h",
+    "sampler.cc",
+    "sampler.h",
+    "sampler_descriptor.cc",
+    "sampler_descriptor.h",
+    "shader_types.cc",
+    "shader_types.h",
+    "texture.cc",
+    "texture.h",
+    "texture_descriptor.cc",
+    "texture_descriptor.h",
+    "vertex_buffer.cc",
+    "vertex_buffer.h",
+  ]
+
+  deps = [
+    "../base",
+    "../geometry",
+    "//flutter/fml",
+  ]
+}
+
+impeller_component("allocator_unittests") {
+  testonly = true
+
+  sources = [ "allocator_unittests.cc" ]
+
+  deps = [
+    ":core",
+    "../geometry",
+    "//flutter/testing:testing_lib",
+  ]
+}
diff --git a/impeller/renderer/allocator.cc b/impeller/core/allocator.cc
similarity index 70%
rename from impeller/renderer/allocator.cc
rename to impeller/core/allocator.cc
index 297cb48f2a4d9cd42123ba786baa76d85080d084..19314c5bfcd59a4c4b09b09aad22c22f624ff21e 100644
--- a/impeller/renderer/allocator.cc
+++ b/impeller/core/allocator.cc
@@ -2,11 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/renderer/allocator.h"
+#include "impeller/core/allocator.h"
 
 #include "impeller/base/validation.h"
-#include "impeller/renderer/device_buffer.h"
-#include "impeller/renderer/range.h"
+#include "impeller/core/device_buffer.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/range.h"
 
 namespace impeller {
 
@@ -49,12 +50,19 @@ std::shared_ptr<Texture> Allocator::CreateTexture(
     const TextureDescriptor& desc) {
   const auto max_size = GetMaxTextureSizeSupported();
   if (desc.size.width > max_size.width || desc.size.height > max_size.height) {
-    VALIDATION_LOG
-        << "Requested texture size exceeds maximum supported size of "
-        << desc.size;
+    VALIDATION_LOG << "Requested texture size " << desc.size
+                   << " exceeds maximum supported size of " << max_size;
     return nullptr;
   }
 
+  if (desc.mip_count > desc.size.MipCount()) {
+    VALIDATION_LOG << "Requested mip_count " << desc.mip_count
+                   << " exceeds maximum supported for size " << desc.size;
+    TextureDescriptor corrected_desc = desc;
+    corrected_desc.mip_count = desc.size.MipCount();
+    return OnCreateTexture(corrected_desc);
+  }
+
   return OnCreateTexture(desc);
 }
 
diff --git a/impeller/renderer/allocator.h b/impeller/core/allocator.h
similarity index 70%
rename from impeller/renderer/allocator.h
rename to impeller/core/allocator.h
index 6dfec0652f2074c7d7fcb91f90f7edcd1e17e8a7..38ac054d364238175c58430d943e034cb56b99fb 100644
--- a/impeller/renderer/allocator.h
+++ b/impeller/core/allocator.h
@@ -2,20 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_CORE_ALLOCATOR_H_
+#define FLUTTER_IMPELLER_CORE_ALLOCATOR_H_
 
-#include <string>
-
-#include "flutter/fml/macros.h"
 #include "flutter/fml/mapping.h"
-#include "impeller/renderer/device_buffer_descriptor.h"
-#include "impeller/renderer/texture_descriptor.h"
+#include "impeller/core/device_buffer_descriptor.h"
+#include "impeller/core/texture.h"
+#include "impeller/core/texture_descriptor.h"
+#include "impeller/geometry/size.h"
 
 namespace impeller {
 
 class Context;
 class DeviceBuffer;
-class Texture;
 
 //------------------------------------------------------------------------------
 /// @brief      An object that allocates device memory.
@@ -45,6 +44,12 @@ class Allocator {
 
   virtual ISize GetMaxTextureSizeSupported() const = 0;
 
+  /// @brief Write debug memory usage information to the dart timeline in debug
+  ///        and profile modes.
+  ///
+  ///        This is only supported on the Vulkan backend.
+  virtual void DebugTraceMemoryStatistics() const {};
+
  protected:
   Allocator();
 
@@ -55,7 +60,11 @@ class Allocator {
       const TextureDescriptor& desc) = 0;
 
  private:
-  FML_DISALLOW_COPY_AND_ASSIGN(Allocator);
+  Allocator(const Allocator&) = delete;
+
+  Allocator& operator=(const Allocator&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_CORE_ALLOCATOR_H_
diff --git a/impeller/core/allocator_unittests.cc b/impeller/core/allocator_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c0c2268dfb151855f54f7f4327b8597aa06c960e
--- /dev/null
+++ b/impeller/core/allocator_unittests.cc
@@ -0,0 +1,83 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <memory>
+#include "flutter/testing/testing.h"
+#include "impeller/core/allocator.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/texture_descriptor.h"
+#include "impeller/geometry/size.h"
+#include "impeller/renderer/testing/mocks.h"
+
+namespace impeller {
+namespace testing {
+
+TEST(AllocatorTest, TextureDescriptorCompatibility) {
+  // Size.
+  {
+    TextureDescriptor desc_a = {.size = ISize(100, 100)};
+    TextureDescriptor desc_b = {.size = ISize(100, 100)};
+    TextureDescriptor desc_c = {.size = ISize(101, 100)};
+
+    ASSERT_EQ(desc_a, desc_b);
+    ASSERT_NE(desc_a, desc_c);
+  }
+  // Storage Mode.
+  {
+    TextureDescriptor desc_a = {.storage_mode = StorageMode::kDevicePrivate};
+    TextureDescriptor desc_b = {.storage_mode = StorageMode::kDevicePrivate};
+    TextureDescriptor desc_c = {.storage_mode = StorageMode::kHostVisible};
+
+    ASSERT_EQ(desc_a, desc_b);
+    ASSERT_NE(desc_a, desc_c);
+  }
+  // Format.
+  {
+    TextureDescriptor desc_a = {.format = PixelFormat::kR8G8B8A8UNormInt};
+    TextureDescriptor desc_b = {.format = PixelFormat::kR8G8B8A8UNormInt};
+    TextureDescriptor desc_c = {.format = PixelFormat::kB10G10R10A10XR};
+
+    ASSERT_EQ(desc_a, desc_b);
+    ASSERT_NE(desc_a, desc_c);
+  }
+  // Sample Count.
+  {
+    TextureDescriptor desc_a = {.sample_count = SampleCount::kCount4};
+    TextureDescriptor desc_b = {.sample_count = SampleCount::kCount4};
+    TextureDescriptor desc_c = {.sample_count = SampleCount::kCount1};
+
+    ASSERT_EQ(desc_a, desc_b);
+    ASSERT_NE(desc_a, desc_c);
+  }
+  // Sample Count.
+  {
+    TextureDescriptor desc_a = {.type = TextureType::kTexture2DMultisample};
+    TextureDescriptor desc_b = {.type = TextureType::kTexture2DMultisample};
+    TextureDescriptor desc_c = {.type = TextureType::kTexture2D};
+
+    ASSERT_EQ(desc_a, desc_b);
+    ASSERT_NE(desc_a, desc_c);
+  }
+  // Compression.
+  {
+    TextureDescriptor desc_a = {.compression_type = CompressionType::kLossless};
+    TextureDescriptor desc_b = {.compression_type = CompressionType::kLossless};
+    TextureDescriptor desc_c = {.compression_type = CompressionType::kLossy};
+
+    ASSERT_EQ(desc_a, desc_b);
+    ASSERT_NE(desc_a, desc_c);
+  }
+  // Mip Count.
+  {
+    TextureDescriptor desc_a = {.mip_count = 1};
+    TextureDescriptor desc_b = {.mip_count = 1};
+    TextureDescriptor desc_c = {.mip_count = 4};
+
+    ASSERT_EQ(desc_a, desc_b);
+    ASSERT_NE(desc_a, desc_c);
+  }
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/renderer/buffer_view.cc b/impeller/core/buffer_view.cc
similarity index 83%
rename from impeller/renderer/buffer_view.cc
rename to impeller/core/buffer_view.cc
index a52f369c8dc8a76f17bfe41a997d1e5ab6506dd9..8d0887a3b59d736b9311b6f62c339bc5d0c7f199 100644
--- a/impeller/renderer/buffer_view.cc
+++ b/impeller/core/buffer_view.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/renderer/buffer_view.h"
+#include "impeller/core/buffer_view.h"
 
 namespace impeller {
 
diff --git a/impeller/renderer/buffer_view.h b/impeller/core/buffer_view.h
similarity index 42%
rename from impeller/renderer/buffer_view.h
rename to impeller/core/buffer_view.h
index 21a04655d645a9c701880c7f17b9baa544049f1d..e319f44f283599a1b9762a8306912abcefed88d3 100644
--- a/impeller/renderer/buffer_view.h
+++ b/impeller/core/buffer_view.h
@@ -2,20 +2,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_CORE_BUFFER_VIEW_H_
+#define FLUTTER_IMPELLER_CORE_BUFFER_VIEW_H_
 
-#include "flutter/fml/macros.h"
-#include "impeller/renderer/buffer.h"
-#include "impeller/renderer/range.h"
+#include <memory>
+#include "impeller/core/range.h"
 
 namespace impeller {
 
+class DeviceBuffer;
+
 struct BufferView {
-  std::shared_ptr<const Buffer> buffer;
-  uint8_t* contents;
+  std::shared_ptr<const DeviceBuffer> buffer;
   Range range;
 
-  constexpr operator bool() const { return static_cast<bool>(buffer); }
+  constexpr explicit operator bool() const { return static_cast<bool>(buffer); }
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_CORE_BUFFER_VIEW_H_
diff --git a/impeller/core/capture.cc b/impeller/core/capture.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a4b4c462b829b83763175b52a43eba121fbfc758
--- /dev/null
+++ b/impeller/core/capture.cc
@@ -0,0 +1,220 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/core/capture.h"
+
+#include <initializer_list>
+#include <memory>
+
+namespace impeller {
+
+//-----------------------------------------------------------------------------
+/// CaptureProperty
+///
+
+CaptureProperty::CaptureProperty(const std::string& label, Options options)
+    : CaptureCursorListElement(label), options(options) {}
+
+CaptureProperty::~CaptureProperty() = default;
+
+bool CaptureProperty::MatchesCloselyEnough(const CaptureProperty& other) const {
+  if (label != other.label) {
+    return false;
+  }
+  if (GetType() != other.GetType()) {
+    return false;
+  }
+  return true;
+}
+
+#define _CAPTURE_PROPERTY_CAST_DEFINITION(type_name, pascal_name, lower_name) \
+  std::optional<type_name> CaptureProperty::As##pascal_name() const {         \
+    if (GetType() != Type::k##pascal_name) {                                  \
+      return std::nullopt;                                                    \
+    }                                                                         \
+    return reinterpret_cast<const Capture##pascal_name##Property*>(this)      \
+        ->value;                                                              \
+  }
+
+_FOR_EACH_CAPTURE_PROPERTY(_CAPTURE_PROPERTY_CAST_DEFINITION);
+
+#define _CAPTURE_PROPERTY_DEFINITION(type_name, pascal_name, lower_name)       \
+  Capture##pascal_name##Property::Capture##pascal_name##Property(              \
+      const std::string& label, type_name value, Options options)              \
+      : CaptureProperty(label, options), value(std::move(value)) {}            \
+                                                                               \
+  std::shared_ptr<Capture##pascal_name##Property>                              \
+      Capture##pascal_name##Property::Make(const std::string& label,           \
+                                           type_name value, Options options) { \
+    auto result = std::shared_ptr<Capture##pascal_name##Property>(             \
+        new Capture##pascal_name##Property(label, std::move(value), options)); \
+    return result;                                                             \
+  }                                                                            \
+                                                                               \
+  CaptureProperty::Type Capture##pascal_name##Property::GetType() const {      \
+    return Type::k##pascal_name;                                               \
+  }                                                                            \
+                                                                               \
+  void Capture##pascal_name##Property::Invoke(                                 \
+      const CaptureProcTable& proc_table) {                                    \
+    proc_table.lower_name(*this);                                              \
+  }
+
+_FOR_EACH_CAPTURE_PROPERTY(_CAPTURE_PROPERTY_DEFINITION);
+
+//-----------------------------------------------------------------------------
+/// CaptureElement
+///
+
+CaptureElement::CaptureElement(const std::string& label)
+    : CaptureCursorListElement(label) {}
+
+std::shared_ptr<CaptureElement> CaptureElement::Make(const std::string& label) {
+  return std::shared_ptr<CaptureElement>(new CaptureElement(label));
+}
+
+void CaptureElement::Rewind() {
+  properties.Rewind();
+  children.Rewind();
+}
+
+bool CaptureElement::MatchesCloselyEnough(const CaptureElement& other) const {
+  return label == other.label;
+}
+
+//-----------------------------------------------------------------------------
+/// Capture
+///
+
+Capture::Capture() = default;
+
+#ifdef IMPELLER_ENABLE_CAPTURE
+Capture::Capture(const std::string& label)
+    : element_(CaptureElement::Make(label)), active_(true) {
+  element_->label = label;
+}
+#else
+Capture::Capture(const std::string& label) {}
+#endif
+
+Capture Capture::MakeInactive() {
+  return Capture();
+}
+
+std::shared_ptr<CaptureElement> Capture::GetElement() const {
+#ifdef IMPELLER_ENABLE_CAPTURE
+  return element_;
+#else
+  return nullptr;
+#endif
+}
+
+void Capture::Rewind() {
+  return GetElement()->Rewind();
+}
+
+#ifdef IMPELLER_ENABLE_CAPTURE
+#define _CAPTURE_PROPERTY_RECORDER_DEFINITION(type_name, pascal_name,          \
+                                              lower_name)                      \
+  type_name Capture::Add##pascal_name(std::string_view label, type_name value, \
+                                      CaptureProperty::Options options) {      \
+    if (!active_) {                                                            \
+      return value;                                                            \
+    }                                                                          \
+    FML_DCHECK(element_ != nullptr);                                           \
+                                                                               \
+    std::string label_clone = std::string(label);                              \
+    auto new_value = Capture##pascal_name##Property::Make(                     \
+        label_clone, std::move(value), options);                               \
+                                                                               \
+    auto next = std::reinterpret_pointer_cast<Capture##pascal_name##Property>( \
+        element_->properties.GetNext(std::move(new_value), options.readonly)); \
+                                                                               \
+    return next->value;                                                        \
+  }
+
+_FOR_EACH_CAPTURE_PROPERTY(_CAPTURE_PROPERTY_RECORDER_DEFINITION);
+#endif
+
+//-----------------------------------------------------------------------------
+/// CaptureContext
+///
+
+#ifdef IMPELLER_ENABLE_CAPTURE
+CaptureContext::CaptureContext() : active_(true) {}
+CaptureContext::CaptureContext(std::initializer_list<std::string> allowlist)
+    : active_(true), allowlist_(allowlist) {}
+#else
+CaptureContext::CaptureContext() {}
+CaptureContext::CaptureContext(std::initializer_list<std::string> allowlist) {}
+#endif
+
+CaptureContext::CaptureContext(CaptureContext::InactiveFlag) {}
+
+CaptureContext CaptureContext::MakeInactive() {
+  return CaptureContext(InactiveFlag{});
+}
+
+CaptureContext CaptureContext::MakeAllowlist(
+    std::initializer_list<std::string> allowlist) {
+  return CaptureContext(allowlist);
+}
+
+bool CaptureContext::IsActive() const {
+#ifdef IMPELLER_ENABLE_CAPTURE
+  return active_;
+#else
+  return false;
+#endif
+}
+
+void CaptureContext::Rewind() {
+#ifdef IMPELLER_ENABLE_CAPTURE
+  for (auto& [name, capture] : documents_) {
+    capture.GetElement()->Rewind();
+  }
+#else
+  return;
+#endif
+}
+
+Capture CaptureContext::GetDocument(const std::string& label) {
+#ifdef IMPELLER_ENABLE_CAPTURE
+  if (!active_) {
+    return Capture::MakeInactive();
+  }
+
+  if (allowlist_.has_value()) {
+    if (allowlist_->find(label) == allowlist_->end()) {
+      return Capture::MakeInactive();
+    }
+  }
+
+  auto found = documents_.find(label);
+  if (found != documents_.end()) {
+    // Always rewind when fetching an existing document.
+    found->second.Rewind();
+    return found->second;
+  }
+
+  auto new_document = Capture(label);
+  documents_.emplace(label, new_document);
+  return new_document;
+#else
+  return Capture::MakeInactive();
+#endif
+}
+
+bool CaptureContext::DoesDocumentExist(const std::string& label) const {
+#ifdef IMPELLER_ENABLE_CAPTURE
+  if (!active_) {
+    return false;
+  }
+  return documents_.find(label) != documents_.end();
+#else
+  return false;
+#endif
+}
+
+}  // namespace impeller
diff --git a/impeller/core/capture.h b/impeller/core/capture.h
new file mode 100644
index 0000000000000000000000000000000000000000..9e5c0d93184176a3a6b4eaaf5d3d2750439bb625
--- /dev/null
+++ b/impeller/core/capture.h
@@ -0,0 +1,300 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_CORE_CAPTURE_H_
+#define FLUTTER_IMPELLER_CORE_CAPTURE_H_
+
+#include <functional>
+#include <initializer_list>
+#include <memory>
+#include <string>
+#include <type_traits>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
+
+#include "flutter/fml/logging.h"
+#include "flutter/fml/macros.h"
+#include "impeller/geometry/color.h"
+#include "impeller/geometry/matrix.h"
+#include "impeller/geometry/point.h"
+#include "impeller/geometry/rect.h"
+#include "impeller/geometry/scalar.h"
+#include "impeller/geometry/vector.h"
+
+namespace impeller {
+
+struct CaptureProcTable;
+
+#define _FOR_EACH_CAPTURE_PROPERTY(PROPERTY_V) \
+  PROPERTY_V(bool, Boolean, boolean)           \
+  PROPERTY_V(int, Integer, integer)            \
+  PROPERTY_V(Scalar, Scalar, scalar)           \
+  PROPERTY_V(Point, Point, point)              \
+  PROPERTY_V(Vector3, Vector3, vector3)        \
+  PROPERTY_V(Rect, Rect, rect)                 \
+  PROPERTY_V(Color, Color, color)              \
+  PROPERTY_V(Matrix, Matrix, matrix)           \
+  PROPERTY_V(std::string, String, string)
+
+template <typename Type>
+struct CaptureCursorListElement {
+  std::string label;
+
+  explicit CaptureCursorListElement(const std::string& label) : label(label){};
+
+  virtual ~CaptureCursorListElement() = default;
+
+  //----------------------------------------------------------------------------
+  /// @brief  Determines if previously captured data matches closely enough with
+  ///         newly recorded data to safely emitted in its place. If this
+  ///         returns `false`, then the remaining elements in the capture list
+  ///         are discarded and re-recorded.
+  ///
+  ///         This mechanism ensures that the UI of an interactive inspector can
+  ///         never deviate from reality, even if the schema of the captured
+  ///         data were to significantly deviate.
+  ///
+  virtual bool MatchesCloselyEnough(const Type& other) const = 0;
+};
+
+#define _CAPTURE_TYPE(type_name, pascal_name, lower_name) k##pascal_name,
+
+#define _CAPTURE_PROPERTY_CAST_DECLARATION(type_name, pascal_name, lower_name) \
+  std::optional<type_name> As##pascal_name() const;
+
+/// A capturable property type
+struct CaptureProperty : public CaptureCursorListElement<CaptureProperty> {
+  enum class Type { _FOR_EACH_CAPTURE_PROPERTY(_CAPTURE_TYPE) };
+
+  struct Options {
+    struct Range {
+      Scalar min;
+      Scalar max;
+    };
+
+    /// Readonly properties are always re-recorded during capture. Any edits
+    /// made to readonly values in-between captures are overwritten during the
+    /// next capture.
+    bool readonly = false;
+
+    /// An inspector hint that can be used for displaying sliders. Only used for
+    /// numeric types. Rounded down for integer types.
+    std::optional<Range> range;
+  };
+
+  Options options;
+
+  CaptureProperty(const std::string& label, Options options);
+
+  virtual ~CaptureProperty();
+
+  virtual Type GetType() const = 0;
+
+  virtual void Invoke(const CaptureProcTable& proc_table) = 0;
+
+  bool MatchesCloselyEnough(const CaptureProperty& other) const override;
+
+  _FOR_EACH_CAPTURE_PROPERTY(_CAPTURE_PROPERTY_CAST_DECLARATION)
+};
+
+#define _CAPTURE_PROPERTY_DECLARATION(type_name, pascal_name, lower_name) \
+  struct Capture##pascal_name##Property final : public CaptureProperty {  \
+    type_name value;                                                      \
+                                                                          \
+    static std::shared_ptr<Capture##pascal_name##Property>                \
+    Make(const std::string& label, type_name value, Options options);     \
+                                                                          \
+    /* |CaptureProperty| */                                               \
+    Type GetType() const override;                                        \
+                                                                          \
+    /* |CaptureProperty| */                                               \
+    void Invoke(const CaptureProcTable& proc_table) override;             \
+                                                                          \
+   private:                                                               \
+    Capture##pascal_name##Property(const std::string& label,              \
+                                   type_name value,                       \
+                                   Options options);                      \
+                                                                          \
+    FML_DISALLOW_COPY_AND_ASSIGN(Capture##pascal_name##Property);         \
+  };
+
+_FOR_EACH_CAPTURE_PROPERTY(_CAPTURE_PROPERTY_DECLARATION);
+
+#define _CAPTURE_PROC(type_name, pascal_name, lower_name)           \
+  std::function<void(Capture##pascal_name##Property&)> lower_name = \
+      [](Capture##pascal_name##Property& value) {};
+
+struct CaptureProcTable {
+  _FOR_EACH_CAPTURE_PROPERTY(_CAPTURE_PROC)
+};
+
+template <typename Type>
+class CapturePlaybackList {
+ public:
+  CapturePlaybackList() = default;
+
+  ~CapturePlaybackList() {
+    // Force the list element type to inherit the CRTP type. We can't enforce
+    // this as a template requirement directly because `CaptureElement` has a
+    // recursive `CaptureCursorList<CaptureElement>` property, and so the
+    // compiler fails the check due to the type being incomplete.
+    static_assert(std::is_base_of_v<CaptureCursorListElement<Type>, Type>);
+  }
+
+  void Rewind() { cursor_ = 0; }
+
+  size_t Count() { return values_.size(); }
+
+  std::shared_ptr<Type> GetNext(std::shared_ptr<Type> captured,
+                                bool force_overwrite) {
+    if (cursor_ < values_.size()) {
+      std::shared_ptr<Type>& result = values_[cursor_];
+
+      if (result->MatchesCloselyEnough(*captured)) {
+        if (force_overwrite) {
+          values_[cursor_] = captured;
+        }
+        // Safe playback is possible.
+        ++cursor_;
+        return result;
+      }
+      // The data has changed too much from the last capture to safely continue
+      // playback. Discard this and all subsequent elements to re-record.
+      values_.resize(cursor_);
+    }
+
+    ++cursor_;
+    values_.push_back(captured);
+    return captured;
+  }
+
+  std::shared_ptr<Type> FindFirstByLabel(const std::string& label) {
+    for (std::shared_ptr<Type>& value : values_) {
+      if (value->label == label) {
+        return value;
+      }
+    }
+    return nullptr;
+  }
+
+  void Iterate(std::function<void(Type&)> iterator) const {
+    for (auto& value : values_) {
+      iterator(*value);
+    }
+  }
+
+ private:
+  size_t cursor_ = 0;
+  std::vector<std::shared_ptr<Type>> values_;
+
+  CapturePlaybackList(const CapturePlaybackList&) = delete;
+
+  CapturePlaybackList& operator=(const CapturePlaybackList&) = delete;
+};
+
+/// A document of capture data, containing a list of properties and a list
+/// of subdocuments.
+struct CaptureElement final : public CaptureCursorListElement<CaptureElement> {
+  CapturePlaybackList<CaptureProperty> properties;
+  CapturePlaybackList<CaptureElement> children;
+
+  static std::shared_ptr<CaptureElement> Make(const std::string& label);
+
+  void Rewind();
+
+  bool MatchesCloselyEnough(const CaptureElement& other) const override;
+
+ private:
+  explicit CaptureElement(const std::string& label);
+
+  CaptureElement(const CaptureElement&) = delete;
+
+  CaptureElement& operator=(const CaptureElement&) = delete;
+};
+
+#ifdef IMPELLER_ENABLE_CAPTURE
+#define _CAPTURE_PROPERTY_RECORDER_DECLARATION(type_name, pascal_name, \
+                                               lower_name)             \
+  type_name Add##pascal_name(std::string_view label, type_name value,  \
+                             CaptureProperty::Options options = {});
+#else
+#define _CAPTURE_PROPERTY_RECORDER_DECLARATION(type_name, pascal_name,       \
+                                               lower_name)                   \
+  inline type_name Add##pascal_name(std::string_view label, type_name value, \
+                                    CaptureProperty::Options options = {}) { \
+    return value;                                                            \
+  }
+#endif
+
+class Capture {
+ public:
+  explicit Capture(const std::string& label);
+
+  Capture();
+
+  static Capture MakeInactive();
+
+  inline Capture CreateChild(std::string_view label) {
+#ifdef IMPELLER_ENABLE_CAPTURE
+    if (!active_) {
+      return Capture();
+    }
+
+    std::string label_copy = std::string(label);
+    auto new_capture = Capture(label_copy);
+    new_capture.element_ =
+        element_->children.GetNext(new_capture.element_, false);
+    new_capture.element_->Rewind();
+    return new_capture;
+#else
+    return Capture();
+#endif
+  }
+
+  std::shared_ptr<CaptureElement> GetElement() const;
+
+  void Rewind();
+
+  _FOR_EACH_CAPTURE_PROPERTY(_CAPTURE_PROPERTY_RECORDER_DECLARATION)
+
+ private:
+#ifdef IMPELLER_ENABLE_CAPTURE
+  std::shared_ptr<CaptureElement> element_;
+  bool active_ = false;
+#endif
+};
+
+class CaptureContext {
+ public:
+  CaptureContext();
+
+  static CaptureContext MakeInactive();
+
+  static CaptureContext MakeAllowlist(
+      std::initializer_list<std::string> allowlist);
+
+  bool IsActive() const;
+
+  void Rewind();
+
+  Capture GetDocument(const std::string& label);
+
+  bool DoesDocumentExist(const std::string& label) const;
+
+ private:
+  struct InactiveFlag {};
+  explicit CaptureContext(InactiveFlag);
+  CaptureContext(std::initializer_list<std::string> allowlist);
+
+#ifdef IMPELLER_ENABLE_CAPTURE
+  bool active_ = false;
+  std::optional<std::unordered_set<std::string>> allowlist_;
+  std::unordered_map<std::string, Capture> documents_;
+#endif
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_CORE_CAPTURE_H_
diff --git a/impeller/renderer/device_buffer.cc b/impeller/core/device_buffer.cc
similarity index 82%
rename from impeller/renderer/device_buffer.cc
rename to impeller/core/device_buffer.cc
index 08daf8c8b655a3c920af7233948571882e213266..3eae7e0a5f5b06b2cd63c4164242387ebeba44ca 100644
--- a/impeller/renderer/device_buffer.cc
+++ b/impeller/core/device_buffer.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/renderer/device_buffer.h"
+#include "impeller/core/device_buffer.h"
 
 namespace impeller {
 
@@ -10,17 +10,15 @@ DeviceBuffer::DeviceBuffer(DeviceBufferDescriptor desc) : desc_(desc) {}
 
 DeviceBuffer::~DeviceBuffer() = default;
 
-// |Buffer|
-std::shared_ptr<const DeviceBuffer> DeviceBuffer::GetDeviceBuffer(
-    Allocator& allocator) const {
-  return shared_from_this();
-}
+void DeviceBuffer::Flush(std::optional<Range> range) const {}
+
+void DeviceBuffer::Invalidate(std::optional<Range> range) const {}
 
-BufferView DeviceBuffer::AsBufferView() const {
+// static
+BufferView DeviceBuffer::AsBufferView(std::shared_ptr<DeviceBuffer> buffer) {
   BufferView view;
-  view.buffer = shared_from_this();
-  view.contents = OnGetContents();
-  view.range = {0u, desc_.size};
+  view.buffer = std::move(buffer);
+  view.range = {0u, view.buffer->desc_.size};
   return view;
 }
 
diff --git a/impeller/renderer/device_buffer.h b/impeller/core/device_buffer.h
similarity index 50%
rename from impeller/renderer/device_buffer.h
rename to impeller/core/device_buffer.h
index a1ae3a041fc8614875988089e5bd2c88990107ad..0306fad46e595fdb4870352d931b7023fc260565 100644
--- a/impeller/renderer/device_buffer.h
+++ b/impeller/core/device_buffer.h
@@ -2,23 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_CORE_DEVICE_BUFFER_H_
+#define FLUTTER_IMPELLER_CORE_DEVICE_BUFFER_H_
 
 #include <memory>
 #include <string>
 
-#include "flutter/fml/macros.h"
-#include "impeller/renderer/allocator.h"
-#include "impeller/renderer/buffer.h"
-#include "impeller/renderer/buffer_view.h"
-#include "impeller/renderer/device_buffer_descriptor.h"
-#include "impeller/renderer/range.h"
-#include "impeller/renderer/texture.h"
+#include "impeller/core/allocator.h"
+#include "impeller/core/buffer_view.h"
+#include "impeller/core/device_buffer_descriptor.h"
+#include "impeller/core/range.h"
+#include "impeller/core/texture.h"
 
 namespace impeller {
 
-class DeviceBuffer : public Buffer,
-                     public std::enable_shared_from_this<DeviceBuffer> {
+class DeviceBuffer {
  public:
   virtual ~DeviceBuffer();
 
@@ -30,32 +28,44 @@ class DeviceBuffer : public Buffer,
 
   virtual bool SetLabel(const std::string& label, Range range) = 0;
 
-  BufferView AsBufferView() const;
+  /// @brief Create a buffer view of this entire buffer.
+  static BufferView AsBufferView(std::shared_ptr<DeviceBuffer> buffer);
 
   virtual std::shared_ptr<Texture> AsTexture(
       Allocator& allocator,
       const TextureDescriptor& descriptor,
       uint16_t row_bytes) const;
 
-  // |Buffer|
-  std::shared_ptr<const DeviceBuffer> GetDeviceBuffer(
-      Allocator& allocator) const;
-
   const DeviceBufferDescriptor& GetDeviceBufferDescriptor() const;
 
+  virtual uint8_t* OnGetContents() const = 0;
+
+  /// Make any pending writes visible to the GPU.
+  ///
+  /// This method must be called if the device pointer provided by
+  /// [OnGetContents] is written to without using [CopyHostBuffer]. On Devices
+  /// with coherent host memory, this method will not perform extra work.
+  ///
+  /// If the range is not provided, the entire buffer is flushed.
+  virtual void Flush(std::optional<Range> range = std::nullopt) const;
+
+  virtual void Invalidate(std::optional<Range> range = std::nullopt) const;
+
  protected:
   const DeviceBufferDescriptor desc_;
 
   explicit DeviceBuffer(DeviceBufferDescriptor desc);
 
-  virtual uint8_t* OnGetContents() const = 0;
-
   virtual bool OnCopyHostBuffer(const uint8_t* source,
                                 Range source_range,
                                 size_t offset) = 0;
 
  private:
-  FML_DISALLOW_COPY_AND_ASSIGN(DeviceBuffer);
+  DeviceBuffer(const DeviceBuffer&) = delete;
+
+  DeviceBuffer& operator=(const DeviceBuffer&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_CORE_DEVICE_BUFFER_H_
diff --git a/impeller/renderer/device_buffer_descriptor.cc b/impeller/core/device_buffer_descriptor.cc
similarity index 79%
rename from impeller/renderer/device_buffer_descriptor.cc
rename to impeller/core/device_buffer_descriptor.cc
index 8ad913139791936d6b9b25bb30b68924474887df..9be04ae14fa18cfc16580f3d222dd2cfe212ae76 100644
--- a/impeller/renderer/device_buffer_descriptor.cc
+++ b/impeller/core/device_buffer_descriptor.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/renderer/device_buffer_descriptor.h"
+#include "impeller/core/device_buffer_descriptor.h"
 
 namespace impeller {
 
diff --git a/impeller/renderer/device_buffer_descriptor.h b/impeller/core/device_buffer_descriptor.h
similarity index 49%
rename from impeller/renderer/device_buffer_descriptor.h
rename to impeller/core/device_buffer_descriptor.h
index 2585808b8d8ecd7252a538e277449dd76105b1db..6c7c0ca1d29fc67218f8707220dfbfeb9d58176e 100644
--- a/impeller/renderer/device_buffer_descriptor.h
+++ b/impeller/core/device_buffer_descriptor.h
@@ -2,17 +2,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_CORE_DEVICE_BUFFER_DESCRIPTOR_H_
+#define FLUTTER_IMPELLER_CORE_DEVICE_BUFFER_DESCRIPTOR_H_
 
 #include <cstddef>
 
-#include "impeller/renderer/formats.h"
+#include "impeller/core/formats.h"
 
 namespace impeller {
 
 struct DeviceBufferDescriptor {
   StorageMode storage_mode = StorageMode::kDeviceTransient;
   size_t size = 0u;
+  // Perhaps we could combine this with storage mode and create appropriate
+  // host-write and host-read flags.
+  bool readback = false;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_CORE_DEVICE_BUFFER_DESCRIPTOR_H_
diff --git a/impeller/renderer/formats.cc b/impeller/core/formats.cc
similarity index 55%
rename from impeller/renderer/formats.cc
rename to impeller/core/formats.cc
index 7c2c535328f78a64f908f4cc516c519e5044311b..77cbef96ceb0bb80b8151ab656fb07f10f049ca7 100644
--- a/impeller/renderer/formats.cc
+++ b/impeller/core/formats.cc
@@ -2,11 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/renderer/formats.h"
+#include "impeller/core/formats.h"
+
+#include <sstream>
 
 #include "impeller/base/strings.h"
 #include "impeller/base/validation.h"
-#include "impeller/renderer/texture.h"
+#include "impeller/core/texture.h"
 
 namespace impeller {
 
@@ -76,4 +78,67 @@ bool Attachment::IsValid() const {
   return true;
 }
 
+std::string TextureUsageMaskToString(TextureUsageMask mask) {
+  std::vector<TextureUsage> usages;
+  if (mask & TextureUsage::kShaderRead) {
+    usages.push_back(TextureUsage::kShaderRead);
+  }
+  if (mask & TextureUsage::kShaderWrite) {
+    usages.push_back(TextureUsage::kShaderWrite);
+  }
+  if (mask & TextureUsage::kRenderTarget) {
+    usages.push_back(TextureUsage::kRenderTarget);
+  }
+  std::stringstream stream;
+  stream << "{ ";
+  for (size_t i = 0; i < usages.size(); i++) {
+    stream << TextureUsageToString(usages[i]);
+    if (i != usages.size() - 1u) {
+      stream << ", ";
+    }
+  }
+  stream << " }";
+  return stream.str();
+}
+
+std::string AttachmentToString(const Attachment& attachment) {
+  std::stringstream stream;
+  if (attachment.texture) {
+    stream << "Texture=("
+           << TextureDescriptorToString(
+                  attachment.texture->GetTextureDescriptor())
+           << "),";
+  }
+  if (attachment.resolve_texture) {
+    stream << "ResolveTexture=("
+           << TextureDescriptorToString(
+                  attachment.resolve_texture->GetTextureDescriptor())
+           << "),";
+  }
+  stream << "LoadAction=" << LoadActionToString(attachment.load_action) << ",";
+  stream << "StoreAction=" << StoreActionToString(attachment.store_action);
+  return stream.str();
+}
+
+std::string ColorAttachmentToString(const ColorAttachment& color) {
+  std::stringstream stream;
+  stream << AttachmentToString(color) << ",";
+  stream << "ClearColor=(" << ColorToString(color.clear_color) << ")";
+  return stream.str();
+}
+
+std::string DepthAttachmentToString(const DepthAttachment& depth) {
+  std::stringstream stream;
+  stream << AttachmentToString(depth) << ",";
+  stream << "ClearDepth=" << SPrintF("%.2f", depth.clear_depth);
+  return stream.str();
+}
+
+std::string StencilAttachmentToString(const StencilAttachment& stencil) {
+  std::stringstream stream;
+  stream << AttachmentToString(stencil) << ",";
+  stream << "ClearStencil=" << stencil.clear_stencil;
+  return stream.str();
+}
+
 }  // namespace impeller
diff --git a/impeller/renderer/formats.h b/impeller/core/formats.h
similarity index 68%
rename from impeller/renderer/formats.h
rename to impeller/core/formats.h
index 945b7f87752ed9a32f584edeb5bde885c5e27025..aa859b45f68183b56c2c31923fe781ac9d8bd248 100644
--- a/impeller/renderer/formats.h
+++ b/impeller/core/formats.h
@@ -2,22 +2,29 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_CORE_FORMATS_H_
+#define FLUTTER_IMPELLER_CORE_FORMATS_H_
 
 #include <cstdint>
 #include <functional>
 #include <memory>
+#include <string>
 #include <type_traits>
 
 #include "flutter/fml/hash_combine.h"
 #include "flutter/fml/logging.h"
-#include "flutter/fml/macros.h"
+#include "impeller/base/mask.h"
 #include "impeller/geometry/color.h"
 #include "impeller/geometry/rect.h"
 #include "impeller/geometry/scalar.h"
 
 namespace impeller {
 
+enum class WindingOrder {
+  kClockwise,
+  kCounterClockwise,
+};
+
 class Texture;
 
 //------------------------------------------------------------------------------
@@ -51,6 +58,18 @@ enum class StorageMode {
   kDeviceTransient,
 };
 
+constexpr const char* StorageModeToString(StorageMode mode) {
+  switch (mode) {
+    case StorageMode::kHostVisible:
+      return "HostVisible";
+    case StorageMode::kDevicePrivate:
+      return "DevicePrivate";
+    case StorageMode::kDeviceTransient:
+      return "DeviceTransient";
+  }
+  FML_UNREACHABLE();
+}
+
 //------------------------------------------------------------------------------
 /// @brief      The Pixel formats supported by Impeller. The naming convention
 ///             denotes the usage of the component, the bit width of that
@@ -78,7 +97,7 @@ enum class StorageMode {
 ///             esoteric formats and use blit passes to convert to a
 ///             non-esoteric pass.
 ///
-enum class PixelFormat {
+enum class PixelFormat : uint8_t {
   kUnknown,
   kA8UNormInt,
   kR8UNormInt,
@@ -87,17 +106,76 @@ enum class PixelFormat {
   kR8G8B8A8UNormIntSRGB,
   kB8G8R8A8UNormInt,
   kB8G8R8A8UNormIntSRGB,
+  kR32G32B32A32Float,
+  kR16G16B16A16Float,
+  kB10G10R10XR,
+  kB10G10R10XRSRGB,
+  kB10G10R10A10XR,
+  // Depth and stencil formats.
   kS8UInt,
-
-  // Defaults. If you don't know which ones to use, these are usually a safe
-  // bet.
-  //
-  // On Metal, this is a support format for layer drawable and can be used to
-  // specify the format of the resolve texture if needed.
-  kDefaultColor = kB8G8R8A8UNormInt,
-  kDefaultStencil = kS8UInt,
+  kD24UnormS8Uint,
+  kD32FloatS8UInt,
 };
 
+constexpr bool IsDepthWritable(PixelFormat format) {
+  switch (format) {
+    case PixelFormat::kD24UnormS8Uint:
+    case PixelFormat::kD32FloatS8UInt:
+      return true;
+    default:
+      return false;
+  }
+}
+
+constexpr bool IsStencilWritable(PixelFormat format) {
+  switch (format) {
+    case PixelFormat::kS8UInt:
+    case PixelFormat::kD24UnormS8Uint:
+    case PixelFormat::kD32FloatS8UInt:
+      return true;
+    default:
+      return false;
+  }
+}
+
+constexpr const char* PixelFormatToString(PixelFormat format) {
+  switch (format) {
+    case PixelFormat::kUnknown:
+      return "Unknown";
+    case PixelFormat::kA8UNormInt:
+      return "A8UNormInt";
+    case PixelFormat::kR8UNormInt:
+      return "R8UNormInt";
+    case PixelFormat::kR8G8UNormInt:
+      return "R8G8UNormInt";
+    case PixelFormat::kR8G8B8A8UNormInt:
+      return "R8G8B8A8UNormInt";
+    case PixelFormat::kR8G8B8A8UNormIntSRGB:
+      return "R8G8B8A8UNormIntSRGB";
+    case PixelFormat::kB8G8R8A8UNormInt:
+      return "B8G8R8A8UNormInt";
+    case PixelFormat::kB8G8R8A8UNormIntSRGB:
+      return "B8G8R8A8UNormIntSRGB";
+    case PixelFormat::kR32G32B32A32Float:
+      return "R32G32B32A32Float";
+    case PixelFormat::kR16G16B16A16Float:
+      return "R16G16B16A16Float";
+    case PixelFormat::kB10G10R10XR:
+      return "B10G10R10XR";
+    case PixelFormat::kB10G10R10XRSRGB:
+      return "B10G10R10XRSRGB";
+    case PixelFormat::kB10G10R10A10XR:
+      return "B10G10R10A10XR";
+    case PixelFormat::kS8UInt:
+      return "S8UInt";
+    case PixelFormat::kD24UnormS8Uint:
+      return "D24UnormS8Uint";
+    case PixelFormat::kD32FloatS8UInt:
+      return "D32FloatS8UInt";
+  }
+  FML_UNREACHABLE();
+}
+
 enum class BlendFactor {
   kZero,
   kOne,
@@ -135,6 +213,30 @@ enum class StoreAction {
   kStoreAndMultisampleResolve,
 };
 
+constexpr const char* LoadActionToString(LoadAction action) {
+  switch (action) {
+    case LoadAction::kDontCare:
+      return "DontCare";
+    case LoadAction::kLoad:
+      return "Load";
+    case LoadAction::kClear:
+      return "Clear";
+  }
+}
+
+constexpr const char* StoreActionToString(StoreAction action) {
+  switch (action) {
+    case StoreAction::kDontCare:
+      return "DontCare";
+    case StoreAction::kStore:
+      return "Store";
+    case StoreAction::kMultisampleResolve:
+      return "MultisampleResolve";
+    case StoreAction::kStoreAndMultisampleResolve:
+      return "StoreAndMultisampleResolve";
+  }
+}
+
 constexpr bool CanClearAttachment(LoadAction action) {
   switch (action) {
     case LoadAction::kLoad:
@@ -162,12 +264,28 @@ enum class TextureType {
   kTexture2D,
   kTexture2DMultisample,
   kTextureCube,
+  kTextureExternalOES,
 };
 
+constexpr const char* TextureTypeToString(TextureType type) {
+  switch (type) {
+    case TextureType::kTexture2D:
+      return "Texture2D";
+    case TextureType::kTexture2DMultisample:
+      return "Texture2DMultisample";
+    case TextureType::kTextureCube:
+      return "TextureCube";
+    case TextureType::kTextureExternalOES:
+      return "TextureExternalOES";
+  }
+  FML_UNREACHABLE();
+}
+
 constexpr bool IsMultisampleCapable(TextureType type) {
   switch (type) {
     case TextureType::kTexture2D:
     case TextureType::kTextureCube:
+    case TextureType::kTextureExternalOES:
       return false;
     case TextureType::kTexture2DMultisample:
       return true;
@@ -175,22 +293,45 @@ constexpr bool IsMultisampleCapable(TextureType type) {
   return false;
 }
 
-enum class SampleCount {
+enum class SampleCount : uint8_t {
   kCount1 = 1,
   kCount4 = 4,
 };
 
-using TextureUsageMask = uint64_t;
-
-enum class TextureUsage : TextureUsageMask {
+enum class TextureUsage {
   kUnknown = 0,
   kShaderRead = 1 << 0,
   kShaderWrite = 1 << 1,
   kRenderTarget = 1 << 2,
 };
+IMPELLER_ENUM_IS_MASK(TextureUsage);
+
+using TextureUsageMask = Mask<TextureUsage>;
+
+constexpr const char* TextureUsageToString(TextureUsage usage) {
+  switch (usage) {
+    case TextureUsage::kUnknown:
+      return "Unknown";
+    case TextureUsage::kShaderRead:
+      return "ShaderRead";
+    case TextureUsage::kShaderWrite:
+      return "ShaderWrite";
+    case TextureUsage::kRenderTarget:
+      return "RenderTarget";
+  }
+  FML_UNREACHABLE();
+}
 
-enum class TextureIntent {
+std::string TextureUsageMaskToString(TextureUsageMask mask);
+
+// Texture coordinate system.
+enum class TextureCoordinateSystem {
+  // Alternative coordinate system used when uploading texture data from the
+  // host.
+  // (0, 0) is the bottom-left of the image with +Y going up.
   kUploadFromHost,
+  // Default coordinate system.
+  // (0, 0) is the top-left of the image with +Y going down.
   kRenderToTexture,
 };
 
@@ -204,18 +345,47 @@ enum class IndexType {
   kUnknown,
   k16bit,
   k32bit,
+  /// Does not use the index buffer.
+  kNone,
 };
 
-enum class PrimitiveType {
+/// Decides how backend draws pixels based on input vertices.
+enum class PrimitiveType : uint8_t {
+  /// Draws a triage for each separate set of three vertices.
+  ///
+  /// Vertices [A, B, C, D, E, F] will produce triages
+  /// [ABC, DEF].
   kTriangle,
+
+  /// Draws a triage for every adjacent three vertices.
+  ///
+  /// Vertices [A, B, C, D, E, F] will produce triages
+  /// [ABC, BCD, CDE, DEF].
   kTriangleStrip,
+
+  /// Draws a line for each separate set of two vertices.
+  ///
+  /// Vertices [A, B, C] will produce discontinued line
+  /// [AB, BC].
   kLine,
+
+  /// Draws a continuous line that connect every input vertices
+  ///
+  /// Vertices [A, B, C] will produce one continuous line
+  /// [ABC].
   kLineStrip,
+
+  /// Draws a point at each input vertex.
   kPoint,
   // Triangle fans are implementation dependent and need extra extensions
   // checks. Hence, they are not supported here.
 };
 
+enum class PolygonMode {
+  kFill,
+  kLine,
+};
+
 struct DepthRange {
   Scalar z_near = 0.0;
   Scalar z_far = 1.0;
@@ -243,8 +413,6 @@ enum class MinMagFilter {
 };
 
 enum class MipFilter {
-  /// Always sample from mip level 0. Other mip levels are ignored.
-  kNone,
   /// Sample from the nearest mip level.
   kNearest,
   /// Sample from the two nearest mip levels and linearly interpolate between
@@ -259,9 +427,13 @@ enum class SamplerAddressMode {
   // More modes are almost always supported but they are usually behind
   // extensions checks. The ones current in these structs are safe (always
   // supported) defaults.
+
+  /// @brief decal sampling mode is only supported on devices that pass
+  ///        the `Capabilities.SupportsDecalSamplerAddressMode` check.
+  kDecal,
 };
 
-enum class ColorWriteMask : uint64_t {
+enum class ColorWriteMaskBits : uint64_t {
   kNone = 0,
   kRed = 1 << 0,
   kGreen = 1 << 1,
@@ -269,6 +441,9 @@ enum class ColorWriteMask : uint64_t {
   kAlpha = 1 << 3,
   kAll = kRed | kGreen | kBlue | kAlpha,
 };
+IMPELLER_ENUM_IS_MASK(ColorWriteMaskBits);
+
+using ColorWriteMask = Mask<ColorWriteMaskBits>;
 
 constexpr size_t BytesPerPixelForPixelFormat(PixelFormat format) {
   switch (format) {
@@ -284,7 +459,18 @@ constexpr size_t BytesPerPixelForPixelFormat(PixelFormat format) {
     case PixelFormat::kR8G8B8A8UNormIntSRGB:
     case PixelFormat::kB8G8R8A8UNormInt:
     case PixelFormat::kB8G8R8A8UNormIntSRGB:
+    case PixelFormat::kB10G10R10XRSRGB:
+    case PixelFormat::kB10G10R10XR:
       return 4u;
+    case PixelFormat::kD24UnormS8Uint:
+      return 4u;
+    case PixelFormat::kD32FloatS8UInt:
+      return 5u;
+    case PixelFormat::kR16G16B16A16Float:
+    case PixelFormat::kB10G10R10A10XR:
+      return 8u;
+    case PixelFormat::kR32G32B32A32Float:
+      return 16u;
   }
   return 0u;
 }
@@ -323,8 +509,7 @@ struct ColorAttachmentDescriptor {
   BlendOperation alpha_blend_op = BlendOperation::kAdd;
   BlendFactor dst_alpha_blend_factor = BlendFactor::kOneMinusSourceAlpha;
 
-  std::underlying_type_t<ColorWriteMask> write_mask =
-      static_cast<uint64_t>(ColorWriteMask::kAll);
+  ColorWriteMask write_mask = ColorWriteMaskBits::kAll;
 
   constexpr bool operator==(const ColorAttachmentDescriptor& o) const {
     return format == o.format &&                                  //
@@ -339,14 +524,14 @@ struct ColorAttachmentDescriptor {
   }
 
   constexpr size_t Hash() const {
-    return fml::HashCombine(format, blending_enabled, src_color_blend_factor,
-                            color_blend_op, dst_color_blend_factor,
-                            src_alpha_blend_factor, alpha_blend_op,
-                            dst_alpha_blend_factor, write_mask);
+    return fml::HashCombine(
+        format, blending_enabled, src_color_blend_factor, color_blend_op,
+        dst_color_blend_factor, src_alpha_blend_factor, alpha_blend_op,
+        dst_alpha_blend_factor, static_cast<uint64_t>(write_mask));
   }
 };
 
-enum class CompareFunction {
+enum class CompareFunction : uint8_t {
   /// Comparison test never passes.
   kNever,
   /// Comparison test passes always passes.
@@ -365,7 +550,7 @@ enum class CompareFunction {
   kGreaterEqual,
 };
 
-enum class StencilOperation {
+enum class StencilOperation : uint8_t {
   /// Don't modify the current stencil value.
   kKeep,
   /// Reset the stencil value to zero.
@@ -424,6 +609,7 @@ struct StencilAttachmentDescriptor {
   /// Indicates what to do when both the stencil and depth tests pass.
   ///
   StencilOperation depth_stencil_pass = StencilOperation::kKeep;
+
   //----------------------------------------------------------------------------
   /// The mask applied to the reference and stencil buffer values before
   /// performing the stencil_compare operation.
@@ -445,7 +631,7 @@ struct StencilAttachmentDescriptor {
 
   constexpr size_t GetHash() const {
     return fml::HashCombine(stencil_compare, stencil_failure, depth_failure,
-                            depth_stencil_pass, read_mask);
+                            depth_stencil_pass, read_mask, write_mask);
   }
 };
 
@@ -470,6 +656,14 @@ struct StencilAttachment : public Attachment {
   uint32_t clear_stencil = 0;
 };
 
+std::string AttachmentToString(const Attachment& attachment);
+
+std::string ColorAttachmentToString(const ColorAttachment& color);
+
+std::string DepthAttachmentToString(const DepthAttachment& depth);
+
+std::string StencilAttachmentToString(const StencilAttachment& stencil);
+
 }  // namespace impeller
 
 namespace std {
@@ -491,3 +685,5 @@ struct hash<impeller::StencilAttachmentDescriptor> {
 };
 
 }  // namespace std
+
+#endif  // FLUTTER_IMPELLER_CORE_FORMATS_H_
diff --git a/impeller/core/host_buffer.cc b/impeller/core/host_buffer.cc
new file mode 100644
index 0000000000000000000000000000000000000000..67d3ca260af80130e5079cd896df588ab7d587bd
--- /dev/null
+++ b/impeller/core/host_buffer.cc
@@ -0,0 +1,201 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/core/host_buffer.h"
+
+#include <cstring>
+#include <tuple>
+
+#include "impeller/core/allocator.h"
+#include "impeller/core/buffer_view.h"
+#include "impeller/core/device_buffer.h"
+#include "impeller/core/device_buffer_descriptor.h"
+#include "impeller/core/formats.h"
+
+namespace impeller {
+
+constexpr size_t kAllocatorBlockSize = 1024000;  // 1024 Kb.
+
+std::shared_ptr<HostBuffer> HostBuffer::Create(
+    const std::shared_ptr<Allocator>& allocator) {
+  return std::shared_ptr<HostBuffer>(new HostBuffer(allocator));
+}
+
+HostBuffer::HostBuffer(const std::shared_ptr<Allocator>& allocator)
+    : allocator_(allocator) {
+  DeviceBufferDescriptor desc;
+  desc.size = kAllocatorBlockSize;
+  desc.storage_mode = StorageMode::kHostVisible;
+  for (auto i = 0u; i < kHostBufferArenaSize; i++) {
+    device_buffers_[i].push_back(allocator->CreateBuffer(desc));
+  }
+}
+
+HostBuffer::~HostBuffer() = default;
+
+void HostBuffer::SetLabel(std::string label) {
+  label_ = std::move(label);
+}
+
+BufferView HostBuffer::Emplace(const void* buffer,
+                               size_t length,
+                               size_t align) {
+  auto [range, device_buffer] = EmplaceInternal(buffer, length, align);
+  if (!device_buffer) {
+    return {};
+  }
+  return BufferView{std::move(device_buffer), range};
+}
+
+BufferView HostBuffer::Emplace(const void* buffer, size_t length) {
+  auto [range, device_buffer] = EmplaceInternal(buffer, length);
+  if (!device_buffer) {
+    return {};
+  }
+  return BufferView{std::move(device_buffer), range};
+}
+
+BufferView HostBuffer::Emplace(size_t length,
+                               size_t align,
+                               const EmplaceProc& cb) {
+  auto [range, device_buffer] = EmplaceInternal(length, align, cb);
+  if (!device_buffer) {
+    return {};
+  }
+  return BufferView{std::move(device_buffer), range};
+}
+
+HostBuffer::TestStateQuery HostBuffer::GetStateForTest() {
+  return HostBuffer::TestStateQuery{
+      .current_frame = frame_index_,
+      .current_buffer = current_buffer_,
+      .total_buffer_count = device_buffers_[frame_index_].size(),
+  };
+}
+
+void HostBuffer::MaybeCreateNewBuffer() {
+  current_buffer_++;
+  if (current_buffer_ >= device_buffers_[frame_index_].size()) {
+    DeviceBufferDescriptor desc;
+    desc.size = kAllocatorBlockSize;
+    desc.storage_mode = StorageMode::kHostVisible;
+    device_buffers_[frame_index_].push_back(allocator_->CreateBuffer(desc));
+  }
+  offset_ = 0;
+}
+
+std::tuple<Range, std::shared_ptr<DeviceBuffer>> HostBuffer::EmplaceInternal(
+    size_t length,
+    size_t align,
+    const EmplaceProc& cb) {
+  if (!cb) {
+    return {};
+  }
+
+  // If the requested allocation is bigger than the block size, create a one-off
+  // device buffer and write to that.
+  if (length > kAllocatorBlockSize) {
+    DeviceBufferDescriptor desc;
+    desc.size = length;
+    desc.storage_mode = StorageMode::kHostVisible;
+    auto device_buffer = allocator_->CreateBuffer(desc);
+    if (!device_buffer) {
+      return {};
+    }
+    if (cb) {
+      cb(device_buffer->OnGetContents());
+      device_buffer->Flush(Range{0, length});
+    }
+    return std::make_tuple(Range{0, length}, device_buffer);
+  }
+
+  size_t padding = 0;
+  if (align > 0 && offset_ % align) {
+    padding = align - (offset_ % align);
+  }
+  if (offset_ + padding + length > kAllocatorBlockSize) {
+    MaybeCreateNewBuffer();
+  } else {
+    offset_ += padding;
+  }
+
+  auto current_buffer = GetCurrentBuffer();
+  auto contents = current_buffer->OnGetContents();
+  cb(contents + offset_);
+  Range output_range(offset_, length);
+  current_buffer->Flush(output_range);
+
+  offset_ += length;
+  return std::make_tuple(output_range, std::move(current_buffer));
+}
+
+std::tuple<Range, std::shared_ptr<DeviceBuffer>> HostBuffer::EmplaceInternal(
+    const void* buffer,
+    size_t length) {
+  // If the requested allocation is bigger than the block size, create a one-off
+  // device buffer and write to that.
+  if (length > kAllocatorBlockSize) {
+    DeviceBufferDescriptor desc;
+    desc.size = length;
+    desc.storage_mode = StorageMode::kHostVisible;
+    auto device_buffer = allocator_->CreateBuffer(desc);
+    if (!device_buffer) {
+      return {};
+    }
+    if (buffer) {
+      if (!device_buffer->CopyHostBuffer(static_cast<const uint8_t*>(buffer),
+                                         Range{0, length})) {
+        return {};
+      }
+    }
+    return std::make_tuple(Range{0, length}, device_buffer);
+  }
+
+  auto old_length = GetLength();
+  if (old_length + length > kAllocatorBlockSize) {
+    MaybeCreateNewBuffer();
+  }
+  old_length = GetLength();
+
+  auto current_buffer = GetCurrentBuffer();
+  auto contents = current_buffer->OnGetContents();
+  if (buffer) {
+    ::memmove(contents + old_length, buffer, length);
+    current_buffer->Flush(Range{old_length, length});
+  }
+  offset_ += length;
+  return std::make_tuple(Range{old_length, length}, std::move(current_buffer));
+}
+
+std::tuple<Range, std::shared_ptr<DeviceBuffer>>
+HostBuffer::EmplaceInternal(const void* buffer, size_t length, size_t align) {
+  if (align == 0 || (GetLength() % align) == 0) {
+    return EmplaceInternal(buffer, length);
+  }
+
+  {
+    auto padding = align - (GetLength() % align);
+    if (offset_ + padding < kAllocatorBlockSize) {
+      offset_ += padding;
+    } else {
+      MaybeCreateNewBuffer();
+    }
+  }
+
+  return EmplaceInternal(buffer, length);
+}
+
+void HostBuffer::Reset() {
+  // When resetting the host buffer state at the end of the frame, check if
+  // there are any unused buffers and remove them.
+  while (device_buffers_[frame_index_].size() > current_buffer_ + 1) {
+    device_buffers_[frame_index_].pop_back();
+  }
+
+  offset_ = 0u;
+  current_buffer_ = 0u;
+  frame_index_ = (frame_index_ + 1) % kHostBufferArenaSize;
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/host_buffer.h b/impeller/core/host_buffer.h
similarity index 53%
rename from impeller/renderer/host_buffer.h
rename to impeller/core/host_buffer.h
index 7895a38b87ae69a0ee4f0ea8f32bc3b9c55b896d..4ed78d0c555c90cf0edccae703f8c8265b8feb59 100644
--- a/impeller/renderer/host_buffer.h
+++ b/impeller/core/host_buffer.h
@@ -2,26 +2,33 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_CORE_HOST_BUFFER_H_
+#define FLUTTER_IMPELLER_CORE_HOST_BUFFER_H_
 
 #include <algorithm>
+#include <array>
+#include <functional>
 #include <memory>
 #include <string>
 #include <type_traits>
 
-#include "flutter/fml/macros.h"
-#include "impeller/base/allocation.h"
-#include "impeller/renderer/buffer.h"
-#include "impeller/renderer/buffer_view.h"
-#include "impeller/renderer/platform.h"
+#include "impeller/core/allocator.h"
+#include "impeller/core/buffer_view.h"
+#include "impeller/core/platform.h"
 
 namespace impeller {
 
-class HostBuffer final : public std::enable_shared_from_this<HostBuffer>,
-                         public Allocation,
-                         public Buffer {
+/// Approximately the same size as the max frames in flight.
+static const constexpr size_t kHostBufferArenaSize = 3u;
+
+/// The host buffer class manages one more 1024 Kb blocks of device buffer
+/// allocations.
+///
+/// These are reset per-frame.
+class HostBuffer {
  public:
-  static std::shared_ptr<HostBuffer> Create();
+  static std::shared_ptr<HostBuffer> Create(
+      const std::shared_ptr<Allocator>& allocator);
 
   // |Buffer|
   virtual ~HostBuffer();
@@ -95,21 +102,72 @@ class HostBuffer final : public std::enable_shared_from_this<HostBuffer>,
                                    size_t length,
                                    size_t align);
 
+  using EmplaceProc = std::function<void(uint8_t* buffer)>;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Emplaces undefined data onto the managed buffer and gives the
+  ///             caller a chance to update it using the specified callback. The
+  ///             buffer is guaranteed to have enough space for length bytes. It
+  ///             is the responsibility of the caller to not exceed the bounds
+  ///             of the buffer returned in the EmplaceProc.
+  ///
+  /// @param[in]  cb            A callback that will be passed a ptr to the
+  ///                           underlying host buffer.
+  ///
+  /// @return     The buffer view.
+  ///
+  BufferView Emplace(size_t length, size_t align, const EmplaceProc& cb);
+
+  //----------------------------------------------------------------------------
+  /// @brief Resets the contents of the HostBuffer to nothing so it can be
+  ///        reused.
+  void Reset();
+
+  /// Test only internal state.
+  struct TestStateQuery {
+    size_t current_frame;
+    size_t current_buffer;
+    size_t total_buffer_count;
+  };
+
+  /// @brief Retrieve internal buffer state for test expectations.
+  TestStateQuery GetStateForTest();
+
  private:
-  mutable std::shared_ptr<DeviceBuffer> device_buffer_;
-  mutable size_t device_buffer_generation_ = 0u;
-  size_t generation_ = 1u;
-  std::string label_;
+  [[nodiscard]] std::tuple<Range, std::shared_ptr<DeviceBuffer>>
+  EmplaceInternal(const void* buffer, size_t length);
 
-  // |Buffer|
-  std::shared_ptr<const DeviceBuffer> GetDeviceBuffer(
-      Allocator& allocator) const override;
+  std::tuple<Range, std::shared_ptr<DeviceBuffer>>
+  EmplaceInternal(size_t length, size_t align, const EmplaceProc& cb);
+
+  std::tuple<Range, std::shared_ptr<DeviceBuffer>>
+  EmplaceInternal(const void* buffer, size_t length, size_t align);
+
+  size_t GetLength() const { return offset_; }
+
+  void MaybeCreateNewBuffer();
+
+  std::shared_ptr<DeviceBuffer>& GetCurrentBuffer() {
+    return device_buffers_[frame_index_][current_buffer_];
+  }
 
   [[nodiscard]] BufferView Emplace(const void* buffer, size_t length);
 
-  HostBuffer();
+  explicit HostBuffer(const std::shared_ptr<Allocator>& allocator);
+
+  HostBuffer(const HostBuffer&) = delete;
+
+  HostBuffer& operator=(const HostBuffer&) = delete;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(HostBuffer);
+  std::shared_ptr<Allocator> allocator_;
+  std::array<std::vector<std::shared_ptr<DeviceBuffer>>, kHostBufferArenaSize>
+      device_buffers_;
+  size_t current_buffer_ = 0u;
+  size_t offset_ = 0u;
+  size_t frame_index_ = 0u;
+  std::string label_;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_CORE_HOST_BUFFER_H_
diff --git a/impeller/renderer/platform.cc b/impeller/core/platform.cc
similarity index 84%
rename from impeller/renderer/platform.cc
rename to impeller/core/platform.cc
index 7f225f3d3dbbc2fe207e928d0ea7b7a1d09918a9..66a8115092b8941e6ae7a990f82dd155bae8ca61 100644
--- a/impeller/renderer/platform.cc
+++ b/impeller/core/platform.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/renderer/platform.h"
+#include "impeller/core/platform.h"
 
 namespace impeller {
 
diff --git a/impeller/renderer/platform.h b/impeller/core/platform.h
similarity index 76%
rename from impeller/renderer/platform.h
rename to impeller/core/platform.h
index 6076e810b3d17624fd069f130a5e779fdcc99805..824738c02d8a7f8a928a1abaefda73ffe6f6c74f 100644
--- a/impeller/renderer/platform.h
+++ b/impeller/core/platform.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_CORE_PLATFORM_H_
+#define FLUTTER_IMPELLER_CORE_PLATFORM_H_
 
 #include <cstddef>
 
@@ -14,11 +15,11 @@ namespace impeller {
 constexpr size_t DefaultUniformAlignment() {
 #if FML_OS_IOS && !TARGET_OS_SIMULATOR
   return 16u;
-#elif FML_OS_MACOSX
-  return 256u;
 #else
-  return 16u;
+  return 256u;
 #endif
 }
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_CORE_PLATFORM_H_
diff --git a/impeller/renderer/range.cc b/impeller/core/range.cc
similarity index 85%
rename from impeller/renderer/range.cc
rename to impeller/core/range.cc
index 14d7c001a10b9c452f442973f1ae6f2fefd76b37..336f08bf3c1832e04f6385bbffe42a4917e1650f 100644
--- a/impeller/renderer/range.cc
+++ b/impeller/core/range.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/renderer/range.h"
+#include "impeller/core/range.h"
 
 namespace impeller {
 
diff --git a/impeller/renderer/range.h b/impeller/core/range.h
similarity index 82%
rename from impeller/renderer/range.h
rename to impeller/core/range.h
index e1a28878136ce3a22814b786594c082ab471bf1b..d0971725c6928400dda099bc4e718a14e9e9cfc2 100644
--- a/impeller/renderer/range.h
+++ b/impeller/core/range.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_CORE_RANGE_H_
+#define FLUTTER_IMPELLER_CORE_RANGE_H_
 
 #include <cstddef>
 
@@ -25,3 +26,5 @@ struct Range {
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_CORE_RANGE_H_
diff --git a/impeller/archivist/archivable.cc b/impeller/core/resource_binder.cc
similarity index 83%
rename from impeller/archivist/archivable.cc
rename to impeller/core/resource_binder.cc
index 29c8a3c019a478428b3465afa50e0467bfe2f6bf..6972ec45591b74f6c71e88d94d056c149d4551f0 100644
--- a/impeller/archivist/archivable.cc
+++ b/impeller/core/resource_binder.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/archivist/archivable.h"
+#include "impeller/core/resource_binder.h"
 
 namespace impeller {
 
diff --git a/impeller/core/resource_binder.h b/impeller/core/resource_binder.h
new file mode 100644
index 0000000000000000000000000000000000000000..8f25ff0c7fe1842eed204abcafb0384e7ed9e893
--- /dev/null
+++ b/impeller/core/resource_binder.h
@@ -0,0 +1,42 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_CORE_RESOURCE_BINDER_H_
+#define FLUTTER_IMPELLER_CORE_RESOURCE_BINDER_H_
+
+#include <memory>
+
+#include "impeller/core/buffer_view.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/sampler.h"
+#include "impeller/core/shader_types.h"
+#include "impeller/core/texture.h"
+
+namespace impeller {
+
+//------------------------------------------------------------------------------
+/// @brief      An interface for binding resources. This is implemented by
+///             |Command| and |ComputeCommand| to make GPU resources available
+///             to a given command's pipeline.
+///
+struct ResourceBinder {
+  virtual ~ResourceBinder() = default;
+
+  virtual bool BindResource(ShaderStage stage,
+                            DescriptorType type,
+                            const ShaderUniformSlot& slot,
+                            const ShaderMetadata& metadata,
+                            BufferView view) = 0;
+
+  virtual bool BindResource(ShaderStage stage,
+                            DescriptorType type,
+                            const SampledImageSlot& slot,
+                            const ShaderMetadata& metadata,
+                            std::shared_ptr<const Texture> texture,
+                            const std::unique_ptr<const Sampler>& sampler) = 0;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_CORE_RESOURCE_BINDER_H_
diff --git a/impeller/runtime_stage/runtime_types.cc b/impeller/core/runtime_types.cc
similarity index 69%
rename from impeller/runtime_stage/runtime_types.cc
rename to impeller/core/runtime_types.cc
index 4236eae89bbfcecc47b1ad35a3f46efcda2c736f..08811275967ba418131ece067fa954711bf59d2a 100644
--- a/impeller/runtime_stage/runtime_types.cc
+++ b/impeller/core/runtime_types.cc
@@ -2,15 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/runtime_stage/runtime_types.h"
+#include "impeller/core/runtime_types.h"
 
 namespace impeller {
 
 size_t RuntimeUniformDescription::GetSize() const {
   size_t size = dimensions.rows * dimensions.cols * bit_width / 8u;
   if (array_elements.value_or(0) > 0) {
+    // Covered by check on the line above.
+    // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
     size *= array_elements.value();
   }
+  size += sizeof(float) * struct_layout.size();
   return size;
 }
 
diff --git a/impeller/runtime_stage/runtime_types.h b/impeller/core/runtime_types.h
similarity index 65%
rename from impeller/runtime_stage/runtime_types.h
rename to impeller/core/runtime_types.h
index 2ef8512dbd8b4f701b43766380a1aca27dafb83b..48a8744e0e6545a6bf5c4d4f397a60a66a0b1f86 100644
--- a/impeller/runtime_stage/runtime_types.h
+++ b/impeller/core/runtime_types.h
@@ -2,36 +2,33 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_CORE_RUNTIME_TYPES_H_
+#define FLUTTER_IMPELLER_CORE_RUNTIME_TYPES_H_
 
 #include <cstddef>
 #include <optional>
 #include <string>
+#include <vector>
 
 namespace impeller {
 
+enum class RuntimeStageBackend {
+  kSkSL,
+  kMetal,
+  kOpenGLES,
+  kVulkan,
+};
+
 enum RuntimeUniformType {
-  kBoolean,
-  kSignedByte,
-  kUnsignedByte,
-  kSignedShort,
-  kUnsignedShort,
-  kSignedInt,
-  kUnsignedInt,
-  kSignedInt64,
-  kUnsignedInt64,
-  kHalfFloat,
   kFloat,
-  kDouble,
   kSampledImage,
+  kStruct,
 };
 
 enum class RuntimeShaderStage {
   kVertex,
   kFragment,
   kCompute,
-  kTessellationControl,
-  kTessellationEvaluation,
 };
 
 struct RuntimeUniformDimensions {
@@ -43,12 +40,16 @@ struct RuntimeUniformDescription {
   std::string name;
   size_t location = 0u;
   RuntimeUniformType type = RuntimeUniformType::kFloat;
-  RuntimeUniformDimensions dimensions;
-  size_t bit_width;
+  RuntimeUniformDimensions dimensions = {};
+  size_t bit_width = 0u;
   std::optional<size_t> array_elements;
+  std::vector<uint8_t> struct_layout = {};
+  size_t struct_float_count = 0u;
 
   /// @brief  Computes the total number of bytes that this uniform requires.
   size_t GetSize() const;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_CORE_RUNTIME_TYPES_H_
diff --git a/impeller/renderer/sampler.cc b/impeller/core/sampler.cc
similarity index 90%
rename from impeller/renderer/sampler.cc
rename to impeller/core/sampler.cc
index 47d44e8996c3d02d1db2b28cfa95b104d3f943db..12b87d3e91b1a78c3bf3a4ffc39f9bcc474b2ea0 100644
--- a/impeller/renderer/sampler.cc
+++ b/impeller/core/sampler.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/renderer/sampler.h"
+#include "impeller/core/sampler.h"
 
 namespace impeller {
 
diff --git a/impeller/renderer/sampler.h b/impeller/core/sampler.h
similarity index 36%
rename from impeller/renderer/sampler.h
rename to impeller/core/sampler.h
index 2b14d2843c5a356df64ce67697ba2ec30e9a08e4..d5fb783816fc02efecbefb89cbb6f219378f1892 100644
--- a/impeller/renderer/sampler.h
+++ b/impeller/core/sampler.h
@@ -2,10 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_CORE_SAMPLER_H_
+#define FLUTTER_IMPELLER_CORE_SAMPLER_H_
 
-#include "flutter/fml/macros.h"
-#include "impeller/renderer/sampler_descriptor.h"
+#include <unordered_map>
+
+#include "impeller/base/comparable.h"
+#include "impeller/core/sampler_descriptor.h"
 
 namespace impeller {
 
@@ -13,17 +16,24 @@ class Sampler {
  public:
   virtual ~Sampler();
 
-  virtual bool IsValid() const = 0;
-
   const SamplerDescriptor& GetDescriptor() const;
 
  protected:
   SamplerDescriptor desc_;
 
-  Sampler(SamplerDescriptor desc);
+  explicit Sampler(SamplerDescriptor desc);
 
  private:
-  FML_DISALLOW_COPY_AND_ASSIGN(Sampler);
+  Sampler(const Sampler&) = delete;
+
+  Sampler& operator=(const Sampler&) = delete;
 };
 
+using SamplerMap = std::unordered_map<SamplerDescriptor,
+                                      std::unique_ptr<const Sampler>,
+                                      ComparableHash<SamplerDescriptor>,
+                                      ComparableEqual<SamplerDescriptor>>;
+
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_CORE_SAMPLER_H_
diff --git a/impeller/core/sampler_descriptor.cc b/impeller/core/sampler_descriptor.cc
new file mode 100644
index 0000000000000000000000000000000000000000..9e99089813dd3b8d41da4ea48d067393ee6d5588
--- /dev/null
+++ b/impeller/core/sampler_descriptor.cc
@@ -0,0 +1,22 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/core/sampler_descriptor.h"
+
+#include "fml/logging.h"
+
+namespace impeller {
+
+SamplerDescriptor::SamplerDescriptor() = default;
+
+SamplerDescriptor::SamplerDescriptor(std::string label,
+                                     MinMagFilter min_filter,
+                                     MinMagFilter mag_filter,
+                                     MipFilter mip_filter)
+    : min_filter(min_filter),
+      mag_filter(mag_filter),
+      mip_filter(mip_filter),
+      label(std::move(label)) {}
+
+}  // namespace impeller
diff --git a/impeller/renderer/sampler_descriptor.h b/impeller/core/sampler_descriptor.h
similarity index 75%
rename from impeller/renderer/sampler_descriptor.h
rename to impeller/core/sampler_descriptor.h
index 6ebb96e4e70cf0e4f77606cb30ed9535146c47cc..0e92745ec311f04edf78c0365b49930d2ea21ac1 100644
--- a/impeller/renderer/sampler_descriptor.h
+++ b/impeller/core/sampler_descriptor.h
@@ -2,23 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_CORE_SAMPLER_DESCRIPTOR_H_
+#define FLUTTER_IMPELLER_CORE_SAMPLER_DESCRIPTOR_H_
 
-#include <unordered_map>
-
-#include "flutter/fml/macros.h"
 #include "impeller/base/comparable.h"
-#include "impeller/renderer/formats.h"
+#include "impeller/core/formats.h"
 
 namespace impeller {
 
-class Sampler;
 class Context;
 
 struct SamplerDescriptor final : public Comparable<SamplerDescriptor> {
   MinMagFilter min_filter = MinMagFilter::kNearest;
   MinMagFilter mag_filter = MinMagFilter::kNearest;
-  MipFilter mip_filter = MipFilter::kNone;
+  MipFilter mip_filter = MipFilter::kNearest;
 
   SamplerAddressMode width_address_mode = SamplerAddressMode::kClampToEdge;
   SamplerAddressMode height_address_mode = SamplerAddressMode::kClampToEdge;
@@ -26,6 +23,13 @@ struct SamplerDescriptor final : public Comparable<SamplerDescriptor> {
 
   std::string label = "NN Clamp Sampler";
 
+  SamplerDescriptor();
+
+  SamplerDescriptor(std::string label,
+                    MinMagFilter min_filter,
+                    MinMagFilter mag_filter,
+                    MipFilter mip_filter);
+
   // Comparable<SamplerDescriptor>
   std::size_t GetHash() const override {
     return fml::HashCombine(min_filter, mag_filter, mip_filter,
@@ -43,9 +47,6 @@ struct SamplerDescriptor final : public Comparable<SamplerDescriptor> {
   }
 };
 
-using SamplerMap = std::unordered_map<SamplerDescriptor,
-                                      std::shared_ptr<const Sampler>,
-                                      ComparableHash<SamplerDescriptor>,
-                                      ComparableEqual<SamplerDescriptor>>;
-
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_CORE_SAMPLER_DESCRIPTOR_H_
diff --git a/impeller/renderer/shader_types.cc b/impeller/core/shader_types.cc
similarity index 83%
rename from impeller/renderer/shader_types.cc
rename to impeller/core/shader_types.cc
index f49b27cc45e686ee30c2ad2295ee6c74531ea3a6..8018c18eef0e64707495fdd0c716a586ba682fad 100644
--- a/impeller/renderer/shader_types.cc
+++ b/impeller/core/shader_types.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/renderer/shader_types.h"
+#include "impeller/core/shader_types.h"
 
 namespace impeller {
 
diff --git a/impeller/renderer/shader_types.h b/impeller/core/shader_types.h
similarity index 62%
rename from impeller/renderer/shader_types.h
rename to impeller/core/shader_types.h
index 400607c1f55f6c889706b73e2acf848ad6168659..25c405b1f0cb96833286bcc93d34bd07fabb9ab3 100644
--- a/impeller/renderer/shader_types.h
+++ b/impeller/core/shader_types.h
@@ -2,17 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_CORE_SHADER_TYPES_H_
+#define FLUTTER_IMPELLER_CORE_SHADER_TYPES_H_
 
 #include <cstddef>
+#include <cstdint>
 #include <optional>
 #include <string_view>
 #include <vector>
 
 #include "flutter/fml/hash_combine.h"
 #include "flutter/fml/logging.h"
+#include "impeller/core/runtime_types.h"
+#include "impeller/geometry/half.h"
 #include "impeller/geometry/matrix.h"
-#include "impeller/runtime_stage/runtime_types.h"
 
 namespace impeller {
 
@@ -20,8 +23,6 @@ enum class ShaderStage {
   kUnknown,
   kVertex,
   kFragment,
-  kTessellationControl,
-  kTessellationEvaluation,
   kCompute,
 };
 
@@ -33,10 +34,6 @@ constexpr ShaderStage ToShaderStage(RuntimeShaderStage stage) {
       return ShaderStage::kFragment;
     case RuntimeShaderStage::kCompute:
       return ShaderStage::kCompute;
-    case RuntimeShaderStage::kTessellationControl:
-      return ShaderStage::kTessellationControl;
-    case RuntimeShaderStage::kTessellationEvaluation:
-      return ShaderStage::kTessellationEvaluation;
   }
   FML_UNREACHABLE();
 }
@@ -73,14 +70,42 @@ struct ShaderStructMemberMetadata {
 };
 
 struct ShaderMetadata {
+  // This must match the uniform name in the shader program.
   std::string name;
   std::vector<ShaderStructMemberMetadata> members;
 };
 
+/// @brief Metadata required to bind a buffer.
+///
+/// OpenGL binding requires the usage of the separate shader metadata struct.
 struct ShaderUniformSlot {
+  /// @brief The name of the uniform slot.
   const char* name;
+
+  /// @brief `ext_res_0` is the Metal binding value.
   size_t ext_res_0;
+
+  /// @brief The Vulkan descriptor set index.
+  size_t set;
+
+  /// @brief The Vulkan binding value.
+  size_t binding;
+};
+
+/// @brief Metadata required to bind a combined texture and sampler.
+///
+/// OpenGL binding requires the usage of the separate shader metadata struct.
+struct SampledImageSlot {
+  /// @brief The name of the uniform slot.
+  const char* name;
+
+  /// @brief `ext_res_0` is the Metal binding value.
+  size_t texture_index;
+
+  /// @brief The Vulkan descriptor set index.
   size_t set;
+
+  /// @brief The Vulkan binding value.
   size_t binding;
 };
 
@@ -93,10 +118,11 @@ struct ShaderStageIOSlot {
   size_t bit_width;
   size_t vec_size;
   size_t columns;
+  size_t offset;
 
   constexpr size_t GetHash() const {
     return fml::HashCombine(name, location, set, binding, type, bit_width,
-                            vec_size, columns);
+                            vec_size, columns, offset);
   }
 
   constexpr bool operator==(const ShaderStageIOSlot& other) const {
@@ -107,20 +133,36 @@ struct ShaderStageIOSlot {
            type == other.type &&            //
            bit_width == other.bit_width &&  //
            vec_size == other.vec_size &&    //
-           columns == other.columns;
+           columns == other.columns &&      //
+           offset == other.offset;
   }
 };
 
-struct SampledImageSlot {
-  const char* name;
-  size_t texture_index;
-  size_t sampler_index;
+struct ShaderStageBufferLayout {
+  size_t stride;
   size_t binding;
-  size_t set;
 
-  constexpr bool HasTexture() const { return texture_index < 32u; }
+  constexpr size_t GetHash() const { return fml::HashCombine(stride, binding); }
 
-  constexpr bool HasSampler() const { return sampler_index < 32u; }
+  constexpr bool operator==(const ShaderStageBufferLayout& other) const {
+    return stride == other.stride &&  //
+           binding == other.binding;
+  }
+};
+
+enum class DescriptorType {
+  kUniformBuffer,
+  kStorageBuffer,
+  kSampledImage,
+  kImage,
+  kSampler,
+  kInputAttachment,
+};
+
+struct DescriptorSetLayout {
+  uint32_t binding;
+  DescriptorType descriptor_type;
+  ShaderStage shader_stage;
 };
 
 template <size_t Size>
@@ -145,3 +187,5 @@ inline constexpr Vector4 ToVector(Color color) {
 }
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_CORE_SHADER_TYPES_H_
diff --git a/impeller/renderer/texture.cc b/impeller/core/texture.cc
similarity index 64%
rename from impeller/renderer/texture.cc
rename to impeller/core/texture.cc
index 64860c181a038ec8aef71145d9ba986960c35b10..bb2f125aea503371b559967ccf41789f5c9a4654 100644
--- a/impeller/renderer/texture.cc
+++ b/impeller/core/texture.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/renderer/texture.h"
+#include "impeller/core/texture.h"
 
 #include "impeller/base/validation.h"
 
@@ -14,7 +14,8 @@ Texture::~Texture() = default;
 
 bool Texture::SetContents(const uint8_t* contents,
                           size_t length,
-                          size_t slice) {
+                          size_t slice,
+                          bool is_opaque) {
   if (!IsSliceValid(slice)) {
     VALIDATION_LOG << "Invalid slice for texture.";
     return false;
@@ -22,12 +23,14 @@ bool Texture::SetContents(const uint8_t* contents,
   if (!OnSetContents(contents, length, slice)) {
     return false;
   }
-  intent_ = TextureIntent::kUploadFromHost;
+  coordinate_system_ = TextureCoordinateSystem::kUploadFromHost;
+  is_opaque_ = is_opaque;
   return true;
 }
 
 bool Texture::SetContents(std::shared_ptr<const fml::Mapping> mapping,
-                          size_t slice) {
+                          size_t slice,
+                          bool is_opaque) {
   if (!IsSliceValid(slice)) {
     VALIDATION_LOG << "Invalid slice for texture.";
     return false;
@@ -38,10 +41,15 @@ bool Texture::SetContents(std::shared_ptr<const fml::Mapping> mapping,
   if (!OnSetContents(std::move(mapping), slice)) {
     return false;
   }
-  intent_ = TextureIntent::kUploadFromHost;
+  coordinate_system_ = TextureCoordinateSystem::kUploadFromHost;
+  is_opaque_ = is_opaque;
   return true;
 }
 
+bool Texture::IsOpaque() const {
+  return is_opaque_;
+}
+
 size_t Texture::GetMipCount() const {
   return GetTextureDescriptor().mip_count;
 }
@@ -54,6 +62,7 @@ bool Texture::IsSliceValid(size_t slice) const {
   switch (desc_.type) {
     case TextureType::kTexture2D:
     case TextureType::kTexture2DMultisample:
+    case TextureType::kTextureExternalOES:
       return slice == 0;
     case TextureType::kTextureCube:
       return slice <= 5;
@@ -61,16 +70,20 @@ bool Texture::IsSliceValid(size_t slice) const {
   FML_UNREACHABLE();
 }
 
-void Texture::SetIntent(TextureIntent intent) {
-  intent_ = intent;
+void Texture::SetCoordinateSystem(TextureCoordinateSystem coordinate_system) {
+  coordinate_system_ = coordinate_system;
 }
 
-TextureIntent Texture::GetIntent() const {
-  return intent_;
+TextureCoordinateSystem Texture::GetCoordinateSystem() const {
+  return coordinate_system_;
 }
 
 Scalar Texture::GetYCoordScale() const {
   return 1.0;
 }
 
+bool Texture::NeedsMipmapGeneration() const {
+  return !mipmap_generated_ && desc_.mip_count > 1;
+}
+
 }  // namespace impeller
diff --git a/impeller/renderer/texture.h b/impeller/core/texture.h
similarity index 54%
rename from impeller/renderer/texture.h
rename to impeller/core/texture.h
index 4491e06f859e93d03e2188e2bed90fafebae3dc5..af14a9e9331c91d0d54d0d1e566928ac95e8d521 100644
--- a/impeller/renderer/texture.h
+++ b/impeller/core/texture.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_CORE_TEXTURE_H_
+#define FLUTTER_IMPELLER_CORE_TEXTURE_H_
 
 #include <string_view>
 
-#include "flutter/fml/macros.h"
 #include "flutter/fml/mapping.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/texture_descriptor.h"
 #include "impeller/geometry/size.h"
-#include "impeller/renderer/formats.h"
-#include "impeller/renderer/texture_descriptor.h"
 
 namespace impeller {
 
@@ -22,25 +22,34 @@ class Texture {
 
   [[nodiscard]] bool SetContents(const uint8_t* contents,
                                  size_t length,
-                                 size_t slice = 0);
+                                 size_t slice = 0,
+                                 bool is_opaque = false);
 
   [[nodiscard]] bool SetContents(std::shared_ptr<const fml::Mapping> mapping,
-                                 size_t slice = 0);
+                                 size_t slice = 0,
+                                 bool is_opaque = false);
 
   virtual bool IsValid() const = 0;
 
   virtual ISize GetSize() const = 0;
 
+  bool IsOpaque() const;
+
   size_t GetMipCount() const;
 
   const TextureDescriptor& GetTextureDescriptor() const;
 
-  void SetIntent(TextureIntent intent);
+  void SetCoordinateSystem(TextureCoordinateSystem coordinate_system);
 
-  TextureIntent GetIntent() const;
+  TextureCoordinateSystem GetCoordinateSystem() const;
 
   virtual Scalar GetYCoordScale() const;
 
+  /// Returns true if mipmaps have never been generated.
+  /// The contents of the mipmap may be out of date if the root texture has been
+  /// modified and the mipmaps hasn't been regenerated.
+  bool NeedsMipmapGeneration() const;
+
  protected:
   explicit Texture(TextureDescriptor desc);
 
@@ -52,13 +61,21 @@ class Texture {
       std::shared_ptr<const fml::Mapping> mapping,
       size_t slice) = 0;
 
+  bool mipmap_generated_ = false;
+
  private:
-  TextureIntent intent_ = TextureIntent::kRenderToTexture;
+  TextureCoordinateSystem coordinate_system_ =
+      TextureCoordinateSystem::kRenderToTexture;
   const TextureDescriptor desc_;
+  bool is_opaque_ = false;
 
   bool IsSliceValid(size_t slice) const;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(Texture);
+  Texture(const Texture&) = delete;
+
+  Texture& operator=(const Texture&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_CORE_TEXTURE_H_
diff --git a/impeller/core/texture_descriptor.cc b/impeller/core/texture_descriptor.cc
new file mode 100644
index 0000000000000000000000000000000000000000..e55c7ada7068e1d6440cc60d2c6a6dac12003db0
--- /dev/null
+++ b/impeller/core/texture_descriptor.cc
@@ -0,0 +1,23 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/core/texture_descriptor.h"
+
+#include <sstream>
+
+namespace impeller {
+
+std::string TextureDescriptorToString(const TextureDescriptor& desc) {
+  std::stringstream stream;
+  stream << "StorageMode=" << StorageModeToString(desc.storage_mode) << ",";
+  stream << "Type=" << TextureTypeToString(desc.type) << ",";
+  stream << "Format=" << PixelFormatToString(desc.format) << ",";
+  stream << "Size=" << desc.size << ",";
+  stream << "MipCount=" << desc.mip_count << ",";
+  stream << "SampleCount=" << static_cast<size_t>(desc.sample_count) << ",";
+  stream << "Compression=" << CompressionTypeToString(desc.compression_type);
+  return stream.str();
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/texture_descriptor.h b/impeller/core/texture_descriptor.h
similarity index 44%
rename from impeller/renderer/texture_descriptor.h
rename to impeller/core/texture_descriptor.h
index d4ed61a1ef5b5add4b6c4fcb793891bb9434141f..66a293d0ca8e0c58ca323c567a42125f36fffc8b 100644
--- a/impeller/renderer/texture_descriptor.h
+++ b/impeller/core/texture_descriptor.h
@@ -2,19 +2,37 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
-
-#include <optional>
+#ifndef FLUTTER_IMPELLER_CORE_TEXTURE_DESCRIPTOR_H_
+#define FLUTTER_IMPELLER_CORE_TEXTURE_DESCRIPTOR_H_
 
+#include "impeller/core/formats.h"
 #include "impeller/geometry/size.h"
-#include "impeller/image/decompressed_image.h"
-#include "impeller/renderer/formats.h"
 
 namespace impeller {
 
+//------------------------------------------------------------------------------
+/// @brief      Additional compression to apply to a texture. This value is
+///             ignored on platforms which do not support it.
+///
+///             Lossy compression is only supported on iOS 15+ on A15 chips.
+enum class CompressionType {
+  kLossless,
+  kLossy,
+};
+
+constexpr const char* CompressionTypeToString(CompressionType type) {
+  switch (type) {
+    case CompressionType::kLossless:
+      return "Lossless";
+    case CompressionType::kLossy:
+      return "Lossy";
+  }
+  FML_UNREACHABLE();
+}
+
 //------------------------------------------------------------------------------
 /// @brief      A lightweight object that describes the attributes of a texture
-///             that can then used used an allocator to create that texture.
+///             that can then used an allocator to create that texture.
 ///
 struct TextureDescriptor {
   StorageMode storage_mode = StorageMode::kDeviceTransient;
@@ -22,9 +40,9 @@ struct TextureDescriptor {
   PixelFormat format = PixelFormat::kUnknown;
   ISize size;
   size_t mip_count = 1u;  // Size::MipCount is usually appropriate.
-  TextureUsageMask usage =
-      static_cast<TextureUsageMask>(TextureUsage::kShaderRead);
+  TextureUsageMask usage = TextureUsage::kShaderRead;
   SampleCount sample_count = SampleCount::kCount1;
+  CompressionType compression_type = CompressionType::kLossless;
 
   constexpr size_t GetByteSizeOfBaseMipLevel() const {
     if (!IsValid()) {
@@ -45,12 +63,31 @@ struct TextureDescriptor {
     return IsMultisampleCapable(type) ? count > 1 : count == 1;
   }
 
+  constexpr bool operator==(const TextureDescriptor& other) const {
+    return size == other.size &&                          //
+           storage_mode == other.storage_mode &&          //
+           format == other.format &&                      //
+           usage == other.usage &&                        //
+           sample_count == other.sample_count &&          //
+           type == other.type &&                          //
+           compression_type == other.compression_type &&  //
+           mip_count == other.mip_count;
+  }
+
+  constexpr bool operator!=(const TextureDescriptor& other) const {
+    return !(*this == other);
+  }
+
   constexpr bool IsValid() const {
     return format != PixelFormat::kUnknown &&  //
-           size.IsPositive() &&                //
+           !size.IsEmpty() &&                  //
            mip_count >= 1u &&                  //
            SamplingOptionsAreValid();
   }
 };
 
+std::string TextureDescriptorToString(const TextureDescriptor& desc);
+
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_CORE_TEXTURE_DESCRIPTOR_H_
diff --git a/impeller/renderer/vertex_buffer.cc b/impeller/core/vertex_buffer.cc
similarity index 82%
rename from impeller/renderer/vertex_buffer.cc
rename to impeller/core/vertex_buffer.cc
index e73f64e533a827af1d813ba184ce55989331c947..900bcffcf8d372cca0254aea2731ad08af20974b 100644
--- a/impeller/renderer/vertex_buffer.cc
+++ b/impeller/core/vertex_buffer.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/renderer/vertex_buffer.h"
+#include "impeller/core/vertex_buffer.h"
 
 namespace impeller {
 
diff --git a/impeller/core/vertex_buffer.h b/impeller/core/vertex_buffer.h
new file mode 100644
index 0000000000000000000000000000000000000000..b88654ce9e552661db0cea4f5894100a7c28d888
--- /dev/null
+++ b/impeller/core/vertex_buffer.h
@@ -0,0 +1,39 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_CORE_VERTEX_BUFFER_H_
+#define FLUTTER_IMPELLER_CORE_VERTEX_BUFFER_H_
+
+#include "impeller/core/buffer_view.h"
+#include "impeller/core/formats.h"
+
+namespace impeller {
+
+struct VertexBuffer {
+  BufferView vertex_buffer;
+
+  //----------------------------------------------------------------------------
+  /// The index buffer binding used by the vertex shader stage.
+  BufferView index_buffer;
+
+  //----------------------------------------------------------------------------
+  /// The total count of vertices, either in the vertex_buffer if the
+  /// index_type is IndexType::kNone or in the index_buffer otherwise.
+  size_t vertex_count = 0u;
+
+  //----------------------------------------------------------------------------
+  /// The type of indices in the index buffer. The indices must be tightly
+  /// packed in the index buffer.
+  ///
+  IndexType index_type = IndexType::kUnknown;
+
+  constexpr explicit operator bool() const {
+    return static_cast<bool>(vertex_buffer) &&
+           (index_type == IndexType::kNone || static_cast<bool>(index_buffer));
+  }
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_CORE_VERTEX_BUFFER_H_
diff --git a/impeller/display_list/BUILD.gn b/impeller/display_list/BUILD.gn
index 48cf0f1619f3828eb7cce8d504a3161425a88e58..d5acdc83a74aecd77cb2f1b98e3a7ce8dec05f79 100644
--- a/impeller/display_list/BUILD.gn
+++ b/impeller/display_list/BUILD.gn
@@ -4,37 +4,83 @@
 
 import("//flutter/impeller/tools/impeller.gni")
 
+impeller_component("skia_conversions") {
+  sources = [
+    "skia_conversions.cc",
+    "skia_conversions.h",
+  ]
+
+  public_deps = [
+    "../core",
+    "../geometry",
+    "//flutter/display_list",
+    "//flutter/fml",
+    "//flutter/skia",
+    "//flutter/skia/modules/skparagraph",
+  ]
+}
+
 impeller_component("display_list") {
   sources = [
-    "display_list_dispatcher.cc",
-    "display_list_dispatcher.h",
-    "display_list_image_impeller.cc",
-    "display_list_image_impeller.h",
-    "display_list_vertices_geometry.cc",
-    "display_list_vertices_geometry.h",
+    "dl_dispatcher.cc",
+    "dl_dispatcher.h",
+    "dl_image_impeller.cc",
+    "dl_image_impeller.h",
+    "dl_vertices_geometry.cc",
+    "dl_vertices_geometry.h",
     "nine_patch_converter.cc",
     "nine_patch_converter.h",
   ]
 
   public_deps = [
+    ":skia_conversions",
     "../aiks",
     "//flutter/display_list",
     "//flutter/fml",
-    "//third_party/skia",
+    "//flutter/impeller/typographer/backends/skia:typographer_skia_backend",
+    "//flutter/skia",
   ]
+
+  if (!defined(defines)) {
+    defines = []
+  }
+  if (impeller_enable_3d) {
+    defines += [ "IMPELLER_ENABLE_3D" ]
+  }
 }
 
 impeller_component("display_list_unittests") {
   testonly = true
 
   sources = [
-    "display_list_playground.cc",
-    "display_list_playground.h",
-    "display_list_unittests.cc",
+    "dl_playground.cc",
+    "dl_playground.h",
+    "dl_unittests.cc",
   ]
 
   deps = [
     ":display_list",
     "../playground:playground_test",
+    "//flutter/impeller/scene",
+    "//flutter/impeller/typographer/backends/stb:typographer_stb_backend",
+    "//flutter/third_party/txt",
+  ]
+
+  if (!defined(defines)) {
+    defines = []
+  }
+  if (impeller_enable_3d) {
+    defines += [ "IMPELLER_ENABLE_3D" ]
+  }
+}
+
+impeller_component("skia_conversions_unittests") {
+  testonly = true
+
+  sources = [ "skia_conversions_unittests.cc" ]
+
+  deps = [
+    ":skia_conversions",
+    "//flutter/testing:testing_lib",
   ]
 }
diff --git a/impeller/display_list/display_list_vertices_geometry.cc b/impeller/display_list/display_list_vertices_geometry.cc
deleted file mode 100644
index e7ddf3a1a492324fe2785d8ea22b6720b6d451b9..0000000000000000000000000000000000000000
--- a/impeller/display_list/display_list_vertices_geometry.cc
+++ /dev/null
@@ -1,247 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "impeller/display_list/display_list_vertices_geometry.h"
-
-#include "impeller/entity/contents/content_context.h"
-#include "impeller/entity/entity.h"
-#include "impeller/entity/position_color.vert.h"
-#include "impeller/geometry/matrix.h"
-#include "impeller/geometry/path_builder.h"
-#include "impeller/geometry/point.h"
-#include "impeller/renderer/device_buffer.h"
-#include "impeller/renderer/render_pass.h"
-#include "third_party/skia/include/core/SkPoint.h"
-#include "third_party/skia/include/core/SkRect.h"
-
-namespace impeller {
-
-static Rect ToRect(const SkRect& rect) {
-  return Rect::MakeLTRB(rect.fLeft, rect.fTop, rect.fRight, rect.fBottom);
-}
-
-// Fan mode isn't natively supported. Unroll into triangle mode by
-// manipulating the index array.
-//
-// In Triangle fan, the first vertex is shared across all triangles, and then
-// each sliding window of two vertices plus that first vertex defines a
-// triangle.
-static std::vector<uint16_t> fromFanIndices(
-    const flutter::DlVertices* vertices) {
-  FML_DCHECK(vertices->vertex_count() >= 3);
-  FML_DCHECK(vertices->mode() == flutter::DlVertexMode::kTriangleFan);
-
-  std::vector<uint16_t> indices;
-
-  // Un-fan index buffer if provided.
-  if (vertices->index_count() > 0) {
-    auto* dl_indices = vertices->indices();
-    auto center_point = dl_indices[0];
-    for (int i = 1; i < vertices->index_count() - 1; i++) {
-      indices.push_back(center_point);
-      indices.push_back(dl_indices[i]);
-      indices.push_back(dl_indices[i + 1]);
-    }
-  } else {
-    // If indices were not provided, create an index buffer that unfans
-    // triangles instead of re-writing points, colors, et cetera.
-    for (int i = 1; i < vertices->vertex_count() - 1; i++) {
-      indices.push_back(0);
-      indices.push_back(i);
-      indices.push_back(i + 1);
-    }
-  }
-  return indices;
-}
-
-/////// Vertices Geometry ///////
-
-// static
-std::unique_ptr<VerticesGeometry> DLVerticesGeometry::MakeVertices(
-    const flutter::DlVertices* vertices) {
-  return std::make_unique<DLVerticesGeometry>(vertices);
-}
-
-DLVerticesGeometry::DLVerticesGeometry(const flutter::DlVertices* vertices)
-    : vertices_(vertices) {
-  NormalizeIndices();
-}
-
-DLVerticesGeometry::~DLVerticesGeometry() = default;
-
-void DLVerticesGeometry::NormalizeIndices() {
-  // Convert triangle fan if present.
-  if (vertices_->mode() == flutter::DlVertexMode::kTriangleFan) {
-    normalized_indices_ = fromFanIndices(vertices_);
-    return;
-  }
-
-  auto index_count = vertices_->index_count();
-  auto vertex_count = vertices_->vertex_count();
-  if (index_count != 0 || vertex_count == 0) {
-    return;
-  }
-  normalized_indices_.reserve(vertex_count);
-  for (auto i = 0; i < vertex_count; i++) {
-    normalized_indices_.push_back(i);
-  }
-}
-
-static PrimitiveType GetPrimitiveType(const flutter::DlVertices* vertices) {
-  switch (vertices->mode()) {
-    case flutter::DlVertexMode::kTriangles:
-      return PrimitiveType::kTriangle;
-    case flutter::DlVertexMode::kTriangleStrip:
-      return PrimitiveType::kTriangleStrip;
-    case flutter::DlVertexMode::kTriangleFan:
-      // Unrolled into triangle mode.
-      return PrimitiveType::kTriangle;
-  }
-}
-
-GeometryResult DLVerticesGeometry::GetPositionBuffer(
-    const ContentContext& renderer,
-    const Entity& entity,
-    RenderPass& pass) {
-  auto index_count = normalized_indices_.size() == 0
-                         ? vertices_->index_count()
-                         : normalized_indices_.size();
-  auto vertex_count = vertices_->vertex_count();
-  auto* dl_indices = normalized_indices_.size() == 0
-                         ? vertices_->indices()
-                         : normalized_indices_.data();
-  auto* dl_vertices = vertices_->vertices();
-
-  size_t total_vtx_bytes = vertex_count * sizeof(float) * 2;
-  size_t total_idx_bytes = index_count * sizeof(uint16_t);
-
-  DeviceBufferDescriptor buffer_desc;
-  buffer_desc.size = total_vtx_bytes + total_idx_bytes;
-  buffer_desc.storage_mode = StorageMode::kHostVisible;
-
-  auto buffer =
-      renderer.GetContext()->GetResourceAllocator()->CreateBuffer(buffer_desc);
-
-  if (!buffer->CopyHostBuffer(reinterpret_cast<const uint8_t*>(dl_vertices),
-                              Range{0, total_vtx_bytes}, 0)) {
-    return {};
-  }
-  if (!buffer->CopyHostBuffer(
-          reinterpret_cast<uint8_t*>(const_cast<uint16_t*>(dl_indices)),
-          Range{0, total_idx_bytes}, total_vtx_bytes)) {
-    return {};
-  }
-
-  return GeometryResult{
-      .type = GetPrimitiveType(vertices_),
-      .vertex_buffer =
-          {
-              .vertex_buffer = {.buffer = buffer,
-                                .range = Range{0, total_vtx_bytes}},
-              .index_buffer = {.buffer = buffer,
-                               .range =
-                                   Range{total_vtx_bytes, total_idx_bytes}},
-              .index_count = index_count,
-              .index_type = IndexType::k16bit,
-          },
-      .transform = Matrix::MakeOrthographic(pass.GetRenderTargetSize()) *
-                   entity.GetTransformation(),
-      .prevent_overdraw = false,
-  };
-}
-
-GeometryResult DLVerticesGeometry::GetPositionColorBuffer(
-    const ContentContext& renderer,
-    const Entity& entity,
-    RenderPass& pass,
-    Color paint_color,
-    BlendMode blend_mode) {
-  using VS = GeometryColorPipeline::VertexShader;
-
-  auto index_count = normalized_indices_.size() == 0
-                         ? vertices_->index_count()
-                         : normalized_indices_.size();
-  auto vertex_count = vertices_->vertex_count();
-  auto* dl_indices = normalized_indices_.size() == 0
-                         ? vertices_->indices()
-                         : normalized_indices_.data();
-  auto* dl_vertices = vertices_->vertices();
-  auto* dl_colors = vertices_->colors();
-
-  std::vector<VS::PerVertexData> vertex_data(vertex_count);
-  {
-    for (auto i = 0; i < vertex_count; i++) {
-      auto dl_color = dl_colors[i];
-      auto pre_color = Color(dl_color.getRedF(), dl_color.getGreenF(),
-                             dl_color.getBlueF(), dl_color.getAlphaF());
-      auto color = Color::BlendColor(paint_color, pre_color, blend_mode);
-      auto sk_point = dl_vertices[i];
-      vertex_data[i] = {
-          .position = Point(sk_point.x(), sk_point.y()),
-          .color = color,
-      };
-    }
-  }
-
-  size_t total_vtx_bytes = vertex_data.size() * sizeof(VS::PerVertexData);
-  size_t total_idx_bytes = index_count * sizeof(uint16_t);
-
-  DeviceBufferDescriptor buffer_desc;
-  buffer_desc.size = total_vtx_bytes + total_idx_bytes;
-  buffer_desc.storage_mode = StorageMode::kHostVisible;
-
-  auto buffer =
-      renderer.GetContext()->GetResourceAllocator()->CreateBuffer(buffer_desc);
-
-  if (!buffer->CopyHostBuffer(reinterpret_cast<uint8_t*>(vertex_data.data()),
-                              Range{0, total_vtx_bytes}, 0)) {
-    return {};
-  }
-  if (!buffer->CopyHostBuffer(
-          reinterpret_cast<uint8_t*>(const_cast<uint16_t*>(dl_indices)),
-          Range{0, total_idx_bytes}, total_vtx_bytes)) {
-    return {};
-  }
-
-  return GeometryResult{
-      .type = GetPrimitiveType(vertices_),
-      .vertex_buffer =
-          {
-              .vertex_buffer = {.buffer = buffer,
-                                .range = Range{0, total_vtx_bytes}},
-              .index_buffer = {.buffer = buffer,
-                               .range =
-                                   Range{total_vtx_bytes, total_idx_bytes}},
-              .index_count = index_count,
-              .index_type = IndexType::k16bit,
-          },
-      .transform = Matrix::MakeOrthographic(pass.GetRenderTargetSize()) *
-                   entity.GetTransformation(),
-      .prevent_overdraw = false,
-  };
-}
-
-GeometryResult DLVerticesGeometry::GetPositionUVBuffer(
-    const ContentContext& renderer,
-    const Entity& entity,
-    RenderPass& pass) {
-  // TODO(jonahwilliams): support texture coordinates in vertices
-  // https://github.com/flutter/flutter/issues/109956
-  return {};
-}
-
-GeometryVertexType DLVerticesGeometry::GetVertexType() const {
-  auto* dl_colors = vertices_->colors();
-  if (dl_colors != nullptr) {
-    return GeometryVertexType::kColor;
-  }
-  return GeometryVertexType::kPosition;
-}
-
-std::optional<Rect> DLVerticesGeometry::GetCoverage(
-    const Matrix& transform) const {
-  return ToRect(vertices_->bounds()).TransformBounds(transform);
-}
-
-}  // namespace impeller
diff --git a/impeller/display_list/display_list_dispatcher.cc b/impeller/display_list/dl_dispatcher.cc
similarity index 38%
rename from impeller/display_list/display_list_dispatcher.cc
rename to impeller/display_list/dl_dispatcher.cc
index eba5782e43b2217fb0e3a3a85f2ddeef4499b34a..8be3b9daf39bf2c16f3403a5cc2ecba2979502a0 100644
--- a/impeller/display_list/display_list_dispatcher.cc
+++ b/impeller/display_list/dl_dispatcher.cc
@@ -2,52 +2,47 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/display_list/display_list_dispatcher.h"
+#include "impeller/display_list/dl_dispatcher.h"
 
 #include <algorithm>
 #include <cstring>
 #include <memory>
 #include <optional>
-#include <unordered_map>
 #include <utility>
 #include <vector>
 
-#include "display_list/display_list_blend_mode.h"
-#include "display_list/display_list_color_filter.h"
-#include "display_list/display_list_color_source.h"
-#include "display_list/display_list_path_effect.h"
-#include "display_list/display_list_tile_mode.h"
 #include "flutter/fml/logging.h"
 #include "flutter/fml/trace_event.h"
-#include "impeller/display_list/display_list_image_impeller.h"
-#include "impeller/display_list/display_list_vertices_geometry.h"
+#include "impeller/aiks/color_filter.h"
+#include "impeller/core/formats.h"
+#include "impeller/display_list/dl_vertices_geometry.h"
 #include "impeller/display_list/nine_patch_converter.h"
+#include "impeller/display_list/skia_conversions.h"
 #include "impeller/entity/contents/filters/filter_contents.h"
 #include "impeller/entity/contents/filters/inputs/filter_input.h"
-#include "impeller/entity/contents/linear_gradient_contents.h"
-#include "impeller/entity/contents/radial_gradient_contents.h"
 #include "impeller/entity/contents/runtime_effect_contents.h"
-#include "impeller/entity/contents/sweep_gradient_contents.h"
-#include "impeller/entity/contents/tiled_texture_contents.h"
 #include "impeller/entity/entity.h"
-#include "impeller/entity/geometry.h"
 #include "impeller/geometry/path.h"
 #include "impeller/geometry/path_builder.h"
 #include "impeller/geometry/scalar.h"
 #include "impeller/geometry/sigma.h"
-#include "impeller/renderer/formats.h"
-#include "impeller/typographer/backends/skia/text_frame_skia.h"
 
-#include "third_party/skia/include/core/SkColor.h"
+#if IMPELLER_ENABLE_3D
+#include "impeller/entity/contents/scene_contents.h"
+#endif  // IMPELLER_ENABLE_3D
 
 namespace impeller {
 
 #define UNIMPLEMENTED \
   FML_DLOG(ERROR) << "Unimplemented detail in " << __FUNCTION__;
 
-DisplayListDispatcher::DisplayListDispatcher() = default;
+DlDispatcher::DlDispatcher() = default;
 
-DisplayListDispatcher::~DisplayListDispatcher() = default;
+DlDispatcher::DlDispatcher(Rect cull_rect) : canvas_(cull_rect) {}
+
+DlDispatcher::DlDispatcher(IRect cull_rect) : canvas_(cull_rect) {}
+
+DlDispatcher::~DlDispatcher() = default;
 
 static BlendMode ToBlendMode(flutter::DlBlendMode mode) {
   switch (mode) {
@@ -135,6 +130,9 @@ static impeller::SamplerDescriptor ToSamplerDescriptor(
       desc.label = "Nearest Sampler";
       break;
     case flutter::DlImageSampling::kLinear:
+    // Impeller doesn't support cubic sampling, but linear is closer to correct
+    // than nearest for this case.
+    case flutter::DlImageSampling::kCubic:
       desc.min_filter = desc.mag_filter = impeller::MinMagFilter::kLinear;
       desc.label = "Linear Sampler";
       break;
@@ -143,8 +141,6 @@ static impeller::SamplerDescriptor ToSamplerDescriptor(
       desc.mip_filter = impeller::MipFilter::kLinear;
       desc.label = "Mipmap Linear Sampler";
       break;
-    default:
-      break;
   }
   return desc;
 }
@@ -178,14 +174,11 @@ static Matrix ToMatrix(const SkMatrix& m) {
   };
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::setAntiAlias(bool aa) {
+// |flutter::DlOpReceiver|
+void DlDispatcher::setAntiAlias(bool aa) {
   // Nothing to do because AA is implicit.
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::setDither(bool dither) {}
-
 static Paint::Style ToStyle(flutter::DlDrawStyle style) {
   switch (style) {
     case flutter::DlDrawStyle::kFill:
@@ -199,13 +192,13 @@ static Paint::Style ToStyle(flutter::DlDrawStyle style) {
   return Paint::Style::kFill;
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::setStyle(flutter::DlDrawStyle style) {
+// |flutter::DlOpReceiver|
+void DlDispatcher::setDrawStyle(flutter::DlDrawStyle style) {
   paint_.style = ToStyle(style);
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::setColor(flutter::DlColor color) {
+// |flutter::DlOpReceiver|
+void DlDispatcher::setColor(flutter::DlColor color) {
   paint_.color = {
       color.getRedF(),
       color.getGreenF(),
@@ -214,18 +207,18 @@ void DisplayListDispatcher::setColor(flutter::DlColor color) {
   };
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::setStrokeWidth(SkScalar width) {
+// |flutter::DlOpReceiver|
+void DlDispatcher::setStrokeWidth(SkScalar width) {
   paint_.stroke_width = width;
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::setStrokeMiter(SkScalar limit) {
+// |flutter::DlOpReceiver|
+void DlDispatcher::setStrokeMiter(SkScalar limit) {
   paint_.stroke_miter = limit;
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::setStrokeCap(flutter::DlStrokeCap cap) {
+// |flutter::DlOpReceiver|
+void DlDispatcher::setStrokeCap(flutter::DlStrokeCap cap) {
   switch (cap) {
     case flutter::DlStrokeCap::kButt:
       paint_.stroke_cap = Cap::kButt;
@@ -239,8 +232,8 @@ void DisplayListDispatcher::setStrokeCap(flutter::DlStrokeCap cap) {
   }
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::setStrokeJoin(flutter::DlStrokeJoin join) {
+// |flutter::DlOpReceiver|
+void DlDispatcher::setStrokeJoin(flutter::DlStrokeJoin join) {
   switch (join) {
     case flutter::DlStrokeJoin::kMiter:
       paint_.stroke_join = Join::kMiter;
@@ -254,198 +247,141 @@ void DisplayListDispatcher::setStrokeJoin(flutter::DlStrokeJoin join) {
   }
 }
 
-static Point ToPoint(const SkPoint& point) {
-  return Point::MakeXY(point.fX, point.fY);
-}
-
-static Color ToColor(const SkColor& color) {
-  return {
-      static_cast<Scalar>(SkColorGetR(color) / 255.0),  //
-      static_cast<Scalar>(SkColorGetG(color) / 255.0),  //
-      static_cast<Scalar>(SkColorGetB(color) / 255.0),  //
-      static_cast<Scalar>(SkColorGetA(color) / 255.0)   //
-  };
-}
-
 static std::vector<Color> ToColors(const flutter::DlColor colors[], int count) {
   auto result = std::vector<Color>();
   if (colors == nullptr) {
     return result;
   }
   for (int i = 0; i < count; i++) {
-    result.push_back(ToColor(colors[i]));
+    result.push_back(skia_conversions::ToColor(colors[i]));
   }
   return result;
 }
 
-static std::vector<Matrix> ToRSXForms(const SkRSXform xform[], int count) {
-  auto result = std::vector<Matrix>();
-  for (int i = 0; i < count; i++) {
-    auto form = xform[i];
-    // clang-format off
-    auto matrix = Matrix{
-      form.fSCos, form.fSSin, 0, 0,
-     -form.fSSin, form.fSCos, 0, 0,
-      0,          0,          1, 0,
-      form.fTx,   form.fTy,   0, 1
-    };
-    // clang-format on
-    result.push_back(matrix);
-  }
-  return result;
-}
-
-// Convert display list colors + stops into impeller colors and stops, taking
-// care to ensure that the stops always start with 0.0 and end with 1.0.
-template <typename T>
-static void ConvertStops(T* gradient,
-                         std::vector<Color>* colors,
-                         std::vector<float>* stops) {
-  FML_DCHECK(gradient->stop_count() >= 2);
-
-  auto* dl_colors = gradient->colors();
-  auto* dl_stops = gradient->stops();
-  if (dl_stops[0] != 0.0) {
-    colors->emplace_back(ToColor(dl_colors[0]));
-    stops->emplace_back(0);
-  }
-  for (auto i = 0; i < gradient->stop_count(); i++) {
-    colors->emplace_back(ToColor(dl_colors[i]));
-    stops->emplace_back(dl_stops[i]);
-  }
-  if (stops->back() != 1.0) {
-    colors->emplace_back(colors->back());
-    stops->emplace_back(1.0);
-  }
-}
-
-static std::optional<Paint::ColorSourceType> ToColorSourceType(
+static std::optional<ColorSource::Type> ToColorSourceType(
     flutter::DlColorSourceType type) {
   switch (type) {
     case flutter::DlColorSourceType::kColor:
-      return Paint::ColorSourceType::kColor;
+      return ColorSource::Type::kColor;
     case flutter::DlColorSourceType::kImage:
-      return Paint::ColorSourceType::kImage;
+      return ColorSource::Type::kImage;
     case flutter::DlColorSourceType::kLinearGradient:
-      return Paint::ColorSourceType::kLinearGradient;
+      return ColorSource::Type::kLinearGradient;
     case flutter::DlColorSourceType::kRadialGradient:
-      return Paint::ColorSourceType::kRadialGradient;
+      return ColorSource::Type::kRadialGradient;
     case flutter::DlColorSourceType::kConicalGradient:
-      return Paint::ColorSourceType::kConicalGradient;
+      return ColorSource::Type::kConicalGradient;
     case flutter::DlColorSourceType::kSweepGradient:
-      return Paint::ColorSourceType::kSweepGradient;
+      return ColorSource::Type::kSweepGradient;
     case flutter::DlColorSourceType::kRuntimeEffect:
-      return Paint::ColorSourceType::kRuntimeEffect;
-    case flutter::DlColorSourceType::kUnknown:
-      return std::nullopt;
+      return ColorSource::Type::kRuntimeEffect;
+#ifdef IMPELLER_ENABLE_3D
+    case flutter::DlColorSourceType::kScene:
+      return ColorSource::Type::kScene;
+#endif  // IMPELLER_ENABLE_3D
   }
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::setColorSource(
-    const flutter::DlColorSource* source) {
+// |flutter::DlOpReceiver|
+void DlDispatcher::setColorSource(const flutter::DlColorSource* source) {
   if (!source) {
-    paint_.color_source = std::nullopt;
-    paint_.color_source_type = Paint::ColorSourceType::kColor;
+    paint_.color_source = ColorSource::MakeColor();
     return;
   }
 
-  std::optional<Paint::ColorSourceType> type =
-      ToColorSourceType(source->type());
+  std::optional<ColorSource::Type> type = ToColorSourceType(source->type());
 
   if (!type.has_value()) {
     FML_LOG(ERROR) << "Requested ColorSourceType::kUnknown";
-    paint_.color_source = std::nullopt;
-    paint_.color_source_type = Paint::ColorSourceType::kColor;
+    paint_.color_source = ColorSource::MakeColor();
     return;
   }
 
-  paint_.color_source_type = type.value();
-
   switch (type.value()) {
-    case Paint::ColorSourceType::kColor: {
+    case ColorSource::Type::kColor: {
       const flutter::DlColorColorSource* color = source->asColor();
-      paint_.color_source = std::nullopt;
+
+      paint_.color_source = ColorSource::MakeColor();
       setColor(color->color());
       FML_DCHECK(color);
       return;
     }
-    case Paint::ColorSourceType::kLinearGradient: {
+    case ColorSource::Type::kLinearGradient: {
       const flutter::DlLinearGradientColorSource* linear =
           source->asLinearGradient();
       FML_DCHECK(linear);
-      auto start_point = ToPoint(linear->start_point());
-      auto end_point = ToPoint(linear->end_point());
+      auto start_point = skia_conversions::ToPoint(linear->start_point());
+      auto end_point = skia_conversions::ToPoint(linear->end_point());
       std::vector<Color> colors;
       std::vector<float> stops;
-      ConvertStops(linear, &colors, &stops);
+      skia_conversions::ConvertStops(linear, colors, stops);
 
       auto tile_mode = ToTileMode(linear->tile_mode());
       auto matrix = ToMatrix(linear->matrix());
-      paint_.color_source = [start_point, end_point, colors = std::move(colors),
-                             stops = std::move(stops), tile_mode, matrix]() {
-        auto contents = std::make_shared<LinearGradientContents>();
-        contents->SetColors(colors);
-        contents->SetStops(stops);
-        contents->SetEndPoints(start_point, end_point);
-        contents->SetTileMode(tile_mode);
-        contents->SetMatrix(matrix);
-        return contents;
-      };
+
+      paint_.color_source = ColorSource::MakeLinearGradient(
+          start_point, end_point, std::move(colors), std::move(stops),
+          tile_mode, matrix);
+      return;
+    }
+    case ColorSource::Type::kConicalGradient: {
+      const flutter::DlConicalGradientColorSource* conical_gradient =
+          source->asConicalGradient();
+      FML_DCHECK(conical_gradient);
+      Point center = skia_conversions::ToPoint(conical_gradient->end_center());
+      SkScalar radius = conical_gradient->end_radius();
+      Point focus_center =
+          skia_conversions::ToPoint(conical_gradient->start_center());
+      SkScalar focus_radius = conical_gradient->start_radius();
+      std::vector<Color> colors;
+      std::vector<float> stops;
+      skia_conversions::ConvertStops(conical_gradient, colors, stops);
+
+      auto tile_mode = ToTileMode(conical_gradient->tile_mode());
+      auto matrix = ToMatrix(conical_gradient->matrix());
+
+      paint_.color_source = ColorSource::MakeConicalGradient(
+          center, radius, std::move(colors), std::move(stops), focus_center,
+          focus_radius, tile_mode, matrix);
       return;
     }
-    case Paint::ColorSourceType::kRadialGradient: {
+    case ColorSource::Type::kRadialGradient: {
       const flutter::DlRadialGradientColorSource* radialGradient =
           source->asRadialGradient();
       FML_DCHECK(radialGradient);
-      auto center = ToPoint(radialGradient->center());
+      auto center = skia_conversions::ToPoint(radialGradient->center());
       auto radius = radialGradient->radius();
       std::vector<Color> colors;
       std::vector<float> stops;
-      ConvertStops(radialGradient, &colors, &stops);
+      skia_conversions::ConvertStops(radialGradient, colors, stops);
 
       auto tile_mode = ToTileMode(radialGradient->tile_mode());
       auto matrix = ToMatrix(radialGradient->matrix());
-      paint_.color_source = [center, radius, colors = std::move(colors),
-                             stops = std::move(stops), tile_mode, matrix]() {
-        auto contents = std::make_shared<RadialGradientContents>();
-        contents->SetColors(colors);
-        contents->SetStops(stops);
-        contents->SetCenterAndRadius(center, radius);
-        contents->SetTileMode(tile_mode);
-        contents->SetMatrix(matrix);
-        return contents;
-      };
+      paint_.color_source =
+          ColorSource::MakeRadialGradient(center, radius, std::move(colors),
+                                          std::move(stops), tile_mode, matrix);
       return;
     }
-    case Paint::ColorSourceType::kSweepGradient: {
+    case ColorSource::Type::kSweepGradient: {
       const flutter::DlSweepGradientColorSource* sweepGradient =
           source->asSweepGradient();
       FML_DCHECK(sweepGradient);
 
-      auto center = ToPoint(sweepGradient->center());
+      auto center = skia_conversions::ToPoint(sweepGradient->center());
       auto start_angle = Degrees(sweepGradient->start());
       auto end_angle = Degrees(sweepGradient->end());
       std::vector<Color> colors;
       std::vector<float> stops;
-      ConvertStops(sweepGradient, &colors, &stops);
+      skia_conversions::ConvertStops(sweepGradient, colors, stops);
 
       auto tile_mode = ToTileMode(sweepGradient->tile_mode());
       auto matrix = ToMatrix(sweepGradient->matrix());
-      paint_.color_source = [center, start_angle, end_angle,
-                             colors = std::move(colors),
-                             stops = std::move(stops), tile_mode, matrix]() {
-        auto contents = std::make_shared<SweepGradientContents>();
-        contents->SetCenterAndAngles(center, start_angle, end_angle);
-        contents->SetColors(colors);
-        contents->SetStops(stops);
-        contents->SetTileMode(tile_mode);
-        contents->SetMatrix(matrix);
-        return contents;
-      };
+      paint_.color_source = ColorSource::MakeSweepGradient(
+          center, start_angle, end_angle, std::move(colors), std::move(stops),
+          tile_mode, matrix);
       return;
     }
-    case Paint::ColorSourceType::kImage: {
+    case ColorSource::Type::kImage: {
       const flutter::DlImageColorSource* image_color_source = source->asImage();
       FML_DCHECK(image_color_source &&
                  image_color_source->image()->impeller_texture());
@@ -454,18 +390,11 @@ void DisplayListDispatcher::setColorSource(
       auto y_tile_mode = ToTileMode(image_color_source->vertical_tile_mode());
       auto desc = ToSamplerDescriptor(image_color_source->sampling());
       auto matrix = ToMatrix(image_color_source->matrix());
-      paint_.color_source = [texture, x_tile_mode, y_tile_mode, desc,
-                             matrix]() {
-        auto contents = std::make_shared<TiledTextureContents>();
-        contents->SetTexture(texture);
-        contents->SetTileModes(x_tile_mode, y_tile_mode);
-        contents->SetSamplerDescriptor(desc);
-        contents->SetMatrix(matrix);
-        return contents;
-      };
+      paint_.color_source = ColorSource::MakeImage(texture, x_tile_mode,
+                                                   y_tile_mode, desc, matrix);
       return;
     }
-    case Paint::ColorSourceType::kRuntimeEffect: {
+    case ColorSource::Type::kRuntimeEffect: {
       const flutter::DlRuntimeEffectColorSource* runtime_effect_color_source =
           source->asRuntimeEffect();
       auto runtime_stage =
@@ -491,104 +420,90 @@ void DisplayListDispatcher::setColorSource(
         });
       }
 
-      paint_.color_source = [runtime_stage, uniform_data, texture_inputs]() {
-        auto contents = std::make_shared<RuntimeEffectContents>();
-        contents->SetRuntimeStage(runtime_stage);
-        contents->SetUniformData(uniform_data);
-        contents->SetTextureInputs(texture_inputs);
-        return contents;
-      };
+      paint_.color_source = ColorSource::MakeRuntimeEffect(
+          runtime_stage, uniform_data, texture_inputs);
+      return;
+    }
+    case ColorSource::Type::kScene: {
+#ifdef IMPELLER_ENABLE_3D
+      const flutter::DlSceneColorSource* scene_color_source = source->asScene();
+      std::shared_ptr<scene::Node> scene_node =
+          scene_color_source->scene_node();
+      Matrix camera_transform = scene_color_source->camera_matrix();
+
+      paint_.color_source =
+          ColorSource::MakeScene(scene_node, camera_transform);
+#else   // IMPELLER_ENABLE_3D
+      FML_LOG(ERROR) << "ColorSourceType::kScene can only be used if Impeller "
+                        "Scene is enabled.";
+#endif  // IMPELLER_ENABLE_3D
       return;
     }
-    case Paint::ColorSourceType::kConicalGradient:
-      UNIMPLEMENTED;
-      break;
   }
 }
 
-static std::optional<Paint::ColorFilterProc> ToColorFilterProc(
+static std::shared_ptr<ColorFilter> ToColorFilter(
     const flutter::DlColorFilter* filter) {
   if (filter == nullptr) {
-    return std::nullopt;
+    return nullptr;
   }
   switch (filter->type()) {
     case flutter::DlColorFilterType::kBlend: {
       auto dl_blend = filter->asBlend();
       auto blend_mode = ToBlendMode(dl_blend->mode());
-      auto color = ToColor(dl_blend->color());
-      return [blend_mode, color](FilterInput::Ref input) {
-        return ColorFilterContents::MakeBlend(blend_mode, {std::move(input)},
-                                              color);
-      };
+      auto color = skia_conversions::ToColor(dl_blend->color());
+      return ColorFilter::MakeBlend(blend_mode, color);
     }
     case flutter::DlColorFilterType::kMatrix: {
       const flutter::DlMatrixColorFilter* dl_matrix = filter->asMatrix();
-      impeller::FilterContents::ColorMatrix color_matrix;
+      impeller::ColorMatrix color_matrix;
       dl_matrix->get_matrix(color_matrix.array);
-      return [color_matrix](FilterInput::Ref input) {
-        return ColorFilterContents::MakeColorMatrix({std::move(input)},
-                                                    color_matrix);
-      };
+      return ColorFilter::MakeMatrix(color_matrix);
     }
     case flutter::DlColorFilterType::kSrgbToLinearGamma:
-      return [](FilterInput::Ref input) {
-        return ColorFilterContents::MakeSrgbToLinearFilter({std::move(input)});
-      };
+      return ColorFilter::MakeSrgbToLinear();
     case flutter::DlColorFilterType::kLinearToSrgbGamma:
-      return [](FilterInput::Ref input) {
-        return ColorFilterContents::MakeLinearToSrgbFilter({std::move(input)});
-      };
-    case flutter::DlColorFilterType::kUnknown:
-      FML_LOG(ERROR) << "Requested DlColorFilterType::kUnknown";
-      UNIMPLEMENTED;
+      return ColorFilter::MakeLinearToSrgb();
   }
-  return std::nullopt;
+  return nullptr;
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::setColorFilter(
-    const flutter::DlColorFilter* filter) {
-  // Needs https://github.com/flutter/flutter/issues/95434
-  paint_.color_filter = ToColorFilterProc(filter);
+// |flutter::DlOpReceiver|
+void DlDispatcher::setColorFilter(const flutter::DlColorFilter* filter) {
+  paint_.color_filter = ToColorFilter(filter);
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::setInvertColors(bool invert) {
-  UNIMPLEMENTED;
+// |flutter::DlOpReceiver|
+void DlDispatcher::setInvertColors(bool invert) {
+  paint_.invert_colors = invert;
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::setBlendMode(flutter::DlBlendMode dl_mode) {
+// |flutter::DlOpReceiver|
+void DlDispatcher::setBlendMode(flutter::DlBlendMode dl_mode) {
   paint_.blend_mode = ToBlendMode(dl_mode);
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::setBlender(sk_sp<SkBlender> blender) {
-  // Needs https://github.com/flutter/flutter/issues/95434
-  UNIMPLEMENTED;
-}
-
-// |flutter::Dispatcher|
-void DisplayListDispatcher::setPathEffect(const flutter::DlPathEffect* effect) {
+// |flutter::DlOpReceiver|
+void DlDispatcher::setPathEffect(const flutter::DlPathEffect* effect) {
   // Needs https://github.com/flutter/flutter/issues/95434
   UNIMPLEMENTED;
 }
 
-static FilterContents::BlurStyle ToBlurStyle(SkBlurStyle blur_style) {
+static FilterContents::BlurStyle ToBlurStyle(flutter::DlBlurStyle blur_style) {
   switch (blur_style) {
-    case kNormal_SkBlurStyle:
+    case flutter::DlBlurStyle::kNormal:
       return FilterContents::BlurStyle::kNormal;
-    case kSolid_SkBlurStyle:
+    case flutter::DlBlurStyle::kSolid:
       return FilterContents::BlurStyle::kSolid;
-    case kOuter_SkBlurStyle:
+    case flutter::DlBlurStyle::kOuter:
       return FilterContents::BlurStyle::kOuter;
-    case kInner_SkBlurStyle:
+    case flutter::DlBlurStyle::kInner:
       return FilterContents::BlurStyle::kInner;
   }
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::setMaskFilter(const flutter::DlMaskFilter* filter) {
+// |flutter::DlOpReceiver|
+void DlDispatcher::setMaskFilter(const flutter::DlMaskFilter* filter) {
   // Needs https://github.com/flutter/flutter/issues/95434
   if (filter == nullptr) {
     paint_.mask_blur_descriptor = std::nullopt;
@@ -604,16 +519,13 @@ void DisplayListDispatcher::setMaskFilter(const flutter::DlMaskFilter* filter) {
       };
       break;
     }
-    case flutter::DlMaskFilterType::kUnknown:
-      UNIMPLEMENTED;
-      break;
   }
 }
 
-static std::optional<Paint::ImageFilterProc> ToImageFilterProc(
+static std::shared_ptr<ImageFilter> ToImageFilter(
     const flutter::DlImageFilter* filter) {
   if (filter == nullptr) {
-    return std::nullopt;
+    return nullptr;
   }
 
   switch (filter->type()) {
@@ -622,189 +534,138 @@ static std::optional<Paint::ImageFilterProc> ToImageFilterProc(
       auto sigma_x = Sigma(blur->sigma_x());
       auto sigma_y = Sigma(blur->sigma_y());
       auto tile_mode = ToTileMode(blur->tile_mode());
-
-      return [sigma_x, sigma_y, tile_mode](const FilterInput::Ref& input,
-                                           const Matrix& effect_transform) {
-        return FilterContents::MakeGaussianBlur(
-            input, sigma_x, sigma_y, FilterContents::BlurStyle::kNormal,
-            tile_mode, effect_transform);
-      };
-
-      break;
+      return ImageFilter::MakeBlur(
+          sigma_x, sigma_y, FilterContents::BlurStyle::kNormal, tile_mode);
     }
     case flutter::DlImageFilterType::kDilate: {
       auto dilate = filter->asDilate();
       FML_DCHECK(dilate);
       if (dilate->radius_x() < 0 || dilate->radius_y() < 0) {
-        return std::nullopt;
+        return nullptr;
       }
       auto radius_x = Radius(dilate->radius_x());
       auto radius_y = Radius(dilate->radius_y());
-      return [radius_x, radius_y](FilterInput::Ref input,
-                                  const Matrix& effect_transform) {
-        return FilterContents::MakeMorphology(
-            std::move(input), radius_x, radius_y,
-            FilterContents::MorphType::kDilate, effect_transform);
-      };
-      break;
+      return ImageFilter::MakeDilate(radius_x, radius_y);
     }
     case flutter::DlImageFilterType::kErode: {
       auto erode = filter->asErode();
       FML_DCHECK(erode);
       if (erode->radius_x() < 0 || erode->radius_y() < 0) {
-        return std::nullopt;
+        return nullptr;
       }
       auto radius_x = Radius(erode->radius_x());
       auto radius_y = Radius(erode->radius_y());
-      return [radius_x, radius_y](FilterInput::Ref input,
-                                  const Matrix& effect_transform) {
-        return FilterContents::MakeMorphology(
-            std::move(input), radius_x, radius_y,
-            FilterContents::MorphType::kErode, effect_transform);
-      };
-      break;
+      return ImageFilter::MakeErode(radius_x, radius_y);
     }
     case flutter::DlImageFilterType::kMatrix: {
       auto matrix_filter = filter->asMatrix();
       FML_DCHECK(matrix_filter);
       auto matrix = ToMatrix(matrix_filter->matrix());
       auto desc = ToSamplerDescriptor(matrix_filter->sampling());
-      return [matrix, desc](FilterInput::Ref input,
-                            const Matrix& effect_transform) {
-        return FilterContents::MakeMatrixFilter(std::move(input), matrix, desc);
-      };
-      break;
+      return ImageFilter::MakeMatrix(matrix, desc);
     }
-    case flutter::DlImageFilterType::kComposeFilter: {
+    case flutter::DlImageFilterType::kCompose: {
       auto compose = filter->asCompose();
       FML_DCHECK(compose);
-      auto outer = compose->outer();
-      auto inner = compose->inner();
-      auto outer_proc = ToImageFilterProc(outer.get());
-      auto inner_proc = ToImageFilterProc(inner.get());
-      if (!outer_proc.has_value()) {
-        return inner_proc;
+      auto outer_dl_filter = compose->outer();
+      auto inner_dl_filter = compose->inner();
+      auto outer_filter = ToImageFilter(outer_dl_filter.get());
+      auto inner_filter = ToImageFilter(inner_dl_filter.get());
+      if (!outer_filter) {
+        return inner_filter;
       }
-      if (!inner_proc.has_value()) {
-        return outer_proc;
+      if (!inner_filter) {
+        return outer_filter;
       }
-      FML_DCHECK(outer_proc.has_value() && inner_proc.has_value());
-      return [outer_filter = outer_proc.value(),
-              inner_filter = inner_proc.value()](
-                 FilterInput::Ref input, const Matrix& effect_transform) {
-        auto contents = inner_filter(std::move(input), effect_transform);
-        contents = outer_filter(FilterInput::Make(contents), effect_transform);
-        return contents;
-      };
-      break;
+      FML_DCHECK(outer_filter && inner_filter);
+
+      return ImageFilter::MakeCompose(*inner_filter, *outer_filter);
     }
     case flutter::DlImageFilterType::kColorFilter: {
       auto color_filter_image_filter = filter->asColorFilter();
       FML_DCHECK(color_filter_image_filter);
-      auto color_filter_proc =
-          ToColorFilterProc(color_filter_image_filter->color_filter().get());
-      if (!color_filter_proc.has_value()) {
-        return std::nullopt;
+      auto color_filter =
+          ToColorFilter(color_filter_image_filter->color_filter().get());
+      if (!color_filter) {
+        return nullptr;
       }
-      return [color_filter = color_filter_proc.value()](
-                 FilterInput::Ref input, const Matrix& effect_transform) {
-        return color_filter(std::move(input));
-      };
-      break;
+      // When color filters are used as image filters, set the color filter's
+      // "absorb opacity" flag to false. For image filters, the snapshot
+      // opacity needs to be deferred until the result of the filter chain is
+      // being blended with the layer.
+      return ImageFilter::MakeFromColorFilter(*color_filter);
     }
-    case flutter::DlImageFilterType::kLocalMatrixFilter: {
+    case flutter::DlImageFilterType::kLocalMatrix: {
       auto local_matrix_filter = filter->asLocalMatrix();
       FML_DCHECK(local_matrix_filter);
       auto internal_filter = local_matrix_filter->image_filter();
       FML_DCHECK(internal_filter);
 
-      auto image_filter_proc = ToImageFilterProc(internal_filter.get());
-      if (!image_filter_proc.has_value()) {
-        return std::nullopt;
+      auto image_filter = ToImageFilter(internal_filter.get());
+      if (!image_filter) {
+        return nullptr;
       }
 
       auto matrix = ToMatrix(local_matrix_filter->matrix());
-
-      return [matrix, filter_proc = image_filter_proc.value()](
-                 FilterInput::Ref input, const Matrix& effect_transform) {
-        std::shared_ptr<FilterContents> filter =
-            filter_proc(std::move(input), effect_transform);
-        return FilterContents::MakeLocalMatrixFilter(FilterInput::Make(filter),
-                                                     matrix);
-      };
-      break;
+      return ImageFilter::MakeLocalMatrix(matrix, *image_filter);
     }
-    case flutter::DlImageFilterType::kUnknown:
-      return std::nullopt;
   }
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::setImageFilter(
-    const flutter::DlImageFilter* filter) {
-  paint_.image_filter = ToImageFilterProc(filter);
+// |flutter::DlOpReceiver|
+void DlDispatcher::setImageFilter(const flutter::DlImageFilter* filter) {
+  paint_.image_filter = ToImageFilter(filter);
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::save() {
+// |flutter::DlOpReceiver|
+void DlDispatcher::save() {
   canvas_.Save();
 }
 
-static std::optional<Rect> ToRect(const SkRect* rect) {
-  if (rect == nullptr) {
-    return std::nullopt;
-  }
-  return Rect::MakeLTRB(rect->fLeft, rect->fTop, rect->fRight, rect->fBottom);
-}
-
-static std::vector<Rect> ToRects(const SkRect tex[], int count) {
-  auto result = std::vector<Rect>();
-  for (int i = 0; i < count; i++) {
-    result.push_back(ToRect(&tex[i]).value());
-  }
-  return result;
-}
-
-// |flutter::Dispatcher|
-void DisplayListDispatcher::saveLayer(const SkRect* bounds,
-                                      const flutter::SaveLayerOptions options,
-                                      const flutter::DlImageFilter* backdrop) {
+// |flutter::DlOpReceiver|
+void DlDispatcher::saveLayer(const SkRect& bounds,
+                             const flutter::SaveLayerOptions options,
+                             const flutter::DlImageFilter* backdrop) {
   auto paint = options.renders_with_attributes() ? paint_ : Paint{};
-  canvas_.SaveLayer(paint, ToRect(bounds), ToImageFilterProc(backdrop));
+  auto promise = options.content_is_clipped()
+                     ? ContentBoundsPromise::kMayClipContents
+                     : ContentBoundsPromise::kContainsContents;
+  canvas_.SaveLayer(paint, skia_conversions::ToRect(bounds),
+                    ToImageFilter(backdrop), promise);
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::restore() {
+// |flutter::DlOpReceiver|
+void DlDispatcher::restore() {
   canvas_.Restore();
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::translate(SkScalar tx, SkScalar ty) {
+// |flutter::DlOpReceiver|
+void DlDispatcher::translate(SkScalar tx, SkScalar ty) {
   canvas_.Translate({tx, ty, 0.0});
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::scale(SkScalar sx, SkScalar sy) {
+// |flutter::DlOpReceiver|
+void DlDispatcher::scale(SkScalar sx, SkScalar sy) {
   canvas_.Scale({sx, sy, 1.0});
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::rotate(SkScalar degrees) {
+// |flutter::DlOpReceiver|
+void DlDispatcher::rotate(SkScalar degrees) {
   canvas_.Rotate(Degrees{degrees});
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::skew(SkScalar sx, SkScalar sy) {
+// |flutter::DlOpReceiver|
+void DlDispatcher::skew(SkScalar sx, SkScalar sy) {
   canvas_.Skew(sx, sy);
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::transform2DAffine(SkScalar mxx,
-                                              SkScalar mxy,
-                                              SkScalar mxt,
-                                              SkScalar myx,
-                                              SkScalar myy,
-                                              SkScalar myt) {
+// |flutter::DlOpReceiver|
+void DlDispatcher::transform2DAffine(SkScalar mxx,
+                                     SkScalar mxy,
+                                     SkScalar mxt,
+                                     SkScalar myx,
+                                     SkScalar myy,
+                                     SkScalar myt) {
   // clang-format off
   transformFullPerspective(
     mxx, mxy,  0, mxt,
@@ -815,277 +676,241 @@ void DisplayListDispatcher::transform2DAffine(SkScalar mxx,
   // clang-format on
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::transformFullPerspective(SkScalar mxx,
-                                                     SkScalar mxy,
-                                                     SkScalar mxz,
-                                                     SkScalar mxt,
-                                                     SkScalar myx,
-                                                     SkScalar myy,
-                                                     SkScalar myz,
-                                                     SkScalar myt,
-                                                     SkScalar mzx,
-                                                     SkScalar mzy,
-                                                     SkScalar mzz,
-                                                     SkScalar mzt,
-                                                     SkScalar mwx,
-                                                     SkScalar mwy,
-                                                     SkScalar mwz,
-                                                     SkScalar mwt) {
+// |flutter::DlOpReceiver|
+void DlDispatcher::transformFullPerspective(SkScalar mxx,
+                                            SkScalar mxy,
+                                            SkScalar mxz,
+                                            SkScalar mxt,
+                                            SkScalar myx,
+                                            SkScalar myy,
+                                            SkScalar myz,
+                                            SkScalar myt,
+                                            SkScalar mzx,
+                                            SkScalar mzy,
+                                            SkScalar mzz,
+                                            SkScalar mzt,
+                                            SkScalar mwx,
+                                            SkScalar mwy,
+                                            SkScalar mwz,
+                                            SkScalar mwt) {
   // The order of arguments is row-major but Impeller matrices are
   // column-major.
   // clang-format off
-  auto xformation = Matrix{
+  auto transform = Matrix{
     mxx, myx, mzx, mwx,
     mxy, myy, mzy, mwy,
     mxz, myz, mzz, mwz,
     mxt, myt, mzt, mwt
   };
   // clang-format on
-  canvas_.Transform(xformation);
+  canvas_.Transform(transform);
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::transformReset() {
+// |flutter::DlOpReceiver|
+void DlDispatcher::transformReset() {
   canvas_.ResetTransform();
+  canvas_.Transform(initial_matrix_);
 }
 
-static Rect ToRect(const SkRect& rect) {
-  return Rect::MakeLTRB(rect.fLeft, rect.fTop, rect.fRight, rect.fBottom);
-}
-
-static Entity::ClipOperation ToClipOperation(SkClipOp clip_op) {
+static Entity::ClipOperation ToClipOperation(
+    flutter::DlCanvas::ClipOp clip_op) {
   switch (clip_op) {
-    case SkClipOp::kDifference:
+    case flutter::DlCanvas::ClipOp::kDifference:
       return Entity::ClipOperation::kDifference;
-    case SkClipOp::kIntersect:
+    case flutter::DlCanvas::ClipOp::kIntersect:
       return Entity::ClipOperation::kIntersect;
   }
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::clipRect(const SkRect& rect,
-                                     SkClipOp clip_op,
-                                     bool is_aa) {
-  auto path = PathBuilder{}.AddRect(ToRect(rect)).TakePath();
-  canvas_.ClipPath(path, ToClipOperation(clip_op));
-}
-
-static PathBuilder::RoundingRadii ToRoundingRadii(const SkRRect& rrect) {
-  using Corner = SkRRect::Corner;
-  PathBuilder::RoundingRadii radii;
-  radii.bottom_left = ToPoint(rrect.radii(Corner::kLowerLeft_Corner));
-  radii.bottom_right = ToPoint(rrect.radii(Corner::kLowerRight_Corner));
-  radii.top_left = ToPoint(rrect.radii(Corner::kUpperLeft_Corner));
-  radii.top_right = ToPoint(rrect.radii(Corner::kUpperRight_Corner));
-  return radii;
+// |flutter::DlOpReceiver|
+void DlDispatcher::clipRect(const SkRect& rect, ClipOp clip_op, bool is_aa) {
+  canvas_.ClipRect(skia_conversions::ToRect(rect), ToClipOperation(clip_op));
 }
 
-static Path ToPath(const SkPath& path) {
-  auto iterator = SkPath::Iter(path, false);
-
-  struct PathData {
-    union {
-      SkPoint points[4];
-    };
-  };
-
-  PathBuilder builder;
-  PathData data;
-  auto verb = SkPath::Verb::kDone_Verb;
-  do {
-    verb = iterator.next(data.points);
-    switch (verb) {
-      case SkPath::kMove_Verb:
-        builder.MoveTo(ToPoint(data.points[0]));
-        break;
-      case SkPath::kLine_Verb:
-        builder.LineTo(ToPoint(data.points[1]));
-        break;
-      case SkPath::kQuad_Verb:
-        builder.QuadraticCurveTo(ToPoint(data.points[1]),
-                                 ToPoint(data.points[2]));
-        break;
-      case SkPath::kConic_Verb: {
-        constexpr auto kPow2 = 1;  // Only works for sweeps up to 90 degrees.
-        constexpr auto kQuadCount = 1 + (2 * (1 << kPow2));
-        SkPoint points[kQuadCount];
-        const auto curve_count =
-            SkPath::ConvertConicToQuads(data.points[0],          //
-                                        data.points[1],          //
-                                        data.points[2],          //
-                                        iterator.conicWeight(),  //
-                                        points,                  //
-                                        kPow2                    //
-            );
-
-        for (int curve_index = 0, point_index = 0;  //
-             curve_index < curve_count;             //
-             curve_index++, point_index += 2        //
-        ) {
-          builder.QuadraticCurveTo(ToPoint(points[point_index + 1]),
-                                   ToPoint(points[point_index + 2]));
-        }
-      } break;
-      case SkPath::kCubic_Verb:
-        builder.CubicCurveTo(ToPoint(data.points[1]), ToPoint(data.points[2]),
-                             ToPoint(data.points[3]));
-        break;
-      case SkPath::kClose_Verb:
-        builder.Close();
-        break;
-      case SkPath::kDone_Verb:
-        break;
-    }
-  } while (verb != SkPath::Verb::kDone_Verb);
-
-  FillType fill_type;
-  switch (path.getFillType()) {
-    case SkPathFillType::kWinding:
-      fill_type = FillType::kNonZero;
-      break;
-    case SkPathFillType::kEvenOdd:
-      fill_type = FillType::kOdd;
-      break;
-    case SkPathFillType::kInverseWinding:
-    case SkPathFillType::kInverseEvenOdd:
-      // Flutter doesn't expose these path fill types. These are only visible
-      // via the dispatcher interface. We should never get here.
-      fill_type = FillType::kNonZero;
-      break;
+// |flutter::DlOpReceiver|
+void DlDispatcher::clipRRect(const SkRRect& rrect, ClipOp sk_op, bool is_aa) {
+  auto clip_op = ToClipOperation(sk_op);
+  if (rrect.isRect()) {
+    canvas_.ClipRect(skia_conversions::ToRect(rrect.rect()), clip_op);
+  } else if (rrect.isOval()) {
+    canvas_.ClipOval(skia_conversions::ToRect(rrect.rect()), clip_op);
+  } else if (rrect.isSimple()) {
+    canvas_.ClipRRect(skia_conversions::ToRect(rrect.rect()),
+                      skia_conversions::ToSize(rrect.getSimpleRadii()),
+                      clip_op);
+  } else {
+    canvas_.ClipPath(skia_conversions::ToPath(rrect), clip_op);
   }
-  return builder.TakePath(fill_type);
 }
 
-static Path ToPath(const SkRRect& rrect) {
-  return PathBuilder{}
-      .AddRoundedRect(ToRect(rrect.getBounds()), ToRoundingRadii(rrect))
-      .TakePath();
+// |flutter::DlOpReceiver|
+void DlDispatcher::clipPath(const SkPath& path, ClipOp sk_op, bool is_aa) {
+  UNIMPLEMENTED;
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::clipRRect(const SkRRect& rrect,
-                                      SkClipOp clip_op,
-                                      bool is_aa) {
-  canvas_.ClipPath(ToPath(rrect), ToClipOperation(clip_op));
+const Path& DlDispatcher::GetOrCachePath(const CacheablePath& cache) {
+  if (cache.cached_impeller_path.IsEmpty() && !cache.sk_path.isEmpty()) {
+    cache.cached_impeller_path = skia_conversions::ToPath(cache.sk_path);
+  }
+  return cache.cached_impeller_path;
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::clipPath(const SkPath& path,
-                                     SkClipOp clip_op,
-                                     bool is_aa) {
-  canvas_.ClipPath(ToPath(path), ToClipOperation(clip_op));
+// |flutter::DlOpReceiver|
+void DlDispatcher::clipPath(const CacheablePath& cache,
+                            ClipOp sk_op,
+                            bool is_aa) {
+  auto clip_op = ToClipOperation(sk_op);
+
+  SkRect rect;
+  if (cache.sk_path.isRect(&rect)) {
+    canvas_.ClipRect(skia_conversions::ToRect(rect), clip_op);
+  } else if (cache.sk_path.isOval(&rect)) {
+    canvas_.ClipOval(skia_conversions::ToRect(rect), clip_op);
+  } else {
+    SkRRect rrect;
+    if (cache.sk_path.isRRect(&rrect) && rrect.isSimple()) {
+      canvas_.ClipRRect(skia_conversions::ToRect(rrect.rect()),
+                        skia_conversions::ToSize(rrect.getSimpleRadii()),
+                        clip_op);
+    } else {
+      canvas_.ClipPath(GetOrCachePath(cache), clip_op);
+    }
+  }
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::drawColor(flutter::DlColor color,
-                                      flutter::DlBlendMode dl_mode) {
+// |flutter::DlOpReceiver|
+void DlDispatcher::drawColor(flutter::DlColor color,
+                             flutter::DlBlendMode dl_mode) {
   Paint paint;
-  paint.color = ToColor(color);
+  paint.color = skia_conversions::ToColor(color);
   paint.blend_mode = ToBlendMode(dl_mode);
   canvas_.DrawPaint(paint);
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::drawPaint() {
+// |flutter::DlOpReceiver|
+void DlDispatcher::drawPaint() {
   canvas_.DrawPaint(paint_);
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::drawLine(const SkPoint& p0, const SkPoint& p1) {
-  auto path = PathBuilder{}.AddLine(ToPoint(p0), ToPoint(p1)).TakePath();
-  Paint paint = paint_;
-  paint.style = Paint::Style::kStroke;
-  canvas_.DrawPath(path, paint);
+// |flutter::DlOpReceiver|
+void DlDispatcher::drawLine(const SkPoint& p0, const SkPoint& p1) {
+  canvas_.DrawLine(skia_conversions::ToPoint(p0), skia_conversions::ToPoint(p1),
+                   paint_);
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::drawRect(const SkRect& rect) {
-  canvas_.DrawRect(ToRect(rect), paint_);
+// |flutter::DlOpReceiver|
+void DlDispatcher::drawRect(const SkRect& rect) {
+  canvas_.DrawRect(skia_conversions::ToRect(rect), paint_);
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::drawOval(const SkRect& bounds) {
-  if (bounds.width() == bounds.height()) {
-    canvas_.DrawCircle(ToPoint(bounds.center()), bounds.width() * 0.5, paint_);
-  } else {
-    auto path = PathBuilder{}.AddOval(ToRect(bounds)).TakePath();
-    canvas_.DrawPath(path, paint_);
-  }
+// |flutter::DlOpReceiver|
+void DlDispatcher::drawOval(const SkRect& bounds) {
+  canvas_.DrawOval(skia_conversions::ToRect(bounds), paint_);
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::drawCircle(const SkPoint& center, SkScalar radius) {
-  auto path = PathBuilder{}.AddCircle(ToPoint(center), radius).TakePath();
-  canvas_.DrawCircle(ToPoint(center), radius, paint_);
+// |flutter::DlOpReceiver|
+void DlDispatcher::drawCircle(const SkPoint& center, SkScalar radius) {
+  canvas_.DrawCircle(skia_conversions::ToPoint(center), radius, paint_);
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::drawRRect(const SkRRect& rrect) {
+// |flutter::DlOpReceiver|
+void DlDispatcher::drawRRect(const SkRRect& rrect) {
   if (rrect.isSimple()) {
-    canvas_.DrawRRect(ToRect(rrect.rect()), rrect.getSimpleRadii().fX, paint_);
+    canvas_.DrawRRect(skia_conversions::ToRect(rrect.rect()),
+                      skia_conversions::ToSize(rrect.getSimpleRadii()), paint_);
   } else {
-    canvas_.DrawPath(ToPath(rrect), paint_);
+    canvas_.DrawPath(skia_conversions::ToPath(rrect), paint_);
   }
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::drawDRRect(const SkRRect& outer,
-                                       const SkRRect& inner) {
+// |flutter::DlOpReceiver|
+void DlDispatcher::drawDRRect(const SkRRect& outer, const SkRRect& inner) {
   PathBuilder builder;
-  builder.AddPath(ToPath(outer));
-  builder.AddPath(ToPath(inner));
+  builder.AddPath(skia_conversions::ToPath(outer));
+  builder.AddPath(skia_conversions::ToPath(inner));
   canvas_.DrawPath(builder.TakePath(FillType::kOdd), paint_);
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::drawPath(const SkPath& path) {
-  canvas_.DrawPath(ToPath(path), paint_);
+// |flutter::DlOpReceiver|
+void DlDispatcher::drawPath(const SkPath& path) {
+  UNIMPLEMENTED;
+}
+
+// |flutter::DlOpReceiver|
+void DlDispatcher::drawPath(const CacheablePath& cache) {
+  SimplifyOrDrawPath(canvas_, cache, paint_);
+}
+
+void DlDispatcher::SimplifyOrDrawPath(CanvasType& canvas,
+                                      const CacheablePath& cache,
+                                      const Paint& paint) {
+  SkRect rect;
+
+  // We can't "optimize" a path into a rectangle if it's open.
+  bool closed;
+  if (cache.sk_path.isRect(&rect, &closed) && closed) {
+    canvas.DrawRect(skia_conversions::ToRect(rect), paint);
+    return;
+  }
+
+  SkRRect rrect;
+  if (cache.sk_path.isRRect(&rrect) && rrect.isSimple()) {
+    canvas.DrawRRect(skia_conversions::ToRect(rrect.rect()),
+                     skia_conversions::ToSize(rrect.getSimpleRadii()), paint);
+    return;
+  }
+
+  SkRect oval;
+  if (cache.sk_path.isOval(&oval)) {
+    canvas.DrawOval(skia_conversions::ToRect(oval), paint);
+    return;
+  }
+
+  canvas.DrawPath(GetOrCachePath(cache), paint);
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::drawArc(const SkRect& oval_bounds,
-                                    SkScalar start_degrees,
-                                    SkScalar sweep_degrees,
-                                    bool use_center) {
+// |flutter::DlOpReceiver|
+void DlDispatcher::drawArc(const SkRect& oval_bounds,
+                           SkScalar start_degrees,
+                           SkScalar sweep_degrees,
+                           bool use_center) {
   PathBuilder builder;
-  builder.AddArc(ToRect(oval_bounds), Degrees(start_degrees),
+  builder.AddArc(skia_conversions::ToRect(oval_bounds), Degrees(start_degrees),
                  Degrees(sweep_degrees), use_center);
   canvas_.DrawPath(builder.TakePath(), paint_);
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::drawPoints(SkCanvas::PointMode mode,
-                                       uint32_t count,
-                                       const SkPoint points[]) {
+// |flutter::DlOpReceiver|
+void DlDispatcher::drawPoints(PointMode mode,
+                              uint32_t count,
+                              const SkPoint points[]) {
   Paint paint = paint_;
   paint.style = Paint::Style::kStroke;
   switch (mode) {
-    case SkCanvas::kPoints_PointMode:
-      if (paint.stroke_cap == Cap::kButt) {
-        paint.stroke_cap = Cap::kSquare;
-      }
-      for (uint32_t i = 0; i < count; i++) {
-        Point p0 = ToPoint(points[i]);
-        auto path = PathBuilder{}.AddLine(p0, p0).TakePath();
-        canvas_.DrawPath(path, paint);
+    case flutter::DlCanvas::PointMode::kPoints: {
+      // Cap::kButt is also treated as a square.
+      auto point_style = paint.stroke_cap == Cap::kRound ? PointStyle::kRound
+                                                         : PointStyle::kSquare;
+      auto radius = paint.stroke_width;
+      if (radius > 0) {
+        radius /= 2.0;
       }
-      break;
-    case SkCanvas::kLines_PointMode:
+      canvas_.DrawPoints(skia_conversions::ToPoints(points, count), radius,
+                         paint, point_style);
+    } break;
+    case flutter::DlCanvas::PointMode::kLines:
       for (uint32_t i = 1; i < count; i += 2) {
-        Point p0 = ToPoint(points[i - 1]);
-        Point p1 = ToPoint(points[i]);
-        auto path = PathBuilder{}.AddLine(p0, p1).TakePath();
-        canvas_.DrawPath(path, paint);
+        Point p0 = skia_conversions::ToPoint(points[i - 1]);
+        Point p1 = skia_conversions::ToPoint(points[i]);
+        canvas_.DrawLine(p0, p1, paint);
       }
       break;
-    case SkCanvas::kPolygon_PointMode:
+    case flutter::DlCanvas::PointMode::kPolygon:
       if (count > 1) {
-        Point p0 = ToPoint(points[0]);
+        Point p0 = skia_conversions::ToPoint(points[0]);
         for (uint32_t i = 1; i < count; i++) {
-          Point p1 = ToPoint(points[i]);
-          auto path = PathBuilder{}.AddLine(p0, p1).TakePath();
-          canvas_.DrawPath(path, paint);
+          Point p1 = skia_conversions::ToPoint(points[i]);
+          canvas_.DrawLine(p0, p1, paint);
           p0 = p1;
         }
       }
@@ -1093,25 +918,17 @@ void DisplayListDispatcher::drawPoints(SkCanvas::PointMode mode,
   }
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::drawSkVertices(const sk_sp<SkVertices> vertices,
-                                           SkBlendMode mode) {
-  // Needs https://github.com/flutter/flutter/issues/95434
-  UNIMPLEMENTED;
-}
-
-// |flutter::Dispatcher|
-void DisplayListDispatcher::drawVertices(const flutter::DlVertices* vertices,
-                                         flutter::DlBlendMode dl_mode) {
-  canvas_.DrawVertices(DLVerticesGeometry::MakeVertices(vertices),
-                       ToBlendMode(dl_mode), paint_);
+// |flutter::DlOpReceiver|
+void DlDispatcher::drawVertices(const flutter::DlVertices* vertices,
+                                flutter::DlBlendMode dl_mode) {
+  canvas_.DrawVertices(MakeVertices(vertices), ToBlendMode(dl_mode), paint_);
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::drawImage(const sk_sp<flutter::DlImage> image,
-                                      const SkPoint point,
-                                      flutter::DlImageSampling sampling,
-                                      bool render_with_attributes) {
+// |flutter::DlOpReceiver|
+void DlDispatcher::drawImage(const sk_sp<flutter::DlImage> image,
+                             const SkPoint point,
+                             flutter::DlImageSampling sampling,
+                             bool render_with_attributes) {
   if (!image) {
     return;
   }
@@ -1126,111 +943,157 @@ void DisplayListDispatcher::drawImage(const sk_sp<flutter::DlImage> image,
   const auto dest =
       SkRect::MakeXYWH(point.fX, point.fY, size.width, size.height);
 
-  drawImageRect(
-      image,                   // image
-      src,                     // source rect
-      dest,                    // destination rect
-      sampling,                // sampling options
-      render_with_attributes,  // render with attributes
-      SkCanvas::SrcRectConstraint::kStrict_SrcRectConstraint  // constraint
+  drawImageRect(image,                      // image
+                src,                        // source rect
+                dest,                       // destination rect
+                sampling,                   // sampling options
+                render_with_attributes,     // render with attributes
+                SrcRectConstraint::kStrict  // constraint
   );
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::drawImageRect(
+// |flutter::DlOpReceiver|
+void DlDispatcher::drawImageRect(
     const sk_sp<flutter::DlImage> image,
     const SkRect& src,
     const SkRect& dst,
     flutter::DlImageSampling sampling,
     bool render_with_attributes,
-    SkCanvas::SrcRectConstraint constraint) {
+    SrcRectConstraint constraint = SrcRectConstraint::kFast) {
   canvas_.DrawImageRect(
       std::make_shared<Image>(image->impeller_texture()),  // image
-      ToRect(src),                                         // source rect
-      ToRect(dst),                                         // destination rect
+      skia_conversions::ToRect(src),                       // source rect
+      skia_conversions::ToRect(dst),                       // destination rect
       render_with_attributes ? paint_ : Paint(),           // paint
       ToSamplerDescriptor(sampling)                        // sampling
   );
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::drawImageNine(const sk_sp<flutter::DlImage> image,
-                                          const SkIRect& center,
-                                          const SkRect& dst,
-                                          flutter::DlFilterMode filter,
-                                          bool render_with_attributes) {
+// |flutter::DlOpReceiver|
+void DlDispatcher::drawImageNine(const sk_sp<flutter::DlImage> image,
+                                 const SkIRect& center,
+                                 const SkRect& dst,
+                                 flutter::DlFilterMode filter,
+                                 bool render_with_attributes) {
   NinePatchConverter converter = {};
   converter.DrawNinePatch(
       std::make_shared<Image>(image->impeller_texture()),
       Rect::MakeLTRB(center.fLeft, center.fTop, center.fRight, center.fBottom),
-      ToRect(dst), ToSamplerDescriptor(filter), &canvas_, &paint_);
-}
-
-// |flutter::Dispatcher|
-void DisplayListDispatcher::drawImageLattice(
-    const sk_sp<flutter::DlImage> image,
-    const SkCanvas::Lattice& lattice,
-    const SkRect& dst,
-    flutter::DlFilterMode filter,
-    bool render_with_attributes) {
-  // Don't implement this one since it is not exposed by flutter,
-  // Skia internally converts calls to drawImageNine into this method,
-  // which is then converted back to drawImageNine by display list.
-}
-
-// |flutter::Dispatcher|
-void DisplayListDispatcher::drawAtlas(const sk_sp<flutter::DlImage> atlas,
-                                      const SkRSXform xform[],
-                                      const SkRect tex[],
-                                      const flutter::DlColor colors[],
-                                      int count,
-                                      flutter::DlBlendMode mode,
-                                      flutter::DlImageSampling sampling,
-                                      const SkRect* cull_rect,
-                                      bool render_with_attributes) {
+      skia_conversions::ToRect(dst), ToSamplerDescriptor(filter), &canvas_,
+      &paint_);
+}
+
+// |flutter::DlOpReceiver|
+void DlDispatcher::drawAtlas(const sk_sp<flutter::DlImage> atlas,
+                             const SkRSXform xform[],
+                             const SkRect tex[],
+                             const flutter::DlColor colors[],
+                             int count,
+                             flutter::DlBlendMode mode,
+                             flutter::DlImageSampling sampling,
+                             const SkRect* cull_rect,
+                             bool render_with_attributes) {
   canvas_.DrawAtlas(std::make_shared<Image>(atlas->impeller_texture()),
-                    ToRSXForms(xform, count), ToRects(tex, count),
+                    skia_conversions::ToRSXForms(xform, count),
+                    skia_conversions::ToRects(tex, count),
                     ToColors(colors, count), ToBlendMode(mode),
-                    ToSamplerDescriptor(sampling), ToRect(cull_rect), paint_);
+                    ToSamplerDescriptor(sampling),
+                    skia_conversions::ToRect(cull_rect), paint_);
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::drawPicture(const sk_sp<SkPicture> picture,
-                                        const SkMatrix* matrix,
-                                        bool render_with_attributes) {
-  // Needs https://github.com/flutter/flutter/issues/95434
+// |flutter::DlOpReceiver|
+void DlDispatcher::drawDisplayList(
+    const sk_sp<flutter::DisplayList> display_list,
+    SkScalar opacity) {
+  // Save all values that must remain untouched after the operation.
+  Paint saved_paint = paint_;
+  Matrix saved_initial_matrix = initial_matrix_;
+  int restore_count = canvas_.GetSaveCount();
+
+  // The display list may alter the clip, which must be restored to the current
+  // clip at the end of playback.
+  canvas_.Save();
+
+  // Establish a new baseline for interpreting the new DL.
+  // Matrix and clip are left untouched, the current
+  // transform is saved as the new base matrix, and paint
+  // values are reset to defaults.
+  initial_matrix_ = canvas_.GetCurrentTransform();
+  paint_ = Paint();
+
+  // Handle passed opacity in the most brute-force way by using
+  // a SaveLayer. If the display_list is able to inherit the
+  // opacity, this could also be handled by modulating all of its
+  // attribute settings (for example, color), by the indicated
+  // opacity.
+  if (opacity < SK_Scalar1) {
+    Paint save_paint;
+    save_paint.color = Color(0, 0, 0, opacity);
+    canvas_.SaveLayer(save_paint);
+  }
+
+  // TODO(131445): Remove this restriction if we can correctly cull with
+  // perspective transforms.
+  if (display_list->has_rtree() && !initial_matrix_.HasPerspective()) {
+    // The canvas remembers the screen-space culling bounds clipped by
+    // the surface and the history of clip calls. DisplayList can cull
+    // the ops based on a rectangle expressed in its "destination bounds"
+    // so we need the canvas to transform those into the current local
+    // coordinate space into which the DisplayList will be rendered.
+    auto cull_bounds = canvas_.GetCurrentLocalCullingBounds();
+    if (cull_bounds.has_value()) {
+      Rect cull_rect = cull_bounds.value();
+      display_list->Dispatch(
+          *this, SkRect::MakeLTRB(cull_rect.GetLeft(), cull_rect.GetTop(),
+                                  cull_rect.GetRight(), cull_rect.GetBottom()));
+    } else {
+      display_list->Dispatch(*this);
+    }
+  } else {
+    display_list->Dispatch(*this);
+  }
+
+  // Restore all saved state back to what it was before we interpreted
+  // the display_list
+  canvas_.RestoreToCount(restore_count);
+  initial_matrix_ = saved_initial_matrix;
+  paint_ = saved_paint;
+}
+
+// |flutter::DlOpReceiver|
+void DlDispatcher::drawTextBlob(const sk_sp<SkTextBlob> blob,
+                                SkScalar x,
+                                SkScalar y) {
+  // When running with Impeller enabled Skia text blobs are converted to
+  // Impeller text frames in paragraph_skia.cc
   UNIMPLEMENTED;
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::drawDisplayList(
-    const sk_sp<flutter::DisplayList> display_list) {
-  int saveCount = canvas_.GetSaveCount();
-  Paint savePaint = paint_;
-  paint_ = Paint();
-  display_list->Dispatch(*this);
-  paint_ = savePaint;
-  canvas_.RestoreToCount(saveCount);
-}
-
-// |flutter::Dispatcher|
-void DisplayListDispatcher::drawTextBlob(const sk_sp<SkTextBlob> blob,
-                                         SkScalar x,
-                                         SkScalar y) {
-  Scalar scale = canvas_.GetCurrentTransformation().GetMaxBasisLength();
-  canvas_.DrawTextFrame(TextFrameFromTextBlob(blob, scale),  //
-                        impeller::Point{x, y},               //
-                        paint_                               //
+void DlDispatcher::drawTextFrame(const std::shared_ptr<TextFrame>& text_frame,
+                                 SkScalar x,
+                                 SkScalar y) {
+  canvas_.DrawTextFrame(text_frame,             //
+                        impeller::Point{x, y},  //
+                        paint_                  //
   );
 }
 
-// |flutter::Dispatcher|
-void DisplayListDispatcher::drawShadow(const SkPath& path,
-                                       const flutter::DlColor color,
-                                       const SkScalar elevation,
-                                       bool transparent_occluder,
-                                       SkScalar dpr) {
-  Color spot_color = ToColor(color);
+// |flutter::DlOpReceiver|
+void DlDispatcher::drawShadow(const SkPath& path,
+                              const flutter::DlColor color,
+                              const SkScalar elevation,
+                              bool transparent_occluder,
+                              SkScalar dpr) {
+  UNIMPLEMENTED;
+}
+
+// |flutter::DlOpReceiver|
+void DlDispatcher::drawShadow(const CacheablePath& cache,
+                              const flutter::DlColor color,
+                              const SkScalar elevation,
+                              bool transparent_occluder,
+                              SkScalar dpr) {
+  Color spot_color = skia_conversions::ToColor(color);
   spot_color.alpha *= 0.25;
 
   // Compute the spot color -- ported from SkShadowUtils::ComputeTonalColors.
@@ -1254,7 +1117,7 @@ void DisplayListDispatcher::drawShadow(const SkPath& path,
 
     Scalar color_scale = color_alpha * (1 - greyscale_alpha);
     Scalar tonal_alpha = color_scale + greyscale_alpha;
-    Scalar unpremul_scale = color_scale / tonal_alpha;
+    Scalar unpremul_scale = tonal_alpha != 0 ? color_scale / tonal_alpha : 0;
     spot_color = Color(unpremul_scale * spot_color.red,
                        unpremul_scale * spot_color.green,
                        unpremul_scale * spot_color.blue, tonal_alpha);
@@ -1271,30 +1134,19 @@ void DisplayListDispatcher::drawShadow(const SkPath& path,
   paint.mask_blur_descriptor = Paint::MaskBlurDescriptor{
       .style = FilterContents::BlurStyle::kNormal,
       .sigma = Radius{kLightRadius * occluder_z /
-                      canvas_.GetCurrentTransformation().GetScale().y},
+                      canvas_.GetCurrentTransform().GetScale().y},
   };
 
   canvas_.Save();
   canvas_.PreConcat(
       Matrix::MakeTranslation(Vector2(0, -occluder_z * light_position.y)));
 
-  SkRect rect;
-  SkRRect rrect;
-  SkRect oval;
-  if (path.isRect(&rect)) {
-    canvas_.DrawRect(ToRect(rect), paint);
-  } else if (path.isRRect(&rrect) && rrect.isSimple()) {
-    canvas_.DrawRRect(ToRect(rrect.rect()), rrect.getSimpleRadii().fX, paint);
-  } else if (path.isOval(&oval) && oval.width() == oval.height()) {
-    canvas_.DrawCircle(ToPoint(oval.center()), oval.width() * 0.5, paint);
-  } else {
-    canvas_.DrawPath(ToPath(path), paint);
-  }
+  SimplifyOrDrawPath(canvas_, cache, paint);
 
   canvas_.Restore();
 }
 
-Picture DisplayListDispatcher::EndRecordingAsPicture() {
+Picture DlDispatcher::EndRecordingAsPicture() {
   TRACE_EVENT0("impeller", "DisplayListDispatcher::EndRecordingAsPicture");
   return canvas_.EndRecordingAsPicture();
 }
diff --git a/impeller/display_list/display_list_dispatcher.h b/impeller/display_list/dl_dispatcher.h
similarity index 59%
rename from impeller/display_list/display_list_dispatcher.h
rename to impeller/display_list/dl_dispatcher.h
index c81116427570850c9889f55adaa1aa4e685f3a07..4643e43ad1c94aad368088b2bc52659509a1efd1 100644
--- a/impeller/display_list/display_list_dispatcher.h
+++ b/impeller/display_list/dl_dispatcher.h
@@ -2,98 +2,96 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
-
-#include "display_list/display_list_path_effect.h"
-#include "flutter/display_list/display_list.h"
-#include "flutter/display_list/display_list_blend_mode.h"
-#include "flutter/display_list/display_list_dispatcher.h"
-#include "flutter/fml/macros.h"
-#include "impeller/aiks/canvas.h"
+#ifndef FLUTTER_IMPELLER_DISPLAY_LIST_DL_DISPATCHER_H_
+#define FLUTTER_IMPELLER_DISPLAY_LIST_DL_DISPATCHER_H_
+
+#include "flutter/display_list/dl_op_receiver.h"
+#include "impeller/aiks/canvas_type.h"
 #include "impeller/aiks/paint.h"
 
 namespace impeller {
 
-class DisplayListDispatcher final : public flutter::Dispatcher {
+class DlDispatcher final : public flutter::DlOpReceiver {
  public:
-  DisplayListDispatcher();
+  DlDispatcher();
+
+  explicit DlDispatcher(Rect cull_rect);
+
+  explicit DlDispatcher(IRect cull_rect);
 
-  ~DisplayListDispatcher();
+  ~DlDispatcher();
 
   Picture EndRecordingAsPicture();
 
-  // |flutter::Dispatcher|
-  void setAntiAlias(bool aa) override;
+  // |flutter::DlOpReceiver|
+  bool PrefersImpellerPaths() const override { return true; }
 
-  // |flutter::Dispatcher|
-  void setDither(bool dither) override;
+  // |flutter::DlOpReceiver|
+  void setAntiAlias(bool aa) override;
 
-  // |flutter::Dispatcher|
-  void setStyle(flutter::DlDrawStyle style) override;
+  // |flutter::DlOpReceiver|
+  void setDrawStyle(flutter::DlDrawStyle style) override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void setColor(flutter::DlColor color) override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void setStrokeWidth(SkScalar width) override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void setStrokeMiter(SkScalar limit) override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void setStrokeCap(flutter::DlStrokeCap cap) override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void setStrokeJoin(flutter::DlStrokeJoin join) override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void setColorSource(const flutter::DlColorSource* source) override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void setColorFilter(const flutter::DlColorFilter* filter) override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void setInvertColors(bool invert) override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void setBlendMode(flutter::DlBlendMode mode) override;
 
-  // |flutter::Dispatcher|
-  void setBlender(sk_sp<SkBlender> blender) override;
-
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void setPathEffect(const flutter::DlPathEffect* effect) override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void setMaskFilter(const flutter::DlMaskFilter* filter) override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void setImageFilter(const flutter::DlImageFilter* filter) override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void save() override;
 
-  // |flutter::Dispatcher|
-  void saveLayer(const SkRect* bounds,
+  // |flutter::DlOpReceiver|
+  void saveLayer(const SkRect& bounds,
                  const flutter::SaveLayerOptions options,
                  const flutter::DlImageFilter* backdrop) override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void restore() override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void translate(SkScalar tx, SkScalar ty) override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void scale(SkScalar sx, SkScalar sy) override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void rotate(SkScalar degrees) override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void skew(SkScalar sx, SkScalar sy) override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void transform2DAffine(SkScalar mxx,
                          SkScalar mxy,
                          SkScalar mxt,
@@ -101,7 +99,7 @@ class DisplayListDispatcher final : public flutter::Dispatcher {
                          SkScalar myy,
                          SkScalar myt) override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void transformFullPerspective(SkScalar mxx,
                                 SkScalar mxy,
                                 SkScalar mxz,
@@ -119,93 +117,90 @@ class DisplayListDispatcher final : public flutter::Dispatcher {
                                 SkScalar mwz,
                                 SkScalar mwt) override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void transformReset() override;
 
-  // |flutter::Dispatcher|
-  void clipRect(const SkRect& rect, SkClipOp clip_op, bool is_aa) override;
+  // |flutter::DlOpReceiver|
+  void clipRect(const SkRect& rect, ClipOp clip_op, bool is_aa) override;
 
-  // |flutter::Dispatcher|
-  void clipRRect(const SkRRect& rrect, SkClipOp clip_op, bool is_aa) override;
+  // |flutter::DlOpReceiver|
+  void clipRRect(const SkRRect& rrect, ClipOp clip_op, bool is_aa) override;
 
-  // |flutter::Dispatcher|
-  void clipPath(const SkPath& path, SkClipOp clip_op, bool is_aa) override;
+  // |flutter::DlOpReceiver|
+  void clipPath(const SkPath& path, ClipOp clip_op, bool is_aa) override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
+  void clipPath(const CacheablePath& cache,
+                ClipOp clip_op,
+                bool is_aa) override;
+
+  // |flutter::DlOpReceiver|
   void drawColor(flutter::DlColor color, flutter::DlBlendMode mode) override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void drawPaint() override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void drawLine(const SkPoint& p0, const SkPoint& p1) override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void drawRect(const SkRect& rect) override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void drawOval(const SkRect& bounds) override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void drawCircle(const SkPoint& center, SkScalar radius) override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void drawRRect(const SkRRect& rrect) override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void drawDRRect(const SkRRect& outer, const SkRRect& inner) override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void drawPath(const SkPath& path) override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
+  void drawPath(const CacheablePath& cache) override;
+
+  // |flutter::DlOpReceiver|
   void drawArc(const SkRect& oval_bounds,
                SkScalar start_degrees,
                SkScalar sweep_degrees,
                bool use_center) override;
 
-  // |flutter::Dispatcher|
-  void drawPoints(SkCanvas::PointMode mode,
+  // |flutter::DlOpReceiver|
+  void drawPoints(PointMode mode,
                   uint32_t count,
                   const SkPoint points[]) override;
 
-  // |flutter::Dispatcher|
-  void drawSkVertices(const sk_sp<SkVertices> vertices,
-                      SkBlendMode mode) override;
-
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void drawVertices(const flutter::DlVertices* vertices,
                     flutter::DlBlendMode dl_mode) override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void drawImage(const sk_sp<flutter::DlImage> image,
                  const SkPoint point,
                  flutter::DlImageSampling sampling,
                  bool render_with_attributes) override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void drawImageRect(const sk_sp<flutter::DlImage> image,
                      const SkRect& src,
                      const SkRect& dst,
                      flutter::DlImageSampling sampling,
                      bool render_with_attributes,
-                     SkCanvas::SrcRectConstraint constraint) override;
+                     SrcRectConstraint constraint) override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void drawImageNine(const sk_sp<flutter::DlImage> image,
                      const SkIRect& center,
                      const SkRect& dst,
                      flutter::DlFilterMode filter,
                      bool render_with_attributes) override;
 
-  // |flutter::Dispatcher|
-  void drawImageLattice(const sk_sp<flutter::DlImage> image,
-                        const SkCanvas::Lattice& lattice,
-                        const SkRect& dst,
-                        flutter::DlFilterMode filter,
-                        bool render_with_attributes) override;
-
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void drawAtlas(const sk_sp<flutter::DlImage> atlas,
                  const SkRSXform xform[],
                  const SkRect tex[],
@@ -216,31 +211,50 @@ class DisplayListDispatcher final : public flutter::Dispatcher {
                  const SkRect* cull_rect,
                  bool render_with_attributes) override;
 
-  // |flutter::Dispatcher|
-  void drawPicture(const sk_sp<SkPicture> picture,
-                   const SkMatrix* matrix,
-                   bool render_with_attributes) override;
-
-  // |flutter::Dispatcher|
-  void drawDisplayList(const sk_sp<flutter::DisplayList> display_list) override;
+  // |flutter::DlOpReceiver|
+  void drawDisplayList(const sk_sp<flutter::DisplayList> display_list,
+                       SkScalar opacity) override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
   void drawTextBlob(const sk_sp<SkTextBlob> blob,
                     SkScalar x,
                     SkScalar y) override;
 
-  // |flutter::Dispatcher|
+  // |flutter::DlOpReceiver|
+  void drawTextFrame(const std::shared_ptr<impeller::TextFrame>& text_frame,
+                     SkScalar x,
+                     SkScalar y) override;
+
+  // |flutter::DlOpReceiver|
   void drawShadow(const SkPath& path,
                   const flutter::DlColor color,
                   const SkScalar elevation,
                   bool transparent_occluder,
                   SkScalar dpr) override;
 
+  // |flutter::DlOpReceiver|
+  void drawShadow(const CacheablePath& cache,
+                  const flutter::DlColor color,
+                  const SkScalar elevation,
+                  bool transparent_occluder,
+                  SkScalar dpr) override;
+
  private:
   Paint paint_;
-  Canvas canvas_;
+  CanvasType canvas_;
+  Matrix initial_matrix_;
+
+  static const Path& GetOrCachePath(const CacheablePath& cache);
+
+  static void SimplifyOrDrawPath(CanvasType& canvas,
+                                 const CacheablePath& cache,
+                                 const Paint& paint);
 
-  FML_DISALLOW_COPY_AND_ASSIGN(DisplayListDispatcher);
+  DlDispatcher(const DlDispatcher&) = delete;
+
+  DlDispatcher& operator=(const DlDispatcher&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_DISPLAY_LIST_DL_DISPATCHER_H_
diff --git a/impeller/display_list/display_list_image_impeller.cc b/impeller/display_list/dl_image_impeller.cc
similarity index 79%
rename from impeller/display_list/display_list_image_impeller.cc
rename to impeller/display_list/dl_image_impeller.cc
index 7650a41ff364c9505dac6b80de269fbe9c68bb74..e5af07f6a2ffc53b65c47a7aebc834504391546c 100644
--- a/impeller/display_list/display_list_image_impeller.cc
+++ b/impeller/display_list/dl_image_impeller.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/display_list/display_list_image_impeller.h"
+#include "impeller/display_list/dl_image_impeller.h"
 
 #include "impeller/aiks/aiks_context.h"
 #include "impeller/entity/contents/filters/filter_contents.h"
@@ -31,7 +31,16 @@ sk_sp<DlImageImpeller> DlImageImpeller::MakeFromYUVTextures(
   impeller::Entity entity;
   entity.SetBlendMode(impeller::BlendMode::kSource);
   auto snapshot = yuv_to_rgb_filter_contents->RenderToSnapshot(
-      aiks_context->GetContentContext(), entity);
+      aiks_context->GetContentContext(),  // renderer
+      entity,                             // entity
+      std::nullopt,                       // coverage_limit
+      std::nullopt,                       // sampler_descriptor
+      true,                               // msaa_enabled
+      /*mip_count=*/1,
+      "MakeYUVToRGBFilter Snapshot");  // label
+  if (!snapshot.has_value()) {
+    return nullptr;
+  }
   return impeller::DlImageImpeller::Make(snapshot->texture);
 }
 
@@ -64,6 +73,12 @@ bool DlImageImpeller::isTextureBacked() const {
   return true;
 }
 
+// |DlImage|
+bool DlImageImpeller::isUIThreadSafe() const {
+  // Impeller textures are always thread-safe
+  return true;
+}
+
 // |DlImage|
 SkISize DlImageImpeller::dimensions() const {
   const auto size = texture_ ? texture_->GetSize() : ISize{};
@@ -72,7 +87,7 @@ SkISize DlImageImpeller::dimensions() const {
 
 // |DlImage|
 size_t DlImageImpeller::GetApproximateByteSize() const {
-  auto size = sizeof(this);
+  auto size = sizeof(*this);
   if (texture_) {
     size += texture_->GetTextureDescriptor().GetByteSizeOfBaseMipLevel();
   }
diff --git a/impeller/display_list/display_list_image_impeller.h b/impeller/display_list/dl_image_impeller.h
similarity index 76%
rename from impeller/display_list/display_list_image_impeller.h
rename to impeller/display_list/dl_image_impeller.h
index 88484a0fc46fafe2f336d7fecd812bd43103011a..920c21fc8f1383e49f345f913ec2bbd8e7a55c62 100644
--- a/impeller/display_list/display_list_image_impeller.h
+++ b/impeller/display_list/dl_image_impeller.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_DISPLAY_LIST_DL_IMAGE_IMPELLER_H_
+#define FLUTTER_IMPELLER_DISPLAY_LIST_DL_IMAGE_IMPELLER_H_
 
-#include "flutter/display_list/display_list_image.h"
-#include "flutter/fml/macros.h"
-#include "impeller/renderer/texture.h"
+#include "flutter/display_list/image/dl_image.h"
+#include "impeller/core/texture.h"
 
 namespace impeller {
 
@@ -39,6 +39,9 @@ class DlImageImpeller final : public flutter::DlImage {
   // |DlImage|
   bool isTextureBacked() const override;
 
+  // |DlImage|
+  bool isUIThreadSafe() const override;
+
   // |DlImage|
   SkISize dimensions() const override;
 
@@ -55,7 +58,11 @@ class DlImageImpeller final : public flutter::DlImage {
   explicit DlImageImpeller(std::shared_ptr<Texture> texture,
                            OwningContext owning_context = OwningContext::kIO);
 
-  FML_DISALLOW_COPY_AND_ASSIGN(DlImageImpeller);
+  DlImageImpeller(const DlImageImpeller&) = delete;
+
+  DlImageImpeller& operator=(const DlImageImpeller&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_DISPLAY_LIST_DL_IMAGE_IMPELLER_H_
diff --git a/impeller/display_list/display_list_playground.cc b/impeller/display_list/dl_playground.cc
similarity index 40%
rename from impeller/display_list/display_list_playground.cc
rename to impeller/display_list/dl_playground.cc
index c9da19ad90b98ce648a415736382c160d0073c02..a9c510a07670142b948e5f794b937e6e44763c82 100644
--- a/impeller/display_list/display_list_playground.cc
+++ b/impeller/display_list/dl_playground.cc
@@ -2,74 +2,68 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/display_list/display_list_playground.h"
+#include "impeller/display_list/dl_playground.h"
 
 #include "flutter/testing/testing.h"
 #include "impeller/aiks/aiks_context.h"
-#include "impeller/display_list/display_list_dispatcher.h"
+#include "impeller/display_list/dl_dispatcher.h"
+#include "impeller/typographer/backends/skia/typographer_context_skia.h"
+#include "third_party/imgui/imgui.h"
 #include "third_party/skia/include/core/SkData.h"
+#include "third_party/skia/include/core/SkFontMgr.h"
+#include "third_party/skia/include/core/SkTypeface.h"
+#include "txt/platform.h"
 
 namespace impeller {
 
-DisplayListPlayground::DisplayListPlayground() = default;
+DlPlayground::DlPlayground() = default;
 
-DisplayListPlayground::~DisplayListPlayground() = default;
+DlPlayground::~DlPlayground() = default;
 
-bool DisplayListPlayground::OpenPlaygroundHere(
-    flutter::DisplayListBuilder& builder) {
+bool DlPlayground::OpenPlaygroundHere(flutter::DisplayListBuilder& builder) {
   return OpenPlaygroundHere(builder.Build());
 }
 
-bool DisplayListPlayground::OpenPlaygroundHere(
-    sk_sp<flutter::DisplayList> list) {
+bool DlPlayground::OpenPlaygroundHere(sk_sp<flutter::DisplayList> list) {
   return OpenPlaygroundHere([&list]() { return list; });
 }
 
-bool DisplayListPlayground::OpenPlaygroundHere(
-    DisplayListPlaygroundCallback callback) {
-  if (!Playground::is_enabled()) {
+bool DlPlayground::OpenPlaygroundHere(DisplayListPlaygroundCallback callback) {
+  if (!switches_.enable_playground) {
     return true;
   }
 
-  AiksContext context(GetContext());
+  AiksContext context(GetContext(), TypographerContextSkia::Make());
   if (!context.IsValid()) {
     return false;
   }
   return Playground::OpenPlaygroundHere(
       [&context, &callback](RenderTarget& render_target) -> bool {
+        static bool wireframe = false;
+        if (ImGui::IsKeyPressed(ImGuiKey_Z)) {
+          wireframe = !wireframe;
+          context.GetContentContext().SetWireframe(wireframe);
+        }
+
         auto list = callback();
 
-        DisplayListDispatcher dispatcher;
+        DlDispatcher dispatcher;
         list->Dispatch(dispatcher);
         auto picture = dispatcher.EndRecordingAsPicture();
 
-        return context.Render(picture, render_target);
+        return context.Render(picture, render_target, true);
       });
 }
 
-static sk_sp<SkData> OpenFixtureAsSkData(const char* fixture_name) {
-  auto mapping = flutter::testing::OpenFixtureAsMapping(fixture_name);
-  if (!mapping) {
-    return nullptr;
-  }
-  auto data = SkData::MakeWithProc(
-      mapping->GetMapping(), mapping->GetSize(),
-      [](const void* ptr, void* context) {
-        delete reinterpret_cast<fml::Mapping*>(context);
-      },
-      mapping.get());
-  mapping.release();
-  return data;
-}
-
-SkFont DisplayListPlayground::CreateTestFontOfSize(SkScalar scalar) {
+SkFont DlPlayground::CreateTestFontOfSize(SkScalar scalar) {
   static constexpr const char* kTestFontFixture = "Roboto-Regular.ttf";
-  auto mapping = OpenFixtureAsSkData(kTestFontFixture);
+  auto mapping = flutter::testing::OpenFixtureAsSkData(kTestFontFixture);
   FML_CHECK(mapping);
-  return SkFont{SkTypeface::MakeFromData(mapping), scalar};
+  sk_sp<SkFontMgr> font_mgr = txt::GetDefaultFontManager();
+  return SkFont{font_mgr->makeFromData(mapping), scalar};
 }
 
-SkFont DisplayListPlayground::CreateTestFont() {
+SkFont DlPlayground::CreateTestFont() {
   return CreateTestFontOfSize(50);
 }
 
diff --git a/impeller/display_list/display_list_playground.h b/impeller/display_list/dl_playground.h
similarity index 65%
rename from impeller/display_list/display_list_playground.h
rename to impeller/display_list/dl_playground.h
index e4645c625b341ed2c0c85b528c53f6324219401f..b49b1a556e156e41be85f5d1069a70e00040396a 100644
--- a/impeller/display_list/display_list_playground.h
+++ b/impeller/display_list/dl_playground.h
@@ -2,24 +2,24 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_DISPLAY_LIST_DL_PLAYGROUND_H_
+#define FLUTTER_IMPELLER_DISPLAY_LIST_DL_PLAYGROUND_H_
 
 #include "flutter/display_list/display_list.h"
-#include "flutter/display_list/display_list_builder.h"
-#include "flutter/fml/macros.h"
+#include "flutter/display_list/dl_builder.h"
 #include "impeller/playground/playground_test.h"
 #include "third_party/skia/include/core/SkFont.h"
 
 namespace impeller {
 
-class DisplayListPlayground : public PlaygroundTest {
+class DlPlayground : public PlaygroundTest {
  public:
   using DisplayListPlaygroundCallback =
       std::function<sk_sp<flutter::DisplayList>()>;
 
-  DisplayListPlayground();
+  DlPlayground();
 
-  ~DisplayListPlayground();
+  ~DlPlayground();
 
   bool OpenPlaygroundHere(flutter::DisplayListBuilder& builder);
 
@@ -32,7 +32,11 @@ class DisplayListPlayground : public PlaygroundTest {
   SkFont CreateTestFont();
 
  private:
-  FML_DISALLOW_COPY_AND_ASSIGN(DisplayListPlayground);
+  DlPlayground(const DlPlayground&) = delete;
+
+  DlPlayground& operator=(const DlPlayground&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_DISPLAY_LIST_DL_PLAYGROUND_H_
diff --git a/impeller/display_list/display_list_unittests.cc b/impeller/display_list/dl_unittests.cc
similarity index 42%
rename from impeller/display_list/display_list_unittests.cc
rename to impeller/display_list/dl_unittests.cc
index f61a82687eccbe3b8b7baf24f8b6b54204cc3888..b10f5545251eff79e1028f1678e08d424f444f1a 100644
--- a/impeller/display_list/display_list_unittests.cc
+++ b/impeller/display_list/dl_unittests.cc
@@ -7,98 +7,143 @@
 #include <memory>
 #include <vector>
 
-#include "display_list/display_list_blend_mode.h"
-#include "display_list/display_list_color.h"
-#include "display_list/display_list_color_filter.h"
-#include "display_list/display_list_color_source.h"
-#include "display_list/display_list_image_filter.h"
-#include "display_list/display_list_paint.h"
-#include "display_list/display_list_tile_mode.h"
-#include "flutter/display_list/display_list_builder.h"
-#include "flutter/display_list/display_list_mask_filter.h"
-#include "flutter/display_list/types.h"
+#include "flutter/display_list/dl_blend_mode.h"
+#include "flutter/display_list/dl_builder.h"
+#include "flutter/display_list/dl_color.h"
+#include "flutter/display_list/dl_paint.h"
+#include "flutter/display_list/dl_tile_mode.h"
+#include "flutter/display_list/effects/dl_color_filter.h"
+#include "flutter/display_list/effects/dl_color_source.h"
+#include "flutter/display_list/effects/dl_image_filter.h"
+#include "flutter/display_list/effects/dl_mask_filter.h"
 #include "flutter/testing/testing.h"
-#include "impeller/display_list/display_list_image_impeller.h"
-#include "impeller/display_list/display_list_playground.h"
+#include "gtest/gtest.h"
+#include "impeller/display_list/dl_dispatcher.h"
+#include "impeller/display_list/dl_image_impeller.h"
+#include "impeller/display_list/dl_playground.h"
+#include "impeller/entity/contents/clip_contents.h"
+#include "impeller/entity/contents/solid_color_contents.h"
+#include "impeller/entity/contents/solid_rrect_blur_contents.h"
 #include "impeller/geometry/constants.h"
 #include "impeller/geometry/point.h"
+#include "impeller/geometry/scalar.h"
 #include "impeller/playground/widgets.h"
+#include "impeller/scene/node.h"
 #include "third_party/imgui/imgui.h"
 #include "third_party/skia/include/core/SkBlurTypes.h"
 #include "third_party/skia/include/core/SkClipOp.h"
-#include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPathBuilder.h"
 #include "third_party/skia/include/core/SkRRect.h"
 
 namespace impeller {
 namespace testing {
 
-using DisplayListTest = DisplayListPlayground;
+flutter::DlColor toColor(const float* components) {
+  return flutter::DlColor(Color::ToIColor(
+      Color(components[0], components[1], components[2], components[3])));
+}
+
+using DisplayListTest = DlPlayground;
 INSTANTIATE_PLAYGROUND_SUITE(DisplayListTest);
 
 TEST_P(DisplayListTest, CanDrawRect) {
   flutter::DisplayListBuilder builder;
-  builder.setColor(SK_ColorBLUE);
-  builder.drawRect(SkRect::MakeXYWH(10, 10, 100, 100));
+  builder.DrawRect(SkRect::MakeXYWH(10, 10, 100, 100),
+                   flutter::DlPaint(flutter::DlColor::kBlue()));
   ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
 }
 
 TEST_P(DisplayListTest, CanDrawTextBlob) {
   flutter::DisplayListBuilder builder;
-  builder.setColor(SK_ColorBLUE);
-  builder.drawTextBlob(SkTextBlob::MakeFromString("Hello", CreateTestFont()),
-                       100, 100);
+  builder.DrawTextBlob(SkTextBlob::MakeFromString("Hello", CreateTestFont()),
+                       100, 100, flutter::DlPaint(flutter::DlColor::kBlue()));
+  ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
+}
+
+TEST_P(DisplayListTest, CanDrawTextBlobWithGradient) {
+  flutter::DisplayListBuilder builder;
+
+  std::vector<flutter::DlColor> colors = {flutter::DlColor::kBlue(),
+                                          flutter::DlColor::kRed()};
+  const float stops[2] = {0.0, 1.0};
+
+  auto linear = flutter::DlColorSource::MakeLinear({0.0, 0.0}, {300.0, 300.0},
+                                                   2, colors.data(), stops,
+                                                   flutter::DlTileMode::kClamp);
+  flutter::DlPaint paint;
+  paint.setColorSource(linear);
+
+  builder.DrawTextBlob(
+      SkTextBlob::MakeFromString("Hello World", CreateTestFont()), 100, 100,
+      paint);
+  ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
+}
+
+TEST_P(DisplayListTest, CanDrawTextWithSaveLayer) {
+  flutter::DisplayListBuilder builder;
+  builder.DrawTextBlob(SkTextBlob::MakeFromString("Hello", CreateTestFont()),
+                       100, 100, flutter::DlPaint(flutter::DlColor::kRed()));
+
+  flutter::DlPaint save_paint;
+  float alpha = 0.5;
+  save_paint.setAlpha(static_cast<uint8_t>(255 * alpha));
+  builder.SaveLayer(nullptr, &save_paint);
+  builder.DrawTextBlob(SkTextBlob::MakeFromString("Hello with half alpha",
+                                                  CreateTestFontOfSize(100)),
+                       100, 300, flutter::DlPaint(flutter::DlColor::kRed()));
+  builder.Restore();
   ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
 }
 
 TEST_P(DisplayListTest, CanDrawImage) {
   auto texture = CreateTextureForFixture("embarcadero.jpg");
   flutter::DisplayListBuilder builder;
-  builder.drawImage(DlImageImpeller::Make(texture), SkPoint::Make(100, 100),
-                    flutter::DlImageSampling::kNearestNeighbor, true);
+  builder.DrawImage(DlImageImpeller::Make(texture), SkPoint::Make(100, 100),
+                    flutter::DlImageSampling::kNearestNeighbor, nullptr);
   ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
 }
 
 TEST_P(DisplayListTest, CanDrawCapsAndJoins) {
   flutter::DisplayListBuilder builder;
+  flutter::DlPaint paint;
 
-  builder.setStyle(flutter::DlDrawStyle::kStroke);
-  builder.setStrokeWidth(30);
-  builder.setColor(SK_ColorRED);
+  paint.setDrawStyle(flutter::DlDrawStyle::kStroke);
+  paint.setStrokeWidth(30);
+  paint.setColor(flutter::DlColor::kRed());
 
   auto path =
       SkPathBuilder{}.moveTo(-50, 0).lineTo(0, -50).lineTo(50, 0).snapshot();
 
-  builder.translate(100, 100);
+  builder.Translate(100, 100);
   {
-    builder.setStrokeCap(flutter::DlStrokeCap::kButt);
-    builder.setStrokeJoin(flutter::DlStrokeJoin::kMiter);
-    builder.setStrokeMiter(4);
-    builder.drawPath(path);
+    paint.setStrokeCap(flutter::DlStrokeCap::kButt);
+    paint.setStrokeJoin(flutter::DlStrokeJoin::kMiter);
+    paint.setStrokeMiter(4);
+    builder.DrawPath(path, paint);
   }
 
   {
-    builder.save();
-    builder.translate(0, 100);
+    builder.Save();
+    builder.Translate(0, 100);
     // The joint in the path is 45 degrees. A miter length of 1 convert to a
     // bevel in this case.
-    builder.setStrokeMiter(1);
-    builder.drawPath(path);
-    builder.restore();
+    paint.setStrokeMiter(1);
+    builder.DrawPath(path, paint);
+    builder.Restore();
   }
 
-  builder.translate(150, 0);
+  builder.Translate(150, 0);
   {
-    builder.setStrokeCap(flutter::DlStrokeCap::kSquare);
-    builder.setStrokeJoin(flutter::DlStrokeJoin::kBevel);
-    builder.drawPath(path);
+    paint.setStrokeCap(flutter::DlStrokeCap::kSquare);
+    paint.setStrokeJoin(flutter::DlStrokeJoin::kBevel);
+    builder.DrawPath(path, paint);
   }
 
-  builder.translate(150, 0);
+  builder.Translate(150, 0);
   {
-    builder.setStrokeCap(flutter::DlStrokeCap::kRound);
-    builder.setStrokeJoin(flutter::DlStrokeJoin::kRound);
-    builder.drawPath(path);
+    paint.setStrokeCap(flutter::DlStrokeCap::kRound);
+    paint.setStrokeJoin(flutter::DlStrokeJoin::kRound);
+    builder.DrawPath(path, paint);
   }
 
   ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
@@ -111,31 +156,54 @@ TEST_P(DisplayListTest, CanDrawArc) {
     static float stroke_width = 10;
     static bool use_center = true;
 
+    static int selected_cap = 0;
+    const char* cap_names[] = {"Butt", "Round", "Square"};
+    flutter::DlStrokeCap cap;
+
     ImGui::Begin("Controls", nullptr, ImGuiWindowFlags_AlwaysAutoResize);
     ImGui::SliderFloat("Start angle", &start_angle, -360, 360);
     ImGui::SliderFloat("Sweep angle", &sweep_angle, -360, 360);
-    ImGui::SliderFloat("Stroke width", &stroke_width, 0, 100);
+    ImGui::SliderFloat("Stroke width", &stroke_width, 0, 300);
+    ImGui::Combo("Cap", &selected_cap, cap_names,
+                 sizeof(cap_names) / sizeof(char*));
     ImGui::Checkbox("Use center", &use_center);
     ImGui::End();
 
-    auto [p1, p2] = IMPELLER_PLAYGROUND_LINE(
-        Point(200, 200), Point(400, 400), 20, Color::White(), Color::White());
+    switch (selected_cap) {
+      case 0:
+        cap = flutter::DlStrokeCap::kButt;
+        break;
+      case 1:
+        cap = flutter::DlStrokeCap::kRound;
+        break;
+      case 2:
+        cap = flutter::DlStrokeCap::kSquare;
+        break;
+      default:
+        cap = flutter::DlStrokeCap::kButt;
+        break;
+    }
+
+    static PlaygroundPoint point_a(Point(200, 200), 20, Color::White());
+    static PlaygroundPoint point_b(Point(400, 400), 20, Color::White());
+    auto [p1, p2] = DrawPlaygroundLine(point_a, point_b);
 
     flutter::DisplayListBuilder builder;
+    flutter::DlPaint paint;
 
     Vector2 scale = GetContentScale();
-    builder.scale(scale.x, scale.y);
-    builder.setStyle(flutter::DlDrawStyle::kStroke);
-    builder.setStrokeCap(flutter::DlStrokeCap::kButt);
-    builder.setStrokeJoin(flutter::DlStrokeJoin::kMiter);
-    builder.setStrokeMiter(10);
+    builder.Scale(scale.x, scale.y);
+    paint.setDrawStyle(flutter::DlDrawStyle::kStroke);
+    paint.setStrokeCap(cap);
+    paint.setStrokeJoin(flutter::DlStrokeJoin::kMiter);
+    paint.setStrokeMiter(10);
     auto rect = SkRect::MakeLTRB(p1.x, p1.y, p2.x, p2.y);
-    builder.setColor(SK_ColorGREEN);
-    builder.setStrokeWidth(2);
-    builder.drawRect(rect);
-    builder.setColor(SK_ColorRED);
-    builder.setStrokeWidth(stroke_width);
-    builder.drawArc(rect, start_angle, sweep_angle, use_center);
+    paint.setColor(flutter::DlColor::kGreen());
+    paint.setStrokeWidth(2);
+    builder.DrawRect(rect, paint);
+    paint.setColor(flutter::DlColor::kRed());
+    paint.setStrokeWidth(stroke_width);
+    builder.DrawArc(rect, start_angle, sweep_angle, use_center, paint);
 
     return builder.Build();
   };
@@ -143,62 +211,218 @@ TEST_P(DisplayListTest, CanDrawArc) {
 }
 
 TEST_P(DisplayListTest, StrokedPathsDrawCorrectly) {
-  flutter::DisplayListBuilder builder;
-  builder.setColor(SK_ColorRED);
-  builder.setStyle(flutter::DlDrawStyle::kStroke);
-  builder.setStrokeWidth(10);
+  auto callback = [&]() {
+    flutter::DisplayListBuilder builder;
+    flutter::DlPaint paint;
 
-  // Rectangle
-  builder.translate(100, 100);
-  builder.drawRect(SkRect::MakeSize({100, 100}));
+    paint.setColor(flutter::DlColor::kRed());
+    paint.setDrawStyle(flutter::DlDrawStyle::kStroke);
 
-  // Rounded rectangle
-  builder.translate(150, 0);
-  builder.drawRRect(SkRRect::MakeRectXY(SkRect::MakeSize({100, 50}), 10, 10));
+    static float stroke_width = 10.0f;
+    static int selected_stroke_type = 0;
+    static int selected_join_type = 0;
+    const char* stroke_types[] = {"Butte", "Round", "Square"};
+    const char* join_type[] = {"kMiter", "Round", "kBevel"};
 
-  // Double rounded rectangle
-  builder.translate(150, 0);
-  builder.drawDRRect(
-      SkRRect::MakeRectXY(SkRect::MakeSize({100, 50}), 10, 10),
-      SkRRect::MakeRectXY(SkRect::MakeXYWH(10, 10, 80, 30), 10, 10));
+    ImGui::Begin("Controls", nullptr, ImGuiWindowFlags_AlwaysAutoResize);
+    ImGui::Combo("Cap", &selected_stroke_type, stroke_types,
+                 sizeof(stroke_types) / sizeof(char*));
+    ImGui::Combo("Join", &selected_join_type, join_type,
+                 sizeof(join_type) / sizeof(char*));
+    ImGui::SliderFloat("Stroke Width", &stroke_width, 10.0f, 50.0f);
+    ImGui::End();
 
-  // Contour with duplicate join points
-  {
-    builder.translate(150, 0);
-    SkPath path;
-    path.lineTo({100, 0});
-    path.lineTo({100, 0});
-    path.lineTo({100, 100});
-    builder.drawPath(path);
-  }
+    flutter::DlStrokeCap cap;
+    flutter::DlStrokeJoin join;
+    switch (selected_stroke_type) {
+      case 0:
+        cap = flutter::DlStrokeCap::kButt;
+        break;
+      case 1:
+        cap = flutter::DlStrokeCap::kRound;
+        break;
+      case 2:
+        cap = flutter::DlStrokeCap::kSquare;
+        break;
+      default:
+        cap = flutter::DlStrokeCap::kButt;
+        break;
+    }
+    switch (selected_join_type) {
+      case 0:
+        join = flutter::DlStrokeJoin::kMiter;
+        break;
+      case 1:
+        join = flutter::DlStrokeJoin::kRound;
+        break;
+      case 2:
+        join = flutter::DlStrokeJoin::kBevel;
+        break;
+      default:
+        join = flutter::DlStrokeJoin::kMiter;
+        break;
+    }
+    paint.setStrokeCap(cap);
+    paint.setStrokeJoin(join);
+    paint.setStrokeWidth(stroke_width);
 
-  // Contour with duplicate end points
-  {
-    builder.setStrokeCap(flutter::DlStrokeCap::kRound);
-    builder.translate(150, 0);
-    SkPath path;
-    path.moveTo(0, 0);
-    path.lineTo({0, 0});
-    path.lineTo({50, 50});
-    path.lineTo({100, 0});
-    path.lineTo({100, 0});
-    builder.drawPath(path);
-  }
+    // Make rendering better to watch.
+    builder.Scale(1.5f, 1.5f);
 
-  ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
+    // Rectangle
+    builder.Translate(100, 100);
+    builder.DrawRect(SkRect::MakeSize({100, 100}), paint);
+
+    // Rounded rectangle
+    builder.Translate(150, 0);
+    builder.DrawRRect(SkRRect::MakeRectXY(SkRect::MakeSize({100, 50}), 10, 10),
+                      paint);
+
+    // Double rounded rectangle
+    builder.Translate(150, 0);
+    builder.DrawDRRect(
+        SkRRect::MakeRectXY(SkRect::MakeSize({100, 50}), 10, 10),
+        SkRRect::MakeRectXY(SkRect::MakeXYWH(10, 10, 80, 30), 10, 10), paint);
+
+    // Contour with duplicate join points
+    {
+      builder.Translate(150, 0);
+      SkPath path;
+      path.moveTo(0, 0);
+      path.lineTo(0, 0);
+      path.lineTo({100, 0});
+      path.lineTo({100, 0});
+      path.lineTo({100, 100});
+      builder.DrawPath(path, paint);
+    }
+
+    // Contour with duplicate start and end points
+
+    // Line.
+    builder.Translate(200, 0);
+    {
+      builder.Save();
+
+      SkPath line_path;
+      line_path.moveTo(0, 0);
+      line_path.moveTo(0, 0);
+      line_path.lineTo({0, 0});
+      line_path.lineTo({0, 0});
+      line_path.lineTo({50, 50});
+      line_path.lineTo({50, 50});
+      line_path.lineTo({100, 0});
+      line_path.lineTo({100, 0});
+      builder.DrawPath(line_path, paint);
+
+      builder.Translate(0, 100);
+      builder.DrawPath(line_path, paint);
+
+      builder.Translate(0, 100);
+      SkPath line_path2;
+      line_path2.moveTo(0, 0);
+      line_path2.lineTo(0, 0);
+      line_path2.lineTo(0, 0);
+      builder.DrawPath(line_path2, paint);
+
+      builder.Restore();
+    }
+
+    // Cubic.
+    builder.Translate(150, 0);
+    {
+      builder.Save();
+
+      SkPath cubic_path;
+      cubic_path.moveTo({0, 0});
+      cubic_path.cubicTo(0, 0, 140.0, 100.0, 140, 20);
+      builder.DrawPath(cubic_path, paint);
+
+      builder.Translate(0, 100);
+      SkPath cubic_path2;
+      cubic_path2.moveTo({0, 0});
+      cubic_path2.cubicTo(0, 0, 0, 0, 150, 150);
+      builder.DrawPath(cubic_path2, paint);
+
+      builder.Translate(0, 100);
+      SkPath cubic_path3;
+      cubic_path3.moveTo({0, 0});
+      cubic_path3.cubicTo(0, 0, 0, 0, 0, 0);
+      builder.DrawPath(cubic_path3, paint);
+
+      builder.Restore();
+    }
+
+    // Quad.
+    builder.Translate(200, 0);
+    {
+      builder.Save();
+
+      SkPath quad_path;
+      quad_path.moveTo(0, 0);
+      quad_path.moveTo(0, 0);
+      quad_path.quadTo({100, 40}, {50, 80});
+      builder.DrawPath(quad_path, paint);
+
+      builder.Translate(0, 150);
+      SkPath quad_path2;
+      quad_path2.moveTo(0, 0);
+      quad_path2.moveTo(0, 0);
+      quad_path2.quadTo({0, 0}, {100, 100});
+      builder.DrawPath(quad_path2, paint);
+
+      builder.Translate(0, 100);
+      SkPath quad_path3;
+      quad_path3.moveTo(0, 0);
+      quad_path3.quadTo({0, 0}, {0, 0});
+      builder.DrawPath(quad_path3, paint);
+
+      builder.Restore();
+    }
+    return builder.Build();
+  };
+  ASSERT_TRUE(OpenPlaygroundHere(callback));
 }
 
 TEST_P(DisplayListTest, CanDrawWithOddPathWinding) {
   flutter::DisplayListBuilder builder;
-  builder.setColor(SK_ColorRED);
-  builder.setStyle(flutter::DlDrawStyle::kFill);
+  flutter::DlPaint paint;
+
+  paint.setColor(flutter::DlColor::kRed());
+  paint.setDrawStyle(flutter::DlDrawStyle::kFill);
 
-  builder.translate(300, 300);
+  builder.Translate(300, 300);
   SkPath path;
   path.setFillType(SkPathFillType::kEvenOdd);
   path.addCircle(0, 0, 100);
   path.addCircle(0, 0, 50);
-  builder.drawPath(path);
+  builder.DrawPath(path, paint);
+
+  ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
+}
+
+// Regression test for https://github.com/flutter/flutter/issues/134816.
+//
+// It should be possible to draw 3 lines, and not have an implicit close path.
+TEST_P(DisplayListTest, CanDrawAnOpenPath) {
+  flutter::DisplayListBuilder builder;
+  flutter::DlPaint paint;
+
+  paint.setColor(flutter::DlColor::kRed());
+  paint.setDrawStyle(flutter::DlDrawStyle::kStroke);
+  paint.setStrokeWidth(10);
+
+  builder.Translate(300, 300);
+
+  // Move to (50, 50) and draw lines from:
+  // 1. (50, height)
+  // 2. (width, height)
+  // 3. (width, 50)
+  SkPath path;
+  path.moveTo(50, 50);
+  path.lineTo(50, 100);
+  path.lineTo(100, 100);
+  path.lineTo(100, 50);
+  builder.DrawPath(path, paint);
 
   ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
 }
@@ -206,54 +430,112 @@ TEST_P(DisplayListTest, CanDrawWithOddPathWinding) {
 TEST_P(DisplayListTest, CanDrawWithMaskBlur) {
   auto texture = CreateTextureForFixture("embarcadero.jpg");
   flutter::DisplayListBuilder builder;
+  flutter::DlPaint paint;
 
   // Mask blurred image.
   {
-    auto filter = flutter::DlBlurMaskFilter(kNormal_SkBlurStyle, 10.0f);
-    builder.setMaskFilter(&filter);
-    builder.drawImage(DlImageImpeller::Make(texture), SkPoint::Make(100, 100),
-                      flutter::DlImageSampling::kNearestNeighbor, true);
+    auto filter =
+        flutter::DlBlurMaskFilter(flutter::DlBlurStyle::kNormal, 10.0f);
+    paint.setMaskFilter(&filter);
+    builder.DrawImage(DlImageImpeller::Make(texture), SkPoint::Make(100, 100),
+                      flutter::DlImageSampling::kNearestNeighbor, &paint);
   }
 
   // Mask blurred filled path.
   {
-    builder.setColor(SK_ColorYELLOW);
-    auto filter = flutter::DlBlurMaskFilter(kOuter_SkBlurStyle, 10.0f);
-    builder.setMaskFilter(&filter);
-    builder.drawArc(SkRect::MakeXYWH(410, 110, 100, 100), 45, 270, true);
+    paint.setColor(flutter::DlColor::kYellow());
+    auto filter =
+        flutter::DlBlurMaskFilter(flutter::DlBlurStyle::kOuter, 10.0f);
+    paint.setMaskFilter(&filter);
+    builder.DrawArc(SkRect::MakeXYWH(410, 110, 100, 100), 45, 270, true, paint);
   }
 
   // Mask blurred text.
   {
-    auto filter = flutter::DlBlurMaskFilter(kSolid_SkBlurStyle, 10.0f);
-    builder.setMaskFilter(&filter);
-    builder.drawTextBlob(
-        SkTextBlob::MakeFromString("Testing", CreateTestFont()), 220, 170);
+    auto filter =
+        flutter::DlBlurMaskFilter(flutter::DlBlurStyle::kSolid, 10.0f);
+    paint.setMaskFilter(&filter);
+    builder.DrawTextBlob(
+        SkTextBlob::MakeFromString("Testing", CreateTestFont()), 220, 170,
+        paint);
   }
 
   ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
 }
 
+TEST_P(DisplayListTest, CanDrawStrokedText) {
+  flutter::DisplayListBuilder builder;
+  flutter::DlPaint paint;
+
+  paint.setDrawStyle(flutter::DlDrawStyle::kStroke);
+  paint.setColor(flutter::DlColor::kRed());
+  builder.DrawTextBlob(
+      SkTextBlob::MakeFromString("stoked about stroked text", CreateTestFont()),
+      250, 250, paint);
+
+  ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
+}
+
+// Regression test for https://github.com/flutter/flutter/issues/133157.
+TEST_P(DisplayListTest, StrokedTextNotOffsetFromNormalText) {
+  flutter::DisplayListBuilder builder;
+  flutter::DlPaint paint;
+  auto const& text_blob = SkTextBlob::MakeFromString("00000", CreateTestFont());
+
+  // https://api.flutter.dev/flutter/material/Colors/blue-constant.html.
+  auto const& mat_blue = flutter::DlColor(0xFF2196f3);
+
+  // Draw a blue filled rectangle so the text is easier to see.
+  paint.setDrawStyle(flutter::DlDrawStyle::kFill);
+  paint.setColor(mat_blue);
+  builder.DrawRect(SkRect::MakeXYWH(0, 0, 500, 500), paint);
+
+  // Draw stacked text, with stroked text on top.
+  paint.setDrawStyle(flutter::DlDrawStyle::kFill);
+  paint.setColor(flutter::DlColor::kWhite());
+  builder.DrawTextBlob(text_blob, 250, 250, paint);
+
+  paint.setDrawStyle(flutter::DlDrawStyle::kStroke);
+  paint.setColor(flutter::DlColor::kBlack());
+  builder.DrawTextBlob(text_blob, 250, 250, paint);
+
+  ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
+}
+
+TEST_P(DisplayListTest, IgnoreMaskFilterWhenSavingLayer) {
+  auto texture = CreateTextureForFixture("embarcadero.jpg");
+  flutter::DisplayListBuilder builder;
+  auto filter = flutter::DlBlurMaskFilter(flutter::DlBlurStyle::kNormal, 10.0f);
+  flutter::DlPaint paint;
+  paint.setMaskFilter(&filter);
+  builder.SaveLayer(nullptr, &paint);
+  builder.DrawImage(DlImageImpeller::Make(texture), SkPoint::Make(100, 100),
+                    flutter::DlImageSampling::kNearestNeighbor);
+  builder.Restore();
+  ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
+}
+
 TEST_P(DisplayListTest, CanDrawWithBlendColorFilter) {
   auto texture = CreateTextureForFixture("embarcadero.jpg");
   flutter::DisplayListBuilder builder;
+  flutter::DlPaint paint;
 
   // Pipeline blended image.
   {
-    auto filter = flutter::DlBlendColorFilter(SK_ColorYELLOW,
+    auto filter = flutter::DlBlendColorFilter(flutter::DlColor::kYellow(),
                                               flutter::DlBlendMode::kModulate);
-    builder.setColorFilter(&filter);
-    builder.drawImage(DlImageImpeller::Make(texture), SkPoint::Make(100, 100),
-                      flutter::DlImageSampling::kNearestNeighbor, true);
+    paint.setColorFilter(&filter);
+    builder.DrawImage(DlImageImpeller::Make(texture), SkPoint::Make(100, 100),
+                      flutter::DlImageSampling::kNearestNeighbor, &paint);
   }
 
   // Advanced blended image.
   {
-    auto filter =
-        flutter::DlBlendColorFilter(SK_ColorRED, flutter::DlBlendMode::kScreen);
-    builder.setColorFilter(&filter);
-    builder.drawImage(DlImageImpeller::Make(texture), SkPoint::Make(250, 250),
-                      flutter::DlImageSampling::kNearestNeighbor, true);
+    auto filter = flutter::DlBlendColorFilter(flutter::DlColor::kRed(),
+                                              flutter::DlBlendMode::kScreen);
+    paint.setColorFilter(&filter);
+    builder.DrawImage(DlImageImpeller::Make(texture), SkPoint::Make(250, 250),
+                      flutter::DlImageSampling::kNearestNeighbor, &paint);
   }
 
   ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
@@ -268,18 +550,21 @@ TEST_P(DisplayListTest, CanDrawWithColorFilterImageFilter) {
   };
   auto texture = CreateTextureForFixture("boston.jpg");
   flutter::DisplayListBuilder builder;
+  flutter::DlPaint paint;
+
   auto color_filter =
       std::make_shared<flutter::DlMatrixColorFilter>(invert_color_matrix);
   auto image_filter =
       std::make_shared<flutter::DlColorFilterImageFilter>(color_filter);
-  builder.setImageFilter(image_filter.get());
-  builder.drawImage(DlImageImpeller::Make(texture), SkPoint::Make(100, 100),
-                    flutter::DlImageSampling::kNearestNeighbor, true);
-
-  builder.translate(0, 700);
-  builder.setColorFilter(color_filter.get());
-  builder.drawImage(DlImageImpeller::Make(texture), SkPoint::Make(100, 100),
-                    flutter::DlImageSampling::kNearestNeighbor, true);
+
+  paint.setImageFilter(image_filter.get());
+  builder.DrawImage(DlImageImpeller::Make(texture), SkPoint::Make(100, 100),
+                    flutter::DlImageSampling::kNearestNeighbor, &paint);
+
+  builder.Translate(0, 700);
+  paint.setColorFilter(color_filter.get());
+  builder.DrawImage(DlImageImpeller::Make(texture), SkPoint::Make(100, 100),
+                    flutter::DlImageSampling::kNearestNeighbor, &paint);
   ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
 }
 
@@ -294,12 +579,13 @@ TEST_P(DisplayListTest, CanDrawWithImageBlurFilter) {
     ImGui::End();
 
     flutter::DisplayListBuilder builder;
+    flutter::DlPaint paint;
 
     auto filter = flutter::DlBlurImageFilter(sigma[0], sigma[1],
                                              flutter::DlTileMode::kClamp);
-    builder.setImageFilter(&filter);
-    builder.drawImage(DlImageImpeller::Make(texture), SkPoint::Make(200, 200),
-                      flutter::DlImageSampling::kNearestNeighbor, true);
+    paint.setImageFilter(&filter);
+    builder.DrawImage(DlImageImpeller::Make(texture), SkPoint::Make(200, 200),
+                      flutter::DlImageSampling::kNearestNeighbor, &paint);
 
     return builder.Build();
   };
@@ -310,17 +596,20 @@ TEST_P(DisplayListTest, CanDrawWithImageBlurFilter) {
 TEST_P(DisplayListTest, CanDrawWithComposeImageFilter) {
   auto texture = CreateTextureForFixture("boston.jpg");
   flutter::DisplayListBuilder builder;
+  flutter::DlPaint paint;
+
   auto dilate = std::make_shared<flutter::DlDilateImageFilter>(10.0, 10.0);
   auto erode = std::make_shared<flutter::DlErodeImageFilter>(10.0, 10.0);
   auto open = std::make_shared<flutter::DlComposeImageFilter>(dilate, erode);
   auto close = std::make_shared<flutter::DlComposeImageFilter>(erode, dilate);
-  builder.setImageFilter(open.get());
-  builder.drawImage(DlImageImpeller::Make(texture), SkPoint::Make(100, 100),
-                    flutter::DlImageSampling::kNearestNeighbor, true);
-  builder.translate(0, 700);
-  builder.setImageFilter(close.get());
-  builder.drawImage(DlImageImpeller::Make(texture), SkPoint::Make(100, 100),
-                    flutter::DlImageSampling::kNearestNeighbor, true);
+
+  paint.setImageFilter(open.get());
+  builder.DrawImage(DlImageImpeller::Make(texture), SkPoint::Make(100, 100),
+                    flutter::DlImageSampling::kNearestNeighbor, &paint);
+  builder.Translate(0, 700);
+  paint.setImageFilter(close.get());
+  builder.DrawImage(DlImageImpeller::Make(texture), SkPoint::Make(100, 100),
+                    flutter::DlImageSampling::kNearestNeighbor, &paint);
   ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
 }
 
@@ -349,117 +638,13 @@ TEST_P(DisplayListTest, CanClampTheResultingColorOfColorMatrixFilter) {
   auto compose = std::make_shared<flutter::DlComposeImageFilter>(outer, inner);
 
   flutter::DisplayListBuilder builder;
-  builder.setImageFilter(compose.get());
-  builder.drawImage(DlImageImpeller::Make(texture), SkPoint::Make(100, 100),
-                    flutter::DlImageSampling::kNearestNeighbor, true);
+  flutter::DlPaint paint;
+  paint.setImageFilter(compose.get());
+  builder.DrawImage(DlImageImpeller::Make(texture), SkPoint::Make(100, 100),
+                    flutter::DlImageSampling::kNearestNeighbor, &paint);
   ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
 }
 
-TEST_P(DisplayListTest, SaveLayerWithColorMatrixFiltersAndAlphaDrawCorrectly) {
-  auto texture = CreateTextureForFixture("boston.jpg");
-  enum class Type { kUseAsImageFilter, kUseAsColorFilter, kDisableFilter };
-  auto callback = [&]() {
-    static float alpha = 0.5;
-    static int selected_type = 0;
-    const char* names[] = {"Use as image filter", "Use as color filter",
-                           "Disable filter"};
-
-    static float color_matrix[20] = {
-        1, 0, 0, 0, 0,  //
-        0, 1, 0, 0, 0,  //
-        0, 0, 1, 0, 0,  //
-        0, 0, 0, 2, 0,  //
-    };
-
-    ImGui::Begin("Controls", nullptr, ImGuiWindowFlags_AlwaysAutoResize);
-    ImGui::SliderFloat("Alpha", &alpha, 0, 1);
-
-    ImGui::Combo("Type", &selected_type, names, sizeof(names) / sizeof(char*));
-    std::string label = "##1";
-    for (int i = 0; i < 20; i += 5) {
-      ImGui::InputScalarN(label.c_str(), ImGuiDataType_Float,
-                          &(color_matrix[i]), 5, nullptr, nullptr, "%.2f", 0);
-      label[2]++;
-    }
-    ImGui::End();
-
-    flutter::DisplayListBuilder builder;
-    flutter::DlPaint save_paint;
-    save_paint.setAlpha(static_cast<uint8_t>(255 * alpha));
-    auto color_filter =
-        std::make_shared<flutter::DlMatrixColorFilter>(color_matrix);
-    Type type = static_cast<Type>(selected_type);
-    switch (type) {
-      case Type::kUseAsImageFilter: {
-        auto image_filter =
-            std::make_shared<flutter::DlColorFilterImageFilter>(color_filter);
-        save_paint.setImageFilter(image_filter);
-        break;
-      }
-      case Type::kUseAsColorFilter: {
-        save_paint.setColorFilter(color_filter);
-        break;
-      }
-      case Type::kDisableFilter:
-        break;
-    }
-    builder.saveLayer(nullptr, &save_paint);
-    flutter::DlPaint draw_paint;
-    builder.drawImage(DlImageImpeller::Make(texture), SkPoint::Make(100, 100),
-                      flutter::DlImageSampling::kNearestNeighbor, &draw_paint);
-    builder.restore();
-    return builder.Build();
-  };
-
-  ASSERT_TRUE(OpenPlaygroundHere(callback));
-}
-
-TEST_P(DisplayListTest, SaveLayerWithBlendFiltersAndAlphaDrawCorrectly) {
-  auto texture = CreateTextureForFixture("boston.jpg");
-  enum class Type { kUseAsImageFilter, kUseAsColorFilter, kDisableFilter };
-  auto callback = [&]() {
-    static float alpha = 0.5;
-    static int selected_type = 0;
-    const char* names[] = {"Use as image filter", "Use as color filter",
-                           "Disable filter"};
-
-    ImGui::Begin("Controls", nullptr, ImGuiWindowFlags_AlwaysAutoResize);
-    ImGui::SliderFloat("Alpha", &alpha, 0, 1);
-
-    ImGui::Combo("Type", &selected_type, names, sizeof(names) / sizeof(char*));
-    ImGui::End();
-
-    flutter::DisplayListBuilder builder;
-    flutter::DlPaint save_paint;
-    save_paint.setAlpha(static_cast<uint8_t>(255 * alpha));
-    auto color_filter = std::make_shared<flutter::DlBlendColorFilter>(
-        flutter::DlColor::kRed(), flutter::DlBlendMode::kDstOver);
-    Type type = static_cast<Type>(selected_type);
-    switch (type) {
-      case Type::kUseAsImageFilter: {
-        auto image_filter =
-            std::make_shared<flutter::DlColorFilterImageFilter>(color_filter);
-        save_paint.setImageFilter(image_filter);
-        break;
-      }
-      case Type::kUseAsColorFilter: {
-        save_paint.setColorFilter(color_filter);
-        break;
-      }
-      case Type::kDisableFilter:
-        break;
-    }
-    builder.saveLayer(nullptr, &save_paint);
-    flutter::DlPaint draw_paint;
-    draw_paint.setColor(flutter::DlColor::kBlue());
-    builder.drawRect(SkRect::MakeLTRB(100, 100, 400, 400), draw_paint);
-    builder.restore();
-    return builder.Build();
-  };
-
-  ASSERT_TRUE(OpenPlaygroundHere(callback));
-}
-
 TEST_P(DisplayListTest, CanDrawBackdropFilter) {
   auto texture = CreateTextureForFixture("embarcadero.jpg");
 
@@ -485,40 +670,42 @@ TEST_P(DisplayListTest, CanDrawBackdropFilter) {
     flutter::DisplayListBuilder builder;
 
     Vector2 scale = ctm_scale * GetContentScale();
-    builder.scale(scale.x, scale.y);
+    builder.Scale(scale.x, scale.y);
 
     auto filter = flutter::DlBlurImageFilter(sigma[0], sigma[1],
                                              flutter::DlTileMode::kClamp);
 
     std::optional<SkRect> bounds;
     if (use_bounds) {
-      auto [p1, p2] = IMPELLER_PLAYGROUND_LINE(
-          Point(350, 150), Point(800, 600), 20, Color::White(), Color::White());
+      static PlaygroundPoint point_a(Point(350, 150), 20, Color::White());
+      static PlaygroundPoint point_b(Point(800, 600), 20, Color::White());
+      auto [p1, p2] = DrawPlaygroundLine(point_a, point_b);
       bounds = SkRect::MakeLTRB(p1.x, p1.y, p2.x, p2.y);
     }
 
     // Insert a clip to test that the backdrop filter handles stencil depths > 0
     // correctly.
     if (add_clip) {
-      builder.clipRect(SkRect::MakeLTRB(0, 0, 99999, 99999),
-                       SkClipOp::kIntersect, true);
+      builder.ClipRect(SkRect::MakeLTRB(0, 0, 99999, 99999),
+                       flutter::DlCanvas::ClipOp::kIntersect, true);
     }
 
-    builder.drawImage(DlImageImpeller::Make(texture), SkPoint::Make(200, 200),
-                      flutter::DlImageSampling::kNearestNeighbor, true);
-    builder.saveLayer(bounds.has_value() ? &bounds.value() : nullptr, nullptr,
+    builder.DrawImage(DlImageImpeller::Make(texture), SkPoint::Make(200, 200),
+                      flutter::DlImageSampling::kNearestNeighbor, nullptr);
+    builder.SaveLayer(bounds.has_value() ? &bounds.value() : nullptr, nullptr,
                       &filter);
 
     if (draw_circle) {
-      auto circle_center =
-          IMPELLER_PLAYGROUND_POINT(Point(500, 400), 20, Color::Red());
-
-      builder.setStyle(flutter::DlDrawStyle::kStroke);
-      builder.setStrokeCap(flutter::DlStrokeCap::kButt);
-      builder.setStrokeJoin(flutter::DlStrokeJoin::kBevel);
-      builder.setStrokeWidth(10);
-      builder.setColor(flutter::DlColor::kRed().withAlpha(100));
-      builder.drawCircle({circle_center.x, circle_center.y}, 100);
+      static PlaygroundPoint center_point(Point(500, 400), 20, Color::Red());
+      auto circle_center = DrawPlaygroundPoint(center_point);
+
+      flutter::DlPaint paint;
+      paint.setDrawStyle(flutter::DlDrawStyle::kStroke);
+      paint.setStrokeCap(flutter::DlStrokeCap::kButt);
+      paint.setStrokeJoin(flutter::DlStrokeJoin::kBevel);
+      paint.setStrokeWidth(10);
+      paint.setColor(flutter::DlColor::kRed().withAlpha(100));
+      builder.DrawCircle({circle_center.x, circle_center.y}, 100, paint);
     }
 
     return builder.Build();
@@ -532,12 +719,12 @@ TEST_P(DisplayListTest, CanDrawNinePatchImage) {
   auto texture = CreateTextureForFixture("embarcadero.jpg");
   flutter::DisplayListBuilder builder;
   auto size = texture->GetSize();
-  builder.drawImageNine(
+  builder.DrawImageNine(
       DlImageImpeller::Make(texture),
       SkIRect::MakeLTRB(size.width / 4, size.height / 4, size.width * 3 / 4,
                         size.height * 3 / 4),
       SkRect::MakeLTRB(0, 0, size.width * 2, size.height * 2),
-      flutter::DlFilterMode::kNearest, true);
+      flutter::DlFilterMode::kNearest, nullptr);
   ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
 }
 
@@ -548,12 +735,12 @@ TEST_P(DisplayListTest, CanDrawNinePatchImageCenterWidthBiggerThanDest) {
   auto texture = CreateTextureForFixture("embarcadero.jpg");
   flutter::DisplayListBuilder builder;
   auto size = texture->GetSize();
-  builder.drawImageNine(
+  builder.DrawImageNine(
       DlImageImpeller::Make(texture),
       SkIRect::MakeLTRB(size.width / 4, size.height / 4, size.width * 3 / 4,
                         size.height * 3 / 4),
       SkRect::MakeLTRB(0, 0, size.width / 2, size.height),
-      flutter::DlFilterMode::kNearest, true);
+      flutter::DlFilterMode::kNearest, nullptr);
   ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
 }
 
@@ -564,12 +751,12 @@ TEST_P(DisplayListTest, CanDrawNinePatchImageCenterHeightBiggerThanDest) {
   auto texture = CreateTextureForFixture("embarcadero.jpg");
   flutter::DisplayListBuilder builder;
   auto size = texture->GetSize();
-  builder.drawImageNine(
+  builder.DrawImageNine(
       DlImageImpeller::Make(texture),
       SkIRect::MakeLTRB(size.width / 4, size.height / 4, size.width * 3 / 4,
                         size.height * 3 / 4),
       SkRect::MakeLTRB(0, 0, size.width, size.height / 2),
-      flutter::DlFilterMode::kNearest, true);
+      flutter::DlFilterMode::kNearest, nullptr);
   ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
 }
 
@@ -579,12 +766,12 @@ TEST_P(DisplayListTest, CanDrawNinePatchImageCenterBiggerThanDest) {
   auto texture = CreateTextureForFixture("embarcadero.jpg");
   flutter::DisplayListBuilder builder;
   auto size = texture->GetSize();
-  builder.drawImageNine(
+  builder.DrawImageNine(
       DlImageImpeller::Make(texture),
       SkIRect::MakeLTRB(size.width / 4, size.height / 4, size.width * 3 / 4,
                         size.height * 3 / 4),
       SkRect::MakeLTRB(0, 0, size.width / 2, size.height / 2),
-      flutter::DlFilterMode::kNearest, true);
+      flutter::DlFilterMode::kNearest, nullptr);
   ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
 }
 
@@ -594,12 +781,24 @@ TEST_P(DisplayListTest, CanDrawNinePatchImageCornersScaledDown) {
   auto texture = CreateTextureForFixture("embarcadero.jpg");
   flutter::DisplayListBuilder builder;
   auto size = texture->GetSize();
-  builder.drawImageNine(
+  builder.DrawImageNine(
       DlImageImpeller::Make(texture),
       SkIRect::MakeLTRB(size.width / 4, size.height / 4, size.width * 3 / 4,
                         size.height * 3 / 4),
       SkRect::MakeLTRB(0, 0, size.width / 4, size.height / 4),
-      flutter::DlFilterMode::kNearest, true);
+      flutter::DlFilterMode::kNearest, nullptr);
+  ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
+}
+
+TEST_P(DisplayListTest, NinePatchImagePrecision) {
+  // Draw a nine patch image with colored corners and verify that the corner
+  // color does not leak outside the intended region.
+  auto texture = CreateTextureForFixture("nine_patch_corners.png");
+  flutter::DisplayListBuilder builder;
+  builder.DrawImageNine(DlImageImpeller::Make(texture),
+                        SkIRect::MakeXYWH(10, 10, 1, 1),
+                        SkRect::MakeXYWH(0, 0, 200, 100),
+                        flutter::DlFilterMode::kNearest, nullptr);
   ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
 }
 
@@ -623,17 +822,18 @@ TEST_P(DisplayListTest, CanDrawPoints) {
       flutter::DlPaint()                                         //
           .setColor(flutter::DlColor::kYellow().withAlpha(127))  //
           .setStrokeWidth(20);
-  builder.translate(50, 50);
+  builder.Translate(50, 50);
   for (auto cap : caps) {
     paint.setStrokeCap(cap);
-    builder.save();
-    builder.drawPoints(SkCanvas::kPoints_PointMode, 7, points, paint);
-    builder.translate(150, 0);
-    builder.drawPoints(SkCanvas::kLines_PointMode, 5, points, paint);
-    builder.translate(150, 0);
-    builder.drawPoints(SkCanvas::kPolygon_PointMode, 5, points, paint);
-    builder.restore();
-    builder.translate(0, 150);
+    builder.Save();
+    builder.DrawPoints(flutter::DlCanvas::PointMode::kPoints, 7, points, paint);
+    builder.Translate(150, 0);
+    builder.DrawPoints(flutter::DlCanvas::PointMode::kLines, 5, points, paint);
+    builder.Translate(150, 0);
+    builder.DrawPoints(flutter::DlCanvas::PointMode::kPolygon, 5, points,
+                       paint);
+    builder.Restore();
+    builder.Translate(0, 150);
   }
   ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
 }
@@ -654,18 +854,19 @@ TEST_P(DisplayListTest, CanDrawZeroLengthLine) {
   SkPath path = SkPath().addPoly({{150, 50}, {150, 50}}, false);
   for (auto cap : caps) {
     paint.setStrokeCap(cap);
-    builder.drawLine({50, 50}, {50, 50}, paint);
-    builder.drawPath(path, paint);
-    builder.translate(0, 150);
+    builder.DrawLine({50, 50}, {50, 50}, paint);
+    builder.DrawPath(path, paint);
+    builder.Translate(0, 150);
   }
   ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
 }
 
 TEST_P(DisplayListTest, CanDrawShadow) {
   flutter::DisplayListBuilder builder;
+  flutter::DlPaint paint;
 
   auto content_scale = GetContentScale() * 0.8;
-  builder.scale(content_scale.x, content_scale.y);
+  builder.Scale(content_scale.x, content_scale.y);
 
   constexpr size_t star_spikes = 5;
   constexpr SkScalar half_spike_rotation = kPi / star_spikes;
@@ -690,25 +891,88 @@ TEST_P(DisplayListTest, CanDrawShadow) {
       SkPath{}.addCircle(100, 50, 50),
       SkPath{}.addPoly(star.data(), star.size(), true),
   };
-  builder.setColor(flutter::DlColor::kWhite());
-  builder.drawPaint();
-  builder.setColor(flutter::DlColor::kCyan());
-  builder.translate(100, 50);
+  paint.setColor(flutter::DlColor::kWhite());
+  builder.DrawPaint(paint);
+  paint.setColor(flutter::DlColor::kCyan());
+  builder.Translate(100, 50);
   for (size_t x = 0; x < paths.size(); x++) {
-    builder.save();
+    builder.Save();
     for (size_t y = 0; y < 6; y++) {
-      builder.drawShadow(paths[x], flutter::DlColor::kBlack(), 3 + y * 8, false,
+      builder.DrawShadow(paths[x], flutter::DlColor::kBlack(), 3 + y * 8, false,
                          1);
-      builder.drawPath(paths[x]);
-      builder.translate(0, 150);
+      builder.DrawPath(paths[x], paint);
+      builder.Translate(0, 150);
     }
-    builder.restore();
-    builder.translate(250, 0);
+    builder.Restore();
+    builder.Translate(250, 0);
   }
 
   ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
 }
 
+TEST_P(DisplayListTest,
+       DispatcherDoesNotCullPerspectiveTransformedChildDisplayLists) {
+  // Regression test for https://github.com/flutter/flutter/issues/130613
+  flutter::DisplayListBuilder sub_builder(true);
+  sub_builder.DrawRect(SkRect::MakeXYWH(0, 0, 50, 50),
+                       flutter::DlPaint(flutter::DlColor::kRed()));
+  auto display_list = sub_builder.Build();
+
+  DlDispatcher dispatcher(Rect::MakeLTRB(0, 0, 2400, 1800));
+  dispatcher.scale(2.0, 2.0);
+  dispatcher.translate(-93.0, 0.0);
+  // clang-format off
+  dispatcher.transformFullPerspective(
+     0.8, -0.2, -0.1, -0.0,
+     0.0,  1.0,  0.0,  0.0,
+     1.4,  1.3,  1.0,  0.0,
+    63.2, 65.3, 48.6,  1.1
+  );
+  // clang-format on
+  dispatcher.translate(35.0, 75.0);
+  dispatcher.drawDisplayList(display_list, 1.0f);
+  auto picture = dispatcher.EndRecordingAsPicture();
+
+  bool found = false;
+  picture.pass->IterateAllEntities([&found](Entity& entity) {
+    if (std::static_pointer_cast<SolidColorContents>(entity.GetContents())
+            ->GetColor() == Color::Red()) {
+      found = true;
+      return false;
+    }
+
+    return true;
+  });
+  EXPECT_TRUE(found);
+}
+
+TEST_P(DisplayListTest, TransparentShadowProducesCorrectColor) {
+  DlDispatcher dispatcher;
+  dispatcher.save();
+  dispatcher.scale(1.618, 1.618);
+  SkPath path = SkPath{}.addRect(SkRect::MakeXYWH(0, 0, 200, 100));
+  flutter::DlOpReceiver::CacheablePath cache(path);
+  dispatcher.drawShadow(cache, flutter::DlColor::kTransparent(), 15, false, 1);
+  dispatcher.restore();
+  auto picture = dispatcher.EndRecordingAsPicture();
+
+  std::shared_ptr<SolidRRectBlurContents> rrect_blur;
+  picture.pass->IterateAllEntities([&rrect_blur](Entity& entity) {
+    if (ScalarNearlyEqual(entity.GetTransform().GetScale().x, 1.618f)) {
+      rrect_blur = std::static_pointer_cast<SolidRRectBlurContents>(
+          entity.GetContents());
+      return false;
+    }
+    return true;
+  });
+
+  ASSERT_NE(rrect_blur, nullptr);
+  ASSERT_EQ(rrect_blur->GetColor().red, 0);
+  ASSERT_EQ(rrect_blur->GetColor().green, 0);
+  ASSERT_EQ(rrect_blur->GetColor().blue, 0);
+  ASSERT_EQ(rrect_blur->GetColor().alpha, 0);
+}
+
 // Draw a hexagon using triangle fan
 TEST_P(DisplayListTest, CanConvertTriangleFanToTriangles) {
   constexpr Scalar hexagon_radius = 125;
@@ -728,12 +992,12 @@ TEST_P(DisplayListTest, CanConvertTriangleFanToTriangles) {
     SkPoint::Make(hex_start.x - center_to_flat, hex_start.y + 0.5 * hexagon_radius)
   };
   // clang-format on
-  auto paint = flutter::DlPaint().setColor(flutter::DlColor::kDarkGrey());
+  auto paint = flutter::DlPaint(flutter::DlColor::kDarkGrey());
   auto dl_vertices = flutter::DlVertices::Make(
       flutter::DlVertexMode::kTriangleFan, vertices.size(), vertices.data(),
       nullptr, nullptr);
   flutter::DisplayListBuilder builder;
-  builder.drawVertices(dl_vertices, flutter::DlBlendMode::kSrcOver, paint);
+  builder.DrawVertices(dl_vertices, flutter::DlBlendMode::kSrcOver, paint);
   ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
 }
 
@@ -758,15 +1022,15 @@ TEST_P(DisplayListTest, CanDrawZeroWidthLine) {
   SkPath path = SkPath().addPoly({{150, 50}, {160, 50}}, false);
   for (auto cap : caps) {
     paint.setStrokeCap(cap);
-    builder.drawLine({50, 50}, {60, 50}, paint);
-    builder.drawRect({45, 45, 65, 55}, outline_paint);
-    builder.drawLine({100, 50}, {100, 50}, paint);
+    builder.DrawLine({50, 50}, {60, 50}, paint);
+    builder.DrawRect({45, 45, 65, 55}, outline_paint);
+    builder.DrawLine({100, 50}, {100, 50}, paint);
     if (cap != flutter::DlStrokeCap::kButt) {
-      builder.drawRect({95, 45, 105, 55}, outline_paint);
+      builder.DrawRect({95, 45, 105, 55}, outline_paint);
     }
-    builder.drawPath(path, paint);
-    builder.drawRect(path.getBounds().makeOutset(5, 5), outline_paint);
-    builder.translate(0, 150);
+    builder.DrawPath(path, paint);
+    builder.DrawRect(path.getBounds().makeOutset(5, 5), outline_paint);
+    builder.Translate(0, 150);
   }
   ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
 }
@@ -819,20 +1083,21 @@ TEST_P(DisplayListTest, CanDrawWithMatrixFilter) {
     ImGui::End();
 
     flutter::DisplayListBuilder builder;
-    SkPaint paint;
+    flutter::DlPaint paint;
+
     if (enable_savelayer) {
-      builder.saveLayer(nullptr, nullptr);
+      builder.SaveLayer(nullptr, nullptr);
     }
     {
       auto content_scale = GetContentScale();
-      builder.scale(content_scale.x, content_scale.y);
+      builder.Scale(content_scale.x, content_scale.y);
 
       // Set the current transform
       auto ctm_matrix =
           SkMatrix::MakeAll(ctm_scale[0], ctm_skew[0], ctm_translation[0],  //
                             ctm_skew[1], ctm_scale[1], ctm_translation[1],  //
                             0, 0, 1);
-      builder.transform(ctm_matrix);
+      builder.Transform(ctm_matrix);
 
       // Set the matrix filter
       auto filter_matrix =
@@ -845,7 +1110,7 @@ TEST_P(DisplayListTest, CanDrawWithMatrixFilter) {
           case 0: {
             auto filter = flutter::DlMatrixImageFilter(
                 filter_matrix, flutter::DlImageSampling::kLinear);
-            builder.setImageFilter(&filter);
+            paint.setImageFilter(&filter);
             break;
           }
           case 1: {
@@ -854,17 +1119,17 @@ TEST_P(DisplayListTest, CanDrawWithMatrixFilter) {
                     .shared();
             auto filter = flutter::DlLocalMatrixImageFilter(filter_matrix,
                                                             internal_filter);
-            builder.setImageFilter(&filter);
+            paint.setImageFilter(&filter);
             break;
           }
         }
       }
 
-      builder.drawImage(DlImageImpeller::Make(boston), {},
-                        flutter::DlImageSampling::kLinear, true);
+      builder.DrawImage(DlImageImpeller::Make(boston), {},
+                        flutter::DlImageSampling::kLinear, &paint);
     }
     if (enable_savelayer) {
-      builder.restore();
+      builder.Restore();
     }
 
     return builder.Build();
@@ -873,16 +1138,75 @@ TEST_P(DisplayListTest, CanDrawWithMatrixFilter) {
   ASSERT_TRUE(OpenPlaygroundHere(callback));
 }
 
+TEST_P(DisplayListTest, CanDrawWithMatrixFilterWhenSavingLayer) {
+  auto callback = [&]() {
+    static float translation[2] = {0, 0};
+    static bool enable_save_layer = true;
+
+    ImGui::Begin("Controls", nullptr, ImGuiWindowFlags_AlwaysAutoResize);
+    ImGui::SliderFloat2("Translation", translation, -130, 130);
+    ImGui::Checkbox("Enable save layer", &enable_save_layer);
+    ImGui::End();
+
+    flutter::DisplayListBuilder builder;
+    builder.Save();
+    builder.Scale(2.0, 2.0);
+    flutter::DlPaint paint;
+    paint.setColor(flutter::DlColor::kYellow());
+    builder.DrawRect(SkRect::MakeWH(300, 300), paint);
+    paint.setStrokeWidth(1.0);
+    paint.setDrawStyle(flutter::DlDrawStyle::kStroke);
+    paint.setColor(flutter::DlColor::kBlack().withAlpha(0x80));
+    builder.DrawLine(SkPoint::Make(150, 0), SkPoint::Make(150, 300), paint);
+    builder.DrawLine(SkPoint::Make(0, 150), SkPoint::Make(300, 150), paint);
+
+    flutter::DlPaint save_paint;
+    SkRect bounds = SkRect::MakeXYWH(100, 100, 100, 100);
+    SkMatrix translate_matrix =
+        SkMatrix::Translate(translation[0], translation[1]);
+    if (enable_save_layer) {
+      auto filter = flutter::DlMatrixImageFilter(
+          translate_matrix, flutter::DlImageSampling::kNearestNeighbor);
+      save_paint.setImageFilter(filter.shared());
+      builder.SaveLayer(&bounds, &save_paint);
+    } else {
+      builder.Save();
+      builder.Transform(translate_matrix);
+    }
+
+    SkMatrix filter_matrix = SkMatrix::I();
+    filter_matrix.postTranslate(-150, -150);
+    filter_matrix.postScale(0.2f, 0.2f);
+    filter_matrix.postTranslate(150, 150);
+    auto filter = flutter::DlMatrixImageFilter(
+        filter_matrix, flutter::DlImageSampling::kNearestNeighbor);
+
+    save_paint.setImageFilter(filter.shared());
+
+    builder.SaveLayer(&bounds, &save_paint);
+    flutter::DlPaint paint2;
+    paint2.setColor(flutter::DlColor::kBlue());
+    builder.DrawRect(bounds, paint2);
+    builder.Restore();
+    builder.Restore();
+    return builder.Build();
+  };
+
+  ASSERT_TRUE(OpenPlaygroundHere(callback));
+}
+
 TEST_P(DisplayListTest, CanDrawRectWithLinearToSrgbColorFilter) {
   flutter::DlPaint paint;
   paint.setColor(flutter::DlColor(0xFF2196F3).withAlpha(128));
   flutter::DisplayListBuilder builder;
-  paint.setColorFilter(flutter::DlLinearToSrgbGammaColorFilter::instance.get());
-  builder.drawRect(SkRect::MakeXYWH(0, 0, 200, 200), paint);
-  builder.translate(0, 200);
+  paint.setColorFilter(
+      flutter::DlLinearToSrgbGammaColorFilter::kInstance.get());
+  builder.DrawRect(SkRect::MakeXYWH(0, 0, 200, 200), paint);
+  builder.Translate(0, 200);
 
-  paint.setColorFilter(flutter::DlSrgbToLinearGammaColorFilter::instance.get());
-  builder.drawRect(SkRect::MakeXYWH(0, 0, 200, 200), paint);
+  paint.setColorFilter(
+      flutter::DlSrgbToLinearGammaColorFilter::kInstance.get());
+  builder.DrawRect(SkRect::MakeXYWH(0, 0, 200, 200), paint);
 
   ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
 }
@@ -896,45 +1220,45 @@ TEST_P(DisplayListTest, CanDrawPaintWithColorSource) {
   flutter::DlPaint paint;
   flutter::DisplayListBuilder builder;
   auto clip_bounds = SkRect::MakeWH(300.0, 300.0);
-  builder.save();
-  builder.translate(100, 100);
-  builder.clipRect(clip_bounds, SkClipOp::kIntersect, false);
+  builder.Save();
+  builder.Translate(100, 100);
+  builder.ClipRect(clip_bounds, flutter::DlCanvas::ClipOp::kIntersect, false);
   auto linear =
       flutter::DlColorSource::MakeLinear({0.0, 0.0}, {100.0, 100.0}, 2, colors,
                                          stops, flutter::DlTileMode::kRepeat);
   paint.setColorSource(linear);
-  builder.drawPaint(paint);
-  builder.restore();
+  builder.DrawPaint(paint);
+  builder.Restore();
 
-  builder.save();
-  builder.translate(500, 100);
-  builder.clipRect(clip_bounds, SkClipOp::kIntersect, false);
+  builder.Save();
+  builder.Translate(500, 100);
+  builder.ClipRect(clip_bounds, flutter::DlCanvas::ClipOp::kIntersect, false);
   auto radial = flutter::DlColorSource::MakeRadial(
       {100.0, 100.0}, 100.0, 2, colors, stops, flutter::DlTileMode::kRepeat);
   paint.setColorSource(radial);
-  builder.drawPaint(paint);
-  builder.restore();
+  builder.DrawPaint(paint);
+  builder.Restore();
 
-  builder.save();
-  builder.translate(100, 500);
-  builder.clipRect(clip_bounds, SkClipOp::kIntersect, false);
+  builder.Save();
+  builder.Translate(100, 500);
+  builder.ClipRect(clip_bounds, flutter::DlCanvas::ClipOp::kIntersect, false);
   auto sweep =
       flutter::DlColorSource::MakeSweep({100.0, 100.0}, 180.0, 270.0, 2, colors,
                                         stops, flutter::DlTileMode::kRepeat);
   paint.setColorSource(sweep);
-  builder.drawPaint(paint);
-  builder.restore();
+  builder.DrawPaint(paint);
+  builder.Restore();
 
-  builder.save();
-  builder.translate(500, 500);
-  builder.clipRect(clip_bounds, SkClipOp::kIntersect, false);
+  builder.Save();
+  builder.Translate(500, 500);
+  builder.ClipRect(clip_bounds, flutter::DlCanvas::ClipOp::kIntersect, false);
   auto texture = CreateTextureForFixture("table_mountain_nx.png");
   auto image = std::make_shared<flutter::DlImageColorSource>(
       DlImageImpeller::Make(texture), flutter::DlTileMode::kRepeat,
       flutter::DlTileMode::kRepeat);
   paint.setColorSource(image);
-  builder.drawPaint(paint);
-  builder.restore();
+  builder.DrawPaint(paint);
+  builder.Restore();
 
   ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
 }
@@ -943,48 +1267,48 @@ TEST_P(DisplayListTest, CanBlendDstOverAndDstCorrectly) {
   flutter::DisplayListBuilder builder;
 
   {
-    builder.saveLayer(nullptr, nullptr);
-    builder.translate(100, 100);
+    builder.SaveLayer(nullptr, nullptr);
+    builder.Translate(100, 100);
     flutter::DlPaint paint;
     paint.setColor(flutter::DlColor::kRed());
-    builder.drawRect(SkRect::MakeSize({200, 200}), paint);
+    builder.DrawRect(SkRect::MakeSize({200, 200}), paint);
     paint.setColor(flutter::DlColor::kBlue().withAlpha(127));
     paint.setBlendMode(flutter::DlBlendMode::kSrcOver);
-    builder.drawRect(SkRect::MakeSize({200, 200}), paint);
-    builder.restore();
+    builder.DrawRect(SkRect::MakeSize({200, 200}), paint);
+    builder.Restore();
   }
   {
-    builder.saveLayer(nullptr, nullptr);
-    builder.translate(300, 100);
+    builder.SaveLayer(nullptr, nullptr);
+    builder.Translate(300, 100);
     flutter::DlPaint paint;
     paint.setColor(flutter::DlColor::kBlue().withAlpha(127));
-    builder.drawRect(SkRect::MakeSize({200, 200}), paint);
+    builder.DrawRect(SkRect::MakeSize({200, 200}), paint);
     paint.setColor(flutter::DlColor::kRed());
     paint.setBlendMode(flutter::DlBlendMode::kDstOver);
-    builder.drawRect(SkRect::MakeSize({200, 200}), paint);
-    builder.restore();
+    builder.DrawRect(SkRect::MakeSize({200, 200}), paint);
+    builder.Restore();
   }
   {
-    builder.saveLayer(nullptr, nullptr);
-    builder.translate(100, 300);
+    builder.SaveLayer(nullptr, nullptr);
+    builder.Translate(100, 300);
     flutter::DlPaint paint;
     paint.setColor(flutter::DlColor::kRed());
-    builder.drawRect(SkRect::MakeSize({200, 200}), paint);
+    builder.DrawRect(SkRect::MakeSize({200, 200}), paint);
     paint.setColor(flutter::DlColor::kBlue().withAlpha(127));
     paint.setBlendMode(flutter::DlBlendMode::kSrc);
-    builder.drawRect(SkRect::MakeSize({200, 200}), paint);
-    builder.restore();
+    builder.DrawRect(SkRect::MakeSize({200, 200}), paint);
+    builder.Restore();
   }
   {
-    builder.saveLayer(nullptr, nullptr);
-    builder.translate(300, 300);
+    builder.SaveLayer(nullptr, nullptr);
+    builder.Translate(300, 300);
     flutter::DlPaint paint;
     paint.setColor(flutter::DlColor::kBlue().withAlpha(127));
-    builder.drawRect(SkRect::MakeSize({200, 200}), paint);
+    builder.DrawRect(SkRect::MakeSize({200, 200}), paint);
     paint.setColor(flutter::DlColor::kRed());
     paint.setBlendMode(flutter::DlBlendMode::kDst);
-    builder.drawRect(SkRect::MakeSize({200, 200}), paint);
-    builder.restore();
+    builder.DrawRect(SkRect::MakeSize({200, 200}), paint);
+    builder.Restore();
   }
 
   ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
@@ -1015,13 +1339,13 @@ TEST_P(DisplayListTest, CanDrawCorrectlyWithColorFilterAndImageFilter) {
   paint.setColor(flutter::DlColor::kRed());
   paint.setColorFilter(green_color_filter);
   paint.setImageFilter(blue_image_filter);
-  builder.drawRect(SkRect::MakeLTRB(100, 100, 500, 500), paint);
+  builder.DrawRect(SkRect::MakeLTRB(100, 100, 500, 500), paint);
   ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
 }
 
 TEST_P(DisplayListTest, MaskBlursApplyCorrectlyToColorSources) {
   auto blur_filter = std::make_shared<flutter::DlBlurMaskFilter>(
-      SkBlurStyle::kNormal_SkBlurStyle, 10);
+      flutter::DlBlurStyle::kNormal, 10);
 
   flutter::DisplayListBuilder builder;
 
@@ -1035,18 +1359,18 @@ TEST_P(DisplayListTest, MaskBlursApplyCorrectlyToColorSources) {
           stops.data(), flutter::DlTileMode::kClamp)};
 
   int offset = 100;
-  for (auto color_source : color_sources) {
+  for (const auto& color_source : color_sources) {
     flutter::DlPaint paint;
     paint.setColorSource(color_source);
     paint.setMaskFilter(blur_filter);
 
     paint.setDrawStyle(flutter::DlDrawStyle::kFill);
-    builder.drawRRect(
+    builder.DrawRRect(
         SkRRect::MakeRectXY(SkRect::MakeXYWH(100, offset, 100, 50), 30, 30),
         paint);
     paint.setDrawStyle(flutter::DlDrawStyle::kStroke);
     paint.setStrokeWidth(10);
-    builder.drawRRect(
+    builder.DrawRRect(
         SkRRect::MakeRectXY(SkRect::MakeXYWH(300, offset, 100, 50), 30, 30),
         paint);
 
@@ -1068,14 +1392,14 @@ TEST_P(DisplayListTest, DrawVerticesSolidColorTrianglesWithoutIndices) {
 
   auto vertices = flutter::DlVertices::Make(
       flutter::DlVertexMode::kTriangles, 3, positions.data(),
-      /*texture_coorindates=*/nullptr, colors.data());
+      /*texture_coordinates=*/nullptr, colors.data());
 
   flutter::DisplayListBuilder builder;
   flutter::DlPaint paint;
 
   paint.setColor(flutter::DlColor::kRed().modulateOpacity(0.5));
-  builder.scale(-1, -1);
-  builder.drawVertices(vertices, flutter::DlBlendMode::kSrcOver, paint);
+  builder.Scale(-1, -1);
+  builder.DrawVertices(vertices, flutter::DlBlendMode::kSrcOver, paint);
 
   ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
 }
@@ -1087,7 +1411,36 @@ TEST_P(DisplayListTest, DrawVerticesLinearGradientWithoutIndices) {
 
   auto vertices = flutter::DlVertices::Make(
       flutter::DlVertexMode::kTriangles, 3, positions.data(),
-      /*texture_coorindates=*/nullptr, /*colors=*/nullptr);
+      /*texture_coordinates=*/nullptr, /*colors=*/nullptr);
+
+  std::vector<flutter::DlColor> colors = {flutter::DlColor::kBlue(),
+                                          flutter::DlColor::kRed()};
+  const float stops[2] = {0.0, 1.0};
+
+  auto linear = flutter::DlColorSource::MakeLinear(
+      {100.0, 100.0}, {300.0, 300.0}, 2, colors.data(), stops,
+      flutter::DlTileMode::kRepeat);
+
+  flutter::DisplayListBuilder builder;
+  flutter::DlPaint paint;
+
+  paint.setColorSource(linear);
+  builder.DrawVertices(vertices, flutter::DlBlendMode::kSrcOver, paint);
+
+  ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
+}
+
+TEST_P(DisplayListTest, DrawVerticesLinearGradientWithTextureCoordinates) {
+  std::vector<SkPoint> positions = {SkPoint::Make(100, 300),
+                                    SkPoint::Make(200, 100),
+                                    SkPoint::Make(300, 300)};
+  std::vector<SkPoint> texture_coordinates = {SkPoint::Make(300, 100),
+                                              SkPoint::Make(100, 200),
+                                              SkPoint::Make(300, 300)};
+
+  auto vertices = flutter::DlVertices::Make(
+      flutter::DlVertexMode::kTriangles, 3, positions.data(),
+      texture_coordinates.data(), /*colors=*/nullptr);
 
   std::vector<flutter::DlColor> colors = {flutter::DlColor::kBlue(),
                                           flutter::DlColor::kRed()};
@@ -1101,7 +1454,61 @@ TEST_P(DisplayListTest, DrawVerticesLinearGradientWithoutIndices) {
   flutter::DlPaint paint;
 
   paint.setColorSource(linear);
-  builder.drawVertices(vertices, flutter::DlBlendMode::kSrcOver, paint);
+  builder.DrawVertices(vertices, flutter::DlBlendMode::kSrcOver, paint);
+
+  ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
+}
+
+TEST_P(DisplayListTest, DrawVerticesImageSourceWithTextureCoordinates) {
+  auto texture = CreateTextureForFixture("embarcadero.jpg");
+  auto dl_image = DlImageImpeller::Make(texture);
+  std::vector<SkPoint> positions = {SkPoint::Make(100, 300),
+                                    SkPoint::Make(200, 100),
+                                    SkPoint::Make(300, 300)};
+  std::vector<SkPoint> texture_coordinates = {
+      SkPoint::Make(0, 0), SkPoint::Make(100, 200), SkPoint::Make(200, 100)};
+
+  auto vertices = flutter::DlVertices::Make(
+      flutter::DlVertexMode::kTriangles, 3, positions.data(),
+      texture_coordinates.data(), /*colors=*/nullptr);
+
+  flutter::DisplayListBuilder builder;
+  flutter::DlPaint paint;
+
+  auto image_source = flutter::DlImageColorSource(
+      dl_image, flutter::DlTileMode::kRepeat, flutter::DlTileMode::kRepeat);
+
+  paint.setColorSource(&image_source);
+  builder.DrawVertices(vertices, flutter::DlBlendMode::kSrcOver, paint);
+
+  ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
+}
+
+TEST_P(DisplayListTest,
+       DrawVerticesImageSourceWithTextureCoordinatesAndColorBlending) {
+  auto texture = CreateTextureForFixture("embarcadero.jpg");
+  auto dl_image = DlImageImpeller::Make(texture);
+  std::vector<SkPoint> positions = {SkPoint::Make(100, 300),
+                                    SkPoint::Make(200, 100),
+                                    SkPoint::Make(300, 300)};
+  std::vector<flutter::DlColor> colors = {flutter::DlColor::kWhite(),
+                                          flutter::DlColor::kGreen(),
+                                          flutter::DlColor::kWhite()};
+  std::vector<SkPoint> texture_coordinates = {
+      SkPoint::Make(0, 0), SkPoint::Make(100, 200), SkPoint::Make(200, 100)};
+
+  auto vertices = flutter::DlVertices::Make(
+      flutter::DlVertexMode::kTriangles, 3, positions.data(),
+      texture_coordinates.data(), colors.data());
+
+  flutter::DisplayListBuilder builder;
+  flutter::DlPaint paint;
+
+  auto image_source = flutter::DlImageColorSource(
+      dl_image, flutter::DlTileMode::kRepeat, flutter::DlTileMode::kRepeat);
+
+  paint.setColorSource(&image_source);
+  builder.DrawVertices(vertices, flutter::DlBlendMode::kModulate, paint);
 
   ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
 }
@@ -1113,14 +1520,39 @@ TEST_P(DisplayListTest, DrawVerticesSolidColorTrianglesWithIndices) {
   std::vector<uint16_t> indices = {0, 1, 2, 0, 2, 3};
 
   auto vertices = flutter::DlVertices::Make(
-      flutter::DlVertexMode::kTriangles, 6, positions.data(),
-      /*texture_coorindates=*/nullptr, /*colors=*/nullptr, 6, indices.data());
+      flutter::DlVertexMode::kTriangles, positions.size(), positions.data(),
+      /*texture_coordinates=*/nullptr, /*colors=*/nullptr, indices.size(),
+      indices.data());
 
   flutter::DisplayListBuilder builder;
   flutter::DlPaint paint;
 
   paint.setColor(flutter::DlColor::kWhite());
-  builder.drawVertices(vertices, flutter::DlBlendMode::kSrcOver, paint);
+  builder.DrawVertices(vertices, flutter::DlBlendMode::kSrcOver, paint);
+
+  ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
+}
+
+TEST_P(DisplayListTest, DrawVerticesPremultipliesColors) {
+  std::vector<SkPoint> positions = {
+      SkPoint::Make(100, 300), SkPoint::Make(200, 100), SkPoint::Make(300, 300),
+      SkPoint::Make(200, 500)};
+  auto color = flutter::DlColor::kBlue().withAlpha(0x99);
+  std::vector<uint16_t> indices = {0, 1, 2, 0, 2, 3};
+  std::vector<flutter::DlColor> colors = {color, color, color, color};
+
+  auto vertices = flutter::DlVertices::Make(
+      flutter::DlVertexMode::kTriangles, positions.size(), positions.data(),
+      /*texture_coordinates=*/nullptr, colors.data(), indices.size(),
+      indices.data());
+
+  flutter::DisplayListBuilder builder;
+  flutter::DlPaint paint;
+  paint.setBlendMode(flutter::DlBlendMode::kSrcOver);
+  paint.setColor(flutter::DlColor::kRed());
+
+  builder.DrawRect(SkRect::MakeLTRB(0, 0, 400, 400), paint);
+  builder.DrawVertices(vertices, flutter::DlBlendMode::kDst, paint);
 
   ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
 }
@@ -1144,22 +1576,284 @@ TEST_P(DisplayListTest, DrawShapes) {
           .setStrokeWidth(10);
   SkPath path = SkPath().addPoly({{150, 50}, {160, 50}}, false);
 
-  builder.translate(300, 50);
-  builder.scale(0.8, 0.8);
+  builder.Translate(300, 50);
+  builder.Scale(0.8, 0.8);
   for (auto join : joins) {
     paint.setStrokeJoin(join);
     stroke_paint.setStrokeJoin(join);
-    builder.drawRect(SkRect::MakeXYWH(0, 0, 100, 100), paint);
-    builder.drawRect(SkRect::MakeXYWH(0, 150, 100, 100), stroke_paint);
-    builder.drawRRect(
+    builder.DrawRect(SkRect::MakeXYWH(0, 0, 100, 100), paint);
+    builder.DrawRect(SkRect::MakeXYWH(0, 150, 100, 100), stroke_paint);
+    builder.DrawRRect(
         SkRRect::MakeRectXY(SkRect::MakeXYWH(150, 0, 100, 100), 30, 30), paint);
-    builder.drawRRect(
+    builder.DrawRRect(
         SkRRect::MakeRectXY(SkRect::MakeXYWH(150, 150, 100, 100), 30, 30),
         stroke_paint);
-    builder.drawCircle({350, 50}, 50, paint);
-    builder.drawCircle({350, 200}, 50, stroke_paint);
-    builder.translate(0, 300);
+    builder.DrawCircle({350, 50}, 50, paint);
+    builder.DrawCircle({350, 200}, 50, stroke_paint);
+    builder.Translate(0, 300);
+  }
+  ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
+}
+
+TEST_P(DisplayListTest, ClipDrawRRectWithNonCircularRadii) {
+  flutter::DisplayListBuilder builder;
+
+  flutter::DlPaint fill_paint =                       //
+      flutter::DlPaint()                              //
+          .setColor(flutter::DlColor::kBlue())        //
+          .setDrawStyle(flutter::DlDrawStyle::kFill)  //
+          .setStrokeWidth(10);
+  flutter::DlPaint stroke_paint =                       //
+      flutter::DlPaint()                                //
+          .setColor(flutter::DlColor::kGreen())         //
+          .setDrawStyle(flutter::DlDrawStyle::kStroke)  //
+          .setStrokeWidth(10);
+
+  builder.DrawRRect(
+      SkRRect::MakeRectXY(SkRect::MakeXYWH(500, 100, 300, 300), 120, 40),
+      fill_paint);
+  builder.DrawRRect(
+      SkRRect::MakeRectXY(SkRect::MakeXYWH(500, 100, 300, 300), 120, 40),
+      stroke_paint);
+
+  builder.DrawRRect(
+      SkRRect::MakeRectXY(SkRect::MakeXYWH(100, 500, 300, 300), 40, 120),
+      fill_paint);
+  builder.DrawRRect(
+      SkRRect::MakeRectXY(SkRect::MakeXYWH(100, 500, 300, 300), 40, 120),
+      stroke_paint);
+
+  flutter::DlPaint reference_paint =                  //
+      flutter::DlPaint()                              //
+          .setColor(flutter::DlColor::kMidGrey())     //
+          .setDrawStyle(flutter::DlDrawStyle::kFill)  //
+          .setStrokeWidth(10);
+
+  builder.DrawRRect(
+      SkRRect::MakeRectXY(SkRect::MakeXYWH(500, 500, 300, 300), 40, 40),
+      reference_paint);
+  builder.DrawRRect(
+      SkRRect::MakeRectXY(SkRect::MakeXYWH(100, 100, 300, 300), 120, 120),
+      reference_paint);
+
+  flutter::DlPaint clip_fill_paint =                  //
+      flutter::DlPaint()                              //
+          .setColor(flutter::DlColor::kCyan())        //
+          .setDrawStyle(flutter::DlDrawStyle::kFill)  //
+          .setStrokeWidth(10);
+
+  builder.Save();
+  builder.ClipRRect(
+      SkRRect::MakeRectXY(SkRect::MakeXYWH(900, 100, 300, 300), 120, 40));
+  builder.DrawPaint(clip_fill_paint);
+  builder.Restore();
+
+  builder.Save();
+  builder.ClipRRect(
+      SkRRect::MakeRectXY(SkRect::MakeXYWH(100, 900, 300, 300), 40, 120));
+  builder.DrawPaint(clip_fill_paint);
+  builder.Restore();
+
+  ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
+}
+
+TEST_P(DisplayListTest, DrawVerticesBlendModes) {
+  std::vector<const char*> blend_mode_names;
+  std::vector<flutter::DlBlendMode> blend_mode_values;
+  {
+    const std::vector<std::tuple<const char*, flutter::DlBlendMode>> blends = {
+        // Pipeline blends (Porter-Duff alpha compositing)
+        {"Clear", flutter::DlBlendMode::kClear},
+        {"Source", flutter::DlBlendMode::kSrc},
+        {"Destination", flutter::DlBlendMode::kDst},
+        {"SourceOver", flutter::DlBlendMode::kSrcOver},
+        {"DestinationOver", flutter::DlBlendMode::kDstOver},
+        {"SourceIn", flutter::DlBlendMode::kSrcIn},
+        {"DestinationIn", flutter::DlBlendMode::kDstIn},
+        {"SourceOut", flutter::DlBlendMode::kSrcOut},
+        {"DestinationOut", flutter::DlBlendMode::kDstOut},
+        {"SourceATop", flutter::DlBlendMode::kSrcATop},
+        {"DestinationATop", flutter::DlBlendMode::kDstATop},
+        {"Xor", flutter::DlBlendMode::kXor},
+        {"Plus", flutter::DlBlendMode::kPlus},
+        {"Modulate", flutter::DlBlendMode::kModulate},
+        // Advanced blends (color component blends)
+        {"Screen", flutter::DlBlendMode::kScreen},
+        {"Overlay", flutter::DlBlendMode::kOverlay},
+        {"Darken", flutter::DlBlendMode::kDarken},
+        {"Lighten", flutter::DlBlendMode::kLighten},
+        {"ColorDodge", flutter::DlBlendMode::kColorDodge},
+        {"ColorBurn", flutter::DlBlendMode::kColorBurn},
+        {"HardLight", flutter::DlBlendMode::kHardLight},
+        {"SoftLight", flutter::DlBlendMode::kSoftLight},
+        {"Difference", flutter::DlBlendMode::kDifference},
+        {"Exclusion", flutter::DlBlendMode::kExclusion},
+        {"Multiply", flutter::DlBlendMode::kMultiply},
+        {"Hue", flutter::DlBlendMode::kHue},
+        {"Saturation", flutter::DlBlendMode::kSaturation},
+        {"Color", flutter::DlBlendMode::kColor},
+        {"Luminosity", flutter::DlBlendMode::kLuminosity},
+    };
+    assert(blends.size() ==
+           static_cast<size_t>(flutter::DlBlendMode::kLastMode) + 1);
+    for (const auto& [name, mode] : blends) {
+      blend_mode_names.push_back(name);
+      blend_mode_values.push_back(mode);
+    }
   }
+
+  auto callback = [&]() {
+    static int current_blend_index = 3;
+    static float dst_alpha = 1;
+    static float src_alpha = 1;
+    static float color0[4] = {1.0f, 0.0f, 0.0f, 1.0f};
+    static float color1[4] = {0.0f, 1.0f, 0.0f, 1.0f};
+    static float color2[4] = {0.0f, 0.0f, 1.0f, 1.0f};
+    static float src_color[4] = {1.0f, 1.0f, 1.0f, 1.0f};
+
+    ImGui::Begin("Controls", nullptr, ImGuiWindowFlags_AlwaysAutoResize);
+    {
+      ImGui::ListBox("Blending mode", &current_blend_index,
+                     blend_mode_names.data(), blend_mode_names.size());
+      ImGui::SliderFloat("Source alpha", &src_alpha, 0, 1);
+      ImGui::ColorEdit4("Color A", color0);
+      ImGui::ColorEdit4("Color B", color1);
+      ImGui::ColorEdit4("Color C", color2);
+      ImGui::ColorEdit4("Source Color", src_color);
+      ImGui::SliderFloat("Destination alpha", &dst_alpha, 0, 1);
+    }
+    ImGui::End();
+
+    std::vector<SkPoint> positions = {SkPoint::Make(100, 300),
+                                      SkPoint::Make(200, 100),
+                                      SkPoint::Make(300, 300)};
+    std::vector<flutter::DlColor> colors = {
+        toColor(color0).modulateOpacity(dst_alpha),
+        toColor(color1).modulateOpacity(dst_alpha),
+        toColor(color2).modulateOpacity(dst_alpha)};
+
+    auto vertices = flutter::DlVertices::Make(
+        flutter::DlVertexMode::kTriangles, 3, positions.data(),
+        /*texture_coordinates=*/nullptr, colors.data());
+
+    flutter::DisplayListBuilder builder;
+    flutter::DlPaint paint;
+
+    paint.setColor(toColor(src_color).modulateOpacity(src_alpha));
+    builder.DrawVertices(vertices, blend_mode_values[current_blend_index],
+                         paint);
+    return builder.Build();
+  };
+
+  ASSERT_TRUE(OpenPlaygroundHere(callback));
+}
+
+template <typename Contents>
+static std::optional<Rect> GetCoverageOfFirstEntity(const Picture& picture) {
+  std::optional<Rect> coverage;
+  picture.pass->IterateAllEntities([&coverage](Entity& entity) {
+    if (std::static_pointer_cast<Contents>(entity.GetContents())) {
+      auto contents = std::static_pointer_cast<Contents>(entity.GetContents());
+      Entity entity;
+      coverage = contents->GetCoverage(entity);
+      return false;
+    }
+    return true;
+  });
+  return coverage;
+}
+
+TEST(DisplayListTest, RRectBoundsComputation) {
+  SkRRect rrect = SkRRect::MakeRectXY(SkRect::MakeLTRB(0, 0, 100, 100), 4, 4);
+  SkPath path = SkPath().addRRect(rrect);
+
+  flutter::DlPaint paint;
+  flutter::DisplayListBuilder builder;
+
+  builder.DrawPath(path, paint);
+  auto display_list = builder.Build();
+
+  DlDispatcher dispatcher;
+  display_list->Dispatch(dispatcher);
+  auto picture = dispatcher.EndRecordingAsPicture();
+
+  std::optional<Rect> coverage =
+      GetCoverageOfFirstEntity<SolidColorContents>(picture);
+
+  // Validate that the RRect coverage is _exactly_ the same as the input rect.
+  ASSERT_TRUE(coverage.has_value());
+  ASSERT_EQ(coverage.value_or(Rect::MakeMaximum()),
+            Rect::MakeLTRB(0, 0, 100, 100));
+}
+
+TEST(DisplayListTest, CircleBoundsComputation) {
+  SkPath path = SkPath().addCircle(0, 0, 5);
+
+  flutter::DlPaint paint;
+  flutter::DisplayListBuilder builder;
+
+  builder.DrawPath(path, paint);
+  auto display_list = builder.Build();
+
+  DlDispatcher dispatcher;
+  display_list->Dispatch(dispatcher);
+  auto picture = dispatcher.EndRecordingAsPicture();
+
+  std::optional<Rect> coverage =
+      GetCoverageOfFirstEntity<SolidColorContents>(picture);
+
+  ASSERT_TRUE(coverage.has_value());
+  ASSERT_EQ(coverage.value_or(Rect::MakeMaximum()),
+            Rect::MakeLTRB(-5, -5, 5, 5));
+}
+
+#ifdef IMPELLER_ENABLE_3D
+TEST_P(DisplayListTest, SceneColorSource) {
+  // Load up the scene.
+  auto mapping =
+      flutter::testing::OpenFixtureAsMapping("flutter_logo_baked.glb.ipscene");
+  ASSERT_NE(mapping, nullptr);
+
+  std::shared_ptr<scene::Node> gltf_scene =
+      impeller::scene::Node::MakeFromFlatbuffer(
+          *mapping, *GetContext()->GetResourceAllocator());
+  ASSERT_NE(gltf_scene, nullptr);
+
+  flutter::DisplayListBuilder builder;
+
+  auto color_source = std::make_shared<flutter::DlSceneColorSource>(
+      gltf_scene,
+      Matrix::MakePerspective(Degrees(45), GetWindowSize(), 0.1, 1000) *
+          Matrix::MakeLookAt({3, 2, -5}, {0, 0, 0}, {0, 1, 0}));
+
+  flutter::DlPaint paint = flutter::DlPaint().setColorSource(color_source);
+
+  builder.DrawPaint(paint);
+
+  ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
+}
+#endif
+
+TEST_P(DisplayListTest, DrawPaintIgnoresMaskFilter) {
+  flutter::DisplayListBuilder builder;
+  builder.DrawPaint(flutter::DlPaint().setColor(flutter::DlColor::kWhite()));
+
+  auto filter = flutter::DlBlurMaskFilter(flutter::DlBlurStyle::kNormal, 10.0f);
+  builder.DrawCircle({300, 300}, 200,
+                     flutter::DlPaint().setMaskFilter(&filter));
+
+  std::vector<flutter::DlColor> colors = {flutter::DlColor::kGreen(),
+                                          flutter::DlColor::kGreen()};
+  const float stops[2] = {0.0, 1.0};
+  auto linear = flutter::DlColorSource::MakeLinear(
+      {100.0, 100.0}, {300.0, 300.0}, 2, colors.data(), stops,
+      flutter::DlTileMode::kRepeat);
+  flutter::DlPaint blend_paint =
+      flutter::DlPaint()           //
+          .setColorSource(linear)  //
+          .setBlendMode(flutter::DlBlendMode::kScreen);
+  builder.DrawPaint(blend_paint);
+
   ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
 }
 
diff --git a/impeller/display_list/dl_vertices_geometry.cc b/impeller/display_list/dl_vertices_geometry.cc
new file mode 100644
index 0000000000000000000000000000000000000000..279e5905700bf9a11f2eae9f30a777621bdc05aa
--- /dev/null
+++ b/impeller/display_list/dl_vertices_geometry.cc
@@ -0,0 +1,65 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/display_list/dl_vertices_geometry.h"
+
+#include "display_list/dl_vertices.h"
+#include "impeller/display_list/skia_conversions.h"
+#include "impeller/entity/geometry/vertices_geometry.h"
+#include "impeller/geometry/point.h"
+#include "third_party/skia/include/core/SkPoint.h"
+#include "third_party/skia/include/core/SkRect.h"
+
+namespace impeller {
+
+static Rect ToRect(const SkRect& rect) {
+  return Rect::MakeLTRB(rect.fLeft, rect.fTop, rect.fRight, rect.fBottom);
+}
+
+static VerticesGeometry::VertexMode ToVertexMode(flutter::DlVertexMode mode) {
+  switch (mode) {
+    case flutter::DlVertexMode::kTriangles:
+      return VerticesGeometry::VertexMode::kTriangles;
+    case flutter::DlVertexMode::kTriangleStrip:
+      return VerticesGeometry::VertexMode::kTriangleStrip;
+    case flutter::DlVertexMode::kTriangleFan:
+      return VerticesGeometry::VertexMode::kTriangleFan;
+  };
+}
+
+std::shared_ptr<impeller::VerticesGeometry> MakeVertices(
+    const flutter::DlVertices* vertices) {
+  auto bounds = ToRect(vertices->bounds());
+  auto mode = ToVertexMode(vertices->mode());
+  std::vector<Point> positions(vertices->vertex_count());
+  for (auto i = 0; i < vertices->vertex_count(); i++) {
+    positions[i] = skia_conversions::ToPoint(vertices->vertices()[i]);
+  }
+
+  std::vector<uint16_t> indices(vertices->index_count());
+  for (auto i = 0; i < vertices->index_count(); i++) {
+    indices[i] = vertices->indices()[i];
+  }
+
+  std::vector<Color> colors;
+  if (vertices->colors()) {
+    colors.reserve(vertices->vertex_count());
+    for (auto i = 0; i < vertices->vertex_count(); i++) {
+      colors.push_back(
+          skia_conversions::ToColor(vertices->colors()[i]).Premultiply());
+    }
+  }
+  std::vector<Point> texture_coordinates;
+  if (vertices->texture_coordinates()) {
+    texture_coordinates.reserve(vertices->vertex_count());
+    for (auto i = 0; i < vertices->vertex_count(); i++) {
+      texture_coordinates.push_back(
+          skia_conversions::ToPoint(vertices->texture_coordinates()[i]));
+    }
+  }
+  return std::make_shared<VerticesGeometry>(
+      positions, indices, texture_coordinates, colors, bounds, mode);
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/deletion_queue_vk.h b/impeller/display_list/dl_vertices_geometry.h
similarity index 36%
rename from impeller/renderer/backend/vulkan/deletion_queue_vk.h
rename to impeller/display_list/dl_vertices_geometry.h
index 427844f752680ccd623336cb2f86c2c4efac12c5..e7502cdc83dbe86e1ff1c033a7810c8b1275005a 100644
--- a/impeller/renderer/backend/vulkan/deletion_queue_vk.h
+++ b/impeller/display_list/dl_vertices_geometry.h
@@ -2,31 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_DISPLAY_LIST_DL_VERTICES_GEOMETRY_H_
+#define FLUTTER_IMPELLER_DISPLAY_LIST_DL_VERTICES_GEOMETRY_H_
 
-#include <deque>
-#include <functional>
+#include "flutter/display_list/dl_vertices.h"
 
-#include "flutter/fml/macros.h"
+#include "impeller/entity/geometry/vertices_geometry.h"
 
 namespace impeller {
 
-class DeletionQueueVK {
- public:
-  using Deletor = std::function<void()>;
-
-  explicit DeletionQueueVK();
-
-  ~DeletionQueueVK();
-
-  void Flush();
-
-  void Push(Deletor&& deletor);
-
- private:
-  std::deque<Deletor> deletors_;
-
-  FML_DISALLOW_COPY_AND_ASSIGN(DeletionQueueVK);
-};
+std::shared_ptr<VerticesGeometry> MakeVertices(
+    const flutter::DlVertices* vertices);
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_DISPLAY_LIST_DL_VERTICES_GEOMETRY_H_
diff --git a/impeller/display_list/nine_patch_converter.cc b/impeller/display_list/nine_patch_converter.cc
index 4a4536999ac6eb9375ff00837fad759cc1e52f07..73d28838afe40e0c75429e68ccf55a1bf33112f2 100644
--- a/impeller/display_list/nine_patch_converter.cc
+++ b/impeller/display_list/nine_patch_converter.cc
@@ -61,7 +61,7 @@ void NinePatchConverter::DrawNinePatch(const std::shared_ptr<Image>& image,
                                        Rect center,
                                        Rect dst,
                                        const SamplerDescriptor& sampler,
-                                       Canvas* canvas,
+                                       CanvasType* canvas,
                                        Paint* paint) {
   if (dst.IsEmpty()) {
     return;
@@ -86,7 +86,7 @@ void NinePatchConverter::DrawNinePatch(const std::shared_ptr<Image>& image,
       // DrawImageAtlas.
       canvas->DrawImageRect(image, Rect::MakeLTRB(srcX0, srcY0, srcX1, srcY1),
                             Rect::MakeLTRB(dstX0, dstY0, dstX1, dstY1), *paint,
-                            sampler);
+                            sampler, SourceRectConstraint::kStrict);
     }
   }
 }
diff --git a/impeller/display_list/nine_patch_converter.h b/impeller/display_list/nine_patch_converter.h
index 6795f4dc7feb8d48b30fe873dfa7d53afc501e8b..2d0974baa1ebba6d2391d5f605b970135f00d500 100644
--- a/impeller/display_list/nine_patch_converter.h
+++ b/impeller/display_list/nine_patch_converter.h
@@ -2,16 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_DISPLAY_LIST_NINE_PATCH_CONVERTER_H_
+#define FLUTTER_IMPELLER_DISPLAY_LIST_NINE_PATCH_CONVERTER_H_
 
 #include <memory>
 
-#include "flutter/fml/macros.h"
-#include "impeller/aiks/canvas.h"
+#include "impeller/aiks/canvas_type.h"
 #include "impeller/aiks/image.h"
 #include "impeller/aiks/paint.h"
-#include "impeller/geometry/path.h"
-#include "impeller/renderer/sampler_descriptor.h"
+#include "impeller/core/sampler_descriptor.h"
 
 namespace impeller {
 
@@ -26,7 +25,7 @@ class NinePatchConverter {
                      Rect center,
                      Rect dst,
                      const SamplerDescriptor& sampler,
-                     Canvas* canvas,
+                     CanvasType* canvas,
                      Paint* paint);
 
  private:
@@ -45,3 +44,5 @@ class NinePatchConverter {
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_DISPLAY_LIST_NINE_PATCH_CONVERTER_H_
diff --git a/impeller/display_list/skia_conversions.cc b/impeller/display_list/skia_conversions.cc
new file mode 100644
index 0000000000000000000000000000000000000000..f356e9973a57a345b111dabe63a6cc98fe1a1e49
--- /dev/null
+++ b/impeller/display_list/skia_conversions.cc
@@ -0,0 +1,223 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/display_list/skia_conversions.h"
+#include "display_list/dl_color.h"
+#include "third_party/skia/modules/skparagraph/include/Paragraph.h"
+
+namespace impeller {
+namespace skia_conversions {
+
+Rect ToRect(const SkRect& rect) {
+  return Rect::MakeLTRB(rect.fLeft, rect.fTop, rect.fRight, rect.fBottom);
+}
+
+std::optional<Rect> ToRect(const SkRect* rect) {
+  if (rect == nullptr) {
+    return std::nullopt;
+  }
+  return Rect::MakeLTRB(rect->fLeft, rect->fTop, rect->fRight, rect->fBottom);
+}
+
+std::vector<Rect> ToRects(const SkRect tex[], int count) {
+  auto result = std::vector<Rect>();
+  for (int i = 0; i < count; i++) {
+    result.push_back(ToRect(tex[i]));
+  }
+  return result;
+}
+
+std::vector<Point> ToPoints(const SkPoint points[], int count) {
+  std::vector<Point> result(count);
+  for (auto i = 0; i < count; i++) {
+    result[i] = ToPoint(points[i]);
+  }
+  return result;
+}
+
+PathBuilder::RoundingRadii ToRoundingRadii(const SkRRect& rrect) {
+  using Corner = SkRRect::Corner;
+  PathBuilder::RoundingRadii radii;
+  radii.bottom_left = ToPoint(rrect.radii(Corner::kLowerLeft_Corner));
+  radii.bottom_right = ToPoint(rrect.radii(Corner::kLowerRight_Corner));
+  radii.top_left = ToPoint(rrect.radii(Corner::kUpperLeft_Corner));
+  radii.top_right = ToPoint(rrect.radii(Corner::kUpperRight_Corner));
+  return radii;
+}
+
+Path ToPath(const SkPath& path, Point shift) {
+  auto iterator = SkPath::Iter(path, false);
+
+  struct PathData {
+    union {
+      SkPoint points[4];
+    };
+  };
+
+  PathBuilder builder;
+  PathData data;
+  // Reserve a path size with some arbitrarily additional padding.
+  builder.Reserve(path.countPoints() + 8, path.countVerbs() + 8);
+  auto verb = SkPath::Verb::kDone_Verb;
+  do {
+    verb = iterator.next(data.points);
+    switch (verb) {
+      case SkPath::kMove_Verb:
+        builder.MoveTo(ToPoint(data.points[0]));
+        break;
+      case SkPath::kLine_Verb:
+        builder.LineTo(ToPoint(data.points[1]));
+        break;
+      case SkPath::kQuad_Verb:
+        builder.QuadraticCurveTo(ToPoint(data.points[1]),
+                                 ToPoint(data.points[2]));
+        break;
+      case SkPath::kConic_Verb: {
+        constexpr auto kPow2 = 1;  // Only works for sweeps up to 90 degrees.
+        constexpr auto kQuadCount = 1 + (2 * (1 << kPow2));
+        SkPoint points[kQuadCount];
+        const auto curve_count =
+            SkPath::ConvertConicToQuads(data.points[0],          //
+                                        data.points[1],          //
+                                        data.points[2],          //
+                                        iterator.conicWeight(),  //
+                                        points,                  //
+                                        kPow2                    //
+            );
+
+        for (int curve_index = 0, point_index = 0;  //
+             curve_index < curve_count;             //
+             curve_index++, point_index += 2        //
+        ) {
+          builder.QuadraticCurveTo(ToPoint(points[point_index + 1]),
+                                   ToPoint(points[point_index + 2]));
+        }
+      } break;
+      case SkPath::kCubic_Verb:
+        builder.CubicCurveTo(ToPoint(data.points[1]), ToPoint(data.points[2]),
+                             ToPoint(data.points[3]));
+        break;
+      case SkPath::kClose_Verb:
+        builder.Close();
+        break;
+      case SkPath::kDone_Verb:
+        break;
+    }
+  } while (verb != SkPath::Verb::kDone_Verb);
+
+  FillType fill_type;
+  switch (path.getFillType()) {
+    case SkPathFillType::kWinding:
+      fill_type = FillType::kNonZero;
+      break;
+    case SkPathFillType::kEvenOdd:
+      fill_type = FillType::kOdd;
+      break;
+    case SkPathFillType::kInverseWinding:
+    case SkPathFillType::kInverseEvenOdd:
+      // Flutter doesn't expose these path fill types. These are only visible
+      // via the receiver interface. We should never get here.
+      fill_type = FillType::kNonZero;
+      break;
+  }
+  builder.SetConvexity(path.isConvex() ? Convexity::kConvex
+                                       : Convexity::kUnknown);
+  builder.Shift(shift);
+  auto sk_bounds = path.getBounds().makeOutset(shift.x, shift.y);
+  builder.SetBounds(ToRect(sk_bounds));
+  return builder.TakePath(fill_type);
+}
+
+Path ToPath(const SkRRect& rrect) {
+  return PathBuilder{}
+      .AddRoundedRect(ToRect(rrect.getBounds()), ToRoundingRadii(rrect))
+      .SetConvexity(Convexity::kConvex)
+      .SetBounds(ToRect(rrect.getBounds()))
+      .TakePath();
+}
+
+Point ToPoint(const SkPoint& point) {
+  return Point::MakeXY(point.fX, point.fY);
+}
+
+Size ToSize(const SkPoint& point) {
+  return Size(point.fX, point.fY);
+}
+
+Color ToColor(const flutter::DlColor& color) {
+  return {
+      static_cast<Scalar>(color.getRedF()),    //
+      static_cast<Scalar>(color.getGreenF()),  //
+      static_cast<Scalar>(color.getBlueF()),   //
+      static_cast<Scalar>(color.getAlphaF())   //
+  };
+}
+
+std::vector<Matrix> ToRSXForms(const SkRSXform xform[], int count) {
+  auto result = std::vector<Matrix>();
+  for (int i = 0; i < count; i++) {
+    auto form = xform[i];
+    // clang-format off
+    auto matrix = Matrix{
+      form.fSCos, form.fSSin, 0, 0,
+     -form.fSSin, form.fSCos, 0, 0,
+      0,          0,          1, 0,
+      form.fTx,   form.fTy,   0, 1
+    };
+    // clang-format on
+    result.push_back(matrix);
+  }
+  return result;
+}
+
+Path PathDataFromTextBlob(const sk_sp<SkTextBlob>& blob, Point shift) {
+  if (!blob) {
+    return {};
+  }
+
+  return ToPath(skia::textlayout::Paragraph::GetPath(blob.get()), shift);
+}
+
+std::optional<impeller::PixelFormat> ToPixelFormat(SkColorType type) {
+  switch (type) {
+    case kRGBA_8888_SkColorType:
+      return impeller::PixelFormat::kR8G8B8A8UNormInt;
+    case kBGRA_8888_SkColorType:
+      return impeller::PixelFormat::kB8G8R8A8UNormInt;
+    case kRGBA_F16_SkColorType:
+      return impeller::PixelFormat::kR16G16B16A16Float;
+    case kBGR_101010x_XR_SkColorType:
+      return impeller::PixelFormat::kB10G10R10XR;
+    default:
+      return std::nullopt;
+  }
+  return std::nullopt;
+}
+
+void ConvertStops(const flutter::DlGradientColorSourceBase* gradient,
+                  std::vector<Color>& colors,
+                  std::vector<float>& stops) {
+  FML_DCHECK(gradient->stop_count() >= 2);
+
+  auto* dl_colors = gradient->colors();
+  auto* dl_stops = gradient->stops();
+  if (dl_stops[0] != 0.0) {
+    colors.emplace_back(skia_conversions::ToColor(dl_colors[0]));
+    stops.emplace_back(0);
+  }
+  for (auto i = 0; i < gradient->stop_count(); i++) {
+    colors.emplace_back(skia_conversions::ToColor(dl_colors[i]));
+    stops.emplace_back(std::clamp(dl_stops[i], 0.0f, 1.0f));
+  }
+  if (dl_stops[gradient->stop_count() - 1] != 1.0) {
+    colors.emplace_back(colors.back());
+    stops.emplace_back(1.0);
+  }
+  for (auto i = 1; i < gradient->stop_count(); i++) {
+    stops[i] = std::clamp(stops[i], stops[i - 1], stops[i]);
+  }
+}
+
+}  // namespace skia_conversions
+}  // namespace impeller
diff --git a/impeller/display_list/skia_conversions.h b/impeller/display_list/skia_conversions.h
new file mode 100644
index 0000000000000000000000000000000000000000..a0fe839d29b872e583549fe0be81b5cecd80b1c4
--- /dev/null
+++ b/impeller/display_list/skia_conversions.h
@@ -0,0 +1,75 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_DISPLAY_LIST_SKIA_CONVERSIONS_H_
+#define FLUTTER_IMPELLER_DISPLAY_LIST_SKIA_CONVERSIONS_H_
+
+#include "display_list/dl_color.h"
+#include "display_list/effects/dl_color_source.h"
+#include "impeller/core/formats.h"
+#include "impeller/geometry/color.h"
+#include "impeller/geometry/path.h"
+#include "impeller/geometry/path_builder.h"
+#include "impeller/geometry/point.h"
+#include "impeller/geometry/rect.h"
+#include "third_party/skia/include/core/SkColor.h"
+#include "third_party/skia/include/core/SkColorType.h"
+#include "third_party/skia/include/core/SkPath.h"
+#include "third_party/skia/include/core/SkPoint.h"
+#include "third_party/skia/include/core/SkRRect.h"
+#include "third_party/skia/include/core/SkRSXform.h"
+#include "third_party/skia/include/core/SkTextBlob.h"
+
+namespace impeller {
+namespace skia_conversions {
+
+Rect ToRect(const SkRect& rect);
+
+std::optional<Rect> ToRect(const SkRect* rect);
+
+std::vector<Rect> ToRects(const SkRect tex[], int count);
+
+std::vector<Point> ToPoints(const SkPoint points[], int count);
+
+Point ToPoint(const SkPoint& point);
+
+Size ToSize(const SkPoint& point);
+
+Color ToColor(const flutter::DlColor& color);
+
+std::vector<Matrix> ToRSXForms(const SkRSXform xform[], int count);
+
+PathBuilder::RoundingRadii ToRoundingRadii(const SkRRect& rrect);
+
+Path ToPath(const SkPath& path, Point shift = Point(0, 0));
+
+Path ToPath(const SkRRect& rrect);
+
+Path PathDataFromTextBlob(const sk_sp<SkTextBlob>& blob,
+                          Point shift = Point(0, 0));
+
+std::optional<impeller::PixelFormat> ToPixelFormat(SkColorType type);
+
+/// @brief Convert display list colors + stops into impeller colors and stops,
+/// taking care to ensure that the stops monotonically increase from 0.0 to 1.0.
+///
+/// The general process is:
+/// * Ensure that the first gradient stop value is 0.0. If not, insert a new
+///   stop with a value of 0.0 and use the first gradient color as this new
+///   stops color.
+/// * Ensure the last gradient stop value is 1.0. If not, insert a new stop
+///   with a value of 1.0 and use the last gradient color as this stops color.
+/// * Clamp all gradient values between the values of 0.0 and 1.0.
+/// * For all stop values, ensure that the values are monotonically increasing
+///   by clamping each value to a minimum of the previous stop value and itself.
+///   For example, with stop values of 0.0, 0.5, 0.4, 1.0, we would clamp such
+///   that the values were 0.0, 0.5, 0.5, 1.0.
+void ConvertStops(const flutter::DlGradientColorSourceBase* gradient,
+                  std::vector<Color>& colors,
+                  std::vector<float>& stops);
+
+}  // namespace skia_conversions
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_DISPLAY_LIST_SKIA_CONVERSIONS_H_
diff --git a/impeller/display_list/skia_conversions_unittests.cc b/impeller/display_list/skia_conversions_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..e31005e322c9f3c9b3f54b89be0847f6665772d3
--- /dev/null
+++ b/impeller/display_list/skia_conversions_unittests.cc
@@ -0,0 +1,178 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "display_list/dl_color.h"
+#include "display_list/dl_tile_mode.h"
+#include "flutter/testing/testing.h"
+#include "impeller/display_list/skia_conversions.h"
+#include "impeller/geometry/scalar.h"
+
+namespace impeller {
+namespace testing {
+
+TEST(SkiaConversionsTest, SkPointToPoint) {
+  for (int x = -100; x < 100; x += 4) {
+    for (int y = -100; y < 100; y += 4) {
+      EXPECT_EQ(skia_conversions::ToPoint(SkPoint::Make(x * 0.25f, y * 0.25f)),
+                Point(x * 0.25f, y * 0.25f));
+    }
+  }
+}
+
+TEST(SkiaConversionsTest, SkPointToSize) {
+  for (int x = -100; x < 100; x += 4) {
+    for (int y = -100; y < 100; y += 4) {
+      EXPECT_EQ(skia_conversions::ToSize(SkPoint::Make(x * 0.25f, y * 0.25f)),
+                Size(x * 0.25f, y * 0.25f));
+    }
+  }
+}
+
+TEST(SkiaConversionsTest, ToColor) {
+  // Create a color with alpha, red, green, and blue values that are all
+  // trivially divisible by 255 so that we can test the conversion results in
+  // correct scalar values.
+  //                                                AARRGGBB
+  const flutter::DlColor color = flutter::DlColor(0x8040C020);
+  auto converted_color = skia_conversions::ToColor(color);
+
+  ASSERT_TRUE(ScalarNearlyEqual(converted_color.alpha, 0x80 * (1.0f / 255)));
+  ASSERT_TRUE(ScalarNearlyEqual(converted_color.red, 0x40 * (1.0f / 255)));
+  ASSERT_TRUE(ScalarNearlyEqual(converted_color.green, 0xC0 * (1.0f / 255)));
+  ASSERT_TRUE(ScalarNearlyEqual(converted_color.blue, 0x20 * (1.0f / 255)));
+}
+
+TEST(SkiaConversionsTest, GradientStopConversion) {
+  // Typical gradient.
+  std::vector<flutter::DlColor> colors = {flutter::DlColor::kBlue(),
+                                          flutter::DlColor::kRed(),
+                                          flutter::DlColor::kGreen()};
+  std::vector<float> stops = {0.0, 0.5, 1.0};
+  const auto gradient =
+      flutter::DlColorSource::MakeLinear(SkPoint::Make(0, 0),          //
+                                         SkPoint::Make(1.0, 1.0),      //
+                                         3,                            //
+                                         colors.data(),                //
+                                         stops.data(),                 //
+                                         flutter::DlTileMode::kClamp,  //
+                                         nullptr                       //
+      );
+
+  std::vector<Color> converted_colors;
+  std::vector<Scalar> converted_stops;
+  skia_conversions::ConvertStops(gradient.get(), converted_colors,
+                                 converted_stops);
+
+  ASSERT_TRUE(ScalarNearlyEqual(converted_stops[0], 0.0f));
+  ASSERT_TRUE(ScalarNearlyEqual(converted_stops[1], 0.5f));
+  ASSERT_TRUE(ScalarNearlyEqual(converted_stops[2], 1.0f));
+}
+
+TEST(SkiaConversionsTest, GradientMissing0) {
+  std::vector<flutter::DlColor> colors = {flutter::DlColor::kBlue(),
+                                          flutter::DlColor::kRed()};
+  std::vector<float> stops = {0.5, 1.0};
+  const auto gradient =
+      flutter::DlColorSource::MakeLinear(SkPoint::Make(0, 0),          //
+                                         SkPoint::Make(1.0, 1.0),      //
+                                         2,                            //
+                                         colors.data(),                //
+                                         stops.data(),                 //
+                                         flutter::DlTileMode::kClamp,  //
+                                         nullptr                       //
+      );
+
+  std::vector<Color> converted_colors;
+  std::vector<Scalar> converted_stops;
+  skia_conversions::ConvertStops(gradient.get(), converted_colors,
+                                 converted_stops);
+
+  // First color is inserted as blue.
+  ASSERT_TRUE(ScalarNearlyEqual(converted_colors[0].blue, 1.0f));
+  ASSERT_TRUE(ScalarNearlyEqual(converted_stops[0], 0.0f));
+  ASSERT_TRUE(ScalarNearlyEqual(converted_stops[1], 0.5f));
+  ASSERT_TRUE(ScalarNearlyEqual(converted_stops[2], 1.0f));
+}
+
+TEST(SkiaConversionsTest, GradientMissingLastValue) {
+  std::vector<flutter::DlColor> colors = {flutter::DlColor::kBlue(),
+                                          flutter::DlColor::kRed()};
+  std::vector<float> stops = {0.0, .5};
+  const auto gradient =
+      flutter::DlColorSource::MakeLinear(SkPoint::Make(0, 0),          //
+                                         SkPoint::Make(1.0, 1.0),      //
+                                         2,                            //
+                                         colors.data(),                //
+                                         stops.data(),                 //
+                                         flutter::DlTileMode::kClamp,  //
+                                         nullptr                       //
+      );
+
+  std::vector<Color> converted_colors;
+  std::vector<Scalar> converted_stops;
+  skia_conversions::ConvertStops(gradient.get(), converted_colors,
+                                 converted_stops);
+
+  // Last color is inserted as red.
+  ASSERT_TRUE(ScalarNearlyEqual(converted_colors[2].red, 1.0f));
+  ASSERT_TRUE(ScalarNearlyEqual(converted_stops[0], 0.0f));
+  ASSERT_TRUE(ScalarNearlyEqual(converted_stops[1], 0.5f));
+  ASSERT_TRUE(ScalarNearlyEqual(converted_stops[2], 1.0f));
+}
+
+TEST(SkiaConversionsTest, GradientStopGreaterThan1) {
+  std::vector<flutter::DlColor> colors = {flutter::DlColor::kBlue(),
+                                          flutter::DlColor::kGreen(),
+                                          flutter::DlColor::kRed()};
+  std::vector<float> stops = {0.0, 100, 1.0};
+  const auto gradient =
+      flutter::DlColorSource::MakeLinear(SkPoint::Make(0, 0),          //
+                                         SkPoint::Make(1.0, 1.0),      //
+                                         3,                            //
+                                         colors.data(),                //
+                                         stops.data(),                 //
+                                         flutter::DlTileMode::kClamp,  //
+                                         nullptr                       //
+      );
+
+  std::vector<Color> converted_colors;
+  std::vector<Scalar> converted_stops;
+  skia_conversions::ConvertStops(gradient.get(), converted_colors,
+                                 converted_stops);
+
+  // Value is clamped to 1.0
+  ASSERT_TRUE(ScalarNearlyEqual(converted_stops[0], 0.0f));
+  ASSERT_TRUE(ScalarNearlyEqual(converted_stops[1], 1.0f));
+  ASSERT_TRUE(ScalarNearlyEqual(converted_stops[2], 1.0f));
+}
+
+TEST(SkiaConversionsTest, GradientConversionNonMonotonic) {
+  std::vector<flutter::DlColor> colors = {
+      flutter::DlColor::kBlue(), flutter::DlColor::kGreen(),
+      flutter::DlColor::kGreen(), flutter::DlColor::kRed()};
+  std::vector<float> stops = {0.0, 0.5, 0.4, 1.0};
+  const auto gradient =
+      flutter::DlColorSource::MakeLinear(SkPoint::Make(0, 0),          //
+                                         SkPoint::Make(1.0, 1.0),      //
+                                         4,                            //
+                                         colors.data(),                //
+                                         stops.data(),                 //
+                                         flutter::DlTileMode::kClamp,  //
+                                         nullptr                       //
+      );
+
+  std::vector<Color> converted_colors;
+  std::vector<Scalar> converted_stops;
+  skia_conversions::ConvertStops(gradient.get(), converted_colors,
+                                 converted_stops);
+
+  // Value is clamped to 0.5
+  ASSERT_TRUE(ScalarNearlyEqual(converted_stops[0], 0.0f));
+  ASSERT_TRUE(ScalarNearlyEqual(converted_stops[1], 0.5f));
+  ASSERT_TRUE(ScalarNearlyEqual(converted_stops[2], 0.5f));
+  ASSERT_TRUE(ScalarNearlyEqual(converted_stops[3], 1.0f));
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/docs/android.md b/impeller/docs/android.md
new file mode 100644
index 0000000000000000000000000000000000000000..4da9e0a672fc00b5d42b8df156ca18e68ee10663
--- /dev/null
+++ b/impeller/docs/android.md
@@ -0,0 +1,88 @@
+# Android
+
+## Rendering Backend Selection
+
+Impeller supports both Vulkan and Open GL ES rendering on Android. Impeller will prefer rendering with Vulkan and fallback to OpenGL ES 2.0 for compatibility. With both the Vulkan and OpenGL ES, Impeller supports rendering on [all existing Android versions supported by Flutter](https://docs.flutter.dev/reference/supported-platforms).
+
+The rough logic for backend selection on Android is depicted below.
+
+```mermaid
+flowchart TD
+    start[Start]
+    android_api{Check Android API}
+    device_support{Device Supports Vulkan}
+    vulkan_version{Vulkan Version Check}
+    vulkan_exts{Vulkan Supports Extensions}
+    vulkan[Use Vulkan Backend]
+    opengl[Use OpenGL Backend]
+    
+    start-->device_support
+    
+    device_support-->|Yes|android_api
+    device_support-->|No|opengl
+    
+    android_api-->|>= Android 29|vulkan_version
+    android_api-->|< Android 29|opengl
+
+    vulkan_version-->|>= Vulkan 1.1|vulkan_exts
+    vulkan_version-->|< Vulkan 1.1|opengl
+
+    vulkan_exts-->|Supports Extensions|vulkan
+    vulkan_exts-->|Doesn't Support Extensions|opengl
+```
+
+### Vulkan Version
+
+For Vulkan, Impeller needs at least Vulkan version 1.1. As of January 06, 2023, this includes 77% of all Android devices per the [Android Distribution dashboard](https://developer.android.com/about/dashboards#Vulkan).
+
+```mermaid
+pie title Vulkan version
+	"No Vulkan Support" : 15
+	"Vulkan 1.0.3" : 8
+	"Vulkan 1.1" : 77
+```
+
+Impeller could theoretically support older version of Vulkan but at a significant cost of implementation and for ultimately diminishing returns on investment. The team would rather spend that time improving the OpenGL ES backend.
+
+Besides older devices still in use, devices you can buy new that don't support Vulkan are configurations with 64-bit kernels and 32-bit user-spaces (`armv7l`) or other RAM constrained devices.
+
+### Android Version
+
+For Vulkan support, Impeller needs at least Android 10, API level 29 (Q, Quince Tart). Cumulative usage of Android 10 as of August 21, 2023 is 78.5% per [apilevels.com](https://apilevels.com/).
+
+```mermaid
+pie title Vulkan version
+	"Android 10 or higher" : 78.5
+	"Android 9 and lower" : 21.5
+```
+
+Android 9 and older will unconditionally use OpenGL.
+
+Android 10, API level 29 provides necessary support to work with [`HardwareBuffer`](https://developer.android.com/reference/android/hardware/HardwareBuffer)s  efficiently. This is critical to support platform views.
+
+### Vulkan Extensions
+
+Besides the Vulkan and Android versions. On Android, Impeller needs some extensions for interoperability with the underlying platform to support features like platform views and external texture composition. The expectation is that very Android devices will be filtered out in this check because support for extensions like `VK_ANDROID_external_memory_android_hardware_buffer` [is almost universal on devices with Android 10](https://vulkan.gpuinfo.org/listextensions.php?platform=android) and above.
+
+## Platform Views
+
+Android Platform Views (i.e. an android.view.View embedded inside a Flutter app)
+are supported in both GLES and Vulkan backends and the Engine manages this
+automatically.
+
+## SurfaceTexture
+
+Flutter's Java API allows for developers to register custom SurfaceTexture
+backed textures that can be rendered inside of a Flutter application. See
+`TextureRegistry.registerSurfaceTexture` and `TextureRegistry.createSurfaceTexture`.
+
+### GLES
+
+There are no issues with SurfaceTextures when using the GLES backend.
+
+### Vulkan
+
+We do not currently support rendering these textures when using the Vulkan
+backend. Supporting this will require adding support for importing GL textures
+into Vulkan textures which will have performance implications.
+
diff --git a/impeller/docs/android_cpu_profile.md b/impeller/docs/android_cpu_profile.md
new file mode 100644
index 0000000000000000000000000000000000000000..05f8bfe02a1d82cd1ac358c2bc2c8a75ae31341c
--- /dev/null
+++ b/impeller/docs/android_cpu_profile.md
@@ -0,0 +1,52 @@
+# Android CPU Profiling
+
+Android devices have different performance characteristics than iOS devices, CPU traces frequently reveal surprising performance issues, such as https://github.com/flutter/engine/pull/48303 . This document describes the steps to capture an equivalent [flame graph](https://cacm.acm.org/magazines/2016/6/202665-the-flame-graph/abstract) on your local Android device.
+
+1. Build Local Engine with Symbols
+
+Add the `--no-stripped` flag to the gn config when building the android engine.
+
+Example config:
+
+ `gn --no-lto --no-goma --runtime-mode=profile --android --android-cpu=arm64 --no-stripped`
+
+2. Configure Gradle to not remove strip sources
+
+In the flutter project file `android/app/build.gradle` , add the following line under the `android` block:
+
+```
+    packagingOptions{
+        doNotStrip "**/*.so"
+    }
+```
+
+3. `flutter run` the app with the local engine flags (`--local-engine`,  `--local-engine-host`,  `--local-engine-src-path`).
+4. Open Android Studio.
+
+You can create a new blank project if you don't have one already. You do not need to open the application project nor do you need to run the App through Android Studio. In fact, it's much easier if you do not do those things.
+
+5. Open the Profiler Tab
+
+Note: this may be in a different location depending on the exact version of Android Studio that you have installed.
+
+![Alt text](assets/android_profiling/image.png)
+
+6. Start a New Session.
+
+Click the plus button to start a new session, then look for the attached devices, then finally the name of the application to profile. It usually takes a few seconds for the drop downs to populate. The IDE will warn about the build not being a release build, but this doesn't impact the C++ engine so ignore it.
+
+![Alt text](assets/android_profiling/dropdown.png)
+
+7. Take a CPU Profile
+
+Click on the CPU section of the chart highlighted below. This will open a side panel that allows you to select the type of profile. Choose "Callstack Sample Recording" and then hit "Record" to start the profile and "Stop" to end the profile
+
+![Alt text](assets/android_profiling/where_do_i_click.png)
+
+8. Analyze Raster performance
+
+Samples will be collected from all threads, but for analyzing the engine performance we really only care about the raster thread. Note that if you are benchmarking an application that uses platform views, _and_ that platform view uses Hybrid Composition, then the raster thread will be merged with the platform thread.
+
+Select the raster thread by clicking on that area and then choose flame graph (or any of the other options). The flame graph can be navigated using `WASD` and the chart area expanded to make inspection easier.
+
+![Alt text](assets/android_profiling/so_many_options.png)
diff --git a/impeller/docs/android_validation_layers.md b/impeller/docs/android_validation_layers.md
index df0125c4224acc51c37e2d02f3460f48585c4902..ae32076c686d80917e509ec7bd65c6a465191fc4 100644
--- a/impeller/docs/android_validation_layers.md
+++ b/impeller/docs/android_validation_layers.md
@@ -1,23 +1,26 @@
 # Android Vulkan Validation Layers
 
-This is a quick guide to get Vulkan validation layers support for a Flutter application. This guide assumes that you've created the application with `flutter create`, otherwise the locations might vary.
+If you want to run Vulkan Validation Layers with a custom engine build you need
+to add the `--enable-vulkan-validation-layers` to the `gn` invocation to make
+sure the layers are built and injected into the Flutter jar.
 
-1. Download the validation layers from this [GitHub](https://github.com/KhronosGroup/Vulkan-ValidationLayers/releases) releases. Typically named `android-binaries-1.3.231.1.zip`.
-2. When you unzip the file, you will see: `arm64-v8a  armeabi-v7a  x86  x86_64`
-3. Copy these directories to `${FLUTTER_APP}/android/app/src/main/vklibs`. The layout should look similar to:
+Example:
 
-```
-src/main/vklibs/
-  arm64-v8a/
-    libVkLayer_khronos_validation.so
-  armeabi-v7a/
-    libVkLayer_khronos_validation.so
-  x86/
-    libVkLayer_khronos_validation.so
-  x86-64/
-    libVkLayer_khronos_validation.so
+```sh
+flutter/tools/gn \
+  --runtime-mode=debug \
+  --enable-vulkan-validation-layers \
+  --no-lto \
+  --unoptimized \
+  --android \
+  --android-cpu=arm64
 ```
 
-4. Add the following line to `${FLUTTER_APP}/android/app/build.gradle`, `android > sourceSets` section: `main.jniLibs.srcDirs += 'src/main/vklibs'`.
+Then adding the following field to the
+`android/app/src/main/AndroidManifest.xml` will turn them on:
 
-5. This should enable Vulkan validation layers on your Android application.
+```xml
+<meta-data
+    android:name="io.flutter.embedding.android.EnableVulkanValidation"
+    android:value="true" />
+```
diff --git a/impeller/docs/assets/android_profiling/dropdown.png b/impeller/docs/assets/android_profiling/dropdown.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9e7317f0a15c9b573b970bc197244f2955e0116
Binary files /dev/null and b/impeller/docs/assets/android_profiling/dropdown.png differ
diff --git a/impeller/docs/assets/android_profiling/image.png b/impeller/docs/assets/android_profiling/image.png
new file mode 100644
index 0000000000000000000000000000000000000000..1fa2e76e6dc261b80da4a58057b70cffe4e5fdb8
Binary files /dev/null and b/impeller/docs/assets/android_profiling/image.png differ
diff --git a/impeller/docs/assets/android_profiling/so_many_options.png b/impeller/docs/assets/android_profiling/so_many_options.png
new file mode 100644
index 0000000000000000000000000000000000000000..5213fcc0223e6fc41b32f0b5c80f3f59b9ae809d
Binary files /dev/null and b/impeller/docs/assets/android_profiling/so_many_options.png differ
diff --git a/impeller/docs/assets/android_profiling/where_do_i_click.png b/impeller/docs/assets/android_profiling/where_do_i_click.png
new file mode 100644
index 0000000000000000000000000000000000000000..36453aae584ebced8f98af47fefd8db342b1c8eb
Binary files /dev/null and b/impeller/docs/assets/android_profiling/where_do_i_click.png differ
diff --git a/impeller/docs/assets/ios_profiling/deep_copy.png b/impeller/docs/assets/ios_profiling/deep_copy.png
new file mode 100644
index 0000000000000000000000000000000000000000..031eaaacb050fec049adf81fd5a5b50bfdcd4f78
Binary files /dev/null and b/impeller/docs/assets/ios_profiling/deep_copy.png differ
diff --git a/impeller/docs/assets/ios_profiling/flamegraph.png b/impeller/docs/assets/ios_profiling/flamegraph.png
new file mode 100644
index 0000000000000000000000000000000000000000..83cbd65bd7ab4feb3055c5edf82b3f6ca2969baa
Binary files /dev/null and b/impeller/docs/assets/ios_profiling/flamegraph.png differ
diff --git a/impeller/docs/assets/ios_profiling/ios_profiler_select_thread.png b/impeller/docs/assets/ios_profiling/ios_profiler_select_thread.png
new file mode 100644
index 0000000000000000000000000000000000000000..87b6bd0adf750b8c094940882e6c193d46c6cd78
Binary files /dev/null and b/impeller/docs/assets/ios_profiling/ios_profiler_select_thread.png differ
diff --git a/impeller/docs/assets/ios_profiling/ios_time_profiler_example.png b/impeller/docs/assets/ios_profiling/ios_time_profiler_example.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac2db89a885e9e755d586b61901ff09a7e4f17df
Binary files /dev/null and b/impeller/docs/assets/ios_profiling/ios_time_profiler_example.png differ
diff --git a/impeller/docs/assets/metal_validation/performance_hud.png b/impeller/docs/assets/metal_validation/performance_hud.png
new file mode 100644
index 0000000000000000000000000000000000000000..6009c6d022f422a54d7607ac262c3bd5fc142a7f
Binary files /dev/null and b/impeller/docs/assets/metal_validation/performance_hud.png differ
diff --git a/impeller/docs/assets/read_frame_captures/invalid_uuid.png b/impeller/docs/assets/read_frame_captures/invalid_uuid.png
new file mode 100644
index 0000000000000000000000000000000000000000..0bdff413f91dff5d7a9ddb7628d6028bb657cee1
Binary files /dev/null and b/impeller/docs/assets/read_frame_captures/invalid_uuid.png differ
diff --git a/impeller/docs/assets/read_frame_captures/no_sources.png b/impeller/docs/assets/read_frame_captures/no_sources.png
new file mode 100644
index 0000000000000000000000000000000000000000..66280a50af6ade77561822cba5044aa32249081d
Binary files /dev/null and b/impeller/docs/assets/read_frame_captures/no_sources.png differ
diff --git a/impeller/docs/assets/launch-app.png b/impeller/docs/assets/renderdoc_frame_capture/launch-app.png
similarity index 100%
rename from impeller/docs/assets/launch-app.png
rename to impeller/docs/assets/renderdoc_frame_capture/launch-app.png
diff --git a/impeller/docs/assets/render-doc-capture.png b/impeller/docs/assets/renderdoc_frame_capture/render-doc-capture.png
similarity index 100%
rename from impeller/docs/assets/render-doc-capture.png
rename to impeller/docs/assets/renderdoc_frame_capture/render-doc-capture.png
diff --git a/impeller/docs/benchmarks.md b/impeller/docs/benchmarks.md
new file mode 100644
index 0000000000000000000000000000000000000000..f2a5b5f7006785eb5f72de2a865bda4f28a1742a
--- /dev/null
+++ b/impeller/docs/benchmarks.md
@@ -0,0 +1,40 @@
+# Impeller Benchmarks
+
+Here are some noteworthy benchmarks related to Impeller performance:
+
+- **New Gallery** - Runs through the Flutter Gallery with a driver test.
+  - Pixel 7 Pro
+    - Vulkan: [dashboard](https://flutter-flutter-perf.skia.org/e/?keys=X3f83005df6350b72d23479764c787b2d)
+    - OpenGLES: [dashboard](https://flutter-flutter-perf.skia.org/e/?keys=X080f13e1d6607d5ad3f4fe5c67e61538)
+    - Skia vs Vulkan Impeller - frame raster time stats: [dashboard](https://flutter-flutter-perf.skia.org/e/?queries=device_type%3DPixel_7_Pro%26sub_result%3D90th_percentile_frame_rasterizer_time_millis%26sub_result%3D99th_percentile_frame_rasterizer_time_millis%26sub_result%3Daverage_frame_rasterizer_time_millis%26sub_result%3Dworst_frame_rasterizer_time_millis%26test%3Dnew_gallery__transition_perf%26test%3Dnew_gallery_impeller__transition_perf)
+    - Vulkan vs OpenGLES - average rasterizer time: [dashboard](https://flutter-flutter-perf.skia.org/e/?queries=device_type%3DPixel_7_Pro%26sub_result%3Daverage_frame_rasterizer_time_millis%26test%3Dnew_gallery_impeller__transition_perf%26test%3Dnew_gallery_opengles_impeller__transition_perf)
+  - Samsung S10
+    - Vulkan: [dashboard](https://flutter-flutter-perf.skia.org/e/?keys=X777844777514c7b34e736eadbc5dd002)
+    - Skia vs Vulkan Impeller - 90th percentile frame rasterizer time: [dashboard](https://flutter-flutter-perf.skia.org/e/?begin=1707934850&end=1708021250&queries=device_type%3DSM-A025V%26sub_result%3D90th_percentile_frame_rasterizer_time_millis%26test%3Dnew_gallery__transition_perf%26test%3Dnew_gallery_impeller__transition_perf)
+  - Moto G4 (OpenGLES): [dashboard](https://flutter-flutter-perf.skia.org/e/?keys=Xaeae5aa39c9028be43e8a9ad40540bd8)
+  - iPhone 11
+    - Metal: [dashboard](https://flutter-flutter-perf.skia.org/e/?keys=X9d52e54d0ac32151cc10feca61ea34cc)
+    - Skia vs Metal Impeller - 90th percentile frame rasterizer time: [dashboard](https://flutter-flutter-perf.skia.org/e/?keys=X836c18b955eb83a9102a4391672f37e0)
+
+- **Animated Blur Backdrop Filter** - A driver test that scrolls to a screen and
+  animates a Blur Backdrop filter to get progressively blurrier.  This covers a
+  gap in the "New Gallery" tests we've seen in places like Wonderous.
+  - Pixel 7 Pro
+    - Vulkan: [dashboard](https://flutter-flutter-perf.skia.org/e/?keys=X6d3dd43039c95ec80a8b3914cf386f48)
+    - OpenGLES: [dashboard](https://flutter-flutter-perf.skia.org/e/?keys=X48625544c02c75d050c4440405025d80)
+    - Vulkan vs OpenGLES - Average rasterizer time: [dashboard](https://flutter-flutter-perf.skia.org/e/?queries=device_type%3DPixel_7_Pro%26sub_result%3Daverage_frame_rasterizer_time_millis%26test%3Danimated_blur_backdrop_filter_perf__timeline_summary%26test%3Danimated_blur_backdrop_filter_perf_opengles__timeline_summary)
+  - Moto G4 (OpenGLES): [dashboard](https://flutter-flutter-perf.skia.org/e/?keys=X78023772ea9e94c81f37456a7fa7bf46)
+  - iPhone 11 (Metal): [dashboard](https://flutter-flutter-perf.skia.org/e/?keys=X2f7504aba3db6aeff08cc896081ace55)
+
+- **Animated Advanced Blend** - A driver test like the Animated Blur test, but
+  is displaying a handful of advanced blurs since it represents a specific case
+  exercised in Wonderous.
+  - Pixel 7 Pro
+    - Vulkan: [dashboard](https://flutter-flutter-perf.skia.org/e/?keys=Xe742e40d9f7510cf6c8ddbf9eee9d51b)
+    - OpenGLES: [dashboard](https://flutter-flutter-perf.skia.org/e/?keys=X78baa100c6cadec3171d42063cc857bf)
+    - Vulkan vs OpenGLES - Average rasterizer time: [dashboard](https://flutter-flutter-perf.skia.org/e/?queries=device_type%3DPixel_7_Pro%26sub_result%3Daverage_frame_rasterizer_time_millis%26test%3Danimated_advanced_blend_perf__timeline_summary%26test%3Danimated_advanced_blend_perf_opengles__timeline_summary)
+  - iPhone 11 (Metal): [dashboard](https://flutter-flutter-perf.skia.org/e/?keys=X65477f5b5026c0d5ee8fee79122427ab)
+
+- **Backdrop Filter Perf** - A driver test that isolates better the performance
+  of blurs.
+  - iPhone 11 (Metal) - Average rasterizer time: [dashboard](https://flutter-flutter-perf.skia.org/e/?queries=sub_result%3Daverage_frame_rasterizer_time_millis%26test%3Dbackdrop_filter_perf_ios__timeline_summary&xbaroffset=38815)
diff --git a/impeller/docs/coordinate_system.md b/impeller/docs/coordinate_system.md
index 9010610f3c90ee92d209dc440f5c7f6ae7c731f3..7da7af20c0575c92e1ca92bcd2a02bf124fd7f34 100644
--- a/impeller/docs/coordinate_system.md
+++ b/impeller/docs/coordinate_system.md
@@ -1,4 +1,4 @@
-# Impellers Coordinate System
+# Impeller's Coordinate System
 
 **TL;DR, Impeller uses the Metal coordinate system.**
 
diff --git a/impeller/docs/faq.md b/impeller/docs/faq.md
index 74efb2b83a03422156e46dbaeb1fce42fbdc059f..473479c02add5f4afd9f64d359f225a4ded01e62 100644
--- a/impeller/docs/faq.md
+++ b/impeller/docs/faq.md
@@ -1,15 +1,53 @@
 # Frequently Asked Questions
 
-* How do you run `impeller_unittests` with Playgrounds enabled?
-  * Playgrounds in the `impeller_unittests` harness can be enabled in one of
-    three ways:
-    * Edit `gn args` directly and add `impeller_enable_playground = true`.
-    * Add the `--enable-impeller-playground` flag to your `./flutter/tools/gn`
-      invocation.
-    * Set the `FLUTTER_IMPELLER_ENABLE_PLAYGROUND` to `1` before invoking
-      `./flutter/tools/gn`. Only do this if you frequently work with Playgrounds
-      and don't want to have to set the flags manually. Also, it would be a bad
-      idea to set this environment variable on CI.
+* How do I enable Impeller to try it out myself?
+  * See the instructions in the README on how to [try Impeller in
+    Flutter](https://github.com/flutter/engine/tree/main/impeller#try-impeller-in-flutter).
+  * Support on some platforms is further along than on others. The current
+    priority for the team is to support iOS, Android, Desktops, and Embedder API
+    users (in that rough order).
+* I am running into issues when Impeller is enabled, how do I report them?
+  * Like any other Flutter issue, you can report them on the [GitHub issue
+    tracker](https://github.com/flutter/flutter/issues/new/choose).
+  * Please explicitly mention that this is an Impeller specific regression. You
+    can quickly swap between the Impeller and Skia backends using the command
+    line flag flag detailed in [section in the README on how to try
+    Impeller](https://github.com/flutter/engine/tree/main/impeller#try-impeller-in-flutter).
+  * Reduced test cases are the most useful.
+  * Please also report any performance regressions.
+* What does it mean for an Impeller platform to be "in preview". How long will
+  be the preview last?
+  * The team is focused on getting one platform right at a time. This includes
+    ensuring all fidelity issues are fixed, performance issues addressed, and
+    compatibility with plugins guaranteed.
+  * When the team believes that the majority of Flutter applications will
+    benefit from Impeller on a specific platform, the backend will be declared
+    to be in preview.
+  * During the preview, Flutter developers will need to opt in to using
+    Impeller.
+  * The top priority of the team will be to address issues reported by
+    developers opting into the preview. The team wants the preview phase for a
+    platform to be as short as possible.
+  * Once major issues reported by platforms in preview become manageable, the
+    preview ends and Impeller becomes the default rendering backend.
+  * Besides working on fixing issues reported on platforms in preview, and
+    working on supporting additional platforms, the team is also undertaking a
+    high-touch exercise of migrating large existing Flutter applications to use
+    Impeller. The team will find and fix any issues it encounters during this
+    exercise.
+  * The length of the preview will depend on the number and nature of the issues
+    filed by developers and discovered by the team.
+  * Even once the preview ends, the developer can opt into the legacy rendering
+    backend for a short period of time. The legacy backend will be removed after
+    this period.
+* What can I expect when I opt in to using Impeller?
+  * A high level overview of the status of project is [present on the
+    wiki](https://github.com/flutter/flutter/wiki/Impeller#status).
+  * All Impeller related work items are tracked on a [project specific dashboard
+    on GitHub](https://github.com/orgs/flutter/projects/21).
+  * The team tracks known platform specific issues in their own milestones:
+    * [iOS](https://github.com/flutter/flutter/milestone/77)
+    * [Android](https://github.com/flutter/flutter/milestone/76)
 * Does Impeller use Skia for rendering?
   * No. Impeller has no direct dependencies on Skia.
   * When running with Impeller, Flutter does not create a Skia graphics context.
@@ -19,7 +57,7 @@
   * Similarly, Impeller does not perform image decompression. Flutter uses a
     standard set of codecs wrapped by Skia before querying the system supplied
     image formats.
-  * So, while Impeller does not use nor is it a wrapper for Skia, some Skia
+  * So, while Impeller does not use nor is a wrapper for Skia, some Skia
     components are still used by Flutter when rendering using Impeller.
 * Is Impeller going to be supported on the Web?
   * The current priority for Impeller is to be amazing on all platforms targeted
@@ -45,8 +83,9 @@
     priority at this time for the small team working on Impeller.
   * We are aware that these priorities might change in the future. There have
     been sanity checks to ensure that the Impeller API can be ported to WASM and
-    also that Impeller shaders can be [compiled to WGSL](https://github.com/chinmaygarde/wgsl_sandbox)
-    for eventual WebGPU support.
+    also that Impeller shaders can be [compiled to
+    WGSL](https://github.com/chinmaygarde/wgsl_sandbox) for eventual WebGPU
+    support.
 * How will Impeller affect the way in which Flutter applications are created and
   packaged?
   * It won't.
@@ -59,6 +98,5 @@
     includes all precompiled shaders.
   * Impeller is compiled into the Flutter engine. It is currently behind a flag
     as development progresses.
-* How do I enable Impeller to try it out myself?
-  * See the instructions in the README on how to [try Impeller in
-    Flutter](https://github.com/flutter/engine/tree/main/impeller#try-impeller-in-flutter).
+* How do you run `impeller_unittests` with Playgrounds enabled?
+  * Specify the `--enable_playground` command-line option.
diff --git a/impeller/docs/ios_cpu_profile.md b/impeller/docs/ios_cpu_profile.md
new file mode 100644
index 0000000000000000000000000000000000000000..96a30dea1624b0dd26f00d5843377d907b10aee8
--- /dev/null
+++ b/impeller/docs/ios_cpu_profile.md
@@ -0,0 +1,25 @@
+# iOS CPU Profiling
+
+XCode has a number of built in profiling tools that can easily be used with local or prebuilt engines. This document is focused on creating flame graph charts, which is not a part of XCode but provides a useful way to look at aggregate performance. Compared to the Android Studio flame graph this one is a little wonky, but still useful.
+
+
+1. Clone the "FlameGraph" swift package from `https://github.com/lennet/FlameGraph`
+2. Start a "Time Profiler" based profile session.
+
+![Alt text](assets/ios_profiling/ios_time_profiler_example.png)
+
+  Click the red dot to begin and record as much profile data as you want, then press stop to conclude the trace.
+
+3. Select the thread to investigate, in this case you want io.flutter.raster. IMPORTANT: also select the trace root.
+
+![Alt text](assets/ios_profiling/ios_profiler_select_thread.png)
+
+4. Copy the trace with the keyboard shortcut (⇧⌘C) or the menu ("Edit" -> "Deep Copy").
+
+![Alt text](assets/ios_profiling/deep_copy.png)
+
+5. On the command line, run `swift run FlameGraph --html output.html`
+
+A new browser tab will open with the flame graph. It may require some zooming to be useful.
+
+![Alt text](assets/ios_profiling/flamegraph.png)
\ No newline at end of file
diff --git a/impeller/docs/metal_validation.md b/impeller/docs/metal_validation.md
index a471155ee961e7976ae0c4864665b255a7c47df7..c322a3240e88ac73bc24b05d0b34073880075c32 100644
--- a/impeller/docs/metal_validation.md
+++ b/impeller/docs/metal_validation.md
@@ -1,23 +1,41 @@
 # Enable Metal Validation without Xcode.
 
-To enable validation of all Metal calls without using Xcode, add the following
-to your rc file.
+Metal validation can be enabled for command-line application using environment
+variables.
 
-These flags are not documented and have been reverse engineered from observing
-what Xcode does to enable these validation layers.
+Apple [documents these environment variables on their developer site](https://developer.apple.com/documentation/xcode/validating-your-apps-metal-api-usage#Enable-API-Validation-with-environment-variables).
+More documentation about these environment variables is also available via a man
+page entry: `man MetalValidation`
 
+To enable all relevant Metal API and shader validation without using Xcode, add
+the following to your `.rc` file.
 
+``` sh
+# Metal Validation Defaults
+export MTL_DEBUG_LAYER=1
+export MTL_DEBUG_LAYER_ERROR_MODE=assert
+# Set this to assert for stricter runtime checks. Set to "ignore" if too chatty.
+export MTL_DEBUG_LAYER_WARNING_MODE=nslog
+export MTL_SHADER_VALIDATION=1
 ```
-# Metal Tracing Defaults
-export DYLD_INSERT_LIBRARIES="/usr/lib/libMTLCapture.dylib:/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/Library/GPUToolsPlatform/libMTLToolsDiagnostics.dylib"
-export METAL_DEBUG_ERROR_MODE=0
-export METAL_DEVICE_FORCE_COMMAND_BUFFER_ENHANCED_ERRORS=1
-export METAL_DEVICE_WRAPPER_TYPE=5
-export METAL_DIAGNOSTICS_ENABLED=1
-export METAL_LOAD_INTERPOSER=1
-export MTL_FORCE_COMMAND_BUFFER_ENHANCED_ERRORS=1
-export DYMTL_TOOLS_DYLIB_PATH="/usr/lib/libMTLCapture.dylib"
-```
 
+These environment variable are good defaults but there are more validation
+related knobs and dials to turn. See `man MetalValidation`.
+
+# Enable Metal Profiling HUD without Xcode
+
+Applications can optionally display a HUD that displays real-time information
+about Metal related performance.
+
+![Profiling HUD](assets/metal_validation/performance_hud.png)
 
-These flags have been validated to work on macOS Monterey (12.0.1)
+More documentation about the specific elements of the HUD is present on the
+[Apple developer site](https://developer.apple.com/documentation/xcode/monitoring-your-metal-apps-graphics-performance).
+
+The Profiling HUD is separate from Metal Validation and can be enabled for apps
+that are launched from the command like (like Impeller Playgrounds) using
+environment variables. Add the following to your `.rc` file.
+
+```sh
+export MTL_HUD_ENABLED=1
+```
diff --git a/impeller/docs/read_frame_captures.md b/impeller/docs/read_frame_captures.md
index 020796b1063a1858eb46a231e87772ff2c48d82c..97ed1e5cda54f49c8ae0194a648d4b8ef0e2beda 100644
--- a/impeller/docs/read_frame_captures.md
+++ b/impeller/docs/read_frame_captures.md
@@ -211,7 +211,7 @@ function pipeline configuration.
 
 ![alt_text](assets/read_frame_captures/image7.png "image_tooltip")
 
-You will get intimately familiar with this view when you setup a new pipeline
+You will get intimately familiar with this view when you set up a new pipeline
 state object in Impeller or try to reason about the correctness of one of the
 pipeline state object variants.
 
@@ -317,6 +317,41 @@ of the draw call (potentially thousands of times depending on the side of the
 triangle rendered). So, when you want to debug a shader, you must first find one
 specific invocation of either the vertex or fragment shader to debug.
 
+### iOS & macOS: Tell Xcode the Location of your Shaders
+
+When using the Metal backend, instead of packaging shader sources as strings,
+Impeller compiles and packages them into a single shader library. This library
+is stripped of debugging information to minimize the size overhead. This
+debugging information is not tossed away however. In the `out/<variant>/shaders`
+directory, you will find a series of files with the `.metallibsym` extension.
+
+When you try to debug a shader for the first time as described in the sections
+below, Xcode you prompt you with a dialog that says it can't find the sources
+for shader along with a button to show it where to find the relevant
+`.metallibsym` files. Click that button and a dialog will pop up showing the
+Metal libraries whose `.metallibsym` files could not be resolved.
+
+![No Sources](assets/read_frame_captures/no_sources.png)
+
+In the "External Source Search Paths" section, click the tiny `+` button at the
+bottom. In the file chooser dialog box that appears next, select all the
+`metallibsym` files in the `out/<variant>/shaders` directory.
+
+You will only have to do this once per engine variant. The search paths will
+remain the same as you rebuild the engine and the `.metallibsym` files contain
+the UUID of the shader library. So Xcode won't attempt to resolve shaders
+sources in an outdated `.metallibsym` file.
+
+You may however also run into Xcode complaining about "Invalid UUID" errors.
+This is instead of the "No Source" errors as shown in the dialog above.
+
+![Invalid UUID](assets/read_frame_captures/invalid_uuid.png)
+
+The team has been unable to to find documentation for this type of error. But
+through trial-and-error, we have determined that the way to fix this is to set
+the deployment target of the application to the current OS version during the
+instrumentation run (either on macOS or iOS). To information about this line of
+troubleshooting can be found [here](https://github.com/flutter/engine/pull/39532).
 
 ### Debugging a Fragment Shader
 
diff --git a/impeller/docs/renderdoc_frame_capture.md b/impeller/docs/renderdoc_frame_capture.md
index 5f21441515361edf8aa158029b83177eed93e99f..f5a09725d8d82c50676c0e9070c0fdd4c2362d87 100644
--- a/impeller/docs/renderdoc_frame_capture.md
+++ b/impeller/docs/renderdoc_frame_capture.md
@@ -1,27 +1,52 @@
 # Frame Capture with RenderDoc
 
-[RenderDoc](https://renderdoc.org/) is a graphics debugger that can be used to capture frames. With Impeller starting to support gles and Vulkan backends, RenderDoc can provide insights into the application's frames.
+[RenderDoc](https://renderdoc.org/) is a graphics debugger that can be used to capture frames. With Impeller starting to support OpenGL ES and Vulkan backends, RenderDoc can provide insights into the application's frames.
 
-1. First step is to setup RenderDoc. Follow the instructions [here](https://renderdoc.org/docs/getting_started/quick_start.html). For the purposes of this guide it is assumed that you are able to get RenderDoc running.
-2. The next step would be to run the application you wish the capture the frames of. Typically these would be one of the playground tests. To build these, do:
+1. First step is to set up RenderDoc. Follow the [quickstart instructions](https://renderdoc.org/docs/getting_started/quick_start.html).
+   For the purposes of this guide it is assumed that you are able to get RenderDoc running.
+   If the RenderDoc installed from your package manager crashes on startup, consider [building from source](https://github.com/baldurk/renderdoc/blob/v1.x/docs/CONTRIBUTING/Compiling.md).
+   
+2. The next step would be to run the application you wish the capture the frames of.
+   Typically these would be one of the [playground tests](https://github.com/flutter/engine/tree/main/impeller/playground),
+   for example [those in entity_unittests.cc](https://github.com/flutter/engine/blob/main/impeller/entity/entity_unittests.cc).
+   To build these, do:
 
-```bash
-# In your $ENGINE_SRC folder, do:
+   ```bash
+   # In your $ENGINE_SRC folder, do:
 
-./flutter/tools/gn --unopt --no-lto --enable-impeller-playground\
-   --enable-impeller-vulkan --target-dir host_debug_impeller_vulkan
-autoninja -C out/host_debug_impeller_vulkan/
-```
+   ./flutter/tools/gn --unopt
+   ninja -C out/host_debug_unopt/
+   ```
 
-3. Start RenderDoc, and click the "Launch Application" button.
+   Building a "debug_unopt" build ensures that you have tracing enabled. Without this, RenderDoc will not have much to show.
 
-<img src="assets/launch-app.png" height="200" />
+3. Start RenderDoc and (if necessary) select "Launch Application" button from the menu:
 
-4. Fill out the following parameters, and click launch:
-  - executable: `$ENGINE_SRC/out/host_debug_impeller_vulkan/impeller_unittests` (expand `ENGINE_SRC`).
-  - args: `--gtest_filter="*CanDrawRect/Vulkan*"`
-  - working dir: `$ENGINE_SRC` (expand `ENGINE_SRC`)
+   ![Launch App](assets/renderdoc_frame_capture/launch-app.png)
 
-5. For the frame you wish to capture, press `F12`, you will now be able to see the frame capture and inspect the state.
+   On Linux, the executable is `qrenderdoc`.
 
-<img src="assets/render-doc-capture.png" />
+   You may also need to click the message that says "Click here to set up Vulkan capture".
+   This will probably be needed if you built from source.
+
+4. Fill out the configuration fields.
+   Here, we will configure RenderDoc to specifically capture the "CanDrawRect" test:
+
+   - executable path: `$ENGINE_SRC/out/host_debug/impeller_unittests` (expand `ENGINE_SRC`).
+   - working directory: `$ENGINE_SRC` (expand `ENGINE_SRC`)
+   - command-line arguments: `--gtest_filter="*CanDrawRect/Vulkan*" --enable_playground`
+
+5. Click "Launch". If everything is working, you'll get a window with the selected unit test rendering,
+   with a prompt in the top-left corner telling you to press `F12` or `Print Screen` to capture a frame.
+   (If you do not, try capturing a different program, like factorio. On at least one occasion that has
+   shaken things loose, though we have no explanation for why.)
+
+   Press `ESC` to move on to the next test.
+
+5. For the frame you wish to capture, press `F12`, you will now be able to see the frame capture and inspect the state:
+
+   ![Renderdoc Capture](assets/renderdoc_frame_capture/render-doc-capture.png)
+
+_See also:_
+
+ * [Learning to Read GPU Frame Captures](https://github.com/flutter/engine/blob/main/impeller/docs/read_frame_captures.md)
diff --git a/impeller/docs/shader_optimization.md b/impeller/docs/shader_optimization.md
index 397d4787f3f6684330d7fbe1f8e1e1cdc0de4f2e..b557da720b137d61992aa1f0b8870d2ebbff82b3 100644
--- a/impeller/docs/shader_optimization.md
+++ b/impeller/docs/shader_optimization.md
@@ -267,7 +267,7 @@ vec4 FrobnicateColor(vec4 color) {
   vec4 result;
 
   if (color.a == 0) {
-    result vec4(0);
+    result = vec4(0);
   } else {
     result = DoExtremelyExpensiveThing(color);
   }
diff --git a/impeller/docs/specialization_constants.md b/impeller/docs/specialization_constants.md
new file mode 100644
index 0000000000000000000000000000000000000000..431f1b89028dc75345aad3dd62d2c79d8ebd33e0
--- /dev/null
+++ b/impeller/docs/specialization_constants.md
@@ -0,0 +1,94 @@
+# Specialization Constants
+
+A specialization constant is a named variable that is known to be constant at runtime but not when the shader is authored. These variables are bound to specific values when the shader is compiled on application start up and allow the backend to perform optimizations such as branch elimination and constant folding.
+
+Specialization constants have two possible benefits when used in a shader:
+
+  * Improving performance, by removing branching and conditional code.
+  * Code organization/size, by removing the number of shader source files required.
+
+These goals are related: The number of shaders can be reduce by adding runtime branching to create more generic shaders. Alternatively, branching can be reduced by adding more specialized shader variants. Specialization constants provide a happy medium where the source files can be combined with branching but done so in a way that has no runtime cost.
+
+## Example Usage
+
+Consider the case of the "decal" texture sampling mode. This is implement via clamp-to-border with
+a border color set to transparent black. While this functionality is well supported on the Metal and
+Vulkan backends, the GLES backend needs to support devices that do not have this extension. As a
+result, the following code was used to conditionally decal:
+
+```glsl
+// Decal sample if necessary.
+vec4 Sample(sampler2D sampler, vec2 coord) {
+#ifdef GLES
+  return IPSampleDecal(sampler, coord)
+#else
+  return texture(sampler, coord);
+#endif
+}
+```
+
+This works great as long as we know that the GLES backend can never do the decal sample mode. This is also "free" as the ifdef branch is evaluated in the compiler. But eventually, we added a runtime check for decal mode as we need to support this on GLES. So the code turned into (approximately) the following:
+
+```glsl
+#ifdef GLES
+uniform float supports_decal;
+#endif
+
+// Decal sample if necessary.
+vec4 Sample(sampler2D sampler, vec2 coord) {
+#ifdef GLES
+  if (supports_decal) {
+    return texture(sampler, coord);
+  }
+  return IPSampleDecal(sampler, coord)
+#else
+  return texture(sampler, coord);
+#endif
+}
+```
+
+Now we've got decal support, but we've also got new problems:
+
+* The code is actually quite messy. We have to track different uniform values depending on the backend.
+* The GLES backend is still paying some cost for branching, even though we "know" that decal is or isn't supported when the shader is compiled.
+
+### Specialization constants to the rescue
+
+Instead of using a runtime check, we can create a specialization constant that is set when compiling the
+shader. This constant will be `1` if decal is supported and `0` otherwise.
+
+```glsl
+layout(constant_id = 0) const float supports_decal = 1.0;
+
+vec4 Sample(sampler2D sampler, vec2 coord) {
+  if (supports_decal) {
+    return texture(sampler, coord);
+  }
+  return IPSampleDecal(sampler, coord)
+}
+
+```
+
+Immediately we realize a number of benefits:
+
+* Code is the same across all backends
+* Runtime branching cost is removed as the branch is compiled out.
+
+
+## Implementation
+
+Const values are floats and can be used to represent:
+
+* true/false via 0/1.
+* function selection, such as advanced blends. The specialization value maps to a specific blend function. For example, 0 maps to screen and 1 to overlay via a giant if/else macro.
+* Only fragment shaders can be specialized. This limitation could be removed with more investment.
+
+*AVOID* adding specialization constants for color values or anything more complex.
+
+Specialization constants are provided to the CreateDefault argument in content_context.cc and aren't a
+part of variants. This is intentional: specialization constants shouldn't be used to create (potentially unlimited) runtime variants of a shader.
+
+Backend specific information:
+* In the Metal backend, the specialization constants are mapped to a MTLFunctionConstantValues. See also: https://developer.apple.com/documentation/metal/using_function_specialization_to_build_pipeline_variants?language=objc
+* In the Vulkan backend, the specialization constants are mapped to VkSpecializationINfo. See also: https://blogs.igalia.com/itoral/2018/03/20/improving-shader-performance-with-vulkans-specialization-constants/
+* In the GLES backend, the SPIRV Cross compiler will generate defines named `#ifdef SPIRV_CROSS_CONSTANT_i`, where i is the index of constant. The Impeller runtime will insert `#define SPIRV_CROSS_CONSTANT_i` in the header of the shader.
\ No newline at end of file
diff --git a/impeller/docs/vulkan_threading.md b/impeller/docs/vulkan_threading.md
new file mode 100644
index 0000000000000000000000000000000000000000..053738606a010afe9e06df277138d10130d60d24
--- /dev/null
+++ b/impeller/docs/vulkan_threading.md
@@ -0,0 +1,61 @@
+# Threading in Vulkan
+
+The Vulkan backend uses a dedicated concurrent worker pool that is created along
+with the creation of the Vulkan context.
+
+Unlike other pools such as the IO worker pool, long running tasks may **not** be
+posted to this pool. This is because frame workloads can and often are
+distributed to workers in this pool. Having a potentially long running task
+(such as texture decompression) may potentially block frame critical tasks. The
+limitation of a separate pool for frame critical tasks is working around the
+separate limitation of not being able to specify a QoS to specific tasks and may
+be lifted in the future.
+
+There is also a separate component called the fence waiter which operates on its
+own thread. The purpose of the fence waiter is to ensure that the resource
+reference count lives at least as long as the GPU command buffer(s) that access
+this resource.
+
+Resource collection and pooling also happens on another thread called the
+resource manager. This is because touching the allocators is a potentially
+expensive operation and having the collection be done in a frame workload, or on
+the fence waiter thread may cause jank.
+
+With this overview, the total number of thread used by the Impeller Vulkan
+backend is the number of workers in the concurrent worker pool, and the two
+threads for the fence waiter and resource manager respectively.
+
+A summary of the interaction between the various threads is drawn below:
+
+
+```mermaid
+sequenceDiagram
+    participant rt as Render Thread
+    participant worker1 as Concurrent Worker 1
+    participant worker2 as Concurrent Worker 2
+    participant fence_waiter as Fence Waiter
+    participant resource_manager as Resource Manager
+    participant gpu as GPU
+    rt->>+worker1: Setup PSO 1
+    rt->>+worker2: Setup PSO n
+    worker1-->>-rt: Done
+    worker2-->>-rt: Done
+    Note over rt,resource_manager: Application launch
+    loop One Frame
+        activate rt
+        rt->>+worker2: Frame Workload
+        activate fence_waiter
+        rt->>fence_waiter: Resource 1 owned by GPU
+        worker2-->>-rt: Done
+        rt->>fence_waiter: Resource 2 owned by GPU
+        rt->>gpu: Submit GPU Commands
+        deactivate rt
+    end
+    activate gpu
+    gpu-->>fence_waiter: GPU Work Done
+    fence_waiter->>resource_manager: Collect/Pool Resources
+    deactivate fence_waiter
+    activate resource_manager
+    deactivate gpu
+    deactivate resource_manager
+```
diff --git a/impeller/docs/xcode_frame_capture.md b/impeller/docs/xcode_frame_capture.md
index e258f022ff6c0d2849fb34f91c380bd8ea9be325..1b7fd8c5622301d43d143affa04d61e2f4b25f11 100644
--- a/impeller/docs/xcode_frame_capture.md
+++ b/impeller/docs/xcode_frame_capture.md
@@ -89,7 +89,7 @@ that some of those diagnostics need Xcode to be able to re-compile the
 translation units in the engine. But, it doesn’t know how to do that, only
 GN/Ninja does. So some of those will be unavailable.
 
-Any Impeller test that setup up a Playground will now automatically have GPU
+Any Impeller test that sets up a Playground will now automatically have GPU
 frame capture enabled.
 
 # Select the Playground Enabled Test to Profile
@@ -103,6 +103,8 @@ To do this, in the `Options` tab on the `Edit Scheme…` pop-up, in the `Argumen
 Passed on Launch` section, add the right `--gtest_filter=` to launch, and
 instrument just the one test you want.
 
+You also need to set the `--enable_playground` flag in order to do frame capturing.
+
 ![alt_text](assets/xcode_frame_capture/image12.png "image_tooltip")
 
 This is also the spot where you will add other command line arguments that will
diff --git a/impeller/entity/BUILD.gn b/impeller/entity/BUILD.gn
index 87bebf55d382ef60d5228d0c2d40bc44152e94d6..9e1a56a21a3c5a354284d09b877b2a07fa1df70d 100644
--- a/impeller/entity/BUILD.gn
+++ b/impeller/entity/BUILD.gn
@@ -7,38 +7,32 @@ import("//flutter/impeller/tools/impeller.gni")
 impeller_shaders("entity_shaders") {
   name = "entity"
 
+  if (impeller_enable_vulkan) {
+    vulkan_language_version = 130
+  }
+
+  use_half_textures = true
+
   shaders = [
-    "shaders/atlas_fill.frag",
-    "shaders/atlas_fill.vert",
     "shaders/blending/advanced_blend.vert",
-    "shaders/blending/advanced_blend_color.frag",
-    "shaders/blending/advanced_blend_colorburn.frag",
-    "shaders/blending/advanced_blend_colordodge.frag",
-    "shaders/blending/advanced_blend_darken.frag",
-    "shaders/blending/advanced_blend_difference.frag",
-    "shaders/blending/advanced_blend_exclusion.frag",
-    "shaders/blending/advanced_blend_hardlight.frag",
-    "shaders/blending/advanced_blend_hue.frag",
-    "shaders/blending/advanced_blend_lighten.frag",
-    "shaders/blending/advanced_blend_luminosity.frag",
-    "shaders/blending/advanced_blend_multiply.frag",
-    "shaders/blending/advanced_blend_overlay.frag",
-    "shaders/blending/advanced_blend_saturation.frag",
-    "shaders/blending/advanced_blend_screen.frag",
-    "shaders/blending/advanced_blend_softlight.frag",
+    "shaders/blending/advanced_blend.frag",
     "shaders/blending/blend.frag",
     "shaders/blending/blend.vert",
     "shaders/border_mask_blur.frag",
     "shaders/border_mask_blur.vert",
+    "shaders/clip.frag",
+    "shaders/clip.vert",
     "shaders/color_matrix_color_filter.frag",
     "shaders/color_matrix_color_filter.vert",
-    "shaders/gaussian_blur.frag",
-    "shaders/gaussian_blur_decal.frag",
-    "shaders/gaussian_blur.vert",
+    "shaders/conical_gradient_fill.frag",
+    "shaders/gaussian_blur/gaussian_blur.vert",
+    "shaders/gaussian_blur/gaussian_blur_noalpha_decal.frag",
+    "shaders/gaussian_blur/gaussian_blur_noalpha_nodecal.frag",
+    "shaders/gaussian_blur/kernel_decal.frag",
+    "shaders/gaussian_blur/kernel_nodecal.frag",
     "shaders/glyph_atlas.frag",
+    "shaders/glyph_atlas_color.frag",
     "shaders/glyph_atlas.vert",
-    "shaders/glyph_atlas_sdf.frag",
-    "shaders/glyph_atlas_sdf.vert",
     "shaders/gradient_fill.vert",
     "shaders/linear_to_srgb_filter.frag",
     "shaders/linear_to_srgb_filter.vert",
@@ -46,8 +40,6 @@ impeller_shaders("entity_shaders") {
     "shaders/morphology_filter.frag",
     "shaders/morphology_filter.vert",
     "shaders/position_color.vert",
-    "shaders/position_uv.vert",
-    "shaders/position.vert",
     "shaders/radial_gradient_fill.frag",
     "shaders/rrect_blur.vert",
     "shaders/rrect_blur.frag",
@@ -59,36 +51,77 @@ impeller_shaders("entity_shaders") {
     "shaders/sweep_gradient_fill.frag",
     "shaders/texture_fill.frag",
     "shaders/texture_fill.vert",
+    "shaders/texture_fill_external.frag",
+    "shaders/texture_fill_strict_src.frag",
     "shaders/tiled_texture_fill.frag",
-    "shaders/tiled_texture_fill.vert",
+    "shaders/tiled_texture_fill_external.frag",
     "shaders/vertices.frag",
     "shaders/yuv_to_rgb_filter.frag",
     "shaders/yuv_to_rgb_filter.vert",
+    "shaders/blending/porter_duff_blend.frag",
+    "shaders/blending/porter_duff_blend.vert",
   ]
+
+  if (impeller_debug) {
+    shaders += [
+      "shaders/debug/checkerboard.frag",
+      "shaders/debug/checkerboard.vert",
+    ]
+  }
 }
 
 impeller_shaders("modern_entity_shaders") {
   name = "modern"
 
   if (impeller_enable_opengles) {
-    gles_language_version = "460"
+    gles_language_version = 460
+  }
+
+  if (impeller_enable_vulkan) {
+    vulkan_language_version = 130
   }
 
   shaders = [
+    "shaders/conical_gradient_ssbo_fill.frag",
     "shaders/linear_gradient_ssbo_fill.frag",
     "shaders/radial_gradient_ssbo_fill.frag",
     "shaders/sweep_gradient_ssbo_fill.frag",
+    "shaders/geometry/points.comp",
+    "shaders/geometry/uv.comp",
+  ]
+}
+
+impeller_shaders("framebuffer_blend_entity_shaders") {
+  name = "framebuffer_blend"
+  require_framebuffer_fetch = true
+
+  # malioc does not support analyzing shaders that use the framebuffer fetch extension on some GPUs.
+  analyze = false
+
+  if (is_mac && !is_ios) {
+    # Note: this needs to correspond to the Apple7 Support family
+    # for M1 and M2.
+    metal_version = "2.3"
+  }
+
+  shaders = [
+    "shaders/blending/framebuffer_blend.vert",
+    "shaders/blending/framebuffer_blend.frag",
   ]
 }
 
 impeller_component("entity") {
   sources = [
+    "contents/anonymous_contents.cc",
+    "contents/anonymous_contents.h",
     "contents/atlas_contents.cc",
     "contents/atlas_contents.h",
     "contents/clip_contents.cc",
     "contents/clip_contents.h",
     "contents/color_source_contents.cc",
     "contents/color_source_contents.h",
+    "contents/conical_gradient_contents.cc",
+    "contents/conical_gradient_contents.h",
     "contents/content_context.cc",
     "contents/content_context.h",
     "contents/contents.cc",
@@ -111,6 +144,8 @@ impeller_component("entity") {
     "contents/filters/inputs/filter_contents_filter_input.h",
     "contents/filters/inputs/filter_input.cc",
     "contents/filters/inputs/filter_input.h",
+    "contents/filters/inputs/placeholder_filter_input.cc",
+    "contents/filters/inputs/placeholder_filter_input.h",
     "contents/filters/inputs/texture_filter_input.cc",
     "contents/filters/inputs/texture_filter_input.h",
     "contents/filters/linear_to_srgb_filter_contents.cc",
@@ -125,18 +160,20 @@ impeller_component("entity") {
     "contents/filters/srgb_to_linear_filter_contents.h",
     "contents/filters/yuv_to_rgb_filter_contents.cc",
     "contents/filters/yuv_to_rgb_filter_contents.h",
+    "contents/framebuffer_blend_contents.cc",
+    "contents/framebuffer_blend_contents.h",
     "contents/gradient_generator.cc",
     "contents/gradient_generator.h",
     "contents/linear_gradient_contents.cc",
     "contents/linear_gradient_contents.h",
     "contents/radial_gradient_contents.cc",
     "contents/radial_gradient_contents.h",
-    "contents/rrect_shadow_contents.cc",
-    "contents/rrect_shadow_contents.h",
     "contents/runtime_effect_contents.cc",
     "contents/runtime_effect_contents.h",
     "contents/solid_color_contents.cc",
     "contents/solid_color_contents.h",
+    "contents/solid_rrect_blur_contents.cc",
+    "contents/solid_rrect_blur_contents.h",
     "contents/sweep_gradient_contents.cc",
     "contents/sweep_gradient_contents.h",
     "contents/text_contents.cc",
@@ -151,39 +188,106 @@ impeller_component("entity") {
     "entity.h",
     "entity_pass.cc",
     "entity_pass.h",
+    "entity_pass_clip_stack.cc",
+    "entity_pass_clip_stack.h",
     "entity_pass_delegate.cc",
     "entity_pass_delegate.h",
-    "geometry.cc",
-    "geometry.h",
+    "entity_pass_target.cc",
+    "entity_pass_target.h",
+    "geometry/circle_geometry.cc",
+    "geometry/circle_geometry.h",
+    "geometry/cover_geometry.cc",
+    "geometry/cover_geometry.h",
+    "geometry/ellipse_geometry.cc",
+    "geometry/ellipse_geometry.h",
+    "geometry/fill_path_geometry.cc",
+    "geometry/fill_path_geometry.h",
+    "geometry/geometry.cc",
+    "geometry/geometry.h",
+    "geometry/line_geometry.cc",
+    "geometry/line_geometry.h",
+    "geometry/point_field_geometry.cc",
+    "geometry/point_field_geometry.h",
+    "geometry/rect_geometry.cc",
+    "geometry/rect_geometry.h",
+    "geometry/round_rect_geometry.cc",
+    "geometry/round_rect_geometry.h",
+    "geometry/stroke_path_geometry.cc",
+    "geometry/stroke_path_geometry.h",
+    "geometry/vertices_geometry.cc",
+    "geometry/vertices_geometry.h",
     "inline_pass_context.cc",
     "inline_pass_context.h",
+    "render_target_cache.cc",
+    "render_target_cache.h",
   ]
 
+  if (impeller_debug) {
+    sources += [
+      "contents/checkerboard_contents.cc",
+      "contents/checkerboard_contents.h",
+    ]
+  }
+
   public_deps = [
     ":entity_shaders",
+    ":framebuffer_blend_entity_shaders",
     ":modern_entity_shaders",
-    "../archivist",
-    "../image",
     "../renderer",
     "../typographer",
   ]
 
+  if (impeller_enable_3d) {
+    sources += [
+      "contents/scene_contents.cc",
+      "contents/scene_contents.h",
+    ]
+    public_deps += [ "../scene" ]
+  }
+
   deps = [ "//flutter/fml" ]
+  defines = [ "_USE_MATH_DEFINES" ]
+}
+
+impeller_component("entity_test_helpers") {
+  testonly = true
+
+  sources = [
+    "contents/test/contents_test_helpers.cc",
+    "contents/test/contents_test_helpers.h",
+    "contents/test/recording_render_pass.cc",
+    "contents/test/recording_render_pass.h",
+  ]
+
+  deps = [ ":entity" ]
 }
 
 impeller_component("entity_unittests") {
   testonly = true
 
   sources = [
+    "contents/checkerboard_contents_unittests.cc",
+    "contents/content_context_unittests.cc",
+    "contents/filters/gaussian_blur_filter_contents_unittests.cc",
     "contents/filters/inputs/filter_input_unittests.cc",
+    "contents/host_buffer_unittests.cc",
+    "contents/tiled_texture_contents_unittests.cc",
+    "contents/vertices_contents_unittests.cc",
+    "entity_pass_target_unittests.cc",
+    "entity_pass_unittests.cc",
     "entity_playground.cc",
     "entity_playground.h",
     "entity_unittests.cc",
+    "geometry/geometry_unittests.cc",
+    "render_target_cache_unittests.cc",
   ]
 
   deps = [
     ":entity",
-    "../geometry:geometry_unittests",
+    ":entity_test_helpers",
+    "../geometry:geometry_asserts",
     "../playground:playground_test",
+    "//flutter/display_list/testing:display_list_testing",
+    "//flutter/impeller/typographer/backends/skia:typographer_skia_backend",
   ]
 }
diff --git a/impeller/entity/contents/anonymous_contents.cc b/impeller/entity/contents/anonymous_contents.cc
new file mode 100644
index 0000000000000000000000000000000000000000..f8008f7a8d2675efb842cccdbc99101b1195bf5d
--- /dev/null
+++ b/impeller/entity/contents/anonymous_contents.cc
@@ -0,0 +1,34 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/entity/contents/anonymous_contents.h"
+
+#include <memory>
+
+namespace impeller {
+
+std::shared_ptr<Contents> AnonymousContents::Make(RenderProc render_proc,
+                                                  CoverageProc coverage_proc) {
+  return std::shared_ptr<Contents>(
+      new AnonymousContents(std::move(render_proc), std::move(coverage_proc)));
+}
+
+AnonymousContents::AnonymousContents(RenderProc render_proc,
+                                     CoverageProc coverage_proc)
+    : render_proc_(std::move(render_proc)),
+      coverage_proc_(std::move(coverage_proc)) {}
+
+AnonymousContents::~AnonymousContents() = default;
+
+bool AnonymousContents::Render(const ContentContext& renderer,
+                               const Entity& entity,
+                               RenderPass& pass) const {
+  return render_proc_(renderer, entity, pass);
+}
+
+std::optional<Rect> AnonymousContents::GetCoverage(const Entity& entity) const {
+  return coverage_proc_(entity);
+}
+
+}  // namespace impeller
diff --git a/impeller/entity/contents/anonymous_contents.h b/impeller/entity/contents/anonymous_contents.h
new file mode 100644
index 0000000000000000000000000000000000000000..0efbfa7487e77752551dcab76e035cbb8ad6ef48
--- /dev/null
+++ b/impeller/entity/contents/anonymous_contents.h
@@ -0,0 +1,45 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_ANONYMOUS_CONTENTS_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_ANONYMOUS_CONTENTS_H_
+
+#include <functional>
+#include <memory>
+
+#include "flutter/fml/macros.h"
+#include "impeller/entity/contents/contents.h"
+
+namespace impeller {
+
+class AnonymousContents final : public Contents {
+ public:
+  static std::shared_ptr<Contents> Make(RenderProc render_proc,
+                                        CoverageProc coverage_proc);
+
+  // |Contents|
+  ~AnonymousContents() override;
+
+  // |Contents|
+  bool Render(const ContentContext& renderer,
+              const Entity& entity,
+              RenderPass& pass) const override;
+
+  // |Contents|
+  std::optional<Rect> GetCoverage(const Entity& entity) const override;
+
+ private:
+  RenderProc render_proc_;
+  CoverageProc coverage_proc_;
+
+  AnonymousContents(RenderProc render_proc, CoverageProc coverage_proc);
+
+  AnonymousContents(const AnonymousContents&) = delete;
+
+  AnonymousContents& operator=(const AnonymousContents&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_ANONYMOUS_CONTENTS_H_
diff --git a/impeller/entity/contents/atlas_contents.cc b/impeller/entity/contents/atlas_contents.cc
index b983d29e9c2618c7df6c7eee6398af65f52957ef..ebad55f96c35c224cb387cb3207a23e88e28e5c2 100644
--- a/impeller/entity/contents/atlas_contents.cc
+++ b/impeller/entity/contents/atlas_contents.cc
@@ -3,18 +3,21 @@
 // found in the LICENSE file.
 
 #include <optional>
+#include <unordered_map>
 #include <utility>
 
-#include "impeller/renderer/formats.h"
-#include "impeller/renderer/sampler_library.h"
-#include "impeller/renderer/vertex_buffer_builder.h"
-
-#include "impeller/entity/atlas_fill.frag.h"
-#include "impeller/entity/atlas_fill.vert.h"
+#include "impeller/core/formats.h"
 #include "impeller/entity/contents/atlas_contents.h"
 #include "impeller/entity/contents/content_context.h"
+#include "impeller/entity/contents/filters/blend_filter_contents.h"
+#include "impeller/entity/contents/filters/color_filter_contents.h"
+#include "impeller/entity/contents/texture_contents.h"
 #include "impeller/entity/entity.h"
+#include "impeller/entity/texture_fill.frag.h"
+#include "impeller/entity/texture_fill.vert.h"
+#include "impeller/geometry/color.h"
 #include "impeller/renderer/render_pass.h"
+#include "impeller/renderer/vertex_buffer_builder.h"
 
 namespace impeller {
 
@@ -32,10 +35,12 @@ std::shared_ptr<Texture> AtlasContents::GetTexture() const {
 
 void AtlasContents::SetTransforms(std::vector<Matrix> transforms) {
   transforms_ = std::move(transforms);
+  bounding_box_cache_.reset();
 }
 
 void AtlasContents::SetTextureCoordinates(std::vector<Rect> texture_coords) {
   texture_coords_ = std::move(texture_coords);
+  bounding_box_cache_.reset();
 }
 
 void AtlasContents::SetColors(std::vector<Color> colors) {
@@ -47,7 +52,6 @@ void AtlasContents::SetAlpha(Scalar alpha) {
 }
 
 void AtlasContents::SetBlendMode(BlendMode blend_mode) {
-  // TODO(jonahwilliams): blending of colors with texture.
   blend_mode_ = blend_mode;
 }
 
@@ -55,19 +59,107 @@ void AtlasContents::SetCullRect(std::optional<Rect> cull_rect) {
   cull_rect_ = cull_rect;
 }
 
+struct AtlasBlenderKey {
+  Color color;
+  Rect rect;
+  uint32_t color_key;
+
+  struct Hash {
+    std::size_t operator()(const AtlasBlenderKey& key) const {
+      return fml::HashCombine(key.color_key, key.rect.GetWidth(),
+                              key.rect.GetHeight(), key.rect.GetX(),
+                              key.rect.GetY());
+    }
+  };
+
+  struct Equal {
+    bool operator()(const AtlasBlenderKey& lhs,
+                    const AtlasBlenderKey& rhs) const {
+      return lhs.rect == rhs.rect && lhs.color_key == rhs.color_key;
+    }
+  };
+};
+
+std::shared_ptr<SubAtlasResult> AtlasContents::GenerateSubAtlas() const {
+  FML_DCHECK(colors_.size() > 0 && blend_mode_ != BlendMode::kSource &&
+             blend_mode_ != BlendMode::kDestination);
+
+  std::unordered_map<AtlasBlenderKey, std::vector<Matrix>,
+                     AtlasBlenderKey::Hash, AtlasBlenderKey::Equal>
+      sub_atlas = {};
+
+  for (auto i = 0u; i < texture_coords_.size(); i++) {
+    AtlasBlenderKey key = {.color = colors_[i],
+                           .rect = texture_coords_[i],
+                           .color_key = Color::ToIColor(colors_[i])};
+    if (sub_atlas.find(key) == sub_atlas.end()) {
+      sub_atlas[key] = {transforms_[i]};
+    } else {
+      sub_atlas[key].push_back(transforms_[i]);
+    }
+  }
+
+  auto result = std::make_shared<SubAtlasResult>();
+  Scalar x_offset = 0.0;
+  Scalar y_offset = 0.0;
+  Scalar x_extent = 0.0;
+  Scalar y_extent = 0.0;
+
+  for (auto it = sub_atlas.begin(); it != sub_atlas.end(); it++) {
+    // This size was arbitrarily chosen to keep the textures from getting too
+    // wide. We could instead use a more generic rect packer but in the majority
+    // of cases the sample rects will be fairly close in size making this a good
+    // enough approximation.
+    if (x_offset >= 1000) {
+      y_offset = y_extent + 1;
+      x_offset = 0.0;
+    }
+
+    auto key = it->first;
+    auto transforms = it->second;
+
+    auto new_rect = Rect::MakeXYWH(x_offset, y_offset, key.rect.GetWidth(),
+                                   key.rect.GetHeight());
+    auto sub_transform = Matrix::MakeTranslation(Vector2(x_offset, y_offset));
+
+    x_offset += std::ceil(key.rect.GetWidth()) + 1.0;
+
+    result->sub_texture_coords.push_back(key.rect);
+    result->sub_colors.push_back(key.color);
+    result->sub_transforms.push_back(sub_transform);
+
+    x_extent = std::max(x_extent, x_offset);
+    y_extent = std::max(y_extent, std::ceil(y_offset + key.rect.GetHeight()));
+
+    for (auto transform : transforms) {
+      result->result_texture_coords.push_back(new_rect);
+      result->result_transforms.push_back(transform);
+    }
+  }
+  result->size = ISize(std::ceil(x_extent), std::ceil(y_extent));
+  return result;
+}
+
 std::optional<Rect> AtlasContents::GetCoverage(const Entity& entity) const {
   if (cull_rect_.has_value()) {
-    return cull_rect_.value().TransformBounds(entity.GetTransformation());
+    return cull_rect_.value().TransformBounds(entity.GetTransform());
   }
+  return ComputeBoundingBox().TransformBounds(entity.GetTransform());
+}
 
-  Rect bounding_box = {};
-  for (size_t i = 0; i < texture_coords_.size(); i++) {
-    auto matrix = transforms_[i];
-    auto sample_rect = texture_coords_[i];
-    auto bounds = Rect::MakeSize(sample_rect.size).TransformBounds(matrix);
-    bounding_box = bounds.Union(bounding_box);
+Rect AtlasContents::ComputeBoundingBox() const {
+  if (!bounding_box_cache_.has_value()) {
+    Rect bounding_box = {};
+    for (size_t i = 0; i < texture_coords_.size(); i++) {
+      auto matrix = transforms_[i];
+      auto sample_rect = texture_coords_[i];
+      auto bounds =
+          Rect::MakeSize(sample_rect.GetSize()).TransformBounds(matrix);
+      bounding_box = bounds.Union(bounding_box);
+    }
+    bounding_box_cache_ = bounding_box;
   }
-  return bounding_box.TransformBounds(entity.GetTransformation());
+  return bounding_box_cache_.value();
 }
 
 void AtlasContents::SetSamplerDescriptor(SamplerDescriptor desc) {
@@ -78,41 +170,313 @@ const SamplerDescriptor& AtlasContents::GetSamplerDescriptor() const {
   return sampler_descriptor_;
 }
 
+const std::vector<Matrix>& AtlasContents::GetTransforms() const {
+  return transforms_;
+}
+
+const std::vector<Rect>& AtlasContents::GetTextureCoordinates() const {
+  return texture_coords_;
+}
+
+const std::vector<Color>& AtlasContents::GetColors() const {
+  return colors_;
+}
+
 bool AtlasContents::Render(const ContentContext& renderer,
                            const Entity& entity,
                            RenderPass& pass) const {
-  if (texture_ == nullptr) {
+  if (texture_ == nullptr || blend_mode_ == BlendMode::kClear ||
+      alpha_ <= 0.0) {
+    return true;
+  }
+
+  // Ensure that we use the actual computed bounds and not a cull-rect
+  // approximation of them.
+  auto coverage = ComputeBoundingBox();
+
+  if (blend_mode_ == BlendMode::kSource || colors_.size() == 0) {
+    auto child_contents = AtlasTextureContents(*this);
+    child_contents.SetAlpha(alpha_);
+    child_contents.SetCoverage(coverage);
+    return child_contents.Render(renderer, entity, pass);
+  }
+  if (blend_mode_ == BlendMode::kDestination) {
+    auto child_contents = AtlasColorContents(*this);
+    child_contents.SetAlpha(alpha_);
+    child_contents.SetCoverage(coverage);
+    return child_contents.Render(renderer, entity, pass);
+  }
+
+  constexpr size_t indices[6] = {0, 1, 2, 1, 2, 3};
+
+  if (blend_mode_ <= BlendMode::kModulate) {
+    // Simple Porter-Duff blends can be accomplished without a subpass.
+    using VS = PorterDuffBlendPipeline::VertexShader;
+    using FS = PorterDuffBlendPipeline::FragmentShader;
+
+    VertexBufferBuilder<VS::PerVertexData> vtx_builder;
+    vtx_builder.Reserve(texture_coords_.size() * 6);
+    const auto texture_size = texture_->GetSize();
+    auto& host_buffer = renderer.GetTransientsBuffer();
+
+    for (size_t i = 0; i < texture_coords_.size(); i++) {
+      auto sample_rect = texture_coords_[i];
+      auto matrix = transforms_[i];
+      auto points = sample_rect.GetPoints();
+      auto transformed_points =
+          Rect::MakeSize(sample_rect.GetSize()).GetTransformedPoints(matrix);
+      auto color = colors_[i].Premultiply();
+      for (size_t j = 0; j < 6; j++) {
+        VS::PerVertexData data;
+        data.vertices = transformed_points[indices[j]];
+        data.texture_coords = points[indices[j]] / texture_size;
+        data.color = color;
+        vtx_builder.AppendVertex(data);
+      }
+    }
+
+#ifdef IMPELLER_DEBUG
+    pass.SetCommandLabel(
+        SPrintF("DrawAtlas Blend (%s)", BlendModeToString(blend_mode_)));
+#endif  // IMPELLER_DEBUG
+    pass.SetVertexBuffer(vtx_builder.CreateVertexBuffer(host_buffer));
+    pass.SetStencilReference(entity.GetClipDepth());
+    pass.SetPipeline(
+        renderer.GetPorterDuffBlendPipeline(OptionsFromPass(pass)));
+
+    FS::FragInfo frag_info;
+    VS::FrameInfo frame_info;
+
+    auto dst_sampler_descriptor = sampler_descriptor_;
+    if (renderer.GetDeviceCapabilities().SupportsDecalSamplerAddressMode()) {
+      dst_sampler_descriptor.width_address_mode = SamplerAddressMode::kDecal;
+      dst_sampler_descriptor.height_address_mode = SamplerAddressMode::kDecal;
+    }
+    const std::unique_ptr<const Sampler>& dst_sampler =
+        renderer.GetContext()->GetSamplerLibrary()->GetSampler(
+            dst_sampler_descriptor);
+    FS::BindTextureSamplerDst(pass, texture_, dst_sampler);
+    frame_info.texture_sampler_y_coord_scale = texture_->GetYCoordScale();
+
+    frag_info.output_alpha = alpha_;
+    frag_info.input_alpha = 1.0;
+
+    auto inverted_blend_mode =
+        InvertPorterDuffBlend(blend_mode_).value_or(BlendMode::kSource);
+    auto blend_coefficients =
+        kPorterDuffCoefficients[static_cast<int>(inverted_blend_mode)];
+    frag_info.src_coeff = blend_coefficients[0];
+    frag_info.src_coeff_dst_alpha = blend_coefficients[1];
+    frag_info.dst_coeff = blend_coefficients[2];
+    frag_info.dst_coeff_src_alpha = blend_coefficients[3];
+    frag_info.dst_coeff_src_color = blend_coefficients[4];
+
+    FS::BindFragInfo(pass, host_buffer.EmplaceUniform(frag_info));
+
+    frame_info.mvp = entity.GetShaderTransform(pass);
+
+    auto uniform_view = host_buffer.EmplaceUniform(frame_info);
+    VS::BindFrameInfo(pass, uniform_view);
+
+    return pass.Draw().ok();
+  }
+
+  // Advanced blends.
+
+  auto sub_atlas = GenerateSubAtlas();
+  auto sub_coverage = Rect::MakeSize(sub_atlas->size);
+
+  auto src_contents = std::make_shared<AtlasTextureContents>(*this);
+  src_contents->SetSubAtlas(sub_atlas);
+  src_contents->SetCoverage(sub_coverage);
+
+  auto dst_contents = std::make_shared<AtlasColorContents>(*this);
+  dst_contents->SetSubAtlas(sub_atlas);
+  dst_contents->SetCoverage(sub_coverage);
+
+  Entity untransformed_entity;
+  auto contents = ColorFilterContents::MakeBlend(
+      blend_mode_,
+      {FilterInput::Make(dst_contents), FilterInput::Make(src_contents)});
+  auto snapshot =
+      contents->RenderToSnapshot(renderer,              // renderer
+                                 untransformed_entity,  // entity
+                                 std::nullopt,          // coverage_limit
+                                 std::nullopt,          // sampler_descriptor
+                                 true,                  // msaa_enabled
+                                 /*mip_count=*/1,
+                                 "AtlasContents Snapshot");  // label
+  if (!snapshot.has_value()) {
+    return false;
+  }
+
+  auto child_contents = AtlasTextureContents(*this);
+  child_contents.SetAlpha(alpha_);
+  child_contents.SetCoverage(coverage);
+  child_contents.SetTexture(snapshot.value().texture);
+  child_contents.SetUseDestination(true);
+  child_contents.SetSubAtlas(sub_atlas);
+  return child_contents.Render(renderer, entity, pass);
+}
+
+// AtlasTextureContents
+// ---------------------------------------------------------
+
+AtlasTextureContents::AtlasTextureContents(const AtlasContents& parent)
+    : parent_(parent) {}
+
+AtlasTextureContents::~AtlasTextureContents() {}
+
+std::optional<Rect> AtlasTextureContents::GetCoverage(
+    const Entity& entity) const {
+  return coverage_.TransformBounds(entity.GetTransform());
+}
+
+void AtlasTextureContents::SetAlpha(Scalar alpha) {
+  alpha_ = alpha;
+}
+
+void AtlasTextureContents::SetCoverage(Rect coverage) {
+  coverage_ = coverage;
+}
+
+void AtlasTextureContents::SetUseDestination(bool value) {
+  use_destination_ = value;
+}
+
+void AtlasTextureContents::SetSubAtlas(
+    const std::shared_ptr<SubAtlasResult>& subatlas) {
+  subatlas_ = subatlas;
+}
+
+void AtlasTextureContents::SetTexture(std::shared_ptr<Texture> texture) {
+  texture_ = std::move(texture);
+}
+
+bool AtlasTextureContents::Render(const ContentContext& renderer,
+                                  const Entity& entity,
+                                  RenderPass& pass) const {
+  using VS = TextureFillVertexShader;
+  using FS = TextureFillFragmentShader;
+
+  auto texture = texture_ ? texture_ : parent_.GetTexture();
+  if (texture == nullptr) {
     return true;
   }
 
-  using VS = AtlasFillVertexShader;
-  using FS = AtlasFillFragmentShader;
+  std::vector<Rect> texture_coords;
+  std::vector<Matrix> transforms;
+  if (subatlas_) {
+    texture_coords = use_destination_ ? subatlas_->result_texture_coords
+                                      : subatlas_->sub_texture_coords;
+    transforms = use_destination_ ? subatlas_->result_transforms
+                                  : subatlas_->sub_transforms;
+  } else {
+    texture_coords = parent_.GetTextureCoordinates();
+    transforms = parent_.GetTransforms();
+  }
+
+  const Size texture_size(texture->GetSize());
+  VertexBufferBuilder<VS::PerVertexData> vertex_builder;
+  vertex_builder.Reserve(texture_coords.size() * 6);
+  constexpr size_t indices[6] = {0, 1, 2, 1, 2, 3};
+  for (size_t i = 0; i < texture_coords.size(); i++) {
+    auto sample_rect = texture_coords[i];
+    auto matrix = transforms[i];
+    auto points = sample_rect.GetPoints();
+    auto transformed_points =
+        Rect::MakeSize(sample_rect.GetSize()).GetTransformedPoints(matrix);
+
+    for (size_t j = 0; j < 6; j++) {
+      VS::PerVertexData data;
+      data.position = transformed_points[indices[j]];
+      data.texture_coords = points[indices[j]] / texture_size;
+      vertex_builder.AppendVertex(data);
+    }
+  }
 
-  const auto texture_size = texture_->GetSize();
-  if (texture_size.IsEmpty()) {
+  if (!vertex_builder.HasVertices()) {
     return true;
   }
 
+  pass.SetCommandLabel("AtlasTexture");
+
+  auto& host_buffer = renderer.GetTransientsBuffer();
+
+  VS::FrameInfo frame_info;
+  frame_info.mvp = entity.GetShaderTransform(pass);
+  frame_info.texture_sampler_y_coord_scale = texture->GetYCoordScale();
+  frame_info.alpha = alpha_;
+
+  auto options = OptionsFromPassAndEntity(pass, entity);
+  pass.SetPipeline(renderer.GetTexturePipeline(options));
+  pass.SetStencilReference(entity.GetClipDepth());
+  pass.SetVertexBuffer(vertex_builder.CreateVertexBuffer(host_buffer));
+  VS::BindFrameInfo(pass, host_buffer.EmplaceUniform(frame_info));
+  FS::BindTextureSampler(pass, texture,
+                         renderer.GetContext()->GetSamplerLibrary()->GetSampler(
+                             parent_.GetSamplerDescriptor()));
+  return pass.Draw().ok();
+}
+
+// AtlasColorContents
+// ---------------------------------------------------------
+
+AtlasColorContents::AtlasColorContents(const AtlasContents& parent)
+    : parent_(parent) {}
+
+AtlasColorContents::~AtlasColorContents() {}
+
+std::optional<Rect> AtlasColorContents::GetCoverage(
+    const Entity& entity) const {
+  return coverage_.TransformBounds(entity.GetTransform());
+}
+
+void AtlasColorContents::SetAlpha(Scalar alpha) {
+  alpha_ = alpha;
+}
+
+void AtlasColorContents::SetCoverage(Rect coverage) {
+  coverage_ = coverage;
+}
+
+void AtlasColorContents::SetSubAtlas(
+    const std::shared_ptr<SubAtlasResult>& subatlas) {
+  subatlas_ = subatlas;
+}
+
+bool AtlasColorContents::Render(const ContentContext& renderer,
+                                const Entity& entity,
+                                RenderPass& pass) const {
+  using VS = GeometryColorPipeline::VertexShader;
+  using FS = GeometryColorPipeline::FragmentShader;
+
+  std::vector<Rect> texture_coords;
+  std::vector<Matrix> transforms;
+  std::vector<Color> colors;
+  if (subatlas_) {
+    texture_coords = subatlas_->sub_texture_coords;
+    colors = subatlas_->sub_colors;
+    transforms = subatlas_->sub_transforms;
+  } else {
+    texture_coords = parent_.GetTextureCoordinates();
+    transforms = parent_.GetTransforms();
+    colors = parent_.GetColors();
+  }
+
   VertexBufferBuilder<VS::PerVertexData> vertex_builder;
-  vertex_builder.Reserve(texture_coords_.size() * 6);
+  vertex_builder.Reserve(texture_coords.size() * 6);
   constexpr size_t indices[6] = {0, 1, 2, 1, 2, 3};
-  constexpr Scalar width[6] = {0, 1, 0, 1, 0, 1};
-  constexpr Scalar height[6] = {0, 0, 1, 0, 1, 1};
-  for (size_t i = 0; i < texture_coords_.size(); i++) {
-    auto sample_rect = texture_coords_[i];
-    auto matrix = transforms_[i];
-    auto color = colors_.size() > 0 ? colors_[i] : Color::Black();
+  for (size_t i = 0; i < texture_coords.size(); i++) {
+    auto sample_rect = texture_coords[i];
+    auto matrix = transforms[i];
     auto transformed_points =
-        Rect::MakeSize(sample_rect.size).GetTransformedPoints(matrix);
+        Rect::MakeSize(sample_rect.GetSize()).GetTransformedPoints(matrix);
 
     for (size_t j = 0; j < 6; j++) {
       VS::PerVertexData data;
       data.position = transformed_points[indices[j]];
-      data.texture_coords =
-          (sample_rect.origin + Point(sample_rect.size.width * width[j],
-                                      sample_rect.size.height * height[j])) /
-          texture_size;
-      data.color = color.Premultiply();
+      data.color = colors[i].Premultiply();
       vertex_builder.AppendVertex(data);
     }
   }
@@ -121,31 +485,24 @@ bool AtlasContents::Render(const ContentContext& renderer,
     return true;
   }
 
-  auto& host_buffer = pass.GetTransientsBuffer();
+  pass.SetCommandLabel("AtlasColors");
 
-  VS::VertInfo vert_info;
-  vert_info.mvp = Matrix::MakeOrthographic(pass.GetRenderTargetSize()) *
-                  entity.GetTransformation();
+  auto& host_buffer = renderer.GetTransientsBuffer();
+
+  VS::FrameInfo frame_info;
+  frame_info.mvp = entity.GetShaderTransform(pass);
 
   FS::FragInfo frag_info;
-  frag_info.texture_sampler_y_coord_scale = texture_->GetYCoordScale();
-  frag_info.has_vertex_color = colors_.size() > 0 ? 1.0 : 0.0;
   frag_info.alpha = alpha_;
 
-  Command cmd;
-  cmd.label = "DrawAtlas";
-  cmd.pipeline =
-      renderer.GetAtlasPipeline(OptionsFromPassAndEntity(pass, entity));
-  cmd.stencil_reference = entity.GetStencilDepth();
-  cmd.BindVertices(vertex_builder.CreateVertexBuffer(host_buffer));
-  VS::BindVertInfo(cmd, host_buffer.EmplaceUniform(vert_info));
-  FS::BindFragInfo(cmd, host_buffer.EmplaceUniform(frag_info));
-  FS::BindTextureSampler(cmd, texture_,
-                         renderer.GetContext()->GetSamplerLibrary()->GetSampler(
-                             sampler_descriptor_));
-  pass.AddCommand(std::move(cmd));
-
-  return true;
+  auto opts = OptionsFromPassAndEntity(pass, entity);
+  opts.blend_mode = BlendMode::kSourceOver;
+  pass.SetPipeline(renderer.GetGeometryColorPipeline(opts));
+  pass.SetStencilReference(entity.GetClipDepth());
+  pass.SetVertexBuffer(vertex_builder.CreateVertexBuffer(host_buffer));
+  VS::BindFrameInfo(pass, host_buffer.EmplaceUniform(frame_info));
+  FS::BindFragInfo(pass, host_buffer.EmplaceUniform(frag_info));
+  return pass.Draw().ok();
 }
 
 }  // namespace impeller
diff --git a/impeller/entity/contents/atlas_contents.h b/impeller/entity/contents/atlas_contents.h
index 7b879892da2a1bfefd16b0a0adf8d6a8507b5494..12e5e232d3f25020d43345428a50de36ce9fba26 100644
--- a/impeller/entity/contents/atlas_contents.h
+++ b/impeller/entity/contents/atlas_contents.h
@@ -2,19 +2,34 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_ATLAS_CONTENTS_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_ATLAS_CONTENTS_H_
 
 #include <functional>
 #include <memory>
 #include <vector>
 
 #include "flutter/fml/macros.h"
+#include "impeller/core/sampler_descriptor.h"
 #include "impeller/entity/contents/contents.h"
 #include "impeller/entity/entity.h"
-#include "impeller/renderer/sampler_descriptor.h"
 
 namespace impeller {
 
+struct SubAtlasResult {
+  // Sub atlas values.
+  std::vector<Rect> sub_texture_coords;
+  std::vector<Color> sub_colors;
+  std::vector<Matrix> sub_transforms;
+
+  // Result atlas values.
+  std::vector<Rect> result_texture_coords;
+  std::vector<Matrix> result_transforms;
+
+  // Size of the sub-atlass.
+  ISize size;
+};
+
 class AtlasContents final : public Contents {
  public:
   explicit AtlasContents();
@@ -41,6 +56,17 @@ class AtlasContents final : public Contents {
 
   const SamplerDescriptor& GetSamplerDescriptor() const;
 
+  const std::vector<Matrix>& GetTransforms() const;
+
+  const std::vector<Rect>& GetTextureCoordinates() const;
+
+  const std::vector<Color>& GetColors() const;
+
+  /// @brief Compress a drawAtlas call with blending into a smaller sized atlas.
+  ///        This atlas has no overlapping to ensure
+  ///        blending behaves as if it were done in the fragment shader.
+  std::shared_ptr<SubAtlasResult> GenerateSubAtlas() const;
+
   // |Contents|
   std::optional<Rect> GetCoverage(const Entity& entity) const override;
 
@@ -50,6 +76,8 @@ class AtlasContents final : public Contents {
               RenderPass& pass) const override;
 
  private:
+  Rect ComputeBoundingBox() const;
+
   std::shared_ptr<Texture> texture_;
   std::vector<Rect> texture_coords_;
   std::vector<Color> colors_;
@@ -58,8 +86,81 @@ class AtlasContents final : public Contents {
   std::optional<Rect> cull_rect_;
   Scalar alpha_ = 1.0;
   SamplerDescriptor sampler_descriptor_ = {};
+  mutable std::optional<Rect> bounding_box_cache_;
+
+  AtlasContents(const AtlasContents&) = delete;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(AtlasContents);
+  AtlasContents& operator=(const AtlasContents&) = delete;
+};
+
+class AtlasTextureContents final : public Contents {
+ public:
+  explicit AtlasTextureContents(const AtlasContents& parent);
+
+  ~AtlasTextureContents() override;
+
+  // |Contents|
+  std::optional<Rect> GetCoverage(const Entity& entity) const override;
+
+  // |Contents|
+  bool Render(const ContentContext& renderer,
+              const Entity& entity,
+              RenderPass& pass) const override;
+
+  void SetAlpha(Scalar alpha);
+
+  void SetCoverage(Rect coverage);
+
+  void SetTexture(std::shared_ptr<Texture> texture);
+
+  void SetUseDestination(bool value);
+
+  void SetSubAtlas(const std::shared_ptr<SubAtlasResult>& subatlas);
+
+ private:
+  const AtlasContents& parent_;
+  Scalar alpha_ = 1.0;
+  Rect coverage_;
+  std::shared_ptr<Texture> texture_;
+  bool use_destination_ = false;
+  std::shared_ptr<SubAtlasResult> subatlas_;
+
+  AtlasTextureContents(const AtlasTextureContents&) = delete;
+
+  AtlasTextureContents& operator=(const AtlasTextureContents&) = delete;
+};
+
+class AtlasColorContents final : public Contents {
+ public:
+  explicit AtlasColorContents(const AtlasContents& parent);
+
+  ~AtlasColorContents() override;
+
+  // |Contents|
+  std::optional<Rect> GetCoverage(const Entity& entity) const override;
+
+  // |Contents|
+  bool Render(const ContentContext& renderer,
+              const Entity& entity,
+              RenderPass& pass) const override;
+
+  void SetAlpha(Scalar alpha);
+
+  void SetCoverage(Rect coverage);
+
+  void SetSubAtlas(const std::shared_ptr<SubAtlasResult>& subatlas);
+
+ private:
+  const AtlasContents& parent_;
+  Scalar alpha_ = 1.0;
+  Rect coverage_;
+  std::shared_ptr<SubAtlasResult> subatlas_;
+
+  AtlasColorContents(const AtlasColorContents&) = delete;
+
+  AtlasColorContents& operator=(const AtlasColorContents&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_ATLAS_CONTENTS_H_
diff --git a/impeller/entity/contents/checkerboard_contents.cc b/impeller/entity/contents/checkerboard_contents.cc
new file mode 100644
index 0000000000000000000000000000000000000000..e8d0de77952c50ddcf6c9f260065a92a74bfd075
--- /dev/null
+++ b/impeller/entity/contents/checkerboard_contents.cc
@@ -0,0 +1,64 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/entity/contents/checkerboard_contents.h"
+
+#include "impeller/core/formats.h"
+#include "impeller/entity/contents/content_context.h"
+#include "impeller/renderer/render_pass.h"
+#include "impeller/renderer/vertex_buffer_builder.h"
+
+namespace impeller {
+
+CheckerboardContents::CheckerboardContents() = default;
+
+CheckerboardContents::~CheckerboardContents() = default;
+
+bool CheckerboardContents::Render(const ContentContext& renderer,
+                                  const Entity& entity,
+                                  RenderPass& pass) const {
+  auto& host_buffer = renderer.GetTransientsBuffer();
+
+  using VS = CheckerboardPipeline::VertexShader;
+  using FS = CheckerboardPipeline::FragmentShader;
+
+  auto options = OptionsFromPass(pass);
+  options.blend_mode = BlendMode::kSourceOver;
+  options.stencil_mode = ContentContextOptions::StencilMode::kIgnore;
+  options.primitive_type = PrimitiveType::kTriangleStrip;
+
+  VertexBufferBuilder<typename VS::PerVertexData> vtx_builder;
+  vtx_builder.AddVertices({
+      {Point(-1, -1)},
+      {Point(1, -1)},
+      {Point(-1, 1)},
+      {Point(1, 1)},
+  });
+
+  pass.SetCommandLabel("Checkerboard");
+  pass.SetPipeline(renderer.GetCheckerboardPipeline(options));
+  pass.SetVertexBuffer(vtx_builder.CreateVertexBuffer(host_buffer));
+
+  FS::FragInfo frag_info;
+  frag_info.color = color_;
+  frag_info.square_size = square_size_;
+  FS::BindFragInfo(pass, host_buffer.EmplaceUniform(frag_info));
+
+  return pass.Draw().ok();
+}
+
+std::optional<Rect> CheckerboardContents::GetCoverage(
+    const Entity& entity) const {
+  return std::nullopt;
+}
+
+void CheckerboardContents::SetColor(Color color) {
+  color_ = color;
+}
+
+void CheckerboardContents::SetSquareSize(Scalar square_size) {
+  square_size_ = square_size;
+}
+
+}  // namespace impeller
diff --git a/impeller/entity/contents/checkerboard_contents.h b/impeller/entity/contents/checkerboard_contents.h
new file mode 100644
index 0000000000000000000000000000000000000000..43b2ae79424adb227230377045f045fffb29210d
--- /dev/null
+++ b/impeller/entity/contents/checkerboard_contents.h
@@ -0,0 +1,45 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_CHECKERBOARD_CONTENTS_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_CHECKERBOARD_CONTENTS_H_
+
+#include "impeller/entity/contents/contents.h"
+
+namespace impeller {
+
+/// A special Contents that renders a translucent checkerboard pattern with a
+/// random color over the entire pass texture. This is useful for visualizing
+/// offscreen textures.
+class CheckerboardContents final : public Contents {
+ public:
+  CheckerboardContents();
+
+  // |Contents|
+  ~CheckerboardContents() override;
+
+  // |Contents|
+  bool Render(const ContentContext& renderer,
+              const Entity& entity,
+              RenderPass& pass) const override;
+
+  // |Contents|
+  std::optional<Rect> GetCoverage(const Entity& entity) const override;
+
+  void SetColor(Color color);
+
+  void SetSquareSize(Scalar square_size);
+
+ private:
+  Color color_ = Color::Red().WithAlpha(0.25);
+  Scalar square_size_ = 12;
+
+  CheckerboardContents(const CheckerboardContents&) = delete;
+
+  CheckerboardContents& operator=(const CheckerboardContents&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_CHECKERBOARD_CONTENTS_H_
diff --git a/impeller/entity/contents/checkerboard_contents_unittests.cc b/impeller/entity/contents/checkerboard_contents_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a79cc115f544c609279d0de32ec51a1c6e30e35e
--- /dev/null
+++ b/impeller/entity/contents/checkerboard_contents_unittests.cc
@@ -0,0 +1,58 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <memory>
+#include <optional>
+
+#include "gtest/gtest.h"
+
+#include "impeller/entity/contents/checkerboard_contents.h"
+#include "impeller/entity/contents/contents.h"
+#include "impeller/entity/contents/test/recording_render_pass.h"
+#include "impeller/entity/entity.h"
+#include "impeller/entity/entity_playground.h"
+#include "impeller/renderer/render_target.h"
+
+namespace impeller {
+namespace testing {
+
+using EntityTest = EntityPlayground;
+
+#ifdef IMPELLER_DEBUG
+TEST(EntityTest, HasNulloptCoverage) {
+  auto contents = std::make_shared<CheckerboardContents>();
+
+  Entity entity;
+  ASSERT_EQ(contents->GetCoverage(entity), std::nullopt);
+}
+
+TEST_P(EntityTest, RendersWithoutError) {
+  auto contents = std::make_shared<CheckerboardContents>();
+  contents->SetColor(Color::Aqua());
+  contents->SetSquareSize(10);
+
+  auto content_context = GetContentContext();
+  auto buffer = content_context->GetContext()->CreateCommandBuffer();
+  auto render_target =
+      GetContentContext()->GetRenderTargetCache()->CreateOffscreenMSAA(
+          *content_context->GetContext(), {100, 100},
+          /*mip_count=*/1);
+  auto render_pass = buffer->CreateRenderPass(render_target);
+  auto recording_pass = std::make_shared<RecordingRenderPass>(
+      render_pass, GetContext(), render_target);
+
+  Entity entity;
+
+  ASSERT_TRUE(recording_pass->GetCommands().empty());
+  ASSERT_TRUE(contents->Render(*content_context, entity, *recording_pass));
+  ASSERT_FALSE(recording_pass->GetCommands().empty());
+
+  if (GetParam() == PlaygroundBackend::kMetal) {
+    recording_pass->EncodeCommands();
+  }
+}
+#endif  // IMPELLER_DEBUG
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/entity/contents/clip_contents.cc b/impeller/entity/contents/clip_contents.cc
index 5fbd10e5c038f424a4c7c90bc28286fc869d6eed..4897be855815a6ce3f80f63dd0532d763061e735 100644
--- a/impeller/entity/contents/clip_contents.cc
+++ b/impeller/entity/contents/clip_contents.cc
@@ -2,18 +2,27 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <cmath>
 #include <optional>
 
 #include "fml/logging.h"
+#include "impeller/core/formats.h"
 #include "impeller/entity/contents/clip_contents.h"
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/entity.h"
-#include "impeller/renderer/formats.h"
 #include "impeller/renderer/render_pass.h"
 #include "impeller/renderer/vertex_buffer_builder.h"
 
 namespace impeller {
 
+static Scalar GetShaderClipDepth(const Entity& entity) {
+  // Draw the clip at the max of the clip entity's depth slice, so that other
+  // draw calls with this same depth value will be culled even if they have a
+  // perspective transform.
+  return std::nextafterf(
+      Entity::GetShaderClipDepth(entity.GetNewClipDepth() + 1), 0.0f);
+}
+
 /*******************************************************************************
  ******* ClipContents
  ******************************************************************************/
@@ -22,8 +31,8 @@ ClipContents::ClipContents() = default;
 
 ClipContents::~ClipContents() = default;
 
-void ClipContents::SetGeometry(std::unique_ptr<Geometry> geometry) {
-  geometry_ = std::move(geometry);
+void ClipContents::SetGeometry(const std::shared_ptr<Geometry>& geometry) {
+  geometry_ = geometry;
 }
 
 void ClipContents::SetClipOperation(Entity::ClipOperation clip_op) {
@@ -34,106 +43,206 @@ std::optional<Rect> ClipContents::GetCoverage(const Entity& entity) const {
   return std::nullopt;
 };
 
-Contents::StencilCoverage ClipContents::GetStencilCoverage(
+Contents::ClipCoverage ClipContents::GetClipCoverage(
     const Entity& entity,
-    const std::optional<Rect>& current_stencil_coverage) const {
-  if (!current_stencil_coverage.has_value()) {
-    return {.type = StencilCoverage::Type::kAppend, .coverage = std::nullopt};
+    const std::optional<Rect>& current_clip_coverage) const {
+  if (!current_clip_coverage.has_value()) {
+    return {.type = ClipCoverage::Type::kAppend, .coverage = std::nullopt};
   }
   switch (clip_op_) {
     case Entity::ClipOperation::kDifference:
       // This can be optimized further by considering cases when the bounds of
       // the current stencil will shrink.
-      return {.type = StencilCoverage::Type::kAppend,
-              .coverage = current_stencil_coverage};
+      return {.type = ClipCoverage::Type::kAppend,
+              .coverage = current_clip_coverage};
     case Entity::ClipOperation::kIntersect:
       if (!geometry_) {
-        return {.type = StencilCoverage::Type::kAppend,
-                .coverage = std::nullopt};
+        return {.type = ClipCoverage::Type::kAppend, .coverage = std::nullopt};
       }
-      auto coverage = geometry_->GetCoverage(entity.GetTransformation());
-      if (!coverage.has_value() || !current_stencil_coverage.has_value()) {
-        return {.type = StencilCoverage::Type::kAppend,
-                .coverage = std::nullopt};
+      auto coverage = geometry_->GetCoverage(entity.GetTransform());
+      if (!coverage.has_value() || !current_clip_coverage.has_value()) {
+        return {.type = ClipCoverage::Type::kAppend, .coverage = std::nullopt};
       }
       return {
-          .type = StencilCoverage::Type::kAppend,
-          .coverage = current_stencil_coverage->Intersection(coverage.value()),
+          .type = ClipCoverage::Type::kAppend,
+          .coverage = current_clip_coverage->Intersection(coverage.value()),
       };
   }
   FML_UNREACHABLE();
 }
 
-bool ClipContents::ShouldRender(
-    const Entity& entity,
-    const std::optional<Rect>& stencil_coverage) const {
+bool ClipContents::ShouldRender(const Entity& entity,
+                                const std::optional<Rect> clip_coverage) const {
   return true;
 }
 
-bool ClipContents::Render(const ContentContext& renderer,
-                          const Entity& entity,
-                          RenderPass& pass) const {
+bool ClipContents::CanInheritOpacity(const Entity& entity) const {
+  return true;
+}
+
+void ClipContents::SetInheritedOpacity(Scalar opacity) {}
+
+bool ClipContents::RenderDepthClip(const ContentContext& renderer,
+                                   const Entity& entity,
+                                   RenderPass& pass,
+                                   Entity::ClipOperation clip_op,
+                                   const Geometry& geometry) const {
   using VS = ClipPipeline::VertexShader;
-  using FS = ClipPipeline::FragmentShader;
 
-  VS::VertInfo info;
+  VS::FrameInfo info;
+  info.depth = GetShaderClipDepth(entity);
+
+  auto geometry_result = geometry.GetPositionBuffer(renderer, entity, pass);
+  auto options = OptionsFromPass(pass);
+  options.blend_mode = BlendMode::kDestination;
+
+  pass.SetStencilReference(0);
+
+  /// Stencil preparation draw.
+
+  options.depth_write_enabled = false;
+  options.primitive_type = geometry_result.type;
+  pass.SetVertexBuffer(std::move(geometry_result.vertex_buffer));
+  switch (geometry_result.mode) {
+    case GeometryResult::Mode::kNonZero:
+      pass.SetCommandLabel("Clip stencil preparation (NonZero)");
+      options.stencil_mode =
+          ContentContextOptions::StencilMode::kStencilNonZeroFill;
+      break;
+    case GeometryResult::Mode::kEvenOdd:
+      pass.SetCommandLabel("Clip stencil preparation (EvenOdd)");
+      options.stencil_mode =
+          ContentContextOptions::StencilMode::kStencilEvenOddFill;
+      break;
+    case GeometryResult::Mode::kNormal:
+    case GeometryResult::Mode::kPreventOverdraw:
+      pass.SetCommandLabel("Clip stencil preparation (Increment)");
+      options.stencil_mode =
+          ContentContextOptions::StencilMode::kLegacyClipIncrement;
+      break;
+  }
+  pass.SetPipeline(renderer.GetClipPipeline(options));
+
+  info.mvp = geometry_result.transform;
+  VS::BindFrameInfo(pass, renderer.GetTransientsBuffer().EmplaceUniform(info));
+
+  if (!pass.Draw().ok()) {
+    return false;
+  }
+
+  /// Write depth.
+
+  options.depth_write_enabled = true;
+  options.primitive_type = PrimitiveType::kTriangleStrip;
+  Rect cover_area;
+  switch (clip_op) {
+    case Entity::ClipOperation::kIntersect:
+      pass.SetCommandLabel("Intersect Clip");
+      options.stencil_mode =
+          ContentContextOptions::StencilMode::kCoverCompareInverted;
+      cover_area = Rect::MakeSize(pass.GetRenderTargetSize());
+      break;
+    case Entity::ClipOperation::kDifference:
+      pass.SetCommandLabel("Difference Clip");
+      options.stencil_mode = ContentContextOptions::StencilMode::kCoverCompare;
+      std::optional<Rect> maybe_cover_area =
+          geometry.GetCoverage(entity.GetTransform());
+      if (!maybe_cover_area.has_value()) {
+        return true;
+      }
+      cover_area = maybe_cover_area.value();
+      break;
+  }
+  auto points = cover_area.GetPoints();
+  auto vertices =
+      VertexBufferBuilder<VS::PerVertexData>{}
+          .AddVertices({{points[0]}, {points[1]}, {points[2]}, {points[3]}})
+          .CreateVertexBuffer(renderer.GetTransientsBuffer());
+  pass.SetVertexBuffer(std::move(vertices));
+
+  pass.SetPipeline(renderer.GetClipPipeline(options));
+
+  info.mvp = pass.GetOrthographicTransform();
+  VS::BindFrameInfo(pass, renderer.GetTransientsBuffer().EmplaceUniform(info));
 
-  Command cmd;
+  return pass.Draw().ok();
+}
+
+bool ClipContents::RenderStencilClip(const ContentContext& renderer,
+                                     const Entity& entity,
+                                     RenderPass& pass,
+                                     Entity::ClipOperation clip_op,
+                                     const Geometry& geometry) const {
+  using VS = ClipPipeline::VertexShader;
 
-  FS::FragInfo frag_info;
-  // The color really doesn't matter.
-  frag_info.color = Color::SkyBlue();
-  FS::BindFragInfo(cmd, pass.GetTransientsBuffer().EmplaceUniform(frag_info));
+  VS::FrameInfo info;
+  info.depth = GetShaderClipDepth(entity);
 
-  auto options = OptionsFromPassAndEntity(pass, entity);
-  cmd.stencil_reference = entity.GetStencilDepth();
-  options.stencil_compare = CompareFunction::kEqual;
-  options.stencil_operation = StencilOperation::kIncrementClamp;
+  auto options = OptionsFromPass(pass);
+  options.blend_mode = BlendMode::kDestination;
+  pass.SetStencilReference(entity.GetClipDepth());
 
-  if (clip_op_ == Entity::ClipOperation::kDifference) {
+  if (clip_op == Entity::ClipOperation::kDifference) {
     {
-      cmd.label = "Difference Clip (Increment)";
+      pass.SetCommandLabel("Difference Clip (Increment)");
 
-      auto points = Rect(Size(pass.GetRenderTargetSize())).GetPoints();
+      options.stencil_mode =
+          ContentContextOptions::StencilMode::kLegacyClipIncrement;
+
+      auto points = Rect::MakeSize(pass.GetRenderTargetSize()).GetPoints();
       auto vertices =
           VertexBufferBuilder<VS::PerVertexData>{}
               .AddVertices({{points[0]}, {points[1]}, {points[2]}, {points[3]}})
-              .CreateVertexBuffer(pass.GetTransientsBuffer());
-      cmd.BindVertices(vertices);
+              .CreateVertexBuffer(renderer.GetTransientsBuffer());
+
+      pass.SetVertexBuffer(std::move(vertices));
 
-      info.mvp = Matrix::MakeOrthographic(pass.GetRenderTargetSize());
-      VS::BindVertInfo(cmd, pass.GetTransientsBuffer().EmplaceUniform(info));
+      info.mvp = pass.GetOrthographicTransform();
+      VS::BindFrameInfo(pass,
+                        renderer.GetTransientsBuffer().EmplaceUniform(info));
 
       options.primitive_type = PrimitiveType::kTriangleStrip;
-      cmd.pipeline = renderer.GetClipPipeline(options);
-      pass.AddCommand(cmd);
+      pass.SetPipeline(renderer.GetClipPipeline(options));
+      pass.Draw();
     }
 
     {
-      cmd.label = "Difference Clip (Punch)";
+      pass.SetCommandLabel("Difference Clip (Punch)");
+      pass.SetStencilReference(entity.GetClipDepth() + 1);
 
-      cmd.stencil_reference = entity.GetStencilDepth() + 1;
-      options.stencil_compare = CompareFunction::kEqual;
-      options.stencil_operation = StencilOperation::kDecrementClamp;
+      options.stencil_mode =
+          ContentContextOptions::StencilMode::kLegacyClipDecrement;
     }
   } else {
-    cmd.label = "Intersect Clip";
-    options.stencil_compare = CompareFunction::kEqual;
-    options.stencil_operation = StencilOperation::kIncrementClamp;
+    pass.SetCommandLabel("Intersect Clip");
+
+    options.stencil_mode =
+        ContentContextOptions::StencilMode::kLegacyClipIncrement;
   }
 
-  auto geometry_result = geometry_->GetPositionBuffer(renderer, entity, pass);
+  auto geometry_result = geometry.GetPositionBuffer(renderer, entity, pass);
   options.primitive_type = geometry_result.type;
-  cmd.pipeline = renderer.GetClipPipeline(options);
+  pass.SetPipeline(renderer.GetClipPipeline(options));
 
-  auto allocator = renderer.GetContext()->GetResourceAllocator();
-  cmd.BindVertices(geometry_result.vertex_buffer);
+  pass.SetVertexBuffer(std::move(geometry_result.vertex_buffer));
 
   info.mvp = geometry_result.transform;
-  VS::BindVertInfo(cmd, pass.GetTransientsBuffer().EmplaceUniform(info));
+  VS::BindFrameInfo(pass, renderer.GetTransientsBuffer().EmplaceUniform(info));
 
-  pass.AddCommand(std::move(cmd));
-  return true;
+  return pass.Draw().ok();
+}
+
+bool ClipContents::Render(const ContentContext& renderer,
+                          const Entity& entity,
+                          RenderPass& pass) const {
+  if (!geometry_) {
+    return true;
+  }
+  if constexpr (ContentContext::kEnableStencilThenCover) {
+    return RenderDepthClip(renderer, entity, pass, clip_op_, *geometry_);
+  } else {
+    return RenderStencilClip(renderer, entity, pass, clip_op_, *geometry_);
+  }
 }
 
 /*******************************************************************************
@@ -154,37 +263,42 @@ std::optional<Rect> ClipRestoreContents::GetCoverage(
   return std::nullopt;
 };
 
-Contents::StencilCoverage ClipRestoreContents::GetStencilCoverage(
+Contents::ClipCoverage ClipRestoreContents::GetClipCoverage(
     const Entity& entity,
-    const std::optional<Rect>& current_stencil_coverage) const {
-  return {.type = StencilCoverage::Type::kRestore, .coverage = std::nullopt};
+    const std::optional<Rect>& current_clip_coverage) const {
+  return {.type = ClipCoverage::Type::kRestore, .coverage = std::nullopt};
 }
 
 bool ClipRestoreContents::ShouldRender(
     const Entity& entity,
-    const std::optional<Rect>& stencil_coverage) const {
+    const std::optional<Rect> clip_coverage) const {
   return true;
 }
 
+bool ClipRestoreContents::CanInheritOpacity(const Entity& entity) const {
+  return true;
+}
+
+void ClipRestoreContents::SetInheritedOpacity(Scalar opacity) {}
+
 bool ClipRestoreContents::Render(const ContentContext& renderer,
                                  const Entity& entity,
                                  RenderPass& pass) const {
   using VS = ClipPipeline::VertexShader;
-  using FS = ClipPipeline::FragmentShader;
 
-  Command cmd;
-  cmd.label = "Restore Clip";
-  auto options = OptionsFromPassAndEntity(pass, entity);
-  options.stencil_compare = CompareFunction::kLess;
-  options.stencil_operation = StencilOperation::kSetToReferenceValue;
+  pass.SetCommandLabel("Restore Clip");
+  auto options = OptionsFromPass(pass);
+  options.blend_mode = BlendMode::kDestination;
+  options.stencil_mode = ContentContextOptions::StencilMode::kLegacyClipRestore;
   options.primitive_type = PrimitiveType::kTriangleStrip;
-  cmd.pipeline = renderer.GetClipPipeline(options);
-  cmd.stencil_reference = entity.GetStencilDepth();
+  pass.SetPipeline(renderer.GetClipPipeline(options));
+  pass.SetStencilReference(entity.GetClipDepth());
 
   // Create a rect that covers either the given restore area, or the whole
   // render target texture.
-  auto ltrb = restore_coverage_.value_or(Rect(Size(pass.GetRenderTargetSize())))
-                  .GetLTRB();
+  auto ltrb =
+      restore_coverage_.value_or(Rect::MakeSize(pass.GetRenderTargetSize()))
+          .GetLTRB();
   VertexBufferBuilder<VS::PerVertexData> vtx_builder;
   vtx_builder.AddVertices({
       {Point(ltrb[0], ltrb[1])},
@@ -192,19 +306,15 @@ bool ClipRestoreContents::Render(const ContentContext& renderer,
       {Point(ltrb[0], ltrb[3])},
       {Point(ltrb[2], ltrb[3])},
   });
-  cmd.BindVertices(vtx_builder.CreateVertexBuffer(pass.GetTransientsBuffer()));
-
-  VS::VertInfo info;
-  info.mvp = Matrix::MakeOrthographic(pass.GetRenderTargetSize());
-  VS::BindVertInfo(cmd, pass.GetTransientsBuffer().EmplaceUniform(info));
+  pass.SetVertexBuffer(
+      vtx_builder.CreateVertexBuffer(renderer.GetTransientsBuffer()));
 
-  FS::FragInfo frag_info;
-  // The color really doesn't matter.
-  frag_info.color = Color::SkyBlue();
-  FS::BindFragInfo(cmd, pass.GetTransientsBuffer().EmplaceUniform(frag_info));
+  VS::FrameInfo info;
+  info.depth = GetShaderClipDepth(entity);
+  info.mvp = pass.GetOrthographicTransform();
+  VS::BindFrameInfo(pass, renderer.GetTransientsBuffer().EmplaceUniform(info));
 
-  pass.AddCommand(std::move(cmd));
-  return true;
+  return pass.Draw().ok();
 }
 
-};  // namespace impeller
+}  // namespace impeller
diff --git a/impeller/entity/contents/clip_contents.h b/impeller/entity/contents/clip_contents.h
index 86606d2f59db7dffee77cd1eb4d3e74873137f1f..8d7f162217cffc5e04d60e4790e0a66b89b6285c 100644
--- a/impeller/entity/contents/clip_contents.h
+++ b/impeller/entity/contents/clip_contents.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_CLIP_CONTENTS_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_CLIP_CONTENTS_H_
 
 #include <functional>
 #include <memory>
@@ -11,7 +12,7 @@
 #include "flutter/fml/macros.h"
 #include "impeller/entity/contents/contents.h"
 #include "impeller/entity/entity.h"
-#include "impeller/entity/geometry.h"
+#include "impeller/entity/geometry/geometry.h"
 
 namespace impeller {
 
@@ -21,7 +22,7 @@ class ClipContents final : public Contents {
 
   ~ClipContents();
 
-  void SetGeometry(std::unique_ptr<Geometry> geometry);
+  void SetGeometry(const std::shared_ptr<Geometry>& geometry);
 
   void SetClipOperation(Entity::ClipOperation clip_op);
 
@@ -29,24 +30,42 @@ class ClipContents final : public Contents {
   std::optional<Rect> GetCoverage(const Entity& entity) const override;
 
   // |Contents|
-  StencilCoverage GetStencilCoverage(
+  ClipCoverage GetClipCoverage(
       const Entity& entity,
-      const std::optional<Rect>& current_stencil_coverage) const override;
+      const std::optional<Rect>& current_clip_coverage) const override;
 
   // |Contents|
   bool ShouldRender(const Entity& entity,
-                    const std::optional<Rect>& stencil_coverage) const override;
+                    const std::optional<Rect> clip_coverage) const override;
 
   // |Contents|
   bool Render(const ContentContext& renderer,
               const Entity& entity,
               RenderPass& pass) const override;
+  // |Contents|
+  bool CanInheritOpacity(const Entity& entity) const override;
+
+  // |Contents|
+  void SetInheritedOpacity(Scalar opacity) override;
 
  private:
-  std::unique_ptr<Geometry> geometry_;
+  bool RenderDepthClip(const ContentContext& renderer,
+                       const Entity& entity,
+                       RenderPass& pass,
+                       Entity::ClipOperation clip_op,
+                       const Geometry& geometry) const;
+  bool RenderStencilClip(const ContentContext& renderer,
+                         const Entity& entity,
+                         RenderPass& pass,
+                         Entity::ClipOperation clip_op,
+                         const Geometry& geometry) const;
+
+  std::shared_ptr<Geometry> geometry_;
   Entity::ClipOperation clip_op_ = Entity::ClipOperation::kIntersect;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(ClipContents);
+  ClipContents(const ClipContents&) = delete;
+
+  ClipContents& operator=(const ClipContents&) = delete;
 };
 
 class ClipRestoreContents final : public Contents {
@@ -58,30 +77,40 @@ class ClipRestoreContents final : public Contents {
   /// @brief  The area on the pass texture where this clip restore will be
   ///         applied. If unset, the entire pass texture will be restored.
   ///
-  /// @note   This rectangle is not transformed by the entity's transformation.
+  /// @note   This rectangle is not transformed by the entity's transform.
   void SetRestoreCoverage(std::optional<Rect> coverage);
 
   // |Contents|
   std::optional<Rect> GetCoverage(const Entity& entity) const override;
 
   // |Contents|
-  StencilCoverage GetStencilCoverage(
+  ClipCoverage GetClipCoverage(
       const Entity& entity,
-      const std::optional<Rect>& current_stencil_coverage) const override;
+      const std::optional<Rect>& current_clip_coverage) const override;
 
   // |Contents|
   bool ShouldRender(const Entity& entity,
-                    const std::optional<Rect>& stencil_coverage) const override;
+                    const std::optional<Rect> clip_coverage) const override;
 
   // |Contents|
   bool Render(const ContentContext& renderer,
               const Entity& entity,
               RenderPass& pass) const override;
 
+  // |Contents|
+  bool CanInheritOpacity(const Entity& entity) const override;
+
+  // |Contents|
+  void SetInheritedOpacity(Scalar opacity) override;
+
  private:
   std::optional<Rect> restore_coverage_;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(ClipRestoreContents);
+  ClipRestoreContents(const ClipRestoreContents&) = delete;
+
+  ClipRestoreContents& operator=(const ClipRestoreContents&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_CLIP_CONTENTS_H_
diff --git a/impeller/entity/contents/color_source_contents.cc b/impeller/entity/contents/color_source_contents.cc
index 37e079d8785bbe51602b1697d31baffeebf4f94e..18bc16608a037c79929446bd6cd1a088f21a4be2 100644
--- a/impeller/entity/contents/color_source_contents.cc
+++ b/impeller/entity/contents/color_source_contents.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "color_source_contents.h"
+#include "impeller/entity/contents/color_source_contents.h"
 
 #include "impeller/entity/entity.h"
 #include "impeller/geometry/matrix.h"
@@ -13,42 +13,45 @@ ColorSourceContents::ColorSourceContents() = default;
 
 ColorSourceContents::~ColorSourceContents() = default;
 
-void ColorSourceContents::SetGeometry(std::unique_ptr<Geometry> geometry) {
+void ColorSourceContents::SetGeometry(std::shared_ptr<Geometry> geometry) {
   geometry_ = std::move(geometry);
 }
 
-const std::unique_ptr<Geometry>& ColorSourceContents::GetGeometry() const {
+const std::shared_ptr<Geometry>& ColorSourceContents::GetGeometry() const {
   return geometry_;
 }
 
-void ColorSourceContents::SetAlpha(Scalar alpha) {
-  alpha_ = alpha;
+void ColorSourceContents::SetOpacityFactor(Scalar alpha) {
+  opacity_ = alpha;
 }
 
-Scalar ColorSourceContents::GetAlpha() const {
-  return alpha_;
+Scalar ColorSourceContents::GetOpacityFactor() const {
+  return opacity_ * inherited_opacity_;
 }
 
-void ColorSourceContents::SetMatrix(Matrix matrix) {
+void ColorSourceContents::SetEffectTransform(Matrix matrix) {
   inverse_matrix_ = matrix.Invert();
 }
 
-const Matrix& ColorSourceContents::GetInverseMatrix() const {
+const Matrix& ColorSourceContents::GetInverseEffectTransform() const {
   return inverse_matrix_;
 }
 
+bool ColorSourceContents::IsSolidColor() const {
+  return false;
+}
+
 std::optional<Rect> ColorSourceContents::GetCoverage(
     const Entity& entity) const {
-  return geometry_->GetCoverage(entity.GetTransformation());
+  return geometry_->GetCoverage(entity.GetTransform());
 };
 
-bool ColorSourceContents::ShouldRender(
-    const Entity& entity,
-    const std::optional<Rect>& stencil_coverage) const {
-  if (!stencil_coverage.has_value()) {
-    return false;
-  }
-  return Contents::ShouldRender(entity, stencil_coverage);
+bool ColorSourceContents::CanInheritOpacity(const Entity& entity) const {
+  return true;
+}
+
+void ColorSourceContents::SetInheritedOpacity(Scalar opacity) {
+  inherited_opacity_ = opacity;
 }
 
 }  // namespace impeller
diff --git a/impeller/entity/contents/color_source_contents.h b/impeller/entity/contents/color_source_contents.h
index f5289192b1d8932e1f1d869889315e0cefc0a4d1..2c1e104562e654a5afeca25ce0b36612e9617e8f 100644
--- a/impeller/entity/contents/color_source_contents.h
+++ b/impeller/entity/contents/color_source_contents.h
@@ -2,48 +2,258 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_COLOR_SOURCE_CONTENTS_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_COLOR_SOURCE_CONTENTS_H_
 
-#include "flutter/fml/macros.h"
+#include "fml/logging.h"
+#include "impeller/entity/contents/clip_contents.h"
+#include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/contents/contents.h"
-#include "impeller/entity/geometry.h"
+#include "impeller/entity/geometry/geometry.h"
+#include "impeller/entity/geometry/rect_geometry.h"
 #include "impeller/geometry/matrix.h"
-#include "impeller/geometry/path.h"
 
 namespace impeller {
 
+//------------------------------------------------------------------------------
+/// Color sources are geometry-ignostic `Contents` capable of shading any area
+/// defined by an `impeller::Geometry`. Conceptually,
+/// `impeller::ColorSourceContents` implement a particular color shading
+/// behavior.
+///
+/// This separation of concerns between geometry and color source output allows
+/// Impeller to handle most possible draw combinations in a consistent way.
+/// For example: There are color sources for handling solid colors, gradients,
+/// textures, custom runtime effects, and even 3D scenes.
+///
+/// There are some special rendering exceptions that deviate from this pattern
+/// and cross geometry and color source concerns, such as text atlas and image
+/// atlas rendering. Special `Contents` exist for rendering these behaviors
+/// which don't implement `ColorSourceContents`.
+///
+/// @see  `impeller::Geometry`
+///
 class ColorSourceContents : public Contents {
  public:
   ColorSourceContents();
 
   ~ColorSourceContents() override;
 
-  void SetGeometry(std::unique_ptr<Geometry> geometry);
+  //----------------------------------------------------------------------------
+  /// @brief  Set the geometry that this contents will use to render.
+  ///
+  void SetGeometry(std::shared_ptr<Geometry> geometry);
 
-  void SetMatrix(Matrix matrix);
+  //----------------------------------------------------------------------------
+  /// @brief  Get the geometry that this contents will use to render.
+  ///
+  const std::shared_ptr<Geometry>& GetGeometry() const;
 
-  void SetAlpha(Scalar alpha);
+  //----------------------------------------------------------------------------
+  /// @brief  Set the effect transform for this color source.
+  ///
+  ///         The effect transform is a transform matrix that is applied to
+  ///         the shaded color output and does not impact geometry in any way.
+  ///
+  ///         For example: With repeat tiling, any gradient or
+  ///         `TiledTextureContents` could be used with an effect transform to
+  ///         inexpensively draw an infinite scrolling background pattern.
+  ///
+  void SetEffectTransform(Matrix matrix);
+
+  //----------------------------------------------------------------------------
+  /// @brief   Set the inverted effect transform for this color source.
+  ///
+  ///          When the effect transform is set via `SetEffectTransform`, the
+  ///          value is inverted upon storage. The reason for this is that most
+  ///          color sources internally use the inverted transform.
+  ///
+  /// @return  The inverse of the transform set by `SetEffectTransform`.
+  ///
+  /// @see     `SetEffectTransform`
+  ///
+  const Matrix& GetInverseEffectTransform() const;
+
+  //----------------------------------------------------------------------------
+  /// @brief  Set the opacity factor for this color source.
+  ///
+  void SetOpacityFactor(Scalar opacity);
+
+  //----------------------------------------------------------------------------
+  /// @brief  Get the opacity factor for this color source.
+  ///
+  ///         This value is is factored into the output of the color source in
+  ///         addition to opacity information that may be supplied any other
+  ///         inputs.
+  ///
+  /// @note   If set, the output of this method factors factors in the inherited
+  ///         opacity of this `Contents`.
+  ///
+  /// @see    `Contents::CanInheritOpacity`
+  ///
+  Scalar GetOpacityFactor() const;
+
+  virtual bool IsSolidColor() const;
 
   // |Contents|
   std::optional<Rect> GetCoverage(const Entity& entity) const override;
 
   // |Contents|
-  bool ShouldRender(const Entity& entity,
-                    const std::optional<Rect>& stencil_coverage) const override;
+  bool CanInheritOpacity(const Entity& entity) const override;
+
+  // |Contents|
+  void SetInheritedOpacity(Scalar opacity) override;
 
  protected:
-  const std::unique_ptr<Geometry>& GetGeometry() const;
+  using BindFragmentCallback = std::function<bool(RenderPass& pass)>;
+  using PipelineBuilderMethod = std::shared_ptr<Pipeline<PipelineDescriptor>> (
+      impeller::ContentContext::*)(ContentContextOptions) const;
+  using PipelineBuilderCallback =
+      std::function<std::shared_ptr<Pipeline<PipelineDescriptor>>(
+          ContentContextOptions)>;
+
+  template <typename VertexShaderT>
+  bool DrawGeometry(const ContentContext& renderer,
+                    const Entity& entity,
+                    RenderPass& pass,
+                    const PipelineBuilderCallback& pipeline_callback,
+                    typename VertexShaderT::FrameInfo frame_info,
+                    const BindFragmentCallback& bind_fragment_callback,
+                    bool enable_uvs = false,
+                    Rect texture_coverage = {},
+                    const Matrix& effect_transform = {}) const {
+    auto options = OptionsFromPassAndEntity(pass, entity);
+
+    GeometryResult::Mode geometry_mode = GetGeometry()->GetResultMode();
+    Geometry& geometry = *GetGeometry();
+
+    const bool is_stencil_then_cover =
+        geometry_mode == GeometryResult::Mode::kNonZero ||
+        geometry_mode == GeometryResult::Mode::kEvenOdd;
+    if (is_stencil_then_cover) {
+      pass.SetStencilReference(0);
+
+      /// Stencil preparation draw.
+
+      GeometryResult stencil_geometry_result =
+          GetGeometry()->GetPositionBuffer(renderer, entity, pass);
+      if (stencil_geometry_result.vertex_buffer.vertex_count == 0u) {
+        return true;
+      }
+      pass.SetVertexBuffer(std::move(stencil_geometry_result.vertex_buffer));
+      options.primitive_type = stencil_geometry_result.type;
+
+      options.blend_mode = BlendMode::kDestination;
+      switch (stencil_geometry_result.mode) {
+        case GeometryResult::Mode::kNonZero:
+          pass.SetCommandLabel("Stencil preparation (NonZero)");
+          options.stencil_mode =
+              ContentContextOptions::StencilMode::kStencilNonZeroFill;
+          break;
+        case GeometryResult::Mode::kEvenOdd:
+          pass.SetCommandLabel("Stencil preparation (EvenOdd)");
+          options.stencil_mode =
+              ContentContextOptions::StencilMode::kStencilEvenOddFill;
+          break;
+        default:
+          FML_UNREACHABLE();
+      }
+      pass.SetPipeline(renderer.GetClipPipeline(options));
+      ClipPipeline::VertexShader::FrameInfo clip_frame_info;
+      clip_frame_info.depth = entity.GetShaderClipDepth();
+      clip_frame_info.mvp = stencil_geometry_result.transform;
+      ClipPipeline::VertexShader::BindFrameInfo(
+          pass, renderer.GetTransientsBuffer().EmplaceUniform(clip_frame_info));
 
-  const Matrix& GetInverseMatrix() const;
+      if (!pass.Draw().ok()) {
+        return false;
+      }
 
-  Scalar GetAlpha() const;
+      /// Cover draw.
+
+      options.blend_mode = entity.GetBlendMode();
+      options.stencil_mode = ContentContextOptions::StencilMode::kCoverCompare;
+      std::optional<Rect> maybe_cover_area = GetGeometry()->GetCoverage({});
+      if (!maybe_cover_area.has_value()) {
+        return true;
+      }
+      geometry = RectGeometry(maybe_cover_area.value());
+    }
+
+    GeometryResult geometry_result =
+        enable_uvs
+            ? geometry.GetPositionUVBuffer(texture_coverage, effect_transform,
+                                           renderer, entity, pass)
+            : geometry.GetPositionBuffer(renderer, entity, pass);
+    if (geometry_result.vertex_buffer.vertex_count == 0u) {
+      return true;
+    }
+    pass.SetVertexBuffer(std::move(geometry_result.vertex_buffer));
+    options.primitive_type = geometry_result.type;
+
+    // Take the pre-populated vertex shader uniform struct and set managed
+    // values.
+    frame_info.mvp = geometry_result.transform;
+
+    // If overdraw prevention is enabled (like when drawing stroke paths), we
+    // increment the stencil buffer as we draw, preventing overlapping fragments
+    // from drawing. Afterwards, we need to append another draw call to clean up
+    // the stencil buffer (happens below in this method).
+    if (geometry_result.mode == GeometryResult::Mode::kPreventOverdraw) {
+      options.stencil_mode =
+          ContentContextOptions::StencilMode::kLegacyClipIncrement;
+    }
+    if constexpr (ContentContext::kEnableStencilThenCover) {
+      pass.SetStencilReference(0);
+    } else {
+      pass.SetStencilReference(entity.GetClipDepth());
+    }
+
+    VertexShaderT::BindFrameInfo(
+        pass, renderer.GetTransientsBuffer().EmplaceUniform(frame_info));
+
+    // The reason we need to have a callback mechanism here is that this routine
+    // may insert draw calls before the main draw call below. For example, for
+    // sufficiently complex paths we may opt to use stencil-then-cover to avoid
+    // tessellation.
+    if (!bind_fragment_callback(pass)) {
+      return false;
+    }
+
+    pass.SetPipeline(pipeline_callback(options));
+
+    if (!pass.Draw().ok()) {
+      return false;
+    }
+
+    // If we performed overdraw prevention, a subsection of the clip heightmap
+    // was incremented by 1 in order to self-clip. So simply append a clip
+    // restore to clean it up.
+    if (geometry_result.mode == GeometryResult::Mode::kPreventOverdraw) {
+      auto restore = ClipRestoreContents();
+      restore.SetRestoreCoverage(GetCoverage(entity));
+      if constexpr (ContentContext::kEnableStencilThenCover) {
+        Entity restore_entity = entity.Clone();
+        restore_entity.SetClipDepth(0);
+        return restore.Render(renderer, restore_entity, pass);
+      } else {
+        return restore.Render(renderer, entity, pass);
+      }
+    }
+    return true;
+  }
 
  private:
-  std::unique_ptr<Geometry> geometry_;
+  std::shared_ptr<Geometry> geometry_;
   Matrix inverse_matrix_;
-  Scalar alpha_ = 1.0;
+  Scalar opacity_ = 1.0;
+  Scalar inherited_opacity_ = 1.0;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(ColorSourceContents);
+  ColorSourceContents(const ColorSourceContents&) = delete;
+
+  ColorSourceContents& operator=(const ColorSourceContents&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_COLOR_SOURCE_CONTENTS_H_
diff --git a/impeller/entity/contents/conical_gradient_contents.cc b/impeller/entity/contents/conical_gradient_contents.cc
new file mode 100644
index 0000000000000000000000000000000000000000..9a053a92605714e7891ddac79b72edb995c87b23
--- /dev/null
+++ b/impeller/entity/contents/conical_gradient_contents.cc
@@ -0,0 +1,178 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "conical_gradient_contents.h"
+
+#include "impeller/entity/contents/clip_contents.h"
+#include "impeller/entity/contents/content_context.h"
+#include "impeller/entity/contents/gradient_generator.h"
+#include "impeller/entity/entity.h"
+#include "impeller/entity/geometry/geometry.h"
+#include "impeller/geometry/gradient.h"
+#include "impeller/renderer/render_pass.h"
+
+namespace impeller {
+
+ConicalGradientContents::ConicalGradientContents() = default;
+
+ConicalGradientContents::~ConicalGradientContents() = default;
+
+void ConicalGradientContents::SetCenterAndRadius(Point center, Scalar radius) {
+  center_ = center;
+  radius_ = radius;
+}
+
+void ConicalGradientContents::SetTileMode(Entity::TileMode tile_mode) {
+  tile_mode_ = tile_mode;
+}
+
+void ConicalGradientContents::SetColors(std::vector<Color> colors) {
+  colors_ = std::move(colors);
+}
+
+void ConicalGradientContents::SetStops(std::vector<Scalar> stops) {
+  stops_ = std::move(stops);
+}
+
+const std::vector<Color>& ConicalGradientContents::GetColors() const {
+  return colors_;
+}
+
+const std::vector<Scalar>& ConicalGradientContents::GetStops() const {
+  return stops_;
+}
+
+void ConicalGradientContents::SetFocus(std::optional<Point> focus,
+                                       Scalar radius) {
+  focus_ = focus;
+  focus_radius_ = radius;
+}
+
+bool ConicalGradientContents::Render(const ContentContext& renderer,
+                                     const Entity& entity,
+                                     RenderPass& pass) const {
+  if (renderer.GetDeviceCapabilities().SupportsSSBO()) {
+    return RenderSSBO(renderer, entity, pass);
+  }
+  return RenderTexture(renderer, entity, pass);
+}
+
+bool ConicalGradientContents::RenderSSBO(const ContentContext& renderer,
+                                         const Entity& entity,
+                                         RenderPass& pass) const {
+  using VS = ConicalGradientSSBOFillPipeline::VertexShader;
+  using FS = ConicalGradientSSBOFillPipeline::FragmentShader;
+
+  VS::FrameInfo frame_info;
+  frame_info.matrix = GetInverseEffectTransform();
+
+  PipelineBuilderCallback pipeline_callback =
+      [&renderer](ContentContextOptions options) {
+        return renderer.GetConicalGradientSSBOFillPipeline(options);
+      };
+  return ColorSourceContents::DrawGeometry<VS>(
+      renderer, entity, pass, pipeline_callback, frame_info,
+      [this, &renderer](RenderPass& pass) {
+        FS::FragInfo frag_info;
+        frag_info.center = center_;
+        frag_info.radius = radius_;
+        frag_info.tile_mode = static_cast<Scalar>(tile_mode_);
+        frag_info.decal_border_color = decal_border_color_;
+        frag_info.alpha = GetOpacityFactor();
+        if (focus_) {
+          frag_info.focus = focus_.value();
+          frag_info.focus_radius = focus_radius_;
+        } else {
+          frag_info.focus = center_;
+          frag_info.focus_radius = 0.0;
+        }
+
+        auto& host_buffer = renderer.GetTransientsBuffer();
+        auto colors = CreateGradientColors(colors_, stops_);
+
+        frag_info.colors_length = colors.size();
+        auto color_buffer =
+            host_buffer.Emplace(colors.data(), colors.size() * sizeof(StopData),
+                                DefaultUniformAlignment());
+
+        FS::BindFragInfo(
+            pass, renderer.GetTransientsBuffer().EmplaceUniform(frag_info));
+        FS::BindColorData(pass, color_buffer);
+
+        pass.SetCommandLabel("ConicalGradientSSBOFill");
+        return true;
+      });
+}
+
+bool ConicalGradientContents::RenderTexture(const ContentContext& renderer,
+                                            const Entity& entity,
+                                            RenderPass& pass) const {
+  using VS = ConicalGradientFillPipeline::VertexShader;
+  using FS = ConicalGradientFillPipeline::FragmentShader;
+
+  auto gradient_data = CreateGradientBuffer(colors_, stops_);
+  auto gradient_texture =
+      CreateGradientTexture(gradient_data, renderer.GetContext());
+  if (gradient_texture == nullptr) {
+    return false;
+  }
+
+  auto geometry_result =
+      GetGeometry()->GetPositionBuffer(renderer, entity, pass);
+
+  VS::FrameInfo frame_info;
+  frame_info.matrix = GetInverseEffectTransform();
+
+  PipelineBuilderCallback pipeline_callback =
+      [&renderer](ContentContextOptions options) {
+        return renderer.GetConicalGradientFillPipeline(options);
+      };
+  return ColorSourceContents::DrawGeometry<VS>(
+      renderer, entity, pass, pipeline_callback, frame_info,
+      [this, &renderer, &gradient_texture](RenderPass& pass) {
+        FS::FragInfo frag_info;
+        frag_info.center = center_;
+        frag_info.radius = radius_;
+        frag_info.tile_mode = static_cast<Scalar>(tile_mode_);
+        frag_info.decal_border_color = decal_border_color_;
+        frag_info.texture_sampler_y_coord_scale =
+            gradient_texture->GetYCoordScale();
+        frag_info.alpha = GetOpacityFactor();
+        frag_info.half_texel =
+            Vector2(0.5 / gradient_texture->GetSize().width,
+                    0.5 / gradient_texture->GetSize().height);
+        if (focus_) {
+          frag_info.focus = focus_.value();
+          frag_info.focus_radius = focus_radius_;
+        } else {
+          frag_info.focus = center_;
+          frag_info.focus_radius = 0.0;
+        }
+
+        pass.SetCommandLabel("ConicalGradientFill");
+
+        FS::BindFragInfo(
+            pass, renderer.GetTransientsBuffer().EmplaceUniform(frag_info));
+        SamplerDescriptor sampler_desc;
+        sampler_desc.min_filter = MinMagFilter::kLinear;
+        sampler_desc.mag_filter = MinMagFilter::kLinear;
+        FS::BindTextureSampler(
+            pass, gradient_texture,
+            renderer.GetContext()->GetSamplerLibrary()->GetSampler(
+                sampler_desc));
+
+        return true;
+      });
+}
+
+bool ConicalGradientContents::ApplyColorFilter(
+    const ColorFilterProc& color_filter_proc) {
+  for (Color& color : colors_) {
+    color = color_filter_proc(color);
+  }
+  decal_border_color_ = color_filter_proc(decal_border_color_);
+  return true;
+}
+
+}  // namespace impeller
diff --git a/impeller/entity/contents/conical_gradient_contents.h b/impeller/entity/contents/conical_gradient_contents.h
new file mode 100644
index 0000000000000000000000000000000000000000..db3b86b98e630c8acd1a06fa221c6b21e2b75cdd
--- /dev/null
+++ b/impeller/entity/contents/conical_gradient_contents.h
@@ -0,0 +1,75 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_CONICAL_GRADIENT_CONTENTS_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_CONICAL_GRADIENT_CONTENTS_H_
+
+#include <functional>
+#include <memory>
+#include <vector>
+
+#include "flutter/fml/macros.h"
+#include "impeller/entity/contents/color_source_contents.h"
+#include "impeller/entity/entity.h"
+#include "impeller/geometry/color.h"
+#include "impeller/geometry/gradient.h"
+#include "impeller/geometry/path.h"
+#include "impeller/geometry/point.h"
+
+namespace impeller {
+
+class ConicalGradientContents final : public ColorSourceContents {
+ public:
+  ConicalGradientContents();
+
+  ~ConicalGradientContents() override;
+
+  // |Contents|
+  bool Render(const ContentContext& renderer,
+              const Entity& entity,
+              RenderPass& pass) const override;
+
+  // |Contents|
+  [[nodiscard]] bool ApplyColorFilter(
+      const ColorFilterProc& color_filter_proc) override;
+
+  void SetCenterAndRadius(Point center, Scalar radius);
+
+  void SetColors(std::vector<Color> colors);
+
+  void SetStops(std::vector<Scalar> stops);
+
+  const std::vector<Color>& GetColors() const;
+
+  const std::vector<Scalar>& GetStops() const;
+
+  void SetTileMode(Entity::TileMode tile_mode);
+
+  void SetFocus(std::optional<Point> focus, Scalar radius);
+
+ private:
+  bool RenderTexture(const ContentContext& renderer,
+                     const Entity& entity,
+                     RenderPass& pass) const;
+
+  bool RenderSSBO(const ContentContext& renderer,
+                  const Entity& entity,
+                  RenderPass& pass) const;
+  Point center_;
+  Scalar radius_ = 0.0f;
+  std::vector<Color> colors_;
+  std::vector<Scalar> stops_;
+  Entity::TileMode tile_mode_;
+  Color decal_border_color_ = Color::BlackTransparent();
+  std::optional<Point> focus_;
+  Scalar focus_radius_ = 0.0f;
+
+  ConicalGradientContents(const ConicalGradientContents&) = delete;
+
+  ConicalGradientContents& operator=(const ConicalGradientContents&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_CONICAL_GRADIENT_CONTENTS_H_
diff --git a/impeller/entity/contents/content_context.cc b/impeller/entity/contents/content_context.cc
index 31479224b292604f93b1ecf3cfbe6860cddb2b4d..f500d1b75c14c895b06deda66d545c53fe0bb993 100644
--- a/impeller/entity/contents/content_context.cc
+++ b/impeller/entity/contents/content_context.cc
@@ -4,14 +4,23 @@
 
 #include "impeller/entity/contents/content_context.h"
 
-#include <sstream>
+#include <memory>
+#include <utility>
 
+#include "fml/trace_event.h"
+#include "impeller/base/strings.h"
+#include "impeller/base/validation.h"
+#include "impeller/core/formats.h"
+#include "impeller/entity/contents/framebuffer_blend_contents.h"
 #include "impeller/entity/entity.h"
+#include "impeller/entity/render_target_cache.h"
 #include "impeller/renderer/command_buffer.h"
-#include "impeller/renderer/formats.h"
-#include "impeller/renderer/render_pass.h"
+#include "impeller/renderer/pipeline_descriptor.h"
+#include "impeller/renderer/pipeline_library.h"
 #include "impeller/renderer/render_target.h"
+#include "impeller/renderer/texture_mipmap.h"
 #include "impeller/tessellator/tessellator.h"
+#include "impeller/typographer/typographer_context.h"
 
 namespace impeller {
 
@@ -27,17 +36,28 @@ void ContentContextOptions::ApplyToPipelineDescriptor(
   desc.SetSampleCount(sample_count);
 
   ColorAttachmentDescriptor color0 = *desc.GetColorAttachmentDescriptor(0u);
+  color0.format = color_attachment_pixel_format;
   color0.alpha_blend_op = BlendOperation::kAdd;
   color0.color_blend_op = BlendOperation::kAdd;
 
   switch (pipeline_blend) {
     case BlendMode::kClear:
-      color0.dst_alpha_blend_factor = BlendFactor::kZero;
-      color0.dst_color_blend_factor = BlendFactor::kZero;
-      color0.src_alpha_blend_factor = BlendFactor::kZero;
-      color0.src_color_blend_factor = BlendFactor::kZero;
+      if (is_for_rrect_blur_clear) {
+        color0.alpha_blend_op = BlendOperation::kReverseSubtract;
+        color0.color_blend_op = BlendOperation::kReverseSubtract;
+        color0.dst_alpha_blend_factor = BlendFactor::kOne;
+        color0.dst_color_blend_factor = BlendFactor::kOne;
+        color0.src_alpha_blend_factor = BlendFactor::kDestinationColor;
+        color0.src_color_blend_factor = BlendFactor::kDestinationColor;
+      } else {
+        color0.dst_alpha_blend_factor = BlendFactor::kZero;
+        color0.dst_color_blend_factor = BlendFactor::kZero;
+        color0.src_alpha_blend_factor = BlendFactor::kZero;
+        color0.src_color_blend_factor = BlendFactor::kZero;
+      }
       break;
     case BlendMode::kSource:
+      color0.blending_enabled = false;
       color0.dst_alpha_blend_factor = BlendFactor::kZero;
       color0.dst_color_blend_factor = BlendFactor::kZero;
       color0.src_alpha_blend_factor = BlendFactor::kOne;
@@ -120,15 +140,92 @@ void ContentContextOptions::ApplyToPipelineDescriptor(
   }
   desc.SetColorAttachmentDescriptor(0u, color0);
 
-  if (desc.GetFrontStencilAttachmentDescriptor().has_value()) {
-    StencilAttachmentDescriptor stencil =
-        desc.GetFrontStencilAttachmentDescriptor().value();
-    stencil.stencil_compare = stencil_compare;
-    stencil.depth_stencil_pass = stencil_operation;
-    desc.SetStencilAttachmentDescriptors(stencil);
+  if (!has_depth_stencil_attachments) {
+    desc.ClearDepthAttachment();
+    desc.ClearStencilAttachments();
+  }
+
+  auto maybe_stencil = desc.GetFrontStencilAttachmentDescriptor();
+  auto maybe_depth = desc.GetDepthStencilAttachmentDescriptor();
+  FML_DCHECK(has_depth_stencil_attachments == maybe_depth.has_value())
+      << "Depth attachment doesn't match expected pipeline state. "
+         "has_depth_stencil_attachments="
+      << has_depth_stencil_attachments;
+  FML_DCHECK(has_depth_stencil_attachments == maybe_stencil.has_value())
+      << "Stencil attachment doesn't match expected pipeline state. "
+         "has_depth_stencil_attachments="
+      << has_depth_stencil_attachments;
+  if (maybe_stencil.has_value()) {
+    StencilAttachmentDescriptor front_stencil = maybe_stencil.value();
+    StencilAttachmentDescriptor back_stencil = front_stencil;
+
+    switch (stencil_mode) {
+      case StencilMode::kIgnore:
+        front_stencil.stencil_compare = CompareFunction::kAlways;
+        front_stencil.depth_stencil_pass = StencilOperation::kKeep;
+        desc.SetStencilAttachmentDescriptors(front_stencil);
+        break;
+      case StencilMode::kStencilNonZeroFill:
+        // The stencil ref should be 0 on commands that use this mode.
+        front_stencil.stencil_compare = CompareFunction::kAlways;
+        front_stencil.depth_stencil_pass = StencilOperation::kIncrementWrap;
+        back_stencil.stencil_compare = CompareFunction::kAlways;
+        back_stencil.depth_stencil_pass = StencilOperation::kDecrementWrap;
+        desc.SetStencilAttachmentDescriptors(front_stencil, back_stencil);
+        break;
+      case StencilMode::kStencilEvenOddFill:
+        // The stencil ref should be 0 on commands that use this mode.
+        front_stencil.stencil_compare = CompareFunction::kEqual;
+        front_stencil.depth_stencil_pass = StencilOperation::kIncrementWrap;
+        front_stencil.stencil_failure = StencilOperation::kDecrementWrap;
+        desc.SetStencilAttachmentDescriptors(front_stencil);
+        break;
+      case StencilMode::kCoverCompare:
+        // The stencil ref should be 0 on commands that use this mode.
+        front_stencil.stencil_compare = CompareFunction::kNotEqual;
+        front_stencil.depth_stencil_pass =
+            StencilOperation::kSetToReferenceValue;
+        desc.SetStencilAttachmentDescriptors(front_stencil);
+        break;
+      case StencilMode::kCoverCompareInverted:
+        // The stencil ref should be 0 on commands that use this mode.
+        front_stencil.stencil_compare = CompareFunction::kEqual;
+        front_stencil.stencil_failure = StencilOperation::kSetToReferenceValue;
+        desc.SetStencilAttachmentDescriptors(front_stencil);
+        break;
+      case StencilMode::kLegacyClipRestore:
+        front_stencil.stencil_compare = CompareFunction::kLess;
+        front_stencil.depth_stencil_pass =
+            StencilOperation::kSetToReferenceValue;
+        desc.SetStencilAttachmentDescriptors(front_stencil);
+        break;
+      case StencilMode::kLegacyClipIncrement:
+        front_stencil.stencil_compare = CompareFunction::kEqual;
+        front_stencil.depth_stencil_pass = StencilOperation::kIncrementClamp;
+        desc.SetStencilAttachmentDescriptors(front_stencil);
+        break;
+      case StencilMode::kLegacyClipDecrement:
+        front_stencil.stencil_compare = CompareFunction::kEqual;
+        front_stencil.depth_stencil_pass = StencilOperation::kDecrementClamp;
+        desc.SetStencilAttachmentDescriptors(front_stencil);
+        break;
+      case StencilMode::kLegacyClipCompare:
+        front_stencil.stencil_compare = CompareFunction::kEqual;
+        front_stencil.depth_stencil_pass = StencilOperation::kKeep;
+        desc.SetStencilAttachmentDescriptors(front_stencil);
+        break;
+    }
+  }
+  if (maybe_depth.has_value()) {
+    DepthAttachmentDescriptor depth = maybe_depth.value();
+    depth.depth_write_enabled = depth_write_enabled;
+    depth.depth_compare = depth_compare;
+    desc.SetDepthStencilAttachmentDescriptor(depth);
   }
 
   desc.SetPrimitiveType(primitive_type);
+
+  desc.SetPolygonMode(wireframe ? PolygonMode::kLine : PolygonMode::kFill);
 }
 
 template <typename PipelineT>
@@ -139,116 +236,237 @@ static std::unique_ptr<PipelineT> CreateDefaultPipeline(
     return nullptr;
   }
   // Apply default ContentContextOptions to the descriptor.
-  ContentContextOptions{}.ApplyToPipelineDescriptor(*desc);
+  const auto default_color_format =
+      context.GetCapabilities()->GetDefaultColorFormat();
+  ContentContextOptions{.sample_count = SampleCount::kCount4,
+                        .primitive_type = PrimitiveType::kTriangleStrip,
+                        .color_attachment_pixel_format = default_color_format}
+      .ApplyToPipelineDescriptor(*desc);
   return std::make_unique<PipelineT>(context, desc);
 }
 
-ContentContext::ContentContext(std::shared_ptr<Context> context)
+ContentContext::ContentContext(
+    std::shared_ptr<Context> context,
+    std::shared_ptr<TypographerContext> typographer_context,
+    std::shared_ptr<RenderTargetAllocator> render_target_allocator)
     : context_(std::move(context)),
+      lazy_glyph_atlas_(
+          std::make_shared<LazyGlyphAtlas>(std::move(typographer_context))),
       tessellator_(std::make_shared<Tessellator>()),
-      glyph_atlas_context_(std::make_shared<GlyphAtlasContext>()) {
+#if IMPELLER_ENABLE_3D
+      scene_context_(std::make_shared<scene::SceneContext>(context_)),
+#endif  // IMPELLER_ENABLE_3D
+      render_target_cache_(render_target_allocator == nullptr
+                               ? std::make_shared<RenderTargetCache>(
+                                     context_->GetResourceAllocator())
+                               : std::move(render_target_allocator)),
+      host_buffer_(HostBuffer::Create(context_->GetResourceAllocator())),
+      pending_command_buffers_(std::make_unique<PendingCommandBuffers>()) {
   if (!context_ || !context_->IsValid()) {
     return;
   }
 
-  solid_fill_pipelines_[{}] =
-      CreateDefaultPipeline<SolidFillPipeline>(*context_);
-  linear_gradient_fill_pipelines_[{}] =
-      CreateDefaultPipeline<LinearGradientFillPipeline>(*context_);
-  radial_gradient_fill_pipelines_[{}] =
-      CreateDefaultPipeline<RadialGradientFillPipeline>(*context_);
-  if (context_->GetBackendFeatures().ssbo_support) {
-    linear_gradient_ssbo_fill_pipelines_[{}] =
-        CreateDefaultPipeline<LinearGradientSSBOFillPipeline>(*context_);
-    radial_gradient_ssbo_fill_pipelines_[{}] =
-        CreateDefaultPipeline<RadialGradientSSBOFillPipeline>(*context_);
-    sweep_gradient_ssbo_fill_pipelines_[{}] =
-        CreateDefaultPipeline<SweepGradientSSBOFillPipeline>(*context_);
-  }
-  sweep_gradient_fill_pipelines_[{}] =
-      CreateDefaultPipeline<SweepGradientFillPipeline>(*context_);
-  rrect_blur_pipelines_[{}] =
-      CreateDefaultPipeline<RRectBlurPipeline>(*context_);
-  texture_blend_pipelines_[{}] =
-      CreateDefaultPipeline<BlendPipeline>(*context_);
-  blend_color_pipelines_[{}] =
-      CreateDefaultPipeline<BlendColorPipeline>(*context_);
-  blend_colorburn_pipelines_[{}] =
-      CreateDefaultPipeline<BlendColorBurnPipeline>(*context_);
-  blend_colordodge_pipelines_[{}] =
-      CreateDefaultPipeline<BlendColorDodgePipeline>(*context_);
-  blend_darken_pipelines_[{}] =
-      CreateDefaultPipeline<BlendDarkenPipeline>(*context_);
-  blend_difference_pipelines_[{}] =
-      CreateDefaultPipeline<BlendDifferencePipeline>(*context_);
-  blend_exclusion_pipelines_[{}] =
-      CreateDefaultPipeline<BlendExclusionPipeline>(*context_);
-  blend_hardlight_pipelines_[{}] =
-      CreateDefaultPipeline<BlendHardLightPipeline>(*context_);
-  blend_hue_pipelines_[{}] = CreateDefaultPipeline<BlendHuePipeline>(*context_);
-  blend_lighten_pipelines_[{}] =
-      CreateDefaultPipeline<BlendLightenPipeline>(*context_);
-  blend_luminosity_pipelines_[{}] =
-      CreateDefaultPipeline<BlendLuminosityPipeline>(*context_);
-  blend_multiply_pipelines_[{}] =
-      CreateDefaultPipeline<BlendMultiplyPipeline>(*context_);
-  blend_overlay_pipelines_[{}] =
-      CreateDefaultPipeline<BlendOverlayPipeline>(*context_);
-  blend_saturation_pipelines_[{}] =
-      CreateDefaultPipeline<BlendSaturationPipeline>(*context_);
-  blend_screen_pipelines_[{}] =
-      CreateDefaultPipeline<BlendScreenPipeline>(*context_);
-  blend_softlight_pipelines_[{}] =
-      CreateDefaultPipeline<BlendSoftLightPipeline>(*context_);
-  texture_pipelines_[{}] = CreateDefaultPipeline<TexturePipeline>(*context_);
-  tiled_texture_pipelines_[{}] =
-      CreateDefaultPipeline<TiledTexturePipeline>(*context_);
-  gaussian_blur_pipelines_[{}] =
-      CreateDefaultPipeline<GaussianBlurPipeline>(*context_);
-  gaussian_blur_decal_pipelines_[{}] =
-      CreateDefaultPipeline<GaussianBlurDecalPipeline>(*context_);
-  border_mask_blur_pipelines_[{}] =
-      CreateDefaultPipeline<BorderMaskBlurPipeline>(*context_);
-  morphology_filter_pipelines_[{}] =
-      CreateDefaultPipeline<MorphologyFilterPipeline>(*context_);
-  color_matrix_color_filter_pipelines_[{}] =
-      CreateDefaultPipeline<ColorMatrixColorFilterPipeline>(*context_);
-  linear_to_srgb_filter_pipelines_[{}] =
-      CreateDefaultPipeline<LinearToSrgbFilterPipeline>(*context_);
-  srgb_to_linear_filter_pipelines_[{}] =
-      CreateDefaultPipeline<SrgbToLinearFilterPipeline>(*context_);
-  glyph_atlas_pipelines_[{}] =
-      CreateDefaultPipeline<GlyphAtlasPipeline>(*context_);
-  glyph_atlas_sdf_pipelines_[{}] =
-      CreateDefaultPipeline<GlyphAtlasSdfPipeline>(*context_);
-  geometry_color_pipelines_[{}] =
-      CreateDefaultPipeline<GeometryColorPipeline>(*context_);
-  geometry_position_pipelines_[{}] =
-      CreateDefaultPipeline<GeometryPositionPipeline>(*context_);
-  atlas_pipelines_[{}] = CreateDefaultPipeline<AtlasPipeline>(*context_);
-  yuv_to_rgb_filter_pipelines_[{}] =
-      CreateDefaultPipeline<YUVToRGBFilterPipeline>(*context_);
-
-  if (solid_fill_pipelines_[{}]->GetDescriptor().has_value()) {
-    auto clip_pipeline_descriptor =
-        solid_fill_pipelines_[{}]->GetDescriptor().value();
-    clip_pipeline_descriptor.SetLabel("Clip Pipeline");
-    // Disable write to all color attachments.
-    auto color_attachments =
-        clip_pipeline_descriptor.GetColorAttachmentDescriptors();
-    for (auto& color_attachment : color_attachments) {
-      color_attachment.second.write_mask =
-          static_cast<uint64_t>(ColorWriteMask::kNone);
-    }
-    clip_pipeline_descriptor.SetColorAttachmentDescriptors(
-        std::move(color_attachments));
-    clip_pipelines_[{}] =
-        std::make_unique<ClipPipeline>(*context_, clip_pipeline_descriptor);
+  auto options = ContentContextOptions{
+      .sample_count = SampleCount::kCount4,
+      .color_attachment_pixel_format =
+          context_->GetCapabilities()->GetDefaultColorFormat()};
+  auto options_trianglestrip = ContentContextOptions{
+      .sample_count = SampleCount::kCount4,
+      .primitive_type = PrimitiveType::kTriangleStrip,
+      .color_attachment_pixel_format =
+          context_->GetCapabilities()->GetDefaultColorFormat()};
+  const auto supports_decal = static_cast<Scalar>(
+      context_->GetCapabilities()->SupportsDecalSamplerAddressMode());
+
+#ifdef IMPELLER_DEBUG
+  checkerboard_pipelines_.CreateDefault(*context_, options);
+#endif  // IMPELLER_DEBUG
+
+  solid_fill_pipelines_.CreateDefault(*context_, options);
+
+  if (context_->GetCapabilities()->SupportsSSBO()) {
+    linear_gradient_ssbo_fill_pipelines_.CreateDefault(*context_, options);
+    radial_gradient_ssbo_fill_pipelines_.CreateDefault(*context_, options);
+    conical_gradient_ssbo_fill_pipelines_.CreateDefault(*context_, options);
+    sweep_gradient_ssbo_fill_pipelines_.CreateDefault(*context_, options);
   } else {
+    linear_gradient_fill_pipelines_.CreateDefault(*context_, options);
+    radial_gradient_fill_pipelines_.CreateDefault(*context_, options);
+    conical_gradient_fill_pipelines_.CreateDefault(*context_, options);
+    sweep_gradient_fill_pipelines_.CreateDefault(*context_, options);
+  }
+
+  if (context_->GetCapabilities()->SupportsFramebufferFetch()) {
+    framebuffer_blend_color_pipelines_.CreateDefault(
+        *context_, options_trianglestrip,
+        {static_cast<Scalar>(BlendSelectValues::kColor), supports_decal});
+    framebuffer_blend_colorburn_pipelines_.CreateDefault(
+        *context_, options_trianglestrip,
+        {static_cast<Scalar>(BlendSelectValues::kColorBurn), supports_decal});
+    framebuffer_blend_colordodge_pipelines_.CreateDefault(
+        *context_, options_trianglestrip,
+        {static_cast<Scalar>(BlendSelectValues::kColorDodge), supports_decal});
+    framebuffer_blend_darken_pipelines_.CreateDefault(
+        *context_, options_trianglestrip,
+        {static_cast<Scalar>(BlendSelectValues::kDarken), supports_decal});
+    framebuffer_blend_difference_pipelines_.CreateDefault(
+        *context_, options_trianglestrip,
+        {static_cast<Scalar>(BlendSelectValues::kDifference), supports_decal});
+    framebuffer_blend_exclusion_pipelines_.CreateDefault(
+        *context_, options_trianglestrip,
+        {static_cast<Scalar>(BlendSelectValues::kExclusion), supports_decal});
+    framebuffer_blend_hardlight_pipelines_.CreateDefault(
+        *context_, options_trianglestrip,
+        {static_cast<Scalar>(BlendSelectValues::kHardLight), supports_decal});
+    framebuffer_blend_hue_pipelines_.CreateDefault(
+        *context_, options_trianglestrip,
+        {static_cast<Scalar>(BlendSelectValues::kHue), supports_decal});
+    framebuffer_blend_lighten_pipelines_.CreateDefault(
+        *context_, options_trianglestrip,
+        {static_cast<Scalar>(BlendSelectValues::kLighten), supports_decal});
+    framebuffer_blend_luminosity_pipelines_.CreateDefault(
+        *context_, options_trianglestrip,
+        {static_cast<Scalar>(BlendSelectValues::kLuminosity), supports_decal});
+    framebuffer_blend_multiply_pipelines_.CreateDefault(
+        *context_, options_trianglestrip,
+        {static_cast<Scalar>(BlendSelectValues::kMultiply), supports_decal});
+    framebuffer_blend_overlay_pipelines_.CreateDefault(
+        *context_, options_trianglestrip,
+        {static_cast<Scalar>(BlendSelectValues::kOverlay), supports_decal});
+    framebuffer_blend_saturation_pipelines_.CreateDefault(
+        *context_, options_trianglestrip,
+        {static_cast<Scalar>(BlendSelectValues::kSaturation), supports_decal});
+    framebuffer_blend_screen_pipelines_.CreateDefault(
+        *context_, options_trianglestrip,
+        {static_cast<Scalar>(BlendSelectValues::kScreen), supports_decal});
+    framebuffer_blend_softlight_pipelines_.CreateDefault(
+        *context_, options_trianglestrip,
+        {static_cast<Scalar>(BlendSelectValues::kSoftLight), supports_decal});
+  }
+
+  blend_color_pipelines_.CreateDefault(
+      *context_, options_trianglestrip,
+      {static_cast<Scalar>(BlendSelectValues::kColor), supports_decal});
+  blend_colorburn_pipelines_.CreateDefault(
+      *context_, options_trianglestrip,
+      {static_cast<Scalar>(BlendSelectValues::kColorBurn), supports_decal});
+  blend_colordodge_pipelines_.CreateDefault(
+      *context_, options_trianglestrip,
+      {static_cast<Scalar>(BlendSelectValues::kColorDodge), supports_decal});
+  blend_darken_pipelines_.CreateDefault(
+      *context_, options_trianglestrip,
+      {static_cast<Scalar>(BlendSelectValues::kDarken), supports_decal});
+  blend_difference_pipelines_.CreateDefault(
+      *context_, options_trianglestrip,
+      {static_cast<Scalar>(BlendSelectValues::kDifference), supports_decal});
+  blend_exclusion_pipelines_.CreateDefault(
+      *context_, options_trianglestrip,
+      {static_cast<Scalar>(BlendSelectValues::kExclusion), supports_decal});
+  blend_hardlight_pipelines_.CreateDefault(
+      *context_, options_trianglestrip,
+      {static_cast<Scalar>(BlendSelectValues::kHardLight), supports_decal});
+  blend_hue_pipelines_.CreateDefault(
+      *context_, options_trianglestrip,
+      {static_cast<Scalar>(BlendSelectValues::kHue), supports_decal});
+  blend_lighten_pipelines_.CreateDefault(
+      *context_, options_trianglestrip,
+      {static_cast<Scalar>(BlendSelectValues::kLighten), supports_decal});
+  blend_luminosity_pipelines_.CreateDefault(
+      *context_, options_trianglestrip,
+      {static_cast<Scalar>(BlendSelectValues::kLuminosity), supports_decal});
+  blend_multiply_pipelines_.CreateDefault(
+      *context_, options_trianglestrip,
+      {static_cast<Scalar>(BlendSelectValues::kMultiply), supports_decal});
+  blend_overlay_pipelines_.CreateDefault(
+      *context_, options_trianglestrip,
+      {static_cast<Scalar>(BlendSelectValues::kOverlay), supports_decal});
+  blend_saturation_pipelines_.CreateDefault(
+      *context_, options_trianglestrip,
+      {static_cast<Scalar>(BlendSelectValues::kSaturation), supports_decal});
+  blend_screen_pipelines_.CreateDefault(
+      *context_, options_trianglestrip,
+      {static_cast<Scalar>(BlendSelectValues::kScreen), supports_decal});
+  blend_softlight_pipelines_.CreateDefault(
+      *context_, options_trianglestrip,
+      {static_cast<Scalar>(BlendSelectValues::kSoftLight), supports_decal});
+
+  rrect_blur_pipelines_.CreateDefault(*context_, options_trianglestrip);
+  texture_blend_pipelines_.CreateDefault(*context_, options);
+  texture_pipelines_.CreateDefault(*context_, options);
+  texture_strict_src_pipelines_.CreateDefault(*context_, options);
+  position_uv_pipelines_.CreateDefault(*context_, options);
+  tiled_texture_pipelines_.CreateDefault(*context_, options);
+  gaussian_blur_noalpha_decal_pipelines_.CreateDefault(*context_,
+                                                       options_trianglestrip);
+  gaussian_blur_noalpha_nodecal_pipelines_.CreateDefault(*context_,
+                                                         options_trianglestrip);
+  kernel_decal_pipelines_.CreateDefault(*context_, options_trianglestrip);
+  kernel_nodecal_pipelines_.CreateDefault(*context_, options_trianglestrip);
+  border_mask_blur_pipelines_.CreateDefault(*context_, options_trianglestrip);
+  morphology_filter_pipelines_.CreateDefault(*context_, options_trianglestrip,
+                                             {supports_decal});
+  color_matrix_color_filter_pipelines_.CreateDefault(*context_,
+                                                     options_trianglestrip);
+  linear_to_srgb_filter_pipelines_.CreateDefault(*context_,
+                                                 options_trianglestrip);
+  srgb_to_linear_filter_pipelines_.CreateDefault(*context_,
+                                                 options_trianglestrip);
+  glyph_atlas_pipelines_.CreateDefault(
+      *context_, options,
+      {static_cast<Scalar>(
+          GetContext()->GetCapabilities()->GetDefaultGlyphAtlasFormat() ==
+          PixelFormat::kA8UNormInt)});
+  glyph_atlas_color_pipelines_.CreateDefault(*context_, options);
+  geometry_color_pipelines_.CreateDefault(*context_, options);
+  yuv_to_rgb_filter_pipelines_.CreateDefault(*context_, options_trianglestrip);
+  porter_duff_blend_pipelines_.CreateDefault(*context_, options_trianglestrip,
+                                             {supports_decal});
+  // GLES only shader that is unsupported on macOS.
+#if defined(IMPELLER_ENABLE_OPENGLES) && !defined(FML_OS_MACOSX)
+  if (GetContext()->GetBackendType() == Context::BackendType::kOpenGLES) {
+    texture_external_pipelines_.CreateDefault(*context_, options);
+  }
+  if (GetContext()->GetBackendType() == Context::BackendType::kOpenGLES) {
+    tiled_texture_external_pipelines_.CreateDefault(*context_, options);
+  }
+#endif  // IMPELLER_ENABLE_OPENGLES
+  if (context_->GetCapabilities()->SupportsCompute()) {
+    auto pipeline_desc =
+        PointsComputeShaderPipeline::MakeDefaultPipelineDescriptor(*context_);
+    point_field_compute_pipelines_ =
+        context_->GetPipelineLibrary()->GetPipeline(pipeline_desc).Get();
+
+    auto uv_pipeline_desc =
+        UvComputeShaderPipeline::MakeDefaultPipelineDescriptor(*context_);
+    uv_compute_pipelines_ =
+        context_->GetPipelineLibrary()->GetPipeline(uv_pipeline_desc).Get();
+  }
+
+  /// Setup default clip pipeline.
+
+  auto clip_pipeline_descriptor =
+      ClipPipeline::Builder::MakeDefaultPipelineDescriptor(*context_);
+  if (!clip_pipeline_descriptor.has_value()) {
     return;
   }
+  ContentContextOptions{
+      .sample_count = SampleCount::kCount4,
+      .color_attachment_pixel_format =
+          context_->GetCapabilities()->GetDefaultColorFormat()}
+      .ApplyToPipelineDescriptor(*clip_pipeline_descriptor);
+  // Disable write to all color attachments.
+  auto clip_color_attachments =
+      clip_pipeline_descriptor->GetColorAttachmentDescriptors();
+  for (auto& color_attachment : clip_color_attachments) {
+    color_attachment.second.write_mask = ColorWriteMaskBits::kNone;
+  }
+  clip_pipeline_descriptor->SetColorAttachmentDescriptors(
+      std::move(clip_color_attachments));
+  clip_pipelines_.SetDefault(options, std::make_unique<ClipPipeline>(
+                                          *context_, clip_pipeline_descriptor));
 
   is_valid_ = true;
+  InitializeCommonlyUsedShadersIfNeeded();
 }
 
 ContentContext::~ContentContext() = default;
@@ -257,64 +475,190 @@ bool ContentContext::IsValid() const {
   return is_valid_;
 }
 
-std::shared_ptr<Texture> ContentContext::MakeSubpass(
+fml::StatusOr<RenderTarget> ContentContext::MakeSubpass(
+    const std::string& label,
     ISize texture_size,
-    const SubpassCallback& subpass_callback) const {
-  auto context = GetContext();
-
+    const SubpassCallback& subpass_callback,
+    bool msaa_enabled,
+    bool depth_stencil_enabled,
+    int32_t mip_count) const {
+  const std::shared_ptr<Context>& context = GetContext();
   RenderTarget subpass_target;
-  if (context->SupportsOffscreenMSAA()) {
-    subpass_target = RenderTarget::CreateOffscreenMSAA(*context, texture_size);
+
+  std::optional<RenderTarget::AttachmentConfig> depth_stencil_config =
+      depth_stencil_enabled ? RenderTarget::kDefaultStencilAttachmentConfig
+                            : std::optional<RenderTarget::AttachmentConfig>();
+
+  if (context->GetCapabilities()->SupportsOffscreenMSAA() && msaa_enabled) {
+    subpass_target = GetRenderTargetCache()->CreateOffscreenMSAA(
+        *context, texture_size,
+        /*mip_count=*/mip_count, SPrintF("%s Offscreen", label.c_str()),
+        RenderTarget::kDefaultColorAttachmentConfigMSAA, depth_stencil_config);
   } else {
-    subpass_target = RenderTarget::CreateOffscreen(*context, texture_size);
+    subpass_target = GetRenderTargetCache()->CreateOffscreen(
+        *context, texture_size,
+        /*mip_count=*/mip_count, SPrintF("%s Offscreen", label.c_str()),
+        RenderTarget::kDefaultColorAttachmentConfig, depth_stencil_config);
   }
+  return MakeSubpass(label, subpass_target, subpass_callback);
+}
+
+fml::StatusOr<RenderTarget> ContentContext::MakeSubpass(
+    const std::string& label,
+    const RenderTarget& subpass_target,
+    const SubpassCallback& subpass_callback) const {
+  const std::shared_ptr<Context>& context = GetContext();
+
   auto subpass_texture = subpass_target.GetRenderTargetTexture();
   if (!subpass_texture) {
-    return nullptr;
+    return fml::Status(fml::StatusCode::kUnknown, "");
   }
 
   auto sub_command_buffer = context->CreateCommandBuffer();
-  sub_command_buffer->SetLabel("Offscreen Contents Command Buffer");
+  sub_command_buffer->SetLabel(SPrintF("%s CommandBuffer", label.c_str()));
   if (!sub_command_buffer) {
-    return nullptr;
+    return fml::Status(fml::StatusCode::kUnknown, "");
   }
 
   auto sub_renderpass = sub_command_buffer->CreateRenderPass(subpass_target);
   if (!sub_renderpass) {
-    return nullptr;
+    return fml::Status(fml::StatusCode::kUnknown, "");
   }
-  sub_renderpass->SetLabel("OffscreenContentsPass");
+  sub_renderpass->SetLabel(SPrintF("%s RenderPass", label.c_str()));
 
   if (!subpass_callback(*this, *sub_renderpass)) {
-    return nullptr;
+    return fml::Status(fml::StatusCode::kUnknown, "");
   }
 
   if (!sub_renderpass->EncodeCommands()) {
-    return nullptr;
+    return fml::Status(fml::StatusCode::kUnknown, "");
   }
 
-  if (!sub_command_buffer->SubmitCommands()) {
-    return nullptr;
+  const std::shared_ptr<Texture>& target_texture =
+      subpass_target.GetRenderTargetTexture();
+  if (target_texture->GetMipCount() > 1) {
+    fml::Status mipmap_status =
+        AddMipmapGeneration(sub_command_buffer, context, target_texture);
+    if (!mipmap_status.ok()) {
+      return mipmap_status;
+    }
+  }
+
+  if (!context->GetCommandQueue()->Submit({sub_command_buffer}).ok()) {
+    return fml::Status(fml::StatusCode::kUnknown, "");
   }
 
-  return subpass_texture;
+  return subpass_target;
 }
 
-std::shared_ptr<Tessellator> ContentContext::GetTessellator() const {
-  return tessellator_;
+#if IMPELLER_ENABLE_3D
+std::shared_ptr<scene::SceneContext> ContentContext::GetSceneContext() const {
+  return scene_context_;
 }
+#endif  // IMPELLER_ENABLE_3D
 
-std::shared_ptr<GlyphAtlasContext> ContentContext::GetGlyphAtlasContext()
-    const {
-  return glyph_atlas_context_;
+std::shared_ptr<Tessellator> ContentContext::GetTessellator() const {
+  return tessellator_;
 }
 
 std::shared_ptr<Context> ContentContext::GetContext() const {
   return context_;
 }
 
-const BackendFeatures& ContentContext::GetBackendFeatures() const {
-  return context_->GetBackendFeatures();
+const Capabilities& ContentContext::GetDeviceCapabilities() const {
+  return *context_->GetCapabilities();
+}
+
+void ContentContext::SetWireframe(bool wireframe) {
+  wireframe_ = wireframe;
+}
+
+std::shared_ptr<Pipeline<PipelineDescriptor>>
+ContentContext::GetCachedRuntimeEffectPipeline(
+    const std::string& unique_entrypoint_name,
+    const ContentContextOptions& options,
+    const std::function<std::shared_ptr<Pipeline<PipelineDescriptor>>()>&
+        create_callback) const {
+  RuntimeEffectPipelineKey key{unique_entrypoint_name, options};
+  auto it = runtime_effect_pipelines_.find(key);
+  if (it == runtime_effect_pipelines_.end()) {
+    it = runtime_effect_pipelines_.insert(it, {key, create_callback()});
+  }
+  return it->second;
+}
+
+void ContentContext::ClearCachedRuntimeEffectPipeline(
+    const std::string& unique_entrypoint_name) const {
+  for (auto it = runtime_effect_pipelines_.begin();
+       it != runtime_effect_pipelines_.end();) {
+    if (it->first.unique_entrypoint_name == unique_entrypoint_name) {
+      it = runtime_effect_pipelines_.erase(it);
+    } else {
+      it++;
+    }
+  }
+}
+
+void ContentContext::InitializeCommonlyUsedShadersIfNeeded() const {
+  TRACE_EVENT0("flutter", "InitializeCommonlyUsedShadersIfNeeded");
+  GetContext()->InitializeCommonlyUsedShadersIfNeeded();
+
+  if (GetContext()->GetBackendType() == Context::BackendType::kOpenGLES) {
+    // TODO(jonahwilliams): The OpenGL Embedder Unittests hang if this code
+    // runs.
+    return;
+  }
+
+  // Initialize commonly used shaders that aren't defaults. These settings were
+  // chosen based on the knowledge that we mix and match triangle and
+  // triangle-strip geometry, and also have fairly agressive srcOver to src
+  // blend mode conversions.
+  auto options = ContentContextOptions{
+      .sample_count = SampleCount::kCount4,
+      .color_attachment_pixel_format =
+          context_->GetCapabilities()->GetDefaultColorFormat()};
+
+  for (const auto mode : {BlendMode::kSource, BlendMode::kSourceOver}) {
+    for (const auto geometry :
+         {PrimitiveType::kTriangle, PrimitiveType::kTriangleStrip}) {
+      options.blend_mode = mode;
+      options.primitive_type = geometry;
+      CreateIfNeeded(solid_fill_pipelines_, options);
+      CreateIfNeeded(texture_pipelines_, options);
+      if (GetContext()->GetCapabilities()->SupportsSSBO()) {
+        CreateIfNeeded(linear_gradient_ssbo_fill_pipelines_, options);
+        CreateIfNeeded(radial_gradient_ssbo_fill_pipelines_, options);
+        CreateIfNeeded(sweep_gradient_ssbo_fill_pipelines_, options);
+        CreateIfNeeded(conical_gradient_ssbo_fill_pipelines_, options);
+      }
+    }
+  }
+
+  options.blend_mode = BlendMode::kDestination;
+  options.primitive_type = PrimitiveType::kTriangleStrip;
+  for (const auto stencil_mode :
+       {ContentContextOptions::StencilMode::kLegacyClipIncrement,
+        ContentContextOptions::StencilMode::kLegacyClipDecrement,
+        ContentContextOptions::StencilMode::kLegacyClipRestore}) {
+    options.stencil_mode = stencil_mode;
+    CreateIfNeeded(clip_pipelines_, options);
+  }
+
+  // On ARM devices, the initial usage of vkCmdCopyBufferToImage has been
+  // observed to take 10s of ms as an internal shader is compiled to perform
+  // the operation. Similarly, the initial render pass can also take 10s of ms
+  // for a similar reason. Because the context object is initialized far
+  // before the first frame, create a trivial texture and render pass to force
+  // the driver to compiler these shaders before the frame begins.
+  TextureDescriptor desc;
+  desc.size = {1, 1};
+  desc.storage_mode = StorageMode::kHostVisible;
+  desc.format = PixelFormat::kR8G8B8A8UNormInt;
+  auto texture = GetContext()->GetResourceAllocator()->CreateTexture(desc);
+  uint32_t color = 0;
+  if (!texture->SetContents(reinterpret_cast<uint8_t*>(&color), 4u)) {
+    VALIDATION_LOG << "Failed to set bootstrap texture.";
+  }
 }
 
 }  // namespace impeller
diff --git a/impeller/entity/contents/content_context.h b/impeller/entity/contents/content_context.h
index 5b4aaa5066e6bda8a3febafba055dc1afd2174b6..c1eed6ea2fadaf0bd9e47c82eb36781816c0b753 100644
--- a/impeller/entity/contents/content_context.h
+++ b/impeller/entity/contents/content_context.h
@@ -2,53 +2,54 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_CONTENT_CONTEXT_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_CONTENT_CONTEXT_H_
 
+#include <initializer_list>
 #include <memory>
+#include <optional>
 #include <unordered_map>
 
-#include "flutter/fml/hash_combine.h"
-#include "flutter/fml/macros.h"
-#include "fml/logging.h"
+#include "flutter/fml/build_config.h"
+#include "flutter/fml/logging.h"
+#include "flutter/fml/status_or.h"
 #include "impeller/base/validation.h"
-#include "impeller/entity/advanced_blend.vert.h"
-#include "impeller/entity/advanced_blend_color.frag.h"
-#include "impeller/entity/advanced_blend_colorburn.frag.h"
-#include "impeller/entity/advanced_blend_colordodge.frag.h"
-#include "impeller/entity/advanced_blend_darken.frag.h"
-#include "impeller/entity/advanced_blend_difference.frag.h"
-#include "impeller/entity/advanced_blend_exclusion.frag.h"
-#include "impeller/entity/advanced_blend_hardlight.frag.h"
-#include "impeller/entity/advanced_blend_hue.frag.h"
-#include "impeller/entity/advanced_blend_lighten.frag.h"
-#include "impeller/entity/advanced_blend_luminosity.frag.h"
-#include "impeller/entity/advanced_blend_multiply.frag.h"
-#include "impeller/entity/advanced_blend_overlay.frag.h"
-#include "impeller/entity/advanced_blend_saturation.frag.h"
-#include "impeller/entity/advanced_blend_screen.frag.h"
-#include "impeller/entity/advanced_blend_softlight.frag.h"
-#include "impeller/entity/atlas_fill.frag.h"
-#include "impeller/entity/atlas_fill.vert.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/host_buffer.h"
+#include "impeller/entity/entity.h"
+#include "impeller/renderer/capabilities.h"
+#include "impeller/renderer/command_buffer.h"
+#include "impeller/renderer/pipeline.h"
+#include "impeller/renderer/pipeline_descriptor.h"
+#include "impeller/renderer/render_target.h"
+#include "impeller/typographer/typographer_context.h"
+
+#ifdef IMPELLER_DEBUG
+#include "impeller/entity/checkerboard.frag.h"
+#include "impeller/entity/checkerboard.vert.h"
+#endif  // IMPELLER_DEBUG
+
 #include "impeller/entity/blend.frag.h"
 #include "impeller/entity/blend.vert.h"
 #include "impeller/entity/border_mask_blur.frag.h"
 #include "impeller/entity/border_mask_blur.vert.h"
+#include "impeller/entity/clip.frag.h"
+#include "impeller/entity/clip.vert.h"
 #include "impeller/entity/color_matrix_color_filter.frag.h"
 #include "impeller/entity/color_matrix_color_filter.vert.h"
-#include "impeller/entity/entity.h"
-#include "impeller/entity/gaussian_blur.frag.h"
-#include "impeller/entity/gaussian_blur.vert.h"
-#include "impeller/entity/gaussian_blur_decal.frag.h"
+#include "impeller/entity/conical_gradient_fill.frag.h"
 #include "impeller/entity/glyph_atlas.frag.h"
 #include "impeller/entity/glyph_atlas.vert.h"
-#include "impeller/entity/glyph_atlas_sdf.frag.h"
-#include "impeller/entity/glyph_atlas_sdf.vert.h"
+#include "impeller/entity/glyph_atlas_color.frag.h"
 #include "impeller/entity/gradient_fill.vert.h"
 #include "impeller/entity/linear_gradient_fill.frag.h"
 #include "impeller/entity/linear_to_srgb_filter.frag.h"
 #include "impeller/entity/linear_to_srgb_filter.vert.h"
 #include "impeller/entity/morphology_filter.frag.h"
 #include "impeller/entity/morphology_filter.vert.h"
+#include "impeller/entity/points.comp.h"
+#include "impeller/entity/porter_duff_blend.frag.h"
+#include "impeller/entity/porter_duff_blend.vert.h"
 #include "impeller/entity/radial_gradient_fill.frag.h"
 #include "impeller/entity/rrect_blur.frag.h"
 #include "impeller/entity/rrect_blur.vert.h"
@@ -59,96 +60,95 @@
 #include "impeller/entity/sweep_gradient_fill.frag.h"
 #include "impeller/entity/texture_fill.frag.h"
 #include "impeller/entity/texture_fill.vert.h"
+#include "impeller/entity/texture_fill_strict_src.frag.h"
 #include "impeller/entity/tiled_texture_fill.frag.h"
-#include "impeller/entity/tiled_texture_fill.vert.h"
+#include "impeller/entity/uv.comp.h"
 #include "impeller/entity/vertices.frag.h"
 #include "impeller/entity/yuv_to_rgb_filter.frag.h"
 #include "impeller/entity/yuv_to_rgb_filter.vert.h"
-#include "impeller/renderer/formats.h"
-#include "impeller/renderer/pipeline.h"
 
-#include "impeller/entity/position.vert.h"
+#include "impeller/entity/gaussian_blur.vert.h"
+#include "impeller/entity/gaussian_blur_noalpha_decal.frag.h"
+#include "impeller/entity/gaussian_blur_noalpha_nodecal.frag.h"
+#include "impeller/entity/kernel_decal.frag.h"
+#include "impeller/entity/kernel_nodecal.frag.h"
+
 #include "impeller/entity/position_color.vert.h"
-#include "impeller/entity/position_uv.vert.h"
 
 #include "impeller/typographer/glyph_atlas.h"
 
+#include "impeller/entity/conical_gradient_ssbo_fill.frag.h"
 #include "impeller/entity/linear_gradient_ssbo_fill.frag.h"
 #include "impeller/entity/radial_gradient_ssbo_fill.frag.h"
 #include "impeller/entity/sweep_gradient_ssbo_fill.frag.h"
 
+#include "impeller/entity/advanced_blend.frag.h"
+#include "impeller/entity/advanced_blend.vert.h"
+
+#include "impeller/entity/framebuffer_blend.frag.h"
+#include "impeller/entity/framebuffer_blend.vert.h"
+
+#ifdef IMPELLER_ENABLE_OPENGLES
+#include "impeller/entity/texture_fill_external.frag.h"
+#include "impeller/entity/tiled_texture_fill_external.frag.h"
+#endif  // IMPELLER_ENABLE_OPENGLES
+
+#if IMPELLER_ENABLE_3D
+#include "impeller/scene/scene_context.h"  // nogncheck
+#endif
+
 namespace impeller {
 
+#ifdef IMPELLER_DEBUG
+using CheckerboardPipeline =
+    RenderPipelineT<CheckerboardVertexShader, CheckerboardFragmentShader>;
+#endif  // IMPELLER_DEBUG
+
 using LinearGradientFillPipeline =
     RenderPipelineT<GradientFillVertexShader, LinearGradientFillFragmentShader>;
 using SolidFillPipeline =
     RenderPipelineT<SolidFillVertexShader, SolidFillFragmentShader>;
 using RadialGradientFillPipeline =
     RenderPipelineT<GradientFillVertexShader, RadialGradientFillFragmentShader>;
+using ConicalGradientFillPipeline =
+    RenderPipelineT<GradientFillVertexShader,
+                    ConicalGradientFillFragmentShader>;
 using SweepGradientFillPipeline =
     RenderPipelineT<GradientFillVertexShader, SweepGradientFillFragmentShader>;
 using LinearGradientSSBOFillPipeline =
     RenderPipelineT<GradientFillVertexShader,
                     LinearGradientSsboFillFragmentShader>;
+using ConicalGradientSSBOFillPipeline =
+    RenderPipelineT<GradientFillVertexShader,
+                    ConicalGradientSsboFillFragmentShader>;
 using RadialGradientSSBOFillPipeline =
     RenderPipelineT<GradientFillVertexShader,
                     RadialGradientSsboFillFragmentShader>;
 using SweepGradientSSBOFillPipeline =
     RenderPipelineT<GradientFillVertexShader,
                     SweepGradientSsboFillFragmentShader>;
-using BlendPipeline = RenderPipelineT<BlendVertexShader, BlendFragmentShader>;
 using RRectBlurPipeline =
     RenderPipelineT<RrectBlurVertexShader, RrectBlurFragmentShader>;
 using BlendPipeline = RenderPipelineT<BlendVertexShader, BlendFragmentShader>;
-using BlendColorPipeline = RenderPipelineT<AdvancedBlendVertexShader,
-                                           AdvancedBlendColorFragmentShader>;
-using BlendColorBurnPipeline =
-    RenderPipelineT<AdvancedBlendVertexShader,
-                    AdvancedBlendColorburnFragmentShader>;
-using BlendColorDodgePipeline =
-    RenderPipelineT<AdvancedBlendVertexShader,
-                    AdvancedBlendColordodgeFragmentShader>;
-using BlendDarkenPipeline = RenderPipelineT<AdvancedBlendVertexShader,
-                                            AdvancedBlendDarkenFragmentShader>;
-using BlendDifferencePipeline =
-    RenderPipelineT<AdvancedBlendVertexShader,
-                    AdvancedBlendDifferenceFragmentShader>;
-using BlendExclusionPipeline =
-    RenderPipelineT<AdvancedBlendVertexShader,
-                    AdvancedBlendExclusionFragmentShader>;
-using BlendHardLightPipeline =
-    RenderPipelineT<AdvancedBlendVertexShader,
-                    AdvancedBlendHardlightFragmentShader>;
-using BlendHuePipeline =
-    RenderPipelineT<AdvancedBlendVertexShader, AdvancedBlendHueFragmentShader>;
-using BlendLightenPipeline =
-    RenderPipelineT<AdvancedBlendVertexShader,
-                    AdvancedBlendLightenFragmentShader>;
-using BlendLuminosityPipeline =
-    RenderPipelineT<AdvancedBlendVertexShader,
-                    AdvancedBlendLuminosityFragmentShader>;
-using BlendMultiplyPipeline =
-    RenderPipelineT<AdvancedBlendVertexShader,
-                    AdvancedBlendMultiplyFragmentShader>;
-using BlendOverlayPipeline =
-    RenderPipelineT<AdvancedBlendVertexShader,
-                    AdvancedBlendOverlayFragmentShader>;
-using BlendSaturationPipeline =
-    RenderPipelineT<AdvancedBlendVertexShader,
-                    AdvancedBlendSaturationFragmentShader>;
-using BlendScreenPipeline = RenderPipelineT<AdvancedBlendVertexShader,
-                                            AdvancedBlendScreenFragmentShader>;
-using BlendSoftLightPipeline =
-    RenderPipelineT<AdvancedBlendVertexShader,
-                    AdvancedBlendSoftlightFragmentShader>;
 using TexturePipeline =
     RenderPipelineT<TextureFillVertexShader, TextureFillFragmentShader>;
-using TiledTexturePipeline = RenderPipelineT<TiledTextureFillVertexShader,
-                                             TiledTextureFillFragmentShader>;
-using GaussianBlurPipeline =
-    RenderPipelineT<GaussianBlurVertexShader, GaussianBlurFragmentShader>;
+using TextureStrictSrcPipeline =
+    RenderPipelineT<TextureFillVertexShader,
+                    TextureFillStrictSrcFragmentShader>;
+using PositionUVPipeline =
+    RenderPipelineT<TextureFillVertexShader, TiledTextureFillFragmentShader>;
+using TiledTexturePipeline =
+    RenderPipelineT<TextureFillVertexShader, TiledTextureFillFragmentShader>;
 using GaussianBlurDecalPipeline =
-    RenderPipelineT<GaussianBlurVertexShader, GaussianBlurDecalFragmentShader>;
+    RenderPipelineT<GaussianBlurVertexShader,
+                    GaussianBlurNoalphaDecalFragmentShader>;
+using GaussianBlurPipeline =
+    RenderPipelineT<GaussianBlurVertexShader,
+                    GaussianBlurNoalphaNodecalFragmentShader>;
+using KernelDecalPipeline =
+    RenderPipelineT<GaussianBlurVertexShader, KernelDecalFragmentShader>;
+using KernelPipeline =
+    RenderPipelineT<GaussianBlurVertexShader, KernelNodecalFragmentShader>;
 using BorderMaskBlurPipeline =
     RenderPipelineT<BorderMaskBlurVertexShader, BorderMaskBlurFragmentShader>;
 using MorphologyFilterPipeline =
@@ -165,33 +165,203 @@ using SrgbToLinearFilterPipeline =
                     SrgbToLinearFilterFragmentShader>;
 using GlyphAtlasPipeline =
     RenderPipelineT<GlyphAtlasVertexShader, GlyphAtlasFragmentShader>;
-using GlyphAtlasSdfPipeline =
-    RenderPipelineT<GlyphAtlasSdfVertexShader, GlyphAtlasSdfFragmentShader>;
-using AtlasPipeline =
-    RenderPipelineT<AtlasFillVertexShader, AtlasFillFragmentShader>;
+using GlyphAtlasColorPipeline =
+    RenderPipelineT<GlyphAtlasVertexShader, GlyphAtlasColorFragmentShader>;
+using PorterDuffBlendPipeline =
+    RenderPipelineT<PorterDuffBlendVertexShader, PorterDuffBlendFragmentShader>;
 // Instead of requiring new shaders for clips, the solid fill stages are used
 // to redirect writing to the stencil instead of color attachments.
-using ClipPipeline =
-    RenderPipelineT<SolidFillVertexShader, SolidFillFragmentShader>;
+using ClipPipeline = RenderPipelineT<ClipVertexShader, ClipFragmentShader>;
 
-using GeometryPositionPipeline =
-    RenderPipelineT<PositionVertexShader, VerticesFragmentShader>;
 using GeometryColorPipeline =
     RenderPipelineT<PositionColorVertexShader, VerticesFragmentShader>;
 using YUVToRGBFilterPipeline =
     RenderPipelineT<YuvToRgbFilterVertexShader, YuvToRgbFilterFragmentShader>;
 
+// Advanced blends
+using BlendColorPipeline =
+    RenderPipelineT<AdvancedBlendVertexShader, AdvancedBlendFragmentShader>;
+using BlendColorBurnPipeline =
+    RenderPipelineT<AdvancedBlendVertexShader, AdvancedBlendFragmentShader>;
+using BlendColorDodgePipeline =
+    RenderPipelineT<AdvancedBlendVertexShader, AdvancedBlendFragmentShader>;
+using BlendDarkenPipeline =
+    RenderPipelineT<AdvancedBlendVertexShader, AdvancedBlendFragmentShader>;
+using BlendDifferencePipeline =
+    RenderPipelineT<AdvancedBlendVertexShader, AdvancedBlendFragmentShader>;
+using BlendExclusionPipeline =
+    RenderPipelineT<AdvancedBlendVertexShader, AdvancedBlendFragmentShader>;
+using BlendHardLightPipeline =
+    RenderPipelineT<AdvancedBlendVertexShader, AdvancedBlendFragmentShader>;
+using BlendHuePipeline =
+    RenderPipelineT<AdvancedBlendVertexShader, AdvancedBlendFragmentShader>;
+using BlendLightenPipeline =
+    RenderPipelineT<AdvancedBlendVertexShader, AdvancedBlendFragmentShader>;
+using BlendLuminosityPipeline =
+    RenderPipelineT<AdvancedBlendVertexShader, AdvancedBlendFragmentShader>;
+using BlendMultiplyPipeline =
+    RenderPipelineT<AdvancedBlendVertexShader, AdvancedBlendFragmentShader>;
+using BlendOverlayPipeline =
+    RenderPipelineT<AdvancedBlendVertexShader, AdvancedBlendFragmentShader>;
+using BlendSaturationPipeline =
+    RenderPipelineT<AdvancedBlendVertexShader, AdvancedBlendFragmentShader>;
+using BlendScreenPipeline =
+    RenderPipelineT<AdvancedBlendVertexShader, AdvancedBlendFragmentShader>;
+using BlendSoftLightPipeline =
+    RenderPipelineT<AdvancedBlendVertexShader, AdvancedBlendFragmentShader>;
+// Framebuffer Advanced Blends
+using FramebufferBlendColorPipeline =
+    RenderPipelineT<FramebufferBlendVertexShader,
+                    FramebufferBlendFragmentShader>;
+using FramebufferBlendColorBurnPipeline =
+    RenderPipelineT<FramebufferBlendVertexShader,
+                    FramebufferBlendFragmentShader>;
+using FramebufferBlendColorDodgePipeline =
+    RenderPipelineT<FramebufferBlendVertexShader,
+                    FramebufferBlendFragmentShader>;
+using FramebufferBlendDarkenPipeline =
+    RenderPipelineT<FramebufferBlendVertexShader,
+                    FramebufferBlendFragmentShader>;
+using FramebufferBlendDifferencePipeline =
+    RenderPipelineT<FramebufferBlendVertexShader,
+                    FramebufferBlendFragmentShader>;
+using FramebufferBlendExclusionPipeline =
+    RenderPipelineT<FramebufferBlendVertexShader,
+                    FramebufferBlendFragmentShader>;
+using FramebufferBlendHardLightPipeline =
+    RenderPipelineT<FramebufferBlendVertexShader,
+                    FramebufferBlendFragmentShader>;
+using FramebufferBlendHuePipeline =
+    RenderPipelineT<FramebufferBlendVertexShader,
+                    FramebufferBlendFragmentShader>;
+using FramebufferBlendLightenPipeline =
+    RenderPipelineT<FramebufferBlendVertexShader,
+                    FramebufferBlendFragmentShader>;
+using FramebufferBlendLuminosityPipeline =
+    RenderPipelineT<FramebufferBlendVertexShader,
+                    FramebufferBlendFragmentShader>;
+using FramebufferBlendMultiplyPipeline =
+    RenderPipelineT<FramebufferBlendVertexShader,
+                    FramebufferBlendFragmentShader>;
+using FramebufferBlendOverlayPipeline =
+    RenderPipelineT<FramebufferBlendVertexShader,
+                    FramebufferBlendFragmentShader>;
+using FramebufferBlendSaturationPipeline =
+    RenderPipelineT<FramebufferBlendVertexShader,
+                    FramebufferBlendFragmentShader>;
+using FramebufferBlendScreenPipeline =
+    RenderPipelineT<FramebufferBlendVertexShader,
+                    FramebufferBlendFragmentShader>;
+using FramebufferBlendSoftLightPipeline =
+    RenderPipelineT<FramebufferBlendVertexShader,
+                    FramebufferBlendFragmentShader>;
+
+/// Geometry Pipelines
+using PointsComputeShaderPipeline = ComputePipelineBuilder<PointsComputeShader>;
+using UvComputeShaderPipeline = ComputePipelineBuilder<UvComputeShader>;
+
+#ifdef IMPELLER_ENABLE_OPENGLES
+using TextureExternalPipeline =
+    RenderPipelineT<TextureFillVertexShader, TextureFillExternalFragmentShader>;
+
+using TiledTextureExternalPipeline =
+    RenderPipelineT<TextureFillVertexShader,
+                    TiledTextureFillExternalFragmentShader>;
+#endif  // IMPELLER_ENABLE_OPENGLES
+
+// A struct used to isolate command buffer storage from the content
+// context options to preserve const-ness.
+struct PendingCommandBuffers {
+  std::vector<std::shared_ptr<CommandBuffer>> command_buffers;
+};
+
+/// Pipeline state configuration.
+///
+/// Each unique combination of these options requires a different pipeline state
+/// object to be built. This struct is used as a key for the per-pipeline
+/// variant cache.
+///
+/// When adding fields to this key, reliant features should take care to limit
+/// the combinatorical explosion of variations. A sufficiently complicated
+/// Flutter application may easily require building hundreds of PSOs in total,
+/// but they shouldn't require e.g. 10s of thousands.
 struct ContentContextOptions {
+  enum class StencilMode : uint8_t {
+    /// Turn the stencil test off. Used when drawing without stencil-then-cover.
+    kIgnore,
+
+    // Operations used for stencil-then-cover
+
+    /// Draw the stencil for the NonZero fill path rule.
+    ///
+    /// The stencil ref should always be 0 on commands using this mode.
+    kStencilNonZeroFill,
+    /// Draw the stencil for the EvenOdd fill path rule.
+    ///
+    /// The stencil ref should always be 0 on commands using this mode.
+    kStencilEvenOddFill,
+    /// Used for draw calls which fill in the stenciled area. Intended to be
+    /// used after `kStencilNonZeroFill` or `kStencilEvenOddFill` is used to set
+    /// up the stencil buffer. Also cleans up the stencil buffer by resetting
+    /// everything to zero.
+    ///
+    /// The stencil ref should always be 0 on commands using this mode.
+    kCoverCompare,
+    /// The opposite of `kCoverCompare`. Used for draw calls which fill in the
+    /// non-stenciled area (intersection clips). Intended to be used after
+    /// `kStencilNonZeroFill` or `kStencilEvenOddFill` is used to set up the
+    /// stencil buffer. Also cleans up the stencil buffer by resetting
+    /// everything to zero.
+    ///
+    /// The stencil ref should always be 0 on commands using this mode.
+    kCoverCompareInverted,
+
+    // Operations to control the legacy clip implementation, which forms a
+    // heightmap on the stencil buffer.
+
+    /// Slice the clip heightmap to a new maximum height.
+    kLegacyClipRestore,
+    /// Increment the stencil heightmap.
+    kLegacyClipIncrement,
+    /// Decrement the stencil heightmap (used for difference clipping only).
+    kLegacyClipDecrement,
+    /// Used for applying clips to all non-clip draw calls.
+    kLegacyClipCompare,
+  };
+
   SampleCount sample_count = SampleCount::kCount1;
   BlendMode blend_mode = BlendMode::kSourceOver;
-  CompareFunction stencil_compare = CompareFunction::kEqual;
-  StencilOperation stencil_operation = StencilOperation::kKeep;
+  CompareFunction depth_compare = CompareFunction::kAlways;
+  StencilMode stencil_mode =
+      ContentContextOptions::StencilMode::kLegacyClipCompare;
   PrimitiveType primitive_type = PrimitiveType::kTriangle;
+  PixelFormat color_attachment_pixel_format = PixelFormat::kUnknown;
+  bool has_depth_stencil_attachments = true;
+  bool depth_write_enabled = false;
+  bool wireframe = false;
+  bool is_for_rrect_blur_clear = false;
 
   struct Hash {
-    constexpr std::size_t operator()(const ContentContextOptions& o) const {
-      return fml::HashCombine(o.sample_count, o.blend_mode, o.stencil_compare,
-                              o.stencil_operation, o.primitive_type);
+    constexpr uint64_t operator()(const ContentContextOptions& o) const {
+      static_assert(sizeof(o.sample_count) == 1);
+      static_assert(sizeof(o.blend_mode) == 1);
+      static_assert(sizeof(o.sample_count) == 1);
+      static_assert(sizeof(o.depth_compare) == 1);
+      static_assert(sizeof(o.stencil_mode) == 1);
+      static_assert(sizeof(o.primitive_type) == 1);
+      static_assert(sizeof(o.color_attachment_pixel_format) == 1);
+
+      return (o.is_for_rrect_blur_clear ? 1llu : 0llu) << 0 |
+             (o.wireframe ? 1llu : 0llu) << 1 |
+             (o.has_depth_stencil_attachments ? 1llu : 0llu) << 2 |
+             (o.depth_write_enabled ? 1llu : 0llu) << 3 |
+             // enums
+             static_cast<uint64_t>(o.color_attachment_pixel_format) << 8 |
+             static_cast<uint64_t>(o.primitive_type) << 16 |
+             static_cast<uint64_t>(o.stencil_mode) << 24 |
+             static_cast<uint64_t>(o.depth_compare) << 32 |
+             static_cast<uint64_t>(o.blend_mode) << 40 |
+             static_cast<uint64_t>(o.sample_count) << 48;
     }
   };
 
@@ -200,9 +370,16 @@ struct ContentContextOptions {
                               const ContentContextOptions& rhs) const {
       return lhs.sample_count == rhs.sample_count &&
              lhs.blend_mode == rhs.blend_mode &&
-             lhs.stencil_compare == rhs.stencil_compare &&
-             lhs.stencil_operation == rhs.stencil_operation &&
-             lhs.primitive_type == rhs.primitive_type;
+             lhs.depth_write_enabled == rhs.depth_write_enabled &&
+             lhs.depth_compare == rhs.depth_compare &&
+             lhs.stencil_mode == rhs.stencil_mode &&
+             lhs.primitive_type == rhs.primitive_type &&
+             lhs.color_attachment_pixel_format ==
+                 rhs.color_attachment_pixel_format &&
+             lhs.has_depth_stencil_attachments ==
+                 rhs.has_depth_stencil_attachments &&
+             lhs.wireframe == rhs.wireframe &&
+             lhs.is_for_rrect_blur_clear == rhs.is_for_rrect_blur_clear;
     }
   };
 
@@ -210,17 +387,42 @@ struct ContentContextOptions {
 };
 
 class Tessellator;
+class RenderTargetCache;
 
 class ContentContext {
  public:
-  explicit ContentContext(std::shared_ptr<Context> context);
+  explicit ContentContext(
+      std::shared_ptr<Context> context,
+      std::shared_ptr<TypographerContext> typographer_context,
+      std::shared_ptr<RenderTargetAllocator> render_target_allocator = nullptr);
 
   ~ContentContext();
 
   bool IsValid() const;
 
+  /// This setting does two things:
+  /// 1. Enables clipping with the depth buffer, freeing up the stencil buffer.
+  ///    See also: https://github.com/flutter/flutter/issues/138460
+  /// 2. Switches the generic tessellation fallback to use stencil-then-cover.
+  ///    See also: https://github.com/flutter/flutter/issues/123671
+  ///
+  // TODO(bdero): Remove this setting once StC is fully de-risked
+  //              https://github.com/flutter/flutter/issues/123671
+  static constexpr bool kEnableStencilThenCover = true;
+
+#if IMPELLER_ENABLE_3D
+  std::shared_ptr<scene::SceneContext> GetSceneContext() const;
+#endif  // IMPELLER_ENABLE_3D
+
   std::shared_ptr<Tessellator> GetTessellator() const;
 
+#ifdef IMPELLER_DEBUG
+  std::shared_ptr<Pipeline<PipelineDescriptor>> GetCheckerboardPipeline(
+      ContentContextOptions opts) const {
+    return GetPipeline(checkerboard_pipelines_, opts);
+  }
+#endif  // IMPELLER_DEBUG
+
   std::shared_ptr<Pipeline<PipelineDescriptor>> GetLinearGradientFillPipeline(
       ContentContextOptions opts) const {
     return GetPipeline(linear_gradient_fill_pipelines_, opts);
@@ -228,19 +430,25 @@ class ContentContext {
 
   std::shared_ptr<Pipeline<PipelineDescriptor>>
   GetLinearGradientSSBOFillPipeline(ContentContextOptions opts) const {
-    FML_DCHECK(GetBackendFeatures().ssbo_support);
+    FML_DCHECK(GetDeviceCapabilities().SupportsSSBO());
     return GetPipeline(linear_gradient_ssbo_fill_pipelines_, opts);
   }
 
   std::shared_ptr<Pipeline<PipelineDescriptor>>
   GetRadialGradientSSBOFillPipeline(ContentContextOptions opts) const {
-    FML_DCHECK(GetBackendFeatures().ssbo_support);
+    FML_DCHECK(GetDeviceCapabilities().SupportsSSBO());
     return GetPipeline(radial_gradient_ssbo_fill_pipelines_, opts);
   }
 
+  std::shared_ptr<Pipeline<PipelineDescriptor>>
+  GetConicalGradientSSBOFillPipeline(ContentContextOptions opts) const {
+    FML_DCHECK(GetDeviceCapabilities().SupportsSSBO());
+    return GetPipeline(conical_gradient_ssbo_fill_pipelines_, opts);
+  }
+
   std::shared_ptr<Pipeline<PipelineDescriptor>>
   GetSweepGradientSSBOFillPipeline(ContentContextOptions opts) const {
-    FML_DCHECK(GetBackendFeatures().ssbo_support);
+    FML_DCHECK(GetDeviceCapabilities().SupportsSSBO());
     return GetPipeline(sweep_gradient_ssbo_fill_pipelines_, opts);
   }
 
@@ -249,6 +457,11 @@ class ContentContext {
     return GetPipeline(radial_gradient_fill_pipelines_, opts);
   }
 
+  std::shared_ptr<Pipeline<PipelineDescriptor>> GetConicalGradientFillPipeline(
+      ContentContextOptions opts) const {
+    return GetPipeline(conical_gradient_fill_pipelines_, opts);
+  }
+
   std::shared_ptr<Pipeline<PipelineDescriptor>> GetRRectBlurPipeline(
       ContentContextOptions opts) const {
     return GetPipeline(rrect_blur_pipelines_, opts);
@@ -274,19 +487,55 @@ class ContentContext {
     return GetPipeline(texture_pipelines_, opts);
   }
 
+  std::shared_ptr<Pipeline<PipelineDescriptor>> GetTextureStrictSrcPipeline(
+      ContentContextOptions opts) const {
+    return GetPipeline(texture_strict_src_pipelines_, opts);
+  }
+
+#ifdef IMPELLER_ENABLE_OPENGLES
+  std::shared_ptr<Pipeline<PipelineDescriptor>> GetTextureExternalPipeline(
+      ContentContextOptions opts) const {
+    FML_DCHECK(GetContext()->GetBackendType() ==
+               Context::BackendType::kOpenGLES);
+    return GetPipeline(texture_external_pipelines_, opts);
+  }
+
+  std::shared_ptr<Pipeline<PipelineDescriptor>> GetTiledTextureExternalPipeline(
+      ContentContextOptions opts) const {
+    FML_DCHECK(GetContext()->GetBackendType() ==
+               Context::BackendType::kOpenGLES);
+    return GetPipeline(tiled_texture_external_pipelines_, opts);
+  }
+#endif  // IMPELLER_ENABLE_OPENGLES
+
+  std::shared_ptr<Pipeline<PipelineDescriptor>> GetPositionUVPipeline(
+      ContentContextOptions opts) const {
+    return GetPipeline(position_uv_pipelines_, opts);
+  }
+
   std::shared_ptr<Pipeline<PipelineDescriptor>> GetTiledTexturePipeline(
       ContentContextOptions opts) const {
     return GetPipeline(tiled_texture_pipelines_, opts);
   }
 
+  std::shared_ptr<Pipeline<PipelineDescriptor>> GetGaussianBlurDecalPipeline(
+      ContentContextOptions opts) const {
+    return GetPipeline(gaussian_blur_noalpha_decal_pipelines_, opts);
+  }
+
   std::shared_ptr<Pipeline<PipelineDescriptor>> GetGaussianBlurPipeline(
       ContentContextOptions opts) const {
-    return GetPipeline(gaussian_blur_pipelines_, opts);
+    return GetPipeline(gaussian_blur_noalpha_nodecal_pipelines_, opts);
   }
 
-  std::shared_ptr<Pipeline<PipelineDescriptor>> GetGaussianBlurDecalPipeline(
+  std::shared_ptr<Pipeline<PipelineDescriptor>> GetKernelDecalPipeline(
       ContentContextOptions opts) const {
-    return GetPipeline(gaussian_blur_decal_pipelines_, opts);
+    return GetPipeline(kernel_decal_pipelines_, opts);
+  }
+
+  std::shared_ptr<Pipeline<PipelineDescriptor>> GetKernelPipeline(
+      ContentContextOptions opts) const {
+    return GetPipeline(kernel_nodecal_pipelines_, opts);
   }
 
   std::shared_ptr<Pipeline<PipelineDescriptor>> GetBorderMaskBlurPipeline(
@@ -324,9 +573,9 @@ class ContentContext {
     return GetPipeline(glyph_atlas_pipelines_, opts);
   }
 
-  std::shared_ptr<Pipeline<PipelineDescriptor>> GetGlyphAtlasSdfPipeline(
+  std::shared_ptr<Pipeline<PipelineDescriptor>> GetGlyphAtlasColorPipeline(
       ContentContextOptions opts) const {
-    return GetPipeline(glyph_atlas_sdf_pipelines_, opts);
+    return GetPipeline(glyph_atlas_color_pipelines_, opts);
   }
 
   std::shared_ptr<Pipeline<PipelineDescriptor>> GetGeometryColorPipeline(
@@ -334,19 +583,14 @@ class ContentContext {
     return GetPipeline(geometry_color_pipelines_, opts);
   }
 
-  std::shared_ptr<Pipeline<PipelineDescriptor>> GetGeometryPositionPipeline(
-      ContentContextOptions opts) const {
-    return GetPipeline(geometry_position_pipelines_, opts);
-  }
-
-  std::shared_ptr<Pipeline<PipelineDescriptor>> GetAtlasPipeline(
+  std::shared_ptr<Pipeline<PipelineDescriptor>> GetYUVToRGBFilterPipeline(
       ContentContextOptions opts) const {
-    return GetPipeline(atlas_pipelines_, opts);
+    return GetPipeline(yuv_to_rgb_filter_pipelines_, opts);
   }
 
-  std::shared_ptr<Pipeline<PipelineDescriptor>> GetYUVToRGBFilterPipeline(
+  std::shared_ptr<Pipeline<PipelineDescriptor>> GetPorterDuffBlendPipeline(
       ContentContextOptions opts) const {
-    return GetPipeline(yuv_to_rgb_filter_pipelines_, opts);
+    return GetPipeline(porter_duff_blend_pipelines_, opts);
   }
 
   // Advanced blends.
@@ -426,49 +670,303 @@ class ContentContext {
     return GetPipeline(blend_softlight_pipelines_, opts);
   }
 
+  // Framebuffer Advanced Blends
+  std::shared_ptr<Pipeline<PipelineDescriptor>>
+  GetFramebufferBlendColorPipeline(ContentContextOptions opts) const {
+    FML_DCHECK(GetDeviceCapabilities().SupportsFramebufferFetch());
+    return GetPipeline(framebuffer_blend_color_pipelines_, opts);
+  }
+
+  std::shared_ptr<Pipeline<PipelineDescriptor>>
+  GetFramebufferBlendColorBurnPipeline(ContentContextOptions opts) const {
+    FML_DCHECK(GetDeviceCapabilities().SupportsFramebufferFetch());
+    return GetPipeline(framebuffer_blend_colorburn_pipelines_, opts);
+  }
+
+  std::shared_ptr<Pipeline<PipelineDescriptor>>
+  GetFramebufferBlendColorDodgePipeline(ContentContextOptions opts) const {
+    FML_DCHECK(GetDeviceCapabilities().SupportsFramebufferFetch());
+    return GetPipeline(framebuffer_blend_colordodge_pipelines_, opts);
+  }
+
+  std::shared_ptr<Pipeline<PipelineDescriptor>>
+  GetFramebufferBlendDarkenPipeline(ContentContextOptions opts) const {
+    FML_DCHECK(GetDeviceCapabilities().SupportsFramebufferFetch());
+    return GetPipeline(framebuffer_blend_darken_pipelines_, opts);
+  }
+
+  std::shared_ptr<Pipeline<PipelineDescriptor>>
+  GetFramebufferBlendDifferencePipeline(ContentContextOptions opts) const {
+    FML_DCHECK(GetDeviceCapabilities().SupportsFramebufferFetch());
+    return GetPipeline(framebuffer_blend_difference_pipelines_, opts);
+  }
+
+  std::shared_ptr<Pipeline<PipelineDescriptor>>
+  GetFramebufferBlendExclusionPipeline(ContentContextOptions opts) const {
+    FML_DCHECK(GetDeviceCapabilities().SupportsFramebufferFetch());
+    return GetPipeline(framebuffer_blend_exclusion_pipelines_, opts);
+  }
+
+  std::shared_ptr<Pipeline<PipelineDescriptor>>
+  GetFramebufferBlendHardLightPipeline(ContentContextOptions opts) const {
+    FML_DCHECK(GetDeviceCapabilities().SupportsFramebufferFetch());
+    return GetPipeline(framebuffer_blend_hardlight_pipelines_, opts);
+  }
+
+  std::shared_ptr<Pipeline<PipelineDescriptor>> GetFramebufferBlendHuePipeline(
+      ContentContextOptions opts) const {
+    FML_DCHECK(GetDeviceCapabilities().SupportsFramebufferFetch());
+    return GetPipeline(framebuffer_blend_hue_pipelines_, opts);
+  }
+
+  std::shared_ptr<Pipeline<PipelineDescriptor>>
+  GetFramebufferBlendLightenPipeline(ContentContextOptions opts) const {
+    FML_DCHECK(GetDeviceCapabilities().SupportsFramebufferFetch());
+    return GetPipeline(framebuffer_blend_lighten_pipelines_, opts);
+  }
+
+  std::shared_ptr<Pipeline<PipelineDescriptor>>
+  GetFramebufferBlendLuminosityPipeline(ContentContextOptions opts) const {
+    FML_DCHECK(GetDeviceCapabilities().SupportsFramebufferFetch());
+    return GetPipeline(framebuffer_blend_luminosity_pipelines_, opts);
+  }
+
+  std::shared_ptr<Pipeline<PipelineDescriptor>>
+  GetFramebufferBlendMultiplyPipeline(ContentContextOptions opts) const {
+    FML_DCHECK(GetDeviceCapabilities().SupportsFramebufferFetch());
+    return GetPipeline(framebuffer_blend_multiply_pipelines_, opts);
+  }
+
+  std::shared_ptr<Pipeline<PipelineDescriptor>>
+  GetFramebufferBlendOverlayPipeline(ContentContextOptions opts) const {
+    FML_DCHECK(GetDeviceCapabilities().SupportsFramebufferFetch());
+    return GetPipeline(framebuffer_blend_overlay_pipelines_, opts);
+  }
+
+  std::shared_ptr<Pipeline<PipelineDescriptor>>
+  GetFramebufferBlendSaturationPipeline(ContentContextOptions opts) const {
+    FML_DCHECK(GetDeviceCapabilities().SupportsFramebufferFetch());
+    return GetPipeline(framebuffer_blend_saturation_pipelines_, opts);
+  }
+
+  std::shared_ptr<Pipeline<PipelineDescriptor>>
+  GetFramebufferBlendScreenPipeline(ContentContextOptions opts) const {
+    FML_DCHECK(GetDeviceCapabilities().SupportsFramebufferFetch());
+    return GetPipeline(framebuffer_blend_screen_pipelines_, opts);
+  }
+
+  std::shared_ptr<Pipeline<PipelineDescriptor>>
+  GetFramebufferBlendSoftLightPipeline(ContentContextOptions opts) const {
+    FML_DCHECK(GetDeviceCapabilities().SupportsFramebufferFetch());
+    return GetPipeline(framebuffer_blend_softlight_pipelines_, opts);
+  }
+
+  std::shared_ptr<Pipeline<ComputePipelineDescriptor>> GetPointComputePipeline()
+      const {
+    FML_DCHECK(GetDeviceCapabilities().SupportsCompute());
+    return point_field_compute_pipelines_;
+  }
+
+  std::shared_ptr<Pipeline<ComputePipelineDescriptor>> GetUvComputePipeline()
+      const {
+    FML_DCHECK(GetDeviceCapabilities().SupportsCompute());
+    return uv_compute_pipelines_;
+  }
+
   std::shared_ptr<Context> GetContext() const;
 
-  std::shared_ptr<GlyphAtlasContext> GetGlyphAtlasContext() const;
+  const Capabilities& GetDeviceCapabilities() const;
 
-  const BackendFeatures& GetBackendFeatures() const;
+  void SetWireframe(bool wireframe);
 
   using SubpassCallback =
       std::function<bool(const ContentContext&, RenderPass&)>;
 
   /// @brief  Creates a new texture of size `texture_size` and calls
   ///         `subpass_callback` with a `RenderPass` for drawing to the texture.
-  std::shared_ptr<Texture> MakeSubpass(
+  fml::StatusOr<RenderTarget> MakeSubpass(
+      const std::string& label,
       ISize texture_size,
+      const SubpassCallback& subpass_callback,
+      bool msaa_enabled = true,
+      bool depth_stencil_enabled = false,
+      int32_t mip_count = 1) const;
+
+  /// Makes a subpass that will render to `subpass_target`.
+  fml::StatusOr<RenderTarget> MakeSubpass(
+      const std::string& label,
+      const RenderTarget& subpass_target,
       const SubpassCallback& subpass_callback) const;
 
+  const std::shared_ptr<LazyGlyphAtlas>& GetLazyGlyphAtlas() const {
+    return lazy_glyph_atlas_;
+  }
+
+  const std::shared_ptr<RenderTargetAllocator>& GetRenderTargetCache() const {
+    return render_target_cache_;
+  }
+
+  /// RuntimeEffect pipelines must be obtained via this method to avoid
+  /// re-creating them every frame.
+  ///
+  /// The unique_entrypoint_name comes from RuntimeEffect::GetEntrypoint.
+  /// Impellerc generates a unique entrypoint name for runtime effect shaders
+  /// based on the input file name and shader stage.
+  ///
+  /// The create_callback is synchronously invoked exactly once if a cached
+  /// pipeline is not found.
+  std::shared_ptr<Pipeline<PipelineDescriptor>> GetCachedRuntimeEffectPipeline(
+      const std::string& unique_entrypoint_name,
+      const ContentContextOptions& options,
+      const std::function<std::shared_ptr<Pipeline<PipelineDescriptor>>()>&
+          create_callback) const;
+
+  /// Used by hot reload/hot restart to clear a cached pipeline from
+  /// GetCachedRuntimeEffectPipeline.
+  void ClearCachedRuntimeEffectPipeline(
+      const std::string& unique_entrypoint_name) const;
+
+  /// @brief Retrieve the currnent host buffer for transient storage.
+  ///
+  /// This is only safe to use from the raster threads. Other threads should
+  /// allocate their own device buffers.
+  HostBuffer& GetTransientsBuffer() const { return *host_buffer_; }
+
  private:
   std::shared_ptr<Context> context_;
+  std::shared_ptr<LazyGlyphAtlas> lazy_glyph_atlas_;
+
+  /// Run backend specific additional setup and create common shader variants.
+  ///
+  /// This bootstrap is intended to improve the performance of several
+  /// first frame benchmarks that are tracked in the flutter device lab.
+  /// The workload includes initializing commonly used but not default
+  /// shader variants, as well as forcing driver initialization.
+  void InitializeCommonlyUsedShadersIfNeeded() const;
+
+  struct RuntimeEffectPipelineKey {
+    std::string unique_entrypoint_name;
+    ContentContextOptions options;
+
+    struct Hash {
+      std::size_t operator()(const RuntimeEffectPipelineKey& key) const {
+        return fml::HashCombine(key.unique_entrypoint_name,
+                                ContentContextOptions::Hash{}(key.options));
+      }
+    };
+
+    struct Equal {
+      constexpr bool operator()(const RuntimeEffectPipelineKey& lhs,
+                                const RuntimeEffectPipelineKey& rhs) const {
+        return lhs.unique_entrypoint_name == rhs.unique_entrypoint_name &&
+               ContentContextOptions::Equal{}(lhs.options, rhs.options);
+      }
+    };
+  };
+
+  mutable std::unordered_map<RuntimeEffectPipelineKey,
+                             std::shared_ptr<Pipeline<PipelineDescriptor>>,
+                             RuntimeEffectPipelineKey::Hash,
+                             RuntimeEffectPipelineKey::Equal>
+      runtime_effect_pipelines_;
+
+  template <class PipelineT>
+  class Variants {
+   public:
+    Variants() = default;
 
-  template <class T>
-  using Variants = std::unordered_map<ContentContextOptions,
-                                      std::unique_ptr<T>,
-                                      ContentContextOptions::Hash,
-                                      ContentContextOptions::Equal>;
+    void Set(const ContentContextOptions& options,
+             std::unique_ptr<PipelineT> pipeline) {
+      pipelines_[options] = std::move(pipeline);
+    }
+
+    void SetDefault(const ContentContextOptions& options,
+                    std::unique_ptr<PipelineT> pipeline) {
+      default_options_ = options;
+      Set(options, std::move(pipeline));
+    }
+
+    void CreateDefault(const Context& context,
+                       const ContentContextOptions& options,
+                       const std::initializer_list<Scalar>& constants = {}) {
+      auto desc =
+          PipelineT::Builder::MakeDefaultPipelineDescriptor(context, constants);
+      if (!desc.has_value()) {
+        VALIDATION_LOG << "Failed to create default pipeline.";
+        return;
+      }
+      options.ApplyToPipelineDescriptor(*desc);
+      SetDefault(options, std::make_unique<PipelineT>(context, desc));
+    }
+
+    PipelineT* Get(const ContentContextOptions& options) const {
+      if (auto found = pipelines_.find(options); found != pipelines_.end()) {
+        return found->second.get();
+      }
+      return nullptr;
+    }
+
+    PipelineT* GetDefault() const {
+      if (!default_options_.has_value()) {
+        return nullptr;
+      }
+      return Get(default_options_.value());
+    }
+
+    size_t GetPipelineCount() const { return pipelines_.size(); }
+
+   private:
+    std::optional<ContentContextOptions> default_options_;
+    std::unordered_map<ContentContextOptions,
+                       std::unique_ptr<PipelineT>,
+                       ContentContextOptions::Hash,
+                       ContentContextOptions::Equal>
+        pipelines_;
+
+    Variants(const Variants&) = delete;
+
+    Variants& operator=(const Variants&) = delete;
+  };
 
   // These are mutable because while the prototypes are created eagerly, any
   // variants requested from that are lazily created and cached in the variants
   // map.
+
+#ifdef IMPELLER_DEBUG
+  mutable Variants<CheckerboardPipeline> checkerboard_pipelines_;
+#endif  // IMPELLER_DEBUG
+
   mutable Variants<SolidFillPipeline> solid_fill_pipelines_;
   mutable Variants<LinearGradientFillPipeline> linear_gradient_fill_pipelines_;
   mutable Variants<RadialGradientFillPipeline> radial_gradient_fill_pipelines_;
+  mutable Variants<ConicalGradientFillPipeline>
+      conical_gradient_fill_pipelines_;
   mutable Variants<SweepGradientFillPipeline> sweep_gradient_fill_pipelines_;
   mutable Variants<LinearGradientSSBOFillPipeline>
       linear_gradient_ssbo_fill_pipelines_;
   mutable Variants<RadialGradientSSBOFillPipeline>
       radial_gradient_ssbo_fill_pipelines_;
+  mutable Variants<ConicalGradientSSBOFillPipeline>
+      conical_gradient_ssbo_fill_pipelines_;
   mutable Variants<SweepGradientSSBOFillPipeline>
       sweep_gradient_ssbo_fill_pipelines_;
   mutable Variants<RRectBlurPipeline> rrect_blur_pipelines_;
   mutable Variants<BlendPipeline> texture_blend_pipelines_;
   mutable Variants<TexturePipeline> texture_pipelines_;
+  mutable Variants<TextureStrictSrcPipeline> texture_strict_src_pipelines_;
+#ifdef IMPELLER_ENABLE_OPENGLES
+  mutable Variants<TextureExternalPipeline> texture_external_pipelines_;
+  mutable Variants<TiledTextureExternalPipeline>
+      tiled_texture_external_pipelines_;
+#endif  // IMPELLER_ENABLE_OPENGLES
+  mutable Variants<PositionUVPipeline> position_uv_pipelines_;
   mutable Variants<TiledTexturePipeline> tiled_texture_pipelines_;
-  mutable Variants<GaussianBlurPipeline> gaussian_blur_pipelines_;
-  mutable Variants<GaussianBlurDecalPipeline> gaussian_blur_decal_pipelines_;
+  mutable Variants<GaussianBlurDecalPipeline>
+      gaussian_blur_noalpha_decal_pipelines_;
+  mutable Variants<GaussianBlurPipeline>
+      gaussian_blur_noalpha_nodecal_pipelines_;
+  mutable Variants<KernelDecalPipeline> kernel_decal_pipelines_;
+  mutable Variants<KernelPipeline> kernel_nodecal_pipelines_;
   mutable Variants<BorderMaskBlurPipeline> border_mask_blur_pipelines_;
   mutable Variants<MorphologyFilterPipeline> morphology_filter_pipelines_;
   mutable Variants<ColorMatrixColorFilterPipeline>
@@ -477,11 +975,10 @@ class ContentContext {
   mutable Variants<SrgbToLinearFilterPipeline> srgb_to_linear_filter_pipelines_;
   mutable Variants<ClipPipeline> clip_pipelines_;
   mutable Variants<GlyphAtlasPipeline> glyph_atlas_pipelines_;
-  mutable Variants<GlyphAtlasSdfPipeline> glyph_atlas_sdf_pipelines_;
-  mutable Variants<AtlasPipeline> atlas_pipelines_;
-  mutable Variants<GeometryPositionPipeline> geometry_position_pipelines_;
+  mutable Variants<GlyphAtlasColorPipeline> glyph_atlas_color_pipelines_;
   mutable Variants<GeometryColorPipeline> geometry_color_pipelines_;
   mutable Variants<YUVToRGBFilterPipeline> yuv_to_rgb_filter_pipelines_;
+  mutable Variants<PorterDuffBlendPipeline> porter_duff_blend_pipelines_;
   // Advanced blends.
   mutable Variants<BlendColorPipeline> blend_color_pipelines_;
   mutable Variants<BlendColorBurnPipeline> blend_colorburn_pipelines_;
@@ -498,41 +995,107 @@ class ContentContext {
   mutable Variants<BlendSaturationPipeline> blend_saturation_pipelines_;
   mutable Variants<BlendScreenPipeline> blend_screen_pipelines_;
   mutable Variants<BlendSoftLightPipeline> blend_softlight_pipelines_;
+  // Framebuffer Advanced blends.
+  mutable Variants<FramebufferBlendColorPipeline>
+      framebuffer_blend_color_pipelines_;
+  mutable Variants<FramebufferBlendColorBurnPipeline>
+      framebuffer_blend_colorburn_pipelines_;
+  mutable Variants<FramebufferBlendColorDodgePipeline>
+      framebuffer_blend_colordodge_pipelines_;
+  mutable Variants<FramebufferBlendDarkenPipeline>
+      framebuffer_blend_darken_pipelines_;
+  mutable Variants<FramebufferBlendDifferencePipeline>
+      framebuffer_blend_difference_pipelines_;
+  mutable Variants<FramebufferBlendExclusionPipeline>
+      framebuffer_blend_exclusion_pipelines_;
+  mutable Variants<FramebufferBlendHardLightPipeline>
+      framebuffer_blend_hardlight_pipelines_;
+  mutable Variants<FramebufferBlendHuePipeline>
+      framebuffer_blend_hue_pipelines_;
+  mutable Variants<FramebufferBlendLightenPipeline>
+      framebuffer_blend_lighten_pipelines_;
+  mutable Variants<FramebufferBlendLuminosityPipeline>
+      framebuffer_blend_luminosity_pipelines_;
+  mutable Variants<FramebufferBlendMultiplyPipeline>
+      framebuffer_blend_multiply_pipelines_;
+  mutable Variants<FramebufferBlendOverlayPipeline>
+      framebuffer_blend_overlay_pipelines_;
+  mutable Variants<FramebufferBlendSaturationPipeline>
+      framebuffer_blend_saturation_pipelines_;
+  mutable Variants<FramebufferBlendScreenPipeline>
+      framebuffer_blend_screen_pipelines_;
+  mutable Variants<FramebufferBlendSoftLightPipeline>
+      framebuffer_blend_softlight_pipelines_;
+  mutable std::shared_ptr<Pipeline<ComputePipelineDescriptor>>
+      point_field_compute_pipelines_;
+  mutable std::shared_ptr<Pipeline<ComputePipelineDescriptor>>
+      uv_compute_pipelines_;
 
   template <class TypedPipeline>
   std::shared_ptr<Pipeline<PipelineDescriptor>> GetPipeline(
       Variants<TypedPipeline>& container,
       ContentContextOptions opts) const {
+    TypedPipeline* pipeline = CreateIfNeeded(container, opts);
+    if (!pipeline) {
+      return nullptr;
+    }
+    return pipeline->WaitAndGet();
+  }
+
+  template <class TypedPipeline>
+  TypedPipeline* CreateIfNeeded(Variants<TypedPipeline>& container,
+                                ContentContextOptions opts) const {
     if (!IsValid()) {
       return nullptr;
     }
 
-    if (auto found = container.find(opts); found != container.end()) {
-      return found->second->WaitAndGet();
+    if (wireframe_) {
+      opts.wireframe = true;
+    }
+
+    if (TypedPipeline* found = container.Get(opts)) {
+      return found;
     }
 
-    auto prototype = container.find({});
+    TypedPipeline* prototype = container.GetDefault();
 
     // The prototype must always be initialized in the constructor.
-    FML_CHECK(prototype != container.end());
+    FML_CHECK(prototype != nullptr);
 
-    auto variant_future = prototype->second->WaitAndGet()->CreateVariant(
-        [&opts, variants_count = container.size()](PipelineDescriptor& desc) {
+    std::shared_ptr<Pipeline<PipelineDescriptor>> pipeline =
+        prototype->WaitAndGet();
+    if (!pipeline) {
+      return nullptr;
+    }
+
+    auto variant_future = pipeline->CreateVariant(
+        [&opts, variants_count =
+                    container.GetPipelineCount()](PipelineDescriptor& desc) {
           opts.ApplyToPipelineDescriptor(desc);
           desc.SetLabel(
               SPrintF("%s V#%zu", desc.GetLabel().c_str(), variants_count));
         });
-    auto variant = std::make_unique<TypedPipeline>(std::move(variant_future));
-    auto variant_pipeline = variant->WaitAndGet();
-    container[opts] = std::move(variant);
-    return variant_pipeline;
+    std::unique_ptr<TypedPipeline> variant =
+        std::make_unique<TypedPipeline>(std::move(variant_future));
+    container.Set(opts, std::move(variant));
+    return container.Get(opts);
   }
 
   bool is_valid_ = false;
   std::shared_ptr<Tessellator> tessellator_;
-  std::shared_ptr<GlyphAtlasContext> glyph_atlas_context_;
+#if IMPELLER_ENABLE_3D
+  std::shared_ptr<scene::SceneContext> scene_context_;
+#endif  // IMPELLER_ENABLE_3D
+  std::shared_ptr<RenderTargetAllocator> render_target_cache_;
+  std::shared_ptr<HostBuffer> host_buffer_;
+  std::unique_ptr<PendingCommandBuffers> pending_command_buffers_;
+  bool wireframe_ = false;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(ContentContext);
+  ContentContext(const ContentContext&) = delete;
+
+  ContentContext& operator=(const ContentContext&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_CONTENT_CONTEXT_H_
diff --git a/impeller/entity/contents/content_context_unittests.cc b/impeller/entity/contents/content_context_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..07d8d87ddb5283fe24ba88e2bb3f5fdfad908dc2
--- /dev/null
+++ b/impeller/entity/contents/content_context_unittests.cc
@@ -0,0 +1,359 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <cstdint>
+#include <future>
+#include <memory>
+#include <utility>
+#include <vector>
+
+#include "fml/logging.h"
+#include "gtest/gtest.h"
+
+#include "impeller/base/backend_cast.h"
+#include "impeller/base/comparable.h"
+#include "impeller/core/allocator.h"
+#include "impeller/core/device_buffer_descriptor.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/texture_descriptor.h"
+#include "impeller/entity/contents/content_context.h"
+#include "impeller/entity/contents/test/recording_render_pass.h"
+#include "impeller/geometry/color.h"
+#include "impeller/renderer/capabilities.h"
+#include "impeller/renderer/command_buffer.h"
+#include "impeller/renderer/command_queue.h"
+#include "impeller/renderer/pipeline.h"
+#include "impeller/renderer/pipeline_descriptor.h"
+#include "impeller/renderer/pipeline_library.h"
+#include "impeller/renderer/render_pass.h"
+#include "impeller/renderer/shader_function.h"
+#include "impeller/renderer/shader_library.h"
+
+namespace impeller {
+namespace testing {
+
+namespace {
+class FakeTexture : public Texture {
+ public:
+  explicit FakeTexture(const TextureDescriptor& desc) : Texture(desc) {}
+
+  ~FakeTexture() override {}
+
+  void SetLabel(std::string_view label) {}
+
+  bool IsValid() const override { return true; }
+
+  ISize GetSize() const override { return {1, 1}; }
+
+  Scalar GetYCoordScale() const override { return 1.0; }
+
+  bool OnSetContents(const uint8_t* contents,
+                     size_t length,
+                     size_t slice) override {
+    if (GetTextureDescriptor().GetByteSizeOfBaseMipLevel() != length) {
+      return false;
+    }
+    did_set_contents = true;
+    return true;
+  }
+
+  bool OnSetContents(std::shared_ptr<const fml::Mapping> mapping,
+                     size_t slice) override {
+    did_set_contents = true;
+    return true;
+  }
+
+  bool did_set_contents = false;
+};
+
+class FakeAllocator : public Allocator,
+                      public BackendCast<FakeAllocator, Allocator> {
+ public:
+  FakeAllocator() : Allocator() {}
+
+  uint16_t MinimumBytesPerRow(PixelFormat format) const override { return 0; }
+  ISize GetMaxTextureSizeSupported() const override { return ISize(1, 1); }
+
+  std::shared_ptr<DeviceBuffer> OnCreateBuffer(
+      const DeviceBufferDescriptor& desc) override {
+    return nullptr;
+  }
+  std::shared_ptr<Texture> OnCreateTexture(
+      const TextureDescriptor& desc) override {
+    if (desc.size == ISize{1, 1}) {
+      auto result = std::make_shared<FakeTexture>(desc);
+      textures.push_back(result);
+      return result;
+    }
+    return nullptr;
+  }
+
+  std::vector<std::shared_ptr<FakeTexture>> textures = {};
+};
+
+class FakePipeline : public Pipeline<PipelineDescriptor> {
+ public:
+  FakePipeline(std::weak_ptr<PipelineLibrary> library,
+               const PipelineDescriptor& desc)
+      : Pipeline(std::move(library), desc) {}
+
+  ~FakePipeline() override {}
+
+  bool IsValid() const override { return true; }
+};
+
+class FakeComputePipeline : public Pipeline<ComputePipelineDescriptor> {
+ public:
+  FakeComputePipeline(std::weak_ptr<PipelineLibrary> library,
+                      const ComputePipelineDescriptor& desc)
+      : Pipeline(std::move(library), desc) {}
+
+  ~FakeComputePipeline() override {}
+
+  bool IsValid() const override { return true; }
+};
+
+class FakePipelineLibrary : public PipelineLibrary {
+ public:
+  FakePipelineLibrary() {}
+
+  ~FakePipelineLibrary() override {}
+
+  bool IsValid() const override { return true; }
+
+  PipelineFuture<PipelineDescriptor> GetPipeline(
+      PipelineDescriptor descriptor) override {
+    auto pipeline =
+        std::make_shared<FakePipeline>(weak_from_this(), descriptor);
+    std::promise<std::shared_ptr<Pipeline<PipelineDescriptor>>> promise;
+    promise.set_value(std::move(pipeline));
+    return PipelineFuture<PipelineDescriptor>{
+        .descriptor = descriptor,
+        .future =
+            std::shared_future<std::shared_ptr<Pipeline<PipelineDescriptor>>>(
+                promise.get_future())};
+  }
+
+  PipelineFuture<ComputePipelineDescriptor> GetPipeline(
+      ComputePipelineDescriptor descriptor) override {
+    auto pipeline =
+        std::make_shared<FakeComputePipeline>(weak_from_this(), descriptor);
+    std::promise<std::shared_ptr<Pipeline<ComputePipelineDescriptor>>> promise;
+    promise.set_value(std::move(pipeline));
+    return PipelineFuture<ComputePipelineDescriptor>{
+        .descriptor = descriptor,
+        .future = std::shared_future<
+            std::shared_ptr<Pipeline<ComputePipelineDescriptor>>>(
+            promise.get_future())};
+  }
+
+  void RemovePipelinesWithEntryPoint(
+      std::shared_ptr<const ShaderFunction> function) {}
+};
+
+class FakeShaderFunction : public ShaderFunction {
+ public:
+  FakeShaderFunction(UniqueID parent_library_id,
+                     std::string name,
+                     ShaderStage stage)
+      : ShaderFunction(parent_library_id, std::move(name), stage){};
+
+  ~FakeShaderFunction() override {}
+};
+
+class FakeShaderLibrary : public ShaderLibrary {
+ public:
+  ~FakeShaderLibrary() override {}
+
+  bool IsValid() const override { return true; }
+
+  std::shared_ptr<const ShaderFunction> GetFunction(std::string_view name,
+                                                    ShaderStage stage) {
+    return std::make_shared<FakeShaderFunction>(UniqueID{}, std::string(name),
+                                                stage);
+  }
+
+  void RegisterFunction(std::string name,
+                        ShaderStage stage,
+                        std::shared_ptr<fml::Mapping> code,
+                        RegistrationCallback callback) override {}
+
+  void UnregisterFunction(std::string name, ShaderStage stage) override {}
+};
+
+class FakeCommandBuffer : public CommandBuffer {
+ public:
+  explicit FakeCommandBuffer(std::weak_ptr<const Context> context)
+      : CommandBuffer(std::move(context)) {}
+
+  ~FakeCommandBuffer() {}
+
+  bool IsValid() const override { return true; }
+
+  void SetLabel(const std::string& label) const override {}
+
+  std::shared_ptr<RenderPass> OnCreateRenderPass(
+      RenderTarget render_target) override {
+    return std::make_shared<RecordingRenderPass>(nullptr, context_.lock(),
+                                                 render_target);
+  }
+
+  std::shared_ptr<BlitPass> OnCreateBlitPass() override {
+    FML_UNREACHABLE();
+    return nullptr;
+  }
+
+  virtual bool OnSubmitCommands(CompletionCallback callback) { return true; }
+
+  void OnWaitUntilScheduled() {}
+
+  std::shared_ptr<ComputePass> OnCreateComputePass() override {
+    FML_UNREACHABLE();
+    return nullptr;
+  }
+};
+
+class FakeContext : public Context,
+                    public std::enable_shared_from_this<FakeContext> {
+ public:
+  explicit FakeContext(
+      const std::string& gpu_model = "",
+      PixelFormat default_color_format = PixelFormat::kR8G8B8A8UNormInt)
+      : Context(),
+        allocator_(std::make_shared<FakeAllocator>()),
+        capabilities_(std::shared_ptr<Capabilities>(
+            CapabilitiesBuilder()
+                .SetDefaultColorFormat(default_color_format)
+                .Build())),
+        pipelines_(std::make_shared<FakePipelineLibrary>()),
+        queue_(std::make_shared<CommandQueue>()),
+        shader_library_(std::make_shared<FakeShaderLibrary>()),
+        gpu_model_(gpu_model) {}
+
+  BackendType GetBackendType() const override { return BackendType::kVulkan; }
+  std::string DescribeGpuModel() const override { return gpu_model_; }
+  bool IsValid() const override { return true; }
+  const std::shared_ptr<const Capabilities>& GetCapabilities() const override {
+    return capabilities_;
+  }
+  std::shared_ptr<Allocator> GetResourceAllocator() const override {
+    return allocator_;
+  }
+  std::shared_ptr<ShaderLibrary> GetShaderLibrary() const {
+    return shader_library_;
+  }
+  std::shared_ptr<SamplerLibrary> GetSamplerLibrary() const { return nullptr; }
+  std::shared_ptr<PipelineLibrary> GetPipelineLibrary() const {
+    return pipelines_;
+  }
+  std::shared_ptr<CommandQueue> GetCommandQueue() const { return queue_; }
+  std::shared_ptr<CommandBuffer> CreateCommandBuffer() const {
+    return std::make_shared<FakeCommandBuffer>(shared_from_this());
+  }
+  void Shutdown() {}
+
+ private:
+  std::shared_ptr<Allocator> allocator_;
+  std::shared_ptr<const Capabilities> capabilities_;
+  std::shared_ptr<FakePipelineLibrary> pipelines_;
+  std::shared_ptr<CommandQueue> queue_;
+  std::shared_ptr<ShaderLibrary> shader_library_;
+  std::string gpu_model_;
+};
+}  // namespace
+
+TEST(ContentContext, CachesPipelines) {
+  auto context = std::make_shared<FakeContext>();
+
+  auto create_callback = [&]() {
+    return std::make_shared<FakePipeline>(context->GetPipelineLibrary(),
+                                          PipelineDescriptor{});
+  };
+
+  ContentContext content_context(context, nullptr);
+  ContentContextOptions optionsA{.blend_mode = BlendMode::kSourceOver};
+  ContentContextOptions optionsB{.blend_mode = BlendMode::kSource};
+
+  auto pipelineA = content_context.GetCachedRuntimeEffectPipeline(
+      "A", optionsA, create_callback);
+
+  auto pipelineA2 = content_context.GetCachedRuntimeEffectPipeline(
+      "A", optionsA, create_callback);
+
+  auto pipelineA3 = content_context.GetCachedRuntimeEffectPipeline(
+      "A", optionsB, create_callback);
+
+  auto pipelineB = content_context.GetCachedRuntimeEffectPipeline(
+      "B", optionsB, create_callback);
+
+  ASSERT_EQ(pipelineA.get(), pipelineA2.get());
+  ASSERT_NE(pipelineA.get(), pipelineA3.get());
+  ASSERT_NE(pipelineB.get(), pipelineA.get());
+}
+
+TEST(ContentContext, InvalidatesAllPipelinesWithSameUniqueNameOnClear) {
+  auto context = std::make_shared<FakeContext>();
+  ContentContext content_context(context, nullptr);
+  ContentContextOptions optionsA{.blend_mode = BlendMode::kSourceOver};
+  ContentContextOptions optionsB{.blend_mode = BlendMode::kSource};
+
+  auto create_callback = [&]() {
+    return std::make_shared<FakePipeline>(context->GetPipelineLibrary(),
+                                          PipelineDescriptor{});
+  };
+
+  auto pipelineA = content_context.GetCachedRuntimeEffectPipeline(
+      "A", optionsA, create_callback);
+
+  auto pipelineA2 = content_context.GetCachedRuntimeEffectPipeline(
+      "A", optionsB, create_callback);
+
+  auto pipelineB = content_context.GetCachedRuntimeEffectPipeline(
+      "B", optionsB, create_callback);
+
+  ASSERT_TRUE(pipelineA);
+  ASSERT_TRUE(pipelineA2);
+  ASSERT_TRUE(pipelineB);
+
+  ASSERT_EQ(pipelineA, content_context.GetCachedRuntimeEffectPipeline(
+                           "A", optionsA, create_callback));
+  ASSERT_EQ(pipelineA2, content_context.GetCachedRuntimeEffectPipeline(
+                            "A", optionsB, create_callback));
+  ASSERT_EQ(pipelineB, content_context.GetCachedRuntimeEffectPipeline(
+                           "B", optionsB, create_callback));
+
+  content_context.ClearCachedRuntimeEffectPipeline("A");
+
+  ASSERT_NE(pipelineA, content_context.GetCachedRuntimeEffectPipeline(
+                           "A", optionsA, create_callback));
+  ASSERT_NE(pipelineA2, content_context.GetCachedRuntimeEffectPipeline(
+                            "A", optionsB, create_callback));
+  ASSERT_EQ(pipelineB, content_context.GetCachedRuntimeEffectPipeline(
+                           "B", optionsB, create_callback));
+
+  content_context.ClearCachedRuntimeEffectPipeline("B");
+
+  ASSERT_NE(pipelineB, content_context.GetCachedRuntimeEffectPipeline(
+                           "B", optionsB, create_callback));
+}
+
+TEST(ContentContext, InitializeCommonlyUsedShadersIfNeeded) {
+  ScopedValidationFatal fatal_validations;
+  // Set a pixel format that is larger than 32bpp.
+  auto context = std::make_shared<FakeContext>("Mali G70",
+                                               PixelFormat::kR16G16B16A16Float);
+  ContentContext content_context(context, nullptr);
+
+  FakeAllocator& fake_allocator =
+      FakeAllocator::Cast(*context->GetResourceAllocator());
+
+#if IMPELLER_ENABLE_3D
+  EXPECT_EQ(fake_allocator.textures.size(), 2u);
+#else
+  EXPECT_EQ(fake_allocator.textures.size(), 1u);
+#endif  // IMPELLER_ENABLE_3D
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/entity/contents/contents.cc b/impeller/entity/contents/contents.cc
index dc841cf1cb9fde8f001313cdfda43acf1f9965fa..7c0c62af98ac0bf709ef577edc5bc6fd16756bac 100644
--- a/impeller/entity/contents/contents.cc
+++ b/impeller/entity/contents/contents.cc
@@ -6,75 +6,147 @@
 #include <optional>
 
 #include "fml/logging.h"
+#include "impeller/base/strings.h"
+#include "impeller/base/validation.h"
+#include "impeller/core/formats.h"
+#include "impeller/entity/contents/anonymous_contents.h"
 #include "impeller/entity/contents/content_context.h"
+#include "impeller/entity/contents/texture_contents.h"
 #include "impeller/renderer/command_buffer.h"
-#include "impeller/renderer/formats.h"
 #include "impeller/renderer/render_pass.h"
 
 namespace impeller {
 
 ContentContextOptions OptionsFromPass(const RenderPass& pass) {
   ContentContextOptions opts;
-  opts.sample_count = pass.GetRenderTarget().GetSampleCount();
+  opts.sample_count = pass.GetSampleCount();
+  opts.color_attachment_pixel_format = pass.GetRenderTargetPixelFormat();
+
+  bool has_depth_stencil_attachments =
+      pass.HasDepthAttachment() && pass.HasStencilAttachment();
+  FML_DCHECK(pass.HasDepthAttachment() == pass.HasStencilAttachment());
+
+  opts.has_depth_stencil_attachments = has_depth_stencil_attachments;
+  if constexpr (ContentContext::kEnableStencilThenCover) {
+    opts.depth_compare = CompareFunction::kGreater;
+    opts.stencil_mode = ContentContextOptions::StencilMode::kIgnore;
+  }
   return opts;
 }
 
 ContentContextOptions OptionsFromPassAndEntity(const RenderPass& pass,
                                                const Entity& entity) {
-  ContentContextOptions opts;
-  opts.sample_count = pass.GetRenderTarget().GetSampleCount();
+  ContentContextOptions opts = OptionsFromPass(pass);
   opts.blend_mode = entity.GetBlendMode();
   return opts;
 }
 
+std::shared_ptr<Contents> Contents::MakeAnonymous(
+    Contents::RenderProc render_proc,
+    Contents::CoverageProc coverage_proc) {
+  return AnonymousContents::Make(std::move(render_proc),
+                                 std::move(coverage_proc));
+}
+
 Contents::Contents() = default;
 
 Contents::~Contents() = default;
 
-Contents::StencilCoverage Contents::GetStencilCoverage(
+bool Contents::IsOpaque() const {
+  return false;
+}
+
+Contents::ClipCoverage Contents::GetClipCoverage(
     const Entity& entity,
-    const std::optional<Rect>& current_stencil_coverage) const {
-  return {.type = StencilCoverage::Type::kNone,
-          .coverage = current_stencil_coverage};
+    const std::optional<Rect>& current_clip_coverage) const {
+  return {.type = ClipCoverage::Type::kNoChange,
+          .coverage = current_clip_coverage};
 }
 
 std::optional<Snapshot> Contents::RenderToSnapshot(
     const ContentContext& renderer,
-    const Entity& entity) const {
+    const Entity& entity,
+    std::optional<Rect> coverage_limit,
+    const std::optional<SamplerDescriptor>& sampler_descriptor,
+    bool msaa_enabled,
+    int32_t mip_count,
+    const std::string& label) const {
   auto coverage = GetCoverage(entity);
   if (!coverage.has_value()) {
     return std::nullopt;
   }
 
-  auto texture = renderer.MakeSubpass(
-      ISize::Ceil(coverage->size),
+  // Pad Contents snapshots with 1 pixel borders to ensure correct sampling
+  // behavior. Not doing so results in a coverage leak for filters that support
+  // customizing the input sampling mode. Snapshots of contents should be
+  // theoretically treated as infinite size just like layers.
+  coverage = coverage->Expand(1);
+
+  if (coverage_limit.has_value()) {
+    coverage = coverage->Intersection(*coverage_limit);
+    if (!coverage.has_value()) {
+      return std::nullopt;
+    }
+  }
+
+  ISize subpass_size = ISize::Ceil(coverage->GetSize());
+  fml::StatusOr<RenderTarget> render_target = renderer.MakeSubpass(
+      label, subpass_size,
       [&contents = *this, &entity, &coverage](const ContentContext& renderer,
                                               RenderPass& pass) -> bool {
         Entity sub_entity;
         sub_entity.SetBlendMode(BlendMode::kSourceOver);
-        sub_entity.SetTransformation(
-            Matrix::MakeTranslation(Vector3(-coverage->origin)) *
-            entity.GetTransformation());
+        sub_entity.SetTransform(
+            Matrix::MakeTranslation(Vector3(-coverage->GetOrigin())) *
+            entity.GetTransform());
         return contents.Render(renderer, sub_entity, pass);
-      });
+      },
+      msaa_enabled, /*depth_stencil_enabled=*/true,
+      std::min(mip_count, static_cast<int32_t>(subpass_size.MipCount())));
 
-  if (!texture) {
+  if (!render_target.ok()) {
     return std::nullopt;
   }
 
-  return Snapshot{.texture = texture,
-                  .transform = Matrix::MakeTranslation(coverage->origin)};
+  auto snapshot = Snapshot{
+      .texture = render_target.value().GetRenderTargetTexture(),
+      .transform = Matrix::MakeTranslation(coverage->GetOrigin()),
+  };
+  if (sampler_descriptor.has_value()) {
+    snapshot.sampler_descriptor = sampler_descriptor.value();
+  }
+
+  return snapshot;
+}
+
+bool Contents::CanInheritOpacity(const Entity& entity) const {
+  return false;
+}
+
+void Contents::SetInheritedOpacity(Scalar opacity) {
+  VALIDATION_LOG << "Contents::SetInheritedOpacity should never be called when "
+                    "Contents::CanAcceptOpacity returns false.";
+}
+
+std::optional<Color> Contents::AsBackgroundColor(const Entity& entity,
+                                                 ISize target_size) const {
+  return {};
+}
+
+const FilterContents* Contents::AsFilter() const {
+  return nullptr;
+}
+
+bool Contents::ApplyColorFilter(
+    const Contents::ColorFilterProc& color_filter_proc) {
+  return false;
 }
 
 bool Contents::ShouldRender(const Entity& entity,
-                            const std::optional<Rect>& stencil_coverage) const {
-  if (!stencil_coverage.has_value()) {
+                            const std::optional<Rect> clip_coverage) const {
+  if (!clip_coverage.has_value()) {
     return false;
   }
-  if (Entity::BlendModeShouldCoverWholeScreen(entity.GetBlendMode())) {
-    return true;
-  }
-
   auto coverage = GetCoverage(entity);
   if (!coverage.has_value()) {
     return false;
@@ -82,7 +154,23 @@ bool Contents::ShouldRender(const Entity& entity,
   if (coverage == Rect::MakeMaximum()) {
     return true;
   }
-  return stencil_coverage->IntersectsWithRect(coverage.value());
+  return clip_coverage->IntersectsWithRect(coverage.value());
+}
+
+void Contents::SetCoverageHint(std::optional<Rect> coverage_hint) {
+  coverage_hint_ = coverage_hint;
+}
+
+const std::optional<Rect>& Contents::GetCoverageHint() const {
+  return coverage_hint_;
+}
+
+std::optional<Size> Contents::GetColorSourceSize() const {
+  return color_source_size_;
+};
+
+void Contents::SetColorSourceSize(Size size) {
+  color_source_size_ = size;
 }
 
 }  // namespace impeller
diff --git a/impeller/entity/contents/contents.h b/impeller/entity/contents/contents.h
index 6d7b6edd5552434a404245676cd29d89e65d700c..ec8f1a714708a3f835e359eae99dd2fbde5bba6f 100644
--- a/impeller/entity/contents/contents.h
+++ b/impeller/entity/contents/contents.h
@@ -2,16 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_CONTENTS_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_CONTENTS_H_
 
 #include <functional>
 #include <memory>
 #include <vector>
 
 #include "flutter/fml/macros.h"
+#include "impeller/core/sampler_descriptor.h"
+#include "impeller/core/texture.h"
+#include "impeller/geometry/color.h"
 #include "impeller/geometry/rect.h"
 #include "impeller/renderer/snapshot.h"
-#include "impeller/renderer/texture.h"
+#include "impeller/typographer/lazy_glyph_atlas.h"
 
 namespace impeller {
 
@@ -20,6 +24,7 @@ struct ContentContextOptions;
 class Entity;
 class Surface;
 class RenderPass;
+class FilterContents;
 
 ContentContextOptions OptionsFromPass(const RenderPass& pass);
 
@@ -28,47 +33,175 @@ ContentContextOptions OptionsFromPassAndEntity(const RenderPass& pass,
 
 class Contents {
  public:
-  Contents();
-
-  virtual ~Contents();
+  /// A procedure that filters a given unpremultiplied color to produce a new
+  /// unpremultiplied color.
+  using ColorFilterProc = std::function<Color(Color)>;
 
-  struct StencilCoverage {
-    enum class Type { kNone, kAppend, kRestore };
+  struct ClipCoverage {
+    enum class Type { kNoChange, kAppend, kRestore };
 
-    Type type = Type::kNone;
+    Type type = Type::kNoChange;
     std::optional<Rect> coverage = std::nullopt;
   };
 
+  using RenderProc = std::function<bool(const ContentContext& renderer,
+                                        const Entity& entity,
+                                        RenderPass& pass)>;
+  using CoverageProc = std::function<std::optional<Rect>(const Entity& entity)>;
+
+  static std::shared_ptr<Contents> MakeAnonymous(RenderProc render_proc,
+                                                 CoverageProc coverage_proc);
+
+  Contents();
+
+  virtual ~Contents();
+
+  /// @brief  Add any text data to the specified lazy atlas. The scale parameter
+  ///         must be used again later when drawing the text.
+  virtual void PopulateGlyphAtlas(
+      const std::shared_ptr<LazyGlyphAtlas>& lazy_glyph_atlas,
+      Scalar scale) {}
+
   virtual bool Render(const ContentContext& renderer,
                       const Entity& entity,
                       RenderPass& pass) const = 0;
 
-  /// @brief Get the screen space bounding rectangle that this contents affects.
+  //----------------------------------------------------------------------------
+  /// @brief   Get the area of the render pass that will be affected when this
+  ///          contents is rendered.
+  ///
+  ///          During rendering, coverage coordinates count pixels from the top
+  ///          left corner of the framebuffer.
+  ///
+  /// @return  The coverage rectangle. An `std::nullopt` result means that
+  ///          rendering this contents has no effect on the output color.
+  ///
   virtual std::optional<Rect> GetCoverage(const Entity& entity) const = 0;
 
-  /// @brief Given the current screen space bounding rectangle of the stencil,
-  ///        return the expected stencil coverage after this draw call. This
-  ///        should only be implemented for contents that may write to the
-  ///        stencil buffer.
-  virtual StencilCoverage GetStencilCoverage(
+  //----------------------------------------------------------------------------
+  /// @brief  Hint that specifies the coverage area of this Contents that will
+  ///         actually be used during rendering. This is for optimization
+  ///         purposes only and can not be relied on as a clip. May optionally
+  ///         affect the result of `GetCoverage()`.
+  ///
+  void SetCoverageHint(std::optional<Rect> coverage_hint);
+
+  const std::optional<Rect>& GetCoverageHint() const;
+
+  //----------------------------------------------------------------------------
+  /// @brief Whether this Contents only emits opaque source colors from the
+  ///        fragment stage. This value does not account for any entity
+  ///        properties (e.g. the blend mode), clips/visibility culling, or
+  ///        inherited opacity.
+  ///
+  virtual bool IsOpaque() const;
+
+  //----------------------------------------------------------------------------
+  /// @brief Given the current pass space bounding rectangle of the clip
+  ///        buffer, return the expected clip coverage after this draw call.
+  ///        This should only be implemented for contents that may write to the
+  ///        clip buffer.
+  ///
+  ///        During rendering, coverage coordinates count pixels from the top
+  ///        left corner of the framebuffer.
+  ///
+  virtual ClipCoverage GetClipCoverage(
       const Entity& entity,
-      const std::optional<Rect>& current_stencil_coverage) const;
+      const std::optional<Rect>& current_clip_coverage) const;
 
+  //----------------------------------------------------------------------------
   /// @brief Render this contents to a snapshot, respecting the entity's
-  ///        transform, path, stencil depth, and blend mode.
+  ///        transform, path, clip depth, and blend mode.
   ///        The result texture size is always the size of
   ///        `GetCoverage(entity)`.
+  ///
   virtual std::optional<Snapshot> RenderToSnapshot(
       const ContentContext& renderer,
-      const Entity& entity) const;
+      const Entity& entity,
+      std::optional<Rect> coverage_limit = std::nullopt,
+      const std::optional<SamplerDescriptor>& sampler_descriptor = std::nullopt,
+      bool msaa_enabled = true,
+      int32_t mip_count = 1,
+      const std::string& label = "Snapshot") const;
 
   virtual bool ShouldRender(const Entity& entity,
-                            const std::optional<Rect>& stencil_coverage) const;
-
- protected:
+                            const std::optional<Rect> clip_coverage) const;
+
+  //----------------------------------------------------------------------------
+  /// @brief  Return the color source's intrinsic size, if available.
+  ///
+  ///         For example, a gradient has a size based on its end and beginning
+  ///         points, ignoring any tiling. Solid colors and runtime effects have
+  ///         no size.
+  ///
+  std::optional<Size> GetColorSourceSize() const;
+
+  void SetColorSourceSize(Size size);
+
+  //----------------------------------------------------------------------------
+  /// @brief Whether or not this contents can accept the opacity peephole
+  ///        optimization.
+  ///
+  ///        By default all contents return false. Contents are responsible
+  ///        for determining whether or not their own geometries intersect in
+  ///        a way that makes accepting opacity impossible. It is always safe
+  ///        to return false, especially if computing overlap would be
+  ///        computationally expensive.
+  ///
+  virtual bool CanInheritOpacity(const Entity& entity) const;
+
+  //----------------------------------------------------------------------------
+  /// @brief Inherit the provided opacity.
+  ///
+  ///        Use of this method is invalid if CanAcceptOpacity returns false.
+  ///
+  virtual void SetInheritedOpacity(Scalar opacity);
+
+  //----------------------------------------------------------------------------
+  /// @brief Returns a color if this Contents will flood the given `target_size`
+  ///        with a color. This output color is the "Source" color that will be
+  ///        used for the Entity's blend operation.
+  ///
+  ///        This is useful for absorbing full screen solid color draws into
+  ///        subpass clear colors.
+  ///
+  virtual std::optional<Color> AsBackgroundColor(const Entity& entity,
+                                                 ISize target_size) const;
+
+  //----------------------------------------------------------------------------
+  /// @brief Cast to a filter. Returns `nullptr` if this Contents is not a
+  ///        filter.
+  ///
+  virtual const FilterContents* AsFilter() const;
+
+  //----------------------------------------------------------------------------
+  /// @brief      If possible, applies a color filter to this contents inputs on
+  ///             the CPU.
+  ///
+  ///             This method will either fully apply the color filter or
+  ///             perform no action. Partial/incorrect application of the color
+  ///             filter will never occur.
+  ///
+  /// @param[in]  color_filter_proc  A function that filters a given
+  ///                                unpremultiplied color to produce a new
+  ///                                unpremultiplied color.
+  ///
+  /// @return     True if the color filter was able to be fully applied to all
+  ///             all relevant inputs. Otherwise, this operation is a no-op and
+  ///             false is returned.
+  ///
+  [[nodiscard]] virtual bool ApplyColorFilter(
+      const ColorFilterProc& color_filter_proc);
 
  private:
-  FML_DISALLOW_COPY_AND_ASSIGN(Contents);
+  std::optional<Rect> coverage_hint_;
+  std::optional<Size> color_source_size_;
+
+  Contents(const Contents&) = delete;
+
+  Contents& operator=(const Contents&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_CONTENTS_H_
diff --git a/impeller/entity/contents/filters/blend_filter_contents.cc b/impeller/entity/contents/filters/blend_filter_contents.cc
index 3215629734e60a3726d56fe2e0de3e04aa5d6516..624181c25e855d15fbed3fd57d183f51debf900a 100644
--- a/impeller/entity/contents/filters/blend_filter_contents.cc
+++ b/impeller/entity/contents/filters/blend_filter_contents.cc
@@ -8,17 +8,56 @@
 #include <memory>
 #include <optional>
 
+#include "impeller/base/strings.h"
+#include "impeller/core/formats.h"
+#include "impeller/entity/contents/anonymous_contents.h"
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/contents/contents.h"
+#include "impeller/entity/contents/filters/color_filter_contents.h"
 #include "impeller/entity/contents/filters/inputs/filter_input.h"
 #include "impeller/entity/contents/solid_color_contents.h"
 #include "impeller/entity/entity.h"
-#include "impeller/geometry/path_builder.h"
+#include "impeller/geometry/color.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_library.h"
+#include "impeller/renderer/snapshot.h"
 
 namespace impeller {
 
+std::optional<BlendMode> InvertPorterDuffBlend(BlendMode blend_mode) {
+  switch (blend_mode) {
+    case BlendMode::kClear:
+      return BlendMode::kClear;
+    case BlendMode::kSource:
+      return BlendMode::kDestination;
+    case BlendMode::kDestination:
+      return BlendMode::kSource;
+    case BlendMode::kSourceOver:
+      return BlendMode::kDestinationOver;
+    case BlendMode::kDestinationOver:
+      return BlendMode::kSourceOver;
+    case BlendMode::kSourceIn:
+      return BlendMode::kDestinationIn;
+    case BlendMode::kDestinationIn:
+      return BlendMode::kSourceIn;
+    case BlendMode::kSourceOut:
+      return BlendMode::kDestinationOut;
+    case BlendMode::kDestinationOut:
+      return BlendMode::kSourceOut;
+    case BlendMode::kSourceATop:
+      return BlendMode::kDestinationATop;
+    case BlendMode::kDestinationATop:
+      return BlendMode::kSourceATop;
+    case BlendMode::kXor:
+      return BlendMode::kXor;
+    case BlendMode::kPlus:
+      return BlendMode::kPlus;
+    case BlendMode::kModulate:
+      return BlendMode::kModulate;
+    default:
+      return std::nullopt;
+  }
+}
+
 BlendFilterContents::BlendFilterContents() {
   SetBlendMode(BlendMode::kSourceOver);
 }
@@ -29,14 +68,16 @@ using PipelineProc = std::shared_ptr<Pipeline<PipelineDescriptor>> (
     ContentContext::*)(ContentContextOptions) const;
 
 template <typename TPipeline>
-static std::optional<Snapshot> AdvancedBlend(
+static std::optional<Entity> AdvancedBlend(
     const FilterInput::Vector& inputs,
     const ContentContext& renderer,
     const Entity& entity,
     const Rect& coverage,
+    BlendMode blend_mode,
     std::optional<Color> foreground_color,
-    bool absorb_opacity,
-    PipelineProc pipeline_proc) {
+    ColorFilterContents::AbsorbOpacity absorb_opacity,
+    PipelineProc pipeline_proc,
+    std::optional<Scalar> alpha) {
   using VS = typename TPipeline::VertexShader;
   using FS = typename TPipeline::FragmentShader;
 
@@ -50,7 +91,8 @@ static std::optional<Snapshot> AdvancedBlend(
     return std::nullopt;
   }
 
-  auto dst_snapshot = inputs[0]->GetSnapshot(renderer, entity);
+  auto dst_snapshot =
+      inputs[0]->GetSnapshot("AdvancedBlend(Dst)", renderer, entity);
   if (!dst_snapshot.has_value()) {
     return std::nullopt;
   }
@@ -63,53 +105,89 @@ static std::optional<Snapshot> AdvancedBlend(
   std::optional<Snapshot> src_snapshot;
   std::array<Point, 4> src_uvs;
   if (!foreground_color.has_value()) {
-    src_snapshot = inputs[1]->GetSnapshot(renderer, entity);
+    src_snapshot =
+        inputs[1]->GetSnapshot("AdvancedBlend(Src)", renderer, entity);
     if (!src_snapshot.has_value()) {
-      return dst_snapshot;
+      if (!dst_snapshot.has_value()) {
+        return std::nullopt;
+      }
+      return Entity::FromSnapshot(dst_snapshot.value(), entity.GetBlendMode(),
+                                  entity.GetClipDepth());
     }
     auto maybe_src_uvs = src_snapshot->GetCoverageUVs(coverage);
     if (!maybe_src_uvs.has_value()) {
-      return dst_snapshot;
+      if (!dst_snapshot.has_value()) {
+        return std::nullopt;
+      }
+      return Entity::FromSnapshot(dst_snapshot.value(), entity.GetBlendMode(),
+                                  entity.GetClipDepth());
     }
     src_uvs = maybe_src_uvs.value();
   }
 
+  Rect subpass_coverage = coverage;
+  if (entity.GetContents()) {
+    auto coverage_hint = entity.GetContents()->GetCoverageHint();
+
+    if (coverage_hint.has_value()) {
+      auto maybe_subpass_coverage =
+          subpass_coverage.Intersection(*coverage_hint);
+      if (!maybe_subpass_coverage.has_value()) {
+        return std::nullopt;  // Nothing to render.
+      }
+
+      subpass_coverage = *maybe_subpass_coverage;
+    }
+  }
+
   //----------------------------------------------------------------------------
   /// Render to texture.
   ///
 
   ContentContext::SubpassCallback callback = [&](const ContentContext& renderer,
                                                  RenderPass& pass) {
-    auto& host_buffer = pass.GetTransientsBuffer();
+    auto& host_buffer = renderer.GetTransientsBuffer();
 
     auto size = pass.GetRenderTargetSize();
     VertexBufferBuilder<typename VS::PerVertexData> vtx_builder;
     vtx_builder.AddVertices({
         {Point(0, 0), dst_uvs[0], src_uvs[0]},
         {Point(size.width, 0), dst_uvs[1], src_uvs[1]},
-        {Point(size.width, size.height), dst_uvs[3], src_uvs[3]},
-        {Point(0, 0), dst_uvs[0], src_uvs[0]},
-        {Point(size.width, size.height), dst_uvs[3], src_uvs[3]},
         {Point(0, size.height), dst_uvs[2], src_uvs[2]},
+        {Point(size.width, size.height), dst_uvs[3], src_uvs[3]},
     });
     auto vtx_buffer = vtx_builder.CreateVertexBuffer(host_buffer);
 
     auto options = OptionsFromPass(pass);
+    options.primitive_type = PrimitiveType::kTriangleStrip;
     options.blend_mode = BlendMode::kSource;
     std::shared_ptr<Pipeline<PipelineDescriptor>> pipeline =
         std::invoke(pipeline_proc, renderer, options);
 
-    Command cmd;
-    cmd.label = "Advanced Blend Filter";
-    cmd.BindVertices(vtx_buffer);
-    cmd.pipeline = std::move(pipeline);
+#ifdef IMPELLER_DEBUG
+    pass.SetCommandLabel(
+        SPrintF("Advanced Blend Filter (%s)", BlendModeToString(blend_mode)));
+#endif  // IMPELLER_DEBUG
+    pass.SetVertexBuffer(std::move(vtx_buffer));
+    pass.SetPipeline(pipeline);
 
     typename FS::BlendInfo blend_info;
+    typename VS::FrameInfo frame_info;
 
-    auto sampler = renderer.GetContext()->GetSamplerLibrary()->GetSampler({});
-    FS::BindTextureSamplerDst(cmd, dst_snapshot->texture, sampler);
-    blend_info.dst_y_coord_scale = dst_snapshot->texture->GetYCoordScale();
-    blend_info.dst_input_alpha = absorb_opacity ? dst_snapshot->opacity : 1.0f;
+    auto dst_sampler_descriptor = dst_snapshot->sampler_descriptor;
+    if (renderer.GetDeviceCapabilities().SupportsDecalSamplerAddressMode()) {
+      dst_sampler_descriptor.width_address_mode = SamplerAddressMode::kDecal;
+      dst_sampler_descriptor.height_address_mode = SamplerAddressMode::kDecal;
+    }
+    const std::unique_ptr<const Sampler>& dst_sampler =
+        renderer.GetContext()->GetSamplerLibrary()->GetSampler(
+            dst_sampler_descriptor);
+    FS::BindTextureSamplerDst(pass, dst_snapshot->texture, dst_sampler);
+    frame_info.dst_y_coord_scale = dst_snapshot->texture->GetYCoordScale();
+    blend_info.dst_input_alpha =
+        absorb_opacity == ColorFilterContents::AbsorbOpacity::kYes
+            ? dst_snapshot->opacity
+            : 1.0;
 
     if (foreground_color.has_value()) {
       blend_info.color_factor = 1;
@@ -117,59 +195,248 @@ static std::optional<Snapshot> AdvancedBlend(
       // This texture will not be sampled from due to the color factor. But
       // this is present so that validation doesn't trip on a missing
       // binding.
-      FS::BindTextureSamplerSrc(cmd, dst_snapshot->texture, sampler);
+      FS::BindTextureSamplerSrc(pass, dst_snapshot->texture, dst_sampler);
     } else {
+      auto src_sampler_descriptor = src_snapshot->sampler_descriptor;
+      if (renderer.GetDeviceCapabilities().SupportsDecalSamplerAddressMode()) {
+        src_sampler_descriptor.width_address_mode = SamplerAddressMode::kDecal;
+        src_sampler_descriptor.height_address_mode = SamplerAddressMode::kDecal;
+      }
+      const std::unique_ptr<const Sampler>& src_sampler =
+          renderer.GetContext()->GetSamplerLibrary()->GetSampler(
+              src_sampler_descriptor);
       blend_info.color_factor = 0;
-      FS::BindTextureSamplerSrc(cmd, src_snapshot->texture, sampler);
-      blend_info.src_y_coord_scale = src_snapshot->texture->GetYCoordScale();
+      blend_info.src_input_alpha = src_snapshot->opacity;
+      FS::BindTextureSamplerSrc(pass, src_snapshot->texture, src_sampler);
+      frame_info.src_y_coord_scale = src_snapshot->texture->GetYCoordScale();
     }
     auto blend_uniform = host_buffer.EmplaceUniform(blend_info);
-    FS::BindBlendInfo(cmd, blend_uniform);
+    FS::BindBlendInfo(pass, blend_uniform);
 
-    typename VS::FrameInfo frame_info;
-    frame_info.mvp = Matrix::MakeOrthographic(size);
+    frame_info.mvp = pass.GetOrthographicTransform() *
+                     Matrix::MakeTranslation(coverage.GetOrigin() -
+                                             subpass_coverage.GetOrigin());
 
     auto uniform_view = host_buffer.EmplaceUniform(frame_info);
-    VS::BindFrameInfo(cmd, uniform_view);
-    pass.AddCommand(cmd);
+    VS::BindFrameInfo(pass, uniform_view);
 
-    return true;
+    return pass.Draw().ok();
   };
 
-  auto out_texture = renderer.MakeSubpass(ISize(coverage.size), callback);
-  if (!out_texture) {
+  fml::StatusOr<RenderTarget> render_target = renderer.MakeSubpass(
+      "Advanced Blend Filter", ISize(subpass_coverage.GetSize()), callback);
+  if (!render_target.ok()) {
     return std::nullopt;
   }
-  out_texture->SetLabel("Advanced Blend Filter Texture");
 
-  return Snapshot{.texture = out_texture,
-                  .transform = Matrix::MakeTranslation(coverage.origin),
-                  .sampler_descriptor = dst_snapshot->sampler_descriptor,
-                  .opacity = absorb_opacity ? 1.0f : dst_snapshot->opacity};
+  return Entity::FromSnapshot(
+      Snapshot{
+          .texture = render_target.value().GetRenderTargetTexture(),
+          .transform = Matrix::MakeTranslation(subpass_coverage.GetOrigin()),
+          // Since we absorbed the transform of the inputs and used the
+          // respective snapshot sampling modes when blending, pass on
+          // the default NN clamp sampler.
+          .sampler_descriptor = {},
+          .opacity = (absorb_opacity == ColorFilterContents::AbsorbOpacity::kYes
+                          ? 1.0f
+                          : dst_snapshot->opacity) *
+                     alpha.value_or(1.0)},
+      entity.GetBlendMode(), entity.GetClipDepth());
+}
+
+std::optional<Entity> BlendFilterContents::CreateForegroundAdvancedBlend(
+    const std::shared_ptr<FilterInput>& input,
+    const ContentContext& renderer,
+    const Entity& entity,
+    const Rect& coverage,
+    Color foreground_color,
+    BlendMode blend_mode,
+    std::optional<Scalar> alpha,
+    ColorFilterContents::AbsorbOpacity absorb_opacity) const {
+  auto dst_snapshot =
+      input->GetSnapshot("ForegroundAdvancedBlend", renderer, entity);
+  if (!dst_snapshot.has_value()) {
+    return std::nullopt;
+  }
+
+  RenderProc render_proc = [foreground_color, coverage, dst_snapshot,
+                            blend_mode, alpha, absorb_opacity](
+                               const ContentContext& renderer,
+                               const Entity& entity, RenderPass& pass) -> bool {
+    using VS = BlendScreenPipeline::VertexShader;
+    using FS = BlendScreenPipeline::FragmentShader;
+
+    auto& host_buffer = renderer.GetTransientsBuffer();
+
+    auto maybe_dst_uvs = dst_snapshot->GetCoverageUVs(coverage);
+    if (!maybe_dst_uvs.has_value()) {
+      return false;
+    }
+    auto dst_uvs = maybe_dst_uvs.value();
+
+    auto size = coverage.GetSize();
+    auto origin = coverage.GetOrigin();
+    VertexBufferBuilder<VS::PerVertexData> vtx_builder;
+    vtx_builder.AddVertices({
+        {origin, dst_uvs[0], dst_uvs[0]},
+        {Point(origin.x + size.width, origin.y), dst_uvs[1], dst_uvs[1]},
+        {Point(origin.x, origin.y + size.height), dst_uvs[2], dst_uvs[2]},
+        {Point(origin.x + size.width, origin.y + size.height), dst_uvs[3],
+         dst_uvs[3]},
+    });
+    auto vtx_buffer = vtx_builder.CreateVertexBuffer(host_buffer);
+
+#ifdef IMPELLER_DEBUG
+    pass.SetCommandLabel(SPrintF("Foreground Advanced Blend Filter (%s)",
+                                 BlendModeToString(blend_mode)));
+#endif  // IMPELLER_DEBUG
+    pass.SetVertexBuffer(std::move(vtx_buffer));
+    pass.SetStencilReference(entity.GetClipDepth());
+    auto options = OptionsFromPass(pass);
+    options.primitive_type = PrimitiveType::kTriangleStrip;
+
+    switch (blend_mode) {
+      case BlendMode::kScreen:
+        pass.SetPipeline(renderer.GetBlendScreenPipeline(options));
+        break;
+      case BlendMode::kOverlay:
+        pass.SetPipeline(renderer.GetBlendOverlayPipeline(options));
+        break;
+      case BlendMode::kDarken:
+        pass.SetPipeline(renderer.GetBlendDarkenPipeline(options));
+        break;
+      case BlendMode::kLighten:
+        pass.SetPipeline(renderer.GetBlendLightenPipeline(options));
+        break;
+      case BlendMode::kColorDodge:
+        pass.SetPipeline(renderer.GetBlendColorDodgePipeline(options));
+        break;
+      case BlendMode::kColorBurn:
+        pass.SetPipeline(renderer.GetBlendColorBurnPipeline(options));
+        break;
+      case BlendMode::kHardLight:
+        pass.SetPipeline(renderer.GetBlendHardLightPipeline(options));
+        break;
+      case BlendMode::kSoftLight:
+        pass.SetPipeline(renderer.GetBlendSoftLightPipeline(options));
+        break;
+      case BlendMode::kDifference:
+        pass.SetPipeline(renderer.GetBlendDifferencePipeline(options));
+        break;
+      case BlendMode::kExclusion:
+        pass.SetPipeline(renderer.GetBlendExclusionPipeline(options));
+        break;
+      case BlendMode::kMultiply:
+        pass.SetPipeline(renderer.GetBlendMultiplyPipeline(options));
+        break;
+      case BlendMode::kHue:
+        pass.SetPipeline(renderer.GetBlendHuePipeline(options));
+        break;
+      case BlendMode::kSaturation:
+        pass.SetPipeline(renderer.GetBlendSaturationPipeline(options));
+        break;
+      case BlendMode::kColor:
+        pass.SetPipeline(renderer.GetBlendColorPipeline(options));
+        break;
+      case BlendMode::kLuminosity:
+        pass.SetPipeline(renderer.GetBlendLuminosityPipeline(options));
+        break;
+      default:
+        return false;
+    }
+
+    FS::BlendInfo blend_info;
+    VS::FrameInfo frame_info;
+
+    auto dst_sampler_descriptor = dst_snapshot->sampler_descriptor;
+    if (renderer.GetDeviceCapabilities().SupportsDecalSamplerAddressMode()) {
+      dst_sampler_descriptor.width_address_mode = SamplerAddressMode::kDecal;
+      dst_sampler_descriptor.height_address_mode = SamplerAddressMode::kDecal;
+    }
+    const std::unique_ptr<const Sampler>& dst_sampler =
+        renderer.GetContext()->GetSamplerLibrary()->GetSampler(
+            dst_sampler_descriptor);
+    FS::BindTextureSamplerDst(pass, dst_snapshot->texture, dst_sampler);
+    frame_info.dst_y_coord_scale = dst_snapshot->texture->GetYCoordScale();
+    blend_info.dst_input_alpha =
+        absorb_opacity == ColorFilterContents::AbsorbOpacity::kYes
+            ? dst_snapshot->opacity * alpha.value_or(1.0)
+            : 1.0;
+
+    blend_info.color_factor = 1;
+    blend_info.color = foreground_color;
+    // This texture will not be sampled from due to the color factor. But
+    // this is present so that validation doesn't trip on a missing
+    // binding.
+    FS::BindTextureSamplerSrc(pass, dst_snapshot->texture, dst_sampler);
+
+    auto blend_uniform = host_buffer.EmplaceUniform(blend_info);
+    FS::BindBlendInfo(pass, blend_uniform);
+
+    frame_info.mvp = entity.GetShaderTransform(pass);
+
+    auto uniform_view = host_buffer.EmplaceUniform(frame_info);
+    VS::BindFrameInfo(pass, uniform_view);
+
+    return pass.Draw().ok();
+  };
+  CoverageProc coverage_proc =
+      [coverage](const Entity& entity) -> std::optional<Rect> {
+    return coverage.TransformBounds(entity.GetTransform());
+  };
+
+  auto contents = AnonymousContents::Make(render_proc, coverage_proc);
+
+  Entity sub_entity;
+  sub_entity.SetContents(std::move(contents));
+  sub_entity.SetClipDepth(entity.GetClipDepth());
+
+  return sub_entity;
 }
 
-static std::optional<Snapshot> PipelineBlend(
+static std::optional<Entity> PipelineBlend(
     const FilterInput::Vector& inputs,
     const ContentContext& renderer,
     const Entity& entity,
     const Rect& coverage,
-    BlendMode pipeline_blend,
+    BlendMode blend_mode,
     std::optional<Color> foreground_color,
-    bool absorb_opacity) {
+    ColorFilterContents::AbsorbOpacity absorb_opacity,
+    std::optional<Scalar> alpha) {
   using VS = BlendPipeline::VertexShader;
   using FS = BlendPipeline::FragmentShader;
 
-  auto input_snapshot = inputs[0]->GetSnapshot(renderer, entity);
+  auto dst_snapshot =
+      inputs[0]->GetSnapshot("PipelineBlend(Dst)", renderer, entity);
+  if (!dst_snapshot.has_value()) {
+    return std::nullopt;  // Nothing to render.
+  }
+
+  Rect subpass_coverage = coverage;
+  if (entity.GetContents()) {
+    auto coverage_hint = entity.GetContents()->GetCoverageHint();
+
+    if (coverage_hint.has_value()) {
+      auto maybe_subpass_coverage =
+          subpass_coverage.Intersection(*coverage_hint);
+      if (!maybe_subpass_coverage.has_value()) {
+        return std::nullopt;  // Nothing to render.
+      }
+
+      subpass_coverage = *maybe_subpass_coverage;
+    }
+  }
 
   ContentContext::SubpassCallback callback = [&](const ContentContext& renderer,
                                                  RenderPass& pass) {
-    auto& host_buffer = pass.GetTransientsBuffer();
-
-    auto sampler = renderer.GetContext()->GetSamplerLibrary()->GetSampler({});
+    auto& host_buffer = renderer.GetTransientsBuffer();
 
-    Command cmd;
-    cmd.label = "Pipeline Blend Filter";
+#ifdef IMPELLER_DEBUG
+    pass.SetCommandLabel(
+        SPrintF("Pipeline Blend Filter (%s)", BlendModeToString(blend_mode)));
+#endif  // IMPELLER_DEBUG
     auto options = OptionsFromPass(pass);
+    options.primitive_type = PrimitiveType::kTriangleStrip;
 
     auto add_blend_command = [&](std::optional<Snapshot> input) {
       if (!input.has_value()) {
@@ -180,53 +447,57 @@ static std::optional<Snapshot> PipelineBlend(
         return false;
       }
 
-      FS::BindTextureSamplerSrc(cmd, input->texture, sampler);
+      const std::unique_ptr<const Sampler>& sampler =
+          renderer.GetContext()->GetSamplerLibrary()->GetSampler(
+              input->sampler_descriptor);
+      FS::BindTextureSamplerSrc(pass, input->texture, sampler);
 
       auto size = input->texture->GetSize();
       VertexBufferBuilder<VS::PerVertexData> vtx_builder;
       vtx_builder.AddVertices({
           {Point(0, 0), Point(0, 0)},
           {Point(size.width, 0), Point(1, 0)},
-          {Point(size.width, size.height), Point(1, 1)},
-          {Point(0, 0), Point(0, 0)},
-          {Point(size.width, size.height), Point(1, 1)},
           {Point(0, size.height), Point(0, 1)},
+          {Point(size.width, size.height), Point(1, 1)},
       });
-      auto vtx_buffer = vtx_builder.CreateVertexBuffer(host_buffer);
-      cmd.BindVertices(vtx_buffer);
+      pass.SetVertexBuffer(vtx_builder.CreateVertexBuffer(host_buffer));
 
       VS::FrameInfo frame_info;
-      frame_info.mvp = Matrix::MakeOrthographic(pass.GetRenderTargetSize()) *
-                       Matrix::MakeTranslation(-coverage.origin) *
+      frame_info.mvp = pass.GetOrthographicTransform() *
+                       Matrix::MakeTranslation(-subpass_coverage.GetOrigin()) *
                        input->transform;
-      FS::FragInfo frag_info;
-      frag_info.texture_sampler_y_coord_scale =
+      frame_info.texture_sampler_y_coord_scale =
           input->texture->GetYCoordScale();
-      frag_info.input_alpha = absorb_opacity ? input->opacity : 1.0f;
-      FS::BindFragInfo(cmd, host_buffer.EmplaceUniform(frag_info));
-      VS::BindFrameInfo(cmd, host_buffer.EmplaceUniform(frame_info));
 
-      pass.AddCommand(cmd);
-      return true;
+      FS::FragInfo frag_info;
+      frag_info.input_alpha =
+          absorb_opacity == ColorFilterContents::AbsorbOpacity::kYes
+              ? input->opacity
+              : 1.0;
+      FS::BindFragInfo(pass, host_buffer.EmplaceUniform(frag_info));
+      VS::BindFrameInfo(pass, host_buffer.EmplaceUniform(frame_info));
+
+      return pass.Draw().ok();
     };
 
     // Draw the first texture using kSource.
     options.blend_mode = BlendMode::kSource;
-    cmd.pipeline = renderer.GetBlendPipeline(options);
-    if (!add_blend_command(input_snapshot)) {
+    pass.SetPipeline(renderer.GetBlendPipeline(options));
+    if (!add_blend_command(dst_snapshot)) {
       return true;
     }
 
     // Write subsequent textures using the selected blend mode.
 
     if (inputs.size() >= 2) {
-      options.blend_mode = pipeline_blend;
-      cmd.pipeline = renderer.GetBlendPipeline(options);
+      options.blend_mode = blend_mode;
+      pass.SetPipeline(renderer.GetBlendPipeline(options));
 
       for (auto texture_i = inputs.begin() + 1; texture_i < inputs.end();
            texture_i++) {
-        auto input = texture_i->get()->GetSnapshot(renderer, entity);
-        if (!add_blend_command(input)) {
+        auto src_input = texture_i->get()->GetSnapshot("PipelineBlend(Src)",
+                                                       renderer, entity);
+        if (!add_blend_command(src_input)) {
           return true;
         }
       }
@@ -236,14 +507,12 @@ static std::optional<Snapshot> PipelineBlend(
 
     if (foreground_color.has_value()) {
       auto contents = std::make_shared<SolidColorContents>();
-      contents->SetGeometry(Geometry::MakeFillPath(
-          PathBuilder{}
-              .AddRect(Rect::MakeSize(pass.GetRenderTargetSize()))
-              .TakePath()));
+      contents->SetGeometry(
+          Geometry::MakeRect(Rect::MakeSize(pass.GetRenderTargetSize())));
       contents->SetColor(foreground_color.value());
 
       Entity foreground_entity;
-      foreground_entity.SetBlendMode(pipeline_blend);
+      foreground_entity.SetBlendMode(blend_mode);
       foreground_entity.SetContents(contents);
       if (!foreground_entity.Render(renderer, pass)) {
         return false;
@@ -253,31 +522,41 @@ static std::optional<Snapshot> PipelineBlend(
     return true;
   };
 
-  auto out_texture = renderer.MakeSubpass(ISize(coverage.size), callback);
-  if (!out_texture) {
+  fml::StatusOr<RenderTarget> render_target = renderer.MakeSubpass(
+      "Pipeline Blend Filter", ISize(subpass_coverage.GetSize()), callback);
+
+  if (!render_target.ok()) {
     return std::nullopt;
   }
-  out_texture->SetLabel("Pipeline Blend Filter Texture");
-
-  return Snapshot{
-      .texture = out_texture,
-      .transform = Matrix::MakeTranslation(coverage.origin),
-      .sampler_descriptor =
-          inputs[0]->GetSnapshot(renderer, entity)->sampler_descriptor,
-      .opacity = absorb_opacity ? 1.0f : input_snapshot->opacity};
+
+  return Entity::FromSnapshot(
+      Snapshot{
+          .texture = render_target.value().GetRenderTargetTexture(),
+          .transform = Matrix::MakeTranslation(subpass_coverage.GetOrigin()),
+          // Since we absorbed the transform of the inputs and used the
+          // respective snapshot sampling modes when blending, pass on
+          // the default NN clamp sampler.
+          .sampler_descriptor = {},
+          .opacity = (absorb_opacity == ColorFilterContents::AbsorbOpacity::kYes
+                          ? 1.0f
+                          : dst_snapshot->opacity) *
+                     alpha.value_or(1.0)},
+      entity.GetBlendMode(), entity.GetClipDepth());
 }
 
-#define BLEND_CASE(mode)                                                    \
-  case BlendMode::k##mode:                                                  \
-    advanced_blend_proc_ = [](const FilterInput::Vector& inputs,            \
-                              const ContentContext& renderer,               \
-                              const Entity& entity, const Rect& coverage,   \
-                              std::optional<Color> fg_color,                \
-                              bool absorb_opacity) {                        \
-      PipelineProc p = &ContentContext::GetBlend##mode##Pipeline;           \
-      return AdvancedBlend<BlendScreenPipeline>(                            \
-          inputs, renderer, entity, coverage, fg_color, absorb_opacity, p); \
-    };                                                                      \
+#define BLEND_CASE(mode)                                                      \
+  case BlendMode::k##mode:                                                    \
+    advanced_blend_proc_ =                                                    \
+        [](const FilterInput::Vector& inputs, const ContentContext& renderer, \
+           const Entity& entity, const Rect& coverage, BlendMode blend_mode,  \
+           std::optional<Color> fg_color,                                     \
+           ColorFilterContents::AbsorbOpacity absorb_opacity,                 \
+           std::optional<Scalar> alpha) {                                     \
+          PipelineProc p = &ContentContext::GetBlend##mode##Pipeline;         \
+          return AdvancedBlend<Blend##mode##Pipeline>(                        \
+              inputs, renderer, entity, coverage, blend_mode, fg_color,       \
+              absorb_opacity, p, alpha);                                      \
+        };                                                                    \
     break;
 
 void BlendFilterContents::SetBlendMode(BlendMode blend_mode) {
@@ -315,12 +594,13 @@ void BlendFilterContents::SetForegroundColor(std::optional<Color> color) {
   foreground_color_ = color;
 }
 
-std::optional<Snapshot> BlendFilterContents::RenderFilter(
+std::optional<Entity> BlendFilterContents::RenderFilter(
     const FilterInput::Vector& inputs,
     const ContentContext& renderer,
     const Entity& entity,
     const Matrix& effect_transform,
-    const Rect& coverage) const {
+    const Rect& coverage,
+    const std::optional<Rect>& coverage_hint) const {
   if (inputs.empty()) {
     return std::nullopt;
   }
@@ -328,20 +608,28 @@ std::optional<Snapshot> BlendFilterContents::RenderFilter(
   if (inputs.size() == 1 && !foreground_color_.has_value()) {
     // Nothing to blend.
     return PipelineBlend(inputs, renderer, entity, coverage, BlendMode::kSource,
-                         std::nullopt, GetAbsorbOpacity());
+                         std::nullopt, GetAbsorbOpacity(), GetAlpha());
   }
 
   if (blend_mode_ <= Entity::kLastPipelineBlendMode) {
     return PipelineBlend(inputs, renderer, entity, coverage, blend_mode_,
-                         foreground_color_, GetAbsorbOpacity());
+                         foreground_color_, GetAbsorbOpacity(), GetAlpha());
   }
 
   if (blend_mode_ <= Entity::kLastAdvancedBlendMode) {
-    return advanced_blend_proc_(inputs, renderer, entity, coverage,
-                                foreground_color_, GetAbsorbOpacity());
+    if (inputs.size() == 1 && foreground_color_.has_value() &&
+        GetAbsorbOpacity() == ColorFilterContents::AbsorbOpacity::kYes) {
+      return CreateForegroundAdvancedBlend(
+          inputs[0], renderer, entity, coverage, foreground_color_.value(),
+          blend_mode_, GetAlpha(), GetAbsorbOpacity());
+    }
+    return advanced_blend_proc_(inputs, renderer, entity, coverage, blend_mode_,
+                                foreground_color_, GetAbsorbOpacity(),
+                                GetAlpha());
   }
+
   FML_UNREACHABLE();
-  std::optional<Snapshot> ret;
+  std::optional<Entity> ret;
   return ret;
 }
 
diff --git a/impeller/entity/contents/filters/blend_filter_contents.h b/impeller/entity/contents/filters/blend_filter_contents.h
index 5276eb81f05f1334dca609f05fd44f4def4ac0ac..75f575f5b2aafa6866dea9bfcfd1f54d947bacbc 100644
--- a/impeller/entity/contents/filters/blend_filter_contents.h
+++ b/impeller/entity/contents/filters/blend_filter_contents.h
@@ -2,22 +2,47 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_BLEND_FILTER_CONTENTS_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_BLEND_FILTER_CONTENTS_H_
 
+#include <optional>
 #include "impeller/entity/contents/filters/color_filter_contents.h"
 #include "impeller/entity/contents/filters/inputs/filter_input.h"
+#include "impeller/geometry/color.h"
 
 namespace impeller {
 
+constexpr std::array<std::array<Scalar, 5>, 15> kPorterDuffCoefficients = {{
+    {0, 0, 0, 0, 0},    // Clear
+    {1, 0, 0, 0, 0},    // Source
+    {0, 0, 1, 0, 0},    // Destination
+    {1, 0, 1, -1, 0},   // SourceOver
+    {1, -1, 1, 0, 0},   // DestinationOver
+    {0, 1, 0, 0, 0},    // SourceIn
+    {0, 0, 0, 1, 0},    // DestinationIn
+    {1, -1, 0, 0, 0},   // SourceOut
+    {0, 0, 1, -1, 0},   // DestinationOut
+    {0, 1, 1, -1, 0},   // SourceATop
+    {1, -1, 0, 1, 0},   // DestinationATop
+    {1, -1, 1, -1, 0},  // Xor
+    {1, 0, 1, 0, 0},    // Plus
+    {0, 0, 0, 0, 1},    // Modulate
+    {0, 0, 1, 0, -1},   // Screen
+}};
+
+std::optional<BlendMode> InvertPorterDuffBlend(BlendMode blend_mode);
+
 class BlendFilterContents : public ColorFilterContents {
  public:
-  using AdvancedBlendProc = std::function<std::optional<Snapshot>(
+  using AdvancedBlendProc = std::function<std::optional<Entity>(
       const FilterInput::Vector& inputs,
       const ContentContext& renderer,
       const Entity& entity,
       const Rect& coverage,
+      BlendMode blend_mode,
       std::optional<Color> foreground_color,
-      bool absorb_opacity)>;
+      ColorFilterContents::AbsorbOpacity absorb_opacity,
+      std::optional<Scalar> alpha)>;
 
   BlendFilterContents();
 
@@ -31,17 +56,37 @@ class BlendFilterContents : public ColorFilterContents {
 
  private:
   // |FilterContents|
-  std::optional<Snapshot> RenderFilter(const FilterInput::Vector& inputs,
-                                       const ContentContext& renderer,
-                                       const Entity& entity,
-                                       const Matrix& effect_transform,
-                                       const Rect& coverage) const override;
+  std::optional<Entity> RenderFilter(
+      const FilterInput::Vector& inputs,
+      const ContentContext& renderer,
+      const Entity& entity,
+      const Matrix& effect_transform,
+      const Rect& coverage,
+      const std::optional<Rect>& coverage_hint) const override;
+
+  /// @brief Optimized advanced blend that avoids a second subpass when there is
+  ///        only a single input and a foreground color.
+  ///
+  /// These contents cannot absorb opacity.
+  std::optional<Entity> CreateForegroundAdvancedBlend(
+      const std::shared_ptr<FilterInput>& input,
+      const ContentContext& renderer,
+      const Entity& entity,
+      const Rect& coverage,
+      Color foreground_color,
+      BlendMode blend_mode,
+      std::optional<Scalar> alpha,
+      ColorFilterContents::AbsorbOpacity absorb_opacity) const;
 
   BlendMode blend_mode_ = BlendMode::kSourceOver;
   AdvancedBlendProc advanced_blend_proc_;
   std::optional<Color> foreground_color_;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(BlendFilterContents);
+  BlendFilterContents(const BlendFilterContents&) = delete;
+
+  BlendFilterContents& operator=(const BlendFilterContents&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_BLEND_FILTER_CONTENTS_H_
diff --git a/impeller/entity/contents/filters/border_mask_blur_filter_contents.cc b/impeller/entity/contents/filters/border_mask_blur_filter_contents.cc
index 847cfafa8815f86514baec68e692240067fd7af0..3179ad3c3bfe83648699ec5a5891f4b527ff0f96 100644
--- a/impeller/entity/contents/filters/border_mask_blur_filter_contents.cc
+++ b/impeller/entity/contents/filters/border_mask_blur_filter_contents.cc
@@ -5,9 +5,10 @@
 #include "impeller/entity/contents/filters/border_mask_blur_filter_contents.h"
 #include "impeller/entity/contents/content_context.h"
 
+#include "impeller/entity/contents/anonymous_contents.h"
 #include "impeller/entity/contents/contents.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_library.h"
+#include "impeller/renderer/vertex_buffer_builder.h"
 
 namespace impeller {
 
@@ -47,12 +48,13 @@ void BorderMaskBlurFilterContents::SetBlurStyle(BlurStyle blur_style) {
   }
 }
 
-std::optional<Snapshot> BorderMaskBlurFilterContents::RenderFilter(
+std::optional<Entity> BorderMaskBlurFilterContents::RenderFilter(
     const FilterInput::Vector& inputs,
     const ContentContext& renderer,
     const Entity& entity,
     const Matrix& effect_transform,
-    const Rect& coverage) const {
+    const Rect& coverage,
+    const std::optional<Rect>& coverage_hint) const {
   using VS = BorderMaskBlurPipeline::VertexShader;
   using FS = BorderMaskBlurPipeline::FragmentShader;
 
@@ -64,10 +66,12 @@ std::optional<Snapshot> BorderMaskBlurFilterContents::RenderFilter(
     return std::nullopt;
   }
 
-  auto input_snapshot = inputs[0]->GetSnapshot(renderer, entity);
+  auto input_snapshot =
+      inputs[0]->GetSnapshot("BorderMaskBlur", renderer, entity);
   if (!input_snapshot.has_value()) {
     return std::nullopt;
   }
+
   auto maybe_input_uvs = input_snapshot->GetCoverageUVs(coverage);
   if (!maybe_input_uvs.has_value()) {
     return std::nullopt;
@@ -75,60 +79,69 @@ std::optional<Snapshot> BorderMaskBlurFilterContents::RenderFilter(
   auto input_uvs = maybe_input_uvs.value();
 
   //----------------------------------------------------------------------------
-  /// Render to texture.
+  /// Create AnonymousContents for rendering.
   ///
 
-  ContentContext::SubpassCallback callback = [&](const ContentContext& renderer,
-                                                 RenderPass& pass) {
-    auto& host_buffer = pass.GetTransientsBuffer();
+  auto sigma = effect_transform * Vector2(sigma_x_.sigma, sigma_y_.sigma);
+  RenderProc render_proc = [coverage, input_snapshot, input_uvs = input_uvs,
+                            src_color_factor = src_color_factor_,
+                            inner_blur_factor = inner_blur_factor_,
+                            outer_blur_factor = outer_blur_factor_, sigma](
+                               const ContentContext& renderer,
+                               const Entity& entity, RenderPass& pass) -> bool {
+    auto& host_buffer = renderer.GetTransientsBuffer();
 
     VertexBufferBuilder<VS::PerVertexData> vtx_builder;
+    auto origin = coverage.GetOrigin();
+    auto size = coverage.GetSize();
     vtx_builder.AddVertices({
-        {Point(0, 0), input_uvs[0]},
-        {Point(1, 0), input_uvs[1]},
-        {Point(1, 1), input_uvs[3]},
-        {Point(0, 0), input_uvs[0]},
-        {Point(1, 1), input_uvs[3]},
-        {Point(0, 1), input_uvs[2]},
+        {origin, input_uvs[0]},
+        {{origin.x + size.width, origin.y}, input_uvs[1]},
+        {{origin.x, origin.y + size.height}, input_uvs[2]},
+        {{origin.x + size.width, origin.y + size.height}, input_uvs[3]},
     });
-    auto vtx_buffer = vtx_builder.CreateVertexBuffer(host_buffer);
 
-    Command cmd;
-    cmd.label = "Border Mask Blur Filter";
-    auto options = OptionsFromPass(pass);
-    options.blend_mode = BlendMode::kSource;
-    cmd.pipeline = renderer.GetBorderMaskBlurPipeline(options);
-    cmd.BindVertices(vtx_buffer);
+    auto options = OptionsFromPassAndEntity(pass, entity);
+    options.primitive_type = PrimitiveType::kTriangleStrip;
 
     VS::FrameInfo frame_info;
-    frame_info.mvp = Matrix::MakeOrthographic(ISize(1, 1));
+    frame_info.mvp = entity.GetShaderTransform(pass);
+    frame_info.texture_sampler_y_coord_scale =
+        input_snapshot->texture->GetYCoordScale();
 
-    auto sigma = effect_transform * Vector2(sigma_x_.sigma, sigma_y_.sigma);
-    frame_info.sigma_uv = sigma.Abs() / input_snapshot->texture->GetSize();
-    frame_info.src_factor = src_color_factor_;
-    frame_info.inner_blur_factor = inner_blur_factor_;
-    frame_info.outer_blur_factor = outer_blur_factor_;
     FS::FragInfo frag_info;
-    frag_info.texture_sampler_y_coord_scale =
-        input_snapshot->texture->GetYCoordScale();
-    FS::BindFragInfo(cmd, host_buffer.EmplaceUniform(frag_info));
-    VS::BindFrameInfo(cmd, host_buffer.EmplaceUniform(frame_info));
+    frag_info.sigma_uv = sigma.Abs() / input_snapshot->texture->GetSize();
+    frag_info.src_factor = src_color_factor;
+    frag_info.inner_blur_factor = inner_blur_factor;
+    frag_info.outer_blur_factor = outer_blur_factor;
+
+    pass.SetCommandLabel("Border Mask Blur Filter");
+    pass.SetPipeline(renderer.GetBorderMaskBlurPipeline(options));
+    pass.SetVertexBuffer(vtx_builder.CreateVertexBuffer(host_buffer));
+    pass.SetStencilReference(entity.GetClipDepth());
 
-    auto sampler = renderer.GetContext()->GetSamplerLibrary()->GetSampler({});
-    FS::BindTextureSampler(cmd, input_snapshot->texture, sampler);
+    FS::BindFragInfo(pass, host_buffer.EmplaceUniform(frag_info));
+    VS::BindFrameInfo(pass, host_buffer.EmplaceUniform(frame_info));
 
-    return pass.AddCommand(std::move(cmd));
+    const std::unique_ptr<const Sampler>& sampler =
+        renderer.GetContext()->GetSamplerLibrary()->GetSampler({});
+    FS::BindTextureSampler(pass, input_snapshot->texture, sampler);
+
+    return pass.Draw().ok();
   };
 
-  auto out_texture = renderer.MakeSubpass(ISize(coverage.size), callback);
-  if (!out_texture) {
-    return std::nullopt;
-  }
-  out_texture->SetLabel("BorderMaskBlurFilter Texture");
+  CoverageProc coverage_proc =
+      [coverage](const Entity& entity) -> std::optional<Rect> {
+    return coverage.TransformBounds(entity.GetTransform());
+  };
+
+  auto contents = AnonymousContents::Make(render_proc, coverage_proc);
 
-  return Snapshot{.texture = out_texture,
-                  .transform = Matrix::MakeTranslation(coverage.origin),
-                  .opacity = input_snapshot->opacity};
+  Entity sub_entity;
+  sub_entity.SetContents(std::move(contents));
+  sub_entity.SetClipDepth(entity.GetClipDepth());
+  sub_entity.SetBlendMode(entity.GetBlendMode());
+  return sub_entity;
 }
 
 std::optional<Rect> BorderMaskBlurFilterContents::GetFilterCoverage(
@@ -147,9 +160,18 @@ std::optional<Rect> BorderMaskBlurFilterContents::GetFilterCoverage(
   auto transformed_blur_vector =
       transform.TransformDirection(Vector2(Radius{sigma_x_}.radius, 0)).Abs() +
       transform.TransformDirection(Vector2(0, Radius{sigma_y_}.radius)).Abs();
-  auto extent = coverage->size + transformed_blur_vector * 2;
-  return Rect(coverage->origin - transformed_blur_vector,
-              Size(extent.x, extent.y));
+  return coverage->Expand(transformed_blur_vector);
+}
+
+std::optional<Rect> BorderMaskBlurFilterContents::GetFilterSourceCoverage(
+    const Matrix& effect_transform,
+    const Rect& output_limit) const {
+  auto transformed_blur_vector =
+      effect_transform.TransformDirection(Vector2(Radius{sigma_x_}.radius, 0))
+          .Abs() +
+      effect_transform.TransformDirection(Vector2(0, Radius{sigma_y_}.radius))
+          .Abs();
+  return output_limit.Expand(transformed_blur_vector);
 }
 
 }  // namespace impeller
diff --git a/impeller/entity/contents/filters/border_mask_blur_filter_contents.h b/impeller/entity/contents/filters/border_mask_blur_filter_contents.h
index 9d971f5a11fdfb34bbe65fb1aa0966992a5681ac..10be38dbb72edc8900e0de5f6c762caa5abc7e36 100644
--- a/impeller/entity/contents/filters/border_mask_blur_filter_contents.h
+++ b/impeller/entity/contents/filters/border_mask_blur_filter_contents.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_BORDER_MASK_BLUR_FILTER_CONTENTS_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_BORDER_MASK_BLUR_FILTER_CONTENTS_H_
 
 #include <memory>
 #include <optional>
@@ -27,14 +28,20 @@ class BorderMaskBlurFilterContents final : public FilterContents {
       const Entity& entity,
       const Matrix& effect_transform) const override;
 
+  // |FilterContents|
+  std::optional<Rect> GetFilterSourceCoverage(
+      const Matrix& effect_transform,
+      const Rect& output_limit) const override;
+
  private:
   // |FilterContents|
-  std::optional<Snapshot> RenderFilter(
+  std::optional<Entity> RenderFilter(
       const FilterInput::Vector& input_textures,
       const ContentContext& renderer,
       const Entity& entity,
       const Matrix& effect_transform,
-      const Rect& coverage) const override;
+      const Rect& coverage,
+      const std::optional<Rect>& coverage_hint) const override;
 
   Sigma sigma_x_;
   Sigma sigma_y_;
@@ -43,7 +50,12 @@ class BorderMaskBlurFilterContents final : public FilterContents {
   bool inner_blur_factor_ = true;
   bool outer_blur_factor_ = true;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(BorderMaskBlurFilterContents);
+  BorderMaskBlurFilterContents(const BorderMaskBlurFilterContents&) = delete;
+
+  BorderMaskBlurFilterContents& operator=(const BorderMaskBlurFilterContents&) =
+      delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_BORDER_MASK_BLUR_FILTER_CONTENTS_H_
diff --git a/impeller/entity/contents/filters/color_filter_contents.cc b/impeller/entity/contents/filters/color_filter_contents.cc
index a4b8db8fc6cce87a32cf3de98e78761fe9666e38..489cc4b0cd6b54d2d00e0b248c56c47176ae89ad 100644
--- a/impeller/entity/contents/filters/color_filter_contents.cc
+++ b/impeller/entity/contents/filters/color_filter_contents.cc
@@ -37,7 +37,7 @@ std::shared_ptr<ColorFilterContents> ColorFilterContents::MakeBlend(
   std::shared_ptr<BlendFilterContents> new_blend;
   for (auto in_i = inputs.begin() + 1; in_i < inputs.end(); in_i++) {
     new_blend = std::make_shared<BlendFilterContents>();
-    new_blend->SetInputs({*in_i, blend_input});
+    new_blend->SetInputs({blend_input, *in_i});
     new_blend->SetBlendMode(blend_mode);
     if (in_i < inputs.end() - 1 || foreground_color.has_value()) {
       blend_input = FilterInput::Make(
@@ -82,12 +82,27 @@ ColorFilterContents::ColorFilterContents() = default;
 
 ColorFilterContents::~ColorFilterContents() = default;
 
-void ColorFilterContents::SetAbsorbOpacity(bool absorb_opacity) {
+void ColorFilterContents::SetAbsorbOpacity(AbsorbOpacity absorb_opacity) {
   absorb_opacity_ = absorb_opacity;
 }
 
-bool ColorFilterContents::GetAbsorbOpacity() const {
+ColorFilterContents::AbsorbOpacity ColorFilterContents::GetAbsorbOpacity()
+    const {
   return absorb_opacity_;
 }
 
+void ColorFilterContents::SetAlpha(Scalar alpha) {
+  alpha_ = alpha;
+}
+
+std::optional<Scalar> ColorFilterContents::GetAlpha() const {
+  return alpha_;
+}
+
+std::optional<Rect> ColorFilterContents::GetFilterSourceCoverage(
+    const Matrix& effect_transform,
+    const Rect& output_limit) const {
+  return output_limit;
+}
+
 }  // namespace impeller
diff --git a/impeller/entity/contents/filters/color_filter_contents.h b/impeller/entity/contents/filters/color_filter_contents.h
index 17e54b56039f0ae4c5552467f96541f9baba5c04..14d9cb8aa595920871b56f971005020b67ce7eae 100644
--- a/impeller/entity/contents/filters/color_filter_contents.h
+++ b/impeller/entity/contents/filters/color_filter_contents.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_COLOR_FILTER_CONTENTS_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_COLOR_FILTER_CONTENTS_H_
 
 #include "impeller/entity/contents/filters/filter_contents.h"
 
@@ -10,6 +11,12 @@ namespace impeller {
 
 class ColorFilterContents : public FilterContents {
  public:
+  enum class AbsorbOpacity {
+    kYes,
+    kNo,
+  };
+
+  /// @brief the [inputs] are expected to be in the order of dst, src.
   static std::shared_ptr<ColorFilterContents> MakeBlend(
       BlendMode blend_mode,
       FilterInput::Vector inputs,
@@ -29,14 +36,29 @@ class ColorFilterContents : public FilterContents {
 
   ~ColorFilterContents() override;
 
-  void SetAbsorbOpacity(bool absorb_opacity);
+  void SetAbsorbOpacity(AbsorbOpacity absorb_opacity);
+
+  AbsorbOpacity GetAbsorbOpacity() const;
+
+  /// @brief Sets an alpha that is applied to the final blended result.
+  void SetAlpha(Scalar alpha);
 
-  bool GetAbsorbOpacity() const;
+  std::optional<Scalar> GetAlpha() const;
+
+  // |FilterContents|
+  std::optional<Rect> GetFilterSourceCoverage(
+      const Matrix& effect_transform,
+      const Rect& output_limit) const override;
 
  private:
-  bool absorb_opacity_ = false;
+  AbsorbOpacity absorb_opacity_ = AbsorbOpacity::kNo;
+  std::optional<Scalar> alpha_;
+
+  ColorFilterContents(const ColorFilterContents&) = delete;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(ColorFilterContents);
+  ColorFilterContents& operator=(const ColorFilterContents&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_COLOR_FILTER_CONTENTS_H_
diff --git a/impeller/entity/contents/filters/color_matrix_filter_contents.cc b/impeller/entity/contents/filters/color_matrix_filter_contents.cc
index 66e8464f81d498f3b9ec18c48d454c622e12d441..9d5aa125471b20a0640ae693e80daee5fb30a4f1 100644
--- a/impeller/entity/contents/filters/color_matrix_filter_contents.cc
+++ b/impeller/entity/contents/filters/color_matrix_filter_contents.cc
@@ -6,12 +6,14 @@
 
 #include <optional>
 
+#include "impeller/entity/contents/anonymous_contents.h"
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/contents/contents.h"
+#include "impeller/entity/contents/filters/color_filter_contents.h"
 #include "impeller/geometry/point.h"
 #include "impeller/geometry/vector.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_library.h"
+#include "impeller/renderer/vertex_buffer_builder.h"
 
 namespace impeller {
 
@@ -23,12 +25,13 @@ void ColorMatrixFilterContents::SetMatrix(const ColorMatrix& matrix) {
   matrix_ = matrix;
 }
 
-std::optional<Snapshot> ColorMatrixFilterContents::RenderFilter(
+std::optional<Entity> ColorMatrixFilterContents::RenderFilter(
     const FilterInput::Vector& inputs,
     const ContentContext& renderer,
     const Entity& entity,
     const Matrix& effect_transform,
-    const Rect& coverage) const {
+    const Rect& coverage,
+    const std::optional<Rect>& coverage_hint) const {
   using VS = ColorMatrixColorFilterPipeline::VertexShader;
   using FS = ColorMatrixColorFilterPipeline::FragmentShader;
 
@@ -40,45 +43,48 @@ std::optional<Snapshot> ColorMatrixFilterContents::RenderFilter(
     return std::nullopt;
   }
 
-  auto input_snapshot = inputs[0]->GetSnapshot(renderer, entity);
+  auto input_snapshot = inputs[0]->GetSnapshot("ColorMatrix", renderer, entity);
   if (!input_snapshot.has_value()) {
     return std::nullopt;
   }
 
   //----------------------------------------------------------------------------
-  /// Render to texture.
+  /// Create AnonymousContents for rendering.
   ///
+  RenderProc render_proc = [input_snapshot, color_matrix = matrix_,
+                            absorb_opacity = GetAbsorbOpacity()](
+                               const ContentContext& renderer,
+                               const Entity& entity, RenderPass& pass) -> bool {
+    pass.SetCommandLabel("Color Matrix Filter");
+    pass.SetStencilReference(entity.GetClipDepth());
 
-  ContentContext::SubpassCallback callback = [&](const ContentContext& renderer,
-                                                 RenderPass& pass) {
-    Command cmd;
-    cmd.label = "Color Matrix Filter";
+    auto options = OptionsFromPassAndEntity(pass, entity);
+    options.primitive_type = PrimitiveType::kTriangleStrip;
+    pass.SetPipeline(renderer.GetColorMatrixColorFilterPipeline(options));
 
-    auto options = OptionsFromPass(pass);
-    options.blend_mode = BlendMode::kSource;
-    cmd.pipeline = renderer.GetColorMatrixColorFilterPipeline(options);
+    auto size = input_snapshot->texture->GetSize();
 
     VertexBufferBuilder<VS::PerVertexData> vtx_builder;
     vtx_builder.AddVertices({
         {Point(0, 0)},
         {Point(1, 0)},
-        {Point(1, 1)},
-        {Point(0, 0)},
-        {Point(1, 1)},
         {Point(0, 1)},
+        {Point(1, 1)},
     });
-    auto& host_buffer = pass.GetTransientsBuffer();
-    auto vtx_buffer = vtx_builder.CreateVertexBuffer(host_buffer);
-    cmd.BindVertices(vtx_buffer);
+    auto& host_buffer = renderer.GetTransientsBuffer();
+    pass.SetVertexBuffer(vtx_builder.CreateVertexBuffer(host_buffer));
 
     VS::FrameInfo frame_info;
-    frame_info.mvp = Matrix::MakeOrthographic(ISize(1, 1));
+    frame_info.mvp = Entity::GetShaderTransform(
+        entity.GetShaderClipDepth(), pass,
+        entity.GetTransform() * input_snapshot->transform *
+            Matrix::MakeScale(Vector2(size)));
+    frame_info.texture_sampler_y_coord_scale =
+        input_snapshot->texture->GetYCoordScale();
 
     FS::FragInfo frag_info;
-    const float* matrix = matrix_.array;
+    const float* matrix = color_matrix.array;
     frag_info.color_v = Vector4(matrix[4], matrix[9], matrix[14], matrix[19]);
-    frag_info.texture_sampler_y_coord_scale =
-        input_snapshot->texture->GetYCoordScale();
     // clang-format off
     frag_info.color_m = Matrix(
         matrix[0], matrix[5], matrix[10], matrix[15],
@@ -87,28 +93,32 @@ std::optional<Snapshot> ColorMatrixFilterContents::RenderFilter(
         matrix[3], matrix[8], matrix[13], matrix[18]
     );
     // clang-format on
-    frag_info.input_alpha = GetAbsorbOpacity() ? input_snapshot->opacity : 1.0f;
-    auto sampler = renderer.GetContext()->GetSamplerLibrary()->GetSampler({});
-    FS::BindInputTexture(cmd, input_snapshot->texture, sampler);
-    FS::BindFragInfo(cmd, host_buffer.EmplaceUniform(frag_info));
-
-    VS::BindFrameInfo(cmd, host_buffer.EmplaceUniform(frame_info));
+    frag_info.input_alpha =
+        absorb_opacity == ColorFilterContents::AbsorbOpacity::kYes
+            ? input_snapshot->opacity
+            : 1.0f;
+    const std::unique_ptr<const Sampler>& sampler =
+        renderer.GetContext()->GetSamplerLibrary()->GetSampler({});
+    FS::BindInputTexture(pass, input_snapshot->texture, sampler);
+    FS::BindFragInfo(pass, host_buffer.EmplaceUniform(frag_info));
+
+    VS::BindFrameInfo(pass, host_buffer.EmplaceUniform(frame_info));
+
+    return pass.Draw().ok();
+  };
 
-    return pass.AddCommand(std::move(cmd));
+  CoverageProc coverage_proc =
+      [coverage](const Entity& entity) -> std::optional<Rect> {
+    return coverage.TransformBounds(entity.GetTransform());
   };
 
-  auto out_texture =
-      renderer.MakeSubpass(input_snapshot->texture->GetSize(), callback);
-  if (!out_texture) {
-    return std::nullopt;
-  }
-  out_texture->SetLabel("ColorMatrixFilter Texture");
+  auto contents = AnonymousContents::Make(render_proc, coverage_proc);
 
-  return Snapshot{
-      .texture = out_texture,
-      .transform = input_snapshot->transform,
-      .sampler_descriptor = input_snapshot->sampler_descriptor,
-      .opacity = GetAbsorbOpacity() ? 1.0f : input_snapshot->opacity};
+  Entity sub_entity;
+  sub_entity.SetContents(std::move(contents));
+  sub_entity.SetClipDepth(entity.GetClipDepth());
+  sub_entity.SetBlendMode(entity.GetBlendMode());
+  return sub_entity;
 }
 
 }  // namespace impeller
diff --git a/impeller/entity/contents/filters/color_matrix_filter_contents.h b/impeller/entity/contents/filters/color_matrix_filter_contents.h
index 3486365a5a642f7c443889472823356215027239..e394125f79b9a083b4b29b26337f9215858383a3 100644
--- a/impeller/entity/contents/filters/color_matrix_filter_contents.h
+++ b/impeller/entity/contents/filters/color_matrix_filter_contents.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_COLOR_MATRIX_FILTER_CONTENTS_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_COLOR_MATRIX_FILTER_CONTENTS_H_
 
 #include <memory>
 #include <optional>
@@ -24,16 +25,22 @@ class ColorMatrixFilterContents final : public ColorFilterContents {
 
  private:
   // |FilterContents|
-  std::optional<Snapshot> RenderFilter(
+  std::optional<Entity> RenderFilter(
       const FilterInput::Vector& input_textures,
       const ContentContext& renderer,
       const Entity& entity,
       const Matrix& effect_transform,
-      const Rect& coverage) const override;
+      const Rect& coverage,
+      const std::optional<Rect>& coverage_hint) const override;
 
   ColorMatrix matrix_;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(ColorMatrixFilterContents);
+  ColorMatrixFilterContents(const ColorMatrixFilterContents&) = delete;
+
+  ColorMatrixFilterContents& operator=(const ColorMatrixFilterContents&) =
+      delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_COLOR_MATRIX_FILTER_CONTENTS_H_
diff --git a/impeller/entity/contents/filters/filter_contents.cc b/impeller/entity/contents/filters/filter_contents.cc
index d43e4298c884570202efa34a15d3291f8f5e4101..4db42708a4b93ca1e790a2770e78270d73d176c0 100644
--- a/impeller/entity/contents/filters/filter_contents.cc
+++ b/impeller/entity/contents/filters/filter_contents.cc
@@ -13,6 +13,7 @@
 #include <utility>
 
 #include "flutter/fml/logging.h"
+#include "impeller/core/formats.h"
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/contents/filters/border_mask_blur_filter_contents.h"
 #include "impeller/entity/contents/filters/gaussian_blur_filter_contents.h"
@@ -25,59 +26,35 @@
 #include "impeller/entity/entity.h"
 #include "impeller/geometry/path_builder.h"
 #include "impeller/renderer/command_buffer.h"
-#include "impeller/renderer/formats.h"
 #include "impeller/renderer/render_pass.h"
 
 namespace impeller {
 
-std::shared_ptr<FilterContents> FilterContents::MakeDirectionalGaussianBlur(
-    FilterInput::Ref input,
-    Sigma sigma,
-    Vector2 direction,
-    BlurStyle blur_style,
-    Entity::TileMode tile_mode,
-    FilterInput::Ref source_override,
-    Sigma secondary_sigma,
-    const Matrix& effect_transform) {
-  auto blur = std::make_shared<DirectionalGaussianBlurFilterContents>();
-  blur->SetInputs({std::move(input)});
-  blur->SetSigma(sigma);
-  blur->SetDirection(direction);
-  blur->SetBlurStyle(blur_style);
-  blur->SetTileMode(tile_mode);
-  blur->SetSourceOverride(std::move(source_override));
-  blur->SetSecondarySigma(secondary_sigma);
-  blur->SetEffectTransform(effect_transform);
-  return blur;
-}
+const int32_t FilterContents::kBlurFilterRequiredMipCount =
+    GaussianBlurFilterContents::kBlurFilterRequiredMipCount;
 
 std::shared_ptr<FilterContents> FilterContents::MakeGaussianBlur(
     const FilterInput::Ref& input,
     Sigma sigma_x,
     Sigma sigma_y,
-    BlurStyle blur_style,
     Entity::TileMode tile_mode,
-    const Matrix& effect_transform) {
-  auto x_blur = MakeDirectionalGaussianBlur(input, sigma_x, Point(1, 0),
-                                            BlurStyle::kNormal, tile_mode,
-                                            nullptr, {}, effect_transform);
-  auto y_blur = MakeDirectionalGaussianBlur(FilterInput::Make(x_blur), sigma_y,
-                                            Point(0, 1), blur_style, tile_mode,
-                                            input, sigma_x, effect_transform);
-  return y_blur;
+    FilterContents::BlurStyle mask_blur_style,
+    const std::shared_ptr<Geometry>& mask_geometry) {
+  auto blur = std::make_shared<GaussianBlurFilterContents>(
+      sigma_x.sigma, sigma_y.sigma, tile_mode, mask_blur_style, mask_geometry);
+  blur->SetInputs({input});
+  return blur;
 }
 
 std::shared_ptr<FilterContents> FilterContents::MakeBorderMaskBlur(
     FilterInput::Ref input,
     Sigma sigma_x,
     Sigma sigma_y,
-    BlurStyle blur_style,
-    const Matrix& effect_transform) {
+    BlurStyle blur_style) {
   auto filter = std::make_shared<BorderMaskBlurFilterContents>();
   filter->SetInputs({std::move(input)});
   filter->SetSigma(sigma_x, sigma_y);
   filter->SetBlurStyle(blur_style);
-  filter->SetEffectTransform(effect_transform);
   return filter;
 }
 
@@ -85,14 +62,12 @@ std::shared_ptr<FilterContents> FilterContents::MakeDirectionalMorphology(
     FilterInput::Ref input,
     Radius radius,
     Vector2 direction,
-    MorphType morph_type,
-    const Matrix& effect_transform) {
+    MorphType morph_type) {
   auto filter = std::make_shared<DirectionalMorphologyFilterContents>();
   filter->SetInputs({std::move(input)});
   filter->SetRadius(radius);
   filter->SetDirection(direction);
   filter->SetMorphType(morph_type);
-  filter->SetEffectTransform(effect_transform);
   return filter;
 }
 
@@ -100,13 +75,11 @@ std::shared_ptr<FilterContents> FilterContents::MakeMorphology(
     FilterInput::Ref input,
     Radius radius_x,
     Radius radius_y,
-    MorphType morph_type,
-    const Matrix& effect_transform) {
-  auto x_morphology = MakeDirectionalMorphology(
-      std::move(input), radius_x, Point(1, 0), morph_type, effect_transform);
-  auto y_morphology =
-      MakeDirectionalMorphology(FilterInput::Make(x_morphology), radius_y,
-                                Point(0, 1), morph_type, effect_transform);
+    MorphType morph_type) {
+  auto x_morphology = MakeDirectionalMorphology(std::move(input), radius_x,
+                                                Point(1, 0), morph_type);
+  auto y_morphology = MakeDirectionalMorphology(
+      FilterInput::Make(x_morphology), radius_y, Point(0, 1), morph_type);
   return y_morphology;
 }
 
@@ -149,12 +122,12 @@ void FilterContents::SetInputs(FilterInput::Vector inputs) {
   inputs_ = std::move(inputs);
 }
 
-void FilterContents::SetCoverageCrop(std::optional<Rect> coverage_crop) {
-  coverage_crop_ = coverage_crop;
-}
+void FilterContents::SetEffectTransform(const Matrix& effect_transform) {
+  effect_transform_ = effect_transform;
 
-void FilterContents::SetEffectTransform(Matrix effect_transform) {
-  effect_transform_ = effect_transform.Basis();
+  for (auto& input : inputs_) {
+    input->SetEffectTransform(effect_transform);
+  }
 }
 
 bool FilterContents::Render(const ContentContext& renderer,
@@ -167,46 +140,40 @@ bool FilterContents::Render(const ContentContext& renderer,
 
   // Run the filter.
 
-  auto maybe_snapshot = RenderToSnapshot(renderer, entity);
-  if (!maybe_snapshot.has_value()) {
-    return false;
+  auto maybe_entity = GetEntity(renderer, entity, GetCoverageHint());
+  if (!maybe_entity.has_value()) {
+    return true;
   }
-  auto& snapshot = maybe_snapshot.value();
-
-  // Draw the result texture, respecting the transform and clip stack.
-
-  auto texture_rect = Rect::MakeSize(snapshot.texture->GetSize());
-  auto contents = TextureContents::MakeRect(texture_rect);
-  contents->SetTexture(snapshot.texture);
-  contents->SetSamplerDescriptor(snapshot.sampler_descriptor);
-  contents->SetSourceRect(texture_rect);
-  contents->SetOpacity(snapshot.opacity);
-
-  Entity e;
-  e.SetBlendMode(entity.GetBlendMode());
-  e.SetStencilDepth(entity.GetStencilDepth());
-  e.SetTransformation(snapshot.transform);
-  return contents->Render(renderer, e, pass);
+  maybe_entity->SetNewClipDepth(entity.GetNewClipDepth());
+  return maybe_entity->Render(renderer, pass);
 }
 
 std::optional<Rect> FilterContents::GetLocalCoverage(
     const Entity& local_entity) const {
   auto coverage = GetFilterCoverage(inputs_, local_entity, effect_transform_);
-  if (coverage_crop_.has_value() && coverage.has_value()) {
-    coverage = coverage->Intersection(coverage_crop_.value());
+  auto coverage_hint = GetCoverageHint();
+  if (coverage_hint.has_value() && coverage.has_value()) {
+    coverage = coverage->Intersection(coverage_hint.value());
   }
 
   return coverage;
 }
 
 std::optional<Rect> FilterContents::GetCoverage(const Entity& entity) const {
-  Entity entity_with_local_transform = entity;
-  entity_with_local_transform.SetTransformation(
-      GetTransform(entity.GetTransformation()));
+  Entity entity_with_local_transform = entity.Clone();
+  entity_with_local_transform.SetTransform(GetTransform(entity.GetTransform()));
 
   return GetLocalCoverage(entity_with_local_transform);
 }
 
+void FilterContents::PopulateGlyphAtlas(
+    const std::shared_ptr<LazyGlyphAtlas>& lazy_glyph_atlas,
+    Scalar scale) {
+  for (auto& input : inputs_) {
+    input->PopulateGlyphAtlas(lazy_glyph_atlas, scale);
+  }
+}
+
 std::optional<Rect> FilterContents::GetFilterCoverage(
     const FilterInput::Vector& inputs,
     const Entity& entity,
@@ -234,12 +201,34 @@ std::optional<Rect> FilterContents::GetFilterCoverage(
   return result;
 }
 
-std::optional<Snapshot> FilterContents::RenderToSnapshot(
+std::optional<Rect> FilterContents::GetSourceCoverage(
+    const Matrix& effect_transform,
+    const Rect& output_limit) const {
+  auto filter_input_coverage =
+      GetFilterSourceCoverage(effect_transform_, output_limit);
+
+  if (!filter_input_coverage.has_value()) {
+    return std::nullopt;
+  }
+
+  std::optional<Rect> inputs_coverage;
+  for (const auto& input : inputs_) {
+    auto input_coverage = input->GetSourceCoverage(
+        effect_transform, filter_input_coverage.value());
+    if (!input_coverage.has_value()) {
+      return std::nullopt;
+    }
+    inputs_coverage = Rect::Union(inputs_coverage, input_coverage.value());
+  }
+  return inputs_coverage;
+}
+
+std::optional<Entity> FilterContents::GetEntity(
     const ContentContext& renderer,
-    const Entity& entity) const {
-  Entity entity_with_local_transform = entity;
-  entity_with_local_transform.SetTransformation(
-      GetTransform(entity.GetTransformation()));
+    const Entity& entity,
+    const std::optional<Rect>& coverage_hint) const {
+  Entity entity_with_local_transform = entity.Clone();
+  entity_with_local_transform.SetTransform(GetTransform(entity.GetTransform()));
 
   auto coverage = GetLocalCoverage(entity_with_local_transform);
   if (!coverage.has_value() || coverage->IsEmpty()) {
@@ -247,7 +236,37 @@ std::optional<Snapshot> FilterContents::RenderToSnapshot(
   }
 
   return RenderFilter(inputs_, renderer, entity_with_local_transform,
-                      effect_transform_, coverage.value());
+                      effect_transform_, coverage.value(), coverage_hint);
+}
+
+std::optional<Snapshot> FilterContents::RenderToSnapshot(
+    const ContentContext& renderer,
+    const Entity& entity,
+    std::optional<Rect> coverage_limit,
+    const std::optional<SamplerDescriptor>& sampler_descriptor,
+    bool msaa_enabled,
+    int32_t mip_count,
+    const std::string& label) const {
+  // Resolve the render instruction (entity) from the filter and render it to a
+  // snapshot.
+  if (std::optional<Entity> result =
+          GetEntity(renderer, entity, coverage_limit);
+      result.has_value()) {
+    return result->GetContents()->RenderToSnapshot(
+        renderer,        // renderer
+        result.value(),  // entity
+        coverage_limit,  // coverage_limit
+        std::nullopt,    // sampler_descriptor
+        true,            // msaa_enabled
+        /*mip_count=*/mip_count,
+        label);  // label
+  }
+
+  return std::nullopt;
+}
+
+const FilterContents* FilterContents::AsFilter() const {
+  return this;
 }
 
 Matrix FilterContents::GetLocalTransform(const Matrix& parent_transform) const {
@@ -257,5 +276,38 @@ Matrix FilterContents::GetLocalTransform(const Matrix& parent_transform) const {
 Matrix FilterContents::GetTransform(const Matrix& parent_transform) const {
   return parent_transform * GetLocalTransform(parent_transform);
 }
+bool FilterContents::IsTranslationOnly() const {
+  for (auto& input : inputs_) {
+    if (!input->IsTranslationOnly()) {
+      return false;
+    }
+  }
+  return true;
+}
+
+bool FilterContents::IsLeaf() const {
+  for (auto& input : inputs_) {
+    if (!input->IsLeaf()) {
+      return false;
+    }
+  }
+  return true;
+}
+
+void FilterContents::SetLeafInputs(const FilterInput::Vector& inputs) {
+  if (IsLeaf()) {
+    inputs_ = inputs;
+    return;
+  }
+  for (auto& input : inputs_) {
+    input->SetLeafInputs(inputs);
+  }
+}
+
+void FilterContents::SetRenderingMode(Entity::RenderingMode rendering_mode) {
+  for (auto& input : inputs_) {
+    input->SetRenderingMode(rendering_mode);
+  }
+}
 
 }  // namespace impeller
diff --git a/impeller/entity/contents/filters/filter_contents.h b/impeller/entity/contents/filters/filter_contents.h
index 9387e7ce7d0143899ba98d15e66f0afb76d3ac2a..27ecd6c520ed208e2e81b4363be9ebd5fd81d91e 100644
--- a/impeller/entity/contents/filters/filter_contents.h
+++ b/impeller/entity/contents/filters/filter_contents.h
@@ -2,22 +2,27 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_FILTER_CONTENTS_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_FILTER_CONTENTS_H_
 
 #include <memory>
 #include <optional>
 #include <variant>
 #include <vector>
 
+#include "impeller/core/formats.h"
 #include "impeller/entity/contents/filters/inputs/filter_input.h"
 #include "impeller/entity/entity.h"
+#include "impeller/entity/geometry/geometry.h"
+#include "impeller/geometry/matrix.h"
 #include "impeller/geometry/sigma.h"
-#include "impeller/renderer/formats.h"
 
 namespace impeller {
 
 class FilterContents : public Contents {
  public:
+  static const int32_t kBlurFilterRequiredMipCount;
+
   enum class BlurStyle {
     /// Blurred inside and outside.
     kNormal,
@@ -29,51 +34,34 @@ class FilterContents : public Contents {
     kInner,
   };
 
-  // Domain is kRGBA, we may decide to support more color modes later.
-  struct ColorMatrix {
-    float array[20];
-  };
-
   enum class MorphType { kDilate, kErode };
 
-  static std::shared_ptr<FilterContents> MakeDirectionalGaussianBlur(
-      FilterInput::Ref input,
-      Sigma sigma,
-      Vector2 direction,
-      BlurStyle blur_style = BlurStyle::kNormal,
-      Entity::TileMode tile_mode = Entity::TileMode::kDecal,
-      FilterInput::Ref alpha_mask = nullptr,
-      Sigma secondary_sigma = {},
-      const Matrix& effect_transform = Matrix());
-
+  /// Creates a gaussian blur that operates in 2 dimensions.
+  /// See also: `MakeDirectionalGaussianBlur`
   static std::shared_ptr<FilterContents> MakeGaussianBlur(
       const FilterInput::Ref& input,
       Sigma sigma_x,
       Sigma sigma_y,
-      BlurStyle blur_style = BlurStyle::kNormal,
       Entity::TileMode tile_mode = Entity::TileMode::kDecal,
-      const Matrix& effect_transform = Matrix());
+      BlurStyle mask_blur_style = BlurStyle::kNormal,
+      const std::shared_ptr<Geometry>& mask_geometry = nullptr);
 
   static std::shared_ptr<FilterContents> MakeBorderMaskBlur(
       FilterInput::Ref input,
       Sigma sigma_x,
       Sigma sigma_y,
-      BlurStyle blur_style = BlurStyle::kNormal,
-      const Matrix& effect_transform = Matrix());
+      BlurStyle blur_style = BlurStyle::kNormal);
 
   static std::shared_ptr<FilterContents> MakeDirectionalMorphology(
       FilterInput::Ref input,
       Radius radius,
       Vector2 direction,
-      MorphType morph_type,
-      const Matrix& effect_transform = Matrix());
+      MorphType morph_type);
 
-  static std::shared_ptr<FilterContents> MakeMorphology(
-      FilterInput::Ref input,
-      Radius radius_x,
-      Radius radius_y,
-      MorphType morph_type,
-      const Matrix& effect_transform = Matrix());
+  static std::shared_ptr<FilterContents> MakeMorphology(FilterInput::Ref input,
+                                                        Radius radius_x,
+                                                        Radius radius_y,
+                                                        MorphType morph_type);
 
   static std::shared_ptr<FilterContents> MakeMatrixFilter(
       FilterInput::Ref input,
@@ -100,12 +88,19 @@ class FilterContents : public Contents {
   ///         particular filter's implementation.
   void SetInputs(FilterInput::Vector inputs);
 
-  /// @brief  Screen space bounds to use for cropping the filter output.
-  void SetCoverageCrop(std::optional<Rect> coverage_crop);
-
   /// @brief  Sets the transform which gets appended to the effect of this
   ///         filter. Note that this is in addition to the entity's transform.
-  void SetEffectTransform(Matrix effect_transform);
+  ///
+  ///         This is useful for subpass rendering scenarios where it's
+  ///         difficult to encode the current transform of the layer into the
+  ///         Entity being rendered.
+  void SetEffectTransform(const Matrix& effect_transform);
+
+  /// @brief  Create an Entity that renders this filter's output.
+  std::optional<Entity> GetEntity(
+      const ContentContext& renderer,
+      const Entity& entity,
+      const std::optional<Rect>& coverage_hint) const;
 
   // |Contents|
   bool Render(const ContentContext& renderer,
@@ -116,34 +111,128 @@ class FilterContents : public Contents {
   std::optional<Rect> GetCoverage(const Entity& entity) const override;
 
   // |Contents|
-  std::optional<Snapshot> RenderToSnapshot(const ContentContext& renderer,
-                                           const Entity& entity) const override;
+  void PopulateGlyphAtlas(
+      const std::shared_ptr<LazyGlyphAtlas>& lazy_glyph_atlas,
+      Scalar scale) override;
+
+  // |Contents|
+  std::optional<Snapshot> RenderToSnapshot(
+      const ContentContext& renderer,
+      const Entity& entity,
+      std::optional<Rect> coverage_limit = std::nullopt,
+      const std::optional<SamplerDescriptor>& sampler_descriptor = std::nullopt,
+      bool msaa_enabled = true,
+      int32_t mip_count = 1,
+      const std::string& label = "Filter Snapshot") const override;
+
+  // |Contents|
+  const FilterContents* AsFilter() const override;
+
+  /// @brief  Determines the coverage of source pixels that will be needed
+  ///         to produce results for the specified |output_limit| under the
+  ///         specified |effect_transform|. This is essentially a reverse of
+  ///         the |GetCoverage| method computing a source coverage from
+  ///         an intended |output_limit| coverage.
+  ///
+  ///         Both the |output_limit| and the return value are in the
+  ///         transformed coordinate space, and so do not need to be
+  ///         transformed or inverse transformed by the |effect_transform|
+  ///         but individual parameters on the filter might be in the
+  ///         untransformed space and should be transformed by the
+  ///         |effect_transform| before applying them to the coverages.
+  ///
+  ///         The method computes a result such that if the filter is applied
+  ///         to a set of pixels filling the computed source coverage, it
+  ///         should produce an output that covers the entire specified
+  ///         |output_limit|.
+  ///
+  ///         This is useful for subpass rendering scenarios where a filter
+  ///         will be applied to the output of the subpass and we need to
+  ///         determine how large of a render target to allocate in order
+  ///         to collect all pixels that might affect the supplied output
+  ///         coverage limit. While we might end up clipping the rendering
+  ///         of the subpass to its destination, we want to avoid clipping
+  ///         out any pixels that contribute to the output limit via the
+  ///         filtering operation.
+  ///
+  /// @return The coverage bounds in the transformed space of any source pixel
+  ///         that may be needed to produce output for the indicated filter
+  ///         that covers the indicated |output_limit|.
+  std::optional<Rect> GetSourceCoverage(const Matrix& effect_transform,
+                                        const Rect& output_limit) const;
 
   virtual Matrix GetLocalTransform(const Matrix& parent_transform) const;
 
   Matrix GetTransform(const Matrix& parent_transform) const;
 
+  /// @brief  Returns true if this filter graph doesn't perform any basis
+  ///         transforms to the filtered content. For example: Rotating,
+  ///         scaling, and skewing are all basis transforms, but
+  ///         translating is not.
+  ///
+  ///         This is useful for determining whether a filtered object's space
+  ///         is compatible enough with the parent pass space to perform certain
+  ///         subpass clipping optimizations.
+  virtual bool IsTranslationOnly() const;
+
+  /// @brief  Returns `true` if this filter does not have any `FilterInput`
+  ///         children.
+  bool IsLeaf() const;
+
+  /// @brief  Replaces the set of all leaf `FilterContents` with a new set
+  ///         of `FilterInput`s.
+  /// @see    `FilterContents::IsLeaf`
+  void SetLeafInputs(const FilterInput::Vector& inputs);
+
+  /// @brief  Marks this filter chain as applying in a subpass scenario.
+  ///
+  ///         Subpasses render in screenspace, and this setting informs filters
+  ///         that the current transform matrix of the entity is not stored
+  ///         in the Entity transform matrix. Instead, the effect transform
+  ///         is used in this case.
+  virtual void SetRenderingMode(Entity::RenderingMode rendering_mode);
+
  private:
+  /// @brief  Internal utility method for |GetLocalCoverage| that computes
+  ///         the output coverage of this filter across the specified inputs,
+  ///         ignoring the coverage hint.
   virtual std::optional<Rect> GetFilterCoverage(
       const FilterInput::Vector& inputs,
       const Entity& entity,
       const Matrix& effect_transform) const;
 
-  /// @brief  Converts zero or more filter inputs into a new texture.
-  virtual std::optional<Snapshot> RenderFilter(
+  /// @brief  Internal utility method for |GetSourceCoverage| that computes
+  ///         the inverse effect of this transform on the specified output
+  ///         coverage, ignoring the inputs which will be accommodated by
+  ///         the caller.
+  virtual std::optional<Rect> GetFilterSourceCoverage(
+      const Matrix& effect_transform,
+      const Rect& output_limit) const = 0;
+
+  /// @brief  Converts zero or more filter inputs into a render instruction.
+  virtual std::optional<Entity> RenderFilter(
       const FilterInput::Vector& inputs,
       const ContentContext& renderer,
       const Entity& entity,
       const Matrix& effect_transform,
-      const Rect& coverage) const = 0;
+      const Rect& coverage,
+      const std::optional<Rect>& coverage_hint) const = 0;
 
+  /// @brief  Internal utility method to compute the coverage of this
+  ///         filter across its internally specified inputs and subject
+  ///         to the coverage hint.
+  ///
+  ///         Uses |GetFilterCoverage|.
   std::optional<Rect> GetLocalCoverage(const Entity& local_entity) const;
 
   FilterInput::Vector inputs_;
-  std::optional<Rect> coverage_crop_;
-  Matrix effect_transform_;
+  Matrix effect_transform_ = Matrix();
 
-  FML_DISALLOW_COPY_AND_ASSIGN(FilterContents);
+  FilterContents(const FilterContents&) = delete;
+
+  FilterContents& operator=(const FilterContents&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_FILTER_CONTENTS_H_
diff --git a/impeller/entity/contents/filters/gaussian_blur_filter_contents.cc b/impeller/entity/contents/filters/gaussian_blur_filter_contents.cc
index 32f455e57f8b8afa37c9dd48b68e1d8035d84756..07b91c915cadcffe4bf18f125c4b6150f89cd519 100644
--- a/impeller/entity/contents/filters/gaussian_blur_filter_contents.cc
+++ b/impeller/entity/contents/filters/gaussian_blur_filter_contents.cc
@@ -5,314 +5,644 @@
 #include "impeller/entity/contents/filters/gaussian_blur_filter_contents.h"
 
 #include <cmath>
-#include <utility>
-#include <valarray>
 
-#include "impeller/base/strings.h"
-#include "impeller/base/validation.h"
+#include "flutter/fml/make_copyable.h"
+#include "impeller/entity/contents/clip_contents.h"
+#include "impeller/entity/contents/color_source_contents.h"
 #include "impeller/entity/contents/content_context.h"
-#include "impeller/entity/contents/filters/filter_contents.h"
-#include "impeller/geometry/rect.h"
-#include "impeller/geometry/scalar.h"
-#include "impeller/renderer/command_buffer.h"
-#include "impeller/renderer/formats.h"
+#include "impeller/entity/texture_fill.frag.h"
+#include "impeller/entity/texture_fill.vert.h"
+#include "impeller/renderer/command.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/render_target.h"
-#include "impeller/renderer/sampler_descriptor.h"
-#include "impeller/renderer/sampler_library.h"
+#include "impeller/renderer/texture_mipmap.h"
+#include "impeller/renderer/vertex_buffer_builder.h"
 
 namespace impeller {
 
-DirectionalGaussianBlurFilterContents::DirectionalGaussianBlurFilterContents() =
-    default;
+using GaussianBlurVertexShader = KernelPipeline::VertexShader;
+using GaussianBlurFragmentShader = KernelPipeline::FragmentShader;
 
-DirectionalGaussianBlurFilterContents::
-    ~DirectionalGaussianBlurFilterContents() = default;
+const int32_t GaussianBlurFilterContents::kBlurFilterRequiredMipCount = 4;
 
-void DirectionalGaussianBlurFilterContents::SetSigma(Sigma sigma) {
-  blur_sigma_ = sigma;
+namespace {
+
+// 48 comes from kernel.glsl.
+const int32_t kMaxKernelSize = 48;
+
+SamplerDescriptor MakeSamplerDescriptor(MinMagFilter filter,
+                                        SamplerAddressMode address_mode) {
+  SamplerDescriptor sampler_desc;
+  sampler_desc.min_filter = filter;
+  sampler_desc.mag_filter = filter;
+  sampler_desc.width_address_mode = address_mode;
+  sampler_desc.height_address_mode = address_mode;
+  return sampler_desc;
 }
 
-void DirectionalGaussianBlurFilterContents::SetSecondarySigma(Sigma sigma) {
-  secondary_blur_sigma_ = sigma;
+template <typename T>
+void BindVertices(RenderPass& pass,
+                  HostBuffer& host_buffer,
+                  std::initializer_list<typename T::PerVertexData>&& vertices) {
+  VertexBufferBuilder<typename T::PerVertexData> vtx_builder;
+  vtx_builder.AddVertices(vertices);
+  pass.SetVertexBuffer(vtx_builder.CreateVertexBuffer(host_buffer));
 }
 
-void DirectionalGaussianBlurFilterContents::SetDirection(Vector2 direction) {
-  blur_direction_ = direction.Normalize();
-  if (blur_direction_.IsZero()) {
-    blur_direction_ = Vector2(0, 1);
+void SetTileMode(SamplerDescriptor* descriptor,
+                 const ContentContext& renderer,
+                 Entity::TileMode tile_mode) {
+  switch (tile_mode) {
+    case Entity::TileMode::kDecal:
+      if (renderer.GetDeviceCapabilities().SupportsDecalSamplerAddressMode()) {
+        descriptor->width_address_mode = SamplerAddressMode::kDecal;
+        descriptor->height_address_mode = SamplerAddressMode::kDecal;
+      }
+      break;
+    case Entity::TileMode::kClamp:
+      descriptor->width_address_mode = SamplerAddressMode::kClampToEdge;
+      descriptor->height_address_mode = SamplerAddressMode::kClampToEdge;
+      break;
+    case Entity::TileMode::kMirror:
+      descriptor->width_address_mode = SamplerAddressMode::kMirror;
+      descriptor->height_address_mode = SamplerAddressMode::kMirror;
+      break;
+    case Entity::TileMode::kRepeat:
+      descriptor->width_address_mode = SamplerAddressMode::kRepeat;
+      descriptor->height_address_mode = SamplerAddressMode::kRepeat;
+      break;
   }
 }
 
-void DirectionalGaussianBlurFilterContents::SetBlurStyle(BlurStyle blur_style) {
-  blur_style_ = blur_style;
+/// Makes a subpass that will render the scaled down input and add the
+/// transparent gutter required for the blur halo.
+fml::StatusOr<RenderTarget> MakeDownsampleSubpass(
+    const ContentContext& renderer,
+    std::shared_ptr<Texture> input_texture,
+    const SamplerDescriptor& sampler_descriptor,
+    const Quad& uvs,
+    const ISize& subpass_size,
+    Entity::TileMode tile_mode) {
+  ContentContext::SubpassCallback subpass_callback =
+      [&](const ContentContext& renderer, RenderPass& pass) {
+        HostBuffer& host_buffer = renderer.GetTransientsBuffer();
+
+        pass.SetCommandLabel("Gaussian blur downsample");
+        auto pipeline_options = OptionsFromPass(pass);
+        pipeline_options.primitive_type = PrimitiveType::kTriangleStrip;
+        pass.SetPipeline(renderer.GetTexturePipeline(pipeline_options));
+
+        TextureFillVertexShader::FrameInfo frame_info;
+        frame_info.mvp = Matrix::MakeOrthographic(ISize(1, 1));
+        frame_info.texture_sampler_y_coord_scale = 1.0;
+        frame_info.alpha = 1.0;
+
+        BindVertices<TextureFillVertexShader>(pass, host_buffer,
+                                              {
+                                                  {Point(0, 0), uvs[0]},
+                                                  {Point(1, 0), uvs[1]},
+                                                  {Point(0, 1), uvs[2]},
+                                                  {Point(1, 1), uvs[3]},
+                                              });
+
+        SamplerDescriptor linear_sampler_descriptor = sampler_descriptor;
+        SetTileMode(&linear_sampler_descriptor, renderer, tile_mode);
+        linear_sampler_descriptor.mag_filter = MinMagFilter::kLinear;
+        linear_sampler_descriptor.min_filter = MinMagFilter::kLinear;
+        TextureFillVertexShader::BindFrameInfo(
+            pass, host_buffer.EmplaceUniform(frame_info));
+        TextureFillFragmentShader::BindTextureSampler(
+            pass, input_texture,
+            renderer.GetContext()->GetSamplerLibrary()->GetSampler(
+                linear_sampler_descriptor));
+
+        return pass.Draw().ok();
+      };
+  fml::StatusOr<RenderTarget> render_target = renderer.MakeSubpass(
+      "Gaussian Blur Filter", subpass_size, subpass_callback);
+  return render_target;
+}
 
+fml::StatusOr<RenderTarget> MakeBlurSubpass(
+    const ContentContext& renderer,
+    const RenderTarget& input_pass,
+    const SamplerDescriptor& sampler_descriptor,
+    Entity::TileMode tile_mode,
+    const BlurParameters& blur_info,
+    std::optional<RenderTarget> destination_target,
+    const Quad& blur_uvs) {
+  if (blur_info.blur_sigma < kEhCloseEnough) {
+    return input_pass;
+  }
+
+  std::shared_ptr<Texture> input_texture = input_pass.GetRenderTargetTexture();
+
+  // TODO(gaaclarke): This blurs the whole image, but because we know the clip
+  //                  region we could focus on just blurring that.
+  ISize subpass_size = input_texture->GetSize();
+  ContentContext::SubpassCallback subpass_callback =
+      [&](const ContentContext& renderer, RenderPass& pass) {
+        GaussianBlurVertexShader::FrameInfo frame_info{
+            .mvp = Matrix::MakeOrthographic(ISize(1, 1)),
+            .texture_sampler_y_coord_scale = 1.0};
+
+        HostBuffer& host_buffer = renderer.GetTransientsBuffer();
+
+        ContentContextOptions options = OptionsFromPass(pass);
+        options.primitive_type = PrimitiveType::kTriangleStrip;
+
+        if (tile_mode == Entity::TileMode::kDecal &&
+            !renderer.GetDeviceCapabilities()
+                 .SupportsDecalSamplerAddressMode()) {
+          pass.SetPipeline(renderer.GetKernelDecalPipeline(options));
+        } else {
+          pass.SetPipeline(renderer.GetKernelPipeline(options));
+        }
+
+        BindVertices<GaussianBlurVertexShader>(pass, host_buffer,
+                                               {
+                                                   {blur_uvs[0], blur_uvs[0]},
+                                                   {blur_uvs[1], blur_uvs[1]},
+                                                   {blur_uvs[2], blur_uvs[2]},
+                                                   {blur_uvs[3], blur_uvs[3]},
+                                               });
+
+        SamplerDescriptor linear_sampler_descriptor = sampler_descriptor;
+        linear_sampler_descriptor.mag_filter = MinMagFilter::kLinear;
+        linear_sampler_descriptor.min_filter = MinMagFilter::kLinear;
+        GaussianBlurFragmentShader::BindTextureSampler(
+            pass, input_texture,
+            renderer.GetContext()->GetSamplerLibrary()->GetSampler(
+                linear_sampler_descriptor));
+        GaussianBlurVertexShader::BindFrameInfo(
+            pass, host_buffer.EmplaceUniform(frame_info));
+        KernelPipeline::FragmentShader::KernelSamples kernel_samples =
+            LerpHackKernelSamples(GenerateBlurInfo(blur_info));
+        FML_CHECK(kernel_samples.sample_count < kMaxKernelSize);
+        GaussianBlurFragmentShader::BindKernelSamples(
+            pass, host_buffer.EmplaceUniform(kernel_samples));
+        return pass.Draw().ok();
+      };
+  if (destination_target.has_value()) {
+    return renderer.MakeSubpass("Gaussian Blur Filter",
+                                destination_target.value(), subpass_callback);
+  } else {
+    return renderer.MakeSubpass("Gaussian Blur Filter", subpass_size,
+                                subpass_callback);
+  }
+}
+
+/// Returns `rect` relative to `reference`, where Rect::MakeXYWH(0,0,1,1) will
+/// be returned when `rect` == `reference`.
+Rect MakeReferenceUVs(const Rect& reference, const Rect& rect) {
+  Rect result = Rect::MakeOriginSize(rect.GetOrigin() - reference.GetOrigin(),
+                                     rect.GetSize());
+  return result.Scale(1.0f / Vector2(reference.GetSize()));
+}
+
+int ScaleBlurRadius(Scalar radius, Scalar scalar) {
+  return static_cast<int>(std::round(radius * scalar));
+}
+
+Entity ApplyClippedBlurStyle(Entity::ClipOperation clip_operation,
+                             const Entity& entity,
+                             const std::shared_ptr<FilterInput>& input,
+                             const Snapshot& input_snapshot,
+                             Entity blur_entity,
+                             const std::shared_ptr<Geometry>& geometry) {
+  auto clip_contents = std::make_shared<ClipContents>();
+  clip_contents->SetClipOperation(clip_operation);
+  clip_contents->SetGeometry(geometry);
+  Entity clipper;
+  clipper.SetContents(clip_contents);
+  auto restore = std::make_unique<ClipRestoreContents>();
+  Matrix entity_transform = entity.GetTransform();
+  Matrix blur_transform = blur_entity.GetTransform();
+  auto renderer = fml::MakeCopyable(
+      [blur_entity = blur_entity.Clone(), clipper = std::move(clipper),
+       restore = std::move(restore), entity_transform,
+       blur_transform](const ContentContext& renderer, const Entity& entity,
+                       RenderPass& pass) mutable {
+        bool result = true;
+        clipper.SetNewClipDepth(entity.GetNewClipDepth());
+        clipper.SetTransform(entity.GetTransform() * entity_transform);
+        result = clipper.Render(renderer, pass) && result;
+        blur_entity.SetNewClipDepth(entity.GetNewClipDepth());
+        blur_entity.SetTransform(entity.GetTransform() * blur_transform);
+        result = blur_entity.Render(renderer, pass) && result;
+        if constexpr (!ContentContext::kEnableStencilThenCover) {
+          result = restore->Render(renderer, entity, pass) && result;
+        }
+        return result;
+      });
+  auto coverage =
+      fml::MakeCopyable([blur_entity = std::move(blur_entity),
+                         blur_transform](const Entity& entity) mutable {
+        blur_entity.SetTransform(entity.GetTransform() * blur_transform);
+        return blur_entity.GetCoverage();
+      });
+  Entity result;
+  result.SetContents(Contents::MakeAnonymous(renderer, coverage));
+  return result;
+}
+
+Entity ApplyBlurStyle(FilterContents::BlurStyle blur_style,
+                      const Entity& entity,
+                      const std::shared_ptr<FilterInput>& input,
+                      const Snapshot& input_snapshot,
+                      Entity blur_entity,
+                      const std::shared_ptr<Geometry>& geometry) {
   switch (blur_style) {
     case FilterContents::BlurStyle::kNormal:
-      src_color_factor_ = false;
-      inner_blur_factor_ = true;
-      outer_blur_factor_ = true;
-      break;
-    case FilterContents::BlurStyle::kSolid:
-      src_color_factor_ = true;
-      inner_blur_factor_ = false;
-      outer_blur_factor_ = true;
-      break;
-    case FilterContents::BlurStyle::kOuter:
-      src_color_factor_ = false;
-      inner_blur_factor_ = false;
-      outer_blur_factor_ = true;
-      break;
+      return blur_entity;
     case FilterContents::BlurStyle::kInner:
-      src_color_factor_ = false;
-      inner_blur_factor_ = true;
-      outer_blur_factor_ = false;
+      return ApplyClippedBlurStyle(Entity::ClipOperation::kIntersect, entity,
+                                   input, input_snapshot,
+                                   std::move(blur_entity), geometry);
       break;
+    case FilterContents::BlurStyle::kOuter:
+      return ApplyClippedBlurStyle(Entity::ClipOperation::kDifference, entity,
+                                   input, input_snapshot,
+                                   std::move(blur_entity), geometry);
+    case FilterContents::BlurStyle::kSolid: {
+      Entity snapshot_entity = Entity::FromSnapshot(
+          input_snapshot, entity.GetBlendMode(), entity.GetClipDepth());
+      Entity result;
+      Matrix blurred_transform = blur_entity.GetTransform();
+      Matrix snapshot_transform = snapshot_entity.GetTransform();
+      result.SetContents(Contents::MakeAnonymous(
+          fml::MakeCopyable([blur_entity = blur_entity.Clone(),
+                             blurred_transform, snapshot_transform,
+                             snapshot_entity = std::move(snapshot_entity)](
+                                const ContentContext& renderer,
+                                const Entity& entity,
+                                RenderPass& pass) mutable {
+            bool result = true;
+            blur_entity.SetNewClipDepth(entity.GetNewClipDepth());
+            blur_entity.SetTransform(entity.GetTransform() * blurred_transform);
+            result = result && blur_entity.Render(renderer, pass);
+            snapshot_entity.SetTransform(entity.GetTransform() *
+                                         snapshot_transform);
+            snapshot_entity.SetNewClipDepth(entity.GetNewClipDepth());
+            result = result && snapshot_entity.Render(renderer, pass);
+            return result;
+          }),
+          fml::MakeCopyable([blur_entity = blur_entity.Clone(),
+                             blurred_transform](const Entity& entity) mutable {
+            blur_entity.SetTransform(entity.GetTransform() * blurred_transform);
+            return blur_entity.GetCoverage();
+          })));
+      return result;
+    }
   }
 }
+}  // namespace
+
+std::string_view GaussianBlurFilterContents::kNoMipsError =
+    "Applying gaussian blur without mipmap.";
+
+GaussianBlurFilterContents::GaussianBlurFilterContents(
+    Scalar sigma_x,
+    Scalar sigma_y,
+    Entity::TileMode tile_mode,
+    BlurStyle mask_blur_style,
+    const std::shared_ptr<Geometry>& mask_geometry)
+    : sigma_x_(sigma_x),
+      sigma_y_(sigma_y),
+      tile_mode_(tile_mode),
+      mask_blur_style_(mask_blur_style),
+      mask_geometry_(mask_geometry) {
+  // This is supposed to be enforced at a higher level.
+  FML_DCHECK(mask_blur_style == BlurStyle::kNormal || mask_geometry);
+}
 
-void DirectionalGaussianBlurFilterContents::SetTileMode(
-    Entity::TileMode tile_mode) {
-  tile_mode_ = tile_mode;
+// This value was extracted from Skia, see:
+//  * https://github.com/google/skia/blob/d29cc3fe182f6e8a8539004a6a4ee8251677a6fd/src/gpu/ganesh/GrBlurUtils.cpp#L2561-L2576
+//  * https://github.com/google/skia/blob/d29cc3fe182f6e8a8539004a6a4ee8251677a6fd/src/gpu/BlurUtils.h#L57
+Scalar GaussianBlurFilterContents::CalculateScale(Scalar sigma) {
+  if (sigma <= 4) {
+    return 1.0;
+  }
+  Scalar raw_result = 4.0 / sigma;
+  // Round to the nearest 1/(2^n) to get the best quality down scaling.
+  Scalar exponent = round(log2f(raw_result));
+  // Don't scale down below 1/16th to preserve signal.
+  exponent = std::max(-4.0f, exponent);
+  Scalar rounded = powf(2.0f, exponent);
+  Scalar result = rounded;
+  // Extend the range of the 1/8th downsample based on the effective kernel size
+  // for the blur.
+  if (rounded < 0.125f) {
+    Scalar rounded_plus = powf(2.0f, exponent + 1);
+    Scalar blur_radius = CalculateBlurRadius(sigma);
+    int kernel_size_plus = (ScaleBlurRadius(blur_radius, rounded_plus) * 2) + 1;
+    // This constant was picked by looking at the results to make sure no
+    // shimmering was introduced at the highest sigma values that downscale to
+    // 1/16th.
+    static constexpr int32_t kEighthDownsampleKernalWidthMax = 41;
+    result = kernel_size_plus <= kEighthDownsampleKernalWidthMax ? rounded_plus
+                                                                 : rounded;
+  }
+  return result;
+};
+
+std::optional<Rect> GaussianBlurFilterContents::GetFilterSourceCoverage(
+    const Matrix& effect_transform,
+    const Rect& output_limit) const {
+  Vector2 scaled_sigma = {ScaleSigma(sigma_x_), ScaleSigma(sigma_y_)};
+  Vector2 blur_radius = {CalculateBlurRadius(scaled_sigma.x),
+                         CalculateBlurRadius(scaled_sigma.y)};
+  Vector3 blur_radii =
+      effect_transform.Basis() * Vector3{blur_radius.x, blur_radius.y, 0.0};
+  return output_limit.Expand(Point(blur_radii.x, blur_radii.y));
 }
 
-void DirectionalGaussianBlurFilterContents::SetSourceOverride(
-    FilterInput::Ref source_override) {
-  source_override_ = std::move(source_override);
+std::optional<Rect> GaussianBlurFilterContents::GetFilterCoverage(
+    const FilterInput::Vector& inputs,
+    const Entity& entity,
+    const Matrix& effect_transform) const {
+  if (inputs.empty()) {
+    return {};
+  }
+
+  std::optional<Rect> input_coverage = inputs[0]->GetCoverage(entity);
+  if (!input_coverage.has_value()) {
+    return {};
+  }
+
+  Vector2 scaled_sigma = (effect_transform.Basis() *
+                          Vector2(ScaleSigma(sigma_x_), ScaleSigma(sigma_y_)))
+                             .Abs();
+  Vector2 blur_radius = Vector2(CalculateBlurRadius(scaled_sigma.x),
+                                CalculateBlurRadius(scaled_sigma.y));
+  Vector2 padding(ceil(blur_radius.x), ceil(blur_radius.y));
+  Vector2 local_padding = (entity.GetTransform().Basis() * padding).Abs();
+  return input_coverage.value().Expand(Point(local_padding.x, local_padding.y));
 }
 
-std::optional<Snapshot> DirectionalGaussianBlurFilterContents::RenderFilter(
+std::optional<Entity> GaussianBlurFilterContents::RenderFilter(
     const FilterInput::Vector& inputs,
     const ContentContext& renderer,
     const Entity& entity,
     const Matrix& effect_transform,
-    const Rect& coverage) const {
-  using VS = GaussianBlurPipeline::VertexShader;
-  using FS = GaussianBlurPipeline::FragmentShader;
-
-  //----------------------------------------------------------------------------
-  /// Handle inputs.
-  ///
-
+    const Rect& coverage,
+    const std::optional<Rect>& coverage_hint) const {
   if (inputs.empty()) {
     return std::nullopt;
   }
 
-  // Input 0 snapshot.
+  Vector2 scaled_sigma = (effect_transform.Basis() *
+                          Vector2(ScaleSigma(sigma_x_), ScaleSigma(sigma_y_)))
+                             .Abs();
+  Vector2 blur_radius = Vector2(CalculateBlurRadius(scaled_sigma.x),
+                                CalculateBlurRadius(scaled_sigma.y));
+  Vector2 padding(ceil(blur_radius.x), ceil(blur_radius.y));
+  Vector2 local_padding = (entity.GetTransform().Basis() * padding).Abs();
+
+  // Apply as much of the desired padding as possible from the source. This may
+  // be ignored so must be accounted for in the downsample pass by adding a
+  // transparent gutter.
+  std::optional<Rect> expanded_coverage_hint;
+  if (coverage_hint.has_value()) {
+    expanded_coverage_hint = coverage_hint->Expand(local_padding);
+  }
+
+  int32_t mip_count = kBlurFilterRequiredMipCount;
+  if (renderer.GetContext()->GetBackendType() ==
+      Context::BackendType::kOpenGLES) {
+    // TODO(https://github.com/flutter/flutter/issues/141732): Implement mip map
+    // generation on opengles.
+    mip_count = 1;
+  }
 
-  auto input_snapshot = inputs[0]->GetSnapshot(renderer, entity);
+  std::optional<Snapshot> input_snapshot =
+      inputs[0]->GetSnapshot("GaussianBlur", renderer, entity,
+                             /*coverage_limit=*/expanded_coverage_hint,
+                             /*mip_count=*/mip_count);
   if (!input_snapshot.has_value()) {
     return std::nullopt;
   }
 
-  if (blur_sigma_.sigma < kEhCloseEnough) {
-    return input_snapshot.value();  // No blur to render.
+  if (scaled_sigma.x < kEhCloseEnough && scaled_sigma.y < kEhCloseEnough) {
+    return Entity::FromSnapshot(input_snapshot.value(), entity.GetBlendMode(),
+                                entity.GetClipDepth());  // No blur to render.
   }
 
-  auto radius = Radius{blur_sigma_}.radius;
-
-  auto transform = entity.GetTransformation() * effect_transform;
-  auto transformed_blur_radius =
-      transform.TransformDirection(blur_direction_ * radius);
-
-  auto transformed_blur_radius_length = transformed_blur_radius.GetLength();
-
-  // If the radius length is < .5, the shader will take at most 1 sample,
-  // resulting in no blur.
-  if (transformed_blur_radius_length < .5) {
-    return input_snapshot.value();  // No blur to render.
+  // In order to avoid shimmering in downsampling step, we should have mips.
+  if (input_snapshot->texture->GetMipCount() <= 1) {
+    FML_DLOG(ERROR) << kNoMipsError;
   }
-
-  // A matrix that rotates the snapshot space such that the blur direction is
-  // +X.
-  auto texture_rotate = Matrix::MakeRotationZ(
-      transformed_blur_radius.Normalize().AngleTo({1, 0}));
-
-  // Converts local pass space to screen space. This is just the snapshot space
-  // rotated such that the blur direction is +X.
-  auto pass_transform = texture_rotate * input_snapshot->transform;
-
-  // The pass texture coverage, but rotated such that the blur is in the +X
-  // direction, and expanded to include the blur radius. This is used for UV
-  // projection and as a source for the pass size. Note that it doesn't matter
-  // which direction the space is rotated in when grabbing the pass size.
-  auto pass_texture_rect = Rect::MakeSize(input_snapshot->texture->GetSize())
-                               .TransformBounds(pass_transform);
-  pass_texture_rect.origin.x -= transformed_blur_radius_length;
-  pass_texture_rect.size.width += transformed_blur_radius_length * 2;
-
-  // Source override snapshot.
-
-  auto source = source_override_ ? source_override_ : inputs[0];
-  auto source_snapshot = source->GetSnapshot(renderer, entity);
-  if (!source_snapshot.has_value()) {
+  FML_DCHECK(!input_snapshot->texture->NeedsMipmapGeneration());
+
+  Scalar desired_scalar =
+      std::min(CalculateScale(scaled_sigma.x), CalculateScale(scaled_sigma.y));
+  // TODO(jonahwilliams): If desired_scalar is 1.0 and we fully acquired the
+  // gutter from the expanded_coverage_hint, we can skip the downsample pass.
+  // pass.
+  Vector2 downsample_scalar(desired_scalar, desired_scalar);
+  Rect source_rect = Rect::MakeSize(input_snapshot->texture->GetSize());
+  Rect source_rect_padded = source_rect.Expand(padding);
+  Matrix padding_snapshot_adjustment = Matrix::MakeTranslation(-padding);
+  // TODO(gaaclarke): The padding could be removed if we know it's not needed or
+  //   resized to account for the expanded_clip_coverage. There doesn't appear
+  //   to be the math to make those calculations though. The following
+  //   optimization works, but causes a shimmer as a result of
+  //   https://github.com/flutter/flutter/issues/140193 so it isn't applied.
+  //
+  //   !input_snapshot->GetCoverage()->Expand(-local_padding)
+  //     .Contains(coverage_hint.value()))
+  Vector2 downsampled_size = source_rect_padded.GetSize() * downsample_scalar;
+  ISize subpass_size =
+      ISize(round(downsampled_size.x), round(downsampled_size.y));
+  Vector2 effective_scalar =
+      Vector2(subpass_size) / source_rect_padded.GetSize();
+
+  Quad uvs = CalculateUVs(inputs[0], entity, source_rect_padded,
+                          input_snapshot->texture->GetSize());
+
+  fml::StatusOr<RenderTarget> pass1_out = MakeDownsampleSubpass(
+      renderer, input_snapshot->texture, input_snapshot->sampler_descriptor,
+      uvs, subpass_size, tile_mode_);
+
+  if (!pass1_out.ok()) {
     return std::nullopt;
   }
 
-  // UV mapping.
-
-  auto pass_uv_project = [&texture_rotate,
-                          &pass_texture_rect](Snapshot& input) {
-    auto uv_matrix = Matrix::MakeScale(1 / Vector2(input.texture->GetSize())) *
-                     (texture_rotate * input.transform).Invert();
-    return pass_texture_rect.GetTransformedPoints(uv_matrix);
-  };
-
-  auto input_uvs = pass_uv_project(input_snapshot.value());
-
-  auto source_uvs = pass_uv_project(source_snapshot.value());
-
-  //----------------------------------------------------------------------------
-  /// Render to texture.
-  ///
-
-  ContentContext::SubpassCallback callback = [&](const ContentContext& renderer,
-                                                 RenderPass& pass) {
-    auto& host_buffer = pass.GetTransientsBuffer();
-
-    VertexBufferBuilder<VS::PerVertexData> vtx_builder;
-    vtx_builder.AddVertices({
-        {Point(0, 0), input_uvs[0], source_uvs[0]},
-        {Point(1, 0), input_uvs[1], source_uvs[1]},
-        {Point(1, 1), input_uvs[3], source_uvs[3]},
-        {Point(0, 0), input_uvs[0], source_uvs[0]},
-        {Point(1, 1), input_uvs[3], source_uvs[3]},
-        {Point(0, 1), input_uvs[2], source_uvs[2]},
-    });
-    auto vtx_buffer = vtx_builder.CreateVertexBuffer(host_buffer);
-
-    VS::FrameInfo frame_info;
-    frame_info.mvp = Matrix::MakeOrthographic(ISize(1, 1));
-    frame_info.texture_sampler_y_coord_scale =
-        input_snapshot->texture->GetYCoordScale();
-    frame_info.alpha_mask_sampler_y_coord_scale =
-        source_snapshot->texture->GetYCoordScale();
-
-    FS::FragInfo frag_info;
-    auto r = Radius{transformed_blur_radius_length};
-    frag_info.blur_sigma = Sigma{r}.sigma;
-    frag_info.blur_radius = r.radius;
-
-    // The blur direction is in input UV space.
-    frag_info.blur_direction =
-        pass_transform.Invert().TransformDirection(Vector2(1, 0)).Normalize();
-
-    frag_info.src_factor = src_color_factor_;
-    frag_info.inner_blur_factor = inner_blur_factor_;
-    frag_info.outer_blur_factor = outer_blur_factor_;
-    frag_info.texture_size = Point(input_snapshot->GetCoverage().value().size);
-
-    Command cmd;
-    cmd.label = SPrintF("Gaussian Blur Filter (Radius=%.2f)",
-                        transformed_blur_radius_length);
-    cmd.BindVertices(vtx_buffer);
-
-    auto options = OptionsFromPass(pass);
-    options.blend_mode = BlendMode::kSource;
-    auto input_descriptor = input_snapshot->sampler_descriptor;
-    auto source_descriptor = source_snapshot->sampler_descriptor;
-    switch (tile_mode_) {
-      case Entity::TileMode::kDecal:
-        cmd.pipeline = renderer.GetGaussianBlurDecalPipeline(options);
-        break;
-      case Entity::TileMode::kClamp:
-        cmd.pipeline = renderer.GetGaussianBlurPipeline(options);
-        input_descriptor.width_address_mode = SamplerAddressMode::kClampToEdge;
-        input_descriptor.height_address_mode = SamplerAddressMode::kClampToEdge;
-        source_descriptor.width_address_mode = SamplerAddressMode::kClampToEdge;
-        source_descriptor.height_address_mode =
-            SamplerAddressMode::kClampToEdge;
-        break;
-      case Entity::TileMode::kMirror:
-        cmd.pipeline = renderer.GetGaussianBlurPipeline(options);
-        input_descriptor.width_address_mode = SamplerAddressMode::kMirror;
-        input_descriptor.height_address_mode = SamplerAddressMode::kMirror;
-        source_descriptor.width_address_mode = SamplerAddressMode::kMirror;
-        source_descriptor.height_address_mode = SamplerAddressMode::kMirror;
-        break;
-      case Entity::TileMode::kRepeat:
-        cmd.pipeline = renderer.GetGaussianBlurPipeline(options);
-        input_descriptor.width_address_mode = SamplerAddressMode::kRepeat;
-        input_descriptor.height_address_mode = SamplerAddressMode::kRepeat;
-        source_descriptor.width_address_mode = SamplerAddressMode::kRepeat;
-        source_descriptor.height_address_mode = SamplerAddressMode::kRepeat;
-        break;
+  Vector2 pass1_pixel_size =
+      1.0 / Vector2(pass1_out.value().GetRenderTargetTexture()->GetSize());
+
+  std::optional<Rect> input_snapshot_coverage = input_snapshot->GetCoverage();
+  Quad blur_uvs = {Point(0, 0), Point(1, 0), Point(0, 1), Point(1, 1)};
+  if (expanded_coverage_hint.has_value() &&
+      input_snapshot_coverage.has_value() &&
+      // TODO(https://github.com/flutter/flutter/issues/140890): Remove this
+      //   condition. There is some flaw in coverage stopping us from using this
+      //   today. I attempted to use source coordinates to calculate the uvs,
+      //   but that didn't work either.
+      input_snapshot.has_value() &&
+      input_snapshot.value().transform.IsTranslationScaleOnly()) {
+    // Only process the uvs where the blur is happening, not the whole texture.
+    std::optional<Rect> uvs = MakeReferenceUVs(input_snapshot_coverage.value(),
+                                               expanded_coverage_hint.value())
+                                  .Intersection(Rect::MakeSize(Size(1, 1)));
+    FML_DCHECK(uvs.has_value());
+    if (uvs.has_value()) {
+      blur_uvs[0] = uvs->GetLeftTop();
+      blur_uvs[1] = uvs->GetRightTop();
+      blur_uvs[2] = uvs->GetLeftBottom();
+      blur_uvs[3] = uvs->GetRightBottom();
     }
-
-    FS::BindTextureSampler(
-        cmd, input_snapshot->texture,
-        renderer.GetContext()->GetSamplerLibrary()->GetSampler(
-            input_descriptor));
-    FS::BindAlphaMaskSampler(
-        cmd, source_snapshot->texture,
-        renderer.GetContext()->GetSamplerLibrary()->GetSampler(
-            source_descriptor));
-    VS::BindFrameInfo(cmd, host_buffer.EmplaceUniform(frame_info));
-    FS::BindFragInfo(cmd, host_buffer.EmplaceUniform(frag_info));
-
-    return pass.AddCommand(cmd);
-  };
-
-  Vector2 scale;
-  auto scale_curve = [](Scalar radius) {
-    constexpr Scalar decay = 4.0;   // Larger is more gradual.
-    constexpr Scalar limit = 0.95;  // The maximum percentage of the scaledown.
-    const Scalar curve =
-        std::min(1.0, decay / (std::max(1.0f, radius) + decay - 1.0));
-    return (curve - 1) * limit + 1;
-  };
-  {
-    scale.x = scale_curve(transformed_blur_radius_length);
-
-    Scalar y_radius = std::abs(pass_transform.GetDirectionScale(Vector2(
-        0, source_override_ ? Radius{secondary_blur_sigma_}.radius : 1)));
-    scale.y = scale_curve(y_radius);
   }
 
-  Vector2 scaled_size = pass_texture_rect.size * scale;
-  ISize floored_size = ISize(scaled_size.x, scaled_size.y);
-
-  auto out_texture = renderer.MakeSubpass(floored_size, callback);
+  fml::StatusOr<RenderTarget> pass2_out = MakeBlurSubpass(
+      renderer, /*input_pass=*/pass1_out.value(),
+      input_snapshot->sampler_descriptor, tile_mode_,
+      BlurParameters{
+          .blur_uv_offset = Point(0.0, pass1_pixel_size.y),
+          .blur_sigma = scaled_sigma.y * effective_scalar.y,
+          .blur_radius = ScaleBlurRadius(blur_radius.y, effective_scalar.y),
+          .step_size = 1,
+      },
+      /*destination_target=*/std::nullopt, blur_uvs);
+
+  if (!pass2_out.ok()) {
+    return std::nullopt;
+  }
 
-  if (!out_texture) {
+  // Only ping pong if the first pass actually created a render target.
+  auto pass3_destination = pass2_out.value().GetRenderTargetTexture() !=
+                                   pass1_out.value().GetRenderTargetTexture()
+                               ? std::optional<RenderTarget>(pass1_out.value())
+                               : std::optional<RenderTarget>(std::nullopt);
+
+  fml::StatusOr<RenderTarget> pass3_out = MakeBlurSubpass(
+      renderer, /*input_pass=*/pass2_out.value(),
+      input_snapshot->sampler_descriptor, tile_mode_,
+      BlurParameters{
+          .blur_uv_offset = Point(pass1_pixel_size.x, 0.0),
+          .blur_sigma = scaled_sigma.x * effective_scalar.x,
+          .blur_radius = ScaleBlurRadius(blur_radius.x, effective_scalar.x),
+          .step_size = 1,
+      },
+      pass3_destination, blur_uvs);
+
+  if (!pass3_out.ok()) {
     return std::nullopt;
   }
-  out_texture->SetLabel("DirectionalGaussianBlurFilter Texture");
 
-  SamplerDescriptor sampler_desc;
-  sampler_desc.min_filter = MinMagFilter::kLinear;
-  sampler_desc.mag_filter = MinMagFilter::kLinear;
-
-  return Snapshot{
-      .texture = out_texture,
-      .transform =
-          texture_rotate.Invert() *
-          Matrix::MakeTranslation(pass_texture_rect.origin) *
-          Matrix::MakeScale((1 / scale) * (scaled_size / floored_size)),
-      .sampler_descriptor = sampler_desc,
-      .opacity = input_snapshot->opacity};
+  // The ping-pong approach requires that each render pass output has the same
+  // size.
+  FML_DCHECK((pass1_out.value().GetRenderTargetSize() ==
+              pass2_out.value().GetRenderTargetSize()) &&
+             (pass2_out.value().GetRenderTargetSize() ==
+              pass3_out.value().GetRenderTargetSize()));
+
+  SamplerDescriptor sampler_desc = MakeSamplerDescriptor(
+      MinMagFilter::kLinear, SamplerAddressMode::kClampToEdge);
+
+  Entity blur_output_entity = Entity::FromSnapshot(
+      Snapshot{.texture = pass3_out.value().GetRenderTargetTexture(),
+               .transform = input_snapshot->transform *
+                            padding_snapshot_adjustment *
+                            Matrix::MakeScale(1 / effective_scalar),
+               .sampler_descriptor = sampler_desc,
+               .opacity = input_snapshot->opacity},
+      entity.GetBlendMode(), entity.GetClipDepth());
+
+  return ApplyBlurStyle(mask_blur_style_, entity, inputs[0],
+                        input_snapshot.value(), std::move(blur_output_entity),
+                        mask_geometry_);
 }
 
-std::optional<Rect> DirectionalGaussianBlurFilterContents::GetFilterCoverage(
-    const FilterInput::Vector& inputs,
+Scalar GaussianBlurFilterContents::CalculateBlurRadius(Scalar sigma) {
+  return static_cast<Radius>(Sigma(sigma)).radius;
+}
+
+Quad GaussianBlurFilterContents::CalculateUVs(
+    const std::shared_ptr<FilterInput>& filter_input,
     const Entity& entity,
-    const Matrix& effect_transform) const {
-  if (inputs.empty()) {
-    return std::nullopt;
+    const Rect& source_rect,
+    const ISize& texture_size) {
+  Matrix input_transform = filter_input->GetLocalTransform(entity);
+  Quad coverage_quad = source_rect.GetTransformedPoints(input_transform);
+
+  Matrix uv_transform = Matrix::MakeScale(
+      {1.0f / texture_size.width, 1.0f / texture_size.height, 1.0f});
+  return uv_transform.Transform(coverage_quad);
+}
+
+// This function was calculated by observing Skia's behavior. Its blur at 500
+// seemed to be 0.15.  Since we clamp at 500 I solved the quadratic equation
+// that puts the minima there and a f(0)=1.
+Scalar GaussianBlurFilterContents::ScaleSigma(Scalar sigma) {
+  // Limit the kernel size to 1000x1000 pixels, like Skia does.
+  Scalar clamped = std::min(sigma, 500.0f);
+  constexpr Scalar a = 3.4e-06;
+  constexpr Scalar b = -3.4e-3;
+  constexpr Scalar c = 1.f;
+  Scalar scalar = c + b * clamped + a * clamped * clamped;
+  return clamped * scalar;
+}
+
+KernelPipeline::FragmentShader::KernelSamples GenerateBlurInfo(
+    BlurParameters parameters) {
+  KernelPipeline::FragmentShader::KernelSamples result;
+  result.sample_count =
+      ((2 * parameters.blur_radius) / parameters.step_size) + 1;
+
+  // Chop off the last samples if the radius >= 3 where they account for < 1.56%
+  // of the result.
+  int x_offset = 0;
+  if (parameters.blur_radius >= 3) {
+    result.sample_count -= 2;
+    x_offset = 1;
   }
 
-  auto coverage = inputs[0]->GetCoverage(entity);
-  if (!coverage.has_value()) {
-    return std::nullopt;
+  Scalar tally = 0.0f;
+  for (int i = 0; i < result.sample_count; ++i) {
+    int x = x_offset + (i * parameters.step_size) - parameters.blur_radius;
+    result.samples[i] = KernelPipeline::FragmentShader::KernelSample{
+        .uv_offset = parameters.blur_uv_offset * x,
+        .coefficient = expf(-0.5f * (x * x) /
+                            (parameters.blur_sigma * parameters.blur_sigma)) /
+                       (sqrtf(2.0f * M_PI) * parameters.blur_sigma),
+    };
+    tally += result.samples[i].coefficient;
+  }
+
+  // Make sure everything adds up to 1.
+  for (auto& sample : result.samples) {
+    sample.coefficient /= tally;
+  }
+
+  return result;
+}
+
+// This works by shrinking the kernel size by 2 and relying on lerp to read
+// between the samples.
+KernelPipeline::FragmentShader::KernelSamples LerpHackKernelSamples(
+    KernelPipeline::FragmentShader::KernelSamples parameters) {
+  KernelPipeline::FragmentShader::KernelSamples result;
+  result.sample_count = ((parameters.sample_count - 1) / 2) + 1;
+  int32_t middle = result.sample_count / 2;
+  int32_t j = 0;
+  for (int i = 0; i < result.sample_count; i++) {
+    if (i == middle) {
+      result.samples[i] = parameters.samples[j++];
+    } else {
+      KernelPipeline::FragmentShader::KernelSample left = parameters.samples[j];
+      KernelPipeline::FragmentShader::KernelSample right =
+          parameters.samples[j + 1];
+      result.samples[i] = KernelPipeline::FragmentShader::KernelSample{
+          .uv_offset = (left.uv_offset * left.coefficient +
+                        right.uv_offset * right.coefficient) /
+                       (left.coefficient + right.coefficient),
+          .coefficient = left.coefficient + right.coefficient,
+      };
+      j += 2;
+    }
   }
 
-  auto transform = inputs[0]->GetTransform(entity) * effect_transform;
-  auto transformed_blur_vector =
-      transform.TransformDirection(blur_direction_ * Radius{blur_sigma_}.radius)
-          .Abs();
-  auto extent = coverage->size + transformed_blur_vector * 2;
-  return Rect(coverage->origin - transformed_blur_vector,
-              Size(extent.x, extent.y));
+  return result;
 }
 
 }  // namespace impeller
diff --git a/impeller/entity/contents/filters/gaussian_blur_filter_contents.h b/impeller/entity/contents/filters/gaussian_blur_filter_contents.h
index 7c4e44d68ece5b6dec124c7f160f81c14171e8ae..7f545c079a00914b2057640248144b137723716a 100644
--- a/impeller/entity/contents/filters/gaussian_blur_filter_contents.h
+++ b/impeller/entity/contents/filters/gaussian_blur_filter_contents.h
@@ -2,32 +2,54 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_GAUSSIAN_BLUR_FILTER_CONTENTS_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_GAUSSIAN_BLUR_FILTER_CONTENTS_H_
 
-#include <memory>
 #include <optional>
+#include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/contents/filters/filter_contents.h"
-#include "impeller/entity/contents/filters/inputs/filter_input.h"
+#include "impeller/entity/geometry/geometry.h"
 
 namespace impeller {
 
-class DirectionalGaussianBlurFilterContents final : public FilterContents {
- public:
-  DirectionalGaussianBlurFilterContents();
-
-  ~DirectionalGaussianBlurFilterContents() override;
+struct BlurParameters {
+  Point blur_uv_offset;
+  Scalar blur_sigma;
+  int blur_radius;
+  int step_size;
+};
 
-  void SetSigma(Sigma sigma);
+KernelPipeline::FragmentShader::KernelSamples GenerateBlurInfo(
+    BlurParameters parameters);
 
-  void SetSecondarySigma(Sigma sigma);
+/// This will shrink the size of a kernel by roughly half by sampling between
+/// samples and relying on linear interpolation between the samples.
+KernelPipeline::FragmentShader::KernelSamples LerpHackKernelSamples(
+    KernelPipeline::FragmentShader::KernelSamples samples);
 
-  void SetDirection(Vector2 direction);
+/// Performs a bidirectional Gaussian blur.
+///
+/// This is accomplished by rendering multiple passes in multiple directions.
+/// Note: This will replace `DirectionalGaussianBlurFilterContents`.
+class GaussianBlurFilterContents final : public FilterContents {
+ public:
+  static std::string_view kNoMipsError;
+  static const int32_t kBlurFilterRequiredMipCount;
 
-  void SetBlurStyle(BlurStyle blur_style);
+  explicit GaussianBlurFilterContents(
+      Scalar sigma_x,
+      Scalar sigma_y,
+      Entity::TileMode tile_mode,
+      BlurStyle mask_blur_style,
+      const std::shared_ptr<Geometry>& mask_geometry);
 
-  void SetTileMode(Entity::TileMode tile_mode);
+  Scalar GetSigmaX() const { return sigma_x_; }
+  Scalar GetSigmaY() const { return sigma_y_; }
 
-  void SetSourceOverride(FilterInput::Ref alpha_mask);
+  // |FilterContents|
+  std::optional<Rect> GetFilterSourceCoverage(
+      const Matrix& effect_transform,
+      const Rect& output_limit) const override;
 
   // |FilterContents|
   std::optional<Rect> GetFilterCoverage(
@@ -35,25 +57,51 @@ class DirectionalGaussianBlurFilterContents final : public FilterContents {
       const Entity& entity,
       const Matrix& effect_transform) const override;
 
+  /// Given a sigma (standard deviation) calculate the blur radius (1/2 the
+  /// kernel size).
+  static Scalar CalculateBlurRadius(Scalar sigma);
+
+  /// Calculate the UV coordinates for rendering the filter_input.
+  /// @param filter_input The FilterInput that should be rendered.
+  /// @param entity The associated entity for the filter_input.
+  /// @param source_rect The rect in source coordinates to convert to uvs.
+  /// @param texture_size The rect to convert in source coordinates.
+  static Quad CalculateUVs(const std::shared_ptr<FilterInput>& filter_input,
+                           const Entity& entity,
+                           const Rect& source_rect,
+                           const ISize& texture_size);
+
+  /// Calculate the scale factor for the downsample pass given a sigma value.
+  ///
+  /// Visible for testing.
+  static Scalar CalculateScale(Scalar sigma);
+
+  /// Scales down the sigma value to match Skia's behavior.
+  ///
+  /// effective_blur_radius = CalculateBlurRadius(ScaleSigma(sigma_));
+  ///
+  /// This function was calculated by observing Skia's behavior. Its blur at
+  /// 500 seemed to be 0.15.  Since we clamp at 500 I solved the quadratic
+  /// equation that puts the minima there and a f(0)=1.
+  static Scalar ScaleSigma(Scalar sigma);
+
  private:
   // |FilterContents|
-  std::optional<Snapshot> RenderFilter(
+  std::optional<Entity> RenderFilter(
       const FilterInput::Vector& input_textures,
       const ContentContext& renderer,
       const Entity& entity,
       const Matrix& effect_transform,
-      const Rect& coverage) const override;
-  Sigma blur_sigma_;
-  Sigma secondary_blur_sigma_;
-  Vector2 blur_direction_;
-  BlurStyle blur_style_ = BlurStyle::kNormal;
-  Entity::TileMode tile_mode_ = Entity::TileMode::kDecal;
-  bool src_color_factor_ = false;
-  bool inner_blur_factor_ = true;
-  bool outer_blur_factor_ = true;
-  FilterInput::Ref source_override_;
-
-  FML_DISALLOW_COPY_AND_ASSIGN(DirectionalGaussianBlurFilterContents);
+      const Rect& coverage,
+      const std::optional<Rect>& coverage_hint) const override;
+
+  const Scalar sigma_x_ = 0.0;
+  const Scalar sigma_y_ = 0.0;
+  const Entity::TileMode tile_mode_;
+  const BlurStyle mask_blur_style_;
+  std::shared_ptr<Geometry> mask_geometry_;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_GAUSSIAN_BLUR_FILTER_CONTENTS_H_
diff --git a/impeller/entity/contents/filters/gaussian_blur_filter_contents_unittests.cc b/impeller/entity/contents/filters/gaussian_blur_filter_contents_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..73b49ae1367cc8961e3ba49286e6d1bd9ca60757
--- /dev/null
+++ b/impeller/entity/contents/filters/gaussian_blur_filter_contents_unittests.cc
@@ -0,0 +1,598 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/testing/testing.h"
+#include "fml/status_or.h"
+#include "gmock/gmock.h"
+#include "impeller/entity/contents/filters/gaussian_blur_filter_contents.h"
+#include "impeller/entity/contents/texture_contents.h"
+#include "impeller/entity/entity_playground.h"
+#include "impeller/geometry/geometry_asserts.h"
+#include "impeller/renderer/testing/mocks.h"
+
+#if FML_OS_MACOSX
+#define IMPELLER_RAND arc4random
+#else
+#define IMPELLER_RAND rand
+#endif
+
+namespace impeller {
+namespace testing {
+
+namespace {
+
+// Use newtonian method to give the closest answer to target where
+// f(x) is less than the target. We do this because the value is `ceil`'d to
+// grab fractional pixels.
+fml::StatusOr<float> LowerBoundNewtonianMethod(
+    const std::function<float(float)>& func,
+    float target,
+    float guess,
+    float tolerance) {
+  const double delta = 1e-6;
+  double x = guess;
+  double fx;
+  static const int kMaxIterations = 1000;
+  int count = 0;
+
+  do {
+    fx = func(x) - target;
+    double derivative = (func(x + delta) - func(x)) / delta;
+    x = x - fx / derivative;
+    if (++count > kMaxIterations) {
+      return fml::Status(fml::StatusCode::kDeadlineExceeded,
+                         "Did not converge on answer.");
+    }
+  } while (std::abs(fx) > tolerance ||
+           fx < 0.0);  // fx < 0.0 makes this lower bound.
+
+  return x;
+}
+
+fml::StatusOr<Scalar> CalculateSigmaForBlurRadius(
+    Scalar radius,
+    const Matrix& effect_transform) {
+  auto f = [effect_transform](Scalar x) -> Scalar {
+    Vector2 scaled_sigma = (effect_transform.Basis() *
+                            Vector2(GaussianBlurFilterContents::ScaleSigma(x),
+                                    GaussianBlurFilterContents::ScaleSigma(x)))
+                               .Abs();
+    Vector2 blur_radius = Vector2(
+        GaussianBlurFilterContents::CalculateBlurRadius(scaled_sigma.x),
+        GaussianBlurFilterContents::CalculateBlurRadius(scaled_sigma.y));
+    return std::max(blur_radius.x, blur_radius.y);
+  };
+  // The newtonian method is used here since inverting the function is
+  // non-trivial because of conditional logic and would be fragile to changes.
+  return LowerBoundNewtonianMethod(f, radius, 2.f, 0.001f);
+}
+
+}  // namespace
+
+class GaussianBlurFilterContentsTest : public EntityPlayground {
+ public:
+  /// Create a texture that has been cleared to transparent black.
+  std::shared_ptr<Texture> MakeTexture(ISize size) {
+    auto render_target = GetContentContext()->MakeSubpass(
+        "Clear Subpass", size,
+        [](const ContentContext&, RenderPass&) { return true; });
+    if (render_target.ok()) {
+      return render_target.value().GetRenderTargetTexture();
+    }
+    return nullptr;
+  }
+};
+INSTANTIATE_PLAYGROUND_SUITE(GaussianBlurFilterContentsTest);
+
+TEST(GaussianBlurFilterContentsTest, Create) {
+  GaussianBlurFilterContents contents(
+      /*sigma_x=*/0.0, /*sigma_y=*/0.0, Entity::TileMode::kDecal,
+      FilterContents::BlurStyle::kNormal, /*mask_geometry=*/nullptr);
+  EXPECT_EQ(contents.GetSigmaX(), 0.0);
+  EXPECT_EQ(contents.GetSigmaY(), 0.0);
+}
+
+TEST(GaussianBlurFilterContentsTest, CoverageEmpty) {
+  GaussianBlurFilterContents contents(
+      /*sigma_x=*/0.0, /*sigma_y=*/0.0, Entity::TileMode::kDecal,
+      FilterContents::BlurStyle::kNormal, /*mask_geometry=*/nullptr);
+  FilterInput::Vector inputs = {};
+  Entity entity;
+  std::optional<Rect> coverage =
+      contents.GetFilterCoverage(inputs, entity, /*effect_transform=*/Matrix());
+  ASSERT_FALSE(coverage.has_value());
+}
+
+TEST(GaussianBlurFilterContentsTest, CoverageSimple) {
+  GaussianBlurFilterContents contents(
+      /*sigma_x=*/0.0, /*sigma_y=*/0.0, Entity::TileMode::kDecal,
+      FilterContents::BlurStyle::kNormal, /*mask_geometry=*/nullptr);
+  FilterInput::Vector inputs = {
+      FilterInput::Make(Rect::MakeLTRB(10, 10, 110, 110))};
+  Entity entity;
+  std::optional<Rect> coverage =
+      contents.GetFilterCoverage(inputs, entity, /*effect_transform=*/Matrix());
+
+  ASSERT_EQ(coverage, Rect::MakeLTRB(10, 10, 110, 110));
+}
+
+TEST(GaussianBlurFilterContentsTest, CoverageWithSigma) {
+  fml::StatusOr<Scalar> sigma_radius_1 =
+      CalculateSigmaForBlurRadius(1.0, Matrix());
+  ASSERT_TRUE(sigma_radius_1.ok());
+  GaussianBlurFilterContents contents(
+      /*sigma_x=*/sigma_radius_1.value(),
+      /*sigma_y=*/sigma_radius_1.value(), Entity::TileMode::kDecal,
+      FilterContents::BlurStyle::kNormal, /*mask_geometry=*/nullptr);
+  FilterInput::Vector inputs = {
+      FilterInput::Make(Rect::MakeLTRB(100, 100, 200, 200))};
+  Entity entity;
+  std::optional<Rect> coverage =
+      contents.GetFilterCoverage(inputs, entity, /*effect_transform=*/Matrix());
+
+  EXPECT_TRUE(coverage.has_value());
+  if (coverage.has_value()) {
+    EXPECT_RECT_NEAR(coverage.value(), Rect::MakeLTRB(99, 99, 201, 201));
+  }
+}
+
+TEST_P(GaussianBlurFilterContentsTest, CoverageWithTexture) {
+  fml::StatusOr<Scalar> sigma_radius_1 =
+      CalculateSigmaForBlurRadius(1.0, Matrix());
+  ASSERT_TRUE(sigma_radius_1.ok());
+  GaussianBlurFilterContents contents(
+      /*sigma_X=*/sigma_radius_1.value(),
+      /*sigma_y=*/sigma_radius_1.value(), Entity::TileMode::kDecal,
+      FilterContents::BlurStyle::kNormal, /*mask_geometry=*/nullptr);
+  std::shared_ptr<Texture> texture = MakeTexture(ISize(100, 100));
+  FilterInput::Vector inputs = {FilterInput::Make(texture)};
+  Entity entity;
+  entity.SetTransform(Matrix::MakeTranslation({100, 100, 0}));
+  std::optional<Rect> coverage =
+      contents.GetFilterCoverage(inputs, entity, /*effect_transform=*/Matrix());
+
+  EXPECT_TRUE(coverage.has_value());
+  if (coverage.has_value()) {
+    EXPECT_RECT_NEAR(coverage.value(), Rect::MakeLTRB(99, 99, 201, 201));
+  }
+}
+
+TEST_P(GaussianBlurFilterContentsTest, CoverageWithEffectTransform) {
+  Matrix effect_transform = Matrix::MakeScale({2.0, 2.0, 1.0});
+  fml::StatusOr<Scalar> sigma_radius_1 =
+      CalculateSigmaForBlurRadius(1.0, effect_transform);
+  ASSERT_TRUE(sigma_radius_1.ok());
+  GaussianBlurFilterContents contents(
+      /*sigma_x=*/sigma_radius_1.value(),
+      /*sigma_y=*/sigma_radius_1.value(), Entity::TileMode::kDecal,
+      FilterContents::BlurStyle::kNormal, /*mask_geometry=*/nullptr);
+  std::shared_ptr<Texture> texture = MakeTexture(ISize(100, 100));
+  FilterInput::Vector inputs = {FilterInput::Make(texture)};
+  Entity entity;
+  entity.SetTransform(Matrix::MakeTranslation({100, 100, 0}));
+  std::optional<Rect> coverage =
+      contents.GetFilterCoverage(inputs, entity, effect_transform);
+  EXPECT_TRUE(coverage.has_value());
+  if (coverage.has_value()) {
+    EXPECT_RECT_NEAR(coverage.value(),
+                     Rect::MakeLTRB(100 - 1, 100 - 1, 200 + 1, 200 + 1));
+  }
+}
+
+TEST(GaussianBlurFilterContentsTest, FilterSourceCoverage) {
+  fml::StatusOr<Scalar> sigma_radius_1 =
+      CalculateSigmaForBlurRadius(1.0, Matrix());
+  ASSERT_TRUE(sigma_radius_1.ok());
+  auto contents = std::make_unique<GaussianBlurFilterContents>(
+      sigma_radius_1.value(), sigma_radius_1.value(), Entity::TileMode::kDecal,
+      FilterContents::BlurStyle::kNormal, /*mask_geometry=*/nullptr);
+  std::optional<Rect> coverage = contents->GetFilterSourceCoverage(
+      /*effect_transform=*/Matrix::MakeScale({2.0, 2.0, 1.0}),
+      /*output_limit=*/Rect::MakeLTRB(100, 100, 200, 200));
+  EXPECT_TRUE(coverage.has_value());
+  if (coverage.has_value()) {
+    EXPECT_RECT_NEAR(coverage.value(),
+                     Rect::MakeLTRB(100 - 2, 100 - 2, 200 + 2, 200 + 2));
+  }
+}
+
+TEST(GaussianBlurFilterContentsTest, CalculateSigmaValues) {
+  EXPECT_EQ(GaussianBlurFilterContents::CalculateScale(1.0f), 1);
+  EXPECT_EQ(GaussianBlurFilterContents::CalculateScale(2.0f), 1);
+  EXPECT_EQ(GaussianBlurFilterContents::CalculateScale(3.0f), 1);
+  EXPECT_EQ(GaussianBlurFilterContents::CalculateScale(4.0f), 1);
+  EXPECT_EQ(GaussianBlurFilterContents::CalculateScale(16.0f), 0.25);
+  // Hang on to 1/8 as long as possible.
+  EXPECT_EQ(GaussianBlurFilterContents::CalculateScale(95.0f), 0.125);
+  EXPECT_EQ(GaussianBlurFilterContents::CalculateScale(96.0f), 0.0625);
+  // Downsample clamped to 1/16th.
+  EXPECT_EQ(GaussianBlurFilterContents::CalculateScale(1024.0f), 0.0625);
+}
+
+TEST_P(GaussianBlurFilterContentsTest, RenderCoverageMatchesGetCoverage) {
+  std::shared_ptr<Texture> texture = MakeTexture(ISize(100, 100));
+  fml::StatusOr<Scalar> sigma_radius_1 =
+      CalculateSigmaForBlurRadius(1.0, Matrix());
+  ASSERT_TRUE(sigma_radius_1.ok());
+  auto contents = std::make_unique<GaussianBlurFilterContents>(
+      sigma_radius_1.value(), sigma_radius_1.value(), Entity::TileMode::kDecal,
+      FilterContents::BlurStyle::kNormal, /*mask_geometry=*/nullptr);
+  contents->SetInputs({FilterInput::Make(texture)});
+  std::shared_ptr<ContentContext> renderer = GetContentContext();
+
+  Entity entity;
+  std::optional<Entity> result =
+      contents->GetEntity(*renderer, entity, /*coverage_hint=*/{});
+  EXPECT_TRUE(result.has_value());
+  if (result.has_value()) {
+    EXPECT_EQ(result.value().GetBlendMode(), BlendMode::kSourceOver);
+    std::optional<Rect> result_coverage = result.value().GetCoverage();
+    std::optional<Rect> contents_coverage = contents->GetCoverage(entity);
+    EXPECT_TRUE(result_coverage.has_value());
+    EXPECT_TRUE(contents_coverage.has_value());
+    if (result_coverage.has_value() && contents_coverage.has_value()) {
+      EXPECT_TRUE(RectNear(contents_coverage.value(),
+                           Rect::MakeLTRB(-1, -1, 101, 101)));
+      EXPECT_TRUE(
+          RectNear(result_coverage.value(), Rect::MakeLTRB(-1, -1, 101, 101)));
+    }
+  }
+}
+
+TEST_P(GaussianBlurFilterContentsTest,
+       RenderCoverageMatchesGetCoverageTranslate) {
+  std::shared_ptr<Texture> texture = MakeTexture(ISize(100, 100));
+  fml::StatusOr<Scalar> sigma_radius_1 =
+      CalculateSigmaForBlurRadius(1.0, Matrix());
+  ASSERT_TRUE(sigma_radius_1.ok());
+  auto contents = std::make_unique<GaussianBlurFilterContents>(
+      sigma_radius_1.value(), sigma_radius_1.value(), Entity::TileMode::kDecal,
+      FilterContents::BlurStyle::kNormal, /*mask_geometry=*/nullptr);
+  contents->SetInputs({FilterInput::Make(texture)});
+  std::shared_ptr<ContentContext> renderer = GetContentContext();
+
+  Entity entity;
+  entity.SetTransform(Matrix::MakeTranslation({100, 200, 0}));
+  std::optional<Entity> result =
+      contents->GetEntity(*renderer, entity, /*coverage_hint=*/{});
+
+  EXPECT_TRUE(result.has_value());
+  if (result.has_value()) {
+    EXPECT_EQ(result.value().GetBlendMode(), BlendMode::kSourceOver);
+    std::optional<Rect> result_coverage = result.value().GetCoverage();
+    std::optional<Rect> contents_coverage = contents->GetCoverage(entity);
+    EXPECT_TRUE(result_coverage.has_value());
+    EXPECT_TRUE(contents_coverage.has_value());
+    if (result_coverage.has_value() && contents_coverage.has_value()) {
+      EXPECT_TRUE(RectNear(contents_coverage.value(),
+                           Rect::MakeLTRB(99, 199, 201, 301)));
+      EXPECT_TRUE(
+          RectNear(result_coverage.value(), Rect::MakeLTRB(99, 199, 201, 301)));
+    }
+  }
+}
+
+TEST_P(GaussianBlurFilterContentsTest,
+       RenderCoverageMatchesGetCoverageRotated) {
+  std::shared_ptr<Texture> texture = MakeTexture(ISize(400, 300));
+  fml::StatusOr<Scalar> sigma_radius_1 =
+      CalculateSigmaForBlurRadius(1.0, Matrix());
+  auto contents = std::make_unique<GaussianBlurFilterContents>(
+      sigma_radius_1.value(), sigma_radius_1.value(), Entity::TileMode::kDecal,
+      FilterContents::BlurStyle::kNormal, /*mask_geometry=*/nullptr);
+  contents->SetInputs({FilterInput::Make(texture)});
+  std::shared_ptr<ContentContext> renderer = GetContentContext();
+
+  Entity entity;
+  // Rotate around the top left corner, then push it over to (100, 100).
+  entity.SetTransform(Matrix::MakeTranslation({400, 100, 0}) *
+                      Matrix::MakeRotationZ(Degrees(90.0)));
+  std::optional<Entity> result =
+      contents->GetEntity(*renderer, entity, /*coverage_hint=*/{});
+  EXPECT_TRUE(result.has_value());
+  if (result.has_value()) {
+    EXPECT_EQ(result.value().GetBlendMode(), BlendMode::kSourceOver);
+    std::optional<Rect> result_coverage = result.value().GetCoverage();
+    std::optional<Rect> contents_coverage = contents->GetCoverage(entity);
+    EXPECT_TRUE(result_coverage.has_value());
+    EXPECT_TRUE(contents_coverage.has_value());
+    if (result_coverage.has_value() && contents_coverage.has_value()) {
+      EXPECT_TRUE(RectNear(contents_coverage.value(),
+                           Rect::MakeLTRB(99, 99, 401, 501)));
+      EXPECT_TRUE(
+          RectNear(result_coverage.value(), Rect::MakeLTRB(99, 99, 401, 501)));
+    }
+  }
+}
+
+TEST_P(GaussianBlurFilterContentsTest, CalculateUVsSimple) {
+  std::shared_ptr<Texture> texture = MakeTexture(ISize(100, 100));
+  auto filter_input = FilterInput::Make(texture);
+  Entity entity;
+  Quad uvs = GaussianBlurFilterContents::CalculateUVs(
+      filter_input, entity, Rect::MakeSize(ISize(100, 100)), ISize(100, 100));
+  std::optional<Rect> uvs_bounds = Rect::MakePointBounds(uvs);
+  EXPECT_TRUE(uvs_bounds.has_value());
+  if (uvs_bounds.has_value()) {
+    EXPECT_TRUE(RectNear(uvs_bounds.value(), Rect::MakeXYWH(0, 0, 1, 1)));
+  }
+}
+
+TEST_P(GaussianBlurFilterContentsTest, TextureContentsWithDestinationRect) {
+  std::shared_ptr<Texture> texture = MakeTexture(ISize(100, 100));
+  auto texture_contents = std::make_shared<TextureContents>();
+  texture_contents->SetSourceRect(Rect::MakeSize(texture->GetSize()));
+  texture_contents->SetTexture(texture);
+  texture_contents->SetDestinationRect(Rect::MakeXYWH(
+      50, 40, texture->GetSize().width, texture->GetSize().height));
+
+  fml::StatusOr<Scalar> sigma_radius_1 =
+      CalculateSigmaForBlurRadius(1.0, Matrix());
+  auto contents = std::make_unique<GaussianBlurFilterContents>(
+      sigma_radius_1.value(), sigma_radius_1.value(), Entity::TileMode::kDecal,
+      FilterContents::BlurStyle::kNormal, /*mask_geometry=*/nullptr);
+  contents->SetInputs({FilterInput::Make(texture_contents)});
+  std::shared_ptr<ContentContext> renderer = GetContentContext();
+
+  Entity entity;
+  std::optional<Entity> result =
+      contents->GetEntity(*renderer, entity, /*coverage_hint=*/{});
+  EXPECT_TRUE(result.has_value());
+  if (result.has_value()) {
+    EXPECT_EQ(result.value().GetBlendMode(), BlendMode::kSourceOver);
+    std::optional<Rect> result_coverage = result.value().GetCoverage();
+    std::optional<Rect> contents_coverage = contents->GetCoverage(entity);
+    EXPECT_TRUE(result_coverage.has_value());
+    EXPECT_TRUE(contents_coverage.has_value());
+    if (result_coverage.has_value() && contents_coverage.has_value()) {
+      EXPECT_TRUE(RectNear(result_coverage.value(), contents_coverage.value()));
+      EXPECT_TRUE(RectNear(result_coverage.value(),
+                           Rect::MakeLTRB(49.f, 39.f, 151.f, 141.f)));
+    }
+  }
+}
+
+TEST_P(GaussianBlurFilterContentsTest,
+       TextureContentsWithDestinationRectScaled) {
+  std::shared_ptr<Texture> texture = MakeTexture(ISize(100, 100));
+  auto texture_contents = std::make_shared<TextureContents>();
+  texture_contents->SetSourceRect(Rect::MakeSize(texture->GetSize()));
+  texture_contents->SetTexture(texture);
+  texture_contents->SetDestinationRect(Rect::MakeXYWH(
+      50, 40, texture->GetSize().width, texture->GetSize().height));
+
+  fml::StatusOr<Scalar> sigma_radius_1 =
+      CalculateSigmaForBlurRadius(1.0, Matrix());
+  auto contents = std::make_unique<GaussianBlurFilterContents>(
+      sigma_radius_1.value(), sigma_radius_1.value(), Entity::TileMode::kDecal,
+      FilterContents::BlurStyle::kNormal, /*mask_geometry=*/nullptr);
+  contents->SetInputs({FilterInput::Make(texture_contents)});
+  std::shared_ptr<ContentContext> renderer = GetContentContext();
+
+  Entity entity;
+  entity.SetTransform(Matrix::MakeScale({2.0, 2.0, 1.0}));
+  std::optional<Entity> result =
+      contents->GetEntity(*renderer, entity, /*coverage_hint=*/{});
+  EXPECT_TRUE(result.has_value());
+  if (result.has_value()) {
+    EXPECT_EQ(result.value().GetBlendMode(), BlendMode::kSourceOver);
+    std::optional<Rect> result_coverage = result.value().GetCoverage();
+    std::optional<Rect> contents_coverage = contents->GetCoverage(entity);
+    EXPECT_TRUE(result_coverage.has_value());
+    EXPECT_TRUE(contents_coverage.has_value());
+    if (result_coverage.has_value() && contents_coverage.has_value()) {
+      EXPECT_TRUE(RectNear(result_coverage.value(), contents_coverage.value()));
+      EXPECT_TRUE(RectNear(contents_coverage.value(),
+                           Rect::MakeLTRB(98.f, 78.f, 302.f, 282.f)));
+    }
+  }
+}
+
+TEST_P(GaussianBlurFilterContentsTest, TextureContentsWithEffectTransform) {
+  Matrix effect_transform = Matrix::MakeScale({2.0, 2.0, 1.0});
+  std::shared_ptr<Texture> texture = MakeTexture(ISize(100, 100));
+  auto texture_contents = std::make_shared<TextureContents>();
+  texture_contents->SetSourceRect(Rect::MakeSize(texture->GetSize()));
+  texture_contents->SetTexture(texture);
+  texture_contents->SetDestinationRect(Rect::MakeXYWH(
+      50, 40, texture->GetSize().width, texture->GetSize().height));
+
+  fml::StatusOr<Scalar> sigma_radius_1 =
+      CalculateSigmaForBlurRadius(1.0, effect_transform);
+  ASSERT_TRUE(sigma_radius_1.ok());
+  auto contents = std::make_unique<GaussianBlurFilterContents>(
+      sigma_radius_1.value(), sigma_radius_1.value(), Entity::TileMode::kDecal,
+      FilterContents::BlurStyle::kNormal, /*mask_geometry=*/nullptr);
+  contents->SetInputs({FilterInput::Make(texture_contents)});
+  contents->SetEffectTransform(effect_transform);
+  std::shared_ptr<ContentContext> renderer = GetContentContext();
+
+  Entity entity;
+  std::optional<Entity> result =
+      contents->GetEntity(*renderer, entity, /*coverage_hint=*/{});
+  EXPECT_TRUE(result.has_value());
+  if (result.has_value()) {
+    EXPECT_EQ(result.value().GetBlendMode(), BlendMode::kSourceOver);
+    std::optional<Rect> result_coverage = result.value().GetCoverage();
+    std::optional<Rect> contents_coverage = contents->GetCoverage(entity);
+    EXPECT_TRUE(result_coverage.has_value());
+    EXPECT_TRUE(contents_coverage.has_value());
+    if (result_coverage.has_value() && contents_coverage.has_value()) {
+      EXPECT_TRUE(RectNear(result_coverage.value(), contents_coverage.value()));
+      EXPECT_TRUE(RectNear(contents_coverage.value(),
+                           Rect::MakeXYWH(49.f, 39.f, 102.f, 102.f)));
+    }
+  }
+}
+
+TEST(GaussianBlurFilterContentsTest, CalculateSigmaForBlurRadius) {
+  Scalar sigma = 1.0;
+  Scalar radius = GaussianBlurFilterContents::CalculateBlurRadius(
+      GaussianBlurFilterContents::ScaleSigma(sigma));
+  fml::StatusOr<Scalar> derived_sigma =
+      CalculateSigmaForBlurRadius(radius, Matrix());
+  ASSERT_TRUE(derived_sigma.ok());
+  EXPECT_NEAR(sigma, derived_sigma.value(), 0.01f);
+}
+
+TEST(GaussianBlurFilterContentsTest, Coefficients) {
+  BlurParameters parameters = {.blur_uv_offset = Point(1, 0),
+                               .blur_sigma = 1,
+                               .blur_radius = 5,
+                               .step_size = 1};
+  KernelPipeline::FragmentShader::KernelSamples samples =
+      GenerateBlurInfo(parameters);
+  EXPECT_EQ(samples.sample_count, 9);
+
+  // Coefficients should add up to 1.
+  Scalar tally = 0;
+  for (int i = 0; i < samples.sample_count; ++i) {
+    tally += samples.samples[i].coefficient;
+  }
+  EXPECT_FLOAT_EQ(tally, 1.0f);
+
+  // Verify the shape of the curve.
+  for (int i = 0; i < 4; ++i) {
+    EXPECT_FLOAT_EQ(samples.samples[i].coefficient,
+                    samples.samples[8 - i].coefficient);
+    EXPECT_TRUE(samples.samples[i + 1].coefficient >
+                samples.samples[i].coefficient);
+  }
+}
+
+TEST(GaussianBlurFilterContentsTest, LerpHackKernelSamplesSimple) {
+  KernelPipeline::FragmentShader::KernelSamples kernel_samples = {
+      .sample_count = 5,
+      .samples =
+          {
+              {
+                  .uv_offset = Vector2(-2, 0),
+                  .coefficient = 0.1f,
+              },
+              {
+                  .uv_offset = Vector2(-1, 0),
+                  .coefficient = 0.2f,
+              },
+              {
+                  .uv_offset = Vector2(0, 0),
+                  .coefficient = 0.4f,
+              },
+              {
+                  .uv_offset = Vector2(1, 0),
+                  .coefficient = 0.2f,
+              },
+              {
+                  .uv_offset = Vector2(2, 0),
+                  .coefficient = 0.1f,
+              },
+          },
+  };
+
+  KernelPipeline::FragmentShader::KernelSamples fast_kernel_samples =
+      LerpHackKernelSamples(kernel_samples);
+  EXPECT_EQ(fast_kernel_samples.sample_count, 3);
+
+  KernelPipeline::FragmentShader::KernelSample* samples =
+      kernel_samples.samples;
+  KernelPipeline::FragmentShader::KernelSample* fast_samples =
+      fast_kernel_samples.samples;
+
+  //////////////////////////////////////////////////////////////////////////////
+  // Check output kernel.
+
+  EXPECT_FLOAT_EQ(fast_samples[0].uv_offset.x, -1.3333333);
+  EXPECT_FLOAT_EQ(fast_samples[0].uv_offset.y, 0);
+  EXPECT_FLOAT_EQ(fast_samples[0].coefficient, 0.3);
+  EXPECT_FLOAT_EQ(fast_samples[1].uv_offset.x, 0);
+  EXPECT_FLOAT_EQ(fast_samples[1].uv_offset.y, 0);
+  EXPECT_FLOAT_EQ(fast_samples[1].coefficient, 0.4);
+  EXPECT_FLOAT_EQ(fast_samples[2].uv_offset.x, 1.3333333);
+  EXPECT_FLOAT_EQ(fast_samples[2].uv_offset.y, 0);
+  EXPECT_FLOAT_EQ(fast_samples[2].coefficient, 0.3);
+
+  //////////////////////////////////////////////////////////////////////////////
+  // Check output of fast kernel versus original kernel.
+
+  Scalar data[5] = {0.25, 0.5, 0.5, 1.0, 0.2};
+  Scalar original_output =
+      samples[0].coefficient * data[0] + samples[1].coefficient * data[1] +
+      samples[2].coefficient * data[2] + samples[3].coefficient * data[3] +
+      samples[4].coefficient * data[4];
+
+  auto lerp = [](const Point& point, Scalar left, Scalar right) {
+    Scalar int_part;
+    Scalar fract = fabsf(modf(point.x, &int_part));
+    if (point.x < 0) {
+      return left * fract + right * (1.0 - fract);
+    } else {
+      return left * (1.0 - fract) + right * fract;
+    }
+  };
+  Scalar fast_output =
+      /*1st*/ lerp(fast_samples[0].uv_offset, data[0], data[1]) *
+          fast_samples[0].coefficient +
+      /*2nd*/ data[2] * fast_samples[1].coefficient +
+      /*3rd*/ lerp(fast_samples[2].uv_offset, data[3], data[4]) *
+          fast_samples[2].coefficient;
+
+  EXPECT_NEAR(original_output, fast_output, 0.01);
+}
+
+TEST(GaussianBlurFilterContentsTest, LerpHackKernelSamplesComplex) {
+  Scalar sigma = 10.0f;
+  int32_t blur_radius = static_cast<int32_t>(
+      std::ceil(GaussianBlurFilterContents::CalculateBlurRadius(sigma)));
+  BlurParameters parameters = {.blur_uv_offset = Point(1, 0),
+                               .blur_sigma = sigma,
+                               .blur_radius = blur_radius,
+                               .step_size = 1};
+  KernelPipeline::FragmentShader::KernelSamples kernel_samples =
+      GenerateBlurInfo(parameters);
+  EXPECT_EQ(kernel_samples.sample_count, 33);
+  KernelPipeline::FragmentShader::KernelSamples fast_kernel_samples =
+      LerpHackKernelSamples(kernel_samples);
+  EXPECT_EQ(fast_kernel_samples.sample_count, 17);
+  float data[33];
+  srand(0);
+  for (int i = 0; i < 33; i++) {
+    data[i] = 255.0 * static_cast<double>(IMPELLER_RAND()) / RAND_MAX;
+  }
+
+  auto sampler = [data](Point point) -> Scalar {
+    FML_CHECK(point.y == 0.0f);
+    FML_CHECK(point.x >= -16);
+    FML_CHECK(point.x <= 16);
+    Scalar fint_part;
+    Scalar fract = fabsf(modf(point.x, &fint_part));
+    if (fract == 0) {
+      int32_t int_part = static_cast<int32_t>(fint_part) + 16;
+      return data[int_part];
+    } else {
+      int32_t left = static_cast<int32_t>(floor(point.x)) + 16;
+      int32_t right = static_cast<int32_t>(ceil(point.x)) + 16;
+      if (point.x < 0) {
+        return fract * data[left] + (1.0 - fract) * data[right];
+      } else {
+        return (1.0 - fract) * data[left] + fract * data[right];
+      }
+    }
+  };
+
+  Scalar output = 0.0;
+  for (int i = 0; i < kernel_samples.sample_count; ++i) {
+    auto sample = kernel_samples.samples[i];
+    output += sample.coefficient * sampler(sample.uv_offset);
+  }
+
+  Scalar fast_output = 0.0;
+  for (int i = 0; i < fast_kernel_samples.sample_count; ++i) {
+    auto sample = fast_kernel_samples.samples[i];
+    fast_output += sample.coefficient * sampler(sample.uv_offset);
+  }
+
+  EXPECT_NEAR(output, fast_output, 0.1);
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/entity/contents/filters/inputs/contents_filter_input.cc b/impeller/entity/contents/filters/inputs/contents_filter_input.cc
index fda5df7760efa81570e849bf432010e03edd7ce8..f6e95a1af23ec0f31c4211ceb1eb2882d21def11 100644
--- a/impeller/entity/contents/filters/inputs/contents_filter_input.cc
+++ b/impeller/entity/contents/filters/inputs/contents_filter_input.cc
@@ -4,12 +4,16 @@
 
 #include "impeller/entity/contents/filters/inputs/contents_filter_input.h"
 
+#include <optional>
 #include <utility>
 
+#include "impeller/base/strings.h"
+
 namespace impeller {
 
-ContentsFilterInput::ContentsFilterInput(std::shared_ptr<Contents> contents)
-    : contents_(std::move(contents)) {}
+ContentsFilterInput::ContentsFilterInput(std::shared_ptr<Contents> contents,
+                                         bool msaa_enabled)
+    : contents_(std::move(contents)), msaa_enabled_(msaa_enabled) {}
 
 ContentsFilterInput::~ContentsFilterInput() = default;
 
@@ -18,10 +22,23 @@ FilterInput::Variant ContentsFilterInput::GetInput() const {
 }
 
 std::optional<Snapshot> ContentsFilterInput::GetSnapshot(
+    const std::string& label,
     const ContentContext& renderer,
-    const Entity& entity) const {
+    const Entity& entity,
+    std::optional<Rect> coverage_limit,
+    int32_t mip_count) const {
+  if (!coverage_limit.has_value() && entity.GetContents()) {
+    coverage_limit = entity.GetContents()->GetCoverageHint();
+  }
   if (!snapshot_.has_value()) {
-    snapshot_ = contents_->RenderToSnapshot(renderer, entity);
+    snapshot_ = contents_->RenderToSnapshot(
+        renderer,        // renderer
+        entity,          // entity
+        coverage_limit,  // coverage_limit
+        std::nullopt,    // sampler_descriptor
+        msaa_enabled_,   // msaa_enabled
+        /*mip_count=*/mip_count,
+        SPrintF("Contents to %s Filter Snapshot", label.c_str()));  // label
   }
   return snapshot_;
 }
@@ -31,4 +48,10 @@ std::optional<Rect> ContentsFilterInput::GetCoverage(
   return contents_->GetCoverage(entity);
 }
 
+void ContentsFilterInput::PopulateGlyphAtlas(
+    const std::shared_ptr<LazyGlyphAtlas>& lazy_glyph_atlas,
+    Scalar scale) {
+  contents_->PopulateGlyphAtlas(lazy_glyph_atlas, scale);
+}
+
 }  // namespace impeller
diff --git a/impeller/entity/contents/filters/inputs/contents_filter_input.h b/impeller/entity/contents/filters/inputs/contents_filter_input.h
index 7309c17ffa5f081b26315d80e1eda76b37405a51..374e10123efc4d05f470e43d7c5aa9274dc61a38 100644
--- a/impeller/entity/contents/filters/inputs/contents_filter_input.h
+++ b/impeller/entity/contents/filters/inputs/contents_filter_input.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_INPUTS_CONTENTS_FILTER_INPUT_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_INPUTS_CONTENTS_FILTER_INPUT_H_
 
 #include "impeller/entity/contents/filters/inputs/filter_input.h"
 
@@ -16,19 +17,30 @@ class ContentsFilterInput final : public FilterInput {
   Variant GetInput() const override;
 
   // |FilterInput|
-  std::optional<Snapshot> GetSnapshot(const ContentContext& renderer,
-                                      const Entity& entity) const override;
+  std::optional<Snapshot> GetSnapshot(const std::string& label,
+                                      const ContentContext& renderer,
+                                      const Entity& entity,
+                                      std::optional<Rect> coverage_limit,
+                                      int32_t mip_count) const override;
 
   // |FilterInput|
   std::optional<Rect> GetCoverage(const Entity& entity) const override;
 
+  // |FilterInput|
+  void PopulateGlyphAtlas(
+      const std::shared_ptr<LazyGlyphAtlas>& lazy_glyph_atlas,
+      Scalar scale) override;
+
  private:
-  ContentsFilterInput(std::shared_ptr<Contents> contents);
+  ContentsFilterInput(std::shared_ptr<Contents> contents, bool msaa_enabled);
 
   std::shared_ptr<Contents> contents_;
   mutable std::optional<Snapshot> snapshot_;
+  bool msaa_enabled_;
 
   friend FilterInput;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_INPUTS_CONTENTS_FILTER_INPUT_H_
diff --git a/impeller/entity/contents/filters/inputs/filter_contents_filter_input.cc b/impeller/entity/contents/filters/inputs/filter_contents_filter_input.cc
index 8b19b87e20ec1c967b45f4ecb76414cd99e66adf..2dabc08e61c06c0f57a3eaf1e48ea442b963f44a 100644
--- a/impeller/entity/contents/filters/inputs/filter_contents_filter_input.cc
+++ b/impeller/entity/contents/filters/inputs/filter_contents_filter_input.cc
@@ -6,6 +6,7 @@
 
 #include <utility>
 
+#include "impeller/base/strings.h"
 #include "impeller/entity/contents/filters/filter_contents.h"
 
 namespace impeller {
@@ -21,10 +22,20 @@ FilterInput::Variant FilterContentsFilterInput::GetInput() const {
 }
 
 std::optional<Snapshot> FilterContentsFilterInput::GetSnapshot(
+    const std::string& label,
     const ContentContext& renderer,
-    const Entity& entity) const {
+    const Entity& entity,
+    std::optional<Rect> coverage_limit,
+    int32_t mip_count) const {
   if (!snapshot_.has_value()) {
-    snapshot_ = filter_->RenderToSnapshot(renderer, entity);
+    snapshot_ = filter_->RenderToSnapshot(
+        renderer,        // renderer
+        entity,          // entity
+        coverage_limit,  // coverage_limit
+        std::nullopt,    // sampler_descriptor
+        true,            // msaa_enabled
+        /*mip_count=*/mip_count,
+        SPrintF("Filter to %s Filter Snapshot", label.c_str()));  // label
   }
   return snapshot_;
 }
@@ -34,13 +45,47 @@ std::optional<Rect> FilterContentsFilterInput::GetCoverage(
   return filter_->GetCoverage(entity);
 }
 
+std::optional<Rect> FilterContentsFilterInput::GetSourceCoverage(
+    const Matrix& effect_transform,
+    const Rect& output_limit) const {
+  return filter_->GetSourceCoverage(effect_transform, output_limit);
+}
+
 Matrix FilterContentsFilterInput::GetLocalTransform(
     const Entity& entity) const {
-  return filter_->GetLocalTransform(entity.GetTransformation());
+  return filter_->GetLocalTransform(entity.GetTransform());
 }
 
 Matrix FilterContentsFilterInput::GetTransform(const Entity& entity) const {
-  return filter_->GetTransform(entity.GetTransformation());
+  return filter_->GetTransform(entity.GetTransform());
+}
+
+void FilterContentsFilterInput::PopulateGlyphAtlas(
+    const std::shared_ptr<LazyGlyphAtlas>& lazy_glyph_atlas,
+    Scalar scale) {
+  filter_->PopulateGlyphAtlas(lazy_glyph_atlas, scale);
+}
+
+bool FilterContentsFilterInput::IsTranslationOnly() const {
+  return filter_->IsTranslationOnly();
+}
+
+bool FilterContentsFilterInput::IsLeaf() const {
+  return false;
+}
+
+void FilterContentsFilterInput::SetLeafInputs(
+    const FilterInput::Vector& inputs) {
+  filter_->SetLeafInputs(inputs);
+}
+
+void FilterContentsFilterInput::SetEffectTransform(const Matrix& matrix) {
+  filter_->SetEffectTransform(matrix);
+}
+
+void FilterContentsFilterInput::SetRenderingMode(
+    Entity::RenderingMode rendering_mode) {
+  filter_->SetRenderingMode(rendering_mode);
 }
 
 }  // namespace impeller
diff --git a/impeller/entity/contents/filters/inputs/filter_contents_filter_input.h b/impeller/entity/contents/filters/inputs/filter_contents_filter_input.h
index 9562484a8f07a2b40dfeb76d42f45ecc8c0e0d29..8d5f26693be9b3684b80462ddfe98b287523430d 100644
--- a/impeller/entity/contents/filters/inputs/filter_contents_filter_input.h
+++ b/impeller/entity/contents/filters/inputs/filter_contents_filter_input.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_INPUTS_FILTER_CONTENTS_FILTER_INPUT_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_INPUTS_FILTER_CONTENTS_FILTER_INPUT_H_
 
 #include "impeller/entity/contents/filters/inputs/filter_input.h"
 
@@ -16,20 +17,48 @@ class FilterContentsFilterInput final : public FilterInput {
   Variant GetInput() const override;
 
   // |FilterInput|
-  std::optional<Snapshot> GetSnapshot(const ContentContext& renderer,
-                                      const Entity& entity) const override;
+  std::optional<Snapshot> GetSnapshot(const std::string& label,
+                                      const ContentContext& renderer,
+                                      const Entity& entity,
+                                      std::optional<Rect> coverage_limit,
+                                      int32_t mip_count) const override;
 
   // |FilterInput|
   std::optional<Rect> GetCoverage(const Entity& entity) const override;
 
+  // |FilterInput|
+  std::optional<Rect> GetSourceCoverage(
+      const Matrix& effect_transform,
+      const Rect& output_limit) const override;
+
   // |FilterInput|
   Matrix GetLocalTransform(const Entity& entity) const override;
 
   // |FilterInput|
   Matrix GetTransform(const Entity& entity) const override;
 
+  // |FilterInput|
+  void PopulateGlyphAtlas(
+      const std::shared_ptr<LazyGlyphAtlas>& lazy_glyph_atlas,
+      Scalar scale) override;
+
+  // |FilterInput|
+  bool IsTranslationOnly() const override;
+
+  // |FilterInput|
+  bool IsLeaf() const override;
+
+  // |FilterInput|
+  void SetLeafInputs(const FilterInput::Vector& inputs) override;
+
+  // |FilterInput|
+  virtual void SetEffectTransform(const Matrix& matrix) override;
+
+  // |FilterInput|
+  virtual void SetRenderingMode(Entity::RenderingMode rendering_mode) override;
+
  private:
-  FilterContentsFilterInput(std::shared_ptr<FilterContents> filter);
+  explicit FilterContentsFilterInput(std::shared_ptr<FilterContents> filter);
 
   std::shared_ptr<FilterContents> filter_;
   mutable std::optional<Snapshot> snapshot_;
@@ -38,3 +67,5 @@ class FilterContentsFilterInput final : public FilterInput {
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_INPUTS_FILTER_CONTENTS_FILTER_INPUT_H_
diff --git a/impeller/entity/contents/filters/inputs/filter_input.cc b/impeller/entity/contents/filters/inputs/filter_input.cc
index b19ac60bbb4c6c2feabf3112b17679e4f1f8ca12..0364694e16736c0b747799256e69a8bac9c607a5 100644
--- a/impeller/entity/contents/filters/inputs/filter_input.cc
+++ b/impeller/entity/contents/filters/inputs/filter_input.cc
@@ -11,11 +11,12 @@
 #include "impeller/entity/contents/filters/filter_contents.h"
 #include "impeller/entity/contents/filters/inputs/contents_filter_input.h"
 #include "impeller/entity/contents/filters/inputs/filter_contents_filter_input.h"
+#include "impeller/entity/contents/filters/inputs/placeholder_filter_input.h"
 #include "impeller/entity/contents/filters/inputs/texture_filter_input.h"
 
 namespace impeller {
 
-FilterInput::Ref FilterInput::Make(Variant input) {
+FilterInput::Ref FilterInput::Make(Variant input, bool msaa_enabled) {
   if (auto filter = std::get_if<std::shared_ptr<FilterContents>>(&input)) {
     return std::static_pointer_cast<FilterInput>(
         std::shared_ptr<FilterContentsFilterInput>(
@@ -25,13 +26,18 @@ FilterInput::Ref FilterInput::Make(Variant input) {
   if (auto contents = std::get_if<std::shared_ptr<Contents>>(&input)) {
     return std::static_pointer_cast<FilterInput>(
         std::shared_ptr<ContentsFilterInput>(
-            new ContentsFilterInput(*contents)));
+            new ContentsFilterInput(*contents, msaa_enabled)));
   }
 
   if (auto texture = std::get_if<std::shared_ptr<Texture>>(&input)) {
     return Make(*texture, Matrix());
   }
 
+  if (auto rect = std::get_if<Rect>(&input)) {
+    return std::shared_ptr<PlaceholderFilterInput>(
+        new PlaceholderFilterInput(*rect));
+  }
+
   FML_UNREACHABLE();
   return std::shared_ptr<FilterContentsFilterInput>();
 }
@@ -56,15 +62,39 @@ Matrix FilterInput::GetLocalTransform(const Entity& entity) const {
 }
 
 std::optional<Rect> FilterInput::GetLocalCoverage(const Entity& entity) const {
-  Entity local_entity = entity;
-  local_entity.SetTransformation(GetLocalTransform(entity));
+  Entity local_entity = entity.Clone();
+  local_entity.SetTransform(GetLocalTransform(entity));
   return GetCoverage(local_entity);
 }
 
+std::optional<Rect> FilterInput::GetSourceCoverage(
+    const Matrix& effect_transform,
+    const Rect& output_limit) const {
+  return output_limit;
+}
+
 Matrix FilterInput::GetTransform(const Entity& entity) const {
-  return entity.GetTransformation() * GetLocalTransform(entity);
+  return entity.GetTransform() * GetLocalTransform(entity);
 }
 
+void FilterInput::PopulateGlyphAtlas(
+    const std::shared_ptr<LazyGlyphAtlas>& lazy_glyph_atlas,
+    Scalar scale) {}
+
 FilterInput::~FilterInput() = default;
 
+bool FilterInput::IsTranslationOnly() const {
+  return true;
+}
+
+bool FilterInput::IsLeaf() const {
+  return true;
+}
+
+void FilterInput::SetLeafInputs(const FilterInput::Vector& inputs) {}
+
+void FilterInput::SetEffectTransform(const Matrix& matrix) {}
+
+void FilterInput::SetRenderingMode(Entity::RenderingMode rendering_mode) {}
+
 }  // namespace impeller
diff --git a/impeller/entity/contents/filters/inputs/filter_input.h b/impeller/entity/contents/filters/inputs/filter_input.h
index 7bd631f600e44f9c119cf82efedb705deadfb0a4..070b05c688daf0c3886606aa2ae6a05581739804 100644
--- a/impeller/entity/contents/filters/inputs/filter_input.h
+++ b/impeller/entity/contents/filters/inputs/filter_input.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_INPUTS_FILTER_INPUT_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_INPUTS_FILTER_INPUT_H_
 
 #include <memory>
 #include <optional>
@@ -10,12 +11,12 @@
 #include <vector>
 
 #include "impeller/entity/contents/contents.h"
+#include "impeller/entity/entity.h"
 #include "impeller/geometry/rect.h"
 
 namespace impeller {
 
 class ContentContext;
-class Entity;
 class FilterContents;
 
 /// `FilterInput` is a lazy/single eval `Snapshot` which may be shared across
@@ -32,11 +33,12 @@ class FilterInput {
   using Vector = std::vector<FilterInput::Ref>;
   using Variant = std::variant<std::shared_ptr<FilterContents>,
                                std::shared_ptr<Contents>,
-                               std::shared_ptr<Texture>>;
+                               std::shared_ptr<Texture>,
+                               Rect>;
 
   virtual ~FilterInput();
 
-  static FilterInput::Ref Make(Variant input);
+  static FilterInput::Ref Make(Variant input, bool msaa_enabled = true);
 
   static FilterInput::Ref Make(std::shared_ptr<Texture> input,
                                Matrix local_transform);
@@ -45,20 +47,52 @@ class FilterInput {
 
   virtual Variant GetInput() const = 0;
 
-  virtual std::optional<Snapshot> GetSnapshot(const ContentContext& renderer,
-                                              const Entity& entity) const = 0;
+  virtual std::optional<Snapshot> GetSnapshot(
+      const std::string& label,
+      const ContentContext& renderer,
+      const Entity& entity,
+      std::optional<Rect> coverage_limit = std::nullopt,
+      int32_t mip_count = 1) const = 0;
 
   std::optional<Rect> GetLocalCoverage(const Entity& entity) const;
 
   virtual std::optional<Rect> GetCoverage(const Entity& entity) const = 0;
 
+  virtual std::optional<Rect> GetSourceCoverage(const Matrix& effect_transform,
+                                                const Rect& output_limit) const;
+
   /// @brief  Get the local transform of this filter input. This transform is
   ///         relative to the `Entity` transform space.
   virtual Matrix GetLocalTransform(const Entity& entity) const;
 
   /// @brief  Get the transform of this `FilterInput`. This is equivalent to
-  ///         calling `entity.GetTransformation() * GetLocalTransform()`.
+  ///         calling `entity.GetTransform() * GetLocalTransform()`.
   virtual Matrix GetTransform(const Entity& entity) const;
+
+  /// @see    `Contents::PopulateGlyphAtlas`
+  virtual void PopulateGlyphAtlas(
+      const std::shared_ptr<LazyGlyphAtlas>& lazy_glyph_atlas,
+      Scalar scale);
+
+  /// @see  `FilterContents::HasBasisTransforms`
+  virtual bool IsTranslationOnly() const;
+
+  /// @brief  Returns `true` unless this input is a `FilterInput`, which may
+  ///         take other inputs.
+  virtual bool IsLeaf() const;
+
+  /// @brief  Replaces the inputs of all leaf `FilterContents` with a new set
+  ///         of `inputs`.
+  /// @see    `FilterInput::IsLeaf`
+  virtual void SetLeafInputs(const FilterInput::Vector& inputs);
+
+  /// @brief  Sets the effect transform of filter inputs.
+  virtual void SetEffectTransform(const Matrix& matrix);
+
+  /// @brief  Turns on subpass mode for filter inputs.
+  virtual void SetRenderingMode(Entity::RenderingMode rendering_mode);
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_INPUTS_FILTER_INPUT_H_
diff --git a/impeller/entity/contents/filters/inputs/filter_input_unittests.cc b/impeller/entity/contents/filters/inputs/filter_input_unittests.cc
index be245e5a526da088b082094e33d0a60fe84b38e1..ab924a13c5d4b0412dc78a76e3d4ed81cf127081 100644
--- a/impeller/entity/contents/filters/inputs/filter_input_unittests.cc
+++ b/impeller/entity/contents/filters/inputs/filter_input_unittests.cc
@@ -5,9 +5,11 @@
 #include <memory>
 #include "flutter/testing/testing.h"
 #include "gtest/gtest.h"
+#include "impeller/entity/contents/filters/color_filter_contents.h"
 #include "impeller/entity/contents/filters/inputs/filter_input.h"
 #include "impeller/entity/entity.h"
-#include "impeller/geometry/geometry_unittests.h"
+#include "impeller/geometry/color.h"
+#include "impeller/geometry/geometry_asserts.h"
 
 namespace impeller {
 namespace testing {
@@ -17,7 +19,7 @@ TEST(FilterInputTest, CanSetLocalTransformForTexture) {
   auto input =
       FilterInput::Make(texture, Matrix::MakeTranslation({1.0, 0.0, 0.0}));
   Entity e;
-  e.SetTransformation(Matrix::MakeTranslation({0.0, 2.0, 0.0}));
+  e.SetTransform(Matrix::MakeTranslation({0.0, 2.0, 0.0}));
 
   ASSERT_MATRIX_NEAR(input->GetLocalTransform(e),
                      Matrix::MakeTranslation({1.0, 0.0, 0.0}));
@@ -25,5 +27,41 @@ TEST(FilterInputTest, CanSetLocalTransformForTexture) {
                      Matrix::MakeTranslation({1.0, 2.0, 0.0}));
 }
 
+TEST(FilterInputTest, IsLeaf) {
+  std::shared_ptr<FilterContents> leaf =
+      ColorFilterContents::MakeBlend(BlendMode::kSource, {});
+  ASSERT_TRUE(leaf->IsLeaf());
+
+  auto base = ColorFilterContents::MakeMatrixFilter(FilterInput::Make(leaf),
+                                                    Matrix(), {});
+
+  ASSERT_TRUE(leaf->IsLeaf());
+  ASSERT_FALSE(base->IsLeaf());
+}
+
+TEST(FilterInputTest, SetCoverageInputs) {
+  std::shared_ptr<FilterContents> leaf =
+      ColorFilterContents::MakeBlend(BlendMode::kSource, {});
+  ASSERT_TRUE(leaf->IsLeaf());
+
+  auto base = ColorFilterContents::MakeMatrixFilter(FilterInput::Make(leaf),
+                                                    Matrix(), {});
+
+  {
+    auto result = base->GetCoverage({});
+    ASSERT_FALSE(result.has_value());
+  }
+
+  auto coverage_rect = Rect::MakeLTRB(100, 100, 200, 200);
+  base->SetLeafInputs(FilterInput::Make({coverage_rect}));
+
+  {
+    auto result = base->GetCoverage({});
+    ASSERT_TRUE(result.has_value());
+    // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
+    ASSERT_RECT_NEAR(result.value(), coverage_rect);
+  }
+}
+
 }  // namespace testing
 }  // namespace impeller
diff --git a/impeller/entity/contents/filters/inputs/placeholder_filter_input.cc b/impeller/entity/contents/filters/inputs/placeholder_filter_input.cc
new file mode 100644
index 0000000000000000000000000000000000000000..5341b287f075619918609e3d9cc7086a41b2a4fe
--- /dev/null
+++ b/impeller/entity/contents/filters/inputs/placeholder_filter_input.cc
@@ -0,0 +1,41 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/entity/contents/filters/inputs/placeholder_filter_input.h"
+
+#include <optional>
+#include <utility>
+
+#include "impeller/base/strings.h"
+
+namespace impeller {
+
+PlaceholderFilterInput::PlaceholderFilterInput(Rect coverage_rect)
+    : coverage_rect_(coverage_rect) {}
+
+PlaceholderFilterInput::~PlaceholderFilterInput() = default;
+
+FilterInput::Variant PlaceholderFilterInput::GetInput() const {
+  return coverage_rect_;
+}
+
+std::optional<Snapshot> PlaceholderFilterInput::GetSnapshot(
+    const std::string& label,
+    const ContentContext& renderer,
+    const Entity& entity,
+    std::optional<Rect> coverage_limit,
+    int32_t mip_count) const {
+  return std::nullopt;
+}
+
+std::optional<Rect> PlaceholderFilterInput::GetCoverage(
+    const Entity& entity) const {
+  return coverage_rect_;
+}
+
+void PlaceholderFilterInput::PopulateGlyphAtlas(
+    const std::shared_ptr<LazyGlyphAtlas>& lazy_glyph_atlas,
+    Scalar scale) {}
+
+}  // namespace impeller
diff --git a/impeller/entity/contents/filters/inputs/placeholder_filter_input.h b/impeller/entity/contents/filters/inputs/placeholder_filter_input.h
new file mode 100644
index 0000000000000000000000000000000000000000..3641176a51dd473ae5b9e9d87e229d3cbf43d06d
--- /dev/null
+++ b/impeller/entity/contents/filters/inputs/placeholder_filter_input.h
@@ -0,0 +1,44 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_INPUTS_PLACEHOLDER_FILTER_INPUT_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_INPUTS_PLACEHOLDER_FILTER_INPUT_H_
+
+#include "impeller/entity/contents/filters/inputs/filter_input.h"
+
+namespace impeller {
+
+class PlaceholderFilterInput final : public FilterInput {
+ public:
+  explicit PlaceholderFilterInput(Rect coverage);
+
+  ~PlaceholderFilterInput() override;
+
+  // |FilterInput|
+  Variant GetInput() const override;
+
+  // |FilterInput|
+  std::optional<Snapshot> GetSnapshot(const std::string& label,
+                                      const ContentContext& renderer,
+                                      const Entity& entity,
+                                      std::optional<Rect> coverage_limit,
+                                      int32_t mip_count = 1) const override;
+
+  // |FilterInput|
+  std::optional<Rect> GetCoverage(const Entity& entity) const override;
+
+  // |FilterInput|
+  void PopulateGlyphAtlas(
+      const std::shared_ptr<LazyGlyphAtlas>& lazy_glyph_atlas,
+      Scalar scale) override;
+
+ private:
+  Rect coverage_rect_;
+
+  friend FilterInput;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_INPUTS_PLACEHOLDER_FILTER_INPUT_H_
diff --git a/impeller/entity/contents/filters/inputs/texture_filter_input.cc b/impeller/entity/contents/filters/inputs/texture_filter_input.cc
index 09a393bc51e074ca06d7d4db9fccd821396d8275..b18c90f1351314cdb961ffbfb0650c4492ff826c 100644
--- a/impeller/entity/contents/filters/inputs/texture_filter_input.cc
+++ b/impeller/entity/contents/filters/inputs/texture_filter_input.cc
@@ -6,6 +6,8 @@
 
 #include <utility>
 
+#include "impeller/core/formats.h"
+
 namespace impeller {
 
 TextureFilterInput::TextureFilterInput(std::shared_ptr<Texture> texture,
@@ -19,9 +21,18 @@ FilterInput::Variant TextureFilterInput::GetInput() const {
 }
 
 std::optional<Snapshot> TextureFilterInput::GetSnapshot(
+    const std::string& label,
     const ContentContext& renderer,
-    const Entity& entity) const {
-  return Snapshot{.texture = texture_, .transform = GetTransform(entity)};
+    const Entity& entity,
+    std::optional<Rect> coverage_limit,
+    int32_t mip_count) const {
+  auto snapshot =
+      Snapshot{.texture = texture_, .transform = GetTransform(entity)};
+  if (texture_->GetMipCount() > 1) {
+    snapshot.sampler_descriptor.label = "TextureFilterInput Trilinear Sampler";
+    snapshot.sampler_descriptor.mip_filter = MipFilter::kLinear;
+  }
+  return snapshot;
 }
 
 std::optional<Rect> TextureFilterInput::GetCoverage(
diff --git a/impeller/entity/contents/filters/inputs/texture_filter_input.h b/impeller/entity/contents/filters/inputs/texture_filter_input.h
index 4700f30cc2b0b74f6ac82fd393aa0f08656b2417..5adbe4bb7b398aa569ea29915e84ea4e2bf69733 100644
--- a/impeller/entity/contents/filters/inputs/texture_filter_input.h
+++ b/impeller/entity/contents/filters/inputs/texture_filter_input.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_INPUTS_TEXTURE_FILTER_INPUT_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_INPUTS_TEXTURE_FILTER_INPUT_H_
 
 #include "impeller/entity/contents/filters/inputs/filter_input.h"
 
@@ -18,8 +19,11 @@ class TextureFilterInput final : public FilterInput {
   Variant GetInput() const override;
 
   // |FilterInput|
-  std::optional<Snapshot> GetSnapshot(const ContentContext& renderer,
-                                      const Entity& entity) const override;
+  std::optional<Snapshot> GetSnapshot(const std::string& label,
+                                      const ContentContext& renderer,
+                                      const Entity& entity,
+                                      std::optional<Rect> coverage_limit,
+                                      int32_t mip_count) const override;
 
   // |FilterInput|
   std::optional<Rect> GetCoverage(const Entity& entity) const override;
@@ -28,8 +32,8 @@ class TextureFilterInput final : public FilterInput {
   Matrix GetLocalTransform(const Entity& entity) const override;
 
  private:
-  TextureFilterInput(std::shared_ptr<Texture> texture,
-                     Matrix local_transform = Matrix());
+  explicit TextureFilterInput(std::shared_ptr<Texture> texture,
+                              Matrix local_transform = Matrix());
 
   std::shared_ptr<Texture> texture_;
   Matrix local_transform_;
@@ -38,3 +42,5 @@ class TextureFilterInput final : public FilterInput {
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_INPUTS_TEXTURE_FILTER_INPUT_H_
diff --git a/impeller/entity/contents/filters/linear_to_srgb_filter_contents.cc b/impeller/entity/contents/filters/linear_to_srgb_filter_contents.cc
index 98d397a7270087ecf8e4e3b31e019a89741ef14d..937d9367e9319cbb479ff2750f513126a65d1ac7 100644
--- a/impeller/entity/contents/filters/linear_to_srgb_filter_contents.cc
+++ b/impeller/entity/contents/filters/linear_to_srgb_filter_contents.cc
@@ -4,12 +4,12 @@
 
 #include "impeller/entity/contents/filters/linear_to_srgb_filter_contents.h"
 
+#include "impeller/entity/contents/anonymous_contents.h"
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/contents/contents.h"
 #include "impeller/geometry/point.h"
-#include "impeller/geometry/vector.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_library.h"
+#include "impeller/renderer/vertex_buffer_builder.h"
 
 namespace impeller {
 
@@ -17,12 +17,13 @@ LinearToSrgbFilterContents::LinearToSrgbFilterContents() = default;
 
 LinearToSrgbFilterContents::~LinearToSrgbFilterContents() = default;
 
-std::optional<Snapshot> LinearToSrgbFilterContents::RenderFilter(
+std::optional<Entity> LinearToSrgbFilterContents::RenderFilter(
     const FilterInput::Vector& inputs,
     const ContentContext& renderer,
     const Entity& entity,
     const Matrix& effect_transform,
-    const Rect& coverage) const {
+    const Rect& coverage,
+    const std::optional<Rect>& coverage_hint) const {
   if (inputs.empty()) {
     return std::nullopt;
   }
@@ -30,62 +31,74 @@ std::optional<Snapshot> LinearToSrgbFilterContents::RenderFilter(
   using VS = LinearToSrgbFilterPipeline::VertexShader;
   using FS = LinearToSrgbFilterPipeline::FragmentShader;
 
-  auto input_snapshot = inputs[0]->GetSnapshot(renderer, entity);
+  auto input_snapshot =
+      inputs[0]->GetSnapshot("LinearToSrgb", renderer, entity);
   if (!input_snapshot.has_value()) {
     return std::nullopt;
   }
 
-  ContentContext::SubpassCallback callback = [&](const ContentContext& renderer,
-                                                 RenderPass& pass) {
-    Command cmd;
-    cmd.label = "Linear to sRGB Filter";
+  //----------------------------------------------------------------------------
+  /// Create AnonymousContents for rendering.
+  ///
+  RenderProc render_proc = [input_snapshot,
+                            absorb_opacity = GetAbsorbOpacity()](
+                               const ContentContext& renderer,
+                               const Entity& entity, RenderPass& pass) -> bool {
+    pass.SetCommandLabel("Linear to sRGB Filter");
+    pass.SetStencilReference(entity.GetClipDepth());
 
-    auto options = OptionsFromPass(pass);
-    options.blend_mode = BlendMode::kSource;
-    cmd.pipeline = renderer.GetLinearToSrgbFilterPipeline(options);
+    auto options = OptionsFromPassAndEntity(pass, entity);
+    options.primitive_type = PrimitiveType::kTriangleStrip;
+    pass.SetPipeline(renderer.GetLinearToSrgbFilterPipeline(options));
+
+    auto size = input_snapshot->texture->GetSize();
 
     VertexBufferBuilder<VS::PerVertexData> vtx_builder;
     vtx_builder.AddVertices({
         {Point(0, 0)},
         {Point(1, 0)},
-        {Point(1, 1)},
-        {Point(0, 0)},
-        {Point(1, 1)},
         {Point(0, 1)},
+        {Point(1, 1)},
     });
 
-    auto& host_buffer = pass.GetTransientsBuffer();
-    auto vtx_buffer = vtx_builder.CreateVertexBuffer(host_buffer);
-    cmd.BindVertices(vtx_buffer);
+    auto& host_buffer = renderer.GetTransientsBuffer();
+    pass.SetVertexBuffer(vtx_builder.CreateVertexBuffer(host_buffer));
 
     VS::FrameInfo frame_info;
-    frame_info.mvp = Matrix::MakeOrthographic(ISize(1, 1));
-
-    FS::FragInfo frag_info;
-    frag_info.texture_sampler_y_coord_scale =
+    frame_info.mvp = Entity::GetShaderTransform(
+        entity.GetShaderClipDepth(), pass,
+        entity.GetTransform() * input_snapshot->transform *
+            Matrix::MakeScale(Vector2(size)));
+    frame_info.texture_sampler_y_coord_scale =
         input_snapshot->texture->GetYCoordScale();
-    frag_info.input_alpha = GetAbsorbOpacity() ? input_snapshot->opacity : 1.0f;
 
-    auto sampler = renderer.GetContext()->GetSamplerLibrary()->GetSampler({});
-    FS::BindInputTexture(cmd, input_snapshot->texture, sampler);
-    FS::BindFragInfo(cmd, host_buffer.EmplaceUniform(frag_info));
-    VS::BindFrameInfo(cmd, host_buffer.EmplaceUniform(frame_info));
+    FS::FragInfo frag_info;
+    frag_info.input_alpha =
+        absorb_opacity == ColorFilterContents::AbsorbOpacity::kYes
+            ? input_snapshot->opacity
+            : 1.0f;
+
+    FS::BindInputTexture(
+        pass, input_snapshot->texture,
+        renderer.GetContext()->GetSamplerLibrary()->GetSampler({}));
+    FS::BindFragInfo(pass, host_buffer.EmplaceUniform(frag_info));
+    VS::BindFrameInfo(pass, host_buffer.EmplaceUniform(frame_info));
+
+    return pass.Draw().ok();
+  };
 
-    return pass.AddCommand(std::move(cmd));
+  CoverageProc coverage_proc =
+      [coverage](const Entity& entity) -> std::optional<Rect> {
+    return coverage.TransformBounds(entity.GetTransform());
   };
 
-  auto out_texture =
-      renderer.MakeSubpass(input_snapshot->texture->GetSize(), callback);
-  if (!out_texture) {
-    return std::nullopt;
-  }
-  out_texture->SetLabel("LinearToSrgb Texture");
+  auto contents = AnonymousContents::Make(render_proc, coverage_proc);
 
-  return Snapshot{
-      .texture = out_texture,
-      .transform = input_snapshot->transform,
-      .sampler_descriptor = input_snapshot->sampler_descriptor,
-      .opacity = GetAbsorbOpacity() ? 1.0f : input_snapshot->opacity};
+  Entity sub_entity;
+  sub_entity.SetContents(std::move(contents));
+  sub_entity.SetClipDepth(entity.GetClipDepth());
+  sub_entity.SetBlendMode(entity.GetBlendMode());
+  return sub_entity;
 }
 
 }  // namespace impeller
diff --git a/impeller/entity/contents/filters/linear_to_srgb_filter_contents.h b/impeller/entity/contents/filters/linear_to_srgb_filter_contents.h
index 00b7116420a55ca2b40a342e3d0a646deec23632..d43703896aacf4acb5889878ebcd7ffc78695d70 100644
--- a/impeller/entity/contents/filters/linear_to_srgb_filter_contents.h
+++ b/impeller/entity/contents/filters/linear_to_srgb_filter_contents.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_LINEAR_TO_SRGB_FILTER_CONTENTS_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_LINEAR_TO_SRGB_FILTER_CONTENTS_H_
 
 #include "impeller/entity/contents/filters/color_filter_contents.h"
 #include "impeller/entity/contents/filters/inputs/filter_input.h"
@@ -17,14 +18,20 @@ class LinearToSrgbFilterContents final : public ColorFilterContents {
 
  private:
   // |FilterContents|
-  std::optional<Snapshot> RenderFilter(
+  std::optional<Entity> RenderFilter(
       const FilterInput::Vector& input_textures,
       const ContentContext& renderer,
       const Entity& entity,
       const Matrix& effect_transform,
-      const Rect& coverage) const override;
+      const Rect& coverage,
+      const std::optional<Rect>& coverage_hint) const override;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(LinearToSrgbFilterContents);
+  LinearToSrgbFilterContents(const LinearToSrgbFilterContents&) = delete;
+
+  LinearToSrgbFilterContents& operator=(const LinearToSrgbFilterContents&) =
+      delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_LINEAR_TO_SRGB_FILTER_CONTENTS_H_
diff --git a/impeller/entity/contents/filters/local_matrix_filter_contents.cc b/impeller/entity/contents/filters/local_matrix_filter_contents.cc
index 5cafbb58e10b81e424e2a53c712612f01fcb03a3..d5b52ef615349207a350b1c9942a2d047dd12ac6 100644
--- a/impeller/entity/contents/filters/local_matrix_filter_contents.cc
+++ b/impeller/entity/contents/filters/local_matrix_filter_contents.cc
@@ -19,13 +19,31 @@ Matrix LocalMatrixFilterContents::GetLocalTransform(
   return matrix_;
 }
 
-std::optional<Snapshot> LocalMatrixFilterContents::RenderFilter(
+std::optional<Rect> LocalMatrixFilterContents::GetFilterSourceCoverage(
+    const Matrix& effect_transform,
+    const Rect& output_limit) const {
+  auto matrix = matrix_.Basis();
+  if (matrix.GetDeterminant() == 0.0) {
+    return std::nullopt;
+  }
+  auto inverse = matrix.Invert();
+  return output_limit.TransformBounds(inverse);
+}
+
+std::optional<Entity> LocalMatrixFilterContents::RenderFilter(
     const FilterInput::Vector& inputs,
     const ContentContext& renderer,
     const Entity& entity,
     const Matrix& effect_transform,
-    const Rect& coverage) const {
-  return inputs[0]->GetSnapshot(renderer, entity);
+    const Rect& coverage,
+    const std::optional<Rect>& coverage_hint) const {
+  std::optional<Snapshot> snapshot =
+      inputs[0]->GetSnapshot("LocalMatrix", renderer, entity);
+  if (!snapshot.has_value()) {
+    return std::nullopt;
+  }
+  return Entity::FromSnapshot(snapshot.value(), entity.GetBlendMode(),
+                              entity.GetClipDepth());
 }
 
 }  // namespace impeller
diff --git a/impeller/entity/contents/filters/local_matrix_filter_contents.h b/impeller/entity/contents/filters/local_matrix_filter_contents.h
index 9d310c986a584b7e76859e4cbce4821e3939041e..0340058a021bca8878dbde023425aa3767d0f47b 100644
--- a/impeller/entity/contents/filters/local_matrix_filter_contents.h
+++ b/impeller/entity/contents/filters/local_matrix_filter_contents.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_LOCAL_MATRIX_FILTER_CONTENTS_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_LOCAL_MATRIX_FILTER_CONTENTS_H_
 
 #include "impeller/entity/contents/filters/filter_contents.h"
 #include "impeller/entity/contents/filters/inputs/filter_input.h"
@@ -20,18 +21,29 @@ class LocalMatrixFilterContents final : public FilterContents {
   // |FilterContents|
   Matrix GetLocalTransform(const Matrix& parent_transform) const override;
 
+  // |FilterContents|
+  std::optional<Rect> GetFilterSourceCoverage(
+      const Matrix& effect_transform,
+      const Rect& output_limit) const override;
+
  private:
   // |FilterContents|
-  std::optional<Snapshot> RenderFilter(
+  std::optional<Entity> RenderFilter(
       const FilterInput::Vector& input_textures,
       const ContentContext& renderer,
       const Entity& entity,
       const Matrix& effect_transform,
-      const Rect& coverage) const override;
+      const Rect& coverage,
+      const std::optional<Rect>& coverage_hint) const override;
 
   Matrix matrix_;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(LocalMatrixFilterContents);
+  LocalMatrixFilterContents(const LocalMatrixFilterContents&) = delete;
+
+  LocalMatrixFilterContents& operator=(const LocalMatrixFilterContents&) =
+      delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_LOCAL_MATRIX_FILTER_CONTENTS_H_
diff --git a/impeller/entity/contents/filters/matrix_filter_contents.cc b/impeller/entity/contents/filters/matrix_filter_contents.cc
index e8d5281a36dca524c1e51d64cc774e1a43c680bd..7fe455c79d387089b2f7805e5706ecb20a2b5b67 100644
--- a/impeller/entity/contents/filters/matrix_filter_contents.cc
+++ b/impeller/entity/contents/filters/matrix_filter_contents.cc
@@ -14,27 +14,74 @@ void MatrixFilterContents::SetMatrix(Matrix matrix) {
   matrix_ = matrix;
 }
 
+void MatrixFilterContents::SetRenderingMode(
+    Entity::RenderingMode rendering_mode) {
+  rendering_mode_ = rendering_mode;
+  FilterContents::SetRenderingMode(rendering_mode);
+}
+
+bool MatrixFilterContents::IsTranslationOnly() const {
+  return matrix_.Basis().IsIdentity() && FilterContents::IsTranslationOnly();
+}
+
 void MatrixFilterContents::SetSamplerDescriptor(SamplerDescriptor desc) {
   sampler_descriptor_ = std::move(desc);
 }
 
-std::optional<Snapshot> MatrixFilterContents::RenderFilter(
+std::optional<Entity> MatrixFilterContents::RenderFilter(
     const FilterInput::Vector& inputs,
     const ContentContext& renderer,
     const Entity& entity,
     const Matrix& effect_transform,
-    const Rect& coverage) const {
-  auto snapshot = inputs[0]->GetSnapshot(renderer, entity);
+    const Rect& coverage,
+    const std::optional<Rect>& coverage_hint) const {
+  auto snapshot = inputs[0]->GetSnapshot("Matrix", renderer, entity);
   if (!snapshot.has_value()) {
     return std::nullopt;
   }
 
-  snapshot->transform = entity.GetTransformation() *           //
-                        matrix_ *                              //
-                        entity.GetTransformation().Invert() *  //
+  // The filter's matrix needs to be applied within the space defined by the
+  // scene's current transform matrix (CTM). For example: If the CTM is
+  // scaled up, then translations applied by the matrix should be magnified
+  // accordingly.
+  //
+  // To accomplish this, we sandwich the filter's matrix within the CTM in both
+  // cases. But notice that for the subpass backdrop filter case, we use the
+  // "effect transform" instead of the Entity's transform!
+  //
+  // That's because in the subpass backdrop filter case, the Entity's transform
+  // isn't actually the captured CTM of the scene like it usually is; instead,
+  // it's just a screen space translation that offsets the backdrop texture (as
+  // mentioned above). And so we sneak the subpass's captured CTM in through the
+  // effect transform.
+
+  auto transform = rendering_mode_ == Entity::RenderingMode::kSubpass
+                       ? effect_transform
+                       : entity.GetTransform();
+  snapshot->transform = transform *           //
+                        matrix_ *             //
+                        transform.Invert() *  //
                         snapshot->transform;
+
   snapshot->sampler_descriptor = sampler_descriptor_;
-  return snapshot;
+  if (!snapshot.has_value()) {
+    return std::nullopt;
+  }
+  return Entity::FromSnapshot(snapshot.value(), entity.GetBlendMode(),
+                              entity.GetClipDepth());
+}
+
+std::optional<Rect> MatrixFilterContents::GetFilterSourceCoverage(
+    const Matrix& effect_transform,
+    const Rect& output_limit) const {
+  auto transform = effect_transform *          //
+                   matrix_ *                   //
+                   effect_transform.Invert();  //
+  if (transform.GetDeterminant() == 0.0) {
+    return std::nullopt;
+  }
+  auto inverse = transform.Invert();
+  return output_limit.TransformBounds(inverse);
 }
 
 std::optional<Rect> MatrixFilterContents::GetFilterCoverage(
@@ -49,10 +96,12 @@ std::optional<Rect> MatrixFilterContents::GetFilterCoverage(
   if (!coverage.has_value()) {
     return std::nullopt;
   }
-
-  auto transform = inputs[0]->GetTransform(entity) *  //
-                   matrix_ *                          //
-                   inputs[0]->GetTransform(entity).Invert();
+  auto& m = rendering_mode_ == Entity::RenderingMode::kSubpass
+                ? effect_transform
+                : inputs[0]->GetTransform(entity);
+  auto transform = m *          //
+                   matrix_ *    //
+                   m.Invert();  //
   return coverage->TransformBounds(transform);
 }
 
diff --git a/impeller/entity/contents/filters/matrix_filter_contents.h b/impeller/entity/contents/filters/matrix_filter_contents.h
index f5f3880e1bd21957b289d083558b6513c175bbee..dd6334e4169c84ca11801df40d75d67ae72b3b0f 100644
--- a/impeller/entity/contents/filters/matrix_filter_contents.h
+++ b/impeller/entity/contents/filters/matrix_filter_contents.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_MATRIX_FILTER_CONTENTS_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_MATRIX_FILTER_CONTENTS_H_
 
 #include "impeller/entity/contents/filters/filter_contents.h"
 #include "impeller/entity/contents/filters/inputs/filter_input.h"
@@ -17,6 +18,12 @@ class MatrixFilterContents final : public FilterContents {
 
   void SetMatrix(Matrix matrix);
 
+  // |FilterContents|
+  void SetRenderingMode(Entity::RenderingMode rendering_mode) override;
+
+  // |FilterContents|
+  bool IsTranslationOnly() const override;
+
   void SetSamplerDescriptor(SamplerDescriptor desc);
 
   // |FilterContents|
@@ -27,17 +34,28 @@ class MatrixFilterContents final : public FilterContents {
 
  private:
   // |FilterContents|
-  std::optional<Snapshot> RenderFilter(
+  std::optional<Entity> RenderFilter(
       const FilterInput::Vector& input_textures,
       const ContentContext& renderer,
       const Entity& entity,
       const Matrix& effect_transform,
-      const Rect& coverage) const override;
+      const Rect& coverage,
+      const std::optional<Rect>& coverage_hint) const override;
+
+  // |FilterContents|
+  std::optional<Rect> GetFilterSourceCoverage(
+      const Matrix& effect_transform,
+      const Rect& output_limit) const override;
 
   Matrix matrix_;
   SamplerDescriptor sampler_descriptor_ = {};
+  Entity::RenderingMode rendering_mode_ = Entity::RenderingMode::kDirect;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(MatrixFilterContents);
+  MatrixFilterContents(const MatrixFilterContents&) = delete;
+
+  MatrixFilterContents& operator=(const MatrixFilterContents&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_MATRIX_FILTER_CONTENTS_H_
diff --git a/impeller/entity/contents/filters/morphology_filter_contents.cc b/impeller/entity/contents/filters/morphology_filter_contents.cc
index 42c1d79afc3b9d333a19e841553450a5e6475faf..5aa0e35ac9e7d727405ee089547702d03904f5d9 100644
--- a/impeller/entity/contents/filters/morphology_filter_contents.cc
+++ b/impeller/entity/contents/filters/morphology_filter_contents.cc
@@ -6,10 +6,11 @@
 
 #include <cmath>
 
+#include "impeller/core/formats.h"
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/contents/contents.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_library.h"
+#include "impeller/renderer/vertex_buffer_builder.h"
 
 namespace impeller {
 
@@ -34,12 +35,13 @@ void DirectionalMorphologyFilterContents::SetMorphType(MorphType morph_type) {
   morph_type_ = morph_type;
 }
 
-std::optional<Snapshot> DirectionalMorphologyFilterContents::RenderFilter(
+std::optional<Entity> DirectionalMorphologyFilterContents::RenderFilter(
     const FilterInput::Vector& inputs,
     const ContentContext& renderer,
     const Entity& entity,
     const Matrix& effect_transform,
-    const Rect& coverage) const {
+    const Rect& coverage,
+    const std::optional<Rect>& coverage_hint) const {
   using VS = MorphologyFilterPipeline::VertexShader;
   using FS = MorphologyFilterPipeline::FragmentShader;
 
@@ -51,13 +53,14 @@ std::optional<Snapshot> DirectionalMorphologyFilterContents::RenderFilter(
     return std::nullopt;
   }
 
-  auto input_snapshot = inputs[0]->GetSnapshot(renderer, entity);
+  auto input_snapshot = inputs[0]->GetSnapshot("Morphology", renderer, entity);
   if (!input_snapshot.has_value()) {
     return std::nullopt;
   }
 
   if (radius_.radius < kEhCloseEnough) {
-    return input_snapshot.value();
+    return Entity::FromSnapshot(input_snapshot.value(), entity.GetBlendMode(),
+                                entity.GetClipDepth());
   }
 
   auto maybe_input_uvs = input_snapshot->GetCoverageUVs(coverage);
@@ -72,27 +75,26 @@ std::optional<Snapshot> DirectionalMorphologyFilterContents::RenderFilter(
 
   ContentContext::SubpassCallback callback = [&](const ContentContext& renderer,
                                                  RenderPass& pass) {
-    auto& host_buffer = pass.GetTransientsBuffer();
+    auto& host_buffer = renderer.GetTransientsBuffer();
 
     VertexBufferBuilder<VS::PerVertexData> vtx_builder;
     vtx_builder.AddVertices({
         {Point(0, 0), input_uvs[0]},
         {Point(1, 0), input_uvs[1]},
-        {Point(1, 1), input_uvs[3]},
-        {Point(0, 0), input_uvs[0]},
-        {Point(1, 1), input_uvs[3]},
         {Point(0, 1), input_uvs[2]},
+        {Point(1, 1), input_uvs[3]},
     });
 
-    auto vtx_buffer = vtx_builder.CreateVertexBuffer(host_buffer);
-
     VS::FrameInfo frame_info;
     frame_info.mvp = Matrix::MakeOrthographic(ISize(1, 1));
-    auto transform = entity.GetTransformation() * effect_transform;
+    frame_info.texture_sampler_y_coord_scale =
+        input_snapshot->texture->GetYCoordScale();
+
+    auto transform = entity.GetTransform() * effect_transform.Basis();
     auto transformed_radius =
         transform.TransformDirection(direction_ * radius_.radius);
     auto transformed_texture_vertices =
-        Rect(Size(input_snapshot->texture->GetSize()))
+        Rect::MakeSize(input_snapshot->texture->GetSize())
             .GetTransformedPoints(input_snapshot->transform);
     auto transformed_texture_width =
         transformed_texture_vertices[0].GetDistance(
@@ -102,47 +104,53 @@ std::optional<Snapshot> DirectionalMorphologyFilterContents::RenderFilter(
             transformed_texture_vertices[2]);
 
     FS::FragInfo frag_info;
-    frag_info.texture_sampler_y_coord_scale =
-        input_snapshot->texture->GetYCoordScale();
     frag_info.radius = std::round(transformed_radius.GetLength());
-    frag_info.direction = input_snapshot->transform.Invert()
-                              .TransformDirection(transformed_radius)
-                              .Normalize();
-    frag_info.texture_size =
-        Point(transformed_texture_width, transformed_texture_height);
     frag_info.morph_type = static_cast<Scalar>(morph_type_);
+    frag_info.uv_offset =
+        input_snapshot->transform.Invert()
+            .TransformDirection(transformed_radius)
+            .Normalize() /
+        Point(transformed_texture_width, transformed_texture_height);
 
-    Command cmd;
-    cmd.label = "Morphology Filter";
+    pass.SetCommandLabel("Morphology Filter");
     auto options = OptionsFromPass(pass);
+    options.primitive_type = PrimitiveType::kTriangleStrip;
     options.blend_mode = BlendMode::kSource;
-    cmd.pipeline = renderer.GetMorphologyFilterPipeline(options);
-    cmd.BindVertices(vtx_buffer);
+    pass.SetPipeline(renderer.GetMorphologyFilterPipeline(options));
+    pass.SetVertexBuffer(vtx_builder.CreateVertexBuffer(host_buffer));
+
+    auto sampler_descriptor = input_snapshot->sampler_descriptor;
+    if (renderer.GetDeviceCapabilities().SupportsDecalSamplerAddressMode()) {
+      sampler_descriptor.width_address_mode = SamplerAddressMode::kDecal;
+      sampler_descriptor.height_address_mode = SamplerAddressMode::kDecal;
+    }
 
     FS::BindTextureSampler(
-        cmd, input_snapshot->texture,
+        pass, input_snapshot->texture,
         renderer.GetContext()->GetSamplerLibrary()->GetSampler(
-            input_snapshot->sampler_descriptor));
-    VS::BindFrameInfo(cmd, host_buffer.EmplaceUniform(frame_info));
-    FS::BindFragInfo(cmd, host_buffer.EmplaceUniform(frag_info));
+            sampler_descriptor));
+    VS::BindFrameInfo(pass, host_buffer.EmplaceUniform(frame_info));
+    FS::BindFragInfo(pass, host_buffer.EmplaceUniform(frag_info));
 
-    return pass.AddCommand(cmd);
+    return pass.Draw().ok();
   };
 
-  auto out_texture = renderer.MakeSubpass(ISize(coverage.size), callback);
-  if (!out_texture) {
+  fml::StatusOr<RenderTarget> render_target = renderer.MakeSubpass(
+      "Directional Morphology Filter", ISize(coverage.GetSize()), callback);
+  if (!render_target.ok()) {
     return std::nullopt;
   }
-  out_texture->SetLabel("DirectionalMorphologyFilter Texture");
 
   SamplerDescriptor sampler_desc;
   sampler_desc.min_filter = MinMagFilter::kLinear;
   sampler_desc.mag_filter = MinMagFilter::kLinear;
 
-  return Snapshot{.texture = out_texture,
-                  .transform = Matrix::MakeTranslation(coverage.origin),
-                  .sampler_descriptor = sampler_desc,
-                  .opacity = input_snapshot->opacity};
+  return Entity::FromSnapshot(
+      Snapshot{.texture = render_target.value().GetRenderTargetTexture(),
+               .transform = Matrix::MakeTranslation(coverage.GetOrigin()),
+               .sampler_descriptor = sampler_desc,
+               .opacity = input_snapshot->opacity},
+      entity.GetBlendMode(), entity.GetClipDepth());
 }
 
 std::optional<Rect> DirectionalMorphologyFilterContents::GetFilterCoverage(
@@ -157,12 +165,12 @@ std::optional<Rect> DirectionalMorphologyFilterContents::GetFilterCoverage(
   if (!coverage.has_value()) {
     return std::nullopt;
   }
-  auto transform = inputs[0]->GetTransform(entity) * effect_transform;
+  auto transform = inputs[0]->GetTransform(entity) * effect_transform.Basis();
   auto transformed_vector =
       transform.TransformDirection(direction_ * radius_.radius).Abs();
 
-  auto origin = coverage->origin;
-  auto size = Vector2(coverage->size);
+  auto origin = coverage->GetOrigin();
+  auto size = Vector2(coverage->GetSize());
   switch (morph_type_) {
     case FilterContents::MorphType::kDilate:
       origin -= transformed_vector;
@@ -176,7 +184,21 @@ std::optional<Rect> DirectionalMorphologyFilterContents::GetFilterCoverage(
   if (size.x < 0 || size.y < 0) {
     return Rect::MakeSize(Size(0, 0));
   }
-  return Rect(origin, Size(size.x, size.y));
+  return Rect::MakeOriginSize(origin, Size(size.x, size.y));
+}
+
+std::optional<Rect>
+DirectionalMorphologyFilterContents::GetFilterSourceCoverage(
+    const Matrix& effect_transform,
+    const Rect& output_limit) const {
+  auto transformed_vector =
+      effect_transform.TransformDirection(direction_ * radius_.radius).Abs();
+  switch (morph_type_) {
+    case FilterContents::MorphType::kDilate:
+      return output_limit.Expand(-transformed_vector);
+    case FilterContents::MorphType::kErode:
+      return output_limit.Expand(transformed_vector);
+  }
 }
 
 }  // namespace impeller
diff --git a/impeller/entity/contents/filters/morphology_filter_contents.h b/impeller/entity/contents/filters/morphology_filter_contents.h
index 0028039e11177de308c89c8f255efd7d7f9717d6..db3c23071ce0906529a3bd69e738964f81239ab0 100644
--- a/impeller/entity/contents/filters/morphology_filter_contents.h
+++ b/impeller/entity/contents/filters/morphology_filter_contents.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_MORPHOLOGY_FILTER_CONTENTS_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_MORPHOLOGY_FILTER_CONTENTS_H_
 
 #include <memory>
 #include <optional>
@@ -29,20 +30,32 @@ class DirectionalMorphologyFilterContents final : public FilterContents {
       const Entity& entity,
       const Matrix& effect_transform) const override;
 
+  // |FilterContents|
+  std::optional<Rect> GetFilterSourceCoverage(
+      const Matrix& effect_transform,
+      const Rect& output_limit) const override;
+
  private:
   // |FilterContents|
-  std::optional<Snapshot> RenderFilter(
+  std::optional<Entity> RenderFilter(
       const FilterInput::Vector& input_textures,
       const ContentContext& renderer,
       const Entity& entity,
       const Matrix& effect_transform,
-      const Rect& coverage) const override;
+      const Rect& coverage,
+      const std::optional<Rect>& coverage_hint) const override;
 
   Radius radius_;
   Vector2 direction_;
   MorphType morph_type_;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(DirectionalMorphologyFilterContents);
+  DirectionalMorphologyFilterContents(
+      const DirectionalMorphologyFilterContents&) = delete;
+
+  DirectionalMorphologyFilterContents& operator=(
+      const DirectionalMorphologyFilterContents&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_MORPHOLOGY_FILTER_CONTENTS_H_
diff --git a/impeller/entity/contents/filters/srgb_to_linear_filter_contents.cc b/impeller/entity/contents/filters/srgb_to_linear_filter_contents.cc
index ee483b6ed5e935b003df819db72f52c851e2107c..0351ee710d5b040d4bde3b84bc15a70c357df5ce 100644
--- a/impeller/entity/contents/filters/srgb_to_linear_filter_contents.cc
+++ b/impeller/entity/contents/filters/srgb_to_linear_filter_contents.cc
@@ -4,12 +4,12 @@
 
 #include "impeller/entity/contents/filters/srgb_to_linear_filter_contents.h"
 
+#include "impeller/entity/contents/anonymous_contents.h"
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/contents/contents.h"
 #include "impeller/geometry/point.h"
-#include "impeller/geometry/vector.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_library.h"
+#include "impeller/renderer/vertex_buffer_builder.h"
 
 namespace impeller {
 
@@ -17,12 +17,13 @@ SrgbToLinearFilterContents::SrgbToLinearFilterContents() = default;
 
 SrgbToLinearFilterContents::~SrgbToLinearFilterContents() = default;
 
-std::optional<Snapshot> SrgbToLinearFilterContents::RenderFilter(
+std::optional<Entity> SrgbToLinearFilterContents::RenderFilter(
     const FilterInput::Vector& inputs,
     const ContentContext& renderer,
     const Entity& entity,
     const Matrix& effect_transform,
-    const Rect& coverage) const {
+    const Rect& coverage,
+    const std::optional<Rect>& coverage_hint) const {
   if (inputs.empty()) {
     return std::nullopt;
   }
@@ -30,62 +31,74 @@ std::optional<Snapshot> SrgbToLinearFilterContents::RenderFilter(
   using VS = SrgbToLinearFilterPipeline::VertexShader;
   using FS = SrgbToLinearFilterPipeline::FragmentShader;
 
-  auto input_snapshot = inputs[0]->GetSnapshot(renderer, entity);
+  auto input_snapshot =
+      inputs[0]->GetSnapshot("SrgbToLinear", renderer, entity);
   if (!input_snapshot.has_value()) {
     return std::nullopt;
   }
 
-  ContentContext::SubpassCallback callback = [&](const ContentContext& renderer,
-                                                 RenderPass& pass) {
-    Command cmd;
-    cmd.label = "sRGB to Linear Filter";
+  //----------------------------------------------------------------------------
+  /// Create AnonymousContents for rendering.
+  ///
+  RenderProc render_proc = [input_snapshot,
+                            absorb_opacity = GetAbsorbOpacity()](
+                               const ContentContext& renderer,
+                               const Entity& entity, RenderPass& pass) -> bool {
+    pass.SetCommandLabel("sRGB to Linear Filter");
+    pass.SetStencilReference(entity.GetClipDepth());
 
-    auto options = OptionsFromPass(pass);
-    options.blend_mode = BlendMode::kSource;
-    cmd.pipeline = renderer.GetSrgbToLinearFilterPipeline(options);
+    auto options = OptionsFromPassAndEntity(pass, entity);
+    options.primitive_type = PrimitiveType::kTriangleStrip;
+    pass.SetPipeline(renderer.GetSrgbToLinearFilterPipeline(options));
+
+    auto size = input_snapshot->texture->GetSize();
 
     VertexBufferBuilder<VS::PerVertexData> vtx_builder;
     vtx_builder.AddVertices({
         {Point(0, 0)},
         {Point(1, 0)},
-        {Point(1, 1)},
-        {Point(0, 0)},
-        {Point(1, 1)},
         {Point(0, 1)},
+        {Point(1, 1)},
     });
 
-    auto& host_buffer = pass.GetTransientsBuffer();
-    auto vtx_buffer = vtx_builder.CreateVertexBuffer(host_buffer);
-    cmd.BindVertices(vtx_buffer);
+    auto& host_buffer = renderer.GetTransientsBuffer();
+    pass.SetVertexBuffer(vtx_builder.CreateVertexBuffer(host_buffer));
 
     VS::FrameInfo frame_info;
-    frame_info.mvp = Matrix::MakeOrthographic(ISize(1, 1));
-
-    FS::FragInfo frag_info;
-    frag_info.texture_sampler_y_coord_scale =
+    frame_info.mvp = Entity::GetShaderTransform(
+        entity.GetShaderClipDepth(), pass,
+        entity.GetTransform() * input_snapshot->transform *
+            Matrix::MakeScale(Vector2(size)));
+    frame_info.texture_sampler_y_coord_scale =
         input_snapshot->texture->GetYCoordScale();
-    frag_info.input_alpha = GetAbsorbOpacity() ? input_snapshot->opacity : 1.0f;
 
-    auto sampler = renderer.GetContext()->GetSamplerLibrary()->GetSampler({});
-    FS::BindInputTexture(cmd, input_snapshot->texture, sampler);
-    FS::BindFragInfo(cmd, host_buffer.EmplaceUniform(frag_info));
-    VS::BindFrameInfo(cmd, host_buffer.EmplaceUniform(frame_info));
+    FS::FragInfo frag_info;
+    frag_info.input_alpha =
+        absorb_opacity == ColorFilterContents::AbsorbOpacity::kYes
+            ? input_snapshot->opacity
+            : 1.0f;
+
+    const std::unique_ptr<const Sampler>& sampler =
+        renderer.GetContext()->GetSamplerLibrary()->GetSampler({});
+    FS::BindInputTexture(pass, input_snapshot->texture, sampler);
+    FS::BindFragInfo(pass, host_buffer.EmplaceUniform(frag_info));
+    VS::BindFrameInfo(pass, host_buffer.EmplaceUniform(frame_info));
+
+    return pass.Draw().ok();
+  };
 
-    return pass.AddCommand(std::move(cmd));
+  CoverageProc coverage_proc =
+      [coverage](const Entity& entity) -> std::optional<Rect> {
+    return coverage.TransformBounds(entity.GetTransform());
   };
 
-  auto out_texture =
-      renderer.MakeSubpass(input_snapshot->texture->GetSize(), callback);
-  if (!out_texture) {
-    return std::nullopt;
-  }
-  out_texture->SetLabel("SrgbToLinear Texture");
+  auto contents = AnonymousContents::Make(render_proc, coverage_proc);
 
-  return Snapshot{
-      .texture = out_texture,
-      .transform = input_snapshot->transform,
-      .sampler_descriptor = input_snapshot->sampler_descriptor,
-      .opacity = GetAbsorbOpacity() ? 1.0f : input_snapshot->opacity};
+  Entity sub_entity;
+  sub_entity.SetContents(std::move(contents));
+  sub_entity.SetClipDepth(entity.GetClipDepth());
+  sub_entity.SetBlendMode(entity.GetBlendMode());
+  return sub_entity;
 }
 
 }  // namespace impeller
diff --git a/impeller/entity/contents/filters/srgb_to_linear_filter_contents.h b/impeller/entity/contents/filters/srgb_to_linear_filter_contents.h
index 07b3307159c7402d653f408ea24ec61c93121c04..dfadcffbf0c42955816046413b4cb8837e491a52 100644
--- a/impeller/entity/contents/filters/srgb_to_linear_filter_contents.h
+++ b/impeller/entity/contents/filters/srgb_to_linear_filter_contents.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_SRGB_TO_LINEAR_FILTER_CONTENTS_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_SRGB_TO_LINEAR_FILTER_CONTENTS_H_
 
 #include "impeller/entity/contents/filters/color_filter_contents.h"
 #include "impeller/entity/contents/filters/inputs/filter_input.h"
@@ -17,14 +18,20 @@ class SrgbToLinearFilterContents final : public ColorFilterContents {
 
  private:
   // |FilterContents|
-  std::optional<Snapshot> RenderFilter(
+  std::optional<Entity> RenderFilter(
       const FilterInput::Vector& input_textures,
       const ContentContext& renderer,
       const Entity& entity,
       const Matrix& effect_transform,
-      const Rect& coverage) const override;
+      const Rect& coverage,
+      const std::optional<Rect>& coverage_hint) const override;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(SrgbToLinearFilterContents);
+  SrgbToLinearFilterContents(const SrgbToLinearFilterContents&) = delete;
+
+  SrgbToLinearFilterContents& operator=(const SrgbToLinearFilterContents&) =
+      delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_SRGB_TO_LINEAR_FILTER_CONTENTS_H_
diff --git a/impeller/entity/contents/filters/yuv_to_rgb_filter_contents.cc b/impeller/entity/contents/filters/yuv_to_rgb_filter_contents.cc
index b00a4b92c8228616f4744204aefa34a77e16c6ae..b81328c616b0c2256b7866c6ccd07292a589cb49 100644
--- a/impeller/entity/contents/filters/yuv_to_rgb_filter_contents.cc
+++ b/impeller/entity/contents/filters/yuv_to_rgb_filter_contents.cc
@@ -4,11 +4,12 @@
 
 #include "impeller/entity/contents/filters/yuv_to_rgb_filter_contents.h"
 
+#include "impeller/core/formats.h"
+#include "impeller/entity/contents/anonymous_contents.h"
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/geometry/matrix.h"
-#include "impeller/renderer/formats.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_library.h"
+#include "impeller/renderer/vertex_buffer_builder.h"
 
 namespace impeller {
 
@@ -36,12 +37,13 @@ void YUVToRGBFilterContents::SetYUVColorSpace(YUVColorSpace yuv_color_space) {
   yuv_color_space_ = yuv_color_space;
 }
 
-std::optional<Snapshot> YUVToRGBFilterContents::RenderFilter(
+std::optional<Entity> YUVToRGBFilterContents::RenderFilter(
     const FilterInput::Vector& inputs,
     const ContentContext& renderer,
     const Entity& entity,
     const Matrix& effect_transform,
-    const Rect& coverage) const {
+    const Rect& coverage,
+    const std::optional<Rect>& coverage_hint) const {
   if (inputs.size() < 2) {
     return std::nullopt;
   }
@@ -49,8 +51,10 @@ std::optional<Snapshot> YUVToRGBFilterContents::RenderFilter(
   using VS = YUVToRGBFilterPipeline::VertexShader;
   using FS = YUVToRGBFilterPipeline::FragmentShader;
 
-  auto y_input_snapshot = inputs[0]->GetSnapshot(renderer, entity);
-  auto uv_input_snapshot = inputs[1]->GetSnapshot(renderer, entity);
+  auto y_input_snapshot =
+      inputs[0]->GetSnapshot("YUVToRGB(Y)", renderer, entity);
+  auto uv_input_snapshot =
+      inputs[1]->GetSnapshot("YUVToRGB(UV)", renderer, entity);
   if (!y_input_snapshot.has_value() || !uv_input_snapshot.has_value()) {
     return std::nullopt;
   }
@@ -62,37 +66,44 @@ std::optional<Snapshot> YUVToRGBFilterContents::RenderFilter(
     return std::nullopt;
   }
 
-  ContentContext::SubpassCallback callback = [&](const ContentContext& renderer,
-                                                 RenderPass& pass) {
-    Command cmd;
-    cmd.label = "YUV to RGB Filter";
+  //----------------------------------------------------------------------------
+  /// Create AnonymousContents for rendering.
+  ///
+  RenderProc render_proc = [y_input_snapshot, uv_input_snapshot,
+                            yuv_color_space = yuv_color_space_](
+                               const ContentContext& renderer,
+                               const Entity& entity, RenderPass& pass) -> bool {
+    pass.SetCommandLabel("YUV to RGB Filter");
+    pass.SetStencilReference(entity.GetClipDepth());
 
-    auto options = OptionsFromPass(pass);
-    options.blend_mode = BlendMode::kSource;
-    cmd.pipeline = renderer.GetYUVToRGBFilterPipeline(options);
+    auto options = OptionsFromPassAndEntity(pass, entity);
+    options.primitive_type = PrimitiveType::kTriangleStrip;
+    pass.SetPipeline(renderer.GetYUVToRGBFilterPipeline(options));
+
+    auto size = y_input_snapshot->texture->GetSize();
 
     VertexBufferBuilder<VS::PerVertexData> vtx_builder;
     vtx_builder.AddVertices({
         {Point(0, 0)},
         {Point(1, 0)},
-        {Point(1, 1)},
-        {Point(0, 0)},
-        {Point(1, 1)},
         {Point(0, 1)},
+        {Point(1, 1)},
     });
 
-    auto& host_buffer = pass.GetTransientsBuffer();
-    auto vtx_buffer = vtx_builder.CreateVertexBuffer(host_buffer);
-    cmd.BindVertices(vtx_buffer);
+    auto& host_buffer = renderer.GetTransientsBuffer();
+    pass.SetVertexBuffer(vtx_builder.CreateVertexBuffer(host_buffer));
 
     VS::FrameInfo frame_info;
-    frame_info.mvp = Matrix::MakeOrthographic(ISize(1, 1));
+    frame_info.mvp = Entity::GetShaderTransform(
+        entity.GetShaderClipDepth(), pass,
+        entity.GetTransform() * y_input_snapshot->transform *
+            Matrix::MakeScale(Vector2(size)));
+    frame_info.texture_sampler_y_coord_scale =
+        y_input_snapshot->texture->GetYCoordScale();
 
     FS::FragInfo frag_info;
-    frag_info.texture_sampler_y_coord_scale =
-        y_input_snapshot->texture->GetYCoordScale();
-    frag_info.yuv_color_space = static_cast<Scalar>(yuv_color_space_);
-    switch (yuv_color_space_) {
+    frag_info.yuv_color_space = static_cast<Scalar>(yuv_color_space);
+    switch (yuv_color_space) {
       case YUVColorSpace::kBT601LimitedRange:
         frag_info.matrix = kMatrixBT601LimitedRange;
         break;
@@ -101,24 +112,35 @@ std::optional<Snapshot> YUVToRGBFilterContents::RenderFilter(
         break;
     }
 
-    auto sampler = renderer.GetContext()->GetSamplerLibrary()->GetSampler({});
-    FS::BindYTexture(cmd, y_input_snapshot->texture, sampler);
-    FS::BindUvTexture(cmd, uv_input_snapshot->texture, sampler);
+    const std::unique_ptr<const Sampler>& sampler =
+        renderer.GetContext()->GetSamplerLibrary()->GetSampler({});
+    FS::BindYTexture(pass, y_input_snapshot->texture, sampler);
+    FS::BindUvTexture(pass, uv_input_snapshot->texture, sampler);
 
-    FS::BindFragInfo(cmd, host_buffer.EmplaceUniform(frag_info));
-    VS::BindFrameInfo(cmd, host_buffer.EmplaceUniform(frame_info));
+    FS::BindFragInfo(pass, host_buffer.EmplaceUniform(frag_info));
+    VS::BindFrameInfo(pass, host_buffer.EmplaceUniform(frame_info));
 
-    return pass.AddCommand(std::move(cmd));
+    return pass.Draw().ok();
   };
 
-  auto out_texture =
-      renderer.MakeSubpass(y_input_snapshot->texture->GetSize(), callback);
-  if (!out_texture) {
-    return std::nullopt;
-  }
-  out_texture->SetLabel("YUVToRGB Texture");
+  CoverageProc coverage_proc =
+      [coverage](const Entity& entity) -> std::optional<Rect> {
+    return coverage.TransformBounds(entity.GetTransform());
+  };
+
+  auto contents = AnonymousContents::Make(render_proc, coverage_proc);
 
-  return Snapshot{.texture = out_texture};
+  Entity sub_entity;
+  sub_entity.SetContents(std::move(contents));
+  sub_entity.SetClipDepth(entity.GetClipDepth());
+  sub_entity.SetBlendMode(entity.GetBlendMode());
+  return sub_entity;
+}
+
+std::optional<Rect> YUVToRGBFilterContents::GetFilterSourceCoverage(
+    const Matrix& effect_transform,
+    const Rect& output_limit) const {
+  return output_limit;
 }
 
 }  // namespace impeller
diff --git a/impeller/entity/contents/filters/yuv_to_rgb_filter_contents.h b/impeller/entity/contents/filters/yuv_to_rgb_filter_contents.h
index 7e15cb5efce9756e184f15534ea5744578411377..efa903f0d9d350adc8d74e2d04214df452559f1b 100644
--- a/impeller/entity/contents/filters/yuv_to_rgb_filter_contents.h
+++ b/impeller/entity/contents/filters/yuv_to_rgb_filter_contents.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_YUV_TO_RGB_FILTER_CONTENTS_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_YUV_TO_RGB_FILTER_CONTENTS_H_
 
 #include "impeller/entity/contents/filters/filter_contents.h"
 
@@ -18,16 +19,26 @@ class YUVToRGBFilterContents final : public FilterContents {
 
  private:
   // |FilterContents|
-  std::optional<Snapshot> RenderFilter(
+  std::optional<Entity> RenderFilter(
       const FilterInput::Vector& input_textures,
       const ContentContext& renderer,
       const Entity& entity,
       const Matrix& effect_transform,
-      const Rect& coverage) const override;
+      const Rect& coverage,
+      const std::optional<Rect>& coverage_hint) const override;
+
+  // |FilterContents|
+  std::optional<Rect> GetFilterSourceCoverage(
+      const Matrix& effect_transform,
+      const Rect& output_limit) const override;
 
   YUVColorSpace yuv_color_space_ = YUVColorSpace::kBT601LimitedRange;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(YUVToRGBFilterContents);
+  YUVToRGBFilterContents(const YUVToRGBFilterContents&) = delete;
+
+  YUVToRGBFilterContents& operator=(const YUVToRGBFilterContents&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_FILTERS_YUV_TO_RGB_FILTER_CONTENTS_H_
diff --git a/impeller/entity/contents/framebuffer_blend_contents.cc b/impeller/entity/contents/framebuffer_blend_contents.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c4a75ddd03ab45855b52f63693e709a4d3bdee2d
--- /dev/null
+++ b/impeller/entity/contents/framebuffer_blend_contents.cc
@@ -0,0 +1,152 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "framebuffer_blend_contents.h"
+
+#include "impeller/entity/contents/content_context.h"
+#include "impeller/renderer/render_pass.h"
+
+namespace impeller {
+
+FramebufferBlendContents::FramebufferBlendContents() = default;
+
+FramebufferBlendContents::~FramebufferBlendContents() = default;
+
+void FramebufferBlendContents::SetBlendMode(BlendMode blend_mode) {
+  blend_mode_ = blend_mode;
+}
+
+void FramebufferBlendContents::SetChildContents(
+    std::shared_ptr<Contents> child_contents) {
+  child_contents_ = std::move(child_contents);
+}
+
+// |Contents|
+std::optional<Rect> FramebufferBlendContents::GetCoverage(
+    const Entity& entity) const {
+  return child_contents_->GetCoverage(entity);
+}
+
+bool FramebufferBlendContents::Render(const ContentContext& renderer,
+                                      const Entity& entity,
+                                      RenderPass& pass) const {
+  if (!renderer.GetDeviceCapabilities().SupportsFramebufferFetch()) {
+    return false;
+  }
+
+  using VS = FramebufferBlendScreenPipeline::VertexShader;
+  using FS = FramebufferBlendScreenPipeline::FragmentShader;
+
+  auto& host_buffer = renderer.GetTransientsBuffer();
+
+  auto src_snapshot = child_contents_->RenderToSnapshot(
+      renderer,                                    // renderer
+      entity,                                      // entity
+      Rect::MakeSize(pass.GetRenderTargetSize()),  // coverage_limit
+      std::nullopt,                                // sampler_descriptor
+      true,                                        // msaa_enabled
+      /*mip_count=*/1,
+      "FramebufferBlendContents Snapshot");  // label
+
+  if (!src_snapshot.has_value()) {
+    return true;
+  }
+  auto coverage = src_snapshot->GetCoverage();
+  if (!coverage.has_value()) {
+    return true;
+  }
+  Rect src_coverage = coverage.value();
+
+  auto size = src_coverage.GetSize();
+  VertexBufferBuilder<VS::PerVertexData> vtx_builder;
+  vtx_builder.AddVertices({
+      {Point(0, 0), Point(0, 0)},
+      {Point(size.width, 0), Point(1, 0)},
+      {Point(0, size.height), Point(0, 1)},
+      {Point(size.width, size.height), Point(1, 1)},
+  });
+
+  auto options = OptionsFromPass(pass);
+  options.blend_mode = BlendMode::kSource;
+  options.primitive_type = PrimitiveType::kTriangleStrip;
+
+  pass.SetCommandLabel("Framebuffer Advanced Blend Filter");
+  pass.SetVertexBuffer(vtx_builder.CreateVertexBuffer(host_buffer));
+  pass.SetStencilReference(entity.GetClipDepth());
+
+  switch (blend_mode_) {
+    case BlendMode::kScreen:
+      pass.SetPipeline(renderer.GetFramebufferBlendScreenPipeline(options));
+      break;
+    case BlendMode::kOverlay:
+      pass.SetPipeline(renderer.GetFramebufferBlendOverlayPipeline(options));
+      break;
+    case BlendMode::kDarken:
+      pass.SetPipeline(renderer.GetFramebufferBlendDarkenPipeline(options));
+      break;
+    case BlendMode::kLighten:
+      pass.SetPipeline(renderer.GetFramebufferBlendLightenPipeline(options));
+      break;
+    case BlendMode::kColorDodge:
+      pass.SetPipeline(renderer.GetFramebufferBlendColorDodgePipeline(options));
+      break;
+    case BlendMode::kColorBurn:
+      pass.SetPipeline(renderer.GetFramebufferBlendColorBurnPipeline(options));
+      break;
+    case BlendMode::kHardLight:
+      pass.SetPipeline(renderer.GetFramebufferBlendHardLightPipeline(options));
+      break;
+    case BlendMode::kSoftLight:
+      pass.SetPipeline(renderer.GetFramebufferBlendSoftLightPipeline(options));
+      break;
+    case BlendMode::kDifference:
+      pass.SetPipeline(renderer.GetFramebufferBlendDifferencePipeline(options));
+      break;
+    case BlendMode::kExclusion:
+      pass.SetPipeline(renderer.GetFramebufferBlendExclusionPipeline(options));
+      break;
+    case BlendMode::kMultiply:
+      pass.SetPipeline(renderer.GetFramebufferBlendMultiplyPipeline(options));
+      break;
+    case BlendMode::kHue:
+      pass.SetPipeline(renderer.GetFramebufferBlendHuePipeline(options));
+      break;
+    case BlendMode::kSaturation:
+      pass.SetPipeline(renderer.GetFramebufferBlendSaturationPipeline(options));
+      break;
+    case BlendMode::kColor:
+      pass.SetPipeline(renderer.GetFramebufferBlendColorPipeline(options));
+      break;
+    case BlendMode::kLuminosity:
+      pass.SetPipeline(renderer.GetFramebufferBlendLuminosityPipeline(options));
+      break;
+    default:
+      return false;
+  }
+
+  VS::FrameInfo frame_info;
+  FS::FragInfo frag_info;
+
+  auto src_sampler_descriptor = src_snapshot->sampler_descriptor;
+  if (renderer.GetDeviceCapabilities().SupportsDecalSamplerAddressMode()) {
+    src_sampler_descriptor.width_address_mode = SamplerAddressMode::kDecal;
+    src_sampler_descriptor.height_address_mode = SamplerAddressMode::kDecal;
+  }
+  const std::unique_ptr<const Sampler>& src_sampler =
+      renderer.GetContext()->GetSamplerLibrary()->GetSampler(
+          src_sampler_descriptor);
+  FS::BindTextureSamplerSrc(pass, src_snapshot->texture, src_sampler);
+
+  frame_info.mvp = Entity::GetShaderTransform(entity.GetShaderClipDepth(), pass,
+                                              src_snapshot->transform);
+  frame_info.src_y_coord_scale = src_snapshot->texture->GetYCoordScale();
+  VS::BindFrameInfo(pass, host_buffer.EmplaceUniform(frame_info));
+
+  frag_info.src_input_alpha = src_snapshot->opacity;
+  FS::BindFragInfo(pass, host_buffer.EmplaceUniform(frag_info));
+
+  return pass.Draw().ok();
+}
+
+}  // namespace impeller
diff --git a/impeller/entity/contents/framebuffer_blend_contents.h b/impeller/entity/contents/framebuffer_blend_contents.h
new file mode 100644
index 0000000000000000000000000000000000000000..5335055bd3f612422cd68f450561b977becebef6
--- /dev/null
+++ b/impeller/entity/contents/framebuffer_blend_contents.h
@@ -0,0 +1,62 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_FRAMEBUFFER_BLEND_CONTENTS_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_FRAMEBUFFER_BLEND_CONTENTS_H_
+
+#include <memory>
+
+#include "impeller/entity/contents/color_source_contents.h"
+#include "impeller/entity/entity.h"
+
+namespace impeller {
+
+enum class BlendSelectValues {
+  kScreen = 0,
+  kOverlay,
+  kDarken,
+  kLighten,
+  kColorDodge,
+  kColorBurn,
+  kHardLight,
+  kSoftLight,
+  kDifference,
+  kExclusion,
+  kMultiply,
+  kHue,
+  kSaturation,
+  kColor,
+  kLuminosity,
+};
+
+class FramebufferBlendContents final : public ColorSourceContents {
+ public:
+  FramebufferBlendContents();
+
+  ~FramebufferBlendContents() override;
+
+  void SetBlendMode(BlendMode blend_mode);
+
+  void SetChildContents(std::shared_ptr<Contents> child_contents);
+
+ private:
+  // |Contents|
+  std::optional<Rect> GetCoverage(const Entity& entity) const override;
+
+  // |Contents|
+  bool Render(const ContentContext& renderer,
+              const Entity& entity,
+              RenderPass& pass) const override;
+
+  BlendMode blend_mode_;
+  std::shared_ptr<Contents> child_contents_;
+
+  FramebufferBlendContents(const FramebufferBlendContents&) = delete;
+
+  FramebufferBlendContents& operator=(const FramebufferBlendContents&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_FRAMEBUFFER_BLEND_CONTENTS_H_
diff --git a/impeller/entity/contents/gradient_generator.cc b/impeller/entity/contents/gradient_generator.cc
index 6a53719a90594758dfb51a116c4f660f9a7fb3b7..6672fb394118b8fc522e81a0c285cd9762722ba0 100644
--- a/impeller/entity/contents/gradient_generator.cc
+++ b/impeller/entity/contents/gradient_generator.cc
@@ -7,10 +7,10 @@
 #include "impeller/entity/contents/gradient_generator.h"
 
 #include "flutter/fml/logging.h"
+#include "impeller/core/texture.h"
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/renderer/context.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/texture.h"
 
 namespace impeller {
 
@@ -42,4 +42,15 @@ std::shared_ptr<Texture> CreateGradientTexture(
   return texture;
 }
 
+std::vector<StopData> CreateGradientColors(const std::vector<Color>& colors,
+                                           const std::vector<Scalar>& stops) {
+  FML_DCHECK(stops.size() == colors.size());
+
+  std::vector<StopData> result(stops.size());
+  for (auto i = 0u; i < stops.size(); i++) {
+    result[i] = {.color = colors[i], .stop = stops[i]};
+  }
+  return result;
+}
+
 }  // namespace impeller
diff --git a/impeller/entity/contents/gradient_generator.h b/impeller/entity/contents/gradient_generator.h
index 2074d2a3e044042d6e2c13cab46f04a2486ee07b..8c3c02e9d95272a0d3c42306bbbbed0d7015bec4 100644
--- a/impeller/entity/contents/gradient_generator.h
+++ b/impeller/entity/contents/gradient_generator.h
@@ -2,14 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_GRADIENT_GENERATOR_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_GRADIENT_GENERATOR_H_
 
 #include <functional>
 #include <memory>
 #include <vector>
 
 #include "flutter/fml/macros.h"
-#include "flutter/impeller/renderer/texture.h"
+#include "flutter/impeller/core/texture.h"
+#include "impeller/core/shader_types.h"
 #include "impeller/geometry/color.h"
 #include "impeller/geometry/gradient.h"
 #include "impeller/geometry/path.h"
@@ -27,4 +29,22 @@ std::shared_ptr<Texture> CreateGradientTexture(
     const GradientData& gradient_data,
     const std::shared_ptr<impeller::Context>& context);
 
+struct StopData {
+  Color color;
+  Scalar stop;
+  Padding<12> _padding_;
+};
+
+/**
+ * @brief Populate a vector with the color and stop data for a gradient
+ *
+ * @param colors
+ * @param stops
+ * @return StopData
+ */
+std::vector<StopData> CreateGradientColors(const std::vector<Color>& colors,
+                                           const std::vector<Scalar>& stops);
+
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_GRADIENT_GENERATOR_H_
diff --git a/impeller/entity/contents/host_buffer_unittests.cc b/impeller/entity/contents/host_buffer_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..28ac62dccea72f1b77c911c49a994a96a48753e3
--- /dev/null
+++ b/impeller/entity/contents/host_buffer_unittests.cc
@@ -0,0 +1,160 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/testing/testing.h"
+#include "impeller/core/host_buffer.h"
+#include "impeller/entity/entity_playground.h"
+
+namespace impeller {
+namespace testing {
+
+using HostBufferTest = EntityPlayground;
+INSTANTIATE_PLAYGROUND_SUITE(HostBufferTest);
+
+TEST_P(HostBufferTest, CanEmplace) {
+  struct Length2 {
+    uint8_t pad[2];
+  };
+  static_assert(sizeof(Length2) == 2u);
+
+  auto buffer = HostBuffer::Create(GetContext()->GetResourceAllocator());
+
+  for (size_t i = 0; i < 12500; i++) {
+    auto view = buffer->Emplace(Length2{});
+    ASSERT_TRUE(view);
+    ASSERT_EQ(view.range, Range(i * sizeof(Length2), 2u));
+  }
+}
+
+TEST_P(HostBufferTest, CanEmplaceWithAlignment) {
+  struct Length2 {
+    uint8_t pad[2];
+  };
+  static_assert(sizeof(Length2) == 2);
+  struct alignas(16) Align16 {
+    uint8_t pad[2];
+  };
+  static_assert(alignof(Align16) == 16);
+  static_assert(sizeof(Align16) == 16);
+
+  auto buffer = HostBuffer::Create(GetContext()->GetResourceAllocator());
+  ASSERT_TRUE(buffer);
+
+  {
+    auto view = buffer->Emplace(Length2{});
+    ASSERT_TRUE(view);
+    ASSERT_EQ(view.range, Range(0u, 2u));
+  }
+
+  {
+    auto view = buffer->Emplace(Align16{});
+    ASSERT_TRUE(view);
+    ASSERT_EQ(view.range.offset, 16u);
+    ASSERT_EQ(view.range.length, 16u);
+  }
+  {
+    auto view = buffer->Emplace(Length2{});
+    ASSERT_TRUE(view);
+    ASSERT_EQ(view.range, Range(32u, 2u));
+  }
+
+  {
+    auto view = buffer->Emplace(Align16{});
+    ASSERT_TRUE(view);
+    ASSERT_EQ(view.range.offset, 48u);
+    ASSERT_EQ(view.range.length, 16u);
+  }
+}
+
+TEST_P(HostBufferTest, HostBufferInitialState) {
+  auto buffer = HostBuffer::Create(GetContext()->GetResourceAllocator());
+
+  EXPECT_EQ(buffer->GetStateForTest().current_buffer, 0u);
+  EXPECT_EQ(buffer->GetStateForTest().current_frame, 0u);
+  EXPECT_EQ(buffer->GetStateForTest().total_buffer_count, 1u);
+}
+
+TEST_P(HostBufferTest, ResetIncrementsFrameCounter) {
+  auto buffer = HostBuffer::Create(GetContext()->GetResourceAllocator());
+
+  EXPECT_EQ(buffer->GetStateForTest().current_frame, 0u);
+
+  buffer->Reset();
+  EXPECT_EQ(buffer->GetStateForTest().current_frame, 1u);
+
+  buffer->Reset();
+  EXPECT_EQ(buffer->GetStateForTest().current_frame, 2u);
+
+  buffer->Reset();
+  EXPECT_EQ(buffer->GetStateForTest().current_frame, 0u);
+}
+
+TEST_P(HostBufferTest,
+       EmplacingLargerThanBlockSizeCreatesOneOffBufferCallback) {
+  auto buffer = HostBuffer::Create(GetContext()->GetResourceAllocator());
+
+  // Emplace an amount larger than the block size, to verify that the host
+  // buffer does not create a buffer.
+  auto buffer_view = buffer->Emplace(1024000 + 10, 0, [](uint8_t* data) {});
+
+  EXPECT_EQ(buffer->GetStateForTest().current_buffer, 0u);
+  EXPECT_EQ(buffer->GetStateForTest().current_frame, 0u);
+  EXPECT_EQ(buffer->GetStateForTest().total_buffer_count, 1u);
+}
+
+TEST_P(HostBufferTest, EmplacingLargerThanBlockSizeCreatesOneOffBuffer) {
+  auto buffer = HostBuffer::Create(GetContext()->GetResourceAllocator());
+
+  // Emplace an amount larger than the block size, to verify that the host
+  // buffer does not create a buffer.
+  auto buffer_view = buffer->Emplace(nullptr, 1024000 + 10, 0);
+
+  EXPECT_EQ(buffer->GetStateForTest().current_buffer, 0u);
+  EXPECT_EQ(buffer->GetStateForTest().current_frame, 0u);
+  EXPECT_EQ(buffer->GetStateForTest().total_buffer_count, 1u);
+}
+
+TEST_P(HostBufferTest, UnusedBuffersAreDiscardedWhenResetting) {
+  auto buffer = HostBuffer::Create(GetContext()->GetResourceAllocator());
+
+  // Emplace two large allocations to force the allocation of a second buffer.
+  auto buffer_view_a = buffer->Emplace(1020000, 0, [](uint8_t* data) {});
+  auto buffer_view_b = buffer->Emplace(1020000, 0, [](uint8_t* data) {});
+
+  EXPECT_EQ(buffer->GetStateForTest().current_buffer, 1u);
+  EXPECT_EQ(buffer->GetStateForTest().total_buffer_count, 2u);
+  EXPECT_EQ(buffer->GetStateForTest().current_frame, 0u);
+
+  // Reset until we get back to this frame.
+  for (auto i = 0; i < 3; i++) {
+    buffer->Reset();
+  }
+
+  EXPECT_EQ(buffer->GetStateForTest().current_buffer, 0u);
+  EXPECT_EQ(buffer->GetStateForTest().total_buffer_count, 2u);
+  EXPECT_EQ(buffer->GetStateForTest().current_frame, 0u);
+
+  // Now when we reset, the buffer should get dropped.
+  // Reset until we get back to this frame.
+  for (auto i = 0; i < 3; i++) {
+    buffer->Reset();
+  }
+
+  EXPECT_EQ(buffer->GetStateForTest().current_buffer, 0u);
+  EXPECT_EQ(buffer->GetStateForTest().total_buffer_count, 1u);
+  EXPECT_EQ(buffer->GetStateForTest().current_frame, 0u);
+}
+
+TEST_P(HostBufferTest, EmplaceWithProcIsAligned) {
+  auto buffer = HostBuffer::Create(GetContext()->GetResourceAllocator());
+
+  BufferView view = buffer->Emplace(std::array<char, 21>());
+  EXPECT_EQ(view.range, Range(0, 21));
+
+  view = buffer->Emplace(64, 16, [](uint8_t*) {});
+  EXPECT_EQ(view.range, Range(32, 64));
+}
+
+}  // namespace  testing
+}  // namespace impeller
diff --git a/impeller/entity/contents/linear_gradient_contents.cc b/impeller/entity/contents/linear_gradient_contents.cc
index 54d63578e68f78b8df42e3b2f5e83dd118c76d97..99f2c79055f159ca59c8b8882a2a67f1a7c94d9e 100644
--- a/impeller/entity/contents/linear_gradient_contents.cc
+++ b/impeller/entity/contents/linear_gradient_contents.cc
@@ -4,14 +4,11 @@
 
 #include "linear_gradient_contents.h"
 
-#include "flutter/fml/logging.h"
-#include "impeller/entity/contents/clip_contents.h"
+#include "impeller/core/formats.h"
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/contents/gradient_generator.h"
 #include "impeller/entity/entity.h"
-#include "impeller/renderer/formats.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_library.h"
 
 namespace impeller {
 
@@ -44,10 +41,22 @@ void LinearGradientContents::SetTileMode(Entity::TileMode tile_mode) {
   tile_mode_ = tile_mode;
 }
 
+bool LinearGradientContents::IsOpaque() const {
+  if (GetOpacityFactor() < 1 || tile_mode_ == Entity::TileMode::kDecal) {
+    return false;
+  }
+  for (auto color : colors_) {
+    if (!color.IsOpaque()) {
+      return false;
+    }
+  }
+  return true;
+}
+
 bool LinearGradientContents::Render(const ContentContext& renderer,
                                     const Entity& entity,
                                     RenderPass& pass) const {
-  if (renderer.GetBackendFeatures().ssbo_support) {
+  if (renderer.GetDeviceCapabilities().SupportsSSBO()) {
     return RenderSSBO(renderer, entity, pass);
   }
   return RenderTexture(renderer, entity, pass);
@@ -59,63 +68,49 @@ bool LinearGradientContents::RenderTexture(const ContentContext& renderer,
   using VS = LinearGradientFillPipeline::VertexShader;
   using FS = LinearGradientFillPipeline::FragmentShader;
 
-  auto gradient_data = CreateGradientBuffer(colors_, stops_);
-  auto gradient_texture =
-      CreateGradientTexture(gradient_data, renderer.GetContext());
-  if (gradient_texture == nullptr) {
-    return false;
-  }
-
-  FS::GradientInfo gradient_info;
-  gradient_info.start_point = start_point_;
-  gradient_info.end_point = end_point_;
-  gradient_info.tile_mode = static_cast<Scalar>(tile_mode_);
-  gradient_info.texture_sampler_y_coord_scale =
-      gradient_texture->GetYCoordScale();
-  gradient_info.alpha = GetAlpha();
-  gradient_info.half_texel = Vector2(0.5 / gradient_texture->GetSize().width,
-                                     0.5 / gradient_texture->GetSize().height);
-
-  auto geometry_result =
-      GetGeometry()->GetPositionBuffer(renderer, entity, pass);
-
   VS::FrameInfo frame_info;
-  frame_info.mvp = geometry_result.transform;
-  frame_info.matrix = GetInverseMatrix();
-
-  Command cmd;
-  cmd.label = "LinearGradientFill";
-  cmd.stencil_reference = entity.GetStencilDepth();
-
-  auto options = OptionsFromPassAndEntity(pass, entity);
-  if (geometry_result.prevent_overdraw) {
-    options.stencil_compare = CompareFunction::kEqual;
-    options.stencil_operation = StencilOperation::kIncrementClamp;
-  }
-  options.primitive_type = geometry_result.type;
-  cmd.pipeline = renderer.GetLinearGradientFillPipeline(options);
-
-  cmd.BindVertices(geometry_result.vertex_buffer);
-  FS::BindGradientInfo(
-      cmd, pass.GetTransientsBuffer().EmplaceUniform(gradient_info));
-  SamplerDescriptor sampler_desc;
-  sampler_desc.min_filter = MinMagFilter::kLinear;
-  sampler_desc.mag_filter = MinMagFilter::kLinear;
-  FS::BindTextureSampler(
-      cmd, std::move(gradient_texture),
-      renderer.GetContext()->GetSamplerLibrary()->GetSampler(sampler_desc));
-  VS::BindFrameInfo(cmd, pass.GetTransientsBuffer().EmplaceUniform(frame_info));
-
-  if (!pass.AddCommand(std::move(cmd))) {
-    return false;
-  }
-
-  if (geometry_result.prevent_overdraw) {
-    auto restore = ClipRestoreContents();
-    restore.SetRestoreCoverage(GetCoverage(entity));
-    return restore.Render(renderer, entity, pass);
-  }
-  return true;
+  frame_info.matrix = GetInverseEffectTransform();
+
+  PipelineBuilderCallback pipeline_callback =
+      [&renderer](ContentContextOptions options) {
+        return renderer.GetLinearGradientFillPipeline(options);
+      };
+  return ColorSourceContents::DrawGeometry<VS>(
+      renderer, entity, pass, pipeline_callback, frame_info,
+      [this, &renderer](RenderPass& pass) {
+        auto gradient_data = CreateGradientBuffer(colors_, stops_);
+        auto gradient_texture =
+            CreateGradientTexture(gradient_data, renderer.GetContext());
+        if (gradient_texture == nullptr) {
+          return false;
+        }
+
+        FS::FragInfo frag_info;
+        frag_info.start_point = start_point_;
+        frag_info.end_point = end_point_;
+        frag_info.tile_mode = static_cast<Scalar>(tile_mode_);
+        frag_info.decal_border_color = decal_border_color_;
+        frag_info.texture_sampler_y_coord_scale =
+            gradient_texture->GetYCoordScale();
+        frag_info.alpha = GetOpacityFactor();
+        frag_info.half_texel =
+            Vector2(0.5 / gradient_texture->GetSize().width,
+                    0.5 / gradient_texture->GetSize().height);
+
+        pass.SetCommandLabel("LinearGradientFill");
+
+        SamplerDescriptor sampler_desc;
+        sampler_desc.min_filter = MinMagFilter::kLinear;
+        sampler_desc.mag_filter = MinMagFilter::kLinear;
+
+        FS::BindTextureSampler(
+            pass, std::move(gradient_texture),
+            renderer.GetContext()->GetSamplerLibrary()->GetSampler(
+                sampler_desc));
+        FS::BindFragInfo(
+            pass, renderer.GetTransientsBuffer().EmplaceUniform(frag_info));
+        return true;
+      });
 }
 
 bool LinearGradientContents::RenderSSBO(const ContentContext& renderer,
@@ -124,53 +119,47 @@ bool LinearGradientContents::RenderSSBO(const ContentContext& renderer,
   using VS = LinearGradientSSBOFillPipeline::VertexShader;
   using FS = LinearGradientSSBOFillPipeline::FragmentShader;
 
-  FS::GradientInfo gradient_info;
-  gradient_info.start_point = start_point_;
-  gradient_info.end_point = end_point_;
-  gradient_info.tile_mode = static_cast<Scalar>(tile_mode_);
-  gradient_info.alpha = GetAlpha();
-
-  auto& host_buffer = pass.GetTransientsBuffer();
-  auto colors = CreateGradientColors(colors_, stops_).value_or(colors_);
-
-  gradient_info.colors_length = colors.size();
-  auto color_buffer = host_buffer.Emplace(
-      colors.data(), colors.size() * sizeof(Color), alignof(Color));
-
   VS::FrameInfo frame_info;
-  frame_info.mvp = Matrix::MakeOrthographic(pass.GetRenderTargetSize()) *
-                   entity.GetTransformation();
-  frame_info.matrix = GetInverseMatrix();
-
-  Command cmd;
-  cmd.label = "LinearGradientSSBOFill";
-  cmd.stencil_reference = entity.GetStencilDepth();
-
-  auto geometry_result =
-      GetGeometry()->GetPositionBuffer(renderer, entity, pass);
-  auto options = OptionsFromPassAndEntity(pass, entity);
-  if (geometry_result.prevent_overdraw) {
-    options.stencil_compare = CompareFunction::kEqual;
-    options.stencil_operation = StencilOperation::kIncrementClamp;
-  }
-  options.primitive_type = geometry_result.type;
-  cmd.pipeline = renderer.GetLinearGradientSSBOFillPipeline(options);
-
-  cmd.BindVertices(geometry_result.vertex_buffer);
-  FS::BindGradientInfo(
-      cmd, pass.GetTransientsBuffer().EmplaceUniform(gradient_info));
-  FS::BindColorData(cmd, color_buffer);
-  VS::BindFrameInfo(cmd, pass.GetTransientsBuffer().EmplaceUniform(frame_info));
-
-  if (!pass.AddCommand(std::move(cmd))) {
-    return false;
-  }
+  frame_info.matrix = GetInverseEffectTransform();
+
+  PipelineBuilderCallback pipeline_callback =
+      [&renderer](ContentContextOptions options) {
+        return renderer.GetLinearGradientSSBOFillPipeline(options);
+      };
+  return ColorSourceContents::DrawGeometry<VS>(
+      renderer, entity, pass, pipeline_callback, frame_info,
+      [this, &renderer](RenderPass& pass) {
+        FS::FragInfo frag_info;
+        frag_info.start_point = start_point_;
+        frag_info.end_point = end_point_;
+        frag_info.tile_mode = static_cast<Scalar>(tile_mode_);
+        frag_info.decal_border_color = decal_border_color_;
+        frag_info.alpha = GetOpacityFactor();
+
+        auto& host_buffer = renderer.GetTransientsBuffer();
+        auto colors = CreateGradientColors(colors_, stops_);
+
+        frag_info.colors_length = colors.size();
+        auto color_buffer =
+            host_buffer.Emplace(colors.data(), colors.size() * sizeof(StopData),
+                                DefaultUniformAlignment());
+
+        pass.SetCommandLabel("LinearGradientSSBOFill");
+
+        FS::BindFragInfo(
+            pass, renderer.GetTransientsBuffer().EmplaceUniform(frag_info));
+        FS::BindColorData(pass, color_buffer);
+
+        return true;
+      });
+}
 
-  if (geometry_result.prevent_overdraw) {
-    auto restore = ClipRestoreContents();
-    restore.SetRestoreCoverage(GetCoverage(entity));
-    return restore.Render(renderer, entity, pass);
+bool LinearGradientContents::ApplyColorFilter(
+    const ColorFilterProc& color_filter_proc) {
+  for (Color& color : colors_) {
+    color = color_filter_proc(color);
   }
+  decal_border_color_ = color_filter_proc(decal_border_color_);
   return true;
 }
 
diff --git a/impeller/entity/contents/linear_gradient_contents.h b/impeller/entity/contents/linear_gradient_contents.h
index 2a2fd1c6c663265bb66aa973245eb1ff7674b192..75b24a3ab9f4dfc1d033d9b0d1ec30628b503c1c 100644
--- a/impeller/entity/contents/linear_gradient_contents.h
+++ b/impeller/entity/contents/linear_gradient_contents.h
@@ -2,14 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_LINEAR_GRADIENT_CONTENTS_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_LINEAR_GRADIENT_CONTENTS_H_
 
 #include <functional>
 #include <memory>
 #include <vector>
 
 #include "flutter/fml/macros.h"
-#include "flutter/impeller/renderer/texture.h"
+#include "flutter/impeller/core/texture.h"
 #include "impeller/entity/contents/color_source_contents.h"
 #include "impeller/entity/entity.h"
 #include "impeller/geometry/color.h"
@@ -25,11 +26,18 @@ class LinearGradientContents final : public ColorSourceContents {
 
   ~LinearGradientContents() override;
 
+  // |Contents|
+  bool IsOpaque() const override;
+
   // |Contents|
   bool Render(const ContentContext& renderer,
               const Entity& entity,
               RenderPass& pass) const override;
 
+  // |Contents|
+  [[nodiscard]] bool ApplyColorFilter(
+      const ColorFilterProc& color_filter_proc) override;
+
   void SetEndPoints(Point start_point, Point end_point);
 
   void SetColors(std::vector<Color> colors);
@@ -56,8 +64,13 @@ class LinearGradientContents final : public ColorSourceContents {
   std::vector<Color> colors_;
   std::vector<Scalar> stops_;
   Entity::TileMode tile_mode_;
+  Color decal_border_color_ = Color::BlackTransparent();
+
+  LinearGradientContents(const LinearGradientContents&) = delete;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(LinearGradientContents);
+  LinearGradientContents& operator=(const LinearGradientContents&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_LINEAR_GRADIENT_CONTENTS_H_
diff --git a/impeller/entity/contents/radial_gradient_contents.cc b/impeller/entity/contents/radial_gradient_contents.cc
index 82de84b2b21296704ad5ac7b1033a4099d1befdb..f2d58c998ae489c0c8720444f216b8f3d1508809 100644
--- a/impeller/entity/contents/radial_gradient_contents.cc
+++ b/impeller/entity/contents/radial_gradient_contents.cc
@@ -4,15 +4,13 @@
 
 #include "radial_gradient_contents.h"
 
-#include "flutter/fml/logging.h"
 #include "impeller/entity/contents/clip_contents.h"
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/contents/gradient_generator.h"
 #include "impeller/entity/entity.h"
-#include "impeller/entity/geometry.h"
+#include "impeller/entity/geometry/geometry.h"
 #include "impeller/geometry/gradient.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_library.h"
 
 namespace impeller {
 
@@ -45,10 +43,22 @@ const std::vector<Scalar>& RadialGradientContents::GetStops() const {
   return stops_;
 }
 
+bool RadialGradientContents::IsOpaque() const {
+  if (GetOpacityFactor() < 1 || tile_mode_ == Entity::TileMode::kDecal) {
+    return false;
+  }
+  for (auto color : colors_) {
+    if (!color.IsOpaque()) {
+      return false;
+    }
+  }
+  return true;
+}
+
 bool RadialGradientContents::Render(const ContentContext& renderer,
                                     const Entity& entity,
                                     RenderPass& pass) const {
-  if (renderer.GetBackendFeatures().ssbo_support) {
+  if (renderer.GetDeviceCapabilities().SupportsSSBO()) {
     return RenderSSBO(renderer, entity, pass);
   }
   return RenderTexture(renderer, entity, pass);
@@ -60,54 +70,38 @@ bool RadialGradientContents::RenderSSBO(const ContentContext& renderer,
   using VS = RadialGradientSSBOFillPipeline::VertexShader;
   using FS = RadialGradientSSBOFillPipeline::FragmentShader;
 
-  FS::GradientInfo gradient_info;
-  gradient_info.center = center_;
-  gradient_info.radius = radius_;
-  gradient_info.tile_mode = static_cast<Scalar>(tile_mode_);
-  gradient_info.alpha = GetAlpha();
-
-  auto& host_buffer = pass.GetTransientsBuffer();
-  auto colors = CreateGradientColors(colors_, stops_).value_or(colors_);
-
-  gradient_info.colors_length = colors.size();
-  auto color_buffer = host_buffer.Emplace(
-      colors.data(), colors.size() * sizeof(Color), alignof(Color));
-
   VS::FrameInfo frame_info;
-  frame_info.mvp = Matrix::MakeOrthographic(pass.GetRenderTargetSize()) *
-                   entity.GetTransformation();
-  frame_info.matrix = GetInverseMatrix();
-
-  Command cmd;
-  cmd.label = "RadialGradientSSBOFill";
-  cmd.stencil_reference = entity.GetStencilDepth();
-
-  auto geometry_result =
-      GetGeometry()->GetPositionBuffer(renderer, entity, pass);
-  auto options = OptionsFromPassAndEntity(pass, entity);
-  if (geometry_result.prevent_overdraw) {
-    options.stencil_compare = CompareFunction::kEqual;
-    options.stencil_operation = StencilOperation::kIncrementClamp;
-  }
-  options.primitive_type = geometry_result.type;
-  cmd.pipeline = renderer.GetRadialGradientSSBOFillPipeline(options);
-
-  cmd.BindVertices(geometry_result.vertex_buffer);
-  FS::BindGradientInfo(
-      cmd, pass.GetTransientsBuffer().EmplaceUniform(gradient_info));
-  FS::BindColorData(cmd, color_buffer);
-  VS::BindFrameInfo(cmd, pass.GetTransientsBuffer().EmplaceUniform(frame_info));
-
-  if (!pass.AddCommand(std::move(cmd))) {
-    return false;
-  }
-
-  if (geometry_result.prevent_overdraw) {
-    auto restore = ClipRestoreContents();
-    restore.SetRestoreCoverage(GetCoverage(entity));
-    return restore.Render(renderer, entity, pass);
-  }
-  return true;
+  frame_info.matrix = GetInverseEffectTransform();
+
+  PipelineBuilderCallback pipeline_callback =
+      [&renderer](ContentContextOptions options) {
+        return renderer.GetRadialGradientSSBOFillPipeline(options);
+      };
+  return ColorSourceContents::DrawGeometry<VS>(
+      renderer, entity, pass, pipeline_callback, frame_info,
+      [this, &renderer](RenderPass& pass) {
+        FS::FragInfo frag_info;
+        frag_info.center = center_;
+        frag_info.radius = radius_;
+        frag_info.tile_mode = static_cast<Scalar>(tile_mode_);
+        frag_info.decal_border_color = decal_border_color_;
+        frag_info.alpha = GetOpacityFactor();
+
+        auto& host_buffer = renderer.GetTransientsBuffer();
+        auto colors = CreateGradientColors(colors_, stops_);
+
+        frag_info.colors_length = colors.size();
+        auto color_buffer =
+            host_buffer.Emplace(colors.data(), colors.size() * sizeof(StopData),
+                                DefaultUniformAlignment());
+
+        pass.SetCommandLabel("RadialGradientSSBOFill");
+        FS::BindFragInfo(
+            pass, renderer.GetTransientsBuffer().EmplaceUniform(frag_info));
+        FS::BindColorData(pass, color_buffer);
+
+        return true;
+      });
 }
 
 bool RadialGradientContents::RenderTexture(const ContentContext& renderer,
@@ -123,55 +117,51 @@ bool RadialGradientContents::RenderTexture(const ContentContext& renderer,
     return false;
   }
 
-  FS::GradientInfo gradient_info;
-  gradient_info.center = center_;
-  gradient_info.radius = radius_;
-  gradient_info.tile_mode = static_cast<Scalar>(tile_mode_);
-  gradient_info.texture_sampler_y_coord_scale =
-      gradient_texture->GetYCoordScale();
-  gradient_info.alpha = GetAlpha();
-  gradient_info.half_texel = Vector2(0.5 / gradient_texture->GetSize().width,
-                                     0.5 / gradient_texture->GetSize().height);
-
-  auto geometry_result =
-      GetGeometry()->GetPositionBuffer(renderer, entity, pass);
-
   VS::FrameInfo frame_info;
-  frame_info.mvp = geometry_result.transform;
-  frame_info.matrix = GetInverseMatrix();
-
-  Command cmd;
-  cmd.label = "RadialGradientFill";
-  cmd.stencil_reference = entity.GetStencilDepth();
-
-  auto options = OptionsFromPassAndEntity(pass, entity);
-  if (geometry_result.prevent_overdraw) {
-    options.stencil_compare = CompareFunction::kEqual;
-    options.stencil_operation = StencilOperation::kIncrementClamp;
-  }
-  options.primitive_type = geometry_result.type;
-  cmd.pipeline = renderer.GetRadialGradientFillPipeline(options);
-
-  cmd.BindVertices(geometry_result.vertex_buffer);
-  FS::BindGradientInfo(
-      cmd, pass.GetTransientsBuffer().EmplaceUniform(gradient_info));
-  SamplerDescriptor sampler_desc;
-  sampler_desc.min_filter = MinMagFilter::kLinear;
-  sampler_desc.mag_filter = MinMagFilter::kLinear;
-  FS::BindTextureSampler(
-      cmd, gradient_texture,
-      renderer.GetContext()->GetSamplerLibrary()->GetSampler(sampler_desc));
-  VS::BindFrameInfo(cmd, pass.GetTransientsBuffer().EmplaceUniform(frame_info));
-
-  if (!pass.AddCommand(std::move(cmd))) {
-    return false;
-  }
+  frame_info.matrix = GetInverseEffectTransform();
+
+  PipelineBuilderCallback pipeline_callback =
+      [&renderer](ContentContextOptions options) {
+        return renderer.GetRadialGradientFillPipeline(options);
+      };
+  return ColorSourceContents::DrawGeometry<VS>(
+      renderer, entity, pass, pipeline_callback, frame_info,
+      [this, &renderer, &gradient_texture](RenderPass& pass) {
+        FS::FragInfo frag_info;
+        frag_info.center = center_;
+        frag_info.radius = radius_;
+        frag_info.tile_mode = static_cast<Scalar>(tile_mode_);
+        frag_info.decal_border_color = decal_border_color_;
+        frag_info.texture_sampler_y_coord_scale =
+            gradient_texture->GetYCoordScale();
+        frag_info.alpha = GetOpacityFactor();
+        frag_info.half_texel =
+            Vector2(0.5 / gradient_texture->GetSize().width,
+                    0.5 / gradient_texture->GetSize().height);
+
+        SamplerDescriptor sampler_desc;
+        sampler_desc.min_filter = MinMagFilter::kLinear;
+        sampler_desc.mag_filter = MinMagFilter::kLinear;
+
+        pass.SetCommandLabel("RadialGradientFill");
+
+        FS::BindFragInfo(
+            pass, renderer.GetTransientsBuffer().EmplaceUniform(frag_info));
+        FS::BindTextureSampler(
+            pass, gradient_texture,
+            renderer.GetContext()->GetSamplerLibrary()->GetSampler(
+                sampler_desc));
+
+        return true;
+      });
+}
 
-  if (geometry_result.prevent_overdraw) {
-    auto restore = ClipRestoreContents();
-    restore.SetRestoreCoverage(GetCoverage(entity));
-    return restore.Render(renderer, entity, pass);
+bool RadialGradientContents::ApplyColorFilter(
+    const ColorFilterProc& color_filter_proc) {
+  for (Color& color : colors_) {
+    color = color_filter_proc(color);
   }
+  decal_border_color_ = color_filter_proc(decal_border_color_);
   return true;
 }
 
diff --git a/impeller/entity/contents/radial_gradient_contents.h b/impeller/entity/contents/radial_gradient_contents.h
index 6cb611d1ee68a8f4b8fa3f2122eaf498a3c47c3d..b25f3e2c85ec95a8a1ccde0d5678a27cb2919214 100644
--- a/impeller/entity/contents/radial_gradient_contents.h
+++ b/impeller/entity/contents/radial_gradient_contents.h
@@ -2,18 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_RADIAL_GRADIENT_CONTENTS_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_RADIAL_GRADIENT_CONTENTS_H_
 
-#include <functional>
-#include <memory>
 #include <vector>
 
-#include "flutter/fml/macros.h"
 #include "impeller/entity/contents/color_source_contents.h"
 #include "impeller/entity/entity.h"
 #include "impeller/geometry/color.h"
-#include "impeller/geometry/gradient.h"
-#include "impeller/geometry/path.h"
 #include "impeller/geometry/point.h"
 
 namespace impeller {
@@ -24,11 +20,18 @@ class RadialGradientContents final : public ColorSourceContents {
 
   ~RadialGradientContents() override;
 
+  // |Contents|
+  bool IsOpaque() const override;
+
   // |Contents|
   bool Render(const ContentContext& renderer,
               const Entity& entity,
               RenderPass& pass) const override;
 
+  // |Contents|
+  [[nodiscard]] bool ApplyColorFilter(
+      const ColorFilterProc& color_filter_proc) override;
+
   void SetCenterAndRadius(Point center, Scalar radius);
 
   void SetColors(std::vector<Color> colors);
@@ -54,8 +57,13 @@ class RadialGradientContents final : public ColorSourceContents {
   std::vector<Color> colors_;
   std::vector<Scalar> stops_;
   Entity::TileMode tile_mode_;
+  Color decal_border_color_ = Color::BlackTransparent();
+
+  RadialGradientContents(const RadialGradientContents&) = delete;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(RadialGradientContents);
+  RadialGradientContents& operator=(const RadialGradientContents&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_RADIAL_GRADIENT_CONTENTS_H_
diff --git a/impeller/entity/contents/rrect_shadow_contents.cc b/impeller/entity/contents/rrect_shadow_contents.cc
deleted file mode 100644
index b1c65b9e58755d64774252e722b4e71bc5418fe3..0000000000000000000000000000000000000000
--- a/impeller/entity/contents/rrect_shadow_contents.cc
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "impeller/entity/contents/rrect_shadow_contents.h"
-#include <optional>
-
-#include "impeller/entity/contents/content_context.h"
-#include "impeller/entity/entity.h"
-#include "impeller/geometry/path.h"
-#include "impeller/geometry/path_builder.h"
-#include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/vertex_buffer_builder.h"
-#include "impeller/tessellator/tessellator.h"
-
-namespace impeller {
-
-RRectShadowContents::RRectShadowContents() = default;
-
-RRectShadowContents::~RRectShadowContents() = default;
-
-void RRectShadowContents::SetRRect(std::optional<Rect> rect,
-                                   Scalar corner_radius) {
-  rect_ = rect;
-  corner_radius_ = corner_radius;
-}
-
-void RRectShadowContents::SetSigma(Sigma sigma) {
-  sigma_ = sigma;
-}
-
-void RRectShadowContents::SetColor(Color color) {
-  color_ = color.Premultiply();
-}
-
-std::optional<Rect> RRectShadowContents::GetCoverage(
-    const Entity& entity) const {
-  if (!rect_.has_value()) {
-    return std::nullopt;
-  }
-
-  Scalar radius = Radius{sigma_}.radius;
-
-  auto ltrb = rect_->GetLTRB();
-  Rect bounds = Rect::MakeLTRB(ltrb[0] - radius, ltrb[1] - radius,
-                               ltrb[2] + radius, ltrb[3] + radius);
-  return bounds.TransformBounds(entity.GetTransformation());
-};
-
-bool RRectShadowContents::Render(const ContentContext& renderer,
-                                 const Entity& entity,
-                                 RenderPass& pass) const {
-  if (!rect_.has_value()) {
-    return true;
-  }
-
-  using VS = RRectBlurPipeline::VertexShader;
-  using FS = RRectBlurPipeline::FragmentShader;
-
-  VertexBufferBuilder<VS::PerVertexData> vtx_builder;
-
-  auto blur_radius = Radius{sigma_}.radius;
-  auto positive_rect = rect_->GetPositive();
-  {
-    auto left = -blur_radius;
-    auto top = -blur_radius;
-    auto right = positive_rect.size.width + blur_radius;
-    auto bottom = positive_rect.size.height + blur_radius;
-
-    vtx_builder.AddVertices({
-        {Point(left, top)},
-        {Point(right, top)},
-        {Point(left, bottom)},
-        {Point(left, bottom)},
-        {Point(right, top)},
-        {Point(right, bottom)},
-    });
-  }
-
-  Command cmd;
-  cmd.label = "RRect Shadow";
-  auto opts = OptionsFromPassAndEntity(pass, entity);
-  opts.primitive_type = PrimitiveType::kTriangle;
-  cmd.pipeline = renderer.GetRRectBlurPipeline(opts);
-  cmd.stencil_reference = entity.GetStencilDepth();
-
-  cmd.BindVertices(vtx_builder.CreateVertexBuffer(pass.GetTransientsBuffer()));
-
-  VS::VertInfo vert_info;
-  vert_info.mvp = Matrix::MakeOrthographic(pass.GetRenderTargetSize()) *
-                  entity.GetTransformation() *
-                  Matrix::MakeTranslation({positive_rect.origin});
-  VS::BindVertInfo(cmd, pass.GetTransientsBuffer().EmplaceUniform(vert_info));
-
-  FS::FragInfo frag_info;
-  frag_info.color = color_;
-  frag_info.blur_sigma = sigma_.sigma;
-  frag_info.rect_size = Point(positive_rect.size);
-  frag_info.corner_radius =
-      std::min(corner_radius_, std::min(positive_rect.size.width / 2.0f,
-                                        positive_rect.size.height / 2.0f));
-  FS::BindFragInfo(cmd, pass.GetTransientsBuffer().EmplaceUniform(frag_info));
-
-  if (!pass.AddCommand(std::move(cmd))) {
-    return false;
-  }
-
-  return true;
-}
-
-}  // namespace impeller
diff --git a/impeller/entity/contents/runtime_effect_contents.cc b/impeller/entity/contents/runtime_effect_contents.cc
index 3e1033590cdffab4f1c391b3688d27cb0d15bd27..423cbdcb956376a9a08b51526d24ad5eb3eb4c33 100644
--- a/impeller/entity/contents/runtime_effect_contents.cc
+++ b/impeller/entity/contents/runtime_effect_contents.cc
@@ -10,15 +10,15 @@
 #include "flutter/fml/logging.h"
 #include "flutter/fml/make_copyable.h"
 #include "impeller/base/validation.h"
-#include "impeller/entity/contents/clip_contents.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/runtime_types.h"
+#include "impeller/core/shader_types.h"
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/runtime_effect.vert.h"
-#include "impeller/renderer/formats.h"
+#include "impeller/renderer/capabilities.h"
 #include "impeller/renderer/pipeline_library.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_library.h"
 #include "impeller/renderer/shader_function.h"
-#include "impeller/renderer/shader_types.h"
 
 namespace impeller {
 
@@ -37,11 +37,39 @@ void RuntimeEffectContents::SetTextureInputs(
   texture_inputs_ = std::move(texture_inputs);
 }
 
+bool RuntimeEffectContents::CanInheritOpacity(const Entity& entity) const {
+  return false;
+}
+
+static ShaderType GetShaderType(RuntimeUniformType type) {
+  switch (type) {
+    case kSampledImage:
+      return ShaderType::kSampledImage;
+    case kFloat:
+      return ShaderType::kFloat;
+    case kStruct:
+      return ShaderType::kStruct;
+  }
+}
+
+static std::shared_ptr<ShaderMetadata> MakeShaderMetadata(
+    const RuntimeUniformDescription& uniform) {
+  auto metadata = std::make_shared<ShaderMetadata>();
+  metadata->name = uniform.name;
+  metadata->members.emplace_back(ShaderStructMemberMetadata{
+      .type = GetShaderType(uniform.type),
+      .size = uniform.GetSize(),
+      .byte_length = uniform.bit_width / 8,
+  });
+
+  return metadata;
+}
+
 bool RuntimeEffectContents::Render(const ContentContext& renderer,
                                    const Entity& entity,
                                    RenderPass& pass) const {
-  auto context = renderer.GetContext();
-  auto library = context->GetShaderLibrary();
+  const std::shared_ptr<Context>& context = renderer.GetContext();
+  const std::shared_ptr<ShaderLibrary>& library = context->GetShaderLibrary();
 
   //--------------------------------------------------------------------------
   /// Get or register shader.
@@ -52,7 +80,12 @@ bool RuntimeEffectContents::Render(const ContentContext& renderer,
   std::shared_ptr<const ShaderFunction> function = library->GetFunction(
       runtime_stage_->GetEntrypoint(), ShaderStage::kFragment);
 
+  //--------------------------------------------------------------------------
+  /// Resolve runtime stage function.
+  ///
+
   if (function && runtime_stage_->IsDirty()) {
+    renderer.ClearCachedRuntimeEffectPipeline(runtime_stage_->GetEntrypoint());
     context->GetPipelineLibrary()->RemovePipelinesWithEntryPoint(function);
     library->UnregisterFunction(runtime_stage_->GetEntrypoint(),
                                 ShaderStage::kFragment);
@@ -92,132 +125,199 @@ bool RuntimeEffectContents::Render(const ContentContext& renderer,
   }
 
   //--------------------------------------------------------------------------
-  /// Resolve geometry.
+  /// Set up the command. Defer setting up the pipeline until the descriptor set
+  /// layouts are known from the uniforms.
   ///
 
-  auto geometry_result =
-      GetGeometry()->GetPositionBuffer(renderer, entity, pass);
-
-  //--------------------------------------------------------------------------
-  /// Get or create runtime stage pipeline.
-  ///
+  const std::shared_ptr<const Capabilities>& caps = context->GetCapabilities();
+  const auto color_attachment_format = caps->GetDefaultColorFormat();
+  const auto stencil_attachment_format = caps->GetDefaultDepthStencilFormat();
 
   using VS = RuntimeEffectVertexShader;
-  PipelineDescriptor desc;
-  desc.SetLabel("Runtime Stage");
-  desc.AddStageEntrypoint(
-      library->GetFunction(VS::kEntrypointName, ShaderStage::kVertex));
-  desc.AddStageEntrypoint(library->GetFunction(runtime_stage_->GetEntrypoint(),
-                                               ShaderStage::kFragment));
-  auto vertex_descriptor = std::make_shared<VertexDescriptor>();
-  if (!vertex_descriptor->SetStageInputs(VS::kAllShaderStageInputs)) {
-    VALIDATION_LOG << "Failed to set stage inputs for runtime effect pipeline.";
-  }
-  desc.SetVertexDescriptor(std::move(vertex_descriptor));
-  desc.SetColorAttachmentDescriptor(
-      0u, {.format = PixelFormat::kDefaultColor, .blending_enabled = true});
-  desc.SetStencilAttachmentDescriptors({});
-  desc.SetStencilPixelFormat(PixelFormat::kDefaultStencil);
-
-  auto options = OptionsFromPassAndEntity(pass, entity);
-  if (geometry_result.prevent_overdraw) {
-    options.stencil_compare = CompareFunction::kEqual;
-    options.stencil_operation = StencilOperation::kIncrementClamp;
-  }
-  options.primitive_type = geometry_result.type;
-  options.ApplyToPipelineDescriptor(desc);
-
-  auto pipeline = context->GetPipelineLibrary()->GetPipeline(desc).Get();
-  if (!pipeline) {
-    VALIDATION_LOG << "Failed to get or create runtime effect pipeline.";
-    return false;
-  }
-
-  Command cmd;
-  cmd.label = "RuntimeEffectContents";
-  cmd.pipeline = pipeline;
-  cmd.stencil_reference = entity.GetStencilDepth();
-  cmd.BindVertices(geometry_result.vertex_buffer);
-
-  //--------------------------------------------------------------------------
-  /// Vertex stage uniforms.
-  ///
-
-  VS::VertInfo frame_info;
-  frame_info.mvp = geometry_result.transform;
-  VS::BindVertInfo(cmd, pass.GetTransientsBuffer().EmplaceUniform(frame_info));
 
   //--------------------------------------------------------------------------
   /// Fragment stage uniforms.
   ///
 
-  size_t buffer_index = 0;
-  size_t buffer_offset = 0;
-  size_t sampler_index = 0;
-  for (auto uniform : runtime_stage_->GetUniforms()) {
-    // TODO(113715): Populate this metadata once GLES is able to handle
-    //               non-struct uniform names.
-    ShaderMetadata metadata;
-
-    switch (uniform.type) {
-      case kSampledImage: {
-        FML_DCHECK(sampler_index < texture_inputs_.size());
-        auto& input = texture_inputs_[sampler_index];
-
-        auto sampler =
-            context->GetSamplerLibrary()->GetSampler(input.sampler_descriptor);
-
-        SampledImageSlot image_slot;
-        image_slot.name = uniform.name.c_str();
-        image_slot.texture_index = sampler_index;
-        image_slot.sampler_index = sampler_index;
-        cmd.BindResource(ShaderStage::kFragment, image_slot, metadata,
-                         input.texture, sampler);
-
-        sampler_index++;
-        break;
+  std::vector<DescriptorSetLayout> descriptor_set_layouts;
+
+  BindFragmentCallback bind_callback = [this, &renderer, &context,
+                                        &descriptor_set_layouts](
+                                           RenderPass& pass) {
+    descriptor_set_layouts.clear();
+
+    size_t minimum_sampler_index = 100000000;
+    size_t buffer_index = 0;
+    size_t buffer_offset = 0;
+
+    for (const auto& uniform : runtime_stage_->GetUniforms()) {
+      std::shared_ptr<ShaderMetadata> metadata = MakeShaderMetadata(uniform);
+
+      switch (uniform.type) {
+        case kSampledImage: {
+          // Sampler uniforms are ordered in the IPLR according to their
+          // declaration and the uniform location reflects the correct offset to
+          // be mapped to - except that it may include all proceeding float
+          // uniforms. For example, a float sampler that comes after 4 float
+          // uniforms may have a location of 4. To convert to the actual offset
+          // we need to find the largest location assigned to a float uniform
+          // and then subtract this from all uniform locations. This is more or
+          // less the same operation we previously performed in the shader
+          // compiler.
+          minimum_sampler_index =
+              std::min(minimum_sampler_index, uniform.location);
+          break;
+        }
+        case kFloat: {
+          FML_DCHECK(renderer.GetContext()->GetBackendType() !=
+                     Context::BackendType::kVulkan)
+              << "Uniform " << uniform.name
+              << " had unexpected type kFloat for Vulkan backend.";
+          size_t alignment =
+              std::max(uniform.bit_width / 8, DefaultUniformAlignment());
+          auto buffer_view = renderer.GetTransientsBuffer().Emplace(
+              uniform_data_->data() + buffer_offset, uniform.GetSize(),
+              alignment);
+
+          ShaderUniformSlot uniform_slot;
+          uniform_slot.name = uniform.name.c_str();
+          uniform_slot.ext_res_0 = uniform.location;
+          pass.BindResource(ShaderStage::kFragment,
+                            DescriptorType::kUniformBuffer, uniform_slot,
+                            metadata, buffer_view);
+          buffer_index++;
+          buffer_offset += uniform.GetSize();
+          break;
+        }
+        case kStruct: {
+          FML_DCHECK(renderer.GetContext()->GetBackendType() ==
+                     Context::BackendType::kVulkan);
+          descriptor_set_layouts.emplace_back(DescriptorSetLayout{
+              static_cast<uint32_t>(uniform.location),
+              DescriptorType::kUniformBuffer,
+              ShaderStage::kFragment,
+          });
+          ShaderUniformSlot uniform_slot;
+          uniform_slot.name = uniform.name.c_str();
+          uniform_slot.binding = uniform.location;
+
+          std::vector<float> uniform_buffer;
+          uniform_buffer.reserve(uniform.struct_layout.size());
+          size_t uniform_byte_index = 0u;
+          for (const auto& byte_type : uniform.struct_layout) {
+            if (byte_type == 0) {
+              uniform_buffer.push_back(0.f);
+            } else if (byte_type == 1) {
+              uniform_buffer.push_back(reinterpret_cast<float*>(
+                  uniform_data_->data())[uniform_byte_index++]);
+            } else {
+              FML_UNREACHABLE();
+            }
+          }
+
+          size_t alignment = std::max(sizeof(float) * uniform_buffer.size(),
+                                      DefaultUniformAlignment());
+
+          auto buffer_view = renderer.GetTransientsBuffer().Emplace(
+              reinterpret_cast<const void*>(uniform_buffer.data()),
+              sizeof(float) * uniform_buffer.size(), alignment);
+          pass.BindResource(ShaderStage::kFragment,
+                            DescriptorType::kUniformBuffer, uniform_slot,
+                            ShaderMetadata{}, buffer_view);
+        }
       }
-      case kFloat: {
-        size_t alignment =
-            std::max(uniform.bit_width / 8, DefaultUniformAlignment());
-        auto buffer_view = pass.GetTransientsBuffer().Emplace(
-            uniform_data_->data() + buffer_offset, uniform.GetSize(),
-            alignment);
-
-        ShaderUniformSlot uniform_slot;
-        uniform_slot.name = uniform.name.c_str();
-        uniform_slot.ext_res_0 = buffer_index;
-        cmd.BindResource(ShaderStage::kFragment, uniform_slot, metadata,
-                         buffer_view);
-        buffer_index++;
-        buffer_offset += uniform.GetSize();
-        break;
+    }
+
+    size_t sampler_index = 0;
+    for (const auto& uniform : runtime_stage_->GetUniforms()) {
+      std::shared_ptr<ShaderMetadata> metadata = MakeShaderMetadata(uniform);
+
+      switch (uniform.type) {
+        case kSampledImage: {
+          FML_DCHECK(sampler_index < texture_inputs_.size());
+          auto& input = texture_inputs_[sampler_index];
+
+          const std::unique_ptr<const Sampler>& sampler =
+              context->GetSamplerLibrary()->GetSampler(
+                  input.sampler_descriptor);
+
+          SampledImageSlot image_slot;
+          image_slot.name = uniform.name.c_str();
+
+          uint32_t sampler_binding_location = 0u;
+          if (!descriptor_set_layouts.empty()) {
+            sampler_binding_location =
+                descriptor_set_layouts.back().binding + 1;
+          }
+
+          descriptor_set_layouts.emplace_back(DescriptorSetLayout{
+              sampler_binding_location,
+              DescriptorType::kSampledImage,
+              ShaderStage::kFragment,
+          });
+
+          image_slot.binding = sampler_binding_location;
+          image_slot.texture_index = uniform.location - minimum_sampler_index;
+          pass.BindResource(ShaderStage::kFragment,
+                            DescriptorType::kSampledImage, image_slot,
+                            *metadata, input.texture, sampler);
+
+          sampler_index++;
+          break;
+        }
+        default:
+          continue;
       }
-      case kBoolean:
-      case kSignedByte:
-      case kUnsignedByte:
-      case kSignedShort:
-      case kUnsignedShort:
-      case kSignedInt:
-      case kUnsignedInt:
-      case kSignedInt64:
-      case kUnsignedInt64:
-      case kHalfFloat:
-      case kDouble:
-        VALIDATION_LOG << "Unsupported uniform type for " << uniform.name
-                       << ".";
-        return true;
     }
-  }
+    return true;
+  };
+
+  /// Now that the descriptor set layouts are known, get the pipeline.
+
+  PipelineBuilderCallback pipeline_callback = [&](ContentContextOptions
+                                                      options) {
+    // Pipeline creation callback for the cache handler to call.
+    auto create_callback =
+        [&]() -> std::shared_ptr<Pipeline<PipelineDescriptor>> {
+      PipelineDescriptor desc;
+      desc.SetLabel("Runtime Stage");
+      desc.AddStageEntrypoint(
+          library->GetFunction(VS::kEntrypointName, ShaderStage::kVertex));
+      desc.AddStageEntrypoint(library->GetFunction(
+          runtime_stage_->GetEntrypoint(), ShaderStage::kFragment));
+      auto vertex_descriptor = std::make_shared<VertexDescriptor>();
+      vertex_descriptor->SetStageInputs(VS::kAllShaderStageInputs,
+                                        VS::kInterleavedBufferLayout);
+      vertex_descriptor->RegisterDescriptorSetLayouts(
+          VS::kDescriptorSetLayouts);
+      vertex_descriptor->RegisterDescriptorSetLayouts(
+          descriptor_set_layouts.data(), descriptor_set_layouts.size());
+      desc.SetVertexDescriptor(std::move(vertex_descriptor));
+      desc.SetColorAttachmentDescriptor(
+          0u, {.format = color_attachment_format, .blending_enabled = true});
+
+      desc.SetStencilAttachmentDescriptors(StencilAttachmentDescriptor{});
+      desc.SetStencilPixelFormat(stencil_attachment_format);
+
+      desc.SetDepthStencilAttachmentDescriptor(DepthAttachmentDescriptor{});
+      desc.SetDepthPixelFormat(stencil_attachment_format);
+
+      options.ApplyToPipelineDescriptor(desc);
+      auto pipeline = context->GetPipelineLibrary()->GetPipeline(desc).Get();
+      if (!pipeline) {
+        VALIDATION_LOG << "Failed to get or create runtime effect pipeline.";
+        return nullptr;
+      }
 
-  pass.AddCommand(std::move(cmd));
+      return pipeline;
+    };
+    return renderer.GetCachedRuntimeEffectPipeline(
+        runtime_stage_->GetEntrypoint(), options, create_callback);
+  };
 
-  if (geometry_result.prevent_overdraw) {
-    auto restore = ClipRestoreContents();
-    restore.SetRestoreCoverage(GetCoverage(entity));
-    return restore.Render(renderer, entity, pass);
-  }
-  return true;
+  return ColorSourceContents::DrawGeometry<VS>(renderer, entity, pass,
+                                               pipeline_callback,
+                                               VS::FrameInfo{}, bind_callback);
 }
 
 }  // namespace impeller
diff --git a/impeller/entity/contents/runtime_effect_contents.h b/impeller/entity/contents/runtime_effect_contents.h
index bda791bc064f5daa140fb419475aa30f75f1d29e..c92b6eff24cb4fe47a1b47fa01b878b93609e098 100644
--- a/impeller/entity/contents/runtime_effect_contents.h
+++ b/impeller/entity/contents/runtime_effect_contents.h
@@ -2,12 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <functional>
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_RUNTIME_EFFECT_CONTENTS_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_RUNTIME_EFFECT_CONTENTS_H_
+
 #include <memory>
 #include <vector>
 
+#include "impeller/core/sampler_descriptor.h"
 #include "impeller/entity/contents/color_source_contents.h"
-#include "impeller/renderer/sampler_descriptor.h"
 #include "impeller/runtime_stage/runtime_stage.h"
 
 namespace impeller {
@@ -25,6 +27,9 @@ class RuntimeEffectContents final : public ColorSourceContents {
 
   void SetTextureInputs(std::vector<TextureInput> texture_inputs);
 
+  // | Contents|
+  bool CanInheritOpacity(const Entity& entity) const override;
+
   // |Contents|
   bool Render(const ContentContext& renderer,
               const Entity& entity,
@@ -37,3 +42,5 @@ class RuntimeEffectContents final : public ColorSourceContents {
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_RUNTIME_EFFECT_CONTENTS_H_
diff --git a/impeller/entity/contents/scene_contents.cc b/impeller/entity/contents/scene_contents.cc
new file mode 100644
index 0000000000000000000000000000000000000000..602821a6d237b73b7df0366b9b3a835055551f35
--- /dev/null
+++ b/impeller/entity/contents/scene_contents.cc
@@ -0,0 +1,105 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/entity/contents/scene_contents.h"
+
+#include "impeller/core/formats.h"
+#include "impeller/entity/contents/content_context.h"
+#include "impeller/entity/contents/tiled_texture_contents.h"
+#include "impeller/entity/entity.h"
+#include "impeller/geometry/path_builder.h"
+#include "impeller/scene/camera.h"
+#include "impeller/scene/scene.h"
+
+namespace impeller {
+
+SceneContents::SceneContents() = default;
+
+SceneContents::~SceneContents() = default;
+
+void SceneContents::SetCameraTransform(Matrix matrix) {
+  camera_transform_ = matrix;
+}
+
+void SceneContents::SetNode(std::shared_ptr<scene::Node> node) {
+  node_ = std::move(node);
+}
+
+bool SceneContents::Render(const ContentContext& renderer,
+                           const Entity& entity,
+                           RenderPass& pass) const {
+  if (!node_) {
+    return true;
+  }
+
+  auto coverage = GetCoverage(entity);
+  if (!coverage.has_value()) {
+    return true;
+  }
+
+  // This happens for CoverGeometry (DrawPaint). In this situation,
+  // Draw the scene to the full layer.
+  if (coverage.value().IsMaximum()) {
+    coverage = Rect::MakeSize(pass.GetRenderTargetSize());
+  }
+
+  RenderTarget subpass_target;
+  if (renderer.GetContext()->GetCapabilities()->SupportsOffscreenMSAA()) {
+    subpass_target = renderer.GetRenderTargetCache()->CreateOffscreenMSAA(
+        *renderer.GetContext(),             // context
+        ISize(coverage.value().GetSize()),  // size
+        /*mip_count=*/1,
+        "SceneContents",  // label
+        RenderTarget::AttachmentConfigMSAA{
+            .storage_mode = StorageMode::kDeviceTransient,
+            .resolve_storage_mode = StorageMode::kDevicePrivate,
+            .load_action = LoadAction::kClear,
+            .store_action = StoreAction::kMultisampleResolve,
+        },  // color_attachment_config
+        RenderTarget::AttachmentConfig{
+            .storage_mode = StorageMode::kDeviceTransient,
+            .load_action = LoadAction::kDontCare,
+            .store_action = StoreAction::kDontCare,
+        }  // stencil_attachment_config
+    );
+  } else {
+    subpass_target = renderer.GetRenderTargetCache()->CreateOffscreen(
+        *renderer.GetContext(),             // context
+        ISize(coverage.value().GetSize()),  // size
+        /*mip_count=*/1,
+        "SceneContents",  // label
+        RenderTarget::AttachmentConfig{
+            .storage_mode = StorageMode::kDevicePrivate,
+            .load_action = LoadAction::kClear,
+            .store_action = StoreAction::kStore,
+        },  // color_attachment_config
+        RenderTarget::AttachmentConfig{
+            .storage_mode = StorageMode::kDeviceTransient,
+            .load_action = LoadAction::kClear,
+            .store_action = StoreAction::kDontCare,
+        }  // stencil_attachment_config
+    );
+  }
+
+  if (!subpass_target.IsValid()) {
+    return false;
+  }
+
+  scene::Scene scene(renderer.GetSceneContext());
+  scene.GetRoot().AddChild(node_);
+
+  if (!scene.Render(subpass_target, camera_transform_)) {
+    return false;
+  }
+
+  // Render the texture to the pass.
+  TiledTextureContents contents;
+  contents.SetGeometry(GetGeometry());
+  contents.SetTexture(subpass_target.GetRenderTargetTexture());
+  contents.SetEffectTransform(
+      Matrix::MakeScale(1 / entity.GetTransform().GetScale()));
+  return contents.Render(renderer, entity, pass);
+}
+
+}  // namespace impeller
diff --git a/impeller/entity/contents/scene_contents.h b/impeller/entity/contents/scene_contents.h
new file mode 100644
index 0000000000000000000000000000000000000000..e5b249baf97ffa0837c72d09c6d62d9e3ff69bb7
--- /dev/null
+++ b/impeller/entity/contents/scene_contents.h
@@ -0,0 +1,44 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_SCENE_CONTENTS_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_SCENE_CONTENTS_H_
+
+#if !IMPELLER_ENABLE_3D
+static_assert(false);
+#endif
+
+#include <memory>
+
+#include "impeller/entity/contents/color_source_contents.h"
+
+#include "impeller/geometry/matrix.h"
+#include "impeller/geometry/rect.h"
+#include "impeller/scene/node.h"
+
+namespace impeller {
+
+class SceneContents final : public ColorSourceContents {
+ public:
+  SceneContents();
+
+  ~SceneContents() override;
+
+  void SetCameraTransform(Matrix matrix);
+
+  void SetNode(std::shared_ptr<scene::Node> node);
+
+  // |Contents|
+  bool Render(const ContentContext& renderer,
+              const Entity& entity,
+              RenderPass& pass) const override;
+
+ private:
+  Matrix camera_transform_;
+  std::shared_ptr<scene::Node> node_;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_SCENE_CONTENTS_H_
diff --git a/impeller/entity/contents/solid_color_contents.cc b/impeller/entity/contents/solid_color_contents.cc
index 032b06ed1248871d25bad6c289dc489542f0f109..083ac7d61ec38c2d36f8fa486621de08dcbbc516 100644
--- a/impeller/entity/contents/solid_color_contents.cc
+++ b/impeller/entity/contents/solid_color_contents.cc
@@ -4,9 +4,9 @@
 
 #include "solid_color_contents.h"
 
-#include "impeller/entity/contents/clip_contents.h"
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/entity.h"
+#include "impeller/entity/geometry/geometry.h"
 #include "impeller/geometry/path.h"
 #include "impeller/renderer/render_pass.h"
 
@@ -20,74 +20,50 @@ void SolidColorContents::SetColor(Color color) {
   color_ = color;
 }
 
-const Color& SolidColorContents::GetColor() const {
-  return color_;
+Color SolidColorContents::GetColor() const {
+  return color_.WithAlpha(color_.alpha * GetOpacityFactor());
 }
 
-void SolidColorContents::SetGeometry(std::unique_ptr<Geometry> geometry) {
-  geometry_ = std::move(geometry);
+bool SolidColorContents::IsSolidColor() const {
+  return true;
+}
+
+bool SolidColorContents::IsOpaque() const {
+  return GetColor().IsOpaque();
 }
 
 std::optional<Rect> SolidColorContents::GetCoverage(
     const Entity& entity) const {
-  if (color_.IsTransparent()) {
+  if (GetColor().IsTransparent()) {
     return std::nullopt;
   }
-  if (geometry_ == nullptr) {
+
+  const std::shared_ptr<Geometry>& geometry = GetGeometry();
+  if (geometry == nullptr) {
     return std::nullopt;
   }
-  return geometry_->GetCoverage(entity.GetTransformation());
+  return geometry->GetCoverage(entity.GetTransform());
 };
 
-bool SolidColorContents::ShouldRender(
-    const Entity& entity,
-    const std::optional<Rect>& stencil_coverage) const {
-  if (!stencil_coverage.has_value()) {
-    return false;
-  }
-  return Contents::ShouldRender(entity, stencil_coverage);
-}
-
 bool SolidColorContents::Render(const ContentContext& renderer,
                                 const Entity& entity,
                                 RenderPass& pass) const {
+  auto capture = entity.GetCapture().CreateChild("SolidColorContents");
   using VS = SolidFillPipeline::VertexShader;
-  using FS = SolidFillPipeline::FragmentShader;
-
-  Command cmd;
-  cmd.label = "Solid Fill";
-  cmd.stencil_reference = entity.GetStencilDepth();
-
-  auto geometry_result = geometry_->GetPositionBuffer(renderer, entity, pass);
-
-  auto options = OptionsFromPassAndEntity(pass, entity);
-  if (geometry_result.prevent_overdraw) {
-    options.stencil_compare = CompareFunction::kEqual;
-    options.stencil_operation = StencilOperation::kIncrementClamp;
-  }
-
-  options.primitive_type = geometry_result.type;
-  cmd.pipeline = renderer.GetSolidFillPipeline(options);
-  cmd.BindVertices(geometry_result.vertex_buffer);
 
-  VS::VertInfo vert_info;
-  vert_info.mvp = geometry_result.transform;
-  VS::BindVertInfo(cmd, pass.GetTransientsBuffer().EmplaceUniform(vert_info));
-
-  FS::FragInfo frag_info;
-  frag_info.color = color_.Premultiply();
-  FS::BindFragInfo(cmd, pass.GetTransientsBuffer().EmplaceUniform(frag_info));
-
-  if (!pass.AddCommand(std::move(cmd))) {
-    return false;
-  }
-
-  if (geometry_result.prevent_overdraw) {
-    auto restore = ClipRestoreContents();
-    restore.SetRestoreCoverage(GetCoverage(entity));
-    return restore.Render(renderer, entity, pass);
-  }
-  return true;
+  VS::FrameInfo frame_info;
+  frame_info.color = capture.AddColor("Color", GetColor()).Premultiply();
+
+  PipelineBuilderCallback pipeline_callback =
+      [&renderer](ContentContextOptions options) {
+        return renderer.GetSolidFillPipeline(options);
+      };
+  return ColorSourceContents::DrawGeometry<VS>(
+      renderer, entity, pass, pipeline_callback, frame_info,
+      [](RenderPass& pass) {
+        pass.SetCommandLabel("Solid Fill");
+        return true;
+      });
 }
 
 std::unique_ptr<SolidColorContents> SolidColorContents::Make(const Path& path,
@@ -98,4 +74,19 @@ std::unique_ptr<SolidColorContents> SolidColorContents::Make(const Path& path,
   return contents;
 }
 
+std::optional<Color> SolidColorContents::AsBackgroundColor(
+    const Entity& entity,
+    ISize target_size) const {
+  Rect target_rect = Rect::MakeSize(target_size);
+  return GetGeometry()->CoversArea(entity.GetTransform(), target_rect)
+             ? GetColor()
+             : std::optional<Color>();
+}
+
+bool SolidColorContents::ApplyColorFilter(
+    const ColorFilterProc& color_filter_proc) {
+  color_ = color_filter_proc(color_);
+  return true;
+}
+
 }  // namespace impeller
diff --git a/impeller/entity/contents/solid_color_contents.h b/impeller/entity/contents/solid_color_contents.h
index e43e7292a74520bbc75e8a370c7a9fad6dc5d1a4..59358ac68f3f485a19df1a2cc069d4f266cec5c8 100644
--- a/impeller/entity/contents/solid_color_contents.h
+++ b/impeller/entity/contents/solid_color_contents.h
@@ -2,15 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_SOLID_COLOR_CONTENTS_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_SOLID_COLOR_CONTENTS_H_
 
-#include <functional>
 #include <memory>
-#include <vector>
 
-#include "flutter/fml/macros.h"
+#include "impeller/entity/contents/color_source_contents.h"
 #include "impeller/entity/contents/contents.h"
-#include "impeller/entity/geometry.h"
 #include "impeller/geometry/color.h"
 #include "impeller/geometry/path.h"
 
@@ -20,7 +18,7 @@ class Path;
 class HostBuffer;
 struct VertexBuffer;
 
-class SolidColorContents final : public Contents {
+class SolidColorContents final : public ColorSourceContents {
  public:
   SolidColorContents();
 
@@ -29,30 +27,39 @@ class SolidColorContents final : public Contents {
   static std::unique_ptr<SolidColorContents> Make(const Path& path,
                                                   Color color);
 
-  void SetGeometry(std::unique_ptr<Geometry> geometry);
-
   void SetColor(Color color);
 
-  const Color& GetColor() const;
+  Color GetColor() const;
+
+  // |ColorSourceContents|
+  bool IsSolidColor() const override;
 
   // |Contents|
-  std::optional<Rect> GetCoverage(const Entity& entity) const override;
+  bool IsOpaque() const override;
 
   // |Contents|
-  bool ShouldRender(const Entity& entity,
-                    const std::optional<Rect>& stencil_coverage) const override;
+  std::optional<Rect> GetCoverage(const Entity& entity) const override;
 
   // |Contents|
   bool Render(const ContentContext& renderer,
               const Entity& entity,
               RenderPass& pass) const override;
 
- private:
-  std::unique_ptr<Geometry> geometry_;
+  std::optional<Color> AsBackgroundColor(const Entity& entity,
+                                         ISize target_size) const override;
 
+  // |Contents|
+  [[nodiscard]] bool ApplyColorFilter(
+      const ColorFilterProc& color_filter_proc) override;
+
+ private:
   Color color_;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(SolidColorContents);
+  SolidColorContents(const SolidColorContents&) = delete;
+
+  SolidColorContents& operator=(const SolidColorContents&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_SOLID_COLOR_CONTENTS_H_
diff --git a/impeller/entity/contents/solid_rrect_blur_contents.cc b/impeller/entity/contents/solid_rrect_blur_contents.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a38a462563d752f98825b253aa0e17466fedd87e
--- /dev/null
+++ b/impeller/entity/contents/solid_rrect_blur_contents.cc
@@ -0,0 +1,138 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/entity/contents/solid_rrect_blur_contents.h"
+#include <optional>
+
+#include "impeller/entity/contents/content_context.h"
+#include "impeller/entity/entity.h"
+#include "impeller/geometry/color.h"
+#include "impeller/geometry/constants.h"
+#include "impeller/renderer/render_pass.h"
+#include "impeller/renderer/vertex_buffer_builder.h"
+
+namespace impeller {
+
+namespace {
+// Generous padding to make sure blurs with large sigmas are fully visible.
+// Used to expand the geometry around the rrect.
+Scalar PadForSigma(Scalar sigma) {
+  return sigma * 4.0;
+}
+}  // namespace
+
+SolidRRectBlurContents::SolidRRectBlurContents() = default;
+
+SolidRRectBlurContents::~SolidRRectBlurContents() = default;
+
+void SolidRRectBlurContents::SetRRect(std::optional<Rect> rect,
+                                      Size corner_radii) {
+  rect_ = rect;
+  corner_radii_ = corner_radii;
+}
+
+void SolidRRectBlurContents::SetSigma(Sigma sigma) {
+  sigma_ = sigma;
+}
+
+void SolidRRectBlurContents::SetColor(Color color) {
+  color_ = color.Premultiply();
+}
+
+Color SolidRRectBlurContents::GetColor() const {
+  return color_;
+}
+
+std::optional<Rect> SolidRRectBlurContents::GetCoverage(
+    const Entity& entity) const {
+  if (!rect_.has_value()) {
+    return std::nullopt;
+  }
+
+  Scalar radius = PadForSigma(sigma_.sigma);
+
+  return rect_->Expand(radius).TransformBounds(entity.GetTransform());
+}
+
+bool SolidRRectBlurContents::Render(const ContentContext& renderer,
+                                    const Entity& entity,
+                                    RenderPass& pass) const {
+  if (!rect_.has_value()) {
+    return true;
+  }
+
+  using VS = RRectBlurPipeline::VertexShader;
+  using FS = RRectBlurPipeline::FragmentShader;
+
+  VertexBufferBuilder<VS::PerVertexData> vtx_builder;
+
+  // Clamp the max kernel width/height to 1000 to limit the extent
+  // of the blur and to kEhCloseEnough to prevent NaN calculations
+  // trying to evaluate a Guassian distribution with a sigma of 0.
+  auto blur_sigma = std::clamp(sigma_.sigma, kEhCloseEnough, 250.0f);
+  // Increase quality by making the radius a bit bigger than the typical
+  // sigma->radius conversion we use for slower blurs.
+  auto blur_radius = PadForSigma(blur_sigma);
+  auto positive_rect = rect_->GetPositive();
+  {
+    auto left = -blur_radius;
+    auto top = -blur_radius;
+    auto right = positive_rect.GetWidth() + blur_radius;
+    auto bottom = positive_rect.GetHeight() + blur_radius;
+
+    vtx_builder.AddVertices({
+        {Point(left, top)},
+        {Point(right, top)},
+        {Point(left, bottom)},
+        {Point(right, bottom)},
+    });
+  }
+
+  ContentContextOptions opts = OptionsFromPassAndEntity(pass, entity);
+  opts.primitive_type = PrimitiveType::kTriangleStrip;
+  Color color = color_;
+  if (entity.GetBlendMode() == BlendMode::kClear) {
+    opts.is_for_rrect_blur_clear = true;
+    color = Color::White();
+  }
+
+  VS::FrameInfo frame_info;
+  frame_info.mvp = Entity::GetShaderTransform(
+      entity.GetShaderClipDepth(), pass,
+      entity.GetTransform() *
+          Matrix::MakeTranslation(positive_rect.GetOrigin()));
+
+  FS::FragInfo frag_info;
+  frag_info.color = color;
+  frag_info.blur_sigma = blur_sigma;
+  frag_info.rect_size = Point(positive_rect.GetSize());
+  frag_info.corner_radii = {std::clamp(corner_radii_.width, kEhCloseEnough,
+                                       positive_rect.GetWidth() * 0.5f),
+                            std::clamp(corner_radii_.width, kEhCloseEnough,
+                                       positive_rect.GetHeight() * 0.5f)};
+
+  pass.SetCommandLabel("RRect Shadow");
+  pass.SetPipeline(renderer.GetRRectBlurPipeline(opts));
+  pass.SetStencilReference(entity.GetClipDepth());
+  pass.SetVertexBuffer(
+      vtx_builder.CreateVertexBuffer(renderer.GetTransientsBuffer()));
+  VS::BindFrameInfo(pass,
+                    renderer.GetTransientsBuffer().EmplaceUniform(frame_info));
+  FS::BindFragInfo(pass,
+                   renderer.GetTransientsBuffer().EmplaceUniform(frag_info));
+
+  if (!pass.Draw().ok()) {
+    return false;
+  }
+
+  return true;
+}
+
+bool SolidRRectBlurContents::ApplyColorFilter(
+    const ColorFilterProc& color_filter_proc) {
+  color_ = color_filter_proc(color_);
+  return true;
+}
+
+}  // namespace impeller
diff --git a/impeller/entity/contents/rrect_shadow_contents.h b/impeller/entity/contents/solid_rrect_blur_contents.h
similarity index 47%
rename from impeller/entity/contents/rrect_shadow_contents.h
rename to impeller/entity/contents/solid_rrect_blur_contents.h
index d6d46b7f5223a77677d5715cfcacf895e87574c3..f396d0487aba010e0930ed042a56b6a05fb90c9f 100644
--- a/impeller/entity/contents/rrect_shadow_contents.h
+++ b/impeller/entity/contents/solid_rrect_blur_contents.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_SOLID_RRECT_BLUR_CONTENTS_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_SOLID_RRECT_BLUR_CONTENTS_H_
 
 #include <functional>
 #include <memory>
@@ -18,18 +19,23 @@ class Path;
 class HostBuffer;
 struct VertexBuffer;
 
-class RRectShadowContents final : public Contents {
+/// @brief  Draws a fast solid color blur of an rounded rectangle. Only supports
+/// RRects with fully symmetrical radii. Also produces correct results for
+/// rectangles (corner_radius=0) and circles (corner_radius=width/2=height/2).
+class SolidRRectBlurContents final : public Contents {
  public:
-  RRectShadowContents();
+  SolidRRectBlurContents();
 
-  ~RRectShadowContents() override;
+  ~SolidRRectBlurContents() override;
 
-  void SetRRect(std::optional<Rect> rect, Scalar corner_radius = 0);
+  void SetRRect(std::optional<Rect> rect, Size corner_radii = {});
 
   void SetSigma(Sigma sigma);
 
   void SetColor(Color color);
 
+  Color GetColor() const;
+
   // |Contents|
   std::optional<Rect> GetCoverage(const Entity& entity) const override;
 
@@ -38,14 +44,22 @@ class RRectShadowContents final : public Contents {
               const Entity& entity,
               RenderPass& pass) const override;
 
+  // |Contents|
+  [[nodiscard]] bool ApplyColorFilter(
+      const ColorFilterProc& color_filter_proc) override;
+
  private:
   std::optional<Rect> rect_;
-  Scalar corner_radius_;
+  Size corner_radii_;
   Sigma sigma_;
 
   Color color_;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(RRectShadowContents);
+  SolidRRectBlurContents(const SolidRRectBlurContents&) = delete;
+
+  SolidRRectBlurContents& operator=(const SolidRRectBlurContents&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_SOLID_RRECT_BLUR_CONTENTS_H_
diff --git a/impeller/entity/contents/sweep_gradient_contents.cc b/impeller/entity/contents/sweep_gradient_contents.cc
index 0e39175eccafbe9e691dabd35ac26d316214463e..3586a14b9fc75545633d62ef04b705bfe7e55382 100644
--- a/impeller/entity/contents/sweep_gradient_contents.cc
+++ b/impeller/entity/contents/sweep_gradient_contents.cc
@@ -11,7 +11,6 @@
 #include "impeller/entity/entity.h"
 #include "impeller/geometry/gradient.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_library.h"
 
 namespace impeller {
 
@@ -50,10 +49,22 @@ const std::vector<Scalar>& SweepGradientContents::GetStops() const {
   return stops_;
 }
 
+bool SweepGradientContents::IsOpaque() const {
+  if (GetOpacityFactor() < 1 || tile_mode_ == Entity::TileMode::kDecal) {
+    return false;
+  }
+  for (auto color : colors_) {
+    if (!color.IsOpaque()) {
+      return false;
+    }
+  }
+  return true;
+}
+
 bool SweepGradientContents::Render(const ContentContext& renderer,
                                    const Entity& entity,
                                    RenderPass& pass) const {
-  if (renderer.GetBackendFeatures().ssbo_support) {
+  if (renderer.GetDeviceCapabilities().SupportsSSBO()) {
     return RenderSSBO(renderer, entity, pass);
   }
   return RenderTexture(renderer, entity, pass);
@@ -65,55 +76,42 @@ bool SweepGradientContents::RenderSSBO(const ContentContext& renderer,
   using VS = SweepGradientSSBOFillPipeline::VertexShader;
   using FS = SweepGradientSSBOFillPipeline::FragmentShader;
 
-  FS::GradientInfo gradient_info;
-  gradient_info.center = center_;
-  gradient_info.bias = bias_;
-  gradient_info.scale = scale_;
-  gradient_info.tile_mode = static_cast<Scalar>(tile_mode_);
-  gradient_info.alpha = GetAlpha();
-
-  auto& host_buffer = pass.GetTransientsBuffer();
-  auto colors = CreateGradientColors(colors_, stops_).value_or(colors_);
-
-  gradient_info.colors_length = colors.size();
-  auto color_buffer = host_buffer.Emplace(
-      colors.data(), colors.size() * sizeof(Color), alignof(Color));
-
   VS::FrameInfo frame_info;
-  frame_info.mvp = Matrix::MakeOrthographic(pass.GetRenderTargetSize()) *
-                   entity.GetTransformation();
-  frame_info.matrix = GetInverseMatrix();
-
-  Command cmd;
-  cmd.label = "SweepGradientSSBOFill";
-  cmd.stencil_reference = entity.GetStencilDepth();
-  auto geometry_result =
-      GetGeometry()->GetPositionBuffer(renderer, entity, pass);
-
-  auto options = OptionsFromPassAndEntity(pass, entity);
-  if (geometry_result.prevent_overdraw) {
-    options.stencil_compare = CompareFunction::kEqual;
-    options.stencil_operation = StencilOperation::kIncrementClamp;
-  }
-  options.primitive_type = geometry_result.type;
-  cmd.pipeline = renderer.GetSweepGradientSSBOFillPipeline(options);
-
-  cmd.BindVertices(geometry_result.vertex_buffer);
-  FS::BindGradientInfo(
-      cmd, pass.GetTransientsBuffer().EmplaceUniform(gradient_info));
-  FS::BindColorData(cmd, color_buffer);
-  VS::BindFrameInfo(cmd, pass.GetTransientsBuffer().EmplaceUniform(frame_info));
-
-  if (!pass.AddCommand(std::move(cmd))) {
-    return false;
-  }
-
-  if (geometry_result.prevent_overdraw) {
-    auto restore = ClipRestoreContents();
-    restore.SetRestoreCoverage(GetCoverage(entity));
-    return restore.Render(renderer, entity, pass);
-  }
-  return true;
+  frame_info.matrix = GetInverseEffectTransform();
+  VS::BindFrameInfo(pass,
+                    renderer.GetTransientsBuffer().EmplaceUniform(frame_info));
+
+  PipelineBuilderCallback pipeline_callback =
+      [&renderer](ContentContextOptions options) {
+        return renderer.GetSweepGradientSSBOFillPipeline(options);
+      };
+  return ColorSourceContents::DrawGeometry<VS>(
+      renderer, entity, pass, pipeline_callback, frame_info,
+      [this, &renderer](RenderPass& pass) {
+        FS::FragInfo frag_info;
+        frag_info.center = center_;
+        frag_info.bias = bias_;
+        frag_info.scale = scale_;
+        frag_info.tile_mode = static_cast<Scalar>(tile_mode_);
+        frag_info.decal_border_color = decal_border_color_;
+        frag_info.alpha = GetOpacityFactor();
+
+        auto& host_buffer = renderer.GetTransientsBuffer();
+        auto colors = CreateGradientColors(colors_, stops_);
+
+        frag_info.colors_length = colors.size();
+        auto color_buffer =
+            host_buffer.Emplace(colors.data(), colors.size() * sizeof(StopData),
+                                DefaultUniformAlignment());
+
+        pass.SetCommandLabel("SweepGradientSSBOFill");
+
+        FS::BindFragInfo(
+            pass, renderer.GetTransientsBuffer().EmplaceUniform(frag_info));
+        FS::BindColorData(pass, color_buffer);
+
+        return true;
+      });
 }
 
 bool SweepGradientContents::RenderTexture(const ContentContext& renderer,
@@ -129,56 +127,52 @@ bool SweepGradientContents::RenderTexture(const ContentContext& renderer,
     return false;
   }
 
-  FS::GradientInfo gradient_info;
-  gradient_info.center = center_;
-  gradient_info.bias = bias_;
-  gradient_info.scale = scale_;
-  gradient_info.texture_sampler_y_coord_scale =
-      gradient_texture->GetYCoordScale();
-  gradient_info.tile_mode = static_cast<Scalar>(tile_mode_);
-  gradient_info.alpha = GetAlpha();
-  gradient_info.half_texel = Vector2(0.5 / gradient_texture->GetSize().width,
-                                     0.5 / gradient_texture->GetSize().height);
-
-  auto geometry_result =
-      GetGeometry()->GetPositionBuffer(renderer, entity, pass);
-
   VS::FrameInfo frame_info;
-  frame_info.mvp = geometry_result.transform;
-  frame_info.matrix = GetInverseMatrix();
-
-  Command cmd;
-  cmd.label = "SweepGradientFill";
-  cmd.stencil_reference = entity.GetStencilDepth();
-
-  auto options = OptionsFromPassAndEntity(pass, entity);
-  if (geometry_result.prevent_overdraw) {
-    options.stencil_compare = CompareFunction::kEqual;
-    options.stencil_operation = StencilOperation::kIncrementClamp;
-  }
-  options.primitive_type = geometry_result.type;
-  cmd.pipeline = renderer.GetSweepGradientFillPipeline(options);
-
-  cmd.BindVertices(geometry_result.vertex_buffer);
-  FS::BindGradientInfo(
-      cmd, pass.GetTransientsBuffer().EmplaceUniform(gradient_info));
-  VS::BindFrameInfo(cmd, pass.GetTransientsBuffer().EmplaceUniform(frame_info));
-  SamplerDescriptor sampler_desc;
-  sampler_desc.min_filter = MinMagFilter::kLinear;
-  sampler_desc.mag_filter = MinMagFilter::kLinear;
-  FS::BindTextureSampler(
-      cmd, gradient_texture,
-      renderer.GetContext()->GetSamplerLibrary()->GetSampler(sampler_desc));
-
-  if (!pass.AddCommand(std::move(cmd))) {
-    return false;
-  }
+  frame_info.matrix = GetInverseEffectTransform();
+
+  PipelineBuilderCallback pipeline_callback =
+      [&renderer](ContentContextOptions options) {
+        return renderer.GetSweepGradientFillPipeline(options);
+      };
+  return ColorSourceContents::DrawGeometry<VS>(
+      renderer, entity, pass, pipeline_callback, frame_info,
+      [this, &renderer, &gradient_texture](RenderPass& pass) {
+        FS::FragInfo frag_info;
+        frag_info.center = center_;
+        frag_info.bias = bias_;
+        frag_info.scale = scale_;
+        frag_info.texture_sampler_y_coord_scale =
+            gradient_texture->GetYCoordScale();
+        frag_info.tile_mode = static_cast<Scalar>(tile_mode_);
+        frag_info.decal_border_color = decal_border_color_;
+        frag_info.alpha = GetOpacityFactor();
+        frag_info.half_texel =
+            Vector2(0.5 / gradient_texture->GetSize().width,
+                    0.5 / gradient_texture->GetSize().height);
+
+        SamplerDescriptor sampler_desc;
+        sampler_desc.min_filter = MinMagFilter::kLinear;
+        sampler_desc.mag_filter = MinMagFilter::kLinear;
+
+        pass.SetCommandLabel("SweepGradientFill");
+
+        FS::BindFragInfo(
+            pass, renderer.GetTransientsBuffer().EmplaceUniform(frag_info));
+        FS::BindTextureSampler(
+            pass, gradient_texture,
+            renderer.GetContext()->GetSamplerLibrary()->GetSampler(
+                sampler_desc));
+
+        return true;
+      });
+}
 
-  if (geometry_result.prevent_overdraw) {
-    auto restore = ClipRestoreContents();
-    restore.SetRestoreCoverage(GetCoverage(entity));
-    return restore.Render(renderer, entity, pass);
+bool SweepGradientContents::ApplyColorFilter(
+    const ColorFilterProc& color_filter_proc) {
+  for (Color& color : colors_) {
+    color = color_filter_proc(color);
   }
+  decal_border_color_ = color_filter_proc(decal_border_color_);
   return true;
 }
 
diff --git a/impeller/entity/contents/sweep_gradient_contents.h b/impeller/entity/contents/sweep_gradient_contents.h
index 94c448cc22961c8d62656f2a946e7914b0654f6f..d46fbee8579a434de5704f27a0a634ebde0be2af 100644
--- a/impeller/entity/contents/sweep_gradient_contents.h
+++ b/impeller/entity/contents/sweep_gradient_contents.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_SWEEP_GRADIENT_CONTENTS_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_SWEEP_GRADIENT_CONTENTS_H_
 
 #include <functional>
 #include <memory>
@@ -25,11 +26,18 @@ class SweepGradientContents final : public ColorSourceContents {
 
   ~SweepGradientContents() override;
 
+  // |Contents|
+  bool IsOpaque() const override;
+
   // |Contents|
   bool Render(const ContentContext& renderer,
               const Entity& entity,
               RenderPass& pass) const override;
 
+  // |Contents|
+  [[nodiscard]] bool ApplyColorFilter(
+      const ColorFilterProc& color_filter_proc) override;
+
   void SetCenterAndAngles(Point center, Degrees start_angle, Degrees end_angle);
 
   void SetColors(std::vector<Color> colors);
@@ -57,8 +65,13 @@ class SweepGradientContents final : public ColorSourceContents {
   std::vector<Color> colors_;
   std::vector<Scalar> stops_;
   Entity::TileMode tile_mode_;
+  Color decal_border_color_ = Color::BlackTransparent();
+
+  SweepGradientContents(const SweepGradientContents&) = delete;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(SweepGradientContents);
+  SweepGradientContents& operator=(const SweepGradientContents&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_SWEEP_GRADIENT_CONTENTS_H_
diff --git a/impeller/entity/contents/test/contents_test_helpers.cc b/impeller/entity/contents/test/contents_test_helpers.cc
new file mode 100644
index 0000000000000000000000000000000000000000..4ec4301d1934617cafb35d380e3f41e205b03e39
--- /dev/null
+++ b/impeller/entity/contents/test/contents_test_helpers.cc
@@ -0,0 +1,11 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/entity/contents/test/contents_test_helpers.h"
+
+namespace impeller {
+
+//
+
+}
\ No newline at end of file
diff --git a/impeller/entity/contents/test/contents_test_helpers.h b/impeller/entity/contents/test/contents_test_helpers.h
new file mode 100644
index 0000000000000000000000000000000000000000..e5f33b19bdeefa9356954265dd8eb0e8815373e8
--- /dev/null
+++ b/impeller/entity/contents/test/contents_test_helpers.h
@@ -0,0 +1,49 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_TEST_CONTENTS_TEST_HELPERS_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_TEST_CONTENTS_TEST_HELPERS_H_
+
+#include "impeller/renderer/command.h"
+
+namespace impeller {
+
+/// @brief Retrieve the [VertInfo] struct data from the provided [command].
+template <typename T>
+typename T::VertInfo* GetVertInfo(const Command& command) {
+  auto resource = std::find_if(command.vertex_bindings.buffers.begin(),
+                               command.vertex_bindings.buffers.end(),
+                               [](const BufferAndUniformSlot& data) {
+                                 return data.slot.ext_res_0 == 0u;
+                               });
+  if (resource == command.vertex_bindings.buffers.end()) {
+    return nullptr;
+  }
+
+  auto data = (resource->view.resource.buffer->OnGetContents() +
+               resource->view.resource.range.offset);
+  return reinterpret_cast<typename T::VertInfo*>(data);
+}
+
+/// @brief Retrieve the [FragInfo] struct data from the provided [command].
+template <typename T>
+typename T::FragInfo* GetFragInfo(const Command& command) {
+  auto resource = std::find_if(command.fragment_bindings.buffers.begin(),
+                               command.fragment_bindings.buffers.end(),
+                               [](const BufferAndUniformSlot& data) {
+                                 return data.slot.ext_res_0 == 0u ||
+                                        data.slot.binding == 64;
+                               });
+  if (resource == command.fragment_bindings.buffers.end()) {
+    return nullptr;
+  }
+
+  auto data = (resource->view.resource.buffer->OnGetContents() +
+               resource->view.resource.range.offset);
+  return reinterpret_cast<typename T::FragInfo*>(data);
+}
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_TEST_CONTENTS_TEST_HELPERS_H_
diff --git a/impeller/entity/contents/test/recording_render_pass.cc b/impeller/entity/contents/test/recording_render_pass.cc
new file mode 100644
index 0000000000000000000000000000000000000000..189138135cc7040e047d588807cb9c63779aa37a
--- /dev/null
+++ b/impeller/entity/contents/test/recording_render_pass.cc
@@ -0,0 +1,150 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/entity/contents/test/recording_render_pass.h"
+
+#include <utility>
+
+namespace impeller {
+
+RecordingRenderPass::RecordingRenderPass(
+    std::shared_ptr<RenderPass> delegate,
+    const std::shared_ptr<const Context>& context,
+    const RenderTarget& render_target)
+    : RenderPass(context, render_target), delegate_(std::move(delegate)) {}
+
+// |RenderPass|
+void RecordingRenderPass::SetPipeline(
+    const std::shared_ptr<Pipeline<PipelineDescriptor>>& pipeline) {
+  pending_.pipeline = pipeline;
+  if (delegate_) {
+    delegate_->SetPipeline(pipeline);
+  }
+}
+
+void RecordingRenderPass::SetCommandLabel(std::string_view label) {
+#ifdef IMPELLER_DEBUG
+  pending_.label = std::string(label);
+#endif  // IMPELLER_DEBUG
+  if (delegate_) {
+    delegate_->SetCommandLabel(label);
+  }
+}
+
+// |RenderPass|
+void RecordingRenderPass::SetStencilReference(uint32_t value) {
+  pending_.stencil_reference = value;
+  if (delegate_) {
+    delegate_->SetStencilReference(value);
+  }
+}
+
+// |RenderPass|
+void RecordingRenderPass::SetBaseVertex(uint64_t value) {
+  pending_.base_vertex = value;
+  if (delegate_) {
+    delegate_->SetBaseVertex(value);
+  }
+}
+
+// |RenderPass|
+void RecordingRenderPass::SetViewport(Viewport viewport) {
+  pending_.viewport = viewport;
+  if (delegate_) {
+    delegate_->SetViewport(viewport);
+  }
+}
+
+// |RenderPass|
+void RecordingRenderPass::SetScissor(IRect scissor) {
+  pending_.scissor = scissor;
+  if (delegate_) {
+    delegate_->SetScissor(scissor);
+  }
+}
+
+// |RenderPass|
+void RecordingRenderPass::SetInstanceCount(size_t count) {
+  pending_.instance_count = count;
+  if (delegate_) {
+    delegate_->SetInstanceCount(count);
+  }
+}
+
+// |RenderPass|
+bool RecordingRenderPass::SetVertexBuffer(VertexBuffer buffer) {
+  pending_.vertex_buffer = buffer;
+  if (delegate_) {
+    return delegate_->SetVertexBuffer(buffer);
+  }
+  return true;
+}
+
+// |RenderPass|
+fml::Status RecordingRenderPass::Draw() {
+  commands_.emplace_back(std::move(pending_));
+  pending_ = {};
+  if (delegate_) {
+    return delegate_->Draw();
+  }
+  return fml::Status();
+}
+
+// |RenderPass|
+void RecordingRenderPass::OnSetLabel(std::string label) {
+  return;
+}
+
+// |RenderPass|
+bool RecordingRenderPass::OnEncodeCommands(const Context& context) const {
+  if (delegate_) {
+    return delegate_->EncodeCommands();
+  }
+  return true;
+}
+
+// |RenderPass|
+bool RecordingRenderPass::BindResource(ShaderStage stage,
+                                       DescriptorType type,
+                                       const ShaderUniformSlot& slot,
+                                       const ShaderMetadata& metadata,
+                                       BufferView view) {
+  pending_.BindResource(stage, type, slot, metadata, view);
+  if (delegate_) {
+    return delegate_->BindResource(stage, type, slot, metadata, view);
+  }
+  return true;
+}
+
+// |RenderPass|
+bool RecordingRenderPass::BindResource(
+    ShaderStage stage,
+    DescriptorType type,
+    const ShaderUniformSlot& slot,
+    const std::shared_ptr<const ShaderMetadata>& metadata,
+    BufferView view) {
+  pending_.BindResource(stage, type, slot, metadata, view);
+  if (delegate_) {
+    return delegate_->BindResource(stage, type, slot, metadata, view);
+  }
+  return true;
+}
+
+// |RenderPass|
+bool RecordingRenderPass::BindResource(
+    ShaderStage stage,
+    DescriptorType type,
+    const SampledImageSlot& slot,
+    const ShaderMetadata& metadata,
+    std::shared_ptr<const Texture> texture,
+    const std::unique_ptr<const Sampler>& sampler) {
+  pending_.BindResource(stage, type, slot, metadata, texture, sampler);
+  if (delegate_) {
+    return delegate_->BindResource(stage, type, slot, metadata, texture,
+                                   sampler);
+  }
+  return true;
+}
+
+}  // namespace impeller
diff --git a/impeller/entity/contents/test/recording_render_pass.h b/impeller/entity/contents/test/recording_render_pass.h
new file mode 100644
index 0000000000000000000000000000000000000000..12fd10cb8d13a89ad4d6ba55a55691b4d5e4aebd
--- /dev/null
+++ b/impeller/entity/contents/test/recording_render_pass.h
@@ -0,0 +1,87 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_TEST_RECORDING_RENDER_PASS_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_TEST_RECORDING_RENDER_PASS_H_
+
+#include "impeller/renderer/render_pass.h"
+
+namespace impeller {
+
+class RecordingRenderPass : public RenderPass {
+ public:
+  explicit RecordingRenderPass(std::shared_ptr<RenderPass> delegate,
+                               const std::shared_ptr<const Context>& context,
+                               const RenderTarget& render_target);
+
+  ~RecordingRenderPass() = default;
+
+  const std::vector<Command>& GetCommands() const override { return commands_; }
+
+  // |RenderPass|
+  void SetPipeline(
+      const std::shared_ptr<Pipeline<PipelineDescriptor>>& pipeline) override;
+
+  void SetCommandLabel(std::string_view label) override;
+
+  // |RenderPass|
+  void SetStencilReference(uint32_t value) override;
+
+  // |RenderPass|
+  void SetBaseVertex(uint64_t value) override;
+
+  // |RenderPass|
+  void SetViewport(Viewport viewport) override;
+
+  // |RenderPass|
+  void SetScissor(IRect scissor) override;
+
+  // |RenderPass|
+  void SetInstanceCount(size_t count) override;
+
+  // |RenderPass|
+  bool SetVertexBuffer(VertexBuffer buffer) override;
+
+  // |RenderPass|
+  fml::Status Draw() override;
+
+  // |RenderPass|
+  bool BindResource(ShaderStage stage,
+                    DescriptorType type,
+                    const ShaderUniformSlot& slot,
+                    const ShaderMetadata& metadata,
+                    BufferView view) override;
+
+  // |RenderPass|
+  bool BindResource(ShaderStage stage,
+                    DescriptorType type,
+                    const ShaderUniformSlot& slot,
+                    const std::shared_ptr<const ShaderMetadata>& metadata,
+                    BufferView view) override;
+
+  // |RenderPass|
+  bool BindResource(ShaderStage stage,
+                    DescriptorType type,
+                    const SampledImageSlot& slot,
+                    const ShaderMetadata& metadata,
+                    std::shared_ptr<const Texture> texture,
+                    const std::unique_ptr<const Sampler>& sampler) override;
+
+  // |RenderPass|
+  void OnSetLabel(std::string label) override;
+
+  // |RenderPass|
+  bool OnEncodeCommands(const Context& context) const override;
+
+  bool IsValid() const override { return true; }
+
+ private:
+  Command pending_;
+  std::shared_ptr<RenderPass> delegate_;
+  std::vector<Command> commands_;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_TEST_RECORDING_RENDER_PASS_H_
diff --git a/impeller/entity/contents/text_contents.cc b/impeller/entity/contents/text_contents.cc
index e6d0d7ac54abe3160d799f47dcbdcfbc7eb91979..9265f16d067d4b4f83795cd857b9f90351deffcb 100644
--- a/impeller/entity/contents/text_contents.cc
+++ b/impeller/entity/contents/text_contents.cc
@@ -4,18 +4,15 @@
 
 #include "impeller/entity/contents/text_contents.h"
 
+#include <cstring>
 #include <optional>
-#include <type_traits>
 #include <utility>
 
+#include "impeller/core/formats.h"
+#include "impeller/core/sampler_descriptor.h"
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/entity.h"
-#include "impeller/geometry/path_builder.h"
-#include "impeller/renderer/formats.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_descriptor.h"
-#include "impeller/renderer/sampler_library.h"
-#include "impeller/tessellator/tessellator.h"
 #include "impeller/typographer/glyph_atlas.h"
 #include "impeller/typographer/lazy_glyph_atlas.h"
 
@@ -25,60 +22,103 @@ TextContents::TextContents() = default;
 
 TextContents::~TextContents() = default;
 
-void TextContents::SetTextFrame(const TextFrame& frame) {
+void TextContents::SetTextFrame(const std::shared_ptr<TextFrame>& frame) {
   frame_ = frame;
 }
 
-void TextContents::SetGlyphAtlas(std::shared_ptr<LazyGlyphAtlas> atlas) {
-  lazy_atlas_ = std::move(atlas);
+void TextContents::SetColor(Color color) {
+  color_ = color;
 }
 
-std::shared_ptr<GlyphAtlas> TextContents::ResolveAtlas(
-    GlyphAtlas::Type type,
-    std::shared_ptr<GlyphAtlasContext> atlas_context,
-    std::shared_ptr<Context> context) const {
-  FML_DCHECK(lazy_atlas_);
-  if (lazy_atlas_) {
-    return lazy_atlas_->CreateOrGetGlyphAtlas(type, std::move(atlas_context),
-                                              std::move(context));
-  }
+Color TextContents::GetColor() const {
+  return color_.WithAlpha(color_.alpha * inherited_opacity_);
+}
 
-  return nullptr;
+bool TextContents::CanInheritOpacity(const Entity& entity) const {
+  return !frame_->MaybeHasOverlapping();
 }
 
-void TextContents::SetColor(Color color) {
-  color_ = color;
+void TextContents::SetInheritedOpacity(Scalar opacity) {
+  inherited_opacity_ = opacity;
+}
+
+void TextContents::SetOffset(Vector2 offset) {
+  offset_ = offset;
+}
+
+void TextContents::SetForceTextColor(bool value) {
+  force_text_color_ = value;
 }
 
 std::optional<Rect> TextContents::GetCoverage(const Entity& entity) const {
-  auto bounds = frame_.GetBounds();
-  if (!bounds.has_value()) {
-    return std::nullopt;
-  }
-  return bounds->TransformBounds(entity.GetTransformation());
+  return frame_->GetBounds().TransformBounds(entity.GetTransform());
 }
 
-template <class TPipeline>
-static bool CommonRender(
-    const ContentContext& renderer,
-    const Entity& entity,
-    RenderPass& pass,
-    const Color& color,
-    const TextFrame& frame,
-    std::shared_ptr<GlyphAtlas>
-        atlas,  // NOLINT(performance-unnecessary-value-param)
-    Command& cmd) {
-  using VS = typename TPipeline::VertexShader;
-  using FS = typename TPipeline::FragmentShader;
+void TextContents::PopulateGlyphAtlas(
+    const std::shared_ptr<LazyGlyphAtlas>& lazy_glyph_atlas,
+    Scalar scale) {
+  lazy_glyph_atlas->AddTextFrame(*frame_, scale);
+  scale_ = scale;
+}
+
+bool TextContents::Render(const ContentContext& renderer,
+                          const Entity& entity,
+                          RenderPass& pass) const {
+  auto color = GetColor();
+  if (color.IsTransparent()) {
+    return true;
+  }
+
+  auto type = frame_->GetAtlasType();
+  const std::shared_ptr<GlyphAtlas>& atlas =
+      renderer.GetLazyGlyphAtlas()->CreateOrGetGlyphAtlas(
+          *renderer.GetContext(), type);
+
+  if (!atlas || !atlas->IsValid()) {
+    VALIDATION_LOG << "Cannot render glyphs without prepared atlas.";
+    return false;
+  }
+
+  // Information shared by all glyph draw calls.
+  pass.SetCommandLabel("TextFrame");
+  auto opts = OptionsFromPassAndEntity(pass, entity);
+  opts.primitive_type = PrimitiveType::kTriangle;
+  if (type == GlyphAtlas::Type::kAlphaBitmap) {
+    pass.SetPipeline(renderer.GetGlyphAtlasPipeline(opts));
+  } else {
+    pass.SetPipeline(renderer.GetGlyphAtlasColorPipeline(opts));
+  }
+  pass.SetStencilReference(entity.GetClipDepth());
+
+  using VS = GlyphAtlasPipeline::VertexShader;
+  using FS = GlyphAtlasPipeline::FragmentShader;
 
   // Common vertex uniforms for all glyphs.
-  typename VS::FrameInfo frame_info;
-  frame_info.mvp = Matrix::MakeOrthographic(pass.GetRenderTargetSize()) *
-                   entity.GetTransformation();
-  VS::BindFrameInfo(cmd, pass.GetTransientsBuffer().EmplaceUniform(frame_info));
+  VS::FrameInfo frame_info;
+  frame_info.mvp =
+      Entity::GetShaderTransform(entity.GetShaderClipDepth(), pass, Matrix());
+  frame_info.atlas_size =
+      Vector2{static_cast<Scalar>(atlas->GetTexture()->GetSize().width),
+              static_cast<Scalar>(atlas->GetTexture()->GetSize().height)};
+  frame_info.offset = offset_;
+  frame_info.is_translation_scale =
+      entity.GetTransform().IsTranslationScaleOnly();
+  frame_info.entity_transform = entity.GetTransform();
+  frame_info.text_color = ToVector(color.Premultiply());
+
+  VS::BindFrameInfo(pass,
+                    renderer.GetTransientsBuffer().EmplaceUniform(frame_info));
+
+  if (type == GlyphAtlas::Type::kColorBitmap) {
+    using FSS = GlyphAtlasColorPipeline::FragmentShader;
+    FSS::FragInfo frag_info;
+    frag_info.use_text_color = force_text_color_ ? 1.0 : 0.0;
+    FSS::BindFragInfo(pass,
+                      renderer.GetTransientsBuffer().EmplaceUniform(frag_info));
+  }
 
   SamplerDescriptor sampler_desc;
-  if (entity.GetTransformation().IsTranslationScaleOnly()) {
+  if (frame_info.is_translation_scale) {
     sampler_desc.min_filter = MinMagFilter::kNearest;
     sampler_desc.mag_filter = MinMagFilter::kNearest;
   } else {
@@ -90,18 +130,10 @@ static bool CommonRender(
     sampler_desc.min_filter = MinMagFilter::kLinear;
     sampler_desc.mag_filter = MinMagFilter::kLinear;
   }
-  sampler_desc.mip_filter = MipFilter::kNone;
+  sampler_desc.mip_filter = MipFilter::kNearest;
 
-  typename FS::FragInfo frag_info;
-  frag_info.text_color = ToVector(color.Premultiply());
-  frag_info.atlas_size =
-      Point{static_cast<Scalar>(atlas->GetTexture()->GetSize().width),
-            static_cast<Scalar>(atlas->GetTexture()->GetSize().height)};
-  FS::BindFragInfo(cmd, pass.GetTransientsBuffer().EmplaceUniform(frag_info));
-
-  // Common fragment uniforms for all glyphs.
   FS::BindGlyphAtlasSampler(
-      cmd,                  // command
+      pass,                 // command
       atlas->GetTexture(),  // texture
       renderer.GetContext()->GetSamplerLibrary()->GetSampler(
           sampler_desc)  // sampler
@@ -114,128 +146,63 @@ static bool CommonRender(
   // interpolated vertex information is also used in the fragment shader to
   // sample from the glyph atlas.
 
-  const std::array<Point, 4> unit_points = {Point{0, 0}, Point{1, 0},
-                                            Point{0, 1}, Point{1, 1}};
-  const std::array<uint32_t, 6> indices = {0, 1, 2, 1, 2, 3};
-
-  VertexBufferBuilder<typename VS::PerVertexData> vertex_builder;
+  constexpr std::array<Point, 6> unit_points = {Point{0, 0}, Point{1, 0},
+                                                Point{0, 1}, Point{1, 0},
+                                                Point{0, 1}, Point{1, 1}};
 
-  size_t count = 0;
-  for (const auto& run : frame.GetRuns()) {
-    count += run.GetGlyphPositions().size();
+  auto& host_buffer = renderer.GetTransientsBuffer();
+  size_t vertex_count = 0;
+  for (const auto& run : frame_->GetRuns()) {
+    vertex_count += run.GetGlyphPositions().size();
   }
-
-  vertex_builder.Reserve(count * 4);
-  vertex_builder.ReserveIndices(count * 6);
-
-  uint32_t offset = 0u;
-  for (auto i = 0u; i < count; i++) {
-    for (const auto& index : indices) {
-      vertex_builder.AppendIndex(index + offset);
-    }
-    offset += 4;
-  }
-
-  for (const auto& run : frame.GetRuns()) {
-    auto font = run.GetFont();
-
-    for (const auto& glyph_position : run.GetGlyphPositions()) {
-      FontGlyphPair font_glyph_pair{font, glyph_position.glyph};
-      auto atlas_glyph_pos = atlas->FindFontGlyphPosition(font_glyph_pair);
-      if (!atlas_glyph_pos.has_value()) {
-        VALIDATION_LOG << "Could not find glyph position in the atlas.";
-        return false;
-      }
-
-      auto atlas_position = atlas_glyph_pos->origin;
-      auto atlas_glyph_size =
-          Point{atlas_glyph_pos->size.width, atlas_glyph_pos->size.height};
-      auto offset_glyph_position =
-          glyph_position.position + glyph_position.glyph.bounds.origin;
-
-      for (const auto& point : unit_points) {
-        typename VS::PerVertexData vtx;
-        vtx.unit_position = point;
-        vtx.destination_position = offset_glyph_position;
-        vtx.destination_size = Point(glyph_position.glyph.bounds.size);
-        vtx.source_position = atlas_position;
-        vtx.source_glyph_size = atlas_glyph_size;
-        if constexpr (std::is_same_v<TPipeline, GlyphAtlasPipeline>) {
-          vtx.has_color =
-              glyph_position.glyph.type == Glyph::Type::kBitmap ? 1.0 : 0.0;
+  vertex_count *= 6;
+
+  auto buffer_view = host_buffer.Emplace(
+      vertex_count * sizeof(VS::PerVertexData), alignof(VS::PerVertexData),
+      [&](uint8_t* contents) {
+        VS::PerVertexData vtx;
+        VS::PerVertexData* vtx_contents =
+            reinterpret_cast<VS::PerVertexData*>(contents);
+        for (const TextRun& run : frame_->GetRuns()) {
+          const Font& font = run.GetFont();
+          Scalar rounded_scale = TextFrame::RoundScaledFontSize(
+              scale_, font.GetMetrics().point_size);
+          const FontGlyphAtlas* font_atlas =
+              atlas->GetFontGlyphAtlas(font, rounded_scale);
+          if (!font_atlas) {
+            VALIDATION_LOG << "Could not find font in the atlas.";
+            continue;
+          }
+
+          for (const TextRun::GlyphPosition& glyph_position :
+               run.GetGlyphPositions()) {
+            std::optional<Rect> maybe_atlas_glyph_bounds =
+                font_atlas->FindGlyphBounds(glyph_position.glyph);
+            if (!maybe_atlas_glyph_bounds.has_value()) {
+              VALIDATION_LOG << "Could not find glyph position in the atlas.";
+              continue;
+            }
+            const Rect& atlas_glyph_bounds = maybe_atlas_glyph_bounds.value();
+            vtx.atlas_glyph_bounds = Vector4(atlas_glyph_bounds.GetXYWH());
+            vtx.glyph_bounds = Vector4(glyph_position.glyph.bounds.GetXYWH());
+            vtx.glyph_position = glyph_position.position;
+
+            for (const Point& point : unit_points) {
+              vtx.unit_position = point;
+              std::memcpy(vtx_contents++, &vtx, sizeof(VS::PerVertexData));
+            }
+          }
         }
-        vertex_builder.AppendVertex(std::move(vtx));
-      }
-    }
-  }
-  auto vertex_buffer =
-      vertex_builder.CreateVertexBuffer(pass.GetTransientsBuffer());
-  cmd.BindVertices(std::move(vertex_buffer));
-
-  if (!pass.AddCommand(cmd)) {
-    return false;
-  }
-
-  return true;
-}
-
-bool TextContents::RenderSdf(const ContentContext& renderer,
-                             const Entity& entity,
-                             RenderPass& pass) const {
-  auto atlas =
-      ResolveAtlas(GlyphAtlas::Type::kSignedDistanceField,
-                   renderer.GetGlyphAtlasContext(), renderer.GetContext());
-
-  if (!atlas || !atlas->IsValid()) {
-    VALIDATION_LOG << "Cannot render glyphs without prepared atlas.";
-    return false;
-  }
-
-  // Information shared by all glyph draw calls.
-  Command cmd;
-  cmd.label = "TextFrameSDF";
-  auto opts = OptionsFromPassAndEntity(pass, entity);
-  opts.primitive_type = PrimitiveType::kTriangle;
-  cmd.pipeline = renderer.GetGlyphAtlasSdfPipeline(opts);
-  cmd.stencil_reference = entity.GetStencilDepth();
+      });
 
-  return CommonRender<GlyphAtlasSdfPipeline>(renderer, entity, pass, color_,
-                                             frame_, atlas, cmd);
-}
-
-bool TextContents::Render(const ContentContext& renderer,
-                          const Entity& entity,
-                          RenderPass& pass) const {
-  if (color_.IsTransparent()) {
-    return true;
-  }
-
-  // This TextContents may be for a frame that doesn't have color, but the
-  // lazy atlas for this scene already does have color.
-  // Benchmarks currently show that creating two atlases per pass regresses
-  // render time. This should get re-evaluated if we start caching atlases
-  // between frames or get significantly faster at creating atlases, because
-  // we're potentially trading memory for time here.
-  auto atlas =
-      ResolveAtlas(lazy_atlas_->HasColor() ? GlyphAtlas::Type::kColorBitmap
-                                           : GlyphAtlas::Type::kAlphaBitmap,
-                   renderer.GetGlyphAtlasContext(), renderer.GetContext());
-
-  if (!atlas || !atlas->IsValid()) {
-    VALIDATION_LOG << "Cannot render glyphs without prepared atlas.";
-    return false;
-  }
-
-  // Information shared by all glyph draw calls.
-  Command cmd;
-  cmd.label = "TextFrame";
-  auto opts = OptionsFromPassAndEntity(pass, entity);
-  opts.primitive_type = PrimitiveType::kTriangle;
-  cmd.pipeline = renderer.GetGlyphAtlasPipeline(opts);
-  cmd.stencil_reference = entity.GetStencilDepth();
+  pass.SetVertexBuffer({
+      .vertex_buffer = std::move(buffer_view),
+      .index_buffer = {},
+      .vertex_count = vertex_count,
+      .index_type = IndexType::kNone,
+  });
 
-  return CommonRender<GlyphAtlasPipeline>(renderer, entity, pass, color_,
-                                          frame_, atlas, cmd);
+  return pass.Draw().ok();
 }
 
 }  // namespace impeller
diff --git a/impeller/entity/contents/text_contents.h b/impeller/entity/contents/text_contents.h
index a0cec70a951036d9160cb3bdb67e0200d74a8de8..10842f33f806fcd583a31aa1724a6180f79f82b9 100644
--- a/impeller/entity/contents/text_contents.h
+++ b/impeller/entity/contents/text_contents.h
@@ -2,14 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_TEXT_CONTENTS_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_TEXT_CONTENTS_H_
 
-#include <functional>
 #include <memory>
-#include <variant>
-#include <vector>
 
-#include "flutter/fml/macros.h"
 #include "impeller/entity/contents/contents.h"
 #include "impeller/geometry/color.h"
 #include "impeller/typographer/glyph_atlas.h"
@@ -26,36 +23,54 @@ class TextContents final : public Contents {
 
   ~TextContents();
 
-  void SetTextFrame(const TextFrame& frame);
-
-  void SetGlyphAtlas(std::shared_ptr<LazyGlyphAtlas> atlas);
+  void SetTextFrame(const std::shared_ptr<TextFrame>& frame);
 
   void SetColor(Color color);
 
+  /// @brief Force the text color to apply to the rendered glyphs, even if those
+  ///        glyphs are bitmaps.
+  ///
+  ///        This is used to ensure that mask blurs work correctly on emoji.
+  void SetForceTextColor(bool value);
+
+  Color GetColor() const;
+
+  // |Contents|
+  bool CanInheritOpacity(const Entity& entity) const override;
+
+  // |Contents|
+  void SetInheritedOpacity(Scalar opacity) override;
+
+  void SetOffset(Vector2 offset);
+
+  std::optional<Rect> GetTextFrameBounds() const;
+
   // |Contents|
   std::optional<Rect> GetCoverage(const Entity& entity) const override;
 
+  // |Contents|
+  void PopulateGlyphAtlas(
+      const std::shared_ptr<LazyGlyphAtlas>& lazy_glyph_atlas,
+      Scalar scale) override;
+
   // |Contents|
   bool Render(const ContentContext& renderer,
               const Entity& entity,
               RenderPass& pass) const override;
 
-  // TODO(dnfield): remove this https://github.com/flutter/flutter/issues/111640
-  bool RenderSdf(const ContentContext& renderer,
-                 const Entity& entity,
-                 RenderPass& pass) const;
-
  private:
-  TextFrame frame_;
+  std::shared_ptr<TextFrame> frame_;
+  Scalar scale_ = 1.0;
   Color color_;
-  mutable std::shared_ptr<LazyGlyphAtlas> lazy_atlas_;
+  Scalar inherited_opacity_ = 1.0;
+  Vector2 offset_;
+  bool force_text_color_ = false;
 
-  std::shared_ptr<GlyphAtlas> ResolveAtlas(
-      GlyphAtlas::Type type,
-      std::shared_ptr<GlyphAtlasContext> atlas_context,
-      std::shared_ptr<Context> context) const;
+  TextContents(const TextContents&) = delete;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(TextContents);
+  TextContents& operator=(const TextContents&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_TEXT_CONTENTS_H_
diff --git a/impeller/entity/contents/texture_contents.cc b/impeller/entity/contents/texture_contents.cc
index 754396bbd78a195bd2681f859fd13370e02c08ba..035c09a1bd7accebd9c3921ab1356862f8a22751 100644
--- a/impeller/entity/contents/texture_contents.cc
+++ b/impeller/entity/contents/texture_contents.cc
@@ -2,22 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "texture_contents.h"
+#include "impeller/entity/contents/texture_contents.h"
 
 #include <memory>
 #include <optional>
 #include <utility>
 
+#include "impeller/core/formats.h"
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/entity.h"
 #include "impeller/entity/texture_fill.frag.h"
 #include "impeller/entity/texture_fill.vert.h"
+#include "impeller/entity/texture_fill_external.frag.h"
 #include "impeller/geometry/constants.h"
-#include "impeller/geometry/path_builder.h"
-#include "impeller/renderer/formats.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_library.h"
-#include "impeller/tessellator/tessellator.h"
+#include "impeller/renderer/vertex_buffer_builder.h"
 
 namespace impeller {
 
@@ -27,8 +26,7 @@ TextureContents::~TextureContents() = default;
 
 std::shared_ptr<TextureContents> TextureContents::MakeRect(Rect destination) {
   auto contents = std::make_shared<TextureContents>();
-  contents->path_ = PathBuilder{}.AddRect(destination).TakePath();
-  contents->is_rect_ = true;
+  contents->destination_rect_ = destination;
   return contents;
 }
 
@@ -36,9 +34,8 @@ void TextureContents::SetLabel(std::string label) {
   label_ = std::move(label);
 }
 
-void TextureContents::SetPath(const Path& path) {
-  path_ = path;
-  is_rect_ = false;
+void TextureContents::SetDestinationRect(Rect rect) {
+  destination_rect_ = rect;
 }
 
 void TextureContents::SetTexture(std::shared_ptr<Texture> texture) {
@@ -57,133 +54,157 @@ void TextureContents::SetStencilEnabled(bool enabled) {
   stencil_enabled_ = enabled;
 }
 
+bool TextureContents::CanInheritOpacity(const Entity& entity) const {
+  return true;
+}
+
+void TextureContents::SetInheritedOpacity(Scalar opacity) {
+  inherited_opacity_ = opacity;
+}
+
+Scalar TextureContents::GetOpacity() const {
+  return opacity_ * inherited_opacity_;
+}
+
 std::optional<Rect> TextureContents::GetCoverage(const Entity& entity) const {
-  if (opacity_ == 0) {
+  if (GetOpacity() == 0) {
     return std::nullopt;
   }
-  return path_.GetTransformedBoundingBox(entity.GetTransformation());
+  return destination_rect_.TransformBounds(entity.GetTransform());
 };
 
 std::optional<Snapshot> TextureContents::RenderToSnapshot(
     const ContentContext& renderer,
-    const Entity& entity) const {
-  auto bounds = path_.GetBoundingBox();
-  if (!bounds.has_value()) {
-    return std::nullopt;
-  }
-
+    const Entity& entity,
+    std::optional<Rect> coverage_limit,
+    const std::optional<SamplerDescriptor>& sampler_descriptor,
+    bool msaa_enabled,
+    int32_t mip_count,
+    const std::string& label) const {
   // Passthrough textures that have simple rectangle paths and complete source
   // rects.
-  if (is_rect_ && source_rect_ == Rect::MakeSize(texture_->GetSize()) &&
-      (opacity_ >= 1 - kEhCloseEnough || defer_applying_opacity_)) {
-    auto scale = Vector2(bounds->size / Size(texture_->GetSize()));
-    return Snapshot{.texture = texture_,
-                    .transform = entity.GetTransformation() *
-                                 Matrix::MakeTranslation(bounds->origin) *
-                                 Matrix::MakeScale(scale),
-                    .sampler_descriptor = sampler_descriptor_,
-                    .opacity = opacity_};
+  auto bounds = destination_rect_;
+  auto opacity = GetOpacity();
+  if (source_rect_ == Rect::MakeSize(texture_->GetSize()) &&
+      (opacity >= 1 - kEhCloseEnough || defer_applying_opacity_)) {
+    auto scale = Vector2(bounds.GetSize() / Size(texture_->GetSize()));
+    return Snapshot{
+        .texture = texture_,
+        .transform = entity.GetTransform() *
+                     Matrix::MakeTranslation(bounds.GetOrigin()) *
+                     Matrix::MakeScale(scale),
+        .sampler_descriptor = sampler_descriptor.value_or(sampler_descriptor_),
+        .opacity = opacity};
   }
-  return Contents::RenderToSnapshot(renderer, entity);
+  return Contents::RenderToSnapshot(
+      renderer,                                          // renderer
+      entity,                                            // entity
+      std::nullopt,                                      // coverage_limit
+      sampler_descriptor.value_or(sampler_descriptor_),  // sampler_descriptor
+      true,                                              // msaa_enabled
+      /*mip_count=*/mip_count,
+      label);  // label
 }
 
 bool TextureContents::Render(const ContentContext& renderer,
                              const Entity& entity,
                              RenderPass& pass) const {
-  if (texture_ == nullptr) {
-    return true;
-  }
+  auto capture = entity.GetCapture().CreateChild("TextureContents");
 
   using VS = TextureFillVertexShader;
   using FS = TextureFillFragmentShader;
+  using FSStrictSrc = TextureFillStrictSrcFragmentShader;
+  using FSExternal = TextureFillExternalFragmentShader;
 
-  const auto coverage_rect = path_.GetBoundingBox();
-
-  if (!coverage_rect.has_value()) {
-    return true;
-  }
-
-  if (coverage_rect->size.IsEmpty()) {
-    return true;
+  if (destination_rect_.IsEmpty() || source_rect_.IsEmpty() ||
+      texture_ == nullptr || texture_->GetSize().IsEmpty()) {
+    return true;  // Nothing to render.
   }
 
-  const auto texture_size = texture_->GetSize();
-  if (texture_size.IsEmpty()) {
-    return true;
-  }
+  bool is_external_texture =
+      texture_->GetTextureDescriptor().type == TextureType::kTextureExternalOES;
 
-  if (source_rect_.IsEmpty()) {
-    return true;
-  }
+  auto source_rect = capture.AddRect("Source rect", source_rect_);
+  auto texture_coords =
+      Rect::MakeSize(texture_->GetSize()).Project(source_rect);
 
   VertexBufferBuilder<VS::PerVertexData> vertex_builder;
-  {
-    const auto tess_result = renderer.GetTessellator()->Tessellate(
-        path_.GetFillType(), path_.CreatePolyline(),
-        [this, &vertex_builder, &coverage_rect, &texture_size](
-            const float* vertices, size_t vertices_size,
-            const uint16_t* indices, size_t indices_size) {
-          for (auto i = 0u; i < vertices_size; i += 2) {
-            VS::PerVertexData data;
-            Point vtx = {vertices[i], vertices[i + 1]};
-            data.position = vtx;
-            auto coverage_coords =
-                (vtx - coverage_rect->origin) / coverage_rect->size;
-            data.texture_coords =
-                (source_rect_.origin + source_rect_.size * coverage_coords) /
-                texture_size;
-            vertex_builder.AppendVertex(data);
-          }
-          FML_DCHECK(vertex_builder.GetVertexCount() == vertices_size / 2);
-          for (auto i = 0u; i < indices_size; i++) {
-            vertex_builder.AppendIndex(indices[i]);
-          }
-          return true;
-        });
-
-    if (tess_result == Tessellator::Result::kInputError) {
-      return true;
-    }
-    if (tess_result == Tessellator::Result::kTessellationError) {
-      return false;
-    }
-  }
 
-  if (!vertex_builder.HasVertices()) {
-    return true;
-  }
-
-  auto& host_buffer = pass.GetTransientsBuffer();
-
-  VS::VertInfo vert_info;
-  vert_info.mvp = Matrix::MakeOrthographic(pass.GetRenderTargetSize()) *
-                  entity.GetTransformation();
-
-  FS::FragInfo frag_info;
-  frag_info.texture_sampler_y_coord_scale = texture_->GetYCoordScale();
-  frag_info.alpha = opacity_;
-
-  Command cmd;
-  cmd.label = "Texture Fill";
-  if (!label_.empty()) {
-    cmd.label += ": " + label_;
+  auto destination_rect =
+      capture.AddRect("Destination rect", destination_rect_);
+  vertex_builder.AddVertices({
+      {destination_rect.GetLeftTop(), texture_coords.GetLeftTop()},
+      {destination_rect.GetRightTop(), texture_coords.GetRightTop()},
+      {destination_rect.GetLeftBottom(), texture_coords.GetLeftBottom()},
+      {destination_rect.GetRightBottom(), texture_coords.GetRightBottom()},
+  });
+
+  auto& host_buffer = renderer.GetTransientsBuffer();
+
+  VS::FrameInfo frame_info;
+  frame_info.mvp = entity.GetShaderTransform(pass);
+  frame_info.texture_sampler_y_coord_scale = texture_->GetYCoordScale();
+  frame_info.alpha = capture.AddScalar("Alpha", GetOpacity());
+
+#ifdef IMPELLER_DEBUG
+  if (label_.empty()) {
+    pass.SetCommandLabel("Texture Fill");
+  } else {
+    pass.SetCommandLabel("Texture Fill: " + label_);
   }
+#endif  // IMPELLER_DEBUG
 
   auto pipeline_options = OptionsFromPassAndEntity(pass, entity);
   if (!stencil_enabled_) {
-    pipeline_options.stencil_compare = CompareFunction::kAlways;
+    pipeline_options.stencil_mode = ContentContextOptions::StencilMode::kIgnore;
   }
-  cmd.pipeline = renderer.GetTexturePipeline(pipeline_options);
-  cmd.stencil_reference = entity.GetStencilDepth();
-  cmd.BindVertices(vertex_builder.CreateVertexBuffer(host_buffer));
-  VS::BindVertInfo(cmd, host_buffer.EmplaceUniform(vert_info));
-  FS::BindFragInfo(cmd, host_buffer.EmplaceUniform(frag_info));
-  FS::BindTextureSampler(cmd, texture_,
-                         renderer.GetContext()->GetSamplerLibrary()->GetSampler(
-                             sampler_descriptor_));
-  pass.AddCommand(std::move(cmd));
+  pipeline_options.primitive_type = PrimitiveType::kTriangleStrip;
 
-  return true;
+  std::shared_ptr<Pipeline<PipelineDescriptor>> pipeline;
+#ifdef IMPELLER_ENABLE_OPENGLES
+  if (is_external_texture) {
+    pipeline = renderer.GetTextureExternalPipeline(pipeline_options);
+  }
+#endif  // IMPELLER_ENABLE_OPENGLES
+
+  if (!pipeline) {
+    if (strict_source_rect_enabled_) {
+      pipeline = renderer.GetTextureStrictSrcPipeline(pipeline_options);
+    } else {
+      pipeline = renderer.GetTexturePipeline(pipeline_options);
+    }
+  }
+  pass.SetPipeline(pipeline);
+
+  pass.SetStencilReference(entity.GetClipDepth());
+  pass.SetVertexBuffer(vertex_builder.CreateVertexBuffer(host_buffer));
+  VS::BindFrameInfo(pass, host_buffer.EmplaceUniform(frame_info));
+  if (is_external_texture) {
+    FSExternal::BindSAMPLEREXTERNALOESTextureSampler(
+        pass, texture_,
+        renderer.GetContext()->GetSamplerLibrary()->GetSampler(
+            sampler_descriptor_));
+  } else if (strict_source_rect_enabled_) {
+    // For a strict source rect, shrink the texture coordinate range by half a
+    // texel to ensure that linear filtering does not sample anything outside
+    // the source rect bounds.
+    auto strict_texture_coords =
+        Rect::MakeSize(texture_->GetSize()).Project(source_rect.Expand(-0.5));
+
+    FSStrictSrc::FragInfo frag_info;
+    frag_info.source_rect = Vector4(strict_texture_coords.GetLTRB());
+    FSStrictSrc::BindFragInfo(pass, host_buffer.EmplaceUniform(frag_info));
+    FSStrictSrc::BindTextureSampler(
+        pass, texture_,
+        renderer.GetContext()->GetSamplerLibrary()->GetSampler(
+            sampler_descriptor_));
+  } else {
+    FS::BindTextureSampler(
+        pass, texture_,
+        renderer.GetContext()->GetSamplerLibrary()->GetSampler(
+            sampler_descriptor_));
+  }
+  return pass.Draw().ok();
 }
 
 void TextureContents::SetSourceRect(const Rect& source_rect) {
@@ -194,6 +215,14 @@ const Rect& TextureContents::GetSourceRect() const {
   return source_rect_;
 }
 
+void TextureContents::SetStrictSourceRect(bool strict) {
+  strict_source_rect_enabled_ = strict;
+}
+
+bool TextureContents::GetStrictSourceRect() const {
+  return strict_source_rect_enabled_;
+}
+
 void TextureContents::SetSamplerDescriptor(SamplerDescriptor desc) {
   sampler_descriptor_ = std::move(desc);
 }
diff --git a/impeller/entity/contents/texture_contents.h b/impeller/entity/contents/texture_contents.h
index 9502881cca3f6697df5e45db94154c5e61b089e0..fc25a900570e3aa7a08aa3559b30d2122b9fd238 100644
--- a/impeller/entity/contents/texture_contents.h
+++ b/impeller/entity/contents/texture_contents.h
@@ -2,16 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_TEXTURE_CONTENTS_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_TEXTURE_CONTENTS_H_
 
 #include <functional>
 #include <memory>
 #include <vector>
 
 #include "flutter/fml/macros.h"
+#include "impeller/core/sampler_descriptor.h"
 #include "impeller/entity/contents/contents.h"
 #include "impeller/geometry/path.h"
-#include "impeller/renderer/sampler_descriptor.h"
 
 namespace impeller {
 
@@ -30,7 +31,7 @@ class TextureContents final : public Contents {
 
   void SetLabel(std::string label);
 
-  void SetPath(const Path& path);
+  void SetDestinationRect(Rect rect);
 
   void SetTexture(std::shared_ptr<Texture> texture);
 
@@ -44,38 +45,61 @@ class TextureContents final : public Contents {
 
   const Rect& GetSourceRect() const;
 
+  void SetStrictSourceRect(bool strict);
+
+  bool GetStrictSourceRect() const;
+
   void SetOpacity(Scalar opacity);
 
+  Scalar GetOpacity() const;
+
   void SetStencilEnabled(bool enabled);
 
   // |Contents|
   std::optional<Rect> GetCoverage(const Entity& entity) const override;
 
   // |Contents|
-  std::optional<Snapshot> RenderToSnapshot(const ContentContext& renderer,
-                                           const Entity& entity) const override;
+  std::optional<Snapshot> RenderToSnapshot(
+      const ContentContext& renderer,
+      const Entity& entity,
+      std::optional<Rect> coverage_limit = std::nullopt,
+      const std::optional<SamplerDescriptor>& sampler_descriptor = std::nullopt,
+      bool msaa_enabled = true,
+      int32_t mip_count = 1,
+      const std::string& label = "Texture Snapshot") const override;
 
   // |Contents|
   bool Render(const ContentContext& renderer,
               const Entity& entity,
               RenderPass& pass) const override;
 
+  // |Contents|
+  bool CanInheritOpacity(const Entity& entity) const override;
+
+  // |Contents|
+  void SetInheritedOpacity(Scalar opacity) override;
+
   void SetDeferApplyingOpacity(bool defer_applying_opacity);
 
  private:
   std::string label_;
 
-  Path path_;
-  bool is_rect_ = false;
+  Rect destination_rect_;
   bool stencil_enabled_ = true;
 
   std::shared_ptr<Texture> texture_;
   SamplerDescriptor sampler_descriptor_ = {};
   Rect source_rect_;
+  bool strict_source_rect_enabled_ = false;
   Scalar opacity_ = 1.0f;
+  Scalar inherited_opacity_ = 1.0f;
   bool defer_applying_opacity_ = false;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(TextureContents);
+  TextureContents(const TextureContents&) = delete;
+
+  TextureContents& operator=(const TextureContents&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_TEXTURE_CONTENTS_H_
diff --git a/impeller/entity/contents/tiled_texture_contents.cc b/impeller/entity/contents/tiled_texture_contents.cc
index bc0b17fcbe3f02816606431fbd232beac05258e3..b8baa2fef8f923e01d69513ac4faf7b7a904c0b3 100644
--- a/impeller/entity/contents/tiled_texture_contents.cc
+++ b/impeller/entity/contents/tiled_texture_contents.cc
@@ -4,17 +4,36 @@
 
 #include "impeller/entity/contents/tiled_texture_contents.h"
 
-#include "impeller/entity/contents/clip_contents.h"
+#include "fml/logging.h"
 #include "impeller/entity/contents/content_context.h"
-#include "impeller/entity/geometry.h"
+#include "impeller/entity/texture_fill.vert.h"
 #include "impeller/entity/tiled_texture_fill.frag.h"
-#include "impeller/entity/tiled_texture_fill.vert.h"
-#include "impeller/geometry/path_builder.h"
+#include "impeller/entity/tiled_texture_fill_external.frag.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_library.h"
 
 namespace impeller {
 
+static std::optional<SamplerAddressMode> TileModeToAddressMode(
+    Entity::TileMode tile_mode,
+    const Capabilities& capabilities) {
+  switch (tile_mode) {
+    case Entity::TileMode::kClamp:
+      return SamplerAddressMode::kClampToEdge;
+      break;
+    case Entity::TileMode::kMirror:
+      return SamplerAddressMode::kMirror;
+      break;
+    case Entity::TileMode::kRepeat:
+      return SamplerAddressMode::kRepeat;
+      break;
+    case Entity::TileMode::kDecal:
+      if (capabilities.SupportsDecalSamplerAddressMode()) {
+        return SamplerAddressMode::kDecal;
+      }
+      return std::nullopt;
+  }
+}
+
 TiledTextureContents::TiledTextureContents() = default;
 
 TiledTextureContents::~TiledTextureContents() = default;
@@ -33,6 +52,62 @@ void TiledTextureContents::SetSamplerDescriptor(SamplerDescriptor desc) {
   sampler_descriptor_ = std::move(desc);
 }
 
+void TiledTextureContents::SetColorFilter(ColorFilterProc color_filter) {
+  color_filter_ = std::move(color_filter);
+}
+
+std::shared_ptr<Texture> TiledTextureContents::CreateFilterTexture(
+    const ContentContext& renderer) const {
+  if (!color_filter_) {
+    return nullptr;
+  }
+  auto color_filter_contents = color_filter_(FilterInput::Make(texture_));
+  auto snapshot = color_filter_contents->RenderToSnapshot(
+      renderer,      // renderer
+      Entity(),      // entity
+      std::nullopt,  // coverage_limit
+      std::nullopt,  // sampler_descriptor
+      true,          // msaa_enabled
+      /*mip_count=*/1,
+      "TiledTextureContents Snapshot");  // label
+  if (snapshot.has_value()) {
+    return snapshot.value().texture;
+  }
+  return nullptr;
+}
+
+SamplerDescriptor TiledTextureContents::CreateSamplerDescriptor(
+    const Capabilities& capabilities) const {
+  SamplerDescriptor descriptor = sampler_descriptor_;
+  auto width_mode = TileModeToAddressMode(x_tile_mode_, capabilities);
+  auto height_mode = TileModeToAddressMode(y_tile_mode_, capabilities);
+  if (width_mode.has_value()) {
+    descriptor.width_address_mode = width_mode.value();
+  }
+  if (height_mode.has_value()) {
+    descriptor.height_address_mode = height_mode.value();
+  }
+  return descriptor;
+}
+
+bool TiledTextureContents::UsesEmulatedTileMode(
+    const Capabilities& capabilities) const {
+  return !TileModeToAddressMode(x_tile_mode_, capabilities).has_value() ||
+         !TileModeToAddressMode(y_tile_mode_, capabilities).has_value();
+}
+
+// |Contents|
+bool TiledTextureContents::IsOpaque() const {
+  if (GetOpacityFactor() < 1 || x_tile_mode_ == Entity::TileMode::kDecal ||
+      y_tile_mode_ == Entity::TileMode::kDecal) {
+    return false;
+  }
+  if (color_filter_) {
+    return false;
+  }
+  return texture_->IsOpaque();
+}
+
 bool TiledTextureContents::Render(const ContentContext& renderer,
                                   const Entity& entity,
                                   RenderPass& pass) const {
@@ -40,60 +115,148 @@ bool TiledTextureContents::Render(const ContentContext& renderer,
     return true;
   }
 
-  using VS = TiledTextureFillVertexShader;
+  using VS = TextureFillVertexShader;
   using FS = TiledTextureFillFragmentShader;
+  using FSExternal = TiledTextureFillExternalFragmentShader;
 
   const auto texture_size = texture_->GetSize();
   if (texture_size.IsEmpty()) {
     return true;
   }
 
-  auto& host_buffer = pass.GetTransientsBuffer();
-
-  auto geometry_result =
-      GetGeometry()->GetPositionBuffer(renderer, entity, pass);
+  bool is_external_texture =
+      texture_->GetTextureDescriptor().type == TextureType::kTextureExternalOES;
 
-  VS::VertInfo vert_info;
-  vert_info.mvp = geometry_result.transform;
-  vert_info.matrix = GetInverseMatrix();
-  vert_info.texture_size = Vector2{static_cast<Scalar>(texture_size.width),
-                                   static_cast<Scalar>(texture_size.height)};
+  bool uses_emulated_tile_mode =
+      UsesEmulatedTileMode(renderer.GetDeviceCapabilities());
 
-  FS::FragInfo frag_info;
-  frag_info.texture_sampler_y_coord_scale = texture_->GetYCoordScale();
-  frag_info.x_tile_mode = static_cast<Scalar>(x_tile_mode_);
-  frag_info.y_tile_mode = static_cast<Scalar>(y_tile_mode_);
-  frag_info.alpha = GetAlpha();
+  VS::FrameInfo frame_info;
+  frame_info.texture_sampler_y_coord_scale = texture_->GetYCoordScale();
+  frame_info.alpha = GetOpacityFactor();
 
-  Command cmd;
-  cmd.label = "TiledTextureFill";
-  cmd.stencil_reference = entity.GetStencilDepth();
+  PipelineBuilderMethod pipeline_method;
 
-  auto options = OptionsFromPassAndEntity(pass, entity);
-  if (geometry_result.prevent_overdraw) {
-    options.stencil_compare = CompareFunction::kEqual;
-    options.stencil_operation = StencilOperation::kIncrementClamp;
+#ifdef IMPELLER_ENABLE_OPENGLES
+  if (is_external_texture) {
+    pipeline_method = &ContentContext::GetTiledTextureExternalPipeline;
+  } else {
+    pipeline_method = uses_emulated_tile_mode
+                          ? &ContentContext::GetTiledTexturePipeline
+                          : &ContentContext::GetTexturePipeline;
   }
-  options.primitive_type = geometry_result.type;
-  cmd.pipeline = renderer.GetTiledTexturePipeline(options);
+#else
+  pipeline_method = uses_emulated_tile_mode
+                        ? &ContentContext::GetTiledTexturePipeline
+                        : &ContentContext::GetTexturePipeline;
+#endif  // IMPELLER_ENABLE_OPENGLES
 
-  cmd.BindVertices(geometry_result.vertex_buffer);
-  VS::BindVertInfo(cmd, host_buffer.EmplaceUniform(vert_info));
-  FS::BindFragInfo(cmd, host_buffer.EmplaceUniform(frag_info));
-  FS::BindTextureSampler(cmd, texture_,
-                         renderer.GetContext()->GetSamplerLibrary()->GetSampler(
-                             sampler_descriptor_));
+  PipelineBuilderCallback pipeline_callback =
+      [&renderer, &pipeline_method](ContentContextOptions options) {
+        return (renderer.*pipeline_method)(options);
+      };
+  return ColorSourceContents::DrawGeometry<VS>(
+      renderer, entity, pass, pipeline_callback, frame_info,
+      [this, &renderer, &is_external_texture,
+       &uses_emulated_tile_mode](RenderPass& pass) {
+        auto& host_buffer = renderer.GetTransientsBuffer();
 
-  if (!pass.AddCommand(std::move(cmd))) {
-    return false;
-  }
+        if (uses_emulated_tile_mode) {
+          pass.SetCommandLabel("TiledTextureFill");
+        } else {
+          pass.SetCommandLabel("TextureFill");
+        }
 
-  if (geometry_result.prevent_overdraw) {
-    auto restore = ClipRestoreContents();
-    restore.SetRestoreCoverage(GetCoverage(entity));
-    return restore.Render(renderer, entity, pass);
+        if (is_external_texture) {
+          FSExternal::FragInfo frag_info;
+          frag_info.x_tile_mode = static_cast<Scalar>(x_tile_mode_);
+          frag_info.y_tile_mode = static_cast<Scalar>(y_tile_mode_);
+          FSExternal::BindFragInfo(pass, host_buffer.EmplaceUniform(frag_info));
+        } else if (uses_emulated_tile_mode) {
+          FS::FragInfo frag_info;
+          frag_info.x_tile_mode = static_cast<Scalar>(x_tile_mode_);
+          frag_info.y_tile_mode = static_cast<Scalar>(y_tile_mode_);
+          FS::BindFragInfo(pass, host_buffer.EmplaceUniform(frag_info));
+        }
+
+        if (is_external_texture) {
+          SamplerDescriptor sampler_desc;
+          // OES_EGL_image_external states that only CLAMP_TO_EDGE is valid, so
+          // we emulate all other tile modes here by remapping the texture
+          // coordinates.
+          sampler_desc.width_address_mode = SamplerAddressMode::kClampToEdge;
+          sampler_desc.height_address_mode = SamplerAddressMode::kClampToEdge;
+
+          // Also, external textures cannot be bound to color filters, so ignore
+          // this case for now.
+          FML_DCHECK(!color_filter_) << "Color filters are not currently "
+                                        "supported for external textures.";
+
+          FSExternal::BindSAMPLEREXTERNALOESTextureSampler(
+              pass, texture_,
+              renderer.GetContext()->GetSamplerLibrary()->GetSampler(
+                  sampler_desc));
+        } else {
+          if (color_filter_) {
+            auto filtered_texture = CreateFilterTexture(renderer);
+            if (!filtered_texture) {
+              return false;
+            }
+            FS::BindTextureSampler(
+                pass, filtered_texture,
+                renderer.GetContext()->GetSamplerLibrary()->GetSampler(
+                    CreateSamplerDescriptor(renderer.GetDeviceCapabilities())));
+          } else {
+            FS::BindTextureSampler(
+                pass, texture_,
+                renderer.GetContext()->GetSamplerLibrary()->GetSampler(
+                    CreateSamplerDescriptor(renderer.GetDeviceCapabilities())));
+          }
+        }
+
+        return true;
+      },
+      /*enable_uvs=*/true,
+      /*texture_coverage=*/Rect::MakeSize(texture_size),
+      /*effect_transform=*/GetInverseEffectTransform());
+}
+
+std::optional<Snapshot> TiledTextureContents::RenderToSnapshot(
+    const ContentContext& renderer,
+    const Entity& entity,
+    std::optional<Rect> coverage_limit,
+    const std::optional<SamplerDescriptor>& sampler_descriptor,
+    bool msaa_enabled,
+    int32_t mip_count,
+    const std::string& label) const {
+  std::optional<Rect> geometry_coverage = GetGeometry()->GetCoverage({});
+  if (GetInverseEffectTransform().IsIdentity() &&
+      GetGeometry()->IsAxisAlignedRect() &&
+      (!geometry_coverage.has_value() ||
+       Rect::MakeSize(texture_->GetSize())
+           .Contains(geometry_coverage.value()))) {
+    auto coverage = GetCoverage(entity);
+    if (!coverage.has_value()) {
+      return std::nullopt;
+    }
+    auto scale = Vector2(coverage->GetSize() / Size(texture_->GetSize()));
+
+    return Snapshot{
+        .texture = texture_,
+        .transform = Matrix::MakeTranslation(coverage->GetOrigin()) *
+                     Matrix::MakeScale(scale),
+        .sampler_descriptor = sampler_descriptor.value_or(sampler_descriptor_),
+        .opacity = GetOpacityFactor(),
+    };
   }
-  return true;
+
+  return Contents::RenderToSnapshot(
+      renderer,                                          // renderer
+      entity,                                            // entity
+      std::nullopt,                                      // coverage_limit
+      sampler_descriptor.value_or(sampler_descriptor_),  // sampler_descriptor
+      true,                                              // msaa_enabled
+      /*mip_count=*/1,
+      label);  // label
 }
 
 }  // namespace impeller
diff --git a/impeller/entity/contents/tiled_texture_contents.h b/impeller/entity/contents/tiled_texture_contents.h
index 95806119c295012b26fdd00eb4fb6bea0c4ce109..f798c13622a86be8e53b043b844f477e45865fed 100644
--- a/impeller/entity/contents/tiled_texture_contents.h
+++ b/impeller/entity/contents/tiled_texture_contents.h
@@ -2,17 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_TILED_TEXTURE_CONTENTS_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_TILED_TEXTURE_CONTENTS_H_
 
 #include <functional>
 #include <memory>
 #include <vector>
 
 #include "flutter/fml/macros.h"
+#include "impeller/core/sampler_descriptor.h"
 #include "impeller/entity/contents/color_source_contents.h"
+#include "impeller/entity/contents/filters/color_filter_contents.h"
 #include "impeller/entity/entity.h"
 #include "impeller/geometry/path.h"
-#include "impeller/renderer/sampler_descriptor.h"
+#include "impeller/renderer/capabilities.h"
 
 namespace impeller {
 
@@ -22,6 +25,12 @@ class TiledTextureContents final : public ColorSourceContents {
 
   ~TiledTextureContents() override;
 
+  using ColorFilterProc =
+      std::function<std::shared_ptr<ColorFilterContents>(FilterInput::Ref)>;
+
+  // |Contents|
+  bool IsOpaque() const override;
+
   // |Contents|
   bool Render(const ContentContext& renderer,
               const Entity& entity,
@@ -33,13 +42,48 @@ class TiledTextureContents final : public ColorSourceContents {
 
   void SetSamplerDescriptor(SamplerDescriptor desc);
 
+  /// @brief Set a color filter to apply directly to this tiled texture
+  /// @param color_filter
+  ///
+  /// When applying a color filter to a tiled texture, we can reduce the
+  /// size and number of the subpasses required and the shader workload by
+  /// applying the filter to the untiled image and absorbing the opacity before
+  /// tiling it into the final location.
+  ///
+  /// This may not be a performance improvement if the image is tiled into a
+  /// much smaller size that its original texture size.
+  void SetColorFilter(ColorFilterProc color_filter);
+
+  // |Contents|
+  std::optional<Snapshot> RenderToSnapshot(
+      const ContentContext& renderer,
+      const Entity& entity,
+      std::optional<Rect> coverage_limit = std::nullopt,
+      const std::optional<SamplerDescriptor>& sampler_descriptor = std::nullopt,
+      bool msaa_enabled = true,
+      int32_t mip_count = 1,
+      const std::string& label = "Tiled Texture Snapshot") const override;
+
  private:
+  std::shared_ptr<Texture> CreateFilterTexture(
+      const ContentContext& renderer) const;
+
+  SamplerDescriptor CreateSamplerDescriptor(
+      const Capabilities& capabilities) const;
+
+  bool UsesEmulatedTileMode(const Capabilities& capabilities) const;
+
   std::shared_ptr<Texture> texture_;
   SamplerDescriptor sampler_descriptor_ = {};
-  Entity::TileMode x_tile_mode_;
-  Entity::TileMode y_tile_mode_;
+  Entity::TileMode x_tile_mode_ = Entity::TileMode::kClamp;
+  Entity::TileMode y_tile_mode_ = Entity::TileMode::kClamp;
+  ColorFilterProc color_filter_ = nullptr;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(TiledTextureContents);
+  TiledTextureContents(const TiledTextureContents&) = delete;
+
+  TiledTextureContents& operator=(const TiledTextureContents&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_TILED_TEXTURE_CONTENTS_H_
diff --git a/impeller/entity/contents/tiled_texture_contents_unittests.cc b/impeller/entity/contents/tiled_texture_contents_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..674ac4fdac20dd13ba529ccbef1799eaf790bbe8
--- /dev/null
+++ b/impeller/entity/contents/tiled_texture_contents_unittests.cc
@@ -0,0 +1,93 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <memory>
+
+#include "impeller/core/formats.h"
+#include "impeller/core/texture_descriptor.h"
+#include "impeller/entity/contents/test/recording_render_pass.h"
+#include "impeller/entity/contents/tiled_texture_contents.h"
+#include "impeller/entity/entity_playground.h"
+#include "impeller/playground/playground_test.h"
+#include "third_party/googletest/googletest/include/gtest/gtest.h"
+
+namespace impeller {
+namespace testing {
+
+using EntityTest = EntityPlayground;
+
+TEST_P(EntityTest, TiledTextureContentsRendersWithCorrectPipeline) {
+  TextureDescriptor texture_desc;
+  texture_desc.size = {100, 100};
+  texture_desc.type = TextureType::kTexture2D;
+  texture_desc.format = PixelFormat::kR8G8B8A8UNormInt;
+  texture_desc.storage_mode = StorageMode::kDevicePrivate;
+  auto texture =
+      GetContext()->GetResourceAllocator()->CreateTexture(texture_desc);
+
+  TiledTextureContents contents;
+  contents.SetTexture(texture);
+  contents.SetGeometry(Geometry::MakeCover());
+
+  auto content_context = GetContentContext();
+  auto buffer = content_context->GetContext()->CreateCommandBuffer();
+  auto render_target =
+      GetContentContext()->GetRenderTargetCache()->CreateOffscreenMSAA(
+          *content_context->GetContext(), {100, 100},
+          /*mip_count=*/1);
+  auto render_pass = buffer->CreateRenderPass(render_target);
+  auto recording_pass = std::make_shared<RecordingRenderPass>(
+      render_pass, GetContext(), render_target);
+
+  ASSERT_TRUE(contents.Render(*GetContentContext(), {}, *recording_pass));
+  const std::vector<Command>& commands = recording_pass->GetCommands();
+
+  ASSERT_EQ(commands.size(), 1u);
+  EXPECT_TRUE(commands[0].pipeline->GetDescriptor().GetLabel().find(
+                  "TextureFill Pipeline") != std::string::npos);
+
+  if (GetParam() == PlaygroundBackend::kMetal) {
+    recording_pass->EncodeCommands();
+  }
+}
+
+// GL_OES_EGL_image_external isn't supported on MacOS hosts.
+#if !defined(FML_OS_MACOSX)
+TEST_P(EntityTest, TiledTextureContentsRendersWithCorrectPipelineExternalOES) {
+  if (GetParam() != PlaygroundBackend::kOpenGLES) {
+    GTEST_SKIP_(
+        "External OES textures are only valid for the OpenGLES backend.");
+  }
+
+  TextureDescriptor texture_desc;
+  texture_desc.size = {100, 100};
+  texture_desc.type = TextureType::kTextureExternalOES;
+  texture_desc.format = PixelFormat::kR8G8B8A8UNormInt;
+  texture_desc.storage_mode = StorageMode::kDevicePrivate;
+  auto texture =
+      GetContext()->GetResourceAllocator()->CreateTexture(texture_desc);
+
+  TiledTextureContents contents;
+  contents.SetTexture(texture);
+  contents.SetGeometry(Geometry::MakeCover());
+
+  auto content_context = GetContentContext();
+  auto buffer = content_context->GetContext()->CreateCommandBuffer();
+  auto render_target =
+      GetContentContext()->GetRenderTargetCache()->CreateOffscreenMSAA(
+          *content_context->GetContext(), {100, 100},
+          /*mip_count=*/1);
+  auto render_pass = buffer->CreateRenderPass(render_target);
+
+  ASSERT_TRUE(contents.Render(*GetContentContext(), {}, *render_pass));
+  const std::vector<Command>& commands = render_pass->GetCommands();
+
+  ASSERT_EQ(commands.size(), 1u);
+  EXPECT_TRUE(commands[0].pipeline->GetDescriptor().GetLabel().find(
+                  "TiledTextureFillExternal Pipeline") != std::string::npos);
+}
+#endif
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/entity/contents/vertices_contents.cc b/impeller/entity/contents/vertices_contents.cc
index 3d0357ed9ae129c6e01b12cfa026edef59920af9..f5d433d70f009a9780d1a6407e25db341d236177 100644
--- a/impeller/entity/contents/vertices_contents.cc
+++ b/impeller/entity/contents/vertices_contents.cc
@@ -5,15 +5,13 @@
 #include "vertices_contents.h"
 
 #include "impeller/entity/contents/content_context.h"
-#include "impeller/entity/position.vert.h"
+#include "impeller/entity/contents/filters/color_filter_contents.h"
+#include "impeller/entity/geometry/geometry.h"
+#include "impeller/entity/geometry/vertices_geometry.h"
 #include "impeller/entity/position_color.vert.h"
-#include "impeller/entity/position_uv.vert.h"
 #include "impeller/entity/vertices.frag.h"
 #include "impeller/geometry/color.h"
-#include "impeller/renderer/formats.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler_library.h"
-#include "impeller/renderer/vertex_buffer.h"
 
 namespace impeller {
 
@@ -22,70 +20,182 @@ VerticesContents::VerticesContents() = default;
 VerticesContents::~VerticesContents() = default;
 
 std::optional<Rect> VerticesContents::GetCoverage(const Entity& entity) const {
-  return geometry_->GetCoverage(entity.GetTransformation());
+  return geometry_->GetCoverage(entity.GetTransform());
 };
 
-void VerticesContents::SetGeometry(std::unique_ptr<VerticesGeometry> geometry) {
+void VerticesContents::SetGeometry(std::shared_ptr<VerticesGeometry> geometry) {
   geometry_ = std::move(geometry);
 }
 
-void VerticesContents::SetColor(Color color) {
-  color_ = color.Premultiply();
+void VerticesContents::SetSourceContents(std::shared_ptr<Contents> contents) {
+  src_contents_ = std::move(contents);
+}
+
+std::shared_ptr<VerticesGeometry> VerticesContents::GetGeometry() const {
+  return geometry_;
+}
+
+void VerticesContents::SetAlpha(Scalar alpha) {
+  alpha_ = alpha;
 }
 
 void VerticesContents::SetBlendMode(BlendMode blend_mode) {
   blend_mode_ = blend_mode;
 }
 
+const std::shared_ptr<Contents>& VerticesContents::GetSourceContents() const {
+  return src_contents_;
+}
+
 bool VerticesContents::Render(const ContentContext& renderer,
                               const Entity& entity,
                               RenderPass& pass) const {
-  auto& host_buffer = pass.GetTransientsBuffer();
-  auto vertex_type = geometry_->GetVertexType();
+  if (blend_mode_ == BlendMode::kClear) {
+    return true;
+  }
+  std::shared_ptr<Contents> src_contents = src_contents_;
+  src_contents->SetCoverageHint(GetCoverageHint());
+  if (geometry_->HasTextureCoordinates()) {
+    auto contents = std::make_shared<VerticesUVContents>(*this);
+    contents->SetCoverageHint(GetCoverageHint());
+    if (!geometry_->HasVertexColors()) {
+      contents->SetAlpha(alpha_);
+      return contents->Render(renderer, entity, pass);
+    }
+    src_contents = contents;
+  }
+
+  auto dst_contents = std::make_shared<VerticesColorContents>(*this);
+  dst_contents->SetCoverageHint(GetCoverageHint());
+
+  std::shared_ptr<Contents> contents;
+  if (blend_mode_ == BlendMode::kDestination) {
+    dst_contents->SetAlpha(alpha_);
+    contents = dst_contents;
+  } else {
+    auto color_filter_contents = ColorFilterContents::MakeBlend(
+        blend_mode_, {FilterInput::Make(dst_contents, false),
+                      FilterInput::Make(src_contents, false)});
+    color_filter_contents->SetAlpha(alpha_);
+    color_filter_contents->SetCoverageHint(GetCoverageHint());
+    contents = color_filter_contents;
+  }
 
-  Command cmd;
-  cmd.label = "Vertices";
-  cmd.stencil_reference = entity.GetStencilDepth();
+  FML_DCHECK(contents->GetCoverageHint() == GetCoverageHint());
+  return contents->Render(renderer, entity, pass);
+}
 
-  auto opts = OptionsFromPassAndEntity(pass, entity);
+//------------------------------------------------------
+// VerticesUVContents
 
-  switch (vertex_type) {
-    case GeometryVertexType::kColor: {
-      using VS = GeometryColorPipeline::VertexShader;
-
-      auto geometry_result = geometry_->GetPositionColorBuffer(
-          renderer, entity, pass, color_, blend_mode_);
-      opts.primitive_type = geometry_result.type;
-      cmd.pipeline = renderer.GetGeometryColorPipeline(opts);
-      cmd.BindVertices(geometry_result.vertex_buffer);
-
-      VS::VertInfo vert_info;
-      vert_info.mvp = Matrix::MakeOrthographic(pass.GetRenderTargetSize()) *
-                      entity.GetTransformation();
-      VS::BindVertInfo(cmd, host_buffer.EmplaceUniform(vert_info));
-      break;
-    }
-    case GeometryVertexType::kUV:
-    case GeometryVertexType::kPosition: {
-      using VS = GeometryPositionPipeline::VertexShader;
-
-      auto geometry_result =
-          geometry_->GetPositionBuffer(renderer, entity, pass);
-      opts.primitive_type = geometry_result.type;
-      cmd.pipeline = renderer.GetGeometryPositionPipeline(opts);
-      cmd.BindVertices(geometry_result.vertex_buffer);
-
-      VS::VertInfo vert_info;
-      vert_info.mvp = geometry_result.transform;
-      vert_info.color = color_.Premultiply();
-      VS::BindVertInfo(cmd,
-                       pass.GetTransientsBuffer().EmplaceUniform(vert_info));
-      break;
-    }
+VerticesUVContents::VerticesUVContents(const VerticesContents& parent)
+    : parent_(parent) {}
+
+VerticesUVContents::~VerticesUVContents() {}
+
+std::optional<Rect> VerticesUVContents::GetCoverage(
+    const Entity& entity) const {
+  return parent_.GetCoverage(entity);
+}
+
+void VerticesUVContents::SetAlpha(Scalar alpha) {
+  alpha_ = alpha;
+}
+
+bool VerticesUVContents::Render(const ContentContext& renderer,
+                                const Entity& entity,
+                                RenderPass& pass) const {
+  using VS = TexturePipeline::VertexShader;
+  using FS = TexturePipeline::FragmentShader;
+
+  auto src_contents = parent_.GetSourceContents();
+
+  auto snapshot =
+      src_contents->RenderToSnapshot(renderer,           // renderer
+                                     entity,             // entity
+                                     GetCoverageHint(),  // coverage_limit
+                                     std::nullopt,       // sampler_descriptor
+                                     true,               // msaa_enabled
+                                     /*mip_count=*/1,
+                                     "VerticesUVContents Snapshot");  // label
+  if (!snapshot.has_value()) {
+    return false;
   }
-  pass.AddCommand(std::move(cmd));
 
-  return true;
+  pass.SetCommandLabel("VerticesUV");
+  auto& host_buffer = renderer.GetTransientsBuffer();
+  const std::shared_ptr<Geometry>& geometry = parent_.GetGeometry();
+
+  auto coverage = src_contents->GetCoverage(Entity{});
+  if (!coverage.has_value()) {
+    return false;
+  }
+  auto geometry_result = geometry->GetPositionUVBuffer(
+      coverage.value(), Matrix(), renderer, entity, pass);
+  auto opts = OptionsFromPassAndEntity(pass, entity);
+  opts.primitive_type = geometry_result.type;
+  pass.SetPipeline(renderer.GetTexturePipeline(opts));
+  pass.SetStencilReference(entity.GetClipDepth());
+  pass.SetVertexBuffer(std::move(geometry_result.vertex_buffer));
+
+  VS::FrameInfo frame_info;
+  frame_info.mvp = geometry_result.transform;
+  frame_info.texture_sampler_y_coord_scale =
+      snapshot->texture->GetYCoordScale();
+  frame_info.alpha = alpha_ * snapshot->opacity;
+  VS::BindFrameInfo(pass, host_buffer.EmplaceUniform(frame_info));
+
+  FS::BindTextureSampler(pass, snapshot->texture,
+                         renderer.GetContext()->GetSamplerLibrary()->GetSampler(
+                             snapshot->sampler_descriptor));
+
+  return pass.Draw().ok();
+}
+
+//------------------------------------------------------
+// VerticesColorContents
+
+VerticesColorContents::VerticesColorContents(const VerticesContents& parent)
+    : parent_(parent) {}
+
+VerticesColorContents::~VerticesColorContents() {}
+
+std::optional<Rect> VerticesColorContents::GetCoverage(
+    const Entity& entity) const {
+  return parent_.GetCoverage(entity);
+}
+
+void VerticesColorContents::SetAlpha(Scalar alpha) {
+  alpha_ = alpha;
+}
+
+bool VerticesColorContents::Render(const ContentContext& renderer,
+                                   const Entity& entity,
+                                   RenderPass& pass) const {
+  using VS = GeometryColorPipeline::VertexShader;
+  using FS = GeometryColorPipeline::FragmentShader;
+
+  pass.SetCommandLabel("VerticesColors");
+  auto& host_buffer = renderer.GetTransientsBuffer();
+  const std::shared_ptr<VerticesGeometry>& geometry = parent_.GetGeometry();
+
+  auto geometry_result =
+      geometry->GetPositionColorBuffer(renderer, entity, pass);
+  auto opts = OptionsFromPassAndEntity(pass, entity);
+  opts.primitive_type = geometry_result.type;
+  pass.SetPipeline(renderer.GetGeometryColorPipeline(opts));
+  pass.SetStencilReference(entity.GetClipDepth());
+  pass.SetVertexBuffer(std::move(geometry_result.vertex_buffer));
+
+  VS::FrameInfo frame_info;
+  frame_info.mvp = geometry_result.transform;
+  VS::BindFrameInfo(pass, host_buffer.EmplaceUniform(frame_info));
+
+  FS::FragInfo frag_info;
+  frag_info.alpha = alpha_;
+  FS::BindFragInfo(pass, host_buffer.EmplaceUniform(frag_info));
+
+  return pass.Draw().ok();
 }
 
 }  // namespace impeller
diff --git a/impeller/entity/contents/vertices_contents.h b/impeller/entity/contents/vertices_contents.h
index 0f754c4c8ea25d36a2c9a2288e01a88af763a89b..b5d3590f024218ca5c67ff78b3783afce4b34f80 100644
--- a/impeller/entity/contents/vertices_contents.h
+++ b/impeller/entity/contents/vertices_contents.h
@@ -2,20 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_CONTENTS_VERTICES_CONTENTS_H_
+#define FLUTTER_IMPELLER_ENTITY_CONTENTS_VERTICES_CONTENTS_H_
 
 #include <functional>
 #include <memory>
 #include <vector>
 
 #include "flutter/fml/macros.h"
+#include "impeller/core/sampler_descriptor.h"
 #include "impeller/entity/contents/contents.h"
 #include "impeller/entity/entity.h"
-#include "impeller/entity/geometry.h"
+#include "impeller/entity/geometry/geometry.h"
+#include "impeller/entity/geometry/vertices_geometry.h"
 #include "impeller/geometry/color.h"
 #include "impeller/geometry/path.h"
 #include "impeller/geometry/point.h"
-#include "impeller/renderer/sampler_descriptor.h"
 
 namespace impeller {
 
@@ -25,12 +27,18 @@ class VerticesContents final : public Contents {
 
   ~VerticesContents() override;
 
-  void SetGeometry(std::unique_ptr<VerticesGeometry> geometry);
+  void SetGeometry(std::shared_ptr<VerticesGeometry> geometry);
 
-  void SetColor(Color color);
+  void SetAlpha(Scalar alpha);
 
   void SetBlendMode(BlendMode blend_mode);
 
+  void SetSourceContents(std::shared_ptr<Contents> contents);
+
+  std::shared_ptr<VerticesGeometry> GetGeometry() const;
+
+  const std::shared_ptr<Contents>& GetSourceContents() const;
+
   // |Contents|
   std::optional<Rect> GetCoverage(const Entity& entity) const override;
 
@@ -39,12 +47,67 @@ class VerticesContents final : public Contents {
               const Entity& entity,
               RenderPass& pass) const override;
 
- public:
-  Color color_;
-  std::unique_ptr<VerticesGeometry> geometry_;
+ private:
+  Scalar alpha_;
+  std::shared_ptr<VerticesGeometry> geometry_;
   BlendMode blend_mode_ = BlendMode::kSource;
+  std::shared_ptr<Contents> src_contents_;
+
+  VerticesContents(const VerticesContents&) = delete;
+
+  VerticesContents& operator=(const VerticesContents&) = delete;
+};
+
+class VerticesColorContents final : public Contents {
+ public:
+  explicit VerticesColorContents(const VerticesContents& parent);
+
+  ~VerticesColorContents() override;
+
+  // |Contents|
+  std::optional<Rect> GetCoverage(const Entity& entity) const override;
+
+  // |Contents|
+  bool Render(const ContentContext& renderer,
+              const Entity& entity,
+              RenderPass& pass) const override;
+
+  void SetAlpha(Scalar alpha);
 
-  FML_DISALLOW_COPY_AND_ASSIGN(VerticesContents);
+ private:
+  const VerticesContents& parent_;
+  Scalar alpha_ = 1.0;
+
+  VerticesColorContents(const VerticesColorContents&) = delete;
+
+  VerticesColorContents& operator=(const VerticesColorContents&) = delete;
+};
+
+class VerticesUVContents final : public Contents {
+ public:
+  explicit VerticesUVContents(const VerticesContents& parent);
+
+  ~VerticesUVContents() override;
+
+  // |Contents|
+  std::optional<Rect> GetCoverage(const Entity& entity) const override;
+
+  // |Contents|
+  bool Render(const ContentContext& renderer,
+              const Entity& entity,
+              RenderPass& pass) const override;
+
+  void SetAlpha(Scalar alpha);
+
+ private:
+  const VerticesContents& parent_;
+  Scalar alpha_ = 1.0;
+
+  VerticesUVContents(const VerticesUVContents&) = delete;
+
+  VerticesUVContents& operator=(const VerticesUVContents&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_CONTENTS_VERTICES_CONTENTS_H_
diff --git a/impeller/entity/contents/vertices_contents_unittests.cc b/impeller/entity/contents/vertices_contents_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..86b01643019c52c45a32d4cd0b5179dd6fbcc080
--- /dev/null
+++ b/impeller/entity/contents/vertices_contents_unittests.cc
@@ -0,0 +1,88 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <memory>
+#include <optional>
+
+#include "gtest/gtest.h"
+
+#include "impeller/entity/contents/contents.h"
+#include "impeller/entity/contents/solid_color_contents.h"
+#include "impeller/entity/contents/test/contents_test_helpers.h"
+#include "impeller/entity/contents/test/recording_render_pass.h"
+#include "impeller/entity/contents/vertices_contents.h"
+#include "impeller/entity/entity.h"
+#include "impeller/entity/entity_playground.h"
+#include "impeller/entity/vertices.frag.h"
+#include "impeller/geometry/path_builder.h"
+#include "impeller/renderer/render_target.h"
+
+namespace impeller {
+namespace testing {
+
+using EntityTest = EntityPlayground;
+
+std::shared_ptr<VerticesGeometry> CreateColorVertices(
+    const std::vector<Point>& vertices,
+    const std::vector<Color>& colors) {
+  auto bounds = Rect::MakePointBounds(vertices.begin(), vertices.end());
+  std::vector<uint16_t> indices = {};
+  indices.reserve(vertices.size());
+  for (auto i = 0u; i < vertices.size(); i++) {
+    indices.emplace_back(i);
+  }
+  std::vector<Point> texture_coordinates = {};
+
+  return std::make_shared<VerticesGeometry>(
+      vertices, indices, texture_coordinates, colors,
+      bounds.value_or(Rect::MakeLTRB(0, 0, 0, 0)),
+      VerticesGeometry::VertexMode::kTriangles);
+}
+
+// Verifies that the destination blend fast path still sets an alpha value.
+TEST_P(EntityTest, RendersDstPerColorWithAlpha) {
+  using FS = GeometryColorPipeline::FragmentShader;
+
+  auto contents = std::make_shared<VerticesContents>();
+  auto vertices = CreateColorVertices(
+      {{0, 0}, {100, 0}, {0, 100}, {100, 0}, {0, 100}, {100, 100}},
+      {Color::Red(), Color::Red(), Color::Red(), Color::Red(), Color::Red(),
+       Color::Red()});
+  auto src_contents = SolidColorContents::Make(
+      PathBuilder{}.AddRect(Rect::MakeLTRB(0, 0, 100, 100)).TakePath(),
+      Color::Red());
+
+  contents->SetGeometry(vertices);
+  contents->SetAlpha(0.5);
+  contents->SetBlendMode(BlendMode::kDestination);
+  contents->SetSourceContents(std::move(src_contents));
+
+  auto content_context = GetContentContext();
+  auto buffer = content_context->GetContext()->CreateCommandBuffer();
+  auto render_target =
+      GetContentContext()->GetRenderTargetCache()->CreateOffscreenMSAA(
+          *content_context->GetContext(), {100, 100},
+          /*mip_count=*/1);
+  auto render_pass = buffer->CreateRenderPass(render_target);
+  auto recording_pass = std::make_shared<RecordingRenderPass>(
+      render_pass, GetContext(), render_target);
+  Entity entity;
+
+  ASSERT_TRUE(recording_pass->GetCommands().empty());
+  ASSERT_TRUE(contents->Render(*content_context, entity, *recording_pass));
+
+  ASSERT_TRUE(recording_pass->GetCommands().size() > 0);
+  const auto& cmd = recording_pass->GetCommands()[0];
+  auto* frag_uniforms = GetFragInfo<FS>(cmd);
+
+  ASSERT_TRUE(frag_uniforms);
+  ASSERT_EQ(frag_uniforms->alpha, 0.5);
+
+  if (GetParam() == PlaygroundBackend::kMetal) {
+    recording_pass->EncodeCommands();
+  }
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/entity/entity.cc b/impeller/entity/entity.cc
index c7c054293f185a776c95e0bfcba4a9a69e222e3b..4385ffb8ddc5bfb999c369b477843dd715ffade6 100644
--- a/impeller/entity/entity.cc
+++ b/impeller/entity/entity.cc
@@ -5,27 +5,65 @@
 #include "impeller/entity/entity.h"
 
 #include <algorithm>
+#include <limits>
 #include <optional>
 
 #include "impeller/base/validation.h"
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/contents/filters/filter_contents.h"
+#include "impeller/entity/contents/texture_contents.h"
 #include "impeller/entity/entity_pass.h"
+#include "impeller/geometry/color.h"
 #include "impeller/geometry/vector.h"
 #include "impeller/renderer/render_pass.h"
 
 namespace impeller {
 
+Entity Entity::FromSnapshot(const Snapshot& snapshot,
+                            BlendMode blend_mode,
+                            uint32_t clip_depth) {
+  auto texture_rect = Rect::MakeSize(snapshot.texture->GetSize());
+
+  auto contents = TextureContents::MakeRect(texture_rect);
+  contents->SetTexture(snapshot.texture);
+  contents->SetSamplerDescriptor(snapshot.sampler_descriptor);
+  contents->SetSourceRect(texture_rect);
+  contents->SetOpacity(snapshot.opacity);
+
+  Entity entity;
+  entity.SetBlendMode(blend_mode);
+  entity.SetClipDepth(clip_depth);
+  entity.SetTransform(snapshot.transform);
+  entity.SetContents(contents);
+  return entity;
+}
+
 Entity::Entity() = default;
 
 Entity::~Entity() = default;
 
-const Matrix& Entity::GetTransformation() const {
-  return transformation_;
+Entity::Entity(Entity&&) = default;
+
+Entity::Entity(const Entity&) = default;
+
+const Matrix& Entity::GetTransform() const {
+  return transform_;
+}
+
+Matrix Entity::GetShaderTransform(const RenderPass& pass) const {
+  return Entity::GetShaderTransform(GetShaderClipDepth(), pass, transform_);
+}
+
+Matrix Entity::GetShaderTransform(Scalar shader_clip_depth,
+                                  const RenderPass& pass,
+                                  const Matrix& transform) {
+  return Matrix::MakeTranslation({0, 0, shader_clip_depth}) *
+         Matrix::MakeScale({1, 1, Entity::kDepthEpsilon}) *
+         pass.GetOrthographicTransform() * transform;
 }
 
-void Entity::SetTransformation(const Matrix& transformation) {
-  transformation_ = transformation;
+void Entity::SetTransform(const Matrix& transform) {
+  transform_ = transform;
 }
 
 std::optional<Rect> Entity::GetCoverage() const {
@@ -36,16 +74,20 @@ std::optional<Rect> Entity::GetCoverage() const {
   return contents_->GetCoverage(*this);
 }
 
-Contents::StencilCoverage Entity::GetStencilCoverage(
-    const std::optional<Rect>& current_stencil_coverage) const {
+Contents::ClipCoverage Entity::GetClipCoverage(
+    const std::optional<Rect>& current_clip_coverage) const {
   if (!contents_) {
     return {};
   }
-  return contents_->GetStencilCoverage(*this, current_stencil_coverage);
+  return contents_->GetClipCoverage(*this, current_clip_coverage);
 }
 
-bool Entity::ShouldRender(const std::optional<Rect>& stencil_coverage) const {
-  return contents_->ShouldRender(*this, stencil_coverage);
+bool Entity::ShouldRender(const std::optional<Rect>& clip_coverage) const {
+#ifdef IMPELLER_CONTENT_CULLING
+  return contents_->ShouldRender(*this, clip_coverage);
+#else
+  return true;
+#endif  // IMPELLER_CONTENT_CULLING
 }
 
 void Entity::SetContents(std::shared_ptr<Contents> contents) {
@@ -56,16 +98,33 @@ const std::shared_ptr<Contents>& Entity::GetContents() const {
   return contents_;
 }
 
-void Entity::SetStencilDepth(uint32_t depth) {
-  stencil_depth_ = depth;
+void Entity::SetClipDepth(uint32_t clip_depth) {
+  clip_depth_ = clip_depth;
+}
+
+uint32_t Entity::GetClipDepth() const {
+  return clip_depth_;
 }
 
-uint32_t Entity::GetStencilDepth() const {
-  return stencil_depth_;
+void Entity::SetNewClipDepth(uint32_t clip_depth) {
+  new_clip_depth_ = clip_depth;
+}
+
+uint32_t Entity::GetNewClipDepth() const {
+  return new_clip_depth_;
+}
+
+Scalar Entity::GetShaderClipDepth() const {
+  return Entity::GetShaderClipDepth(new_clip_depth_);
+}
+
+Scalar Entity::GetShaderClipDepth(uint32_t clip_depth) {
+  Scalar result = std::clamp(clip_depth * kDepthEpsilon, 0.0f, 1.0f);
+  return std::min(result, 1.0f - kDepthEpsilon);
 }
 
 void Entity::IncrementStencilDepth(uint32_t increment) {
-  stencil_depth_ += increment;
+  clip_depth_ += increment;
 }
 
 void Entity::SetBlendMode(BlendMode blend_mode) {
@@ -76,7 +135,40 @@ BlendMode Entity::GetBlendMode() const {
   return blend_mode_;
 }
 
-bool Entity::BlendModeShouldCoverWholeScreen(BlendMode blend_mode) {
+bool Entity::CanInheritOpacity() const {
+  if (!contents_) {
+    return false;
+  }
+  if (!((blend_mode_ == BlendMode::kSource && contents_->IsOpaque()) ||
+        blend_mode_ == BlendMode::kSourceOver)) {
+    return false;
+  }
+  return contents_->CanInheritOpacity(*this);
+}
+
+bool Entity::SetInheritedOpacity(Scalar alpha) {
+  if (!CanInheritOpacity()) {
+    return false;
+  }
+  if (blend_mode_ == BlendMode::kSource && contents_->IsOpaque()) {
+    blend_mode_ = BlendMode::kSourceOver;
+  }
+  contents_->SetInheritedOpacity(alpha);
+  return true;
+}
+
+std::optional<Color> Entity::AsBackgroundColor(ISize target_size) const {
+  return contents_->AsBackgroundColor(*this, target_size);
+}
+
+/// @brief  Returns true if the blend mode is "destructive", meaning that even
+///         fully transparent source colors would result in the destination
+///         getting changed.
+///
+///         This is useful for determining if EntityPass textures can be
+///         shrinkwrapped to their Entities' coverage; they can be shrinkwrapped
+///         if all of the contained Entities have non-destructive blends.
+bool Entity::IsBlendModeDestructive(BlendMode blend_mode) {
   switch (blend_mode) {
     case BlendMode::kClear:
     case BlendMode::kSource:
@@ -99,7 +191,28 @@ bool Entity::Render(const ContentContext& renderer,
     return true;
   }
 
+  if (!contents_->GetCoverageHint().has_value()) {
+    contents_->SetCoverageHint(
+        Rect::MakeSize(parent_pass.GetRenderTargetSize()));
+  }
+
   return contents_->Render(renderer, *this, parent_pass);
 }
 
+Scalar Entity::DeriveTextScale() const {
+  return GetTransform().GetMaxBasisLengthXY();
+}
+
+Capture& Entity::GetCapture() const {
+  return capture_;
+}
+
+Entity Entity::Clone() const {
+  return Entity(*this);
+}
+
+void Entity::SetCapture(Capture capture) const {
+  capture_ = std::move(capture);
+}
+
 }  // namespace impeller
diff --git a/impeller/entity/entity.h b/impeller/entity/entity.h
index 02a99015b04b958c961d1aca9c9bcb97c62d493e..d3c532333217b4e2bdc1e21bace284400af895e1 100644
--- a/impeller/entity/entity.h
+++ b/impeller/entity/entity.h
@@ -2,15 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_ENTITY_H_
+#define FLUTTER_IMPELLER_ENTITY_ENTITY_H_
 
-#include <variant>
+#include <cstdint>
+
+#include "impeller/core/capture.h"
 #include "impeller/entity/contents/contents.h"
 #include "impeller/geometry/color.h"
 #include "impeller/geometry/matrix.h"
-#include "impeller/geometry/path.h"
 #include "impeller/geometry/rect.h"
-#include "impeller/image/decompressed_image.h"
 
 namespace impeller {
 
@@ -22,6 +23,19 @@ class Entity {
   static constexpr BlendMode kLastPipelineBlendMode = BlendMode::kModulate;
   static constexpr BlendMode kLastAdvancedBlendMode = BlendMode::kLuminosity;
 
+  static constexpr Scalar kDepthEpsilon = 1.0f / 262144.0;
+
+  enum class RenderingMode {
+    /// In direct mode, the Entity's transform is used as the current
+    /// local-to-screen transform matrix.
+    kDirect,
+    /// In subpass mode, the Entity passed through the filter is in screen space
+    /// rather than local space, and so some filters (namely,
+    /// MatrixFilterContents) need to interpret the given EffectTransform as the
+    /// current transform matrix.
+    kSubpass,
+  };
+
   /// An enum to define how to repeat, fold, or omit colors outside of the
   /// typically defined range of the source of the colors (such as the
   /// bounds of an image or the defining geometry of a gradient).
@@ -49,30 +63,56 @@ class Entity {
     kIntersect,
   };
 
+  /// @brief  Create an entity that can be used to render a given snapshot.
+  static Entity FromSnapshot(const Snapshot& snapshot,
+                             BlendMode blend_mode = BlendMode::kSourceOver,
+                             uint32_t clip_depth = 0);
+
   Entity();
 
   ~Entity();
 
-  const Matrix& GetTransformation() const;
+  Entity(Entity&&);
+
+  /// @brief  Get the global transform matrix for this Entity.
+  const Matrix& GetTransform() const;
 
-  void SetTransformation(const Matrix& transformation);
+  /// @brief  Get the vertex shader transform used for drawing this Entity.
+  Matrix GetShaderTransform(const RenderPass& pass) const;
+
+  /// @brief  Static utility that computes the vertex shader transform used for
+  ///         drawing an Entity with a given the clip depth and RenderPass size.
+  static Matrix GetShaderTransform(Scalar clip_depth,
+                                   const RenderPass& pass,
+                                   const Matrix& transform);
+
+  /// @brief  Set the global transform matrix for this Entity.
+  void SetTransform(const Matrix& transform);
 
   std::optional<Rect> GetCoverage() const;
 
-  Contents::StencilCoverage GetStencilCoverage(
-      const std::optional<Rect>& current_stencil_coverage) const;
+  Contents::ClipCoverage GetClipCoverage(
+      const std::optional<Rect>& current_clip_coverage) const;
 
-  bool ShouldRender(const std::optional<Rect>& stencil_coverage) const;
+  bool ShouldRender(const std::optional<Rect>& clip_coverage) const;
 
   void SetContents(std::shared_ptr<Contents> contents);
 
   const std::shared_ptr<Contents>& GetContents() const;
 
-  void SetStencilDepth(uint32_t stencil_depth);
+  void SetClipDepth(uint32_t clip_depth);
 
   void IncrementStencilDepth(uint32_t increment);
 
-  uint32_t GetStencilDepth() const;
+  uint32_t GetClipDepth() const;
+
+  void SetNewClipDepth(uint32_t clip_depth);
+
+  uint32_t GetNewClipDepth() const;
+
+  float GetShaderClipDepth() const;
+
+  static float GetShaderClipDepth(uint32_t clip_depth);
 
   void SetBlendMode(BlendMode blend_mode);
 
@@ -80,13 +120,33 @@ class Entity {
 
   bool Render(const ContentContext& renderer, RenderPass& parent_pass) const;
 
-  static bool BlendModeShouldCoverWholeScreen(BlendMode blend_mode);
+  static bool IsBlendModeDestructive(BlendMode blend_mode);
+
+  bool CanInheritOpacity() const;
+
+  bool SetInheritedOpacity(Scalar alpha);
+
+  std::optional<Color> AsBackgroundColor(ISize target_size) const;
+
+  Scalar DeriveTextScale() const;
+
+  Capture& GetCapture() const;
+
+  void SetCapture(Capture capture) const;
+
+  Entity Clone() const;
 
  private:
-  Matrix transformation_;
+  Entity(const Entity&);
+
+  Matrix transform_;
   std::shared_ptr<Contents> contents_;
   BlendMode blend_mode_ = BlendMode::kSourceOver;
-  uint32_t stencil_depth_ = 0u;
+  uint32_t clip_depth_ = 0u;
+  uint32_t new_clip_depth_ = 1u;
+  mutable Capture capture_;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_ENTITY_H_
diff --git a/impeller/entity/entity_pass.cc b/impeller/entity/entity_pass.cc
index 2a246864c172ea2470c36cb55ed76d969114fb52..2bce5a9997b36cc8cb4e87ddeaad72d012087da5 100644
--- a/impeller/entity/entity_pass.cc
+++ b/impeller/entity/entity_pass.cc
@@ -4,47 +4,142 @@
 
 #include "impeller/entity/entity_pass.h"
 
+#include <limits>
 #include <memory>
 #include <utility>
 #include <variant>
 
+#include "flutter/fml/closure.h"
 #include "flutter/fml/logging.h"
-#include "flutter/fml/macros.h"
 #include "flutter/fml/trace_event.h"
+#include "impeller/base/strings.h"
 #include "impeller/base/validation.h"
+#include "impeller/core/formats.h"
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/contents/filters/color_filter_contents.h"
 #include "impeller/entity/contents/filters/inputs/filter_input.h"
+#include "impeller/entity/contents/framebuffer_blend_contents.h"
 #include "impeller/entity/contents/texture_contents.h"
 #include "impeller/entity/entity.h"
+#include "impeller/entity/entity_pass_clip_stack.h"
 #include "impeller/entity/inline_pass_context.h"
-#include "impeller/geometry/path_builder.h"
-#include "impeller/renderer/allocator.h"
-#include "impeller/renderer/command.h"
+#include "impeller/geometry/color.h"
+#include "impeller/geometry/rect.h"
+#include "impeller/geometry/size.h"
 #include "impeller/renderer/command_buffer.h"
-#include "impeller/renderer/formats.h"
-#include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/texture.h"
+
+#ifdef IMPELLER_DEBUG
+#include "impeller/entity/contents/checkerboard_contents.h"
+#endif  // IMPELLER_DEBUG
 
 namespace impeller {
 
+namespace {
+std::tuple<std::optional<Color>, BlendMode> ElementAsBackgroundColor(
+    const EntityPass::Element& element,
+    ISize target_size) {
+  if (const Entity* entity = std::get_if<Entity>(&element)) {
+    std::optional<Color> entity_color = entity->AsBackgroundColor(target_size);
+    if (entity_color.has_value()) {
+      return {entity_color.value(), entity->GetBlendMode()};
+    }
+  }
+  return {};
+}
+}  // namespace
+
+const std::string EntityPass::kCaptureDocumentName = "EntityPass";
+
 EntityPass::EntityPass() = default;
 
 EntityPass::~EntityPass() = default;
 
-void EntityPass::SetDelegate(std::unique_ptr<EntityPassDelegate> delegate) {
+void EntityPass::SetDelegate(std::shared_ptr<EntityPassDelegate> delegate) {
   if (!delegate) {
     return;
   }
   delegate_ = std::move(delegate);
 }
 
+void EntityPass::SetBoundsLimit(std::optional<Rect> bounds_limit,
+                                ContentBoundsPromise bounds_promise) {
+  bounds_limit_ = bounds_limit;
+  bounds_promise_ = bounds_limit.has_value() ? bounds_promise
+                                             : ContentBoundsPromise::kUnknown;
+}
+
+std::optional<Rect> EntityPass::GetBoundsLimit() const {
+  return bounds_limit_;
+}
+
+bool EntityPass::GetBoundsLimitMightClipContent() const {
+  switch (bounds_promise_) {
+    case ContentBoundsPromise::kUnknown:
+      // If the promise is unknown due to not having a bounds limit,
+      // then no clipping will occur. But if we have a bounds limit
+      // and it is unkown, then we can make no promises about whether
+      // it causes clipping of the entity pass contents and we
+      // conservatively return true.
+      return bounds_limit_.has_value();
+    case ContentBoundsPromise::kContainsContents:
+      FML_DCHECK(bounds_limit_.has_value());
+      return false;
+    case ContentBoundsPromise::kMayClipContents:
+      FML_DCHECK(bounds_limit_.has_value());
+      return true;
+  }
+  FML_UNREACHABLE();
+}
+
+bool EntityPass::GetBoundsLimitIsSnug() const {
+  switch (bounds_promise_) {
+    case ContentBoundsPromise::kUnknown:
+      return false;
+    case ContentBoundsPromise::kContainsContents:
+    case ContentBoundsPromise::kMayClipContents:
+      FML_DCHECK(bounds_limit_.has_value());
+      return true;
+  }
+  FML_UNREACHABLE();
+}
+
 void EntityPass::AddEntity(Entity entity) {
+  if (entity.GetBlendMode() == BlendMode::kSourceOver &&
+      entity.GetContents()->IsOpaque()) {
+    entity.SetBlendMode(BlendMode::kSource);
+  }
+
   if (entity.GetBlendMode() > Entity::kLastPipelineBlendMode) {
-    reads_from_pass_texture_ += 1;
+    advanced_blend_reads_from_pass_texture_ += 1;
   }
+  elements_.emplace_back(std::move(entity));
+}
 
+void EntityPass::PushClip(Entity entity) {
   elements_.emplace_back(std::move(entity));
+  active_clips_.emplace_back(elements_.size() - 1);
+}
+
+void EntityPass::PopClips(size_t num_clips, uint64_t depth) {
+  if (num_clips > active_clips_.size()) {
+    VALIDATION_LOG
+        << "Attempted to pop more clips than are currently active. Active: "
+        << active_clips_.size() << ", Popped: " << num_clips
+        << ", Depth: " << depth;
+  }
+
+  size_t max = std::min(num_clips, active_clips_.size());
+  for (size_t i = 0; i < max; i++) {
+    FML_DCHECK(active_clips_.back() < elements_.size());
+    Entity* element = std::get_if<Entity>(&elements_[active_clips_.back()]);
+    FML_DCHECK(element);
+    element->SetNewClipDepth(depth);
+    active_clips_.pop_back();
+  }
+}
+
+void EntityPass::PopAllClips(uint64_t depth) {
+  PopClips(active_clips_.size(), depth);
 }
 
 void EntityPass::SetElements(std::vector<Element> elements) {
@@ -62,64 +157,112 @@ size_t EntityPass::GetSubpassesDepth() const {
   return max_subpass_depth + 1u;
 }
 
-const std::shared_ptr<LazyGlyphAtlas>& EntityPass::GetLazyGlyphAtlas() const {
-  return lazy_glyph_atlas_;
-}
-
 std::optional<Rect> EntityPass::GetElementsCoverage(
-    std::optional<Rect> coverage_crop) const {
-  std::optional<Rect> result;
+    std::optional<Rect> coverage_limit) const {
+  std::optional<Rect> accumulated_coverage;
   for (const auto& element : elements_) {
-    std::optional<Rect> coverage;
+    std::optional<Rect> element_coverage;
 
     if (auto entity = std::get_if<Entity>(&element)) {
-      coverage = entity->GetCoverage();
-
-      if (coverage.has_value() && coverage_crop.has_value()) {
-        coverage = coverage->Intersection(coverage_crop.value());
+      element_coverage = entity->GetCoverage();
+
+      // When the coverage limit is std::nullopt, that means there is no limit,
+      // as opposed to empty coverage.
+      if (element_coverage.has_value() && coverage_limit.has_value()) {
+        const auto* filter = entity->GetContents()->AsFilter();
+        if (!filter || filter->IsTranslationOnly()) {
+          element_coverage =
+              element_coverage->Intersection(coverage_limit.value());
+        }
       }
-    } else if (auto subpass =
+    } else if (auto subpass_ptr =
                    std::get_if<std::unique_ptr<EntityPass>>(&element)) {
-      coverage = GetSubpassCoverage(*subpass->get(), coverage_crop);
+      auto& subpass = *subpass_ptr->get();
+
+      std::optional<Rect> unfiltered_coverage =
+          GetSubpassCoverage(subpass, std::nullopt);
+
+      // If the current pass elements have any coverage so far and there's a
+      // backdrop filter, then incorporate the backdrop filter in the
+      // pre-filtered coverage of the subpass.
+      if (accumulated_coverage.has_value() && subpass.backdrop_filter_proc_) {
+        std::shared_ptr<FilterContents> backdrop_filter =
+            subpass.backdrop_filter_proc_(
+                FilterInput::Make(accumulated_coverage.value()),
+                subpass.transform_, Entity::RenderingMode::kSubpass);
+        if (backdrop_filter) {
+          auto backdrop_coverage = backdrop_filter->GetCoverage({});
+          unfiltered_coverage =
+              Rect::Union(unfiltered_coverage, backdrop_coverage);
+        } else {
+          VALIDATION_LOG << "The EntityPass backdrop filter proc didn't return "
+                            "a valid filter.";
+        }
+      }
+
+      if (!unfiltered_coverage.has_value()) {
+        continue;
+      }
+
+      // Additionally, subpass textures may be passed through filters, which may
+      // modify the coverage.
+      //
+      // Note that we currently only assume that ImageFilters (such as blurs and
+      // matrix transforms) may modify coverage, although it's technically
+      // possible ColorFilters to affect coverage as well. For example: A
+      // ColorMatrixFilter could output a completely transparent result, and
+      // we could potentially detect this case as zero coverage in the future.
+      std::shared_ptr<FilterContents> image_filter =
+          subpass.delegate_->WithImageFilter(*unfiltered_coverage,
+                                             subpass.transform_);
+      if (image_filter) {
+        Entity subpass_entity;
+        subpass_entity.SetTransform(subpass.transform_);
+        element_coverage = image_filter->GetCoverage(subpass_entity);
+      } else {
+        element_coverage = unfiltered_coverage;
+      }
+
+      element_coverage = Rect::Intersection(element_coverage, coverage_limit);
     } else {
       FML_UNREACHABLE();
     }
 
-    if (!result.has_value() && coverage.has_value()) {
-      result = coverage;
-      continue;
-    }
-    if (!coverage.has_value()) {
-      continue;
-    }
-    result = result->Union(coverage.value());
+    accumulated_coverage = Rect::Union(accumulated_coverage, element_coverage);
   }
-  return result;
+  return accumulated_coverage;
 }
 
 std::optional<Rect> EntityPass::GetSubpassCoverage(
     const EntityPass& subpass,
-    std::optional<Rect> coverage_clip) const {
-  auto entities_coverage = subpass.GetElementsCoverage(coverage_clip);
+    std::optional<Rect> coverage_limit) const {
+  if (subpass.bounds_limit_.has_value() && subpass.GetBoundsLimitIsSnug()) {
+    return subpass.bounds_limit_->TransformBounds(subpass.transform_);
+  }
+
+  std::shared_ptr<FilterContents> image_filter =
+      subpass.delegate_->WithImageFilter(Rect(), subpass.transform_);
+
+  // If the subpass has an image filter, then its coverage space may deviate
+  // from the parent pass and make intersecting with the pass coverage limit
+  // unsafe.
+  if (image_filter && coverage_limit.has_value()) {
+    coverage_limit = image_filter->GetSourceCoverage(subpass.transform_,
+                                                     coverage_limit.value());
+  }
+
+  auto entities_coverage = subpass.GetElementsCoverage(coverage_limit);
   // The entities don't cover anything. There is nothing to do.
   if (!entities_coverage.has_value()) {
     return std::nullopt;
   }
 
-  // The delegates don't have an opinion on what the entity coverage has to be.
-  // Just use that as-is.
-  auto delegate_coverage = subpass.delegate_->GetCoverageRect();
-  if (!delegate_coverage.has_value()) {
+  if (!subpass.bounds_limit_.has_value()) {
     return entities_coverage;
   }
-  // The delegate coverage hint is in given in local space, so apply the subpass
-  // transformation.
-  delegate_coverage = delegate_coverage->TransformBounds(subpass.xformation_);
-
-  // If the delegate tells us the coverage is smaller than it needs to be, then
-  // great. OTOH, if the delegate is being wasteful, limit coverage to what is
-  // actually needed.
-  return entities_coverage->Intersection(delegate_coverage.value());
+  auto user_bounds_coverage =
+      subpass.bounds_limit_->TransformBounds(subpass.transform_);
+  return entities_coverage->Intersection(user_bounds_coverage);
 }
 
 EntityPass* EntityPass::GetSuperpass() const {
@@ -133,9 +276,11 @@ EntityPass* EntityPass::AddSubpass(std::unique_ptr<EntityPass> pass) {
   FML_DCHECK(pass->superpass_ == nullptr);
   pass->superpass_ = this;
 
-  if (pass->blend_mode_ > Entity::kLastPipelineBlendMode ||
-      pass->backdrop_filter_proc_.has_value()) {
-    reads_from_pass_texture_ += 1;
+  if (pass->backdrop_filter_proc_) {
+    backdrop_filter_reads_from_pass_texture_ += 1;
+  }
+  if (pass->blend_mode_ > Entity::kLastPipelineBlendMode) {
+    advanced_blend_reads_from_pass_texture_ += 1;
   }
 
   auto subpass_pointer = pass.get();
@@ -143,144 +288,336 @@ EntityPass* EntityPass::AddSubpass(std::unique_ptr<EntityPass> pass) {
   return subpass_pointer;
 }
 
-static RenderTarget CreateRenderTarget(ContentContext& renderer,
-                                       ISize size,
-                                       bool readable) {
-  auto context = renderer.GetContext();
+void EntityPass::AddSubpassInline(std::unique_ptr<EntityPass> pass) {
+  if (!pass) {
+    return;
+  }
+  FML_DCHECK(pass->superpass_ == nullptr);
+
+  std::vector<Element>& elements = pass->elements_;
+  for (auto i = 0u; i < elements.size(); i++) {
+    elements_.emplace_back(std::move(elements[i]));
+  }
+
+  backdrop_filter_reads_from_pass_texture_ +=
+      pass->backdrop_filter_reads_from_pass_texture_;
+  advanced_blend_reads_from_pass_texture_ +=
+      pass->advanced_blend_reads_from_pass_texture_;
+}
+
+static const constexpr RenderTarget::AttachmentConfig kDefaultStencilConfig =
+    RenderTarget::AttachmentConfig{
+        .storage_mode = StorageMode::kDeviceTransient,
+        .load_action = LoadAction::kDontCare,
+        .store_action = StoreAction::kDontCare,
+    };
+
+static EntityPassTarget CreateRenderTarget(ContentContext& renderer,
+                                           ISize size,
+                                           int mip_count,
+                                           const Color& clear_color) {
+  const std::shared_ptr<Context>& context = renderer.GetContext();
 
   /// All of the load/store actions are managed by `InlinePassContext` when
   /// `RenderPasses` are created, so we just set them to `kDontCare` here.
   /// What's important is the `StorageMode` of the textures, which cannot be
   /// changed for the lifetime of the textures.
 
-  if (context->SupportsOffscreenMSAA()) {
-    return RenderTarget::CreateOffscreenMSAA(
-        *context,                          // context
-        size,                              // size
-        "EntityPass",                      // label
-        StorageMode::kDeviceTransient,     // color_storage_mode
-        StorageMode::kDevicePrivate,       // color_resolve_storage_mode
-        LoadAction::kDontCare,             // color_load_action
-        StoreAction::kMultisampleResolve,  // color_store_action
-        readable ? StorageMode::kDevicePrivate
-                 : StorageMode::kDeviceTransient,  // stencil_storage_mode
-        LoadAction::kDontCare,                     // stencil_load_action
-        StoreAction::kDontCare                     // stencil_store_action
+  if (context->GetBackendType() == Context::BackendType::kOpenGLES) {
+    // TODO(https://github.com/flutter/flutter/issues/141732): Implement mip map
+    // generation on opengles.
+    mip_count = 1;
+  }
+
+  RenderTarget target;
+  if (context->GetCapabilities()->SupportsOffscreenMSAA()) {
+    target = renderer.GetRenderTargetCache()->CreateOffscreenMSAA(
+        /*context=*/*context,
+        /*size=*/size,
+        /*mip_count=*/mip_count,
+        /*label=*/"EntityPass",
+        /*color_attachment_config=*/
+        RenderTarget::AttachmentConfigMSAA{
+            .storage_mode = StorageMode::kDeviceTransient,
+            .resolve_storage_mode = StorageMode::kDevicePrivate,
+            .load_action = LoadAction::kDontCare,
+            .store_action = StoreAction::kMultisampleResolve,
+            .clear_color = clear_color},
+        /*stencil_attachment_config=*/
+        kDefaultStencilConfig);
+  } else {
+    target = renderer.GetRenderTargetCache()->CreateOffscreen(
+        *context,  // context
+        size,      // size
+        /*mip_count=*/mip_count,
+        "EntityPass",  // label
+        RenderTarget::AttachmentConfig{
+            .storage_mode = StorageMode::kDevicePrivate,
+            .load_action = LoadAction::kDontCare,
+            .store_action = StoreAction::kDontCare,
+            .clear_color = clear_color,
+        },                     // color_attachment_config
+        kDefaultStencilConfig  // stencil_attachment_config
     );
   }
 
-  return RenderTarget::CreateOffscreen(
-      *context,                     // context
-      size,                         // size
-      "EntityPass",                 // label
-      StorageMode::kDevicePrivate,  // color_storage_mode
-      LoadAction::kDontCare,        // color_load_action
-      StoreAction::kDontCare,       // color_store_action
-      readable ? StorageMode::kDevicePrivate
-               : StorageMode::kDeviceTransient,  // stencil_storage_mode
-      LoadAction::kDontCare,                     // stencil_load_action
-      StoreAction::kDontCare                     // stencil_store_action
-  );
+  return EntityPassTarget(
+      target, renderer.GetDeviceCapabilities().SupportsReadFromResolve(),
+      renderer.GetDeviceCapabilities().SupportsImplicitResolvingMSAA());
+}
+
+uint32_t EntityPass::GetTotalPassReads(ContentContext& renderer) const {
+  return renderer.GetDeviceCapabilities().SupportsFramebufferFetch()
+             ? backdrop_filter_reads_from_pass_texture_
+             : backdrop_filter_reads_from_pass_texture_ +
+                   advanced_blend_reads_from_pass_texture_;
 }
 
 bool EntityPass::Render(ContentContext& renderer,
                         const RenderTarget& render_target) const {
-  if (reads_from_pass_texture_ > 0) {
-    auto offscreen_target =
-        CreateRenderTarget(renderer, render_target.GetRenderTargetSize(), true);
-    if (!OnRender(renderer, offscreen_target.GetRenderTargetSize(),
-                  offscreen_target, Point(), Point(), 0)) {
-      return false;
-    }
+  auto capture =
+      renderer.GetContext()->capture.GetDocument(kCaptureDocumentName);
 
-    auto command_buffer = renderer.GetContext()->CreateCommandBuffer();
-    command_buffer->SetLabel("EntityPass Root Command Buffer");
-    auto render_pass = command_buffer->CreateRenderPass(render_target);
-    render_pass->SetLabel("EntityPass Root Render Pass");
+  renderer.GetRenderTargetCache()->Start();
+  fml::ScopedCleanupClosure reset_state([&renderer]() {
+    renderer.GetLazyGlyphAtlas()->ResetTextFrames();
+    renderer.GetRenderTargetCache()->End();
+  });
 
-    {
-      auto size_rect = Rect::MakeSize(offscreen_target.GetRenderTargetSize());
-      auto contents = TextureContents::MakeRect(size_rect);
-      contents->SetTexture(offscreen_target.GetRenderTargetTexture());
-      contents->SetSourceRect(size_rect);
+  auto root_render_target = render_target;
 
-      Entity entity;
-      entity.SetContents(contents);
-      entity.SetBlendMode(BlendMode::kSource);
+  if (root_render_target.GetColorAttachments().find(0u) ==
+      root_render_target.GetColorAttachments().end()) {
+    VALIDATION_LOG << "The root RenderTarget must have a color attachment.";
+    return false;
+  }
+  if (root_render_target.GetDepthAttachment().has_value() !=
+      root_render_target.GetStencilAttachment().has_value()) {
+    VALIDATION_LOG << "The root RenderTarget should have a stencil attachment "
+                      "iff it has a depth attachment.";
+    return false;
+  }
 
-      entity.Render(renderer, *render_pass);
-    }
+  capture.AddRect("Coverage",
+                  Rect::MakeSize(root_render_target.GetRenderTargetSize()),
+                  {.readonly = true});
 
-    if (!render_pass->EncodeCommands()) {
-      return false;
+  const auto& lazy_glyph_atlas = renderer.GetLazyGlyphAtlas();
+  IterateAllEntities([&lazy_glyph_atlas](const Entity& entity) {
+    if (const auto& contents = entity.GetContents()) {
+      contents->PopulateGlyphAtlas(lazy_glyph_atlas, entity.DeriveTextScale());
     }
-    if (!command_buffer->SubmitCommands()) {
+    return true;
+  });
+
+  EntityPassClipStack clip_stack = EntityPassClipStack(
+      Rect::MakeSize(root_render_target.GetRenderTargetSize()));
+
+  bool reads_from_onscreen_backdrop = GetTotalPassReads(renderer) > 0;
+  // In this branch path, we need to render everything to an offscreen texture
+  // and then blit the results onto the onscreen texture. If using this branch,
+  // there's no need to set up a stencil attachment on the root render target.
+  if (reads_from_onscreen_backdrop) {
+    EntityPassTarget offscreen_target = CreateRenderTarget(
+        renderer, root_render_target.GetRenderTargetSize(),
+        GetRequiredMipCount(),
+        GetClearColorOrDefault(render_target.GetRenderTargetSize()));
+
+    if (!OnRender(renderer,  // renderer
+                  capture,   // capture
+                  offscreen_target.GetRenderTarget()
+                      .GetRenderTargetSize(),  // root_pass_size
+                  offscreen_target,            // pass_target
+                  Point(),                     // global_pass_position
+                  Point(),                     // local_pass_position
+                  0,                           // pass_depth
+                  clip_stack                   // clip_coverage_stack
+                  )) {
+      // Validation error messages are triggered for all `OnRender()` failure
+      // cases.
       return false;
     }
 
+    auto command_buffer = renderer.GetContext()->CreateCommandBuffer();
+    command_buffer->SetLabel("EntityPass Root Command Buffer");
+
+    // If the context supports blitting, blit the offscreen texture to the
+    // onscreen texture. Otherwise, draw it to the parent texture using a
+    // pipeline (slower).
+    if (renderer.GetContext()
+            ->GetCapabilities()
+            ->SupportsTextureToTextureBlits()) {
+      auto blit_pass = command_buffer->CreateBlitPass();
+      blit_pass->AddCopy(
+          offscreen_target.GetRenderTarget().GetRenderTargetTexture(),
+          root_render_target.GetRenderTargetTexture());
+      if (!blit_pass->EncodeCommands(
+              renderer.GetContext()->GetResourceAllocator())) {
+        VALIDATION_LOG << "Failed to encode root pass blit command.";
+        return false;
+      }
+      if (!renderer.GetContext()
+               ->GetCommandQueue()
+               ->Submit({command_buffer})
+               .ok()) {
+        return false;
+      }
+    } else {
+      auto render_pass = command_buffer->CreateRenderPass(root_render_target);
+      render_pass->SetLabel("EntityPass Root Render Pass");
+
+      {
+        auto size_rect = Rect::MakeSize(
+            offscreen_target.GetRenderTarget().GetRenderTargetSize());
+        auto contents = TextureContents::MakeRect(size_rect);
+        contents->SetTexture(
+            offscreen_target.GetRenderTarget().GetRenderTargetTexture());
+        contents->SetSourceRect(size_rect);
+        contents->SetLabel("Root pass blit");
+
+        Entity entity;
+        entity.SetContents(contents);
+        entity.SetBlendMode(BlendMode::kSource);
+
+        if (!entity.Render(renderer, *render_pass)) {
+          VALIDATION_LOG << "Failed to render EntityPass root blit.";
+          return false;
+        }
+      }
+
+      if (!render_pass->EncodeCommands()) {
+        VALIDATION_LOG << "Failed to encode root pass command buffer.";
+        return false;
+      }
+      if (!renderer.GetContext()
+               ->GetCommandQueue()
+               ->Submit({command_buffer})
+               .ok()) {
+        return false;
+      }
+    }
+
     return true;
   }
 
-  return OnRender(renderer, render_target.GetRenderTargetSize(), render_target,
-                  Point(), Point(), 0);
+  // If we make it this far, that means the context is capable of rendering
+  // everything directly to the onscreen texture.
+
+  // The safety check for fetching this color attachment is at the beginning of
+  // this method.
+  auto color0 = root_render_target.GetColorAttachments().find(0u)->second;
+
+  auto stencil_attachment = root_render_target.GetStencilAttachment();
+  auto depth_attachment = root_render_target.GetDepthAttachment();
+  if (!stencil_attachment.has_value() || !depth_attachment.has_value()) {
+    // Setup a new root stencil with an optimal configuration if one wasn't
+    // provided by the caller.
+    root_render_target.SetupDepthStencilAttachments(
+        *renderer.GetContext(), *renderer.GetContext()->GetResourceAllocator(),
+        color0.texture->GetSize(),
+        renderer.GetContext()->GetCapabilities()->SupportsOffscreenMSAA(),
+        "ImpellerOnscreen", kDefaultStencilConfig);
+  }
+
+  // Set up the clear color of the root pass.
+  color0.clear_color =
+      GetClearColorOrDefault(render_target.GetRenderTargetSize());
+  root_render_target.SetColorAttachment(color0, 0);
+
+  EntityPassTarget pass_target(
+      root_render_target,
+      renderer.GetDeviceCapabilities().SupportsReadFromResolve(),
+      renderer.GetDeviceCapabilities().SupportsImplicitResolvingMSAA());
+
+  return OnRender(                               //
+      renderer,                                  // renderer
+      capture,                                   // capture
+      root_render_target.GetRenderTargetSize(),  // root_pass_size
+      pass_target,                               // pass_target
+      Point(),                                   // global_pass_position
+      Point(),                                   // local_pass_position
+      0,                                         // pass_depth
+      clip_stack);                               // clip_coverage_stack
 }
 
 EntityPass::EntityResult EntityPass::GetEntityForElement(
     const EntityPass::Element& element,
     ContentContext& renderer,
+    Capture& capture,
     InlinePassContext& pass_context,
     ISize root_pass_size,
-    Point position,
+    Point global_pass_position,
     uint32_t pass_depth,
-    size_t stencil_depth_floor) const {
-  Entity element_entity;
-
+    EntityPassClipStack& clip_coverage_stack,
+    size_t clip_depth_floor) const {
   //--------------------------------------------------------------------------
   /// Setup entity element.
   ///
-
   if (const auto& entity = std::get_if<Entity>(&element)) {
-    element_entity = *entity;
-    if (!position.IsZero()) {
+    Entity element_entity = entity->Clone();
+    element_entity.SetCapture(capture.CreateChild("Entity"));
+
+    if (!global_pass_position.IsZero()) {
       // If the pass image is going to be rendered with a non-zero position,
       // apply the negative translation to entity copies before rendering them
       // so that they'll end up rendering to the correct on-screen position.
-      element_entity.SetTransformation(
-          Matrix::MakeTranslation(Vector3(-position)) *
-          element_entity.GetTransformation());
+      element_entity.SetTransform(
+          Matrix::MakeTranslation(Vector3(-global_pass_position)) *
+          element_entity.GetTransform());
     }
+    return EntityPass::EntityResult::Success(std::move(element_entity));
   }
 
   //--------------------------------------------------------------------------
   /// Setup subpass element.
   ///
-
-  else if (const auto& subpass_ptr =
-               std::get_if<std::unique_ptr<EntityPass>>(&element)) {
+  if (const auto& subpass_ptr =
+          std::get_if<std::unique_ptr<EntityPass>>(&element)) {
     auto subpass = subpass_ptr->get();
-
     if (subpass->delegate_->CanElide()) {
       return EntityPass::EntityResult::Skip();
     }
 
-    if (subpass->delegate_->CanCollapseIntoParentPass() &&
-        !subpass->backdrop_filter_proc_.has_value()) {
+    if (!subpass->backdrop_filter_proc_ &&
+        subpass->delegate_->CanCollapseIntoParentPass(subpass)) {
+      auto subpass_capture = capture.CreateChild("EntityPass (Collapsed)");
       // Directly render into the parent target and move on.
-      if (!subpass->OnRender(renderer, root_pass_size,
-                             pass_context.GetRenderTarget(), position, position,
-                             stencil_depth_floor)) {
+      if (!subpass->OnRender(
+              renderer,                      // renderer
+              subpass_capture,               // capture
+              root_pass_size,                // root_pass_size
+              pass_context.GetPassTarget(),  // pass_target
+              global_pass_position,          // global_pass_position
+              Point(),                       // local_pass_position
+              pass_depth,                    // pass_depth
+              clip_coverage_stack,           // clip_coverage_stack
+              clip_depth_,                   // clip_depth_floor
+              nullptr,                       // backdrop_filter_contents
+              pass_context.GetRenderPass(pass_depth)  // collapsed_parent_pass
+              )) {
+        // Validation error messages are triggered for all `OnRender()` failure
+        // cases.
         return EntityPass::EntityResult::Failure();
       }
       return EntityPass::EntityResult::Skip();
     }
 
-    std::shared_ptr<Contents> backdrop_filter_contents = nullptr;
-    if (subpass->backdrop_filter_proc_.has_value()) {
+    std::shared_ptr<Contents> subpass_backdrop_filter_contents = nullptr;
+    if (subpass->backdrop_filter_proc_) {
       auto texture = pass_context.GetTexture();
       // Render the backdrop texture before any of the pass elements.
-      const auto& proc = subpass->backdrop_filter_proc_.value();
-      backdrop_filter_contents =
-          proc(FilterInput::Make(std::move(texture)), subpass->xformation_);
+      const auto& proc = subpass->backdrop_filter_proc_;
+      subpass_backdrop_filter_contents =
+          proc(FilterInput::Make(std::move(texture)),
+               subpass->transform_.Basis(), Entity::RenderingMode::kSubpass);
+
+      // If the very first thing we render in this EntityPass is a subpass that
+      // happens to have a backdrop filter, than that backdrop filter will end
+      // may wind up sampling from the raw, uncleared texture that came straight
+      // out of the texture cache. By calling `pass_context.GetRenderPass` here,
+      // we force the texture to pass through at least one RenderPass with the
+      // correct clear configuration before any sampling occurs.
+      pass_context.GetRenderPass(pass_depth);
 
       // The subpass will need to read from the current pass texture when
       // rendering the backdrop, so if there's an active pass, end it prior to
@@ -288,54 +625,104 @@ EntityPass::EntityResult EntityPass::GetEntityForElement(
       pass_context.EndPass();
     }
 
-    auto subpass_coverage =
-        GetSubpassCoverage(*subpass, Rect::MakeSize(root_pass_size));
-    if (subpass->cover_whole_screen_) {
-      subpass_coverage = Rect(
-          position, Size(pass_context.GetRenderTarget().GetRenderTargetSize()));
-    }
-    if (backdrop_filter_contents) {
-      auto backdrop_coverage = backdrop_filter_contents->GetCoverage(Entity{});
-      if (backdrop_coverage.has_value()) {
-        backdrop_coverage->origin += position;
-
-        if (subpass_coverage.has_value()) {
-          subpass_coverage = subpass_coverage->Union(backdrop_coverage.value());
-        } else {
-          subpass_coverage = backdrop_coverage;
-        }
-      }
+    if (!clip_coverage_stack.HasCoverage()) {
+      // The current clip is empty. This means the pass texture won't be
+      // visible, so skip it.
+      capture.CreateChild("Subpass Entity (Skipped: Empty clip A)");
+      return EntityPass::EntityResult::Skip();
+    }
+    auto clip_coverage_back = clip_coverage_stack.CurrentClipCoverage();
+    if (!clip_coverage_back.has_value()) {
+      capture.CreateChild("Subpass Entity (Skipped: Empty clip B)");
+      return EntityPass::EntityResult::Skip();
+    }
+
+    // The maximum coverage of the subpass. Subpasses textures should never
+    // extend outside the parent pass texture or the current clip coverage.
+    auto coverage_limit = Rect::MakeOriginSize(global_pass_position,
+                                               Size(pass_context.GetPassTarget()
+                                                        .GetRenderTarget()
+                                                        .GetRenderTargetSize()))
+                              .Intersection(clip_coverage_back.value());
+    if (!coverage_limit.has_value()) {
+      capture.CreateChild("Subpass Entity (Skipped: Empty coverage limit A)");
+      return EntityPass::EntityResult::Skip();
     }
 
-    if (subpass_coverage.has_value()) {
-      subpass_coverage =
-          subpass_coverage->Intersection(Rect::MakeSize(root_pass_size));
+    coverage_limit =
+        coverage_limit->Intersection(Rect::MakeSize(root_pass_size));
+    if (!coverage_limit.has_value()) {
+      capture.CreateChild("Subpass Entity (Skipped: Empty coverage limit B)");
+      return EntityPass::EntityResult::Skip();
     }
 
+    auto subpass_coverage =
+        (subpass->flood_clip_ || subpass_backdrop_filter_contents)
+            ? coverage_limit
+            : GetSubpassCoverage(*subpass, coverage_limit);
     if (!subpass_coverage.has_value()) {
+      capture.CreateChild("Subpass Entity (Skipped: Empty subpass coverage A)");
       return EntityPass::EntityResult::Skip();
     }
 
-    if (subpass_coverage->size.IsEmpty()) {
-      // It is not an error to have an empty subpass. But subpasses that can't
-      // create their intermediates must trip errors.
+    auto subpass_size = ISize(subpass_coverage->GetSize());
+    if (subpass_size.IsEmpty()) {
+      capture.CreateChild("Subpass Entity (Skipped: Empty subpass coverage B)");
       return EntityPass::EntityResult::Skip();
     }
 
-    auto subpass_target =
-        CreateRenderTarget(renderer,                       //
-                           ISize(subpass_coverage->size),  //
-                           subpass->reads_from_pass_texture_ > 0);
+    auto subpass_target = CreateRenderTarget(
+        renderer,      // renderer
+        subpass_size,  // size
+        subpass->GetRequiredMipCount(),
+        subpass->GetClearColorOrDefault(subpass_size));  // clear_color
 
-    auto subpass_texture = subpass_target.GetRenderTargetTexture();
+    if (!subpass_target.IsValid()) {
+      VALIDATION_LOG << "Subpass render target is invalid.";
+      return EntityPass::EntityResult::Failure();
+    }
+
+    auto subpass_capture = capture.CreateChild("EntityPass");
+    subpass_capture.AddRect("Coverage", *subpass_coverage, {.readonly = true});
 
-    if (!subpass_texture) {
+    // Start non-collapsed subpasses with a fresh clip coverage stack limited by
+    // the subpass coverage. This is important because image filters applied to
+    // save layers may transform the subpass texture after it's rendered,
+    // causing parent clip coverage to get misaligned with the actual area that
+    // the subpass will affect in the parent pass.
+    clip_coverage_stack.PushSubpass(subpass_coverage, subpass->clip_depth_);
+
+    // Stencil textures aren't shared between EntityPasses (as much of the
+    // time they are transient).
+    if (!subpass->OnRender(
+            renderer,                       // renderer
+            subpass_capture,                // capture
+            root_pass_size,                 // root_pass_size
+            subpass_target,                 // pass_target
+            subpass_coverage->GetOrigin(),  // global_pass_position
+            subpass_coverage->GetOrigin() -
+                global_pass_position,         // local_pass_position
+            ++pass_depth,                     // pass_depth
+            clip_coverage_stack,              // clip_coverage_stack
+            subpass->clip_depth_,             // clip_depth_floor
+            subpass_backdrop_filter_contents  // backdrop_filter_contents
+            )) {
+      // Validation error messages are triggered for all `OnRender()` failure
+      // cases.
       return EntityPass::EntityResult::Failure();
     }
 
+    clip_coverage_stack.PopSubpass();
+
+    // The subpass target's texture may have changed during OnRender.
+    auto subpass_texture =
+        subpass_target.GetRenderTarget().GetRenderTargetTexture();
+
     auto offscreen_texture_contents =
         subpass->delegate_->CreateContentsForSubpassTarget(
-            subpass_texture, subpass->xformation_);
+            subpass_texture,
+            Matrix::MakeTranslation(Vector3{-global_pass_position}) *
+                subpass->transform_);
 
     if (!offscreen_texture_contents) {
       // This is an error because the subpass delegate said the pass couldn't
@@ -348,154 +735,233 @@ EntityPass::EntityResult EntityPass::GetEntityForElement(
       // right thing.
       return EntityPass::EntityResult::Failure();
     }
-
-    // Stencil textures aren't shared between EntityPasses (as much of the
-    // time they are transient).
-    if (!subpass->OnRender(renderer, root_pass_size, subpass_target,
-                           subpass_coverage->origin, position, ++pass_depth,
-                           subpass->stencil_depth_, backdrop_filter_contents)) {
-      return EntityPass::EntityResult::Failure();
-    }
-
+    Entity element_entity;
+    Capture subpass_texture_capture =
+        capture.CreateChild("Entity (Subpass texture)");
+    element_entity.SetNewClipDepth(subpass->new_clip_depth_);
+    element_entity.SetCapture(subpass_texture_capture);
     element_entity.SetContents(std::move(offscreen_texture_contents));
-    element_entity.SetStencilDepth(subpass->stencil_depth_);
+    element_entity.SetClipDepth(subpass->clip_depth_);
     element_entity.SetBlendMode(subpass->blend_mode_);
-    element_entity.SetTransformation(
-        Matrix::MakeTranslation(Vector3(subpass_coverage->origin - position)));
-  } else {
-    FML_UNREACHABLE();
-  }
+    element_entity.SetTransform(subpass_texture_capture.AddMatrix(
+        "Transform",
+        Matrix::MakeTranslation(
+            Vector3(subpass_coverage->GetOrigin() - global_pass_position))));
 
-  return EntityPass::EntityResult::Success(element_entity);
+    return EntityPass::EntityResult::Success(std::move(element_entity));
+  }
+  FML_UNREACHABLE();
+  return EntityPass::EntityResult::Failure();
 }
 
-struct StencilLayer {
-  std::optional<Rect> coverage;
-  size_t stencil_depth;
-};
-
-bool EntityPass::OnRender(
-    ContentContext& renderer,
-    ISize root_pass_size,
-    const RenderTarget& render_target,
-    Point position,
-    Point parent_position,
-    uint32_t pass_depth,
-    size_t stencil_depth_floor,
-    std::shared_ptr<Contents> backdrop_filter_contents) const {
-  TRACE_EVENT0("impeller", "EntityPass::OnRender");
+static void SetClipScissor(std::optional<Rect> clip_coverage,
+                           RenderPass& pass,
+                           Point global_pass_position) {
+  if constexpr (!ContentContext::kEnableStencilThenCover) {
+    return;
+  }
+  // Set the scissor to the clip coverage area. We do this prior to rendering
+  // the clip itself and all its contents.
+  IRect scissor;
+  if (clip_coverage.has_value()) {
+    clip_coverage = clip_coverage->Shift(-global_pass_position);
+    scissor = IRect::RoundOut(clip_coverage.value());
+    // The scissor rect must not exceed the size of the render target.
+    scissor = scissor.Intersection(IRect::MakeSize(pass.GetRenderTargetSize()))
+                  .value_or(IRect());
+  }
+  pass.SetScissor(scissor);
+}
 
-  auto context = renderer.GetContext();
-  InlinePassContext pass_context(context, render_target,
-                                 reads_from_pass_texture_);
-  if (!pass_context.IsValid()) {
+bool EntityPass::RenderElement(Entity& element_entity,
+                               size_t clip_depth_floor,
+                               InlinePassContext& pass_context,
+                               int32_t pass_depth,
+                               ContentContext& renderer,
+                               EntityPassClipStack& clip_coverage_stack,
+                               Point global_pass_position) const {
+  auto result = pass_context.GetRenderPass(pass_depth);
+  if (!result.pass) {
+    // Failure to produce a render pass should be explained by specific errors
+    // in `InlinePassContext::GetRenderPass()`, so avoid log spam and don't
+    // append a validation log here.
     return false;
   }
 
-  std::vector<StencilLayer> stencil_stack = {StencilLayer{
-      .coverage = Rect::MakeSize(render_target.GetRenderTargetSize()),
-      .stencil_depth = stencil_depth_floor}};
-
-  auto render_element = [&stencil_depth_floor, &pass_context, &pass_depth,
-                         &renderer, &stencil_stack](Entity& element_entity) {
-    auto result = pass_context.GetRenderPass(pass_depth);
-
-    if (!result.pass) {
+  // If the pass context returns a backdrop texture, we need to draw it to the
+  // current pass. We do this because it's faster and takes significantly less
+  // memory than storing/loading large MSAA textures. Also, it's not possible to
+  // blit the non-MSAA resolve texture of the previous pass to MSAA textures
+  // (let alone a transient one).
+  if (result.backdrop_texture) {
+    auto size_rect = Rect::MakeSize(result.pass->GetRenderTargetSize());
+    auto msaa_backdrop_contents = TextureContents::MakeRect(size_rect);
+    msaa_backdrop_contents->SetStencilEnabled(false);
+    msaa_backdrop_contents->SetLabel("MSAA backdrop");
+    msaa_backdrop_contents->SetSourceRect(size_rect);
+    msaa_backdrop_contents->SetTexture(result.backdrop_texture);
+
+    Entity msaa_backdrop_entity;
+    msaa_backdrop_entity.SetContents(std::move(msaa_backdrop_contents));
+    msaa_backdrop_entity.SetBlendMode(BlendMode::kSource);
+    msaa_backdrop_entity.SetNewClipDepth(std::numeric_limits<uint32_t>::max());
+    if (!msaa_backdrop_entity.Render(renderer, *result.pass)) {
+      VALIDATION_LOG << "Failed to render MSAA backdrop filter entity.";
       return false;
     }
+  }
 
-    // If the pass context returns a texture, we need to draw it to the current
-    // pass. We do this because it's faster and takes significantly less memory
-    // than storing/loading large MSAA textures.
-    if (result.backdrop_texture) {
-      auto size_rect = Rect::MakeSize(result.pass->GetRenderTargetSize());
-      auto msaa_backdrop_contents = TextureContents::MakeRect(size_rect);
-      msaa_backdrop_contents->SetStencilEnabled(false);
-      msaa_backdrop_contents->SetLabel("MSAA backdrop");
-      msaa_backdrop_contents->SetSourceRect(size_rect);
-      msaa_backdrop_contents->SetTexture(result.backdrop_texture);
-
-      Entity msaa_backdrop_entity;
-      msaa_backdrop_entity.SetContents(std::move(msaa_backdrop_contents));
-      msaa_backdrop_entity.SetBlendMode(BlendMode::kSource);
-      if (!msaa_backdrop_entity.Render(renderer, *result.pass)) {
-        return false;
+  if (result.just_created) {
+    // Restore any clips that were recorded before the backdrop filter was
+    // applied.
+    auto& replay_entities = clip_coverage_stack.GetReplayEntities();
+    for (const auto& replay : replay_entities) {
+      SetClipScissor(clip_coverage_stack.CurrentClipCoverage(), *result.pass,
+                     global_pass_position);
+      if (!replay.entity.Render(renderer, *result.pass)) {
+        VALIDATION_LOG << "Failed to render entity for clip restore.";
       }
     }
+  }
 
-    if (!element_entity.ShouldRender(stencil_stack.back().coverage)) {
-      return true;  // Nothing to render.
-    }
+  auto current_clip_coverage = clip_coverage_stack.CurrentClipCoverage();
+  if (current_clip_coverage.has_value()) {
+    // Entity transforms are relative to the current pass position, so we need
+    // to check clip coverage in the same space.
+    current_clip_coverage = current_clip_coverage->Shift(-global_pass_position);
+  }
 
-    auto stencil_coverage =
-        element_entity.GetStencilCoverage(stencil_stack.back().coverage);
+  if (!element_entity.ShouldRender(current_clip_coverage)) {
+    return true;  // Nothing to render.
+  }
 
-    switch (stencil_coverage.type) {
-      case Contents::StencilCoverage::Type::kNone:
-        break;
-      case Contents::StencilCoverage::Type::kAppend: {
-        auto op = stencil_stack.back().coverage;
-        stencil_stack.push_back(StencilLayer{
-            .coverage = stencil_coverage.coverage,
-            .stencil_depth = element_entity.GetStencilDepth() + 1});
-
-        if (!op.has_value()) {
-          // Running this append op won't impact the stencil because the whole
-          // screen is already being clipped, so skip it.
-          return true;
-        }
-      } break;
-      case Contents::StencilCoverage::Type::kRestore: {
-        if (stencil_stack.back().stencil_depth <=
-            element_entity.GetStencilDepth()) {
-          // Drop stencil restores that will do nothing.
-          return true;
-        }
+  auto clip_coverage = element_entity.GetClipCoverage(current_clip_coverage);
+  if (clip_coverage.coverage.has_value()) {
+    clip_coverage.coverage =
+        clip_coverage.coverage->Shift(global_pass_position);
+  }
 
-        auto restoration_depth =
-            element_entity.GetStencilDepth() - stencil_depth_floor;
-        FML_DCHECK(restoration_depth < stencil_stack.size());
+  // The coverage hint tells the rendered Contents which portion of the
+  // rendered output will actually be used, and so we set this to the current
+  // clip coverage (which is the max clip bounds). The contents may
+  // optionally use this hint to avoid unnecessary rendering work.
+  auto element_coverage_hint = element_entity.GetContents()->GetCoverageHint();
+  element_entity.GetContents()->SetCoverageHint(
+      Rect::Intersection(element_coverage_hint, current_clip_coverage));
+
+  EntityPassClipStack::ClipStateResult clip_state_result =
+      clip_coverage_stack.ApplyClipState(clip_coverage, element_entity,
+                                         clip_depth_floor,
+                                         global_pass_position);
+
+  if (clip_state_result.clip_did_change) {
+    // We only need to update the pass scissor if the clip state has changed.
+    SetClipScissor(clip_coverage_stack.CurrentClipCoverage(), *result.pass,
+                   global_pass_position);
+  }
 
-        stencil_stack.resize(restoration_depth + 1);
+  if (!clip_state_result.should_render) {
+    return true;
+  }
 
-        if (!stencil_stack.back().coverage.has_value()) {
-          // Running this restore op won't make anything renderable, so skip it.
-          return true;
-        }
-      } break;
-    }
+  if (!element_entity.Render(renderer, *result.pass)) {
+    VALIDATION_LOG << "Failed to render entity.";
+    return false;
+  }
+  return true;
+}
 
-    element_entity.SetStencilDepth(element_entity.GetStencilDepth() -
-                                   stencil_depth_floor);
-    if (!element_entity.Render(renderer, *result.pass)) {
-      return false;
-    }
-    return true;
-  };
+bool EntityPass::OnRender(
+    ContentContext& renderer,
+    Capture& capture,
+    ISize root_pass_size,
+    EntityPassTarget& pass_target,
+    Point global_pass_position,
+    Point local_pass_position,
+    uint32_t pass_depth,
+    EntityPassClipStack& clip_coverage_stack,
+    size_t clip_depth_floor,
+    std::shared_ptr<Contents> backdrop_filter_contents,
+    const std::optional<InlinePassContext::RenderPassResult>&
+        collapsed_parent_pass) const {
+  TRACE_EVENT0("impeller", "EntityPass::OnRender");
+
+  if (!active_clips_.empty()) {
+    VALIDATION_LOG << SPrintF(
+        "EntityPass (Depth=%d) contains one or more clips with an unresolved "
+        "depth value.",
+        pass_depth);
+  }
+
+  InlinePassContext pass_context(renderer, pass_target,
+                                 GetTotalPassReads(renderer), GetElementCount(),
+                                 collapsed_parent_pass);
+  if (!pass_context.IsValid()) {
+    VALIDATION_LOG << SPrintF("Pass context invalid (Depth=%d)", pass_depth);
+    return false;
+  }
+  auto clear_color_size = pass_target.GetRenderTarget().GetRenderTargetSize();
+
+  if (!collapsed_parent_pass) {
+    // Always force the pass to construct the render pass object, even if there
+    // is not a clear color. This ensures that the attachment textures are
+    // cleared/transitioned to the right state.
+    pass_context.GetRenderPass(pass_depth);
+  }
 
-  if (backdrop_filter_proc_.has_value()) {
+  if (backdrop_filter_proc_) {
     if (!backdrop_filter_contents) {
+      VALIDATION_LOG
+          << "EntityPass contains a backdrop filter, but no backdrop filter "
+             "contents was supplied by the parent pass at render time. This is "
+             "a bug in EntityPass. Parent passes are responsible for setting "
+             "up backdrop filters for their children.";
       return false;
     }
 
     Entity backdrop_entity;
     backdrop_entity.SetContents(std::move(backdrop_filter_contents));
-    backdrop_entity.SetTransformation(
-        Matrix::MakeTranslation(Vector3(parent_position - position)));
-    backdrop_entity.SetStencilDepth(stencil_depth_floor);
+    backdrop_entity.SetTransform(
+        Matrix::MakeTranslation(Vector3(-local_pass_position)));
+    backdrop_entity.SetClipDepth(clip_depth_floor);
+    backdrop_entity.SetNewClipDepth(std::numeric_limits<uint32_t>::max());
 
-    render_element(backdrop_entity);
+    RenderElement(backdrop_entity, clip_depth_floor, pass_context, pass_depth,
+                  renderer, clip_coverage_stack, global_pass_position);
   }
 
+  bool is_collapsing_clear_colors = !collapsed_parent_pass &&
+                                    // Backdrop filters act as a entity before
+                                    // everything and disrupt the optimization.
+                                    !backdrop_filter_proc_;
   for (const auto& element : elements_) {
+    // Skip elements that are incorporated into the clear color.
+    if (is_collapsing_clear_colors) {
+      auto [entity_color, _] =
+          ElementAsBackgroundColor(element, clear_color_size);
+      if (entity_color.has_value()) {
+        continue;
+      }
+      is_collapsing_clear_colors = false;
+    }
+
     EntityResult result =
-        GetEntityForElement(element, renderer, pass_context, root_pass_size,
-                            position, pass_depth, stencil_depth_floor);
+        GetEntityForElement(element,               // element
+                            renderer,              // renderer
+                            capture,               // capture
+                            pass_context,          // pass_context
+                            root_pass_size,        // root_pass_size
+                            global_pass_position,  // global_pass_position
+                            pass_depth,            // pass_depth
+                            clip_coverage_stack,   // clip_coverage_stack
+                            clip_depth_floor);     // clip_depth_floor
 
     switch (result.status) {
       case EntityResult::kSuccess:
         break;
       case EntityResult::kFailure:
+        // All failure cases should be covered by specific validation messages
+        // in `GetEntityForElement()`.
         return false;
       case EntityResult::kSkip:
         continue;
@@ -506,49 +972,125 @@ bool EntityPass::OnRender(
     ///
 
     if (result.entity.GetBlendMode() > Entity::kLastPipelineBlendMode) {
-      // End the active pass and flush the buffer before rendering "advanced"
-      // blends. Advanced blends work by binding the current render target
-      // texture as an input ("destination"), blending with a second texture
-      // input ("source"), writing the result to an intermediate texture, and
-      // finally copying the data from the intermediate texture back to the
-      // render target texture. And so all of the commands that have written
-      // to the render target texture so far need to execute before it's bound
-      // for blending (otherwise the blend pass will end up executing before
-      // all the previous commands in the active pass).
-      if (!pass_context.EndPass()) {
-        return false;
-      }
+      if (renderer.GetDeviceCapabilities().SupportsFramebufferFetch()) {
+        auto src_contents = result.entity.GetContents();
+        auto contents = std::make_shared<FramebufferBlendContents>();
+        contents->SetChildContents(src_contents);
+        contents->SetBlendMode(result.entity.GetBlendMode());
+        result.entity.SetContents(std::move(contents));
+        result.entity.SetBlendMode(BlendMode::kSource);
+      } else {
+        // End the active pass and flush the buffer before rendering "advanced"
+        // blends. Advanced blends work by binding the current render target
+        // texture as an input ("destination"), blending with a second texture
+        // input ("source"), writing the result to an intermediate texture, and
+        // finally copying the data from the intermediate texture back to the
+        // render target texture. And so all of the commands that have written
+        // to the render target texture so far need to execute before it's bound
+        // for blending (otherwise the blend pass will end up executing before
+        // all the previous commands in the active pass).
+
+        if (!pass_context.EndPass()) {
+          VALIDATION_LOG
+              << "Failed to end the current render pass in order to read from "
+                 "the backdrop texture and apply an advanced blend.";
+          return false;
+        }
 
-      // Amend an advanced blend filter to the contents, attaching the pass
-      // texture.
-      auto texture = pass_context.GetTexture();
-      if (!texture) {
-        return false;
-      }
+        // Amend an advanced blend filter to the contents, attaching the pass
+        // texture.
+        auto texture = pass_context.GetTexture();
+        if (!texture) {
+          VALIDATION_LOG << "Failed to fetch the color texture in order to "
+                            "apply an advanced blend.";
+          return false;
+        }
 
-      FilterInput::Vector inputs = {
-          FilterInput::Make(result.entity.GetContents()),
-          FilterInput::Make(texture,
-                            result.entity.GetTransformation().Invert())};
-      auto contents =
-          ColorFilterContents::MakeBlend(result.entity.GetBlendMode(), inputs);
-      contents->SetCoverageCrop(result.entity.GetCoverage());
-      result.entity.SetContents(std::move(contents));
-      result.entity.SetBlendMode(BlendMode::kSource);
+        FilterInput::Vector inputs = {
+            FilterInput::Make(texture, result.entity.GetTransform().Invert()),
+            FilterInput::Make(result.entity.GetContents())};
+        auto contents = ColorFilterContents::MakeBlend(
+            result.entity.GetBlendMode(), inputs);
+        contents->SetCoverageHint(result.entity.GetCoverage());
+        result.entity.SetContents(std::move(contents));
+        result.entity.SetBlendMode(BlendMode::kSource);
+      }
     }
 
     //--------------------------------------------------------------------------
     /// Render the Element.
     ///
+    if (!RenderElement(result.entity, clip_depth_floor, pass_context,
+                       pass_depth, renderer, clip_coverage_stack,
+                       global_pass_position)) {
+      // Specific validation logs are handled in `render_element()`.
+      return false;
+    }
+  }
+
+#ifdef IMPELLER_DEBUG
+  //--------------------------------------------------------------------------
+  /// Draw debug checkerboard over offscreen textures.
+  ///
 
-    if (!render_element(result.entity)) {
+  // When the pass depth is > 0, this EntityPass is being rendered to an
+  // offscreen texture.
+  if (enable_offscreen_debug_checkerboard_ &&
+      !collapsed_parent_pass.has_value() && pass_depth > 0) {
+    auto result = pass_context.GetRenderPass(pass_depth);
+    if (!result.pass) {
+      // Failure to produce a render pass should be explained by specific errors
+      // in `InlinePassContext::GetRenderPass()`.
       return false;
     }
+    auto checkerboard = CheckerboardContents();
+    auto color = ColorHSB(0,                                    // hue
+                          1,                                    // saturation
+                          std::max(0.0, 0.6 - pass_depth / 5),  // brightness
+                          0.25);                                // alpha
+    checkerboard.SetColor(Color(color));
+    checkerboard.Render(renderer, {}, *result.pass);
   }
+#endif
 
   return true;
 }
 
+void EntityPass::IterateAllElements(
+    const std::function<bool(Element&)>& iterator) {
+  if (!iterator) {
+    return;
+  }
+
+  for (auto& element : elements_) {
+    if (!iterator(element)) {
+      return;
+    }
+    if (auto subpass = std::get_if<std::unique_ptr<EntityPass>>(&element)) {
+      subpass->get()->IterateAllElements(iterator);
+    }
+  }
+}
+
+void EntityPass::IterateAllElements(
+    const std::function<bool(const Element&)>& iterator) const {
+  /// TODO(gaaclarke): Remove duplication here between const and non-const
+  /// versions.
+  if (!iterator) {
+    return;
+  }
+
+  for (auto& element : elements_) {
+    if (!iterator(element)) {
+      return;
+    }
+    if (auto subpass = std::get_if<std::unique_ptr<EntityPass>>(&element)) {
+      const EntityPass* entity_pass = subpass->get();
+      entity_pass->IterateAllElements(iterator);
+    }
+  }
+}
+
 void EntityPass::IterateAllEntities(
     const std::function<bool(Entity&)>& iterator) {
   if (!iterator) {
@@ -570,41 +1112,101 @@ void EntityPass::IterateAllEntities(
   }
 }
 
-std::unique_ptr<EntityPass> EntityPass::Clone() const {
-  std::vector<Element> new_elements;
-  new_elements.reserve(elements_.size());
+void EntityPass::IterateAllEntities(
+    const std::function<bool(const Entity&)>& iterator) const {
+  if (!iterator) {
+    return;
+  }
 
   for (const auto& element : elements_) {
     if (auto entity = std::get_if<Entity>(&element)) {
-      new_elements.push_back(*entity);
+      if (!iterator(*entity)) {
+        return;
+      }
       continue;
     }
     if (auto subpass = std::get_if<std::unique_ptr<EntityPass>>(&element)) {
-      new_elements.push_back(subpass->get()->Clone());
+      const EntityPass* entity_pass = subpass->get();
+      entity_pass->IterateAllEntities(iterator);
       continue;
     }
     FML_UNREACHABLE();
   }
+}
+
+bool EntityPass::IterateUntilSubpass(
+    const std::function<bool(Entity&)>& iterator) {
+  if (!iterator) {
+    return true;
+  }
+
+  for (auto& element : elements_) {
+    if (auto entity = std::get_if<Entity>(&element)) {
+      if (!iterator(*entity)) {
+        return false;
+      }
+      continue;
+    }
+    return true;
+  }
+  return false;
+}
+
+size_t EntityPass::GetElementCount() const {
+  return elements_.size();
+}
 
-  auto pass = std::make_unique<EntityPass>();
-  pass->SetElements(std::move(new_elements));
-  return pass;
+void EntityPass::SetTransform(Matrix transform) {
+  transform_ = transform;
 }
 
-void EntityPass::SetTransformation(Matrix xformation) {
-  xformation_ = xformation;
+void EntityPass::SetClipDepth(size_t clip_depth) {
+  clip_depth_ = clip_depth;
 }
 
-void EntityPass::SetStencilDepth(size_t stencil_depth) {
-  stencil_depth_ = stencil_depth;
+size_t EntityPass::GetClipDepth() const {
+  return clip_depth_;
+}
+
+void EntityPass::SetNewClipDepth(size_t clip_depth) {
+  new_clip_depth_ = clip_depth;
+}
+
+uint32_t EntityPass::GetNewClipDepth() const {
+  return new_clip_depth_;
 }
 
 void EntityPass::SetBlendMode(BlendMode blend_mode) {
   blend_mode_ = blend_mode;
-  cover_whole_screen_ = Entity::BlendModeShouldCoverWholeScreen(blend_mode);
+  flood_clip_ = Entity::IsBlendModeDestructive(blend_mode);
 }
 
-void EntityPass::SetBackdropFilter(std::optional<BackdropFilterProc> proc) {
+Color EntityPass::GetClearColorOrDefault(ISize size) const {
+  return GetClearColor(size).value_or(Color::BlackTransparent());
+}
+
+std::optional<Color> EntityPass::GetClearColor(ISize target_size) const {
+  if (backdrop_filter_proc_) {
+    return std::nullopt;
+  }
+
+  std::optional<Color> result = std::nullopt;
+  for (const Element& element : elements_) {
+    auto [entity_color, blend_mode] =
+        ElementAsBackgroundColor(element, target_size);
+    if (!entity_color.has_value()) {
+      break;
+    }
+    result = result.value_or(Color::BlackTransparent())
+                 .Blend(entity_color.value(), blend_mode);
+  }
+  if (result.has_value()) {
+    return result->Premultiply();
+  }
+  return result;
+}
+
+void EntityPass::SetBackdropFilter(BackdropFilterProc proc) {
   if (superpass_) {
     VALIDATION_LOG << "Backdrop filters cannot be set on EntityPasses that "
                       "have already been appended to another pass.";
@@ -613,4 +1215,8 @@ void EntityPass::SetBackdropFilter(std::optional<BackdropFilterProc> proc) {
   backdrop_filter_proc_ = std::move(proc);
 }
 
+void EntityPass::SetEnableOffscreenCheckerboard(bool enabled) {
+  enable_offscreen_debug_checkerboard_ = enabled;
+}
+
 }  // namespace impeller
diff --git a/impeller/entity/entity_pass.h b/impeller/entity/entity_pass.h
index cb7c3b5a47a87682a44b58d8a3c30bf50f4e3521..fd9d99bf6b1b40963f803f279fe8e3241961d91c 100644
--- a/impeller/entity/entity_pass.h
+++ b/impeller/entity/entity_pass.h
@@ -2,72 +2,216 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_ENTITY_PASS_H_
+#define FLUTTER_IMPELLER_ENTITY_ENTITY_PASS_H_
 
+#include <cstdint>
 #include <functional>
 #include <memory>
 #include <optional>
 #include <vector>
 
-#include "flutter/fml/macros.h"
 #include "impeller/entity/contents/contents.h"
 #include "impeller/entity/contents/filters/filter_contents.h"
 #include "impeller/entity/entity.h"
+#include "impeller/entity/entity_pass_clip_stack.h"
 #include "impeller/entity/entity_pass_delegate.h"
 #include "impeller/entity/inline_pass_context.h"
 #include "impeller/renderer/render_target.h"
-#include "impeller/typographer/lazy_glyph_atlas.h"
 
 namespace impeller {
 
 class ContentContext;
 
+/// Specifies how much to trust the bounds rectangle provided for a list
+/// of contents. Used by both |EntityPass| and |Canvas::SaveLayer|.
+enum class ContentBoundsPromise {
+  /// @brief The caller makes no claims related to the size of the bounds.
+  kUnknown,
+
+  /// @brief The caller claims the bounds are a reasonably tight estimate
+  ///        of the coverage of the contents and should contain all of the
+  ///        contents.
+  kContainsContents,
+
+  /// @brief The caller claims the bounds are a subset of an estimate of
+  ///        the reasonably tight bounds but likely clips off some of the
+  ///        contents.
+  kMayClipContents,
+};
+
 class EntityPass {
  public:
+  /// Elements are renderable items in the `EntityPass`. Each can either be an
+  /// `Entity` or a child `EntityPass`.
+  ///
+  /// When the element is a child `EntityPass`, it may be rendered to an
+  /// offscreen texture and converted into an `Entity` that draws the texture
+  /// into the current pass, or its children may be collapsed into the current
+  ///
+  /// `EntityPass`. Elements are converted to Entities in
+  /// `GetEntityForElement()`.
   using Element = std::variant<Entity, std::unique_ptr<EntityPass>>;
+
+  static const std::string kCaptureDocumentName;
+
   using BackdropFilterProc = std::function<std::shared_ptr<FilterContents>(
       FilterInput::Ref,
-      const Matrix& effect_transform)>;
+      const Matrix& effect_transform,
+      Entity::RenderingMode rendering_mode)>;
 
   EntityPass();
 
   ~EntityPass();
 
-  void SetDelegate(std::unique_ptr<EntityPassDelegate> delgate);
+  void SetDelegate(std::shared_ptr<EntityPassDelegate> delgate);
+
+  /// @brief  Set the bounds limit, which is provided by the user when creating
+  ///         a SaveLayer. This is a hint that allows the user to communicate
+  ///         that it's OK to not render content outside of the bounds.
+  ///
+  ///         For consistency with Skia, we effectively treat this like a
+  ///         rectangle clip by forcing the subpass texture size to never exceed
+  ///         it.
+  ///
+  ///         The entity pass will assume that these bounds cause a clipping
+  ///         effect on the layer unless this call is followed up with a
+  ///         call to |SetBoundsClipsContent()| specifying otherwise.
+  void SetBoundsLimit(
+      std::optional<Rect> bounds_limit,
+      ContentBoundsPromise bounds_promise = ContentBoundsPromise::kUnknown);
+
+  /// @brief  Get the bounds limit, which is provided by the user when creating
+  ///         a SaveLayer.
+  std::optional<Rect> GetBoundsLimit() const;
+
+  /// @brief  Indicates if the bounds limit set using |SetBoundsLimit()|
+  ///         might clip the contents of the pass.
+  bool GetBoundsLimitMightClipContent() const;
+
+  /// @brief  Indicates if the bounds limit set using |SetBoundsLimit()|
+  ///         is a reasonably tight estimate of the bounds of the contents.
+  bool GetBoundsLimitIsSnug() const;
 
   size_t GetSubpassesDepth() const;
 
-  std::unique_ptr<EntityPass> Clone() const;
-
+  /// @brief Add an entity to the current entity pass.
   void AddEntity(Entity entity);
 
-  void SetElements(std::vector<Element> elements);
+  void PushClip(Entity entity);
+
+  void PopClips(size_t num_clips, uint64_t depth);
 
-  const std::shared_ptr<LazyGlyphAtlas>& GetLazyGlyphAtlas() const;
+  void PopAllClips(uint64_t depth);
 
+  void SetElements(std::vector<Element> elements);
+
+  //----------------------------------------------------------------------------
+  /// @brief  Appends a given pass as a subpass.
+  ///
   EntityPass* AddSubpass(std::unique_ptr<EntityPass> pass);
 
+  //----------------------------------------------------------------------------
+  /// @brief  Merges a given pass into this pass. Useful for drawing
+  ///         pre-recorded pictures that don't require rendering into a separate
+  ///         subpass.
+  ///
+  void AddSubpassInline(std::unique_ptr<EntityPass> pass);
+
   EntityPass* GetSuperpass() const;
 
   bool Render(ContentContext& renderer,
               const RenderTarget& render_target) const;
 
+  /// @brief  Iterate all elements (entities and subpasses) in this pass,
+  ///         recursively including elements of child passes. The iteration
+  ///         order is depth-first. Whenever a subpass elements is encountered,
+  ///         it's included in the stream before its children.
+  void IterateAllElements(const std::function<bool(Element&)>& iterator);
+
+  void IterateAllElements(
+      const std::function<bool(const Element&)>& iterator) const;
+
+  //----------------------------------------------------------------------------
+  /// @brief  Iterate all entities in this pass, recursively including entities
+  ///         of child passes. The iteration order is depth-first.
+  ///
   void IterateAllEntities(const std::function<bool(Entity&)>& iterator);
 
-  void SetTransformation(Matrix xformation);
+  //----------------------------------------------------------------------------
+  /// @brief  Iterate all entities in this pass, recursively including entities
+  ///         of child passes. The iteration order is depth-first and does not
+  ///         allow modification of the entities.
+  ///
+  void IterateAllEntities(
+      const std::function<bool(const Entity&)>& iterator) const;
 
-  void SetStencilDepth(size_t stencil_depth);
+  //----------------------------------------------------------------------------
+  /// @brief  Iterate entities in this pass up until the first subpass is found.
+  ///         This is useful for limiting look-ahead optimizations.
+  ///
+  /// @return Returns whether a subpass was encountered.
+  ///
+  bool IterateUntilSubpass(const std::function<bool(Entity&)>& iterator);
 
-  void SetBlendMode(BlendMode blend_mode);
+  //----------------------------------------------------------------------------
+  /// @brief Return the number of elements on this pass.
+  ///
+  size_t GetElementCount() const;
 
-  void SetBackdropFilter(std::optional<BackdropFilterProc> proc);
+  void SetTransform(Matrix transform);
 
+  void SetClipDepth(size_t clip_depth);
+
+  size_t GetClipDepth() const;
+
+  void SetNewClipDepth(size_t clip_depth);
+
+  uint32_t GetNewClipDepth() const;
+
+  void SetBlendMode(BlendMode blend_mode);
+
+  /// @brief Return the premultiplied clear color of the pass entities, if any.
+  std::optional<Color> GetClearColor(ISize size = ISize::Infinite()) const;
+
+  /// @brief Return the premultiplied clear color of the pass entities.
+  ///
+  /// If the entity pass has no clear color, this will return transparent black.
+  Color GetClearColorOrDefault(ISize size = ISize::Infinite()) const;
+
+  void SetBackdropFilter(BackdropFilterProc proc);
+
+  void SetEnableOffscreenCheckerboard(bool enabled);
+
+  int32_t GetRequiredMipCount() const { return required_mip_count_; }
+
+  void SetRequiredMipCount(int32_t mip_count) {
+    required_mip_count_ = mip_count;
+  }
+
+  //----------------------------------------------------------------------------
+  /// @brief  Computes the coverage of a given subpass. This is used to
+  ///         determine the texture size of a given subpass before it's rendered
+  ///         to and passed through the subpass ImageFilter, if any.
+  ///
+  /// @param[in]  subpass         The EntityPass for which to compute
+  ///                             pre-filteredcoverage.
+  /// @param[in]  coverage_limit  Confines coverage to a specified area. This
+  ///                             hint is used to trim coverage to the root
+  ///                             framebuffer area. `std::nullopt` means there
+  ///                             is no limit.
+  ///
+  /// @return  The screen space pixel area that the subpass contents will render
+  ///          into, prior to being transformed by the subpass ImageFilter, if
+  ///          any. `std::nullopt` means rendering the subpass will have no
+  ///          effect on the color attachment.
+  ///
   std::optional<Rect> GetSubpassCoverage(
       const EntityPass& subpass,
-      std::optional<Rect> coverage_crop) const;
+      std::optional<Rect> coverage_limit) const;
 
   std::optional<Rect> GetElementsCoverage(
-      std::optional<Rect> coverage_crop) const;
+      std::optional<Rect> coverage_limit) const;
 
  private:
   struct EntityResult {
@@ -88,59 +232,143 @@ class EntityPass {
     ///         error while resolving the Entity.
     Status status = kFailure;
 
-    static EntityResult Success(Entity e) { return {e, kSuccess}; }
+    static EntityResult Success(Entity e) { return {std::move(e), kSuccess}; }
     static EntityResult Failure() { return {{}, kFailure}; }
     static EntityResult Skip() { return {{}, kSkip}; }
   };
 
+  bool RenderElement(Entity& element_entity,
+                     size_t clip_depth_floor,
+                     InlinePassContext& pass_context,
+                     int32_t pass_depth,
+                     ContentContext& renderer,
+                     EntityPassClipStack& clip_coverage_stack,
+                     Point global_pass_position) const;
+
   EntityResult GetEntityForElement(const EntityPass::Element& element,
                                    ContentContext& renderer,
+                                   Capture& capture,
                                    InlinePassContext& pass_context,
                                    ISize root_pass_size,
-                                   Point position,
+                                   Point global_pass_position,
                                    uint32_t pass_depth,
-                                   size_t stencil_depth_floor) const;
-
-  bool OnRender(
-      ContentContext& renderer,
-      ISize root_pass_size,
-      const RenderTarget& render_target,
-      Point position,
-      Point parent_position,
-      uint32_t pass_depth,
-      size_t stencil_depth_floor = 0,
-      std::shared_ptr<Contents> backdrop_filter_contents = nullptr) const;
-
+                                   EntityPassClipStack& clip_coverage_stack,
+                                   size_t clip_depth_floor) const;
+
+  //----------------------------------------------------------------------------
+  /// @brief     OnRender is the internal command recording routine for
+  ///            `EntityPass`. Its job is to walk through each `Element` which
+  ///            was appended to the scene (either an `Entity` via `AddEntity()`
+  ///            or a child `EntityPass` via `AddSubpass()`) and render them to
+  ///            the given `pass_target`.
+  /// @param[in]  renderer                 The Contents context, which manages
+  ///                                      pipeline state.
+  /// @param[in]  root_pass_size           The size of the texture being
+  ///                                      rendered into at the root of the
+  ///                                      `EntityPass` tree. This is the size
+  ///                                      of the `RenderTarget` color
+  ///                                      attachment passed to the public
+  ///                                      `EntityPass::Render` method.
+  /// @param[out] pass_target              Stores the render target that should
+  ///                                      be used for rendering.
+  /// @param[in]  global_pass_position     The position that this `EntityPass`
+  ///                                      will be drawn to the parent pass
+  ///                                      relative to the root pass origin.
+  ///                                      Used for offsetting drawn `Element`s,
+  ///                                      whose origins are all in root
+  ///                                      pass/screen space,
+  /// @param[in]  local_pass_position      The position that this `EntityPass`
+  ///                                      will be drawn to the parent pass
+  ///                                      relative to the parent pass origin.
+  ///                                      Used for positioning backdrop
+  ///                                      filters.
+  /// @param[in]  pass_depth               The tree depth of the `EntityPass` at
+  ///                                      render time. Only used for labeling
+  ///                                      and debugging purposes. This can vary
+  ///                                      depending on whether passes are
+  ///                                      collapsed or not.
+  /// @param[in]  clip_coverage_stack      A global stack of coverage rectangles
+  ///                                      for the clip buffer at each depth.
+  ///                                      Higher depths are more restrictive.
+  ///                                      Used to cull Elements that we
+  ///                                      know won't result in a visible
+  ///                                      change.
+  /// @param[in]  clip_depth_floor         The clip depth that a value of
+  ///                                      zero corresponds to in the given
+  ///                                      `pass_target` clip buffer.
+  ///                                      When new `pass_target`s are created
+  ///                                      for subpasses, their clip buffers are
+  ///                                      initialized at zero, and so this
+  ///                                      value is used to offset Entity clip
+  ///                                      depths to match the clip buffer.
+  /// @param[in]  backdrop_filter_contents Optional. Is supplied, this contents
+  ///                                      is rendered prior to anything else in
+  ///                                      the `EntityPass`, offset by the
+  ///                                      `local_pass_position`.
+  /// @param[in]  collapsed_parent_pass    Optional. If supplied, this
+  ///                                      `InlinePassContext` state is used to
+  ///                                      begin rendering elements instead of
+  ///                                      creating a new `RenderPass`. This
+  ///                                      "collapses" the Elements into the
+  ///                                      parent pass.
+  ///
+  bool OnRender(ContentContext& renderer,
+                Capture& capture,
+                ISize root_pass_size,
+                EntityPassTarget& pass_target,
+                Point global_pass_position,
+                Point local_pass_position,
+                uint32_t pass_depth,
+                EntityPassClipStack& clip_coverage_stack,
+                size_t clip_depth_floor = 0,
+                std::shared_ptr<Contents> backdrop_filter_contents = nullptr,
+                const std::optional<InlinePassContext::RenderPassResult>&
+                    collapsed_parent_pass = std::nullopt) const;
+
+  /// The list of renderable items in the scene. Each of these items is
+  /// evaluated and recorded to an `EntityPassTarget` by the `OnRender` method.
   std::vector<Element> elements_;
 
+  /// The stack of currently active clips (during Aiks recording time). Each
+  /// entry is an index into the `elements_` list. The depth value of a clip is
+  /// the max of all the entities it affects, so assignment of the depth value
+  /// is deferred until clip restore or end of the EntityPass.
+  std::vector<size_t> active_clips_;
+
   EntityPass* superpass_ = nullptr;
-  Matrix xformation_;
-  size_t stencil_depth_ = 0u;
+  Matrix transform_;
+  size_t clip_depth_ = 0u;
+  uint32_t new_clip_depth_ = 1u;
   BlendMode blend_mode_ = BlendMode::kSourceOver;
-  bool cover_whole_screen_ = false;
+  bool flood_clip_ = false;
+  bool enable_offscreen_debug_checkerboard_ = false;
+  std::optional<Rect> bounds_limit_;
+  ContentBoundsPromise bounds_promise_ = ContentBoundsPromise::kUnknown;
+  int32_t required_mip_count_ = 1;
 
-  /// This value is incremented whenever something is added to the pass that
+  /// These values are incremented whenever something is added to the pass that
   /// requires reading from the backdrop texture. Currently, this can happen in
   /// the following scenarios:
   ///   1. An entity with an "advanced blend" is added to the pass.
   ///   2. A subpass with a backdrop filter is added to the pass.
-  uint32_t reads_from_pass_texture_ = 0;
+  /// These are tracked as separate values because we may ignore
+  /// blend_reads_from_pass_texture_ if the device supports framebuffer based
+  /// advanced blends.
+  uint32_t advanced_blend_reads_from_pass_texture_ = 0;
+  uint32_t backdrop_filter_reads_from_pass_texture_ = 0;
 
-  std::optional<BackdropFilterProc> backdrop_filter_proc_ = std::nullopt;
+  uint32_t GetTotalPassReads(ContentContext& renderer) const;
 
-  std::unique_ptr<EntityPassDelegate> delegate_ =
+  BackdropFilterProc backdrop_filter_proc_ = nullptr;
+
+  std::shared_ptr<EntityPassDelegate> delegate_ =
       EntityPassDelegate::MakeDefault();
-  std::shared_ptr<LazyGlyphAtlas> lazy_glyph_atlas_ =
-      std::make_shared<LazyGlyphAtlas>();
 
-  FML_DISALLOW_COPY_AND_ASSIGN(EntityPass);
-};
+  EntityPass(const EntityPass&) = delete;
 
-struct CanvasStackEntry {
-  Matrix xformation;
-  size_t stencil_depth = 0u;
-  bool is_subpass = false;
-  bool contains_clips = false;
+  EntityPass& operator=(const EntityPass&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_ENTITY_PASS_H_
diff --git a/impeller/entity/entity_pass_clip_stack.cc b/impeller/entity/entity_pass_clip_stack.cc
new file mode 100644
index 0000000000000000000000000000000000000000..67bb02d8e8f4d75a446b966590d39959cd82ee98
--- /dev/null
+++ b/impeller/entity/entity_pass_clip_stack.cc
@@ -0,0 +1,173 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/entity/entity_pass_clip_stack.h"
+#include "impeller/entity/contents/clip_contents.h"
+#include "impeller/entity/contents/content_context.h"
+#include "impeller/entity/entity.h"
+
+namespace impeller {
+
+EntityPassClipStack::EntityPassClipStack(const Rect& initial_coverage_rect) {
+  subpass_state_.push_back(SubpassState{
+      .clip_coverage =
+          {
+              {ClipCoverageLayer{
+                  .coverage = initial_coverage_rect,
+                  .clip_depth = 0,
+              }},
+          },
+  });
+}
+
+std::optional<Rect> EntityPassClipStack::CurrentClipCoverage() const {
+  return subpass_state_.back().clip_coverage.back().coverage;
+}
+
+bool EntityPassClipStack::HasCoverage() const {
+  return !subpass_state_.back().clip_coverage.empty();
+}
+
+void EntityPassClipStack::PushSubpass(std::optional<Rect> subpass_coverage,
+                                      size_t clip_depth) {
+  subpass_state_.push_back(SubpassState{
+      .clip_coverage =
+          {
+              ClipCoverageLayer{.coverage = subpass_coverage,
+                                .clip_depth = clip_depth},
+          },
+  });
+}
+
+void EntityPassClipStack::PopSubpass() {
+  subpass_state_.pop_back();
+}
+
+const std::vector<ClipCoverageLayer>
+EntityPassClipStack::GetClipCoverageLayers() const {
+  return subpass_state_.back().clip_coverage;
+}
+
+EntityPassClipStack::ClipStateResult EntityPassClipStack::ApplyClipState(
+    Contents::ClipCoverage global_clip_coverage,
+    Entity& entity,
+    size_t clip_depth_floor,
+    Point global_pass_position) {
+  ClipStateResult result = {.should_render = false, .clip_did_change = false};
+
+  auto& subpass_state = GetCurrentSubpassState();
+  switch (global_clip_coverage.type) {
+    case Contents::ClipCoverage::Type::kNoChange:
+      break;
+    case Contents::ClipCoverage::Type::kAppend: {
+      auto op = CurrentClipCoverage();
+      subpass_state.clip_coverage.push_back(
+          ClipCoverageLayer{.coverage = global_clip_coverage.coverage,
+                            .clip_depth = entity.GetClipDepth() + 1});
+      result.clip_did_change = true;
+
+      FML_DCHECK(subpass_state.clip_coverage.back().clip_depth ==
+                 subpass_state.clip_coverage.front().clip_depth +
+                     subpass_state.clip_coverage.size() - 1);
+
+      if (!op.has_value()) {
+        // Running this append op won't impact the clip buffer because the
+        // whole screen is already being clipped, so skip it.
+        return result;
+      }
+    } break;
+    case Contents::ClipCoverage::Type::kRestore: {
+      if (subpass_state.clip_coverage.back().clip_depth <=
+          entity.GetClipDepth()) {
+        // Drop clip restores that will do nothing.
+        return result;
+      }
+
+      auto restoration_index = entity.GetClipDepth() -
+                               subpass_state.clip_coverage.front().clip_depth;
+      FML_DCHECK(restoration_index < subpass_state.clip_coverage.size());
+
+      // We only need to restore the area that covers the coverage of the
+      // clip rect at target depth + 1.
+      std::optional<Rect> restore_coverage =
+          (restoration_index + 1 < subpass_state.clip_coverage.size())
+              ? subpass_state.clip_coverage[restoration_index + 1].coverage
+              : std::nullopt;
+      if (restore_coverage.has_value()) {
+        // Make the coverage rectangle relative to the current pass.
+        restore_coverage = restore_coverage->Shift(-global_pass_position);
+      }
+      subpass_state.clip_coverage.resize(restoration_index + 1);
+      result.clip_did_change = true;
+
+      if constexpr (ContentContext::kEnableStencilThenCover) {
+        // Skip all clip restores when stencil-then-cover is enabled.
+        if (subpass_state.clip_coverage.back().coverage.has_value()) {
+          RecordEntity(entity, global_clip_coverage.type, Rect());
+        }
+        return result;
+      }
+
+      if (!subpass_state.clip_coverage.back().coverage.has_value()) {
+        // Running this restore op won't make anything renderable, so skip it.
+        return result;
+      }
+
+      auto restore_contents =
+          static_cast<ClipRestoreContents*>(entity.GetContents().get());
+      restore_contents->SetRestoreCoverage(restore_coverage);
+
+    } break;
+  }
+
+#ifdef IMPELLER_ENABLE_CAPTURE
+  {
+    auto element_entity_coverage = entity.GetCoverage();
+    if (element_entity_coverage.has_value()) {
+      element_entity_coverage =
+          element_entity_coverage->Shift(global_pass_position);
+      entity.GetCapture().AddRect("Coverage", *element_entity_coverage,
+                                  {.readonly = true});
+    }
+  }
+#endif
+
+  entity.SetClipDepth(entity.GetClipDepth() - clip_depth_floor);
+  RecordEntity(entity, global_clip_coverage.type,
+               subpass_state.clip_coverage.back().coverage);
+
+  result.should_render = true;
+  return result;
+}
+
+void EntityPassClipStack::RecordEntity(const Entity& entity,
+                                       Contents::ClipCoverage::Type type,
+                                       std::optional<Rect> clip_coverage) {
+  auto& subpass_state = GetCurrentSubpassState();
+  switch (type) {
+    case Contents::ClipCoverage::Type::kNoChange:
+      return;
+    case Contents::ClipCoverage::Type::kAppend:
+      subpass_state.rendered_clip_entities.push_back(
+          {.entity = entity.Clone(), .clip_coverage = clip_coverage});
+      break;
+    case Contents::ClipCoverage::Type::kRestore:
+      if (!subpass_state.rendered_clip_entities.empty()) {
+        subpass_state.rendered_clip_entities.pop_back();
+      }
+      break;
+  }
+}
+
+EntityPassClipStack::SubpassState&
+EntityPassClipStack::GetCurrentSubpassState() {
+  return subpass_state_.back();
+}
+
+const std::vector<EntityPassClipStack::ReplayResult>&
+EntityPassClipStack::GetReplayEntities() const {
+  return subpass_state_.back().rendered_clip_entities;
+}
+
+}  // namespace impeller
diff --git a/impeller/entity/entity_pass_clip_stack.h b/impeller/entity/entity_pass_clip_stack.h
new file mode 100644
index 0000000000000000000000000000000000000000..d5181d86b99075ffc09c23ad9afec51721a46a0b
--- /dev/null
+++ b/impeller/entity/entity_pass_clip_stack.h
@@ -0,0 +1,84 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_ENTITY_ENTITY_PASS_CLIP_STACK_H_
+#define FLUTTER_IMPELLER_ENTITY_ENTITY_PASS_CLIP_STACK_H_
+
+#include "impeller/entity/contents/contents.h"
+#include "impeller/entity/entity.h"
+#include "impeller/geometry/rect.h"
+
+namespace impeller {
+
+struct ClipCoverageLayer {
+  std::optional<Rect> coverage;
+  size_t clip_depth;
+};
+
+/// @brief A class that tracks all clips that have been recorded in the current
+///        entity pass stencil.
+///
+///        These clips are replayed when restoring the backdrop so that the
+///        stencil buffer is left in an identical state.
+class EntityPassClipStack {
+ public:
+  struct ReplayResult {
+    Entity entity;
+    std::optional<Rect> clip_coverage;
+  };
+
+  struct ClipStateResult {
+    /// Whether or not the Entity should be rendered. If false, the Entity may
+    /// be safely skipped.
+    bool should_render = false;
+    /// Whether or not the current clip coverage changed during the call to
+    /// `ApplyClipState`.
+    bool clip_did_change = false;
+  };
+
+  /// Create a new [EntityPassClipStack] with an initialized coverage rect.
+  explicit EntityPassClipStack(const Rect& initial_coverage_rect);
+
+  ~EntityPassClipStack() = default;
+
+  std::optional<Rect> CurrentClipCoverage() const;
+
+  void PushSubpass(std::optional<Rect> subpass_coverage, size_t clip_depth);
+
+  void PopSubpass();
+
+  bool HasCoverage() const;
+
+  /// @brief  Applies the current clip state to an Entity. If the given Entity
+  ///         is a clip operation, then the clip state is updated accordingly.
+  ClipStateResult ApplyClipState(Contents::ClipCoverage global_clip_coverage,
+                                 Entity& entity,
+                                 size_t clip_depth_floor,
+                                 Point global_pass_position);
+
+  // Visible for testing.
+  void RecordEntity(const Entity& entity,
+                    Contents::ClipCoverage::Type type,
+                    std::optional<Rect> clip_coverage);
+
+  // Visible for testing.
+  const std::vector<ReplayResult>& GetReplayEntities() const;
+
+  // Visible for testing.
+  const std::vector<ClipCoverageLayer> GetClipCoverageLayers() const;
+
+ private:
+  struct SubpassState {
+    std::vector<ReplayResult> rendered_clip_entities;
+    std::vector<ClipCoverageLayer> clip_coverage;
+  };
+
+  SubpassState& GetCurrentSubpassState();
+
+  std::vector<SubpassState> subpass_state_;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_ENTITY_PASS_CLIP_STACK_H_
diff --git a/impeller/entity/entity_pass_delegate.cc b/impeller/entity/entity_pass_delegate.cc
index 8455f1adf0f25f5f324bd03bb171c2f8a81103a2..139897842a1c00e61233cd2f294c2cc8b70be74d 100644
--- a/impeller/entity/entity_pass_delegate.cc
+++ b/impeller/entity/entity_pass_delegate.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "impeller/entity/entity_pass_delegate.h"
+#include "impeller/entity/entity_pass.h"
 
 namespace impeller {
 
@@ -17,14 +18,13 @@ class DefaultEntityPassDelegate final : public EntityPassDelegate {
   // |EntityPassDelegate|
   ~DefaultEntityPassDelegate() override = default;
 
-  // |EntityPassDelegate|
-  std::optional<Rect> GetCoverageRect() override { return std::nullopt; }
-
   // |EntityPassDelegate|
   bool CanElide() override { return false; }
 
   // |EntityPassDelegate|
-  bool CanCollapseIntoParentPass() override { return true; }
+  bool CanCollapseIntoParentPass(EntityPass* entity_pass) override {
+    return true;
+  }
 
   // |EntityPassDelegate|
   std::shared_ptr<Contents> CreateContentsForSubpassTarget(
@@ -36,8 +36,18 @@ class DefaultEntityPassDelegate final : public EntityPassDelegate {
     return  ret;
   }
 
+  // |EntityPassDelgate|
+  std::shared_ptr<FilterContents> WithImageFilter(
+      const FilterInput::Variant& input,
+      const Matrix& effect_transform) const override {
+    return nullptr;
+  }
+
  private:
-  FML_DISALLOW_COPY_AND_ASSIGN(DefaultEntityPassDelegate);
+  DefaultEntityPassDelegate(const DefaultEntityPassDelegate&) = delete;
+
+  DefaultEntityPassDelegate& operator=(const DefaultEntityPassDelegate&) =
+      delete;
 };
 
 std::unique_ptr<EntityPassDelegate> EntityPassDelegate::MakeDefault() {
diff --git a/impeller/entity/entity_pass_delegate.h b/impeller/entity/entity_pass_delegate.h
index 28f485c1237f70e25f4ffb4f1a85b5b21d2c288c..04b96ba00782f3fd61bad33298936f5befff7676 100644
--- a/impeller/entity/entity_pass_delegate.h
+++ b/impeller/entity/entity_pass_delegate.h
@@ -2,36 +2,48 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_ENTITY_PASS_DELEGATE_H_
+#define FLUTTER_IMPELLER_ENTITY_ENTITY_PASS_DELEGATE_H_
 
 #include <memory>
 
-#include "flutter/fml/macros.h"
+#include "impeller/core/texture.h"
 #include "impeller/entity/contents/contents.h"
-#include "impeller/renderer/texture.h"
+#include "impeller/entity/contents/filters/filter_contents.h"
+#include "impeller/entity/contents/filters/inputs/filter_input.h"
 
 namespace impeller {
 
+class EntityPass;
+
 class EntityPassDelegate {
  public:
   static std::unique_ptr<EntityPassDelegate> MakeDefault();
 
   EntityPassDelegate();
 
-  virtual std::optional<Rect> GetCoverageRect() = 0;
-
   virtual ~EntityPassDelegate();
 
   virtual bool CanElide() = 0;
 
-  virtual bool CanCollapseIntoParentPass() = 0;
+  /// @brief  Whether or not this entity pass can be collapsed into the parent.
+  ///         If true, this method may modify the entities for the current pass.
+  virtual bool CanCollapseIntoParentPass(EntityPass* entity_pass) = 0;
 
   virtual std::shared_ptr<Contents> CreateContentsForSubpassTarget(
       std::shared_ptr<Texture> target,
       const Matrix& effect_transform) = 0;
 
+  virtual std::shared_ptr<FilterContents> WithImageFilter(
+      const FilterInput::Variant& input,
+      const Matrix& effect_transform) const = 0;
+
  private:
-  FML_DISALLOW_COPY_AND_ASSIGN(EntityPassDelegate);
+  EntityPassDelegate(const EntityPassDelegate&) = delete;
+
+  EntityPassDelegate& operator=(const EntityPassDelegate&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_ENTITY_PASS_DELEGATE_H_
diff --git a/impeller/entity/entity_pass_target.cc b/impeller/entity/entity_pass_target.cc
new file mode 100644
index 0000000000000000000000000000000000000000..d2a63bc43542c54be27017197032ca8c170f82f3
--- /dev/null
+++ b/impeller/entity/entity_pass_target.cc
@@ -0,0 +1,76 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/entity/entity_pass_target.h"
+
+#include "impeller/base/validation.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/texture.h"
+
+namespace impeller {
+
+EntityPassTarget::EntityPassTarget(const RenderTarget& render_target,
+                                   bool supports_read_from_resolve,
+                                   bool supports_implicit_msaa)
+    : target_(render_target),
+      supports_read_from_resolve_(supports_read_from_resolve),
+      supports_implicit_msaa_(supports_implicit_msaa) {}
+
+std::shared_ptr<Texture> EntityPassTarget::Flip(Allocator& allocator) {
+  auto color0 = target_.GetColorAttachments().find(0)->second;
+  if (!color0.resolve_texture) {
+    VALIDATION_LOG << "EntityPassTarget Flip should never be called for a "
+                      "non-MSAA target.";
+    // ...because there is never a circumstance where doing so would be
+    // necessary. Unlike MSAA passes, non-MSAA passes can be trivially loaded
+    // with `LoadAction::kLoad`.
+    return color0.texture;
+  }
+
+  if (supports_read_from_resolve_) {
+    // Just return the current resolve texture, which is safe to read in the
+    // next render pass that'll resolve to `target_`.
+    //
+    // Note that this can only be done when MSAA is being used.
+    return color0.resolve_texture;
+  }
+
+  if (!secondary_color_texture_) {
+    // The second texture is allocated lazily to avoid unused allocations.
+    TextureDescriptor new_descriptor =
+        color0.resolve_texture->GetTextureDescriptor();
+    secondary_color_texture_ = allocator.CreateTexture(new_descriptor);
+
+    if (!secondary_color_texture_) {
+      return nullptr;
+    }
+  }
+
+  // If the color0 resolve texture is the same as the texture, then we're
+  // running on the GLES backend with implicit resolve.
+  if (supports_implicit_msaa_) {
+    auto new_secondary = color0.resolve_texture;
+    color0.resolve_texture = secondary_color_texture_;
+    color0.texture = secondary_color_texture_;
+    secondary_color_texture_ = new_secondary;
+  } else {
+    std::swap(color0.resolve_texture, secondary_color_texture_);
+  }
+
+  target_.SetColorAttachment(color0, 0);
+
+  // Return the previous backdrop texture, which is safe to read in the next
+  // render pass that attaches `target_`.
+  return secondary_color_texture_;
+}
+
+const RenderTarget& EntityPassTarget::GetRenderTarget() const {
+  return target_;
+}
+
+bool EntityPassTarget::IsValid() const {
+  return target_.IsValid();
+}
+
+}  // namespace impeller
diff --git a/impeller/entity/entity_pass_target.h b/impeller/entity/entity_pass_target.h
new file mode 100644
index 0000000000000000000000000000000000000000..204944e4b3a353dd101b856e596c75ecb8a0c28e
--- /dev/null
+++ b/impeller/entity/entity_pass_target.h
@@ -0,0 +1,48 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_ENTITY_ENTITY_PASS_TARGET_H_
+#define FLUTTER_IMPELLER_ENTITY_ENTITY_PASS_TARGET_H_
+
+#include "fml/macros.h"
+#include "impeller/renderer/render_target.h"
+
+namespace impeller {
+
+class InlinePassContext;
+
+class EntityPassTarget {
+ public:
+  explicit EntityPassTarget(const RenderTarget& render_target,
+                            bool supports_read_from_resolve,
+                            bool supports_implicit_msaa);
+
+  /// @brief  Flips the backdrop and returns a readable texture that can be
+  ///         bound/sampled to restore the previous pass.
+  ///
+  ///         After this method is called, a new `RenderPass` that attaches the
+  ///         result of `GetRenderTarget` is guaranteed to be able to read the
+  ///         previous pass's backdrop texture (which is returned by this
+  ///         method).
+  std::shared_ptr<Texture> Flip(Allocator& allocator);
+
+  const RenderTarget& GetRenderTarget() const;
+
+  bool IsValid() const;
+
+ private:
+  RenderTarget target_;
+  std::shared_ptr<Texture> secondary_color_texture_;
+
+  bool supports_read_from_resolve_;
+  bool supports_implicit_msaa_;
+
+  friend InlinePassContext;
+
+  EntityPassTarget& operator=(const EntityPassTarget&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_ENTITY_PASS_TARGET_H_
diff --git a/impeller/entity/entity_pass_target_unittests.cc b/impeller/entity/entity_pass_target_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..654498dd4b1184117a0e59c1b99d65f79966aef7
--- /dev/null
+++ b/impeller/entity/entity_pass_target_unittests.cc
@@ -0,0 +1,115 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <memory>
+
+#include "flutter/testing/testing.h"
+#include "gtest/gtest.h"
+#include "impeller/core/formats.h"
+#include "impeller/entity/entity_pass_target.h"
+#include "impeller/entity/entity_playground.h"
+
+namespace impeller {
+namespace testing {
+
+using EntityPassTargetTest = EntityPlayground;
+INSTANTIATE_PLAYGROUND_SUITE(EntityPassTargetTest);
+
+TEST_P(EntityPassTargetTest, SwapWithMSAATexture) {
+  if (GetContentContext()
+          ->GetDeviceCapabilities()
+          .SupportsImplicitResolvingMSAA()) {
+    GTEST_SKIP() << "Implicit MSAA is used on this device.";
+  }
+  auto content_context = GetContentContext();
+  auto buffer = content_context->GetContext()->CreateCommandBuffer();
+  auto render_target =
+      GetContentContext()->GetRenderTargetCache()->CreateOffscreenMSAA(
+          *content_context->GetContext(), {100, 100},
+          /*mip_count=*/1);
+
+  auto entity_pass_target = EntityPassTarget(render_target, false, false);
+
+  auto color0 = entity_pass_target.GetRenderTarget()
+                    .GetColorAttachments()
+                    .find(0u)
+                    ->second;
+  auto msaa_tex = color0.texture;
+  auto resolve_tex = color0.resolve_texture;
+
+  entity_pass_target.Flip(
+      *content_context->GetContext()->GetResourceAllocator());
+
+  color0 = entity_pass_target.GetRenderTarget()
+               .GetColorAttachments()
+               .find(0u)
+               ->second;
+
+  ASSERT_EQ(msaa_tex, color0.texture);
+  ASSERT_NE(resolve_tex, color0.resolve_texture);
+}
+
+TEST_P(EntityPassTargetTest, SwapWithMSAAImplicitResolve) {
+  auto content_context = GetContentContext();
+  auto buffer = content_context->GetContext()->CreateCommandBuffer();
+  auto context = content_context->GetContext();
+  auto& allocator = *context->GetResourceAllocator();
+
+  // Emulate implicit MSAA resolve by making color resolve and msaa texture the
+  // same.
+  RenderTarget render_target;
+  {
+    PixelFormat pixel_format =
+        context->GetCapabilities()->GetDefaultColorFormat();
+
+    // Create MSAA color texture.
+
+    TextureDescriptor color0_tex_desc;
+    color0_tex_desc.storage_mode = StorageMode::kDevicePrivate;
+    color0_tex_desc.type = TextureType::kTexture2DMultisample;
+    color0_tex_desc.sample_count = SampleCount::kCount4;
+    color0_tex_desc.format = pixel_format;
+    color0_tex_desc.size = ISize{100, 100};
+    color0_tex_desc.usage = TextureUsage::kRenderTarget;
+
+    auto color0_msaa_tex = allocator.CreateTexture(color0_tex_desc);
+
+    // Color attachment.
+
+    ColorAttachment color0;
+    color0.load_action = LoadAction::kDontCare;
+    color0.store_action = StoreAction::kStoreAndMultisampleResolve;
+    color0.texture = color0_msaa_tex;
+    color0.resolve_texture = color0_msaa_tex;
+
+    render_target.SetColorAttachment(color0, 0u);
+    render_target.SetStencilAttachment(std::nullopt);
+  }
+
+  auto entity_pass_target = EntityPassTarget(render_target, false, true);
+
+  auto color0 = entity_pass_target.GetRenderTarget()
+                    .GetColorAttachments()
+                    .find(0u)
+                    ->second;
+  auto msaa_tex = color0.texture;
+  auto resolve_tex = color0.resolve_texture;
+
+  ASSERT_EQ(msaa_tex, resolve_tex);
+
+  entity_pass_target.Flip(
+      *content_context->GetContext()->GetResourceAllocator());
+
+  color0 = entity_pass_target.GetRenderTarget()
+               .GetColorAttachments()
+               .find(0u)
+               ->second;
+
+  ASSERT_NE(msaa_tex, color0.texture);
+  ASSERT_NE(resolve_tex, color0.resolve_texture);
+  ASSERT_EQ(color0.texture, color0.resolve_texture);
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/entity/entity_pass_unittests.cc b/impeller/entity/entity_pass_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..137cbd2e4ad222142da7fb896c59c5127853616f
--- /dev/null
+++ b/impeller/entity/entity_pass_unittests.cc
@@ -0,0 +1,209 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/testing/testing.h"
+#include "gtest/gtest.h"
+#include "impeller/entity/entity.h"
+#include "impeller/entity/entity_pass_clip_stack.h"
+
+namespace impeller {
+namespace testing {
+
+TEST(EntityPassClipStackTest, CanPushAndPopEntities) {
+  EntityPassClipStack recorder =
+      EntityPassClipStack(Rect::MakeLTRB(0, 0, 100, 100));
+
+  EXPECT_TRUE(recorder.GetReplayEntities().empty());
+
+  Entity entity;
+  recorder.RecordEntity(entity, Contents::ClipCoverage::Type::kAppend,
+                        Rect::MakeLTRB(0, 0, 100, 100));
+  EXPECT_EQ(recorder.GetReplayEntities().size(), 1u);
+
+  recorder.RecordEntity(entity, Contents::ClipCoverage::Type::kAppend,
+                        Rect::MakeLTRB(0, 0, 50, 50));
+  EXPECT_EQ(recorder.GetReplayEntities().size(), 2u);
+  ASSERT_TRUE(recorder.GetReplayEntities()[0].clip_coverage.has_value());
+  ASSERT_TRUE(recorder.GetReplayEntities()[1].clip_coverage.has_value());
+  // NOLINTBEGIN(bugprone-unchecked-optional-access)
+  EXPECT_EQ(recorder.GetReplayEntities()[0].clip_coverage.value(),
+            Rect::MakeLTRB(0, 0, 100, 100));
+  EXPECT_EQ(recorder.GetReplayEntities()[1].clip_coverage.value(),
+            Rect::MakeLTRB(0, 0, 50, 50));
+  // NOLINTEND(bugprone-unchecked-optional-access)
+
+  recorder.RecordEntity(entity, Contents::ClipCoverage::Type::kRestore, Rect());
+  EXPECT_EQ(recorder.GetReplayEntities().size(), 1u);
+
+  recorder.RecordEntity(entity, Contents::ClipCoverage::Type::kRestore, Rect());
+  EXPECT_TRUE(recorder.GetReplayEntities().empty());
+}
+
+TEST(EntityPassClipStackTest, CanPopEntitiesSafely) {
+  EntityPassClipStack recorder =
+      EntityPassClipStack(Rect::MakeLTRB(0, 0, 100, 100));
+
+  EXPECT_TRUE(recorder.GetReplayEntities().empty());
+
+  Entity entity;
+  recorder.RecordEntity(entity, Contents::ClipCoverage::Type::kRestore, Rect());
+  EXPECT_TRUE(recorder.GetReplayEntities().empty());
+}
+
+TEST(EntityPassClipStackTest, CanAppendNoChange) {
+  EntityPassClipStack recorder =
+      EntityPassClipStack(Rect::MakeLTRB(0, 0, 100, 100));
+
+  EXPECT_TRUE(recorder.GetReplayEntities().empty());
+
+  Entity entity;
+  recorder.RecordEntity(entity, Contents::ClipCoverage::Type::kNoChange,
+                        Rect());
+  EXPECT_TRUE(recorder.GetReplayEntities().empty());
+}
+
+TEST(EntityPassClipStackTest, AppendCoverageNoChange) {
+  EntityPassClipStack recorder =
+      EntityPassClipStack(Rect::MakeLTRB(0, 0, 100, 100));
+
+  EXPECT_EQ(recorder.GetClipCoverageLayers()[0].coverage,
+            Rect::MakeSize(Size::MakeWH(100, 100)));
+  EXPECT_EQ(recorder.GetClipCoverageLayers()[0].clip_depth, 0u);
+
+  Entity entity;
+  EntityPassClipStack::ClipStateResult result = recorder.ApplyClipState(
+      Contents::ClipCoverage{
+          .type = Contents::ClipCoverage::Type::kNoChange,
+          .coverage = std::nullopt,
+      },
+      entity, 0, Point(0, 0));
+  EXPECT_TRUE(result.should_render);
+  EXPECT_FALSE(result.clip_did_change);
+
+  EXPECT_EQ(recorder.GetClipCoverageLayers()[0].coverage,
+            Rect::MakeSize(Size::MakeWH(100, 100)));
+  EXPECT_EQ(recorder.GetClipCoverageLayers()[0].clip_depth, 0u);
+}
+
+TEST(EntityPassClipStackTest, AppendAndRestoreClipCoverage) {
+  EntityPassClipStack recorder =
+      EntityPassClipStack(Rect::MakeLTRB(0, 0, 100, 100));
+
+  ASSERT_EQ(recorder.GetClipCoverageLayers().size(), 1u);
+
+  // Push a clip.
+  Entity entity;
+  entity.SetClipDepth(0);
+  EntityPassClipStack::ClipStateResult result = recorder.ApplyClipState(
+      Contents::ClipCoverage{
+          .type = Contents::ClipCoverage::Type::kAppend,
+          .coverage = Rect::MakeLTRB(50, 50, 55, 55),
+      },
+      entity, 0, Point(0, 0));
+  EXPECT_TRUE(result.should_render);
+  EXPECT_TRUE(result.clip_did_change);
+
+  ASSERT_EQ(recorder.GetClipCoverageLayers().size(), 2u);
+  EXPECT_EQ(recorder.GetClipCoverageLayers()[1].coverage,
+            Rect::MakeLTRB(50, 50, 55, 55));
+  EXPECT_EQ(recorder.GetClipCoverageLayers()[1].clip_depth, 1u);
+  EXPECT_EQ(recorder.GetReplayEntities().size(), 1u);
+
+  // Restore the clip.
+  entity.SetClipDepth(0);
+  recorder.ApplyClipState(
+      Contents::ClipCoverage{
+          .type = Contents::ClipCoverage::Type::kRestore,
+          .coverage = Rect::MakeLTRB(50, 50, 55, 55),
+      },
+      entity, 0, Point(0, 0));
+
+  ASSERT_EQ(recorder.GetClipCoverageLayers().size(), 1u);
+  EXPECT_EQ(recorder.GetClipCoverageLayers()[0].coverage,
+            Rect::MakeSize(Size::MakeWH(100, 100)));
+  EXPECT_EQ(recorder.GetClipCoverageLayers()[0].clip_depth, 0u);
+  EXPECT_EQ(recorder.GetReplayEntities().size(), 0u);
+}
+
+TEST(EntityPassClipStackTest, UnbalancedRestore) {
+  EntityPassClipStack recorder =
+      EntityPassClipStack(Rect::MakeLTRB(0, 0, 100, 100));
+
+  ASSERT_EQ(recorder.GetClipCoverageLayers().size(), 1u);
+
+  // Restore the clip.
+  Entity entity;
+  entity.SetClipDepth(0);
+  EntityPassClipStack::ClipStateResult result = recorder.ApplyClipState(
+      Contents::ClipCoverage{
+          .type = Contents::ClipCoverage::Type::kRestore,
+          .coverage = Rect::MakeLTRB(50, 50, 55, 55),
+      },
+      entity, 0, Point(0, 0));
+  EXPECT_FALSE(result.should_render);
+  EXPECT_FALSE(result.clip_did_change);
+
+  ASSERT_EQ(recorder.GetClipCoverageLayers().size(), 1u);
+  EXPECT_EQ(recorder.GetClipCoverageLayers()[0].coverage,
+            Rect::MakeSize(Size::MakeWH(100, 100)));
+  EXPECT_EQ(recorder.GetClipCoverageLayers()[0].clip_depth, 0u);
+  EXPECT_EQ(recorder.GetReplayEntities().size(), 0u);
+}
+
+TEST(EntityPassClipStackTest, ClipAndRestoreWithSubpasses) {
+  EntityPassClipStack recorder =
+      EntityPassClipStack(Rect::MakeLTRB(0, 0, 100, 100));
+
+  ASSERT_EQ(recorder.GetClipCoverageLayers().size(), 1u);
+
+  // Push a clip.
+  Entity entity;
+  entity.SetClipDepth(0u);
+  {
+    EntityPassClipStack::ClipStateResult result = recorder.ApplyClipState(
+        Contents::ClipCoverage{
+            .type = Contents::ClipCoverage::Type::kAppend,
+            .coverage = Rect::MakeLTRB(50, 50, 55, 55),
+        },
+        entity, 0, Point(0, 0));
+    EXPECT_TRUE(result.should_render);
+    EXPECT_TRUE(result.clip_did_change);
+  }
+
+  ASSERT_EQ(recorder.GetClipCoverageLayers().size(), 2u);
+  EXPECT_EQ(recorder.GetClipCoverageLayers()[1].coverage,
+            Rect::MakeLTRB(50, 50, 55, 55));
+  EXPECT_EQ(recorder.GetClipCoverageLayers()[1].clip_depth, 1u);
+  EXPECT_EQ(recorder.GetReplayEntities().size(), 1u);
+
+  // Begin a subpass.
+  recorder.PushSubpass(Rect::MakeLTRB(50, 50, 55, 55), 1);
+  ASSERT_EQ(recorder.GetClipCoverageLayers().size(), 1u);
+  EXPECT_EQ(recorder.GetClipCoverageLayers()[0].coverage,
+            Rect::MakeLTRB(50, 50, 55, 55));
+
+  entity.SetClipDepth(1);
+  {
+    EntityPassClipStack::ClipStateResult result = recorder.ApplyClipState(
+        Contents::ClipCoverage{
+            .type = Contents::ClipCoverage::Type::kAppend,
+            .coverage = Rect::MakeLTRB(54, 54, 55, 55),
+        },
+        entity, 0, Point(0, 0));
+    EXPECT_TRUE(result.should_render);
+    EXPECT_TRUE(result.clip_did_change);
+  }
+
+  EXPECT_EQ(recorder.GetClipCoverageLayers()[1].coverage,
+            Rect::MakeLTRB(54, 54, 55, 55));
+
+  // End subpass.
+  recorder.PopSubpass();
+
+  EXPECT_EQ(recorder.GetClipCoverageLayers()[1].coverage,
+            Rect::MakeLTRB(50, 50, 55, 55));
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/entity/entity_playground.cc b/impeller/entity/entity_playground.cc
index 297009d90845b95185bf94207eaa3b56915e0979..294141b9958219b1e5ee27a329baa2493e234bd8 100644
--- a/impeller/entity/entity_playground.cc
+++ b/impeller/entity/entity_playground.cc
@@ -5,39 +5,86 @@
 #include "impeller/entity/entity_playground.h"
 
 #include "impeller/entity/contents/content_context.h"
+#include "impeller/typographer/backends/skia/typographer_context_skia.h"
+#include "third_party/imgui/imgui.h"
 
 namespace impeller {
 
-EntityPlayground::EntityPlayground() = default;
+EntityPlayground::EntityPlayground()
+    : typographer_context_(TypographerContextSkia::Make()) {}
 
 EntityPlayground::~EntityPlayground() = default;
 
-bool EntityPlayground::OpenPlaygroundHere(Entity entity) {
-  if (!Playground::is_enabled()) {
+void EntityPlayground::SetTypographerContext(
+    std::shared_ptr<TypographerContext> typographer_context) {
+  typographer_context_ = std::move(typographer_context);
+}
+
+bool EntityPlayground::OpenPlaygroundHere(EntityPass& entity_pass) {
+  if (!switches_.enable_playground) {
     return true;
   }
 
-  ContentContext content_context(GetContext());
+  ContentContext content_context(GetContext(), typographer_context_);
   if (!content_context.IsValid()) {
     return false;
   }
+
+  // Resolve any lingering tracked clips by assigning an arbitrarily high
+  // number. The number to assign just needs to be at least as high as larger
+  // any previously assigned clip depth in the scene. Normally, Aiks handles
+  // this correctly when wrapping up the base pass as an `impeller::Picture`.
+  entity_pass.PopAllClips(99999);
+
+  auto callback = [&](RenderTarget& render_target) -> bool {
+    return entity_pass.Render(content_context, render_target);
+  };
+  return Playground::OpenPlaygroundHere(callback);
+}
+
+std::shared_ptr<ContentContext> EntityPlayground::GetContentContext() const {
+  return std::make_shared<ContentContext>(GetContext(), typographer_context_);
+}
+
+bool EntityPlayground::OpenPlaygroundHere(Entity entity) {
+  if (!switches_.enable_playground) {
+    return true;
+  }
+
+  auto content_context = GetContentContext();
+  if (!content_context->IsValid()) {
+    return false;
+  }
   SinglePassCallback callback = [&](RenderPass& pass) -> bool {
-    return entity.Render(content_context, pass);
+    content_context->GetRenderTargetCache()->Start();
+    bool result = entity.Render(*content_context, pass);
+    content_context->GetRenderTargetCache()->End();
+    content_context->GetTransientsBuffer().Reset();
+    return result;
   };
   return Playground::OpenPlaygroundHere(callback);
 }
 
 bool EntityPlayground::OpenPlaygroundHere(EntityPlaygroundCallback callback) {
-  if (!Playground::is_enabled()) {
+  if (!switches_.enable_playground) {
     return true;
   }
 
-  ContentContext content_context(GetContext());
+  ContentContext content_context(GetContext(), typographer_context_);
   if (!content_context.IsValid()) {
     return false;
   }
   SinglePassCallback pass_callback = [&](RenderPass& pass) -> bool {
-    return callback(content_context, pass);
+    static bool wireframe = false;
+    if (ImGui::IsKeyPressed(ImGuiKey_Z)) {
+      wireframe = !wireframe;
+      content_context.SetWireframe(wireframe);
+    }
+    content_context.GetRenderTargetCache()->Start();
+    bool result = callback(content_context, pass);
+    content_context.GetRenderTargetCache()->End();
+    content_context.GetTransientsBuffer().Reset();
+    return result;
   };
   return Playground::OpenPlaygroundHere(pass_callback);
 }
diff --git a/impeller/entity/entity_playground.h b/impeller/entity/entity_playground.h
index c66e588fbafa89e176c7e5a2cdbf0c8cd66ae918..41dc21658ef2b9bdb8eec7397fb9f60d6ed592d2 100644
--- a/impeller/entity/entity_playground.h
+++ b/impeller/entity/entity_playground.h
@@ -2,12 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_ENTITY_PLAYGROUND_H_
+#define FLUTTER_IMPELLER_ENTITY_ENTITY_PLAYGROUND_H_
+
+#include "impeller/playground/playground_test.h"
 
 #include "flutter/fml/macros.h"
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/entity.h"
-#include "impeller/playground/playground_test.h"
+#include "impeller/entity/entity_pass.h"
+#include "impeller/typographer/typographer_context.h"
 
 namespace impeller {
 
@@ -20,12 +24,25 @@ class EntityPlayground : public PlaygroundTest {
 
   ~EntityPlayground();
 
+  void SetTypographerContext(
+      std::shared_ptr<TypographerContext> typographer_context);
+
   bool OpenPlaygroundHere(Entity entity);
 
+  bool OpenPlaygroundHere(EntityPass& entity_pass);
+
   bool OpenPlaygroundHere(EntityPlaygroundCallback callback);
 
+  std::shared_ptr<ContentContext> GetContentContext() const;
+
  private:
-  FML_DISALLOW_COPY_AND_ASSIGN(EntityPlayground);
+  std::shared_ptr<TypographerContext> typographer_context_;
+
+  EntityPlayground(const EntityPlayground&) = delete;
+
+  EntityPlayground& operator=(const EntityPlayground&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_ENTITY_PLAYGROUND_H_
diff --git a/impeller/entity/entity_unittests.cc b/impeller/entity/entity_unittests.cc
index 0dde60a9246a0f90f39cb6d663911ca9a72e22e8..ba3fccbc38e319426362366a1fa782063ad2ff6a 100644
--- a/impeller/entity/entity_unittests.cc
+++ b/impeller/entity/entity_unittests.cc
@@ -6,48 +6,61 @@
 #include <cstring>
 #include <memory>
 #include <optional>
-#include <unordered_map>
+#include <utility>
 #include <vector>
 
-#include "flutter/testing/testing.h"
+#include "flutter/display_list/testing/dl_test_snippets.h"
 #include "fml/logging.h"
-#include "fml/time/time_point.h"
 #include "gtest/gtest.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/texture_descriptor.h"
 #include "impeller/entity/contents/atlas_contents.h"
 #include "impeller/entity/contents/clip_contents.h"
+#include "impeller/entity/contents/conical_gradient_contents.h"
+#include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/contents/contents.h"
-#include "impeller/entity/contents/filters/blend_filter_contents.h"
 #include "impeller/entity/contents/filters/color_filter_contents.h"
 #include "impeller/entity/contents/filters/filter_contents.h"
+#include "impeller/entity/contents/filters/gaussian_blur_filter_contents.h"
 #include "impeller/entity/contents/filters/inputs/filter_input.h"
 #include "impeller/entity/contents/linear_gradient_contents.h"
-#include "impeller/entity/contents/rrect_shadow_contents.h"
+#include "impeller/entity/contents/radial_gradient_contents.h"
 #include "impeller/entity/contents/runtime_effect_contents.h"
 #include "impeller/entity/contents/solid_color_contents.h"
+#include "impeller/entity/contents/solid_rrect_blur_contents.h"
 #include "impeller/entity/contents/text_contents.h"
 #include "impeller/entity/contents/texture_contents.h"
-#include "impeller/entity/contents/vertices_contents.h"
+#include "impeller/entity/contents/tiled_texture_contents.h"
 #include "impeller/entity/entity.h"
 #include "impeller/entity/entity_pass.h"
 #include "impeller/entity/entity_pass_delegate.h"
 #include "impeller/entity/entity_playground.h"
-#include "impeller/entity/geometry.h"
+#include "impeller/entity/geometry/geometry.h"
+#include "impeller/entity/geometry/point_field_geometry.h"
+#include "impeller/entity/geometry/stroke_path_geometry.h"
+#include "impeller/entity/render_target_cache.h"
 #include "impeller/geometry/color.h"
-#include "impeller/geometry/geometry_unittests.h"
+#include "impeller/geometry/geometry_asserts.h"
 #include "impeller/geometry/path_builder.h"
+#include "impeller/geometry/point.h"
 #include "impeller/geometry/sigma.h"
+#include "impeller/geometry/vector.h"
 #include "impeller/playground/playground.h"
 #include "impeller/playground/widgets.h"
+#include "impeller/renderer/command.h"
+#include "impeller/renderer/pipeline_descriptor.h"
 #include "impeller/renderer/render_pass.h"
+#include "impeller/renderer/render_target.h"
+#include "impeller/renderer/testing/mocks.h"
 #include "impeller/renderer/vertex_buffer_builder.h"
-#include "impeller/runtime_stage/runtime_stage.h"
-#include "impeller/tessellator/tessellator.h"
 #include "impeller/typographer/backends/skia/text_frame_skia.h"
-#include "impeller/typographer/backends/skia/text_render_context_skia.h"
-#include "include/core/SkBlendMode.h"
+#include "impeller/typographer/backends/skia/typographer_context_skia.h"
 #include "third_party/imgui/imgui.h"
 #include "third_party/skia/include/core/SkTextBlob.h"
 
+// TODO(zanderso): https://github.com/flutter/flutter/issues/127701
+// NOLINTBEGIN(bugprone-unchecked-optional-access)
+
 namespace impeller {
 namespace testing {
 
@@ -56,25 +69,23 @@ INSTANTIATE_PLAYGROUND_SUITE(EntityTest);
 
 TEST_P(EntityTest, CanCreateEntity) {
   Entity entity;
-  ASSERT_TRUE(entity.GetTransformation().IsIdentity());
+  ASSERT_TRUE(entity.GetTransform().IsIdentity());
 }
 
 class TestPassDelegate final : public EntityPassDelegate {
  public:
-  explicit TestPassDelegate(std::optional<Rect> coverage)
-      : coverage_(coverage) {}
+  explicit TestPassDelegate(bool collapse = false) : collapse_(collapse) {}
 
   // |EntityPassDelegate|
   ~TestPassDelegate() override = default;
 
-  // |EntityPassDelegate|
-  std::optional<Rect> GetCoverageRect() override { return coverage_; }
-
   // |EntityPassDelgate|
   bool CanElide() override { return false; }
 
   // |EntityPassDelgate|
-  bool CanCollapseIntoParentPass() override { return false; }
+  bool CanCollapseIntoParentPass(EntityPass* entity_pass) override {
+    return collapse_;
+  }
 
   // |EntityPassDelgate|
   std::shared_ptr<Contents> CreateContentsForSubpassTarget(
@@ -83,21 +94,34 @@ class TestPassDelegate final : public EntityPassDelegate {
     return nullptr;
   }
 
+  // |EntityPassDelegate|
+  std::shared_ptr<FilterContents> WithImageFilter(
+      const FilterInput::Variant& input,
+      const Matrix& effect_transform) const override {
+    return nullptr;
+  }
+
  private:
   const std::optional<Rect> coverage_;
+  const bool collapse_;
 };
 
-auto CreatePassWithRectPath(Rect rect, std::optional<Rect> bounds_hint) {
+auto CreatePassWithRectPath(
+    Rect rect,
+    std::optional<Rect> bounds_hint,
+    ContentBoundsPromise bounds_promise = ContentBoundsPromise::kUnknown,
+    bool collapse = false) {
   auto subpass = std::make_unique<EntityPass>();
   Entity entity;
   entity.SetContents(SolidColorContents::Make(
       PathBuilder{}.AddRect(rect).TakePath(), Color::Red()));
-  subpass->AddEntity(entity);
-  subpass->SetDelegate(std::make_unique<TestPassDelegate>(bounds_hint));
+  subpass->AddEntity(std::move(entity));
+  subpass->SetDelegate(std::make_unique<TestPassDelegate>(collapse));
+  subpass->SetBoundsLimit(bounds_hint, bounds_promise);
   return subpass;
 }
 
-TEST_P(EntityTest, EntityPassCoverageRespectsDelegateBoundsHint) {
+TEST_P(EntityTest, EntityPassRespectsUntrustedSubpassBoundsLimit) {
   EntityPass pass;
 
   auto subpass0 = CreatePassWithRectPath(Rect::MakeLTRB(0, 0, 100, 100),
@@ -124,6 +148,64 @@ TEST_P(EntityTest, EntityPassCoverageRespectsDelegateBoundsHint) {
   ASSERT_RECT_NEAR(coverage.value(), Rect::MakeLTRB(50, 50, 900, 900));
 }
 
+TEST_P(EntityTest, EntityPassTrustsSnugSubpassBoundsLimit) {
+  EntityPass pass;
+
+  auto subpass0 =  //
+      CreatePassWithRectPath(Rect::MakeLTRB(10, 10, 90, 90),
+                             Rect::MakeLTRB(5, 5, 95, 95),
+                             ContentBoundsPromise::kContainsContents);
+  auto subpass1 =  //
+      CreatePassWithRectPath(Rect::MakeLTRB(500, 500, 1000, 1000),
+                             Rect::MakeLTRB(495, 495, 1005, 1005),
+                             ContentBoundsPromise::kContainsContents);
+
+  auto subpass0_coverage =
+      pass.GetSubpassCoverage(*subpass0.get(), std::nullopt);
+  EXPECT_TRUE(subpass0_coverage.has_value());
+  // Result should be the overridden bounds
+  // (we lied about them being snug, but the property is respected)
+  EXPECT_RECT_NEAR(subpass0_coverage.value(), Rect::MakeLTRB(5, 5, 95, 95));
+
+  auto subpass1_coverage =
+      pass.GetSubpassCoverage(*subpass1.get(), std::nullopt);
+  EXPECT_TRUE(subpass1_coverage.has_value());
+  // Result should be the overridden bounds
+  // (we lied about them being snug, but the property is respected)
+  EXPECT_RECT_NEAR(subpass1_coverage.value(),
+                   Rect::MakeLTRB(495, 495, 1005, 1005));
+
+  pass.AddSubpass(std::move(subpass0));
+  pass.AddSubpass(std::move(subpass1));
+
+  auto coverage = pass.GetElementsCoverage(std::nullopt);
+  EXPECT_TRUE(coverage.has_value());
+  // This result should be the union of the overridden bounds
+  EXPECT_RECT_NEAR(coverage.value(), Rect::MakeLTRB(5, 5, 1005, 1005));
+}
+
+TEST_P(EntityTest, EntityPassCanMergeSubpassIntoParent) {
+  // Both a red and a blue box should appear if the pass merging has worked
+  // correctly.
+
+  EntityPass pass;
+  auto subpass = CreatePassWithRectPath(Rect::MakeLTRB(0, 0, 100, 100),
+                                        Rect::MakeLTRB(50, 50, 150, 150),
+                                        ContentBoundsPromise::kUnknown, true);
+  pass.AddSubpass(std::move(subpass));
+
+  Entity entity;
+  entity.SetTransform(Matrix::MakeScale(GetContentScale()));
+  auto contents = std::make_unique<SolidColorContents>();
+  contents->SetGeometry(Geometry::MakeRect(Rect::MakeLTRB(100, 100, 200, 200)));
+  contents->SetColor(Color::Blue());
+  entity.SetContents(std::move(contents));
+
+  pass.AddEntity(std::move(entity));
+
+  ASSERT_TRUE(OpenPlaygroundHere(pass));
+}
+
 TEST_P(EntityTest, EntityPassCoverageRespectsCoverageLimit) {
   // Rect is drawn entirely in negative area.
   auto pass = CreatePassWithRectPath(Rect::MakeLTRB(-200, -200, -100, -100),
@@ -171,7 +253,7 @@ TEST_P(EntityTest, FilterCoverageRespectsCropRect) {
   // With the crop rect.
   {
     auto expected = Rect::MakeLTRB(50, 50, 100, 100);
-    filter->SetCoverageCrop(expected);
+    filter->SetCoverageHint(expected);
     auto actual = filter->GetCoverage({});
 
     ASSERT_TRUE(actual.has_value());
@@ -181,22 +263,38 @@ TEST_P(EntityTest, FilterCoverageRespectsCropRect) {
 
 TEST_P(EntityTest, CanDrawRect) {
   auto contents = std::make_shared<SolidColorContents>();
-  contents->SetGeometry(Geometry::MakeRect({100, 100, 100, 100}));
+  contents->SetGeometry(Geometry::MakeRect(Rect::MakeXYWH(100, 100, 100, 100)));
+  contents->SetColor(Color::Red());
+
+  Entity entity;
+  entity.SetTransform(Matrix::MakeScale(GetContentScale()));
+  entity.SetContents(contents);
+
+  ASSERT_TRUE(OpenPlaygroundHere(std::move(entity)));
+}
+
+TEST_P(EntityTest, CanDrawRRect) {
+  auto contents = std::make_shared<SolidColorContents>();
+  auto path = PathBuilder{}
+                  .SetConvexity(Convexity::kConvex)
+                  .AddRoundedRect(Rect::MakeXYWH(100, 100, 100, 100), 10.0)
+                  .TakePath();
+  contents->SetGeometry(Geometry::MakeFillPath(path));
   contents->SetColor(Color::Red());
 
   Entity entity;
-  entity.SetTransformation(Matrix::MakeScale(GetContentScale()));
+  entity.SetTransform(Matrix::MakeScale(GetContentScale()));
   entity.SetContents(contents);
 
-  ASSERT_TRUE(OpenPlaygroundHere(entity));
+  ASSERT_TRUE(OpenPlaygroundHere(std::move(entity)));
 }
 
 TEST_P(EntityTest, GeometryBoundsAreTransformed) {
-  auto geometry = Geometry::MakeRect({100, 100, 100, 100});
+  auto geometry = Geometry::MakeRect(Rect::MakeXYWH(100, 100, 100, 100));
   auto transform = Matrix::MakeScale({2.0, 2.0, 2.0});
 
   ASSERT_RECT_NEAR(geometry->GetCoverage(transform).value(),
-                   Rect(200, 200, 200, 200));
+                   Rect::MakeXYWH(200, 200, 200, 200));
 }
 
 TEST_P(EntityTest, ThreeStrokesInOnePath) {
@@ -210,32 +308,54 @@ TEST_P(EntityTest, ThreeStrokesInOnePath) {
                   .TakePath();
 
   Entity entity;
-  entity.SetTransformation(Matrix::MakeScale(GetContentScale()));
+  entity.SetTransform(Matrix::MakeScale(GetContentScale()));
   auto contents = std::make_unique<SolidColorContents>();
   contents->SetGeometry(Geometry::MakeStrokePath(path, 5.0));
   contents->SetColor(Color::Red());
   entity.SetContents(std::move(contents));
-  ASSERT_TRUE(OpenPlaygroundHere(entity));
+  ASSERT_TRUE(OpenPlaygroundHere(std::move(entity)));
+}
+
+TEST_P(EntityTest, StrokeWithTextureContents) {
+  auto bridge = CreateTextureForFixture("bay_bridge.jpg");
+  Path path = PathBuilder{}
+                  .MoveTo({100, 100})
+                  .LineTo({100, 200})
+                  .MoveTo({100, 300})
+                  .LineTo({100, 400})
+                  .MoveTo({100, 500})
+                  .LineTo({100, 600})
+                  .TakePath();
+
+  Entity entity;
+  entity.SetTransform(Matrix::MakeScale(GetContentScale()));
+  auto contents = std::make_unique<TiledTextureContents>();
+  contents->SetGeometry(Geometry::MakeStrokePath(path, 100.0));
+  contents->SetTexture(bridge);
+  contents->SetTileModes(Entity::TileMode::kClamp, Entity::TileMode::kClamp);
+  entity.SetContents(std::move(contents));
+  ASSERT_TRUE(OpenPlaygroundHere(std::move(entity)));
 }
 
 TEST_P(EntityTest, TriangleInsideASquare) {
   auto callback = [&](ContentContext& context, RenderPass& pass) {
     Point offset(100, 100);
 
-    Point a =
-        IMPELLER_PLAYGROUND_POINT(Point(10, 10) + offset, 20, Color::White());
-    Point b =
-        IMPELLER_PLAYGROUND_POINT(Point(210, 10) + offset, 20, Color::White());
-    Point c =
-        IMPELLER_PLAYGROUND_POINT(Point(210, 210) + offset, 20, Color::White());
-    Point d =
-        IMPELLER_PLAYGROUND_POINT(Point(10, 210) + offset, 20, Color::White());
-    Point e =
-        IMPELLER_PLAYGROUND_POINT(Point(50, 50) + offset, 20, Color::White());
-    Point f =
-        IMPELLER_PLAYGROUND_POINT(Point(100, 50) + offset, 20, Color::White());
-    Point g =
-        IMPELLER_PLAYGROUND_POINT(Point(50, 150) + offset, 20, Color::White());
+    static PlaygroundPoint point_a(Point(10, 10) + offset, 20, Color::White());
+    Point a = DrawPlaygroundPoint(point_a);
+    static PlaygroundPoint point_b(Point(210, 10) + offset, 20, Color::White());
+    Point b = DrawPlaygroundPoint(point_b);
+    static PlaygroundPoint point_c(Point(210, 210) + offset, 20,
+                                   Color::White());
+    Point c = DrawPlaygroundPoint(point_c);
+    static PlaygroundPoint point_d(Point(10, 210) + offset, 20, Color::White());
+    Point d = DrawPlaygroundPoint(point_d);
+    static PlaygroundPoint point_e(Point(50, 50) + offset, 20, Color::White());
+    Point e = DrawPlaygroundPoint(point_e);
+    static PlaygroundPoint point_f(Point(100, 50) + offset, 20, Color::White());
+    Point f = DrawPlaygroundPoint(point_f);
+    static PlaygroundPoint point_g(Point(50, 150) + offset, 20, Color::White());
+    Point g = DrawPlaygroundPoint(point_g);
     Path path = PathBuilder{}
                     .MoveTo(a)
                     .LineTo(b)
@@ -249,7 +369,7 @@ TEST_P(EntityTest, TriangleInsideASquare) {
                     .TakePath();
 
     Entity entity;
-    entity.SetTransformation(Matrix::MakeScale(GetContentScale()));
+    entity.SetTransform(Matrix::MakeScale(GetContentScale()));
     auto contents = std::make_unique<SolidColorContents>();
     contents->SetGeometry(Geometry::MakeStrokePath(path, 20.0));
     contents->SetColor(Color::Red());
@@ -291,7 +411,7 @@ TEST_P(EntityTest, StrokeCapAndJoinTest) {
       contents->SetColor(Color::Red());
 
       Entity entity;
-      entity.SetTransformation(world_matrix);
+      entity.SetTransform(world_matrix);
       entity.SetContents(std::move(contents));
 
       auto coverage = entity.GetCoverage();
@@ -314,10 +434,12 @@ TEST_P(EntityTest, StrokeCapAndJoinTest) {
     // Cap::kButt demo.
     {
       Point off = Point(0, 0) * padding + margin;
-      auto [a, b] = IMPELLER_PLAYGROUND_LINE(off + a_def, off + b_def, r,
-                                             Color::Black(), Color::White());
-      auto [c, d] = IMPELLER_PLAYGROUND_LINE(off + c_def, off + d_def, r,
-                                             Color::Black(), Color::White());
+      static PlaygroundPoint point_a(off + a_def, r, Color::Black());
+      static PlaygroundPoint point_b(off + b_def, r, Color::White());
+      auto [a, b] = DrawPlaygroundLine(point_a, point_b);
+      static PlaygroundPoint point_c(off + c_def, r, Color::Black());
+      static PlaygroundPoint point_d(off + d_def, r, Color::White());
+      auto [c, d] = DrawPlaygroundLine(point_c, point_d);
       render_path(PathBuilder{}.AddCubicCurve(a, b, d, c).TakePath(),
                   Cap::kButt, Join::kBevel);
     }
@@ -325,10 +447,12 @@ TEST_P(EntityTest, StrokeCapAndJoinTest) {
     // Cap::kSquare demo.
     {
       Point off = Point(1, 0) * padding + margin;
-      auto [a, b] = IMPELLER_PLAYGROUND_LINE(off + a_def, off + b_def, r,
-                                             Color::Black(), Color::White());
-      auto [c, d] = IMPELLER_PLAYGROUND_LINE(off + c_def, off + d_def, r,
-                                             Color::Black(), Color::White());
+      static PlaygroundPoint point_a(off + a_def, r, Color::Black());
+      static PlaygroundPoint point_b(off + b_def, r, Color::White());
+      auto [a, b] = DrawPlaygroundLine(point_a, point_b);
+      static PlaygroundPoint point_c(off + c_def, r, Color::Black());
+      static PlaygroundPoint point_d(off + d_def, r, Color::White());
+      auto [c, d] = DrawPlaygroundLine(point_c, point_d);
       render_path(PathBuilder{}.AddCubicCurve(a, b, d, c).TakePath(),
                   Cap::kSquare, Join::kBevel);
     }
@@ -336,10 +460,12 @@ TEST_P(EntityTest, StrokeCapAndJoinTest) {
     // Cap::kRound demo.
     {
       Point off = Point(2, 0) * padding + margin;
-      auto [a, b] = IMPELLER_PLAYGROUND_LINE(off + a_def, off + b_def, r,
-                                             Color::Black(), Color::White());
-      auto [c, d] = IMPELLER_PLAYGROUND_LINE(off + c_def, off + d_def, r,
-                                             Color::Black(), Color::White());
+      static PlaygroundPoint point_a(off + a_def, r, Color::Black());
+      static PlaygroundPoint point_b(off + b_def, r, Color::White());
+      auto [a, b] = DrawPlaygroundLine(point_a, point_b);
+      static PlaygroundPoint point_c(off + c_def, r, Color::Black());
+      static PlaygroundPoint point_d(off + d_def, r, Color::White());
+      auto [c, d] = DrawPlaygroundLine(point_c, point_d);
       render_path(PathBuilder{}.AddCubicCurve(a, b, d, c).TakePath(),
                   Cap::kRound, Join::kBevel);
     }
@@ -347,9 +473,15 @@ TEST_P(EntityTest, StrokeCapAndJoinTest) {
     // Join::kBevel demo.
     {
       Point off = Point(0, 1) * padding + margin;
-      Point a = IMPELLER_PLAYGROUND_POINT(off + a_def, r, Color::White());
-      Point b = IMPELLER_PLAYGROUND_POINT(off + e_def, r, Color::White());
-      Point c = IMPELLER_PLAYGROUND_POINT(off + c_def, r, Color::White());
+      static PlaygroundPoint point_a =
+          PlaygroundPoint(off + a_def, r, Color::White());
+      static PlaygroundPoint point_b =
+          PlaygroundPoint(off + e_def, r, Color::White());
+      static PlaygroundPoint point_c =
+          PlaygroundPoint(off + c_def, r, Color::White());
+      Point a = DrawPlaygroundPoint(point_a);
+      Point b = DrawPlaygroundPoint(point_b);
+      Point c = DrawPlaygroundPoint(point_c);
       render_path(
           PathBuilder{}.MoveTo(a).LineTo(b).LineTo(c).Close().TakePath(),
           Cap::kButt, Join::kBevel);
@@ -358,9 +490,12 @@ TEST_P(EntityTest, StrokeCapAndJoinTest) {
     // Join::kMiter demo.
     {
       Point off = Point(1, 1) * padding + margin;
-      Point a = IMPELLER_PLAYGROUND_POINT(off + a_def, r, Color::White());
-      Point b = IMPELLER_PLAYGROUND_POINT(off + e_def, r, Color::White());
-      Point c = IMPELLER_PLAYGROUND_POINT(off + c_def, r, Color::White());
+      static PlaygroundPoint point_a(off + a_def, r, Color::White());
+      static PlaygroundPoint point_b(off + e_def, r, Color::White());
+      static PlaygroundPoint point_c(off + c_def, r, Color::White());
+      Point a = DrawPlaygroundPoint(point_a);
+      Point b = DrawPlaygroundPoint(point_b);
+      Point c = DrawPlaygroundPoint(point_c);
       render_path(
           PathBuilder{}.MoveTo(a).LineTo(b).LineTo(c).Close().TakePath(),
           Cap::kButt, Join::kMiter);
@@ -369,9 +504,12 @@ TEST_P(EntityTest, StrokeCapAndJoinTest) {
     // Join::kRound demo.
     {
       Point off = Point(2, 1) * padding + margin;
-      Point a = IMPELLER_PLAYGROUND_POINT(off + a_def, r, Color::White());
-      Point b = IMPELLER_PLAYGROUND_POINT(off + e_def, r, Color::White());
-      Point c = IMPELLER_PLAYGROUND_POINT(off + c_def, r, Color::White());
+      static PlaygroundPoint point_a(off + a_def, r, Color::White());
+      static PlaygroundPoint point_b(off + e_def, r, Color::White());
+      static PlaygroundPoint point_c(off + c_def, r, Color::White());
+      Point a = DrawPlaygroundPoint(point_a);
+      Point b = DrawPlaygroundPoint(point_b);
+      Point c = DrawPlaygroundPoint(point_c);
       render_path(
           PathBuilder{}.MoveTo(a).LineTo(b).LineTo(c).Close().TakePath(),
           Cap::kButt, Join::kRound);
@@ -399,9 +537,55 @@ TEST_P(EntityTest, CubicCurveTest) {
           .Close()
           .TakePath();
   Entity entity;
-  entity.SetTransformation(Matrix::MakeScale(GetContentScale()));
+  entity.SetTransform(Matrix::MakeScale(GetContentScale()));
   entity.SetContents(SolidColorContents::Make(path, Color::Red()));
-  ASSERT_TRUE(OpenPlaygroundHere(entity));
+  ASSERT_TRUE(OpenPlaygroundHere(std::move(entity)));
+}
+
+TEST_P(EntityTest, CanDrawCorrectlyWithRotatedTransform) {
+  auto callback = [&](ContentContext& context, RenderPass& pass) -> bool {
+    const char* input_axis[] = {"X", "Y", "Z"};
+    static int rotation_axis_index = 0;
+    static float rotation = 0;
+    ImGui::Begin("Controls", nullptr, ImGuiWindowFlags_AlwaysAutoResize);
+    ImGui::SliderFloat("Rotation", &rotation, -kPi, kPi);
+    ImGui::Combo("Rotation Axis", &rotation_axis_index, input_axis,
+                 sizeof(input_axis) / sizeof(char*));
+    Matrix rotation_matrix;
+    switch (rotation_axis_index) {
+      case 0:
+        rotation_matrix = Matrix::MakeRotationX(Radians(rotation));
+        break;
+      case 1:
+        rotation_matrix = Matrix::MakeRotationY(Radians(rotation));
+        break;
+      case 2:
+        rotation_matrix = Matrix::MakeRotationZ(Radians(rotation));
+        break;
+      default:
+        rotation_matrix = Matrix{};
+        break;
+    }
+
+    if (ImGui::Button("Reset")) {
+      rotation = 0;
+    }
+    ImGui::End();
+    Matrix current_transform =
+        Matrix::MakeScale(GetContentScale())
+            .MakeTranslation(
+                Vector3(Point(pass.GetRenderTargetSize().width / 2.0,
+                              pass.GetRenderTargetSize().height / 2.0)));
+    Matrix result_transform = current_transform * rotation_matrix;
+    Path path =
+        PathBuilder{}.AddRect(Rect::MakeXYWH(-300, -400, 600, 800)).TakePath();
+
+    Entity entity;
+    entity.SetTransform(result_transform);
+    entity.SetContents(SolidColorContents::Make(path, Color::Red()));
+    return entity.Render(context, pass);
+  };
+  ASSERT_TRUE(OpenPlaygroundHere(callback));
 }
 
 TEST_P(EntityTest, CubicCurveAndOverlapTest) {
@@ -627,9 +811,9 @@ TEST_P(EntityTest, CubicCurveAndOverlapTest) {
           .Close()
           .TakePath();
   Entity entity;
-  entity.SetTransformation(Matrix::MakeScale(GetContentScale()));
+  entity.SetTransform(Matrix::MakeScale(GetContentScale()));
   entity.SetContents(SolidColorContents::Make(path, Color::Red()));
-  ASSERT_TRUE(OpenPlaygroundHere(entity));
+  ASSERT_TRUE(OpenPlaygroundHere(std::move(entity)));
 }
 
 TEST_P(EntityTest, SolidColorContentsStrokeSetStrokeCapsAndJoins) {
@@ -679,7 +863,7 @@ TEST_P(EntityTest, BlendingModeOptions) {
   std::vector<BlendMode> blend_mode_values;
   {
     // Force an exhausiveness check with a switch. When adding blend modes,
-    // update this switch with a new name/value to to make it selectable in the
+    // update this switch with a new name/value to make it selectable in the
     // test GUI.
 
     const BlendMode b{};
@@ -738,7 +922,6 @@ TEST_P(EntityTest, BlendingModeOptions) {
     auto draw_rect = [&context, &pass, &world_matrix](
                          Rect rect, Color color, BlendMode blend_mode) -> bool {
       using VS = SolidFillPipeline::VertexShader;
-      using FS = SolidFillPipeline::FragmentShader;
 
       VertexBufferBuilder<VS::PerVertexData> vtx_builder;
       {
@@ -753,27 +936,21 @@ TEST_P(EntityTest, BlendingModeOptions) {
         });
       }
 
-      Command cmd;
-      cmd.label = "Blended Rectangle";
+      pass.SetCommandLabel("Blended Rectangle");
       auto options = OptionsFromPass(pass);
       options.blend_mode = blend_mode;
       options.primitive_type = PrimitiveType::kTriangle;
-      cmd.pipeline = context.GetSolidFillPipeline(options);
-      cmd.BindVertices(
-          vtx_builder.CreateVertexBuffer(pass.GetTransientsBuffer()));
-
-      VS::VertInfo frame_info;
-      frame_info.mvp =
-          Matrix::MakeOrthographic(pass.GetRenderTargetSize()) * world_matrix;
-      VS::BindVertInfo(cmd,
-                       pass.GetTransientsBuffer().EmplaceUniform(frame_info));
-
-      FS::FragInfo frag_info;
-      frag_info.color = color.Premultiply();
-      FS::BindFragInfo(cmd,
-                       pass.GetTransientsBuffer().EmplaceUniform(frag_info));
-
-      return pass.AddCommand(std::move(cmd));
+      pass.SetPipeline(context.GetSolidFillPipeline(options));
+      pass.SetVertexBuffer(
+          vtx_builder.CreateVertexBuffer(context.GetTransientsBuffer()));
+
+      VS::FrameInfo frame_info;
+      frame_info.mvp = pass.GetOrthographicTransform() * world_matrix;
+      frame_info.color = color.Premultiply();
+      VS::BindFrameInfo(
+          pass, context.GetTransientsBuffer().EmplaceUniform(frame_info));
+
+      return pass.Draw().ok();
     };
 
     ImGui::Begin("Controls", nullptr, ImGuiWindowFlags_AlwaysAutoResize);
@@ -788,15 +965,18 @@ TEST_P(EntityTest, BlendingModeOptions) {
     BlendMode selected_mode = blend_mode_values[current_blend_index];
 
     Point a, b, c, d;
-    std::tie(a, b) = IMPELLER_PLAYGROUND_LINE(
-        Point(400, 100), Point(200, 300), 20, Color::White(), Color::White());
-    std::tie(c, d) = IMPELLER_PLAYGROUND_LINE(
-        Point(470, 190), Point(270, 390), 20, Color::White(), Color::White());
+    static PlaygroundPoint point_a(Point(400, 100), 20, Color::White());
+    static PlaygroundPoint point_b(Point(200, 300), 20, Color::White());
+    std::tie(a, b) = DrawPlaygroundLine(point_a, point_b);
+    static PlaygroundPoint point_c(Point(470, 190), 20, Color::White());
+    static PlaygroundPoint point_d(Point(270, 390), 20, Color::White());
+    std::tie(c, d) = DrawPlaygroundLine(point_c, point_d);
 
     bool result = true;
-    result = result && draw_rect(Rect(0, 0, pass.GetRenderTargetSize().width,
+    result = result &&
+             draw_rect(Rect::MakeXYWH(0, 0, pass.GetRenderTargetSize().width,
                                       pass.GetRenderTargetSize().height),
-                                 Color(), BlendMode::kClear);
+                       Color(), BlendMode::kClear);
     result = result && draw_rect(Rect::MakeLTRB(a.x, a.y, b.x, b.y), color1,
                                  BlendMode::kSourceOver);
     result = result && draw_rect(Rect::MakeLTRB(c.x, c.y, d.x, d.y), color2,
@@ -807,28 +987,37 @@ TEST_P(EntityTest, BlendingModeOptions) {
 }
 
 TEST_P(EntityTest, BezierCircleScaled) {
-  Entity entity;
-  entity.SetTransformation(Matrix::MakeScale(GetContentScale()));
-  auto path = PathBuilder{}
-                  .MoveTo({97.325, 34.818})
-                  .CubicCurveTo({98.50862885295136, 34.81812293973836},
-                                {99.46822048142015, 33.85863261475589},
-                                {99.46822048142015, 32.67499810206613})
-                  .CubicCurveTo({99.46822048142015, 31.491363589376355},
-                                {98.50862885295136, 30.53187326439389},
-                                {97.32499434685802, 30.531998226542708})
-                  .CubicCurveTo({96.14153655073771, 30.532123170035373},
-                                {95.18222070648729, 31.491540299350355},
-                                {95.18222070648729, 32.67499810206613})
-                  .CubicCurveTo({95.18222070648729, 33.85845590478189},
-                                {96.14153655073771, 34.81787303409686},
-                                {97.32499434685802, 34.81799797758954})
-                  .Close()
-                  .TakePath();
-  entity.SetTransformation(
-      Matrix::MakeScale({20.0, 20.0, 1.0}).Translate({-80, -15, 0}));
-  entity.SetContents(SolidColorContents::Make(path, Color::Red()));
-  ASSERT_TRUE(OpenPlaygroundHere(entity));
+  auto callback = [&](ContentContext& context, RenderPass& pass) -> bool {
+    static float scale = 20;
+
+    ImGui::Begin("Controls", nullptr, ImGuiWindowFlags_AlwaysAutoResize);
+    ImGui::SliderFloat("Scale", &scale, 1, 100);
+    ImGui::End();
+
+    Entity entity;
+    entity.SetTransform(Matrix::MakeScale(GetContentScale()));
+    auto path = PathBuilder{}
+                    .MoveTo({97.325, 34.818})
+                    .CubicCurveTo({98.50862885295136, 34.81812293973836},
+                                  {99.46822048142015, 33.85863261475589},
+                                  {99.46822048142015, 32.67499810206613})
+                    .CubicCurveTo({99.46822048142015, 31.491363589376355},
+                                  {98.50862885295136, 30.53187326439389},
+                                  {97.32499434685802, 30.531998226542708})
+                    .CubicCurveTo({96.14153655073771, 30.532123170035373},
+                                  {95.18222070648729, 31.491540299350355},
+                                  {95.18222070648729, 32.67499810206613})
+                    .CubicCurveTo({95.18222070648729, 33.85845590478189},
+                                  {96.14153655073771, 34.81787303409686},
+                                  {97.32499434685802, 34.81799797758954})
+                    .Close()
+                    .TakePath();
+    entity.SetTransform(
+        Matrix::MakeScale({scale, scale, 1.0}).Translate({-90, -20, 0}));
+    entity.SetContents(SolidColorContents::Make(path, Color::Red()));
+    return entity.Render(context, pass);
+  };
+  ASSERT_TRUE(OpenPlaygroundHere(callback));
 }
 
 TEST_P(EntityTest, Filters) {
@@ -847,12 +1036,12 @@ TEST_P(EntityTest, Filters) {
 
     auto blend1 = ColorFilterContents::MakeBlend(
         BlendMode::kScreen,
-        {fi_bridge, FilterInput::Make(blend0), fi_bridge, fi_bridge});
+        {FilterInput::Make(blend0), fi_bridge, fi_bridge, fi_bridge});
 
     Entity entity;
-    entity.SetTransformation(Matrix::MakeScale(GetContentScale()) *
-                             Matrix::MakeTranslation({500, 300}) *
-                             Matrix::MakeScale(Vector2{0.5, 0.5}));
+    entity.SetTransform(Matrix::MakeScale(GetContentScale()) *
+                        Matrix::MakeTranslation({500, 300}) *
+                        Matrix::MakeScale(Vector2{0.5, 0.5}));
     entity.SetContents(blend1);
     return entity.Render(context, pass);
   };
@@ -860,13 +1049,14 @@ TEST_P(EntityTest, Filters) {
 }
 
 TEST_P(EntityTest, GaussianBlurFilter) {
-  auto boston = CreateTextureForFixture("boston.jpg");
+  auto boston =
+      CreateTextureForFixture("boston.jpg", /*enable_mipmapping=*/true);
   ASSERT_TRUE(boston);
 
   auto callback = [&](ContentContext& context, RenderPass& pass) -> bool {
     const char* input_type_names[] = {"Texture", "Solid Color"};
     const char* blur_type_names[] = {"Image blur", "Mask blur"};
-    const char* pass_variation_names[] = {"Two pass", "Directional"};
+    const char* pass_variation_names[] = {"New"};
     const char* blur_style_names[] = {"Normal", "Solid", "Outer", "Inner"};
     const char* tile_mode_names[] = {"Clamp", "Repeat", "Mirror", "Decal"};
     const FilterContents::BlurStyle blur_styles[] = {
@@ -881,7 +1071,9 @@ TEST_P(EntityTest, GaussianBlurFilter) {
     static Color input_color = Color::Black();
     static int selected_blur_type = 0;
     static int selected_pass_variation = 0;
-    static float blur_amount[2] = {10, 10};
+    static bool combined_sigma = false;
+    static float blur_amount_coarse[2] = {0, 0};
+    static float blur_amount_fine[2] = {10, 10};
     static int selected_blur_style = 0;
     static int selected_tile_mode = 3;
     static Color cover_color(1, 0, 0, 0.2);
@@ -911,7 +1103,16 @@ TEST_P(EntityTest, GaussianBlurFilter) {
                      pass_variation_names,
                      sizeof(pass_variation_names) / sizeof(char*));
       }
-      ImGui::SliderFloat2("Sigma", blur_amount, 0, 10);
+      ImGui::Checkbox("Combined sigma", &combined_sigma);
+      if (combined_sigma) {
+        ImGui::SliderFloat("Sigma (coarse)", blur_amount_coarse, 0, 1000);
+        ImGui::SliderFloat("Sigma (fine)", blur_amount_fine, 0, 10);
+        blur_amount_coarse[1] = blur_amount_coarse[0];
+        blur_amount_fine[1] = blur_amount_fine[0];
+      } else {
+        ImGui::SliderFloat2("Sigma (coarse)", blur_amount_coarse, 0, 1000);
+        ImGui::SliderFloat2("Sigma (fine)", blur_amount_fine, 0, 10);
+      }
       ImGui::Combo("Blur style", &selected_blur_style, blur_style_names,
                    sizeof(blur_style_names) / sizeof(char*));
       ImGui::Combo("Tile mode", &selected_tile_mode, tile_mode_names,
@@ -928,6 +1129,9 @@ TEST_P(EntityTest, GaussianBlurFilter) {
     }
     ImGui::End();
 
+    auto blur_sigma_x = Sigma{blur_amount_coarse[0] + blur_amount_fine[0]};
+    auto blur_sigma_y = Sigma{blur_amount_coarse[1] + blur_amount_fine[1]};
+
     std::shared_ptr<Contents> input;
     Size input_size;
 
@@ -936,12 +1140,12 @@ TEST_P(EntityTest, GaussianBlurFilter) {
     if (selected_input_type == 0) {
       auto texture = std::make_shared<TextureContents>();
       texture->SetSourceRect(Rect::MakeSize(boston->GetSize()));
-      texture->SetPath(PathBuilder{}.AddRect(input_rect).TakePath());
+      texture->SetDestinationRect(input_rect);
       texture->SetTexture(boston);
       texture->SetOpacity(input_color.alpha);
 
       input = texture;
-      input_size = input_rect.size;
+      input_size = input_rect.GetSize();
     } else {
       auto fill = std::make_shared<SolidColorContents>();
       fill->SetColor(input_color);
@@ -949,24 +1153,28 @@ TEST_P(EntityTest, GaussianBlurFilter) {
           Geometry::MakeFillPath(PathBuilder{}.AddRect(input_rect).TakePath()));
 
       input = fill;
-      input_size = input_rect.size;
+      input_size = input_rect.GetSize();
     }
 
     std::shared_ptr<FilterContents> blur;
-    if (selected_pass_variation == 0) {
-      blur = FilterContents::MakeGaussianBlur(
-          FilterInput::Make(input), Sigma{blur_amount[0]},
-          Sigma{blur_amount[1]}, blur_styles[selected_blur_style],
-          tile_modes[selected_tile_mode]);
-    } else {
-      Vector2 blur_vector(blur_amount[0], blur_amount[1]);
-      blur = FilterContents::MakeDirectionalGaussianBlur(
-          FilterInput::Make(input), Sigma{blur_vector.GetLength()},
-          blur_vector.Normalize());
-    }
+    switch (selected_pass_variation) {
+      case 0:
+        blur = std::make_shared<GaussianBlurFilterContents>(
+            blur_sigma_x.sigma, blur_sigma_y.sigma,
+            tile_modes[selected_tile_mode], blur_styles[selected_blur_style],
+            /*geometry=*/nullptr);
+        blur->SetInputs({FilterInput::Make(input)});
+        break;
+      case 1:
+        blur = FilterContents::MakeGaussianBlur(
+            FilterInput::Make(input), blur_sigma_x, blur_sigma_y,
+            tile_modes[selected_tile_mode], blur_styles[selected_blur_style]);
+        break;
+    };
+    FML_CHECK(blur);
 
     auto mask_blur = FilterContents::MakeBorderMaskBlur(
-        FilterInput::Make(input), Sigma{blur_amount[0]}, Sigma{blur_amount[1]},
+        FilterInput::Make(input), blur_sigma_x, blur_sigma_y,
         blur_styles[selected_blur_style]);
 
     auto ctm = Matrix::MakeScale(GetContentScale()) *
@@ -980,7 +1188,7 @@ TEST_P(EntityTest, GaussianBlurFilter) {
 
     Entity entity;
     entity.SetContents(target_contents);
-    entity.SetTransformation(ctm);
+    entity.SetTransform(ctm);
 
     entity.Render(context, pass);
 
@@ -989,20 +1197,24 @@ TEST_P(EntityTest, GaussianBlurFilter) {
     Entity cover_entity;
     cover_entity.SetContents(SolidColorContents::Make(
         PathBuilder{}.AddRect(input_rect).TakePath(), cover_color));
-    cover_entity.SetTransformation(ctm);
+    cover_entity.SetTransform(ctm);
 
     cover_entity.Render(context, pass);
 
     // Renders a green bounding rect of the target filter.
     Entity bounds_entity;
-    bounds_entity.SetContents(SolidColorContents::Make(
-        PathBuilder{}
-            .AddRect(target_contents->GetCoverage(entity).value())
-            .TakePath(),
-        bounds_color));
-    bounds_entity.SetTransformation(Matrix());
+    std::optional<Rect> target_contents_coverage =
+        target_contents->GetCoverage(entity);
+    if (target_contents_coverage.has_value()) {
+      bounds_entity.SetContents(SolidColorContents::Make(
+          PathBuilder{}
+              .AddRect(target_contents->GetCoverage(entity).value())
+              .TakePath(),
+          bounds_color));
+      bounds_entity.SetTransform(Matrix());
 
-    bounds_entity.Render(context, pass);
+      bounds_entity.Render(context, pass);
+    }
 
     return true;
   };
@@ -1060,19 +1272,18 @@ TEST_P(EntityTest, MorphologyFilter) {
         Rect::MakeXYWH(path_rect[0], path_rect[1], path_rect[2], path_rect[3]);
     auto texture = std::make_shared<TextureContents>();
     texture->SetSourceRect(Rect::MakeSize(boston->GetSize()));
-    texture->SetPath(PathBuilder{}.AddRect(input_rect).TakePath());
+    texture->SetDestinationRect(input_rect);
     texture->SetTexture(boston);
     texture->SetOpacity(input_color.alpha);
 
     input = texture;
-    input_size = input_rect.size;
-
-    auto effect_transform = Matrix::MakeScale(
-        Vector2{effect_transform_scale, effect_transform_scale});
+    input_size = input_rect.GetSize();
 
     auto contents = FilterContents::MakeMorphology(
         FilterInput::Make(input), Radius{radius[0]}, Radius{radius[1]},
-        morphology_types[selected_morphology_type], effect_transform);
+        morphology_types[selected_morphology_type]);
+    contents->SetEffectTransform(Matrix::MakeScale(
+        Vector2{effect_transform_scale, effect_transform_scale}));
 
     auto ctm = Matrix::MakeScale(GetContentScale()) *
                Matrix::MakeTranslation(Vector3(offset[0], offset[1])) *
@@ -1083,7 +1294,7 @@ TEST_P(EntityTest, MorphologyFilter) {
 
     Entity entity;
     entity.SetContents(contents);
-    entity.SetTransformation(ctm);
+    entity.SetTransform(ctm);
 
     entity.Render(context, pass);
 
@@ -1092,7 +1303,7 @@ TEST_P(EntityTest, MorphologyFilter) {
     Entity cover_entity;
     cover_entity.SetContents(SolidColorContents::Make(
         PathBuilder{}.AddRect(input_rect).TakePath(), cover_color));
-    cover_entity.SetTransformation(ctm);
+    cover_entity.SetTransform(ctm);
 
     cover_entity.Render(context, pass);
 
@@ -1101,7 +1312,7 @@ TEST_P(EntityTest, MorphologyFilter) {
     bounds_entity.SetContents(SolidColorContents::Make(
         PathBuilder{}.AddRect(contents->GetCoverage(entity).value()).TakePath(),
         bounds_color));
-    bounds_entity.SetTransformation(Matrix());
+    bounds_entity.SetTransform(Matrix());
 
     bounds_entity.Render(context, pass);
 
@@ -1186,7 +1397,7 @@ TEST_P(EntityTest, BorderMaskBlurCoverageIsCorrect) {
 
   {
     Entity e;
-    e.SetTransformation(Matrix());
+    e.SetTransform(Matrix());
     auto actual = border_mask_blur->GetCoverage(e);
     auto expected = Rect::MakeXYWH(-3, -4, 306, 408);
     ASSERT_TRUE(actual.has_value());
@@ -1195,7 +1406,7 @@ TEST_P(EntityTest, BorderMaskBlurCoverageIsCorrect) {
 
   {
     Entity e;
-    e.SetTransformation(Matrix::MakeRotationZ(Radians{kPi / 4}));
+    e.SetTransform(Matrix::MakeRotationZ(Radians{kPi / 4}));
     auto actual = border_mask_blur->GetCoverage(e);
     auto expected = Rect::MakeXYWH(-287.792, -4.94975, 504.874, 504.874);
     ASSERT_TRUE(actual.has_value());
@@ -1229,13 +1440,48 @@ TEST_P(EntityTest, DrawAtlasNoColor) {
   contents->SetBlendMode(BlendMode::kSource);
 
   Entity e;
-  e.SetTransformation(Matrix::MakeScale(GetContentScale()));
+  e.SetTransform(Matrix::MakeScale(GetContentScale()));
+  e.SetContents(contents);
+
+  ASSERT_TRUE(OpenPlaygroundHere(std::move(e)));
+}
+
+TEST_P(EntityTest, DrawAtlasWithColorAdvanced) {
+  // Draws the image as four squares stiched together.
+  auto atlas = CreateTextureForFixture("bay_bridge.jpg");
+  auto size = atlas->GetSize();
+  // Divide image into four quadrants.
+  Scalar half_width = size.width / 2;
+  Scalar half_height = size.height / 2;
+  std::vector<Rect> texture_coordinates = {
+      Rect::MakeLTRB(0, 0, half_width, half_height),
+      Rect::MakeLTRB(half_width, 0, size.width, half_height),
+      Rect::MakeLTRB(0, half_height, half_width, size.height),
+      Rect::MakeLTRB(half_width, half_height, size.width, size.height)};
+  // Position quadrants adjacent to eachother.
+  std::vector<Matrix> transforms = {
+      Matrix::MakeTranslation({0, 0, 0}),
+      Matrix::MakeTranslation({half_width, 0, 0}),
+      Matrix::MakeTranslation({0, half_height, 0}),
+      Matrix::MakeTranslation({half_width, half_height, 0})};
+  std::vector<Color> colors = {Color::Red(), Color::Green(), Color::Blue(),
+                               Color::Yellow()};
+  std::shared_ptr<AtlasContents> contents = std::make_shared<AtlasContents>();
+
+  contents->SetTransforms(std::move(transforms));
+  contents->SetTextureCoordinates(std::move(texture_coordinates));
+  contents->SetTexture(atlas);
+  contents->SetColors(colors);
+  contents->SetBlendMode(BlendMode::kModulate);
+
+  Entity e;
+  e.SetTransform(Matrix::MakeScale(GetContentScale()));
   e.SetContents(contents);
 
-  ASSERT_TRUE(OpenPlaygroundHere(e));
+  ASSERT_TRUE(OpenPlaygroundHere(std::move(e)));
 }
 
-TEST_P(EntityTest, DrawAtlasWithColor) {
+TEST_P(EntityTest, DrawAtlasWithColorSimple) {
   // Draws the image as four squares stiched together. Because blend modes
   // aren't implented this ends up as four solid color blocks.
   auto atlas = CreateTextureForFixture("bay_bridge.jpg");
@@ -1262,13 +1508,13 @@ TEST_P(EntityTest, DrawAtlasWithColor) {
   contents->SetTextureCoordinates(std::move(texture_coordinates));
   contents->SetTexture(atlas);
   contents->SetColors(colors);
-  contents->SetBlendMode(BlendMode::kSource);
+  contents->SetBlendMode(BlendMode::kSourceATop);
 
   Entity e;
-  e.SetTransformation(Matrix::MakeScale(GetContentScale()));
+  e.SetTransform(Matrix::MakeScale(GetContentScale()));
   e.SetContents(contents);
 
-  ASSERT_TRUE(OpenPlaygroundHere(e));
+  ASSERT_TRUE(OpenPlaygroundHere(std::move(e)));
 }
 
 TEST_P(EntityTest, DrawAtlasUsesProvidedCullRectForCoverage) {
@@ -1297,7 +1543,7 @@ TEST_P(EntityTest, DrawAtlasUsesProvidedCullRectForCoverage) {
 
   auto transform = Matrix::MakeScale(GetContentScale());
   Entity e;
-  e.SetTransformation(transform);
+  e.SetTransform(transform);
   e.SetContents(contents);
 
   ASSERT_EQ(contents->GetCoverage(e).value(),
@@ -1338,10 +1584,10 @@ TEST_P(EntityTest, DrawAtlasWithOpacity) {
   contents->SetAlpha(0.5);
 
   Entity e;
-  e.SetTransformation(Matrix::MakeScale(GetContentScale()));
+  e.SetTransform(Matrix::MakeScale(GetContentScale()));
   e.SetContents(contents);
 
-  ASSERT_TRUE(OpenPlaygroundHere(e));
+  ASSERT_TRUE(OpenPlaygroundHere(std::move(e)));
 }
 
 TEST_P(EntityTest, DrawAtlasNoColorFullSize) {
@@ -1358,10 +1604,10 @@ TEST_P(EntityTest, DrawAtlasNoColorFullSize) {
   contents->SetBlendMode(BlendMode::kSource);
 
   Entity e;
-  e.SetTransformation(Matrix::MakeScale(GetContentScale()));
+  e.SetTransform(Matrix::MakeScale(GetContentScale()));
   e.SetContents(contents);
 
-  ASSERT_TRUE(OpenPlaygroundHere(e));
+  ASSERT_TRUE(OpenPlaygroundHere(std::move(e)));
 }
 
 TEST_P(EntityTest, SolidFillCoverageIsCorrect) {
@@ -1386,7 +1632,7 @@ TEST_P(EntityTest, SolidFillCoverageIsCorrect) {
         PathBuilder{}.AddRect(Rect::MakeLTRB(100, 110, 200, 220)).TakePath()));
 
     Entity entity;
-    entity.SetTransformation(Matrix::MakeTranslation(Vector2(4, 5)));
+    entity.SetTransform(Matrix::MakeTranslation(Vector2(4, 5)));
     entity.SetContents(std::move(fill));
 
     auto coverage = entity.GetCoverage();
@@ -1439,6 +1685,20 @@ TEST_P(EntityTest, SolidFillShouldRenderIsCorrect) {
   }
 }
 
+TEST_P(EntityTest, DoesNotCullEntitiesByDefault) {
+  auto fill = std::make_shared<SolidColorContents>();
+  fill->SetColor(Color::CornflowerBlue());
+  fill->SetGeometry(
+      Geometry::MakeRect(Rect::MakeLTRB(-1000, -1000, -900, -900)));
+
+  Entity entity;
+  entity.SetContents(fill);
+
+  // Even though the entity is offscreen, this should still render because we do
+  // not compute the coverage intersection by default.
+  EXPECT_TRUE(entity.ShouldRender(Rect::MakeLTRB(0, 0, 100, 100)));
+}
+
 TEST_P(EntityTest, ClipContentsShouldRenderIsCorrect) {
   // For clip ops, `ShouldRender` should always return true.
 
@@ -1463,12 +1723,12 @@ TEST_P(EntityTest, ClipContentsShouldRenderIsCorrect) {
   }
 }
 
-TEST_P(EntityTest, ClipContentsGetStencilCoverageIsCorrect) {
+TEST_P(EntityTest, ClipContentsGetClipCoverageIsCorrect) {
   // Intersection: No stencil coverage, no geometry.
   {
     auto clip = std::make_shared<ClipContents>();
     clip->SetClipOperation(Entity::ClipOperation::kIntersect);
-    auto result = clip->GetStencilCoverage(Entity{}, Rect{});
+    auto result = clip->GetClipCoverage(Entity{}, Rect{});
 
     ASSERT_FALSE(result.coverage.has_value());
   }
@@ -1479,7 +1739,7 @@ TEST_P(EntityTest, ClipContentsGetStencilCoverageIsCorrect) {
     clip->SetClipOperation(Entity::ClipOperation::kIntersect);
     clip->SetGeometry(Geometry::MakeFillPath(
         PathBuilder{}.AddRect(Rect::MakeLTRB(0, 0, 100, 100)).TakePath()));
-    auto result = clip->GetStencilCoverage(Entity{}, Rect{});
+    auto result = clip->GetClipCoverage(Entity{}, Rect{});
 
     ASSERT_FALSE(result.coverage.has_value());
   }
@@ -1489,7 +1749,7 @@ TEST_P(EntityTest, ClipContentsGetStencilCoverageIsCorrect) {
     auto clip = std::make_shared<ClipContents>();
     clip->SetClipOperation(Entity::ClipOperation::kIntersect);
     auto result =
-        clip->GetStencilCoverage(Entity{}, Rect::MakeLTRB(0, 0, 100, 100));
+        clip->GetClipCoverage(Entity{}, Rect::MakeLTRB(0, 0, 100, 100));
 
     ASSERT_FALSE(result.coverage.has_value());
   }
@@ -1501,11 +1761,11 @@ TEST_P(EntityTest, ClipContentsGetStencilCoverageIsCorrect) {
     clip->SetGeometry(Geometry::MakeFillPath(
         PathBuilder{}.AddRect(Rect::MakeLTRB(0, 0, 50, 50)).TakePath()));
     auto result =
-        clip->GetStencilCoverage(Entity{}, Rect::MakeLTRB(0, 0, 100, 100));
+        clip->GetClipCoverage(Entity{}, Rect::MakeLTRB(0, 0, 100, 100));
 
     ASSERT_TRUE(result.coverage.has_value());
     ASSERT_RECT_NEAR(result.coverage.value(), Rect::MakeLTRB(0, 0, 50, 50));
-    ASSERT_EQ(result.type, Contents::StencilCoverage::Type::kAppend);
+    ASSERT_EQ(result.type, Contents::ClipCoverage::Type::kAppend);
   }
 
   // Difference: With stencil coverage, with geometry.
@@ -1515,11 +1775,11 @@ TEST_P(EntityTest, ClipContentsGetStencilCoverageIsCorrect) {
     clip->SetGeometry(Geometry::MakeFillPath(
         PathBuilder{}.AddRect(Rect::MakeLTRB(0, 0, 50, 50)).TakePath()));
     auto result =
-        clip->GetStencilCoverage(Entity{}, Rect::MakeLTRB(0, 0, 100, 100));
+        clip->GetClipCoverage(Entity{}, Rect::MakeLTRB(0, 0, 100, 100));
 
     ASSERT_TRUE(result.coverage.has_value());
     ASSERT_RECT_NEAR(result.coverage.value(), Rect::MakeLTRB(0, 0, 100, 100));
-    ASSERT_EQ(result.type, Contents::StencilCoverage::Type::kAppend);
+    ASSERT_EQ(result.type, Contents::ClipCoverage::Type::kAppend);
   }
 }
 
@@ -1542,18 +1802,21 @@ TEST_P(EntityTest, RRectShadowTest) {
     }
     ImGui::End();
 
-    auto [top_left, bottom_right] = IMPELLER_PLAYGROUND_LINE(
-        Point(200, 200), Point(600, 400), 30, Color::White(), Color::White());
+    static PlaygroundPoint top_left_point(Point(200, 200), 30, Color::White());
+    static PlaygroundPoint bottom_right_point(Point(600, 400), 30,
+                                              Color::White());
+    auto [top_left, bottom_right] =
+        DrawPlaygroundLine(top_left_point, bottom_right_point);
     auto rect =
         Rect::MakeLTRB(top_left.x, top_left.y, bottom_right.x, bottom_right.y);
 
-    auto contents = std::make_unique<RRectShadowContents>();
-    contents->SetRRect(rect, corner_radius);
+    auto contents = std::make_unique<SolidRRectBlurContents>();
+    contents->SetRRect(rect, {corner_radius, corner_radius});
     contents->SetColor(color);
     contents->SetSigma(Radius(blur_radius));
 
     Entity entity;
-    entity.SetTransformation(Matrix::MakeScale(GetContentScale()));
+    entity.SetTransform(Matrix::MakeScale(GetContentScale()));
     entity.SetContents(std::move(contents));
     entity.Render(context, pass);
 
@@ -1581,7 +1844,7 @@ TEST_P(EntityTest, ColorMatrixFilterCoverageIsCorrect) {
   fill->SetColor(Color::Coral());
 
   // Set the color matrix filter.
-  FilterContents::ColorMatrix matrix = {
+  ColorMatrix matrix = {
       1, 1, 1, 1, 1,  //
       1, 1, 1, 1, 1,  //
       1, 1, 1, 1, 1,  //
@@ -1592,7 +1855,7 @@ TEST_P(EntityTest, ColorMatrixFilterCoverageIsCorrect) {
       ColorFilterContents::MakeColorMatrix(FilterInput::Make(fill), matrix);
 
   Entity e;
-  e.SetTransformation(Matrix());
+  e.SetTransform(Matrix());
 
   // Confirm that the actual filter coverage matches the expected coverage.
   auto actual = filter->GetCoverage(e);
@@ -1608,7 +1871,7 @@ TEST_P(EntityTest, ColorMatrixFilterEditable) {
 
   auto callback = [&](ContentContext& context, RenderPass& pass) -> bool {
     // UI state.
-    static FilterContents::ColorMatrix color_matrix = {
+    static ColorMatrix color_matrix = {
         1, 0, 0, 0, 0,  //
         0, 3, 0, 0, 0,  //
         0, 0, 1, 0, 0,  //
@@ -1644,7 +1907,7 @@ TEST_P(EntityTest, ColorMatrixFilterEditable) {
 
     // Define the entity with the color matrix filter.
     Entity entity;
-    entity.SetTransformation(
+    entity.SetTransform(
         Matrix::MakeScale(GetContentScale()) *
         Matrix::MakeTranslation(Vector3(offset[0], offset[1])) *
         Matrix::MakeRotationZ(Radians(rotation)) *
@@ -1671,7 +1934,7 @@ TEST_P(EntityTest, LinearToSrgbFilterCoverageIsCorrect) {
       ColorFilterContents::MakeLinearToSrgbFilter(FilterInput::Make(fill));
 
   Entity e;
-  e.SetTransformation(Matrix());
+  e.SetTransform(Matrix());
 
   // Confirm that the actual filter coverage matches the expected coverage.
   auto actual = filter->GetCoverage(e);
@@ -1692,18 +1955,18 @@ TEST_P(EntityTest, LinearToSrgbFilter) {
     // Define the entity that will serve as the control image as a Gaussian blur
     // filter with no filter at all.
     Entity entity_left;
-    entity_left.SetTransformation(Matrix::MakeScale(GetContentScale()) *
-                                  Matrix::MakeTranslation({100, 300}) *
-                                  Matrix::MakeScale(Vector2{0.5, 0.5}));
+    entity_left.SetTransform(Matrix::MakeScale(GetContentScale()) *
+                             Matrix::MakeTranslation({100, 300}) *
+                             Matrix::MakeScale(Vector2{0.5, 0.5}));
     auto unfiltered = FilterContents::MakeGaussianBlur(FilterInput::Make(image),
                                                        Sigma{0}, Sigma{0});
     entity_left.SetContents(unfiltered);
 
     // Define the entity that will be filtered from linear to sRGB.
     Entity entity_right;
-    entity_right.SetTransformation(Matrix::MakeScale(GetContentScale()) *
-                                   Matrix::MakeTranslation({500, 300}) *
-                                   Matrix::MakeScale(Vector2{0.5, 0.5}));
+    entity_right.SetTransform(Matrix::MakeScale(GetContentScale()) *
+                              Matrix::MakeTranslation({500, 300}) *
+                              Matrix::MakeScale(Vector2{0.5, 0.5}));
     entity_right.SetContents(filtered);
     return entity_left.Render(context, pass) &&
            entity_right.Render(context, pass);
@@ -1723,7 +1986,7 @@ TEST_P(EntityTest, SrgbToLinearFilterCoverageIsCorrect) {
       ColorFilterContents::MakeSrgbToLinearFilter(FilterInput::Make(fill));
 
   Entity e;
-  e.SetTransformation(Matrix());
+  e.SetTransform(Matrix());
 
   // Confirm that the actual filter coverage matches the expected coverage.
   auto actual = filter->GetCoverage(e);
@@ -1744,18 +2007,18 @@ TEST_P(EntityTest, SrgbToLinearFilter) {
     // Define the entity that will serve as the control image as a Gaussian blur
     // filter with no filter at all.
     Entity entity_left;
-    entity_left.SetTransformation(Matrix::MakeScale(GetContentScale()) *
-                                  Matrix::MakeTranslation({100, 300}) *
-                                  Matrix::MakeScale(Vector2{0.5, 0.5}));
+    entity_left.SetTransform(Matrix::MakeScale(GetContentScale()) *
+                             Matrix::MakeTranslation({100, 300}) *
+                             Matrix::MakeScale(Vector2{0.5, 0.5}));
     auto unfiltered = FilterContents::MakeGaussianBlur(FilterInput::Make(image),
                                                        Sigma{0}, Sigma{0});
     entity_left.SetContents(unfiltered);
 
     // Define the entity that will be filtered from sRGB to linear.
     Entity entity_right;
-    entity_right.SetTransformation(Matrix::MakeScale(GetContentScale()) *
-                                   Matrix::MakeTranslation({500, 300}) *
-                                   Matrix::MakeScale(Vector2{0.5, 0.5}));
+    entity_right.SetTransform(Matrix::MakeScale(GetContentScale()) *
+                              Matrix::MakeTranslation({500, 300}) *
+                              Matrix::MakeScale(Vector2{0.5, 0.5}));
     entity_right.SetContents(filtered);
     return entity_left.Render(context, pass) &&
            entity_right.Render(context, pass);
@@ -1764,266 +2027,69 @@ TEST_P(EntityTest, SrgbToLinearFilter) {
   ASSERT_TRUE(OpenPlaygroundHere(callback));
 }
 
-TEST_P(EntityTest, TTTBlendColor) {
-  {
-    Color src = {1, 0, 0, 0.5};
-    Color dst = {1, 0, 1, 1};
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kClear),
-              Color(0, 0, 0, 0));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSource),
-              Color(1, 0, 0, 0.5));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestination),
-              Color(1, 0, 1, 1));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSourceOver),
-              Color(1.5, 0, 0.5, 1));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestinationOver),
-              Color(1, 0, 1, 1));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSourceIn),
-              Color(1, 0, 0, 0.5));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestinationIn),
-              Color(0.5, 0, 0.5, 0.5));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSourceOut),
-              Color(0, 0, 0, 0));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestinationOut),
-              Color(0.5, 0, 0.5, 0.5));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSourceATop),
-              Color(1.5, 0, 0.5, 1));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestinationATop),
-              Color(0.5, 0, 0.5, 0.5));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kXor),
-              Color(0.5, 0, 0.5, 0.5));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kPlus), Color(1, 0, 1, 1));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kModulate),
-              Color(1, 0, 0, 0.5));
-  }
-
-  {
-    Color src = {1, 1, 0, 1};
-    Color dst = {1, 0, 1, 1};
-
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kClear),
-              Color(0, 0, 0, 0));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSource),
-              Color(1, 1, 0, 1));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestination),
-              Color(1, 0, 1, 1));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSourceOver),
-              Color(1, 1, 0, 1));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestinationOver),
-              Color(1, 0, 1, 1));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSourceIn),
-              Color(1, 1, 0, 1));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestinationIn),
-              Color(1, 0, 1, 1));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSourceOut),
-              Color(0, 0, 0, 0));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestinationOut),
-              Color(0, 0, 0, 0));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSourceATop),
-              Color(1, 1, 0, 1));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestinationATop),
-              Color(1, 0, 1, 1));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kXor), Color(0, 0, 0, 0));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kPlus), Color(1, 1, 1, 1));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kModulate),
-              Color(1, 0, 0, 1));
-  }
-
-  {
-    Color src = {1, 1, 0, 0.2};
-    Color dst = {1, 1, 1, 0.5};
-
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kClear),
-              Color(0, 0, 0, 0));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSource),
-              Color(1, 1, 0, 0.2));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestination),
-              Color(1, 1, 1, 0.5));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSourceOver),
-              Color(1.8, 1.8, 0.8, 0.6));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestinationOver),
-              Color(1.5, 1.5, 1, 0.6));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSourceIn),
-              Color(0.5, 0.5, 0, 0.1));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestinationIn),
-              Color(0.2, 0.2, 0.2, 0.1));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSourceOut),
-              Color(0.5, 0.5, 0, 0.1));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestinationOut),
-              Color(0.8, 0.8, 0.8, 0.4));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSourceATop),
-              Color(1.3, 1.3, 0.8, 0.5));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestinationATop),
-              Color(0.7, 0.7, 0.2, 0.2));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kXor),
-              Color(1.3, 1.3, 0.8, 0.5));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kPlus),
-              Color(1, 1, 1, 0.7));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kModulate),
-              Color(1, 1, 0, 0.1));
-  }
-
-  {
-    Color src = {1, 0.5, 0, 0.2};
-    Color dst = {1, 1, 0.5, 0.5};
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kClear),
-              Color(0, 0, 0, 0));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSource),
-              Color(1, 0.5, 0, 0.2));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestination),
-              Color(1, 1, 0.5, 0.5));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSourceOver),
-              Color(1.8, 1.3, 0.4, 0.6));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestinationOver),
-              Color(1.5, 1.25, 0.5, 0.6));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSourceIn),
-              Color(0.5, 0.25, 0, 0.1));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestinationIn),
-              Color(0.2, 0.2, 0.1, 0.1));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSourceOut),
-              Color(0.5, 0.25, 0, 0.1));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestinationOut),
-              Color(0.8, 0.8, 0.4, 0.4));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSourceATop),
-              Color(1.3, 1.05, 0.4, 0.5));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestinationATop),
-              Color(0.7, 0.45, 0.1, 0.2));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kXor),
-              Color(1.3, 1.05, 0.4, 0.5));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kPlus),
-              Color(1, 1, 0.5, 0.7));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kModulate),
-              Color(1, 0.5, 0, 0.1));
-  }
-
-  {
-    Color src = {0.5, 0.5, 0, 0.2};
-    Color dst = {0, 1, 0.5, 0.5};
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kClear),
-              Color(0, 0, 0, 0));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSource),
-              Color(0.5, 0.5, 0, 0.2));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestination),
-              Color(0, 1, 0.5, 0.5));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSourceOver),
-              Color(0.5, 1.3, 0.4, 0.6));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestinationOver),
-              Color(0.25, 1.25, 0.5, 0.6));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSourceIn),
-              Color(0.25, 0.25, 0, 0.1));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestinationIn),
-              Color(0, 0.2, 0.1, 0.1));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSourceOut),
-              Color(0.25, 0.25, 0, 0.1));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestinationOut),
-              Color(0, 0.8, 0.4, 0.4));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSourceATop),
-              Color(0.25, 1.05, 0.4, 0.5));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestinationATop),
-              Color(0.25, 0.45, 0.1, 0.2));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kXor),
-              Color(0.25, 1.05, 0.4, 0.5));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kPlus),
-              Color(0.5, 1, 0.5, 0.7));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kModulate),
-              Color(0, 0.5, 0, 0.1));
-  }
+TEST_P(EntityTest, AtlasContentsSubAtlas) {
+  auto boston = CreateTextureForFixture("boston.jpg");
 
   {
-    Color src = {0.5, 0.5, 0.2, 0.2};
-    Color dst = {0.2, 1, 0.5, 0.5};
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kClear),
-              Color(0, 0, 0, 0));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSource),
-              Color(0.5, 0.5, 0.2, 0.2));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestination),
-              Color(0.2, 1, 0.5, 0.5));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSourceOver),
-              Color(0.66, 1.3, 0.6, 0.6));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestinationOver),
-              Color(0.45, 1.25, 0.6, 0.6));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSourceIn),
-              Color(0.25, 0.25, 0.1, 0.1));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestinationIn),
-              Color(0.04, 0.2, 0.1, 0.1));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSourceOut),
-              Color(0.25, 0.25, 0.1, 0.1));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestinationOut),
-              Color(0.16, 0.8, 0.4, 0.4));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSourceATop),
-              Color(0.41, 1.05, 0.5, 0.5));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestinationATop),
-              Color(0.29, 0.45, 0.2, 0.2));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kXor),
-              Color(0.41, 1.05, 0.5, 0.5));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kPlus),
-              Color(0.7, 1, 0.7, 0.7));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kModulate),
-              Color(0.1, 0.5, 0.1, 0.1));
+    auto contents = std::make_shared<AtlasContents>();
+    contents->SetBlendMode(BlendMode::kSourceOver);
+    contents->SetTexture(boston);
+    contents->SetColors({
+        Color::Red(),
+        Color::Red(),
+        Color::Red(),
+    });
+    contents->SetTextureCoordinates({
+        Rect::MakeLTRB(0, 0, 10, 10),
+        Rect::MakeLTRB(0, 0, 10, 10),
+        Rect::MakeLTRB(0, 0, 10, 10),
+    });
+    contents->SetTransforms({
+        Matrix::MakeTranslation(Vector2(0, 0)),
+        Matrix::MakeTranslation(Vector2(100, 100)),
+        Matrix::MakeTranslation(Vector2(200, 200)),
+    });
+
+    // Since all colors and sample rects are the same, there should
+    // only be a single entry in the sub atlas.
+    auto subatlas = contents->GenerateSubAtlas();
+    ASSERT_EQ(subatlas->sub_texture_coords.size(), 1u);
   }
 
   {
-    Color src = {0.5, 0.5, 0.2, 0.2};
-    Color dst = {0.2, 0.2, 0.5, 0.5};
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kClear),
-              Color(0, 0, 0, 0));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSource),
-              Color(0.5, 0.5, 0.2, 0.2));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestination),
-              Color(0.2, 0.2, 0.5, 0.5));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSourceOver),
-              Color(0.66, 0.66, 0.6, 0.6));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestinationOver),
-              Color(0.45, 0.45, 0.6, 0.6));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSourceIn),
-              Color(0.25, 0.25, 0.1, 0.1));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestinationIn),
-              Color(0.04, 0.04, 0.1, 0.1));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSourceOut),
-              Color(0.25, 0.25, 0.1, 0.1));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestinationOut),
-              Color(0.16, 0.16, 0.4, 0.4));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kSourceATop),
-              Color(0.41, 0.41, 0.5, 0.5));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kDestinationATop),
-              Color(0.29, 0.29, 0.2, 0.2));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kXor),
-              Color(0.41, 0.41, 0.5, 0.5));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kPlus),
-              Color(0.7, 0.7, 0.7, 0.7));
-    ASSERT_EQ(Color::BlendColor(src, dst, BlendMode::kModulate),
-              Color(0.1, 0.1, 0.1, 0.1));
+    auto contents = std::make_shared<AtlasContents>();
+    contents->SetBlendMode(BlendMode::kSourceOver);
+    contents->SetTexture(boston);
+    contents->SetColors({
+        Color::Red(),
+        Color::Green(),
+        Color::Blue(),
+    });
+    contents->SetTextureCoordinates({
+        Rect::MakeLTRB(0, 0, 10, 10),
+        Rect::MakeLTRB(0, 0, 10, 10),
+        Rect::MakeLTRB(0, 0, 10, 10),
+    });
+    contents->SetTransforms({
+        Matrix::MakeTranslation(Vector2(0, 0)),
+        Matrix::MakeTranslation(Vector2(100, 100)),
+        Matrix::MakeTranslation(Vector2(200, 200)),
+    });
+
+    // Since all colors are different, there are three entires.
+    auto subatlas = contents->GenerateSubAtlas();
+    ASSERT_EQ(subatlas->sub_texture_coords.size(), 3u);
+
+    // The translations are kept but the sample rects point into
+    // different parts of the sub atlas.
+    ASSERT_EQ(subatlas->result_texture_coords[0], Rect::MakeXYWH(0, 0, 10, 10));
+    ASSERT_EQ(subatlas->result_texture_coords[1],
+              Rect::MakeXYWH(11, 0, 10, 10));
+    ASSERT_EQ(subatlas->result_texture_coords[2],
+              Rect::MakeXYWH(22, 0, 10, 10));
   }
 }
 
-TEST_P(EntityTest, SdfText) {
-  auto callback = [&](ContentContext& context, RenderPass& pass) -> bool {
-    SkFont font;
-    font.setSize(30);
-    auto blob = SkTextBlob::MakeFromString(
-        "the quick brown fox jumped over the lazy dog (but with sdf).", font);
-    auto frame = TextFrameFromTextBlob(blob);
-    auto lazy_glyph_atlas = std::make_shared<LazyGlyphAtlas>();
-    lazy_glyph_atlas->AddTextFrame(frame);
-
-    EXPECT_FALSE(lazy_glyph_atlas->HasColor());
-
-    auto text_contents = std::make_shared<TextContents>();
-    text_contents->SetTextFrame(frame);
-    text_contents->SetGlyphAtlas(std::move(lazy_glyph_atlas));
-    text_contents->SetColor(Color(1.0, 0.0, 0.0, 1.0));
-    Entity entity;
-    entity.SetTransformation(
-        Matrix::MakeTranslation(Vector3{200.0, 200.0, 0.0}) *
-        Matrix::MakeScale(GetContentScale()));
-    entity.SetContents(text_contents);
-
-    // Force SDF rendering.
-    return text_contents->RenderSdf(context, entity, pass);
-  };
-  ASSERT_TRUE(OpenPlaygroundHere(callback));
-}
-
 static Vector3 RGBToYUV(Vector3 rgb, YUVColorSpace yuv_color_space) {
   Vector3 yuv;
   switch (yuv_color_space) {
@@ -2116,7 +2182,7 @@ TEST_P(EntityTest, YUVToRGBFilter) {
       contents->SetTexture(snapshot->texture);
       contents->SetSourceRect(Rect::MakeSize(snapshot->texture->GetSize()));
       entity.SetContents(contents);
-      entity.SetTransformation(
+      entity.SetTransform(
           Matrix::MakeTranslation({static_cast<Scalar>(100 + 400 * i), 300}));
       entity.Render(context, pass);
     }
@@ -2126,25 +2192,20 @@ TEST_P(EntityTest, YUVToRGBFilter) {
 }
 
 TEST_P(EntityTest, RuntimeEffect) {
-  if (GetParam() != PlaygroundBackend::kMetal) {
-    GTEST_SKIP_("This test only has a Metal fixture at the moment.");
-  }
-
-  auto runtime_stage =
+  auto runtime_stages =
       OpenAssetAsRuntimeStage("runtime_stage_example.frag.iplr");
+  auto runtime_stage =
+      runtime_stages[PlaygroundBackendToRuntimeStageBackend(GetBackend())];
+  ASSERT_TRUE(runtime_stage);
   ASSERT_TRUE(runtime_stage->IsDirty());
 
-  bool first_frame = true;
+  bool expect_dirty = true;
+  Pipeline<PipelineDescriptor>* first_pipeline;
   auto callback = [&](ContentContext& context, RenderPass& pass) -> bool {
-    if (first_frame) {
-      first_frame = false;
-    } else {
-      assert(runtime_stage->IsDirty() == false);
-    }
+    EXPECT_EQ(runtime_stage->IsDirty(), expect_dirty);
 
     auto contents = std::make_shared<RuntimeEffectContents>();
     contents->SetGeometry(Geometry::MakeCover());
-
     contents->SetRuntimeStage(runtime_stage);
 
     struct FragUniforms {
@@ -2161,10 +2222,643 @@ TEST_P(EntityTest, RuntimeEffect) {
 
     Entity entity;
     entity.SetContents(contents);
-    return contents->Render(context, entity, pass);
+    bool result = contents->Render(context, entity, pass);
+
+    if (expect_dirty) {
+      EXPECT_NE(first_pipeline, pass.GetCommands().back().pipeline.get());
+      first_pipeline = pass.GetCommands().back().pipeline.get();
+    } else {
+      EXPECT_EQ(pass.GetCommands().back().pipeline.get(), first_pipeline);
+    }
+
+    expect_dirty = false;
+    return result;
+  };
+
+  // Simulate some renders and hot reloading of the shader.
+  auto content_context = GetContentContext();
+  {
+    RenderTarget target =
+        content_context->GetRenderTargetCache()->CreateOffscreen(
+            *content_context->GetContext(), {1, 1}, 1u);
+
+    testing::MockRenderPass mock_pass(GetContext(), target);
+    callback(*content_context, mock_pass);
+    callback(*content_context, mock_pass);
+
+    // Dirty the runtime stage.
+    runtime_stages = OpenAssetAsRuntimeStage("runtime_stage_example.frag.iplr");
+    runtime_stage =
+        runtime_stages[PlaygroundBackendToRuntimeStageBackend(GetBackend())];
+
+    ASSERT_TRUE(runtime_stage->IsDirty());
+    expect_dirty = true;
+
+    callback(*content_context, mock_pass);
+  }
+}
+
+TEST_P(EntityTest, RuntimeEffectCanSuccessfullyRender) {
+  auto runtime_stages =
+      OpenAssetAsRuntimeStage("runtime_stage_example.frag.iplr");
+  auto runtime_stage =
+      runtime_stages[PlaygroundBackendToRuntimeStageBackend(GetBackend())];
+  ASSERT_TRUE(runtime_stage);
+  ASSERT_TRUE(runtime_stage->IsDirty());
+
+  auto contents = std::make_shared<RuntimeEffectContents>();
+  contents->SetGeometry(Geometry::MakeCover());
+
+  contents->SetRuntimeStage(runtime_stage);
+
+  struct FragUniforms {
+    Vector2 iResolution;
+    Scalar iTime;
+  } frag_uniforms = {
+      .iResolution = Vector2(GetWindowSize().width, GetWindowSize().height),
+      .iTime = static_cast<Scalar>(GetSecondsElapsed()),
+  };
+  auto uniform_data = std::make_shared<std::vector<uint8_t>>();
+  uniform_data->resize(sizeof(FragUniforms));
+  memcpy(uniform_data->data(), &frag_uniforms, sizeof(FragUniforms));
+  contents->SetUniformData(uniform_data);
+
+  Entity entity;
+  entity.SetContents(contents);
+
+  // Create a render target with a depth-stencil, similar to how EntityPass
+  // does.
+  RenderTarget target =
+      GetContentContext()->GetRenderTargetCache()->CreateOffscreenMSAA(
+          *GetContext(), {GetWindowSize().width, GetWindowSize().height}, 1,
+          "RuntimeEffect Texture");
+  testing::MockRenderPass pass(GetContext(), target);
+
+  ASSERT_TRUE(contents->Render(*GetContentContext(), entity, pass));
+  ASSERT_EQ(pass.GetCommands().size(), 1u);
+  const auto& command = pass.GetCommands()[0];
+  ASSERT_TRUE(command.pipeline->GetDescriptor()
+                  .GetDepthStencilAttachmentDescriptor()
+                  .has_value());
+  ASSERT_TRUE(command.pipeline->GetDescriptor()
+                  .GetFrontStencilAttachmentDescriptor()
+                  .has_value());
+}
+
+TEST_P(EntityTest, RuntimeEffectSetsRightSizeWhenUniformIsStruct) {
+  if (GetBackend() != PlaygroundBackend::kVulkan) {
+    GTEST_SKIP() << "Test only applies to Vulkan";
+  }
+
+  auto runtime_stages =
+      OpenAssetAsRuntimeStage("runtime_stage_example.frag.iplr");
+  auto runtime_stage =
+      runtime_stages[PlaygroundBackendToRuntimeStageBackend(GetBackend())];
+  ASSERT_TRUE(runtime_stage);
+  ASSERT_TRUE(runtime_stage->IsDirty());
+
+  auto contents = std::make_shared<RuntimeEffectContents>();
+  contents->SetGeometry(Geometry::MakeCover());
+  contents->SetRuntimeStage(runtime_stage);
+
+  struct FragUniforms {
+    Vector2 iResolution;
+    Scalar iTime;
+  } frag_uniforms = {
+      .iResolution = Vector2(GetWindowSize().width, GetWindowSize().height),
+      .iTime = static_cast<Scalar>(GetSecondsElapsed()),
+  };
+  auto uniform_data = std::make_shared<std::vector<uint8_t>>();
+  uniform_data->resize(sizeof(FragUniforms));
+  memcpy(uniform_data->data(), &frag_uniforms, sizeof(FragUniforms));
+  contents->SetUniformData(uniform_data);
+
+  Entity entity;
+  entity.SetContents(contents);
+
+  auto context = GetContentContext();
+  RenderTarget target = context->GetRenderTargetCache()->CreateOffscreen(
+      *context->GetContext(), {1, 1}, 1u);
+
+  testing::MockRenderPass pass(GetContext(), target);
+  ASSERT_TRUE(contents->Render(*context, entity, pass));
+  ASSERT_EQ(pass.GetCommands().size(), 1u);
+  const auto& command = pass.GetCommands()[0];
+  ASSERT_EQ(command.fragment_bindings.buffers.size(), 1u);
+  // 16 bytes:
+  //   8 bytes for iResolution
+  //   4 bytes for iTime
+  //   4 bytes padding
+  EXPECT_EQ(command.fragment_bindings.buffers[0].view.resource.range.length,
+            16u);
+}
+
+TEST_P(EntityTest, InheritOpacityTest) {
+  Entity entity;
+
+  // Texture contents can always accept opacity.
+  auto texture_contents = std::make_shared<TextureContents>();
+  texture_contents->SetOpacity(0.5);
+  ASSERT_TRUE(texture_contents->CanInheritOpacity(entity));
+
+  texture_contents->SetInheritedOpacity(0.5);
+  ASSERT_EQ(texture_contents->GetOpacity(), 0.25);
+  texture_contents->SetInheritedOpacity(0.5);
+  ASSERT_EQ(texture_contents->GetOpacity(), 0.25);
+
+  // Solid color contents can accept opacity if their geometry
+  // doesn't overlap.
+  auto solid_color = std::make_shared<SolidColorContents>();
+  solid_color->SetGeometry(
+      Geometry::MakeRect(Rect::MakeLTRB(100, 100, 200, 200)));
+  solid_color->SetColor(Color::Blue().WithAlpha(0.5));
+
+  ASSERT_TRUE(solid_color->CanInheritOpacity(entity));
+
+  solid_color->SetInheritedOpacity(0.5);
+  ASSERT_EQ(solid_color->GetColor().alpha, 0.25);
+  solid_color->SetInheritedOpacity(0.5);
+  ASSERT_EQ(solid_color->GetColor().alpha, 0.25);
+
+  // Color source contents can accept opacity if their geometry
+  // doesn't overlap.
+  auto tiled_texture = std::make_shared<TiledTextureContents>();
+  tiled_texture->SetGeometry(
+      Geometry::MakeRect(Rect::MakeLTRB(100, 100, 200, 200)));
+  tiled_texture->SetOpacityFactor(0.5);
+
+  ASSERT_TRUE(tiled_texture->CanInheritOpacity(entity));
+
+  tiled_texture->SetInheritedOpacity(0.5);
+  ASSERT_EQ(tiled_texture->GetOpacityFactor(), 0.25);
+  tiled_texture->SetInheritedOpacity(0.5);
+  ASSERT_EQ(tiled_texture->GetOpacityFactor(), 0.25);
+
+  // Text contents can accept opacity if the text frames do not
+  // overlap
+  SkFont font = flutter::testing::CreateTestFontOfSize(30);
+  auto blob = SkTextBlob::MakeFromString("A", font);
+  auto frame = MakeTextFrameFromTextBlobSkia(blob);
+  auto lazy_glyph_atlas =
+      std::make_shared<LazyGlyphAtlas>(TypographerContextSkia::Make());
+  lazy_glyph_atlas->AddTextFrame(*frame, 1.0f);
+
+  auto text_contents = std::make_shared<TextContents>();
+  text_contents->SetTextFrame(frame);
+  text_contents->SetColor(Color::Blue().WithAlpha(0.5));
+
+  ASSERT_TRUE(text_contents->CanInheritOpacity(entity));
+
+  text_contents->SetInheritedOpacity(0.5);
+  ASSERT_EQ(text_contents->GetColor().alpha, 0.25);
+  text_contents->SetInheritedOpacity(0.5);
+  ASSERT_EQ(text_contents->GetColor().alpha, 0.25);
+
+  // Clips and restores trivially accept opacity.
+  ASSERT_TRUE(ClipContents().CanInheritOpacity(entity));
+  ASSERT_TRUE(ClipRestoreContents().CanInheritOpacity(entity));
+
+  // Runtime effect contents can't accept opacity.
+  auto runtime_effect = std::make_shared<RuntimeEffectContents>();
+  ASSERT_FALSE(runtime_effect->CanInheritOpacity(entity));
+}
+
+TEST_P(EntityTest, ColorFilterWithForegroundColorAdvancedBlend) {
+  auto image = CreateTextureForFixture("boston.jpg");
+  auto filter = ColorFilterContents::MakeBlend(
+      BlendMode::kColorBurn, FilterInput::Make({image}), Color::Red());
+
+  auto callback = [&](ContentContext& context, RenderPass& pass) -> bool {
+    Entity entity;
+    entity.SetTransform(Matrix::MakeScale(GetContentScale()) *
+                        Matrix::MakeTranslation({500, 300}) *
+                        Matrix::MakeScale(Vector2{0.5, 0.5}));
+    entity.SetContents(filter);
+    return entity.Render(context, pass);
+  };
+  ASSERT_TRUE(OpenPlaygroundHere(callback));
+}
+
+TEST_P(EntityTest, ColorFilterWithForegroundColorClearBlend) {
+  auto image = CreateTextureForFixture("boston.jpg");
+  auto filter = ColorFilterContents::MakeBlend(
+      BlendMode::kClear, FilterInput::Make({image}), Color::Red());
+
+  auto callback = [&](ContentContext& context, RenderPass& pass) -> bool {
+    Entity entity;
+    entity.SetTransform(Matrix::MakeScale(GetContentScale()) *
+                        Matrix::MakeTranslation({500, 300}) *
+                        Matrix::MakeScale(Vector2{0.5, 0.5}));
+    entity.SetContents(filter);
+    return entity.Render(context, pass);
+  };
+  ASSERT_TRUE(OpenPlaygroundHere(callback));
+}
+
+TEST_P(EntityTest, ColorFilterWithForegroundColorSrcBlend) {
+  auto image = CreateTextureForFixture("boston.jpg");
+  auto filter = ColorFilterContents::MakeBlend(
+      BlendMode::kSource, FilterInput::Make({image}), Color::Red());
+
+  auto callback = [&](ContentContext& context, RenderPass& pass) -> bool {
+    Entity entity;
+    entity.SetTransform(Matrix::MakeScale(GetContentScale()) *
+                        Matrix::MakeTranslation({500, 300}) *
+                        Matrix::MakeScale(Vector2{0.5, 0.5}));
+    entity.SetContents(filter);
+    return entity.Render(context, pass);
+  };
+  ASSERT_TRUE(OpenPlaygroundHere(callback));
+}
+
+TEST_P(EntityTest, ColorFilterWithForegroundColorDstBlend) {
+  auto image = CreateTextureForFixture("boston.jpg");
+  auto filter = ColorFilterContents::MakeBlend(
+      BlendMode::kDestination, FilterInput::Make({image}), Color::Red());
+
+  auto callback = [&](ContentContext& context, RenderPass& pass) -> bool {
+    Entity entity;
+    entity.SetTransform(Matrix::MakeScale(GetContentScale()) *
+                        Matrix::MakeTranslation({500, 300}) *
+                        Matrix::MakeScale(Vector2{0.5, 0.5}));
+    entity.SetContents(filter);
+    return entity.Render(context, pass);
   };
   ASSERT_TRUE(OpenPlaygroundHere(callback));
 }
 
+TEST_P(EntityTest, ColorFilterWithForegroundColorSrcInBlend) {
+  auto image = CreateTextureForFixture("boston.jpg");
+  auto filter = ColorFilterContents::MakeBlend(
+      BlendMode::kSourceIn, FilterInput::Make({image}), Color::Red());
+
+  auto callback = [&](ContentContext& context, RenderPass& pass) -> bool {
+    Entity entity;
+    entity.SetTransform(Matrix::MakeScale(GetContentScale()) *
+                        Matrix::MakeTranslation({500, 300}) *
+                        Matrix::MakeScale(Vector2{0.5, 0.5}));
+    entity.SetContents(filter);
+    return entity.Render(context, pass);
+  };
+  ASSERT_TRUE(OpenPlaygroundHere(callback));
+}
+
+TEST_P(EntityTest, CoverageForStrokePathWithNegativeValuesInTransform) {
+  auto arrow_head = PathBuilder{}
+                        .MoveTo({50, 120})
+                        .LineTo({120, 190})
+                        .LineTo({190, 120})
+                        .TakePath();
+  auto geometry = Geometry::MakeStrokePath(arrow_head, 15.0, 4.0, Cap::kRound,
+                                           Join::kRound);
+
+  auto transform = Matrix::MakeTranslation({300, 300}) *
+                   Matrix::MakeRotationZ(Radians(kPiOver2));
+  EXPECT_LT(transform.e[0][0], 0.f);
+  auto coverage = geometry->GetCoverage(transform);
+  ASSERT_RECT_NEAR(coverage.value(), Rect::MakeXYWH(102.5, 342.5, 85, 155));
+}
+
+TEST_P(EntityTest, SolidColorContentsIsOpaque) {
+  SolidColorContents contents;
+  contents.SetColor(Color::CornflowerBlue());
+  ASSERT_TRUE(contents.IsOpaque());
+  contents.SetColor(Color::CornflowerBlue().WithAlpha(0.5));
+  ASSERT_FALSE(contents.IsOpaque());
+}
+
+TEST_P(EntityTest, ConicalGradientContentsIsOpaque) {
+  ConicalGradientContents contents;
+  contents.SetColors({Color::CornflowerBlue()});
+  ASSERT_FALSE(contents.IsOpaque());
+  contents.SetColors({Color::CornflowerBlue().WithAlpha(0.5)});
+  ASSERT_FALSE(contents.IsOpaque());
+}
+
+TEST_P(EntityTest, LinearGradientContentsIsOpaque) {
+  LinearGradientContents contents;
+  contents.SetColors({Color::CornflowerBlue()});
+  ASSERT_TRUE(contents.IsOpaque());
+  contents.SetColors({Color::CornflowerBlue().WithAlpha(0.5)});
+  ASSERT_FALSE(contents.IsOpaque());
+  contents.SetColors({Color::CornflowerBlue()});
+  contents.SetTileMode(Entity::TileMode::kDecal);
+  ASSERT_FALSE(contents.IsOpaque());
+}
+
+TEST_P(EntityTest, RadialGradientContentsIsOpaque) {
+  RadialGradientContents contents;
+  contents.SetColors({Color::CornflowerBlue()});
+  ASSERT_TRUE(contents.IsOpaque());
+  contents.SetColors({Color::CornflowerBlue().WithAlpha(0.5)});
+  ASSERT_FALSE(contents.IsOpaque());
+  contents.SetColors({Color::CornflowerBlue()});
+  contents.SetTileMode(Entity::TileMode::kDecal);
+  ASSERT_FALSE(contents.IsOpaque());
+}
+
+TEST_P(EntityTest, SweepGradientContentsIsOpaque) {
+  RadialGradientContents contents;
+  contents.SetColors({Color::CornflowerBlue()});
+  ASSERT_TRUE(contents.IsOpaque());
+  contents.SetColors({Color::CornflowerBlue().WithAlpha(0.5)});
+  ASSERT_FALSE(contents.IsOpaque());
+  contents.SetColors({Color::CornflowerBlue()});
+  contents.SetTileMode(Entity::TileMode::kDecal);
+  ASSERT_FALSE(contents.IsOpaque());
+}
+
+TEST_P(EntityTest, TiledTextureContentsIsOpaque) {
+  auto bay_bridge = CreateTextureForFixture("bay_bridge.jpg");
+  TiledTextureContents contents;
+  contents.SetTexture(bay_bridge);
+  // This is a placeholder test. Images currently never decompress as opaque
+  // (whether in Flutter or the playground), and so this should currently always
+  // return false in practice.
+  ASSERT_FALSE(contents.IsOpaque());
+}
+
+TEST_P(EntityTest, PointFieldGeometryDivisions) {
+  // Square always gives 4 divisions.
+  ASSERT_EQ(PointFieldGeometry::ComputeCircleDivisions(24.0, false), 4u);
+  ASSERT_EQ(PointFieldGeometry::ComputeCircleDivisions(2.0, false), 4u);
+  ASSERT_EQ(PointFieldGeometry::ComputeCircleDivisions(200.0, false), 4u);
+
+  ASSERT_EQ(PointFieldGeometry::ComputeCircleDivisions(0.5, true), 4u);
+  ASSERT_EQ(PointFieldGeometry::ComputeCircleDivisions(1.5, true), 8u);
+  ASSERT_EQ(PointFieldGeometry::ComputeCircleDivisions(5.5, true), 24u);
+  ASSERT_EQ(PointFieldGeometry::ComputeCircleDivisions(12.5, true), 34u);
+  ASSERT_EQ(PointFieldGeometry::ComputeCircleDivisions(22.3, true), 22u);
+  ASSERT_EQ(PointFieldGeometry::ComputeCircleDivisions(40.5, true), 40u);
+  ASSERT_EQ(PointFieldGeometry::ComputeCircleDivisions(100.0, true), 100u);
+  // Caps at 140.
+  ASSERT_EQ(PointFieldGeometry::ComputeCircleDivisions(1000.0, true), 140u);
+  ASSERT_EQ(PointFieldGeometry::ComputeCircleDivisions(20000.0, true), 140u);
+}
+
+TEST_P(EntityTest, PointFieldGeometryCoverage) {
+  std::vector<Point> points = {{10, 20}, {100, 200}};
+  auto geometry = Geometry::MakePointField(points, 5.0, false);
+  ASSERT_EQ(*geometry->GetCoverage(Matrix()), Rect::MakeLTRB(5, 15, 105, 205));
+  ASSERT_EQ(*geometry->GetCoverage(Matrix::MakeTranslation({30, 0, 0})),
+            Rect::MakeLTRB(35, 15, 135, 205));
+}
+
+TEST_P(EntityTest, ColorFilterContentsWithLargeGeometry) {
+  Entity entity;
+  entity.SetTransform(Matrix::MakeScale(GetContentScale()));
+  auto src_contents = std::make_shared<SolidColorContents>();
+  src_contents->SetGeometry(
+      Geometry::MakeRect(Rect::MakeLTRB(-300, -500, 30000, 50000)));
+  src_contents->SetColor(Color::Red());
+
+  auto dst_contents = std::make_shared<SolidColorContents>();
+  dst_contents->SetGeometry(
+      Geometry::MakeRect(Rect::MakeLTRB(300, 500, 20000, 30000)));
+  dst_contents->SetColor(Color::Blue());
+
+  auto contents = ColorFilterContents::MakeBlend(
+      BlendMode::kSourceOver, {FilterInput::Make(dst_contents, false),
+                               FilterInput::Make(src_contents, false)});
+  entity.SetContents(std::move(contents));
+  ASSERT_TRUE(OpenPlaygroundHere(std::move(entity)));
+}
+
+TEST_P(EntityTest, TextContentsCeilsGlyphScaleToDecimal) {
+  ASSERT_EQ(TextFrame::RoundScaledFontSize(0.4321111f, 12), 0.43f);
+  ASSERT_EQ(TextFrame::RoundScaledFontSize(0.5321111f, 12), 0.53f);
+  ASSERT_EQ(TextFrame::RoundScaledFontSize(2.1f, 12), 2.1f);
+  ASSERT_EQ(TextFrame::RoundScaledFontSize(0.0f, 12), 0.0f);
+}
+
+TEST_P(EntityTest, AdvancedBlendCoverageHintIsNotResetByEntityPass) {
+  if (GetContext()->GetCapabilities()->SupportsFramebufferFetch()) {
+    GTEST_SKIP() << "Backends that support framebuffer fetch dont use coverage "
+                    "for advanced blends.";
+  }
+
+  auto contents = std::make_shared<SolidColorContents>();
+  contents->SetGeometry(Geometry::MakeRect(Rect::MakeXYWH(100, 100, 100, 100)));
+  contents->SetColor(Color::Red());
+
+  Entity entity;
+  entity.SetTransform(Matrix::MakeScale(Vector3(2, 2, 1)));
+  entity.SetBlendMode(BlendMode::kColorBurn);
+  entity.SetContents(contents);
+
+  auto coverage = entity.GetCoverage();
+  EXPECT_TRUE(coverage.has_value());
+
+  auto pass = std::make_unique<EntityPass>();
+  std::shared_ptr<RenderTargetCache> render_target_allocator =
+      std::make_shared<RenderTargetCache>(GetContext()->GetResourceAllocator());
+  auto stencil_config = RenderTarget::AttachmentConfig{
+      .storage_mode = StorageMode::kDevicePrivate,
+      .load_action = LoadAction::kClear,
+      .store_action = StoreAction::kDontCare,
+      .clear_color = Color::BlackTransparent()};
+  auto rt = render_target_allocator->CreateOffscreen(
+      *GetContext(), ISize::MakeWH(1000, 1000),
+      /*mip_count=*/1, "Offscreen", RenderTarget::kDefaultColorAttachmentConfig,
+      stencil_config);
+  auto content_context = ContentContext(
+      GetContext(), TypographerContextSkia::Make(), render_target_allocator);
+  pass->AddEntity(std::move(entity));
+
+  EXPECT_TRUE(pass->Render(content_context, rt));
+
+  auto contains_size = [&render_target_allocator](ISize size) -> bool {
+    return std::find_if(render_target_allocator->GetRenderTargetDataBegin(),
+                        render_target_allocator->GetRenderTargetDataEnd(),
+                        [&size](const auto& data) {
+                          return data.config.size == size;
+                        }) != render_target_allocator->GetRenderTargetDataEnd();
+  };
+
+  EXPECT_TRUE(contains_size(ISize(1000, 1000)))
+      << "The root texture wasn't allocated";
+  EXPECT_TRUE(contains_size(ISize(200, 200)))
+      << "The ColorBurned texture wasn't allocated (100x100 scales up 2x)";
+}
+
+TEST_P(EntityTest, SpecializationConstantsAreAppliedToVariants) {
+  auto content_context = GetContentContext();
+
+  auto default_color_burn = content_context->GetBlendColorBurnPipeline({
+      .color_attachment_pixel_format = PixelFormat::kR8G8B8A8UNormInt,
+      .has_depth_stencil_attachments = false,
+  });
+  auto alt_color_burn = content_context->GetBlendColorBurnPipeline(
+      {.color_attachment_pixel_format = PixelFormat::kR8G8B8A8UNormInt,
+       .has_depth_stencil_attachments = true});
+
+  ASSERT_NE(default_color_burn, alt_color_burn);
+  ASSERT_EQ(default_color_burn->GetDescriptor().GetSpecializationConstants(),
+            alt_color_burn->GetDescriptor().GetSpecializationConstants());
+
+  auto decal_supported = static_cast<Scalar>(
+      GetContext()->GetCapabilities()->SupportsDecalSamplerAddressMode());
+  std::vector<Scalar> expected_constants = {5, decal_supported};
+  ASSERT_EQ(default_color_burn->GetDescriptor().GetSpecializationConstants(),
+            expected_constants);
+}
+
+TEST_P(EntityTest, DecalSpecializationAppliedToMorphologyFilter) {
+  auto content_context = GetContentContext();
+  auto default_color_burn = content_context->GetMorphologyFilterPipeline({
+      .color_attachment_pixel_format = PixelFormat::kR8G8B8A8UNormInt,
+  });
+
+  auto decal_supported = static_cast<Scalar>(
+      GetContext()->GetCapabilities()->SupportsDecalSamplerAddressMode());
+  std::vector<Scalar> expected_constants = {decal_supported};
+  ASSERT_EQ(default_color_burn->GetDescriptor().GetSpecializationConstants(),
+            expected_constants);
+}
+
+// This doesn't really tell you if the hashes will have frequent
+// collisions, but since this type is only used to hash a bounded
+// set of options, we can just compare benchmarks.
+TEST_P(EntityTest, ContentContextOptionsHasReasonableHashFunctions) {
+  ContentContextOptions opts;
+  auto hash_a = ContentContextOptions::Hash{}(opts);
+
+  opts.blend_mode = BlendMode::kColorBurn;
+  auto hash_b = ContentContextOptions::Hash{}(opts);
+
+  opts.has_depth_stencil_attachments = false;
+  auto hash_c = ContentContextOptions::Hash{}(opts);
+
+  opts.primitive_type = PrimitiveType::kPoint;
+  auto hash_d = ContentContextOptions::Hash{}(opts);
+
+  EXPECT_NE(hash_a, hash_b);
+  EXPECT_NE(hash_b, hash_c);
+  EXPECT_NE(hash_c, hash_d);
+}
+
+#ifdef FML_OS_LINUX
+TEST_P(EntityTest, FramebufferFetchVulkanBindingOffsetIsTheSame) {
+  // Using framebuffer fetch on Vulkan requires that we maintain a subpass input
+  // binding that we don't have a good route for configuring with the current
+  // metadata approach. This test verifies that the binding value doesn't change
+  // from the expected constant.
+  // See also:
+  //   * impeller/renderer/backend/vulkan/binding_helpers_vk.cc
+  //   * impeller/entity/shaders/blending/framebuffer_blend.frag
+  // This test only works on Linux because macOS hosts incorrectly populate the
+  // Vulkan descriptor sets based on the MSL compiler settings.
+
+  bool expected_layout = false;
+  for (const DescriptorSetLayout& layout : FramebufferBlendColorBurnPipeline::
+           FragmentShader::kDescriptorSetLayouts) {
+    if (layout.binding == 64 &&
+        layout.descriptor_type == DescriptorType::kInputAttachment) {
+      expected_layout = true;
+    }
+  }
+  EXPECT_TRUE(expected_layout);
+}
+#endif
+
+TEST_P(EntityTest, FillPathGeometryGetPositionBufferReturnsExpectedMode) {
+  RenderTarget target;
+  testing::MockRenderPass mock_pass(GetContext(), target);
+
+  auto get_result = [this, &mock_pass](const Path& path) {
+    auto geometry = Geometry::MakeFillPath(
+        path, /* inner rect */ Rect::MakeLTRB(0, 0, 100, 100));
+    return geometry->GetPositionBuffer(*GetContentContext(), {}, mock_pass);
+  };
+
+  // Convex path
+  {
+    GeometryResult result =
+        get_result(PathBuilder{}
+                       .AddRect(Rect::MakeLTRB(0, 0, 100, 100))
+                       .SetConvexity(Convexity::kConvex)
+                       .TakePath());
+    EXPECT_EQ(result.mode, GeometryResult::Mode::kNormal);
+  }
+
+  // Concave path
+  {
+    Path path = PathBuilder{}
+                    .MoveTo({0, 0})
+                    .LineTo({100, 0})
+                    .LineTo({100, 100})
+                    .LineTo({50, 50})
+                    .Close()
+                    .TakePath();
+    GeometryResult result = get_result(path);
+    if constexpr (ContentContext::kEnableStencilThenCover) {
+      EXPECT_EQ(result.mode, GeometryResult::Mode::kNonZero);
+    } else {
+      EXPECT_EQ(result.mode, GeometryResult::Mode::kNormal);
+    }
+  }
+}
+
+TEST_P(EntityTest, FailOnValidationError) {
+  if (GetParam() != PlaygroundBackend::kVulkan) {
+    GTEST_SKIP() << "Validation is only fatal on Vulkan backend.";
+  }
+  EXPECT_DEATH(
+      // The easiest way to trigger a validation error is to try to compile
+      // a shader with an unsupported pixel format.
+      GetContentContext()->GetBlendColorBurnPipeline({
+          .color_attachment_pixel_format = PixelFormat::kUnknown,
+          .has_depth_stencil_attachments = false,
+      }),
+      "");
+}
+
+TEST_P(EntityTest, CanComputeGeometryForEmptyPathsWithoutCrashing) {
+  PathBuilder builder = {};
+  builder.AddRect(Rect::MakeLTRB(0, 0, 0, 0));
+  Path path = builder.TakePath();
+
+  EXPECT_TRUE(path.GetBoundingBox()->IsEmpty());
+
+  auto geom = Geometry::MakeFillPath(path);
+
+  Entity entity;
+  RenderTarget target =
+      GetContentContext()->GetRenderTargetCache()->CreateOffscreen(
+          *GetContext(), {1, 1}, 1u);
+  testing::MockRenderPass render_pass(GetContext(), target);
+  auto position_result =
+      geom->GetPositionBuffer(*GetContentContext(), entity, render_pass);
+
+  auto uv_result =
+      geom->GetPositionUVBuffer(Rect::MakeLTRB(0, 0, 100, 100), Matrix(),
+                                *GetContentContext(), entity, render_pass);
+
+  EXPECT_EQ(position_result.vertex_buffer.vertex_count, 0u);
+  EXPECT_EQ(uv_result.vertex_buffer.vertex_count, 0u);
+
+  EXPECT_EQ(geom->GetResultMode(), GeometryResult::Mode::kNormal);
+}
+
+TEST_P(EntityTest, CanRenderEmptyPathsWithoutCrashing) {
+  PathBuilder builder = {};
+  builder.AddRect(Rect::MakeLTRB(0, 0, 0, 0));
+  Path path = builder.TakePath();
+
+  EXPECT_TRUE(path.GetBoundingBox()->IsEmpty());
+
+  auto contents = std::make_shared<SolidColorContents>();
+  contents->SetGeometry(Geometry::MakeFillPath(path));
+  contents->SetColor(Color::Red());
+
+  Entity entity;
+  entity.SetTransform(Matrix::MakeScale(GetContentScale()));
+  entity.SetContents(contents);
+
+  ASSERT_TRUE(OpenPlaygroundHere(std::move(entity)));
+}
+
 }  // namespace testing
 }  // namespace impeller
+
+// NOLINTEND(bugprone-unchecked-optional-access)
diff --git a/impeller/entity/geometry.cc b/impeller/entity/geometry.cc
deleted file mode 100644
index 763fed1ecbbdab58002d67b40a4eb5692b3e2b0c..0000000000000000000000000000000000000000
--- a/impeller/entity/geometry.cc
+++ /dev/null
@@ -1,554 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "impeller/entity/geometry.h"
-#include "impeller/entity/contents/content_context.h"
-#include "impeller/entity/position_color.vert.h"
-#include "impeller/geometry/matrix.h"
-#include "impeller/geometry/path_builder.h"
-#include "impeller/renderer/device_buffer.h"
-#include "impeller/renderer/render_pass.h"
-#include "impeller/tessellator/tessellator.h"
-
-namespace impeller {
-
-Geometry::Geometry() = default;
-
-Geometry::~Geometry() = default;
-
-// static
-std::unique_ptr<Geometry> Geometry::MakeFillPath(const Path& path) {
-  return std::make_unique<FillPathGeometry>(path);
-}
-
-std::unique_ptr<Geometry> Geometry::MakeStrokePath(const Path& path,
-                                                   Scalar stroke_width,
-                                                   Scalar miter_limit,
-                                                   Cap stroke_cap,
-                                                   Join stroke_join) {
-  // Skia behaves like this.
-  if (miter_limit < 0) {
-    miter_limit = 4.0;
-  }
-  return std::make_unique<StrokePathGeometry>(path, stroke_width, miter_limit,
-                                              stroke_cap, stroke_join);
-}
-
-std::unique_ptr<Geometry> Geometry::MakeCover() {
-  return std::make_unique<CoverGeometry>();
-}
-
-std::unique_ptr<Geometry> Geometry::MakeRect(Rect rect) {
-  return std::make_unique<RectGeometry>(rect);
-}
-
-/////// Path Geometry ///////
-
-FillPathGeometry::FillPathGeometry(const Path& path) : path_(path) {}
-
-FillPathGeometry::~FillPathGeometry() = default;
-
-GeometryResult FillPathGeometry::GetPositionBuffer(
-    const ContentContext& renderer,
-    const Entity& entity,
-    RenderPass& pass) {
-  VertexBuffer vertex_buffer;
-  auto& host_buffer = pass.GetTransientsBuffer();
-  auto tesselation_result = renderer.GetTessellator()->Tessellate(
-      path_.GetFillType(), path_.CreatePolyline(),
-      [&vertex_buffer, &host_buffer](
-          const float* vertices, size_t vertices_count, const uint16_t* indices,
-          size_t indices_count) {
-        vertex_buffer.vertex_buffer = host_buffer.Emplace(
-            vertices, vertices_count * sizeof(float), alignof(float));
-        vertex_buffer.index_buffer = host_buffer.Emplace(
-            indices, indices_count * sizeof(uint16_t), alignof(uint16_t));
-        vertex_buffer.index_count = indices_count;
-        vertex_buffer.index_type = IndexType::k16bit;
-        return true;
-      });
-  if (tesselation_result != Tessellator::Result::kSuccess) {
-    return {};
-  }
-  return GeometryResult{
-      .type = PrimitiveType::kTriangle,
-      .vertex_buffer = vertex_buffer,
-      .transform = Matrix::MakeOrthographic(pass.GetRenderTargetSize()) *
-                   entity.GetTransformation(),
-      .prevent_overdraw = false,
-  };
-}
-
-GeometryVertexType FillPathGeometry::GetVertexType() const {
-  return GeometryVertexType::kPosition;
-}
-
-std::optional<Rect> FillPathGeometry::GetCoverage(
-    const Matrix& transform) const {
-  return path_.GetTransformedBoundingBox(transform);
-}
-
-///// Stroke Geometry //////
-
-StrokePathGeometry::StrokePathGeometry(const Path& path,
-                                       Scalar stroke_width,
-                                       Scalar miter_limit,
-                                       Cap stroke_cap,
-                                       Join stroke_join)
-    : path_(path),
-      stroke_width_(stroke_width),
-      miter_limit_(miter_limit),
-      stroke_cap_(stroke_cap),
-      stroke_join_(stroke_join) {}
-
-StrokePathGeometry::~StrokePathGeometry() = default;
-
-Scalar StrokePathGeometry::GetStrokeWidth() const {
-  return stroke_width_;
-}
-
-Scalar StrokePathGeometry::GetMiterLimit() const {
-  return miter_limit_;
-}
-
-Cap StrokePathGeometry::GetStrokeCap() const {
-  return stroke_cap_;
-}
-
-Join StrokePathGeometry::GetStrokeJoin() const {
-  return stroke_join_;
-}
-
-// static
-Scalar StrokePathGeometry::CreateBevelAndGetDirection(
-    VertexBufferBuilder<SolidFillVertexShader::PerVertexData>& vtx_builder,
-    const Point& position,
-    const Point& start_offset,
-    const Point& end_offset) {
-  SolidFillVertexShader::PerVertexData vtx;
-  vtx.position = position;
-  vtx_builder.AppendVertex(vtx);
-
-  Scalar dir = start_offset.Cross(end_offset) > 0 ? -1 : 1;
-  vtx.position = position + start_offset * dir;
-  vtx_builder.AppendVertex(vtx);
-  vtx.position = position + end_offset * dir;
-  vtx_builder.AppendVertex(vtx);
-
-  return dir;
-}
-
-// static
-StrokePathGeometry::JoinProc StrokePathGeometry::GetJoinProc(Join stroke_join) {
-  using VS = SolidFillVertexShader;
-  StrokePathGeometry::JoinProc join_proc;
-  switch (stroke_join) {
-    case Join::kBevel:
-      join_proc = [](VertexBufferBuilder<VS::PerVertexData>& vtx_builder,
-                     const Point& position, const Point& start_offset,
-                     const Point& end_offset, Scalar miter_limit,
-                     Scalar tolerance) {
-        CreateBevelAndGetDirection(vtx_builder, position, start_offset,
-                                   end_offset);
-      };
-      break;
-    case Join::kMiter:
-      join_proc = [](VertexBufferBuilder<VS::PerVertexData>& vtx_builder,
-                     const Point& position, const Point& start_offset,
-                     const Point& end_offset, Scalar miter_limit,
-                     Scalar tolerance) {
-        Point start_normal = start_offset.Normalize();
-        Point end_normal = end_offset.Normalize();
-
-        // 1 for no joint (straight line), 0 for max joint (180 degrees).
-        Scalar alignment = (start_normal.Dot(end_normal) + 1) / 2;
-        if (ScalarNearlyEqual(alignment, 1)) {
-          return;
-        }
-
-        Scalar dir = CreateBevelAndGetDirection(vtx_builder, position,
-                                                start_offset, end_offset);
-
-        Point miter_point = (start_offset + end_offset) / 2 / alignment;
-        if (miter_point.GetDistanceSquared({0, 0}) >
-            miter_limit * miter_limit) {
-          return;  // Convert to bevel when we exceed the miter limit.
-        }
-
-        // Outer miter point.
-        VS::PerVertexData vtx;
-        vtx.position = position + miter_point * dir;
-        vtx_builder.AppendVertex(vtx);
-      };
-      break;
-    case Join::kRound:
-      join_proc = [](VertexBufferBuilder<VS::PerVertexData>& vtx_builder,
-                     const Point& position, const Point& start_offset,
-                     const Point& end_offset, Scalar miter_limit,
-                     Scalar tolerance) {
-        Point start_normal = start_offset.Normalize();
-        Point end_normal = end_offset.Normalize();
-
-        // 0 for no joint (straight line), 1 for max joint (180 degrees).
-        Scalar alignment = 1 - (start_normal.Dot(end_normal) + 1) / 2;
-        if (ScalarNearlyEqual(alignment, 0)) {
-          return;
-        }
-
-        Scalar dir = CreateBevelAndGetDirection(vtx_builder, position,
-                                                start_offset, end_offset);
-
-        Point middle =
-            (start_offset + end_offset).Normalize() * start_offset.GetLength();
-        Point middle_normal = middle.Normalize();
-
-        Point middle_handle = middle + Point(-middle.y, middle.x) *
-                                           PathBuilder::kArcApproximationMagic *
-                                           alignment * dir;
-        Point start_handle =
-            start_offset + Point(start_offset.y, -start_offset.x) *
-                               PathBuilder::kArcApproximationMagic * alignment *
-                               dir;
-
-        auto arc_points = CubicPathComponent(start_offset, start_handle,
-                                             middle_handle, middle)
-                              .CreatePolyline(tolerance);
-
-        VS::PerVertexData vtx;
-        for (const auto& point : arc_points) {
-          vtx.position = position + point * dir;
-          vtx_builder.AppendVertex(vtx);
-          vtx.position = position + (-point * dir).Reflect(middle_normal);
-          vtx_builder.AppendVertex(vtx);
-        }
-      };
-      break;
-  }
-  return join_proc;
-}
-
-// static
-StrokePathGeometry::CapProc StrokePathGeometry::GetCapProc(Cap stroke_cap) {
-  using VS = SolidFillVertexShader;
-  StrokePathGeometry::CapProc cap_proc;
-  switch (stroke_cap) {
-    case Cap::kButt:
-      cap_proc = [](VertexBufferBuilder<VS::PerVertexData>& vtx_builder,
-                    const Point& position, const Point& offset,
-                    Scalar tolerance) {
-        VS::PerVertexData vtx;
-        vtx.position = position + offset;
-        vtx_builder.AppendVertex(vtx);
-        vtx.position = position - offset;
-        vtx_builder.AppendVertex(vtx);
-      };
-      break;
-    case Cap::kRound:
-      cap_proc = [](VertexBufferBuilder<VS::PerVertexData>& vtx_builder,
-                    const Point& position, const Point& offset,
-                    Scalar tolerance) {
-        VS::PerVertexData vtx;
-
-        Point forward(offset.y, -offset.x);
-        Point forward_normal = forward.Normalize();
-
-        auto arc_points =
-            CubicPathComponent(
-                offset, offset + forward * PathBuilder::kArcApproximationMagic,
-                forward + offset * PathBuilder::kArcApproximationMagic, forward)
-                .CreatePolyline(tolerance);
-
-        vtx.position = position + offset;
-        vtx_builder.AppendVertex(vtx);
-        vtx.position = position - offset;
-        vtx_builder.AppendVertex(vtx);
-        for (const auto& point : arc_points) {
-          vtx.position = position + point;
-          vtx_builder.AppendVertex(vtx);
-          vtx.position = position + (-point).Reflect(forward_normal);
-          vtx_builder.AppendVertex(vtx);
-        }
-      };
-      break;
-    case Cap::kSquare:
-      cap_proc = [](VertexBufferBuilder<VS::PerVertexData>& vtx_builder,
-                    const Point& position, const Point& offset,
-                    Scalar tolerance) {
-        VS::PerVertexData vtx;
-
-        Point forward(offset.y, -offset.x);
-
-        vtx.position = position + offset;
-        vtx_builder.AppendVertex(vtx);
-        vtx.position = position - offset;
-        vtx_builder.AppendVertex(vtx);
-        vtx.position = position + offset + forward;
-        vtx_builder.AppendVertex(vtx);
-        vtx.position = position - offset + forward;
-        vtx_builder.AppendVertex(vtx);
-      };
-      break;
-  }
-  return cap_proc;
-}
-
-// static
-VertexBuffer StrokePathGeometry::CreateSolidStrokeVertices(
-    const Path& path,
-    HostBuffer& buffer,
-    Scalar stroke_width,
-    Scalar scaled_miter_limit,
-    const StrokePathGeometry::JoinProc& join_proc,
-    const StrokePathGeometry::CapProc& cap_proc,
-    Scalar tolerance) {
-  VertexBufferBuilder<VS::PerVertexData> vtx_builder;
-  auto polyline = path.CreatePolyline();
-
-  VS::PerVertexData vtx;
-
-  // Offset state.
-  Point offset;
-  Point previous_offset;  // Used for computing joins.
-
-  auto compute_offset = [&polyline, &offset, &previous_offset,
-                         &stroke_width](size_t point_i) {
-    previous_offset = offset;
-    Point direction =
-        (polyline.points[point_i] - polyline.points[point_i - 1]).Normalize();
-    offset = Vector2{-direction.y, direction.x} * stroke_width * 0.5;
-  };
-
-  for (size_t contour_i = 0; contour_i < polyline.contours.size();
-       contour_i++) {
-    auto contour = polyline.contours[contour_i];
-    size_t contour_start_point_i, contour_end_point_i;
-    std::tie(contour_start_point_i, contour_end_point_i) =
-        polyline.GetContourPointBounds(contour_i);
-
-    switch (contour_end_point_i - contour_start_point_i) {
-      case 1: {
-        Point p = polyline.points[contour_start_point_i];
-        cap_proc(vtx_builder, p, {-stroke_width * 0.5f, 0}, tolerance);
-        cap_proc(vtx_builder, p, {stroke_width * 0.5f, 0}, tolerance);
-        continue;
-      }
-      case 0:
-        continue;  // This contour has no renderable content.
-      default:
-        break;
-    }
-
-    // The first point's offset is always the same as the second point.
-    compute_offset(contour_start_point_i + 1);
-    const Point contour_first_offset = offset;
-
-    if (contour_i > 0) {
-      // This branch only executes when we've just finished drawing a contour
-      // and are switching to a new one.
-      // We're drawing a triangle strip, so we need to "pick up the pen" by
-      // appending two vertices at the end of the previous contour and two
-      // vertices at the start of the new contour (thus connecting the two
-      // contours with two zero volume triangles, which will be discarded by
-      // the rasterizer).
-      vtx.position = polyline.points[contour_start_point_i - 1];
-      // Append two vertices when "picking up" the pen so that the triangle
-      // drawn when moving to the beginning of the new contour will have zero
-      // volume.
-      vtx_builder.AppendVertex(vtx);
-      vtx_builder.AppendVertex(vtx);
-
-      vtx.position = polyline.points[contour_start_point_i];
-      // Append two vertices at the beginning of the new contour, which
-      // appends  two triangles of zero area.
-      vtx_builder.AppendVertex(vtx);
-      vtx_builder.AppendVertex(vtx);
-    }
-
-    // Generate start cap.
-    if (!polyline.contours[contour_i].is_closed) {
-      auto cap_offset =
-          Vector2(contour.start_direction.y, -contour.start_direction.x) *
-          stroke_width * 0.5;
-      cap_proc(vtx_builder, polyline.points[contour_start_point_i], cap_offset,
-               tolerance);
-    }
-
-    // Generate contour geometry.
-    for (size_t point_i = contour_start_point_i; point_i < contour_end_point_i;
-         point_i++) {
-      if (point_i > contour_start_point_i) {
-        // Generate line rect.
-        vtx.position = polyline.points[point_i - 1] + offset;
-        vtx_builder.AppendVertex(vtx);
-        vtx.position = polyline.points[point_i - 1] - offset;
-        vtx_builder.AppendVertex(vtx);
-        vtx.position = polyline.points[point_i] + offset;
-        vtx_builder.AppendVertex(vtx);
-        vtx.position = polyline.points[point_i] - offset;
-        vtx_builder.AppendVertex(vtx);
-
-        if (point_i < contour_end_point_i - 1) {
-          compute_offset(point_i + 1);
-
-          // Generate join from the current line to the next line.
-          join_proc(vtx_builder, polyline.points[point_i], previous_offset,
-                    offset, scaled_miter_limit, tolerance);
-        }
-      }
-    }
-
-    // Generate end cap or join.
-    if (!polyline.contours[contour_i].is_closed) {
-      auto cap_offset =
-          Vector2(-contour.end_direction.y, contour.end_direction.x) *
-          stroke_width * 0.5;
-      cap_proc(vtx_builder, polyline.points[contour_end_point_i - 1],
-               cap_offset, tolerance);
-    } else {
-      join_proc(vtx_builder, polyline.points[contour_start_point_i], offset,
-                contour_first_offset, scaled_miter_limit, tolerance);
-    }
-  }
-
-  return vtx_builder.CreateVertexBuffer(buffer);
-}
-
-GeometryResult StrokePathGeometry::GetPositionBuffer(
-    const ContentContext& renderer,
-    const Entity& entity,
-    RenderPass& pass) {
-  if (stroke_width_ < 0.0) {
-    return {};
-  }
-  auto determinant = entity.GetTransformation().GetDeterminant();
-  if (determinant == 0) {
-    return {};
-  }
-
-  Scalar min_size = 1.0f / sqrt(std::abs(determinant));
-  Scalar stroke_width = std::max(stroke_width_, min_size);
-
-  auto tolerance =
-      kDefaultCurveTolerance /
-      (stroke_width_ * entity.GetTransformation().GetMaxBasisLength());
-
-  auto& host_buffer = pass.GetTransientsBuffer();
-  auto vertex_buffer = CreateSolidStrokeVertices(
-      path_, host_buffer, stroke_width, miter_limit_ * stroke_width_ * 0.5,
-      GetJoinProc(stroke_join_), GetCapProc(stroke_cap_), tolerance);
-
-  return GeometryResult{
-      .type = PrimitiveType::kTriangleStrip,
-      .vertex_buffer = vertex_buffer,
-      .transform = Matrix::MakeOrthographic(pass.GetRenderTargetSize()) *
-                   entity.GetTransformation(),
-      .prevent_overdraw = true,
-  };
-}
-
-GeometryVertexType StrokePathGeometry::GetVertexType() const {
-  return GeometryVertexType::kPosition;
-}
-
-std::optional<Rect> StrokePathGeometry::GetCoverage(
-    const Matrix& transform) const {
-  auto path_bounds = path_.GetBoundingBox();
-  if (!path_bounds.has_value()) {
-    return std::nullopt;
-  }
-  auto path_coverage = path_bounds->TransformBounds(transform);
-
-  Scalar max_radius = 0.5;
-  if (stroke_cap_ == Cap::kSquare) {
-    max_radius = max_radius * kSqrt2;
-  }
-  if (stroke_join_ == Join::kMiter) {
-    max_radius = std::max(max_radius, miter_limit_ * 0.5f);
-  }
-  Scalar determinant = transform.GetDeterminant();
-  if (determinant == 0) {
-    return std::nullopt;
-  }
-  Scalar min_size = 1.0f / sqrt(std::abs(determinant));
-  Vector2 max_radius_xy = transform.TransformDirection(
-      Vector2(max_radius, max_radius) * std::max(stroke_width_, min_size));
-
-  return Rect(path_coverage.origin - max_radius_xy,
-              Size(path_coverage.size.width + max_radius_xy.x * 2,
-                   path_coverage.size.height + max_radius_xy.y * 2));
-}
-
-/////// Cover Geometry ///////
-
-CoverGeometry::CoverGeometry() = default;
-
-CoverGeometry::~CoverGeometry() = default;
-
-GeometryResult CoverGeometry::GetPositionBuffer(const ContentContext& renderer,
-                                                const Entity& entity,
-                                                RenderPass& pass) {
-  auto rect = Rect(Size(pass.GetRenderTargetSize()));
-  constexpr uint16_t kRectIndicies[4] = {0, 1, 2, 3};
-  auto& host_buffer = pass.GetTransientsBuffer();
-  return GeometryResult{
-      .type = PrimitiveType::kTriangleStrip,
-      .vertex_buffer =
-          {
-              .vertex_buffer = host_buffer.Emplace(
-                  rect.GetPoints().data(), 8 * sizeof(float), alignof(float)),
-              .index_buffer = host_buffer.Emplace(
-                  kRectIndicies, 4 * sizeof(uint16_t), alignof(uint16_t)),
-              .index_count = 4,
-              .index_type = IndexType::k16bit,
-          },
-      .transform = Matrix::MakeOrthographic(pass.GetRenderTargetSize()),
-      .prevent_overdraw = false,
-  };
-}
-
-GeometryVertexType CoverGeometry::GetVertexType() const {
-  return GeometryVertexType::kPosition;
-}
-
-std::optional<Rect> CoverGeometry::GetCoverage(const Matrix& transform) const {
-  return Rect::MakeMaximum();
-}
-
-/////// Rect Geometry ///////
-
-RectGeometry::RectGeometry(Rect rect) : rect_(rect) {}
-
-RectGeometry::~RectGeometry() = default;
-
-GeometryResult RectGeometry::GetPositionBuffer(const ContentContext& renderer,
-                                               const Entity& entity,
-                                               RenderPass& pass) {
-  constexpr uint16_t kRectIndicies[4] = {0, 1, 2, 3};
-  auto& host_buffer = pass.GetTransientsBuffer();
-  return GeometryResult{
-      .type = PrimitiveType::kTriangleStrip,
-      .vertex_buffer =
-          {
-              .vertex_buffer = host_buffer.Emplace(
-                  rect_.GetPoints().data(), 8 * sizeof(float), alignof(float)),
-              .index_buffer = host_buffer.Emplace(
-                  kRectIndicies, 4 * sizeof(uint16_t), alignof(uint16_t)),
-              .index_count = 4,
-              .index_type = IndexType::k16bit,
-          },
-      .transform = Matrix::MakeOrthographic(pass.GetRenderTargetSize()) *
-                   entity.GetTransformation(),
-      .prevent_overdraw = false,
-  };
-}
-
-GeometryVertexType RectGeometry::GetVertexType() const {
-  return GeometryVertexType::kPosition;
-}
-
-std::optional<Rect> RectGeometry::GetCoverage(const Matrix& transform) const {
-  return rect_.TransformBounds(transform);
-}
-
-}  // namespace impeller
diff --git a/impeller/entity/geometry.h b/impeller/entity/geometry.h
deleted file mode 100644
index dabab1d1dc42ae0420e0cff40f3a168e5c9ebf29..0000000000000000000000000000000000000000
--- a/impeller/entity/geometry.h
+++ /dev/null
@@ -1,230 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#pragma once
-
-#include "impeller/entity/contents/contents.h"
-#include "impeller/entity/entity.h"
-#include "impeller/entity/solid_fill.vert.h"
-#include "impeller/geometry/color.h"
-#include "impeller/geometry/path.h"
-#include "impeller/renderer/allocator.h"
-#include "impeller/renderer/host_buffer.h"
-#include "impeller/renderer/vertex_buffer.h"
-
-namespace impeller {
-
-class Tessellator;
-
-struct GeometryResult {
-  PrimitiveType type;
-  VertexBuffer vertex_buffer;
-  Matrix transform;
-  bool prevent_overdraw;
-};
-
-enum GeometryVertexType {
-  kPosition,
-  kColor,
-  kUV,
-};
-
-enum class Cap {
-  kButt,
-  kRound,
-  kSquare,
-};
-
-enum class Join {
-  kMiter,
-  kRound,
-  kBevel,
-};
-
-class Geometry {
- public:
-  Geometry();
-
-  virtual ~Geometry();
-
-  static std::unique_ptr<Geometry> MakeFillPath(const Path& path);
-
-  static std::unique_ptr<Geometry> MakeStrokePath(
-      const Path& path,
-      Scalar stroke_width = 0.0,
-      Scalar miter_limit = 4.0,
-      Cap stroke_cap = Cap::kButt,
-      Join stroke_join = Join::kMiter);
-
-  static std::unique_ptr<Geometry> MakeCover();
-
-  static std::unique_ptr<Geometry> MakeRect(Rect rect);
-
-  virtual GeometryResult GetPositionBuffer(const ContentContext& renderer,
-                                           const Entity& entity,
-                                           RenderPass& pass) = 0;
-
-  virtual GeometryVertexType GetVertexType() const = 0;
-
-  virtual std::optional<Rect> GetCoverage(const Matrix& transform) const = 0;
-};
-
-/// @brief A geometry that is created from a vertices object.
-class VerticesGeometry : public Geometry {
- public:
-  virtual GeometryResult GetPositionColorBuffer(const ContentContext& renderer,
-                                                const Entity& entity,
-                                                RenderPass& pass,
-                                                Color paint_color,
-                                                BlendMode blend_mode) = 0;
-
-  virtual GeometryResult GetPositionUVBuffer(const ContentContext& renderer,
-                                             const Entity& entity,
-                                             RenderPass& pass) = 0;
-};
-
-/// @brief A geometry that is created from a filled path object.
-class FillPathGeometry : public Geometry {
- public:
-  explicit FillPathGeometry(const Path& path);
-
-  ~FillPathGeometry();
-
- private:
-  // |Geometry|
-  GeometryResult GetPositionBuffer(const ContentContext& renderer,
-                                   const Entity& entity,
-                                   RenderPass& pass) override;
-
-  // |Geometry|
-  GeometryVertexType GetVertexType() const override;
-
-  // |Geometry|
-  std::optional<Rect> GetCoverage(const Matrix& transform) const override;
-
-  Path path_;
-
-  FML_DISALLOW_COPY_AND_ASSIGN(FillPathGeometry);
-};
-
-/// @brief A geometry that is created from a stroked path object.
-class StrokePathGeometry : public Geometry {
- public:
-  StrokePathGeometry(const Path& path,
-                     Scalar stroke_width,
-                     Scalar miter_limit,
-                     Cap stroke_cap,
-                     Join stroke_join);
-
-  ~StrokePathGeometry();
-
-  Scalar GetStrokeWidth() const;
-
-  Scalar GetMiterLimit() const;
-
-  Cap GetStrokeCap() const;
-
-  Join GetStrokeJoin() const;
-
- private:
-  using VS = SolidFillVertexShader;
-
-  using CapProc =
-      std::function<void(VertexBufferBuilder<VS::PerVertexData>& vtx_builder,
-                         const Point& position,
-                         const Point& offset,
-                         Scalar tolerance)>;
-  using JoinProc =
-      std::function<void(VertexBufferBuilder<VS::PerVertexData>& vtx_builder,
-                         const Point& position,
-                         const Point& start_offset,
-                         const Point& end_offset,
-                         Scalar miter_limit,
-                         Scalar tolerance)>;
-
-  // |Geometry|
-  GeometryResult GetPositionBuffer(const ContentContext& renderer,
-                                   const Entity& entity,
-                                   RenderPass& pass) override;
-
-  // |Geometry|
-  GeometryVertexType GetVertexType() const override;
-
-  // |Geometry|
-  std::optional<Rect> GetCoverage(const Matrix& transform) const override;
-
-  static Scalar CreateBevelAndGetDirection(
-      VertexBufferBuilder<SolidFillVertexShader::PerVertexData>& vtx_builder,
-      const Point& position,
-      const Point& start_offset,
-      const Point& end_offset);
-
-  static VertexBuffer CreateSolidStrokeVertices(const Path& path,
-                                                HostBuffer& buffer,
-                                                Scalar stroke_width,
-                                                Scalar scaled_miter_limit,
-                                                const JoinProc& join_proc,
-                                                const CapProc& cap_proc,
-                                                Scalar tolerance);
-
-  static StrokePathGeometry::JoinProc GetJoinProc(Join stroke_join);
-
-  static StrokePathGeometry::CapProc GetCapProc(Cap stroke_cap);
-
-  Path path_;
-  Scalar stroke_width_;
-  Scalar miter_limit_;
-  Cap stroke_cap_;
-  Join stroke_join_;
-
-  FML_DISALLOW_COPY_AND_ASSIGN(StrokePathGeometry);
-};
-
-/// @brief A geometry that implements "drawPaint" like behavior by covering
-///        the entire render pass area.
-class CoverGeometry : public Geometry {
- public:
-  CoverGeometry();
-
-  ~CoverGeometry();
-
- private:
-  // |Geometry|
-  GeometryResult GetPositionBuffer(const ContentContext& renderer,
-                                   const Entity& entity,
-                                   RenderPass& pass) override;
-
-  // |Geometry|
-  GeometryVertexType GetVertexType() const override;
-
-  // |Geometry|
-  std::optional<Rect> GetCoverage(const Matrix& transform) const override;
-
-  FML_DISALLOW_COPY_AND_ASSIGN(CoverGeometry);
-};
-
-class RectGeometry : public Geometry {
- public:
-  explicit RectGeometry(Rect rect);
-
-  ~RectGeometry();
-
- private:
-  // |Geometry|
-  GeometryResult GetPositionBuffer(const ContentContext& renderer,
-                                   const Entity& entity,
-                                   RenderPass& pass) override;
-
-  // |Geometry|
-  GeometryVertexType GetVertexType() const override;
-
-  // |Geometry|
-  std::optional<Rect> GetCoverage(const Matrix& transform) const override;
-
-  Rect rect_;
-
-  FML_DISALLOW_COPY_AND_ASSIGN(RectGeometry);
-};
-
-}  // namespace impeller
diff --git a/impeller/entity/geometry/circle_geometry.cc b/impeller/entity/geometry/circle_geometry.cc
new file mode 100644
index 0000000000000000000000000000000000000000..bd9aa8c79637835d58055e3f19043b74e99acd45
--- /dev/null
+++ b/impeller/entity/geometry/circle_geometry.cc
@@ -0,0 +1,99 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <algorithm>
+
+#include "flutter/impeller/entity/geometry/circle_geometry.h"
+
+#include "flutter/impeller/entity/geometry/line_geometry.h"
+
+namespace impeller {
+
+CircleGeometry::CircleGeometry(const Point& center, Scalar radius)
+    : center_(center), radius_(radius), stroke_width_(-1.0f) {
+  FML_DCHECK(radius >= 0);
+}
+
+CircleGeometry::CircleGeometry(const Point& center,
+                               Scalar radius,
+                               Scalar stroke_width)
+    : center_(center),
+      radius_(radius),
+      stroke_width_(std::max(stroke_width, 0.0f)) {
+  FML_DCHECK(radius >= 0);
+  FML_DCHECK(stroke_width >= 0);
+}
+
+GeometryResult CircleGeometry::GetPositionBuffer(const ContentContext& renderer,
+                                                 const Entity& entity,
+                                                 RenderPass& pass) const {
+  auto& transform = entity.GetTransform();
+
+  Scalar half_width = stroke_width_ < 0 ? 0.0
+                                        : LineGeometry::ComputePixelHalfWidth(
+                                              transform, stroke_width_);
+
+  std::shared_ptr<Tessellator> tessellator = renderer.GetTessellator();
+
+  // We call the StrokedCircle method which will simplify to a
+  // FilledCircleGenerator if the inner_radius is <= 0.
+  auto generator =
+      tessellator->StrokedCircle(transform, center_, radius_, half_width);
+
+  return ComputePositionGeometry(renderer, generator, entity, pass);
+}
+
+// |Geometry|
+GeometryResult CircleGeometry::GetPositionUVBuffer(
+    Rect texture_coverage,
+    Matrix effect_transform,
+    const ContentContext& renderer,
+    const Entity& entity,
+    RenderPass& pass) const {
+  auto& transform = entity.GetTransform();
+  auto uv_transform =
+      texture_coverage.GetNormalizingTransform() * effect_transform;
+
+  Scalar half_width = stroke_width_ < 0 ? 0.0
+                                        : LineGeometry::ComputePixelHalfWidth(
+                                              transform, stroke_width_);
+  std::shared_ptr<Tessellator> tessellator = renderer.GetTessellator();
+
+  // We call the StrokedCircle method which will simplify to a
+  // FilledCircleGenerator if the inner_radius is <= 0.
+  auto generator =
+      tessellator->StrokedCircle(transform, center_, radius_, half_width);
+
+  return ComputePositionUVGeometry(renderer, generator, uv_transform, entity,
+                                   pass);
+}
+
+GeometryVertexType CircleGeometry::GetVertexType() const {
+  return GeometryVertexType::kPosition;
+}
+
+std::optional<Rect> CircleGeometry::GetCoverage(const Matrix& transform) const {
+  Point corners[4]{
+      {center_.x, center_.y - radius_},
+      {center_.x + radius_, center_.y},
+      {center_.x, center_.y + radius_},
+      {center_.x - radius_, center_.y},
+  };
+
+  for (int i = 0; i < 4; i++) {
+    corners[i] = transform * corners[i];
+  }
+  return Rect::MakePointBounds(std::begin(corners), std::end(corners));
+}
+
+bool CircleGeometry::CoversArea(const Matrix& transform,
+                                const Rect& rect) const {
+  return false;
+}
+
+bool CircleGeometry::IsAxisAlignedRect() const {
+  return false;
+}
+
+}  // namespace impeller
diff --git a/impeller/entity/geometry/circle_geometry.h b/impeller/entity/geometry/circle_geometry.h
new file mode 100644
index 0000000000000000000000000000000000000000..be75f891317d13d987e3cdb1e1c21afcedd98dfd
--- /dev/null
+++ b/impeller/entity/geometry/circle_geometry.h
@@ -0,0 +1,60 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_ENTITY_GEOMETRY_CIRCLE_GEOMETRY_H_
+#define FLUTTER_IMPELLER_ENTITY_GEOMETRY_CIRCLE_GEOMETRY_H_
+
+#include "impeller/entity/geometry/geometry.h"
+
+namespace impeller {
+
+// Geometry class that can generate vertices (with or without texture
+// coordinates) for either filled or stroked circles
+class CircleGeometry final : public Geometry {
+ public:
+  explicit CircleGeometry(const Point& center, Scalar radius);
+
+  explicit CircleGeometry(const Point& center,
+                          Scalar radius,
+                          Scalar stroke_width);
+
+  ~CircleGeometry() = default;
+
+  // |Geometry|
+  bool CoversArea(const Matrix& transform, const Rect& rect) const override;
+
+  // |Geometry|
+  bool IsAxisAlignedRect() const override;
+
+ private:
+  // |Geometry|
+  GeometryResult GetPositionBuffer(const ContentContext& renderer,
+                                   const Entity& entity,
+                                   RenderPass& pass) const override;
+
+  // |Geometry|
+  GeometryVertexType GetVertexType() const override;
+
+  // |Geometry|
+  std::optional<Rect> GetCoverage(const Matrix& transform) const override;
+
+  // |Geometry|
+  GeometryResult GetPositionUVBuffer(Rect texture_coverage,
+                                     Matrix effect_transform,
+                                     const ContentContext& renderer,
+                                     const Entity& entity,
+                                     RenderPass& pass) const override;
+
+  Point center_;
+  Scalar radius_;
+  Scalar stroke_width_;
+
+  CircleGeometry(const CircleGeometry&) = delete;
+
+  CircleGeometry& operator=(const CircleGeometry&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_GEOMETRY_CIRCLE_GEOMETRY_H_
diff --git a/impeller/entity/geometry/cover_geometry.cc b/impeller/entity/geometry/cover_geometry.cc
new file mode 100644
index 0000000000000000000000000000000000000000..1f80687d14752bc0a64f5cbb356f1d4b65c685da
--- /dev/null
+++ b/impeller/entity/geometry/cover_geometry.cc
@@ -0,0 +1,65 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/entity/geometry/cover_geometry.h"
+
+#include "impeller/renderer/render_pass.h"
+
+namespace impeller {
+
+CoverGeometry::CoverGeometry() = default;
+
+GeometryResult CoverGeometry::GetPositionBuffer(const ContentContext& renderer,
+                                                const Entity& entity,
+                                                RenderPass& pass) const {
+  auto rect = Rect::MakeSize(pass.GetRenderTargetSize());
+  constexpr uint16_t kRectIndicies[4] = {0, 1, 2, 3};
+  auto& host_buffer = renderer.GetTransientsBuffer();
+  return GeometryResult{
+      .type = PrimitiveType::kTriangleStrip,
+      .vertex_buffer =
+          {
+              .vertex_buffer = host_buffer.Emplace(
+                  rect.GetTransformedPoints(entity.GetTransform().Invert())
+                      .data(),
+                  8 * sizeof(float), alignof(float)),
+              .index_buffer = host_buffer.Emplace(
+                  kRectIndicies, 4 * sizeof(uint16_t), alignof(uint16_t)),
+              .vertex_count = 4,
+              .index_type = IndexType::k16bit,
+          },
+      .transform = entity.GetShaderTransform(pass),
+  };
+}
+
+// |Geometry|
+GeometryResult CoverGeometry::GetPositionUVBuffer(
+    Rect texture_coverage,
+    Matrix effect_transform,
+    const ContentContext& renderer,
+    const Entity& entity,
+    RenderPass& pass) const {
+  auto rect = Rect::MakeSize(pass.GetRenderTargetSize());
+  return ComputeUVGeometryForRect(rect, texture_coverage, effect_transform,
+                                  renderer, entity, pass);
+}
+
+GeometryVertexType CoverGeometry::GetVertexType() const {
+  return GeometryVertexType::kPosition;
+}
+
+std::optional<Rect> CoverGeometry::GetCoverage(const Matrix& transform) const {
+  return Rect::MakeMaximum();
+}
+
+bool CoverGeometry::CoversArea(const Matrix& transform,
+                               const Rect& rect) const {
+  return true;
+}
+
+bool CoverGeometry::CanApplyMaskFilter() const {
+  return false;
+}
+
+}  // namespace impeller
diff --git a/impeller/entity/geometry/cover_geometry.h b/impeller/entity/geometry/cover_geometry.h
new file mode 100644
index 0000000000000000000000000000000000000000..e9f56530cded23fe8481b1ee7d3339e0c9bc486d
--- /dev/null
+++ b/impeller/entity/geometry/cover_geometry.h
@@ -0,0 +1,53 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_ENTITY_GEOMETRY_COVER_GEOMETRY_H_
+#define FLUTTER_IMPELLER_ENTITY_GEOMETRY_COVER_GEOMETRY_H_
+
+#include "impeller/entity/geometry/geometry.h"
+
+namespace impeller {
+
+/// @brief A geometry that implements "drawPaint" like behavior by covering
+///        the entire render pass area.
+class CoverGeometry final : public Geometry {
+ public:
+  CoverGeometry();
+
+  ~CoverGeometry() = default;
+
+  // |Geometry|
+  bool CoversArea(const Matrix& transform, const Rect& rect) const override;
+
+  bool CanApplyMaskFilter() const override;
+
+ private:
+  // |Geometry|
+  GeometryResult GetPositionBuffer(const ContentContext& renderer,
+                                   const Entity& entity,
+                                   RenderPass& pass) const override;
+
+  // |Geometry|
+  GeometryVertexType GetVertexType() const override;
+
+  // |Geometry|
+  std::optional<Rect> GetCoverage(const Matrix& transform) const override;
+
+  // |Geometry|
+  GeometryResult GetPositionUVBuffer(Rect texture_coverage,
+                                     Matrix effect_transform,
+                                     const ContentContext& renderer,
+                                     const Entity& entity,
+                                     RenderPass& pass) const override;
+
+  CoverGeometry(const CoverGeometry&) = delete;
+
+  CoverGeometry& operator=(const CoverGeometry&) = delete;
+};
+
+static_assert(std::is_trivially_destructible<CoverGeometry>::value);
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_GEOMETRY_COVER_GEOMETRY_H_
diff --git a/impeller/entity/geometry/ellipse_geometry.cc b/impeller/entity/geometry/ellipse_geometry.cc
new file mode 100644
index 0000000000000000000000000000000000000000..b0d21324b437e05f9563fcf79566aecb09d87a55
--- /dev/null
+++ b/impeller/entity/geometry/ellipse_geometry.cc
@@ -0,0 +1,57 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <algorithm>
+
+#include "flutter/impeller/entity/geometry/ellipse_geometry.h"
+
+#include "flutter/impeller/entity/geometry/line_geometry.h"
+
+namespace impeller {
+
+EllipseGeometry::EllipseGeometry(Rect bounds) : bounds_(bounds) {}
+
+GeometryResult EllipseGeometry::GetPositionBuffer(
+    const ContentContext& renderer,
+    const Entity& entity,
+    RenderPass& pass) const {
+  return ComputePositionGeometry(
+      renderer,
+      renderer.GetTessellator()->FilledEllipse(entity.GetTransform(), bounds_),
+      entity, pass);
+}
+
+// |Geometry|
+GeometryResult EllipseGeometry::GetPositionUVBuffer(
+    Rect texture_coverage,
+    Matrix effect_transform,
+    const ContentContext& renderer,
+    const Entity& entity,
+    RenderPass& pass) const {
+  return ComputePositionUVGeometry(
+      renderer,
+      renderer.GetTessellator()->FilledEllipse(entity.GetTransform(), bounds_),
+      texture_coverage.GetNormalizingTransform() * effect_transform, entity,
+      pass);
+}
+
+GeometryVertexType EllipseGeometry::GetVertexType() const {
+  return GeometryVertexType::kPosition;
+}
+
+std::optional<Rect> EllipseGeometry::GetCoverage(
+    const Matrix& transform) const {
+  return bounds_.TransformBounds(transform);
+}
+
+bool EllipseGeometry::CoversArea(const Matrix& transform,
+                                 const Rect& rect) const {
+  return false;
+}
+
+bool EllipseGeometry::IsAxisAlignedRect() const {
+  return false;
+}
+
+}  // namespace impeller
diff --git a/impeller/entity/geometry/ellipse_geometry.h b/impeller/entity/geometry/ellipse_geometry.h
new file mode 100644
index 0000000000000000000000000000000000000000..892d03568e6de71e5ef8313a5eaba29414bca500
--- /dev/null
+++ b/impeller/entity/geometry/ellipse_geometry.h
@@ -0,0 +1,56 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_ENTITY_GEOMETRY_ELLIPSE_GEOMETRY_H_
+#define FLUTTER_IMPELLER_ENTITY_GEOMETRY_ELLIPSE_GEOMETRY_H_
+
+#include "impeller/entity/geometry/geometry.h"
+
+namespace impeller {
+
+// Geometry class that can generate vertices (with or without texture
+// coordinates) for filled ellipses. Generating vertices for a stroked
+// ellipse would require a lot more work since the line width must be
+// applied perpendicular to the distorted ellipse shape.
+class EllipseGeometry final : public Geometry {
+ public:
+  explicit EllipseGeometry(Rect bounds);
+
+  ~EllipseGeometry() = default;
+
+  // |Geometry|
+  bool CoversArea(const Matrix& transform, const Rect& rect) const override;
+
+  // |Geometry|
+  bool IsAxisAlignedRect() const override;
+
+ private:
+  // |Geometry|
+  GeometryResult GetPositionBuffer(const ContentContext& renderer,
+                                   const Entity& entity,
+                                   RenderPass& pass) const override;
+
+  // |Geometry|
+  GeometryVertexType GetVertexType() const override;
+
+  // |Geometry|
+  std::optional<Rect> GetCoverage(const Matrix& transform) const override;
+
+  // |Geometry|
+  GeometryResult GetPositionUVBuffer(Rect texture_coverage,
+                                     Matrix effect_transform,
+                                     const ContentContext& renderer,
+                                     const Entity& entity,
+                                     RenderPass& pass) const override;
+
+  Rect bounds_;
+
+  EllipseGeometry(const EllipseGeometry&) = delete;
+
+  EllipseGeometry& operator=(const EllipseGeometry&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_GEOMETRY_ELLIPSE_GEOMETRY_H_
diff --git a/impeller/entity/geometry/fill_path_geometry.cc b/impeller/entity/geometry/fill_path_geometry.cc
new file mode 100644
index 0000000000000000000000000000000000000000..7f0f807a2fced274a3dedc5f12148b8b07f181c1
--- /dev/null
+++ b/impeller/entity/geometry/fill_path_geometry.cc
@@ -0,0 +1,208 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/entity/geometry/fill_path_geometry.h"
+
+#include "fml/logging.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/vertex_buffer.h"
+#include "impeller/entity/contents/content_context.h"
+#include "impeller/entity/geometry/geometry.h"
+
+namespace impeller {
+
+FillPathGeometry::FillPathGeometry(const Path& path,
+                                   std::optional<Rect> inner_rect)
+    : path_(path), inner_rect_(inner_rect) {}
+
+GeometryResult FillPathGeometry::GetPositionBuffer(
+    const ContentContext& renderer,
+    const Entity& entity,
+    RenderPass& pass) const {
+  auto& host_buffer = renderer.GetTransientsBuffer();
+
+  const auto& bounding_box = path_.GetBoundingBox();
+  if (bounding_box.has_value() && bounding_box->IsEmpty()) {
+    return GeometryResult{
+        .type = PrimitiveType::kTriangle,
+        .vertex_buffer =
+            VertexBuffer{
+                .vertex_buffer = {},
+                .vertex_count = 0,
+                .index_type = IndexType::k16bit,
+            },
+        .transform = pass.GetOrthographicTransform() * entity.GetTransform(),
+    };
+  }
+
+  VertexBuffer vertex_buffer;
+  if constexpr (!ContentContext::kEnableStencilThenCover) {
+    if (!path_.IsConvex()) {
+      auto tesselation_result = renderer.GetTessellator()->Tessellate(
+          path_, entity.GetTransform().GetMaxBasisLength(),
+          [&vertex_buffer, &host_buffer](
+              const float* vertices, size_t vertices_count,
+              const uint16_t* indices, size_t indices_count) {
+            vertex_buffer.vertex_buffer = host_buffer.Emplace(
+                vertices, vertices_count * sizeof(float) * 2, alignof(float));
+            if (indices != nullptr) {
+              vertex_buffer.index_buffer = host_buffer.Emplace(
+                  indices, indices_count * sizeof(uint16_t), alignof(uint16_t));
+              vertex_buffer.vertex_count = indices_count;
+              vertex_buffer.index_type = IndexType::k16bit;
+            } else {
+              vertex_buffer.index_buffer = {};
+              vertex_buffer.vertex_count = vertices_count;
+              vertex_buffer.index_type = IndexType::kNone;
+            }
+            return true;
+          });
+      if (tesselation_result != Tessellator::Result::kSuccess) {
+        return {};
+      }
+      return GeometryResult{
+          .type = PrimitiveType::kTriangle,
+          .vertex_buffer = vertex_buffer,
+          .transform = entity.GetShaderTransform(pass),
+      };
+    }
+  }
+
+  auto points = renderer.GetTessellator()->TessellateConvex(
+      path_, entity.GetTransform().GetMaxBasisLength());
+
+  vertex_buffer.vertex_buffer = host_buffer.Emplace(
+      points.data(), points.size() * sizeof(Point), alignof(Point));
+  vertex_buffer.index_buffer = {}, vertex_buffer.vertex_count = points.size();
+  vertex_buffer.index_type = IndexType::kNone;
+
+  return GeometryResult{
+      .type = PrimitiveType::kTriangleStrip,
+      .vertex_buffer = vertex_buffer,
+      .transform = entity.GetShaderTransform(pass),
+      .mode = GetResultMode(),
+  };
+}
+
+// |Geometry|
+GeometryResult FillPathGeometry::GetPositionUVBuffer(
+    Rect texture_coverage,
+    Matrix effect_transform,
+    const ContentContext& renderer,
+    const Entity& entity,
+    RenderPass& pass) const {
+  using VS = TextureFillVertexShader;
+
+  const auto& bounding_box = path_.GetBoundingBox();
+  if (bounding_box.has_value() && bounding_box->IsEmpty()) {
+    return GeometryResult{
+        .type = PrimitiveType::kTriangle,
+        .vertex_buffer =
+            VertexBuffer{
+                .vertex_buffer = {},
+                .vertex_count = 0,
+                .index_type = IndexType::k16bit,
+            },
+        .transform = pass.GetOrthographicTransform() * entity.GetTransform(),
+    };
+  }
+
+  auto uv_transform =
+      texture_coverage.GetNormalizingTransform() * effect_transform;
+
+  if constexpr (!ContentContext::kEnableStencilThenCover) {
+    if (!path_.IsConvex()) {
+      VertexBufferBuilder<VS::PerVertexData> vertex_builder;
+      auto tesselation_result = renderer.GetTessellator()->Tessellate(
+          path_, entity.GetTransform().GetMaxBasisLength(),
+          [&vertex_builder, &uv_transform](
+              const float* vertices, size_t vertices_count,
+              const uint16_t* indices, size_t indices_count) {
+            for (auto i = 0u; i < vertices_count * 2; i += 2) {
+              VS::PerVertexData data;
+              Point vtx = {vertices[i], vertices[i + 1]};
+              data.position = vtx;
+              data.texture_coords = uv_transform * vtx;
+              vertex_builder.AppendVertex(data);
+            }
+            FML_DCHECK(vertex_builder.GetVertexCount() == vertices_count);
+            if (indices != nullptr) {
+              for (auto i = 0u; i < indices_count; i++) {
+                vertex_builder.AppendIndex(indices[i]);
+              }
+            }
+            return true;
+          });
+      if (tesselation_result != Tessellator::Result::kSuccess) {
+        return {};
+      }
+      return GeometryResult{
+          .type = PrimitiveType::kTriangle,
+          .vertex_buffer =
+              vertex_builder.CreateVertexBuffer(renderer.GetTransientsBuffer()),
+          .transform = entity.GetShaderTransform(pass),
+      };
+    }
+  }
+
+  auto points = renderer.GetTessellator()->TessellateConvex(
+      path_, entity.GetTransform().GetMaxBasisLength());
+
+  VertexBufferBuilder<VS::PerVertexData> vertex_builder;
+  vertex_builder.Reserve(points.size());
+  for (auto i = 0u; i < points.size(); i++) {
+    VS::PerVertexData data;
+    data.position = points[i];
+    data.texture_coords = uv_transform * points[i];
+    vertex_builder.AppendVertex(data);
+  }
+
+  return GeometryResult{
+      .type = PrimitiveType::kTriangleStrip,
+      .vertex_buffer =
+          vertex_builder.CreateVertexBuffer(renderer.GetTransientsBuffer()),
+      .transform = entity.GetShaderTransform(pass),
+      .mode = GetResultMode(),
+  };
+}
+
+GeometryResult::Mode FillPathGeometry::GetResultMode() const {
+  const auto& bounding_box = path_.GetBoundingBox();
+  if (!ContentContext::kEnableStencilThenCover || path_.IsConvex() ||
+      (bounding_box.has_value() && bounding_box->IsEmpty())) {
+    return GeometryResult::Mode::kNormal;
+  }
+
+  switch (path_.GetFillType()) {
+    case FillType::kNonZero:
+      return GeometryResult::Mode::kNonZero;
+    case FillType::kOdd:
+      return GeometryResult::Mode::kEvenOdd;
+  }
+
+  FML_UNREACHABLE();
+}
+
+GeometryVertexType FillPathGeometry::GetVertexType() const {
+  return GeometryVertexType::kPosition;
+}
+
+std::optional<Rect> FillPathGeometry::GetCoverage(
+    const Matrix& transform) const {
+  return path_.GetTransformedBoundingBox(transform);
+}
+
+bool FillPathGeometry::CoversArea(const Matrix& transform,
+                                  const Rect& rect) const {
+  if (!inner_rect_.has_value()) {
+    return false;
+  }
+  if (!transform.IsTranslationScaleOnly()) {
+    return false;
+  }
+  Rect coverage = inner_rect_->TransformBounds(transform);
+  return coverage.Contains(rect);
+}
+
+}  // namespace impeller
diff --git a/impeller/entity/geometry/fill_path_geometry.h b/impeller/entity/geometry/fill_path_geometry.h
new file mode 100644
index 0000000000000000000000000000000000000000..722f7cc661c4054691fc24af62cf23924934ad17
--- /dev/null
+++ b/impeller/entity/geometry/fill_path_geometry.h
@@ -0,0 +1,58 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_ENTITY_GEOMETRY_FILL_PATH_GEOMETRY_H_
+#define FLUTTER_IMPELLER_ENTITY_GEOMETRY_FILL_PATH_GEOMETRY_H_
+
+#include <optional>
+
+#include "impeller/entity/geometry/geometry.h"
+#include "impeller/geometry/rect.h"
+
+namespace impeller {
+
+/// @brief A geometry that is created from a filled path object.
+class FillPathGeometry final : public Geometry {
+ public:
+  explicit FillPathGeometry(const Path& path,
+                            std::optional<Rect> inner_rect = std::nullopt);
+
+  ~FillPathGeometry() = default;
+
+  // |Geometry|
+  bool CoversArea(const Matrix& transform, const Rect& rect) const override;
+
+ private:
+  // |Geometry|
+  GeometryResult GetPositionBuffer(const ContentContext& renderer,
+                                   const Entity& entity,
+                                   RenderPass& pass) const override;
+
+  // |Geometry|
+  GeometryVertexType GetVertexType() const override;
+
+  // |Geometry|
+  std::optional<Rect> GetCoverage(const Matrix& transform) const override;
+
+  // |Geometry|
+  GeometryResult GetPositionUVBuffer(Rect texture_coverage,
+                                     Matrix effect_transform,
+                                     const ContentContext& renderer,
+                                     const Entity& entity,
+                                     RenderPass& pass) const override;
+
+  // |Geometry|
+  GeometryResult::Mode GetResultMode() const override;
+
+  Path path_;
+  std::optional<Rect> inner_rect_;
+
+  FillPathGeometry(const FillPathGeometry&) = delete;
+
+  FillPathGeometry& operator=(const FillPathGeometry&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_GEOMETRY_FILL_PATH_GEOMETRY_H_
diff --git a/impeller/entity/geometry/geometry.cc b/impeller/entity/geometry/geometry.cc
new file mode 100644
index 0000000000000000000000000000000000000000..bc774a2a80e70fc0e5ed0c124ee272eee2a45229
--- /dev/null
+++ b/impeller/entity/geometry/geometry.cc
@@ -0,0 +1,247 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/entity/geometry/geometry.h"
+
+#include <memory>
+#include <optional>
+
+#include "fml/status.h"
+#include "impeller/entity/contents/content_context.h"
+#include "impeller/entity/geometry/circle_geometry.h"
+#include "impeller/entity/geometry/cover_geometry.h"
+#include "impeller/entity/geometry/ellipse_geometry.h"
+#include "impeller/entity/geometry/fill_path_geometry.h"
+#include "impeller/entity/geometry/line_geometry.h"
+#include "impeller/entity/geometry/point_field_geometry.h"
+#include "impeller/entity/geometry/rect_geometry.h"
+#include "impeller/entity/geometry/round_rect_geometry.h"
+#include "impeller/entity/geometry/stroke_path_geometry.h"
+#include "impeller/geometry/rect.h"
+
+namespace impeller {
+
+GeometryResult Geometry::ComputePositionGeometry(
+    const ContentContext& renderer,
+    const Tessellator::VertexGenerator& generator,
+    const Entity& entity,
+    RenderPass& pass) {
+  using VT = SolidFillVertexShader::PerVertexData;
+
+  size_t count = generator.GetVertexCount();
+
+  return GeometryResult{
+      .type = generator.GetTriangleType(),
+      .vertex_buffer =
+          {
+              .vertex_buffer = renderer.GetTransientsBuffer().Emplace(
+                  count * sizeof(VT), alignof(VT),
+                  [&generator](uint8_t* buffer) {
+                    auto vertices = reinterpret_cast<VT*>(buffer);
+                    generator.GenerateVertices([&vertices](const Point& p) {
+                      *vertices++ = {
+                          .position = p,
+                      };
+                    });
+                    FML_DCHECK(vertices == reinterpret_cast<VT*>(buffer) +
+                                               generator.GetVertexCount());
+                  }),
+              .vertex_count = count,
+              .index_type = IndexType::kNone,
+          },
+      .transform = entity.GetShaderTransform(pass),
+  };
+}
+
+GeometryResult Geometry::ComputePositionUVGeometry(
+    const ContentContext& renderer,
+    const Tessellator::VertexGenerator& generator,
+    const Matrix& uv_transform,
+    const Entity& entity,
+    RenderPass& pass) {
+  using VT = TextureFillVertexShader::PerVertexData;
+
+  size_t count = generator.GetVertexCount();
+
+  return GeometryResult{
+      .type = generator.GetTriangleType(),
+      .vertex_buffer =
+          {
+              .vertex_buffer = renderer.GetTransientsBuffer().Emplace(
+                  count * sizeof(VT), alignof(VT),
+                  [&generator, &uv_transform](uint8_t* buffer) {
+                    auto vertices = reinterpret_cast<VT*>(buffer);
+                    generator.GenerateVertices(
+                        [&vertices, &uv_transform](const Point& p) {  //
+                          *vertices++ = {
+                              .position = p,
+                              .texture_coords = uv_transform * p,
+                          };
+                        });
+                    FML_DCHECK(vertices == reinterpret_cast<VT*>(buffer) +
+                                               generator.GetVertexCount());
+                  }),
+              .vertex_count = count,
+              .index_type = IndexType::kNone,
+          },
+      .transform = entity.GetShaderTransform(pass),
+  };
+}
+
+VertexBufferBuilder<TextureFillVertexShader::PerVertexData>
+ComputeUVGeometryCPU(
+    VertexBufferBuilder<SolidFillVertexShader::PerVertexData>& input,
+    Point texture_origin,
+    Size texture_coverage,
+    Matrix effect_transform) {
+  VertexBufferBuilder<TextureFillVertexShader::PerVertexData> vertex_builder;
+  vertex_builder.Reserve(input.GetVertexCount());
+  input.IterateVertices(
+      [&vertex_builder, &texture_coverage, &effect_transform,
+       &texture_origin](SolidFillVertexShader::PerVertexData old_vtx) {
+        TextureFillVertexShader::PerVertexData data;
+        data.position = old_vtx.position;
+        data.texture_coords = effect_transform *
+                              (old_vtx.position - texture_origin) /
+                              texture_coverage;
+        vertex_builder.AppendVertex(data);
+      });
+  return vertex_builder;
+}
+
+GeometryResult ComputeUVGeometryForRect(Rect source_rect,
+                                        Rect texture_bounds,
+                                        Matrix effect_transform,
+                                        const ContentContext& renderer,
+                                        const Entity& entity,
+                                        RenderPass& pass) {
+  auto& host_buffer = renderer.GetTransientsBuffer();
+
+  // Calculate UV-specific transform based on texture coverage and effect.
+  // For example, if the texture is 100x100 and the effect transform is
+  // scaling by 2.0, texture_bounds.GetNormalizingTransform() will result in a
+  // Matrix that scales by 0.01, and then if the effect_transform is
+  // Matrix::MakeScale(Vector2{2, 2}), the resulting uv_transform will have x
+  // and y basis vectors with scale 0.02.
+  auto uv_transform = texture_bounds.GetNormalizingTransform() *  //
+                      effect_transform;
+
+  // Allocate space for vertex and UV data (4 vertices)
+  // 0: position
+  // 1: UV
+  // 2: position
+  // 3: UV
+  // etc.
+  Point data[8];
+
+  // Get the raw points from the rect and transform them into UV space.
+  auto points = source_rect.GetPoints();
+  for (auto i = 0u, j = 0u; i < 8; i += 2, j++) {
+    // Store original coordinates.
+    data[i] = points[j];
+
+    // Store transformed UV coordinates.
+    data[i + 1] = uv_transform * points[j];
+  }
+
+  return GeometryResult{
+      .type = PrimitiveType::kTriangleStrip,
+      .vertex_buffer =
+          {
+              .vertex_buffer = host_buffer.Emplace(
+                  /*buffer=*/data,
+                  /*length=*/16 * sizeof(float),
+                  /*align=*/alignof(float)),
+              .vertex_count = 4,
+              .index_type = IndexType::kNone,
+          },
+      .transform = entity.GetShaderTransform(pass),
+  };
+}
+
+GeometryResult Geometry::GetPositionUVBuffer(Rect texture_coverage,
+                                             Matrix effect_transform,
+                                             const ContentContext& renderer,
+                                             const Entity& entity,
+                                             RenderPass& pass) const {
+  return {};
+}
+
+GeometryResult::Mode Geometry::GetResultMode() const {
+  return GeometryResult::Mode::kNormal;
+}
+
+std::shared_ptr<Geometry> Geometry::MakeFillPath(
+    const Path& path,
+    std::optional<Rect> inner_rect) {
+  return std::make_shared<FillPathGeometry>(path, inner_rect);
+}
+
+std::shared_ptr<Geometry> Geometry::MakePointField(std::vector<Point> points,
+                                                   Scalar radius,
+                                                   bool round) {
+  return std::make_shared<PointFieldGeometry>(std::move(points), radius, round);
+}
+
+std::shared_ptr<Geometry> Geometry::MakeStrokePath(const Path& path,
+                                                   Scalar stroke_width,
+                                                   Scalar miter_limit,
+                                                   Cap stroke_cap,
+                                                   Join stroke_join) {
+  // Skia behaves like this.
+  if (miter_limit < 0) {
+    miter_limit = 4.0;
+  }
+  return std::make_shared<StrokePathGeometry>(path, stroke_width, miter_limit,
+                                              stroke_cap, stroke_join);
+}
+
+std::shared_ptr<Geometry> Geometry::MakeCover() {
+  return std::make_shared<CoverGeometry>();
+}
+
+std::shared_ptr<Geometry> Geometry::MakeRect(const Rect& rect) {
+  return std::make_shared<RectGeometry>(rect);
+}
+
+std::shared_ptr<Geometry> Geometry::MakeOval(const Rect& rect) {
+  return std::make_shared<EllipseGeometry>(rect);
+}
+
+std::shared_ptr<Geometry> Geometry::MakeLine(const Point& p0,
+                                             const Point& p1,
+                                             Scalar width,
+                                             Cap cap) {
+  return std::make_shared<LineGeometry>(p0, p1, width, cap);
+}
+
+std::shared_ptr<Geometry> Geometry::MakeCircle(const Point& center,
+                                               Scalar radius) {
+  return std::make_shared<CircleGeometry>(center, radius);
+}
+
+std::shared_ptr<Geometry> Geometry::MakeStrokedCircle(const Point& center,
+                                                      Scalar radius,
+                                                      Scalar stroke_width) {
+  return std::make_shared<CircleGeometry>(center, radius, stroke_width);
+}
+
+std::shared_ptr<Geometry> Geometry::MakeRoundRect(const Rect& rect,
+                                                  const Size& radii) {
+  return std::make_shared<RoundRectGeometry>(rect, radii);
+}
+
+bool Geometry::CoversArea(const Matrix& transform, const Rect& rect) const {
+  return false;
+}
+
+bool Geometry::IsAxisAlignedRect() const {
+  return false;
+}
+
+bool Geometry::CanApplyMaskFilter() const {
+  return true;
+}
+
+}  // namespace impeller
diff --git a/impeller/entity/geometry/geometry.h b/impeller/entity/geometry/geometry.h
new file mode 100644
index 0000000000000000000000000000000000000000..5144ead7c433d9fdf55a740990a591cb0b87757b
--- /dev/null
+++ b/impeller/entity/geometry/geometry.h
@@ -0,0 +1,170 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_ENTITY_GEOMETRY_GEOMETRY_H_
+#define FLUTTER_IMPELLER_ENTITY_GEOMETRY_GEOMETRY_H_
+
+#include "impeller/core/formats.h"
+#include "impeller/core/vertex_buffer.h"
+#include "impeller/entity/contents/content_context.h"
+#include "impeller/entity/entity.h"
+#include "impeller/entity/texture_fill.vert.h"
+#include "impeller/renderer/render_pass.h"
+#include "impeller/renderer/vertex_buffer_builder.h"
+
+namespace impeller {
+
+class Tessellator;
+
+struct GeometryResult {
+  enum class Mode {
+    /// The geometry has no overlapping triangles.
+    kNormal,
+    /// The geometry may have overlapping triangles. The geometry should be
+    /// stenciled with the NonZero fill rule.
+    kNonZero,
+    /// The geometry may have overlapping triangles. The geometry should be
+    /// stenciled with the EvenOdd fill rule.
+    kEvenOdd,
+    /// The geometry may have overlapping triangles, but they should not
+    /// overdraw or cancel each other out. This is a special case for stroke
+    /// geometry.
+    kPreventOverdraw,
+  };
+
+  PrimitiveType type = PrimitiveType::kTriangleStrip;
+  VertexBuffer vertex_buffer;
+  Matrix transform;
+  Mode mode = Mode::kNormal;
+};
+
+static const GeometryResult kEmptyResult = {
+    .vertex_buffer =
+        {
+            .index_type = IndexType::kNone,
+        },
+};
+
+enum GeometryVertexType {
+  kPosition,
+  kColor,
+  kUV,
+};
+
+/// @brief Compute UV geometry for a VBB that contains only position geometry.
+///
+/// texture_origin should be set to 0, 0 for stroke and stroke based geometry,
+/// like the point field.
+VertexBufferBuilder<TextureFillVertexShader::PerVertexData>
+ComputeUVGeometryCPU(
+    VertexBufferBuilder<SolidFillVertexShader::PerVertexData>& input,
+    Point texture_origin,
+    Size texture_coverage,
+    Matrix effect_transform);
+
+/// @brief Computes geometry and UV coordinates for a rectangle to be rendered.
+///
+/// UV is the horizontal and vertical coordinates within the texture.
+///
+/// @param source_rect      The rectangle to be rendered.
+/// @param texture_bounds The local space bounding box of the geometry.
+/// @param effect_transform The transform to apply to the UV coordinates.
+/// @param renderer         The content context to use for allocating buffers.
+/// @param entity           The entity to use for the transform.
+/// @param pass             The render pass to use for the transform.
+GeometryResult ComputeUVGeometryForRect(Rect source_rect,
+                                        Rect texture_bounds,
+                                        Matrix effect_transform,
+                                        const ContentContext& renderer,
+                                        const Entity& entity,
+                                        RenderPass& pass);
+
+class Geometry {
+ public:
+  static std::shared_ptr<Geometry> MakeFillPath(
+      const Path& path,
+      std::optional<Rect> inner_rect = std::nullopt);
+
+  static std::shared_ptr<Geometry> MakeStrokePath(
+      const Path& path,
+      Scalar stroke_width = 0.0,
+      Scalar miter_limit = 4.0,
+      Cap stroke_cap = Cap::kButt,
+      Join stroke_join = Join::kMiter);
+
+  static std::shared_ptr<Geometry> MakeCover();
+
+  static std::shared_ptr<Geometry> MakeRect(const Rect& rect);
+
+  static std::shared_ptr<Geometry> MakeOval(const Rect& rect);
+
+  static std::shared_ptr<Geometry> MakeLine(const Point& p0,
+                                            const Point& p1,
+                                            Scalar width,
+                                            Cap cap);
+
+  static std::shared_ptr<Geometry> MakeCircle(const Point& center,
+                                              Scalar radius);
+
+  static std::shared_ptr<Geometry> MakeStrokedCircle(const Point& center,
+                                                     Scalar radius,
+                                                     Scalar stroke_width);
+
+  static std::shared_ptr<Geometry> MakeRoundRect(const Rect& rect,
+                                                 const Size& radii);
+
+  static std::shared_ptr<Geometry> MakePointField(std::vector<Point> points,
+                                                  Scalar radius,
+                                                  bool round);
+
+  virtual GeometryResult GetPositionBuffer(const ContentContext& renderer,
+                                           const Entity& entity,
+                                           RenderPass& pass) const = 0;
+
+  virtual GeometryResult GetPositionUVBuffer(Rect texture_coverage,
+                                             Matrix effect_transform,
+                                             const ContentContext& renderer,
+                                             const Entity& entity,
+                                             RenderPass& pass) const = 0;
+
+  virtual GeometryResult::Mode GetResultMode() const;
+
+  virtual GeometryVertexType GetVertexType() const = 0;
+
+  virtual std::optional<Rect> GetCoverage(const Matrix& transform) const = 0;
+
+  /// @brief    Determines if this geometry, transformed by the given
+  ///           `transform`, will completely cover all surface area of the given
+  ///           `rect`.
+  ///
+  ///           This is a conservative estimate useful for certain
+  ///           optimizations.
+  ///
+  /// @returns  `true` if the transformed geometry is guaranteed to cover the
+  ///           given `rect`. May return `false` in many undetected cases where
+  ///           the transformed geometry does in fact cover the `rect`.
+  virtual bool CoversArea(const Matrix& transform, const Rect& rect) const;
+
+  virtual bool IsAxisAlignedRect() const;
+
+  virtual bool CanApplyMaskFilter() const;
+
+ protected:
+  static GeometryResult ComputePositionGeometry(
+      const ContentContext& renderer,
+      const Tessellator::VertexGenerator& generator,
+      const Entity& entity,
+      RenderPass& pass);
+
+  static GeometryResult ComputePositionUVGeometry(
+      const ContentContext& renderer,
+      const Tessellator::VertexGenerator& generator,
+      const Matrix& uv_transform,
+      const Entity& entity,
+      RenderPass& pass);
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_GEOMETRY_GEOMETRY_H_
diff --git a/impeller/entity/geometry/geometry_unittests.cc b/impeller/entity/geometry/geometry_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..990b1419659ed698e7b2a713fec8c15df8f80319
--- /dev/null
+++ b/impeller/entity/geometry/geometry_unittests.cc
@@ -0,0 +1,242 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <memory>
+#include "flutter/testing/testing.h"
+#include "impeller/entity/contents/content_context.h"
+#include "impeller/entity/geometry/geometry.h"
+#include "impeller/entity/geometry/stroke_path_geometry.h"
+#include "impeller/geometry/geometry_asserts.h"
+#include "impeller/geometry/path_builder.h"
+#include "impeller/renderer/testing/mocks.h"
+
+inline ::testing::AssertionResult SolidVerticesNear(
+    std::vector<impeller::SolidFillVertexShader::PerVertexData> a,
+    std::vector<impeller::SolidFillVertexShader::PerVertexData> b) {
+  if (a.size() != b.size()) {
+    return ::testing::AssertionFailure() << "Colors length does not match";
+  }
+  for (auto i = 0u; i < b.size(); i++) {
+    if (!PointNear(a[i].position, b[i].position)) {
+      return ::testing::AssertionFailure() << "Positions are not equal.";
+    }
+  }
+  return ::testing::AssertionSuccess();
+}
+
+inline ::testing::AssertionResult TextureVerticesNear(
+    std::vector<impeller::TextureFillVertexShader::PerVertexData> a,
+    std::vector<impeller::TextureFillVertexShader::PerVertexData> b) {
+  if (a.size() != b.size()) {
+    return ::testing::AssertionFailure() << "Colors length does not match";
+  }
+  for (auto i = 0u; i < b.size(); i++) {
+    if (!PointNear(a[i].position, b[i].position)) {
+      return ::testing::AssertionFailure() << "Positions are not equal.";
+    }
+    if (!PointNear(a[i].texture_coords, b[i].texture_coords)) {
+      return ::testing::AssertionFailure() << "Texture coords are not equal.";
+    }
+  }
+  return ::testing::AssertionSuccess();
+}
+
+#define EXPECT_SOLID_VERTICES_NEAR(a, b) \
+  EXPECT_PRED2(&::SolidVerticesNear, a, b)
+#define EXPECT_TEXTURE_VERTICES_NEAR(a, b) \
+  EXPECT_PRED2(&::TextureVerticesNear, a, b)
+
+namespace impeller {
+
+class ImpellerEntityUnitTestAccessor {
+ public:
+  static std::vector<SolidFillVertexShader::PerVertexData>
+  GenerateSolidStrokeVertices(const Path::Polyline& polyline,
+                              Scalar stroke_width,
+                              Scalar miter_limit,
+                              Join stroke_join,
+                              Cap stroke_cap,
+                              Scalar scale) {
+    return StrokePathGeometry::GenerateSolidStrokeVertices(
+        polyline, stroke_width, miter_limit, stroke_join, stroke_cap, scale);
+  }
+
+  static std::vector<TextureFillVertexShader::PerVertexData>
+  GenerateSolidStrokeVerticesUV(const Path::Polyline& polyline,
+                                Scalar stroke_width,
+                                Scalar miter_limit,
+                                Join stroke_join,
+                                Cap stroke_cap,
+                                Scalar scale,
+                                Point texture_origin,
+                                Size texture_size,
+                                const Matrix& effect_transform) {
+    return StrokePathGeometry::GenerateSolidStrokeVerticesUV(
+        polyline, stroke_width, miter_limit, stroke_join, stroke_cap, scale,
+        texture_origin, texture_size, effect_transform);
+  }
+};
+
+namespace testing {
+
+TEST(EntityGeometryTest, RectGeometryCoversArea) {
+  auto geometry = Geometry::MakeRect(Rect::MakeLTRB(0, 0, 100, 100));
+  ASSERT_TRUE(geometry->CoversArea({}, Rect::MakeLTRB(0, 0, 100, 100)));
+  ASSERT_FALSE(geometry->CoversArea({}, Rect::MakeLTRB(-1, 0, 100, 100)));
+  ASSERT_TRUE(geometry->CoversArea({}, Rect::MakeLTRB(1, 1, 100, 100)));
+  ASSERT_TRUE(geometry->CoversArea({}, Rect()));
+}
+
+TEST(EntityGeometryTest, FillPathGeometryCoversArea) {
+  auto path = PathBuilder{}.AddRect(Rect::MakeLTRB(0, 0, 100, 100)).TakePath();
+  auto geometry = Geometry::MakeFillPath(
+      path, /* inner rect */ Rect::MakeLTRB(0, 0, 100, 100));
+  ASSERT_TRUE(geometry->CoversArea({}, Rect::MakeLTRB(0, 0, 100, 100)));
+  ASSERT_FALSE(geometry->CoversArea({}, Rect::MakeLTRB(-1, 0, 100, 100)));
+  ASSERT_TRUE(geometry->CoversArea({}, Rect::MakeLTRB(1, 1, 100, 100)));
+  ASSERT_TRUE(geometry->CoversArea({}, Rect()));
+}
+
+TEST(EntityGeometryTest, FillPathGeometryCoversAreaNoInnerRect) {
+  auto path = PathBuilder{}.AddRect(Rect::MakeLTRB(0, 0, 100, 100)).TakePath();
+  auto geometry = Geometry::MakeFillPath(path);
+  ASSERT_FALSE(geometry->CoversArea({}, Rect::MakeLTRB(0, 0, 100, 100)));
+  ASSERT_FALSE(geometry->CoversArea({}, Rect::MakeLTRB(-1, 0, 100, 100)));
+  ASSERT_FALSE(geometry->CoversArea({}, Rect::MakeLTRB(1, 1, 100, 100)));
+  ASSERT_FALSE(geometry->CoversArea({}, Rect()));
+}
+
+TEST(EntityGeometryTest, LineGeometryCoverage) {
+  {
+    auto geometry = Geometry::MakeLine({10, 10}, {20, 10}, 2, Cap::kButt);
+    EXPECT_EQ(geometry->GetCoverage({}), Rect::MakeLTRB(10, 9, 20, 11));
+    EXPECT_TRUE(geometry->CoversArea({}, Rect::MakeLTRB(10, 9, 20, 11)));
+  }
+
+  {
+    auto geometry = Geometry::MakeLine({10, 10}, {20, 10}, 2, Cap::kSquare);
+    EXPECT_EQ(geometry->GetCoverage({}), Rect::MakeLTRB(9, 9, 21, 11));
+    EXPECT_TRUE(geometry->CoversArea({}, Rect::MakeLTRB(9, 9, 21, 11)));
+  }
+
+  {
+    auto geometry = Geometry::MakeLine({10, 10}, {10, 20}, 2, Cap::kButt);
+    EXPECT_EQ(geometry->GetCoverage({}), Rect::MakeLTRB(9, 10, 11, 20));
+    EXPECT_TRUE(geometry->CoversArea({}, Rect::MakeLTRB(9, 10, 11, 20)));
+  }
+
+  {
+    auto geometry = Geometry::MakeLine({10, 10}, {10, 20}, 2, Cap::kSquare);
+    EXPECT_EQ(geometry->GetCoverage({}), Rect::MakeLTRB(9, 9, 11, 21));
+    EXPECT_TRUE(geometry->CoversArea({}, Rect::MakeLTRB(9, 9, 11, 21)));
+  }
+}
+
+TEST(EntityGeometryTest, RoundRectGeometryCoversArea) {
+  auto geometry =
+      Geometry::MakeRoundRect(Rect::MakeLTRB(0, 0, 100, 100), Size(20, 20));
+  EXPECT_FALSE(geometry->CoversArea({}, Rect::MakeLTRB(15, 15, 85, 85)));
+  EXPECT_TRUE(geometry->CoversArea({}, Rect::MakeLTRB(20, 20, 80, 80)));
+  EXPECT_TRUE(geometry->CoversArea({}, Rect::MakeLTRB(30, 1, 70, 99)));
+  EXPECT_TRUE(geometry->CoversArea({}, Rect::MakeLTRB(1, 30, 99, 70)));
+}
+
+TEST(EntityGeometryTest, StrokePathGeometryTransformOfLine) {
+  auto path =
+      PathBuilder().AddLine(Point(100, 100), Point(200, 100)).TakePath();
+  auto points = std::make_unique<std::vector<Point>>();
+  auto polyline =
+      path.CreatePolyline(1.0f, std::move(points),
+                          [&points](Path::Polyline::PointBufferPtr reclaimed) {
+                            points = std::move(reclaimed);
+                          });
+
+  auto vertices = ImpellerEntityUnitTestAccessor::GenerateSolidStrokeVertices(
+      polyline, 10.0f, 10.0f, Join::kBevel, Cap::kButt, 1.0);
+
+  std::vector<SolidFillVertexShader::PerVertexData> expected = {
+      {.position = Point(100.0f, 105.0f)},  //
+      {.position = Point(100.0f, 95.0f)},   //
+      {.position = Point(100.0f, 105.0f)},  //
+      {.position = Point(100.0f, 95.0f)},   //
+      {.position = Point(200.0f, 105.0f)},  //
+      {.position = Point(200.0f, 95.0f)},   //
+      {.position = Point(200.0f, 105.0f)},  //
+      {.position = Point(200.0f, 95.0f)},   //
+  };
+
+  EXPECT_SOLID_VERTICES_NEAR(vertices, expected);
+
+  {
+    auto uv_vertices =
+        ImpellerEntityUnitTestAccessor::GenerateSolidStrokeVerticesUV(
+            polyline, 10.0f, 10.0f, Join::kBevel, Cap::kButt, 1.0,  //
+            Point(50.0f, 40.0f), Size(20.0f, 40.0f), Matrix());
+    // uvx = (x - 50) / 20
+    // uvy = (y - 40) / 40
+    auto uv = [](const Point& p) {
+      return Point((p.x - 50.0f) / 20.0f,  //
+                   (p.y - 40.0f) / 40.0f);
+    };
+    std::vector<TextureFillVertexShader::PerVertexData> uv_expected;
+    for (size_t i = 0; i < expected.size(); i++) {
+      auto p = expected[i].position;
+      uv_expected.push_back({.position = p, .texture_coords = uv(p)});
+    }
+
+    EXPECT_TEXTURE_VERTICES_NEAR(uv_vertices, uv_expected);
+  }
+
+  {
+    auto uv_vertices =
+        ImpellerEntityUnitTestAccessor::GenerateSolidStrokeVerticesUV(
+            polyline, 10.0f, 10.0f, Join::kBevel, Cap::kButt, 1.0,  //
+            Point(50.0f, 40.0f), Size(20.0f, 40.0f),
+            Matrix::MakeScale({8.0f, 4.0f, 1.0f}));
+    // uvx = ((x * 8) - 50) / 20
+    // uvy = ((y * 4) - 40) / 40
+    auto uv = [](const Point& p) {
+      return Point(((p.x * 8.0f) - 50.0f) / 20.0f,
+                   ((p.y * 4.0f) - 40.0f) / 40.0f);
+    };
+    std::vector<TextureFillVertexShader::PerVertexData> uv_expected;
+    for (size_t i = 0; i < expected.size(); i++) {
+      auto p = expected[i].position;
+      uv_expected.push_back({.position = p, .texture_coords = uv(p)});
+    }
+
+    EXPECT_TEXTURE_VERTICES_NEAR(uv_vertices, uv_expected);
+  }
+
+  {
+    auto uv_vertices =
+        ImpellerEntityUnitTestAccessor::GenerateSolidStrokeVerticesUV(
+            polyline, 10.0f, 10.0f, Join::kBevel, Cap::kButt, 1.0,  //
+            Point(50.0f, 40.0f), Size(20.0f, 40.0f),
+            Matrix::MakeTranslation({8.0f, 4.0f}));
+    // uvx = ((x + 8) - 50) / 20
+    // uvy = ((y + 4) - 40) / 40
+    auto uv = [](const Point& p) {
+      return Point(((p.x + 8.0f) - 50.0f) / 20.0f,
+                   ((p.y + 4.0f) - 40.0f) / 40.0f);
+    };
+    std::vector<TextureFillVertexShader::PerVertexData> uv_expected;
+    for (size_t i = 0; i < expected.size(); i++) {
+      auto p = expected[i].position;
+      uv_expected.push_back({.position = p, .texture_coords = uv(p)});
+    }
+
+    EXPECT_TEXTURE_VERTICES_NEAR(uv_vertices, uv_expected);
+  }
+}
+
+TEST(EntityGeometryTest, GeometryResultHasReasonableDefaults) {
+  GeometryResult result;
+  EXPECT_EQ(result.type, PrimitiveType::kTriangleStrip);
+  EXPECT_EQ(result.transform, Matrix());
+  EXPECT_EQ(result.mode, GeometryResult::Mode::kNormal);
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/entity/geometry/line_geometry.cc b/impeller/entity/geometry/line_geometry.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ea5f087fb5ad7c5e0582812b87dcf7ed1d1b77d5
--- /dev/null
+++ b/impeller/entity/geometry/line_geometry.cc
@@ -0,0 +1,191 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/entity/geometry/line_geometry.h"
+
+namespace impeller {
+
+LineGeometry::LineGeometry(Point p0, Point p1, Scalar width, Cap cap)
+    : p0_(p0), p1_(p1), width_(width), cap_(cap) {
+  FML_DCHECK(width >= 0);
+}
+
+Scalar LineGeometry::ComputePixelHalfWidth(const Matrix& transform,
+                                           Scalar width) {
+  auto determinant = transform.GetDeterminant();
+  if (determinant == 0) {
+    return 0.0f;
+  }
+
+  Scalar min_size = 1.0f / sqrt(std::abs(determinant));
+  return std::max(width, min_size) * 0.5f;
+}
+
+Vector2 LineGeometry::ComputeAlongVector(const Matrix& transform,
+                                         bool allow_zero_length) const {
+  Scalar stroke_half_width = ComputePixelHalfWidth(transform, width_);
+  if (stroke_half_width < kEhCloseEnough) {
+    return {};
+  }
+
+  auto along = p1_ - p0_;
+  Scalar length = along.GetLength();
+  if (length < kEhCloseEnough) {
+    if (!allow_zero_length) {
+      // We won't enclose any pixels unless the endpoints are extended
+      return {};
+    }
+    return {stroke_half_width, 0};
+  } else {
+    return along * stroke_half_width / length;
+  }
+}
+
+bool LineGeometry::ComputeCorners(Point corners[4],
+                                  const Matrix& transform,
+                                  bool extend_endpoints) const {
+  auto along = ComputeAlongVector(transform, extend_endpoints);
+  if (along.IsZero()) {
+    return false;
+  }
+
+  auto across = Vector2(along.y, -along.x);
+  corners[0] = p0_ - across;
+  corners[1] = p1_ - across;
+  corners[2] = p0_ + across;
+  corners[3] = p1_ + across;
+  if (extend_endpoints) {
+    corners[0] -= along;
+    corners[1] += along;
+    corners[2] -= along;
+    corners[3] += along;
+  }
+  return true;
+}
+
+GeometryResult LineGeometry::GetPositionBuffer(const ContentContext& renderer,
+                                               const Entity& entity,
+                                               RenderPass& pass) const {
+  using VT = SolidFillVertexShader::PerVertexData;
+
+  auto& transform = entity.GetTransform();
+  auto radius = ComputePixelHalfWidth(transform, width_);
+
+  if (cap_ == Cap::kRound) {
+    std::shared_ptr<Tessellator> tessellator = renderer.GetTessellator();
+    auto generator = tessellator->RoundCapLine(transform, p0_, p1_, radius);
+    return ComputePositionGeometry(renderer, generator, entity, pass);
+  }
+
+  Point corners[4];
+  if (!ComputeCorners(corners, transform, cap_ == Cap::kSquare)) {
+    return kEmptyResult;
+  }
+
+  auto& host_buffer = renderer.GetTransientsBuffer();
+
+  size_t count = 4;
+  BufferView vertex_buffer = host_buffer.Emplace(
+      count * sizeof(VT), alignof(VT), [&corners](uint8_t* buffer) {
+        auto vertices = reinterpret_cast<VT*>(buffer);
+        for (auto& corner : corners) {
+          *vertices++ = {
+              .position = corner,
+          };
+        }
+      });
+
+  return GeometryResult{
+      .type = PrimitiveType::kTriangleStrip,
+      .vertex_buffer =
+          {
+              .vertex_buffer = vertex_buffer,
+              .vertex_count = count,
+              .index_type = IndexType::kNone,
+          },
+      .transform = entity.GetShaderTransform(pass),
+  };
+}
+
+// |Geometry|
+GeometryResult LineGeometry::GetPositionUVBuffer(Rect texture_coverage,
+                                                 Matrix effect_transform,
+                                                 const ContentContext& renderer,
+                                                 const Entity& entity,
+                                                 RenderPass& pass) const {
+  auto& host_buffer = renderer.GetTransientsBuffer();
+  using VT = TextureFillVertexShader::PerVertexData;
+
+  auto& transform = entity.GetTransform();
+  auto radius = ComputePixelHalfWidth(transform, width_);
+
+  auto uv_transform =
+      texture_coverage.GetNormalizingTransform() * effect_transform;
+
+  if (cap_ == Cap::kRound) {
+    std::shared_ptr<Tessellator> tessellator = renderer.GetTessellator();
+    auto generator = tessellator->RoundCapLine(transform, p0_, p1_, radius);
+    return ComputePositionUVGeometry(renderer, generator, uv_transform, entity,
+                                     pass);
+  }
+
+  Point corners[4];
+  if (!ComputeCorners(corners, transform, cap_ == Cap::kSquare)) {
+    return kEmptyResult;
+  }
+
+  size_t count = 4;
+  BufferView vertex_buffer =
+      host_buffer.Emplace(count * sizeof(VT), alignof(VT),
+                          [&uv_transform, &corners](uint8_t* buffer) {
+                            auto vertices = reinterpret_cast<VT*>(buffer);
+                            for (auto& corner : corners) {
+                              *vertices++ = {
+                                  .position = corner,
+                                  .texture_coords = uv_transform * corner,
+                              };
+                            }
+                          });
+
+  return GeometryResult{
+      .type = PrimitiveType::kTriangleStrip,
+      .vertex_buffer =
+          {
+              .vertex_buffer = vertex_buffer,
+              .vertex_count = count,
+              .index_type = IndexType::kNone,
+          },
+      .transform = entity.GetShaderTransform(pass),
+  };
+}
+
+GeometryVertexType LineGeometry::GetVertexType() const {
+  return GeometryVertexType::kPosition;
+}
+
+std::optional<Rect> LineGeometry::GetCoverage(const Matrix& transform) const {
+  Point corners[4];
+  if (!ComputeCorners(corners, transform, cap_ != Cap::kButt)) {
+    return {};
+  }
+
+  for (int i = 0; i < 4; i++) {
+    corners[i] = transform * corners[i];
+  }
+  return Rect::MakePointBounds(std::begin(corners), std::end(corners));
+}
+
+bool LineGeometry::CoversArea(const Matrix& transform, const Rect& rect) const {
+  if (!transform.IsTranslationScaleOnly() || !IsAxisAlignedRect()) {
+    return false;
+  }
+  auto coverage = GetCoverage(transform);
+  return coverage.has_value() ? coverage->Contains(rect) : false;
+}
+
+bool LineGeometry::IsAxisAlignedRect() const {
+  return cap_ != Cap::kRound && (p0_.x == p1_.x || p0_.y == p1_.y);
+}
+
+}  // namespace impeller
diff --git a/impeller/entity/geometry/line_geometry.h b/impeller/entity/geometry/line_geometry.h
new file mode 100644
index 0000000000000000000000000000000000000000..58032074ed5d96e9a8ea9bc367e3104c3c692dff
--- /dev/null
+++ b/impeller/entity/geometry/line_geometry.h
@@ -0,0 +1,81 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_ENTITY_GEOMETRY_LINE_GEOMETRY_H_
+#define FLUTTER_IMPELLER_ENTITY_GEOMETRY_LINE_GEOMETRY_H_
+
+#include <type_traits>
+#include "impeller/entity/geometry/geometry.h"
+
+namespace impeller {
+
+class LineGeometry final : public Geometry {
+ public:
+  explicit LineGeometry(Point p0, Point p1, Scalar width, Cap cap);
+
+  ~LineGeometry() = default;
+
+  static Scalar ComputePixelHalfWidth(const Matrix& transform, Scalar width);
+
+  // |Geometry|
+  bool CoversArea(const Matrix& transform, const Rect& rect) const override;
+
+  // |Geometry|
+  bool IsAxisAlignedRect() const override;
+
+ private:
+  // Computes the 4 corners of a rectangle that defines the line and
+  // possibly extended endpoints which will be rendered under the given
+  // transform, and returns true if such a rectangle is defined.
+  //
+  // The coordinates will be generated in the original coordinate system
+  // of the line end points and the transform will only be used to determine
+  // the minimum line width.
+  //
+  // For kButt and kSquare end caps the ends should always be exteded as
+  // per that decoration, but for kRound caps the ends might be extended
+  // if the goal is to get a conservative bounds and might not be extended
+  // if the calling code is planning to draw the round caps on the ends.
+  //
+  // @return true if the transform and width were not degenerate
+  bool ComputeCorners(Point corners[4],
+                      const Matrix& transform,
+                      bool extend_endpoints) const;
+
+  Vector2 ComputeAlongVector(const Matrix& transform,
+                             bool allow_zero_length) const;
+
+  // |Geometry|
+  GeometryResult GetPositionBuffer(const ContentContext& renderer,
+                                   const Entity& entity,
+                                   RenderPass& pass) const override;
+
+  // |Geometry|
+  GeometryVertexType GetVertexType() const override;
+
+  // |Geometry|
+  std::optional<Rect> GetCoverage(const Matrix& transform) const override;
+
+  // |Geometry|
+  GeometryResult GetPositionUVBuffer(Rect texture_coverage,
+                                     Matrix effect_transform,
+                                     const ContentContext& renderer,
+                                     const Entity& entity,
+                                     RenderPass& pass) const override;
+
+  Point p0_;
+  Point p1_;
+  Scalar width_;
+  Cap cap_;
+
+  LineGeometry(const LineGeometry&) = delete;
+
+  LineGeometry& operator=(const LineGeometry&) = delete;
+};
+
+static_assert(std::is_trivially_destructible<LineGeometry>::value);
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_GEOMETRY_LINE_GEOMETRY_H_
diff --git a/impeller/entity/geometry/point_field_geometry.cc b/impeller/entity/geometry/point_field_geometry.cc
new file mode 100644
index 0000000000000000000000000000000000000000..3aabb901765692914999e6ab7ad67dcf88223c58
--- /dev/null
+++ b/impeller/entity/geometry/point_field_geometry.cc
@@ -0,0 +1,291 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/entity/geometry/point_field_geometry.h"
+
+#include "impeller/geometry/color.h"
+#include "impeller/renderer/command_buffer.h"
+
+namespace impeller {
+
+PointFieldGeometry::PointFieldGeometry(std::vector<Point> points,
+                                       Scalar radius,
+                                       bool round)
+    : points_(std::move(points)), radius_(radius), round_(round) {}
+
+GeometryResult PointFieldGeometry::GetPositionBuffer(
+    const ContentContext& renderer,
+    const Entity& entity,
+    RenderPass& pass) const {
+  if (renderer.GetDeviceCapabilities().SupportsCompute()) {
+    return GetPositionBufferGPU(renderer, entity, pass);
+  }
+  auto vtx_builder = GetPositionBufferCPU(renderer, entity, pass);
+  if (!vtx_builder.has_value()) {
+    return {};
+  }
+
+  auto& host_buffer = renderer.GetTransientsBuffer();
+  return {
+      .type = PrimitiveType::kTriangleStrip,
+      .vertex_buffer = vtx_builder->CreateVertexBuffer(host_buffer),
+      .transform = entity.GetShaderTransform(pass),
+  };
+}
+
+GeometryResult PointFieldGeometry::GetPositionUVBuffer(
+    Rect texture_coverage,
+    Matrix effect_transform,
+    const ContentContext& renderer,
+    const Entity& entity,
+    RenderPass& pass) const {
+  if (renderer.GetDeviceCapabilities().SupportsCompute()) {
+    return GetPositionBufferGPU(renderer, entity, pass, texture_coverage,
+                                effect_transform);
+  }
+
+  auto vtx_builder = GetPositionBufferCPU(renderer, entity, pass);
+  if (!vtx_builder.has_value()) {
+    return {};
+  }
+  auto uv_vtx_builder =
+      ComputeUVGeometryCPU(vtx_builder.value(), {0, 0},
+                           texture_coverage.GetSize(), effect_transform);
+
+  auto& host_buffer = renderer.GetTransientsBuffer();
+  return {
+      .type = PrimitiveType::kTriangleStrip,
+      .vertex_buffer = uv_vtx_builder.CreateVertexBuffer(host_buffer),
+      .transform = entity.GetShaderTransform(pass),
+  };
+}
+
+std::optional<VertexBufferBuilder<SolidFillVertexShader::PerVertexData>>
+PointFieldGeometry::GetPositionBufferCPU(const ContentContext& renderer,
+                                         const Entity& entity,
+                                         RenderPass& pass) const {
+  if (radius_ < 0.0) {
+    return std::nullopt;
+  }
+  auto transform = entity.GetTransform();
+  auto determinant = transform.GetDeterminant();
+  if (determinant == 0) {
+    return std::nullopt;
+  }
+
+  Scalar min_size = 1.0f / sqrt(std::abs(determinant));
+  Scalar radius = std::max(radius_, min_size);
+
+  VertexBufferBuilder<SolidFillVertexShader::PerVertexData> vtx_builder;
+
+  if (round_) {
+    // Get triangulation relative to {0, 0} so we can translate it to each
+    // point in turn.
+    auto generator =
+        renderer.GetTessellator()->FilledCircle(transform, {}, radius);
+    FML_DCHECK(generator.GetTriangleType() == PrimitiveType::kTriangleStrip);
+    std::vector<Point> circle_vertices;
+    circle_vertices.reserve(generator.GetVertexCount());
+    generator.GenerateVertices([&circle_vertices](const Point& p) {  //
+      circle_vertices.push_back(p);
+    });
+    FML_DCHECK(circle_vertices.size() == generator.GetVertexCount());
+
+    vtx_builder.Reserve((circle_vertices.size() + 2) * points_.size() - 2);
+    for (auto& center : points_) {
+      if (vtx_builder.HasVertices()) {
+        vtx_builder.AppendVertex(vtx_builder.Last());
+        vtx_builder.AppendVertex({center + circle_vertices[0]});
+      }
+
+      for (auto& vertex : circle_vertices) {
+        vtx_builder.AppendVertex({center + vertex});
+      }
+    }
+  } else {
+    vtx_builder.Reserve(6 * points_.size() - 2);
+    for (auto& point : points_) {
+      auto first = Point(point.x - radius, point.y - radius);
+
+      if (vtx_builder.HasVertices()) {
+        vtx_builder.AppendVertex(vtx_builder.Last());
+        vtx_builder.AppendVertex({first});
+      }
+
+      // Z pattern from UL -> UR -> LL -> LR
+      vtx_builder.AppendVertex({first});
+      vtx_builder.AppendVertex({{point.x + radius, point.y - radius}});
+      vtx_builder.AppendVertex({{point.x - radius, point.y + radius}});
+      vtx_builder.AppendVertex({{point.x + radius, point.y + radius}});
+    }
+  }
+
+  return vtx_builder;
+}
+
+GeometryResult PointFieldGeometry::GetPositionBufferGPU(
+    const ContentContext& renderer,
+    const Entity& entity,
+    RenderPass& pass,
+    std::optional<Rect> texture_coverage,
+    std::optional<Matrix> effect_transform) const {
+  FML_DCHECK(renderer.GetDeviceCapabilities().SupportsCompute());
+  if (radius_ < 0.0) {
+    return {};
+  }
+  Scalar determinant = entity.GetTransform().GetDeterminant();
+  if (determinant == 0) {
+    return {};
+  }
+
+  Scalar min_size = 1.0f / sqrt(std::abs(determinant));
+  Scalar radius = std::max(radius_, min_size);
+
+  size_t vertices_per_geom = ComputeCircleDivisions(
+      entity.GetTransform().GetMaxBasisLength() * radius, round_);
+
+  size_t points_per_circle = 3 + (vertices_per_geom - 3) * 3;
+  size_t total = points_per_circle * points_.size();
+
+  std::shared_ptr<CommandBuffer> cmd_buffer =
+      renderer.GetContext()->CreateCommandBuffer();
+  std::shared_ptr<ComputePass> compute_pass = cmd_buffer->CreateComputePass();
+  HostBuffer& host_buffer = renderer.GetTransientsBuffer();
+
+  BufferView points_data =
+      host_buffer.Emplace(points_.data(), points_.size() * sizeof(Point),
+                          DefaultUniformAlignment());
+
+  BufferView geometry_buffer =
+      host_buffer.Emplace(nullptr, total * sizeof(Point),
+                          std::max(DefaultUniformAlignment(), alignof(Point)));
+
+  BufferView output;
+  {
+    using PS = PointsComputeShader;
+
+    compute_pass->SetPipeline(renderer.GetPointComputePipeline());
+    compute_pass->SetCommandLabel("Points Geometry");
+
+    PS::FrameInfo frame_info;
+    frame_info.count = points_.size();
+    frame_info.radius = round_ ? radius : radius * kSqrt2;
+    frame_info.radian_start = round_ ? 0.0f : kPiOver4;
+    frame_info.radian_step = k2Pi / vertices_per_geom;
+    frame_info.points_per_circle = points_per_circle;
+    frame_info.divisions_per_circle = vertices_per_geom;
+
+    PS::BindFrameInfo(*compute_pass, host_buffer.EmplaceUniform(frame_info));
+    PS::BindGeometryData(*compute_pass, geometry_buffer);
+    PS::BindPointData(*compute_pass, points_data);
+
+    if (!compute_pass->Compute(ISize(total, 1)).ok()) {
+      return {};
+    }
+    output = geometry_buffer;
+  }
+
+  if (texture_coverage.has_value() && effect_transform.has_value()) {
+    BufferView geometry_uv_buffer = host_buffer.Emplace(
+        nullptr, total * sizeof(Vector4),
+        std::max(DefaultUniformAlignment(), alignof(Vector4)));
+
+    using UV = UvComputeShader;
+
+    compute_pass->AddBufferMemoryBarrier();
+    compute_pass->SetCommandLabel("UV Geometry");
+    compute_pass->SetPipeline(renderer.GetUvComputePipeline());
+
+    UV::FrameInfo frame_info;
+    frame_info.count = total;
+    frame_info.effect_transform = effect_transform.value();
+    frame_info.texture_origin = {0, 0};
+    frame_info.texture_size = Vector2(texture_coverage.value().GetSize());
+
+    UV::BindFrameInfo(*compute_pass, host_buffer.EmplaceUniform(frame_info));
+    UV::BindGeometryData(*compute_pass, geometry_buffer);
+    UV::BindGeometryUVData(*compute_pass, geometry_uv_buffer);
+
+    if (!compute_pass->Compute(ISize(total, 1)).ok()) {
+      return {};
+    }
+    output = geometry_uv_buffer;
+  }
+
+  if (!compute_pass->EncodeCommands()) {
+    return {};
+  }
+  if (!renderer.GetContext()
+           ->GetCommandQueue()
+           ->Submit({std::move(cmd_buffer)})
+           .ok()) {
+    return {};
+  }
+
+  return {
+      .type = PrimitiveType::kTriangle,
+      .vertex_buffer = {.vertex_buffer = std::move(output),
+                        .vertex_count = total,
+                        .index_type = IndexType::kNone},
+      .transform = entity.GetShaderTransform(pass),
+  };
+}
+
+/// @brief Compute the number of vertices to divide each circle into.
+///
+/// @return the number of vertices.
+size_t PointFieldGeometry::ComputeCircleDivisions(Scalar scaled_radius,
+                                                  bool round) {
+  if (!round) {
+    return 4;
+  }
+
+  // Note: these values are approximated based on the values returned from
+  // the decomposition of 4 cubics performed by Path::CreatePolyline.
+  if (scaled_radius < 1.0) {
+    return 4;
+  }
+  if (scaled_radius < 2.0) {
+    return 8;
+  }
+  if (scaled_radius < 12.0) {
+    return 24;
+  }
+  if (scaled_radius < 22.0) {
+    return 34;
+  }
+  return std::min(scaled_radius, 140.0f);
+}
+
+// |Geometry|
+GeometryVertexType PointFieldGeometry::GetVertexType() const {
+  return GeometryVertexType::kPosition;
+}
+
+// |Geometry|
+std::optional<Rect> PointFieldGeometry::GetCoverage(
+    const Matrix& transform) const {
+  if (points_.size() > 0) {
+    // Doesn't use MakePointBounds as this isn't resilient to points that
+    // all lie along the same axis.
+    auto first = points_.begin();
+    auto last = points_.end();
+    auto left = first->x;
+    auto top = first->y;
+    auto right = first->x;
+    auto bottom = first->y;
+    for (auto it = first + 1; it < last; ++it) {
+      left = std::min(left, it->x);
+      top = std::min(top, it->y);
+      right = std::max(right, it->x);
+      bottom = std::max(bottom, it->y);
+    }
+    auto coverage = Rect::MakeLTRB(left - radius_, top - radius_,
+                                   right + radius_, bottom + radius_);
+    return coverage.TransformBounds(transform);
+  }
+  return std::nullopt;
+}
+
+}  // namespace impeller
diff --git a/impeller/entity/geometry/point_field_geometry.h b/impeller/entity/geometry/point_field_geometry.h
new file mode 100644
index 0000000000000000000000000000000000000000..9d43f07cb9fbe602f0be554c34d622cbadba8b15
--- /dev/null
+++ b/impeller/entity/geometry/point_field_geometry.h
@@ -0,0 +1,62 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_ENTITY_GEOMETRY_POINT_FIELD_GEOMETRY_H_
+#define FLUTTER_IMPELLER_ENTITY_GEOMETRY_POINT_FIELD_GEOMETRY_H_
+
+#include "impeller/entity/geometry/geometry.h"
+
+namespace impeller {
+
+class PointFieldGeometry final : public Geometry {
+ public:
+  PointFieldGeometry(std::vector<Point> points, Scalar radius, bool round);
+
+  ~PointFieldGeometry() = default;
+
+  static size_t ComputeCircleDivisions(Scalar scaled_radius, bool round);
+
+ private:
+  // |Geometry|
+  GeometryResult GetPositionBuffer(const ContentContext& renderer,
+                                   const Entity& entity,
+                                   RenderPass& pass) const override;
+
+  // |Geometry|
+  GeometryResult GetPositionUVBuffer(Rect texture_coverage,
+                                     Matrix effect_transform,
+                                     const ContentContext& renderer,
+                                     const Entity& entity,
+                                     RenderPass& pass) const override;
+
+  // |Geometry|
+  GeometryVertexType GetVertexType() const override;
+
+  // |Geometry|
+  std::optional<Rect> GetCoverage(const Matrix& transform) const override;
+
+  GeometryResult GetPositionBufferGPU(
+      const ContentContext& renderer,
+      const Entity& entity,
+      RenderPass& pass,
+      std::optional<Rect> texture_coverage = std::nullopt,
+      std::optional<Matrix> effect_transform = std::nullopt) const;
+
+  std::optional<VertexBufferBuilder<SolidFillVertexShader::PerVertexData>>
+  GetPositionBufferCPU(const ContentContext& renderer,
+                       const Entity& entity,
+                       RenderPass& pass) const;
+
+  std::vector<Point> points_;
+  Scalar radius_;
+  bool round_;
+
+  PointFieldGeometry(const PointFieldGeometry&) = delete;
+
+  PointFieldGeometry& operator=(const PointFieldGeometry&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_GEOMETRY_POINT_FIELD_GEOMETRY_H_
diff --git a/impeller/entity/geometry/rect_geometry.cc b/impeller/entity/geometry/rect_geometry.cc
new file mode 100644
index 0000000000000000000000000000000000000000..6d72efb2f235a364e9d075ffaec1cbbf04396805
--- /dev/null
+++ b/impeller/entity/geometry/rect_geometry.cc
@@ -0,0 +1,58 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/entity/geometry/rect_geometry.h"
+
+namespace impeller {
+
+RectGeometry::RectGeometry(Rect rect) : rect_(rect) {}
+
+GeometryResult RectGeometry::GetPositionBuffer(const ContentContext& renderer,
+                                               const Entity& entity,
+                                               RenderPass& pass) const {
+  auto& host_buffer = renderer.GetTransientsBuffer();
+  return GeometryResult{
+      .type = PrimitiveType::kTriangleStrip,
+      .vertex_buffer =
+          {
+              .vertex_buffer = host_buffer.Emplace(
+                  rect_.GetPoints().data(), 8 * sizeof(float), alignof(float)),
+              .vertex_count = 4,
+              .index_type = IndexType::kNone,
+          },
+      .transform = entity.GetShaderTransform(pass),
+  };
+}
+
+// |Geometry|
+GeometryResult RectGeometry::GetPositionUVBuffer(Rect texture_coverage,
+                                                 Matrix effect_transform,
+                                                 const ContentContext& renderer,
+                                                 const Entity& entity,
+                                                 RenderPass& pass) const {
+  return ComputeUVGeometryForRect(rect_, texture_coverage, effect_transform,
+                                  renderer, entity, pass);
+}
+
+GeometryVertexType RectGeometry::GetVertexType() const {
+  return GeometryVertexType::kPosition;
+}
+
+std::optional<Rect> RectGeometry::GetCoverage(const Matrix& transform) const {
+  return rect_.TransformBounds(transform);
+}
+
+bool RectGeometry::CoversArea(const Matrix& transform, const Rect& rect) const {
+  if (!transform.IsTranslationScaleOnly()) {
+    return false;
+  }
+  Rect coverage = rect_.TransformBounds(transform);
+  return coverage.Contains(rect);
+}
+
+bool RectGeometry::IsAxisAlignedRect() const {
+  return true;
+}
+
+}  // namespace impeller
diff --git a/impeller/entity/geometry/rect_geometry.h b/impeller/entity/geometry/rect_geometry.h
new file mode 100644
index 0000000000000000000000000000000000000000..bed8c23d6c419995a46a667f59a4a5bb9ed2125f
--- /dev/null
+++ b/impeller/entity/geometry/rect_geometry.h
@@ -0,0 +1,54 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_ENTITY_GEOMETRY_RECT_GEOMETRY_H_
+#define FLUTTER_IMPELLER_ENTITY_GEOMETRY_RECT_GEOMETRY_H_
+
+#include "impeller/entity/geometry/geometry.h"
+
+namespace impeller {
+
+class RectGeometry final : public Geometry {
+ public:
+  explicit RectGeometry(Rect rect);
+
+  ~RectGeometry() = default;
+
+  // |Geometry|
+  bool CoversArea(const Matrix& transform, const Rect& rect) const override;
+
+  // |Geometry|
+  bool IsAxisAlignedRect() const override;
+
+  // |Geometry|
+  GeometryResult GetPositionBuffer(const ContentContext& renderer,
+                                   const Entity& entity,
+                                   RenderPass& pass) const override;
+
+  // |Geometry|
+  GeometryVertexType GetVertexType() const override;
+
+  // |Geometry|
+  std::optional<Rect> GetCoverage(const Matrix& transform) const override;
+
+  // |Geometry|
+  GeometryResult GetPositionUVBuffer(Rect texture_coverage,
+                                     Matrix effect_transform,
+                                     const ContentContext& renderer,
+                                     const Entity& entity,
+                                     RenderPass& pass) const override;
+
+ private:
+  Rect rect_;
+
+  RectGeometry(const RectGeometry&) = delete;
+
+  RectGeometry& operator=(const RectGeometry&) = delete;
+};
+
+static_assert(std::is_trivially_destructible<RectGeometry>::value);
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_GEOMETRY_RECT_GEOMETRY_H_
diff --git a/impeller/entity/geometry/round_rect_geometry.cc b/impeller/entity/geometry/round_rect_geometry.cc
new file mode 100644
index 0000000000000000000000000000000000000000..edcf12074afe6e7055fe8a520689b507826028a4
--- /dev/null
+++ b/impeller/entity/geometry/round_rect_geometry.cc
@@ -0,0 +1,83 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/impeller/entity/geometry/round_rect_geometry.h"
+
+namespace impeller {
+
+RoundRectGeometry::RoundRectGeometry(const Rect& bounds, const Size& radii)
+    : bounds_(bounds), radii_(radii) {}
+
+GeometryResult RoundRectGeometry::GetPositionBuffer(
+    const ContentContext& renderer,
+    const Entity& entity,
+    RenderPass& pass) const {
+  return ComputePositionGeometry(renderer,
+                                 renderer.GetTessellator()->FilledRoundRect(
+                                     entity.GetTransform(), bounds_, radii_),
+                                 entity, pass);
+}
+
+// |Geometry|
+GeometryResult RoundRectGeometry::GetPositionUVBuffer(
+    Rect texture_coverage,
+    Matrix effect_transform,
+    const ContentContext& renderer,
+    const Entity& entity,
+    RenderPass& pass) const {
+  return ComputePositionUVGeometry(
+      renderer,
+      renderer.GetTessellator()->FilledRoundRect(entity.GetTransform(), bounds_,
+                                                 radii_),
+      texture_coverage.GetNormalizingTransform() * effect_transform, entity,
+      pass);
+}
+
+GeometryVertexType RoundRectGeometry::GetVertexType() const {
+  return GeometryVertexType::kPosition;
+}
+
+std::optional<Rect> RoundRectGeometry::GetCoverage(
+    const Matrix& transform) const {
+  return bounds_.TransformBounds(transform);
+}
+
+bool RoundRectGeometry::CoversArea(const Matrix& transform,
+                                   const Rect& rect) const {
+  if (!transform.IsTranslationScaleOnly()) {
+    return false;
+  }
+  bool flat_on_tb = bounds_.GetWidth() > radii_.width * 2;
+  bool flat_on_lr = bounds_.GetHeight() > radii_.height * 2;
+  if (!flat_on_tb && !flat_on_lr) {
+    return false;
+  }
+  // We either transform the bounds and delta-transform the radii,
+  // or we compute the vertical and horizontal bounds and then
+  // transform each. Either way there are 2 transform operations.
+  // We could also get a weaker answer by computing just the
+  // "inner rect" and only doing a coverage analysis on that,
+  // but this process will produce more culling results.
+  if (flat_on_tb) {
+    Rect vertical_bounds = bounds_.Expand(Size{-radii_.width, 0});
+    Rect coverage = vertical_bounds.TransformBounds(transform);
+    if (coverage.Contains(rect)) {
+      return true;
+    }
+  }
+  if (flat_on_lr) {
+    Rect horizontal_bounds = bounds_.Expand(Size{0, -radii_.height});
+    Rect coverage = horizontal_bounds.TransformBounds(transform);
+    if (coverage.Contains(rect)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+bool RoundRectGeometry::IsAxisAlignedRect() const {
+  return false;
+}
+
+}  // namespace impeller
diff --git a/impeller/entity/geometry/round_rect_geometry.h b/impeller/entity/geometry/round_rect_geometry.h
new file mode 100644
index 0000000000000000000000000000000000000000..78f0523a20f1f17b86c21f3d83b00fbdee943d23
--- /dev/null
+++ b/impeller/entity/geometry/round_rect_geometry.h
@@ -0,0 +1,57 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_ENTITY_GEOMETRY_ROUND_RECT_GEOMETRY_H_
+#define FLUTTER_IMPELLER_ENTITY_GEOMETRY_ROUND_RECT_GEOMETRY_H_
+
+#include "impeller/entity/geometry/geometry.h"
+
+namespace impeller {
+
+// Geometry class that can generate vertices (with or without texture
+// coordinates) for filled ellipses. Generating vertices for a stroked
+// ellipse would require a lot more work since the line width must be
+// applied perpendicular to the distorted ellipse shape.
+class RoundRectGeometry final : public Geometry {
+ public:
+  explicit RoundRectGeometry(const Rect& bounds, const Size& radii);
+
+  ~RoundRectGeometry() = default;
+
+  // |Geometry|
+  bool CoversArea(const Matrix& transform, const Rect& rect) const override;
+
+  // |Geometry|
+  bool IsAxisAlignedRect() const override;
+
+ private:
+  // |Geometry|
+  GeometryResult GetPositionBuffer(const ContentContext& renderer,
+                                   const Entity& entity,
+                                   RenderPass& pass) const override;
+
+  // |Geometry|
+  GeometryVertexType GetVertexType() const override;
+
+  // |Geometry|
+  std::optional<Rect> GetCoverage(const Matrix& transform) const override;
+
+  // |Geometry|
+  GeometryResult GetPositionUVBuffer(Rect texture_coverage,
+                                     Matrix effect_transform,
+                                     const ContentContext& renderer,
+                                     const Entity& entity,
+                                     RenderPass& pass) const override;
+
+  const Rect bounds_;
+  const Size radii_;
+
+  RoundRectGeometry(const RoundRectGeometry&) = delete;
+
+  RoundRectGeometry& operator=(const RoundRectGeometry&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_GEOMETRY_ROUND_RECT_GEOMETRY_H_
diff --git a/impeller/entity/geometry/stroke_path_geometry.cc b/impeller/entity/geometry/stroke_path_geometry.cc
new file mode 100644
index 0000000000000000000000000000000000000000..49f8ee92d0a071d3bbf9c0fdde3af3b3e1dbc4fe
--- /dev/null
+++ b/impeller/entity/geometry/stroke_path_geometry.cc
@@ -0,0 +1,699 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/entity/geometry/stroke_path_geometry.h"
+
+#include "impeller/core/buffer_view.h"
+#include "impeller/core/formats.h"
+#include "impeller/entity/geometry/geometry.h"
+#include "impeller/entity/texture_fill.vert.h"
+#include "impeller/geometry/path_builder.h"
+#include "impeller/geometry/path_component.h"
+
+namespace impeller {
+using VS = SolidFillVertexShader;
+
+namespace {
+
+template <typename VertexWriter>
+using CapProc = std::function<void(VertexWriter& vtx_builder,
+                                   const Point& position,
+                                   const Point& offset,
+                                   Scalar scale,
+                                   bool reverse)>;
+
+template <typename VertexWriter>
+using JoinProc = std::function<void(VertexWriter& vtx_builder,
+                                    const Point& position,
+                                    const Point& start_offset,
+                                    const Point& end_offset,
+                                    Scalar miter_limit,
+                                    Scalar scale)>;
+
+class PositionWriter {
+ public:
+  void AppendVertex(const Point& point) {
+    data_.emplace_back(SolidFillVertexShader::PerVertexData{.position = point});
+  }
+
+  const std::vector<SolidFillVertexShader::PerVertexData>& GetData() const {
+    return data_;
+  }
+
+ private:
+  std::vector<SolidFillVertexShader::PerVertexData> data_ = {};
+};
+
+class PositionUVWriter {
+ public:
+  PositionUVWriter(const Point& texture_origin,
+                   const Size& texture_size,
+                   const Matrix& effect_transform)
+      : texture_origin_(texture_origin),
+        texture_size_(texture_size),
+        effect_transform_(effect_transform) {}
+
+  const std::vector<TextureFillVertexShader::PerVertexData>& GetData() {
+    if (effect_transform_.IsIdentity()) {
+      auto origin = texture_origin_;
+      auto scale = 1.0 / texture_size_;
+
+      for (auto& pvd : data_) {
+        pvd.texture_coords = (pvd.position - origin) * scale;
+      }
+    } else {
+      auto texture_rect = Rect::MakeOriginSize(texture_origin_, texture_size_);
+      Matrix uv_transform =
+          texture_rect.GetNormalizingTransform() * effect_transform_;
+
+      for (auto& pvd : data_) {
+        pvd.texture_coords = uv_transform * pvd.position;
+      }
+    }
+    return data_;
+  }
+
+  void AppendVertex(const Point& point) {
+    data_.emplace_back(TextureFillVertexShader::PerVertexData{
+        .position = point,
+        // .texture_coords = default, will be filled in during |GetData()|
+    });
+  }
+
+ private:
+  std::vector<TextureFillVertexShader::PerVertexData> data_ = {};
+  const Point texture_origin_;
+  const Size texture_size_;
+  const Matrix effect_transform_;
+};
+
+template <typename VertexWriter>
+class StrokeGenerator {
+ public:
+  StrokeGenerator(const Path::Polyline& p_polyline,
+                  const Scalar p_stroke_width,
+                  const Scalar p_scaled_miter_limit,
+                  const JoinProc<VertexWriter>& p_join_proc,
+                  const CapProc<VertexWriter>& p_cap_proc,
+                  const Scalar p_scale)
+      : polyline(p_polyline),
+        stroke_width(p_stroke_width),
+        scaled_miter_limit(p_scaled_miter_limit),
+        join_proc(p_join_proc),
+        cap_proc(p_cap_proc),
+        scale(p_scale) {}
+
+  void Generate(VertexWriter& vtx_builder) {
+    for (size_t contour_i = 0; contour_i < polyline.contours.size();
+         contour_i++) {
+      const Path::PolylineContour& contour = polyline.contours[contour_i];
+      size_t contour_start_point_i, contour_end_point_i;
+      std::tie(contour_start_point_i, contour_end_point_i) =
+          polyline.GetContourPointBounds(contour_i);
+
+      auto contour_delta = contour_end_point_i - contour_start_point_i;
+      if (contour_delta == 1) {
+        Point p = polyline.GetPoint(contour_start_point_i);
+        cap_proc(vtx_builder, p, {-stroke_width * 0.5f, 0}, scale,
+                 /*reverse=*/false);
+        cap_proc(vtx_builder, p, {stroke_width * 0.5f, 0}, scale,
+                 /*reverse=*/false);
+        continue;
+      } else if (contour_delta == 0) {
+        continue;  // This contour has no renderable content.
+      }
+
+      previous_offset = offset;
+      offset = ComputeOffset(contour_start_point_i, contour_start_point_i,
+                             contour_end_point_i, contour);
+      const Point contour_first_offset = offset;
+
+      if (contour_i > 0) {
+        // This branch only executes when we've just finished drawing a contour
+        // and are switching to a new one.
+        // We're drawing a triangle strip, so we need to "pick up the pen" by
+        // appending two vertices at the end of the previous contour and two
+        // vertices at the start of the new contour (thus connecting the two
+        // contours with two zero volume triangles, which will be discarded by
+        // the rasterizer).
+        vtx.position = polyline.GetPoint(contour_start_point_i - 1);
+        // Append two vertices when "picking up" the pen so that the triangle
+        // drawn when moving to the beginning of the new contour will have zero
+        // volume.
+        vtx_builder.AppendVertex(vtx.position);
+        vtx_builder.AppendVertex(vtx.position);
+
+        vtx.position = polyline.GetPoint(contour_start_point_i);
+        // Append two vertices at the beginning of the new contour, which
+        // appends  two triangles of zero area.
+        vtx_builder.AppendVertex(vtx.position);
+        vtx_builder.AppendVertex(vtx.position);
+      }
+
+      // Generate start cap.
+      if (!polyline.contours[contour_i].is_closed) {
+        Point cap_offset =
+            Vector2(-contour.start_direction.y, contour.start_direction.x) *
+            stroke_width * 0.5f;  // Counterclockwise normal
+        cap_proc(vtx_builder, polyline.GetPoint(contour_start_point_i),
+                 cap_offset, scale, /*reverse=*/true);
+      }
+
+      for (size_t contour_component_i = 0;
+           contour_component_i < contour.components.size();
+           contour_component_i++) {
+        const Path::PolylineContour::Component& component =
+            contour.components[contour_component_i];
+        bool is_last_component =
+            contour_component_i == contour.components.size() - 1;
+
+        size_t component_start_index = component.component_start_index;
+        size_t component_end_index =
+            is_last_component ? contour_end_point_i - 1
+                              : contour.components[contour_component_i + 1]
+                                    .component_start_index;
+        if (component.is_curve) {
+          AddVerticesForCurveComponent(
+              vtx_builder, component_start_index, component_end_index,
+              contour_start_point_i, contour_end_point_i, contour);
+        } else {
+          AddVerticesForLinearComponent(
+              vtx_builder, component_start_index, component_end_index,
+              contour_start_point_i, contour_end_point_i, contour);
+        }
+      }
+
+      // Generate end cap or join.
+      if (!contour.is_closed) {
+        auto cap_offset =
+            Vector2(-contour.end_direction.y, contour.end_direction.x) *
+            stroke_width * 0.5f;  // Clockwise normal
+        cap_proc(vtx_builder, polyline.GetPoint(contour_end_point_i - 1),
+                 cap_offset, scale, /*reverse=*/false);
+      } else {
+        join_proc(vtx_builder, polyline.GetPoint(contour_start_point_i), offset,
+                  contour_first_offset, scaled_miter_limit, scale);
+      }
+    }
+  }
+
+  /// Computes offset by calculating the direction from point_i - 1 to point_i
+  /// if point_i is within `contour_start_point_i` and `contour_end_point_i`;
+  /// Otherwise, it uses direction from contour.
+  Point ComputeOffset(const size_t point_i,
+                      const size_t contour_start_point_i,
+                      const size_t contour_end_point_i,
+                      const Path::PolylineContour& contour) const {
+    Point direction;
+    if (point_i >= contour_end_point_i) {
+      direction = contour.end_direction;
+    } else if (point_i <= contour_start_point_i) {
+      direction = -contour.start_direction;
+    } else {
+      direction = (polyline.GetPoint(point_i) - polyline.GetPoint(point_i - 1))
+                      .Normalize();
+    }
+    return Vector2{-direction.y, direction.x} * stroke_width * 0.5f;
+  }
+
+  void AddVerticesForLinearComponent(VertexWriter& vtx_builder,
+                                     const size_t component_start_index,
+                                     const size_t component_end_index,
+                                     const size_t contour_start_point_i,
+                                     const size_t contour_end_point_i,
+                                     const Path::PolylineContour& contour) {
+    bool is_last_component = component_start_index ==
+                             contour.components.back().component_start_index;
+
+    for (size_t point_i = component_start_index; point_i < component_end_index;
+         point_i++) {
+      bool is_end_of_component = point_i == component_end_index - 1;
+      vtx.position = polyline.GetPoint(point_i) + offset;
+      vtx_builder.AppendVertex(vtx.position);
+      vtx.position = polyline.GetPoint(point_i) - offset;
+      vtx_builder.AppendVertex(vtx.position);
+
+      // For line components, two additional points need to be appended
+      // prior to appending a join connecting the next component.
+      vtx.position = polyline.GetPoint(point_i + 1) + offset;
+      vtx_builder.AppendVertex(vtx.position);
+      vtx.position = polyline.GetPoint(point_i + 1) - offset;
+      vtx_builder.AppendVertex(vtx.position);
+
+      previous_offset = offset;
+      offset = ComputeOffset(point_i + 2, contour_start_point_i,
+                             contour_end_point_i, contour);
+      if (!is_last_component && is_end_of_component) {
+        // Generate join from the current line to the next line.
+        join_proc(vtx_builder, polyline.GetPoint(point_i + 1), previous_offset,
+                  offset, scaled_miter_limit, scale);
+      }
+    }
+  }
+
+  void AddVerticesForCurveComponent(VertexWriter& vtx_builder,
+                                    const size_t component_start_index,
+                                    const size_t component_end_index,
+                                    const size_t contour_start_point_i,
+                                    const size_t contour_end_point_i,
+                                    const Path::PolylineContour& contour) {
+    bool is_last_component = component_start_index ==
+                             contour.components.back().component_start_index;
+
+    for (size_t point_i = component_start_index; point_i < component_end_index;
+         point_i++) {
+      bool is_end_of_component = point_i == component_end_index - 1;
+
+      vtx.position = polyline.GetPoint(point_i) + offset;
+      vtx_builder.AppendVertex(vtx.position);
+      vtx.position = polyline.GetPoint(point_i) - offset;
+      vtx_builder.AppendVertex(vtx.position);
+
+      previous_offset = offset;
+      offset = ComputeOffset(point_i + 2, contour_start_point_i,
+                             contour_end_point_i, contour);
+      // For curve components, the polyline is detailed enough such that
+      // it can avoid worrying about joins altogether.
+      if (is_end_of_component) {
+        vtx.position = polyline.GetPoint(point_i + 1) + offset;
+        vtx_builder.AppendVertex(vtx.position);
+        vtx.position = polyline.GetPoint(point_i + 1) - offset;
+        vtx_builder.AppendVertex(vtx.position);
+        // Generate join from the current line to the next line.
+        if (!is_last_component) {
+          join_proc(vtx_builder, polyline.GetPoint(point_i + 1),
+                    previous_offset, offset, scaled_miter_limit, scale);
+        }
+      }
+    }
+  }
+
+  const Path::Polyline& polyline;
+  const Scalar stroke_width;
+  const Scalar scaled_miter_limit;
+  const JoinProc<VertexWriter>& join_proc;
+  const CapProc<VertexWriter>& cap_proc;
+  const Scalar scale;
+
+  Point previous_offset;
+  Point offset;
+  SolidFillVertexShader::PerVertexData vtx;
+};
+
+template <typename VertexWriter>
+void CreateButtCap(VertexWriter& vtx_builder,
+                   const Point& position,
+                   const Point& offset,
+                   Scalar scale,
+                   bool reverse) {
+  Point orientation = offset * (reverse ? -1 : 1);
+  VS::PerVertexData vtx;
+  vtx.position = position + orientation;
+  vtx_builder.AppendVertex(vtx.position);
+  vtx.position = position - orientation;
+  vtx_builder.AppendVertex(vtx.position);
+}
+
+template <typename VertexWriter>
+void CreateRoundCap(VertexWriter& vtx_builder,
+                    const Point& position,
+                    const Point& offset,
+                    Scalar scale,
+                    bool reverse) {
+  Point orientation = offset * (reverse ? -1 : 1);
+  Point forward(offset.y, -offset.x);
+  Point forward_normal = forward.Normalize();
+
+  CubicPathComponent arc;
+  if (reverse) {
+    arc = CubicPathComponent(
+        forward, forward + orientation * PathBuilder::kArcApproximationMagic,
+        orientation + forward * PathBuilder::kArcApproximationMagic,
+        orientation);
+  } else {
+    arc = CubicPathComponent(
+        orientation,
+        orientation + forward * PathBuilder::kArcApproximationMagic,
+        forward + orientation * PathBuilder::kArcApproximationMagic, forward);
+  }
+
+  Point vtx = position + orientation;
+  vtx_builder.AppendVertex(vtx);
+  vtx = position - orientation;
+  vtx_builder.AppendVertex(vtx);
+
+  arc.ToLinearPathComponents(scale, [&vtx_builder, &vtx, forward_normal,
+                                     position](const Point& point) {
+    vtx = position + point;
+    vtx_builder.AppendVertex(vtx);
+    vtx = position + (-point).Reflect(forward_normal);
+    vtx_builder.AppendVertex(vtx);
+  });
+}
+
+template <typename VertexWriter>
+void CreateSquareCap(VertexWriter& vtx_builder,
+                     const Point& position,
+                     const Point& offset,
+                     Scalar scale,
+                     bool reverse) {
+  Point orientation = offset * (reverse ? -1 : 1);
+  Point forward(offset.y, -offset.x);
+
+  Point vtx = position + orientation;
+  vtx_builder.AppendVertex(vtx);
+  vtx = position - orientation;
+  vtx_builder.AppendVertex(vtx);
+  vtx = position + orientation + forward;
+  vtx_builder.AppendVertex(vtx);
+  vtx = position - orientation + forward;
+  vtx_builder.AppendVertex(vtx);
+}
+
+template <typename VertexWriter>
+Scalar CreateBevelAndGetDirection(VertexWriter& vtx_builder,
+                                  const Point& position,
+                                  const Point& start_offset,
+                                  const Point& end_offset) {
+  Point vtx = position;
+  vtx_builder.AppendVertex(vtx);
+
+  Scalar dir = start_offset.Cross(end_offset) > 0 ? -1 : 1;
+  vtx = position + start_offset * dir;
+  vtx_builder.AppendVertex(vtx);
+  vtx = position + end_offset * dir;
+  vtx_builder.AppendVertex(vtx);
+
+  return dir;
+}
+
+template <typename VertexWriter>
+void CreateMiterJoin(VertexWriter& vtx_builder,
+                     const Point& position,
+                     const Point& start_offset,
+                     const Point& end_offset,
+                     Scalar miter_limit,
+                     Scalar scale) {
+  Point start_normal = start_offset.Normalize();
+  Point end_normal = end_offset.Normalize();
+
+  // 1 for no joint (straight line), 0 for max joint (180 degrees).
+  Scalar alignment = (start_normal.Dot(end_normal) + 1) / 2;
+  if (ScalarNearlyEqual(alignment, 1)) {
+    return;
+  }
+
+  Scalar direction = CreateBevelAndGetDirection(vtx_builder, position,
+                                                start_offset, end_offset);
+
+  Point miter_point = (((start_offset + end_offset) / 2) / alignment);
+  if (miter_point.GetDistanceSquared({0, 0}) > miter_limit * miter_limit) {
+    return;  // Convert to bevel when we exceed the miter limit.
+  }
+
+  // Outer miter point.
+  VS::PerVertexData vtx;
+  vtx.position = position + miter_point * direction;
+  vtx_builder.AppendVertex(vtx.position);
+}
+
+template <typename VertexWriter>
+void CreateRoundJoin(VertexWriter& vtx_builder,
+                     const Point& position,
+                     const Point& start_offset,
+                     const Point& end_offset,
+                     Scalar miter_limit,
+                     Scalar scale) {
+  Point start_normal = start_offset.Normalize();
+  Point end_normal = end_offset.Normalize();
+
+  // 0 for no joint (straight line), 1 for max joint (180 degrees).
+  Scalar alignment = 1 - (start_normal.Dot(end_normal) + 1) / 2;
+  if (ScalarNearlyEqual(alignment, 0)) {
+    return;
+  }
+
+  Scalar direction = CreateBevelAndGetDirection(vtx_builder, position,
+                                                start_offset, end_offset);
+
+  Point middle =
+      (start_offset + end_offset).Normalize() * start_offset.GetLength();
+  Point middle_normal = middle.Normalize();
+
+  Point middle_handle = middle + Point(-middle.y, middle.x) *
+                                     PathBuilder::kArcApproximationMagic *
+                                     alignment * direction;
+  Point start_handle = start_offset + Point(start_offset.y, -start_offset.x) *
+                                          PathBuilder::kArcApproximationMagic *
+                                          alignment * direction;
+
+  VS::PerVertexData vtx;
+  CubicPathComponent(start_offset, start_handle, middle_handle, middle)
+      .ToLinearPathComponents(scale, [&vtx_builder, direction, &vtx, position,
+                                      middle_normal](const Point& point) {
+        vtx.position = position + point * direction;
+        vtx_builder.AppendVertex(vtx.position);
+        vtx.position = position + (-point * direction).Reflect(middle_normal);
+        vtx_builder.AppendVertex(vtx.position);
+      });
+}
+
+template <typename VertexWriter>
+void CreateBevelJoin(VertexWriter& vtx_builder,
+                     const Point& position,
+                     const Point& start_offset,
+                     const Point& end_offset,
+                     Scalar miter_limit,
+                     Scalar scale) {
+  CreateBevelAndGetDirection(vtx_builder, position, start_offset, end_offset);
+}
+
+template <typename VertexWriter>
+void CreateSolidStrokeVertices(VertexWriter& vtx_builder,
+                               const Path::Polyline& polyline,
+                               Scalar stroke_width,
+                               Scalar scaled_miter_limit,
+                               const JoinProc<VertexWriter>& join_proc,
+                               const CapProc<VertexWriter>& cap_proc,
+                               Scalar scale) {
+  StrokeGenerator stroke_generator(polyline, stroke_width, scaled_miter_limit,
+                                   join_proc, cap_proc, scale);
+  stroke_generator.Generate(vtx_builder);
+}
+
+// static
+template <typename VertexWriter>
+JoinProc<VertexWriter> GetJoinProc(Join stroke_join) {
+  switch (stroke_join) {
+    case Join::kBevel:
+      return &CreateBevelJoin<VertexWriter>;
+    case Join::kMiter:
+      return &CreateMiterJoin<VertexWriter>;
+    case Join::kRound:
+      return &CreateRoundJoin<VertexWriter>;
+  }
+}
+
+template <typename VertexWriter>
+CapProc<VertexWriter> GetCapProc(Cap stroke_cap) {
+  switch (stroke_cap) {
+    case Cap::kButt:
+      return &CreateButtCap<VertexWriter>;
+    case Cap::kRound:
+      return &CreateRoundCap<VertexWriter>;
+    case Cap::kSquare:
+      return &CreateSquareCap<VertexWriter>;
+  }
+}
+}  // namespace
+
+std::vector<SolidFillVertexShader::PerVertexData>
+StrokePathGeometry::GenerateSolidStrokeVertices(const Path::Polyline& polyline,
+                                                Scalar stroke_width,
+                                                Scalar miter_limit,
+                                                Join stroke_join,
+                                                Cap stroke_cap,
+                                                Scalar scale) {
+  auto scaled_miter_limit = stroke_width * miter_limit * 0.5f;
+  auto join_proc = GetJoinProc<PositionWriter>(stroke_join);
+  auto cap_proc = GetCapProc<PositionWriter>(stroke_cap);
+  StrokeGenerator stroke_generator(polyline, stroke_width, scaled_miter_limit,
+                                   join_proc, cap_proc, scale);
+  PositionWriter vtx_builder;
+  stroke_generator.Generate(vtx_builder);
+  return vtx_builder.GetData();
+}
+
+std::vector<TextureFillVertexShader::PerVertexData>
+StrokePathGeometry::GenerateSolidStrokeVerticesUV(
+    const Path::Polyline& polyline,
+    Scalar stroke_width,
+    Scalar miter_limit,
+    Join stroke_join,
+    Cap stroke_cap,
+    Scalar scale,
+    Point texture_origin,
+    Size texture_size,
+    const Matrix& effect_transform) {
+  auto scaled_miter_limit = stroke_width * miter_limit * 0.5f;
+  auto join_proc = GetJoinProc<PositionUVWriter>(stroke_join);
+  auto cap_proc = GetCapProc<PositionUVWriter>(stroke_cap);
+  StrokeGenerator stroke_generator(polyline, stroke_width, scaled_miter_limit,
+                                   join_proc, cap_proc, scale);
+  PositionUVWriter vtx_builder(texture_origin, texture_size, effect_transform);
+  stroke_generator.Generate(vtx_builder);
+  return vtx_builder.GetData();
+}
+
+StrokePathGeometry::StrokePathGeometry(const Path& path,
+                                       Scalar stroke_width,
+                                       Scalar miter_limit,
+                                       Cap stroke_cap,
+                                       Join stroke_join)
+    : path_(path),
+      stroke_width_(stroke_width),
+      miter_limit_(miter_limit),
+      stroke_cap_(stroke_cap),
+      stroke_join_(stroke_join) {}
+
+StrokePathGeometry::~StrokePathGeometry() = default;
+
+Scalar StrokePathGeometry::GetStrokeWidth() const {
+  return stroke_width_;
+}
+
+Scalar StrokePathGeometry::GetMiterLimit() const {
+  return miter_limit_;
+}
+
+Cap StrokePathGeometry::GetStrokeCap() const {
+  return stroke_cap_;
+}
+
+Join StrokePathGeometry::GetStrokeJoin() const {
+  return stroke_join_;
+}
+
+GeometryResult StrokePathGeometry::GetPositionBuffer(
+    const ContentContext& renderer,
+    const Entity& entity,
+    RenderPass& pass) const {
+  if (stroke_width_ < 0.0) {
+    return {};
+  }
+  auto determinant = entity.GetTransform().GetDeterminant();
+  if (determinant == 0) {
+    return {};
+  }
+
+  Scalar min_size = 1.0f / sqrt(std::abs(determinant));
+  Scalar stroke_width = std::max(stroke_width_, min_size);
+
+  auto& host_buffer = renderer.GetTransientsBuffer();
+  auto scale = entity.GetTransform().GetMaxBasisLength();
+
+  PositionWriter position_writer;
+  auto polyline = renderer.GetTessellator()->CreateTempPolyline(path_, scale);
+  CreateSolidStrokeVertices(position_writer, polyline, stroke_width,
+                            miter_limit_ * stroke_width_ * 0.5f,
+                            GetJoinProc<PositionWriter>(stroke_join_),
+                            GetCapProc<PositionWriter>(stroke_cap_), scale);
+
+  BufferView buffer_view =
+      host_buffer.Emplace(position_writer.GetData().data(),
+                          position_writer.GetData().size() *
+                              sizeof(SolidFillVertexShader::PerVertexData),
+                          alignof(SolidFillVertexShader::PerVertexData));
+
+  return GeometryResult{
+      .type = PrimitiveType::kTriangleStrip,
+      .vertex_buffer =
+          {
+              .vertex_buffer = buffer_view,
+              .vertex_count = position_writer.GetData().size(),
+              .index_type = IndexType::kNone,
+          },
+      .transform = entity.GetShaderTransform(pass),
+      .mode = GeometryResult::Mode::kPreventOverdraw,
+  };
+}
+
+GeometryResult StrokePathGeometry::GetPositionUVBuffer(
+    Rect texture_coverage,
+    Matrix effect_transform,
+    const ContentContext& renderer,
+    const Entity& entity,
+    RenderPass& pass) const {
+  if (stroke_width_ < 0.0) {
+    return {};
+  }
+  auto determinant = entity.GetTransform().GetDeterminant();
+  if (determinant == 0) {
+    return {};
+  }
+
+  Scalar min_size = 1.0f / sqrt(std::abs(determinant));
+  Scalar stroke_width = std::max(stroke_width_, min_size);
+
+  auto& host_buffer = renderer.GetTransientsBuffer();
+  auto scale = entity.GetTransform().GetMaxBasisLength();
+  auto polyline = renderer.GetTessellator()->CreateTempPolyline(path_, scale);
+
+  PositionUVWriter writer(Point{0, 0}, texture_coverage.GetSize(),
+                          effect_transform);
+  CreateSolidStrokeVertices(writer, polyline, stroke_width,
+                            miter_limit_ * stroke_width_ * 0.5f,
+                            GetJoinProc<PositionUVWriter>(stroke_join_),
+                            GetCapProc<PositionUVWriter>(stroke_cap_), scale);
+
+  BufferView buffer_view = host_buffer.Emplace(
+      writer.GetData().data(),
+      writer.GetData().size() * sizeof(TextureFillVertexShader::PerVertexData),
+      alignof(TextureFillVertexShader::PerVertexData));
+
+  return GeometryResult{
+      .type = PrimitiveType::kTriangleStrip,
+      .vertex_buffer =
+          {
+              .vertex_buffer = buffer_view,
+              .vertex_count = writer.GetData().size(),
+              .index_type = IndexType::kNone,
+          },
+      .transform = entity.GetShaderTransform(pass),
+      .mode = GeometryResult::Mode::kPreventOverdraw,
+  };
+}
+
+GeometryResult::Mode StrokePathGeometry::GetResultMode() const {
+  return GeometryResult::Mode::kPreventOverdraw;
+}
+
+GeometryVertexType StrokePathGeometry::GetVertexType() const {
+  return GeometryVertexType::kPosition;
+}
+
+std::optional<Rect> StrokePathGeometry::GetCoverage(
+    const Matrix& transform) const {
+  auto path_bounds = path_.GetBoundingBox();
+  if (!path_bounds.has_value()) {
+    return std::nullopt;
+  }
+
+  Scalar max_radius = 0.5;
+  if (stroke_cap_ == Cap::kSquare) {
+    max_radius = max_radius * kSqrt2;
+  }
+  if (stroke_join_ == Join::kMiter) {
+    max_radius = std::max(max_radius, miter_limit_ * 0.5f);
+  }
+  Scalar determinant = transform.GetDeterminant();
+  if (determinant == 0) {
+    return std::nullopt;
+  }
+  Scalar min_size = 1.0f / sqrt(std::abs(determinant));
+  max_radius *= std::max(stroke_width_, min_size);
+  return path_bounds->Expand(max_radius).TransformBounds(transform);
+}
+
+}  // namespace impeller
diff --git a/impeller/entity/geometry/stroke_path_geometry.h b/impeller/entity/geometry/stroke_path_geometry.h
new file mode 100644
index 0000000000000000000000000000000000000000..254bcc0a03e0e14a59babc2a9780b432f9226d94
--- /dev/null
+++ b/impeller/entity/geometry/stroke_path_geometry.h
@@ -0,0 +1,91 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_ENTITY_GEOMETRY_STROKE_PATH_GEOMETRY_H_
+#define FLUTTER_IMPELLER_ENTITY_GEOMETRY_STROKE_PATH_GEOMETRY_H_
+
+#include "impeller/entity/geometry/geometry.h"
+
+namespace impeller {
+
+/// @brief A geometry that is created from a stroked path object.
+class StrokePathGeometry final : public Geometry {
+ public:
+  StrokePathGeometry(const Path& path,
+                     Scalar stroke_width,
+                     Scalar miter_limit,
+                     Cap stroke_cap,
+                     Join stroke_join);
+
+  ~StrokePathGeometry();
+
+  Scalar GetStrokeWidth() const;
+
+  Scalar GetMiterLimit() const;
+
+  Cap GetStrokeCap() const;
+
+  Join GetStrokeJoin() const;
+
+ private:
+  // |Geometry|
+  GeometryResult GetPositionBuffer(const ContentContext& renderer,
+                                   const Entity& entity,
+                                   RenderPass& pass) const override;
+
+  // |Geometry|
+  GeometryResult GetPositionUVBuffer(Rect texture_coverage,
+                                     Matrix effect_transform,
+                                     const ContentContext& renderer,
+                                     const Entity& entity,
+                                     RenderPass& pass) const override;
+
+  // |Geometry|
+  GeometryResult::Mode GetResultMode() const override;
+
+  // |Geometry|
+  GeometryVertexType GetVertexType() const override;
+
+  // |Geometry|
+  std::optional<Rect> GetCoverage(const Matrix& transform) const override;
+
+  // Private for benchmarking and debugging
+  static std::vector<SolidFillVertexShader::PerVertexData>
+  GenerateSolidStrokeVertices(const Path::Polyline& polyline,
+                              Scalar stroke_width,
+                              Scalar miter_limit,
+                              Join stroke_join,
+                              Cap stroke_cap,
+                              Scalar scale);
+
+  static std::vector<TextureFillVertexShader::PerVertexData>
+  GenerateSolidStrokeVerticesUV(const Path::Polyline& polyline,
+                                Scalar stroke_width,
+                                Scalar miter_limit,
+                                Join stroke_join,
+                                Cap stroke_cap,
+                                Scalar scale,
+                                Point texture_origin,
+                                Size texture_size,
+                                const Matrix& effect_transform);
+
+  friend class ImpellerBenchmarkAccessor;
+  friend class ImpellerEntityUnitTestAccessor;
+
+  bool SkipRendering() const;
+
+  Path path_;
+  Scalar stroke_width_;
+  Scalar miter_limit_;
+  Cap stroke_cap_;
+  Join stroke_join_;
+
+  StrokePathGeometry(const StrokePathGeometry&) = delete;
+
+  StrokePathGeometry& operator=(const StrokePathGeometry&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_GEOMETRY_STROKE_PATH_GEOMETRY_H_
diff --git a/impeller/entity/geometry/vertices_geometry.cc b/impeller/entity/geometry/vertices_geometry.cc
new file mode 100644
index 0000000000000000000000000000000000000000..eedb7553b6ec93649209a911f95c40ac27a3d1d3
--- /dev/null
+++ b/impeller/entity/geometry/vertices_geometry.cc
@@ -0,0 +1,262 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/entity/geometry/vertices_geometry.h"
+
+#include <cstdint>
+#include <utility>
+
+#include "impeller/core/buffer_view.h"
+
+namespace impeller {
+
+// Fan mode isn't natively supported. Unroll into triangle mode by
+// manipulating the index array.
+//
+// In Triangle fan, the first vertex is shared across all triangles, and then
+// each sliding window of two vertices plus that first vertex defines a
+// triangle.
+static std::vector<uint16_t> fromFanIndices(
+    const std::vector<Point>& vertices,
+    const std::vector<uint16_t>& indices) {
+  std::vector<uint16_t> unrolled_indices;
+
+  // Un-fan index buffer if provided.
+  if (indices.size() > 0u) {
+    if (indices.size() < 3u) {
+      return {};
+    }
+
+    auto center_point = indices[0];
+    for (auto i = 1u; i < indices.size() - 1; i++) {
+      unrolled_indices.push_back(center_point);
+      unrolled_indices.push_back(indices[i]);
+      unrolled_indices.push_back(indices[i + 1]);
+    }
+  } else {
+    if (vertices.size() < 3u) {
+      return {};
+    }
+
+    // If indices were not provided, create an index buffer that unfans
+    // triangles instead of re-writing points, colors, et cetera.
+    for (auto i = 1u; i < vertices.size() - 1; i++) {
+      unrolled_indices.push_back(0);
+      unrolled_indices.push_back(i);
+      unrolled_indices.push_back(i + 1);
+    }
+  }
+  return unrolled_indices;
+}
+
+/////// Vertices Geometry ///////
+
+VerticesGeometry::VerticesGeometry(std::vector<Point> vertices,
+                                   std::vector<uint16_t> indices,
+                                   std::vector<Point> texture_coordinates,
+                                   std::vector<Color> colors,
+                                   Rect bounds,
+                                   VertexMode vertex_mode)
+    : vertices_(std::move(vertices)),
+      colors_(std::move(colors)),
+      texture_coordinates_(std::move(texture_coordinates)),
+      indices_(std::move(indices)),
+      bounds_(bounds),
+      vertex_mode_(vertex_mode) {
+  NormalizeIndices();
+}
+
+PrimitiveType VerticesGeometry::GetPrimitiveType() const {
+  switch (vertex_mode_) {
+    case VerticesGeometry::VertexMode::kTriangleFan:
+      // Unrolled into triangle mode.
+      return PrimitiveType::kTriangle;
+    case VerticesGeometry::VertexMode::kTriangleStrip:
+      return PrimitiveType::kTriangleStrip;
+    case VerticesGeometry::VertexMode::kTriangles:
+      return PrimitiveType::kTriangle;
+  }
+}
+
+void VerticesGeometry::NormalizeIndices() {
+  // Convert triangle fan if present.
+  if (vertex_mode_ == VerticesGeometry::VertexMode::kTriangleFan) {
+    indices_ = fromFanIndices(vertices_, indices_);
+    return;
+  }
+}
+
+bool VerticesGeometry::HasVertexColors() const {
+  return colors_.size() > 0;
+}
+
+bool VerticesGeometry::HasTextureCoordinates() const {
+  return texture_coordinates_.size() > 0;
+}
+
+std::optional<Rect> VerticesGeometry::GetTextureCoordinateCoverge() const {
+  if (!HasTextureCoordinates()) {
+    return std::nullopt;
+  }
+  auto vertex_count = vertices_.size();
+  if (vertex_count == 0) {
+    return std::nullopt;
+  }
+
+  return Rect::MakePointBounds(texture_coordinates_.begin(),
+                               texture_coordinates_.end());
+}
+
+GeometryResult VerticesGeometry::GetPositionBuffer(
+    const ContentContext& renderer,
+    const Entity& entity,
+    RenderPass& pass) const {
+  auto index_count = indices_.size();
+  auto vertex_count = vertices_.size();
+
+  size_t total_vtx_bytes = vertex_count * sizeof(float) * 2;
+  size_t total_idx_bytes = index_count * sizeof(uint16_t);
+
+  auto vertex_buffer = renderer.GetTransientsBuffer().Emplace(
+      reinterpret_cast<const uint8_t*>(vertices_.data()), total_vtx_bytes,
+      alignof(float));
+
+  BufferView index_buffer = {};
+  if (index_count) {
+    index_buffer = renderer.GetTransientsBuffer().Emplace(
+        indices_.data(), total_idx_bytes, alignof(uint16_t));
+  }
+
+  return GeometryResult{
+      .type = GetPrimitiveType(),
+      .vertex_buffer =
+          {
+              .vertex_buffer = vertex_buffer,
+              .index_buffer = index_buffer,
+              .vertex_count = index_count > 0 ? index_count : vertex_count,
+              .index_type =
+                  index_count > 0 ? IndexType::k16bit : IndexType::kNone,
+          },
+      .transform = entity.GetShaderTransform(pass),
+  };
+}
+
+GeometryResult VerticesGeometry::GetPositionColorBuffer(
+    const ContentContext& renderer,
+    const Entity& entity,
+    RenderPass& pass) {
+  using VS = GeometryColorPipeline::VertexShader;
+
+  auto index_count = indices_.size();
+  auto vertex_count = vertices_.size();
+  size_t total_vtx_bytes = vertex_count * sizeof(VS::PerVertexData);
+  size_t total_idx_bytes = index_count * sizeof(uint16_t);
+
+  auto vertex_buffer = renderer.GetTransientsBuffer().Emplace(
+      total_vtx_bytes, alignof(VS::PerVertexData), [&](uint8_t* data) {
+        VS::PerVertexData* vtx_contents =
+            reinterpret_cast<VS::PerVertexData*>(data);
+        for (auto i = 0u; i < vertices_.size(); i++) {
+          VS::PerVertexData vertex_data = {
+              .position = vertices_[i],
+              .color = colors_[i],
+          };
+          std::memcpy(vtx_contents++, &vertex_data, sizeof(VS::PerVertexData));
+        }
+      });
+
+  BufferView index_buffer = {};
+  if (index_count > 0) {
+    index_buffer = renderer.GetTransientsBuffer().Emplace(
+        indices_.data(), total_idx_bytes, alignof(uint16_t));
+  }
+
+  return GeometryResult{
+      .type = GetPrimitiveType(),
+      .vertex_buffer =
+          {
+              .vertex_buffer = vertex_buffer,
+              .index_buffer = index_buffer,
+              .vertex_count = index_count > 0 ? index_count : vertex_count,
+              .index_type =
+                  index_count > 0 ? IndexType::k16bit : IndexType::kNone,
+          },
+      .transform = entity.GetShaderTransform(pass),
+  };
+}
+
+GeometryResult VerticesGeometry::GetPositionUVBuffer(
+    Rect texture_coverage,
+    Matrix effect_transform,
+    const ContentContext& renderer,
+    const Entity& entity,
+    RenderPass& pass) const {
+  using VS = TexturePipeline::VertexShader;
+
+  auto index_count = indices_.size();
+  auto vertex_count = vertices_.size();
+  auto uv_transform =
+      texture_coverage.GetNormalizingTransform() * effect_transform;
+  auto has_texture_coordinates = HasTextureCoordinates();
+
+  size_t total_vtx_bytes = vertices_.size() * sizeof(VS::PerVertexData);
+  size_t total_idx_bytes = index_count * sizeof(uint16_t);
+  auto vertex_buffer = renderer.GetTransientsBuffer().Emplace(
+      total_vtx_bytes, alignof(VS::PerVertexData), [&](uint8_t* data) {
+        VS::PerVertexData* vtx_contents =
+            reinterpret_cast<VS::PerVertexData*>(data);
+        for (auto i = 0u; i < vertices_.size(); i++) {
+          auto vertex = vertices_[i];
+          auto texture_coord =
+              has_texture_coordinates ? texture_coordinates_[i] : vertices_[i];
+          auto uv = uv_transform * texture_coord;
+          // From experimentation we need to clamp these values to < 1.0 or else
+          // there can be flickering.
+          VS::PerVertexData vertex_data = {
+              .position = vertex,
+              .texture_coords =
+                  Point(std::clamp(uv.x, 0.0f, 1.0f - kEhCloseEnough),
+                        std::clamp(uv.y, 0.0f, 1.0f - kEhCloseEnough)),
+          };
+          std::memcpy(vtx_contents++, &vertex_data, sizeof(VS::PerVertexData));
+        }
+      });
+
+  BufferView index_buffer = {};
+  if (index_count > 0) {
+    index_buffer = renderer.GetTransientsBuffer().Emplace(
+        indices_.data(), total_idx_bytes, alignof(uint16_t));
+  }
+
+  return GeometryResult{
+      .type = GetPrimitiveType(),
+      .vertex_buffer =
+          {
+              .vertex_buffer = vertex_buffer,
+              .index_buffer = index_buffer,
+              .vertex_count = index_count > 0 ? index_count : vertex_count,
+              .index_type =
+                  index_count > 0 ? IndexType::k16bit : IndexType::kNone,
+          },
+      .transform = entity.GetShaderTransform(pass),
+  };
+}
+
+GeometryVertexType VerticesGeometry::GetVertexType() const {
+  if (HasVertexColors()) {
+    return GeometryVertexType::kColor;
+  }
+  if (HasTextureCoordinates()) {
+    return GeometryVertexType::kUV;
+  }
+
+  return GeometryVertexType::kPosition;
+}
+
+std::optional<Rect> VerticesGeometry::GetCoverage(
+    const Matrix& transform) const {
+  return bounds_.TransformBounds(transform);
+}
+
+}  // namespace impeller
diff --git a/impeller/display_list/display_list_vertices_geometry.h b/impeller/entity/geometry/vertices_geometry.h
similarity index 35%
rename from impeller/display_list/display_list_vertices_geometry.h
rename to impeller/entity/geometry/vertices_geometry.h
index 510f496a3011092018ce27deb4918d505112c42a..8f4d2be485e6202fe960bd207c31990db416235c 100644
--- a/impeller/display_list/display_list_vertices_geometry.h
+++ b/impeller/entity/geometry/vertices_geometry.h
@@ -2,46 +2,46 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_GEOMETRY_VERTICES_GEOMETRY_H_
+#define FLUTTER_IMPELLER_ENTITY_GEOMETRY_VERTICES_GEOMETRY_H_
 
-#include <optional>
-#include <vector>
-
-#include "flutter/display_list/display_list_vertices.h"
-
-#include "impeller/entity/geometry.h"
-#include "impeller/geometry/color.h"
-#include "impeller/geometry/point.h"
-#include "impeller/geometry/rect.h"
+#include "impeller/entity/geometry/geometry.h"
 
 namespace impeller {
 
 /// @brief A geometry that is created from a vertices object.
-class DLVerticesGeometry : public VerticesGeometry {
+class VerticesGeometry final : public Geometry {
  public:
-  explicit DLVerticesGeometry(const flutter::DlVertices* vertices);
+  enum class VertexMode {
+    kTriangles,
+    kTriangleStrip,
+    kTriangleFan,
+  };
 
-  ~DLVerticesGeometry();
+  VerticesGeometry(std::vector<Point> vertices,
+                   std::vector<uint16_t> indices,
+                   std::vector<Point> texture_coordinates,
+                   std::vector<Color> colors,
+                   Rect bounds,
+                   VerticesGeometry::VertexMode vertex_mode);
 
-  static std::unique_ptr<VerticesGeometry> MakeVertices(
-      const flutter::DlVertices* vertices);
+  ~VerticesGeometry() = default;
 
-  // |VerticesGeometry|
   GeometryResult GetPositionColorBuffer(const ContentContext& renderer,
                                         const Entity& entity,
-                                        RenderPass& pass,
-                                        Color paint_color,
-                                        BlendMode blend_mode) override;
+                                        RenderPass& pass);
 
-  // |VerticesGeometry|
-  GeometryResult GetPositionUVBuffer(const ContentContext& renderer,
+  // |Geometry|
+  GeometryResult GetPositionUVBuffer(Rect texture_coverage,
+                                     Matrix effect_transform,
+                                     const ContentContext& renderer,
                                      const Entity& entity,
-                                     RenderPass& pass) override;
+                                     RenderPass& pass) const override;
 
   // |Geometry|
   GeometryResult GetPositionBuffer(const ContentContext& renderer,
                                    const Entity& entity,
-                                   RenderPass& pass) override;
+                                   RenderPass& pass) const override;
 
   // |Geometry|
   std::optional<Rect> GetCoverage(const Matrix& transform) const override;
@@ -49,13 +49,26 @@ class DLVerticesGeometry : public VerticesGeometry {
   // |Geometry|
   GeometryVertexType GetVertexType() const override;
 
+  bool HasVertexColors() const;
+
+  bool HasTextureCoordinates() const;
+
+  std::optional<Rect> GetTextureCoordinateCoverge() const;
+
  private:
   void NormalizeIndices();
 
-  const flutter::DlVertices* vertices_;
-  std::vector<uint16_t> normalized_indices_;
+  PrimitiveType GetPrimitiveType() const;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(DLVerticesGeometry);
+  std::vector<Point> vertices_;
+  std::vector<Color> colors_;
+  std::vector<Point> texture_coordinates_;
+  std::vector<uint16_t> indices_;
+  Rect bounds_;
+  VerticesGeometry::VertexMode vertex_mode_ =
+      VerticesGeometry::VertexMode::kTriangles;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_GEOMETRY_VERTICES_GEOMETRY_H_
diff --git a/impeller/entity/inline_pass_context.cc b/impeller/entity/inline_pass_context.cc
index 99a1877c95442993c4a207c3f5e98cf3ee3d8762..5bfe6dff79c45c8415ec4f8838c5bba85489c984 100644
--- a/impeller/entity/inline_pass_context.cc
+++ b/impeller/entity/inline_pass_context.cc
@@ -6,26 +6,40 @@
 
 #include <utility>
 
+#include "flutter/fml/status.h"
+#include "impeller/base/allocation.h"
 #include "impeller/base/validation.h"
+#include "impeller/core/formats.h"
+#include "impeller/entity/contents/content_context.h"
+#include "impeller/entity/entity_pass_target.h"
 #include "impeller/renderer/command_buffer.h"
-#include "impeller/renderer/formats.h"
-#include "impeller/renderer/texture_descriptor.h"
+#include "impeller/renderer/texture_mipmap.h"
 
 namespace impeller {
 
-InlinePassContext::InlinePassContext(std::shared_ptr<Context> context,
-                                     const RenderTarget& render_target,
-                                     uint32_t pass_texture_reads)
-    : context_(std::move(context)),
-      render_target_(render_target),
-      total_pass_reads_(pass_texture_reads) {}
+InlinePassContext::InlinePassContext(
+    const ContentContext& renderer,
+    EntityPassTarget& pass_target,
+    uint32_t pass_texture_reads,
+    uint32_t entity_count,
+    std::optional<RenderPassResult> collapsed_parent_pass)
+    : renderer_(renderer),
+      pass_target_(pass_target),
+      entity_count_(entity_count),
+      is_collapsed_(collapsed_parent_pass.has_value()) {
+  if (collapsed_parent_pass.has_value()) {
+    pass_ = collapsed_parent_pass.value().pass;
+  }
+}
 
 InlinePassContext::~InlinePassContext() {
-  EndPass();
+  if (!is_collapsed_) {
+    EndPass();
+  }
 }
 
 bool InlinePassContext::IsValid() const {
-  return !render_target_.GetColorAttachments().empty();
+  return pass_target_.IsValid();
 }
 
 bool InlinePassContext::IsActive() const {
@@ -36,19 +50,34 @@ std::shared_ptr<Texture> InlinePassContext::GetTexture() {
   if (!IsValid()) {
     return nullptr;
   }
-  return render_target_.GetRenderTargetTexture();
+  return pass_target_.GetRenderTarget().GetRenderTargetTexture();
 }
 
 bool InlinePassContext::EndPass() {
   if (!IsActive()) {
     return true;
   }
+  FML_DCHECK(command_buffer_);
 
   if (!pass_->EncodeCommands()) {
+    VALIDATION_LOG << "Failed to encode and submit command buffer while ending "
+                      "render pass.";
     return false;
   }
 
-  if (!command_buffer_->SubmitCommands()) {
+  const std::shared_ptr<Texture>& target_texture =
+      GetPassTarget().GetRenderTarget().GetRenderTargetTexture();
+  if (target_texture->GetMipCount() > 1) {
+    fml::Status mip_status = AddMipmapGeneration(
+        command_buffer_, renderer_.GetContext(), target_texture);
+    if (!mip_status.ok()) {
+      return false;
+    }
+  }
+  if (!renderer_.GetContext()
+           ->GetCommandQueue()
+           ->Submit({std::move(command_buffer_)})
+           .ok()) {
     return false;
   }
 
@@ -58,8 +87,8 @@ bool InlinePassContext::EndPass() {
   return true;
 }
 
-const RenderTarget& InlinePassContext::GetRenderTarget() const {
-  return render_target_;
+EntityPassTarget& InlinePassContext::GetPassTarget() const {
+  return pass_target_;
 }
 
 InlinePassContext::RenderPassResult InlinePassContext::GetRenderPass(
@@ -72,77 +101,107 @@ InlinePassContext::RenderPassResult InlinePassContext::GetRenderPass(
   /// time this method is called, but it'll also run if the pass has been
   /// previously ended via `EndPass`.
 
-  command_buffer_ = context_->CreateCommandBuffer();
+  command_buffer_ = renderer_.GetContext()->CreateCommandBuffer();
   if (!command_buffer_) {
     VALIDATION_LOG << "Could not create command buffer.";
     return {};
   }
 
-  if (render_target_.GetColorAttachments().empty()) {
+  if (pass_target_.GetRenderTarget().GetColorAttachments().empty()) {
     VALIDATION_LOG << "Color attachment unexpectedly missing from the "
                       "EntityPass render target.";
     return {};
   }
-  auto color0 = render_target_.GetColorAttachments().find(0)->second;
 
   command_buffer_->SetLabel(
       "EntityPass Command Buffer: Depth=" + std::to_string(pass_depth) +
       " Count=" + std::to_string(pass_count_));
 
   RenderPassResult result;
-
-  if (pass_count_ > 0 && color0.resolve_texture) {
-    result.backdrop_texture = color0.resolve_texture;
+  {
+    // If the pass target has a resolve texture, then we're using MSAA.
+    bool is_msaa = pass_target_.GetRenderTarget()
+                       .GetColorAttachments()
+                       .find(0)
+                       ->second.resolve_texture != nullptr;
+    if (pass_count_ > 0 && is_msaa) {
+      result.backdrop_texture =
+          pass_target_.Flip(*renderer_.GetContext()->GetResourceAllocator());
+      if (!result.backdrop_texture) {
+        VALIDATION_LOG << "Could not flip the EntityPass render target.";
+      }
+    }
   }
 
-  if (color0.resolve_texture) {
-    color0.load_action =
-        pass_count_ > 0 ? LoadAction::kDontCare : LoadAction::kClear;
-    color0.store_action = StoreAction::kMultisampleResolve;
+  // Find the color attachment a second time, since the target may have just
+  // flipped.
+  auto color0 =
+      pass_target_.GetRenderTarget().GetColorAttachments().find(0)->second;
+  bool is_msaa = color0.resolve_texture != nullptr;
+
+  if (pass_count_ > 0) {
+    // When MSAA is being used, we end up overriding the entire backdrop by
+    // drawing the previous pass texture, and so we don't have to clear it and
+    // can use kDontCare.
+    color0.load_action = is_msaa ? LoadAction::kDontCare : LoadAction::kLoad;
   } else {
     color0.load_action = LoadAction::kClear;
-    color0.store_action = StoreAction::kStore;
   }
 
-#ifndef IMPELLER_ENABLE_VULKAN
-  auto stencil = render_target_.GetStencilAttachment();
-  if (!stencil.has_value()) {
-    VALIDATION_LOG << "Stencil attachment unexpectedly missing from the "
+  color0.store_action =
+      is_msaa ? StoreAction::kMultisampleResolve : StoreAction::kStore;
+
+  if (ContentContext::kEnableStencilThenCover) {
+    auto depth = pass_target_.GetRenderTarget().GetDepthAttachment();
+    if (!depth.has_value()) {
+      VALIDATION_LOG << "Depth attachment unexpectedly missing from the "
+                        "EntityPass render target.";
+      return {};
+    }
+    depth->load_action = LoadAction::kClear;
+    depth->store_action = StoreAction::kDontCare;
+    pass_target_.target_.SetDepthAttachment(depth.value());
+  }
+
+  auto depth = pass_target_.GetRenderTarget().GetDepthAttachment();
+  auto stencil = pass_target_.GetRenderTarget().GetStencilAttachment();
+  if (!depth.has_value() || !stencil.has_value()) {
+    VALIDATION_LOG << "Stencil/Depth attachment unexpectedly missing from the "
                       "EntityPass render target.";
     return {};
   }
-
-  // Only clear the stencil if this is the very first pass of the
-  // layer.
-  stencil->load_action =
-      pass_count_ > 0 ? LoadAction::kLoad : LoadAction::kClear;
-  // If we're on the last pass of the layer, there's no need to store the
-  // stencil because nothing needs to read it.
-  stencil->store_action = pass_count_ == total_pass_reads_
-                              ? StoreAction::kDontCare
-                              : StoreAction::kStore;
-  render_target_.SetStencilAttachment(stencil.value());
-#else
-  // Touch this variable to avoid a compiler warnings.
-  // This will go away once stencil support is added for vulkan.
-  total_pass_reads_ = 1;
-#endif
-
-  render_target_.SetColorAttachment(color0, 0);
-
-  pass_ = command_buffer_->CreateRenderPass(render_target_);
+  stencil->load_action = LoadAction::kClear;
+  stencil->store_action = StoreAction::kDontCare;
+  depth->load_action = LoadAction::kClear;
+  depth->store_action = StoreAction::kDontCare;
+  pass_target_.target_.SetDepthAttachment(depth);
+  pass_target_.target_.SetStencilAttachment(stencil.value());
+  pass_target_.target_.SetColorAttachment(color0, 0);
+
+  pass_ = command_buffer_->CreateRenderPass(pass_target_.GetRenderTarget());
   if (!pass_) {
     VALIDATION_LOG << "Could not create render pass.";
     return {};
   }
-
+  // Commands are fairly large (500B) objects, so re-allocation of the command
+  // buffer while encoding can add a surprising amount of overhead. We make a
+  // conservative npot estimate to avoid this case.
+  pass_->ReserveCommands(Allocation::NextPowerOfTwoSize(entity_count_));
   pass_->SetLabel(
       "EntityPass Render Pass: Depth=" + std::to_string(pass_depth) +
       " Count=" + std::to_string(pass_count_));
 
-  ++pass_count_;
-
   result.pass = pass_;
+  result.just_created = true;
+
+  if (!renderer_.GetContext()->GetCapabilities()->SupportsReadFromResolve() &&
+      result.backdrop_texture ==
+          result.pass->GetRenderTarget().GetRenderTargetTexture()) {
+    VALIDATION_LOG << "EntityPass backdrop restore configuration is not valid "
+                      "for the current graphics backend.";
+  }
+
+  ++pass_count_;
   return result;
 }
 
diff --git a/impeller/entity/inline_pass_context.h b/impeller/entity/inline_pass_context.h
index ee393bda6c4b273334c583e680529f22851d8bae..93e69ff1737dff78b0f7ff9000fcde104a834f1f 100644
--- a/impeller/entity/inline_pass_context.h
+++ b/impeller/entity/inline_pass_context.h
@@ -2,44 +2,65 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_ENTITY_INLINE_PASS_CONTEXT_H_
+#define FLUTTER_IMPELLER_ENTITY_INLINE_PASS_CONTEXT_H_
 
+#include <cstdint>
+
+#include "impeller/entity/contents/content_context.h"
+#include "impeller/entity/entity_pass_target.h"
 #include "impeller/renderer/context.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/render_target.h"
 
 namespace impeller {
 
 class InlinePassContext {
  public:
   struct RenderPassResult {
+    bool just_created = false;
     std::shared_ptr<RenderPass> pass;
     std::shared_ptr<Texture> backdrop_texture;
   };
 
-  InlinePassContext(std::shared_ptr<Context> context,
-                    const RenderTarget& render_target,
-                    uint32_t pass_texture_reads);
+  InlinePassContext(
+      const ContentContext& renderer,
+      EntityPassTarget& pass_target,
+      uint32_t pass_texture_reads,
+      uint32_t entity_count,
+      std::optional<RenderPassResult> collapsed_parent_pass = std::nullopt);
+
   ~InlinePassContext();
 
   bool IsValid() const;
+
   bool IsActive() const;
+
   std::shared_ptr<Texture> GetTexture();
+
   bool EndPass();
-  const RenderTarget& GetRenderTarget() const;
+
+  EntityPassTarget& GetPassTarget() const;
+
   uint32_t GetPassCount() const;
 
   RenderPassResult GetRenderPass(uint32_t pass_depth);
 
  private:
-  std::shared_ptr<Context> context_;
-  RenderTarget render_target_;
+  const ContentContext& renderer_;
+  EntityPassTarget& pass_target_;
   std::shared_ptr<CommandBuffer> command_buffer_;
   std::shared_ptr<RenderPass> pass_;
   uint32_t pass_count_ = 0;
-  uint32_t total_pass_reads_ = 0;
+  uint32_t entity_count_ = 0;
+
+  // Whether this context is collapsed into a parent entity pass.
+  bool is_collapsed_ = false;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(InlinePassContext);
+  InlinePassContext(const InlinePassContext&) = delete;
+
+  InlinePassContext& operator=(const InlinePassContext&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_INLINE_PASS_CONTEXT_H_
diff --git a/impeller/entity/render_target_cache.cc b/impeller/entity/render_target_cache.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c96dc6a065accd2e1969d84f9613569b6adc800a
--- /dev/null
+++ b/impeller/entity/render_target_cache.cc
@@ -0,0 +1,133 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/entity/render_target_cache.h"
+#include "impeller/renderer/render_target.h"
+
+namespace impeller {
+
+RenderTargetCache::RenderTargetCache(std::shared_ptr<Allocator> allocator)
+    : RenderTargetAllocator(std::move(allocator)) {}
+
+void RenderTargetCache::Start() {
+  for (auto& td : render_target_data_) {
+    td.used_this_frame = false;
+  }
+}
+
+void RenderTargetCache::End() {
+  std::vector<RenderTargetData> retain;
+
+  for (const auto& td : render_target_data_) {
+    if (td.used_this_frame) {
+      retain.push_back(td);
+    }
+  }
+  render_target_data_.swap(retain);
+}
+
+RenderTarget RenderTargetCache::CreateOffscreen(
+    const Context& context,
+    ISize size,
+    int mip_count,
+    const std::string& label,
+    RenderTarget::AttachmentConfig color_attachment_config,
+    std::optional<RenderTarget::AttachmentConfig> stencil_attachment_config,
+    const std::shared_ptr<Texture>& existing_color_texture,
+    const std::shared_ptr<Texture>& existing_depth_stencil_texture) {
+  if (size.IsEmpty()) {
+    return {};
+  }
+
+  FML_DCHECK(existing_color_texture == nullptr &&
+             existing_depth_stencil_texture == nullptr);
+  auto config = RenderTargetConfig{
+      .size = size,
+      .mip_count = static_cast<size_t>(mip_count),
+      .has_msaa = false,
+      .has_depth_stencil = stencil_attachment_config.has_value(),
+  };
+  for (auto& render_target_data : render_target_data_) {
+    const auto other_config = render_target_data.config;
+    if (!render_target_data.used_this_frame && other_config == config) {
+      render_target_data.used_this_frame = true;
+      auto color0 = render_target_data.render_target.GetColorAttachments()
+                        .find(0u)
+                        ->second;
+      auto depth = render_target_data.render_target.GetDepthAttachment();
+      std::shared_ptr<Texture> depth_tex = depth ? depth->texture : nullptr;
+      return RenderTargetAllocator::CreateOffscreen(
+          context, size, mip_count, label, color_attachment_config,
+          stencil_attachment_config, color0.texture, depth_tex);
+    }
+  }
+  RenderTarget created_target = RenderTargetAllocator::CreateOffscreen(
+      context, size, mip_count, label, color_attachment_config,
+      stencil_attachment_config);
+  if (!created_target.IsValid()) {
+    return created_target;
+  }
+  render_target_data_.push_back(
+      RenderTargetData{.used_this_frame = true,
+                       .config = config,
+                       .render_target = created_target});
+  return created_target;
+}
+
+RenderTarget RenderTargetCache::CreateOffscreenMSAA(
+    const Context& context,
+    ISize size,
+    int mip_count,
+    const std::string& label,
+    RenderTarget::AttachmentConfigMSAA color_attachment_config,
+    std::optional<RenderTarget::AttachmentConfig> stencil_attachment_config,
+    const std::shared_ptr<Texture>& existing_color_msaa_texture,
+    const std::shared_ptr<Texture>& existing_color_resolve_texture,
+    const std::shared_ptr<Texture>& existing_depth_stencil_texture) {
+  if (size.IsEmpty()) {
+    return {};
+  }
+
+  FML_DCHECK(existing_color_msaa_texture == nullptr &&
+             existing_color_resolve_texture == nullptr &&
+             existing_depth_stencil_texture == nullptr);
+  auto config = RenderTargetConfig{
+      .size = size,
+      .mip_count = static_cast<size_t>(mip_count),
+      .has_msaa = true,
+      .has_depth_stencil = stencil_attachment_config.has_value(),
+  };
+  for (auto& render_target_data : render_target_data_) {
+    const auto other_config = render_target_data.config;
+    if (!render_target_data.used_this_frame && other_config == config) {
+      render_target_data.used_this_frame = true;
+      auto color0 = render_target_data.render_target.GetColorAttachments()
+                        .find(0u)
+                        ->second;
+      auto depth = render_target_data.render_target.GetDepthAttachment();
+      std::shared_ptr<Texture> depth_tex = depth ? depth->texture : nullptr;
+      return RenderTargetAllocator::CreateOffscreenMSAA(
+          context, size, mip_count, label, color_attachment_config,
+          stencil_attachment_config, color0.texture, color0.resolve_texture,
+          depth_tex);
+    }
+  }
+  RenderTarget created_target = RenderTargetAllocator::CreateOffscreenMSAA(
+      context, size, mip_count, label, color_attachment_config,
+      stencil_attachment_config);
+  if (!created_target.IsValid()) {
+    return created_target;
+  }
+  render_target_data_.push_back(
+      RenderTargetData{.used_this_frame = true,
+                       .config = config,
+                       .render_target = created_target});
+  return created_target;
+}
+
+size_t RenderTargetCache::CachedTextureCount() const {
+  return render_target_data_.size();
+}
+
+}  // namespace impeller
diff --git a/impeller/entity/render_target_cache.h b/impeller/entity/render_target_cache.h
new file mode 100644
index 0000000000000000000000000000000000000000..838814e45f0d6b6057e1695716877247610c47c3
--- /dev/null
+++ b/impeller/entity/render_target_cache.h
@@ -0,0 +1,86 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_ENTITY_RENDER_TARGET_CACHE_H_
+#define FLUTTER_IMPELLER_ENTITY_RENDER_TARGET_CACHE_H_
+
+#include "impeller/renderer/render_target.h"
+
+namespace impeller {
+
+/// @brief An implementation of the [RenderTargetAllocator] that caches all
+///        allocated texture data for one frame.
+///
+///        Any textures unused after a frame are immediately discarded.
+class RenderTargetCache : public RenderTargetAllocator {
+ public:
+  explicit RenderTargetCache(std::shared_ptr<Allocator> allocator);
+
+  ~RenderTargetCache() = default;
+
+  // |RenderTargetAllocator|
+  void Start() override;
+
+  // |RenderTargetAllocator|
+  void End() override;
+
+  RenderTarget CreateOffscreen(
+      const Context& context,
+      ISize size,
+      int mip_count,
+      const std::string& label = "Offscreen",
+      RenderTarget::AttachmentConfig color_attachment_config =
+          RenderTarget::kDefaultColorAttachmentConfig,
+      std::optional<RenderTarget::AttachmentConfig> stencil_attachment_config =
+          RenderTarget::kDefaultStencilAttachmentConfig,
+      const std::shared_ptr<Texture>& existing_color_texture = nullptr,
+      const std::shared_ptr<Texture>& existing_depth_stencil_texture =
+          nullptr) override;
+
+  RenderTarget CreateOffscreenMSAA(
+      const Context& context,
+      ISize size,
+      int mip_count,
+      const std::string& label = "Offscreen MSAA",
+      RenderTarget::AttachmentConfigMSAA color_attachment_config =
+          RenderTarget::kDefaultColorAttachmentConfigMSAA,
+      std::optional<RenderTarget::AttachmentConfig> stencil_attachment_config =
+          RenderTarget::kDefaultStencilAttachmentConfig,
+      const std::shared_ptr<Texture>& existing_color_msaa_texture = nullptr,
+      const std::shared_ptr<Texture>& existing_color_resolve_texture = nullptr,
+      const std::shared_ptr<Texture>& existing_depth_stencil_texture =
+          nullptr) override;
+
+  // visible for testing.
+  size_t CachedTextureCount() const;
+
+ private:
+  struct RenderTargetData {
+    bool used_this_frame;
+    RenderTargetConfig config;
+    RenderTarget render_target;
+  };
+
+  std::vector<RenderTargetData> render_target_data_;
+
+  RenderTargetCache(const RenderTargetCache&) = delete;
+
+  RenderTargetCache& operator=(const RenderTargetCache&) = delete;
+
+ public:
+  /// Visible for testing.
+  std::vector<RenderTargetData>::const_iterator GetRenderTargetDataBegin()
+      const {
+    return render_target_data_.begin();
+  }
+
+  /// Visible for testing.
+  std::vector<RenderTargetData>::const_iterator GetRenderTargetDataEnd() const {
+    return render_target_data_.end();
+  }
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_ENTITY_RENDER_TARGET_CACHE_H_
diff --git a/impeller/entity/render_target_cache_unittests.cc b/impeller/entity/render_target_cache_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..73493e7641c8513cbf1f7eee6a8e6b8f35be9eb4
--- /dev/null
+++ b/impeller/entity/render_target_cache_unittests.cc
@@ -0,0 +1,134 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <memory>
+
+#include "flutter/testing/testing.h"
+#include "impeller/base/validation.h"
+#include "impeller/core/allocator.h"
+#include "impeller/core/texture_descriptor.h"
+#include "impeller/entity/entity_playground.h"
+#include "impeller/entity/render_target_cache.h"
+#include "impeller/playground/playground_test.h"
+#include "impeller/renderer/testing/mocks.h"
+
+namespace impeller {
+namespace testing {
+
+using RenderTargetCacheTest = EntityPlayground;
+INSTANTIATE_PLAYGROUND_SUITE(RenderTargetCacheTest);
+
+class TestAllocator : public Allocator {
+ public:
+  TestAllocator() = default;
+
+  ~TestAllocator() = default;
+
+  ISize GetMaxTextureSizeSupported() const override {
+    return ISize(1024, 1024);
+  };
+
+  std::shared_ptr<DeviceBuffer> OnCreateBuffer(
+      const DeviceBufferDescriptor& desc) override {
+    if (should_fail) {
+      return nullptr;
+    }
+    return std::make_shared<MockDeviceBuffer>(desc);
+  };
+
+  virtual std::shared_ptr<Texture> OnCreateTexture(
+      const TextureDescriptor& desc) override {
+    if (should_fail) {
+      return nullptr;
+    }
+    return std::make_shared<MockTexture>(desc);
+  };
+
+  bool should_fail = false;
+};
+
+TEST_P(RenderTargetCacheTest, CachesUsedTexturesAcrossFrames) {
+  auto render_target_cache =
+      RenderTargetCache(GetContext()->GetResourceAllocator());
+
+  render_target_cache.Start();
+  // Create two render targets of the same exact size/shape. Both should be
+  // marked as used this frame, so the cached data set will contain two.
+  render_target_cache.CreateOffscreen(*GetContext(), {100, 100}, 1);
+  render_target_cache.CreateOffscreen(*GetContext(), {100, 100}, 1);
+
+  EXPECT_EQ(render_target_cache.CachedTextureCount(), 2u);
+
+  render_target_cache.End();
+  render_target_cache.Start();
+
+  // Next frame, only create one texture. The set will still contain two,
+  // but one will be removed at the end of the frame.
+  render_target_cache.CreateOffscreen(*GetContext(), {100, 100}, 1);
+  EXPECT_EQ(render_target_cache.CachedTextureCount(), 2u);
+
+  render_target_cache.End();
+  EXPECT_EQ(render_target_cache.CachedTextureCount(), 1u);
+}
+
+TEST_P(RenderTargetCacheTest, DoesNotPersistFailedAllocations) {
+  ScopedValidationDisable disable;
+  auto allocator = std::make_shared<TestAllocator>();
+  auto render_target_cache = RenderTargetCache(allocator);
+
+  render_target_cache.Start();
+  allocator->should_fail = true;
+
+  auto render_target =
+      render_target_cache.CreateOffscreen(*GetContext(), {100, 100}, 1);
+
+  EXPECT_FALSE(render_target.IsValid());
+  EXPECT_EQ(render_target_cache.CachedTextureCount(), 0u);
+}
+
+TEST_P(RenderTargetCacheTest, CachedTextureGetsNewAttachmentConfig) {
+  auto render_target_cache =
+      RenderTargetCache(GetContext()->GetResourceAllocator());
+
+  render_target_cache.Start();
+  RenderTarget::AttachmentConfig color_attachment_config =
+      RenderTarget::kDefaultColorAttachmentConfig;
+  RenderTarget target1 = render_target_cache.CreateOffscreen(
+      *GetContext(), {100, 100}, 1, "Offscreen1", color_attachment_config);
+  render_target_cache.End();
+
+  render_target_cache.Start();
+  color_attachment_config.clear_color = Color::Red();
+  RenderTarget target2 = render_target_cache.CreateOffscreen(
+      *GetContext(), {100, 100}, 1, "Offscreen2", color_attachment_config);
+  render_target_cache.End();
+
+  auto color1 = target1.GetColorAttachments().find(0)->second;
+  auto color2 = target2.GetColorAttachments().find(0)->second;
+  // The second color attachment should reuse the first attachment's texture
+  // but with attributes from the second AttachmentConfig.
+  EXPECT_EQ(color2.texture, color1.texture);
+  EXPECT_EQ(color2.clear_color, Color::Red());
+}
+
+TEST_P(RenderTargetCacheTest, CreateWithEmptySize) {
+  auto render_target_cache =
+      RenderTargetCache(GetContext()->GetResourceAllocator());
+
+  render_target_cache.Start();
+  RenderTarget empty_target =
+      render_target_cache.CreateOffscreen(*GetContext(), {100, 0}, 1);
+  RenderTarget empty_target_msaa =
+      render_target_cache.CreateOffscreenMSAA(*GetContext(), {0, 0}, 1);
+  render_target_cache.End();
+
+  {
+    ScopedValidationDisable disable_validation;
+    EXPECT_FALSE(empty_target.IsValid());
+    EXPECT_FALSE(empty_target_msaa.IsValid());
+  }
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/entity/shaders/blending/advanced_blend.frag b/impeller/entity/shaders/blending/advanced_blend.frag
new file mode 100644
index 0000000000000000000000000000000000000000..db444f522a0922dc7fbbe4ec29d6f736d0323800
--- /dev/null
+++ b/impeller/entity/shaders/blending/advanced_blend.frag
@@ -0,0 +1,57 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <impeller/blending.glsl>
+#include <impeller/color.glsl>
+#include <impeller/texture.glsl>
+#include <impeller/types.glsl>
+#include "blend_select.glsl"
+
+layout(constant_id = 0) const float blend_type = 0.0;
+layout(constant_id = 1) const float supports_decal = 1.0;
+
+uniform BlendInfo {
+  float16_t dst_input_alpha;
+  float16_t src_input_alpha;
+  float16_t color_factor;
+  f16vec4 color;  // This color input is expected to be unpremultiplied.
+  float supports_decal_sampler_address_mode;
+}
+blend_info;
+
+uniform f16sampler2D texture_sampler_dst;
+uniform f16sampler2D texture_sampler_src;
+
+in vec2 v_dst_texture_coords;
+in vec2 v_src_texture_coords;
+
+out f16vec4 frag_color;
+
+f16vec4 Sample(f16sampler2D texture_sampler, vec2 texture_coords) {
+  if (supports_decal > 0.0) {
+    return texture(texture_sampler, texture_coords);
+  }
+  return IPHalfSampleDecal(texture_sampler, texture_coords);
+}
+
+void main() {
+  f16vec4 dst =
+      IPHalfUnpremultiply(Sample(texture_sampler_dst,  // sampler
+                                 v_dst_texture_coords  // texture coordinates
+                                 ));
+  dst *= blend_info.dst_input_alpha;
+  f16vec4 src = blend_info.color_factor > 0.0hf
+                    ? blend_info.color
+                    : IPHalfUnpremultiply(Sample(
+                          texture_sampler_src,  // sampler
+                          v_src_texture_coords  // texture coordinates
+                          ));
+  if (blend_info.color_factor == 0.0hf) {
+    src.a *= blend_info.src_input_alpha;
+  }
+
+  f16vec3 blend_result = AdvancedBlend(dst.rgb, src.rgb, int(blend_type));
+
+  frag_color = IPApplyBlendedColor(dst, src, blend_result);
+}
diff --git a/impeller/entity/shaders/blending/advanced_blend.glsl b/impeller/entity/shaders/blending/advanced_blend.glsl
deleted file mode 100644
index 4fd47b059c0c898eaa45d2189fcabc8397e62cb1..0000000000000000000000000000000000000000
--- a/impeller/entity/shaders/blending/advanced_blend.glsl
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <impeller/blending.glsl>
-#include <impeller/color.glsl>
-#include <impeller/texture.glsl>
-#include <impeller/types.glsl>
-
-uniform BlendInfo {
-  float dst_input_alpha;
-  float dst_y_coord_scale;
-  float src_y_coord_scale;
-  float color_factor;
-  vec4 color;  // This color input is expected to be unpremultiplied.
-}
-blend_info;
-
-uniform sampler2D texture_sampler_dst;
-uniform sampler2D texture_sampler_src;
-
-in vec2 v_dst_texture_coords;
-in vec2 v_src_texture_coords;
-
-out vec4 frag_color;
-
-void main() {
-  vec4 dst_sample =
-      IPSampleWithTileMode(texture_sampler_dst,           // sampler
-                           v_dst_texture_coords,          // texture coordinates
-                           blend_info.dst_y_coord_scale,  // y coordinate scale
-                           kTileModeDecal                 // tile mode
-                           ) *
-      blend_info.dst_input_alpha;
-
-  vec4 dst = IPUnpremultiply(dst_sample);
-  vec4 src = blend_info.color_factor > 0
-                 ? blend_info.color
-                 : IPUnpremultiply(IPSampleWithTileMode(
-                       texture_sampler_src,           // sampler
-                       v_src_texture_coords,          // texture coordinates
-                       blend_info.src_y_coord_scale,  // y coordinate scale
-                       kTileModeDecal                 // tile mode
-                       ));
-
-  vec4 blended = vec4(Blend(dst.rgb, src.rgb), 1) * dst.a;
-
-  frag_color = mix(dst_sample, blended, src.a);
-  // frag_color = dst_sample;
-}
diff --git a/impeller/entity/shaders/blending/advanced_blend.vert b/impeller/entity/shaders/blending/advanced_blend.vert
index cc72aeae977965d13eeeb3d0cda1ead8a11a98a2..5a5535ab869d6345ffe29d760439127a7e696c67 100644
--- a/impeller/entity/shaders/blending/advanced_blend.vert
+++ b/impeller/entity/shaders/blending/advanced_blend.vert
@@ -2,10 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <impeller/conversions.glsl>
 #include <impeller/types.glsl>
 
 uniform FrameInfo {
   mat4 mvp;
+  float dst_y_coord_scale;
+  float src_y_coord_scale;
 }
 frame_info;
 
@@ -18,6 +21,8 @@ out vec2 v_src_texture_coords;
 
 void main() {
   gl_Position = frame_info.mvp * vec4(vertices, 0.0, 1.0);
-  v_dst_texture_coords = dst_texture_coords;
-  v_src_texture_coords = src_texture_coords;
+  v_dst_texture_coords =
+      IPRemapCoords(dst_texture_coords, frame_info.dst_y_coord_scale);
+  v_src_texture_coords =
+      IPRemapCoords(src_texture_coords, frame_info.src_y_coord_scale);
 }
diff --git a/impeller/entity/shaders/blending/advanced_blend_difference.frag b/impeller/entity/shaders/blending/advanced_blend_difference.frag
deleted file mode 100644
index 9d9320fdffd782c7cfa006048291a7115ee4a3c3..0000000000000000000000000000000000000000
--- a/impeller/entity/shaders/blending/advanced_blend_difference.frag
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <impeller/blending.glsl>
-
-vec3 Blend(vec3 dst, vec3 src) {
-  return IPBlendDifference(dst, src);
-}
-
-#include "advanced_blend.glsl"
diff --git a/impeller/entity/shaders/blending/advanced_blend_exclusion.frag b/impeller/entity/shaders/blending/advanced_blend_exclusion.frag
deleted file mode 100644
index 7c2f9f92996ca330d49ba604da213c660dfdbd42..0000000000000000000000000000000000000000
--- a/impeller/entity/shaders/blending/advanced_blend_exclusion.frag
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <impeller/blending.glsl>
-
-vec3 Blend(vec3 dst, vec3 src) {
-  return IPBlendExclusion(dst, src);
-}
-
-#include "advanced_blend.glsl"
diff --git a/impeller/entity/shaders/blending/advanced_blend_hardlight.frag b/impeller/entity/shaders/blending/advanced_blend_hardlight.frag
deleted file mode 100644
index aa126dfdc7cc77d078035840d26070a8502af800..0000000000000000000000000000000000000000
--- a/impeller/entity/shaders/blending/advanced_blend_hardlight.frag
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <impeller/blending.glsl>
-
-vec3 Blend(vec3 dst, vec3 src) {
-  return IPBlendHardLight(dst, src);
-}
-
-#include "advanced_blend.glsl"
diff --git a/impeller/entity/shaders/blending/advanced_blend_lighten.frag b/impeller/entity/shaders/blending/advanced_blend_lighten.frag
deleted file mode 100644
index 32f2df082b4f5edd510fd60fb9ebae314229a856..0000000000000000000000000000000000000000
--- a/impeller/entity/shaders/blending/advanced_blend_lighten.frag
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <impeller/blending.glsl>
-
-vec3 Blend(vec3 dst, vec3 src) {
-  return IPBlendLighten(dst, src);
-}
-
-#include "advanced_blend.glsl"
diff --git a/impeller/entity/shaders/blending/advanced_blend_luminosity.frag b/impeller/entity/shaders/blending/advanced_blend_luminosity.frag
deleted file mode 100644
index 4ceae64493947d1302a8a7245addf3588e134c56..0000000000000000000000000000000000000000
--- a/impeller/entity/shaders/blending/advanced_blend_luminosity.frag
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <impeller/blending.glsl>
-
-vec3 Blend(vec3 dst, vec3 src) {
-  return IPBlendLuminosity(dst, src);
-}
-
-#include "advanced_blend.glsl"
diff --git a/impeller/entity/shaders/blending/advanced_blend_multiply.frag b/impeller/entity/shaders/blending/advanced_blend_multiply.frag
deleted file mode 100644
index a2fd42b6c7d2e3ac6483d00fe604eefed3647d44..0000000000000000000000000000000000000000
--- a/impeller/entity/shaders/blending/advanced_blend_multiply.frag
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <impeller/blending.glsl>
-
-vec3 Blend(vec3 dst, vec3 src) {
-  return IPBlendMultiply(dst, src);
-}
-
-#include "advanced_blend.glsl"
diff --git a/impeller/entity/shaders/blending/advanced_blend_overlay.frag b/impeller/entity/shaders/blending/advanced_blend_overlay.frag
deleted file mode 100644
index 0837b91d8bfbd840184a685eaf05274ba5862e95..0000000000000000000000000000000000000000
--- a/impeller/entity/shaders/blending/advanced_blend_overlay.frag
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <impeller/blending.glsl>
-
-vec3 Blend(vec3 dst, vec3 src) {
-  return IPBlendOverlay(dst, src);
-}
-
-#include "advanced_blend.glsl"
diff --git a/impeller/entity/shaders/blending/advanced_blend_saturation.frag b/impeller/entity/shaders/blending/advanced_blend_saturation.frag
deleted file mode 100644
index c3fd3bebc87d75375f010e3362673512bfbbc7ec..0000000000000000000000000000000000000000
--- a/impeller/entity/shaders/blending/advanced_blend_saturation.frag
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <impeller/blending.glsl>
-
-vec3 Blend(vec3 dst, vec3 src) {
-  return IPBlendSaturation(dst, src);
-}
-
-#include "advanced_blend.glsl"
diff --git a/impeller/entity/shaders/blending/advanced_blend_screen.frag b/impeller/entity/shaders/blending/advanced_blend_screen.frag
deleted file mode 100644
index f65ab5db1d5637dd34ec82c4466d54f28ca721a2..0000000000000000000000000000000000000000
--- a/impeller/entity/shaders/blending/advanced_blend_screen.frag
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <impeller/blending.glsl>
-
-vec3 Blend(vec3 dst, vec3 src) {
-  return IPBlendScreen(dst, src);
-}
-
-#include "advanced_blend.glsl"
diff --git a/impeller/entity/shaders/blending/advanced_blend_softlight.frag b/impeller/entity/shaders/blending/advanced_blend_softlight.frag
deleted file mode 100644
index 3a504afbb99c6a02fc1995b3d977198690f4c60e..0000000000000000000000000000000000000000
--- a/impeller/entity/shaders/blending/advanced_blend_softlight.frag
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <impeller/blending.glsl>
-
-vec3 Blend(vec3 dst, vec3 src) {
-  return IPBlendSoftLight(dst, src);
-}
-
-#include "advanced_blend.glsl"
diff --git a/impeller/entity/shaders/blending/blend.frag b/impeller/entity/shaders/blending/blend.frag
index af401a151d98d1dd317ff80cf75e79d87aad9e27..d8eb5b806f8944be307611d7ef7b519cc250fa4b 100644
--- a/impeller/entity/shaders/blending/blend.frag
+++ b/impeller/entity/shaders/blending/blend.frag
@@ -2,23 +2,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+precision mediump float;
+
 #include <impeller/texture.glsl>
 #include <impeller/types.glsl>
 
-uniform sampler2D texture_sampler_src;
+uniform f16sampler2D texture_sampler_src;
 
 uniform FragInfo {
-  float texture_sampler_y_coord_scale;
-  float input_alpha;
+  float16_t input_alpha;
 }
 frag_info;
 
 in vec2 v_texture_coords;
 
-out vec4 frag_color;
+out f16vec4 frag_color;
 
 void main() {
-  frag_color = IPSample(texture_sampler_src, v_texture_coords,
-                        frag_info.texture_sampler_y_coord_scale) *
-               frag_info.input_alpha;
+  frag_color =
+      texture(texture_sampler_src, v_texture_coords) * frag_info.input_alpha;
 }
diff --git a/impeller/entity/shaders/blending/blend.vert b/impeller/entity/shaders/blending/blend.vert
index 3b4a4bd4304450c2c5ff86229fb4fa49c0924565..f8a08ecee3b378edd182edd11bccdb7a38d08770 100644
--- a/impeller/entity/shaders/blending/blend.vert
+++ b/impeller/entity/shaders/blending/blend.vert
@@ -2,10 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <impeller/conversions.glsl>
 #include <impeller/types.glsl>
 
 uniform FrameInfo {
   mat4 mvp;
+  float texture_sampler_y_coord_scale;
 }
 frame_info;
 
@@ -16,5 +18,6 @@ out vec2 v_texture_coords;
 
 void main() {
   gl_Position = frame_info.mvp * vec4(vertices, 0.0, 1.0);
-  v_texture_coords = texture_coords;
+  v_texture_coords =
+      IPRemapCoords(texture_coords, frame_info.texture_sampler_y_coord_scale);
 }
diff --git a/impeller/entity/shaders/blending/blend_select.glsl b/impeller/entity/shaders/blending/blend_select.glsl
new file mode 100644
index 0000000000000000000000000000000000000000..17c45c16fdcf4dbf166c41addaf842ae2465372c
--- /dev/null
+++ b/impeller/entity/shaders/blending/blend_select.glsl
@@ -0,0 +1,72 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <impeller/blending.glsl>
+#include <impeller/color.glsl>
+#include <impeller/types.glsl>
+
+// kScreen = 0,
+// kOverlay,
+// kDarken,
+// kLighten,
+// kColorDodge,
+// kColorBurn,
+// kHardLight,
+// kSoftLight,
+// kDifference,
+// kExclusion,
+// kMultiply,
+// kHue,
+// kSaturation,
+// kColor,
+// kLuminosity,
+// Note, this isn't a switch as GLSL ES 1.0 does not support them.
+f16vec3 AdvancedBlend(f16vec3 dst, f16vec3 src, int blend_type) {
+  if (blend_type == 0) {
+    return IPBlendScreen(dst, src);
+  }
+  if (blend_type == 1) {
+    return IPBlendOverlay(dst, src);
+  }
+  if (blend_type == 2) {
+    return IPBlendDarken(dst, src);
+  }
+  if (blend_type == 3) {
+    return IPBlendLighten(dst, src);
+  }
+  if (blend_type == 4) {
+    return IPBlendColorDodge(dst, src);
+  }
+  if (blend_type == 5) {
+    return IPBlendColorBurn(dst, src);
+  }
+  if (blend_type == 6) {
+    return IPBlendHardLight(dst, src);
+  }
+  if (blend_type == 7) {
+    return IPBlendSoftLight(dst, src);
+  }
+  if (blend_type == 8) {
+    return IPBlendDifference(dst, src);
+  }
+  if (blend_type == 9) {
+    return IPBlendExclusion(dst, src);
+  }
+  if (blend_type == 10) {
+    return IPBlendMultiply(dst, src);
+  }
+  if (blend_type == 11) {
+    return IPBlendHue(dst, src);
+  }
+  if (blend_type == 12) {
+    return IPBlendSaturation(dst, src);
+  }
+  if (blend_type == 13) {
+    return IPBlendColor(dst, src);
+  }
+  if (blend_type == 14) {
+    return IPBlendLuminosity(dst, src);
+  }
+  return f16vec3(0.0hf);
+}
diff --git a/impeller/entity/shaders/blending/framebuffer_blend.frag b/impeller/entity/shaders/blending/framebuffer_blend.frag
new file mode 100644
index 0000000000000000000000000000000000000000..6d03856b4a824d746b61eadb249a4f7b48c7d3a7
--- /dev/null
+++ b/impeller/entity/shaders/blending/framebuffer_blend.frag
@@ -0,0 +1,56 @@
+#version 450
+
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <impeller/blending.glsl>
+#include <impeller/color.glsl>
+#include <impeller/texture.glsl>
+#include <impeller/types.glsl>
+#include "blend_select.glsl"
+
+// Warning: if any of the constant values or layouts are changed in this
+// file, then the hard-coded constant value in
+// impeller/renderer/backend/vulkan/binding_helpers_vk.cc
+layout(constant_id = 0) const float blend_type = 0;
+layout(constant_id = 1) const float supports_decal = 1;
+
+layout(input_attachment_index = 0) uniform subpassInputMS uSub;
+
+vec4 ReadDestination() {
+  return (subpassLoad(uSub, 0) + subpassLoad(uSub, 1) + subpassLoad(uSub, 2) +
+          subpassLoad(uSub, 3)) /
+         vec4(4.0);
+}
+
+uniform sampler2D texture_sampler_src;
+
+uniform FragInfo {
+  float16_t src_input_alpha;
+}
+frag_info;
+
+in vec2 v_src_texture_coords;
+
+out vec4 frag_color;
+
+vec4 Sample(sampler2D texture_sampler, vec2 texture_coords) {
+  if (supports_decal > 1) {
+    return texture(texture_sampler, texture_coords);
+  }
+  return IPSampleDecal(texture_sampler, texture_coords);
+}
+
+void main() {
+  f16vec4 dst = IPHalfUnpremultiply(f16vec4(ReadDestination()));
+  f16vec4 src = IPHalfUnpremultiply(
+      f16vec4(Sample(texture_sampler_src,  // sampler
+                     v_src_texture_coords  // texture coordinates
+                     )));
+  src.a *= frag_info.src_input_alpha;
+
+  f16vec3 blend_result = AdvancedBlend(dst.rgb, src.rgb, int(blend_type));
+
+  frag_color = IPApplyBlendedColor(dst, src, blend_result);
+}
diff --git a/impeller/entity/shaders/glyph_atlas_sdf.vert b/impeller/entity/shaders/blending/framebuffer_blend.vert
similarity index 34%
rename from impeller/entity/shaders/glyph_atlas_sdf.vert
rename to impeller/entity/shaders/blending/framebuffer_blend.vert
index 4f6b62d059b5c7a928123792dde24a050b6f7598..362362e4e3f8f9be94137570bbfd3869570d1d73 100644
--- a/impeller/entity/shaders/glyph_atlas_sdf.vert
+++ b/impeller/entity/shaders/blending/framebuffer_blend.vert
@@ -2,29 +2,25 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <impeller/conversions.glsl>
 #include <impeller/types.glsl>
 
-#include <impeller/transform.glsl>
-
+// Warning: if any of the constant values or layouts are changed in this
+// file, then the hard-coded constant value in
+// impeller/renderer/backend/vulkan/binding_helpers_vk.cc
 uniform FrameInfo {
   mat4 mvp;
+  float src_y_coord_scale;
 }
 frame_info;
 
-in vec2 unit_position;
-in vec2 destination_position;
-in vec2 destination_size;
-in vec2 source_position;
-in vec2 source_glyph_size;
+in vec2 vertices;
+in vec2 src_texture_coords;
 
-out vec2 v_unit_position;
-out vec2 v_source_position;
-out vec2 v_source_glyph_size;
+out vec2 v_src_texture_coords;
 
 void main() {
-  gl_Position = IPPositionForGlyphPosition(
-      frame_info.mvp, unit_position, destination_position, destination_size);
-  v_unit_position = unit_position;
-  v_source_position = source_position;
-  v_source_glyph_size = source_glyph_size;
+  gl_Position = frame_info.mvp * vec4(vertices, 0.0, 1.0);
+  v_src_texture_coords =
+      IPRemapCoords(src_texture_coords, frame_info.src_y_coord_scale);
 }
diff --git a/impeller/entity/shaders/blending/porter_duff_blend.frag b/impeller/entity/shaders/blending/porter_duff_blend.frag
new file mode 100644
index 0000000000000000000000000000000000000000..2b6631f9d57f7c8ea3eb1e2a4c5d175572ab878c
--- /dev/null
+++ b/impeller/entity/shaders/blending/porter_duff_blend.frag
@@ -0,0 +1,48 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+precision mediump float;
+
+#include <impeller/blending.glsl>
+#include <impeller/color.glsl>
+#include <impeller/texture.glsl>
+#include <impeller/types.glsl>
+
+layout(constant_id = 0) const float supports_decal = 1.0;
+
+uniform f16sampler2D texture_sampler_dst;
+
+uniform FragInfo {
+  float16_t src_coeff;
+  float16_t src_coeff_dst_alpha;
+  float16_t dst_coeff;
+  float16_t dst_coeff_src_alpha;
+  float16_t dst_coeff_src_color;
+  float16_t input_alpha;
+  float16_t output_alpha;
+}
+frag_info;
+
+in vec2 v_texture_coords;
+in f16vec4 v_color;
+
+out f16vec4 frag_color;
+
+f16vec4 Sample(f16sampler2D texture_sampler, vec2 texture_coords) {
+  if (supports_decal > 0.0) {
+    return texture(texture_sampler, texture_coords);
+  }
+  return IPHalfSampleDecal(texture_sampler, texture_coords);
+}
+
+void main() {
+  f16vec4 dst =
+      texture(texture_sampler_dst, v_texture_coords) * frag_info.input_alpha;
+  f16vec4 src = v_color;
+  frag_color =
+      src * (frag_info.src_coeff + dst.a * frag_info.src_coeff_dst_alpha) +
+      dst * (frag_info.dst_coeff + src.a * frag_info.dst_coeff_src_alpha +
+             src * frag_info.dst_coeff_src_color);
+  frag_color *= frag_info.output_alpha;
+}
diff --git a/impeller/entity/shaders/tiled_texture_fill.vert b/impeller/entity/shaders/blending/porter_duff_blend.vert
similarity index 40%
rename from impeller/entity/shaders/tiled_texture_fill.vert
rename to impeller/entity/shaders/blending/porter_duff_blend.vert
index dabcdf780bf54079ddf405b8002bc29a5acd8ac8..ca266ff6686f60b5c319e1b5914652d9ec475a77 100644
--- a/impeller/entity/shaders/tiled_texture_fill.vert
+++ b/impeller/entity/shaders/blending/porter_duff_blend.vert
@@ -2,22 +2,25 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <impeller/transform.glsl>
+#include <impeller/conversions.glsl>
 #include <impeller/types.glsl>
 
-uniform VertInfo {
+uniform FrameInfo {
   mat4 mvp;
-  mat4 matrix;
-  vec2 texture_size;
+  float texture_sampler_y_coord_scale;
 }
-vert_info;
+frame_info;
 
-in vec2 position;
+in vec2 vertices;
+in vec2 texture_coords;
+in vec4 color;
 
 out vec2 v_texture_coords;
+out f16vec4 v_color;
 
 void main() {
-  gl_Position = vert_info.mvp * vec4(position, 0.0, 1.0);
-  vec2 transformed = IPVec2TransformPosition(vert_info.matrix, position);
-  v_texture_coords = transformed / vert_info.texture_size;
+  gl_Position = frame_info.mvp * vec4(vertices, 0.0, 1.0);
+  v_color = f16vec4(color);
+  v_texture_coords =
+      IPRemapCoords(texture_coords, frame_info.texture_sampler_y_coord_scale);
 }
diff --git a/impeller/entity/shaders/border_mask_blur.frag b/impeller/entity/shaders/border_mask_blur.frag
index a7652e5623967aa8720fb70f42d3ad314e7afc04..55247604ad9537acdcdf02922b81812974838b14 100644
--- a/impeller/entity/shaders/border_mask_blur.frag
+++ b/impeller/entity/shaders/border_mask_blur.frag
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+precision mediump float;
+
 #include <impeller/gaussian.glsl>
 #include <impeller/texture.glsl>
 #include <impeller/types.glsl>
@@ -15,41 +17,43 @@
 // integral (using an erf approximation) to the 4 edges of the UV rectangle and
 // multiplying them.
 
-uniform sampler2D texture_sampler;
+uniform f16sampler2D texture_sampler;
 
 uniform FragInfo {
-  float texture_sampler_y_coord_scale;
+  float16_t src_factor;
+  float16_t inner_blur_factor;
+  float16_t outer_blur_factor;
+  float16_t alpha;
+
+  f16vec2 sigma_uv;
 }
 frag_info;
 
-in vec2 v_texture_coords;
-in vec2 v_sigma_uv;
-in float v_src_factor;
-in float v_inner_blur_factor;
-in float v_outer_blur_factor;
+in highp vec2 v_texture_coords;
 
-out vec4 frag_color;
+out f16vec4 frag_color;
 
-float BoxBlurMask(vec2 uv) {
+float16_t BoxBlurMask(f16vec2 uv) {
   // LTRB
-  return IPGaussianIntegral(uv.x, v_sigma_uv.x) *      //
-         IPGaussianIntegral(uv.y, v_sigma_uv.y) *      //
-         IPGaussianIntegral(1 - uv.x, v_sigma_uv.x) *  //
-         IPGaussianIntegral(1 - uv.y, v_sigma_uv.y);
+  return IPGaussianIntegral(uv.x, frag_info.sigma_uv.x) *          //
+         IPGaussianIntegral(uv.y, frag_info.sigma_uv.y) *          //
+         IPGaussianIntegral(1.0hf - uv.x, frag_info.sigma_uv.x) *  //
+         IPGaussianIntegral(1.0hf - uv.y, frag_info.sigma_uv.y);
 }
 
 void main() {
-  vec4 image_color = IPSample(texture_sampler, v_texture_coords,
-                              frag_info.texture_sampler_y_coord_scale);
-  float blur_factor = BoxBlurMask(v_texture_coords);
-
-  float within_bounds =
-      float(v_texture_coords.x >= 0 && v_texture_coords.y >= 0 &&
-            v_texture_coords.x < 1 && v_texture_coords.y < 1);
-  float inner_factor =
-      (v_inner_blur_factor * blur_factor + v_src_factor) * within_bounds;
-  float outer_factor = v_outer_blur_factor * blur_factor * (1 - within_bounds);
-
-  float mask_factor = inner_factor + outer_factor;
+  f16vec4 image_color = texture(texture_sampler, v_texture_coords);
+  float16_t blur_factor = BoxBlurMask(f16vec2(v_texture_coords));
+
+  float16_t within_bounds =
+      float16_t(v_texture_coords.x >= 0.0 && v_texture_coords.y >= 0.0 &&
+                v_texture_coords.x < 1.0 && v_texture_coords.y < 1.0);
+  float16_t inner_factor =
+      (frag_info.inner_blur_factor * blur_factor + frag_info.src_factor) *
+      within_bounds;
+  float16_t outer_factor =
+      frag_info.outer_blur_factor * blur_factor * (1.0hf - within_bounds);
+
+  float16_t mask_factor = inner_factor + outer_factor;
   frag_color = image_color * mask_factor;
 }
diff --git a/impeller/entity/shaders/border_mask_blur.vert b/impeller/entity/shaders/border_mask_blur.vert
index 47a4d03e5978e2a2c09a9044622988e7a23bec70..0dbc6fd4bfad431ad2d5e89a819992613da9f9ad 100644
--- a/impeller/entity/shaders/border_mask_blur.vert
+++ b/impeller/entity/shaders/border_mask_blur.vert
@@ -2,33 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <impeller/conversions.glsl>
 #include <impeller/types.glsl>
 
 uniform FrameInfo {
   mat4 mvp;
-
-  vec2 sigma_uv;
-
-  float src_factor;
-  float inner_blur_factor;
-  float outer_blur_factor;
+  float texture_sampler_y_coord_scale;
 }
 frame_info;
 
-in vec2 vertices;
+in vec2 position;
 in vec2 texture_coords;
 
 out vec2 v_texture_coords;
-out vec2 v_sigma_uv;
-out float v_src_factor;
-out float v_inner_blur_factor;
-out float v_outer_blur_factor;
 
 void main() {
-  gl_Position = frame_info.mvp * vec4(vertices, 0.0, 1.0);
-  v_texture_coords = texture_coords;
-  v_sigma_uv = frame_info.sigma_uv;
-  v_src_factor = frame_info.src_factor;
-  v_inner_blur_factor = frame_info.inner_blur_factor;
-  v_outer_blur_factor = frame_info.outer_blur_factor;
+  gl_Position = frame_info.mvp * vec4(position, 0.0, 1.0);
+  v_texture_coords =
+      IPRemapCoords(texture_coords, frame_info.texture_sampler_y_coord_scale);
 }
diff --git a/impeller/entity/shaders/clip.frag b/impeller/entity/shaders/clip.frag
new file mode 100644
index 0000000000000000000000000000000000000000..61d44949136b6aaeaf6bdce4438679929dd6b984
--- /dev/null
+++ b/impeller/entity/shaders/clip.frag
@@ -0,0 +1,9 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+precision mediump float;
+
+#include <impeller/types.glsl>
+
+void main() {}
diff --git a/impeller/entity/shaders/position_uv.vert b/impeller/entity/shaders/clip.vert
similarity index 41%
rename from impeller/entity/shaders/position_uv.vert
rename to impeller/entity/shaders/clip.vert
index e49949a801277fb6aea5a717a787c60eb62fd05f..4a8f9f2df65edcf63bcb91e8fb7584314b9333a1 100644
--- a/impeller/entity/shaders/position_uv.vert
+++ b/impeller/entity/shaders/clip.vert
@@ -2,22 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <impeller/transform.glsl>
 #include <impeller/types.glsl>
 
-uniform VertInfo {
+uniform FrameInfo {
   mat4 mvp;
+  float depth;
 }
-vert_info;
+frame_info;
 
 in vec2 position;
-in vec2 uv;
-
-out vec2 v_uv;
-out vec2 v_position;
 
 void main() {
-  gl_Position = vert_info.mvp * vec4(position, 0.0, 1.0);
-  v_uv = uv;
-  v_position = IPVec2TransformPosition(vert_info.mvp, position);
+  gl_Position = frame_info.mvp * vec4(position, 0.0, 1.0);
+  // We can just absorb W and override the depth value here because we don't
+  // need to worry about perspective correcting any vertex attributes when
+  // drawing clips.
+  gl_Position /= gl_Position.w;
+  gl_Position.z = frame_info.depth;
 }
diff --git a/impeller/entity/shaders/color_matrix_color_filter.frag b/impeller/entity/shaders/color_matrix_color_filter.frag
index e169f476b788e5b912f07333bb874920bcfcea02..b8f2da6b1961b070a672be6215b7c7b466f6c193 100644
--- a/impeller/entity/shaders/color_matrix_color_filter.frag
+++ b/impeller/entity/shaders/color_matrix_color_filter.frag
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+precision mediump float;
+
 #include <impeller/color.glsl>
 #include <impeller/texture.glsl>
 #include <impeller/types.glsl>
@@ -31,27 +33,26 @@
 
 uniform FragInfo {
   mat4 color_m;
-  vec4 color_v;
-  float texture_sampler_y_coord_scale;
-  float input_alpha;
+  f16vec4 color_v;
+  float16_t input_alpha;
 }
 frag_info;
 
-uniform sampler2D input_texture;
+uniform f16sampler2D input_texture;
 
-in vec2 v_position;
-out vec4 frag_color;
+in highp vec2 v_texture_coords;
+out f16vec4 frag_color;
 
 void main() {
-  vec4 input_color = IPSample(input_texture, v_position,
-                              frag_info.texture_sampler_y_coord_scale) *
-                     frag_info.input_alpha;
+  f16vec4 input_color =
+      texture(input_texture, v_texture_coords) * frag_info.input_alpha;
 
   // unpremultiply first, as filter inputs are premultiplied.
-  vec4 color = IPUnpremultiply(input_color);
+  f16vec4 color = IPHalfUnpremultiply(input_color);
 
-  color = clamp(frag_info.color_m * color + frag_info.color_v, 0.0, 1.0);
+  color = clamp(f16mat4(frag_info.color_m) * color + frag_info.color_v,
+                float16_t(0), float16_t(1.0));
 
   // premultiply the outputs
-  frag_color = vec4(color.rgb * color.a, color.a);
+  frag_color = f16vec4(color.rgb * color.a, color.a);
 }
diff --git a/impeller/entity/shaders/color_matrix_color_filter.vert b/impeller/entity/shaders/color_matrix_color_filter.vert
index 27b8ecedbf216a2fecb287dfd5be2872ffe47e69..5a631d8b1f039095cd65d33b03352ef8b9328dd9 100644
--- a/impeller/entity/shaders/color_matrix_color_filter.vert
+++ b/impeller/entity/shaders/color_matrix_color_filter.vert
@@ -2,17 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <impeller/conversions.glsl>
 #include <impeller/types.glsl>
 
 uniform FrameInfo {
   mat4 mvp;
+  float texture_sampler_y_coord_scale;
 }
 frame_info;
 
 in vec2 position;
-out vec2 v_position;
+
+out vec2 v_texture_coords;
 
 void main() {
-  v_position = position;
   gl_Position = frame_info.mvp * vec4(position, 0.0, 1.0);
+  v_texture_coords =
+      IPRemapCoords(position, frame_info.texture_sampler_y_coord_scale);
 }
diff --git a/impeller/entity/shaders/conical_gradient_fill.frag b/impeller/entity/shaders/conical_gradient_fill.frag
new file mode 100644
index 0000000000000000000000000000000000000000..159b95c1c3ccc07dacbc27073eee5801445744b5
--- /dev/null
+++ b/impeller/entity/shaders/conical_gradient_fill.frag
@@ -0,0 +1,48 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+precision mediump float;
+
+#include <impeller/color.glsl>
+#include <impeller/gradient.glsl>
+#include <impeller/texture.glsl>
+#include <impeller/types.glsl>
+
+uniform sampler2D texture_sampler;
+
+uniform FragInfo {
+  highp vec2 center;
+  float radius;
+  float tile_mode;
+  vec4 decal_border_color;
+  float texture_sampler_y_coord_scale;
+  float alpha;
+  vec2 half_texel;
+  vec2 focus;
+  float focus_radius;
+}
+frag_info;
+
+highp in vec2 v_position;
+
+out vec4 frag_color;
+
+void main() {
+  vec2 res = IPComputeConicalT(frag_info.focus, frag_info.focus_radius,
+                               frag_info.center, frag_info.radius, v_position);
+  if (res.y < 0.0) {
+    frag_color = vec4(0);
+    return;
+  }
+
+  float t = res.x;
+  frag_color =
+      IPSampleLinearWithTileMode(texture_sampler,                          //
+                                 vec2(t, 0.5),                             //
+                                 frag_info.texture_sampler_y_coord_scale,  //
+                                 frag_info.half_texel,                     //
+                                 frag_info.tile_mode,                      //
+                                 frag_info.decal_border_color);
+  frag_color = IPPremultiply(frag_color) * frag_info.alpha;
+}
diff --git a/impeller/entity/shaders/conical_gradient_ssbo_fill.frag b/impeller/entity/shaders/conical_gradient_ssbo_fill.frag
new file mode 100644
index 0000000000000000000000000000000000000000..432152ea82dc155d3dd15756d9b6cc0115c42316
--- /dev/null
+++ b/impeller/entity/shaders/conical_gradient_ssbo_fill.frag
@@ -0,0 +1,69 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+precision mediump float;
+
+#include <impeller/color.glsl>
+#include <impeller/dithering.glsl>
+#include <impeller/gradient.glsl>
+#include <impeller/texture.glsl>
+#include <impeller/types.glsl>
+
+struct ColorPoint {
+  vec4 color;
+  float stop;
+};
+
+layout(std140) readonly buffer ColorData {
+  ColorPoint colors[];
+}
+color_data;
+
+uniform FragInfo {
+  highp vec2 center;
+  float radius;
+  float tile_mode;
+  vec4 decal_border_color;
+  float alpha;
+  int colors_length;
+  vec2 focus;
+  float focus_radius;
+}
+frag_info;
+
+highp in vec2 v_position;
+
+out vec4 frag_color;
+
+void main() {
+  vec2 res = IPComputeConicalT(frag_info.focus, frag_info.focus_radius,
+                               frag_info.center, frag_info.radius, v_position);
+
+  float t = res.x;
+  vec4 result_color = vec4(0);
+  if (res.y < 0.0 ||
+      ((t < 0.0 || t > 1.0) && frag_info.tile_mode == kTileModeDecal)) {
+    result_color = frag_info.decal_border_color;
+  } else {
+    t = IPFloatTile(t, frag_info.tile_mode);
+
+    for (int i = 1; i < frag_info.colors_length; i++) {
+      ColorPoint prev_point = color_data.colors[i - 1];
+      ColorPoint current_point = color_data.colors[i];
+      if (t >= prev_point.stop && t <= current_point.stop) {
+        float delta = (current_point.stop - prev_point.stop);
+        if (delta < 0.001) {
+          result_color = current_point.color;
+        } else {
+          float ratio = (t - prev_point.stop) / delta;
+          result_color = mix(prev_point.color, current_point.color, ratio);
+        }
+        break;
+      }
+    }
+  }
+
+  frag_color = IPPremultiply(result_color) * frag_info.alpha;
+  frag_color = IPOrderedDither8x8(frag_color, gl_FragCoord.xy);
+}
diff --git a/flutter_frontend_server/bin/starter.dart b/impeller/entity/shaders/debug/checkerboard.frag
similarity index 40%
rename from flutter_frontend_server/bin/starter.dart
rename to impeller/entity/shaders/debug/checkerboard.frag
index f78c3a2754d5c0d5176ee9eaec2c96c833ef52a9..cd711965c1fccffc826d60fa7d81b44dc2c93404 100644
--- a/flutter_frontend_server/bin/starter.dart
+++ b/impeller/entity/shaders/debug/checkerboard.frag
@@ -2,15 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-library frontend_server;
+precision mediump float;
 
-import 'dart:io';
+uniform FragInfo {
+  vec4 color;
+  float square_size;
+}
+frag_info;
 
-import 'package:flutter_frontend_server/server.dart';
+out vec4 frag_color;
 
-Future<void> main(List<String> args) async {
-  final int exitCode = await starter(args);
-  if (exitCode != 0) {
-    exit(exitCode);
-  }
+void main() {
+  vec2 square = floor(gl_FragCoord.xy / frag_info.square_size);
+  frag_color = mod(square.x + square.y, 2.0) * frag_info.color;
 }
diff --git a/impeller/entity/shaders/debug/checkerboard.vert b/impeller/entity/shaders/debug/checkerboard.vert
new file mode 100644
index 0000000000000000000000000000000000000000..12942363ab9a52e5f637109a85f9efafe49074b2
--- /dev/null
+++ b/impeller/entity/shaders/debug/checkerboard.vert
@@ -0,0 +1,9 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+in vec2 position;
+
+void main() {
+  gl_Position = vec4(position, 0.0, 1.0);
+}
diff --git a/impeller/entity/shaders/gaussian_blur/gaussian_blur.glsl b/impeller/entity/shaders/gaussian_blur/gaussian_blur.glsl
new file mode 100644
index 0000000000000000000000000000000000000000..ebf135a482328baad37e8ca802b404b7b4a9932e
--- /dev/null
+++ b/impeller/entity/shaders/gaussian_blur/gaussian_blur.glsl
@@ -0,0 +1,73 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// 1D (directional) gaussian blur.
+//
+// Paths for future optimization:
+//   * Remove the uv bounds multiplier in SampleColor by adding optional
+//     support for SamplerAddressMode::ClampToBorder in the texture sampler.
+//   * Render both blur passes into a smaller texture than the source image
+//     (~1/radius size).
+//   * If doing the small texture render optimization, cache misses can be
+//     reduced in the first pass by sampling the source textures with a mip
+//     level of log2(min_radius).
+
+#include <impeller/constants.glsl>
+#include <impeller/gaussian.glsl>
+#include <impeller/texture.glsl>
+#include <impeller/types.glsl>
+
+uniform f16sampler2D texture_sampler;
+
+uniform BlurInfo {
+  f16vec2 blur_uv_offset;
+
+  // The blur sigma and radius have a linear relationship which is defined
+  // host-side, but both are useful controls here. Sigma (pixels per standard
+  // deviation) is used to define the gaussian function itself, whereas the
+  // radius is used to limit how much of the function is integrated.
+  float blur_sigma;
+  float16_t blur_radius;
+  float16_t step_size;
+}
+blur_info;
+
+f16vec4 Sample(f16sampler2D tex, vec2 coords) {
+#if ENABLE_DECAL_SPECIALIZATION
+  return IPHalfSampleDecal(tex, coords);
+#else
+  return texture(tex, coords);
+#endif
+}
+
+in vec2 v_texture_coords;
+
+out f16vec4 frag_color;
+
+void main() {
+  f16vec4 total_color = f16vec4(0.0hf);
+  float16_t gaussian_integral = 0.0hf;
+
+  // Step by 2.0 as a performance optimization, relying on bilinear filtering in
+  // the sampler to blend the texels. Typically the space between pixels is
+  // calculated so their blended amounts match the gaussian coefficients. This
+  // just uses 0.5 as an optimization until the gaussian coefficients are
+  // calculated and passed in from the cpu.
+  for (float16_t i = -blur_info.blur_radius; i <= blur_info.blur_radius;
+       i += blur_info.step_size) {
+    // Use the 32 bit Gaussian function because the 16 bit variation results in
+    // quality loss/visible banding. Also, 16 bit variation internally breaks
+    // down at a moderately high (but still reasonable) blur sigma of >255 when
+    // computing sigma^2 due to the exponent only having 5 bits.
+    float16_t gaussian = float16_t(IPGaussian(float(i), blur_info.blur_sigma));
+    gaussian_integral += gaussian;
+    total_color +=
+        gaussian * Sample(texture_sampler,  // sampler
+                          v_texture_coords + blur_info.blur_uv_offset *
+                                                 i  // texture coordinates
+                   );
+  }
+
+  frag_color = total_color / gaussian_integral;
+}
diff --git a/impeller/entity/shaders/gaussian_blur.vert b/impeller/entity/shaders/gaussian_blur/gaussian_blur.vert
similarity index 68%
rename from impeller/entity/shaders/gaussian_blur.vert
rename to impeller/entity/shaders/gaussian_blur/gaussian_blur.vert
index f402003b13bf19ac382b46972c037d801af2e298..f8a08ecee3b378edd182edd11bccdb7a38d08770 100644
--- a/impeller/entity/shaders/gaussian_blur.vert
+++ b/impeller/entity/shaders/gaussian_blur/gaussian_blur.vert
@@ -2,27 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <impeller/texture.glsl>
+#include <impeller/conversions.glsl>
 #include <impeller/types.glsl>
 
 uniform FrameInfo {
   mat4 mvp;
   float texture_sampler_y_coord_scale;
-  float alpha_mask_sampler_y_coord_scale;
 }
 frame_info;
 
 in vec2 vertices;
 in vec2 texture_coords;
-in vec2 src_texture_coords;
 
 out vec2 v_texture_coords;
-out vec2 v_src_texture_coords;
 
 void main() {
   gl_Position = frame_info.mvp * vec4(vertices, 0.0, 1.0);
   v_texture_coords =
       IPRemapCoords(texture_coords, frame_info.texture_sampler_y_coord_scale);
-  v_src_texture_coords = IPRemapCoords(
-      src_texture_coords, frame_info.alpha_mask_sampler_y_coord_scale);
 }
diff --git a/impeller/entity/shaders/gaussian_blur.frag b/impeller/entity/shaders/gaussian_blur/gaussian_blur_noalpha_decal.frag
similarity index 64%
rename from impeller/entity/shaders/gaussian_blur.frag
rename to impeller/entity/shaders/gaussian_blur/gaussian_blur_noalpha_decal.frag
index 8b483ae45de30698367b331366f05971971baa1d..7bb1045e19dbc9bdfc9358236cf9878bbbb5cb51 100644
--- a/impeller/entity/shaders/gaussian_blur.frag
+++ b/impeller/entity/shaders/gaussian_blur/gaussian_blur_noalpha_decal.frag
@@ -2,10 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <impeller/texture.glsl>
+precision mediump float;
 
-vec4 Sample(sampler2D tex, vec2 coords) {
-  return texture(tex, coords);
-}
+#define ENABLE_DECAL_SPECIALIZATION 1
 
 #include "gaussian_blur.glsl"
diff --git a/impeller/entity/shaders/gaussian_blur/gaussian_blur_noalpha_nodecal.frag b/impeller/entity/shaders/gaussian_blur/gaussian_blur_noalpha_nodecal.frag
new file mode 100644
index 0000000000000000000000000000000000000000..79d708e1dae36d7ef7e39e8509f1d982852a31ff
--- /dev/null
+++ b/impeller/entity/shaders/gaussian_blur/gaussian_blur_noalpha_nodecal.frag
@@ -0,0 +1,9 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+precision mediump float;
+
+#define ENABLE_DECAL_SPECIALIZATION 0
+
+#include "gaussian_blur.glsl"
diff --git a/impeller/entity/shaders/gaussian_blur/kernel.glsl b/impeller/entity/shaders/gaussian_blur/kernel.glsl
new file mode 100644
index 0000000000000000000000000000000000000000..1aba5ad3e9342924fa4fdc88240e5be1853f1fd3
--- /dev/null
+++ b/impeller/entity/shaders/gaussian_blur/kernel.glsl
@@ -0,0 +1,46 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <impeller/constants.glsl>
+#include <impeller/gaussian.glsl>
+#include <impeller/texture.glsl>
+#include <impeller/types.glsl>
+
+uniform f16sampler2D texture_sampler;
+
+struct KernelSample {
+  vec2 uv_offset;
+  float coefficient;
+};
+
+uniform KernelSamples {
+  int sample_count;
+  KernelSample samples[48];
+}
+blur_info;
+
+f16vec4 Sample(f16sampler2D tex, vec2 coords) {
+#if ENABLE_DECAL_SPECIALIZATION
+  return IPHalfSampleDecal(tex, coords);
+#else
+  return texture(tex, coords);
+#endif
+}
+
+in vec2 v_texture_coords;
+
+out f16vec4 frag_color;
+
+void main() {
+  f16vec4 total_color = f16vec4(0.0hf);
+
+  for (int i = 0; i < blur_info.sample_count; ++i) {
+    float16_t coefficient = float16_t(blur_info.samples[i].coefficient);
+    total_color +=
+        coefficient * Sample(texture_sampler,
+                             v_texture_coords + blur_info.samples[i].uv_offset);
+  }
+
+  frag_color = total_color;
+}
diff --git a/impeller/entity/shaders/gaussian_blur/kernel_decal.frag b/impeller/entity/shaders/gaussian_blur/kernel_decal.frag
new file mode 100644
index 0000000000000000000000000000000000000000..114ee133fd068e6c481c4fd97935308baf103525
--- /dev/null
+++ b/impeller/entity/shaders/gaussian_blur/kernel_decal.frag
@@ -0,0 +1,9 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+precision mediump float;
+
+#define ENABLE_DECAL_SPECIALIZATION 1
+
+#include "kernel.glsl"
diff --git a/impeller/entity/shaders/gaussian_blur/kernel_nodecal.frag b/impeller/entity/shaders/gaussian_blur/kernel_nodecal.frag
new file mode 100644
index 0000000000000000000000000000000000000000..ee87a79d00823bfe0d935c0672fbdcb303f48790
--- /dev/null
+++ b/impeller/entity/shaders/gaussian_blur/kernel_nodecal.frag
@@ -0,0 +1,9 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+precision mediump float;
+
+#define ENABLE_DECAL_SPECIALIZATION 0
+
+#include "kernel.glsl"
diff --git a/impeller/entity/shaders/geometry/points.comp b/impeller/entity/shaders/geometry/points.comp
new file mode 100644
index 0000000000000000000000000000000000000000..7d274ade499489400e0ba0c7537601f146272e3c
--- /dev/null
+++ b/impeller/entity/shaders/geometry/points.comp
@@ -0,0 +1,67 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <impeller/texture.glsl>
+#include <impeller/types.glsl>
+
+// Unused, see See PointFieldGeometry::GetPositionBuffer
+layout(local_size_x = 16) in;
+
+layout(std430) readonly buffer PointData {
+  // Size of this input data is frame_info.count;
+  vec2 points[];
+}
+point_data;
+
+layout(std430) writeonly buffer GeometryData {
+  // Size of this output data is frame_info.count * points_per_circle;
+  vec2 geometry[];
+}
+geometry_data;
+
+uniform FrameInfo {
+  uint count;
+  float16_t radius;
+  float16_t radian_start;
+  float16_t radian_step;
+  uint points_per_circle;
+  int divisions_per_circle;
+}
+frame_info;
+
+void main() {
+  uint ident = gl_GlobalInvocationID.x;
+  if (ident >= frame_info.count) {
+    return;
+  }
+
+  vec2 center = point_data.points[ident];
+  uint bufer_offset = ident * frame_info.points_per_circle;
+
+  float16_t elapsed_angle = frame_info.radian_start;
+
+  vec2 origin =
+      center + vec2(cos(elapsed_angle), sin(elapsed_angle)) * frame_info.radius;
+  geometry_data.geometry[bufer_offset++] = origin;
+
+  elapsed_angle += frame_info.radian_step;
+  vec2 pt1 =
+      center + vec2(cos(elapsed_angle), sin(elapsed_angle)) * frame_info.radius;
+  geometry_data.geometry[bufer_offset++] = pt1;
+
+  elapsed_angle += frame_info.radian_step;
+  vec2 pt2 =
+      center + vec2(cos(elapsed_angle), sin(elapsed_angle)) * frame_info.radius;
+  geometry_data.geometry[bufer_offset++] = pt2;
+
+  for (int i = 0; i < frame_info.divisions_per_circle - 3; i++) {
+    geometry_data.geometry[bufer_offset++] = origin;
+    geometry_data.geometry[bufer_offset++] = pt2;
+
+    elapsed_angle += frame_info.radian_step;
+    pt2 = center +
+          vec2(cos(elapsed_angle), sin(elapsed_angle)) * frame_info.radius;
+    geometry_data.geometry[bufer_offset++] = pt2;
+  }
+}
diff --git a/impeller/entity/shaders/geometry/uv.comp b/impeller/entity/shaders/geometry/uv.comp
new file mode 100644
index 0000000000000000000000000000000000000000..de4aacc18963b2beb2150fd34111d5d38bda90cc
--- /dev/null
+++ b/impeller/entity/shaders/geometry/uv.comp
@@ -0,0 +1,60 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <impeller/texture.glsl>
+#include <impeller/types.glsl>
+
+// Unused, see See PointFieldGeometry::GetPositionBuffer
+layout(local_size_x = 16) in;
+
+layout(std430) readonly buffer GeometryData {
+  // Size of this input data is frame_info.count;
+  vec2 points[];
+}
+geometry_data;
+
+layout(std430) writeonly buffer GeometryUVData {
+  // Size of this output data is frame_info.count;
+  // x,y is the original geometry.
+  // u,v is the texture UV.
+  vec4 points_uv[];
+}
+geometry_uv_data;
+
+uniform FrameInfo {
+  uint count;
+  mat4 effect_transform;
+  vec2 texture_origin;
+  vec2 texture_size;
+}
+frame_info;
+
+vec2 project_point(mat4 m, vec2 v) {
+  float w = v.x * m[0][3] + v.y * m[1][3] + m[3][3];
+  vec2 result = vec2(v.x * m[0][0] + v.y * m[1][0] + m[3][0],
+                     v.x * m[0][1] + v.y * m[1][1] + m[3][1]);
+
+  // This is Skia's behavior, but it may be reasonable to allow UB for the w=0
+  // case.
+  if (w != 0) {
+    w = 1 / w;
+  }
+  return result * w;
+}
+
+void main() {
+  uint ident = gl_GlobalInvocationID.x;
+  if (ident >= frame_info.count) {
+    return;
+  }
+
+  vec2 point = geometry_data.points[ident];
+
+  vec2 coverage_coords =
+      (point - frame_info.texture_origin) / frame_info.texture_size;
+  vec2 texture_coords =
+      project_point(frame_info.effect_transform, coverage_coords);
+
+  geometry_uv_data.points_uv[ident] = vec4(point, texture_coords);
+}
diff --git a/impeller/entity/shaders/glyph_atlas.frag b/impeller/entity/shaders/glyph_atlas.frag
index acfed85a3204b2ab9c36ff2602fd2b1c9d131481..8db425d0e97ff574af6928c22b2421289d16ae72 100644
--- a/impeller/entity/shaders/glyph_atlas.frag
+++ b/impeller/entity/shaders/glyph_atlas.frag
@@ -2,33 +2,25 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+precision mediump float;
+
 #include <impeller/types.glsl>
 
-uniform sampler2D glyph_atlas_sampler;
+uniform f16sampler2D glyph_atlas_sampler;
 
-uniform FragInfo {
-  vec2 atlas_size;
-  vec4 text_color;
-}
-frag_info;
+layout(constant_id = 0) const float use_alpha_color_channel = 1.0;
+
+in highp vec2 v_uv;
 
-in vec2 v_unit_position;
-in vec2 v_source_position;
-in vec2 v_source_glyph_size;
-in float v_has_color;
+IMPELLER_MAYBE_FLAT in f16vec4 v_text_color;
 
-out vec4 frag_color;
+out f16vec4 frag_color;
 
 void main() {
-  vec2 uv_size = v_source_glyph_size / frag_info.atlas_size;
-  vec2 uv_position = v_source_position / frag_info.atlas_size;
-  if (v_has_color == 1.0) {
-    frag_color =
-        texture(glyph_atlas_sampler, v_unit_position * uv_size + uv_position);
+  f16vec4 value = texture(glyph_atlas_sampler, v_uv);
+  if (use_alpha_color_channel == 1.0) {
+    frag_color = value.aaaa * v_text_color;
   } else {
-    frag_color =
-        texture(glyph_atlas_sampler, v_unit_position * uv_size + uv_position)
-            .aaaa *
-        frag_info.text_color;
+    frag_color = value.rrrr * v_text_color;
   }
 }
diff --git a/impeller/entity/shaders/glyph_atlas.vert b/impeller/entity/shaders/glyph_atlas.vert
index 514f0b67dbb34d84d0690af2c29075009c791068..c677997e7268ec8a26441a405fd0ca6048a80204 100644
--- a/impeller/entity/shaders/glyph_atlas.vert
+++ b/impeller/entity/shaders/glyph_atlas.vert
@@ -7,27 +7,79 @@
 
 uniform FrameInfo {
   mat4 mvp;
+  mat4 entity_transform;
+  vec2 atlas_size;
+  vec2 offset;
+  f16vec4 text_color;
+  float is_translation_scale;
 }
 frame_info;
 
+// XYWH.
+in vec4 atlas_glyph_bounds;
+// XYWH
+in vec4 glyph_bounds;
+
 in vec2 unit_position;
-in vec2 destination_position;
-in vec2 destination_size;
-in vec2 source_position;
-in vec2 source_glyph_size;
-in float has_color;
+in vec2 glyph_position;
+
+out vec2 v_uv;
+
+IMPELLER_MAYBE_FLAT out f16vec4 v_text_color;
 
-out vec2 v_unit_position;
-out vec2 v_source_position;
-out vec2 v_source_glyph_size;
-out float v_has_color;
+mat4 basis(mat4 m) {
+  return mat4(m[0][0], m[0][1], m[0][2], 0.0,  //
+              m[1][0], m[1][1], m[1][2], 0.0,  //
+              m[2][0], m[2][1], m[2][2], 0.0,  //
+              0.0, 0.0, 0.0, 1.0               //
+  );
+}
+
+vec2 project(mat4 m, vec2 v) {
+  float w = v.x * m[0][3] + v.y * m[1][3] + m[3][3];
+  vec2 result = vec2(v.x * m[0][0] + v.y * m[1][0] + m[3][0],
+                     v.x * m[0][1] + v.y * m[1][1] + m[3][1]);
+
+  // This is Skia's behavior, but it may be reasonable to allow UB for the w=0
+  // case.
+  if (w != 0) {
+    w = 1 / w;
+  }
+  return result * w;
+}
 
 void main() {
-  gl_Position = IPPositionForGlyphPosition(
-      frame_info.mvp, unit_position, destination_position, destination_size);
-  v_unit_position = unit_position;
-  // Pixel snap the source (sampling) start position.
-  v_source_position = round(source_position);
-  v_source_glyph_size = source_glyph_size;
-  v_has_color = has_color;
+  vec2 screen_offset =
+      round(project(frame_info.entity_transform, frame_info.offset));
+
+  // For each glyph, we compute two rectangles. One for the vertex positions
+  // and one for the texture coordinates (UVs).
+  vec2 uv_origin = (atlas_glyph_bounds.xy - vec2(0.5)) / frame_info.atlas_size;
+  vec2 uv_size = (atlas_glyph_bounds.zw + vec2(1)) / frame_info.atlas_size;
+
+  // Rounding here prevents most jitter between glyphs in the run when
+  // nearest sampling.
+  mat4 basis_transform = basis(frame_info.entity_transform);
+  vec2 screen_glyph_position =
+      screen_offset +
+      round(project(basis_transform, (glyph_position + glyph_bounds.xy)));
+
+  vec4 position;
+  if (frame_info.is_translation_scale == 1.0) {
+    // Rouding up here prevents the bounds from becoming 1 pixel too small
+    // when nearest sampling. This path breaks down for projections.
+    position = vec4(
+        screen_glyph_position +
+            ceil(project(basis_transform, unit_position * glyph_bounds.zw)),
+        0.0, 1.0);
+  } else {
+    position = frame_info.entity_transform *
+               vec4(frame_info.offset + glyph_position + glyph_bounds.xy +
+                        unit_position * glyph_bounds.zw,
+                    0.0, 1.0);
+  }
+
+  gl_Position = frame_info.mvp * position;
+  v_uv = uv_origin + unit_position * uv_size;
+  v_text_color = frame_info.text_color;
 }
diff --git a/impeller/entity/shaders/atlas_fill.frag b/impeller/entity/shaders/glyph_atlas_color.frag
similarity index 35%
rename from impeller/entity/shaders/atlas_fill.frag
rename to impeller/entity/shaders/glyph_atlas_color.frag
index 4862343926a78d6101c0bbb8d0130e4c621c262b..5b8ecc2520ce9ed4d735a3d150b8c6c99e8f3179 100644
--- a/impeller/entity/shaders/atlas_fill.frag
+++ b/impeller/entity/shaders/glyph_atlas_color.frag
@@ -2,29 +2,28 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <impeller/texture.glsl>
+precision mediump float;
+
 #include <impeller/types.glsl>
 
-uniform sampler2D texture_sampler;
+uniform f16sampler2D glyph_atlas_sampler;
 
 uniform FragInfo {
-  float texture_sampler_y_coord_scale;
-  float has_vertex_color;
-  float alpha;
+  float use_text_color;
 }
 frag_info;
 
-in vec2 v_texture_coords;
-in vec4 v_color;
+in highp vec2 v_uv;
+
+IMPELLER_MAYBE_FLAT in f16vec4 v_text_color;
 
-out vec4 frag_color;
+out f16vec4 frag_color;
 
 void main() {
-  vec4 sampled = IPSample(texture_sampler, v_texture_coords,
-                          frag_info.texture_sampler_y_coord_scale);
-  if (frag_info.has_vertex_color == 1.0) {
-    frag_color = sampled.aaaa * v_color * frag_info.alpha;
+  f16vec4 value = texture(glyph_atlas_sampler, v_uv);
+  if (frag_info.use_text_color == 1.0f) {
+    frag_color = value.aaaa * v_text_color;
   } else {
-    frag_color = sampled * frag_info.alpha;
+    frag_color = value * v_text_color.aaaa;
   }
 }
diff --git a/impeller/entity/shaders/glyph_atlas_sdf.frag b/impeller/entity/shaders/glyph_atlas_sdf.frag
deleted file mode 100644
index 0ded6865c63713f68be88bd976f884ebf9a1a7e3..0000000000000000000000000000000000000000
--- a/impeller/entity/shaders/glyph_atlas_sdf.frag
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <impeller/types.glsl>
-
-uniform sampler2D glyph_atlas_sampler;
-
-uniform FragInfo {
-  vec2 atlas_size;
-  vec4 text_color;
-}
-frag_info;
-
-in vec2 v_unit_position;
-in vec2 v_source_position;
-in vec2 v_source_glyph_size;
-
-out vec4 frag_color;
-
-void main() {
-  vec2 scale_perspective = v_source_glyph_size / frag_info.atlas_size;
-  vec2 offset = v_source_position / frag_info.atlas_size;
-
-  // Inspired by Metal by Example's SDF text rendering shader:
-  // https://github.com/metal-by-example/sample-code/blob/master/objc/12-TextRendering/TextRendering/Shaders.metal
-
-  // Outline of glyph is the isocontour with value 50%
-  float edge_distance = 0.5;
-  // Sample the signed-distance field to find distance from this fragment to the
-  // glyph outline
-  float sample_distance =
-      texture(glyph_atlas_sampler, v_unit_position * scale_perspective + offset)
-          .a;
-  // Use local automatic gradients to find anti-aliased anisotropic edge width,
-  // cf. Gustavson 2012
-  float edge_width = length(vec2(dFdx(sample_distance), dFdy(sample_distance)));
-  // Smooth the glyph edge by interpolating across the boundary in a band with
-  // the width determined above
-  float insideness = smoothstep(edge_distance - edge_width,
-                                edge_distance + edge_width, sample_distance);
-  frag_color = frag_info.text_color * insideness;
-}
diff --git a/impeller/entity/shaders/linear_gradient_fill.frag b/impeller/entity/shaders/linear_gradient_fill.frag
index 008d0a562e255be47c59cfbfc8cec3800050896b..4d9a90f89646479c84a264a3ae629f6afca6b5ef 100644
--- a/impeller/entity/shaders/linear_gradient_fill.frag
+++ b/impeller/entity/shaders/linear_gradient_fill.frag
@@ -2,34 +2,40 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+precision mediump float;
+
+#include <impeller/color.glsl>
 #include <impeller/texture.glsl>
 #include <impeller/types.glsl>
 
 uniform sampler2D texture_sampler;
 
-uniform GradientInfo {
-  vec2 start_point;
-  vec2 end_point;
+uniform FragInfo {
+  highp vec2 start_point;
+  highp vec2 end_point;
   float tile_mode;
+  vec4 decal_border_color;
   float texture_sampler_y_coord_scale;
   float alpha;
   vec2 half_texel;
 }
-gradient_info;
+frag_info;
 
-in vec2 v_position;
+highp in vec2 v_position;
 
 out vec4 frag_color;
 
 void main() {
-  float len = length(gradient_info.end_point - gradient_info.start_point);
-  float dot = dot(v_position - gradient_info.start_point,
-                  gradient_info.end_point - gradient_info.start_point);
-  float t = dot / (len * len);
-  frag_color = IPSampleLinearWithTileMode(
-      texture_sampler, vec2(t, 0.5),
-      gradient_info.texture_sampler_y_coord_scale, gradient_info.half_texel,
-      gradient_info.tile_mode);
+  vec2 start_to_end = frag_info.end_point - frag_info.start_point;
+  vec2 start_to_position = v_position - frag_info.start_point;
+  float t =
+      dot(start_to_position, start_to_end) / dot(start_to_end, start_to_end);
   frag_color =
-      vec4(frag_color.xyz * frag_color.a, frag_color.a) * gradient_info.alpha;
+      IPSampleLinearWithTileMode(texture_sampler,                          //
+                                 vec2(t, 0.5),                             //
+                                 frag_info.texture_sampler_y_coord_scale,  //
+                                 frag_info.half_texel,                     //
+                                 frag_info.tile_mode,                      //
+                                 frag_info.decal_border_color);
+  frag_color = IPPremultiply(frag_color) * frag_info.alpha;
 }
diff --git a/impeller/entity/shaders/linear_gradient_ssbo_fill.frag b/impeller/entity/shaders/linear_gradient_ssbo_fill.frag
index a2443ece8cadfcf498f064ad6d23612f6742f512..e64c33b4d12c17c16d3f04b3439c3c77c343dd04 100644
--- a/impeller/entity/shaders/linear_gradient_ssbo_fill.frag
+++ b/impeller/entity/shaders/linear_gradient_ssbo_fill.frag
@@ -2,43 +2,64 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <impeller/gradient.glsl>
+precision mediump float;
+
+#include <impeller/color.glsl>
+#include <impeller/dithering.glsl>
 #include <impeller/texture.glsl>
 #include <impeller/types.glsl>
 
-readonly buffer ColorData {
-  vec4 colors[];
+struct ColorPoint {
+  vec4 color;
+  float stop;
+};
+
+layout(std140) readonly buffer ColorData {
+  ColorPoint colors[];
 }
 color_data;
 
-uniform GradientInfo {
-  vec2 start_point;
-  vec2 end_point;
+uniform FragInfo {
+  highp vec2 start_point;
+  highp vec2 end_point;
   float alpha;
   float tile_mode;
-  float colors_length;
+  vec4 decal_border_color;
+  int colors_length;
 }
-gradient_info;
+frag_info;
 
-in vec2 v_position;
+highp in vec2 v_position;
 
 out vec4 frag_color;
 
 void main() {
-  float len = length(gradient_info.end_point - gradient_info.start_point);
-  float dot = dot(v_position - gradient_info.start_point,
-                  gradient_info.end_point - gradient_info.start_point);
-  float t = dot / (len * len);
-
-  if ((t < 0.0 || t > 1.0) && gradient_info.tile_mode == kTileModeDecal) {
-    frag_color = vec4(0);
-    return;
+  highp vec2 start_to_end = frag_info.end_point - frag_info.start_point;
+  highp vec2 start_to_position = v_position - frag_info.start_point;
+  highp float t =
+      dot(start_to_position, start_to_end) / dot(start_to_end, start_to_end);
+
+  if ((t < 0.0 || t > 1.0) && frag_info.tile_mode == kTileModeDecal) {
+    frag_color = frag_info.decal_border_color;
+  } else {
+    t = IPFloatTile(t, frag_info.tile_mode);
+
+    for (int i = 1; i < frag_info.colors_length; i++) {
+      ColorPoint prev_point = color_data.colors[i - 1];
+      ColorPoint current_point = color_data.colors[i];
+      if (t >= prev_point.stop && t <= current_point.stop) {
+        float delta = (current_point.stop - prev_point.stop);
+        if (delta < 0.001) {
+          frag_color = current_point.color;
+        } else {
+          float ratio = (t - prev_point.stop) / delta;
+          frag_color = mix(prev_point.color, current_point.color, ratio);
+        }
+        break;
+      }
+    }
   }
-  t = IPFloatTile(t, gradient_info.tile_mode);
-  vec3 values = IPComputeFixedGradientValues(t, gradient_info.colors_length);
 
-  frag_color = mix(color_data.colors[int(values.x)],
-                   color_data.colors[int(values.y)], values.z);
-  frag_color =
-      vec4(frag_color.xyz * frag_color.a, frag_color.a) * gradient_info.alpha;
+  frag_color = IPPremultiply(frag_color) * frag_info.alpha;
+  frag_color = IPOrderedDither8x8(frag_color, gl_FragCoord.xy);
 }
diff --git a/impeller/entity/shaders/linear_to_srgb_filter.frag b/impeller/entity/shaders/linear_to_srgb_filter.frag
index 0d6a99263df77b6d8b03a01f266788df23c48da4..d1f9e82930230aa499129ece00c7d3ed03f43b97 100644
--- a/impeller/entity/shaders/linear_to_srgb_filter.frag
+++ b/impeller/entity/shaders/linear_to_srgb_filter.frag
@@ -2,38 +2,38 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+precision mediump float;
+
 #include <impeller/color.glsl>
-#include <impeller/texture.glsl>
 #include <impeller/types.glsl>
 
 // A color filter that applies the sRGB gamma curve to the color.
 //
 // This filter is used so that the colors are suitable for display in monitors.
 
-uniform sampler2D input_texture;
+uniform f16sampler2D input_texture;
 
 uniform FragInfo {
-  float texture_sampler_y_coord_scale;
-  float input_alpha;
+  float16_t input_alpha;
 }
 frag_info;
 
-in vec2 v_position;
-out vec4 frag_color;
+in highp vec2 v_texture_coords;
+
+out f16vec4 frag_color;
 
 void main() {
-  vec4 input_color = IPSample(input_texture, v_position,
-                              frag_info.texture_sampler_y_coord_scale) *
-                     frag_info.input_alpha;
+  f16vec4 input_color =
+      texture(input_texture, v_texture_coords) * frag_info.input_alpha;
 
-  vec4 color = IPUnpremultiply(input_color);
+  f16vec4 color = IPHalfUnpremultiply(input_color);
   for (int i = 0; i < 3; i++) {
-    if (color[i] <= 0.0031308) {
-      color[i] = (color[i]) * 12.92;
+    if (color[i] <= 0.0031308hf) {
+      color[i] = (color[i]) * 12.92hf;
     } else {
-      color[i] = 1.055 * pow(color[i], (1.0 / 2.4)) - 0.055;
+      color[i] = 1.055hf * pow(color[i], (1.0hf / 2.4hf)) - 0.055hf;
     }
   }
 
-  frag_color = IPPremultiply(color);
+  frag_color = IPHalfPremultiply(color);
 }
diff --git a/impeller/entity/shaders/linear_to_srgb_filter.vert b/impeller/entity/shaders/linear_to_srgb_filter.vert
index 27b8ecedbf216a2fecb287dfd5be2872ffe47e69..5a631d8b1f039095cd65d33b03352ef8b9328dd9 100644
--- a/impeller/entity/shaders/linear_to_srgb_filter.vert
+++ b/impeller/entity/shaders/linear_to_srgb_filter.vert
@@ -2,17 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <impeller/conversions.glsl>
 #include <impeller/types.glsl>
 
 uniform FrameInfo {
   mat4 mvp;
+  float texture_sampler_y_coord_scale;
 }
 frame_info;
 
 in vec2 position;
-out vec2 v_position;
+
+out vec2 v_texture_coords;
 
 void main() {
-  v_position = position;
   gl_Position = frame_info.mvp * vec4(position, 0.0, 1.0);
+  v_texture_coords =
+      IPRemapCoords(position, frame_info.texture_sampler_y_coord_scale);
 }
diff --git a/impeller/entity/shaders/morphology_filter.frag b/impeller/entity/shaders/morphology_filter.frag
index dc80727a80c9258b9718e618a906d0b559519e1d..54d151e98bc6a375c546dbed1353ac0303dd583e 100644
--- a/impeller/entity/shaders/morphology_filter.frag
+++ b/impeller/entity/shaders/morphology_filter.frag
@@ -2,41 +2,46 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+precision mediump float;
+
+layout(constant_id = 0) const float supports_decal = 1.0;
+
 #include <impeller/constants.glsl>
 #include <impeller/texture.glsl>
 #include <impeller/types.glsl>
 
 // These values must correspond to the order of the items in the
 // 'FilterContents::MorphType' enum class.
-const float kMorphTypeDilate = 0;
-const float kMorphTypeErode = 1;
+const float16_t kMorphTypeDilate = 0.0hf;
+const float16_t kMorphTypeErode = 1.0hf;
 
-uniform sampler2D texture_sampler;
+uniform f16sampler2D texture_sampler;
 
 uniform FragInfo {
-  float texture_sampler_y_coord_scale;
-  vec2 texture_size;
-  vec2 direction;
-  float radius;
-  float morph_type;
+  f16vec2 uv_offset;
+  float16_t radius;
+  float16_t morph_type;
+  float supports_decal_sampler_address_mode;
 }
 frag_info;
 
-in vec2 v_texture_coords;
-out vec4 frag_color;
+in highp vec2 v_texture_coords;
+
+out f16vec4 frag_color;
 
 void main() {
-  vec4 result = frag_info.morph_type == kMorphTypeDilate ? vec4(0) : vec4(1);
-  vec2 uv_offset = frag_info.direction / frag_info.texture_size;
-  for (float i = -frag_info.radius; i <= frag_info.radius; i++) {
-    vec2 texture_coords = v_texture_coords + uv_offset * i;
-    vec4 color;
-    color = IPSampleWithTileMode(
-        texture_sampler,                          // sampler
-        texture_coords,                           // texture coordinates
-        frag_info.texture_sampler_y_coord_scale,  // y coordinate scale
-        kTileModeDecal                            // tile mode
-    );
+  f16vec4 result =
+      frag_info.morph_type == kMorphTypeDilate ? f16vec4(0.0) : f16vec4(1.0);
+  for (float16_t i = -frag_info.radius; i <= frag_info.radius; i++) {
+    vec2 texture_coords = v_texture_coords + frag_info.uv_offset * i;
+
+    f16vec4 color;
+    if (supports_decal == 1) {
+      color = texture(texture_sampler, texture_coords);
+    } else {
+      color = IPHalfSampleDecal(texture_sampler, texture_coords);
+    }
+
     if (frag_info.morph_type == kMorphTypeDilate) {
       result = max(color, result);
     } else {
diff --git a/impeller/entity/shaders/morphology_filter.vert b/impeller/entity/shaders/morphology_filter.vert
index a504e7a9e23c8e02fabfedd75f4fe539a5b10858..0dbc6fd4bfad431ad2d5e89a819992613da9f9ad 100644
--- a/impeller/entity/shaders/morphology_filter.vert
+++ b/impeller/entity/shaders/morphology_filter.vert
@@ -2,10 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <impeller/conversions.glsl>
 #include <impeller/types.glsl>
 
 uniform FrameInfo {
   mat4 mvp;
+  float texture_sampler_y_coord_scale;
 }
 frame_info;
 
@@ -16,5 +18,6 @@ out vec2 v_texture_coords;
 
 void main() {
   gl_Position = frame_info.mvp * vec4(position, 0.0, 1.0);
-  v_texture_coords = texture_coords;
+  v_texture_coords =
+      IPRemapCoords(texture_coords, frame_info.texture_sampler_y_coord_scale);
 }
diff --git a/impeller/entity/shaders/position_color.vert b/impeller/entity/shaders/position_color.vert
index f36ded01e025780c132d48bfebf5e9ac73915155..d6b35c464f7d9078d5e66a28b3fdf018bd85b088 100644
--- a/impeller/entity/shaders/position_color.vert
+++ b/impeller/entity/shaders/position_color.vert
@@ -5,17 +5,17 @@
 #include <impeller/transform.glsl>
 #include <impeller/types.glsl>
 
-uniform VertInfo {
+uniform FrameInfo {
   mat4 mvp;
 }
-vert_info;
+frame_info;
 
 in vec2 position;
 in vec4 color;
 
-out vec4 v_color;
+out f16vec4 v_color;
 
 void main() {
-  gl_Position = vert_info.mvp * vec4(position, 0.0, 1.0);
-  v_color = color;
+  gl_Position = frame_info.mvp * vec4(position, 0.0, 1.0);
+  v_color = f16vec4(color);
 }
diff --git a/impeller/entity/shaders/radial_gradient_fill.frag b/impeller/entity/shaders/radial_gradient_fill.frag
index 9d3a4d64bb7d17c95e6410d920f8ca1310e3b6b0..c1bbe80af7e06613d991293da9bc2da1fb6dfab3 100644
--- a/impeller/entity/shaders/radial_gradient_fill.frag
+++ b/impeller/entity/shaders/radial_gradient_fill.frag
@@ -2,32 +2,38 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+precision mediump float;
+
+#include <impeller/color.glsl>
 #include <impeller/texture.glsl>
 #include <impeller/types.glsl>
 
 uniform sampler2D texture_sampler;
 
-uniform GradientInfo {
-  vec2 center;
+uniform FragInfo {
+  highp vec2 center;
   float radius;
   float tile_mode;
+  vec4 decal_border_color;
   float texture_sampler_y_coord_scale;
   float alpha;
   vec2 half_texel;
 }
-gradient_info;
+frag_info;
 
-in vec2 v_position;
+highp in vec2 v_position;
 
 out vec4 frag_color;
 
 void main() {
-  float len = length(v_position - gradient_info.center);
-  float t = len / gradient_info.radius;
-  frag_color = IPSampleLinearWithTileMode(
-      texture_sampler, vec2(t, 0.5),
-      gradient_info.texture_sampler_y_coord_scale, gradient_info.half_texel,
-      gradient_info.tile_mode);
+  float len = length(v_position - frag_info.center);
+  float t = len / frag_info.radius;
   frag_color =
-      vec4(frag_color.xyz * frag_color.a, frag_color.a) * gradient_info.alpha;
+      IPSampleLinearWithTileMode(texture_sampler,                          //
+                                 vec2(t, 0.5),                             //
+                                 frag_info.texture_sampler_y_coord_scale,  //
+                                 frag_info.half_texel,                     //
+                                 frag_info.tile_mode,                      //
+                                 frag_info.decal_border_color);
+  frag_color = IPPremultiply(frag_color) * frag_info.alpha;
 }
diff --git a/impeller/entity/shaders/radial_gradient_ssbo_fill.frag b/impeller/entity/shaders/radial_gradient_ssbo_fill.frag
index 0b6496c0d7a68286efce3b228a4a61c5a640d265..2a7390ce39e0b649c139d8540a28987a6c1e0640 100644
--- a/impeller/entity/shaders/radial_gradient_ssbo_fill.frag
+++ b/impeller/entity/shaders/radial_gradient_ssbo_fill.frag
@@ -2,41 +2,64 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+precision mediump float;
+
+#include <impeller/color.glsl>
+#include <impeller/dithering.glsl>
 #include <impeller/gradient.glsl>
 #include <impeller/texture.glsl>
 #include <impeller/types.glsl>
 
-readonly buffer ColorData {
-  vec4 colors[];
+struct ColorPoint {
+  vec4 color;
+  float stop;
+};
+
+layout(std140) readonly buffer ColorData {
+  ColorPoint colors[];
 }
 color_data;
 
-uniform GradientInfo {
-  vec2 center;
+uniform FragInfo {
+  highp vec2 center;
   float radius;
   float tile_mode;
+  vec4 decal_border_color;
   float alpha;
-  float colors_length;
+  int colors_length;
 }
-gradient_info;
+frag_info;
 
-in vec2 v_position;
+highp in vec2 v_position;
 
 out vec4 frag_color;
 
 void main() {
-  float len = length(v_position - gradient_info.center);
-  float t = len / gradient_info.radius;
+  float len = length(v_position - frag_info.center);
+  float t = len / frag_info.radius;
+
+  vec4 result_color = vec4(0);
+  if ((t < 0.0 || t > 1.0) && frag_info.tile_mode == kTileModeDecal) {
+    result_color = frag_info.decal_border_color;
+  } else {
+    t = IPFloatTile(t, frag_info.tile_mode);
 
-  if ((t < 0.0 || t > 1.0) && gradient_info.tile_mode == kTileModeDecal) {
-    frag_color = vec4(0);
-    return;
+    for (int i = 1; i < frag_info.colors_length; i++) {
+      ColorPoint prev_point = color_data.colors[i - 1];
+      ColorPoint current_point = color_data.colors[i];
+      if (t >= prev_point.stop && t <= current_point.stop) {
+        float delta = (current_point.stop - prev_point.stop);
+        if (delta < 0.001) {
+          result_color = current_point.color;
+        } else {
+          float ratio = (t - prev_point.stop) / delta;
+          result_color = mix(prev_point.color, current_point.color, ratio);
+        }
+        break;
+      }
+    }
   }
-  t = IPFloatTile(t, gradient_info.tile_mode);
-  vec3 values = IPComputeFixedGradientValues(t, gradient_info.colors_length);
 
-  frag_color = mix(color_data.colors[int(values.x)],
-                   color_data.colors[int(values.y)], values.z);
-  frag_color =
-      vec4(frag_color.xyz * frag_color.a, frag_color.a) * gradient_info.alpha;
+  frag_color = IPPremultiply(result_color) * frag_info.alpha;
+  frag_color = IPOrderedDither8x8(frag_color, gl_FragCoord.xy);
 }
diff --git a/impeller/entity/shaders/rrect_blur.frag b/impeller/entity/shaders/rrect_blur.frag
index 7a82a57805e63597b9e33ddc31af65e410f24834..bc4e9c7d4d01fe102c835cb1a98f7961aa1ccbf1 100644
--- a/impeller/entity/shaders/rrect_blur.frag
+++ b/impeller/entity/shaders/rrect_blur.frag
@@ -2,64 +2,94 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+precision highp float;
+
 #include <impeller/gaussian.glsl>
 #include <impeller/types.glsl>
 
 uniform FragInfo {
-  vec4 color;
-  float blur_sigma;
+  f16vec4 color;
   vec2 rect_size;
-  float corner_radius;
+  float blur_sigma;
+  vec2 corner_radii;
 }
 frag_info;
 
 in vec2 v_position;
 
-out vec4 frag_color;
-
-const int kSampleCount = 5;
+out f16vec4 frag_color;
 
-float RRectDistance(vec2 sample_position, vec2 half_size) {
-  vec2 space = abs(sample_position) - half_size + frag_info.corner_radius;
-  return length(max(space, 0.0)) + min(max(space.x, space.y), 0.0) -
-         frag_info.corner_radius;
-}
+const int kSampleCount = 4;
 
 /// Closed form unidirectional rounded rect blur mask solution using the
 /// analytical Gaussian integral (with approximated erf).
-float RRectShadowX(vec2 sample_position, vec2 half_size) {
-  // Compute the X direction distance field (not incorporating the Y distance)
-  // for the rounded rect.
-  float space =
-      min(0, half_size.y - frag_info.corner_radius - abs(sample_position.y));
+float RRectBlurX(vec2 sample_position, vec2 half_size) {
+  // The vertical edge of the rrect consists of a flat portion and a curved
+  // portion, the two of which vary in size depending on the size of the
+  // corner radii, both adding up to half_size.y.
+  // half_size.y - corner_radii.y is the size of the vertical flat
+  // portion of the rrect.
+  // subtracting the absolute value of the Y sample_position will be
+  // negative (and then clamped to 0) for positions that are located
+  // vertically in the flat part of the rrect, and will be the relative
+  // distance from the center of curvature otherwise.
+  float space_y =
+      min(0.0, half_size.y - frag_info.corner_radii.y - abs(sample_position.y));
+  // space is now in the range [0.0, corner_radii.y]. If the y sample was
+  // in the flat portion of the rrect, it will be 0.0
+
+  // We will now calculate rrect_distance as the distance from the centerline
+  // of the rrect towards the near side of the rrect.
+  // half_size.x - frag_info.corner_radii.x is the size of the horizontal
+  // flat portion of the rrect.
+  // We add to that the X size (space_x) of the curved corner measured at
+  // the indicated Y coordinate we calculated as space_y, such that:
+  //   (space_y / corner_radii.y)^2 + (space_x / corner_radii.x)^2 == 1.0
+  // Since we want the space_x, we rearrange the equation as:
+  //   space_x = corner_radii.x * sqrt(1.0 - (space_y / corner_radii.y)^2)
+  // We need to prevent negative values inside the sqrt which can occur
+  // when the Y sample was beyond the vertical size of the rrect and thus
+  // space_y was larger than corner_radii.y.
+  // The calling function RRectBlur will never provide a Y sample outside
+  // of that range, though, so the max(0.0) is mostly a precaution.
+  float unit_space_y = space_y / frag_info.corner_radii.y;
+  float unit_space_x = sqrt(max(0.0, 1.0 - unit_space_y * unit_space_y));
   float rrect_distance =
-      half_size.x - frag_info.corner_radius +
-      sqrt(max(0, frag_info.corner_radius * frag_info.corner_radius -
-                      space * space));
-
-  // Map the linear distance field to the analytical Gaussian integral.
-  vec2 integral = IPVec2GaussianIntegral(
-      sample_position.x + vec2(-rrect_distance, rrect_distance),
-      frag_info.blur_sigma);
+      half_size.x - frag_info.corner_radii.x * (1.0 - unit_space_x);
+
+  // Now we integrate the Gaussian over the range of the relative positions
+  // of the left and right sides of the rrect relative to the sampling
+  // X coordinate.
+  vec2 integral = IPVec2FastGaussianIntegral(
+      float(sample_position.x) + vec2(-rrect_distance, rrect_distance),
+      float(frag_info.blur_sigma));
+  // integral.y contains the evaluation of the indefinite gaussian integral
+  // function at (X + rrect_distance) and integral.x contains the evaluation
+  // of it at (X - rrect_distance). Subtracting the two produces the
+  // integral result over the range from one to the other.
   return integral.y - integral.x;
 }
 
-float RRectShadow(vec2 sample_position, vec2 half_size) {
+float RRectBlur(vec2 sample_position, vec2 half_size) {
   // Limit the sampling range to 3 standard deviations in the Y direction from
   // the kernel center to incorporate 99.7% of the color contribution.
-  float half_sampling_range = frag_info.blur_sigma * 3;
+  float half_sampling_range = frag_info.blur_sigma * 3.0;
 
+  // We want to cover the range [Y - half_range, Y + half_range], but we
+  // don't want to sample beyond the edge of the rrect (where the RRectBlurX
+  // function produces bad information and where the real answer at those
+  // locations will be 0.0 anyway).
   float begin_y = max(-half_sampling_range, sample_position.y - half_size.y);
   float end_y = min(half_sampling_range, sample_position.y + half_size.y);
   float interval = (end_y - begin_y) / kSampleCount;
 
   // Sample the X blur kSampleCount times, weighted by the Gaussian function.
-  float result = 0;
+  float result = 0.0;
   for (int sample_i = 0; sample_i < kSampleCount; sample_i++) {
-    float y = begin_y + interval * (sample_i + 0.5);
-    result += RRectShadowX(vec2(sample_position.x, sample_position.y - y),
-                           half_size) *
-              IPGaussian(y, frag_info.blur_sigma) * interval;
+    float y = begin_y + interval * (float(sample_i) + 0.5);
+    result +=
+        RRectBlurX(vec2(sample_position.x, sample_position.y - y), half_size) *
+        IPGaussian(float(y), float(frag_info.blur_sigma)) * interval;
   }
 
   return result;
@@ -71,9 +101,5 @@ void main() {
   vec2 half_size = frag_info.rect_size * 0.5;
   vec2 sample_position = v_position - half_size;
 
-  if (frag_info.blur_sigma > 0) {
-    frag_color *= RRectShadow(sample_position, half_size);
-  } else {
-    frag_color *= -RRectDistance(sample_position, half_size);
-  }
+  frag_color *= float16_t(RRectBlur(sample_position, half_size));
 }
diff --git a/impeller/entity/shaders/rrect_blur.vert b/impeller/entity/shaders/rrect_blur.vert
index 8ada4365f413841c07dd8382af4ce73380f83c1c..87382f6b4dcbe7226ba4cc498999c0cfbf0add87 100644
--- a/impeller/entity/shaders/rrect_blur.vert
+++ b/impeller/entity/shaders/rrect_blur.vert
@@ -4,17 +4,17 @@
 
 #include <impeller/types.glsl>
 
-uniform VertInfo {
+uniform FrameInfo {
   mat4 mvp;
 }
-vert_info;
+frame_info;
 
 in vec2 position;
 
 out vec2 v_position;
 
 void main() {
-  gl_Position = vert_info.mvp * vec4(position, 0.0, 1.0);
+  gl_Position = frame_info.mvp * vec4(position, 0.0, 1.0);
   // The fragment stage uses local coordinates to compute the blur.
   v_position = position;
 }
diff --git a/impeller/entity/shaders/runtime_effect.vert b/impeller/entity/shaders/runtime_effect.vert
index bf69bf1ed69a7d6e8ae7a5a12f82ba7f09ad30cd..77b92d221142ce92b4c59c8353fda9258ef277b5 100644
--- a/impeller/entity/shaders/runtime_effect.vert
+++ b/impeller/entity/shaders/runtime_effect.vert
@@ -4,15 +4,18 @@
 
 #include <impeller/types.glsl>
 
-uniform VertInfo {
+uniform FrameInfo {
   mat4 mvp;
 }
-vert_info;
+frame_info;
 
 in vec2 position;
-out vec2 v_position;
+// Note: The GLES backend uses name matching for attribute locations. This name
+// must match the name of the attribute input in:
+// impeller/compiler/shader_lib/flutter/runtime_effect.glsl
+out vec2 _fragCoord;
 
 void main() {
-  gl_Position = vert_info.mvp * vec4(position, 0.0, 1.0);
-  v_position = position;
+  gl_Position = frame_info.mvp * vec4(position, 0.0, 1.0);
+  _fragCoord = position;
 }
diff --git a/impeller/entity/shaders/solid_fill.frag b/impeller/entity/shaders/solid_fill.frag
index 28c7776da9e1d9efceabbe76945d367ff6bade9b..ed376a71d85bbbfd1dd6fa28ad6ed54993c709cf 100644
--- a/impeller/entity/shaders/solid_fill.frag
+++ b/impeller/entity/shaders/solid_fill.frag
@@ -2,15 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+precision mediump float;
+
 #include <impeller/types.glsl>
 
-uniform FragInfo {
-  vec4 color;
-}
-frag_info;
+IMPELLER_MAYBE_FLAT in f16vec4 v_color;
 
-out vec4 frag_color;
+out f16vec4 frag_color;
 
 void main() {
-  frag_color = frag_info.color;
+  frag_color = v_color;
 }
diff --git a/impeller/entity/shaders/solid_fill.vert b/impeller/entity/shaders/solid_fill.vert
index 3ced5986276c774167bba7a3570ea57890144353..76733804d6e45f599c20a9c12e58a71d7e64d7db 100644
--- a/impeller/entity/shaders/solid_fill.vert
+++ b/impeller/entity/shaders/solid_fill.vert
@@ -4,13 +4,17 @@
 
 #include <impeller/types.glsl>
 
-uniform VertInfo {
+uniform FrameInfo {
   mat4 mvp;
+  f16vec4 color;
 }
-vert_info;
+frame_info;
 
 in vec2 position;
 
+IMPELLER_MAYBE_FLAT out f16vec4 v_color;
+
 void main() {
-  gl_Position = vert_info.mvp * vec4(position, 0.0, 1.0);
+  v_color = frame_info.color;
+  gl_Position = frame_info.mvp * vec4(position, 0.0, 1.0);
 }
diff --git a/impeller/entity/shaders/srgb_to_linear_filter.frag b/impeller/entity/shaders/srgb_to_linear_filter.frag
index fcef8e99d545de7d9a8a9ebfde5957de67169d04..67736e2185563708c9d936c4b1b5ed955c511743 100644
--- a/impeller/entity/shaders/srgb_to_linear_filter.frag
+++ b/impeller/entity/shaders/srgb_to_linear_filter.frag
@@ -2,38 +2,37 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+precision mediump float;
+
 #include <impeller/color.glsl>
-#include <impeller/texture.glsl>
 
 // Creates a color filter that applies the inverse of the sRGB gamma curve
 // to the RGB channels.
 
 #include <impeller/types.glsl>
 
-uniform sampler2D input_texture;
+uniform f16sampler2D input_texture;
 
 uniform FragInfo {
-  float texture_sampler_y_coord_scale;
-  float input_alpha;
+  float16_t input_alpha;
 }
 frag_info;
 
-in vec2 v_position;
-out vec4 frag_color;
+in highp vec2 v_texture_coords;
+out f16vec4 frag_color;
 
 void main() {
-  vec4 input_color = IPSample(input_texture, v_position,
-                              frag_info.texture_sampler_y_coord_scale) *
-                     frag_info.input_alpha;
+  f16vec4 input_color =
+      texture(input_texture, v_texture_coords) * frag_info.input_alpha;
 
-  vec4 color = IPUnpremultiply(input_color);
+  f16vec4 color = IPHalfUnpremultiply(input_color);
   for (int i = 0; i < 3; i++) {
-    if (color[i] <= 0.04045) {
-      color[i] = color[i] / 12.92;
+    if (color[i] <= 0.04045hf) {
+      color[i] = color[i] / 12.92hf;
     } else {
-      color[i] = pow((color[i] + 0.055) / 1.055, 2.4);
+      color[i] = pow((color[i] + 0.055hf) / 1.055hf, 2.4hf);
     }
   }
 
-  frag_color = IPPremultiply(color);
+  frag_color = IPHalfPremultiply(color);
 }
diff --git a/impeller/entity/shaders/srgb_to_linear_filter.vert b/impeller/entity/shaders/srgb_to_linear_filter.vert
index 27b8ecedbf216a2fecb287dfd5be2872ffe47e69..5a631d8b1f039095cd65d33b03352ef8b9328dd9 100644
--- a/impeller/entity/shaders/srgb_to_linear_filter.vert
+++ b/impeller/entity/shaders/srgb_to_linear_filter.vert
@@ -2,17 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <impeller/conversions.glsl>
 #include <impeller/types.glsl>
 
 uniform FrameInfo {
   mat4 mvp;
+  float texture_sampler_y_coord_scale;
 }
 frame_info;
 
 in vec2 position;
-out vec2 v_position;
+
+out vec2 v_texture_coords;
 
 void main() {
-  v_position = position;
   gl_Position = frame_info.mvp * vec4(position, 0.0, 1.0);
+  v_texture_coords =
+      IPRemapCoords(position, frame_info.texture_sampler_y_coord_scale);
 }
diff --git a/impeller/entity/shaders/sweep_gradient_fill.frag b/impeller/entity/shaders/sweep_gradient_fill.frag
index 47d70f023a4c6cb2beb90e0e23d30a675bef6350..fba9e2b4586e2a59e7a61c74f35f917ed4975267 100644
--- a/impeller/entity/shaders/sweep_gradient_fill.frag
+++ b/impeller/entity/shaders/sweep_gradient_fill.frag
@@ -2,37 +2,42 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+precision mediump float;
+
+#include <impeller/color.glsl>
 #include <impeller/constants.glsl>
 #include <impeller/texture.glsl>
 #include <impeller/types.glsl>
 
 uniform sampler2D texture_sampler;
 
-uniform GradientInfo {
-  vec2 center;
+uniform FragInfo {
+  highp vec2 center;
   float bias;
   float scale;
   float tile_mode;
+  vec4 decal_border_color;
   float texture_sampler_y_coord_scale;
   float alpha;
   vec2 half_texel;
 }
-gradient_info;
+frag_info;
 
-in vec2 v_position;
+highp in vec2 v_position;
 
 out vec4 frag_color;
 
 void main() {
-  vec2 coord = v_position - gradient_info.center;
+  vec2 coord = v_position - frag_info.center;
   float angle = atan(-coord.y, -coord.x);
 
-  float t =
-      (angle * k1Over2Pi + 0.5 + gradient_info.bias) * gradient_info.scale;
-  frag_color = IPSampleLinearWithTileMode(
-      texture_sampler, vec2(t, 0.5),
-      gradient_info.texture_sampler_y_coord_scale, gradient_info.half_texel,
-      gradient_info.tile_mode);
+  float t = (angle * k1Over2Pi + 0.5 + frag_info.bias) * frag_info.scale;
   frag_color =
-      vec4(frag_color.xyz * frag_color.a, frag_color.a) * gradient_info.alpha;
+      IPSampleLinearWithTileMode(texture_sampler,                          //
+                                 vec2(t, 0.5),                             //
+                                 frag_info.texture_sampler_y_coord_scale,  //
+                                 frag_info.half_texel,                     //
+                                 frag_info.tile_mode,                      //
+                                 frag_info.decal_border_color);
+  frag_color = IPPremultiply(frag_color) * frag_info.alpha;
 }
diff --git a/impeller/entity/shaders/sweep_gradient_ssbo_fill.frag b/impeller/entity/shaders/sweep_gradient_ssbo_fill.frag
index 9fe30f94ad99c67ab43ab04821307a4e6f54ab4c..20d7f7d91b1481d886c77ee7b1f1502b908fda39 100644
--- a/impeller/entity/shaders/sweep_gradient_ssbo_fill.frag
+++ b/impeller/entity/shaders/sweep_gradient_ssbo_fill.frag
@@ -2,45 +2,65 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <impeller/color.glsl>
 #include <impeller/constants.glsl>
+#include <impeller/dithering.glsl>
 #include <impeller/gradient.glsl>
 #include <impeller/texture.glsl>
 #include <impeller/types.glsl>
 
-readonly buffer ColorData {
-  vec4 colors[];
+struct ColorPoint {
+  vec4 color;
+  float stop;
+};
+
+layout(std140) readonly buffer ColorData {
+  ColorPoint colors[];
 }
 color_data;
 
-uniform GradientInfo {
-  vec2 center;
+uniform FragInfo {
+  highp vec2 center;
   float bias;
   float scale;
   float tile_mode;
+  vec4 decal_border_color;
   float alpha;
-  float colors_length;
+  int colors_length;
 }
-gradient_info;
+frag_info;
 
-in vec2 v_position;
+highp in vec2 v_position;
 
 out vec4 frag_color;
 
 void main() {
-  vec2 coord = v_position - gradient_info.center;
+  vec2 coord = v_position - frag_info.center;
   float angle = atan(-coord.y, -coord.x);
-  float t =
-      (angle * k1Over2Pi + 0.5 + gradient_info.bias) * gradient_info.scale;
+  float t = (angle * k1Over2Pi + 0.5 + frag_info.bias) * frag_info.scale;
+
+  vec4 result_color = vec4(0);
+  if ((t < 0.0 || t > 1.0) && frag_info.tile_mode == kTileModeDecal) {
+    result_color = frag_info.decal_border_color;
+  } else {
+    t = IPFloatTile(t, frag_info.tile_mode);
 
-  if ((t < 0.0 || t > 1.0) && gradient_info.tile_mode == kTileModeDecal) {
-    frag_color = vec4(0);
-    return;
+    for (int i = 1; i < frag_info.colors_length; i++) {
+      ColorPoint prev_point = color_data.colors[i - 1];
+      ColorPoint current_point = color_data.colors[i];
+      if (t >= prev_point.stop && t <= current_point.stop) {
+        float delta = (current_point.stop - prev_point.stop);
+        if (delta < 0.001) {
+          result_color = current_point.color;
+        } else {
+          float ratio = (t - prev_point.stop) / delta;
+          result_color = mix(prev_point.color, current_point.color, ratio);
+        }
+        break;
+      }
+    }
   }
-  t = IPFloatTile(t, gradient_info.tile_mode);
-  vec3 values = IPComputeFixedGradientValues(t, gradient_info.colors_length);
 
-  frag_color = mix(color_data.colors[int(values.x)],
-                   color_data.colors[int(values.y)], values.z);
-  frag_color =
-      vec4(frag_color.xyz * frag_color.a, frag_color.a) * gradient_info.alpha;
+  frag_color = IPPremultiply(result_color) * frag_info.alpha;
+  frag_color = IPOrderedDither8x8(frag_color, gl_FragCoord.xy);
 }
diff --git a/impeller/entity/shaders/texture_fill.frag b/impeller/entity/shaders/texture_fill.frag
index 9b8a8a6bab8026b985e0c45f8db8045dc7eb5056..c520b4701ce8dcd37d6ad1e5158754ae9bc1a600 100644
--- a/impeller/entity/shaders/texture_fill.frag
+++ b/impeller/entity/shaders/texture_fill.frag
@@ -2,23 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <impeller/texture.glsl>
-#include <impeller/types.glsl>
+precision mediump float;
 
-uniform sampler2D texture_sampler;
+#include <impeller/constants.glsl>
+#include <impeller/types.glsl>
 
-uniform FragInfo {
-  float texture_sampler_y_coord_scale;
-  float alpha;
-}
-frag_info;
+uniform f16sampler2D texture_sampler;
 
-in vec2 v_texture_coords;
+in highp vec2 v_texture_coords;
+IMPELLER_MAYBE_FLAT in float16_t v_alpha;
 
-out vec4 frag_color;
+out f16vec4 frag_color;
 
 void main() {
-  vec4 sampled = IPSample(texture_sampler, v_texture_coords,
-                          frag_info.texture_sampler_y_coord_scale);
-  frag_color = sampled * frag_info.alpha;
+  f16vec4 sampled =
+      texture(texture_sampler, v_texture_coords, kDefaultMipBiasHalf);
+  frag_color = sampled * v_alpha;
 }
diff --git a/impeller/entity/shaders/texture_fill.vert b/impeller/entity/shaders/texture_fill.vert
index 212f9e288f34fab103cc69721f3c5632449f3688..26e5f73f713b5c4d3307598bc53f030b0c1daebc 100644
--- a/impeller/entity/shaders/texture_fill.vert
+++ b/impeller/entity/shaders/texture_fill.vert
@@ -2,19 +2,25 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <impeller/conversions.glsl>
 #include <impeller/types.glsl>
 
-uniform VertInfo {
+uniform FrameInfo {
   mat4 mvp;
+  float texture_sampler_y_coord_scale;
+  float16_t alpha;
 }
-vert_info;
+frame_info;
 
 in vec2 position;
 in vec2 texture_coords;
 
 out vec2 v_texture_coords;
+IMPELLER_MAYBE_FLAT out float16_t v_alpha;
 
 void main() {
-  gl_Position = vert_info.mvp * vec4(position, 0.0, 1.0);
-  v_texture_coords = texture_coords;
+  gl_Position = frame_info.mvp * vec4(position, 0.0, 1.0);
+  v_alpha = frame_info.alpha;
+  v_texture_coords =
+      IPRemapCoords(texture_coords, frame_info.texture_sampler_y_coord_scale);
 }
diff --git a/impeller/entity/shaders/texture_fill_external.frag b/impeller/entity/shaders/texture_fill_external.frag
new file mode 100644
index 0000000000000000000000000000000000000000..b402c113eb95048eecdb48bd12c5694458d87a79
--- /dev/null
+++ b/impeller/entity/shaders/texture_fill_external.frag
@@ -0,0 +1,16 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+uniform sampler2D SAMPLER_EXTERNAL_OES_texture_sampler;
+
+in vec2 v_texture_coords;
+in float v_alpha;
+
+out vec4 frag_color;
+
+void main() {
+  vec4 sampled =
+      texture(SAMPLER_EXTERNAL_OES_texture_sampler, v_texture_coords);
+  frag_color = sampled * v_alpha;
+}
diff --git a/impeller/entity/shaders/texture_fill_strict_src.frag b/impeller/entity/shaders/texture_fill_strict_src.frag
new file mode 100644
index 0000000000000000000000000000000000000000..04f40298441f95450d37305c2dabfc932bf4b743
--- /dev/null
+++ b/impeller/entity/shaders/texture_fill_strict_src.frag
@@ -0,0 +1,30 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+precision mediump float;
+
+#include <impeller/constants.glsl>
+#include <impeller/types.glsl>
+
+uniform f16sampler2D texture_sampler;
+
+uniform FragInfo {
+  vec4 source_rect;
+}
+frag_info;
+
+in highp vec2 v_texture_coords;
+IMPELLER_MAYBE_FLAT in float16_t v_alpha;
+
+out f16vec4 frag_color;
+
+void main() {
+  vec2 texture_coords = vec2(clamp(v_texture_coords.x, frag_info.source_rect.x,
+                                   frag_info.source_rect.z),
+                             clamp(v_texture_coords.y, frag_info.source_rect.y,
+                                   frag_info.source_rect.w));
+  f16vec4 sampled =
+      texture(texture_sampler, texture_coords, kDefaultMipBiasHalf);
+  frag_color = sampled * v_alpha;
+}
diff --git a/impeller/entity/shaders/tiled_texture_fill.frag b/impeller/entity/shaders/tiled_texture_fill.frag
index 2c3c4ea8ab07a811abd2d8358fca2d21f406a2c4..5e8413ef98f9c94a5a137266dc1542635fd00133 100644
--- a/impeller/entity/shaders/tiled_texture_fill.frag
+++ b/impeller/entity/shaders/tiled_texture_fill.frag
@@ -2,31 +2,30 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+precision mediump float;
+
 #include <impeller/texture.glsl>
 #include <impeller/types.glsl>
 
-uniform sampler2D texture_sampler;
+uniform f16sampler2D texture_sampler;
 
 uniform FragInfo {
-  float texture_sampler_y_coord_scale;
-  float x_tile_mode;
-  float y_tile_mode;
-  float alpha;
+  float16_t x_tile_mode;
+  float16_t y_tile_mode;
 }
 frag_info;
 
-in vec2 v_texture_coords;
+in highp vec2 v_texture_coords;
+IMPELLER_MAYBE_FLAT in float16_t v_alpha;
 
-out vec4 frag_color;
+out f16vec4 frag_color;
 
 void main() {
   frag_color =
-      IPSampleWithTileMode(
-          texture_sampler,                          // sampler
-          v_texture_coords,                         // texture coordinates
-          frag_info.texture_sampler_y_coord_scale,  // y coordinate scale
-          frag_info.x_tile_mode,                    // x tile mode
-          frag_info.y_tile_mode                     // y tile mode
-          ) *
-      frag_info.alpha;
+      IPHalfSampleWithTileMode(texture_sampler,        // sampler
+                               v_texture_coords,       // texture coordinates
+                               frag_info.x_tile_mode,  // x tile mode
+                               frag_info.y_tile_mode   // y tile mode
+                               ) *
+      v_alpha;
 }
diff --git a/impeller/entity/shaders/tiled_texture_fill_external.frag b/impeller/entity/shaders/tiled_texture_fill_external.frag
new file mode 100644
index 0000000000000000000000000000000000000000..b0ece73193b6640e3fe2ec364a2b92e67d078ec8
--- /dev/null
+++ b/impeller/entity/shaders/tiled_texture_fill_external.frag
@@ -0,0 +1,30 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+precision mediump float;
+
+#include <impeller/external_texture_oes.glsl>
+
+uniform sampler2D SAMPLER_EXTERNAL_OES_texture_sampler;
+
+uniform FragInfo {
+  float x_tile_mode;
+  float y_tile_mode;
+}
+frag_info;
+
+in vec2 v_texture_coords;
+in float v_alpha;
+
+out vec4 frag_color;
+
+void main() {
+  frag_color =
+      IPSampleWithTileModeOES(SAMPLER_EXTERNAL_OES_texture_sampler,  // sampler
+                              v_texture_coords,       // texture coordinates
+                              frag_info.x_tile_mode,  // x tile mode
+                              frag_info.y_tile_mode   // y tile mode
+                              ) *
+      v_alpha;
+}
diff --git a/impeller/entity/shaders/vertices.frag b/impeller/entity/shaders/vertices.frag
index c42e809ecc14d4937c9ce912b29c86e0797bf2b3..e3eaab01cda8057c7261e057b12e6ddbc6be68e5 100644
--- a/impeller/entity/shaders/vertices.frag
+++ b/impeller/entity/shaders/vertices.frag
@@ -2,12 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+precision mediump float;
+
 #include <impeller/types.glsl>
 
-in vec4 v_color;
+uniform FragInfo {
+  float16_t alpha;
+}
+frag_info;
+
+in f16vec4 v_color;
 
-out vec4 frag_color;
+out f16vec4 frag_color;
 
 void main() {
-  frag_color = v_color;
+  frag_color = v_color * frag_info.alpha;
 }
diff --git a/impeller/entity/shaders/yuv_to_rgb_filter.frag b/impeller/entity/shaders/yuv_to_rgb_filter.frag
index d33e0d541bc0835f1bbceb5810ba9469eada9ec7..6d8db224a5a6b34ac080460b1cb864fe3ff6b14f 100644
--- a/impeller/entity/shaders/yuv_to_rgb_filter.frag
+++ b/impeller/entity/shaders/yuv_to_rgb_filter.frag
@@ -2,40 +2,38 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+precision mediump float;
+
 #include <impeller/color.glsl>
 #include <impeller/texture.glsl>
 #include <impeller/types.glsl>
 
-uniform sampler2D y_texture;
-uniform sampler2D uv_texture;
+uniform f16sampler2D y_texture;
+uniform f16sampler2D uv_texture;
 
 // These values must correspond to the order of the items in the
 // 'YUVColorSpace' enum class.
-const float kBT601LimitedRange = 0;
-const float kBT601FullRange = 1;
+const float16_t kBT601LimitedRange = 0.0hf;
+const float16_t kBT601FullRange = 1.0hf;
 
 uniform FragInfo {
-  float texture_sampler_y_coord_scale;
   mat4 matrix;
-  float yuv_color_space;
+  float16_t yuv_color_space;
 }
 frag_info;
 
-in vec2 v_position;
-out vec4 frag_color;
+in highp vec2 v_texture_coords;
+
+out f16vec4 frag_color;
 
 void main() {
-  vec3 yuv;
-  vec3 yuv_offset = vec3(0.0, 0.5, 0.5);
+  f16vec3 yuv;
+  f16vec3 yuv_offset = f16vec3(0.0hf, 0.5hf, 0.5hf);
   if (frag_info.yuv_color_space == kBT601LimitedRange) {
-    yuv_offset.x = 16.0 / 255.0;
+    yuv_offset.x = 16.0hf / 255.0hf;
   }
 
-  yuv.x =
-      IPSample(y_texture, v_position, frag_info.texture_sampler_y_coord_scale)
-          .r;
-  yuv.yz =
-      IPSample(uv_texture, v_position, frag_info.texture_sampler_y_coord_scale)
-          .rg;
-  frag_color = frag_info.matrix * vec4(yuv - yuv_offset, 1);
+  yuv.x = texture(y_texture, v_texture_coords).r;
+  yuv.yz = texture(uv_texture, v_texture_coords).rg;
+  frag_color = f16mat4(frag_info.matrix) * f16vec4(yuv - yuv_offset, 1.0hf);
 }
diff --git a/impeller/entity/shaders/yuv_to_rgb_filter.vert b/impeller/entity/shaders/yuv_to_rgb_filter.vert
index 27b8ecedbf216a2fecb287dfd5be2872ffe47e69..5a631d8b1f039095cd65d33b03352ef8b9328dd9 100644
--- a/impeller/entity/shaders/yuv_to_rgb_filter.vert
+++ b/impeller/entity/shaders/yuv_to_rgb_filter.vert
@@ -2,17 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <impeller/conversions.glsl>
 #include <impeller/types.glsl>
 
 uniform FrameInfo {
   mat4 mvp;
+  float texture_sampler_y_coord_scale;
 }
 frame_info;
 
 in vec2 position;
-out vec2 v_position;
+
+out vec2 v_texture_coords;
 
 void main() {
-  v_position = position;
   gl_Position = frame_info.mvp * vec4(position, 0.0, 1.0);
+  v_texture_coords =
+      IPRemapCoords(position, frame_info.texture_sampler_y_coord_scale);
 }
diff --git a/impeller/fixtures/BUILD.gn b/impeller/fixtures/BUILD.gn
index eb81d57237ccb7d2aec41489ffe5317112be277f..ee299ee2660ebd1f6c26d76428714f59dd360c84 100644
--- a/impeller/fixtures/BUILD.gn
+++ b/impeller/fixtures/BUILD.gn
@@ -7,13 +7,21 @@ import("//flutter/testing/testing.gni")
 
 impeller_shaders("shader_fixtures") {
   name = "fixtures"
+
+  # 2.3 adds support for framebuffer fetch in Metal.
+  metal_version = "2.3"
+
+  # Not analyzing because they are not performance critical, and mipmap uses
+  # textureLod, which uses an extension that malioc does not support.
+  analyze = false
   shaders = [
     "array.frag",
     "array.vert",
     "box_fade.frag",
     "box_fade.vert",
-    "colors.vert",
     "colors.frag",
+    "colors.vert",
+    "half.frag",
     "impeller.frag",
     "impeller.vert",
     "inactive_uniforms.frag",
@@ -23,23 +31,50 @@ impeller_shaders("shader_fixtures") {
     "mipmaps.frag",
     "mipmaps.vert",
     "sample.comp",
+    "sepia.frag",
+    "sepia.vert",
     "simple.vert",
+    "stage1.comp",
+    "stage2.comp",
+    "swizzle.frag",
     "test_texture.frag",
     "test_texture.vert",
+    "texture.frag",
+    "texture.vert",
   ]
 
   if (impeller_enable_opengles) {
-    gles_exclusions = [ "sample.comp" ]
+    gles_exclusions = [
+      "sample.comp",
+      "stage1.comp",
+      "stage2.comp",
+      "half.frag",
+    ]
   }
 }
 
+scenec("scene_fixtures") {
+  geometry = [
+    "flutter_logo_baked.glb",
+    "two_triangles.glb",
+  ]
+  type = "gltf"
+}
+
 impellerc("runtime_stages") {
   shaders = [
     "ink_sparkle.frag",
     "runtime_stage_example.frag",
+    "gradient.frag",
   ]
   sl_file_extension = "iplr"
-  shader_target_flag = "--runtime-stage-metal"
+
+  shader_target_flags = [
+    "--runtime-stage-metal",
+    "--runtime-stage-gles",
+    "--runtime-stage-vulkan",
+  ]
+
   iplr = true
 }
 
@@ -50,21 +85,31 @@ test_fixtures("file_fixtures") {
     "//flutter/third_party/txt/third_party/fonts/Roboto-Regular.ttf",
     "airplane.jpg",
     "bay_bridge.jpg",
+    "blend_mode_dst.png",
+    "blend_mode_src.png",
     "blue_noise.png",
     "boston.jpg",
     "embarcadero.jpg",
+    "flutter_gpu_texture.frag",
+    "flutter_gpu_texture.vert",
+    "flutter_gpu_unlit.frag",
+    "flutter_gpu_unlit.vert",
+    "flutter_logo_baked.glb",
     "kalimba.jpg",
+    "monkey.png",
     "multiple_stages.hlsl",
+    "nine_patch_corners.png",
     "resources_limit.vert",
     "sample.comp",
     "sample.frag",
-    "sample.tesc",
-    "sample.tese",
     "sample.vert",
     "sample_with_binding.vert",
     "simple.vert.hlsl",
     "sa%m#ple.vert",
+    "stage1.comp",
+    "stage2.comp",
     "struct_def_bug.vert",
+    "struct_internal.frag",
     "table_mountain_nx.png",
     "table_mountain_ny.png",
     "table_mountain_nz.png",
@@ -72,15 +117,47 @@ test_fixtures("file_fixtures") {
     "table_mountain_py.png",
     "table_mountain_pz.png",
     "test_texture.frag",
+    "two_triangles.glb",
     "types.h",
     "wtf.otf",
+    "texture_lookup.frag",
   ]
   if (host_os == "mac") {
     fixtures += [ "/System/Library/Fonts/Apple Color Emoji.ttc" ]
   }
   fixtures +=
-      filter_include(get_target_outputs(":runtime_stages"), [ "*.iplr" ])
-  deps = [ ":runtime_stages" ]
+      filter_include(get_target_outputs(":runtime_stages"), [ "*.iplr" ]) +
+      filter_include(get_target_outputs(":scene_fixtures"), [ "*.ipscene" ])
+  deps = [
+    ":runtime_stages",
+    ":scene_fixtures",
+  ]
+}
+
+impellerc("flutter_gpu_shaders") {
+  shaders = [
+    # Temporarily build Flutter GPU test shaders as runtime stages.
+    "flutter_gpu_unlit.frag",
+    "flutter_gpu_unlit.vert",
+    "flutter_gpu_texture.frag",
+    "flutter_gpu_texture.vert",
+  ]
+
+  fixtures = rebase_path("//flutter/impeller/fixtures")
+  shader_bundle = "{\"UnlitFragment\": {\"type\": \"fragment\", \"file\": \"${fixtures}/flutter_gpu_unlit.frag\"}, \"UnlitVertex\": {\"type\": \"vertex\", \"file\": \"${fixtures}/flutter_gpu_unlit.vert\"}, \"TextureFragment\": {\"type\": \"fragment\", \"file\": \"${fixtures}/flutter_gpu_texture.frag\"}, \"TextureVertex\": {\"type\": \"vertex\", \"file\": \"${fixtures}/flutter_gpu_texture.vert\"}}"
+  shader_bundle_output = "playground.shaderbundle"
+}
+
+test_fixtures("flutter_gpu_fixtures") {
+  dart_main = "dart_tests.dart"
+
+  fixtures = filter_include(get_target_outputs(":flutter_gpu_shaders"),
+                            [
+                              "*.iplr",
+                              "*.shaderbundle",
+                            ])
+
+  deps = [ ":flutter_gpu_shaders" ]
 }
 
 group("fixtures") {
@@ -88,6 +165,7 @@ group("fixtures") {
 
   public_deps = [
     ":file_fixtures",
+    ":scene_fixtures",
     ":shader_fixtures",
   ]
 }
diff --git a/impeller/fixtures/array.vert b/impeller/fixtures/array.vert
index 2babce30d2955de45c336709613a6dfd7ef652ff..6da02700d2821d3deeab9294c1ba9757b5c2957b 100644
--- a/impeller/fixtures/array.vert
+++ b/impeller/fixtures/array.vert
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-uniform VertInfo {
+uniform FrameInfo {
   mat4 mvp;
 }
-vert_info;
+frame_info;
 
 in vec2 position;
 
 out vec2 v_position;
 
 void main() {
-  gl_Position = vert_info.mvp * vec4(position, 0.0, 1.0);
+  gl_Position = frame_info.mvp * vec4(position, 0.0, 1.0);
   v_position = position;
 }
diff --git a/impeller/fixtures/blend_mode_dst.png b/impeller/fixtures/blend_mode_dst.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f3fe3f9a6949a2b39fe6b3e4cce289cad77a298
Binary files /dev/null and b/impeller/fixtures/blend_mode_dst.png differ
diff --git a/impeller/fixtures/blend_mode_src.png b/impeller/fixtures/blend_mode_src.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d168d743b1ab020413260a44003c4e083893cc7
Binary files /dev/null and b/impeller/fixtures/blend_mode_src.png differ
diff --git a/impeller/fixtures/box_fade.frag b/impeller/fixtures/box_fade.frag
index 5acb1cba44f8441a389c6e49782011b93fcabf7b..541096efd5135ba7c52ab5e395ef4737dea5a462 100644
--- a/impeller/fixtures/box_fade.frag
+++ b/impeller/fixtures/box_fade.frag
@@ -9,7 +9,7 @@ uniform FrameInfo {
 }
 frame_info;
 
-in vec2 interporlated_texture_coordinates;
+in vec2 interpolated_texture_coordinates;
 
 out vec4 frag_color;
 
@@ -17,8 +17,8 @@ uniform sampler2D contents1;
 uniform sampler2D contents2;
 
 void main() {
-  vec4 tex1 = texture(contents1, interporlated_texture_coordinates);
-  vec4 tex2 = texture(contents2, interporlated_texture_coordinates);
+  vec4 tex1 = texture(contents1, interpolated_texture_coordinates);
+  vec4 tex2 = texture(contents2, interpolated_texture_coordinates);
   frag_color = mix(
       tex1, tex2,
       clamp(frame_info.cursor_position.x / frame_info.window_size.x, 0.0, 1.0));
diff --git a/impeller/fixtures/box_fade.vert b/impeller/fixtures/box_fade.vert
index 05f52f3c70aff0f7c8bce7fd76ae6280964e3ede..fd65238d83de787c88af318e317453bd4bbecb31 100644
--- a/impeller/fixtures/box_fade.vert
+++ b/impeller/fixtures/box_fade.vert
@@ -10,9 +10,9 @@ uniform_buffer;
 in vec3 vertex_position;
 in vec2 texture_coordinates;
 
-out vec2 interporlated_texture_coordinates;
+out vec2 interpolated_texture_coordinates;
 
 void main() {
   gl_Position = uniform_buffer.mvp * vec4(vertex_position, 1.0);
-  interporlated_texture_coordinates = texture_coordinates;
+  interpolated_texture_coordinates = texture_coordinates;
 }
diff --git a/impeller/fixtures/dart_tests.dart b/impeller/fixtures/dart_tests.dart
new file mode 100644
index 0000000000000000000000000000000000000000..1923dd440c8d19139ed172941142b632c5b143d8
--- /dev/null
+++ b/impeller/fixtures/dart_tests.dart
@@ -0,0 +1,145 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:typed_data';
+import 'dart:ui' as ui;
+import '../../lib/gpu/lib/gpu.dart' as gpu;
+
+void main() {}
+
+@pragma('vm:entry-point')
+void sayHi() {
+  print('Hi');
+}
+
+@pragma('vm:entry-point')
+void instantiateDefaultContext() {
+  // ignore: unused_local_variable
+  final gpu.GpuContext context = gpu.gpuContext;
+}
+
+@pragma('vm:entry-point')
+void canCreateShaderLibrary() {
+  final gpu.ShaderLibrary? library = gpu.ShaderLibrary.fromAsset('playground');
+  assert(library != null);
+  final gpu.Shader? shader = library!['UnlitVertex'];
+  assert(shader != null);
+}
+
+@pragma('vm:entry-point')
+void canReflectUniformStructs() {
+  final gpu.RenderPipeline pipeline = createUnlitRenderPipeline();
+
+  final gpu.UniformSlot vertInfo =
+      pipeline.vertexShader.getUniformSlot('VertInfo');
+  assert(vertInfo.uniformName == 'VertInfo');
+  final int? totalSize = vertInfo.sizeInBytes;
+  assert(totalSize != null);
+  assert(totalSize! == 128);
+  final int? mvpOffset = vertInfo.getMemberOffsetInBytes('mvp');
+  assert(mvpOffset != null);
+  assert(mvpOffset! == 0);
+  final int? colorOffset = vertInfo.getMemberOffsetInBytes('color');
+  assert(colorOffset != null);
+  assert(colorOffset! == 64);
+}
+
+gpu.RenderPipeline createUnlitRenderPipeline() {
+  final gpu.ShaderLibrary? library = gpu.ShaderLibrary.fromAsset('playground');
+  assert(library != null);
+  final gpu.Shader? vertex = library!['UnlitVertex'];
+  assert(vertex != null);
+  final gpu.Shader? fragment = library['UnlitFragment'];
+  assert(fragment != null);
+  return gpu.gpuContext.createRenderPipeline(vertex!, fragment!);
+}
+
+gpu.RenderPass createRenderPass() {
+  final gpu.Texture? renderTexture =
+      gpu.gpuContext.createTexture(gpu.StorageMode.devicePrivate, 100, 100);
+  assert(renderTexture != null);
+
+  final gpu.CommandBuffer commandBuffer = gpu.gpuContext.createCommandBuffer();
+
+  final gpu.RenderTarget renderTarget = gpu.RenderTarget.singleColor(
+    gpu.ColorAttachment(texture: renderTexture!),
+  );
+  return commandBuffer.createRenderPass(renderTarget);
+}
+
+@pragma('vm:entry-point')
+void uniformBindFailsForInvalidHostBufferOffset() {
+  final gpu.RenderPass encoder = createRenderPass();
+
+  final gpu.RenderPipeline pipeline = createUnlitRenderPipeline();
+  encoder.bindPipeline(pipeline);
+
+  final gpu.HostBuffer transients = gpu.gpuContext.createHostBuffer();
+  final gpu.BufferView vertInfoData = transients.emplace(float32(<double>[
+    1, 0, 0, 0, // mvp
+    0, 1, 0, 0, // mvp
+    0, 0, 1, 0, // mvp
+    0, 0, 0, 1, // mvp
+    0, 1, 0, 1, // color
+  ]));
+  final gpu.BufferView viewWithBadOffset = gpu.BufferView(vertInfoData.buffer,
+      offsetInBytes: 1, lengthInBytes: vertInfoData.lengthInBytes);
+
+  final gpu.UniformSlot vertInfo =
+      pipeline.vertexShader.getUniformSlot('VertInfo');
+  String? exception;
+  try {
+    encoder.bindUniform(vertInfo, viewWithBadOffset);
+  } catch (e) {
+    exception = e.toString();
+  }
+  assert(exception!.contains('Failed to bind uniform'));
+}
+
+ByteData float32(List<double> values) {
+  return Float32List.fromList(values).buffer.asByteData();
+}
+
+@pragma('vm:entry-point')
+void canCreateRenderPassAndSubmit() {
+  final gpu.Texture? renderTexture =
+      gpu.gpuContext.createTexture(gpu.StorageMode.devicePrivate, 100, 100);
+  assert(renderTexture != null);
+
+  final gpu.CommandBuffer commandBuffer = gpu.gpuContext.createCommandBuffer();
+
+  final gpu.RenderTarget renderTarget = gpu.RenderTarget.singleColor(
+    gpu.ColorAttachment(texture: renderTexture!),
+  );
+  final gpu.RenderPass encoder = commandBuffer.createRenderPass(renderTarget);
+
+  final gpu.RenderPipeline pipeline = createUnlitRenderPipeline();
+  encoder.bindPipeline(pipeline);
+
+  // Configure blending with defaults (just to test the bindings).
+  encoder.setColorBlendEnable(true);
+  encoder.setColorBlendEquation(gpu.ColorBlendEquation());
+
+  final gpu.HostBuffer transients = gpu.gpuContext.createHostBuffer();
+  final gpu.BufferView vertices = transients.emplace(float32(<double>[
+    -0.5, -0.5, //
+    0.5, 0.5, //
+    0.5, -0.5, //
+  ]));
+  final gpu.BufferView vertInfoData = transients.emplace(float32(<double>[
+    1, 0, 0, 0, // mvp
+    0, 1, 0, 0, // mvp
+    0, 0, 1, 0, // mvp
+    0, 0, 0, 1, // mvp
+    0, 1, 0, 1, // color
+  ]));
+  encoder.bindVertexBuffer(vertices, 3);
+
+  final gpu.UniformSlot vertInfo =
+      pipeline.vertexShader.getUniformSlot('VertInfo');
+  encoder.bindUniform(vertInfo, vertInfoData);
+  encoder.draw();
+
+  commandBuffer.submit();
+}
diff --git a/impeller/entity/shaders/blending/advanced_blend_colordodge.frag b/impeller/fixtures/flutter_gpu_texture.frag
similarity index 51%
rename from impeller/entity/shaders/blending/advanced_blend_colordodge.frag
rename to impeller/fixtures/flutter_gpu_texture.frag
index f11fc5e68584d5735ebda3028325a6c7e025d57f..dc18b9a7c55dc14be9be185acb82cae919286ad3 100644
--- a/impeller/entity/shaders/blending/advanced_blend_colordodge.frag
+++ b/impeller/fixtures/flutter_gpu_texture.frag
@@ -2,10 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <impeller/blending.glsl>
+uniform sampler2D tex;
 
-vec3 Blend(vec3 dst, vec3 src) {
-  return IPBlendColorDodge(dst, src);
-}
+in vec2 v_texture_coords;
+in vec4 v_color;
+out vec4 frag_color;
 
-#include "advanced_blend.glsl"
+void main() {
+  frag_color = v_color * texture(tex, v_texture_coords);
+}
diff --git a/impeller/entity/shaders/atlas_fill.vert b/impeller/fixtures/flutter_gpu_texture.vert
similarity index 77%
rename from impeller/entity/shaders/atlas_fill.vert
rename to impeller/fixtures/flutter_gpu_texture.vert
index 6140ad98788a4f7faede2a914f874dc5f5fe1ecb..69a0fcdf3b11613e85f384944927a61af981fba4 100644
--- a/impeller/entity/shaders/atlas_fill.vert
+++ b/impeller/fixtures/flutter_gpu_texture.vert
@@ -2,22 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <impeller/types.glsl>
-
 uniform VertInfo {
   mat4 mvp;
 }
 vert_info;
 
-in vec2 position;
+in vec3 position;
 in vec2 texture_coords;
 in vec4 color;
-
 out vec2 v_texture_coords;
 out vec4 v_color;
 
 void main() {
-  gl_Position = vert_info.mvp * vec4(position, 0.0, 1.0);
   v_texture_coords = texture_coords;
   v_color = color;
+  gl_Position = vert_info.mvp * vec4(position, 1.0);
 }
diff --git a/impeller/fixtures/flutter_gpu_unlit.frag b/impeller/fixtures/flutter_gpu_unlit.frag
new file mode 100644
index 0000000000000000000000000000000000000000..fc61864108b1dda590006dd9bd501e4b2d086719
--- /dev/null
+++ b/impeller/fixtures/flutter_gpu_unlit.frag
@@ -0,0 +1,10 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+in vec4 v_color;
+out vec4 frag_color;
+
+void main() {
+  frag_color = v_color;
+}
diff --git a/impeller/entity/shaders/position.vert b/impeller/fixtures/flutter_gpu_unlit.vert
similarity index 64%
rename from impeller/entity/shaders/position.vert
rename to impeller/fixtures/flutter_gpu_unlit.vert
index 048062f0033f5685fc3f0fa127083ae493ce4df7..91a85ec71020855c66281ba32d95ab9b48f58be0 100644
--- a/impeller/entity/shaders/position.vert
+++ b/impeller/fixtures/flutter_gpu_unlit.vert
@@ -2,20 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <impeller/transform.glsl>
-#include <impeller/types.glsl>
-
-uniform VertInfo {
-  mat4 mvp;
-  vec4 color;
+uniform VertInfo {  // 128 bytes (alignment = NPOT(largest member))
+  mat4 mvp;         // offset 0 bytes, size 64 bytes
+  vec4 color;       // offset 64 bytes, size 16 bytes
 }
 vert_info;
 
 in vec2 position;
-
 out vec4 v_color;
 
 void main() {
-  gl_Position = vert_info.mvp * vec4(position, 0.0, 1.0);
   v_color = vert_info.color;
+  gl_Position = vert_info.mvp * vec4(position, 0.0, 1.0);
 }
diff --git a/impeller/fixtures/flutter_logo_baked.glb b/impeller/fixtures/flutter_logo_baked.glb
new file mode 100644
index 0000000000000000000000000000000000000000..f786be69b36e859054ccab65c4028e4302927aa0
Binary files /dev/null and b/impeller/fixtures/flutter_logo_baked.glb differ
diff --git a/impeller/fixtures/golden_paths.h b/impeller/fixtures/golden_paths.h
new file mode 100644
index 0000000000000000000000000000000000000000..16767f766b776145d99cdcd048296c8941a41663
--- /dev/null
+++ b/impeller/fixtures/golden_paths.h
@@ -0,0 +1,72 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_FIXTURES_GOLDEN_PATHS_H_
+#define FLUTTER_IMPELLER_FIXTURES_GOLDEN_PATHS_H_
+
+#include <vector>
+
+#include "impeller/geometry/path_component.h"
+#include "impeller/geometry/point.h"
+
+namespace impeller {
+namespace testing {
+
+std::vector<Point> golden_cubic_and_quad_points = {
+    {139.982, 19.5003}, {140.018, 20.4997}, {131.747, 19.8026},
+    {131.783, 20.802},  {131.715, 19.8048}, {131.815, 20.7998},
+    {123.622, 20.6102}, {123.721, 21.6053}, {123.59, 20.6145},
+    {123.753, 21.601},  {115.652, 21.9306}, {115.816, 22.9171},
+    {115.619, 21.9372}, {115.848, 22.9105}, {107.85, 23.7687},
+    {108.08, 24.742},   {107.817, 23.7777}, {108.113, 24.733},
+    {100.23, 26.1264},  {100.526, 27.0817}, {100.197, 26.1378},
+    {100.558, 27.0703}, {92.8037, 29.0025}, {93.165, 29.935},
+    {92.7736, 29.0154}, {93.1952, 29.9221}, {85.708, 32.3003},
+    {86.1296, 33.2071}, {85.68, 32.3144},   {86.1576, 33.193},
+    {78.8865, 36.008},  {79.3641, 36.8865}, {78.8588, 36.0242},
+    {79.3918, 36.8703}, {72.3485, 40.125},  {72.8815, 40.9711},
+    {72.3216, 40.1432}, {72.9084, 40.9529}, {66.1045, 44.6479},
+    {66.6913, 45.4577}, {66.0788, 44.6679}, {66.717, 45.4378},
+    {60.1632, 49.5711}, {60.8014, 50.341},  {60.139, 49.5924},
+    {60.8255, 50.3196}, {54.5317, 54.8864}, {55.2183, 55.6136},
+    {54.5094, 54.909},  {55.2406, 55.591},  {49.254, 60.5436},
+    {49.9853, 61.2257}, {49.2329, 60.5677}, {50.0063, 61.2016},
+    {44.3684, 66.5025}, {45.1418, 67.1364}, {44.3488, 66.5281},
+    {45.1614, 67.1108}, {39.8827, 72.7564}, {40.6954, 73.3391},
+    {39.8648, 72.7832}, {40.7133, 73.3123}, {35.8029, 79.297},
+    {36.6515, 79.8261}, {35.7869, 79.3246}, {36.6675, 79.7985},
+    {32.1328, 86.1144}, {33.0134, 86.5883}, {32.1188, 86.1424},
+    {33.0273, 86.5603}, {28.8739, 93.1973}, {29.7824, 93.6152},
+    {28.8613, 93.2272}, {29.795, 93.5853},  {26.0399, 100.583},
+    {26.9736, 100.941}, {26.0288, 100.615}, {26.9847, 100.908},
+    {23.7144, 108.15},  {24.6704, 108.444}, {23.7056, 108.183},
+    {24.6792, 108.411}, {21.9002, 115.886}, {22.8738, 116.115},
+    {21.8937, 115.919}, {22.8804, 116.082}, {20.5962, 123.779},
+    {21.5828, 123.942}, {20.592, 123.812},  {21.5871, 123.91},
+    {19.7985, 131.816}, {20.7936, 131.914}, {19.7964, 131.847},
+    {20.7957, 131.883}, {19.5003, 139.982}, {20.4997, 140.018},
+    {20.2883, 140.409}, {19.7117, 139.591}, {29.9421, 133.595},
+    {29.3655, 132.778}, {29.9544, 133.586}, {29.3532, 132.787},
+    {39.1905, 126.639}, {38.5894, 125.839}, {39.2039, 126.628},
+    {38.576, 125.85},   {47.9822, 119.545}, {47.3542, 118.767},
+    {47.9968, 119.533}, {47.3396, 118.779}, {56.2739, 112.316},
+    {55.6167, 111.562}, {56.2898, 112.302}, {55.6008, 111.577},
+    {64.0197, 104.952}, {63.3307, 104.228}, {64.0369, 104.935},
+    {63.3134, 104.245}, {71.1714, 97.4578}, {70.4479, 96.7675},
+    {71.1899, 97.4373}, {70.4294, 96.7879}, {77.6791, 89.8381},
+    {76.9187, 89.1887}, {77.6987, 89.8137}, {76.8991, 89.2131},
+    {83.4923, 82.1009}, {82.6928, 81.5003}, {83.5125, 82.0718},
+    {82.6725, 81.5293}, {88.5609, 74.2563}, {87.7209, 73.7138},
+    {88.5812, 74.2221}, {87.7007, 73.748},  {92.8369, 66.3173},
+    {91.9564, 65.8432}, {92.8562, 66.2772}, {91.9371, 65.8833},
+    {96.2756, 58.299},  {95.3564, 57.9051}, {96.2927, 58.253},
+    {95.3393, 57.951},  {98.8374, 50.2196}, {97.8841, 49.9176},
+    {98.8508, 50.1681}, {97.8708, 49.969},  {100.49, 42.0995},
+    {99.51, 41.9005},   {100.49, 42.0995},  {99.51, 41.9005},
+};
+
+}  // namespace testing
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_FIXTURES_GOLDEN_PATHS_H_
diff --git a/impeller/fixtures/gradient.frag b/impeller/fixtures/gradient.frag
new file mode 100644
index 0000000000000000000000000000000000000000..249efd246969b806bb69362f5f79b48573408530
--- /dev/null
+++ b/impeller/fixtures/gradient.frag
@@ -0,0 +1,10 @@
+#include <flutter/runtime_effect.glsl>
+
+uniform vec2 uSize;
+
+out vec4 fragColor;
+
+void main() {
+  float v = FlutterFragCoord().y / uSize.y;
+  fragColor = vec4(v, v, v, 1);
+}
diff --git a/impeller/fixtures/half.frag b/impeller/fixtures/half.frag
new file mode 100644
index 0000000000000000000000000000000000000000..527476d8b6eb8983303350317e8c1ffe398a52d9
--- /dev/null
+++ b/impeller/fixtures/half.frag
@@ -0,0 +1,21 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#extension GL_AMD_gpu_shader_half_float : enable
+#extension GL_AMD_gpu_shader_half_float_fetch : enable
+#extension GL_EXT_shader_explicit_arithmetic_types_float16 : enable
+
+uniform FragInfo {
+  float16_t half_1;
+  f16vec2 half_2;
+  f16vec3 half_3;
+  f16vec4 half_4;
+}
+frag_info;
+
+out vec4 frag_color;
+
+void main() {
+  frag_color = vec4(0);
+}
diff --git a/impeller/fixtures/inactive_uniforms.vert b/impeller/fixtures/inactive_uniforms.vert
index 2babce30d2955de45c336709613a6dfd7ef652ff..6da02700d2821d3deeab9294c1ba9757b5c2957b 100644
--- a/impeller/fixtures/inactive_uniforms.vert
+++ b/impeller/fixtures/inactive_uniforms.vert
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-uniform VertInfo {
+uniform FrameInfo {
   mat4 mvp;
 }
-vert_info;
+frame_info;
 
 in vec2 position;
 
 out vec2 v_position;
 
 void main() {
-  gl_Position = vert_info.mvp * vec4(position, 0.0, 1.0);
+  gl_Position = frame_info.mvp * vec4(position, 0.0, 1.0);
   v_position = position;
 }
diff --git a/impeller/fixtures/mipmaps.vert b/impeller/fixtures/mipmaps.vert
index c31cb3049468c8ef1dd209e1bc171bffc664eb1d..eab582c732aee56b3a0d8a004556fa30a9721882 100644
--- a/impeller/fixtures/mipmaps.vert
+++ b/impeller/fixtures/mipmaps.vert
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-uniform VertInfo {
+uniform FrameInfo {
   mat4 mvp;
 }
-vert_info;
+frame_info;
 
 in vec2 vertex_position;
 in vec2 uv;
@@ -13,6 +13,6 @@ in vec2 uv;
 out vec2 v_uv;
 
 void main() {
-  gl_Position = vert_info.mvp * vec4(vertex_position, 0.0, 1.0);
+  gl_Position = frame_info.mvp * vec4(vertex_position, 0.0, 1.0);
   v_uv = uv;
 }
diff --git a/impeller/fixtures/monkey.png b/impeller/fixtures/monkey.png
new file mode 100644
index 0000000000000000000000000000000000000000..67460aed6fca53ae3c85adb8cfb4db54f0fb0a91
Binary files /dev/null and b/impeller/fixtures/monkey.png differ
diff --git a/impeller/fixtures/nine_patch_corners.png b/impeller/fixtures/nine_patch_corners.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f48981f51b407b00a1916d319b8f5294db8956f
Binary files /dev/null and b/impeller/fixtures/nine_patch_corners.png differ
diff --git a/impeller/fixtures/runtime_stage_example.frag b/impeller/fixtures/runtime_stage_example.frag
index 3448174dbc98aa5d46957a17832bdb33a68d154c..66159e94156de2cb722c9db88676473b04a0fe2e 100644
--- a/impeller/fixtures/runtime_stage_example.frag
+++ b/impeller/fixtures/runtime_stage_example.frag
@@ -2,13 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-layout(location = 0) uniform vec2 iResolution;
-layout(location = 1) uniform float iTime;
+#include <flutter/runtime_effect.glsl>
 
-layout(location = 0) out vec4 fragColor;
+uniform vec2 iResolution;
+uniform float iTime;
+
+out vec4 fragColor;
 
 void main() {
-  vec2 uv = gl_FragCoord.xy / iResolution;
+  vec2 uv = FlutterFragCoord() / iResolution;
   float t = 4 * iTime;
   vec3 col = 0.5 + 0.5 * cos(t + uv.xyx + vec3(0, 1, 4));
   fragColor = vec4(col, 1.0);
diff --git a/impeller/fixtures/sample.tesc b/impeller/fixtures/sample.tesc
deleted file mode 100644
index d6fe50408fe7a0278cf726957a04e4e10f75d816..0000000000000000000000000000000000000000
--- a/impeller/fixtures/sample.tesc
+++ /dev/null
@@ -1,5 +0,0 @@
-layout(vertices = 4) out;
-
-void main() {
-  gl_out[gl_InvocationID].gl_Position = gl_in[gl_InvocationID].gl_Position;
-}
diff --git a/impeller/fixtures/sample.tese b/impeller/fixtures/sample.tese
deleted file mode 100644
index b47a8775e441600496c249733215e4c91851a87a..0000000000000000000000000000000000000000
--- a/impeller/fixtures/sample.tese
+++ /dev/null
@@ -1,12 +0,0 @@
-layout(quads, equal_spacing, ccw) in;
-
-void main() {
-  float u = gl_TessCoord.x;
-  float omu = 1 - u;
-  float v = gl_TessCoord.y;
-  float omv = 1 - v;
-
-  gl_Position = omu * omv * gl_in[0].gl_Position +
-                u * omv * gl_in[1].gl_Position + u * v * gl_in[2].gl_Position +
-                omu * v * gl_in[3].gl_Position;
-}
diff --git a/impeller/fixtures/sepia.frag b/impeller/fixtures/sepia.frag
new file mode 100644
index 0000000000000000000000000000000000000000..1379a5f4f533b3a336b184e2d7cb5850737298d8
--- /dev/null
+++ b/impeller/fixtures/sepia.frag
@@ -0,0 +1,17 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+out vec4 frag_color;
+
+layout(input_attachment_index = 0) uniform subpassInputMS subpass_input;
+
+void main() {
+  // https://github.com/chinmaygarde/merle/blob/3eecb311ac8862c41f0c53a5d9b360be923142bb/src/texture.cc#L195
+  const mat4 sepia_matrix = mat4(0.3588, 0.2990, 0.2392, 0.0000,  //
+                                 0.7044, 0.5870, 0.4696, 0.0000,  //
+                                 0.1368, 0.1140, 0.0912, 0.0000,  //
+                                 0.0000, 0.0000, 0.0000, 1.0000   //
+  );
+  frag_color = sepia_matrix * subpassLoad(subpass_input, 0);
+}
diff --git a/impeller/entity/shaders/blending/advanced_blend_darken.frag b/impeller/fixtures/sepia.vert
similarity index 51%
rename from impeller/entity/shaders/blending/advanced_blend_darken.frag
rename to impeller/fixtures/sepia.vert
index 286b7ff2912e694c10d618052f6ab1f26a8be855..b8b09eeaae0e8e74b0456c357ffeac39da629416 100644
--- a/impeller/entity/shaders/blending/advanced_blend_darken.frag
+++ b/impeller/fixtures/sepia.vert
@@ -2,10 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <impeller/blending.glsl>
-
-vec3 Blend(vec3 dst, vec3 src) {
-  return IPBlendDarken(dst, src);
+uniform UniformBuffer {
+  mat4 mvp;
 }
+uniform_buffer;
+
+in vec3 vertex_position;
 
-#include "advanced_blend.glsl"
+void main() {
+  gl_Position = uniform_buffer.mvp * vec4(vertex_position, 1.0);
+}
diff --git a/impeller/fixtures/stage1.comp b/impeller/fixtures/stage1.comp
new file mode 100644
index 0000000000000000000000000000000000000000..9c39e3f5a95a06352837edc1be716a62d15de785
--- /dev/null
+++ b/impeller/fixtures/stage1.comp
@@ -0,0 +1,29 @@
+layout(local_size_x = 128) in;
+layout(std430) buffer;
+
+layout(binding = 0) writeonly buffer Output {
+  uint count;
+  uint elements[];
+}
+output_data;
+
+layout(binding = 1) readonly buffer Input {
+  uint count;
+  uint elements[];
+}
+input_data;
+
+void main() {
+  uint ident = gl_GlobalInvocationID.x;
+
+  if (ident >= input_data.count) {
+    return;
+  }
+
+  uint out_slot = ident * 2;
+
+  output_data.count = input_data.count * 2;
+
+  output_data.elements[out_slot] = input_data.elements[ident] * 2;
+  output_data.elements[out_slot + 1] = input_data.elements[ident] * 3;
+}
diff --git a/impeller/fixtures/stage2.comp b/impeller/fixtures/stage2.comp
new file mode 100644
index 0000000000000000000000000000000000000000..ed51278da16f8c7d248b4c8132bfe22cdfd3086c
--- /dev/null
+++ b/impeller/fixtures/stage2.comp
@@ -0,0 +1,26 @@
+layout(local_size_x = 128) in;
+layout(std430) buffer;
+
+layout(binding = 0) writeonly buffer Output {
+  uint count;
+  uint elements[];
+}
+output_data;
+
+layout(binding = 1) readonly buffer Input {
+  uint count;
+  uint elements[];
+}
+input_data;
+
+void main() {
+  uint ident = gl_GlobalInvocationID.x;
+
+  if (ident >= input_data.count) {
+    return;
+  }
+
+  output_data.count = input_data.count;
+
+  output_data.elements[ident] = input_data.elements[ident] * 2;
+}
diff --git a/impeller/fixtures/struct_internal.frag b/impeller/fixtures/struct_internal.frag
new file mode 100644
index 0000000000000000000000000000000000000000..5cc75950ee39cf1960ec9c9e70641b51a531ac6b
--- /dev/null
+++ b/impeller/fixtures/struct_internal.frag
@@ -0,0 +1,16 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+out vec4 frag_color;
+
+struct TestStruct {
+  float a;
+  float b;
+  float c;
+};
+
+void main() {
+  TestStruct ts = TestStruct(1.0, 0.5, 0.25);
+  frag_color = vec4(ts.c, ts.b, ts.a, 1.0);
+}
diff --git a/impeller/fixtures/swizzle.frag b/impeller/fixtures/swizzle.frag
new file mode 100644
index 0000000000000000000000000000000000000000..63d793e3ead9994d354aae452f99f6cdeb8bfb13
--- /dev/null
+++ b/impeller/fixtures/swizzle.frag
@@ -0,0 +1,11 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+out vec4 frag_color;
+
+layout(input_attachment_index = 0) uniform subpassInputMS subpass_input;
+
+void main() {
+  frag_color = subpassLoad(subpass_input, 0).gbra;
+}
diff --git a/impeller/fixtures/texture.frag b/impeller/fixtures/texture.frag
new file mode 100644
index 0000000000000000000000000000000000000000..1e95b0f8f8ade297f6feda753cf8871879d7f100
--- /dev/null
+++ b/impeller/fixtures/texture.frag
@@ -0,0 +1,13 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+in vec2 interpolated_texture_coordinates;
+
+out vec4 frag_color;
+
+uniform sampler2D texture_contents;
+
+void main() {
+  frag_color = texture(texture_contents, interpolated_texture_coordinates);
+}
diff --git a/impeller/fixtures/texture.vert b/impeller/fixtures/texture.vert
new file mode 100644
index 0000000000000000000000000000000000000000..fd65238d83de787c88af318e317453bd4bbecb31
--- /dev/null
+++ b/impeller/fixtures/texture.vert
@@ -0,0 +1,18 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+uniform UniformBuffer {
+  mat4 mvp;
+}
+uniform_buffer;
+
+in vec3 vertex_position;
+in vec2 texture_coordinates;
+
+out vec2 interpolated_texture_coordinates;
+
+void main() {
+  gl_Position = uniform_buffer.mvp * vec4(vertex_position, 1.0);
+  interpolated_texture_coordinates = texture_coordinates;
+}
diff --git a/impeller/blobcat/blob_types.h b/impeller/fixtures/texture_lookup.frag
similarity index 56%
rename from impeller/blobcat/blob_types.h
rename to impeller/fixtures/texture_lookup.frag
index 37dea53998664eafc46a7d9081653e9fbc8b4dbc..cbf7d5db7136df2cc9f93d5d96b85080a7c52f1c 100644
--- a/impeller/blobcat/blob_types.h
+++ b/impeller/fixtures/texture_lookup.frag
@@ -2,14 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+uniform sampler2D textureA;
 
-namespace impeller {
+out vec4 frag_color;
 
-enum class BlobShaderType {
-  kVertex,
-  kFragment,
-  kCompute,
-};
-
-}  // namespace impeller
+void main() {
+  frag_color = texture(textureA, vec2(1.0) + gl_FragCoord.xy);
+}
diff --git a/impeller/fixtures/two_triangles.glb b/impeller/fixtures/two_triangles.glb
new file mode 100644
index 0000000000000000000000000000000000000000..0ecae588ca88c89a58173ea80aebe42319d4c20c
Binary files /dev/null and b/impeller/fixtures/two_triangles.glb differ
diff --git a/impeller/fixtures/types.h b/impeller/fixtures/types.h
index d8775956bacd399255fbeed69b1991fb39e1df6c..e26dbee0682bd97e93cb52c6da09d0643930fb1c 100644
--- a/impeller/fixtures/types.h
+++ b/impeller/fixtures/types.h
@@ -2,8 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_IMPELLER_FIXTURES_TYPES_H_
+#define FLUTTER_IMPELLER_FIXTURES_TYPES_H_
+
 struct Uniforms {
   mat4 model;
   mat4 view;
   mat4 projection;
 };
+
+#endif  // FLUTTER_IMPELLER_FIXTURES_TYPES_H_
diff --git a/impeller/geometry/BUILD.gn b/impeller/geometry/BUILD.gn
index a1b511ce9f41bc935da6a4e55dcc16266e152abb..0db775b86090ac199551bdf9b1f8d437cb87cf76 100644
--- a/impeller/geometry/BUILD.gn
+++ b/impeller/geometry/BUILD.gn
@@ -12,6 +12,7 @@ impeller_component("geometry") {
     "constants.h",
     "gradient.cc",
     "gradient.h",
+    "half.h",
     "matrix.cc",
     "matrix.h",
     "matrix_decomposition.cc",
@@ -28,6 +29,7 @@ impeller_component("geometry") {
     "quaternion.h",
     "rect.cc",
     "rect.h",
+    "saturated_math.h",
     "scalar.h",
     "shear.cc",
     "shear.h",
@@ -35,24 +37,45 @@ impeller_component("geometry") {
     "sigma.h",
     "size.cc",
     "size.h",
+    "trig.cc",
+    "trig.h",
     "type_traits.cc",
     "type_traits.h",
     "vector.cc",
     "vector.h",
   ]
 
-  deps = [ "//flutter/fml" ]
+  deps = [
+    "../base",
+    "//flutter/fml",
+  ]
+}
+
+impeller_component("geometry_asserts") {
+  testonly = true
+  sources = [ "geometry_asserts.h" ]
+  deps = [
+    ":geometry",
+    "//flutter/testing:testing_lib",
+  ]
 }
 
 impeller_component("geometry_unittests") {
   testonly = true
   sources = [
     "geometry_unittests.cc",
-    "geometry_unittests.h",
+    "matrix_unittests.cc",
+    "path_unittests.cc",
+    "rect_unittests.cc",
+    "saturated_math_unittests.cc",
+    "size_unittests.cc",
+    "trig_unittests.cc",
   ]
+
   deps = [
     ":geometry",
-    "//flutter/testing",
+    ":geometry_asserts",
+    "//flutter/testing:testing_lib",
   ]
 }
 
@@ -61,6 +84,7 @@ executable("geometry_benchmarks") {
   sources = [ "geometry_benchmarks.cc" ]
   deps = [
     ":geometry",
+    "../entity",
     "../tessellator",
     "//flutter/benchmarking",
   ]
diff --git a/impeller/geometry/color.cc b/impeller/geometry/color.cc
index 70946f66a8528089e812f82bcde07fe344eebcc7..d2565e6e6fd1dd7b9baa60a108926e6b1d4a79a9 100644
--- a/impeller/geometry/color.cc
+++ b/impeller/geometry/color.cc
@@ -6,13 +6,49 @@
 
 #include <algorithm>
 #include <cmath>
+#include <functional>
 #include <sstream>
+#include <type_traits>
 
+#include "impeller/base/strings.h"
+#include "impeller/geometry/constants.h"
 #include "impeller/geometry/scalar.h"
 #include "impeller/geometry/vector.h"
 
 namespace impeller {
 
+#define _IMPELLER_ASSERT_BLEND_MODE(blend_mode)                            \
+  auto enum_##blend_mode = static_cast<std::underlying_type_t<BlendMode>>( \
+      BlendMode::k##blend_mode);                                           \
+  if (i != enum_##blend_mode) {                                            \
+    return false;                                                          \
+  }                                                                        \
+  ++i;
+
+static constexpr inline bool ValidateBlendModes() {
+  std::underlying_type_t<BlendMode> i = 0;
+  // Ensure the order of the blend modes match.
+  IMPELLER_FOR_EACH_BLEND_MODE(_IMPELLER_ASSERT_BLEND_MODE)
+  // Ensure the total number of blend modes match.
+  if (i - 1 !=
+      static_cast<std::underlying_type_t<BlendMode>>(BlendMode::kLast)) {
+    return false;
+  }
+  return true;
+}
+static_assert(ValidateBlendModes(),
+              "IMPELLER_FOR_EACH_BLEND_MODE must match impeller::BlendMode.");
+
+#define _IMPELLER_BLEND_MODE_NAME_LIST(blend_mode) #blend_mode,
+
+static constexpr const char* kBlendModeNames[] = {
+    IMPELLER_FOR_EACH_BLEND_MODE(_IMPELLER_BLEND_MODE_NAME_LIST)};
+
+const char* BlendModeToString(BlendMode blend_mode) {
+  return kBlendModeNames[static_cast<std::underlying_type_t<BlendMode>>(
+      blend_mode)];
+}
+
 ColorHSB ColorHSB::FromRGB(Color rgb) {
   Scalar R = rgb.red;
   Scalar G = rgb.green;
@@ -88,37 +124,115 @@ Color ColorHSB::ToRGBA() const {
   return Color(0, 0, 0, alpha);
 }
 
-Color Color::operator+(const Color& c) const {
-  return Color(Vector4(*this) + Vector4(c));
+Color::Color(const ColorHSB& hsbColor) : Color(hsbColor.ToRGBA()) {}
+
+Color::Color(const Vector4& value)
+    : red(value.x), green(value.y), blue(value.z), alpha(value.w) {}
+
+static constexpr inline Color Min(Color c, float threshold) {
+  return Color(std::min(c.red, threshold), std::min(c.green, threshold),
+               std::min(c.blue, threshold), std::min(c.alpha, threshold));
 }
 
-Color Color::operator-(const Color& c) const {
-  return Color(Vector4(*this) - Vector4(c));
+// The following HSV utilities correspond to the W3C blend definitions
+// implemented in: impeller/compiler/shader_lib/impeller/blending.glsl
+
+static constexpr inline Scalar Luminosity(Vector3 color) {
+  return color.x * 0.3f + color.y * 0.59f + color.z * 0.11f;
 }
 
-Color Color::operator*(Scalar value) const {
-  return Color(red * value, green * value, blue * value, alpha * value);
+static constexpr inline Vector3 ClipColor(Vector3 color) {
+  Scalar lum = Luminosity(color);
+  Scalar mn = std::min(std::min(color.x, color.y), color.z);
+  Scalar mx = std::max(std::max(color.x, color.y), color.z);
+  // `lum - mn` and `mx - lum` will always be >= 0 in the following conditions,
+  // so adding a tiny value is enough to make these divisions safe.
+  if (mn < 0.0f) {
+    color = lum + (((color - lum) * lum) / (lum - mn + kEhCloseEnough));
+  }
+  if (mx > 1.0) {
+    color =
+        lum + (((color - lum) * (1.0f - lum)) / (mx - lum + kEhCloseEnough));
+  }
+  return color;
 }
 
-Color::Color(const ColorHSB& hsbColor) : Color(hsbColor.ToRGBA()) {}
+static constexpr inline Vector3 SetLuminosity(Vector3 color,
+                                              Scalar luminosity) {
+  Scalar relative_lum = luminosity - Luminosity(color);
+  return ClipColor(color + relative_lum);
+}
 
-Color::Color(const Vector4& value)
-    : red(value.x), green(value.y), blue(value.z), alpha(value.w) {}
+static constexpr inline Scalar Saturation(Vector3 color) {
+  return std::max(std::max(color.x, color.y), color.z) -
+         std::min(std::min(color.x, color.y), color.z);
+}
 
-Color Min(Color c, float threshold) {
-  return Color(std::min(c.red, threshold), std::min(c.green, threshold),
-               std::min(c.blue, threshold), std::min(c.alpha, threshold));
+static constexpr inline Vector3 SetSaturation(Vector3 color,
+                                              Scalar saturation) {
+  Scalar mn = std::min(std::min(color.x, color.y), color.z);
+  Scalar mx = std::max(std::max(color.x, color.y), color.z);
+  return (mn < mx) ? ((color - mn) * saturation) / (mx - mn) : Vector3();
 }
 
-Color Color::BlendColor(const Color& src,
-                        const Color& dst,
-                        BlendMode blend_mode) {
-  static auto apply_rgb_srcover_alpha = [&](auto f) -> Color {
-    return Color(f(src.red, dst.red), f(src.green, dst.green),
-                 f(src.blue, dst.blue),
-                 dst.alpha * (1 - src.alpha) + src.alpha  // srcOver alpha
-    );
-  };
+static constexpr inline Vector3 ComponentChoose(Vector3 a,
+                                                Vector3 b,
+                                                Vector3 value,
+                                                Scalar cutoff) {
+  return Vector3(value.x > cutoff ? b.x : a.x,  //
+                 value.y > cutoff ? b.y : a.y,  //
+                 value.z > cutoff ? b.z : a.z   //
+  );
+}
+
+static constexpr inline Vector3 ToRGB(Color color) {
+  return {color.red, color.green, color.blue};
+}
+
+static constexpr inline Color FromRGB(Vector3 color, Scalar alpha) {
+  return {color.x, color.y, color.z, alpha};
+}
+
+/// Composite a blended color onto the destination.
+/// All three parameters are unpremultiplied. Returns a premultiplied result.
+///
+/// This routine is the same as `IPApplyBlendedColor` in the Impeller shader
+/// library.
+static constexpr inline Color ApplyBlendedColor(Color dst,
+                                                Color src,
+                                                Vector3 blend_result) {
+  dst = dst.Premultiply();
+  src =
+      // Use the blended color for areas where the source and destination
+      // colors overlap.
+      FromRGB(blend_result, src.alpha * dst.alpha).Premultiply() +
+      // Use the original source color for any remaining non-overlapping areas.
+      src.Premultiply() * (1.0f - dst.alpha);
+
+  // Source-over composite the blended source color atop the destination.
+  return src + dst * (1.0f - src.alpha);
+}
+
+static constexpr inline Color DoColorBlend(
+    Color dst,
+    Color src,
+    const std::function<Vector3(Vector3, Vector3)>& blend_rgb_func) {
+  const Vector3 blend_result = blend_rgb_func(ToRGB(dst), ToRGB(src));
+  return ApplyBlendedColor(dst, src, blend_result).Unpremultiply();
+}
+
+static constexpr inline Color DoColorBlendComponents(
+    Color dst,
+    Color src,
+    const std::function<Scalar(Scalar, Scalar)>& blend_func) {
+  Vector3 blend_result = Vector3(blend_func(dst.red, src.red),      //
+                                 blend_func(dst.green, src.green),  //
+                                 blend_func(dst.blue, src.blue));   //
+  return ApplyBlendedColor(dst, src, blend_result).Unpremultiply();
+}
+
+Color Color::Blend(Color src, BlendMode blend_mode) const {
+  Color dst = *this;
 
   switch (blend_mode) {
     case BlendMode::kClear:
@@ -129,115 +243,177 @@ Color Color::BlendColor(const Color& src,
       return dst;
     case BlendMode::kSourceOver:
       // r = s + (1-sa)*d
-      return src + dst * (1 - src.alpha);
+      return (src.Premultiply() + dst.Premultiply() * (1 - src.alpha))
+          .Unpremultiply();
     case BlendMode::kDestinationOver:
       // r = d + (1-da)*s
-      return dst + src * (1 - dst.alpha);
+      return (dst.Premultiply() + src.Premultiply() * (1 - dst.alpha))
+          .Unpremultiply();
     case BlendMode::kSourceIn:
       // r = s * da
-      return src * dst.alpha;
+      return (src.Premultiply() * dst.alpha).Unpremultiply();
     case BlendMode::kDestinationIn:
       // r = d * sa
-      return dst * src.alpha;
+      return (dst.Premultiply() * src.alpha).Unpremultiply();
     case BlendMode::kSourceOut:
       // r = s * ( 1- da)
-      return src * (1 - dst.alpha);
+      return (src.Premultiply() * (1 - dst.alpha)).Unpremultiply();
     case BlendMode::kDestinationOut:
       // r = d * (1-sa)
-      return dst * (1 - src.alpha);
+      return (dst.Premultiply() * (1 - src.alpha)).Unpremultiply();
     case BlendMode::kSourceATop:
       // r = s*da + d*(1-sa)
-      return src * dst.alpha + dst * (1 - src.alpha);
+      return (src.Premultiply() * dst.alpha +
+              dst.Premultiply() * (1 - src.alpha))
+          .Unpremultiply();
     case BlendMode::kDestinationATop:
       // r = d*sa + s*(1-da)
-      return dst * src.alpha + src * (1 - dst.alpha);
+      return (dst.Premultiply() * src.alpha +
+              src.Premultiply() * (1 - dst.alpha))
+          .Unpremultiply();
     case BlendMode::kXor:
       // r = s*(1-da) + d*(1-sa)
-      return src * (1 - dst.alpha) + dst * (1 - src.alpha);
+      return (src.Premultiply() * (1 - dst.alpha) +
+              dst.Premultiply() * (1 - src.alpha))
+          .Unpremultiply();
     case BlendMode::kPlus:
       // r = min(s + d, 1)
-      return Min(src + dst, 1);
+      return (Min(src.Premultiply() + dst.Premultiply(), 1)).Unpremultiply();
     case BlendMode::kModulate:
       // r = s*d
-      return src * dst;
+      return (src.Premultiply() * dst.Premultiply()).Unpremultiply();
     case BlendMode::kScreen: {
-      // r = s + d - s*d
-      return src + dst - src * dst;
+      return DoColorBlend(dst, src, [](Vector3 d, Vector3 s) -> Vector3 {
+        return s + d - s * d;
+      });
     }
     case BlendMode::kOverlay:
-      return apply_rgb_srcover_alpha([&](auto s, auto d) {
-        if (d * 2 < dst.alpha) {
-          return 2 * s * d;
-        }
-        return src.alpha * dst.alpha - 2 * (dst.alpha - s) * (src.alpha - d);
-      });
-    case BlendMode::kDarken: {
-      return apply_rgb_srcover_alpha([&](auto s, auto d) {
-        return (1 - dst.alpha) * s + (1 - src.alpha) * d + std::min(s, d);
+      return DoColorBlend(dst, src, [](Vector3 d, Vector3 s) -> Vector3 {
+        // The same as HardLight, but with the source and destination reversed.
+        Vector3 screen_src = 2.0 * d - 1.0;
+        Vector3 screen = screen_src + s - screen_src * s;
+        return ComponentChoose(s * (2.0 * d),  //
+                               screen,         //
+                               d,              //
+                               0.5);
       });
-    }
+    case BlendMode::kDarken:
+      return DoColorBlend(
+          dst, src, [](Vector3 d, Vector3 s) -> Vector3 { return d.Min(s); });
     case BlendMode::kLighten:
-      return apply_rgb_srcover_alpha([&](auto s, auto d) {
-        return (1 - dst.alpha) * s + (1 - src.alpha) * d + std::max(s, d);
-      });
+      return DoColorBlend(
+          dst, src, [](Vector3 d, Vector3 s) -> Vector3 { return d.Max(s); });
     case BlendMode::kColorDodge:
-      return apply_rgb_srcover_alpha([&](auto s, auto d) {
-        if (d == 0) {
-          return s * (1 - src.alpha);
+      return DoColorBlendComponents(dst, src, [](Scalar d, Scalar s) -> Scalar {
+        if (d < kEhCloseEnough) {
+          return 0.0f;
         }
-        if (s == src.alpha) {
-          return s + dst.alpha * (1 - src.alpha);
+        if (1.0 - s < kEhCloseEnough) {
+          return 1.0f;
         }
-        return src.alpha *
-                   std::min(dst.alpha, d * src.alpha / (src.alpha - s)) +
-               s * (1 - dst.alpha + dst.alpha * (1 - src.alpha));
+        return std::min(1.0f, d / (1.0f - s));
       });
     case BlendMode::kColorBurn:
-      return apply_rgb_srcover_alpha([&](auto s, auto d) {
-        if (s == 0) {
-          return dst.alpha * (1 - src.alpha);
+      return DoColorBlendComponents(dst, src, [](Scalar d, Scalar s) -> Scalar {
+        if (1.0 - d < kEhCloseEnough) {
+          return 1.0f;
         }
-        if (d == dst.alpha) {
-          return d + s * (1 - dst.alpha);
+        if (s < kEhCloseEnough) {
+          return 0.0f;
         }
-        // s.a * (d.a - min(d.a, (d.a - s) * s.a/s)) + s * (1-d.a) + d.a * (1 -
-        // s.a)
-        return src.alpha *
-                   (dst.alpha -
-                    std::min(dst.alpha, (dst.alpha - d) * src.alpha / s)) +
-               s * (1 - dst.alpha) + dst.alpha * (1 - src.alpha);
+        return 1.0f - std::min(1.0f, (1.0f - d) / s);
       });
     case BlendMode::kHardLight:
-      return apply_rgb_srcover_alpha([&](auto s, auto d) {
-        if (src.alpha >= s * (1 - dst.alpha) + d * (1 - src.alpha) + 2 * s) {
-          return 2 * s * d;
-        }
-        // s.a * d.a - 2 * (d.a - d) * (s.a - s)
-        return src.alpha * dst.alpha - 2 * (dst.alpha - d) * (src.alpha - s);
+      return DoColorBlend(dst, src, [](Vector3 d, Vector3 s) -> Vector3 {
+        Vector3 screen_src = 2.0 * s - 1.0;
+        Vector3 screen = screen_src + d - screen_src * d;
+        return ComponentChoose(d * (2.0 * s),  //
+                               screen,         //
+                               s,              //
+                               0.5);
+      });
+    case BlendMode::kSoftLight:
+      return DoColorBlend(dst, src, [](Vector3 d, Vector3 s) -> Vector3 {
+        Vector3 D = ComponentChoose(((16.0 * d - 12.0) * d + 4.0) * d,  //
+                                    Vector3(std::sqrt(d.x), std::sqrt(d.y),
+                                            std::sqrt(d.z)),  //
+                                    d,                        //
+                                    0.25);
+        return ComponentChoose(d - (1.0 - 2.0 * s) * d * (1.0 - d),  //
+                               d + (2.0 * s - 1.0) * (D - d),        //
+                               s,                                    //
+                               0.5);
       });
     case BlendMode::kDifference:
-      return apply_rgb_srcover_alpha([&](auto s, auto d) {
-        // s + d - 2 * min(s * d.a, d * s.a);
-        return s + d - 2 * std::min(s * dst.alpha, d * src.alpha);
+      return DoColorBlend(dst, src, [](Vector3 d, Vector3 s) -> Vector3 {
+        return (d - s).Abs();
       });
     case BlendMode::kExclusion:
-      return apply_rgb_srcover_alpha([&](auto s, auto d) {
-        // s + d - 2 * s * d
-        return s + d - 2 * s * d;
+      return DoColorBlend(dst, src, [](Vector3 d, Vector3 s) -> Vector3 {
+        return d + s - 2.0f * d * s;
       });
     case BlendMode::kMultiply:
-      return apply_rgb_srcover_alpha([&](auto s, auto d) {
-        // s * (1 - d.a) + d * (1 - s.a) + (s * d)
-        return s * (1 - dst.alpha) + d * (1 - src.alpha) + (s * d);
+      return DoColorBlend(
+          dst, src, [](Vector3 d, Vector3 s) -> Vector3 { return d * s; });
+    case BlendMode::kHue: {
+      return DoColorBlend(dst, src, [](Vector3 d, Vector3 s) -> Vector3 {
+        return SetLuminosity(SetSaturation(s, Saturation(d)), Luminosity(d));
       });
-    case BlendMode::kHue:
+    }
     case BlendMode::kSaturation:
+      return DoColorBlend(dst, src, [](Vector3 d, Vector3 s) -> Vector3 {
+        return SetLuminosity(SetSaturation(d, Saturation(s)), Luminosity(d));
+      });
     case BlendMode::kColor:
+      return DoColorBlend(dst, src, [](Vector3 d, Vector3 s) -> Vector3 {
+        return SetLuminosity(s, Luminosity(d));
+      });
     case BlendMode::kLuminosity:
-    case BlendMode::kSoftLight:
-    default:
-      return src + dst * (1 - src.alpha);
+      return DoColorBlend(dst, src, [](Vector3 d, Vector3 s) -> Vector3 {
+        return SetLuminosity(d, Luminosity(s));
+      });
   }
 }
 
+Color Color::ApplyColorMatrix(const ColorMatrix& color_matrix) const {
+  auto* c = color_matrix.array;
+  return Color(
+             c[0] * red + c[1] * green + c[2] * blue + c[3] * alpha + c[4],
+             c[5] * red + c[6] * green + c[7] * blue + c[8] * alpha + c[9],
+             c[10] * red + c[11] * green + c[12] * blue + c[13] * alpha + c[14],
+             c[15] * red + c[16] * green + c[17] * blue + c[18] * alpha + c[19])
+      .Clamp01();
+}
+
+Color Color::LinearToSRGB() const {
+  static auto conversion = [](Scalar component) {
+    if (component <= 0.0031308) {
+      return component * 12.92;
+    }
+    return 1.055 * pow(component, (1.0 / 2.4)) - 0.055;
+  };
+
+  return Color(conversion(red), conversion(green), conversion(blue), alpha);
+}
+
+Color Color::SRGBToLinear() const {
+  static auto conversion = [](Scalar component) {
+    if (component <= 0.04045) {
+      return component / 12.92;
+    }
+    return pow((component + 0.055) / 1.055, 2.4);
+  };
+
+  return Color(conversion(red), conversion(green), conversion(blue), alpha);
+}
+
+std::string ColorToString(const Color& color) {
+  return SPrintF("R=%.1f,G=%.1f,B=%.1f,A=%.1f",  //
+                 color.red,                      //
+                 color.green,                    //
+                 color.blue,                     //
+                 color.alpha                     //
+  );
+}
+
 }  // namespace impeller
diff --git a/impeller/geometry/color.h b/impeller/geometry/color.h
index 6966a3ccc0f6dd95bf29bf811622273c704a68a7..c90c696066ed6864d3fdb82a8bbec643649bebd7 100644
--- a/impeller/geometry/color.h
+++ b/impeller/geometry/color.h
@@ -2,13 +2,50 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_GEOMETRY_COLOR_H_
+#define FLUTTER_IMPELLER_GEOMETRY_COLOR_H_
 
 #include <stdint.h>
+#include <algorithm>
 #include <array>
+#include <cstdint>
 #include <cstdlib>
 #include <ostream>
+#include <type_traits>
+
 #include "impeller/geometry/scalar.h"
+#include "impeller/geometry/type_traits.h"
+
+#define IMPELLER_FOR_EACH_BLEND_MODE(V) \
+  V(Clear)                              \
+  V(Source)                             \
+  V(Destination)                        \
+  V(SourceOver)                         \
+  V(DestinationOver)                    \
+  V(SourceIn)                           \
+  V(DestinationIn)                      \
+  V(SourceOut)                          \
+  V(DestinationOut)                     \
+  V(SourceATop)                         \
+  V(DestinationATop)                    \
+  V(Xor)                                \
+  V(Plus)                               \
+  V(Modulate)                           \
+  V(Screen)                             \
+  V(Overlay)                            \
+  V(Darken)                             \
+  V(Lighten)                            \
+  V(ColorDodge)                         \
+  V(ColorBurn)                          \
+  V(HardLight)                          \
+  V(SoftLight)                          \
+  V(Difference)                         \
+  V(Exclusion)                          \
+  V(Multiply)                           \
+  V(Hue)                                \
+  V(Saturation)                         \
+  V(Color)                              \
+  V(Luminosity)
 
 namespace impeller {
 
@@ -19,10 +56,10 @@ enum class YUVColorSpace { kBT601LimitedRange, kBT601FullRange };
 
 /// All blend modes assume that both the source (fragment output) and
 /// destination (first color attachment) have colors with premultiplied alpha.
-enum class BlendMode {
+enum class BlendMode : uint8_t {
   // The following blend modes are able to be used as pipeline blend modes or
   // via `BlendFilterContents`.
-  kClear,
+  kClear = 0,
   kSource,
   kDestination,
   kSourceOver,
@@ -55,6 +92,30 @@ enum class BlendMode {
   kSaturation,
   kColor,
   kLuminosity,
+
+  kLast = kLuminosity,
+};
+
+const char* BlendModeToString(BlendMode blend_mode);
+
+/// 4x5 matrix for transforming the color and alpha components of a Bitmap.
+///
+///   [ a, b, c, d, e,
+///     f, g, h, i, j,
+///     k, l, m, n, o,
+///     p, q, r, s, t ]
+///
+/// When applied to a color [R, G, B, A], the resulting color is computed as:
+///
+///    R’ = a*R + b*G + c*B + d*A + e;
+///    G’ = f*R + g*G + h*B + i*A + j;
+///    B’ = k*R + l*G + m*B + n*A + o;
+///    A’ = p*R + q*G + r*B + s*A + t;
+///
+/// That resulting color [R’, G’, B’, A’] then has each channel clamped to the 0
+/// to 1 range.
+struct ColorMatrix {
+  Scalar array[20];
 };
 
 /**
@@ -85,27 +146,77 @@ struct Color {
 
   explicit Color(const ColorHSB& hsbColor);
 
-  Color(const Vector4& value);
+  explicit Color(const Vector4& value);
 
   constexpr Color(Scalar r, Scalar g, Scalar b, Scalar a)
       : red(r), green(g), blue(b), alpha(a) {}
 
   static constexpr Color MakeRGBA8(uint8_t r, uint8_t g, uint8_t b, uint8_t a) {
-    return Color(static_cast<Scalar>(r) / 255, static_cast<Scalar>(g) / 255,
-                 static_cast<Scalar>(b) / 255, static_cast<Scalar>(a) / 255);
+    return Color(
+        static_cast<Scalar>(r) / 255.0f, static_cast<Scalar>(g) / 255.0f,
+        static_cast<Scalar>(b) / 255.0f, static_cast<Scalar>(a) / 255.0f);
   }
 
-  constexpr bool operator==(const Color& c) const {
+  /// @brief Convert this color to a 32-bit representation.
+  static constexpr uint32_t ToIColor(Color color) {
+    return (((std::lround(color.alpha * 255.0f) & 0xff) << 24) |
+            ((std::lround(color.red * 255.0f) & 0xff) << 16) |
+            ((std::lround(color.green * 255.0f) & 0xff) << 8) |
+            ((std::lround(color.blue * 255.0f) & 0xff) << 0)) &
+           0xFFFFFFFF;
+  }
+
+  constexpr inline bool operator==(const Color& c) const {
     return ScalarNearlyEqual(red, c.red) && ScalarNearlyEqual(green, c.green) &&
            ScalarNearlyEqual(blue, c.blue) && ScalarNearlyEqual(alpha, c.alpha);
   }
 
+  constexpr inline Color operator+(const Color& c) const {
+    return {red + c.red, green + c.green, blue + c.blue, alpha + c.alpha};
+  }
+
+  template <class T, class = std::enable_if_t<std::is_arithmetic_v<T>>>
+  constexpr inline Color operator+(T value) const {
+    auto v = static_cast<Scalar>(value);
+    return {red + v, green + v, blue + v, alpha + v};
+  }
+
+  constexpr inline Color operator-(const Color& c) const {
+    return {red - c.red, green - c.green, blue - c.blue, alpha - c.alpha};
+  }
+
+  template <class T, class = std::enable_if_t<std::is_arithmetic_v<T>>>
+  constexpr inline Color operator-(T value) const {
+    auto v = static_cast<Scalar>(value);
+    return {red - v, green - v, blue - v, alpha - v};
+  }
+
+  constexpr inline Color operator*(const Color& c) const {
+    return {red * c.red, green * c.green, blue * c.blue, alpha * c.alpha};
+  }
+
+  template <class T, class = std::enable_if_t<std::is_arithmetic_v<T>>>
+  constexpr inline Color operator*(T value) const {
+    auto v = static_cast<Scalar>(value);
+    return {red * v, green * v, blue * v, alpha * v};
+  }
+
+  constexpr inline Color operator/(const Color& c) const {
+    return {red * c.red, green * c.green, blue * c.blue, alpha * c.alpha};
+  }
+
+  template <class T, class = std::enable_if_t<std::is_arithmetic_v<T>>>
+  constexpr inline Color operator/(T value) const {
+    auto v = static_cast<Scalar>(value);
+    return {red / v, green / v, blue / v, alpha / v};
+  }
+
   constexpr Color Premultiply() const {
     return {red * alpha, green * alpha, blue * alpha, alpha};
   }
 
   constexpr Color Unpremultiply() const {
-    if (ScalarNearlyEqual(alpha, 0.0)) {
+    if (ScalarNearlyEqual(alpha, 0.0f)) {
       return Color::BlackTransparent();
     }
     return {red / alpha, green / alpha, blue / alpha, alpha};
@@ -113,17 +224,20 @@ struct Color {
 
   /**
    * @brief Return a color that is linearly interpolated between colors a
-   * and b, according to the value of t.
+   *        and b, according to the value of t.
    *
    * @param a The lower color.
    * @param b The upper color.
-   * @param t A value between 0.0 and 1.0, inclusive.
+   * @param t A value between 0.0f and 1.0f, inclusive.
    * @return constexpr Color
    */
-  constexpr static Color lerp(Color a, Color b, Scalar t) {
-    Scalar tt = 1.0 - t;
-    return {a.red * tt + b.red * t, a.green * tt + b.green * t,
-            a.blue * tt + b.blue * t, a.alpha * tt + b.alpha * t};
+  constexpr static Color Lerp(Color a, Color b, Scalar t) {
+    return a + (b - a) * t;
+  }
+
+  constexpr Color Clamp01() const {
+    return Color(std::clamp(red, 0.0f, 1.0f), std::clamp(green, 0.0f, 1.0f),
+                 std::clamp(blue, 0.0f, 1.0f), std::clamp(alpha, 0.0f, 1.0f));
   }
 
   /**
@@ -132,626 +246,669 @@ struct Color {
    * @return constexpr std::array<u_int8, 4>
    */
   constexpr std::array<uint8_t, 4> ToR8G8B8A8() const {
-    uint8_t r = std::round(red * 255);
-    uint8_t g = std::round(green * 255);
-    uint8_t b = std::round(blue * 255);
-    uint8_t a = std::round(alpha * 255);
+    uint8_t r = std::round(red * 255.0f);
+    uint8_t g = std::round(green * 255.0f);
+    uint8_t b = std::round(blue * 255.0f);
+    uint8_t a = std::round(alpha * 255.0f);
     return {r, g, b, a};
   }
 
-  static constexpr Color White() { return {1.0, 1.0, 1.0, 1.0}; }
+  static constexpr Color White() { return {1.0f, 1.0f, 1.0f, 1.0f}; }
 
-  static constexpr Color Black() { return {0.0, 0.0, 0.0, 1.0}; }
+  static constexpr Color Black() { return {0.0f, 0.0f, 0.0f, 1.0f}; }
 
-  static constexpr Color WhiteTransparent() { return {1.0, 1.0, 1.0, 0.0}; }
+  static constexpr Color WhiteTransparent() { return {1.0f, 1.0f, 1.0f, 0.0f}; }
 
-  static constexpr Color BlackTransparent() { return {0.0, 0.0, 0.0, 0.0}; }
+  static constexpr Color BlackTransparent() { return {0.0f, 0.0f, 0.0f, 0.0f}; }
 
-  static constexpr Color Red() { return {1.0, 0.0, 0.0, 1.0}; }
+  static constexpr Color Red() { return {1.0f, 0.0f, 0.0f, 1.0f}; }
 
-  static constexpr Color Green() { return {0.0, 1.0, 0.0, 1.0}; }
+  static constexpr Color Green() { return {0.0f, 1.0f, 0.0f, 1.0f}; }
 
-  static constexpr Color Blue() { return {0.0, 0.0, 1.0, 1.0}; }
+  static constexpr Color Blue() { return {0.0f, 0.0f, 1.0f, 1.0f}; }
 
   constexpr Color WithAlpha(Scalar new_alpha) const {
     return {red, green, blue, new_alpha};
   }
 
   static constexpr Color AliceBlue() {
-    return {240.0 / 255.0, 248.0 / 255.0, 255.0 / 255.0, 1.0};
+    return {240.0f / 255.0f, 248.0f / 255.0f, 255.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color AntiqueWhite() {
-    return {250.0 / 255.0, 235.0 / 255.0, 215.0 / 255.0, 1.0};
+    return {250.0f / 255.0f, 235.0f / 255.0f, 215.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Aqua() {
-    return {0.0 / 255.0, 255.0 / 255.0, 255.0 / 255.0, 1.0};
+    return {0.0f / 255.0f, 255.0f / 255.0f, 255.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color AquaMarine() {
-    return {127.0 / 255.0, 255.0 / 255.0, 212.0 / 255.0, 1.0};
+    return {127.0f / 255.0f, 255.0f / 255.0f, 212.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Azure() {
-    return {240.0 / 255.0, 255.0 / 255.0, 255.0 / 255.0, 1.0};
+    return {240.0f / 255.0f, 255.0f / 255.0f, 255.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Beige() {
-    return {245.0 / 255.0, 245.0 / 255.0, 220.0 / 255.0, 1.0};
+    return {245.0f / 255.0f, 245.0f / 255.0f, 220.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Bisque() {
-    return {255.0 / 255.0, 228.0 / 255.0, 196.0 / 255.0, 1.0};
+    return {255.0f / 255.0f, 228.0f / 255.0f, 196.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color BlanchedAlmond() {
-    return {255.0 / 255.0, 235.0 / 255.0, 205.0 / 255.0, 1.0};
+    return {255.0f / 255.0f, 235.0f / 255.0f, 205.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color BlueViolet() {
-    return {138.0 / 255.0, 43.0 / 255.0, 226.0 / 255.0, 1.0};
+    return {138.0f / 255.0f, 43.0f / 255.0f, 226.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Brown() {
-    return {165.0 / 255.0, 42.0 / 255.0, 42.0 / 255.0, 1.0};
+    return {165.0f / 255.0f, 42.0f / 255.0f, 42.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color BurlyWood() {
-    return {222.0 / 255.0, 184.0 / 255.0, 135.0 / 255.0, 1.0};
+    return {222.0f / 255.0f, 184.0f / 255.0f, 135.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color CadetBlue() {
-    return {95.0 / 255.0, 158.0 / 255.0, 160.0 / 255.0, 1.0};
+    return {95.0f / 255.0f, 158.0f / 255.0f, 160.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Chartreuse() {
-    return {127.0 / 255.0, 255.0 / 255.0, 0.0 / 255.0, 1.0};
+    return {127.0f / 255.0f, 255.0f / 255.0f, 0.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Chocolate() {
-    return {210.0 / 255.0, 105.0 / 255.0, 30.0 / 255.0, 1.0};
+    return {210.0f / 255.0f, 105.0f / 255.0f, 30.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Coral() {
-    return {255.0 / 255.0, 127.0 / 255.0, 80.0 / 255.0, 1.0};
+    return {255.0f / 255.0f, 127.0f / 255.0f, 80.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color CornflowerBlue() {
-    return {100.0 / 255.0, 149.0 / 255.0, 237.0 / 255.0, 1.0};
+    return {100.0f / 255.0f, 149.0f / 255.0f, 237.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Cornsilk() {
-    return {255.0 / 255.0, 248.0 / 255.0, 220.0 / 255.0, 1.0};
+    return {255.0f / 255.0f, 248.0f / 255.0f, 220.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Crimson() {
-    return {220.0 / 255.0, 20.0 / 255.0, 60.0 / 255.0, 1.0};
+    return {220.0f / 255.0f, 20.0f / 255.0f, 60.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Cyan() {
-    return {0.0 / 255.0, 255.0 / 255.0, 255.0 / 255.0, 1.0};
+    return {0.0f / 255.0f, 255.0f / 255.0f, 255.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color DarkBlue() {
-    return {0.0 / 255.0, 0.0 / 255.0, 139.0 / 255.0, 1.0};
+    return {0.0f / 255.0f, 0.0f / 255.0f, 139.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color DarkCyan() {
-    return {0.0 / 255.0, 139.0 / 255.0, 139.0 / 255.0, 1.0};
+    return {0.0f / 255.0f, 139.0f / 255.0f, 139.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color DarkGoldenrod() {
-    return {184.0 / 255.0, 134.0 / 255.0, 11.0 / 255.0, 1.0};
+    return {184.0f / 255.0f, 134.0f / 255.0f, 11.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color DarkGray() {
-    return {169.0 / 255.0, 169.0 / 255.0, 169.0 / 255.0, 1.0};
+    return {169.0f / 255.0f, 169.0f / 255.0f, 169.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color DarkGreen() {
-    return {0.0 / 255.0, 100.0 / 255.0, 0.0 / 255.0, 1.0};
+    return {0.0f / 255.0f, 100.0f / 255.0f, 0.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color DarkGrey() {
-    return {169.0 / 255.0, 169.0 / 255.0, 169.0 / 255.0, 1.0};
+    return {169.0f / 255.0f, 169.0f / 255.0f, 169.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color DarkKhaki() {
-    return {189.0 / 255.0, 183.0 / 255.0, 107.0 / 255.0, 1.0};
+    return {189.0f / 255.0f, 183.0f / 255.0f, 107.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color DarkMagenta() {
-    return {139.0 / 255.0, 0.0 / 255.0, 139.0 / 255.0, 1.0};
+    return {139.0f / 255.0f, 0.0f / 255.0f, 139.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color DarkOliveGreen() {
-    return {85.0 / 255.0, 107.0 / 255.0, 47.0 / 255.0, 1.0};
+    return {85.0f / 255.0f, 107.0f / 255.0f, 47.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color DarkOrange() {
-    return {255.0 / 255.0, 140.0 / 255.0, 0.0 / 255.0, 1.0};
+    return {255.0f / 255.0f, 140.0f / 255.0f, 0.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color DarkOrchid() {
-    return {153.0 / 255.0, 50.0 / 255.0, 204.0 / 255.0, 1.0};
+    return {153.0f / 255.0f, 50.0f / 255.0f, 204.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color DarkRed() {
-    return {139.0 / 255.0, 0.0 / 255.0, 0.0 / 255.0, 1.0};
+    return {139.0f / 255.0f, 0.0f / 255.0f, 0.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color DarkSalmon() {
-    return {233.0 / 255.0, 150.0 / 255.0, 122.0 / 255.0, 1.0};
+    return {233.0f / 255.0f, 150.0f / 255.0f, 122.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color DarkSeagreen() {
-    return {143.0 / 255.0, 188.0 / 255.0, 143.0 / 255.0, 1.0};
+    return {143.0f / 255.0f, 188.0f / 255.0f, 143.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color DarkSlateBlue() {
-    return {72.0 / 255.0, 61.0 / 255.0, 139.0 / 255.0, 1.0};
+    return {72.0f / 255.0f, 61.0f / 255.0f, 139.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color DarkSlateGray() {
-    return {47.0 / 255.0, 79.0 / 255.0, 79.0 / 255.0, 1.0};
+    return {47.0f / 255.0f, 79.0f / 255.0f, 79.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color DarkSlateGrey() {
-    return {47.0 / 255.0, 79.0 / 255.0, 79.0 / 255.0, 1.0};
+    return {47.0f / 255.0f, 79.0f / 255.0f, 79.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color DarkTurquoise() {
-    return {0.0 / 255.0, 206.0 / 255.0, 209.0 / 255.0, 1.0};
+    return {0.0f / 255.0f, 206.0f / 255.0f, 209.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color DarkViolet() {
-    return {148.0 / 255.0, 0.0 / 255.0, 211.0 / 255.0, 1.0};
+    return {148.0f / 255.0f, 0.0f / 255.0f, 211.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color DeepPink() {
-    return {255.0 / 255.0, 20.0 / 255.0, 147.0 / 255.0, 1.0};
+    return {255.0f / 255.0f, 20.0f / 255.0f, 147.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color DeepSkyBlue() {
-    return {0.0 / 255.0, 191.0 / 255.0, 255.0 / 255.0, 1.0};
+    return {0.0f / 255.0f, 191.0f / 255.0f, 255.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color DimGray() {
-    return {105.0 / 255.0, 105.0 / 255.0, 105.0 / 255.0, 1.0};
+    return {105.0f / 255.0f, 105.0f / 255.0f, 105.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color DimGrey() {
-    return {105.0 / 255.0, 105.0 / 255.0, 105.0 / 255.0, 1.0};
+    return {105.0f / 255.0f, 105.0f / 255.0f, 105.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color DodgerBlue() {
-    return {30.0 / 255.0, 144.0 / 255.0, 255.0 / 255.0, 1.0};
+    return {30.0f / 255.0f, 144.0f / 255.0f, 255.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Firebrick() {
-    return {178.0 / 255.0, 34.0 / 255.0, 34.0 / 255.0, 1.0};
+    return {178.0f / 255.0f, 34.0f / 255.0f, 34.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color FloralWhite() {
-    return {255.0 / 255.0, 250.0 / 255.0, 240.0 / 255.0, 1.0};
+    return {255.0f / 255.0f, 250.0f / 255.0f, 240.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color ForestGreen() {
-    return {34.0 / 255.0, 139.0 / 255.0, 34.0 / 255.0, 1.0};
+    return {34.0f / 255.0f, 139.0f / 255.0f, 34.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Fuchsia() {
-    return {255.0 / 255.0, 0.0 / 255.0, 255.0 / 255.0, 1.0};
+    return {255.0f / 255.0f, 0.0f / 255.0f, 255.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Gainsboro() {
-    return {220.0 / 255.0, 220.0 / 255.0, 220.0 / 255.0, 1.0};
+    return {220.0f / 255.0f, 220.0f / 255.0f, 220.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Ghostwhite() {
-    return {248.0 / 255.0, 248.0 / 255.0, 255.0 / 255.0, 1.0};
+    return {248.0f / 255.0f, 248.0f / 255.0f, 255.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Gold() {
-    return {255.0 / 255.0, 215.0 / 255.0, 0.0 / 255.0, 1.0};
+    return {255.0f / 255.0f, 215.0f / 255.0f, 0.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Goldenrod() {
-    return {218.0 / 255.0, 165.0 / 255.0, 32.0 / 255.0, 1.0};
+    return {218.0f / 255.0f, 165.0f / 255.0f, 32.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Gray() {
-    return {128.0 / 255.0, 128.0 / 255.0, 128.0 / 255.0, 1.0};
+    return {128.0f / 255.0f, 128.0f / 255.0f, 128.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color GreenYellow() {
-    return {173.0 / 255.0, 255.0 / 255.0, 47.0 / 255.0, 1.0};
+    return {173.0f / 255.0f, 255.0f / 255.0f, 47.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Grey() {
-    return {128.0 / 255.0, 128.0 / 255.0, 128.0 / 255.0, 1.0};
+    return {128.0f / 255.0f, 128.0f / 255.0f, 128.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Honeydew() {
-    return {240.0 / 255.0, 255.0 / 255.0, 240.0 / 255.0, 1.0};
+    return {240.0f / 255.0f, 255.0f / 255.0f, 240.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color HotPink() {
-    return {255.0 / 255.0, 105.0 / 255.0, 180.0 / 255.0, 1.0};
+    return {255.0f / 255.0f, 105.0f / 255.0f, 180.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color IndianRed() {
-    return {205.0 / 255.0, 92.0 / 255.0, 92.0 / 255.0, 1.0};
+    return {205.0f / 255.0f, 92.0f / 255.0f, 92.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Indigo() {
-    return {75.0 / 255.0, 0.0 / 255.0, 130.0 / 255.0, 1.0};
+    return {75.0f / 255.0f, 0.0f / 255.0f, 130.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Ivory() {
-    return {255.0 / 255.0, 255.0 / 255.0, 240.0 / 255.0, 1.0};
+    return {255.0f / 255.0f, 255.0f / 255.0f, 240.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Khaki() {
-    return {240.0 / 255.0, 230.0 / 255.0, 140.0 / 255.0, 1.0};
+    return {240.0f / 255.0f, 230.0f / 255.0f, 140.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Lavender() {
-    return {230.0 / 255.0, 230.0 / 255.0, 250.0 / 255.0, 1.0};
+    return {230.0f / 255.0f, 230.0f / 255.0f, 250.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color LavenderBlush() {
-    return {255.0 / 255.0, 240.0 / 255.0, 245.0 / 255.0, 1.0};
+    return {255.0f / 255.0f, 240.0f / 255.0f, 245.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color LawnGreen() {
-    return {124.0 / 255.0, 252.0 / 255.0, 0.0 / 255.0, 1.0};
+    return {124.0f / 255.0f, 252.0f / 255.0f, 0.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color LemonChiffon() {
-    return {255.0 / 255.0, 250.0 / 255.0, 205.0 / 255.0, 1.0};
+    return {255.0f / 255.0f, 250.0f / 255.0f, 205.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color LightBlue() {
-    return {173.0 / 255.0, 216.0 / 255.0, 230.0 / 255.0, 1.0};
+    return {173.0f / 255.0f, 216.0f / 255.0f, 230.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color LightCoral() {
-    return {240.0 / 255.0, 128.0 / 255.0, 128.0 / 255.0, 1.0};
+    return {240.0f / 255.0f, 128.0f / 255.0f, 128.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color LightCyan() {
-    return {224.0 / 255.0, 255.0 / 255.0, 255.0 / 255.0, 1.0};
+    return {224.0f / 255.0f, 255.0f / 255.0f, 255.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color LightGoldenrodYellow() {
-    return {50.0 / 255.0, 250.0 / 255.0, 210.0 / 255.0, 1.0};
+    return {50.0f / 255.0f, 250.0f / 255.0f, 210.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color LightGray() {
-    return {211.0 / 255.0, 211.0 / 255.0, 211.0 / 255.0, 1.0};
+    return {211.0f / 255.0f, 211.0f / 255.0f, 211.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color LightGreen() {
-    return {144.0 / 255.0, 238.0 / 255.0, 144.0 / 255.0, 1.0};
+    return {144.0f / 255.0f, 238.0f / 255.0f, 144.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color LightGrey() {
-    return {211.0 / 255.0, 211.0 / 255.0, 211.0 / 255.0, 1.0};
+    return {211.0f / 255.0f, 211.0f / 255.0f, 211.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color LightPink() {
-    return {255.0 / 255.0, 182.0 / 255.0, 193.0 / 255.0, 1.0};
+    return {255.0f / 255.0f, 182.0f / 255.0f, 193.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color LightSalmon() {
-    return {255.0 / 255.0, 160.0 / 255.0, 122.0 / 255.0, 1.0};
+    return {255.0f / 255.0f, 160.0f / 255.0f, 122.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color LightSeaGreen() {
-    return {32.0 / 255.0, 178.0 / 255.0, 170.0 / 255.0, 1.0};
+    return {32.0f / 255.0f, 178.0f / 255.0f, 170.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color LightSkyBlue() {
-    return {135.0 / 255.0, 206.0 / 255.0, 250.0 / 255.0, 1.0};
+    return {135.0f / 255.0f, 206.0f / 255.0f, 250.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color LightSlateGray() {
-    return {119.0 / 255.0, 136.0 / 255.0, 153.0 / 255.0, 1.0};
+    return {119.0f / 255.0f, 136.0f / 255.0f, 153.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color LightSlateGrey() {
-    return {119.0 / 255.0, 136.0 / 255.0, 153.0 / 255.0, 1.0};
+    return {119.0f / 255.0f, 136.0f / 255.0f, 153.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color LightSteelBlue() {
-    return {176.0 / 255.0, 196.0 / 255.0, 222.0 / 255.0, 1.0};
+    return {176.0f / 255.0f, 196.0f / 255.0f, 222.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color LightYellow() {
-    return {255.0 / 255.0, 255.0 / 255.0, 224.0 / 255.0, 1.0};
+    return {255.0f / 255.0f, 255.0f / 255.0f, 224.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Lime() {
-    return {0.0 / 255.0, 255.0 / 255.0, 0.0 / 255.0, 1.0};
+    return {0.0f / 255.0f, 255.0f / 255.0f, 0.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color LimeGreen() {
-    return {50.0 / 255.0, 205.0 / 255.0, 50.0 / 255.0, 1.0};
+    return {50.0f / 255.0f, 205.0f / 255.0f, 50.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Linen() {
-    return {250.0 / 255.0, 240.0 / 255.0, 230.0 / 255.0, 1.0};
+    return {250.0f / 255.0f, 240.0f / 255.0f, 230.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Magenta() {
-    return {255.0 / 255.0, 0.0 / 255.0, 255.0 / 255.0, 1.0};
+    return {255.0f / 255.0f, 0.0f / 255.0f, 255.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Maroon() {
-    return {128.0 / 255.0, 0.0 / 255.0, 0.0 / 255.0, 1.0};
+    return {128.0f / 255.0f, 0.0f / 255.0f, 0.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color MediumAquamarine() {
-    return {102.0 / 255.0, 205.0 / 255.0, 170.0 / 255.0, 1.0};
+    return {102.0f / 255.0f, 205.0f / 255.0f, 170.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color MediumBlue() {
-    return {0.0 / 255.0, 0.0 / 255.0, 205.0 / 255.0, 1.0};
+    return {0.0f / 255.0f, 0.0f / 255.0f, 205.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color MediumOrchid() {
-    return {186.0 / 255.0, 85.0 / 255.0, 211.0 / 255.0, 1.0};
+    return {186.0f / 255.0f, 85.0f / 255.0f, 211.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color MediumPurple() {
-    return {147.0 / 255.0, 112.0 / 255.0, 219.0 / 255.0, 1.0};
+    return {147.0f / 255.0f, 112.0f / 255.0f, 219.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color MediumSeagreen() {
-    return {60.0 / 255.0, 179.0 / 255.0, 113.0 / 255.0, 1.0};
+    return {60.0f / 255.0f, 179.0f / 255.0f, 113.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color MediumSlateBlue() {
-    return {123.0 / 255.0, 104.0 / 255.0, 238.0 / 255.0, 1.0};
+    return {123.0f / 255.0f, 104.0f / 255.0f, 238.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color MediumSpringGreen() {
-    return {0.0 / 255.0, 250.0 / 255.0, 154.0 / 255.0, 1.0};
+    return {0.0f / 255.0f, 250.0f / 255.0f, 154.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color MediumTurquoise() {
-    return {72.0 / 255.0, 209.0 / 255.0, 204.0 / 255.0, 1.0};
+    return {72.0f / 255.0f, 209.0f / 255.0f, 204.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color MediumVioletRed() {
-    return {199.0 / 255.0, 21.0 / 255.0, 133.0 / 255.0, 1.0};
+    return {199.0f / 255.0f, 21.0f / 255.0f, 133.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color MidnightBlue() {
-    return {25.0 / 255.0, 25.0 / 255.0, 112.0 / 255.0, 1.0};
+    return {25.0f / 255.0f, 25.0f / 255.0f, 112.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color MintCream() {
-    return {245.0 / 255.0, 255.0 / 255.0, 250.0 / 255.0, 1.0};
+    return {245.0f / 255.0f, 255.0f / 255.0f, 250.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color MistyRose() {
-    return {255.0 / 255.0, 228.0 / 255.0, 225.0 / 255.0, 1.0};
+    return {255.0f / 255.0f, 228.0f / 255.0f, 225.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Moccasin() {
-    return {255.0 / 255.0, 228.0 / 255.0, 181.0 / 255.0, 1.0};
+    return {255.0f / 255.0f, 228.0f / 255.0f, 181.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color NavajoWhite() {
-    return {255.0 / 255.0, 222.0 / 255.0, 173.0 / 255.0, 1.0};
+    return {255.0f / 255.0f, 222.0f / 255.0f, 173.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Navy() {
-    return {0.0 / 255.0, 0.0 / 255.0, 128.0 / 255.0, 1.0};
+    return {0.0f / 255.0f, 0.0f / 255.0f, 128.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color OldLace() {
-    return {253.0 / 255.0, 245.0 / 255.0, 230.0 / 255.0, 1.0};
+    return {253.0f / 255.0f, 245.0f / 255.0f, 230.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Olive() {
-    return {128.0 / 255.0, 128.0 / 255.0, 0.0 / 255.0, 1.0};
+    return {128.0f / 255.0f, 128.0f / 255.0f, 0.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color OliveDrab() {
-    return {107.0 / 255.0, 142.0 / 255.0, 35.0 / 255.0, 1.0};
+    return {107.0f / 255.0f, 142.0f / 255.0f, 35.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Orange() {
-    return {255.0 / 255.0, 165.0 / 255.0, 0.0 / 255.0, 1.0};
+    return {255.0f / 255.0f, 165.0f / 255.0f, 0.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color OrangeRed() {
-    return {255.0 / 255.0, 69.0 / 255.0, 0.0 / 255.0, 1.0};
+    return {255.0f / 255.0f, 69.0f / 255.0f, 0.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Orchid() {
-    return {218.0 / 255.0, 112.0 / 255.0, 214.0 / 255.0, 1.0};
+    return {218.0f / 255.0f, 112.0f / 255.0f, 214.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color PaleGoldenrod() {
-    return {238.0 / 255.0, 232.0 / 255.0, 170.0 / 255.0, 1.0};
+    return {238.0f / 255.0f, 232.0f / 255.0f, 170.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color PaleGreen() {
-    return {152.0 / 255.0, 251.0 / 255.0, 152.0 / 255.0, 1.0};
+    return {152.0f / 255.0f, 251.0f / 255.0f, 152.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color PaleTurquoise() {
-    return {175.0 / 255.0, 238.0 / 255.0, 238.0 / 255.0, 1.0};
+    return {175.0f / 255.0f, 238.0f / 255.0f, 238.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color PaleVioletRed() {
-    return {219.0 / 255.0, 112.0 / 255.0, 147.0 / 255.0, 1.0};
+    return {219.0f / 255.0f, 112.0f / 255.0f, 147.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color PapayaWhip() {
-    return {255.0 / 255.0, 239.0 / 255.0, 213.0 / 255.0, 1.0};
+    return {255.0f / 255.0f, 239.0f / 255.0f, 213.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Peachpuff() {
-    return {255.0 / 255.0, 218.0 / 255.0, 185.0 / 255.0, 1.0};
+    return {255.0f / 255.0f, 218.0f / 255.0f, 185.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Peru() {
-    return {205.0 / 255.0, 133.0 / 255.0, 63.0 / 255.0, 1.0};
+    return {205.0f / 255.0f, 133.0f / 255.0f, 63.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Pink() {
-    return {255.0 / 255.0, 192.0 / 255.0, 203.0 / 255.0, 1.0};
+    return {255.0f / 255.0f, 192.0f / 255.0f, 203.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Plum() {
-    return {221.0 / 255.0, 160.0 / 255.0, 221.0 / 255.0, 1.0};
+    return {221.0f / 255.0f, 160.0f / 255.0f, 221.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color PowderBlue() {
-    return {176.0 / 255.0, 224.0 / 255.0, 230.0 / 255.0, 1.0};
+    return {176.0f / 255.0f, 224.0f / 255.0f, 230.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Purple() {
-    return {128.0 / 255.0, 0.0 / 255.0, 128.0 / 255.0, 1.0};
+    return {128.0f / 255.0f, 0.0f / 255.0f, 128.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color RosyBrown() {
-    return {188.0 / 255.0, 143.0 / 255.0, 143.0 / 255.0, 1.0};
+    return {188.0f / 255.0f, 143.0f / 255.0f, 143.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color RoyalBlue() {
-    return {65.0 / 255.0, 105.0 / 255.0, 225.0 / 255.0, 1.0};
+    return {65.0f / 255.0f, 105.0f / 255.0f, 225.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color SaddleBrown() {
-    return {139.0 / 255.0, 69.0 / 255.0, 19.0 / 255.0, 1.0};
+    return {139.0f / 255.0f, 69.0f / 255.0f, 19.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Salmon() {
-    return {250.0 / 255.0, 128.0 / 255.0, 114.0 / 255.0, 1.0};
+    return {250.0f / 255.0f, 128.0f / 255.0f, 114.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color SandyBrown() {
-    return {244.0 / 255.0, 164.0 / 255.0, 96.0 / 255.0, 1.0};
+    return {244.0f / 255.0f, 164.0f / 255.0f, 96.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Seagreen() {
-    return {46.0 / 255.0, 139.0 / 255.0, 87.0 / 255.0, 1.0};
+    return {46.0f / 255.0f, 139.0f / 255.0f, 87.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Seashell() {
-    return {255.0 / 255.0, 245.0 / 255.0, 238.0 / 255.0, 1.0};
+    return {255.0f / 255.0f, 245.0f / 255.0f, 238.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Sienna() {
-    return {160.0 / 255.0, 82.0 / 255.0, 45.0 / 255.0, 1.0};
+    return {160.0f / 255.0f, 82.0f / 255.0f, 45.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Silver() {
-    return {192.0 / 255.0, 192.0 / 255.0, 192.0 / 255.0, 1.0};
+    return {192.0f / 255.0f, 192.0f / 255.0f, 192.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color SkyBlue() {
-    return {135.0 / 255.0, 206.0 / 255.0, 235.0 / 255.0, 1.0};
+    return {135.0f / 255.0f, 206.0f / 255.0f, 235.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color SlateBlue() {
-    return {106.0 / 255.0, 90.0 / 255.0, 205.0 / 255.0, 1.0};
+    return {106.0f / 255.0f, 90.0f / 255.0f, 205.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color SlateGray() {
-    return {112.0 / 255.0, 128.0 / 255.0, 144.0 / 255.0, 1.0};
+    return {112.0f / 255.0f, 128.0f / 255.0f, 144.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color SlateGrey() {
-    return {112.0 / 255.0, 128.0 / 255.0, 144.0 / 255.0, 1.0};
+    return {112.0f / 255.0f, 128.0f / 255.0f, 144.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Snow() {
-    return {255.0 / 255.0, 250.0 / 255.0, 250.0 / 255.0, 1.0};
+    return {255.0f / 255.0f, 250.0f / 255.0f, 250.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color SpringGreen() {
-    return {0.0 / 255.0, 255.0 / 255.0, 127.0 / 255.0, 1.0};
+    return {0.0f / 255.0f, 255.0f / 255.0f, 127.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color SteelBlue() {
-    return {70.0 / 255.0, 130.0 / 255.0, 180.0 / 255.0, 1.0};
+    return {70.0f / 255.0f, 130.0f / 255.0f, 180.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Tan() {
-    return {210.0 / 255.0, 180.0 / 255.0, 140.0 / 255.0, 1.0};
+    return {210.0f / 255.0f, 180.0f / 255.0f, 140.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Teal() {
-    return {0.0 / 255.0, 128.0 / 255.0, 128.0 / 255.0, 1.0};
+    return {0.0f / 255.0f, 128.0f / 255.0f, 128.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Thistle() {
-    return {216.0 / 255.0, 191.0 / 255.0, 216.0 / 255.0, 1.0};
+    return {216.0f / 255.0f, 191.0f / 255.0f, 216.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Tomato() {
-    return {255.0 / 255.0, 99.0 / 255.0, 71.0 / 255.0, 1.0};
+    return {255.0f / 255.0f, 99.0f / 255.0f, 71.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Turquoise() {
-    return {64.0 / 255.0, 224.0 / 255.0, 208.0 / 255.0, 1.0};
+    return {64.0f / 255.0f, 224.0f / 255.0f, 208.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Violet() {
-    return {238.0 / 255.0, 130.0 / 255.0, 238.0 / 255.0, 1.0};
+    return {238.0f / 255.0f, 130.0f / 255.0f, 238.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Wheat() {
-    return {245.0 / 255.0, 222.0 / 255.0, 179.0 / 255.0, 1.0};
+    return {245.0f / 255.0f, 222.0f / 255.0f, 179.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Whitesmoke() {
-    return {245.0 / 255.0, 245.0 / 255.0, 245.0 / 255.0, 1.0};
+    return {245.0f / 255.0f, 245.0f / 255.0f, 245.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color Yellow() {
-    return {255.0 / 255.0, 255.0 / 255.0, 0.0 / 255.0, 1.0};
+    return {255.0f / 255.0f, 255.0f / 255.0f, 0.0f / 255.0f, 1.0f};
   }
 
   static constexpr Color YellowGreen() {
-    return {154.0 / 255.0, 205.0 / 255.0, 50.0 / 255.0, 1.0};
+    return {154.0f / 255.0f, 205.0f / 255.0f, 50.0f / 255.0f, 1.0f};
   }
 
   static Color Random() {
     return {
-        static_cast<Scalar>((std::rand() % 255) / 255.0),  //
-        static_cast<Scalar>((std::rand() % 255) / 255.0),  //
-        static_cast<Scalar>((std::rand() % 255) / 255.0),  //
-        1.0                                                //
+        // This method is not used for cryptographic purposes.
+        // NOLINTBEGIN(clang-analyzer-security.insecureAPI.rand)
+        static_cast<Scalar>((std::rand() % 255) / 255.0f),  //
+        static_cast<Scalar>((std::rand() % 255) / 255.0f),  //
+        static_cast<Scalar>((std::rand() % 255) / 255.0f),  //
+        // NOLINTEND(clang-analyzer-security.insecureAPI.rand)
+        1.0f  //
+
     };
   }
 
-  static Color BlendColor(const Color& src,
-                          const Color& dst,
-                          BlendMode blend_mode);
-
-  Color operator*(const Color& c) const {
-    return Color(red * c.red, green * c.green, blue * c.blue, alpha * c.alpha);
-  }
+  /// @brief Blends an unpremultiplied destination color into a given
+  ///        unpremultiplied source color to form a new unpremultiplied color.
+  ///
+  ///        If either the source or destination are premultiplied, the result
+  ///        will be incorrect.
+  Color Blend(Color source, BlendMode blend_mode) const;
+
+  /// @brief A color filter that transforms colors through a 4x5 color matrix.
+  ///
+  ///        This filter can be used to change the saturation of pixels, convert
+  ///        from YUV to RGB, etc.
+  ///
+  ///        Each channel of the output color is clamped to the 0 to 1 range.
+  ///
+  /// @see   `ColorMatrix`
+  Color ApplyColorMatrix(const ColorMatrix& color_matrix) const;
+
+  /// @brief Convert the color from linear space to sRGB space.
+  ///
+  ///        The color is assumed to be unpremultiplied. If the color is
+  ///        premultipled, the conversion output will be incorrect.
+  Color LinearToSRGB() const;
+
+  /// @brief Convert the color from sRGB space to linear space.
+  ///
+  ///        The color is assumed to be unpremultiplied. If the color is
+  ///        premultipled, the conversion output will be incorrect.
+  Color SRGBToLinear() const;
+
+  constexpr bool IsTransparent() const { return alpha == 0.0f; }
+
+  constexpr bool IsOpaque() const { return alpha == 1.0f; }
+};
 
-  Color operator+(const Color& c) const;
+template <class T, class = std::enable_if_t<std::is_arithmetic_v<T>>>
+constexpr inline Color operator+(T value, const Color& c) {
+  return c + static_cast<Scalar>(value);
+}
 
-  Color operator-(const Color& c) const;
+template <class T, class = std::enable_if_t<std::is_arithmetic_v<T>>>
+constexpr inline Color operator-(T value, const Color& c) {
+  auto v = static_cast<Scalar>(value);
+  return {v - c.red, v - c.green, v - c.blue, v - c.alpha};
+}
 
-  Color operator*(Scalar value) const;
+template <class T, class = std::enable_if_t<std::is_arithmetic_v<T>>>
+constexpr inline Color operator*(T value, const Color& c) {
+  return c * static_cast<Scalar>(value);
+}
 
-  constexpr bool IsTransparent() const { return alpha == 0.0; }
+template <class T, class = std::enable_if_t<std::is_arithmetic_v<T>>>
+constexpr inline Color operator/(T value, const Color& c) {
+  auto v = static_cast<Scalar>(value);
+  return {v / c.red, v / c.green, v / c.blue, v / c.alpha};
+}
 
-  constexpr bool IsOpaque() const { return alpha == 1.0; }
-};
+std::string ColorToString(const Color& color);
 
 /**
  *  Represents a color by its constituent hue, saturation, brightness and alpha
@@ -798,3 +955,5 @@ inline std::ostream& operator<<(std::ostream& out, const impeller::Color& c) {
 }
 
 }  // namespace std
+
+#endif  // FLUTTER_IMPELLER_GEOMETRY_COLOR_H_
diff --git a/impeller/geometry/constants.h b/impeller/geometry/constants.h
index 5e775b5385194bb06fe55e67102aaf588869c73d..2fa8e037db8a8765da5eb54149a0228a7d271912 100644
--- a/impeller/geometry/constants.h
+++ b/impeller/geometry/constants.h
@@ -2,56 +2,59 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_GEOMETRY_CONSTANTS_H_
+#define FLUTTER_IMPELLER_GEOMETRY_CONSTANTS_H_
 
 namespace impeller {
 
 // e
-constexpr float kE = 2.7182818284590452354;
+constexpr float kE = 2.7182818284590452354f;
 
 // log_2 e
-constexpr float kLog2_E = 1.4426950408889634074;
+constexpr float kLog2E = 1.4426950408889634074f;
 
 // log_10 e
-constexpr float kLog10_E = 0.43429448190325182765;
+constexpr float kLog10E = 0.43429448190325182765f;
 
 // log_e 2
-constexpr float klogE_2 = 0.69314718055994530942;
+constexpr float kLogE2 = 0.69314718055994530942f;
 
 // log_e 10
-constexpr float klogE_10 = 2.30258509299404568402;
+constexpr float kLogE10 = 2.30258509299404568402f;
 
 // pi
-constexpr float kPi = 3.14159265358979323846;
+constexpr float kPi = 3.14159265358979323846f;
 
 // pi*2
-constexpr float k2Pi = 6.28318530717958647693;
+constexpr float k2Pi = 6.28318530717958647693f;
 
 // pi/2
-constexpr float kPiOver2 = 1.57079632679489661923;
+constexpr float kPiOver2 = 1.57079632679489661923f;
 
 // pi/4
-constexpr float kPiOver4 = 0.78539816339744830962;
+constexpr float kPiOver4 = 0.78539816339744830962f;
 
 // 1/pi
-constexpr float k1OverPi = 0.31830988618379067154;
+constexpr float k1OverPi = 0.31830988618379067154f;
 
 // 2/pi
-constexpr float k2OverPi = 0.63661977236758134308;
+constexpr float k2OverPi = 0.63661977236758134308f;
 
 // 2/sqrt(pi)
-constexpr float k2OverSqrtPi = 1.12837916709551257390;
+constexpr float k2OverSqrtPi = 1.12837916709551257390f;
 
 // sqrt(2)
-constexpr float kSqrt2 = 1.41421356237309504880;
+constexpr float kSqrt2 = 1.41421356237309504880f;
 
 // 1/sqrt(2)
-constexpr float k1OverSqrt2 = 0.70710678118654752440;
+constexpr float k1OverSqrt2 = 0.70710678118654752440f;
 
 // phi
-constexpr float kPhi = 1.61803398874989484820;
+constexpr float kPhi = 1.61803398874989484820f;
 
 // 0.001
-constexpr float kEhCloseEnough = 1e-3;
+constexpr float kEhCloseEnough = 1e-3f;
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_GEOMETRY_CONSTANTS_H_
diff --git a/impeller/geometry/geometry_unittests.h b/impeller/geometry/geometry_asserts.h
similarity index 80%
rename from impeller/geometry/geometry_unittests.h
rename to impeller/geometry/geometry_asserts.h
index d2c63fc2fe24d6b390f064f73cd4818aef9e3c01..0d7e39768d0911615673802edab5941eb1a5202c 100644
--- a/impeller/geometry/geometry_unittests.h
+++ b/impeller/geometry/geometry_asserts.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_IMPELLER_GEOMETRY_GEOMETRY_ASSERTS_H_
+#define FLUTTER_IMPELLER_GEOMETRY_GEOMETRY_ASSERTS_H_
+
 #include <array>
 #include <iostream>
 
@@ -37,7 +40,8 @@ inline ::testing::AssertionResult MatrixNear(impeller::Matrix a,
                && NumberNear(a.m[15], b.m[15]);
 
   return equal ? ::testing::AssertionSuccess()
-               : ::testing::AssertionFailure() << "Matrixes are not equal.";
+               : ::testing::AssertionFailure()
+                     << "Matrixes are not equal " << a << " " << b;
 }
 
 inline ::testing::AssertionResult QuaternionNear(impeller::Quaternion a,
@@ -50,13 +54,14 @@ inline ::testing::AssertionResult QuaternionNear(impeller::Quaternion a,
 }
 
 inline ::testing::AssertionResult RectNear(impeller::Rect a, impeller::Rect b) {
-  auto equal = NumberNear(a.origin.x, b.origin.x) &&
-               NumberNear(a.origin.y, b.origin.y) &&
-               NumberNear(a.size.width, b.size.width) &&
-               NumberNear(a.size.height, b.size.height);
+  auto equal = NumberNear(a.GetLeft(), b.GetLeft()) &&
+               NumberNear(a.GetTop(), b.GetTop()) &&
+               NumberNear(a.GetRight(), b.GetRight()) &&
+               NumberNear(a.GetBottom(), b.GetBottom());
 
   return equal ? ::testing::AssertionSuccess()
-               : ::testing::AssertionFailure() << "Rects are not equal.";
+               : ::testing::AssertionFailure()
+                     << "Rects are not equal (" << a << " " << b << ")";
 }
 
 inline ::testing::AssertionResult ColorNear(impeller::Color a,
@@ -73,7 +78,8 @@ inline ::testing::AssertionResult PointNear(impeller::Point a,
   auto equal = NumberNear(a.x, b.x) && NumberNear(a.y, b.y);
 
   return equal ? ::testing::AssertionSuccess()
-               : ::testing::AssertionFailure() << "Points are not equal.";
+               : ::testing::AssertionFailure()
+                     << "Points are not equal (" << a << " " << b << ").";
 }
 
 inline ::testing::AssertionResult Vector3Near(impeller::Vector3 a,
@@ -158,3 +164,17 @@ inline ::testing::AssertionResult ColorsNear(std::vector<impeller::Color> a,
 #define ASSERT_ARRAY_4_NEAR(a, b) ASSERT_PRED2(&::Array4Near, a, b)
 #define ASSERT_COLOR_BUFFER_NEAR(a, b) ASSERT_PRED2(&::ColorBufferNear, a, b)
 #define ASSERT_COLORS_NEAR(a, b) ASSERT_PRED2(&::ColorsNear, a, b)
+
+#define EXPECT_MATRIX_NEAR(a, b) EXPECT_PRED2(&::MatrixNear, a, b)
+#define EXPECT_QUATERNION_NEAR(a, b) EXPECT_PRED2(&::QuaternionNear, a, b)
+#define EXPECT_RECT_NEAR(a, b) EXPECT_PRED2(&::RectNear, a, b)
+#define EXPECT_COLOR_NEAR(a, b) EXPECT_PRED2(&::ColorNear, a, b)
+#define EXPECT_POINT_NEAR(a, b) EXPECT_PRED2(&::PointNear, a, b)
+#define EXPECT_VECTOR3_NEAR(a, b) EXPECT_PRED2(&::Vector3Near, a, b)
+#define EXPECT_VECTOR4_NEAR(a, b) EXPECT_PRED2(&::Vector4Near, a, b)
+#define EXPECT_SIZE_NEAR(a, b) EXPECT_PRED2(&::SizeNear, a, b)
+#define EXPECT_ARRAY_4_NEAR(a, b) EXPECT_PRED2(&::Array4Near, a, b)
+#define EXPECT_COLOR_BUFFER_NEAR(a, b) EXPECT_PRED2(&::ColorBufferNear, a, b)
+#define EXPECT_COLORS_NEAR(a, b) EXPECT_PRED2(&::ColorsNear, a, b)
+
+#endif  // FLUTTER_IMPELLER_GEOMETRY_GEOMETRY_ASSERTS_H_
diff --git a/impeller/geometry/geometry_benchmarks.cc b/impeller/geometry/geometry_benchmarks.cc
index 06b514b46e61ca92a8893abb031502b5f60e66d0..98d17cf7d8c15173f8b55810adc0fb700dbbff47 100644
--- a/impeller/geometry/geometry_benchmarks.cc
+++ b/impeller/geometry/geometry_benchmarks.cc
@@ -4,18 +4,53 @@
 
 #include "flutter/benchmarking/benchmarking.h"
 
+#include "flutter/impeller/entity/solid_fill.vert.h"
+#include "flutter/impeller/entity/texture_fill.vert.h"
+
+#include "impeller/entity/geometry/stroke_path_geometry.h"
 #include "impeller/geometry/path.h"
 #include "impeller/geometry/path_builder.h"
 #include "impeller/tessellator/tessellator.h"
 
 namespace impeller {
 
+class ImpellerBenchmarkAccessor {
+ public:
+  static std::vector<SolidFillVertexShader::PerVertexData>
+  GenerateSolidStrokeVertices(const Path::Polyline& polyline,
+                              Scalar stroke_width,
+                              Scalar miter_limit,
+                              Join stroke_join,
+                              Cap stroke_cap,
+                              Scalar scale) {
+    return StrokePathGeometry::GenerateSolidStrokeVertices(
+        polyline, stroke_width, miter_limit, stroke_join, stroke_cap, scale);
+  }
+
+  static std::vector<TextureFillVertexShader::PerVertexData>
+  GenerateSolidStrokeVerticesUV(const Path::Polyline& polyline,
+                                Scalar stroke_width,
+                                Scalar miter_limit,
+                                Join stroke_join,
+                                Cap stroke_cap,
+                                Scalar scale,
+                                Point texture_origin,
+                                Size texture_size,
+                                const Matrix& effect_transform) {
+    return StrokePathGeometry::GenerateSolidStrokeVerticesUV(
+        polyline, stroke_width, miter_limit, stroke_join, stroke_cap, scale,
+        texture_origin, texture_size, effect_transform);
+  }
+};
+
 namespace {
 /// A path with many connected cubic components, including
 /// overlaps/self-intersections/multi-contour.
-Path CreateCubic();
+Path CreateCubic(bool closed);
 /// Similar to the path above, but with all cubics replaced by quadratics.
-Path CreateQuadratic();
+Path CreateQuadratic(bool closed);
+/// Create a rounded rect.
+Path CreateRRect();
 }  // namespace
 
 static Tessellator tess;
@@ -28,29 +63,164 @@ static void BM_Polyline(benchmark::State& state, Args&&... args) {
 
   size_t point_count = 0u;
   size_t single_point_count = 0u;
+  auto points = std::make_unique<std::vector<Point>>();
+  points->reserve(2048);
   while (state.KeepRunning()) {
-    auto polyline = path.CreatePolyline();
-    single_point_count = polyline.points.size();
-    point_count += single_point_count;
     if (tessellate) {
-      tess.Tessellate(
-          FillType::kNonZero, polyline,
-          [](const float* vertices, size_t vertices_size,
-             const uint16_t* indices, size_t indices_size) { return true; });
+      tess.Tessellate(path, 1.0f,
+                      [&point_count, &single_point_count](
+                          const float* vertices, size_t vertices_count,
+                          const uint16_t* indices, size_t indices_count) {
+                        if (indices_count > 0) {
+                          single_point_count = indices_count;
+                          point_count += indices_count;
+                        } else {
+                          single_point_count = vertices_count;
+                          point_count += vertices_count;
+                        }
+                        return true;
+                      });
+    } else {
+      auto polyline = path.CreatePolyline(
+          // Clang-tidy doesn't know that the points get moved back before
+          // getting moved again in this loop.
+          // NOLINTNEXTLINE(clang-analyzer-cplusplus.Move)
+          1.0f, std::move(points),
+          [&points](Path::Polyline::PointBufferPtr reclaimed) {
+            points = std::move(reclaimed);
+          });
+      single_point_count = polyline.points->size();
+      point_count += single_point_count;
+    }
+  }
+  state.counters["SinglePointCount"] = single_point_count;
+  state.counters["TotalPointCount"] = point_count;
+}
+
+enum class UVMode {
+  kNoUV,
+  kUVRect,
+  kUVRectTx,
+};
+
+template <class... Args>
+static void BM_StrokePolyline(benchmark::State& state, Args&&... args) {
+  auto args_tuple = std::make_tuple(std::move(args)...);
+  auto path = std::get<Path>(args_tuple);
+  auto cap = std::get<Cap>(args_tuple);
+  auto join = std::get<Join>(args_tuple);
+  auto generate_uv = std::get<UVMode>(args_tuple);
+
+  const Scalar stroke_width = 5.0f;
+  const Scalar miter_limit = 10.0f;
+  const Scalar scale = 1.0f;
+  const Point texture_origin = Point(0, 0);
+  const Size texture_size = Size(100, 100);
+  const Matrix effect_transform = (generate_uv == UVMode::kUVRectTx)
+                                      ? Matrix::MakeScale({2.0f, 2.0f, 1.0f})
+                                      : Matrix();
+
+  auto points = std::make_unique<std::vector<Point>>();
+  points->reserve(2048);
+  auto polyline =
+      path.CreatePolyline(1.0f, std::move(points),
+                          [&points](Path::Polyline::PointBufferPtr reclaimed) {
+                            points = std::move(reclaimed);
+                          });
+
+  size_t point_count = 0u;
+  size_t single_point_count = 0u;
+  while (state.KeepRunning()) {
+    if (generate_uv == UVMode::kNoUV) {
+      auto vertices = ImpellerBenchmarkAccessor::GenerateSolidStrokeVertices(
+          polyline, stroke_width, miter_limit, join, cap, scale);
+      single_point_count = vertices.size();
+    } else {
+      auto vertices = ImpellerBenchmarkAccessor::GenerateSolidStrokeVerticesUV(
+          polyline, stroke_width, miter_limit, join, cap, scale,  //
+          texture_origin, texture_size, effect_transform);
+      single_point_count = vertices.size();
     }
+    point_count += single_point_count;
   }
   state.counters["SinglePointCount"] = single_point_count;
   state.counters["TotalPointCount"] = point_count;
 }
 
-BENCHMARK_CAPTURE(BM_Polyline, cubic_polyline, CreateCubic(), false);
-BENCHMARK_CAPTURE(BM_Polyline, cubic_polyline_tess, CreateCubic(), true);
-BENCHMARK_CAPTURE(BM_Polyline, quad_polyline, CreateQuadratic(), false);
-BENCHMARK_CAPTURE(BM_Polyline, quad_polyline_tess, CreateQuadratic(), true);
+template <class... Args>
+static void BM_Convex(benchmark::State& state, Args&&... args) {
+  auto args_tuple = std::make_tuple(std::move(args)...);
+  auto path = std::get<Path>(args_tuple);
+
+  size_t point_count = 0u;
+  size_t single_point_count = 0u;
+  auto points = std::make_unique<std::vector<Point>>();
+  points->reserve(2048);
+  while (state.KeepRunning()) {
+    auto points = tess.TessellateConvex(path, 1.0f);
+    single_point_count = points.size();
+    point_count += points.size();
+  }
+  state.counters["SinglePointCount"] = single_point_count;
+  state.counters["TotalPointCount"] = point_count;
+}
+
+#define MAKE_STROKE_BENCHMARK_CAPTURE(path, cap, join, closed, uvname, uvtype) \
+  BENCHMARK_CAPTURE(BM_StrokePolyline, stroke_##path##_##cap##_##join##uvname, \
+                    Create##path(closed), Cap::k##cap, Join::k##join, uvtype)
+
+#define MAKE_STROKE_BENCHMARK_CAPTURE_CAPS_JOINS(path, uvname, uvtype)       \
+  MAKE_STROKE_BENCHMARK_CAPTURE(path, Butt, Bevel, false, uvname, uvtype);   \
+  MAKE_STROKE_BENCHMARK_CAPTURE(path, Butt, Miter, false, uvname, uvtype);   \
+  MAKE_STROKE_BENCHMARK_CAPTURE(path, Butt, Round, false, uvname, uvtype);   \
+  MAKE_STROKE_BENCHMARK_CAPTURE(path, Square, Bevel, false, uvname, uvtype); \
+  MAKE_STROKE_BENCHMARK_CAPTURE(path, Round, Bevel, false, uvname, uvtype)
+
+#define MAKE_STROKE_BENCHMARK_CAPTURE_UVS(path)                           \
+  MAKE_STROKE_BENCHMARK_CAPTURE_CAPS_JOINS(path, , UVMode::kNoUV);        \
+  MAKE_STROKE_BENCHMARK_CAPTURE_CAPS_JOINS(path, _uv, UVMode::kUVRectTx); \
+  MAKE_STROKE_BENCHMARK_CAPTURE_CAPS_JOINS(path, _uvNoTx, UVMode::kUVRect)
+
+BENCHMARK_CAPTURE(BM_Polyline, cubic_polyline, CreateCubic(true), false);
+BENCHMARK_CAPTURE(BM_Polyline, cubic_polyline_tess, CreateCubic(true), true);
+BENCHMARK_CAPTURE(BM_Polyline,
+                  unclosed_cubic_polyline,
+                  CreateCubic(false),
+                  false);
+BENCHMARK_CAPTURE(BM_Polyline,
+                  unclosed_cubic_polyline_tess,
+                  CreateCubic(false),
+                  true);
+MAKE_STROKE_BENCHMARK_CAPTURE_UVS(Cubic);
+
+BENCHMARK_CAPTURE(BM_Polyline, quad_polyline, CreateQuadratic(true), false);
+BENCHMARK_CAPTURE(BM_Polyline, quad_polyline_tess, CreateQuadratic(true), true);
+BENCHMARK_CAPTURE(BM_Polyline,
+                  unclosed_quad_polyline,
+                  CreateQuadratic(false),
+                  false);
+BENCHMARK_CAPTURE(BM_Polyline,
+                  unclosed_quad_polyline_tess,
+                  CreateQuadratic(false),
+                  true);
+MAKE_STROKE_BENCHMARK_CAPTURE_UVS(Quadratic);
+
+BENCHMARK_CAPTURE(BM_Convex, rrect_convex, CreateRRect(), true);
+MAKE_STROKE_BENCHMARK_CAPTURE(RRect, Butt, Bevel, , , UVMode::kNoUV);
+MAKE_STROKE_BENCHMARK_CAPTURE(RRect, Butt, Bevel, , _uv, UVMode::kUVRectTx);
+MAKE_STROKE_BENCHMARK_CAPTURE(RRect, Butt, Bevel, , _uvNoTx, UVMode::kUVRect);
 
 namespace {
-Path CreateCubic() {
+
+Path CreateRRect() {
   return PathBuilder{}
+      .AddRoundedRect(Rect::MakeLTRB(0, 0, 400, 400), 16)
+      .TakePath();
+}
+
+Path CreateCubic(bool closed) {
+  auto builder = PathBuilder{};
+  builder  //
       .MoveTo({359.934, 96.6335})
       .CubicCurveTo({358.189, 96.7055}, {356.436, 96.7908}, {354.673, 96.8895})
       .CubicCurveTo({354.571, 96.8953}, {354.469, 96.9016}, {354.367, 96.9075})
@@ -118,12 +288,18 @@ Path CreateCubic() {
       .LineTo({360, 119.256})
       .LineTo({360, 106.332})
       .LineTo({360, 96.6307})
-      .CubicCurveTo({359.978, 96.6317}, {359.956, 96.6326}, {359.934, 96.6335})
-      .Close()
+      .CubicCurveTo({359.978, 96.6317}, {359.956, 96.6326}, {359.934, 96.6335});
+  if (closed) {
+    builder.Close();
+  }
+  builder  //
       .MoveTo({337.336, 124.143})
       .CubicCurveTo({337.274, 122.359}, {338.903, 121.511}, {338.903, 121.511})
-      .CubicCurveTo({338.903, 121.511}, {338.96, 123.303}, {337.336, 124.143})
-      .Close()
+      .CubicCurveTo({338.903, 121.511}, {338.96, 123.303}, {337.336, 124.143});
+  if (closed) {
+    builder.Close();
+  }
+  builder  //
       .MoveTo({340.082, 121.849})
       .CubicCurveTo({340.074, 121.917}, {340.062, 121.992}, {340.046, 122.075})
       .CubicCurveTo({340.039, 122.109}, {340.031, 122.142}, {340.023, 122.177})
@@ -148,8 +324,11 @@ Path CreateCubic() {
       .CubicCurveTo({339.256, 122.215}, {339.339, 122.12}, {339.425, 122.037})
       .CubicCurveTo({339.428, 122.033}, {339.431, 122.03}, {339.435, 122.027})
       .CubicCurveTo({339.785, 121.687}, {340.106, 121.511}, {340.106, 121.511})
-      .CubicCurveTo({340.106, 121.511}, {340.107, 121.645}, {340.082, 121.849})
-      .Close()
+      .CubicCurveTo({340.106, 121.511}, {340.107, 121.645}, {340.082, 121.849});
+  if (closed) {
+    builder.Close();
+  }
+  builder  //
       .MoveTo({340.678, 113.245})
       .CubicCurveTo({340.594, 113.488}, {340.356, 113.655}, {340.135, 113.775})
       .CubicCurveTo({339.817, 113.948}, {339.465, 114.059}, {339.115, 114.151})
@@ -168,21 +347,30 @@ Path CreateCubic() {
       .CubicCurveTo({339.574, 110.984}, {337.942, 112.708}, {336.753, 113.784})
       .CubicCurveTo({336.768, 113.8}, {336.782, 113.816}, {336.796, 113.833})
       .CubicCurveTo({338.104, 112.946}, {340.187, 111.755}, {340.65, 112.813})
-      .CubicCurveTo({340.71, 112.95}, {340.728, 113.102}, {340.678, 113.245})
-      .Close()
+      .CubicCurveTo({340.71, 112.95}, {340.728, 113.102}, {340.678, 113.245});
+  if (closed) {
+    builder.Close();
+  }
+  builder  //
       .MoveTo({346.357, 106.771})
       .CubicCurveTo({346.295, 104.987}, {347.924, 104.139}, {347.924, 104.139})
-      .CubicCurveTo({347.924, 104.139}, {347.982, 105.931}, {346.357, 106.771})
-      .Close()
+      .CubicCurveTo({347.924, 104.139}, {347.982, 105.931}, {346.357, 106.771});
+  if (closed) {
+    builder.Close();
+  }
+  builder  //
       .MoveTo({347.56, 106.771})
       .CubicCurveTo({347.498, 104.987}, {349.127, 104.139}, {349.127, 104.139})
-      .CubicCurveTo({349.127, 104.139}, {349.185, 105.931}, {347.56, 106.771})
-      .Close()
-      .TakePath();
+      .CubicCurveTo({349.127, 104.139}, {349.185, 105.931}, {347.56, 106.771});
+  if (closed) {
+    builder.Close();
+  }
+  return builder.TakePath();
 }
 
-Path CreateQuadratic() {
-  return PathBuilder{}
+Path CreateQuadratic(bool closed) {
+  auto builder = PathBuilder{};
+  builder  //
       .MoveTo({359.934, 96.6335})
       .QuadraticCurveTo({358.189, 96.7055}, {354.673, 96.8895})
       .QuadraticCurveTo({354.571, 96.8953}, {354.367, 96.9075})
@@ -250,12 +438,18 @@ Path CreateQuadratic() {
       .LineTo({360, 119.256})
       .LineTo({360, 106.332})
       .LineTo({360, 96.6307})
-      .QuadraticCurveTo({359.978, 96.6317}, {359.934, 96.6335})
-      .Close()
+      .QuadraticCurveTo({359.978, 96.6317}, {359.934, 96.6335});
+  if (closed) {
+    builder.Close();
+  }
+  builder  //
       .MoveTo({337.336, 124.143})
       .QuadraticCurveTo({337.274, 122.359}, {338.903, 121.511})
-      .QuadraticCurveTo({338.903, 121.511}, {337.336, 124.143})
-      .Close()
+      .QuadraticCurveTo({338.903, 121.511}, {337.336, 124.143});
+  if (closed) {
+    builder.Close();
+  }
+  builder  //
       .MoveTo({340.082, 121.849})
       .QuadraticCurveTo({340.074, 121.917}, {340.046, 122.075})
       .QuadraticCurveTo({340.039, 122.109}, {340.023, 122.177})
@@ -279,8 +473,11 @@ Path CreateQuadratic() {
       .QuadraticCurveTo({339.256, 122.215}, {339.425, 122.037})
       .QuadraticCurveTo({339.428, 122.033}, {339.435, 122.027})
       .QuadraticCurveTo({339.785, 121.687}, {340.106, 121.511})
-      .QuadraticCurveTo({340.106, 121.511}, {340.082, 121.849})
-      .Close()
+      .QuadraticCurveTo({340.106, 121.511}, {340.082, 121.849});
+  if (closed) {
+    builder.Close();
+  }
+  builder  //
       .MoveTo({340.678, 113.245})
       .QuadraticCurveTo({340.594, 113.488}, {340.135, 113.775})
       .QuadraticCurveTo({339.817, 113.948}, {339.115, 114.151})
@@ -299,17 +496,25 @@ Path CreateQuadratic() {
       .QuadraticCurveTo({339.574, 110.984}, {336.753, 113.784})
       .QuadraticCurveTo({336.768, 113.8}, {336.796, 113.833})
       .QuadraticCurveTo({338.104, 112.946}, {340.65, 112.813})
-      .QuadraticCurveTo({340.71, 112.95}, {340.678, 113.245})
-      .Close()
+      .QuadraticCurveTo({340.71, 112.95}, {340.678, 113.245});
+  if (closed) {
+    builder.Close();
+  }
+  builder  //
       .MoveTo({346.357, 106.771})
       .QuadraticCurveTo({346.295, 104.987}, {347.924, 104.139})
-      .QuadraticCurveTo({347.924, 104.139}, {346.357, 106.771})
-      .Close()
+      .QuadraticCurveTo({347.924, 104.139}, {346.357, 106.771});
+  if (closed) {
+    builder.Close();
+  }
+  builder  //
       .MoveTo({347.56, 106.771})
       .QuadraticCurveTo({347.498, 104.987}, {349.127, 104.139})
-      .QuadraticCurveTo({349.127, 104.139}, {347.56, 106.771})
-      .Close()
-      .TakePath();
+      .QuadraticCurveTo({349.127, 104.139}, {347.56, 106.771});
+  if (closed) {
+    builder.Close();
+  }
+  return builder.TakePath();
 }
 
 }  // namespace
diff --git a/impeller/geometry/geometry_unittests.cc b/impeller/geometry/geometry_unittests.cc
index 9b6706ba9a763b0d690e39184b74aa9744e94a09..aa1e5910b77eb7fdd9271c12678f3d39278c042f 100644
--- a/impeller/geometry/geometry_unittests.cc
+++ b/impeller/geometry/geometry_unittests.cc
@@ -2,22 +2,26 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/geometry/geometry_unittests.h"
+#include "gtest/gtest.h"
+#include "impeller/geometry/geometry_asserts.h"
 
 #include <limits>
 #include <sstream>
+#include <type_traits>
 
+#include "flutter/fml/build_config.h"
 #include "flutter/testing/testing.h"
+#include "impeller/geometry/color.h"
 #include "impeller/geometry/constants.h"
 #include "impeller/geometry/gradient.h"
-#include "impeller/geometry/path.h"
-#include "impeller/geometry/path_builder.h"
-#include "impeller/geometry/path_component.h"
+#include "impeller/geometry/half.h"
 #include "impeller/geometry/point.h"
 #include "impeller/geometry/rect.h"
 #include "impeller/geometry/scalar.h"
 #include "impeller/geometry/size.h"
-#include "path_component.h"
+
+// TODO(zanderso): https://github.com/flutter/flutter/issues/127701
+// NOLINTBEGIN(bugprone-unchecked-optional-access)
 
 namespace impeller {
 namespace testing {
@@ -240,7 +244,7 @@ TEST(GeometryTest, MatrixVectorMultiplication) {
     auto vector = Vector3(3, 3, -3);
 
     Vector3 result = matrix * vector;
-    auto expected = Vector3(1, 1, 0.673401);
+    auto expected = Vector3(-1, -1, 1.3468);
     ASSERT_VECTOR3_NEAR(result, expected);
   }
 
@@ -250,7 +254,7 @@ TEST(GeometryTest, MatrixVectorMultiplication) {
     auto point = Point(3, 3);
 
     Point result = matrix * point;
-    auto expected = Point(1, 1);
+    auto expected = Point(-1, -1);
     ASSERT_POINT_NEAR(result, expected);
   }
 
@@ -265,6 +269,26 @@ TEST(GeometryTest, MatrixVectorMultiplication) {
   }
 }
 
+TEST(GeometryTest, MatrixMakeRotationFromQuaternion) {
+  {
+    auto matrix = Matrix::MakeRotation(Quaternion({1, 0, 0}, kPiOver2));
+    auto expected = Matrix::MakeRotationX(Radians(kPiOver2));
+    ASSERT_MATRIX_NEAR(matrix, expected);
+  }
+
+  {
+    auto matrix = Matrix::MakeRotation(Quaternion({0, 1, 0}, kPiOver2));
+    auto expected = Matrix::MakeRotationY(Radians(kPiOver2));
+    ASSERT_MATRIX_NEAR(matrix, expected);
+  }
+
+  {
+    auto matrix = Matrix::MakeRotation(Quaternion({0, 0, 1}, kPiOver2));
+    auto expected = Matrix::MakeRotationZ(Radians(kPiOver2));
+    ASSERT_MATRIX_NEAR(matrix, expected);
+  }
+}
+
 TEST(GeometryTest, MatrixTransformDirection) {
   {
     auto matrix = Matrix::MakeTranslation({100, 100, 100}) *
@@ -315,13 +339,40 @@ TEST(GeometryTest, MatrixGetMaxBasisLength) {
   }
 }
 
+TEST(GeometryTest, MatrixGetMaxBasisLengthXY) {
+  {
+    auto m = Matrix::MakeScale({3, 1, 1});
+    ASSERT_EQ(m.GetMaxBasisLengthXY(), 3);
+
+    m = m * Matrix::MakeSkew(0, 4);
+    ASSERT_EQ(m.GetMaxBasisLengthXY(), 5);
+  }
+
+  {
+    auto m = Matrix::MakeScale({-3, 4, 7});
+    ASSERT_EQ(m.GetMaxBasisLengthXY(), 4);
+  }
+
+  {
+    // clang-format off
+    auto m = Matrix::MakeColumn(
+        1.0f, 0.0f, 0.0f, 0.0f,
+        0.0f, 1.0f, 0.0f, 0.0f,
+        4.0f, 0.0f, 1.0f, 0.0f,
+        0.0f, 0.0f, 0.0f, 1.0f
+    );
+    // clang-format on
+    ASSERT_EQ(m.GetMaxBasisLengthXY(), 1.0f);
+  }
+}
+
 TEST(GeometryTest, MatrixMakeOrthographic) {
   {
     auto m = Matrix::MakeOrthographic(Size(100, 200));
     auto expect = Matrix{
         0.02, 0,     0,   0,  //
         0,    -0.01, 0,   0,  //
-        0,    0,     1,   0,  //
+        0,    0,     0,   0,  //
         -1,   1,     0.5, 1,  //
     };
     ASSERT_MATRIX_NEAR(m, expect);
@@ -332,7 +383,7 @@ TEST(GeometryTest, MatrixMakeOrthographic) {
     auto expect = Matrix{
         0.005, 0,     0,   0,  //
         0,     -0.02, 0,   0,  //
-        0,     0,     1,   0,  //
+        0,     0,     0,   0,  //
         -1,    1,     0.5, 1,  //
     };
     ASSERT_MATRIX_NEAR(m, expect);
@@ -343,10 +394,10 @@ TEST(GeometryTest, MatrixMakePerspective) {
   {
     auto m = Matrix::MakePerspective(Degrees(60), Size(100, 200), 1, 10);
     auto expect = Matrix{
-        3.4641, 0,       0,        0,   //
-        0,      1.73205, 0,        0,   //
-        0,      0,       -1.11111, -1,  //
-        0,      0,       -1.11111, 0,   //
+        3.4641, 0,       0,        0,  //
+        0,      1.73205, 0,        0,  //
+        0,      0,       1.11111,  1,  //
+        0,      0,       -1.11111, 0,  //
     };
     ASSERT_MATRIX_NEAR(m, expect);
   }
@@ -354,10 +405,10 @@ TEST(GeometryTest, MatrixMakePerspective) {
   {
     auto m = Matrix::MakePerspective(Radians(1), 2, 10, 20);
     auto expect = Matrix{
-        0.915244, 0,       0,   0,   //
-        0,        1.83049, 0,   0,   //
-        0,        0,       -2,  -1,  //
-        0,        0,       -20, 0,   //
+        0.915244, 0,       0,   0,  //
+        0,        1.83049, 0,   0,  //
+        0,        0,       2,   1,  //
+        0,        0,       -20, 0,  //
     };
     ASSERT_MATRIX_NEAR(m, expect);
   }
@@ -549,94 +600,6 @@ TEST(GeometryTest, QuaternionVectorMultiply) {
   }
 }
 
-TEST(GeometryTest, EmptyPath) {
-  auto path = PathBuilder{}.TakePath();
-  ASSERT_EQ(path.GetComponentCount(), 1u);
-
-  ContourComponent c;
-  path.GetContourComponentAtIndex(0, c);
-  ASSERT_POINT_NEAR(c.destination, Point());
-
-  Path::Polyline polyline = path.CreatePolyline();
-  ASSERT_TRUE(polyline.points.empty());
-  ASSERT_TRUE(polyline.contours.empty());
-}
-
-TEST(GeometryTest, SimplePath) {
-  Path path;
-
-  path.AddLinearComponent({0, 0}, {100, 100})
-      .AddQuadraticComponent({100, 100}, {200, 200}, {300, 300})
-      .AddCubicComponent({300, 300}, {400, 400}, {500, 500}, {600, 600});
-
-  ASSERT_EQ(path.GetComponentCount(), 4u);
-
-  path.EnumerateComponents(
-      [](size_t index, const LinearPathComponent& linear) {
-        Point p1(0, 0);
-        Point p2(100, 100);
-        ASSERT_EQ(index, 1u);
-        ASSERT_EQ(linear.p1, p1);
-        ASSERT_EQ(linear.p2, p2);
-      },
-      [](size_t index, const QuadraticPathComponent& quad) {
-        Point p1(100, 100);
-        Point cp(200, 200);
-        Point p2(300, 300);
-        ASSERT_EQ(index, 2u);
-        ASSERT_EQ(quad.p1, p1);
-        ASSERT_EQ(quad.cp, cp);
-        ASSERT_EQ(quad.p2, p2);
-      },
-      [](size_t index, const CubicPathComponent& cubic) {
-        Point p1(300, 300);
-        Point cp1(400, 400);
-        Point cp2(500, 500);
-        Point p2(600, 600);
-        ASSERT_EQ(index, 3u);
-        ASSERT_EQ(cubic.p1, p1);
-        ASSERT_EQ(cubic.cp1, cp1);
-        ASSERT_EQ(cubic.cp2, cp2);
-        ASSERT_EQ(cubic.p2, p2);
-      },
-      [](size_t index, const ContourComponent& contour) {
-        Point p1(0, 0);
-        ASSERT_EQ(index, 0u);
-        ASSERT_EQ(contour.destination, p1);
-        ASSERT_FALSE(contour.is_closed);
-      });
-}
-
-TEST(GeometryTest, BoundingBoxCubic) {
-  Path path;
-  path.AddCubicComponent({120, 160}, {25, 200}, {220, 260}, {220, 40});
-  auto box = path.GetBoundingBox();
-  Rect expected(93.9101, 40, 126.09, 158.862);
-  ASSERT_TRUE(box.has_value());
-  ASSERT_RECT_NEAR(box.value(), expected);
-}
-
-TEST(GeometryTest, BoundingBoxOfCompositePathIsCorrect) {
-  PathBuilder builder;
-  builder.AddRoundedRect({{10, 10}, {300, 300}}, {50, 50, 50, 50});
-  auto path = builder.TakePath();
-  auto actual = path.GetBoundingBox();
-  Rect expected(10, 10, 300, 300);
-  ASSERT_TRUE(actual.has_value());
-  ASSERT_RECT_NEAR(actual.value(), expected);
-}
-
-TEST(GeometryTest, PathGetBoundingBoxForCubicWithNoDerivativeRootsIsCorrect) {
-  PathBuilder builder;
-  // Straight diagonal line.
-  builder.AddCubicCurve({0, 1}, {2, 3}, {4, 5}, {6, 7});
-  auto path = builder.TakePath();
-  auto actual = path.GetBoundingBox();
-  auto expected = Rect::MakeLTRB(0, 1, 6, 7);
-  ASSERT_TRUE(actual.has_value());
-  ASSERT_RECT_NEAR(actual.value(), expected);
-}
-
 TEST(GeometryTest, CanGenerateMipCounts) {
   ASSERT_EQ((Size{128, 128}.MipCount()), 7u);
   ASSERT_EQ((Size{128, 256}.MipCount()), 8u);
@@ -671,15 +634,6 @@ TEST(GeometryTest, CanConvertTTypesExplicitly) {
     ASSERT_EQ(p1.x, 1u);
     ASSERT_EQ(p1.y, 2u);
   }
-
-  {
-    Rect r1(1.0, 2.0, 3.0, 4.0);
-    IRect r2 = static_cast<IRect>(r1);
-    ASSERT_EQ(r2.origin.x, 1u);
-    ASSERT_EQ(r2.origin.y, 2u);
-    ASSERT_EQ(r2.size.width, 3u);
-    ASSERT_EQ(r2.size.height, 4u);
-  }
 }
 
 TEST(GeometryTest, CanPerformAlgebraicPointOps) {
@@ -1040,6 +994,111 @@ TEST(GeometryTest, PointAngleTo) {
   }
 }
 
+TEST(GeometryTest, PointMin) {
+  Point p(1, 2);
+  Point result = p.Min({0, 10});
+  Point expected(0, 2);
+  ASSERT_POINT_NEAR(result, expected);
+}
+
+TEST(GeometryTest, Vector3Min) {
+  Vector3 p(1, 2, 3);
+  Vector3 result = p.Min({0, 10, 2});
+  Vector3 expected(0, 2, 2);
+  ASSERT_VECTOR3_NEAR(result, expected);
+}
+
+TEST(GeometryTest, Vector4Min) {
+  Vector4 p(1, 2, 3, 4);
+  Vector4 result = p.Min({0, 10, 2, 1});
+  Vector4 expected(0, 2, 2, 1);
+  ASSERT_VECTOR4_NEAR(result, expected);
+}
+
+TEST(GeometryTest, PointMax) {
+  Point p(1, 2);
+  Point result = p.Max({0, 10});
+  Point expected(1, 10);
+  ASSERT_POINT_NEAR(result, expected);
+}
+
+TEST(GeometryTest, Vector3Max) {
+  Vector3 p(1, 2, 3);
+  Vector3 result = p.Max({0, 10, 2});
+  Vector3 expected(1, 10, 3);
+  ASSERT_VECTOR3_NEAR(result, expected);
+}
+
+TEST(GeometryTest, Vector4Max) {
+  Vector4 p(1, 2, 3, 4);
+  Vector4 result = p.Max({0, 10, 2, 1});
+  Vector4 expected(1, 10, 3, 4);
+  ASSERT_VECTOR4_NEAR(result, expected);
+}
+
+TEST(GeometryTest, PointFloor) {
+  Point p(1.5, 2.3);
+  Point result = p.Floor();
+  Point expected(1, 2);
+  ASSERT_POINT_NEAR(result, expected);
+}
+
+TEST(GeometryTest, Vector3Floor) {
+  Vector3 p(1.5, 2.3, 3.9);
+  Vector3 result = p.Floor();
+  Vector3 expected(1, 2, 3);
+  ASSERT_VECTOR3_NEAR(result, expected);
+}
+
+TEST(GeometryTest, Vector4Floor) {
+  Vector4 p(1.5, 2.3, 3.9, 4.0);
+  Vector4 result = p.Floor();
+  Vector4 expected(1, 2, 3, 4);
+  ASSERT_VECTOR4_NEAR(result, expected);
+}
+
+TEST(GeometryTest, PointCeil) {
+  Point p(1.5, 2.3);
+  Point result = p.Ceil();
+  Point expected(2, 3);
+  ASSERT_POINT_NEAR(result, expected);
+}
+
+TEST(GeometryTest, Vector3Ceil) {
+  Vector3 p(1.5, 2.3, 3.9);
+  Vector3 result = p.Ceil();
+  Vector3 expected(2, 3, 4);
+  ASSERT_VECTOR3_NEAR(result, expected);
+}
+
+TEST(GeometryTest, Vector4Ceil) {
+  Vector4 p(1.5, 2.3, 3.9, 4.0);
+  Vector4 result = p.Ceil();
+  Vector4 expected(2, 3, 4, 4);
+  ASSERT_VECTOR4_NEAR(result, expected);
+}
+
+TEST(GeometryTest, PointRound) {
+  Point p(1.5, 2.3);
+  Point result = p.Round();
+  Point expected(2, 2);
+  ASSERT_POINT_NEAR(result, expected);
+}
+
+TEST(GeometryTest, Vector3Round) {
+  Vector3 p(1.5, 2.3, 3.9);
+  Vector3 result = p.Round();
+  Vector3 expected(2, 2, 4);
+  ASSERT_VECTOR3_NEAR(result, expected);
+}
+
+TEST(GeometryTest, Vector4Round) {
+  Vector4 p(1.5, 2.3, 3.9, 4.0);
+  Vector4 result = p.Round();
+  Vector4 expected(2, 2, 4, 4);
+  ASSERT_VECTOR4_NEAR(result, expected);
+}
+
 TEST(GeometryTest, PointLerp) {
   Point p(1, 2);
   Point result = p.Lerp({5, 10}, 0.75);
@@ -1147,37 +1206,69 @@ TEST(GeometryTest, CanPerformAlgebraicVector3Ops) {
 
 TEST(GeometryTest, CanPerformAlgebraicVector3OpsWithArithmeticTypes) {
   // LHS
+  {
+    Vector3 p1(1, 2, 3);
+    Vector3 p2 = p1 + 2.0f;
+    ASSERT_EQ(p2.x, 3);
+    ASSERT_EQ(p2.y, 4);
+    ASSERT_EQ(p2.z, 5);
+  }
+
+  {
+    Vector3 p1(1, 2, 3);
+    Vector3 p2 = p1 - 2.0f;
+    ASSERT_EQ(p2.x, -1);
+    ASSERT_EQ(p2.y, 0);
+    ASSERT_EQ(p2.z, 1);
+  }
+
   {
     Vector3 p1(1, 2, 3);
     Vector3 p2 = p1 * 2.0f;
-    ASSERT_EQ(p2.x, 2u);
-    ASSERT_EQ(p2.y, 4u);
-    ASSERT_EQ(p2.z, 6u);
+    ASSERT_EQ(p2.x, 2);
+    ASSERT_EQ(p2.y, 4);
+    ASSERT_EQ(p2.z, 6);
   }
 
   {
     Vector3 p1(2, 6, 12);
     Vector3 p2 = p1 / 2.0f;
-    ASSERT_EQ(p2.x, 1u);
-    ASSERT_EQ(p2.y, 3u);
-    ASSERT_EQ(p2.z, 6u);
+    ASSERT_EQ(p2.x, 1);
+    ASSERT_EQ(p2.y, 3);
+    ASSERT_EQ(p2.z, 6);
   }
 
   // RHS
+  {
+    Vector3 p1(1, 2, 3);
+    Vector3 p2 = 2.0f + p1;
+    ASSERT_EQ(p2.x, 3);
+    ASSERT_EQ(p2.y, 4);
+    ASSERT_EQ(p2.z, 5);
+  }
+
+  {
+    Vector3 p1(1, 2, 3);
+    Vector3 p2 = 2.0f - p1;
+    ASSERT_EQ(p2.x, 1);
+    ASSERT_EQ(p2.y, 0);
+    ASSERT_EQ(p2.z, -1);
+  }
+
   {
     Vector3 p1(1, 2, 3);
     Vector3 p2 = 2.0f * p1;
-    ASSERT_EQ(p2.x, 2u);
-    ASSERT_EQ(p2.y, 4u);
-    ASSERT_EQ(p2.z, 6u);
+    ASSERT_EQ(p2.x, 2);
+    ASSERT_EQ(p2.y, 4);
+    ASSERT_EQ(p2.z, 6);
   }
 
   {
     Vector3 p1(2, 6, 12);
     Vector3 p2 = 12.0f / p1;
-    ASSERT_EQ(p2.x, 6u);
-    ASSERT_EQ(p2.y, 2u);
-    ASSERT_EQ(p2.z, 1u);
+    ASSERT_EQ(p2.x, 6);
+    ASSERT_EQ(p2.y, 2);
+    ASSERT_EQ(p2.z, 1);
   }
 }
 
@@ -1229,449 +1320,301 @@ TEST(GeometryTest, ColorLerp) {
     Color a(0.0, 0.0, 0.0, 0.0);
     Color b(1.0, 1.0, 1.0, 1.0);
 
-    ASSERT_COLOR_NEAR(Color::lerp(a, b, 0.5), Color(0.5, 0.5, 0.5, 0.5));
-    ASSERT_COLOR_NEAR(Color::lerp(a, b, 0.0), a);
-    ASSERT_COLOR_NEAR(Color::lerp(a, b, 1.0), b);
-    ASSERT_COLOR_NEAR(Color::lerp(a, b, 0.2), Color(0.2, 0.2, 0.2, 0.2));
+    ASSERT_COLOR_NEAR(Color::Lerp(a, b, 0.5), Color(0.5, 0.5, 0.5, 0.5));
+    ASSERT_COLOR_NEAR(Color::Lerp(a, b, 0.0), a);
+    ASSERT_COLOR_NEAR(Color::Lerp(a, b, 1.0), b);
+    ASSERT_COLOR_NEAR(Color::Lerp(a, b, 0.2), Color(0.2, 0.2, 0.2, 0.2));
   }
 
   {
     Color a(0.2, 0.4, 1.0, 0.5);
     Color b(0.4, 1.0, 0.2, 0.3);
 
-    ASSERT_COLOR_NEAR(Color::lerp(a, b, 0.5), Color(0.3, 0.7, 0.6, 0.4));
-    ASSERT_COLOR_NEAR(Color::lerp(a, b, 0.0), a);
-    ASSERT_COLOR_NEAR(Color::lerp(a, b, 1.0), b);
-    ASSERT_COLOR_NEAR(Color::lerp(a, b, 0.2), Color(0.24, 0.52, 0.84, 0.46));
-  }
-}
-
-TEST(GeometryTest, ColorMakeRGBA8) {
-  {
-    Color a = Color::MakeRGBA8(0, 0, 0, 0);
-    Color b = Color::BlackTransparent();
-    ASSERT_COLOR_NEAR(a, b);
-  }
-
-  {
-    Color a = Color::MakeRGBA8(255, 255, 255, 255);
-    Color b = Color::White();
-    ASSERT_COLOR_NEAR(a, b);
-  }
-
-  {
-    Color a = Color::MakeRGBA8(63, 127, 191, 127);
-    Color b(0.247059, 0.498039, 0.74902, 0.498039);
-    ASSERT_COLOR_NEAR(a, b);
+    ASSERT_COLOR_NEAR(Color::Lerp(a, b, 0.5), Color(0.3, 0.7, 0.6, 0.4));
+    ASSERT_COLOR_NEAR(Color::Lerp(a, b, 0.0), a);
+    ASSERT_COLOR_NEAR(Color::Lerp(a, b, 1.0), b);
+    ASSERT_COLOR_NEAR(Color::Lerp(a, b, 0.2), Color(0.24, 0.52, 0.84, 0.46));
   }
 }
 
-TEST(GeometryTest, CanConvertBetweenDegressAndRadians) {
-  {
-    auto deg = Degrees{90.0};
-    Radians rad = deg;
-    ASSERT_FLOAT_EQ(rad.radians, kPiOver2);
-  }
-}
-
-TEST(GeometryTest, RectMakeSize) {
-  {
-    Size s(100, 200);
-    Rect r = Rect::MakeSize(s);
-    Rect expected = Rect::MakeLTRB(0, 0, 100, 200);
-    ASSERT_RECT_NEAR(r, expected);
-  }
-
+TEST(GeometryTest, ColorClamp01) {
   {
-    ISize s(100, 200);
-    Rect r = Rect::MakeSize(s);
-    Rect expected = Rect::MakeLTRB(0, 0, 100, 200);
-    ASSERT_RECT_NEAR(r, expected);
+    Color result = Color(0.5, 0.5, 0.5, 0.5).Clamp01();
+    Color expected = Color(0.5, 0.5, 0.5, 0.5);
+    ASSERT_COLOR_NEAR(result, expected);
   }
 
   {
-    Size s(100, 200);
-    IRect r = IRect::MakeSize(s);
-    IRect expected = IRect::MakeLTRB(0, 0, 100, 200);
-    ASSERT_EQ(r, expected);
+    Color result = Color(-1, -1, -1, -1).Clamp01();
+    Color expected = Color(0, 0, 0, 0);
+    ASSERT_COLOR_NEAR(result, expected);
   }
 
   {
-    ISize s(100, 200);
-    IRect r = IRect::MakeSize(s);
-    IRect expected = IRect::MakeLTRB(0, 0, 100, 200);
-    ASSERT_EQ(r, expected);
+    Color result = Color(2, 2, 2, 2).Clamp01();
+    Color expected = Color(1, 1, 1, 1);
+    ASSERT_COLOR_NEAR(result, expected);
   }
 }
 
-TEST(GeometryTest, RectUnion) {
-  {
-    Rect a(100, 100, 100, 100);
-    Rect b(0, 0, 0, 0);
-    auto u = a.Union(b);
-    auto expected = Rect(0, 0, 200, 200);
-    ASSERT_RECT_NEAR(u, expected);
-  }
-
+TEST(GeometryTest, ColorMakeRGBA8) {
   {
-    Rect a(100, 100, 100, 100);
-    Rect b(10, 10, 0, 0);
-    auto u = a.Union(b);
-    auto expected = Rect(10, 10, 190, 190);
-    ASSERT_RECT_NEAR(u, expected);
+    Color a = Color::MakeRGBA8(0, 0, 0, 0);
+    Color b = Color::BlackTransparent();
+    ASSERT_COLOR_NEAR(a, b);
   }
 
   {
-    Rect a(0, 0, 100, 100);
-    Rect b(10, 10, 100, 100);
-    auto u = a.Union(b);
-    auto expected = Rect(0, 0, 110, 110);
-    ASSERT_RECT_NEAR(u, expected);
+    Color a = Color::MakeRGBA8(255, 255, 255, 255);
+    Color b = Color::White();
+    ASSERT_COLOR_NEAR(a, b);
   }
 
   {
-    Rect a(0, 0, 100, 100);
-    Rect b(100, 100, 100, 100);
-    auto u = a.Union(b);
-    auto expected = Rect(0, 0, 200, 200);
-    ASSERT_RECT_NEAR(u, expected);
+    Color a = Color::MakeRGBA8(63, 127, 191, 127);
+    Color b(0.247059, 0.498039, 0.74902, 0.498039);
+    ASSERT_COLOR_NEAR(a, b);
   }
 }
 
-TEST(GeometryTest, RectIntersection) {
+TEST(GeometryTest, ColorApplyColorMatrix) {
   {
-    Rect a(100, 100, 100, 100);
-    Rect b(0, 0, 0, 0);
-
-    auto u = a.Intersection(b);
-    ASSERT_FALSE(u.has_value());
-  }
-
-  {
-    Rect a(100, 100, 100, 100);
-    Rect b(10, 10, 0, 0);
-    auto u = a.Intersection(b);
-    ASSERT_FALSE(u.has_value());
-  }
-
-  {
-    Rect a(0, 0, 100, 100);
-    Rect b(10, 10, 100, 100);
-    auto u = a.Intersection(b);
-    ASSERT_TRUE(u.has_value());
-    auto expected = Rect(10, 10, 90, 90);
-    ASSERT_RECT_NEAR(u.value(), expected);
+    ColorMatrix color_matrix = {
+        1, 1, 1, 1, 1,  //
+        1, 1, 1, 1, 1,  //
+        1, 1, 1, 1, 1,  //
+        1, 1, 1, 1, 1,  //
+    };
+    auto result = Color::White().ApplyColorMatrix(color_matrix);
+    auto expected = Color(1, 1, 1, 1);
+    ASSERT_COLOR_NEAR(result, expected);
   }
 
   {
-    Rect a(0, 0, 100, 100);
-    Rect b(100, 100, 100, 100);
-    auto u = a.Intersection(b);
-    ASSERT_FALSE(u.has_value());
+    ColorMatrix color_matrix = {
+        0.1, 0,   0,   0,   0.01,  //
+        0,   0.2, 0,   0,   0.02,  //
+        0,   0,   0.3, 0,   0.03,  //
+        0,   0,   0,   0.4, 0.04,  //
+    };
+    auto result = Color::White().ApplyColorMatrix(color_matrix);
+    auto expected = Color(0.11, 0.22, 0.33, 0.44);
+    ASSERT_COLOR_NEAR(result, expected);
+  }
+}
+
+TEST(GeometryTest, ColorLinearToSRGB) {
+  {
+    auto result = Color::White().LinearToSRGB();
+    auto expected = Color(1, 1, 1, 1);
+    ASSERT_COLOR_NEAR(result, expected);
+  }
+
+  {
+    auto result = Color::BlackTransparent().LinearToSRGB();
+    auto expected = Color(0, 0, 0, 0);
+    ASSERT_COLOR_NEAR(result, expected);
+  }
+
+  {
+    auto result = Color(0.2, 0.4, 0.6, 0.8).LinearToSRGB();
+    auto expected = Color(0.484529, 0.665185, 0.797738, 0.8);
+    ASSERT_COLOR_NEAR(result, expected);
+  }
+}
+
+TEST(GeometryTest, ColorSRGBToLinear) {
+  {
+    auto result = Color::White().SRGBToLinear();
+    auto expected = Color(1, 1, 1, 1);
+    ASSERT_COLOR_NEAR(result, expected);
+  }
+
+  {
+    auto result = Color::BlackTransparent().SRGBToLinear();
+    auto expected = Color(0, 0, 0, 0);
+    ASSERT_COLOR_NEAR(result, expected);
+  }
+
+  {
+    auto result = Color(0.2, 0.4, 0.6, 0.8).SRGBToLinear();
+    auto expected = Color(0.0331048, 0.132868, 0.318547, 0.8);
+    ASSERT_COLOR_NEAR(result, expected);
+  }
+}
+
+struct ColorBlendTestData {
+  static constexpr Color kDestinationColor =
+      Color::CornflowerBlue().WithAlpha(0.75);
+  static constexpr Color kSourceColors[] = {Color::White().WithAlpha(0.75),
+                                            Color::LimeGreen().WithAlpha(0.75),
+                                            Color::Black().WithAlpha(0.75)};
+
+  // THIS RESULT TABLE IS GENERATED!
+  //
+  // Uncomment the `GenerateColorBlendResults` test below to print a new table
+  // after making changes to `Color::Blend`.
+  static constexpr Color kExpectedResults
+      [sizeof(kSourceColors)]
+      [static_cast<std::underlying_type_t<BlendMode>>(BlendMode::kLast) + 1] = {
+          {
+              {0, 0, 0, 0},                            // Clear
+              {1, 1, 1, 0.75},                         // Source
+              {0.392157, 0.584314, 0.929412, 0.75},    // Destination
+              {0.878431, 0.916863, 0.985882, 0.9375},  // SourceOver
+              {0.513726, 0.667451, 0.943529, 0.9375},  // DestinationOver
+              {1, 1, 1, 0.5625},                       // SourceIn
+              {0.392157, 0.584314, 0.929412, 0.5625},  // DestinationIn
+              {1, 1, 1, 0.1875},                       // SourceOut
+              {0.392157, 0.584314, 0.929412, 0.1875},  // DestinationOut
+              {0.848039, 0.896078, 0.982353, 0.75},    // SourceATop
+              {0.544118, 0.688235, 0.947059, 0.75},    // DestinationATop
+              {0.696078, 0.792157, 0.964706, 0.375},   // Xor
+              {1, 1, 1, 1},                            // Plus
+              {0.392157, 0.584314, 0.929412, 0.5625},  // Modulate
+              {0.878431, 0.916863, 0.985882, 0.9375},  // Screen
+              {0.74902, 0.916863, 0.985882, 0.9375},   // Overlay
+              {0.513726, 0.667451, 0.943529, 0.9375},  // Darken
+              {0.878431, 0.916863, 0.985882, 0.9375},  // Lighten
+              {0.878431, 0.916863, 0.985882, 0.9375},  // ColorDodge
+              {0.513725, 0.667451, 0.943529, 0.9375},  // ColorBurn
+              {0.878431, 0.916863, 0.985882, 0.9375},  // HardLight
+              {0.654166, 0.775505, 0.964318, 0.9375},  // SoftLight
+              {0.643137, 0.566275, 0.428235, 0.9375},  // Difference
+              {0.643137, 0.566275, 0.428235, 0.9375},  // Exclusion
+              {0.513726, 0.667451, 0.943529, 0.9375},  // Multiply
+              {0.617208, 0.655639, 0.724659, 0.9375},  // Hue
+              {0.617208, 0.655639, 0.724659, 0.9375},  // Saturation
+              {0.617208, 0.655639, 0.724659, 0.9375},  // Color
+              {0.878431, 0.916863, 0.985882, 0.9375},  // Luminosity
+          },
+          {
+              {0, 0, 0, 0},                             // Clear
+              {0.196078, 0.803922, 0.196078, 0.75},     // Source
+              {0.392157, 0.584314, 0.929412, 0.75},     // Destination
+              {0.235294, 0.76, 0.342745, 0.9375},       // SourceOver
+              {0.352941, 0.628235, 0.782745, 0.9375},   // DestinationOver
+              {0.196078, 0.803922, 0.196078, 0.5625},   // SourceIn
+              {0.392157, 0.584314, 0.929412, 0.5625},   // DestinationIn
+              {0.196078, 0.803922, 0.196078, 0.1875},   // SourceOut
+              {0.392157, 0.584314, 0.929412, 0.1875},   // DestinationOut
+              {0.245098, 0.74902, 0.379412, 0.75},      // SourceATop
+              {0.343137, 0.639216, 0.746078, 0.75},     // DestinationATop
+              {0.294118, 0.694118, 0.562745, 0.375},    // Xor
+              {0.441176, 1, 0.844118, 1},               // Plus
+              {0.0768935, 0.469742, 0.182238, 0.5625},  // Modulate
+              {0.424452, 0.828743, 0.79105, 0.9375},    // Screen
+              {0.209919, 0.779839, 0.757001, 0.9375},   // Overlay
+              {0.235294, 0.628235, 0.342745, 0.9375},   // Darken
+              {0.352941, 0.76, 0.782745, 0.9375},       // Lighten
+              {0.41033, 0.877647, 0.825098, 0.9375},    // ColorDodge
+              {0.117647, 0.567403, 0.609098, 0.9375},   // ColorBurn
+              {0.209919, 0.779839, 0.443783, 0.9375},   // HardLight
+              {0.266006, 0.693915, 0.758818, 0.9375},   // SoftLight
+              {0.235294, 0.409412, 0.665098, 0.9375},   // Difference
+              {0.378316, 0.546897, 0.681707, 0.9375},   // Exclusion
+              {0.163783, 0.559493, 0.334441, 0.9375},   // Multiply
+              {0.266235, 0.748588, 0.373686, 0.9375},   // Hue
+              {0.339345, 0.629787, 0.811502, 0.9375},   // Saturation
+              {0.241247, 0.765953, 0.348698, 0.9375},   // Color
+              {0.346988, 0.622282, 0.776792, 0.9375},   // Luminosity
+          },
+          {
+              {0, 0, 0, 0},                             // Clear
+              {0, 0, 0, 0.75},                          // Source
+              {0.392157, 0.584314, 0.929412, 0.75},     // Destination
+              {0.0784314, 0.116863, 0.185882, 0.9375},  // SourceOver
+              {0.313726, 0.467451, 0.743529, 0.9375},   // DestinationOver
+              {0, 0, 0, 0.5625},                        // SourceIn
+              {0.392157, 0.584314, 0.929412, 0.5625},   // DestinationIn
+              {0, 0, 0, 0.1875},                        // SourceOut
+              {0.392157, 0.584314, 0.929412, 0.1875},   // DestinationOut
+              {0.0980392, 0.146078, 0.232353, 0.75},    // SourceATop
+              {0.294118, 0.438235, 0.697059, 0.75},     // DestinationATop
+              {0.196078, 0.292157, 0.464706, 0.375},    // Xor
+              {0.294118, 0.438235, 0.697059, 1},        // Plus
+              {0, 0, 0, 0.5625},                        // Modulate
+              {0.313726, 0.467451, 0.743529, 0.9375},   // Screen
+              {0.0784314, 0.218039, 0.701176, 0.9375},  // Overlay
+              {0.0784314, 0.116863, 0.185882, 0.9375},  // Darken
+              {0.313726, 0.467451, 0.743529, 0.9375},   // Lighten
+              {0.313726, 0.467451, 0.743529, 0.9375},   // ColorDodge
+              {0.0784314, 0.116863, 0.185882, 0.9375},  // ColorBurn
+              {0.0784314, 0.116863, 0.185882, 0.9375},  // HardLight
+              {0.170704, 0.321716, 0.704166, 0.9375},   // SoftLight
+              {0.313726, 0.467451, 0.743529, 0.9375},   // Difference
+              {0.313726, 0.467451, 0.743529, 0.9375},   // Exclusion
+              {0.0784314, 0.116863, 0.185882, 0.9375},  // Multiply
+              {0.417208, 0.455639, 0.524659, 0.9375},   // Hue
+              {0.417208, 0.455639, 0.524659, 0.9375},   // Saturation
+              {0.417208, 0.455639, 0.524659, 0.9375},   // Color
+              {0.0784314, 0.116863, 0.185882, 0.9375},  // Luminosity
+          },
+  };
+};
+
+/// To print a new ColorBlendTestData::kExpectedResults table, uncomment this
+/// test and run with:
+/// --gtest_filter="GeometryTest.GenerateColorBlendResults"
+/*
+TEST(GeometryTest, GenerateColorBlendResults) {
+  auto& o = std::cout;
+  using BlendT = std::underlying_type_t<BlendMode>;
+  o << "{";
+  for (const auto& source : ColorBlendTestData::kSourceColors) {
+    o << "{";
+    for (BlendT blend_i = 0;
+         blend_i < static_cast<BlendT>(BlendMode::kLast) + 1; blend_i++) {
+      auto blend = static_cast<BlendMode>(blend_i);
+      Color c = ColorBlendTestData::kDestinationColor.Blend(source, blend);
+      o << "{" << c.red << "," << c.green << "," << c.blue << "," << c.alpha
+        << "}, // " << BlendModeToString(blend) << std::endl;
+    }
+    o << "},";
   }
+  o << "};" << std::endl;
 }
+*/
 
-TEST(GeometryTest, RectIntersectsWithRect) {
-  {
-    Rect a(100, 100, 100, 100);
-    Rect b(0, 0, 0, 0);
-    ASSERT_FALSE(a.IntersectsWithRect(b));
-  }
+#define _BLEND_MODE_RESULT_CHECK(blend_mode)                          \
+  blend_i = static_cast<BlendT>(BlendMode::k##blend_mode);            \
+  expected = ColorBlendTestData::kExpectedResults[source_i][blend_i]; \
+  EXPECT_COLOR_NEAR(dst.Blend(src, BlendMode::k##blend_mode), expected);
 
-  {
-    Rect a(100, 100, 100, 100);
-    Rect b(10, 10, 0, 0);
-    ASSERT_FALSE(a.IntersectsWithRect(b));
-  }
-
-  {
-    Rect a(0, 0, 100, 100);
-    Rect b(10, 10, 100, 100);
-    ASSERT_TRUE(a.IntersectsWithRect(b));
-  }
+TEST(GeometryTest, ColorBlendReturnsExpectedResults) {
+  using BlendT = std::underlying_type_t<BlendMode>;
+  Color dst = ColorBlendTestData::kDestinationColor;
+  for (size_t source_i = 0;
+       source_i < sizeof(ColorBlendTestData::kSourceColors) / sizeof(Color);
+       source_i++) {
+    Color src = ColorBlendTestData::kSourceColors[source_i];
 
-  {
-    Rect a(0, 0, 100, 100);
-    Rect b(100, 100, 100, 100);
-    ASSERT_FALSE(a.IntersectsWithRect(b));
+    size_t blend_i;
+    Color expected;
+    IMPELLER_FOR_EACH_BLEND_MODE(_BLEND_MODE_RESULT_CHECK)
   }
 }
 
-TEST(GeometryTest, RectContainsPoint) {
-  {
-    // Origin is inclusive
-    Rect r(100, 100, 100, 100);
-    Point p(100, 100);
-    ASSERT_TRUE(r.Contains(p));
-  }
-  {
-    // Size is exclusive
-    Rect r(100, 100, 100, 100);
-    Point p(200, 200);
-    ASSERT_FALSE(r.Contains(p));
-  }
-  {
-    Rect r(100, 100, 100, 100);
-    Point p(99, 99);
-    ASSERT_FALSE(r.Contains(p));
-  }
-  {
-    Rect r(100, 100, 100, 100);
-    Point p(199, 199);
-    ASSERT_TRUE(r.Contains(p));
-  }
-}
-
-TEST(GeometryTest, RectContainsRect) {
-  {
-    Rect a(100, 100, 100, 100);
-    ASSERT_TRUE(a.Contains(a));
-  }
-  {
-    Rect a(100, 100, 100, 100);
-    Rect b(0, 0, 0, 0);
-    ASSERT_FALSE(a.Contains(b));
-  }
-  {
-    Rect a(100, 100, 100, 100);
-    Rect b(150, 150, 20, 20);
-    ASSERT_TRUE(a.Contains(b));
-  }
-  {
-    Rect a(100, 100, 100, 100);
-    Rect b(150, 150, 100, 100);
-    ASSERT_FALSE(a.Contains(b));
-  }
-  {
-    Rect a(100, 100, 100, 100);
-    Rect b(50, 50, 100, 100);
-    ASSERT_FALSE(a.Contains(b));
-  }
-  {
-    Rect a(100, 100, 100, 100);
-    Rect b(0, 0, 300, 300);
-    ASSERT_FALSE(a.Contains(b));
-  }
-}
+#define _BLEND_MODE_NAME_CHECK(blend_mode) \
+  case BlendMode::k##blend_mode:           \
+    ASSERT_STREQ(result, #blend_mode);     \
+    break;
 
-TEST(GeometryTest, RectGetPoints) {
-  Rect r(100, 200, 300, 400);
-  auto points = r.GetPoints();
-  ASSERT_POINT_NEAR(points[0], Point(100, 200));
-  ASSERT_POINT_NEAR(points[1], Point(400, 200));
-  ASSERT_POINT_NEAR(points[2], Point(100, 600));
-  ASSERT_POINT_NEAR(points[3], Point(400, 600));
-}
-
-TEST(GeometryTest, RectGetTransformedPoints) {
-  Rect r(100, 200, 300, 400);
-  auto points = r.GetTransformedPoints(Matrix::MakeTranslation({10, 20}));
-  ASSERT_POINT_NEAR(points[0], Point(110, 220));
-  ASSERT_POINT_NEAR(points[1], Point(410, 220));
-  ASSERT_POINT_NEAR(points[2], Point(110, 620));
-  ASSERT_POINT_NEAR(points[3], Point(410, 620));
-}
-
-TEST(GeometryTest, RectMakePointBounds) {
-  {
-    Rect r =
-        Rect::MakePointBounds({Point(1, 5), Point(4, -1), Point(0, 6)}).value();
-    auto expected = Rect(0, -1, 4, 7);
-    ASSERT_RECT_NEAR(r, expected);
-  }
-  {
-    std::optional<Rect> r = Rect::MakePointBounds({});
-    ASSERT_FALSE(r.has_value());
-  }
-}
-
-TEST(GeometryTest, RectGetPositive) {
-  {
-    Rect r{100, 200, 300, 400};
-    auto actual = r.GetPositive();
-    ASSERT_RECT_NEAR(r, actual);
-  }
-  {
-    Rect r{100, 200, -100, -100};
-    auto actual = r.GetPositive();
-    Rect expected(0, 100, 100, 100);
-    ASSERT_RECT_NEAR(expected, actual);
+TEST(GeometryTest, BlendModeToString) {
+  using BlendT = std::underlying_type_t<BlendMode>;
+  for (BlendT i = 0; i <= static_cast<BlendT>(BlendMode::kLast); i++) {
+    auto mode = static_cast<BlendMode>(i);
+    auto result = BlendModeToString(mode);
+    switch (mode) { IMPELLER_FOR_EACH_BLEND_MODE(_BLEND_MODE_NAME_CHECK) }
   }
 }
 
-TEST(GeometryTest, CubicPathComponentPolylineDoesNotIncludePointOne) {
-  CubicPathComponent component({10, 10}, {20, 35}, {35, 20}, {40, 40});
-  auto polyline = component.CreatePolyline();
-  ASSERT_NE(polyline.front().x, 10);
-  ASSERT_NE(polyline.front().y, 10);
-  ASSERT_EQ(polyline.back().x, 40);
-  ASSERT_EQ(polyline.back().y, 40);
-}
-
-TEST(GeometryTest, PathCreatePolyLineDoesNotDuplicatePoints) {
-  Path path;
-  path.AddContourComponent({10, 10});
-  path.AddLinearComponent({10, 10}, {20, 20});
-  path.AddLinearComponent({20, 20}, {30, 30});
-  path.AddContourComponent({40, 40});
-  path.AddLinearComponent({40, 40}, {50, 50});
-
-  auto polyline = path.CreatePolyline();
-
-  ASSERT_EQ(polyline.contours.size(), 2u);
-  ASSERT_EQ(polyline.points.size(), 5u);
-  ASSERT_EQ(polyline.points[0].x, 10);
-  ASSERT_EQ(polyline.points[1].x, 20);
-  ASSERT_EQ(polyline.points[2].x, 30);
-  ASSERT_EQ(polyline.points[3].x, 40);
-  ASSERT_EQ(polyline.points[4].x, 50);
-}
-
-TEST(GeometryTest, PathBuilderSetsCorrectContourPropertiesForAddCommands) {
-  // Closed shapes.
-  {
-    Path path = PathBuilder{}.AddCircle({100, 100}, 50).TakePath();
-    ContourComponent contour;
-    path.GetContourComponentAtIndex(0, contour);
-    ASSERT_POINT_NEAR(contour.destination, Point(100, 50));
-    ASSERT_TRUE(contour.is_closed);
-  }
-
-  {
-    Path path = PathBuilder{}.AddOval(Rect(100, 100, 100, 100)).TakePath();
-    ContourComponent contour;
-    path.GetContourComponentAtIndex(0, contour);
-    ASSERT_POINT_NEAR(contour.destination, Point(150, 100));
-    ASSERT_TRUE(contour.is_closed);
-  }
-
-  {
-    Path path = PathBuilder{}.AddRect(Rect(100, 100, 100, 100)).TakePath();
-    ContourComponent contour;
-    path.GetContourComponentAtIndex(0, contour);
-    ASSERT_POINT_NEAR(contour.destination, Point(100, 100));
-    ASSERT_TRUE(contour.is_closed);
-  }
-
+TEST(GeometryTest, CanConvertBetweenDegressAndRadians) {
   {
-    Path path =
-        PathBuilder{}.AddRoundedRect(Rect(100, 100, 100, 100), 10).TakePath();
-    ContourComponent contour;
-    path.GetContourComponentAtIndex(0, contour);
-    ASSERT_POINT_NEAR(contour.destination, Point(110, 100));
-    ASSERT_TRUE(contour.is_closed);
+    auto deg = Degrees{90.0};
+    Radians rad = deg;
+    ASSERT_FLOAT_EQ(rad.radians, kPiOver2);
   }
-
-  // Open shapes.
-  {
-    Point p(100, 100);
-    Path path = PathBuilder{}.AddLine(p, {200, 100}).TakePath();
-    ContourComponent contour;
-    path.GetContourComponentAtIndex(0, contour);
-    ASSERT_POINT_NEAR(contour.destination, p);
-    ASSERT_FALSE(contour.is_closed);
-  }
-
-  {
-    Path path =
-        PathBuilder{}
-            .AddCubicCurve({100, 100}, {100, 50}, {100, 150}, {200, 100})
-            .TakePath();
-    ContourComponent contour;
-    path.GetContourComponentAtIndex(0, contour);
-    ASSERT_POINT_NEAR(contour.destination, Point(100, 100));
-    ASSERT_FALSE(contour.is_closed);
-  }
-
-  {
-    Path path = PathBuilder{}
-                    .AddQuadraticCurve({100, 100}, {100, 50}, {200, 100})
-                    .TakePath();
-    ContourComponent contour;
-    path.GetContourComponentAtIndex(0, contour);
-    ASSERT_POINT_NEAR(contour.destination, Point(100, 100));
-    ASSERT_FALSE(contour.is_closed);
-  }
-}
-
-TEST(GeometryTest, PathCreatePolylineGeneratesCorrectContourData) {
-  Path::Polyline polyline = PathBuilder{}
-                                .AddLine({100, 100}, {200, 100})
-                                .MoveTo({100, 200})
-                                .LineTo({150, 250})
-                                .LineTo({200, 200})
-                                .Close()
-                                .TakePath()
-                                .CreatePolyline();
-  ASSERT_EQ(polyline.points.size(), 6u);
-  ASSERT_EQ(polyline.contours.size(), 2u);
-  ASSERT_EQ(polyline.contours[0].is_closed, false);
-  ASSERT_EQ(polyline.contours[0].start_index, 0u);
-  ASSERT_EQ(polyline.contours[1].is_closed, true);
-  ASSERT_EQ(polyline.contours[1].start_index, 2u);
-}
-
-TEST(GeometryTest, PolylineGetContourPointBoundsReturnsCorrectRanges) {
-  Path::Polyline polyline = PathBuilder{}
-                                .AddLine({100, 100}, {200, 100})
-                                .MoveTo({100, 200})
-                                .LineTo({150, 250})
-                                .LineTo({200, 200})
-                                .Close()
-                                .TakePath()
-                                .CreatePolyline();
-  size_t a1, a2, b1, b2;
-  std::tie(a1, a2) = polyline.GetContourPointBounds(0);
-  std::tie(b1, b2) = polyline.GetContourPointBounds(1);
-  ASSERT_EQ(a1, 0u);
-  ASSERT_EQ(a2, 2u);
-  ASSERT_EQ(b1, 2u);
-  ASSERT_EQ(b2, 6u);
-}
-
-TEST(GeometryTest, PathAddRectPolylineHasCorrectContourData) {
-  Path::Polyline polyline = PathBuilder{}
-                                .AddRect(Rect::MakeLTRB(50, 60, 70, 80))
-                                .TakePath()
-                                .CreatePolyline();
-  ASSERT_EQ(polyline.contours.size(), 1u);
-  ASSERT_TRUE(polyline.contours[0].is_closed);
-  ASSERT_EQ(polyline.contours[0].start_index, 0u);
-  ASSERT_EQ(polyline.points.size(), 5u);
-  ASSERT_EQ(polyline.points[0], Point(50, 60));
-  ASSERT_EQ(polyline.points[1], Point(70, 60));
-  ASSERT_EQ(polyline.points[2], Point(70, 80));
-  ASSERT_EQ(polyline.points[3], Point(50, 80));
-  ASSERT_EQ(polyline.points[4], Point(50, 60));
-}
-
-TEST(GeometryTest, PathPolylineDuplicatesAreRemovedForSameContour) {
-  Path::Polyline polyline =
-      PathBuilder{}
-          .MoveTo({50, 50})
-          .LineTo({50, 50})  // Insert duplicate at beginning of contour.
-          .LineTo({100, 50})
-          .LineTo({100, 50})  // Insert duplicate at contour join.
-          .LineTo({100, 100})
-          .Close()  // Implicitly insert duplicate {50, 50} across contours.
-          .LineTo({0, 50})
-          .LineTo({0, 100})
-          .LineTo({0, 100})  // Insert duplicate at end of contour.
-          .TakePath()
-          .CreatePolyline();
-  ASSERT_EQ(polyline.contours.size(), 2u);
-  ASSERT_EQ(polyline.contours[0].start_index, 0u);
-  ASSERT_TRUE(polyline.contours[0].is_closed);
-  ASSERT_EQ(polyline.contours[1].start_index, 4u);
-  ASSERT_FALSE(polyline.contours[1].is_closed);
-  ASSERT_EQ(polyline.points.size(), 7u);
-  ASSERT_EQ(polyline.points[0], Point(50, 50));
-  ASSERT_EQ(polyline.points[1], Point(100, 50));
-  ASSERT_EQ(polyline.points[2], Point(100, 100));
-  ASSERT_EQ(polyline.points[3], Point(50, 50));
-  ASSERT_EQ(polyline.points[4], Point(50, 50));
-  ASSERT_EQ(polyline.points[5], Point(0, 50));
-  ASSERT_EQ(polyline.points[6], Point(0, 100));
 }
 
 TEST(GeometryTest, MatrixPrinting) {
@@ -1765,6 +1708,12 @@ TEST(GeometryTest, ColorPrinting) {
   }
 }
 
+TEST(GeometryTest, ToIColor) {
+  ASSERT_EQ(Color::ToIColor(Color(0, 0, 0, 0)), 0u);
+  ASSERT_EQ(Color::ToIColor(Color(1.0, 1.0, 1.0, 1.0)), 0xFFFFFFFF);
+  ASSERT_EQ(Color::ToIColor(Color(0.5, 0.5, 1.0, 1.0)), 0xFF8080FF);
+}
+
 TEST(GeometryTest, Gradient) {
   {
     // Simple 2 color gradient produces color buffer containing exactly those
@@ -1811,8 +1760,8 @@ TEST(GeometryTest, Gradient) {
     std::vector<Color> lerped_colors = {
         Color::Red(),
         Color::Blue(),
-        Color::lerp(Color::Blue(), Color::Green(), 0.3333),
-        Color::lerp(Color::Blue(), Color::Green(), 0.6666),
+        Color::Lerp(Color::Blue(), Color::Green(), 0.3333),
+        Color::Lerp(Color::Blue(), Color::Green(), 0.6666),
         Color::Green(),
     };
     ASSERT_COLOR_BUFFER_NEAR(gradient.color_bytes, lerped_colors);
@@ -1835,73 +1784,42 @@ TEST(GeometryTest, Gradient) {
   }
 }
 
-TEST(GeometryTest, GradientSSBO) {
-  {
-    // Simple 2 color gradient produces std::nullopt, as original
-    // color vector should be used.
-    std::vector<Color> colors = {Color::Red(), Color::Blue()};
-    std::vector<Scalar> stops = {0.0, 1.0};
+TEST(GeometryTest, HalfConversions) {
+#if defined(FML_OS_MACOSX) || defined(FML_OS_IOS) || \
+    defined(FML_OS_IOS_SIMULATOR)
+  ASSERT_EQ(ScalarToHalf(0.0), 0.0f16);
+  ASSERT_EQ(ScalarToHalf(0.05), 0.05f16);
+  ASSERT_EQ(ScalarToHalf(2.43), 2.43f16);
+  ASSERT_EQ(ScalarToHalf(-1.45), -1.45f16);
 
-    auto gradient = CreateGradientColors(colors, stops);
+  // 65504 is the largest possible half.
+  ASSERT_EQ(ScalarToHalf(65504.0f), 65504.0f16);
+  ASSERT_EQ(ScalarToHalf(65504.0f + 1), 65504.0f16);
 
-    ASSERT_EQ(gradient, std::nullopt);
-  }
+  // Colors
+  ASSERT_EQ(HalfVector4(Color::Red()),
+            HalfVector4(1.0f16, 0.0f16, 0.0f16, 1.0f16));
+  ASSERT_EQ(HalfVector4(Color::Green()),
+            HalfVector4(0.0f16, 1.0f16, 0.0f16, 1.0f16));
+  ASSERT_EQ(HalfVector4(Color::Blue()),
+            HalfVector4(0.0f16, 0.0f16, 1.0f16, 1.0f16));
+  ASSERT_EQ(HalfVector4(Color::Black().WithAlpha(0)),
+            HalfVector4(0.0f16, 0.0f16, 0.0f16, 0.0f16));
 
-  {
-    // Gradient with duplicate stops does not create an empty texture.
-    std::vector<Color> colors = {Color::Red(), Color::Yellow(), Color::Black(),
-                                 Color::Blue()};
-    std::vector<Scalar> stops = {0.0, 0.25, 0.25, 1.0};
+  ASSERT_EQ(HalfVector3(Vector3(4.0, 6.0, -1.0)),
+            HalfVector3(4.0f16, 6.0f16, -1.0f16));
+  ASSERT_EQ(HalfVector2(Vector2(4.0, 6.0)), HalfVector2(4.0f16, 6.0f16));
 
-    auto gradient = CreateGradientColors(colors, stops);
-    ASSERT_EQ(gradient.value().size(), 5u);
-  }
-
-  {
-    // Simple N color gradient produces color buffer containing exactly those
-    // values.
-    std::vector<Color> colors = {Color::Red(), Color::Blue(), Color::Green(),
-                                 Color::White()};
-    std::vector<Scalar> stops = {0.0, 0.33, 0.66, 1.0};
-
-    auto gradient = CreateGradientColors(colors, stops);
-
-    ASSERT_EQ(gradient, std::nullopt);
-  }
-
-  {
-    // Gradient with color stops will lerp and scale buffer.
-    std::vector<Color> colors = {Color::Red(), Color::Blue(), Color::Green()};
-    std::vector<Scalar> stops = {0.0, 0.25, 1.0};
-
-    auto gradient = CreateGradientColors(colors, stops);
-
-    std::vector<Color> lerped_colors = {
-        Color::Red(),
-        Color::Blue(),
-        Color::lerp(Color::Blue(), Color::Green(), 0.3333),
-        Color::lerp(Color::Blue(), Color::Green(), 0.6666),
-        Color::Green(),
-    };
-
-    ASSERT_COLORS_NEAR(gradient.value(), lerped_colors);
-    ASSERT_EQ(gradient.value().size(), 5u);
-  }
-
-  {
-    // Gradient size is capped at 1024.
-    std::vector<Color> colors = {};
-    std::vector<Scalar> stops = {};
-    for (auto i = 0u; i < 1025; i++) {
-      colors.push_back(Color::Blue());
-      stops.push_back(i / 1025.0);
-    }
-
-    auto gradient = CreateGradientColors(colors, stops);
-
-    ASSERT_EQ(gradient.value().size(), 1024u);
-  }
+  ASSERT_EQ(Half(0.5f), Half(0.5f16));
+  ASSERT_EQ(Half(0.5), Half(0.5f16));
+  ASSERT_EQ(Half(5), Half(5.0f16));
+#else
+  GTEST_SKIP() << "Half-precision floats (IEEE 754) are not portable and "
+                  "only used on Apple platforms.";
+#endif  // FML_OS_MACOSX || FML_OS_IOS || FML_OS_IOS_SIMULATOR
 }
 
 }  // namespace testing
 }  // namespace impeller
+
+// NOLINTEND(bugprone-unchecked-optional-access)
diff --git a/impeller/geometry/gradient.cc b/impeller/geometry/gradient.cc
index e668827e80ea409c07872cbdcf992f81fb30d3f1..8bdfbe2cb250788d1fde1fa6903b19b741cc8254 100644
--- a/impeller/geometry/gradient.cc
+++ b/impeller/geometry/gradient.cc
@@ -75,7 +75,7 @@ GradientData CreateGradientBuffer(const std::vector<Color>& colors,
       } else if (scaled_i < next_stop) {
         // We're still between the current stop and the next stop.
         auto t = (scaled_i - previous_stop) / (next_stop - previous_stop);
-        auto mixed_color = Color::lerp(previous_color, next_color, t);
+        auto mixed_color = Color::Lerp(previous_color, next_color, t);
 
         AppendColor(mixed_color, &data);
       } else {
@@ -87,7 +87,7 @@ GradientData CreateGradientBuffer(const std::vector<Color>& colors,
         auto next_stop = stops[previous_color_index + 1];
 
         auto t = (scaled_i - previous_stop) / (next_stop - previous_stop);
-        auto mixed_color = Color::lerp(previous_color, next_color, t);
+        auto mixed_color = Color::Lerp(previous_color, next_color, t);
 
         AppendColor(mixed_color, &data);
       }
@@ -98,80 +98,4 @@ GradientData CreateGradientBuffer(const std::vector<Color>& colors,
   return data;
 }
 
-std::optional<std::vector<Color>> CreateGradientColors(
-    const std::vector<Color>& colors,
-    const std::vector<Scalar>& stops) {
-  FML_DCHECK(stops.size() == colors.size());
-
-  if (stops.size() == 2) {
-    // Use original buffer.
-    return std::nullopt;
-  }
-
-  auto minimum_delta = 1.0;
-  for (size_t i = 1; i < stops.size(); i++) {
-    auto value = stops[i] - stops[i - 1];
-    // Smaller than kEhCloseEnough
-    if (value < 0.0001) {
-      continue;
-    }
-    if (value < minimum_delta) {
-      minimum_delta = value;
-    }
-  }
-  // Avoid creating buffers that are absurdly large due to stops that are
-  // very close together.
-  uint32_t color_count = std::min(
-      static_cast<uint32_t>(std::round(1.0 / minimum_delta)) + 1, 1024u);
-
-  if (color_count == colors.size()) {
-    // Use original buffer.
-    return std::nullopt;
-  }
-
-  std::vector<Color> data;
-  data.reserve(color_count);
-
-  Color previous_color = colors[0];
-  auto previous_stop = 0.0;
-  auto previous_color_index = 0;
-
-  // The first index is always equal to the first color, exactly.
-  data.push_back(colors[0]);
-
-  for (auto i = 1u; i < color_count - 1; i++) {
-    auto scaled_i = i / (color_count - 1.0);
-    Color next_color = colors[previous_color_index + 1];
-    auto next_stop = stops[previous_color_index + 1];
-    // We're almost exactly equal to the next stop.
-    if (ScalarNearlyEqual(scaled_i, next_stop)) {
-      data.push_back(next_color);
-
-      previous_color = next_color;
-      previous_stop = next_stop;
-      previous_color_index += 1;
-    } else if (scaled_i < next_stop) {
-      // We're still between the current stop and the next stop.
-      auto t = (scaled_i - previous_stop) / (next_stop - previous_stop);
-      auto mixed_color = Color::lerp(previous_color, next_color, t);
-
-      data.push_back(mixed_color);
-    } else {
-      // We've slightly overshot the previous stop.
-      previous_color = next_color;
-      previous_stop = next_stop;
-      previous_color_index += 1;
-      next_color = colors[previous_color_index + 1];
-      auto next_stop = stops[previous_color_index + 1];
-
-      auto t = (scaled_i - previous_stop) / (next_stop - previous_stop);
-      auto mixed_color = Color::lerp(previous_color, next_color, t);
-      data.push_back(mixed_color);
-    }
-  }
-  // The last index is always equal to the last color, exactly.
-  data.push_back(colors.back());
-  return data;
-}
-
 }  // namespace impeller
diff --git a/impeller/geometry/gradient.h b/impeller/geometry/gradient.h
index 2d8e737adab35e84f12b070983dc62f98c6d638a..8d6e70a2e3f3cf26b16ac18daf7a3370a4bec077 100644
--- a/impeller/geometry/gradient.h
+++ b/impeller/geometry/gradient.h
@@ -2,8 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_GEOMETRY_GRADIENT_H_
+#define FLUTTER_IMPELLER_GEOMETRY_GRADIENT_H_
 
+#include <cstdint>
 #include <memory>
 #include <vector>
 
@@ -30,19 +32,6 @@ struct GradientData {
 GradientData CreateGradientBuffer(const std::vector<Color>& colors,
                                   const std::vector<Scalar>& stops);
 
-/**
- * @brief Populate a vector with the interpolated colors for the linear gradient
- * described  by colors and stops.
- *
- * If the returned result is std::nullopt, the original color buffer can be used
- * instead.
- *
- * @param colors
- * @param stops
- * @return GradientData
- */
-std::optional<std::vector<Color>> CreateGradientColors(
-    const std::vector<Color>& colors,
-    const std::vector<Scalar>& stops);
-
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_GEOMETRY_GRADIENT_H_
diff --git a/impeller/geometry/half.h b/impeller/geometry/half.h
new file mode 100644
index 0000000000000000000000000000000000000000..1e819ce466856cb1b496daa9c05866f0dc8d9d54
--- /dev/null
+++ b/impeller/geometry/half.h
@@ -0,0 +1,196 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_GEOMETRY_HALF_H_
+#define FLUTTER_IMPELLER_GEOMETRY_HALF_H_
+
+#include <cstdint>
+
+#include "flutter/fml/build_config.h"
+
+#include "impeller/geometry/color.h"
+#include "impeller/geometry/point.h"
+#include "impeller/geometry/scalar.h"
+#include "impeller/geometry/vector.h"
+
+// NOLINTBEGIN(google-explicit-constructor)
+
+#if defined(FML_OS_MACOSX) || defined(FML_OS_IOS) || \
+    defined(FML_OS_IOS_SIMULATOR)
+using InternalHalf = _Float16;
+#else
+using InternalHalf = uint16_t;
+#endif
+
+namespace impeller {
+
+/// @brief Convert a scalar to a half precision float.
+///
+/// See also: https://clang.llvm.org/docs/LanguageExtensions.html
+/// This is not currently supported on Windows toolchains.
+inline constexpr InternalHalf ScalarToHalf(Scalar f) {
+#ifdef FML_OS_WIN
+  return static_cast<InternalHalf>(0);
+#else
+  return static_cast<InternalHalf>(f);
+#endif
+}
+
+/// @brief A storage only class for half precision floating point.
+struct Half {
+  InternalHalf x = 0;
+
+  constexpr Half() {}
+
+  constexpr Half(double value) : x(ScalarToHalf(static_cast<Scalar>(value))) {}
+
+  constexpr Half(Scalar value) : x(ScalarToHalf(value)) {}
+
+  constexpr Half(int value) : x(ScalarToHalf(static_cast<Scalar>(value))) {}
+
+  constexpr Half(InternalHalf x) : x(x) {}
+
+  constexpr bool operator==(const Half& v) const { return v.x == x; }
+
+  constexpr bool operator!=(const Half& v) const { return v.x != x; }
+};
+
+/// @brief A storage only class for half precision floating point vector 4.
+struct HalfVector4 {
+  union {
+    struct {
+      InternalHalf x = 0;
+      InternalHalf y = 0;
+      InternalHalf z = 0;
+      InternalHalf w = 0;
+    };
+    InternalHalf e[4];
+  };
+
+  constexpr HalfVector4() {}
+
+  constexpr HalfVector4(const Color& a)
+      : x(ScalarToHalf(a.red)),
+        y(ScalarToHalf(a.green)),
+        z(ScalarToHalf(a.blue)),
+        w(ScalarToHalf(a.alpha)) {}
+
+  constexpr HalfVector4(const Vector4& a)
+      : x(ScalarToHalf(a.x)),
+        y(ScalarToHalf(a.y)),
+        z(ScalarToHalf(a.z)),
+        w(ScalarToHalf(a.w)) {}
+
+  constexpr HalfVector4(InternalHalf x,
+                        InternalHalf y,
+                        InternalHalf z,
+                        InternalHalf w)
+      : x(x), y(y), z(z), w(w) {}
+
+  constexpr bool operator==(const HalfVector4& v) const {
+    return v.x == x && v.y == y && v.z == z && v.w == w;
+  }
+
+  constexpr bool operator!=(const HalfVector4& v) const {
+    return v.x != x || v.y != y || v.z != z || v.w != w;
+  }
+};
+
+/// @brief A storage only class for half precision floating point vector 3.
+struct HalfVector3 {
+  union {
+    struct {
+      InternalHalf x = 0;
+      InternalHalf y = 0;
+      InternalHalf z = 0;
+    };
+    InternalHalf e[3];
+  };
+
+  constexpr HalfVector3() {}
+
+  constexpr HalfVector3(const Vector3& a)
+      : x(ScalarToHalf(a.x)), y(ScalarToHalf(a.y)), z(ScalarToHalf(a.z)) {}
+
+  constexpr HalfVector3(InternalHalf x, InternalHalf y, InternalHalf z)
+      : x(x), y(y), z(z) {}
+
+  constexpr bool operator==(const HalfVector3& v) const {
+    return v.x == x && v.y == y && v.z == z;
+  }
+
+  constexpr bool operator!=(const HalfVector3& v) const {
+    return v.x != x || v.y != y || v.z != z;
+  }
+};
+
+/// @brief A storage only class for half precision floating point vector 2.
+struct HalfVector2 {
+  union {
+    struct {
+      InternalHalf x = 0;
+      InternalHalf y = 0;
+    };
+    InternalHalf e[2];
+  };
+
+  constexpr HalfVector2() {}
+
+  constexpr HalfVector2(const Vector2& a)
+      : x(ScalarToHalf(a.x)), y(ScalarToHalf(a.y)) {}
+
+  constexpr HalfVector2(InternalHalf x, InternalHalf y) : x(x), y(y){};
+
+  constexpr bool operator==(const HalfVector2& v) const {
+    return v.x == x && v.y == y;
+  }
+
+  constexpr bool operator!=(const HalfVector2& v) const {
+    return v.x != x || v.y != y;
+  }
+};
+
+static_assert(sizeof(Half) == sizeof(uint16_t));
+static_assert(sizeof(HalfVector2) == 2 * sizeof(Half));
+static_assert(sizeof(HalfVector3) == 3 * sizeof(Half));
+static_assert(sizeof(HalfVector4) == 4 * sizeof(Half));
+
+}  // namespace impeller
+
+namespace std {
+
+inline std::ostream& operator<<(std::ostream& out, const impeller::Half& p) {
+  out << "(" << static_cast<impeller::Scalar>(p.x) << ")";
+  return out;
+}
+
+inline std::ostream& operator<<(std::ostream& out,
+                                const impeller::HalfVector2& p) {
+  out << "(" << static_cast<impeller::Scalar>(p.x) << ", "
+      << static_cast<impeller::Scalar>(p.y) << ")";
+  return out;
+}
+
+inline std::ostream& operator<<(std::ostream& out,
+                                const impeller::HalfVector3& p) {
+  out << "(" << static_cast<impeller::Scalar>(p.x) << ", "
+      << static_cast<impeller::Scalar>(p.y) << ", "
+      << static_cast<impeller::Scalar>(p.z) << ")";
+  return out;
+}
+
+inline std::ostream& operator<<(std::ostream& out,
+                                const impeller::HalfVector4& p) {
+  out << "(" << static_cast<impeller::Scalar>(p.x) << ", "
+      << static_cast<impeller::Scalar>(p.y) << ", "
+      << static_cast<impeller::Scalar>(p.z) << ", "
+      << static_cast<impeller::Scalar>(p.w) << ")";
+  return out;
+}
+
+// NOLINTEND(google-explicit-constructor)
+
+}  // namespace std
+
+#endif  // FLUTTER_IMPELLER_GEOMETRY_HALF_H_
diff --git a/impeller/geometry/matrix.h b/impeller/geometry/matrix.h
index 30d6636f9af79add74f8129753ed20329f9376f0..5e563af6d70e87106c36764e6da31c3b0d5fe5f8 100644
--- a/impeller/geometry/matrix.h
+++ b/impeller/geometry/matrix.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_GEOMETRY_MATRIX_H_
+#define FLUTTER_IMPELLER_GEOMETRY_MATRIX_H_
 
 #include <cmath>
 #include <iomanip>
@@ -28,11 +29,11 @@ namespace impeller {
 ///             device coordinates must use the following convention:
 ///               * Left-handed coordinate system. Positive rotation is
 ///                 clockwise about axis of rotation.
-///               * Lower left corner is -1.0, -1.0.
-///               * Upper right corner is  1.0,  1.0.
+///               * Lower left corner is -1.0f, -1.0.
+///               * Upper right corner is  1.0f,  1.0.
 ///               * Visible z-space is from 0.0 to 1.0.
 ///                 * This is NOT the same as OpenGL! Be careful.
-///               * NDC origin is at (0.0, 0.0, 0.5).
+///               * NDC origin is at (0.0f, 0.0f, 0.5f).
 struct Matrix {
   union {
     Scalar m[16];
@@ -45,10 +46,10 @@ struct Matrix {
   ///
   constexpr Matrix()
       // clang-format off
-      : vec{ Vector4(1.0,  0.0,  0.0,  0.0),
-             Vector4(0.0,  1.0,  0.0,  0.0),
-             Vector4(0.0,  0.0,  1.0,  0.0),
-             Vector4(0.0,  0.0,  0.0,  1.0)} {}
+      : vec{ Vector4(1.0f,  0.0f,  0.0f,  0.0f),
+             Vector4(0.0f,  1.0f,  0.0f,  0.0f),
+             Vector4(0.0f,  0.0f,  1.0f,  0.0f),
+             Vector4(0.0f,  0.0f,  0.0f,  1.0f)} {}
   // clang-format on
 
   // clang-format off
@@ -62,7 +63,7 @@ struct Matrix {
             Vector4(m12, m13, m14, m15)} {}
   // clang-format on
 
-  Matrix(const MatrixDecomposition& decomposition);
+  explicit Matrix(const MatrixDecomposition& decomposition);
 
   // clang-format off
   static constexpr Matrix MakeColumn(
@@ -93,32 +94,57 @@ struct Matrix {
 
   static constexpr Matrix MakeTranslation(const Vector3& t) {
     // clang-format off
-    return Matrix(1.0, 0.0, 0.0, 0.0,
-                  0.0, 1.0, 0.0, 0.0,
-                  0.0, 0.0, 1.0, 0.0,
-                  t.x, t.y, t.z, 1.0);
+    return Matrix(1.0f, 0.0f, 0.0f, 0.0f,
+                  0.0f, 1.0f, 0.0f, 0.0f,
+                  0.0f, 0.0f, 1.0f, 0.0f,
+                  t.x, t.y, t.z, 1.0f);
     // clang-format on
   }
 
   static constexpr Matrix MakeScale(const Vector3& s) {
     // clang-format off
-    return Matrix(s.x, 0.0, 0.0, 0.0,
-                  0.0, s.y, 0.0, 0.0,
-                  0.0, 0.0, s.z, 0.0,
-                  0.0, 0.0, 0.0, 1.0);
+    return Matrix(s.x, 0.0f, 0.0f, 0.0f,
+                  0.0f, s.y, 0.0f, 0.0f,
+                  0.0f, 0.0f, s.z, 0.0f,
+                  0.0f, 0.0f, 0.0f, 1.0f);
     // clang-format on
   }
 
   static constexpr Matrix MakeScale(const Vector2& s) {
-    return MakeScale(Vector3(s.x, s.y, 1.0));
+    return MakeScale(Vector3(s.x, s.y, 1.0f));
   }
 
   static constexpr Matrix MakeSkew(Scalar sx, Scalar sy) {
     // clang-format off
-    return Matrix(1.0, sy , 0.0, 0.0,
-                  sx , 1.0, 0.0, 0.0,
-                  0.0, 0.0, 1.0, 0.0,
-                  0.0, 0.0, 0.0, 1.0);
+    return Matrix(1.0f, sy , 0.0f, 0.0f,
+                  sx , 1.0f, 0.0f, 0.0f,
+                  0.0f, 0.0f, 1.0f, 0.0f,
+                  0.0f, 0.0f, 0.0f, 1.0f);
+    // clang-format on
+  }
+
+  static Matrix MakeRotation(Quaternion q) {
+    // clang-format off
+    return Matrix(
+      1.0f - 2.0f * q.y * q.y  - 2.0f * q.z * q.z,
+      2.0f * q.x  * q.y + 2.0f * q.z  * q.w,
+      2.0f * q.x  * q.z - 2.0f * q.y  * q.w,
+      0.0f,
+
+      2.0f * q.x  * q.y - 2.0f * q.z  * q.w,
+      1.0f - 2.0f * q.x * q.x  - 2.0f * q.z * q.z,
+      2.0f * q.y  * q.z + 2.0f * q.x  * q.w,
+      0.0f,
+
+      2.0f * q.x  * q.z + 2.0f * q.y * q.w,
+      2.0f * q.y  * q.z - 2.0f * q.x * q.w,
+      1.0f - 2.0f * q.x * q.x  - 2.0f * q.y * q.y,
+      0.0f,
+
+      0.0f,
+      0.0f,
+      0.0f,
+      1.0f);
     // clang-format on
   }
 
@@ -134,22 +160,22 @@ struct Matrix {
       cosine + cosp * v.x * v.x,
       cosp * v.x * v.y + v.z * sine,
       cosp * v.x * v.z - v.y * sine,
-      0.0,
+      0.0f,
 
       cosp * v.x * v.y - v.z * sine,
       cosine + cosp * v.y * v.y,
       cosp * v.y * v.z + v.x * sine,
-      0.0,
+      0.0f,
 
       cosp * v.x * v.z + v.y * sine,
       cosp * v.y * v.z - v.x * sine,
       cosine + cosp * v.z * v.z,
-      0.0,
+      0.0f,
 
-      0.0,
-      0.0,
-      0.0,
-      1.0);
+      0.0f,
+      0.0f,
+      0.0f,
+      1.0f);
     // clang-format on
   }
 
@@ -158,10 +184,10 @@ struct Matrix {
     const Scalar sine = sin(r.radians);
     // clang-format off
     return Matrix(
-      1.0,  0.0,    0.0,    0.0,
-      0.0,  cosine, sine,   0.0,
-      0.0, -sine,   cosine, 0.0,
-      0.0,  0.0,    0.0,    1.0
+      1.0f,  0.0f,    0.0f,    0.0f,
+      0.0f,  cosine,  sine,    0.0f,
+      0.0f, -sine,    cosine,  0.0f,
+      0.0f,  0.0f,    0.0f,    1.0f
     );
     // clang-format on
   }
@@ -172,10 +198,10 @@ struct Matrix {
 
     // clang-format off
     return Matrix(
-      cosine, 0.0, -sine,   0.0,
-      0.0,    1.0,  0.0,    0.0,
-      sine,   0.0,  cosine, 0.0,
-      0.0,    0.0,  0.0,    1.0
+      cosine,  0.0f, -sine,    0.0f,
+      0.0f,    1.0f,  0.0f,    0.0f,
+      sine,    0.0f,  cosine,  0.0f,
+      0.0f,    0.0f,  0.0f,    1.0f
     );
     // clang-format on
   }
@@ -186,21 +212,22 @@ struct Matrix {
 
     // clang-format off
     return Matrix (
-      cosine, sine,   0.0, 0.0,
-      -sine,  cosine, 0.0, 0.0,
-      0.0,    0.0,    1.0, 0.0,
-      0.0,    0.0,    0.0, 1.0
+      cosine, sine,   0.0f, 0.0f,
+      -sine,  cosine, 0.0f, 0.0f,
+      0.0f,    0.0f,    1.0f, 0.0f,
+      0.0f,    0.0f,    0.0f, 1.0
     );
     // clang-format on
   }
 
+  /// The Matrix without its `w` components (without translation).
   constexpr Matrix Basis() const {
     // clang-format off
     return Matrix(
-      m[0], m[1], m[2],  0.0,
-      m[4], m[5], m[6],  0.0,
-      m[8], m[9], m[10], 0.0,
-      0.0,  0.0,  0.0,   1.0
+      m[0], m[1], m[2],  0.0f,
+      m[4], m[5], m[6],  0.0f,
+      m[8], m[9], m[10], 0.0f,
+      0.0f,  0.0f,  0.0f,   1.0
     );
     // clang-format on
   }
@@ -265,6 +292,11 @@ struct Matrix {
 
   Scalar GetMaxBasisLength() const;
 
+  constexpr Scalar GetMaxBasisLengthXY() const {
+    return std::sqrt(std::max(e[0][0] * e[0][0] + e[0][1] * e[0][1],
+                              e[1][0] * e[1][0] + e[1][1] * e[1][1]));
+  }
+
   constexpr Vector3 GetBasisX() const { return Vector3(m[0], m[1], m[2]); }
 
   constexpr Vector3 GetBasisY() const { return Vector3(m[4], m[5], m[6]); }
@@ -277,7 +309,7 @@ struct Matrix {
   }
 
   constexpr Scalar GetDirectionScale(Vector3 direction) const {
-    return 1.0 / (this->Basis().Invert() * direction.Normalize()).Length() *
+    return 1.0f / (this->Basis().Invert() * direction.Normalize()).Length() *
            direction.Length();
   }
 
@@ -286,6 +318,10 @@ struct Matrix {
             m[9] == 0 && m[10] == 1 && m[11] == 0 && m[14] == 0 && m[15] == 1);
   }
 
+  constexpr bool HasPerspective() const {
+    return m[3] != 0 || m[7] != 0 || m[11] != 0 || m[15] != 1;
+  }
+
   constexpr bool IsAligned(Scalar tolerance = 0) const {
     int v[] = {!ScalarNearlyZero(m[0], tolerance),  //
                !ScalarNearlyZero(m[1], tolerance),  //
@@ -314,10 +350,10 @@ struct Matrix {
   constexpr bool IsIdentity() const {
     return (
         // clang-format off
-        m[0]  == 1.0 && m[1]  == 0.0 && m[2]  == 0.0 && m[3]  == 0.0 &&
-        m[4]  == 0.0 && m[5]  == 1.0 && m[6]  == 0.0 && m[7]  == 0.0 &&
-        m[8]  == 0.0 && m[9]  == 0.0 && m[10] == 1.0 && m[11] == 0.0 &&
-        m[12] == 0.0 && m[13] == 0.0 && m[14] == 0.0 && m[15] == 1.0
+        m[0]  == 1.0f && m[1]  == 0.0f && m[2]  == 0.0f && m[3]  == 0.0f &&
+        m[4]  == 0.0f && m[5]  == 1.0f && m[6]  == 0.0f && m[7]  == 0.0f &&
+        m[8]  == 0.0f && m[9]  == 0.0f && m[10] == 1.0f && m[11] == 0.0f &&
+        m[12] == 0.0f && m[13] == 0.0f && m[14] == 0.0f && m[15] == 1.0f
         // clang-format on
     );
   }
@@ -413,13 +449,22 @@ struct Matrix {
     return Vector2(v.x * m[0] + v.y * m[4], v.x * m[1] + v.y * m[5]);
   }
 
+  constexpr Quad Transform(const Quad& quad) const {
+    return {
+        *this * quad[0],
+        *this * quad[1],
+        *this * quad[2],
+        *this * quad[3],
+    };
+  }
+
   template <class T>
   static constexpr Matrix MakeOrthographic(TSize<T> size) {
     // Per assumptions about NDC documented above.
     const auto scale =
         MakeScale({2.0f / static_cast<Scalar>(size.width),
-                   -2.0f / static_cast<Scalar>(size.height), 1.0});
-    const auto translate = MakeTranslation({-1.0, 1.0, 0.5});
+                   -2.0f / static_cast<Scalar>(size.height), 0.0f});
+    const auto translate = MakeTranslation({-1.0f, 1.0f, 0.5f});
     return translate * scale;
   }
 
@@ -427,14 +472,14 @@ struct Matrix {
                                           Scalar aspect_ratio,
                                           Scalar z_near,
                                           Scalar z_far) {
-    Scalar height = std::tan(fov_y.radians * 0.5);
+    Scalar height = std::tan(fov_y.radians * 0.5f);
     Scalar width = height * aspect_ratio;
 
     // clang-format off
     return {
       1.0f / width, 0.0f,           0.0f,                                 0.0f,
       0.0f,         1.0f / height,  0.0f,                                 0.0f,
-      0.0f,         0.0f,           z_far / (z_near - z_far),            -1.0f,
+      0.0f,         0.0f,           z_far / (z_far - z_near),             1.0f,
       0.0f,         0.0f,          -(z_far * z_near) / (z_far - z_near),  0.0f,
     };
     // clang-format on
@@ -486,3 +531,5 @@ inline std::ostream& operator<<(std::ostream& out, const impeller::Matrix& m) {
 }
 
 }  // namespace std
+
+#endif  // FLUTTER_IMPELLER_GEOMETRY_MATRIX_H_
diff --git a/impeller/geometry/matrix_decomposition.h b/impeller/geometry/matrix_decomposition.h
index 31c01ec5c6266816aacee3c2100cb05cc00e4910..a5b6592f26149272e41815e6bf49e9c1d84b6fc0 100644
--- a/impeller/geometry/matrix_decomposition.h
+++ b/impeller/geometry/matrix_decomposition.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_GEOMETRY_MATRIX_DECOMPOSITION_H_
+#define FLUTTER_IMPELLER_GEOMETRY_MATRIX_DECOMPOSITION_H_
 
 #include "impeller/geometry/quaternion.h"
 #include "impeller/geometry/scalar.h"
@@ -30,3 +31,5 @@ struct MatrixDecomposition {
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_GEOMETRY_MATRIX_DECOMPOSITION_H_
diff --git a/impeller/geometry/matrix_unittests.cc b/impeller/geometry/matrix_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..2d1bdcfe8edeeae908a57d7b4ccdf591dceaf69c
--- /dev/null
+++ b/impeller/geometry/matrix_unittests.cc
@@ -0,0 +1,28 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "gtest/gtest.h"
+
+#include "flutter/impeller/geometry/matrix.h"
+
+#include "flutter/impeller/geometry/geometry_asserts.h"
+
+namespace impeller {
+namespace testing {
+
+TEST(MatrixTest, Multiply) {
+  Matrix x(0.0, 0.0, 0.0, 1.0,  //
+           1.0, 0.0, 0.0, 1.0,  //
+           0.0, 1.0, 0.0, 1.0,  //
+           1.0, 1.0, 0.0, 1.0);
+  Matrix translate = Matrix::MakeTranslation({10, 20, 0});
+  Matrix result = translate * x;
+  EXPECT_TRUE(MatrixNear(result, Matrix(10.0, 20.0, 0.0, 1.0,  //
+                                        11.0, 20.0, 0.0, 1.0,  //
+                                        10.0, 21.0, 0.0, 1.0,  //
+                                        11.0, 21.0, 0.0, 1.0)));
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/geometry/path.cc b/impeller/geometry/path.cc
index cad3774c40863859841578a8d1a582340e729bba..2eb682f5ff722cf29e80174c57b0483c27feec41 100644
--- a/impeller/geometry/path.cc
+++ b/impeller/geometry/path.cc
@@ -5,73 +5,59 @@
 #include "impeller/geometry/path.h"
 
 #include <optional>
+#include <variant>
 
+#include "flutter/fml/logging.h"
 #include "impeller/geometry/path_component.h"
+#include "impeller/geometry/point.h"
 
 namespace impeller {
 
-Path::Path() {
-  AddContourComponent({});
-};
+Path::Path() : data_(new Data()) {}
+
+Path::Path(Data data) : data_(std::make_shared<Data>(std::move(data))) {}
 
 Path::~Path() = default;
 
 std::tuple<size_t, size_t> Path::Polyline::GetContourPointBounds(
     size_t contour_index) const {
   if (contour_index >= contours.size()) {
-    return {points.size(), points.size()};
+    return {points->size(), points->size()};
   }
   const size_t start_index = contours.at(contour_index).start_index;
   const size_t end_index = (contour_index >= contours.size() - 1)
-                               ? points.size()
+                               ? points->size()
                                : contours.at(contour_index + 1).start_index;
   return std::make_tuple(start_index, end_index);
 }
 
-size_t Path::GetComponentCount() const {
-  return components_.size();
-}
-
-void Path::SetFillType(FillType fill) {
-  fill_ = fill;
+size_t Path::GetComponentCount(std::optional<ComponentType> type) const {
+  if (!type.has_value()) {
+    return data_->components.size();
+  }
+  auto type_value = type.value();
+  if (type_value == ComponentType::kContour) {
+    return data_->contours.size();
+  }
+  size_t count = 0u;
+  for (const auto& component : data_->components) {
+    if (component.type == type_value) {
+      count++;
+    }
+  }
+  return count;
 }
 
 FillType Path::GetFillType() const {
-  return fill_;
-}
-
-Path& Path::AddLinearComponent(Point p1, Point p2) {
-  linears_.emplace_back(p1, p2);
-  components_.emplace_back(ComponentType::kLinear, linears_.size() - 1);
-  return *this;
-}
-
-Path& Path::AddQuadraticComponent(Point p1, Point cp, Point p2) {
-  quads_.emplace_back(p1, cp, p2);
-  components_.emplace_back(ComponentType::kQuadratic, quads_.size() - 1);
-  return *this;
+  return data_->fill;
 }
 
-Path& Path::AddCubicComponent(Point p1, Point cp1, Point cp2, Point p2) {
-  cubics_.emplace_back(p1, cp1, cp2, p2);
-  components_.emplace_back(ComponentType::kCubic, cubics_.size() - 1);
-  return *this;
+bool Path::IsConvex() const {
+  return data_->convexity == Convexity::kConvex;
 }
 
-Path& Path::AddContourComponent(Point destination, bool is_closed) {
-  if (components_.size() > 0 &&
-      components_.back().type == ComponentType::kContour) {
-    // Never insert contiguous contours.
-    contours_.back() = ContourComponent(destination, is_closed);
-  } else {
-    contours_.emplace_back(ContourComponent(destination, is_closed));
-    components_.emplace_back(ComponentType::kContour, contours_.size() - 1);
-  }
-  return *this;
-}
-
-void Path::SetContourClosed(bool is_closed) {
-  contours_.back().is_closed = is_closed;
+bool Path::IsEmpty() const {
+  return data_->points.empty();
 }
 
 void Path::EnumerateComponents(
@@ -79,27 +65,37 @@ void Path::EnumerateComponents(
     const Applier<QuadraticPathComponent>& quad_applier,
     const Applier<CubicPathComponent>& cubic_applier,
     const Applier<ContourComponent>& contour_applier) const {
+  auto& points = data_->points;
   size_t currentIndex = 0;
-  for (const auto& component : components_) {
+  for (const auto& component : data_->components) {
     switch (component.type) {
       case ComponentType::kLinear:
         if (linear_applier) {
-          linear_applier(currentIndex, linears_[component.index]);
+          linear_applier(currentIndex,
+                         LinearPathComponent(points[component.index],
+                                             points[component.index + 1]));
         }
         break;
       case ComponentType::kQuadratic:
         if (quad_applier) {
-          quad_applier(currentIndex, quads_[component.index]);
+          quad_applier(currentIndex,
+                       QuadraticPathComponent(points[component.index],
+                                              points[component.index + 1],
+                                              points[component.index + 2]));
         }
         break;
       case ComponentType::kCubic:
         if (cubic_applier) {
-          cubic_applier(currentIndex, cubics_[component.index]);
+          cubic_applier(currentIndex,
+                        CubicPathComponent(points[component.index],
+                                           points[component.index + 1],
+                                           points[component.index + 2],
+                                           points[component.index + 3]));
         }
         break;
       case ComponentType::kContour:
         if (contour_applier) {
-          contour_applier(currentIndex, contours_[component.index]);
+          contour_applier(currentIndex, data_->contours[component.index]);
         }
         break;
     }
@@ -109,227 +105,239 @@ void Path::EnumerateComponents(
 
 bool Path::GetLinearComponentAtIndex(size_t index,
                                      LinearPathComponent& linear) const {
-  if (index >= components_.size()) {
+  auto& components = data_->components;
+
+  if (index >= components.size()) {
     return false;
   }
 
-  if (components_[index].type != ComponentType::kLinear) {
+  if (components[index].type != ComponentType::kLinear) {
     return false;
   }
 
-  linear = linears_[components_[index].index];
+  auto& points = data_->points;
+  auto point_index = components[index].index;
+  linear = LinearPathComponent(points[point_index], points[point_index + 1]);
   return true;
 }
 
 bool Path::GetQuadraticComponentAtIndex(
     size_t index,
     QuadraticPathComponent& quadratic) const {
-  if (index >= components_.size()) {
+  auto& components = data_->components;
+
+  if (index >= components.size()) {
     return false;
   }
 
-  if (components_[index].type != ComponentType::kQuadratic) {
+  if (components[index].type != ComponentType::kQuadratic) {
     return false;
   }
 
-  quadratic = quads_[components_[index].index];
+  auto& points = data_->points;
+  auto point_index = components[index].index;
+  quadratic = QuadraticPathComponent(
+      points[point_index], points[point_index + 1], points[point_index + 2]);
   return true;
 }
 
 bool Path::GetCubicComponentAtIndex(size_t index,
                                     CubicPathComponent& cubic) const {
-  if (index >= components_.size()) {
+  auto& components = data_->components;
+
+  if (index >= components.size()) {
     return false;
   }
 
-  if (components_[index].type != ComponentType::kCubic) {
+  if (components[index].type != ComponentType::kCubic) {
     return false;
   }
 
-  cubic = cubics_[components_[index].index];
+  auto& points = data_->points;
+  auto point_index = components[index].index;
+  cubic = CubicPathComponent(points[point_index], points[point_index + 1],
+                             points[point_index + 2], points[point_index + 3]);
   return true;
 }
 
 bool Path::GetContourComponentAtIndex(size_t index,
                                       ContourComponent& move) const {
-  if (index >= components_.size()) {
-    return false;
-  }
-
-  if (components_[index].type != ComponentType::kContour) {
-    return false;
-  }
+  auto& components = data_->components;
 
-  move = contours_[components_[index].index];
-  return true;
-}
-
-bool Path::UpdateLinearComponentAtIndex(size_t index,
-                                        const LinearPathComponent& linear) {
-  if (index >= components_.size()) {
+  if (index >= components.size()) {
     return false;
   }
 
-  if (components_[index].type != ComponentType::kLinear) {
+  if (components[index].type != ComponentType::kContour) {
     return false;
   }
 
-  linears_[components_[index].index] = linear;
+  move = data_->contours[components[index].index];
   return true;
 }
 
-bool Path::UpdateQuadraticComponentAtIndex(
-    size_t index,
-    const QuadraticPathComponent& quadratic) {
-  if (index >= components_.size()) {
-    return false;
-  }
-
-  if (components_[index].type != ComponentType::kQuadratic) {
-    return false;
-  }
-
-  quads_[components_[index].index] = quadratic;
-  return true;
+Path::Polyline::Polyline(Path::Polyline::PointBufferPtr point_buffer,
+                         Path::Polyline::ReclaimPointBufferCallback reclaim)
+    : points(std::move(point_buffer)), reclaim_points_(std::move(reclaim)) {
+  FML_DCHECK(points);
 }
 
-bool Path::UpdateCubicComponentAtIndex(size_t index,
-                                       CubicPathComponent& cubic) {
-  if (index >= components_.size()) {
-    return false;
-  }
-
-  if (components_[index].type != ComponentType::kCubic) {
-    return false;
-  }
-
-  cubics_[components_[index].index] = cubic;
-  return true;
+Path::Polyline::Polyline(Path::Polyline&& other) {
+  points = std::move(other.points);
+  reclaim_points_ = std::move(other.reclaim_points_);
+  contours = std::move(other.contours);
 }
 
-bool Path::UpdateContourComponentAtIndex(size_t index,
-                                         const ContourComponent& move) {
-  if (index >= components_.size()) {
-    return false;
-  }
-
-  if (components_[index].type != ComponentType::kContour) {
-    return false;
+Path::Polyline::~Polyline() {
+  if (reclaim_points_) {
+    points->clear();
+    reclaim_points_(std::move(points));
   }
-
-  contours_[components_[index].index] = move;
-  return true;
 }
 
-Path::Polyline Path::CreatePolyline(Scalar tolerance) const {
-  Polyline polyline;
+Path::Polyline Path::CreatePolyline(
+    Scalar scale,
+    Path::Polyline::PointBufferPtr point_buffer,
+    Path::Polyline::ReclaimPointBufferCallback reclaim) const {
+  Polyline polyline(std::move(point_buffer), std::move(reclaim));
 
-  std::optional<Point> previous_contour_point;
-  auto collect_points = [&polyline, &previous_contour_point](
-                            const std::vector<Point>& collection) {
-    if (collection.empty()) {
-      return;
-    }
+  auto& path_components = data_->components;
+  auto& path_points = data_->points;
 
-    for (const auto& point : collection) {
-      if (previous_contour_point.has_value() &&
-          previous_contour_point.value() == point) {
-        // Skip over duplicate points in the same contour.
-        continue;
-      }
-      previous_contour_point = point;
-      polyline.points.push_back(point);
+  auto get_path_component = [&path_components, &path_points](
+                                size_t component_i) -> PathComponentVariant {
+    if (component_i >= path_components.size()) {
+      return std::monostate{};
     }
-  };
-
-  auto get_path_component =
-      [this](size_t component_i) -> std::optional<const PathComponent*> {
-    if (component_i >= components_.size()) {
-      return std::nullopt;
-    }
-    const auto& component = components_[component_i];
+    const auto& component = path_components[component_i];
     switch (component.type) {
       case ComponentType::kLinear:
-        return &linears_[component.index];
+        return reinterpret_cast<const LinearPathComponent*>(
+            &path_points[component.index]);
       case ComponentType::kQuadratic:
-        return &quads_[component.index];
+        return reinterpret_cast<const QuadraticPathComponent*>(
+            &path_points[component.index]);
       case ComponentType::kCubic:
-        return &cubics_[component.index];
+        return reinterpret_cast<const CubicPathComponent*>(
+            &path_points[component.index]);
       case ComponentType::kContour:
-        return std::nullopt;
+        return std::monostate{};
     }
   };
 
-  std::optional<const PathComponent*> previous_path_component;
-  auto end_contour = [&polyline, &previous_path_component]() {
-    // Whenever a contour has ended, extract the exact end direction from the
-    // last component.
+  auto compute_contour_start_direction =
+      [&get_path_component](size_t current_path_component_index) {
+        size_t next_component_index = current_path_component_index + 1;
+        while (!std::holds_alternative<std::monostate>(
+            get_path_component(next_component_index))) {
+          auto next_component = get_path_component(next_component_index);
+          auto maybe_vector =
+              std::visit(PathComponentStartDirectionVisitor(), next_component);
+          if (maybe_vector.has_value()) {
+            return maybe_vector.value();
+          } else {
+            next_component_index++;
+          }
+        }
+        return Vector2(0, -1);
+      };
+
+  std::vector<PolylineContour::Component> poly_components;
+  std::optional<size_t> previous_path_component_index;
+  auto end_contour = [&polyline, &previous_path_component_index,
+                      &get_path_component, &poly_components]() {
+    // Whenever a contour has ended, extract the exact end direction from
+    // the last component.
     if (polyline.contours.empty()) {
       return;
     }
-    if (!previous_path_component.has_value()) {
+
+    if (!previous_path_component_index.has_value()) {
       return;
     }
+
     auto& contour = polyline.contours.back();
-    contour.end_direction =
-        previous_path_component.value()->GetEndDirection().value_or(
-            Vector2(0, 1));
+    contour.end_direction = Vector2(0, 1);
+    contour.components = poly_components;
+    poly_components.clear();
+
+    size_t previous_index = previous_path_component_index.value();
+    while (!std::holds_alternative<std::monostate>(
+        get_path_component(previous_index))) {
+      auto previous_component = get_path_component(previous_index);
+      auto maybe_vector =
+          std::visit(PathComponentEndDirectionVisitor(), previous_component);
+      if (maybe_vector.has_value()) {
+        contour.end_direction = maybe_vector.value();
+        break;
+      } else {
+        if (previous_index == 0) {
+          break;
+        }
+        previous_index--;
+      }
+    }
   };
 
-  for (size_t component_i = 0; component_i < components_.size();
+  for (size_t component_i = 0; component_i < path_components.size();
        component_i++) {
-    const auto& component = components_[component_i];
-    switch (component.type) {
+    const auto& path_component = path_components[component_i];
+    switch (path_component.type) {
       case ComponentType::kLinear:
-        collect_points(linears_[component.index].CreatePolyline());
-        previous_path_component = &linears_[component.index];
+        poly_components.push_back({
+            .component_start_index = polyline.points->size() - 1,
+            .is_curve = false,
+        });
+        reinterpret_cast<const LinearPathComponent*>(
+            &path_points[path_component.index])
+            ->AppendPolylinePoints(*polyline.points);
+        previous_path_component_index = component_i;
         break;
       case ComponentType::kQuadratic:
-        collect_points(quads_[component.index].CreatePolyline(tolerance));
-        previous_path_component = &quads_[component.index];
+        poly_components.push_back({
+            .component_start_index = polyline.points->size() - 1,
+            .is_curve = true,
+        });
+        reinterpret_cast<const QuadraticPathComponent*>(
+            &path_points[path_component.index])
+            ->AppendPolylinePoints(scale, *polyline.points);
+        previous_path_component_index = component_i;
         break;
       case ComponentType::kCubic:
-        collect_points(cubics_[component.index].CreatePolyline(tolerance));
-        previous_path_component = &cubics_[component.index];
+        poly_components.push_back({
+            .component_start_index = polyline.points->size() - 1,
+            .is_curve = true,
+        });
+        reinterpret_cast<const CubicPathComponent*>(
+            &path_points[path_component.index])
+            ->AppendPolylinePoints(scale, *polyline.points);
+        previous_path_component_index = component_i;
         break;
       case ComponentType::kContour:
-        if (component_i == components_.size() - 1) {
+        if (component_i == path_components.size() - 1) {
           // If the last component is a contour, that means it's an empty
           // contour, so skip it.
           continue;
         }
         end_contour();
 
-        Vector2 start_direction(0, -1);
-        auto first_component = get_path_component(component_i + 1);
-        if (first_component.has_value()) {
-          start_direction =
-              first_component.value()->GetStartDirection().value_or(
-                  Vector2(0, -1));
-        }
-
-        const auto& contour = contours_[component.index];
-        polyline.contours.push_back({.start_index = polyline.points.size(),
+        Vector2 start_direction = compute_contour_start_direction(component_i);
+        const auto& contour = data_->contours[path_component.index];
+        polyline.contours.push_back({.start_index = polyline.points->size(),
                                      .is_closed = contour.is_closed,
-                                     .start_direction = start_direction});
-        previous_contour_point = std::nullopt;
-        collect_points({contour.destination});
+                                     .start_direction = start_direction,
+                                     .components = poly_components});
+
+        polyline.points->push_back(contour.destination);
         break;
     }
-    end_contour();
   }
+  end_contour();
   return polyline;
 }
 
 std::optional<Rect> Path::GetBoundingBox() const {
-  auto min_max = GetMinMaxCoveragePoints();
-  if (!min_max.has_value()) {
-    return std::nullopt;
-  }
-  auto min = min_max->first;
-  auto max = min_max->second;
-  const auto difference = max - min;
-  return Rect{min.x, min.y, difference.x, difference.y};
+  return data_->bounds;
 }
 
 std::optional<Rect> Path::GetTransformedBoundingBox(
@@ -341,51 +349,4 @@ std::optional<Rect> Path::GetTransformedBoundingBox(
   return bounds->TransformBounds(transform);
 }
 
-std::optional<std::pair<Point, Point>> Path::GetMinMaxCoveragePoints() const {
-  if (linears_.empty() && quads_.empty() && cubics_.empty()) {
-    return std::nullopt;
-  }
-
-  std::optional<Point> min, max;
-
-  auto clamp = [&min, &max](const Point& point) {
-    if (min.has_value()) {
-      min->x = std::min(min->x, point.x);
-      min->y = std::min(min->y, point.y);
-    } else {
-      min = point;
-    }
-
-    if (max.has_value()) {
-      max->x = std::max(max->x, point.x);
-      max->y = std::max(max->y, point.y);
-    } else {
-      max = point;
-    }
-  };
-
-  for (const auto& linear : linears_) {
-    clamp(linear.p1);
-    clamp(linear.p2);
-  }
-
-  for (const auto& quad : quads_) {
-    for (const Point& point : quad.Extrema()) {
-      clamp(point);
-    }
-  }
-
-  for (const auto& cubic : cubics_) {
-    for (const Point& point : cubic.Extrema()) {
-      clamp(point);
-    }
-  }
-
-  if (!min.has_value() || !max.has_value()) {
-    return std::nullopt;
-  }
-
-  return std::make_pair(min.value(), max.value());
-}
-
 }  // namespace impeller
diff --git a/impeller/geometry/path.h b/impeller/geometry/path.h
index 9b472c31e39d62f313a7352230d83ccb6d5a4f0a..ba56a4101c1bd967a8abd5fae4c561aeb2bcaa20 100644
--- a/impeller/geometry/path.h
+++ b/impeller/geometry/path.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_GEOMETRY_PATH_H_
+#define FLUTTER_IMPELLER_GEOMETRY_PATH_H_
 
 #include <functional>
 #include <optional>
-#include <set>
 #include <tuple>
 #include <vector>
 
@@ -14,25 +14,39 @@
 
 namespace impeller {
 
+enum class Cap {
+  kButt,
+  kRound,
+  kSquare,
+};
+
+enum class Join {
+  kMiter,
+  kRound,
+  kBevel,
+};
+
 enum class FillType {
   kNonZero,  // The default winding order.
   kOdd,
-  kPositive,
-  kNegative,
-  kAbsGeqTwo,
+};
+
+enum class Convexity {
+  kUnknown,
+  kConvex,
 };
 
 //------------------------------------------------------------------------------
 /// @brief      Paths are lightweight objects that describe a collection of
 ///             linear, quadratic, or cubic segments. These segments may be
-///             be broken up by move commands, which are effectively linear
+///             broken up by move commands, which are effectively linear
 ///             commands that pick up the pen rather than continuing to draw.
 ///
 ///             All shapes supported by Impeller are paths either directly or
 ///             via approximation (in the case of circles).
 ///
-///             Creating paths that describe complex shapes is usually done by a
-///             path builder.
+///             Paths are externally immutable once created, Creating paths must
+///             be done using a path builder.
 ///
 class Path {
  public:
@@ -44,8 +58,17 @@ class Path {
   };
 
   struct PolylineContour {
+    struct Component {
+      size_t component_start_index;
+      /// Denotes whether this component is a curve.
+      ///
+      /// This is set to true when this component is generated from
+      /// QuadraticComponent or CubicPathComponent.
+      bool is_curve;
+    };
     /// Index that denotes the first point of this contour.
     size_t start_index;
+
     /// Denotes whether the last point of this contour is connected to the first
     /// point of this contour or not.
     bool is_closed;
@@ -54,14 +77,41 @@ class Path {
     Vector2 start_direction;
     /// The direction of the contour's end cap.
     Vector2 end_direction;
+
+    /// Distinct components in this contour.
+    ///
+    /// If this contour is generated from multiple path components, each
+    /// path component forms a component in this vector.
+    std::vector<Component> components;
   };
 
   /// One or more contours represented as a series of points and indices in
   /// the point vector representing the start of a new contour.
+  ///
+  /// Polylines are ephemeral and meant to be used by the tessellator. They do
+  /// not allocate their own point vectors to allow for optimizations around
+  /// allocation and reuse of arenas.
   struct Polyline {
+    /// The signature of a method called when it is safe to reclaim the point
+    /// buffer provided to the constructor of this object.
+    using PointBufferPtr = std::unique_ptr<std::vector<Point>>;
+    using ReclaimPointBufferCallback = std::function<void(PointBufferPtr)>;
+
+    /// The buffer will be cleared and returned at the destruction of this
+    /// polyline.
+    Polyline(PointBufferPtr point_buffer, ReclaimPointBufferCallback reclaim);
+
+    Polyline(Polyline&& other);
+    ~Polyline();
+
     /// Points in the polyline, which may represent multiple contours specified
-    /// by indices in |breaks|.
-    std::vector<Point> points;
+    /// by indices in |contours|.
+    PointBufferPtr points;
+
+    Point& GetPoint(size_t index) const { return (*points)[index]; }
+
+    /// Contours are disconnected pieces of a polyline, such as when a MoveTo
+    /// was issued on a PathBuilder.
     std::vector<PolylineContour> contours;
 
     /// Convenience method to compute the start (inclusive) and end (exclusive)
@@ -70,27 +120,22 @@ class Path {
     /// The contour_index parameter is clamped to contours.size().
     std::tuple<size_t, size_t> GetContourPointBounds(
         size_t contour_index) const;
+
+   private:
+    ReclaimPointBufferCallback reclaim_points_;
   };
 
   Path();
 
   ~Path();
 
-  size_t GetComponentCount() const;
-
-  void SetFillType(FillType fill);
+  size_t GetComponentCount(std::optional<ComponentType> type = {}) const;
 
   FillType GetFillType() const;
 
-  Path& AddLinearComponent(Point p1, Point p2);
-
-  Path& AddQuadraticComponent(Point p1, Point cp, Point p2);
-
-  Path& AddCubicComponent(Point p1, Point cp1, Point cp2, Point p2);
+  bool IsConvex() const;
 
-  Path& AddContourComponent(Point destination, bool is_closed = false);
-
-  void SetContourClosed(bool is_closed);
+  bool IsEmpty() const;
 
   template <class T>
   using Applier = std::function<void(size_t index, const T& component)>;
@@ -111,26 +156,25 @@ class Path {
   bool GetContourComponentAtIndex(size_t index,
                                   ContourComponent& contour) const;
 
-  bool UpdateLinearComponentAtIndex(size_t index,
-                                    const LinearPathComponent& linear);
-
-  bool UpdateQuadraticComponentAtIndex(size_t index,
-                                       const QuadraticPathComponent& quadratic);
-
-  bool UpdateCubicComponentAtIndex(size_t index, CubicPathComponent& cubic);
-
-  bool UpdateContourComponentAtIndex(size_t index,
-                                     const ContourComponent& contour);
-
-  Polyline CreatePolyline(Scalar tolerance = kDefaultCurveTolerance) const;
+  /// Callers must provide the scale factor for how this path will be
+  /// transformed.
+  ///
+  /// It is suitable to use the max basis length of the matrix used to transform
+  /// the path. If the provided scale is 0, curves will revert to straight
+  /// lines.
+  Polyline CreatePolyline(
+      Scalar scale,
+      Polyline::PointBufferPtr point_buffer =
+          std::make_unique<std::vector<Point>>(),
+      Polyline::ReclaimPointBufferCallback reclaim = nullptr) const;
 
   std::optional<Rect> GetBoundingBox() const;
 
   std::optional<Rect> GetTransformedBoundingBox(const Matrix& transform) const;
 
-  std::optional<std::pair<Point, Point>> GetMinMaxCoveragePoints() const;
-
  private:
+  friend class PathBuilder;
+
   struct ComponentIndexPair {
     ComponentType type = ComponentType::kLinear;
     size_t index = 0;
@@ -141,12 +185,40 @@ class Path {
         : type(a_type), index(a_index) {}
   };
 
-  FillType fill_ = FillType::kNonZero;
-  std::vector<ComponentIndexPair> components_;
-  std::vector<LinearPathComponent> linears_;
-  std::vector<QuadraticPathComponent> quads_;
-  std::vector<CubicPathComponent> cubics_;
-  std::vector<ContourComponent> contours_;
+  // All of the data for the path is stored in this structure which is
+  // held by a shared_ptr. Since they all share the structure, the
+  // copy constructor for Path is very cheap and we don't need to deal
+  // with shared pointers for Path fields and method arguments.
+  //
+  // PathBuilder also uses this structure to accumulate the path data
+  // but the Path constructor used in |TakePath()| will clone the
+  // structure to prevent sharing and future modifications within the
+  // builder from affecting the existing taken paths.
+  struct Data {
+    Data() = default;
+
+    Data(Data&& other) = default;
+
+    Data(const Data& other) = default;
+
+    ~Data() = default;
+
+    FillType fill = FillType::kNonZero;
+    Convexity convexity = Convexity::kUnknown;
+    std::vector<ComponentIndexPair> components;
+    std::vector<Point> points;
+    std::vector<ContourComponent> contours;
+
+    std::optional<Rect> bounds;
+  };
+
+  explicit Path(Data data);
+
+  std::shared_ptr<const Data> data_;
 };
 
+static_assert(sizeof(Path) == sizeof(std::shared_ptr<struct Anonymous>));
+
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_GEOMETRY_PATH_H_
diff --git a/impeller/geometry/path_builder.cc b/impeller/geometry/path_builder.cc
index f7f68cf8496b3b190ba90d7f03fb3849fb493081..5cc9e28127cb3a806631157d837eab71ae612bc6 100644
--- a/impeller/geometry/path_builder.cc
+++ b/impeller/geometry/path_builder.cc
@@ -8,39 +8,45 @@
 
 namespace impeller {
 
-PathBuilder::PathBuilder() = default;
+PathBuilder::PathBuilder() {
+  AddContourComponent({});
+}
 
 PathBuilder::~PathBuilder() = default;
 
-Path PathBuilder::CopyPath(FillType fill) const {
-  auto path = prototype_;
-  path.SetFillType(fill);
-  return path;
+Path PathBuilder::CopyPath(FillType fill) {
+  prototype_.fill = fill;
+  return Path(prototype_);
 }
 
 Path PathBuilder::TakePath(FillType fill) {
-  auto path = prototype_;
-  path.SetFillType(fill);
-  return path;
+  prototype_.fill = fill;
+  UpdateBounds();
+  return Path(std::move(prototype_));
+}
+
+void PathBuilder::Reserve(size_t point_size, size_t verb_size) {
+  prototype_.points.reserve(point_size);
+  prototype_.components.reserve(verb_size);
 }
 
 PathBuilder& PathBuilder::MoveTo(Point point, bool relative) {
   current_ = relative ? current_ + point : point;
   subpath_start_ = current_;
-  prototype_.AddContourComponent(current_);
+  AddContourComponent(current_);
   return *this;
 }
 
 PathBuilder& PathBuilder::Close() {
   LineTo(subpath_start_);
-  prototype_.SetContourClosed(true);
-  prototype_.AddContourComponent(current_);
+  SetContourClosed(true);
+  AddContourComponent(current_);
   return *this;
 }
 
 PathBuilder& PathBuilder::LineTo(Point point, bool relative) {
   point = relative ? current_ + point : point;
-  prototype_.AddLinearComponent(current_, point);
+  AddLinearComponent(current_, point);
   current_ = point;
   return *this;
 }
@@ -48,7 +54,7 @@ PathBuilder& PathBuilder::LineTo(Point point, bool relative) {
 PathBuilder& PathBuilder::HorizontalLineTo(Scalar x, bool relative) {
   Point endpoint =
       relative ? Point{current_.x + x, current_.y} : Point{x, current_.y};
-  prototype_.AddLinearComponent(current_, endpoint);
+  AddLinearComponent(current_, endpoint);
   current_ = endpoint;
   return *this;
 }
@@ -56,7 +62,7 @@ PathBuilder& PathBuilder::HorizontalLineTo(Scalar x, bool relative) {
 PathBuilder& PathBuilder::VerticalLineTo(Scalar y, bool relative) {
   Point endpoint =
       relative ? Point{current_.x, current_.y + y} : Point{current_.x, y};
-  prototype_.AddLinearComponent(current_, endpoint);
+  AddLinearComponent(current_, endpoint);
   current_ = endpoint;
   return *this;
 }
@@ -66,40 +72,13 @@ PathBuilder& PathBuilder::QuadraticCurveTo(Point controlPoint,
                                            bool relative) {
   point = relative ? current_ + point : point;
   controlPoint = relative ? current_ + controlPoint : controlPoint;
-  prototype_.AddQuadraticComponent(current_, controlPoint, point);
+  AddQuadraticComponent(current_, controlPoint, point);
   current_ = point;
   return *this;
 }
 
-Point PathBuilder::ReflectedQuadraticControlPoint1() const {
-  /*
-   *  If there is no previous command or if the previous command was not a
-   *  quadratic, assume the control point is coincident with the current point.
-   */
-  if (prototype_.GetComponentCount() == 0) {
-    return current_;
-  }
-
-  QuadraticPathComponent quad;
-  if (!prototype_.GetQuadraticComponentAtIndex(
-          prototype_.GetComponentCount() - 1, quad)) {
-    return current_;
-  }
-
-  /*
-   *  The control point is assumed to be the reflection of the control point on
-   *  the previous command relative to the current point.
-   */
-  return (current_ * 2.0) - quad.cp;
-}
-
-PathBuilder& PathBuilder::SmoothQuadraticCurveTo(Point point, bool relative) {
-  point = relative ? current_ + point : point;
-  /*
-   *  The reflected control point is absolute and we made the endpoint absolute
-   *  too. So there the last argument is always false (i.e, not relative).
-   */
-  QuadraticCurveTo(point, ReflectedQuadraticControlPoint1(), false);
+PathBuilder& PathBuilder::SetConvexity(Convexity value) {
+  prototype_.convexity = value;
   return *this;
 }
 
@@ -110,52 +89,14 @@ PathBuilder& PathBuilder::CubicCurveTo(Point controlPoint1,
   controlPoint1 = relative ? current_ + controlPoint1 : controlPoint1;
   controlPoint2 = relative ? current_ + controlPoint2 : controlPoint2;
   point = relative ? current_ + point : point;
-  prototype_.AddCubicComponent(current_, controlPoint1, controlPoint2, point);
+  AddCubicComponent(current_, controlPoint1, controlPoint2, point);
   current_ = point;
   return *this;
 }
 
-Point PathBuilder::ReflectedCubicControlPoint1() const {
-  /*
-   *  If there is no previous command or if the previous command was not a
-   *  cubic, assume the first control point is coincident with the current
-   *  point.
-   */
-  if (prototype_.GetComponentCount() == 0) {
-    return current_;
-  }
-
-  CubicPathComponent cubic;
-  if (!prototype_.GetCubicComponentAtIndex(prototype_.GetComponentCount() - 1,
-                                           cubic)) {
-    return current_;
-  }
-
-  /*
-   *  The first control point is assumed to be the reflection of the second
-   *  control point on the previous command relative to the current point.
-   */
-  return (current_ * 2.0) - cubic.cp2;
-}
-
-PathBuilder& PathBuilder::SmoothCubicCurveTo(Point controlPoint2,
-                                             Point point,
-                                             bool relative) {
-  auto controlPoint1 = ReflectedCubicControlPoint1();
-  controlPoint2 = relative ? current_ + controlPoint2 : controlPoint2;
-  auto endpoint = relative ? current_ + point : point;
-
-  CubicCurveTo(endpoint,       // endpoint
-               controlPoint1,  // control point 1
-               controlPoint2,  // control point 2
-               false           // relative since all points are already absolute
-  );
-  return *this;
-}
-
 PathBuilder& PathBuilder::AddQuadraticCurve(Point p1, Point cp, Point p2) {
   MoveTo(p1);
-  prototype_.AddQuadraticComponent(p1, cp, p2);
+  AddQuadraticComponent(p1, cp, p2);
   return *this;
 }
 
@@ -164,34 +105,41 @@ PathBuilder& PathBuilder::AddCubicCurve(Point p1,
                                         Point cp2,
                                         Point p2) {
   MoveTo(p1);
-  prototype_.AddCubicComponent(p1, cp1, cp2, p2);
+  AddCubicComponent(p1, cp1, cp2, p2);
   return *this;
 }
 
 PathBuilder& PathBuilder::AddRect(Rect rect) {
-  current_ = rect.origin;
+  auto origin = rect.GetOrigin();
+  auto size = rect.GetSize();
 
-  auto tl = rect.origin;
-  auto bl = rect.origin + Point{0.0, rect.size.height};
-  auto br = rect.origin + Point{rect.size.width, rect.size.height};
-  auto tr = rect.origin + Point{rect.size.width, 0.0};
+  auto tl = origin;
+  auto bl = origin + Point{0.0, size.height};
+  auto br = origin + size;
+  auto tr = origin + Point{size.width, 0.0};
 
   MoveTo(tl);
-  prototype_.AddLinearComponent(tl, tr)
-      .AddLinearComponent(tr, br)
-      .AddLinearComponent(br, bl);
+  LineTo(tr);
+  LineTo(br);
+  LineTo(bl);
   Close();
 
   return *this;
 }
 
 PathBuilder& PathBuilder::AddCircle(const Point& c, Scalar r) {
-  return AddOval(Rect{c.x - r, c.y - r, 2.0f * r, 2.0f * r});
+  return AddOval(Rect::MakeXYWH(c.x - r, c.y - r, 2.0f * r, 2.0f * r));
 }
 
 PathBuilder& PathBuilder::AddRoundedRect(Rect rect, Scalar radius) {
   return radius <= 0.0 ? AddRect(rect)
-                       : AddRoundedRect(rect, {radius, radius, radius, radius});
+                       : AddRoundedRect(rect, RoundingRadii(radius));
+}
+
+PathBuilder& PathBuilder::AddRoundedRect(Rect rect, Size radii) {
+  return radii.width <= 0 || radii.height <= 0
+             ? AddRect(rect)
+             : AddRoundedRect(rect, RoundingRadii(radii));
 }
 
 PathBuilder& PathBuilder::AddRoundedRect(Rect rect, RoundingRadii radii) {
@@ -199,96 +147,169 @@ PathBuilder& PathBuilder::AddRoundedRect(Rect rect, RoundingRadii radii) {
     return AddRect(rect);
   }
 
-  current_ = rect.origin + Point{radii.top_left.x, 0.0};
+  auto rect_origin = rect.GetOrigin();
+  auto rect_size = rect.GetSize();
 
-  const auto magic_top_right = radii.top_right * kArcApproximationMagic;
-  const auto magic_bottom_right = radii.bottom_right * kArcApproximationMagic;
-  const auto magic_bottom_left = radii.bottom_left * kArcApproximationMagic;
-  const auto magic_top_left = radii.top_left * kArcApproximationMagic;
+  current_ = rect_origin + Point{radii.top_left.x, 0.0};
 
-  MoveTo({rect.origin.x + radii.top_left.x, rect.origin.y});
+  MoveTo({rect_origin.x + radii.top_left.x, rect_origin.y});
 
   //----------------------------------------------------------------------------
   // Top line.
   //
-  prototype_.AddLinearComponent(
-      {rect.origin.x + radii.top_left.x, rect.origin.y},
-      {rect.origin.x + rect.size.width - radii.top_right.x, rect.origin.y});
+  AddLinearComponent(
+      {rect_origin.x + radii.top_left.x, rect_origin.y},
+      {rect_origin.x + rect_size.width - radii.top_right.x, rect_origin.y});
 
   //----------------------------------------------------------------------------
   // Top right arc.
   //
-  prototype_.AddCubicComponent(
-      {rect.origin.x + rect.size.width - radii.top_right.x, rect.origin.y},
-      {rect.origin.x + rect.size.width - radii.top_right.x + magic_top_right.x,
-       rect.origin.y},
-      {rect.origin.x + rect.size.width,
-       rect.origin.y + radii.top_right.y - magic_top_right.y},
-      {rect.origin.x + rect.size.width, rect.origin.y + radii.top_right.y});
+  AddRoundedRectTopRight(rect, radii);
 
   //----------------------------------------------------------------------------
   // Right line.
   //
-  prototype_.AddLinearComponent(
-      {rect.origin.x + rect.size.width, rect.origin.y + radii.top_right.y},
-      {rect.origin.x + rect.size.width,
-       rect.origin.y + rect.size.height - radii.bottom_right.y});
+  AddLinearComponent(
+      {rect_origin.x + rect_size.width, rect_origin.y + radii.top_right.y},
+      {rect_origin.x + rect_size.width,
+       rect_origin.y + rect_size.height - radii.bottom_right.y});
 
   //----------------------------------------------------------------------------
   // Bottom right arc.
   //
-  prototype_.AddCubicComponent(
-      {rect.origin.x + rect.size.width,
-       rect.origin.y + rect.size.height - radii.bottom_right.y},
-      {rect.origin.x + rect.size.width, rect.origin.y + rect.size.height -
-                                            radii.bottom_right.y +
-                                            magic_bottom_right.y},
-      {rect.origin.x + rect.size.width - radii.bottom_right.x +
-           magic_bottom_right.x,
-       rect.origin.y + rect.size.height},
-      {rect.origin.x + rect.size.width - radii.bottom_right.x,
-       rect.origin.y + rect.size.height});
+  AddRoundedRectBottomRight(rect, radii);
 
   //----------------------------------------------------------------------------
   // Bottom line.
   //
-  prototype_.AddLinearComponent(
-      {rect.origin.x + rect.size.width - radii.bottom_right.x,
-       rect.origin.y + rect.size.height},
-      {rect.origin.x + radii.bottom_left.x, rect.origin.y + rect.size.height});
+  AddLinearComponent(
+      {rect_origin.x + rect_size.width - radii.bottom_right.x,
+       rect_origin.y + rect_size.height},
+      {rect_origin.x + radii.bottom_left.x, rect_origin.y + rect_size.height});
 
   //----------------------------------------------------------------------------
   // Bottom left arc.
   //
-  prototype_.AddCubicComponent(
-      {rect.origin.x + radii.bottom_left.x, rect.origin.y + rect.size.height},
-      {rect.origin.x + radii.bottom_left.x - magic_bottom_left.x,
-       rect.origin.y + rect.size.height},
-      {rect.origin.x, rect.origin.y + rect.size.height - radii.bottom_left.y +
-                          magic_bottom_left.y},
-      {rect.origin.x, rect.origin.y + rect.size.height - radii.bottom_left.y});
+  AddRoundedRectBottomLeft(rect, radii);
 
   //----------------------------------------------------------------------------
   // Left line.
   //
-  prototype_.AddLinearComponent(
-      {rect.origin.x, rect.origin.y + rect.size.height - radii.bottom_left.y},
-      {rect.origin.x, rect.origin.y + radii.top_left.y});
+  AddLinearComponent(
+      {rect_origin.x, rect_origin.y + rect_size.height - radii.bottom_left.y},
+      {rect_origin.x, rect_origin.y + radii.top_left.y});
 
   //----------------------------------------------------------------------------
   // Top left arc.
   //
-  prototype_.AddCubicComponent(
-      {rect.origin.x, rect.origin.y + radii.top_left.y},
-      {rect.origin.x, rect.origin.y + radii.top_left.y - magic_top_left.y},
-      {rect.origin.x + radii.top_left.x - magic_top_left.x, rect.origin.y},
-      {rect.origin.x + radii.top_left.x, rect.origin.y});
+  AddRoundedRectTopLeft(rect, radii);
 
   Close();
 
   return *this;
 }
 
+PathBuilder& PathBuilder::AddRoundedRectTopLeft(Rect rect,
+                                                RoundingRadii radii) {
+  const auto magic_top_left = radii.top_left * kArcApproximationMagic;
+  const auto corner = rect.GetOrigin();
+  AddCubicComponent({corner.x, corner.y + radii.top_left.y},
+                    {corner.x, corner.y + radii.top_left.y - magic_top_left.y},
+                    {corner.x + radii.top_left.x - magic_top_left.x, corner.y},
+                    {corner.x + radii.top_left.x, corner.y});
+  return *this;
+}
+
+PathBuilder& PathBuilder::AddRoundedRectTopRight(Rect rect,
+                                                 RoundingRadii radii) {
+  const auto magic_top_right = radii.top_right * kArcApproximationMagic;
+  const auto corner = rect.GetOrigin() + Point{rect.GetWidth(), 0};
+  AddCubicComponent(
+      {corner.x - radii.top_right.x, corner.y},
+      {corner.x - radii.top_right.x + magic_top_right.x, corner.y},
+      {corner.x, corner.y + radii.top_right.y - magic_top_right.y},
+      {corner.x, corner.y + radii.top_right.y});
+  return *this;
+}
+
+PathBuilder& PathBuilder::AddRoundedRectBottomRight(Rect rect,
+                                                    RoundingRadii radii) {
+  const auto magic_bottom_right = radii.bottom_right * kArcApproximationMagic;
+  const auto corner = rect.GetOrigin() + rect.GetSize();
+  AddCubicComponent(
+      {corner.x, corner.y - radii.bottom_right.y},
+      {corner.x, corner.y - radii.bottom_right.y + magic_bottom_right.y},
+      {corner.x - radii.bottom_right.x + magic_bottom_right.x, corner.y},
+      {corner.x - radii.bottom_right.x, corner.y});
+  return *this;
+}
+
+PathBuilder& PathBuilder::AddRoundedRectBottomLeft(Rect rect,
+                                                   RoundingRadii radii) {
+  const auto magic_bottom_left = radii.bottom_left * kArcApproximationMagic;
+  const auto corner = rect.GetOrigin() + Point{0, rect.GetHeight()};
+  AddCubicComponent(
+      {corner.x + radii.bottom_left.x, corner.y},
+      {corner.x + radii.bottom_left.x - magic_bottom_left.x, corner.y},
+      {corner.x, corner.y - radii.bottom_left.y + magic_bottom_left.y},
+      {corner.x, corner.y - radii.bottom_left.y});
+  return *this;
+}
+
+void PathBuilder::AddContourComponent(const Point& destination,
+                                      bool is_closed) {
+  auto& components = prototype_.components;
+  auto& contours = prototype_.contours;
+  if (components.size() > 0 &&
+      components.back().type == Path::ComponentType::kContour) {
+    // Never insert contiguous contours.
+    contours.back() = ContourComponent(destination, is_closed);
+  } else {
+    contours.emplace_back(ContourComponent(destination, is_closed));
+    components.emplace_back(Path::ComponentType::kContour, contours.size() - 1);
+  }
+  prototype_.bounds.reset();
+}
+
+void PathBuilder::AddLinearComponent(const Point& p1, const Point& p2) {
+  auto& points = prototype_.points;
+  auto index = points.size();
+  points.emplace_back(p1);
+  points.emplace_back(p2);
+  prototype_.components.emplace_back(Path::ComponentType::kLinear, index);
+  prototype_.bounds.reset();
+}
+
+void PathBuilder::AddQuadraticComponent(const Point& p1,
+                                        const Point& cp,
+                                        const Point& p2) {
+  auto& points = prototype_.points;
+  auto index = points.size();
+  points.emplace_back(p1);
+  points.emplace_back(cp);
+  points.emplace_back(p2);
+  prototype_.components.emplace_back(Path::ComponentType::kQuadratic, index);
+  prototype_.bounds.reset();
+}
+
+void PathBuilder::AddCubicComponent(const Point& p1,
+                                    const Point& cp1,
+                                    const Point& cp2,
+                                    const Point& p2) {
+  auto& points = prototype_.points;
+  auto index = points.size();
+  points.emplace_back(p1);
+  points.emplace_back(cp1);
+  points.emplace_back(cp2);
+  points.emplace_back(p2);
+  prototype_.components.emplace_back(Path::ComponentType::kCubic, index);
+  prototype_.bounds.reset();
+}
+
+void PathBuilder::SetContourClosed(bool is_closed) {
+  prototype_.contours.back().is_closed = is_closed;
+}
+
 PathBuilder& PathBuilder::AddArc(const Rect& oval_bounds,
                                  Radians start,
                                  Radians sweep,
@@ -300,10 +321,8 @@ PathBuilder& PathBuilder::AddArc(const Rect& oval_bounds,
   sweep.radians = std::min(k2Pi, sweep.radians);
   start.radians = std::fmod(start.radians, k2Pi);
 
-  const Point radius = {oval_bounds.size.width * 0.5f,
-                        oval_bounds.size.height * 0.5f};
-  const Point center = {oval_bounds.origin.x + radius.x,
-                        oval_bounds.origin.y + radius.y};
+  const Point center = oval_bounds.GetCenter();
+  const Point radius = center - oval_bounds.GetOrigin();
 
   Vector2 p1_unit(std::cos(start.radians), std::sin(start.radians));
 
@@ -334,7 +353,7 @@ PathBuilder& PathBuilder::AddArc(const Rect& oval_bounds,
     Point cp1 = p1 + Vector2(-p1_unit.y, p1_unit.x) * arc_cp_lengths;
     Point cp2 = p2 + Vector2(p2_unit.y, -p2_unit.x) * arc_cp_lengths;
 
-    prototype_.AddCubicComponent(p1, cp1, cp2, p2);
+    AddCubicComponent(p1, cp1, cp2, p2);
     current_ = p2;
 
     start.radians += quadrant_angle;
@@ -350,46 +369,46 @@ PathBuilder& PathBuilder::AddArc(const Rect& oval_bounds,
 }
 
 PathBuilder& PathBuilder::AddOval(const Rect& container) {
-  const Point r = {container.size.width * 0.5f, container.size.height * 0.5f};
-  const Point c = {container.origin.x + r.x, container.origin.y + r.y};
-  const Point m = {kArcApproximationMagic * r.x, kArcApproximationMagic * r.y};
+  const Point c = container.GetCenter();
+  const Point r = c - container.GetOrigin();
+  const Point m = r * kArcApproximationMagic;
 
   MoveTo({c.x, c.y - r.y});
 
   //----------------------------------------------------------------------------
   // Top right arc.
   //
-  prototype_.AddCubicComponent({c.x, c.y - r.y},        // p1
-                               {c.x + m.x, c.y - r.y},  // cp1
-                               {c.x + r.x, c.y - m.y},  // cp2
-                               {c.x + r.x, c.y}         // p2
+  AddCubicComponent({c.x, c.y - r.y},        // p1
+                    {c.x + m.x, c.y - r.y},  // cp1
+                    {c.x + r.x, c.y - m.y},  // cp2
+                    {c.x + r.x, c.y}         // p2
   );
 
   //----------------------------------------------------------------------------
   // Bottom right arc.
   //
-  prototype_.AddCubicComponent({c.x + r.x, c.y},        // p1
-                               {c.x + r.x, c.y + m.y},  // cp1
-                               {c.x + m.x, c.y + r.y},  // cp2
-                               {c.x, c.y + r.y}         // p2
+  AddCubicComponent({c.x + r.x, c.y},        // p1
+                    {c.x + r.x, c.y + m.y},  // cp1
+                    {c.x + m.x, c.y + r.y},  // cp2
+                    {c.x, c.y + r.y}         // p2
   );
 
   //----------------------------------------------------------------------------
   // Bottom left arc.
   //
-  prototype_.AddCubicComponent({c.x, c.y + r.y},        // p1
-                               {c.x - m.x, c.y + r.y},  // cp1
-                               {c.x - r.x, c.y + m.y},  // cp2
-                               {c.x - r.x, c.y}         // p2
+  AddCubicComponent({c.x, c.y + r.y},        // p1
+                    {c.x - m.x, c.y + r.y},  // cp1
+                    {c.x - r.x, c.y + m.y},  // cp2
+                    {c.x - r.x, c.y}         // p2
   );
 
   //----------------------------------------------------------------------------
   // Top left arc.
   //
-  prototype_.AddCubicComponent({c.x - r.x, c.y},        // p1
-                               {c.x - r.x, c.y - m.y},  // cp1
-                               {c.x - m.x, c.y - r.y},  // cp2
-                               {c.x, c.y - r.y}         // p2
+  AddCubicComponent({c.x - r.x, c.y},        // p1
+                    {c.x - r.x, c.y - m.y},  // cp1
+                    {c.x - m.x, c.y - r.y},  // cp2
+                    {c.x, c.y - r.y}         // p2
   );
 
   Close();
@@ -399,29 +418,116 @@ PathBuilder& PathBuilder::AddOval(const Rect& container) {
 
 PathBuilder& PathBuilder::AddLine(const Point& p1, const Point& p2) {
   MoveTo(p1);
-  prototype_.AddLinearComponent(p1, p2);
+  AddLinearComponent(p1, p2);
   return *this;
 }
 
-const Path& PathBuilder::GetCurrentPath() const {
-  return prototype_;
-}
-
 PathBuilder& PathBuilder::AddPath(const Path& path) {
   auto linear = [&](size_t index, const LinearPathComponent& l) {
-    prototype_.AddLinearComponent(l.p1, l.p2);
+    AddLinearComponent(l.p1, l.p2);
   };
   auto quadratic = [&](size_t index, const QuadraticPathComponent& q) {
-    prototype_.AddQuadraticComponent(q.p1, q.cp, q.p2);
+    AddQuadraticComponent(q.p1, q.cp, q.p2);
   };
   auto cubic = [&](size_t index, const CubicPathComponent& c) {
-    prototype_.AddCubicComponent(c.p1, c.cp1, c.cp2, c.p2);
+    AddCubicComponent(c.p1, c.cp1, c.cp2, c.p2);
   };
   auto move = [&](size_t index, const ContourComponent& m) {
-    prototype_.AddContourComponent(m.destination);
+    AddContourComponent(m.destination);
   };
   path.EnumerateComponents(linear, quadratic, cubic, move);
   return *this;
 }
 
+PathBuilder& PathBuilder::Shift(Point offset) {
+  for (auto& point : prototype_.points) {
+    point += offset;
+  }
+  for (auto& contour : prototype_.contours) {
+    contour.destination += offset;
+  }
+  prototype_.bounds.reset();
+  return *this;
+}
+
+PathBuilder& PathBuilder::SetBounds(Rect bounds) {
+  prototype_.bounds = bounds;
+  return *this;
+}
+
+void PathBuilder::UpdateBounds() {
+  if (!prototype_.bounds.has_value()) {
+    auto min_max = GetMinMaxCoveragePoints();
+    if (!min_max.has_value()) {
+      prototype_.bounds.reset();
+      return;
+    }
+    auto min = min_max->first;
+    auto max = min_max->second;
+    const auto difference = max - min;
+    prototype_.bounds =
+        Rect::MakeXYWH(min.x, min.y, difference.x, difference.y);
+  }
+}
+
+std::optional<std::pair<Point, Point>> PathBuilder::GetMinMaxCoveragePoints()
+    const {
+  auto& points = prototype_.points;
+
+  if (points.empty()) {
+    return std::nullopt;
+  }
+
+  std::optional<Point> min, max;
+
+  auto clamp = [&min, &max](const Point& point) {
+    if (min.has_value()) {
+      min = min->Min(point);
+    } else {
+      min = point;
+    }
+
+    if (max.has_value()) {
+      max = max->Max(point);
+    } else {
+      max = point;
+    }
+  };
+
+  for (const auto& component : prototype_.components) {
+    switch (component.type) {
+      case Path::ComponentType::kLinear: {
+        auto* linear = reinterpret_cast<const LinearPathComponent*>(
+            &points[component.index]);
+        clamp(linear->p1);
+        clamp(linear->p2);
+        break;
+      }
+      case Path::ComponentType::kQuadratic:
+        for (const auto& extrema :
+             reinterpret_cast<const QuadraticPathComponent*>(
+                 &points[component.index])
+                 ->Extrema()) {
+          clamp(extrema);
+        }
+        break;
+      case Path::ComponentType::kCubic:
+        for (const auto& extrema : reinterpret_cast<const CubicPathComponent*>(
+                                       &points[component.index])
+                                       ->Extrema()) {
+          clamp(extrema);
+        }
+        break;
+      case Path::ComponentType::kContour:
+        break;
+    }
+  }
+
+  if (!min.has_value() || !max.has_value()) {
+    return std::nullopt;
+  }
+
+  return std::make_pair(min.value(), max.value());
+}
+
 }  // namespace impeller
diff --git a/impeller/geometry/path_builder.h b/impeller/geometry/path_builder.h
index 13e9240d68600d8a1ac77572e3a176f824e035a9..0907b7b67f0f4706e572278d1202e001fb5569b9 100644
--- a/impeller/geometry/path_builder.h
+++ b/impeller/geometry/path_builder.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_GEOMETRY_PATH_BUILDER_H_
+#define FLUTTER_IMPELLER_GEOMETRY_PATH_BUILDER_H_
 
 #include "impeller/geometry/path.h"
 #include "impeller/geometry/rect.h"
@@ -19,43 +20,54 @@ class PathBuilder {
   /// the angle. However, accuracy rapidly diminishes if magnified for obtuse
   /// angle arcs, and so multiple cubic curves should be used when approximating
   /// arcs greater than 90 degrees.
-  constexpr static const Scalar kArcApproximationMagic = 0.551915024494;
+  constexpr static const Scalar kArcApproximationMagic = 0.551915024494f;
 
   PathBuilder();
 
   ~PathBuilder();
 
-  Path CopyPath(FillType fill = FillType::kNonZero) const;
+  Path CopyPath(FillType fill = FillType::kNonZero);
 
   Path TakePath(FillType fill = FillType::kNonZero);
 
-  const Path& GetCurrentPath() const;
+  /// @brief Reserve [point_size] points and [verb_size] verbs in the underlying
+  ///        path buffer.
+  void Reserve(size_t point_size, size_t verb_size);
+
+  PathBuilder& SetConvexity(Convexity value);
 
   PathBuilder& MoveTo(Point point, bool relative = false);
 
   PathBuilder& Close();
 
+  /// @brief Insert a line from the current position to `point`.
+  ///
+  /// If `relative` is true, then `point` is relative to the current location.
   PathBuilder& LineTo(Point point, bool relative = false);
 
   PathBuilder& HorizontalLineTo(Scalar x, bool relative = false);
 
   PathBuilder& VerticalLineTo(Scalar y, bool relative = false);
 
+  /// @brief Insert a quadradic curve from the current position to `point` using
+  /// the control point `controlPoint`.
+  ///
+  /// If `relative` is true the `point` and `controlPoint` are relative to
+  /// current location.
   PathBuilder& QuadraticCurveTo(Point controlPoint,
                                 Point point,
                                 bool relative = false);
 
-  PathBuilder& SmoothQuadraticCurveTo(Point point, bool relative = false);
-
+  /// @brief Insert a cubic curve from the curren position to `point` using the
+  /// control points `controlPoint1` and `controlPoint2`.
+  ///
+  /// If `relative` is true the `point`, `controlPoint1`, and `controlPoint2`
+  /// are relative to current location.
   PathBuilder& CubicCurveTo(Point controlPoint1,
                             Point controlPoint2,
                             Point point,
                             bool relative = false);
 
-  PathBuilder& SmoothCubicCurveTo(Point controlPoint2,
-                                  Point point,
-                                  bool relative = false);
-
   PathBuilder& AddRect(Rect rect);
 
   PathBuilder& AddCircle(const Point& center, Scalar radius);
@@ -67,12 +79,29 @@ class PathBuilder {
 
   PathBuilder& AddOval(const Rect& rect);
 
+  /// @brief Move to point `p1`, then insert a line from `p1` to `p2`.
   PathBuilder& AddLine(const Point& p1, const Point& p2);
 
+  /// @brief Move to point `p1`, then insert a quadradic curve from `p1` to `p2`
+  /// with the control point `cp`.
   PathBuilder& AddQuadraticCurve(Point p1, Point cp, Point p2);
 
+  /// @brief Move to point `p1`, then insert a cubic curve from `p1` to `p2`
+  /// with control points `cp1` and `cp2`.
   PathBuilder& AddCubicCurve(Point p1, Point cp1, Point cp2, Point p2);
 
+  /// @brief Transform the existing path segments and contours by the given
+  /// `offset`.
+  PathBuilder& Shift(Point offset);
+
+  /// @brief Set the bounding box that will be used by `Path.GetBoundingBox` in
+  /// place of performing the computation.
+  ///
+  ///        When Impeller recieves Skia Path objects, many of these already
+  ///        have computed bounds. This method is used to avoid needlessly
+  ///        recomputing these bounds.
+  PathBuilder& SetBounds(Rect bounds);
+
   struct RoundingRadii {
     Point top_left;
     Point bottom_left;
@@ -90,6 +119,24 @@ class PathBuilder {
           top_right(p_top_right, p_top_right),
           bottom_right(p_bottom_right, p_bottom_right) {}
 
+    explicit RoundingRadii(Scalar radius)
+        : top_left(radius, radius),
+          bottom_left(radius, radius),
+          top_right(radius, radius),
+          bottom_right(radius, radius) {}
+
+    explicit RoundingRadii(Point radii)
+        : top_left(radii),
+          bottom_left(radii),
+          top_right(radii),
+          bottom_right(radii) {}
+
+    explicit RoundingRadii(Size radii)
+        : top_left(radii),
+          bottom_left(radii),
+          top_right(radii),
+          bottom_right(radii) {}
+
     bool AreAllZero() const {
       return top_left.IsZero() &&     //
              bottom_left.IsZero() &&  //
@@ -100,6 +147,8 @@ class PathBuilder {
 
   PathBuilder& AddRoundedRect(Rect rect, RoundingRadii radii);
 
+  PathBuilder& AddRoundedRect(Rect rect, Size radii);
+
   PathBuilder& AddRoundedRect(Rect rect, Scalar radius);
 
   PathBuilder& AddPath(const Path& path);
@@ -107,14 +156,40 @@ class PathBuilder {
  private:
   Point subpath_start_;
   Point current_;
-  Path prototype_;
+  Path::Data prototype_;
+
+  PathBuilder& AddRoundedRectTopLeft(Rect rect, RoundingRadii radii);
 
-  Point ReflectedQuadraticControlPoint1() const;
+  PathBuilder& AddRoundedRectTopRight(Rect rect, RoundingRadii radii);
 
-  Point ReflectedCubicControlPoint1() const;
+  PathBuilder& AddRoundedRectBottomRight(Rect rect, RoundingRadii radii);
+
+  PathBuilder& AddRoundedRectBottomLeft(Rect rect, RoundingRadii radii);
+
+  void AddContourComponent(const Point& destination, bool is_closed = false);
+
+  void SetContourClosed(bool is_closed);
+
+  void AddLinearComponent(const Point& p1, const Point& p2);
+
+  void AddQuadraticComponent(const Point& p1, const Point& cp, const Point& p2);
+
+  void AddCubicComponent(const Point& p1,
+                         const Point& cp1,
+                         const Point& cp2,
+                         const Point& p2);
+
+  /// Compute the bounds of the path unless they are already computed or
+  /// set by an external source, such as |SetBounds|. Any call which mutates
+  /// the path data can invalidate the computed/set bounds.
+  void UpdateBounds();
+
+  std::optional<std::pair<Point, Point>> GetMinMaxCoveragePoints() const;
 
   PathBuilder(const PathBuilder&) = delete;
   PathBuilder& operator=(const PathBuilder&&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_GEOMETRY_PATH_BUILDER_H_
diff --git a/impeller/geometry/path_component.cc b/impeller/geometry/path_component.cc
index 669fa4eaee0ffab2c760eca814e54223dec955a8..55a456570841768f99dfdbc692336f4a9b95de11 100644
--- a/impeller/geometry/path_component.cc
+++ b/impeller/geometry/path_component.cc
@@ -8,8 +8,6 @@
 
 namespace impeller {
 
-PathComponent::~PathComponent() = default;
-
 /*
  *  Based on: https://en.wikipedia.org/wiki/B%C3%A9zier_curve#Specific_cases
  */
@@ -61,8 +59,11 @@ Point LinearPathComponent::Solve(Scalar time) const {
   };
 }
 
-std::vector<Point> LinearPathComponent::CreatePolyline() const {
-  return {p2};
+void LinearPathComponent::AppendPolylinePoints(
+    std::vector<Point>& points) const {
+  if (points.size() == 0 || points.back() != p2) {
+    points.push_back(p2);
+  }
 }
 
 std::vector<Point> LinearPathComponent::Extrema() const {
@@ -70,10 +71,16 @@ std::vector<Point> LinearPathComponent::Extrema() const {
 }
 
 std::optional<Vector2> LinearPathComponent::GetStartDirection() const {
+  if (p1 == p2) {
+    return std::nullopt;
+  }
   return (p1 - p2).Normalize();
 }
 
 std::optional<Vector2> LinearPathComponent::GetEndDirection() const {
+  if (p1 == p2) {
+    return std::nullopt;
+  }
   return (p2 - p1).Normalize();
 }
 
@@ -96,15 +103,18 @@ static Scalar ApproximateParabolaIntegral(Scalar x) {
   return x / (1.0 - d + sqrt(sqrt(pow(d, 4) + 0.25 * x * x)));
 }
 
-std::vector<Point> QuadraticPathComponent::CreatePolyline(
-    Scalar tolerance) const {
-  std::vector<Point> points;
-  FillPointsForPolyline(points, tolerance);
-  return points;
+void QuadraticPathComponent::AppendPolylinePoints(
+    Scalar scale_factor,
+    std::vector<Point>& points) const {
+  ToLinearPathComponents(scale_factor, [&points](const Point& point) {
+    points.emplace_back(point);
+  });
 }
 
-void QuadraticPathComponent::FillPointsForPolyline(std::vector<Point>& points,
-                                                   Scalar tolerance) const {
+void QuadraticPathComponent::ToLinearPathComponents(
+    Scalar scale_factor,
+    const PointProc& proc) const {
+  auto tolerance = kDefaultCurveTolerance / scale_factor;
   auto sqrt_tolerance = sqrt(tolerance);
 
   auto d01 = cp - p1;
@@ -113,13 +123,13 @@ void QuadraticPathComponent::FillPointsForPolyline(std::vector<Point>& points,
   auto cross = (p2 - p1).Cross(dd);
   auto x0 = d01.Dot(dd) * 1 / cross;
   auto x2 = d12.Dot(dd) * 1 / cross;
-  auto scale = abs(cross / (hypot(dd.x, dd.y) * (x2 - x0)));
+  auto scale = std::abs(cross / (hypot(dd.x, dd.y) * (x2 - x0)));
 
   auto a0 = ApproximateParabolaIntegral(x0);
   auto a2 = ApproximateParabolaIntegral(x2);
   Scalar val = 0.f;
   if (std::isfinite(scale)) {
-    auto da = abs(a2 - a0);
+    auto da = std::abs(a2 - a0);
     auto sqrt_scale = sqrt(scale);
     if ((x0 < 0 && x2 < 0) || (x0 >= 0 && x2 >= 0)) {
       val = da * sqrt_scale;
@@ -139,9 +149,9 @@ void QuadraticPathComponent::FillPointsForPolyline(std::vector<Point>& points,
     auto u = i * step;
     auto a = a0 + (a2 - a0) * u;
     auto t = (ApproximateParabolaIntegral(a) - u0) * uscale;
-    points.emplace_back(Solve(t));
+    proc(Solve(t));
   }
-  points.emplace_back(p2);
+  proc(p2);
 }
 
 std::vector<Point> QuadraticPathComponent::Extrema() const {
@@ -150,11 +160,23 @@ std::vector<Point> QuadraticPathComponent::Extrema() const {
 }
 
 std::optional<Vector2> QuadraticPathComponent::GetStartDirection() const {
-  return (p1 - cp).Normalize();
+  if (p1 != cp) {
+    return (p1 - cp).Normalize();
+  }
+  if (p1 != p2) {
+    return (p1 - p2).Normalize();
+  }
+  return std::nullopt;
 }
 
 std::optional<Vector2> QuadraticPathComponent::GetEndDirection() const {
-  return (p2 - cp).Normalize();
+  if (p2 != cp) {
+    return (p2 - cp).Normalize();
+  }
+  if (p2 != p1) {
+    return (p2 - p1).Normalize();
+  }
+  return std::nullopt;
 }
 
 Point CubicPathComponent::Solve(Scalar time) const {
@@ -171,13 +193,11 @@ Point CubicPathComponent::SolveDerivative(Scalar time) const {
   };
 }
 
-std::vector<Point> CubicPathComponent::CreatePolyline(Scalar tolerance) const {
-  auto quads = ToQuadraticPathComponents(.1);
-  std::vector<Point> points;
-  for (const auto& quad : quads) {
-    quad.FillPointsForPolyline(points, tolerance);
-  }
-  return points;
+void CubicPathComponent::AppendPolylinePoints(
+    Scalar scale,
+    std::vector<Point>& points) const {
+  ToLinearPathComponents(
+      scale, [&points](const Point& point) { points.emplace_back(point); });
 }
 
 inline QuadraticPathComponent CubicPathComponent::Lower() const {
@@ -195,9 +215,9 @@ CubicPathComponent CubicPathComponent::Subsegment(Scalar t0, Scalar t1) const {
   return CubicPathComponent(p0, p1, p2, p3);
 }
 
-std::vector<QuadraticPathComponent>
-CubicPathComponent::ToQuadraticPathComponents(Scalar accuracy) const {
-  std::vector<QuadraticPathComponent> quads;
+void CubicPathComponent::ToLinearPathComponents(Scalar scale,
+                                                const PointProc& proc) const {
+  constexpr Scalar accuracy = 0.1;
   // The maximum error, as a vector from the cubic to the best approximating
   // quadratic, is proportional to the third derivative, which is constant
   // across the segment. Thus, the error scales down as the third power of
@@ -215,17 +235,15 @@ CubicPathComponent::ToQuadraticPathComponents(Scalar accuracy) const {
   auto p = p2x2 - p1x2;
   auto err = p.Dot(p);
   auto quad_count = std::max(1., ceil(pow(err / max_hypot2, 1. / 6.0)));
-
   for (size_t i = 0; i < quad_count; i++) {
     auto t0 = i / quad_count;
     auto t1 = (i + 1) / quad_count;
     auto seg = Subsegment(t0, t1);
     auto p1x2 = 3.0 * seg.cp1 - seg.p1;
     auto p2x2 = 3.0 * seg.cp2 - seg.p2;
-    quads.emplace_back(
-        QuadraticPathComponent(seg.p1, ((p1x2 + p2x2) / 4.0), seg.p2));
+    QuadraticPathComponent(seg.p1, ((p1x2 + p2x2) / 4.0), seg.p2)
+        .ToLinearPathComponents(scale, proc);
   }
-  return quads;
 }
 
 static inline bool NearEqual(Scalar a, Scalar b, Scalar epsilon) {
@@ -268,15 +286,23 @@ static void CubicPathBoundingPopulateValues(std::vector<Scalar>& values,
 
   Scalar rootB2Minus4AC = ::sqrt(b2Minus4AC);
 
+  /* From Numerical Recipes in C.
+   *
+   * q = -1/2 (b + sign(b) sqrt[b^2 - 4ac])
+   * x1 = q / a
+   * x2 = c / q
+   */
+  Scalar q = (b < 0) ? -(b - rootB2Minus4AC) / 2 : -(b + rootB2Minus4AC) / 2;
+
   {
-    Scalar t = (-b + rootB2Minus4AC) / (2.0 * a);
+    Scalar t = q / a;
     if (t >= 0.0 && t <= 1.0) {
       values.emplace_back(t);
     }
   }
 
   {
-    Scalar t = (-b - rootB2Minus4AC) / (2.0 * a);
+    Scalar t = c / q;
     if (t >= 0.0 && t <= 1.0) {
       values.emplace_back(t);
     }
@@ -302,11 +328,77 @@ std::vector<Point> CubicPathComponent::Extrema() const {
 }
 
 std::optional<Vector2> CubicPathComponent::GetStartDirection() const {
-  return (p1 - cp1).Normalize();
+  if (p1 != cp1) {
+    return (p1 - cp1).Normalize();
+  }
+  if (p1 != cp2) {
+    return (p1 - cp2).Normalize();
+  }
+  if (p1 != p2) {
+    return (p1 - p2).Normalize();
+  }
+  return std::nullopt;
 }
 
 std::optional<Vector2> CubicPathComponent::GetEndDirection() const {
-  return (p2 - cp2).Normalize();
+  if (p2 != cp2) {
+    return (p2 - cp2).Normalize();
+  }
+  if (p2 != cp1) {
+    return (p2 - cp1).Normalize();
+  }
+  if (p2 != p1) {
+    return (p2 - p1).Normalize();
+  }
+  return std::nullopt;
+}
+
+std::optional<Vector2> PathComponentStartDirectionVisitor::operator()(
+    const LinearPathComponent* component) {
+  if (!component) {
+    return std::nullopt;
+  }
+  return component->GetStartDirection();
+}
+
+std::optional<Vector2> PathComponentStartDirectionVisitor::operator()(
+    const QuadraticPathComponent* component) {
+  if (!component) {
+    return std::nullopt;
+  }
+  return component->GetStartDirection();
+}
+
+std::optional<Vector2> PathComponentStartDirectionVisitor::operator()(
+    const CubicPathComponent* component) {
+  if (!component) {
+    return std::nullopt;
+  }
+  return component->GetStartDirection();
+}
+
+std::optional<Vector2> PathComponentEndDirectionVisitor::operator()(
+    const LinearPathComponent* component) {
+  if (!component) {
+    return std::nullopt;
+  }
+  return component->GetEndDirection();
+}
+
+std::optional<Vector2> PathComponentEndDirectionVisitor::operator()(
+    const QuadraticPathComponent* component) {
+  if (!component) {
+    return std::nullopt;
+  }
+  return component->GetEndDirection();
+}
+
+std::optional<Vector2> PathComponentEndDirectionVisitor::operator()(
+    const CubicPathComponent* component) {
+  if (!component) {
+    return std::nullopt;
+  }
+  return component->GetEndDirection();
 }
 
 }  // namespace impeller
diff --git a/impeller/geometry/path_component.h b/impeller/geometry/path_component.h
index 2871192cc618ab869e3a7bae3ab24fd7730f254c..58aa1f9f835305bf7e242eb9121c87432ac64ac0 100644
--- a/impeller/geometry/path_component.h
+++ b/impeller/geometry/path_component.h
@@ -2,8 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_GEOMETRY_PATH_COMPONENT_H_
+#define FLUTTER_IMPELLER_GEOMETRY_PATH_COMPONENT_H_
 
+#include <functional>
+#include <type_traits>
+#include <variant>
 #include <vector>
 
 #include "impeller/geometry/point.h"
@@ -12,9 +16,9 @@
 
 namespace impeller {
 
-// The default tolerance value for QuadraticCurveComponent::CreatePolyline and
-// CubicCurveComponent::CreatePolyline. It also impacts the number of quadratics
-// created when flattening a cubic curve to a polyline.
+// The default tolerance value for QuadraticCurveComponent::AppendPolylinePoints
+// and CubicCurveComponent::AppendPolylinePoints. It also impacts the number of
+// quadratics created when flattening a cubic curve to a polyline.
 //
 // Smaller numbers mean more points. This number seems suitable for particularly
 // curvy curves at scales close to 1.0. As the scale increases, this number
@@ -22,14 +26,7 @@ namespace impeller {
 // points for the given scale.
 static constexpr Scalar kDefaultCurveTolerance = .1f;
 
-struct PathComponent {
-  virtual ~PathComponent();
-
-  virtual std::optional<Vector2> GetStartDirection() const = 0;
-  virtual std::optional<Vector2> GetEndDirection() const = 0;
-};
-
-struct LinearPathComponent : public PathComponent {
+struct LinearPathComponent {
   Point p1;
   Point p2;
 
@@ -39,7 +36,7 @@ struct LinearPathComponent : public PathComponent {
 
   Point Solve(Scalar time) const;
 
-  std::vector<Point> CreatePolyline() const;
+  void AppendPolylinePoints(std::vector<Point>& points) const;
 
   std::vector<Point> Extrema() const;
 
@@ -47,14 +44,18 @@ struct LinearPathComponent : public PathComponent {
     return p1 == other.p1 && p2 == other.p2;
   }
 
-  std::optional<Vector2> GetStartDirection() const override;
+  std::optional<Vector2> GetStartDirection() const;
 
-  std::optional<Vector2> GetEndDirection() const override;
+  std::optional<Vector2> GetEndDirection() const;
 };
 
-struct QuadraticPathComponent : public PathComponent {
+// A component that represets a Quadratic Bézier curve.
+struct QuadraticPathComponent {
+  // Start point.
   Point p1;
+  // Control point.
   Point cp;
+  // End point.
   Point p2;
 
   QuadraticPathComponent() {}
@@ -76,11 +77,12 @@ struct QuadraticPathComponent : public PathComponent {
   //   making it trivially parallelizable.
   //
   // See also the implementation in kurbo: https://github.com/linebender/kurbo.
-  std::vector<Point> CreatePolyline(
-      Scalar tolerance = kDefaultCurveTolerance) const;
+  void AppendPolylinePoints(Scalar scale_factor,
+                            std::vector<Point>& points) const;
+
+  using PointProc = std::function<void(const Point& point)>;
 
-  void FillPointsForPolyline(std::vector<Point>& points,
-                             Scalar tolerance = kDefaultCurveTolerance) const;
+  void ToLinearPathComponents(Scalar scale_factor, const PointProc& proc) const;
 
   std::vector<Point> Extrema() const;
 
@@ -88,20 +90,25 @@ struct QuadraticPathComponent : public PathComponent {
     return p1 == other.p1 && cp == other.cp && p2 == other.p2;
   }
 
-  std::optional<Vector2> GetStartDirection() const override;
+  std::optional<Vector2> GetStartDirection() const;
 
-  std::optional<Vector2> GetEndDirection() const override;
+  std::optional<Vector2> GetEndDirection() const;
 };
 
-struct CubicPathComponent : public PathComponent {
+// A component that represets a Cubic Bézier curve.
+struct CubicPathComponent {
+  // Start point.
   Point p1;
+  // The first control point.
   Point cp1;
+  // The second control point.
   Point cp2;
+  // End point.
   Point p2;
 
   CubicPathComponent() {}
 
-  CubicPathComponent(const QuadraticPathComponent& q)
+  explicit CubicPathComponent(const QuadraticPathComponent& q)
       : p1(q.p1),
         cp1(q.p1 + (q.cp - q.p1) * (2.0 / 3.0)),
         cp2(q.p2 + (q.cp - q.p2) * (2.0 / 3.0)),
@@ -117,14 +124,15 @@ struct CubicPathComponent : public PathComponent {
   // This method approximates the cubic component with quadratics, and then
   // generates a polyline from those quadratics.
   //
-  // See the note on QuadraticPathComponent::CreatePolyline for references.
-  std::vector<Point> CreatePolyline(
-      Scalar tolerance = kDefaultCurveTolerance) const;
+  // See the note on QuadraticPathComponent::AppendPolylinePoints for
+  // references.
+  void AppendPolylinePoints(Scalar scale, std::vector<Point>& points) const;
 
   std::vector<Point> Extrema() const;
 
-  std::vector<QuadraticPathComponent> ToQuadraticPathComponents(
-      Scalar accuracy) const;
+  using PointProc = std::function<void(const Point& point)>;
+
+  void ToLinearPathComponents(Scalar scale, const PointProc& proc) const;
 
   CubicPathComponent Subsegment(Scalar t0, Scalar t1) const;
 
@@ -133,9 +141,9 @@ struct CubicPathComponent : public PathComponent {
            p2 == other.p2;
   }
 
-  std::optional<Vector2> GetStartDirection() const override;
+  std::optional<Vector2> GetStartDirection() const;
 
-  std::optional<Vector2> GetEndDirection() const override;
+  std::optional<Vector2> GetEndDirection() const;
 
  private:
   QuadraticPathComponent Lower() const;
@@ -147,7 +155,7 @@ struct ContourComponent {
 
   ContourComponent() {}
 
-  ContourComponent(Point p, bool is_closed = false)
+  explicit ContourComponent(Point p, bool is_closed = false)
       : destination(p), is_closed(is_closed) {}
 
   bool operator==(const ContourComponent& other) const {
@@ -155,4 +163,33 @@ struct ContourComponent {
   }
 };
 
+using PathComponentVariant = std::variant<std::monostate,
+                                          const LinearPathComponent*,
+                                          const QuadraticPathComponent*,
+                                          const CubicPathComponent*>;
+
+struct PathComponentStartDirectionVisitor {
+  std::optional<Vector2> operator()(const LinearPathComponent* component);
+  std::optional<Vector2> operator()(const QuadraticPathComponent* component);
+  std::optional<Vector2> operator()(const CubicPathComponent* component);
+  std::optional<Vector2> operator()(std::monostate monostate) {
+    return std::nullopt;
+  }
+};
+
+struct PathComponentEndDirectionVisitor {
+  std::optional<Vector2> operator()(const LinearPathComponent* component);
+  std::optional<Vector2> operator()(const QuadraticPathComponent* component);
+  std::optional<Vector2> operator()(const CubicPathComponent* component);
+  std::optional<Vector2> operator()(std::monostate monostate) {
+    return std::nullopt;
+  }
+};
+
+static_assert(!std::is_polymorphic<LinearPathComponent>::value);
+static_assert(!std::is_polymorphic<QuadraticPathComponent>::value);
+static_assert(!std::is_polymorphic<CubicPathComponent>::value);
+
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_GEOMETRY_PATH_COMPONENT_H_
diff --git a/impeller/geometry/path_unittests.cc b/impeller/geometry/path_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..6ffd69a1de56a77c2f1cb6f2f1540dc71f9a7878
--- /dev/null
+++ b/impeller/geometry/path_unittests.cc
@@ -0,0 +1,690 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "gtest/gtest.h"
+
+#include "flutter/testing/testing.h"
+#include "impeller/geometry/geometry_asserts.h"
+#include "impeller/geometry/path.h"
+#include "impeller/geometry/path_builder.h"
+
+namespace impeller {
+namespace testing {
+
+TEST(PathTest, CubicPathComponentPolylineDoesNotIncludePointOne) {
+  CubicPathComponent component({10, 10}, {20, 35}, {35, 20}, {40, 40});
+  std::vector<Point> polyline;
+  component.AppendPolylinePoints(1.0f, polyline);
+  ASSERT_NE(polyline.front().x, 10);
+  ASSERT_NE(polyline.front().y, 10);
+  ASSERT_EQ(polyline.back().x, 40);
+  ASSERT_EQ(polyline.back().y, 40);
+}
+
+TEST(PathTest, PathCreatePolyLineDoesNotDuplicatePoints) {
+  PathBuilder builder;
+  builder.MoveTo({10, 10});
+  builder.LineTo({20, 20});
+  builder.LineTo({30, 30});
+  builder.MoveTo({40, 40});
+  builder.LineTo({50, 50});
+
+  auto polyline = builder.TakePath().CreatePolyline(1.0f);
+
+  ASSERT_EQ(polyline.contours.size(), 2u);
+  ASSERT_EQ(polyline.points->size(), 5u);
+  ASSERT_EQ(polyline.GetPoint(0).x, 10);
+  ASSERT_EQ(polyline.GetPoint(1).x, 20);
+  ASSERT_EQ(polyline.GetPoint(2).x, 30);
+  ASSERT_EQ(polyline.GetPoint(3).x, 40);
+  ASSERT_EQ(polyline.GetPoint(4).x, 50);
+}
+
+TEST(PathTest, PathBuilderSetsCorrectContourPropertiesForAddCommands) {
+  // Closed shapes.
+  {
+    Path path = PathBuilder{}.AddCircle({100, 100}, 50).TakePath();
+    ContourComponent contour;
+    path.GetContourComponentAtIndex(0, contour);
+    ASSERT_POINT_NEAR(contour.destination, Point(100, 50));
+    ASSERT_TRUE(contour.is_closed);
+  }
+
+  {
+    Path path =
+        PathBuilder{}.AddOval(Rect::MakeXYWH(100, 100, 100, 100)).TakePath();
+    ContourComponent contour;
+    path.GetContourComponentAtIndex(0, contour);
+    ASSERT_POINT_NEAR(contour.destination, Point(150, 100));
+    ASSERT_TRUE(contour.is_closed);
+  }
+
+  {
+    Path path =
+        PathBuilder{}.AddRect(Rect::MakeXYWH(100, 100, 100, 100)).TakePath();
+    ContourComponent contour;
+    path.GetContourComponentAtIndex(0, contour);
+    ASSERT_POINT_NEAR(contour.destination, Point(100, 100));
+    ASSERT_TRUE(contour.is_closed);
+  }
+
+  {
+    Path path = PathBuilder{}
+                    .AddRoundedRect(Rect::MakeXYWH(100, 100, 100, 100), 10)
+                    .TakePath();
+    ContourComponent contour;
+    path.GetContourComponentAtIndex(0, contour);
+    ASSERT_POINT_NEAR(contour.destination, Point(110, 100));
+    ASSERT_TRUE(contour.is_closed);
+  }
+
+  {
+    Path path =
+        PathBuilder{}
+            .AddRoundedRect(Rect::MakeXYWH(100, 100, 100, 100), Size(10, 20))
+            .TakePath();
+    ContourComponent contour;
+    path.GetContourComponentAtIndex(0, contour);
+    ASSERT_POINT_NEAR(contour.destination, Point(110, 100));
+    ASSERT_TRUE(contour.is_closed);
+  }
+
+  // Open shapes.
+  {
+    Point p(100, 100);
+    Path path = PathBuilder{}.AddLine(p, {200, 100}).TakePath();
+    ContourComponent contour;
+    path.GetContourComponentAtIndex(0, contour);
+    ASSERT_POINT_NEAR(contour.destination, p);
+    ASSERT_FALSE(contour.is_closed);
+  }
+
+  {
+    Path path =
+        PathBuilder{}
+            .AddCubicCurve({100, 100}, {100, 50}, {100, 150}, {200, 100})
+            .TakePath();
+    ContourComponent contour;
+    path.GetContourComponentAtIndex(0, contour);
+    ASSERT_POINT_NEAR(contour.destination, Point(100, 100));
+    ASSERT_FALSE(contour.is_closed);
+  }
+
+  {
+    Path path = PathBuilder{}
+                    .AddQuadraticCurve({100, 100}, {100, 50}, {200, 100})
+                    .TakePath();
+    ContourComponent contour;
+    path.GetContourComponentAtIndex(0, contour);
+    ASSERT_POINT_NEAR(contour.destination, Point(100, 100));
+    ASSERT_FALSE(contour.is_closed);
+  }
+}
+
+TEST(PathTest, PathCreatePolylineGeneratesCorrectContourData) {
+  Path::Polyline polyline = PathBuilder{}
+                                .AddLine({100, 100}, {200, 100})
+                                .MoveTo({100, 200})
+                                .LineTo({150, 250})
+                                .LineTo({200, 200})
+                                .Close()
+                                .TakePath()
+                                .CreatePolyline(1.0f);
+  ASSERT_EQ(polyline.points->size(), 6u);
+  ASSERT_EQ(polyline.contours.size(), 2u);
+  ASSERT_EQ(polyline.contours[0].is_closed, false);
+  ASSERT_EQ(polyline.contours[0].start_index, 0u);
+  ASSERT_EQ(polyline.contours[1].is_closed, true);
+  ASSERT_EQ(polyline.contours[1].start_index, 2u);
+}
+
+TEST(PathTest, PolylineGetContourPointBoundsReturnsCorrectRanges) {
+  Path::Polyline polyline = PathBuilder{}
+                                .AddLine({100, 100}, {200, 100})
+                                .MoveTo({100, 200})
+                                .LineTo({150, 250})
+                                .LineTo({200, 200})
+                                .Close()
+                                .TakePath()
+                                .CreatePolyline(1.0f);
+  size_t a1, a2, b1, b2;
+  std::tie(a1, a2) = polyline.GetContourPointBounds(0);
+  std::tie(b1, b2) = polyline.GetContourPointBounds(1);
+  ASSERT_EQ(a1, 0u);
+  ASSERT_EQ(a2, 2u);
+  ASSERT_EQ(b1, 2u);
+  ASSERT_EQ(b2, 6u);
+}
+
+TEST(PathTest, PathAddRectPolylineHasCorrectContourData) {
+  Path::Polyline polyline = PathBuilder{}
+                                .AddRect(Rect::MakeLTRB(50, 60, 70, 80))
+                                .TakePath()
+                                .CreatePolyline(1.0f);
+  ASSERT_EQ(polyline.contours.size(), 1u);
+  ASSERT_TRUE(polyline.contours[0].is_closed);
+  ASSERT_EQ(polyline.contours[0].start_index, 0u);
+  ASSERT_EQ(polyline.points->size(), 5u);
+  ASSERT_EQ(polyline.GetPoint(0), Point(50, 60));
+  ASSERT_EQ(polyline.GetPoint(1), Point(70, 60));
+  ASSERT_EQ(polyline.GetPoint(2), Point(70, 80));
+  ASSERT_EQ(polyline.GetPoint(3), Point(50, 80));
+  ASSERT_EQ(polyline.GetPoint(4), Point(50, 60));
+}
+
+TEST(PathTest, PathPolylineDuplicatesAreRemovedForSameContour) {
+  Path::Polyline polyline =
+      PathBuilder{}
+          .MoveTo({50, 50})
+          .LineTo({50, 50})  // Insert duplicate at beginning of contour.
+          .LineTo({100, 50})
+          .LineTo({100, 50})  // Insert duplicate at contour join.
+          .LineTo({100, 100})
+          .Close()  // Implicitly insert duplicate {50, 50} across contours.
+          .LineTo({0, 50})
+          .LineTo({0, 100})
+          .LineTo({0, 100})  // Insert duplicate at end of contour.
+          .TakePath()
+          .CreatePolyline(1.0f);
+  ASSERT_EQ(polyline.contours.size(), 2u);
+  ASSERT_EQ(polyline.contours[0].start_index, 0u);
+  ASSERT_TRUE(polyline.contours[0].is_closed);
+  ASSERT_EQ(polyline.contours[1].start_index, 4u);
+  ASSERT_FALSE(polyline.contours[1].is_closed);
+  ASSERT_EQ(polyline.points->size(), 7u);
+  ASSERT_EQ(polyline.GetPoint(0), Point(50, 50));
+  ASSERT_EQ(polyline.GetPoint(1), Point(100, 50));
+  ASSERT_EQ(polyline.GetPoint(2), Point(100, 100));
+  ASSERT_EQ(polyline.GetPoint(3), Point(50, 50));
+  ASSERT_EQ(polyline.GetPoint(4), Point(50, 50));
+  ASSERT_EQ(polyline.GetPoint(5), Point(0, 50));
+  ASSERT_EQ(polyline.GetPoint(6), Point(0, 100));
+}
+
+TEST(PathTest, PolylineBufferReuse) {
+  auto point_buffer = std::make_unique<std::vector<Point>>();
+  auto point_buffer_address = reinterpret_cast<uintptr_t>(point_buffer.get());
+  Path::Polyline polyline =
+      PathBuilder{}
+          .MoveTo({50, 50})
+          .LineTo({100, 100})
+          .TakePath()
+          .CreatePolyline(
+              1.0f, std::move(point_buffer),
+              [point_buffer_address](
+                  Path::Polyline::PointBufferPtr point_buffer) {
+                ASSERT_EQ(point_buffer->size(), 0u);
+                ASSERT_EQ(point_buffer_address,
+                          reinterpret_cast<uintptr_t>(point_buffer.get()));
+              });
+}
+
+TEST(PathTest, PolylineFailsWithNullptrBuffer) {
+  EXPECT_DEATH_IF_SUPPORTED(PathBuilder{}
+                                .MoveTo({50, 50})
+                                .LineTo({100, 100})
+                                .TakePath()
+                                .CreatePolyline(1.0f, nullptr),
+                            "");
+}
+
+TEST(PathTest, PathShifting) {
+  PathBuilder builder{};
+  auto path =
+      builder.AddLine(Point(0, 0), Point(10, 10))
+          .AddQuadraticCurve(Point(10, 10), Point(15, 15), Point(20, 20))
+          .AddCubicCurve(Point(20, 20), Point(25, 25), Point(-5, -5),
+                         Point(30, 30))
+          .Close()
+          .Shift(Point(1, 1))
+          .TakePath();
+
+  ContourComponent contour;
+  LinearPathComponent linear;
+  QuadraticPathComponent quad;
+  CubicPathComponent cubic;
+
+  ASSERT_TRUE(path.GetContourComponentAtIndex(0, contour));
+  ASSERT_TRUE(path.GetLinearComponentAtIndex(1, linear));
+  ASSERT_TRUE(path.GetQuadraticComponentAtIndex(3, quad));
+  ASSERT_TRUE(path.GetCubicComponentAtIndex(5, cubic));
+
+  EXPECT_EQ(contour.destination, Point(1, 1));
+
+  EXPECT_EQ(linear.p1, Point(1, 1));
+  EXPECT_EQ(linear.p2, Point(11, 11));
+
+  EXPECT_EQ(quad.cp, Point(16, 16));
+  EXPECT_EQ(quad.p1, Point(11, 11));
+  EXPECT_EQ(quad.p2, Point(21, 21));
+
+  EXPECT_EQ(cubic.cp1, Point(26, 26));
+  EXPECT_EQ(cubic.cp2, Point(-4, -4));
+  EXPECT_EQ(cubic.p1, Point(21, 21));
+  EXPECT_EQ(cubic.p2, Point(31, 31));
+}
+
+TEST(PathTest, PathBuilderWillComputeBounds) {
+  PathBuilder builder;
+  auto path_1 = builder.AddLine({0, 0}, {1, 1}).TakePath();
+
+  ASSERT_EQ(path_1.GetBoundingBox().value_or(Rect::MakeMaximum()),
+            Rect::MakeLTRB(0, 0, 1, 1));
+
+  auto path_2 = builder.AddLine({-1, -1}, {1, 1}).TakePath();
+
+  // Verify that PathBuilder recomputes the bounds.
+  ASSERT_EQ(path_2.GetBoundingBox().value_or(Rect::MakeMaximum()),
+            Rect::MakeLTRB(-1, -1, 1, 1));
+
+  // PathBuilder can set the bounds to whatever it wants
+  auto path_3 = builder.AddLine({0, 0}, {1, 1})
+                    .SetBounds(Rect::MakeLTRB(0, 0, 100, 100))
+                    .TakePath();
+
+  ASSERT_EQ(path_3.GetBoundingBox().value_or(Rect::MakeMaximum()),
+            Rect::MakeLTRB(0, 0, 100, 100));
+}
+
+TEST(PathTest, PathHorizontalLine) {
+  PathBuilder builder;
+  auto path = builder.HorizontalLineTo(10).TakePath();
+
+  LinearPathComponent linear;
+  path.GetLinearComponentAtIndex(1, linear);
+
+  EXPECT_EQ(linear.p1, Point(0, 0));
+  EXPECT_EQ(linear.p2, Point(10, 0));
+}
+
+TEST(PathTest, PathVerticalLine) {
+  PathBuilder builder;
+  auto path = builder.VerticalLineTo(10).TakePath();
+
+  LinearPathComponent linear;
+  path.GetLinearComponentAtIndex(1, linear);
+
+  EXPECT_EQ(linear.p1, Point(0, 0));
+  EXPECT_EQ(linear.p2, Point(0, 10));
+}
+
+TEST(PathTest, QuadradicPath) {
+  PathBuilder builder;
+  auto path = builder.QuadraticCurveTo(Point(10, 10), Point(20, 20)).TakePath();
+
+  QuadraticPathComponent quad;
+  path.GetQuadraticComponentAtIndex(1, quad);
+
+  EXPECT_EQ(quad.p1, Point(0, 0));
+  EXPECT_EQ(quad.cp, Point(10, 10));
+  EXPECT_EQ(quad.p2, Point(20, 20));
+}
+
+TEST(PathTest, CubicPath) {
+  PathBuilder builder;
+  auto path =
+      builder.CubicCurveTo(Point(10, 10), Point(-10, -10), Point(20, 20))
+          .TakePath();
+
+  CubicPathComponent cubic;
+  path.GetCubicComponentAtIndex(1, cubic);
+
+  EXPECT_EQ(cubic.p1, Point(0, 0));
+  EXPECT_EQ(cubic.cp1, Point(10, 10));
+  EXPECT_EQ(cubic.cp2, Point(-10, -10));
+  EXPECT_EQ(cubic.p2, Point(20, 20));
+}
+
+TEST(PathTest, BoundingBoxCubic) {
+  PathBuilder builder;
+  auto path =
+      builder.AddCubicCurve({120, 160}, {25, 200}, {220, 260}, {220, 40})
+          .TakePath();
+  auto box = path.GetBoundingBox();
+  Rect expected = Rect::MakeXYWH(93.9101, 40, 126.09, 158.862);
+  ASSERT_TRUE(box.has_value());
+  ASSERT_RECT_NEAR(box.value_or(Rect::MakeMaximum()), expected);
+}
+
+TEST(PathTest, BoundingBoxOfCompositePathIsCorrect) {
+  PathBuilder builder;
+  builder.AddRoundedRect(Rect::MakeXYWH(10, 10, 300, 300), {50, 50, 50, 50});
+  auto path = builder.TakePath();
+  auto actual = path.GetBoundingBox();
+  Rect expected = Rect::MakeXYWH(10, 10, 300, 300);
+
+  ASSERT_TRUE(actual.has_value());
+  ASSERT_RECT_NEAR(actual.value_or(Rect::MakeMaximum()), expected);
+}
+
+TEST(PathTest, ExtremaOfCubicPathComponentIsCorrect) {
+  CubicPathComponent cubic{{11.769268, 252.883148},
+                           {-6.2857933, 204.356461},
+                           {-4.53997231, 156.552902},
+                           {17.0067291, 109.472488}};
+  auto points = cubic.Extrema();
+
+  ASSERT_EQ(points.size(), static_cast<size_t>(3));
+  ASSERT_POINT_NEAR(points[2], cubic.Solve(0.455916));
+}
+
+TEST(PathTest, PathGetBoundingBoxForCubicWithNoDerivativeRootsIsCorrect) {
+  PathBuilder builder;
+  // Straight diagonal line.
+  builder.AddCubicCurve({0, 1}, {2, 3}, {4, 5}, {6, 7});
+  auto path = builder.TakePath();
+  auto actual = path.GetBoundingBox();
+  auto expected = Rect::MakeLTRB(0, 1, 6, 7);
+
+  ASSERT_TRUE(actual.has_value());
+  ASSERT_RECT_NEAR(actual.value_or(Rect::MakeMaximum()), expected);
+}
+
+TEST(PathTest, EmptyPath) {
+  auto path = PathBuilder{}.TakePath();
+  ASSERT_EQ(path.GetComponentCount(), 1u);
+
+  ContourComponent c;
+  path.GetContourComponentAtIndex(0, c);
+  ASSERT_POINT_NEAR(c.destination, Point());
+
+  Path::Polyline polyline = path.CreatePolyline(1.0f);
+  ASSERT_TRUE(polyline.points->empty());
+  ASSERT_TRUE(polyline.contours.empty());
+}
+
+TEST(PathTest, SimplePath) {
+  PathBuilder builder;
+
+  auto path = builder.AddLine({0, 0}, {100, 100})
+                  .AddQuadraticCurve({100, 100}, {200, 200}, {300, 300})
+                  .AddCubicCurve({300, 300}, {400, 400}, {500, 500}, {600, 600})
+                  .TakePath();
+
+  ASSERT_EQ(path.GetComponentCount(), 6u);
+  ASSERT_EQ(path.GetComponentCount(Path::ComponentType::kLinear), 1u);
+  ASSERT_EQ(path.GetComponentCount(Path::ComponentType::kQuadratic), 1u);
+  ASSERT_EQ(path.GetComponentCount(Path::ComponentType::kCubic), 1u);
+  ASSERT_EQ(path.GetComponentCount(Path::ComponentType::kContour), 3u);
+
+  path.EnumerateComponents(
+      [](size_t index, const LinearPathComponent& linear) {
+        Point p1(0, 0);
+        Point p2(100, 100);
+        ASSERT_EQ(index, 1u);
+        ASSERT_EQ(linear.p1, p1);
+        ASSERT_EQ(linear.p2, p2);
+      },
+      [](size_t index, const QuadraticPathComponent& quad) {
+        Point p1(100, 100);
+        Point cp(200, 200);
+        Point p2(300, 300);
+        ASSERT_EQ(index, 3u);
+        ASSERT_EQ(quad.p1, p1);
+        ASSERT_EQ(quad.cp, cp);
+        ASSERT_EQ(quad.p2, p2);
+      },
+      [](size_t index, const CubicPathComponent& cubic) {
+        Point p1(300, 300);
+        Point cp1(400, 400);
+        Point cp2(500, 500);
+        Point p2(600, 600);
+        ASSERT_EQ(index, 5u);
+        ASSERT_EQ(cubic.p1, p1);
+        ASSERT_EQ(cubic.cp1, cp1);
+        ASSERT_EQ(cubic.cp2, cp2);
+        ASSERT_EQ(cubic.p2, p2);
+      },
+      [](size_t index, const ContourComponent& contour) {
+        // There is an initial countour added for each curve.
+        if (index == 0u) {
+          Point p1(0, 0);
+          ASSERT_EQ(contour.destination, p1);
+        } else if (index == 2u) {
+          Point p1(100, 100);
+          ASSERT_EQ(contour.destination, p1);
+        } else if (index == 4u) {
+          Point p1(300, 300);
+          ASSERT_EQ(contour.destination, p1);
+        } else {
+          ASSERT_FALSE(true);
+        }
+        ASSERT_FALSE(contour.is_closed);
+      });
+}
+
+TEST(PathTest, CanBeCloned) {
+  PathBuilder builder;
+  builder.MoveTo({10, 10});
+  builder.LineTo({20, 20});
+  builder.SetBounds(Rect::MakeLTRB(0, 0, 100, 100));
+  builder.SetConvexity(Convexity::kConvex);
+
+  auto path_a = builder.TakePath(FillType::kOdd);
+  // NOLINTNEXTLINE(performance-unnecessary-copy-initialization)
+  auto path_b = path_a;
+
+  EXPECT_EQ(path_a.GetBoundingBox(), path_b.GetBoundingBox());
+  EXPECT_EQ(path_a.GetFillType(), path_b.GetFillType());
+  EXPECT_EQ(path_a.IsConvex(), path_b.IsConvex());
+
+  auto poly_a = path_a.CreatePolyline(1.0);
+  auto poly_b = path_b.CreatePolyline(1.0);
+
+  ASSERT_EQ(poly_a.points->size(), poly_b.points->size());
+  ASSERT_EQ(poly_a.contours.size(), poly_b.contours.size());
+
+  for (auto i = 0u; i < poly_a.points->size(); i++) {
+    EXPECT_EQ((*poly_a.points)[i], (*poly_b.points)[i]);
+  }
+
+  for (auto i = 0u; i < poly_a.contours.size(); i++) {
+    EXPECT_EQ(poly_a.contours[i].start_index, poly_b.contours[i].start_index);
+    EXPECT_EQ(poly_a.contours[i].start_direction,
+              poly_b.contours[i].start_direction);
+  }
+}
+
+TEST(PathTest, PathBuilderDoesNotMutateCopiedPaths) {
+  auto test_isolation =
+      [](const std::function<void(PathBuilder & builder)>& mutator,
+         bool will_close, Point mutation_offset, const std::string& label) {
+        PathBuilder builder;
+        builder.MoveTo({10, 10});
+        builder.LineTo({20, 20});
+        builder.LineTo({20, 10});
+
+        auto verify_path = [](const Path& path, bool is_mutated, bool is_closed,
+                              Point offset, const std::string& label) {
+          if (is_mutated) {
+            // We can only test the initial state before the mutator did
+            // its work. We have >= 3 components and the first 3 components
+            // will match what we saw before the mutation.
+            EXPECT_GE(path.GetComponentCount(), 3u) << label;
+          } else {
+            EXPECT_EQ(path.GetComponentCount(), 3u) << label;
+          }
+          {
+            ContourComponent contour;
+            EXPECT_TRUE(path.GetContourComponentAtIndex(0, contour)) << label;
+            EXPECT_EQ(contour.destination, offset + Point(10, 10)) << label;
+            EXPECT_EQ(contour.is_closed, is_closed) << label;
+          }
+          {
+            LinearPathComponent line;
+            EXPECT_TRUE(path.GetLinearComponentAtIndex(1, line)) << label;
+            EXPECT_EQ(line.p1, offset + Point(10, 10)) << label;
+            EXPECT_EQ(line.p2, offset + Point(20, 20)) << label;
+          }
+          {
+            LinearPathComponent line;
+            EXPECT_TRUE(path.GetLinearComponentAtIndex(2, line)) << label;
+            EXPECT_EQ(line.p1, offset + Point(20, 20)) << label;
+            EXPECT_EQ(line.p2, offset + Point(20, 10)) << label;
+          }
+        };
+
+        auto path1 = builder.CopyPath();
+        verify_path(path1, false, false, {},
+                    "Initial Path1 state before " + label);
+
+        for (int i = 0; i < 10; i++) {
+          auto path = builder.CopyPath();
+          verify_path(
+              path, false, false, {},
+              "Extra CopyPath #" + std::to_string(i + 1) + " for " + label);
+        }
+        mutator(builder);
+        verify_path(path1, false, false, {},
+                    "Path1 state after subsequent " + label);
+
+        auto path2 = builder.CopyPath();
+        verify_path(path1, false, false, {},
+                    "Path1 state after subsequent " + label + " and CopyPath");
+        verify_path(path2, true, will_close, mutation_offset,
+                    "Initial Path2 state with subsequent " + label);
+      };
+
+  test_isolation(
+      [](PathBuilder& builder) {  //
+        builder.SetConvexity(Convexity::kConvex);
+      },
+      false, {}, "SetConvex");
+
+  test_isolation(
+      [](PathBuilder& builder) {  //
+        builder.SetConvexity(Convexity::kUnknown);
+      },
+      false, {}, "SetUnknownConvex");
+
+  test_isolation(
+      [](PathBuilder& builder) {  //
+        builder.Close();
+      },
+      true, {}, "Close");
+
+  test_isolation(
+      [](PathBuilder& builder) {
+        builder.MoveTo({20, 30}, false);
+      },
+      false, {}, "Absolute MoveTo");
+
+  test_isolation(
+      [](PathBuilder& builder) {
+        builder.MoveTo({20, 30}, true);
+      },
+      false, {}, "Relative MoveTo");
+
+  test_isolation(
+      [](PathBuilder& builder) {
+        builder.LineTo({20, 30}, false);
+      },
+      false, {}, "Absolute LineTo");
+
+  test_isolation(
+      [](PathBuilder& builder) {
+        builder.LineTo({20, 30}, true);
+      },
+      false, {}, "Relative LineTo");
+
+  test_isolation(
+      [](PathBuilder& builder) {  //
+        builder.HorizontalLineTo(100, false);
+      },
+      false, {}, "Absolute HorizontalLineTo");
+
+  test_isolation(
+      [](PathBuilder& builder) {  //
+        builder.HorizontalLineTo(100, true);
+      },
+      false, {}, "Relative HorizontalLineTo");
+
+  test_isolation(
+      [](PathBuilder& builder) {  //
+        builder.VerticalLineTo(100, false);
+      },
+      false, {}, "Absolute VerticalLineTo");
+
+  test_isolation(
+      [](PathBuilder& builder) {  //
+        builder.VerticalLineTo(100, true);
+      },
+      false, {}, "Relative VerticalLineTo");
+
+  test_isolation(
+      [](PathBuilder& builder) {
+        builder.QuadraticCurveTo({20, 30}, {30, 20}, false);
+      },
+      false, {}, "Absolute QuadraticCurveTo");
+
+  test_isolation(
+      [](PathBuilder& builder) {
+        builder.QuadraticCurveTo({20, 30}, {30, 20}, true);
+      },
+      false, {}, "Relative QuadraticCurveTo");
+
+  test_isolation(
+      [](PathBuilder& builder) {
+        builder.CubicCurveTo({20, 30}, {30, 20}, {30, 30}, false);
+      },
+      false, {}, "Absolute CubicCurveTo");
+
+  test_isolation(
+      [](PathBuilder& builder) {
+        builder.CubicCurveTo({20, 30}, {30, 20}, {30, 30}, true);
+      },
+      false, {}, "Relative CubicCurveTo");
+
+  test_isolation(
+      [](PathBuilder& builder) {
+        builder.AddLine({100, 100}, {150, 100});
+      },
+      false, {}, "AddLine");
+
+  test_isolation(
+      [](PathBuilder& builder) {
+        builder.AddRect(Rect::MakeLTRB(100, 100, 120, 120));
+      },
+      false, {}, "AddRect");
+
+  test_isolation(
+      [](PathBuilder& builder) {
+        builder.AddOval(Rect::MakeLTRB(100, 100, 120, 120));
+      },
+      false, {}, "AddOval");
+
+  test_isolation(
+      [](PathBuilder& builder) {
+        builder.AddCircle({100, 100}, 20);
+      },
+      false, {}, "AddCircle");
+
+  test_isolation(
+      [](PathBuilder& builder) {
+        builder.AddArc(Rect::MakeLTRB(100, 100, 120, 120), Degrees(10),
+                       Degrees(170));
+      },
+      false, {}, "AddArc");
+
+  test_isolation(
+      [](PathBuilder& builder) {
+        builder.AddQuadraticCurve({100, 100}, {150, 100}, {150, 150});
+      },
+      false, {}, "AddQuadraticCurve");
+
+  test_isolation(
+      [](PathBuilder& builder) {
+        builder.AddCubicCurve({100, 100}, {150, 100}, {100, 150}, {150, 150});
+      },
+      false, {}, "AddCubicCurve");
+
+  test_isolation(
+      [](PathBuilder& builder) {
+        builder.Shift({23, 42});
+      },
+      false, {23, 42}, "Shift");
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/geometry/point.h b/impeller/geometry/point.h
index 5c377c522973c579581f1d4eef6de11a0c34c29f..ba10fa3fa0b9547e57e2d63e2884eda2913b9843 100644
--- a/impeller/geometry/point.h
+++ b/impeller/geometry/point.h
@@ -2,10 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_GEOMETRY_POINT_H_
+#define FLUTTER_IMPELLER_GEOMETRY_POINT_H_
 
 #include <algorithm>
 #include <cmath>
+#include <cstdint>
 #include <ostream>
 #include <string>
 #include <type_traits>
@@ -16,6 +18,11 @@
 
 namespace impeller {
 
+#define ONLY_ON_FLOAT_M(Modifiers, Return) \
+  template <typename U = T>                \
+  Modifiers std::enable_if_t<std::is_floating_point_v<U>, Return>
+#define ONLY_ON_FLOAT(Return) DL_ONLY_ON_FLOAT_M(, Return)
+
 template <class T>
 struct TPoint {
   using Type = T;
@@ -38,6 +45,12 @@ struct TPoint {
 
   static constexpr TPoint<Type> MakeXY(Type x, Type y) { return {x, y}; }
 
+  template <class U>
+  static constexpr TPoint Round(const TPoint<U>& other) {
+    return TPoint{static_cast<Type>(std::round(other.x)),
+                  static_cast<Type>(std::round(other.y))};
+  }
+
   constexpr bool operator==(const TPoint& p) const {
     return p.x == x && p.y == y;
   }
@@ -178,6 +191,12 @@ struct TPoint {
     return {std::max<Type>(x, p.x), std::max<Type>(y, p.y)};
   }
 
+  constexpr TPoint Floor() const { return {std::floor(x), std::floor(y)}; }
+
+  constexpr TPoint Ceil() const { return {std::ceil(x), std::ceil(y)}; }
+
+  constexpr TPoint Round() const { return {std::round(x), std::round(y)}; }
+
   constexpr Type GetDistance(const TPoint& p) const {
     return sqrt(GetDistanceSquared(p));
   }
@@ -213,6 +232,9 @@ struct TPoint {
   }
 
   constexpr bool IsZero() const { return x == 0 && y == 0; }
+
+  ONLY_ON_FLOAT_M(constexpr, bool)
+  IsFinite() const { return std::isfinite(x) && std::isfinite(y); }
 };
 
 // Specializations for mixed (float & integer) algebraic operations.
@@ -296,6 +318,10 @@ using IPoint = TPoint<int64_t>;
 using IPoint32 = TPoint<int32_t>;
 using UintPoint32 = TPoint<uint32_t>;
 using Vector2 = Point;
+using Quad = std::array<Point, 4>;
+
+#undef ONLY_ON_FLOAT
+#undef ONLY_ON_FLOAT_M
 
 }  // namespace impeller
 
@@ -309,3 +335,5 @@ inline std::ostream& operator<<(std::ostream& out,
 }
 
 }  // namespace std
+
+#endif  // FLUTTER_IMPELLER_GEOMETRY_POINT_H_
diff --git a/impeller/geometry/quaternion.h b/impeller/geometry/quaternion.h
index 0270dab9dc814c77abced1e4957e069f52b6e5a8..408f5c04edb6435de5b43515ccb2def2527b3ceb 100644
--- a/impeller/geometry/quaternion.h
+++ b/impeller/geometry/quaternion.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_GEOMETRY_QUATERNION_H_
+#define FLUTTER_IMPELLER_GEOMETRY_QUATERNION_H_
 
 #include <ostream>
 
@@ -13,38 +14,40 @@ namespace impeller {
 struct Quaternion {
   union {
     struct {
-      double x = 0.0;
-      double y = 0.0;
-      double z = 0.0;
-      double w = 1.0;
+      Scalar x = 0.0;
+      Scalar y = 0.0;
+      Scalar z = 0.0;
+      Scalar w = 1.0;
     };
-    double e[4];
+    Scalar e[4];
   };
 
   Quaternion() {}
 
-  Quaternion(double px, double py, double pz, double pw)
+  Quaternion(Scalar px, Scalar py, Scalar pz, Scalar pw)
       : x(px), y(py), z(pz), w(pw) {}
 
-  Quaternion(const Vector3& axis, double angle) {
-    const auto sine = sin(angle * 0.5);
+  Quaternion(const Vector3& axis, Scalar angle) {
+    const auto sine = sin(angle * 0.5f);
     x = sine * axis.x;
     y = sine * axis.y;
     z = sine * axis.z;
-    w = cos(angle * 0.5);
+    w = cos(angle * 0.5f);
   }
 
-  double Dot(const Quaternion& q) const {
+  Scalar Dot(const Quaternion& q) const {
     return x * q.x + y * q.y + z * q.z + w * q.w;
   }
 
-  double Length() const { return sqrt(x * x + y * y + z * z + w * w); }
+  Scalar Length() const { return sqrt(x * x + y * y + z * z + w * w); }
 
   Quaternion Normalize() const {
-    auto m = 1.0 / Length();
+    auto m = 1.0f / Length();
     return {x * m, y * m, z * m, w * m};
   }
 
+  Quaternion Invert() const { return {-x, -y, -z, w}; }
+
   Quaternion Slerp(const Quaternion& to, double time) const;
 
   Quaternion operator*(const Quaternion& o) const {
@@ -56,7 +59,7 @@ struct Quaternion {
     };
   }
 
-  Quaternion operator*(double scale) const {
+  Quaternion operator*(Scalar scale) const {
     return {scale * x, scale * y, scale * z, scale * w};
   }
 
@@ -95,3 +98,5 @@ inline std::ostream& operator<<(std::ostream& out,
 }
 
 }  // namespace std
+
+#endif  // FLUTTER_IMPELLER_GEOMETRY_QUATERNION_H_
diff --git a/impeller/geometry/rect.h b/impeller/geometry/rect.h
index 803000bc007df304df28fe869e5f720d69c31bab..46c396c494ab5774bb1f0e3ffd6a74729d1ae515 100644
--- a/impeller/geometry/rect.h
+++ b/impeller/geometry/rect.h
@@ -2,50 +2,144 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_GEOMETRY_RECT_H_
+#define FLUTTER_IMPELLER_GEOMETRY_RECT_H_
 
 #include <array>
 #include <optional>
 #include <ostream>
 #include <vector>
 
+#include "fml/logging.h"
 #include "impeller/geometry/matrix.h"
 #include "impeller/geometry/point.h"
+#include "impeller/geometry/saturated_math.h"
 #include "impeller/geometry/scalar.h"
 #include "impeller/geometry/size.h"
 
 namespace impeller {
 
+#define ONLY_ON_FLOAT_M(Modifiers, Return) \
+  template <typename U = T>                \
+  Modifiers std::enable_if_t<std::is_floating_point_v<U>, Return>
+#define ONLY_ON_FLOAT(Return) DL_ONLY_ON_FLOAT_M(, Return)
+
+/// Templated struct for holding an axis-aligned rectangle.
+///
+/// Rectangles are defined as 4 axis-aligned edges that might contain
+/// space. They can be viewed as 2 X coordinates that define the
+/// left and right edges and 2 Y coordinates that define the top and
+/// bottom edges; or they can be viewed as an origin and horizontal
+/// and vertical dimensions (width and height).
+///
+/// When the left and right edges are equal or reversed (right <= left)
+/// or the top and bottom edges are equal or reversed (bottom <= top),
+/// the rectangle is considered empty. Considering the rectangle in XYWH
+/// form, the width and/or the height would be negative or zero. Such
+/// reversed/empty rectangles contain no space and act as such in the
+/// methods that operate on them (Intersection, Union, IntersectsWithRect,
+/// Contains, Cutout, etc.)
+///
+/// Rectangles cannot be modified by any method and a new value can only
+/// be stored into an existing rect using assignment. This keeps the API
+/// clean compared to implementations that might have similar methods
+/// that produce the answer in place, or construct a new object with
+/// the answer, or place the result in an indicated result object.
+///
+/// Methods that might fail to produce an answer will use |std::optional|
+/// to indicate that success or failure (see |Intersection| and |CutOut|).
+/// For convenience, |Intersection| and |Union| both have overloaded
+/// variants that take |std::optional| arguments and treat them as if
+/// the argument was an empty rect to allow chaining multiple such methods
+/// and only needing to check the optional condition of the final result.
+/// The primary methods also provide |...OrEmpty| overloaded variants that
+/// translate an empty optional answer into a simple empty rectangle of the
+/// same type.
+///
+/// Rounding instance methods are not provided as the return value might
+/// be wanted as another floating point rectangle or sometimes as an integer
+/// rectangle. Instead a |RoundOut| factory, defined only for floating point
+/// input rectangles, is provided to provide control over the result type.
+///
+/// NaN and Infinity values
+///
+/// Constructing an LTRB rectangle using Infinity values should work as
+/// expected with either 0 or +Infinity returned as dimensions depending on
+/// which side the Infinity values are on and the sign.
+///
+/// Constructing an XYWH rectangle using Infinity values will usually
+/// not work if the math requires the object to compute a right or bottom
+/// edge from ([xy] -Infinity + [wh] +Infinity). Other combinations might
+/// work.
+///
+/// The special factory |MakeMaximum| is provided to construct a rectangle
+/// of the indicated coordinate type that covers all finite coordinates.
+/// It does not use infinity values, but rather the largest finite values
+/// to avoid math that might produce a NaN value from various getters.
+///
+/// Any rectangle that is constructed with, or computed to have a NaN value
+/// will be considered the same as any empty rectangle.
+///
+/// Empty Rectangle canonical results summary:
+///
+/// Union will ignore any empty rects and return the other rect
+/// Intersection will return nullopt if either rect is empty
+/// IntersectsWithRect will return false if either rect is empty
+/// Cutout will return the source rect if the argument is empty
+/// Cutout will return nullopt if the source rectangle is empty
+/// Contains(Point) will return false if the source rectangle is empty
+/// Contains(Rect) will return false if the source rectangle is empty
+/// Contains(Rect) will otherwise return true if the argument is empty
+/// Specifically, EmptyRect.Contains(EmptyRect) returns false
+///
+/// ---------------
+/// Special notes on problems using the XYWH form of specifying rectangles:
+///
+/// It is possible to have integer rectangles whose dimensions exceed
+/// the maximum number that their coordinates can represent since
+/// (MAX_INT - MIN_INT) overflows the representable positive numbers.
+/// Floating point rectangles technically have a similar issue in that
+/// overflow can occur, but it will be automatically converted into
+/// either an infinity, or a finite-overflow value and still be
+/// representable, just with little to no precision.
+///
+/// Secondly, specifying a rectangle using XYWH leads to cases where the
+/// math for (x+w) and/or (y+h) are also beyond the maximum representable
+/// coordinates. For N-bit integer rectangles declared as XYWH, the
+/// maximum right coordinate will require N+1 signed bits which cannot be
+/// stored in storage that uses N-bit integers.
+///
+/// Saturated math is used when constructing a rectangle from XYWH values
+/// and when returning the dimensions of the rectangle. Constructing an
+/// integer rectangle from values such that xy + wh is beyond the range
+/// of the integer type will place the right or bottom edges at the maximum
+/// value for the integer type. Similarly, constructing an integer rectangle
+/// such that the distance from the left to the right (or top to bottom) is
+/// greater than the range of the integer type will simply return the
+/// maximum integer value as the dimension. Floating point rectangles are
+/// naturally saturated by the rules of IEEE arithmetic.
 template <class T>
 struct TRect {
+ private:
   using Type = T;
 
-  TPoint<Type> origin;
-  TSize<Type> size;
-
-  constexpr TRect() : origin({0, 0}), size({0, 0}) {}
-
-  constexpr TRect(TSize<Type> size) : origin({0.0, 0.0}), size(size) {}
-
-  constexpr TRect(TPoint<Type> origin, TSize<Type> size)
-      : origin(origin), size(size) {}
-
-  constexpr TRect(const Type components[4])
-      : origin(components[0], components[1]),
-        size(components[2], components[3]) {}
-
-  constexpr TRect(Type x, Type y, Type width, Type height)
-      : origin(x, y), size(width, height) {}
+ public:
+  constexpr TRect() : left_(0), top_(0), right_(0), bottom_(0) {}
 
   constexpr static TRect MakeLTRB(Type left,
                                   Type top,
                                   Type right,
                                   Type bottom) {
-    return TRect(left, top, right - left, bottom - top);
+    return TRect(left, top, right, bottom);
   }
 
   constexpr static TRect MakeXYWH(Type x, Type y, Type width, Type height) {
-    return TRect(x, y, width, height);
+    return TRect(x, y, saturated::Add(x, width), saturated::Add(y, height));
+  }
+
+  constexpr static TRect MakeOriginSize(const TPoint<Type>& origin,
+                                        const TSize<Type>& size) {
+    return MakeXYWH(origin.x, origin.y, size.width, size.height);
   }
 
   template <class U>
@@ -53,114 +147,251 @@ struct TRect {
     return TRect(0.0, 0.0, size.width, size.height);
   }
 
-  constexpr static std::optional<TRect> MakePointBounds(
-      const std::vector<TPoint<Type>>& points) {
-    if (points.empty()) {
+  template <typename U>
+  constexpr static std::optional<TRect> MakePointBounds(const U& value) {
+    return MakePointBounds(value.begin(), value.end());
+  }
+
+  template <typename PointIter>
+  constexpr static std::optional<TRect> MakePointBounds(const PointIter first,
+                                                        const PointIter last) {
+    if (first == last) {
       return std::nullopt;
     }
-    auto left = points[0].x;
-    auto top = points[0].y;
-    auto right = points[0].x;
-    auto bottom = points[0].y;
-    if (points.size() > 1) {
-      for (size_t i = 1; i < points.size(); i++) {
-        left = std::min(left, points[i].x);
-        top = std::min(top, points[i].y);
-        right = std::max(right, points[i].x);
-        bottom = std::max(bottom, points[i].y);
-      }
+    auto left = first->x;
+    auto top = first->y;
+    auto right = first->x;
+    auto bottom = first->y;
+    for (auto it = first + 1; it < last; ++it) {
+      left = std::min(left, it->x);
+      top = std::min(top, it->y);
+      right = std::max(right, it->x);
+      bottom = std::max(bottom, it->y);
     }
     return TRect::MakeLTRB(left, top, right, bottom);
   }
 
-  constexpr static TRect MakeMaximum() {
-    return TRect::MakeLTRB(-std::numeric_limits<Scalar>::infinity(),
-                           -std::numeric_limits<Scalar>::infinity(),
-                           std::numeric_limits<Scalar>::infinity(),
-                           std::numeric_limits<Scalar>::infinity());
+  [[nodiscard]] constexpr static TRect MakeMaximum() {
+    return TRect::MakeLTRB(std::numeric_limits<Type>::lowest(),
+                           std::numeric_limits<Type>::lowest(),
+                           std::numeric_limits<Type>::max(),
+                           std::numeric_limits<Type>::max());
   }
 
-  template <class U>
-  constexpr explicit TRect(const TRect<U>& other)
-      : origin(static_cast<TPoint<Type>>(other.origin)),
-        size(static_cast<TSize<Type>>(other.size)) {}
+  [[nodiscard]] constexpr bool operator==(const TRect& r) const {
+    return left_ == r.left_ &&    //
+           top_ == r.top_ &&      //
+           right_ == r.right_ &&  //
+           bottom_ == r.bottom_;
+  }
+
+  [[nodiscard]] constexpr TRect Scale(Type scale) const {
+    return TRect(left_ * scale,   //
+                 top_ * scale,    //
+                 right_ * scale,  //
+                 bottom_ * scale);
+  }
 
-  constexpr TRect operator+(const TRect& r) const {
-    return TRect({origin.x + r.origin.x, origin.y + r.origin.y},
-                 {size.width + r.size.width, size.height + r.size.height});
+  [[nodiscard]] constexpr TRect Scale(Type scale_x, Type scale_y) const {
+    return TRect(left_ * scale_x,   //
+                 top_ * scale_y,    //
+                 right_ * scale_x,  //
+                 bottom_ * scale_y);
   }
 
-  constexpr TRect operator-(const TRect& r) const {
-    return TRect({origin.x - r.origin.x, origin.y - r.origin.y},
-                 {size.width - r.size.width, size.height - r.size.height});
+  [[nodiscard]] constexpr TRect Scale(TPoint<T> scale) const {
+    return Scale(scale.x, scale.y);
   }
 
-  constexpr TRect operator*(Type scale) const {
-    return TRect({origin.x * scale, origin.y * scale},
-                 {size.width * scale, size.height * scale});
+  [[nodiscard]] constexpr TRect Scale(TSize<T> scale) const {
+    return Scale(scale.width, scale.height);
   }
 
-  constexpr TRect operator*(const TRect& r) const {
-    return TRect({origin.x * r.origin.x, origin.y * r.origin.y},
-                 {size.width * r.size.width, size.height * r.size.height});
+  /// @brief  Returns true iff the provided point |p| is inside the
+  ///         half-open interior of this rectangle.
+  ///
+  ///         For purposes of containment, a rectangle contains points
+  ///         along the top and left edges but not points along the
+  ///         right and bottom edges so that a point is only ever
+  ///         considered inside one of two abutting rectangles.
+  [[nodiscard]] constexpr bool Contains(const TPoint<Type>& p) const {
+    return !this->IsEmpty() &&  //
+           p.x >= left_ &&      //
+           p.y >= top_ &&       //
+           p.x < right_ &&      //
+           p.y < bottom_;
   }
 
-  constexpr bool operator==(const TRect& r) const {
-    return origin == r.origin && size == r.size;
+  /// @brief  Returns true iff this rectangle is not empty and it also
+  ///         contains every point considered inside the provided
+  ///         rectangle |o| (as determined by |Contains(TPoint)|).
+  ///
+  ///         This is similar to a definition where the result is true iff
+  ///         the union of the two rectangles is equal to this rectangle,
+  ///         ignoring precision issues with performing those operations
+  ///         and assuming that empty rectangles are never equal.
+  ///
+  ///         An empty rectangle can contain no other rectangle.
+  ///
+  ///         An empty rectangle is, however, contained within any
+  ///         other non-empy rectangle as the set of points it contains
+  ///         is an empty set and so there are no points to fail the
+  ///         containment criteria.
+  [[nodiscard]] constexpr bool Contains(const TRect& o) const {
+    return !this->IsEmpty() &&                     //
+           (o.IsEmpty() || (o.left_ >= left_ &&    //
+                            o.top_ >= top_ &&      //
+                            o.right_ <= right_ &&  //
+                            o.bottom_ <= bottom_));
   }
 
-  constexpr bool Contains(const TPoint<Type>& p) const {
-    return p.x >= origin.x && p.x < origin.x + size.width && p.y >= origin.y &&
-           p.y < origin.y + size.height;
+  /// @brief  Returns true if all of the fields of this floating point
+  ///         rectangle are finite.
+  ///
+  ///         Note that the results of |GetWidth()| and |GetHeight()| may
+  ///         still be infinite due to overflow even if the fields themselves
+  ///         are finite.
+  ONLY_ON_FLOAT_M([[nodiscard]] constexpr, bool)
+  IsFinite() const {
+    return std::isfinite(left_) &&   //
+           std::isfinite(top_) &&    //
+           std::isfinite(right_) &&  //
+           std::isfinite(bottom_);
   }
 
-  constexpr bool Contains(const TRect& o) const {
-    return Union(o).size == size;
+  /// @brief  Returns true if either of the width or height are 0, negative,
+  ///         or NaN.
+  [[nodiscard]] constexpr bool IsEmpty() const {
+    // Computing the non-empty condition and negating the result causes any
+    // NaN value to return true - i.e. is considered empty.
+    return !(left_ < right_ && top_ < bottom_);
   }
 
-  constexpr bool IsZero() const { return size.IsZero(); }
+  /// @brief  Returns true if width and height are equal and neither is NaN.
+  [[nodiscard]] constexpr bool IsSquare() const {
+    // empty rectangles can technically be "square", but would be
+    // misleading to most callers. Using |IsEmpty| also prevents
+    // "non-empty and non-overflowing" computations from happening
+    // to be equal to "empty and overflowing" results.
+    // (Consider LTRB(10, 15, MAX-2, MIN+2) which is empty, but both
+    //  w/h subtractions equal "5").
+    return !IsEmpty() && (right_ - left_) == (bottom_ - top_);
+  }
 
-  constexpr bool IsEmpty() const { return size.IsEmpty(); }
+  [[nodiscard]] constexpr bool IsMaximum() const {
+    return *this == MakeMaximum();
+  }
 
-  constexpr auto GetLeft() const {
-    return std::min(origin.x, origin.x + size.width);
+  /// @brief Returns the upper left corner of the rectangle as specified
+  ///        by the left/top or x/y values when it was constructed.
+  [[nodiscard]] constexpr TPoint<Type> GetOrigin() const {
+    return {left_, top_};
   }
 
-  constexpr auto GetTop() const {
-    return std::min(origin.y, origin.y + size.height);
+  /// @brief Returns the size of the rectangle which may be negative in
+  ///        either width or height and may have been clipped to the
+  ///        maximum integer values for integer rects whose size overflows.
+  [[nodiscard]] constexpr TSize<Type> GetSize() const {
+    return {GetWidth(), GetHeight()};
+  }
+
+  /// @brief Returns the X coordinate of the upper left corner, equivalent
+  ///        to |GetOrigin().x|
+  [[nodiscard]] constexpr Type GetX() const { return left_; }
+
+  /// @brief Returns the Y coordinate of the upper left corner, equivalent
+  ///        to |GetOrigin().y|
+  [[nodiscard]] constexpr Type GetY() const { return top_; }
+
+  /// @brief Returns the width of the rectangle, equivalent to
+  ///        |GetSize().width|
+  [[nodiscard]] constexpr Type GetWidth() const {
+    return saturated::Sub(right_, left_);
   }
 
-  constexpr auto GetRight() const {
-    return std::max(origin.x, origin.x + size.width);
+  /// @brief Returns the height of the rectangle, equivalent to
+  ///        |GetSize().height|
+  [[nodiscard]] constexpr Type GetHeight() const {
+    return saturated::Sub(bottom_, top_);
+  }
+
+  [[nodiscard]] constexpr auto GetLeft() const { return left_; }
+
+  [[nodiscard]] constexpr auto GetTop() const { return top_; }
+
+  [[nodiscard]] constexpr auto GetRight() const { return right_; }
+
+  [[nodiscard]] constexpr auto GetBottom() const { return bottom_; }
+
+  [[nodiscard]] constexpr TPoint<T> GetLeftTop() const {  //
+    return {left_, top_};
   }
 
-  constexpr auto GetBottom() const {
-    return std::max(origin.y, origin.y + size.height);
+  [[nodiscard]] constexpr TPoint<T> GetRightTop() const {
+    return {right_, top_};
   }
 
-  constexpr std::array<T, 4> GetLTRB() const {
-    const auto left = std::min(origin.x, origin.x + size.width);
-    const auto top = std::min(origin.y, origin.y + size.height);
-    const auto right = std::max(origin.x, origin.x + size.width);
-    const auto bottom = std::max(origin.y, origin.y + size.height);
-    return {left, top, right, bottom};
+  [[nodiscard]] constexpr TPoint<T> GetLeftBottom() const {
+    return {left_, bottom_};
+  }
+
+  [[nodiscard]] constexpr TPoint<T> GetRightBottom() const {
+    return {right_, bottom_};
+  }
+
+  /// @brief  Get the area of the rectangle, equivalent to |GetSize().Area()|
+  [[nodiscard]] constexpr T Area() const {
+    // TODO(flutter/flutter#141710) - Use saturated math to avoid overflow
+    // https://github.com/flutter/flutter/issues/141710
+    return IsEmpty() ? 0 : (right_ - left_) * (bottom_ - top_);
+  }
+
+  /// @brief  Get the center point as a |Point|.
+  [[nodiscard]] constexpr Point GetCenter() const {
+    return {saturated::AverageScalar(left_, right_),
+            saturated::AverageScalar(top_, bottom_)};
+  }
+
+  [[nodiscard]] constexpr std::array<T, 4> GetLTRB() const {
+    return {left_, top_, right_, bottom_};
+  }
+
+  /// @brief  Get the x, y coordinates of the origin and the width and
+  ///         height of the rectangle in an array.
+  [[nodiscard]] constexpr std::array<T, 4> GetXYWH() const {
+    return {left_, top_, GetWidth(), GetHeight()};
   }
 
   /// @brief  Get a version of this rectangle that has a non-negative size.
-  constexpr TRect GetPositive() const {
-    auto ltrb = GetLTRB();
-    return MakeLTRB(ltrb[0], ltrb[1], ltrb[2], ltrb[3]);
+  [[nodiscard]] constexpr TRect GetPositive() const {
+    if (!IsEmpty()) {
+      return *this;
+    }
+    return {
+        std::min(left_, right_),
+        std::min(top_, bottom_),
+        std::max(left_, right_),
+        std::max(top_, bottom_),
+    };
   }
 
-  /// @brief  Get the points that represent the 4 corners of this rectangle. The
-  ///         order is: Top left, top right, bottom left, bottom right.
-  constexpr std::array<TPoint<T>, 4> GetPoints() const {
-    auto [left, top, right, bottom] = GetLTRB();
-    return {TPoint(left, top), TPoint(right, top), TPoint(left, bottom),
-            TPoint(right, bottom)};
+  /// @brief  Get the points that represent the 4 corners of this rectangle
+  ///         in a Z order that is compatible with triangle strips or a set
+  ///         of all zero points if the rectangle is empty.
+  ///         The order is: Top left, top right, bottom left, bottom right.
+  [[nodiscard]] constexpr std::array<TPoint<T>, 4> GetPoints() const {
+    if (IsEmpty()) {
+      return {};
+    }
+    return {
+        TPoint{left_, top_},
+        TPoint{right_, top_},
+        TPoint{left_, bottom_},
+        TPoint{right_, bottom_},
+    };
   }
 
-  constexpr std::array<TPoint<T>, 4> GetTransformedPoints(
+  [[nodiscard]] constexpr std::array<TPoint<T>, 4> GetTransformedPoints(
       const Matrix& transform) const {
     auto points = GetPoints();
     for (size_t i = 0; i < points.size(); i++) {
@@ -171,44 +402,269 @@ struct TRect {
 
   /// @brief  Creates a new bounding box that contains this transformed
   ///         rectangle.
-  constexpr TRect TransformBounds(const Matrix& transform) const {
+  [[nodiscard]] constexpr TRect TransformBounds(const Matrix& transform) const {
+    if (IsEmpty()) {
+      return {};
+    }
     auto points = GetTransformedPoints(transform);
-    return TRect::MakePointBounds({points.begin(), points.end()}).value();
-  }
-
-  constexpr TRect Union(const TRect& o) const {
-    auto this_ltrb = GetLTRB();
-    auto other_ltrb = o.GetLTRB();
-    return TRect::MakeLTRB(std::min(this_ltrb[0], other_ltrb[0]),  //
-                           std::min(this_ltrb[1], other_ltrb[1]),  //
-                           std::max(this_ltrb[2], other_ltrb[2]),  //
-                           std::max(this_ltrb[3], other_ltrb[3])   //
-    );
-  }
-
-  constexpr std::optional<TRect<T>> Intersection(const TRect& o) const {
-    auto this_ltrb = GetLTRB();
-    auto other_ltrb = o.GetLTRB();
-    auto intersection =
-        TRect::MakeLTRB(std::max(this_ltrb[0], other_ltrb[0]),  //
-                        std::max(this_ltrb[1], other_ltrb[1]),  //
-                        std::min(this_ltrb[2], other_ltrb[2]),  //
-                        std::min(this_ltrb[3], other_ltrb[3])   //
-        );
-    if (intersection.size.IsEmpty()) {
+    auto bounds = TRect::MakePointBounds(points.begin(), points.end());
+    if (bounds.has_value()) {
+      return bounds.value();
+    }
+    FML_UNREACHABLE();
+    return {};
+  }
+
+  /// @brief  Constructs a Matrix that will map all points in the coordinate
+  ///         space of the rectangle into a new normalized coordinate space
+  ///         where the upper left corner of the rectangle maps to (0, 0)
+  ///         and the lower right corner of the rectangle maps to (1, 1).
+  ///
+  ///         Empty and non-finite rectangles will return a zero-scaling
+  ///         transform that maps all points to (0, 0).
+  [[nodiscard]] constexpr Matrix GetNormalizingTransform() const {
+    if (!IsEmpty()) {
+      Scalar sx = 1.0 / GetWidth();
+      Scalar sy = 1.0 / GetHeight();
+      Scalar tx = left_ * -sx;
+      Scalar ty = top_ * -sy;
+
+      // Exclude NaN and infinities and either scale underflowing to zero
+      if (sx != 0.0 && sy != 0.0 && 0.0 * sx * sy * tx * ty == 0.0) {
+        // clang-format off
+        return Matrix(  sx, 0.0f, 0.0f, 0.0f,
+                      0.0f,   sy, 0.0f, 0.0f,
+                      0.0f, 0.0f, 1.0f, 0.0f,
+                        tx,   ty, 0.0f, 1.0f);
+        // clang-format on
+      }
+    }
+
+    // Map all coordinates to the origin.
+    return Matrix::MakeScale({0.0f, 0.0f, 1.0f});
+  }
+
+  [[nodiscard]] constexpr TRect Union(const TRect& o) const {
+    if (IsEmpty()) {
+      return o;
+    }
+    if (o.IsEmpty()) {
+      return *this;
+    }
+    return {
+        std::min(left_, o.left_),
+        std::min(top_, o.top_),
+        std::max(right_, o.right_),
+        std::max(bottom_, o.bottom_),
+    };
+  }
+
+  [[nodiscard]] constexpr std::optional<TRect> Intersection(
+      const TRect& o) const {
+    if (IntersectsWithRect(o)) {
+      return TRect{
+          std::max(left_, o.left_),
+          std::max(top_, o.top_),
+          std::min(right_, o.right_),
+          std::min(bottom_, o.bottom_),
+      };
+    } else {
       return std::nullopt;
     }
-    return intersection;
   }
 
-  constexpr bool IntersectsWithRect(const TRect& o) const {
-    return Intersection(o).has_value();
+  [[nodiscard]] constexpr bool IntersectsWithRect(const TRect& o) const {
+    return !IsEmpty() &&        //
+           !o.IsEmpty() &&      //
+           left_ < o.right_ &&  //
+           top_ < o.bottom_ &&  //
+           right_ > o.left_ &&  //
+           bottom_ > o.top_;
   }
+
+  /// @brief Returns the new boundary rectangle that would result from this
+  ///        rectangle being cut out by the specified rectangle.
+  [[nodiscard]] constexpr std::optional<TRect<T>> Cutout(const TRect& o) const {
+    if (IsEmpty()) {
+      // This test isn't just a short-circuit, it also prevents the concise
+      // math below from returning the wrong answer on empty rects.
+      // Once we know that this rectangle is not empty, the math below can
+      // only succeed in computing a value if o is also non-empty and non-nan.
+      // Otherwise, the method returns *this by default.
+      return std::nullopt;
+    }
+
+    const auto& [a_left, a_top, a_right, a_bottom] = GetLTRB();  // Source rect.
+    const auto& [b_left, b_top, b_right, b_bottom] = o.GetLTRB();  // Cutout.
+    if (b_left <= a_left && b_right >= a_right) {
+      if (b_top <= a_top && b_bottom >= a_bottom) {
+        // Full cutout.
+        return std::nullopt;
+      }
+      if (b_top <= a_top && b_bottom > a_top) {
+        // Cuts off the top.
+        return TRect::MakeLTRB(a_left, b_bottom, a_right, a_bottom);
+      }
+      if (b_bottom >= a_bottom && b_top < a_bottom) {
+        // Cuts off the bottom.
+        return TRect::MakeLTRB(a_left, a_top, a_right, b_top);
+      }
+    }
+    if (b_top <= a_top && b_bottom >= a_bottom) {
+      if (b_left <= a_left && b_right > a_left) {
+        // Cuts off the left.
+        return TRect::MakeLTRB(b_right, a_top, a_right, a_bottom);
+      }
+      if (b_right >= a_right && b_left < a_right) {
+        // Cuts off the right.
+        return TRect::MakeLTRB(a_left, a_top, b_left, a_bottom);
+      }
+    }
+
+    return *this;
+  }
+
+  [[nodiscard]] constexpr TRect CutoutOrEmpty(const TRect& o) const {
+    return Cutout(o).value_or(TRect());
+  }
+
+  /// @brief  Returns a new rectangle translated by the given offset.
+  [[nodiscard]] constexpr TRect<T> Shift(T dx, T dy) const {
+    return {
+        saturated::Add(left_, dx),    //
+        saturated::Add(top_, dy),     //
+        saturated::Add(right_, dx),   //
+        saturated::Add(bottom_, dy),  //
+    };
+  }
+
+  /// @brief  Returns a new rectangle translated by the given offset.
+  [[nodiscard]] constexpr TRect<T> Shift(TPoint<T> offset) const {
+    return Shift(offset.x, offset.y);
+  }
+
+  /// @brief  Returns a rectangle with expanded edges. Negative expansion
+  ///         results in shrinking.
+  [[nodiscard]] constexpr TRect<T> Expand(T left,
+                                          T top,
+                                          T right,
+                                          T bottom) const {
+    return {
+        saturated::Sub(left_, left),      //
+        saturated::Sub(top_, top),        //
+        saturated::Add(right_, right),    //
+        saturated::Add(bottom_, bottom),  //
+    };
+  }
+
+  /// @brief  Returns a rectangle with expanded edges in all directions.
+  ///         Negative expansion results in shrinking.
+  [[nodiscard]] constexpr TRect<T> Expand(T amount) const {
+    return {
+        saturated::Sub(left_, amount),    //
+        saturated::Sub(top_, amount),     //
+        saturated::Add(right_, amount),   //
+        saturated::Add(bottom_, amount),  //
+    };
+  }
+
+  /// @brief  Returns a rectangle with expanded edges in all directions.
+  ///         Negative expansion results in shrinking.
+  [[nodiscard]] constexpr TRect<T> Expand(T horizontal_amount,
+                                          T vertical_amount) const {
+    return {
+        saturated::Sub(left_, horizontal_amount),   //
+        saturated::Sub(top_, vertical_amount),      //
+        saturated::Add(right_, horizontal_amount),  //
+        saturated::Add(bottom_, vertical_amount),   //
+    };
+  }
+
+  /// @brief  Returns a rectangle with expanded edges in all directions.
+  ///         Negative expansion results in shrinking.
+  [[nodiscard]] constexpr TRect<T> Expand(TPoint<T> amount) const {
+    return Expand(amount.x, amount.y);
+  }
+
+  /// @brief  Returns a rectangle with expanded edges in all directions.
+  ///         Negative expansion results in shrinking.
+  [[nodiscard]] constexpr TRect<T> Expand(TSize<T> amount) const {
+    return Expand(amount.width, amount.height);
+  }
+
+  /// @brief  Returns a new rectangle that represents the projection of the
+  ///         source rectangle onto this rectangle. In other words, the source
+  ///         rectangle is redefined in terms of the coordinate space of this
+  ///         rectangle.
+  [[nodiscard]] constexpr TRect<T> Project(TRect<T> source) const {
+    if (IsEmpty()) {
+      return {};
+    }
+    return source.Shift(-left_, -top_)
+        .Scale(1.0 / static_cast<Scalar>(GetWidth()),
+               1.0 / static_cast<Scalar>(GetHeight()));
+  }
+
+  ONLY_ON_FLOAT_M([[nodiscard]] constexpr static, TRect)
+  RoundOut(const TRect<U>& r) {
+    return TRect::MakeLTRB(saturated::Cast<U, Type>(floor(r.GetLeft())),
+                           saturated::Cast<U, Type>(floor(r.GetTop())),
+                           saturated::Cast<U, Type>(ceil(r.GetRight())),
+                           saturated::Cast<U, Type>(ceil(r.GetBottom())));
+  }
+
+  [[nodiscard]] constexpr static std::optional<TRect> Union(
+      const TRect& a,
+      const std::optional<TRect> b) {
+    return b.has_value() ? a.Union(b.value()) : a;
+  }
+
+  [[nodiscard]] constexpr static std::optional<TRect> Union(
+      const std::optional<TRect> a,
+      const TRect& b) {
+    return a.has_value() ? a->Union(b) : b;
+  }
+
+  [[nodiscard]] constexpr static std::optional<TRect> Union(
+      const std::optional<TRect> a,
+      const std::optional<TRect> b) {
+    return a.has_value() ? Union(a.value(), b) : b;
+  }
+
+  [[nodiscard]] constexpr static std::optional<TRect> Intersection(
+      const TRect& a,
+      const std::optional<TRect> b) {
+    return b.has_value() ? a.Intersection(b.value()) : a;
+  }
+
+  [[nodiscard]] constexpr static std::optional<TRect> Intersection(
+      const std::optional<TRect> a,
+      const TRect& b) {
+    return a.has_value() ? a->Intersection(b) : b;
+  }
+
+  [[nodiscard]] constexpr static std::optional<TRect> Intersection(
+      const std::optional<TRect> a,
+      const std::optional<TRect> b) {
+    return a.has_value() ? Intersection(a.value(), b) : b;
+  }
+
+ private:
+  constexpr TRect(Type left, Type top, Type right, Type bottom)
+      : left_(left), top_(top), right_(right), bottom_(bottom) {}
+
+  Type left_;
+  Type top_;
+  Type right_;
+  Type bottom_;
 };
 
 using Rect = TRect<Scalar>;
 using IRect = TRect<int64_t>;
 
+#undef ONLY_ON_FLOAT
+#undef ONLY_ON_FLOAT_M
+
 }  // namespace impeller
 
 namespace std {
@@ -216,8 +672,10 @@ namespace std {
 template <class T>
 inline std::ostream& operator<<(std::ostream& out,
                                 const impeller::TRect<T>& r) {
-  out << "(" << r.origin << ", " << r.size << ")";
+  out << "(" << r.GetOrigin() << ", " << r.GetSize() << ")";
   return out;
 }
 
 }  // namespace std
+
+#endif  // FLUTTER_IMPELLER_GEOMETRY_RECT_H_
diff --git a/impeller/geometry/rect_unittests.cc b/impeller/geometry/rect_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..17ba9efb066b97a942db3dd983aaa0b374ca92a8
--- /dev/null
+++ b/impeller/geometry/rect_unittests.cc
@@ -0,0 +1,2866 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "gtest/gtest.h"
+
+#include "flutter/impeller/geometry/rect.h"
+
+#include "flutter/impeller/geometry/geometry_asserts.h"
+
+namespace impeller {
+namespace testing {
+
+TEST(RectTest, RectEmptyDeclaration) {
+  Rect rect;
+
+  EXPECT_EQ(rect.GetLeft(), 0.0f);
+  EXPECT_EQ(rect.GetTop(), 0.0f);
+  EXPECT_EQ(rect.GetRight(), 0.0f);
+  EXPECT_EQ(rect.GetBottom(), 0.0f);
+  EXPECT_EQ(rect.GetX(), 0.0f);
+  EXPECT_EQ(rect.GetY(), 0.0f);
+  EXPECT_EQ(rect.GetWidth(), 0.0f);
+  EXPECT_EQ(rect.GetHeight(), 0.0f);
+  EXPECT_TRUE(rect.IsEmpty());
+  EXPECT_TRUE(rect.IsFinite());
+}
+
+TEST(RectTest, IRectEmptyDeclaration) {
+  IRect rect;
+
+  EXPECT_EQ(rect.GetLeft(), 0);
+  EXPECT_EQ(rect.GetTop(), 0);
+  EXPECT_EQ(rect.GetRight(), 0);
+  EXPECT_EQ(rect.GetBottom(), 0);
+  EXPECT_EQ(rect.GetX(), 0);
+  EXPECT_EQ(rect.GetY(), 0);
+  EXPECT_EQ(rect.GetWidth(), 0);
+  EXPECT_EQ(rect.GetHeight(), 0);
+  EXPECT_TRUE(rect.IsEmpty());
+  // EXPECT_TRUE(rect.IsFinite());  // should fail to compile
+}
+
+TEST(RectTest, RectDefaultConstructor) {
+  Rect rect = Rect();
+
+  EXPECT_EQ(rect.GetLeft(), 0.0f);
+  EXPECT_EQ(rect.GetTop(), 0.0f);
+  EXPECT_EQ(rect.GetRight(), 0.0f);
+  EXPECT_EQ(rect.GetBottom(), 0.0f);
+  EXPECT_EQ(rect.GetX(), 0.0f);
+  EXPECT_EQ(rect.GetY(), 0.0f);
+  EXPECT_EQ(rect.GetWidth(), 0.0f);
+  EXPECT_EQ(rect.GetHeight(), 0.0f);
+  EXPECT_TRUE(rect.IsEmpty());
+  EXPECT_TRUE(rect.IsFinite());
+}
+
+TEST(RectTest, IRectDefaultConstructor) {
+  IRect rect = IRect();
+
+  EXPECT_EQ(rect.GetLeft(), 0);
+  EXPECT_EQ(rect.GetTop(), 0);
+  EXPECT_EQ(rect.GetRight(), 0);
+  EXPECT_EQ(rect.GetBottom(), 0);
+  EXPECT_EQ(rect.GetX(), 0);
+  EXPECT_EQ(rect.GetY(), 0);
+  EXPECT_EQ(rect.GetWidth(), 0);
+  EXPECT_EQ(rect.GetHeight(), 0);
+  EXPECT_TRUE(rect.IsEmpty());
+}
+
+TEST(RectTest, RectSimpleLTRB) {
+  // Using fractional-power-of-2 friendly values for equality tests
+  Rect rect = Rect::MakeLTRB(5.125f, 10.25f, 20.625f, 25.375f);
+
+  EXPECT_EQ(rect.GetLeft(), 5.125f);
+  EXPECT_EQ(rect.GetTop(), 10.25f);
+  EXPECT_EQ(rect.GetRight(), 20.625f);
+  EXPECT_EQ(rect.GetBottom(), 25.375f);
+  EXPECT_EQ(rect.GetX(), 5.125f);
+  EXPECT_EQ(rect.GetY(), 10.25f);
+  EXPECT_EQ(rect.GetWidth(), 15.5f);
+  EXPECT_EQ(rect.GetHeight(), 15.125f);
+  EXPECT_FALSE(rect.IsEmpty());
+  EXPECT_TRUE(rect.IsFinite());
+}
+
+TEST(RectTest, IRectSimpleLTRB) {
+  IRect rect = IRect::MakeLTRB(5, 10, 20, 25);
+
+  EXPECT_EQ(rect.GetLeft(), 5);
+  EXPECT_EQ(rect.GetTop(), 10);
+  EXPECT_EQ(rect.GetRight(), 20);
+  EXPECT_EQ(rect.GetBottom(), 25);
+  EXPECT_EQ(rect.GetX(), 5);
+  EXPECT_EQ(rect.GetY(), 10);
+  EXPECT_EQ(rect.GetWidth(), 15);
+  EXPECT_EQ(rect.GetHeight(), 15);
+  EXPECT_FALSE(rect.IsEmpty());
+}
+
+TEST(RectTest, RectSimpleXYWH) {
+  // Using fractional-power-of-2 friendly values for equality tests
+  Rect rect = Rect::MakeXYWH(5.125f, 10.25f, 15.5f, 15.125f);
+
+  EXPECT_EQ(rect.GetLeft(), 5.125f);
+  EXPECT_EQ(rect.GetTop(), 10.25f);
+  EXPECT_EQ(rect.GetRight(), 20.625f);
+  EXPECT_EQ(rect.GetBottom(), 25.375f);
+  EXPECT_EQ(rect.GetX(), 5.125f);
+  EXPECT_EQ(rect.GetY(), 10.25f);
+  EXPECT_EQ(rect.GetWidth(), 15.5f);
+  EXPECT_EQ(rect.GetHeight(), 15.125f);
+  EXPECT_FALSE(rect.IsEmpty());
+  EXPECT_TRUE(rect.IsFinite());
+}
+
+TEST(RectTest, IRectSimpleXYWH) {
+  IRect rect = IRect::MakeXYWH(5, 10, 15, 16);
+
+  EXPECT_EQ(rect.GetLeft(), 5);
+  EXPECT_EQ(rect.GetTop(), 10);
+  EXPECT_EQ(rect.GetRight(), 20);
+  EXPECT_EQ(rect.GetBottom(), 26);
+  EXPECT_EQ(rect.GetX(), 5);
+  EXPECT_EQ(rect.GetY(), 10);
+  EXPECT_EQ(rect.GetWidth(), 15);
+  EXPECT_EQ(rect.GetHeight(), 16);
+  EXPECT_FALSE(rect.IsEmpty());
+}
+
+TEST(RectTest, RectOverflowXYWH) {
+  auto min = std::numeric_limits<Scalar>::lowest();
+  auto max = std::numeric_limits<Scalar>::max();
+  auto inf = std::numeric_limits<Scalar>::infinity();
+
+  // 8 cases:
+  //   finite X, max W
+  //   max X, max W
+  //   finite Y, max H
+  //   max Y, max H
+  //   finite X, min W
+  //   min X, min W
+  //   finite Y, min H
+  //   min Y, min H
+
+  // a small finite value added to a max value will remain max
+  // a very large finite value (like max) added to max will go to infinity
+
+  {
+    Rect rect = Rect::MakeXYWH(5.0, 10.0f, max, 15.0f);
+
+    EXPECT_EQ(rect.GetLeft(), 5.0f);
+    EXPECT_EQ(rect.GetTop(), 10.0f);
+    EXPECT_EQ(rect.GetRight(), max);
+    EXPECT_EQ(rect.GetBottom(), 25.0f);
+    EXPECT_EQ(rect.GetX(), 5.0f);
+    EXPECT_EQ(rect.GetY(), 10.0f);
+    EXPECT_EQ(rect.GetWidth(), max);
+    EXPECT_EQ(rect.GetHeight(), 15.0f);
+    EXPECT_FALSE(rect.IsEmpty());
+    EXPECT_TRUE(rect.IsFinite());
+  }
+
+  {
+    Rect rect = Rect::MakeXYWH(max, 10.0f, max, 15.0f);
+
+    EXPECT_EQ(rect.GetLeft(), max);
+    EXPECT_EQ(rect.GetTop(), 10.0f);
+    EXPECT_EQ(rect.GetRight(), inf);
+    EXPECT_EQ(rect.GetBottom(), 25.0f);
+    EXPECT_EQ(rect.GetX(), max);
+    EXPECT_EQ(rect.GetY(), 10.0f);
+    EXPECT_EQ(rect.GetWidth(), inf);
+    EXPECT_EQ(rect.GetHeight(), 15.0f);
+    EXPECT_FALSE(rect.IsEmpty());
+    EXPECT_FALSE(rect.IsFinite());
+  }
+
+  {
+    Rect rect = Rect::MakeXYWH(5.0f, 10.0f, 20.0f, max);
+
+    EXPECT_EQ(rect.GetLeft(), 5.0f);
+    EXPECT_EQ(rect.GetTop(), 10.0f);
+    EXPECT_EQ(rect.GetRight(), 25.0f);
+    EXPECT_EQ(rect.GetBottom(), max);
+    EXPECT_EQ(rect.GetX(), 5.0f);
+    EXPECT_EQ(rect.GetY(), 10.0f);
+    EXPECT_EQ(rect.GetWidth(), 20.0f);
+    EXPECT_EQ(rect.GetHeight(), max);
+    EXPECT_FALSE(rect.IsEmpty());
+    EXPECT_TRUE(rect.IsFinite());
+  }
+
+  {
+    Rect rect = Rect::MakeXYWH(5.0f, max, 20.0f, max);
+
+    EXPECT_EQ(rect.GetLeft(), 5.0f);
+    EXPECT_EQ(rect.GetTop(), max);
+    EXPECT_EQ(rect.GetRight(), 25.0f);
+    EXPECT_EQ(rect.GetBottom(), inf);
+    EXPECT_EQ(rect.GetX(), 5.0f);
+    EXPECT_EQ(rect.GetY(), max);
+    EXPECT_EQ(rect.GetWidth(), 20.0f);
+    EXPECT_EQ(rect.GetHeight(), inf);
+    EXPECT_FALSE(rect.IsEmpty());
+    EXPECT_FALSE(rect.IsFinite());
+  }
+
+  {
+    Rect rect = Rect::MakeXYWH(5.0, 10.0f, min, 15.0f);
+
+    EXPECT_EQ(rect.GetLeft(), 5.0f);
+    EXPECT_EQ(rect.GetTop(), 10.0f);
+    EXPECT_EQ(rect.GetRight(), min);
+    EXPECT_EQ(rect.GetBottom(), 25.0f);
+    EXPECT_EQ(rect.GetX(), 5.0f);
+    EXPECT_EQ(rect.GetY(), 10.0f);
+    EXPECT_EQ(rect.GetWidth(), min);
+    EXPECT_EQ(rect.GetHeight(), 15.0f);
+    EXPECT_TRUE(rect.IsEmpty());
+    EXPECT_TRUE(rect.IsFinite());
+  }
+
+  {
+    Rect rect = Rect::MakeXYWH(min, 10.0f, min, 15.0f);
+
+    EXPECT_EQ(rect.GetLeft(), min);
+    EXPECT_EQ(rect.GetTop(), 10.0f);
+    EXPECT_EQ(rect.GetRight(), -inf);
+    EXPECT_EQ(rect.GetBottom(), 25.0f);
+    EXPECT_EQ(rect.GetX(), min);
+    EXPECT_EQ(rect.GetY(), 10.0f);
+    EXPECT_EQ(rect.GetWidth(), -inf);
+    EXPECT_EQ(rect.GetHeight(), 15.0f);
+    EXPECT_TRUE(rect.IsEmpty());
+    EXPECT_FALSE(rect.IsFinite());
+  }
+
+  {
+    Rect rect = Rect::MakeXYWH(5.0f, 10.0f, 20.0f, min);
+
+    EXPECT_EQ(rect.GetLeft(), 5.0f);
+    EXPECT_EQ(rect.GetTop(), 10.0f);
+    EXPECT_EQ(rect.GetRight(), 25.0f);
+    EXPECT_EQ(rect.GetBottom(), min);
+    EXPECT_EQ(rect.GetX(), 5.0f);
+    EXPECT_EQ(rect.GetY(), 10.0f);
+    EXPECT_EQ(rect.GetWidth(), 20.0f);
+    EXPECT_EQ(rect.GetHeight(), min);
+    EXPECT_TRUE(rect.IsEmpty());
+    EXPECT_TRUE(rect.IsFinite());
+  }
+
+  {
+    Rect rect = Rect::MakeXYWH(5.0f, min, 20.0f, min);
+
+    EXPECT_EQ(rect.GetLeft(), 5.0f);
+    EXPECT_EQ(rect.GetTop(), min);
+    EXPECT_EQ(rect.GetRight(), 25.0f);
+    EXPECT_EQ(rect.GetBottom(), -inf);
+    EXPECT_EQ(rect.GetX(), 5.0f);
+    EXPECT_EQ(rect.GetY(), min);
+    EXPECT_EQ(rect.GetWidth(), 20.0f);
+    EXPECT_EQ(rect.GetHeight(), -inf);
+    EXPECT_TRUE(rect.IsEmpty());
+    EXPECT_FALSE(rect.IsFinite());
+  }
+}
+
+TEST(RectTest, IRectOverflowXYWH) {
+  auto min = std::numeric_limits<int64_t>::min();
+  auto max = std::numeric_limits<int64_t>::max();
+
+  // 4 cases
+  //   x near max, positive w takes it past max
+  //   x near min, negative w takes it below min
+  //   y near max, positive h takes it past max
+  //   y near min, negative h takes it below min
+
+  {
+    IRect rect = IRect::MakeXYWH(max - 5, 10, 10, 16);
+
+    EXPECT_EQ(rect.GetLeft(), max - 5);
+    EXPECT_EQ(rect.GetTop(), 10);
+    EXPECT_EQ(rect.GetRight(), max);
+    EXPECT_EQ(rect.GetBottom(), 26);
+    EXPECT_EQ(rect.GetX(), max - 5);
+    EXPECT_EQ(rect.GetY(), 10);
+    EXPECT_EQ(rect.GetWidth(), 5);
+    EXPECT_EQ(rect.GetHeight(), 16);
+    EXPECT_FALSE(rect.IsEmpty());
+  }
+
+  {
+    IRect rect = IRect::MakeXYWH(min + 5, 10, -10, 16);
+
+    EXPECT_EQ(rect.GetLeft(), min + 5);
+    EXPECT_EQ(rect.GetTop(), 10);
+    EXPECT_EQ(rect.GetRight(), min);
+    EXPECT_EQ(rect.GetBottom(), 26);
+    EXPECT_EQ(rect.GetX(), min + 5);
+    EXPECT_EQ(rect.GetY(), 10);
+    EXPECT_EQ(rect.GetWidth(), -5);
+    EXPECT_EQ(rect.GetHeight(), 16);
+    EXPECT_TRUE(rect.IsEmpty());
+  }
+
+  {
+    IRect rect = IRect::MakeXYWH(5, max - 10, 10, 16);
+
+    EXPECT_EQ(rect.GetLeft(), 5);
+    EXPECT_EQ(rect.GetTop(), max - 10);
+    EXPECT_EQ(rect.GetRight(), 15);
+    EXPECT_EQ(rect.GetBottom(), max);
+    EXPECT_EQ(rect.GetX(), 5);
+    EXPECT_EQ(rect.GetY(), max - 10);
+    EXPECT_EQ(rect.GetWidth(), 10);
+    EXPECT_EQ(rect.GetHeight(), 10);
+    EXPECT_FALSE(rect.IsEmpty());
+  }
+
+  {
+    IRect rect = IRect::MakeXYWH(5, min + 10, 10, -16);
+
+    EXPECT_EQ(rect.GetLeft(), 5);
+    EXPECT_EQ(rect.GetTop(), min + 10);
+    EXPECT_EQ(rect.GetRight(), 15);
+    EXPECT_EQ(rect.GetBottom(), min);
+    EXPECT_EQ(rect.GetX(), 5);
+    EXPECT_EQ(rect.GetY(), min + 10);
+    EXPECT_EQ(rect.GetWidth(), 10);
+    EXPECT_EQ(rect.GetHeight(), -10);
+    EXPECT_TRUE(rect.IsEmpty());
+  }
+}
+
+TEST(RectTest, RectOverflowLTRB) {
+  auto min = std::numeric_limits<Scalar>::lowest();
+  auto max = std::numeric_limits<Scalar>::max();
+  auto inf = std::numeric_limits<Scalar>::infinity();
+
+  // 8 cases:
+  //   finite negative X, max W
+  //   ~min X, ~max W
+  //   finite negative Y, max H
+  //   ~min Y, ~max H
+  //   finite positive X, min W
+  //   ~min X, ~min W
+  //   finite positive Y, min H
+  //   ~min Y, ~min H
+
+  // a small finite value subtracted from a max value will remain max
+  // a very large finite value (like min) subtracted from max will go to inf
+
+  {
+    Rect rect = Rect::MakeLTRB(-5.0f, 10.0f, max, 25.0f);
+
+    EXPECT_EQ(rect.GetLeft(), -5.0f);
+    EXPECT_EQ(rect.GetTop(), 10.0f);
+    EXPECT_EQ(rect.GetRight(), max);
+    EXPECT_EQ(rect.GetBottom(), 25.0f);
+    EXPECT_EQ(rect.GetX(), -5.0f);
+    EXPECT_EQ(rect.GetY(), 10.0f);
+    EXPECT_EQ(rect.GetWidth(), max);
+    EXPECT_EQ(rect.GetHeight(), 15.0f);
+    EXPECT_FALSE(rect.IsEmpty());
+    EXPECT_TRUE(rect.IsFinite());
+  }
+
+  {
+    Rect rect = Rect::MakeLTRB(min + 5.0f, 10.0f, max - 5.0f, 25.0f);
+
+    EXPECT_EQ(rect.GetLeft(), min + 5.0f);
+    EXPECT_EQ(rect.GetTop(), 10.0f);
+    EXPECT_EQ(rect.GetRight(), max - 5.0f);
+    EXPECT_EQ(rect.GetBottom(), 25.0f);
+    EXPECT_EQ(rect.GetX(), min + 5.0f);
+    EXPECT_EQ(rect.GetY(), 10.0f);
+    EXPECT_EQ(rect.GetWidth(), inf);
+    EXPECT_EQ(rect.GetHeight(), 15.0f);
+    EXPECT_FALSE(rect.IsEmpty());
+    EXPECT_TRUE(rect.IsFinite());
+  }
+
+  {
+    Rect rect = Rect::MakeLTRB(5.0f, -10.0f, 20.0f, max);
+
+    EXPECT_EQ(rect.GetLeft(), 5.0f);
+    EXPECT_EQ(rect.GetTop(), -10.0f);
+    EXPECT_EQ(rect.GetRight(), 20.0f);
+    EXPECT_EQ(rect.GetBottom(), max);
+    EXPECT_EQ(rect.GetX(), 5.0f);
+    EXPECT_EQ(rect.GetY(), -10.0f);
+    EXPECT_EQ(rect.GetWidth(), 15.0f);
+    EXPECT_EQ(rect.GetHeight(), max);
+    EXPECT_FALSE(rect.IsEmpty());
+    EXPECT_TRUE(rect.IsFinite());
+  }
+
+  {
+    Rect rect = Rect::MakeLTRB(5.0f, min + 10.0f, 20.0f, max - 15.0f);
+
+    EXPECT_EQ(rect.GetLeft(), 5.0f);
+    EXPECT_EQ(rect.GetTop(), min + 10.0f);
+    EXPECT_EQ(rect.GetRight(), 20.0f);
+    EXPECT_EQ(rect.GetBottom(), max - 15.0f);
+    EXPECT_EQ(rect.GetX(), 5.0f);
+    EXPECT_EQ(rect.GetY(), min + 10.0f);
+    EXPECT_EQ(rect.GetWidth(), 15.0f);
+    EXPECT_EQ(rect.GetHeight(), inf);
+    EXPECT_FALSE(rect.IsEmpty());
+    EXPECT_TRUE(rect.IsFinite());
+  }
+
+  {
+    Rect rect = Rect::MakeLTRB(5.0f, 10.0f, min, 25.0f);
+
+    EXPECT_EQ(rect.GetLeft(), 5.0f);
+    EXPECT_EQ(rect.GetTop(), 10.0f);
+    EXPECT_EQ(rect.GetRight(), min);
+    EXPECT_EQ(rect.GetBottom(), 25.0f);
+    EXPECT_EQ(rect.GetX(), 5.0f);
+    EXPECT_EQ(rect.GetY(), 10.0f);
+    EXPECT_EQ(rect.GetWidth(), min);
+    EXPECT_EQ(rect.GetHeight(), 15.0f);
+    EXPECT_TRUE(rect.IsEmpty());
+    EXPECT_TRUE(rect.IsFinite());
+  }
+
+  {
+    Rect rect = Rect::MakeLTRB(max - 5.0f, 10.0f, min + 10.0f, 25.0f);
+
+    EXPECT_EQ(rect.GetLeft(), max - 5.0f);
+    EXPECT_EQ(rect.GetTop(), 10.0f);
+    EXPECT_EQ(rect.GetRight(), min + 10.0f);
+    EXPECT_EQ(rect.GetBottom(), 25.0f);
+    EXPECT_EQ(rect.GetX(), max - 5.0f);
+    EXPECT_EQ(rect.GetY(), 10.0f);
+    EXPECT_EQ(rect.GetWidth(), -inf);
+    EXPECT_EQ(rect.GetHeight(), 15.0f);
+    EXPECT_TRUE(rect.IsEmpty());
+    EXPECT_TRUE(rect.IsFinite());
+  }
+
+  {
+    Rect rect = Rect::MakeLTRB(5.0f, 10.0f, 20.0f, min);
+
+    EXPECT_EQ(rect.GetLeft(), 5.0f);
+    EXPECT_EQ(rect.GetTop(), 10.0f);
+    EXPECT_EQ(rect.GetRight(), 20.0f);
+    EXPECT_EQ(rect.GetBottom(), min);
+    EXPECT_EQ(rect.GetX(), 5.0f);
+    EXPECT_EQ(rect.GetY(), 10.0f);
+    EXPECT_EQ(rect.GetWidth(), 15.0f);
+    EXPECT_EQ(rect.GetHeight(), min);
+    EXPECT_TRUE(rect.IsEmpty());
+    EXPECT_TRUE(rect.IsFinite());
+  }
+
+  {
+    Rect rect = Rect::MakeLTRB(5.0f, max - 5.0f, 20.0f, min + 10.0f);
+
+    EXPECT_EQ(rect.GetLeft(), 5.0f);
+    EXPECT_EQ(rect.GetTop(), max - 5.0f);
+    EXPECT_EQ(rect.GetRight(), 20.0f);
+    EXPECT_EQ(rect.GetBottom(), min + 10.0f);
+    EXPECT_EQ(rect.GetX(), 5.0f);
+    EXPECT_EQ(rect.GetY(), max - 5.0f);
+    EXPECT_EQ(rect.GetWidth(), 15.0f);
+    EXPECT_EQ(rect.GetHeight(), -inf);
+    EXPECT_TRUE(rect.IsEmpty());
+    EXPECT_TRUE(rect.IsFinite());
+  }
+}
+
+TEST(RectTest, IRectOverflowLTRB) {
+  auto min = std::numeric_limits<int64_t>::min();
+  auto max = std::numeric_limits<int64_t>::max();
+
+  // 4 cases
+  //   negative l, r near max takes width past max
+  //   positive l, r near min takes width below min
+  //   negative t, b near max takes width past max
+  //   positive t, b near min takes width below min
+
+  {
+    IRect rect = IRect::MakeLTRB(-10, 10, max - 5, 26);
+
+    EXPECT_EQ(rect.GetLeft(), -10);
+    EXPECT_EQ(rect.GetTop(), 10);
+    EXPECT_EQ(rect.GetRight(), max - 5);
+    EXPECT_EQ(rect.GetBottom(), 26);
+    EXPECT_EQ(rect.GetX(), -10);
+    EXPECT_EQ(rect.GetY(), 10);
+    EXPECT_EQ(rect.GetWidth(), max);
+    EXPECT_EQ(rect.GetHeight(), 16);
+    EXPECT_FALSE(rect.IsEmpty());
+  }
+
+  {
+    IRect rect = IRect::MakeLTRB(10, 10, min + 5, 26);
+
+    EXPECT_EQ(rect.GetLeft(), 10);
+    EXPECT_EQ(rect.GetTop(), 10);
+    EXPECT_EQ(rect.GetRight(), min + 5);
+    EXPECT_EQ(rect.GetBottom(), 26);
+    EXPECT_EQ(rect.GetX(), 10);
+    EXPECT_EQ(rect.GetY(), 10);
+    EXPECT_EQ(rect.GetWidth(), min);
+    EXPECT_EQ(rect.GetHeight(), 16);
+    EXPECT_TRUE(rect.IsEmpty());
+  }
+
+  {
+    IRect rect = IRect::MakeLTRB(5, -10, 15, max - 5);
+
+    EXPECT_EQ(rect.GetLeft(), 5);
+    EXPECT_EQ(rect.GetTop(), -10);
+    EXPECT_EQ(rect.GetRight(), 15);
+    EXPECT_EQ(rect.GetBottom(), max - 5);
+    EXPECT_EQ(rect.GetX(), 5);
+    EXPECT_EQ(rect.GetY(), -10);
+    EXPECT_EQ(rect.GetWidth(), 10);
+    EXPECT_EQ(rect.GetHeight(), max);
+    EXPECT_FALSE(rect.IsEmpty());
+  }
+
+  {
+    IRect rect = IRect::MakeLTRB(5, 10, 15, min + 5);
+
+    EXPECT_EQ(rect.GetLeft(), 5);
+    EXPECT_EQ(rect.GetTop(), 10);
+    EXPECT_EQ(rect.GetRight(), 15);
+    EXPECT_EQ(rect.GetBottom(), min + 5);
+    EXPECT_EQ(rect.GetX(), 5);
+    EXPECT_EQ(rect.GetY(), 10);
+    EXPECT_EQ(rect.GetWidth(), 10);
+    EXPECT_EQ(rect.GetHeight(), min);
+    EXPECT_TRUE(rect.IsEmpty());
+  }
+}
+
+TEST(RectTest, RectMakeSize) {
+  {
+    Size s(100, 200);
+    Rect r = Rect::MakeSize(s);
+    Rect expected = Rect::MakeLTRB(0, 0, 100, 200);
+    EXPECT_RECT_NEAR(r, expected);
+  }
+
+  {
+    ISize s(100, 200);
+    Rect r = Rect::MakeSize(s);
+    Rect expected = Rect::MakeLTRB(0, 0, 100, 200);
+    EXPECT_RECT_NEAR(r, expected);
+  }
+
+  {
+    Size s(100, 200);
+    IRect r = IRect::MakeSize(s);
+    IRect expected = IRect::MakeLTRB(0, 0, 100, 200);
+    EXPECT_EQ(r, expected);
+  }
+
+  {
+    ISize s(100, 200);
+    IRect r = IRect::MakeSize(s);
+    IRect expected = IRect::MakeLTRB(0, 0, 100, 200);
+    EXPECT_EQ(r, expected);
+  }
+}
+
+TEST(RectTest, RectMakeMaximum) {
+  Rect rect = Rect::MakeMaximum();
+  auto inf = std::numeric_limits<Scalar>::infinity();
+  auto min = std::numeric_limits<Scalar>::lowest();
+  auto max = std::numeric_limits<Scalar>::max();
+
+  EXPECT_EQ(rect.GetLeft(), min);
+  EXPECT_EQ(rect.GetTop(), min);
+  EXPECT_EQ(rect.GetRight(), max);
+  EXPECT_EQ(rect.GetBottom(), max);
+  EXPECT_EQ(rect.GetX(), min);
+  EXPECT_EQ(rect.GetY(), min);
+  EXPECT_EQ(rect.GetWidth(), inf);
+  EXPECT_EQ(rect.GetHeight(), inf);
+  EXPECT_FALSE(rect.IsEmpty());
+  EXPECT_TRUE(rect.IsFinite());
+}
+
+TEST(RectTest, IRectMakeMaximum) {
+  IRect rect = IRect::MakeMaximum();
+  auto min = std::numeric_limits<int64_t>::min();
+  auto max = std::numeric_limits<int64_t>::max();
+
+  EXPECT_EQ(rect.GetLeft(), min);
+  EXPECT_EQ(rect.GetTop(), min);
+  EXPECT_EQ(rect.GetRight(), max);
+  EXPECT_EQ(rect.GetBottom(), max);
+  EXPECT_EQ(rect.GetX(), min);
+  EXPECT_EQ(rect.GetY(), min);
+  EXPECT_EQ(rect.GetWidth(), max);
+  EXPECT_EQ(rect.GetHeight(), max);
+  EXPECT_FALSE(rect.IsEmpty());
+}
+
+TEST(RectTest, RectFromRect) {
+  EXPECT_EQ(Rect(Rect::MakeXYWH(2, 3, 7, 15)),
+            Rect::MakeXYWH(2.0, 3.0, 7.0, 15.0));
+  EXPECT_EQ(Rect(Rect::MakeLTRB(2, 3, 7, 15)),
+            Rect::MakeLTRB(2.0, 3.0, 7.0, 15.0));
+}
+
+TEST(RectTest, IRectFromIRect) {
+  EXPECT_EQ(IRect(IRect::MakeXYWH(2, 3, 7, 15)),  //
+            IRect::MakeXYWH(2, 3, 7, 15));
+  EXPECT_EQ(IRect(IRect::MakeLTRB(2, 3, 7, 15)),  //
+            IRect::MakeLTRB(2, 3, 7, 15));
+}
+
+TEST(RectTest, RectCopy) {
+  // Using fractional-power-of-2 friendly values for equality tests
+  Rect rect = Rect::MakeLTRB(5.125f, 10.25f, 20.625f, 25.375f);
+  Rect copy = rect;
+
+  EXPECT_EQ(rect, copy);
+  EXPECT_EQ(copy.GetLeft(), 5.125f);
+  EXPECT_EQ(copy.GetTop(), 10.25f);
+  EXPECT_EQ(copy.GetRight(), 20.625f);
+  EXPECT_EQ(copy.GetBottom(), 25.375f);
+  EXPECT_EQ(copy.GetX(), 5.125f);
+  EXPECT_EQ(copy.GetY(), 10.25f);
+  EXPECT_EQ(copy.GetWidth(), 15.5f);
+  EXPECT_EQ(copy.GetHeight(), 15.125f);
+  EXPECT_FALSE(copy.IsEmpty());
+  EXPECT_TRUE(copy.IsFinite());
+}
+
+TEST(RectTest, IRectCopy) {
+  IRect rect = IRect::MakeLTRB(5, 10, 20, 25);
+  IRect copy = rect;
+
+  EXPECT_EQ(rect, copy);
+  EXPECT_EQ(copy.GetLeft(), 5);
+  EXPECT_EQ(copy.GetTop(), 10);
+  EXPECT_EQ(copy.GetRight(), 20);
+  EXPECT_EQ(copy.GetBottom(), 25);
+  EXPECT_EQ(copy.GetX(), 5);
+  EXPECT_EQ(copy.GetY(), 10);
+  EXPECT_EQ(copy.GetWidth(), 15);
+  EXPECT_EQ(copy.GetHeight(), 15);
+  EXPECT_FALSE(copy.IsEmpty());
+}
+
+TEST(RectTest, RectOriginSizeXYWHGetters) {
+  {
+    Rect r = Rect::MakeOriginSize({10, 20}, {50, 40});
+    EXPECT_EQ(r.GetOrigin(), Point(10, 20));
+    EXPECT_EQ(r.GetSize(), Size(50, 40));
+    EXPECT_EQ(r.GetX(), 10);
+    EXPECT_EQ(r.GetY(), 20);
+    EXPECT_EQ(r.GetWidth(), 50);
+    EXPECT_EQ(r.GetHeight(), 40);
+    auto expected_array = std::array<Scalar, 4>{10, 20, 50, 40};
+    EXPECT_EQ(r.GetXYWH(), expected_array);
+  }
+
+  {
+    Rect r = Rect::MakeLTRB(10, 20, 50, 40);
+    EXPECT_EQ(r.GetOrigin(), Point(10, 20));
+    EXPECT_EQ(r.GetSize(), Size(40, 20));
+    EXPECT_EQ(r.GetX(), 10);
+    EXPECT_EQ(r.GetY(), 20);
+    EXPECT_EQ(r.GetWidth(), 40);
+    EXPECT_EQ(r.GetHeight(), 20);
+    auto expected_array = std::array<Scalar, 4>{10, 20, 40, 20};
+    EXPECT_EQ(r.GetXYWH(), expected_array);
+  }
+}
+
+TEST(RectTest, IRectOriginSizeXYWHGetters) {
+  {
+    IRect r = IRect::MakeOriginSize({10, 20}, {50, 40});
+    EXPECT_EQ(r.GetOrigin(), IPoint(10, 20));
+    EXPECT_EQ(r.GetSize(), ISize(50, 40));
+    EXPECT_EQ(r.GetX(), 10);
+    EXPECT_EQ(r.GetY(), 20);
+    EXPECT_EQ(r.GetWidth(), 50);
+    EXPECT_EQ(r.GetHeight(), 40);
+    auto expected_array = std::array<int64_t, 4>{10, 20, 50, 40};
+    EXPECT_EQ(r.GetXYWH(), expected_array);
+  }
+
+  {
+    IRect r = IRect::MakeLTRB(10, 20, 50, 40);
+    EXPECT_EQ(r.GetOrigin(), IPoint(10, 20));
+    EXPECT_EQ(r.GetSize(), ISize(40, 20));
+    EXPECT_EQ(r.GetX(), 10);
+    EXPECT_EQ(r.GetY(), 20);
+    EXPECT_EQ(r.GetWidth(), 40);
+    EXPECT_EQ(r.GetHeight(), 20);
+    auto expected_array = std::array<int64_t, 4>{10, 20, 40, 20};
+    EXPECT_EQ(r.GetXYWH(), expected_array);
+  }
+}
+
+TEST(RectTest, RectRoundOutEmpty) {
+  Rect rect;
+
+  EXPECT_EQ(Rect::RoundOut(rect), Rect());
+
+  EXPECT_EQ(IRect::RoundOut(rect), IRect());
+}
+
+TEST(RectTest, RectRoundOutSimple) {
+  Rect rect = Rect::MakeLTRB(5.125f, 10.75f, 20.625f, 25.375f);
+
+  EXPECT_EQ(Rect::RoundOut(rect), Rect::MakeLTRB(5.0f, 10.0f, 21.0f, 26.0f));
+
+  EXPECT_EQ(IRect::RoundOut(rect), IRect::MakeLTRB(5, 10, 21, 26));
+}
+
+TEST(RectTest, RectRoundOutToIRectHuge) {
+  auto test = [](int corners) {
+    EXPECT_TRUE(corners >= 0 && corners <= 0xf);
+    Scalar l, t, r, b;
+    int64_t il, it, ir, ib;
+    l = il = 50;
+    t = it = 50;
+    r = ir = 80;
+    b = ib = 80;
+    if ((corners & (1 << 0)) != 0) {
+      l = -1E20;
+      il = std::numeric_limits<int64_t>::min();
+    }
+    if ((corners & (1 << 1)) != 0) {
+      t = -1E20;
+      it = std::numeric_limits<int64_t>::min();
+    }
+    if ((corners & (1 << 2)) != 0) {
+      r = +1E20;
+      ir = std::numeric_limits<int64_t>::max();
+    }
+    if ((corners & (1 << 3)) != 0) {
+      b = +1E20;
+      ib = std::numeric_limits<int64_t>::max();
+    }
+
+    Rect rect = Rect::MakeLTRB(l, t, r, b);
+    IRect irect = IRect::RoundOut(rect);
+    EXPECT_EQ(irect.GetLeft(), il) << corners;
+    EXPECT_EQ(irect.GetTop(), it) << corners;
+    EXPECT_EQ(irect.GetRight(), ir) << corners;
+    EXPECT_EQ(irect.GetBottom(), ib) << corners;
+  };
+
+  for (int corners = 0; corners <= 15; corners++) {
+    test(corners);
+  }
+}
+
+TEST(RectTest, RectDoesNotIntersectEmpty) {
+  Rect rect = Rect::MakeLTRB(50, 50, 100, 100);
+
+  auto test = [&rect](Scalar l, Scalar t, Scalar r, Scalar b,
+                      const std::string& label) {
+    EXPECT_FALSE(rect.IntersectsWithRect(Rect::MakeLTRB(l, b, r, t)))
+        << label << " with Top/Bottom swapped";
+    EXPECT_FALSE(rect.IntersectsWithRect(Rect::MakeLTRB(r, b, l, t)))
+        << label << " with Left/Right swapped";
+    EXPECT_FALSE(rect.IntersectsWithRect(Rect::MakeLTRB(r, t, l, b)))
+        << label << " with all sides swapped";
+  };
+
+  test(20, 20, 30, 30, "Above and Left");
+  test(70, 20, 80, 30, "Above");
+  test(120, 20, 130, 30, "Above and Right");
+  test(120, 70, 130, 80, "Right");
+  test(120, 120, 130, 130, "Below and Right");
+  test(70, 120, 80, 130, "Below");
+  test(20, 120, 30, 130, "Below and Left");
+  test(20, 70, 30, 80, "Left");
+
+  test(70, 70, 80, 80, "Inside");
+
+  test(40, 70, 60, 80, "Straddling Left");
+  test(70, 40, 80, 60, "Straddling Top");
+  test(90, 70, 110, 80, "Straddling Right");
+  test(70, 90, 80, 110, "Straddling Bottom");
+}
+
+TEST(RectTest, IRectDoesNotIntersectEmpty) {
+  IRect rect = IRect::MakeLTRB(50, 50, 100, 100);
+
+  auto test = [&rect](int64_t l, int64_t t, int64_t r, int64_t b,
+                      const std::string& label) {
+    EXPECT_FALSE(rect.IntersectsWithRect(IRect::MakeLTRB(l, b, r, t)))
+        << label << " with Top/Bottom swapped";
+    EXPECT_FALSE(rect.IntersectsWithRect(IRect::MakeLTRB(r, b, l, t)))
+        << label << " with Left/Right swapped";
+    EXPECT_FALSE(rect.IntersectsWithRect(IRect::MakeLTRB(r, t, l, b)))
+        << label << " with all sides swapped";
+  };
+
+  test(20, 20, 30, 30, "Above and Left");
+  test(70, 20, 80, 30, "Above");
+  test(120, 20, 130, 30, "Above and Right");
+  test(120, 70, 130, 80, "Right");
+  test(120, 120, 130, 130, "Below and Right");
+  test(70, 120, 80, 130, "Below");
+  test(20, 120, 30, 130, "Below and Left");
+  test(20, 70, 30, 80, "Left");
+
+  test(70, 70, 80, 80, "Inside");
+
+  test(40, 70, 60, 80, "Straddling Left");
+  test(70, 40, 80, 60, "Straddling Top");
+  test(90, 70, 110, 80, "Straddling Right");
+  test(70, 90, 80, 110, "Straddling Bottom");
+}
+
+TEST(RectTest, EmptyRectDoesNotIntersect) {
+  Rect rect = Rect::MakeLTRB(50, 50, 100, 100);
+
+  auto test = [&rect](Scalar l, Scalar t, Scalar r, Scalar b,
+                      const std::string& label) {
+    EXPECT_FALSE(Rect::MakeLTRB(l, b, r, t).IntersectsWithRect(rect))
+        << label << " with Top/Bottom swapped";
+    EXPECT_FALSE(Rect::MakeLTRB(r, b, l, t).IntersectsWithRect(rect))
+        << label << " with Left/Right swapped";
+    EXPECT_FALSE(Rect::MakeLTRB(r, t, l, b).IntersectsWithRect(rect))
+        << label << " with all sides swapped";
+  };
+
+  test(20, 20, 30, 30, "Above and Left");
+  test(70, 20, 80, 30, "Above");
+  test(120, 20, 130, 30, "Above and Right");
+  test(120, 70, 130, 80, "Right");
+  test(120, 120, 130, 130, "Below and Right");
+  test(70, 120, 80, 130, "Below");
+  test(20, 120, 30, 130, "Below and Left");
+  test(20, 70, 30, 80, "Left");
+
+  test(70, 70, 80, 80, "Inside");
+
+  test(40, 70, 60, 80, "Straddling Left");
+  test(70, 40, 80, 60, "Straddling Top");
+  test(90, 70, 110, 80, "Straddling Right");
+  test(70, 90, 80, 110, "Straddling Bottom");
+}
+
+TEST(RectTest, EmptyIRectDoesNotIntersect) {
+  IRect rect = IRect::MakeLTRB(50, 50, 100, 100);
+
+  auto test = [&rect](int64_t l, int64_t t, int64_t r, int64_t b,
+                      const std::string& label) {
+    EXPECT_FALSE(IRect::MakeLTRB(l, b, r, t).IntersectsWithRect(rect))
+        << label << " with Top/Bottom swapped";
+    EXPECT_FALSE(IRect::MakeLTRB(r, b, l, t).IntersectsWithRect(rect))
+        << label << " with Left/Right swapped";
+    EXPECT_FALSE(IRect::MakeLTRB(r, t, l, b).IntersectsWithRect(rect))
+        << label << " with all sides swapped";
+  };
+
+  test(20, 20, 30, 30, "Above and Left");
+  test(70, 20, 80, 30, "Above");
+  test(120, 20, 130, 30, "Above and Right");
+  test(120, 70, 130, 80, "Right");
+  test(120, 120, 130, 130, "Below and Right");
+  test(70, 120, 80, 130, "Below");
+  test(20, 120, 30, 130, "Below and Left");
+  test(20, 70, 30, 80, "Left");
+
+  test(70, 70, 80, 80, "Inside");
+
+  test(40, 70, 60, 80, "Straddling Left");
+  test(70, 40, 80, 60, "Straddling Top");
+  test(90, 70, 110, 80, "Straddling Right");
+  test(70, 90, 80, 110, "Straddling Bottom");
+}
+
+TEST(RectTest, RectScale) {
+  auto test1 = [](Rect rect, Scalar scale) {
+    Rect expected = Rect::MakeXYWH(rect.GetX() * scale,      //
+                                   rect.GetY() * scale,      //
+                                   rect.GetWidth() * scale,  //
+                                   rect.GetHeight() * scale);
+
+    EXPECT_RECT_NEAR(rect.Scale(scale), expected)  //
+        << rect << " * " << scale;
+    EXPECT_RECT_NEAR(rect.Scale(scale, scale), expected)  //
+        << rect << " * " << scale;
+    EXPECT_RECT_NEAR(rect.Scale(Point(scale, scale)), expected)  //
+        << rect << " * " << scale;
+    EXPECT_RECT_NEAR(rect.Scale(Size(scale, scale)), expected)  //
+        << rect << " * " << scale;
+  };
+
+  auto test2 = [&test1](Rect rect, Scalar scale_x, Scalar scale_y) {
+    Rect expected = Rect::MakeXYWH(rect.GetX() * scale_x,      //
+                                   rect.GetY() * scale_y,      //
+                                   rect.GetWidth() * scale_x,  //
+                                   rect.GetHeight() * scale_y);
+
+    EXPECT_RECT_NEAR(rect.Scale(scale_x, scale_y), expected)  //
+        << rect << " * " << scale_x << ", " << scale_y;
+    EXPECT_RECT_NEAR(rect.Scale(Point(scale_x, scale_y)), expected)  //
+        << rect << " * " << scale_x << ", " << scale_y;
+    EXPECT_RECT_NEAR(rect.Scale(Size(scale_x, scale_y)), expected)  //
+        << rect << " * " << scale_x << ", " << scale_y;
+
+    test1(rect, scale_x);
+    test1(rect, scale_y);
+  };
+
+  test2(Rect::MakeLTRB(10, 15, 100, 150), 1.0, 0.0);
+  test2(Rect::MakeLTRB(10, 15, 100, 150), 0.0, 1.0);
+  test2(Rect::MakeLTRB(10, 15, 100, 150), 0.0, 0.0);
+  test2(Rect::MakeLTRB(10, 15, 100, 150), 2.5, 3.5);
+  test2(Rect::MakeLTRB(10, 15, 100, 150), 3.5, 2.5);
+  test2(Rect::MakeLTRB(10, 15, -100, 150), 2.5, 3.5);
+  test2(Rect::MakeLTRB(10, 15, 100, -150), 2.5, 3.5);
+  test2(Rect::MakeLTRB(10, 15, 100, 150), -2.5, 3.5);
+  test2(Rect::MakeLTRB(10, 15, 100, 150), 2.5, -3.5);
+}
+
+TEST(RectTest, IRectScale) {
+  auto test1 = [](IRect rect, int64_t scale) {
+    IRect expected = IRect::MakeXYWH(rect.GetX() * scale,      //
+                                     rect.GetY() * scale,      //
+                                     rect.GetWidth() * scale,  //
+                                     rect.GetHeight() * scale);
+
+    EXPECT_EQ(rect.Scale(scale), expected)  //
+        << rect << " * " << scale;
+    EXPECT_EQ(rect.Scale(scale, scale), expected)  //
+        << rect << " * " << scale;
+    EXPECT_EQ(rect.Scale(IPoint(scale, scale)), expected)  //
+        << rect << " * " << scale;
+    EXPECT_EQ(rect.Scale(ISize(scale, scale)), expected)  //
+        << rect << " * " << scale;
+  };
+
+  auto test2 = [&test1](IRect rect, int64_t scale_x, int64_t scale_y) {
+    IRect expected = IRect::MakeXYWH(rect.GetX() * scale_x,      //
+                                     rect.GetY() * scale_y,      //
+                                     rect.GetWidth() * scale_x,  //
+                                     rect.GetHeight() * scale_y);
+
+    EXPECT_EQ(rect.Scale(scale_x, scale_y), expected)  //
+        << rect << " * " << scale_x << ", " << scale_y;
+    EXPECT_EQ(rect.Scale(IPoint(scale_x, scale_y)), expected)  //
+        << rect << " * " << scale_x << ", " << scale_y;
+    EXPECT_EQ(rect.Scale(ISize(scale_x, scale_y)), expected)  //
+        << rect << " * " << scale_x << ", " << scale_y;
+
+    test1(rect, scale_x);
+    test1(rect, scale_y);
+  };
+
+  test2(IRect::MakeLTRB(10, 15, 100, 150), 2, 3);
+  test2(IRect::MakeLTRB(10, 15, 100, 150), 3, 2);
+  test2(IRect::MakeLTRB(10, 15, -100, 150), 2, 3);
+  test2(IRect::MakeLTRB(10, 15, 100, -150), 2, 3);
+  test2(IRect::MakeLTRB(10, 15, 100, 150), -2, 3);
+  test2(IRect::MakeLTRB(10, 15, 100, 150), 2, -3);
+}
+
+TEST(RectTest, RectArea) {
+  EXPECT_EQ(Rect::MakeXYWH(0, 0, 100, 200).Area(), 20000);
+  EXPECT_EQ(Rect::MakeXYWH(10, 20, 100, 200).Area(), 20000);
+  EXPECT_EQ(Rect::MakeXYWH(0, 0, 200, 100).Area(), 20000);
+  EXPECT_EQ(Rect::MakeXYWH(10, 20, 200, 100).Area(), 20000);
+  EXPECT_EQ(Rect::MakeXYWH(0, 0, 100, 100).Area(), 10000);
+  EXPECT_EQ(Rect::MakeXYWH(10, 20, 100, 100).Area(), 10000);
+}
+
+TEST(RectTest, IRectArea) {
+  EXPECT_EQ(IRect::MakeXYWH(0, 0, 100, 200).Area(), 20000);
+  EXPECT_EQ(IRect::MakeXYWH(10, 20, 100, 200).Area(), 20000);
+  EXPECT_EQ(IRect::MakeXYWH(0, 0, 200, 100).Area(), 20000);
+  EXPECT_EQ(IRect::MakeXYWH(10, 20, 200, 100).Area(), 20000);
+  EXPECT_EQ(IRect::MakeXYWH(0, 0, 100, 100).Area(), 10000);
+  EXPECT_EQ(IRect::MakeXYWH(10, 20, 100, 100).Area(), 10000);
+}
+
+TEST(RectTest, RectGetNormalizingTransform) {
+  {
+    // Checks for expected matrix values
+
+    auto r = Rect::MakeXYWH(100, 200, 200, 400);
+
+    EXPECT_EQ(r.GetNormalizingTransform(),
+              Matrix::MakeScale({0.005, 0.0025, 1.0}) *
+                  Matrix::MakeTranslation({-100, -200}));
+  }
+
+  {
+    // Checks for expected transform of points relative to the rect
+
+    auto r = Rect::MakeLTRB(300, 500, 400, 700);
+    auto m = r.GetNormalizingTransform();
+
+    // The 4 corners of the rect => (0, 0) to (1, 1)
+    EXPECT_EQ(m * Point(300, 500), Point(0, 0));
+    EXPECT_EQ(m * Point(400, 500), Point(1, 0));
+    EXPECT_EQ(m * Point(400, 700), Point(1, 1));
+    EXPECT_EQ(m * Point(300, 700), Point(0, 1));
+
+    // The center => (0.5, 0.5)
+    EXPECT_EQ(m * Point(350, 600), Point(0.5, 0.5));
+
+    // Outside the 4 corners => (-1, -1) to (2, 2)
+    EXPECT_EQ(m * Point(200, 300), Point(-1, -1));
+    EXPECT_EQ(m * Point(500, 300), Point(2, -1));
+    EXPECT_EQ(m * Point(500, 900), Point(2, 2));
+    EXPECT_EQ(m * Point(200, 900), Point(-1, 2));
+  }
+
+  {
+    // Checks for behavior with empty rects
+
+    auto zero = Matrix::MakeScale({0.0, 0.0, 1.0});
+
+    // Empty for width and/or height == 0
+    EXPECT_EQ(Rect::MakeXYWH(10, 10, 0, 10).GetNormalizingTransform(), zero);
+    EXPECT_EQ(Rect::MakeXYWH(10, 10, 10, 0).GetNormalizingTransform(), zero);
+    EXPECT_EQ(Rect::MakeXYWH(10, 10, 0, 0).GetNormalizingTransform(), zero);
+
+    // Empty for width and/or height < 0
+    EXPECT_EQ(Rect::MakeXYWH(10, 10, -1, 10).GetNormalizingTransform(), zero);
+    EXPECT_EQ(Rect::MakeXYWH(10, 10, 10, -1).GetNormalizingTransform(), zero);
+    EXPECT_EQ(Rect::MakeXYWH(10, 10, -1, -1).GetNormalizingTransform(), zero);
+  }
+
+  {
+    // Checks for behavior with non-finite rects
+
+    auto z = Matrix::MakeScale({0.0, 0.0, 1.0});
+    auto nan = std::numeric_limits<Scalar>::quiet_NaN();
+    auto inf = std::numeric_limits<Scalar>::infinity();
+
+    // Non-finite for width and/or height == nan
+    EXPECT_EQ(Rect::MakeXYWH(10, 10, nan, 10).GetNormalizingTransform(), z);
+    EXPECT_EQ(Rect::MakeXYWH(10, 10, 10, nan).GetNormalizingTransform(), z);
+    EXPECT_EQ(Rect::MakeXYWH(10, 10, nan, nan).GetNormalizingTransform(), z);
+
+    // Non-finite for width and/or height == inf
+    EXPECT_EQ(Rect::MakeXYWH(10, 10, inf, 10).GetNormalizingTransform(), z);
+    EXPECT_EQ(Rect::MakeXYWH(10, 10, 10, inf).GetNormalizingTransform(), z);
+    EXPECT_EQ(Rect::MakeXYWH(10, 10, inf, inf).GetNormalizingTransform(), z);
+
+    // Non-finite for width and/or height == -inf
+    EXPECT_EQ(Rect::MakeXYWH(10, 10, -inf, 10).GetNormalizingTransform(), z);
+    EXPECT_EQ(Rect::MakeXYWH(10, 10, 10, -inf).GetNormalizingTransform(), z);
+    EXPECT_EQ(Rect::MakeXYWH(10, 10, -inf, -inf).GetNormalizingTransform(), z);
+
+    // Non-finite for origin X and/or Y == nan
+    EXPECT_EQ(Rect::MakeXYWH(nan, 10, 10, 10).GetNormalizingTransform(), z);
+    EXPECT_EQ(Rect::MakeXYWH(10, nan, 10, 10).GetNormalizingTransform(), z);
+    EXPECT_EQ(Rect::MakeXYWH(nan, nan, 10, 10).GetNormalizingTransform(), z);
+
+    // Non-finite for origin X and/or Y == inf
+    EXPECT_EQ(Rect::MakeXYWH(inf, 10, 10, 10).GetNormalizingTransform(), z);
+    EXPECT_EQ(Rect::MakeXYWH(10, inf, 10, 10).GetNormalizingTransform(), z);
+    EXPECT_EQ(Rect::MakeXYWH(inf, inf, 10, 10).GetNormalizingTransform(), z);
+
+    // Non-finite for origin X and/or Y == -inf
+    EXPECT_EQ(Rect::MakeXYWH(-inf, 10, 10, 10).GetNormalizingTransform(), z);
+    EXPECT_EQ(Rect::MakeXYWH(10, -inf, 10, 10).GetNormalizingTransform(), z);
+    EXPECT_EQ(Rect::MakeXYWH(-inf, -inf, 10, 10).GetNormalizingTransform(), z);
+  }
+}
+
+TEST(RectTest, IRectGetNormalizingTransform) {
+  {
+    // Checks for expected matrix values
+
+    auto r = IRect::MakeXYWH(100, 200, 200, 400);
+
+    EXPECT_EQ(r.GetNormalizingTransform(),
+              Matrix::MakeScale({0.005, 0.0025, 1.0}) *
+                  Matrix::MakeTranslation({-100, -200}));
+  }
+
+  {
+    // Checks for expected transform of points relative to the rect
+
+    auto r = IRect::MakeLTRB(300, 500, 400, 700);
+    auto m = r.GetNormalizingTransform();
+
+    // The 4 corners of the rect => (0, 0) to (1, 1)
+    EXPECT_EQ(m * Point(300, 500), Point(0, 0));
+    EXPECT_EQ(m * Point(400, 500), Point(1, 0));
+    EXPECT_EQ(m * Point(400, 700), Point(1, 1));
+    EXPECT_EQ(m * Point(300, 700), Point(0, 1));
+
+    // The center => (0.5, 0.5)
+    EXPECT_EQ(m * Point(350, 600), Point(0.5, 0.5));
+
+    // Outside the 4 corners => (-1, -1) to (2, 2)
+    EXPECT_EQ(m * Point(200, 300), Point(-1, -1));
+    EXPECT_EQ(m * Point(500, 300), Point(2, -1));
+    EXPECT_EQ(m * Point(500, 900), Point(2, 2));
+    EXPECT_EQ(m * Point(200, 900), Point(-1, 2));
+  }
+
+  {
+    // Checks for behavior with empty rects
+
+    auto zero = Matrix::MakeScale({0.0, 0.0, 1.0});
+
+    // Empty for width and/or height == 0
+    EXPECT_EQ(IRect::MakeXYWH(10, 10, 0, 10).GetNormalizingTransform(), zero);
+    EXPECT_EQ(IRect::MakeXYWH(10, 10, 10, 0).GetNormalizingTransform(), zero);
+    EXPECT_EQ(IRect::MakeXYWH(10, 10, 0, 0).GetNormalizingTransform(), zero);
+
+    // Empty for width and/or height < 0
+    EXPECT_EQ(IRect::MakeXYWH(10, 10, -1, 10).GetNormalizingTransform(), zero);
+    EXPECT_EQ(IRect::MakeXYWH(10, 10, 10, -1).GetNormalizingTransform(), zero);
+    EXPECT_EQ(IRect::MakeXYWH(10, 10, -1, -1).GetNormalizingTransform(), zero);
+  }
+}
+
+TEST(RectTest, RectXYWHIsEmpty) {
+  auto nan = std::numeric_limits<Scalar>::quiet_NaN();
+
+  // Non-empty
+  EXPECT_FALSE(Rect::MakeXYWH(1.5, 2.3, 10.5, 7.2).IsEmpty());
+
+  // Empty both width and height both 0 or negative, in all combinations
+  EXPECT_TRUE(Rect::MakeXYWH(1.5, 2.3, 0.0, 0.0).IsEmpty());
+  EXPECT_TRUE(Rect::MakeXYWH(1.5, 2.3, -1.0, -1.0).IsEmpty());
+  EXPECT_TRUE(Rect::MakeXYWH(1.5, 2.3, 0.0, -1.0).IsEmpty());
+  EXPECT_TRUE(Rect::MakeXYWH(1.5, 2.3, -1.0, 0.0).IsEmpty());
+
+  // Empty for 0 or negative width or height (but not both at the same time)
+  EXPECT_TRUE(Rect::MakeXYWH(1.5, 2.3, 10.5, 0.0).IsEmpty());
+  EXPECT_TRUE(Rect::MakeXYWH(1.5, 2.3, 10.5, -1.0).IsEmpty());
+  EXPECT_TRUE(Rect::MakeXYWH(1.5, 2.3, 0.0, 7.2).IsEmpty());
+  EXPECT_TRUE(Rect::MakeXYWH(1.5, 2.3, -1.0, 7.2).IsEmpty());
+
+  // Empty for NaN in width or height or both
+  EXPECT_TRUE(Rect::MakeXYWH(1.5, 2.3, 10.5, nan).IsEmpty());
+  EXPECT_TRUE(Rect::MakeXYWH(1.5, 2.3, nan, 7.2).IsEmpty());
+  EXPECT_TRUE(Rect::MakeXYWH(1.5, 2.3, nan, nan).IsEmpty());
+}
+
+TEST(RectTest, IRectXYWHIsEmpty) {
+  // Non-empty
+  EXPECT_FALSE(IRect::MakeXYWH(1, 2, 10, 7).IsEmpty());
+
+  // Empty both width and height both 0 or negative, in all combinations
+  EXPECT_TRUE(IRect::MakeXYWH(1, 2, 0, 0).IsEmpty());
+  EXPECT_TRUE(IRect::MakeXYWH(1, 2, -1, -1).IsEmpty());
+  EXPECT_TRUE(IRect::MakeXYWH(1, 2, -1, 0).IsEmpty());
+  EXPECT_TRUE(IRect::MakeXYWH(1, 2, 0, -1).IsEmpty());
+
+  // Empty for 0 or negative width or height (but not both at the same time)
+  EXPECT_TRUE(IRect::MakeXYWH(1, 2, 10, 0).IsEmpty());
+  EXPECT_TRUE(IRect::MakeXYWH(1, 2, 10, -1).IsEmpty());
+  EXPECT_TRUE(IRect::MakeXYWH(1, 2, 0, 7).IsEmpty());
+  EXPECT_TRUE(IRect::MakeXYWH(1, 2, -1, 7).IsEmpty());
+}
+
+TEST(RectTest, MakePointBoundsQuad) {
+  Quad quad = {
+      Point(10, 10),
+      Point(20, 10),
+      Point(10, 20),
+      Point(20, 20),
+  };
+  std::optional<Rect> bounds = Rect::MakePointBounds(quad);
+  EXPECT_TRUE(bounds.has_value());
+  if (bounds.has_value()) {
+    EXPECT_TRUE(RectNear(bounds.value(), Rect::MakeLTRB(10, 10, 20, 20)));
+  }
+}
+
+TEST(RectTest, IsSquare) {
+  EXPECT_TRUE(Rect::MakeXYWH(10, 30, 20, 20).IsSquare());
+  EXPECT_FALSE(Rect::MakeXYWH(10, 30, 20, 19).IsSquare());
+  EXPECT_FALSE(Rect::MakeXYWH(10, 30, 19, 20).IsSquare());
+  EXPECT_TRUE(Rect::MakeMaximum().IsSquare());
+
+  EXPECT_TRUE(IRect::MakeXYWH(10, 30, 20, 20).IsSquare());
+  EXPECT_FALSE(IRect::MakeXYWH(10, 30, 20, 19).IsSquare());
+  EXPECT_FALSE(IRect::MakeXYWH(10, 30, 19, 20).IsSquare());
+  EXPECT_TRUE(IRect::MakeMaximum().IsSquare());
+}
+
+TEST(RectTest, GetCenter) {
+  EXPECT_EQ(Rect::MakeXYWH(10, 30, 20, 20).GetCenter(), Point(20, 40));
+  EXPECT_EQ(Rect::MakeXYWH(10, 30, 20, 19).GetCenter(), Point(20, 39.5));
+  EXPECT_EQ(Rect::MakeMaximum().GetCenter(), Point(0, 0));
+
+  // Note that we expect a Point as the answer from an IRect
+  EXPECT_EQ(IRect::MakeXYWH(10, 30, 20, 20).GetCenter(), Point(20, 40));
+  EXPECT_EQ(IRect::MakeXYWH(10, 30, 20, 19).GetCenter(), Point(20, 39.5));
+  EXPECT_EQ(IRect::MakeMaximum().GetCenter(), Point(0, 0));
+}
+
+TEST(RectTest, RectExpand) {
+  auto rect = Rect::MakeLTRB(100, 100, 200, 200);
+
+  // Expand(T amount)
+  EXPECT_EQ(rect.Expand(10), Rect::MakeLTRB(90, 90, 210, 210));
+  EXPECT_EQ(rect.Expand(-10), Rect::MakeLTRB(110, 110, 190, 190));
+
+  // Expand(amount, amount)
+  EXPECT_EQ(rect.Expand(10, 10), Rect::MakeLTRB(90, 90, 210, 210));
+  EXPECT_EQ(rect.Expand(10, -10), Rect::MakeLTRB(90, 110, 210, 190));
+  EXPECT_EQ(rect.Expand(-10, 10), Rect::MakeLTRB(110, 90, 190, 210));
+  EXPECT_EQ(rect.Expand(-10, -10), Rect::MakeLTRB(110, 110, 190, 190));
+
+  // Expand(amount, amount, amount, amount)
+  EXPECT_EQ(rect.Expand(10, 20, 30, 40), Rect::MakeLTRB(90, 80, 230, 240));
+  EXPECT_EQ(rect.Expand(-10, 20, 30, 40), Rect::MakeLTRB(110, 80, 230, 240));
+  EXPECT_EQ(rect.Expand(10, -20, 30, 40), Rect::MakeLTRB(90, 120, 230, 240));
+  EXPECT_EQ(rect.Expand(10, 20, -30, 40), Rect::MakeLTRB(90, 80, 170, 240));
+  EXPECT_EQ(rect.Expand(10, 20, 30, -40), Rect::MakeLTRB(90, 80, 230, 160));
+
+  // Expand(Point amount)
+  EXPECT_EQ(rect.Expand(Point{10, 10}), Rect::MakeLTRB(90, 90, 210, 210));
+  EXPECT_EQ(rect.Expand(Point{10, -10}), Rect::MakeLTRB(90, 110, 210, 190));
+  EXPECT_EQ(rect.Expand(Point{-10, 10}), Rect::MakeLTRB(110, 90, 190, 210));
+  EXPECT_EQ(rect.Expand(Point{-10, -10}), Rect::MakeLTRB(110, 110, 190, 190));
+
+  // Expand(Size amount)
+  EXPECT_EQ(rect.Expand(Size{10, 10}), Rect::MakeLTRB(90, 90, 210, 210));
+  EXPECT_EQ(rect.Expand(Size{10, -10}), Rect::MakeLTRB(90, 110, 210, 190));
+  EXPECT_EQ(rect.Expand(Size{-10, 10}), Rect::MakeLTRB(110, 90, 190, 210));
+  EXPECT_EQ(rect.Expand(Size{-10, -10}), Rect::MakeLTRB(110, 110, 190, 190));
+}
+
+TEST(RectTest, IRectExpand) {
+  auto rect = IRect::MakeLTRB(100, 100, 200, 200);
+
+  // Expand(T amount)
+  EXPECT_EQ(rect.Expand(10), IRect::MakeLTRB(90, 90, 210, 210));
+  EXPECT_EQ(rect.Expand(-10), IRect::MakeLTRB(110, 110, 190, 190));
+
+  // Expand(amount, amount)
+  EXPECT_EQ(rect.Expand(10, 10), IRect::MakeLTRB(90, 90, 210, 210));
+  EXPECT_EQ(rect.Expand(10, -10), IRect::MakeLTRB(90, 110, 210, 190));
+  EXPECT_EQ(rect.Expand(-10, 10), IRect::MakeLTRB(110, 90, 190, 210));
+  EXPECT_EQ(rect.Expand(-10, -10), IRect::MakeLTRB(110, 110, 190, 190));
+
+  // Expand(amount, amount, amount, amount)
+  EXPECT_EQ(rect.Expand(10, 20, 30, 40), IRect::MakeLTRB(90, 80, 230, 240));
+  EXPECT_EQ(rect.Expand(-10, 20, 30, 40), IRect::MakeLTRB(110, 80, 230, 240));
+  EXPECT_EQ(rect.Expand(10, -20, 30, 40), IRect::MakeLTRB(90, 120, 230, 240));
+  EXPECT_EQ(rect.Expand(10, 20, -30, 40), IRect::MakeLTRB(90, 80, 170, 240));
+  EXPECT_EQ(rect.Expand(10, 20, 30, -40), IRect::MakeLTRB(90, 80, 230, 160));
+
+  // Expand(IPoint amount)
+  EXPECT_EQ(rect.Expand(IPoint{10, 10}), IRect::MakeLTRB(90, 90, 210, 210));
+  EXPECT_EQ(rect.Expand(IPoint{10, -10}), IRect::MakeLTRB(90, 110, 210, 190));
+  EXPECT_EQ(rect.Expand(IPoint{-10, 10}), IRect::MakeLTRB(110, 90, 190, 210));
+  EXPECT_EQ(rect.Expand(IPoint{-10, -10}), IRect::MakeLTRB(110, 110, 190, 190));
+
+  // Expand(ISize amount)
+  EXPECT_EQ(rect.Expand(ISize{10, 10}), IRect::MakeLTRB(90, 90, 210, 210));
+  EXPECT_EQ(rect.Expand(ISize{10, -10}), IRect::MakeLTRB(90, 110, 210, 190));
+  EXPECT_EQ(rect.Expand(ISize{-10, 10}), IRect::MakeLTRB(110, 90, 190, 210));
+  EXPECT_EQ(rect.Expand(ISize{-10, -10}), IRect::MakeLTRB(110, 110, 190, 190));
+}
+
+TEST(RectTest, ContainsFloatingPoint) {
+  auto rect1 =
+      Rect::MakeXYWH(472.599945f, 440.999969f, 1102.80005f, 654.000061f);
+  auto rect2 = Rect::MakeXYWH(724.f, 618.f, 600.f, 300.f);
+  EXPECT_TRUE(rect1.Contains(rect2));
+}
+
+template <typename R>
+static constexpr inline R flip_lr(R rect) {
+  return R::MakeLTRB(rect.GetRight(), rect.GetTop(),  //
+                     rect.GetLeft(), rect.GetBottom());
+}
+
+template <typename R>
+static constexpr inline R flip_tb(R rect) {
+  return R::MakeLTRB(rect.GetLeft(), rect.GetBottom(),  //
+                     rect.GetRight(), rect.GetTop());
+}
+
+template <typename R>
+static constexpr inline R flip_lrtb(R rect) {
+  return flip_lr(flip_tb(rect));
+}
+
+static constexpr inline Rect swap_nan(const Rect& rect, int index) {
+  Scalar nan = std::numeric_limits<Scalar>::quiet_NaN();
+  FML_DCHECK(index >= 0 && index <= 15);
+  Scalar l = ((index & (1 << 0)) != 0) ? nan : rect.GetLeft();
+  Scalar t = ((index & (1 << 1)) != 0) ? nan : rect.GetTop();
+  Scalar r = ((index & (1 << 2)) != 0) ? nan : rect.GetRight();
+  Scalar b = ((index & (1 << 3)) != 0) ? nan : rect.GetBottom();
+  return Rect::MakeLTRB(l, t, r, b);
+}
+
+static constexpr inline Point swap_nan(const Point& point, int index) {
+  Scalar nan = std::numeric_limits<Scalar>::quiet_NaN();
+  FML_DCHECK(index >= 0 && index <= 3);
+  Scalar x = ((index & (1 << 0)) != 0) ? nan : point.x;
+  Scalar y = ((index & (1 << 1)) != 0) ? nan : point.y;
+  return Point(x, y);
+}
+
+TEST(RectTest, RectUnion) {
+  auto check_nans = [](const Rect& a, const Rect& b, const std::string& label) {
+    ASSERT_TRUE(a.IsFinite()) << label;
+    ASSERT_TRUE(b.IsFinite()) << label;
+    ASSERT_FALSE(a.Union(b).IsEmpty());
+
+    for (int i = 1; i < 16; i++) {
+      // NaN in a produces b
+      EXPECT_EQ(swap_nan(a, i).Union(b), b) << label << ", index = " << i;
+      // NaN in b produces a
+      EXPECT_EQ(a.Union(swap_nan(b, i)), a) << label << ", index = " << i;
+      // NaN in both is empty
+      for (int j = 1; j < 16; j++) {
+        EXPECT_TRUE(swap_nan(a, i).Union(swap_nan(b, j)).IsEmpty())
+            << label << ", indices = " << i << ", " << j;
+      }
+    }
+  };
+
+  auto check_empty_flips = [](const Rect& a, const Rect& b,
+                              const std::string& label) {
+    ASSERT_FALSE(a.IsEmpty());
+    // b is allowed to be empty
+
+    // unflipped a vs flipped (empty) b yields a
+    EXPECT_EQ(a.Union(flip_lr(b)), a) << label;
+    EXPECT_EQ(a.Union(flip_tb(b)), a) << label;
+    EXPECT_EQ(a.Union(flip_lrtb(b)), a) << label;
+
+    // flipped (empty) a vs unflipped b yields b
+    EXPECT_EQ(flip_lr(a).Union(b), b) << label;
+    EXPECT_EQ(flip_tb(a).Union(b), b) << label;
+    EXPECT_EQ(flip_lrtb(a).Union(b), b) << label;
+
+    // flipped (empty) a vs flipped (empty) b yields empty
+    EXPECT_TRUE(flip_lr(a).Union(flip_lr(b)).IsEmpty()) << label;
+    EXPECT_TRUE(flip_tb(a).Union(flip_tb(b)).IsEmpty()) << label;
+    EXPECT_TRUE(flip_lrtb(a).Union(flip_lrtb(b)).IsEmpty()) << label;
+  };
+
+  auto test = [&check_nans, &check_empty_flips](const Rect& a, const Rect& b,
+                                                const Rect& result) {
+    ASSERT_FALSE(a.IsEmpty()) << a;
+    // b is allowed to be empty
+
+    std::stringstream stream;
+    stream << a << " union " << b;
+    auto label = stream.str();
+
+    EXPECT_EQ(a.Union(b), result) << label;
+    EXPECT_EQ(b.Union(a), result) << label;
+    check_empty_flips(a, b, label);
+    check_nans(a, b, label);
+  };
+
+  {
+    auto a = Rect::MakeXYWH(100, 100, 100, 100);
+    auto b = Rect::MakeXYWH(0, 0, 0, 0);
+    auto expected = Rect::MakeXYWH(100, 100, 100, 100);
+    test(a, b, expected);
+  }
+
+  {
+    auto a = Rect::MakeXYWH(100, 100, 100, 100);
+    auto b = Rect::MakeXYWH(0, 0, 1, 1);
+    auto expected = Rect::MakeXYWH(0, 0, 200, 200);
+    test(a, b, expected);
+  }
+
+  {
+    auto a = Rect::MakeXYWH(100, 100, 100, 100);
+    auto b = Rect::MakeXYWH(10, 10, 1, 1);
+    auto expected = Rect::MakeXYWH(10, 10, 190, 190);
+    test(a, b, expected);
+  }
+
+  {
+    auto a = Rect::MakeXYWH(0, 0, 100, 100);
+    auto b = Rect::MakeXYWH(10, 10, 100, 100);
+    auto expected = Rect::MakeXYWH(0, 0, 110, 110);
+    test(a, b, expected);
+  }
+
+  {
+    auto a = Rect::MakeXYWH(0, 0, 100, 100);
+    auto b = Rect::MakeXYWH(100, 100, 100, 100);
+    auto expected = Rect::MakeXYWH(0, 0, 200, 200);
+    test(a, b, expected);
+  }
+}
+
+TEST(RectTest, OptRectUnion) {
+  auto a = Rect::MakeLTRB(0, 0, 100, 100);
+  auto b = Rect::MakeLTRB(100, 100, 200, 200);
+  auto c = Rect::MakeLTRB(100, 0, 200, 100);
+
+  // NullOpt, NullOpt
+  EXPECT_FALSE(Rect::Union(std::nullopt, std::nullopt).has_value());
+  EXPECT_EQ(Rect::Union(std::nullopt, std::nullopt), std::nullopt);
+
+  auto test1 = [](const Rect& r) {
+    // Rect, NullOpt
+    EXPECT_TRUE(Rect::Union(r, std::nullopt).has_value());
+    EXPECT_EQ(Rect::Union(r, std::nullopt).value(), r);
+
+    // OptRect, NullOpt
+    EXPECT_TRUE(Rect::Union(std::optional(r), std::nullopt).has_value());
+    EXPECT_EQ(Rect::Union(std::optional(r), std::nullopt).value(), r);
+
+    // NullOpt, Rect
+    EXPECT_TRUE(Rect::Union(std::nullopt, r).has_value());
+    EXPECT_EQ(Rect::Union(std::nullopt, r).value(), r);
+
+    // NullOpt, OptRect
+    EXPECT_TRUE(Rect::Union(std::nullopt, std::optional(r)).has_value());
+    EXPECT_EQ(Rect::Union(std::nullopt, std::optional(r)).value(), r);
+  };
+
+  test1(a);
+  test1(b);
+  test1(c);
+
+  auto test2 = [](const Rect& a, const Rect& b, const Rect& u) {
+    ASSERT_EQ(a.Union(b), u);
+
+    // Rect, OptRect
+    EXPECT_TRUE(Rect::Union(a, std::optional(b)).has_value());
+    EXPECT_EQ(Rect::Union(a, std::optional(b)).value(), u);
+
+    // OptRect, Rect
+    EXPECT_TRUE(Rect::Union(std::optional(a), b).has_value());
+    EXPECT_EQ(Rect::Union(std::optional(a), b).value(), u);
+
+    // OptRect, OptRect
+    EXPECT_TRUE(Rect::Union(std::optional(a), std::optional(b)).has_value());
+    EXPECT_EQ(Rect::Union(std::optional(a), std::optional(b)).value(), u);
+  };
+
+  test2(a, b, Rect::MakeLTRB(0, 0, 200, 200));
+  test2(a, c, Rect::MakeLTRB(0, 0, 200, 100));
+  test2(b, c, Rect::MakeLTRB(100, 0, 200, 200));
+}
+
+TEST(RectTest, IRectUnion) {
+  auto check_empty_flips = [](const IRect& a, const IRect& b,
+                              const std::string& label) {
+    ASSERT_FALSE(a.IsEmpty());
+    // b is allowed to be empty
+
+    // unflipped a vs flipped (empty) b yields a
+    EXPECT_EQ(a.Union(flip_lr(b)), a) << label;
+    EXPECT_EQ(a.Union(flip_tb(b)), a) << label;
+    EXPECT_EQ(a.Union(flip_lrtb(b)), a) << label;
+
+    // flipped (empty) a vs unflipped b yields b
+    EXPECT_EQ(flip_lr(a).Union(b), b) << label;
+    EXPECT_EQ(flip_tb(a).Union(b), b) << label;
+    EXPECT_EQ(flip_lrtb(a).Union(b), b) << label;
+
+    // flipped (empty) a vs flipped (empty) b yields empty
+    EXPECT_TRUE(flip_lr(a).Union(flip_lr(b)).IsEmpty()) << label;
+    EXPECT_TRUE(flip_tb(a).Union(flip_tb(b)).IsEmpty()) << label;
+    EXPECT_TRUE(flip_lrtb(a).Union(flip_lrtb(b)).IsEmpty()) << label;
+  };
+
+  auto test = [&check_empty_flips](const IRect& a, const IRect& b,
+                                   const IRect& result) {
+    ASSERT_FALSE(a.IsEmpty()) << a;
+    // b is allowed to be empty
+
+    std::stringstream stream;
+    stream << a << " union " << b;
+    auto label = stream.str();
+
+    EXPECT_EQ(a.Union(b), result) << label;
+    EXPECT_EQ(b.Union(a), result) << label;
+    check_empty_flips(a, b, label);
+  };
+
+  {
+    auto a = IRect::MakeXYWH(100, 100, 100, 100);
+    auto b = IRect::MakeXYWH(0, 0, 0, 0);
+    auto expected = IRect::MakeXYWH(100, 100, 100, 100);
+    test(a, b, expected);
+  }
+
+  {
+    auto a = IRect::MakeXYWH(100, 100, 100, 100);
+    auto b = IRect::MakeXYWH(0, 0, 1, 1);
+    auto expected = IRect::MakeXYWH(0, 0, 200, 200);
+    test(a, b, expected);
+  }
+
+  {
+    auto a = IRect::MakeXYWH(100, 100, 100, 100);
+    auto b = IRect::MakeXYWH(10, 10, 1, 1);
+    auto expected = IRect::MakeXYWH(10, 10, 190, 190);
+    test(a, b, expected);
+  }
+
+  {
+    auto a = IRect::MakeXYWH(0, 0, 100, 100);
+    auto b = IRect::MakeXYWH(10, 10, 100, 100);
+    auto expected = IRect::MakeXYWH(0, 0, 110, 110);
+    test(a, b, expected);
+  }
+
+  {
+    auto a = IRect::MakeXYWH(0, 0, 100, 100);
+    auto b = IRect::MakeXYWH(100, 100, 100, 100);
+    auto expected = IRect::MakeXYWH(0, 0, 200, 200);
+    test(a, b, expected);
+  }
+}
+
+TEST(RectTest, OptIRectUnion) {
+  auto a = IRect::MakeLTRB(0, 0, 100, 100);
+  auto b = IRect::MakeLTRB(100, 100, 200, 200);
+  auto c = IRect::MakeLTRB(100, 0, 200, 100);
+
+  // NullOpt, NullOpt
+  EXPECT_FALSE(IRect::Union(std::nullopt, std::nullopt).has_value());
+  EXPECT_EQ(IRect::Union(std::nullopt, std::nullopt), std::nullopt);
+
+  auto test1 = [](const IRect& r) {
+    // Rect, NullOpt
+    EXPECT_TRUE(IRect::Union(r, std::nullopt).has_value());
+    EXPECT_EQ(IRect::Union(r, std::nullopt).value(), r);
+
+    // OptRect, NullOpt
+    EXPECT_TRUE(IRect::Union(std::optional(r), std::nullopt).has_value());
+    EXPECT_EQ(IRect::Union(std::optional(r), std::nullopt).value(), r);
+
+    // NullOpt, Rect
+    EXPECT_TRUE(IRect::Union(std::nullopt, r).has_value());
+    EXPECT_EQ(IRect::Union(std::nullopt, r).value(), r);
+
+    // NullOpt, OptRect
+    EXPECT_TRUE(IRect::Union(std::nullopt, std::optional(r)).has_value());
+    EXPECT_EQ(IRect::Union(std::nullopt, std::optional(r)).value(), r);
+  };
+
+  test1(a);
+  test1(b);
+  test1(c);
+
+  auto test2 = [](const IRect& a, const IRect& b, const IRect& u) {
+    ASSERT_EQ(a.Union(b), u);
+
+    // Rect, OptRect
+    EXPECT_TRUE(IRect::Union(a, std::optional(b)).has_value());
+    EXPECT_EQ(IRect::Union(a, std::optional(b)).value(), u);
+
+    // OptRect, Rect
+    EXPECT_TRUE(IRect::Union(std::optional(a), b).has_value());
+    EXPECT_EQ(IRect::Union(std::optional(a), b).value(), u);
+
+    // OptRect, OptRect
+    EXPECT_TRUE(IRect::Union(std::optional(a), std::optional(b)).has_value());
+    EXPECT_EQ(IRect::Union(std::optional(a), std::optional(b)).value(), u);
+  };
+
+  test2(a, b, IRect::MakeLTRB(0, 0, 200, 200));
+  test2(a, c, IRect::MakeLTRB(0, 0, 200, 100));
+  test2(b, c, IRect::MakeLTRB(100, 0, 200, 200));
+}
+
+TEST(RectTest, RectIntersection) {
+  auto check_nans = [](const Rect& a, const Rect& b, const std::string& label) {
+    ASSERT_TRUE(a.IsFinite()) << label;
+    ASSERT_TRUE(b.IsFinite()) << label;
+
+    for (int i = 1; i < 16; i++) {
+      // NaN in a produces empty
+      EXPECT_FALSE(swap_nan(a, i).Intersection(b).has_value())
+          << label << ", index = " << i;
+      // NaN in b produces empty
+      EXPECT_FALSE(a.Intersection(swap_nan(b, i)).has_value())
+          << label << ", index = " << i;
+      // NaN in both is empty
+      for (int j = 1; j < 16; j++) {
+        EXPECT_FALSE(swap_nan(a, i).Intersection(swap_nan(b, j)).has_value())
+            << label << ", indices = " << i << ", " << j;
+      }
+    }
+  };
+
+  auto check_empty_flips = [](const Rect& a, const Rect& b,
+                              const std::string& label) {
+    ASSERT_FALSE(a.IsEmpty());
+    // b is allowed to be empty
+
+    // unflipped a vs flipped (empty) b yields a
+    EXPECT_FALSE(a.Intersection(flip_lr(b)).has_value()) << label;
+    EXPECT_FALSE(a.Intersection(flip_tb(b)).has_value()) << label;
+    EXPECT_FALSE(a.Intersection(flip_lrtb(b)).has_value()) << label;
+
+    // flipped (empty) a vs unflipped b yields b
+    EXPECT_FALSE(flip_lr(a).Intersection(b).has_value()) << label;
+    EXPECT_FALSE(flip_tb(a).Intersection(b).has_value()) << label;
+    EXPECT_FALSE(flip_lrtb(a).Intersection(b).has_value()) << label;
+
+    // flipped (empty) a vs flipped (empty) b yields empty
+    EXPECT_FALSE(flip_lr(a).Intersection(flip_lr(b)).has_value()) << label;
+    EXPECT_FALSE(flip_tb(a).Intersection(flip_tb(b)).has_value()) << label;
+    EXPECT_FALSE(flip_lrtb(a).Intersection(flip_lrtb(b)).has_value()) << label;
+  };
+
+  auto test_non_empty = [&check_nans, &check_empty_flips](
+                            const Rect& a, const Rect& b, const Rect& result) {
+    ASSERT_FALSE(a.IsEmpty()) << a;
+    // b is allowed to be empty
+
+    std::stringstream stream;
+    stream << a << " union " << b;
+    auto label = stream.str();
+
+    EXPECT_TRUE(a.Intersection(b).has_value()) << label;
+    EXPECT_TRUE(b.Intersection(a).has_value()) << label;
+    EXPECT_EQ(a.Intersection(b), result) << label;
+    EXPECT_EQ(b.Intersection(a), result) << label;
+    check_empty_flips(a, b, label);
+    check_nans(a, b, label);
+  };
+
+  auto test_empty = [&check_nans, &check_empty_flips](const Rect& a,
+                                                      const Rect& b) {
+    ASSERT_FALSE(a.IsEmpty()) << a;
+    // b is allowed to be empty
+
+    std::stringstream stream;
+    stream << a << " union " << b;
+    auto label = stream.str();
+
+    EXPECT_FALSE(a.Intersection(b).has_value()) << label;
+    EXPECT_FALSE(b.Intersection(a).has_value()) << label;
+    check_empty_flips(a, b, label);
+    check_nans(a, b, label);
+  };
+
+  {
+    auto a = Rect::MakeXYWH(100, 100, 100, 100);
+    auto b = Rect::MakeXYWH(0, 0, 0, 0);
+
+    test_empty(a, b);
+  }
+
+  {
+    auto a = Rect::MakeXYWH(100, 100, 100, 100);
+    auto b = Rect::MakeXYWH(10, 10, 0, 0);
+
+    test_empty(a, b);
+  }
+
+  {
+    auto a = Rect::MakeXYWH(0, 0, 100, 100);
+    auto b = Rect::MakeXYWH(10, 10, 100, 100);
+    auto expected = Rect::MakeXYWH(10, 10, 90, 90);
+
+    test_non_empty(a, b, expected);
+  }
+
+  {
+    auto a = Rect::MakeXYWH(0, 0, 100, 100);
+    auto b = Rect::MakeXYWH(100, 100, 100, 100);
+
+    test_empty(a, b);
+  }
+
+  {
+    auto a = Rect::MakeMaximum();
+    auto b = Rect::MakeXYWH(10, 10, 300, 300);
+
+    test_non_empty(a, b, b);
+  }
+
+  {
+    auto a = Rect::MakeMaximum();
+    auto b = Rect::MakeMaximum();
+
+    test_non_empty(a, b, Rect::MakeMaximum());
+  }
+}
+
+TEST(RectTest, OptRectIntersection) {
+  auto a = Rect::MakeLTRB(0, 0, 110, 110);
+  auto b = Rect::MakeLTRB(100, 100, 200, 200);
+  auto c = Rect::MakeLTRB(100, 0, 200, 110);
+
+  // NullOpt, NullOpt
+  EXPECT_FALSE(Rect::Intersection(std::nullopt, std::nullopt).has_value());
+  EXPECT_EQ(Rect::Intersection(std::nullopt, std::nullopt), std::nullopt);
+
+  auto test1 = [](const Rect& r) {
+    // Rect, NullOpt
+    EXPECT_TRUE(Rect::Intersection(r, std::nullopt).has_value());
+    EXPECT_EQ(Rect::Intersection(r, std::nullopt).value(), r);
+
+    // OptRect, NullOpt
+    EXPECT_TRUE(Rect::Intersection(std::optional(r), std::nullopt).has_value());
+    EXPECT_EQ(Rect::Intersection(std::optional(r), std::nullopt).value(), r);
+
+    // NullOpt, Rect
+    EXPECT_TRUE(Rect::Intersection(std::nullopt, r).has_value());
+    EXPECT_EQ(Rect::Intersection(std::nullopt, r).value(), r);
+
+    // NullOpt, OptRect
+    EXPECT_TRUE(Rect::Intersection(std::nullopt, std::optional(r)).has_value());
+    EXPECT_EQ(Rect::Intersection(std::nullopt, std::optional(r)).value(), r);
+  };
+
+  test1(a);
+  test1(b);
+  test1(c);
+
+  auto test2 = [](const Rect& a, const Rect& b, const Rect& i) {
+    ASSERT_EQ(a.Intersection(b), i);
+
+    // Rect, OptRect
+    EXPECT_TRUE(Rect::Intersection(a, std::optional(b)).has_value());
+    EXPECT_EQ(Rect::Intersection(a, std::optional(b)).value(), i);
+
+    // OptRect, Rect
+    EXPECT_TRUE(Rect::Intersection(std::optional(a), b).has_value());
+    EXPECT_EQ(Rect::Intersection(std::optional(a), b).value(), i);
+
+    // OptRect, OptRect
+    EXPECT_TRUE(
+        Rect::Intersection(std::optional(a), std::optional(b)).has_value());
+    EXPECT_EQ(Rect::Intersection(std::optional(a), std::optional(b)).value(),
+              i);
+  };
+
+  test2(a, b, Rect::MakeLTRB(100, 100, 110, 110));
+  test2(a, c, Rect::MakeLTRB(100, 0, 110, 110));
+  test2(b, c, Rect::MakeLTRB(100, 100, 200, 110));
+}
+
+TEST(RectTest, IRectIntersection) {
+  auto check_empty_flips = [](const IRect& a, const IRect& b,
+                              const std::string& label) {
+    ASSERT_FALSE(a.IsEmpty());
+    // b is allowed to be empty
+
+    // unflipped a vs flipped (empty) b yields a
+    EXPECT_FALSE(a.Intersection(flip_lr(b)).has_value()) << label;
+    EXPECT_FALSE(a.Intersection(flip_tb(b)).has_value()) << label;
+    EXPECT_FALSE(a.Intersection(flip_lrtb(b)).has_value()) << label;
+
+    // flipped (empty) a vs unflipped b yields b
+    EXPECT_FALSE(flip_lr(a).Intersection(b).has_value()) << label;
+    EXPECT_FALSE(flip_tb(a).Intersection(b).has_value()) << label;
+    EXPECT_FALSE(flip_lrtb(a).Intersection(b).has_value()) << label;
+
+    // flipped (empty) a vs flipped (empty) b yields empty
+    EXPECT_FALSE(flip_lr(a).Intersection(flip_lr(b)).has_value()) << label;
+    EXPECT_FALSE(flip_tb(a).Intersection(flip_tb(b)).has_value()) << label;
+    EXPECT_FALSE(flip_lrtb(a).Intersection(flip_lrtb(b)).has_value()) << label;
+  };
+
+  auto test_non_empty = [&check_empty_flips](const IRect& a, const IRect& b,
+                                             const IRect& result) {
+    ASSERT_FALSE(a.IsEmpty()) << a;
+    // b is allowed to be empty
+
+    std::stringstream stream;
+    stream << a << " union " << b;
+    auto label = stream.str();
+
+    EXPECT_TRUE(a.Intersection(b).has_value()) << label;
+    EXPECT_TRUE(b.Intersection(a).has_value()) << label;
+    EXPECT_EQ(a.Intersection(b), result) << label;
+    EXPECT_EQ(b.Intersection(a), result) << label;
+    check_empty_flips(a, b, label);
+  };
+
+  auto test_empty = [&check_empty_flips](const IRect& a, const IRect& b) {
+    ASSERT_FALSE(a.IsEmpty()) << a;
+    // b is allowed to be empty
+
+    std::stringstream stream;
+    stream << a << " union " << b;
+    auto label = stream.str();
+
+    EXPECT_FALSE(a.Intersection(b).has_value()) << label;
+    EXPECT_FALSE(b.Intersection(a).has_value()) << label;
+    check_empty_flips(a, b, label);
+  };
+
+  {
+    auto a = IRect::MakeXYWH(100, 100, 100, 100);
+    auto b = IRect::MakeXYWH(0, 0, 0, 0);
+
+    test_empty(a, b);
+  }
+
+  {
+    auto a = IRect::MakeXYWH(100, 100, 100, 100);
+    auto b = IRect::MakeXYWH(10, 10, 0, 0);
+
+    test_empty(a, b);
+  }
+
+  {
+    auto a = IRect::MakeXYWH(0, 0, 100, 100);
+    auto b = IRect::MakeXYWH(10, 10, 100, 100);
+    auto expected = IRect::MakeXYWH(10, 10, 90, 90);
+
+    test_non_empty(a, b, expected);
+  }
+
+  {
+    auto a = IRect::MakeXYWH(0, 0, 100, 100);
+    auto b = IRect::MakeXYWH(100, 100, 100, 100);
+
+    test_empty(a, b);
+  }
+
+  {
+    auto a = IRect::MakeMaximum();
+    auto b = IRect::MakeXYWH(10, 10, 300, 300);
+
+    test_non_empty(a, b, b);
+  }
+
+  {
+    auto a = IRect::MakeMaximum();
+    auto b = IRect::MakeMaximum();
+
+    test_non_empty(a, b, IRect::MakeMaximum());
+  }
+}
+
+TEST(RectTest, OptIRectIntersection) {
+  auto a = IRect::MakeLTRB(0, 0, 110, 110);
+  auto b = IRect::MakeLTRB(100, 100, 200, 200);
+  auto c = IRect::MakeLTRB(100, 0, 200, 110);
+
+  // NullOpt, NullOpt
+  EXPECT_FALSE(IRect::Intersection(std::nullopt, std::nullopt).has_value());
+  EXPECT_EQ(IRect::Intersection(std::nullopt, std::nullopt), std::nullopt);
+
+  auto test1 = [](const IRect& r) {
+    // Rect, NullOpt
+    EXPECT_TRUE(IRect::Intersection(r, std::nullopt).has_value());
+    EXPECT_EQ(IRect::Intersection(r, std::nullopt).value(), r);
+
+    // OptRect, NullOpt
+    EXPECT_TRUE(
+        IRect::Intersection(std::optional(r), std::nullopt).has_value());
+    EXPECT_EQ(IRect::Intersection(std::optional(r), std::nullopt).value(), r);
+
+    // NullOpt, Rect
+    EXPECT_TRUE(IRect::Intersection(std::nullopt, r).has_value());
+    EXPECT_EQ(IRect::Intersection(std::nullopt, r).value(), r);
+
+    // NullOpt, OptRect
+    EXPECT_TRUE(
+        IRect::Intersection(std::nullopt, std::optional(r)).has_value());
+    EXPECT_EQ(IRect::Intersection(std::nullopt, std::optional(r)).value(), r);
+  };
+
+  test1(a);
+  test1(b);
+  test1(c);
+
+  auto test2 = [](const IRect& a, const IRect& b, const IRect& i) {
+    ASSERT_EQ(a.Intersection(b), i);
+
+    // Rect, OptRect
+    EXPECT_TRUE(IRect::Intersection(a, std::optional(b)).has_value());
+    EXPECT_EQ(IRect::Intersection(a, std::optional(b)).value(), i);
+
+    // OptRect, Rect
+    EXPECT_TRUE(IRect::Intersection(std::optional(a), b).has_value());
+    EXPECT_EQ(IRect::Intersection(std::optional(a), b).value(), i);
+
+    // OptRect, OptRect
+    EXPECT_TRUE(
+        IRect::Intersection(std::optional(a), std::optional(b)).has_value());
+    EXPECT_EQ(IRect::Intersection(std::optional(a), std::optional(b)).value(),
+              i);
+  };
+
+  test2(a, b, IRect::MakeLTRB(100, 100, 110, 110));
+  test2(a, c, IRect::MakeLTRB(100, 0, 110, 110));
+  test2(b, c, IRect::MakeLTRB(100, 100, 200, 110));
+}
+
+TEST(RectTest, RectIntersectsWithRect) {
+  auto check_nans = [](const Rect& a, const Rect& b, const std::string& label) {
+    ASSERT_TRUE(a.IsFinite()) << label;
+    ASSERT_TRUE(b.IsFinite()) << label;
+
+    for (int i = 1; i < 16; i++) {
+      // NaN in a produces b
+      EXPECT_FALSE(swap_nan(a, i).IntersectsWithRect(b))
+          << label << ", index = " << i;
+      // NaN in b produces a
+      EXPECT_FALSE(a.IntersectsWithRect(swap_nan(b, i)))
+          << label << ", index = " << i;
+      // NaN in both is empty
+      for (int j = 1; j < 16; j++) {
+        EXPECT_FALSE(swap_nan(a, i).IntersectsWithRect(swap_nan(b, j)))
+            << label << ", indices = " << i << ", " << j;
+      }
+    }
+  };
+
+  auto check_empty_flips = [](const Rect& a, const Rect& b,
+                              const std::string& label) {
+    ASSERT_FALSE(a.IsEmpty());
+    // b is allowed to be empty
+
+    // unflipped a vs flipped (empty) b yields a
+    EXPECT_FALSE(a.IntersectsWithRect(flip_lr(b))) << label;
+    EXPECT_FALSE(a.IntersectsWithRect(flip_tb(b))) << label;
+    EXPECT_FALSE(a.IntersectsWithRect(flip_lrtb(b))) << label;
+
+    // flipped (empty) a vs unflipped b yields b
+    EXPECT_FALSE(flip_lr(a).IntersectsWithRect(b)) << label;
+    EXPECT_FALSE(flip_tb(a).IntersectsWithRect(b)) << label;
+    EXPECT_FALSE(flip_lrtb(a).IntersectsWithRect(b)) << label;
+
+    // flipped (empty) a vs flipped (empty) b yields empty
+    EXPECT_FALSE(flip_lr(a).IntersectsWithRect(flip_lr(b))) << label;
+    EXPECT_FALSE(flip_tb(a).IntersectsWithRect(flip_tb(b))) << label;
+    EXPECT_FALSE(flip_lrtb(a).IntersectsWithRect(flip_lrtb(b))) << label;
+  };
+
+  auto test_non_empty = [&check_nans, &check_empty_flips](const Rect& a,
+                                                          const Rect& b) {
+    ASSERT_FALSE(a.IsEmpty()) << a;
+    // b is allowed to be empty
+
+    std::stringstream stream;
+    stream << a << " union " << b;
+    auto label = stream.str();
+
+    EXPECT_TRUE(a.IntersectsWithRect(b)) << label;
+    EXPECT_TRUE(b.IntersectsWithRect(a)) << label;
+    check_empty_flips(a, b, label);
+    check_nans(a, b, label);
+  };
+
+  auto test_empty = [&check_nans, &check_empty_flips](const Rect& a,
+                                                      const Rect& b) {
+    ASSERT_FALSE(a.IsEmpty()) << a;
+    // b is allowed to be empty
+
+    std::stringstream stream;
+    stream << a << " union " << b;
+    auto label = stream.str();
+
+    EXPECT_FALSE(a.IntersectsWithRect(b)) << label;
+    EXPECT_FALSE(b.IntersectsWithRect(a)) << label;
+    check_empty_flips(a, b, label);
+    check_nans(a, b, label);
+  };
+
+  {
+    auto a = Rect::MakeXYWH(100, 100, 100, 100);
+    auto b = Rect::MakeXYWH(0, 0, 0, 0);
+
+    test_empty(a, b);
+  }
+
+  {
+    auto a = Rect::MakeXYWH(100, 100, 100, 100);
+    auto b = Rect::MakeXYWH(10, 10, 0, 0);
+
+    test_empty(a, b);
+  }
+
+  {
+    auto a = Rect::MakeXYWH(0, 0, 100, 100);
+    auto b = Rect::MakeXYWH(10, 10, 100, 100);
+
+    test_non_empty(a, b);
+  }
+
+  {
+    auto a = Rect::MakeXYWH(0, 0, 100, 100);
+    auto b = Rect::MakeXYWH(100, 100, 100, 100);
+
+    test_empty(a, b);
+  }
+
+  {
+    auto a = Rect::MakeMaximum();
+    auto b = Rect::MakeXYWH(10, 10, 100, 100);
+
+    test_non_empty(a, b);
+  }
+
+  {
+    auto a = Rect::MakeMaximum();
+    auto b = Rect::MakeMaximum();
+
+    test_non_empty(a, b);
+  }
+}
+
+TEST(RectTest, IRectIntersectsWithRect) {
+  auto check_empty_flips = [](const IRect& a, const IRect& b,
+                              const std::string& label) {
+    ASSERT_FALSE(a.IsEmpty());
+    // b is allowed to be empty
+
+    // unflipped a vs flipped (empty) b yields a
+    EXPECT_FALSE(a.IntersectsWithRect(flip_lr(b))) << label;
+    EXPECT_FALSE(a.IntersectsWithRect(flip_tb(b))) << label;
+    EXPECT_FALSE(a.IntersectsWithRect(flip_lrtb(b))) << label;
+
+    // flipped (empty) a vs unflipped b yields b
+    EXPECT_FALSE(flip_lr(a).IntersectsWithRect(b)) << label;
+    EXPECT_FALSE(flip_tb(a).IntersectsWithRect(b)) << label;
+    EXPECT_FALSE(flip_lrtb(a).IntersectsWithRect(b)) << label;
+
+    // flipped (empty) a vs flipped (empty) b yields empty
+    EXPECT_FALSE(flip_lr(a).IntersectsWithRect(flip_lr(b))) << label;
+    EXPECT_FALSE(flip_tb(a).IntersectsWithRect(flip_tb(b))) << label;
+    EXPECT_FALSE(flip_lrtb(a).IntersectsWithRect(flip_lrtb(b))) << label;
+  };
+
+  auto test_non_empty = [&check_empty_flips](const IRect& a, const IRect& b) {
+    ASSERT_FALSE(a.IsEmpty()) << a;
+    // b is allowed to be empty
+
+    std::stringstream stream;
+    stream << a << " union " << b;
+    auto label = stream.str();
+
+    EXPECT_TRUE(a.IntersectsWithRect(b)) << label;
+    EXPECT_TRUE(b.IntersectsWithRect(a)) << label;
+    check_empty_flips(a, b, label);
+  };
+
+  auto test_empty = [&check_empty_flips](const IRect& a, const IRect& b) {
+    ASSERT_FALSE(a.IsEmpty()) << a;
+    // b is allowed to be empty
+
+    std::stringstream stream;
+    stream << a << " union " << b;
+    auto label = stream.str();
+
+    EXPECT_FALSE(a.IntersectsWithRect(b)) << label;
+    EXPECT_FALSE(b.IntersectsWithRect(a)) << label;
+    check_empty_flips(a, b, label);
+  };
+
+  {
+    auto a = IRect::MakeXYWH(100, 100, 100, 100);
+    auto b = IRect::MakeXYWH(0, 0, 0, 0);
+
+    test_empty(a, b);
+  }
+
+  {
+    auto a = IRect::MakeXYWH(100, 100, 100, 100);
+    auto b = IRect::MakeXYWH(10, 10, 0, 0);
+
+    test_empty(a, b);
+  }
+
+  {
+    auto a = IRect::MakeXYWH(0, 0, 100, 100);
+    auto b = IRect::MakeXYWH(10, 10, 100, 100);
+
+    test_non_empty(a, b);
+  }
+
+  {
+    auto a = IRect::MakeXYWH(0, 0, 100, 100);
+    auto b = IRect::MakeXYWH(100, 100, 100, 100);
+
+    test_empty(a, b);
+  }
+
+  {
+    auto a = IRect::MakeMaximum();
+    auto b = IRect::MakeXYWH(10, 10, 100, 100);
+
+    test_non_empty(a, b);
+  }
+
+  {
+    auto a = IRect::MakeMaximum();
+    auto b = IRect::MakeMaximum();
+
+    test_non_empty(a, b);
+  }
+}
+
+TEST(RectTest, RectContainsPoint) {
+  auto check_nans = [](const Rect& rect, const Point& point,
+                       const std::string& label) {
+    ASSERT_TRUE(rect.IsFinite()) << label;
+    ASSERT_TRUE(point.IsFinite()) << label;
+
+    for (int i = 1; i < 16; i++) {
+      EXPECT_FALSE(swap_nan(rect, i).Contains(point))
+          << label << ", index = " << i;
+      for (int j = 1; j < 4; j++) {
+        EXPECT_FALSE(swap_nan(rect, i).Contains(swap_nan(point, j)))
+            << label << ", indices = " << i << ", " << j;
+      }
+    }
+  };
+
+  auto check_empty_flips = [](const Rect& rect, const Point& point,
+                              const std::string& label) {
+    ASSERT_FALSE(rect.IsEmpty());
+
+    EXPECT_FALSE(flip_lr(rect).Contains(point)) << label;
+    EXPECT_FALSE(flip_tb(rect).Contains(point)) << label;
+    EXPECT_FALSE(flip_lrtb(rect).Contains(point)) << label;
+  };
+
+  auto test_inside = [&check_nans, &check_empty_flips](const Rect& rect,
+                                                       const Point& point) {
+    ASSERT_FALSE(rect.IsEmpty()) << rect;
+
+    std::stringstream stream;
+    stream << rect << " contains " << point;
+    auto label = stream.str();
+
+    EXPECT_TRUE(rect.Contains(point)) << label;
+    check_empty_flips(rect, point, label);
+    check_nans(rect, point, label);
+  };
+
+  auto test_outside = [&check_nans, &check_empty_flips](const Rect& rect,
+                                                        const Point& point) {
+    ASSERT_FALSE(rect.IsEmpty()) << rect;
+
+    std::stringstream stream;
+    stream << rect << " contains " << point;
+    auto label = stream.str();
+
+    EXPECT_FALSE(rect.Contains(point)) << label;
+    check_empty_flips(rect, point, label);
+    check_nans(rect, point, label);
+  };
+
+  {
+    // Origin is inclusive
+    auto r = Rect::MakeXYWH(100, 100, 100, 100);
+    auto p = Point(100, 100);
+
+    test_inside(r, p);
+  }
+  {
+    // Size is exclusive
+    auto r = Rect::MakeXYWH(100, 100, 100, 100);
+    auto p = Point(200, 200);
+
+    test_outside(r, p);
+  }
+  {
+    auto r = Rect::MakeXYWH(100, 100, 100, 100);
+    auto p = Point(99, 99);
+
+    test_outside(r, p);
+  }
+  {
+    auto r = Rect::MakeXYWH(100, 100, 100, 100);
+    auto p = Point(199, 199);
+
+    test_inside(r, p);
+  }
+
+  {
+    auto r = Rect::MakeMaximum();
+    auto p = Point(199, 199);
+
+    test_inside(r, p);
+  }
+}
+
+TEST(RectTest, IRectContainsIPoint) {
+  auto check_empty_flips = [](const IRect& rect, const IPoint& point,
+                              const std::string& label) {
+    ASSERT_FALSE(rect.IsEmpty());
+
+    EXPECT_FALSE(flip_lr(rect).Contains(point)) << label;
+    EXPECT_FALSE(flip_tb(rect).Contains(point)) << label;
+    EXPECT_FALSE(flip_lrtb(rect).Contains(point)) << label;
+  };
+
+  auto test_inside = [&check_empty_flips](const IRect& rect,
+                                          const IPoint& point) {
+    ASSERT_FALSE(rect.IsEmpty()) << rect;
+
+    std::stringstream stream;
+    stream << rect << " contains " << point;
+    auto label = stream.str();
+
+    EXPECT_TRUE(rect.Contains(point)) << label;
+    check_empty_flips(rect, point, label);
+  };
+
+  auto test_outside = [&check_empty_flips](const IRect& rect,
+                                           const IPoint& point) {
+    ASSERT_FALSE(rect.IsEmpty()) << rect;
+
+    std::stringstream stream;
+    stream << rect << " contains " << point;
+    auto label = stream.str();
+
+    EXPECT_FALSE(rect.Contains(point)) << label;
+    check_empty_flips(rect, point, label);
+  };
+
+  {
+    // Origin is inclusive
+    auto r = IRect::MakeXYWH(100, 100, 100, 100);
+    auto p = IPoint(100, 100);
+
+    test_inside(r, p);
+  }
+  {
+    // Size is exclusive
+    auto r = IRect::MakeXYWH(100, 100, 100, 100);
+    auto p = IPoint(200, 200);
+
+    test_outside(r, p);
+  }
+  {
+    auto r = IRect::MakeXYWH(100, 100, 100, 100);
+    auto p = IPoint(99, 99);
+
+    test_outside(r, p);
+  }
+  {
+    auto r = IRect::MakeXYWH(100, 100, 100, 100);
+    auto p = IPoint(199, 199);
+
+    test_inside(r, p);
+  }
+
+  {
+    auto r = IRect::MakeMaximum();
+    auto p = IPoint(199, 199);
+
+    test_inside(r, p);
+  }
+}
+
+TEST(RectTest, RectContainsRect) {
+  auto check_nans = [](const Rect& a, const Rect& b, const std::string& label) {
+    ASSERT_TRUE(a.IsFinite()) << label;
+    ASSERT_TRUE(b.IsFinite()) << label;
+    ASSERT_FALSE(a.IsEmpty());
+
+    for (int i = 1; i < 16; i++) {
+      // NaN in a produces false
+      EXPECT_FALSE(swap_nan(a, i).Contains(b)) << label << ", index = " << i;
+      // NaN in b produces false
+      EXPECT_TRUE(a.Contains(swap_nan(b, i))) << label << ", index = " << i;
+      // NaN in both is false
+      for (int j = 1; j < 16; j++) {
+        EXPECT_FALSE(swap_nan(a, i).Contains(swap_nan(b, j)))
+            << label << ", indices = " << i << ", " << j;
+      }
+    }
+  };
+
+  auto check_empty_flips = [](const Rect& a, const Rect& b,
+                              const std::string& label) {
+    ASSERT_FALSE(a.IsEmpty());
+    // test b rects are allowed to have 0 w/h, but not be backwards
+    ASSERT_FALSE(b.GetLeft() > b.GetRight() || b.GetTop() > b.GetBottom());
+
+    // unflipped a vs flipped (empty) b yields false
+    EXPECT_TRUE(a.Contains(flip_lr(b))) << label;
+    EXPECT_TRUE(a.Contains(flip_tb(b))) << label;
+    EXPECT_TRUE(a.Contains(flip_lrtb(b))) << label;
+
+    // flipped (empty) a vs unflipped b yields false
+    EXPECT_FALSE(flip_lr(a).Contains(b)) << label;
+    EXPECT_FALSE(flip_tb(a).Contains(b)) << label;
+    EXPECT_FALSE(flip_lrtb(a).Contains(b)) << label;
+
+    // flipped (empty) a vs flipped (empty) b yields empty
+    EXPECT_FALSE(flip_lr(a).Contains(flip_lr(b))) << label;
+    EXPECT_FALSE(flip_tb(a).Contains(flip_tb(b))) << label;
+    EXPECT_FALSE(flip_lrtb(a).Contains(flip_lrtb(b))) << label;
+  };
+
+  auto test_inside = [&check_nans, &check_empty_flips](const Rect& a,
+                                                       const Rect& b) {
+    ASSERT_FALSE(a.IsEmpty()) << a;
+    // test b rects are allowed to have 0 w/h, but not be backwards
+    ASSERT_FALSE(b.GetLeft() > b.GetRight() || b.GetTop() > b.GetBottom());
+
+    std::stringstream stream;
+    stream << a << " contains " << b;
+    auto label = stream.str();
+
+    EXPECT_TRUE(a.Contains(b)) << label;
+    check_empty_flips(a, b, label);
+    check_nans(a, b, label);
+  };
+
+  auto test_not_inside = [&check_nans, &check_empty_flips](const Rect& a,
+                                                           const Rect& b) {
+    ASSERT_FALSE(a.IsEmpty()) << a;
+    // If b was empty, it would be contained and should not be tested with
+    // this function - use |test_inside| instead.
+    ASSERT_FALSE(b.IsEmpty()) << b;
+
+    std::stringstream stream;
+    stream << a << " contains " << b;
+    auto label = stream.str();
+
+    EXPECT_FALSE(a.Contains(b)) << label;
+    check_empty_flips(a, b, label);
+    check_nans(a, b, label);
+  };
+
+  {
+    auto a = Rect::MakeXYWH(100, 100, 100, 100);
+
+    test_inside(a, a);
+  }
+  {
+    auto a = Rect::MakeXYWH(100, 100, 100, 100);
+    auto b = Rect::MakeXYWH(0, 0, 0, 0);
+
+    test_inside(a, b);
+  }
+  {
+    auto a = Rect::MakeXYWH(100, 100, 100, 100);
+    auto b = Rect::MakeXYWH(150, 150, 20, 20);
+
+    test_inside(a, b);
+  }
+  {
+    auto a = Rect::MakeXYWH(100, 100, 100, 100);
+    auto b = Rect::MakeXYWH(150, 150, 100, 100);
+
+    test_not_inside(a, b);
+  }
+  {
+    auto a = Rect::MakeXYWH(100, 100, 100, 100);
+    auto b = Rect::MakeXYWH(50, 50, 100, 100);
+
+    test_not_inside(a, b);
+  }
+  {
+    auto a = Rect::MakeXYWH(100, 100, 100, 100);
+    auto b = Rect::MakeXYWH(0, 0, 300, 300);
+
+    test_not_inside(a, b);
+  }
+  {
+    auto a = Rect::MakeMaximum();
+    auto b = Rect::MakeXYWH(0, 0, 300, 300);
+
+    test_inside(a, b);
+  }
+}
+
+TEST(RectTest, IRectContainsIRect) {
+  auto check_empty_flips = [](const IRect& a, const IRect& b,
+                              const std::string& label) {
+    ASSERT_FALSE(a.IsEmpty());
+    // test b rects are allowed to have 0 w/h, but not be backwards
+    ASSERT_FALSE(b.GetLeft() > b.GetRight() || b.GetTop() > b.GetBottom());
+
+    // unflipped a vs flipped (empty) b yields true
+    EXPECT_TRUE(a.Contains(flip_lr(b))) << label;
+    EXPECT_TRUE(a.Contains(flip_tb(b))) << label;
+    EXPECT_TRUE(a.Contains(flip_lrtb(b))) << label;
+
+    // flipped (empty) a vs unflipped b yields false
+    EXPECT_FALSE(flip_lr(a).Contains(b)) << label;
+    EXPECT_FALSE(flip_tb(a).Contains(b)) << label;
+    EXPECT_FALSE(flip_lrtb(a).Contains(b)) << label;
+
+    // flipped (empty) a vs flipped (empty) b yields empty
+    EXPECT_FALSE(flip_lr(a).Contains(flip_lr(b))) << label;
+    EXPECT_FALSE(flip_tb(a).Contains(flip_tb(b))) << label;
+    EXPECT_FALSE(flip_lrtb(a).Contains(flip_lrtb(b))) << label;
+  };
+
+  auto test_inside = [&check_empty_flips](const IRect& a, const IRect& b) {
+    ASSERT_FALSE(a.IsEmpty()) << a;
+    // test b rects are allowed to have 0 w/h, but not be backwards
+    ASSERT_FALSE(b.GetLeft() > b.GetRight() || b.GetTop() > b.GetBottom());
+
+    std::stringstream stream;
+    stream << a << " contains " << b;
+    auto label = stream.str();
+
+    EXPECT_TRUE(a.Contains(b)) << label;
+    check_empty_flips(a, b, label);
+  };
+
+  auto test_not_inside = [&check_empty_flips](const IRect& a, const IRect& b) {
+    ASSERT_FALSE(a.IsEmpty()) << a;
+    // If b was empty, it would be contained and should not be tested with
+    // this function - use |test_inside| instead.
+    ASSERT_FALSE(b.IsEmpty()) << b;
+
+    std::stringstream stream;
+    stream << a << " contains " << b;
+    auto label = stream.str();
+
+    EXPECT_FALSE(a.Contains(b)) << label;
+    check_empty_flips(a, b, label);
+  };
+
+  {
+    auto a = IRect::MakeXYWH(100, 100, 100, 100);
+
+    test_inside(a, a);
+  }
+  {
+    auto a = IRect::MakeXYWH(100, 100, 100, 100);
+    auto b = IRect::MakeXYWH(0, 0, 0, 0);
+
+    test_inside(a, b);
+  }
+  {
+    auto a = IRect::MakeXYWH(100, 100, 100, 100);
+    auto b = IRect::MakeXYWH(150, 150, 20, 20);
+
+    test_inside(a, b);
+  }
+  {
+    auto a = IRect::MakeXYWH(100, 100, 100, 100);
+    auto b = IRect::MakeXYWH(150, 150, 100, 100);
+
+    test_not_inside(a, b);
+  }
+  {
+    auto a = IRect::MakeXYWH(100, 100, 100, 100);
+    auto b = IRect::MakeXYWH(50, 50, 100, 100);
+
+    test_not_inside(a, b);
+  }
+  {
+    auto a = IRect::MakeXYWH(100, 100, 100, 100);
+    auto b = IRect::MakeXYWH(0, 0, 300, 300);
+
+    test_not_inside(a, b);
+  }
+  {
+    auto a = IRect::MakeMaximum();
+    auto b = IRect::MakeXYWH(0, 0, 300, 300);
+
+    test_inside(a, b);
+  }
+}
+
+TEST(RectTest, RectCutOut) {
+  Rect cull_rect = Rect::MakeLTRB(20, 20, 40, 40);
+
+  auto check_nans = [&cull_rect](const Rect& diff_rect,
+                                 const std::string& label) {
+    EXPECT_TRUE(cull_rect.IsFinite()) << label;
+    EXPECT_TRUE(diff_rect.IsFinite()) << label;
+
+    for (int i = 1; i < 16; i++) {
+      // NaN in cull_rect produces empty
+      EXPECT_FALSE(swap_nan(cull_rect, i).Cutout(diff_rect).has_value())
+          << label << ", index " << i;
+      EXPECT_EQ(swap_nan(cull_rect, i).CutoutOrEmpty(diff_rect), Rect())
+          << label << ", index " << i;
+
+      // NaN in diff_rect is nop
+      EXPECT_TRUE(cull_rect.Cutout(swap_nan(diff_rect, i)).has_value())
+          << label << ", index " << i;
+      EXPECT_EQ(cull_rect.CutoutOrEmpty(swap_nan(diff_rect, i)), cull_rect)
+          << label << ", index " << i;
+
+      for (int j = 1; j < 16; j++) {
+        // NaN in both is also empty
+        EXPECT_FALSE(
+            swap_nan(cull_rect, i).Cutout(swap_nan(diff_rect, j)).has_value())
+            << label << ", indices " << i << ", " << j;
+        EXPECT_EQ(swap_nan(cull_rect, i).CutoutOrEmpty(swap_nan(diff_rect, j)),
+                  Rect())
+            << label << ", indices " << i << ", " << j;
+      }
+    }
+  };
+
+  auto check_empty_flips = [&cull_rect](const Rect& diff_rect,
+                                        const std::string& label) {
+    EXPECT_FALSE(cull_rect.IsEmpty()) << label;
+    EXPECT_FALSE(diff_rect.IsEmpty()) << label;
+
+    // unflipped cull_rect vs flipped(empty) diff_rect
+    // == cull_rect
+    EXPECT_TRUE(cull_rect.Cutout(flip_lr(diff_rect)).has_value()) << label;
+    EXPECT_EQ(cull_rect.Cutout(flip_lr(diff_rect)), cull_rect) << label;
+    EXPECT_TRUE(cull_rect.Cutout(flip_tb(diff_rect)).has_value()) << label;
+    EXPECT_EQ(cull_rect.Cutout(flip_tb(diff_rect)), cull_rect) << label;
+    EXPECT_TRUE(cull_rect.Cutout(flip_lrtb(diff_rect)).has_value()) << label;
+    EXPECT_EQ(cull_rect.Cutout(flip_lrtb(diff_rect)), cull_rect) << label;
+
+    // flipped(empty) cull_rect vs unflipped diff_rect
+    // == empty
+    EXPECT_FALSE(flip_lr(cull_rect).Cutout(diff_rect).has_value()) << label;
+    EXPECT_EQ(flip_lr(cull_rect).CutoutOrEmpty(diff_rect), Rect()) << label;
+    EXPECT_FALSE(flip_tb(cull_rect).Cutout(diff_rect).has_value()) << label;
+    EXPECT_EQ(flip_tb(cull_rect).CutoutOrEmpty(diff_rect), Rect()) << label;
+    EXPECT_FALSE(flip_lrtb(cull_rect).Cutout(diff_rect).has_value()) << label;
+    EXPECT_EQ(flip_lrtb(cull_rect).CutoutOrEmpty(diff_rect), Rect()) << label;
+
+    // flipped(empty) cull_rect vs flipped(empty) diff_rect
+    // == empty
+    EXPECT_FALSE(flip_lr(cull_rect).Cutout(flip_lr(diff_rect)).has_value())
+        << label;
+    EXPECT_EQ(flip_lr(cull_rect).CutoutOrEmpty(flip_lr(diff_rect)), Rect())
+        << label;
+    EXPECT_FALSE(flip_tb(cull_rect).Cutout(flip_tb(diff_rect)).has_value())
+        << label;
+    EXPECT_EQ(flip_tb(cull_rect).CutoutOrEmpty(flip_tb(diff_rect)), Rect())
+        << label;
+    EXPECT_FALSE(flip_lrtb(cull_rect).Cutout(flip_lrtb(diff_rect)).has_value())
+        << label;
+    EXPECT_EQ(flip_lrtb(cull_rect).CutoutOrEmpty(flip_lrtb(diff_rect)), Rect())
+        << label;
+  };
+
+  auto non_reducing = [&cull_rect, &check_empty_flips, &check_nans](
+                          const Rect& diff_rect, const std::string& label) {
+    EXPECT_EQ(cull_rect.Cutout(diff_rect), cull_rect) << label;
+    EXPECT_EQ(cull_rect.CutoutOrEmpty(diff_rect), cull_rect) << label;
+    check_empty_flips(diff_rect, label);
+    check_nans(diff_rect, label);
+  };
+
+  auto reducing = [&cull_rect, &check_empty_flips, &check_nans](
+                      const Rect& diff_rect, const Rect& result_rect,
+                      const std::string& label) {
+    EXPECT_TRUE(!result_rect.IsEmpty());
+    EXPECT_EQ(cull_rect.Cutout(diff_rect), result_rect) << label;
+    EXPECT_EQ(cull_rect.CutoutOrEmpty(diff_rect), result_rect) << label;
+    check_empty_flips(diff_rect, label);
+    check_nans(diff_rect, label);
+  };
+
+  auto emptying = [&cull_rect, &check_empty_flips, &check_nans](
+                      const Rect& diff_rect, const std::string& label) {
+    EXPECT_FALSE(cull_rect.Cutout(diff_rect).has_value()) << label;
+    EXPECT_EQ(cull_rect.CutoutOrEmpty(diff_rect), Rect()) << label;
+    check_empty_flips(diff_rect, label);
+    check_nans(diff_rect, label);
+  };
+
+  // Skim the corners and edge
+  non_reducing(Rect::MakeLTRB(10, 10, 20, 20), "outside UL corner");
+  non_reducing(Rect::MakeLTRB(20, 10, 40, 20), "Above");
+  non_reducing(Rect::MakeLTRB(40, 10, 50, 20), "outside UR corner");
+  non_reducing(Rect::MakeLTRB(40, 20, 50, 40), "Right");
+  non_reducing(Rect::MakeLTRB(40, 40, 50, 50), "outside LR corner");
+  non_reducing(Rect::MakeLTRB(20, 40, 40, 50), "Below");
+  non_reducing(Rect::MakeLTRB(10, 40, 20, 50), "outside LR corner");
+  non_reducing(Rect::MakeLTRB(10, 20, 20, 40), "Left");
+
+  // Overlap corners
+  non_reducing(Rect::MakeLTRB(15, 15, 25, 25), "covering UL corner");
+  non_reducing(Rect::MakeLTRB(35, 15, 45, 25), "covering UR corner");
+  non_reducing(Rect::MakeLTRB(35, 35, 45, 45), "covering LR corner");
+  non_reducing(Rect::MakeLTRB(15, 35, 25, 45), "covering LL corner");
+
+  // Overlap edges, but not across an entire side
+  non_reducing(Rect::MakeLTRB(20, 15, 39, 25), "Top edge left-biased");
+  non_reducing(Rect::MakeLTRB(21, 15, 40, 25), "Top edge, right biased");
+  non_reducing(Rect::MakeLTRB(35, 20, 45, 39), "Right edge, top-biased");
+  non_reducing(Rect::MakeLTRB(35, 21, 45, 40), "Right edge, bottom-biased");
+  non_reducing(Rect::MakeLTRB(20, 35, 39, 45), "Bottom edge, left-biased");
+  non_reducing(Rect::MakeLTRB(21, 35, 40, 45), "Bottom edge, right-biased");
+  non_reducing(Rect::MakeLTRB(15, 20, 25, 39), "Left edge, top-biased");
+  non_reducing(Rect::MakeLTRB(15, 21, 25, 40), "Left edge, bottom-biased");
+
+  // Slice all the way through the middle
+  non_reducing(Rect::MakeLTRB(25, 15, 35, 45), "Vertical interior slice");
+  non_reducing(Rect::MakeLTRB(15, 25, 45, 35), "Horizontal interior slice");
+
+  // Slice off each edge
+  reducing(Rect::MakeLTRB(20, 15, 40, 25),  //
+           Rect::MakeLTRB(20, 25, 40, 40),  //
+           "Slice off top");
+  reducing(Rect::MakeLTRB(35, 20, 45, 40),  //
+           Rect::MakeLTRB(20, 20, 35, 40),  //
+           "Slice off right");
+  reducing(Rect::MakeLTRB(20, 35, 40, 45),  //
+           Rect::MakeLTRB(20, 20, 40, 35),  //
+           "Slice off bottom");
+  reducing(Rect::MakeLTRB(15, 20, 25, 40),  //
+           Rect::MakeLTRB(25, 20, 40, 40),  //
+           "Slice off left");
+
+  // cull rect contains diff rect
+  non_reducing(Rect::MakeLTRB(21, 21, 39, 39), "Contained, non-covering");
+
+  // cull rect equals diff rect
+  emptying(cull_rect, "Perfectly covering");
+
+  // diff rect contains cull rect
+  emptying(Rect::MakeLTRB(15, 15, 45, 45), "Smothering");
+}
+
+TEST(RectTest, IRectCutOut) {
+  IRect cull_rect = IRect::MakeLTRB(20, 20, 40, 40);
+
+  auto check_empty_flips = [&cull_rect](const IRect& diff_rect,
+                                        const std::string& label) {
+    EXPECT_FALSE(diff_rect.IsEmpty());
+    EXPECT_FALSE(cull_rect.IsEmpty());
+
+    // unflipped cull_rect vs flipped(empty) diff_rect
+    // == cull_rect
+    EXPECT_TRUE(cull_rect.Cutout(flip_lr(diff_rect)).has_value()) << label;
+    EXPECT_EQ(cull_rect.Cutout(flip_lr(diff_rect)), cull_rect) << label;
+    EXPECT_TRUE(cull_rect.Cutout(flip_tb(diff_rect)).has_value()) << label;
+    EXPECT_EQ(cull_rect.Cutout(flip_tb(diff_rect)), cull_rect) << label;
+    EXPECT_TRUE(cull_rect.Cutout(flip_lrtb(diff_rect)).has_value()) << label;
+    EXPECT_EQ(cull_rect.Cutout(flip_lrtb(diff_rect)), cull_rect) << label;
+
+    // flipped(empty) cull_rect vs flipped(empty) diff_rect
+    // == empty
+    EXPECT_FALSE(flip_lr(cull_rect).Cutout(diff_rect).has_value()) << label;
+    EXPECT_EQ(flip_lr(cull_rect).CutoutOrEmpty(diff_rect), IRect()) << label;
+    EXPECT_FALSE(flip_tb(cull_rect).Cutout(diff_rect).has_value()) << label;
+    EXPECT_EQ(flip_tb(cull_rect).CutoutOrEmpty(diff_rect), IRect()) << label;
+    EXPECT_FALSE(flip_lrtb(cull_rect).Cutout(diff_rect).has_value()) << label;
+    EXPECT_EQ(flip_lrtb(cull_rect).CutoutOrEmpty(diff_rect), IRect()) << label;
+
+    // flipped(empty) cull_rect vs unflipped diff_rect
+    // == empty
+    EXPECT_FALSE(flip_lr(cull_rect).Cutout(flip_lr(diff_rect)).has_value())
+        << label;
+    EXPECT_EQ(flip_lr(cull_rect).CutoutOrEmpty(flip_lr(diff_rect)), IRect())
+        << label;
+    EXPECT_FALSE(flip_tb(cull_rect).Cutout(flip_tb(diff_rect)).has_value())
+        << label;
+    EXPECT_EQ(flip_tb(cull_rect).CutoutOrEmpty(flip_tb(diff_rect)), IRect())
+        << label;
+    EXPECT_FALSE(flip_lrtb(cull_rect).Cutout(flip_lrtb(diff_rect)).has_value())
+        << label;
+    EXPECT_EQ(flip_lrtb(cull_rect).CutoutOrEmpty(flip_lrtb(diff_rect)), IRect())
+        << label;
+  };
+
+  auto non_reducing = [&cull_rect, &check_empty_flips](
+                          const IRect& diff_rect, const std::string& label) {
+    EXPECT_EQ(cull_rect.Cutout(diff_rect), cull_rect) << label;
+    EXPECT_EQ(cull_rect.CutoutOrEmpty(diff_rect), cull_rect) << label;
+    check_empty_flips(diff_rect, label);
+  };
+
+  auto reducing = [&cull_rect, &check_empty_flips](const IRect& diff_rect,
+                                                   const IRect& result_rect,
+                                                   const std::string& label) {
+    EXPECT_TRUE(!result_rect.IsEmpty());
+    EXPECT_EQ(cull_rect.Cutout(diff_rect), result_rect) << label;
+    EXPECT_EQ(cull_rect.CutoutOrEmpty(diff_rect), result_rect) << label;
+    check_empty_flips(diff_rect, label);
+  };
+
+  auto emptying = [&cull_rect, &check_empty_flips](const IRect& diff_rect,
+                                                   const std::string& label) {
+    EXPECT_FALSE(cull_rect.Cutout(diff_rect).has_value()) << label;
+    EXPECT_EQ(cull_rect.CutoutOrEmpty(diff_rect), IRect()) << label;
+    check_empty_flips(diff_rect, label);
+  };
+
+  // Skim the corners and edge
+  non_reducing(IRect::MakeLTRB(10, 10, 20, 20), "outside UL corner");
+  non_reducing(IRect::MakeLTRB(20, 10, 40, 20), "Above");
+  non_reducing(IRect::MakeLTRB(40, 10, 50, 20), "outside UR corner");
+  non_reducing(IRect::MakeLTRB(40, 20, 50, 40), "Right");
+  non_reducing(IRect::MakeLTRB(40, 40, 50, 50), "outside LR corner");
+  non_reducing(IRect::MakeLTRB(20, 40, 40, 50), "Below");
+  non_reducing(IRect::MakeLTRB(10, 40, 20, 50), "outside LR corner");
+  non_reducing(IRect::MakeLTRB(10, 20, 20, 40), "Left");
+
+  // Overlap corners
+  non_reducing(IRect::MakeLTRB(15, 15, 25, 25), "covering UL corner");
+  non_reducing(IRect::MakeLTRB(35, 15, 45, 25), "covering UR corner");
+  non_reducing(IRect::MakeLTRB(35, 35, 45, 45), "covering LR corner");
+  non_reducing(IRect::MakeLTRB(15, 35, 25, 45), "covering LL corner");
+
+  // Overlap edges, but not across an entire side
+  non_reducing(IRect::MakeLTRB(20, 15, 39, 25), "Top edge left-biased");
+  non_reducing(IRect::MakeLTRB(21, 15, 40, 25), "Top edge, right biased");
+  non_reducing(IRect::MakeLTRB(35, 20, 45, 39), "Right edge, top-biased");
+  non_reducing(IRect::MakeLTRB(35, 21, 45, 40), "Right edge, bottom-biased");
+  non_reducing(IRect::MakeLTRB(20, 35, 39, 45), "Bottom edge, left-biased");
+  non_reducing(IRect::MakeLTRB(21, 35, 40, 45), "Bottom edge, right-biased");
+  non_reducing(IRect::MakeLTRB(15, 20, 25, 39), "Left edge, top-biased");
+  non_reducing(IRect::MakeLTRB(15, 21, 25, 40), "Left edge, bottom-biased");
+
+  // Slice all the way through the middle
+  non_reducing(IRect::MakeLTRB(25, 15, 35, 45), "Vertical interior slice");
+  non_reducing(IRect::MakeLTRB(15, 25, 45, 35), "Horizontal interior slice");
+
+  // Slice off each edge
+  reducing(IRect::MakeLTRB(20, 15, 40, 25),  //
+           IRect::MakeLTRB(20, 25, 40, 40),  //
+           "Slice off top");
+  reducing(IRect::MakeLTRB(35, 20, 45, 40),  //
+           IRect::MakeLTRB(20, 20, 35, 40),  //
+           "Slice off right");
+  reducing(IRect::MakeLTRB(20, 35, 40, 45),  //
+           IRect::MakeLTRB(20, 20, 40, 35),  //
+           "Slice off bottom");
+  reducing(IRect::MakeLTRB(15, 20, 25, 40),  //
+           IRect::MakeLTRB(25, 20, 40, 40),  //
+           "Slice off left");
+
+  // cull rect contains diff rect
+  non_reducing(IRect::MakeLTRB(21, 21, 39, 39), "Contained, non-covering");
+
+  // cull rect equals diff rect
+  emptying(cull_rect, "Perfectly covering");
+
+  // diff rect contains cull rect
+  emptying(IRect::MakeLTRB(15, 15, 45, 45), "Smothering");
+}
+
+TEST(RectTest, RectGetPoints) {
+  {
+    Rect r = Rect::MakeXYWH(100, 200, 300, 400);
+    auto points = r.GetPoints();
+    EXPECT_POINT_NEAR(points[0], Point(100, 200));
+    EXPECT_POINT_NEAR(points[1], Point(400, 200));
+    EXPECT_POINT_NEAR(points[2], Point(100, 600));
+    EXPECT_POINT_NEAR(points[3], Point(400, 600));
+  }
+
+  {
+    Rect r = Rect::MakeMaximum();
+    auto points = r.GetPoints();
+    EXPECT_EQ(points[0], Point(std::numeric_limits<float>::lowest(),
+                               std::numeric_limits<float>::lowest()));
+    EXPECT_EQ(points[1], Point(std::numeric_limits<float>::max(),
+                               std::numeric_limits<float>::lowest()));
+    EXPECT_EQ(points[2], Point(std::numeric_limits<float>::lowest(),
+                               std::numeric_limits<float>::max()));
+    EXPECT_EQ(points[3], Point(std::numeric_limits<float>::max(),
+                               std::numeric_limits<float>::max()));
+  }
+}
+
+TEST(RectTest, RectShift) {
+  auto r = Rect::MakeLTRB(0, 0, 100, 100);
+
+  EXPECT_EQ(r.Shift(Point(10, 5)), Rect::MakeLTRB(10, 5, 110, 105));
+  EXPECT_EQ(r.Shift(Point(-10, -5)), Rect::MakeLTRB(-10, -5, 90, 95));
+}
+
+TEST(RectTest, RectGetTransformedPoints) {
+  Rect r = Rect::MakeXYWH(100, 200, 300, 400);
+  auto points = r.GetTransformedPoints(Matrix::MakeTranslation({10, 20}));
+  EXPECT_POINT_NEAR(points[0], Point(110, 220));
+  EXPECT_POINT_NEAR(points[1], Point(410, 220));
+  EXPECT_POINT_NEAR(points[2], Point(110, 620));
+  EXPECT_POINT_NEAR(points[3], Point(410, 620));
+}
+
+TEST(RectTest, RectMakePointBounds) {
+  {
+    std::vector<Point> points{{1, 5}, {4, -1}, {0, 6}};
+    auto r = Rect::MakePointBounds(points.begin(), points.end());
+    auto expected = Rect::MakeXYWH(0, -1, 4, 7);
+    EXPECT_TRUE(r.has_value());
+    if (r.has_value()) {
+      EXPECT_RECT_NEAR(r.value(), expected);
+    }
+  }
+  {
+    std::vector<Point> points;
+    std::optional<Rect> r = Rect::MakePointBounds(points.begin(), points.end());
+    EXPECT_FALSE(r.has_value());
+  }
+}
+
+TEST(RectTest, RectGetPositive) {
+  {
+    Rect r = Rect::MakeXYWH(100, 200, 300, 400);
+    auto actual = r.GetPositive();
+    EXPECT_RECT_NEAR(r, actual);
+  }
+  {
+    Rect r = Rect::MakeXYWH(100, 200, -100, -100);
+    auto actual = r.GetPositive();
+    Rect expected = Rect::MakeXYWH(0, 100, 100, 100);
+    EXPECT_RECT_NEAR(expected, actual);
+  }
+}
+
+TEST(RectTest, RectDirections) {
+  auto r = Rect::MakeLTRB(1, 2, 3, 4);
+
+  EXPECT_EQ(r.GetLeft(), 1);
+  EXPECT_EQ(r.GetTop(), 2);
+  EXPECT_EQ(r.GetRight(), 3);
+  EXPECT_EQ(r.GetBottom(), 4);
+
+  EXPECT_POINT_NEAR(r.GetLeftTop(), Point(1, 2));
+  EXPECT_POINT_NEAR(r.GetRightTop(), Point(3, 2));
+  EXPECT_POINT_NEAR(r.GetLeftBottom(), Point(1, 4));
+  EXPECT_POINT_NEAR(r.GetRightBottom(), Point(3, 4));
+}
+
+TEST(RectTest, RectProject) {
+  {
+    auto r = Rect::MakeLTRB(-100, -100, 100, 100);
+    auto actual = r.Project(r);
+    auto expected = Rect::MakeLTRB(0, 0, 1, 1);
+    EXPECT_RECT_NEAR(expected, actual);
+  }
+  {
+    auto r = Rect::MakeLTRB(-100, -100, 100, 100);
+    auto actual = r.Project(Rect::MakeLTRB(0, 0, 100, 100));
+    auto expected = Rect::MakeLTRB(0.5, 0.5, 1, 1);
+    EXPECT_RECT_NEAR(expected, actual);
+  }
+}
+
+TEST(RectTest, RectRoundOut) {
+  {
+    auto r = Rect::MakeLTRB(-100, -100, 100, 100);
+    EXPECT_EQ(Rect::RoundOut(r), r);
+  }
+  {
+    auto r = Rect::MakeLTRB(-100.1, -100.1, 100.1, 100.1);
+    EXPECT_EQ(Rect::RoundOut(r), Rect::MakeLTRB(-101, -101, 101, 101));
+  }
+}
+
+TEST(RectTest, IRectRoundOut) {
+  {
+    auto r = Rect::MakeLTRB(-100, -100, 100, 100);
+    auto ir = IRect::MakeLTRB(-100, -100, 100, 100);
+    EXPECT_EQ(IRect::RoundOut(r), ir);
+  }
+  {
+    auto r = Rect::MakeLTRB(-100.1, -100.1, 100.1, 100.1);
+    auto ir = IRect::MakeLTRB(-101, -101, 101, 101);
+    EXPECT_EQ(IRect::RoundOut(r), ir);
+  }
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/geometry/saturated_math.h b/impeller/geometry/saturated_math.h
new file mode 100644
index 0000000000000000000000000000000000000000..bd92cbf42474c7e69df64959813402a9cdb6c157
--- /dev/null
+++ b/impeller/geometry/saturated_math.h
@@ -0,0 +1,148 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_GEOMETRY_SATURATED_MATH_H_
+#define FLUTTER_IMPELLER_GEOMETRY_SATURATED_MATH_H_
+
+#include <algorithm>
+#include <limits>
+#include <type_traits>
+
+#include "flutter/fml/logging.h"
+#include "impeller/geometry/scalar.h"
+
+namespace impeller {
+
+namespace saturated {
+
+// NOLINTBEGIN(readability-identifier-naming)
+template <typename T>
+inline constexpr bool is_signed_integral_v =
+    std::is_integral_v<T> && std::is_signed_v<T>;
+// NOLINTEND(readability-identifier-naming)
+
+#define ONLY_ON_SIGNED_INT_RET(Type, Ret) \
+  template <typename Type>                \
+  constexpr inline std::enable_if_t<is_signed_integral_v<Type>, Ret>
+#define ONLY_ON_SIGNED_INT(Type) ONLY_ON_SIGNED_INT_RET(Type, Type)
+
+#define ONLY_ON_FLOAT_RET(Type, Ret) \
+  template <typename Type>           \
+  constexpr inline std::enable_if_t<std::is_floating_point_v<Type>, Ret>
+#define ONLY_ON_FLOAT(Type) ONLY_ON_FLOAT_RET(Type, Type)
+
+#define ONLY_ON_FLOAT_TO_SIGNED_INT_RET(FPType, SIType, Ret) \
+  template <typename FPType, typename SIType>                \
+  constexpr inline std::enable_if_t<                         \
+      std::is_floating_point_v<FPType> && is_signed_integral_v<SIType>, Ret>
+#define ONLY_ON_FLOAT_TO_SIGNED_INT(FPType, SIType) \
+  ONLY_ON_FLOAT_TO_SIGNED_INT_RET(FPType, SIType, SIType)
+
+#define ONLY_ON_DIFFERING_FLOAT_RET(FPType1, FPType2, Ret)                   \
+  template <typename FPType1, typename FPType2>                              \
+  constexpr inline std::enable_if_t<std::is_floating_point_v<FPType1> &&     \
+                                        std::is_floating_point_v<FPType2> && \
+                                        !std::is_same_v<FPType1, FPType2>,   \
+                                    Ret>
+#define ONLY_ON_DIFFERING_FLOAT(FPType1, FPType2) \
+  ONLY_ON_DIFFERING_FLOAT_RET(FPType1, FPType2, FPType2)
+
+#define ONLY_ON_SAME_TYPES_RET(Type1, Type2, Ret) \
+  template <typename Type1, typename Type2>       \
+  constexpr inline std::enable_if_t<std::is_same_v<Type1, Type2>, Ret>
+#define ONLY_ON_SAME_TYPES(Type1, Type2) \
+  ONLY_ON_SAME_TYPES_RET(Type1, Type2, Type2)
+
+ONLY_ON_SIGNED_INT(SI) Add(SI location, SI distance) {
+  if (location >= 0) {
+    if (distance > std::numeric_limits<SI>::max() - location) {
+      return std::numeric_limits<SI>::max();
+    }
+  } else if (distance < std::numeric_limits<SI>::min() - location) {
+    return std::numeric_limits<SI>::min();
+  }
+  return location + distance;
+}
+
+ONLY_ON_FLOAT(FP) Add(FP location, FP distance) {
+  return location + distance;
+}
+
+ONLY_ON_SIGNED_INT(SI) Sub(SI upper, SI lower) {
+  if (upper >= 0) {
+    if (lower < 0 && upper > std::numeric_limits<SI>::max() + lower) {
+      return std::numeric_limits<SI>::max();
+    }
+  } else if (lower > 0 && upper < std::numeric_limits<SI>::min() + lower) {
+    return std::numeric_limits<SI>::min();
+  }
+  return upper - lower;
+}
+
+ONLY_ON_FLOAT(FP) Sub(FP upper, FP lower) {
+  return upper - lower;
+}
+
+ONLY_ON_SIGNED_INT_RET(SI, Scalar) AverageScalar(SI a, SI b) {
+  // scalbn has an implementation for ints that converts to double
+  // while adjusting the exponent.
+  return static_cast<Scalar>(std::scalbn(a, -1) + std::scalbn(b, -1));
+}
+
+ONLY_ON_FLOAT(FP) AverageScalar(FP a, FP b) {
+  // GetCenter might want this to return 0 for a Maximum Rect, but it
+  // will currently produce NaN instead.  For the Maximum Rect itself
+  // a 0 would make sense as the center, but for a computed rect that
+  // incidentally ended up with infinities, NaN may be a better choice.
+  // return static_cast<Scalar>(std::scalbn(a, -1) + std::scalbn(b, -1));
+
+  // This equation would save an extra scalbn operation but at the cost
+  // of having very large (or very neagive) a's and b's overflow to
+  // +/- infinity. Scaling first allows finite numbers to be more likely
+  // to have a finite average.
+  // return std::scalbn(a + b, -1);
+
+  return static_cast<Scalar>(std::scalbn(a, -1) + std::scalbn(b, -1));
+}
+
+ONLY_ON_SAME_TYPES(T, U) Cast(T v) {
+  return v;
+}
+
+ONLY_ON_FLOAT_TO_SIGNED_INT(FP, SI) Cast(FP v) {
+  if (v <= static_cast<FP>(std::numeric_limits<SI>::min())) {
+    return std::numeric_limits<SI>::min();
+  } else if (v >= static_cast<FP>(std::numeric_limits<SI>::max())) {
+    return std::numeric_limits<SI>::max();
+  }
+  return static_cast<SI>(v);
+}
+
+ONLY_ON_DIFFERING_FLOAT(FP1, FP2) Cast(FP1 v) {
+  if (std::isfinite(v)) {
+    // Avoid truncation to inf/-inf.
+    return std::clamp(static_cast<FP2>(v),  //
+                      std::numeric_limits<FP2>::lowest(),
+                      std::numeric_limits<FP2>::max());
+  } else {
+    return static_cast<FP2>(v);
+  }
+}
+
+#undef ONLY_ON_SAME_TYPES
+#undef ONLY_ON_SAME_TYPES_RET
+#undef ONLY_ON_DIFFERING_FLOAT
+#undef ONLY_ON_DIFFERING_FLOAT_RET
+#undef ONLY_ON_FLOAT_TO_SIGNED_INT
+#undef ONLY_ON_FLOAT_TO_SIGNED_INT_RET
+#undef ONLY_ON_FLOAT
+#undef ONLY_ON_FLOAT_RET
+#undef ONLY_ON_SIGNED_INT
+#undef ONLY_ON_SIGNED_INT_RET
+
+}  // namespace saturated
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_GEOMETRY_SATURATED_MATH_H_
diff --git a/impeller/geometry/saturated_math_unittests.cc b/impeller/geometry/saturated_math_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..4e845e5a4b42e542b57d1fe86791411749bb2a7a
--- /dev/null
+++ b/impeller/geometry/saturated_math_unittests.cc
@@ -0,0 +1,1133 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "gtest/gtest.h"
+
+#include "impeller/geometry/saturated_math.h"
+
+namespace impeller {
+namespace testing {
+
+TEST(SaturatedMath, ExplicitAddOfSignedInts) {
+  {
+    EXPECT_EQ(saturated::Add<int8_t>(0x79, 5), int8_t(0x7E));
+    EXPECT_EQ(saturated::Add<int8_t>(0x7A, 5), int8_t(0x7F));
+    EXPECT_EQ(saturated::Add<int8_t>(0x7B, 5), int8_t(0x7F));
+  }
+  {
+    EXPECT_EQ(saturated::Add<int8_t>(0x86, -5), int8_t(0x81));
+    EXPECT_EQ(saturated::Add<int8_t>(0x85, -5), int8_t(0x80));
+    EXPECT_EQ(saturated::Add<int8_t>(0x84, -5), int8_t(0x80));
+  }
+  {
+    EXPECT_EQ(saturated::Add<int16_t>(0x7FF9, 5), int16_t(0x7FFE));
+    EXPECT_EQ(saturated::Add<int16_t>(0x7FFA, 5), int16_t(0x7FFF));
+    EXPECT_EQ(saturated::Add<int16_t>(0x7FFB, 5), int16_t(0x7FFF));
+  }
+  {
+    EXPECT_EQ(saturated::Add<int16_t>(0x8006, -5), int16_t(0x8001));
+    EXPECT_EQ(saturated::Add<int16_t>(0x8005, -5), int16_t(0x8000));
+    EXPECT_EQ(saturated::Add<int16_t>(0x8004, -5), int16_t(0x8000));
+  }
+  {
+    EXPECT_EQ(saturated::Add<int32_t>(0x7FFFFFF9, 5), int32_t(0x7FFFFFFE));
+    EXPECT_EQ(saturated::Add<int32_t>(0x7FFFFFFA, 5), int32_t(0x7FFFFFFF));
+    EXPECT_EQ(saturated::Add<int32_t>(0x7FFFFFFB, 5), int32_t(0x7FFFFFFF));
+  }
+  {
+    EXPECT_EQ(saturated::Add<int32_t>(0x80000006, -5), int32_t(0x80000001));
+    EXPECT_EQ(saturated::Add<int32_t>(0x80000005, -5), int32_t(0x80000000));
+    EXPECT_EQ(saturated::Add<int32_t>(0x80000004, -5), int32_t(0x80000000));
+  }
+  {
+    EXPECT_EQ(saturated::Add<int64_t>(0x7FFFFFFFFFFFFFF9, 5),
+              int64_t(0x7FFFFFFFFFFFFFFE));
+    EXPECT_EQ(saturated::Add<int64_t>(0x7FFFFFFFFFFFFFFA, 5),
+              int64_t(0x7FFFFFFFFFFFFFFF));
+    EXPECT_EQ(saturated::Add<int64_t>(0x7FFFFFFFFFFFFFFB, 5),
+              int64_t(0x7FFFFFFFFFFFFFFF));
+  }
+  {
+    EXPECT_EQ(saturated::Add<int64_t>(0x8000000000000006, -5),
+              int64_t(0x8000000000000001));
+    EXPECT_EQ(saturated::Add<int64_t>(0x8000000000000005, -5),
+              int64_t(0x8000000000000000));
+    EXPECT_EQ(saturated::Add<int64_t>(0x8000000000000004, -5),
+              int64_t(0x8000000000000000));
+  }
+}
+
+TEST(SaturatedMath, ImplicitAddOfSignedInts) {
+  {
+    int8_t a = 0x79;
+    int8_t b = 5;
+    EXPECT_EQ(saturated::Add(a, b), int8_t(0x7E));
+    a = 0x7A;
+    EXPECT_EQ(saturated::Add(a, b), int8_t(0x7F));
+    a = 0x7B;
+    EXPECT_EQ(saturated::Add(a, b), int8_t(0x7F));
+  }
+  {
+    int8_t a = 0x86;
+    int8_t b = -5;
+    EXPECT_EQ(saturated::Add(a, b), int8_t(0x81));
+    a = 0x85;
+    EXPECT_EQ(saturated::Add(a, b), int8_t(0x80));
+    a = 0x84;
+    EXPECT_EQ(saturated::Add(a, b), int8_t(0x80));
+  }
+  {
+    int16_t a = 0x7FF9;
+    int16_t b = 5;
+    EXPECT_EQ(saturated::Add(a, b), int16_t(0x7FFE));
+    a = 0x7FFA;
+    EXPECT_EQ(saturated::Add(a, b), int16_t(0x7FFF));
+    a = 0x7FFB;
+    EXPECT_EQ(saturated::Add(a, b), int16_t(0x7FFF));
+  }
+  {
+    int16_t a = 0x8006;
+    int16_t b = -5;
+    EXPECT_EQ(saturated::Add(a, b), int16_t(0x8001));
+    a = 0x8005;
+    EXPECT_EQ(saturated::Add(a, b), int16_t(0x8000));
+    a = 0x8004;
+    EXPECT_EQ(saturated::Add(a, b), int16_t(0x8000));
+  }
+  {
+    int32_t a = 0x7FFFFFF9;
+    int32_t b = 5;
+    EXPECT_EQ(saturated::Add(a, b), int32_t(0x7FFFFFFE));
+    a = 0x7FFFFFFA;
+    EXPECT_EQ(saturated::Add(a, b), int32_t(0x7FFFFFFF));
+    a = 0x7FFFFFFB;
+    EXPECT_EQ(saturated::Add(a, b), int32_t(0x7FFFFFFF));
+  }
+  {
+    int32_t a = 0x80000006;
+    int32_t b = -5;
+    EXPECT_EQ(saturated::Add(a, b), int32_t(0x80000001));
+    a = 0x80000005;
+    EXPECT_EQ(saturated::Add(a, b), int32_t(0x80000000));
+    a = 0x80000004;
+    EXPECT_EQ(saturated::Add(a, b), int32_t(0x80000000));
+  }
+  {
+    int64_t a = 0x7FFFFFFFFFFFFFF9;
+    int64_t b = 5;
+    EXPECT_EQ(saturated::Add(a, b), int64_t(0x7FFFFFFFFFFFFFFE));
+    a = 0x7FFFFFFFFFFFFFFA;
+    EXPECT_EQ(saturated::Add(a, b), int64_t(0x7FFFFFFFFFFFFFFF));
+    a = 0x7FFFFFFFFFFFFFFB;
+    EXPECT_EQ(saturated::Add(a, b), int64_t(0x7FFFFFFFFFFFFFFF));
+  }
+  {
+    int64_t a = 0x8000000000000006;
+    int64_t b = -5;
+    EXPECT_EQ(saturated::Add(a, b), int64_t(0x8000000000000001));
+    a = 0x8000000000000005;
+    EXPECT_EQ(saturated::Add(a, b), int64_t(0x8000000000000000));
+    a = 0x8000000000000004;
+    EXPECT_EQ(saturated::Add(a, b), int64_t(0x8000000000000000));
+  }
+}
+
+TEST(SaturatedMath, ExplicitAddOfFloatingPoint) {
+  {
+    const float inf = std::numeric_limits<float>::infinity();
+    const float max = std::numeric_limits<float>::max();
+    const float big = max * 0.5f;
+
+    EXPECT_EQ(saturated::Add<float>(big, big), max);
+    EXPECT_EQ(saturated::Add<float>(max, big), inf);
+    EXPECT_EQ(saturated::Add<float>(big, max), inf);
+    EXPECT_EQ(saturated::Add<float>(max, max), inf);
+    EXPECT_EQ(saturated::Add<float>(max, inf), inf);
+    EXPECT_EQ(saturated::Add<float>(inf, max), inf);
+    EXPECT_EQ(saturated::Add<float>(inf, inf), inf);
+
+    EXPECT_EQ(saturated::Add<float>(-big, -big), -max);
+    EXPECT_EQ(saturated::Add<float>(-max, -big), -inf);
+    EXPECT_EQ(saturated::Add<float>(-big, -max), -inf);
+    EXPECT_EQ(saturated::Add<float>(-max, -max), -inf);
+    EXPECT_EQ(saturated::Add<float>(-max, -inf), -inf);
+    EXPECT_EQ(saturated::Add<float>(-inf, -max), -inf);
+    EXPECT_EQ(saturated::Add<float>(-inf, -inf), -inf);
+
+    EXPECT_EQ(saturated::Add<float>(big, -big), 0.0f);
+    EXPECT_EQ(saturated::Add<float>(max, -big), big);
+    EXPECT_EQ(saturated::Add<float>(big, -max), -big);
+    EXPECT_EQ(saturated::Add<float>(max, -max), 0.0f);
+    EXPECT_EQ(saturated::Add<float>(max, -inf), -inf);
+    EXPECT_EQ(saturated::Add<float>(inf, -max), inf);
+    EXPECT_TRUE(std::isnan(saturated::Add<float>(inf, -inf)));
+
+    EXPECT_EQ(saturated::Add<float>(-big, big), 0.0f);
+    EXPECT_EQ(saturated::Add<float>(-max, big), -big);
+    EXPECT_EQ(saturated::Add<float>(-big, max), big);
+    EXPECT_EQ(saturated::Add<float>(-max, max), 0.0f);
+    EXPECT_EQ(saturated::Add<float>(-max, inf), inf);
+    EXPECT_EQ(saturated::Add<float>(-inf, max), -inf);
+    EXPECT_TRUE(std::isnan(saturated::Add<float>(-inf, inf)));
+  }
+  {
+    const double inf = std::numeric_limits<double>::infinity();
+    const double max = std::numeric_limits<double>::max();
+    const double big = max * 0.5f;
+
+    EXPECT_EQ(saturated::Add<double>(big, big), max);
+    EXPECT_EQ(saturated::Add<double>(max, big), inf);
+    EXPECT_EQ(saturated::Add<double>(big, max), inf);
+    EXPECT_EQ(saturated::Add<double>(max, max), inf);
+    EXPECT_EQ(saturated::Add<double>(max, inf), inf);
+    EXPECT_EQ(saturated::Add<double>(inf, max), inf);
+    EXPECT_EQ(saturated::Add<double>(inf, inf), inf);
+
+    EXPECT_EQ(saturated::Add<double>(-big, -big), -max);
+    EXPECT_EQ(saturated::Add<double>(-max, -big), -inf);
+    EXPECT_EQ(saturated::Add<double>(-big, -max), -inf);
+    EXPECT_EQ(saturated::Add<double>(-max, -max), -inf);
+    EXPECT_EQ(saturated::Add<double>(-max, -inf), -inf);
+    EXPECT_EQ(saturated::Add<double>(-inf, -max), -inf);
+    EXPECT_EQ(saturated::Add<double>(-inf, -inf), -inf);
+
+    EXPECT_EQ(saturated::Add<double>(big, -big), 0.0f);
+    EXPECT_EQ(saturated::Add<double>(max, -big), big);
+    EXPECT_EQ(saturated::Add<double>(big, -max), -big);
+    EXPECT_EQ(saturated::Add<double>(max, -max), 0.0f);
+    EXPECT_EQ(saturated::Add<double>(max, -inf), -inf);
+    EXPECT_EQ(saturated::Add<double>(inf, -max), inf);
+    EXPECT_TRUE(std::isnan(saturated::Add<double>(inf, -inf)));
+
+    EXPECT_EQ(saturated::Add<double>(-big, big), 0.0f);
+    EXPECT_EQ(saturated::Add<double>(-max, big), -big);
+    EXPECT_EQ(saturated::Add<double>(-big, max), big);
+    EXPECT_EQ(saturated::Add<double>(-max, max), 0.0f);
+    EXPECT_EQ(saturated::Add<double>(-max, inf), inf);
+    EXPECT_EQ(saturated::Add<double>(-inf, max), -inf);
+    EXPECT_TRUE(std::isnan(saturated::Add<double>(-inf, inf)));
+  }
+  {
+    const Scalar inf = std::numeric_limits<Scalar>::infinity();
+    const Scalar max = std::numeric_limits<Scalar>::max();
+    const Scalar big = max * 0.5f;
+
+    EXPECT_EQ(saturated::Add<Scalar>(big, big), max);
+    EXPECT_EQ(saturated::Add<Scalar>(max, big), inf);
+    EXPECT_EQ(saturated::Add<Scalar>(big, max), inf);
+    EXPECT_EQ(saturated::Add<Scalar>(max, max), inf);
+    EXPECT_EQ(saturated::Add<Scalar>(max, inf), inf);
+    EXPECT_EQ(saturated::Add<Scalar>(inf, max), inf);
+    EXPECT_EQ(saturated::Add<Scalar>(inf, inf), inf);
+
+    EXPECT_EQ(saturated::Add<Scalar>(-big, -big), -max);
+    EXPECT_EQ(saturated::Add<Scalar>(-max, -big), -inf);
+    EXPECT_EQ(saturated::Add<Scalar>(-big, -max), -inf);
+    EXPECT_EQ(saturated::Add<Scalar>(-max, -max), -inf);
+    EXPECT_EQ(saturated::Add<Scalar>(-max, -inf), -inf);
+    EXPECT_EQ(saturated::Add<Scalar>(-inf, -max), -inf);
+    EXPECT_EQ(saturated::Add<Scalar>(-inf, -inf), -inf);
+
+    EXPECT_EQ(saturated::Add<Scalar>(big, -big), 0.0f);
+    EXPECT_EQ(saturated::Add<Scalar>(max, -big), big);
+    EXPECT_EQ(saturated::Add<Scalar>(big, -max), -big);
+    EXPECT_EQ(saturated::Add<Scalar>(max, -max), 0.0f);
+    EXPECT_EQ(saturated::Add<Scalar>(max, -inf), -inf);
+    EXPECT_EQ(saturated::Add<Scalar>(inf, -max), inf);
+    EXPECT_TRUE(std::isnan(saturated::Add<Scalar>(inf, -inf)));
+
+    EXPECT_EQ(saturated::Add<Scalar>(-big, big), 0.0f);
+    EXPECT_EQ(saturated::Add<Scalar>(-max, big), -big);
+    EXPECT_EQ(saturated::Add<Scalar>(-big, max), big);
+    EXPECT_EQ(saturated::Add<Scalar>(-max, max), 0.0f);
+    EXPECT_EQ(saturated::Add<Scalar>(-max, inf), inf);
+    EXPECT_EQ(saturated::Add<Scalar>(-inf, max), -inf);
+    EXPECT_TRUE(std::isnan(saturated::Add<Scalar>(-inf, inf)));
+  }
+}
+
+TEST(SaturatedMath, ImplicitAddOfFloatingPoint) {
+  {
+    const float inf = std::numeric_limits<float>::infinity();
+    const float max = std::numeric_limits<float>::max();
+    const float big = max * 0.5f;
+
+    EXPECT_EQ(saturated::Add(big, big), max);
+    EXPECT_EQ(saturated::Add(max, big), inf);
+    EXPECT_EQ(saturated::Add(big, max), inf);
+    EXPECT_EQ(saturated::Add(max, max), inf);
+    EXPECT_EQ(saturated::Add(max, inf), inf);
+    EXPECT_EQ(saturated::Add(inf, max), inf);
+    EXPECT_EQ(saturated::Add(inf, inf), inf);
+
+    EXPECT_EQ(saturated::Add(-big, -big), -max);
+    EXPECT_EQ(saturated::Add(-max, -big), -inf);
+    EXPECT_EQ(saturated::Add(-big, -max), -inf);
+    EXPECT_EQ(saturated::Add(-max, -max), -inf);
+    EXPECT_EQ(saturated::Add(-max, -inf), -inf);
+    EXPECT_EQ(saturated::Add(-inf, -max), -inf);
+    EXPECT_EQ(saturated::Add(-inf, -inf), -inf);
+
+    EXPECT_EQ(saturated::Add(big, -big), 0.0f);
+    EXPECT_EQ(saturated::Add(max, -big), big);
+    EXPECT_EQ(saturated::Add(big, -max), -big);
+    EXPECT_EQ(saturated::Add(max, -max), 0.0f);
+    EXPECT_EQ(saturated::Add(max, -inf), -inf);
+    EXPECT_EQ(saturated::Add(inf, -max), inf);
+    EXPECT_TRUE(std::isnan(saturated::Add(inf, -inf)));
+
+    EXPECT_EQ(saturated::Add(-big, big), 0.0f);
+    EXPECT_EQ(saturated::Add(-max, big), -big);
+    EXPECT_EQ(saturated::Add(-big, max), big);
+    EXPECT_EQ(saturated::Add(-max, max), 0.0f);
+    EXPECT_EQ(saturated::Add(-max, inf), inf);
+    EXPECT_EQ(saturated::Add(-inf, max), -inf);
+    EXPECT_TRUE(std::isnan(saturated::Add(-inf, inf)));
+  }
+  {
+    const double inf = std::numeric_limits<double>::infinity();
+    const double max = std::numeric_limits<double>::max();
+    const double big = max * 0.5f;
+
+    EXPECT_EQ(saturated::Add(big, big), max);
+    EXPECT_EQ(saturated::Add(max, big), inf);
+    EXPECT_EQ(saturated::Add(big, max), inf);
+    EXPECT_EQ(saturated::Add(max, max), inf);
+    EXPECT_EQ(saturated::Add(max, inf), inf);
+    EXPECT_EQ(saturated::Add(inf, max), inf);
+    EXPECT_EQ(saturated::Add(inf, inf), inf);
+
+    EXPECT_EQ(saturated::Add(-big, -big), -max);
+    EXPECT_EQ(saturated::Add(-max, -big), -inf);
+    EXPECT_EQ(saturated::Add(-big, -max), -inf);
+    EXPECT_EQ(saturated::Add(-max, -max), -inf);
+    EXPECT_EQ(saturated::Add(-max, -inf), -inf);
+    EXPECT_EQ(saturated::Add(-inf, -max), -inf);
+    EXPECT_EQ(saturated::Add(-inf, -inf), -inf);
+
+    EXPECT_EQ(saturated::Add(big, -big), 0.0f);
+    EXPECT_EQ(saturated::Add(max, -big), big);
+    EXPECT_EQ(saturated::Add(big, -max), -big);
+    EXPECT_EQ(saturated::Add(max, -max), 0.0f);
+    EXPECT_EQ(saturated::Add(max, -inf), -inf);
+    EXPECT_EQ(saturated::Add(inf, -max), inf);
+    EXPECT_TRUE(std::isnan(saturated::Add(inf, -inf)));
+
+    EXPECT_EQ(saturated::Add(-big, big), 0.0f);
+    EXPECT_EQ(saturated::Add(-max, big), -big);
+    EXPECT_EQ(saturated::Add(-big, max), big);
+    EXPECT_EQ(saturated::Add(-max, max), 0.0f);
+    EXPECT_EQ(saturated::Add(-max, inf), inf);
+    EXPECT_EQ(saturated::Add(-inf, max), -inf);
+    EXPECT_TRUE(std::isnan(saturated::Add(-inf, inf)));
+  }
+  {
+    const Scalar inf = std::numeric_limits<Scalar>::infinity();
+    const Scalar max = std::numeric_limits<Scalar>::max();
+    const Scalar big = max * 0.5f;
+
+    EXPECT_EQ(saturated::Add(big, big), max);
+    EXPECT_EQ(saturated::Add(max, big), inf);
+    EXPECT_EQ(saturated::Add(big, max), inf);
+    EXPECT_EQ(saturated::Add(max, max), inf);
+    EXPECT_EQ(saturated::Add(max, inf), inf);
+    EXPECT_EQ(saturated::Add(inf, max), inf);
+    EXPECT_EQ(saturated::Add(inf, inf), inf);
+
+    EXPECT_EQ(saturated::Add(-big, -big), -max);
+    EXPECT_EQ(saturated::Add(-max, -big), -inf);
+    EXPECT_EQ(saturated::Add(-big, -max), -inf);
+    EXPECT_EQ(saturated::Add(-max, -max), -inf);
+    EXPECT_EQ(saturated::Add(-max, -inf), -inf);
+    EXPECT_EQ(saturated::Add(-inf, -max), -inf);
+    EXPECT_EQ(saturated::Add(-inf, -inf), -inf);
+
+    EXPECT_EQ(saturated::Add(big, -big), 0.0f);
+    EXPECT_EQ(saturated::Add(max, -big), big);
+    EXPECT_EQ(saturated::Add(big, -max), -big);
+    EXPECT_EQ(saturated::Add(max, -max), 0.0f);
+    EXPECT_EQ(saturated::Add(max, -inf), -inf);
+    EXPECT_EQ(saturated::Add(inf, -max), inf);
+    EXPECT_TRUE(std::isnan(saturated::Add(inf, -inf)));
+
+    EXPECT_EQ(saturated::Add(-big, big), 0.0f);
+    EXPECT_EQ(saturated::Add(-max, big), -big);
+    EXPECT_EQ(saturated::Add(-big, max), big);
+    EXPECT_EQ(saturated::Add(-max, max), 0.0f);
+    EXPECT_EQ(saturated::Add(-max, inf), inf);
+    EXPECT_EQ(saturated::Add(-inf, max), -inf);
+    EXPECT_TRUE(std::isnan(saturated::Add(-inf, inf)));
+  }
+}
+
+TEST(SaturatedMath, ExplicitSubOfSignedInts) {
+  {
+    EXPECT_EQ(saturated::Sub<int8_t>(0x79, -5), int8_t(0x7E));
+    EXPECT_EQ(saturated::Sub<int8_t>(0x7A, -5), int8_t(0x7F));
+    EXPECT_EQ(saturated::Sub<int8_t>(0x7B, -5), int8_t(0x7F));
+  }
+  {
+    EXPECT_EQ(saturated::Sub<int8_t>(0x86, 5), int8_t(0x81));
+    EXPECT_EQ(saturated::Sub<int8_t>(0x85, 5), int8_t(0x80));
+    EXPECT_EQ(saturated::Sub<int8_t>(0x84, 5), int8_t(0x80));
+  }
+  {
+    EXPECT_EQ(saturated::Sub<int16_t>(0x7FF9, -5), int16_t(0x7FFE));
+    EXPECT_EQ(saturated::Sub<int16_t>(0x7FFA, -5), int16_t(0x7FFF));
+    EXPECT_EQ(saturated::Sub<int16_t>(0x7FFB, -5), int16_t(0x7FFF));
+  }
+  {
+    EXPECT_EQ(saturated::Sub<int16_t>(0x8006, 5), int16_t(0x8001));
+    EXPECT_EQ(saturated::Sub<int16_t>(0x8005, 5), int16_t(0x8000));
+    EXPECT_EQ(saturated::Sub<int16_t>(0x8004, 5), int16_t(0x8000));
+  }
+  {
+    EXPECT_EQ(saturated::Sub<int32_t>(0x7FFFFFF9, -5), int32_t(0x7FFFFFFE));
+    EXPECT_EQ(saturated::Sub<int32_t>(0x7FFFFFFA, -5), int32_t(0x7FFFFFFF));
+    EXPECT_EQ(saturated::Sub<int32_t>(0x7FFFFFFB, -5), int32_t(0x7FFFFFFF));
+  }
+  {
+    EXPECT_EQ(saturated::Sub<int32_t>(0x80000006, 5), int32_t(0x80000001));
+    EXPECT_EQ(saturated::Sub<int32_t>(0x80000005, 5), int32_t(0x80000000));
+    EXPECT_EQ(saturated::Sub<int32_t>(0x80000004, 5), int32_t(0x80000000));
+  }
+  {
+    EXPECT_EQ(saturated::Sub<int64_t>(0x7FFFFFFFFFFFFFF9, -5),
+              int64_t(0x7FFFFFFFFFFFFFFE));
+    EXPECT_EQ(saturated::Sub<int64_t>(0x7FFFFFFFFFFFFFFA, -5),
+              int64_t(0x7FFFFFFFFFFFFFFF));
+    EXPECT_EQ(saturated::Sub<int64_t>(0x7FFFFFFFFFFFFFFB, -5),
+              int64_t(0x7FFFFFFFFFFFFFFF));
+  }
+  {
+    EXPECT_EQ(saturated::Sub<int64_t>(0x8000000000000006, 5),
+              int64_t(0x8000000000000001));
+    EXPECT_EQ(saturated::Sub<int64_t>(0x8000000000000005, 5),
+              int64_t(0x8000000000000000));
+    EXPECT_EQ(saturated::Sub<int64_t>(0x8000000000000004, 5),
+              int64_t(0x8000000000000000));
+  }
+}
+
+TEST(SaturatedMath, ImplicitSubOfSignedInts) {
+  {
+    int8_t a = 0x79;
+    int8_t b = -5;
+    EXPECT_EQ(saturated::Sub(a, b), int8_t(0x7E));
+    a = 0x7A;
+    EXPECT_EQ(saturated::Sub(a, b), int8_t(0x7F));
+    a = 0x7B;
+    EXPECT_EQ(saturated::Sub(a, b), int8_t(0x7F));
+  }
+  {
+    int8_t a = 0x86;
+    int8_t b = 5;
+    EXPECT_EQ(saturated::Sub(a, b), int8_t(0x81));
+    a = 0x85;
+    EXPECT_EQ(saturated::Sub(a, b), int8_t(0x80));
+    a = 0x84;
+    EXPECT_EQ(saturated::Sub(a, b), int8_t(0x80));
+  }
+  {
+    int16_t a = 0x7FF9;
+    int16_t b = -5;
+    EXPECT_EQ(saturated::Sub(a, b), int16_t(0x7FFE));
+    a = 0x7FFA;
+    EXPECT_EQ(saturated::Sub(a, b), int16_t(0x7FFF));
+    a = 0x7FFB;
+    EXPECT_EQ(saturated::Sub(a, b), int16_t(0x7FFF));
+  }
+  {
+    int16_t a = 0x8006;
+    int16_t b = 5;
+    EXPECT_EQ(saturated::Sub(a, b), int16_t(0x8001));
+    a = 0x8005;
+    EXPECT_EQ(saturated::Sub(a, b), int16_t(0x8000));
+    a = 0x8004;
+    EXPECT_EQ(saturated::Sub(a, b), int16_t(0x8000));
+  }
+  {
+    int32_t a = 0x7FFFFFF9;
+    int32_t b = -5;
+    EXPECT_EQ(saturated::Sub(a, b), int32_t(0x7FFFFFFE));
+    a = 0x7FFFFFFA;
+    EXPECT_EQ(saturated::Sub(a, b), int32_t(0x7FFFFFFF));
+    a = 0x7FFFFFFB;
+    EXPECT_EQ(saturated::Sub(a, b), int32_t(0x7FFFFFFF));
+  }
+  {
+    int32_t a = 0x80000006;
+    int32_t b = 5;
+    EXPECT_EQ(saturated::Sub(a, b), int32_t(0x80000001));
+    a = 0x80000005;
+    EXPECT_EQ(saturated::Sub(a, b), int32_t(0x80000000));
+    a = 0x80000004;
+    EXPECT_EQ(saturated::Sub(a, b), int32_t(0x80000000));
+  }
+  {
+    int64_t a = 0x7FFFFFFFFFFFFFF9;
+    int64_t b = -5;
+    EXPECT_EQ(saturated::Sub(a, b), int64_t(0x7FFFFFFFFFFFFFFE));
+    a = 0x7FFFFFFFFFFFFFFA;
+    EXPECT_EQ(saturated::Sub(a, b), int64_t(0x7FFFFFFFFFFFFFFF));
+    a = 0x7FFFFFFFFFFFFFFB;
+    EXPECT_EQ(saturated::Sub(a, b), int64_t(0x7FFFFFFFFFFFFFFF));
+  }
+  {
+    int64_t a = 0x8000000000000006;
+    int64_t b = 5;
+    EXPECT_EQ(saturated::Sub(a, b), int64_t(0x8000000000000001));
+    a = 0x8000000000000005;
+    EXPECT_EQ(saturated::Sub(a, b), int64_t(0x8000000000000000));
+    a = 0x8000000000000004;
+    EXPECT_EQ(saturated::Sub(a, b), int64_t(0x8000000000000000));
+  }
+}
+
+TEST(SaturatedMath, ExplicitSubOfFloatingPoint) {
+  {
+    const float inf = std::numeric_limits<float>::infinity();
+    const float max = std::numeric_limits<float>::max();
+    const float big = max * 0.5f;
+
+    EXPECT_EQ(saturated::Sub<float>(big, big), 0.0f);
+    EXPECT_EQ(saturated::Sub<float>(max, big), big);
+    EXPECT_EQ(saturated::Sub<float>(big, max), -big);
+    EXPECT_EQ(saturated::Sub<float>(max, max), 0.0f);
+    EXPECT_EQ(saturated::Sub<float>(max, inf), -inf);
+    EXPECT_EQ(saturated::Sub<float>(inf, max), inf);
+    EXPECT_TRUE(std::isnan(saturated::Sub<float>(inf, inf)));
+
+    EXPECT_EQ(saturated::Sub<float>(-big, -big), 0.0f);
+    EXPECT_EQ(saturated::Sub<float>(-max, -big), -big);
+    EXPECT_EQ(saturated::Sub<float>(-big, -max), big);
+    EXPECT_EQ(saturated::Sub<float>(-max, -max), 0.0f);
+    EXPECT_EQ(saturated::Sub<float>(-max, -inf), inf);
+    EXPECT_EQ(saturated::Sub<float>(-inf, -max), -inf);
+    EXPECT_TRUE(std::isnan(saturated::Sub<float>(-inf, -inf)));
+
+    EXPECT_EQ(saturated::Sub<float>(big, -big), max);
+    EXPECT_EQ(saturated::Sub<float>(max, -big), inf);
+    EXPECT_EQ(saturated::Sub<float>(big, -max), inf);
+    EXPECT_EQ(saturated::Sub<float>(max, -max), inf);
+    EXPECT_EQ(saturated::Sub<float>(max, -inf), inf);
+    EXPECT_EQ(saturated::Sub<float>(inf, -max), inf);
+    EXPECT_EQ(saturated::Sub<float>(inf, -inf), inf);
+
+    EXPECT_EQ(saturated::Sub<float>(-big, big), -max);
+    EXPECT_EQ(saturated::Sub<float>(-max, big), -inf);
+    EXPECT_EQ(saturated::Sub<float>(-big, max), -inf);
+    EXPECT_EQ(saturated::Sub<float>(-max, max), -inf);
+    EXPECT_EQ(saturated::Sub<float>(-max, inf), -inf);
+    EXPECT_EQ(saturated::Sub<float>(-inf, max), -inf);
+    EXPECT_EQ(saturated::Sub<float>(-inf, inf), -inf);
+  }
+  {
+    const double inf = std::numeric_limits<double>::infinity();
+    const double max = std::numeric_limits<double>::max();
+    const double big = max * 0.5f;
+
+    EXPECT_EQ(saturated::Sub<double>(big, big), 0.0f);
+    EXPECT_EQ(saturated::Sub<double>(max, big), big);
+    EXPECT_EQ(saturated::Sub<double>(big, max), -big);
+    EXPECT_EQ(saturated::Sub<double>(max, max), 0.0f);
+    EXPECT_EQ(saturated::Sub<double>(max, inf), -inf);
+    EXPECT_EQ(saturated::Sub<double>(inf, max), inf);
+    EXPECT_TRUE(std::isnan(saturated::Sub<double>(inf, inf)));
+
+    EXPECT_EQ(saturated::Sub<double>(-big, -big), 0.0f);
+    EXPECT_EQ(saturated::Sub<double>(-max, -big), -big);
+    EXPECT_EQ(saturated::Sub<double>(-big, -max), big);
+    EXPECT_EQ(saturated::Sub<double>(-max, -max), 0.0f);
+    EXPECT_EQ(saturated::Sub<double>(-max, -inf), inf);
+    EXPECT_EQ(saturated::Sub<double>(-inf, -max), -inf);
+    EXPECT_TRUE(std::isnan(saturated::Sub<double>(-inf, -inf)));
+
+    EXPECT_EQ(saturated::Sub<double>(big, -big), max);
+    EXPECT_EQ(saturated::Sub<double>(max, -big), inf);
+    EXPECT_EQ(saturated::Sub<double>(big, -max), inf);
+    EXPECT_EQ(saturated::Sub<double>(max, -max), inf);
+    EXPECT_EQ(saturated::Sub<double>(max, -inf), inf);
+    EXPECT_EQ(saturated::Sub<double>(inf, -max), inf);
+    EXPECT_EQ(saturated::Sub<double>(inf, -inf), inf);
+
+    EXPECT_EQ(saturated::Sub<double>(-big, big), -max);
+    EXPECT_EQ(saturated::Sub<double>(-max, big), -inf);
+    EXPECT_EQ(saturated::Sub<double>(-big, max), -inf);
+    EXPECT_EQ(saturated::Sub<double>(-max, max), -inf);
+    EXPECT_EQ(saturated::Sub<double>(-max, inf), -inf);
+    EXPECT_EQ(saturated::Sub<double>(-inf, max), -inf);
+    EXPECT_EQ(saturated::Sub<double>(-inf, inf), -inf);
+  }
+  {
+    const Scalar inf = std::numeric_limits<Scalar>::infinity();
+    const Scalar max = std::numeric_limits<Scalar>::max();
+    const Scalar big = max * 0.5f;
+
+    EXPECT_EQ(saturated::Sub<Scalar>(big, big), 0.0f);
+    EXPECT_EQ(saturated::Sub<Scalar>(max, big), big);
+    EXPECT_EQ(saturated::Sub<Scalar>(big, max), -big);
+    EXPECT_EQ(saturated::Sub<Scalar>(max, max), 0.0f);
+    EXPECT_EQ(saturated::Sub<Scalar>(max, inf), -inf);
+    EXPECT_EQ(saturated::Sub<Scalar>(inf, max), inf);
+    EXPECT_TRUE(std::isnan(saturated::Sub<Scalar>(inf, inf)));
+
+    EXPECT_EQ(saturated::Sub<Scalar>(-big, -big), 0.0f);
+    EXPECT_EQ(saturated::Sub<Scalar>(-max, -big), -big);
+    EXPECT_EQ(saturated::Sub<Scalar>(-big, -max), big);
+    EXPECT_EQ(saturated::Sub<Scalar>(-max, -max), 0.0f);
+    EXPECT_EQ(saturated::Sub<Scalar>(-max, -inf), inf);
+    EXPECT_EQ(saturated::Sub<Scalar>(-inf, -max), -inf);
+    EXPECT_TRUE(std::isnan(saturated::Sub<Scalar>(-inf, -inf)));
+
+    EXPECT_EQ(saturated::Sub<Scalar>(big, -big), max);
+    EXPECT_EQ(saturated::Sub<Scalar>(max, -big), inf);
+    EXPECT_EQ(saturated::Sub<Scalar>(big, -max), inf);
+    EXPECT_EQ(saturated::Sub<Scalar>(max, -max), inf);
+    EXPECT_EQ(saturated::Sub<Scalar>(max, -inf), inf);
+    EXPECT_EQ(saturated::Sub<Scalar>(inf, -max), inf);
+    EXPECT_EQ(saturated::Sub<Scalar>(inf, -inf), inf);
+
+    EXPECT_EQ(saturated::Sub<Scalar>(-big, big), -max);
+    EXPECT_EQ(saturated::Sub<Scalar>(-max, big), -inf);
+    EXPECT_EQ(saturated::Sub<Scalar>(-big, max), -inf);
+    EXPECT_EQ(saturated::Sub<Scalar>(-max, max), -inf);
+    EXPECT_EQ(saturated::Sub<Scalar>(-max, inf), -inf);
+    EXPECT_EQ(saturated::Sub<Scalar>(-inf, max), -inf);
+    EXPECT_EQ(saturated::Sub<Scalar>(-inf, inf), -inf);
+  }
+}
+
+TEST(SaturatedMath, ImplicitSubOfFloatingPoint) {
+  {
+    const float inf = std::numeric_limits<float>::infinity();
+    const float max = std::numeric_limits<float>::max();
+    const float big = max * 0.5f;
+
+    EXPECT_EQ(saturated::Sub(big, big), 0.0f);
+    EXPECT_EQ(saturated::Sub(max, big), big);
+    EXPECT_EQ(saturated::Sub(big, max), -big);
+    EXPECT_EQ(saturated::Sub(max, max), 0.0f);
+    EXPECT_EQ(saturated::Sub(max, inf), -inf);
+    EXPECT_EQ(saturated::Sub(inf, max), inf);
+    EXPECT_TRUE(std::isnan(saturated::Sub(inf, inf)));
+
+    EXPECT_EQ(saturated::Sub(-big, -big), 0.0f);
+    EXPECT_EQ(saturated::Sub(-max, -big), -big);
+    EXPECT_EQ(saturated::Sub(-big, -max), big);
+    EXPECT_EQ(saturated::Sub(-max, -max), 0.0f);
+    EXPECT_EQ(saturated::Sub(-max, -inf), inf);
+    EXPECT_EQ(saturated::Sub(-inf, -max), -inf);
+    EXPECT_TRUE(std::isnan(saturated::Sub(-inf, -inf)));
+
+    EXPECT_EQ(saturated::Sub(big, -big), max);
+    EXPECT_EQ(saturated::Sub(max, -big), inf);
+    EXPECT_EQ(saturated::Sub(big, -max), inf);
+    EXPECT_EQ(saturated::Sub(max, -max), inf);
+    EXPECT_EQ(saturated::Sub(max, -inf), inf);
+    EXPECT_EQ(saturated::Sub(inf, -max), inf);
+    EXPECT_EQ(saturated::Sub(inf, -inf), inf);
+
+    EXPECT_EQ(saturated::Sub(-big, big), -max);
+    EXPECT_EQ(saturated::Sub(-max, big), -inf);
+    EXPECT_EQ(saturated::Sub(-big, max), -inf);
+    EXPECT_EQ(saturated::Sub(-max, max), -inf);
+    EXPECT_EQ(saturated::Sub(-max, inf), -inf);
+    EXPECT_EQ(saturated::Sub(-inf, max), -inf);
+    EXPECT_EQ(saturated::Sub(-inf, inf), -inf);
+  }
+  {
+    const double inf = std::numeric_limits<double>::infinity();
+    const double max = std::numeric_limits<double>::max();
+    const double big = max * 0.5f;
+
+    EXPECT_EQ(saturated::Sub(big, big), 0.0f);
+    EXPECT_EQ(saturated::Sub(max, big), big);
+    EXPECT_EQ(saturated::Sub(big, max), -big);
+    EXPECT_EQ(saturated::Sub(max, max), 0.0f);
+    EXPECT_EQ(saturated::Sub(max, inf), -inf);
+    EXPECT_EQ(saturated::Sub(inf, max), inf);
+    EXPECT_TRUE(std::isnan(saturated::Sub(inf, inf)));
+
+    EXPECT_EQ(saturated::Sub(-big, -big), 0.0f);
+    EXPECT_EQ(saturated::Sub(-max, -big), -big);
+    EXPECT_EQ(saturated::Sub(-big, -max), big);
+    EXPECT_EQ(saturated::Sub(-max, -max), 0.0f);
+    EXPECT_EQ(saturated::Sub(-max, -inf), inf);
+    EXPECT_EQ(saturated::Sub(-inf, -max), -inf);
+    EXPECT_TRUE(std::isnan(saturated::Sub(-inf, -inf)));
+
+    EXPECT_EQ(saturated::Sub(big, -big), max);
+    EXPECT_EQ(saturated::Sub(max, -big), inf);
+    EXPECT_EQ(saturated::Sub(big, -max), inf);
+    EXPECT_EQ(saturated::Sub(max, -max), inf);
+    EXPECT_EQ(saturated::Sub(max, -inf), inf);
+    EXPECT_EQ(saturated::Sub(inf, -max), inf);
+    EXPECT_EQ(saturated::Sub(inf, -inf), inf);
+
+    EXPECT_EQ(saturated::Sub(-big, big), -max);
+    EXPECT_EQ(saturated::Sub(-max, big), -inf);
+    EXPECT_EQ(saturated::Sub(-big, max), -inf);
+    EXPECT_EQ(saturated::Sub(-max, max), -inf);
+    EXPECT_EQ(saturated::Sub(-max, inf), -inf);
+    EXPECT_EQ(saturated::Sub(-inf, max), -inf);
+    EXPECT_EQ(saturated::Sub(-inf, inf), -inf);
+  }
+  {
+    const Scalar inf = std::numeric_limits<Scalar>::infinity();
+    const Scalar max = std::numeric_limits<Scalar>::max();
+    const Scalar big = max * 0.5f;
+
+    EXPECT_EQ(saturated::Sub(big, big), 0.0f);
+    EXPECT_EQ(saturated::Sub(max, big), big);
+    EXPECT_EQ(saturated::Sub(big, max), -big);
+    EXPECT_EQ(saturated::Sub(max, max), 0.0f);
+    EXPECT_EQ(saturated::Sub(max, inf), -inf);
+    EXPECT_EQ(saturated::Sub(inf, max), inf);
+    EXPECT_TRUE(std::isnan(saturated::Sub(inf, inf)));
+
+    EXPECT_EQ(saturated::Sub(-big, -big), 0.0f);
+    EXPECT_EQ(saturated::Sub(-max, -big), -big);
+    EXPECT_EQ(saturated::Sub(-big, -max), big);
+    EXPECT_EQ(saturated::Sub(-max, -max), 0.0f);
+    EXPECT_EQ(saturated::Sub(-max, -inf), inf);
+    EXPECT_EQ(saturated::Sub(-inf, -max), -inf);
+    EXPECT_TRUE(std::isnan(saturated::Sub(-inf, -inf)));
+
+    EXPECT_EQ(saturated::Sub(big, -big), max);
+    EXPECT_EQ(saturated::Sub(max, -big), inf);
+    EXPECT_EQ(saturated::Sub(big, -max), inf);
+    EXPECT_EQ(saturated::Sub(max, -max), inf);
+    EXPECT_EQ(saturated::Sub(max, -inf), inf);
+    EXPECT_EQ(saturated::Sub(inf, -max), inf);
+    EXPECT_EQ(saturated::Sub(inf, -inf), inf);
+
+    EXPECT_EQ(saturated::Sub(-big, big), -max);
+    EXPECT_EQ(saturated::Sub(-max, big), -inf);
+    EXPECT_EQ(saturated::Sub(-big, max), -inf);
+    EXPECT_EQ(saturated::Sub(-max, max), -inf);
+    EXPECT_EQ(saturated::Sub(-max, inf), -inf);
+    EXPECT_EQ(saturated::Sub(-inf, max), -inf);
+    EXPECT_EQ(saturated::Sub(-inf, inf), -inf);
+  }
+}
+
+TEST(SaturatedMath, ExplicitAverageScalarOfSignedInts) {
+  // For each type try:
+  //
+  // - near the limits, averaging to 0
+  // - at the limits, averaging to 0 or 0.5 depending on precision
+  // - both large enough for the sum to overflow
+  // - both negative enough for the sum to underflow
+  {
+    EXPECT_EQ(saturated::AverageScalar<int8_t>(0x81, 0x7F), -0.0f);
+    EXPECT_EQ(saturated::AverageScalar<int8_t>(0x80, 0x7F), -0.5f);
+    EXPECT_EQ(saturated::AverageScalar<int8_t>(0x70, 0x75), 114.5f);
+    EXPECT_EQ(saturated::AverageScalar<int8_t>(0x85, 0x8A), -120.5f);
+  }
+  {
+    EXPECT_EQ(saturated::AverageScalar<int16_t>(0x8001, 0x7FFF), -0.0f);
+    EXPECT_EQ(saturated::AverageScalar<int16_t>(0x8000, 0x7FFF), -0.5f);
+    EXPECT_EQ(saturated::AverageScalar<int16_t>(0x7000, 0x7005), 28674.5f);
+    EXPECT_EQ(saturated::AverageScalar<int16_t>(0x8005, 0x800A), -32760.5f);
+  }
+  {
+    EXPECT_EQ(saturated::AverageScalar<int32_t>(0x80000001, 0x7FFFFFFF), -0.0f);
+    EXPECT_EQ(saturated::AverageScalar<int32_t>(0x80000000, 0x7FFFFFFF), -0.5f);
+    EXPECT_EQ(saturated::AverageScalar<int32_t>(0x70000000, 0x70000005),
+              1879048195.5f);
+    EXPECT_EQ(saturated::AverageScalar<int32_t>(0x80000005, 0x8000000A),
+              -2147483655.5f);
+  }
+  {
+    EXPECT_EQ(saturated::AverageScalar<int64_t>(0x8000000000000001,
+                                                0x7FFFFFFFFFFFFFFF),
+              0.0f);
+    // 64-bit integers overflow the ability of a Scalar (float) to
+    // represent discrete integers and so the two numbers we are
+    // averaging here will look like the same number with different
+    // signs and the answer will be "0"
+    EXPECT_EQ(saturated::AverageScalar<int64_t>(0x8000000000000000,
+                                                0x7FFFFFFFFFFFFFFF),
+              0.0f);
+    EXPECT_NEAR(saturated::AverageScalar<int64_t>(0x7000000000000000,
+                                                  0x7000000000000005),
+                8.07045053e+18, 1e18);
+    EXPECT_NEAR(saturated::AverageScalar<int64_t>(0x8000000000000005,
+                                                  0x800000000000000A),
+                -9.223372e+18, 1e18);
+  }
+}
+
+TEST(SaturatedMath, ImplicitAverageScalarOfSignedInts) {
+  // For each type try:
+  //
+  // - near the limits, averaging to 0
+  // - at the limits, averaging to 0 or 0.5 depending on precision
+  // - both large enough for the sum to overflow
+  // - both negative enough for the sum to underflow
+  {
+    int8_t a = 0x81;
+    int8_t b = 0x7f;
+    EXPECT_EQ(saturated::AverageScalar(a, b), -0.0f);
+    a = 0x80;
+    EXPECT_EQ(saturated::AverageScalar(a, b), -0.5f);
+    a = 0x70;
+    b = 0x75;
+    EXPECT_EQ(saturated::AverageScalar(a, b), 114.5f);
+    a = 0x85;
+    b = 0x8A;
+    EXPECT_EQ(saturated::AverageScalar(a, b), -120.5f);
+  }
+  {
+    int16_t a = 0x8001;
+    int16_t b = 0x7FFF;
+    EXPECT_EQ(saturated::AverageScalar(a, b), -0.0f);
+    a = 0x8000;
+    EXPECT_EQ(saturated::AverageScalar(a, b), -0.5f);
+    a = 0x7000;
+    b = 0x7005;
+    EXPECT_EQ(saturated::AverageScalar(a, b), 28674.5f);
+    a = 0x8005;
+    b = 0x800A;
+    EXPECT_EQ(saturated::AverageScalar(a, b), -32760.5f);
+  }
+  {
+    int32_t a = 0x80000001;
+    int32_t b = 0x7FFFFFFF;
+    EXPECT_EQ(saturated::AverageScalar(a, b), -0.0f);
+    a = 0x80000000;
+    EXPECT_EQ(saturated::AverageScalar(a, b), -0.5f);
+    a = 0x70000000;
+    b = 0x70000005;
+    EXPECT_EQ(saturated::AverageScalar(a, b), 1879048195.5f);
+    a = 0x80000005;
+    b = 0x8000000A;
+    EXPECT_EQ(saturated::AverageScalar(a, b), -2147483655.5f);
+  }
+  {
+    int64_t a = 0x8000000000000001;
+    int64_t b = 0x7FFFFFFFFFFFFFFF;
+    EXPECT_EQ(saturated::AverageScalar(a, b), 0.0f);
+    // 64-bit integers overflow the ability of a Scalar (float) to
+    // represent discrete integers and so the two numbers we are
+    // averaging here will look like the same number with different
+    // signs and the answer will be "0"
+    a = 0x8000000000000000;
+    EXPECT_EQ(saturated::AverageScalar<int64_t>(a, b), 0.0f);
+    a = 0x7000000000000000;
+    b = 0x7000000000000005;
+    EXPECT_NEAR(saturated::AverageScalar<int64_t>(a, b), 8.0704505e+18, 1e18);
+    a = 0x8000000000000005;
+    b = 0x800000000000000A;
+    EXPECT_NEAR(saturated::AverageScalar<int64_t>(a, b), -9.223372e+18, 1e18);
+  }
+}
+
+TEST(SaturatedMath, ExplicitAverageScalarOfFloatingPoint) {
+  const Scalar s_inf = std::numeric_limits<Scalar>::infinity();
+  const Scalar s_max = std::numeric_limits<Scalar>::max();
+  const Scalar s_big = s_max * 0.5f;
+
+  {
+    const float inf = std::numeric_limits<Scalar>::infinity();
+    const float max = std::numeric_limits<float>::max();
+    const float big = max * 0.5f;
+
+    EXPECT_EQ(saturated::AverageScalar<float>(big, big), s_big);
+    EXPECT_EQ(saturated::AverageScalar<float>(max, max), s_max);
+    EXPECT_EQ(saturated::AverageScalar<float>(big, -big), 0.0f);
+    EXPECT_EQ(saturated::AverageScalar<float>(max, -max), 0.0f);
+    EXPECT_EQ(saturated::AverageScalar<float>(-big, big), 0.0f);
+    EXPECT_EQ(saturated::AverageScalar<float>(-max, max), 0.0f);
+    EXPECT_EQ(saturated::AverageScalar<float>(-big, -big), -s_big);
+    EXPECT_EQ(saturated::AverageScalar<float>(-max, -max), -s_max);
+
+    EXPECT_EQ(saturated::AverageScalar<float>(inf, inf), s_inf);
+    EXPECT_EQ(saturated::AverageScalar<float>(-inf, -inf), -s_inf);
+    EXPECT_TRUE(std::isnan(saturated::AverageScalar<float>(-inf, inf)));
+    EXPECT_TRUE(std::isnan(saturated::AverageScalar<float>(inf, -inf)));
+  }
+  {
+    const double inf = std::numeric_limits<Scalar>::infinity();
+    const double max = std::numeric_limits<double>::max();
+    const double big = max * 0.5;
+
+    // Most of the averages below using the double constants will
+    // overflow the Scalar return value and result in infinity,
+    // so we also test with some Scalar constants (promoted to double)
+    // to verify that they don't overflow in the double template
+    EXPECT_EQ(saturated::AverageScalar<double>(s_big, s_big), s_big);
+    EXPECT_EQ(saturated::AverageScalar<double>(s_max, s_max), s_max);
+    EXPECT_EQ(saturated::AverageScalar<double>(-s_big, -s_big), -s_big);
+    EXPECT_EQ(saturated::AverageScalar<double>(-s_max, -s_max), -s_max);
+
+    // And now testing continues with the double constants which
+    // mostly overflow
+    EXPECT_EQ(saturated::AverageScalar<double>(big, big), s_inf);
+    EXPECT_EQ(saturated::AverageScalar<double>(max, max), s_inf);
+    EXPECT_EQ(saturated::AverageScalar<double>(big, -big), 0.0f);
+    EXPECT_EQ(saturated::AverageScalar<double>(max, -max), 0.0f);
+    EXPECT_EQ(saturated::AverageScalar<double>(-big, big), 0.0f);
+    EXPECT_EQ(saturated::AverageScalar<double>(-max, max), 0.0f);
+    EXPECT_EQ(saturated::AverageScalar<double>(-big, -big), -s_inf);
+    EXPECT_EQ(saturated::AverageScalar<double>(-max, -max), -s_inf);
+
+    EXPECT_EQ(saturated::AverageScalar<double>(inf, inf), s_inf);
+    EXPECT_EQ(saturated::AverageScalar<double>(-inf, -inf), -s_inf);
+    EXPECT_TRUE(std::isnan(saturated::AverageScalar<double>(-inf, inf)));
+    EXPECT_TRUE(std::isnan(saturated::AverageScalar<double>(inf, -inf)));
+  }
+  {
+    const Scalar inf = std::numeric_limits<Scalar>::infinity();
+    const Scalar max = std::numeric_limits<Scalar>::max();
+    const Scalar big = max * 0.5f;
+
+    EXPECT_EQ(saturated::AverageScalar<Scalar>(big, big), s_big);
+    EXPECT_EQ(saturated::AverageScalar<Scalar>(max, max), s_max);
+    EXPECT_EQ(saturated::AverageScalar<Scalar>(big, -big), 0.0f);
+    EXPECT_EQ(saturated::AverageScalar<Scalar>(max, -max), 0.0f);
+    EXPECT_EQ(saturated::AverageScalar<Scalar>(-big, big), 0.0f);
+    EXPECT_EQ(saturated::AverageScalar<Scalar>(-max, max), 0.0f);
+    EXPECT_EQ(saturated::AverageScalar<Scalar>(-big, -big), -s_big);
+    EXPECT_EQ(saturated::AverageScalar<Scalar>(-max, -max), -s_max);
+
+    EXPECT_EQ(saturated::AverageScalar<Scalar>(inf, inf), s_inf);
+    EXPECT_EQ(saturated::AverageScalar<Scalar>(-inf, -inf), -s_inf);
+    EXPECT_TRUE(std::isnan(saturated::AverageScalar<Scalar>(-inf, s_inf)));
+    EXPECT_TRUE(std::isnan(saturated::AverageScalar<Scalar>(inf, -s_inf)));
+  }
+}
+
+TEST(SaturatedMath, ImplicitAverageScalarOfFloatingPoint) {
+  // All return values are Scalar regardless of the operand types
+  // so these constants are used as the expected answers.
+  const Scalar s_inf = std::numeric_limits<Scalar>::infinity();
+  const Scalar s_max = std::numeric_limits<Scalar>::max();
+  const Scalar s_big = s_max * 0.5f;
+
+  {
+    const float inf = std::numeric_limits<float>::infinity();
+    const float max = std::numeric_limits<float>::max();
+    const float big = max * 0.5f;
+
+    EXPECT_EQ(saturated::AverageScalar(big, big), s_big);
+    EXPECT_EQ(saturated::AverageScalar(max, max), s_max);
+    EXPECT_EQ(saturated::AverageScalar(big, -big), 0.0f);
+    EXPECT_EQ(saturated::AverageScalar(max, -max), 0.0f);
+    EXPECT_EQ(saturated::AverageScalar(-big, big), 0.0f);
+    EXPECT_EQ(saturated::AverageScalar(-max, max), 0.0f);
+    EXPECT_EQ(saturated::AverageScalar(-big, -big), -s_big);
+    EXPECT_EQ(saturated::AverageScalar(-max, -max), -s_max);
+
+    EXPECT_EQ(saturated::AverageScalar(inf, inf), s_inf);
+    EXPECT_EQ(saturated::AverageScalar(-inf, -inf), -s_inf);
+    EXPECT_TRUE(std::isnan(saturated::AverageScalar(-inf, inf)));
+    EXPECT_TRUE(std::isnan(saturated::AverageScalar(inf, -inf)));
+  }
+  {
+    const double inf = std::numeric_limits<double>::infinity();
+    const double max = std::numeric_limits<double>::max();
+    const double big = max * 0.5;
+
+    // The s_constants converted to double. We should get finite results
+    // from finding the averages of these values, but we'll get a lot of
+    // overflow to infinity when testing the large double constants.
+    const double d_s_max = s_max;
+    const double d_s_big = s_big;
+    EXPECT_EQ(saturated::AverageScalar(d_s_big, d_s_big), s_big);
+    EXPECT_EQ(saturated::AverageScalar(d_s_max, d_s_max), s_max);
+    EXPECT_EQ(saturated::AverageScalar(-d_s_big, -d_s_big), -s_big);
+    EXPECT_EQ(saturated::AverageScalar(-d_s_max, -d_s_max), -s_max);
+
+    // And now testing continues with the double constants which
+    // mostly overflow
+    EXPECT_EQ(saturated::AverageScalar(big, big), s_inf);
+    EXPECT_EQ(saturated::AverageScalar(max, max), s_inf);
+    EXPECT_EQ(saturated::AverageScalar(big, -big), 0.0f);
+    EXPECT_EQ(saturated::AverageScalar(max, -max), 0.0f);
+    EXPECT_EQ(saturated::AverageScalar(-big, big), 0.0f);
+    EXPECT_EQ(saturated::AverageScalar(-max, max), 0.0f);
+    EXPECT_EQ(saturated::AverageScalar(-big, -big), -s_inf);
+    EXPECT_EQ(saturated::AverageScalar(-max, -max), -s_inf);
+
+    EXPECT_EQ(saturated::AverageScalar(inf, inf), s_inf);
+    EXPECT_EQ(saturated::AverageScalar(-inf, -inf), -s_inf);
+    EXPECT_TRUE(std::isnan(saturated::AverageScalar(-inf, inf)));
+    EXPECT_TRUE(std::isnan(saturated::AverageScalar(inf, -inf)));
+  }
+  {
+    const Scalar inf = std::numeric_limits<Scalar>::infinity();
+    const Scalar max = std::numeric_limits<Scalar>::max();
+    const Scalar big = max * 0.5f;
+
+    EXPECT_EQ(saturated::AverageScalar(big, big), s_big);
+    EXPECT_EQ(saturated::AverageScalar(max, max), s_max);
+    EXPECT_EQ(saturated::AverageScalar(big, -big), 0.0f);
+    EXPECT_EQ(saturated::AverageScalar(max, -max), 0.0f);
+    EXPECT_EQ(saturated::AverageScalar(-big, big), 0.0f);
+    EXPECT_EQ(saturated::AverageScalar(-max, max), 0.0f);
+    EXPECT_EQ(saturated::AverageScalar(-big, -big), -s_big);
+    EXPECT_EQ(saturated::AverageScalar(-max, -max), -s_max);
+
+    EXPECT_EQ(saturated::AverageScalar(inf, inf), s_inf);
+    EXPECT_EQ(saturated::AverageScalar(-inf, -inf), -s_inf);
+    EXPECT_TRUE(std::isnan(saturated::AverageScalar(-inf, s_inf)));
+    EXPECT_TRUE(std::isnan(saturated::AverageScalar(inf, -s_inf)));
+  }
+}
+
+TEST(SaturatedMath, CastingFiniteDoubleToFloatStaysFinite) {
+  const double d_max = std::numeric_limits<double>::max();
+  const float f_max = std::numeric_limits<float>::max();
+
+  {
+    const float result = saturated::Cast<double, float>(d_max);
+    EXPECT_EQ(result, f_max);
+  }
+
+  {
+    const float result = saturated::Cast<double, float>(-d_max);
+    EXPECT_EQ(result, -f_max);
+  }
+}
+
+TEST(SaturatedMath, CastingInfiniteDoubleToFloatStaysInfinite) {
+  const double d_inf = std::numeric_limits<double>::infinity();
+  const float f_max = std::numeric_limits<float>::infinity();
+
+  {
+    const float result = saturated::Cast<double, float>(d_inf);
+    EXPECT_EQ(result, f_max);
+  }
+
+  {
+    const float result = saturated::Cast<double, float>(-d_inf);
+    EXPECT_EQ(result, -f_max);
+  }
+}
+
+TEST(SaturatedMath, CastingNaNDoubleToFloatStaysNaN) {
+  const double d_nan = std::numeric_limits<double>::quiet_NaN();
+
+  {
+    const float result = saturated::Cast<double, float>(d_nan);
+    EXPECT_TRUE(std::isnan(result));
+  }
+
+  {
+    const float result = saturated::Cast<double, float>(-d_nan);
+    EXPECT_TRUE(std::isnan(result));
+  }
+}
+
+TEST(SaturatedMath, CastingLargeScalarToSignedIntProducesLimit) {
+  // larger than even any [u]int64_t;
+  const Scalar large = 1e20f;
+
+  {
+    const auto result = saturated::Cast<Scalar, int8_t>(large);
+    EXPECT_EQ(result, int8_t(0x7F));
+  }
+  {
+    const auto result = saturated::Cast<Scalar, int8_t>(-large);
+    EXPECT_EQ(result, int8_t(0x80));
+  }
+
+  {
+    const auto result = saturated::Cast<Scalar, int16_t>(large);
+    EXPECT_EQ(result, int16_t(0x7FFF));
+  }
+  {
+    const auto result = saturated::Cast<Scalar, int16_t>(-large);
+    EXPECT_EQ(result, int16_t(0x8000));
+  }
+
+  {
+    const auto result = saturated::Cast<Scalar, int32_t>(large);
+    EXPECT_EQ(result, int32_t(0x7FFFFFFF));
+  }
+  {
+    const auto result = saturated::Cast<Scalar, int32_t>(-large);
+    EXPECT_EQ(result, int32_t(0x80000000));
+  }
+
+  {
+    const auto result = saturated::Cast<Scalar, int64_t>(large);
+    EXPECT_EQ(result, int64_t(0x7FFFFFFFFFFFFFFF));
+  }
+  {
+    const auto result = saturated::Cast<Scalar, int64_t>(-large);
+    EXPECT_EQ(result, int64_t(0x8000000000000000));
+  }
+}
+
+TEST(SaturatedMath, CastingInfiniteScalarToSignedIntProducesLimit) {
+  // larger than even any [u]int64_t;
+  const Scalar inf = std::numeric_limits<Scalar>::infinity();
+
+  {
+    const auto result = saturated::Cast<Scalar, int8_t>(inf);
+    EXPECT_EQ(result, int8_t(0x7F));
+  }
+  {
+    const auto result = saturated::Cast<Scalar, int8_t>(-inf);
+    EXPECT_EQ(result, int8_t(0x80));
+  }
+
+  {
+    const auto result = saturated::Cast<Scalar, int16_t>(inf);
+    EXPECT_EQ(result, int16_t(0x7FFF));
+  }
+  {
+    const auto result = saturated::Cast<Scalar, int16_t>(-inf);
+    EXPECT_EQ(result, int16_t(0x8000));
+  }
+
+  {
+    const auto result = saturated::Cast<Scalar, int32_t>(inf);
+    EXPECT_EQ(result, int32_t(0x7FFFFFFF));
+  }
+  {
+    const auto result = saturated::Cast<Scalar, int32_t>(-inf);
+    EXPECT_EQ(result, int32_t(0x80000000));
+  }
+
+  {
+    const auto result = saturated::Cast<Scalar, int64_t>(inf);
+    EXPECT_EQ(result, int64_t(0x7FFFFFFFFFFFFFFF));
+  }
+  {
+    const auto result = saturated::Cast<Scalar, int64_t>(-inf);
+    EXPECT_EQ(result, int64_t(0x8000000000000000));
+  }
+}
+
+TEST(SaturatedMath, CastingNaNScalarToSignedIntProducesZero) {
+  // larger than even any [u]int64_t;
+  const Scalar nan = std::numeric_limits<Scalar>::quiet_NaN();
+
+  {
+    const auto result = saturated::Cast<Scalar, int8_t>(nan);
+    EXPECT_EQ(result, int8_t(0));
+  }
+
+  {
+    const auto result = saturated::Cast<Scalar, int16_t>(nan);
+    EXPECT_EQ(result, int16_t(0));
+  }
+
+  {
+    const auto result = saturated::Cast<Scalar, int32_t>(nan);
+    EXPECT_EQ(result, int32_t(0));
+  }
+
+  {
+    const auto result = saturated::Cast<Scalar, int64_t>(nan);
+    EXPECT_EQ(result, int64_t(0));
+  }
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/geometry/scalar.h b/impeller/geometry/scalar.h
index 8a080e18b52a92aa55c0b6650b990970e8aecd09..2600a49c42dc55eb1620d1bf38c30b8cd508d043 100644
--- a/impeller/geometry/scalar.h
+++ b/impeller/geometry/scalar.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_GEOMETRY_SCALAR_H_
+#define FLUTTER_IMPELLER_GEOMETRY_SCALAR_H_
 
 #include <cfloat>
 #include <type_traits>
@@ -12,6 +13,8 @@
 
 namespace impeller {
 
+// NOLINTBEGIN(google-explicit-constructor)
+
 using Scalar = float;
 
 template <class T, class = std::enable_if_t<std::is_arithmetic_v<T>>>
@@ -52,4 +55,8 @@ struct Degrees {
   };
 };
 
+// NOLINTEND(google-explicit-constructor)
+
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_GEOMETRY_SCALAR_H_
diff --git a/impeller/geometry/shear.h b/impeller/geometry/shear.h
index 155f7ea7fae43f7418b32d9b25134ac466d4d9b5..c94e26e5f0cb53991805970bc48c965cc253de67 100644
--- a/impeller/geometry/shear.h
+++ b/impeller/geometry/shear.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_GEOMETRY_SHEAR_H_
+#define FLUTTER_IMPELLER_GEOMETRY_SHEAR_H_
 
 #include <string>
 
@@ -30,3 +31,5 @@ struct Shear {
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_GEOMETRY_SHEAR_H_
diff --git a/impeller/geometry/sigma.h b/impeller/geometry/sigma.h
index c909128be4baa437f232070aa66f847246218617..9ea85498dbae453c4900b4975625c12cb13967fb 100644
--- a/impeller/geometry/sigma.h
+++ b/impeller/geometry/sigma.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_GEOMETRY_SIGMA_H_
+#define FLUTTER_IMPELLER_GEOMETRY_SIGMA_H_
 
 #include "impeller/geometry/scalar.h"
 
@@ -55,3 +56,5 @@ struct Radius {
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_GEOMETRY_SIGMA_H_
diff --git a/impeller/geometry/size.h b/impeller/geometry/size.h
index dc6abd4126d6e2dc340be8777a6b4c891e510642..9841b63d32642ea2a1516bbbf37c64ce3ebbc2d3 100644
--- a/impeller/geometry/size.h
+++ b/impeller/geometry/size.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_GEOMETRY_SIZE_H_
+#define FLUTTER_IMPELLER_GEOMETRY_SIZE_H_
 
 #include <algorithm>
 #include <cmath>
@@ -68,6 +69,8 @@ struct TSize {
     return {width - s.width, height - s.height};
   }
 
+  constexpr TSize operator-() const { return {-width, -height}; }
+
   constexpr TSize Min(const TSize& o) const {
     return {
         std::min(width, o.width),
@@ -82,15 +85,26 @@ struct TSize {
     };
   }
 
-  constexpr Type Area() const { return width * height; }
+  constexpr Type MaxDimension() const { return std::max(width, height); }
 
-  constexpr bool IsPositive() const { return width > 0 && height > 0; }
+  constexpr TSize Abs() const { return {std::fabs(width), std::fabs(height)}; }
+
+  constexpr TSize Floor() const {
+    return {std::floor(width), std::floor(height)};
+  }
+
+  constexpr TSize Ceil() const { return {std::ceil(width), std::ceil(height)}; }
+
+  constexpr TSize Round() const {
+    return {std::round(width), std::round(height)};
+  }
 
-  constexpr bool IsNegative() const { return width < 0 || height < 0; }
+  constexpr Type Area() const { return width * height; }
 
-  constexpr bool IsZero() const { return width == 0 || height == 0; }
+  /// Returns true if either of the width or height are 0, negative, or NaN.
+  constexpr bool IsEmpty() const { return !(width > 0 && height > 0); }
 
-  constexpr bool IsEmpty() const { return IsNegative() || IsZero(); }
+  constexpr bool IsSquare() const { return width == height; }
 
   template <class U>
   static constexpr TSize Ceil(const TSize<U>& other) {
@@ -100,7 +114,7 @@ struct TSize {
 
   constexpr size_t MipCount() const {
     constexpr size_t minimum_mip = 1u;
-    if (!IsPositive()) {
+    if (IsEmpty()) {
       return minimum_mip;
     }
     size_t result = std::max(ceil(log2(width)), ceil(log2(height)));
@@ -108,6 +122,18 @@ struct TSize {
   }
 };
 
+// RHS algebraic operations with arithmetic types.
+
+template <class T, class U, class = std::enable_if_t<std::is_arithmetic_v<U>>>
+constexpr TSize<T> operator*(U s, const TSize<T>& p) {
+  return p * s;
+}
+
+template <class T, class U, class = std::enable_if_t<std::is_arithmetic_v<U>>>
+constexpr TSize<T> operator/(U s, const TSize<T>& p) {
+  return {static_cast<T>(s) / p.width, static_cast<T>(s) / p.height};
+}
+
 using Size = TSize<Scalar>;
 using ISize = TSize<int64_t>;
 
@@ -125,3 +151,5 @@ inline std::ostream& operator<<(std::ostream& out,
 }
 
 }  // namespace std
+
+#endif  // FLUTTER_IMPELLER_GEOMETRY_SIZE_H_
diff --git a/impeller/geometry/size_unittests.cc b/impeller/geometry/size_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..9c1a65eebc00e82fd3438227798083102b8cfacf
--- /dev/null
+++ b/impeller/geometry/size_unittests.cc
@@ -0,0 +1,85 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "gtest/gtest.h"
+
+#include "flutter/impeller/geometry/size.h"
+
+namespace impeller {
+namespace testing {
+
+TEST(SizeTest, SizeIsEmpty) {
+  auto nan = std::numeric_limits<Scalar>::quiet_NaN();
+
+  // Non-empty
+  EXPECT_FALSE(Size(10.5, 7.2).IsEmpty());
+
+  // Empty both width and height both 0 or negative, in all combinations
+  EXPECT_TRUE(Size(0.0, 0.0).IsEmpty());
+  EXPECT_TRUE(Size(-1.0, -1.0).IsEmpty());
+  EXPECT_TRUE(Size(-1.0, 0.0).IsEmpty());
+  EXPECT_TRUE(Size(0.0, -1.0).IsEmpty());
+
+  // Empty for 0 or negative width or height (but not both at the same time)
+  EXPECT_TRUE(Size(10.5, 0.0).IsEmpty());
+  EXPECT_TRUE(Size(10.5, -1.0).IsEmpty());
+  EXPECT_TRUE(Size(0.0, 7.2).IsEmpty());
+  EXPECT_TRUE(Size(-1.0, 7.2).IsEmpty());
+
+  // Empty for NaN in width or height or both
+  EXPECT_TRUE(Size(10.5, nan).IsEmpty());
+  EXPECT_TRUE(Size(nan, 7.2).IsEmpty());
+  EXPECT_TRUE(Size(nan, nan).IsEmpty());
+}
+
+TEST(SizeTest, ISizeIsEmpty) {
+  // Non-empty
+  EXPECT_FALSE(ISize(10, 7).IsEmpty());
+
+  // Empty both width and height both 0 or negative, in all combinations
+  EXPECT_TRUE(ISize(0, 0).IsEmpty());
+  EXPECT_TRUE(ISize(-1, -1).IsEmpty());
+  EXPECT_TRUE(ISize(-1, 0).IsEmpty());
+  EXPECT_TRUE(ISize(0, -1).IsEmpty());
+
+  // Empty for 0 or negative width or height (but not both at the same time)
+  EXPECT_TRUE(ISize(10, 0).IsEmpty());
+  EXPECT_TRUE(ISize(10, -1).IsEmpty());
+  EXPECT_TRUE(ISize(0, 7).IsEmpty());
+  EXPECT_TRUE(ISize(-1, 7).IsEmpty());
+}
+
+TEST(SizeTest, IsSquare) {
+  EXPECT_TRUE(Size(20, 20).IsSquare());
+  EXPECT_FALSE(Size(20, 19).IsSquare());
+  EXPECT_FALSE(Size(19, 20).IsSquare());
+
+  EXPECT_TRUE(ISize(20, 20).IsSquare());
+  EXPECT_FALSE(ISize(20, 19).IsSquare());
+  EXPECT_FALSE(ISize(19, 20).IsSquare());
+}
+
+TEST(SizeTest, MaxDimension) {
+  EXPECT_EQ(Size(20, 20).MaxDimension(), 20);
+  EXPECT_EQ(Size(20, 19).MaxDimension(), 20);
+  EXPECT_EQ(Size(19, 20).MaxDimension(), 20);
+  EXPECT_EQ(Size(20, 21).MaxDimension(), 21);
+  EXPECT_EQ(Size(21, 20).MaxDimension(), 21);
+
+  EXPECT_EQ(ISize(20, 20).MaxDimension(), 20);
+  EXPECT_EQ(ISize(20, 19).MaxDimension(), 20);
+  EXPECT_EQ(ISize(19, 20).MaxDimension(), 20);
+  EXPECT_EQ(ISize(20, 21).MaxDimension(), 21);
+  EXPECT_EQ(ISize(21, 20).MaxDimension(), 21);
+}
+
+TEST(SizeTest, NegationOperator) {
+  EXPECT_EQ(-Size(10, 20), Size(-10, -20));
+  EXPECT_EQ(-Size(-10, 20), Size(10, -20));
+  EXPECT_EQ(-Size(10, -20), Size(-10, 20));
+  EXPECT_EQ(-Size(-10, -20), Size(10, 20));
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/renderer/sampler_descriptor.cc b/impeller/geometry/trig.cc
similarity index 81%
rename from impeller/renderer/sampler_descriptor.cc
rename to impeller/geometry/trig.cc
index 35251848bc742f0e8bfd4f2e3b1ead86f49317fd..c613a7b5c96201dbe29a2b841975709cc2947626 100644
--- a/impeller/renderer/sampler_descriptor.cc
+++ b/impeller/geometry/trig.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/renderer/sampler_descriptor.h"
+#include "trig.h"
 
 namespace impeller {
 
diff --git a/impeller/geometry/trig.h b/impeller/geometry/trig.h
new file mode 100644
index 0000000000000000000000000000000000000000..da43375744f7795e3eda92c00147ec9223b5e336
--- /dev/null
+++ b/impeller/geometry/trig.h
@@ -0,0 +1,42 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_GEOMETRY_TRIG_H_
+#define FLUTTER_IMPELLER_GEOMETRY_TRIG_H_
+
+#include <functional>
+#include <vector>
+
+#include "flutter/impeller/geometry/point.h"
+
+namespace impeller {
+
+/// @brief  A structure to store the sine and cosine of an angle.
+struct Trig {
+  /// Construct a Trig object from a given angle in radians.
+  explicit Trig(Radians r)
+      : cos(std::cos(r.radians)), sin(std::sin(r.radians)) {}
+
+  /// Construct a Trig object from the given cosine and sine values.
+  Trig(double cos, double sin) : cos(cos), sin(sin) {}
+
+  double cos;
+  double sin;
+
+  /// @brief  Returns the corresponding point on a circle of a given |radius|.
+  Vector2 operator*(double radius) const {
+    return Vector2(static_cast<Scalar>(cos * radius),
+                   static_cast<Scalar>(sin * radius));
+  }
+
+  /// @brief  Returns the corresponding point on an ellipse with the given size.
+  Vector2 operator*(const Size& ellipse_radii) const {
+    return Vector2(static_cast<Scalar>(cos * ellipse_radii.width),
+                   static_cast<Scalar>(sin * ellipse_radii.height));
+  }
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_GEOMETRY_TRIG_H_
diff --git a/impeller/geometry/trig_unittests.cc b/impeller/geometry/trig_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ff15c974b5e0bfa70aa2fa32992433a0a4a2d2de
--- /dev/null
+++ b/impeller/geometry/trig_unittests.cc
@@ -0,0 +1,78 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <math.h>
+
+#include "fml/logging.h"
+#include "gtest/gtest.h"
+
+#include "flutter/impeller/geometry/trig.h"
+
+namespace impeller {
+namespace testing {
+
+TEST(TrigTest, TrigAngles) {
+  {
+    Trig trig(Degrees(0.0));
+    EXPECT_EQ(trig.cos, 1.0);
+    EXPECT_EQ(trig.sin, 0.0);
+  }
+
+  {
+    Trig trig(Radians(0.0));
+    EXPECT_EQ(trig.cos, 1.0);
+    EXPECT_EQ(trig.sin, 0.0);
+  }
+
+  {
+    Trig trig(Degrees(30.0));
+    EXPECT_NEAR(trig.cos, sqrt(0.75), kEhCloseEnough);
+    EXPECT_NEAR(trig.sin, 0.5, kEhCloseEnough);
+  }
+
+  {
+    Trig trig(Radians(kPi / 6.0));
+    EXPECT_NEAR(trig.cos, sqrt(0.75), kEhCloseEnough);
+    EXPECT_NEAR(trig.sin, 0.5, kEhCloseEnough);
+  }
+
+  {
+    Trig trig(Degrees(60.0));
+    EXPECT_NEAR(trig.cos, 0.5, kEhCloseEnough);
+    EXPECT_NEAR(trig.sin, sqrt(0.75), kEhCloseEnough);
+  }
+
+  {
+    Trig trig(Radians(kPi / 3.0));
+    EXPECT_NEAR(trig.cos, 0.5, kEhCloseEnough);
+    EXPECT_NEAR(trig.sin, sqrt(0.75), kEhCloseEnough);
+  }
+
+  {
+    Trig trig(Degrees(90.0));
+    EXPECT_NEAR(trig.cos, 0.0, kEhCloseEnough);
+    EXPECT_NEAR(trig.sin, 1.0, kEhCloseEnough);
+  }
+
+  {
+    Trig trig(Radians(kPi / 2.0));
+    EXPECT_NEAR(trig.cos, 0.0, kEhCloseEnough);
+    EXPECT_NEAR(trig.sin, 1.0, kEhCloseEnough);
+  }
+}
+
+TEST(TrigTest, MultiplyByScalarRadius) {
+  for (int i = 0; i <= 360; i++) {
+    for (int i = 1; i <= 10; i++) {
+      Scalar radius = i * 5.0f;
+      EXPECT_EQ(Trig(Degrees(i)) * radius,
+                Point(radius * std::cos(i * kPi / 180),
+                      radius * std::sin(i * kPi / 180)))
+          << "at " << i << " degrees and radius " << radius;
+    }
+  }
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/geometry/type_traits.h b/impeller/geometry/type_traits.h
index 4e884d16c1eca26b5d8455586cda097e5d729db2..7fc0ac436040d8064e241cc8268adb6ccee7b7ee 100644
--- a/impeller/geometry/type_traits.h
+++ b/impeller/geometry/type_traits.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_GEOMETRY_TYPE_TRAITS_H_
+#define FLUTTER_IMPELLER_GEOMETRY_TYPE_TRAITS_H_
 
 #include <type_traits>
 
@@ -18,3 +19,5 @@ template <class F, class I>
 using MixedOp = typename MixedOp_<F, I>::type;
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_GEOMETRY_TYPE_TRAITS_H_
diff --git a/impeller/geometry/vector.h b/impeller/geometry/vector.h
index e87c22f61e4a92486d130c1983a046bd8d2633f0..d55136d5cef801643ba3153b5e9b6e7b2f495580 100644
--- a/impeller/geometry/vector.h
+++ b/impeller/geometry/vector.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_GEOMETRY_VECTOR_H_
+#define FLUTTER_IMPELLER_GEOMETRY_VECTOR_H_
 
 #include <cmath>
 #include <string>
@@ -14,12 +15,14 @@
 
 namespace impeller {
 
+// NOLINTBEGIN(google-explicit-constructor)
+
 struct Vector3 {
   union {
     struct {
-      Scalar x = 0.0;
-      Scalar y = 0.0;
-      Scalar z = 0.0;
+      Scalar x = 0.0f;
+      Scalar y = 0.0f;
+      Scalar z = 0.0f;
     };
     Scalar e[3];
   };
@@ -52,6 +55,10 @@ struct Vector3 {
     return ((x * other.x) + (y * other.y) + (z * other.z));
   }
 
+  constexpr Vector3 Abs() const {
+    return {std::fabs(x), std::fabs(y), std::fabs(z)};
+  }
+
   constexpr Vector3 Cross(const Vector3& other) const {
     return {
         (y * other.z) - (z * other.y),  //
@@ -60,6 +67,26 @@ struct Vector3 {
     };
   }
 
+  constexpr Vector3 Min(const Vector3& p) const {
+    return {std::min(x, p.x), std::min(y, p.y), std::min(z, p.z)};
+  }
+
+  constexpr Vector3 Max(const Vector3& p) const {
+    return {std::max(x, p.x), std::max(y, p.y), std::max(z, p.z)};
+  }
+
+  constexpr Vector3 Floor() const {
+    return {std::floor(x), std::floor(y), std::floor(z)};
+  }
+
+  constexpr Vector3 Ceil() const {
+    return {std::ceil(x), std::ceil(y), std::ceil(z)};
+  }
+
+  constexpr Vector3 Round() const {
+    return {std::round(x), std::round(y), std::round(z)};
+  }
+
   constexpr bool operator==(const Vector3& v) const {
     return v.x == x && v.y == y && v.z == z;
   }
@@ -122,6 +149,14 @@ struct Vector3 {
     return Vector3(x - v.x, y - v.y, z - v.z);
   }
 
+  constexpr Vector3 operator+(Scalar s) const {
+    return Vector3(x + s, y + s, z + s);
+  }
+
+  constexpr Vector3 operator-(Scalar s) const {
+    return Vector3(x - s, y - s, z - s);
+  }
+
   constexpr Vector3 operator*(const Vector3& v) const {
     return Vector3(x * v.x, y * v.y, z * v.z);
   }
@@ -175,6 +210,16 @@ constexpr Vector3 operator*(U s, const Vector3& p) {
   return p * s;
 }
 
+template <class U, class = std::enable_if_t<std::is_arithmetic_v<U>>>
+constexpr Vector3 operator+(U s, const Vector3& p) {
+  return p + s;
+}
+
+template <class U, class = std::enable_if_t<std::is_arithmetic_v<U>>>
+constexpr Vector3 operator-(U s, const Vector3& p) {
+  return -p + s;
+}
+
 template <class U, class = std::enable_if_t<std::is_arithmetic_v<U>>>
 constexpr Vector3 operator/(U s, const Vector3& p) {
   return {
@@ -187,10 +232,10 @@ constexpr Vector3 operator/(U s, const Vector3& p) {
 struct Vector4 {
   union {
     struct {
-      Scalar x = 0.0;
-      Scalar y = 0.0;
-      Scalar z = 0.0;
-      Scalar w = 1.0;
+      Scalar x = 0.0f;
+      Scalar y = 0.0f;
+      Scalar z = 0.0f;
+      Scalar w = 1.0f;
     };
     Scalar e[4];
   };
@@ -207,8 +252,11 @@ struct Vector4 {
 
   constexpr Vector4(const Point& p) : x(p.x), y(p.y) {}
 
+  constexpr Vector4(std::array<Scalar, 4> values)
+      : x(values[0]), y(values[1]), z(values[2]), w(values[3]) {}
+
   Vector4 Normalize() const {
-    const Scalar inverse = 1.0 / sqrt(x * x + y * y + z * z + w * w);
+    const Scalar inverse = 1.0f / sqrt(x * x + y * y + z * z + w * w);
     return Vector4(x * inverse, y * inverse, z * inverse, w * inverse);
   }
 
@@ -236,6 +284,28 @@ struct Vector4 {
     return Vector4(x * v.x, y * v.y, z * v.z, w * v.w);
   }
 
+  constexpr Vector4 Min(const Vector4& p) const {
+    return {std::min(x, p.x), std::min(y, p.y), std::min(z, p.z),
+            std::min(w, p.w)};
+  }
+
+  constexpr Vector4 Max(const Vector4& p) const {
+    return {std::max(x, p.x), std::max(y, p.y), std::max(z, p.z),
+            std::max(w, p.w)};
+  }
+
+  constexpr Vector4 Floor() const {
+    return {std::floor(x), std::floor(y), std::floor(z), std::floor(w)};
+  }
+
+  constexpr Vector4 Ceil() const {
+    return {std::ceil(x), std::ceil(y), std::ceil(z), std::ceil(w)};
+  }
+
+  constexpr Vector4 Round() const {
+    return {std::round(x), std::round(y), std::round(z), std::round(w)};
+  }
+
   constexpr Vector4 Lerp(const Vector4& v, Scalar t) const {
     return *this + (v - *this) * t;
   }
@@ -260,4 +330,8 @@ inline std::ostream& operator<<(std::ostream& out, const impeller::Vector4& p) {
   return out;
 }
 
+// NOLINTEND(google-explicit-constructor)
+
 }  // namespace std
+
+#endif  // FLUTTER_IMPELLER_GEOMETRY_VECTOR_H_
diff --git a/impeller/golden_tests/BUILD.gn b/impeller/golden_tests/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..8c8b5548833e052b01c45b61275714e3abc71c5d
--- /dev/null
+++ b/impeller/golden_tests/BUILD.gn
@@ -0,0 +1,92 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//flutter/common/config.gni")
+import("//flutter/impeller/tools/impeller.gni")
+
+impeller_component("golden_playground_test") {
+  testonly = true
+
+  sources = [ "golden_playground_test.h" ]
+
+  deps = [
+    ":digest",
+    "//flutter/fml",
+    "//flutter/impeller/aiks",
+    "//flutter/impeller/playground",
+    "//flutter/impeller/typographer/backends/skia:typographer_skia_backend",
+    "//flutter/testing:testing_lib",
+  ]
+
+  if (is_mac) {
+    sources += [ "golden_playground_test_mac.cc" ]
+    deps += [
+      ":metal_screenshot",
+      "//flutter/third_party/abseil-cpp/absl/base:no_destructor",
+    ]
+  } else {
+    sources += [ "golden_playground_test_stub.cc" ]
+  }
+}
+
+impeller_component("digest") {
+  testonly = true
+
+  sources = [
+    "golden_digest.cc",
+    "golden_digest.h",
+    "working_directory.cc",
+    "working_directory.h",
+  ]
+
+  deps = [ "//flutter/fml" ]
+}
+
+if (is_mac) {
+  impeller_component("metal_screenshot") {
+    testonly = true
+
+    sources = [
+      "metal_screenshot.h",
+      "metal_screenshot.mm",
+      "metal_screenshotter.h",
+      "metal_screenshotter.mm",
+      "screenshot.h",
+      "screenshotter.h",
+      "vulkan_screenshotter.h",
+      "vulkan_screenshotter.mm",
+    ]
+
+    deps = [
+      "//flutter/impeller/aiks",
+      "//flutter/impeller/display_list",
+      "//flutter/impeller/playground",
+      "//flutter/impeller/renderer/backend/metal:metal",
+      "//flutter/impeller/renderer/backend/vulkan",
+    ]
+  }
+
+  impeller_component("impeller_golden_tests") {
+    target_type = "executable"
+
+    testonly = true
+
+    sources = [
+      "golden_tests.cc",
+      "main.cc",
+    ]
+
+    deps = [
+      ":digest",
+      ":metal_screenshot",
+      "//flutter/impeller/aiks",
+      "//flutter/impeller/aiks:aiks_unittests_golden",
+      "//flutter/impeller/fixtures",
+      "//flutter/third_party/angle:libEGL",
+      "//flutter/third_party/angle:libGLESv2",
+      "//flutter/third_party/googletest:gtest",
+      "//flutter/third_party/swiftshader",
+    ]
+  }
+}
diff --git a/impeller/golden_tests/README.md b/impeller/golden_tests/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..8e590ee0938c25a14d8e5c1d4e48f452c21a5f13
--- /dev/null
+++ b/impeller/golden_tests/README.md
@@ -0,0 +1,35 @@
+# Impeller Golden Tests
+
+This is the executable that will generate the golden image results that can then
+be sent to Skia Gold vial the
+[golden_tests_harvester]("../../tools/golden_tests_harvester").
+
+Running these tests should happen from
+[//flutter/testing/run_tests.py](../../testing/run_tests.py). That will do all
+the steps to generate the golden images and transmit them to Skia Gold. If you
+run the tests locally it will not actually upload anything. That only happens if
+the script is executed from LUCI.
+
+Example invocation:
+
+```sh
+./run_tests.py --variant="host_debug_unopt_arm64" --type="impeller-golden"
+```
+
+Currently these tests are only supported on macOS and only test the Metal
+backend to Impeller.
+
+## Adding tests
+
+To add a golden image test, the `impeller_golden_tests` target must be modified
+to generate the correct image and modification to its generated `digest.json`.
+If a test case is added to [golden_tests.cc](./golden_tests.cc), for example
+"GoldenTests.FooBar", that will turn into the golden test
+"impeller_GoldenTests_Foobar" automatically if the `SaveScreenshot()` function
+is used.
+
+The examples in `golden_tests.cc` use GLFW for rendering the tests, but
+technically anything could be used.  Using the `SaveScreenshot()` function will
+automatically update the `GoldenDigest::Instance()` which will make sure that it
+is included in the generated `digest.json`. If that function isn't used the
+`GoldenDigest` should be updated manually.
diff --git a/impeller/golden_tests/golden_digest.cc b/impeller/golden_tests/golden_digest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..d68220b10022c8f55295872537426e0ab478877e
--- /dev/null
+++ b/impeller/golden_tests/golden_digest.cc
@@ -0,0 +1,96 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/golden_tests/golden_digest.h"
+
+#include <fstream>
+#include <sstream>
+
+static const double kMaxDiffPixelsPercent = 0.01;
+static const int32_t kMaxColorDelta = 8;
+
+namespace impeller {
+namespace testing {
+
+GoldenDigest* GoldenDigest::instance_ = nullptr;
+
+GoldenDigest* GoldenDigest::Instance() {
+  if (!instance_) {
+    instance_ = new GoldenDigest();
+  }
+  return instance_;
+}
+
+GoldenDigest::GoldenDigest() {}
+
+void GoldenDigest::AddDimension(const std::string& name,
+                                const std::string& value) {
+  std::stringstream ss;
+  ss << "\"" << value << "\"";
+  dimensions_[name] = ss.str();
+}
+
+void GoldenDigest::AddImage(const std::string& test_name,
+                            const std::string& filename,
+                            int32_t width,
+                            int32_t height) {
+  entries_.push_back({test_name, filename, width, height, kMaxDiffPixelsPercent,
+                      kMaxColorDelta});
+}
+
+bool GoldenDigest::Write(WorkingDirectory* working_directory) {
+  std::ofstream fout;
+  fout.open(working_directory->GetFilenamePath("digest.json"));
+  if (!fout.good()) {
+    return false;
+  }
+
+  fout << "{" << std::endl;
+  fout << "  \"dimensions\": {" << std::endl;
+  bool is_first = true;
+  for (const auto& dimension : dimensions_) {
+    if (!is_first) {
+      fout << "," << std::endl;
+    }
+    is_first = false;
+    fout << "    \"" << dimension.first << "\": " << dimension.second;
+  }
+  fout << std::endl << "  }," << std::endl;
+  fout << "  \"entries\":" << std::endl;
+
+  fout << "  [" << std::endl;
+  is_first = true;
+  for (const auto& entry : entries_) {
+    if (!is_first) {
+      fout << "," << std::endl;
+    }
+    is_first = false;
+
+    fout << "    { " << "\"testName\" : \"" << entry.test_name << "\", "
+         << "\"filename\" : \"" << entry.filename << "\", "
+         << "\"width\" : " << entry.width << ", "
+         << "\"height\" : " << entry.height << ", ";
+
+    if (entry.max_diff_pixels_percent ==
+        static_cast<int64_t>(entry.max_diff_pixels_percent)) {
+      fout << "\"maxDiffPixelsPercent\" : " << entry.max_diff_pixels_percent
+           << ".0, ";
+    } else {
+      fout << "\"maxDiffPixelsPercent\" : " << entry.max_diff_pixels_percent
+           << ", ";
+    }
+
+    fout << "\"maxColorDelta\":" << entry.max_color_delta << " ";
+    fout << "}";
+  }
+  fout << std::endl << "  ]" << std::endl;
+
+  fout << "}" << std::endl;
+
+  fout.close();
+  return true;
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/golden_tests/golden_digest.h b/impeller/golden_tests/golden_digest.h
new file mode 100644
index 0000000000000000000000000000000000000000..aaa4e8fa00c2afafbfc1971f98d10f2a836e7c4f
--- /dev/null
+++ b/impeller/golden_tests/golden_digest.h
@@ -0,0 +1,56 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_GOLDEN_TESTS_GOLDEN_DIGEST_H_
+#define FLUTTER_IMPELLER_GOLDEN_TESTS_GOLDEN_DIGEST_H_
+
+#include <map>
+#include <string>
+#include <vector>
+
+#include "flutter/fml/macros.h"
+#include "flutter/impeller/golden_tests/working_directory.h"
+
+namespace impeller {
+namespace testing {
+
+/// Manages a global variable for tracking instances of golden images.
+class GoldenDigest {
+ public:
+  static GoldenDigest* Instance();
+
+  void AddDimension(const std::string& name, const std::string& value);
+
+  void AddImage(const std::string& test_name,
+                const std::string& filename,
+                int32_t width,
+                int32_t height);
+
+  /// Writes a "digest.json" file to `working_directory`.
+  ///
+  /// Returns `true` on success.
+  bool Write(WorkingDirectory* working_directory);
+
+ private:
+  GoldenDigest(const GoldenDigest&) = delete;
+
+  GoldenDigest& operator=(const GoldenDigest&) = delete;
+  GoldenDigest();
+  struct Entry {
+    std::string test_name;
+    std::string filename;
+    int32_t width;
+    int32_t height;
+    double max_diff_pixels_percent;
+    int32_t max_color_delta;
+  };
+
+  static GoldenDigest* instance_;
+  std::vector<Entry> entries_;
+  std::map<std::string, std::string> dimensions_;
+};
+}  // namespace testing
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_GOLDEN_TESTS_GOLDEN_DIGEST_H_
diff --git a/impeller/golden_tests/golden_playground_test.h b/impeller/golden_tests/golden_playground_test.h
new file mode 100644
index 0000000000000000000000000000000000000000..f57ceb2c543a21dc162d3034bc3bd9681a8a51ec
--- /dev/null
+++ b/impeller/golden_tests/golden_playground_test.h
@@ -0,0 +1,96 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_GOLDEN_TESTS_GOLDEN_PLAYGROUND_TEST_H_
+#define FLUTTER_IMPELLER_GOLDEN_TESTS_GOLDEN_PLAYGROUND_TEST_H_
+
+#include <memory>
+
+#include "flutter/impeller/aiks/aiks_context.h"
+#include "flutter/impeller/playground/playground.h"
+#include "flutter/impeller/renderer/render_target.h"
+#include "flutter/testing/testing.h"
+#include "impeller/typographer/typographer_context.h"
+#include "third_party/imgui/imgui.h"
+
+#if FML_OS_MACOSX
+#include "flutter/fml/platform/darwin/scoped_nsautorelease_pool.h"
+#endif
+
+namespace impeller {
+
+class GoldenPlaygroundTest
+    : public ::testing::TestWithParam<PlaygroundBackend> {
+ public:
+  using AiksPlaygroundCallback =
+      std::function<std::optional<Picture>(AiksContext& renderer)>;
+
+  GoldenPlaygroundTest();
+
+  ~GoldenPlaygroundTest() override;
+
+  void SetUp();
+
+  void TearDown();
+
+  PlaygroundBackend GetBackend() const;
+
+  void SetTypographerContext(
+      std::shared_ptr<TypographerContext> typographer_context);
+
+  bool OpenPlaygroundHere(Picture picture);
+
+  bool OpenPlaygroundHere(AiksPlaygroundCallback callback);
+
+  static bool ImGuiBegin(const char* name,
+                         bool* p_open,
+                         ImGuiWindowFlags flags);
+
+  std::shared_ptr<Texture> CreateTextureForFixture(
+      const char* fixture_name,
+      bool enable_mipmapping = false) const;
+
+  RuntimeStage::Map OpenAssetAsRuntimeStage(const char* asset_name) const;
+
+  std::shared_ptr<Context> GetContext() const;
+
+  std::shared_ptr<Context> MakeContext() const;
+
+  Point GetContentScale() const;
+
+  Scalar GetSecondsElapsed() const;
+
+  ISize GetWindowSize() const;
+
+  [[nodiscard]] fml::Status SetCapabilities(
+      const std::shared_ptr<Capabilities>& capabilities);
+
+  /// TODO(https://github.com/flutter/flutter/issues/139950): Remove this.
+  /// Returns true if `OpenPlaygroundHere` will actually render anything.
+  bool WillRenderSomething() const { return true; }
+
+ protected:
+  void SetWindowSize(ISize size);
+
+ private:
+#if FML_OS_MACOSX
+  // This must be placed first so that the autorelease pool is not destroyed
+  // until the GoldenPlaygroundTestImpl has been destructed.
+  fml::ScopedNSAutoreleasePool autorelease_pool_;
+#endif
+
+  std::shared_ptr<TypographerContext> typographer_context_;
+
+  struct GoldenPlaygroundTestImpl;
+  // This is only a shared_ptr so it can work with a forward declared type.
+  std::shared_ptr<GoldenPlaygroundTestImpl> pimpl_;
+
+  GoldenPlaygroundTest(const GoldenPlaygroundTest&) = delete;
+
+  GoldenPlaygroundTest& operator=(const GoldenPlaygroundTest&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_GOLDEN_TESTS_GOLDEN_PLAYGROUND_TEST_H_
diff --git a/impeller/golden_tests/golden_playground_test_mac.cc b/impeller/golden_tests/golden_playground_test_mac.cc
new file mode 100644
index 0000000000000000000000000000000000000000..75fea0f34072a690ad6fe0d4adb962596e3b30af
--- /dev/null
+++ b/impeller/golden_tests/golden_playground_test_mac.cc
@@ -0,0 +1,288 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <dlfcn.h>
+#include <filesystem>
+#include <memory>
+
+#include "flutter/impeller/golden_tests/golden_playground_test.h"
+
+#include "flutter/impeller/aiks/picture.h"
+#include "flutter/impeller/golden_tests/golden_digest.h"
+#include "flutter/impeller/golden_tests/metal_screenshotter.h"
+#include "flutter/impeller/golden_tests/vulkan_screenshotter.h"
+#include "flutter/third_party/abseil-cpp/absl/base/no_destructor.h"
+#include "impeller/typographer/backends/skia/typographer_context_skia.h"
+#include "impeller/typographer/typographer_context.h"
+
+#define GLFW_INCLUDE_NONE
+#include "third_party/glfw/include/GLFW/glfw3.h"
+
+namespace impeller {
+
+namespace {
+std::unique_ptr<PlaygroundImpl> MakeVulkanPlayground(bool enable_validations) {
+  FML_CHECK(::glfwInit() == GLFW_TRUE);
+  PlaygroundSwitches playground_switches;
+  playground_switches.enable_vulkan_validation = enable_validations;
+  return PlaygroundImpl::Create(PlaygroundBackend::kVulkan,
+                                playground_switches);
+}
+
+// Returns a static instance to a playground that can be used across tests.
+const std::unique_ptr<PlaygroundImpl>& GetSharedVulkanPlayground(
+    bool enable_validations) {
+  if (enable_validations) {
+    static absl::NoDestructor<std::unique_ptr<PlaygroundImpl>>
+        vulkan_validation_playground(
+            MakeVulkanPlayground(/*enable_validations=*/true));
+    // TODO(https://github.com/flutter/flutter/issues/142237): This can be
+    // removed when the thread local storage is removed.
+    static fml::ScopedCleanupClosure context_cleanup(
+        [&] { (*vulkan_validation_playground)->GetContext()->Shutdown(); });
+    return *vulkan_validation_playground;
+  } else {
+    static absl::NoDestructor<std::unique_ptr<PlaygroundImpl>>
+        vulkan_playground(MakeVulkanPlayground(/*enable_validations=*/false));
+    // TODO(https://github.com/flutter/flutter/issues/142237): This can be
+    // removed when the thread local storage is removed.
+    static fml::ScopedCleanupClosure context_cleanup(
+        [&] { (*vulkan_playground)->GetContext()->Shutdown(); });
+    return *vulkan_playground;
+  }
+}
+}  // namespace
+
+#define IMP_AIKSTEST(name)                         \
+  "impeller_Play_AiksTest_" #name "_Metal",        \
+      "impeller_Play_AiksTest_" #name "_OpenGLES", \
+      "impeller_Play_AiksTest_" #name "_Vulkan"
+
+// If you add a new playground test to the aiks unittests and you do not want it
+// to also be a golden test, then add the test name here.
+static const std::vector<std::string> kSkipTests = {
+    // TextRotated is flakey and we can't seem to get it to stabilize on Skia
+    // Gold.
+    IMP_AIKSTEST(TextRotated),
+    // Runtime stage based tests get confused with a Metal context.
+    "impeller_Play_AiksTest_CanRenderClippedRuntimeEffects_Vulkan",
+};
+
+namespace {
+std::string GetTestName() {
+  std::string suite_name =
+      ::testing::UnitTest::GetInstance()->current_test_suite()->name();
+  std::string test_name =
+      ::testing::UnitTest::GetInstance()->current_test_info()->name();
+  std::stringstream ss;
+  ss << "impeller_" << suite_name << "_" << test_name;
+  std::string result = ss.str();
+  // Make sure there are no slashes in the test name.
+  std::replace(result.begin(), result.end(), '/', '_');
+  return result;
+}
+
+std::string GetGoldenFilename() {
+  return GetTestName() + ".png";
+}
+
+bool SaveScreenshot(std::unique_ptr<testing::Screenshot> screenshot) {
+  if (!screenshot || !screenshot->GetBytes()) {
+    FML_LOG(ERROR) << "Failed to collect screenshot for test " << GetTestName();
+    return false;
+  }
+  std::string test_name = GetTestName();
+  std::string filename = GetGoldenFilename();
+  testing::GoldenDigest::Instance()->AddImage(
+      test_name, filename, screenshot->GetWidth(), screenshot->GetHeight());
+  if (!screenshot->WriteToPNG(
+          testing::WorkingDirectory::Instance()->GetFilenamePath(filename))) {
+    FML_LOG(ERROR) << "Failed to write screenshot to " << filename;
+    return false;
+  }
+  return true;
+}
+
+}  // namespace
+
+struct GoldenPlaygroundTest::GoldenPlaygroundTestImpl {
+  std::unique_ptr<PlaygroundImpl> test_vulkan_playground;
+  std::unique_ptr<PlaygroundImpl> test_opengl_playground;
+  std::unique_ptr<testing::Screenshotter> screenshotter;
+  ISize window_size = ISize{1024, 768};
+};
+
+GoldenPlaygroundTest::GoldenPlaygroundTest()
+    : typographer_context_(TypographerContextSkia::Make()),
+      pimpl_(new GoldenPlaygroundTest::GoldenPlaygroundTestImpl()) {}
+
+GoldenPlaygroundTest::~GoldenPlaygroundTest() = default;
+
+void GoldenPlaygroundTest::SetTypographerContext(
+    std::shared_ptr<TypographerContext> typographer_context) {
+  typographer_context_ = std::move(typographer_context);
+};
+
+void GoldenPlaygroundTest::TearDown() {
+  ASSERT_FALSE(dlopen("/usr/local/lib/libMoltenVK.dylib", RTLD_NOLOAD));
+}
+
+void GoldenPlaygroundTest::SetUp() {
+  std::filesystem::path testing_assets_path =
+      flutter::testing::GetTestingAssetsPath();
+  std::filesystem::path target_path = testing_assets_path.parent_path()
+                                          .parent_path()
+                                          .parent_path()
+                                          .parent_path();
+  std::filesystem::path icd_path = target_path / "vk_swiftshader_icd.json";
+  setenv("VK_ICD_FILENAMES", icd_path.c_str(), 1);
+
+  switch (GetParam()) {
+    case PlaygroundBackend::kMetal:
+      pimpl_->screenshotter = std::make_unique<testing::MetalScreenshotter>();
+      break;
+    case PlaygroundBackend::kVulkan: {
+      const std::unique_ptr<PlaygroundImpl>& playground =
+          GetSharedVulkanPlayground(/*enable_validations=*/true);
+      pimpl_->screenshotter =
+          std::make_unique<testing::VulkanScreenshotter>(playground);
+      break;
+    }
+    case PlaygroundBackend::kOpenGLES: {
+      FML_CHECK(::glfwInit() == GLFW_TRUE);
+      PlaygroundSwitches playground_switches;
+      playground_switches.use_angle = true;
+      pimpl_->test_opengl_playground = PlaygroundImpl::Create(
+          PlaygroundBackend::kOpenGLES, playground_switches);
+      pimpl_->screenshotter = std::make_unique<testing::VulkanScreenshotter>(
+          pimpl_->test_opengl_playground);
+      break;
+    }
+  }
+  if (GetParam() == PlaygroundBackend::kMetal) {
+    pimpl_->screenshotter = std::make_unique<testing::MetalScreenshotter>();
+  } else if (GetParam() == PlaygroundBackend::kVulkan) {
+    const std::unique_ptr<PlaygroundImpl>& playground =
+        GetSharedVulkanPlayground(/*enable_validations=*/true);
+    pimpl_->screenshotter =
+        std::make_unique<testing::VulkanScreenshotter>(playground);
+  }
+
+  std::string test_name = GetTestName();
+  if (std::find(kSkipTests.begin(), kSkipTests.end(), test_name) !=
+      kSkipTests.end()) {
+    GTEST_SKIP_(
+        "GoldenPlaygroundTest doesn't support interactive playground tests "
+        "yet.");
+  }
+
+  testing::GoldenDigest::Instance()->AddDimension(
+      "gpu_string", GetContext()->DescribeGpuModel());
+}
+
+PlaygroundBackend GoldenPlaygroundTest::GetBackend() const {
+  return GetParam();
+}
+
+bool GoldenPlaygroundTest::OpenPlaygroundHere(Picture picture) {
+  AiksContext renderer(GetContext(), typographer_context_);
+
+  auto screenshot = pimpl_->screenshotter->MakeScreenshot(renderer, picture,
+                                                          pimpl_->window_size);
+  return SaveScreenshot(std::move(screenshot));
+}
+
+bool GoldenPlaygroundTest::OpenPlaygroundHere(
+    AiksPlaygroundCallback
+        callback) {  // NOLINT(performance-unnecessary-value-param)
+  AiksContext renderer(GetContext(), typographer_context_);
+
+  std::optional<Picture> picture;
+  std::unique_ptr<testing::Screenshot> screenshot;
+  for (int i = 0; i < 2; ++i) {
+    picture = callback(renderer);
+    if (!picture.has_value()) {
+      return false;
+    }
+    screenshot = pimpl_->screenshotter->MakeScreenshot(
+        renderer, picture.value(), pimpl_->window_size);
+  }
+
+  return SaveScreenshot(std::move(screenshot));
+}
+
+bool GoldenPlaygroundTest::ImGuiBegin(const char* name,
+                                      bool* p_open,
+                                      ImGuiWindowFlags flags) {
+  return false;
+}
+
+std::shared_ptr<Texture> GoldenPlaygroundTest::CreateTextureForFixture(
+    const char* fixture_name,
+    bool enable_mipmapping) const {
+  std::shared_ptr<fml::Mapping> mapping =
+      flutter::testing::OpenFixtureAsMapping(fixture_name);
+  auto result = Playground::CreateTextureForMapping(GetContext(), mapping,
+                                                    enable_mipmapping);
+  if (result) {
+    result->SetLabel(fixture_name);
+  }
+  return result;
+}
+
+RuntimeStage::Map GoldenPlaygroundTest::OpenAssetAsRuntimeStage(
+    const char* asset_name) const {
+  const std::shared_ptr<fml::Mapping> fixture =
+      flutter::testing::OpenFixtureAsMapping(asset_name);
+  if (!fixture || fixture->GetSize() == 0) {
+    return {};
+  }
+  return RuntimeStage::DecodeRuntimeStages(fixture);
+}
+
+std::shared_ptr<Context> GoldenPlaygroundTest::GetContext() const {
+  return pimpl_->screenshotter->GetPlayground().GetContext();
+}
+
+std::shared_ptr<Context> GoldenPlaygroundTest::MakeContext() const {
+  if (GetParam() == PlaygroundBackend::kMetal) {
+    /// On Metal we create a context for each test.
+    return GetContext();
+  } else if (GetParam() == PlaygroundBackend::kVulkan) {
+    bool enable_vulkan_validations = true;
+    FML_CHECK(!pimpl_->test_vulkan_playground)
+        << "We don't support creating multiple contexts for one test";
+    pimpl_->test_vulkan_playground =
+        MakeVulkanPlayground(enable_vulkan_validations);
+    pimpl_->screenshotter = std::make_unique<testing::VulkanScreenshotter>(
+        pimpl_->test_vulkan_playground);
+    return pimpl_->test_vulkan_playground->GetContext();
+  } else {
+    /// On OpenGL we create a context for each test.
+    return GetContext();
+  }
+}
+
+Point GoldenPlaygroundTest::GetContentScale() const {
+  return pimpl_->screenshotter->GetPlayground().GetContentScale();
+}
+
+Scalar GoldenPlaygroundTest::GetSecondsElapsed() const {
+  return 0.0f;
+}
+
+ISize GoldenPlaygroundTest::GetWindowSize() const {
+  return pimpl_->window_size;
+}
+
+void GoldenPlaygroundTest::GoldenPlaygroundTest::SetWindowSize(ISize size) {
+  pimpl_->window_size = size;
+}
+
+fml::Status GoldenPlaygroundTest::SetCapabilities(
+    const std::shared_ptr<Capabilities>& capabilities) {
+  return pimpl_->screenshotter->GetPlayground().SetCapabilities(capabilities);
+}
+
+}  // namespace impeller
diff --git a/impeller/golden_tests/golden_playground_test_stub.cc b/impeller/golden_tests/golden_playground_test_stub.cc
new file mode 100644
index 0000000000000000000000000000000000000000..9d7568a1faff282a456edabee5498ee2543fc36d
--- /dev/null
+++ b/impeller/golden_tests/golden_playground_test_stub.cc
@@ -0,0 +1,75 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/impeller/golden_tests/golden_playground_test.h"
+
+#include "impeller/aiks/picture.h"
+
+namespace impeller {
+
+GoldenPlaygroundTest::GoldenPlaygroundTest() = default;
+
+GoldenPlaygroundTest::~GoldenPlaygroundTest() = default;
+
+void GoldenPlaygroundTest::SetTypographerContext(
+    std::shared_ptr<TypographerContext> typographer_context) {
+  typographer_context_ = std::move(typographer_context);
+};
+
+void GoldenPlaygroundTest::TearDown() {}
+
+void GoldenPlaygroundTest::SetUp() {
+  GTEST_SKIP_("GoldenPlaygroundTest doesn't support this backend type.");
+}
+
+PlaygroundBackend GoldenPlaygroundTest::GetBackend() const {
+  return GetParam();
+}
+
+bool GoldenPlaygroundTest::OpenPlaygroundHere(Picture picture) {
+  return false;
+}
+
+bool GoldenPlaygroundTest::OpenPlaygroundHere(
+    AiksPlaygroundCallback
+        callback) {  // NOLINT(performance-unnecessary-value-param)
+  return false;
+}
+
+std::shared_ptr<Texture> GoldenPlaygroundTest::CreateTextureForFixture(
+    const char* fixture_name,
+    bool enable_mipmapping) const {
+  return nullptr;
+}
+RuntimeStage::Map GoldenPlaygroundTest::OpenAssetAsRuntimeStage(
+    const char* asset_name) const {
+  return {};
+}
+
+std::shared_ptr<Context> GoldenPlaygroundTest::GetContext() const {
+  return nullptr;
+}
+
+Point GoldenPlaygroundTest::GetContentScale() const {
+  return Point();
+}
+
+Scalar GoldenPlaygroundTest::GetSecondsElapsed() const {
+  return Scalar();
+}
+
+ISize GoldenPlaygroundTest::GetWindowSize() const {
+  return ISize();
+}
+
+void GoldenPlaygroundTest::SetWindowSize(ISize size) {}
+
+fml::Status GoldenPlaygroundTest::SetCapabilities(
+    const std::shared_ptr<Capabilities>& capabilities) {
+  return fml::Status(
+      fml::StatusCode::kUnimplemented,
+      "GoldenPlaygroundTest-Stub doesn't support SetCapabilities.");
+}
+
+}  // namespace impeller
diff --git a/impeller/golden_tests/golden_tests.cc b/impeller/golden_tests/golden_tests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c519f367a1ddb9162a395cc3ea4203711ca25d1a
--- /dev/null
+++ b/impeller/golden_tests/golden_tests.cc
@@ -0,0 +1,90 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "gtest/gtest.h"
+
+#include <sstream>
+
+#include "flutter/fml/platform/darwin/scoped_nsautorelease_pool.h"
+#include "impeller/aiks/aiks_context.h"
+#include "impeller/aiks/canvas.h"
+#include "impeller/entity/contents/conical_gradient_contents.h"
+#include "impeller/geometry/path_builder.h"
+#include "impeller/golden_tests/golden_digest.h"
+#include "impeller/golden_tests/metal_screenshot.h"
+#include "impeller/golden_tests/metal_screenshotter.h"
+#include "impeller/golden_tests/working_directory.h"
+
+namespace impeller {
+namespace testing {
+
+namespace {
+std::string GetTestName() {
+  std::string suite_name =
+      ::testing::UnitTest::GetInstance()->current_test_suite()->name();
+  std::string test_name =
+      ::testing::UnitTest::GetInstance()->current_test_info()->name();
+  std::stringstream ss;
+  ss << "impeller_" << suite_name << "_" << test_name;
+  return ss.str();
+}
+
+std::string GetGoldenFilename() {
+  return GetTestName() + ".png";
+}
+
+bool SaveScreenshot(std::unique_ptr<Screenshot> screenshot) {
+  if (!screenshot || !screenshot->GetBytes()) {
+    return false;
+  }
+  std::string test_name = GetTestName();
+  std::string filename = GetGoldenFilename();
+  GoldenDigest::Instance()->AddImage(
+      test_name, filename, screenshot->GetWidth(), screenshot->GetHeight());
+  return screenshot->WriteToPNG(
+      WorkingDirectory::Instance()->GetFilenamePath(filename));
+}
+
+}  // namespace
+
+class GoldenTests : public ::testing::Test {
+ public:
+  GoldenTests() : screenshotter_(new MetalScreenshotter()) {}
+
+  MetalScreenshotter& Screenshotter() { return *screenshotter_; }
+
+  void SetUp() override {
+    testing::GoldenDigest::Instance()->AddDimension(
+        "gpu_string",
+        Screenshotter().GetPlayground().GetContext()->DescribeGpuModel());
+  }
+
+ private:
+  // This must be placed before any other members that may use the
+  // autorelease pool.
+  fml::ScopedNSAutoreleasePool autorelease_pool_;
+
+  std::unique_ptr<MetalScreenshotter> screenshotter_;
+};
+
+TEST_F(GoldenTests, ConicalGradient) {
+  Canvas canvas;
+  Paint paint;
+
+  paint.color_source = ColorSource::MakeConicalGradient(
+      {125, 125}, 125, {Color(1.0, 0.0, 0.0, 1.0), Color(0.0, 0.0, 1.0, 1.0)},
+      {0, 1}, {180, 180}, 0, Entity::TileMode::kClamp, {});
+
+  paint.stroke_width = 0.0;
+  paint.style = Paint::Style::kFill;
+  canvas.DrawRect(Rect::MakeXYWH(10, 10, 250, 250), paint);
+  Picture picture = canvas.EndRecordingAsPicture();
+
+  auto aiks_context =
+      AiksContext(Screenshotter().GetPlayground().GetContext(), nullptr);
+  auto screenshot = Screenshotter().MakeScreenshot(aiks_context, picture);
+  ASSERT_TRUE(SaveScreenshot(std::move(screenshot)));
+}
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/golden_tests/main.cc b/impeller/golden_tests/main.cc
new file mode 100644
index 0000000000000000000000000000000000000000..4791f3818a9f03bcfd010a0f6e9e2c204a204552
--- /dev/null
+++ b/impeller/golden_tests/main.cc
@@ -0,0 +1,69 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <wordexp.h>
+
+#include "flutter/fml/backtrace.h"
+#include "flutter/fml/build_config.h"
+#include "flutter/fml/command_line.h"
+#include "flutter/fml/logging.h"
+#include "flutter/impeller/base/validation.h"
+#include "flutter/impeller/golden_tests/golden_digest.h"
+#include "flutter/impeller/golden_tests/working_directory.h"
+#include "gtest/gtest.h"
+
+namespace {
+void print_usage() {
+  std::cout << "usage: impeller_golden_tests --working_dir=<working_dir>"
+            << std::endl
+            << std::endl;
+  std::cout << "flags:" << std::endl;
+  std::cout << "  working_dir: Where the golden images will be generated and "
+               "uploaded to Skia Gold from."
+            << std::endl;
+}
+}  // namespace
+
+namespace impeller {
+TEST(ValidationTest, IsFatal) {
+  EXPECT_TRUE(ImpellerValidationErrorsAreFatal());
+}
+}  // namespace impeller
+
+int main(int argc, char** argv) {
+  impeller::ImpellerValidationErrorsSetFatal(true);
+  fml::InstallCrashHandler();
+  testing::InitGoogleTest(&argc, argv);
+  fml::CommandLine cmd = fml::CommandLineFromPlatformOrArgcArgv(argc, argv);
+
+  std::optional<std::string> working_dir;
+  for (const auto& option : cmd.options()) {
+    if (option.name == "working_dir") {
+      wordexp_t wordexp_result;
+      int code = wordexp(option.value.c_str(), &wordexp_result, 0);
+      FML_CHECK(code == 0);
+      FML_CHECK(wordexp_result.we_wordc != 0);
+      working_dir = wordexp_result.we_wordv[0];
+      wordfree(&wordexp_result);
+    }
+  }
+  if (!working_dir) {
+    std::cout << "required argument \"working_dir\" is missing." << std::endl
+              << std::endl;
+    print_usage();
+    return 1;
+  }
+
+  impeller::testing::WorkingDirectory::Instance()->SetPath(working_dir.value());
+  std::cout << "working directory: "
+            << impeller::testing::WorkingDirectory::Instance()->GetPath()
+            << std::endl;
+
+  int return_code = RUN_ALL_TESTS();
+  if (0 == return_code) {
+    impeller::testing::GoldenDigest::Instance()->Write(
+        impeller::testing::WorkingDirectory::Instance());
+  }
+  return return_code;
+}
diff --git a/impeller/golden_tests/metal_screenshot.h b/impeller/golden_tests/metal_screenshot.h
new file mode 100644
index 0000000000000000000000000000000000000000..dc3ebf697c3d01c78beb8e6ddc7d6018f855625f
--- /dev/null
+++ b/impeller/golden_tests/metal_screenshot.h
@@ -0,0 +1,46 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_GOLDEN_TESTS_METAL_SCREENSHOT_H_
+#define FLUTTER_IMPELLER_GOLDEN_TESTS_METAL_SCREENSHOT_H_
+
+#include "flutter/impeller/golden_tests/screenshot.h"
+
+#include <CoreFoundation/CoreFoundation.h>
+#include <CoreImage/CoreImage.h>
+#include <string>
+
+#include "flutter/fml/macros.h"
+
+namespace impeller {
+namespace testing {
+
+/// A screenshot that was produced from `MetalScreenshotter`.
+class MetalScreenshot : public Screenshot {
+ public:
+  explicit MetalScreenshot(CGImageRef cgImage);
+
+  ~MetalScreenshot();
+
+  const uint8_t* GetBytes() const override;
+
+  size_t GetHeight() const override;
+
+  size_t GetWidth() const override;
+
+  size_t GetBytesPerRow() const override;
+
+  bool WriteToPNG(const std::string& path) const override;
+
+ private:
+  MetalScreenshot(const MetalScreenshot&) = delete;
+
+  MetalScreenshot& operator=(const MetalScreenshot&) = delete;
+  CGImageRef cg_image_;
+  CFDataRef pixel_data_;
+};
+}  // namespace testing
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_GOLDEN_TESTS_METAL_SCREENSHOT_H_
diff --git a/impeller/golden_tests/metal_screenshot.mm b/impeller/golden_tests/metal_screenshot.mm
new file mode 100644
index 0000000000000000000000000000000000000000..fd7ab0c083461dd53043d3c9b25a3e953c7f81ca
--- /dev/null
+++ b/impeller/golden_tests/metal_screenshot.mm
@@ -0,0 +1,56 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/golden_tests/metal_screenshot.h"
+
+namespace impeller {
+namespace testing {
+
+MetalScreenshot::MetalScreenshot(CGImageRef cgImage) : cg_image_(cgImage) {
+  CGDataProviderRef data_provider = CGImageGetDataProvider(cgImage);
+  pixel_data_ = CGDataProviderCopyData(data_provider);
+}
+
+MetalScreenshot::~MetalScreenshot() {
+  CFRelease(pixel_data_);
+  CGImageRelease(cg_image_);
+}
+
+const uint8_t* MetalScreenshot::GetBytes() const {
+  return CFDataGetBytePtr(pixel_data_);
+}
+
+size_t MetalScreenshot::GetHeight() const {
+  return CGImageGetHeight(cg_image_);
+}
+
+size_t MetalScreenshot::GetWidth() const {
+  return CGImageGetWidth(cg_image_);
+}
+
+size_t MetalScreenshot::GetBytesPerRow() const {
+  return CGImageGetBytesPerRow(cg_image_);
+}
+
+bool MetalScreenshot::WriteToPNG(const std::string& path) const {
+  bool result = false;
+  NSURL* output_url =
+      [NSURL fileURLWithPath:[NSString stringWithUTF8String:path.c_str()]];
+  CGImageDestinationRef destination = CGImageDestinationCreateWithURL(
+      (__bridge CFURLRef)output_url, kUTTypePNG, 1, nullptr);
+  if (destination != nullptr) {
+    CGImageDestinationAddImage(destination, cg_image_,
+                               (__bridge CFDictionaryRef) @{});
+
+    if (CGImageDestinationFinalize(destination)) {
+      result = true;
+    }
+
+    CFRelease(destination);
+  }
+  return result;
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/golden_tests/metal_screenshotter.h b/impeller/golden_tests/metal_screenshotter.h
new file mode 100644
index 0000000000000000000000000000000000000000..582462a73f4256041df93595f5ea2c2b7d611fbb
--- /dev/null
+++ b/impeller/golden_tests/metal_screenshotter.h
@@ -0,0 +1,38 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_GOLDEN_TESTS_METAL_SCREENSHOTTER_H_
+#define FLUTTER_IMPELLER_GOLDEN_TESTS_METAL_SCREENSHOTTER_H_
+
+#include "flutter/fml/macros.h"
+#include "flutter/impeller/aiks/picture.h"
+#include "flutter/impeller/golden_tests/metal_screenshot.h"
+#include "flutter/impeller/golden_tests/screenshotter.h"
+#include "flutter/impeller/playground/playground_impl.h"
+
+namespace impeller {
+namespace testing {
+
+/// Converts `Picture`s and `DisplayList`s to `MetalScreenshot`s with the
+/// playground backend.
+class MetalScreenshotter : public Screenshotter {
+ public:
+  MetalScreenshotter();
+
+  std::unique_ptr<Screenshot> MakeScreenshot(
+      AiksContext& aiks_context,
+      const Picture& picture,
+      const ISize& size = {300, 300},
+      bool scale_content = true) override;
+
+  PlaygroundImpl& GetPlayground() override { return *playground_; }
+
+ private:
+  std::unique_ptr<PlaygroundImpl> playground_;
+};
+
+}  // namespace testing
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_GOLDEN_TESTS_METAL_SCREENSHOTTER_H_
diff --git a/impeller/golden_tests/metal_screenshotter.mm b/impeller/golden_tests/metal_screenshotter.mm
new file mode 100644
index 0000000000000000000000000000000000000000..534884078a17f4bb1130d0e2e797e7679d38cc8a
--- /dev/null
+++ b/impeller/golden_tests/metal_screenshotter.mm
@@ -0,0 +1,64 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/impeller/golden_tests/metal_screenshotter.h"
+
+#include <CoreImage/CoreImage.h>
+#include "impeller/renderer/backend/metal/context_mtl.h"
+#include "impeller/renderer/backend/metal/texture_mtl.h"
+#define GLFW_INCLUDE_NONE
+#include "third_party/glfw/include/GLFW/glfw3.h"
+
+namespace impeller {
+namespace testing {
+
+MetalScreenshotter::MetalScreenshotter() {
+  FML_CHECK(::glfwInit() == GLFW_TRUE);
+  playground_ =
+      PlaygroundImpl::Create(PlaygroundBackend::kMetal, PlaygroundSwitches{});
+}
+
+std::unique_ptr<Screenshot> MetalScreenshotter::MakeScreenshot(
+    AiksContext& aiks_context,
+    const Picture& picture,
+    const ISize& size,
+    bool scale_content) {
+  Vector2 content_scale =
+      scale_content ? playground_->GetContentScale() : Vector2{1, 1};
+  std::shared_ptr<Image> image = picture.ToImage(
+      aiks_context,
+      ISize(size.width * content_scale.x, size.height * content_scale.y));
+  std::shared_ptr<Texture> texture = image->GetTexture();
+  id<MTLTexture> metal_texture =
+      std::static_pointer_cast<TextureMTL>(texture)->GetMTLTexture();
+
+  if (metal_texture.pixelFormat != MTLPixelFormatBGRA8Unorm) {
+    return {};
+  }
+
+  CGColorSpaceRef color_space = CGColorSpaceCreateDeviceRGB();
+  CIImage* ciImage = [[CIImage alloc]
+      initWithMTLTexture:metal_texture
+                 options:@{kCIImageColorSpace : (__bridge id)color_space}];
+  CGColorSpaceRelease(color_space);
+  FML_CHECK(ciImage);
+
+  std::shared_ptr<Context> context = playground_->GetContext();
+  std::shared_ptr<ContextMTL> context_mtl =
+      std::static_pointer_cast<ContextMTL>(context);
+  CIContext* cicontext =
+      [CIContext contextWithMTLDevice:context_mtl->GetMTLDevice()];
+  FML_CHECK(context);
+
+  CIImage* flipped = [ciImage
+      imageByApplyingOrientation:kCGImagePropertyOrientationDownMirrored];
+
+  CGImageRef cgImage = [cicontext createCGImage:flipped
+                                       fromRect:[ciImage extent]];
+
+  return std::unique_ptr<MetalScreenshot>(new MetalScreenshot(cgImage));
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/golden_tests/screenshot.h b/impeller/golden_tests/screenshot.h
new file mode 100644
index 0000000000000000000000000000000000000000..4772609b2fb156318a4eda831098fbb0f33dfb71
--- /dev/null
+++ b/impeller/golden_tests/screenshot.h
@@ -0,0 +1,40 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_GOLDEN_TESTS_SCREENSHOT_H_
+#define FLUTTER_IMPELLER_GOLDEN_TESTS_SCREENSHOT_H_
+
+#include <cstddef>
+#include <cstdint>
+#include <memory>
+#include <string>
+
+namespace impeller {
+namespace testing {
+
+class Screenshot {
+ public:
+  virtual ~Screenshot() = default;
+
+  /// Access raw data of the screenshot.
+  virtual const uint8_t* GetBytes() const = 0;
+
+  /// Returns the height of the image in pixels.
+  virtual size_t GetHeight() const = 0;
+
+  /// Returns the width of the image in pixels.
+  virtual size_t GetWidth() const = 0;
+
+  /// Returns number of bytes required to represent one row of the raw image.
+  virtual size_t GetBytesPerRow() const = 0;
+
+  /// Synchronously write the screenshot to disk as a PNG at `path`.  Returns
+  /// `true` if it succeeded.
+  virtual bool WriteToPNG(const std::string& path) const = 0;
+};
+
+}  // namespace testing
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_GOLDEN_TESTS_SCREENSHOT_H_
diff --git a/impeller/golden_tests/screenshotter.h b/impeller/golden_tests/screenshotter.h
new file mode 100644
index 0000000000000000000000000000000000000000..d75f607d42e3447fa7a501f130ab5f0f19ff92d4
--- /dev/null
+++ b/impeller/golden_tests/screenshotter.h
@@ -0,0 +1,34 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_GOLDEN_TESTS_SCREENSHOTTER_H_
+#define FLUTTER_IMPELLER_GOLDEN_TESTS_SCREENSHOTTER_H_
+
+#include "flutter/fml/macros.h"
+#include "flutter/impeller/aiks/picture.h"
+#include "flutter/impeller/golden_tests/screenshot.h"
+#include "flutter/impeller/playground/playground_impl.h"
+
+namespace impeller {
+namespace testing {
+
+/// Converts `Picture`s and `DisplayList`s to `MetalScreenshot`s with the
+/// playground backend.
+class Screenshotter {
+ public:
+  virtual ~Screenshotter() = default;
+
+  virtual std::unique_ptr<Screenshot> MakeScreenshot(
+      AiksContext& aiks_context,
+      const Picture& picture,
+      const ISize& size = {300, 300},
+      bool scale_content = true) = 0;
+
+  virtual PlaygroundImpl& GetPlayground() = 0;
+};
+
+}  // namespace testing
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_GOLDEN_TESTS_SCREENSHOTTER_H_
diff --git a/impeller/golden_tests/vulkan_screenshotter.h b/impeller/golden_tests/vulkan_screenshotter.h
new file mode 100644
index 0000000000000000000000000000000000000000..83a0959975ddff38e64af231e6d26ef9b54a26d7
--- /dev/null
+++ b/impeller/golden_tests/vulkan_screenshotter.h
@@ -0,0 +1,39 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_GOLDEN_TESTS_VULKAN_SCREENSHOTTER_H_
+#define FLUTTER_IMPELLER_GOLDEN_TESTS_VULKAN_SCREENSHOTTER_H_
+
+#include "flutter/fml/macros.h"
+#include "flutter/impeller/aiks/picture.h"
+#include "flutter/impeller/golden_tests/metal_screenshot.h"
+#include "flutter/impeller/golden_tests/screenshotter.h"
+#include "flutter/impeller/playground/playground_impl.h"
+
+namespace impeller {
+namespace testing {
+
+/// Converts `Picture`s and `DisplayList`s to `MetalScreenshot`s with the
+/// playground backend.
+class VulkanScreenshotter : public Screenshotter {
+ public:
+  explicit VulkanScreenshotter(
+      const std::unique_ptr<PlaygroundImpl>& playground);
+
+  std::unique_ptr<Screenshot> MakeScreenshot(
+      AiksContext& aiks_context,
+      const Picture& picture,
+      const ISize& size = {300, 300},
+      bool scale_content = true) override;
+
+  PlaygroundImpl& GetPlayground() override { return *playground_; }
+
+ private:
+  const std::unique_ptr<PlaygroundImpl>& playground_;
+};
+
+}  // namespace testing
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_GOLDEN_TESTS_VULKAN_SCREENSHOTTER_H_
diff --git a/impeller/golden_tests/vulkan_screenshotter.mm b/impeller/golden_tests/vulkan_screenshotter.mm
new file mode 100644
index 0000000000000000000000000000000000000000..a896c72f6975dc4553cb104041de7fb861439d74
--- /dev/null
+++ b/impeller/golden_tests/vulkan_screenshotter.mm
@@ -0,0 +1,124 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/impeller/golden_tests/vulkan_screenshotter.h"
+
+#include "flutter/fml/synchronization/waitable_event.h"
+#include "flutter/impeller/golden_tests/metal_screenshot.h"
+#define GLFW_INCLUDE_NONE
+#include "third_party/glfw/include/GLFW/glfw3.h"
+
+namespace impeller {
+namespace testing {
+
+namespace {
+
+using CGContextPtr = std::unique_ptr<std::remove_pointer<CGContextRef>::type,
+                                     decltype(&CGContextRelease)>;
+using CGImagePtr = std::unique_ptr<std::remove_pointer<CGImageRef>::type,
+                                   decltype(&CGImageRelease)>;
+using CGColorSpacePtr =
+    std::unique_ptr<std::remove_pointer<CGColorSpaceRef>::type,
+                    decltype(&CGColorSpaceRelease)>;
+
+std::unique_ptr<Screenshot> ReadTexture(
+    const std::shared_ptr<Context>& surface_context,
+    const std::shared_ptr<Texture>& texture) {
+  DeviceBufferDescriptor buffer_desc;
+  buffer_desc.storage_mode = StorageMode::kHostVisible;
+  buffer_desc.size =
+      texture->GetTextureDescriptor().GetByteSizeOfBaseMipLevel();
+  buffer_desc.readback = true;
+  std::shared_ptr<DeviceBuffer> device_buffer =
+      surface_context->GetResourceAllocator()->CreateBuffer(buffer_desc);
+  FML_CHECK(device_buffer);
+
+  auto command_buffer = surface_context->CreateCommandBuffer();
+  auto blit_pass = command_buffer->CreateBlitPass();
+  bool success = blit_pass->AddCopy(texture, device_buffer);
+  FML_CHECK(success);
+
+  success = blit_pass->EncodeCommands(surface_context->GetResourceAllocator());
+  FML_CHECK(success);
+
+  fml::AutoResetWaitableEvent latch;
+  success =
+      surface_context->GetCommandQueue()
+          ->Submit({command_buffer},
+                   [&latch](CommandBuffer::Status status) {
+                     FML_CHECK(status == CommandBuffer::Status::kCompleted);
+                     latch.Signal();
+                   })
+          .ok();
+  FML_CHECK(success);
+  latch.Wait();
+  device_buffer->Invalidate();
+
+  // TODO(gaaclarke): Replace CoreImage requirement with something
+  // crossplatform.
+
+  CGColorSpacePtr color_space(CGColorSpaceCreateDeviceRGB(),
+                              &CGColorSpaceRelease);
+  CGBitmapInfo bitmap_info =
+      texture->GetTextureDescriptor().format == PixelFormat::kB8G8R8A8UNormInt
+          ? kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Little
+          : kCGImageAlphaPremultipliedLast;
+  CGContextPtr context(
+      CGBitmapContextCreate(
+          device_buffer->OnGetContents(), texture->GetSize().width,
+          texture->GetSize().height,
+          /*bitsPerComponent=*/8,
+          /*bytesPerRow=*/texture->GetTextureDescriptor().GetBytesPerRow(),
+          color_space.get(), bitmap_info),
+      &CGContextRelease);
+  FML_CHECK(context);
+  CGImagePtr image(CGBitmapContextCreateImage(context.get()), &CGImageRelease);
+  FML_CHECK(image);
+
+  // TODO(https://github.com/flutter/flutter/issues/142641): Perform the flip at
+  // the blit stage to avoid this slow copy.
+  if (texture->GetYCoordScale() == -1) {
+    CGContextPtr flipped_context(
+        CGBitmapContextCreate(
+            nullptr, texture->GetSize().width, texture->GetSize().height,
+            /*bitsPerComponent=*/8,
+            /*bytesPerRow=*/0, color_space.get(), bitmap_info),
+        &CGContextRelease);
+    CGContextTranslateCTM(flipped_context.get(), 0, texture->GetSize().height);
+    CGContextScaleCTM(flipped_context.get(), 1.0, -1.0);
+    CGContextDrawImage(
+        flipped_context.get(),
+        CGRectMake(0, 0, texture->GetSize().width, texture->GetSize().height),
+        image.get());
+    CGImagePtr flipped_image(CGBitmapContextCreateImage(flipped_context.get()),
+                             &CGImageRelease);
+    image.swap(flipped_image);
+  }
+
+  return std::make_unique<MetalScreenshot>(image.release());
+}
+}  // namespace
+
+VulkanScreenshotter::VulkanScreenshotter(
+    const std::unique_ptr<PlaygroundImpl>& playground)
+    : playground_(playground) {
+  FML_CHECK(playground_);
+}
+
+std::unique_ptr<Screenshot> VulkanScreenshotter::MakeScreenshot(
+    AiksContext& aiks_context,
+    const Picture& picture,
+    const ISize& size,
+    bool scale_content) {
+  Vector2 content_scale =
+      scale_content ? playground_->GetContentScale() : Vector2{1, 1};
+  std::shared_ptr<Image> image = picture.ToImage(
+      aiks_context,
+      ISize(size.width * content_scale.x, size.height * content_scale.y));
+  std::shared_ptr<Texture> texture = image->GetTexture();
+  return ReadTexture(aiks_context.GetContext(), texture);
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/golden_tests/working_directory.cc b/impeller/golden_tests/working_directory.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ac9e608cf98ade828feffab6962bf795a611582c
--- /dev/null
+++ b/impeller/golden_tests/working_directory.cc
@@ -0,0 +1,35 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/golden_tests/working_directory.h"
+
+#include "flutter/fml/paths.h"
+
+namespace impeller {
+namespace testing {
+
+WorkingDirectory* WorkingDirectory::instance_ = nullptr;
+
+WorkingDirectory::WorkingDirectory() {}
+
+WorkingDirectory* WorkingDirectory::Instance() {
+  if (!instance_) {
+    instance_ = new WorkingDirectory();
+  }
+  return instance_;
+}
+
+std::string WorkingDirectory::GetFilenamePath(
+    const std::string& filename) const {
+  return fml::paths::JoinPaths({path_, filename});
+}
+
+void WorkingDirectory::SetPath(const std::string& path) {
+  FML_CHECK(did_set_ == false);
+  path_ = path;
+  did_set_ = true;
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/golden_tests/working_directory.h b/impeller/golden_tests/working_directory.h
new file mode 100644
index 0000000000000000000000000000000000000000..e6de4ef36f8abd0b40a7040bcc165ed7b139017e
--- /dev/null
+++ b/impeller/golden_tests/working_directory.h
@@ -0,0 +1,40 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_GOLDEN_TESTS_WORKING_DIRECTORY_H_
+#define FLUTTER_IMPELLER_GOLDEN_TESTS_WORKING_DIRECTORY_H_
+
+#include <string>
+
+#include "flutter/fml/macros.h"
+
+namespace impeller {
+namespace testing {
+
+/// Keeps track of the global variable for the specified working
+/// directory.
+class WorkingDirectory {
+ public:
+  static WorkingDirectory* Instance();
+
+  std::string GetFilenamePath(const std::string& filename) const;
+
+  void SetPath(const std::string& path);
+
+  const std::string& GetPath() const { return path_; }
+
+ private:
+  WorkingDirectory(const WorkingDirectory&) = delete;
+
+  WorkingDirectory& operator=(const WorkingDirectory&) = delete;
+  WorkingDirectory();
+  static WorkingDirectory* instance_;
+  std::string path_;
+  bool did_set_ = false;
+};
+
+}  // namespace testing
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_GOLDEN_TESTS_WORKING_DIRECTORY_H_
diff --git a/impeller/playground/BUILD.gn b/impeller/playground/BUILD.gn
index 8940b5baef8f8e287249592fc7fedb943878b248..5635b155505b6c6fbf0ac0ceffc7568434750dc5 100644
--- a/impeller/playground/BUILD.gn
+++ b/impeller/playground/BUILD.gn
@@ -6,13 +6,21 @@ import("//flutter/impeller/tools/impeller.gni")
 import("//flutter/testing/testing.gni")
 
 impeller_component("playground") {
+  testonly = true
+
   sources = [
     "playground.cc",
     "playground.h",
     "playground_impl.cc",
     "playground_impl.h",
+    "switches.cc",
+    "switches.h",
     "widgets.cc",
     "widgets.h",
+
+    # Swiftshader is Vulkan backend specific but the utilities are not.
+    "backend/vulkan/swiftshader_utilities.cc",
+    "backend/vulkan/swiftshader_utilities.h",
   ]
 
   deps = [ "../renderer/backend" ]
@@ -39,18 +47,24 @@ impeller_component("playground") {
   }
 
   public_deps = [
-    "../entity:entity_shaders",
-    "../entity:modern_entity_shaders",
     "../fixtures:shader_fixtures",
     "../renderer",
     "../scene/shaders",
+    "image:image_skia_backend",
     "imgui:imgui_impeller_backend",
     "//flutter/fml",
-    "//third_party/glfw",
-    "//third_party/imgui:imgui_glfw",
+    "//flutter/testing:testing_lib",
+    "//flutter/third_party/glfw",
+    "//flutter/third_party/imgui:imgui_glfw",
   ]
 
-  public_configs = [ ":playground_config" ]
+  if (impeller_supports_rendering) {
+    public_deps += [
+      "../entity:entity_shaders",
+      "../entity:framebuffer_blend_entity_shaders",
+      "../entity:modern_entity_shaders",
+    ]
+  }
 
   if (is_mac) {
     frameworks = [
@@ -72,12 +86,6 @@ impeller_component("playground_test") {
 
   public_deps = [
     ":playground",
-    "//flutter/testing",
+    "//flutter/testing:testing_lib",
   ]
 }
-
-config("playground_config") {
-  if (impeller_enable_playground) {
-    defines = [ "IMPELLER_ENABLE_PLAYGROUND" ]
-  }
-}
diff --git a/impeller/playground/backend/gles/playground_impl_gles.cc b/impeller/playground/backend/gles/playground_impl_gles.cc
index 999ccfbae07e51951e51a93d4deab92af3e61261..4eb970a55a756ea8066108870410716b44fe8f2e 100644
--- a/impeller/playground/backend/gles/playground_impl_gles.cc
+++ b/impeller/playground/backend/gles/playground_impl_gles.cc
@@ -4,11 +4,19 @@
 
 #include "impeller/playground/backend/gles/playground_impl_gles.h"
 
+#define IMPELLER_PLAYGROUND_SUPPORTS_ANGLE FML_OS_MACOSX
+
+#if IMPELLER_PLAYGROUND_SUPPORTS_ANGLE
+#include <dlfcn.h>
+#endif
+
 #define GLFW_INCLUDE_NONE
 #include "third_party/glfw/include/GLFW/glfw3.h"
 
 #include "flutter/fml/build_config.h"
 #include "impeller/entity/gles/entity_shaders_gles.h"
+#include "impeller/entity/gles/framebuffer_blend_shaders_gles.h"
+#include "impeller/entity/gles/modern_shaders_gles.h"
 #include "impeller/fixtures/gles/fixtures_shaders_gles.h"
 #include "impeller/playground/imgui/gles/imgui_shaders_gles.h"
 #include "impeller/renderer/backend/gles/context_gles.h"
@@ -41,7 +49,9 @@ class PlaygroundImplGLES::ReactorWorker final : public ReactorGLES::Worker {
   mutable RWMutex mutex_;
   std::map<std::thread::id, bool> reactions_allowed_ IPLR_GUARDED_BY(mutex_);
 
-  FML_DISALLOW_COPY_AND_ASSIGN(ReactorWorker);
+  ReactorWorker(const ReactorWorker&) = delete;
+
+  ReactorWorker& operator=(const ReactorWorker&) = delete;
 };
 
 void PlaygroundImplGLES::DestroyWindowHandle(WindowHandle handle) {
@@ -51,24 +61,32 @@ void PlaygroundImplGLES::DestroyWindowHandle(WindowHandle handle) {
   ::glfwDestroyWindow(reinterpret_cast<GLFWwindow*>(handle));
 }
 
-PlaygroundImplGLES::PlaygroundImplGLES()
-    : handle_(nullptr, &DestroyWindowHandle),
-      worker_(std::shared_ptr<ReactorWorker>(new ReactorWorker())) {
+PlaygroundImplGLES::PlaygroundImplGLES(PlaygroundSwitches switches)
+    : PlaygroundImpl(switches),
+      handle_(nullptr, &DestroyWindowHandle),
+      worker_(std::shared_ptr<ReactorWorker>(new ReactorWorker())),
+      use_angle_(switches.use_angle) {
+  if (use_angle_) {
+#if IMPELLER_PLAYGROUND_SUPPORTS_ANGLE
+    angle_glesv2_ = dlopen("libGLESv2.dylib", RTLD_LAZY);
+#endif
+    FML_CHECK(angle_glesv2_ != nullptr);
+  }
+
   ::glfwDefaultWindowHints();
 
 #if FML_OS_MACOSX
-  // ES Profiles are not supported on Mac.
-  ::glfwWindowHint(GLFW_CLIENT_API, GLFW_OPENGL_API);
-#else   // FML_OS_MACOSX
+  FML_CHECK(use_angle_) << "Must use Angle on macOS for OpenGL ES.";
+  ::glfwWindowHint(GLFW_CONTEXT_CREATION_API, GLFW_EGL_CONTEXT_API);
+#endif  // FML_OS_MACOSX
   ::glfwWindowHint(GLFW_CLIENT_API, GLFW_OPENGL_ES_API);
   ::glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 2);
   ::glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);
-#endif  // FML_OS_MACOSX
   ::glfwWindowHint(GLFW_RED_BITS, 8);
   ::glfwWindowHint(GLFW_GREEN_BITS, 8);
   ::glfwWindowHint(GLFW_BLUE_BITS, 8);
   ::glfwWindowHint(GLFW_ALPHA_BITS, 8);
-  ::glfwWindowHint(GLFW_DEPTH_BITS, 0);    // no depth buffer
+  ::glfwWindowHint(GLFW_DEPTH_BITS, 32);   // 32 bit depth buffer
   ::glfwWindowHint(GLFW_STENCIL_BITS, 8);  // 8 bit stencil buffer
   ::glfwWindowHint(GLFW_SAMPLES, 4);       // 4xMSAA
 
@@ -90,6 +108,12 @@ ShaderLibraryMappingsForPlayground() {
       std::make_shared<fml::NonOwnedMapping>(
           impeller_entity_shaders_gles_data,
           impeller_entity_shaders_gles_length),
+      std::make_shared<fml::NonOwnedMapping>(
+          impeller_modern_shaders_gles_data,
+          impeller_modern_shaders_gles_length),
+      std::make_shared<fml::NonOwnedMapping>(
+          impeller_framebuffer_blend_shaders_gles_data,
+          impeller_framebuffer_blend_shaders_gles_length),
       std::make_shared<fml::NonOwnedMapping>(
           impeller_fixtures_shaders_gles_data,
           impeller_fixtures_shaders_gles_length),
@@ -102,17 +126,26 @@ ShaderLibraryMappingsForPlayground() {
 
 // |PlaygroundImpl|
 std::shared_ptr<Context> PlaygroundImplGLES::GetContext() const {
-  auto resolver = [](const char* name) -> void* {
-    return reinterpret_cast<void*>(::glfwGetProcAddress(name));
-  };
+  auto resolver = use_angle_ ? [](const char* name) -> void* {
+    void* symbol = nullptr;
+#if IMPELLER_PLAYGROUND_SUPPORTS_ANGLE
+    void* angle_glesv2 = dlopen("libGLESv2.dylib", RTLD_LAZY);
+    symbol = dlsym(angle_glesv2, name);
+#endif
+    FML_CHECK(symbol);
+    return symbol;
+  }
+  : [](const char* name) -> void* {
+      return reinterpret_cast<void*>(::glfwGetProcAddress(name));
+    };
   auto gl = std::make_unique<ProcTableGLES>(resolver);
   if (!gl->IsValid()) {
     FML_LOG(ERROR) << "Proc table when creating a playground was invalid.";
     return nullptr;
   }
 
-  auto context =
-      ContextGLES::Create(std::move(gl), ShaderLibraryMappingsForPlayground());
+  auto context = ContextGLES::Create(
+      std::move(gl), ShaderLibraryMappingsForPlayground(), true);
   if (!context) {
     FML_LOG(ERROR) << "Could not create context.";
     return nullptr;
@@ -153,4 +186,11 @@ std::unique_ptr<Surface> PlaygroundImplGLES::AcquireSurfaceFrame(
   );
 }
 
+fml::Status PlaygroundImplGLES::SetCapabilities(
+    const std::shared_ptr<Capabilities>& capabilities) {
+  return fml::Status(
+      fml::StatusCode::kUnimplemented,
+      "PlaygroundImplGLES doesn't support setting the capabilities.");
+}
+
 }  // namespace impeller
diff --git a/impeller/playground/backend/gles/playground_impl_gles.h b/impeller/playground/backend/gles/playground_impl_gles.h
index 9540d1460e6a9c70eb3c5ba71ab7ff9d0db6b93f..21a51fd9ab8073b17e0ee264be91f40e902e927a 100644
--- a/impeller/playground/backend/gles/playground_impl_gles.h
+++ b/impeller/playground/backend/gles/playground_impl_gles.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_PLAYGROUND_BACKEND_GLES_PLAYGROUND_IMPL_GLES_H_
+#define FLUTTER_IMPELLER_PLAYGROUND_BACKEND_GLES_PLAYGROUND_IMPL_GLES_H_
 
 #include "flutter/fml/macros.h"
 #include "impeller/playground/playground_impl.h"
@@ -11,10 +12,13 @@ namespace impeller {
 
 class PlaygroundImplGLES final : public PlaygroundImpl {
  public:
-  PlaygroundImplGLES();
+  explicit PlaygroundImplGLES(PlaygroundSwitches switches);
 
   ~PlaygroundImplGLES();
 
+  fml::Status SetCapabilities(
+      const std::shared_ptr<Capabilities>& capabilities) override;
+
  private:
   class ReactorWorker;
 
@@ -22,6 +26,8 @@ class PlaygroundImplGLES final : public PlaygroundImpl {
   using UniqueHandle = std::unique_ptr<void, decltype(&DestroyWindowHandle)>;
   UniqueHandle handle_;
   std::shared_ptr<ReactorWorker> worker_;
+  const bool use_angle_;
+  void* angle_glesv2_;
 
   // |PlaygroundImpl|
   std::shared_ptr<Context> GetContext() const override;
@@ -33,7 +39,11 @@ class PlaygroundImplGLES final : public PlaygroundImpl {
   std::unique_ptr<Surface> AcquireSurfaceFrame(
       std::shared_ptr<Context> context) override;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(PlaygroundImplGLES);
+  PlaygroundImplGLES(const PlaygroundImplGLES&) = delete;
+
+  PlaygroundImplGLES& operator=(const PlaygroundImplGLES&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_PLAYGROUND_BACKEND_GLES_PLAYGROUND_IMPL_GLES_H_
diff --git a/impeller/playground/backend/metal/playground_impl_mtl.h b/impeller/playground/backend/metal/playground_impl_mtl.h
index 345574ebe16ac573e83f6213667f925d8ae6c3fc..9d8698d2857d754ee4125e54e2a93d063506d367 100644
--- a/impeller/playground/backend/metal/playground_impl_mtl.h
+++ b/impeller/playground/backend/metal/playground_impl_mtl.h
@@ -2,21 +2,30 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_PLAYGROUND_BACKEND_METAL_PLAYGROUND_IMPL_MTL_H_
+#define FLUTTER_IMPELLER_PLAYGROUND_BACKEND_METAL_PLAYGROUND_IMPL_MTL_H_
 
 #include <memory>
 
+#include "flutter/fml/concurrent_message_loop.h"
 #include "flutter/fml/macros.h"
+#include "flutter/fml/synchronization/sync_switch.h"
 #include "impeller/playground/playground_impl.h"
 
 namespace impeller {
 
+// Forward declared to avoid objc in a C++ header.
+class ContextMTL;
+
 class PlaygroundImplMTL final : public PlaygroundImpl {
  public:
-  PlaygroundImplMTL();
+  explicit PlaygroundImplMTL(PlaygroundSwitches switches);
 
   ~PlaygroundImplMTL();
 
+  fml::Status SetCapabilities(
+      const std::shared_ptr<Capabilities>& capabilities) override;
+
  private:
   struct Data;
 
@@ -26,7 +35,9 @@ class PlaygroundImplMTL final : public PlaygroundImpl {
 
   // To ensure that ObjC stuff doesn't leak into C++ TUs.
   std::unique_ptr<Data> data_;
-  std::shared_ptr<Context> context_;
+  std::shared_ptr<ContextMTL> context_;
+  std::shared_ptr<fml::ConcurrentMessageLoop> concurrent_loop_;
+  std::shared_ptr<const fml::SyncSwitch> is_gpu_disabled_sync_switch_;
 
   // |PlaygroundImpl|
   std::shared_ptr<Context> GetContext() const override;
@@ -38,7 +49,11 @@ class PlaygroundImplMTL final : public PlaygroundImpl {
   std::unique_ptr<Surface> AcquireSurfaceFrame(
       std::shared_ptr<Context> context) override;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(PlaygroundImplMTL);
+  PlaygroundImplMTL(const PlaygroundImplMTL&) = delete;
+
+  PlaygroundImplMTL& operator=(const PlaygroundImplMTL&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_PLAYGROUND_BACKEND_METAL_PLAYGROUND_IMPL_MTL_H_
diff --git a/impeller/playground/backend/metal/playground_impl_mtl.mm b/impeller/playground/backend/metal/playground_impl_mtl.mm
index c3f9e0c33d8e469b6e1245691a66b5f4c40fdccc..421d6eba3c46b62da2c84a939f6f3f16a25a8bd0 100644
--- a/impeller/playground/backend/metal/playground_impl_mtl.mm
+++ b/impeller/playground/backend/metal/playground_impl_mtl.mm
@@ -15,6 +15,7 @@
 
 #include "flutter/fml/mapping.h"
 #include "impeller/entity/mtl/entity_shaders.h"
+#include "impeller/entity/mtl/framebuffer_blend_shaders.h"
 #include "impeller/entity/mtl/modern_shaders.h"
 #include "impeller/fixtures/mtl/fixtures_shaders.h"
 #include "impeller/playground/imgui/mtl/imgui_shaders.h"
@@ -22,6 +23,7 @@
 #include "impeller/renderer/backend/metal/formats_mtl.h"
 #include "impeller/renderer/backend/metal/surface_mtl.h"
 #include "impeller/renderer/backend/metal/texture_mtl.h"
+#include "impeller/renderer/mtl/compute_shaders.h"
 #include "impeller/scene/shaders/mtl/scene_shaders.h"
 
 namespace impeller {
@@ -32,17 +34,21 @@ struct PlaygroundImplMTL::Data {
 
 static std::vector<std::shared_ptr<fml::Mapping>>
 ShaderLibraryMappingsForPlayground() {
-  return {
-      std::make_shared<fml::NonOwnedMapping>(impeller_entity_shaders_data,
-                                             impeller_entity_shaders_length),
-      std::make_shared<fml::NonOwnedMapping>(impeller_modern_shaders_data,
-                                             impeller_modern_shaders_length),
-      std::make_shared<fml::NonOwnedMapping>(impeller_fixtures_shaders_data,
-                                             impeller_fixtures_shaders_length),
-      std::make_shared<fml::NonOwnedMapping>(impeller_imgui_shaders_data,
-                                             impeller_imgui_shaders_length),
-      std::make_shared<fml::NonOwnedMapping>(impeller_scene_shaders_data,
-                                             impeller_scene_shaders_length),
+  return {std::make_shared<fml::NonOwnedMapping>(
+              impeller_entity_shaders_data, impeller_entity_shaders_length),
+          std::make_shared<fml::NonOwnedMapping>(
+              impeller_modern_shaders_data, impeller_modern_shaders_length),
+          std::make_shared<fml::NonOwnedMapping>(
+              impeller_framebuffer_blend_shaders_data,
+              impeller_framebuffer_blend_shaders_length),
+          std::make_shared<fml::NonOwnedMapping>(
+              impeller_fixtures_shaders_data, impeller_fixtures_shaders_length),
+          std::make_shared<fml::NonOwnedMapping>(impeller_imgui_shaders_data,
+                                                 impeller_imgui_shaders_length),
+          std::make_shared<fml::NonOwnedMapping>(impeller_scene_shaders_data,
+                                                 impeller_scene_shaders_length),
+          std::make_shared<fml::NonOwnedMapping>(
+              impeller_compute_shaders_data, impeller_compute_shaders_length)
 
   };
 }
@@ -54,8 +60,12 @@ void PlaygroundImplMTL::DestroyWindowHandle(WindowHandle handle) {
   ::glfwDestroyWindow(reinterpret_cast<GLFWwindow*>(handle));
 }
 
-PlaygroundImplMTL::PlaygroundImplMTL()
-    : handle_(nullptr, &DestroyWindowHandle), data_(std::make_unique<Data>()) {
+PlaygroundImplMTL::PlaygroundImplMTL(PlaygroundSwitches switches)
+    : PlaygroundImpl(switches),
+      handle_(nullptr, &DestroyWindowHandle),
+      data_(std::make_unique<Data>()),
+      concurrent_loop_(fml::ConcurrentMessageLoop::Create()),
+      is_gpu_disabled_sync_switch_(new fml::SyncSwitch(false)) {
   ::glfwDefaultWindowHints();
   ::glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
   ::glfwWindowHint(GLFW_VISIBLE, GLFW_FALSE);
@@ -63,8 +73,9 @@ PlaygroundImplMTL::PlaygroundImplMTL()
   if (!window) {
     return;
   }
-  auto context = ContextMTL::Create(ShaderLibraryMappingsForPlayground(),
-                                    "Playground Library");
+  auto context =
+      ContextMTL::Create(ShaderLibraryMappingsForPlayground(),
+                         is_gpu_disabled_sync_switch_, "Playground Library");
   if (!context) {
     return;
   }
@@ -74,8 +85,8 @@ PlaygroundImplMTL::PlaygroundImplMTL()
   }
   data_->metal_layer = [CAMetalLayer layer];
   data_->metal_layer.device = ContextMTL::Cast(*context).GetMTLDevice();
-  // This pixel format is one of the documented supported formats.
-  data_->metal_layer.pixelFormat = ToMTLPixelFormat(PixelFormat::kDefaultColor);
+  data_->metal_layer.pixelFormat =
+      ToMTLPixelFormat(context->GetCapabilities()->GetDefaultColorFormat());
   data_->metal_layer.framebufferOnly = NO;
   cocoa_window.contentView.layer = data_->metal_layer;
   cocoa_window.contentView.wantsLayer = YES;
@@ -107,7 +118,15 @@ std::unique_ptr<Surface> PlaygroundImplMTL::AcquireSurfaceFrame(
   data_->metal_layer.drawableSize =
       CGSizeMake(layer_size.width * scale.x, layer_size.height * scale.y);
 
-  return SurfaceMTL::WrapCurrentMetalLayerDrawable(context, data_->metal_layer);
+  auto drawable =
+      SurfaceMTL::GetMetalDrawableAndValidate(context, data_->metal_layer);
+  return SurfaceMTL::MakeFromMetalLayerDrawable(context, drawable);
+}
+
+fml::Status PlaygroundImplMTL::SetCapabilities(
+    const std::shared_ptr<Capabilities>& capabilities) {
+  context_->SetCapabilities(capabilities);
+  return fml::Status();
 }
 
 }  // namespace impeller
diff --git a/impeller/playground/backend/vulkan/playground_impl_vk.cc b/impeller/playground/backend/vulkan/playground_impl_vk.cc
index 3b045b35d4516b989bf8c4ab2e5f72ce160339ba..def2fc5d1ff7657a119899ebfaa44963a6cb42d1 100644
--- a/impeller/playground/backend/vulkan/playground_impl_vk.cc
+++ b/impeller/playground/backend/vulkan/playground_impl_vk.cc
@@ -4,6 +4,7 @@
 
 #include "impeller/playground/backend/vulkan/playground_impl_vk.h"
 
+#include "flutter/fml/paths.h"
 #include "impeller/renderer/backend/vulkan/vk.h"
 
 #define GLFW_INCLUDE_VULKAN
@@ -12,13 +13,16 @@
 #include "flutter/fml/logging.h"
 #include "flutter/fml/mapping.h"
 #include "impeller/entity/vk/entity_shaders_vk.h"
+#include "impeller/entity/vk/framebuffer_blend_shaders_vk.h"
 #include "impeller/entity/vk/modern_shaders_vk.h"
 #include "impeller/fixtures/vk/fixtures_shaders_vk.h"
 #include "impeller/playground/imgui/vk/imgui_shaders_vk.h"
 #include "impeller/renderer/backend/vulkan/context_vk.h"
 #include "impeller/renderer/backend/vulkan/formats_vk.h"
-#include "impeller/renderer/backend/vulkan/surface_vk.h"
+#include "impeller/renderer/backend/vulkan/surface_context_vk.h"
+#include "impeller/renderer/backend/vulkan/swapchain/khr/khr_surface_vk.h"
 #include "impeller/renderer/backend/vulkan/texture_vk.h"
+#include "impeller/renderer/vk/compute_shaders_vk.h"
 #include "impeller/scene/shaders/vk/scene_shaders_vk.h"
 
 namespace impeller {
@@ -30,6 +34,9 @@ ShaderLibraryMappingsForPlayground() {
                                              impeller_entity_shaders_vk_length),
       std::make_shared<fml::NonOwnedMapping>(impeller_modern_shaders_vk_data,
                                              impeller_modern_shaders_vk_length),
+      std::make_shared<fml::NonOwnedMapping>(
+          impeller_framebuffer_blend_shaders_vk_data,
+          impeller_framebuffer_blend_shaders_vk_length),
       std::make_shared<fml::NonOwnedMapping>(
           impeller_fixtures_shaders_vk_data,
           impeller_fixtures_shaders_vk_length),
@@ -37,10 +44,13 @@ ShaderLibraryMappingsForPlayground() {
                                              impeller_imgui_shaders_vk_length),
       std::make_shared<fml::NonOwnedMapping>(impeller_scene_shaders_vk_data,
                                              impeller_scene_shaders_vk_length),
-
+      std::make_shared<fml::NonOwnedMapping>(
+          impeller_compute_shaders_vk_data, impeller_compute_shaders_vk_length),
   };
 }
 
+vk::UniqueInstance PlaygroundImplVK::global_instance_;
+
 void PlaygroundImplVK::DestroyWindowHandle(WindowHandle handle) {
   if (!handle) {
     return;
@@ -48,61 +58,64 @@ void PlaygroundImplVK::DestroyWindowHandle(WindowHandle handle) {
   ::glfwDestroyWindow(reinterpret_cast<GLFWwindow*>(handle));
 }
 
-PlaygroundImplVK::PlaygroundImplVK()
-    : concurrent_loop_(fml::ConcurrentMessageLoop::Create()),
-      handle_(nullptr, &DestroyWindowHandle) {
-  if (!::glfwVulkanSupported()) {
-    VALIDATION_LOG << "Attempted to initialize a Vulkan playground on a system "
-                      "that does not support Vulkan.";
-    return;
-  }
+PlaygroundImplVK::PlaygroundImplVK(PlaygroundSwitches switches)
+    : PlaygroundImpl(switches), handle_(nullptr, &DestroyWindowHandle) {
+  FML_CHECK(IsVulkanDriverPresent());
+
+  InitGlobalVulkanInstance();
 
   ::glfwDefaultWindowHints();
   ::glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
-  ::glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE);
   ::glfwWindowHint(GLFW_VISIBLE, GLFW_FALSE);
 
-  auto window =
-      ::glfwCreateWindow(800, 600, "Test Vulkan Window", nullptr, nullptr);
+  auto window = ::glfwCreateWindow(1, 1, "Test", nullptr, nullptr);
   if (!window) {
     VALIDATION_LOG << "Unable to create glfw window";
     return;
   }
 
+  int width = 0;
+  int height = 0;
+  ::glfwGetWindowSize(window, &width, &height);
+  size_ = ISize{width, height};
+
   handle_.reset(window);
 
-  auto context = ContextVK::Create(reinterpret_cast<PFN_vkGetInstanceProcAddr>(
-                                       &::glfwGetInstanceProcAddress),    //
-                                   ShaderLibraryMappingsForPlayground(),  //
-                                   nullptr,                               //
-                                   concurrent_loop_->GetTaskRunner(),     //
-                                   "Playground Library"                   //
-  );
+  ContextVK::Settings context_settings;
+  context_settings.proc_address_callback =
+      reinterpret_cast<PFN_vkGetInstanceProcAddr>(
+          &::glfwGetInstanceProcAddress);
+  context_settings.shader_libraries_data = ShaderLibraryMappingsForPlayground();
+  context_settings.cache_directory = fml::paths::GetCachesDirectory();
+  context_settings.enable_validation = switches_.enable_vulkan_validation;
 
-  if (!context || !context->IsValid()) {
+  auto context_vk = ContextVK::Create(std::move(context_settings));
+  if (!context_vk || !context_vk->IsValid()) {
     VALIDATION_LOG << "Could not create Vulkan context in the playground.";
     return;
   }
 
-  context_ = std::move(context);
-
-  SetupSwapchain();
-}
-
-void PlaygroundImplVK::SetupSwapchain() {
-  ContextVK* context_vk = reinterpret_cast<ContextVK*>(context_.get());
-  auto window = reinterpret_cast<GLFWwindow*>(handle_.get());
-  vk::Instance instance = context_vk->GetInstance();
-  VkSurfaceKHR surface_tmp;
-  auto res = vk::Result{
-      ::glfwCreateWindowSurface(instance, window, nullptr, &surface_tmp)};
+  VkSurfaceKHR vk_surface;
+  auto res = vk::Result{::glfwCreateWindowSurface(
+      context_vk->GetInstance(),  // instance
+      window,                     // window
+      nullptr,                    // allocator
+      &vk_surface                 // surface
+      )};
   if (res != vk::Result::eSuccess) {
     VALIDATION_LOG << "Could not create surface for GLFW window: "
                    << vk::to_string(res);
     return;
   }
-  vk::UniqueSurfaceKHR surface{surface_tmp, instance};
-  context_vk->SetupSwapchain(std::move(surface));
+
+  vk::UniqueSurfaceKHR surface{vk_surface, context_vk->GetInstance()};
+  auto context = context_vk->CreateSurfaceContext();
+  if (!context->SetWindowSurface(std::move(surface), size_)) {
+    VALIDATION_LOG << "Could not set up surface for context.";
+    return;
+  }
+
+  context_ = std::move(context);
 }
 
 PlaygroundImplVK::~PlaygroundImplVK() = default;
@@ -120,8 +133,100 @@ PlaygroundImpl::WindowHandle PlaygroundImplVK::GetWindowHandle() const {
 // |PlaygroundImpl|
 std::unique_ptr<Surface> PlaygroundImplVK::AcquireSurfaceFrame(
     std::shared_ptr<Context> context) {
-  ContextVK* context_vk = reinterpret_cast<ContextVK*>(context_.get());
-  return context_vk->AcquireSurface(current_frame_++);
+  SurfaceContextVK* surface_context_vk =
+      reinterpret_cast<SurfaceContextVK*>(context_.get());
+
+  int width = 0;
+  int height = 0;
+  ::glfwGetFramebufferSize(reinterpret_cast<GLFWwindow*>(handle_.get()), &width,
+                           &height);
+  size_ = ISize{width, height};
+  surface_context_vk->UpdateSurfaceSize(ISize{width, height});
+
+  return surface_context_vk->AcquireNextSurface();
+}
+
+// Create a global instance of Vulkan in order to prevent unloading of the
+// Vulkan library.
+// A test suite may repeatedly create and destroy PlaygroundImplVK instances,
+// and if the PlaygroundImplVK's Vulkan instance is the only one in the
+// process then the Vulkan library will be unloaded when the instance is
+// destroyed.  Repeated loading and unloading of SwiftShader was leaking
+// resources, so this will work around that leak.
+// (see https://github.com/flutter/flutter/issues/138028)
+void PlaygroundImplVK::InitGlobalVulkanInstance() {
+  if (global_instance_) {
+    return;
+  }
+
+  VULKAN_HPP_DEFAULT_DISPATCHER.init(::glfwGetInstanceProcAddress);
+
+  vk::ApplicationInfo application_info;
+  application_info.setApplicationVersion(VK_API_VERSION_1_0);
+  application_info.setApiVersion(VK_API_VERSION_1_1);
+  application_info.setEngineVersion(VK_API_VERSION_1_0);
+  application_info.setPEngineName("PlaygroundImplVK");
+  application_info.setPApplicationName("PlaygroundImplVK");
+
+  auto caps = std::shared_ptr<CapabilitiesVK>(
+      new CapabilitiesVK(/*enable_validations=*/true));
+  FML_DCHECK(caps->IsValid());
+
+  std::optional<std::vector<std::string>> enabled_layers =
+      caps->GetEnabledLayers();
+  std::optional<std::vector<std::string>> enabled_extensions =
+      caps->GetEnabledInstanceExtensions();
+  FML_DCHECK(enabled_layers.has_value() && enabled_extensions.has_value());
+
+  std::vector<const char*> enabled_layers_c;
+  std::vector<const char*> enabled_extensions_c;
+
+  if (enabled_layers.has_value()) {
+    for (const auto& layer : enabled_layers.value()) {
+      enabled_layers_c.push_back(layer.c_str());
+    }
+  }
+
+  if (enabled_extensions.has_value()) {
+    for (const auto& ext : enabled_extensions.value()) {
+      enabled_extensions_c.push_back(ext.c_str());
+    }
+  }
+
+  vk::InstanceCreateFlags instance_flags = {};
+  instance_flags |= vk::InstanceCreateFlagBits::eEnumeratePortabilityKHR;
+  vk::InstanceCreateInfo instance_info;
+  instance_info.setPEnabledLayerNames(enabled_layers_c);
+  instance_info.setPEnabledExtensionNames(enabled_extensions_c);
+  instance_info.setPApplicationInfo(&application_info);
+  instance_info.setFlags(instance_flags);
+  auto instance_result = vk::createInstanceUnique(instance_info);
+  FML_CHECK(instance_result.result == vk::Result::eSuccess)
+      << "Unable to initialize global Vulkan instance";
+  global_instance_ = std::move(instance_result.value);
+}
+
+fml::Status PlaygroundImplVK::SetCapabilities(
+    const std::shared_ptr<Capabilities>& capabilities) {
+  return fml::Status(
+      fml::StatusCode::kUnimplemented,
+      "PlaygroundImplVK doesn't support setting the capabilities.");
+}
+
+bool PlaygroundImplVK::IsVulkanDriverPresent() {
+  if (::glfwVulkanSupported()) {
+    return true;
+  }
+#ifdef TARGET_OS_MAC
+  FML_LOG(ERROR) << "Attempting to initialize a Vulkan playground on macOS "
+                    "where Vulkan cannot be found. It can be installed via "
+                    "MoltenVK and make sure to install it globally so "
+                    "dlopen can find it.";
+#else   // TARGET_OS_MAC
+  FML_LOG(ERROR) << "Attempting to initialize a Vulkan playground on a system "
+                    "that does not support Vulkan.";
+#endif  // TARGET_OS_MAC
+  return false;
 }
 
 }  // namespace impeller
diff --git a/impeller/playground/backend/vulkan/playground_impl_vk.h b/impeller/playground/backend/vulkan/playground_impl_vk.h
index 37c847a92a99e79c4895cf30d84ef1e851e12ce1..774030df1ed74e099e7d2be92690c6904b1d857e 100644
--- a/impeller/playground/backend/vulkan/playground_impl_vk.h
+++ b/impeller/playground/backend/vulkan/playground_impl_vk.h
@@ -2,31 +2,37 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_PLAYGROUND_BACKEND_VULKAN_PLAYGROUND_IMPL_VK_H_
+#define FLUTTER_IMPELLER_PLAYGROUND_BACKEND_VULKAN_PLAYGROUND_IMPL_VK_H_
 
-#include "flutter/fml/concurrent_message_loop.h"
-#include "flutter/fml/macros.h"
 #include "impeller/playground/playground_impl.h"
-#include "impeller/renderer/backend/vulkan/swapchain_vk.h"
 #include "impeller/renderer/backend/vulkan/vk.h"
 
 namespace impeller {
 
 class PlaygroundImplVK final : public PlaygroundImpl {
  public:
-  PlaygroundImplVK();
+  static bool IsVulkanDriverPresent();
+
+  explicit PlaygroundImplVK(PlaygroundSwitches switches);
 
   ~PlaygroundImplVK();
 
+  fml::Status SetCapabilities(
+      const std::shared_ptr<Capabilities>& capabilities) override;
+
  private:
-  std::shared_ptr<fml::ConcurrentMessageLoop> concurrent_loop_;
   std::shared_ptr<Context> context_;
-  size_t current_frame_ = 0;
 
-  // windows
+  // Windows management.
   static void DestroyWindowHandle(WindowHandle handle);
   using UniqueHandle = std::unique_ptr<void, decltype(&DestroyWindowHandle)>;
   UniqueHandle handle_;
+  ISize size_ = {1, 1};
+
+  // A global Vulkan instance which ensures that the Vulkan library will remain
+  // loaded throughout the lifetime of the process.
+  static vk::UniqueInstance global_instance_;
 
   // |PlaygroundImpl|
   std::shared_ptr<Context> GetContext() const override;
@@ -38,9 +44,13 @@ class PlaygroundImplVK final : public PlaygroundImpl {
   std::unique_ptr<Surface> AcquireSurfaceFrame(
       std::shared_ptr<Context> context) override;
 
-  void SetupSwapchain();
+  PlaygroundImplVK(const PlaygroundImplVK&) = delete;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(PlaygroundImplVK);
+  PlaygroundImplVK& operator=(const PlaygroundImplVK&) = delete;
+
+  static void InitGlobalVulkanInstance();
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_PLAYGROUND_BACKEND_VULKAN_PLAYGROUND_IMPL_VK_H_
diff --git a/impeller/playground/backend/vulkan/swiftshader_utilities.cc b/impeller/playground/backend/vulkan/swiftshader_utilities.cc
new file mode 100644
index 0000000000000000000000000000000000000000..96e5ad6f0c5e8a0980f00911be11ab9bd3676fdc
--- /dev/null
+++ b/impeller/playground/backend/vulkan/swiftshader_utilities.cc
@@ -0,0 +1,68 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/impeller/playground/backend/vulkan/swiftshader_utilities.h"
+
+#include <cstdlib>
+
+#include "flutter/fml/build_config.h"
+#include "flutter/fml/file.h"
+#include "flutter/fml/logging.h"
+#include "flutter/fml/paths.h"
+
+#if FML_OS_WIN
+#include <Windows.h>
+#endif  // FML_OS_WIN
+
+namespace impeller {
+
+static void FindSwiftShaderICDAtKnownPaths() {
+  static constexpr const char* kSwiftShaderICDJSON = "vk_swiftshader_icd.json";
+  static constexpr const char* kVulkanICDFileNamesEnvVariableKey =
+      "VK_ICD_FILENAMES";
+  const auto executable_directory_path =
+      fml::paths::GetExecutableDirectoryPath();
+  FML_CHECK(executable_directory_path.first);
+  const auto executable_directory =
+      fml::OpenDirectory(executable_directory_path.second.c_str(), false,
+                         fml::FilePermission::kRead);
+  FML_CHECK(executable_directory.is_valid());
+  if (fml::FileExists(executable_directory, kSwiftShaderICDJSON)) {
+    const auto icd_path = fml::paths::JoinPaths(
+        {executable_directory_path.second, kSwiftShaderICDJSON});
+#if FML_OS_WIN
+    const auto success =
+        ::SetEnvironmentVariableA(kVulkanICDFileNamesEnvVariableKey,  //
+                                  icd_path.c_str()                    //
+                                  ) != 0;
+#else   // FML_OS_WIN
+    const auto success = ::setenv(kVulkanICDFileNamesEnvVariableKey,  //
+                                  icd_path.c_str(),                   //
+                                  1  // overwrite
+                                  ) == 0;
+#endif  // FML_OS_WIN
+    FML_CHECK(success)
+        << "Could not set the environment variable to use SwiftShader.";
+  } else {
+    FML_CHECK(false)
+        << "Was asked to use SwiftShader but could not find the installable "
+           "client driver (ICD) for the locally built SwiftShader.";
+  }
+}
+
+void SetupSwiftshaderOnce(bool use_swiftshader) {
+  static bool swiftshader_preference = false;
+  static std::once_flag sOnceInitializer;
+  std::call_once(sOnceInitializer, [use_swiftshader]() {
+    if (use_swiftshader) {
+      FindSwiftShaderICDAtKnownPaths();
+      swiftshader_preference = use_swiftshader;
+    }
+  });
+  FML_CHECK(swiftshader_preference == use_swiftshader)
+      << "The option to use SwiftShader in a process can only be set once and "
+         "may not be changed later.";
+}
+
+}  // namespace impeller
diff --git a/impeller/playground/backend/vulkan/swiftshader_utilities.h b/impeller/playground/backend/vulkan/swiftshader_utilities.h
new file mode 100644
index 0000000000000000000000000000000000000000..5331ed69550dd1fb74191a8233dbaeaa62dc05b8
--- /dev/null
+++ b/impeller/playground/backend/vulkan/swiftshader_utilities.h
@@ -0,0 +1,26 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_PLAYGROUND_BACKEND_VULKAN_SWIFTSHADER_UTILITIES_H_
+#define FLUTTER_IMPELLER_PLAYGROUND_BACKEND_VULKAN_SWIFTSHADER_UTILITIES_H_
+
+namespace impeller {
+
+//------------------------------------------------------------------------------
+/// @brief      Find and setup the installable client driver for a locally built
+///             SwiftShader at known paths. The option to use SwiftShader can
+///             only be used once in the process. While calling this method
+///             multiple times is fine, specifying a different use_swiftshader
+///             value will trip an assertion.
+///
+/// @warning    This call must be made before any Vulkan contexts are created in
+///             the process.
+///
+/// @param[in]  use_swiftshader  If SwiftShader should be used.
+///
+void SetupSwiftshaderOnce(bool use_swiftshader);
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_PLAYGROUND_BACKEND_VULKAN_SWIFTSHADER_UTILITIES_H_
diff --git a/impeller/playground/compute_playground_test.cc b/impeller/playground/compute_playground_test.cc
index 8405bb668706f457b2078f931ce61c11031a4ff8..3df0e62a7260e67a11bd6018e8faba060f713d60 100644
--- a/impeller/playground/compute_playground_test.cc
+++ b/impeller/playground/compute_playground_test.cc
@@ -4,11 +4,13 @@
 
 #include "flutter/fml/time/time_point.h"
 
+#include "flutter/testing/test_args.h"
 #include "impeller/playground/compute_playground_test.h"
 
 namespace impeller {
 
-ComputePlaygroundTest::ComputePlaygroundTest() = default;
+ComputePlaygroundTest::ComputePlaygroundTest()
+    : Playground(PlaygroundSwitches{flutter::testing::GetArgsForProcess()}) {}
 
 ComputePlaygroundTest::~ComputePlaygroundTest() = default;
 
@@ -24,6 +26,7 @@ void ComputePlaygroundTest::SetUp() {
   }
 
   SetupContext(GetParam());
+  SetupWindow();
 
   start_time_ = fml::TimePoint::Now().ToEpochDelta();
 }
@@ -38,23 +41,9 @@ std::unique_ptr<fml::Mapping> ComputePlaygroundTest::OpenAssetAsMapping(
   return flutter::testing::OpenFixtureAsMapping(asset_name);
 }
 
-std::shared_ptr<RuntimeStage> ComputePlaygroundTest::OpenAssetAsRuntimeStage(
-    const char* asset_name) const {
-  auto fixture = flutter::testing::OpenFixtureAsMapping(asset_name);
-  if (!fixture || fixture->GetSize() == 0) {
-    return nullptr;
-  }
-  auto stage = std::make_unique<RuntimeStage>(std::move(fixture));
-  if (!stage->IsValid()) {
-    return nullptr;
-  }
-  return stage;
-}
-
 static std::string FormatWindowTitle(const std::string& test_name) {
   std::stringstream stream;
-  stream << "Impeller Playground for '" << test_name
-         << "' (Press ESC or 'q' to quit)";
+  stream << "Impeller Playground for '" << test_name << "' (Press ESC to quit)";
   return stream.str();
 }
 
@@ -63,8 +52,4 @@ std::string ComputePlaygroundTest::GetWindowTitle() const {
   return FormatWindowTitle(flutter::testing::GetCurrentTestName());
 }
 
-Scalar ComputePlaygroundTest::GetSecondsElapsed() const {
-  return (fml::TimePoint::Now().ToEpochDelta() - start_time_).ToSecondsF();
-}
-
 }  // namespace impeller
diff --git a/impeller/playground/compute_playground_test.h b/impeller/playground/compute_playground_test.h
index 93cff4ce2f86adf766ddc0c8ae13f362b6a1dd43..66d1858749d5cf94f3e32eb7fd7b54dae32de3f2 100644
--- a/impeller/playground/compute_playground_test.h
+++ b/impeller/playground/compute_playground_test.h
@@ -2,13 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_PLAYGROUND_COMPUTE_PLAYGROUND_TEST_H_
+#define FLUTTER_IMPELLER_PLAYGROUND_COMPUTE_PLAYGROUND_TEST_H_
 
 #include <memory>
 
 #include "flutter/fml/macros.h"
 #include "flutter/fml/time/time_delta.h"
 #include "flutter/testing/testing.h"
+#include "impeller/core/device_buffer.h"
 #include "impeller/geometry/scalar.h"
 #include "impeller/playground/playground.h"
 
@@ -30,26 +32,37 @@ class ComputePlaygroundTest
   std::unique_ptr<fml::Mapping> OpenAssetAsMapping(
       std::string asset_name) const override;
 
-  std::shared_ptr<RuntimeStage> OpenAssetAsRuntimeStage(
-      const char* asset_name) const;
-
   // |Playground|
   std::string GetWindowTitle() const override;
 
-  /// @brief Get the amount of time elapsed from the start of the playground
-  ///        test's execution.
-  Scalar GetSecondsElapsed() const;
+  template <typename T>
+  std::shared_ptr<DeviceBuffer> CreateHostVisibleDeviceBuffer(
+      const std::shared_ptr<Context>& context,
+      const std::string& label) {
+    DeviceBufferDescriptor desc;
+    desc.storage_mode = StorageMode::kHostVisible;
+    desc.size = sizeof(T);
+    auto buffer = context->GetResourceAllocator()->CreateBuffer(desc);
+    buffer->SetLabel(label);
+    return buffer;
+  }
 
  private:
   fml::TimeDelta start_time_;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(ComputePlaygroundTest);
+  ComputePlaygroundTest(const ComputePlaygroundTest&) = delete;
+
+  ComputePlaygroundTest& operator=(const ComputePlaygroundTest&) = delete;
 };
 
 #define INSTANTIATE_COMPUTE_SUITE(playground)                              \
   INSTANTIATE_TEST_SUITE_P(                                                \
-      Compute, playground, ::testing::Values(PlaygroundBackend::kMetal),   \
+      Compute, playground,                                                 \
+      ::testing::Values(PlaygroundBackend::kMetal,                         \
+                        PlaygroundBackend::kVulkan),                       \
       [](const ::testing::TestParamInfo<ComputePlaygroundTest::ParamType>& \
              info) { return PlaygroundBackendToString(info.param); });
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_PLAYGROUND_COMPUTE_PLAYGROUND_TEST_H_
diff --git a/impeller/image/BUILD.gn b/impeller/playground/image/BUILD.gn
similarity index 60%
rename from impeller/image/BUILD.gn
rename to impeller/playground/image/BUILD.gn
index 0343f0604c5f5425660b123cd8f6b70c8e29ef02..ed44158f9b2fd3864e26487468d68e6ea07cc0b8 100644
--- a/impeller/image/BUILD.gn
+++ b/impeller/playground/image/BUILD.gn
@@ -5,34 +5,39 @@
 import("//flutter/impeller/tools/impeller.gni")
 
 impeller_component("image") {
+  testonly = true
   public = [
     "compressed_image.h",
     "decompressed_image.h",
   ]
 
   sources = [
-    "backends/skia/compressed_image_skia.cc",
-    "backends/skia/compressed_image_skia.h",
     "compressed_image.cc",
     "decompressed_image.cc",
   ]
 
   public_deps = [
-    "../base",
-    "../geometry",
+    "../../base",
+    "../../geometry",
   ]
 
-  deps = [
-    "//flutter/fml",
-    "//third_party/skia",
-  ]
+  deps = [ "//flutter/fml" ]
 }
 
-impeller_component("image_unittests") {
+impeller_component("image_skia_backend") {
   testonly = true
-  sources = []
-  deps = [
+  public = [ "backends/skia/compressed_image_skia.h" ]
+
+  sources = [ "backends/skia/compressed_image_skia.cc" ]
+
+  public_deps = [
     ":image",
-    "//flutter/testing",
+    "../../base",
+    "../../geometry",
+  ]
+
+  deps = [
+    "//flutter/fml",
+    "//flutter/skia",
   ]
 }
diff --git a/impeller/image/README.md b/impeller/playground/image/README.md
similarity index 100%
rename from impeller/image/README.md
rename to impeller/playground/image/README.md
diff --git a/impeller/image/backends/skia/compressed_image_skia.cc b/impeller/playground/image/backends/skia/compressed_image_skia.cc
similarity index 74%
rename from impeller/image/backends/skia/compressed_image_skia.cc
rename to impeller/playground/image/backends/skia/compressed_image_skia.cc
index d0844053254cf91d2e698947eb26e9d89dc0dcd3..e44510cdfded97d8c335ed9bf0db0847876225d9 100644
--- a/impeller/image/backends/skia/compressed_image_skia.cc
+++ b/impeller/playground/image/backends/skia/compressed_image_skia.cc
@@ -2,17 +2,28 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/image/backends/skia/compressed_image_skia.h"
+#include "impeller/playground/image/backends/skia/compressed_image_skia.h"
 
 #include <memory>
 
 #include "impeller/base/validation.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkData.h"
-#include "third_party/skia/include/core/SkImageGenerator.h"
+#include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkPixmap.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
 
 namespace impeller {
 
+std::shared_ptr<CompressedImage> CompressedImageSkia::Create(
+    std::shared_ptr<const fml::Mapping> allocation) {
+  // There is only one backend today.
+  if (!allocation) {
+    return nullptr;
+  }
+  return std::make_shared<CompressedImageSkia>(std::move(allocation));
+}
+
 CompressedImageSkia::CompressedImageSkia(
     std::shared_ptr<const fml::Mapping> allocation)
     : CompressedImage(std::move(allocation)) {}
@@ -36,12 +47,12 @@ DecompressedImage CompressedImageSkia::Decode() const {
       },
       src);
 
-  auto generator = SkImageGenerator::MakeFromEncoded(sk_data);
-  if (!generator) {
+  auto image = SkImages::DeferredFromEncodedData(sk_data);
+  if (!image) {
     return {};
   }
 
-  const auto dims = generator->getInfo().dimensions();
+  const auto dims = image->imageInfo().dimensions();
   auto info = SkImageInfo::Make(dims.width(), dims.height(),
                                 kRGBA_8888_SkColorType, kPremul_SkAlphaType);
 
@@ -51,7 +62,7 @@ DecompressedImage CompressedImageSkia::Decode() const {
     return {};
   }
 
-  if (!generator->getPixels(bitmap->pixmap())) {
+  if (!image->readPixels(nullptr, bitmap->pixmap(), 0, 0)) {
     VALIDATION_LOG << "Could not decompress image into arena.";
     return {};
   }
diff --git a/impeller/image/backends/skia/compressed_image_skia.h b/impeller/playground/image/backends/skia/compressed_image_skia.h
similarity index 41%
rename from impeller/image/backends/skia/compressed_image_skia.h
rename to impeller/playground/image/backends/skia/compressed_image_skia.h
index 856c5304cc385c40a55b0e8c779a9e47f8e73295..6c92b10264e3b3f17dd46a495d6a619dccc0fae5 100644
--- a/impeller/image/backends/skia/compressed_image_skia.h
+++ b/impeller/playground/image/backends/skia/compressed_image_skia.h
@@ -2,16 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_PLAYGROUND_IMAGE_BACKENDS_SKIA_COMPRESSED_IMAGE_SKIA_H_
+#define FLUTTER_IMPELLER_PLAYGROUND_IMAGE_BACKENDS_SKIA_COMPRESSED_IMAGE_SKIA_H_
 
 #include "flutter/fml/macros.h"
-#include "impeller/image/compressed_image.h"
+#include "impeller/playground/image/compressed_image.h"
 
 namespace impeller {
 
 class CompressedImageSkia final : public CompressedImage {
  public:
-  CompressedImageSkia(std::shared_ptr<const fml::Mapping> allocation);
+  static std::shared_ptr<CompressedImage> Create(
+      std::shared_ptr<const fml::Mapping> allocation);
+
+  explicit CompressedImageSkia(std::shared_ptr<const fml::Mapping> allocation);
 
   ~CompressedImageSkia() override;
 
@@ -19,7 +23,11 @@ class CompressedImageSkia final : public CompressedImage {
   DecompressedImage Decode() const override;
 
  private:
-  FML_DISALLOW_COPY_AND_ASSIGN(CompressedImageSkia);
+  CompressedImageSkia(const CompressedImageSkia&) = delete;
+
+  CompressedImageSkia& operator=(const CompressedImageSkia&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_PLAYGROUND_IMAGE_BACKENDS_SKIA_COMPRESSED_IMAGE_SKIA_H_
diff --git a/impeller/image/compressed_image.cc b/impeller/playground/image/compressed_image.cc
similarity index 54%
rename from impeller/image/compressed_image.cc
rename to impeller/playground/image/compressed_image.cc
index 15b4e01487b9c4031b46c508f9e53e030c9edb09..5d1ad4e0fd7ae888dcf18925cacb206420b294ff 100644
--- a/impeller/image/compressed_image.cc
+++ b/impeller/playground/image/compressed_image.cc
@@ -2,21 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/image/compressed_image.h"
-
-#include "impeller/image/backends/skia/compressed_image_skia.h"
+#include "impeller/playground/image/compressed_image.h"
 
 namespace impeller {
 
-std::shared_ptr<CompressedImage> CompressedImage::Create(
-    std::shared_ptr<const fml::Mapping> allocation) {
-  // There is only one backend today.
-  if (!allocation) {
-    return nullptr;
-  }
-  return std::make_shared<CompressedImageSkia>(std::move(allocation));
-}
-
 CompressedImage::CompressedImage(std::shared_ptr<const fml::Mapping> allocation)
     : source_(std::move(allocation)) {}
 
diff --git a/impeller/image/compressed_image.h b/impeller/playground/image/compressed_image.h
similarity index 64%
rename from impeller/image/compressed_image.h
rename to impeller/playground/image/compressed_image.h
index 58c5a5050d66e840c91400b02d616385464f8b26..5f6bf0089c05d6617f9a5eca58d8e2abefaf58e3 100644
--- a/impeller/image/compressed_image.h
+++ b/impeller/playground/image/compressed_image.h
@@ -2,14 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_PLAYGROUND_IMAGE_COMPRESSED_IMAGE_H_
+#define FLUTTER_IMPELLER_PLAYGROUND_IMAGE_COMPRESSED_IMAGE_H_
 
 #include <memory>
 
 #include "flutter/fml/macros.h"
 #include "flutter/fml/mapping.h"
 #include "impeller/geometry/size.h"
-#include "impeller/image/decompressed_image.h"
+#include "impeller/playground/image/decompressed_image.h"
 
 namespace impeller {
 
@@ -17,9 +18,6 @@ class ImageSource;
 
 class CompressedImage {
  public:
-  static std::shared_ptr<CompressedImage> Create(
-      std::shared_ptr<const fml::Mapping> allocation);
-
   virtual ~CompressedImage();
 
   [[nodiscard]] virtual DecompressedImage Decode() const = 0;
@@ -29,7 +27,9 @@ class CompressedImage {
  protected:
   const std::shared_ptr<const fml::Mapping> source_;
 
-  CompressedImage(std::shared_ptr<const fml::Mapping> allocation);
+  explicit CompressedImage(std::shared_ptr<const fml::Mapping> allocation);
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_PLAYGROUND_IMAGE_COMPRESSED_IMAGE_H_
diff --git a/impeller/image/decompressed_image.cc b/impeller/playground/image/decompressed_image.cc
similarity index 96%
rename from impeller/image/decompressed_image.cc
rename to impeller/playground/image/decompressed_image.cc
index c31c184c32961f63711da9fb97900beedeea322c..70642ab492814017b6d8bf7d15770d43d4f21254 100644
--- a/impeller/image/decompressed_image.cc
+++ b/impeller/playground/image/decompressed_image.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/image/decompressed_image.h"
+#include "impeller/playground/image/decompressed_image.h"
 
 #include <limits>
 
@@ -18,7 +18,7 @@ DecompressedImage::DecompressedImage(
     Format format,
     std::shared_ptr<const fml::Mapping> allocation)
     : size_(size), format_(format), allocation_(std::move(allocation)) {
-  if (!allocation_ || !size.IsPositive() || format_ == Format::kInvalid) {
+  if (!allocation_ || size.IsEmpty() || format_ == Format::kInvalid) {
     return;
   }
   is_valid_ = true;
diff --git a/impeller/image/decompressed_image.h b/impeller/playground/image/decompressed_image.h
similarity index 83%
rename from impeller/image/decompressed_image.h
rename to impeller/playground/image/decompressed_image.h
index 56bf9b15c5c4cff3e3c24c523eaa34eb808f14b3..300b9837bd0e92439137afccd27de82aae183b2b 100644
--- a/impeller/image/decompressed_image.h
+++ b/impeller/playground/image/decompressed_image.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_PLAYGROUND_IMAGE_DECOMPRESSED_IMAGE_H_
+#define FLUTTER_IMPELLER_PLAYGROUND_IMAGE_DECOMPRESSED_IMAGE_H_
 
 #include <memory>
 #include <optional>
@@ -49,3 +50,5 @@ class DecompressedImage {
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_PLAYGROUND_IMAGE_DECOMPRESSED_IMAGE_H_
diff --git a/impeller/playground/imgui/BUILD.gn b/impeller/playground/imgui/BUILD.gn
index 3b0c53b10acd2fa5d236865dde30279f367e5dc7..19bb195876f4d1b0ae784163d5bd25c646e2cccc 100644
--- a/impeller/playground/imgui/BUILD.gn
+++ b/impeller/playground/imgui/BUILD.gn
@@ -6,6 +6,10 @@ import("//flutter/impeller/tools/impeller.gni")
 
 impeller_shaders("imgui_shaders") {
   name = "imgui"
+
+  # Not analyzing because they are not performance critical, and mipmap uses
+  # textureLod, which uses an extension that malioc does not support.
+  analyze = false
   shaders = [
     "imgui_raster.vert",
     "imgui_raster.frag",
@@ -15,7 +19,7 @@ impeller_shaders("imgui_shaders") {
 impeller_component("imgui_impeller_backend") {
   public_deps = [
     ":imgui_shaders",
-    "//third_party/imgui",
+    "//flutter/third_party/imgui",
   ]
 
   deps = [ "//flutter/impeller/renderer" ]
diff --git a/impeller/playground/imgui/imgui_impl_impeller.cc b/impeller/playground/imgui/imgui_impl_impeller.cc
index d93a7369e7524a8d10b69ba466be95a255d5b022..a37a077a3acf9cd8d6468192075bd006e1793848 100644
--- a/impeller/playground/imgui/imgui_impl_impeller.cc
+++ b/impeller/playground/imgui/imgui_impl_impeller.cc
@@ -9,36 +9,41 @@
 #include <memory>
 #include <vector>
 
+#include "impeller/core/host_buffer.h"
+#include "impeller/core/platform.h"
 #include "impeller/geometry/scalar.h"
 #include "impeller/geometry/vector.h"
 #include "impeller/playground/imgui/imgui_raster.frag.h"
 #include "impeller/playground/imgui/imgui_raster.vert.h"
 #include "third_party/imgui/imgui.h"
 
+#include "impeller/core/allocator.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/range.h"
+#include "impeller/core/sampler.h"
+#include "impeller/core/texture.h"
+#include "impeller/core/texture_descriptor.h"
+#include "impeller/core/vertex_buffer.h"
 #include "impeller/geometry/matrix.h"
 #include "impeller/geometry/point.h"
 #include "impeller/geometry/rect.h"
 #include "impeller/geometry/size.h"
-#include "impeller/renderer/allocator.h"
 #include "impeller/renderer/command.h"
 #include "impeller/renderer/context.h"
-#include "impeller/renderer/formats.h"
 #include "impeller/renderer/pipeline_builder.h"
 #include "impeller/renderer/pipeline_descriptor.h"
 #include "impeller/renderer/pipeline_library.h"
-#include "impeller/renderer/range.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/sampler.h"
-#include "impeller/renderer/sampler_library.h"
-#include "impeller/renderer/texture.h"
-#include "impeller/renderer/texture_descriptor.h"
-#include "impeller/renderer/vertex_buffer.h"
 
 struct ImGui_ImplImpeller_Data {
+  explicit ImGui_ImplImpeller_Data(
+      const std::unique_ptr<const impeller::Sampler>& p_sampler)
+      : sampler(p_sampler) {}
+
   std::shared_ptr<impeller::Context> context;
   std::shared_ptr<impeller::Texture> font_texture;
   std::shared_ptr<impeller::Pipeline<impeller::PipelineDescriptor>> pipeline;
-  std::shared_ptr<const impeller::Sampler> sampler;
+  const std::unique_ptr<const impeller::Sampler>& sampler;
 };
 
 static ImGui_ImplImpeller_Data* ImGui_ImplImpeller_GetBackendData() {
@@ -55,7 +60,8 @@ bool ImGui_ImplImpeller_Init(
             "Already initialized a renderer backend!");
 
   // Setup backend capabilities flags
-  auto* bd = new ImGui_ImplImpeller_Data();
+  auto* bd =
+      new ImGui_ImplImpeller_Data(context->GetSamplerLibrary()->GetSampler({}));
   io.BackendRendererUserData = reinterpret_cast<void*>(bd);
   io.BackendRendererName = "imgui_impl_impeller";
   io.BackendFlags |=
@@ -94,18 +100,16 @@ bool ImGui_ImplImpeller_Init(
     auto desc = impeller::PipelineBuilder<impeller::ImguiRasterVertexShader,
                                           impeller::ImguiRasterFragmentShader>::
         MakeDefaultPipelineDescriptor(*context);
-    auto stencil = desc->GetFrontStencilAttachmentDescriptor();
-    if (stencil.has_value()) {
-      stencil->stencil_compare = impeller::CompareFunction::kAlways;
-      stencil->depth_stencil_pass = impeller::StencilOperation::kKeep;
-      desc->SetStencilAttachmentDescriptors(stencil.value());
+    IM_ASSERT(desc.has_value() && "Could not create Impeller pipeline");
+    if (desc.has_value()) {  // Needed to silence clang-tidy check
+                             // bugprone-unchecked-optional-access.
+      desc->ClearStencilAttachments();
+      desc->ClearDepthAttachment();
     }
 
     bd->pipeline =
         context->GetPipelineLibrary()->GetPipeline(std::move(desc)).Get();
     IM_ASSERT(bd->pipeline != nullptr && "Could not create ImGui pipeline.");
-
-    bd->sampler = context->GetSamplerLibrary()->GetSampler({});
     IM_ASSERT(bd->pipeline != nullptr && "Could not create ImGui sampler.");
   }
 
@@ -124,6 +128,8 @@ void ImGui_ImplImpeller_RenderDrawData(ImDrawData* draw_data,
   if (draw_data->CmdListsCount == 0) {
     return;  // Nothing to render.
   }
+  auto host_buffer = impeller::HostBuffer::Create(
+      render_pass.GetContext()->GetResourceAllocator());
 
   using VS = impeller::ImguiRasterVertexShader;
   using FS = impeller::ImguiRasterFragmentShader;
@@ -145,23 +151,19 @@ void ImGui_ImplImpeller_RenderDrawData(ImDrawData* draw_data,
   auto buffer = bd->context->GetResourceAllocator()->CreateBuffer(buffer_desc);
   buffer->SetLabel(impeller::SPrintF("ImGui vertex+index buffer"));
 
-  auto display_rect =
-      impeller::Rect(draw_data->DisplayPos.x, draw_data->DisplayPos.y,
-                     draw_data->DisplaySize.x, draw_data->DisplaySize.y);
+  auto display_rect = impeller::Rect::MakeXYWH(
+      draw_data->DisplayPos.x, draw_data->DisplayPos.y,
+      draw_data->DisplaySize.x, draw_data->DisplaySize.y);
 
   auto viewport = impeller::Viewport{
-      .rect = impeller::Rect(
-          display_rect.origin.x * draw_data->FramebufferScale.x,
-          display_rect.origin.y * draw_data->FramebufferScale.y,
-          display_rect.size.width * draw_data->FramebufferScale.x,
-          display_rect.size.height * draw_data->FramebufferScale.y)};
+      .rect = display_rect.Scale(draw_data->FramebufferScale.x,
+                                 draw_data->FramebufferScale.y)};
 
   // Allocate vertex shader uniform buffer.
   VS::UniformBuffer uniforms;
-  uniforms.mvp = impeller::Matrix::MakeOrthographic(display_rect.size)
-                     .Translate(-display_rect.origin);
-  auto vtx_uniforms =
-      render_pass.GetTransientsBuffer().EmplaceUniform(uniforms);
+  uniforms.mvp = impeller::Matrix::MakeOrthographic(display_rect.GetSize())
+                     .Translate(-display_rect.GetOrigin());
+  auto vtx_uniforms = host_buffer->EmplaceUniform(uniforms);
 
   size_t vertex_buffer_offset = 0;
   size_t index_buffer_offset = total_vtx_bytes;
@@ -237,16 +239,13 @@ void ImGui_ImplImpeller_RenderDrawData(ImDrawData* draw_data,
           clip_rect = visible_clip.value();
         }
 
-        impeller::Command cmd;
-        cmd.label = impeller::SPrintF("ImGui draw list %d (command %d)",
-                                      draw_list_i, cmd_i);
-
-        cmd.viewport = viewport;
-        cmd.scissor = impeller::IRect(clip_rect);
-
-        cmd.pipeline = bd->pipeline;
-        VS::BindUniformBuffer(cmd, vtx_uniforms);
-        FS::BindTex(cmd, bd->font_texture, bd->sampler);
+        render_pass.SetCommandLabel(impeller::SPrintF(
+            "ImGui draw list %d (command %d)", draw_list_i, cmd_i));
+        render_pass.SetViewport(viewport);
+        render_pass.SetScissor(impeller::IRect::RoundOut(clip_rect));
+        render_pass.SetPipeline(bd->pipeline);
+        VS::BindUniformBuffer(render_pass, vtx_uniforms);
+        FS::BindTex(render_pass, bd->font_texture, bd->sampler);
 
         size_t vb_start =
             vertex_buffer_offset + pcmd->VtxOffset * sizeof(ImDrawVert);
@@ -260,16 +259,17 @@ void ImGui_ImplImpeller_RenderDrawData(ImDrawData* draw_data,
             .range = impeller::Range(
                 index_buffer_offset + pcmd->IdxOffset * sizeof(ImDrawIdx),
                 pcmd->ElemCount * sizeof(ImDrawIdx))};
-        vertex_buffer.index_count = pcmd->ElemCount;
+        vertex_buffer.vertex_count = pcmd->ElemCount;
         vertex_buffer.index_type = impeller::IndexType::k16bit;
-        cmd.BindVertices(vertex_buffer);
-        cmd.base_vertex = pcmd->VtxOffset;
+        render_pass.SetVertexBuffer(std::move(vertex_buffer));
+        render_pass.SetBaseVertex(pcmd->VtxOffset);
 
-        render_pass.AddCommand(std::move(cmd));
+        render_pass.Draw().ok();
       }
     }
 
     vertex_buffer_offset += draw_list_vtx_bytes;
     index_buffer_offset += draw_list_idx_bytes;
   }
+  host_buffer->Reset();
 }
diff --git a/impeller/playground/imgui/imgui_impl_impeller.h b/impeller/playground/imgui/imgui_impl_impeller.h
index 8b60efc31b5bd670bd83698206955abdda613e4a..cfb624a61c5a951acbd992eb4e7c84211ef48ad9 100644
--- a/impeller/playground/imgui/imgui_impl_impeller.h
+++ b/impeller/playground/imgui/imgui_impl_impeller.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_PLAYGROUND_IMGUI_IMGUI_IMPL_IMPELLER_H_
+#define FLUTTER_IMPELLER_PLAYGROUND_IMGUI_IMGUI_IMPL_IMPELLER_H_
 
 #include <memory>
 
@@ -23,3 +24,5 @@ IMGUI_IMPL_API void ImGui_ImplImpeller_Shutdown();
 IMGUI_IMPL_API void ImGui_ImplImpeller_RenderDrawData(
     ImDrawData* draw_data,
     impeller::RenderPass& renderpass);
+
+#endif  // FLUTTER_IMPELLER_PLAYGROUND_IMGUI_IMGUI_IMPL_IMPELLER_H_
diff --git a/impeller/playground/playground.cc b/impeller/playground/playground.cc
index 4cfb98b93e80ed5ea9d2a8e795728188c62bbfd8..4ed9e5af7efcb2f3387699a3b999ece4dc0d1018 100644
--- a/impeller/playground/playground.cc
+++ b/impeller/playground/playground.cc
@@ -7,7 +7,9 @@
 #include <optional>
 #include <sstream>
 
-#include "impeller/image/decompressed_image.h"
+#include "fml/time/time_point.h"
+#include "impeller/playground/image/backends/skia/compressed_image_skia.h"
+#include "impeller/playground/image/decompressed_image.h"
 #include "impeller/renderer/command_buffer.h"
 #include "impeller/runtime_stage/runtime_stage.h"
 
@@ -16,18 +18,27 @@
 
 #include "flutter/fml/paths.h"
 #include "impeller/base/validation.h"
-#include "impeller/image/compressed_image.h"
+#include "impeller/core/allocator.h"
+#include "impeller/core/formats.h"
+#include "impeller/playground/backend/vulkan/swiftshader_utilities.h"
+#include "impeller/playground/image/compressed_image.h"
 #include "impeller/playground/imgui/imgui_impl_impeller.h"
 #include "impeller/playground/playground.h"
 #include "impeller/playground/playground_impl.h"
-#include "impeller/renderer/allocator.h"
 #include "impeller/renderer/context.h"
-#include "impeller/renderer/formats.h"
 #include "impeller/renderer/render_pass.h"
 #include "impeller/renderer/renderer.h"
 #include "third_party/imgui/backends/imgui_impl_glfw.h"
 #include "third_party/imgui/imgui.h"
 
+#if FML_OS_MACOSX
+#include "fml/platform/darwin/scoped_nsautorelease_pool.h"
+#endif  // FML_OS_MACOSX
+
+#if IMPELLER_ENABLE_VULKAN
+#include "impeller/playground/backend/vulkan/playground_impl_vk.h"
+#endif  // IMPELLER_ENABLE_VULKAN
+
 namespace impeller {
 
 std::string PlaygroundBackendToString(PlaygroundBackend backend) {
@@ -42,37 +53,36 @@ std::string PlaygroundBackendToString(PlaygroundBackend backend) {
   FML_UNREACHABLE();
 }
 
-struct Playground::GLFWInitializer {
-  GLFWInitializer() {
-    // This guard is a hack to work around a problem where glfwCreateWindow
-    // hangs when opening a second window after GLFW has been reinitialized (for
-    // example, when flipping through multiple playground tests).
-    //
-    // Explanation:
-    //  * glfwCreateWindow calls [NSApp run], which begins running the event
-    //    loop on the current thread.
-    //  * GLFW then immediately stops the loop when
-    //    applicationDidFinishLaunching is fired.
-    //  * applicationDidFinishLaunching is only ever fired once during the
-    //    application's lifetime, so subsequent calls to [NSApp run] will always
-    //    hang with this setup.
-    //  * glfwInit resets the flag that guards against [NSApp run] being
-    //    called a second time, which causes the subsequent `glfwCreateWindow`
-    //    to hang indefinitely in the event loop, because
-    //    applicationDidFinishLaunching is never fired.
-    static std::once_flag sOnceInitializer;
-    std::call_once(sOnceInitializer, []() {
-      ::glfwSetErrorCallback([](int code, const char* description) {
-        FML_LOG(ERROR) << "GLFW Error '" << description << "'  (" << code
-                       << ").";
-      });
-      FML_CHECK(::glfwInit() == GLFW_TRUE);
+static void InitializeGLFWOnce() {
+  // This guard is a hack to work around a problem where glfwCreateWindow
+  // hangs when opening a second window after GLFW has been reinitialized (for
+  // example, when flipping through multiple playground tests).
+  //
+  // Explanation:
+  //  * glfwCreateWindow calls [NSApp run], which begins running the event
+  //    loop on the current thread.
+  //  * GLFW then immediately stops the loop when
+  //    applicationDidFinishLaunching is fired.
+  //  * applicationDidFinishLaunching is only ever fired once during the
+  //    application's lifetime, so subsequent calls to [NSApp run] will always
+  //    hang with this setup.
+  //  * glfwInit resets the flag that guards against [NSApp run] being
+  //    called a second time, which causes the subsequent `glfwCreateWindow`
+  //    to hang indefinitely in the event loop, because
+  //    applicationDidFinishLaunching is never fired.
+  static std::once_flag sOnceInitializer;
+  std::call_once(sOnceInitializer, []() {
+    ::glfwSetErrorCallback([](int code, const char* description) {
+      FML_LOG(ERROR) << "GLFW Error '" << description << "'  (" << code << ").";
     });
-  }
-};
+    FML_CHECK(::glfwInit() == GLFW_TRUE);
+  });
+}
 
-Playground::Playground()
-    : glfw_initializer_(std::make_unique<GLFWInitializer>()) {}
+Playground::Playground(PlaygroundSwitches switches) : switches_(switches) {
+  InitializeGLFWOnce();
+  SetupSwiftshaderOnce(switches_.use_swiftshader);
+}
 
 Playground::~Playground() = default;
 
@@ -80,6 +90,12 @@ std::shared_ptr<Context> Playground::GetContext() const {
   return context_;
 }
 
+std::shared_ptr<Context> Playground::MakeContext() const {
+  // Playgrounds are already making a context for each test, so we can just
+  // return the `context_`.
+  return context_;
+}
+
 bool Playground::SupportsBackend(PlaygroundBackend backend) {
   switch (backend) {
     case PlaygroundBackend::kMetal:
@@ -96,7 +112,7 @@ bool Playground::SupportsBackend(PlaygroundBackend backend) {
 #endif  // IMPELLER_ENABLE_OPENGLES
     case PlaygroundBackend::kVulkan:
 #if IMPELLER_ENABLE_VULKAN
-      return true;
+      return PlaygroundImplVK::IsVulkanDriverPresent();
 #else   // IMPELLER_ENABLE_VULKAN
       return false;
 #endif  // IMPELLER_ENABLE_VULKAN
@@ -107,8 +123,9 @@ bool Playground::SupportsBackend(PlaygroundBackend backend) {
 void Playground::SetupContext(PlaygroundBackend backend) {
   FML_CHECK(SupportsBackend(backend));
 
-  impl_ = PlaygroundImpl::Create(backend);
+  impl_ = PlaygroundImpl::Create(backend, switches_);
   if (!impl_) {
+    FML_LOG(WARNING) << "PlaygroundImpl::Create failed.";
     return;
   }
 
@@ -117,8 +134,8 @@ void Playground::SetupContext(PlaygroundBackend backend) {
 
 void Playground::SetupWindow() {
   if (!context_) {
-    FML_LOG(WARNING)
-        << "Asked to setup a window with no context (call SetupContext first).";
+    FML_LOG(WARNING) << "Asked to set up a window with no context (call "
+                        "SetupContext first).";
     return;
   }
   auto renderer = std::make_unique<Renderer>(context_);
@@ -126,9 +143,14 @@ void Playground::SetupWindow() {
     return;
   }
   renderer_ = std::move(renderer);
+
+  start_time_ = fml::TimePoint::Now().ToEpochDelta();
 }
 
 void Playground::TeardownWindow() {
+  if (context_) {
+    context_->Shutdown();
+  }
   context_.reset();
   renderer_.reset();
   impl_.reset();
@@ -145,7 +167,7 @@ static void PlaygroundKeyCallback(GLFWwindow* window,
                                   int scancode,
                                   int action,
                                   int mods) {
-  if ((key == GLFW_KEY_ESCAPE || key == GLFW_KEY_Q) && action == GLFW_RELEASE) {
+  if ((key == GLFW_KEY_ESCAPE) && action == GLFW_RELEASE) {
     if (mods & (GLFW_MOD_CONTROL | GLFW_MOD_SUPER | GLFW_MOD_SHIFT)) {
       gShouldOpenNewPlaygrounds = false;
     }
@@ -165,13 +187,17 @@ Point Playground::GetContentScale() const {
   return impl_->GetContentScale();
 }
 
+Scalar Playground::GetSecondsElapsed() const {
+  return (fml::TimePoint::Now().ToEpochDelta() - start_time_).ToSecondsF();
+}
+
 void Playground::SetCursorPosition(Point pos) {
   cursor_position_ = pos;
 }
 
 bool Playground::OpenPlaygroundHere(
     const Renderer::RenderCallback& render_callback) {
-  if (!is_enabled()) {
+  if (!switches_.enable_playground) {
     return true;
   }
 
@@ -188,7 +214,11 @@ bool Playground::OpenPlaygroundHere(
   fml::ScopedCleanupClosure destroy_imgui_context(
       []() { ImGui::DestroyContext(); });
   ImGui::StyleColorsDark();
-  ImGui::GetIO().IniFilename = nullptr;
+
+  auto& io = ImGui::GetIO();
+  io.IniFilename = nullptr;
+  io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;
+  io.ConfigWindowsResizeFromEdges = true;
 
   auto window = reinterpret_cast<GLFWwindow*>(impl_->GetWindowHandle());
   if (!window) {
@@ -203,8 +233,7 @@ bool Playground::OpenPlaygroundHere(
         if (!playground) {
           return;
         }
-        playground->SetWindowSize(
-            ISize{std::max(width, 0), std::max(height, 0)});
+        playground->SetWindowSize(ISize{width, height}.Max({}));
       });
   ::glfwSetKeyCallback(window, &PlaygroundKeyCallback);
   ::glfwSetCursorPosCallback(window, [](GLFWwindow* window, double x,
@@ -227,7 +256,10 @@ bool Playground::OpenPlaygroundHere(
   ::glfwShowWindow(window);
 
   while (true) {
-    ::glfwWaitEventsTimeout(1.0 / 30.0);
+#if FML_OS_MACOSX
+    fml::ScopedNSAutoreleasePool pool;
+#endif
+    ::glfwPollEvents();
 
     if (::glfwWindowShouldClose(window)) {
       return true;
@@ -239,6 +271,8 @@ bool Playground::OpenPlaygroundHere(
         [render_callback,
          &renderer = renderer_](RenderTarget& render_target) -> bool {
       ImGui::NewFrame();
+      ImGui::DockSpaceOverViewport(ImGui::GetMainViewport(),
+                                   ImGuiDockNodeFlags_PassthruCentralNode);
       bool result = render_callback(render_target);
       ImGui::Render();
 
@@ -263,35 +297,8 @@ bool Playground::OpenPlaygroundHere(
         }
         render_target.SetColorAttachment(color0, 0);
 
-#ifndef IMPELLER_ENABLE_VULKAN
-        {
-          TextureDescriptor stencil0_tex;
-          stencil0_tex.storage_mode = StorageMode::kDeviceTransient;
-          stencil0_tex.type = TextureType::kTexture2D;
-          stencil0_tex.sample_count = SampleCount::kCount1;
-          stencil0_tex.format = PixelFormat::kDefaultStencil;
-          stencil0_tex.size = color0.texture->GetSize();
-          stencil0_tex.usage =
-              static_cast<TextureUsageMask>(TextureUsage::kRenderTarget);
-          auto stencil_texture =
-              renderer->GetContext()->GetResourceAllocator()->CreateTexture(
-                  stencil0_tex);
-
-          if (!stencil_texture) {
-            VALIDATION_LOG << "Could not create stencil texture.";
-            return false;
-          }
-          stencil_texture->SetLabel("ImguiStencil");
-
-          StencilAttachment stencil0;
-          stencil0.texture = stencil_texture;
-          stencil0.clear_stencil = 0;
-          stencil0.load_action = LoadAction::kClear;
-          stencil0.store_action = StoreAction::kDontCare;
-
-          render_target.SetStencilAttachment(stencil0);
-        }
-#endif
+        render_target.SetStencilAttachment(std::nullopt);
+        render_target.SetDepthAttachment(std::nullopt);
 
         auto pass = buffer->CreateRenderPass(render_target);
         if (!pass) {
@@ -302,7 +309,7 @@ bool Playground::OpenPlaygroundHere(
         ImGui_ImplImpeller_RenderDrawData(ImGui::GetDrawData(), *pass);
 
         pass->EncodeCommands();
-        if (!buffer->SubmitCommands()) {
+        if (!renderer->GetContext()->GetCommandQueue()->Submit({buffer}).ok()) {
           return false;
         }
       }
@@ -315,6 +322,10 @@ bool Playground::OpenPlaygroundHere(
       VALIDATION_LOG << "Could not render into the surface.";
       return false;
     }
+
+    if (!ShouldKeepRendering()) {
+      break;
+    }
   }
 
   ::glfwHideWindow(window);
@@ -342,23 +353,27 @@ bool Playground::OpenPlaygroundHere(SinglePassCallback pass_callback) {
         }
 
         pass->EncodeCommands();
-        if (!buffer->SubmitCommands()) {
+        if (!context->GetCommandQueue()->Submit({buffer}).ok()) {
           return false;
         }
         return true;
       });
 }
 
-std::optional<DecompressedImage> Playground::LoadFixtureImageRGBA(
-    const char* fixture_name) const {
-  if (!renderer_ || fixture_name == nullptr) {
-    return std::nullopt;
-  }
-
-  auto compressed_image =
-      CompressedImage::Create(OpenAssetAsMapping(fixture_name));
+std::shared_ptr<CompressedImage> Playground::LoadFixtureImageCompressed(
+    std::shared_ptr<fml::Mapping> mapping) {
+  auto compressed_image = CompressedImageSkia::Create(std::move(mapping));
   if (!compressed_image) {
     VALIDATION_LOG << "Could not create compressed image.";
+    return nullptr;
+  }
+
+  return compressed_image;
+}
+
+std::optional<DecompressedImage> Playground::DecodeImageRGBA(
+    const std::shared_ptr<CompressedImage>& compressed) {
+  if (compressed == nullptr) {
     return std::nullopt;
   }
   // The decoded image is immediately converted into RGBA as that format is
@@ -366,44 +381,81 @@ std::optional<DecompressedImage> Playground::LoadFixtureImageRGBA(
   // bit pixel strides, this is overkill. Since this is a test fixture we
   // aren't necessarily trying to eke out memory savings here and instead
   // favor simplicity.
-  auto image = compressed_image->Decode().ConvertToRGBA();
+  auto image = compressed->Decode().ConvertToRGBA();
   if (!image.IsValid()) {
-    VALIDATION_LOG << "Could not find fixture named " << fixture_name;
+    VALIDATION_LOG << "Could not decode image.";
     return std::nullopt;
   }
 
   return image;
 }
 
-std::shared_ptr<Texture> Playground::CreateTextureForFixture(
-    const char* fixture_name,
-    bool enable_mipmapping) const {
-  auto image = LoadFixtureImageRGBA(fixture_name);
-  if (!image.has_value()) {
-    return nullptr;
-  }
-
+static std::shared_ptr<Texture> CreateTextureForDecompressedImage(
+    const std::shared_ptr<Context>& context,
+    DecompressedImage& decompressed_image,
+    bool enable_mipmapping) {
   auto texture_descriptor = TextureDescriptor{};
   texture_descriptor.storage_mode = StorageMode::kHostVisible;
   texture_descriptor.format = PixelFormat::kR8G8B8A8UNormInt;
-  texture_descriptor.size = image->GetSize();
+  texture_descriptor.size = decompressed_image.GetSize();
   texture_descriptor.mip_count =
-      enable_mipmapping ? image->GetSize().MipCount() : 1u;
+      enable_mipmapping ? decompressed_image.GetSize().MipCount() : 1u;
 
-  auto texture = renderer_->GetContext()->GetResourceAllocator()->CreateTexture(
-      texture_descriptor);
+  auto texture =
+      context->GetResourceAllocator()->CreateTexture(texture_descriptor);
   if (!texture) {
-    VALIDATION_LOG << "Could not allocate texture for fixture " << fixture_name;
+    VALIDATION_LOG << "Could not allocate texture for fixture.";
     return nullptr;
   }
-  texture->SetLabel(fixture_name);
 
-  auto uploaded = texture->SetContents(image->GetAllocation());
+  auto uploaded = texture->SetContents(decompressed_image.GetAllocation());
   if (!uploaded) {
-    VALIDATION_LOG << "Could not upload texture to device memory for fixture "
-                   << fixture_name;
+    VALIDATION_LOG << "Could not upload texture to device memory for fixture.";
     return nullptr;
   }
+  if (enable_mipmapping) {
+    auto command_buffer = context->CreateCommandBuffer();
+    if (!command_buffer) {
+      FML_DLOG(ERROR)
+          << "Could not create command buffer for mipmap generation.";
+      return nullptr;
+    }
+    command_buffer->SetLabel("Mipmap Command Buffer");
+    auto blit_pass = command_buffer->CreateBlitPass();
+    blit_pass->SetLabel("Mipmap Blit Pass");
+    blit_pass->GenerateMipmap(texture);
+    blit_pass->EncodeCommands(context->GetResourceAllocator());
+    if (!context->GetCommandQueue()->Submit({command_buffer}).ok()) {
+      FML_DLOG(ERROR) << "Failed to submit blit pass command buffer.";
+      return nullptr;
+    }
+  }
+  return texture;
+}
+
+std::shared_ptr<Texture> Playground::CreateTextureForMapping(
+    const std::shared_ptr<Context>& context,
+    std::shared_ptr<fml::Mapping> mapping,
+    bool enable_mipmapping) {
+  auto image = Playground::DecodeImageRGBA(
+      Playground::LoadFixtureImageCompressed(std::move(mapping)));
+  if (!image.has_value()) {
+    return nullptr;
+  }
+  return CreateTextureForDecompressedImage(context, image.value(),
+                                           enable_mipmapping);
+}
+
+std::shared_ptr<Texture> Playground::CreateTextureForFixture(
+    const char* fixture_name,
+    bool enable_mipmapping) const {
+  auto texture = CreateTextureForMapping(renderer_->GetContext(),
+                                         OpenAssetAsMapping(fixture_name),
+                                         enable_mipmapping);
+  if (texture == nullptr) {
+    return nullptr;
+  }
+  texture->SetLabel(fixture_name);
   return texture;
 }
 
@@ -411,7 +463,8 @@ std::shared_ptr<Texture> Playground::CreateTextureCubeForFixture(
     std::array<const char*, 6> fixture_names) const {
   std::array<DecompressedImage, 6> images;
   for (size_t i = 0; i < fixture_names.size(); i++) {
-    auto image = LoadFixtureImageRGBA(fixture_names[i]);
+    auto image = DecodeImageRGBA(
+        LoadFixtureImageCompressed(OpenAssetAsMapping(fixture_names[i])));
     if (!image.has_value()) {
       return nullptr;
     }
@@ -450,4 +503,17 @@ void Playground::SetWindowSize(ISize size) {
   window_size_ = size;
 }
 
+bool Playground::ShouldKeepRendering() const {
+  return true;
+}
+
+fml::Status Playground::SetCapabilities(
+    const std::shared_ptr<Capabilities>& capabilities) {
+  return impl_->SetCapabilities(capabilities);
+}
+
+bool Playground::WillRenderSomething() const {
+  return switches_.enable_playground;
+}
+
 }  // namespace impeller
diff --git a/impeller/playground/playground.h b/impeller/playground/playground.h
index 842c988394631c929e0f30b84d8dfbecd0251482..9c6cde6467d6a34f3c1ad73ce79ec4ef54dc497c 100644
--- a/impeller/playground/playground.h
+++ b/impeller/playground/playground.h
@@ -2,16 +2,24 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_PLAYGROUND_PLAYGROUND_H_
+#define FLUTTER_IMPELLER_PLAYGROUND_PLAYGROUND_H_
 
+#include <chrono>
 #include <memory>
 
 #include "flutter/fml/closure.h"
 #include "flutter/fml/macros.h"
-
+#include "flutter/fml/status.h"
+#include "flutter/fml/time/time_delta.h"
+#include "impeller/core/runtime_types.h"
+#include "impeller/core/texture.h"
 #include "impeller/geometry/point.h"
+#include "impeller/playground/image/compressed_image.h"
+#include "impeller/playground/image/decompressed_image.h"
+#include "impeller/playground/switches.h"
+#include "impeller/renderer/render_pass.h"
 #include "impeller/renderer/renderer.h"
-#include "impeller/renderer/texture.h"
 #include "impeller/runtime_stage/runtime_stage.h"
 
 namespace impeller {
@@ -24,18 +32,29 @@ enum class PlaygroundBackend {
   kVulkan,
 };
 
+constexpr inline RuntimeStageBackend PlaygroundBackendToRuntimeStageBackend(
+    PlaygroundBackend backend) {
+  switch (backend) {
+    case PlaygroundBackend::kMetal:
+      return RuntimeStageBackend::kMetal;
+    case PlaygroundBackend::kOpenGLES:
+      return RuntimeStageBackend::kOpenGLES;
+    case PlaygroundBackend::kVulkan:
+      return RuntimeStageBackend::kVulkan;
+  }
+  FML_UNREACHABLE();
+}
+
 std::string PlaygroundBackendToString(PlaygroundBackend backend);
 
 class Playground {
  public:
   using SinglePassCallback = std::function<bool(RenderPass& pass)>;
 
-  explicit Playground();
+  explicit Playground(PlaygroundSwitches switches);
 
   virtual ~Playground();
 
-  static constexpr bool is_enabled() { return is_enabled_; }
-
   static bool ShouldOpenNewPlaygrounds();
 
   void SetupContext(PlaygroundBackend backend);
@@ -50,14 +69,28 @@ class Playground {
 
   Point GetContentScale() const;
 
+  /// @brief Get the amount of time elapsed from the start of the playground's
+  /// execution.
+  Scalar GetSecondsElapsed() const;
+
   std::shared_ptr<Context> GetContext() const;
 
+  std::shared_ptr<Context> MakeContext() const;
+
   bool OpenPlaygroundHere(const Renderer::RenderCallback& render_callback);
 
   bool OpenPlaygroundHere(SinglePassCallback pass_callback);
 
-  std::optional<DecompressedImage> LoadFixtureImageRGBA(
-      const char* fixture_name) const;
+  static std::shared_ptr<CompressedImage> LoadFixtureImageCompressed(
+      std::shared_ptr<fml::Mapping> mapping);
+
+  static std::optional<DecompressedImage> DecodeImageRGBA(
+      const std::shared_ptr<CompressedImage>& compressed);
+
+  static std::shared_ptr<Texture> CreateTextureForMapping(
+      const std::shared_ptr<Context>& context,
+      std::shared_ptr<fml::Mapping> mapping,
+      bool enable_mipmapping = false);
 
   std::shared_ptr<Texture> CreateTextureForFixture(
       const char* fixture_name,
@@ -73,15 +106,22 @@ class Playground {
 
   virtual std::string GetWindowTitle() const = 0;
 
+  [[nodiscard]] fml::Status SetCapabilities(
+      const std::shared_ptr<Capabilities>& capabilities);
+
+  /// TODO(https://github.com/flutter/flutter/issues/139950): Remove this.
+  /// Returns true if `OpenPlaygroundHere` will actually render anything.
+  bool WillRenderSomething() const;
+
+ protected:
+  const PlaygroundSwitches switches_;
+
+  virtual bool ShouldKeepRendering() const;
+
+  void SetWindowSize(ISize size);
+
  private:
-#if IMPELLER_ENABLE_PLAYGROUND
-  static const bool is_enabled_ = true;
-#else
-  static const bool is_enabled_ = false;
-#endif  // IMPELLER_ENABLE_PLAYGROUND
-
-  struct GLFWInitializer;
-  std::unique_ptr<GLFWInitializer> glfw_initializer_;
+  fml::TimeDelta start_time_;
   std::unique_ptr<PlaygroundImpl> impl_;
   std::shared_ptr<Context> context_;
   std::unique_ptr<Renderer> renderer_;
@@ -90,9 +130,11 @@ class Playground {
 
   void SetCursorPosition(Point pos);
 
-  void SetWindowSize(ISize size);
+  Playground(const Playground&) = delete;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(Playground);
+  Playground& operator=(const Playground&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_PLAYGROUND_PLAYGROUND_H_
diff --git a/impeller/playground/playground_impl.cc b/impeller/playground/playground_impl.cc
index e26f84ff6b1dde295c2d3b70c22c936e19dcb5c9..7cf5418707600593032011e4daf8c0c8811b0ced 100644
--- a/impeller/playground/playground_impl.cc
+++ b/impeller/playground/playground_impl.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "impeller/playground/playground_impl.h"
+#include "flutter/testing/testing.h"
 
 #define GLFW_INCLUDE_NONE
 #include "third_party/glfw/include/GLFW/glfw3.h"
@@ -26,19 +27,26 @@
 namespace impeller {
 
 std::unique_ptr<PlaygroundImpl> PlaygroundImpl::Create(
-    PlaygroundBackend backend) {
+    PlaygroundBackend backend,
+    PlaygroundSwitches switches) {
   switch (backend) {
 #if IMPELLER_ENABLE_METAL
     case PlaygroundBackend::kMetal:
-      return std::make_unique<PlaygroundImplMTL>();
+      return std::make_unique<PlaygroundImplMTL>(switches);
 #endif  // IMPELLER_ENABLE_METAL
 #if IMPELLER_ENABLE_OPENGLES
     case PlaygroundBackend::kOpenGLES:
-      return std::make_unique<PlaygroundImplGLES>();
+      return std::make_unique<PlaygroundImplGLES>(switches);
 #endif  // IMPELLER_ENABLE_OPENGLES
 #if IMPELLER_ENABLE_VULKAN
     case PlaygroundBackend::kVulkan:
-      return std::make_unique<PlaygroundImplVK>();
+      if (!PlaygroundImplVK::IsVulkanDriverPresent()) {
+        FML_CHECK(false) << "Attempted to create playground with backend that "
+                            "isn't available or was disabled on this platform: "
+                         << PlaygroundBackendToString(backend);
+      }
+      switches.enable_vulkan_validation = true;
+      return std::make_unique<PlaygroundImplVK>(switches);
 #endif  // IMPELLER_ENABLE_VULKAN
     default:
       FML_CHECK(false) << "Attempted to create playground with backend that "
@@ -48,7 +56,8 @@ std::unique_ptr<PlaygroundImpl> PlaygroundImpl::Create(
   FML_UNREACHABLE();
 }
 
-PlaygroundImpl::PlaygroundImpl() = default;
+PlaygroundImpl::PlaygroundImpl(PlaygroundSwitches switches)
+    : switches_(switches) {}
 
 PlaygroundImpl::~PlaygroundImpl() = default;
 
diff --git a/impeller/playground/playground_impl.h b/impeller/playground/playground_impl.h
index cd47439778d7e39e14497a24bf03ebb03e881559..68598d398553dc4b88db5d1a35adf7c37c2d0661 100644
--- a/impeller/playground/playground_impl.h
+++ b/impeller/playground/playground_impl.h
@@ -2,12 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_PLAYGROUND_PLAYGROUND_IMPL_H_
+#define FLUTTER_IMPELLER_PLAYGROUND_PLAYGROUND_IMPL_H_
 
 #include <memory>
 
 #include "flutter/fml/macros.h"
 #include "impeller/playground/playground.h"
+#include "impeller/playground/switches.h"
 #include "impeller/renderer/context.h"
 #include "impeller/renderer/surface.h"
 
@@ -15,7 +17,8 @@ namespace impeller {
 
 class PlaygroundImpl {
  public:
-  static std::unique_ptr<PlaygroundImpl> Create(PlaygroundBackend backend);
+  static std::unique_ptr<PlaygroundImpl> Create(PlaygroundBackend backend,
+                                                PlaygroundSwitches switches);
 
   virtual ~PlaygroundImpl();
 
@@ -30,11 +33,20 @@ class PlaygroundImpl {
 
   Vector2 GetContentScale() const;
 
+  virtual fml::Status SetCapabilities(
+      const std::shared_ptr<Capabilities>& capabilities) = 0;
+
  protected:
-  PlaygroundImpl();
+  const PlaygroundSwitches switches_;
+
+  explicit PlaygroundImpl(PlaygroundSwitches switches);
 
  private:
-  FML_DISALLOW_COPY_AND_ASSIGN(PlaygroundImpl);
+  PlaygroundImpl(const PlaygroundImpl&) = delete;
+
+  PlaygroundImpl& operator=(const PlaygroundImpl&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_PLAYGROUND_PLAYGROUND_IMPL_H_
diff --git a/impeller/playground/playground_test.cc b/impeller/playground/playground_test.cc
index c34b30d63f256ce0bb77c4e093a6b496aafbf505..676c3b041299279045a226904cc671fc28a30c57 100644
--- a/impeller/playground/playground_test.cc
+++ b/impeller/playground/playground_test.cc
@@ -4,11 +4,14 @@
 
 #include "flutter/fml/time/time_point.h"
 
+#include "impeller/base/timing.h"
+#include "impeller/base/validation.h"
 #include "impeller/playground/playground_test.h"
 
 namespace impeller {
 
-PlaygroundTest::PlaygroundTest() = default;
+PlaygroundTest::PlaygroundTest()
+    : Playground(PlaygroundSwitches{flutter::testing::GetArgsForProcess()}) {}
 
 PlaygroundTest::~PlaygroundTest() = default;
 
@@ -23,10 +26,14 @@ void PlaygroundTest::SetUp() {
     return;
   }
 
+  ImpellerValidationErrorsSetFatal(true);
+
   SetupContext(GetParam());
   SetupWindow();
+}
 
-  start_time_ = fml::TimePoint::Now().ToEpochDelta();
+PlaygroundBackend PlaygroundTest::GetBackend() const {
+  return GetParam();
 }
 
 void PlaygroundTest::TearDown() {
@@ -39,33 +46,50 @@ std::unique_ptr<fml::Mapping> PlaygroundTest::OpenAssetAsMapping(
   return flutter::testing::OpenFixtureAsMapping(asset_name);
 }
 
-std::shared_ptr<RuntimeStage> PlaygroundTest::OpenAssetAsRuntimeStage(
+RuntimeStage::Map PlaygroundTest::OpenAssetAsRuntimeStage(
     const char* asset_name) const {
-  auto fixture = flutter::testing::OpenFixtureAsMapping(asset_name);
+  const std::shared_ptr<fml::Mapping> fixture =
+      flutter::testing::OpenFixtureAsMapping(asset_name);
   if (!fixture || fixture->GetSize() == 0) {
-    return nullptr;
-  }
-  auto stage = std::make_unique<RuntimeStage>(std::move(fixture));
-  if (!stage->IsValid()) {
-    return nullptr;
+    return {};
   }
-  return stage;
+  return RuntimeStage::DecodeRuntimeStages(fixture);
 }
 
-static std::string FormatWindowTitle(const std::string& test_name) {
+// |Playground|
+std::string PlaygroundTest::GetWindowTitle() const {
   std::stringstream stream;
-  stream << "Impeller Playground for '" << test_name
-         << "' (Press ESC or 'q' to quit)";
+  stream << "Impeller Playground for '"
+         << flutter::testing::GetCurrentTestName() << "' ";
+  switch (GetBackend()) {
+    case PlaygroundBackend::kMetal:
+      break;
+    case PlaygroundBackend::kOpenGLES:
+      if (switches_.use_angle) {
+        stream << " (Angle) ";
+      }
+      break;
+    case PlaygroundBackend::kVulkan:
+      if (switches_.use_swiftshader) {
+        stream << " (SwiftShader) ";
+      }
+      break;
+  }
+  stream << " (Press ESC to quit)";
   return stream.str();
 }
 
 // |Playground|
-std::string PlaygroundTest::GetWindowTitle() const {
-  return FormatWindowTitle(flutter::testing::GetCurrentTestName());
-}
+bool PlaygroundTest::ShouldKeepRendering() const {
+  if (!switches_.timeout.has_value()) {
+    return true;
+  }
+
+  if (SecondsF{GetSecondsElapsed()} > switches_.timeout.value()) {
+    return false;
+  }
 
-Scalar PlaygroundTest::GetSecondsElapsed() const {
-  return (fml::TimePoint::Now().ToEpochDelta() - start_time_).ToSecondsF();
+  return true;
 }
 
 }  // namespace impeller
diff --git a/impeller/playground/playground_test.h b/impeller/playground/playground_test.h
index 26db90635cb831abec1e379b3889b6fcdf73614b..cabb7dfd3abd5463b5b5b688bccf72bee94e1236 100644
--- a/impeller/playground/playground_test.h
+++ b/impeller/playground/playground_test.h
@@ -2,15 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_PLAYGROUND_PLAYGROUND_TEST_H_
+#define FLUTTER_IMPELLER_PLAYGROUND_PLAYGROUND_TEST_H_
 
 #include <memory>
 
 #include "flutter/fml/macros.h"
-#include "flutter/fml/time/time_delta.h"
+#include "flutter/testing/test_args.h"
 #include "flutter/testing/testing.h"
 #include "impeller/geometry/scalar.h"
 #include "impeller/playground/playground.h"
+#include "impeller/playground/switches.h"
+
+#if FML_OS_MACOSX
+#include "flutter/fml/platform/darwin/scoped_nsautorelease_pool.h"
+#endif
 
 namespace impeller {
 
@@ -25,34 +31,69 @@ class PlaygroundTest : public Playground,
 
   void TearDown() override;
 
+  PlaygroundBackend GetBackend() const;
+
   // |Playground|
   std::unique_ptr<fml::Mapping> OpenAssetAsMapping(
       std::string asset_name) const override;
 
-  std::shared_ptr<RuntimeStage> OpenAssetAsRuntimeStage(
-      const char* asset_name) const;
+  RuntimeStage::Map OpenAssetAsRuntimeStage(const char* asset_name) const;
 
   // |Playground|
   std::string GetWindowTitle() const override;
 
-  /// @brief Get the amount of time elapsed from the start of the playground
-  ///        test's execution.
-  Scalar GetSecondsElapsed() const;
-
  private:
-  fml::TimeDelta start_time_;
+  // |Playground|
+  bool ShouldKeepRendering() const;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(PlaygroundTest);
+#if FML_OS_MACOSX
+  fml::ScopedNSAutoreleasePool autorelease_pool_;
+#endif
+
+  PlaygroundTest(const PlaygroundTest&) = delete;
+
+  PlaygroundTest& operator=(const PlaygroundTest&) = delete;
 };
 
-#define INSTANTIATE_PLAYGROUND_SUITE(playground)                            \
-  INSTANTIATE_TEST_SUITE_P(                                                 \
-      Play, playground,                                                     \
-      ::testing::Values(PlaygroundBackend::kMetal,                          \
-                        PlaygroundBackend::kOpenGLES,                       \
-                        PlaygroundBackend::kVulkan),                        \
-      [](const ::testing::TestParamInfo<PlaygroundTest::ParamType>& info) { \
-        return PlaygroundBackendToString(info.param);                       \
+#define INSTANTIATE_PLAYGROUND_SUITE(playground)                             \
+  [[maybe_unused]] const char* kYouInstantiated##playground##MultipleTimes = \
+      "";                                                                    \
+  INSTANTIATE_TEST_SUITE_P(                                                  \
+      Play, playground,                                                      \
+      ::testing::Values(PlaygroundBackend::kMetal,                           \
+                        PlaygroundBackend::kOpenGLES,                        \
+                        PlaygroundBackend::kVulkan),                         \
+      [](const ::testing::TestParamInfo<PlaygroundTest::ParamType>& info) {  \
+        return PlaygroundBackendToString(info.param);                        \
+      });
+
+#define INSTANTIATE_METAL_PLAYGROUND_SUITE(playground)                       \
+  [[maybe_unused]] const char* kYouInstantiated##playground##MultipleTimes = \
+      "";                                                                    \
+  INSTANTIATE_TEST_SUITE_P(                                                  \
+      Play, playground, ::testing::Values(PlaygroundBackend::kMetal),        \
+      [](const ::testing::TestParamInfo<PlaygroundTest::ParamType>& info) {  \
+        return PlaygroundBackendToString(info.param);                        \
+      });
+
+#define INSTANTIATE_VULKAN_PLAYGROUND_SUITE(playground)                      \
+  [[maybe_unused]] const char* kYouInstantiated##playground##MultipleTimes = \
+      "";                                                                    \
+  INSTANTIATE_TEST_SUITE_P(                                                  \
+      Play, playground, ::testing::Values(PlaygroundBackend::kVulkan),       \
+      [](const ::testing::TestParamInfo<PlaygroundTest::ParamType>& info) {  \
+        return PlaygroundBackendToString(info.param);                        \
+      });
+
+#define INSTANTIATE_OPENGLES_PLAYGROUND_SUITE(playground)                    \
+  [[maybe_unused]] const char* kYouInstantiated##playground##MultipleTimes = \
+      "";                                                                    \
+  INSTANTIATE_TEST_SUITE_P(                                                  \
+      Play, playground, ::testing::Values(PlaygroundBackend::kOpenGLES),     \
+      [](const ::testing::TestParamInfo<PlaygroundTest::ParamType>& info) {  \
+        return PlaygroundBackendToString(info.param);                        \
       });
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_PLAYGROUND_PLAYGROUND_TEST_H_
diff --git a/impeller/playground/switches.cc b/impeller/playground/switches.cc
new file mode 100644
index 0000000000000000000000000000000000000000..89971fc25a06dcfaa7be2e05ff6540cfdbcc5764
--- /dev/null
+++ b/impeller/playground/switches.cc
@@ -0,0 +1,32 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/playground/switches.h"
+
+#include <cstdlib>
+
+#include "flutter/fml/build_config.h"
+
+namespace impeller {
+
+PlaygroundSwitches::PlaygroundSwitches() = default;
+
+PlaygroundSwitches::PlaygroundSwitches(const fml::CommandLine& args) {
+  enable_playground = args.HasOption("enable_playground");
+  std::string timeout_str;
+  if (args.GetOptionValue("playground_timeout_ms", &timeout_str)) {
+    timeout = std::chrono::milliseconds(atoi(timeout_str.c_str()));
+    // Specifying a playground timeout implies you want to enable playgrounds.
+    enable_playground = true;
+  }
+  enable_vulkan_validation = args.HasOption("enable_vulkan_validation");
+  use_swiftshader = args.HasOption("use_swiftshader");
+  use_angle = args.HasOption("use_angle");
+#if FML_OS_MACOSX
+  // OpenGL on macOS is busted and deprecated. Use Angle there by default.
+  use_angle = true;
+#endif  // FML_OS_MACOSX
+}
+
+}  // namespace impeller
diff --git a/impeller/playground/switches.h b/impeller/playground/switches.h
new file mode 100644
index 0000000000000000000000000000000000000000..be49fb0191a9bdbbe9ac219564a0b44ce2abba1e
--- /dev/null
+++ b/impeller/playground/switches.h
@@ -0,0 +1,43 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_PLAYGROUND_SWITCHES_H_
+#define FLUTTER_IMPELLER_PLAYGROUND_SWITCHES_H_
+
+#include <chrono>
+#include <optional>
+
+#include "flutter/fml/command_line.h"
+#include "flutter/fml/macros.h"
+
+namespace impeller {
+
+struct PlaygroundSwitches {
+  bool enable_playground = false;
+  // If specified, the playgrounds will render for at least the duration
+  // specified in the timeout. If the timeout is zero, exactly one frame will be
+  // rendered in the playground.
+  std::optional<std::chrono::milliseconds> timeout;
+  bool enable_vulkan_validation = false;
+  //----------------------------------------------------------------------------
+  /// Seek a SwiftShader library in known locations and use it when running
+  /// Vulkan. It is a fatal error to provide this option and not have the test
+  /// find a SwiftShader implementation.
+  ///
+  bool use_swiftshader = false;
+  /// Attempt to use Angle on the system instead of the available OpenGL ES
+  /// implementation. This is on-by-default on macOS due to the broken-ness in
+  /// the deprecated OpenGL implementation. On other platforms, it this opt-in
+  /// via the flag with the system OpenGL ES implementation used by fault.
+  ///
+  bool use_angle = false;
+
+  PlaygroundSwitches();
+
+  explicit PlaygroundSwitches(const fml::CommandLine& args);
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_PLAYGROUND_SWITCHES_H_
diff --git a/impeller/playground/widgets.cc b/impeller/playground/widgets.cc
index ed3f76c380098c2564aab7f7a874153ed4656ed1..62122996c6b9e6904925a529ccd5b955b8579f54 100644
--- a/impeller/playground/widgets.cc
+++ b/impeller/playground/widgets.cc
@@ -2,10 +2,67 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "widgets.h"
+#include "impeller/playground/widgets.h"
 
 namespace impeller {
 
+Point DrawPlaygroundPoint(PlaygroundPoint& point) {
+  if (ImGui::GetCurrentContext()) {
+    impeller::Point mouse_pos(ImGui::GetMousePos().x, ImGui::GetMousePos().y);
+    if (!point.prev_mouse_pos.has_value()) {
+      point.prev_mouse_pos = mouse_pos;
+    }
+
+    if (ImGui::IsKeyPressed(ImGuiKey_R)) {
+      point.position = point.reset_position;
+      point.dragging = false;
+    }
+
+    bool hovering =
+        point.position.GetDistance(mouse_pos) < point.radius &&
+        point.position.GetDistance(point.prev_mouse_pos.value()) < point.radius;
+    if (!ImGui::IsMouseDown(0)) {
+      point.dragging = false;
+    } else if (hovering && ImGui::IsMouseClicked(0)) {
+      point.dragging = true;
+    }
+    if (point.dragging) {
+      point.position += mouse_pos - point.prev_mouse_pos.value();
+    }
+    ImGui::GetBackgroundDrawList()->AddCircleFilled(
+        {point.position.x, point.position.y}, point.radius,
+        ImColor(point.color.red, point.color.green, point.color.blue,
+                (hovering || point.dragging) ? 0.6f : 0.3f));
+    if (hovering || point.dragging) {
+      ImGui::GetBackgroundDrawList()->AddText(
+          {point.position.x - point.radius,
+           point.position.y + point.radius + 10},
+          ImColor(point.color.red, point.color.green, point.color.blue, 1.0f),
+          impeller::SPrintF("x:%0.3f y:%0.3f", point.position.x,
+                            point.position.y)
+              .c_str());
+    }
+    point.prev_mouse_pos = mouse_pos;
+  }
+  return point.position;
+}
+
+std::tuple<Point, Point> DrawPlaygroundLine(PlaygroundPoint& point_a,
+                                            PlaygroundPoint& point_b) {
+  Point position_a = DrawPlaygroundPoint(point_a);
+  Point position_b = DrawPlaygroundPoint(point_b);
+
+  if (ImGui::GetCurrentContext()) {
+    auto dir = (position_b - position_a).Normalize() * point_a.radius;
+    auto line_a = position_a + dir;
+    auto line_b = position_b - dir;
+    ImGui::GetBackgroundDrawList()->AddLine(
+        {line_a.x, line_a.y}, {line_b.x, line_b.y},
+        ImColor(point_b.color.red, point_b.color.green, point_b.color.blue,
+                0.3f));
+  }
+  return std::make_tuple(position_a, position_b);
+}
 //
 
 }  // namespace impeller
diff --git a/impeller/playground/widgets.h b/impeller/playground/widgets.h
index 819d47ff2c64cc633f154743a0b65096f3bb303a..7da9b4b4865cba984d1d2acc4ee80bc83bec3a2c 100644
--- a/impeller/playground/widgets.h
+++ b/impeller/playground/widgets.h
@@ -2,8 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_PLAYGROUND_WIDGETS_H_
+#define FLUTTER_IMPELLER_PLAYGROUND_WIDGETS_H_
 
+#include <optional>
 #include <tuple>
 
 #include "impeller/base/strings.h"
@@ -11,65 +13,27 @@
 #include "impeller/geometry/point.h"
 #include "third_party/imgui/imgui.h"
 
-#define IMPELLER_PLAYGROUND_POINT(default_position, radius, color)             \
-  ({                                                                           \
-    static impeller::Point position = default_position;                        \
-    static impeller::Point reset_position = default_position;                  \
-    float radius_ = radius;                                                    \
-    impeller::Color color_ = color;                                            \
-                                                                               \
-    static bool dragging = false;                                              \
-    impeller::Point mouse_pos(ImGui::GetMousePos().x, ImGui::GetMousePos().y); \
-    static impeller::Point prev_mouse_pos = mouse_pos;                         \
-                                                                               \
-    if (ImGui::IsKeyPressed('R')) {                                            \
-      position = reset_position;                                               \
-      dragging = false;                                                        \
-    }                                                                          \
-                                                                               \
-    bool hovering = position.GetDistance(mouse_pos) < radius_ &&               \
-                    position.GetDistance(prev_mouse_pos) < radius_;            \
-    if (!ImGui::IsMouseDown(0)) {                                              \
-      dragging = false;                                                        \
-    } else if (hovering && ImGui::IsMouseClicked(0)) {                         \
-      dragging = true;                                                         \
-    }                                                                          \
-    if (dragging) {                                                            \
-      position += mouse_pos - prev_mouse_pos;                                  \
-    }                                                                          \
-    ImGui::GetBackgroundDrawList()->AddCircleFilled(                           \
-        {position.x, position.y}, radius_,                                     \
-        ImColor(color_.red, color_.green, color_.blue,                         \
-                (hovering || dragging) ? 0.6f : 0.3f));                        \
-    if (hovering || dragging) {                                                \
-      ImGui::GetBackgroundDrawList()->AddText(                                 \
-          {position.x - radius_, position.y + radius_ + 10},                   \
-          ImColor(color_.red, color.green, color.blue, 1.0f),                  \
-          impeller::SPrintF("x:%0.3f y:%0.3f", position.x, position.y)         \
-              .c_str());                                                       \
-    }                                                                          \
-    prev_mouse_pos = mouse_pos;                                                \
-    position;                                                                  \
-  })
+namespace impeller {
+struct PlaygroundPoint {
+  PlaygroundPoint(Point default_position, Scalar p_radius, Color p_color)
+      : position(default_position),
+        reset_position(default_position),
+        radius(p_radius),
+        color(p_color) {}
+  Point position;
+  Point reset_position;
+  bool dragging = false;
+  std::optional<Point> prev_mouse_pos;
+  Scalar radius;
+  Color color;
+  PlaygroundPoint(const PlaygroundPoint&) = delete;
+  PlaygroundPoint(PlaygroundPoint&&) = delete;
+  PlaygroundPoint& operator=(const PlaygroundPoint&) = delete;
+};
 
-#define IMPELLER_PLAYGROUND_LINE(default_position_a, default_position_b, \
-                                 radius, color_a, color_b)               \
-  ({                                                                     \
-    impeller::Point position_a = default_position_a;                     \
-    impeller::Point position_b = default_position_b;                     \
-    float r_ = radius;                                                   \
-    impeller::Color color_a_ = color_a;                                  \
-    impeller::Color color_b_ = color_b;                                  \
-                                                                         \
-    position_a = IMPELLER_PLAYGROUND_POINT(position_a, r_, color_a_);    \
-    position_b = IMPELLER_PLAYGROUND_POINT(position_b, r_, color_b_);    \
-                                                                         \
-    auto dir = (position_b - position_a).Normalize() * r_;               \
-    auto line_a = position_a + dir;                                      \
-    auto line_b = position_b - dir;                                      \
-    ImGui::GetBackgroundDrawList()->AddLine(                             \
-        {line_a.x, line_a.y}, {line_b.x, line_b.y},                      \
-        ImColor(color_b.red, color_b.green, color_b.blue, 0.3f));        \
-                                                                         \
-    std::make_tuple(position_a, position_b);                             \
-  })
+Point DrawPlaygroundPoint(PlaygroundPoint& point);
+
+std::tuple<Point, Point> DrawPlaygroundLine(PlaygroundPoint& point_a,
+                                            PlaygroundPoint& point_b);
+}  // namespace impeller
+#endif  // FLUTTER_IMPELLER_PLAYGROUND_WIDGETS_H_
diff --git a/impeller/renderer/BUILD.gn b/impeller/renderer/BUILD.gn
index 100d5db2202c42da2b150b81f073ee88bd4d413b..2cf663bc4db1dcac8d3d3512dfa8f58284aab47d 100644
--- a/impeller/renderer/BUILD.gn
+++ b/impeller/renderer/BUILD.gn
@@ -4,24 +4,59 @@
 
 import("//flutter/impeller/tools/impeller.gni")
 
+if (impeller_enable_compute) {
+  impeller_shaders("compute_shaders") {
+    name = "compute"
+    enable_opengles = false
+
+    if (impeller_enable_vulkan) {
+      vulkan_language_version = 130
+    }
+
+    if (is_ios) {
+      metal_version = "2.4"
+    } else if (is_mac) {
+      metal_version = "2.1"
+    }
+
+    shaders = [
+      "stroke.comp",
+      "path_polyline.comp",
+      "prefix_sum_test.comp",
+      "threadgroup_sizing_test.comp",
+    ]
+  }
+
+  impeller_component("compute_tessellation_unittests") {
+    testonly = true
+    sources = [ "compute_subgroup_unittests.cc" ]
+
+    deps = [
+      ":compute_shaders",
+      ":renderer",
+      "../display_list:skia_conversions",
+      "../entity",
+      "../fixtures",
+      "../playground:playground_test",
+      "//flutter/testing:testing_lib",
+    ]
+  }
+}
+
 impeller_component("renderer") {
   sources = [
-    "allocator.cc",
-    "allocator.h",
     "blit_command.cc",
     "blit_command.h",
     "blit_pass.cc",
     "blit_pass.h",
-    "buffer.cc",
-    "buffer.h",
-    "buffer_view.cc",
-    "buffer_view.h",
+    "capabilities.cc",
+    "capabilities.h",
     "command.cc",
     "command.h",
     "command_buffer.cc",
     "command_buffer.h",
-    "compute_command.cc",
-    "compute_command.h",
+    "command_queue.cc",
+    "command_queue.h",
     "compute_pass.cc",
     "compute_pass.h",
     "compute_pipeline_builder.cc",
@@ -30,17 +65,6 @@ impeller_component("renderer") {
     "compute_pipeline_descriptor.h",
     "context.cc",
     "context.h",
-    "descriptor_set_layout.h",
-    "device_buffer.cc",
-    "device_buffer.h",
-    "device_buffer_descriptor.cc",
-    "device_buffer_descriptor.h",
-    "formats.cc",
-    "formats.h",
-    "gpu_tracer.cc",
-    "gpu_tracer.h",
-    "host_buffer.cc",
-    "host_buffer.h",
     "pipeline.cc",
     "pipeline.h",
     "pipeline_builder.cc",
@@ -49,20 +73,13 @@ impeller_component("renderer") {
     "pipeline_descriptor.h",
     "pipeline_library.cc",
     "pipeline_library.h",
-    "platform.cc",
-    "platform.h",
-    "range.cc",
-    "range.h",
+    "pool.h",
     "render_pass.cc",
     "render_pass.h",
     "render_target.cc",
     "render_target.h",
     "renderer.cc",
     "renderer.h",
-    "sampler.cc",
-    "sampler.h",
-    "sampler_descriptor.cc",
-    "sampler_descriptor.h",
     "sampler_library.cc",
     "sampler_library.h",
     "shader_function.cc",
@@ -71,18 +88,12 @@ impeller_component("renderer") {
     "shader_key.h",
     "shader_library.cc",
     "shader_library.h",
-    "shader_types.cc",
-    "shader_types.h",
     "snapshot.cc",
     "snapshot.h",
     "surface.cc",
     "surface.h",
-    "texture.cc",
-    "texture.h",
-    "texture_descriptor.cc",
-    "texture_descriptor.h",
-    "vertex_buffer.cc",
-    "vertex_buffer.h",
+    "texture_mipmap.cc",
+    "texture_mipmap.h",
     "vertex_buffer_builder.cc",
     "vertex_buffer_builder.h",
     "vertex_descriptor.cc",
@@ -91,12 +102,20 @@ impeller_component("renderer") {
 
   public_deps = [
     "../base",
+    "../core",
     "../geometry",
-    "../image",
     "../runtime_stage",
     "../tessellator",
   ]
 
+  if (impeller_enable_compute) {
+    sources += [
+      "compute_tessellator.cc",
+      "compute_tessellator.h",
+    ]
+    public_deps += [ ":compute_shaders" ]
+  }
+
   deps = [ "//flutter/fml" ]
 }
 
@@ -104,20 +123,42 @@ impeller_component("renderer_unittests") {
   testonly = true
 
   sources = [
+    "blit_pass_unittests.cc",
+    "capabilities_unittests.cc",
     "device_buffer_unittests.cc",
-    "host_buffer_unittests.cc",
     "pipeline_descriptor_unittests.cc",
+    "pool_unittests.cc",
     "renderer_unittests.cc",
   ]
 
-  if (impeller_enable_metal || impeller_enable_vulkan) {
+  deps = [
+    ":renderer",
+    "../fixtures",
+    "../playground:playground_test",
+    "//flutter/testing:testing_lib",
+  ]
+
+  if (impeller_enable_compute) {
     sources += [ "compute_unittests.cc" ]
   }
+}
+
+impeller_component("renderer_dart_unittests") {
+  testonly = true
+
+  sources = [ "renderer_dart_unittests.cc" ]
+
+  public_configs = [ "//flutter:export_dynamic_symbols" ]
 
   deps = [
     ":renderer",
-    "../fixtures",
+    "../fixtures:flutter_gpu_fixtures",
+    "../fixtures:flutter_gpu_shaders",
     "../playground:playground_test",
-    "//flutter/testing:testing_lib",
+    "//flutter/lib/gpu",
+    "//flutter/lib/snapshot",
+    "//flutter/runtime:runtime",
+    "//flutter/testing:fixture_test",
+    "//flutter/testing:testing",
   ]
 }
diff --git a/impeller/renderer/backend/BUILD.gn b/impeller/renderer/backend/BUILD.gn
index bf0d18d4f50bd9f18edaad30b47edf528df961f9..609d0a22ec7ed1839b584bf8d37e6fbb420d03f4 100644
--- a/impeller/renderer/backend/BUILD.gn
+++ b/impeller/renderer/backend/BUILD.gn
@@ -8,14 +8,17 @@ group("backend") {
   public_deps = []
 
   if (impeller_enable_metal) {
+    assert(is_mac || is_ios)
     public_deps += [ "metal" ]
   }
 
   if (impeller_enable_opengles) {
+    assert(is_mac || is_linux || is_win || is_android || is_ohos)
     public_deps += [ "gles" ]
   }
 
   if (impeller_enable_vulkan) {
+    assert(is_mac || is_linux || is_win || is_android || is_ohos)
     public_deps += [ "vulkan" ]
   }
 }
diff --git a/impeller/renderer/backend/gles/BUILD.gn b/impeller/renderer/backend/gles/BUILD.gn
index 7141abc3304ed5c2e74b632e30ef4c8da8e670dd..de7c968e3a7c739baa5c0e5cd51ff36d7e3ef531 100644
--- a/impeller/renderer/backend/gles/BUILD.gn
+++ b/impeller/renderer/backend/gles/BUILD.gn
@@ -2,12 +2,31 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//flutter/vulkan/config.gni")
 import("../../../tools/impeller.gni")
 
 config("gles_config") {
   # Generic GL/GLES/EGL/Vulkan headers. Any will do. We just pick one from Angle
   # because they are there.
-  include_dirs = [ "//third_party/angle/include" ]
+  include_dirs = [ "//flutter/third_party/angle/include" ]
+}
+
+impeller_component("gles_unittests") {
+  testonly = true
+  sources = [
+    "test/capabilities_unittests.cc",
+    "test/formats_gles_unittests.cc",
+    "test/gpu_tracer_gles_unittests.cc",
+    "test/mock_gles.cc",
+    "test/mock_gles.h",
+    "test/mock_gles_unittests.cc",
+    "test/proc_table_gles_unittests.cc",
+    "test/specialization_constants_unittests.cc",
+  ]
+  deps = [
+    ":gles",
+    "//flutter/testing:testing_lib",
+  ]
 }
 
 impeller_component("gles") {
@@ -35,6 +54,8 @@ impeller_component("gles") {
     "formats_gles.cc",
     "formats_gles.h",
     "gles.h",
+    "gpu_tracer_gles.cc",
+    "gpu_tracer_gles.h",
     "handle_gles.cc",
     "handle_gles.h",
     "pipeline_gles.cc",
@@ -61,20 +82,20 @@ impeller_component("gles") {
     "texture_gles.h",
   ]
 
-  if (!is_android && !is_fuchsia) {
+  if (!is_android && !is_fuchsia && !is_ohos) {
     public_configs = [ ":gles_config" ]
     sources += [
-      "//third_party/angle/include/GLES2/gl2ext.h",
+      "//flutter/third_party/angle/include/GLES2/gl2ext.h",
 
       # The GLES3 API is a superset of GLES2. Although we target GLES2, we use
       # some GLES3 features if the driver supports them.
-      "//third_party/angle/include/GLES3/gl3.h",
+      "//flutter/third_party/angle/include/GLES3/gl3.h",
     ]
   }
 
   public_deps = [
     "../../:renderer",
-    "../../../blobcat:blobcat_lib",
+    "../../../shader_archive",
     "//flutter/fml",
   ]
 }
diff --git a/impeller/renderer/backend/gles/allocator_gles.h b/impeller/renderer/backend/gles/allocator_gles.h
index 171daf7f44a16b50ec3d32f57e75b5ae7af99de0..a78980382b65dac972f09632e3fbfc18d461e211 100644
--- a/impeller/renderer/backend/gles/allocator_gles.h
+++ b/impeller/renderer/backend/gles/allocator_gles.h
@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_ALLOCATOR_GLES_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_ALLOCATOR_GLES_H_
 
 #include "flutter/fml/macros.h"
-#include "impeller/renderer/allocator.h"
+#include "impeller/core/allocator.h"
 #include "impeller/renderer/backend/gles/reactor_gles.h"
 
 namespace impeller {
@@ -21,7 +22,7 @@ class AllocatorGLES final : public Allocator {
   ReactorGLES::Ref reactor_;
   bool is_valid_ = false;
 
-  AllocatorGLES(ReactorGLES::Ref reactor);
+  explicit AllocatorGLES(ReactorGLES::Ref reactor);
 
   // |Allocator|
   bool IsValid() const;
@@ -37,7 +38,11 @@ class AllocatorGLES final : public Allocator {
   // |Allocator|
   ISize GetMaxTextureSizeSupported() const override;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(AllocatorGLES);
+  AllocatorGLES(const AllocatorGLES&) = delete;
+
+  AllocatorGLES& operator=(const AllocatorGLES&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_ALLOCATOR_GLES_H_
diff --git a/impeller/renderer/backend/gles/blit_command_gles.cc b/impeller/renderer/backend/gles/blit_command_gles.cc
index 14016f7123b0f52fe53e6d9bf6649c955ba866d0..f30ce5446f5d8e5c713d5c9c60251ad52e0a4dd4 100644
--- a/impeller/renderer/backend/gles/blit_command_gles.cc
+++ b/impeller/renderer/backend/gles/blit_command_gles.cc
@@ -41,14 +41,14 @@ static std::optional<GLuint> ConfigureFBO(
   gl.BindFramebuffer(fbo_type, fbo);
 
   if (!TextureGLES::Cast(*texture).SetAsFramebufferAttachment(
-          fbo_type, fbo, TextureGLES::AttachmentPoint::kColor0)) {
+          fbo_type, TextureGLES::AttachmentType::kColor0)) {
     VALIDATION_LOG << "Could not attach texture to framebuffer.";
     DeleteFBO(gl, fbo, fbo_type);
     return std::nullopt;
   }
 
   if (gl.CheckFramebufferStatus(fbo_type) != GL_FRAMEBUFFER_COMPLETE) {
-    VALIDATION_LOG << "Could not create a complete frambuffer.";
+    VALIDATION_LOG << "Could not create a complete framebuffer.";
     DeleteFBO(gl, fbo, fbo_type);
     return std::nullopt;
   }
@@ -102,14 +102,14 @@ bool BlitCopyTextureToTextureCommandGLES::Encode(
   gl.Disable(GL_DEPTH_TEST);
   gl.Disable(GL_STENCIL_TEST);
 
-  gl.BlitFramebuffer(source_region.origin.x,     // srcX0
-                     source_region.origin.y,     // srcY0
-                     source_region.size.width,   // srcX1
-                     source_region.size.height,  // srcY1
+  gl.BlitFramebuffer(source_region.GetX(),       // srcX0
+                     source_region.GetY(),       // srcY0
+                     source_region.GetWidth(),   // srcX1
+                     source_region.GetHeight(),  // srcY1
                      destination_origin.x,       // dstX0
                      destination_origin.y,       // dstY0
-                     source_region.size.width,   // dstX1
-                     source_region.size.height,  // dstY1
+                     source_region.GetWidth(),   // dstX1
+                     source_region.GetHeight(),  // dstY1
                      GL_COLOR_BUFFER_BIT,        // mask
                      GL_NEAREST                  // filter
   );
@@ -147,8 +147,8 @@ bool BlitCopyTextureToBufferCommandGLES::Encode(
 
   DeviceBufferGLES::Cast(*destination)
       .UpdateBufferData([&gl, this](uint8_t* data, size_t length) {
-        gl.ReadPixels(source_region.origin.x, source_region.origin.y,
-                      source_region.size.width, source_region.size.height,
+        gl.ReadPixels(source_region.GetX(), source_region.GetY(),
+                      source_region.GetWidth(), source_region.GetHeight(),
                       GL_RGBA, GL_UNSIGNED_BYTE, data + destination_offset);
       });
 
@@ -163,7 +163,7 @@ std::string BlitGenerateMipmapCommandGLES::GetLabel() const {
 
 bool BlitGenerateMipmapCommandGLES::Encode(const ReactorGLES& reactor) const {
   auto texture_gles = TextureGLES::Cast(texture.get());
-  if (!texture_gles->GenerateMipmaps()) {
+  if (!texture_gles->GenerateMipmap()) {
     return false;
   }
 
diff --git a/impeller/renderer/backend/gles/blit_command_gles.h b/impeller/renderer/backend/gles/blit_command_gles.h
index 570b1f19d30fb01fadf559927b4836defa486b1c..5fa9c802f3a5bd9b7b08256024e5645f7c87c955 100644
--- a/impeller/renderer/backend/gles/blit_command_gles.h
+++ b/impeller/renderer/backend/gles/blit_command_gles.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_BLIT_COMMAND_GLES_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_BLIT_COMMAND_GLES_H_
 
 #include "impeller/base/backend_cast.h"
 #include "impeller/renderer/backend/gles/reactor_gles.h"
@@ -49,3 +50,5 @@ struct BlitGenerateMipmapCommandGLES : public BlitEncodeGLES,
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_BLIT_COMMAND_GLES_H_
diff --git a/impeller/renderer/backend/gles/blit_pass_gles.cc b/impeller/renderer/backend/gles/blit_pass_gles.cc
index 8685d86aa4a292b075efbd717f4072ada180039a..92364c4c7cf20caf20ffbed53f949b85c6cc2155 100644
--- a/impeller/renderer/backend/gles/blit_pass_gles.cc
+++ b/impeller/renderer/backend/gles/blit_pass_gles.cc
@@ -4,19 +4,13 @@
 
 #include "impeller/renderer/backend/gles/blit_pass_gles.h"
 
-#include <algorithm>
 #include <memory>
 
 #include "flutter/fml/trace_event.h"
-#include "impeller/base/config.h"
-#include "impeller/base/validation.h"
+#include "fml/closure.h"
+#include "impeller/core/formats.h"
 #include "impeller/renderer/backend/gles/blit_command_gles.h"
-#include "impeller/renderer/backend/gles/device_buffer_gles.h"
-#include "impeller/renderer/backend/gles/formats_gles.h"
-#include "impeller/renderer/backend/gles/pipeline_gles.h"
 #include "impeller/renderer/backend/gles/proc_table_gles.h"
-#include "impeller/renderer/backend/gles/texture_gles.h"
-#include "impeller/renderer/formats.h"
 
 namespace impeller {
 
@@ -42,7 +36,7 @@ void BlitPassGLES::OnSetLabel(std::string label) {
     const ReactorGLES& reactor,
     const std::vector<std::unique_ptr<BlitEncodeGLES>>& commands,
     const std::string& label) {
-  TRACE_EVENT0("impeller", __FUNCTION__);
+  TRACE_EVENT0("impeller", "BlitPassGLES::EncodeCommandsInReactor");
 
   if (commands.empty()) {
     return true;
@@ -86,10 +80,12 @@ bool BlitPassGLES::EncodeCommands(
     return true;
   }
 
-  return reactor_->AddOperation([transients_allocator, &commands = commands_,
+  std::shared_ptr<const BlitPassGLES> shared_this = shared_from_this();
+  return reactor_->AddOperation([transients_allocator,
+                                 blit_pass = std::move(shared_this),
                                  label = label_](const auto& reactor) {
-    auto result =
-        EncodeCommandsInReactor(transients_allocator, reactor, commands, label);
+    auto result = EncodeCommandsInReactor(transients_allocator, reactor,
+                                          blit_pass->commands_, label);
     FML_CHECK(result) << "Must be able to encode GL commands without error.";
   });
 }
diff --git a/impeller/renderer/backend/gles/blit_pass_gles.h b/impeller/renderer/backend/gles/blit_pass_gles.h
index deaf1a41835f4c207a18e54ecd6e41455ca52dea..b38fa0da634c1f67e967e604b4d0fde0a3c7bd44 100644
--- a/impeller/renderer/backend/gles/blit_pass_gles.h
+++ b/impeller/renderer/backend/gles/blit_pass_gles.h
@@ -2,16 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_BLIT_PASS_GLES_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_BLIT_PASS_GLES_H_
+
+#include <memory>
 
 #include "flutter/fml/macros.h"
+#include "flutter/impeller/base/config.h"
 #include "flutter/impeller/renderer/backend/gles/reactor_gles.h"
 #include "flutter/impeller/renderer/blit_pass.h"
 #include "impeller/renderer/backend/gles/blit_command_gles.h"
 
 namespace impeller {
 
-class BlitPassGLES final : public BlitPass {
+class BlitPassGLES final : public BlitPass,
+                           public std::enable_shared_from_this<BlitPassGLES> {
  public:
   // |BlitPass|
   ~BlitPassGLES() override;
@@ -50,11 +55,23 @@ class BlitPassGLES final : public BlitPass {
                                     size_t destination_offset,
                                     std::string label) override;
 
+  // |BlitPass|
+  bool OnCopyBufferToTextureCommand(BufferView source,
+                                    std::shared_ptr<Texture> destination,
+                                    IPoint destination_origin,
+                                    std::string label) override {
+    IMPELLER_UNIMPLEMENTED;
+    return false;
+  }
   // |BlitPass|
   bool OnGenerateMipmapCommand(std::shared_ptr<Texture> texture,
                                std::string label) override;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(BlitPassGLES);
+  BlitPassGLES(const BlitPassGLES&) = delete;
+
+  BlitPassGLES& operator=(const BlitPassGLES&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_BLIT_PASS_GLES_H_
diff --git a/impeller/renderer/backend/gles/buffer_bindings_gles.cc b/impeller/renderer/backend/gles/buffer_bindings_gles.cc
index 3861765b0391f13432d14c678ce68bac70bdd289..4067498173b9ea3080f0526ead474716c7b3e7f9 100644
--- a/impeller/renderer/backend/gles/buffer_bindings_gles.cc
+++ b/impeller/renderer/backend/gles/buffer_bindings_gles.cc
@@ -4,13 +4,11 @@
 
 #include "impeller/renderer/backend/gles/buffer_bindings_gles.h"
 
-#include <algorithm>
 #include <cstring>
-#include <sstream>
 #include <vector>
 
-#include "impeller/base/config.h"
 #include "impeller/base/validation.h"
+#include "impeller/core/shader_types.h"
 #include "impeller/renderer/backend/gles/device_buffer_gles.h"
 #include "impeller/renderer/backend/gles/formats_gles.h"
 #include "impeller/renderer/backend/gles/sampler_gles.h"
@@ -18,23 +16,23 @@
 
 namespace impeller {
 
+// This prefix is used in the names of inputs generated by ANGLE's framebuffer
+// fetch emulation.
+static constexpr std::string_view kAngleInputAttachmentPrefix =
+    "ANGLEInputAttachment";
+
 BufferBindingsGLES::BufferBindingsGLES() = default;
 
 BufferBindingsGLES::~BufferBindingsGLES() = default;
 
 bool BufferBindingsGLES::RegisterVertexStageInput(
     const ProcTableGLES& gl,
-    const std::vector<ShaderStageIOSlot>& p_inputs) {
-  // Attrib locations have to be iterated over in order of location because we
-  // will be calculating offsets later.
-  auto inputs = p_inputs;
-  std::sort(inputs.begin(), inputs.end(), [](const auto& lhs, const auto& rhs) {
-    return lhs.location < rhs.location;
-  });
-
+    const std::vector<ShaderStageIOSlot>& p_inputs,
+    const std::vector<ShaderStageBufferLayout>& layouts) {
   std::vector<VertexAttribPointer> vertex_attrib_arrays;
-  size_t offset = 0u;
-  for (const auto& input : inputs) {
+  for (auto i = 0u; i < p_inputs.size(); i++) {
+    const auto& input = p_inputs[i];
+    const auto& layout = layouts[input.binding];
     VertexAttribPointer attrib;
     attrib.index = input.location;
     // Component counts must be 1, 2, 3 or 4. Do that validation now.
@@ -48,13 +46,10 @@ bool BufferBindingsGLES::RegisterVertexStageInput(
     }
     attrib.type = type.value();
     attrib.normalized = GL_FALSE;
-    attrib.offset = offset;
-    offset += (input.bit_width * input.vec_size) / 8;
+    attrib.offset = input.offset;
+    attrib.stride = layout.stride;
     vertex_attrib_arrays.emplace_back(attrib);
   }
-  for (auto& array : vertex_attrib_arrays) {
-    array.stride = offset;
-  }
   vertex_attrib_arrays_ = std::move(vertex_attrib_arrays);
   return true;
 }
@@ -70,18 +65,23 @@ static std::string NormalizeUniformKey(const std::string& key) {
   return result;
 }
 
-static std::string CreateUnifiormMemberKey(const std::string& struct_name,
-                                           const std::string& member,
-                                           bool is_array) {
-  std::stringstream stream;
-  stream << struct_name << "." << member;
+static std::string CreateUniformMemberKey(const std::string& struct_name,
+                                          const std::string& member,
+                                          bool is_array) {
+  std::string result;
+  result.reserve(struct_name.length() + member.length() + (is_array ? 4 : 1));
+  result += struct_name;
+  if (!member.empty()) {
+    result += '.';
+    result += member;
+  }
   if (is_array) {
-    stream << "[0]";
+    result += "[0]";
   }
-  return NormalizeUniformKey(stream.str());
+  return NormalizeUniformKey(result);
 }
 
-static std::string CreateUnifiormMemberKey(
+static std::string CreateUniformMemberKey(
     const std::string& non_struct_member) {
   return NormalizeUniformKey(non_struct_member);
 }
@@ -96,6 +96,9 @@ bool BufferBindingsGLES::ReadUniformsBindings(const ProcTableGLES& gl,
 
   GLint uniform_count = 0;
   gl.GetProgramiv(program, GL_ACTIVE_UNIFORMS, &uniform_count);
+
+  // Query the Program for all active uniform locations, and
+  // record this via normalized key.
   for (GLint i = 0; i < uniform_count; i++) {
     std::vector<GLchar> name;
     name.resize(max_name_size);
@@ -113,6 +116,17 @@ bool BufferBindingsGLES::ReadUniformsBindings(const ProcTableGLES& gl,
                         &uniform_type,      // type
                         name.data()         // name
     );
+
+    // Skip unrecognized variables generated by ANGLE.
+    if (gl.GetCapabilities()->IsANGLE()) {
+      if (written_count >=
+              static_cast<GLsizei>(kAngleInputAttachmentPrefix.length()) &&
+          std::string_view(name.data(), kAngleInputAttachmentPrefix.length()) ==
+              kAngleInputAttachmentPrefix) {
+        continue;
+      }
+    }
+
     auto location = gl.GetUniformLocation(program, name.data());
     if (location == -1) {
       VALIDATION_LOG << "Could not query the location of an active uniform.";
@@ -145,27 +159,30 @@ bool BufferBindingsGLES::BindVertexAttributes(const ProcTableGLES& gl,
   return true;
 }
 
-bool BufferBindingsGLES::BindUniformData(
-    const ProcTableGLES& gl,
-    Allocator& transients_allocator,
-    const Bindings& vertex_bindings,
-    const Bindings& fragment_bindings) const {
+bool BufferBindingsGLES::BindUniformData(const ProcTableGLES& gl,
+                                         Allocator& transients_allocator,
+                                         const Bindings& vertex_bindings,
+                                         const Bindings& fragment_bindings) {
   for (const auto& buffer : vertex_bindings.buffers) {
-    if (!BindUniformBuffer(gl, transients_allocator, buffer.second)) {
+    if (!BindUniformBuffer(gl, transients_allocator, buffer.view)) {
       return false;
     }
   }
   for (const auto& buffer : fragment_bindings.buffers) {
-    if (!BindUniformBuffer(gl, transients_allocator, buffer.second)) {
+    if (!BindUniformBuffer(gl, transients_allocator, buffer.view)) {
       return false;
     }
   }
 
-  if (!BindTextures(gl, vertex_bindings, ShaderStage::kVertex)) {
+  std::optional<size_t> next_unit_index =
+      BindTextures(gl, vertex_bindings, ShaderStage::kVertex);
+  if (!next_unit_index.has_value()) {
     return false;
   }
 
-  if (!BindTextures(gl, fragment_bindings, ShaderStage::kFragment)) {
+  if (!BindTextures(gl, fragment_bindings, ShaderStage::kFragment,
+                    *next_unit_index)
+           .has_value()) {
     return false;
   }
 
@@ -179,18 +196,60 @@ bool BufferBindingsGLES::UnbindVertexAttributes(const ProcTableGLES& gl) const {
   return true;
 }
 
-bool BufferBindingsGLES::BindUniformBuffer(const ProcTableGLES& gl,
-                                           Allocator& transients_allocator,
-                                           const BufferResource& buffer) const {
-  const auto* metadata = buffer.isa;
-  if (metadata == nullptr) {
-    // Vertex buffer bindings don't have metadata as those definitions are
-    // already handled by vertex attrib pointers. Keep going.
-    return true;
+GLint BufferBindingsGLES::ComputeTextureLocation(
+    const ShaderMetadata* metadata) {
+  auto location = binding_map_.find(metadata->name);
+  if (location != binding_map_.end()) {
+    return location->second[0];
+  }
+  auto& locations = binding_map_[metadata->name] = {};
+  auto computed_location =
+      uniform_locations_.find(CreateUniformMemberKey(metadata->name));
+  if (computed_location == uniform_locations_.end()) {
+    locations.push_back(-1);
+  } else {
+    locations.push_back(computed_location->second);
+  }
+  return locations[0];
+}
+
+const std::vector<GLint>& BufferBindingsGLES::ComputeUniformLocations(
+    const ShaderMetadata* metadata) {
+  auto location = binding_map_.find(metadata->name);
+  if (location != binding_map_.end()) {
+    return location->second;
+  }
+
+  // For each metadata member, look up the binding location and record
+  // it in the binding map.
+  auto& locations = binding_map_[metadata->name] = {};
+  for (const auto& member : metadata->members) {
+    if (member.type == ShaderType::kVoid) {
+      // Void types are used for padding. We are obviously not going to find
+      // mappings for these. Keep going.
+      locations.push_back(-1);
+      continue;
+    }
+
+    size_t element_count = member.array_elements.value_or(1);
+    const auto member_key =
+        CreateUniformMemberKey(metadata->name, member.name, element_count > 1);
+    const auto computed_location = uniform_locations_.find(member_key);
+    if (computed_location == uniform_locations_.end()) {
+      // Uniform was not active.
+      locations.push_back(-1);
+      continue;
+    }
+    locations.push_back(computed_location->second);
   }
+  return locations;
+}
 
-  auto device_buffer =
-      buffer.resource.buffer->GetDeviceBuffer(transients_allocator);
+bool BufferBindingsGLES::BindUniformBuffer(const ProcTableGLES& gl,
+                                           Allocator& transients_allocator,
+                                           const BufferResource& buffer) {
+  const auto* metadata = buffer.GetMetadata();
+  auto device_buffer = buffer.resource.buffer;
   if (!device_buffer) {
     VALIDATION_LOG << "Device buffer not found.";
     return false;
@@ -206,35 +265,25 @@ bool BufferBindingsGLES::BindUniformBuffer(const ProcTableGLES& gl,
     return false;
   }
 
-  for (const auto& member : metadata->members) {
-    if (member.type == ShaderType::kVoid) {
-      // Void types are used for padding. We are obviously not going to find
-      // mappings for these. Keep going.
+  const auto& locations = ComputeUniformLocations(metadata);
+  for (auto i = 0u; i < metadata->members.size(); i++) {
+    const auto& member = metadata->members[i];
+    auto location = locations[i];
+    // Void type or inactive uniform.
+    if (location == -1 || member.type == ShaderType::kVoid) {
       continue;
     }
 
     size_t element_count = member.array_elements.value_or(1);
-
-    const auto member_key =
-        CreateUnifiormMemberKey(metadata->name, member.name, element_count > 1);
-    const auto location = uniform_locations_.find(member_key);
-    if (location == uniform_locations_.end()) {
-      // The list of uniform locations only contains "active" uniforms that are
-      // not optimized out. So this situation is expected to happen when unused
-      // uniforms are present in the shader.
-      continue;
-    }
-
     size_t element_stride = member.byte_length / element_count;
-
     auto* buffer_data =
         reinterpret_cast<const GLfloat*>(buffer_ptr + member.offset);
 
     std::vector<uint8_t> array_element_buffer;
     if (element_count > 1) {
-      // When binding uniform arrays, the elements must be contiguous. Copy the
-      // uniforms to a temp buffer to eliminate any padding needed by the other
-      // backends.
+      // When binding uniform arrays, the elements must be contiguous. Copy
+      // the uniforms to a temp buffer to eliminate any padding needed by the
+      // other backends.
       array_element_buffer.resize(member.size * element_count);
       for (size_t element_i = 0; element_i < element_count; element_i++) {
         std::memcpy(array_element_buffer.data() + element_i * member.size,
@@ -250,37 +299,40 @@ bool BufferBindingsGLES::BindUniformBuffer(const ProcTableGLES& gl,
       case ShaderType::kFloat:
         switch (member.size) {
           case sizeof(Matrix):
-            gl.UniformMatrix4fv(location->second,  // location
-                                element_count,     // count
-                                GL_FALSE,          // normalize
-                                buffer_data        // data
+            gl.UniformMatrix4fv(location,       // location
+                                element_count,  // count
+                                GL_FALSE,       // normalize
+                                buffer_data     // data
             );
             continue;
           case sizeof(Vector4):
-            gl.Uniform4fv(location->second,  // location
-                          element_count,     // count
-                          buffer_data        // data
+            gl.Uniform4fv(location,       // location
+                          element_count,  // count
+                          buffer_data     // data
             );
             continue;
           case sizeof(Vector3):
-            gl.Uniform3fv(location->second,  // location
-                          element_count,     // count
-                          buffer_data        // data
+            gl.Uniform3fv(location,       // location
+                          element_count,  // count
+                          buffer_data     // data
             );
             continue;
           case sizeof(Vector2):
-            gl.Uniform2fv(location->second,  // location
-                          element_count,     // count
-                          buffer_data        // data
+            gl.Uniform2fv(location,       // location
+                          element_count,  // count
+                          buffer_data     // data
             );
             continue;
           case sizeof(Scalar):
-            gl.Uniform1fv(location->second,  // location
-                          element_count,     // count
-                          buffer_data        // data
+            gl.Uniform1fv(location,       // location
+                          element_count,  // count
+                          buffer_data     // data
             );
             continue;
         }
+        VALIDATION_LOG << "Size " << member.size
+                       << " could not be mapped ShaderType::kFloat for key: "
+                       << member.name;
       case ShaderType::kBoolean:
       case ShaderType::kSignedByte:
       case ShaderType::kUnsignedByte:
@@ -300,29 +352,29 @@ bool BufferBindingsGLES::BindUniformBuffer(const ProcTableGLES& gl,
       case ShaderType::kSampledImage:
       case ShaderType::kSampler:
         VALIDATION_LOG << "Could not bind uniform buffer data for key: "
-                       << member_key;
+                       << member.name << " : " << static_cast<int>(member.type);
         return false;
     }
   }
   return true;
 }
 
-bool BufferBindingsGLES::BindTextures(const ProcTableGLES& gl,
-                                      const Bindings& bindings,
-                                      ShaderStage stage) const {
-  size_t active_index = 0;
-  for (const auto& texture : bindings.textures) {
-    const auto& texture_gles = TextureGLES::Cast(*texture.second.resource);
-    if (texture.second.isa == nullptr) {
+std::optional<size_t> BufferBindingsGLES::BindTextures(
+    const ProcTableGLES& gl,
+    const Bindings& bindings,
+    ShaderStage stage,
+    size_t unit_start_index) {
+  size_t active_index = unit_start_index;
+  for (const auto& data : bindings.sampled_images) {
+    const auto& texture_gles = TextureGLES::Cast(*data.texture.resource);
+    if (data.texture.GetMetadata() == nullptr) {
       VALIDATION_LOG << "No metadata found for texture binding.";
-      return false;
+      return std::nullopt;
     }
 
-    const auto uniform_key = CreateUnifiormMemberKey(texture.second.isa->name);
-    auto uniform = uniform_locations_.find(uniform_key);
-    if (uniform == uniform_locations_.end()) {
-      VALIDATION_LOG << "Could not find uniform for key: " << uniform_key;
-      return false;
+    auto location = ComputeTextureLocation(data.texture.GetMetadata());
+    if (location == -1) {
+      return std::nullopt;
     }
 
     //--------------------------------------------------------------------------
@@ -331,7 +383,7 @@ bool BufferBindingsGLES::BindTextures(const ProcTableGLES& gl,
     if (active_index >= gl.GetCapabilities()->GetMaxTextureUnits(stage)) {
       VALIDATION_LOG << "Texture units specified exceed the capabilities for "
                         "this shader stage.";
-      return false;
+      return std::nullopt;
     }
     gl.ActiveTexture(GL_TEXTURE0 + active_index);
 
@@ -339,32 +391,29 @@ bool BufferBindingsGLES::BindTextures(const ProcTableGLES& gl,
     /// Bind the texture.
     ///
     if (!texture_gles.Bind()) {
-      return false;
+      return std::nullopt;
     }
 
     //--------------------------------------------------------------------------
     /// If there is a sampler for the texture at the same index, configure the
     /// bound texture using that sampler.
     ///
-    auto sampler = bindings.samplers.find(texture.first);
-    if (sampler != bindings.samplers.end()) {
-      const auto& sampler_gles = SamplerGLES::Cast(*sampler->second.resource);
-      if (!sampler_gles.ConfigureBoundTexture(texture_gles, gl)) {
-        return false;
-      }
+    const auto& sampler_gles = SamplerGLES::Cast(*data.sampler);
+    if (!sampler_gles.ConfigureBoundTexture(texture_gles, gl)) {
+      return std::nullopt;
     }
 
     //--------------------------------------------------------------------------
     /// Set the texture uniform location.
     ///
-    gl.Uniform1i(uniform->second, active_index);
+    gl.Uniform1i(location, active_index);
 
     //--------------------------------------------------------------------------
     /// Bump up the active index at binding.
     ///
     active_index++;
   }
-  return true;
+  return active_index;
 }
 
 }  // namespace impeller
diff --git a/impeller/renderer/backend/gles/buffer_bindings_gles.h b/impeller/renderer/backend/gles/buffer_bindings_gles.h
index 5dc3536f3f685413a088f62c151b4fba4db09148..708980d553b8843c558fd0496c9fe580f58370fc 100644
--- a/impeller/renderer/backend/gles/buffer_bindings_gles.h
+++ b/impeller/renderer/backend/gles/buffer_bindings_gles.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_BUFFER_BINDINGS_GLES_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_BUFFER_BINDINGS_GLES_H_
 
-#include <map>
+#include <unordered_map>
 #include <vector>
 
-#include "flutter/fml/macros.h"
+#include "impeller/core/shader_types.h"
 #include "impeller/renderer/backend/gles/gles.h"
 #include "impeller/renderer/backend/gles/proc_table_gles.h"
 #include "impeller/renderer/command.h"
-#include "impeller/renderer/vertex_descriptor.h"
 
 namespace impeller {
 
@@ -25,8 +25,10 @@ class BufferBindingsGLES {
 
   ~BufferBindingsGLES();
 
-  bool RegisterVertexStageInput(const ProcTableGLES& gl,
-                                const std::vector<ShaderStageIOSlot>& inputs);
+  bool RegisterVertexStageInput(
+      const ProcTableGLES& gl,
+      const std::vector<ShaderStageIOSlot>& inputs,
+      const std::vector<ShaderStageBufferLayout>& layouts);
 
   bool ReadUniformsBindings(const ProcTableGLES& gl, GLuint program);
 
@@ -36,7 +38,7 @@ class BufferBindingsGLES {
   bool BindUniformData(const ProcTableGLES& gl,
                        Allocator& transients_allocator,
                        const Bindings& vertex_bindings,
-                       const Bindings& fragment_bindings) const;
+                       const Bindings& fragment_bindings);
 
   bool UnbindVertexAttributes(const ProcTableGLES& gl) const;
 
@@ -53,17 +55,31 @@ class BufferBindingsGLES {
     GLsizei offset = 0u;
   };
   std::vector<VertexAttribPointer> vertex_attrib_arrays_;
-  std::map<std::string, GLint> uniform_locations_;
+
+  std::unordered_map<std::string, GLint> uniform_locations_;
+
+  using BindingMap = std::unordered_map<std::string, std::vector<GLint>>;
+  BindingMap binding_map_ = {};
+
+  const std::vector<GLint>& ComputeUniformLocations(
+      const ShaderMetadata* metadata);
+
+  GLint ComputeTextureLocation(const ShaderMetadata* metadata);
 
   bool BindUniformBuffer(const ProcTableGLES& gl,
                          Allocator& transients_allocator,
-                         const BufferResource& buffer) const;
+                         const BufferResource& buffer);
+
+  std::optional<size_t> BindTextures(const ProcTableGLES& gl,
+                                     const Bindings& bindings,
+                                     ShaderStage stage,
+                                     size_t unit_start_index = 0);
 
-  bool BindTextures(const ProcTableGLES& gl,
-                    const Bindings& bindings,
-                    ShaderStage stage) const;
+  BufferBindingsGLES(const BufferBindingsGLES&) = delete;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(BufferBindingsGLES);
+  BufferBindingsGLES& operator=(const BufferBindingsGLES&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_BUFFER_BINDINGS_GLES_H_
diff --git a/impeller/renderer/backend/gles/capabilities_gles.cc b/impeller/renderer/backend/gles/capabilities_gles.cc
index fff4e5889808ea8fd545e3312bdfc7a0f1fe4cee..a67486bd370479e50d96c8879e1d255e9be228d4 100644
--- a/impeller/renderer/backend/gles/capabilities_gles.cc
+++ b/impeller/renderer/backend/gles/capabilities_gles.cc
@@ -4,10 +4,24 @@
 
 #include "impeller/renderer/backend/gles/capabilities_gles.h"
 
+#include "impeller/core/formats.h"
 #include "impeller/renderer/backend/gles/proc_table_gles.h"
 
 namespace impeller {
 
+// https://registry.khronos.org/OpenGL/extensions/EXT/EXT_shader_framebuffer_fetch.txt
+static const constexpr char* kFramebufferFetchExt =
+    "GL_EXT_shader_framebuffer_fetch";
+
+static const constexpr char* kTextureBorderClampExt =
+    "GL_EXT_texture_border_clamp";
+static const constexpr char* kNvidiaTextureBorderClampExt =
+    "GL_NV_texture_border_clamp";
+
+// https://www.khronos.org/registry/OpenGL/extensions/EXT/EXT_multisampled_render_to_texture.txt
+static const constexpr char* kMultisampledRenderToTextureExt =
+    "GL_EXT_multisampled_render_to_texture";
+
 CapabilitiesGLES::CapabilitiesGLES(const ProcTableGLES& gl) {
   {
     GLint value = 0;
@@ -21,7 +35,9 @@ CapabilitiesGLES::CapabilitiesGLES(const ProcTableGLES& gl) {
     max_cube_map_texture_size = value;
   }
 
-  if (gl.GetDescription()->IsES()) {
+  auto const desc = gl.GetDescription();
+
+  if (desc->IsES()) {
     GLint value = 0;
     gl.GetIntegerv(GL_MAX_FRAGMENT_UNIFORM_VECTORS, &value);
     max_fragment_uniform_vectors = value;
@@ -45,7 +61,7 @@ CapabilitiesGLES::CapabilitiesGLES(const ProcTableGLES& gl) {
     max_texture_size = ISize{value, value};
   }
 
-  if (gl.GetDescription()->IsES()) {
+  if (desc->IsES()) {
     GLint value = 0;
     gl.GetIntegerv(GL_MAX_VARYING_VECTORS, &value);
     max_varying_vectors = value;
@@ -63,7 +79,7 @@ CapabilitiesGLES::CapabilitiesGLES(const ProcTableGLES& gl) {
     max_vertex_texture_image_units = value;
   }
 
-  if (gl.GetDescription()->IsES()) {
+  if (desc->IsES()) {
     GLint value = 0;
     gl.GetIntegerv(GL_MAX_VERTEX_UNIFORM_VECTORS, &value);
     max_vertex_uniform_vectors = value;
@@ -81,11 +97,35 @@ CapabilitiesGLES::CapabilitiesGLES(const ProcTableGLES& gl) {
     num_compressed_texture_formats = value;
   }
 
-  if (gl.GetDescription()->IsES()) {
+  if (desc->IsES()) {
     GLint value = 0;
     gl.GetIntegerv(GL_NUM_SHADER_BINARY_FORMATS, &value);
     num_shader_binary_formats = value;
   }
+
+  if (desc->IsES()) {
+    default_glyph_atlas_format_ = PixelFormat::kA8UNormInt;
+  } else {
+    default_glyph_atlas_format_ = PixelFormat::kR8UNormInt;
+  }
+
+  supports_framebuffer_fetch_ = desc->HasExtension(kFramebufferFetchExt);
+
+  if (desc->HasExtension(kTextureBorderClampExt) ||
+      desc->HasExtension(kNvidiaTextureBorderClampExt)) {
+    supports_decal_sampler_address_mode_ = true;
+  }
+
+  if (desc->HasExtension(kMultisampledRenderToTextureExt)) {
+    supports_implicit_msaa_ = true;
+
+    // We hard-code 4x MSAA, so let's make sure it's supported.
+    GLint value = 0;
+    gl.GetIntegerv(GL_MAX_SAMPLES_EXT, &value);
+    supports_offscreen_msaa_ = value >= 4;
+  }
+
+  is_angle_ = desc->IsANGLE();
 }
 
 size_t CapabilitiesGLES::GetMaxTextureUnits(ShaderStage stage) const {
@@ -95,12 +135,74 @@ size_t CapabilitiesGLES::GetMaxTextureUnits(ShaderStage stage) const {
     case ShaderStage::kFragment:
       return max_texture_image_units;
     case ShaderStage::kUnknown:
-    case ShaderStage::kTessellationControl:
-    case ShaderStage::kTessellationEvaluation:
     case ShaderStage::kCompute:
       return 0u;
   }
   FML_UNREACHABLE();
 }
 
+bool CapabilitiesGLES::SupportsOffscreenMSAA() const {
+  return supports_offscreen_msaa_;
+}
+
+bool CapabilitiesGLES::SupportsImplicitResolvingMSAA() const {
+  return supports_implicit_msaa_;
+}
+
+bool CapabilitiesGLES::SupportsSSBO() const {
+  return false;
+}
+
+bool CapabilitiesGLES::SupportsBufferToTextureBlits() const {
+  return false;
+}
+
+bool CapabilitiesGLES::SupportsTextureToTextureBlits() const {
+  return false;
+}
+
+bool CapabilitiesGLES::SupportsFramebufferFetch() const {
+  return supports_framebuffer_fetch_;
+}
+
+bool CapabilitiesGLES::SupportsCompute() const {
+  return false;
+}
+
+bool CapabilitiesGLES::SupportsComputeSubgroups() const {
+  return false;
+}
+
+bool CapabilitiesGLES::SupportsReadFromResolve() const {
+  return false;
+}
+
+bool CapabilitiesGLES::SupportsDecalSamplerAddressMode() const {
+  return supports_decal_sampler_address_mode_;
+}
+
+bool CapabilitiesGLES::SupportsDeviceTransientTextures() const {
+  return false;
+}
+
+PixelFormat CapabilitiesGLES::GetDefaultColorFormat() const {
+  return PixelFormat::kR8G8B8A8UNormInt;
+}
+
+PixelFormat CapabilitiesGLES::GetDefaultStencilFormat() const {
+  return PixelFormat::kS8UInt;
+}
+
+PixelFormat CapabilitiesGLES::GetDefaultDepthStencilFormat() const {
+  return PixelFormat::kD24UnormS8Uint;
+}
+
+bool CapabilitiesGLES::IsANGLE() const {
+  return is_angle_;
+}
+
+PixelFormat CapabilitiesGLES::GetDefaultGlyphAtlasFormat() const {
+  return default_glyph_atlas_format_;
+}
+
 }  // namespace impeller
diff --git a/impeller/renderer/backend/gles/capabilities_gles.h b/impeller/renderer/backend/gles/capabilities_gles.h
index 5cce9125cac1c73ffd0bf18b69ef014fb44b4226..afcc71b418f735182c1919f8206796409e620481 100644
--- a/impeller/renderer/backend/gles/capabilities_gles.h
+++ b/impeller/renderer/backend/gles/capabilities_gles.h
@@ -2,20 +2,37 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_CAPABILITIES_GLES_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_CAPABILITIES_GLES_H_
 
 #include <cstddef>
 
-#include "flutter/fml/macros.h"
+#include "impeller/base/backend_cast.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/shader_types.h"
 #include "impeller/geometry/size.h"
-#include "impeller/renderer/shader_types.h"
+#include "impeller/renderer/capabilities.h"
 
 namespace impeller {
 
 class ProcTableGLES;
 
-struct CapabilitiesGLES {
-  CapabilitiesGLES(const ProcTableGLES& gl);
+//------------------------------------------------------------------------------
+/// @brief      The Vulkan layers and extensions wrangler.
+///
+class CapabilitiesGLES final
+    : public Capabilities,
+      public BackendCast<CapabilitiesGLES, Capabilities> {
+ public:
+  explicit CapabilitiesGLES(const ProcTableGLES& gl);
+
+  CapabilitiesGLES(const CapabilitiesGLES&) = delete;
+
+  CapabilitiesGLES(CapabilitiesGLES&&) = delete;
+
+  CapabilitiesGLES& operator=(const CapabilitiesGLES&) = delete;
+
+  CapabilitiesGLES& operator=(CapabilitiesGLES&&) = delete;
 
   // Must be at least 8.
   size_t max_combined_texture_image_units = 8;
@@ -57,6 +74,63 @@ struct CapabilitiesGLES {
   size_t num_shader_binary_formats = 0;
 
   size_t GetMaxTextureUnits(ShaderStage stage) const;
+
+  bool IsANGLE() const;
+
+  // |Capabilities|
+  bool SupportsOffscreenMSAA() const override;
+
+  // |Capabilities|
+  bool SupportsImplicitResolvingMSAA() const override;
+
+  // |Capabilities|
+  bool SupportsSSBO() const override;
+
+  // |Capabilities|
+  bool SupportsBufferToTextureBlits() const override;
+
+  // |Capabilities|
+  bool SupportsTextureToTextureBlits() const override;
+
+  // |Capabilities|
+  bool SupportsFramebufferFetch() const override;
+
+  // |Capabilities|
+  bool SupportsCompute() const override;
+
+  // |Capabilities|
+  bool SupportsComputeSubgroups() const override;
+
+  // |Capabilities|
+  bool SupportsReadFromResolve() const override;
+
+  // |Capabilities|
+  bool SupportsDecalSamplerAddressMode() const override;
+
+  // |Capabilities|
+  bool SupportsDeviceTransientTextures() const override;
+
+  // |Capabilities|
+  PixelFormat GetDefaultColorFormat() const override;
+
+  // |Capabilities|
+  PixelFormat GetDefaultStencilFormat() const override;
+
+  // |Capabilities|
+  PixelFormat GetDefaultDepthStencilFormat() const override;
+
+  // |Capabilities|
+  PixelFormat GetDefaultGlyphAtlasFormat() const override;
+
+ private:
+  bool supports_framebuffer_fetch_ = false;
+  bool supports_decal_sampler_address_mode_ = false;
+  bool supports_offscreen_msaa_ = false;
+  bool supports_implicit_msaa_ = false;
+  bool is_angle_ = false;
+  PixelFormat default_glyph_atlas_format_ = PixelFormat::kUnknown;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_CAPABILITIES_GLES_H_
diff --git a/impeller/renderer/backend/gles/command_buffer_gles.cc b/impeller/renderer/backend/gles/command_buffer_gles.cc
index c53c774330399ab3cb6e843e1569123f2ce13271..ea6a651d0189ac7f36f99179e6554fab42000628 100644
--- a/impeller/renderer/backend/gles/command_buffer_gles.cc
+++ b/impeller/renderer/backend/gles/command_buffer_gles.cc
@@ -38,14 +38,23 @@ bool CommandBufferGLES::OnSubmitCommands(CompletionCallback callback) {
   return result;
 }
 
+// |CommandBuffer|
+void CommandBufferGLES::OnWaitUntilScheduled() {
+  reactor_->GetProcTable().Flush();
+}
+
 // |CommandBuffer|
 std::shared_ptr<RenderPass> CommandBufferGLES::OnCreateRenderPass(
     RenderTarget target) {
   if (!IsValid()) {
     return nullptr;
   }
+  auto context = context_.lock();
+  if (!context) {
+    return nullptr;
+  }
   auto pass = std::shared_ptr<RenderPassGLES>(
-      new RenderPassGLES(context_, target, reactor_));
+      new RenderPassGLES(context, target, reactor_));
   if (!pass->IsValid()) {
     return nullptr;
   }
@@ -53,7 +62,7 @@ std::shared_ptr<RenderPass> CommandBufferGLES::OnCreateRenderPass(
 }
 
 // |CommandBuffer|
-std::shared_ptr<BlitPass> CommandBufferGLES::OnCreateBlitPass() const {
+std::shared_ptr<BlitPass> CommandBufferGLES::OnCreateBlitPass() {
   if (!IsValid()) {
     return nullptr;
   }
@@ -65,7 +74,7 @@ std::shared_ptr<BlitPass> CommandBufferGLES::OnCreateBlitPass() const {
 }
 
 // |CommandBuffer|
-std::shared_ptr<ComputePass> CommandBufferGLES::OnCreateComputePass() const {
+std::shared_ptr<ComputePass> CommandBufferGLES::OnCreateComputePass() {
   // Compute passes aren't supported until GLES 3.2, at which point Vulkan is
   // available anyway.
   return nullptr;
diff --git a/impeller/renderer/backend/gles/command_buffer_gles.h b/impeller/renderer/backend/gles/command_buffer_gles.h
index 9aef71fa808426ac82f0adc08752cfb7d2647b0d..23441a1a78e4fe011d86bf6cad89dfb79431ad2d 100644
--- a/impeller/renderer/backend/gles/command_buffer_gles.h
+++ b/impeller/renderer/backend/gles/command_buffer_gles.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_COMMAND_BUFFER_GLES_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_COMMAND_BUFFER_GLES_H_
 
 #include "flutter/fml/macros.h"
 #include "impeller/renderer/backend/gles/reactor_gles.h"
@@ -34,16 +35,23 @@ class CommandBufferGLES final : public CommandBuffer {
   // |CommandBuffer|
   bool OnSubmitCommands(CompletionCallback callback) override;
 
+  // |CommandBuffer|
+  void OnWaitUntilScheduled() override;
+
   // |CommandBuffer|
   std::shared_ptr<RenderPass> OnCreateRenderPass(RenderTarget target) override;
 
   // |CommandBuffer|
-  std::shared_ptr<BlitPass> OnCreateBlitPass() const override;
+  std::shared_ptr<BlitPass> OnCreateBlitPass() override;
 
   // |CommandBuffer|
-  std::shared_ptr<ComputePass> OnCreateComputePass() const override;
+  std::shared_ptr<ComputePass> OnCreateComputePass() override;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(CommandBufferGLES);
+  CommandBufferGLES(const CommandBufferGLES&) = delete;
+
+  CommandBufferGLES& operator=(const CommandBufferGLES&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_COMMAND_BUFFER_GLES_H_
diff --git a/impeller/renderer/backend/gles/context_gles.cc b/impeller/renderer/backend/gles/context_gles.cc
index 9ecd91cec63246549fafd239b452d8a52a61f5c7..7629eff28e7cde2a0a2de794cf81ded0b38194b2 100644
--- a/impeller/renderer/backend/gles/context_gles.cc
+++ b/impeller/renderer/backend/gles/context_gles.cc
@@ -3,23 +3,28 @@
 // found in the LICENSE file.
 
 #include "impeller/renderer/backend/gles/context_gles.h"
+#include <memory>
 
 #include "impeller/base/config.h"
 #include "impeller/base/validation.h"
-#include "impeller/base/work_queue_common.h"
+#include "impeller/renderer/backend/gles/command_buffer_gles.h"
+#include "impeller/renderer/backend/gles/gpu_tracer_gles.h"
+#include "impeller/renderer/command_queue.h"
 
 namespace impeller {
 
 std::shared_ptr<ContextGLES> ContextGLES::Create(
     std::unique_ptr<ProcTableGLES> gl,
-    const std::vector<std::shared_ptr<fml::Mapping>>& shader_libraries) {
+    const std::vector<std::shared_ptr<fml::Mapping>>& shader_libraries,
+    bool enable_gpu_tracing) {
   return std::shared_ptr<ContextGLES>(
-      new ContextGLES(std::move(gl), shader_libraries));
+      new ContextGLES(std::move(gl), shader_libraries, enable_gpu_tracing));
 }
 
-ContextGLES::ContextGLES(std::unique_ptr<ProcTableGLES> gl,
-                         const std::vector<std::shared_ptr<fml::Mapping>>&
-                             shader_libraries_mappings) {
+ContextGLES::ContextGLES(
+    std::unique_ptr<ProcTableGLES> gl,
+    const std::vector<std::shared_ptr<fml::Mapping>>& shader_libraries_mappings,
+    bool enable_gpu_tracing) {
   reactor_ = std::make_shared<ReactorGLES>(std::move(gl));
   if (!reactor_->IsValid()) {
     VALIDATION_LOG << "Could not create valid reactor.";
@@ -53,26 +58,26 @@ ContextGLES::ContextGLES(std::unique_ptr<ProcTableGLES> gl,
     }
   }
 
+  device_capabilities_ = reactor_->GetProcTable().GetCapabilities();
+
   // Create the sampler library.
   {
     sampler_library_ =
-        std::shared_ptr<SamplerLibraryGLES>(new SamplerLibraryGLES());
-  }
-
-  // Create the work queue.
-  {
-    work_queue_ = WorkQueueCommon::Create();
-    if (!work_queue_) {
-      VALIDATION_LOG << "Could not create work queue.";
-      return;
-    }
+        std::shared_ptr<SamplerLibraryGLES>(new SamplerLibraryGLES(
+            device_capabilities_->SupportsDecalSamplerAddressMode()));
   }
-
+  gpu_tracer_ = std::make_shared<GPUTracerGLES>(GetReactor()->GetProcTable(),
+                                                enable_gpu_tracing);
+  command_queue_ = std::make_shared<CommandQueue>();
   is_valid_ = true;
 }
 
 ContextGLES::~ContextGLES() = default;
 
+Context::BackendType ContextGLES::GetBackendType() const {
+  return Context::BackendType::kOpenGLES;
+}
+
 const ReactorGLES::Ref& ContextGLES::GetReactor() const {
   return reactor_;
 }
@@ -96,6 +101,13 @@ bool ContextGLES::IsValid() const {
   return is_valid_;
 }
 
+void ContextGLES::Shutdown() {}
+
+// |Context|
+std::string ContextGLES::DescribeGpuModel() const {
+  return reactor_->GetProcTable().GetDescription()->GetString();
+}
+
 // |Context|
 std::shared_ptr<Allocator> ContextGLES::GetResourceAllocator() const {
   return resource_allocator_;
@@ -123,28 +135,14 @@ std::shared_ptr<CommandBuffer> ContextGLES::CreateCommandBuffer() const {
 }
 
 // |Context|
-std::shared_ptr<WorkQueue> ContextGLES::GetWorkQueue() const {
-  return work_queue_;
-}
-
-// |Context|
-bool ContextGLES::HasThreadingRestrictions() const {
-  return true;
-}
-
-// |Context|
-bool ContextGLES::SupportsOffscreenMSAA() const {
-  return false;
-}
-
-// |Context|
-const BackendFeatures& ContextGLES::GetBackendFeatures() const {
-  return kLegacyBackendFeatures;
+const std::shared_ptr<const Capabilities>& ContextGLES::GetCapabilities()
+    const {
+  return device_capabilities_;
 }
 
 // |Context|
-PixelFormat ContextGLES::GetColorAttachmentPixelFormat() const {
-  return PixelFormat::kR8G8B8A8UNormInt;
+std::shared_ptr<CommandQueue> ContextGLES::GetCommandQueue() const {
+  return command_queue_;
 }
 
 }  // namespace impeller
diff --git a/impeller/renderer/backend/gles/context_gles.h b/impeller/renderer/backend/gles/context_gles.h
index 4c841462ca773dd74282c01e1e0c620ae956e1af..2a0f09aca39b1e0d367b4e7b0653b572b393c34b 100644
--- a/impeller/renderer/backend/gles/context_gles.h
+++ b/impeller/renderer/backend/gles/context_gles.h
@@ -2,30 +2,38 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_CONTEXT_GLES_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_CONTEXT_GLES_H_
 
-#include "flutter/fml/macros.h"
 #include "impeller/base/backend_cast.h"
 #include "impeller/renderer/backend/gles/allocator_gles.h"
-#include "impeller/renderer/backend/gles/command_buffer_gles.h"
+#include "impeller/renderer/backend/gles/capabilities_gles.h"
+#include "impeller/renderer/backend/gles/gpu_tracer_gles.h"
 #include "impeller/renderer/backend/gles/pipeline_library_gles.h"
 #include "impeller/renderer/backend/gles/reactor_gles.h"
 #include "impeller/renderer/backend/gles/sampler_library_gles.h"
 #include "impeller/renderer/backend/gles/shader_library_gles.h"
+#include "impeller/renderer/capabilities.h"
+#include "impeller/renderer/command_queue.h"
 #include "impeller/renderer/context.h"
 
 namespace impeller {
 
 class ContextGLES final : public Context,
-                          public BackendCast<ContextGLES, Context> {
+                          public BackendCast<ContextGLES, Context>,
+                          public std::enable_shared_from_this<ContextGLES> {
  public:
   static std::shared_ptr<ContextGLES> Create(
       std::unique_ptr<ProcTableGLES> gl,
-      const std::vector<std::shared_ptr<fml::Mapping>>& shader_libraries);
+      const std::vector<std::shared_ptr<fml::Mapping>>& shader_libraries,
+      bool enable_gpu_tracing);
 
   // |Context|
   ~ContextGLES() override;
 
+  // |Context|
+  BackendType GetBackendType() const override;
+
   const ReactorGLES::Ref& GetReactor() const;
 
   std::optional<ReactorGLES::WorkerID> AddReactorWorker(
@@ -33,18 +41,30 @@ class ContextGLES final : public Context,
 
   bool RemoveReactorWorker(ReactorGLES::WorkerID id);
 
+  std::shared_ptr<GPUTracerGLES> GetGPUTracer() const { return gpu_tracer_; }
+
  private:
   ReactorGLES::Ref reactor_;
   std::shared_ptr<ShaderLibraryGLES> shader_library_;
   std::shared_ptr<PipelineLibraryGLES> pipeline_library_;
   std::shared_ptr<SamplerLibraryGLES> sampler_library_;
-  std::shared_ptr<WorkQueue> work_queue_;
   std::shared_ptr<AllocatorGLES> resource_allocator_;
+  std::shared_ptr<CommandQueue> command_queue_;
+  std::shared_ptr<GPUTracerGLES> gpu_tracer_;
+
+  // Note: This is stored separately from the ProcTableGLES CapabilitiesGLES
+  // in order to satisfy the Context::GetCapabilities signature which returns
+  // a reference.
+  std::shared_ptr<const Capabilities> device_capabilities_;
   bool is_valid_ = false;
 
   ContextGLES(
       std::unique_ptr<ProcTableGLES> gl,
-      const std::vector<std::shared_ptr<fml::Mapping>>& shader_libraries);
+      const std::vector<std::shared_ptr<fml::Mapping>>& shader_libraries,
+      bool enable_gpu_tracing);
+
+  // |Context|
+  std::string DescribeGpuModel() const override;
 
   // |Context|
   bool IsValid() const override;
@@ -65,21 +85,19 @@ class ContextGLES final : public Context,
   std::shared_ptr<CommandBuffer> CreateCommandBuffer() const override;
 
   // |Context|
-  std::shared_ptr<WorkQueue> GetWorkQueue() const override;
+  const std::shared_ptr<const Capabilities>& GetCapabilities() const override;
 
   // |Context|
-  bool HasThreadingRestrictions() const override;
+  std::shared_ptr<CommandQueue> GetCommandQueue() const override;
 
   // |Context|
-  bool SupportsOffscreenMSAA() const override;
+  void Shutdown() override;
 
-  // |Context|
-  const BackendFeatures& GetBackendFeatures() const override;
+  ContextGLES(const ContextGLES&) = delete;
 
-  // |Context|
-  PixelFormat GetColorAttachmentPixelFormat() const override;
-
-  FML_DISALLOW_COPY_AND_ASSIGN(ContextGLES);
+  ContextGLES& operator=(const ContextGLES&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_CONTEXT_GLES_H_
diff --git a/impeller/renderer/backend/gles/description_gles.cc b/impeller/renderer/backend/gles/description_gles.cc
index cc86b7fd8ec325acd9d2897625e0b92701b251e7..855c192079a6b31df157a6ec46f4fcb2d08a047f 100644
--- a/impeller/renderer/backend/gles/description_gles.cc
+++ b/impeller/renderer/backend/gles/description_gles.cc
@@ -26,10 +26,24 @@ static std::string GetGLString(const ProcTableGLES& gl, GLenum name) {
   return reinterpret_cast<const char*>(str);
 }
 
+static std::string GetGLStringi(const ProcTableGLES& gl,
+                                GLenum name,
+                                int index) {
+  auto str = gl.GetStringi(name, index);
+  if (str == nullptr) {
+    return "";
+  }
+  return reinterpret_cast<const char*>(str);
+}
+
 static bool DetermineIfES(const std::string& version) {
   return HasPrefix(version, "OpenGL ES");
 }
 
+static bool DetermineIfANGLE(const std::string& version) {
+  return version.find("ANGLE") != std::string::npos;
+}
+
 static std::optional<Version> DetermineVersion(std::string version) {
   // Format for OpenGL "OpenGL<space>ES<space><version
   // number><space><vendor-specific information>".
@@ -70,14 +84,8 @@ DescriptionGLES::DescriptionGLES(const ProcTableGLES& gl)
       renderer_(GetGLString(gl, GL_RENDERER)),
       gl_version_string_(GetGLString(gl, GL_VERSION)),
       sl_version_string_(GetGLString(gl, GL_SHADING_LANGUAGE_VERSION)) {
-  const auto extensions = GetGLString(gl, GL_EXTENSIONS);
-  std::stringstream extensions_stream(extensions);
-  std::string extension;
-  while (std::getline(extensions_stream, extension, ' ')) {
-    extensions_.insert(extension);
-  }
-
   is_es_ = DetermineIfES(gl_version_string_);
+  is_angle_ = DetermineIfANGLE(gl_version_string_);
 
   auto gl_version = DetermineVersion(gl_version_string_);
   if (!gl_version.has_value()) {
@@ -86,6 +94,22 @@ DescriptionGLES::DescriptionGLES(const ProcTableGLES& gl)
   }
   gl_version_ = gl_version.value();
 
+  // GL_NUM_EXTENSIONS is only available in OpenGL 3+ and OpenGL ES 3+
+  if (gl_version_.IsAtLeast(Version(3, 0, 0))) {
+    int extension_count = 0;
+    gl.GetIntegerv(GL_NUM_EXTENSIONS, &extension_count);
+    for (auto i = 0; i < extension_count; i++) {
+      extensions_.insert(GetGLStringi(gl, GL_EXTENSIONS, i));
+    }
+  } else {
+    const auto extensions = GetGLString(gl, GL_EXTENSIONS);
+    std::stringstream extensions_stream(extensions);
+    std::string extension;
+    while (std::getline(extensions_stream, extension, ' ')) {
+      extensions_.insert(extension);
+    }
+  }
+
   auto sl_version = DetermineVersion(sl_version_string_);
   if (!sl_version.has_value()) {
     VALIDATION_LOG << "Could not determine SL version.";
@@ -137,10 +161,18 @@ std::string DescriptionGLES::GetString() const {
   return stream.str();
 }
 
+Version DescriptionGLES::GetGlVersion() const {
+  return gl_version_;
+}
+
 bool DescriptionGLES::IsES() const {
   return is_es_;
 }
 
+bool DescriptionGLES::IsANGLE() const {
+  return is_angle_;
+}
+
 bool DescriptionGLES::HasExtension(const std::string& ext) const {
   return extensions_.find(ext) != extensions_.end();
 }
diff --git a/impeller/renderer/backend/gles/description_gles.h b/impeller/renderer/backend/gles/description_gles.h
index 7630d431c9282f7c7728b8eeb08c9dfaec3eab89..496e1eec02b791c37ce75cf34c2f4dd1b0c02582 100644
--- a/impeller/renderer/backend/gles/description_gles.h
+++ b/impeller/renderer/backend/gles/description_gles.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_DESCRIPTION_GLES_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_DESCRIPTION_GLES_H_
 
 #include <set>
 #include <string>
@@ -16,7 +17,7 @@ class ProcTableGLES;
 
 class DescriptionGLES {
  public:
-  DescriptionGLES(const ProcTableGLES& gl);
+  explicit DescriptionGLES(const ProcTableGLES& gl);
 
   ~DescriptionGLES();
 
@@ -26,10 +27,15 @@ class DescriptionGLES {
 
   std::string GetString() const;
 
+  Version GetGlVersion() const;
+
   bool HasExtension(const std::string& ext) const;
 
+  /// @brief      Returns whether GLES includes the debug extension.
   bool HasDebugExtension() const;
 
+  bool IsANGLE() const;
+
  private:
   Version gl_version_;
   Version sl_version_;
@@ -39,9 +45,14 @@ class DescriptionGLES {
   std::string gl_version_string_;
   std::string sl_version_string_;
   std::set<std::string> extensions_;
+  bool is_angle_ = false;
   bool is_valid_ = false;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(DescriptionGLES);
+  DescriptionGLES(const DescriptionGLES&) = delete;
+
+  DescriptionGLES& operator=(const DescriptionGLES&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_DESCRIPTION_GLES_H_
diff --git a/impeller/renderer/backend/gles/device_buffer_gles.cc b/impeller/renderer/backend/gles/device_buffer_gles.cc
index 0ba29c1b67e31295812d6ca7403a6ad8f43cd2cb..3cbc9ea5139d914d496f083c6952f1d2d3231e1e 100644
--- a/impeller/renderer/backend/gles/device_buffer_gles.cc
+++ b/impeller/renderer/backend/gles/device_buffer_gles.cc
@@ -57,6 +57,10 @@ bool DeviceBufferGLES::OnCopyHostBuffer(const uint8_t* source,
   return true;
 }
 
+void DeviceBufferGLES::Flush(std::optional<Range> range) const {
+  generation_++;
+}
+
 static GLenum ToTarget(DeviceBufferGLES::BindingType type) {
   switch (type) {
     case DeviceBufferGLES::BindingType::kArrayBuffer:
diff --git a/impeller/renderer/backend/gles/device_buffer_gles.h b/impeller/renderer/backend/gles/device_buffer_gles.h
index 70700040b0770c739e6219cf0eee1e0fe96bf01d..932a2df69bef020fe9675658b4509aa5178c460b 100644
--- a/impeller/renderer/backend/gles/device_buffer_gles.h
+++ b/impeller/renderer/backend/gles/device_buffer_gles.h
@@ -2,15 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_DEVICE_BUFFER_GLES_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_DEVICE_BUFFER_GLES_H_
 
+#include <cstdint>
 #include <memory>
 
-#include "flutter/fml/macros.h"
 #include "impeller/base/allocation.h"
 #include "impeller/base/backend_cast.h"
+#include "impeller/core/device_buffer.h"
 #include "impeller/renderer/backend/gles/reactor_gles.h"
-#include "impeller/renderer/device_buffer.h"
 
 namespace impeller {
 
@@ -37,6 +38,8 @@ class DeviceBufferGLES final
 
   [[nodiscard]] bool BindAndUploadDataIfNecessary(BindingType type) const;
 
+  void Flush(std::optional<Range> range = std::nullopt) const override;
+
  private:
   ReactorGLES::Ref reactor_;
   HandleGLES handle_;
@@ -58,7 +61,11 @@ class DeviceBufferGLES final
   // |DeviceBuffer|
   bool SetLabel(const std::string& label, Range range) override;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(DeviceBufferGLES);
+  DeviceBufferGLES(const DeviceBufferGLES&) = delete;
+
+  DeviceBufferGLES& operator=(const DeviceBufferGLES&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_DEVICE_BUFFER_GLES_H_
diff --git a/impeller/renderer/backend/gles/formats_gles.cc b/impeller/renderer/backend/gles/formats_gles.cc
index 7d5f3b832d9460103039ec1a516979cb93a207f6..0f8b719b40869418e541a6a9aced2d5a136d87e8 100644
--- a/impeller/renderer/backend/gles/formats_gles.cc
+++ b/impeller/renderer/backend/gles/formats_gles.cc
@@ -6,6 +6,21 @@
 
 namespace impeller {
 
-//
+std::string DebugToFramebufferError(int status) {
+  switch (status) {
+    case GL_FRAMEBUFFER_UNDEFINED:
+      return "GL_FRAMEBUFFER_UNDEFINED";
+    case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT:
+      return "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT";
+    case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:
+      return "GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT";
+    case GL_FRAMEBUFFER_UNSUPPORTED:
+      return "GL_FRAMEBUFFER_UNSUPPORTED";
+    case GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE:
+      return "GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE";
+    default:
+      return "Unknown error code: " + std::to_string(status);
+  }
+}
 
 }  // namespace impeller
diff --git a/impeller/renderer/backend/gles/formats_gles.h b/impeller/renderer/backend/gles/formats_gles.h
index fb5ce27e0a38493cf2107122d4ffcf335c63d159..02adb19941fce7a4e648a2aa82a7987996cfa177 100644
--- a/impeller/renderer/backend/gles/formats_gles.h
+++ b/impeller/renderer/backend/gles/formats_gles.h
@@ -2,13 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_FORMATS_GLES_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_FORMATS_GLES_H_
+
 #include <optional>
 
 #include "flutter/fml/logging.h"
 #include "flutter/fml/macros.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/shader_types.h"
 #include "impeller/renderer/backend/gles/gles.h"
-#include "impeller/renderer/formats.h"
-#include "impeller/renderer/shader_types.h"
 
 namespace impeller {
 
@@ -31,6 +34,7 @@ constexpr GLenum ToMode(PrimitiveType primitive_type) {
 constexpr GLenum ToIndexType(IndexType type) {
   switch (type) {
     case IndexType::kUnknown:
+    case IndexType::kNone:
       FML_UNREACHABLE();
     case IndexType::k16bit:
       return GL_UNSIGNED_SHORT;
@@ -171,6 +175,8 @@ constexpr GLenum ToTextureType(TextureType type) {
       return GL_TEXTURE_2D_MULTISAMPLE;
     case TextureType::kTextureCube:
       return GL_TEXTURE_CUBE_MAP;
+    case TextureType::kTextureExternalOES:
+      return GL_TEXTURE_EXTERNAL_OES;
   }
   FML_UNREACHABLE();
 }
@@ -180,11 +186,17 @@ constexpr std::optional<GLenum> ToTextureTarget(TextureType type) {
     case TextureType::kTexture2D:
       return GL_TEXTURE_2D;
     case TextureType::kTexture2DMultisample:
-      return std::nullopt;
+      return GL_TEXTURE_2D;
     case TextureType::kTextureCube:
       return GL_TEXTURE_CUBE_MAP;
+    case TextureType::kTextureExternalOES:
+      return GL_TEXTURE_EXTERNAL_OES;
   }
   FML_UNREACHABLE();
 }
 
+std::string DebugToFramebufferError(int status);
+
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_FORMATS_GLES_H_
diff --git a/impeller/renderer/backend/gles/gles.h b/impeller/renderer/backend/gles/gles.h
index 599e3c9433c97f6b27e51e20fed81579dc4880f2..b3a512e0d23f502c687a6816382903dc486ac364 100644
--- a/impeller/renderer/backend/gles/gles.h
+++ b/impeller/renderer/backend/gles/gles.h
@@ -2,8 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_GLES_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_GLES_H_
 
+// IWYU pragma: begin_exports
 #include "GLES3/gl3.h"
+
+// Defines for extension enums.
+#define IMPELLER_GL_CLAMP_TO_BORDER 0x812D
+#define IMPELLER_GL_TEXTURE_BORDER_COLOR 0x1004
+
 #define GL_GLEXT_PROTOTYPES
 #include "GLES2/gl2ext.h"
+// IWYU pragma: end_exports
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_GLES_H_
diff --git a/impeller/renderer/backend/gles/gpu_tracer_gles.cc b/impeller/renderer/backend/gles/gpu_tracer_gles.cc
new file mode 100644
index 0000000000000000000000000000000000000000..0f77928ccad99f8630ad102cdde3ca2ea3c3f028
--- /dev/null
+++ b/impeller/renderer/backend/gles/gpu_tracer_gles.cc
@@ -0,0 +1,92 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/backend/gles/gpu_tracer_gles.h"
+#include <thread>
+#include "fml/trace_event.h"
+
+namespace impeller {
+
+GPUTracerGLES::GPUTracerGLES(const ProcTableGLES& gl, bool enable_tracing) {
+#ifdef IMPELLER_DEBUG
+  auto desc = gl.GetDescription();
+  enabled_ =
+      enable_tracing && desc->HasExtension("GL_EXT_disjoint_timer_query");
+#endif  // IMPELLER_DEBUG
+}
+
+void GPUTracerGLES::MarkFrameStart(const ProcTableGLES& gl) {
+  if (!enabled_ || active_frame_.has_value() ||
+      std::this_thread::get_id() != raster_thread_) {
+    return;
+  }
+
+  // At the beginning of a frame, check the status of all pending
+  // previous queries.
+  ProcessQueries(gl);
+
+  uint32_t query = 0;
+  gl.GenQueriesEXT(1, &query);
+  if (query == 0) {
+    return;
+  }
+
+  active_frame_ = query;
+  gl.BeginQueryEXT(GL_TIME_ELAPSED_EXT, query);
+}
+
+void GPUTracerGLES::RecordRasterThread() {
+  raster_thread_ = std::this_thread::get_id();
+}
+
+void GPUTracerGLES::ProcessQueries(const ProcTableGLES& gl) {
+  // For reasons unknown to me, querying the state of more than
+  // one query object per frame causes crashes on a Pixel 6 pro.
+  // It does not crash on an S10.
+  while (!pending_traces_.empty()) {
+    auto query = pending_traces_.front();
+
+    // First check if the query is complete without blocking
+    // on the result. Incomplete results are left in the pending
+    // trace vector and will not be checked again for another
+    // frame.
+    GLuint available = GL_FALSE;
+    gl.GetQueryObjectuivEXT(query, GL_QUERY_RESULT_AVAILABLE_EXT, &available);
+
+    if (available != GL_TRUE) {
+      // If a query is not available, then all subsequent queries will be
+      // unavailable.
+      return;
+    }
+    // Return the timer resolution in nanoseconds.
+    uint64_t duration = 0;
+    gl.GetQueryObjectui64vEXT(query, GL_QUERY_RESULT_EXT, &duration);
+    auto gpu_ms = duration / 1000000.0;
+
+    TRACE_EVENT0("flutter-GPUTracer",
+                 std::string(std::to_string(reinterpret_cast<int64_t>(this)) +
+                             "-FrameTimeMS-" + std::to_string(gpu_ms))
+                     .c_str());
+    FML_TRACE_COUNTER("flutter", "GPUTracer",
+                      reinterpret_cast<int64_t>(this),  // Trace Counter ID
+                      "FrameTimeMS", gpu_ms);
+    gl.DeleteQueriesEXT(1, &query);
+    pending_traces_.pop_front();
+  }
+}
+
+void GPUTracerGLES::MarkFrameEnd(const ProcTableGLES& gl) {
+  if (!enabled_ || std::this_thread::get_id() != raster_thread_ ||
+      !active_frame_.has_value()) {
+    return;
+  }
+
+  auto query = active_frame_.value();
+  gl.EndQueryEXT(GL_TIME_ELAPSED_EXT);
+
+  pending_traces_.push_back(query);
+  active_frame_ = std::nullopt;
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/backend/gles/gpu_tracer_gles.h b/impeller/renderer/backend/gles/gpu_tracer_gles.h
new file mode 100644
index 0000000000000000000000000000000000000000..f6b0de8ab9be66e89ac3491d7af88edb2faa821a
--- /dev/null
+++ b/impeller/renderer/backend/gles/gpu_tracer_gles.h
@@ -0,0 +1,55 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_GPU_TRACER_GLES_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_GPU_TRACER_GLES_H_
+
+#include <cstdint>
+#include <deque>
+#include <thread>
+
+#include "impeller/renderer/backend/gles/proc_table_gles.h"
+
+namespace impeller {
+
+/// @brief Trace GPU execution times using GL_EXT_disjoint_timer_query on GLES.
+///
+/// Note: there are a substantial number of GPUs where usage of the this API is
+/// known to cause crashes. As a result, this functionality is disabled by
+/// default and can only be enabled in debug/profile mode via a specific opt-in
+/// flag that is exposed in the Android manifest.
+///
+/// To enable, add the following metadata to the application's Android manifest:
+///   <meta-data
+///       android:name="io.flutter.embedding.android.EnableOpenGLGPUTracing"
+///       android:value="false" />
+class GPUTracerGLES {
+ public:
+  GPUTracerGLES(const ProcTableGLES& gl, bool enable_tracing);
+
+  ~GPUTracerGLES() = default;
+
+  /// @brief Record the thread id of the raster thread.
+  void RecordRasterThread();
+
+  /// @brief Record the start of a frame workload, if one hasn't already been
+  ///        started.
+  void MarkFrameStart(const ProcTableGLES& gl);
+
+  /// @brief Record the end of a frame workload.
+  void MarkFrameEnd(const ProcTableGLES& gl);
+
+ private:
+  void ProcessQueries(const ProcTableGLES& gl);
+
+  std::deque<uint32_t> pending_traces_;
+  std::optional<uint32_t> active_frame_ = std::nullopt;
+  std::thread::id raster_thread_;
+
+  bool enabled_ = false;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_GPU_TRACER_GLES_H_
diff --git a/impeller/renderer/backend/gles/handle_gles.h b/impeller/renderer/backend/gles/handle_gles.h
index 3cfddf621fa62da90fe2eabc18339100004f0724..a6fefd592318707de72a2ea7c3d2cb7e984acc38 100644
--- a/impeller/renderer/backend/gles/handle_gles.h
+++ b/impeller/renderer/backend/gles/handle_gles.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_HANDLE_GLES_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_HANDLE_GLES_H_
 
 #include <optional>
 #include <sstream>
@@ -78,10 +79,16 @@ inline std::ostream& operator<<(std::ostream& out,
   if (handle.IsDead()) {
     out << "DEAD";
   } else {
-    out << handle.name.value().id;
+    if (handle.name.has_value()) {
+      out << handle.name.value().id;
+    } else {
+      out << "UNNAMED";
+    }
   }
   out << ")";
   return out;
 }
 
 }  // namespace std
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_HANDLE_GLES_H_
diff --git a/impeller/renderer/backend/gles/pipeline_gles.cc b/impeller/renderer/backend/gles/pipeline_gles.cc
index 31063ce43d64fde00340fc9e5f35fc6dcb6143cb..eb996613f5a5ce8953b0023ade04d6e7509df995 100644
--- a/impeller/renderer/backend/gles/pipeline_gles.cc
+++ b/impeller/renderer/backend/gles/pipeline_gles.cc
@@ -35,7 +35,7 @@ const HandleGLES& PipelineGLES::GetProgramHandle() const {
   return handle_;
 }
 
-const BufferBindingsGLES* PipelineGLES::GetBufferBindings() const {
+BufferBindingsGLES* PipelineGLES::GetBufferBindings() const {
   return buffer_bindings_.get();
 }
 
@@ -46,7 +46,8 @@ bool PipelineGLES::BuildVertexDescriptor(const ProcTableGLES& gl,
   }
   auto vtx_desc = std::make_unique<BufferBindingsGLES>();
   if (!vtx_desc->RegisterVertexStageInput(
-          gl, GetDescriptor().GetVertexDescriptor()->GetStageInputs())) {
+          gl, GetDescriptor().GetVertexDescriptor()->GetStageInputs(),
+          GetDescriptor().GetVertexDescriptor()->GetStageLayouts())) {
     return false;
   }
   if (!vtx_desc->ReadUniformsBindings(gl, program)) {
diff --git a/impeller/renderer/backend/gles/pipeline_gles.h b/impeller/renderer/backend/gles/pipeline_gles.h
index 4097684a24717798720d278fda41c11b8b35dd61..9dfed8d8074340877b4b09bf4de034c8681c7463 100644
--- a/impeller/renderer/backend/gles/pipeline_gles.h
+++ b/impeller/renderer/backend/gles/pipeline_gles.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_PIPELINE_GLES_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_PIPELINE_GLES_H_
 
 #include "flutter/fml/macros.h"
 #include "impeller/base/backend_cast.h"
@@ -28,7 +29,7 @@ class PipelineGLES final
 
   [[nodiscard]] bool UnbindProgram() const;
 
-  const BufferBindingsGLES* GetBufferBindings() const;
+  BufferBindingsGLES* GetBufferBindings() const;
 
   [[nodiscard]] bool BuildVertexDescriptor(const ProcTableGLES& gl,
                                            GLuint program);
@@ -48,7 +49,11 @@ class PipelineGLES final
                std::weak_ptr<PipelineLibrary> library,
                const PipelineDescriptor& desc);
 
-  FML_DISALLOW_COPY_AND_ASSIGN(PipelineGLES);
+  PipelineGLES(const PipelineGLES&) = delete;
+
+  PipelineGLES& operator=(const PipelineGLES&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_PIPELINE_GLES_H_
diff --git a/impeller/renderer/backend/gles/pipeline_library_gles.cc b/impeller/renderer/backend/gles/pipeline_library_gles.cc
index 25fa0ab632304b35c04b049ac0babc6064c72289..14e395404efa5920c8ee60a3ab7fceba1e9a86a2 100644
--- a/impeller/renderer/backend/gles/pipeline_library_gles.cc
+++ b/impeller/renderer/backend/gles/pipeline_library_gles.cc
@@ -9,6 +9,7 @@
 
 #include "flutter/fml/container.h"
 #include "flutter/fml/trace_event.h"
+#include "fml/closure.h"
 #include "impeller/base/promise.h"
 #include "impeller/renderer/backend/gles/pipeline_gles.h"
 #include "impeller/renderer/backend/gles/shader_function_gles.h"
@@ -32,6 +33,19 @@ static std::string GetShaderInfoLog(const ProcTableGLES& gl, GLuint shader) {
   return log_string;
 }
 
+static std::string GetShaderSource(const ProcTableGLES& gl, GLuint shader) {
+  // Arbitrarily chosen size that should be larger than most shaders.
+  // Since this only fires on compilation errors the performance shouldn't
+  // matter.
+  auto data = static_cast<char*>(malloc(10240));
+  GLsizei length;
+  gl.GetShaderSource(shader, 10240, &length, data);
+
+  auto result = std::string{data, static_cast<size_t>(length)};
+  free(data);
+  return result;
+}
+
 static void LogShaderCompilationFailure(const ProcTableGLES& gl,
                                         GLuint shader,
                                         const std::string& name,
@@ -49,12 +63,6 @@ static void LogShaderCompilationFailure(const ProcTableGLES& gl,
     case ShaderStage::kFragment:
       stream << "fragment";
       break;
-    case ShaderStage::kTessellationControl:
-      stream << "tessellation control";
-      break;
-    case ShaderStage::kTessellationEvaluation:
-      stream << "tessellation evaluation";
-      break;
     case ShaderStage::kCompute:
       stream << "compute";
       break;
@@ -62,10 +70,7 @@ static void LogShaderCompilationFailure(const ProcTableGLES& gl,
   stream << " shader for '" << name << "' with error:" << std::endl;
   stream << GetShaderInfoLog(gl, shader) << std::endl;
   stream << "Shader source was: " << std::endl;
-  stream << std::string{reinterpret_cast<const char*>(
-                            source_mapping.GetMapping()),
-                        source_mapping.GetSize()}
-         << std::endl;
+  stream << GetShaderSource(gl, shader) << std::endl;
   VALIDATION_LOG << stream.str();
 }
 
@@ -104,8 +109,10 @@ static bool LinkProgram(
   fml::ScopedCleanupClosure delete_frag_shader(
       [&gl, frag_shader]() { gl.DeleteShader(frag_shader); });
 
-  gl.ShaderSourceMapping(vert_shader, *vert_mapping);
-  gl.ShaderSourceMapping(frag_shader, *frag_mapping);
+  gl.ShaderSourceMapping(vert_shader, *vert_mapping,
+                         descriptor.GetSpecializationConstants());
+  gl.ShaderSourceMapping(frag_shader, *frag_mapping,
+                         descriptor.GetSpecializationConstants());
 
   gl.CompileShader(vert_shader);
   gl.CompileShader(frag_shader);
@@ -114,7 +121,7 @@ static bool LinkProgram(
   GLint frag_status = GL_FALSE;
 
   gl.GetShaderiv(vert_shader, GL_COMPILE_STATUS, &vert_status);
-  gl.GetShaderiv(vert_shader, GL_COMPILE_STATUS, &frag_status);
+  gl.GetShaderiv(frag_shader, GL_COMPILE_STATUS, &frag_status);
 
   if (vert_status != GL_TRUE) {
     LogShaderCompilationFailure(gl, vert_shader, descriptor.GetLabel(),
diff --git a/impeller/renderer/backend/gles/pipeline_library_gles.h b/impeller/renderer/backend/gles/pipeline_library_gles.h
index aca495418eabb14b62d471c2beb0d4622f1e48c0..410fcb991a90c0a16a7e4bc991dc130295d9a56d 100644
--- a/impeller/renderer/backend/gles/pipeline_library_gles.h
+++ b/impeller/renderer/backend/gles/pipeline_library_gles.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_PIPELINE_LIBRARY_GLES_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_PIPELINE_LIBRARY_GLES_H_
 
 #include "flutter/fml/macros.h"
 #include "impeller/renderer/backend/gles/reactor_gles.h"
@@ -23,7 +24,7 @@ class PipelineLibraryGLES final : public PipelineLibrary {
   ReactorGLES::Ref reactor_;
   PipelineMap pipelines_;
 
-  PipelineLibraryGLES(ReactorGLES::Ref reactor);
+  explicit PipelineLibraryGLES(ReactorGLES::Ref reactor);
 
   // |PipelineLibrary|
   bool IsValid() const override;
@@ -40,7 +41,11 @@ class PipelineLibraryGLES final : public PipelineLibrary {
   void RemovePipelinesWithEntryPoint(
       std::shared_ptr<const ShaderFunction> function) override;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(PipelineLibraryGLES);
+  PipelineLibraryGLES(const PipelineLibraryGLES&) = delete;
+
+  PipelineLibraryGLES& operator=(const PipelineLibraryGLES&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_PIPELINE_LIBRARY_GLES_H_
diff --git a/impeller/renderer/backend/gles/proc_table_gles.cc b/impeller/renderer/backend/gles/proc_table_gles.cc
index b3c8a8ff434f459dd8af2c024f106b10bb51687f..8aeda6d733a1a23b49a72e70ef2843196b269d00 100644
--- a/impeller/renderer/backend/gles/proc_table_gles.cc
+++ b/impeller/renderer/backend/gles/proc_table_gles.cc
@@ -6,9 +6,12 @@
 
 #include <sstream>
 
+#include "fml/closure.h"
 #include "impeller/base/allocation.h"
 #include "impeller/base/comparable.h"
 #include "impeller/base/validation.h"
+#include "impeller/renderer/backend/gles/capabilities_gles.h"
+#include "impeller/renderer/capabilities.h"
 
 namespace impeller {
 
@@ -32,6 +35,20 @@ const char* GLErrorToString(GLenum value) {
   return "Unknown.";
 }
 
+bool GLErrorIsFatal(GLenum value) {
+  switch (value) {
+    case GL_NO_ERROR:
+      return false;
+    case GL_INVALID_ENUM:
+    case GL_INVALID_VALUE:
+    case GL_INVALID_OPERATION:
+    case GL_INVALID_FRAMEBUFFER_OPERATION:
+    case GL_OUT_OF_MEMORY:
+      return true;
+  }
+  return false;
+}
+
 ProcTableGLES::Resolver WrappedResolver(
     const ProcTableGLES::Resolver& resolver) {
   return [resolver](const char* function_name) -> void* {
@@ -54,7 +71,11 @@ ProcTableGLES::Resolver WrappedResolver(
   };
 }
 
-ProcTableGLES::ProcTableGLES(Resolver resolver) {
+ProcTableGLES::ProcTableGLES(  // NOLINT(google-readability-function-size)
+    Resolver resolver) {
+  // The reason this constructor has anywhere near enough code to tip off
+  // `google-readability-function-size` is the proc macros, so ignore the lint.
+
   if (!resolver) {
     return;
   }
@@ -63,8 +84,7 @@ ProcTableGLES::ProcTableGLES(Resolver resolver) {
 
   auto error_fn = reinterpret_cast<PFNGLGETERRORPROC>(resolver("glGetError"));
   if (!error_fn) {
-    VALIDATION_LOG << "Could not resolve "
-                   << "glGetError";
+    VALIDATION_LOG << "Could not resolve " << "glGetError";
     return;
   }
 
@@ -80,6 +100,18 @@ ProcTableGLES::ProcTableGLES(Resolver resolver) {
 
   FOR_EACH_IMPELLER_PROC(IMPELLER_PROC);
 
+  description_ = std::make_unique<DescriptionGLES>(*this);
+
+  if (!description_->IsValid()) {
+    return;
+  }
+
+  if (description_->IsES()) {
+    FOR_EACH_IMPELLER_ES_ONLY_PROC(IMPELLER_PROC);
+  } else {
+    FOR_EACH_IMPELLER_DESKTOP_ONLY_PROC(IMPELLER_PROC);
+  }
+
 #undef IMPELLER_PROC
 
 #define IMPELLER_PROC(proc_ivar)                                \
@@ -93,12 +125,6 @@ ProcTableGLES::ProcTableGLES(Resolver resolver) {
 
 #undef IMPELLER_PROC
 
-  description_ = std::make_unique<DescriptionGLES>(*this);
-
-  if (!description_->IsValid()) {
-    return;
-  }
-
   if (!description_->HasDebugExtension()) {
     PushDebugGroupKHR.Reset();
     PopDebugGroupKHR.Reset();
@@ -111,7 +137,7 @@ ProcTableGLES::ProcTableGLES(Resolver resolver) {
     DiscardFramebufferEXT.Reset();
   }
 
-  capabilities_ = std::make_unique<CapabilitiesGLES>(*this);
+  capabilities_ = std::make_shared<CapabilitiesGLES>(*this);
 
   is_valid_ = true;
 }
@@ -122,20 +148,61 @@ bool ProcTableGLES::IsValid() const {
   return is_valid_;
 }
 
-void ProcTableGLES::ShaderSourceMapping(GLuint shader,
-                                        const fml::Mapping& mapping) const {
+void ProcTableGLES::ShaderSourceMapping(
+    GLuint shader,
+    const fml::Mapping& mapping,
+    const std::vector<Scalar>& defines) const {
+  if (defines.empty()) {
+    const GLchar* sources[] = {
+        reinterpret_cast<const GLchar*>(mapping.GetMapping())};
+    const GLint lengths[] = {static_cast<GLint>(mapping.GetSize())};
+    ShaderSource(shader, 1u, sources, lengths);
+    return;
+  }
+  const auto& shader_source = ComputeShaderWithDefines(mapping, defines);
+  if (!shader_source.has_value()) {
+    VALIDATION_LOG << "Failed to append constant data to shader";
+    return;
+  }
+
   const GLchar* sources[] = {
-      reinterpret_cast<const GLchar*>(mapping.GetMapping())};
-  const GLint lengths[] = {static_cast<GLint>(mapping.GetSize())};
+      reinterpret_cast<const GLchar*>(shader_source->c_str())};
+  const GLint lengths[] = {static_cast<GLint>(shader_source->size())};
   ShaderSource(shader, 1u, sources, lengths);
 }
 
+// Visible For testing.
+std::optional<std::string> ProcTableGLES::ComputeShaderWithDefines(
+    const fml::Mapping& mapping,
+    const std::vector<Scalar>& defines) const {
+  auto shader_source = std::string{
+      reinterpret_cast<const char*>(mapping.GetMapping()), mapping.GetSize()};
+
+  // Look for the first newline after the '#version' header, which impellerc
+  // will always emit as the first line of a compiled shader.
+  auto index = shader_source.find('\n');
+  if (index == std::string::npos) {
+    VALIDATION_LOG << "Failed to append constant data to shader";
+    return std::nullopt;
+  }
+
+  std::stringstream ss;
+  ss << std::fixed;
+  for (auto i = 0u; i < defines.size(); i++) {
+    ss << "#define SPIRV_CROSS_CONSTANT_ID_" << i << " " << defines[i] << '\n';
+  }
+  auto define_string = ss.str();
+  shader_source.insert(index + 1, define_string);
+  return shader_source;
+}
+
 const DescriptionGLES* ProcTableGLES::GetDescription() const {
   return description_.get();
 }
 
-const CapabilitiesGLES* ProcTableGLES::GetCapabilities() const {
-  return capabilities_.get();
+const std::shared_ptr<const CapabilitiesGLES>& ProcTableGLES::GetCapabilities()
+    const {
+  return capabilities_;
 }
 
 static const char* FramebufferStatusToString(GLenum status) {
@@ -305,9 +372,11 @@ bool ProcTableGLES::SetDebugLabel(DebugResourceType type,
 }
 
 void ProcTableGLES::PushDebugGroup(const std::string& label) const {
+#ifdef IMPELLER_DEBUG
   if (debug_label_max_length_ <= 0) {
     return;
   }
+
   UniqueID id;
   const auto label_length =
       std::min<GLsizei>(debug_label_max_length_ - 1, label.size());
@@ -316,13 +385,17 @@ void ProcTableGLES::PushDebugGroup(const std::string& label) const {
                     label_length,                     // length
                     label.data()                      // message
   );
+#endif  // IMPELLER_DEBUG
 }
 
 void ProcTableGLES::PopDebugGroup() const {
+#ifdef IMPELLER_DEBUG
   if (debug_label_max_length_ <= 0) {
     return;
   }
+
   PopDebugGroupKHR();
+#endif  // IMPELLER_DEBUG
 }
 
 std::string ProcTableGLES::GetProgramInfoLogString(GLuint program) const {
diff --git a/impeller/renderer/backend/gles/proc_table_gles.h b/impeller/renderer/backend/gles/proc_table_gles.h
index 6fb00e83c4a5a3f31d92232a642938782657430a..88397c5d682782650925965e21a0d2d498f9b4e2 100644
--- a/impeller/renderer/backend/gles/proc_table_gles.h
+++ b/impeller/renderer/backend/gles/proc_table_gles.h
@@ -2,16 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_PROC_TABLE_GLES_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_PROC_TABLE_GLES_H_
 
 #include <functional>
 #include <string>
-#include <vector>
 
 #include "flutter/fml/logging.h"
-#include "flutter/fml/macros.h"
 #include "flutter/fml/mapping.h"
-#include "flutter/fml/trace_event.h"
 #include "impeller/renderer/backend/gles/capabilities_gles.h"
 #include "impeller/renderer/backend/gles/description_gles.h"
 #include "impeller/renderer/backend/gles/gles.h"
@@ -19,9 +17,13 @@
 namespace impeller {
 
 const char* GLErrorToString(GLenum value);
+bool GLErrorIsFatal(GLenum value);
 
 struct AutoErrorCheck {
   const PFNGLGETERRORPROC error_fn;
+
+  // TODO(matanlurey) Change to string_view.
+  // https://github.com/flutter/flutter/issues/135922
   const char* name;
 
   AutoErrorCheck(PFNGLGETERRORPROC error, const char* name)
@@ -30,9 +32,16 @@ struct AutoErrorCheck {
   ~AutoErrorCheck() {
     if (error_fn) {
       auto error = error_fn();
-      FML_CHECK(error == GL_NO_ERROR)
-          << "GL Error " << GLErrorToString(error) << "(" << error << ")"
-          << " encountered on call to " << name;
+      if (error == GL_NO_ERROR) {
+        return;
+      }
+      if (GLErrorIsFatal(error)) {
+        FML_LOG(FATAL) << "Fatal GL Error " << GLErrorToString(error) << "("
+                       << error << ")" << " encountered on call to " << name;
+      } else {
+        FML_LOG(ERROR) << "GL Error " << GLErrorToString(error) << "(" << error
+                       << ")" << " encountered on call to " << name;
+      }
     }
   }
 };
@@ -41,6 +50,9 @@ template <class T>
 struct GLProc {
   using GLFunctionType = T;
 
+  // TODO(matanlurey) Change to string_view.
+  // https://github.com/flutter/flutter/issues/135922
+
   //----------------------------------------------------------------------------
   /// The name of the GL function.
   ///
@@ -65,9 +77,14 @@ struct GLProc {
   ///
   template <class... Args>
   auto operator()(Args&&... args) const {
-#ifdef IMPELLER_ERROR_CHECK_ALL_GL_CALLS
+#ifdef IMPELLER_DEBUG
     AutoErrorCheck error(error_fn, name);
-#endif  // IMPELLER_ERROR_CHECK_ALL_GL_CALLS
+    // We check for the existence of extensions, and reset the function pointer
+    // but it's still called unconditionally below, and will segfault. This
+    // validation log will at least give us a hint as to what's going on.
+    FML_CHECK(IsAvailable()) << "GL function " << name << " is not available. "
+                             << "This is likely due to a missing extension.";
+#endif  // IMPELLER_DEBUG
 #ifdef IMPELLER_TRACE_ALL_GL_CALLS
     TRACE_EVENT0("impeller", name);
 #endif  // IMPELLER_TRACE_ALL_GL_CALLS
@@ -77,7 +94,6 @@ struct GLProc {
   constexpr bool IsAvailable() const { return function != nullptr; }
 
   void Reset() {
-    name = nullptr;
     function = nullptr;
     error_fn = nullptr;
   }
@@ -97,7 +113,6 @@ struct GLProc {
   PROC(CheckFramebufferStatus);              \
   PROC(Clear);                               \
   PROC(ClearColor);                          \
-  PROC(ClearDepthf);                         \
   PROC(ClearStencil);                        \
   PROC(ColorMask);                           \
   PROC(CompileShader);                       \
@@ -112,13 +127,14 @@ struct GLProc {
   PROC(DeleteTextures);                      \
   PROC(DepthFunc);                           \
   PROC(DepthMask);                           \
-  PROC(DepthRangef);                         \
   PROC(DetachShader);                        \
   PROC(Disable);                             \
   PROC(DisableVertexAttribArray);            \
+  PROC(DrawArrays);                          \
   PROC(DrawElements);                        \
   PROC(Enable);                              \
   PROC(EnableVertexAttribArray);             \
+  PROC(Flush);                               \
   PROC(FramebufferRenderbuffer);             \
   PROC(FramebufferTexture2D);                \
   PROC(FrontFace);                           \
@@ -137,6 +153,7 @@ struct GLProc {
   PROC(GetShaderInfoLog);                    \
   PROC(GetShaderiv);                         \
   PROC(GetString);                           \
+  PROC(GetStringi);                          \
   PROC(GetUniformLocation);                  \
   PROC(IsBuffer);                            \
   PROC(IsFramebuffer);                       \
@@ -154,6 +171,7 @@ struct GLProc {
   PROC(StencilOpSeparate);                   \
   PROC(TexImage2D);                          \
   PROC(TexParameteri);                       \
+  PROC(TexParameterfv);                      \
   PROC(Uniform1fv);                          \
   PROC(Uniform1i);                           \
   PROC(Uniform2fv);                          \
@@ -163,15 +181,41 @@ struct GLProc {
   PROC(UseProgram);                          \
   PROC(VertexAttribPointer);                 \
   PROC(Viewport);                            \
+  PROC(GetShaderSource);                     \
   PROC(ReadPixels);
 
+// Calls specific to OpenGLES.
+void(glClearDepthf)(GLfloat depth);
+void(glDepthRangef)(GLfloat n, GLfloat f);
+
+#define FOR_EACH_IMPELLER_ES_ONLY_PROC(PROC) \
+  PROC(ClearDepthf);                         \
+  PROC(DepthRangef);
+
+// Calls specific to desktop GL.
+void(glClearDepth)(GLdouble depth);
+void(glDepthRange)(GLdouble n, GLdouble f);
+
+#define FOR_EACH_IMPELLER_DESKTOP_ONLY_PROC(PROC) \
+  PROC(ClearDepth);                               \
+  PROC(DepthRange);
+
 #define FOR_EACH_IMPELLER_GLES3_PROC(PROC) PROC(BlitFramebuffer);
 
-#define FOR_EACH_IMPELLER_EXT_PROC(PROC) \
-  PROC(DiscardFramebufferEXT);           \
-  PROC(PushDebugGroupKHR);               \
-  PROC(PopDebugGroupKHR);                \
-  PROC(ObjectLabelKHR);
+#define FOR_EACH_IMPELLER_EXT_PROC(PROC)    \
+  PROC(DebugMessageControlKHR);             \
+  PROC(DiscardFramebufferEXT);              \
+  PROC(FramebufferTexture2DMultisampleEXT); \
+  PROC(PushDebugGroupKHR);                  \
+  PROC(PopDebugGroupKHR);                   \
+  PROC(ObjectLabelKHR);                     \
+  PROC(RenderbufferStorageMultisampleEXT);  \
+  PROC(GenQueriesEXT);                      \
+  PROC(DeleteQueriesEXT);                   \
+  PROC(GetQueryObjectui64vEXT);             \
+  PROC(BeginQueryEXT);                      \
+  PROC(EndQueryEXT);                        \
+  PROC(GetQueryObjectuivEXT);
 
 enum class DebugResourceType {
   kTexture,
@@ -185,7 +229,8 @@ enum class DebugResourceType {
 class ProcTableGLES {
  public:
   using Resolver = std::function<void*(const char* function_name)>;
-  ProcTableGLES(Resolver resolver);
+  explicit ProcTableGLES(Resolver resolver);
+  ProcTableGLES(ProcTableGLES&& other) = default;
 
   ~ProcTableGLES();
 
@@ -193,6 +238,8 @@ class ProcTableGLES {
   GLProc<decltype(gl##name)> name = {"gl" #name, nullptr};
 
   FOR_EACH_IMPELLER_PROC(IMPELLER_PROC);
+  FOR_EACH_IMPELLER_ES_ONLY_PROC(IMPELLER_PROC);
+  FOR_EACH_IMPELLER_DESKTOP_ONLY_PROC(IMPELLER_PROC);
   FOR_EACH_IMPELLER_GLES3_PROC(IMPELLER_PROC);
   FOR_EACH_IMPELLER_EXT_PROC(IMPELLER_PROC);
 
@@ -200,11 +247,18 @@ class ProcTableGLES {
 
   bool IsValid() const;
 
-  void ShaderSourceMapping(GLuint shader, const fml::Mapping& mapping) const;
+  /// @brief Set the source for the attached [shader].
+  ///
+  /// Optionally, [defines] may contain a string value that will be
+  /// append to the shader source after the version marker. This can be used to
+  /// support static specialization. For example, setting "#define Foo 1".
+  void ShaderSourceMapping(GLuint shader,
+                           const fml::Mapping& mapping,
+                           const std::vector<Scalar>& defines = {}) const;
 
   const DescriptionGLES* GetDescription() const;
 
-  const CapabilitiesGLES* GetCapabilities() const;
+  const std::shared_ptr<const CapabilitiesGLES>& GetCapabilities() const;
 
   std::string DescribeCurrentFramebuffer() const;
 
@@ -220,13 +274,22 @@ class ProcTableGLES {
 
   void PopDebugGroup() const;
 
+  // Visible For testing.
+  std::optional<std::string> ComputeShaderWithDefines(
+      const fml::Mapping& mapping,
+      const std::vector<Scalar>& defines) const;
+
  private:
   bool is_valid_ = false;
   std::unique_ptr<DescriptionGLES> description_;
-  std::unique_ptr<CapabilitiesGLES> capabilities_;
+  std::shared_ptr<const CapabilitiesGLES> capabilities_;
   GLint debug_label_max_length_ = 0;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(ProcTableGLES);
+  ProcTableGLES(const ProcTableGLES&) = delete;
+
+  ProcTableGLES& operator=(const ProcTableGLES&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_PROC_TABLE_GLES_H_
diff --git a/impeller/renderer/backend/gles/reactor_gles.cc b/impeller/renderer/backend/gles/reactor_gles.cc
index f4d9ca9396233ec6c710352172632dfd49e79952..df22c68573a80f2a21a555ca43f87e934d510be7 100644
--- a/impeller/renderer/backend/gles/reactor_gles.cc
+++ b/impeller/renderer/backend/gles/reactor_gles.cc
@@ -7,6 +7,7 @@
 #include <algorithm>
 
 #include "flutter/fml/trace_event.h"
+#include "fml/logging.h"
 #include "impeller/base/validation.h"
 
 namespace impeller {
@@ -158,6 +159,10 @@ bool ReactorGLES::React() {
   }
   TRACE_EVENT0("impeller", "ReactorGLES::React");
   while (HasPendingOperations()) {
+    // Both the raster thread and the IO thread can flush queued operations.
+    // Ensure that execution of the ops is serialized.
+    Lock execution_lock(ops_execution_mutex_);
+
     if (!ReactOnce()) {
       return false;
     }
@@ -233,6 +238,13 @@ bool ReactorGLES::ConsolidateHandles() {
 
 bool ReactorGLES::FlushOps() {
   TRACE_EVENT0("impeller", __FUNCTION__);
+
+#ifdef IMPELLER_DEBUG
+  // glDebugMessageControl sometimes must be called before glPushDebugGroup:
+  // https://github.com/flutter/flutter/issues/135715#issuecomment-1740153506
+  SetupDebugGroups();
+#endif
+
   // Do NOT hold the ops or handles locks while performing operations in case
   // the ops enqueue more ops.
   decltype(ops_) ops;
@@ -247,6 +259,18 @@ bool ReactorGLES::FlushOps() {
   return true;
 }
 
+void ReactorGLES::SetupDebugGroups() {
+  // Setup of a default active debug group: Filter everything in.
+  if (proc_table_->DebugMessageControlKHR.IsAvailable()) {
+    proc_table_->DebugMessageControlKHR(GL_DONT_CARE,  // source
+                                        GL_DONT_CARE,  // type
+                                        GL_DONT_CARE,  // severity
+                                        0,             // count
+                                        nullptr,       // ids
+                                        GL_TRUE);      // enabled
+  }
+}
+
 void ReactorGLES::SetDebugLabel(const HandleGLES& handle, std::string label) {
   if (!can_set_debug_labels_) {
     return;
diff --git a/impeller/renderer/backend/gles/reactor_gles.h b/impeller/renderer/backend/gles/reactor_gles.h
index 70d3bda65b77f7a2e88c77ff7e6e9a5319779614..1d84ffb220c92dfac4ba8d5621393ff6f3192ea2 100644
--- a/impeller/renderer/backend/gles/reactor_gles.h
+++ b/impeller/renderer/backend/gles/reactor_gles.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_REACTOR_GLES_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_REACTOR_GLES_H_
 
 #include <functional>
 #include <memory>
 #include <vector>
 
-#include "flutter/fml/closure.h"
 #include "flutter/fml/macros.h"
 #include "impeller/base/thread.h"
 #include "impeller/renderer/backend/gles/handle_gles.h"
@@ -16,43 +16,207 @@
 
 namespace impeller {
 
+//------------------------------------------------------------------------------
+/// @brief      The reactor attempts to make thread-safe usage of OpenGL ES
+///             easier to reason about.
+///
+///             In the other Impeller backends (like Metal and Vulkan),
+///             resources can be created, used, and deleted on any thread with
+///             relatively few restrictions. However, OpenGL resources can only
+///             be created, used, and deleted on a thread on which an OpenGL
+///             context (or one in the same sharegroup) is current.
+///
+///             There aren't too many OpenGL contexts to go around and making
+///             the caller reason about the timing and threading requirement
+///             only when the OpenGL backend is in use is tedious. To work
+///             around this tedium, there is an abstraction between the
+///             resources and their handles in OpenGL. The reactor is this
+///             abstraction.
+///
+///             The reactor is thread-safe and can created, used, and collected
+///             on any thread.
+///
+///             Reactor handles `HandleGLES` can be created, used, and collected
+///             on any thread. These handles can be to textures, buffers, etc..
+///
+///             Operations added to the reactor are guaranteed to run on a
+///             worker within a finite amount of time unless the reactor itself
+///             is torn down or there are no workers. These operations may run
+///             on the calling thread immediately if a worker is active on the
+///             current thread and can perform reactions. The operations are
+///             guaranteed to run with an OpenGL context current and all reactor
+///             handles having live OpenGL handle counterparts.
+///
+///             Creating a handle in the reactor doesn't mean an OpenGL handle
+///             is created immediately. OpenGL handles become live before the
+///             next reaction. Similarly, dropping the last reference to a
+///             reactor handle means that the OpenGL handle will be deleted at
+///             some point in the near future.
+///
 class ReactorGLES {
  public:
   using WorkerID = UniqueID;
 
+  //----------------------------------------------------------------------------
+  /// @brief      A delegate implemented by a thread on which an OpenGL context
+  ///             is current. There may be multiple workers for the reactor to
+  ///             perform reactions on. In that case, it is the workers
+  ///             responsibility to ensure that all of them use either the same
+  ///             OpenGL context or multiple OpenGL contexts in the same
+  ///             sharegroup.
+  ///
   class Worker {
    public:
     virtual ~Worker() = default;
 
+    //--------------------------------------------------------------------------
+    /// @brief      Determines the ability of the worker to service a reaction
+    ///             on the current thread. The OpenGL context must be current on
+    ///             the thread if the worker says it is able to service a
+    ///             reaction.
+    ///
+    /// @param[in]  reactor  The reactor
+    ///
+    /// @return     If the worker is able to service a reaction. The reactor
+    ///             assumes the context is already current if true.
+    ///
     virtual bool CanReactorReactOnCurrentThreadNow(
         const ReactorGLES& reactor) const = 0;
   };
 
   using Ref = std::shared_ptr<ReactorGLES>;
 
-  ReactorGLES(std::unique_ptr<ProcTableGLES> gl);
-
+  //----------------------------------------------------------------------------
+  /// @brief      Create a new reactor. There are expensive and only one per
+  ///             application instance is necessary.
+  ///
+  /// @param[in]  gl    The proc table for GL access. This is necessary for the
+  ///                   reactor to be able to create and collect OpenGL handles.
+  ///
+  explicit ReactorGLES(std::unique_ptr<ProcTableGLES> gl);
+
+  //----------------------------------------------------------------------------
+  /// @brief      Destroy a reactor.
+  ///
   ~ReactorGLES();
 
+  //----------------------------------------------------------------------------
+  /// @brief      If this is a valid reactor. Invalid reactors must be discarded
+  ///             immediately.
+  ///
+  /// @return     If this reactor is valid.
+  ///
   bool IsValid() const;
 
+  //----------------------------------------------------------------------------
+  /// @brief      Adds a worker to the reactor. Each new worker must ensure that
+  ///             the context it manages is the same as the other workers in the
+  ///             reactor or in the same sharegroup.
+  ///
+  /// @param[in]  worker  The worker
+  ///
+  /// @return     The worker identifier. This identifier can be used to remove
+  ///             the worker from the reactor later.
+  ///
   WorkerID AddWorker(std::weak_ptr<Worker> worker);
 
-  bool RemoveWorker(WorkerID);
-
+  //----------------------------------------------------------------------------
+  /// @brief      Remove a previously added worker from the reactor. If the
+  ///             reactor has no workers, pending added operations will never
+  ///             run.
+  ///
+  /// @param[in]  id  The worker identifier previously returned by `AddWorker`.
+  ///
+  /// @return     If a worker with the given identifer was successfully removed
+  ///             from the reactor.
+  ///
+  bool RemoveWorker(WorkerID id);
+
+  //----------------------------------------------------------------------------
+  /// @brief      Get the OpenGL proc. table the reactor uses to manage handles.
+  ///
+  /// @return     The proc table.
+  ///
   const ProcTableGLES& GetProcTable() const;
 
+  //----------------------------------------------------------------------------
+  /// @brief      Returns the OpenGL handle for a reactor handle if one is
+  ///             available. This is typically only safe to call within a
+  ///             reaction. That is, within a `ReactorGLES::Operation`.
+  ///
+  ///             Asking for the OpenGL handle before the reactor has a chance
+  ///             to reactor will return `std::nullopt`.
+  ///
+  ///             This can be called on any thread but is typically useless
+  ///             outside of a reaction since the handle is useless outside of a
+  ///             reactor operation.
+  ///
+  /// @param[in]  handle  The reactor handle.
+  ///
+  /// @return     The OpenGL handle if the reactor has had a chance to react.
+  ///             `std::nullopt` otherwise.
+  ///
   std::optional<GLuint> GetGLHandle(const HandleGLES& handle) const;
 
+  //----------------------------------------------------------------------------
+  /// @brief      Create a reactor handle.
+  ///
+  ///             This can be called on any thread. Even one that doesn't have
+  ///             an OpenGL context.
+  ///
+  /// @param[in]  type  The type of handle to create.
+  ///
+  /// @return     The reactor handle.
+  ///
   HandleGLES CreateHandle(HandleType type);
 
+  //----------------------------------------------------------------------------
+  /// @brief      Collect a reactor handle.
+  ///
+  ///             This can be called on any thread. Even one that doesn't have
+  ///             an OpenGL context.
+  ///
+  /// @param[in]  handle  The reactor handle handle
+  ///
   void CollectHandle(HandleGLES handle);
 
+  //----------------------------------------------------------------------------
+  /// @brief      Set the debug label on a reactor handle.
+  ///
+  ///             This call ensures that the OpenGL debug label is propagated to
+  ///             even the OpenGL handle hasn't been created at the time the
+  ///             caller sets the label.
+  ///
+  /// @param[in]  handle  The handle
+  /// @param[in]  label   The label
+  ///
   void SetDebugLabel(const HandleGLES& handle, std::string label);
 
   using Operation = std::function<void(const ReactorGLES& reactor)>;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Adds an operation that the reactor runs on a worker that
+  ///             ensures that an OpenGL context is current.
+  ///
+  ///             This operation is not guaranteed to run immediately. It will
+  ///             complete in a finite amount of time on any thread as long as
+  ///             there is a reactor worker and the reactor itself is not being
+  ///             torn down.
+  ///
+  /// @param[in]  operation  The operation
+  ///
+  /// @return     If the operation was successfully queued for completion.
+  ///
   [[nodiscard]] bool AddOperation(Operation operation);
 
+  //----------------------------------------------------------------------------
+  /// @brief      Perform a reaction on the current thread if able.
+  ///
+  ///             It is safe to call this simultaneously from multiple threads
+  ///             at the same time.
+  ///
+  /// @return     If a reaction was performed on the calling thread.
+  ///
   [[nodiscard]] bool React();
 
  private:
@@ -63,14 +227,14 @@ class ReactorGLES {
 
     LiveHandle() = default;
 
-    explicit LiveHandle(std::optional<GLuint> p_name)
-        : name(std::move(p_name)) {}
+    explicit LiveHandle(std::optional<GLuint> p_name) : name(p_name) {}
 
     constexpr bool IsLive() const { return name.has_value(); }
   };
 
   std::unique_ptr<ProcTableGLES> proc_table_;
 
+  Mutex ops_execution_mutex_;
   mutable Mutex ops_mutex_;
   std::vector<Operation> ops_ IPLR_GUARDED_BY(ops_mutex_);
 
@@ -84,13 +248,13 @@ class ReactorGLES {
   LiveHandles handles_ IPLR_GUARDED_BY(handles_mutex_);
 
   mutable Mutex workers_mutex_;
-  mutable std::map<WorkerID, std::weak_ptr<Worker>> workers_
-      IPLR_GUARDED_BY(workers_mutex_);
+  mutable std::map<WorkerID, std::weak_ptr<Worker>> workers_ IPLR_GUARDED_BY(
+      workers_mutex_);
 
   bool can_set_debug_labels_ = false;
   bool is_valid_ = false;
 
-  bool ReactOnce();
+  bool ReactOnce() IPLR_REQUIRES(ops_execution_mutex_);
 
   bool HasPendingOperations() const;
 
@@ -100,7 +264,13 @@ class ReactorGLES {
 
   bool FlushOps();
 
-  FML_DISALLOW_COPY_AND_ASSIGN(ReactorGLES);
+  void SetupDebugGroups();
+
+  ReactorGLES(const ReactorGLES&) = delete;
+
+  ReactorGLES& operator=(const ReactorGLES&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_REACTOR_GLES_H_
diff --git a/impeller/renderer/backend/gles/render_pass_gles.cc b/impeller/renderer/backend/gles/render_pass_gles.cc
index c3de2557cc3bebdd89ba42e9b4a5db5ef74e34b6..6cc570ff055707070ffef62c44f8d83f81d5a2c0 100644
--- a/impeller/renderer/backend/gles/render_pass_gles.cc
+++ b/impeller/renderer/backend/gles/render_pass_gles.cc
@@ -4,19 +4,23 @@
 
 #include "impeller/renderer/backend/gles/render_pass_gles.h"
 
-#include <algorithm>
+#include <cstdint>
 
+#include "GLES3/gl3.h"
 #include "flutter/fml/trace_event.h"
-#include "impeller/base/config.h"
+#include "fml/closure.h"
+#include "fml/logging.h"
 #include "impeller/base/validation.h"
+#include "impeller/renderer/backend/gles/context_gles.h"
 #include "impeller/renderer/backend/gles/device_buffer_gles.h"
 #include "impeller/renderer/backend/gles/formats_gles.h"
+#include "impeller/renderer/backend/gles/gpu_tracer_gles.h"
 #include "impeller/renderer/backend/gles/pipeline_gles.h"
 #include "impeller/renderer/backend/gles/texture_gles.h"
 
 namespace impeller {
 
-RenderPassGLES::RenderPassGLES(std::weak_ptr<const Context> context,
+RenderPassGLES::RenderPassGLES(std::shared_ptr<const Context> context,
                                const RenderTarget& target,
                                ReactorGLES::Ref reactor)
     : RenderPass(std::move(context), target),
@@ -38,35 +42,33 @@ void RenderPassGLES::OnSetLabel(std::string label) {
 
 void ConfigureBlending(const ProcTableGLES& gl,
                        const ColorAttachmentDescriptor* color) {
-  if (!color->blending_enabled) {
+  if (color->blending_enabled) {
+    gl.Enable(GL_BLEND);
+    gl.BlendFuncSeparate(
+        ToBlendFactor(color->src_color_blend_factor),  // src color
+        ToBlendFactor(color->dst_color_blend_factor),  // dst color
+        ToBlendFactor(color->src_alpha_blend_factor),  // src alpha
+        ToBlendFactor(color->dst_alpha_blend_factor)   // dst alpha
+    );
+    gl.BlendEquationSeparate(
+        ToBlendOperation(color->color_blend_op),  // mode color
+        ToBlendOperation(color->alpha_blend_op)   // mode alpha
+    );
+  } else {
     gl.Disable(GL_BLEND);
-    return;
   }
 
-  gl.Enable(GL_BLEND);
-  gl.BlendFuncSeparate(
-      ToBlendFactor(color->src_color_blend_factor),  // src color
-      ToBlendFactor(color->dst_color_blend_factor),  // dst color
-      ToBlendFactor(color->src_alpha_blend_factor),  // src alpha
-      ToBlendFactor(color->dst_alpha_blend_factor)   // dst alpha
-  );
-  gl.BlendEquationSeparate(
-      ToBlendOperation(color->color_blend_op),  // mode color
-      ToBlendOperation(color->alpha_blend_op)   // mode alpha
-  );
   {
-    const auto is_set = [](std::underlying_type_t<ColorWriteMask> mask,
+    const auto is_set = [](ColorWriteMask mask,
                            ColorWriteMask check) -> GLboolean {
-      using RawType = decltype(mask);
-      return (static_cast<RawType>(mask) & static_cast<RawType>(mask))
-                 ? GL_TRUE
-                 : GL_FALSE;
+      return (mask & check) ? GL_TRUE : GL_FALSE;
     };
 
-    gl.ColorMask(is_set(color->write_mask, ColorWriteMask::kRed),    // red
-                 is_set(color->write_mask, ColorWriteMask::kGreen),  // green
-                 is_set(color->write_mask, ColorWriteMask::kBlue),   // blue
-                 is_set(color->write_mask, ColorWriteMask::kAlpha)   // alpha
+    gl.ColorMask(
+        is_set(color->write_mask, ColorWriteMaskBits::kRed),    // red
+        is_set(color->write_mask, ColorWriteMaskBits::kGreen),  // green
+        is_set(color->write_mask, ColorWriteMaskBits::kBlue),   // blue
+        is_set(color->write_mask, ColorWriteMaskBits::kAlpha)   // alpha
     );
   }
 }
@@ -100,14 +102,16 @@ void ConfigureStencil(const ProcTableGLES& gl,
   gl.Enable(GL_STENCIL_TEST);
   const auto& front = pipeline.GetFrontStencilAttachmentDescriptor();
   const auto& back = pipeline.GetBackStencilAttachmentDescriptor();
-  if (front == back) {
+
+  if (front.has_value() && back.has_value() && front == back) {
     ConfigureStencil(GL_FRONT_AND_BACK, gl, *front, stencil_reference);
-  } else if (front.has_value()) {
+    return;
+  }
+  if (front.has_value()) {
     ConfigureStencil(GL_FRONT, gl, *front, stencil_reference);
-  } else if (back.has_value()) {
+  }
+  if (back.has_value()) {
     ConfigureStencil(GL_BACK, gl, *back, stencil_reference);
-  } else {
-    FML_UNREACHABLE();
   }
 }
 
@@ -141,14 +145,14 @@ struct RenderPassData {
     const RenderPassData& pass_data,
     const std::shared_ptr<Allocator>& transients_allocator,
     const ReactorGLES& reactor,
-    const std::vector<Command>& commands) {
-  TRACE_EVENT0("impeller", __FUNCTION__);
-
-  if (commands.empty()) {
-    return true;
-  }
+    const std::vector<Command>& commands,
+    const std::shared_ptr<GPUTracerGLES>& tracer) {
+  TRACE_EVENT0("impeller", "RenderPassGLES::EncodeCommandsInReactor");
 
   const auto& gl = reactor.GetProcTable();
+#ifdef IMPELLER_DEBUG
+  tracer->MarkFrameStart(gl);
+#endif  // IMPELLER_DEBUG
 
   fml::ScopedCleanupClosure pop_pass_debug_marker(
       [&gl]() { gl.PopDebugGroup(); });
@@ -176,25 +180,28 @@ struct RenderPassData {
 
     if (auto color = TextureGLES::Cast(pass_data.color_attachment.get())) {
       if (!color->SetAsFramebufferAttachment(
-              GL_FRAMEBUFFER, fbo, TextureGLES::AttachmentPoint::kColor0)) {
+              GL_FRAMEBUFFER, TextureGLES::AttachmentType::kColor0)) {
         return false;
       }
     }
+
     if (auto depth = TextureGLES::Cast(pass_data.depth_attachment.get())) {
       if (!depth->SetAsFramebufferAttachment(
-              GL_FRAMEBUFFER, fbo, TextureGLES::AttachmentPoint::kDepth)) {
+              GL_FRAMEBUFFER, TextureGLES::AttachmentType::kDepth)) {
         return false;
       }
     }
     if (auto stencil = TextureGLES::Cast(pass_data.stencil_attachment.get())) {
       if (!stencil->SetAsFramebufferAttachment(
-              GL_FRAMEBUFFER, fbo, TextureGLES::AttachmentPoint::kStencil)) {
+              GL_FRAMEBUFFER, TextureGLES::AttachmentType::kStencil)) {
         return false;
       }
     }
 
-    if (gl.CheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) {
-      VALIDATION_LOG << "Could not create a complete frambuffer.";
+    auto status = gl.CheckFramebufferStatus(GL_FRAMEBUFFER);
+    if (status != GL_FRAMEBUFFER_COMPLETE) {
+      VALIDATION_LOG << "Could not create a complete frambuffer: "
+                     << DebugToFramebufferError(status);
       return false;
     }
   }
@@ -205,7 +212,11 @@ struct RenderPassData {
                 pass_data.clear_color.alpha   // alpha
   );
   if (pass_data.depth_attachment) {
-    gl.ClearDepthf(pass_data.clear_depth);
+    if (gl.DepthRangef.IsAvailable()) {
+      gl.ClearDepthf(pass_data.clear_depth);
+    } else {
+      gl.ClearDepth(pass_data.clear_depth);
+    }
   }
   if (pass_data.stencil_attachment) {
     gl.ClearStencil(pass_data.clear_stencil);
@@ -228,6 +239,9 @@ struct RenderPassData {
   gl.Disable(GL_CULL_FACE);
   gl.Disable(GL_BLEND);
   gl.ColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+  gl.DepthMask(GL_TRUE);
+  gl.StencilMaskSeparate(GL_FRONT, 0xFFFFFFFF);
+  gl.StencilMaskSeparate(GL_BACK, 0xFFFFFFFF);
 
   gl.Clear(clear_bits);
 
@@ -242,6 +256,7 @@ struct RenderPassData {
       return false;
     }
 
+#ifdef IMPELLER_DEBUG
     fml::ScopedCleanupClosure pop_cmd_debug_marker(
         [&gl]() { gl.PopDebugGroup(); });
     if (!command.label.empty()) {
@@ -249,6 +264,7 @@ struct RenderPassData {
     } else {
       pop_cmd_debug_marker.Release();
     }
+#endif  // IMPELLER_DEBUG
 
     const auto& pipeline = PipelineGLES::Cast(*command.pipeline);
 
@@ -292,14 +308,18 @@ struct RenderPassData {
     /// Setup the viewport.
     ///
     const auto& viewport = command.viewport.value_or(pass_data.viewport);
-    gl.Viewport(viewport.rect.origin.x,  // x
-                target_size.height - viewport.rect.origin.y -
-                    viewport.rect.size.height,  // y
-                viewport.rect.size.width,       // width
-                viewport.rect.size.height       // height
+    gl.Viewport(viewport.rect.GetX(),  // x
+                target_size.height - viewport.rect.GetY() -
+                    viewport.rect.GetHeight(),  // y
+                viewport.rect.GetWidth(),       // width
+                viewport.rect.GetHeight()       // height
     );
     if (pass_data.depth_attachment) {
-      gl.DepthRangef(viewport.depth_range.z_near, viewport.depth_range.z_far);
+      if (gl.DepthRangef.IsAvailable()) {
+        gl.DepthRangef(viewport.depth_range.z_near, viewport.depth_range.z_far);
+      } else {
+        gl.DepthRange(viewport.depth_range.z_near, viewport.depth_range.z_far);
+      }
     }
 
     //--------------------------------------------------------------------------
@@ -309,10 +329,10 @@ struct RenderPassData {
       const auto& scissor = command.scissor.value();
       gl.Enable(GL_SCISSOR_TEST);
       gl.Scissor(
-          scissor.origin.x,                                             // x
-          target_size.height - scissor.origin.y - scissor.size.height,  // y
-          scissor.size.width,                                           // width
-          scissor.size.height  // height
+          scissor.GetX(),                                             // x
+          target_size.height - scissor.GetY() - scissor.GetHeight(),  // y
+          scissor.GetWidth(),                                         // width
+          scissor.GetHeight()                                         // height
       );
     } else {
       gl.Disable(GL_SCISSOR_TEST);
@@ -346,28 +366,24 @@ struct RenderPassData {
         break;
     }
 
-    if (command.index_type == IndexType::kUnknown) {
+    if (command.vertex_buffer.index_type == IndexType::kUnknown) {
       return false;
     }
 
-    const auto& vertex_desc_gles = pipeline.GetBufferBindings();
+    auto vertex_desc_gles = pipeline.GetBufferBindings();
 
     //--------------------------------------------------------------------------
     /// Bind vertex and index buffers.
     ///
-    auto vertex_buffer_view = command.GetVertexBuffer();
-    auto index_buffer_view = command.index_buffer;
+    auto& vertex_buffer_view = command.vertex_buffer.vertex_buffer;
 
-    if (!vertex_buffer_view || !index_buffer_view) {
+    if (!vertex_buffer_view) {
       return false;
     }
 
-    auto vertex_buffer =
-        vertex_buffer_view.buffer->GetDeviceBuffer(*transients_allocator);
-    auto index_buffer =
-        index_buffer_view.buffer->GetDeviceBuffer(*transients_allocator);
+    auto vertex_buffer = vertex_buffer_view.buffer;
 
-    if (!vertex_buffer || !index_buffer) {
+    if (!vertex_buffer) {
       return false;
     }
 
@@ -376,11 +392,6 @@ struct RenderPassData {
             DeviceBufferGLES::BindingType::kArrayBuffer)) {
       return false;
     }
-    const auto& index_buffer_gles = DeviceBufferGLES::Cast(*index_buffer);
-    if (!index_buffer_gles.BindAndUploadDataIfNecessary(
-            DeviceBufferGLES::BindingType::kElementArrayBuffer)) {
-      return false;
-    }
 
     //--------------------------------------------------------------------------
     /// Bind the pipeline program.
@@ -408,16 +419,40 @@ struct RenderPassData {
       return false;
     }
 
+    //--------------------------------------------------------------------------
+    /// Determine the primitive type.
+    ///
+    // GLES doesn't support setting the fill mode, so override the primitive
+    // with GL_LINE_STRIP to somewhat emulate PolygonMode::kLine. This isn't
+    // correct; full triangle outlines won't be drawn and disconnected
+    // geometry may appear connected. However this can still be useful for
+    // wireframe debug views.
+    auto mode = pipeline.GetDescriptor().GetPolygonMode() == PolygonMode::kLine
+                    ? GL_LINE_STRIP
+                    : ToMode(pipeline.GetDescriptor().GetPrimitiveType());
+
     //--------------------------------------------------------------------------
     /// Finally! Invoke the draw call.
     ///
-    PrimitiveType primitive_type = pipeline.GetDescriptor().GetPrimitiveType();
-    gl.DrawElements(ToMode(primitive_type),           // mode
-                    command.index_count,              // count
-                    ToIndexType(command.index_type),  // type
-                    reinterpret_cast<const GLvoid*>(static_cast<GLsizei>(
-                        index_buffer_view.range.offset))  // indices
-    );
+    if (command.vertex_buffer.index_type == IndexType::kNone) {
+      gl.DrawArrays(mode, command.base_vertex,
+                    command.vertex_buffer.vertex_count);
+    } else {
+      // Bind the index buffer if necessary.
+      auto index_buffer_view = command.vertex_buffer.index_buffer;
+      auto index_buffer = index_buffer_view.buffer;
+      const auto& index_buffer_gles = DeviceBufferGLES::Cast(*index_buffer);
+      if (!index_buffer_gles.BindAndUploadDataIfNecessary(
+              DeviceBufferGLES::BindingType::kElementArrayBuffer)) {
+        return false;
+      }
+      gl.DrawElements(mode,                                           // mode
+                      command.vertex_buffer.vertex_count,             // count
+                      ToIndexType(command.vertex_buffer.index_type),  // type
+                      reinterpret_cast<const GLvoid*>(static_cast<GLsizei>(
+                          index_buffer_view.range.offset))  // indices
+      );
+    }
 
     //--------------------------------------------------------------------------
     /// Unbind vertex attribs.
@@ -436,15 +471,22 @@ struct RenderPassData {
 
   if (gl.DiscardFramebufferEXT.IsAvailable()) {
     std::vector<GLenum> attachments;
+
+    // TODO(jonahwilliams): discarding stencil or depth on the default fbo
+    // causes Angle to discard the entire render target. Until we know the
+    // reason, default to storing.
+    bool angle_safe = gl.GetCapabilities()->IsANGLE() ? !is_default_fbo : true;
+
     if (pass_data.discard_color_attachment) {
       attachments.push_back(is_default_fbo ? GL_COLOR_EXT
                                            : GL_COLOR_ATTACHMENT0);
     }
-    if (pass_data.discard_depth_attachment) {
+    if (pass_data.discard_depth_attachment && angle_safe) {
       attachments.push_back(is_default_fbo ? GL_DEPTH_EXT
                                            : GL_DEPTH_ATTACHMENT);
     }
-    if (pass_data.discard_stencil_attachment) {
+
+    if (pass_data.discard_stencil_attachment && angle_safe) {
       attachments.push_back(is_default_fbo ? GL_STENCIL_EXT
                                            : GL_STENCIL_ATTACHMENT);
     }
@@ -454,6 +496,12 @@ struct RenderPassData {
     );
   }
 
+#ifdef IMPELLER_DEBUG
+  if (is_default_fbo) {
+    tracer->MarkFrameEnd(gl);
+  }
+#endif  // IMPELLER_DEBUG
+
   return true;
 }
 
@@ -462,9 +510,6 @@ bool RenderPassGLES::OnEncodeCommands(const Context& context) const {
   if (!IsValid()) {
     return false;
   }
-  if (commands_.empty()) {
-    return true;
-  }
   const auto& render_target = GetRenderTarget();
   if (!render_target.HasColorAttachment(0u)) {
     return false;
@@ -486,6 +531,14 @@ bool RenderPassGLES::OnEncodeCommands(const Context& context) const {
   pass_data->discard_color_attachment =
       CanDiscardAttachmentWhenDone(color0.store_action);
 
+  // When we are using EXT_multisampled_render_to_texture, it is implicitly
+  // resolved when we bind the texture to the framebuffer. We don't need to
+  // discard the attachment when we are done.
+  if (color0.resolve_texture) {
+    FML_DCHECK(context.GetCapabilities()->SupportsImplicitResolvingMSAA());
+    pass_data->discard_color_attachment = false;
+  }
+
   //----------------------------------------------------------------------------
   /// Setup depth data.
   ///
@@ -498,7 +551,7 @@ bool RenderPassGLES::OnEncodeCommands(const Context& context) const {
   }
 
   //----------------------------------------------------------------------------
-  /// Setup depth data.
+  /// Setup stencil data.
   ///
   if (stencil0.has_value()) {
     pass_data->stencil_attachment = stencil0->texture;
@@ -509,11 +562,14 @@ bool RenderPassGLES::OnEncodeCommands(const Context& context) const {
         CanDiscardAttachmentWhenDone(stencil0->store_action);
   }
 
+  std::shared_ptr<const RenderPassGLES> shared_this = shared_from_this();
+  auto tracer = ContextGLES::Cast(context).GetGPUTracer();
   return reactor_->AddOperation([pass_data,
                                  allocator = context.GetResourceAllocator(),
-                                 commands = commands_](const auto& reactor) {
-    auto result =
-        EncodeCommandsInReactor(*pass_data, allocator, reactor, commands);
+                                 render_pass = std::move(shared_this),
+                                 tracer](const auto& reactor) {
+    auto result = EncodeCommandsInReactor(*pass_data, allocator, reactor,
+                                          render_pass->commands_, tracer);
     FML_CHECK(result) << "Must be able to encode GL commands without error.";
   });
 }
diff --git a/impeller/renderer/backend/gles/render_pass_gles.h b/impeller/renderer/backend/gles/render_pass_gles.h
index 48e50760aa92115bc1745d10b474b283967b4913..9d4f986108d57107c48b67a30bfa0603ff47d2b9 100644
--- a/impeller/renderer/backend/gles/render_pass_gles.h
+++ b/impeller/renderer/backend/gles/render_pass_gles.h
@@ -2,15 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_RENDER_PASS_GLES_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_RENDER_PASS_GLES_H_
+
+#include <memory>
 
-#include "flutter/fml/macros.h"
 #include "flutter/impeller/renderer/backend/gles/reactor_gles.h"
 #include "flutter/impeller/renderer/render_pass.h"
 
 namespace impeller {
 
-class RenderPassGLES final : public RenderPass {
+class RenderPassGLES final
+    : public RenderPass,
+      public std::enable_shared_from_this<RenderPassGLES> {
  public:
   // |RenderPass|
   ~RenderPassGLES() override;
@@ -22,7 +26,7 @@ class RenderPassGLES final : public RenderPass {
   std::string label_;
   bool is_valid_ = false;
 
-  RenderPassGLES(std::weak_ptr<const Context> context,
+  RenderPassGLES(std::shared_ptr<const Context> context,
                  const RenderTarget& target,
                  ReactorGLES::Ref reactor);
 
@@ -35,7 +39,11 @@ class RenderPassGLES final : public RenderPass {
   // |RenderPass|
   bool OnEncodeCommands(const Context& context) const override;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(RenderPassGLES);
+  RenderPassGLES(const RenderPassGLES&) = delete;
+
+  RenderPassGLES& operator=(const RenderPassGLES&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_RENDER_PASS_GLES_H_
diff --git a/impeller/renderer/backend/gles/sampler_gles.cc b/impeller/renderer/backend/gles/sampler_gles.cc
index 72fea36726f95039d4a23391020286648b8612f9..292db944bbb03fc078714221591f8356dd5a7470 100644
--- a/impeller/renderer/backend/gles/sampler_gles.cc
+++ b/impeller/renderer/backend/gles/sampler_gles.cc
@@ -4,10 +4,11 @@
 
 #include "impeller/renderer/backend/gles/sampler_gles.h"
 
+#include "impeller/base/validation.h"
+#include "impeller/core/formats.h"
 #include "impeller/renderer/backend/gles/formats_gles.h"
 #include "impeller/renderer/backend/gles/proc_table_gles.h"
 #include "impeller/renderer/backend/gles/texture_gles.h"
-#include "impeller/renderer/formats.h"
 
 namespace impeller {
 
@@ -15,19 +16,19 @@ SamplerGLES::SamplerGLES(SamplerDescriptor desc) : Sampler(std::move(desc)) {}
 
 SamplerGLES::~SamplerGLES() = default;
 
-bool SamplerGLES::IsValid() const {
-  return true;
-}
+static GLint ToParam(MinMagFilter minmag_filter,
+                     std::optional<MipFilter> mip_filter = std::nullopt) {
+  if (!mip_filter.has_value()) {
+    switch (minmag_filter) {
+      case MinMagFilter::kNearest:
+        return GL_NEAREST;
+      case MinMagFilter::kLinear:
+        return GL_LINEAR;
+    }
+    FML_UNREACHABLE();
+  }
 
-static GLint ToParam(MinMagFilter minmag_filter, MipFilter mip_filter) {
-  switch (mip_filter) {
-    case MipFilter::kNone:
-      switch (minmag_filter) {
-        case MinMagFilter::kNearest:
-          return GL_NEAREST;
-        case MinMagFilter::kLinear:
-          return GL_LINEAR;
-      }
+  switch (mip_filter.value()) {
     case MipFilter::kNearest:
       switch (minmag_filter) {
         case MinMagFilter::kNearest:
@@ -46,7 +47,8 @@ static GLint ToParam(MinMagFilter minmag_filter, MipFilter mip_filter) {
   FML_UNREACHABLE();
 }
 
-static GLint ToAddressMode(SamplerAddressMode mode) {
+static GLint ToAddressMode(SamplerAddressMode mode,
+                           bool supports_decal_sampler_address_mode) {
   switch (mode) {
     case SamplerAddressMode::kClampToEdge:
       return GL_CLAMP_TO_EDGE;
@@ -54,13 +56,22 @@ static GLint ToAddressMode(SamplerAddressMode mode) {
       return GL_REPEAT;
     case SamplerAddressMode::kMirror:
       return GL_MIRRORED_REPEAT;
+    case SamplerAddressMode::kDecal:
+      if (supports_decal_sampler_address_mode) {
+        return IMPELLER_GL_CLAMP_TO_BORDER;
+      } else {
+        return GL_CLAMP_TO_EDGE;
+      }
   }
   FML_UNREACHABLE();
 }
 
 bool SamplerGLES::ConfigureBoundTexture(const TextureGLES& texture,
                                         const ProcTableGLES& gl) const {
-  if (!IsValid()) {
+  if (texture.NeedsMipmapGeneration()) {
+    VALIDATION_LOG
+        << "Texture mip count is > 1, but the mipmap has not been generated. "
+           "Texture can not be sampled safely.";
     return false;
   }
 
@@ -69,16 +80,35 @@ bool SamplerGLES::ConfigureBoundTexture(const TextureGLES& texture,
   if (!target.has_value()) {
     return false;
   }
-
   const auto& desc = GetDescriptor();
-  gl.TexParameteri(target.value(), GL_TEXTURE_MIN_FILTER,
-                   ToParam(desc.min_filter, desc.mip_filter));
-  gl.TexParameteri(target.value(), GL_TEXTURE_MAG_FILTER,
-                   ToParam(desc.mag_filter, MipFilter::kNone));
-  gl.TexParameteri(target.value(), GL_TEXTURE_WRAP_S,
-                   ToAddressMode(desc.width_address_mode));
-  gl.TexParameteri(target.value(), GL_TEXTURE_WRAP_T,
-                   ToAddressMode(desc.height_address_mode));
+
+  std::optional<MipFilter> mip_filter = std::nullopt;
+  if (texture.GetTextureDescriptor().mip_count > 1) {
+    mip_filter = desc.mip_filter;
+  }
+
+  gl.TexParameteri(*target, GL_TEXTURE_MIN_FILTER,
+                   ToParam(desc.min_filter, mip_filter));
+  gl.TexParameteri(*target, GL_TEXTURE_MAG_FILTER, ToParam(desc.mag_filter));
+
+  const auto supports_decal_mode =
+      gl.GetCapabilities()->SupportsDecalSamplerAddressMode();
+
+  const auto wrap_s =
+      ToAddressMode(desc.width_address_mode, supports_decal_mode);
+  const auto wrap_t =
+      ToAddressMode(desc.height_address_mode, supports_decal_mode);
+
+  gl.TexParameteri(*target, GL_TEXTURE_WRAP_S, wrap_s);
+  gl.TexParameteri(*target, GL_TEXTURE_WRAP_T, wrap_t);
+
+  if (wrap_s == IMPELLER_GL_CLAMP_TO_BORDER ||
+      wrap_t == IMPELLER_GL_CLAMP_TO_BORDER) {
+    // Transparent black.
+    const GLfloat border_color[4] = {0.0f, 0.0f, 0.0f, 0.0f};
+    gl.TexParameterfv(*target, IMPELLER_GL_TEXTURE_BORDER_COLOR, border_color);
+  }
+
   return true;
 }
 
diff --git a/impeller/renderer/backend/gles/sampler_gles.h b/impeller/renderer/backend/gles/sampler_gles.h
index 7fa58daa452156580cac5ff953a3b5b499c6821e..a2372ec1c3d50586cc6355d79251a5a163d6c5b0 100644
--- a/impeller/renderer/backend/gles/sampler_gles.h
+++ b/impeller/renderer/backend/gles/sampler_gles.h
@@ -2,11 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_SAMPLER_GLES_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_SAMPLER_GLES_H_
 
 #include "flutter/fml/macros.h"
 #include "impeller/base/backend_cast.h"
-#include "impeller/renderer/sampler.h"
+#include "impeller/core/sampler.h"
 
 namespace impeller {
 
@@ -25,12 +26,13 @@ class SamplerGLES final : public Sampler,
  private:
   friend class SamplerLibraryGLES;
 
-  SamplerGLES(SamplerDescriptor desc);
+  explicit SamplerGLES(SamplerDescriptor desc);
 
-  // |Sampler|
-  bool IsValid() const override;
+  SamplerGLES(const SamplerGLES&) = delete;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(SamplerGLES);
+  SamplerGLES& operator=(const SamplerGLES&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_SAMPLER_GLES_H_
diff --git a/impeller/renderer/backend/gles/sampler_library_gles.cc b/impeller/renderer/backend/gles/sampler_library_gles.cc
index bea4a4d40879b8c63d08a2be56bfc50e4ffc1bc2..5536d6ca709290dba8e2e36db528233928cbddd9 100644
--- a/impeller/renderer/backend/gles/sampler_library_gles.cc
+++ b/impeller/renderer/backend/gles/sampler_library_gles.cc
@@ -5,24 +5,39 @@
 #include "impeller/renderer/backend/gles/sampler_library_gles.h"
 
 #include "impeller/base/config.h"
+#include "impeller/base/validation.h"
+#include "impeller/core/formats.h"
 #include "impeller/renderer/backend/gles/sampler_gles.h"
 
 namespace impeller {
 
-SamplerLibraryGLES::SamplerLibraryGLES() = default;
+static const std::unique_ptr<const Sampler> kNullSampler = nullptr;
+
+SamplerLibraryGLES::SamplerLibraryGLES(bool supports_decal_sampler_address_mode)
+    : supports_decal_sampler_address_mode_(
+          supports_decal_sampler_address_mode) {}
 
 // |SamplerLibrary|
 SamplerLibraryGLES::~SamplerLibraryGLES() = default;
 
 // |SamplerLibrary|
-std::shared_ptr<const Sampler> SamplerLibraryGLES::GetSampler(
+const std::unique_ptr<const Sampler>& SamplerLibraryGLES::GetSampler(
     SamplerDescriptor descriptor) {
+  if (!supports_decal_sampler_address_mode_ &&
+      (descriptor.width_address_mode == SamplerAddressMode::kDecal ||
+       descriptor.height_address_mode == SamplerAddressMode::kDecal ||
+       descriptor.depth_address_mode == SamplerAddressMode::kDecal)) {
+    VALIDATION_LOG << "SamplerAddressMode::kDecal is not supported by the "
+                      "current OpenGLES backend.";
+    return kNullSampler;
+  }
+
   auto found = samplers_.find(descriptor);
   if (found != samplers_.end()) {
     return found->second;
   }
-  return samplers_[descriptor] =
-             std::shared_ptr<SamplerGLES>(new SamplerGLES(descriptor));
+  return (samplers_[descriptor] =
+              std::unique_ptr<SamplerGLES>(new SamplerGLES(descriptor)));
 }
 
 }  // namespace impeller
diff --git a/impeller/renderer/backend/gles/sampler_library_gles.h b/impeller/renderer/backend/gles/sampler_library_gles.h
index 9bf35d6740ec8f478f7427ca93edb1b2343f2a4c..502a908c234e2a010b888a7d7b4776a995770094 100644
--- a/impeller/renderer/backend/gles/sampler_library_gles.h
+++ b/impeller/renderer/backend/gles/sampler_library_gles.h
@@ -2,16 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_SAMPLER_LIBRARY_GLES_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_SAMPLER_LIBRARY_GLES_H_
 
-#include "flutter/fml/macros.h"
-#include "impeller/renderer/sampler_descriptor.h"
+#include "impeller/core/sampler.h"
+#include "impeller/core/sampler_descriptor.h"
 #include "impeller/renderer/sampler_library.h"
 
 namespace impeller {
 
 class SamplerLibraryGLES final : public SamplerLibrary {
  public:
+  explicit SamplerLibraryGLES(bool supports_decal_sampler_address_mode);
   // |SamplerLibrary|
   ~SamplerLibraryGLES() override;
 
@@ -23,10 +25,16 @@ class SamplerLibraryGLES final : public SamplerLibrary {
   SamplerLibraryGLES();
 
   // |SamplerLibrary|
-  std::shared_ptr<const Sampler> GetSampler(
+  const std::unique_ptr<const Sampler>& GetSampler(
       SamplerDescriptor descriptor) override;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(SamplerLibraryGLES);
+  bool supports_decal_sampler_address_mode_ = false;
+
+  SamplerLibraryGLES(const SamplerLibraryGLES&) = delete;
+
+  SamplerLibraryGLES& operator=(const SamplerLibraryGLES&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_SAMPLER_LIBRARY_GLES_H_
diff --git a/impeller/renderer/backend/gles/shader_function_gles.h b/impeller/renderer/backend/gles/shader_function_gles.h
index 9658ca046dd2d5780bbdf742861ed989720bf978..97bf2a49dc57315ed923dc25a1b0cdb16759a9a7 100644
--- a/impeller/renderer/backend/gles/shader_function_gles.h
+++ b/impeller/renderer/backend/gles/shader_function_gles.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_SHADER_FUNCTION_GLES_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_SHADER_FUNCTION_GLES_H_
 
 #include <string>
 
@@ -34,7 +35,11 @@ class ShaderFunctionGLES final
                      std::string name,
                      std::shared_ptr<const fml::Mapping> mapping);
 
-  FML_DISALLOW_COPY_AND_ASSIGN(ShaderFunctionGLES);
+  ShaderFunctionGLES(const ShaderFunctionGLES&) = delete;
+
+  ShaderFunctionGLES& operator=(const ShaderFunctionGLES&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_SHADER_FUNCTION_GLES_H_
diff --git a/impeller/renderer/backend/gles/shader_library_gles.cc b/impeller/renderer/backend/gles/shader_library_gles.cc
index f3c273c63e913456370ccd67a40c48f43747d662..48e52e4edc30ea558e08da0d69d41de5b381c053 100644
--- a/impeller/renderer/backend/gles/shader_library_gles.cc
+++ b/impeller/renderer/backend/gles/shader_library_gles.cc
@@ -9,18 +9,19 @@
 #include "flutter/fml/closure.h"
 #include "impeller/base/config.h"
 #include "impeller/base/validation.h"
-#include "impeller/blobcat/blob_library.h"
 #include "impeller/renderer/backend/gles/shader_function_gles.h"
+#include "impeller/shader_archive/multi_arch_shader_archive.h"
+#include "impeller/shader_archive/shader_archive.h"
 
 namespace impeller {
 
-static ShaderStage ToShaderStage(BlobShaderType type) {
+static ShaderStage ToShaderStage(ArchiveShaderType type) {
   switch (type) {
-    case BlobShaderType::kVertex:
+    case ArchiveShaderType::kVertex:
       return ShaderStage::kVertex;
-    case BlobShaderType::kFragment:
+    case ArchiveShaderType::kFragment:
       return ShaderStage::kFragment;
-    case BlobShaderType::kCompute:
+    case ArchiveShaderType::kCompute:
       return ShaderStage::kCompute;
   }
   FML_UNREACHABLE();
@@ -40,12 +41,6 @@ static std::string GLESShaderNameToShaderKeyName(const std::string& name,
     case ShaderStage::kFragment:
       stream << "_fragment_";
       break;
-    case ShaderStage::kTessellationControl:
-      stream << "_tessellation_control_";
-      break;
-    case ShaderStage::kTessellationEvaluation:
-      stream << "_tessellation_evaluation_";
-      break;
     case ShaderStage::kCompute:
       stream << "_compute_";
       break;
@@ -74,12 +69,13 @@ ShaderLibraryGLES::ShaderLibraryGLES(
     return true;
   };
   for (auto library : shader_libraries) {
-    auto blob_library = BlobLibrary{std::move(library)};
-    if (!blob_library.IsValid()) {
-      VALIDATION_LOG << "Could not construct blob library for shaders.";
+    auto gles_archive = MultiArchShaderArchive::CreateArchiveFromMapping(
+        std::move(library), ArchiveRenderingBackend::kOpenGLES);
+    if (!gles_archive || !gles_archive->IsValid()) {
+      VALIDATION_LOG << "Could not construct shader library.";
       return;
     }
-    blob_library.IterateAllBlobs(iterator);
+    gles_archive->IterateAllShaders(iterator);
   }
 
   functions_ = functions;
@@ -145,7 +141,7 @@ void ShaderLibraryGLES::UnregisterFunction(std::string name,
   const auto key = ShaderKey{name, stage};
 
   auto found = functions_.find(key);
-  if (found != functions_.end()) {
+  if (found == functions_.end()) {
     VALIDATION_LOG << "Library function named " << name
                    << " was not found, so it couldn't be unregistered.";
     return;
diff --git a/impeller/renderer/backend/gles/shader_library_gles.h b/impeller/renderer/backend/gles/shader_library_gles.h
index 06750077d6acd356c42a9931430aa942b7f3edbb..8c10a638c82371abea0ae60332d9b463a1ebf142 100644
--- a/impeller/renderer/backend/gles/shader_library_gles.h
+++ b/impeller/renderer/backend/gles/shader_library_gles.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_SHADER_LIBRARY_GLES_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_SHADER_LIBRARY_GLES_H_
 
 #include <memory>
 
@@ -30,7 +31,7 @@ class ShaderLibraryGLES final : public ShaderLibrary {
   ShaderFunctionMap functions_ IPLR_GUARDED_BY(functions_mutex_);
   bool is_valid_ = false;
 
-  ShaderLibraryGLES(
+  explicit ShaderLibraryGLES(
       const std::vector<std::shared_ptr<fml::Mapping>>& shader_libraries);
 
   // |ShaderLibrary|
@@ -46,7 +47,11 @@ class ShaderLibraryGLES final : public ShaderLibrary {
   // |ShaderLibrary|
   void UnregisterFunction(std::string name, ShaderStage stage) override;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(ShaderLibraryGLES);
+  ShaderLibraryGLES(const ShaderLibraryGLES&) = delete;
+
+  ShaderLibraryGLES& operator=(const ShaderLibraryGLES&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_SHADER_LIBRARY_GLES_H_
diff --git a/impeller/renderer/backend/gles/surface_gles.cc b/impeller/renderer/backend/gles/surface_gles.cc
index a179b3798f3d9782ca79cad824e6ec9045f511f5..d225831d0896da0aaa41549175bb4a65f7490f6d 100644
--- a/impeller/renderer/backend/gles/surface_gles.cc
+++ b/impeller/renderer/backend/gles/surface_gles.cc
@@ -29,7 +29,7 @@ std::unique_ptr<Surface> SurfaceGLES::WrapFBO(
   color0_tex.type = TextureType::kTexture2D;
   color0_tex.format = color_format;
   color0_tex.size = fbo_size;
-  color0_tex.usage = static_cast<TextureUsageMask>(TextureUsage::kRenderTarget);
+  color0_tex.usage = TextureUsage::kRenderTarget;
   color0_tex.sample_count = SampleCount::kCount1;
   color0_tex.storage_mode = StorageMode::kDevicePrivate;
 
@@ -40,26 +40,39 @@ std::unique_ptr<Surface> SurfaceGLES::WrapFBO(
   color0.load_action = LoadAction::kClear;
   color0.store_action = StoreAction::kStore;
 
-  TextureDescriptor stencil0_tex;
-  stencil0_tex.type = TextureType::kTexture2D;
-  stencil0_tex.format = color_format;
-  stencil0_tex.size = fbo_size;
-  stencil0_tex.usage =
-      static_cast<TextureUsageMask>(TextureUsage::kRenderTarget);
-  stencil0_tex.sample_count = SampleCount::kCount1;
+  TextureDescriptor depth_stencil_texture_desc;
+  depth_stencil_texture_desc.type = TextureType::kTexture2D;
+  depth_stencil_texture_desc.format = color_format;
+  depth_stencil_texture_desc.size = fbo_size;
+  depth_stencil_texture_desc.usage = TextureUsage::kRenderTarget;
+  depth_stencil_texture_desc.sample_count = SampleCount::kCount1;
+
+  auto depth_stencil_tex = std::make_shared<TextureGLES>(
+      gl_context.GetReactor(), depth_stencil_texture_desc,
+      TextureGLES::IsWrapped::kWrapped);
+
+  DepthAttachment depth0;
+  depth0.clear_depth = 0;
+  depth0.texture = depth_stencil_tex;
+  depth0.load_action = LoadAction::kClear;
+  depth0.store_action = StoreAction::kDontCare;
 
   StencilAttachment stencil0;
   stencil0.clear_stencil = 0;
-  stencil0.texture = std::make_shared<TextureGLES>(
-      gl_context.GetReactor(), stencil0_tex, TextureGLES::IsWrapped::kWrapped);
+  stencil0.texture = depth_stencil_tex;
   stencil0.load_action = LoadAction::kClear;
   stencil0.store_action = StoreAction::kDontCare;
 
   RenderTarget render_target_desc;
 
   render_target_desc.SetColorAttachment(color0, 0u);
+  render_target_desc.SetDepthAttachment(depth0);
   render_target_desc.SetStencilAttachment(stencil0);
 
+#ifdef IMPELLER_DEBUG
+  gl_context.GetGPUTracer()->RecordRasterThread();
+#endif  // IMPELLER_DEBUG
+
   return std::unique_ptr<SurfaceGLES>(
       new SurfaceGLES(std::move(swap_callback), render_target_desc));
 }
diff --git a/impeller/renderer/backend/gles/surface_gles.h b/impeller/renderer/backend/gles/surface_gles.h
index b2d8819041058f9130265733a39de45c0d81eb23..1b040598d3994ed71ddfdd5bef3dac610c9cd588 100644
--- a/impeller/renderer/backend/gles/surface_gles.h
+++ b/impeller/renderer/backend/gles/surface_gles.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_SURFACE_GLES_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_SURFACE_GLES_H_
 
 #include <functional>
 #include <memory>
@@ -36,7 +37,11 @@ class SurfaceGLES final : public Surface {
   // |Surface|
   bool Present() const override;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(SurfaceGLES);
+  SurfaceGLES(const SurfaceGLES&) = delete;
+
+  SurfaceGLES& operator=(const SurfaceGLES&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_SURFACE_GLES_H_
diff --git a/impeller/renderer/backend/gles/test/README.md b/impeller/renderer/backend/gles/test/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..dd9d028e1b8bd6c4c3ba4f06f33030663906843d
--- /dev/null
+++ b/impeller/renderer/backend/gles/test/README.md
@@ -0,0 +1,48 @@
+# `MockGLES`
+
+This directory contains a mock implementation of the GLES backend.
+
+Most functions are implemented as no-ops, have a default implementation that is not configurable, or just record the call. The latter is useful for testing:
+
+```cc
+TEST(MockGLES, Example) {
+  // Creates a mock GLES implementation and sets it as the current one.
+  auto mock_gles = MockGLES::Init();
+  auto& gl = mock_gles->GetProcTable();
+
+  // Call the proc table methods as usual, or pass the proc table to a class
+  // that needs it.
+  gl.PushDebugGroupKHR(GL_DEBUG_SOURCE_APPLICATION_KHR, 0, -1, "test");
+  gl.PopDebugGroupKHR();
+
+  // Method names are recorded and can be inspected.
+  //
+  // Note that many built-ins, like glGetString, are not recorded (otherwise the // logs would be much bigger and less useful).
+  auto calls = mock_gles->GetCapturedCalls();
+  EXPECT_EQ(calls, std::vector<std::string>(
+                       {"PushDebugGroupKHR", "PopDebugGroupKHR"}));
+}
+```
+
+To add a new function, do the following:
+
+1. Add a new top-level method to [`mock_gles.cc`](mock_gles.cc):
+
+   ```cc
+   void glFooBar() {
+     recordCall("glFooBar");
+   }
+   ```
+
+2. Edit the `kMockResolver`, and add a new `else if` clause:
+
+   ```diff
+   + else if (strcmp(name, "glFooBar") == 0) {
+   +  return reinterpret_cast<void*>(&glFooBar);
+     } else {
+      return reinterpret_cast<void*>(&glDoNothing);
+     }
+   ```
+
+It's possible we'll want to add a more sophisticated mechanism for mocking
+besides capturing calls, but this is a good start. PRs welcome!
diff --git a/impeller/renderer/backend/gles/test/capabilities_unittests.cc b/impeller/renderer/backend/gles/test/capabilities_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..2ad20916a72337fc03698fc1a309210b6c0a5c22
--- /dev/null
+++ b/impeller/renderer/backend/gles/test/capabilities_unittests.cc
@@ -0,0 +1,68 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/testing/testing.h"  // IWYU pragma: keep
+#include "gtest/gtest.h"
+#include "impeller/renderer/backend/gles/proc_table_gles.h"
+#include "impeller/renderer/backend/gles/test/mock_gles.h"
+
+namespace impeller {
+namespace testing {
+
+TEST(CapabilitiesGLES, CanInitializeWithDefaults) {
+  auto mock_gles = MockGLES::Init();
+
+  auto capabilities = mock_gles->GetProcTable().GetCapabilities();
+
+  EXPECT_FALSE(capabilities->SupportsOffscreenMSAA());
+  EXPECT_FALSE(capabilities->SupportsSSBO());
+  EXPECT_FALSE(capabilities->SupportsBufferToTextureBlits());
+  EXPECT_FALSE(capabilities->SupportsTextureToTextureBlits());
+  EXPECT_FALSE(capabilities->SupportsFramebufferFetch());
+  EXPECT_FALSE(capabilities->SupportsCompute());
+  EXPECT_FALSE(capabilities->SupportsComputeSubgroups());
+  EXPECT_FALSE(capabilities->SupportsReadFromResolve());
+  EXPECT_FALSE(capabilities->SupportsDecalSamplerAddressMode());
+  EXPECT_FALSE(capabilities->SupportsDeviceTransientTextures());
+
+  EXPECT_EQ(capabilities->GetDefaultColorFormat(),
+            PixelFormat::kR8G8B8A8UNormInt);
+  EXPECT_EQ(capabilities->GetDefaultStencilFormat(), PixelFormat::kS8UInt);
+  EXPECT_EQ(capabilities->GetDefaultDepthStencilFormat(),
+            PixelFormat::kD24UnormS8Uint);
+}
+
+TEST(CapabilitiesGLES, SupportsDecalSamplerAddressMode) {
+  auto const extensions = std::vector<const unsigned char*>{
+      reinterpret_cast<const unsigned char*>("GL_KHR_debug"),                 //
+      reinterpret_cast<const unsigned char*>("GL_EXT_texture_border_clamp"),  //
+  };
+  auto mock_gles = MockGLES::Init(extensions);
+  auto capabilities = mock_gles->GetProcTable().GetCapabilities();
+  EXPECT_TRUE(capabilities->SupportsDecalSamplerAddressMode());
+}
+
+TEST(CapabilitiesGLES, SupportsDecalSamplerAddressModeNotOES) {
+  auto const extensions = std::vector<const unsigned char*>{
+      reinterpret_cast<const unsigned char*>("GL_KHR_debug"),                 //
+      reinterpret_cast<const unsigned char*>("GL_OES_texture_border_clamp"),  //
+  };
+  auto mock_gles = MockGLES::Init(extensions);
+  auto capabilities = mock_gles->GetProcTable().GetCapabilities();
+  EXPECT_FALSE(capabilities->SupportsDecalSamplerAddressMode());
+}
+
+TEST(CapabilitiesGLES, SupportsFramebufferFetch) {
+  auto const extensions = std::vector<const unsigned char*>{
+      reinterpret_cast<const unsigned char*>("GL_KHR_debug"),  //
+      reinterpret_cast<const unsigned char*>(
+          "GL_EXT_shader_framebuffer_fetch"),  //
+  };
+  auto mock_gles = MockGLES::Init(extensions);
+  auto capabilities = mock_gles->GetProcTable().GetCapabilities();
+  EXPECT_TRUE(capabilities->SupportsFramebufferFetch());
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/renderer/backend/gles/test/formats_gles_unittests.cc b/impeller/renderer/backend/gles/test/formats_gles_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..4e0fd114e80e342a00f5a9851290471f25ecd283
--- /dev/null
+++ b/impeller/renderer/backend/gles/test/formats_gles_unittests.cc
@@ -0,0 +1,28 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/testing/testing.h"  // IWYU pragma: keep
+#include "gtest/gtest.h"
+#include "impeller/renderer/backend/gles/formats_gles.h"
+
+namespace impeller {
+namespace testing {
+
+TEST(FormatsGLES, CanFormatFramebufferErrorMessage) {
+  ASSERT_EQ(DebugToFramebufferError(GL_FRAMEBUFFER_UNDEFINED),
+            "GL_FRAMEBUFFER_UNDEFINED");
+  ASSERT_EQ(DebugToFramebufferError(GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT),
+            "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT");
+  ASSERT_EQ(
+      DebugToFramebufferError(GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT),
+      "GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT");
+  ASSERT_EQ(DebugToFramebufferError(GL_FRAMEBUFFER_UNSUPPORTED),
+            "GL_FRAMEBUFFER_UNSUPPORTED");
+  ASSERT_EQ(DebugToFramebufferError(GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE),
+            "GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE");
+  ASSERT_EQ(DebugToFramebufferError(0), "Unknown error code: 0");
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/renderer/backend/gles/test/gpu_tracer_gles_unittests.cc b/impeller/renderer/backend/gles/test/gpu_tracer_gles_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..d0579a2091b23e89cbf24263024df1741d0c41f5
--- /dev/null
+++ b/impeller/renderer/backend/gles/test/gpu_tracer_gles_unittests.cc
@@ -0,0 +1,50 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/testing/testing.h"  // IWYU pragma: keep
+#include "gtest/gtest.h"
+#include "impeller/renderer/backend/gles/gpu_tracer_gles.h"
+#include "impeller/renderer/backend/gles/test/mock_gles.h"
+
+namespace impeller {
+namespace testing {
+
+#ifdef IMPELLER_DEBUG
+TEST(GPUTracerGLES, CanFormatFramebufferErrorMessage) {
+  auto const extensions = std::vector<const unsigned char*>{
+      reinterpret_cast<const unsigned char*>("GL_KHR_debug"),                 //
+      reinterpret_cast<const unsigned char*>("GL_EXT_disjoint_timer_query"),  //
+  };
+  auto mock_gles = MockGLES::Init(extensions);
+  auto tracer =
+      std::make_shared<GPUTracerGLES>(mock_gles->GetProcTable(), true);
+  tracer->RecordRasterThread();
+  tracer->MarkFrameStart(mock_gles->GetProcTable());
+  tracer->MarkFrameEnd(mock_gles->GetProcTable());
+
+  auto calls = mock_gles->GetCapturedCalls();
+
+  std::vector<std::string> expected = {"glGenQueriesEXT", "glBeginQueryEXT",
+                                       "glEndQueryEXT"};
+  for (auto i = 0; i < 3; i++) {
+    EXPECT_EQ(calls[i], expected[i]);
+  }
+
+  // Begin second frame, which prompts the tracer to query the result
+  // from the previous frame.
+  tracer->MarkFrameStart(mock_gles->GetProcTable());
+
+  calls = mock_gles->GetCapturedCalls();
+  std::vector<std::string> expected_b = {"glGetQueryObjectuivEXT",
+                                         "glGetQueryObjectui64vEXT",
+                                         "glDeleteQueriesEXT"};
+  for (auto i = 0; i < 3; i++) {
+    EXPECT_EQ(calls[i], expected_b[i]);
+  }
+}
+
+#endif  // IMPELLER_DEBUG
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/renderer/backend/gles/test/mock_gles.cc b/impeller/renderer/backend/gles/test/mock_gles.cc
new file mode 100644
index 0000000000000000000000000000000000000000..d000dad400947812904d8e5a29074abf0e5eb360
--- /dev/null
+++ b/impeller/renderer/backend/gles/test/mock_gles.cc
@@ -0,0 +1,218 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <memory>
+
+#include "GLES3/gl3.h"
+#include "fml/logging.h"
+#include "impeller/renderer/backend/gles/proc_table_gles.h"
+#include "impeller/renderer/backend/gles/test/mock_gles.h"
+
+namespace impeller {
+namespace testing {
+
+// OpenGLES is not thread safe.
+//
+// This mutex is used to ensure that only one test is using the mock at a time.
+static std::mutex g_test_lock;
+
+static std::weak_ptr<MockGLES> g_mock_gles;
+
+static ProcTableGLES::Resolver g_resolver;
+
+static std::vector<const unsigned char*> g_extensions;
+
+static const unsigned char* g_version;
+
+// Has friend visibility into MockGLES to record calls.
+void RecordGLCall(const char* name) {
+  if (auto mock_gles = g_mock_gles.lock()) {
+    mock_gles->RecordCall(name);
+  }
+}
+
+template <typename T, typename U>
+struct CheckSameSignature : std::false_type {};
+
+template <typename Ret, typename... Args>
+struct CheckSameSignature<Ret(Args...), Ret(Args...)> : std::true_type {};
+
+// This is a stub function that does nothing/records nothing.
+void doNothing() {}
+
+auto const kMockVendor = (unsigned char*)"MockGLES";
+const auto kMockShadingLanguageVersion = (unsigned char*)"GLSL ES 1.0";
+auto const kExtensions = std::vector<const unsigned char*>{
+    (unsigned char*)"GL_KHR_debug"  //
+};
+
+const unsigned char* mockGetString(GLenum name) {
+  switch (name) {
+    case GL_VENDOR:
+      return kMockVendor;
+    case GL_VERSION:
+      return g_version;
+    case GL_SHADING_LANGUAGE_VERSION:
+      return kMockShadingLanguageVersion;
+    default:
+      return (unsigned char*)"";
+  }
+}
+
+static_assert(CheckSameSignature<decltype(mockGetString),  //
+                                 decltype(glGetString)>::value);
+
+const unsigned char* mockGetStringi(GLenum name, GLuint index) {
+  switch (name) {
+    case GL_EXTENSIONS:
+      return g_extensions[index];
+    default:
+      return (unsigned char*)"";
+  }
+}
+
+static_assert(CheckSameSignature<decltype(mockGetStringi),  //
+                                 decltype(glGetStringi)>::value);
+
+void mockGetIntegerv(GLenum name, int* value) {
+  switch (name) {
+    case GL_NUM_EXTENSIONS: {
+      *value = g_extensions.size();
+    } break;
+    case GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS:
+      *value = 8;
+      break;
+    default:
+      *value = 0;
+      break;
+  }
+}
+
+static_assert(CheckSameSignature<decltype(mockGetIntegerv),  //
+                                 decltype(glGetIntegerv)>::value);
+
+GLenum mockGetError() {
+  return GL_NO_ERROR;
+}
+
+static_assert(CheckSameSignature<decltype(mockGetError),  //
+                                 decltype(glGetError)>::value);
+
+void mockPopDebugGroupKHR() {
+  RecordGLCall("PopDebugGroupKHR");
+}
+
+static_assert(CheckSameSignature<decltype(mockPopDebugGroupKHR),  //
+                                 decltype(glPopDebugGroupKHR)>::value);
+
+void mockPushDebugGroupKHR(GLenum source,
+                           GLuint id,
+                           GLsizei length,
+                           const GLchar* message) {
+  RecordGLCall("PushDebugGroupKHR");
+}
+
+static_assert(CheckSameSignature<decltype(mockPushDebugGroupKHR),  //
+                                 decltype(glPushDebugGroupKHR)>::value);
+
+void mockGenQueriesEXT(GLsizei n, GLuint* ids) {
+  RecordGLCall("glGenQueriesEXT");
+  for (auto i = 0; i < n; i++) {
+    ids[i] = i + 1;
+  }
+}
+
+static_assert(CheckSameSignature<decltype(mockGenQueriesEXT),  //
+                                 decltype(glGenQueriesEXT)>::value);
+
+void mockBeginQueryEXT(GLenum target, GLuint id) {
+  RecordGLCall("glBeginQueryEXT");
+}
+
+static_assert(CheckSameSignature<decltype(mockBeginQueryEXT),  //
+                                 decltype(glBeginQueryEXT)>::value);
+
+void mockEndQueryEXT(GLuint id) {
+  RecordGLCall("glEndQueryEXT");
+}
+
+static_assert(CheckSameSignature<decltype(mockEndQueryEXT),  //
+                                 decltype(glEndQueryEXT)>::value);
+
+void mockGetQueryObjectuivEXT(GLuint id, GLenum target, GLuint* result) {
+  RecordGLCall("glGetQueryObjectuivEXT");
+  *result = GL_TRUE;
+}
+
+static_assert(CheckSameSignature<decltype(mockGetQueryObjectuivEXT),  //
+                                 decltype(glGetQueryObjectuivEXT)>::value);
+
+void mockGetQueryObjectui64vEXT(GLuint id, GLenum target, GLuint64* result) {
+  RecordGLCall("glGetQueryObjectui64vEXT");
+  *result = 1000u;
+}
+
+static_assert(CheckSameSignature<decltype(mockGetQueryObjectui64vEXT),  //
+                                 decltype(glGetQueryObjectui64vEXT)>::value);
+
+void mockDeleteQueriesEXT(GLsizei size, const GLuint* queries) {
+  RecordGLCall("glDeleteQueriesEXT");
+}
+
+static_assert(CheckSameSignature<decltype(mockDeleteQueriesEXT),  //
+                                 decltype(glDeleteQueriesEXT)>::value);
+
+std::shared_ptr<MockGLES> MockGLES::Init(
+    const std::optional<std::vector<const unsigned char*>>& extensions,
+    const char* version_string,
+    ProcTableGLES::Resolver resolver) {
+  // If we cannot obtain a lock, MockGLES is already being used elsewhere.
+  FML_CHECK(g_test_lock.try_lock())
+      << "MockGLES is already being used by another test.";
+  g_version = (unsigned char*)version_string;
+  g_extensions = extensions.value_or(kExtensions);
+  auto mock_gles = std::shared_ptr<MockGLES>(new MockGLES(std::move(resolver)));
+  g_mock_gles = mock_gles;
+  return mock_gles;
+}
+
+const ProcTableGLES::Resolver kMockResolverGLES = [](const char* name) {
+  if (strcmp(name, "glPopDebugGroupKHR") == 0) {
+    return reinterpret_cast<void*>(&mockPopDebugGroupKHR);
+  } else if (strcmp(name, "glPushDebugGroupKHR") == 0) {
+    return reinterpret_cast<void*>(&mockPushDebugGroupKHR);
+  } else if (strcmp(name, "glGetString") == 0) {
+    return reinterpret_cast<void*>(&mockGetString);
+  } else if (strcmp(name, "glGetStringi") == 0) {
+    return reinterpret_cast<void*>(&mockGetStringi);
+  } else if (strcmp(name, "glGetIntegerv") == 0) {
+    return reinterpret_cast<void*>(&mockGetIntegerv);
+  } else if (strcmp(name, "glGetError") == 0) {
+    return reinterpret_cast<void*>(&mockGetError);
+  } else if (strcmp(name, "glGenQueriesEXT") == 0) {
+    return reinterpret_cast<void*>(&mockGenQueriesEXT);
+  } else if (strcmp(name, "glBeginQueryEXT") == 0) {
+    return reinterpret_cast<void*>(&mockBeginQueryEXT);
+  } else if (strcmp(name, "glEndQueryEXT") == 0) {
+    return reinterpret_cast<void*>(&mockEndQueryEXT);
+  } else if (strcmp(name, "glDeleteQueriesEXT") == 0) {
+    return reinterpret_cast<void*>(&mockDeleteQueriesEXT);
+  } else if (strcmp(name, "glGetQueryObjectui64vEXT") == 0) {
+    return reinterpret_cast<void*>(mockGetQueryObjectui64vEXT);
+  } else if (strcmp(name, "glGetQueryObjectuivEXT") == 0) {
+    return reinterpret_cast<void*>(mockGetQueryObjectuivEXT);
+  } else {
+    return reinterpret_cast<void*>(&doNothing);
+  }
+};
+
+MockGLES::MockGLES(ProcTableGLES::Resolver resolver)
+    : proc_table_(std::move(resolver)) {}
+
+MockGLES::~MockGLES() {
+  g_test_lock.unlock();
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/renderer/backend/gles/test/mock_gles.h b/impeller/renderer/backend/gles/test/mock_gles.h
new file mode 100644
index 0000000000000000000000000000000000000000..4fcf387604e507dc5e32b77e9abaeb049ec4906c
--- /dev/null
+++ b/impeller/renderer/backend/gles/test/mock_gles.h
@@ -0,0 +1,71 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_TEST_MOCK_GLES_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_TEST_MOCK_GLES_H_
+
+#include <memory>
+#include <optional>
+#include "fml/macros.h"
+#include "impeller/renderer/backend/gles/proc_table_gles.h"
+
+namespace impeller {
+namespace testing {
+
+extern const ProcTableGLES::Resolver kMockResolverGLES;
+
+/// @brief      Provides a mocked version of the |ProcTableGLES| class.
+///
+/// Typically, Open GLES at runtime will be provided the host's GLES bindings
+/// (as function pointers). This class maintains a set of function pointers that
+/// appear to be GLES functions, but are actually just stubs that record
+/// invocations.
+///
+/// See `README.md` for more information.
+class MockGLES final {
+ public:
+  /// @brief      Returns an initialized |MockGLES| instance.
+  ///
+  /// This method overwrites mocked global GLES function pointers to record
+  /// invocations on this instance of |MockGLES|. As such, it should only be
+  /// called once per test.
+  static std::shared_ptr<MockGLES> Init(
+      const std::optional<std::vector<const unsigned char*>>& extensions =
+          std::nullopt,
+      const char* version_string = "OpenGL ES 3.0",
+      ProcTableGLES::Resolver resolver = kMockResolverGLES);
+
+  /// @brief      Returns a configured |ProcTableGLES| instance.
+  const ProcTableGLES& GetProcTable() const { return proc_table_; }
+
+  /// @brief      Returns a vector of the names of all recorded calls.
+  ///
+  /// Calls are cleared after this method is called.
+  std::vector<std::string> GetCapturedCalls() {
+    std::vector<std::string> calls = captured_calls_;
+    captured_calls_.clear();
+    return calls;
+  }
+
+  ~MockGLES();
+
+ private:
+  friend void RecordGLCall(const char* name);
+
+  explicit MockGLES(ProcTableGLES::Resolver resolver = kMockResolverGLES);
+
+  void RecordCall(const char* name) { captured_calls_.emplace_back(name); }
+
+  ProcTableGLES proc_table_;
+  std::vector<std::string> captured_calls_;
+
+  MockGLES(const MockGLES&) = delete;
+
+  MockGLES& operator=(const MockGLES&) = delete;
+};
+
+}  // namespace testing
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_TEST_MOCK_GLES_H_
diff --git a/impeller/renderer/backend/gles/test/mock_gles_unittests.cc b/impeller/renderer/backend/gles/test/mock_gles_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..5345cdbd0054eb341a80b2b2b9a9f6d7c82eddff
--- /dev/null
+++ b/impeller/renderer/backend/gles/test/mock_gles_unittests.cc
@@ -0,0 +1,49 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/testing/testing.h"  // IWYU pragma: keep
+#include "gtest/gtest.h"
+#include "impeller/renderer/backend/gles/proc_table_gles.h"
+#include "impeller/renderer/backend/gles/test/mock_gles.h"
+
+namespace impeller {
+namespace testing {
+
+// This test just checks that the proc table is initialized correctly.
+//
+// If this test doesn't pass, no test that uses the proc table will pass.
+TEST(MockGLES, CanInitialize) {
+  auto mock_gles = MockGLES::Init();
+
+  std::string_view vendor(reinterpret_cast<const char*>(
+      mock_gles->GetProcTable().GetString(GL_VENDOR)));
+  EXPECT_EQ(vendor, "MockGLES");
+}
+
+// Tests we can call two functions and capture the calls.
+TEST(MockGLES, CapturesPushAndPopDebugGroup) {
+  auto mock_gles = MockGLES::Init();
+
+  auto& gl = mock_gles->GetProcTable();
+  gl.PushDebugGroupKHR(GL_DEBUG_SOURCE_APPLICATION_KHR, 0, -1, "test");
+  gl.PopDebugGroupKHR();
+
+  auto calls = mock_gles->GetCapturedCalls();
+  EXPECT_EQ(calls, std::vector<std::string>(
+                       {"PushDebugGroupKHR", "PopDebugGroupKHR"}));
+}
+
+// Tests that if we call a function we have not mocked, it's OK.
+TEST(MockGLES, CanCallUnmockedFunction) {
+  auto mock_gles = MockGLES::Init();
+
+  auto& gl = mock_gles->GetProcTable();
+  gl.DeleteFramebuffers(1, nullptr);
+
+  // Test should still complete.
+  // If we end up mocking DeleteFramebuffers, delete this test.
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/renderer/backend/gles/test/proc_table_gles_unittests.cc b/impeller/renderer/backend/gles/test/proc_table_gles_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..b7f188f95029990890b506af450b2259a5d4fc9e
--- /dev/null
+++ b/impeller/renderer/backend/gles/test/proc_table_gles_unittests.cc
@@ -0,0 +1,37 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <optional>
+
+#include "flutter/testing/testing.h"  // IWYU pragma: keep
+#include "gtest/gtest.h"
+#include "impeller/renderer/backend/gles/proc_table_gles.h"
+#include "impeller/renderer/backend/gles/test/mock_gles.h"
+
+namespace impeller {
+namespace testing {
+
+#define EXPECT_AVAILABLE(proc_ivar) \
+  EXPECT_TRUE(mock_gles->GetProcTable().proc_ivar.IsAvailable());
+#define EXPECT_UNAVAILABLE(proc_ivar) \
+  EXPECT_FALSE(mock_gles->GetProcTable().proc_ivar.IsAvailable());
+
+TEST(ProcTableGLES, ResolvesCorrectClearDepthProcOnES) {
+  auto mock_gles = MockGLES::Init(std::nullopt, "OpenGL ES 3.0");
+  EXPECT_TRUE(mock_gles->GetProcTable().GetDescription()->IsES());
+
+  FOR_EACH_IMPELLER_ES_ONLY_PROC(EXPECT_AVAILABLE);
+  FOR_EACH_IMPELLER_DESKTOP_ONLY_PROC(EXPECT_UNAVAILABLE);
+}
+
+TEST(ProcTableGLES, ResolvesCorrectClearDepthProcOnDesktopGL) {
+  auto mock_gles = MockGLES::Init(std::nullopt, "OpenGL 4.0");
+  EXPECT_FALSE(mock_gles->GetProcTable().GetDescription()->IsES());
+
+  FOR_EACH_IMPELLER_DESKTOP_ONLY_PROC(EXPECT_AVAILABLE);
+  FOR_EACH_IMPELLER_ES_ONLY_PROC(EXPECT_UNAVAILABLE);
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/renderer/backend/gles/test/specialization_constants_unittests.cc b/impeller/renderer/backend/gles/test/specialization_constants_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..b6975ccc99c1349bc8531fda257b795db9efd6ff
--- /dev/null
+++ b/impeller/renderer/backend/gles/test/specialization_constants_unittests.cc
@@ -0,0 +1,75 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/testing/testing.h"  // IWYU pragma: keep
+#include "fml/mapping.h"
+#include "gtest/gtest.h"
+#include "impeller/renderer/backend/gles/proc_table_gles.h"
+#include "impeller/renderer/backend/gles/test/mock_gles.h"
+
+namespace impeller {
+namespace testing {
+
+TEST(SpecConstant, CanCreateShaderWithSpecializationConstant) {
+  auto mock_gles = MockGLES::Init();
+  auto& proc_table = mock_gles->GetProcTable();
+  auto shader_source =
+      "#version 100\n"
+      "#ifndef SPIRV_CROSS_CONSTANT_ID_0\n"
+      "#define SPIRV_CROSS_CONSTANT_ID_0 1\n"
+      "#endif\n"
+      "void main() { return vec4(0.0); }";
+  auto test_shader = std::make_shared<fml::DataMapping>(shader_source);
+
+  auto result = proc_table.ComputeShaderWithDefines(*test_shader, {0});
+
+  auto expected_shader_source =
+      "#version 100\n"
+      "#define SPIRV_CROSS_CONSTANT_ID_0 0.000000\n"
+      "#ifndef SPIRV_CROSS_CONSTANT_ID_0\n"
+      "#define SPIRV_CROSS_CONSTANT_ID_0 1\n"
+      "#endif\n"
+      "void main() { return vec4(0.0); }";
+
+  if (!result.has_value()) {
+    GTEST_FAIL() << "Expected shader source";
+  }
+  ASSERT_EQ(result.value(), expected_shader_source);
+}
+
+TEST(SpecConstant, CanCreateShaderWithSpecializationConstantMultipleValues) {
+  auto mock_gles = MockGLES::Init();
+  auto& proc_table = mock_gles->GetProcTable();
+  auto shader_source =
+      "#version 100\n"
+      "#ifndef SPIRV_CROSS_CONSTANT_ID_0\n"
+      "#define SPIRV_CROSS_CONSTANT_ID_0 1\n"
+      "#endif\n"
+      "void main() { return vec4(0.0); }";
+  auto test_shader = std::make_shared<fml::DataMapping>(shader_source);
+
+  auto result =
+      proc_table.ComputeShaderWithDefines(*test_shader, {0, 1, 2, 3, 4, 5});
+
+  auto expected_shader_source =
+      "#version 100\n"
+      "#define SPIRV_CROSS_CONSTANT_ID_0 0.000000\n"
+      "#define SPIRV_CROSS_CONSTANT_ID_1 1.000000\n"
+      "#define SPIRV_CROSS_CONSTANT_ID_2 2.000000\n"
+      "#define SPIRV_CROSS_CONSTANT_ID_3 3.000000\n"
+      "#define SPIRV_CROSS_CONSTANT_ID_4 4.000000\n"
+      "#define SPIRV_CROSS_CONSTANT_ID_5 5.000000\n"
+      "#ifndef SPIRV_CROSS_CONSTANT_ID_0\n"
+      "#define SPIRV_CROSS_CONSTANT_ID_0 1\n"
+      "#endif\n"
+      "void main() { return vec4(0.0); }";
+
+  if (!result.has_value()) {
+    GTEST_FAIL() << "Expected shader source";
+  }
+  ASSERT_EQ(result.value(), expected_shader_source);
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/renderer/backend/gles/texture_gles.cc b/impeller/renderer/backend/gles/texture_gles.cc
index e8a8f9b455721240619088f6321745ecc762001e..23e867bc069dff573c57ae08db88d680219cc74a 100644
--- a/impeller/renderer/backend/gles/texture_gles.cc
+++ b/impeller/renderer/backend/gles/texture_gles.cc
@@ -7,32 +7,61 @@
 #include <optional>
 #include <utility>
 
+#include "flutter/fml/logging.h"
 #include "flutter/fml/mapping.h"
 #include "flutter/fml/trace_event.h"
 #include "impeller/base/allocation.h"
-#include "impeller/base/config.h"
 #include "impeller/base/validation.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/texture_descriptor.h"
 #include "impeller/renderer/backend/gles/formats_gles.h"
-#include "impeller/renderer/formats.h"
 
 namespace impeller {
 
+static bool IsDepthStencilFormat(PixelFormat format) {
+  switch (format) {
+    case PixelFormat::kS8UInt:
+    case PixelFormat::kD24UnormS8Uint:
+    case PixelFormat::kD32FloatS8UInt:
+      return true;
+    case PixelFormat::kUnknown:
+    case PixelFormat::kA8UNormInt:
+    case PixelFormat::kR8UNormInt:
+    case PixelFormat::kR8G8UNormInt:
+    case PixelFormat::kR8G8B8A8UNormInt:
+    case PixelFormat::kR8G8B8A8UNormIntSRGB:
+    case PixelFormat::kB8G8R8A8UNormInt:
+    case PixelFormat::kB8G8R8A8UNormIntSRGB:
+    case PixelFormat::kR32G32B32A32Float:
+    case PixelFormat::kR16G16B16A16Float:
+    case PixelFormat::kB10G10R10XR:
+    case PixelFormat::kB10G10R10XRSRGB:
+    case PixelFormat::kB10G10R10A10XR:
+      return false;
+  }
+  FML_UNREACHABLE();
+}
+
 static TextureGLES::Type GetTextureTypeFromDescriptor(
     const TextureDescriptor& desc) {
   const auto usage = static_cast<TextureUsageMask>(desc.usage);
-  const auto render_target =
-      static_cast<TextureUsageMask>(TextureUsage::kRenderTarget);
-  if (usage == render_target) {
-    return TextureGLES::Type::kRenderBuffer;
-  }
-  return TextureGLES::Type::kTexture;
+  const auto render_target = TextureUsage::kRenderTarget;
+  const auto is_msaa = desc.sample_count == SampleCount::kCount4;
+  if (usage == render_target && IsDepthStencilFormat(desc.format)) {
+    return is_msaa ? TextureGLES::Type::kRenderBufferMultisampled
+                   : TextureGLES::Type::kRenderBuffer;
+  }
+  return is_msaa ? TextureGLES::Type::kTextureMultisampled
+                 : TextureGLES::Type::kTexture;
 }
 
 HandleType ToHandleType(TextureGLES::Type type) {
   switch (type) {
     case TextureGLES::Type::kTexture:
+    case TextureGLES::Type::kTextureMultisampled:
       return HandleType::kTexture;
     case TextureGLES::Type::kRenderBuffer:
+    case TextureGLES::Type::kRenderBufferMultisampled:
       return HandleType::kRenderBuffer;
   }
   FML_UNREACHABLE();
@@ -68,6 +97,7 @@ TextureGLES::TextureGLES(std::shared_ptr<ReactorGLES> reactor,
                    << " would exceed max supported size of " << max_size << ".";
     return;
   }
+
   is_valid_ = true;
 }
 
@@ -99,6 +129,11 @@ struct TexImage2DData {
         external_format = GL_ALPHA;
         type = GL_UNSIGNED_BYTE;
         break;
+      case PixelFormat::kR8UNormInt:
+        internal_format = GL_RED;
+        external_format = GL_RED;
+        type = GL_UNSIGNED_BYTE;
+        break;
       case PixelFormat::kR8G8B8A8UNormInt:
       case PixelFormat::kB8G8R8A8UNormInt:
       case PixelFormat::kR8G8B8A8UNormIntSRGB:
@@ -107,50 +142,44 @@ struct TexImage2DData {
         external_format = GL_RGBA;
         type = GL_UNSIGNED_BYTE;
         break;
-      case PixelFormat::kUnknown:
-      case PixelFormat::kS8UInt:
-      case PixelFormat::kR8UNormInt:
-      case PixelFormat::kR8G8UNormInt:
-        return;
-    }
-    is_valid_ = true;
-  }
-
-  TexImage2DData(PixelFormat pixel_format,
-                 std::shared_ptr<const fml::Mapping> mapping) {
-    switch (pixel_format) {
-      case PixelFormat::kUnknown:
-        return;
-      case PixelFormat::kA8UNormInt: {
-        internal_format = GL_ALPHA;
-        external_format = GL_ALPHA;
-        type = GL_UNSIGNED_BYTE;
-        data = std::move(mapping);
+      case PixelFormat::kR32G32B32A32Float:
+        internal_format = GL_RGBA;
+        external_format = GL_RGBA;
+        type = GL_FLOAT;
         break;
-      }
-      case PixelFormat::kR8G8B8A8UNormInt: {
+      case PixelFormat::kR16G16B16A16Float:
         internal_format = GL_RGBA;
         external_format = GL_RGBA;
-        type = GL_UNSIGNED_BYTE;
-        data = std::move(mapping);
+        type = GL_HALF_FLOAT;
         break;
-      }
-      case PixelFormat::kR8G8B8A8UNormIntSRGB:
-        return;
-      case PixelFormat::kB8G8R8A8UNormInt:
-        return;
-      case PixelFormat::kB8G8R8A8UNormIntSRGB:
-        return;
       case PixelFormat::kS8UInt:
-        return;
-      case PixelFormat::kR8UNormInt:
-        return;
+        // Pure stencil textures are only available in OpenGL 4.4+, which is
+        // ~0% of mobile devices. Instead, we use a depth-stencil texture and
+        // only use the stencil component.
+        //
+        // https://registry.khronos.org/OpenGL-Refpages/gl4/html/glTexImage2D.xhtml
+      case PixelFormat::kD24UnormS8Uint:
+        internal_format = GL_DEPTH_STENCIL;
+        external_format = GL_DEPTH_STENCIL;
+        type = GL_UNSIGNED_INT_24_8;
+        break;
+      case PixelFormat::kUnknown:
+      case PixelFormat::kD32FloatS8UInt:
       case PixelFormat::kR8G8UNormInt:
+      case PixelFormat::kB10G10R10XRSRGB:
+      case PixelFormat::kB10G10R10XR:
+      case PixelFormat::kB10G10R10A10XR:
         return;
     }
     is_valid_ = true;
   }
 
+  TexImage2DData(PixelFormat pixel_format,
+                 std::shared_ptr<const fml::Mapping> mapping)
+      : TexImage2DData(pixel_format) {
+    data = std::move(mapping);
+  }
+
   bool IsValid() const { return is_valid_; }
 
  private:
@@ -219,6 +248,10 @@ bool TextureGLES::OnSetContents(std::shared_ptr<const fml::Mapping> mapping,
       texture_type = GL_TEXTURE_CUBE_MAP;
       texture_target = GL_TEXTURE_CUBE_MAP_POSITIVE_X + slice;
       break;
+    case TextureType::kTextureExternalOES:
+      texture_type = GL_TEXTURE_EXTERNAL_OES;
+      texture_target = GL_TEXTURE_EXTERNAL_OES;
+      break;
   }
 
   auto data = std::make_shared<TexImage2DData>(tex_descriptor.format,
@@ -277,14 +310,25 @@ static std::optional<GLenum> ToRenderBufferFormat(PixelFormat format) {
     case PixelFormat::kB8G8R8A8UNormInt:
     case PixelFormat::kR8G8B8A8UNormInt:
       return GL_RGBA4;
+    case PixelFormat::kR32G32B32A32Float:
+      return GL_RGBA32F;
+    case PixelFormat::kR16G16B16A16Float:
+      return GL_RGBA16F;
     case PixelFormat::kS8UInt:
       return GL_STENCIL_INDEX8;
+    case PixelFormat::kD24UnormS8Uint:
+      return GL_DEPTH24_STENCIL8;
+    case PixelFormat::kD32FloatS8UInt:
+      return GL_DEPTH32F_STENCIL8;
     case PixelFormat::kUnknown:
     case PixelFormat::kA8UNormInt:
     case PixelFormat::kR8UNormInt:
     case PixelFormat::kR8G8UNormInt:
     case PixelFormat::kR8G8B8A8UNormIntSRGB:
     case PixelFormat::kB8G8R8A8UNormIntSRGB:
+    case PixelFormat::kB10G10R10XRSRGB:
+    case PixelFormat::kB10G10R10XR:
+    case PixelFormat::kB10G10R10A10XR:
       return std::nullopt;
   }
   FML_UNREACHABLE();
@@ -317,7 +361,8 @@ void TextureGLES::InitializeContentsIfNecessary() const {
   }
 
   switch (type_) {
-    case Type::kTexture: {
+    case Type::kTexture:
+    case Type::kTextureMultisampled: {
       TexImage2DData tex_data(GetTextureDescriptor().format);
       if (!tex_data.IsValid()) {
         VALIDATION_LOG << "Invalid format for texture image.";
@@ -337,9 +382,9 @@ void TextureGLES::InitializeContentsIfNecessary() const {
                       nullptr                    // data
         );
       }
-
     } break;
     case Type::kRenderBuffer:
+    case Type::kRenderBufferMultisampled: {
       auto render_buffer_format =
           ToRenderBufferFormat(GetTextureDescriptor().format);
       if (!render_buffer_format.has_value()) {
@@ -349,13 +394,24 @@ void TextureGLES::InitializeContentsIfNecessary() const {
       gl.BindRenderbuffer(GL_RENDERBUFFER, handle.value());
       {
         TRACE_EVENT0("impeller", "RenderBufferStorageInitialization");
-        gl.RenderbufferStorage(GL_RENDERBUFFER,               // target
-                               render_buffer_format.value(),  // internal format
-                               size.width,                    // width
-                               size.height                    // height
-        );
+        if (type_ == Type::kRenderBufferMultisampled) {
+          gl.RenderbufferStorageMultisampleEXT(
+              GL_RENDERBUFFER,               // target
+              4,                             // samples
+              render_buffer_format.value(),  // internal format
+              size.width,                    // width
+              size.height                    // height
+          );
+        } else {
+          gl.RenderbufferStorage(
+              GL_RENDERBUFFER,               // target
+              render_buffer_format.value(),  // internal format
+              size.width,                    // width
+              size.height                    // height
+          );
+        }
       }
-      break;
+    } break;
   }
 }
 
@@ -373,7 +429,8 @@ bool TextureGLES::Bind() const {
   }
   const auto& gl = reactor_->GetProcTable();
   switch (type_) {
-    case Type::kTexture: {
+    case Type::kTexture:
+    case Type::kTextureMultisampled: {
       const auto target = ToTextureTarget(GetTextureDescriptor().type);
       if (!target.has_value()) {
         VALIDATION_LOG << "Could not bind texture of this type.";
@@ -382,6 +439,7 @@ bool TextureGLES::Bind() const {
       gl.BindTexture(target.value(), handle.value());
     } break;
     case Type::kRenderBuffer:
+    case Type::kRenderBufferMultisampled:
       gl.BindRenderbuffer(GL_RENDERBUFFER, handle.value());
       break;
   }
@@ -389,7 +447,7 @@ bool TextureGLES::Bind() const {
   return true;
 }
 
-bool TextureGLES::GenerateMipmaps() const {
+bool TextureGLES::GenerateMipmap() {
   if (!IsValid()) {
     return false;
   }
@@ -404,6 +462,8 @@ bool TextureGLES::GenerateMipmaps() const {
       return false;
     case TextureType::kTextureCube:
       break;
+    case TextureType::kTextureExternalOES:
+      break;
   }
 
   if (!Bind()) {
@@ -417,6 +477,7 @@ bool TextureGLES::GenerateMipmaps() const {
 
   const auto& gl = reactor_->GetProcTable();
   gl.GenerateMipmap(ToTextureType(type));
+  mipmap_generated_ = true;
   return true;
 }
 
@@ -424,20 +485,20 @@ TextureGLES::Type TextureGLES::GetType() const {
   return type_;
 }
 
-static GLenum ToAttachmentPoint(TextureGLES::AttachmentPoint point) {
+static GLenum ToAttachmentType(TextureGLES::AttachmentType point) {
   switch (point) {
-    case TextureGLES::AttachmentPoint::kColor0:
+    case TextureGLES::AttachmentType::kColor0:
       return GL_COLOR_ATTACHMENT0;
-    case TextureGLES::AttachmentPoint::kDepth:
+    case TextureGLES::AttachmentType::kDepth:
       return GL_DEPTH_ATTACHMENT;
-    case TextureGLES::AttachmentPoint::kStencil:
+    case TextureGLES::AttachmentType::kStencil:
       return GL_STENCIL_ATTACHMENT;
   }
 }
 
-bool TextureGLES::SetAsFramebufferAttachment(GLenum target,
-                                             GLuint fbo,
-                                             AttachmentPoint point) const {
+bool TextureGLES::SetAsFramebufferAttachment(
+    GLenum target,
+    AttachmentType attachment_type) const {
   if (!IsValid()) {
     return false;
   }
@@ -447,32 +508,46 @@ bool TextureGLES::SetAsFramebufferAttachment(GLenum target,
     return false;
   }
   const auto& gl = reactor_->GetProcTable();
+
   switch (type_) {
     case Type::kTexture:
-      gl.FramebufferTexture2D(target,                    // target
-                              ToAttachmentPoint(point),  // attachment
-                              GL_TEXTURE_2D,             // textarget
-                              handle.value(),            // texture
-                              0                          // level
+      gl.FramebufferTexture2D(target,                             // target
+                              ToAttachmentType(attachment_type),  // attachment
+                              GL_TEXTURE_2D,                      // textarget
+                              handle.value(),                     // texture
+                              0                                   // level
+      );
+      break;
+    case Type::kTextureMultisampled:
+      gl.FramebufferTexture2DMultisampleEXT(
+          target,                             // target
+          ToAttachmentType(attachment_type),  // attachment
+          GL_TEXTURE_2D,                      // textarget
+          handle.value(),                     // texture
+          0,                                  // level
+          4                                   // samples
       );
       break;
     case Type::kRenderBuffer:
-      gl.FramebufferRenderbuffer(target,                    // target
-                                 ToAttachmentPoint(point),  // attachment
-                                 GL_RENDERBUFFER,  // render-buffer target
-                                 handle.value()    // render-buffer
+    case Type::kRenderBufferMultisampled:
+      gl.FramebufferRenderbuffer(
+          target,                             // target
+          ToAttachmentType(attachment_type),  // attachment
+          GL_RENDERBUFFER,                    // render-buffer target
+          handle.value()                      // render-buffer
       );
       break;
   }
+
   return true;
 }
 
 // |Texture|
 Scalar TextureGLES::GetYCoordScale() const {
-  switch (GetIntent()) {
-    case TextureIntent::kUploadFromHost:
+  switch (GetCoordinateSystem()) {
+    case TextureCoordinateSystem::kUploadFromHost:
       return 1.0;
-    case TextureIntent::kRenderToTexture:
+    case TextureCoordinateSystem::kRenderToTexture:
       return -1.0;
   }
   FML_UNREACHABLE();
diff --git a/impeller/renderer/backend/gles/texture_gles.h b/impeller/renderer/backend/gles/texture_gles.h
index 03c8b5cbcfdd795cb023fdc02a6ff7ca924492ca..adfc2e49d4b901804cb33060f5f91aac01043221 100644
--- a/impeller/renderer/backend/gles/texture_gles.h
+++ b/impeller/renderer/backend/gles/texture_gles.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_TEXTURE_GLES_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_TEXTURE_GLES_H_
 
-#include "flutter/fml/macros.h"
 #include "impeller/base/backend_cast.h"
+#include "impeller/core/texture.h"
 #include "impeller/renderer/backend/gles/handle_gles.h"
 #include "impeller/renderer/backend/gles/reactor_gles.h"
-#include "impeller/renderer/texture.h"
 
 namespace impeller {
 
@@ -17,7 +17,9 @@ class TextureGLES final : public Texture,
  public:
   enum class Type {
     kTexture,
+    kTextureMultisampled,
     kRenderBuffer,
+    kRenderBufferMultisampled,
   };
 
   enum class IsWrapped {
@@ -37,16 +39,16 @@ class TextureGLES final : public Texture,
 
   [[nodiscard]] bool Bind() const;
 
-  [[nodiscard]] bool GenerateMipmaps() const;
+  [[nodiscard]] bool GenerateMipmap();
 
-  enum class AttachmentPoint {
+  enum class AttachmentType {
     kColor0,
     kDepth,
     kStencil,
   };
-  [[nodiscard]] bool SetAsFramebufferAttachment(GLenum target,
-                                                GLuint fbo,
-                                                AttachmentPoint point) const;
+  [[nodiscard]] bool SetAsFramebufferAttachment(
+      GLenum target,
+      AttachmentType attachment_type) const;
 
   Type GetType() const;
 
@@ -89,7 +91,11 @@ class TextureGLES final : public Texture,
 
   void InitializeContentsIfNecessary() const;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(TextureGLES);
+  TextureGLES(const TextureGLES&) = delete;
+
+  TextureGLES& operator=(const TextureGLES&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_TEXTURE_GLES_H_
diff --git a/impeller/renderer/backend/metal/BUILD.gn b/impeller/renderer/backend/metal/BUILD.gn
index 417c2e761c88f4b5c1975034d8103dbfd937d166..2c9e0f2e718ebaa4ca368dd1206f1597b9a7eda1 100644
--- a/impeller/renderer/backend/metal/BUILD.gn
+++ b/impeller/renderer/backend/metal/BUILD.gn
@@ -14,6 +14,8 @@ impeller_component("metal") {
     "blit_pass_mtl.mm",
     "command_buffer_mtl.h",
     "command_buffer_mtl.mm",
+    "compute_pass_bindings_cache_mtl.h",
+    "compute_pass_bindings_cache_mtl.mm",
     "compute_pass_mtl.h",
     "compute_pass_mtl.mm",
     "compute_pipeline_mtl.h",
@@ -26,6 +28,10 @@ impeller_component("metal") {
     "formats_mtl.mm",
     "gpu_tracer_mtl.h",
     "gpu_tracer_mtl.mm",
+    "lazy_drawable_holder.h",
+    "lazy_drawable_holder.mm",
+    "pass_bindings_cache_mtl.h",
+    "pass_bindings_cache_mtl.mm",
     "pipeline_library_mtl.h",
     "pipeline_library_mtl.mm",
     "pipeline_mtl.h",
@@ -44,6 +50,8 @@ impeller_component("metal") {
     "surface_mtl.mm",
     "texture_mtl.h",
     "texture_mtl.mm",
+    "texture_wrapper_mtl.h",
+    "texture_wrapper_mtl.mm",
     "vertex_descriptor_mtl.h",
     "vertex_descriptor_mtl.mm",
   ]
@@ -55,3 +63,19 @@ impeller_component("metal") {
 
   frameworks = [ "Metal.framework" ]
 }
+
+impeller_component("metal_unittests") {
+  testonly = true
+
+  sources = [ "texture_mtl_unittests.mm" ]
+
+  deps = [
+    ":metal",
+    "//flutter/testing:testing_lib",
+  ]
+
+  frameworks = [
+    "AppKit.framework",
+    "QuartzCore.framework",
+  ]
+}
diff --git a/impeller/renderer/backend/metal/allocator_mtl.h b/impeller/renderer/backend/metal/allocator_mtl.h
index c1cca04c81227577c1f372bd5cb275b0ea70bd4d..2d097e16b8b76bc499523f29e7b93e9cead2f74a 100644
--- a/impeller/renderer/backend/metal/allocator_mtl.h
+++ b/impeller/renderer/backend/metal/allocator_mtl.h
@@ -2,12 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_ALLOCATOR_MTL_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_ALLOCATOR_MTL_H_
 
 #include <Metal/Metal.h>
 
 #include "flutter/fml/macros.h"
-#include "impeller/renderer/allocator.h"
+#include "impeller/core/allocator.h"
 
 namespace impeller {
 
@@ -47,7 +48,11 @@ class AllocatorMTL final : public Allocator {
   // |Allocator|
   ISize GetMaxTextureSizeSupported() const override;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(AllocatorMTL);
+  AllocatorMTL(const AllocatorMTL&) = delete;
+
+  AllocatorMTL& operator=(const AllocatorMTL&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_ALLOCATOR_MTL_H_
diff --git a/impeller/renderer/backend/metal/allocator_mtl.mm b/impeller/renderer/backend/metal/allocator_mtl.mm
index 9722a80437c553f95ff626bebd8af60971d497bc..dfae2502ea9fee4a515f8d6308413c83d3a7cdad 100644
--- a/impeller/renderer/backend/metal/allocator_mtl.mm
+++ b/impeller/renderer/backend/metal/allocator_mtl.mm
@@ -10,11 +10,10 @@
 #include "impeller/renderer/backend/metal/device_buffer_mtl.h"
 #include "impeller/renderer/backend/metal/formats_mtl.h"
 #include "impeller/renderer/backend/metal/texture_mtl.h"
-#include "impeller/renderer/buffer.h"
 
 namespace impeller {
 
-static bool DeviceSupportsMemorylessTargets(id<MTLDevice> device) {
+static bool DeviceSupportsDeviceTransientTargets(id<MTLDevice> device) {
   // Refer to the "Memoryless render targets" feature in the table below:
   // https://developer.apple.com/metal/Metal-Feature-Set-Tables.pdf
   if (@available(ios 13.0, tvos 13.0, macos 10.15, *)) {
@@ -78,13 +77,24 @@ static ISize DeviceMaxTextureSizeSupported(id<MTLDevice> device) {
   }
 }
 
+static bool SupportsLossyTextureCompression(id<MTLDevice> device) {
+#ifdef FML_OS_IOS_SIMULATOR
+  return false;
+#else
+  if (@available(macOS 10.15, iOS 13, tvOS 13, *)) {
+    return [device supportsFamily:MTLGPUFamilyApple8];
+  }
+  return false;
+#endif
+}
+
 AllocatorMTL::AllocatorMTL(id<MTLDevice> device, std::string label)
     : device_(device), allocator_label_(std::move(label)) {
   if (!device_) {
     return;
   }
 
-  supports_memoryless_targets_ = DeviceSupportsMemorylessTargets(device_);
+  supports_memoryless_targets_ = DeviceSupportsDeviceTransientTargets(device_);
   supports_uma_ = DeviceHasUnifiedMemoryArchitecture(device_);
   max_texture_supported_ = DeviceMaxTextureSizeSupported(device_);
 
@@ -194,11 +204,19 @@ std::shared_ptr<Texture> AllocatorMTL::OnCreateTexture(
 
   mtl_texture_desc.storageMode = ToMTLStorageMode(
       desc.storage_mode, supports_memoryless_targets_, supports_uma_);
+
+  if (@available(macOS 12.5, ios 15.0, *)) {
+    if (desc.compression_type == CompressionType::kLossy &&
+        SupportsLossyTextureCompression(device_)) {
+      mtl_texture_desc.compressionType = MTLTextureCompressionTypeLossy;
+    }
+  }
+
   auto texture = [device_ newTextureWithDescriptor:mtl_texture_desc];
   if (!texture) {
     return nullptr;
   }
-  return std::make_shared<TextureMTL>(desc, texture);
+  return TextureMTL::Create(desc, texture);
 }
 
 uint16_t AllocatorMTL::MinimumBytesPerRow(PixelFormat format) const {
diff --git a/impeller/renderer/backend/metal/blit_command_mtl.h b/impeller/renderer/backend/metal/blit_command_mtl.h
index ffdd450f16c9ba38fd8701e496a4b20fd97391f1..90dad1956090c694b87359c6273ef35c218ce173 100644
--- a/impeller/renderer/backend/metal/blit_command_mtl.h
+++ b/impeller/renderer/backend/metal/blit_command_mtl.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_BLIT_COMMAND_MTL_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_BLIT_COMMAND_MTL_H_
 
 #include <Metal/Metal.h>
 
@@ -50,4 +51,16 @@ struct BlitGenerateMipmapCommandMTL : public BlitGenerateMipmapCommand,
   [[nodiscard]] bool Encode(id<MTLBlitCommandEncoder> encoder) const override;
 };
 
+struct BlitCopyBufferToTextureCommandMTL
+    : public BlitCopyBufferToTextureCommand,
+      public BlitEncodeMTL {
+  ~BlitCopyBufferToTextureCommandMTL() override;
+
+  std::string GetLabel() const override;
+
+  [[nodiscard]] bool Encode(id<MTLBlitCommandEncoder> encoder) const override;
+};
+
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_BLIT_COMMAND_MTL_H_
diff --git a/impeller/renderer/backend/metal/blit_command_mtl.mm b/impeller/renderer/backend/metal/blit_command_mtl.mm
index 7f589b4f541753d0aa8b6793c50f0357efef1aba..17c8b51ba7269fd21f4ff8e4974c3978f35947d0 100644
--- a/impeller/renderer/backend/metal/blit_command_mtl.mm
+++ b/impeller/renderer/backend/metal/blit_command_mtl.mm
@@ -31,9 +31,9 @@ bool BlitCopyTextureToTextureCommandMTL::Encode(
   }
 
   auto source_origin_mtl =
-      MTLOriginMake(source_region.origin.x, source_region.origin.y, 0);
+      MTLOriginMake(source_region.GetX(), source_region.GetY(), 0);
   auto source_size_mtl =
-      MTLSizeMake(source_region.size.width, source_region.size.height, 1);
+      MTLSizeMake(source_region.GetWidth(), source_region.GetHeight(), 1);
   auto destination_origin_mtl =
       MTLOriginMake(destination_origin.x, destination_origin.y, 0);
 
@@ -70,9 +70,9 @@ bool BlitCopyTextureToBufferCommandMTL::Encode(
   }
 
   auto source_origin_mtl =
-      MTLOriginMake(source_region.origin.x, source_region.origin.y, 0);
+      MTLOriginMake(source_region.GetX(), source_region.GetY(), 0);
   auto source_size_mtl =
-      MTLSizeMake(source_region.size.width, source_region.size.height, 1);
+      MTLSizeMake(source_region.GetWidth(), source_region.GetHeight(), 1);
 
   auto destination_bytes_per_pixel =
       BytesPerPixelForPixelFormat(source->GetTextureDescriptor().format);
@@ -94,22 +94,60 @@ bool BlitCopyTextureToBufferCommandMTL::Encode(
   return true;
 };
 
-BlitGenerateMipmapCommandMTL::~BlitGenerateMipmapCommandMTL() = default;
+BlitCopyBufferToTextureCommandMTL::~BlitCopyBufferToTextureCommandMTL() =
+    default;
 
-std::string BlitGenerateMipmapCommandMTL::GetLabel() const {
+std::string BlitCopyBufferToTextureCommandMTL::GetLabel() const {
   return label;
 }
 
-bool BlitGenerateMipmapCommandMTL::Encode(
+bool BlitCopyBufferToTextureCommandMTL::Encode(
     id<MTLBlitCommandEncoder> encoder) const {
-  auto texture_mtl = TextureMTL::Cast(*texture).GetMTLTexture();
-  if (!texture_mtl) {
+  auto source_mtl = DeviceBufferMTL::Cast(*source.buffer).GetMTLBuffer();
+  if (!source_mtl) {
     return false;
   }
 
-  [encoder generateMipmapsForTexture:texture_mtl];
+  auto destination_mtl = TextureMTL::Cast(*destination).GetMTLTexture();
+  if (!destination_mtl) {
+    return false;
+  }
+
+  auto destination_origin_mtl =
+      MTLOriginMake(destination_origin.x, destination_origin.y, 0);
+
+  auto image_size = destination->GetTextureDescriptor().size;
+  auto source_size_mtl = MTLSizeMake(image_size.width, image_size.height, 1);
+
+  auto destination_bytes_per_pixel =
+      BytesPerPixelForPixelFormat(destination->GetTextureDescriptor().format);
+  auto destination_bytes_per_row =
+      source_size_mtl.width * destination_bytes_per_pixel;
+  auto destination_bytes_per_image =
+      source_size_mtl.height * destination_bytes_per_row;
+
+  [encoder copyFromBuffer:source_mtl
+             sourceOffset:source.range.offset
+        sourceBytesPerRow:destination_bytes_per_row
+      sourceBytesPerImage:destination_bytes_per_image
+               sourceSize:source_size_mtl
+                toTexture:destination_mtl
+         destinationSlice:0
+         destinationLevel:0
+        destinationOrigin:destination_origin_mtl];
 
   return true;
 };
 
+BlitGenerateMipmapCommandMTL::~BlitGenerateMipmapCommandMTL() = default;
+
+std::string BlitGenerateMipmapCommandMTL::GetLabel() const {
+  return label;
+}
+
+bool BlitGenerateMipmapCommandMTL::Encode(
+    id<MTLBlitCommandEncoder> encoder) const {
+  return TextureMTL::Cast(*texture).GenerateMipmap(encoder);
+};
+
 }  // namespace impeller
diff --git a/impeller/renderer/backend/metal/blit_pass_mtl.h b/impeller/renderer/backend/metal/blit_pass_mtl.h
index 108d320d98bf09b5a2042de6a416361741079bc8..68d0c2d4096485621e8795a6bffbecbceaad2ea6 100644
--- a/impeller/renderer/backend/metal/blit_pass_mtl.h
+++ b/impeller/renderer/backend/metal/blit_pass_mtl.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_BLIT_PASS_MTL_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_BLIT_PASS_MTL_H_
 
 #include <Metal/Metal.h>
 
@@ -52,12 +53,21 @@ class BlitPassMTL final : public BlitPass {
                                     IRect source_region,
                                     size_t destination_offset,
                                     std::string label) override;
+  // |BlitPass|
+  bool OnCopyBufferToTextureCommand(BufferView source,
+                                    std::shared_ptr<Texture> destination,
+                                    IPoint destination_origin,
+                                    std::string label) override;
 
   // |BlitPass|
   bool OnGenerateMipmapCommand(std::shared_ptr<Texture> texture,
                                std::string label) override;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(BlitPassMTL);
+  BlitPassMTL(const BlitPassMTL&) = delete;
+
+  BlitPassMTL& operator=(const BlitPassMTL&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_BLIT_PASS_MTL_H_
diff --git a/impeller/renderer/backend/metal/blit_pass_mtl.mm b/impeller/renderer/backend/metal/blit_pass_mtl.mm
index 8de720677c3c607f825a871aba2ff65ed43d4d55..b884d01c0c1515df60280f9851f50750fddae29e 100644
--- a/impeller/renderer/backend/metal/blit_pass_mtl.mm
+++ b/impeller/renderer/backend/metal/blit_pass_mtl.mm
@@ -11,6 +11,9 @@
 #include "flutter/fml/logging.h"
 #include "flutter/fml/trace_event.h"
 #include "impeller/base/backend_cast.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/host_buffer.h"
+#include "impeller/core/shader_types.h"
 #include "impeller/renderer/backend/metal/blit_command_mtl.h"
 #include "impeller/renderer/backend/metal/device_buffer_mtl.h"
 #include "impeller/renderer/backend/metal/formats_mtl.h"
@@ -18,9 +21,6 @@
 #include "impeller/renderer/backend/metal/sampler_mtl.h"
 #include "impeller/renderer/backend/metal/texture_mtl.h"
 #include "impeller/renderer/blit_command.h"
-#include "impeller/renderer/formats.h"
-#include "impeller/renderer/host_buffer.h"
-#include "impeller/renderer/shader_types.h"
 
 namespace impeller {
 
@@ -80,7 +80,7 @@ bool BlitPassMTL::EncodeCommands(id<MTLBlitCommandEncoder> encoder) const {
       auto_pop_debug_marker.Release();
     }
 
-    if (command->Encode(encoder)) {
+    if (!command->Encode(encoder)) {
       return false;
     }
   }
@@ -123,6 +123,21 @@ bool BlitPassMTL::OnCopyTextureToBufferCommand(
   return true;
 }
 
+bool BlitPassMTL::OnCopyBufferToTextureCommand(
+    BufferView source,
+    std::shared_ptr<Texture> destination,
+    IPoint destination_origin,
+    std::string label) {
+  auto command = std::make_unique<BlitCopyBufferToTextureCommandMTL>();
+  command->label = label;
+  command->source = std::move(source);
+  command->destination = std::move(destination);
+  command->destination_origin = destination_origin;
+
+  commands_.emplace_back(std::move(command));
+  return true;
+}
+
 // |BlitPass|
 bool BlitPassMTL::OnGenerateMipmapCommand(std::shared_ptr<Texture> texture,
                                           std::string label) {
diff --git a/impeller/renderer/backend/metal/command_buffer_mtl.h b/impeller/renderer/backend/metal/command_buffer_mtl.h
index 30dd3f6f5d6a4bf0d48ec704731b9d20fd8f05ce..f9db1c1b4af7f73908073fa2efe41a358d592bf5 100644
--- a/impeller/renderer/backend/metal/command_buffer_mtl.h
+++ b/impeller/renderer/backend/metal/command_buffer_mtl.h
@@ -2,11 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_COMMAND_BUFFER_MTL_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_COMMAND_BUFFER_MTL_H_
 
 #include <Metal/Metal.h>
 
 #include "flutter/fml/macros.h"
+#include "impeller/core/allocator.h"
 #include "impeller/renderer/command_buffer.h"
 
 namespace impeller {
@@ -33,16 +35,23 @@ class CommandBufferMTL final : public CommandBuffer {
   // |CommandBuffer|
   bool OnSubmitCommands(CompletionCallback callback) override;
 
+  // |CommandBuffer|
+  void OnWaitUntilScheduled() override;
+
   // |CommandBuffer|
   std::shared_ptr<RenderPass> OnCreateRenderPass(RenderTarget target) override;
 
   // |CommandBuffer|
-  std::shared_ptr<BlitPass> OnCreateBlitPass() const override;
+  std::shared_ptr<BlitPass> OnCreateBlitPass() override;
 
   // |CommandBuffer|
-  std::shared_ptr<ComputePass> OnCreateComputePass() const override;
+  std::shared_ptr<ComputePass> OnCreateComputePass() override;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(CommandBufferMTL);
+  CommandBufferMTL(const CommandBufferMTL&) = delete;
+
+  CommandBufferMTL& operator=(const CommandBufferMTL&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_COMMAND_BUFFER_MTL_H_
diff --git a/impeller/renderer/backend/metal/command_buffer_mtl.mm b/impeller/renderer/backend/metal/command_buffer_mtl.mm
index 2e8a5f7d8a5af30ceea1323728caee730aa54a53..5909426cbb5449eb6f8eedcdc15c60156f9ba9d2 100644
--- a/impeller/renderer/backend/metal/command_buffer_mtl.mm
+++ b/impeller/renderer/backend/metal/command_buffer_mtl.mm
@@ -4,8 +4,12 @@
 
 #include "impeller/renderer/backend/metal/command_buffer_mtl.h"
 
+#include "flutter/fml/make_copyable.h"
+#include "flutter/fml/synchronization/semaphore.h"
+
 #include "impeller/renderer/backend/metal/blit_pass_mtl.h"
 #include "impeller/renderer/backend/metal/compute_pass_mtl.h"
+#include "impeller/renderer/backend/metal/context_mtl.h"
 #include "impeller/renderer/backend/metal/render_pass_mtl.h"
 
 namespace impeller {
@@ -111,6 +115,7 @@ static bool LogMTLCommandBufferErrorIfPresent(id<MTLCommandBuffer> buffer) {
 }
 
 static id<MTLCommandBuffer> CreateCommandBuffer(id<MTLCommandQueue> queue) {
+#ifndef FLUTTER_RELEASE
   if (@available(iOS 14.0, macOS 11.0, *)) {
     auto desc = [[MTLCommandBufferDescriptor alloc] init];
     // Degrades CPU performance slightly but is well worth the cost for typical
@@ -118,6 +123,7 @@ static id<MTLCommandBuffer> CreateCommandBuffer(id<MTLCommandQueue> queue) {
     desc.errorOptions = MTLCommandBufferErrorOptionEncoderExecutionStatus;
     return [queue commandBufferWithDescriptor:desc];
   }
+#endif  // FLUTTER_RELEASE
   return [queue commandBuffer];
 }
 
@@ -152,6 +158,13 @@ static CommandBuffer::Status ToCommitResult(MTLCommandBufferStatus status) {
 }
 
 bool CommandBufferMTL::OnSubmitCommands(CompletionCallback callback) {
+  auto context = context_.lock();
+  if (!context) {
+    return false;
+  }
+#ifdef IMPELLER_DEBUG
+  ContextMTL::Cast(*context).GetGPUTracer()->RecordCmdBuffer(buffer_);
+#endif  // IMPELLER_DEBUG
   if (callback) {
     [buffer_
         addCompletedHandler:^(id<MTLCommandBuffer> buffer) {
@@ -164,19 +177,25 @@ bool CommandBufferMTL::OnSubmitCommands(CompletionCallback callback) {
   }
 
   [buffer_ commit];
-  [buffer_ waitUntilScheduled];
+
   buffer_ = nil;
   return true;
 }
 
+void CommandBufferMTL::OnWaitUntilScheduled() {}
+
 std::shared_ptr<RenderPass> CommandBufferMTL::OnCreateRenderPass(
     RenderTarget target) {
   if (!buffer_) {
     return nullptr;
   }
 
+  auto context = context_.lock();
+  if (!context) {
+    return nullptr;
+  }
   auto pass = std::shared_ptr<RenderPassMTL>(
-      new RenderPassMTL(context_, target, buffer_));
+      new RenderPassMTL(context, target, buffer_));
   if (!pass->IsValid()) {
     return nullptr;
   }
@@ -184,7 +203,7 @@ std::shared_ptr<RenderPass> CommandBufferMTL::OnCreateRenderPass(
   return pass;
 }
 
-std::shared_ptr<BlitPass> CommandBufferMTL::OnCreateBlitPass() const {
+std::shared_ptr<BlitPass> CommandBufferMTL::OnCreateBlitPass() {
   if (!buffer_) {
     return nullptr;
   }
@@ -197,13 +216,17 @@ std::shared_ptr<BlitPass> CommandBufferMTL::OnCreateBlitPass() const {
   return pass;
 }
 
-std::shared_ptr<ComputePass> CommandBufferMTL::OnCreateComputePass() const {
+std::shared_ptr<ComputePass> CommandBufferMTL::OnCreateComputePass() {
   if (!buffer_) {
     return nullptr;
   }
+  auto context = context_.lock();
+  if (!context) {
+    return nullptr;
+  }
 
   auto pass =
-      std::shared_ptr<ComputePassMTL>(new ComputePassMTL(context_, buffer_));
+      std::shared_ptr<ComputePassMTL>(new ComputePassMTL(context, buffer_));
   if (!pass->IsValid()) {
     return nullptr;
   }
diff --git a/impeller/renderer/backend/metal/compute_pass_bindings_cache_mtl.h b/impeller/renderer/backend/metal/compute_pass_bindings_cache_mtl.h
new file mode 100644
index 0000000000000000000000000000000000000000..eff7557f88647d33ee19bc7c10b491c52fada03d
--- /dev/null
+++ b/impeller/renderer/backend/metal/compute_pass_bindings_cache_mtl.h
@@ -0,0 +1,62 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_COMPUTE_PASS_BINDINGS_CACHE_MTL_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_COMPUTE_PASS_BINDINGS_CACHE_MTL_H_
+
+#include <Metal/Metal.h>
+
+#include "flutter/fml/macros.h"
+#include "impeller/renderer/compute_pass.h"
+#include "impeller/renderer/pipeline_descriptor.h"
+
+namespace impeller {
+
+//-----------------------------------------------------------------------------
+/// @brief      Ensures that bindings on the pass are not redundantly set or
+///             updated. Avoids making the driver do additional checks and makes
+///             the frame insights during profiling and instrumentation not
+///             complain about the same.
+///
+///             There should be no change to rendering if this caching was
+///             absent.
+///
+struct ComputePassBindingsCacheMTL {
+  explicit ComputePassBindingsCacheMTL() {}
+
+  ComputePassBindingsCacheMTL(const ComputePassBindingsCacheMTL&) = delete;
+
+  ComputePassBindingsCacheMTL(ComputePassBindingsCacheMTL&&) = delete;
+
+  void SetComputePipelineState(id<MTLComputePipelineState> pipeline);
+
+  id<MTLComputePipelineState> GetPipeline() const;
+
+  void SetEncoder(id<MTLComputeCommandEncoder> encoder);
+
+  void SetBuffer(uint64_t index, uint64_t offset, id<MTLBuffer> buffer);
+
+  void SetTexture(uint64_t index, id<MTLTexture> texture);
+
+  void SetSampler(uint64_t index, id<MTLSamplerState> sampler);
+
+ private:
+  struct BufferOffsetPair {
+    id<MTLBuffer> buffer = nullptr;
+    size_t offset = 0u;
+  };
+  using BufferMap = std::map<uint64_t, BufferOffsetPair>;
+  using TextureMap = std::map<uint64_t, id<MTLTexture>>;
+  using SamplerMap = std::map<uint64_t, id<MTLSamplerState>>;
+
+  id<MTLComputeCommandEncoder> encoder_;
+  id<MTLComputePipelineState> pipeline_ = nullptr;
+  BufferMap buffers_;
+  TextureMap textures_;
+  SamplerMap samplers_;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_COMPUTE_PASS_BINDINGS_CACHE_MTL_H_
diff --git a/impeller/renderer/backend/metal/compute_pass_bindings_cache_mtl.mm b/impeller/renderer/backend/metal/compute_pass_bindings_cache_mtl.mm
new file mode 100644
index 0000000000000000000000000000000000000000..50e91e7ce95a114095ec3be934262d4e4b25f77e
--- /dev/null
+++ b/impeller/renderer/backend/metal/compute_pass_bindings_cache_mtl.mm
@@ -0,0 +1,73 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/backend/metal/compute_pass_bindings_cache_mtl.h"
+
+namespace impeller {
+
+void ComputePassBindingsCacheMTL::SetComputePipelineState(
+    id<MTLComputePipelineState> pipeline) {
+  if (pipeline == pipeline_) {
+    return;
+  }
+  pipeline_ = pipeline;
+  [encoder_ setComputePipelineState:pipeline_];
+}
+
+id<MTLComputePipelineState> ComputePassBindingsCacheMTL::GetPipeline() const {
+  return pipeline_;
+}
+
+void ComputePassBindingsCacheMTL::SetEncoder(
+    id<MTLComputeCommandEncoder> encoder) {
+  encoder_ = encoder;
+}
+
+void ComputePassBindingsCacheMTL::SetBuffer(uint64_t index,
+                                            uint64_t offset,
+                                            id<MTLBuffer> buffer) {
+  auto found = buffers_.find(index);
+  if (found != buffers_.end() && found->second.buffer == buffer) {
+    // The right buffer is bound. Check if its offset needs to be updated.
+    if (found->second.offset == offset) {
+      // Buffer and its offset is identical. Nothing to do.
+      return;
+    }
+
+    // Only the offset needs to be updated.
+    found->second.offset = offset;
+
+    [encoder_ setBufferOffset:offset atIndex:index];
+    return;
+  }
+
+  buffers_[index] = {buffer, static_cast<size_t>(offset)};
+  [encoder_ setBuffer:buffer offset:offset atIndex:index];
+}
+
+void ComputePassBindingsCacheMTL::SetTexture(uint64_t index,
+                                             id<MTLTexture> texture) {
+  auto found = textures_.find(index);
+  if (found != textures_.end() && found->second == texture) {
+    // Already bound.
+    return;
+  }
+  textures_[index] = texture;
+  [encoder_ setTexture:texture atIndex:index];
+  return;
+}
+
+void ComputePassBindingsCacheMTL::SetSampler(uint64_t index,
+                                             id<MTLSamplerState> sampler) {
+  auto found = samplers_.find(index);
+  if (found != samplers_.end() && found->second == sampler) {
+    // Already bound.
+    return;
+  }
+  samplers_[index] = sampler;
+  [encoder_ setSamplerState:sampler atIndex:index];
+  return;
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/backend/metal/compute_pass_mtl.h b/impeller/renderer/backend/metal/compute_pass_mtl.h
index df395c3434bb2c4d8e3ca208684af9fc7d20e5b7..ff9669a4105ca5b1bde434d24556d94c0034a9e5 100644
--- a/impeller/renderer/backend/metal/compute_pass_mtl.h
+++ b/impeller/renderer/backend/metal/compute_pass_mtl.h
@@ -2,12 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_COMPUTE_PASS_MTL_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_COMPUTE_PASS_MTL_H_
 
 #include <Metal/Metal.h>
 
 #include "flutter/fml/macros.h"
+#include "impeller/renderer/backend/metal/compute_pass_bindings_cache_mtl.h"
 #include "impeller/renderer/compute_pass.h"
+#include "impeller/renderer/pipeline_descriptor.h"
 
 namespace impeller {
 
@@ -20,29 +23,60 @@ class ComputePassMTL final : public ComputePass {
   friend class CommandBufferMTL;
 
   id<MTLCommandBuffer> buffer_ = nil;
-  std::string label_;
+  id<MTLComputeCommandEncoder> encoder_ = nil;
+  ComputePassBindingsCacheMTL pass_bindings_cache_ =
+      ComputePassBindingsCacheMTL();
   bool is_valid_ = false;
+  bool has_label_ = false;
 
-  ComputePassMTL(std::weak_ptr<const Context> context,
+  ComputePassMTL(std::shared_ptr<const Context> context,
                  id<MTLCommandBuffer> buffer);
 
   // |ComputePass|
   bool IsValid() const override;
 
   // |ComputePass|
-  void OnSetLabel(std::string label) override;
+  fml::Status Compute(const ISize& grid_size) override;
 
   // |ComputePass|
-  bool OnEncodeCommands(const Context& context,
-                        const ISize& grid_size,
-                        const ISize& thread_group_size) const override;
+  void SetCommandLabel(std::string_view label) override;
 
-  bool EncodeCommands(const std::shared_ptr<Allocator>& allocator,
-                      id<MTLComputeCommandEncoder> pass,
-                      const ISize& grid_size,
-                      const ISize& thread_group_size) const;
+  // |ComputePass|
+  void OnSetLabel(const std::string& label) override;
+
+  // |ComputePass|
+  void SetPipeline(const std::shared_ptr<Pipeline<ComputePipelineDescriptor>>&
+                       pipeline) override;
+
+  // |ComputePass|
+  bool BindResource(ShaderStage stage,
+                    DescriptorType type,
+                    const ShaderUniformSlot& slot,
+                    const ShaderMetadata& metadata,
+                    BufferView view) override;
+
+  // |ComputePass|
+  bool BindResource(ShaderStage stage,
+                    DescriptorType type,
+                    const SampledImageSlot& slot,
+                    const ShaderMetadata& metadata,
+                    std::shared_ptr<const Texture> texture,
+                    const std::unique_ptr<const Sampler>& sampler) override;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(ComputePassMTL);
+  // |ComputePass|
+  bool EncodeCommands() const override;
+
+  // |ComputePass|
+  void AddBufferMemoryBarrier() override;
+
+  // |ComputePass|
+  void AddTextureMemoryBarrier() override;
+
+  ComputePassMTL(const ComputePassMTL&) = delete;
+
+  ComputePassMTL& operator=(const ComputePassMTL&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_COMPUTE_PASS_MTL_H_
diff --git a/impeller/renderer/backend/metal/compute_pass_mtl.mm b/impeller/renderer/backend/metal/compute_pass_mtl.mm
index fd831f35a2aa2c734d71331c8aa34f7d8dcb3dc3..f05825c139ec3fc2748adbc006f07382f7f8a461 100644
--- a/impeller/renderer/backend/metal/compute_pass_mtl.mm
+++ b/impeller/renderer/backend/metal/compute_pass_mtl.mm
@@ -6,31 +6,38 @@
 
 #include <Metal/Metal.h>
 #include <memory>
-#include <variant>
 
 #include "flutter/fml/backtrace.h"
 #include "flutter/fml/closure.h"
 #include "flutter/fml/logging.h"
 #include "flutter/fml/trace_event.h"
+#include "fml/status.h"
 #include "impeller/base/backend_cast.h"
+#include "impeller/core/device_buffer.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/host_buffer.h"
+#include "impeller/core/shader_types.h"
 #include "impeller/renderer/backend/metal/compute_pipeline_mtl.h"
 #include "impeller/renderer/backend/metal/device_buffer_mtl.h"
 #include "impeller/renderer/backend/metal/formats_mtl.h"
 #include "impeller/renderer/backend/metal/sampler_mtl.h"
 #include "impeller/renderer/backend/metal/texture_mtl.h"
-#include "impeller/renderer/compute_command.h"
-#include "impeller/renderer/formats.h"
-#include "impeller/renderer/host_buffer.h"
-#include "impeller/renderer/shader_types.h"
+#include "impeller/renderer/command.h"
 
 namespace impeller {
 
-ComputePassMTL::ComputePassMTL(std::weak_ptr<const Context> context,
+ComputePassMTL::ComputePassMTL(std::shared_ptr<const Context> context,
                                id<MTLCommandBuffer> buffer)
     : ComputePass(std::move(context)), buffer_(buffer) {
   if (!buffer_) {
     return;
   }
+  encoder_ = [buffer_ computeCommandEncoderWithDispatchType:
+                          MTLDispatchType::MTLDispatchTypeConcurrent];
+  if (!encoder_) {
+    return;
+  }
+  pass_bindings_cache_.SetEncoder(encoder_);
   is_valid_ = true;
 }
 
@@ -40,225 +47,126 @@ bool ComputePassMTL::IsValid() const {
   return is_valid_;
 }
 
-void ComputePassMTL::OnSetLabel(std::string label) {
+void ComputePassMTL::OnSetLabel(const std::string& label) {
+#ifdef IMPELLER_DEBUG
   if (label.empty()) {
     return;
   }
-  label_ = std::move(label);
+  [encoder_ setLabel:@(label.c_str())];
+#endif  // IMPELLER_DEBUG
 }
 
-bool ComputePassMTL::OnEncodeCommands(const Context& context,
-                                      const ISize& grid_size,
-                                      const ISize& thread_group_size) const {
-  TRACE_EVENT0("impeller", "ComputePassMTL::EncodeCommands");
-  if (!IsValid()) {
-    return false;
-  }
-
-  // TODO(dnfield): Support non-serial dispatch type on higher iOS versions.
-  auto compute_command_encoder = [buffer_ computeCommandEncoder];
-
-  if (!compute_command_encoder) {
-    return false;
-  }
-
-  if (!label_.empty()) {
-    [compute_command_encoder setLabel:@(label_.c_str())];
-  }
-
-  // Success or failure, the pass must end. The buffer can only process one pass
-  // at a time.
-  fml::ScopedCleanupClosure auto_end(
-      [compute_command_encoder]() { [compute_command_encoder endEncoding]; });
-
-  return EncodeCommands(context.GetResourceAllocator(), compute_command_encoder,
-                        grid_size, thread_group_size);
+void ComputePassMTL::SetCommandLabel(std::string_view label) {
+  has_label_ = true;
+  [encoder_ pushDebugGroup:@(label.data())];
 }
 
-//-----------------------------------------------------------------------------
-/// @brief      Ensures that bindings on the pass are not redundantly set or
-///             updated. Avoids making the driver do additional checks and makes
-///             the frame insights during profiling and instrumentation not
-///             complain about the same.
-///
-///             There should be no change to rendering if this caching was
-///             absent.
-///
-struct ComputePassBindingsCache {
-  explicit ComputePassBindingsCache(id<MTLComputeCommandEncoder> encoder)
-      : encoder_(encoder) {}
-
-  ComputePassBindingsCache(const ComputePassBindingsCache&) = delete;
-
-  ComputePassBindingsCache(ComputePassBindingsCache&&) = delete;
-
-  void SetComputePipelineState(id<MTLComputePipelineState> pipeline) {
-    if (pipeline == pipeline_) {
-      return;
-    }
-    pipeline_ = pipeline;
-    [encoder_ setComputePipelineState:pipeline_];
-  }
-
-  id<MTLComputePipelineState> GetPipeline() const { return pipeline_; }
-
-  void SetBuffer(uint64_t index, uint64_t offset, id<MTLBuffer> buffer) {
-    auto found = buffers_.find(index);
-    if (found != buffers_.end() && found->second.buffer == buffer) {
-      // The right buffer is bound. Check if its offset needs to be updated.
-      if (found->second.offset == offset) {
-        // Buffer and its offset is identical. Nothing to do.
-        return;
-      }
-
-      // Only the offset needs to be updated.
-      found->second.offset = offset;
-
-      [encoder_ setBufferOffset:offset atIndex:index];
-      return;
-    }
-
-    buffers_[index] = {buffer, static_cast<size_t>(offset)};
-    [encoder_ setBuffer:buffer offset:offset atIndex:index];
-  }
-
-  void SetTexture(uint64_t index, id<MTLTexture> texture) {
-    auto found = textures_.find(index);
-    if (found != textures_.end() && found->second == texture) {
-      // Already bound.
-      return;
-    }
-    textures_[index] = texture;
-    [encoder_ setTexture:texture atIndex:index];
-    return;
-  }
-
-  void SetSampler(uint64_t index, id<MTLSamplerState> sampler) {
-    auto found = samplers_.find(index);
-    if (found != samplers_.end() && found->second == sampler) {
-      // Already bound.
-      return;
-    }
-    samplers_[index] = sampler;
-    [encoder_ setSamplerState:sampler atIndex:index];
-    return;
-  }
+// |ComputePass|
+void ComputePassMTL::SetPipeline(
+    const std::shared_ptr<Pipeline<ComputePipelineDescriptor>>& pipeline) {
+  pass_bindings_cache_.SetComputePipelineState(
+      ComputePipelineMTL::Cast(*pipeline).GetMTLComputePipelineState());
+}
 
- private:
-  struct BufferOffsetPair {
-    id<MTLBuffer> buffer = nullptr;
-    size_t offset = 0u;
-  };
-  using BufferMap = std::map<uint64_t, BufferOffsetPair>;
-  using TextureMap = std::map<uint64_t, id<MTLTexture>>;
-  using SamplerMap = std::map<uint64_t, id<MTLSamplerState>>;
+// |ComputePass|
+void ComputePassMTL::AddBufferMemoryBarrier() {
+  [encoder_ memoryBarrierWithScope:MTLBarrierScopeBuffers];
+}
 
-  const id<MTLComputeCommandEncoder> encoder_;
-  id<MTLComputePipelineState> pipeline_ = nullptr;
-  BufferMap buffers_;
-  TextureMap textures_;
-  SamplerMap samplers_;
-};
+// |ComputePass|
+void ComputePassMTL::AddTextureMemoryBarrier() {
+  [encoder_ memoryBarrierWithScope:MTLBarrierScopeTextures];
+}
 
-static bool Bind(ComputePassBindingsCache& pass,
-                 Allocator& allocator,
-                 size_t bind_index,
-                 const BufferView& view) {
+// |ComputePass|
+bool ComputePassMTL::BindResource(ShaderStage stage,
+                                  DescriptorType type,
+                                  const ShaderUniformSlot& slot,
+                                  const ShaderMetadata& metadata,
+                                  BufferView view) {
   if (!view.buffer) {
     return false;
   }
 
-  auto device_buffer = view.buffer->GetDeviceBuffer(allocator);
+  const std::shared_ptr<const DeviceBuffer>& device_buffer = view.buffer;
   if (!device_buffer) {
     return false;
   }
 
-  auto buffer = DeviceBufferMTL::Cast(*device_buffer).GetMTLBuffer();
+  id<MTLBuffer> buffer = DeviceBufferMTL::Cast(*device_buffer).GetMTLBuffer();
   // The Metal call is a void return and we don't want to make it on nil.
   if (!buffer) {
     return false;
   }
 
-  pass.SetBuffer(bind_index, view.range.offset, buffer);
+  pass_bindings_cache_.SetBuffer(slot.ext_res_0, view.range.offset, buffer);
   return true;
 }
 
-static bool Bind(ComputePassBindingsCache& pass,
-                 size_t bind_index,
-                 const Texture& texture) {
-  if (!texture.IsValid()) {
+// |ComputePass|
+bool ComputePassMTL::BindResource(
+    ShaderStage stage,
+    DescriptorType type,
+    const SampledImageSlot& slot,
+    const ShaderMetadata& metadata,
+    std::shared_ptr<const Texture> texture,
+    const std::unique_ptr<const Sampler>& sampler) {
+  if (!sampler || !texture->IsValid()) {
     return false;
   }
 
-  pass.SetTexture(bind_index, TextureMTL::Cast(texture).GetMTLTexture());
+  pass_bindings_cache_.SetTexture(slot.texture_index,
+                                  TextureMTL::Cast(*texture).GetMTLTexture());
+  pass_bindings_cache_.SetSampler(
+      slot.texture_index, SamplerMTL::Cast(*sampler).GetMTLSamplerState());
   return true;
 }
 
-static bool Bind(ComputePassBindingsCache& pass,
-                 size_t bind_index,
-                 const Sampler& sampler) {
-  if (!sampler.IsValid()) {
-    return false;
-  }
-
-  pass.SetSampler(bind_index, SamplerMTL::Cast(sampler).GetMTLSamplerState());
-  return true;
-}
-
-bool ComputePassMTL::EncodeCommands(const std::shared_ptr<Allocator>& allocator,
-                                    id<MTLComputeCommandEncoder> encoder,
-                                    const ISize& grid_size,
-                                    const ISize& thread_group_size) const {
-  ComputePassBindingsCache pass_bindings(encoder);
-
-  fml::closure pop_debug_marker = [encoder]() { [encoder popDebugGroup]; };
-  for (const auto& command : commands_) {
-    fml::ScopedCleanupClosure auto_pop_debug_marker(pop_debug_marker);
-    if (!command.label.empty()) {
-      [encoder pushDebugGroup:@(command.label.c_str())];
-    } else {
-      auto_pop_debug_marker.Release();
-    }
-
-    pass_bindings.SetComputePipelineState(
-        ComputePipelineMTL::Cast(*command.pipeline)
-            .GetMTLComputePipelineState());
-
-    for (const auto& buffer : command.bindings.buffers) {
-      if (!Bind(pass_bindings, *allocator, buffer.first,
-                buffer.second.resource)) {
-        return false;
-      }
-    }
-
-    for (const auto& texture : command.bindings.textures) {
-      if (!Bind(pass_bindings, texture.first, *texture.second.resource)) {
-        return false;
-      }
-    }
-    for (const auto& sampler : command.bindings.samplers) {
-      if (!Bind(pass_bindings, sampler.first, *sampler.second.resource)) {
-        return false;
-      }
-    }
+fml::Status ComputePassMTL::Compute(const ISize& grid_size) {
+  if (grid_size.IsEmpty()) {
+    return fml::Status(fml::StatusCode::kUnknown,
+                       "Invalid grid size for compute command.");
   }
   // TODO(dnfield): use feature detection to support non-uniform threadgroup
   // sizes.
   // https://github.com/flutter/flutter/issues/110619
-
-  // For now, check that the sizes are uniform.
-  FML_DCHECK(grid_size == thread_group_size);
   auto width = grid_size.width;
   auto height = grid_size.height;
-  while (width * height >
-         static_cast<int64_t>(
-             pass_bindings.GetPipeline().maxTotalThreadsPerThreadgroup)) {
-    width /= 2;
-    height /= 2;
+
+  auto max_total_threads_per_threadgroup = static_cast<int64_t>(
+      pass_bindings_cache_.GetPipeline().maxTotalThreadsPerThreadgroup);
+
+  // Special case for linear processing.
+  if (height == 1) {
+    int64_t thread_groups = std::max(
+        static_cast<int64_t>(
+            std::ceil(width * 1.0 / max_total_threads_per_threadgroup * 1.0)),
+        1LL);
+    [encoder_
+         dispatchThreadgroups:MTLSizeMake(thread_groups, 1, 1)
+        threadsPerThreadgroup:MTLSizeMake(max_total_threads_per_threadgroup, 1,
+                                          1)];
+  } else {
+    while (width * height > max_total_threads_per_threadgroup) {
+      width = std::max(1LL, width / 2);
+      height = std::max(1LL, height / 2);
+    }
+
+    auto size = MTLSizeMake(width, height, 1);
+    [encoder_ dispatchThreadgroups:size threadsPerThreadgroup:size];
   }
-  auto size = MTLSizeMake(width, height, 1);
-  [encoder dispatchThreadgroups:size threadsPerThreadgroup:size];
 
+#ifdef IMPELLER_DEBUG
+  if (has_label_) {
+    [encoder_ popDebugGroup];
+  }
+  has_label_ = false;
+#endif  // IMPELLER_DEBUG
+  return fml::Status();
+}
+
+bool ComputePassMTL::EncodeCommands() const {
+  [encoder_ endEncoding];
   return true;
 }
 
diff --git a/impeller/renderer/backend/metal/compute_pipeline_mtl.h b/impeller/renderer/backend/metal/compute_pipeline_mtl.h
index 9c2efa74884f5054c10190355ff579712571ef1c..1ab1277c04ccef5b1f55893079ac7de720db021f 100644
--- a/impeller/renderer/backend/metal/compute_pipeline_mtl.h
+++ b/impeller/renderer/backend/metal/compute_pipeline_mtl.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_COMPUTE_PIPELINE_MTL_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_COMPUTE_PIPELINE_MTL_H_
 
 #include <Metal/Metal.h>
 
@@ -35,7 +36,11 @@ class ComputePipelineMTL final
   // |Pipeline|
   bool IsValid() const override;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(ComputePipelineMTL);
+  ComputePipelineMTL(const ComputePipelineMTL&) = delete;
+
+  ComputePipelineMTL& operator=(const ComputePipelineMTL&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_COMPUTE_PIPELINE_MTL_H_
diff --git a/impeller/renderer/backend/metal/context_mtl.h b/impeller/renderer/backend/metal/context_mtl.h
index df6089f618e3f2489d611dea9f2a43750a12ea7e..6497871b28b2558f8dc843189d2c34348008a613 100644
--- a/impeller/renderer/backend/metal/context_mtl.h
+++ b/impeller/renderer/backend/metal/context_mtl.h
@@ -2,52 +2,66 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_CONTEXT_MTL_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_CONTEXT_MTL_H_
 
 #include <Metal/Metal.h>
 
+#include <deque>
 #include <string>
-#include <vector>
 
+#include "flutter/fml/concurrent_message_loop.h"
 #include "flutter/fml/macros.h"
+#include "flutter/fml/synchronization/sync_switch.h"
 #include "impeller/base/backend_cast.h"
+#include "impeller/core/sampler.h"
 #include "impeller/renderer/backend/metal/allocator_mtl.h"
 #include "impeller/renderer/backend/metal/command_buffer_mtl.h"
 #include "impeller/renderer/backend/metal/gpu_tracer_mtl.h"
 #include "impeller/renderer/backend/metal/pipeline_library_mtl.h"
 #include "impeller/renderer/backend/metal/shader_library_mtl.h"
+#include "impeller/renderer/capabilities.h"
+#include "impeller/renderer/command_queue.h"
 #include "impeller/renderer/context.h"
-#include "impeller/renderer/sampler.h"
+
+#if TARGET_OS_SIMULATOR
+#define IMPELLER_CA_METAL_LAYER_AVAILABLE API_AVAILABLE(macos(10.11), ios(13.0))
+#else  // TARGET_OS_SIMULATOR
+#define IMPELLER_CA_METAL_LAYER_AVAILABLE API_AVAILABLE(macos(10.11), ios(8.0))
+#endif  // TARGET_OS_SIMULATOR
 
 namespace impeller {
 
 class ContextMTL final : public Context,
-                         public BackendCast<ContextMTL, Context> {
+                         public BackendCast<ContextMTL, Context>,
+                         public std::enable_shared_from_this<ContextMTL> {
  public:
   static std::shared_ptr<ContextMTL> Create(
-      const std::vector<std::string>& shader_library_paths);
+      const std::vector<std::string>& shader_library_paths,
+      std::shared_ptr<const fml::SyncSwitch> is_gpu_disabled_sync_switch);
+
+  static std::shared_ptr<ContextMTL> Create(
+      const std::vector<std::shared_ptr<fml::Mapping>>& shader_libraries_data,
+      std::shared_ptr<const fml::SyncSwitch> is_gpu_disabled_sync_switch,
+      const std::string& label);
 
   static std::shared_ptr<ContextMTL> Create(
+      id<MTLDevice> device,
+      id<MTLCommandQueue> command_queue,
       const std::vector<std::shared_ptr<fml::Mapping>>& shader_libraries_data,
+      std::shared_ptr<const fml::SyncSwitch> is_gpu_disabled_sync_switch,
       const std::string& label);
 
   // |Context|
   ~ContextMTL() override;
 
-  id<MTLDevice> GetMTLDevice() const;
+  // |Context|
+  BackendType GetBackendType() const override;
 
- private:
-  id<MTLDevice> device_ = nullptr;
-  id<MTLCommandQueue> command_queue_ = nullptr;
-  std::shared_ptr<ShaderLibraryMTL> shader_library_;
-  std::shared_ptr<PipelineLibraryMTL> pipeline_library_;
-  std::shared_ptr<SamplerLibrary> sampler_library_;
-  std::shared_ptr<AllocatorMTL> resource_allocator_;
-  std::shared_ptr<WorkQueue> work_queue_;
-  std::shared_ptr<GPUTracerMTL> gpu_tracer_;
-  bool is_valid_ = false;
+  id<MTLDevice> GetMTLDevice() const;
 
-  ContextMTL(id<MTLDevice> device, NSArray<id<MTLLibrary>>* shader_libraries);
+  // |Context|
+  std::string DescribeGpuModel() const override;
 
   // |Context|
   bool IsValid() const override;
@@ -68,21 +82,73 @@ class ContextMTL final : public Context,
   std::shared_ptr<CommandBuffer> CreateCommandBuffer() const override;
 
   // |Context|
-  std::shared_ptr<WorkQueue> GetWorkQueue() const override;
+  std::shared_ptr<CommandQueue> GetCommandQueue() const override;
+
+  // |Context|
+  const std::shared_ptr<const Capabilities>& GetCapabilities() const override;
+
+  void SetCapabilities(const std::shared_ptr<const Capabilities>& capabilities);
 
   // |Context|
-  std::shared_ptr<GPUTracer> GetGPUTracer() const override;
+  bool UpdateOffscreenLayerPixelFormat(PixelFormat format) override;
 
   // |Context|
-  bool SupportsOffscreenMSAA() const override;
+  void Shutdown() override;
+
+  id<MTLCommandBuffer> CreateMTLCommandBuffer(const std::string& label) const;
+
+  std::shared_ptr<const fml::SyncSwitch> GetIsGpuDisabledSyncSwitch() const;
+
+#ifdef IMPELLER_DEBUG
+  std::shared_ptr<GPUTracerMTL> GetGPUTracer() const;
+#endif  // IMPELLER_DEBUG
 
   // |Context|
-  const BackendFeatures& GetBackendFeatures() const override;
+  void StoreTaskForGPU(const std::function<void()>& task) override;
+
+ private:
+  class SyncSwitchObserver : public fml::SyncSwitch::Observer {
+   public:
+    explicit SyncSwitchObserver(ContextMTL& parent);
+    virtual ~SyncSwitchObserver() = default;
+    void OnSyncSwitchUpdate(bool new_value) override;
+
+   private:
+    ContextMTL& parent_;
+  };
+
+  id<MTLDevice> device_ = nullptr;
+  id<MTLCommandQueue> command_queue_ = nullptr;
+  std::shared_ptr<ShaderLibraryMTL> shader_library_;
+  std::shared_ptr<PipelineLibraryMTL> pipeline_library_;
+  std::shared_ptr<SamplerLibrary> sampler_library_;
+  std::shared_ptr<AllocatorMTL> resource_allocator_;
+  std::shared_ptr<const Capabilities> device_capabilities_;
+  std::shared_ptr<const fml::SyncSwitch> is_gpu_disabled_sync_switch_;
+#ifdef IMPELLER_DEBUG
+  std::shared_ptr<GPUTracerMTL> gpu_tracer_;
+#endif  // IMPELLER_DEBUG
+  std::deque<std::function<void()>> tasks_awaiting_gpu_;
+  std::unique_ptr<SyncSwitchObserver> sync_switch_observer_;
+  std::shared_ptr<CommandQueue> command_queue_ip_;
+  bool is_valid_ = false;
+
+  ContextMTL(
+      id<MTLDevice> device,
+      id<MTLCommandQueue> command_queue,
+      NSArray<id<MTLLibrary>>* shader_libraries,
+      std::shared_ptr<const fml::SyncSwitch> is_gpu_disabled_sync_switch);
 
   std::shared_ptr<CommandBuffer> CreateCommandBufferInQueue(
       id<MTLCommandQueue> queue) const;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(ContextMTL);
+  void FlushTasksAwaitingGPU();
+
+  ContextMTL(const ContextMTL&) = delete;
+
+  ContextMTL& operator=(const ContextMTL&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_CONTEXT_MTL_H_
diff --git a/impeller/renderer/backend/metal/context_mtl.mm b/impeller/renderer/backend/metal/context_mtl.mm
index faedec8e5bf2b64326a01ab18edbac062b79c951..623f3c8335f4c0cfffc936218b7df90044ab2e99 100644
--- a/impeller/renderer/backend/metal/context_mtl.mm
+++ b/impeller/renderer/backend/metal/context_mtl.mm
@@ -4,26 +4,90 @@
 
 #include "impeller/renderer/backend/metal/context_mtl.h"
 
-#include <Foundation/Foundation.h>
+#include <memory>
 
+#include "flutter/fml/concurrent_message_loop.h"
 #include "flutter/fml/file.h"
 #include "flutter/fml/logging.h"
 #include "flutter/fml/paths.h"
-#include "impeller/base/platform/darwin/work_queue_darwin.h"
+#include "flutter/fml/synchronization/sync_switch.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/sampler_descriptor.h"
+#include "impeller/renderer/backend/metal/gpu_tracer_mtl.h"
 #include "impeller/renderer/backend/metal/sampler_library_mtl.h"
-#include "impeller/renderer/sampler_descriptor.h"
+#include "impeller/renderer/capabilities.h"
 
 namespace impeller {
 
-ContextMTL::ContextMTL(id<MTLDevice> device,
-                       NSArray<id<MTLLibrary>>* shader_libraries)
-    : device_(device) {
+static bool DeviceSupportsFramebufferFetch(id<MTLDevice> device) {
+  // The iOS simulator lies about supporting framebuffer fetch.
+#if FML_OS_IOS_SIMULATOR
+  return false;
+#else  // FML_OS_IOS_SIMULATOR
+
+  if (@available(macOS 10.15, iOS 13, tvOS 13, *)) {
+    return [device supportsFamily:MTLGPUFamilyApple2];
+  }
+  // According to
+  // https://developer.apple.com/metal/Metal-Feature-Set-Tables.pdf , Apple2
+  // corresponds to iOS GPU family 2, which supports A8 devices.
+#if FML_OS_IOS
+  return [device supportsFeatureSet:MTLFeatureSet_iOS_GPUFamily2_v1];
+#else
+  return false;
+#endif  // FML_OS_IOS
+#endif  // FML_OS_IOS_SIMULATOR
+}
+
+static bool DeviceSupportsComputeSubgroups(id<MTLDevice> device) {
+  bool supports_subgroups = false;
+  // Refer to the "SIMD-scoped reduction operations" feature in the table
+  // below: https://developer.apple.com/metal/Metal-Feature-Set-Tables.pdf
+  if (@available(ios 13.0, tvos 13.0, macos 10.15, *)) {
+    supports_subgroups = [device supportsFamily:MTLGPUFamilyApple7] ||
+                         [device supportsFamily:MTLGPUFamilyMac2];
+  }
+  return supports_subgroups;
+}
+
+static std::unique_ptr<Capabilities> InferMetalCapabilities(
+    id<MTLDevice> device,
+    PixelFormat color_format) {
+  return CapabilitiesBuilder()
+      .SetSupportsOffscreenMSAA(true)
+      .SetSupportsSSBO(true)
+      .SetSupportsBufferToTextureBlits(true)
+      .SetSupportsTextureToTextureBlits(true)
+      .SetSupportsDecalSamplerAddressMode(true)
+      .SetSupportsFramebufferFetch(DeviceSupportsFramebufferFetch(device))
+      .SetDefaultColorFormat(color_format)
+      .SetDefaultStencilFormat(PixelFormat::kS8UInt)
+      .SetDefaultDepthStencilFormat(PixelFormat::kD32FloatS8UInt)
+      .SetSupportsCompute(true)
+      .SetSupportsComputeSubgroups(DeviceSupportsComputeSubgroups(device))
+      .SetSupportsReadFromResolve(true)
+      .SetSupportsDeviceTransientTextures(true)
+      .SetDefaultGlyphAtlasFormat(PixelFormat::kA8UNormInt)
+      .Build();
+}
+
+ContextMTL::ContextMTL(
+    id<MTLDevice> device,
+    id<MTLCommandQueue> command_queue,
+    NSArray<id<MTLLibrary>>* shader_libraries,
+    std::shared_ptr<const fml::SyncSwitch> is_gpu_disabled_sync_switch)
+    : device_(device),
+      command_queue_(command_queue),
+      is_gpu_disabled_sync_switch_(std::move(is_gpu_disabled_sync_switch)) {
   // Validate device.
   if (!device_) {
-    VALIDATION_LOG << "Could not setup valid Metal device.";
+    VALIDATION_LOG << "Could not set up valid Metal device.";
     return;
   }
 
+  sync_switch_observer_.reset(new SyncSwitchObserver(*this));
+  is_gpu_disabled_sync_switch_->AddObserver(sync_switch_observer_.get());
+
   // Setup the shader library.
   {
     if (shader_libraries == nil) {
@@ -41,16 +105,6 @@ ContextMTL::ContextMTL(id<MTLDevice> device,
     shader_library_ = std::move(library);
   }
 
-  // Setup command queue.
-  {
-    command_queue_ = device_.newCommandQueue;
-    if (!command_queue_) {
-      VALIDATION_LOG << "Could not setup the command queue.";
-      return;
-    }
-    command_queue_.label = @"Impeller Command Queue";
-  }
-
   // Setup the pipeline library.
   {
     pipeline_library_ =
@@ -68,26 +122,17 @@ ContextMTL::ContextMTL(id<MTLDevice> device,
     resource_allocator_ = std::shared_ptr<AllocatorMTL>(
         new AllocatorMTL(device_, "Impeller Permanents Allocator"));
     if (!resource_allocator_) {
-      VALIDATION_LOG << "Could not setup the resource allocator.";
-      return;
-    }
-  }
-
-  // Setup the work queue.
-  {
-    work_queue_ = WorkQueueDarwin::Create();
-    if (!work_queue_) {
-      VALIDATION_LOG << "Could not setup the work queue.";
+      VALIDATION_LOG << "Could not set up the resource allocator.";
       return;
     }
   }
 
-#if (FLUTTER_RUNTIME_MODE == FLUTTER_RUNTIME_MODE_DEBUG) || \
-    (FLUTTER_RUNTIME_MODE == FLUTTER_RUNTIME_MODE_PROFILE)
-  // Setup the gpu tracer.
-  { gpu_tracer_ = std::shared_ptr<GPUTracerMTL>(new GPUTracerMTL(device_)); }
-#endif
-
+  device_capabilities_ =
+      InferMetalCapabilities(device_, PixelFormat::kB8G8R8A8UNormInt);
+  command_queue_ip_ = std::make_shared<CommandQueue>();
+#ifdef IMPELLER_DEBUG
+  gpu_tracer_ = std::make_shared<GPUTracerMTL>();
+#endif  // IMPELLER_DEBUG
   is_valid_ = true;
 }
 
@@ -149,6 +194,9 @@ static NSArray<id<MTLLibrary>>* MTLShaderLibraryFromFileData(
                      << shader_library_error.localizedDescription.UTF8String;
       return nil;
     }
+    if (!label.empty()) {
+      library.label = @(label.c_str());
+    }
     [found_libraries addObject:library];
   }
   return found_libraries;
@@ -158,11 +206,28 @@ static id<MTLDevice> CreateMetalDevice() {
   return ::MTLCreateSystemDefaultDevice();
 }
 
+static id<MTLCommandQueue> CreateMetalCommandQueue(id<MTLDevice> device) {
+  auto command_queue = device.newCommandQueue;
+  if (!command_queue) {
+    VALIDATION_LOG << "Could not set up the command queue.";
+    return nullptr;
+  }
+  command_queue.label = @"Impeller Command Queue";
+  return command_queue;
+}
+
 std::shared_ptr<ContextMTL> ContextMTL::Create(
-    const std::vector<std::string>& shader_library_paths) {
+    const std::vector<std::string>& shader_library_paths,
+    std::shared_ptr<const fml::SyncSwitch> is_gpu_disabled_sync_switch) {
   auto device = CreateMetalDevice();
+  auto command_queue = CreateMetalCommandQueue(device);
+  if (!command_queue) {
+    return nullptr;
+  }
   auto context = std::shared_ptr<ContextMTL>(new ContextMTL(
-      device, MTLShaderLibraryFromFilePaths(device, shader_library_paths)));
+      device, command_queue,
+      MTLShaderLibraryFromFilePaths(device, shader_library_paths),
+      std::move(is_gpu_disabled_sync_switch)));
   if (!context->IsValid()) {
     FML_LOG(ERROR) << "Could not create Metal context.";
     return nullptr;
@@ -172,11 +237,18 @@ std::shared_ptr<ContextMTL> ContextMTL::Create(
 
 std::shared_ptr<ContextMTL> ContextMTL::Create(
     const std::vector<std::shared_ptr<fml::Mapping>>& shader_libraries_data,
-    const std::string& label) {
+    std::shared_ptr<const fml::SyncSwitch> is_gpu_disabled_sync_switch,
+    const std::string& library_label) {
   auto device = CreateMetalDevice();
-  auto context = std::shared_ptr<ContextMTL>(new ContextMTL(
-      device,
-      MTLShaderLibraryFromFileData(device, shader_libraries_data, label)));
+  auto command_queue = CreateMetalCommandQueue(device);
+  if (!command_queue) {
+    return nullptr;
+  }
+  auto context = std::shared_ptr<ContextMTL>(
+      new ContextMTL(device, command_queue,
+                     MTLShaderLibraryFromFileData(device, shader_libraries_data,
+                                                  library_label),
+                     std::move(is_gpu_disabled_sync_switch)));
   if (!context->IsValid()) {
     FML_LOG(ERROR) << "Could not create Metal context.";
     return nullptr;
@@ -184,7 +256,36 @@ std::shared_ptr<ContextMTL> ContextMTL::Create(
   return context;
 }
 
-ContextMTL::~ContextMTL() = default;
+std::shared_ptr<ContextMTL> ContextMTL::Create(
+    id<MTLDevice> device,
+    id<MTLCommandQueue> command_queue,
+    const std::vector<std::shared_ptr<fml::Mapping>>& shader_libraries_data,
+    std::shared_ptr<const fml::SyncSwitch> is_gpu_disabled_sync_switch,
+    const std::string& library_label) {
+  auto context = std::shared_ptr<ContextMTL>(
+      new ContextMTL(device, command_queue,
+                     MTLShaderLibraryFromFileData(device, shader_libraries_data,
+                                                  library_label),
+                     std::move(is_gpu_disabled_sync_switch)));
+  if (!context->IsValid()) {
+    FML_LOG(ERROR) << "Could not create Metal context.";
+    return nullptr;
+  }
+  return context;
+}
+
+ContextMTL::~ContextMTL() {
+  is_gpu_disabled_sync_switch_->RemoveObserver(sync_switch_observer_.get());
+}
+
+Context::BackendType ContextMTL::GetBackendType() const {
+  return Context::BackendType::kMetal;
+}
+
+// |Context|
+std::string ContextMTL::DescribeGpuModel() const {
+  return std::string([[device_ name] UTF8String]);
+}
 
 // |Context|
 bool ContextMTL::IsValid() const {
@@ -212,13 +313,18 @@ std::shared_ptr<CommandBuffer> ContextMTL::CreateCommandBuffer() const {
 }
 
 // |Context|
-std::shared_ptr<WorkQueue> ContextMTL::GetWorkQueue() const {
-  return work_queue_;
-}
+void ContextMTL::Shutdown() {}
 
-std::shared_ptr<GPUTracer> ContextMTL::GetGPUTracer() const {
+#ifdef IMPELLER_DEBUG
+std::shared_ptr<GPUTracerMTL> ContextMTL::GetGPUTracer() const {
   return gpu_tracer_;
 }
+#endif  // IMPELLER_DEBUG
+
+std::shared_ptr<const fml::SyncSwitch> ContextMTL::GetIsGpuDisabledSyncSwitch()
+    const {
+  return is_gpu_disabled_sync_switch_;
+}
 
 std::shared_ptr<CommandBuffer> ContextMTL::CreateCommandBufferInQueue(
     id<MTLCommandQueue> queue) const {
@@ -242,14 +348,57 @@ id<MTLDevice> ContextMTL::GetMTLDevice() const {
   return device_;
 }
 
+const std::shared_ptr<const Capabilities>& ContextMTL::GetCapabilities() const {
+  return device_capabilities_;
+}
+
+void ContextMTL::SetCapabilities(
+    const std::shared_ptr<const Capabilities>& capabilities) {
+  device_capabilities_ = capabilities;
+}
+
 // |Context|
-bool ContextMTL::SupportsOffscreenMSAA() const {
+bool ContextMTL::UpdateOffscreenLayerPixelFormat(PixelFormat format) {
+  device_capabilities_ = InferMetalCapabilities(device_, format);
   return true;
 }
 
+id<MTLCommandBuffer> ContextMTL::CreateMTLCommandBuffer(
+    const std::string& label) const {
+  auto buffer = [command_queue_ commandBuffer];
+  if (!label.empty()) {
+    [buffer setLabel:@(label.data())];
+  }
+  return buffer;
+}
+
+void ContextMTL::StoreTaskForGPU(const std::function<void()>& task) {
+  tasks_awaiting_gpu_.emplace_back(task);
+  while (tasks_awaiting_gpu_.size() > kMaxTasksAwaitingGPU) {
+    tasks_awaiting_gpu_.front()();
+    tasks_awaiting_gpu_.pop_front();
+  }
+}
+
+void ContextMTL::FlushTasksAwaitingGPU() {
+  for (const auto& task : tasks_awaiting_gpu_) {
+    task();
+  }
+  tasks_awaiting_gpu_.clear();
+}
+
+ContextMTL::SyncSwitchObserver::SyncSwitchObserver(ContextMTL& parent)
+    : parent_(parent) {}
+
+void ContextMTL::SyncSwitchObserver::OnSyncSwitchUpdate(bool new_is_disabled) {
+  if (!new_is_disabled) {
+    parent_.FlushTasksAwaitingGPU();
+  }
+}
+
 // |Context|
-const BackendFeatures& ContextMTL::GetBackendFeatures() const {
-  return kModernBackendFeatures;
+std::shared_ptr<CommandQueue> ContextMTL::GetCommandQueue() const {
+  return command_queue_ip_;
 }
 
 }  // namespace impeller
diff --git a/impeller/renderer/backend/metal/device_buffer_mtl.h b/impeller/renderer/backend/metal/device_buffer_mtl.h
index ab4914d37fc9a8c4d64ca31a00c891e11b762b87..63b5b6d21c758d6f46af4d67ce6daa7d4aeb9b57 100644
--- a/impeller/renderer/backend/metal/device_buffer_mtl.h
+++ b/impeller/renderer/backend/metal/device_buffer_mtl.h
@@ -2,13 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_DEVICE_BUFFER_MTL_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_DEVICE_BUFFER_MTL_H_
 
 #include <Metal/Metal.h>
 
 #include "flutter/fml/macros.h"
 #include "impeller/base/backend_cast.h"
-#include "impeller/renderer/device_buffer.h"
+#include "impeller/core/device_buffer.h"
 
 namespace impeller {
 
@@ -52,7 +53,14 @@ class DeviceBufferMTL final
   // |DeviceBuffer|
   bool SetLabel(const std::string& label, Range range) override;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(DeviceBufferMTL);
+  // |DeviceBuffer|
+  void Flush(std::optional<Range> range) const override;
+
+  DeviceBufferMTL(const DeviceBufferMTL&) = delete;
+
+  DeviceBufferMTL& operator=(const DeviceBufferMTL&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_DEVICE_BUFFER_MTL_H_
diff --git a/impeller/renderer/backend/metal/device_buffer_mtl.mm b/impeller/renderer/backend/metal/device_buffer_mtl.mm
index a8534c9a5da2a2939a402f26ae7887e43edd20fa..c2ea8d89ef7310d7e9945deb6014b5bc94e929c5 100644
--- a/impeller/renderer/backend/metal/device_buffer_mtl.mm
+++ b/impeller/renderer/backend/metal/device_buffer_mtl.mm
@@ -50,7 +50,7 @@ std::shared_ptr<Texture> DeviceBufferMTL::AsTexture(
   if (!texture) {
     return nullptr;
   }
-  return std::make_shared<TextureMTL>(descriptor, texture);
+  return TextureMTL::Create(descriptor, texture);
 }
 
 [[nodiscard]] bool DeviceBufferMTL::OnCopyHostBuffer(const uint8_t* source,
@@ -78,6 +78,16 @@ std::shared_ptr<Texture> DeviceBufferMTL::AsTexture(
   return true;
 }
 
+void DeviceBufferMTL::Flush(std::optional<Range> range) const {
+#if !FML_OS_IOS
+  auto flush_range = range.value_or(Range{0, GetDeviceBufferDescriptor().size});
+  if (storage_mode_ == MTLStorageModeManaged) {
+    [buffer_
+        didModifyRange:NSMakeRange(flush_range.offset, flush_range.length)];
+  }
+#endif
+}
+
 bool DeviceBufferMTL::SetLabel(const std::string& label) {
   if (label.empty()) {
     return false;
diff --git a/impeller/renderer/backend/metal/formats_mtl.h b/impeller/renderer/backend/metal/formats_mtl.h
index 591ecb8d24cc87a5d97cf22a10f882dcce58679d..28ca80aa60f2a5714e9585721c4639f63f8bd0b0 100644
--- a/impeller/renderer/backend/metal/formats_mtl.h
+++ b/impeller/renderer/backend/metal/formats_mtl.h
@@ -2,16 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_FORMATS_MTL_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_FORMATS_MTL_H_
 
 #include <Metal/Metal.h>
 
 #include <optional>
 
+#include "flutter/fml/build_config.h"
 #include "flutter/fml/macros.h"
+#include "impeller/base/validation.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/texture_descriptor.h"
 #include "impeller/geometry/color.h"
-#include "impeller/renderer/formats.h"
-#include "impeller/renderer/texture_descriptor.h"
 
 namespace impeller {
 
@@ -27,16 +30,50 @@ constexpr PixelFormat FromMTLPixelFormat(MTLPixelFormat format) {
       return PixelFormat::kB8G8R8A8UNormIntSRGB;
     case MTLPixelFormatRGBA8Unorm:
       return PixelFormat::kR8G8B8A8UNormInt;
-    case MTLPixelFormatStencil8:
-      return PixelFormat::kS8UInt;
     case MTLPixelFormatRGBA8Unorm_sRGB:
       return PixelFormat::kR8G8B8A8UNormIntSRGB;
+    case MTLPixelFormatRGBA32Float:
+      return PixelFormat::kR32G32B32A32Float;
+    case MTLPixelFormatRGBA16Float:
+      return PixelFormat::kR16G16B16A16Float;
+    case MTLPixelFormatStencil8:
+      return PixelFormat::kS8UInt;
+#if !FML_OS_IOS
+    case MTLPixelFormatDepth24Unorm_Stencil8:
+      return PixelFormat::kD24UnormS8Uint;
+#endif  // FML_OS_IOS
+    case MTLPixelFormatDepth32Float_Stencil8:
+      return PixelFormat::kD32FloatS8UInt;
+    case MTLPixelFormatBGR10_XR_sRGB:
+      return PixelFormat::kB10G10R10XRSRGB;
+    case MTLPixelFormatBGR10_XR:
+      return PixelFormat::kB10G10R10XR;
+    case MTLPixelFormatBGRA10_XR:
+      return PixelFormat::kB10G10R10A10XR;
     default:
       return PixelFormat::kUnknown;
   }
   return PixelFormat::kUnknown;
 }
 
+/// Safe accessor for MTLPixelFormatDepth24Unorm_Stencil8.
+/// Returns PixelFormat::kUnknown if MTLPixelFormatDepth24Unorm_Stencil8 isn't
+/// supported.
+MTLPixelFormat SafeMTLPixelFormatDepth24Unorm_Stencil8();
+
+/// Safe accessor for MTLPixelFormatBGR10_XR_sRGB.
+/// Returns PixelFormat::kUnknown if MTLPixelFormatBGR10_XR_sRGB isn't
+/// supported.
+MTLPixelFormat SafeMTLPixelFormatBGR10_XR_sRGB();
+
+/// Safe accessor for MTLPixelFormatBGR10_XR.
+/// Returns PixelFormat::kUnknown if MTLPixelFormatBGR10_XR isn't supported.
+MTLPixelFormat SafeMTLPixelFormatBGR10_XR();
+
+/// Safe accessor for MTLPixelFormatBGRA10_XR.
+/// Returns PixelFormat::kUnknown if MTLPixelFormatBGR10_XR isn't supported.
+MTLPixelFormat SafeMTLPixelFormatBGRA10_XR();
+
 constexpr MTLPixelFormat ToMTLPixelFormat(PixelFormat format) {
   switch (format) {
     case PixelFormat::kUnknown:
@@ -53,10 +90,24 @@ constexpr MTLPixelFormat ToMTLPixelFormat(PixelFormat format) {
       return MTLPixelFormatBGRA8Unorm_sRGB;
     case PixelFormat::kR8G8B8A8UNormInt:
       return MTLPixelFormatRGBA8Unorm;
-    case PixelFormat::kS8UInt:
-      return MTLPixelFormatStencil8;
     case PixelFormat::kR8G8B8A8UNormIntSRGB:
       return MTLPixelFormatRGBA8Unorm_sRGB;
+    case PixelFormat::kR32G32B32A32Float:
+      return MTLPixelFormatRGBA32Float;
+    case PixelFormat::kR16G16B16A16Float:
+      return MTLPixelFormatRGBA16Float;
+    case PixelFormat::kS8UInt:
+      return MTLPixelFormatStencil8;
+    case PixelFormat::kD24UnormS8Uint:
+      return SafeMTLPixelFormatDepth24Unorm_Stencil8();
+    case PixelFormat::kD32FloatS8UInt:
+      return MTLPixelFormatDepth32Float_Stencil8;
+    case PixelFormat::kB10G10R10XRSRGB:
+      return SafeMTLPixelFormatBGR10_XR_sRGB();
+    case PixelFormat::kB10G10R10XR:
+      return SafeMTLPixelFormatBGR10_XR();
+    case PixelFormat::kB10G10R10A10XR:
+      return SafeMTLPixelFormatBGRA10_XR();
   }
   return MTLPixelFormatInvalid;
 };
@@ -113,6 +164,16 @@ constexpr MTLPrimitiveType ToMTLPrimitiveType(PrimitiveType type) {
   return MTLPrimitiveTypePoint;
 }
 
+constexpr MTLTriangleFillMode ToMTLTriangleFillMode(PolygonMode mode) {
+  switch (mode) {
+    case PolygonMode::kFill:
+      return MTLTriangleFillModeFill;
+    case PolygonMode::kLine:
+      return MTLTriangleFillModeLines;
+  }
+  return MTLTriangleFillModeFill;
+}
+
 constexpr MTLIndexType ToMTLIndexType(IndexType type) {
   switch (type) {
     case IndexType::k16bit:
@@ -146,25 +207,22 @@ constexpr MTLBlendOperation ToMTLBlendOperation(BlendOperation type) {
   return MTLBlendOperationAdd;
 };
 
-constexpr MTLColorWriteMask ToMTLColorWriteMask(
-    std::underlying_type_t<ColorWriteMask> type) {
-  using UnderlyingType = decltype(type);
-
+constexpr MTLColorWriteMask ToMTLColorWriteMask(ColorWriteMask type) {
   MTLColorWriteMask mask = MTLColorWriteMaskNone;
 
-  if (type & static_cast<UnderlyingType>(ColorWriteMask::kRed)) {
+  if (type & ColorWriteMaskBits::kRed) {
     mask |= MTLColorWriteMaskRed;
   }
 
-  if (type & static_cast<UnderlyingType>(ColorWriteMask::kGreen)) {
+  if (type & ColorWriteMaskBits::kGreen) {
     mask |= MTLColorWriteMaskGreen;
   }
 
-  if (type & static_cast<UnderlyingType>(ColorWriteMask::kBlue)) {
+  if (type & ColorWriteMaskBits::kBlue) {
     mask |= MTLColorWriteMaskBlue;
   }
 
-  if (type & static_cast<UnderlyingType>(ColorWriteMask::kAlpha)) {
+  if (type & ColorWriteMaskBits::kAlpha) {
     mask |= MTLColorWriteMaskAlpha;
   }
 
@@ -285,8 +343,6 @@ constexpr MTLSamplerMinMagFilter ToMTLSamplerMinMagFilter(MinMagFilter filter) {
 
 constexpr MTLSamplerMipFilter ToMTLSamplerMipFilter(MipFilter filter) {
   switch (filter) {
-    case MipFilter::kNone:
-      return MTLSamplerMipFilterNotMipmapped;
     case MipFilter::kNearest:
       return MTLSamplerMipFilterNearest;
     case MipFilter::kLinear:
@@ -304,6 +360,8 @@ constexpr MTLSamplerAddressMode ToMTLSamplerAddressMode(
       return MTLSamplerAddressModeRepeat;
     case SamplerAddressMode::kMirror:
       return MTLSamplerAddressModeMirrorRepeat;
+    case SamplerAddressMode::kDecal:
+      return MTLSamplerAddressModeClampToZero;
   }
   return MTLSamplerAddressModeClampToEdge;
 }
@@ -320,6 +378,9 @@ constexpr MTLTextureType ToMTLTextureType(TextureType type) {
       return MTLTextureType2DMultisample;
     case TextureType::kTextureCube:
       return MTLTextureTypeCube;
+    case TextureType::kTextureExternalOES:
+      VALIDATION_LOG
+          << "kTextureExternalOES can not be used with the Metal backend.";
   }
   return MTLTextureType2D;
 }
@@ -336,3 +397,5 @@ MTLDepthStencilDescriptor* ToMTLDepthStencilDescriptor(
 MTLTextureDescriptor* ToMTLTextureDescriptor(const TextureDescriptor& desc);
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_FORMATS_MTL_H_
diff --git a/impeller/renderer/backend/metal/formats_mtl.mm b/impeller/renderer/backend/metal/formats_mtl.mm
index 3d88d59c5251ee0aab7d9823a2e772ef4591f2b1..256ffea93489512702d7963fa31b18b7b710163d 100644
--- a/impeller/renderer/backend/metal/formats_mtl.mm
+++ b/impeller/renderer/backend/metal/formats_mtl.mm
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "impeller/renderer/backend/metal/formats_mtl.h"
+#include <Metal/Metal.h>
 
 #include <memory>
 
@@ -64,8 +65,13 @@ MTLDepthStencilDescriptor* ToMTLDepthStencilDescriptor(
 
   auto des = [[MTLDepthStencilDescriptor alloc] init];
 
-  des.depthCompareFunction = ToMTLCompareFunction(depth->depth_compare);
-  des.depthWriteEnabled = depth->depth_write_enabled;
+  // These temporary variables are necessary for clang-tidy (Fuchsia LLVM
+  // version 17.0.0git) to not crash.
+  auto compare_function = ToMTLCompareFunction(depth->depth_compare);
+  auto depth_write_enabled = depth->depth_write_enabled;
+
+  des.depthCompareFunction = compare_function;
+  des.depthWriteEnabled = depth_write_enabled;
 
   if (front.has_value()) {
     des.frontFaceStencil = ToMTLStencilDescriptor(front.value());
@@ -89,19 +95,52 @@ MTLTextureDescriptor* ToMTLTextureDescriptor(const TextureDescriptor& desc) {
   mtl_desc.height = desc.size.height;
   mtl_desc.mipmapLevelCount = desc.mip_count;
   mtl_desc.usage = MTLTextureUsageUnknown;
-  if (desc.usage & static_cast<TextureUsageMask>(TextureUsage::kUnknown)) {
+  if (desc.usage & TextureUsage::kUnknown) {
     mtl_desc.usage |= MTLTextureUsageUnknown;
   }
-  if (desc.usage & static_cast<TextureUsageMask>(TextureUsage::kShaderRead)) {
+  if (desc.usage & TextureUsage::kShaderRead) {
     mtl_desc.usage |= MTLTextureUsageShaderRead;
   }
-  if (desc.usage & static_cast<TextureUsageMask>(TextureUsage::kShaderWrite)) {
+  if (desc.usage & TextureUsage::kShaderWrite) {
     mtl_desc.usage |= MTLTextureUsageShaderWrite;
   }
-  if (desc.usage & static_cast<TextureUsageMask>(TextureUsage::kRenderTarget)) {
+  if (desc.usage & TextureUsage::kRenderTarget) {
     mtl_desc.usage |= MTLTextureUsageRenderTarget;
   }
   return mtl_desc;
 }
 
+MTLPixelFormat SafeMTLPixelFormatDepth24Unorm_Stencil8() {
+#if !FML_OS_IOS
+  if (@available(macOS 10.11, *)) {
+    return MTLPixelFormatDepth24Unorm_Stencil8;
+  }
+#endif  // FML_OS_IOS
+  return MTLPixelFormatInvalid;
+}
+
+MTLPixelFormat SafeMTLPixelFormatBGR10_XR_sRGB() {
+  if (@available(iOS 11, macOS 11.0, *)) {
+    return MTLPixelFormatBGR10_XR_sRGB;
+  } else {
+    return MTLPixelFormatInvalid;
+  }
+}
+
+MTLPixelFormat SafeMTLPixelFormatBGR10_XR() {
+  if (@available(iOS 10, macOS 11.0, *)) {
+    return MTLPixelFormatBGR10_XR;
+  } else {
+    return MTLPixelFormatInvalid;
+  }
+}
+
+MTLPixelFormat SafeMTLPixelFormatBGRA10_XR() {
+  if (@available(iOS 10, macOS 11.0, *)) {
+    return MTLPixelFormatBGRA10_XR;
+  } else {
+    return MTLPixelFormatInvalid;
+  }
+}
+
 }  // namespace impeller
diff --git a/impeller/renderer/backend/metal/gpu_tracer_mtl.h b/impeller/renderer/backend/metal/gpu_tracer_mtl.h
index c9367da842b9a8e403d269c15b3daa266eb622fe..94ada1b97d47d44135800065822c6f97e5f83f3c 100644
--- a/impeller/renderer/backend/metal/gpu_tracer_mtl.h
+++ b/impeller/renderer/backend/metal/gpu_tracer_mtl.h
@@ -2,39 +2,50 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_GPU_TRACER_MTL_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_GPU_TRACER_MTL_H_
 
 #include <Metal/Metal.h>
 
-#include "flutter/fml/macros.h"
-#include "impeller/base/backend_cast.h"
-#include "impeller/renderer/gpu_tracer.h"
+#include <memory>
+#include <optional>
+#include "impeller/base/thread.h"
+#include "impeller/base/thread_safety.h"
+#include "impeller/geometry/scalar.h"
 
 namespace impeller {
 
-class GPUTracerMTL final : public GPUTracer,
-                           public BackendCast<GPUTracerMTL, GPUTracer> {
- public:
-  // |GPUTracer|
-  ~GPUTracerMTL() override;
-
-  // |GPUTracer|
-  bool StartCapturingFrame(GPUTracerConfiguration configuration) override;
+class ContextMTL;
 
-  // |GPUTracer|
-  bool StopCapturingFrame() override;
+/// @brief Approximate the GPU frame time by computing a difference between the
+///        smallest GPUStartTime and largest GPUEndTime for all command buffers
+///        submitted in a frame workload.
+class GPUTracerMTL : public std::enable_shared_from_this<GPUTracerMTL> {
+ public:
+  GPUTracerMTL() = default;
 
- private:
-  friend class ContextMTL;
+  ~GPUTracerMTL() = default;
 
-  id<MTLDevice> device_;
-  GPUTracerMTL(id<MTLDevice> device);
+  /// @brief Record that the current frame has ended. Any additional cmd buffers
+  ///        will be attributed to the "next" frame.
+  void MarkFrameEnd();
 
-  NSURL* GetUniqueGPUTraceSavedURL() const;
-  NSURL* GetGPUTraceSavedDictionaryURL() const;
-  bool CreateGPUTraceSavedDictionaryIfNeeded() const;
+  /// @brief Record the current cmd buffer GPU execution timestamps into an
+  ///        aggregate frame workload metric.
+  void RecordCmdBuffer(id<MTLCommandBuffer> buffer);
 
-  FML_DISALLOW_COPY_AND_ASSIGN(GPUTracerMTL);
+ private:
+  struct GPUTraceState {
+    Scalar smallest_timestamp = std::numeric_limits<float>::max();
+    Scalar largest_timestamp = 0;
+    size_t pending_buffers = 0;
+  };
+
+  mutable Mutex trace_state_mutex_;
+  GPUTraceState trace_states_[16] IPLR_GUARDED_BY(trace_state_mutex_);
+  size_t current_state_ IPLR_GUARDED_BY(trace_state_mutex_) = 0u;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_GPU_TRACER_MTL_H_
diff --git a/impeller/renderer/backend/metal/gpu_tracer_mtl.mm b/impeller/renderer/backend/metal/gpu_tracer_mtl.mm
index ef04d04aff32e1b81a12084a40506acf29265134..41f1aa04a3328e8d5fa18f84731341306c2accd8 100644
--- a/impeller/renderer/backend/metal/gpu_tracer_mtl.mm
+++ b/impeller/renderer/backend/metal/gpu_tracer_mtl.mm
@@ -2,101 +2,55 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/renderer/backend/metal/gpu_tracer_mtl.h"
-#include <fml/logging.h>
-
-namespace impeller {
-
-GPUTracerMTL::GPUTracerMTL(id<MTLDevice> device) : device_(device) {}
-
-GPUTracerMTL::~GPUTracerMTL() = default;
-
-bool GPUTracerMTL::StartCapturingFrame(GPUTracerConfiguration configuration) {
-  if (!device_) {
-    return false;
-  }
+#include <Metal/Metal.h>
+#include "fml/trace_event.h"
+#include "impeller/renderer/backend/metal/context_mtl.h"
+#include "impeller/renderer/backend/metal/formats_mtl.h"
 
-  MTLCaptureManager* captureManager = [MTLCaptureManager sharedCaptureManager];
-  if (captureManager.isCapturing) {
-    return false;
-  }
-
-  if (@available(iOS 13.0, macOS 10.15, *)) {
-    MTLCaptureDescriptor* desc = [[MTLCaptureDescriptor alloc] init];
-    desc.captureObject = device_;
-
-    MTLCaptureDestination targetDestination =
-        configuration.mtl_frame_capture_save_trace_as_document
-            ? MTLCaptureDestinationGPUTraceDocument
-            : MTLCaptureDestinationDeveloperTools;
-    if (![captureManager supportsDestination:targetDestination]) {
-      return false;
-    }
-    desc.destination = targetDestination;
-
-    if (configuration.mtl_frame_capture_save_trace_as_document) {
-      if (!CreateGPUTraceSavedDictionaryIfNeeded()) {
-        return false;
-      }
-      NSURL* outputURL = GetUniqueGPUTraceSavedURL();
-      desc.outputURL = outputURL;
-    }
-    return [captureManager startCaptureWithDescriptor:desc error:nil];
-  }
+#include <memory>
 
-  [captureManager startCaptureWithDevice:device_];
-  return captureManager.isCapturing;
-}
+#include "impeller/renderer/backend/metal/gpu_tracer_mtl.h"
 
-bool GPUTracerMTL::StopCapturingFrame() {
-  if (!device_) {
-    return false;
-  }
+namespace impeller {
 
-  MTLCaptureManager* captureManager = [MTLCaptureManager sharedCaptureManager];
-  if (!captureManager.isCapturing) {
-    return false;
+void GPUTracerMTL::MarkFrameEnd() {
+  if (@available(ios 10.3, tvos 10.2, macos 10.15, macCatalyst 13.0, *)) {
+    Lock lock(trace_state_mutex_);
+    current_state_ = (current_state_ + 1) % 16;
   }
-
-  [captureManager stopCapture];
-  return !captureManager.isCapturing;
-}
-
-NSURL* GPUTracerMTL::GetUniqueGPUTraceSavedURL() const {
-  NSURL* savedDictionaryURL = GetGPUTraceSavedDictionaryURL();
-  NSString* uniqueID = [NSUUID UUID].UUIDString;
-  return [[savedDictionaryURL URLByAppendingPathComponent:uniqueID]
-      URLByAppendingPathExtension:@"gputrace"];
 }
 
-bool GPUTracerMTL::CreateGPUTraceSavedDictionaryIfNeeded() const {
-  NSFileManager* fileManager = [NSFileManager defaultManager];
-  NSURL* gpuTraceSavedDictionaryURL = GetGPUTraceSavedDictionaryURL();
-  if ([fileManager fileExistsAtPath:gpuTraceSavedDictionaryURL.path]) {
-    return true;
-  }
-
-  NSError* error = nil;
-  [fileManager createDirectoryAtURL:gpuTraceSavedDictionaryURL
-        withIntermediateDirectories:NO
-                         attributes:nil
-                              error:&error];
-  if (error != nil) {
-    FML_LOG(ERROR) << "Metal frame capture "
-                      "CreateGPUTraceSavedDictionaryIfNeeded failed.";
-    return false;
+void GPUTracerMTL::RecordCmdBuffer(id<MTLCommandBuffer> buffer) {
+  if (@available(ios 10.3, tvos 10.2, macos 10.15, macCatalyst 13.0, *)) {
+    Lock lock(trace_state_mutex_);
+    auto current_state = current_state_;
+    trace_states_[current_state].pending_buffers += 1;
+
+    auto weak_self = weak_from_this();
+    [buffer addCompletedHandler:^(id<MTLCommandBuffer> buffer) {
+      auto self = weak_self.lock();
+      if (!self) {
+        return;
+      }
+      Lock lock(self->trace_state_mutex_);
+      auto& state = self->trace_states_[current_state];
+      state.pending_buffers--;
+      state.smallest_timestamp = std::min(
+          state.smallest_timestamp, static_cast<Scalar>(buffer.GPUStartTime));
+      state.largest_timestamp = std::max(
+          state.largest_timestamp, static_cast<Scalar>(buffer.GPUEndTime));
+
+      if (state.pending_buffers == 0) {
+        auto gpu_ms =
+            (state.largest_timestamp - state.smallest_timestamp) * 1000;
+        state.smallest_timestamp = std::numeric_limits<float>::max();
+        state.largest_timestamp = 0;
+        FML_TRACE_COUNTER("flutter", "GPUTracer",
+                          reinterpret_cast<int64_t>(this),  // Trace Counter ID
+                          "FrameTimeMS", gpu_ms);
+      }
+    }];
   }
-  return true;
-}
-
-NSURL* GPUTracerMTL::GetGPUTraceSavedDictionaryURL() const {
-  NSArray* paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory,
-                                                       NSUserDomainMask, YES);
-  NSString* docPath = [paths objectAtIndex:0];
-  NSURL* docURL = [NSURL fileURLWithPath:docPath];
-  NSURL* gpuTraceDictionaryURL =
-      [docURL URLByAppendingPathComponent:@"MetalCaptureGPUTrace"];
-  return gpuTraceDictionaryURL;
 }
 
 }  // namespace impeller
diff --git a/impeller/renderer/backend/metal/lazy_drawable_holder.h b/impeller/renderer/backend/metal/lazy_drawable_holder.h
new file mode 100644
index 0000000000000000000000000000000000000000..c01975b978a1e5a39befec4c7d4a4e38368e3711
--- /dev/null
+++ b/impeller/renderer/backend/metal/lazy_drawable_holder.h
@@ -0,0 +1,33 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_LAZY_DRAWABLE_HOLDER_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_LAZY_DRAWABLE_HOLDER_H_
+
+#include <Metal/Metal.h>
+
+#include <future>
+#include "impeller/core/texture_descriptor.h"
+#include "impeller/renderer/backend/metal/texture_mtl.h"
+
+@protocol CAMetalDrawable;
+@class CAMetalLayer;
+
+namespace impeller {
+
+/// @brief Create a deferred drawable from a CAMetalLayer.
+std::shared_future<id<CAMetalDrawable>> GetDrawableDeferred(
+    CAMetalLayer* layer);
+
+/// @brief Create a TextureMTL from a deferred drawable.
+///
+///        This function is safe to call multiple times and will only call
+///        nextDrawable once.
+std::shared_ptr<TextureMTL> CreateTextureFromDrawableFuture(
+    TextureDescriptor desc,
+    const std::shared_future<id<CAMetalDrawable>>& drawble_future);
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_LAZY_DRAWABLE_HOLDER_H_
diff --git a/impeller/renderer/backend/metal/lazy_drawable_holder.mm b/impeller/renderer/backend/metal/lazy_drawable_holder.mm
new file mode 100644
index 0000000000000000000000000000000000000000..b847791a288b100f2b4c58b6c1db9fb6d8aeffe7
--- /dev/null
+++ b/impeller/renderer/backend/metal/lazy_drawable_holder.mm
@@ -0,0 +1,51 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/backend/metal/lazy_drawable_holder.h"
+
+#include <QuartzCore/CAMetalLayer.h>
+#include <future>
+#include <memory>
+
+#include "flutter/fml/trace_event.h"
+#include "impeller/base/validation.h"
+
+namespace impeller {
+
+#pragma GCC diagnostic push
+// Disable the diagnostic for iOS Simulators. Metal without emulation isn't
+// available prior to iOS 13 and that's what the simulator headers say when
+// support for CAMetalLayer begins. CAMetalLayer is available on iOS 8.0 and
+// above which is well below Flutters support level.
+#pragma GCC diagnostic ignored "-Wunguarded-availability-new"
+
+std::shared_future<id<CAMetalDrawable>> GetDrawableDeferred(
+    CAMetalLayer* layer) {
+  auto future =
+      std::async(std::launch::deferred, [layer]() -> id<CAMetalDrawable> {
+        id<CAMetalDrawable> current_drawable = nil;
+        {
+          TRACE_EVENT0("impeller", "WaitForNextDrawable");
+          current_drawable = [layer nextDrawable];
+        }
+        if (!current_drawable) {
+          VALIDATION_LOG << "Could not acquire current drawable.";
+          return nullptr;
+        }
+        return current_drawable;
+      });
+  return std::shared_future<id<CAMetalDrawable>>(std::move(future));
+}
+
+std::shared_ptr<TextureMTL> CreateTextureFromDrawableFuture(
+    TextureDescriptor desc,
+    const std::shared_future<id<CAMetalDrawable>>& drawble_future) {
+  return std::make_shared<TextureMTL>(
+      desc, [drawble_future]() { return drawble_future.get().texture; },
+      /*wrapped=*/false, /*drawable=*/true);
+}
+
+#pragma GCC diagnostic pop
+
+}  // namespace impeller
diff --git a/impeller/renderer/backend/metal/pass_bindings_cache_mtl.h b/impeller/renderer/backend/metal/pass_bindings_cache_mtl.h
new file mode 100644
index 0000000000000000000000000000000000000000..4728bee4b8612a8a058ee40a896db5c5a61229cf
--- /dev/null
+++ b/impeller/renderer/backend/metal/pass_bindings_cache_mtl.h
@@ -0,0 +1,75 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_PASS_BINDINGS_CACHE_MTL_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_PASS_BINDINGS_CACHE_MTL_H_
+
+#include <Metal/Metal.h>
+
+#include "impeller/renderer/render_pass.h"
+#include "impeller/renderer/render_target.h"
+
+namespace impeller {
+
+//-----------------------------------------------------------------------------
+/// @brief      Ensures that bindings on the pass are not redundantly set or
+///             updated. Avoids making the driver do additional checks and makes
+///             the frame insights during profiling and instrumentation not
+///             complain about the same.
+///
+///             There should be no change to rendering if this caching was
+///             absent.
+///
+struct PassBindingsCacheMTL {
+  explicit PassBindingsCacheMTL() {}
+
+  ~PassBindingsCacheMTL() = default;
+
+  PassBindingsCacheMTL(const PassBindingsCacheMTL&) = delete;
+
+  PassBindingsCacheMTL(PassBindingsCacheMTL&&) = delete;
+
+  void SetEncoder(id<MTLRenderCommandEncoder> encoder);
+
+  void SetRenderPipelineState(id<MTLRenderPipelineState> pipeline);
+
+  void SetDepthStencilState(id<MTLDepthStencilState> depth_stencil);
+
+  bool SetBuffer(ShaderStage stage,
+                 uint64_t index,
+                 uint64_t offset,
+                 id<MTLBuffer> buffer);
+
+  bool SetTexture(ShaderStage stage, uint64_t index, id<MTLTexture> texture);
+
+  bool SetSampler(ShaderStage stage,
+                  uint64_t index,
+                  id<MTLSamplerState> sampler);
+
+  void SetViewport(const Viewport& viewport);
+
+  void SetScissor(const IRect& scissor);
+
+ private:
+  struct BufferOffsetPair {
+    id<MTLBuffer> buffer = nullptr;
+    size_t offset = 0u;
+  };
+  using BufferMap = std::map<uint64_t, BufferOffsetPair>;
+  using TextureMap = std::map<uint64_t, id<MTLTexture>>;
+  using SamplerMap = std::map<uint64_t, id<MTLSamplerState>>;
+
+  id<MTLRenderCommandEncoder> encoder_;
+  id<MTLRenderPipelineState> pipeline_ = nullptr;
+  id<MTLDepthStencilState> depth_stencil_ = nullptr;
+  std::map<ShaderStage, BufferMap> buffers_;
+  std::map<ShaderStage, TextureMap> textures_;
+  std::map<ShaderStage, SamplerMap> samplers_;
+  std::optional<Viewport> viewport_;
+  std::optional<IRect> scissor_;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_PASS_BINDINGS_CACHE_MTL_H_
diff --git a/impeller/renderer/backend/metal/pass_bindings_cache_mtl.mm b/impeller/renderer/backend/metal/pass_bindings_cache_mtl.mm
new file mode 100644
index 0000000000000000000000000000000000000000..ab5370a7a14efc0c58540cd6164dbe63c69dc4b7
--- /dev/null
+++ b/impeller/renderer/backend/metal/pass_bindings_cache_mtl.mm
@@ -0,0 +1,152 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/backend/metal/pass_bindings_cache_mtl.h"
+
+namespace impeller {
+
+void PassBindingsCacheMTL::SetEncoder(id<MTLRenderCommandEncoder> encoder) {
+  encoder_ = encoder;
+}
+
+void PassBindingsCacheMTL::SetRenderPipelineState(
+    id<MTLRenderPipelineState> pipeline) {
+  if (pipeline == pipeline_) {
+    return;
+  }
+  pipeline_ = pipeline;
+  [encoder_ setRenderPipelineState:pipeline_];
+}
+
+void PassBindingsCacheMTL::SetDepthStencilState(
+    id<MTLDepthStencilState> depth_stencil) {
+  if (depth_stencil_ == depth_stencil) {
+    return;
+  }
+  depth_stencil_ = depth_stencil;
+  [encoder_ setDepthStencilState:depth_stencil_];
+}
+
+bool PassBindingsCacheMTL::SetBuffer(ShaderStage stage,
+                                     uint64_t index,
+                                     uint64_t offset,
+                                     id<MTLBuffer> buffer) {
+  auto& buffers_map = buffers_[stage];
+  auto found = buffers_map.find(index);
+  if (found != buffers_map.end() && found->second.buffer == buffer) {
+    // The right buffer is bound. Check if its offset needs to be updated.
+    if (found->second.offset == offset) {
+      // Buffer and its offset is identical. Nothing to do.
+      return true;
+    }
+
+    // Only the offset needs to be updated.
+    found->second.offset = offset;
+
+    switch (stage) {
+      case ShaderStage::kVertex:
+        [encoder_ setVertexBufferOffset:offset atIndex:index];
+        return true;
+      case ShaderStage::kFragment:
+        [encoder_ setFragmentBufferOffset:offset atIndex:index];
+        return true;
+      default:
+        VALIDATION_LOG << "Cannot update buffer offset of an unknown stage.";
+        return false;
+    }
+    return true;
+  }
+  buffers_map[index] = {buffer, static_cast<size_t>(offset)};
+  switch (stage) {
+    case ShaderStage::kVertex:
+      [encoder_ setVertexBuffer:buffer offset:offset atIndex:index];
+      return true;
+    case ShaderStage::kFragment:
+      [encoder_ setFragmentBuffer:buffer offset:offset atIndex:index];
+      return true;
+    default:
+      VALIDATION_LOG << "Cannot bind buffer to unknown shader stage.";
+      return false;
+  }
+  return false;
+}
+
+bool PassBindingsCacheMTL::SetTexture(ShaderStage stage,
+                                      uint64_t index,
+                                      id<MTLTexture> texture) {
+  auto& texture_map = textures_[stage];
+  auto found = texture_map.find(index);
+  if (found != texture_map.end() && found->second == texture) {
+    // Already bound.
+    return true;
+  }
+  texture_map[index] = texture;
+  switch (stage) {
+    case ShaderStage::kVertex:
+      [encoder_ setVertexTexture:texture atIndex:index];
+      return true;
+    case ShaderStage::kFragment:
+      [encoder_ setFragmentTexture:texture atIndex:index];
+      return true;
+    default:
+      VALIDATION_LOG << "Cannot bind buffer to unknown shader stage.";
+      return false;
+  }
+  return false;
+}
+
+bool PassBindingsCacheMTL::SetSampler(ShaderStage stage,
+                                      uint64_t index,
+                                      id<MTLSamplerState> sampler) {
+  auto& sampler_map = samplers_[stage];
+  auto found = sampler_map.find(index);
+  if (found != sampler_map.end() && found->second == sampler) {
+    // Already bound.
+    return true;
+  }
+  sampler_map[index] = sampler;
+  switch (stage) {
+    case ShaderStage::kVertex:
+      [encoder_ setVertexSamplerState:sampler atIndex:index];
+      return true;
+    case ShaderStage::kFragment:
+      [encoder_ setFragmentSamplerState:sampler atIndex:index];
+      return true;
+    default:
+      VALIDATION_LOG << "Cannot bind buffer to unknown shader stage.";
+      return false;
+  }
+  return false;
+}
+
+void PassBindingsCacheMTL::SetViewport(const Viewport& viewport) {
+  if (viewport_.has_value() && viewport_.value() == viewport) {
+    return;
+  }
+  [encoder_ setViewport:MTLViewport{
+                            .originX = viewport.rect.GetX(),
+                            .originY = viewport.rect.GetY(),
+                            .width = viewport.rect.GetWidth(),
+                            .height = viewport.rect.GetHeight(),
+                            .znear = viewport.depth_range.z_near,
+                            .zfar = viewport.depth_range.z_far,
+                        }];
+  viewport_ = viewport;
+}
+
+void PassBindingsCacheMTL::SetScissor(const IRect& scissor) {
+  if (scissor_.has_value() && scissor_.value() == scissor) {
+    return;
+  }
+  [encoder_
+      setScissorRect:MTLScissorRect{
+                         .x = static_cast<NSUInteger>(scissor.GetX()),
+                         .y = static_cast<NSUInteger>(scissor.GetY()),
+                         .width = static_cast<NSUInteger>(scissor.GetWidth()),
+                         .height = static_cast<NSUInteger>(scissor.GetHeight()),
+                     }];
+  scissor_ = scissor;
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/backend/metal/pipeline_library_mtl.h b/impeller/renderer/backend/metal/pipeline_library_mtl.h
index a06cc459d02d27e85df941492aaeb2f7cfdba0e6..7b12ebbd74b90da2b5c78c2ab248485a10ea147a 100644
--- a/impeller/renderer/backend/metal/pipeline_library_mtl.h
+++ b/impeller/renderer/backend/metal/pipeline_library_mtl.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_PIPELINE_LIBRARY_MTL_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_PIPELINE_LIBRARY_MTL_H_
 
 #include <Metal/Metal.h>
 
@@ -27,7 +28,7 @@ class PipelineLibraryMTL final : public PipelineLibrary {
   PipelineMap pipelines_;
   ComputePipelineMap compute_pipelines_;
 
-  PipelineLibraryMTL(id<MTLDevice> device);
+  explicit PipelineLibraryMTL(id<MTLDevice> device);
 
   // |PipelineLibrary|
   bool IsValid() const override;
@@ -44,7 +45,11 @@ class PipelineLibraryMTL final : public PipelineLibrary {
   void RemovePipelinesWithEntryPoint(
       std::shared_ptr<const ShaderFunction> function) override;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(PipelineLibraryMTL);
+  PipelineLibraryMTL(const PipelineLibraryMTL&) = delete;
+
+  PipelineLibraryMTL& operator=(const PipelineLibraryMTL&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_PIPELINE_LIBRARY_MTL_H_
diff --git a/impeller/renderer/backend/metal/pipeline_library_mtl.mm b/impeller/renderer/backend/metal/pipeline_library_mtl.mm
index 85272ef16fad5f1c425247051d6c7743394ebda8..177c54aa6a8d22ee538d0041fc1204ac648e3fbd 100644
--- a/impeller/renderer/backend/metal/pipeline_library_mtl.mm
+++ b/impeller/renderer/backend/metal/pipeline_library_mtl.mm
@@ -3,8 +3,11 @@
 // found in the LICENSE file.
 
 #include "impeller/renderer/backend/metal/pipeline_library_mtl.h"
+
+#include <Foundation/Foundation.h>
 #include <Metal/Metal.h>
 
+#include "flutter/fml/build_config.h"
 #include "flutter/fml/container.h"
 #include "impeller/base/promise.h"
 #include "impeller/renderer/backend/metal/compute_pipeline_mtl.h"
@@ -20,27 +23,20 @@ PipelineLibraryMTL::PipelineLibraryMTL(id<MTLDevice> device)
 
 PipelineLibraryMTL::~PipelineLibraryMTL() = default;
 
-static MTLRenderPipelineDescriptor* GetMTLRenderPipelineDescriptor(
-    const PipelineDescriptor& desc) {
+using Callback = std::function<void(MTLRenderPipelineDescriptor*)>;
+
+static void GetMTLRenderPipelineDescriptor(const PipelineDescriptor& desc,
+                                           const Callback& callback) {
   auto descriptor = [[MTLRenderPipelineDescriptor alloc] init];
   descriptor.label = @(desc.GetLabel().c_str());
   descriptor.rasterSampleCount = static_cast<NSUInteger>(desc.GetSampleCount());
-
-  for (const auto& entry : desc.GetStageEntrypoints()) {
-    if (entry.first == ShaderStage::kVertex) {
-      descriptor.vertexFunction =
-          ShaderFunctionMTL::Cast(*entry.second).GetMTLFunction();
-    }
-    if (entry.first == ShaderStage::kFragment) {
-      descriptor.fragmentFunction =
-          ShaderFunctionMTL::Cast(*entry.second).GetMTLFunction();
-    }
-  }
+  bool created_specialized_function = false;
 
   if (const auto& vertex_descriptor = desc.GetVertexDescriptor()) {
     VertexDescriptorMTL vertex_descriptor_mtl;
-    if (vertex_descriptor_mtl.SetStageInputs(
-            vertex_descriptor->GetStageInputs())) {
+    if (vertex_descriptor_mtl.SetStageInputsAndLayout(
+            vertex_descriptor->GetStageInputs(),
+            vertex_descriptor->GetStageLayouts())) {
       descriptor.vertexDescriptor =
           vertex_descriptor_mtl.GetMTLVertexDescriptor();
     }
@@ -56,7 +52,33 @@ static MTLRenderPipelineDescriptor* GetMTLRenderPipelineDescriptor(
   descriptor.stencilAttachmentPixelFormat =
       ToMTLPixelFormat(desc.GetStencilPixelFormat());
 
-  return descriptor;
+  const auto& constants = desc.GetSpecializationConstants();
+  for (const auto& entry : desc.GetStageEntrypoints()) {
+    if (entry.first == ShaderStage::kVertex) {
+      descriptor.vertexFunction =
+          ShaderFunctionMTL::Cast(*entry.second).GetMTLFunction();
+    }
+    if (entry.first == ShaderStage::kFragment) {
+      if (constants.empty()) {
+        descriptor.fragmentFunction =
+            ShaderFunctionMTL::Cast(*entry.second).GetMTLFunction();
+      } else {
+        // This code only expects a single specialized function per pipeline.
+        FML_CHECK(!created_specialized_function);
+        created_specialized_function = true;
+        ShaderFunctionMTL::Cast(*entry.second)
+            .GetMTLFunctionSpecialized(
+                constants, [callback, descriptor](id<MTLFunction> function) {
+                  descriptor.fragmentFunction = function;
+                  callback(descriptor);
+                });
+      }
+    }
+  }
+
+  if (!created_specialized_function) {
+    callback(descriptor);
+  }
 }
 
 static MTLComputePipelineDescriptor* GetMTLComputePipelineDescriptor(
@@ -109,7 +131,8 @@ PipelineFuture<PipelineDescriptor> PipelineLibraryMTL::GetPipeline(
       ^(id<MTLRenderPipelineState> _Nullable render_pipeline_state,
         NSError* _Nullable error) {
         if (error != nil) {
-          VALIDATION_LOG << "Could not create render pipeline: "
+          VALIDATION_LOG << "Could not create render pipeline for "
+                         << descriptor.GetLabel() << " :"
                          << error.localizedDescription.UTF8String;
           promise->set_value(nullptr);
           return;
@@ -117,8 +140,6 @@ PipelineFuture<PipelineDescriptor> PipelineLibraryMTL::GetPipeline(
 
         auto strong_this = weak_this.lock();
         if (!strong_this) {
-          VALIDATION_LOG << "Library was collected before a pending pipeline "
-                            "creation could finish.";
           promise->set_value(nullptr);
           return;
         }
@@ -131,9 +152,12 @@ PipelineFuture<PipelineDescriptor> PipelineLibraryMTL::GetPipeline(
             ));
         promise->set_value(new_pipeline);
       };
-  [device_ newRenderPipelineStateWithDescriptor:GetMTLRenderPipelineDescriptor(
-                                                    descriptor)
-                              completionHandler:completion_handler];
+  GetMTLRenderPipelineDescriptor(
+      descriptor, [device = device_, completion_handler](
+                      MTLRenderPipelineDescriptor* descriptor) {
+        [device newRenderPipelineStateWithDescriptor:descriptor
+                                   completionHandler:completion_handler];
+      });
   return pipeline_future;
 }
 
diff --git a/impeller/renderer/backend/metal/pipeline_mtl.h b/impeller/renderer/backend/metal/pipeline_mtl.h
index 7820d595473ce39921aab1bc1ba31026ef3ffccc..b9aca9df8a59944e1b40168c6eed515de24d7ecf 100644
--- a/impeller/renderer/backend/metal/pipeline_mtl.h
+++ b/impeller/renderer/backend/metal/pipeline_mtl.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_PIPELINE_MTL_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_PIPELINE_MTL_H_
 
 #include <Metal/Metal.h>
 
@@ -38,7 +39,11 @@ class PipelineMTL final
   // |Pipeline|
   bool IsValid() const override;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(PipelineMTL);
+  PipelineMTL(const PipelineMTL&) = delete;
+
+  PipelineMTL& operator=(const PipelineMTL&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_PIPELINE_MTL_H_
diff --git a/impeller/renderer/backend/metal/render_pass_mtl.h b/impeller/renderer/backend/metal/render_pass_mtl.h
index 9a286d3978e998dd9f53bb85abedb187a4624a78..c4dd5b470464b9c44c45ad318ace0883bfe3f448 100644
--- a/impeller/renderer/backend/metal/render_pass_mtl.h
+++ b/impeller/renderer/backend/metal/render_pass_mtl.h
@@ -2,11 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_RENDER_PASS_MTL_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_RENDER_PASS_MTL_H_
 
 #include <Metal/Metal.h>
 
 #include "flutter/fml/macros.h"
+#include "impeller/renderer/backend/metal/pass_bindings_cache_mtl.h"
 #include "impeller/renderer/render_pass.h"
 #include "impeller/renderer/render_target.h"
 
@@ -21,14 +23,35 @@ class RenderPassMTL final : public RenderPass {
   friend class CommandBufferMTL;
 
   id<MTLCommandBuffer> buffer_ = nil;
+  id<MTLRenderCommandEncoder> encoder_ = nil;
   MTLRenderPassDescriptor* desc_ = nil;
   std::string label_;
+  bool is_metal_trace_active_ = false;
   bool is_valid_ = false;
+  // Many parts of the codebase will start writing to a render pass but
+  // never submit them. This boolean is used to track if a submit happened
+  // so that in the dtor we can always ensure the render pass is finished.
+  mutable bool did_finish_encoding_ = false;
 
-  RenderPassMTL(std::weak_ptr<const Context> context,
+  PassBindingsCacheMTL pass_bindings_;
+
+  // Per-command state
+  size_t instance_count_ = 1u;
+  size_t base_vertex_ = 0u;
+  size_t vertex_count_ = 0u;
+  bool has_valid_pipeline_ = false;
+  bool has_label_ = false;
+  BufferView index_buffer_ = {};
+  PrimitiveType primitive_type_ = {};
+  MTLIndexType index_type_ = {};
+
+  RenderPassMTL(std::shared_ptr<const Context> context,
                 const RenderTarget& target,
                 id<MTLCommandBuffer> buffer);
 
+  // |RenderPass|
+  void ReserveCommands(size_t command_count) override {}
+
   // |RenderPass|
   bool IsValid() const override;
 
@@ -38,10 +61,61 @@ class RenderPassMTL final : public RenderPass {
   // |RenderPass|
   bool OnEncodeCommands(const Context& context) const override;
 
-  bool EncodeCommands(const std::shared_ptr<Allocator>& transients_allocator,
-                      id<MTLRenderCommandEncoder> pass) const;
+  // |RenderPass|
+  void SetPipeline(
+      const std::shared_ptr<Pipeline<PipelineDescriptor>>& pipeline) override;
+
+  // |RenderPass|
+  void SetCommandLabel(std::string_view label) override;
+
+  // |RenderPass|
+  void SetStencilReference(uint32_t value) override;
+
+  // |RenderPass|
+  void SetBaseVertex(uint64_t value) override;
+
+  // |RenderPass|
+  void SetViewport(Viewport viewport) override;
+
+  // |RenderPass|
+  void SetScissor(IRect scissor) override;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(RenderPassMTL);
+  // |RenderPass|
+  void SetInstanceCount(size_t count) override;
+
+  // |RenderPass|
+  bool SetVertexBuffer(VertexBuffer buffer) override;
+
+  // |RenderPass|
+  fml::Status Draw() override;
+
+  // |RenderPass|
+  bool BindResource(ShaderStage stage,
+                    DescriptorType type,
+                    const ShaderUniformSlot& slot,
+                    const ShaderMetadata& metadata,
+                    BufferView view) override;
+
+  // |RenderPass|
+  bool BindResource(ShaderStage stage,
+                    DescriptorType type,
+                    const ShaderUniformSlot& slot,
+                    const std::shared_ptr<const ShaderMetadata>& metadata,
+                    BufferView view) override;
+
+  // |RenderPass|
+  bool BindResource(ShaderStage stage,
+                    DescriptorType type,
+                    const SampledImageSlot& slot,
+                    const ShaderMetadata& metadata,
+                    std::shared_ptr<const Texture> texture,
+                    const std::unique_ptr<const Sampler>& sampler) override;
+
+  RenderPassMTL(const RenderPassMTL&) = delete;
+
+  RenderPassMTL& operator=(const RenderPassMTL&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_RENDER_PASS_MTL_H_
diff --git a/impeller/renderer/backend/metal/render_pass_mtl.mm b/impeller/renderer/backend/metal/render_pass_mtl.mm
index ac1cc33f934cb31cd7766d8d877ea475b395e0c3..a97aff9ad0f9f63ffc00f72d425ed02b62bcfba4 100644
--- a/impeller/renderer/backend/metal/render_pass_mtl.mm
+++ b/impeller/renderer/backend/metal/render_pass_mtl.mm
@@ -6,16 +6,21 @@
 
 #include "flutter/fml/closure.h"
 #include "flutter/fml/logging.h"
-#include "flutter/fml/trace_event.h"
+#include "flutter/fml/make_copyable.h"
+#include "fml/status.h"
+
 #include "impeller/base/backend_cast.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/host_buffer.h"
+#include "impeller/core/shader_types.h"
+#include "impeller/renderer/backend/metal/context_mtl.h"
 #include "impeller/renderer/backend/metal/device_buffer_mtl.h"
 #include "impeller/renderer/backend/metal/formats_mtl.h"
 #include "impeller/renderer/backend/metal/pipeline_mtl.h"
 #include "impeller/renderer/backend/metal/sampler_mtl.h"
 #include "impeller/renderer/backend/metal/texture_mtl.h"
-#include "impeller/renderer/formats.h"
-#include "impeller/renderer/host_buffer.h"
-#include "impeller/renderer/shader_types.h"
+#include "impeller/renderer/command.h"
+#include "impeller/renderer/vertex_descriptor.h"
 
 namespace impeller {
 
@@ -130,7 +135,7 @@ static MTLRenderPassDescriptor* ToMTLRenderPassDescriptor(
   return result;
 }
 
-RenderPassMTL::RenderPassMTL(std::weak_ptr<const Context> context,
+RenderPassMTL::RenderPassMTL(std::shared_ptr<const Context> context,
                              const RenderTarget& target,
                              id<MTLCommandBuffer> buffer)
     : RenderPass(std::move(context), target),
@@ -139,220 +144,49 @@ RenderPassMTL::RenderPassMTL(std::weak_ptr<const Context> context,
   if (!buffer_ || !desc_ || !render_target_.IsValid()) {
     return;
   }
+  encoder_ = [buffer_ renderCommandEncoderWithDescriptor:desc_];
+
+  if (!encoder_) {
+    return;
+  }
+#ifdef IMPELLER_DEBUG
+  is_metal_trace_active_ =
+      [[MTLCaptureManager sharedCaptureManager] isCapturing];
+#endif  // IMPELLER_DEBUG
+  pass_bindings_.SetEncoder(encoder_);
+  pass_bindings_.SetViewport(
+      Viewport{.rect = Rect::MakeSize(GetRenderTargetSize())});
+  pass_bindings_.SetScissor(IRect::MakeSize(GetRenderTargetSize()));
   is_valid_ = true;
 }
 
-RenderPassMTL::~RenderPassMTL() = default;
+RenderPassMTL::~RenderPassMTL() {
+  if (!did_finish_encoding_) {
+    [encoder_ endEncoding];
+    did_finish_encoding_ = true;
+  }
+}
 
 bool RenderPassMTL::IsValid() const {
   return is_valid_;
 }
 
 void RenderPassMTL::OnSetLabel(std::string label) {
+#ifdef IMPELLER_DEBUG
   if (label.empty()) {
     return;
   }
-  label_ = std::move(label);
+  encoder_.label = @(std::string(label).c_str());
+#endif  // IMPELLER_DEBUG
 }
 
 bool RenderPassMTL::OnEncodeCommands(const Context& context) const {
-  TRACE_EVENT0("impeller", "RenderPassMTL::EncodeCommands");
-  if (!IsValid()) {
-    return false;
-  }
-  auto render_command_encoder =
-      [buffer_ renderCommandEncoderWithDescriptor:desc_];
-
-  if (!render_command_encoder) {
-    return false;
-  }
-
-  if (!label_.empty()) {
-    [render_command_encoder setLabel:@(label_.c_str())];
-  }
-
-  // Success or failure, the pass must end. The buffer can only process one pass
-  // at a time.
-  fml::ScopedCleanupClosure auto_end(
-      [render_command_encoder]() { [render_command_encoder endEncoding]; });
-
-  return EncodeCommands(context.GetResourceAllocator(), render_command_encoder);
+  did_finish_encoding_ = true;
+  [encoder_ endEncoding];
+  return true;
 }
 
-//-----------------------------------------------------------------------------
-/// @brief      Ensures that bindings on the pass are not redundantly set or
-///             updated. Avoids making the driver do additional checks and makes
-///             the frame insights during profiling and instrumentation not
-///             complain about the same.
-///
-///             There should be no change to rendering if this caching was
-///             absent.
-///
-struct PassBindingsCache {
-  explicit PassBindingsCache(id<MTLRenderCommandEncoder> encoder)
-      : encoder_(encoder) {}
-
-  PassBindingsCache(const PassBindingsCache&) = delete;
-
-  PassBindingsCache(PassBindingsCache&&) = delete;
-
-  void SetRenderPipelineState(id<MTLRenderPipelineState> pipeline) {
-    if (pipeline == pipeline_) {
-      return;
-    }
-    pipeline_ = pipeline;
-    [encoder_ setRenderPipelineState:pipeline_];
-  }
-
-  void SetDepthStencilState(id<MTLDepthStencilState> depth_stencil) {
-    if (depth_stencil_ == depth_stencil) {
-      return;
-    }
-    depth_stencil_ = depth_stencil;
-    [encoder_ setDepthStencilState:depth_stencil_];
-  }
-
-  bool SetBuffer(ShaderStage stage,
-                 uint64_t index,
-                 uint64_t offset,
-                 id<MTLBuffer> buffer) {
-    auto& buffers_map = buffers_[stage];
-    auto found = buffers_map.find(index);
-    if (found != buffers_map.end() && found->second.buffer == buffer) {
-      // The right buffer is bound. Check if its offset needs to be updated.
-      if (found->second.offset == offset) {
-        // Buffer and its offset is identical. Nothing to do.
-        return true;
-      }
-
-      // Only the offset needs to be updated.
-      found->second.offset = offset;
-
-      switch (stage) {
-        case ShaderStage::kVertex:
-          [encoder_ setVertexBufferOffset:offset atIndex:index];
-          return true;
-        case ShaderStage::kFragment:
-          [encoder_ setFragmentBufferOffset:offset atIndex:index];
-          return true;
-        default:
-          VALIDATION_LOG << "Cannot update buffer offset of an unknown stage.";
-          return false;
-      }
-      return true;
-    }
-    buffers_map[index] = {buffer, static_cast<size_t>(offset)};
-    switch (stage) {
-      case ShaderStage::kVertex:
-        [encoder_ setVertexBuffer:buffer offset:offset atIndex:index];
-        return true;
-      case ShaderStage::kFragment:
-        [encoder_ setFragmentBuffer:buffer offset:offset atIndex:index];
-        return true;
-      default:
-        VALIDATION_LOG << "Cannot bind buffer to unknown shader stage.";
-        return false;
-    }
-    return false;
-  }
-
-  bool SetTexture(ShaderStage stage, uint64_t index, id<MTLTexture> texture) {
-    auto& texture_map = textures_[stage];
-    auto found = texture_map.find(index);
-    if (found != texture_map.end() && found->second == texture) {
-      // Already bound.
-      return true;
-    }
-    texture_map[index] = texture;
-    switch (stage) {
-      case ShaderStage::kVertex:
-        [encoder_ setVertexTexture:texture atIndex:index];
-        return true;
-      case ShaderStage::kFragment:
-        [encoder_ setFragmentTexture:texture atIndex:index];
-        return true;
-      default:
-        VALIDATION_LOG << "Cannot bind buffer to unknown shader stage.";
-        return false;
-    }
-    return false;
-  }
-
-  bool SetSampler(ShaderStage stage,
-                  uint64_t index,
-                  id<MTLSamplerState> sampler) {
-    auto& sampler_map = samplers_[stage];
-    auto found = sampler_map.find(index);
-    if (found != sampler_map.end() && found->second == sampler) {
-      // Already bound.
-      return true;
-    }
-    sampler_map[index] = sampler;
-    switch (stage) {
-      case ShaderStage::kVertex:
-        [encoder_ setVertexSamplerState:sampler atIndex:index];
-        return true;
-      case ShaderStage::kFragment:
-        [encoder_ setFragmentSamplerState:sampler atIndex:index];
-        return true;
-      default:
-        VALIDATION_LOG << "Cannot bind buffer to unknown shader stage.";
-        return false;
-    }
-    return false;
-  }
-
-  void SetViewport(const Viewport& viewport) {
-    if (viewport_.has_value() && viewport_.value() == viewport) {
-      return;
-    }
-    [encoder_ setViewport:MTLViewport{
-                              .originX = viewport.rect.origin.x,
-                              .originY = viewport.rect.origin.y,
-                              .width = viewport.rect.size.width,
-                              .height = viewport.rect.size.height,
-                              .znear = viewport.depth_range.z_near,
-                              .zfar = viewport.depth_range.z_far,
-                          }];
-    viewport_ = viewport;
-  }
-
-  void SetScissor(const IRect& scissor) {
-    if (scissor_.has_value() && scissor_.value() == scissor) {
-      return;
-    }
-    [encoder_
-        setScissorRect:MTLScissorRect{
-                           .x = static_cast<NSUInteger>(scissor.origin.x),
-                           .y = static_cast<NSUInteger>(scissor.origin.y),
-                           .width = static_cast<NSUInteger>(scissor.size.width),
-                           .height =
-                               static_cast<NSUInteger>(scissor.size.height),
-                       }];
-    scissor_ = scissor;
-  }
-
- private:
-  struct BufferOffsetPair {
-    id<MTLBuffer> buffer = nullptr;
-    size_t offset = 0u;
-  };
-  using BufferMap = std::map<uint64_t, BufferOffsetPair>;
-  using TextureMap = std::map<uint64_t, id<MTLTexture>>;
-  using SamplerMap = std::map<uint64_t, id<MTLSamplerState>>;
-
-  const id<MTLRenderCommandEncoder> encoder_;
-  id<MTLRenderPipelineState> pipeline_ = nullptr;
-  id<MTLDepthStencilState> depth_stencil_ = nullptr;
-  std::map<ShaderStage, BufferMap> buffers_;
-  std::map<ShaderStage, TextureMap> textures_;
-  std::map<ShaderStage, SamplerMap> samplers_;
-  std::optional<Viewport> viewport_;
-  std::optional<IRect> scissor_;
-};
-
-static bool Bind(PassBindingsCache& pass,
-                 Allocator& allocator,
+static bool Bind(PassBindingsCacheMTL& pass,
                  ShaderStage stage,
                  size_t bind_index,
                  const BufferView& view) {
@@ -360,7 +194,7 @@ static bool Bind(PassBindingsCache& pass,
     return false;
   }
 
-  auto device_buffer = view.buffer->GetDeviceBuffer(allocator);
+  auto device_buffer = view.buffer;
   if (!device_buffer) {
     return false;
   }
@@ -374,154 +208,190 @@ static bool Bind(PassBindingsCache& pass,
   return pass.SetBuffer(stage, bind_index, view.range.offset, buffer);
 }
 
-static bool Bind(PassBindingsCache& pass,
+static bool Bind(PassBindingsCacheMTL& pass,
                  ShaderStage stage,
                  size_t bind_index,
+                 const std::unique_ptr<const Sampler>& sampler,
                  const Texture& texture) {
-  if (!texture.IsValid()) {
+  if (!sampler || !texture.IsValid()) {
     return false;
   }
 
+  if (texture.NeedsMipmapGeneration()) {
+    // TODO(127697): generate mips when the GPU is available on iOS.
+#if !FML_OS_IOS
+    VALIDATION_LOG
+        << "Texture at binding index " << bind_index
+        << " has a mip count > 1, but the mipmap has not been generated.";
+    return false;
+#endif  // !FML_OS_IOS
+  }
+
   return pass.SetTexture(stage, bind_index,
-                         TextureMTL::Cast(texture).GetMTLTexture());
+                         TextureMTL::Cast(texture).GetMTLTexture()) &&
+         pass.SetSampler(stage, bind_index,
+                         SamplerMTL::Cast(*sampler).GetMTLSamplerState());
 }
 
-static bool Bind(PassBindingsCache& pass,
-                 ShaderStage stage,
-                 size_t bind_index,
-                 const Sampler& sampler) {
-  if (!sampler.IsValid()) {
-    return false;
+// |RenderPass|
+void RenderPassMTL::SetPipeline(
+    const std::shared_ptr<Pipeline<PipelineDescriptor>>& pipeline) {
+  const PipelineDescriptor& pipeline_desc = pipeline->GetDescriptor();
+  primitive_type_ = pipeline_desc.GetPrimitiveType();
+  pass_bindings_.SetRenderPipelineState(
+      PipelineMTL::Cast(*pipeline).GetMTLRenderPipelineState());
+  pass_bindings_.SetDepthStencilState(
+      PipelineMTL::Cast(*pipeline).GetMTLDepthStencilState());
+
+  [encoder_ setFrontFacingWinding:pipeline_desc.GetWindingOrder() ==
+                                          WindingOrder::kClockwise
+                                      ? MTLWindingClockwise
+                                      : MTLWindingCounterClockwise];
+  [encoder_ setCullMode:ToMTLCullMode(pipeline_desc.GetCullMode())];
+  [encoder_ setTriangleFillMode:ToMTLTriangleFillMode(
+                                    pipeline_desc.GetPolygonMode())];
+  has_valid_pipeline_ = true;
+}
+
+// |RenderPass|
+void RenderPassMTL::SetCommandLabel(std::string_view label) {
+#ifdef IMPELLER_DEBUG
+  if (is_metal_trace_active_) {
+    has_label_ = true;
+    std::string label_copy(label);
+    [encoder_ pushDebugGroup:@(label_copy.c_str())];
   }
+#endif  // IMPELLER_DEBUG
+}
 
-  return pass.SetSampler(stage, bind_index,
-                         SamplerMTL::Cast(sampler).GetMTLSamplerState());
+// |RenderPass|
+void RenderPassMTL::SetStencilReference(uint32_t value) {
+  [encoder_ setStencilReferenceValue:value];
 }
 
-bool RenderPassMTL::EncodeCommands(const std::shared_ptr<Allocator>& allocator,
-                                   id<MTLRenderCommandEncoder> encoder) const {
-  PassBindingsCache pass_bindings(encoder);
-  auto bind_stage_resources = [&allocator, &pass_bindings](
-                                  const Bindings& bindings,
-                                  ShaderStage stage) -> bool {
-    for (const auto& buffer : bindings.buffers) {
-      if (!Bind(pass_bindings, *allocator, stage, buffer.first,
-                buffer.second.resource)) {
-        return false;
-      }
-    }
-    for (const auto& texture : bindings.textures) {
-      if (!Bind(pass_bindings, stage, texture.first,
-                *texture.second.resource)) {
-        return false;
-      }
-    }
-    for (const auto& sampler : bindings.samplers) {
-      if (!Bind(pass_bindings, stage, sampler.first,
-                *sampler.second.resource)) {
-        return false;
-      }
-    }
-    return true;
-  };
+// |RenderPass|
+void RenderPassMTL::SetBaseVertex(uint64_t value) {
+  base_vertex_ = value;
+}
 
-  const auto target_sample_count = render_target_.GetSampleCount();
+// |RenderPass|
+void RenderPassMTL::SetViewport(Viewport viewport) {
+  pass_bindings_.SetViewport(viewport);
+}
 
-  fml::closure pop_debug_marker = [encoder]() { [encoder popDebugGroup]; };
-  for (const auto& command : commands_) {
-    if (command.index_count == 0u) {
-      continue;
-    }
-    if (command.instance_count == 0u) {
-      continue;
-    }
+// |RenderPass|
+void RenderPassMTL::SetScissor(IRect scissor) {
+  pass_bindings_.SetScissor(scissor);
+}
 
-    fml::ScopedCleanupClosure auto_pop_debug_marker(pop_debug_marker);
-    if (!command.label.empty()) {
-      [encoder pushDebugGroup:@(command.label.c_str())];
-    } else {
-      auto_pop_debug_marker.Release();
-    }
+// |RenderPass|
+void RenderPassMTL::SetInstanceCount(size_t count) {
+  instance_count_ = count;
+}
 
-    const auto& pipeline_desc = command.pipeline->GetDescriptor();
-    if (target_sample_count != pipeline_desc.GetSampleCount()) {
-      VALIDATION_LOG << "Pipeline for command and the render target disagree "
-                        "on sample counts (target was "
-                     << static_cast<uint64_t>(target_sample_count)
-                     << " but pipeline wanted "
-                     << static_cast<uint64_t>(pipeline_desc.GetSampleCount())
-                     << ").";
-      return false;
-    }
+// |RenderPass|
+bool RenderPassMTL::SetVertexBuffer(VertexBuffer buffer) {
+  if (buffer.index_type == IndexType::kUnknown) {
+    return false;
+  }
 
-    pass_bindings.SetRenderPipelineState(
-        PipelineMTL::Cast(*command.pipeline).GetMTLRenderPipelineState());
-    pass_bindings.SetDepthStencilState(
-        PipelineMTL::Cast(*command.pipeline).GetMTLDepthStencilState());
-    pass_bindings.SetViewport(command.viewport.value_or<Viewport>(
-        {.rect = Rect::MakeSize(GetRenderTargetSize())}));
-    pass_bindings.SetScissor(
-        command.scissor.value_or(IRect::MakeSize(GetRenderTargetSize())));
-
-    [encoder setFrontFacingWinding:pipeline_desc.GetWindingOrder() ==
-                                           WindingOrder::kClockwise
-                                       ? MTLWindingClockwise
-                                       : MTLWindingCounterClockwise];
-    [encoder setCullMode:ToMTLCullMode(pipeline_desc.GetCullMode())];
-    [encoder setStencilReferenceValue:command.stencil_reference];
-
-    if (!bind_stage_resources(command.vertex_bindings, ShaderStage::kVertex)) {
-      return false;
-    }
-    if (!bind_stage_resources(command.fragment_bindings,
-                              ShaderStage::kFragment)) {
-      return false;
-    }
-    if (command.index_type == IndexType::kUnknown) {
-      return false;
-    }
-    auto index_buffer = command.index_buffer.buffer;
-    if (!index_buffer) {
-      return false;
-    }
-    auto device_buffer = index_buffer->GetDeviceBuffer(*allocator);
-    if (!device_buffer) {
-      return false;
-    }
-    auto mtl_index_buffer =
-        DeviceBufferMTL::Cast(*device_buffer).GetMTLBuffer();
-    if (!mtl_index_buffer) {
-      return false;
-    }
+  if (!Bind(pass_bindings_, ShaderStage::kVertex,
+            VertexDescriptor::kReservedVertexBufferIndex,
+            buffer.vertex_buffer)) {
+    return false;
+  }
+
+  vertex_count_ = buffer.vertex_count;
+  if (buffer.index_type != IndexType::kNone) {
+    index_type_ = ToMTLIndexType(buffer.index_type);
+    index_buffer_ = std::move(buffer.index_buffer);
+  }
+  return true;
+}
+
+// |RenderPass|
+fml::Status RenderPassMTL::Draw() {
+  if (!has_valid_pipeline_) {
+    return fml::Status(fml::StatusCode::kCancelled, "Invalid pipeline.");
+  }
 
-    const PrimitiveType primitive_type = pipeline_desc.GetPrimitiveType();
-
-    FML_DCHECK(command.index_count *
-                   (command.index_type == IndexType::k16bit ? 2 : 4) ==
-               command.index_buffer.range.length);
-
-    if (command.instance_count != 1u) {
-#if TARGET_OS_SIMULATOR
-      VALIDATION_LOG << "iOS Simulator does not support instanced rendering.";
-      return false;
-#endif
-      [encoder drawIndexedPrimitives:ToMTLPrimitiveType(primitive_type)
-                          indexCount:command.index_count
-                           indexType:ToMTLIndexType(command.index_type)
-                         indexBuffer:mtl_index_buffer
-                   indexBufferOffset:command.index_buffer.range.offset
-                       instanceCount:command.instance_count
-                          baseVertex:command.base_vertex
-                        baseInstance:0u];
+  if (!index_buffer_) {
+    if (instance_count_ != 1u) {
+      [encoder_ drawPrimitives:ToMTLPrimitiveType(primitive_type_)
+                   vertexStart:base_vertex_
+                   vertexCount:vertex_count_
+                 instanceCount:instance_count_
+                  baseInstance:0u];
+    } else {
+      [encoder_ drawPrimitives:ToMTLPrimitiveType(primitive_type_)
+                   vertexStart:base_vertex_
+                   vertexCount:vertex_count_];
+    }
+  } else {
+    id<MTLBuffer> mtl_index_buffer =
+        DeviceBufferMTL::Cast(*index_buffer_.buffer).GetMTLBuffer();
+    if (instance_count_ != 1u) {
+      [encoder_ drawIndexedPrimitives:ToMTLPrimitiveType(primitive_type_)
+                           indexCount:vertex_count_
+                            indexType:index_type_
+                          indexBuffer:mtl_index_buffer
+                    indexBufferOffset:index_buffer_.range.offset
+                        instanceCount:instance_count_
+                           baseVertex:base_vertex_
+                         baseInstance:0u];
     } else {
-      [encoder drawIndexedPrimitives:ToMTLPrimitiveType(primitive_type)
-                          indexCount:command.index_count
-                           indexType:ToMTLIndexType(command.index_type)
-                         indexBuffer:mtl_index_buffer
-                   indexBufferOffset:command.index_buffer.range.offset];
+      [encoder_ drawIndexedPrimitives:ToMTLPrimitiveType(primitive_type_)
+                           indexCount:vertex_count_
+                            indexType:index_type_
+                          indexBuffer:mtl_index_buffer
+                    indexBufferOffset:index_buffer_.range.offset];
     }
   }
-  return true;
+
+#ifdef IMPELLER_DEBUG
+  if (has_label_) {
+    [encoder_ popDebugGroup];
+  }
+#endif  // IMPELLER_DEBUG
+
+  vertex_count_ = 0u;
+  base_vertex_ = 0u;
+  instance_count_ = 1u;
+  index_buffer_ = {};
+  has_valid_pipeline_ = false;
+  has_label_ = false;
+
+  return fml::Status();
+}
+
+// |RenderPass|
+bool RenderPassMTL::BindResource(ShaderStage stage,
+                                 DescriptorType type,
+                                 const ShaderUniformSlot& slot,
+                                 const ShaderMetadata& metadata,
+                                 BufferView view) {
+  return Bind(pass_bindings_, stage, slot.ext_res_0, view);
+}
+
+// |RenderPass|
+bool RenderPassMTL::BindResource(
+    ShaderStage stage,
+    DescriptorType type,
+    const ShaderUniformSlot& slot,
+    const std::shared_ptr<const ShaderMetadata>& metadata,
+    BufferView view) {
+  return Bind(pass_bindings_, stage, slot.ext_res_0, view);
+}
+
+// |RenderPass|
+bool RenderPassMTL::BindResource(
+    ShaderStage stage,
+    DescriptorType type,
+    const SampledImageSlot& slot,
+    const ShaderMetadata& metadata,
+    std::shared_ptr<const Texture> texture,
+    const std::unique_ptr<const Sampler>& sampler) {
+  return Bind(pass_bindings_, stage, slot.texture_index, sampler, *texture);
 }
 
 }  // namespace impeller
diff --git a/impeller/renderer/backend/metal/sampler_library_mtl.h b/impeller/renderer/backend/metal/sampler_library_mtl.h
index 74297ebcb53201991e734ccbd6f79c27e57b8874..30cee20ae6f0d0ab874733352366a9194df95432 100644
--- a/impeller/renderer/backend/metal/sampler_library_mtl.h
+++ b/impeller/renderer/backend/metal/sampler_library_mtl.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_SAMPLER_LIBRARY_MTL_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_SAMPLER_LIBRARY_MTL_H_
 
 #include <Metal/Metal.h>
 
@@ -11,7 +12,7 @@
 #include "flutter/fml/macros.h"
 #include "impeller/base/backend_cast.h"
 #include "impeller/base/comparable.h"
-#include "impeller/renderer/sampler_descriptor.h"
+#include "impeller/core/sampler_descriptor.h"
 #include "impeller/renderer/sampler_library.h"
 
 namespace impeller {
@@ -29,13 +30,17 @@ class SamplerLibraryMTL final
   id<MTLDevice> device_ = nullptr;
   SamplerMap samplers_;
 
-  SamplerLibraryMTL(id<MTLDevice> device);
+  explicit SamplerLibraryMTL(id<MTLDevice> device);
 
   // |SamplerLibrary|
-  std::shared_ptr<const Sampler> GetSampler(
+  const std::unique_ptr<const Sampler>& GetSampler(
       SamplerDescriptor descriptor) override;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(SamplerLibraryMTL);
+  SamplerLibraryMTL(const SamplerLibraryMTL&) = delete;
+
+  SamplerLibraryMTL& operator=(const SamplerLibraryMTL&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_SAMPLER_LIBRARY_MTL_H_
diff --git a/impeller/renderer/backend/metal/sampler_library_mtl.mm b/impeller/renderer/backend/metal/sampler_library_mtl.mm
index c9099c509e64696b0506d329219d25ed157f8064..0f24029b42ea1fdac4c6f632d75d717b802ba59e 100644
--- a/impeller/renderer/backend/metal/sampler_library_mtl.mm
+++ b/impeller/renderer/backend/metal/sampler_library_mtl.mm
@@ -13,14 +13,16 @@ SamplerLibraryMTL::SamplerLibraryMTL(id<MTLDevice> device) : device_(device) {}
 
 SamplerLibraryMTL::~SamplerLibraryMTL() = default;
 
-std::shared_ptr<const Sampler> SamplerLibraryMTL::GetSampler(
+static const std::unique_ptr<const Sampler> kNullSampler = nullptr;
+
+const std::unique_ptr<const Sampler>& SamplerLibraryMTL::GetSampler(
     SamplerDescriptor descriptor) {
   auto found = samplers_.find(descriptor);
   if (found != samplers_.end()) {
     return found->second;
   }
   if (!device_) {
-    return nullptr;
+    return kNullSampler;
   }
   auto desc = [[MTLSamplerDescriptor alloc] init];
   desc.minFilter = ToMTLSamplerMinMagFilter(descriptor.min_filter);
@@ -29,22 +31,21 @@ std::shared_ptr<const Sampler> SamplerLibraryMTL::GetSampler(
   desc.sAddressMode = ToMTLSamplerAddressMode(descriptor.width_address_mode);
   desc.tAddressMode = ToMTLSamplerAddressMode(descriptor.height_address_mode);
   desc.rAddressMode = ToMTLSamplerAddressMode(descriptor.depth_address_mode);
-
+  if (@available(iOS 14.0, macos 10.12, *)) {
+    desc.borderColor = MTLSamplerBorderColorTransparentBlack;
+  }
   if (!descriptor.label.empty()) {
     desc.label = @(descriptor.label.c_str());
   }
 
   auto mtl_sampler = [device_ newSamplerStateWithDescriptor:desc];
   if (!mtl_sampler) {
-    return nullptr;
+    return kNullSampler;
   }
   auto sampler =
-      std::shared_ptr<SamplerMTL>(new SamplerMTL(descriptor, mtl_sampler));
-  if (!sampler->IsValid()) {
-    return nullptr;
-  }
-  samplers_[descriptor] = sampler;
-  return sampler;
+      std::unique_ptr<SamplerMTL>(new SamplerMTL(descriptor, mtl_sampler));
+
+  return (samplers_[descriptor] = std::move(sampler));
 }
 
 }  // namespace impeller
diff --git a/impeller/renderer/backend/metal/sampler_mtl.h b/impeller/renderer/backend/metal/sampler_mtl.h
index dc26deff6810850bb27bc1acbec979b780458b29..7a9062d1249fb81ac2eeffdc49812258701b41fc 100644
--- a/impeller/renderer/backend/metal/sampler_mtl.h
+++ b/impeller/renderer/backend/metal/sampler_mtl.h
@@ -2,13 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_SAMPLER_MTL_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_SAMPLER_MTL_H_
 
 #include <Metal/Metal.h>
 
 #include "flutter/fml/macros.h"
 #include "impeller/base/backend_cast.h"
-#include "impeller/renderer/sampler.h"
+#include "impeller/core/sampler.h"
 
 namespace impeller {
 
@@ -31,10 +32,11 @@ class SamplerMTL final : public Sampler,
 
   SamplerMTL(SamplerDescriptor desc, id<MTLSamplerState> state);
 
-  // |Sampler|
-  bool IsValid() const override;
+  SamplerMTL(const SamplerMTL&) = delete;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(SamplerMTL);
+  SamplerMTL& operator=(const SamplerMTL&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_SAMPLER_MTL_H_
diff --git a/impeller/renderer/backend/metal/sampler_mtl.mm b/impeller/renderer/backend/metal/sampler_mtl.mm
index 97ada0c0aebb9b8ed010532baeeba366111a42d5..71bcd08e3138f54a4d794d199134688ab38bc442 100644
--- a/impeller/renderer/backend/metal/sampler_mtl.mm
+++ b/impeller/renderer/backend/metal/sampler_mtl.mm
@@ -7,14 +7,12 @@
 namespace impeller {
 
 SamplerMTL::SamplerMTL(SamplerDescriptor desc, id<MTLSamplerState> state)
-    : Sampler(std::move(desc)), state_(state) {}
+    : Sampler(std::move(desc)), state_(state) {
+  FML_DCHECK(state_);
+}
 
 SamplerMTL::~SamplerMTL() = default;
 
-bool SamplerMTL::IsValid() const {
-  return state_;
-}
-
 id<MTLSamplerState> SamplerMTL::GetMTLSamplerState() const {
   return state_;
 }
diff --git a/impeller/renderer/backend/metal/shader_function_mtl.h b/impeller/renderer/backend/metal/shader_function_mtl.h
index e7f43c886b1cbf58ffed560f18b71981ef45316a..7375421b02e744a7bb962e3af360ff4f3dbc3cf8 100644
--- a/impeller/renderer/backend/metal/shader_function_mtl.h
+++ b/impeller/renderer/backend/metal/shader_function_mtl.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_SHADER_FUNCTION_MTL_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_SHADER_FUNCTION_MTL_H_
 
 #include <Metal/Metal.h>
 
@@ -21,17 +22,28 @@ class ShaderFunctionMTL final
 
   id<MTLFunction> GetMTLFunction() const;
 
+  using CompileCallback = std::function<void(id<MTLFunction>)>;
+
+  void GetMTLFunctionSpecialized(const std::vector<Scalar>& constants,
+                                 const CompileCallback& callback) const;
+
  private:
   friend class ShaderLibraryMTL;
 
   id<MTLFunction> function_ = nullptr;
+  id<MTLLibrary> library_ = nullptr;
 
   ShaderFunctionMTL(UniqueID parent_library_id,
                     id<MTLFunction> function,
+                    id<MTLLibrary> library,
                     std::string name,
                     ShaderStage stage);
 
-  FML_DISALLOW_COPY_AND_ASSIGN(ShaderFunctionMTL);
+  ShaderFunctionMTL(const ShaderFunctionMTL&) = delete;
+
+  ShaderFunctionMTL& operator=(const ShaderFunctionMTL&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_SHADER_FUNCTION_MTL_H_
diff --git a/impeller/renderer/backend/metal/shader_function_mtl.mm b/impeller/renderer/backend/metal/shader_function_mtl.mm
index 04751af1b8f139ebea9553ba8280e7a5e09dfa63..39910a6301c1f9f5253c88077efce07fed286f5d 100644
--- a/impeller/renderer/backend/metal/shader_function_mtl.mm
+++ b/impeller/renderer/backend/metal/shader_function_mtl.mm
@@ -8,13 +8,37 @@ namespace impeller {
 
 ShaderFunctionMTL::ShaderFunctionMTL(UniqueID parent_library_id,
                                      id<MTLFunction> function,
+                                     id<MTLLibrary> library,
                                      std::string name,
                                      ShaderStage stage)
     : ShaderFunction(parent_library_id, std::move(name), stage),
-      function_(function) {}
+      function_(function),
+      library_(library) {}
 
 ShaderFunctionMTL::~ShaderFunctionMTL() = default;
 
+void ShaderFunctionMTL::GetMTLFunctionSpecialized(
+    const std::vector<Scalar>& constants,
+    const CompileCallback& callback) const {
+  MTLFunctionConstantValues* constantValues =
+      [[MTLFunctionConstantValues alloc] init];
+  size_t index = 0;
+  for (const auto value : constants) {
+    Scalar copied_value = value;
+    [constantValues setConstantValue:&copied_value
+                                type:MTLDataTypeFloat
+                             atIndex:index];
+    index++;
+  }
+  CompileCallback callback_value = callback;
+  [library_ newFunctionWithName:@(GetName().data())
+                 constantValues:constantValues
+              completionHandler:^(id<MTLFunction> _Nullable function,
+                                  NSError* _Nullable error) {
+                callback_value(function);
+              }];
+}
+
 id<MTLFunction> ShaderFunctionMTL::GetMTLFunction() const {
   return function_;
 }
diff --git a/impeller/renderer/backend/metal/shader_library_mtl.h b/impeller/renderer/backend/metal/shader_library_mtl.h
index d38d1b5a3308907b1bd4cc8a6f51a5aa0aee8506..756cf5fe4c95f798c1e74ac542ee4021a760780b 100644
--- a/impeller/renderer/backend/metal/shader_library_mtl.h
+++ b/impeller/renderer/backend/metal/shader_library_mtl.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_SHADER_LIBRARY_MTL_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_SHADER_LIBRARY_MTL_H_
 
 #include <Foundation/Foundation.h>
 #include <Metal/Metal.h>
@@ -39,7 +40,7 @@ class ShaderLibraryMTL final : public ShaderLibrary {
   ShaderFunctionMap functions_;
   bool is_valid_ = false;
 
-  ShaderLibraryMTL(NSArray<id<MTLLibrary>>* libraries);
+  explicit ShaderLibraryMTL(NSArray<id<MTLLibrary>>* libraries);
 
   // |ShaderLibrary|
   std::shared_ptr<const ShaderFunction> GetFunction(std::string_view name,
@@ -58,7 +59,11 @@ class ShaderLibraryMTL final : public ShaderLibrary {
 
   void RegisterLibrary(id<MTLLibrary> library);
 
-  FML_DISALLOW_COPY_AND_ASSIGN(ShaderLibraryMTL);
+  ShaderLibraryMTL(const ShaderLibraryMTL&) = delete;
+
+  ShaderLibraryMTL& operator=(const ShaderLibraryMTL&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_SHADER_LIBRARY_MTL_H_
diff --git a/impeller/renderer/backend/metal/shader_library_mtl.mm b/impeller/renderer/backend/metal/shader_library_mtl.mm
index 94fb1e335b16dfbe866cf79d9c68b2b59c19e9c3..a1aedd9a54857c45ab3695da1ef2e24b43d09923 100644
--- a/impeller/renderer/backend/metal/shader_library_mtl.mm
+++ b/impeller/renderer/backend/metal/shader_library_mtl.mm
@@ -32,8 +32,6 @@ static MTLFunctionType ToMTLFunctionType(ShaderStage stage) {
     case ShaderStage::kFragment:
       return MTLFunctionTypeFragment;
     case ShaderStage::kUnknown:
-    case ShaderStage::kTessellationControl:
-    case ShaderStage::kTessellationEvaluation:
     case ShaderStage::kCompute:
       return MTLFunctionTypeKernel;
   }
@@ -55,6 +53,7 @@ std::shared_ptr<const ShaderFunction> ShaderLibraryMTL::GetFunction(
   ShaderKey key(name, stage);
 
   id<MTLFunction> function = nil;
+  id<MTLLibrary> library = nil;
 
   {
     ReaderLock lock(libraries_mutex_);
@@ -64,7 +63,8 @@ std::shared_ptr<const ShaderFunction> ShaderLibraryMTL::GetFunction(
     }
 
     for (size_t i = 0, count = [libraries_ count]; i < count; i++) {
-      function = [libraries_[i] newFunctionWithName:@(name.data())];
+      library = libraries_[i];
+      function = [library newFunctionWithName:@(name.data())];
       if (function) {
         break;
       }
@@ -81,7 +81,7 @@ std::shared_ptr<const ShaderFunction> ShaderLibraryMTL::GetFunction(
     }
 
     auto func = std::shared_ptr<ShaderFunctionMTL>(new ShaderFunctionMTL(
-        library_id_, function, {name.data(), name.size()}, stage));
+        library_id_, function, library, {name.data(), name.size()}, stage));
     functions_[key] = func;
 
     return func;
diff --git a/impeller/renderer/backend/metal/surface_mtl.h b/impeller/renderer/backend/metal/surface_mtl.h
index e922b8ac46283ee1a6d44ce405f2e26be2785648..a933ecff87a36e5dc273901c88d732b035845705 100644
--- a/impeller/renderer/backend/metal/surface_mtl.h
+++ b/impeller/renderer/backend/metal/surface_mtl.h
@@ -2,11 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_SURFACE_MTL_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_SURFACE_MTL_H_
 
 #include <QuartzCore/CAMetalLayer.h>
+#include <memory>
 
 #include "flutter/fml/macros.h"
+#include "impeller/geometry/rect.h"
 #include "impeller/renderer/context.h"
 #include "impeller/renderer/surface.h"
 
@@ -32,23 +35,58 @@ class SurfaceMTL final : public Surface {
   ///
   /// @return     A pointer to the wrapped surface or null.
   ///
-  static std::unique_ptr<Surface> WrapCurrentMetalLayerDrawable(
+  static id<CAMetalDrawable> GetMetalDrawableAndValidate(
       const std::shared_ptr<Context>& context,
       CAMetalLayer* layer);
+
+  static std::unique_ptr<SurfaceMTL> MakeFromMetalLayerDrawable(
+      const std::shared_ptr<Context>& context,
+      id<CAMetalDrawable> drawable,
+      std::optional<IRect> clip_rect = std::nullopt);
+
+  static std::unique_ptr<SurfaceMTL> MakeFromTexture(
+      const std::shared_ptr<Context>& context,
+      id<MTLTexture> texture,
+      std::optional<IRect> clip_rect,
+      id<CAMetalDrawable> drawable = nil);
 #pragma GCC diagnostic pop
 
   // |Surface|
   ~SurfaceMTL() override;
 
- private:
-  id<MTLDrawable> drawable_ = nil;
+  id<MTLDrawable> drawable() const { return drawable_; }
 
-  SurfaceMTL(const RenderTarget& target, id<MTLDrawable> drawable);
+  // Returns a Rect defining the area of the surface in device pixels
+  IRect coverage() const;
 
   // |Surface|
   bool Present() const override;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(SurfaceMTL);
+ private:
+  std::weak_ptr<Context> context_;
+  std::shared_ptr<Texture> resolve_texture_;
+  id<CAMetalDrawable> drawable_ = nil;
+  std::shared_ptr<Texture> source_texture_;
+  std::shared_ptr<Texture> destination_texture_;
+  bool requires_blit_ = false;
+  std::optional<IRect> clip_rect_;
+
+  static bool ShouldPerformPartialRepaint(std::optional<IRect> damage_rect);
+
+  SurfaceMTL(const std::weak_ptr<Context>& context,
+             const RenderTarget& target,
+             std::shared_ptr<Texture> resolve_texture,
+             id<CAMetalDrawable> drawable,
+             std::shared_ptr<Texture> source_texture,
+             std::shared_ptr<Texture> destination_texture,
+             bool requires_blit,
+             std::optional<IRect> clip_rect);
+
+  SurfaceMTL(const SurfaceMTL&) = delete;
+
+  SurfaceMTL& operator=(const SurfaceMTL&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_SURFACE_MTL_H_
diff --git a/impeller/renderer/backend/metal/surface_mtl.mm b/impeller/renderer/backend/metal/surface_mtl.mm
index 1a2d06b09ca12e062e2974e7db44e6b69c36875b..117ef36ab13e94ee0471821ca7afc31244b7f0ff 100644
--- a/impeller/renderer/backend/metal/surface_mtl.mm
+++ b/impeller/renderer/backend/metal/surface_mtl.mm
@@ -5,17 +5,24 @@
 #include "impeller/renderer/backend/metal/surface_mtl.h"
 
 #include "flutter/fml/trace_event.h"
+#include "flutter/impeller/renderer/command_buffer.h"
 #include "impeller/base/validation.h"
+#include "impeller/core/texture_descriptor.h"
+#include "impeller/renderer/backend/metal/context_mtl.h"
 #include "impeller/renderer/backend/metal/formats_mtl.h"
 #include "impeller/renderer/backend/metal/texture_mtl.h"
 #include "impeller/renderer/render_target.h"
 
+@protocol FlutterMetalDrawable <MTLDrawable>
+- (void)flutterPrepareForPresent:(nonnull id<MTLCommandBuffer>)commandBuffer;
+@end
+
 namespace impeller {
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunguarded-availability-new"
 
-std::unique_ptr<Surface> SurfaceMTL::WrapCurrentMetalLayerDrawable(
+id<CAMetalDrawable> SurfaceMTL::GetMetalDrawableAndValidate(
     const std::shared_ptr<Context>& context,
     CAMetalLayer* layer) {
   TRACE_EVENT0("impeller", "SurfaceMTL::WrapCurrentMetalLayerDrawable");
@@ -34,94 +41,251 @@ std::unique_ptr<Surface> SurfaceMTL::WrapCurrentMetalLayerDrawable(
     VALIDATION_LOG << "Could not acquire current drawable.";
     return nullptr;
   }
+  return current_drawable;
+}
 
-  const auto color_format =
-      FromMTLPixelFormat(current_drawable.texture.pixelFormat);
+static std::optional<RenderTarget> WrapTextureWithRenderTarget(
+    Allocator& allocator,
+    id<MTLTexture> texture,
+    bool requires_blit,
+    std::optional<IRect> clip_rect) {
+  // compositor_context.cc will offset the rendering by the clip origin. Here we
+  // shrink to the size of the clip. This has the same effect as clipping the
+  // rendering but also creates smaller intermediate passes.
+  ISize root_size;
+  if (requires_blit) {
+    if (!clip_rect.has_value()) {
+      VALIDATION_LOG << "Missing clip rectangle.";
+      return std::nullopt;
+    }
+    root_size = ISize(clip_rect->GetWidth(), clip_rect->GetHeight());
+  } else {
+    root_size = {static_cast<ISize::Type>(texture.width),
+                 static_cast<ISize::Type>(texture.height)};
+  }
 
-  if (color_format == PixelFormat::kUnknown) {
+  TextureDescriptor resolve_tex_desc;
+  resolve_tex_desc.format = FromMTLPixelFormat(texture.pixelFormat);
+  resolve_tex_desc.size = root_size;
+  resolve_tex_desc.usage =
+      TextureUsage::kRenderTarget | TextureUsage::kShaderRead;
+  resolve_tex_desc.sample_count = SampleCount::kCount1;
+  resolve_tex_desc.storage_mode = StorageMode::kDevicePrivate;
+
+  if (resolve_tex_desc.format == PixelFormat::kUnknown) {
     VALIDATION_LOG << "Unknown drawable color format.";
-    return nullptr;
+    return std::nullopt;
   }
 
-  TextureDescriptor color0_tex_desc;
-  color0_tex_desc.storage_mode = StorageMode::kDeviceTransient;
-  color0_tex_desc.type = TextureType::kTexture2DMultisample;
-  color0_tex_desc.sample_count = SampleCount::kCount4;
-  color0_tex_desc.format = color_format;
-  color0_tex_desc.size = {
-      static_cast<ISize::Type>(current_drawable.texture.width),
-      static_cast<ISize::Type>(current_drawable.texture.height)};
-  color0_tex_desc.usage = static_cast<uint64_t>(TextureUsage::kRenderTarget);
-
-  auto msaa_tex =
-      context->GetResourceAllocator()->CreateTexture(color0_tex_desc);
-  if (!msaa_tex) {
-    VALIDATION_LOG << "Could not allocate MSAA resolve texture.";
-    return nullptr;
+  // Create color resolve texture.
+  std::shared_ptr<Texture> resolve_tex;
+  if (requires_blit) {
+    resolve_tex_desc.compression_type = CompressionType::kLossy;
+    resolve_tex = allocator.CreateTexture(resolve_tex_desc);
+  } else {
+    resolve_tex = TextureMTL::Create(resolve_tex_desc, texture);
   }
 
-  msaa_tex->SetLabel("ImpellerOnscreenColorMSAA");
+  if (!resolve_tex) {
+    VALIDATION_LOG << "Could not wrap resolve texture.";
+    return std::nullopt;
+  }
+  resolve_tex->SetLabel("ImpellerOnscreenResolve");
+
+  TextureDescriptor msaa_tex_desc;
+  msaa_tex_desc.storage_mode = StorageMode::kDeviceTransient;
+  msaa_tex_desc.type = TextureType::kTexture2DMultisample;
+  msaa_tex_desc.sample_count = SampleCount::kCount4;
+  msaa_tex_desc.format = resolve_tex->GetTextureDescriptor().format;
+  msaa_tex_desc.size = resolve_tex->GetSize();
+  msaa_tex_desc.usage = TextureUsage::kRenderTarget;
 
-  TextureDescriptor color0_resolve_tex_desc;
-  color0_resolve_tex_desc.format = color_format;
-  color0_resolve_tex_desc.size = color0_tex_desc.size;
-  color0_resolve_tex_desc.usage =
-      static_cast<uint64_t>(TextureUsage::kRenderTarget);
-  color0_resolve_tex_desc.storage_mode = StorageMode::kDevicePrivate;
+  auto msaa_tex = allocator.CreateTexture(msaa_tex_desc);
+  if (!msaa_tex) {
+    VALIDATION_LOG << "Could not allocate MSAA color texture.";
+    return std::nullopt;
+  }
+  msaa_tex->SetLabel("ImpellerOnscreenColorMSAA");
 
   ColorAttachment color0;
   color0.texture = msaa_tex;
   color0.clear_color = Color::DarkSlateGray();
   color0.load_action = LoadAction::kClear;
   color0.store_action = StoreAction::kMultisampleResolve;
-  color0.resolve_texture = std::make_shared<TextureMTL>(
-      color0_resolve_tex_desc, current_drawable.texture);
-
-  TextureDescriptor stencil0_tex;
-  stencil0_tex.storage_mode = StorageMode::kDeviceTransient;
-  stencil0_tex.type = TextureType::kTexture2DMultisample;
-  stencil0_tex.sample_count = SampleCount::kCount4;
-  stencil0_tex.format = PixelFormat::kDefaultStencil;
-  stencil0_tex.size = color0_tex_desc.size;
-  stencil0_tex.usage =
-      static_cast<TextureUsageMask>(TextureUsage::kRenderTarget);
-  auto stencil_texture =
-      context->GetResourceAllocator()->CreateTexture(stencil0_tex);
-
-  if (!stencil_texture) {
-    VALIDATION_LOG << "Could not create stencil texture.";
+  color0.resolve_texture = std::move(resolve_tex);
+
+  auto render_target_desc = std::make_optional<RenderTarget>();
+  render_target_desc->SetColorAttachment(color0, 0u);
+
+  return render_target_desc;
+}
+
+std::unique_ptr<SurfaceMTL> SurfaceMTL::MakeFromMetalLayerDrawable(
+    const std::shared_ptr<Context>& context,
+    id<CAMetalDrawable> drawable,
+    std::optional<IRect> clip_rect) {
+  return SurfaceMTL::MakeFromTexture(context, drawable.texture, clip_rect,
+                                     drawable);
+}
+
+std::unique_ptr<SurfaceMTL> SurfaceMTL::MakeFromTexture(
+    const std::shared_ptr<Context>& context,
+    id<MTLTexture> texture,
+    std::optional<IRect> clip_rect,
+    id<CAMetalDrawable> drawable) {
+  bool partial_repaint_blit_required = ShouldPerformPartialRepaint(clip_rect);
+
+  // The returned render target is the texture that Impeller will render the
+  // root pass to. If partial repaint is in use, this may be a new texture which
+  // is smaller than the given MTLTexture.
+  auto render_target =
+      WrapTextureWithRenderTarget(*context->GetResourceAllocator(), texture,
+                                  partial_repaint_blit_required, clip_rect);
+  if (!render_target) {
     return nullptr;
   }
-  stencil_texture->SetLabel("ImpellerOnscreenStencil");
 
-  StencilAttachment stencil0;
-  stencil0.texture = stencil_texture;
-  stencil0.clear_stencil = 0;
-  stencil0.load_action = LoadAction::kClear;
-  stencil0.store_action = StoreAction::kDontCare;
+  // If partial repainting, set a "source" texture. The presence of a source
+  // texture and clip rect instructs the surface to blit this texture to the
+  // destination texture.
+  auto source_texture = partial_repaint_blit_required
+                            ? render_target->GetRenderTargetTexture()
+                            : nullptr;
 
-  RenderTarget render_target_desc;
-  render_target_desc.SetColorAttachment(color0, 0u);
-  render_target_desc.SetStencilAttachment(stencil0);
+  // The final "destination" texture is the texture that will be presented. In
+  // this case, it's always the given drawable.
+  std::shared_ptr<Texture> destination_texture;
+  if (partial_repaint_blit_required) {
+    // If blitting for partial repaint, we need to wrap the drawable. Simply
+    // reuse the texture descriptor that was already formed for the new render
+    // target, but override the size with the drawable's size.
+    auto destination_descriptor =
+        render_target->GetRenderTargetTexture()->GetTextureDescriptor();
+    destination_descriptor.size = {static_cast<ISize::Type>(texture.width),
+                                   static_cast<ISize::Type>(texture.height)};
+    destination_texture = TextureMTL::Wrapper(destination_descriptor, texture);
+  } else {
+    // When not partial repaint blit is needed, the render target texture _is_
+    // the drawable texture.
+    destination_texture = render_target->GetRenderTargetTexture();
+  }
 
-  // The constructor is private. So make_unique may not be used.
-  return std::unique_ptr<SurfaceMTL>(
-      new SurfaceMTL(render_target_desc, current_drawable));
+  return std::unique_ptr<SurfaceMTL>(new SurfaceMTL(
+      context,                                  // context
+      *render_target,                           // target
+      render_target->GetRenderTargetTexture(),  // resolve_texture
+      drawable,                                 // drawable
+      source_texture,                           // source_texture
+      destination_texture,                      // destination_texture
+      partial_repaint_blit_required,            // requires_blit
+      clip_rect                                 // clip_rect
+      ));
 }
 
-SurfaceMTL::SurfaceMTL(const RenderTarget& target, id<MTLDrawable> drawable)
-    : Surface(target), drawable_(drawable) {}
+SurfaceMTL::SurfaceMTL(const std::weak_ptr<Context>& context,
+                       const RenderTarget& target,
+                       std::shared_ptr<Texture> resolve_texture,
+                       id<CAMetalDrawable> drawable,
+                       std::shared_ptr<Texture> source_texture,
+                       std::shared_ptr<Texture> destination_texture,
+                       bool requires_blit,
+                       std::optional<IRect> clip_rect)
+    : Surface(target),
+      context_(context),
+      resolve_texture_(std::move(resolve_texture)),
+      drawable_(drawable),
+      source_texture_(std::move(source_texture)),
+      destination_texture_(std::move(destination_texture)),
+      requires_blit_(requires_blit),
+      clip_rect_(clip_rect) {}
 
 // |Surface|
 SurfaceMTL::~SurfaceMTL() = default;
 
+bool SurfaceMTL::ShouldPerformPartialRepaint(std::optional<IRect> damage_rect) {
+  // compositor_context.cc will conditionally disable partial repaint if the
+  // damage region is large. If that happened, then a nullopt damage rect
+  // will be provided here.
+  if (!damage_rect.has_value()) {
+    return false;
+  }
+  // If the damage rect is 0 in at least one dimension, partial repaint isn't
+  // performed as we skip right to present.
+  if (damage_rect->IsEmpty()) {
+    return false;
+  }
+  return true;
+}
+
+// |Surface|
+IRect SurfaceMTL::coverage() const {
+  return IRect::MakeSize(resolve_texture_->GetSize());
+}
+
 // |Surface|
 bool SurfaceMTL::Present() const {
-  if (drawable_ == nil) {
+  auto context = context_.lock();
+  if (!context) {
     return false;
   }
 
-  [drawable_ present];
+  if (requires_blit_) {
+    if (!(source_texture_ && destination_texture_)) {
+      return false;
+    }
+
+    auto blit_command_buffer = context->CreateCommandBuffer();
+    if (!blit_command_buffer) {
+      return false;
+    }
+    auto blit_pass = blit_command_buffer->CreateBlitPass();
+    if (!clip_rect_.has_value()) {
+      VALIDATION_LOG << "Missing clip rectangle.";
+      return false;
+    }
+    blit_pass->AddCopy(source_texture_, destination_texture_, std::nullopt,
+                       clip_rect_->GetOrigin());
+    blit_pass->EncodeCommands(context->GetResourceAllocator());
+    if (!context->GetCommandQueue()->Submit({blit_command_buffer}).ok()) {
+      return false;
+    }
+  }
+#ifdef IMPELLER_DEBUG
+  ContextMTL::Cast(context.get())->GetGPUTracer()->MarkFrameEnd();
+#endif  // IMPELLER_DEBUG
+
+  if (drawable_) {
+    id<MTLCommandBuffer> command_buffer =
+        ContextMTL::Cast(context.get())
+            ->CreateMTLCommandBuffer("Present Waiter Command Buffer");
+
+    id<CAMetalDrawable> metal_drawable =
+        reinterpret_cast<id<CAMetalDrawable>>(drawable_);
+    if ([metal_drawable conformsToProtocol:@protocol(FlutterMetalDrawable)]) {
+      [(id<FlutterMetalDrawable>)metal_drawable
+          flutterPrepareForPresent:command_buffer];
+    }
+
+    // If the threads have been merged, or there is a pending frame capture,
+    // then block on cmd buffer scheduling to ensure that the
+    // transaction/capture work correctly.
+    if ([[NSThread currentThread] isMainThread] ||
+        [[MTLCaptureManager sharedCaptureManager] isCapturing]) {
+      TRACE_EVENT0("flutter", "waitUntilScheduled");
+      [command_buffer commit];
+      [command_buffer waitUntilScheduled];
+      [drawable_ present];
+    } else {
+      // The drawable may come from a FlutterMetalLayer, so it can't be
+      // presented through the command buffer.
+      id<CAMetalDrawable> drawable = drawable_;
+      [command_buffer addScheduledHandler:^(id<MTLCommandBuffer> buffer) {
+        [drawable present];
+      }];
+      [command_buffer commit];
+    }
+  }
+
   return true;
 }
 #pragma GCC diagnostic pop
diff --git a/impeller/renderer/backend/metal/texture_mtl.h b/impeller/renderer/backend/metal/texture_mtl.h
index 1aedbeacaa6afb6f4a2de9f0cccd7960e1e6dbba..0e6992af5b534ccdab6bbed59e8d6a25a6834b77 100644
--- a/impeller/renderer/backend/metal/texture_mtl.h
+++ b/impeller/renderer/backend/metal/texture_mtl.h
@@ -2,25 +2,36 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_TEXTURE_MTL_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_TEXTURE_MTL_H_
 
 #include <Metal/Metal.h>
 
 #include "flutter/fml/macros.h"
 #include "impeller/base/backend_cast.h"
-#include "impeller/renderer/texture.h"
+#include "impeller/core/texture.h"
 
 namespace impeller {
 
 class TextureMTL final : public Texture,
                          public BackendCast<TextureMTL, Texture> {
  public:
+  /// @brief This callback needs to always return the same texture when called
+  ///        multiple times.
+  using AcquireTextureProc = std::function<id<MTLTexture>()>;
+
   TextureMTL(TextureDescriptor desc,
-             id<MTLTexture> texture,
-             bool wrapped = false);
+             const AcquireTextureProc& aquire_proc,
+             bool wrapped = false,
+             bool drawable = false);
+
+  static std::shared_ptr<TextureMTL> Wrapper(
+      TextureDescriptor desc,
+      id<MTLTexture> texture,
+      std::function<void()> deletion_proc = nullptr);
 
-  static std::shared_ptr<TextureMTL> Wrapper(TextureDescriptor desc,
-                                             id<MTLTexture> texture);
+  static std::shared_ptr<TextureMTL> Create(TextureDescriptor desc,
+                                            id<MTLTexture> texture);
 
   // |Texture|
   ~TextureMTL() override;
@@ -29,10 +40,19 @@ class TextureMTL final : public Texture,
 
   bool IsWrapped() const;
 
+  /// @brief Whether or not this texture is wrapping a Metal drawable.
+  bool IsDrawable() const;
+
+  // |Texture|
+  bool IsValid() const override;
+
+  bool GenerateMipmap(id<MTLBlitCommandEncoder> encoder);
+
  private:
-  id<MTLTexture> texture_ = nullptr;
+  AcquireTextureProc aquire_proc_ = {};
   bool is_valid_ = false;
   bool is_wrapped_ = false;
+  bool is_drawable_ = false;
 
   // |Texture|
   void SetLabel(std::string_view label) override;
@@ -45,14 +65,14 @@ class TextureMTL final : public Texture,
   // |Texture|
   bool OnSetContents(std::shared_ptr<const fml::Mapping> mapping,
                      size_t slice) override;
-
-  // |Texture|
-  bool IsValid() const override;
-
   // |Texture|
   ISize GetSize() const override;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(TextureMTL);
+  TextureMTL(const TextureMTL&) = delete;
+
+  TextureMTL& operator=(const TextureMTL&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_TEXTURE_MTL_H_
diff --git a/impeller/renderer/backend/metal/texture_mtl.mm b/impeller/renderer/backend/metal/texture_mtl.mm
index 6877c1b871ac99a88452d598be6c087821f5673f..d65937e8b9f09e1bd67d8b8eb5fbc023549117d3 100644
--- a/impeller/renderer/backend/metal/texture_mtl.mm
+++ b/impeller/renderer/backend/metal/texture_mtl.mm
@@ -3,19 +3,28 @@
 // found in the LICENSE file.
 
 #include "impeller/renderer/backend/metal/texture_mtl.h"
+#include <memory>
 
 #include "impeller/base/validation.h"
-#include "impeller/renderer/texture_descriptor.h"
+#include "impeller/core/texture_descriptor.h"
 
 namespace impeller {
 
+std::shared_ptr<Texture> WrapperMTL(TextureDescriptor desc,
+                                    const void* mtl_texture,
+                                    std::function<void()> deletion_proc) {
+  return TextureMTL::Wrapper(desc, (__bridge id<MTLTexture>)mtl_texture,
+                             std::move(deletion_proc));
+}
+
 TextureMTL::TextureMTL(TextureDescriptor p_desc,
-                       id<MTLTexture> texture,
-                       bool wrapped)
-    : Texture(p_desc), texture_(texture) {
+                       const AcquireTextureProc& aquire_proc,
+                       bool wrapped,
+                       bool drawable)
+    : Texture(p_desc), aquire_proc_(aquire_proc), is_drawable_(drawable) {
   const auto& desc = GetTextureDescriptor();
 
-  if (!desc.IsValid() || !texture_) {
+  if (!desc.IsValid() || !aquire_proc) {
     return;
   }
 
@@ -28,15 +37,35 @@ TextureMTL::TextureMTL(TextureDescriptor p_desc,
   is_valid_ = true;
 }
 
-std::shared_ptr<TextureMTL> TextureMTL::Wrapper(TextureDescriptor desc,
-                                                id<MTLTexture> texture) {
-  return std::make_shared<TextureMTL>(desc, texture, true);
+std::shared_ptr<TextureMTL> TextureMTL::Wrapper(
+    TextureDescriptor desc,
+    id<MTLTexture> texture,
+    std::function<void()> deletion_proc) {
+  if (deletion_proc) {
+    return std::shared_ptr<TextureMTL>(
+        new TextureMTL(
+            desc, [texture]() { return texture; }, true),
+        [deletion_proc = std::move(deletion_proc)](TextureMTL* t) {
+          deletion_proc();
+          delete t;
+        });
+  }
+  return std::shared_ptr<TextureMTL>(
+      new TextureMTL(desc, [texture]() { return texture; }, true));
+}
+
+std::shared_ptr<TextureMTL> TextureMTL::Create(TextureDescriptor desc,
+                                               id<MTLTexture> texture) {
+  return std::make_shared<TextureMTL>(desc, [texture]() { return texture; });
 }
 
 TextureMTL::~TextureMTL() = default;
 
 void TextureMTL::SetLabel(std::string_view label) {
-  [texture_ setLabel:@(label.data())];
+  if (is_drawable_) {
+    return;
+  }
+  [aquire_proc_() setLabel:@(label.data())];
 }
 
 // |Texture|
@@ -51,7 +80,7 @@ bool TextureMTL::OnSetContents(std::shared_ptr<const fml::Mapping> mapping,
 bool TextureMTL::OnSetContents(const uint8_t* contents,
                                size_t length,
                                size_t slice) {
-  if (!IsValid() || !contents || is_wrapped_) {
+  if (!IsValid() || !contents || is_wrapped_ || is_drawable_) {
     return false;
   }
 
@@ -62,30 +91,30 @@ bool TextureMTL::OnSetContents(const uint8_t* contents,
     return false;
   }
 
-  // TODO(csg): Perhaps the storage mode should be added to the texture
-  // descriptor so that invalid region replacements on potentially non-host
-  // visible textures are disallowed. The annoying bit about the API below is
-  // that there seems to be no error handling guidance.
   const auto region =
       MTLRegionMake2D(0u, 0u, desc.size.width, desc.size.height);
-  [texture_ replaceRegion:region                            //
-              mipmapLevel:0u                                //
-                    slice:slice                             //
-                withBytes:contents                          //
-              bytesPerRow:desc.GetBytesPerRow()             //
-            bytesPerImage:desc.GetByteSizeOfBaseMipLevel()  //
+  [aquire_proc_() replaceRegion:region                            //
+                    mipmapLevel:0u                                //
+                          slice:slice                             //
+                      withBytes:contents                          //
+                    bytesPerRow:desc.GetBytesPerRow()             //
+                  bytesPerImage:desc.GetByteSizeOfBaseMipLevel()  //
   ];
 
   return true;
 }
 
 ISize TextureMTL::GetSize() const {
-  return {static_cast<ISize::Type>(texture_.width),
-          static_cast<ISize::Type>(texture_.height)};
+  if (is_drawable_) {
+    return GetTextureDescriptor().size;
+  }
+  const auto& texture = aquire_proc_();
+  return {static_cast<ISize::Type>(texture.width),
+          static_cast<ISize::Type>(texture.height)};
 }
 
 id<MTLTexture> TextureMTL::GetMTLTexture() const {
-  return texture_;
+  return aquire_proc_();
 }
 
 bool TextureMTL::IsValid() const {
@@ -96,4 +125,24 @@ bool TextureMTL::IsWrapped() const {
   return is_wrapped_;
 }
 
+bool TextureMTL::IsDrawable() const {
+  return is_drawable_;
+}
+
+bool TextureMTL::GenerateMipmap(id<MTLBlitCommandEncoder> encoder) {
+  if (is_drawable_) {
+    return false;
+  }
+
+  auto texture = aquire_proc_();
+  if (!texture) {
+    return false;
+  }
+
+  [encoder generateMipmapsForTexture:texture];
+  mipmap_generated_ = true;
+
+  return true;
+}
+
 }  // namespace impeller
diff --git a/impeller/renderer/backend/metal/texture_mtl_unittests.mm b/impeller/renderer/backend/metal/texture_mtl_unittests.mm
new file mode 100644
index 0000000000000000000000000000000000000000..2e263eb0e7db4e958d7a9ab21308ee7cdc7881ea
--- /dev/null
+++ b/impeller/renderer/backend/metal/texture_mtl_unittests.mm
@@ -0,0 +1,53 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/testing/testing.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/texture_descriptor.h"
+#include "impeller/renderer/backend/metal/formats_mtl.h"
+#include "impeller/renderer/backend/metal/lazy_drawable_holder.h"
+#include "impeller/renderer/backend/metal/texture_mtl.h"
+#include "impeller/renderer/capabilities.h"
+
+#include <QuartzCore/CAMetalLayer.h>
+#include <thread>
+
+#include "gtest/gtest.h"
+
+namespace impeller {
+namespace testing {
+
+TEST(TextureMTL, CreateFromDrawable) {
+  auto device = MTLCreateSystemDefaultDevice();
+  auto layer = [[CAMetalLayer alloc] init];
+  layer.device = device;
+  layer.drawableSize = CGSize{100, 100};
+  layer.pixelFormat = ToMTLPixelFormat(PixelFormat::kB8G8R8A8UNormInt);
+
+  TextureDescriptor desc;
+  desc.size = {100, 100};
+  desc.format = PixelFormat::kB8G8R8A8UNormInt;
+  auto drawable_future = GetDrawableDeferred(layer);
+  auto drawable_texture =
+      CreateTextureFromDrawableFuture(desc, drawable_future);
+
+  ASSERT_TRUE(drawable_texture->IsValid());
+  EXPECT_TRUE(drawable_texture->IsDrawable());
+
+  // Spawn a thread and acquire the drawable in the thread.
+  auto thread = std::thread([&drawable_texture]() {
+    // Force the drawable to be acquired.
+    drawable_texture->GetMTLTexture();
+  });
+  thread.join();
+  // Block until drawable is acquired.
+  EXPECT_TRUE(drawable_future.get() != nil);
+  // Drawable is cached.
+  EXPECT_TRUE(drawable_texture->GetMTLTexture() != nil);
+  // Once more for good measure.
+  EXPECT_TRUE(drawable_texture->GetMTLTexture() != nil);
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/deletion_queue_vk.cc b/impeller/renderer/backend/metal/texture_wrapper_mtl.h
similarity index 35%
rename from impeller/renderer/backend/vulkan/deletion_queue_vk.cc
rename to impeller/renderer/backend/metal/texture_wrapper_mtl.h
index 2c202e7ed81f2d57a666b6caeb1fee79cdea40fa..1402bd79dc1ff971feceb0322e0f8594f8796c27 100644
--- a/impeller/renderer/backend/vulkan/deletion_queue_vk.cc
+++ b/impeller/renderer/backend/metal/texture_wrapper_mtl.h
@@ -2,26 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/renderer/backend/vulkan/deletion_queue_vk.h"
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_TEXTURE_WRAPPER_MTL_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_TEXTURE_WRAPPER_MTL_H_
 
-namespace impeller {
-
-DeletionQueueVK::DeletionQueueVK() = default;
-
-DeletionQueueVK::~DeletionQueueVK() {
-  Flush();
-}
+#include "impeller/core/texture.h"
 
-void DeletionQueueVK::Flush() {
-  for (auto it = deletors_.rbegin(); it != deletors_.rend(); ++it) {
-    (*it)();
-  }
-
-  deletors_.clear();
-}
+namespace impeller {
 
-void DeletionQueueVK::Push(Deletor&& deletor) {
-  deletors_.push_back(std::move(deletor));
-}
+std::shared_ptr<Texture> WrapTextureMTL(
+    TextureDescriptor desc,
+    const void* mtl_texture,
+    std::function<void()> deletion_proc = nullptr);
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_TEXTURE_WRAPPER_MTL_H_
diff --git a/impeller/renderer/backend/metal/texture_wrapper_mtl.mm b/impeller/renderer/backend/metal/texture_wrapper_mtl.mm
new file mode 100644
index 0000000000000000000000000000000000000000..2b6a908f6d7cb3c8ddd64132c1bcbf2a0e516930
--- /dev/null
+++ b/impeller/renderer/backend/metal/texture_wrapper_mtl.mm
@@ -0,0 +1,22 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/backend/metal/texture_wrapper_mtl.h"
+
+#include <Metal/Metal.h>
+
+#include "impeller/renderer/backend/metal/formats_mtl.h"
+#include "impeller/renderer/backend/metal/texture_mtl.h"
+
+namespace impeller {
+
+std::shared_ptr<Texture> WrapTextureMTL(TextureDescriptor desc,
+                                        const void* mtl_texture,
+                                        std::function<void()> deletion_proc) {
+  auto texture = (__bridge id<MTLTexture>)mtl_texture;
+  desc.format = FromMTLPixelFormat(texture.pixelFormat);
+  return TextureMTL::Wrapper(desc, texture, std::move(deletion_proc));
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/backend/metal/vertex_descriptor_mtl.h b/impeller/renderer/backend/metal/vertex_descriptor_mtl.h
index 0fe392b2142e9771bb3599f6c872213ae2eac1f6..65c4a9545c44669faa36414fc541dbb574daf874 100644
--- a/impeller/renderer/backend/metal/vertex_descriptor_mtl.h
+++ b/impeller/renderer/backend/metal/vertex_descriptor_mtl.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_VERTEX_DESCRIPTOR_MTL_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_VERTEX_DESCRIPTOR_MTL_H_
+
 #include <Metal/Metal.h>
 
 #include <set>
@@ -18,29 +21,20 @@ class VertexDescriptorMTL {
 
   ~VertexDescriptorMTL();
 
-  bool SetStageInputs(const std::vector<ShaderStageIOSlot>& inputs);
+  bool SetStageInputsAndLayout(
+      const std::vector<ShaderStageIOSlot>& inputs,
+      const std::vector<ShaderStageBufferLayout>& layouts);
 
   MTLVertexDescriptor* GetMTLVertexDescriptor() const;
 
  private:
-  struct StageInput {
-    size_t location;
-    MTLVertexFormat format;
-    size_t length;
-
-    StageInput(size_t p_location, MTLVertexFormat p_format, size_t p_length)
-        : location(p_location), format(p_format), length(p_length) {}
-
-    struct Compare {
-      constexpr bool operator()(const StageInput& lhs,
-                                const StageInput& rhs) const {
-        return lhs.location < rhs.location;
-      }
-    };
-  };
-  std::set<StageInput, StageInput::Compare> stage_inputs_;
-
-  FML_DISALLOW_COPY_AND_ASSIGN(VertexDescriptorMTL);
+  MTLVertexDescriptor* descriptor_;
+
+  VertexDescriptorMTL(const VertexDescriptorMTL&) = delete;
+
+  VertexDescriptorMTL& operator=(const VertexDescriptorMTL&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_METAL_VERTEX_DESCRIPTOR_MTL_H_
diff --git a/impeller/renderer/backend/metal/vertex_descriptor_mtl.mm b/impeller/renderer/backend/metal/vertex_descriptor_mtl.mm
index a49a227324b26245e65efc30f373036384a1962a..6bac6687880c64bf3331de2a84a191eb42c08e61 100644
--- a/impeller/renderer/backend/metal/vertex_descriptor_mtl.mm
+++ b/impeller/renderer/backend/metal/vertex_descriptor_mtl.mm
@@ -169,10 +169,14 @@ static MTLVertexFormat ReadStageInputFormat(const ShaderStageIOSlot& input) {
   }
 }
 
-bool VertexDescriptorMTL::SetStageInputs(
-    const std::vector<ShaderStageIOSlot>& inputs) {
-  stage_inputs_.clear();
-
+bool VertexDescriptorMTL::SetStageInputsAndLayout(
+    const std::vector<ShaderStageIOSlot>& inputs,
+    const std::vector<ShaderStageBufferLayout>& layouts) {
+  auto descriptor = descriptor_ = [MTLVertexDescriptor vertexDescriptor];
+
+  // TODO(jonahwilliams): its odd that we offset buffers from the max index on
+  // metal but not on GLES or Vulkan. We should probably consistently start
+  // these at zero?
   for (size_t i = 0; i < inputs.size(); i++) {
     const auto& input = inputs[i];
     auto vertex_format = ReadStageInputFormat(input);
@@ -180,38 +184,27 @@ bool VertexDescriptorMTL::SetStageInputs(
       VALIDATION_LOG << "Format for input " << input.name << " not supported.";
       return false;
     }
-
-    stage_inputs_.insert(StageInput{input.location, vertex_format,
-                                    (input.bit_width * input.vec_size) / 8});
+    auto attrib = descriptor.attributes[input.location];
+    attrib.format = vertex_format;
+    attrib.offset = input.offset;
+    attrib.bufferIndex =
+        VertexDescriptor::kReservedVertexBufferIndex - input.binding;
   }
 
+  for (size_t i = 0; i < layouts.size(); i++) {
+    const auto& layout = layouts[i];
+    auto vertex_layout =
+        descriptor.layouts[VertexDescriptor::kReservedVertexBufferIndex -
+                           layout.binding];
+    vertex_layout.stride = layout.stride;
+    vertex_layout.stepRate = 1u;
+    vertex_layout.stepFunction = MTLVertexStepFunctionPerVertex;
+  }
   return true;
 }
 
 MTLVertexDescriptor* VertexDescriptorMTL::GetMTLVertexDescriptor() const {
-  auto descriptor = [MTLVertexDescriptor vertexDescriptor];
-
-  const size_t vertex_buffer_index =
-      VertexDescriptor::kReservedVertexBufferIndex;
-
-  size_t offset = 0u;
-  for (const auto& input : stage_inputs_) {
-    auto attrib = descriptor.attributes[input.location];
-    attrib.format = input.format;
-    attrib.offset = offset;
-    // All vertex inputs are interleaved and tightly packed in one buffer at a
-    // reserved index.
-    attrib.bufferIndex = vertex_buffer_index;
-    offset += input.length;
-  }
-
-  // Since it's all in one buffer, indicate its layout.
-  auto vertex_layout = descriptor.layouts[vertex_buffer_index];
-  vertex_layout.stride = offset;
-  vertex_layout.stepRate = 1u;
-  vertex_layout.stepFunction = MTLVertexStepFunctionPerVertex;
-
-  return descriptor;
+  return descriptor_;
 }
 
 }  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/BUILD.gn b/impeller/renderer/backend/vulkan/BUILD.gn
index 3ba6c17ccdc53a8a842256afd3859766c4e139cf..8a00a9c77c1afaa2ec9cf9107344fd6804dbe28e 100644
--- a/impeller/renderer/backend/vulkan/BUILD.gn
+++ b/impeller/renderer/backend/vulkan/BUILD.gn
@@ -2,38 +2,92 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//flutter/vulkan/config.gni")
 import("../../../tools/impeller.gni")
 
+impeller_component("vulkan_unittests") {
+  testonly = true
+  sources = [
+    "allocator_vk_unittests.cc",
+    "blit_command_vk_unittests.cc",
+    "command_encoder_vk_unittests.cc",
+    "command_pool_vk_unittests.cc",
+    "context_vk_unittests.cc",
+    "descriptor_pool_vk_unittests.cc",
+    "driver_info_vk_unittests.cc",
+    "fence_waiter_vk_unittests.cc",
+    "render_pass_builder_vk_unittests.cc",
+    "render_pass_cache_unittests.cc",
+    "resource_manager_vk_unittests.cc",
+    "test/gpu_tracer_unittests.cc",
+    "test/mock_vulkan.cc",
+    "test/mock_vulkan.h",
+    "test/mock_vulkan_unittests.cc",
+    "test/swapchain_unittests.cc",
+  ]
+  deps = [
+    ":vulkan",
+    "../../../playground:playground_test",
+    "//flutter/testing:testing_lib",
+  ]
+}
+
 impeller_component("vulkan") {
   sources = [
     "allocator_vk.cc",
     "allocator_vk.h",
+    "barrier_vk.cc",
+    "barrier_vk.h",
+    "blit_command_vk.cc",
+    "blit_command_vk.h",
     "blit_pass_vk.cc",
     "blit_pass_vk.h",
     "capabilities_vk.cc",
     "capabilities_vk.h",
     "command_buffer_vk.cc",
     "command_buffer_vk.h",
+    "command_encoder_vk.cc",
+    "command_encoder_vk.h",
     "command_pool_vk.cc",
     "command_pool_vk.h",
+    "command_queue_vk.cc",
+    "command_queue_vk.h",
+    "compute_pass_vk.cc",
+    "compute_pass_vk.h",
+    "compute_pipeline_vk.cc",
+    "compute_pipeline_vk.h",
     "context_vk.cc",
     "context_vk.h",
-    "deletion_queue_vk.cc",
-    "deletion_queue_vk.h",
+    "debug_report_vk.cc",
+    "debug_report_vk.h",
     "descriptor_pool_vk.cc",
     "descriptor_pool_vk.h",
     "device_buffer_vk.cc",
     "device_buffer_vk.h",
-    "fenced_command_buffer_vk.cc",
-    "fenced_command_buffer_vk.h",
+    "device_holder_vk.h",
+    "driver_info_vk.cc",
+    "driver_info_vk.h",
+    "fence_waiter_vk.cc",
+    "fence_waiter_vk.h",
     "formats_vk.cc",
     "formats_vk.h",
+    "gpu_tracer_vk.cc",
+    "gpu_tracer_vk.h",
+    "limits_vk.h",
+    "pipeline_cache_vk.cc",
+    "pipeline_cache_vk.h",
     "pipeline_library_vk.cc",
     "pipeline_library_vk.h",
     "pipeline_vk.cc",
     "pipeline_vk.h",
+    "queue_vk.cc",
+    "queue_vk.h",
+    "render_pass_builder_vk.cc",
+    "render_pass_builder_vk.h",
     "render_pass_vk.cc",
     "render_pass_vk.h",
+    "resource_manager_vk.cc",
+    "resource_manager_vk.h",
     "sampler_library_vk.cc",
     "sampler_library_vk.h",
     "sampler_vk.cc",
@@ -42,28 +96,48 @@ impeller_component("vulkan") {
     "shader_function_vk.h",
     "shader_library_vk.cc",
     "shader_library_vk.h",
-    "surface_producer_vk.cc",
-    "surface_producer_vk.h",
-    "surface_vk.cc",
-    "surface_vk.h",
-    "swapchain_details_vk.cc",
-    "swapchain_details_vk.h",
-    "swapchain_vk.cc",
-    "swapchain_vk.h",
+    "shared_object_vk.cc",
+    "shared_object_vk.h",
+    "surface_context_vk.cc",
+    "surface_context_vk.h",
+    "swapchain/khr/khr_surface_vk.cc",
+    "swapchain/khr/khr_surface_vk.h",
+    "swapchain/khr/khr_swapchain_image_vk.cc",
+    "swapchain/khr/khr_swapchain_image_vk.h",
+    "swapchain/khr/khr_swapchain_impl_vk.cc",
+    "swapchain/khr/khr_swapchain_impl_vk.h",
+    "swapchain/khr/khr_swapchain_vk.cc",
+    "swapchain/khr/khr_swapchain_vk.h",
+    "texture_source_vk.cc",
+    "texture_source_vk.h",
     "texture_vk.cc",
     "texture_vk.h",
+    "tracked_objects_vk.cc",
+    "tracked_objects_vk.h",
     "vertex_descriptor_vk.cc",
     "vertex_descriptor_vk.h",
     "vk.h",
+    "vma.cc",
+    "vma.h",
+    "yuv_conversion_library_vk.cc",
+    "yuv_conversion_library_vk.h",
+    "yuv_conversion_vk.cc",
+    "yuv_conversion_vk.h",
   ]
 
+  if (is_android) {
+    sources += [
+      "android/ahb_texture_source_vk.cc",
+      "android/ahb_texture_source_vk.h",
+    ]
+  }
+
   public_deps = [
     "../../:renderer",
-    "../../../blobcat:blobcat_lib",
+    "../../../shader_archive",
     "//flutter/flutter_vma",
     "//flutter/fml",
-    "//flutter/vulkan/procs",
-    "//third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
-    "//third_party/vulkan_memory_allocator",
+    "//flutter/third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
+    "//flutter/third_party/vulkan_memory_allocator",
   ]
 }
diff --git a/impeller/renderer/backend/vulkan/allocator_vk.cc b/impeller/renderer/backend/vulkan/allocator_vk.cc
index 2d0caad238ebea747a235437125be00e8ff2562b..364b9aa49afbde9e28bd37f3b970e398c238ecf4 100644
--- a/impeller/renderer/backend/vulkan/allocator_vk.cc
+++ b/impeller/renderer/backend/vulkan/allocator_vk.cc
@@ -7,72 +7,140 @@
 #include <memory>
 
 #include "flutter/fml/memory/ref_ptr.h"
-#include "flutter/vulkan/procs/vulkan_handle.h"
-#include "flutter/vulkan/procs/vulkan_proc_table.h"
+#include "flutter/fml/trace_event.h"
+#include "impeller/core/formats.h"
 #include "impeller/renderer/backend/vulkan/device_buffer_vk.h"
 #include "impeller/renderer/backend/vulkan/formats_vk.h"
 #include "impeller/renderer/backend/vulkan/texture_vk.h"
-#include "impeller/renderer/formats.h"
+#include "vulkan/vulkan_enums.hpp"
 
 namespace impeller {
 
-AllocatorVK::AllocatorVK(ContextVK& context,
+static constexpr vk::Flags<vk::MemoryPropertyFlagBits>
+ToVKBufferMemoryPropertyFlags(StorageMode mode) {
+  switch (mode) {
+    case StorageMode::kHostVisible:
+      return vk::MemoryPropertyFlagBits::eHostVisible;
+    case StorageMode::kDevicePrivate:
+      return vk::MemoryPropertyFlagBits::eDeviceLocal;
+    case StorageMode::kDeviceTransient:
+      return vk::MemoryPropertyFlagBits::eLazilyAllocated;
+  }
+  FML_UNREACHABLE();
+}
+
+static VmaAllocationCreateFlags ToVmaAllocationBufferCreateFlags(
+    StorageMode mode,
+    bool readback) {
+  VmaAllocationCreateFlags flags = 0;
+  switch (mode) {
+    case StorageMode::kHostVisible:
+      if (!readback) {
+        flags |= VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT;
+      } else {
+        flags |= VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT;
+      }
+      flags |= VMA_ALLOCATION_CREATE_MAPPED_BIT;
+      return flags;
+    case StorageMode::kDevicePrivate:
+      FML_DCHECK(!readback);
+      return flags;
+    case StorageMode::kDeviceTransient:
+      FML_DCHECK(!readback);
+      return flags;
+  }
+  FML_UNREACHABLE();
+}
+
+static PoolVMA CreateBufferPool(VmaAllocator allocator) {
+  vk::BufferCreateInfo buffer_info;
+  buffer_info.usage = vk::BufferUsageFlagBits::eVertexBuffer |
+                      vk::BufferUsageFlagBits::eIndexBuffer |
+                      vk::BufferUsageFlagBits::eUniformBuffer |
+                      vk::BufferUsageFlagBits::eStorageBuffer |
+                      vk::BufferUsageFlagBits::eTransferSrc |
+                      vk::BufferUsageFlagBits::eTransferDst;
+  buffer_info.size = 1u;  // doesn't matter
+  buffer_info.sharingMode = vk::SharingMode::eExclusive;
+  auto buffer_info_native =
+      static_cast<vk::BufferCreateInfo::NativeType>(buffer_info);
+
+  VmaAllocationCreateInfo allocation_info = {};
+  allocation_info.usage = VMA_MEMORY_USAGE_AUTO;
+  allocation_info.preferredFlags = static_cast<VkMemoryPropertyFlags>(
+      ToVKBufferMemoryPropertyFlags(StorageMode::kHostVisible));
+  allocation_info.flags = ToVmaAllocationBufferCreateFlags(
+      StorageMode::kHostVisible, /*readback=*/false);
+
+  uint32_t memTypeIndex;
+  auto result = vk::Result{vmaFindMemoryTypeIndexForBufferInfo(
+      allocator, &buffer_info_native, &allocation_info, &memTypeIndex)};
+  if (result != vk::Result::eSuccess) {
+    return {};
+  }
+
+  VmaPoolCreateInfo pool_create_info = {};
+  pool_create_info.memoryTypeIndex = memTypeIndex;
+  pool_create_info.flags = VMA_POOL_CREATE_IGNORE_BUFFER_IMAGE_GRANULARITY_BIT;
+
+  VmaPool pool = {};
+  result = vk::Result{::vmaCreatePool(allocator, &pool_create_info, &pool)};
+  if (result != vk::Result::eSuccess) {
+    return {};
+  }
+  return {allocator, pool};
+}
+
+AllocatorVK::AllocatorVK(std::weak_ptr<Context> context,
                          uint32_t vulkan_api_version,
                          const vk::PhysicalDevice& physical_device,
-                         const vk::Device& logical_device,
+                         const std::shared_ptr<DeviceHolderVK>& device_holder,
                          const vk::Instance& instance,
-                         PFN_vkGetInstanceProcAddr get_instance_proc_address,
-                         PFN_vkGetDeviceProcAddr get_device_proc_address)
-    : context_(context), device_(logical_device) {
-  vk_ = fml::MakeRefCounted<vulkan::VulkanProcTable>(get_instance_proc_address);
-
-  auto instance_handle = vulkan::VulkanHandle<VkInstance>(instance);
-  FML_CHECK(vk_->SetupInstanceProcAddresses(instance_handle));
-
-  auto device_handle = vulkan::VulkanHandle<VkDevice>(logical_device);
-  FML_CHECK(vk_->SetupDeviceProcAddresses(device_handle));
+                         const CapabilitiesVK& capabilities)
+    : context_(std::move(context)), device_holder_(device_holder) {
+  auto limits = physical_device.getProperties().limits;
+  max_texture_size_.width = max_texture_size_.height =
+      limits.maxImageDimension2D;
+  physical_device.getMemoryProperties(&memory_properties_);
 
   VmaVulkanFunctions proc_table = {};
-  proc_table.vkGetInstanceProcAddr = get_instance_proc_address;
-  proc_table.vkGetDeviceProcAddr = get_device_proc_address;
-
-#define PROVIDE_PROC(tbl, proc, provider) tbl.vk##proc = provider->proc;
-  PROVIDE_PROC(proc_table, GetPhysicalDeviceProperties, vk_);
-  PROVIDE_PROC(proc_table, GetPhysicalDeviceMemoryProperties, vk_);
-  PROVIDE_PROC(proc_table, AllocateMemory, vk_);
-  PROVIDE_PROC(proc_table, FreeMemory, vk_);
-  PROVIDE_PROC(proc_table, MapMemory, vk_);
-  PROVIDE_PROC(proc_table, UnmapMemory, vk_);
-  PROVIDE_PROC(proc_table, FlushMappedMemoryRanges, vk_);
-  PROVIDE_PROC(proc_table, InvalidateMappedMemoryRanges, vk_);
-  PROVIDE_PROC(proc_table, BindBufferMemory, vk_);
-  PROVIDE_PROC(proc_table, BindImageMemory, vk_);
-  PROVIDE_PROC(proc_table, GetBufferMemoryRequirements, vk_);
-  PROVIDE_PROC(proc_table, GetImageMemoryRequirements, vk_);
-  PROVIDE_PROC(proc_table, CreateBuffer, vk_);
-  PROVIDE_PROC(proc_table, DestroyBuffer, vk_);
-  PROVIDE_PROC(proc_table, CreateImage, vk_);
-  PROVIDE_PROC(proc_table, DestroyImage, vk_);
-  PROVIDE_PROC(proc_table, CmdCopyBuffer, vk_);
-
-#define PROVIDE_PROC_COALESCE(tbl, proc, provider) \
-  tbl.vk##proc##KHR = provider->proc ? provider->proc : provider->proc##KHR;
-  // See the following link for why we have to pick either KHR version or
-  // promoted non-KHR version:
-  // https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/issues/203
-  PROVIDE_PROC_COALESCE(proc_table, GetBufferMemoryRequirements2, vk_);
-  PROVIDE_PROC_COALESCE(proc_table, GetImageMemoryRequirements2, vk_);
-  PROVIDE_PROC_COALESCE(proc_table, BindBufferMemory2, vk_);
-  PROVIDE_PROC_COALESCE(proc_table, BindImageMemory2, vk_);
-  PROVIDE_PROC_COALESCE(proc_table, GetPhysicalDeviceMemoryProperties2, vk_);
-#undef PROVIDE_PROC_COALESCE
-
-#undef PROVIDE_PROC
+
+#define BIND_VMA_PROC(x) proc_table.x = VULKAN_HPP_DEFAULT_DISPATCHER.x;
+#define BIND_VMA_PROC_KHR(x)                                \
+  proc_table.x##KHR = VULKAN_HPP_DEFAULT_DISPATCHER.x       \
+                          ? VULKAN_HPP_DEFAULT_DISPATCHER.x \
+                          : VULKAN_HPP_DEFAULT_DISPATCHER.x##KHR;
+  BIND_VMA_PROC(vkGetInstanceProcAddr);
+  BIND_VMA_PROC(vkGetDeviceProcAddr);
+  BIND_VMA_PROC(vkGetPhysicalDeviceProperties);
+  BIND_VMA_PROC(vkGetPhysicalDeviceMemoryProperties);
+  BIND_VMA_PROC(vkAllocateMemory);
+  BIND_VMA_PROC(vkFreeMemory);
+  BIND_VMA_PROC(vkMapMemory);
+  BIND_VMA_PROC(vkUnmapMemory);
+  BIND_VMA_PROC(vkFlushMappedMemoryRanges);
+  BIND_VMA_PROC(vkInvalidateMappedMemoryRanges);
+  BIND_VMA_PROC(vkBindBufferMemory);
+  BIND_VMA_PROC(vkBindImageMemory);
+  BIND_VMA_PROC(vkGetBufferMemoryRequirements);
+  BIND_VMA_PROC(vkGetImageMemoryRequirements);
+  BIND_VMA_PROC(vkCreateBuffer);
+  BIND_VMA_PROC(vkDestroyBuffer);
+  BIND_VMA_PROC(vkCreateImage);
+  BIND_VMA_PROC(vkDestroyImage);
+  BIND_VMA_PROC(vkCmdCopyBuffer);
+  BIND_VMA_PROC_KHR(vkGetBufferMemoryRequirements2);
+  BIND_VMA_PROC_KHR(vkGetImageMemoryRequirements2);
+  BIND_VMA_PROC_KHR(vkBindBufferMemory2);
+  BIND_VMA_PROC_KHR(vkBindImageMemory2);
+  BIND_VMA_PROC_KHR(vkGetPhysicalDeviceMemoryProperties2);
+#undef BIND_VMA_PROC_KHR
+#undef BIND_VMA_PROC
 
   VmaAllocatorCreateInfo allocator_info = {};
   allocator_info.vulkanApiVersion = vulkan_api_version;
   allocator_info.physicalDevice = physical_device;
-  allocator_info.device = logical_device;
+  allocator_info.device = device_holder->GetDevice();
   allocator_info.instance = instance;
   allocator_info.pVulkanFunctions = &proc_table;
 
@@ -82,144 +150,348 @@ AllocatorVK::AllocatorVK(ContextVK& context,
     VALIDATION_LOG << "Could not create memory allocator";
     return;
   }
-  allocator_ = allocator;
+  staging_buffer_pool_.reset(CreateBufferPool(allocator));
+  created_buffer_pool_ &= staging_buffer_pool_.is_valid();
+  allocator_.reset(allocator);
+  supports_memoryless_textures_ =
+      capabilities.SupportsDeviceTransientTextures();
   is_valid_ = true;
 }
 
-AllocatorVK::~AllocatorVK() {
-  if (allocator_) {
-    ::vmaDestroyAllocator(allocator_);
-  }
-}
+AllocatorVK::~AllocatorVK() = default;
 
 // |Allocator|
 bool AllocatorVK::IsValid() const {
   return is_valid_;
 }
 
+// |Allocator|
+ISize AllocatorVK::GetMaxTextureSizeSupported() const {
+  return max_texture_size_;
+}
+
+int32_t AllocatorVK::FindMemoryTypeIndex(
+    uint32_t memory_type_bits_requirement,
+    vk::PhysicalDeviceMemoryProperties& memory_properties) {
+  int32_t type_index = -1;
+  vk::MemoryPropertyFlagBits required_properties =
+      vk::MemoryPropertyFlagBits::eDeviceLocal;
+
+  const uint32_t memory_count = memory_properties.memoryTypeCount;
+  for (uint32_t memory_index = 0; memory_index < memory_count; ++memory_index) {
+    const uint32_t memory_type_bits = (1 << memory_index);
+    const bool is_required_memory_type =
+        memory_type_bits_requirement & memory_type_bits;
+
+    const auto properties =
+        memory_properties.memoryTypes[memory_index].propertyFlags;
+    const bool has_required_properties =
+        (properties & required_properties) == required_properties;
+
+    if (is_required_memory_type && has_required_properties) {
+      return static_cast<int32_t>(memory_index);
+    }
+  }
+
+  return type_index;
+}
+
+vk::ImageUsageFlags AllocatorVK::ToVKImageUsageFlags(
+    PixelFormat format,
+    TextureUsageMask usage,
+    StorageMode mode,
+    bool supports_memoryless_textures) {
+  vk::ImageUsageFlags vk_usage;
+
+  switch (mode) {
+    case StorageMode::kHostVisible:
+    case StorageMode::kDevicePrivate:
+      break;
+    case StorageMode::kDeviceTransient:
+      if (supports_memoryless_textures) {
+        vk_usage |= vk::ImageUsageFlagBits::eTransientAttachment;
+      }
+      break;
+  }
+
+  if (usage & TextureUsage::kRenderTarget) {
+    if (PixelFormatIsDepthStencil(format)) {
+      vk_usage |= vk::ImageUsageFlagBits::eDepthStencilAttachment;
+    } else {
+      vk_usage |= vk::ImageUsageFlagBits::eColorAttachment;
+      vk_usage |= vk::ImageUsageFlagBits::eInputAttachment;
+    }
+  }
+
+  if (usage & TextureUsage::kShaderRead) {
+    vk_usage |= vk::ImageUsageFlagBits::eSampled;
+  }
+
+  if (usage & TextureUsage::kShaderWrite) {
+    vk_usage |= vk::ImageUsageFlagBits::eStorage;
+  }
+
+  if (mode != StorageMode::kDeviceTransient) {
+    // Add transfer usage flags to support blit passes only if image isn't
+    // device transient.
+    vk_usage |= vk::ImageUsageFlagBits::eTransferSrc |
+                vk::ImageUsageFlagBits::eTransferDst;
+  }
+
+  return vk_usage;
+}
+
+static constexpr VmaMemoryUsage ToVMAMemoryUsage() {
+  return VMA_MEMORY_USAGE_AUTO;
+}
+
+static constexpr vk::Flags<vk::MemoryPropertyFlagBits>
+ToVKTextureMemoryPropertyFlags(StorageMode mode,
+                               bool supports_memoryless_textures) {
+  switch (mode) {
+    case StorageMode::kHostVisible:
+      return vk::MemoryPropertyFlagBits::eHostVisible |
+             vk::MemoryPropertyFlagBits::eDeviceLocal;
+    case StorageMode::kDevicePrivate:
+      return vk::MemoryPropertyFlagBits::eDeviceLocal;
+    case StorageMode::kDeviceTransient:
+      if (supports_memoryless_textures) {
+        return vk::MemoryPropertyFlagBits::eLazilyAllocated |
+               vk::MemoryPropertyFlagBits::eDeviceLocal;
+      }
+      return vk::MemoryPropertyFlagBits::eDeviceLocal;
+  }
+  FML_UNREACHABLE();
+}
+
+static VmaAllocationCreateFlags ToVmaAllocationCreateFlags(StorageMode mode) {
+  VmaAllocationCreateFlags flags = 0;
+  switch (mode) {
+    case StorageMode::kHostVisible:
+      return flags;
+    case StorageMode::kDevicePrivate:
+      return flags;
+    case StorageMode::kDeviceTransient:
+      return flags;
+  }
+  FML_UNREACHABLE();
+}
+
+class AllocatedTextureSourceVK final : public TextureSourceVK {
+ public:
+  AllocatedTextureSourceVK(std::weak_ptr<ResourceManagerVK> resource_manager,
+                           const TextureDescriptor& desc,
+                           VmaAllocator allocator,
+                           vk::Device device,
+                           bool supports_memoryless_textures)
+      : TextureSourceVK(desc), resource_(std::move(resource_manager)) {
+    FML_DCHECK(desc.format != PixelFormat::kUnknown);
+    vk::ImageCreateInfo image_info;
+    image_info.flags = ToVKImageCreateFlags(desc.type);
+    image_info.imageType = vk::ImageType::e2D;
+    image_info.format = ToVKImageFormat(desc.format);
+    image_info.extent = VkExtent3D{
+        static_cast<uint32_t>(desc.size.width),   // width
+        static_cast<uint32_t>(desc.size.height),  // height
+        1u                                        // depth
+    };
+    image_info.samples = ToVKSampleCount(desc.sample_count);
+    image_info.mipLevels = desc.mip_count;
+    image_info.arrayLayers = ToArrayLayerCount(desc.type);
+    image_info.tiling = vk::ImageTiling::eOptimal;
+    image_info.initialLayout = vk::ImageLayout::eUndefined;
+    image_info.usage = AllocatorVK::ToVKImageUsageFlags(
+        desc.format, desc.usage, desc.storage_mode,
+        supports_memoryless_textures);
+    image_info.sharingMode = vk::SharingMode::eExclusive;
+
+    VmaAllocationCreateInfo alloc_nfo = {};
+
+    alloc_nfo.usage = ToVMAMemoryUsage();
+    alloc_nfo.preferredFlags =
+        static_cast<VkMemoryPropertyFlags>(ToVKTextureMemoryPropertyFlags(
+            desc.storage_mode, supports_memoryless_textures));
+    alloc_nfo.flags = ToVmaAllocationCreateFlags(desc.storage_mode);
+
+    auto create_info_native =
+        static_cast<vk::ImageCreateInfo::NativeType>(image_info);
+
+    VkImage vk_image = VK_NULL_HANDLE;
+    VmaAllocation allocation = {};
+    VmaAllocationInfo allocation_info = {};
+    {
+      auto result = vk::Result{::vmaCreateImage(allocator,            //
+                                                &create_info_native,  //
+                                                &alloc_nfo,           //
+                                                &vk_image,            //
+                                                &allocation,          //
+                                                &allocation_info      //
+                                                )};
+      if (result != vk::Result::eSuccess) {
+        VALIDATION_LOG << "Unable to allocate Vulkan Image: "
+                       << vk::to_string(result)
+                       << " Type: " << TextureTypeToString(desc.type)
+                       << " Mode: " << StorageModeToString(desc.storage_mode)
+                       << " Usage: " << TextureUsageMaskToString(desc.usage)
+                       << " [VK]Flags: " << vk::to_string(image_info.flags)
+                       << " [VK]Format: " << vk::to_string(image_info.format)
+                       << " [VK]Usage: " << vk::to_string(image_info.usage)
+                       << " [VK]Mem. Flags: "
+                       << vk::to_string(vk::MemoryPropertyFlags(
+                              alloc_nfo.preferredFlags));
+        return;
+      }
+    }
+
+    auto image = vk::Image{vk_image};
+
+    vk::ImageViewCreateInfo view_info = {};
+    view_info.image = image;
+    view_info.viewType = ToVKImageViewType(desc.type);
+    view_info.format = image_info.format;
+    view_info.subresourceRange.aspectMask = ToVKImageAspectFlags(desc.format);
+    view_info.subresourceRange.levelCount = image_info.mipLevels;
+    view_info.subresourceRange.layerCount = ToArrayLayerCount(desc.type);
+
+    // Vulkan does not have an image format that is equivalent to
+    // `MTLPixelFormatA8Unorm`, so we use `R8Unorm` instead. Given that the
+    // shaders expect that alpha channel to be set in the cases, we swizzle.
+    // See: https://github.com/flutter/flutter/issues/115461 for more details.
+    if (desc.format == PixelFormat::kA8UNormInt) {
+      view_info.components.a = vk::ComponentSwizzle::eR;
+      view_info.components.r = vk::ComponentSwizzle::eA;
+    }
+
+    auto [result, image_view] = device.createImageViewUnique(view_info);
+    if (result != vk::Result::eSuccess) {
+      VALIDATION_LOG << "Unable to create an image view for allocation: "
+                     << vk::to_string(result);
+      return;
+    }
+    // Create a specialized view for render target attachments.
+    view_info.subresourceRange.levelCount = 1u;
+    auto [rt_result, rt_image_view] = device.createImageViewUnique(view_info);
+    if (rt_result != vk::Result::eSuccess) {
+      VALIDATION_LOG << "Unable to create an image view for allocation: "
+                     << vk::to_string(rt_result);
+      return;
+    }
+
+    resource_.Swap(ImageResource(ImageVMA{allocator, allocation, image},
+                                 std::move(image_view),
+                                 std::move(rt_image_view)));
+    is_valid_ = true;
+  }
+
+  ~AllocatedTextureSourceVK() = default;
+
+  bool IsValid() const { return is_valid_; }
+
+  vk::Image GetImage() const override { return resource_->image.get().image; }
+
+  vk::ImageView GetImageView() const override {
+    return resource_->image_view.get();
+  }
+
+  vk::ImageView GetRenderTargetView() const override {
+    return resource_->rt_image_view.get();
+  }
+
+  bool IsSwapchainImage() const override { return false; }
+
+ private:
+  struct ImageResource {
+    UniqueImageVMA image;
+    vk::UniqueImageView image_view;
+    vk::UniqueImageView rt_image_view;
+
+    ImageResource() = default;
+
+    ImageResource(ImageVMA p_image,
+                  vk::UniqueImageView p_image_view,
+                  vk::UniqueImageView p_rt_image_view)
+        : image(p_image),
+          image_view(std::move(p_image_view)),
+          rt_image_view(std::move(p_rt_image_view)) {}
+
+    ImageResource(ImageResource&& o) = default;
+
+    ImageResource(const ImageResource&) = delete;
+
+    ImageResource& operator=(const ImageResource&) = delete;
+  };
+
+  UniqueResourceVKT<ImageResource> resource_;
+  bool is_valid_ = false;
+
+  AllocatedTextureSourceVK(const AllocatedTextureSourceVK&) = delete;
+
+  AllocatedTextureSourceVK& operator=(const AllocatedTextureSourceVK&) = delete;
+};
+
 // |Allocator|
 std::shared_ptr<Texture> AllocatorVK::OnCreateTexture(
     const TextureDescriptor& desc) {
-  auto image_create_info = vk::ImageCreateInfo{};
-  image_create_info.imageType = vk::ImageType::e2D;
-  image_create_info.format = ToVKImageFormat(desc.format);
-  image_create_info.extent.width = desc.size.width;
-  image_create_info.extent.height = desc.size.height;
-  image_create_info.samples = ToVKSampleCount(desc.sample_count);
-  image_create_info.mipLevels = desc.mip_count;
-
-  // TODO (kaushikiska): should we read these from desc?
-  image_create_info.extent.depth = 1;
-  image_create_info.arrayLayers = 1;
-
-  image_create_info.tiling = vk::ImageTiling::eOptimal;
-  image_create_info.initialLayout = vk::ImageLayout::eUndefined;
-  image_create_info.usage = vk::ImageUsageFlagBits::eSampled |
-                            vk::ImageUsageFlagBits::eColorAttachment |
-                            vk::ImageUsageFlagBits::eTransferDst;
-
-  VmaAllocationCreateInfo alloc_create_info = {};
-  alloc_create_info.usage = VMA_MEMORY_USAGE_AUTO;
-  // docs recommend using `VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT` for image
-  // allocations, but setting them to be host visible for now.
-  alloc_create_info.flags = VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT |
-                            VMA_ALLOCATION_CREATE_MAPPED_BIT;
-
-  auto create_info_native =
-      static_cast<vk::ImageCreateInfo::NativeType>(image_create_info);
-
-  VkImage img;
-  VmaAllocation allocation;
-  VmaAllocationInfo allocation_info;
-  auto result = vk::Result{vmaCreateImage(allocator_, &create_info_native,
-                                          &alloc_create_info, &img, &allocation,
-                                          &allocation_info)};
-  if (result != vk::Result::eSuccess) {
-    VALIDATION_LOG << "Unable to allocate an image";
+  if (!IsValid()) {
     return nullptr;
   }
-
-  vk::ImageViewCreateInfo view_create_info = {};
-  view_create_info.image = vk::Image{img};
-  view_create_info.viewType = vk::ImageViewType::e2D;
-  view_create_info.format = image_create_info.format;
-  view_create_info.subresourceRange.aspectMask =
-      vk::ImageAspectFlagBits::eColor;
-  view_create_info.subresourceRange.levelCount = image_create_info.mipLevels;
-  view_create_info.subresourceRange.layerCount = image_create_info.arrayLayers;
-
-  // Vulkan does not have an image format that is equivalent to
-  // `MTLPixelFormatA8Unorm`, so we use `R8Unorm` instead. Given that the
-  // shaders expect that alpha channel to be set in the cases, we swizzle.
-  // See: https://github.com/flutter/flutter/issues/115461 for more details.
-  if (desc.format == PixelFormat::kA8UNormInt) {
-    view_create_info.components.a = vk::ComponentSwizzle::eR;
-    view_create_info.components.r = vk::ComponentSwizzle::eA;
+  auto device_holder = device_holder_.lock();
+  if (!device_holder) {
+    return nullptr;
   }
-
-  auto img_view_res = device_.createImageView(view_create_info);
-  if (img_view_res.result != vk::Result::eSuccess) {
-    VALIDATION_LOG << "Unable to create an image view: "
-                   << vk::to_string(img_view_res.result);
+  auto context = context_.lock();
+  if (!context) {
     return nullptr;
   }
-
-  auto image_view = static_cast<vk::ImageView::NativeType>(img_view_res.value);
-  auto staging_buffer =
-      CreateHostVisibleDeviceAllocation(desc.GetByteSizeOfBaseMipLevel());
-
-  auto texture_info = std::make_unique<TextureInfoVK>(TextureInfoVK{
-      .backing_type = TextureBackingTypeVK::kAllocatedTexture,
-      .allocated_texture =
-          {
-              .staging_buffer = staging_buffer,
-              .backing_allocation =
-                  {
-                      .allocator = &allocator_,
-                      .allocation = allocation,
-                      .allocation_info = allocation_info,
-                  },
-              .image = img,
-              .image_view = image_view,
-          },
-  });
-  return std::make_shared<TextureVK>(desc, &context_, std::move(texture_info));
+  auto source = std::make_shared<AllocatedTextureSourceVK>(
+      ContextVK::Cast(*context).GetResourceManager(),  //
+      desc,                                            //
+      allocator_.get(),                                //
+      device_holder->GetDevice(),                      //
+      supports_memoryless_textures_                    //
+  );
+  if (!source->IsValid()) {
+    return nullptr;
+  }
+  return std::make_shared<TextureVK>(context_, std::move(source));
 }
 
 // |Allocator|
 std::shared_ptr<DeviceBuffer> AllocatorVK::OnCreateBuffer(
     const DeviceBufferDescriptor& desc) {
-  // TODO (kaushikiska): consider optimizing  the usage flags based on
-  // StorageMode.
-  auto device_allocation = std::make_unique<DeviceBufferAllocationVK>(
-      CreateHostVisibleDeviceAllocation(desc.size));
-  return std::make_shared<DeviceBufferVK>(desc, context_,
-                                          std::move(device_allocation));
-}
+  vk::BufferCreateInfo buffer_info;
+  buffer_info.usage = vk::BufferUsageFlagBits::eVertexBuffer |
+                      vk::BufferUsageFlagBits::eIndexBuffer |
+                      vk::BufferUsageFlagBits::eUniformBuffer |
+                      vk::BufferUsageFlagBits::eStorageBuffer |
+                      vk::BufferUsageFlagBits::eTransferSrc |
+                      vk::BufferUsageFlagBits::eTransferDst;
+  buffer_info.size = desc.size;
+  buffer_info.sharingMode = vk::SharingMode::eExclusive;
+  auto buffer_info_native =
+      static_cast<vk::BufferCreateInfo::NativeType>(buffer_info);
+
+  VmaAllocationCreateInfo allocation_info = {};
+  allocation_info.usage = ToVMAMemoryUsage();
+  allocation_info.preferredFlags = static_cast<VkMemoryPropertyFlags>(
+      ToVKBufferMemoryPropertyFlags(desc.storage_mode));
+  allocation_info.flags =
+      ToVmaAllocationBufferCreateFlags(desc.storage_mode, desc.readback);
+  if (created_buffer_pool_ && desc.storage_mode == StorageMode::kHostVisible &&
+      !desc.readback) {
+    allocation_info.pool = staging_buffer_pool_.get().pool;
+  }
 
-DeviceBufferAllocationVK AllocatorVK::CreateHostVisibleDeviceAllocation(
-    size_t size) {
-  auto buffer_create_info = static_cast<vk::BufferCreateInfo::NativeType>(
-      vk::BufferCreateInfo()
-          .setUsage(vk::BufferUsageFlagBits::eVertexBuffer |
-                    vk::BufferUsageFlagBits::eIndexBuffer |
-                    vk::BufferUsageFlagBits::eUniformBuffer |
-                    vk::BufferUsageFlagBits::eTransferSrc |
-                    vk::BufferUsageFlagBits::eTransferDst)
-          .setSize(size)
-          .setSharingMode(vk::SharingMode::eExclusive));
-
-  VmaAllocationCreateInfo allocCreateInfo = {};
-  allocCreateInfo.usage = VMA_MEMORY_USAGE_AUTO;
-  allocCreateInfo.flags = VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT |
-                          VMA_ALLOCATION_CREATE_MAPPED_BIT;
-
-  VkBuffer buffer;
-  VmaAllocation buffer_allocation;
-  VmaAllocationInfo buffer_allocation_info;
-  auto result = vk::Result{
-      vmaCreateBuffer(allocator_, &buffer_create_info, &allocCreateInfo,
-                      &buffer, &buffer_allocation, &buffer_allocation_info)};
+  VkBuffer buffer = {};
+  VmaAllocation buffer_allocation = {};
+  VmaAllocationInfo buffer_allocation_info = {};
+  auto result = vk::Result{::vmaCreateBuffer(allocator_.get(),        //
+                                             &buffer_info_native,     //
+                                             &allocation_info,        //
+                                             &buffer,                 //
+                                             &buffer_allocation,      //
+                                             &buffer_allocation_info  //
+                                             )};
 
   if (result != vk::Result::eSuccess) {
     VALIDATION_LOG << "Unable to allocate a device buffer: "
@@ -227,30 +499,36 @@ DeviceBufferAllocationVK AllocatorVK::CreateHostVisibleDeviceAllocation(
     return {};
   }
 
-  VkMemoryPropertyFlags memory_props;
-  vmaGetAllocationMemoryProperties(allocator_, buffer_allocation,
-                                   &memory_props);
-  if (!(memory_props & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT)) {
-    VALIDATION_LOG << "Unable to create host visible device buffer.";
-  }
+  return std::make_shared<DeviceBufferVK>(
+      desc,                                            //
+      context_,                                        //
+      UniqueBufferVMA{BufferVMA{allocator_.get(),      //
+                                buffer_allocation,     //
+                                vk::Buffer{buffer}}},  //
+      buffer_allocation_info                           //
+  );
+}
 
-  return DeviceBufferAllocationVK{
-      .buffer = vk::Buffer{buffer},
-      .backing_allocation =
-          {
-              .allocator = &allocator_,
-              .allocation = buffer_allocation,
-              .allocation_info = buffer_allocation_info,
-          },
-  };
+size_t AllocatorVK::DebugGetHeapUsage() const {
+  auto count = memory_properties_.memoryHeapCount;
+  std::vector<VmaBudget> budgets(count);
+  vmaGetHeapBudgets(allocator_.get(), budgets.data());
+  size_t total_usage = 0;
+  for (auto i = 0u; i < count; i++) {
+    const VmaBudget& budget = budgets[i];
+    total_usage += budget.usage;
+  }
+  // Convert bytes to MB.
+  total_usage *= 1e-6;
+  return total_usage;
 }
 
-// |Allocator|
-ISize AllocatorVK::GetMaxTextureSizeSupported() const {
-  // TODO(magicianA): Get correct max texture size for Vulkan.
-  // 4096 is the required limit, see below:
-  // https://registry.khronos.org/vulkan/specs/1.2-extensions/html/vkspec.html#limits-minmax
-  return {4096, 4096};
+void AllocatorVK::DebugTraceMemoryStatistics() const {
+#ifdef IMPELLER_DEBUG
+  FML_TRACE_COUNTER("flutter", "AllocatorVK",
+                    reinterpret_cast<int64_t>(this),  // Trace Counter ID
+                    "MemoryBudgetUsageMB", DebugGetHeapUsage());
+#endif  // IMPELLER_DEBUG
 }
 
 }  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/allocator_vk.h b/impeller/renderer/backend/vulkan/allocator_vk.h
index 02b76623407e9c294a912c9fd01a0d57e83ce012..a664c84f4a9afed7d9f9526f91d59afa9a829cdc 100644
--- a/impeller/renderer/backend/vulkan/allocator_vk.h
+++ b/impeller/renderer/backend/vulkan/allocator_vk.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_ALLOCATOR_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_ALLOCATOR_VK_H_
 
-#include "flutter/fml/macros.h"
-#include "flutter/fml/memory/ref_ptr.h"
-#include "flutter/vulkan/procs/vulkan_proc_table.h"
-#include "impeller/renderer/allocator.h"
+#include "impeller/core/allocator.h"
 #include "impeller/renderer/backend/vulkan/context_vk.h"
 #include "impeller/renderer/backend/vulkan/device_buffer_vk.h"
+#include "impeller/renderer/backend/vulkan/device_holder_vk.h"
 #include "impeller/renderer/backend/vulkan/vk.h"
 
+#include <cstdint>
 #include <memory>
 
 namespace impeller {
@@ -21,22 +21,44 @@ class AllocatorVK final : public Allocator {
   // |Allocator|
   ~AllocatorVK() override;
 
+  // Visible for testing
+  size_t DebugGetHeapUsage() const;
+
+  /// @brief Select a matching memory type for the given
+  ///        [memory_type_bits_requirement], or -1 if none is found.
+  ///
+  ///        This only returns memory types with deviceLocal allocations.
+  static int32_t FindMemoryTypeIndex(
+      uint32_t memory_type_bits_requirement,
+      vk::PhysicalDeviceMemoryProperties& memory_properties);
+
+  // Visible for testing.
+  static vk::ImageUsageFlags ToVKImageUsageFlags(
+      PixelFormat format,
+      TextureUsageMask usage,
+      StorageMode mode,
+      bool supports_memoryless_textures);
+
  private:
   friend class ContextVK;
 
-  fml::RefPtr<vulkan::VulkanProcTable> vk_;
-  VmaAllocator allocator_ = {};
-  ContextVK& context_;
-  vk::Device device_;
+  UniqueAllocatorVMA allocator_;
+  UniquePoolVMA staging_buffer_pool_;
+  std::weak_ptr<Context> context_;
+  std::weak_ptr<DeviceHolderVK> device_holder_;
+  ISize max_texture_size_;
   bool is_valid_ = false;
+  bool supports_memoryless_textures_ = false;
+  // TODO(jonahwilliams): figure out why CI can't create these buffer pools.
+  bool created_buffer_pool_ = true;
+  vk::PhysicalDeviceMemoryProperties memory_properties_;
 
-  AllocatorVK(ContextVK& context,
+  AllocatorVK(std::weak_ptr<Context> context,
               uint32_t vulkan_api_version,
               const vk::PhysicalDevice& physical_device,
-              const vk::Device& logical_device,
+              const std::shared_ptr<DeviceHolderVK>& device_holder,
               const vk::Instance& instance,
-              PFN_vkGetInstanceProcAddr get_instance_proc_address,
-              PFN_vkGetDeviceProcAddr get_device_proc_address);
+              const CapabilitiesVK& capabilities);
 
   // |Allocator|
   bool IsValid() const;
@@ -52,9 +74,14 @@ class AllocatorVK final : public Allocator {
   // |Allocator|
   ISize GetMaxTextureSizeSupported() const override;
 
-  DeviceBufferAllocationVK CreateHostVisibleDeviceAllocation(size_t size);
+  // |Allocator|
+  void DebugTraceMemoryStatistics() const override;
+
+  AllocatorVK(const AllocatorVK&) = delete;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(AllocatorVK);
+  AllocatorVK& operator=(const AllocatorVK&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_ALLOCATOR_VK_H_
diff --git a/impeller/renderer/backend/vulkan/allocator_vk_unittests.cc b/impeller/renderer/backend/vulkan/allocator_vk_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..f8326c983345cd9b1b76e63dc7a850e6ebf0c7b4
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/allocator_vk_unittests.cc
@@ -0,0 +1,98 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/testing/testing.h"  // IWYU pragma: keep
+#include "gtest/gtest.h"
+#include "impeller/core/device_buffer_descriptor.h"
+#include "impeller/core/formats.h"
+#include "impeller/renderer/backend/vulkan/allocator_vk.h"
+#include "impeller/renderer/backend/vulkan/test/mock_vulkan.h"
+#include "vulkan/vulkan_enums.hpp"
+
+namespace impeller {
+namespace testing {
+
+TEST(AllocatorVKTest, ToVKImageUsageFlags) {
+  EXPECT_EQ(AllocatorVK::ToVKImageUsageFlags(
+                PixelFormat::kR8G8B8A8UNormInt,
+                static_cast<TextureUsageMask>(TextureUsage::kRenderTarget),
+                StorageMode::kDeviceTransient,
+                /*supports_memoryless_textures=*/true),
+            vk::ImageUsageFlagBits::eInputAttachment |
+                vk::ImageUsageFlagBits::eColorAttachment |
+                vk::ImageUsageFlagBits::eTransientAttachment);
+
+  EXPECT_EQ(AllocatorVK::ToVKImageUsageFlags(
+                PixelFormat::kD24UnormS8Uint,
+                static_cast<TextureUsageMask>(TextureUsage::kRenderTarget),
+                StorageMode::kDeviceTransient,
+                /*supports_memoryless_textures=*/true),
+            vk::ImageUsageFlagBits::eDepthStencilAttachment |
+                vk::ImageUsageFlagBits::eTransientAttachment);
+}
+
+TEST(AllocatorVKTest, MemoryTypeSelectionSingleHeap) {
+  vk::PhysicalDeviceMemoryProperties properties;
+  properties.memoryTypeCount = 1;
+  properties.memoryHeapCount = 1;
+  properties.memoryTypes[0].heapIndex = 0;
+  properties.memoryTypes[0].propertyFlags =
+      vk::MemoryPropertyFlagBits::eDeviceLocal;
+  properties.memoryHeaps[0].size = 1024 * 1024 * 1024;
+  properties.memoryHeaps[0].flags = vk::MemoryHeapFlagBits::eDeviceLocal;
+
+  EXPECT_EQ(AllocatorVK::FindMemoryTypeIndex(1, properties), 0);
+  EXPECT_EQ(AllocatorVK::FindMemoryTypeIndex(2, properties), -1);
+  EXPECT_EQ(AllocatorVK::FindMemoryTypeIndex(3, properties), 0);
+}
+
+TEST(AllocatorVKTest, MemoryTypeSelectionTwoHeap) {
+  vk::PhysicalDeviceMemoryProperties properties;
+  properties.memoryTypeCount = 2;
+  properties.memoryHeapCount = 2;
+  properties.memoryTypes[0].heapIndex = 0;
+  properties.memoryTypes[0].propertyFlags =
+      vk::MemoryPropertyFlagBits::eHostVisible;
+  properties.memoryHeaps[0].size = 1024 * 1024 * 1024;
+  properties.memoryHeaps[0].flags = vk::MemoryHeapFlagBits::eDeviceLocal;
+
+  properties.memoryTypes[1].heapIndex = 1;
+  properties.memoryTypes[1].propertyFlags =
+      vk::MemoryPropertyFlagBits::eDeviceLocal;
+  properties.memoryHeaps[1].size = 1024 * 1024 * 1024;
+  properties.memoryHeaps[1].flags = vk::MemoryHeapFlagBits::eDeviceLocal;
+
+  // First fails because this only looks for eDeviceLocal.
+  EXPECT_EQ(AllocatorVK::FindMemoryTypeIndex(1, properties), -1);
+  EXPECT_EQ(AllocatorVK::FindMemoryTypeIndex(2, properties), 1);
+  EXPECT_EQ(AllocatorVK::FindMemoryTypeIndex(3, properties), 1);
+  EXPECT_EQ(AllocatorVK::FindMemoryTypeIndex(4, properties), -1);
+}
+
+#ifdef IMPELLER_DEBUG
+
+TEST(AllocatorVKTest, RecreateSwapchainWhenSizeChanges) {
+  auto const context = MockVulkanContextBuilder().Build();
+  auto allocator = context->GetResourceAllocator();
+
+  EXPECT_EQ(
+      reinterpret_cast<AllocatorVK*>(allocator.get())->DebugGetHeapUsage(), 0u);
+
+  allocator->CreateBuffer(DeviceBufferDescriptor{
+      .storage_mode = StorageMode::kDevicePrivate,
+      .size = 1024,
+  });
+
+  // Usage increases beyond the size of the allocated buffer since VMA will
+  // first allocate large blocks of memory and then suballocate small memory
+  // allocations.
+  EXPECT_EQ(
+      reinterpret_cast<AllocatorVK*>(allocator.get())->DebugGetHeapUsage(),
+      16u);
+}
+
+#endif  // IMPELLER_DEBUG
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/android/ahb_texture_source_vk.cc b/impeller/renderer/backend/vulkan/android/ahb_texture_source_vk.cc
new file mode 100644
index 0000000000000000000000000000000000000000..2ff45078fa5dc7aa8e93f0953c74e44147a3fe77
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/android/ahb_texture_source_vk.cc
@@ -0,0 +1,394 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/backend/vulkan/android/ahb_texture_source_vk.h"
+
+#include "impeller/renderer/backend/vulkan/allocator_vk.h"
+#include "impeller/renderer/backend/vulkan/context_vk.h"
+#include "impeller/renderer/backend/vulkan/texture_source_vk.h"
+#include "impeller/renderer/backend/vulkan/yuv_conversion_library_vk.h"
+
+namespace impeller {
+
+using AHBProperties = vk::StructureChain<
+    // For VK_ANDROID_external_memory_android_hardware_buffer
+    vk::AndroidHardwareBufferPropertiesANDROID,
+    // For VK_ANDROID_external_memory_android_hardware_buffer
+    vk::AndroidHardwareBufferFormatPropertiesANDROID>;
+
+static vk::UniqueImage CreateVKImageWrapperForAndroidHarwareBuffer(
+    const vk::Device& device,
+    const AHBProperties& ahb_props,
+    const AHardwareBuffer_Desc& ahb_desc) {
+  const auto& ahb_format =
+      ahb_props.get<vk::AndroidHardwareBufferFormatPropertiesANDROID>();
+
+  vk::StructureChain<vk::ImageCreateInfo,
+                     // For VK_KHR_external_memory
+                     vk::ExternalMemoryImageCreateInfo,
+                     // For VK_ANDROID_external_memory_android_hardware_buffer
+                     vk::ExternalFormatANDROID>
+      image_chain;
+
+  auto& image_info = image_chain.get<vk::ImageCreateInfo>();
+
+  vk::ImageUsageFlags image_usage_flags;
+  if (ahb_desc.usage & AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE) {
+    image_usage_flags |= vk::ImageUsageFlagBits::eSampled;
+  }
+  if (ahb_desc.usage & AHARDWAREBUFFER_USAGE_GPU_FRAMEBUFFER) {
+    image_usage_flags |= vk::ImageUsageFlagBits::eColorAttachment;
+  }
+
+  vk::ImageCreateFlags image_create_flags;
+  if (ahb_desc.usage & AHARDWAREBUFFER_USAGE_PROTECTED_CONTENT) {
+    image_create_flags |= vk::ImageCreateFlagBits::eProtected;
+  }
+  if (ahb_desc.usage & AHARDWAREBUFFER_USAGE_GPU_CUBE_MAP) {
+    image_create_flags |= vk::ImageCreateFlagBits::eCubeCompatible;
+  }
+
+  image_info.imageType = vk::ImageType::e2D;
+  image_info.format = ahb_format.format;
+  image_info.extent.width = ahb_desc.width;
+  image_info.extent.height = ahb_desc.height;
+  image_info.extent.depth = 1;
+  image_info.mipLevels =
+      (ahb_desc.usage & AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE)
+          ? ISize{ahb_desc.width, ahb_desc.height}.MipCount()
+          : 1u;
+  image_info.arrayLayers = ahb_desc.layers;
+  image_info.samples = vk::SampleCountFlagBits::e1;
+  image_info.tiling = vk::ImageTiling::eOptimal;
+  image_info.usage = image_usage_flags;
+  image_info.flags = image_create_flags;
+  image_info.sharingMode = vk::SharingMode::eExclusive;
+  image_info.initialLayout = vk::ImageLayout::eUndefined;
+
+  image_chain.get<vk::ExternalMemoryImageCreateInfo>().handleTypes =
+      vk::ExternalMemoryHandleTypeFlagBits::eAndroidHardwareBufferANDROID;
+
+  // If the format isn't natively supported by Vulkan (i.e, be a part of the
+  // base vkFormat enum), an untyped "external format" must be specified when
+  // creating the image and the image views. Usually includes YUV formats.
+  if (ahb_format.format == vk::Format::eUndefined) {
+    image_chain.get<vk::ExternalFormatANDROID>().externalFormat =
+        ahb_format.externalFormat;
+  } else {
+    image_chain.unlink<vk::ExternalFormatANDROID>();
+  }
+
+  auto image = device.createImageUnique(image_chain.get());
+  if (image.result != vk::Result::eSuccess) {
+    VALIDATION_LOG << "Could not create image for external buffer: "
+                   << vk::to_string(image.result);
+    return {};
+  }
+
+  return std::move(image.value);
+}
+
+static vk::UniqueDeviceMemory ImportVKDeviceMemoryFromAndroidHarwareBuffer(
+    const vk::Device& device,
+    const vk::PhysicalDevice& physical_device,
+    const vk::Image& image,
+    struct AHardwareBuffer* hardware_buffer,
+    const AHBProperties& ahb_props) {
+  vk::PhysicalDeviceMemoryProperties memory_properties;
+  physical_device.getMemoryProperties(&memory_properties);
+  int memory_type_index = AllocatorVK::FindMemoryTypeIndex(
+      ahb_props.get().memoryTypeBits, memory_properties);
+  if (memory_type_index < 0) {
+    VALIDATION_LOG << "Could not find memory type of external image.";
+    return {};
+  }
+
+  vk::StructureChain<vk::MemoryAllocateInfo,
+                     // Core in 1.1
+                     vk::MemoryDedicatedAllocateInfo,
+                     // For VK_ANDROID_external_memory_android_hardware_buffer
+                     vk::ImportAndroidHardwareBufferInfoANDROID>
+      memory_chain;
+
+  auto& mem_alloc_info = memory_chain.get<vk::MemoryAllocateInfo>();
+  mem_alloc_info.allocationSize = ahb_props.get().allocationSize;
+  mem_alloc_info.memoryTypeIndex = memory_type_index;
+
+  auto& dedicated_alloc_info =
+      memory_chain.get<vk::MemoryDedicatedAllocateInfo>();
+  dedicated_alloc_info.image = image;
+
+  auto& ahb_import_info =
+      memory_chain.get<vk::ImportAndroidHardwareBufferInfoANDROID>();
+  ahb_import_info.buffer = hardware_buffer;
+
+  auto device_memory = device.allocateMemoryUnique(memory_chain.get());
+  if (device_memory.result != vk::Result::eSuccess) {
+    VALIDATION_LOG << "Could not allocate device memory for external image : "
+                   << vk::to_string(device_memory.result);
+    return {};
+  }
+
+  return std::move(device_memory.value);
+}
+
+static std::shared_ptr<YUVConversionVK> CreateYUVConversion(
+    const ContextVK& context,
+    const AHBProperties& ahb_props) {
+  YUVConversionDescriptorVK conversion_chain;
+
+  const auto& ahb_format =
+      ahb_props.get<vk::AndroidHardwareBufferFormatPropertiesANDROID>();
+
+  auto& conversion_info = conversion_chain.get();
+
+  conversion_info.format = ahb_format.format;
+  conversion_info.ycbcrModel = ahb_format.suggestedYcbcrModel;
+  conversion_info.ycbcrRange = ahb_format.suggestedYcbcrRange;
+  conversion_info.components = ahb_format.samplerYcbcrConversionComponents;
+  conversion_info.xChromaOffset = ahb_format.suggestedXChromaOffset;
+  conversion_info.yChromaOffset = ahb_format.suggestedYChromaOffset;
+  // If the potential format features of the sampler Y′CBCR conversion do not
+  // support VK_FORMAT_FEATURE_SAMPLED_IMAGE_YCBCR_CONVERSION_LINEAR_FILTER_BIT,
+  // chromaFilter must not be VK_FILTER_LINEAR.
+  //
+  // Since we are not checking, let's just default to a safe value.
+  conversion_info.chromaFilter = vk::Filter::eNearest;
+  conversion_info.forceExplicitReconstruction = false;
+
+  if (conversion_info.format == vk::Format::eUndefined) {
+    auto& external_format = conversion_chain.get<vk::ExternalFormatANDROID>();
+    external_format.externalFormat = ahb_format.externalFormat;
+  } else {
+    conversion_chain.unlink<vk::ExternalFormatANDROID>();
+  }
+
+  return context.GetYUVConversionLibrary()->GetConversion(conversion_chain);
+}
+
+static vk::UniqueImageView CreateVKImageView(
+    const vk::Device& device,
+    const vk::Image& image,
+    const vk::SamplerYcbcrConversion& yuv_conversion,
+    const AHBProperties& ahb_props,
+    const AHardwareBuffer_Desc& ahb_desc) {
+  const auto& ahb_format =
+      ahb_props.get<vk::AndroidHardwareBufferFormatPropertiesANDROID>();
+
+  vk::StructureChain<vk::ImageViewCreateInfo,
+                     // Core in 1.1
+                     vk::SamplerYcbcrConversionInfo>
+      view_chain;
+
+  auto& view_info = view_chain.get();
+
+  view_info.image = image;
+  view_info.viewType = vk::ImageViewType::e2D;
+  view_info.format = ahb_format.format;
+  view_info.subresourceRange.aspectMask = vk::ImageAspectFlagBits::eColor;
+  view_info.subresourceRange.baseMipLevel = 0u;
+  view_info.subresourceRange.baseArrayLayer = 0u;
+  view_info.subresourceRange.levelCount =
+      (ahb_desc.usage & AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE)
+          ? ISize{ahb_desc.width, ahb_desc.height}.MipCount()
+          : 1u;
+  view_info.subresourceRange.layerCount = ahb_desc.layers;
+
+  // We need a custom YUV conversion only if we don't recognize the format.
+  if (view_info.format == vk::Format::eUndefined) {
+    view_chain.get<vk::SamplerYcbcrConversionInfo>().conversion =
+        yuv_conversion;
+  } else {
+    view_chain.unlink<vk::SamplerYcbcrConversionInfo>();
+  }
+
+  auto image_view = device.createImageViewUnique(view_info);
+  if (image_view.result != vk::Result::eSuccess) {
+    VALIDATION_LOG << "Could not create external image view: "
+                   << vk::to_string(image_view.result);
+    return {};
+  }
+
+  return std::move(image_view.value);
+}
+
+static PixelFormat ToPixelFormat(AHardwareBuffer_Format format) {
+  switch (format) {
+    case AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM:
+      return PixelFormat::kR8G8B8A8UNormInt;
+    case AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT:
+      return PixelFormat::kR16G16B16A16Float;
+    case AHARDWAREBUFFER_FORMAT_D24_UNORM_S8_UINT:
+      return PixelFormat::kD24UnormS8Uint;
+    case AHARDWAREBUFFER_FORMAT_D32_FLOAT_S8_UINT:
+      return PixelFormat::kD32FloatS8UInt;
+    case AHARDWAREBUFFER_FORMAT_S8_UINT:
+      return PixelFormat::kS8UInt;
+    case AHARDWAREBUFFER_FORMAT_R8_UNORM:
+      return PixelFormat::kR8UNormInt;
+    case AHARDWAREBUFFER_FORMAT_R10G10B10A10_UNORM:
+    case AHARDWAREBUFFER_FORMAT_R16G16_UINT:
+    case AHARDWAREBUFFER_FORMAT_D32_FLOAT:
+    case AHARDWAREBUFFER_FORMAT_R16_UINT:
+    case AHARDWAREBUFFER_FORMAT_D24_UNORM:
+    case AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420:
+    case AHARDWAREBUFFER_FORMAT_YCbCr_P010:
+    case AHARDWAREBUFFER_FORMAT_BLOB:
+    case AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM:
+    case AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM:
+    case AHARDWAREBUFFER_FORMAT_R8G8B8_UNORM:
+    case AHARDWAREBUFFER_FORMAT_D16_UNORM:
+    case AHARDWAREBUFFER_FORMAT_R8G8B8X8_UNORM:
+      // Not understood by the rest of Impeller. Use a placeholder but create
+      // the native image and image views using the right external format.
+      break;
+  }
+  return PixelFormat::kR8G8B8A8UNormInt;
+}
+
+static TextureType ToTextureType(const AHardwareBuffer_Desc& ahb_desc) {
+  if (ahb_desc.layers == 1u) {
+    return TextureType::kTexture2D;
+  }
+  if (ahb_desc.layers % 6u == 0 &&
+      (ahb_desc.usage & AHARDWAREBUFFER_USAGE_GPU_CUBE_MAP)) {
+    return TextureType::kTextureCube;
+  }
+  // Our texture types seem to understand external OES textures. Should these be
+  // wired up instead?
+  return TextureType::kTexture2D;
+}
+
+static TextureDescriptor ToTextureDescriptor(
+    const AHardwareBuffer_Desc& ahb_desc) {
+  const auto ahb_size = ISize{ahb_desc.width, ahb_desc.height};
+  TextureDescriptor desc;
+  // We are not going to touch hardware buffers on the CPU or use them as
+  // transient attachments. Just treat them as device private.
+  desc.storage_mode = StorageMode::kDevicePrivate;
+  desc.format =
+      ToPixelFormat(static_cast<AHardwareBuffer_Format>(ahb_desc.format));
+  desc.size = ahb_size;
+  desc.type = ToTextureType(ahb_desc);
+  desc.sample_count = SampleCount::kCount1;
+  desc.compression_type = CompressionType::kLossless;
+  desc.mip_count = (ahb_desc.usage & AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE)
+                       ? ahb_size.MipCount()
+                       : 1u;
+  return desc;
+}
+
+AHBTextureSourceVK::AHBTextureSourceVK(
+    const std::shared_ptr<ContextVK>& context,
+    struct AHardwareBuffer* ahb,
+    const AHardwareBuffer_Desc& ahb_desc)
+    : TextureSourceVK(ToTextureDescriptor(ahb_desc)) {
+  if (!context) {
+    VALIDATION_LOG << "Invalid context.";
+    return;
+  }
+
+  const auto& device = context->GetDevice();
+  const auto& physical_device = context->GetPhysicalDevice();
+
+  AHBProperties ahb_props;
+
+  if (device.getAndroidHardwareBufferPropertiesANDROID(ahb, &ahb_props.get()) !=
+      vk::Result::eSuccess) {
+    VALIDATION_LOG << "Could not determine properties of the Android hardware "
+                      "buffer.";
+    return;
+  }
+
+  const auto& ahb_format =
+      ahb_props.get<vk::AndroidHardwareBufferFormatPropertiesANDROID>();
+
+  // Create an image to refer to our external image.
+  auto image =
+      CreateVKImageWrapperForAndroidHarwareBuffer(device, ahb_props, ahb_desc);
+  if (!image) {
+    return;
+  }
+
+  // Create a device memory allocation to refer to our external image.
+  auto device_memory = ImportVKDeviceMemoryFromAndroidHarwareBuffer(
+      device, physical_device, image.get(), ahb, ahb_props);
+  if (!device_memory) {
+    return;
+  }
+
+  // Bind the image to the image memory.
+  if (auto result = device.bindImageMemory(image.get(), device_memory.get(), 0);
+      result != vk::Result::eSuccess) {
+    VALIDATION_LOG << "Could not bind external device memory to image : "
+                   << vk::to_string(result);
+    return;
+  }
+
+  // Figure out how to perform YUV conversions.
+  auto yuv_conversion = CreateYUVConversion(*context, ahb_props);
+  if (!yuv_conversion || !yuv_conversion->IsValid()) {
+    return;
+  }
+
+  // Create image view for the newly created image.
+  auto image_view = CreateVKImageView(device,                           //
+                                      image.get(),                      //
+                                      yuv_conversion->GetConversion(),  //
+                                      ahb_props,                        //
+                                      ahb_desc                          //
+  );
+  if (!image_view) {
+    return;
+  }
+
+  needs_yuv_conversion_ = ahb_format.format == vk::Format::eUndefined;
+  device_memory_ = std::move(device_memory);
+  image_ = std::move(image);
+  yuv_conversion_ = std::move(yuv_conversion);
+  image_view_ = std::move(image_view);
+
+#ifdef IMPELLER_DEBUG
+  context->SetDebugName(device_memory_.get(), "AHB Device Memory");
+  context->SetDebugName(image_.get(), "AHB Image");
+  context->SetDebugName(yuv_conversion_->GetConversion(), "AHB YUV Conversion");
+  context->SetDebugName(image_view_.get(), "AHB ImageView");
+#endif  // IMPELLER_DEBUG
+
+  is_valid_ = true;
+}
+
+// |TextureSourceVK|
+AHBTextureSourceVK::~AHBTextureSourceVK() = default;
+
+bool AHBTextureSourceVK::IsValid() const {
+  return is_valid_;
+}
+
+// |TextureSourceVK|
+vk::Image AHBTextureSourceVK::GetImage() const {
+  return image_.get();
+}
+
+// |TextureSourceVK|
+vk::ImageView AHBTextureSourceVK::GetImageView() const {
+  return image_view_.get();
+}
+
+// |TextureSourceVK|
+vk::ImageView AHBTextureSourceVK::GetRenderTargetView() const {
+  return image_view_.get();
+}
+
+// |TextureSourceVK|
+bool AHBTextureSourceVK::IsSwapchainImage() const {
+  return false;
+}
+
+// |TextureSourceVK|
+std::shared_ptr<YUVConversionVK> AHBTextureSourceVK::GetYUVConversion() const {
+  return needs_yuv_conversion_ ? yuv_conversion_ : nullptr;
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/android/ahb_texture_source_vk.h b/impeller/renderer/backend/vulkan/android/ahb_texture_source_vk.h
new file mode 100644
index 0000000000000000000000000000000000000000..c36a7c5652e4e061e147d45af7a9a8be66ed541c
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/android/ahb_texture_source_vk.h
@@ -0,0 +1,75 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_ANDROID_AHB_TEXTURE_SOURCE_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_ANDROID_AHB_TEXTURE_SOURCE_VK_H_
+
+#include "flutter/fml/macros.h"
+#include "impeller/geometry/size.h"
+#include "impeller/renderer/backend/vulkan/formats_vk.h"
+#include "impeller/renderer/backend/vulkan/texture_source_vk.h"
+#include "impeller/renderer/backend/vulkan/vk.h"
+#include "impeller/renderer/backend/vulkan/yuv_conversion_vk.h"
+
+#include <android/hardware_buffer.h>
+#include <android/hardware_buffer_jni.h>
+
+namespace impeller {
+
+class ContextVK;
+
+//------------------------------------------------------------------------------
+/// @brief      A texture source that wraps an instance of AHardwareBuffer.
+///
+///             The formats and conversions supported by Android Hardware
+///             Buffers are a superset of those supported by Impeller (and
+///             Vulkan for that matter). Impeller and Vulkan descriptors
+///             obtained from the these texture sources are advisory and it
+///             usually isn't possible to create copies of images and image
+///             views held in these texture sources using the inferred
+///             descriptors. The objects are meant to be used directly (either
+///             as render targets or sources for sampling), not copied.
+///
+class AHBTextureSourceVK final : public TextureSourceVK {
+ public:
+  AHBTextureSourceVK(const std::shared_ptr<ContextVK>& context,
+                     struct AHardwareBuffer* hardware_buffer,
+                     const AHardwareBuffer_Desc& hardware_buffer_desc);
+
+  // |TextureSourceVK|
+  ~AHBTextureSourceVK() override;
+
+  // |TextureSourceVK|
+  vk::Image GetImage() const override;
+
+  // |TextureSourceVK|
+  vk::ImageView GetImageView() const override;
+
+  // |TextureSourceVK|
+  vk::ImageView GetRenderTargetView() const override;
+
+  bool IsValid() const;
+
+  // |TextureSourceVK|
+  bool IsSwapchainImage() const override;
+
+  // |TextureSourceVK|
+  std::shared_ptr<YUVConversionVK> GetYUVConversion() const override;
+
+ private:
+  vk::UniqueDeviceMemory device_memory_ = {};
+  vk::UniqueImage image_ = {};
+  vk::UniqueImageView image_view_ = {};
+  std::shared_ptr<YUVConversionVK> yuv_conversion_ = {};
+  bool needs_yuv_conversion_ = false;
+  bool is_valid_ = false;
+
+  AHBTextureSourceVK(const AHBTextureSourceVK&) = delete;
+
+  AHBTextureSourceVK& operator=(const AHBTextureSourceVK&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_ANDROID_AHB_TEXTURE_SOURCE_VK_H_
diff --git a/impeller/renderer/backend/vulkan/barrier_vk.cc b/impeller/renderer/backend/vulkan/barrier_vk.cc
new file mode 100644
index 0000000000000000000000000000000000000000..e318de5787592f29de7b181bf15e1f1c22d4f574
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/barrier_vk.cc
@@ -0,0 +1,7 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/backend/vulkan/barrier_vk.h"
+
+namespace impeller {}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/barrier_vk.h b/impeller/renderer/backend/vulkan/barrier_vk.h
new file mode 100644
index 0000000000000000000000000000000000000000..bded9c3d5dc5d9ae8cc0ff79985e8a3aaf46c472
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/barrier_vk.h
@@ -0,0 +1,55 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_BARRIER_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_BARRIER_VK_H_
+
+#include "flutter/fml/macros.h"
+#include "impeller/renderer/backend/vulkan/vk.h"
+
+namespace impeller {
+
+//------------------------------------------------------------------------------
+/// @brief      Defines an operations and memory access barrier on a resource.
+///
+///             For further reading, see
+///             https://www.khronos.org/events/vulkan-how-to-use-synchronisation-validation-across-multiple-queues-and-command-buffers
+///             and the Vulkan spec. The docs for the various member of this
+///             class are based on verbiage in the spec.
+///
+///             A useful mnemonic for building a mental model of how to add
+///             these barriers is to build a sentence like so; "All commands
+///             before this barrier may continue till they encounter a <src
+///             access> in the <src pipeline stage>. And, all commands after
+///             this barrier may proceed till <dst access> in the <dst pipeline
+///             stage>."
+///
+struct BarrierVK {
+  vk::CommandBuffer cmd_buffer = {};
+  vk::ImageLayout new_layout = vk::ImageLayout::eUndefined;
+
+  // The first synchronization scope defines what operations the barrier waits
+  // for to be done. In the Vulkan spec, this is usually referred to as the src
+  // scope.
+  vk::PipelineStageFlags src_stage = vk::PipelineStageFlagBits::eNone;
+
+  // The first access scope defines what memory operations are guaranteed to
+  // happen before the barrier. In the Vulkan spec, this is usually referred to
+  // as the src scope.
+  vk::AccessFlags src_access = vk::AccessFlagBits::eNone;
+
+  // The second synchronization scope defines what operations wait for the
+  // barrier to be done. In the Vulkan spec, this is usually referred to as the
+  // dst scope.
+  vk::PipelineStageFlags dst_stage = vk::PipelineStageFlagBits::eNone;
+
+  // The second access scope defines what memory operations are prevented from
+  // running till after the barrier. In the Vulkan spec, this is usually
+  // referred to as the dst scope.
+  vk::AccessFlags dst_access = vk::AccessFlagBits::eNone;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_BARRIER_VK_H_
diff --git a/impeller/renderer/backend/vulkan/blit_command_vk.cc b/impeller/renderer/backend/vulkan/blit_command_vk.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c3c2ebcf88bf100a50c424dbf6ae3b72acefdf30
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/blit_command_vk.cc
@@ -0,0 +1,386 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/backend/vulkan/blit_command_vk.h"
+
+#include <cstdint>
+
+#include "impeller/renderer/backend/vulkan/command_encoder_vk.h"
+#include "impeller/renderer/backend/vulkan/texture_vk.h"
+
+namespace impeller {
+
+BlitEncodeVK::~BlitEncodeVK() = default;
+
+//------------------------------------------------------------------------------
+/// BlitCopyTextureToTextureCommandVK
+///
+
+BlitCopyTextureToTextureCommandVK::~BlitCopyTextureToTextureCommandVK() =
+    default;
+
+std::string BlitCopyTextureToTextureCommandVK::GetLabel() const {
+  return label;
+}
+
+bool BlitCopyTextureToTextureCommandVK::Encode(
+    CommandEncoderVK& encoder) const {
+  const auto& cmd_buffer = encoder.GetCommandBuffer();
+
+  const auto& src = TextureVK::Cast(*source);
+  const auto& dst = TextureVK::Cast(*destination);
+
+  if (!encoder.Track(source) || !encoder.Track(destination)) {
+    return false;
+  }
+
+  BarrierVK src_barrier;
+  src_barrier.cmd_buffer = cmd_buffer;
+  src_barrier.new_layout = vk::ImageLayout::eTransferSrcOptimal;
+  src_barrier.src_access = vk::AccessFlagBits::eTransferWrite |
+                           vk::AccessFlagBits::eShaderWrite |
+                           vk::AccessFlagBits::eColorAttachmentWrite;
+  src_barrier.src_stage = vk::PipelineStageFlagBits::eTransfer |
+                          vk::PipelineStageFlagBits::eFragmentShader |
+                          vk::PipelineStageFlagBits::eColorAttachmentOutput;
+  src_barrier.dst_access = vk::AccessFlagBits::eTransferRead;
+  src_barrier.dst_stage = vk::PipelineStageFlagBits::eTransfer;
+
+  BarrierVK dst_barrier;
+  dst_barrier.cmd_buffer = cmd_buffer;
+  dst_barrier.new_layout = vk::ImageLayout::eTransferDstOptimal;
+  dst_barrier.src_access = {};
+  dst_barrier.src_stage = vk::PipelineStageFlagBits::eTopOfPipe;
+  dst_barrier.dst_access =
+      vk::AccessFlagBits::eShaderRead | vk::AccessFlagBits::eTransferWrite;
+  dst_barrier.dst_stage = vk::PipelineStageFlagBits::eFragmentShader |
+                          vk::PipelineStageFlagBits::eTransfer;
+
+  if (!src.SetLayout(src_barrier) || !dst.SetLayout(dst_barrier)) {
+    VALIDATION_LOG << "Could not complete layout transitions.";
+    return false;
+  }
+
+  vk::ImageCopy image_copy;
+
+  image_copy.setSrcSubresource(
+      vk::ImageSubresourceLayers(vk::ImageAspectFlagBits::eColor, 0, 0, 1));
+  image_copy.setDstSubresource(
+      vk::ImageSubresourceLayers(vk::ImageAspectFlagBits::eColor, 0, 0, 1));
+
+  image_copy.srcOffset =
+      vk::Offset3D(source_region.GetX(), source_region.GetY(), 0);
+  image_copy.dstOffset =
+      vk::Offset3D(destination_origin.x, destination_origin.y, 0);
+  image_copy.extent =
+      vk::Extent3D(source_region.GetWidth(), source_region.GetHeight(), 1);
+
+  // Issue the copy command now that the images are already in the right
+  // layouts.
+  cmd_buffer.copyImage(src.GetImage(),          //
+                       src_barrier.new_layout,  //
+                       dst.GetImage(),          //
+                       dst_barrier.new_layout,  //
+                       image_copy               //
+  );
+
+  // If this is an onscreen texture, do not transition the layout
+  // back to shader read.
+  if (dst.IsSwapchainImage()) {
+    return true;
+  }
+
+  BarrierVK barrier;
+  barrier.cmd_buffer = cmd_buffer;
+  barrier.new_layout = vk::ImageLayout::eShaderReadOnlyOptimal;
+  barrier.src_access = {};
+  barrier.src_stage = vk::PipelineStageFlagBits::eTopOfPipe;
+  barrier.dst_access = vk::AccessFlagBits::eShaderRead;
+  barrier.dst_stage = vk::PipelineStageFlagBits::eFragmentShader;
+
+  return dst.SetLayout(barrier);
+}
+
+//------------------------------------------------------------------------------
+/// BlitCopyTextureToBufferCommandVK
+///
+
+BlitCopyTextureToBufferCommandVK::~BlitCopyTextureToBufferCommandVK() = default;
+
+std::string BlitCopyTextureToBufferCommandVK::GetLabel() const {
+  return label;
+}
+
+bool BlitCopyTextureToBufferCommandVK::Encode(CommandEncoderVK& encoder) const {
+  const auto& cmd_buffer = encoder.GetCommandBuffer();
+
+  // cast source and destination to TextureVK
+  const auto& src = TextureVK::Cast(*source);
+
+  if (!encoder.Track(source) || !encoder.Track(destination)) {
+    return false;
+  }
+
+  BarrierVK barrier;
+  barrier.cmd_buffer = cmd_buffer;
+  barrier.new_layout = vk::ImageLayout::eTransferSrcOptimal;
+  barrier.src_access = vk::AccessFlagBits::eShaderWrite |
+                       vk::AccessFlagBits::eTransferWrite |
+                       vk::AccessFlagBits::eColorAttachmentWrite;
+  barrier.src_stage = vk::PipelineStageFlagBits::eFragmentShader |
+                      vk::PipelineStageFlagBits::eTransfer |
+                      vk::PipelineStageFlagBits::eColorAttachmentOutput;
+  barrier.dst_access = vk::AccessFlagBits::eShaderRead;
+  barrier.dst_stage = vk::PipelineStageFlagBits::eVertexShader |
+                      vk::PipelineStageFlagBits::eFragmentShader;
+
+  const auto& dst = DeviceBufferVK::Cast(*destination);
+
+  vk::BufferImageCopy image_copy;
+  image_copy.setBufferOffset(destination_offset);
+  image_copy.setBufferRowLength(0);
+  image_copy.setBufferImageHeight(0);
+  image_copy.setImageSubresource(
+      vk::ImageSubresourceLayers(vk::ImageAspectFlagBits::eColor, 0, 0, 1));
+  image_copy.setImageOffset(
+      vk::Offset3D(source_region.GetX(), source_region.GetY(), 0));
+  image_copy.setImageExtent(
+      vk::Extent3D(source_region.GetWidth(), source_region.GetHeight(), 1));
+
+  if (!src.SetLayout(barrier)) {
+    VALIDATION_LOG << "Could not encode layout transition.";
+    return false;
+  }
+
+  cmd_buffer.copyImageToBuffer(src.GetImage(),      //
+                               barrier.new_layout,  //
+                               dst.GetBuffer(),     //
+                               image_copy           //
+  );
+
+  // If the buffer is used for readback, then apply a transfer -> host memory
+  // barrier.
+  if (destination->GetDeviceBufferDescriptor().readback) {
+    vk::MemoryBarrier barrier;
+    barrier.srcAccessMask = vk::AccessFlagBits::eTransferWrite;
+    barrier.dstAccessMask = vk::AccessFlagBits::eHostRead;
+
+    cmd_buffer.pipelineBarrier(vk::PipelineStageFlagBits::eTransfer,
+                               vk::PipelineStageFlagBits::eHost, {}, 1,
+                               &barrier, 0, {}, 0, {});
+  }
+
+  return true;
+}
+
+//------------------------------------------------------------------------------
+/// BlitCopyBufferToTextureCommandVK
+///
+
+BlitCopyBufferToTextureCommandVK::~BlitCopyBufferToTextureCommandVK() = default;
+
+std::string BlitCopyBufferToTextureCommandVK::GetLabel() const {
+  return label;
+}
+
+bool BlitCopyBufferToTextureCommandVK::Encode(CommandEncoderVK& encoder) const {
+  const auto& cmd_buffer = encoder.GetCommandBuffer();
+
+  // cast destination to TextureVK
+  const auto& dst = TextureVK::Cast(*destination);
+  const auto& src = DeviceBufferVK::Cast(*source.buffer);
+
+  if (!encoder.Track(source.buffer) || !encoder.Track(destination)) {
+    return false;
+  }
+
+  BarrierVK dst_barrier;
+  dst_barrier.cmd_buffer = cmd_buffer;
+  dst_barrier.new_layout = vk::ImageLayout::eTransferDstOptimal;
+  dst_barrier.src_access = {};
+  dst_barrier.src_stage = vk::PipelineStageFlagBits::eTopOfPipe;
+  dst_barrier.dst_access =
+      vk::AccessFlagBits::eShaderRead | vk::AccessFlagBits::eTransferWrite;
+  dst_barrier.dst_stage = vk::PipelineStageFlagBits::eFragmentShader |
+                          vk::PipelineStageFlagBits::eTransfer;
+
+  vk::BufferImageCopy image_copy;
+  image_copy.setBufferOffset(source.range.offset);
+  image_copy.setBufferRowLength(0);
+  image_copy.setBufferImageHeight(0);
+  image_copy.setImageSubresource(
+      vk::ImageSubresourceLayers(vk::ImageAspectFlagBits::eColor, 0, 0, 1));
+  image_copy.setImageOffset(
+      vk::Offset3D(destination_origin.x, destination_origin.y, 0));
+  image_copy.setImageExtent(vk::Extent3D(destination->GetSize().width,
+                                         destination->GetSize().height, 1));
+
+  if (!dst.SetLayout(dst_barrier)) {
+    VALIDATION_LOG << "Could not encode layout transition.";
+    return false;
+  }
+
+  cmd_buffer.copyBufferToImage(src.GetBuffer(),         //
+                               dst.GetImage(),          //
+                               dst_barrier.new_layout,  //
+                               image_copy               //
+  );
+
+  return true;
+}
+
+//------------------------------------------------------------------------------
+/// BlitGenerateMipmapCommandVK
+///
+
+BlitGenerateMipmapCommandVK::~BlitGenerateMipmapCommandVK() = default;
+
+std::string BlitGenerateMipmapCommandVK::GetLabel() const {
+  return label;
+}
+
+static void InsertImageMemoryBarrier(const vk::CommandBuffer& cmd,
+                                     const vk::Image& image,
+                                     vk::AccessFlags src_access_mask,
+                                     vk::AccessFlags dst_access_mask,
+                                     vk::ImageLayout old_layout,
+                                     vk::ImageLayout new_layout,
+                                     vk::PipelineStageFlags src_stage,
+                                     vk::PipelineStageFlags dst_stage,
+                                     uint32_t base_mip_level,
+                                     uint32_t mip_level_count = 1u) {
+  if (old_layout == new_layout) {
+    return;
+  }
+
+  vk::ImageMemoryBarrier barrier;
+  barrier.srcAccessMask = src_access_mask;
+  barrier.dstAccessMask = dst_access_mask;
+  barrier.oldLayout = old_layout;
+  barrier.newLayout = new_layout;
+  barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+  barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+  barrier.image = image;
+  barrier.subresourceRange.aspectMask = vk::ImageAspectFlagBits::eColor;
+  barrier.subresourceRange.baseMipLevel = base_mip_level;
+  barrier.subresourceRange.levelCount = mip_level_count;
+  barrier.subresourceRange.baseArrayLayer = 0u;
+  barrier.subresourceRange.layerCount = 1u;
+
+  cmd.pipelineBarrier(src_stage, dst_stage, {}, nullptr, nullptr, barrier);
+}
+
+bool BlitGenerateMipmapCommandVK::Encode(CommandEncoderVK& encoder) const {
+  auto& src = TextureVK::Cast(*texture);
+
+  const auto size = src.GetTextureDescriptor().size;
+  uint32_t mip_count = src.GetTextureDescriptor().mip_count;
+
+  if (mip_count < 2u) {
+    return true;
+  }
+
+  const auto& image = src.GetImage();
+  const auto& cmd = encoder.GetCommandBuffer();
+
+  if (!encoder.Track(texture)) {
+    return false;
+  }
+
+  // Transition the base mip level to transfer-src layout so we can read from
+  // it and transition the rest to dst-optimal since they are going to be
+  // written to.
+  InsertImageMemoryBarrier(
+      cmd,                                   // command buffer
+      image,                                 // image
+      vk::AccessFlagBits::eTransferWrite,    // src access mask
+      vk::AccessFlagBits::eTransferRead,     // dst access mask
+      src.GetLayout(),                       // old layout
+      vk::ImageLayout::eTransferSrcOptimal,  // new layout
+      vk::PipelineStageFlagBits::eTransfer,  // src stage
+      vk::PipelineStageFlagBits::eTransfer,  // dst stage
+      0u                                     // mip level
+  );
+  InsertImageMemoryBarrier(
+      cmd,                                   // command buffer
+      image,                                 // image
+      {},                                    // src access mask
+      vk::AccessFlagBits::eTransferWrite,    // dst access mask
+      vk::ImageLayout::eUndefined,           // old layout
+      vk::ImageLayout::eTransferDstOptimal,  // new layout
+      vk::PipelineStageFlagBits::eTransfer,  // src stage
+      vk::PipelineStageFlagBits::eTransfer,  // dst stage
+      1u,                                    // mip level
+      mip_count - 1                          // mip level count
+  );
+
+  // Blit from the base mip level to all other levels.
+  for (size_t mip_level = 1u; mip_level < mip_count; mip_level++) {
+    vk::ImageBlit blit;
+
+    blit.srcSubresource.aspectMask = vk::ImageAspectFlagBits::eColor;
+    blit.srcSubresource.baseArrayLayer = 0u;
+    blit.srcSubresource.layerCount = 1u;
+    blit.srcSubresource.mipLevel = 0u;
+
+    blit.dstSubresource.aspectMask = vk::ImageAspectFlagBits::eColor;
+    blit.dstSubresource.baseArrayLayer = 0u;
+    blit.dstSubresource.layerCount = 1u;
+    blit.dstSubresource.mipLevel = mip_level;
+
+    // offsets[0] is origin.
+    blit.srcOffsets[1].x = size.width;
+    blit.srcOffsets[1].y = size.height;
+    blit.srcOffsets[1].z = 1u;
+
+    // offsets[0] is origin.
+    blit.dstOffsets[1].x = std::max<int32_t>(size.width >> mip_level, 1u);
+    blit.dstOffsets[1].y = std::max<int32_t>(size.height >> mip_level, 1u);
+    blit.dstOffsets[1].z = 1u;
+
+    cmd.blitImage(image,                                 // src image
+                  vk::ImageLayout::eTransferSrcOptimal,  // src layout
+                  image,                                 // dst image
+                  vk::ImageLayout::eTransferDstOptimal,  // dst layout
+                  1u,                                    // region count
+                  &blit,                                 // regions
+                  vk::Filter::eLinear                    // filter
+    );
+  }
+
+  // Transition all mip levels to shader read. The base mip level has a
+  // different "old" layout than the rest now.
+  InsertImageMemoryBarrier(
+      cmd,                                         // command buffer
+      image,                                       // image
+      vk::AccessFlagBits::eTransferWrite,          // src access mask
+      vk::AccessFlagBits::eShaderRead,             // dst access mask
+      vk::ImageLayout::eTransferSrcOptimal,        // old layout
+      vk::ImageLayout::eShaderReadOnlyOptimal,     // new layout
+      vk::PipelineStageFlagBits::eTransfer,        // src stage
+      vk::PipelineStageFlagBits::eFragmentShader,  // dst stage
+      0u                                           // mip level
+  );
+  InsertImageMemoryBarrier(
+      cmd,                                         // command buffer
+      image,                                       // image
+      vk::AccessFlagBits::eTransferWrite,          // src access mask
+      vk::AccessFlagBits::eShaderRead,             // dst access mask
+      vk::ImageLayout::eTransferDstOptimal,        // old layout
+      vk::ImageLayout::eShaderReadOnlyOptimal,     // new layout
+      vk::PipelineStageFlagBits::eTransfer,        // src stage
+      vk::PipelineStageFlagBits::eFragmentShader,  // dst stage
+      1u,                                          // mip level
+      mip_count - 1                                // mip level count
+  );
+
+  // We modified the layouts of this image from underneath it. Tell it its new
+  // state so it doesn't try to perform redundant transitions under the hood.
+  src.SetLayoutWithoutEncoding(vk::ImageLayout::eShaderReadOnlyOptimal);
+  src.SetMipMapGenerated();
+
+  return true;
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/blit_command_vk.h b/impeller/renderer/backend/vulkan/blit_command_vk.h
new file mode 100644
index 0000000000000000000000000000000000000000..7fa7589e55be72cd057dbaeada5d9934e718c15d
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/blit_command_vk.h
@@ -0,0 +1,67 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_BLIT_COMMAND_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_BLIT_COMMAND_VK_H_
+
+#include <memory>
+#include "impeller/base/backend_cast.h"
+#include "impeller/renderer/backend/vulkan/context_vk.h"
+#include "impeller/renderer/blit_command.h"
+#include "impeller/renderer/context.h"
+
+namespace impeller {
+
+class CommandEncoderVK;
+
+// TODO(csg): Should these be backend castable to blit command?
+/// Mixin for dispatching Vulkan commands.
+struct BlitEncodeVK : BackendCast<BlitEncodeVK, BlitCommand> {
+  virtual ~BlitEncodeVK();
+
+  virtual std::string GetLabel() const = 0;
+
+  [[nodiscard]] virtual bool Encode(CommandEncoderVK& encoder) const = 0;
+};
+
+struct BlitCopyTextureToTextureCommandVK
+    : public BlitCopyTextureToTextureCommand,
+      public BlitEncodeVK {
+  ~BlitCopyTextureToTextureCommandVK() override;
+
+  std::string GetLabel() const override;
+
+  [[nodiscard]] bool Encode(CommandEncoderVK& encoder) const override;
+};
+
+struct BlitCopyTextureToBufferCommandVK : public BlitCopyTextureToBufferCommand,
+                                          public BlitEncodeVK {
+  ~BlitCopyTextureToBufferCommandVK() override;
+
+  std::string GetLabel() const override;
+
+  [[nodiscard]] bool Encode(CommandEncoderVK& encoder) const override;
+};
+
+struct BlitCopyBufferToTextureCommandVK : public BlitCopyBufferToTextureCommand,
+                                          public BlitEncodeVK {
+  ~BlitCopyBufferToTextureCommandVK() override;
+
+  std::string GetLabel() const override;
+
+  [[nodiscard]] bool Encode(CommandEncoderVK& encoder) const override;
+};
+
+struct BlitGenerateMipmapCommandVK : public BlitGenerateMipmapCommand,
+                                     public BlitEncodeVK {
+  ~BlitGenerateMipmapCommandVK() override;
+
+  std::string GetLabel() const override;
+
+  [[nodiscard]] bool Encode(CommandEncoderVK& encoder) const override;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_BLIT_COMMAND_VK_H_
diff --git a/impeller/renderer/backend/vulkan/blit_command_vk_unittests.cc b/impeller/renderer/backend/vulkan/blit_command_vk_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..db4fbdf38bf9b6c8f1f251426d9eba3fe1980d57
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/blit_command_vk_unittests.cc
@@ -0,0 +1,82 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/testing/testing.h"  // IWYU pragma: keep
+#include "impeller/renderer/backend/vulkan/blit_command_vk.h"
+#include "impeller/renderer/backend/vulkan/command_encoder_vk.h"
+#include "impeller/renderer/backend/vulkan/test/mock_vulkan.h"
+
+namespace impeller {
+namespace testing {
+
+TEST(BlitCommandVkTest, BlitCopyTextureToTextureCommandVK) {
+  auto context = MockVulkanContextBuilder().Build();
+  auto pool = context->GetCommandPoolRecycler()->Get();
+  auto encoder = std::make_unique<CommandEncoderFactoryVK>(context)->Create();
+  BlitCopyTextureToTextureCommandVK cmd;
+  cmd.source = context->GetResourceAllocator()->CreateTexture({
+      .format = PixelFormat::kR8G8B8A8UNormInt,
+      .size = ISize(100, 100),
+  });
+  cmd.destination = context->GetResourceAllocator()->CreateTexture({
+      .format = PixelFormat::kR8G8B8A8UNormInt,
+      .size = ISize(100, 100),
+  });
+  bool result = cmd.Encode(*encoder.get());
+  EXPECT_TRUE(result);
+  EXPECT_TRUE(encoder->IsTracking(cmd.source));
+  EXPECT_TRUE(encoder->IsTracking(cmd.destination));
+}
+
+TEST(BlitCommandVkTest, BlitCopyTextureToBufferCommandVK) {
+  auto context = MockVulkanContextBuilder().Build();
+  auto encoder = std::make_unique<CommandEncoderFactoryVK>(context)->Create();
+  BlitCopyTextureToBufferCommandVK cmd;
+  cmd.source = context->GetResourceAllocator()->CreateTexture({
+      .format = PixelFormat::kR8G8B8A8UNormInt,
+      .size = ISize(100, 100),
+  });
+  cmd.destination = context->GetResourceAllocator()->CreateBuffer({
+      .size = 1,
+  });
+  bool result = cmd.Encode(*encoder.get());
+  EXPECT_TRUE(result);
+  EXPECT_TRUE(encoder->IsTracking(cmd.source));
+  EXPECT_TRUE(encoder->IsTracking(cmd.destination));
+}
+
+TEST(BlitCommandVkTest, BlitCopyBufferToTextureCommandVK) {
+  auto context = MockVulkanContextBuilder().Build();
+  auto encoder = std::make_unique<CommandEncoderFactoryVK>(context)->Create();
+  BlitCopyBufferToTextureCommandVK cmd;
+  cmd.destination = context->GetResourceAllocator()->CreateTexture({
+      .format = PixelFormat::kR8G8B8A8UNormInt,
+      .size = ISize(100, 100),
+  });
+  cmd.source =
+      DeviceBuffer::AsBufferView(context->GetResourceAllocator()->CreateBuffer({
+          .size = 1,
+      }));
+  bool result = cmd.Encode(*encoder.get());
+  EXPECT_TRUE(result);
+  EXPECT_TRUE(encoder->IsTracking(cmd.source.buffer));
+  EXPECT_TRUE(encoder->IsTracking(cmd.destination));
+}
+
+TEST(BlitCommandVkTest, BlitGenerateMipmapCommandVK) {
+  auto context = MockVulkanContextBuilder().Build();
+  auto encoder = std::make_unique<CommandEncoderFactoryVK>(context)->Create();
+  BlitGenerateMipmapCommandVK cmd;
+  cmd.texture = context->GetResourceAllocator()->CreateTexture({
+      .format = PixelFormat::kR8G8B8A8UNormInt,
+      .size = ISize(100, 100),
+      .mip_count = 2,
+  });
+  bool result = cmd.Encode(*encoder.get());
+  EXPECT_TRUE(result);
+  EXPECT_TRUE(encoder->IsTracking(cmd.texture));
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/blit_pass_vk.cc b/impeller/renderer/backend/vulkan/blit_pass_vk.cc
index 03f0510ada630d7ef7561955d0d2c57049234b97..32f00964c6c9990a7414ab3f02693d56569820a2 100644
--- a/impeller/renderer/backend/vulkan/blit_pass_vk.cc
+++ b/impeller/renderer/backend/vulkan/blit_pass_vk.cc
@@ -4,8 +4,121 @@
 
 #include "impeller/renderer/backend/vulkan/blit_pass_vk.h"
 
+#include "flutter/fml/logging.h"
+#include "flutter/fml/trace_event.h"
+#include "impeller/renderer/backend/vulkan/command_buffer_vk.h"
+
 namespace impeller {
 
-//
+BlitPassVK::BlitPassVK(std::weak_ptr<CommandBufferVK> command_buffer)
+    : command_buffer_(std::move(command_buffer)) {}
+
+BlitPassVK::~BlitPassVK() = default;
+
+void BlitPassVK::OnSetLabel(std::string label) {
+  if (label.empty()) {
+    return;
+  }
+  label_ = std::move(label);
+}
+
+// |BlitPass|
+bool BlitPassVK::IsValid() const {
+  return true;
+}
+
+// |BlitPass|
+bool BlitPassVK::EncodeCommands(
+    const std::shared_ptr<Allocator>& transients_allocator) const {
+  TRACE_EVENT0("impeller", "BlitPassVK::EncodeCommands");
+
+  if (!IsValid()) {
+    return false;
+  }
+
+  auto command_buffer = command_buffer_.lock();
+  if (!command_buffer) {
+    return false;
+  }
+  auto encoder = command_buffer->GetEncoder();
+  if (!encoder) {
+    return false;
+  }
+
+  for (auto& command : commands_) {
+    if (!command->Encode(*encoder)) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+// |BlitPass|
+bool BlitPassVK::OnCopyTextureToTextureCommand(
+    std::shared_ptr<Texture> source,
+    std::shared_ptr<Texture> destination,
+    IRect source_region,
+    IPoint destination_origin,
+    std::string label) {
+  auto command = std::make_unique<BlitCopyTextureToTextureCommandVK>();
+
+  command->source = std::move(source);
+  command->destination = std::move(destination);
+  command->source_region = source_region;
+  command->destination_origin = destination_origin;
+  command->label = std::move(label);
+
+  commands_.push_back(std::move(command));
+  return true;
+}
+
+// |BlitPass|
+bool BlitPassVK::OnCopyTextureToBufferCommand(
+    std::shared_ptr<Texture> source,
+    std::shared_ptr<DeviceBuffer> destination,
+    IRect source_region,
+    size_t destination_offset,
+    std::string label) {
+  auto command = std::make_unique<BlitCopyTextureToBufferCommandVK>();
+
+  command->source = std::move(source);
+  command->destination = std::move(destination);
+  command->source_region = source_region;
+  command->destination_offset = destination_offset;
+  command->label = std::move(label);
+
+  commands_.push_back(std::move(command));
+  return true;
+}
+
+// |BlitPass|
+bool BlitPassVK::OnCopyBufferToTextureCommand(
+    BufferView source,
+    std::shared_ptr<Texture> destination,
+    IPoint destination_origin,
+    std::string label) {
+  auto command = std::make_unique<BlitCopyBufferToTextureCommandVK>();
+
+  command->source = std::move(source);
+  command->destination = std::move(destination);
+  command->destination_origin = destination_origin;
+  command->label = std::move(label);
+
+  commands_.push_back(std::move(command));
+  return true;
+}
+
+// |BlitPass|
+bool BlitPassVK::OnGenerateMipmapCommand(std::shared_ptr<Texture> texture,
+                                         std::string label) {
+  auto command = std::make_unique<BlitGenerateMipmapCommandVK>();
+
+  command->texture = std::move(texture);
+  command->label = std::move(label);
+
+  commands_.push_back(std::move(command));
+  return true;
+}
 
 }  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/blit_pass_vk.h b/impeller/renderer/backend/vulkan/blit_pass_vk.h
index a76e5a71ecb0b233954b052fb915dabeab90beaa..2fc0c26380986dfaae3b9280a73529647024b451 100644
--- a/impeller/renderer/backend/vulkan/blit_pass_vk.h
+++ b/impeller/renderer/backend/vulkan/blit_pass_vk.h
@@ -2,13 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_BLIT_PASS_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_BLIT_PASS_VK_H_
 
 #include "flutter/fml/macros.h"
+#include "flutter/impeller/base/config.h"
+#include "impeller/renderer/backend/vulkan/blit_command_vk.h"
 #include "impeller/renderer/blit_pass.h"
 
 namespace impeller {
 
+class CommandEncoderVK;
+class CommandBufferVK;
+
 class BlitPassVK final : public BlitPass {
  public:
   // |BlitPass|
@@ -17,7 +23,11 @@ class BlitPassVK final : public BlitPass {
  private:
   friend class CommandBufferVK;
 
-  BlitPassVK();
+  std::weak_ptr<CommandBufferVK> command_buffer_;
+  std::vector<std::unique_ptr<BlitEncodeVK>> commands_;
+  std::string label_;
+
+  explicit BlitPassVK(std::weak_ptr<CommandBufferVK> command_buffer);
 
   // |BlitPass|
   bool IsValid() const override;
@@ -44,10 +54,19 @@ class BlitPassVK final : public BlitPass {
                                     std::string label) override;
 
   // |BlitPass|
+  bool OnCopyBufferToTextureCommand(BufferView source,
+                                    std::shared_ptr<Texture> destination,
+                                    IPoint destination_origin,
+                                    std::string label) override;
+  // |BlitPass|
   bool OnGenerateMipmapCommand(std::shared_ptr<Texture> texture,
                                std::string label) override;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(BlitPassVK);
+  BlitPassVK(const BlitPassVK&) = delete;
+
+  BlitPassVK& operator=(const BlitPassVK&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_BLIT_PASS_VK_H_
diff --git a/impeller/renderer/backend/vulkan/capabilities_vk.cc b/impeller/renderer/backend/vulkan/capabilities_vk.cc
index 645ae1cf703756ad271b5a6c94f44bac5f76f17c..3bc6a623945140024b4d00b1eb8ce29caa9c82a5 100644
--- a/impeller/renderer/backend/vulkan/capabilities_vk.cc
+++ b/impeller/renderer/backend/vulkan/capabilities_vk.cc
@@ -4,39 +4,640 @@
 
 #include "impeller/renderer/backend/vulkan/capabilities_vk.h"
 
+#include <algorithm>
+
+#include "impeller/base/validation.h"
+#include "impeller/core/formats.h"
 #include "impeller/renderer/backend/vulkan/vk.h"
 
 namespace impeller {
 
-CapabilitiesVK::CapabilitiesVK() {
-  for (const auto& ext : vk::enumerateInstanceExtensionProperties().value) {
-    extensions_.insert(ext.extensionName);
+static constexpr const char* kInstanceLayer = "ImpellerInstance";
+
+CapabilitiesVK::CapabilitiesVK(bool enable_validations) {
+  auto extensions = vk::enumerateInstanceExtensionProperties();
+  auto layers = vk::enumerateInstanceLayerProperties();
+
+  if (extensions.result != vk::Result::eSuccess ||
+      layers.result != vk::Result::eSuccess) {
+    return;
+  }
+
+  for (const auto& ext : extensions.value) {
+    exts_[kInstanceLayer].insert(ext.extensionName);
+  }
+
+  for (const auto& layer : layers.value) {
+    const std::string layer_name = layer.layerName;
+    auto layer_exts = vk::enumerateInstanceExtensionProperties(layer_name);
+    if (layer_exts.result != vk::Result::eSuccess) {
+      return;
+    }
+    for (const auto& layer_ext : layer_exts.value) {
+      exts_[layer_name].insert(layer_ext.extensionName);
+    }
   }
 
-  for (const auto& layer : vk::enumerateInstanceLayerProperties().value) {
-    layers_.insert(layer.layerName);
+  validations_enabled_ =
+      enable_validations && HasLayer("VK_LAYER_KHRONOS_validation");
+  if (enable_validations && !validations_enabled_) {
+    FML_LOG(ERROR)
+        << "Requested Impeller context creation with validations but the "
+           "validation layers could not be found. Expect no Vulkan validation "
+           "checks!";
   }
+  if (validations_enabled_) {
+    FML_LOG(INFO) << "Vulkan validations are enabled.";
+  }
+  is_valid_ = true;
 }
 
 CapabilitiesVK::~CapabilitiesVK() = default;
 
-bool CapabilitiesVK::HasExtension(const std::string& extension) const {
-  return extensions_.count(extension) == 1u;
+bool CapabilitiesVK::IsValid() const {
+  return is_valid_;
+}
+
+bool CapabilitiesVK::AreValidationsEnabled() const {
+  return validations_enabled_;
+}
+
+std::optional<std::vector<std::string>> CapabilitiesVK::GetEnabledLayers()
+    const {
+  std::vector<std::string> required;
+
+  if (validations_enabled_) {
+    // The presence of this layer is already checked in the ctor.
+    required.push_back("VK_LAYER_KHRONOS_validation");
+  }
+
+  return required;
+}
+
+std::optional<std::vector<std::string>>
+CapabilitiesVK::GetEnabledInstanceExtensions() const {
+  std::vector<std::string> required;
+
+  if (!HasExtension("VK_KHR_surface")) {
+    // Swapchain support is required and this is a dependency of
+    // VK_KHR_swapchain.
+    VALIDATION_LOG << "Could not find the surface extension.";
+    return std::nullopt;
+  }
+  required.push_back("VK_KHR_surface");
+
+  auto has_wsi = false;
+  if (HasExtension("VK_MVK_macos_surface")) {
+    required.push_back("VK_MVK_macos_surface");
+    has_wsi = true;
+  }
+
+  if (HasExtension("VK_EXT_metal_surface")) {
+    required.push_back("VK_EXT_metal_surface");
+    has_wsi = true;
+  }
+
+  if (HasExtension("VK_KHR_portability_enumeration")) {
+    required.push_back("VK_KHR_portability_enumeration");
+    has_wsi = true;
+  }
+
+  if (HasExtension("VK_KHR_win32_surface")) {
+    required.push_back("VK_KHR_win32_surface");
+    has_wsi = true;
+  }
+
+  if (HasExtension("VK_KHR_android_surface")) {
+    required.push_back("VK_KHR_android_surface");
+    has_wsi = true;
+  }
+
+  if (HasExtension("VK_OHOS_surface")) {
+    required.push_back("VK_OHOS_surface");
+    has_wsi = true;
+  }
+
+  if (HasExtension("VK_KHR_xcb_surface")) {
+    required.push_back("VK_KHR_xcb_surface");
+    has_wsi = true;
+  }
+
+  if (HasExtension("VK_KHR_xlib_surface")) {
+    required.push_back("VK_KHR_xlib_surface");
+    has_wsi = true;
+  }
+
+  if (HasExtension("VK_KHR_wayland_surface")) {
+    required.push_back("VK_KHR_wayland_surface");
+    has_wsi = true;
+  }
+
+  if (!has_wsi) {
+    // Don't really care which WSI extension there is as long there is at least
+    // one.
+    VALIDATION_LOG << "Could not find a WSI extension.";
+    return std::nullopt;
+  }
+
+  if (validations_enabled_) {
+    if (!HasExtension("VK_EXT_debug_utils")) {
+      VALIDATION_LOG << "Requested validations but could not find the "
+                        "VK_EXT_debug_utils extension.";
+      return std::nullopt;
+    }
+    required.push_back("VK_EXT_debug_utils");
+
+    if (HasExtension("VK_EXT_validation_features")) {
+      // It's valid to not have `VK_EXT_validation_features` available.  That's
+      // the case when using AGI as a frame debugger.
+      required.push_back("VK_EXT_validation_features");
+    }
+  }
+
+  return required;
+}
+
+static const char* GetExtensionName(RequiredCommonDeviceExtensionVK ext) {
+  switch (ext) {
+    case RequiredCommonDeviceExtensionVK::kKHRSwapchain:
+      return VK_KHR_SWAPCHAIN_EXTENSION_NAME;
+    case RequiredCommonDeviceExtensionVK::kLast:
+      return "Unknown";
+  }
+  FML_UNREACHABLE();
+}
+
+static const char* GetExtensionName(RequiredAndroidDeviceExtensionVK ext) {
+  switch (ext) {
+    case RequiredAndroidDeviceExtensionVK::
+        kANDROIDExternalMemoryAndroidHardwareBuffer:
+      return "VK_ANDROID_external_memory_android_hardware_buffer";
+    case RequiredAndroidDeviceExtensionVK::kKHRSamplerYcbcrConversion:
+      return VK_KHR_SAMPLER_YCBCR_CONVERSION_EXTENSION_NAME;
+    case RequiredAndroidDeviceExtensionVK::kKHRExternalMemory:
+      return VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME;
+    case RequiredAndroidDeviceExtensionVK::kEXTQueueFamilyForeign:
+      return VK_EXT_QUEUE_FAMILY_FOREIGN_EXTENSION_NAME;
+    case RequiredAndroidDeviceExtensionVK::kKHRDedicatedAllocation:
+      return VK_KHR_DEDICATED_ALLOCATION_EXTENSION_NAME;
+    case RequiredAndroidDeviceExtensionVK::kLast:
+      return "Unknown";
+  }
+  FML_UNREACHABLE();
+}
+
+static const char* GetExtensionName(RequiredOHOSDeviceExtensionVK ext) {
+  switch (ext) {
+    case RequiredOHOSDeviceExtensionVK::kOHOSNativeBuffer:
+      return "VK_OHOS_native_buffer";
+    case RequiredOHOSDeviceExtensionVK::kKHRSamplerYcbcrConversion:
+      return VK_KHR_SAMPLER_YCBCR_CONVERSION_EXTENSION_NAME;
+    case RequiredOHOSDeviceExtensionVK::kOHOSExternalMemory:
+      return "VK_OHOS_external_memory";
+    case RequiredOHOSDeviceExtensionVK::kEXTQueueFamilyForeign:
+      return VK_EXT_QUEUE_FAMILY_FOREIGN_EXTENSION_NAME;
+    case RequiredOHOSDeviceExtensionVK::kKHRDedicatedAllocation:
+      return VK_KHR_DEDICATED_ALLOCATION_EXTENSION_NAME;
+    case RequiredOHOSDeviceExtensionVK::kKHRExternalSemaphoreFd:
+      return VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME;
+    case RequiredOHOSDeviceExtensionVK::kLast:
+      return "Unknown";
+  }
+  FML_UNREACHABLE();
+}
+
+static const char* GetExtensionName(OptionalDeviceExtensionVK ext) {
+  switch (ext) {
+    case OptionalDeviceExtensionVK::kEXTPipelineCreationFeedback:
+      return VK_EXT_PIPELINE_CREATION_FEEDBACK_EXTENSION_NAME;
+    case OptionalDeviceExtensionVK::kVKKHRPortabilitySubset:
+      return "VK_KHR_portability_subset";
+    case OptionalDeviceExtensionVK::kLast:
+      return "Unknown";
+  }
+  FML_UNREACHABLE();
+}
+
+template <class T>
+static bool IterateExtensions(const std::function<bool(T)>& it) {
+  if (!it) {
+    return false;
+  }
+  for (size_t i = 0; i < static_cast<uint32_t>(T::kLast); i++) {
+    if (!it(static_cast<T>(i))) {
+      return false;
+    }
+  }
+  return true;
+}
+
+static std::optional<std::set<std::string>> GetSupportedDeviceExtensions(
+    const vk::PhysicalDevice& physical_device) {
+  auto device_extensions = physical_device.enumerateDeviceExtensionProperties();
+  if (device_extensions.result != vk::Result::eSuccess) {
+    return std::nullopt;
+  }
+
+  std::set<std::string> exts;
+  for (const auto& device_extension : device_extensions.value) {
+    exts.insert(device_extension.extensionName);
+  };
+
+  return exts;
+}
+
+std::optional<std::vector<std::string>>
+CapabilitiesVK::GetEnabledDeviceExtensions(
+    const vk::PhysicalDevice& physical_device) const {
+  auto exts = GetSupportedDeviceExtensions(physical_device);
+
+  if (!exts.has_value()) {
+    return std::nullopt;
+  }
+
+  std::vector<std::string> enabled;
+
+  auto for_each_common_extension = [&](RequiredCommonDeviceExtensionVK ext) {
+    auto name = GetExtensionName(ext);
+    if (exts->find(name) == exts->end()) {
+      VALIDATION_LOG << "Device does not support required extension: " << name;
+      return false;
+    }
+    enabled.push_back(name);
+    return true;
+  };
+
+  auto for_each_android_extension = [&](RequiredAndroidDeviceExtensionVK ext) {
+#ifdef FML_OS_ANDROID
+    auto name = GetExtensionName(ext);
+    if (exts->find(name) == exts->end()) {
+      VALIDATION_LOG << "Device does not support required Android extension: "
+                     << name;
+      return false;
+    }
+    enabled.push_back(name);
+#endif  //  FML_OS_ANDROID
+    return true;
+  };
+
+  auto for_each_ohos_extension = [&](RequiredOHOSDeviceExtensionVK ext) {
+#ifdef FML_OS_OHOS
+    auto name = GetExtensionName(ext);
+    if (exts->find(name) == exts->end()) {
+      VALIDATION_LOG << "Device does not support required OHOS extension: "
+                     << name;
+      return false;
+    }
+    enabled.push_back(name);
+#endif  //  FML_OS_ANDROID
+    return true;
+  };
+
+  auto for_each_optional_extension = [&](OptionalDeviceExtensionVK ext) {
+    auto name = GetExtensionName(ext);
+    if (exts->find(name) != exts->end()) {
+      enabled.push_back(name);
+    }
+    return true;
+  };
+
+  const auto iterate_extensions =
+      IterateExtensions<RequiredCommonDeviceExtensionVK>(
+          for_each_common_extension) &&
+      IterateExtensions<RequiredAndroidDeviceExtensionVK>(
+          for_each_android_extension) &&
+      IterateExtensions<RequiredOHOSDeviceExtensionVK>(
+          for_each_ohos_extension) &&
+      IterateExtensions<OptionalDeviceExtensionVK>(for_each_optional_extension);
+
+  if (!iterate_extensions) {
+    VALIDATION_LOG << "Device not suitable since required extensions are not "
+                      "supported.";
+    return std::nullopt;
+  }
+
+  return enabled;
+}
+
+static bool HasSuitableColorFormat(const vk::PhysicalDevice& device,
+                                   vk::Format format) {
+  const auto props = device.getFormatProperties(format);
+  // This needs to be more comprehensive.
+  return !!(props.optimalTilingFeatures &
+            vk::FormatFeatureFlagBits::eColorAttachment);
+}
+
+static bool HasSuitableDepthStencilFormat(const vk::PhysicalDevice& device,
+                                          vk::Format format) {
+  const auto props = device.getFormatProperties(format);
+  return !!(props.optimalTilingFeatures &
+            vk::FormatFeatureFlagBits::eDepthStencilAttachment);
+}
+
+static bool PhysicalDeviceSupportsRequiredFormats(
+    const vk::PhysicalDevice& device) {
+  const auto has_color_format =
+      HasSuitableColorFormat(device, vk::Format::eB8G8R8A8Unorm);
+  const auto has_stencil_format =
+      HasSuitableDepthStencilFormat(device, vk::Format::eD32SfloatS8Uint) ||
+      HasSuitableDepthStencilFormat(device, vk::Format::eD24UnormS8Uint);
+  return has_color_format && has_stencil_format;
+}
+
+static bool HasRequiredProperties(const vk::PhysicalDevice& physical_device) {
+  auto properties = physical_device.getProperties();
+  if (!(properties.limits.framebufferColorSampleCounts &
+        (vk::SampleCountFlagBits::e1 | vk::SampleCountFlagBits::e4))) {
+    return false;
+  }
+  return true;
+}
+
+static bool HasRequiredQueues(const vk::PhysicalDevice& physical_device) {
+  auto queue_flags = vk::QueueFlags{};
+  for (const auto& queue : physical_device.getQueueFamilyProperties()) {
+    if (queue.queueCount == 0) {
+      continue;
+    }
+    queue_flags |= queue.queueFlags;
+  }
+  return static_cast<VkQueueFlags>(queue_flags &
+                                   (vk::QueueFlagBits::eGraphics |
+                                    vk::QueueFlagBits::eCompute |
+                                    vk::QueueFlagBits::eTransfer));
+}
+
+template <class ExtensionEnum>
+static bool IsExtensionInList(const std::vector<std::string>& list,
+                              ExtensionEnum ext) {
+  const std::string name = GetExtensionName(ext);
+  return std::find(list.begin(), list.end(), name) != list.end();
+}
+
+std::optional<CapabilitiesVK::PhysicalDeviceFeatures>
+CapabilitiesVK::GetEnabledDeviceFeatures(
+    const vk::PhysicalDevice& device) const {
+  if (!PhysicalDeviceSupportsRequiredFormats(device)) {
+    VALIDATION_LOG << "Device doesn't support the required formats.";
+    return std::nullopt;
+  }
+
+  if (!HasRequiredProperties(device)) {
+    VALIDATION_LOG << "Device doesn't support the required properties.";
+    return std::nullopt;
+  }
+
+  if (!HasRequiredQueues(device)) {
+    VALIDATION_LOG << "Device doesn't support the required queues.";
+    return std::nullopt;
+  }
+
+  const auto enabled_extensions = GetEnabledDeviceExtensions(device);
+  if (!enabled_extensions.has_value()) {
+    VALIDATION_LOG << "Device doesn't support the required queues.";
+    return std::nullopt;
+  }
+
+  PhysicalDeviceFeatures supported_chain;
+  device.getFeatures2(&supported_chain.get());
+
+  PhysicalDeviceFeatures required_chain;
+
+  // Base features.
+  {
+    auto& required = required_chain.get().features;
+    const auto& supported = supported_chain.get().features;
+
+    // We require this for enabling wireframes in the playground. But its not
+    // necessarily a big deal if we don't have this feature.
+    required.fillModeNonSolid = supported.fillModeNonSolid;
+  }
+  // VK_KHR_sampler_ycbcr_conversion features.
+  if (IsExtensionInList(
+          enabled_extensions.value(),
+          RequiredAndroidDeviceExtensionVK::kKHRSamplerYcbcrConversion)) {
+    auto& required =
+        required_chain
+            .get<vk::PhysicalDeviceSamplerYcbcrConversionFeaturesKHR>();
+    const auto& supported =
+        supported_chain
+            .get<vk::PhysicalDeviceSamplerYcbcrConversionFeaturesKHR>();
+
+    required.samplerYcbcrConversion = supported.samplerYcbcrConversion;
+  }
+
+  return required_chain;
 }
 
 bool CapabilitiesVK::HasLayer(const std::string& layer) const {
-  return layers_.count(layer) == 1u;
+  for (const auto& [found_layer, exts] : exts_) {
+    if (found_layer == layer) {
+      return true;
+    }
+  }
+  return false;
 }
 
-bool CapabilitiesVK::HasLayerExtension(const std::string& layer,
-                                       const std::string& extension) {
-  for (const auto& ext :
-       vk::enumerateInstanceExtensionProperties(layer).value) {
-    if (std::string{ext.extensionName} == extension) {
+bool CapabilitiesVK::HasExtension(const std::string& ext) const {
+  for (const auto& [layer, exts] : exts_) {
+    if (exts.find(ext) != exts.end()) {
       return true;
     }
   }
   return false;
 }
 
+void CapabilitiesVK::SetOffscreenFormat(PixelFormat pixel_format) const {
+  default_color_format_ = pixel_format;
+}
+
+bool CapabilitiesVK::SetPhysicalDevice(const vk::PhysicalDevice& device) {
+  if (HasSuitableDepthStencilFormat(device, vk::Format::eD32SfloatS8Uint)) {
+    default_depth_stencil_format_ = PixelFormat::kD32FloatS8UInt;
+  } else if (HasSuitableDepthStencilFormat(device,
+                                           vk::Format::eD24UnormS8Uint)) {
+    default_depth_stencil_format_ = PixelFormat::kD24UnormS8Uint;
+  } else {
+    default_depth_stencil_format_ = PixelFormat::kUnknown;
+  }
+
+  if (HasSuitableDepthStencilFormat(device, vk::Format::eS8Uint)) {
+    default_stencil_format_ = PixelFormat::kS8UInt;
+  } else if (default_depth_stencil_format_ != PixelFormat::kUnknown) {
+    default_stencil_format_ = default_depth_stencil_format_;
+  }
+
+  device_properties_ = device.getProperties();
+
+  auto physical_properties_2 =
+      device.getProperties2<vk::PhysicalDeviceProperties2,
+                            vk::PhysicalDeviceSubgroupProperties>();
+
+  // Currently shaders only want access to arithmetic subgroup features.
+  // If that changes this needs to get updated, and so does Metal (which right
+  // now assumes it from compile time flags based on the MSL target version).
+
+  supports_compute_subgroups_ =
+      !!(physical_properties_2.get<vk::PhysicalDeviceSubgroupProperties>()
+             .supportedOperations &
+         vk::SubgroupFeatureFlagBits::eArithmetic);
+
+  {
+    // Query texture support.
+    // TODO(jonahwilliams):
+    // https://github.com/flutter/flutter/issues/129784
+    vk::PhysicalDeviceMemoryProperties memory_properties;
+    device.getMemoryProperties(&memory_properties);
+
+    for (auto i = 0u; i < memory_properties.memoryTypeCount; i++) {
+      if (memory_properties.memoryTypes[i].propertyFlags &
+          vk::MemoryPropertyFlagBits::eLazilyAllocated) {
+        supports_device_transient_textures_ = true;
+      }
+    }
+  }
+
+  // Determine the optional device extensions this physical device supports.
+  {
+    required_common_device_extensions_.clear();
+    required_android_device_extensions_.clear();
+    required_ohos_device_extensions_.clear();
+    optional_device_extensions_.clear();
+    auto exts = GetSupportedDeviceExtensions(device);
+    if (!exts.has_value()) {
+      return false;
+    }
+    IterateExtensions<RequiredCommonDeviceExtensionVK>([&](auto ext) -> bool {
+      auto ext_name = GetExtensionName(ext);
+      if (exts->find(ext_name) != exts->end()) {
+        required_common_device_extensions_.insert(ext);
+      }
+      return true;
+    });
+    IterateExtensions<RequiredAndroidDeviceExtensionVK>([&](auto ext) -> bool {
+      auto ext_name = GetExtensionName(ext);
+      if (exts->find(ext_name) != exts->end()) {
+        required_android_device_extensions_.insert(ext);
+      }
+      return true;
+    });
+    IterateExtensions<RequiredOHOSDeviceExtensionVK>([&](auto ext) -> bool {
+      auto ext_name = GetExtensionName(ext);
+      if (exts->find(ext_name) != exts->end()) {
+        required_ohos_device_extensions_.insert(ext);
+      }
+      return true;
+    });
+    IterateExtensions<OptionalDeviceExtensionVK>([&](auto ext) -> bool {
+      auto ext_name = GetExtensionName(ext);
+      if (exts->find(ext_name) != exts->end()) {
+        optional_device_extensions_.insert(ext);
+      }
+      return true;
+    });
+  }
+
+  return true;
+}
+
+// |Capabilities|
+bool CapabilitiesVK::SupportsOffscreenMSAA() const {
+  return true;
+}
+
+// |Capabilities|
+bool CapabilitiesVK::SupportsImplicitResolvingMSAA() const {
+  return false;
+}
+
+// |Capabilities|
+bool CapabilitiesVK::SupportsSSBO() const {
+  return true;
+}
+
+// |Capabilities|
+bool CapabilitiesVK::SupportsBufferToTextureBlits() const {
+  return true;
+}
+
+// |Capabilities|
+bool CapabilitiesVK::SupportsTextureToTextureBlits() const {
+  return true;
+}
+
+// |Capabilities|
+bool CapabilitiesVK::SupportsFramebufferFetch() const {
+  return true;
+}
+
+// |Capabilities|
+bool CapabilitiesVK::SupportsCompute() const {
+  // Vulkan 1.1 requires support for compute.
+  return true;
+}
+
+// |Capabilities|
+bool CapabilitiesVK::SupportsComputeSubgroups() const {
+  // Set by |SetPhysicalDevice|.
+  return supports_compute_subgroups_;
+}
+
+// |Capabilities|
+bool CapabilitiesVK::SupportsReadFromResolve() const {
+  return false;
+}
+
+bool CapabilitiesVK::SupportsDecalSamplerAddressMode() const {
+  return true;
+}
+
+// |Capabilities|
+bool CapabilitiesVK::SupportsDeviceTransientTextures() const {
+  return supports_device_transient_textures_;
+}
+
+// |Capabilities|
+PixelFormat CapabilitiesVK::GetDefaultColorFormat() const {
+  return default_color_format_;
+}
+
+// |Capabilities|
+PixelFormat CapabilitiesVK::GetDefaultStencilFormat() const {
+  return default_stencil_format_;
+}
+
+// |Capabilities|
+PixelFormat CapabilitiesVK::GetDefaultDepthStencilFormat() const {
+  return default_depth_stencil_format_;
+}
+
+const vk::PhysicalDeviceProperties&
+CapabilitiesVK::GetPhysicalDeviceProperties() const {
+  return device_properties_;
+}
+
+PixelFormat CapabilitiesVK::GetDefaultGlyphAtlasFormat() const {
+  return PixelFormat::kR8UNormInt;
+}
+
+bool CapabilitiesVK::HasExtension(RequiredCommonDeviceExtensionVK ext) const {
+  return required_common_device_extensions_.find(ext) !=
+         required_common_device_extensions_.end();
+}
+
+bool CapabilitiesVK::HasExtension(RequiredAndroidDeviceExtensionVK ext) const {
+  return required_android_device_extensions_.find(ext) !=
+         required_android_device_extensions_.end();
+}
+
+bool CapabilitiesVK::HasExtension(RequiredOHOSDeviceExtensionVK ext) const {
+  return required_ohos_device_extensions_.find(ext) !=
+         required_ohos_device_extensions_.end();
+}
+
+bool CapabilitiesVK::HasExtension(OptionalDeviceExtensionVK ext) const {
+  return optional_device_extensions_.find(ext) !=
+         optional_device_extensions_.end();
+}
+
 }  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/capabilities_vk.h b/impeller/renderer/backend/vulkan/capabilities_vk.h
index 2b62e05e498ca4ce5dc3bbc8cfd1c4065c3cfe28..c4bfff5bbb8f7ec79b690f6765b198b5a40b17b9 100644
--- a/impeller/renderer/backend/vulkan/capabilities_vk.h
+++ b/impeller/renderer/backend/vulkan/capabilities_vk.h
@@ -2,33 +2,278 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_CAPABILITIES_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_CAPABILITIES_VK_H_
 
+#include <cstdint>
+#include <map>
 #include <set>
 #include <string>
+#include <vector>
 
-#include "flutter/fml/macros.h"
+#include "impeller/base/backend_cast.h"
+#include "impeller/renderer/backend/vulkan/vk.h"
+#include "impeller/renderer/capabilities.h"
 
 namespace impeller {
 
-class CapabilitiesVK {
+class ContextVK;
+
+//------------------------------------------------------------------------------
+/// @brief      A device extension available on all platforms. Without the
+///             presence of these extensions, context creation will fail.
+///
+enum class RequiredCommonDeviceExtensionVK : uint32_t {
+  //----------------------------------------------------------------------------
+  /// For displaying content in the window system.
+  ///
+  /// https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_KHR_swapchain.html
+  ///
+  kKHRSwapchain,
+
+  kLast,
+};
+
+//------------------------------------------------------------------------------
+/// @brief      A device extension available on all Android platforms. Without
+///             the presence of these extensions on Android, context creation
+///             will fail.
+///
+///             Platform agnostic code can still check if these Android
+///             extensions are present.
+///
+enum class RequiredAndroidDeviceExtensionVK : uint32_t {
+  //----------------------------------------------------------------------------
+  /// For importing hardware buffers used in external texture composition.
+  ///
+  /// https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_ANDROID_external_memory_android_hardware_buffer.html
+  ///
+  kANDROIDExternalMemoryAndroidHardwareBuffer,
+
+  //----------------------------------------------------------------------------
+  /// Dependency of kANDROIDExternalMemoryAndroidHardwareBuffer.
+  ///
+  /// https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_KHR_sampler_ycbcr_conversion.html
+  ///
+  kKHRSamplerYcbcrConversion,
+
+  //----------------------------------------------------------------------------
+  /// Dependency of kANDROIDExternalMemoryAndroidHardwareBuffer.
+  ///
+  /// https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_KHR_external_memory.html
+  ///
+  kKHRExternalMemory,
+
+  //----------------------------------------------------------------------------
+  /// Dependency of kANDROIDExternalMemoryAndroidHardwareBuffer.
+  ///
+  /// https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_EXT_queue_family_foreign.html
+  ///
+  kEXTQueueFamilyForeign,
+
+  //----------------------------------------------------------------------------
+  /// Dependency of kANDROIDExternalMemoryAndroidHardwareBuffer.
+  ///
+  /// https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_KHR_dedicated_allocation.html
+  ///
+  kKHRDedicatedAllocation,
+
+  kLast,
+};
+
+//------------------------------------------------------------------------------
+/// @brief      A device extension available on all OHOS platforms. Without
+///             the presence of these extensions on OHOS, context creation
+///             will fail.
+///
+///             Platform agnostic code can still check if these OHOS
+///             extensions are present.
+///
+enum class RequiredOHOSDeviceExtensionVK : uint32_t {
+  //----------------------------------------------------------------------------
+  /// For importing hardware buffers used in external texture composition.
+  ///
+  /// https://developer.huawei.com/consumer/cn/doc/harmonyos-references-V5/vulkan__ohos_8h-V5
+  ///
+  kOHOSNativeBuffer,
+
+  //----------------------------------------------------------------------------
+  /// Dependency of kOHOSNativeBuffer.
+  ///
+  /// https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_KHR_sampler_ycbcr_conversion.html
+  ///
+  kKHRSamplerYcbcrConversion,
+
+  //----------------------------------------------------------------------------
+  /// Dependency of kOHOSNativeBuffer.
+  ///
+  /// https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_KHR_external_memory.html
+  ///
+  kOHOSExternalMemory,
+
+  //----------------------------------------------------------------------------
+  /// Dependency of kOHOSNativeBuffer.
+  ///
+  /// https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_EXT_queue_family_foreign.html
+  ///
+  kEXTQueueFamilyForeign,
+
+  //----------------------------------------------------------------------------
+  /// Dependency of kOHOSNativeBuffer.
+  ///
+  /// https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_KHR_external_semaphore_fd.html
+  ///
+  kKHRExternalSemaphoreFd,
+
+  //----------------------------------------------------------------------------
+  /// Dependency of kOHOSNativeBuffer.
+  ///
+  /// https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_KHR_dedicated_allocation.html
+  ///
+  kKHRDedicatedAllocation,
+
+  kLast,
+};
+
+//------------------------------------------------------------------------------
+/// @brief      A device extension enabled if available. Subsystems cannot
+///             assume availability and must check if these extensions are
+///             available.
+///
+/// @see        `CapabilitiesVK::HasExtension`.
+///
+enum class OptionalDeviceExtensionVK : uint32_t {
+  //----------------------------------------------------------------------------
+  /// To instrument and profile PSO creation.
+  ///
+  /// https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_EXT_pipeline_creation_feedback.html
+  ///
+  kEXTPipelineCreationFeedback,
+
+  //----------------------------------------------------------------------------
+  /// To enable context creation on MoltenVK. A non-conformant Vulkan
+  /// implementation.
+  ///
+  /// https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_KHR_portability_subset.html
+  ///
+  kVKKHRPortabilitySubset,
+
+  kLast,
+};
+
+//------------------------------------------------------------------------------
+/// @brief      The Vulkan layers and extensions wrangler.
+///
+class CapabilitiesVK final : public Capabilities,
+                             public BackendCast<CapabilitiesVK, Capabilities> {
  public:
-  CapabilitiesVK();
+  explicit CapabilitiesVK(bool enable_validations);
 
   ~CapabilitiesVK();
 
-  bool HasExtension(const std::string& extension) const;
+  bool IsValid() const;
 
-  bool HasLayer(const std::string& layer) const;
+  bool AreValidationsEnabled() const;
+
+  bool HasExtension(RequiredCommonDeviceExtensionVK ext) const;
+
+  bool HasExtension(RequiredAndroidDeviceExtensionVK ext) const;
+
+  bool HasExtension(RequiredOHOSDeviceExtensionVK ext) const;
+
+  bool HasExtension(OptionalDeviceExtensionVK ext) const;
 
-  bool HasLayerExtension(const std::string& layer,
-                         const std::string& extension);
+  std::optional<std::vector<std::string>> GetEnabledLayers() const;
+
+  std::optional<std::vector<std::string>> GetEnabledInstanceExtensions() const;
+
+  std::optional<std::vector<std::string>> GetEnabledDeviceExtensions(
+      const vk::PhysicalDevice& physical_device) const;
+
+  using PhysicalDeviceFeatures =
+      vk::StructureChain<vk::PhysicalDeviceFeatures2,
+                         vk::PhysicalDeviceSamplerYcbcrConversionFeaturesKHR>;
+
+  std::optional<PhysicalDeviceFeatures> GetEnabledDeviceFeatures(
+      const vk::PhysicalDevice& physical_device) const;
+
+  [[nodiscard]] bool SetPhysicalDevice(
+      const vk::PhysicalDevice& physical_device);
+
+  const vk::PhysicalDeviceProperties& GetPhysicalDeviceProperties() const;
+
+  void SetOffscreenFormat(PixelFormat pixel_format) const;
+
+  // |Capabilities|
+  bool SupportsOffscreenMSAA() const override;
+
+  // |Capabilities|
+  bool SupportsImplicitResolvingMSAA() const override;
+
+  // |Capabilities|
+  bool SupportsSSBO() const override;
+
+  // |Capabilities|
+  bool SupportsBufferToTextureBlits() const override;
+
+  // |Capabilities|
+  bool SupportsTextureToTextureBlits() const override;
+
+  // |Capabilities|
+  bool SupportsFramebufferFetch() const override;
+
+  // |Capabilities|
+  bool SupportsCompute() const override;
+
+  // |Capabilities|
+  bool SupportsComputeSubgroups() const override;
+
+  // |Capabilities|
+  bool SupportsReadFromResolve() const override;
+
+  // |Capabilities|
+  bool SupportsDecalSamplerAddressMode() const override;
+
+  // |Capabilities|
+  bool SupportsDeviceTransientTextures() const override;
+
+  // |Capabilities|
+  PixelFormat GetDefaultColorFormat() const override;
+
+  // |Capabilities|
+  PixelFormat GetDefaultStencilFormat() const override;
+
+  // |Capabilities|
+  PixelFormat GetDefaultDepthStencilFormat() const override;
+
+  // |Capabilities|
+  PixelFormat GetDefaultGlyphAtlasFormat() const override;
 
  private:
-  std::set<std::string> extensions_;
-  std::set<std::string> layers_;
+  bool validations_enabled_ = false;
+  std::map<std::string, std::set<std::string>> exts_;
+  std::set<RequiredCommonDeviceExtensionVK> required_common_device_extensions_;
+  std::set<RequiredAndroidDeviceExtensionVK>
+      required_android_device_extensions_;
+  std::set<RequiredOHOSDeviceExtensionVK> required_ohos_device_extensions_;
+  std::set<OptionalDeviceExtensionVK> optional_device_extensions_;
+  mutable PixelFormat default_color_format_ = PixelFormat::kUnknown;
+  PixelFormat default_stencil_format_ = PixelFormat::kUnknown;
+  PixelFormat default_depth_stencil_format_ = PixelFormat::kUnknown;
+  vk::PhysicalDeviceProperties device_properties_;
+  bool supports_compute_subgroups_ = false;
+  bool supports_device_transient_textures_ = false;
+  bool is_valid_ = false;
+
+  bool HasExtension(const std::string& ext) const;
+
+  bool HasLayer(const std::string& layer) const;
+
+  CapabilitiesVK(const CapabilitiesVK&) = delete;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(CapabilitiesVK);
+  CapabilitiesVK& operator=(const CapabilitiesVK&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_CAPABILITIES_VK_H_
diff --git a/impeller/renderer/backend/vulkan/command_buffer_vk.cc b/impeller/renderer/backend/vulkan/command_buffer_vk.cc
index 98f1e86fd806e516e90cc01c0ce664094c30be1f..5c5776cbe25614927ad61c76a5a190e2790766e3 100644
--- a/impeller/renderer/backend/vulkan/command_buffer_vk.cc
+++ b/impeller/renderer/backend/vulkan/command_buffer_vk.cc
@@ -7,126 +7,99 @@
 #include <memory>
 #include <utility>
 
-#include "flutter/fml/logging.h"
-#include "impeller/base/validation.h"
+#include "fml/logging.h"
+#include "impeller/renderer/backend/vulkan/blit_pass_vk.h"
+#include "impeller/renderer/backend/vulkan/command_encoder_vk.h"
+#include "impeller/renderer/backend/vulkan/compute_pass_vk.h"
 #include "impeller/renderer/backend/vulkan/context_vk.h"
-#include "impeller/renderer/backend/vulkan/fenced_command_buffer_vk.h"
-#include "impeller/renderer/backend/vulkan/formats_vk.h"
 #include "impeller/renderer/backend/vulkan/render_pass_vk.h"
 #include "impeller/renderer/command_buffer.h"
 #include "impeller/renderer/render_target.h"
 
 namespace impeller {
 
-std::shared_ptr<CommandBufferVK> CommandBufferVK::Create(
-    const std::weak_ptr<const Context>& context_arg,
-    vk::Device device) {
-  if (auto context = context_arg.lock()) {
-    auto context_vk = reinterpret_cast<const ContextVK*>(context.get());
-    auto queue = context_vk->GetGraphicsQueue();
-    auto command_pool = context_vk->CreateGraphicsCommandPool();
-    auto fenced_command_buffer = std::make_shared<FencedCommandBufferVK>(
-        device, queue, command_pool->Get());
-    return std::make_shared<CommandBufferVK>(
-        context, device, std::move(command_pool), fenced_command_buffer);
-  } else {
-    return nullptr;
-  }
-}
-
 CommandBufferVK::CommandBufferVK(
     std::weak_ptr<const Context> context,
-    vk::Device device,
-    std::unique_ptr<CommandPoolVK> command_pool,
-    std::shared_ptr<FencedCommandBufferVK> command_buffer)
+    std::shared_ptr<CommandEncoderFactoryVK> encoder_factory)
     : CommandBuffer(std::move(context)),
-      device_(device),
-      command_pool_(std::move(command_pool)),
-      fenced_command_buffer_(std::move(command_buffer)) {
-  is_valid_ = true;
-}
+      encoder_factory_(std::move(encoder_factory)) {}
 
 CommandBufferVK::~CommandBufferVK() = default;
 
 void CommandBufferVK::SetLabel(const std::string& label) const {
-  if (auto context = context_.lock()) {
-    reinterpret_cast<const ContextVK*>(context.get())
-        ->SetDebugName(fenced_command_buffer_->Get(), label);
+  if (!encoder_) {
+    encoder_factory_->SetLabel(label);
+  } else {
+    auto context = context_.lock();
+    if (!context || !encoder_) {
+      return;
+    }
+    ContextVK::Cast(*context).SetDebugName(encoder_->GetCommandBuffer(), label);
   }
 }
 
 bool CommandBufferVK::IsValid() const {
-  return is_valid_;
+  return true;
 }
 
-bool CommandBufferVK::OnSubmitCommands(CompletionCallback callback) {
-  bool submit = fenced_command_buffer_->Submit();
-  if (callback) {
-    callback(submit ? CommandBuffer::Status::kCompleted
-                    : CommandBuffer::Status::kError);
+const std::shared_ptr<CommandEncoderVK>& CommandBufferVK::GetEncoder() {
+  if (!encoder_) {
+    encoder_ = encoder_factory_->Create();
   }
-  return submit;
+  return encoder_;
 }
 
-std::shared_ptr<RenderPass> CommandBufferVK::OnCreateRenderPass(
-    RenderTarget target) {
-  std::vector<vk::AttachmentDescription> color_attachments;
-  for (const auto& [k, attachment] : target.GetColorAttachments()) {
-    const TextureDescriptor& tex_desc =
-        attachment.texture->GetTextureDescriptor();
-
-    vk::AttachmentDescription color_attachment;
-    color_attachment.setFormat(ToVKImageFormat(tex_desc.format));
-    color_attachment.setSamples(ToVKSampleCountFlagBits(tex_desc.sample_count));
-    color_attachment.setLoadOp(ToVKAttachmentLoadOp(attachment.load_action));
-    color_attachment.setStoreOp(ToVKAttachmentStoreOp(attachment.store_action));
+bool CommandBufferVK::OnSubmitCommands(CompletionCallback callback) {
+  FML_UNREACHABLE()
+  return false;
+}
 
-    color_attachment.setStencilLoadOp(vk::AttachmentLoadOp::eDontCare);
-    color_attachment.setStencilStoreOp(vk::AttachmentStoreOp::eDontCare);
-    color_attachment.setInitialLayout(vk::ImageLayout::eColorAttachmentOptimal);
-    color_attachment.setFinalLayout(vk::ImageLayout::ePresentSrcKHR);
+void CommandBufferVK::OnWaitUntilScheduled() {}
 
-    color_attachments.push_back(color_attachment);
+std::shared_ptr<RenderPass> CommandBufferVK::OnCreateRenderPass(
+    RenderTarget target) {
+  auto context = context_.lock();
+  if (!context) {
+    return nullptr;
   }
-
-  // TODO (kaushikiska): support depth and stencil attachments.
-
-  vk::AttachmentReference color_attachment_ref;
-  color_attachment_ref.setAttachment(0);
-  color_attachment_ref.setLayout(vk::ImageLayout::eColorAttachmentOptimal);
-
-  vk::SubpassDescription subpass_desc;
-  subpass_desc.setPipelineBindPoint(vk::PipelineBindPoint::eGraphics);
-  subpass_desc.setColorAttachmentCount(color_attachments.size());
-  subpass_desc.setPColorAttachments(&color_attachment_ref);
-
-  vk::RenderPassCreateInfo render_pass_create;
-  render_pass_create.setAttachmentCount(color_attachments.size());
-  render_pass_create.setPAttachments(color_attachments.data());
-  render_pass_create.setSubpassCount(1);
-  render_pass_create.setPSubpasses(&subpass_desc);
-
-  auto render_pass_create_res = device_.createRenderPass(render_pass_create);
-  if (render_pass_create_res.result != vk::Result::eSuccess) {
-    VALIDATION_LOG << "Failed to create render pass: "
-                   << vk::to_string(render_pass_create_res.result);
+  auto pass =
+      std::shared_ptr<RenderPassVK>(new RenderPassVK(context,            //
+                                                     target,             //
+                                                     shared_from_this()  //
+                                                     ));
+  if (!pass->IsValid()) {
     return nullptr;
   }
-
-  vk::RenderPass render_pass = render_pass_create_res.value;
-  return std::make_shared<RenderPassVK>(context_, device_, std::move(target),
-                                        fenced_command_buffer_, render_pass);
+  return pass;
 }
 
-std::shared_ptr<BlitPass> CommandBufferVK::OnCreateBlitPass() const {
-  // TODO(kaushikiska): https://github.com/flutter/flutter/issues/112649
-  return nullptr;
+std::shared_ptr<BlitPass> CommandBufferVK::OnCreateBlitPass() {
+  if (!IsValid()) {
+    return nullptr;
+  }
+  auto pass = std::shared_ptr<BlitPassVK>(new BlitPassVK(weak_from_this()));
+  if (!pass->IsValid()) {
+    return nullptr;
+  }
+  return pass;
 }
 
-std::shared_ptr<ComputePass> CommandBufferVK::OnCreateComputePass() const {
-  // TODO(dnfield): https://github.com/flutter/flutter/issues/110622
-  VALIDATION_LOG << "ComputePasses unimplemented for Vulkan";
-  return nullptr;
+std::shared_ptr<ComputePass> CommandBufferVK::OnCreateComputePass() {
+  if (!IsValid()) {
+    return nullptr;
+  }
+  auto context = context_.lock();
+  if (!context) {
+    return nullptr;
+  }
+  auto pass =
+      std::shared_ptr<ComputePassVK>(new ComputePassVK(context,            //
+                                                       shared_from_this()  //
+                                                       ));
+  if (!pass->IsValid()) {
+    return nullptr;
+  }
+  return pass;
 }
 
 }  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/command_buffer_vk.h b/impeller/renderer/backend/vulkan/command_buffer_vk.h
index 74be5d91d52b0ec4f618ef9b80ab3529ae304718..d85ce290082a8248cade6a41b4af58e671bcd22c 100644
--- a/impeller/renderer/backend/vulkan/command_buffer_vk.h
+++ b/impeller/renderer/backend/vulkan/command_buffer_vk.h
@@ -2,39 +2,37 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_COMMAND_BUFFER_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_COMMAND_BUFFER_VK_H_
 
-#include "flutter/fml/macros.h"
-#include "impeller/renderer/backend/vulkan/command_pool_vk.h"
-#include "impeller/renderer/backend/vulkan/fenced_command_buffer_vk.h"
-#include "impeller/renderer/backend/vulkan/surface_producer_vk.h"
+#include "impeller/base/backend_cast.h"
 #include "impeller/renderer/backend/vulkan/vk.h"
 #include "impeller/renderer/command_buffer.h"
 
 namespace impeller {
 
-class CommandBufferVK final : public CommandBuffer {
- public:
-  static std::shared_ptr<CommandBufferVK> Create(
-      const std::weak_ptr<const Context>& context,
-      vk::Device device);
-
-  CommandBufferVK(std::weak_ptr<const Context> context,
-                  vk::Device device,
-                  std::unique_ptr<CommandPoolVK> command_pool,
-                  std::shared_ptr<FencedCommandBufferVK> command_buffer);
+class ContextVK;
+class CommandEncoderFactoryVK;
+class CommandEncoderVK;
 
+class CommandBufferVK final
+    : public CommandBuffer,
+      public BackendCast<CommandBufferVK, CommandBuffer>,
+      public std::enable_shared_from_this<CommandBufferVK> {
+ public:
   // |CommandBuffer|
   ~CommandBufferVK() override;
 
+  const std::shared_ptr<CommandEncoderVK>& GetEncoder();
+
  private:
   friend class ContextVK;
 
-  vk::Device device_;
-  std::unique_ptr<CommandPoolVK> command_pool_;
-  vk::UniqueRenderPass render_pass_;
-  std::shared_ptr<FencedCommandBufferVK> fenced_command_buffer_;
-  bool is_valid_ = false;
+  std::shared_ptr<CommandEncoderVK> encoder_;
+  std::shared_ptr<CommandEncoderFactoryVK> encoder_factory_;
+
+  CommandBufferVK(std::weak_ptr<const Context> context,
+                  std::shared_ptr<CommandEncoderFactoryVK> encoder_factory);
 
   // |CommandBuffer|
   void SetLabel(const std::string& label) const override;
@@ -45,16 +43,23 @@ class CommandBufferVK final : public CommandBuffer {
   // |CommandBuffer|
   bool OnSubmitCommands(CompletionCallback callback) override;
 
+  // |CommandBuffer|
+  void OnWaitUntilScheduled() override;
+
   // |CommandBuffer|
   std::shared_ptr<RenderPass> OnCreateRenderPass(RenderTarget target) override;
 
   // |CommandBuffer|
-  std::shared_ptr<BlitPass> OnCreateBlitPass() const override;
+  std::shared_ptr<BlitPass> OnCreateBlitPass() override;
 
   // |CommandBuffer|
-  std::shared_ptr<ComputePass> OnCreateComputePass() const override;
+  std::shared_ptr<ComputePass> OnCreateComputePass() override;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(CommandBufferVK);
+  CommandBufferVK(const CommandBufferVK&) = delete;
+
+  CommandBufferVK& operator=(const CommandBufferVK&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_COMMAND_BUFFER_VK_H_
diff --git a/impeller/renderer/backend/vulkan/command_encoder_vk.cc b/impeller/renderer/backend/vulkan/command_encoder_vk.cc
new file mode 100644
index 0000000000000000000000000000000000000000..4fb51fa2491c7fb49fa1374e0cbb87b7d46f2b6c
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/command_encoder_vk.cc
@@ -0,0 +1,209 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/backend/vulkan/command_encoder_vk.h"
+#include <string>
+
+#include "flutter/fml/closure.h"
+#include "fml/status.h"
+#include "fml/status_or.h"
+#include "impeller/renderer/backend/vulkan/context_vk.h"
+#include "impeller/renderer/backend/vulkan/fence_waiter_vk.h"
+#include "impeller/renderer/backend/vulkan/gpu_tracer_vk.h"
+#include "impeller/renderer/backend/vulkan/texture_vk.h"
+#include "impeller/renderer/backend/vulkan/tracked_objects_vk.h"
+
+namespace impeller {
+
+CommandEncoderFactoryVK::CommandEncoderFactoryVK(
+    const std::weak_ptr<const ContextVK>& context)
+    : context_(context) {}
+
+void CommandEncoderFactoryVK::SetLabel(const std::string& label) {
+  label_ = label;
+}
+
+std::shared_ptr<CommandEncoderVK> CommandEncoderFactoryVK::Create() {
+  auto context = context_.lock();
+  if (!context) {
+    return nullptr;
+  }
+  auto recycler = context->GetCommandPoolRecycler();
+  if (!recycler) {
+    return nullptr;
+  }
+  auto tls_pool = recycler->Get();
+  if (!tls_pool) {
+    return nullptr;
+  }
+
+  auto tracked_objects = std::make_shared<TrackedObjectsVK>(
+      context, tls_pool, context->GetGPUTracer()->CreateGPUProbe());
+  auto queue = context->GetGraphicsQueue();
+
+  if (!tracked_objects || !tracked_objects->IsValid() || !queue) {
+    return nullptr;
+  }
+
+  vk::CommandBufferBeginInfo begin_info;
+  begin_info.flags = vk::CommandBufferUsageFlagBits::eOneTimeSubmit;
+  if (tracked_objects->GetCommandBuffer().begin(begin_info) !=
+      vk::Result::eSuccess) {
+    VALIDATION_LOG << "Could not begin command buffer.";
+    return nullptr;
+  }
+
+  if (label_.has_value()) {
+    context->SetDebugName(tracked_objects->GetCommandBuffer(), label_.value());
+  }
+  tracked_objects->GetGPUProbe().RecordCmdBufferStart(
+      tracked_objects->GetCommandBuffer());
+
+  return std::make_shared<CommandEncoderVK>(context->GetDeviceHolder(),
+                                            tracked_objects, queue,
+                                            context->GetFenceWaiter());
+}
+
+CommandEncoderVK::CommandEncoderVK(
+    std::weak_ptr<const DeviceHolderVK> device_holder,
+    std::shared_ptr<TrackedObjectsVK> tracked_objects,
+    const std::shared_ptr<QueueVK>& queue,
+    std::shared_ptr<FenceWaiterVK> fence_waiter)
+    : device_holder_(std::move(device_holder)),
+      tracked_objects_(std::move(tracked_objects)),
+      queue_(queue),
+      fence_waiter_(std::move(fence_waiter)) {}
+
+CommandEncoderVK::~CommandEncoderVK() = default;
+
+bool CommandEncoderVK::IsValid() const {
+  return is_valid_;
+}
+
+bool CommandEncoderVK::EndCommandBuffer() const {
+  InsertDebugMarker("QueueSubmit");
+
+  auto command_buffer = GetCommandBuffer();
+  tracked_objects_->GetGPUProbe().RecordCmdBufferEnd(command_buffer);
+
+  auto status = command_buffer.end();
+  if (status != vk::Result::eSuccess) {
+    VALIDATION_LOG << "Failed to end command buffer: " << vk::to_string(status);
+    return false;
+  }
+  return true;
+}
+
+vk::CommandBuffer CommandEncoderVK::GetCommandBuffer() const {
+  if (tracked_objects_) {
+    return tracked_objects_->GetCommandBuffer();
+  }
+  return {};
+}
+
+void CommandEncoderVK::Reset() {
+  tracked_objects_.reset();
+
+  queue_ = nullptr;
+  is_valid_ = false;
+}
+
+bool CommandEncoderVK::Track(std::shared_ptr<SharedObjectVK> object) {
+  if (!IsValid()) {
+    return false;
+  }
+  tracked_objects_->Track(std::move(object));
+  return true;
+}
+
+bool CommandEncoderVK::Track(std::shared_ptr<const DeviceBuffer> buffer) {
+  if (!IsValid()) {
+    return false;
+  }
+  tracked_objects_->Track(std::move(buffer));
+  return true;
+}
+
+bool CommandEncoderVK::IsTracking(
+    const std::shared_ptr<const DeviceBuffer>& buffer) const {
+  if (!IsValid()) {
+    return false;
+  }
+  return tracked_objects_->IsTracking(buffer);
+}
+
+bool CommandEncoderVK::Track(std::shared_ptr<const TextureSourceVK> texture) {
+  if (!IsValid()) {
+    return false;
+  }
+  tracked_objects_->Track(std::move(texture));
+  return true;
+}
+
+bool CommandEncoderVK::Track(const std::shared_ptr<const Texture>& texture) {
+  if (!IsValid()) {
+    return false;
+  }
+  if (!texture) {
+    return true;
+  }
+  return Track(TextureVK::Cast(*texture).GetTextureSource());
+}
+
+bool CommandEncoderVK::IsTracking(
+    const std::shared_ptr<const Texture>& texture) const {
+  if (!IsValid()) {
+    return false;
+  }
+  std::shared_ptr<const TextureSourceVK> source =
+      TextureVK::Cast(*texture).GetTextureSource();
+  return tracked_objects_->IsTracking(source);
+}
+
+fml::StatusOr<vk::DescriptorSet> CommandEncoderVK::AllocateDescriptorSets(
+    const vk::DescriptorSetLayout& layout,
+    const ContextVK& context) {
+  if (!IsValid()) {
+    return fml::Status(fml::StatusCode::kUnknown, "command encoder invalid");
+  }
+
+  return tracked_objects_->GetDescriptorPool().AllocateDescriptorSets(layout,
+                                                                      context);
+}
+
+void CommandEncoderVK::PushDebugGroup(std::string_view label) const {
+  if (!HasValidationLayers()) {
+    return;
+  }
+  vk::DebugUtilsLabelEXT label_info;
+  label_info.pLabelName = label.data();
+  if (auto command_buffer = GetCommandBuffer()) {
+    command_buffer.beginDebugUtilsLabelEXT(label_info);
+  }
+}
+
+void CommandEncoderVK::PopDebugGroup() const {
+  if (!HasValidationLayers()) {
+    return;
+  }
+  if (auto command_buffer = GetCommandBuffer()) {
+    command_buffer.endDebugUtilsLabelEXT();
+  }
+}
+
+void CommandEncoderVK::InsertDebugMarker(std::string_view label) const {
+  if (!HasValidationLayers()) {
+    return;
+  }
+  vk::DebugUtilsLabelEXT label_info;
+  label_info.pLabelName = label.data();
+  if (auto command_buffer = GetCommandBuffer()) {
+    command_buffer.insertDebugUtilsLabelEXT(label_info);
+  }
+  if (queue_) {
+    queue_->InsertDebugMarker(label);
+  }
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/command_encoder_vk.h b/impeller/renderer/backend/vulkan/command_encoder_vk.h
new file mode 100644
index 0000000000000000000000000000000000000000..4369df5caf67ed590a20d1c7961dbc9b8ae44dc0
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/command_encoder_vk.h
@@ -0,0 +1,110 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_COMMAND_ENCODER_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_COMMAND_ENCODER_VK_H_
+
+#include <cstdint>
+#include <functional>
+#include <optional>
+
+#include "impeller/renderer/backend/vulkan/command_pool_vk.h"
+#include "impeller/renderer/backend/vulkan/command_queue_vk.h"
+#include "impeller/renderer/backend/vulkan/context_vk.h"
+#include "impeller/renderer/backend/vulkan/descriptor_pool_vk.h"
+#include "impeller/renderer/backend/vulkan/device_holder_vk.h"
+#include "impeller/renderer/backend/vulkan/queue_vk.h"
+#include "impeller/renderer/backend/vulkan/shared_object_vk.h"
+#include "impeller/renderer/backend/vulkan/vk.h"
+
+namespace impeller {
+
+class ContextVK;
+class DeviceBuffer;
+class Buffer;
+class Texture;
+class TextureSourceVK;
+class TrackedObjectsVK;
+class FenceWaiterVK;
+class GPUProbe;
+
+class CommandEncoderFactoryVK {
+ public:
+  explicit CommandEncoderFactoryVK(
+      const std::weak_ptr<const ContextVK>& context);
+
+  std::shared_ptr<CommandEncoderVK> Create();
+
+  void SetLabel(const std::string& label);
+
+ private:
+  std::weak_ptr<const ContextVK> context_;
+  std::optional<std::string> label_;
+
+  CommandEncoderFactoryVK(const CommandEncoderFactoryVK&) = delete;
+
+  CommandEncoderFactoryVK& operator=(const CommandEncoderFactoryVK&) = delete;
+};
+
+class CommandEncoderVK {
+ public:
+  using SubmitCallback = std::function<void(bool)>;
+
+  // Visible for testing.
+  CommandEncoderVK(std::weak_ptr<const DeviceHolderVK> device_holder,
+                   std::shared_ptr<TrackedObjectsVK> tracked_objects,
+                   const std::shared_ptr<QueueVK>& queue,
+                   std::shared_ptr<FenceWaiterVK> fence_waiter);
+
+  ~CommandEncoderVK();
+
+  bool IsValid() const;
+
+  bool Track(std::shared_ptr<SharedObjectVK> object);
+
+  bool Track(std::shared_ptr<const DeviceBuffer> buffer);
+
+  bool IsTracking(const std::shared_ptr<const DeviceBuffer>& texture) const;
+
+  bool Track(const std::shared_ptr<const Texture>& texture);
+
+  bool IsTracking(const std::shared_ptr<const Texture>& texture) const;
+
+  bool Track(std::shared_ptr<const TextureSourceVK> texture);
+
+  vk::CommandBuffer GetCommandBuffer() const;
+
+  void PushDebugGroup(std::string_view label) const;
+
+  void PopDebugGroup() const;
+
+  void InsertDebugMarker(std::string_view label) const;
+
+  bool EndCommandBuffer() const;
+
+  fml::StatusOr<vk::DescriptorSet> AllocateDescriptorSets(
+      const vk::DescriptorSetLayout& layout,
+      const ContextVK& context);
+
+ private:
+  friend class ContextVK;
+  friend class CommandQueueVK;
+
+  std::weak_ptr<const DeviceHolderVK> device_holder_;
+  std::shared_ptr<TrackedObjectsVK> tracked_objects_;
+  std::shared_ptr<QueueVK> queue_;
+  const std::shared_ptr<FenceWaiterVK> fence_waiter_;
+  std::shared_ptr<HostBuffer> host_buffer_;
+  bool is_valid_ = true;
+
+  void Reset();
+
+  CommandEncoderVK(const CommandEncoderVK&) = delete;
+
+  CommandEncoderVK& operator=(const CommandEncoderVK&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_COMMAND_ENCODER_VK_H_
diff --git a/impeller/renderer/backend/vulkan/command_encoder_vk_unittests.cc b/impeller/renderer/backend/vulkan/command_encoder_vk_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..7f4dde9b0bec4fc92605765468f5883afbf98781
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/command_encoder_vk_unittests.cc
@@ -0,0 +1,79 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <thread>
+
+#include "flutter/testing/testing.h"  // IWYU pragma: keep
+#include "fml/synchronization/waitable_event.h"
+#include "impeller/renderer/backend/vulkan/command_encoder_vk.h"
+#include "impeller/renderer/backend/vulkan/test/mock_vulkan.h"
+#include "impeller/renderer/command_buffer.h"
+
+namespace impeller {
+namespace testing {
+
+TEST(CommandEncoderVKTest, DeleteEncoderAfterThreadDies) {
+  // Tests that when a CommandEncoderVK is deleted that it will clean up its
+  // command buffers before it cleans up its command pool.
+  std::shared_ptr<std::vector<std::string>> called_functions;
+  {
+    auto context = MockVulkanContextBuilder().Build();
+    called_functions = GetMockVulkanFunctions(context->GetDevice());
+    std::shared_ptr<CommandEncoderVK> encoder;
+    std::thread thread([&] {
+      CommandEncoderFactoryVK factory(context);
+      encoder = factory.Create();
+    });
+    thread.join();
+    context->Shutdown();
+  }
+  auto destroy_pool =
+      std::find(called_functions->begin(), called_functions->end(),
+                "vkDestroyCommandPool");
+  auto free_buffers =
+      std::find(called_functions->begin(), called_functions->end(),
+                "vkFreeCommandBuffers");
+  EXPECT_TRUE(destroy_pool != called_functions->end());
+  EXPECT_TRUE(free_buffers != called_functions->end());
+  EXPECT_TRUE(free_buffers < destroy_pool);
+}
+
+TEST(CommandEncoderVKTest, CleanupAfterSubmit) {
+  // This tests deleting the TrackedObjects where the thread is killed before
+  // the fence waiter has disposed of them, making sure the command buffer and
+  // its pools are deleted in that order.
+  std::shared_ptr<std::vector<std::string>> called_functions;
+  {
+    fml::AutoResetWaitableEvent wait_for_submit;
+    fml::AutoResetWaitableEvent wait_for_thread_join;
+    auto context = MockVulkanContextBuilder().Build();
+    std::thread thread([&] {
+      auto buffer = context->CreateCommandBuffer();
+      context->GetCommandQueue()->Submit(
+          {buffer}, [&](CommandBuffer::Status status) {
+            ASSERT_EQ(status, CommandBuffer::Status::kCompleted);
+            wait_for_thread_join.Wait();
+            wait_for_submit.Signal();
+          });
+    });
+    thread.join();
+    wait_for_thread_join.Signal();
+    wait_for_submit.Wait();
+    called_functions = GetMockVulkanFunctions(context->GetDevice());
+    context->Shutdown();
+  }
+
+  auto destroy_pool =
+      std::find(called_functions->begin(), called_functions->end(),
+                "vkDestroyCommandPool");
+  auto free_buffers =
+      std::find(called_functions->begin(), called_functions->end(),
+                "vkFreeCommandBuffers");
+  EXPECT_TRUE(destroy_pool != called_functions->end());
+  EXPECT_TRUE(free_buffers != called_functions->end());
+  EXPECT_TRUE(free_buffers < destroy_pool);
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/command_pool_vk.cc b/impeller/renderer/backend/vulkan/command_pool_vk.cc
index 065582402419b99bed2e0fd03f843d8439bd1f0d..9bb3d9d8986216ef7c6cb2aa47430541a7906ed2 100644
--- a/impeller/renderer/backend/vulkan/command_pool_vk.cc
+++ b/impeller/renderer/backend/vulkan/command_pool_vk.cc
@@ -4,30 +4,306 @@
 
 #include "impeller/renderer/backend/vulkan/command_pool_vk.h"
 
+#include <memory>
+#include <optional>
+#include <utility>
+
+#include "impeller/renderer/backend/vulkan/context_vk.h"
+#include "impeller/renderer/backend/vulkan/resource_manager_vk.h"
+
+#include "impeller/renderer/backend/vulkan/vk.h"  // IWYU pragma: keep.
+#include "vulkan/vulkan_handles.hpp"
+#include "vulkan/vulkan_structs.hpp"
+
 namespace impeller {
 
-std::unique_ptr<CommandPoolVK> CommandPoolVK::Create(vk::Device device,
-                                                     uint32_t queue_index) {
-  vk::CommandPoolCreateInfo create_info;
-  create_info.setQueueFamilyIndex(queue_index);
+// Holds the command pool in a background thread, recyling it when not in use.
+class BackgroundCommandPoolVK final {
+ public:
+  BackgroundCommandPoolVK(BackgroundCommandPoolVK&&) = default;
+
+  // The recycler also recycles command buffers that were never used, up to a
+  // limit of 16 per frame. This number was somewhat arbitrarily chosen.
+  static constexpr size_t kUnusedCommandBufferLimit = 16u;
+
+  explicit BackgroundCommandPoolVK(
+      vk::UniqueCommandPool&& pool,
+      std::vector<vk::UniqueCommandBuffer>&& buffers,
+      size_t unused_count,
+      std::weak_ptr<CommandPoolRecyclerVK> recycler)
+      : pool_(std::move(pool)),
+        buffers_(std::move(buffers)),
+        unused_count_(unused_count),
+        recycler_(std::move(recycler)) {}
+
+  ~BackgroundCommandPoolVK() {
+    auto const recycler = recycler_.lock();
+
+    // Not only does this prevent recycling when the context is being destroyed,
+    // but it also prevents the destructor from effectively being called twice;
+    // once for the original BackgroundCommandPoolVK() and once for the moved
+    // BackgroundCommandPoolVK().
+    if (!recycler) {
+      return;
+    }
+    // If there are many unused command buffers, release some of them.
+    if (unused_count_ > kUnusedCommandBufferLimit) {
+      for (auto i = 0u; i < unused_count_; i++) {
+        buffers_.pop_back();
+      }
+    }
+
+    recycler->Reclaim(std::move(pool_), std::move(buffers_));
+  }
+
+ private:
+  BackgroundCommandPoolVK(const BackgroundCommandPoolVK&) = delete;
+
+  BackgroundCommandPoolVK& operator=(const BackgroundCommandPoolVK&) = delete;
+
+  vk::UniqueCommandPool pool_;
+
+  // These are retained because the destructor of the C++ UniqueCommandBuffer
+  // wrapper type will attempt to reset the cmd buffer, and doing so may be a
+  // thread safety violation as this may happen on the fence waiter thread.
+  std::vector<vk::UniqueCommandBuffer> buffers_;
+  const size_t unused_count_;
+  std::weak_ptr<CommandPoolRecyclerVK> recycler_;
+};
+
+CommandPoolVK::~CommandPoolVK() {
+  if (!pool_) {
+    return;
+  }
+
+  auto const context = context_.lock();
+  if (!context) {
+    return;
+  }
+  auto const recycler = context->GetCommandPoolRecycler();
+  if (!recycler) {
+    return;
+  }
+  // Any unused command buffers are added to the set of used command buffers.
+  // both will be reset to the initial state when the pool is reset.
+  size_t unused_count = unused_command_buffers_.size();
+  for (auto i = 0u; i < unused_command_buffers_.size(); i++) {
+    collected_buffers_.push_back(std::move(unused_command_buffers_[i]));
+  }
+  unused_command_buffers_.clear();
+
+  auto reset_pool_when_dropped = BackgroundCommandPoolVK(
+      std::move(pool_), std::move(collected_buffers_), unused_count, recycler);
+
+  UniqueResourceVKT<BackgroundCommandPoolVK> pool(
+      context->GetResourceManager(), std::move(reset_pool_when_dropped));
+}
+
+// TODO(matanlurey): Return a status_or<> instead of {} when we have one.
+vk::UniqueCommandBuffer CommandPoolVK::CreateCommandBuffer() {
+  auto const context = context_.lock();
+  if (!context) {
+    return {};
+  }
+
+  Lock lock(pool_mutex_);
+  if (!pool_) {
+    return {};
+  }
+  if (!unused_command_buffers_.empty()) {
+    vk::UniqueCommandBuffer buffer = std::move(unused_command_buffers_.back());
+    unused_command_buffers_.pop_back();
+    return buffer;
+  }
+
+  auto const device = context->GetDevice();
+  vk::CommandBufferAllocateInfo info;
+  info.setCommandPool(pool_.get());
+  info.setCommandBufferCount(1u);
+  info.setLevel(vk::CommandBufferLevel::ePrimary);
+  auto [result, buffers] = device.allocateCommandBuffersUnique(info);
+  if (result != vk::Result::eSuccess) {
+    return {};
+  }
+  return std::move(buffers[0]);
+}
 
-  auto res = device.createCommandPoolUnique(create_info);
-  if (res.result != vk::Result::eSuccess) {
-    FML_CHECK(false) << "Failed to create command pool: "
-                     << vk::to_string(res.result);
+void CommandPoolVK::CollectCommandBuffer(vk::UniqueCommandBuffer&& buffer) {
+  Lock lock(pool_mutex_);
+  if (!pool_) {
+    // If the command pool has already been destroyed, then its buffers have
+    // already been freed.
+    buffer.release();
+    return;
+  }
+  collected_buffers_.push_back(std::move(buffer));
+}
+
+void CommandPoolVK::Destroy() {
+  Lock lock(pool_mutex_);
+  pool_.reset();
+
+  // When the command pool is destroyed, all of its command buffers are freed.
+  // Handles allocated from that pool are now invalid and must be discarded.
+  for (auto& buffer : collected_buffers_) {
+    buffer.release();
+  }
+  for (auto& buffer : unused_command_buffers_) {
+    buffer.release();
+  }
+  unused_command_buffers_.clear();
+  collected_buffers_.clear();
+}
+
+// Associates a resource with a thread and context.
+using CommandPoolMap =
+    std::unordered_map<uint64_t, std::shared_ptr<CommandPoolVK>>;
+
+// CommandPoolVK Lifecycle:
+// 1. End of frame will reset the command pool (clearing this on a thread).
+//    There will still be references to the command pool from the uncompleted
+//    command buffers.
+// 2. The last reference to the command pool will be released from the fence
+//    waiter thread, which will schedule a task on the resource
+//    manager thread, which in turn will reset the command pool and make it
+//    available for reuse ("recycle").
+static thread_local std::unique_ptr<CommandPoolMap> tls_command_pool_map;
+
+// Map each context to a list of all thread-local command pools associated
+// with that context.
+static Mutex g_all_pools_map_mutex;
+static std::unordered_map<
+    const ContextVK*,
+    std::vector<std::weak_ptr<CommandPoolVK>>> g_all_pools_map
+    IPLR_GUARDED_BY(g_all_pools_map_mutex);
+
+// TODO(matanlurey): Return a status_or<> instead of nullptr when we have one.
+std::shared_ptr<CommandPoolVK> CommandPoolRecyclerVK::Get() {
+  auto const strong_context = context_.lock();
+  if (!strong_context) {
+    return nullptr;
+  }
+
+  // If there is a resource in used for this thread and context, return it.
+  if (!tls_command_pool_map.get()) {
+    tls_command_pool_map.reset(new CommandPoolMap());
+  }
+  CommandPoolMap& pool_map = *tls_command_pool_map.get();
+  auto const hash = strong_context->GetHash();
+  auto const it = pool_map.find(hash);
+  if (it != pool_map.end()) {
+    return it->second;
+  }
+
+  // Otherwise, create a new resource and return it.
+  auto data = Create();
+  if (!data || !data->pool) {
     return nullptr;
   }
 
-  return std::make_unique<CommandPoolVK>(std::move(res.value));
+  auto const resource = std::make_shared<CommandPoolVK>(
+      std::move(data->pool), std::move(data->buffers), context_);
+  pool_map.emplace(hash, resource);
+
+  {
+    Lock all_pools_lock(g_all_pools_map_mutex);
+    g_all_pools_map[strong_context.get()].push_back(resource);
+  }
+
+  return resource;
 }
 
-vk::CommandPool CommandPoolVK::Get() const {
-  return *command_pool_;
+// TODO(matanlurey): Return a status_or<> instead of nullopt when we have one.
+std::optional<CommandPoolRecyclerVK::RecycledData>
+CommandPoolRecyclerVK::Create() {
+  // If we can reuse a command pool and its buffers, do so.
+  if (auto data = Reuse()) {
+    return data;
+  }
+
+  // Otherwise, create a new one.
+  auto context = context_.lock();
+  if (!context) {
+    return std::nullopt;
+  }
+  vk::CommandPoolCreateInfo info;
+  info.setQueueFamilyIndex(context->GetGraphicsQueue()->GetIndex().family);
+  info.setFlags(vk::CommandPoolCreateFlagBits::eTransient);
+
+  auto device = context->GetDevice();
+  auto [result, pool] = device.createCommandPoolUnique(info);
+  if (result != vk::Result::eSuccess) {
+    return std::nullopt;
+  }
+  return CommandPoolRecyclerVK::RecycledData{.pool = std::move(pool),
+                                             .buffers = {}};
 }
 
-CommandPoolVK::CommandPoolVK(vk::UniqueCommandPool command_pool)
-    : command_pool_(std::move(command_pool)) {}
+std::optional<CommandPoolRecyclerVK::RecycledData>
+CommandPoolRecyclerVK::Reuse() {
+  // If there are no recycled pools, return nullopt.
+  Lock recycled_lock(recycled_mutex_);
+  if (recycled_.empty()) {
+    return std::nullopt;
+  }
 
-CommandPoolVK::~CommandPoolVK() = default;
+  // Otherwise, remove and return a recycled pool.
+  auto data = std::move(recycled_.back());
+  recycled_.pop_back();
+  return std::move(data);
+}
+
+void CommandPoolRecyclerVK::Reclaim(
+    vk::UniqueCommandPool&& pool,
+    std::vector<vk::UniqueCommandBuffer>&& buffers) {
+  // Reset the pool on a background thread.
+  auto strong_context = context_.lock();
+  if (!strong_context) {
+    return;
+  }
+  auto device = strong_context->GetDevice();
+  device.resetCommandPool(pool.get());
+
+  // Move the pool to the recycled list.
+  Lock recycled_lock(recycled_mutex_);
+  recycled_.push_back(
+      RecycledData{.pool = std::move(pool), .buffers = std::move(buffers)});
+}
+
+CommandPoolRecyclerVK::~CommandPoolRecyclerVK() {
+  // Ensure all recycled pools are reclaimed before this is destroyed.
+  Dispose();
+}
+
+void CommandPoolRecyclerVK::Dispose() {
+  CommandPoolMap* pool_map = tls_command_pool_map.get();
+  if (pool_map) {
+    pool_map->clear();
+  }
+}
+
+void CommandPoolRecyclerVK::DestroyThreadLocalPools(const ContextVK* context) {
+  // Delete the context's entry in this thread's command pool map.
+  if (tls_command_pool_map.get()) {
+    tls_command_pool_map.get()->erase(context->GetHash());
+  }
+
+  // Destroy all other thread-local CommandPoolVK instances associated with
+  // this context.
+  Lock all_pools_lock(g_all_pools_map_mutex);
+  auto found = g_all_pools_map.find(context);
+  if (found != g_all_pools_map.end()) {
+    for (auto& weak_pool : found->second) {
+      auto pool = weak_pool.lock();
+      if (!pool) {
+        continue;
+      }
+      // Delete all objects held by this pool.  The destroyed pool will still
+      // remain in its thread's TLS map until that thread exits.
+      pool->Destroy();
+    }
+    g_all_pools_map.erase(found);
+  }
+}
 
 }  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/command_pool_vk.h b/impeller/renderer/backend/vulkan/command_pool_vk.h
index 034813ed49acfa96576d34a7b1328d1efb9b129c..dd60026b44f70d0a2489ad7928eeb7fe49efca87 100644
--- a/impeller/renderer/backend/vulkan/command_pool_vk.h
+++ b/impeller/renderer/backend/vulkan/command_pool_vk.h
@@ -2,28 +2,162 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_COMMAND_POOL_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_COMMAND_POOL_VK_H_
 
-#include "flutter/fml/macros.h"
-#include "impeller/renderer/backend/vulkan/vk.h"
+#include <memory>
+#include <optional>
+#include <utility>
+
+#include "impeller/base/thread.h"
+#include "impeller/renderer/backend/vulkan/vk.h"  // IWYU pragma: keep.
+#include "vulkan/vulkan_handles.hpp"
 
 namespace impeller {
 
-class CommandPoolVK {
+class ContextVK;
+class CommandPoolRecyclerVK;
+
+//------------------------------------------------------------------------------
+/// @brief      Manages the lifecycle of a single |vk::CommandPool|.
+///
+/// A |vk::CommandPool| is expensive to create and reset. This class manages
+/// the lifecycle of a single |vk::CommandPool| by returning to the origin
+/// (|CommandPoolRecyclerVK|) when it is destroyed to be reused.
+///
+/// @warning    This class is not thread-safe.
+///
+/// @see        |CommandPoolRecyclerVK|
+class CommandPoolVK final {
  public:
-  static std::unique_ptr<CommandPoolVK> Create(vk::Device device,
-                                               uint32_t queue_index);
+  ~CommandPoolVK();
 
-  explicit CommandPoolVK(vk::UniqueCommandPool command_pool);
+  /// @brief      Creates a resource that manages the life of a command pool.
+  ///
+  /// @param[in]  pool      The command pool to manage.
+  /// @param[in]  buffers   Zero or more command buffers in an initial state.
+  /// @param[in]  recycler  The context that will be notified on destruction.
+  CommandPoolVK(vk::UniqueCommandPool pool,
+                std::vector<vk::UniqueCommandBuffer>&& buffers,
+                std::weak_ptr<ContextVK>& context)
+      : pool_(std::move(pool)),
+        unused_command_buffers_(std::move(buffers)),
+        context_(context) {}
 
-  ~CommandPoolVK();
+  /// @brief      Creates and returns a new |vk::CommandBuffer|.
+  ///
+  /// @return     Always returns a new |vk::CommandBuffer|, but if for any
+  ///             reason a valid command buffer could not be created, it will be
+  ///             a `{}` default instance (i.e. while being torn down).
+  vk::UniqueCommandBuffer CreateCommandBuffer();
+
+  /// @brief      Collects the given |vk::CommandBuffer| to be retained.
+  ///
+  /// @param[in]  buffer  The |vk::CommandBuffer| to collect.
+  ///
+  /// @see        |GarbageCollectBuffersIfAble|
+  void CollectCommandBuffer(vk::UniqueCommandBuffer&& buffer);
+
+  /// @brief      Delete all Vulkan objects in this command pool.
+  void Destroy();
+
+ private:
+  CommandPoolVK(const CommandPoolVK&) = delete;
+
+  CommandPoolVK& operator=(const CommandPoolVK&) = delete;
+
+  Mutex pool_mutex_;
+  vk::UniqueCommandPool pool_ IPLR_GUARDED_BY(pool_mutex_);
+  std::vector<vk::UniqueCommandBuffer> unused_command_buffers_;
+  std::weak_ptr<ContextVK>& context_;
+
+  // Used to retain a reference on these until the pool is reset.
+  std::vector<vk::UniqueCommandBuffer> collected_buffers_ IPLR_GUARDED_BY(
+      pool_mutex_);
+};
 
-  vk::CommandPool Get() const;
+//------------------------------------------------------------------------------
+/// @brief      Creates and manages the lifecycle of |vk::CommandPool| objects.
+///
+/// A |vk::CommandPool| is expensive to create and reset. This class manages
+/// the lifecycle of |vk::CommandPool| objects by creating and recycling them;
+/// or in other words, a pool for command pools.
+///
+/// A single instance should be created per |ContextVK|.
+///
+/// Every "frame", a single |CommandPoolResourceVk| is made available for each
+/// thread that calls |Get|. After calling |Dispose|, the current thread's pool
+/// is moved to a background thread, reset, and made available for the next time
+/// |Get| is called and needs to create a command pool.
+///
+/// Commands in the command pool are not necessarily done executing when the
+/// pool is recycled, when all references are dropped to the pool, they are
+/// reset and returned to the pool of available pools.
+///
+/// @note       This class is thread-safe.
+///
+/// @see        |vk::CommandPoolResourceVk|
+/// @see        |ContextVK|
+/// @see
+/// https://arm-software.github.io/vulkan_best_practice_for_mobile_developers/samples/performance/command_buffer_usage/command_buffer_usage_tutorial.html
+class CommandPoolRecyclerVK final
+    : public std::enable_shared_from_this<CommandPoolRecyclerVK> {
+ public:
+  ~CommandPoolRecyclerVK();
+
+  /// A unique command pool and zero or more recycled command buffers.
+  struct RecycledData {
+    vk::UniqueCommandPool pool;
+    std::vector<vk::UniqueCommandBuffer> buffers;
+  };
+
+  /// @brief      Clean up resources held by all per-thread command pools
+  ///             associated with the given context.
+  ///
+  /// @param[in]  context The context.
+  static void DestroyThreadLocalPools(const ContextVK* context);
+
+  /// @brief      Creates a recycler for the given |ContextVK|.
+  ///
+  /// @param[in]  context The context to create the recycler for.
+  explicit CommandPoolRecyclerVK(std::weak_ptr<ContextVK> context)
+      : context_(std::move(context)) {}
+
+  /// @brief      Gets a command pool for the current thread.
+  ///
+  /// @warning    Returns a |nullptr| if a pool could not be created.
+  std::shared_ptr<CommandPoolVK> Get();
+
+  /// @brief      Returns a command pool to be reset on a background thread.
+  ///
+  /// @param[in]  pool The pool to recycler.
+  void Reclaim(vk::UniqueCommandPool&& pool,
+               std::vector<vk::UniqueCommandBuffer>&& buffers);
+
+  /// @brief      Clears all recycled command pools to let them be reclaimed.
+  void Dispose();
 
  private:
-  vk::UniqueCommandPool command_pool_;
+  std::weak_ptr<ContextVK> context_;
+
+  Mutex recycled_mutex_;
+  std::vector<RecycledData> recycled_ IPLR_GUARDED_BY(recycled_mutex_);
+
+  /// @brief      Creates a new |vk::CommandPool|.
+  ///
+  /// @returns    Returns a |std::nullopt| if a pool could not be created.
+  std::optional<CommandPoolRecyclerVK::RecycledData> Create();
 
-  FML_DISALLOW_COPY_AND_ASSIGN(CommandPoolVK);
+  /// @brief      Reuses a recycled |RecycledData|, if available.
+  ///
+  /// @returns    Returns a |std::nullopt| if a pool was not available.
+  std::optional<RecycledData> Reuse();
+
+  CommandPoolRecyclerVK(const CommandPoolRecyclerVK&) = delete;
+
+  CommandPoolRecyclerVK& operator=(const CommandPoolRecyclerVK&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_COMMAND_POOL_VK_H_
diff --git a/impeller/renderer/backend/vulkan/command_pool_vk_unittests.cc b/impeller/renderer/backend/vulkan/command_pool_vk_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..880c40d664b28b3414d1834ab9e0664618616a39
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/command_pool_vk_unittests.cc
@@ -0,0 +1,166 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/testing/testing.h"  // IWYU pragma: keep.
+#include "fml/synchronization/waitable_event.h"
+#include "impeller/renderer/backend/vulkan/command_pool_vk.h"
+#include "impeller/renderer/backend/vulkan/resource_manager_vk.h"
+#include "impeller/renderer/backend/vulkan/test/mock_vulkan.h"
+
+namespace impeller {
+namespace testing {
+
+TEST(CommandPoolRecyclerVKTest, GetsACommandPoolPerThread) {
+  auto const context = MockVulkanContextBuilder().Build();
+
+  {
+    // Record the memory location of each pointer to a command pool.
+    //
+    // These pools have to be held at this context, otherwise they will be
+    // dropped and recycled and potentially reused by another thread, causing
+    // flaky tests.
+    std::shared_ptr<CommandPoolVK> pool1;
+    std::shared_ptr<CommandPoolVK> pool2;
+
+    // Create a command pool in two threads and record the memory location.
+    std::thread thread1(
+        [&]() { pool1 = context->GetCommandPoolRecycler()->Get(); });
+
+    std::thread thread2(
+        [&]() { pool2 = context->GetCommandPoolRecycler()->Get(); });
+
+    thread1.join();
+    thread2.join();
+
+    // The two command pools should be different.
+    EXPECT_NE(pool1, pool2);
+  }
+
+  context->Shutdown();
+}
+
+TEST(CommandPoolRecyclerVKTest, GetsTheSameCommandPoolOnSameThread) {
+  auto const context = MockVulkanContextBuilder().Build();
+
+  auto const pool1 = context->GetCommandPoolRecycler()->Get();
+  auto const pool2 = context->GetCommandPoolRecycler()->Get();
+
+  // The two command pools should be the same.
+  EXPECT_EQ(pool1.get(), pool2.get());
+
+  context->Shutdown();
+}
+
+namespace {
+
+// Invokes the provided callback when the destructor is called.
+//
+// Can be moved, but not copied.
+class DeathRattle final {
+ public:
+  explicit DeathRattle(std::function<void()> callback)
+      : callback_(std::move(callback)) {}
+
+  DeathRattle(DeathRattle&&) = default;
+  DeathRattle& operator=(DeathRattle&&) = default;
+
+  ~DeathRattle() { callback_(); }
+
+ private:
+  std::function<void()> callback_;
+};
+
+}  // namespace
+
+TEST(CommandPoolRecyclerVKTest, ReclaimMakesCommandPoolAvailable) {
+  auto const context = MockVulkanContextBuilder().Build();
+
+  {
+    // Fetch a pool (which will be created).
+    auto const recycler = context->GetCommandPoolRecycler();
+    auto const pool = recycler->Get();
+
+    // This normally is called at the end of a frame.
+    recycler->Dispose();
+  }
+
+  // Add something to the resource manager and have it notify us when it's
+  // destroyed. That should give us a non-flaky signal that the pool has been
+  // reclaimed as well.
+  auto waiter = fml::AutoResetWaitableEvent();
+  auto rattle = DeathRattle([&waiter]() { waiter.Signal(); });
+  {
+    UniqueResourceVKT<DeathRattle> resource(context->GetResourceManager(),
+                                            std::move(rattle));
+  }
+  waiter.Wait();
+
+  // On another thread explicitly, request a new pool.
+  std::thread thread([&]() {
+    auto const pool = context->GetCommandPoolRecycler()->Get();
+    EXPECT_NE(pool.get(), nullptr);
+  });
+
+  thread.join();
+
+  // Now check that we only ever created one pool.
+  auto const called = GetMockVulkanFunctions(context->GetDevice());
+  EXPECT_EQ(std::count(called->begin(), called->end(), "vkCreateCommandPool"),
+            1u);
+
+  context->Shutdown();
+}
+
+TEST(CommandPoolRecyclerVKTest, CommandBuffersAreRecycled) {
+  auto const context = MockVulkanContextBuilder().Build();
+
+  {
+    // Fetch a pool (which will be created).
+    auto const recycler = context->GetCommandPoolRecycler();
+    auto pool = recycler->Get();
+
+    auto buffer = pool->CreateCommandBuffer();
+    pool->CollectCommandBuffer(std::move(buffer));
+
+    // This normally is called at the end of a frame.
+    recycler->Dispose();
+  }
+
+  // Wait for the pool to be reclaimed.
+  for (auto i = 0u; i < 2u; i++) {
+    auto waiter = fml::AutoResetWaitableEvent();
+    auto rattle = DeathRattle([&waiter]() { waiter.Signal(); });
+    {
+      UniqueResourceVKT<DeathRattle> resource(context->GetResourceManager(),
+                                              std::move(rattle));
+    }
+    waiter.Wait();
+  }
+
+  {
+    // Create a second pool and command buffer, which should reused the existing
+    // pool and cmd buffer.
+    auto const recycler = context->GetCommandPoolRecycler();
+    auto pool = recycler->Get();
+
+    auto buffer = pool->CreateCommandBuffer();
+    pool->CollectCommandBuffer(std::move(buffer));
+
+    // This normally is called at the end of a frame.
+    recycler->Dispose();
+  }
+
+  // Now check that we only ever created one pool and one command buffer.
+  auto const called = GetMockVulkanFunctions(context->GetDevice());
+  EXPECT_EQ(std::count(called->begin(), called->end(), "vkCreateCommandPool"),
+            1u);
+  EXPECT_EQ(
+      std::count(called->begin(), called->end(), "vkAllocateCommandBuffers"),
+      1u);
+
+  context->Shutdown();
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/command_queue_vk.cc b/impeller/renderer/backend/vulkan/command_queue_vk.cc
new file mode 100644
index 0000000000000000000000000000000000000000..11842a10467df143cb0a470bfa7bd7edfc69dda9
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/command_queue_vk.cc
@@ -0,0 +1,91 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "fml/status.h"
+
+#include "impeller/renderer/backend/vulkan/command_queue_vk.h"
+
+#include "impeller/base/validation.h"
+#include "impeller/renderer/backend/vulkan/command_buffer_vk.h"
+#include "impeller/renderer/backend/vulkan/command_encoder_vk.h"
+#include "impeller/renderer/backend/vulkan/context_vk.h"
+#include "impeller/renderer/backend/vulkan/fence_waiter_vk.h"
+#include "impeller/renderer/backend/vulkan/tracked_objects_vk.h"
+#include "impeller/renderer/command_buffer.h"
+
+namespace impeller {
+
+CommandQueueVK::CommandQueueVK(const std::weak_ptr<ContextVK>& context)
+    : context_(context) {}
+
+CommandQueueVK::~CommandQueueVK() = default;
+
+fml::Status CommandQueueVK::Submit(
+    const std::vector<std::shared_ptr<CommandBuffer>>& buffers,
+    const CompletionCallback& completion_callback) {
+  if (buffers.empty()) {
+    return fml::Status(fml::StatusCode::kInvalidArgument,
+                       "No command buffers provided.");
+  }
+  // Success or failure, you only get to submit once.
+  fml::ScopedCleanupClosure reset([&]() {
+    if (completion_callback) {
+      completion_callback(CommandBuffer::Status::kError);
+    }
+  });
+
+  std::vector<vk::CommandBuffer> vk_buffers;
+  std::vector<std::shared_ptr<TrackedObjectsVK>> tracked_objects;
+  vk_buffers.reserve(buffers.size());
+  tracked_objects.reserve(buffers.size());
+  for (const std::shared_ptr<CommandBuffer>& buffer : buffers) {
+    auto encoder = CommandBufferVK::Cast(*buffer).GetEncoder();
+    if (!encoder->EndCommandBuffer()) {
+      return fml::Status(fml::StatusCode::kCancelled,
+                         "Failed to end command buffer.");
+    }
+    tracked_objects.push_back(encoder->tracked_objects_);
+    vk_buffers.push_back(encoder->GetCommandBuffer());
+    encoder->Reset();
+  }
+
+  auto context = context_.lock();
+  if (!context) {
+    VALIDATION_LOG << "Device lost.";
+    return fml::Status(fml::StatusCode::kCancelled, "Device lost.");
+  }
+  auto [fence_result, fence] = context->GetDevice().createFenceUnique({});
+  if (fence_result != vk::Result::eSuccess) {
+    VALIDATION_LOG << "Failed to create fence: " << vk::to_string(fence_result);
+    return fml::Status(fml::StatusCode::kCancelled, "Failed to create fence.");
+  }
+
+  vk::SubmitInfo submit_info;
+  submit_info.setCommandBuffers(vk_buffers);
+  auto status = context->GetGraphicsQueue()->Submit(submit_info, *fence);
+  if (status != vk::Result::eSuccess) {
+    VALIDATION_LOG << "Failed to submit queue: " << vk::to_string(status);
+    return fml::Status(fml::StatusCode::kCancelled, "Failed to submit queue: ");
+  }
+
+  // Submit will proceed, call callback with true when it is done and do not
+  // call when `reset` is collected.
+  auto added_fence = context->GetFenceWaiter()->AddFence(
+      std::move(fence), [completion_callback, tracked_objects = std::move(
+                                                  tracked_objects)]() mutable {
+        // Ensure tracked objects are destructed before calling any final
+        // callbacks.
+        tracked_objects.clear();
+        if (completion_callback) {
+          completion_callback(CommandBuffer::Status::kCompleted);
+        }
+      });
+  if (!added_fence) {
+    return fml::Status(fml::StatusCode::kCancelled, "Failed to add fence.");
+  }
+  reset.Release();
+  return fml::Status();
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/command_queue_vk.h b/impeller/renderer/backend/vulkan/command_queue_vk.h
new file mode 100644
index 0000000000000000000000000000000000000000..6397391c845c984b68c747d7e2a1ed9976c152a3
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/command_queue_vk.h
@@ -0,0 +1,34 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_COMMAND_QUEUE_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_COMMAND_QUEUE_VK_H_
+
+#include "impeller/renderer/command_queue.h"
+
+namespace impeller {
+
+class ContextVK;
+
+class CommandQueueVK : public CommandQueue {
+ public:
+  explicit CommandQueueVK(const std::weak_ptr<ContextVK>& context);
+
+  ~CommandQueueVK() override;
+
+  fml::Status Submit(
+      const std::vector<std::shared_ptr<CommandBuffer>>& buffers,
+      const CompletionCallback& completion_callback = {}) override;
+
+ private:
+  std::weak_ptr<ContextVK> context_;
+
+  CommandQueueVK(const CommandQueueVK&) = delete;
+
+  CommandQueueVK& operator=(const CommandQueueVK&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_COMMAND_QUEUE_VK_H_
diff --git a/impeller/renderer/backend/vulkan/compute_pass_vk.cc b/impeller/renderer/backend/vulkan/compute_pass_vk.cc
new file mode 100644
index 0000000000000000000000000000000000000000..2b5ac2eece6205c6135ae242fab8c2df1241f3d6
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/compute_pass_vk.cc
@@ -0,0 +1,265 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/backend/vulkan/compute_pass_vk.h"
+
+#include "impeller/renderer/backend/vulkan/command_buffer_vk.h"
+#include "impeller/renderer/backend/vulkan/compute_pipeline_vk.h"
+#include "impeller/renderer/backend/vulkan/formats_vk.h"
+#include "impeller/renderer/backend/vulkan/sampler_vk.h"
+#include "impeller/renderer/backend/vulkan/texture_vk.h"
+#include "vulkan/vulkan_structs.hpp"
+
+namespace impeller {
+
+ComputePassVK::ComputePassVK(std::shared_ptr<const Context> context,
+                             std::shared_ptr<CommandBufferVK> command_buffer)
+    : ComputePass(std::move(context)),
+      command_buffer_(std::move(command_buffer)) {
+  // TOOD(dnfield): This should be moved to caps. But for now keeping this
+  // in parallel with Metal.
+  max_wg_size_ = ContextVK::Cast(*context_)
+                     .GetPhysicalDevice()
+                     .getProperties()
+                     .limits.maxComputeWorkGroupSize;
+  is_valid_ = true;
+}
+
+ComputePassVK::~ComputePassVK() = default;
+
+bool ComputePassVK::IsValid() const {
+  return is_valid_;
+}
+
+void ComputePassVK::OnSetLabel(const std::string& label) {
+  if (label.empty()) {
+    return;
+  }
+  label_ = label;
+}
+
+// |RenderPass|
+void ComputePassVK::SetCommandLabel(std::string_view label) {
+#ifdef IMPELLER_DEBUG
+  command_buffer_->GetEncoder()->PushDebugGroup(label);
+  has_label_ = true;
+#endif  // IMPELLER_DEBUG
+}
+
+// |ComputePass|
+void ComputePassVK::SetPipeline(
+    const std::shared_ptr<Pipeline<ComputePipelineDescriptor>>& pipeline) {
+  const auto& pipeline_vk = ComputePipelineVK::Cast(*pipeline);
+  const vk::CommandBuffer& command_buffer_vk =
+      command_buffer_->GetEncoder()->GetCommandBuffer();
+  command_buffer_vk.bindPipeline(vk::PipelineBindPoint::eCompute,
+                                 pipeline_vk.GetPipeline());
+  pipeline_layout_ = pipeline_vk.GetPipelineLayout();
+
+  auto descriptor_result =
+      command_buffer_->GetEncoder()->AllocateDescriptorSets(
+          pipeline_vk.GetDescriptorSetLayout(), ContextVK::Cast(*context_));
+  if (!descriptor_result.ok()) {
+    return;
+  }
+  descriptor_set_ = descriptor_result.value();
+  pipeline_valid_ = true;
+}
+
+// |ComputePass|
+fml::Status ComputePassVK::Compute(const ISize& grid_size) {
+  if (grid_size.IsEmpty() || !pipeline_valid_) {
+    bound_image_offset_ = 0u;
+    bound_buffer_offset_ = 0u;
+    descriptor_write_offset_ = 0u;
+    has_label_ = false;
+    pipeline_valid_ = false;
+    return fml::Status(fml::StatusCode::kCancelled,
+                       "Invalid pipeline or empty grid.");
+  }
+
+  const ContextVK& context_vk = ContextVK::Cast(*context_);
+  for (auto i = 0u; i < descriptor_write_offset_; i++) {
+    write_workspace_[i].dstSet = descriptor_set_;
+  }
+
+  context_vk.GetDevice().updateDescriptorSets(descriptor_write_offset_,
+                                              write_workspace_.data(), 0u, {});
+  const vk::CommandBuffer& command_buffer_vk =
+      command_buffer_->GetEncoder()->GetCommandBuffer();
+
+  command_buffer_vk.bindDescriptorSets(
+      vk::PipelineBindPoint::eCompute,  // bind point
+      pipeline_layout_,                 // layout
+      0,                                // first set
+      1,                                // set count
+      &descriptor_set_,                 // sets
+      0,                                // offset count
+      nullptr                           // offsets
+  );
+
+  int64_t width = grid_size.width;
+  int64_t height = grid_size.height;
+
+  // Special case for linear processing.
+  if (height == 1) {
+    command_buffer_vk.dispatch(width, 1, 1);
+  } else {
+    while (width > max_wg_size_[0]) {
+      width = std::max(static_cast<int64_t>(1), width / 2);
+    }
+    while (height > max_wg_size_[1]) {
+      height = std::max(static_cast<int64_t>(1), height / 2);
+    }
+    command_buffer_vk.dispatch(width, height, 1);
+  }
+
+#ifdef IMPELLER_DEBUG
+  if (has_label_) {
+    command_buffer_->GetEncoder()->PopDebugGroup();
+  }
+  has_label_ = false;
+#endif  // IMPELLER_DEBUG
+
+  bound_image_offset_ = 0u;
+  bound_buffer_offset_ = 0u;
+  descriptor_write_offset_ = 0u;
+  has_label_ = false;
+  pipeline_valid_ = false;
+
+  return fml::Status();
+}
+
+// |ResourceBinder|
+bool ComputePassVK::BindResource(ShaderStage stage,
+                                 DescriptorType type,
+                                 const ShaderUniformSlot& slot,
+                                 const ShaderMetadata& metadata,
+                                 BufferView view) {
+  return BindResource(slot.binding, type, view);
+}
+
+// |ResourceBinder|
+bool ComputePassVK::BindResource(
+    ShaderStage stage,
+    DescriptorType type,
+    const SampledImageSlot& slot,
+    const ShaderMetadata& metadata,
+    std::shared_ptr<const Texture> texture,
+    const std::unique_ptr<const Sampler>& sampler) {
+  if (bound_image_offset_ >= kMaxBindings) {
+    return false;
+  }
+  if (!texture->IsValid() || !sampler) {
+    return false;
+  }
+  const TextureVK& texture_vk = TextureVK::Cast(*texture);
+  const SamplerVK& sampler_vk = SamplerVK::Cast(*sampler);
+
+  if (!command_buffer_->GetEncoder()->Track(texture)) {
+    return false;
+  }
+
+  vk::DescriptorImageInfo image_info;
+  image_info.imageLayout = vk::ImageLayout::eShaderReadOnlyOptimal;
+  image_info.sampler = sampler_vk.GetSampler();
+  image_info.imageView = texture_vk.GetImageView();
+  image_workspace_[bound_image_offset_++] = image_info;
+
+  vk::WriteDescriptorSet write_set;
+  write_set.dstBinding = slot.binding;
+  write_set.descriptorCount = 1u;
+  write_set.descriptorType = ToVKDescriptorType(type);
+  write_set.pImageInfo = &image_workspace_[bound_image_offset_ - 1];
+
+  write_workspace_[descriptor_write_offset_++] = write_set;
+  return true;
+}
+
+bool ComputePassVK::BindResource(size_t binding,
+                                 DescriptorType type,
+                                 const BufferView& view) {
+  if (bound_buffer_offset_ >= kMaxBindings) {
+    return false;
+  }
+
+  const std::shared_ptr<const DeviceBuffer>& device_buffer = view.buffer;
+  auto buffer = DeviceBufferVK::Cast(*device_buffer).GetBuffer();
+  if (!buffer) {
+    return false;
+  }
+
+  if (!command_buffer_->GetEncoder()->Track(device_buffer)) {
+    return false;
+  }
+
+  uint32_t offset = view.range.offset;
+
+  vk::DescriptorBufferInfo buffer_info;
+  buffer_info.buffer = buffer;
+  buffer_info.offset = offset;
+  buffer_info.range = view.range.length;
+  buffer_workspace_[bound_buffer_offset_++] = buffer_info;
+
+  vk::WriteDescriptorSet write_set;
+  write_set.dstBinding = binding;
+  write_set.descriptorCount = 1u;
+  write_set.descriptorType = ToVKDescriptorType(type);
+  write_set.pBufferInfo = &buffer_workspace_[bound_buffer_offset_ - 1];
+
+  write_workspace_[descriptor_write_offset_++] = write_set;
+  return true;
+}
+
+// Note:
+// https://github.com/KhronosGroup/Vulkan-Docs/wiki/Synchronization-Examples
+// Seems to suggest that anything more finely grained than a global memory
+// barrier is likely to be weakened into a global barrier. Confirming this on
+// mobile devices will require some experimentation.
+
+// |ComputePass|
+void ComputePassVK::AddBufferMemoryBarrier() {
+  vk::MemoryBarrier barrier;
+  barrier.srcAccessMask = vk::AccessFlagBits::eShaderWrite;
+  barrier.dstAccessMask = vk::AccessFlagBits::eShaderRead;
+
+  command_buffer_->GetEncoder()->GetCommandBuffer().pipelineBarrier(
+      vk::PipelineStageFlagBits::eComputeShader,
+      vk::PipelineStageFlagBits::eComputeShader, {}, 1, &barrier, 0, {}, 0, {});
+}
+
+// |ComputePass|
+void ComputePassVK::AddTextureMemoryBarrier() {
+  vk::MemoryBarrier barrier;
+  barrier.srcAccessMask = vk::AccessFlagBits::eShaderWrite;
+  barrier.dstAccessMask = vk::AccessFlagBits::eShaderRead;
+
+  command_buffer_->GetEncoder()->GetCommandBuffer().pipelineBarrier(
+      vk::PipelineStageFlagBits::eComputeShader,
+      vk::PipelineStageFlagBits::eComputeShader, {}, 1, &barrier, 0, {}, 0, {});
+}
+
+// |ComputePass|
+bool ComputePassVK::EncodeCommands() const {
+  // Since we only use global memory barrier, we don't have to worry about
+  // compute to compute dependencies across cmd buffers. Instead, we pessimize
+  // here and assume that we wrote to a storage image or buffer and that a
+  // render pass will read from it. if there are ever scenarios where we end up
+  // with compute to compute dependencies this should be revisited.
+
+  // This does not currently handle image barriers as we do not use them
+  // for anything.
+  vk::MemoryBarrier barrier;
+  barrier.srcAccessMask = vk::AccessFlagBits::eShaderWrite;
+  barrier.dstAccessMask =
+      vk::AccessFlagBits::eIndexRead | vk::AccessFlagBits::eVertexAttributeRead;
+
+  command_buffer_->GetEncoder()->GetCommandBuffer().pipelineBarrier(
+      vk::PipelineStageFlagBits::eComputeShader,
+      vk::PipelineStageFlagBits::eVertexInput, {}, 1, &barrier, 0, {}, 0, {});
+
+  return true;
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/compute_pass_vk.h b/impeller/renderer/backend/vulkan/compute_pass_vk.h
new file mode 100644
index 0000000000000000000000000000000000000000..adc2720d6272aae2110424f85a8f0901abc4ad3c
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/compute_pass_vk.h
@@ -0,0 +1,90 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_COMPUTE_PASS_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_COMPUTE_PASS_VK_H_
+
+#include "impeller/renderer/backend/vulkan/command_encoder_vk.h"
+#include "impeller/renderer/compute_pass.h"
+
+namespace impeller {
+
+class CommandBufferVK;
+
+class ComputePassVK final : public ComputePass {
+ public:
+  // |ComputePass|
+  ~ComputePassVK() override;
+
+ private:
+  friend class CommandBufferVK;
+
+  std::shared_ptr<CommandBufferVK> command_buffer_;
+  std::string label_;
+  std::array<uint32_t, 3> max_wg_size_ = {};
+  bool is_valid_ = false;
+
+  // Per-command state.
+  std::array<vk::DescriptorImageInfo, kMaxBindings> image_workspace_;
+  std::array<vk::DescriptorBufferInfo, kMaxBindings> buffer_workspace_;
+  std::array<vk::WriteDescriptorSet, kMaxBindings + kMaxBindings>
+      write_workspace_;
+  size_t bound_image_offset_ = 0u;
+  size_t bound_buffer_offset_ = 0u;
+  size_t descriptor_write_offset_ = 0u;
+  bool has_label_ = false;
+  bool pipeline_valid_ = false;
+  vk::DescriptorSet descriptor_set_ = {};
+  vk::PipelineLayout pipeline_layout_ = {};
+
+  ComputePassVK(std::shared_ptr<const Context> context,
+                std::shared_ptr<CommandBufferVK> command_buffer);
+
+  // |ComputePass|
+  bool IsValid() const override;
+
+  // |ComputePass|
+  void OnSetLabel(const std::string& label) override;
+
+  // |ComputePass|
+  bool EncodeCommands() const override;
+
+  // |ComputePass|
+  void SetCommandLabel(std::string_view label) override;
+
+  // |ComputePass|
+  void SetPipeline(const std::shared_ptr<Pipeline<ComputePipelineDescriptor>>&
+                       pipeline) override;
+
+  // |ComputePass|
+  void AddBufferMemoryBarrier() override;
+
+  // |ComputePass|
+  void AddTextureMemoryBarrier() override;
+
+  // |ComputePass|
+  fml::Status Compute(const ISize& grid_size) override;
+
+  // |ResourceBinder|
+  bool BindResource(ShaderStage stage,
+                    DescriptorType type,
+                    const ShaderUniformSlot& slot,
+                    const ShaderMetadata& metadata,
+                    BufferView view) override;
+
+  // |ResourceBinder|
+  bool BindResource(ShaderStage stage,
+                    DescriptorType type,
+                    const SampledImageSlot& slot,
+                    const ShaderMetadata& metadata,
+                    std::shared_ptr<const Texture> texture,
+                    const std::unique_ptr<const Sampler>& sampler) override;
+
+  bool BindResource(size_t binding,
+                    DescriptorType type,
+                    const BufferView& view);
+};
+
+}  // namespace impeller
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_COMPUTE_PASS_VK_H_
diff --git a/impeller/renderer/backend/vulkan/compute_pipeline_vk.cc b/impeller/renderer/backend/vulkan/compute_pipeline_vk.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a6806561873d817276fe9c39e88f69c309ee9a69
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/compute_pipeline_vk.cc
@@ -0,0 +1,54 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/backend/vulkan/compute_pipeline_vk.h"
+
+namespace impeller {
+
+ComputePipelineVK::ComputePipelineVK(
+    std::weak_ptr<DeviceHolderVK> device_holder,
+    std::weak_ptr<PipelineLibrary> library,
+    const ComputePipelineDescriptor& desc,
+    vk::UniquePipeline pipeline,
+    vk::UniquePipelineLayout layout,
+    vk::UniqueDescriptorSetLayout descriptor_set_layout)
+    : Pipeline(std::move(library), desc),
+      device_holder_(std::move(device_holder)),
+      pipeline_(std::move(pipeline)),
+      layout_(std::move(layout)),
+      descriptor_set_layout_(std::move(descriptor_set_layout)) {
+  is_valid_ = pipeline_ && layout_ && descriptor_set_layout_;
+}
+
+ComputePipelineVK::~ComputePipelineVK() {
+  std::shared_ptr<DeviceHolderVK> device_holder = device_holder_.lock();
+  if (device_holder) {
+    descriptor_set_layout_.reset();
+    layout_.reset();
+    pipeline_.reset();
+  } else {
+    descriptor_set_layout_.release();
+    layout_.release();
+    pipeline_.release();
+  }
+}
+
+bool ComputePipelineVK::IsValid() const {
+  return is_valid_;
+}
+
+const vk::Pipeline& ComputePipelineVK::GetPipeline() const {
+  return *pipeline_;
+}
+
+const vk::PipelineLayout& ComputePipelineVK::GetPipelineLayout() const {
+  return *layout_;
+}
+
+const vk::DescriptorSetLayout& ComputePipelineVK::GetDescriptorSetLayout()
+    const {
+  return *descriptor_set_layout_;
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/compute_pipeline_vk.h b/impeller/renderer/backend/vulkan/compute_pipeline_vk.h
new file mode 100644
index 0000000000000000000000000000000000000000..58c8ba96cf5806d8a3c9ab4fdb15c49d8ab05c70
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/compute_pipeline_vk.h
@@ -0,0 +1,58 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_COMPUTE_PIPELINE_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_COMPUTE_PIPELINE_VK_H_
+
+#include <memory>
+
+#include "flutter/fml/macros.h"
+#include "impeller/base/backend_cast.h"
+#include "impeller/renderer/backend/vulkan/device_holder_vk.h"
+#include "impeller/renderer/backend/vulkan/vk.h"
+#include "impeller/renderer/pipeline.h"
+
+namespace impeller {
+
+class ComputePipelineVK final
+    : public Pipeline<ComputePipelineDescriptor>,
+      public BackendCast<ComputePipelineVK,
+                         Pipeline<ComputePipelineDescriptor>> {
+ public:
+  ComputePipelineVK(std::weak_ptr<DeviceHolderVK> device_holder,
+                    std::weak_ptr<PipelineLibrary> library,
+                    const ComputePipelineDescriptor& desc,
+                    vk::UniquePipeline pipeline,
+                    vk::UniquePipelineLayout layout,
+                    vk::UniqueDescriptorSetLayout descriptor_set_layout);
+
+  // |Pipeline|
+  ~ComputePipelineVK() override;
+
+  const vk::Pipeline& GetPipeline() const;
+
+  const vk::PipelineLayout& GetPipelineLayout() const;
+
+  const vk::DescriptorSetLayout& GetDescriptorSetLayout() const;
+
+ private:
+  friend class PipelineLibraryVK;
+
+  std::weak_ptr<DeviceHolderVK> device_holder_;
+  vk::UniquePipeline pipeline_;
+  vk::UniquePipelineLayout layout_;
+  vk::UniqueDescriptorSetLayout descriptor_set_layout_;
+  bool is_valid_ = false;
+
+  // |Pipeline|
+  bool IsValid() const override;
+
+  ComputePipelineVK(const ComputePipelineVK&) = delete;
+
+  ComputePipelineVK& operator=(const ComputePipelineVK&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_COMPUTE_PIPELINE_VK_H_
diff --git a/impeller/renderer/backend/vulkan/context_vk.cc b/impeller/renderer/backend/vulkan/context_vk.cc
index 0427f9fdf0d928231b574473adf2a442d27ba442..215f85d8e645bc31e190f7b7f0ca7056bf4a3d7a 100644
--- a/impeller/renderer/backend/vulkan/context_vk.cc
+++ b/impeller/renderer/backend/vulkan/context_vk.cc
@@ -7,154 +7,56 @@
 
 #include "impeller/renderer/backend/vulkan/context_vk.h"
 
+#include "fml/concurrent_message_loop.h"
+#include "impeller/renderer/backend/vulkan/command_queue_vk.h"
+#include "impeller/renderer/backend/vulkan/render_pass_builder_vk.h"
+#include "impeller/renderer/render_target.h"
+
+#ifdef FML_OS_ANDROID
+#include <pthread.h>
+#include <sys/resource.h>
+#include <sys/time.h>
+#endif  // FML_OS_ANDROID
+
 #include <map>
 #include <memory>
 #include <optional>
-#include <set>
 #include <string>
 #include <vector>
 
-#include "flutter/fml/build_config.h"
-#include "flutter/fml/string_conversion.h"
+#include "flutter/fml/cpu_affinity.h"
 #include "flutter/fml/trace_event.h"
 #include "impeller/base/validation.h"
-#include "impeller/base/work_queue_common.h"
 #include "impeller/renderer/backend/vulkan/allocator_vk.h"
 #include "impeller/renderer/backend/vulkan/capabilities_vk.h"
 #include "impeller/renderer/backend/vulkan/command_buffer_vk.h"
-#include "impeller/renderer/backend/vulkan/deletion_queue_vk.h"
-#include "impeller/renderer/backend/vulkan/formats_vk.h"
-#include "impeller/renderer/backend/vulkan/surface_producer_vk.h"
-#include "impeller/renderer/backend/vulkan/swapchain_details_vk.h"
-#include "impeller/renderer/backend/vulkan/vk.h"
-#include "impeller/renderer/backend_features.h"
+#include "impeller/renderer/backend/vulkan/command_encoder_vk.h"
+#include "impeller/renderer/backend/vulkan/command_pool_vk.h"
+#include "impeller/renderer/backend/vulkan/command_queue_vk.h"
+#include "impeller/renderer/backend/vulkan/debug_report_vk.h"
+#include "impeller/renderer/backend/vulkan/fence_waiter_vk.h"
+#include "impeller/renderer/backend/vulkan/gpu_tracer_vk.h"
+#include "impeller/renderer/backend/vulkan/resource_manager_vk.h"
+#include "impeller/renderer/backend/vulkan/surface_context_vk.h"
+#include "impeller/renderer/backend/vulkan/yuv_conversion_library_vk.h"
+#include "impeller/renderer/capabilities.h"
 
 VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE
 
-namespace {
-
-VKAPI_ATTR VkBool32 VKAPI_CALL DebugUtilsMessengerCallback(
-    VkDebugUtilsMessageSeverityFlagBitsEXT severity,
-    VkDebugUtilsMessageTypeFlagsEXT type,
-    const VkDebugUtilsMessengerCallbackDataEXT* pCallbackData,
-    void* pUserData) {
-  const auto prefix = impeller::vk::to_string(
-      impeller::vk::DebugUtilsMessageSeverityFlagBitsEXT{severity});
-
-  FML_DCHECK(false) << prefix << "[" << pCallbackData->messageIdNumber << "]["
-                    << pCallbackData->pMessageIdName
-                    << "] : " << pCallbackData->pMessage;
-
-  // The return value of this callback controls whether the Vulkan call that
-  // caused the validation message will be aborted or not We return VK_TRUE as
-  // we DO want Vulkan calls that cause a validation message to abort
-  return VK_TRUE;
-}
-
-}  // namespace
-
 namespace impeller {
 
-namespace vk {
+// TODO(csg): Fix this after caps are reworked.
+static bool gHasValidationLayers = false;
 
 bool HasValidationLayers() {
-  auto capabilities = std::make_unique<CapabilitiesVK>();
-  return capabilities->HasLayer(kKhronosValidationLayerName);
-}
-
-}  // namespace vk
-
-static std::set<std::string> kRequiredDeviceExtensions = {
-    VK_KHR_SWAPCHAIN_EXTENSION_NAME,
-#if FML_OS_MACOSX
-    "VK_KHR_portability_subset",  // For Molten VK. No define present in header.
-#endif
-};
-
-std::vector<std::string> kRequiredWSIInstanceExtensions = {
-#if FML_OS_WIN
-    "VK_KHR_win32_surface",
-#elif FML_OS_ANDROID
-    "VK_KHR_android_surface",
-#elif FML_OS_LINUX
-    "VK_KHR_xcb_surface",
-    "VK_KHR_xlib_surface",
-    "VK_KHR_wayland_surface",
-#elif FML_OS_MACOSX
-    "VK_EXT_metal_surface",
-#endif
-};
-
-#if FML_OS_MACOSX
-static const char* MVK_MACOS_SURFACE_EXT = "VK_MVK_macos_surface";
-#endif
-
-static bool HasRequiredQueues(const vk::PhysicalDevice& device) {
-  auto present_flags = vk::QueueFlags{};
-  for (const auto& queue : device.getQueueFamilyProperties()) {
-    if (queue.queueCount == 0) {
-      continue;
-    }
-    present_flags |= queue.queueFlags;
-  }
-  return static_cast<VkQueueFlags>(present_flags &
-                                   (vk::QueueFlagBits::eGraphics |
-                                    vk::QueueFlagBits::eCompute |
-                                    vk::QueueFlagBits::eTransfer));
-}
-
-static std::vector<std::string> HasRequiredExtensions(
-    const vk::PhysicalDevice& device) {
-  std::set<std::string> exts;
-  std::vector<std::string> missing;
-  for (const auto& ext : device.enumerateDeviceExtensionProperties().value) {
-    exts.insert(ext.extensionName);
-  }
-  for (const auto& req_ext : kRequiredDeviceExtensions) {
-    if (exts.count(req_ext) != 1u) {
-      missing.push_back(req_ext);
-    }
-  }
-  return missing;
-}
-
-static vk::PhysicalDeviceFeatures GetRequiredPhysicalDeviceFeatures() {
-  vk::PhysicalDeviceFeatures features;
-  features.setRobustBufferAccess(true);
-  return features;
-};
-
-static bool HasRequiredProperties(const vk::PhysicalDevice& device) {
-  auto properties = device.getProperties();
-  if (!(properties.limits.framebufferColorSampleCounts &
-        (vk::SampleCountFlagBits::e1 | vk::SampleCountFlagBits::e4))) {
-    return false;
-  }
-  return true;
-}
-
-static bool IsPhysicalDeviceCompatible(const vk::PhysicalDevice& device) {
-  if (!HasRequiredQueues(device)) {
-    FML_LOG(ERROR) << "Device doesn't have required queues.";
-    return false;
-  }
-  auto missing_exts = HasRequiredExtensions(device);
-  if (!missing_exts.empty()) {
-    FML_LOG(ERROR) << "Device doesn't have required extensions: "
-                   << fml::Join(missing_exts, ", ");
-    return false;
-  }
-  if (!HasRequiredProperties(device)) {
-    FML_LOG(ERROR) << "Device doesn't have required properties.";
-    return false;
-  }
-  return true;
+  return gHasValidationLayers;
 }
 
 static std::optional<vk::PhysicalDevice> PickPhysicalDevice(
+    const CapabilitiesVK& caps,
     const vk::Instance& instance) {
   for (const auto& device : instance.enumeratePhysicalDevices().value) {
-    if (IsPhysicalDeviceCompatible(device)) {
+    if (caps.GetEnabledDeviceFeatures(device).has_value()) {
       return device;
     }
   }
@@ -162,7 +64,7 @@ static std::optional<vk::PhysicalDevice> PickPhysicalDevice(
 }
 
 static std::vector<vk::DeviceQueueCreateInfo> GetQueueCreateInfos(
-    std::initializer_list<QueueVK> queues) {
+    std::initializer_list<QueueIndexVK> queues) {
   std::map<size_t /* family */, size_t /* index */> family_index_map;
   for (const auto& queue : queues) {
     family_index_map[queue.family] = 0;
@@ -184,8 +86,8 @@ static std::vector<vk::DeviceQueueCreateInfo> GetQueueCreateInfos(
   return infos;
 }
 
-static std::optional<QueueVK> PickQueue(const vk::PhysicalDevice& device,
-                                        vk::QueueFlagBits flags) {
+static std::optional<QueueIndexVK> PickQueue(const vk::PhysicalDevice& device,
+                                             vk::QueueFlagBits flags) {
   // This can be modified to ensure that dedicated queues are returned for each
   // queue type depending on support.
   const auto families = device.getQueueFamilyProperties();
@@ -193,153 +95,118 @@ static std::optional<QueueVK> PickQueue(const vk::PhysicalDevice& device,
     if (!(families[i].queueFlags & flags)) {
       continue;
     }
-    return QueueVK{.family = i, .index = 0};
+    return QueueIndexVK{.family = i, .index = 0};
   }
   return std::nullopt;
 }
 
-static std::optional<QueueVK> PickPresentQueue(const vk::PhysicalDevice& device,
-                                               vk::SurfaceKHR surface) {
-  const auto families = device.getQueueFamilyProperties();
-  for (size_t i = 0u; i < families.size(); i++) {
-    auto res = device.getSurfaceSupportKHR(i, surface);
-    if (res.result != vk::Result::eSuccess) {
-      continue;
-    }
-    vk::Bool32 present_supported = res.value;
-    if (present_supported) {
-      return QueueVK{.family = i, .index = 0};
-    }
-  }
-  VALIDATION_LOG << "No present queue found.";
-  return std::nullopt;
-}
-
-std::shared_ptr<ContextVK> ContextVK::Create(
-    PFN_vkGetInstanceProcAddr proc_address_callback,
-    const std::vector<std::shared_ptr<fml::Mapping>>& shader_libraries_data,
-    const std::shared_ptr<const fml::Mapping>& pipeline_cache_data,
-    std::shared_ptr<fml::ConcurrentTaskRunner> worker_task_runner,
-    const std::string& label) {
-  auto context = std::shared_ptr<ContextVK>(new ContextVK(
-      proc_address_callback,          //
-      shader_libraries_data,          //
-      pipeline_cache_data,            //
-      std::move(worker_task_runner),  //
-      label                           //
-      ));
+std::shared_ptr<ContextVK> ContextVK::Create(Settings settings) {
+  auto context = std::shared_ptr<ContextVK>(new ContextVK());
+  context->Setup(std::move(settings));
   if (!context->IsValid()) {
     return nullptr;
   }
   return context;
 }
 
-ContextVK::ContextVK(
-    PFN_vkGetInstanceProcAddr proc_address_callback,
-    const std::vector<std::shared_ptr<fml::Mapping>>& shader_libraries_data,
-    const std::shared_ptr<const fml::Mapping>& pipeline_cache_data,
-    std::shared_ptr<fml::ConcurrentTaskRunner> worker_task_runner,
-    const std::string& label)
-    : worker_task_runner_(std::move(worker_task_runner)) {
-  TRACE_EVENT0("impeller", "ContextVK::Create");
+// static
+size_t ContextVK::ChooseThreadCountForWorkers(size_t hardware_concurrency) {
+  // Never create more than 4 worker threads. Attempt to use up to
+  // half of the available concurrency.
+  return std::clamp(hardware_concurrency / 2ull, /*lo=*/1ull, /*hi=*/4ull);
+}
 
-  if (!worker_task_runner_) {
-    VALIDATION_LOG << "Invalid worker task runner.";
+namespace {
+thread_local uint64_t tls_context_count = 0;
+uint64_t CalculateHash(void* ptr) {
+  // You could make a context once per nanosecond for 584 years on one thread
+  // before this overflows.
+  return ++tls_context_count;
+}
+}  // namespace
+
+ContextVK::ContextVK() : hash_(CalculateHash(this)) {}
+
+ContextVK::~ContextVK() {
+  if (device_holder_ && device_holder_->device) {
+    [[maybe_unused]] auto result = device_holder_->device->waitIdle();
+  }
+  CommandPoolRecyclerVK::DestroyThreadLocalPools(this);
+}
+
+Context::BackendType ContextVK::GetBackendType() const {
+  return Context::BackendType::kVulkan;
+}
+
+void ContextVK::Setup(Settings settings) {
+  TRACE_EVENT0("impeller", "ContextVK::Setup");
+
+  if (!settings.proc_address_callback) {
     return;
   }
 
+  raster_message_loop_ = fml::ConcurrentMessageLoop::Create(
+      ChooseThreadCountForWorkers(std::thread::hardware_concurrency()));
+  raster_message_loop_->PostTaskToAllWorkers([]() {
+    // Currently we only use the worker task pool for small parts of a frame
+    // workload, if this changes this setting may need to be adjusted.
+    fml::RequestAffinity(fml::CpuAffinity::kNotPerformance);
+#ifdef FML_OS_ANDROID
+    if (::setpriority(PRIO_PROCESS, gettid(), -5) != 0) {
+      FML_LOG(ERROR) << "Failed to set Workers task runner priority";
+    }
+#endif  // FML_OS_ANDROID
+  });
+
   auto& dispatcher = VULKAN_HPP_DEFAULT_DISPATCHER;
-  dispatcher.init(proc_address_callback);
+  dispatcher.init(settings.proc_address_callback);
 
-  auto capabilities = std::make_unique<CapabilitiesVK>();
+  // Enable Vulkan validation if either:
+  // 1. The user has explicitly enabled it.
+  // 2. We are in a combination of debug mode, and running on Android.
+  // (It's possible 2 is overly conservative and we can simplify this)
+  auto enable_validation = settings.enable_validation;
 
-  vk::InstanceCreateFlags instance_flags = {};
-  std::vector<const char*> enabled_layers;
-  std::vector<const char*> enabled_extensions;
+#if defined(FML_OS_ANDROID) && !defined(NDEBUG)
+  enable_validation = true;
+#endif
 
-// This define may need to change into a runtime check if using SwiftShader on
-// Mac.
-#if FML_OS_MACOSX
-  //----------------------------------------------------------------------------
-  /// Ensure we need any Vulkan implementations that are not fully compliant
-  /// with the requested Vulkan Spec. This is necessary for MoltenVK on Mac
-  /// (backed by Metal).
-  ///
-  if (!capabilities->HasExtension(
-          VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME)) {
-    VALIDATION_LOG << "On Mac: Required extension "
-                   << VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME
-                   << " absent.";
-    return;
-  }
-  // Molten VK on Mac is not fully compliant. We opt into being OK not getting
-  // back a fully compliant version of a Vulkan implementation.
-  enabled_extensions.push_back(VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME);
-  instance_flags |= vk::InstanceCreateFlagBits::eEnumeratePortabilityKHR;
+  auto caps =
+      std::shared_ptr<CapabilitiesVK>(new CapabilitiesVK(enable_validation));
 
-  if (!capabilities->HasExtension(
-          VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME)) {
-    VALIDATION_LOG << "On Mac: Required extension "
-                   << VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME
-                   << " absent.";
+  if (!caps->IsValid()) {
+    VALIDATION_LOG << "Could not determine device capabilities.";
     return;
   }
-  // This is dependency of VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME which
-  // is a requirement for opting into Molten VK on Mac.
-  enabled_extensions.push_back(
-      VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME);
 
-  // Required for glfw macOS surfaces.
-  if (!capabilities->HasExtension(MVK_MACOS_SURFACE_EXT)) {
-    VALIDATION_LOG << "On Mac: Required extension " << MVK_MACOS_SURFACE_EXT
-                   << " absent.";
-    return;
-  }
-  enabled_extensions.push_back(MVK_MACOS_SURFACE_EXT);
-#endif  // FML_OS_MACOSX
+  gHasValidationLayers = caps->AreValidationsEnabled();
 
-  //----------------------------------------------------------------------------
-  /// Even though this is a WSI responsibility, require the surface extension
-  /// for swapchains.
-  if (!capabilities->HasExtension(VK_KHR_SURFACE_EXTENSION_NAME)) {
-    VALIDATION_LOG << "Required extension " VK_KHR_SURFACE_EXTENSION_NAME
-                   << " absent.";
+  auto enabled_layers = caps->GetEnabledLayers();
+  auto enabled_extensions = caps->GetEnabledInstanceExtensions();
+
+  if (!enabled_layers.has_value() || !enabled_extensions.has_value()) {
+    VALIDATION_LOG << "Device has insufficient capabilities.";
     return;
   }
-  enabled_extensions.push_back(VK_KHR_SURFACE_EXTENSION_NAME);
 
-  //----------------------------------------------------------------------------
-  /// Enable WSI Instance Extensions. Having any one of these is sufficient.
-  ///
-  bool has_wsi_extensions = false;
-  for (const auto& wsi_ext : kRequiredWSIInstanceExtensions) {
-    if (capabilities->HasExtension(wsi_ext)) {
-      enabled_extensions.push_back(wsi_ext.c_str());
-      has_wsi_extensions = true;
-    }
+  vk::InstanceCreateFlags instance_flags = {};
+
+  if (std::find(enabled_extensions.value().begin(),
+                enabled_extensions.value().end(),
+                "VK_KHR_portability_enumeration") !=
+      enabled_extensions.value().end()) {
+    instance_flags |= vk::InstanceCreateFlagBits::eEnumeratePortabilityKHR;
   }
-  if (!has_wsi_extensions) {
-    VALIDATION_LOG
-        << "Instance doesn't have any of the required WSI extensions: "
-        << fml::Join(kRequiredWSIInstanceExtensions, ", ");
-    return;
+
+  std::vector<const char*> enabled_layers_c;
+  std::vector<const char*> enabled_extensions_c;
+
+  for (const auto& layer : enabled_layers.value()) {
+    enabled_layers_c.push_back(layer.c_str());
   }
 
-  //----------------------------------------------------------------------------
-  /// Enable any and all validation as well as debug toggles.
-  ///
-  auto has_debug_utils = false;
-  if (vk::HasValidationLayers()) {
-    enabled_layers.push_back(vk::kKhronosValidationLayerName);
-    if (capabilities->HasLayerExtension(vk::kKhronosValidationLayerName,
-                                        VK_EXT_DEBUG_UTILS_EXTENSION_NAME)) {
-      enabled_extensions.push_back(VK_EXT_DEBUG_UTILS_EXTENSION_NAME);
-      has_debug_utils = true;
-    } else {
-      FML_LOG(ERROR) << "Vulkan debug utils are absent.";
-    }
-  } else {
-    FML_LOG(ERROR) << "Vulkan validation layers are absent.";
+  for (const auto& ext : enabled_extensions.value()) {
+    enabled_extensions_c.push_back(ext.c_str());
   }
 
   vk::ApplicationInfo application_info;
@@ -349,100 +216,147 @@ ContextVK::ContextVK(
   application_info.setPEngineName("Impeller");
   application_info.setPApplicationName("Impeller");
 
-  vk::InstanceCreateInfo instance_info;
-  instance_info.setPEnabledLayerNames(enabled_layers);
-  instance_info.setPEnabledExtensionNames(enabled_extensions);
-  instance_info.setPApplicationInfo(&application_info);
-  instance_info.setFlags(instance_flags);
+  vk::StructureChain<vk::InstanceCreateInfo, vk::ValidationFeaturesEXT>
+      instance_chain;
 
-  auto instance = vk::createInstanceUnique(instance_info);
-  if (instance.result != vk::Result::eSuccess) {
-    FML_LOG(ERROR) << "Could not create instance: "
-                   << vk::to_string(instance.result);
-    return;
+  if (!caps->AreValidationsEnabled()) {
+    instance_chain.unlink<vk::ValidationFeaturesEXT>();
   }
 
-  dispatcher.init(instance.value.get());
-
-  vk::UniqueDebugUtilsMessengerEXT debug_messenger;
+  std::vector<vk::ValidationFeatureEnableEXT> enabled_validations = {
+      vk::ValidationFeatureEnableEXT::eSynchronizationValidation,
+  };
 
-  if (has_debug_utils) {
-    vk::DebugUtilsMessengerCreateInfoEXT debug_messenger_info;
-    debug_messenger_info.messageSeverity =
-        vk::DebugUtilsMessageSeverityFlagBitsEXT::eWarning |
-        vk::DebugUtilsMessageSeverityFlagBitsEXT::eError;
-    debug_messenger_info.messageType =
-        vk::DebugUtilsMessageTypeFlagBitsEXT::eGeneral |
-        vk::DebugUtilsMessageTypeFlagBitsEXT::ePerformance |
-        vk::DebugUtilsMessageTypeFlagBitsEXT::eValidation;
-    debug_messenger_info.pUserData = nullptr;
-    debug_messenger_info.pfnUserCallback = DebugUtilsMessengerCallback;
+  auto validation = instance_chain.get<vk::ValidationFeaturesEXT>();
+  validation.setEnabledValidationFeatures(enabled_validations);
 
-    auto debug_messenger_result =
-        instance.value->createDebugUtilsMessengerEXTUnique(
-            debug_messenger_info);
+  auto instance_info = instance_chain.get<vk::InstanceCreateInfo>();
+  instance_info.setPEnabledLayerNames(enabled_layers_c);
+  instance_info.setPEnabledExtensionNames(enabled_extensions_c);
+  instance_info.setPApplicationInfo(&application_info);
+  instance_info.setFlags(instance_flags);
 
-    if (debug_messenger_result.result != vk::Result::eSuccess) {
-      FML_LOG(ERROR) << "Could not create debug messenger: "
-                     << vk::to_string(debug_messenger_result.result);
+  auto device_holder = std::make_shared<DeviceHolderImpl>();
+  {
+    auto instance = vk::createInstanceUnique(instance_info);
+    if (instance.result != vk::Result::eSuccess) {
+      VALIDATION_LOG << "Could not create Vulkan instance: "
+                     << vk::to_string(instance.result);
       return;
     }
-
-    debug_messenger = std::move(debug_messenger_result.value);
+    device_holder->instance = std::move(instance.value);
   }
+  dispatcher.init(device_holder->instance.get());
 
-  auto physical_device = PickPhysicalDevice(instance.value.get());
-  if (!physical_device.has_value()) {
-    VALIDATION_LOG << "No valid Vulkan device found.";
+  //----------------------------------------------------------------------------
+  /// Setup the debug report.
+  ///
+  /// Do this as early as possible since we could use the debug report from
+  /// initialization issues.
+  ///
+  auto debug_report =
+      std::make_unique<DebugReportVK>(*caps, device_holder->instance.get());
+
+  if (!debug_report->IsValid()) {
+    VALIDATION_LOG << "Could not set up debug report.";
     return;
   }
 
+  //----------------------------------------------------------------------------
+  /// Pick the physical device.
+  ///
+  {
+    auto physical_device =
+        PickPhysicalDevice(*caps, device_holder->instance.get());
+    if (!physical_device.has_value()) {
+      VALIDATION_LOG << "No valid Vulkan device found.";
+      return;
+    }
+    device_holder->physical_device = physical_device.value();
+  }
+
+  //----------------------------------------------------------------------------
+  /// Pick device queues.
+  ///
   auto graphics_queue =
-      PickQueue(physical_device.value(), vk::QueueFlagBits::eGraphics);
-  graphics_queue_idx_ = graphics_queue->index;
+      PickQueue(device_holder->physical_device, vk::QueueFlagBits::eGraphics);
   auto transfer_queue =
-      PickQueue(physical_device.value(), vk::QueueFlagBits::eTransfer);
+      PickQueue(device_holder->physical_device, vk::QueueFlagBits::eTransfer);
   auto compute_queue =
-      PickQueue(physical_device.value(), vk::QueueFlagBits::eCompute);
+      PickQueue(device_holder->physical_device, vk::QueueFlagBits::eCompute);
 
-  physical_device_ = physical_device.value();
+  if (!graphics_queue.has_value()) {
+    VALIDATION_LOG << "Could not pick graphics queue.";
+    return;
+  }
+  if (!transfer_queue.has_value()) {
+    FML_LOG(INFO) << "Dedicated transfer queue not avialable.";
+    transfer_queue = graphics_queue.value();
+  }
+  if (!compute_queue.has_value()) {
+    VALIDATION_LOG << "Could not pick compute queue.";
+    return;
+  }
 
-  if (!graphics_queue.has_value() || !transfer_queue.has_value() ||
-      !compute_queue.has_value()) {
-    VALIDATION_LOG << "Could not pick device queues.";
+  //----------------------------------------------------------------------------
+  /// Create the logical device.
+  ///
+  auto enabled_device_extensions =
+      caps->GetEnabledDeviceExtensions(device_holder->physical_device);
+  if (!enabled_device_extensions.has_value()) {
+    // This shouldn't happen since we already did device selection. But
+    // doesn't hurt to check again.
     return;
   }
 
-  std::vector<const char*> required_extensions;
-  for (const auto& ext : kRequiredDeviceExtensions) {
-    required_extensions.push_back(ext.data());
+  std::vector<const char*> enabled_device_extensions_c;
+  for (const auto& ext : enabled_device_extensions.value()) {
+    enabled_device_extensions_c.push_back(ext.c_str());
   }
 
   const auto queue_create_infos = GetQueueCreateInfos(
       {graphics_queue.value(), compute_queue.value(), transfer_queue.value()});
 
-  const auto required_features = GetRequiredPhysicalDeviceFeatures();
+  const auto enabled_features =
+      caps->GetEnabledDeviceFeatures(device_holder->physical_device);
+  if (!enabled_features.has_value()) {
+    // This shouldn't happen since the device can't be picked if this was not
+    // true. But doesn't hurt to check.
+    return;
+  }
 
   vk::DeviceCreateInfo device_info;
+
+  device_info.setPNext(&enabled_features.value().get());
   device_info.setQueueCreateInfos(queue_create_infos);
-  device_info.setPEnabledExtensionNames(required_extensions);
-  device_info.setPEnabledFeatures(&required_features);
+  device_info.setPEnabledExtensionNames(enabled_device_extensions_c);
   // Device layers are deprecated and ignored.
 
-  auto device = physical_device->createDeviceUnique(device_info);
-  if (device.result != vk::Result::eSuccess) {
-    VALIDATION_LOG << "Could not create logical device.";
+  {
+    auto device_result =
+        device_holder->physical_device.createDeviceUnique(device_info);
+    if (device_result.result != vk::Result::eSuccess) {
+      VALIDATION_LOG << "Could not create logical device.";
+      return;
+    }
+    device_holder->device = std::move(device_result.value);
+  }
+
+  if (!caps->SetPhysicalDevice(device_holder->physical_device)) {
+    VALIDATION_LOG << "Capabilities could not be updated.";
     return;
   }
 
+  //----------------------------------------------------------------------------
+  /// Create the allocator.
+  ///
   auto allocator = std::shared_ptr<AllocatorVK>(new AllocatorVK(
-      *this,                             //
-      application_info.apiVersion,       //
-      physical_device.value(),           //
-      device.value.get(),                //
-      instance.value.get(),              //
-      dispatcher.vkGetInstanceProcAddr,  //
-      dispatcher.vkGetDeviceProcAddr     //
+      weak_from_this(),                //
+      application_info.apiVersion,     //
+      device_holder->physical_device,  //
+      device_holder,                   //
+      device_holder->instance.get(),   //
+      *caps                            //
       ));
 
   if (!allocator->IsValid()) {
@@ -450,10 +364,14 @@ ContextVK::ContextVK(
     return;
   }
 
+  //----------------------------------------------------------------------------
+  /// Setup the pipeline library.
+  ///
   auto pipeline_library = std::shared_ptr<PipelineLibraryVK>(
-      new PipelineLibraryVK(device.value.get(),   //
-                            pipeline_cache_data,  //
-                            worker_task_runner_   //
+      new PipelineLibraryVK(device_holder,                         //
+                            caps,                                  //
+                            std::move(settings.cache_directory),   //
+                            raster_message_loop_->GetTaskRunner()  //
                             ));
 
   if (!pipeline_library->IsValid()) {
@@ -461,43 +379,109 @@ ContextVK::ContextVK(
     return;
   }
 
-  auto sampler_library = std::shared_ptr<SamplerLibraryVK>(
-      new SamplerLibraryVK(device.value.get()));
+  auto sampler_library =
+      std::shared_ptr<SamplerLibraryVK>(new SamplerLibraryVK(device_holder));
 
   auto shader_library = std::shared_ptr<ShaderLibraryVK>(
-      new ShaderLibraryVK(device.value.get(), shader_libraries_data));
+      new ShaderLibraryVK(device_holder,                   //
+                          settings.shader_libraries_data)  //
+  );
 
   if (!shader_library->IsValid()) {
     VALIDATION_LOG << "Could not create shader library.";
     return;
   }
 
-  auto work_queue = WorkQueueCommon::Create();
+  //----------------------------------------------------------------------------
+  /// Create the fence waiter.
+  ///
+  auto fence_waiter =
+      std::shared_ptr<FenceWaiterVK>(new FenceWaiterVK(device_holder));
+
+  //----------------------------------------------------------------------------
+  /// Create the resource manager and command pool recycler.
+  ///
+  auto resource_manager = ResourceManagerVK::Create();
+  if (!resource_manager) {
+    VALIDATION_LOG << "Could not create resource manager.";
+    return;
+  }
 
-  if (!work_queue) {
-    VALIDATION_LOG << "Could not create workqueue.";
+  auto command_pool_recycler =
+      std::make_shared<CommandPoolRecyclerVK>(weak_from_this());
+  if (!command_pool_recycler) {
+    VALIDATION_LOG << "Could not create command pool recycler.";
     return;
   }
 
-  instance_ = std::move(instance.value);
-  debug_messenger_ = std::move(debug_messenger);
-  device_ = std::move(device.value);
+  auto descriptor_pool_recycler =
+      std::make_shared<DescriptorPoolRecyclerVK>(weak_from_this());
+  if (!descriptor_pool_recycler) {
+    VALIDATION_LOG << "Could not create descriptor pool recycler.";
+    return;
+  }
+
+  //----------------------------------------------------------------------------
+  /// Fetch the queues.
+  ///
+  QueuesVK queues(device_holder->device.get(),  //
+                  graphics_queue.value(),       //
+                  compute_queue.value(),        //
+                  transfer_queue.value()        //
+  );
+  if (!queues.IsValid()) {
+    VALIDATION_LOG << "Could not fetch device queues.";
+    return;
+  }
+
+  VkPhysicalDeviceProperties physical_device_properties;
+  dispatcher.vkGetPhysicalDeviceProperties(device_holder->physical_device,
+                                           &physical_device_properties);
+
+  //----------------------------------------------------------------------------
+  /// All done!
+  ///
+  device_holder_ = std::move(device_holder);
+  driver_info_ =
+      std::make_unique<DriverInfoVK>(device_holder_->physical_device);
+  debug_report_ = std::move(debug_report);
   allocator_ = std::move(allocator);
   shader_library_ = std::move(shader_library);
   sampler_library_ = std::move(sampler_library);
   pipeline_library_ = std::move(pipeline_library);
-  work_queue_ = std::move(work_queue);
-  graphics_queue_ =
-      device_->getQueue(graphics_queue->family, graphics_queue->index);
-  compute_queue_ =
-      device_->getQueue(compute_queue->family, compute_queue->index);
-  transfer_queue_ =
-      device_->getQueue(transfer_queue->family, transfer_queue->index);
-
+  yuv_conversion_library_ = std::shared_ptr<YUVConversionLibraryVK>(
+      new YUVConversionLibraryVK(device_holder_));
+  queues_ = std::move(queues);
+  device_capabilities_ = std::move(caps);
+  fence_waiter_ = std::move(fence_waiter);
+  resource_manager_ = std::move(resource_manager);
+  command_pool_recycler_ = std::move(command_pool_recycler);
+  descriptor_pool_recycler_ = std::move(descriptor_pool_recycler);
+  device_name_ = std::string(physical_device_properties.deviceName);
+  command_queue_vk_ = std::make_shared<CommandQueueVK>(weak_from_this());
   is_valid_ = true;
+
+  // Create the GPU Tracer later because it depends on state from
+  // the ContextVK.
+  gpu_tracer_ = std::make_shared<GPUTracerVK>(weak_from_this(),
+                                              settings.enable_gpu_tracing);
+  gpu_tracer_->InitializeQueryPool(*this);
+
+  //----------------------------------------------------------------------------
+  /// Label all the relevant objects. This happens after setup so that the
+  /// debug messengers have had a chance to be set up.
+  ///
+  SetDebugName(GetDevice(), device_holder_->device.get(), "ImpellerDevice");
 }
 
-ContextVK::~ContextVK() = default;
+void ContextVK::SetOffscreenFormat(PixelFormat pixel_format) {
+  CapabilitiesVK::Cast(*device_capabilities_).SetOffscreenFormat(pixel_format);
+}
+
+// |Context|
+std::string ContextVK::DescribeGpuModel() const {
+  return device_name_;
+}
 
 bool ContextVK::IsValid() const {
   return is_valid_;
@@ -519,93 +503,131 @@ std::shared_ptr<PipelineLibrary> ContextVK::GetPipelineLibrary() const {
   return pipeline_library_;
 }
 
-// |Context|
-std::shared_ptr<WorkQueue> ContextVK::GetWorkQueue() const {
-  return work_queue_;
-}
-
 std::shared_ptr<CommandBuffer> ContextVK::CreateCommandBuffer() const {
-  return CommandBufferVK::Create(weak_from_this(), *device_);
+  return std::shared_ptr<CommandBufferVK>(
+      new CommandBufferVK(shared_from_this(),                     //
+                          CreateGraphicsCommandEncoderFactory())  //
+  );
 }
 
 vk::Instance ContextVK::GetInstance() const {
-  return *instance_;
+  return *device_holder_->instance;
 }
 
-std::unique_ptr<Surface> ContextVK::AcquireSurface(size_t current_frame) {
-  return surface_producer_->AcquireSurface(current_frame);
+const vk::Device& ContextVK::GetDevice() const {
+  return device_holder_->device.get();
 }
 
-#ifdef FML_OS_ANDROID
+const std::shared_ptr<fml::ConcurrentTaskRunner>
+ContextVK::GetConcurrentWorkerTaskRunner() const {
+  return raster_message_loop_->GetTaskRunner();
+}
 
-vk::UniqueSurfaceKHR ContextVK::CreateAndroidSurface(
-    ANativeWindow* window) const {
-  if (!instance_) {
-    return vk::UniqueSurfaceKHR{VK_NULL_HANDLE};
-  }
+void ContextVK::Shutdown() {
+  // There are multiple objects, for example |CommandPoolVK|, that in their
+  // destructors make a strong reference to |ContextVK|. Resetting these shared
+  // pointers ensures that cleanup happens in a correct order.
+  //
+  // tl;dr: Without it, we get thread::join failures on shutdown.
+  fence_waiter_.reset();
+  resource_manager_.reset();
 
-  auto create_info = vk::AndroidSurfaceCreateInfoKHR().setWindow(window);
-  auto surface_res = instance_->createAndroidSurfaceKHRUnique(create_info);
+  raster_message_loop_->Terminate();
+}
 
-  if (surface_res.result != vk::Result::eSuccess) {
-    VALIDATION_LOG << "Could not create Android surface, error: "
-                   << vk::to_string(surface_res.result);
-    return vk::UniqueSurfaceKHR{VK_NULL_HANDLE};
-  }
+std::shared_ptr<SurfaceContextVK> ContextVK::CreateSurfaceContext() {
+  return std::make_shared<SurfaceContextVK>(shared_from_this());
+}
 
-  return std::move(surface_res.value);
+const std::shared_ptr<const Capabilities>& ContextVK::GetCapabilities() const {
+  return device_capabilities_;
 }
 
-#endif  // FML_OS_ANDROID
+const std::shared_ptr<QueueVK>& ContextVK::GetGraphicsQueue() const {
+  return queues_.graphics_queue;
+}
 
-void ContextVK::SetupSwapchain(vk::UniqueSurfaceKHR surface) {
-  surface_ = std::move(surface);
-  auto present_queue_out = PickPresentQueue(physical_device_, *surface_);
-  if (!present_queue_out.has_value()) {
-    return;
-  }
-  present_queue_ =
-      device_->getQueue(present_queue_out->family, present_queue_out->index);
+vk::PhysicalDevice ContextVK::GetPhysicalDevice() const {
+  return device_holder_->physical_device;
+}
 
-  auto swapchain_details =
-      SwapchainDetailsVK::Create(physical_device_, *surface_);
-  if (!swapchain_details) {
-    return;
-  }
-  surface_format_ = swapchain_details->PickSurfaceFormat().format;
-  swapchain_ = SwapchainVK::Create(*device_, *surface_, *swapchain_details);
-  auto weak_this = weak_from_this();
-  surface_producer_ = SurfaceProducerVK::Create(
-      weak_this, {
-                     .device = *device_,
-                     .graphics_queue = graphics_queue_,
-                     .present_queue = present_queue_,
-                     .swapchain = swapchain_.get(),
-                 });
+std::shared_ptr<FenceWaiterVK> ContextVK::GetFenceWaiter() const {
+  return fence_waiter_;
+}
+
+std::shared_ptr<ResourceManagerVK> ContextVK::GetResourceManager() const {
+  return resource_manager_;
+}
+
+std::shared_ptr<CommandPoolRecyclerVK> ContextVK::GetCommandPoolRecycler()
+    const {
+  return command_pool_recycler_;
+}
+
+std::unique_ptr<CommandEncoderFactoryVK>
+ContextVK::CreateGraphicsCommandEncoderFactory() const {
+  return std::make_unique<CommandEncoderFactoryVK>(weak_from_this());
 }
 
-bool ContextVK::SupportsOffscreenMSAA() const {
-  return true;
+std::shared_ptr<GPUTracerVK> ContextVK::GetGPUTracer() const {
+  return gpu_tracer_;
 }
 
-std::unique_ptr<DescriptorPoolVK> ContextVK::CreateDescriptorPool() const {
-  return std::make_unique<DescriptorPoolVK>(*device_);
+std::shared_ptr<DescriptorPoolRecyclerVK> ContextVK::GetDescriptorPoolRecycler()
+    const {
+  return descriptor_pool_recycler_;
 }
 
-PixelFormat ContextVK::GetColorAttachmentPixelFormat() const {
-  return ToPixelFormat(surface_format_);
+std::shared_ptr<CommandQueue> ContextVK::GetCommandQueue() const {
+  return command_queue_vk_;
 }
 
-const BackendFeatures& ContextVK::GetBackendFeatures() const {
-  return kModernBackendFeatures;
+// Creating a render pass is observed to take an additional 6ms on a Pixel 7
+// device as the driver will lazily bootstrap and compile shaders to do so.
+// The render pass does not need to be begun or executed.
+void ContextVK::InitializeCommonlyUsedShadersIfNeeded() const {
+  RenderTargetAllocator rt_allocator(GetResourceAllocator());
+  RenderTarget render_target =
+      rt_allocator.CreateOffscreenMSAA(*this, {1, 1}, 1);
+
+  RenderPassBuilderVK builder;
+  for (const auto& [bind_point, color] : render_target.GetColorAttachments()) {
+    builder.SetColorAttachment(
+        bind_point,                                          //
+        color.texture->GetTextureDescriptor().format,        //
+        color.texture->GetTextureDescriptor().sample_count,  //
+        color.load_action,                                   //
+        color.store_action                                   //
+    );
+  }
+
+  if (auto depth = render_target.GetDepthAttachment(); depth.has_value()) {
+    builder.SetDepthStencilAttachment(
+        depth->texture->GetTextureDescriptor().format,        //
+        depth->texture->GetTextureDescriptor().sample_count,  //
+        depth->load_action,                                   //
+        depth->store_action                                   //
+    );
+  } else if (auto stencil = render_target.GetStencilAttachment();
+             stencil.has_value()) {
+    builder.SetStencilAttachment(
+        stencil->texture->GetTextureDescriptor().format,        //
+        stencil->texture->GetTextureDescriptor().sample_count,  //
+        stencil->load_action,                                   //
+        stencil->store_action                                   //
+    );
+  }
+
+  auto pass = builder.Build(GetDevice());
 }
 
-vk::Queue ContextVK::GetGraphicsQueue() const {
-  return graphics_queue_;
+const std::shared_ptr<YUVConversionLibraryVK>&
+ContextVK::GetYUVConversionLibrary() const {
+  return yuv_conversion_library_;
 }
 
-std::unique_ptr<CommandPoolVK> ContextVK::CreateGraphicsCommandPool() const {
-  return CommandPoolVK::Create(*device_, graphics_queue_idx_);
+const std::unique_ptr<DriverInfoVK>& ContextVK::GetDriverInfo() const {
+  return driver_info_;
 }
 
 }  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/context_vk.h b/impeller/renderer/backend/vulkan/context_vk.h
index 4ed7ddfbbe7a23a7d1036ac53aacdfe245495300..125ca46f7fea7536c20f32cd6a22c04ffcda5e70 100644
--- a/impeller/renderer/backend/vulkan/context_vk.h
+++ b/impeller/renderer/backend/vulkan/context_vk.h
@@ -2,157 +2,219 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_CONTEXT_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_CONTEXT_VK_H_
 
 #include <memory>
 
 #include "flutter/fml/concurrent_message_loop.h"
-#include "flutter/fml/macros.h"
 #include "flutter/fml/mapping.h"
+#include "flutter/fml/unique_fd.h"
+#include "fml/thread.h"
 #include "impeller/base/backend_cast.h"
+#include "impeller/core/formats.h"
 #include "impeller/renderer/backend/vulkan/command_pool_vk.h"
-#include "impeller/renderer/backend/vulkan/deletion_queue_vk.h"
-#include "impeller/renderer/backend/vulkan/descriptor_pool_vk.h"
+#include "impeller/renderer/backend/vulkan/device_holder_vk.h"
+#include "impeller/renderer/backend/vulkan/driver_info_vk.h"
 #include "impeller/renderer/backend/vulkan/pipeline_library_vk.h"
+#include "impeller/renderer/backend/vulkan/queue_vk.h"
 #include "impeller/renderer/backend/vulkan/sampler_library_vk.h"
 #include "impeller/renderer/backend/vulkan/shader_library_vk.h"
-#include "impeller/renderer/backend/vulkan/surface_producer_vk.h"
-#include "impeller/renderer/backend/vulkan/swapchain_vk.h"
-#include "impeller/renderer/backend/vulkan/vk.h"
+#include "impeller/renderer/capabilities.h"
+#include "impeller/renderer/command_queue.h"
 #include "impeller/renderer/context.h"
-#include "impeller/renderer/formats.h"
 
 namespace impeller {
 
-namespace vk {
+bool HasValidationLayers();
 
-constexpr const char* kKhronosValidationLayerName =
-    "VK_LAYER_KHRONOS_validation";
+class CommandEncoderFactoryVK;
+class CommandEncoderVK;
+class CommandPoolRecyclerVK;
+class DebugReportVK;
+class FenceWaiterVK;
+class ResourceManagerVK;
+class SurfaceContextVK;
+class GPUTracerVK;
+class DescriptorPoolRecyclerVK;
+class CommandQueueVK;
+
+class ContextVK final : public Context,
+                        public BackendCast<ContextVK, Context>,
+                        public std::enable_shared_from_this<ContextVK> {
+ public:
+  struct Settings {
+    PFN_vkGetInstanceProcAddr proc_address_callback = nullptr;
+    std::vector<std::shared_ptr<fml::Mapping>> shader_libraries_data;
+    fml::UniqueFD cache_directory;
+    bool enable_validation = false;
+    bool enable_gpu_tracing = false;
 
-bool HasValidationLayers();
+    Settings() = default;
 
-}  // namespace vk
+    Settings(Settings&&) = default;
+  };
 
-class ContextVK final : public Context, public BackendCast<ContextVK, Context> {
- public:
-  static std::shared_ptr<ContextVK> Create(
-      PFN_vkGetInstanceProcAddr proc_address_callback,
-      const std::vector<std::shared_ptr<fml::Mapping>>& shader_libraries_data,
-      const std::shared_ptr<const fml::Mapping>& pipeline_cache_data,
-      std::shared_ptr<fml::ConcurrentTaskRunner> worker_task_runner,
-      const std::string& label);
+  /// Choose the number of worker threads the context_vk will create.
+  ///
+  /// Visible for testing.
+  static size_t ChooseThreadCountForWorkers(size_t hardware_concurrency);
+
+  static std::shared_ptr<ContextVK> Create(Settings settings);
+
+  uint64_t GetHash() const { return hash_; }
 
   // |Context|
   ~ContextVK() override;
 
+  // |Context|
+  BackendType GetBackendType() const override;
+
+  // |Context|
+  std::string DescribeGpuModel() const override;
+
   // |Context|
   bool IsValid() const override;
 
+  // |Context|
+  std::shared_ptr<Allocator> GetResourceAllocator() const override;
+
+  // |Context|
+  std::shared_ptr<ShaderLibrary> GetShaderLibrary() const override;
+
+  // |Context|
+  std::shared_ptr<SamplerLibrary> GetSamplerLibrary() const override;
+
+  // |Context|
+  std::shared_ptr<PipelineLibrary> GetPipelineLibrary() const override;
+
+  // |Context|
+  std::shared_ptr<CommandBuffer> CreateCommandBuffer() const override;
+
+  // |Context|
+  const std::shared_ptr<const Capabilities>& GetCapabilities() const override;
+
+  const std::shared_ptr<YUVConversionLibraryVK>& GetYUVConversionLibrary()
+      const;
+
+  // |Context|
+  void Shutdown() override;
+
+  void SetOffscreenFormat(PixelFormat pixel_format);
+
   template <typename T>
   bool SetDebugName(T handle, std::string_view label) const {
-    return SetDebugName(*device_, handle, label);
+    return SetDebugName(GetDevice(), handle, label);
   }
 
   template <typename T>
-  static bool SetDebugName(vk::Device device,
+  static bool SetDebugName(const vk::Device& device,
                            T handle,
                            std::string_view label) {
-    if (!vk::HasValidationLayers()) {
+    if (!HasValidationLayers()) {
       // No-op if validation layers are not enabled.
       return true;
     }
 
-    uint64_t handle_ptr =
-        reinterpret_cast<uint64_t>(static_cast<typename T::NativeType>(handle));
+    auto c_handle = static_cast<typename T::CType>(handle);
 
-    std::string label_str = std::string(label);
-    auto ret = device.setDebugUtilsObjectNameEXT(
-        vk::DebugUtilsObjectNameInfoEXT()
-            .setObjectType(T::objectType)
-            .setObjectHandle(handle_ptr)
-            .setPObjectName(label_str.c_str()));
+    vk::DebugUtilsObjectNameInfoEXT info;
+    info.objectType = T::objectType;
+    info.pObjectName = label.data();
+    info.objectHandle = reinterpret_cast<decltype(info.objectHandle)>(c_handle);
 
-    if (ret != vk::Result::eSuccess) {
-      VALIDATION_LOG << "unable to set debug name";
+    if (device.setDebugUtilsObjectNameEXT(info) != vk::Result::eSuccess) {
+      VALIDATION_LOG << "Unable to set debug name: " << label;
       return false;
     }
 
     return true;
   }
 
+  std::shared_ptr<DeviceHolderVK> GetDeviceHolder() const {
+    return device_holder_;
+  }
+
   vk::Instance GetInstance() const;
 
-  void SetupSwapchain(vk::UniqueSurfaceKHR surface);
+  const vk::Device& GetDevice() const;
 
-  std::unique_ptr<Surface> AcquireSurface(size_t current_frame);
+  const std::unique_ptr<DriverInfoVK>& GetDriverInfo() const;
 
-  std::unique_ptr<DescriptorPoolVK> CreateDescriptorPool() const;
+  const std::shared_ptr<fml::ConcurrentTaskRunner>
+  GetConcurrentWorkerTaskRunner() const;
 
-#ifdef FML_OS_ANDROID
-  vk::UniqueSurfaceKHR CreateAndroidSurface(ANativeWindow* window) const;
-#endif  // FML_OS_ANDROID
+  std::shared_ptr<SurfaceContextVK> CreateSurfaceContext();
 
-  vk::Queue GetGraphicsQueue() const;
+  const std::shared_ptr<QueueVK>& GetGraphicsQueue() const;
 
-  std::unique_ptr<CommandPoolVK> CreateGraphicsCommandPool() const;
+  vk::PhysicalDevice GetPhysicalDevice() const;
 
- private:
-  std::shared_ptr<fml::ConcurrentTaskRunner> worker_task_runner_;
-  vk::UniqueInstance instance_;
-  vk::UniqueDebugUtilsMessengerEXT debug_messenger_;
-  vk::PhysicalDevice physical_device_;
-  vk::UniqueDevice device_;
-  std::shared_ptr<Allocator> allocator_;
-  std::shared_ptr<ShaderLibraryVK> shader_library_;
-  std::shared_ptr<SamplerLibraryVK> sampler_library_;
-  std::shared_ptr<PipelineLibraryVK> pipeline_library_;
-  uint32_t graphics_queue_idx_;
-  vk::Queue graphics_queue_;
-  vk::Queue compute_queue_;
-  vk::Queue transfer_queue_;
-  vk::Queue present_queue_;
-  vk::UniqueSurfaceKHR surface_;
-  vk::Format surface_format_;
-  std::unique_ptr<SwapchainVK> swapchain_;
-  std::unique_ptr<SurfaceProducerVK> surface_producer_;
-  std::shared_ptr<WorkQueue> work_queue_;
-  bool is_valid_ = false;
+  std::shared_ptr<FenceWaiterVK> GetFenceWaiter() const;
 
-  ContextVK(
-      PFN_vkGetInstanceProcAddr proc_address_callback,
-      const std::vector<std::shared_ptr<fml::Mapping>>& shader_libraries_data,
-      const std::shared_ptr<const fml::Mapping>& pipeline_cache_data,
-      std::shared_ptr<fml::ConcurrentTaskRunner> worker_task_runner,
-      const std::string& label);
+  std::shared_ptr<ResourceManagerVK> GetResourceManager() const;
 
-  // |Context|
-  std::shared_ptr<Allocator> GetResourceAllocator() const override;
+  std::shared_ptr<CommandPoolRecyclerVK> GetCommandPoolRecycler() const;
 
-  // |Context|
-  std::shared_ptr<ShaderLibrary> GetShaderLibrary() const override;
+  std::shared_ptr<DescriptorPoolRecyclerVK> GetDescriptorPoolRecycler() const;
 
-  // |Context|
-  std::shared_ptr<SamplerLibrary> GetSamplerLibrary() const override;
+  std::shared_ptr<CommandQueue> GetCommandQueue() const override;
 
-  // |Context|
-  std::shared_ptr<PipelineLibrary> GetPipelineLibrary() const override;
+  std::shared_ptr<GPUTracerVK> GetGPUTracer() const;
 
-  // |Context|
-  std::shared_ptr<CommandBuffer> CreateCommandBuffer() const override;
+  void RecordFrameEndTime() const;
 
-  // |Context|
-  PixelFormat GetColorAttachmentPixelFormat() const override;
+  void InitializeCommonlyUsedShadersIfNeeded() const override;
 
-  // |Context|
-  std::shared_ptr<WorkQueue> GetWorkQueue() const override;
+ private:
+  struct DeviceHolderImpl : public DeviceHolderVK {
+    // |DeviceHolder|
+    const vk::Device& GetDevice() const override { return device.get(); }
+    // |DeviceHolder|
+    const vk::PhysicalDevice& GetPhysicalDevice() const override {
+      return physical_device;
+    }
 
-  // |Context|
-  bool SupportsOffscreenMSAA() const override;
+    vk::UniqueInstance instance;
+    vk::PhysicalDevice physical_device;
+    vk::UniqueDevice device;
+  };
 
-  // |Context|
-  const BackendFeatures& GetBackendFeatures() const override;
+  std::shared_ptr<DeviceHolderImpl> device_holder_;
+  std::unique_ptr<DriverInfoVK> driver_info_;
+  std::unique_ptr<DebugReportVK> debug_report_;
+  std::shared_ptr<Allocator> allocator_;
+  std::shared_ptr<ShaderLibraryVK> shader_library_;
+  std::shared_ptr<SamplerLibraryVK> sampler_library_;
+  std::shared_ptr<PipelineLibraryVK> pipeline_library_;
+  std::shared_ptr<YUVConversionLibraryVK> yuv_conversion_library_;
+  QueuesVK queues_;
+  std::shared_ptr<const Capabilities> device_capabilities_;
+  std::shared_ptr<FenceWaiterVK> fence_waiter_;
+  std::shared_ptr<ResourceManagerVK> resource_manager_;
+  std::shared_ptr<CommandPoolRecyclerVK> command_pool_recycler_;
+  std::string device_name_;
+  std::shared_ptr<fml::ConcurrentMessageLoop> raster_message_loop_;
+  std::shared_ptr<GPUTracerVK> gpu_tracer_;
+  std::shared_ptr<DescriptorPoolRecyclerVK> descriptor_pool_recycler_;
+  std::shared_ptr<CommandQueue> command_queue_vk_;
+
+  const uint64_t hash_;
+
+  bool is_valid_ = false;
+
+  ContextVK();
 
-  FML_DISALLOW_COPY_AND_ASSIGN(ContextVK);
+  void Setup(Settings settings);
+
+  std::unique_ptr<CommandEncoderFactoryVK> CreateGraphicsCommandEncoderFactory()
+      const;
+
+  ContextVK(const ContextVK&) = delete;
+
+  ContextVK& operator=(const ContextVK&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_CONTEXT_VK_H_
diff --git a/impeller/renderer/backend/vulkan/context_vk_unittests.cc b/impeller/renderer/backend/vulkan/context_vk_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c0d41e7ea6da407b9db6c711cbe47a594c2a6257
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/context_vk_unittests.cc
@@ -0,0 +1,226 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/fml/synchronization/waitable_event.h"
+#include "flutter/testing/testing.h"  // IWYU pragma: keep
+#include "impeller/base/validation.h"
+#include "impeller/core/formats.h"
+#include "impeller/renderer/backend/vulkan/command_pool_vk.h"
+#include "impeller/renderer/backend/vulkan/context_vk.h"
+#include "impeller/renderer/backend/vulkan/test/mock_vulkan.h"
+
+namespace impeller {
+namespace testing {
+
+TEST(ContextVKTest, CommonHardwareConcurrencyConfigurations) {
+  EXPECT_EQ(ContextVK::ChooseThreadCountForWorkers(100u), 4u);
+  EXPECT_EQ(ContextVK::ChooseThreadCountForWorkers(9u), 4u);
+  EXPECT_EQ(ContextVK::ChooseThreadCountForWorkers(8u), 4u);
+  EXPECT_EQ(ContextVK::ChooseThreadCountForWorkers(7u), 3u);
+  EXPECT_EQ(ContextVK::ChooseThreadCountForWorkers(6u), 3u);
+  EXPECT_EQ(ContextVK::ChooseThreadCountForWorkers(5u), 2u);
+  EXPECT_EQ(ContextVK::ChooseThreadCountForWorkers(4u), 2u);
+  EXPECT_EQ(ContextVK::ChooseThreadCountForWorkers(3u), 1u);
+  EXPECT_EQ(ContextVK::ChooseThreadCountForWorkers(2u), 1u);
+  EXPECT_EQ(ContextVK::ChooseThreadCountForWorkers(1u), 1u);
+}
+
+TEST(ContextVKTest, DeletesCommandPools) {
+  std::weak_ptr<ContextVK> weak_context;
+  std::weak_ptr<CommandPoolVK> weak_pool;
+  {
+    std::shared_ptr<ContextVK> context = MockVulkanContextBuilder().Build();
+    auto const pool = context->GetCommandPoolRecycler()->Get();
+    weak_pool = pool;
+    weak_context = context;
+    ASSERT_TRUE(weak_pool.lock());
+    ASSERT_TRUE(weak_context.lock());
+  }
+  ASSERT_FALSE(weak_pool.lock());
+  ASSERT_FALSE(weak_context.lock());
+}
+
+TEST(ContextVKTest, DeletesCommandPoolsOnAllThreads) {
+  std::weak_ptr<ContextVK> weak_context;
+  std::weak_ptr<CommandPoolVK> weak_pool_main;
+
+  std::shared_ptr<ContextVK> context = MockVulkanContextBuilder().Build();
+  weak_pool_main = context->GetCommandPoolRecycler()->Get();
+  weak_context = context;
+  ASSERT_TRUE(weak_pool_main.lock());
+  ASSERT_TRUE(weak_context.lock());
+
+  // Start a second thread that obtains a command pool.
+  fml::AutoResetWaitableEvent latch1, latch2;
+  std::weak_ptr<CommandPoolVK> weak_pool_thread;
+  std::thread thread([&]() {
+    weak_pool_thread = context->GetCommandPoolRecycler()->Get();
+    latch1.Signal();
+    latch2.Wait();
+  });
+
+  // Delete the ContextVK on the main thread.
+  latch1.Wait();
+  context.reset();
+  ASSERT_FALSE(weak_pool_main.lock());
+  ASSERT_FALSE(weak_context.lock());
+
+  // Stop the second thread and check that its command pool has been deleted.
+  latch2.Signal();
+  thread.join();
+  ASSERT_FALSE(weak_pool_thread.lock());
+}
+
+TEST(ContextVKTest, DeletePipelineAfterContext) {
+  std::shared_ptr<Pipeline<PipelineDescriptor>> pipeline;
+  std::shared_ptr<std::vector<std::string>> functions;
+  {
+    std::shared_ptr<ContextVK> context = MockVulkanContextBuilder().Build();
+    PipelineDescriptor pipeline_desc;
+    pipeline_desc.SetVertexDescriptor(std::make_shared<VertexDescriptor>());
+    PipelineFuture<PipelineDescriptor> pipeline_future =
+        context->GetPipelineLibrary()->GetPipeline(pipeline_desc);
+    pipeline = pipeline_future.Get();
+    ASSERT_TRUE(pipeline);
+    functions = GetMockVulkanFunctions(context->GetDevice());
+    ASSERT_TRUE(std::find(functions->begin(), functions->end(),
+                          "vkCreateGraphicsPipelines") != functions->end());
+  }
+  ASSERT_TRUE(std::find(functions->begin(), functions->end(),
+                        "vkDestroyDevice") != functions->end());
+}
+
+TEST(ContextVKTest, DeleteShaderFunctionAfterContext) {
+  std::shared_ptr<const ShaderFunction> shader_function;
+  std::shared_ptr<std::vector<std::string>> functions;
+  {
+    std::shared_ptr<ContextVK> context = MockVulkanContextBuilder().Build();
+    PipelineDescriptor pipeline_desc;
+    pipeline_desc.SetVertexDescriptor(std::make_shared<VertexDescriptor>());
+    std::vector<uint8_t> data = {0x03, 0x02, 0x23, 0x07};
+    context->GetShaderLibrary()->RegisterFunction(
+        "foobar_fragment_main", ShaderStage::kFragment,
+        std::make_shared<fml::DataMapping>(data), [](bool) {});
+    shader_function = context->GetShaderLibrary()->GetFunction(
+        "foobar_fragment_main", ShaderStage::kFragment);
+    ASSERT_TRUE(shader_function);
+    functions = GetMockVulkanFunctions(context->GetDevice());
+    ASSERT_TRUE(std::find(functions->begin(), functions->end(),
+                          "vkCreateShaderModule") != functions->end());
+  }
+  ASSERT_TRUE(std::find(functions->begin(), functions->end(),
+                        "vkDestroyDevice") != functions->end());
+}
+
+TEST(ContextVKTest, DeletePipelineLibraryAfterContext) {
+  std::shared_ptr<PipelineLibrary> pipeline_library;
+  std::shared_ptr<std::vector<std::string>> functions;
+  {
+    std::shared_ptr<ContextVK> context = MockVulkanContextBuilder().Build();
+    PipelineDescriptor pipeline_desc;
+    pipeline_desc.SetVertexDescriptor(std::make_shared<VertexDescriptor>());
+    pipeline_library = context->GetPipelineLibrary();
+    functions = GetMockVulkanFunctions(context->GetDevice());
+    ASSERT_TRUE(std::find(functions->begin(), functions->end(),
+                          "vkCreatePipelineCache") != functions->end());
+  }
+  ASSERT_TRUE(std::find(functions->begin(), functions->end(),
+                        "vkDestroyDevice") != functions->end());
+}
+
+TEST(ContextVKTest, CanCreateContextInAbsenceOfValidationLayers) {
+  // The mocked methods don't report the presence of a validation layer but we
+  // explicitly ask for validation. Context creation should continue anyway.
+  auto context = MockVulkanContextBuilder()
+                     .SetSettingsCallback([](auto& settings) {
+                       settings.enable_validation = true;
+                     })
+                     .Build();
+  ASSERT_NE(context, nullptr);
+  const CapabilitiesVK* capabilites_vk =
+      reinterpret_cast<const CapabilitiesVK*>(context->GetCapabilities().get());
+  ASSERT_FALSE(capabilites_vk->AreValidationsEnabled());
+}
+
+TEST(ContextVKTest, CanCreateContextWithValidationLayers) {
+  auto context =
+      MockVulkanContextBuilder()
+          .SetSettingsCallback(
+              [](auto& settings) { settings.enable_validation = true; })
+          .SetInstanceExtensions(
+              {"VK_KHR_surface", "VK_MVK_macos_surface", "VK_EXT_debug_utils"})
+          .SetInstanceLayers({"VK_LAYER_KHRONOS_validation"})
+          .Build();
+  ASSERT_NE(context, nullptr);
+  const CapabilitiesVK* capabilites_vk =
+      reinterpret_cast<const CapabilitiesVK*>(context->GetCapabilities().get());
+  ASSERT_TRUE(capabilites_vk->AreValidationsEnabled());
+}
+
+// In Impeller's 2D renderer, we no longer use stencil-only formats. They're
+// less widely supported than combined depth-stencil formats, so make sure we
+// don't fail initialization if we can't find a suitable stencil format.
+TEST(CapabilitiesVKTest, ContextInitializesWithNoStencilFormat) {
+  const std::shared_ptr<ContextVK> context =
+      MockVulkanContextBuilder()
+          .SetPhysicalDeviceFormatPropertiesCallback(
+              [](VkPhysicalDevice physicalDevice, VkFormat format,
+                 VkFormatProperties* pFormatProperties) {
+                if (format == VK_FORMAT_B8G8R8A8_UNORM) {
+                  pFormatProperties->optimalTilingFeatures =
+                      static_cast<VkFormatFeatureFlags>(
+                          vk::FormatFeatureFlagBits::eColorAttachment);
+                } else if (format == VK_FORMAT_D32_SFLOAT_S8_UINT) {
+                  pFormatProperties->optimalTilingFeatures =
+                      static_cast<VkFormatFeatureFlags>(
+                          vk::FormatFeatureFlagBits::eDepthStencilAttachment);
+                }
+                // Ignore just the stencil format.
+              })
+          .Build();
+  ASSERT_NE(context, nullptr);
+  const CapabilitiesVK* capabilites_vk =
+      reinterpret_cast<const CapabilitiesVK*>(context->GetCapabilities().get());
+  ASSERT_EQ(capabilites_vk->GetDefaultDepthStencilFormat(),
+            PixelFormat::kD32FloatS8UInt);
+  ASSERT_EQ(capabilites_vk->GetDefaultStencilFormat(),
+            PixelFormat::kD32FloatS8UInt);
+}
+
+// Impeller's 2D renderer relies on hardware support for a combined
+// depth-stencil format (widely supported). So fail initialization if a suitable
+// one couldn't be found. That way we have an opportunity to fallback to
+// OpenGLES.
+TEST(CapabilitiesVKTest,
+     ContextFailsInitializationForNoCombinedDepthStencilFormat) {
+  ScopedValidationDisable disable_validation;
+  const std::shared_ptr<ContextVK> context =
+      MockVulkanContextBuilder()
+          .SetPhysicalDeviceFormatPropertiesCallback(
+              [](VkPhysicalDevice physicalDevice, VkFormat format,
+                 VkFormatProperties* pFormatProperties) {
+                if (format == VK_FORMAT_B8G8R8A8_UNORM) {
+                  pFormatProperties->optimalTilingFeatures =
+                      static_cast<VkFormatFeatureFlags>(
+                          vk::FormatFeatureFlagBits::eColorAttachment);
+                }
+                // Ignore combined depth-stencil formats.
+              })
+          .Build();
+  ASSERT_EQ(context, nullptr);
+}
+
+TEST(ContextVKTest, WarmUpFunctionCreatesRenderPass) {
+  const std::shared_ptr<ContextVK> context = MockVulkanContextBuilder().Build();
+
+  context->SetOffscreenFormat(PixelFormat::kR8G8B8A8UNormInt);
+  context->InitializeCommonlyUsedShadersIfNeeded();
+
+  auto functions = GetMockVulkanFunctions(context->GetDevice());
+  ASSERT_TRUE(std::find(functions->begin(), functions->end(),
+                        "vkCreateRenderPass") != functions->end());
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/debug_report_vk.cc b/impeller/renderer/backend/vulkan/debug_report_vk.cc
new file mode 100644
index 0000000000000000000000000000000000000000..fce16f8751d4bb922089460ee459b8a58be6ef27
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/debug_report_vk.cc
@@ -0,0 +1,182 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/backend/vulkan/debug_report_vk.h"
+
+#include "impeller/base/validation.h"
+#include "impeller/renderer/backend/vulkan/capabilities_vk.h"
+
+namespace impeller {
+
+DebugReportVK::DebugReportVK(const CapabilitiesVK& caps,
+                             const vk::Instance& instance) {
+  if (!caps.AreValidationsEnabled()) {
+    is_valid_ = true;
+    return;
+  }
+
+  vk::DebugUtilsMessengerCreateInfoEXT messenger_info;
+  messenger_info.messageSeverity =
+      vk::DebugUtilsMessageSeverityFlagBitsEXT::eWarning |
+      vk::DebugUtilsMessageSeverityFlagBitsEXT::eError;
+  messenger_info.messageType =
+      vk::DebugUtilsMessageTypeFlagBitsEXT::eGeneral |
+      vk::DebugUtilsMessageTypeFlagBitsEXT::ePerformance |
+      vk::DebugUtilsMessageTypeFlagBitsEXT::eValidation;
+  messenger_info.pUserData = this;
+  messenger_info.pfnUserCallback = DebugUtilsMessengerCallback;
+
+  auto messenger = instance.createDebugUtilsMessengerEXTUnique(messenger_info);
+
+  if (messenger.result != vk::Result::eSuccess) {
+    FML_LOG(ERROR) << "Could not create debug messenger: "
+                   << vk::to_string(messenger.result);
+    return;
+  }
+
+  messenger_ = std::move(messenger.value);
+  is_valid_ = true;
+}
+
+DebugReportVK::~DebugReportVK() = default;
+
+bool DebugReportVK::IsValid() const {
+  return is_valid_;
+}
+
+static std::string JoinLabels(const VkDebugUtilsLabelEXT* labels,
+                              size_t count) {
+  std::stringstream stream;
+  for (size_t i = 0u; i < count; i++) {
+    stream << labels[i].pLabelName;
+    if (i != count - 1u) {
+      stream << ", ";
+    }
+  }
+  return stream.str();
+}
+
+static std::string JoinVKDebugUtilsObjectNameInfoEXT(
+    const VkDebugUtilsObjectNameInfoEXT* names,
+    size_t count) {
+  std::stringstream stream;
+  for (size_t i = 0u; i < count; i++) {
+    stream << vk::to_string(vk::ObjectType(names[i].objectType)) << " ["
+           << names[i].objectHandle << "] [";
+    if (names[i].pObjectName != nullptr) {
+      stream << names[i].pObjectName;
+    } else {
+      stream << "UNNAMED";
+    }
+    stream << "]";
+    if (i != count - 1u) {
+      stream << ", ";
+    }
+  }
+  return stream.str();
+}
+
+VKAPI_ATTR VkBool32 VKAPI_CALL DebugReportVK::DebugUtilsMessengerCallback(
+    VkDebugUtilsMessageSeverityFlagBitsEXT severity,
+    VkDebugUtilsMessageTypeFlagsEXT type,
+    const VkDebugUtilsMessengerCallbackDataEXT* callback_data,
+    void* debug_report) {
+  auto result =
+      reinterpret_cast<DebugReportVK*>(debug_report)
+          ->OnDebugCallback(
+              static_cast<vk::DebugUtilsMessageSeverityFlagBitsEXT>(
+                  severity),                                         //
+              static_cast<vk::DebugUtilsMessageTypeFlagsEXT>(type),  //
+              callback_data                                          //
+          );
+  switch (result) {
+    case Result::kContinue:
+      return VK_FALSE;
+    case Result::kAbort:
+      return VK_TRUE;
+  }
+  return VK_FALSE;
+}
+
+DebugReportVK::Result DebugReportVK::OnDebugCallback(
+    vk::DebugUtilsMessageSeverityFlagBitsEXT severity,
+    vk::DebugUtilsMessageTypeFlagsEXT type,
+    const VkDebugUtilsMessengerCallbackDataEXT* data) {
+  // This is a real issue caused by INPUT_ATTACHMENT_BIT not being a supported
+  // `VkSurfaceCapabilitiesKHR::supportedUsageFlags` on any platform other than
+  // Android. This is necessary for all the framebuffer fetch related tests. We
+  // can get away with suppressing this on macOS but this must be fixed.
+  if (data->messageIdNumber == 0x2c36905d) {
+    return Result::kContinue;
+  }
+
+  std::vector<std::pair<std::string, std::string>> items;
+
+  items.emplace_back("Severity", vk::to_string(severity));
+
+  items.emplace_back("Type", vk::to_string(type));
+
+  if (data->pMessageIdName) {
+    items.emplace_back("ID Name", data->pMessageIdName);
+  }
+
+  items.emplace_back("ID Number", std::to_string(data->messageIdNumber));
+
+  if (auto queues = JoinLabels(data->pQueueLabels, data->queueLabelCount);
+      !queues.empty()) {
+    items.emplace_back("Queue Breadcrumbs", std::move(queues));
+  } else {
+    items.emplace_back("Queue Breadcrumbs", "[NONE]");
+  }
+
+  if (auto cmd_bufs = JoinLabels(data->pCmdBufLabels, data->cmdBufLabelCount);
+      !cmd_bufs.empty()) {
+    items.emplace_back("CMD Buffer Breadcrumbs", std::move(cmd_bufs));
+  } else {
+    items.emplace_back("CMD Buffer Breadcrumbs", "[NONE]");
+  }
+
+  if (auto related =
+          JoinVKDebugUtilsObjectNameInfoEXT(data->pObjects, data->objectCount);
+      !related.empty()) {
+    items.emplace_back("Related Objects", std::move(related));
+  }
+
+  if (data->pMessage) {
+    items.emplace_back("Trigger", data->pMessage);
+  }
+
+  size_t padding = 0;
+
+  for (const auto& item : items) {
+    padding = std::max(padding, item.first.size());
+  }
+
+  padding += 1;
+
+  std::stringstream stream;
+
+  stream << std::endl;
+
+  stream << "--- Vulkan Debug Report  ----------------------------------------";
+
+  stream << std::endl;
+
+  for (const auto& item : items) {
+    stream << "| " << std::setw(static_cast<int>(padding)) << item.first
+           << std::setw(0) << ": " << item.second << std::endl;
+  }
+
+  stream << "-----------------------------------------------------------------";
+
+  if (type == vk::DebugUtilsMessageTypeFlagBitsEXT::ePerformance) {
+    FML_LOG(INFO) << stream.str();
+  } else {
+    VALIDATION_LOG << stream.str();
+  }
+
+  return Result::kContinue;
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/debug_report_vk.h b/impeller/renderer/backend/vulkan/debug_report_vk.h
new file mode 100644
index 0000000000000000000000000000000000000000..b6ca88f3f45129f5a2a0da90c51b28c80dd21264
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/debug_report_vk.h
@@ -0,0 +1,49 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_DEBUG_REPORT_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_DEBUG_REPORT_VK_H_
+
+#include "flutter/fml/macros.h"
+#include "impeller/renderer/backend/vulkan/vk.h"
+
+namespace impeller {
+
+class CapabilitiesVK;
+
+class DebugReportVK {
+ public:
+  DebugReportVK(const CapabilitiesVK& caps, const vk::Instance& instance);
+
+  ~DebugReportVK();
+
+  bool IsValid() const;
+
+ private:
+  vk::UniqueDebugUtilsMessengerEXT messenger_;
+  bool is_valid_ = false;
+
+  enum class Result {
+    kContinue,
+    kAbort,
+  };
+
+  Result OnDebugCallback(vk::DebugUtilsMessageSeverityFlagBitsEXT severity,
+                         vk::DebugUtilsMessageTypeFlagsEXT type,
+                         const VkDebugUtilsMessengerCallbackDataEXT* data);
+
+  static VKAPI_ATTR VkBool32 VKAPI_CALL DebugUtilsMessengerCallback(
+      VkDebugUtilsMessageSeverityFlagBitsEXT severity,
+      VkDebugUtilsMessageTypeFlagsEXT type,
+      const VkDebugUtilsMessengerCallbackDataEXT* callback_data,
+      void* user_data);
+
+  DebugReportVK(const DebugReportVK&) = delete;
+
+  DebugReportVK& operator=(const DebugReportVK&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_DEBUG_REPORT_VK_H_
diff --git a/impeller/renderer/backend/vulkan/descriptor_pool_vk.cc b/impeller/renderer/backend/vulkan/descriptor_pool_vk.cc
index 47e2cfe44410353820be7a09aa56c4ddbd383ee5..c7545ea9a156d0561b09ac4e65ae81c05513dcd1 100644
--- a/impeller/renderer/backend/vulkan/descriptor_pool_vk.cc
+++ b/impeller/renderer/backend/vulkan/descriptor_pool_vk.cc
@@ -4,50 +4,198 @@
 
 #include "impeller/renderer/backend/vulkan/descriptor_pool_vk.h"
 
-#include "fml/logging.h"
+#include <optional>
+
 #include "impeller/base/validation.h"
+#include "impeller/renderer/backend/vulkan/resource_manager_vk.h"
 #include "vulkan/vulkan_enums.hpp"
+#include "vulkan/vulkan_handles.hpp"
 
 namespace impeller {
 
-DescriptorPoolVK::DescriptorPoolVK(vk::Device device) {
-  constexpr size_t kPoolSize = 1024;
-
-  std::vector<vk::DescriptorPoolSize> pool_sizes = {
-      {vk::DescriptorType::eSampler, kPoolSize},
-      {vk::DescriptorType::eCombinedImageSampler, kPoolSize},
-      {vk::DescriptorType::eSampledImage, kPoolSize},
-      {vk::DescriptorType::eStorageImage, kPoolSize},
-      {vk::DescriptorType::eUniformTexelBuffer, kPoolSize},
-      {vk::DescriptorType::eStorageTexelBuffer, kPoolSize},
-      {vk::DescriptorType::eUniformBuffer, kPoolSize},
-      {vk::DescriptorType::eStorageBuffer, kPoolSize},
-      {vk::DescriptorType::eUniformBufferDynamic, kPoolSize},
-      {vk::DescriptorType::eStorageBufferDynamic, kPoolSize},
-      {vk::DescriptorType::eInputAttachment, kPoolSize},
-  };
-
-  vk::DescriptorPoolCreateInfo pool_info = {
-      vk::DescriptorPoolCreateFlagBits::eFreeDescriptorSet,  // flags
-      static_cast<uint32_t>(pool_sizes.size() * kPoolSize),  // max sets
-      static_cast<uint32_t>(pool_sizes.size()),              // pool sizes count
-      pool_sizes.data()                                      // pool sizes
-  };
-
-  auto res = device.createDescriptorPool(pool_info);
-  if (res.result != vk::Result::eSuccess) {
-    VALIDATION_LOG << "Unable to create a descriptor pool";
+struct DescriptorPoolSize {
+  size_t buffer_bindings;
+  size_t texture_bindings;
+  size_t storage_bindings;
+  size_t subpass_bindings;
+};
+
+/// Descriptor pools are always allocated with the following sizes.
+static const constexpr DescriptorPoolSize kDefaultBindingSize =
+    DescriptorPoolSize{
+        .buffer_bindings = 512u,   // Buffer Bindings
+        .texture_bindings = 256u,  // Texture Bindings
+        .storage_bindings = 32,
+        .subpass_bindings = 4u  // Subpass Bindings
+    };
+
+// Holds the command pool in a background thread, recyling it when not in use.
+class BackgroundDescriptorPoolVK final {
+ public:
+  BackgroundDescriptorPoolVK(BackgroundDescriptorPoolVK&&) = default;
+
+  explicit BackgroundDescriptorPoolVK(
+      vk::UniqueDescriptorPool&& pool,
+      std::weak_ptr<DescriptorPoolRecyclerVK> recycler)
+      : pool_(std::move(pool)), recycler_(std::move(recycler)) {}
+
+  ~BackgroundDescriptorPoolVK() {
+    auto const recycler = recycler_.lock();
+
+    // Not only does this prevent recycling when the context is being destroyed,
+    // but it also prevents the destructor from effectively being called twice;
+    // once for the original BackgroundCommandPoolVK() and once for the moved
+    // BackgroundCommandPoolVK().
+    if (!recycler) {
+      return;
+    }
+
+    recycler->Reclaim(std::move(pool_));
+  }
+
+ private:
+  BackgroundDescriptorPoolVK(const BackgroundDescriptorPoolVK&) = delete;
+
+  BackgroundDescriptorPoolVK& operator=(const BackgroundDescriptorPoolVK&) =
+      delete;
+
+  vk::UniqueDescriptorPool pool_;
+  uint32_t allocated_capacity_;
+  std::weak_ptr<DescriptorPoolRecyclerVK> recycler_;
+};
+
+DescriptorPoolVK::DescriptorPoolVK(std::weak_ptr<const ContextVK> context)
+    : context_(std::move(context)) {}
+
+DescriptorPoolVK::~DescriptorPoolVK() {
+  if (pools_.empty()) {
+    return;
+  }
+
+  auto const context = context_.lock();
+  if (!context) {
     return;
   }
+  auto const recycler = context->GetDescriptorPoolRecycler();
+  if (!recycler) {
+    return;
+  }
+
+  for (auto i = 0u; i < pools_.size(); i++) {
+    auto reset_pool_when_dropped =
+        BackgroundDescriptorPoolVK(std::move(pools_[i]), recycler);
 
-  pool_ = res.value;
-  is_valid_ = true;
+    UniqueResourceVKT<BackgroundDescriptorPoolVK> pool(
+        context->GetResourceManager(), std::move(reset_pool_when_dropped));
+  }
+  pools_.clear();
 }
 
-vk::DescriptorPool DescriptorPoolVK::GetPool() {
-  return pool_;
+fml::StatusOr<vk::DescriptorSet> DescriptorPoolVK::AllocateDescriptorSets(
+    const vk::DescriptorSetLayout& layout,
+    const ContextVK& context_vk) {
+  if (pools_.empty()) {
+    CreateNewPool(context_vk);
+  }
+
+  vk::DescriptorSetAllocateInfo set_info;
+  set_info.setDescriptorPool(pools_.back().get());
+  set_info.setPSetLayouts(&layout);
+  set_info.setDescriptorSetCount(1);
+
+  vk::DescriptorSet set;
+  auto result = context_vk.GetDevice().allocateDescriptorSets(&set_info, &set);
+  if (result == vk::Result::eErrorOutOfPoolMemory) {
+    // If the pool ran out of memory, we need to create a new pool.
+    CreateNewPool(context_vk);
+    set_info.setDescriptorPool(pools_.back().get());
+    result = context_vk.GetDevice().allocateDescriptorSets(&set_info, &set);
+  }
+
+  if (result != vk::Result::eSuccess) {
+    VALIDATION_LOG << "Could not allocate descriptor sets: "
+                   << vk::to_string(result);
+    return fml::Status(fml::StatusCode::kUnknown, "");
+  }
+  return set;
+}
+
+fml::Status DescriptorPoolVK::CreateNewPool(const ContextVK& context_vk) {
+  auto new_pool = context_vk.GetDescriptorPoolRecycler()->Get();
+  if (!new_pool) {
+    return fml::Status(fml::StatusCode::kUnknown,
+                       "Failed to create descriptor pool");
+  }
+  pools_.emplace_back(std::move(new_pool));
+  return fml::Status();
 }
 
-DescriptorPoolVK::~DescriptorPoolVK() = default;
+void DescriptorPoolRecyclerVK::Reclaim(vk::UniqueDescriptorPool&& pool) {
+  // Reset the pool on a background thread.
+  auto strong_context = context_.lock();
+  if (!strong_context) {
+    return;
+  }
+  auto device = strong_context->GetDevice();
+  device.resetDescriptorPool(pool.get());
+
+  // Move the pool to the recycled list.
+  Lock recycled_lock(recycled_mutex_);
+
+  if (recycled_.size() < kMaxRecycledPools) {
+    recycled_.push_back(std::move(pool));
+    return;
+  }
+}
+
+vk::UniqueDescriptorPool DescriptorPoolRecyclerVK::Get() {
+  // Recycle a pool with a matching minumum capcity if it is available.
+  auto recycled_pool = Reuse();
+  if (recycled_pool.has_value()) {
+    return std::move(recycled_pool.value());
+  }
+  return Create();
+}
+
+vk::UniqueDescriptorPool DescriptorPoolRecyclerVK::Create() {
+  auto strong_context = context_.lock();
+  if (!strong_context) {
+    VALIDATION_LOG << "Unable to create a descriptor pool";
+    return {};
+  }
+
+  std::vector<vk::DescriptorPoolSize> pools = {
+      vk::DescriptorPoolSize{vk::DescriptorType::eCombinedImageSampler,
+                             kDefaultBindingSize.texture_bindings},
+      vk::DescriptorPoolSize{vk::DescriptorType::eUniformBuffer,
+                             kDefaultBindingSize.buffer_bindings},
+      vk::DescriptorPoolSize{vk::DescriptorType::eStorageBuffer,
+                             kDefaultBindingSize.storage_bindings},
+      vk::DescriptorPoolSize{vk::DescriptorType::eInputAttachment,
+                             kDefaultBindingSize.subpass_bindings}};
+  vk::DescriptorPoolCreateInfo pool_info;
+  pool_info.setMaxSets(kDefaultBindingSize.texture_bindings +
+                       kDefaultBindingSize.buffer_bindings +
+                       kDefaultBindingSize.storage_bindings +
+                       kDefaultBindingSize.subpass_bindings);
+  pool_info.setPoolSizes(pools);
+  auto [result, pool] =
+      strong_context->GetDevice().createDescriptorPoolUnique(pool_info);
+  if (result != vk::Result::eSuccess) {
+    VALIDATION_LOG << "Unable to create a descriptor pool";
+  }
+  return std::move(pool);
+}
+
+std::optional<vk::UniqueDescriptorPool> DescriptorPoolRecyclerVK::Reuse() {
+  Lock lock(recycled_mutex_);
+  if (recycled_.empty()) {
+    return std::nullopt;
+  }
+
+  auto recycled = std::move(recycled_[recycled_.size() - 1]);
+  recycled_.pop_back();
+  return recycled;
+}
 
 }  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/descriptor_pool_vk.h b/impeller/renderer/backend/vulkan/descriptor_pool_vk.h
index e7ff29ee9215b48d7d07fb332cddbfdb6de008f1..53f35a94ab89047f45885737c34375ce56e4c61a 100644
--- a/impeller/renderer/backend/vulkan/descriptor_pool_vk.h
+++ b/impeller/renderer/backend/vulkan/descriptor_pool_vk.h
@@ -2,30 +2,100 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_DESCRIPTOR_POOL_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_DESCRIPTOR_POOL_VK_H_
 
-#include <memory>
+#include <cstdint>
 
-#include "flutter/fml/macros.h"
-#include "impeller/renderer/backend/vulkan/vk.h"
-#include "vulkan/vulkan_enums.hpp"
+#include "fml/status_or.h"
+#include "impeller/renderer/backend/vulkan/context_vk.h"
 #include "vulkan/vulkan_handles.hpp"
 
 namespace impeller {
 
+//------------------------------------------------------------------------------
+/// @brief      A per-frame descriptor pool. Descriptors
+///             from this pool don't need to be freed individually. Instead, the
+///             pool must be collected after all the descriptors allocated from
+///             it are done being used.
+///
+///             The pool or it's descriptors may not be accessed from multiple
+///             threads.
+///
+///             Encoders create pools as necessary as they have the same
+///             threading and lifecycle restrictions.
 class DescriptorPoolVK {
  public:
-  explicit DescriptorPoolVK(vk::Device device);
+  explicit DescriptorPoolVK(std::weak_ptr<const ContextVK> context);
 
   ~DescriptorPoolVK();
 
-  vk::DescriptorPool GetPool();
+  fml::StatusOr<vk::DescriptorSet> AllocateDescriptorSets(
+      const vk::DescriptorSetLayout& layout,
+      const ContextVK& context_vk);
 
  private:
-  vk::DescriptorPool pool_;
-  bool is_valid_ = false;
+  std::weak_ptr<const ContextVK> context_;
+  std::vector<vk::UniqueDescriptorPool> pools_;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(DescriptorPoolVK);
+  fml::Status CreateNewPool(const ContextVK& context_vk);
+
+  DescriptorPoolVK(const DescriptorPoolVK&) = delete;
+
+  DescriptorPoolVK& operator=(const DescriptorPoolVK&) = delete;
+};
+
+//------------------------------------------------------------------------------
+/// @brief      Creates and manages the lifecycle of |vk::DescriptorPoolVK|
+///             objects.
+class DescriptorPoolRecyclerVK final
+    : public std::enable_shared_from_this<DescriptorPoolRecyclerVK> {
+ public:
+  ~DescriptorPoolRecyclerVK() = default;
+
+  /// The maximum number of descriptor pools this recycler will hold onto.
+  static constexpr size_t kMaxRecycledPools = 32u;
+
+  /// @brief      Creates a recycler for the given |ContextVK|.
+  ///
+  /// @param[in]  context The context to create the recycler for.
+  explicit DescriptorPoolRecyclerVK(std::weak_ptr<ContextVK> context)
+      : context_(std::move(context)) {}
+
+  /// @brief      Gets a descriptor pool.
+  ///
+  ///             This may create a new descriptor pool if no existing pools had
+  ///             the necessary capacity.
+  vk::UniqueDescriptorPool Get();
+
+  /// @brief      Returns the descriptor pool to be reset on a background
+  ///             thread.
+  ///
+  /// @param[in]  pool The pool to recycler.
+  void Reclaim(vk::UniqueDescriptorPool&& pool);
+
+ private:
+  std::weak_ptr<ContextVK> context_;
+
+  Mutex recycled_mutex_;
+  std::vector<vk::UniqueDescriptorPool> recycled_ IPLR_GUARDED_BY(
+      recycled_mutex_);
+
+  /// @brief      Creates a new |vk::CommandPool|.
+  ///
+  /// @returns    Returns a |std::nullopt| if a pool could not be created.
+  vk::UniqueDescriptorPool Create();
+
+  /// @brief      Reuses a recycled |vk::CommandPool|, if available.
+  ///
+  /// @returns    Returns a |std::nullopt| if a pool was not available.
+  std::optional<vk::UniqueDescriptorPool> Reuse();
+
+  DescriptorPoolRecyclerVK(const DescriptorPoolRecyclerVK&) = delete;
+
+  DescriptorPoolRecyclerVK& operator=(const DescriptorPoolRecyclerVK&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_DESCRIPTOR_POOL_VK_H_
diff --git a/impeller/renderer/backend/vulkan/descriptor_pool_vk_unittests.cc b/impeller/renderer/backend/vulkan/descriptor_pool_vk_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..34bbcdd91bdfe0c3f1c97513d8ecd2a1c15c673f
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/descriptor_pool_vk_unittests.cc
@@ -0,0 +1,147 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/testing/testing.h"  // IWYU pragma: keep.
+#include "fml/synchronization/waitable_event.h"
+#include "impeller/renderer/backend/vulkan/descriptor_pool_vk.h"
+#include "impeller/renderer/backend/vulkan/resource_manager_vk.h"
+#include "impeller/renderer/backend/vulkan/test/mock_vulkan.h"
+
+namespace impeller {
+namespace testing {
+
+TEST(DescriptorPoolRecyclerVKTest, GetDescriptorPoolRecyclerCreatesNewPools) {
+  auto const context = MockVulkanContextBuilder().Build();
+
+  auto const pool1 = context->GetDescriptorPoolRecycler()->Get();
+  auto const pool2 = context->GetDescriptorPoolRecycler()->Get();
+
+  // The two descriptor pools should be different.
+  EXPECT_NE(pool1.get(), pool2.get());
+
+  context->Shutdown();
+}
+
+namespace {
+
+// Invokes the provided callback when the destructor is called.
+//
+// Can be moved, but not copied.
+class DeathRattle final {
+ public:
+  explicit DeathRattle(std::function<void()> callback)
+      : callback_(std::move(callback)) {}
+
+  DeathRattle(DeathRattle&&) = default;
+  DeathRattle& operator=(DeathRattle&&) = default;
+
+  ~DeathRattle() { callback_(); }
+
+ private:
+  std::function<void()> callback_;
+};
+
+}  // namespace
+
+TEST(DescriptorPoolRecyclerVKTest, ReclaimMakesDescriptorPoolAvailable) {
+  auto const context = MockVulkanContextBuilder().Build();
+
+  {
+    // Fetch a pool (which will be created).
+    auto pool = DescriptorPoolVK(context);
+    pool.AllocateDescriptorSets({}, *context);
+  }
+
+  // There is a chance that the first death rattle item below is destroyed in
+  // the same reclaim cycle as the pool allocation above. These items are placed
+  // into a std::vector and free'd, which may free in reverse order. That would
+  // imply that the death rattle and subsequent waitable event fires before the
+  // pool is reset. To work around this, we can either manually remove items
+  // from the vector or use two death rattles.
+  for (auto i = 0u; i < 2; i++) {
+    // Add something to the resource manager and have it notify us when it's
+    // destroyed. That should give us a non-flaky signal that the pool has been
+    // reclaimed as well.
+    auto waiter = fml::AutoResetWaitableEvent();
+    auto rattle = DeathRattle([&waiter]() { waiter.Signal(); });
+    {
+      UniqueResourceVKT<DeathRattle> resource(context->GetResourceManager(),
+                                              std::move(rattle));
+    }
+    waiter.Wait();
+  }
+
+  auto const pool = context->GetDescriptorPoolRecycler()->Get();
+
+  // Now check that we only ever created one pool.
+  auto const called = GetMockVulkanFunctions(context->GetDevice());
+  EXPECT_EQ(
+      std::count(called->begin(), called->end(), "vkCreateDescriptorPool"), 1u);
+
+  context->Shutdown();
+}
+
+TEST(DescriptorPoolRecyclerVKTest, ReclaimDropsDescriptorPoolIfSizeIsExceeded) {
+  auto const context = MockVulkanContextBuilder().Build();
+
+  // Create 33 pools
+  {
+    std::vector<std::unique_ptr<DescriptorPoolVK>> pools;
+    for (auto i = 0u; i < 33; i++) {
+      auto pool = std::make_unique<DescriptorPoolVK>(context);
+      pool->AllocateDescriptorSets({}, *context);
+      pools.push_back(std::move(pool));
+    }
+  }
+
+  // See note above.
+  for (auto i = 0u; i < 2; i++) {
+    auto waiter = fml::AutoResetWaitableEvent();
+    auto rattle = DeathRattle([&waiter]() { waiter.Signal(); });
+    {
+      UniqueResourceVKT<DeathRattle> resource(context->GetResourceManager(),
+                                              std::move(rattle));
+    }
+    waiter.Wait();
+  }
+
+  auto const called = GetMockVulkanFunctions(context->GetDevice());
+  EXPECT_EQ(
+      std::count(called->begin(), called->end(), "vkCreateDescriptorPool"),
+      33u);
+  EXPECT_EQ(std::count(called->begin(), called->end(), "vkResetDescriptorPool"),
+            33u);
+
+  // Now create 33 more descriptor pools and observe that only one more is
+  // allocated.
+  {
+    std::vector<std::unique_ptr<DescriptorPoolVK>> pools;
+    for (auto i = 0u; i < 33; i++) {
+      auto pool = std::make_unique<DescriptorPoolVK>(context);
+      pool->AllocateDescriptorSets({}, *context);
+      pools.push_back(std::move(pool));
+    }
+  }
+
+  for (auto i = 0u; i < 2; i++) {
+    auto waiter = fml::AutoResetWaitableEvent();
+    auto rattle = DeathRattle([&waiter]() { waiter.Signal(); });
+    {
+      UniqueResourceVKT<DeathRattle> resource(context->GetResourceManager(),
+                                              std::move(rattle));
+    }
+    waiter.Wait();
+  }
+
+  auto const called_twice = GetMockVulkanFunctions(context->GetDevice());
+  // 32 of the descriptor pools were recycled, so only one more is created.
+  EXPECT_EQ(
+      std::count(called->begin(), called->end(), "vkCreateDescriptorPool"),
+      34u);
+
+  context->Shutdown();
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/device_buffer_vk.cc b/impeller/renderer/backend/vulkan/device_buffer_vk.cc
index 92c670da72df1d65ed1230f56054695508c59044..a43a5825fd562fdd03faa20e4165b5892fe1f2ab 100644
--- a/impeller/renderer/backend/vulkan/device_buffer_vk.cc
+++ b/impeller/renderer/backend/vulkan/device_buffer_vk.cc
@@ -4,37 +4,35 @@
 
 #include "impeller/renderer/backend/vulkan/device_buffer_vk.h"
 
-#include "fml/logging.h"
-#include "vulkan/vulkan_handles.hpp"
+#include "flutter/flutter_vma/flutter_vma.h"
+#include "flutter/fml/trace_event.h"
+#include "impeller/renderer/backend/vulkan/context_vk.h"
+#include "vulkan/vulkan_core.h"
 
 namespace impeller {
 
-void* DeviceBufferAllocationVK::GetMapping() const {
-  return backing_allocation.allocation_info.pMappedData;
-}
-
-vk::Buffer DeviceBufferAllocationVK::GetBufferHandle() const {
-  return buffer;
-}
-
-DeviceBufferVK::DeviceBufferVK(
-    DeviceBufferDescriptor desc,
-    ContextVK& context,
-    std::unique_ptr<DeviceBufferAllocationVK> device_allocation)
+DeviceBufferVK::DeviceBufferVK(DeviceBufferDescriptor desc,
+                               std::weak_ptr<Context> context,
+                               UniqueBufferVMA buffer,
+                               VmaAllocationInfo info)
     : DeviceBuffer(desc),
-      context_(context),
-      device_allocation_(std::move(device_allocation)) {}
+      context_(std::move(context)),
+      resource_(ContextVK::Cast(*context_.lock().get()).GetResourceManager(),
+                BufferResource{
+                    std::move(buffer),  //
+                    info                //
+                }) {}
 
 DeviceBufferVK::~DeviceBufferVK() = default;
 
 uint8_t* DeviceBufferVK::OnGetContents() const {
-  return reinterpret_cast<uint8_t*>(device_allocation_->GetMapping());
+  return static_cast<uint8_t*>(resource_->info.pMappedData);
 }
 
 bool DeviceBufferVK::OnCopyHostBuffer(const uint8_t* source,
                                       Range source_range,
                                       size_t offset) {
-  auto dest = static_cast<uint8_t*>(device_allocation_->GetMapping());
+  uint8_t* dest = OnGetContents();
 
   if (!dest) {
     return false;
@@ -43,21 +41,50 @@ bool DeviceBufferVK::OnCopyHostBuffer(const uint8_t* source,
   if (source) {
     ::memmove(dest + offset, source + source_range.offset, source_range.length);
   }
+  ::vmaFlushAllocation(resource_->buffer.get().allocator,
+                       resource_->buffer.get().allocation, offset,
+                       source_range.length);
 
   return true;
 }
 
 bool DeviceBufferVK::SetLabel(const std::string& label) {
-  context_.SetDebugName(device_allocation_->GetBufferHandle(), label);
-  return true;
+  auto context = context_.lock();
+  if (!context || !resource_->buffer.is_valid()) {
+    // The context could have died at this point.
+    return false;
+  }
+
+  ::vmaSetAllocationName(resource_->buffer.get().allocator,   //
+                         resource_->buffer.get().allocation,  //
+                         label.c_str()                        //
+  );
+
+  return ContextVK::Cast(*context).SetDebugName(resource_->buffer.get().buffer,
+                                                label);
+}
+
+void DeviceBufferVK::Flush(std::optional<Range> range) const {
+  auto flush_range = range.value_or(Range{0, GetDeviceBufferDescriptor().size});
+  ::vmaFlushAllocation(resource_->buffer.get().allocator,
+                       resource_->buffer.get().allocation, flush_range.offset,
+                       flush_range.length);
+}
+
+void DeviceBufferVK::Invalidate(std::optional<Range> range) const {
+  auto flush_range = range.value_or(Range{0, GetDeviceBufferDescriptor().size});
+  ::vmaInvalidateAllocation(resource_->buffer.get().allocator,
+                            resource_->buffer.get().allocation,
+                            flush_range.offset, flush_range.length);
 }
 
 bool DeviceBufferVK::SetLabel(const std::string& label, Range range) {
+  // We do not have the ability to name ranges. Just name the whole thing.
   return SetLabel(label);
 }
 
-vk::Buffer DeviceBufferVK::GetVKBufferHandle() const {
-  return device_allocation_->GetBufferHandle();
+vk::Buffer DeviceBufferVK::GetBuffer() const {
+  return resource_->buffer.get().buffer;
 }
 
 }  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/device_buffer_vk.h b/impeller/renderer/backend/vulkan/device_buffer_vk.h
index da8fd8a729e3de20d523e2bd408d129c0560e29f..744453dc2ac33b47f9b41793ad98edb802bc6dfe 100644
--- a/impeller/renderer/backend/vulkan/device_buffer_vk.h
+++ b/impeller/renderer/backend/vulkan/device_buffer_vk.h
@@ -2,52 +2,55 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_DEVICE_BUFFER_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_DEVICE_BUFFER_VK_H_
 
 #include <memory>
 
-#include "flutter/fml/macros.h"
 #include "impeller/base/backend_cast.h"
-#include "impeller/renderer/backend/vulkan/context_vk.h"
-#include "impeller/renderer/device_buffer.h"
+#include "impeller/core/device_buffer.h"
+#include "impeller/renderer/backend/vulkan/resource_manager_vk.h"
+#include "impeller/renderer/backend/vulkan/vma.h"
 
 namespace impeller {
 
-// https://github.com/flutter/flutter/issues/112387
-// This buffer can be freed once the command buffer is disposed.
-// vmaDestroyBuffer(allocator_, buffer_, allocation_);
-struct BackingAllocationVK {
-  VmaAllocator* allocator = nullptr;
-  VmaAllocation allocation = nullptr;
-  VmaAllocationInfo allocation_info = {};
-};
-
-struct DeviceBufferAllocationVK {
-  vk::Buffer buffer = VK_NULL_HANDLE;
-  BackingAllocationVK backing_allocation = {};
-
-  void* GetMapping() const;
-
-  vk::Buffer GetBufferHandle() const;
-};
-
 class DeviceBufferVK final : public DeviceBuffer,
                              public BackendCast<DeviceBufferVK, DeviceBuffer> {
  public:
   DeviceBufferVK(DeviceBufferDescriptor desc,
-                 ContextVK& context,
-                 std::unique_ptr<DeviceBufferAllocationVK> device_allocation);
+                 std::weak_ptr<Context> context,
+                 UniqueBufferVMA buffer,
+                 VmaAllocationInfo info);
 
   // |DeviceBuffer|
   ~DeviceBufferVK() override;
 
-  vk::Buffer GetVKBufferHandle() const;
+  vk::Buffer GetBuffer() const;
 
  private:
   friend class AllocatorVK;
 
-  ContextVK& context_;
-  std::unique_ptr<DeviceBufferAllocationVK> device_allocation_;
+  struct BufferResource {
+    UniqueBufferVMA buffer;
+    VmaAllocationInfo info = {};
+
+    BufferResource() = default;
+
+    BufferResource(UniqueBufferVMA p_buffer, VmaAllocationInfo p_info)
+        : buffer(std::move(p_buffer)), info(p_info) {}
+
+    BufferResource(BufferResource&& o) {
+      std::swap(o.buffer, buffer);
+      std::swap(o.info, info);
+    }
+
+    BufferResource(const BufferResource&) = delete;
+
+    BufferResource& operator=(const BufferResource&) = delete;
+  };
+
+  std::weak_ptr<Context> context_;
+  UniqueResourceVKT<BufferResource> resource_;
 
   // |DeviceBuffer|
   uint8_t* OnGetContents() const override;
@@ -63,7 +66,17 @@ class DeviceBufferVK final : public DeviceBuffer,
   // |DeviceBuffer|
   bool SetLabel(const std::string& label, Range range) override;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(DeviceBufferVK);
+  // |DeviceBuffer|
+  void Flush(std::optional<Range> range) const override;
+
+  // |DeviceBuffer|
+  void Invalidate(std::optional<Range> range) const override;
+
+  DeviceBufferVK(const DeviceBufferVK&) = delete;
+
+  DeviceBufferVK& operator=(const DeviceBufferVK&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_DEVICE_BUFFER_VK_H_
diff --git a/impeller/archivist/archivable.h b/impeller/renderer/backend/vulkan/device_holder_vk.h
similarity index 30%
rename from impeller/archivist/archivable.h
rename to impeller/renderer/backend/vulkan/device_holder_vk.h
index 41c296301d20a8511a6605b4f4387977969a3d4b..f85ae846fdbf5abd52d855a6b587323e8e22595f 100644
--- a/impeller/archivist/archivable.h
+++ b/impeller/renderer/backend/vulkan/device_holder_vk.h
@@ -2,37 +2,28 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_DEVICE_HOLDER_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_DEVICE_HOLDER_VK_H_
 
-#include <cstdint>
-#include <optional>
-#include <string>
-#include <vector>
+#include "impeller/renderer/backend/vulkan/vk.h"  // IWYU pragma: keep.
 
 namespace impeller {
 
-struct ArchiveDef {
-  const std::string table_name;
-  const std::vector<std::string> members;
-};
-
-class ArchiveLocation;
-
-using PrimaryKey = std::optional<int64_t>;
-
 //------------------------------------------------------------------------------
-/// @brief      Instances of `Archivable`s can be read from and written to a
-///             persistent archive.
+/// @brief      Holds a strong reference to the underlying logical Vulkan
+///             device. This comes in handy when the context is being torn down
+///             and the various components on different threads may need to
+///             orchestrate safe shutdown.
 ///
-class Archivable {
+class DeviceHolderVK {
  public:
-  virtual ~Archivable() = default;
-
-  virtual PrimaryKey GetPrimaryKey() const = 0;
+  virtual ~DeviceHolderVK() = default;
 
-  virtual bool Write(ArchiveLocation& item) const = 0;
+  virtual const vk::Device& GetDevice() const = 0;
 
-  virtual bool Read(ArchiveLocation& item) = 0;
+  virtual const vk::PhysicalDevice& GetPhysicalDevice() const = 0;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_DEVICE_HOLDER_VK_H_
diff --git a/impeller/renderer/backend/vulkan/driver_info_vk.cc b/impeller/renderer/backend/vulkan/driver_info_vk.cc
new file mode 100644
index 0000000000000000000000000000000000000000..84b5249fb0a11e4f0c4554308e76fa819454eef8
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/driver_info_vk.cc
@@ -0,0 +1,95 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/backend/vulkan/driver_info_vk.h"
+
+namespace impeller {
+
+constexpr VendorVK IdentifyVendor(uint32_t vendor) {
+  // Check if the vendor has a PCI ID:
+  // https://pcisig.com/membership/member-companies
+  switch (vendor) {
+    case 0x1AE0:
+      return VendorVK::kGoogle;
+    case 0x168C:
+    case 0x17CB:
+    case 0x1969:
+    case 0x5143:
+      return VendorVK::kQualcomm;
+    case 0x13B5:
+      return VendorVK::kARM;
+    case 0x1010:
+      return VendorVK::kImgTec;
+    case 0x1002:
+    case 0x1022:
+      return VendorVK::kAMD;
+    case 0x10DE:
+      return VendorVK::kNvidia;
+    case 0x8086:  // :)
+      return VendorVK::kIntel;
+    case 0x106B:
+      return VendorVK::kApple;
+  }
+  // Check if the ID is a known Khronos vendor.
+  switch (vendor) {
+    case VK_VENDOR_ID_MESA:
+      return VendorVK::kMesa;
+      // There are others but have never been observed. These can be added as
+      // needed.
+  }
+  return VendorVK::kUnknown;
+}
+
+constexpr DeviceTypeVK ToDeviceType(const vk::PhysicalDeviceType& type) {
+  switch (type) {
+    case vk::PhysicalDeviceType::eOther:
+      return DeviceTypeVK::kUnknown;
+    case vk::PhysicalDeviceType::eIntegratedGpu:
+      return DeviceTypeVK::kIntegratedGPU;
+    case vk::PhysicalDeviceType::eDiscreteGpu:
+      return DeviceTypeVK::kDiscreteGPU;
+    case vk::PhysicalDeviceType::eVirtualGpu:
+      return DeviceTypeVK::kVirtualGPU;
+    case vk::PhysicalDeviceType::eCpu:
+      return DeviceTypeVK::kCPU;
+      break;
+  }
+  return DeviceTypeVK::kUnknown;
+}
+
+DriverInfoVK::DriverInfoVK(const vk::PhysicalDevice& device) {
+  auto props = device.getProperties();
+  api_version_ = Version{VK_API_VERSION_MAJOR(props.apiVersion),
+                         VK_API_VERSION_MINOR(props.apiVersion),
+                         VK_API_VERSION_PATCH(props.apiVersion)};
+  vendor_ = IdentifyVendor(props.vendorID);
+  if (vendor_ == VendorVK::kUnknown) {
+    FML_LOG(WARNING) << "Unknown GPU Driver Vendor: " << props.vendorID
+                     << ". This is not an error.";
+  }
+  type_ = ToDeviceType(props.deviceType);
+  if (props.deviceName.data() != nullptr) {
+    driver_name_ = props.deviceName.data();
+  }
+}
+
+DriverInfoVK::~DriverInfoVK() = default;
+
+const Version& DriverInfoVK::GetAPIVersion() const {
+  return api_version_;
+}
+
+const VendorVK& DriverInfoVK::GetVendor() const {
+  return vendor_;
+}
+
+const DeviceTypeVK& DriverInfoVK::GetDeviceType() const {
+  return type_;
+}
+
+const std::string& DriverInfoVK::GetDriverName() const {
+  return driver_name_;
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/driver_info_vk.h b/impeller/renderer/backend/vulkan/driver_info_vk.h
new file mode 100644
index 0000000000000000000000000000000000000000..30edbf654c3d13137a42e752960528bbff7fe2fa
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/driver_info_vk.h
@@ -0,0 +1,120 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_DRIVER_INFO_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_DRIVER_INFO_VK_H_
+
+#include "impeller/base/version.h"
+#include "impeller/renderer/backend/vulkan/vk.h"
+
+namespace impeller {
+
+enum class VendorVK {
+  kUnknown,
+  //----------------------------------------------------------------------------
+  /// Includes the SwiftShader CPU implementation.
+  ///
+  kGoogle,
+  kQualcomm,
+  kARM,
+  kImgTec,
+  kPowerVR = kImgTec,
+  kAMD,
+  kNvidia,
+  kIntel,
+  //----------------------------------------------------------------------------
+  /// Includes the LLVM Pipe CPU implementation.
+  ///
+  kMesa,
+  //----------------------------------------------------------------------------
+  /// Includes Vulkan on Metal via MoltenVK.
+  ///
+  kApple,
+};
+
+enum class DeviceTypeVK {
+  kUnknown,
+  //----------------------------------------------------------------------------
+  /// The device is an integrated GPU. Typically mobile GPUs.
+  ///
+  kIntegratedGPU,
+  //----------------------------------------------------------------------------
+  /// The device is a discrete GPU. Typically desktop GPUs.
+  ///
+  kDiscreteGPU,
+  //----------------------------------------------------------------------------
+  /// The device is a GPU in a virtualized environment.
+  ///
+  kVirtualGPU,
+  //----------------------------------------------------------------------------
+  /// There is no GPU. Vulkan is implemented on the CPU. This is typically
+  /// emulators like SwiftShader and LLVMPipe.
+  ///
+  kCPU,
+};
+
+//------------------------------------------------------------------------------
+/// @brief      Get information about the Vulkan driver.
+///
+/// @warning    Be extremely cautious about the information reported here. This
+///             is self-reported information (by the driver) and may be
+///             inaccurate and or inconsistent.
+///
+///             Before gating features behind any of the information reported by
+///             the driver, consider alternatives (extensions checks perhaps)
+///             and try to get a reviewer buddy to convince you to avoid using
+///             this.
+///
+class DriverInfoVK {
+ public:
+  explicit DriverInfoVK(const vk::PhysicalDevice& device);
+
+  ~DriverInfoVK();
+
+  DriverInfoVK(const DriverInfoVK&) = delete;
+
+  DriverInfoVK& operator=(const DriverInfoVK&) = delete;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Gets the Vulkan API version. Should be at or above Vulkan 1.1
+  ///             which is the Impeller baseline.
+  ///
+  /// @return     The Vulkan API version.
+  ///
+  const Version& GetAPIVersion() const;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Get the vendor of the Vulkan implementation. This is a broad
+  ///             check and includes multiple drivers and platforms.
+  ///
+  /// @return     The vendor.
+  ///
+  const VendorVK& GetVendor() const;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Get the device type. Typical use might be to check if the
+  ///             device is a CPU implementation.
+  ///
+  /// @return     The device type.
+  ///
+  const DeviceTypeVK& GetDeviceType() const;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Get the self-reported name of the graphics driver.
+  ///
+  /// @return     The driver name.
+  ///
+  const std::string& GetDriverName() const;
+
+ private:
+  bool is_valid_ = false;
+  Version api_version_;
+  VendorVK vendor_ = VendorVK::kUnknown;
+  DeviceTypeVK type_ = DeviceTypeVK::kUnknown;
+  std::string driver_name_;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_DRIVER_INFO_VK_H_
diff --git a/impeller/renderer/backend/vulkan/driver_info_vk_unittests.cc b/impeller/renderer/backend/vulkan/driver_info_vk_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..f7964ce8fffdeb0524954566e6d42a6c5ed6c1e5
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/driver_info_vk_unittests.cc
@@ -0,0 +1,26 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/playground/playground_test.h"
+#include "impeller/renderer/backend/vulkan/context_vk.h"
+#include "impeller/renderer/backend/vulkan/surface_context_vk.h"
+
+namespace impeller::testing {
+
+using DriverInfoVKTest = PlaygroundTest;
+INSTANTIATE_VULKAN_PLAYGROUND_SUITE(DriverInfoVKTest);
+
+TEST_P(DriverInfoVKTest, CanQueryDriverInfo) {
+  ASSERT_TRUE(GetContext());
+  const auto& driver_info =
+      SurfaceContextVK::Cast(*GetContext()).GetParent().GetDriverInfo();
+  ASSERT_NE(driver_info, nullptr);
+  // 1.1 is the base Impeller version. The driver can't be lower than that.
+  ASSERT_TRUE(driver_info->GetAPIVersion().IsAtLeast(Version{1, 1, 0}));
+  ASSERT_NE(driver_info->GetVendor(), VendorVK::kUnknown);
+  ASSERT_NE(driver_info->GetDeviceType(), DeviceTypeVK::kUnknown);
+  ASSERT_NE(driver_info->GetDriverName(), "");
+}
+
+}  // namespace impeller::testing
diff --git a/impeller/renderer/backend/vulkan/fence_waiter_vk.cc b/impeller/renderer/backend/vulkan/fence_waiter_vk.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ddd617a58033e5bf9cf810f4f47b2d38b75d621f
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/fence_waiter_vk.cc
@@ -0,0 +1,215 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/backend/vulkan/fence_waiter_vk.h"
+
+#include <algorithm>
+#include <chrono>
+#include <utility>
+
+#include "flutter/fml/cpu_affinity.h"
+#include "flutter/fml/thread.h"
+#include "flutter/fml/trace_event.h"
+#include "impeller/base/validation.h"
+
+namespace impeller {
+
+class WaitSetEntry {
+ public:
+  static std::shared_ptr<WaitSetEntry> Create(vk::UniqueFence p_fence,
+                                              const fml::closure& p_callback) {
+    return std::shared_ptr<WaitSetEntry>(
+        new WaitSetEntry(std::move(p_fence), p_callback));
+  }
+
+  void UpdateSignalledStatus(const vk::Device& device) {
+    if (is_signalled_) {
+      return;
+    }
+    is_signalled_ = device.getFenceStatus(fence_.get()) == vk::Result::eSuccess;
+  }
+
+  const vk::Fence& GetFence() const { return fence_.get(); }
+
+  bool IsSignalled() const { return is_signalled_; }
+
+ private:
+  vk::UniqueFence fence_;
+  fml::ScopedCleanupClosure callback_;
+  bool is_signalled_ = false;
+
+  WaitSetEntry(vk::UniqueFence p_fence, const fml::closure& p_callback)
+      : fence_(std::move(p_fence)),
+        callback_(fml::ScopedCleanupClosure{p_callback}) {}
+
+  WaitSetEntry(const WaitSetEntry&) = delete;
+
+  WaitSetEntry(WaitSetEntry&&) = delete;
+
+  WaitSetEntry& operator=(const WaitSetEntry&) = delete;
+
+  WaitSetEntry& operator=(WaitSetEntry&&) = delete;
+};
+
+FenceWaiterVK::FenceWaiterVK(std::weak_ptr<DeviceHolderVK> device_holder)
+    : device_holder_(std::move(device_holder)) {
+  waiter_thread_ = std::make_unique<std::thread>([&]() { Main(); });
+}
+
+FenceWaiterVK::~FenceWaiterVK() {
+  Terminate();
+  waiter_thread_->join();
+}
+
+bool FenceWaiterVK::AddFence(vk::UniqueFence fence,
+                             const fml::closure& callback) {
+  if (!fence || !callback) {
+    return false;
+  }
+  {
+    // Maintain the invariant that terminate_ is accessed only under the lock.
+    std::scoped_lock lock(wait_set_mutex_);
+    if (terminate_) {
+      return false;
+    }
+    wait_set_.emplace_back(WaitSetEntry::Create(std::move(fence), callback));
+  }
+  wait_set_cv_.notify_one();
+  return true;
+}
+
+static std::vector<vk::Fence> GetFencesForWaitSet(const WaitSet& set) {
+  std::vector<vk::Fence> fences;
+  for (const auto& entry : set) {
+    if (!entry->IsSignalled()) {
+      fences.emplace_back(entry->GetFence());
+    }
+  }
+  return fences;
+}
+
+void FenceWaiterVK::Main() {
+  fml::Thread::SetCurrentThreadName(
+      fml::Thread::ThreadConfig{"IplrVkFenceWait"});
+  // Since this thread mostly waits on fences, it doesn't need to be fast.
+  fml::RequestAffinity(fml::CpuAffinity::kEfficiency);
+
+  while (true) {
+    // We'll read the terminate_ flag within the lock below.
+    bool terminate = false;
+
+    {
+      std::unique_lock lock(wait_set_mutex_);
+
+      // If there are no fences to wait on, wait on the condition variable.
+      wait_set_cv_.wait(lock,
+                        [&]() { return !wait_set_.empty() || terminate_; });
+
+      // Still under the lock, check if the waiter has been terminated.
+      terminate = terminate_;
+    }
+
+    if (terminate) {
+      WaitUntilEmpty();
+      break;
+    }
+
+    if (!Wait()) {
+      break;
+    }
+  }
+}
+
+void FenceWaiterVK::WaitUntilEmpty() {
+  // Note, there is no lock because once terminate_ is set to true, no other
+  // fence can be added to the wait set. Just in case, here's a FML_DCHECK:
+  FML_DCHECK(terminate_) << "Fence waiter must be terminated.";
+  while (!wait_set_.empty() && Wait()) {
+    // Intentionally empty.
+  }
+}
+
+bool FenceWaiterVK::Wait() {
+  // Snapshot the wait set and wait on the fences.
+  WaitSet wait_set;
+  {
+    std::scoped_lock lock(wait_set_mutex_);
+    wait_set = wait_set_;
+  }
+
+  using namespace std::literals::chrono_literals;
+
+  // Check if the context had died in the meantime.
+  auto device_holder = device_holder_.lock();
+  if (!device_holder) {
+    return false;
+  }
+
+  const auto& device = device_holder->GetDevice();
+  // Wait for one or more fences to be signaled. Any additional fences added
+  // to the waiter will be serviced in the next pass. If a fence that is going
+  // to be signaled at an abnormally long deadline is the only one in the set,
+  // a timeout will bail out the wait.
+  auto fences = GetFencesForWaitSet(wait_set);
+  if (fences.empty()) {
+    return true;
+  }
+
+  auto result = device.waitForFences(
+      /*fenceCount=*/fences.size(),
+      /*pFences=*/fences.data(),
+      /*waitAll=*/false,
+      /*timeout=*/std::chrono::nanoseconds{100ms}.count());
+  if (!(result == vk::Result::eSuccess || result == vk::Result::eTimeout)) {
+    VALIDATION_LOG << "Fence waiter encountered an unexpected error. Tearing "
+                      "down the waiter thread.";
+    return false;
+  }
+
+  // One or more fences have been signaled. Find out which ones and update
+  // their signaled statuses.
+  {
+    TRACE_EVENT0("impeller", "CheckFenceStatus");
+    for (auto& entry : wait_set) {
+      entry->UpdateSignalledStatus(device);
+    }
+    wait_set.clear();
+  }
+
+  // Quickly acquire the wait set lock and erase signaled entries. Make sure
+  // the mutex is unlocked before calling the destructors of the erased
+  // entries. These might touch allocators.
+  WaitSet erased_entries;
+  {
+    static constexpr auto is_signalled = [](const auto& entry) {
+      return entry->IsSignalled();
+    };
+    std::scoped_lock lock(wait_set_mutex_);
+
+    // TODO(matanlurey): Iterate the list 1x by copying is_signaled into erased.
+    std::copy_if(wait_set_.begin(), wait_set_.end(),
+                 std::back_inserter(erased_entries), is_signalled);
+    wait_set_.erase(
+        std::remove_if(wait_set_.begin(), wait_set_.end(), is_signalled),
+        wait_set_.end());
+  }
+
+  {
+    TRACE_EVENT0("impeller", "ClearSignaledFences");
+    // Erase the erased entries which will invoke callbacks.
+    erased_entries.clear();  // Bit redundant because of scope but hey.
+  }
+
+  return true;
+}
+
+void FenceWaiterVK::Terminate() {
+  {
+    std::scoped_lock lock(wait_set_mutex_);
+    terminate_ = true;
+  }
+  wait_set_cv_.notify_one();
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/fence_waiter_vk.h b/impeller/renderer/backend/vulkan/fence_waiter_vk.h
new file mode 100644
index 0000000000000000000000000000000000000000..cc265eeb08b811044036be9a3aa80ba30a872123
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/fence_waiter_vk.h
@@ -0,0 +1,61 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_FENCE_WAITER_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_FENCE_WAITER_VK_H_
+
+#include <condition_variable>
+#include <memory>
+#include <thread>
+#include <vector>
+
+#include "flutter/fml/closure.h"
+#include "flutter/fml/macros.h"
+#include "impeller/base/thread.h"
+#include "impeller/renderer/backend/vulkan/device_holder_vk.h"
+#include "impeller/renderer/backend/vulkan/shared_object_vk.h"
+#include "impeller/renderer/backend/vulkan/vk.h"
+
+namespace impeller {
+
+class ContextVK;
+class WaitSetEntry;
+
+using WaitSet = std::vector<std::shared_ptr<WaitSetEntry>>;
+
+class FenceWaiterVK {
+ public:
+  ~FenceWaiterVK();
+
+  bool IsValid() const;
+
+  void Terminate();
+
+  bool AddFence(vk::UniqueFence fence, const fml::closure& callback);
+
+ private:
+  friend class ContextVK;
+
+  std::weak_ptr<DeviceHolderVK> device_holder_;
+  std::unique_ptr<std::thread> waiter_thread_;
+  std::mutex wait_set_mutex_;
+  std::condition_variable wait_set_cv_;
+  WaitSet wait_set_;
+  bool terminate_ = false;
+
+  explicit FenceWaiterVK(std::weak_ptr<DeviceHolderVK> device_holder);
+
+  void Main();
+
+  bool Wait();
+  void WaitUntilEmpty();
+
+  FenceWaiterVK(const FenceWaiterVK&) = delete;
+
+  FenceWaiterVK& operator=(const FenceWaiterVK&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_FENCE_WAITER_VK_H_
diff --git a/impeller/renderer/backend/vulkan/fence_waiter_vk_unittests.cc b/impeller/renderer/backend/vulkan/fence_waiter_vk_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ef2ff5d40cbb950a5fde469d8e0972ef7b4d254d
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/fence_waiter_vk_unittests.cc
@@ -0,0 +1,130 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "fml/synchronization/waitable_event.h"
+#include "gtest/gtest.h"  // IWYU pragma: keep
+#include "impeller/renderer/backend/vulkan/fence_waiter_vk.h"  // IWYU pragma: keep
+#include "impeller/renderer/backend/vulkan/test/mock_vulkan.h"
+
+namespace impeller {
+namespace testing {
+
+TEST(FenceWaiterVKTest, IgnoresNullFence) {
+  auto const context = MockVulkanContextBuilder().Build();
+  auto const waiter = context->GetFenceWaiter();
+  EXPECT_FALSE(waiter->AddFence(vk::UniqueFence(), []() {}));
+}
+
+TEST(FenceWaiterVKTest, IgnoresNullCallback) {
+  auto const context = MockVulkanContextBuilder().Build();
+  auto const device = context->GetDevice();
+  auto const waiter = context->GetFenceWaiter();
+
+  auto fence = device.createFenceUnique({}).value;
+  EXPECT_FALSE(waiter->AddFence(std::move(fence), nullptr));
+}
+
+TEST(FenceWaiterVKTest, ExecutesFenceCallback) {
+  auto const context = MockVulkanContextBuilder().Build();
+  auto const device = context->GetDevice();
+  auto const waiter = context->GetFenceWaiter();
+
+  auto signal = fml::ManualResetWaitableEvent();
+  auto fence = device.createFenceUnique({}).value;
+  waiter->AddFence(std::move(fence), [&signal]() { signal.Signal(); });
+
+  signal.Wait();
+}
+
+TEST(FenceWaiterVKTest, ExecutesFenceCallbackX2) {
+  auto const context = MockVulkanContextBuilder().Build();
+  auto const device = context->GetDevice();
+  auto const waiter = context->GetFenceWaiter();
+
+  auto signal = fml::ManualResetWaitableEvent();
+  auto fence = device.createFenceUnique({}).value;
+  waiter->AddFence(std::move(fence), [&signal]() { signal.Signal(); });
+
+  auto signal2 = fml::ManualResetWaitableEvent();
+  auto fence2 = device.createFenceUnique({}).value;
+  waiter->AddFence(std::move(fence2), [&signal2]() { signal2.Signal(); });
+
+  signal.Wait();
+  signal2.Wait();
+}
+
+TEST(FenceWaiterVKTest, ExecutesNewFenceThenOldFence) {
+  auto const context = MockVulkanContextBuilder().Build();
+  auto const device = context->GetDevice();
+  auto const waiter = context->GetFenceWaiter();
+
+  auto signal = fml::ManualResetWaitableEvent();
+  auto fence = device.createFenceUnique({}).value;
+  MockFence::SetStatus(fence, vk::Result::eNotReady);
+  auto raw_fence = MockFence::GetRawPointer(fence);
+  waiter->AddFence(std::move(fence), [&signal]() { signal.Signal(); });
+
+  // The easiest way to verify that the callback was _not_ called is to wait
+  // for a timeout, but that could introduce flakiness. Instead, we'll add a
+  // second fence that will signal immediately, and wait for that one instead.
+  {
+    auto signal2 = fml::ManualResetWaitableEvent();
+    auto fence2 = device.createFenceUnique({}).value;
+    MockFence::SetStatus(fence2, vk::Result::eSuccess);
+    waiter->AddFence(std::move(fence2), [&signal2]() { signal2.Signal(); });
+    signal2.Wait();
+  }
+
+  // Now, we'll signal the first fence, and wait for the callback to be called.
+  raw_fence->SetStatus(vk::Result::eSuccess);
+
+  // Now, we'll signal the first fence, and wait for the callback to be called.
+  signal.Wait();
+}
+
+TEST(FenceWaiterVKTest, AddFenceDoesNothingIfTerminating) {
+  auto signal = fml::ManualResetWaitableEvent();
+
+  {
+    auto const context = MockVulkanContextBuilder().Build();
+    auto const device = context->GetDevice();
+    auto const waiter = context->GetFenceWaiter();
+    waiter->Terminate();
+
+    auto fence = device.createFenceUnique({}).value;
+    waiter->AddFence(std::move(fence), [&signal]() { signal.Signal(); });
+  }
+
+  // Ensure the fence did _not_ signal.
+  EXPECT_TRUE(signal.WaitWithTimeout(fml::TimeDelta::FromMilliseconds(100)));
+}
+
+TEST(FenceWaiterVKTest, InProgressFencesStillWaitIfTerminated) {
+  MockFence* raw_fence = nullptr;
+  auto signal = fml::ManualResetWaitableEvent();
+
+  auto const context = MockVulkanContextBuilder().Build();
+  auto const device = context->GetDevice();
+  auto const waiter = context->GetFenceWaiter();
+
+  // Add a fence that isn't signalled yet.
+  auto fence = device.createFenceUnique({}).value;
+
+  // Even if the fence is eSuccess, it's not guaranteed to be called in time.
+  MockFence::SetStatus(fence, vk::Result::eNotReady);
+  raw_fence = MockFence::GetRawPointer(fence);
+  waiter->AddFence(std::move(fence), [&signal]() { signal.Signal(); });
+
+  // Terminate the waiter.
+  waiter->Terminate();
+
+  // Signal the fence.
+  raw_fence->SetStatus(vk::Result::eSuccess);
+
+  // This will hang if the fence was not signalled.
+  signal.Wait();
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/fenced_command_buffer_vk.cc b/impeller/renderer/backend/vulkan/fenced_command_buffer_vk.cc
deleted file mode 100644
index 4ebda5ed37da0cd563a278e5d23e2eb6c6086773..0000000000000000000000000000000000000000
--- a/impeller/renderer/backend/vulkan/fenced_command_buffer_vk.cc
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "impeller/renderer/backend/vulkan/fenced_command_buffer_vk.h"
-
-#include <memory>
-
-#include "impeller/base/validation.h"
-#include "impeller/renderer/backend/vulkan/deletion_queue_vk.h"
-
-namespace impeller {
-
-static vk::CommandBuffer CreateCommandBuffer(vk::Device device,
-                                             vk::CommandPool pool) {
-  vk::CommandBufferAllocateInfo allocate_info;
-  allocate_info.setLevel(vk::CommandBufferLevel::ePrimary);
-  allocate_info.setCommandBufferCount(1);
-  allocate_info.setCommandPool(pool);
-
-  auto res = device.allocateCommandBuffers(allocate_info);
-  if (res.result != vk::Result::eSuccess) {
-    VALIDATION_LOG << "Failed to allocate command buffer: "
-                   << vk::to_string(res.result);
-    return nullptr;
-  }
-
-  return res.value[0];
-}
-
-FencedCommandBufferVK::FencedCommandBufferVK(vk::Device device,
-                                             vk::Queue queue,
-                                             vk::CommandPool command_pool)
-    : device_(device),
-      queue_(queue),
-      command_pool_(command_pool),
-      deletion_queue_(std::make_unique<DeletionQueueVK>()) {
-  command_buffer_ = CreateCommandBuffer(device_, command_pool_);
-}
-
-vk::CommandBuffer FencedCommandBufferVK::Get() const {
-  return command_buffer_;
-}
-
-vk::CommandBuffer FencedCommandBufferVK::GetSingleUseChild() {
-  auto child = CreateCommandBuffer(device_, command_pool_);
-  children_.push_back(child);
-  return child;
-}
-
-FencedCommandBufferVK::~FencedCommandBufferVK() {
-  if (!submitted_) {
-    FML_LOG(WARNING)
-        << "FencedCommandBufferVK is being destroyed without being submitted.";
-    children_.push_back(command_buffer_);
-  }
-  device_.freeCommandBuffers(command_pool_, children_);
-}
-
-bool FencedCommandBufferVK::Submit() {
-  if (submitted_) {
-    VALIDATION_LOG << "Command buffer already submitted.";
-    return false;
-  }
-
-  children_.push_back(command_buffer_);
-
-  auto fence_res = device_.createFenceUnique(vk::FenceCreateInfo());
-  if (fence_res.result != vk::Result::eSuccess) {
-    VALIDATION_LOG << "Failed to create fence: "
-                   << vk::to_string(fence_res.result);
-    return false;
-  }
-  vk::UniqueFence fence = std::move(fence_res.value);
-
-  vk::SubmitInfo submit_info;
-  submit_info.setCommandBuffers(children_);
-  auto res = queue_.submit(submit_info, *fence);
-  if (res != vk::Result::eSuccess) {
-    VALIDATION_LOG << "Failed to submit command buffer: " << vk::to_string(res);
-    return false;
-  }
-
-  auto wait = device_.waitForFences(fence.get(), true, UINT64_MAX);
-  if (wait != vk::Result::eSuccess) {
-    VALIDATION_LOG << "Failed to wait for fence: " << vk::to_string(wait);
-    return false;
-  }
-
-  // cleanup all the resources held by the command buffer and its children.
-  deletion_queue_->Flush();
-
-  submitted_ = true;
-  return true;
-}
-
-DeletionQueueVK* FencedCommandBufferVK::GetDeletionQueue() const {
-  return deletion_queue_.get();
-}
-
-}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/fenced_command_buffer_vk.h b/impeller/renderer/backend/vulkan/fenced_command_buffer_vk.h
deleted file mode 100644
index 760d6f44d7e2f1e0944faf029a2dde46b219ade0..0000000000000000000000000000000000000000
--- a/impeller/renderer/backend/vulkan/fenced_command_buffer_vk.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#pragma once
-
-#include <memory>
-
-#include "flutter/fml/macros.h"
-#include "impeller/renderer/backend/vulkan/deletion_queue_vk.h"
-#include "impeller/renderer/backend/vulkan/vk.h"
-
-namespace impeller {
-
-class FencedCommandBufferVK {
- public:
-  FencedCommandBufferVK(vk::Device device,
-                        vk::Queue queue,
-                        vk::CommandPool command_pool);
-
-  ~FencedCommandBufferVK();
-
-  vk::CommandBuffer Get() const;
-
-  vk::CommandBuffer GetSingleUseChild();
-
-  // this is a blocking call that waits for the fence to be signaled.
-  bool Submit();
-
-  DeletionQueueVK* GetDeletionQueue() const;
-
- private:
-  vk::Device device_;
-  vk::Queue queue_;
-  vk::CommandPool command_pool_;
-  std::unique_ptr<DeletionQueueVK> deletion_queue_;
-  vk::CommandBuffer command_buffer_;
-  std::vector<vk::CommandBuffer> children_;
-  bool submitted_ = false;
-
-  FML_DISALLOW_COPY_AND_ASSIGN(FencedCommandBufferVK);
-};
-
-}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/formats_vk.cc b/impeller/renderer/backend/vulkan/formats_vk.cc
index 6df84d0ea489317bcfbbe30d6f7f697aa26b9580..f27452ccdbfed748d7e28cd1e9d2ecd0481eab14 100644
--- a/impeller/renderer/backend/vulkan/formats_vk.cc
+++ b/impeller/renderer/backend/vulkan/formats_vk.cc
@@ -6,6 +6,31 @@
 
 namespace impeller {
 
-//
+vk::PipelineDepthStencilStateCreateInfo ToVKPipelineDepthStencilStateCreateInfo(
+    std::optional<DepthAttachmentDescriptor> depth,
+    std::optional<StencilAttachmentDescriptor> front,
+    std::optional<StencilAttachmentDescriptor> back) {
+  vk::PipelineDepthStencilStateCreateInfo info;
+
+  if (depth.has_value()) {
+    info.depthTestEnable = true;
+    info.depthWriteEnable = depth->depth_write_enabled;
+    info.depthCompareOp = ToVKCompareOp(depth->depth_compare);
+    info.minDepthBounds = 0.0f;
+    info.maxDepthBounds = 1.0f;
+  }
+
+  if (front.has_value()) {
+    info.stencilTestEnable = true;
+    info.front = ToVKStencilOpState(*front);
+  }
+
+  if (back.has_value()) {
+    info.stencilTestEnable = true;
+    info.back = ToVKStencilOpState(*back);
+  }
+
+  return info;
+}
 
 }  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/formats_vk.h b/impeller/renderer/backend/vulkan/formats_vk.h
index 70a42203470949a842e5456d362618785fe35e26..c4383500eed802038267558b43e831c93378b6fa 100644
--- a/impeller/renderer/backend/vulkan/formats_vk.h
+++ b/impeller/renderer/backend/vulkan/formats_vk.h
@@ -2,13 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_FORMATS_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_FORMATS_VK_H_
 
+#include <cstdint>
+#include <ostream>
+
+#include "flutter/fml/hash_combine.h"
 #include "flutter/fml/macros.h"
+#include "impeller/base/validation.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/shader_types.h"
 #include "impeller/renderer/backend/vulkan/vk.h"
-#include "impeller/renderer/descriptor_set_layout.h"
-#include "impeller/renderer/formats.h"
-#include "impeller/renderer/shader_types.h"
 #include "vulkan/vulkan_enums.hpp"
 
 namespace impeller {
@@ -71,25 +76,22 @@ constexpr vk::BlendOp ToVKBlendOp(BlendOperation op) {
   FML_UNREACHABLE();
 }
 
-constexpr vk::ColorComponentFlags ToVKColorComponentFlags(
-    std::underlying_type_t<ColorWriteMask> type) {
-  using UnderlyingType = decltype(type);
-
+constexpr vk::ColorComponentFlags ToVKColorComponentFlags(ColorWriteMask type) {
   vk::ColorComponentFlags mask;
 
-  if (type & static_cast<UnderlyingType>(ColorWriteMask::kRed)) {
+  if (type & ColorWriteMaskBits::kRed) {
     mask |= vk::ColorComponentFlagBits::eR;
   }
 
-  if (type & static_cast<UnderlyingType>(ColorWriteMask::kGreen)) {
+  if (type & ColorWriteMaskBits::kGreen) {
     mask |= vk::ColorComponentFlagBits::eG;
   }
 
-  if (type & static_cast<UnderlyingType>(ColorWriteMask::kBlue)) {
+  if (type & ColorWriteMaskBits::kBlue) {
     mask |= vk::ColorComponentFlagBits::eB;
   }
 
-  if (type & static_cast<UnderlyingType>(ColorWriteMask::kAlpha)) {
+  if (type & ColorWriteMaskBits::kAlpha) {
     mask |= vk::ColorComponentFlagBits::eA;
   }
 
@@ -124,10 +126,6 @@ constexpr std::optional<vk::ShaderStageFlagBits> ToVKShaderStageFlagBits(
       return vk::ShaderStageFlagBits::eVertex;
     case ShaderStage::kFragment:
       return vk::ShaderStageFlagBits::eFragment;
-    case ShaderStage::kTessellationControl:
-      return vk::ShaderStageFlagBits::eTessellationControl;
-    case ShaderStage::kTessellationEvaluation:
-      return vk::ShaderStageFlagBits::eTessellationEvaluation;
     case ShaderStage::kCompute:
       return vk::ShaderStageFlagBits::eCompute;
   }
@@ -137,8 +135,12 @@ constexpr std::optional<vk::ShaderStageFlagBits> ToVKShaderStageFlagBits(
 constexpr vk::Format ToVKImageFormat(PixelFormat format) {
   switch (format) {
     case PixelFormat::kUnknown:
+    case PixelFormat::kB10G10R10XR:
+    case PixelFormat::kB10G10R10A10XR:
+    case PixelFormat::kB10G10R10XRSRGB:
       return vk::Format::eUndefined;
     case PixelFormat::kA8UNormInt:
+      // TODO(csg): This is incorrect. Don't depend on swizzle support for GLES.
       return vk::Format::eR8Unorm;
     case PixelFormat::kR8G8B8A8UNormInt:
       return vk::Format::eR8G8B8A8Unorm;
@@ -148,8 +150,16 @@ constexpr vk::Format ToVKImageFormat(PixelFormat format) {
       return vk::Format::eB8G8R8A8Unorm;
     case PixelFormat::kB8G8R8A8UNormIntSRGB:
       return vk::Format::eB8G8R8A8Srgb;
+    case PixelFormat::kR32G32B32A32Float:
+      return vk::Format::eR32G32B32A32Sfloat;
+    case PixelFormat::kR16G16B16A16Float:
+      return vk::Format::eR16G16B16A16Sfloat;
     case PixelFormat::kS8UInt:
       return vk::Format::eS8Uint;
+    case PixelFormat::kD24UnormS8Uint:
+      return vk::Format::eD24UnormS8Uint;
+    case PixelFormat::kD32FloatS8UInt:
+      return vk::Format::eD32SfloatS8Uint;
     case PixelFormat::kR8UNormInt:
       return vk::Format::eR8Unorm;
     case PixelFormat::kR8G8UNormInt:
@@ -163,28 +173,28 @@ constexpr PixelFormat ToPixelFormat(vk::Format format) {
   switch (format) {
     case vk::Format::eUndefined:
       return PixelFormat::kUnknown;
-
     case vk::Format::eR8G8B8A8Unorm:
       return PixelFormat::kR8G8B8A8UNormInt;
-
     case vk::Format::eR8G8B8A8Srgb:
       return PixelFormat::kR8G8B8A8UNormIntSRGB;
-
     case vk::Format::eB8G8R8A8Unorm:
       return PixelFormat::kB8G8R8A8UNormInt;
-
     case vk::Format::eB8G8R8A8Srgb:
       return PixelFormat::kB8G8R8A8UNormIntSRGB;
-
+    case vk::Format::eR32G32B32A32Sfloat:
+      return PixelFormat::kR32G32B32A32Float;
+    case vk::Format::eR16G16B16A16Sfloat:
+      return PixelFormat::kR16G16B16A16Float;
     case vk::Format::eS8Uint:
       return PixelFormat::kS8UInt;
-
+    case vk::Format::eD24UnormS8Uint:
+      return PixelFormat::kD24UnormS8Uint;
+    case vk::Format::eD32SfloatS8Uint:
+      return PixelFormat::kD32FloatS8UInt;
     case vk::Format::eR8Unorm:
       return PixelFormat::kR8UNormInt;
-
     case vk::Format::eR8G8Unorm:
       return PixelFormat::kR8G8UNormInt;
-
     default:
       return PixelFormat::kUnknown;
   }
@@ -197,6 +207,8 @@ constexpr vk::SampleCountFlagBits ToVKSampleCount(SampleCount sample_count) {
     case SampleCount::kCount4:
       return vk::SampleCountFlagBits::e4;
   }
+
+  FML_UNREACHABLE();
 }
 
 constexpr vk::Filter ToVKSamplerMinMagFilter(MinMagFilter filter) {
@@ -211,14 +223,11 @@ constexpr vk::Filter ToVKSamplerMinMagFilter(MinMagFilter filter) {
 }
 
 constexpr vk::SamplerMipmapMode ToVKSamplerMipmapMode(MipFilter filter) {
-  vk::SamplerCreateInfo sampler_info;
   switch (filter) {
     case MipFilter::kNearest:
       return vk::SamplerMipmapMode::eNearest;
     case MipFilter::kLinear:
       return vk::SamplerMipmapMode::eLinear;
-    case MipFilter::kNone:
-      return vk::SamplerMipmapMode::eNearest;
   }
 
   FML_UNREACHABLE();
@@ -233,6 +242,8 @@ constexpr vk::SamplerAddressMode ToVKSamplerAddressMode(
       return vk::SamplerAddressMode::eMirroredRepeat;
     case SamplerAddressMode::kClampToEdge:
       return vk::SamplerAddressMode::eClampToEdge;
+    case SamplerAddressMode::kDecal:
+      return vk::SamplerAddressMode::eClampToBorder;
   }
 
   FML_UNREACHABLE();
@@ -244,10 +255,6 @@ constexpr vk::ShaderStageFlags ToVkShaderStage(ShaderStage stage) {
       return vk::ShaderStageFlagBits::eAll;
     case ShaderStage::kFragment:
       return vk::ShaderStageFlagBits::eFragment;
-    case ShaderStage::kTessellationControl:
-      return vk::ShaderStageFlagBits::eTessellationControl;
-    case ShaderStage::kTessellationEvaluation:
-      return vk::ShaderStageFlagBits::eTessellationEvaluation;
     case ShaderStage::kCompute:
       return vk::ShaderStageFlagBits::eCompute;
     case ShaderStage::kVertex:
@@ -257,21 +264,36 @@ constexpr vk::ShaderStageFlags ToVkShaderStage(ShaderStage stage) {
   FML_UNREACHABLE();
 }
 
-constexpr vk::DescriptorSetLayoutBinding ToVKDescriptorSetLayoutBinding(
-    const DescriptorSetLayout& layout) {
-  vk::DescriptorSetLayoutBinding binding;
-  binding.binding = layout.binding;
-  binding.descriptorCount = layout.descriptor_count;
-  vk::DescriptorType desc_type = vk::DescriptorType();
-  switch (layout.descriptor_type) {
+constexpr vk::DescriptorType ToVKDescriptorType(DescriptorType type) {
+  switch (type) {
     case DescriptorType::kSampledImage:
-      desc_type = vk::DescriptorType::eCombinedImageSampler;
+      return vk::DescriptorType::eCombinedImageSampler;
       break;
     case DescriptorType::kUniformBuffer:
-      desc_type = vk::DescriptorType::eUniformBuffer;
+      return vk::DescriptorType::eUniformBuffer;
+      break;
+    case DescriptorType::kStorageBuffer:
+      return vk::DescriptorType::eStorageBuffer;
+      break;
+    case DescriptorType::kImage:
+      return vk::DescriptorType::eSampledImage;
       break;
+    case DescriptorType::kSampler:
+      return vk::DescriptorType::eSampler;
+      break;
+    case DescriptorType::kInputAttachment:
+      return vk::DescriptorType::eInputAttachment;
   }
-  binding.descriptorType = desc_type;
+
+  FML_UNREACHABLE();
+}
+
+constexpr vk::DescriptorSetLayoutBinding ToVKDescriptorSetLayoutBinding(
+    const DescriptorSetLayout& layout) {
+  vk::DescriptorSetLayoutBinding binding;
+  binding.binding = layout.binding;
+  binding.descriptorCount = 1u;
+  binding.descriptorType = ToVKDescriptorType(layout.descriptor_type);
   binding.stageFlags = ToVkShaderStage(layout.shader_stage);
   return binding;
 }
@@ -289,19 +311,39 @@ constexpr vk::AttachmentLoadOp ToVKAttachmentLoadOp(LoadAction load_action) {
   FML_UNREACHABLE();
 }
 
-constexpr vk::AttachmentStoreOp ToVKAttachmentStoreOp(
-    StoreAction store_action) {
+constexpr vk::AttachmentStoreOp ToVKAttachmentStoreOp(StoreAction store_action,
+                                                      bool is_resolve_texture) {
   switch (store_action) {
     case StoreAction::kStore:
+      // Both MSAA and resolve textures need to be stored. A resolve is NOT
+      // performed.
       return vk::AttachmentStoreOp::eStore;
     case StoreAction::kDontCare:
+      // Both MSAA and resolve textures can be discarded. A resolve is NOT
+      // performed.
       return vk::AttachmentStoreOp::eDontCare;
     case StoreAction::kMultisampleResolve:
+      // The resolve texture is stored but the MSAA texture can be discarded. A
+      // resolve IS performed.
+      return is_resolve_texture ? vk::AttachmentStoreOp::eStore
+                                : vk::AttachmentStoreOp::eDontCare;
     case StoreAction::kStoreAndMultisampleResolve:
-      // TODO (kaushikiska): vulkan doesn't support multisample resolve.
-      return vk::AttachmentStoreOp::eDontCare;
+      // Both MSAA and resolve textures need to be stored. A resolve IS
+      // performed.
+      return vk::AttachmentStoreOp::eStore;
   }
+  FML_UNREACHABLE();
+}
 
+constexpr bool StoreActionPerformsResolve(StoreAction store_action) {
+  switch (store_action) {
+    case StoreAction::kDontCare:
+    case StoreAction::kStore:
+      return false;
+    case StoreAction::kMultisampleResolve:
+    case StoreAction::kStoreAndMultisampleResolve:
+      return true;
+  }
   FML_UNREACHABLE();
 }
 
@@ -313,9 +355,23 @@ constexpr vk::IndexType ToVKIndexType(IndexType index_type) {
       return vk::IndexType::eUint32;
     case IndexType::kUnknown:
       return vk::IndexType::eUint32;
+    case IndexType::kNone:
+      FML_UNREACHABLE();
   }
 
   FML_UNREACHABLE();
+  return vk::IndexType::eUint16;
+}
+
+constexpr vk::PolygonMode ToVKPolygonMode(PolygonMode mode) {
+  switch (mode) {
+    case PolygonMode::kFill:
+      return vk::PolygonMode::eFill;
+    case PolygonMode::kLine:
+      return vk::PolygonMode::eLine;
+  }
+  FML_UNREACHABLE();
+  return vk::PolygonMode::eFill;
 }
 
 constexpr vk::PrimitiveTopology ToVKPrimitiveTopology(PrimitiveType primitive) {
@@ -333,6 +389,216 @@ constexpr vk::PrimitiveTopology ToVKPrimitiveTopology(PrimitiveType primitive) {
   }
 
   FML_UNREACHABLE();
+  return vk::PrimitiveTopology::eTriangleList;
+}
+
+constexpr bool PixelFormatIsDepthStencil(PixelFormat format) {
+  switch (format) {
+    case PixelFormat::kUnknown:
+    case PixelFormat::kA8UNormInt:
+    case PixelFormat::kR8UNormInt:
+    case PixelFormat::kR8G8UNormInt:
+    case PixelFormat::kR8G8B8A8UNormInt:
+    case PixelFormat::kR8G8B8A8UNormIntSRGB:
+    case PixelFormat::kB8G8R8A8UNormInt:
+    case PixelFormat::kB8G8R8A8UNormIntSRGB:
+    case PixelFormat::kR32G32B32A32Float:
+    case PixelFormat::kR16G16B16A16Float:
+    case PixelFormat::kB10G10R10XR:
+    case PixelFormat::kB10G10R10XRSRGB:
+    case PixelFormat::kB10G10R10A10XR:
+      return false;
+    case PixelFormat::kS8UInt:
+    case PixelFormat::kD24UnormS8Uint:
+    case PixelFormat::kD32FloatS8UInt:
+      return true;
+  }
+  return false;
+}
+
+static constexpr vk::AttachmentReference kUnusedAttachmentReference = {
+    VK_ATTACHMENT_UNUSED, vk::ImageLayout::eUndefined};
+
+constexpr vk::CullModeFlags ToVKCullModeFlags(CullMode mode) {
+  switch (mode) {
+    case CullMode::kNone:
+      return vk::CullModeFlagBits::eNone;
+    case CullMode::kFrontFace:
+      return vk::CullModeFlagBits::eFront;
+    case CullMode::kBackFace:
+      return vk::CullModeFlagBits::eBack;
+  }
+  FML_UNREACHABLE();
+  return vk::CullModeFlagBits::eNone;
+}
+
+constexpr vk::CompareOp ToVKCompareOp(CompareFunction op) {
+  switch (op) {
+    case CompareFunction::kNever:
+      return vk::CompareOp::eNever;
+    case CompareFunction::kAlways:
+      return vk::CompareOp::eAlways;
+    case CompareFunction::kLess:
+      return vk::CompareOp::eLess;
+    case CompareFunction::kEqual:
+      return vk::CompareOp::eEqual;
+    case CompareFunction::kLessEqual:
+      return vk::CompareOp::eLessOrEqual;
+    case CompareFunction::kGreater:
+      return vk::CompareOp::eGreater;
+    case CompareFunction::kNotEqual:
+      return vk::CompareOp::eNotEqual;
+    case CompareFunction::kGreaterEqual:
+      return vk::CompareOp::eGreaterOrEqual;
+  }
+  FML_UNREACHABLE();
+  return vk::CompareOp::eNever;
+}
+
+constexpr vk::StencilOp ToVKStencilOp(StencilOperation op) {
+  switch (op) {
+    case StencilOperation::kKeep:
+      return vk::StencilOp::eKeep;
+    case StencilOperation::kZero:
+      return vk::StencilOp::eZero;
+    case StencilOperation::kSetToReferenceValue:
+      return vk::StencilOp::eReplace;
+    case StencilOperation::kIncrementClamp:
+      return vk::StencilOp::eIncrementAndClamp;
+    case StencilOperation::kDecrementClamp:
+      return vk::StencilOp::eDecrementAndClamp;
+    case StencilOperation::kInvert:
+      return vk::StencilOp::eInvert;
+    case StencilOperation::kIncrementWrap:
+      return vk::StencilOp::eIncrementAndWrap;
+    case StencilOperation::kDecrementWrap:
+      return vk::StencilOp::eDecrementAndWrap;
+      break;
+  }
+  FML_UNREACHABLE();
+  return vk::StencilOp::eKeep;
+}
+
+constexpr vk::StencilOpState ToVKStencilOpState(
+    const StencilAttachmentDescriptor& desc) {
+  vk::StencilOpState state;
+  state.failOp = ToVKStencilOp(desc.stencil_failure);
+  state.passOp = ToVKStencilOp(desc.depth_stencil_pass);
+  state.depthFailOp = ToVKStencilOp(desc.depth_failure);
+  state.compareOp = ToVKCompareOp(desc.stencil_compare);
+  state.compareMask = desc.read_mask;
+  state.writeMask = desc.write_mask;
+  // This is irrelevant as the stencil references are always dynamic state and
+  // will be set in the render pass.
+  state.reference = 1988;
+  return state;
+}
+
+constexpr vk::ImageAspectFlags ToVKImageAspectFlags(PixelFormat format) {
+  switch (format) {
+    case PixelFormat::kUnknown:
+    case PixelFormat::kA8UNormInt:
+    case PixelFormat::kR8UNormInt:
+    case PixelFormat::kR8G8UNormInt:
+    case PixelFormat::kR8G8B8A8UNormInt:
+    case PixelFormat::kR8G8B8A8UNormIntSRGB:
+    case PixelFormat::kB8G8R8A8UNormInt:
+    case PixelFormat::kB8G8R8A8UNormIntSRGB:
+    case PixelFormat::kR32G32B32A32Float:
+    case PixelFormat::kR16G16B16A16Float:
+    case PixelFormat::kB10G10R10XR:
+    case PixelFormat::kB10G10R10XRSRGB:
+    case PixelFormat::kB10G10R10A10XR:
+      return vk::ImageAspectFlagBits::eColor;
+    case PixelFormat::kS8UInt:
+      return vk::ImageAspectFlagBits::eStencil;
+    case PixelFormat::kD24UnormS8Uint:
+    case PixelFormat::kD32FloatS8UInt:
+      return vk::ImageAspectFlagBits::eDepth |
+             vk::ImageAspectFlagBits::eStencil;
+  }
+  FML_UNREACHABLE();
+  return vk::ImageAspectFlagBits::eColor;
+}
+
+constexpr uint32_t ToArrayLayerCount(TextureType type) {
+  switch (type) {
+    case TextureType::kTexture2D:
+    case TextureType::kTexture2DMultisample:
+      return 1u;
+    case TextureType::kTextureCube:
+      return 6u;
+    case TextureType::kTextureExternalOES:
+      VALIDATION_LOG
+          << "kTextureExternalOES can not be used with the Vulkan backend.";
+  }
+  FML_UNREACHABLE();
+  return 1u;
+}
+
+constexpr vk::ImageViewType ToVKImageViewType(TextureType type) {
+  switch (type) {
+    case TextureType::kTexture2D:
+    case TextureType::kTexture2DMultisample:
+      return vk::ImageViewType::e2D;
+    case TextureType::kTextureCube:
+      return vk::ImageViewType::eCube;
+    case TextureType::kTextureExternalOES:
+      VALIDATION_LOG
+          << "kTextureExternalOES can not be used with the Vulkan backend.";
+  }
+  FML_UNREACHABLE();
+  return vk::ImageViewType::e2D;
+}
+
+constexpr vk::ImageCreateFlags ToVKImageCreateFlags(TextureType type) {
+  switch (type) {
+    case TextureType::kTexture2D:
+    case TextureType::kTexture2DMultisample:
+      return {};
+    case TextureType::kTextureCube:
+      return vk::ImageCreateFlagBits::eCubeCompatible;
+    case TextureType::kTextureExternalOES:
+      VALIDATION_LOG
+          << "kTextureExternalOES can not be used with the Vulkan backend.";
+  }
+  FML_UNREACHABLE();
+  return {};
+}
+
+vk::PipelineDepthStencilStateCreateInfo ToVKPipelineDepthStencilStateCreateInfo(
+    std::optional<DepthAttachmentDescriptor> depth,
+    std::optional<StencilAttachmentDescriptor> front,
+    std::optional<StencilAttachmentDescriptor> back);
+
+constexpr vk::ImageAspectFlags ToImageAspectFlags(PixelFormat format) {
+  switch (format) {
+    case PixelFormat::kUnknown:
+      return {};
+    case PixelFormat::kA8UNormInt:
+    case PixelFormat::kR8UNormInt:
+    case PixelFormat::kR8G8UNormInt:
+    case PixelFormat::kR8G8B8A8UNormInt:
+    case PixelFormat::kR8G8B8A8UNormIntSRGB:
+    case PixelFormat::kB8G8R8A8UNormInt:
+    case PixelFormat::kB8G8R8A8UNormIntSRGB:
+    case PixelFormat::kR32G32B32A32Float:
+    case PixelFormat::kR16G16B16A16Float:
+    case PixelFormat::kB10G10R10XR:
+    case PixelFormat::kB10G10R10XRSRGB:
+    case PixelFormat::kB10G10R10A10XR:
+      return vk::ImageAspectFlagBits::eColor;
+    case PixelFormat::kS8UInt:
+      return vk::ImageAspectFlagBits::eStencil;
+    case PixelFormat::kD24UnormS8Uint:
+    case PixelFormat::kD32FloatS8UInt:
+      return vk::ImageAspectFlagBits::eDepth |
+             vk::ImageAspectFlagBits::eStencil;
+  }
+  FML_UNREACHABLE();
+  return {};
 }
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_FORMATS_VK_H_
diff --git a/impeller/renderer/backend/vulkan/gpu_tracer_vk.cc b/impeller/renderer/backend/vulkan/gpu_tracer_vk.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a0e5a8b49c3b53815952cfa9b54f6ea2a57d074c
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/gpu_tracer_vk.cc
@@ -0,0 +1,252 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/backend/vulkan/gpu_tracer_vk.h"
+
+#include <memory>
+#include <optional>
+#include <thread>
+#include <utility>
+
+#include "fml/logging.h"
+#include "fml/trace_event.h"
+#include "impeller/base/validation.h"
+#include "impeller/renderer/backend/vulkan/command_buffer_vk.h"
+#include "impeller/renderer/backend/vulkan/command_encoder_vk.h"
+#include "impeller/renderer/backend/vulkan/context_vk.h"
+
+#include "vulkan/vulkan.hpp"
+
+namespace impeller {
+
+static constexpr uint32_t kPoolSize = 128u;
+
+GPUTracerVK::GPUTracerVK(std::weak_ptr<ContextVK> context,
+                         bool enable_gpu_tracing)
+    : context_(std::move(context)) {
+  if (!enable_gpu_tracing) {
+    return;
+  }
+  timestamp_period_ = context_.lock()
+                          ->GetDeviceHolder()
+                          ->GetPhysicalDevice()
+                          .getProperties()
+                          .limits.timestampPeriod;
+  if (timestamp_period_ <= 0) {
+    // The device does not support timestamp queries.
+    return;
+  }
+// Disable tracing in release mode.
+#ifdef IMPELLER_DEBUG
+  enabled_ = true;
+#endif  // IMPELLER_DEBUG
+}
+
+void GPUTracerVK::InitializeQueryPool(const ContextVK& context) {
+  if (!enabled_) {
+    return;
+  }
+  Lock lock(trace_state_mutex_);
+  std::shared_ptr<CommandBuffer> buffer = context.CreateCommandBuffer();
+  CommandBufferVK& buffer_vk = CommandBufferVK::Cast(*buffer);
+
+  for (auto i = 0u; i < kTraceStatesSize; i++) {
+    vk::QueryPoolCreateInfo info;
+    info.queryCount = kPoolSize;
+    info.queryType = vk::QueryType::eTimestamp;
+
+    auto [status, pool] = context.GetDevice().createQueryPoolUnique(info);
+    if (status != vk::Result::eSuccess) {
+      VALIDATION_LOG << "Failed to create query pool.";
+      return;
+    }
+    trace_states_[i].query_pool = std::move(pool);
+    buffer_vk.GetEncoder()->GetCommandBuffer().resetQueryPool(
+        trace_states_[i].query_pool.get(), 0, kPoolSize);
+  }
+  if (!context.GetCommandQueue()->Submit({buffer}).ok()) {
+    VALIDATION_LOG << "Failed to reset query pool for trace events.";
+    enabled_ = false;
+  }
+}
+
+bool GPUTracerVK::IsEnabled() const {
+  return enabled_;
+}
+
+void GPUTracerVK::MarkFrameStart() {
+  if (!enabled_) {
+    return;
+  }
+  FML_DCHECK(!in_frame_);
+  in_frame_ = true;
+  raster_thread_id_ = std::this_thread::get_id();
+}
+
+void GPUTracerVK::MarkFrameEnd() {
+  in_frame_ = false;
+
+  if (!enabled_) {
+    return;
+  }
+
+  Lock lock(trace_state_mutex_);
+  current_state_ = (current_state_ + 1) % kTraceStatesSize;
+
+  auto& state = trace_states_[current_state_];
+  // If there are still pending buffers on the trace state we're switching to,
+  // that means that a cmd buffer we were relying on to signal this likely
+  // never finished. This shouldn't happen unless there is a bug in the
+  // encoder logic. We set it to zero anyway to prevent a validation error
+  // from becoming a memory leak.
+  FML_DCHECK(state.pending_buffers == 0u);
+  state.pending_buffers = 0;
+  state.current_index = 0;
+}
+
+std::unique_ptr<GPUProbe> GPUTracerVK::CreateGPUProbe() {
+  return std::make_unique<GPUProbe>(weak_from_this());
+}
+
+void GPUTracerVK::RecordCmdBufferStart(const vk::CommandBuffer& buffer,
+                                       GPUProbe& probe) {
+  if (!enabled_ || std::this_thread::get_id() != raster_thread_id_ ||
+      !in_frame_) {
+    return;
+  }
+  Lock lock(trace_state_mutex_);
+  auto& state = trace_states_[current_state_];
+
+  // Reset previously completed queries.
+  if (!states_to_reset_.empty()) {
+    for (auto i = 0u; i < states_to_reset_.size(); i++) {
+      buffer.resetQueryPool(trace_states_[states_to_reset_[i]].query_pool.get(),
+                            0, kPoolSize);
+    }
+    states_to_reset_.clear();
+  }
+
+  // We size the query pool to kPoolSize, but Flutter applications can create an
+  // unbounded amount of work per frame. If we encounter this, stop recording
+  // cmds.
+  if (state.current_index >= kPoolSize) {
+    return;
+  }
+
+  buffer.writeTimestamp(vk::PipelineStageFlagBits::eTopOfPipe,
+                        trace_states_[current_state_].query_pool.get(),
+                        state.current_index);
+  state.current_index += 1;
+  probe.index_ = current_state_;
+  state.pending_buffers += 1;
+}
+
+void GPUTracerVK::RecordCmdBufferEnd(const vk::CommandBuffer& buffer,
+                                     GPUProbe& probe) {
+  if (!enabled_ || std::this_thread::get_id() != raster_thread_id_ ||
+      !in_frame_ || !probe.index_.has_value()) {
+    return;
+  }
+  Lock lock(trace_state_mutex_);
+  GPUTraceState& state = trace_states_[current_state_];
+
+  if (state.current_index >= kPoolSize) {
+    return;
+  }
+
+  buffer.writeTimestamp(vk::PipelineStageFlagBits::eBottomOfPipe,
+                        state.query_pool.get(), state.current_index);
+
+  state.current_index += 1;
+}
+
+void GPUTracerVK::OnFenceComplete(size_t frame_index) {
+  if (!enabled_) {
+    return;
+  }
+
+  size_t pending = 0;
+  size_t query_count = 0;
+  vk::QueryPool pool;
+  {
+    Lock lock(trace_state_mutex_);
+    GPUTraceState& state = trace_states_[frame_index];
+
+    FML_DCHECK(state.pending_buffers > 0);
+    state.pending_buffers -= 1;
+    pending = state.pending_buffers;
+    query_count = state.current_index;
+    pool = state.query_pool.get();
+  }
+
+  if (pending == 0) {
+    std::vector<uint64_t> bits(query_count);
+    std::shared_ptr<ContextVK> context = context_.lock();
+    if (!context) {
+      return;
+    }
+
+    auto result = context->GetDevice().getQueryPoolResults(
+        pool, 0, query_count, query_count * sizeof(uint64_t), bits.data(),
+        sizeof(uint64_t), vk::QueryResultFlagBits::e64);
+    // This may return VK_NOT_READY if the query couldn't be completed, or if
+    // there are queries still pending. From local testing, this happens
+    // occassionally on very expensive frames. Its unclear if we can do anything
+    // about this, because by design this should only signal after all cmd
+    // buffers have signaled. Adding VK_QUERY_RESULT_WAIT_BIT to the flags
+    // passed to getQueryPoolResults seems like it would fix this, but actually
+    // seems to result in more stuck query errors. Better to just drop them and
+    // move on.
+    if (result == vk::Result::eSuccess) {
+      uint64_t smallest_timestamp = std::numeric_limits<uint64_t>::max();
+      uint64_t largest_timestamp = 0;
+      for (auto i = 0u; i < bits.size(); i++) {
+        smallest_timestamp = std::min(smallest_timestamp, bits[i]);
+        largest_timestamp = std::max(largest_timestamp, bits[i]);
+      }
+      auto gpu_ms =
+          (((largest_timestamp - smallest_timestamp) * timestamp_period_) /
+           1000000);
+      FML_TRACE_COUNTER("flutter", "GPUTracer",
+                        reinterpret_cast<int64_t>(this),  // Trace Counter ID
+                        "FrameTimeMS", gpu_ms);
+    }
+
+    // Record this query to be reset the next time a command is recorded.
+    Lock lock(trace_state_mutex_);
+    states_to_reset_.push_back(frame_index);
+  }
+}
+
+GPUProbe::GPUProbe(const std::weak_ptr<GPUTracerVK>& tracer)
+    : tracer_(tracer) {}
+
+GPUProbe::~GPUProbe() {
+  if (!index_.has_value()) {
+    return;
+  }
+  auto tracer = tracer_.lock();
+  if (!tracer) {
+    return;
+  }
+  tracer->OnFenceComplete(index_.value());
+}
+
+void GPUProbe::RecordCmdBufferStart(const vk::CommandBuffer& buffer) {
+  auto tracer = tracer_.lock();
+  if (!tracer) {
+    return;
+  }
+  tracer->RecordCmdBufferStart(buffer, *this);
+}
+
+void GPUProbe::RecordCmdBufferEnd(const vk::CommandBuffer& buffer) {
+  auto tracer = tracer_.lock();
+  if (!tracer) {
+    return;
+  }
+  tracer->RecordCmdBufferEnd(buffer, *this);
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/gpu_tracer_vk.h b/impeller/renderer/backend/vulkan/gpu_tracer_vk.h
new file mode 100644
index 0000000000000000000000000000000000000000..ee6c0e4c34601ac8e5d70615e9f6a1a1d49103c6
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/gpu_tracer_vk.h
@@ -0,0 +1,127 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_GPU_TRACER_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_GPU_TRACER_VK_H_
+
+#include <memory>
+#include <thread>
+
+#include "impeller/renderer/backend/vulkan/context_vk.h"
+#include "impeller/renderer/backend/vulkan/device_holder_vk.h"
+#include "vulkan/vulkan_handles.hpp"
+
+namespace impeller {
+
+class GPUProbe;
+
+/// @brief A class that uses timestamp queries to record the approximate GPU
+/// execution time.
+///
+/// To enable, add the following metadata to the application's Android manifest:
+///   <meta-data
+///       android:name="io.flutter.embedding.android.EnableVulkanGPUTracing"
+///       android:value="false" />
+class GPUTracerVK : public std::enable_shared_from_this<GPUTracerVK> {
+ public:
+  GPUTracerVK(std::weak_ptr<ContextVK> context, bool enable_gpu_tracing);
+
+  ~GPUTracerVK() = default;
+
+  /// @brief Create a GPUProbe to trace the execution of a command buffer on the
+  ///        GPU.
+  std::unique_ptr<GPUProbe> CreateGPUProbe();
+
+  /// @brief Signal the start of a frame workload.
+  ///
+  ///        Any cmd buffers that are created after this call and before
+  ///        [MarkFrameEnd] will be attributed to the current frame.
+  void MarkFrameStart();
+
+  /// @brief Signal the end of a frame workload.
+  void MarkFrameEnd();
+
+  // visible for testing.
+  bool IsEnabled() const;
+
+  /// Initialize the set of query pools.
+  void InitializeQueryPool(const ContextVK& context);
+
+ private:
+  friend class GPUProbe;
+
+  static const constexpr size_t kTraceStatesSize = 16u;
+
+  /// @brief Signal that the cmd buffer is completed.
+  ///
+  ///        If [frame_index] is std::nullopt, this frame recording is ignored.
+  void OnFenceComplete(size_t frame);
+
+  /// @brief Record a timestamp query into the provided cmd buffer to record
+  ///        start time.
+  void RecordCmdBufferStart(const vk::CommandBuffer& buffer, GPUProbe& probe);
+
+  /// @brief Record a timestamp query into the provided cmd buffer to record end
+  ///        time.
+  void RecordCmdBufferEnd(const vk::CommandBuffer& buffer, GPUProbe& probe);
+
+  std::weak_ptr<ContextVK> context_;
+
+  struct GPUTraceState {
+    size_t current_index = 0;
+    size_t pending_buffers = 0;
+    vk::UniqueQueryPool query_pool;
+  };
+
+  mutable Mutex trace_state_mutex_;
+  GPUTraceState trace_states_[kTraceStatesSize] IPLR_GUARDED_BY(
+      trace_state_mutex_);
+  size_t current_state_ IPLR_GUARDED_BY(trace_state_mutex_) = 0u;
+  std::vector<size_t> IPLR_GUARDED_BY(trace_state_mutex_) states_to_reset_ = {};
+
+  // The number of nanoseconds for each timestamp unit.
+  float timestamp_period_ = 1;
+
+  // If in_frame_ is not true, then this cmd buffer was started as a part of
+  // some non-frame workload like image decoding. We should not record this as
+  // part of the frame workload, as the gap between this non-frame and a
+  // frameworkload may be substantial. For example, support the engine creates a
+  // cmd buffer to perform an image upload at timestamp 0 and then 30 ms later
+  // actually renders a frame. Without the in_frame_ guard, the GPU frame time
+  // would include this 30ms gap during which the engine was idle.
+  bool in_frame_ = false;
+
+  // Track the raster thread id to avoid recording mipmap/image cmd buffers
+  // that are not guaranteed to start/end according to frame boundaries.
+  std::thread::id raster_thread_id_;
+  bool enabled_ = false;
+};
+
+class GPUProbe {
+ public:
+  explicit GPUProbe(const std::weak_ptr<GPUTracerVK>& tracer);
+
+  GPUProbe(GPUProbe&&) = delete;
+  GPUProbe& operator=(GPUProbe&&) = delete;
+
+  ~GPUProbe();
+
+  /// @brief Record a timestamp query into the provided cmd buffer to record
+  ///        start time.
+  void RecordCmdBufferStart(const vk::CommandBuffer& buffer);
+
+  /// @brief Record a timestamp query into the provided cmd buffer to record end
+  ///        time.
+  void RecordCmdBufferEnd(const vk::CommandBuffer& buffer);
+
+ private:
+  friend class GPUTracerVK;
+
+  std::weak_ptr<GPUTracerVK> tracer_;
+  std::optional<size_t> index_ = std::nullopt;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_GPU_TRACER_VK_H_
diff --git a/impeller/renderer/backend/vulkan/limits_vk.h b/impeller/renderer/backend/vulkan/limits_vk.h
new file mode 100644
index 0000000000000000000000000000000000000000..4303d7d94db60877e0226dc9ae9135fd7e41eac0
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/limits_vk.h
@@ -0,0 +1,17 @@
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_LIMITS_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_LIMITS_VK_H_
+
+#include <stdint.h>
+
+namespace impeller {
+
+// Maximum size to use VMA image suballocation. Any allocation greater than or
+// equal to this value will use a dedicated VkDeviceMemory.
+//
+// This value was taken from ANGLE.
+constexpr size_t kImageSizeThresholdForDedicatedMemoryAllocation =
+    4 * 1024 * 1024;
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_LIMITS_VK_H_
diff --git a/impeller/renderer/backend/vulkan/pipeline_cache_vk.cc b/impeller/renderer/backend/vulkan/pipeline_cache_vk.cc
new file mode 100644
index 0000000000000000000000000000000000000000..49ee504e5bbcd40c901ba130c2398a4ee2aeeffa
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/pipeline_cache_vk.cc
@@ -0,0 +1,194 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// FLUTTER_NOLINT: https://github.com/flutter/flutter/issues/123467
+
+#include "impeller/renderer/backend/vulkan/pipeline_cache_vk.h"
+
+#include <sstream>
+
+#include "flutter/fml/mapping.h"
+#include "impeller/base/validation.h"
+
+namespace impeller {
+
+static constexpr const char* kPipelineCacheFileName =
+    "flutter.impeller.vkcache";
+
+static bool VerifyExistingCache(const fml::Mapping& mapping,
+                                const CapabilitiesVK& caps) {
+  return true;
+}
+
+static std::shared_ptr<fml::Mapping> DecorateCacheWithMetadata(
+    std::shared_ptr<fml::Mapping> data) {
+  return data;
+}
+
+static std::unique_ptr<fml::Mapping> RemoveMetadataFromCache(
+    std::unique_ptr<fml::Mapping> data) {
+  return data;
+}
+
+static std::unique_ptr<fml::Mapping> OpenCacheFile(
+    const fml::UniqueFD& base_directory,
+    const std::string& cache_file_name,
+    const CapabilitiesVK& caps) {
+  if (!base_directory.is_valid()) {
+    return nullptr;
+  }
+  std::unique_ptr<fml::Mapping> mapping =
+      fml::FileMapping::CreateReadOnly(base_directory, cache_file_name);
+  if (!mapping) {
+    return nullptr;
+  }
+  if (!VerifyExistingCache(*mapping, caps)) {
+    return nullptr;
+  }
+  mapping = RemoveMetadataFromCache(std::move(mapping));
+  if (!mapping) {
+    return nullptr;
+  }
+  return mapping;
+}
+
+PipelineCacheVK::PipelineCacheVK(std::shared_ptr<const Capabilities> caps,
+                                 std::shared_ptr<DeviceHolderVK> device_holder,
+                                 fml::UniqueFD cache_directory)
+    : caps_(std::move(caps)),
+      device_holder_(device_holder),
+      cache_directory_(std::move(cache_directory)) {
+  if (!caps_ || !device_holder->GetDevice()) {
+    return;
+  }
+
+  const auto& vk_caps = CapabilitiesVK::Cast(*caps_);
+
+  auto existing_cache_data =
+      OpenCacheFile(cache_directory_, kPipelineCacheFileName, vk_caps);
+
+  vk::PipelineCacheCreateInfo cache_info;
+  if (existing_cache_data) {
+    cache_info.initialDataSize = existing_cache_data->GetSize();
+    cache_info.pInitialData = existing_cache_data->GetMapping();
+  }
+
+  auto [result, existing_cache] =
+      device_holder->GetDevice().createPipelineCacheUnique(cache_info);
+
+  if (result == vk::Result::eSuccess) {
+    cache_ = std::move(existing_cache);
+  } else {
+    // Even though we perform consistency checks because we don't trust the
+    // driver, the driver may have additional information that may cause it to
+    // reject the cache too.
+    FML_LOG(INFO) << "Existing pipeline cache was invalid: "
+                  << vk::to_string(result) << ". Starting with a fresh cache.";
+    cache_info.pInitialData = nullptr;
+    cache_info.initialDataSize = 0u;
+    auto [result2, new_cache] =
+        device_holder->GetDevice().createPipelineCacheUnique(cache_info);
+    if (result2 == vk::Result::eSuccess) {
+      cache_ = std::move(new_cache);
+    } else {
+      VALIDATION_LOG << "Could not create new pipeline cache: "
+                     << vk::to_string(result2);
+    }
+  }
+
+  is_valid_ = !!cache_;
+}
+
+PipelineCacheVK::~PipelineCacheVK() {
+  std::shared_ptr<DeviceHolderVK> device_holder = device_holder_.lock();
+  if (device_holder) {
+    cache_.reset();
+  } else {
+    cache_.release();
+  }
+}
+
+bool PipelineCacheVK::IsValid() const {
+  return is_valid_;
+}
+
+vk::UniquePipeline PipelineCacheVK::CreatePipeline(
+    const vk::GraphicsPipelineCreateInfo& info) {
+  std::shared_ptr<DeviceHolderVK> strong_device = device_holder_.lock();
+  if (!strong_device) {
+    return {};
+  }
+
+  auto [result, pipeline] =
+      strong_device->GetDevice().createGraphicsPipelineUnique(*cache_, info);
+  if (result != vk::Result::eSuccess) {
+    VALIDATION_LOG << "Could not create graphics pipeline: "
+                   << vk::to_string(result);
+  }
+  return std::move(pipeline);
+}
+
+vk::UniquePipeline PipelineCacheVK::CreatePipeline(
+    const vk::ComputePipelineCreateInfo& info) {
+  std::shared_ptr<DeviceHolderVK> strong_device = device_holder_.lock();
+  if (!strong_device) {
+    return {};
+  }
+
+  auto [result, pipeline] =
+      strong_device->GetDevice().createComputePipelineUnique(*cache_, info);
+  if (result != vk::Result::eSuccess) {
+    VALIDATION_LOG << "Could not create compute pipeline: "
+                   << vk::to_string(result);
+  }
+  return std::move(pipeline);
+}
+
+std::shared_ptr<fml::Mapping> PipelineCacheVK::CopyPipelineCacheData() const {
+  std::shared_ptr<DeviceHolderVK> strong_device = device_holder_.lock();
+  if (!strong_device) {
+    return nullptr;
+  }
+
+  if (!IsValid()) {
+    return nullptr;
+  }
+  auto [result, data] =
+      strong_device->GetDevice().getPipelineCacheData(*cache_);
+  if (result != vk::Result::eSuccess) {
+    VALIDATION_LOG << "Could not get pipeline cache data to persist.";
+    return nullptr;
+  }
+  auto shared_data = std::make_shared<std::vector<uint8_t>>();
+  std::swap(*shared_data, data);
+  return std::make_shared<fml::NonOwnedMapping>(
+      shared_data->data(), shared_data->size(), [shared_data](auto, auto) {});
+}
+
+void PipelineCacheVK::PersistCacheToDisk() const {
+  if (!cache_directory_.is_valid()) {
+    return;
+  }
+  auto data = CopyPipelineCacheData();
+  if (!data) {
+    VALIDATION_LOG << "Could not copy pipeline cache data.";
+    return;
+  }
+  data = DecorateCacheWithMetadata(std::move(data));
+  if (!data) {
+    VALIDATION_LOG
+        << "Could not decorate pipeline cache with additional metadata.";
+    return;
+  }
+  if (!fml::WriteAtomically(cache_directory_, kPipelineCacheFileName, *data)) {
+    VALIDATION_LOG << "Could not persist pipeline cache to disk.";
+    return;
+  }
+}
+
+const CapabilitiesVK* PipelineCacheVK::GetCapabilities() const {
+  return CapabilitiesVK::Cast(caps_.get());
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/pipeline_cache_vk.h b/impeller/renderer/backend/vulkan/pipeline_cache_vk.h
new file mode 100644
index 0000000000000000000000000000000000000000..6376ec4d0b536ddb87f089796178eb09fa28d77c
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/pipeline_cache_vk.h
@@ -0,0 +1,53 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_PIPELINE_CACHE_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_PIPELINE_CACHE_VK_H_
+
+#include "flutter/fml/file.h"
+#include "flutter/fml/macros.h"
+#include "impeller/renderer/backend/vulkan/capabilities_vk.h"
+#include "impeller/renderer/backend/vulkan/device_holder_vk.h"
+
+namespace impeller {
+
+class PipelineCacheVK {
+ public:
+  // The [device] is passed in directly so that it can be used in the
+  // constructor directly. The [device_holder] isn't guaranteed to be valid
+  // at the time of executing `PipelineCacheVK` because of how `ContextVK` does
+  // initialization.
+  explicit PipelineCacheVK(std::shared_ptr<const Capabilities> caps,
+                           std::shared_ptr<DeviceHolderVK> device_holder,
+                           fml::UniqueFD cache_directory);
+
+  ~PipelineCacheVK();
+
+  bool IsValid() const;
+
+  vk::UniquePipeline CreatePipeline(const vk::GraphicsPipelineCreateInfo& info);
+
+  vk::UniquePipeline CreatePipeline(const vk::ComputePipelineCreateInfo& info);
+
+  const CapabilitiesVK* GetCapabilities() const;
+
+  void PersistCacheToDisk() const;
+
+ private:
+  const std::shared_ptr<const Capabilities> caps_;
+  std::weak_ptr<DeviceHolderVK> device_holder_;
+  const fml::UniqueFD cache_directory_;
+  vk::UniquePipelineCache cache_;
+  bool is_valid_ = false;
+
+  std::shared_ptr<fml::Mapping> CopyPipelineCacheData() const;
+
+  PipelineCacheVK(const PipelineCacheVK&) = delete;
+
+  PipelineCacheVK& operator=(const PipelineCacheVK&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_PIPELINE_CACHE_VK_H_
diff --git a/impeller/renderer/backend/vulkan/pipeline_library_vk.cc b/impeller/renderer/backend/vulkan/pipeline_library_vk.cc
index e9008d5c6dba5081521c1c58aa06bd9653223174..26ed69f53ba50658ba5bb131e8fdab550e515b26 100644
--- a/impeller/renderer/backend/vulkan/pipeline_library_vk.cc
+++ b/impeller/renderer/backend/vulkan/pipeline_library_vk.cc
@@ -4,45 +4,41 @@
 
 #include "impeller/renderer/backend/vulkan/pipeline_library_vk.h"
 
+#include <chrono>
+#include <cstdint>
 #include <optional>
+#include <sstream>
 
 #include "flutter/fml/container.h"
 #include "flutter/fml/trace_event.h"
 #include "impeller/base/promise.h"
+#include "impeller/base/timing.h"
 #include "impeller/base/validation.h"
 #include "impeller/renderer/backend/vulkan/context_vk.h"
 #include "impeller/renderer/backend/vulkan/formats_vk.h"
 #include "impeller/renderer/backend/vulkan/pipeline_vk.h"
 #include "impeller/renderer/backend/vulkan/shader_function_vk.h"
 #include "impeller/renderer/backend/vulkan/vertex_descriptor_vk.h"
+#include "vulkan/vulkan_core.h"
+#include "vulkan/vulkan_enums.hpp"
 
 namespace impeller {
 
 PipelineLibraryVK::PipelineLibraryVK(
-    const vk::Device& device,
-    const std::shared_ptr<const fml::Mapping>& pipeline_cache_data,
+    const std::shared_ptr<DeviceHolderVK>& device_holder,
+    std::shared_ptr<const Capabilities> caps,
+    fml::UniqueFD cache_directory,
     std::shared_ptr<fml::ConcurrentTaskRunner> worker_task_runner)
-    : worker_task_runner_(std::move(worker_task_runner)) {
-  if (!worker_task_runner_) {
+    : device_holder_(device_holder),
+      pso_cache_(std::make_shared<PipelineCacheVK>(std::move(caps),
+                                                   device_holder,
+                                                   std::move(cache_directory))),
+      worker_task_runner_(std::move(worker_task_runner)) {
+  FML_DCHECK(worker_task_runner_);
+  if (!pso_cache_->IsValid() || !worker_task_runner_) {
     return;
   }
 
-  vk::PipelineCacheCreateInfo cache_info;
-
-  if (pipeline_cache_data) {
-    cache_info.pInitialData = pipeline_cache_data->GetMapping();
-    cache_info.initialDataSize = pipeline_cache_data->GetSize();
-  }
-
-  auto cache = device.createPipelineCacheUnique(cache_info);
-
-  if (cache.result != vk::Result::eSuccess) {
-    VALIDATION_LOG << "Could not create pipeline cache.";
-    return;
-  }
-
-  device_ = device;
-  cache_ = std::move(cache.value);
   is_valid_ = true;
 }
 
@@ -53,6 +49,112 @@ bool PipelineLibraryVK::IsValid() const {
   return is_valid_;
 }
 
+std::unique_ptr<ComputePipelineVK> PipelineLibraryVK::CreateComputePipeline(
+    const ComputePipelineDescriptor& desc) {
+  TRACE_EVENT0("flutter", __FUNCTION__);
+  vk::ComputePipelineCreateInfo pipeline_info;
+
+  //----------------------------------------------------------------------------
+  /// Shader Stage
+  ///
+  const auto entrypoint = desc.GetStageEntrypoint();
+  if (!entrypoint) {
+    VALIDATION_LOG << "Compute shader is missing an entrypoint.";
+    return nullptr;
+  }
+
+  std::shared_ptr<DeviceHolderVK> strong_device = device_holder_.lock();
+  if (!strong_device) {
+    return nullptr;
+  }
+  auto device_properties = strong_device->GetPhysicalDevice().getProperties();
+  auto max_wg_size = device_properties.limits.maxComputeWorkGroupSize;
+
+  // Give all compute shaders a specialization constant entry for the
+  // workgroup/threadgroup size.
+  vk::SpecializationMapEntry specialization_map_entry[1];
+
+  uint32_t workgroup_size_x = max_wg_size[0];
+  specialization_map_entry[0].constantID = 0;
+  specialization_map_entry[0].offset = 0;
+  specialization_map_entry[0].size = sizeof(uint32_t);
+
+  vk::SpecializationInfo specialization_info;
+  specialization_info.mapEntryCount = 1;
+  specialization_info.pMapEntries = &specialization_map_entry[0];
+  specialization_info.dataSize = sizeof(uint32_t);
+  specialization_info.pData = &workgroup_size_x;
+
+  vk::PipelineShaderStageCreateInfo info;
+  info.setStage(vk::ShaderStageFlagBits::eCompute);
+  info.setPName("main");
+  info.setModule(ShaderFunctionVK::Cast(entrypoint.get())->GetModule());
+  info.setPSpecializationInfo(&specialization_info);
+  pipeline_info.setStage(info);
+
+  //----------------------------------------------------------------------------
+  /// Pipeline Layout a.k.a the descriptor sets and uniforms.
+  ///
+  std::vector<vk::DescriptorSetLayoutBinding> desc_bindings;
+
+  for (auto layout : desc.GetDescriptorSetLayouts()) {
+    auto vk_desc_layout = ToVKDescriptorSetLayoutBinding(layout);
+    desc_bindings.push_back(vk_desc_layout);
+  }
+
+  vk::DescriptorSetLayoutCreateInfo descs_layout_info;
+  descs_layout_info.setBindings(desc_bindings);
+
+  auto [descs_result, descs_layout] =
+      strong_device->GetDevice().createDescriptorSetLayoutUnique(
+          descs_layout_info);
+  if (descs_result != vk::Result::eSuccess) {
+    VALIDATION_LOG << "unable to create uniform descriptors";
+    return nullptr;
+  }
+
+  ContextVK::SetDebugName(strong_device->GetDevice(), descs_layout.get(),
+                          "Descriptor Set Layout " + desc.GetLabel());
+
+  //----------------------------------------------------------------------------
+  /// Create the pipeline layout.
+  ///
+  vk::PipelineLayoutCreateInfo pipeline_layout_info;
+  pipeline_layout_info.setSetLayouts(descs_layout.get());
+  auto pipeline_layout = strong_device->GetDevice().createPipelineLayoutUnique(
+      pipeline_layout_info);
+  if (pipeline_layout.result != vk::Result::eSuccess) {
+    VALIDATION_LOG << "Could not create pipeline layout for pipeline "
+                   << desc.GetLabel() << ": "
+                   << vk::to_string(pipeline_layout.result);
+    return nullptr;
+  }
+  pipeline_info.setLayout(pipeline_layout.value.get());
+
+  //----------------------------------------------------------------------------
+  /// Finally, all done with the setup info. Create the pipeline itself.
+  ///
+  auto pipeline = pso_cache_->CreatePipeline(pipeline_info);
+  if (!pipeline) {
+    VALIDATION_LOG << "Could not create graphics pipeline: " << desc.GetLabel();
+    return nullptr;
+  }
+
+  ContextVK::SetDebugName(strong_device->GetDevice(), *pipeline_layout.value,
+                          "Pipeline Layout " + desc.GetLabel());
+  ContextVK::SetDebugName(strong_device->GetDevice(), *pipeline,
+                          "Pipeline " + desc.GetLabel());
+
+  return std::make_unique<ComputePipelineVK>(
+      device_holder_,
+      weak_from_this(),                  //
+      desc,                              //
+      std::move(pipeline),               //
+      std::move(pipeline_layout.value),  //
+      std::move(descs_layout)            //
+  );
+}
+
 // |PipelineLibrary|
 PipelineFuture<PipelineDescriptor> PipelineLibraryVK::GetPipeline(
     PipelineDescriptor descriptor) {
@@ -68,7 +170,7 @@ PipelineFuture<PipelineDescriptor> PipelineLibraryVK::GetPipeline(
   }
 
   auto promise = std::make_shared<
-      std::promise<std::shared_ptr<Pipeline<PipelineDescriptor>>>>();
+      NoExceptionPromise<std::shared_ptr<Pipeline<PipelineDescriptor>>>>();
   auto pipeline_future =
       PipelineFuture<PipelineDescriptor>{descriptor, promise->get_future()};
   pipelines_[descriptor] = pipeline_future;
@@ -83,10 +185,12 @@ PipelineFuture<PipelineDescriptor> PipelineLibraryVK::GetPipeline(
                         "could be created.";
       return;
     }
-    auto pipeline_create_info =
-        PipelineLibraryVK::Cast(thiz.get())->CreatePipeline(descriptor);
-    promise->set_value(std::make_shared<PipelineVK>(
-        weak_this, descriptor, std::move(pipeline_create_info)));
+
+    promise->set_value(PipelineVK::Create(
+        descriptor,                                            //
+        PipelineLibraryVK::Cast(*thiz).device_holder_.lock(),  //
+        weak_this                                              //
+        ));
   });
 
   return pipeline_future;
@@ -95,42 +199,48 @@ PipelineFuture<PipelineDescriptor> PipelineLibraryVK::GetPipeline(
 // |PipelineLibrary|
 PipelineFuture<ComputePipelineDescriptor> PipelineLibraryVK::GetPipeline(
     ComputePipelineDescriptor descriptor) {
+  Lock lock(compute_pipelines_mutex_);
+  if (auto found = compute_pipelines_.find(descriptor);
+      found != compute_pipelines_.end()) {
+    return found->second;
+  }
+
+  if (!IsValid()) {
+    return {
+        descriptor,
+        RealizedFuture<std::shared_ptr<Pipeline<ComputePipelineDescriptor>>>(
+            nullptr)};
+  }
+
   auto promise = std::make_shared<
       std::promise<std::shared_ptr<Pipeline<ComputePipelineDescriptor>>>>();
-  // TODO(dnfield): implement compute for GLES.
-  promise->set_value(nullptr);
-  return {descriptor, promise->get_future()};
-}
+  auto pipeline_future = PipelineFuture<ComputePipelineDescriptor>{
+      descriptor, promise->get_future()};
+  compute_pipelines_[descriptor] = pipeline_future;
 
-static vk::AttachmentDescription CreatePlaceholderAttachmentDescription(
-    vk::Format format,
-    SampleCount sample_count,
-    bool is_color) {
-  vk::AttachmentDescription desc;
-
-  // See
-  // https://www.khronos.org/registry/vulkan/specs/1.3-extensions/html/chap8.html#renderpass-compatibility
-
-  // Format and samples must match for sub-pass compatibility
-  desc.setFormat(format);
-  desc.setSamples(ToVKSampleCountFlagBits(sample_count));
-
-  // The rest of these are placeholders and the right values will be set when
-  // the render-pass to be used with the framebuffer is created.
-  desc.setLoadOp(vk::AttachmentLoadOp::eDontCare);
-  desc.setStoreOp(vk::AttachmentStoreOp::eDontCare);
-  desc.setStencilLoadOp(vk::AttachmentLoadOp::eDontCare);
-  desc.setStencilStoreOp(vk::AttachmentStoreOp::eDontCare);
-
-  if (!is_color) {
-    desc.setInitialLayout(vk::ImageLayout::eGeneral);
-    desc.setFinalLayout(vk::ImageLayout::eGeneral);
-  } else {
-    desc.setInitialLayout(vk::ImageLayout::eColorAttachmentOptimal);
-    desc.setFinalLayout(vk::ImageLayout::ePresentSrcKHR);
-  }
+  auto weak_this = weak_from_this();
+
+  worker_task_runner_->PostTask([descriptor, weak_this, promise]() {
+    auto self = weak_this.lock();
+    if (!self) {
+      promise->set_value(nullptr);
+      VALIDATION_LOG << "Pipeline library was collected before the pipeline "
+                        "could be created.";
+      return;
+    }
+
+    auto pipeline =
+        PipelineLibraryVK::Cast(*self).CreateComputePipeline(descriptor);
+    if (!pipeline) {
+      promise->set_value(nullptr);
+      VALIDATION_LOG << "Could not create pipeline: " << descriptor.GetLabel();
+      return;
+    }
 
-  return desc;
+    promise->set_value(std::move(pipeline));
+  });
+
+  return pipeline_future;
 }
 
 // |PipelineLibrary|
@@ -144,276 +254,30 @@ void PipelineLibraryVK::RemovePipelinesWithEntryPoint(
   });
 }
 
-//----------------------------------------------------------------------------
-/// Render Pass
-/// We are NOT going to use the same render pass with the framebuffer (later)
-/// and the graphics pipeline (here). Instead, we are going to ensure that the
-/// sub-passes are compatible. To see the compatibility rules, see the Vulkan
-/// spec:
-/// https://www.khronos.org/registry/vulkan/specs/1.3-extensions/html/chap8.html#renderpass-compatibility
-/// TODO(106378): Add a format specifier to the ColorAttachmentDescriptor,
-///               StencilAttachmentDescriptor, and, DepthAttachmentDescriptor.
-///               Right now, these are placeholders.
-///
-std::optional<vk::UniqueRenderPass> PipelineLibraryVK::CreateRenderPass(
-    const PipelineDescriptor& desc) {
-  std::vector<vk::AttachmentDescription> render_pass_attachments;
-  const auto sample_count = desc.GetSampleCount();
-  // Set the color attachment.
-  const auto& format = desc.GetColorAttachmentDescriptor(0)->format;
-  render_pass_attachments.push_back(CreatePlaceholderAttachmentDescription(
-      ToVKImageFormat(format), sample_count, true));
-
-  std::vector<vk::AttachmentReference> color_attachment_references;
-  std::vector<vk::AttachmentReference> resolve_attachment_references;
-  std::optional<vk::AttachmentReference> depth_stencil_attachment_reference;
-
-  // TODO (kaushikiska): consider changing the image layout to
-  // eColorAttachmentOptimal.
-  color_attachment_references.push_back(vk::AttachmentReference(
-      render_pass_attachments.size() - 1u, vk::ImageLayout::eGeneral));
-
-#if false
-  // see: https://github.com/flutter/flutter/issues/112388
-  // Set the resolve attachment if MSAA is enabled.
-  if (sample_count != SampleCount::kCount1) {
-    render_pass_attachments.push_back(CreatePlaceholderAttachmentDescription(
-        vk::Format::eR8G8B8A8Unorm, SampleCount::kCount1, false));
-    resolve_attachment_references.push_back(vk::AttachmentReference(
-        render_pass_attachments.size() - 1u, vk::ImageLayout::eGeneral));
-  }
-
-  if (desc.HasStencilAttachmentDescriptors()) {
-    render_pass_attachments.push_back(CreatePlaceholderAttachmentDescription(
-        vk::Format::eS8Uint, sample_count, false));
-    depth_stencil_attachment_reference = vk::AttachmentReference(
-        render_pass_attachments.size() - 1u, vk::ImageLayout::eGeneral);
-  }
-#endif
-
-  vk::SubpassDescription subpass_info;
-  subpass_info.setPipelineBindPoint(vk::PipelineBindPoint::eGraphics);
-  subpass_info.setColorAttachments(color_attachment_references);
-
-#if false
-  // see: https://github.com/flutter/flutter/issues/112388
-  if (sample_count != SampleCount::kCount1) {
-    subpass_info.setResolveAttachments(resolve_attachment_references);
-  }
-  if (depth_stencil_attachment_reference.has_value()) {
-    subpass_info.setPDepthStencilAttachment(
-        &depth_stencil_attachment_reference.value());
+void PipelineLibraryVK::DidAcquireSurfaceFrame() {
+  if (++frames_acquired_ == 50u) {
+    PersistPipelineCacheToDisk();
   }
-#endif
-
-  vk::RenderPassCreateInfo render_pass_info;
-  render_pass_info.setSubpasses(subpass_info);
-  render_pass_info.setAttachments(render_pass_attachments);
-  auto render_pass = device_.createRenderPassUnique(render_pass_info);
-  if (render_pass.result != vk::Result::eSuccess) {
-    VALIDATION_LOG << "Could not create render pass for pipeline "
-                   << desc.GetLabel() << ": "
-                   << vk::to_string(render_pass.result);
-    return std::nullopt;
-  }
-
-  return std::move(render_pass.value);
 }
 
-std::unique_ptr<PipelineCreateInfoVK> PipelineLibraryVK::CreatePipeline(
-    const PipelineDescriptor& desc) {
-  TRACE_EVENT0("flutter", __FUNCTION__);
-  vk::GraphicsPipelineCreateInfo pipeline_info;
-
-  //----------------------------------------------------------------------------
-  /// Dynamic States
-  ///
-  vk::PipelineDynamicStateCreateInfo dynamic_create_state_info;
-  std::vector<vk::DynamicState> dynamic_states = {
-      vk::DynamicState::eViewport,
-      vk::DynamicState::eScissor,
-      vk::DynamicState::eStencilReference,
-  };
-  dynamic_create_state_info.setDynamicStates(dynamic_states);
-  pipeline_info.setPDynamicState(&dynamic_create_state_info);
-
-  //----------------------------------------------------------------------------
-  /// Viewport State
-  ///
-  vk::PipelineViewportStateCreateInfo viewport_state;
-  viewport_state.setViewportCount(1u);
-  viewport_state.setScissorCount(1u);
-  // The actual viewport and scissor rects are not set here since they are
-  // dynamic as mentioned above in the dynamic state info.
-  pipeline_info.setPViewportState(&viewport_state);
-
-  //----------------------------------------------------------------------------
-  /// Shader Stages
-  ///
-  std::vector<vk::PipelineShaderStageCreateInfo> shader_stages;
-  for (const auto& entrypoint : desc.GetStageEntrypoints()) {
-    auto stage = ToVKShaderStageFlagBits(entrypoint.first);
-    if (!stage.has_value()) {
-      VALIDATION_LOG << "Unsupported shader type in pipeline: "
-                     << desc.GetLabel();
-      return nullptr;
-    }
-    vk::PipelineShaderStageCreateInfo info;
-    info.setStage(stage.value());
-    info.setPName("main");
-    info.setModule(
-        ShaderFunctionVK::Cast(entrypoint.second.get())->GetModule());
-    shader_stages.push_back(info);
-  }
-  pipeline_info.setStages(shader_stages);
-
-  //----------------------------------------------------------------------------
-  /// Rasterization State
-  /// TODO(106380): Move front face and cull mode to pipeline state instead of
-  ///               draw command. These are hard-coded here for now.
-  ///
-  vk::PipelineRasterizationStateCreateInfo rasterization_state;
-  rasterization_state.setFrontFace(vk::FrontFace::eClockwise);
-  rasterization_state.setCullMode(vk::CullModeFlagBits::eNone);
-  rasterization_state.setPolygonMode(vk::PolygonMode::eFill);
-  // requires GPU extensions to change.
-  {
-    rasterization_state.setLineWidth(1.0f);
-    rasterization_state.setDepthClampEnable(false);
-  }
-  rasterization_state.setRasterizerDiscardEnable(false);
-  pipeline_info.setPRasterizationState(&rasterization_state);
-
-  //----------------------------------------------------------------------------
-  /// Multi-sample State
-  ///
-  vk::PipelineMultisampleStateCreateInfo multisample_state;
-  multisample_state.setRasterizationSamples(
-      ToVKSampleCountFlagBits(desc.GetSampleCount()));
-  pipeline_info.setPMultisampleState(&multisample_state);
-
-  //----------------------------------------------------------------------------
-  /// Primitive Input Assembly State
-  vk::PipelineInputAssemblyStateCreateInfo input_assembly;
-  const auto topology = ToVKPrimitiveTopology(desc.GetPrimitiveType());
-  input_assembly.setTopology(topology);
-  pipeline_info.setPInputAssemblyState(&input_assembly);
-
-  //----------------------------------------------------------------------------
-  /// Color Blend State
-  ///
-  std::vector<vk::PipelineColorBlendAttachmentState> attachment_blend_state;
-  for (const auto& color_desc : desc.GetColorAttachmentDescriptors()) {
-    // TODO(csg): The blend states are per color attachment. But it isn't clear
-    // how the color attachment indices are specified in the pipeline create
-    // info. But, this should always work for one color attachment.
-    attachment_blend_state.push_back(
-        ToVKPipelineColorBlendAttachmentState(color_desc.second));
-  }
-  vk::PipelineColorBlendStateCreateInfo blend_state;
-  blend_state.setAttachments(attachment_blend_state);
-  pipeline_info.setPColorBlendState(&blend_state);
-
-  auto render_pass = CreateRenderPass(desc);
-  if (render_pass.has_value()) {
-    pipeline_info.setBasePipelineHandle(VK_NULL_HANDLE);
-    pipeline_info.setSubpass(0);
-    pipeline_info.setRenderPass((*render_pass).get());
-  } else {
-    return nullptr;
-  }
-
-  // only 1 stream of data is supported for now.
-  vk::VertexInputBindingDescription binding_description = {};
-  binding_description.setBinding(0);
-  binding_description.setInputRate(vk::VertexInputRate::eVertex);
-
-  std::vector<vk::VertexInputAttributeDescription> attr_descs;
-  uint32_t offset = 0;
-  const auto& stage_inputs = desc.GetVertexDescriptor()->GetStageInputs();
-  for (const ShaderStageIOSlot& stage_in : stage_inputs) {
-    vk::VertexInputAttributeDescription attr_desc;
-    attr_desc.setBinding(stage_in.binding);
-    attr_desc.setLocation(stage_in.location);
-    attr_desc.setFormat(ToVertexDescriptorFormat(stage_in));
-    attr_desc.setOffset(offset);
-    attr_descs.push_back(attr_desc);
-    uint32_t len = (stage_in.bit_width * stage_in.vec_size) / 8;
-    offset += len;
-  }
-
-  binding_description.setStride(offset);
-
-  vk::PipelineVertexInputStateCreateInfo vertex_input_state;
-  vertex_input_state.setVertexAttributeDescriptions(attr_descs);
-  vertex_input_state.setVertexBindingDescriptionCount(1);
-  vertex_input_state.setPVertexBindingDescriptions(&binding_description);
-
-  pipeline_info.setPVertexInputState(&vertex_input_state);
-
-  //----------------------------------------------------------------------------
-  /// Pipeline Layout a.k.a the descriptor sets and uniforms.
-  ///
-  std::vector<vk::DescriptorSetLayoutBinding> bindings = {};
-
-  for (auto layout : desc.GetVertexDescriptor()->GetDescriptorSetLayouts()) {
-    auto vk_desc_layout = ToVKDescriptorSetLayoutBinding(layout);
-    bindings.push_back(vk_desc_layout);
-  }
-
-  vk::DescriptorSetLayoutCreateInfo descriptor_set_create;
-  descriptor_set_create.setBindings(bindings);
-
-  auto descriptor_set_create_res =
-      device_.createDescriptorSetLayoutUnique(descriptor_set_create);
-  if (descriptor_set_create_res.result != vk::Result::eSuccess) {
-    VALIDATION_LOG << "unable to create uniform descriptors";
-    return nullptr;
-  }
-
-  vk::UniqueDescriptorSetLayout descriptor_set_layout =
-      std::move(descriptor_set_create_res.value);
-  ContextVK::SetDebugName(device_, descriptor_set_layout.get(),
-                          "descriptor_set_layout_" + desc.GetLabel());
-
-  vk::PipelineLayoutCreateInfo pipeline_layout_info;
-  pipeline_layout_info.setSetLayouts(descriptor_set_layout.get());
-  auto pipeline_layout =
-      device_.createPipelineLayoutUnique(pipeline_layout_info);
-  if (pipeline_layout.result != vk::Result::eSuccess) {
-    VALIDATION_LOG << "Could not create pipeline layout for pipeline "
-                   << desc.GetLabel() << ": "
-                   << vk::to_string(pipeline_layout.result);
-    return nullptr;
-  }
-  pipeline_info.setLayout(pipeline_layout.value.get());
-
-  vk::PipelineDepthStencilStateCreateInfo depth_stencil_state;
-  depth_stencil_state.setDepthTestEnable(true);
-  depth_stencil_state.setDepthWriteEnable(true);
-  depth_stencil_state.setDepthCompareOp(vk::CompareOp::eLess);
-  depth_stencil_state.setDepthBoundsTestEnable(false);
-  depth_stencil_state.setStencilTestEnable(false);
-  pipeline_info.setPDepthStencilState(&depth_stencil_state);
-
-  // See the note in the header about why this is a reader lock.
-  ReaderLock lock(cache_mutex_);
-  auto pipeline =
-      device_.createGraphicsPipelineUnique(cache_.get(), pipeline_info);
-  if (pipeline.result != vk::Result::eSuccess) {
-    VALIDATION_LOG << "Could not create graphics pipeline - " << desc.GetLabel()
-                   << ": " << vk::to_string(pipeline.result);
-    return nullptr;
-  }
+void PipelineLibraryVK::PersistPipelineCacheToDisk() {
+  worker_task_runner_->PostTask(
+      [weak_cache = decltype(pso_cache_)::weak_type(pso_cache_)]() {
+        auto cache = weak_cache.lock();
+        if (!cache) {
+          return;
+        }
+        cache->PersistCacheToDisk();
+      });
+}
 
-  ContextVK::SetDebugName(device_, *pipeline_layout.value,
-                          "pipeline_layout_" + desc.GetLabel());
-  ContextVK::SetDebugName(device_, *pipeline.value,
-                          "pipeline_" + desc.GetLabel());
+const std::shared_ptr<PipelineCacheVK>& PipelineLibraryVK::GetPSOCache() const {
+  return pso_cache_;
+}
 
-  return std::make_unique<PipelineCreateInfoVK>(
-      std::move(pipeline.value), std::move(render_pass.value()),
-      std::move(pipeline_layout.value), std::move(descriptor_set_layout));
+const std::shared_ptr<fml::ConcurrentTaskRunner>&
+PipelineLibraryVK::GetWorkerTaskRunner() const {
+  return worker_task_runner_;
 }
 
 }  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/pipeline_library_vk.h b/impeller/renderer/backend/vulkan/pipeline_library_vk.h
index ec03d99438165b3d7bdf5e39a9b0260328c0a3d0..0f3926924e58919afcde79493b90fc258a2bb321 100644
--- a/impeller/renderer/backend/vulkan/pipeline_library_vk.h
+++ b/impeller/renderer/backend/vulkan/pipeline_library_vk.h
@@ -2,17 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_PIPELINE_LIBRARY_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_PIPELINE_LIBRARY_VK_H_
+
+#include <atomic>
 
 #include "flutter/fml/concurrent_message_loop.h"
 #include "flutter/fml/macros.h"
 #include "flutter/fml/mapping.h"
+#include "flutter/fml/unique_fd.h"
 #include "impeller/base/backend_cast.h"
 #include "impeller/base/thread.h"
+#include "impeller/renderer/backend/vulkan/compute_pipeline_vk.h"
+#include "impeller/renderer/backend/vulkan/pipeline_cache_vk.h"
 #include "impeller/renderer/backend/vulkan/pipeline_vk.h"
 #include "impeller/renderer/backend/vulkan/vk.h"
 #include "impeller/renderer/pipeline_library.h"
-#include "vulkan/vulkan_handles.hpp"
 
 namespace impeller {
 
@@ -25,26 +30,30 @@ class PipelineLibraryVK final
   // |PipelineLibrary|
   ~PipelineLibraryVK() override;
 
+  void DidAcquireSurfaceFrame();
+
+  const std::shared_ptr<PipelineCacheVK>& GetPSOCache() const;
+
+  const std::shared_ptr<fml::ConcurrentTaskRunner>& GetWorkerTaskRunner() const;
+
  private:
   friend ContextVK;
 
-  vk::Device device_;
-  // On locking around the pipeline cache: The cache is internally synchronized.
-  // So there is no need to hold a writer lock around its use when pipelines are
-  // being created. The time it takes for implementations to spend within the
-  // critical section of the cache is limited compared to the time it
-  // takes for the "create pipeline" call itself. The writer lock is only
-  // necessary when fetching pipeline cache data for persisting to disk.
-  mutable RWMutex cache_mutex_;
-  vk::UniquePipelineCache cache_ IPLR_GUARDED_BY(cache_mutex_);
+  std::weak_ptr<DeviceHolderVK> device_holder_;
+  std::shared_ptr<PipelineCacheVK> pso_cache_;
   std::shared_ptr<fml::ConcurrentTaskRunner> worker_task_runner_;
   Mutex pipelines_mutex_;
   PipelineMap pipelines_ IPLR_GUARDED_BY(pipelines_mutex_);
+  Mutex compute_pipelines_mutex_;
+  ComputePipelineMap compute_pipelines_ IPLR_GUARDED_BY(
+      compute_pipelines_mutex_);
+  std::atomic_size_t frames_acquired_ = 0u;
   bool is_valid_ = false;
 
   PipelineLibraryVK(
-      const vk::Device& device,
-      const std::shared_ptr<const fml::Mapping>& pipeline_cache_data,
+      const std::shared_ptr<DeviceHolderVK>& device_holder,
+      std::shared_ptr<const Capabilities> caps,
+      fml::UniqueFD cache_directory,
       std::shared_ptr<fml::ConcurrentTaskRunner> worker_task_runner);
 
   // |PipelineLibrary|
@@ -62,13 +71,16 @@ class PipelineLibraryVK final
   void RemovePipelinesWithEntryPoint(
       std::shared_ptr<const ShaderFunction> function) override;
 
-  std::unique_ptr<PipelineCreateInfoVK> CreatePipeline(
-      const PipelineDescriptor& desc);
+  std::unique_ptr<ComputePipelineVK> CreateComputePipeline(
+      const ComputePipelineDescriptor& desc);
+
+  void PersistPipelineCacheToDisk();
 
-  std::optional<vk::UniqueRenderPass> CreateRenderPass(
-      const PipelineDescriptor& desc);
+  PipelineLibraryVK(const PipelineLibraryVK&) = delete;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(PipelineLibraryVK);
+  PipelineLibraryVK& operator=(const PipelineLibraryVK&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_PIPELINE_LIBRARY_VK_H_
diff --git a/impeller/renderer/backend/vulkan/pipeline_vk.cc b/impeller/renderer/backend/vulkan/pipeline_vk.cc
index b24a7acf67a6cc645e652e41a45ed729496407a2..84374190a249e3599dbf9f710958624af4e915dc 100644
--- a/impeller/renderer/backend/vulkan/pipeline_vk.cc
+++ b/impeller/renderer/backend/vulkan/pipeline_vk.cc
@@ -4,55 +4,525 @@
 
 #include "impeller/renderer/backend/vulkan/pipeline_vk.h"
 
+#include "flutter/fml/make_copyable.h"
+#include "flutter/fml/trace_event.h"
+#include "impeller/base/timing.h"
+#include "impeller/renderer/backend/vulkan/capabilities_vk.h"
+#include "impeller/renderer/backend/vulkan/context_vk.h"
+#include "impeller/renderer/backend/vulkan/formats_vk.h"
+#include "impeller/renderer/backend/vulkan/render_pass_builder_vk.h"
+#include "impeller/renderer/backend/vulkan/sampler_vk.h"
+#include "impeller/renderer/backend/vulkan/shader_function_vk.h"
+#include "impeller/renderer/backend/vulkan/vertex_descriptor_vk.h"
+
 namespace impeller {
 
-PipelineCreateInfoVK::PipelineCreateInfoVK(
-    vk::UniquePipeline pipeline,
-    vk::UniqueRenderPass render_pass,
-    vk::UniquePipelineLayout layout,
-    vk::UniqueDescriptorSetLayout descriptor_set_layout)
-    : pipeline_(std::move(pipeline)),
-      render_pass_(std::move(render_pass)),
-      pipeline_layout_(std::move(layout)),
-      descriptor_set_layout_(std::move(descriptor_set_layout)) {
-  is_valid_ =
-      pipeline_ && render_pass_ && pipeline_layout_ && descriptor_set_layout_;
+static vk::PipelineCreationFeedbackEXT EmptyFeedback() {
+  vk::PipelineCreationFeedbackEXT feedback;
+  // If the VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT is not set in flags, an
+  // implementation must not set any other bits in flags, and the values of all
+  // other VkPipelineCreationFeedback data members are undefined.
+  feedback.flags = vk::PipelineCreationFeedbackFlagBits::eValid;
+  return feedback;
 }
 
-bool PipelineCreateInfoVK::IsValid() const {
-  return is_valid_;
+constexpr vk::FrontFace ToVKFrontFace(WindingOrder order) {
+  switch (order) {
+    case WindingOrder::kClockwise:
+      return vk::FrontFace::eClockwise;
+    case WindingOrder::kCounterClockwise:
+      return vk::FrontFace::eCounterClockwise;
+  }
+  FML_UNREACHABLE();
 }
 
-vk::Pipeline PipelineCreateInfoVK::GetVKPipeline() const {
-  return *pipeline_;
+static void ReportPipelineCreationFeedbackToLog(
+    std::stringstream& stream,
+    const vk::PipelineCreationFeedbackEXT& feedback) {
+  const auto pipeline_cache_hit =
+      feedback.flags &
+      vk::PipelineCreationFeedbackFlagBits::eApplicationPipelineCacheHit;
+  const auto base_pipeline_accl =
+      feedback.flags &
+      vk::PipelineCreationFeedbackFlagBits::eBasePipelineAcceleration;
+  auto duration = std::chrono::duration_cast<MillisecondsF>(
+      std::chrono::nanoseconds{feedback.duration});
+  stream << "Time: " << duration.count() << "ms"
+         << " Cache Hit: " << static_cast<bool>(pipeline_cache_hit)
+         << " Base Accel: " << static_cast<bool>(base_pipeline_accl)
+         << " Thread: " << std::this_thread::get_id();
 }
 
-vk::RenderPass PipelineCreateInfoVK::GetRenderPass() const {
-  return *render_pass_;
+static void ReportPipelineCreationFeedbackToLog(
+    const PipelineDescriptor& desc,
+    const vk::PipelineCreationFeedbackCreateInfoEXT& feedback) {
+  std::stringstream stream;
+  stream << std::fixed << std::showpoint << std::setprecision(2);
+  stream << std::endl << ">>>>>>" << std::endl;
+  stream << "Pipeline '" << desc.GetLabel() << "' ";
+  ReportPipelineCreationFeedbackToLog(stream,
+                                      *feedback.pPipelineCreationFeedback);
+  if (feedback.pipelineStageCreationFeedbackCount != 0) {
+    stream << std::endl;
+  }
+  for (size_t i = 0, count = feedback.pipelineStageCreationFeedbackCount;
+       i < count; i++) {
+    stream << "\tStage " << i + 1 << ": ";
+    ReportPipelineCreationFeedbackToLog(
+        stream, feedback.pPipelineStageCreationFeedbacks[i]);
+    if (i != count - 1) {
+      stream << std::endl;
+    }
+  }
+  stream << std::endl << "<<<<<<" << std::endl;
+  FML_LOG(ERROR) << stream.str();
 }
 
-vk::PipelineLayout PipelineCreateInfoVK::GetPipelineLayout() const {
-  return *pipeline_layout_;
+static void ReportPipelineCreationFeedbackToTrace(
+    const PipelineDescriptor& desc,
+    const vk::PipelineCreationFeedbackCreateInfoEXT& feedback) {
+  static int64_t gPipelineCacheHits = 0;
+  static int64_t gPipelineCacheMisses = 0;
+  static int64_t gPipelines = 0;
+  if (feedback.pPipelineCreationFeedback->flags &
+      vk::PipelineCreationFeedbackFlagBits::eApplicationPipelineCacheHit) {
+    gPipelineCacheHits++;
+  } else {
+    gPipelineCacheMisses++;
+  }
+  gPipelines++;
+  static constexpr int64_t kImpellerPipelineTraceID = 1988;
+  FML_TRACE_COUNTER("impeller",                                   //
+                    "PipelineCache",                              // series name
+                    kImpellerPipelineTraceID,                     // series ID
+                    "PipelineCacheHits", gPipelineCacheHits,      //
+                    "PipelineCacheMisses", gPipelineCacheMisses,  //
+                    "TotalPipelines", gPipelines                  //
+  );
 }
 
-vk::DescriptorSetLayout PipelineCreateInfoVK::GetDescriptorSetLayout() const {
-  return *descriptor_set_layout_;
+static void ReportPipelineCreationFeedback(
+    const PipelineDescriptor& desc,
+    const vk::PipelineCreationFeedbackCreateInfoEXT& feedback) {
+  constexpr bool kReportPipelineCreationFeedbackToLogs = false;
+  constexpr bool kReportPipelineCreationFeedbackToTraces = true;
+  if (kReportPipelineCreationFeedbackToLogs) {
+    ReportPipelineCreationFeedbackToLog(desc, feedback);
+  }
+  if (kReportPipelineCreationFeedbackToTraces) {
+    ReportPipelineCreationFeedbackToTrace(desc, feedback);
+  }
 }
 
-PipelineVK::PipelineVK(std::weak_ptr<PipelineLibrary> library,
+//----------------------------------------------------------------------------
+/// Render Pass
+/// We are NOT going to use the same render pass with the framebuffer (later)
+/// and the graphics pipeline (here). Instead, we are going to ensure that the
+/// sub-passes are compatible. To see the compatibility rules, see the Vulkan
+/// spec:
+/// https://www.khronos.org/registry/vulkan/specs/1.3-extensions/html/chap8.html#renderpass-compatibility
+///
+static vk::UniqueRenderPass CreateCompatRenderPassForPipeline(
+    const vk::Device& device,
+    const PipelineDescriptor& desc) {
+  RenderPassBuilderVK builder;
+
+  for (const auto& [bind_point, color] : desc.GetColorAttachmentDescriptors()) {
+    builder.SetColorAttachment(bind_point,             //
+                               color.format,           //
+                               desc.GetSampleCount(),  //
+                               LoadAction::kDontCare,  //
+                               StoreAction::kDontCare  //
+    );
+  }
+
+  if (auto depth = desc.GetDepthStencilAttachmentDescriptor();
+      depth.has_value()) {
+    builder.SetDepthStencilAttachment(desc.GetDepthPixelFormat(),  //
+                                      desc.GetSampleCount(),       //
+                                      LoadAction::kDontCare,       //
+                                      StoreAction::kDontCare       //
+    );
+  } else if (desc.HasStencilAttachmentDescriptors()) {
+    builder.SetStencilAttachment(desc.GetStencilPixelFormat(),  //
+                                 desc.GetSampleCount(),         //
+                                 LoadAction::kDontCare,         //
+                                 StoreAction::kDontCare         //
+    );
+  }
+
+  auto pass = builder.Build(device);
+  if (!pass) {
+    VALIDATION_LOG << "Failed to create render pass for pipeline: "
+                   << desc.GetLabel();
+    return {};
+  }
+
+  ContextVK::SetDebugName(device, pass.get(),
+                          "Compat Render Pass: " + desc.GetLabel());
+
+  return pass;
+}
+
+std::unique_ptr<PipelineVK> PipelineVK::Create(
+    const PipelineDescriptor& desc,
+    const std::shared_ptr<DeviceHolderVK>& device_holder,
+    const std::weak_ptr<PipelineLibrary>& weak_library,
+    std::shared_ptr<SamplerVK> immutable_sampler) {
+  TRACE_EVENT0("flutter", "PipelineVK::Create");
+
+  auto library = weak_library.lock();
+
+  if (!device_holder || !library) {
+    return nullptr;
+  }
+
+  const auto& pso_cache = PipelineLibraryVK::Cast(*library).GetPSOCache();
+
+  vk::StructureChain<vk::GraphicsPipelineCreateInfo,
+                     vk::PipelineCreationFeedbackCreateInfoEXT>
+      chain;
+
+  const auto* caps = pso_cache->GetCapabilities();
+
+  const auto supports_pipeline_creation_feedback = caps->HasExtension(
+      OptionalDeviceExtensionVK::kEXTPipelineCreationFeedback);
+  if (!supports_pipeline_creation_feedback) {
+    chain.unlink<vk::PipelineCreationFeedbackCreateInfoEXT>();
+  }
+
+  auto& pipeline_info = chain.get<vk::GraphicsPipelineCreateInfo>();
+
+  //----------------------------------------------------------------------------
+  /// Dynamic States
+  ///
+  vk::PipelineDynamicStateCreateInfo dynamic_create_state_info;
+  std::vector<vk::DynamicState> dynamic_states = {
+      vk::DynamicState::eViewport,
+      vk::DynamicState::eScissor,
+      vk::DynamicState::eStencilReference,
+  };
+  dynamic_create_state_info.setDynamicStates(dynamic_states);
+  pipeline_info.setPDynamicState(&dynamic_create_state_info);
+
+  //----------------------------------------------------------------------------
+  /// Viewport State
+  ///
+  vk::PipelineViewportStateCreateInfo viewport_state;
+  viewport_state.setViewportCount(1u);
+  viewport_state.setScissorCount(1u);
+  // The actual viewport and scissor rects are not set here since they are
+  // dynamic as mentioned above in the dynamic state info.
+  pipeline_info.setPViewportState(&viewport_state);
+
+  //----------------------------------------------------------------------------
+  /// Shader Stages
+  ///
+  const auto& constants = desc.GetSpecializationConstants();
+
+  std::vector<std::vector<vk::SpecializationMapEntry>> map_entries(
+      desc.GetStageEntrypoints().size());
+  std::vector<vk::SpecializationInfo> specialization_infos(
+      desc.GetStageEntrypoints().size());
+  std::vector<vk::PipelineShaderStageCreateInfo> shader_stages;
+
+  size_t entrypoint_count = 0;
+  for (const auto& entrypoint : desc.GetStageEntrypoints()) {
+    auto stage = ToVKShaderStageFlagBits(entrypoint.first);
+    if (!stage.has_value()) {
+      VALIDATION_LOG << "Unsupported shader type in pipeline: "
+                     << desc.GetLabel();
+      return nullptr;
+    }
+
+    std::vector<vk::SpecializationMapEntry>& entries =
+        map_entries[entrypoint_count];
+    for (auto i = 0u; i < constants.size(); i++) {
+      vk::SpecializationMapEntry entry;
+      entry.offset = (i * sizeof(Scalar));
+      entry.size = sizeof(Scalar);
+      entry.constantID = i;
+      entries.emplace_back(entry);
+    }
+
+    vk::SpecializationInfo& specialization_info =
+        specialization_infos[entrypoint_count];
+    specialization_info.setMapEntries(map_entries[entrypoint_count]);
+    specialization_info.setPData(constants.data());
+    specialization_info.setDataSize(sizeof(Scalar) * constants.size());
+
+    vk::PipelineShaderStageCreateInfo info;
+    info.setStage(stage.value());
+    info.setPName("main");
+    info.setModule(
+        ShaderFunctionVK::Cast(entrypoint.second.get())->GetModule());
+    info.setPSpecializationInfo(&specialization_info);
+    shader_stages.push_back(info);
+    entrypoint_count++;
+  }
+  pipeline_info.setStages(shader_stages);
+
+  //----------------------------------------------------------------------------
+  /// Rasterization State
+  ///
+  vk::PipelineRasterizationStateCreateInfo rasterization_state;
+  rasterization_state.setFrontFace(ToVKFrontFace(desc.GetWindingOrder()));
+  rasterization_state.setCullMode(ToVKCullModeFlags(desc.GetCullMode()));
+  rasterization_state.setPolygonMode(ToVKPolygonMode(desc.GetPolygonMode()));
+  rasterization_state.setLineWidth(1.0f);
+  rasterization_state.setDepthClampEnable(false);
+  rasterization_state.setRasterizerDiscardEnable(false);
+  pipeline_info.setPRasterizationState(&rasterization_state);
+
+  //----------------------------------------------------------------------------
+  /// Multi-sample State
+  ///
+  vk::PipelineMultisampleStateCreateInfo multisample_state;
+  multisample_state.setRasterizationSamples(
+      ToVKSampleCountFlagBits(desc.GetSampleCount()));
+  pipeline_info.setPMultisampleState(&multisample_state);
+
+  //----------------------------------------------------------------------------
+  /// Primitive Input Assembly State
+  vk::PipelineInputAssemblyStateCreateInfo input_assembly;
+  const auto topology = ToVKPrimitiveTopology(desc.GetPrimitiveType());
+  input_assembly.setTopology(topology);
+  pipeline_info.setPInputAssemblyState(&input_assembly);
+
+  //----------------------------------------------------------------------------
+  /// Color Blend State
+  std::vector<vk::PipelineColorBlendAttachmentState> attachment_blend_state;
+  for (const auto& color_desc : desc.GetColorAttachmentDescriptors()) {
+    // TODO(csg): The blend states are per color attachment. But it isn't clear
+    // how the color attachment indices are specified in the pipeline create
+    // info. But, this should always work for one color attachment.
+    attachment_blend_state.push_back(
+        ToVKPipelineColorBlendAttachmentState(color_desc.second));
+  }
+  vk::PipelineColorBlendStateCreateInfo blend_state;
+  blend_state.setAttachments(attachment_blend_state);
+  pipeline_info.setPColorBlendState(&blend_state);
+
+  auto render_pass =
+      CreateCompatRenderPassForPipeline(device_holder->GetDevice(),  //
+                                        desc                         //
+      );
+
+  if (!render_pass) {
+    VALIDATION_LOG << "Could not create render pass for pipeline.";
+    return nullptr;
+  }
+
+  // Convention wisdom says that the base acceleration pipelines are never used
+  // by drivers for cache hits. Instead, the PSO cache is the preferred
+  // mechanism.
+  pipeline_info.setBasePipelineHandle(VK_NULL_HANDLE);
+  pipeline_info.setSubpass(0u);
+  pipeline_info.setRenderPass(render_pass.get());
+
+  //----------------------------------------------------------------------------
+  /// Vertex Input Setup
+  ///
+  std::vector<vk::VertexInputAttributeDescription> attr_descs;
+  std::vector<vk::VertexInputBindingDescription> buffer_descs;
+
+  const auto& stage_inputs = desc.GetVertexDescriptor()->GetStageInputs();
+  const auto& stage_buffer_layouts =
+      desc.GetVertexDescriptor()->GetStageLayouts();
+  for (const ShaderStageIOSlot& stage_in : stage_inputs) {
+    vk::VertexInputAttributeDescription attr_desc;
+    attr_desc.setBinding(stage_in.binding);
+    attr_desc.setLocation(stage_in.location);
+    attr_desc.setFormat(ToVertexDescriptorFormat(stage_in));
+    attr_desc.setOffset(stage_in.offset);
+    attr_descs.push_back(attr_desc);
+  }
+  for (const ShaderStageBufferLayout& layout : stage_buffer_layouts) {
+    vk::VertexInputBindingDescription binding_description;
+    binding_description.setBinding(layout.binding);
+    binding_description.setInputRate(vk::VertexInputRate::eVertex);
+    binding_description.setStride(layout.stride);
+    buffer_descs.push_back(binding_description);
+  }
+
+  vk::PipelineVertexInputStateCreateInfo vertex_input_state;
+  vertex_input_state.setVertexAttributeDescriptions(attr_descs);
+  vertex_input_state.setVertexBindingDescriptions(buffer_descs);
+
+  pipeline_info.setPVertexInputState(&vertex_input_state);
+
+  //----------------------------------------------------------------------------
+  /// Pipeline Layout a.k.a the descriptor sets and uniforms.
+  ///
+  std::vector<vk::DescriptorSetLayoutBinding> set_bindings;
+
+  vk::Sampler vk_immutable_sampler =
+      immutable_sampler ? immutable_sampler->GetSampler()
+                        : static_cast<vk::Sampler>(VK_NULL_HANDLE);
+
+  for (auto layout : desc.GetVertexDescriptor()->GetDescriptorSetLayouts()) {
+    vk::DescriptorSetLayoutBinding set_binding;
+    set_binding.binding = layout.binding;
+    set_binding.descriptorCount = 1u;
+    set_binding.descriptorType = ToVKDescriptorType(layout.descriptor_type);
+    set_binding.stageFlags = ToVkShaderStage(layout.shader_stage);
+    // TODO(143719): This specifies the immutable sampler for all sampled
+    // images. This is incorrect. In cases where the shader samples from the
+    // multiple images, there is currently no way to tell which sampler needs to
+    // be immutable and which one needs a binding set in the render pass. Expect
+    // errors if the shader has more than on sampled image. The sampling from
+    // the one that is expected to be non-immutable will be incorrect.
+    if (vk_immutable_sampler &&
+        layout.descriptor_type == DescriptorType::kSampledImage) {
+      set_binding.setImmutableSamplers(vk_immutable_sampler);
+    }
+    set_bindings.push_back(set_binding);
+  }
+
+  vk::DescriptorSetLayoutCreateInfo desc_set_layout_info;
+  desc_set_layout_info.setBindings(set_bindings);
+
+  auto [descs_result, descs_layout] =
+      device_holder->GetDevice().createDescriptorSetLayoutUnique(
+          desc_set_layout_info);
+  if (descs_result != vk::Result::eSuccess) {
+    VALIDATION_LOG << "unable to create uniform descriptors";
+    return nullptr;
+  }
+
+  ContextVK::SetDebugName(device_holder->GetDevice(), descs_layout.get(),
+                          "Descriptor Set Layout " + desc.GetLabel());
+
+  //----------------------------------------------------------------------------
+  /// Create the pipeline layout.
+  ///
+  vk::PipelineLayoutCreateInfo pipeline_layout_info;
+  pipeline_layout_info.setSetLayouts(descs_layout.get());
+  auto pipeline_layout = device_holder->GetDevice().createPipelineLayoutUnique(
+      pipeline_layout_info);
+  if (pipeline_layout.result != vk::Result::eSuccess) {
+    VALIDATION_LOG << "Could not create pipeline layout for pipeline "
+                   << desc.GetLabel() << ": "
+                   << vk::to_string(pipeline_layout.result);
+    return nullptr;
+  }
+  pipeline_info.setLayout(pipeline_layout.value.get());
+
+  //----------------------------------------------------------------------------
+  /// Create the depth stencil state.
+  ///
+  auto depth_stencil_state = ToVKPipelineDepthStencilStateCreateInfo(
+      desc.GetDepthStencilAttachmentDescriptor(),
+      desc.GetFrontStencilAttachmentDescriptor(),
+      desc.GetBackStencilAttachmentDescriptor());
+  pipeline_info.setPDepthStencilState(&depth_stencil_state);
+
+  //----------------------------------------------------------------------------
+  /// Setup the optional pipeline creation feedback struct so we can understand
+  /// how Vulkan created the PSO.
+  ///
+  auto& feedback = chain.get<vk::PipelineCreationFeedbackCreateInfoEXT>();
+  auto pipeline_feedback = EmptyFeedback();
+  std::vector<vk::PipelineCreationFeedbackEXT> stage_feedbacks(
+      pipeline_info.stageCount, EmptyFeedback());
+  feedback.setPPipelineCreationFeedback(&pipeline_feedback);
+  feedback.setPipelineStageCreationFeedbacks(stage_feedbacks);
+
+  //----------------------------------------------------------------------------
+  /// Finally, all done with the setup info. Create the pipeline itself.
+  ///
+  auto pipeline = pso_cache->CreatePipeline(pipeline_info);
+  if (!pipeline) {
+    VALIDATION_LOG << "Could not create graphics pipeline: " << desc.GetLabel();
+    return nullptr;
+  }
+
+  if (supports_pipeline_creation_feedback) {
+    ReportPipelineCreationFeedback(desc, feedback);
+  }
+
+  ContextVK::SetDebugName(device_holder->GetDevice(), *pipeline_layout.value,
+                          "Pipeline Layout " + desc.GetLabel());
+  ContextVK::SetDebugName(device_holder->GetDevice(), *pipeline,
+                          "Pipeline " + desc.GetLabel());
+
+  auto pipeline_vk = std::unique_ptr<PipelineVK>(new PipelineVK(
+      device_holder,                     //
+      library,                           //
+      desc,                              //
+      std::move(pipeline),               //
+      std::move(render_pass),            //
+      std::move(pipeline_layout.value),  //
+      std::move(descs_layout),           //
+      std::move(immutable_sampler)       //
+      ));
+  if (!pipeline_vk->IsValid()) {
+    VALIDATION_LOG << "Could not create a valid pipeline.";
+    return nullptr;
+  }
+  return pipeline_vk;
+}
+
+PipelineVK::PipelineVK(std::weak_ptr<DeviceHolderVK> device_holder,
+                       std::weak_ptr<PipelineLibrary> library,
                        const PipelineDescriptor& desc,
-                       std::unique_ptr<PipelineCreateInfoVK> create_info)
+                       vk::UniquePipeline pipeline,
+                       vk::UniqueRenderPass render_pass,
+                       vk::UniquePipelineLayout layout,
+                       vk::UniqueDescriptorSetLayout descriptor_set_layout,
+                       std::shared_ptr<SamplerVK> immutable_sampler)
     : Pipeline(std::move(library), desc),
-      pipeline_info_(std::move(create_info)) {}
+      device_holder_(std::move(device_holder)),
+      pipeline_(std::move(pipeline)),
+      render_pass_(std::move(render_pass)),
+      layout_(std::move(layout)),
+      descriptor_set_layout_(std::move(descriptor_set_layout)),
+      immutable_sampler_(std::move(immutable_sampler)) {
+  is_valid_ = pipeline_ && render_pass_ && layout_ && descriptor_set_layout_;
+}
 
-PipelineVK::~PipelineVK() = default;
+PipelineVK::~PipelineVK() {
+  if (auto device = device_holder_.lock(); !device) {
+    descriptor_set_layout_.release();
+    layout_.release();
+    render_pass_.release();
+    pipeline_.release();
+  }
+}
 
 bool PipelineVK::IsValid() const {
-  return pipeline_info_->IsValid();
+  return is_valid_;
+}
+
+vk::Pipeline PipelineVK::GetPipeline() const {
+  return *pipeline_;
+}
+
+const vk::PipelineLayout& PipelineVK::GetPipelineLayout() const {
+  return *layout_;
+}
+
+const vk::DescriptorSetLayout& PipelineVK::GetDescriptorSetLayout() const {
+  return *descriptor_set_layout_;
 }
 
-PipelineCreateInfoVK* PipelineVK::GetCreateInfo() const {
-  return pipeline_info_.get();
+std::shared_ptr<PipelineVK> PipelineVK::CreateVariantForImmutableSamplers(
+    const std::shared_ptr<SamplerVK>& immutable_sampler) const {
+  if (!immutable_sampler) {
+    return nullptr;
+  }
+  auto cache_key = ImmutableSamplerKeyVK{*immutable_sampler};
+  Lock lock(immutable_sampler_variants_mutex_);
+  auto found = immutable_sampler_variants_.find(cache_key);
+  if (found != immutable_sampler_variants_.end()) {
+    return found->second;
+  }
+  auto device_holder = device_holder_.lock();
+  if (!device_holder) {
+    return nullptr;
+  }
+  return (immutable_sampler_variants_[cache_key] =
+              Create(desc_, device_holder, library_, immutable_sampler));
 }
 
 }  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/pipeline_vk.h b/impeller/renderer/backend/vulkan/pipeline_vk.h
index ce7b988d44d58da15f0e13f7acd8940d3b8e8a26..5ab4feccfde895abf029481799ab7f68c9a5f588 100644
--- a/impeller/renderer/backend/vulkan/pipeline_vk.h
+++ b/impeller/renderer/backend/vulkan/pipeline_vk.h
@@ -2,64 +2,88 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_PIPELINE_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_PIPELINE_VK_H_
 
+#include <future>
 #include <memory>
 
-#include "flutter/fml/macros.h"
 #include "impeller/base/backend_cast.h"
+#include "impeller/base/thread.h"
+#include "impeller/core/texture.h"
+#include "impeller/renderer/backend/vulkan/device_holder_vk.h"
+#include "impeller/renderer/backend/vulkan/formats_vk.h"
+#include "impeller/renderer/backend/vulkan/pipeline_cache_vk.h"
+#include "impeller/renderer/backend/vulkan/sampler_vk.h"
 #include "impeller/renderer/backend/vulkan/vk.h"
+#include "impeller/renderer/backend/vulkan/yuv_conversion_vk.h"
 #include "impeller/renderer/pipeline.h"
 
 namespace impeller {
 
-class PipelineCreateInfoVK {
+// Limit on the total number of buffer and image bindings that allow the Vulkan
+// backend to avoid dynamic heap allocations.
+static constexpr size_t kMaxBindings = 32;
+
+class PipelineVK final
+    : public Pipeline<PipelineDescriptor>,
+      public BackendCast<PipelineVK, Pipeline<PipelineDescriptor>> {
  public:
-  PipelineCreateInfoVK(vk::UniquePipeline pipeline,
-                       vk::UniqueRenderPass render_pass,
-                       vk::UniquePipelineLayout pipeline_layout,
-                       vk::UniqueDescriptorSetLayout descriptor_set_layout);
+  static std::unique_ptr<PipelineVK> Create(
+      const PipelineDescriptor& desc,
+      const std::shared_ptr<DeviceHolderVK>& device_holder,
+      const std::weak_ptr<PipelineLibrary>& weak_library,
+      std::shared_ptr<SamplerVK> immutable_sampler = {});
 
-  bool IsValid() const;
+  // |Pipeline|
+  ~PipelineVK() override;
 
-  vk::Pipeline GetVKPipeline() const;
+  vk::Pipeline GetPipeline() const;
 
-  vk::RenderPass GetRenderPass() const;
+  const vk::PipelineLayout& GetPipelineLayout() const;
 
-  vk::PipelineLayout GetPipelineLayout() const;
+  const vk::DescriptorSetLayout& GetDescriptorSetLayout() const;
 
-  vk::DescriptorSetLayout GetDescriptorSetLayout() const;
+  std::shared_ptr<PipelineVK> CreateVariantForImmutableSamplers(
+      const std::shared_ptr<SamplerVK>& immutable_sampler) const;
 
  private:
-  bool is_valid_ = false;
+  friend class PipelineLibraryVK;
+
+  using ImmutableSamplerVariants =
+      std::unordered_map<ImmutableSamplerKeyVK,
+                         std::shared_ptr<PipelineVK>,
+                         ComparableHash<ImmutableSamplerKeyVK>,
+                         ComparableEqual<ImmutableSamplerKeyVK>>;
+
+  std::weak_ptr<DeviceHolderVK> device_holder_;
   vk::UniquePipeline pipeline_;
   vk::UniqueRenderPass render_pass_;
-  vk::UniquePipelineLayout pipeline_layout_;
+  vk::UniquePipelineLayout layout_;
   vk::UniqueDescriptorSetLayout descriptor_set_layout_;
-};
+  std::shared_ptr<SamplerVK> immutable_sampler_;
+  mutable Mutex immutable_sampler_variants_mutex_;
+  mutable ImmutableSamplerVariants immutable_sampler_variants_ IPLR_GUARDED_BY(
+      immutable_sampler_variants_mutex_);
+  bool is_valid_ = false;
 
-class PipelineVK final
-    : public Pipeline<PipelineDescriptor>,
-      public BackendCast<PipelineVK, Pipeline<PipelineDescriptor>> {
- public:
-  PipelineVK(std::weak_ptr<PipelineLibrary> library,
+  PipelineVK(std::weak_ptr<DeviceHolderVK> device_holder,
+             std::weak_ptr<PipelineLibrary> library,
              const PipelineDescriptor& desc,
-             std::unique_ptr<PipelineCreateInfoVK> create_info);
-
-  // |Pipeline|
-  ~PipelineVK() override;
-
-  PipelineCreateInfoVK* GetCreateInfo() const;
-
- private:
-  friend class PipelineLibraryVK;
+             vk::UniquePipeline pipeline,
+             vk::UniqueRenderPass render_pass,
+             vk::UniquePipelineLayout layout,
+             vk::UniqueDescriptorSetLayout descriptor_set_layout,
+             std::shared_ptr<SamplerVK> immutable_sampler);
 
   // |Pipeline|
   bool IsValid() const override;
 
-  std::unique_ptr<PipelineCreateInfoVK> pipeline_info_;
+  PipelineVK(const PipelineVK&) = delete;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(PipelineVK);
+  PipelineVK& operator=(const PipelineVK&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_PIPELINE_VK_H_
diff --git a/impeller/renderer/backend/vulkan/queue_vk.cc b/impeller/renderer/backend/vulkan/queue_vk.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c35dc21e6812d0823df0083d83bb3adb99da124d
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/queue_vk.cc
@@ -0,0 +1,79 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/backend/vulkan/queue_vk.h"
+
+#include "impeller/renderer/backend/vulkan/context_vk.h"
+
+namespace impeller {
+
+QueueVK::QueueVK(QueueIndexVK index, vk::Queue queue)
+    : index_(index), queue_(queue) {}
+
+QueueVK::~QueueVK() = default;
+
+const QueueIndexVK& QueueVK::GetIndex() const {
+  return index_;
+}
+
+vk::Result QueueVK::Submit(const vk::SubmitInfo& submit_info,
+                           const vk::Fence& fence) const {
+  Lock lock(queue_mutex_);
+  return queue_.submit(submit_info, fence);
+}
+
+vk::Result QueueVK::Present(const vk::PresentInfoKHR& present_info) {
+  Lock lock(queue_mutex_);
+  return queue_.presentKHR(present_info);
+}
+
+void QueueVK::InsertDebugMarker(std::string_view label) const {
+  if (!HasValidationLayers()) {
+    return;
+  }
+  vk::DebugUtilsLabelEXT label_info;
+  label_info.pLabelName = label.data();
+  Lock lock(queue_mutex_);
+  queue_.insertDebugUtilsLabelEXT(label_info);
+}
+
+QueuesVK::QueuesVK() = default;
+
+QueuesVK::QueuesVK(const vk::Device& device,
+                   QueueIndexVK graphics,
+                   QueueIndexVK compute,
+                   QueueIndexVK transfer) {
+  auto vk_graphics = device.getQueue(graphics.family, graphics.index);
+  auto vk_compute = device.getQueue(compute.family, compute.index);
+  auto vk_transfer = device.getQueue(transfer.family, transfer.index);
+
+  // Always set up the graphics queue.
+  graphics_queue = std::make_shared<QueueVK>(graphics, vk_graphics);
+  ContextVK::SetDebugName(device, vk_graphics, "ImpellerGraphicsQ");
+
+  // Setup the compute queue if its different from the graphics queue.
+  if (compute == graphics) {
+    compute_queue = graphics_queue;
+  } else {
+    compute_queue = std::make_shared<QueueVK>(compute, vk_compute);
+    ContextVK::SetDebugName(device, vk_compute, "ImpellerComputeQ");
+  }
+
+  // Setup the transfer queue if its different from the graphics or compute
+  // queues.
+  if (transfer == graphics) {
+    transfer_queue = graphics_queue;
+  } else if (transfer == compute) {
+    transfer_queue = compute_queue;
+  } else {
+    transfer_queue = std::make_shared<QueueVK>(transfer, vk_transfer);
+    ContextVK::SetDebugName(device, vk_transfer, "ImpellerTransferQ");
+  }
+}
+
+bool QueuesVK::IsValid() const {
+  return graphics_queue && compute_queue && transfer_queue;
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/queue_vk.h b/impeller/renderer/backend/vulkan/queue_vk.h
new file mode 100644
index 0000000000000000000000000000000000000000..62d650bfc6176da8751f7cdb396932e76b7a771d
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/queue_vk.h
@@ -0,0 +1,78 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_QUEUE_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_QUEUE_VK_H_
+
+#include <memory>
+
+#include "impeller/base/thread.h"
+#include "impeller/renderer/backend/vulkan/vk.h"
+
+namespace impeller {
+
+struct QueueIndexVK {
+  size_t family = 0;
+  size_t index = 0;
+
+  constexpr bool operator==(const QueueIndexVK& other) const {
+    return family == other.family && index == other.index;
+  }
+};
+
+//------------------------------------------------------------------------------
+/// @brief      A thread safe object that can be used to access device queues.
+///             If multiple objects are created with the same underlying queue,
+///             then the external synchronization guarantees of Vulkan queues
+///             cannot be met. So care must be taken the same device queue
+///             doesn't form the basis of multiple `QueueVK`s.
+///
+class QueueVK {
+ public:
+  QueueVK(QueueIndexVK index, vk::Queue queue);
+
+  ~QueueVK();
+
+  const QueueIndexVK& GetIndex() const;
+
+  vk::Result Submit(const vk::SubmitInfo& submit_info,
+                    const vk::Fence& fence) const;
+
+  vk::Result Present(const vk::PresentInfoKHR& present_info);
+
+  void InsertDebugMarker(std::string_view label) const;
+
+ private:
+  mutable Mutex queue_mutex_;
+
+  const QueueIndexVK index_;
+  const vk::Queue queue_ IPLR_GUARDED_BY(queue_mutex_);
+
+  QueueVK(const QueueVK&) = delete;
+
+  QueueVK& operator=(const QueueVK&) = delete;
+};
+
+//------------------------------------------------------------------------------
+/// @brief      The collection of queues used by the context. The queues may all
+///             be the same.
+///
+struct QueuesVK {
+  std::shared_ptr<QueueVK> graphics_queue;
+  std::shared_ptr<QueueVK> compute_queue;
+  std::shared_ptr<QueueVK> transfer_queue;
+
+  QueuesVK();
+
+  QueuesVK(const vk::Device& device,
+           QueueIndexVK graphics,
+           QueueIndexVK compute,
+           QueueIndexVK transfer);
+
+  bool IsValid() const;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_QUEUE_VK_H_
diff --git a/impeller/renderer/backend/vulkan/render_pass_builder_vk.cc b/impeller/renderer/backend/vulkan/render_pass_builder_vk.cc
new file mode 100644
index 0000000000000000000000000000000000000000..5b514e83a7a8bfc2b3bb80066bf88f6af14c27d3
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/render_pass_builder_vk.cc
@@ -0,0 +1,203 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/backend/vulkan/render_pass_builder_vk.h"
+
+#include <vector>
+
+#include "impeller/renderer/backend/vulkan/formats_vk.h"
+
+namespace impeller {
+
+constexpr auto kSelfDependencySrcStageMask =
+    vk::PipelineStageFlagBits::eColorAttachmentOutput;
+constexpr auto kSelfDependencySrcAccessMask =
+    vk::AccessFlagBits::eColorAttachmentWrite;
+
+constexpr auto kSelfDependencyDstStageMask =
+    vk::PipelineStageFlagBits::eFragmentShader;
+constexpr auto kSelfDependencyDstAccessMask =
+    vk::AccessFlagBits::eInputAttachmentRead;
+
+constexpr auto kSelfDependencyFlags = vk::DependencyFlagBits::eByRegion;
+
+RenderPassBuilderVK::RenderPassBuilderVK() = default;
+
+RenderPassBuilderVK::~RenderPassBuilderVK() = default;
+
+RenderPassBuilderVK& RenderPassBuilderVK::SetColorAttachment(
+    size_t index,
+    PixelFormat format,
+    SampleCount sample_count,
+    LoadAction load_action,
+    StoreAction store_action) {
+  vk::AttachmentDescription desc;
+  desc.format = ToVKImageFormat(format);
+  desc.samples = ToVKSampleCount(sample_count);
+  desc.loadOp = ToVKAttachmentLoadOp(load_action);
+  desc.storeOp = ToVKAttachmentStoreOp(store_action, false);
+  desc.stencilLoadOp = vk::AttachmentLoadOp::eDontCare;
+  desc.stencilStoreOp = vk::AttachmentStoreOp::eDontCare;
+  desc.initialLayout = vk::ImageLayout::eGeneral;
+  desc.finalLayout = vk::ImageLayout::eGeneral;
+  colors_[index] = desc;
+
+  if (StoreActionPerformsResolve(store_action)) {
+    desc.storeOp = ToVKAttachmentStoreOp(store_action, true);
+    desc.samples = vk::SampleCountFlagBits::e1;
+    resolves_[index] = desc;
+  } else {
+    resolves_.erase(index);
+  }
+  return *this;
+}
+
+RenderPassBuilderVK& RenderPassBuilderVK::SetDepthStencilAttachment(
+    PixelFormat format,
+    SampleCount sample_count,
+    LoadAction load_action,
+    StoreAction store_action) {
+  vk::AttachmentDescription desc;
+  desc.format = ToVKImageFormat(format);
+  desc.samples = ToVKSampleCount(sample_count);
+  desc.loadOp = ToVKAttachmentLoadOp(load_action);
+  desc.storeOp = ToVKAttachmentStoreOp(store_action, false);
+  desc.stencilLoadOp = desc.loadOp;    // Not separable in Impeller.
+  desc.stencilStoreOp = desc.storeOp;  // Not separable in Impeller.
+  desc.initialLayout = vk::ImageLayout::eUndefined;
+  desc.finalLayout = vk::ImageLayout::eDepthStencilAttachmentOptimal;
+  depth_stencil_ = desc;
+  return *this;
+}
+
+RenderPassBuilderVK& RenderPassBuilderVK::SetStencilAttachment(
+    PixelFormat format,
+    SampleCount sample_count,
+    LoadAction load_action,
+    StoreAction store_action) {
+  vk::AttachmentDescription desc;
+  desc.format = ToVKImageFormat(format);
+  desc.samples = ToVKSampleCount(sample_count);
+  desc.loadOp = vk::AttachmentLoadOp::eDontCare;
+  desc.storeOp = vk::AttachmentStoreOp::eDontCare;
+  desc.stencilLoadOp = ToVKAttachmentLoadOp(load_action);
+  desc.stencilStoreOp = ToVKAttachmentStoreOp(store_action, false);
+  desc.initialLayout = vk::ImageLayout::eUndefined;
+  desc.finalLayout = vk::ImageLayout::eDepthStencilAttachmentOptimal;
+  depth_stencil_ = desc;
+  return *this;
+}
+
+vk::UniqueRenderPass RenderPassBuilderVK::Build(
+    const vk::Device& device) const {
+  // This must be less than `VkPhysicalDeviceLimits::maxColorAttachments` but we
+  // are not checking.
+  const auto color_attachments_count =
+      colors_.empty() ? 0u : colors_.rbegin()->first + 1u;
+
+  std::vector<vk::AttachmentDescription> attachments;
+
+  std::vector<vk::AttachmentReference> color_refs(color_attachments_count,
+                                                  kUnusedAttachmentReference);
+  std::vector<vk::AttachmentReference> resolve_refs(color_attachments_count,
+                                                    kUnusedAttachmentReference);
+  vk::AttachmentReference depth_stencil_ref = kUnusedAttachmentReference;
+
+  for (const auto& color : colors_) {
+    vk::AttachmentReference color_ref;
+    color_ref.attachment = attachments.size();
+    color_ref.layout = vk::ImageLayout::eGeneral;
+    color_refs[color.first] = color_ref;
+    attachments.push_back(color.second);
+
+    if (auto found = resolves_.find(color.first); found != resolves_.end()) {
+      vk::AttachmentReference resolve_ref;
+      resolve_ref.attachment = attachments.size();
+      resolve_ref.layout = vk::ImageLayout::eGeneral;
+      resolve_refs[color.first] = resolve_ref;
+      attachments.push_back(found->second);
+    }
+  }
+
+  if (depth_stencil_.has_value()) {
+    depth_stencil_ref.attachment = attachments.size();
+    depth_stencil_ref.layout = vk::ImageLayout::eGeneral;
+    attachments.push_back(depth_stencil_.value());
+  }
+
+  vk::SubpassDescription subpass0;
+  subpass0.pipelineBindPoint = vk::PipelineBindPoint::eGraphics;
+  subpass0.setInputAttachments(color_refs);
+  subpass0.setColorAttachments(color_refs);
+  subpass0.setResolveAttachments(resolve_refs);
+  subpass0.setPDepthStencilAttachment(&depth_stencil_ref);
+
+  vk::SubpassDependency self_dep;
+  self_dep.srcSubpass = 0u;  // first subpass
+  self_dep.dstSubpass = 0u;  // to itself
+  self_dep.srcStageMask = kSelfDependencySrcStageMask;
+  self_dep.srcAccessMask = kSelfDependencySrcAccessMask;
+  self_dep.dstStageMask = kSelfDependencyDstStageMask;
+  self_dep.dstAccessMask = kSelfDependencyDstAccessMask;
+  self_dep.dependencyFlags = kSelfDependencyFlags;
+
+  vk::RenderPassCreateInfo render_pass_desc;
+  render_pass_desc.setAttachments(attachments);
+  render_pass_desc.setSubpasses(subpass0);
+  render_pass_desc.setDependencies(self_dep);
+
+  auto [result, pass] = device.createRenderPassUnique(render_pass_desc);
+  if (result != vk::Result::eSuccess) {
+    VALIDATION_LOG << "Failed to create render pass: " << vk::to_string(result);
+    return {};
+  }
+  return std::move(pass);
+}
+
+void InsertBarrierForInputAttachmentRead(const vk::CommandBuffer& buffer,
+                                         const vk::Image& image) {
+  // This barrier must be a subset of the masks specified in the subpass
+  // dependency setup.
+  vk::ImageMemoryBarrier barrier;
+  barrier.srcAccessMask = kSelfDependencySrcAccessMask;
+  barrier.dstAccessMask = kSelfDependencyDstAccessMask;
+  barrier.oldLayout = vk::ImageLayout::eGeneral;
+  barrier.newLayout = vk::ImageLayout::eGeneral;
+  barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+  barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+  barrier.image = image;
+
+  vk::ImageSubresourceRange image_levels;
+  image_levels.aspectMask = vk::ImageAspectFlagBits::eColor;
+  image_levels.baseArrayLayer = 0u;
+  image_levels.baseMipLevel = 0u;
+  image_levels.layerCount = VK_REMAINING_ARRAY_LAYERS;
+  image_levels.levelCount = VK_REMAINING_MIP_LEVELS;
+  barrier.subresourceRange = image_levels;
+
+  buffer.pipelineBarrier(kSelfDependencySrcStageMask,  //
+                         kSelfDependencyDstStageMask,  //
+                         kSelfDependencyFlags,         //
+                         {},                           //
+                         {},                           //
+                         barrier                       //
+  );
+}
+
+const std::map<size_t, vk::AttachmentDescription>&
+RenderPassBuilderVK::GetColorAttachments() const {
+  return colors_;
+}
+
+const std::map<size_t, vk::AttachmentDescription>&
+RenderPassBuilderVK::GetResolves() const {
+  return resolves_;
+}
+
+const std::optional<vk::AttachmentDescription>&
+RenderPassBuilderVK::GetDepthStencil() const {
+  return depth_stencil_;
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/render_pass_builder_vk.h b/impeller/renderer/backend/vulkan/render_pass_builder_vk.h
new file mode 100644
index 0000000000000000000000000000000000000000..4ef1924e8fe32f56bc6690c0210657408e3f7dfe
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/render_pass_builder_vk.h
@@ -0,0 +1,81 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_RENDER_PASS_BUILDER_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_RENDER_PASS_BUILDER_VK_H_
+
+#include <map>
+#include <optional>
+
+#include "impeller/core/formats.h"
+#include "impeller/renderer/backend/vulkan/context_vk.h"
+#include "impeller/renderer/backend/vulkan/vk.h"
+
+namespace impeller {
+
+class RenderPassBuilderVK {
+ public:
+  RenderPassBuilderVK();
+
+  ~RenderPassBuilderVK();
+
+  RenderPassBuilderVK(const RenderPassBuilderVK&) = delete;
+
+  RenderPassBuilderVK& operator=(const RenderPassBuilderVK&) = delete;
+
+  RenderPassBuilderVK& SetColorAttachment(size_t index,
+                                          PixelFormat format,
+                                          SampleCount sample_count,
+                                          LoadAction load_action,
+                                          StoreAction store_action);
+
+  RenderPassBuilderVK& SetDepthStencilAttachment(PixelFormat format,
+                                                 SampleCount sample_count,
+                                                 LoadAction load_action,
+                                                 StoreAction store_action);
+
+  RenderPassBuilderVK& SetStencilAttachment(PixelFormat format,
+                                            SampleCount sample_count,
+                                            LoadAction load_action,
+                                            StoreAction store_action);
+
+  vk::UniqueRenderPass Build(const vk::Device& device) const;
+
+  // Visible for testing.
+  const std::map<size_t, vk::AttachmentDescription>& GetColorAttachments()
+      const;
+
+  // Visible for testing.
+  const std::map<size_t, vk::AttachmentDescription>& GetResolves() const;
+
+  // Visible for testing.
+  const std::optional<vk::AttachmentDescription>& GetDepthStencil() const;
+
+ private:
+  std::map<size_t, vk::AttachmentDescription> colors_;
+  std::map<size_t, vk::AttachmentDescription> resolves_;
+  std::optional<vk::AttachmentDescription> depth_stencil_;
+};
+
+//------------------------------------------------------------------------------
+/// @brief      Inserts the appropriate barriers to ensure that subsequent
+///             commands can read from the specified image (itself a framebuffer
+///             attachment) as an input attachment.
+///
+///             Unlike most barriers, this barrier may only be inserted within a
+///             Vulkan render-pass.
+///
+///             The type of barrier inserted depends on the subpass setup and
+///             self-dependencies. Only use this utility method for inserting
+///             barriers in render passes created by `RenderPassBuilderVK`.
+///
+/// @param[in]  buffer  The buffer
+/// @param[in]  image   The image
+///
+void InsertBarrierForInputAttachmentRead(const vk::CommandBuffer& buffer,
+                                         const vk::Image& image);
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_RENDER_PASS_BUILDER_VK_H_
diff --git a/impeller/renderer/backend/vulkan/render_pass_builder_vk_unittests.cc b/impeller/renderer/backend/vulkan/render_pass_builder_vk_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..458702c357c2451f8f8d1499d7052795746e4954
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/render_pass_builder_vk_unittests.cc
@@ -0,0 +1,137 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/testing/testing.h"  // IWYU pragma: keep
+#include "gtest/gtest.h"
+#include "impeller/core/formats.h"
+#include "impeller/renderer/backend/vulkan/render_pass_builder_vk.h"
+#include "impeller/renderer/backend/vulkan/test/mock_vulkan.h"
+#include "vulkan/vulkan_enums.hpp"
+
+namespace impeller {
+namespace testing {
+
+TEST(RenderPassBuilder, CreatesRenderPassWithNoDepthStencil) {
+  RenderPassBuilderVK builder = RenderPassBuilderVK();
+  auto const context = MockVulkanContextBuilder().Build();
+
+  // Create a single color attachment with a transient depth stencil.
+  builder.SetColorAttachment(0, PixelFormat::kR8G8B8A8UNormInt,
+                             SampleCount::kCount1, LoadAction::kClear,
+                             StoreAction::kStore);
+
+  auto render_pass = builder.Build(context->GetDevice());
+
+  EXPECT_TRUE(!!render_pass);
+  EXPECT_FALSE(builder.GetDepthStencil().has_value());
+}
+
+TEST(RenderPassBuilder, CreatesRenderPassWithCombinedDepthStencil) {
+  RenderPassBuilderVK builder = RenderPassBuilderVK();
+  auto const context = MockVulkanContextBuilder().Build();
+
+  // Create a single color attachment with a transient depth stencil.
+  builder.SetColorAttachment(0, PixelFormat::kR8G8B8A8UNormInt,
+                             SampleCount::kCount1, LoadAction::kClear,
+                             StoreAction::kStore);
+  builder.SetDepthStencilAttachment(PixelFormat::kD24UnormS8Uint,
+                                    SampleCount::kCount1, LoadAction::kDontCare,
+                                    StoreAction::kDontCare);
+
+  auto render_pass = builder.Build(context->GetDevice());
+
+  EXPECT_TRUE(!!render_pass);
+
+  auto maybe_color = builder.GetColorAttachments().find(0u);
+  ASSERT_NE(maybe_color, builder.GetColorAttachments().end());
+  auto color = maybe_color->second;
+
+  EXPECT_EQ(color.initialLayout, vk::ImageLayout::eGeneral);
+  EXPECT_EQ(color.finalLayout, vk::ImageLayout::eGeneral);
+  EXPECT_EQ(color.loadOp, vk::AttachmentLoadOp::eClear);
+  EXPECT_EQ(color.storeOp, vk::AttachmentStoreOp::eStore);
+
+  auto maybe_depth_stencil = builder.GetDepthStencil();
+  ASSERT_TRUE(maybe_depth_stencil.has_value());
+  if (!maybe_depth_stencil.has_value()) {
+    return;
+  }
+  auto depth_stencil = maybe_depth_stencil.value();
+
+  EXPECT_EQ(depth_stencil.initialLayout, vk::ImageLayout::eUndefined);
+  EXPECT_EQ(depth_stencil.finalLayout,
+            vk::ImageLayout::eDepthStencilAttachmentOptimal);
+  EXPECT_EQ(depth_stencil.loadOp, vk::AttachmentLoadOp::eDontCare);
+  EXPECT_EQ(depth_stencil.storeOp, vk::AttachmentStoreOp::eDontCare);
+  EXPECT_EQ(depth_stencil.stencilLoadOp, vk::AttachmentLoadOp::eDontCare);
+  EXPECT_EQ(depth_stencil.stencilStoreOp, vk::AttachmentStoreOp::eDontCare);
+}
+
+TEST(RenderPassBuilder, CreatesRenderPassWithOnlyStencil) {
+  RenderPassBuilderVK builder = RenderPassBuilderVK();
+  auto const context = MockVulkanContextBuilder().Build();
+
+  // Create a single color attachment with a transient depth stencil.
+  builder.SetColorAttachment(0, PixelFormat::kR8G8B8A8UNormInt,
+                             SampleCount::kCount1, LoadAction::kClear,
+                             StoreAction::kStore);
+  builder.SetStencilAttachment(PixelFormat::kS8UInt, SampleCount::kCount1,
+                               LoadAction::kDontCare, StoreAction::kDontCare);
+
+  auto render_pass = builder.Build(context->GetDevice());
+
+  EXPECT_TRUE(!!render_pass);
+
+  auto maybe_depth_stencil = builder.GetDepthStencil();
+  ASSERT_TRUE(maybe_depth_stencil.has_value());
+  if (!maybe_depth_stencil.has_value()) {
+    return;
+  }
+  auto depth_stencil = maybe_depth_stencil.value();
+
+  EXPECT_EQ(depth_stencil.initialLayout, vk::ImageLayout::eUndefined);
+  EXPECT_EQ(depth_stencil.finalLayout,
+            vk::ImageLayout::eDepthStencilAttachmentOptimal);
+  EXPECT_EQ(depth_stencil.loadOp, vk::AttachmentLoadOp::eDontCare);
+  EXPECT_EQ(depth_stencil.storeOp, vk::AttachmentStoreOp::eDontCare);
+  EXPECT_EQ(depth_stencil.stencilLoadOp, vk::AttachmentLoadOp::eDontCare);
+  EXPECT_EQ(depth_stencil.stencilStoreOp, vk::AttachmentStoreOp::eDontCare);
+}
+
+TEST(RenderPassBuilder, CreatesMSAAResolveWithCorrectStore) {
+  RenderPassBuilderVK builder = RenderPassBuilderVK();
+  auto const context = MockVulkanContextBuilder().Build();
+
+  // Create an MSAA color attachment.
+  builder.SetColorAttachment(0, PixelFormat::kR8G8B8A8UNormInt,
+                             SampleCount::kCount4, LoadAction::kClear,
+                             StoreAction::kMultisampleResolve);
+
+  auto render_pass = builder.Build(context->GetDevice());
+
+  EXPECT_TRUE(!!render_pass);
+
+  auto maybe_color = builder.GetColorAttachments().find(0u);
+  ASSERT_NE(maybe_color, builder.GetColorAttachments().end());
+  auto color = maybe_color->second;
+
+  // MSAA Texture.
+  EXPECT_EQ(color.initialLayout, vk::ImageLayout::eGeneral);
+  EXPECT_EQ(color.finalLayout, vk::ImageLayout::eGeneral);
+  EXPECT_EQ(color.loadOp, vk::AttachmentLoadOp::eClear);
+  EXPECT_EQ(color.storeOp, vk::AttachmentStoreOp::eDontCare);
+
+  auto maybe_resolve = builder.GetResolves().find(0u);
+  ASSERT_NE(maybe_resolve, builder.GetResolves().end());
+  auto resolve = maybe_resolve->second;
+
+  // MSAA Resolve Texture.
+  EXPECT_EQ(resolve.initialLayout, vk::ImageLayout::eGeneral);
+  EXPECT_EQ(resolve.finalLayout, vk::ImageLayout::eGeneral);
+  EXPECT_EQ(resolve.loadOp, vk::AttachmentLoadOp::eClear);
+  EXPECT_EQ(resolve.storeOp, vk::AttachmentStoreOp::eStore);
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/render_pass_cache_unittests.cc b/impeller/renderer/backend/vulkan/render_pass_cache_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..055c91a3ccb1007f2e3ff9c75091e7a323c092bd
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/render_pass_cache_unittests.cc
@@ -0,0 +1,51 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/testing/testing.h"
+#include "gtest/gtest.h"
+#include "impeller/playground/playground_test.h"
+#include "impeller/renderer/backend/vulkan/texture_vk.h"
+#include "impeller/renderer/render_target.h"
+
+namespace impeller {
+namespace testing {
+
+using RendererTest = PlaygroundTest;
+
+TEST_P(RendererTest, CachesRenderPassAndFramebuffer) {
+  if (GetBackend() != PlaygroundBackend::kVulkan) {
+    GTEST_SKIP() << "Test only applies to Vulkan";
+  }
+
+  auto allocator = std::make_shared<RenderTargetAllocator>(
+      GetContext()->GetResourceAllocator());
+
+  auto render_target =
+      allocator->CreateOffscreenMSAA(*GetContext(), {100, 100}, 1);
+  auto resolve_texture =
+      render_target.GetColorAttachments().find(0u)->second.resolve_texture;
+  auto& texture_vk = TextureVK::Cast(*resolve_texture);
+
+  EXPECT_EQ(texture_vk.GetCachedFramebuffer(), nullptr);
+  EXPECT_EQ(texture_vk.GetCachedRenderPass(), nullptr);
+
+  auto buffer = GetContext()->CreateCommandBuffer();
+  auto render_pass = buffer->CreateRenderPass(render_target);
+
+  EXPECT_NE(texture_vk.GetCachedFramebuffer(), nullptr);
+  EXPECT_NE(texture_vk.GetCachedRenderPass(), nullptr);
+
+  render_pass->EncodeCommands();
+  GetContext()->GetCommandQueue()->Submit({buffer});
+
+  // Can be reused without error.
+  auto buffer_2 = GetContext()->CreateCommandBuffer();
+  auto render_pass_2 = buffer_2->CreateRenderPass(render_target);
+
+  EXPECT_TRUE(render_pass_2->EncodeCommands());
+  EXPECT_TRUE(GetContext()->GetCommandQueue()->Submit({buffer_2}).ok());
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/render_pass_vk.cc b/impeller/renderer/backend/vulkan/render_pass_vk.cc
index 2d20bd051043cf9001e1ca7f48750515fd9dd4a1..205d1c6a991753fa820ace6f9e54a5ba552ebd42 100644
--- a/impeller/renderer/backend/vulkan/render_pass_vk.cc
+++ b/impeller/renderer/backend/vulkan/render_pass_vk.cc
@@ -8,486 +8,650 @@
 #include "impeller/renderer/backend/vulkan/render_pass_vk.h"
 
 #include <array>
+#include <cstdint>
 #include <vector>
 
-#include "fml/logging.h"
+#include "fml/status.h"
 #include "impeller/base/validation.h"
+#include "impeller/core/device_buffer.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/texture.h"
+#include "impeller/renderer/backend/vulkan/barrier_vk.h"
+#include "impeller/renderer/backend/vulkan/command_buffer_vk.h"
+#include "impeller/renderer/backend/vulkan/command_encoder_vk.h"
 #include "impeller/renderer/backend/vulkan/context_vk.h"
 #include "impeller/renderer/backend/vulkan/device_buffer_vk.h"
 #include "impeller/renderer/backend/vulkan/formats_vk.h"
 #include "impeller/renderer/backend/vulkan/pipeline_vk.h"
+#include "impeller/renderer/backend/vulkan/render_pass_builder_vk.h"
 #include "impeller/renderer/backend/vulkan/sampler_vk.h"
-#include "impeller/renderer/backend/vulkan/surface_producer_vk.h"
+#include "impeller/renderer/backend/vulkan/shared_object_vk.h"
 #include "impeller/renderer/backend/vulkan/texture_vk.h"
-#include "impeller/renderer/sampler.h"
-#include "impeller/renderer/shader_types.h"
-#include "vulkan/vulkan_enums.hpp"
-#include "vulkan/vulkan_structs.hpp"
+#include "impeller/renderer/backend/vulkan/vk.h"
+#include "vulkan/vulkan_handles.hpp"
 
 namespace impeller {
 
-static uint32_t color_flash = 0;
-
-RenderPassVK::RenderPassVK(
-    std::weak_ptr<const Context> context,
-    vk::Device device,
-    const RenderTarget& target,
-    std::shared_ptr<FencedCommandBufferVK> command_buffer,
-    vk::RenderPass render_pass)
-    : RenderPass(std::move(context), target),
-      device_(device),
-      command_buffer_(std::move(command_buffer)),
-      render_pass_(render_pass) {
-  is_valid_ = true;
+// Warning: if any of the constant values or layouts are changed in the
+// framebuffer fetch shader, then this input binding may need to be
+// manually changed.
+//
+// See: impeller/entity/shaders/blending/framebuffer_blend.frag
+static constexpr size_t kMagicSubpassInputBinding = 64u;
+
+static vk::ClearColorValue VKClearValueFromColor(Color color) {
+  vk::ClearColorValue value;
+  value.setFloat32(
+      std::array<float, 4>{color.red, color.green, color.blue, color.alpha});
+  return value;
 }
 
-RenderPassVK::~RenderPassVK() = default;
-
-bool RenderPassVK::IsValid() const {
-  return is_valid_;
+static vk::ClearDepthStencilValue VKClearValueFromDepthStencil(uint32_t stencil,
+                                                               Scalar depth) {
+  vk::ClearDepthStencilValue value;
+  value.depth = depth;
+  value.stencil = stencil;
+  return value;
 }
 
-void RenderPassVK::OnSetLabel(std::string label) {
-  label_ = std::move(label);
-}
+static std::vector<vk::ClearValue> GetVKClearValues(
+    const RenderTarget& target) {
+  std::vector<vk::ClearValue> clears;
 
-bool RenderPassVK::OnEncodeCommands(const Context& context) const {
-  if (!IsValid()) {
-    return false;
+  for (const auto& [_, color] : target.GetColorAttachments()) {
+    clears.emplace_back(VKClearValueFromColor(color.clear_color));
+    if (color.resolve_texture) {
+      clears.emplace_back(VKClearValueFromColor(color.clear_color));
+    }
   }
 
-  const auto& render_target = GetRenderTarget();
-  if (!render_target.HasColorAttachment(0u)) {
-    return false;
+  const auto& depth = target.GetDepthAttachment();
+  const auto& stencil = target.GetStencilAttachment();
+
+  if (depth.has_value()) {
+    clears.emplace_back(VKClearValueFromDepthStencil(
+        stencil ? stencil->clear_stencil : 0u, depth->clear_depth));
+  } else if (stencil.has_value()) {
+    clears.emplace_back(VKClearValueFromDepthStencil(
+        stencil->clear_stencil, depth ? depth->clear_depth : 0.0f));
   }
 
-  vk::CommandBufferBeginInfo begin_info;
-  auto res = command_buffer_->Get().begin(begin_info);
-  if (res != vk::Result::eSuccess) {
-    VALIDATION_LOG << "Failed to begin command buffer: " << vk::to_string(res);
-    return false;
+  return clears;
+}
+
+SharedHandleVK<vk::RenderPass> RenderPassVK::CreateVKRenderPass(
+    const ContextVK& context,
+    const SharedHandleVK<vk::RenderPass>& recycled_renderpass,
+    const std::shared_ptr<CommandBufferVK>& command_buffer) const {
+  BarrierVK barrier;
+  barrier.new_layout = vk::ImageLayout::eGeneral;
+  barrier.cmd_buffer = command_buffer->GetEncoder()->GetCommandBuffer();
+  barrier.src_access = vk::AccessFlagBits::eShaderRead;
+  barrier.src_stage = vk::PipelineStageFlagBits::eFragmentShader;
+  barrier.dst_access = vk::AccessFlagBits::eColorAttachmentWrite |
+                       vk::AccessFlagBits::eTransferWrite;
+  barrier.dst_stage = vk::PipelineStageFlagBits::eColorAttachmentOutput |
+                      vk::PipelineStageFlagBits::eTransfer;
+
+  RenderPassBuilderVK builder;
+
+  for (const auto& [bind_point, color] : render_target_.GetColorAttachments()) {
+    builder.SetColorAttachment(
+        bind_point,                                          //
+        color.texture->GetTextureDescriptor().format,        //
+        color.texture->GetTextureDescriptor().sample_count,  //
+        color.load_action,                                   //
+        color.store_action                                   //
+    );
+    TextureVK::Cast(*color.texture).SetLayout(barrier);
+    if (color.resolve_texture) {
+      TextureVK::Cast(*color.resolve_texture).SetLayout(barrier);
+    }
   }
 
-  const auto& color0 = render_target.GetColorAttachments().at(0u);
-  const auto& depth0 = render_target.GetDepthAttachment();
-  const auto& stencil0 = render_target.GetStencilAttachment();
+  if (auto depth = render_target_.GetDepthAttachment(); depth.has_value()) {
+    builder.SetDepthStencilAttachment(
+        depth->texture->GetTextureDescriptor().format,        //
+        depth->texture->GetTextureDescriptor().sample_count,  //
+        depth->load_action,                                   //
+        depth->store_action                                   //
+    );
+  } else if (auto stencil = render_target_.GetStencilAttachment();
+             stencil.has_value()) {
+    builder.SetStencilAttachment(
+        stencil->texture->GetTextureDescriptor().format,        //
+        stencil->texture->GetTextureDescriptor().sample_count,  //
+        stencil->load_action,                                   //
+        stencil->store_action                                   //
+    );
+  }
 
-  auto& texture = TextureVK::Cast(*color0.texture);
-  vk::Framebuffer framebuffer = CreateFrameBuffer(texture);
+  if (recycled_renderpass != nullptr) {
+    return recycled_renderpass;
+  }
 
-  command_buffer_->GetDeletionQueue()->Push(
-      [device = device_, fbo = framebuffer]() {
-        device.destroyFramebuffer(fbo);
-      });
+  auto pass = builder.Build(context.GetDevice());
 
-  // layout transition.
-  if (!TransitionImageLayout(texture.GetImage(), vk::ImageLayout::eUndefined,
-                             vk::ImageLayout::eColorAttachmentOptimal)) {
-    return false;
+  if (!pass) {
+    VALIDATION_LOG << "Failed to create render pass for framebuffer.";
+    return {};
   }
 
-  vk::ClearValue clear_value;
-  clear_value.color =
-      vk::ClearColorValue(std::array<float, 4>{0.0f, 0.0f, 0.0, 0.0f});
+  context.SetDebugName(pass.get(), debug_label_.c_str());
 
-  const auto& size = texture.GetTextureDescriptor().size;
-  vk::Rect2D render_area =
-      vk::Rect2D()
-          .setOffset(vk::Offset2D(0, 0))
-          .setExtent(vk::Extent2D(size.width, size.height));
-  auto rp_begin_info = vk::RenderPassBeginInfo()
-                           .setRenderPass(render_pass_)
-                           .setFramebuffer(framebuffer)
-                           .setRenderArea(render_area)
-                           .setClearValues(clear_value);
-
-  command_buffer_->Get().beginRenderPass(rp_begin_info,
-                                         vk::SubpassContents::eInline);
-
-  const auto& transients_allocator = context.GetResourceAllocator();
-
-  // encode the commands.
-  for (const auto& command : commands_) {
-    if (command.index_count == 0u) {
-      continue;
-    }
+  return MakeSharedVK(std::move(pass));
+}
 
-    if (command.instance_count == 0u) {
-      continue;
-    }
+RenderPassVK::RenderPassVK(const std::shared_ptr<const Context>& context,
+                           const RenderTarget& target,
+                           std::shared_ptr<CommandBufferVK> command_buffer)
+    : RenderPass(context, target), command_buffer_(std::move(command_buffer)) {
+  color_image_vk_ =
+      render_target_.GetColorAttachments().find(0u)->second.texture;
+  resolve_image_vk_ =
+      render_target_.GetColorAttachments().find(0u)->second.resolve_texture;
+
+  const auto& vk_context = ContextVK::Cast(*context);
+  const std::shared_ptr<CommandEncoderVK>& encoder =
+      command_buffer_->GetEncoder();
+  command_buffer_vk_ = encoder->GetCommandBuffer();
+  render_target_.IterateAllAttachments(
+      [&encoder](const auto& attachment) -> bool {
+        encoder->Track(attachment.texture);
+        encoder->Track(attachment.resolve_texture);
+        return true;
+      });
 
-    if (!command.pipeline) {
-      continue;
-    }
+  SharedHandleVK<vk::RenderPass> recycled_render_pass;
+  SharedHandleVK<vk::Framebuffer> recycled_framebuffer;
+  if (resolve_image_vk_) {
+    recycled_render_pass =
+        TextureVK::Cast(*resolve_image_vk_).GetCachedRenderPass();
+    recycled_framebuffer =
+        TextureVK::Cast(*resolve_image_vk_).GetCachedFramebuffer();
+  }
 
-    if (!EncodeCommand(context, command)) {
-      return false;
-    }
+  const auto& target_size = render_target_.GetRenderTargetSize();
+
+  render_pass_ =
+      CreateVKRenderPass(vk_context, recycled_render_pass, command_buffer_);
+  if (!render_pass_) {
+    VALIDATION_LOG << "Could not create renderpass.";
+    is_valid_ = false;
+    return;
   }
 
-  if (!TransitionImageLayout(texture.GetImage(), vk::ImageLayout::eUndefined,
-                             vk::ImageLayout::eColorAttachmentOptimal)) {
-    return false;
+  auto framebuffer = (recycled_framebuffer == nullptr)
+                         ? CreateVKFramebuffer(vk_context, *render_pass_)
+                         : recycled_framebuffer;
+  if (!framebuffer) {
+    VALIDATION_LOG << "Could not create framebuffer.";
+    is_valid_ = false;
+    return;
   }
 
-  command_buffer_->Get().endRenderPass();
+  if (!encoder->Track(framebuffer) || !encoder->Track(render_pass_)) {
+    is_valid_ = false;
+    return;
+  }
+  if (resolve_image_vk_) {
+    TextureVK::Cast(*resolve_image_vk_).SetCachedFramebuffer(framebuffer);
+    TextureVK::Cast(*resolve_image_vk_).SetCachedRenderPass(render_pass_);
+  }
 
-  return const_cast<RenderPassVK*>(this)->EndCommandBuffer();
-}
+  auto clear_values = GetVKClearValues(render_target_);
 
-bool RenderPassVK::EndCommandBuffer() {
-  if (command_buffer_) {
-    auto res = command_buffer_->Get().end();
-    if (res != vk::Result::eSuccess) {
-      VALIDATION_LOG << "Failed to end command buffer: " << vk::to_string(res);
-      return false;
-    }
+  vk::RenderPassBeginInfo pass_info;
+  pass_info.renderPass = *render_pass_;
+  pass_info.framebuffer = *framebuffer;
+  pass_info.renderArea.extent.width = static_cast<uint32_t>(target_size.width);
+  pass_info.renderArea.extent.height =
+      static_cast<uint32_t>(target_size.height);
+  pass_info.setClearValues(clear_values);
 
-    const auto& context_vk = GetContextVK();
-    command_buffer_->GetDeletionQueue()->Push(
-        [device = device_, render_pass = render_pass_]() {
-          device.destroyRenderPass(render_pass);
-        });
+  command_buffer_vk_.beginRenderPass(pass_info, vk::SubpassContents::eInline);
 
-    return true;
-  }
-  return false;
+  // Set the initial viewport.
+  const auto vp = Viewport{.rect = Rect::MakeSize(target_size)};
+  vk::Viewport viewport = vk::Viewport()
+                              .setWidth(vp.rect.GetWidth())
+                              .setHeight(-vp.rect.GetHeight())
+                              .setY(vp.rect.GetHeight())
+                              .setMinDepth(0.0f)
+                              .setMaxDepth(1.0f);
+  command_buffer_vk_.setViewport(0, 1, &viewport);
+
+  // Set the initial scissor.
+  const auto sc = IRect::MakeSize(target_size);
+  vk::Rect2D scissor =
+      vk::Rect2D()
+          .setOffset(vk::Offset2D(sc.GetX(), sc.GetY()))
+          .setExtent(vk::Extent2D(sc.GetWidth(), sc.GetHeight()));
+  command_buffer_vk_.setScissor(0, 1, &scissor);
+
+  // Set the initial stencil reference.
+  command_buffer_vk_.setStencilReference(
+      vk::StencilFaceFlagBits::eVkStencilFrontAndBack, 0u);
+
+  is_valid_ = true;
 }
 
-bool RenderPassVK::EncodeCommand(const Context& context,
-                                 const Command& command) const {
-  SetViewportAndScissor(command);
+RenderPassVK::~RenderPassVK() = default;
 
-  auto& pipeline_vk = PipelineVK::Cast(*command.pipeline);
-  PipelineCreateInfoVK* pipeline_create_info = pipeline_vk.GetCreateInfo();
+bool RenderPassVK::IsValid() const {
+  return is_valid_;
+}
 
-  if (!AllocateAndBindDescriptorSets(context, command, pipeline_create_info)) {
-    return false;
+void RenderPassVK::OnSetLabel(std::string label) {
+#ifdef IMPELLER_DEBUG
+  ContextVK::Cast(*context_).SetDebugName(render_pass_->Get(),
+                                          std::string(label).c_str());
+#endif  // IMPELLER_DEBUG
+}
+
+SharedHandleVK<vk::Framebuffer> RenderPassVK::CreateVKFramebuffer(
+    const ContextVK& context,
+    const vk::RenderPass& pass) const {
+  vk::FramebufferCreateInfo fb_info;
+
+  fb_info.renderPass = pass;
+
+  const auto target_size = render_target_.GetRenderTargetSize();
+  fb_info.width = target_size.width;
+  fb_info.height = target_size.height;
+  fb_info.layers = 1u;
+
+  std::vector<vk::ImageView> attachments;
+
+  // This bit must be consistent to ensure compatibility with the pass created
+  // earlier. Follow this order: Color attachments, then depth-stencil, then
+  // stencil.
+  for (const auto& [_, color] : render_target_.GetColorAttachments()) {
+    // The bind point doesn't matter here since that information is present in
+    // the render pass.
+    attachments.emplace_back(
+        TextureVK::Cast(*color.texture).GetRenderTargetView());
+    if (color.resolve_texture) {
+      attachments.emplace_back(
+          TextureVK::Cast(*color.resolve_texture).GetRenderTargetView());
+    }
+  }
+  if (auto depth = render_target_.GetDepthAttachment(); depth.has_value()) {
+    attachments.emplace_back(
+        TextureVK::Cast(*depth->texture).GetRenderTargetView());
+  } else if (auto stencil = render_target_.GetStencilAttachment();
+             stencil.has_value()) {
+    attachments.emplace_back(
+        TextureVK::Cast(*stencil->texture).GetRenderTargetView());
   }
 
-  command_buffer_->Get().bindPipeline(vk::PipelineBindPoint::eGraphics,
-                                      pipeline_create_info->GetVKPipeline());
+  fb_info.setAttachments(attachments);
 
-  auto vertex_buffer_view = command.GetVertexBuffer();
-  auto index_buffer_view = command.index_buffer;
+  auto [result, framebuffer] =
+      context.GetDevice().createFramebufferUnique(fb_info);
 
-  if (!vertex_buffer_view || !index_buffer_view) {
-    return false;
+  if (result != vk::Result::eSuccess) {
+    VALIDATION_LOG << "Could not create framebuffer: " << vk::to_string(result);
+    return {};
   }
 
-  auto& allocator = *context.GetResourceAllocator();
-  const auto& pipeline_desc = command.pipeline->GetDescriptor();
+  return MakeSharedVK(std::move(framebuffer));
+}
 
-  auto vertex_buffer = vertex_buffer_view.buffer->GetDeviceBuffer(allocator);
-  auto index_buffer = index_buffer_view.buffer->GetDeviceBuffer(allocator);
+// |RenderPass|
+void RenderPassVK::SetPipeline(
+    const std::shared_ptr<Pipeline<PipelineDescriptor>>& pipeline) {
+  pipeline_ = pipeline;
 
-  if (!vertex_buffer || !index_buffer) {
-    VALIDATION_LOG << "Failed to acquire device buffers"
-                   << " for vertex and index buffer views";
-    return false;
+  if (!pipeline_) {
+    return;
   }
 
-  // bind vertex buffer
-  auto vertex_buffer_handle =
-      DeviceBufferVK::Cast(*vertex_buffer).GetVKBufferHandle();
-  vk::Buffer vertex_buffers[] = {vertex_buffer_handle};
-  vk::DeviceSize vertex_buffer_offsets[] = {vertex_buffer_view.range.offset};
-  command_buffer_->Get().bindVertexBuffers(0, 1, vertex_buffers,
-                                           vertex_buffer_offsets);
-
-  // index buffer
-  auto index_buffer_handle =
-      DeviceBufferVK::Cast(*index_buffer).GetVKBufferHandle();
-  command_buffer_->Get().bindIndexBuffer(index_buffer_handle,
-                                         index_buffer_view.range.offset,
-                                         ToVKIndexType(command.index_type));
-
-  // execute draw
-  command_buffer_->Get().drawIndexed(command.index_count,
-                                     command.instance_count, 0, 0, 0);
-  return true;
+  pipeline_uses_input_attachments_ =
+      pipeline_->GetDescriptor().GetVertexDescriptor()->UsesInputAttacments();
+
+  if (pipeline_uses_input_attachments_) {
+    if (bound_image_offset_ >= kMaxBindings) {
+      pipeline_ = nullptr;
+      return;
+    }
+    vk::DescriptorImageInfo image_info;
+    image_info.imageLayout = vk::ImageLayout::eGeneral;
+    image_info.sampler = VK_NULL_HANDLE;
+    image_info.imageView = TextureVK::Cast(*color_image_vk_).GetImageView();
+    image_workspace_[bound_image_offset_++] = image_info;
+
+    vk::WriteDescriptorSet write_set;
+    write_set.dstBinding = kMagicSubpassInputBinding;
+    write_set.descriptorCount = 1u;
+    write_set.descriptorType = vk::DescriptorType::eInputAttachment;
+    write_set.pImageInfo = &image_workspace_[bound_image_offset_ - 1];
+
+    write_workspace_[descriptor_write_offset_++] = write_set;
+  }
 }
 
-bool RenderPassVK::AllocateAndBindDescriptorSets(
+// |RenderPass|
+void RenderPassVK::SetCommandLabel(std::string_view label) {
+#ifdef IMPELLER_DEBUG
+  command_buffer_->GetEncoder()->PushDebugGroup(label);
+  has_label_ = true;
+#endif  // IMPELLER_DEBUG
+}
 
-    const Context& context,
-    const Command& command,
-    PipelineCreateInfoVK* pipeline_create_info) const {
-  auto& allocator = *context.GetResourceAllocator();
-  vk::PipelineLayout pipeline_layout =
-      pipeline_create_info->GetPipelineLayout();
+// |RenderPass|
+void RenderPassVK::SetStencilReference(uint32_t value) {
+  command_buffer_vk_.setStencilReference(
+      vk::StencilFaceFlagBits::eVkStencilFrontAndBack, value);
+}
 
-  const auto& context_vk = GetContextVK();
-  const auto& pool = context_vk.CreateDescriptorPool();
+// |RenderPass|
+void RenderPassVK::SetBaseVertex(uint64_t value) {
+  base_vertex_ = value;
+}
 
-  command_buffer_->GetDeletionQueue()->Push(
-      [pool = pool->GetPool(), device = device_]() {
-        device.destroyDescriptorPool(pool);
-      });
+// |RenderPass|
+void RenderPassVK::SetViewport(Viewport viewport) {
+  vk::Viewport viewport_vk = vk::Viewport()
+                                 .setWidth(viewport.rect.GetWidth())
+                                 .setHeight(-viewport.rect.GetHeight())
+                                 .setY(viewport.rect.GetHeight())
+                                 .setMinDepth(0.0f)
+                                 .setMaxDepth(1.0f);
+  command_buffer_vk_.setViewport(0, 1, &viewport_vk);
+}
 
-  vk::DescriptorSetAllocateInfo alloc_info;
-  std::array<vk::DescriptorSetLayout, 1> dsls = {
-      pipeline_create_info->GetDescriptorSetLayout(),
-  };
+// |RenderPass|
+void RenderPassVK::SetScissor(IRect scissor) {
+  vk::Rect2D scissor_vk =
+      vk::Rect2D()
+          .setOffset(vk::Offset2D(scissor.GetX(), scissor.GetY()))
+          .setExtent(vk::Extent2D(scissor.GetWidth(), scissor.GetHeight()));
+  command_buffer_vk_.setScissor(0, 1, &scissor_vk);
+}
 
-  alloc_info.setDescriptorPool(pool->GetPool());
-  alloc_info.setSetLayouts(dsls);
+// |RenderPass|
+void RenderPassVK::SetInstanceCount(size_t count) {
+  instance_count_ = count;
+}
 
-  auto desc_sets_res = device_.allocateDescriptorSets(alloc_info);
-  if (desc_sets_res.result != vk::Result::eSuccess) {
-    VALIDATION_LOG << "Failed to allocate descriptor sets: "
-                   << vk::to_string(desc_sets_res.result);
+// |RenderPass|
+bool RenderPassVK::SetVertexBuffer(VertexBuffer buffer) {
+  vertex_count_ = buffer.vertex_count;
+  if (buffer.index_type == IndexType::kUnknown || !buffer.vertex_buffer) {
     return false;
   }
 
-  auto desc_sets = desc_sets_res.value;
-  bool update_vertex_descriptors = UpdateDescriptorSets(
-      "vertex_bindings", command.vertex_bindings, allocator, desc_sets[0]);
-  if (!update_vertex_descriptors) {
-    return false;
-  }
-  bool update_frag_descriptors = UpdateDescriptorSets(
-      "fragment_bindings", command.fragment_bindings, allocator, desc_sets[0]);
-  if (!update_frag_descriptors) {
+  if (!command_buffer_->GetEncoder()->Track(buffer.vertex_buffer.buffer)) {
     return false;
   }
 
-  command_buffer_->Get().bindDescriptorSets(
-      vk::PipelineBindPoint::eGraphics, pipeline_layout, 0, desc_sets, nullptr);
-  return true;
-}
-
-bool RenderPassVK::UpdateDescriptorSets(const char* label,
-                                        const Bindings& bindings,
-                                        Allocator& allocator,
-                                        vk::DescriptorSet desc_set) const {
-  std::vector<vk::WriteDescriptorSet> writes;
-  std::vector<vk::DescriptorBufferInfo> buffer_infos;
-  std::vector<vk::DescriptorImageInfo> image_infos;
+  // Bind the vertex buffer.
+  vk::Buffer vertex_buffer_handle =
+      DeviceBufferVK::Cast(*buffer.vertex_buffer.buffer).GetBuffer();
+  vk::Buffer vertex_buffers[] = {vertex_buffer_handle};
+  vk::DeviceSize vertex_buffer_offsets[] = {buffer.vertex_buffer.range.offset};
 
-  for (const auto& [buffer_index, view] : bindings.buffers) {
-    const auto& buffer_view = view.resource.buffer;
+  command_buffer_vk_.bindVertexBuffers(0u, 1u, vertex_buffers,
+                                       vertex_buffer_offsets);
 
-    auto device_buffer = buffer_view->GetDeviceBuffer(allocator);
-    if (!device_buffer) {
-      VALIDATION_LOG << "Failed to get device buffer for vertex binding";
+  // Bind the index buffer.
+  if (buffer.index_type != IndexType::kNone) {
+    has_index_buffer_ = true;
+    const BufferView& index_buffer_view = buffer.index_buffer;
+    if (!index_buffer_view) {
       return false;
     }
 
-    auto buffer = DeviceBufferVK::Cast(*device_buffer).GetVKBufferHandle();
-    if (!buffer) {
+    const std::shared_ptr<const DeviceBuffer>& index_buffer =
+        index_buffer_view.buffer;
+    if (!index_buffer) {
+      VALIDATION_LOG << "Failed to acquire device buffer"
+                     << " for index buffer view";
       return false;
     }
 
-    // reserved index used for per-vertex data.
-    if (buffer_index == VertexDescriptor::kReservedVertexBufferIndex) {
-      continue;
-    }
-
-    uint32_t offset = view.resource.range.offset;
-
-    vk::DescriptorBufferInfo desc_buffer_info;
-    desc_buffer_info.setBuffer(buffer);
-    desc_buffer_info.setOffset(offset);
-    desc_buffer_info.setRange(view.resource.range.length);
-    buffer_infos.push_back(desc_buffer_info);
-
-    const ShaderUniformSlot& uniform = bindings.uniforms.at(buffer_index);
-
-    vk::WriteDescriptorSet setWrite;
-    setWrite.setDstSet(desc_set);
-    setWrite.setDstBinding(uniform.binding);
-    setWrite.setDescriptorCount(1);
-    setWrite.setDescriptorType(vk::DescriptorType::eUniformBuffer);
-    setWrite.setPBufferInfo(&buffer_infos.back());
-
-    writes.push_back(setWrite);
-  }
-
-  for (const auto& [index, sampler_handle] : bindings.samplers) {
-    if (bindings.textures.find(index) == bindings.textures.end()) {
-      VALIDATION_LOG << "Missing texture for sampler: " << index;
+    if (!command_buffer_->GetEncoder()->Track(index_buffer)) {
       return false;
     }
 
-    const auto& texture_vk =
-        TextureVK::Cast(*bindings.textures.at(index).resource);
-
-    const Sampler& sampler = *sampler_handle.resource;
-    const SamplerVK& sampler_vk = SamplerVK::Cast(sampler);
+    vk::Buffer index_buffer_handle =
+        DeviceBufferVK::Cast(*index_buffer).GetBuffer();
+    command_buffer_vk_.bindIndexBuffer(index_buffer_handle,
+                                       index_buffer_view.range.offset,
+                                       ToVKIndexType(buffer.index_type));
+  } else {
+    has_index_buffer_ = false;
+  }
+  return true;
+}
 
-    const SampledImageSlot& slot = bindings.sampled_images.at(index);
+// |RenderPass|
+fml::Status RenderPassVK::Draw() {
+  if (!pipeline_) {
+    return fml::Status(fml::StatusCode::kCancelled,
+                       "No valid pipeline is bound to the RenderPass.");
+  }
 
-    if (!TransitionImageLayout(texture_vk.GetImage(),
-                               vk::ImageLayout::eUndefined,
-                               vk::ImageLayout::eTransferDstOptimal)) {
-      return false;
+  //----------------------------------------------------------------------------
+  /// If there are immutable samplers referenced in the render pass, the base
+  /// pipeline variant is no longer valid and needs to be re-constructed to
+  /// reference the samplers.
+  ///
+  /// This is an instance of JIT creation of PSOs that can cause jank. It is
+  /// unavoidable because it isn't possible to know all possible combinations of
+  /// target YUV conversions. Fortunately, this will only ever happen when
+  /// rendering to external textures. Like Android Hardware Buffers on Android.
+  ///
+  /// Even when JIT creation is unavoidable, pipelines will cache their variants
+  /// when able and all pipeline creation will happen via a base pipeline cache
+  /// anyway. So the jank can be mostly entirely ameliorated and it should only
+  /// ever happen when the first unknown YUV conversion is encountered.
+  ///
+  /// Jank can be completely eliminated by pre-populating known YUV conversion
+  /// pipelines.
+  if (immutable_sampler_) {
+    std::shared_ptr<PipelineVK> pipeline_variant =
+        PipelineVK::Cast(*pipeline_)
+            .CreateVariantForImmutableSamplers(immutable_sampler_);
+    if (!pipeline_variant) {
+      return fml::Status(
+          fml::StatusCode::kAborted,
+          "Could not create pipeline variant with immutable sampler.");
     }
+    pipeline_ = std::move(pipeline_variant);
+  }
 
-    CopyBufferToImage(texture_vk);
-
-    if (!TransitionImageLayout(texture_vk.GetImage(),
-                               vk::ImageLayout::eTransferDstOptimal,
-                               vk::ImageLayout::eShaderReadOnlyOptimal)) {
-      return false;
-    }
+  const auto& context_vk = ContextVK::Cast(*context_);
+  const auto& pipeline_vk = PipelineVK::Cast(*pipeline_);
 
-    vk::DescriptorImageInfo desc_image_info;
-    desc_image_info.setImageLayout(vk::ImageLayout::eShaderReadOnlyOptimal);
-    desc_image_info.setSampler(sampler_vk.GetSamplerVK());
-    desc_image_info.setImageView(texture_vk.GetImageView());
-    image_infos.push_back(desc_image_info);
+  auto descriptor_result =
+      command_buffer_->GetEncoder()->AllocateDescriptorSets(
+          pipeline_vk.GetDescriptorSetLayout(), context_vk);
+  if (!descriptor_result.ok()) {
+    return fml::Status(fml::StatusCode::kAborted,
+                       "Could not allocate descriptor sets.");
+  }
+  const auto descriptor_set = descriptor_result.value();
+  const auto pipeline_layout = pipeline_vk.GetPipelineLayout();
+  command_buffer_vk_.bindPipeline(vk::PipelineBindPoint::eGraphics,
+                                  pipeline_vk.GetPipeline());
 
-    vk::WriteDescriptorSet setWrite;
-    setWrite.setDstSet(desc_set);
-    setWrite.setDstBinding(slot.binding);
-    setWrite.setDescriptorCount(1);
-    setWrite.setDescriptorType(vk::DescriptorType::eCombinedImageSampler);
-    setWrite.setPImageInfo(&image_infos.back());
+  for (auto i = 0u; i < descriptor_write_offset_; i++) {
+    write_workspace_[i].dstSet = descriptor_set;
+  }
 
-    writes.push_back(setWrite);
+  context_vk.GetDevice().updateDescriptorSets(descriptor_write_offset_,
+                                              write_workspace_.data(), 0u, {});
+
+  command_buffer_vk_.bindDescriptorSets(
+      vk::PipelineBindPoint::eGraphics,  // bind point
+      pipeline_layout,                   // layout
+      0,                                 // first set
+      1,                                 // set count
+      &descriptor_set,                   // sets
+      0,                                 // offset count
+      nullptr                            // offsets
+  );
+
+  if (pipeline_uses_input_attachments_) {
+    InsertBarrierForInputAttachmentRead(
+        command_buffer_vk_, TextureVK::Cast(*color_image_vk_).GetImage());
   }
 
-  std::array<vk::CopyDescriptorSet, 0> copies;
-  if (!writes.empty()) {
-    device_.updateDescriptorSets(writes, copies);
+  if (has_index_buffer_) {
+    command_buffer_vk_.drawIndexed(vertex_count_,    // index count
+                                   instance_count_,  // instance count
+                                   0u,               // first index
+                                   base_vertex_,     // vertex offset
+                                   0u                // first instance
+    );
+  } else {
+    command_buffer_vk_.draw(vertex_count_,    // vertex count
+                            instance_count_,  // instance count
+                            base_vertex_,     // vertex offset
+                            0u                // first instance
+    );
   }
 
-  return true;
+#ifdef IMPELLER_DEBUG
+  if (has_label_) {
+    command_buffer_->GetEncoder()->PopDebugGroup();
+  }
+#endif  // IMPELLER_DEBUG
+  has_label_ = false;
+  has_index_buffer_ = false;
+  bound_image_offset_ = 0u;
+  bound_buffer_offset_ = 0u;
+  descriptor_write_offset_ = 0u;
+  instance_count_ = 1u;
+  base_vertex_ = 0u;
+  vertex_count_ = 0u;
+  pipeline_ = nullptr;
+  pipeline_uses_input_attachments_ = false;
+  immutable_sampler_ = nullptr;
+  return fml::Status();
 }
 
-void RenderPassVK::SetViewportAndScissor(const Command& command) const {
-  // set viewport.
-  const auto& vp = command.viewport.value_or<Viewport>(
-      {.rect = Rect::MakeSize(GetRenderTargetSize())});
-  vk::Viewport viewport = vk::Viewport()
-                              .setWidth(vp.rect.size.width)
-                              .setHeight(-vp.rect.size.height)
-                              .setY(vp.rect.size.height)
-                              .setMinDepth(0.0f)
-                              .setMaxDepth(1.0f);
-  command_buffer_->Get().setViewport(0, 1, &viewport);
-
-  // scissor
-  const auto& sc =
-      command.scissor.value_or(IRect::MakeSize(GetRenderTargetSize()));
-  vk::Rect2D scissor =
-      vk::Rect2D()
-          .setOffset(vk::Offset2D(sc.origin.x, sc.origin.y))
-          .setExtent(vk::Extent2D(sc.size.width, sc.size.height));
-  command_buffer_->Get().setScissor(0, 1, &scissor);
+// The RenderPassVK binding methods only need the binding, set, and buffer type
+// information.
+bool RenderPassVK::BindResource(ShaderStage stage,
+                                DescriptorType type,
+                                const ShaderUniformSlot& slot,
+                                const ShaderMetadata& metadata,
+                                BufferView view) {
+  return BindResource(slot.binding, type, view);
 }
 
-vk::Framebuffer RenderPassVK::CreateFrameBuffer(
-    const TextureVK& texture) const {
-  auto img_view = texture.GetImageView();
-  auto size = texture.GetTextureDescriptor().size;
-  vk::FramebufferCreateInfo fb_create_info = vk::FramebufferCreateInfo()
-                                                 .setRenderPass(render_pass_)
-                                                 .setAttachmentCount(1)
-                                                 .setPAttachments(&img_view)
-                                                 .setWidth(size.width)
-                                                 .setHeight(size.height)
-                                                 .setLayers(1);
-  auto res = device_.createFramebuffer(fb_create_info);
-  FML_CHECK(res.result == vk::Result::eSuccess);
-  return res.value;
+bool RenderPassVK::BindResource(
+    ShaderStage stage,
+    DescriptorType type,
+    const ShaderUniformSlot& slot,
+    const std::shared_ptr<const ShaderMetadata>& metadata,
+    BufferView view) {
+  return BindResource(slot.binding, type, view);
 }
 
-bool RenderPassVK::TransitionImageLayout(vk::Image image,
-                                         vk::ImageLayout layout_old,
-                                         vk::ImageLayout layout_new) const {
-  auto transition_cmd = command_buffer_->GetSingleUseChild();
-
-  vk::CommandBufferBeginInfo begin_info;
-  begin_info.setFlags(vk::CommandBufferUsageFlagBits::eOneTimeSubmit);
-  auto res = transition_cmd.begin(begin_info);
+bool RenderPassVK::BindResource(size_t binding,
+                                DescriptorType type,
+                                const BufferView& view) {
+  if (bound_buffer_offset_ >= kMaxBindings) {
+    return false;
+  }
 
-  if (res != vk::Result::eSuccess) {
-    VALIDATION_LOG << "Failed to begin command buffer: " << vk::to_string(res);
+  const std::shared_ptr<const DeviceBuffer>& device_buffer = view.buffer;
+  auto buffer = DeviceBufferVK::Cast(*device_buffer).GetBuffer();
+  if (!buffer) {
     return false;
   }
 
-  vk::ImageMemoryBarrier barrier =
-      vk::ImageMemoryBarrier()
-          .setSrcAccessMask(vk::AccessFlagBits::eColorAttachmentWrite |
-                            vk::AccessFlagBits::eTransferWrite)
-          .setDstAccessMask(vk::AccessFlagBits::eColorAttachmentRead |
-                            vk::AccessFlagBits::eShaderRead)
-          .setOldLayout(layout_old)
-          .setNewLayout(layout_new)
-          .setSrcQueueFamilyIndex(VK_QUEUE_FAMILY_IGNORED)
-          .setDstQueueFamilyIndex(VK_QUEUE_FAMILY_IGNORED)
-          .setImage(image)
-          .setSubresourceRange(
-              vk::ImageSubresourceRange()
-                  .setAspectMask(vk::ImageAspectFlagBits::eColor)
-                  .setBaseMipLevel(0)
-                  .setLevelCount(1)
-                  .setBaseArrayLayer(0)
-                  .setLayerCount(1));
-  transition_cmd.pipelineBarrier(vk::PipelineStageFlagBits::eAllGraphics,
-                                 vk::PipelineStageFlagBits::eAllGraphics, {},
-                                 nullptr, nullptr, barrier);
-
-  res = transition_cmd.end();
-  if (res != vk::Result::eSuccess) {
-    VALIDATION_LOG << "Failed to end command buffer: " << vk::to_string(res);
+  if (!command_buffer_->GetEncoder()->Track(device_buffer)) {
     return false;
   }
 
+  uint32_t offset = view.range.offset;
+
+  vk::DescriptorBufferInfo buffer_info;
+  buffer_info.buffer = buffer;
+  buffer_info.offset = offset;
+  buffer_info.range = view.range.length;
+  buffer_workspace_[bound_buffer_offset_++] = buffer_info;
+
+  vk::WriteDescriptorSet write_set;
+  write_set.dstBinding = binding;
+  write_set.descriptorCount = 1u;
+  write_set.descriptorType = ToVKDescriptorType(type);
+  write_set.pBufferInfo = &buffer_workspace_[bound_buffer_offset_ - 1];
+
+  write_workspace_[descriptor_write_offset_++] = write_set;
   return true;
 }
 
-bool RenderPassVK::CopyBufferToImage(const TextureVK& texture_vk) const {
-  auto copy_cmd = command_buffer_->GetSingleUseChild();
-
-  const auto& size = texture_vk.GetTextureDescriptor().size;
-
-  // actual copy happens here
-  vk::BufferImageCopy region =
-      vk::BufferImageCopy()
-          .setBufferOffset(0)
-          .setBufferRowLength(0)
-          .setBufferImageHeight(0)
-          .setImageSubresource(
-              vk::ImageSubresourceLayers()
-                  .setAspectMask(vk::ImageAspectFlagBits::eColor)
-                  .setMipLevel(0)
-                  .setBaseArrayLayer(0)
-                  .setLayerCount(1))
-          .setImageOffset(vk::Offset3D(0, 0, 0))
-          .setImageExtent(vk::Extent3D(size.width, size.height, 1));
-
-  vk::CommandBufferBeginInfo begin_info;
-  begin_info.setFlags(vk::CommandBufferUsageFlagBits::eOneTimeSubmit);
-  auto res = copy_cmd.begin(begin_info);
-
-  if (res != vk::Result::eSuccess) {
-    VALIDATION_LOG << "Failed to begin command buffer: " << vk::to_string(res);
+bool RenderPassVK::BindResource(ShaderStage stage,
+                                DescriptorType type,
+                                const SampledImageSlot& slot,
+                                const ShaderMetadata& metadata,
+                                std::shared_ptr<const Texture> texture,
+                                const std::unique_ptr<const Sampler>& sampler) {
+  if (bound_buffer_offset_ >= kMaxBindings) {
     return false;
   }
+  if (!texture->IsValid() || !sampler) {
+    return false;
+  }
+  const TextureVK& texture_vk = TextureVK::Cast(*texture);
+  const SamplerVK& sampler_vk = SamplerVK::Cast(*sampler);
 
-  copy_cmd.copyBufferToImage(texture_vk.GetStagingBuffer(),
-                             texture_vk.GetImage(),
-                             vk::ImageLayout::eTransferDstOptimal, region);
-
-  res = copy_cmd.end();
-  if (res != vk::Result::eSuccess) {
-    VALIDATION_LOG << "Failed to end command buffer: " << vk::to_string(res);
+  if (!command_buffer_->GetEncoder()->Track(texture)) {
     return false;
   }
 
+  if (!immutable_sampler_) {
+    immutable_sampler_ = texture_vk.GetImmutableSamplerVariant(sampler_vk);
+  }
+
+  vk::DescriptorImageInfo image_info;
+  image_info.imageLayout = vk::ImageLayout::eShaderReadOnlyOptimal;
+  image_info.sampler = sampler_vk.GetSampler();
+  image_info.imageView = texture_vk.GetImageView();
+  image_workspace_[bound_image_offset_++] = image_info;
+
+  vk::WriteDescriptorSet write_set;
+  write_set.dstBinding = slot.binding;
+  write_set.descriptorCount = 1u;
+  write_set.descriptorType = vk::DescriptorType::eCombinedImageSampler;
+  write_set.pImageInfo = &image_workspace_[bound_image_offset_ - 1];
+
+  write_workspace_[descriptor_write_offset_++] = write_set;
   return true;
 }
 
-const ContextVK& RenderPassVK::GetContextVK() const {
-  if (auto context = context_.lock()) {
-    const auto& context_vk = ContextVK::Cast(*context);
-    return context_vk;
+bool RenderPassVK::OnEncodeCommands(const Context& context) const {
+  command_buffer_->GetEncoder()->GetCommandBuffer().endRenderPass();
+
+  // If this render target will be consumed by a subsequent render pass,
+  // perform a layout transition to a shader read state.
+  const std::shared_ptr<Texture>& result_texture =
+      resolve_image_vk_ ? resolve_image_vk_ : color_image_vk_;
+  if (result_texture->GetTextureDescriptor().usage &
+      TextureUsage::kShaderRead) {
+    BarrierVK barrier;
+    barrier.cmd_buffer = command_buffer_vk_;
+    barrier.src_access = vk::AccessFlagBits::eColorAttachmentWrite |
+                         vk::AccessFlagBits::eTransferWrite;
+    barrier.src_stage = vk::PipelineStageFlagBits::eColorAttachmentOutput |
+                        vk::PipelineStageFlagBits::eTransfer;
+    barrier.dst_access = vk::AccessFlagBits::eShaderRead;
+    barrier.dst_stage = vk::PipelineStageFlagBits::eFragmentShader;
+
+    barrier.new_layout = vk::ImageLayout::eShaderReadOnlyOptimal;
+
+    if (!TextureVK::Cast(*result_texture).SetLayout(barrier)) {
+      return false;
+    }
   }
 
-  FML_UNREACHABLE();
+  return true;
 }
 
 }  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/render_pass_vk.h b/impeller/renderer/backend/vulkan/render_pass_vk.h
index 811267e41021a193c3f45a121db9ad7c881ff847..f0fba63e5954258a13ebffe00a09e07e29a0850e 100644
--- a/impeller/renderer/backend/vulkan/render_pass_vk.h
+++ b/impeller/renderer/backend/vulkan/render_pass_vk.h
@@ -2,76 +2,141 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_RENDER_PASS_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_RENDER_PASS_VK_H_
 
-#include "flutter/fml/macros.h"
+#include "impeller/core/buffer_view.h"
 #include "impeller/renderer/backend/vulkan/context_vk.h"
-#include "impeller/renderer/backend/vulkan/fenced_command_buffer_vk.h"
-#include "impeller/renderer/backend/vulkan/surface_producer_vk.h"
-#include "impeller/renderer/backend/vulkan/texture_vk.h"
-#include "impeller/renderer/backend/vulkan/vk.h"
-#include "impeller/renderer/command.h"
+#include "impeller/renderer/backend/vulkan/pipeline_vk.h"
+#include "impeller/renderer/backend/vulkan/shared_object_vk.h"
+#include "impeller/renderer/command_buffer.h"
 #include "impeller/renderer/render_pass.h"
 #include "impeller/renderer/render_target.h"
+#include "vulkan/vulkan_handles.hpp"
 
 namespace impeller {
 
+class CommandBufferVK;
+class SamplerVK;
+
 class RenderPassVK final : public RenderPass {
  public:
-  RenderPassVK(std::weak_ptr<const Context> context,
-               vk::Device device,
-               const RenderTarget& target,
-               std::shared_ptr<FencedCommandBufferVK> command_buffer,
-               vk::RenderPass render_pass);
-
   // |RenderPass|
   ~RenderPassVK() override;
 
  private:
   friend class CommandBufferVK;
 
-  vk::Device device_;
-  std::shared_ptr<FencedCommandBufferVK> command_buffer_;
-  vk::RenderPass render_pass_;
-  std::string label_ = "";
+  std::shared_ptr<CommandBufferVK> command_buffer_;
+  std::string debug_label_;
+  SharedHandleVK<vk::RenderPass> render_pass_;
   bool is_valid_ = false;
 
+  vk::CommandBuffer command_buffer_vk_;
+  std::shared_ptr<Texture> color_image_vk_;
+  std::shared_ptr<Texture> resolve_image_vk_;
+
+  // Per-command state.
+  std::array<vk::DescriptorImageInfo, kMaxBindings> image_workspace_;
+  std::array<vk::DescriptorBufferInfo, kMaxBindings> buffer_workspace_;
+  std::array<vk::WriteDescriptorSet, kMaxBindings + kMaxBindings>
+      write_workspace_;
+  size_t bound_image_offset_ = 0u;
+  size_t bound_buffer_offset_ = 0u;
+  size_t descriptor_write_offset_ = 0u;
+  size_t instance_count_ = 1u;
+  size_t base_vertex_ = 0u;
+  size_t vertex_count_ = 0u;
+  bool has_index_buffer_ = false;
+  bool has_label_ = false;
+  std::shared_ptr<Pipeline<PipelineDescriptor>> pipeline_;
+  bool pipeline_uses_input_attachments_ = false;
+  std::shared_ptr<SamplerVK> immutable_sampler_;
+
+  RenderPassVK(const std::shared_ptr<const Context>& context,
+               const RenderTarget& target,
+               std::shared_ptr<CommandBufferVK> command_buffer);
+
   // |RenderPass|
-  bool IsValid() const override;
+  void SetPipeline(
+      const std::shared_ptr<Pipeline<PipelineDescriptor>>& pipeline) override;
 
   // |RenderPass|
-  void OnSetLabel(std::string label) override;
+  void SetCommandLabel(std::string_view label) override;
 
   // |RenderPass|
-  bool OnEncodeCommands(const Context& context) const override;
+  void SetStencilReference(uint32_t value) override;
 
-  bool EncodeCommand(const Context& context, const Command& command) const;
+  // |RenderPass|
+  void SetBaseVertex(uint64_t value) override;
 
-  bool AllocateAndBindDescriptorSets(
-      const Context& context,
-      const Command& command,
-      PipelineCreateInfoVK* pipeline_create_info) const;
+  // |RenderPass|
+  void SetViewport(Viewport viewport) override;
 
-  bool EndCommandBuffer();
+  // |RenderPass|
+  void SetScissor(IRect scissor) override;
 
-  bool UpdateDescriptorSets(const char* label,
-                            const Bindings& bindings,
-                            Allocator& allocator,
-                            vk::DescriptorSet desc_set) const;
+  // |RenderPass|
+  void SetInstanceCount(size_t count) override;
 
-  void SetViewportAndScissor(const Command& command) const;
+  // |RenderPass|
+  bool SetVertexBuffer(VertexBuffer buffer) override;
 
-  vk::Framebuffer CreateFrameBuffer(const TextureVK& texture) const;
+  // |RenderPass|
+  fml::Status Draw() override;
 
-  bool TransitionImageLayout(vk::Image image,
-                             vk::ImageLayout layout_old,
-                             vk::ImageLayout layout_new) const;
+  // |RenderPass|
+  void ReserveCommands(size_t command_count) override {}
 
-  bool CopyBufferToImage(const TextureVK& texture_vk) const;
+  // |ResourceBinder|
+  bool BindResource(ShaderStage stage,
+                    DescriptorType type,
+                    const ShaderUniformSlot& slot,
+                    const ShaderMetadata& metadata,
+                    BufferView view) override;
 
-  const ContextVK& GetContextVK() const;
+  // |RenderPass|
+  bool BindResource(ShaderStage stage,
+                    DescriptorType type,
+                    const ShaderUniformSlot& slot,
+                    const std::shared_ptr<const ShaderMetadata>& metadata,
+                    BufferView view) override;
+
+  // |ResourceBinder|
+  bool BindResource(ShaderStage stage,
+                    DescriptorType type,
+                    const SampledImageSlot& slot,
+                    const ShaderMetadata& metadata,
+                    std::shared_ptr<const Texture> texture,
+                    const std::unique_ptr<const Sampler>& sampler) override;
+
+  bool BindResource(size_t binding,
+                    DescriptorType type,
+                    const BufferView& view);
+
+  // |RenderPass|
+  bool IsValid() const override;
+
+  // |RenderPass|
+  void OnSetLabel(std::string label) override;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(RenderPassVK);
+  // |RenderPass|
+  bool OnEncodeCommands(const Context& context) const override;
+
+  SharedHandleVK<vk::RenderPass> CreateVKRenderPass(
+      const ContextVK& context,
+      const SharedHandleVK<vk::RenderPass>& recycled_renderpass,
+      const std::shared_ptr<CommandBufferVK>& command_buffer) const;
+
+  SharedHandleVK<vk::Framebuffer> CreateVKFramebuffer(
+      const ContextVK& context,
+      const vk::RenderPass& pass) const;
+
+  RenderPassVK(const RenderPassVK&) = delete;
+
+  RenderPassVK& operator=(const RenderPassVK&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_RENDER_PASS_VK_H_
diff --git a/impeller/renderer/backend/vulkan/resource_manager_vk.cc b/impeller/renderer/backend/vulkan/resource_manager_vk.cc
new file mode 100644
index 0000000000000000000000000000000000000000..8b55801047ec9e3d659dded3d095a290b4476587
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/resource_manager_vk.cc
@@ -0,0 +1,97 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/backend/vulkan/resource_manager_vk.h"
+
+#include "flutter/fml/cpu_affinity.h"
+#include "flutter/fml/thread.h"
+#include "flutter/fml/trace_event.h"
+#include "fml/logging.h"
+
+namespace impeller {
+
+std::shared_ptr<ResourceManagerVK> ResourceManagerVK::Create() {
+  // It will be tempting to refactor this to create the waiter thread in the
+  // static method instead of the constructor. However, that causes the
+  // destructor never to be called, and the thread never terminates!
+  //
+  // See https://github.com/flutter/flutter/issues/134482.
+  return std::shared_ptr<ResourceManagerVK>(new ResourceManagerVK());
+}
+
+ResourceManagerVK::ResourceManagerVK() : waiter_([&]() { Start(); }) {}
+
+ResourceManagerVK::~ResourceManagerVK() {
+  FML_DCHECK(waiter_.get_id() != std::this_thread::get_id())
+      << "The ResourceManager being destructed on its own spawned thread is a "
+      << "sign that ContextVK was not properly destroyed. A usual fix for this "
+      << "is to ensure that ContextVK is shutdown (i.e. context->Shutdown()) "
+         "before the ResourceManager is destroyed (i.e. at the end of a test).";
+  Terminate();
+  waiter_.join();
+}
+
+void ResourceManagerVK::Start() {
+  // It's possible for Start() to be called when terminating:
+  // { ResourceManagerVK::Create(); }
+  //
+  // ... so no FML_DCHECK here.
+
+  fml::Thread::SetCurrentThreadName(fml::Thread::ThreadConfig{"IplrVkResMgr"});
+  // While this code calls destructors it doesn't need to be particularly fast
+  // with them, as long as it doesn't interrupt raster thread.
+  fml::RequestAffinity(fml::CpuAffinity::kEfficiency);
+
+  bool should_exit = false;
+  while (!should_exit) {
+    std::unique_lock lock(reclaimables_mutex_);
+
+    // Wait until there are reclaimable resource or if the manager should be
+    // torn down.
+    reclaimables_cv_.wait(
+        lock, [&]() { return !reclaimables_.empty() || should_exit_; });
+
+    // Don't reclaim resources when the lock is being held as this may gate
+    // further reclaimables from being registered.
+    Reclaimables resources_to_collect;
+    std::swap(resources_to_collect, reclaimables_);
+
+    // We can't read the ivar outside the lock. Read it here instead.
+    should_exit = should_exit_;
+
+    // We know what to collect. Unlock before doing anything else.
+    lock.unlock();
+
+    // Claim all resources while tracing.
+    {
+      TRACE_EVENT0("Impeller", "ReclaimResources");
+      resources_to_collect.clear();  // Redundant because of scope but here so
+                                     // we can add a trace around it.
+    }
+  }
+}
+
+void ResourceManagerVK::Reclaim(std::unique_ptr<ResourceVK> resource) {
+  if (!resource) {
+    return;
+  }
+  {
+    std::scoped_lock lock(reclaimables_mutex_);
+    reclaimables_.emplace_back(std::move(resource));
+  }
+  reclaimables_cv_.notify_one();
+}
+
+void ResourceManagerVK::Terminate() {
+  // The thread should not be terminated more than once.
+  FML_DCHECK(!should_exit_);
+
+  {
+    std::scoped_lock lock(reclaimables_mutex_);
+    should_exit_ = true;
+  }
+  reclaimables_cv_.notify_one();
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/resource_manager_vk.h b/impeller/renderer/backend/vulkan/resource_manager_vk.h
new file mode 100644
index 0000000000000000000000000000000000000000..4d8ef36a1c1bdb9e6c69589577cf3ba0896a63b5
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/resource_manager_vk.h
@@ -0,0 +1,213 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_RESOURCE_MANAGER_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_RESOURCE_MANAGER_VK_H_
+
+#include <condition_variable>
+#include <memory>
+#include <mutex>
+#include <thread>
+#include <vector>
+
+#include "flutter/fml/macros.h"
+
+namespace impeller {
+
+//------------------------------------------------------------------------------
+/// @brief      A resource that may be reclaimed by a |ResourceManagerVK|.
+///
+/// To create a resource, use `UniqueResourceVKT` to create a unique handle:
+///
+///     auto resource = UniqueResourceVKT<SomeResource>(resource_manager);
+///
+/// @see        |ResourceManagerVK::Reclaim|.
+class ResourceVK {
+ public:
+  virtual ~ResourceVK() = default;
+};
+
+//------------------------------------------------------------------------------
+/// @brief      A resource manager controls how resources are allocated and
+///             reclaimed.
+///
+///             Reclaimed resources are collected in a batch on a separate
+///             thread. In the future, the resource manager may allow resource
+///             pooling/reuse, delaying reclamation past frame workloads, etc...
+///
+class ResourceManagerVK final
+    : public std::enable_shared_from_this<ResourceManagerVK> {
+ public:
+  //----------------------------------------------------------------------------
+  /// @brief      Creates a shared resource manager (a dedicated thread).
+  ///
+  /// Upon creation, a thread is spawned which will collect resources as they
+  /// are reclaimed (passed to `Reclaim`). The thread will exit when the
+  /// resource manager is destroyed.
+  ///
+  /// @note       Only one |ResourceManagerVK| should be created per Vulkan
+  ///             context, but that contract is not enforced by this method.
+  ///
+  /// @return     A resource manager if one could be created.
+  ///
+  static std::shared_ptr<ResourceManagerVK> Create();
+
+  //----------------------------------------------------------------------------
+  /// @brief      Mark a resource as being reclaimable.
+  ///
+  /// The resource will be reset at some point in the future.
+  ///
+  /// @param[in]  resource  The resource to reclaim.
+  ///
+  /// @note       Despite being a public API, this method cannot be invoked
+  ///             directly. Instead, use `UniqueResourceVKT` to create a unique
+  ///             handle to a resource, which will call this method.
+  void Reclaim(std::unique_ptr<ResourceVK> resource);
+
+  //----------------------------------------------------------------------------
+  /// @brief      Destroys the resource manager.
+  ///
+  /// The resource manager will stop collecting resources and will be destroyed
+  /// when all references to it are dropped.
+  ~ResourceManagerVK();
+
+ private:
+  using Reclaimables = std::vector<std::unique_ptr<ResourceVK>>;
+
+  ResourceManagerVK();
+  std::mutex reclaimables_mutex_;
+  std::condition_variable reclaimables_cv_;
+  Reclaimables reclaimables_;
+  bool should_exit_ = false;
+  // This should be initialized last since it references the other instance
+  // variables.
+  std::thread waiter_;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Starts the resource manager thread.
+  ///
+  /// This method is called implicitly by `Create`.
+  void Start();
+
+  //----------------------------------------------------------------------------
+  /// @brief      Terminates the resource manager thread.
+  ///
+  /// Any resources given to the resource manager post termination will be
+  /// collected when the resource manager is collected.
+  void Terminate();
+
+  ResourceManagerVK(const ResourceManagerVK&) = delete;
+
+  ResourceManagerVK& operator=(const ResourceManagerVK&) = delete;
+};
+
+//------------------------------------------------------------------------------
+/// @brief      An internal type that is used to move a resource reference.
+///
+///             Do not use directly, use `UniqueResourceVKT` instead.
+///
+/// @tparam     ResourceType_  The type of the resource.
+///
+/// @see        |UniqueResourceVKT|.
+template <class ResourceType_>
+class ResourceVKT : public ResourceVK {
+ public:
+  using ResourceType = ResourceType_;
+
+  /// @brief      Construct a resource from a move-constructible resource.
+  ///
+  /// @param[in]  resource  The resource to move.
+  explicit ResourceVKT(ResourceType&& resource)
+      : resource_(std::move(resource)) {}
+
+  /// @brief      Returns a pointer to the resource.
+  const ResourceType* Get() const { return &resource_; }
+
+ private:
+  // Prevents subclassing, use `UniqueResourceVKT`.
+  ResourceVKT() = default;
+
+  ResourceType resource_;
+
+  ResourceVKT(const ResourceVKT&) = delete;
+
+  ResourceVKT& operator=(const ResourceVKT&) = delete;
+};
+
+//------------------------------------------------------------------------------
+/// @brief      A unique handle to a resource which will be reclaimed by the
+///             specified resource manager.
+///
+/// @tparam     ResourceType_  A move-constructible resource type.
+///
+template <class ResourceType_>
+class UniqueResourceVKT final {
+ public:
+  using ResourceType = ResourceType_;
+
+  /// @brief      Construct a unique resource handle belonging to a manager.
+  ///
+  /// Initially the handle is empty, and can be populated by calling `Swap`.
+  ///
+  /// @param[in]  resource_manager  The resource manager.
+  explicit UniqueResourceVKT(std::weak_ptr<ResourceManagerVK> resource_manager)
+      : resource_manager_(std::move(resource_manager)) {}
+
+  /// @brief      Construct a unique resource handle belonging to a manager.
+  ///
+  /// Initially the handle is populated with the specified resource, but can
+  /// be replaced (reclaiming the old resource) by calling `Swap`.
+  ///
+  /// @param[in]  resource_manager  The resource manager.
+  /// @param[in]  resource          The resource to move.
+  explicit UniqueResourceVKT(std::weak_ptr<ResourceManagerVK> resource_manager,
+                             ResourceType&& resource)
+      : resource_manager_(std::move(resource_manager)),
+        resource_(
+            std::make_unique<ResourceVKT<ResourceType>>(std::move(resource))) {}
+
+  ~UniqueResourceVKT() { Reset(); }
+
+  /// @brief      Returns a pointer to the resource.
+  const ResourceType* operator->() const {
+    // If this would segfault, fail with a nicer error message.
+    FML_CHECK(resource_) << "UniqueResourceVKT was reclaimed.";
+
+    return resource_.get()->Get();
+  }
+
+  /// @brief      Reclaims the existing resource, if any, and replaces it.
+  ///
+  /// @param[in]  other   The (new) resource to move.
+  void Swap(ResourceType&& other) {
+    Reset();
+    resource_ = std::make_unique<ResourceVKT<ResourceType>>(std::move(other));
+  }
+
+  /// @brief      Reclaims the existing resource, if any.
+  void Reset() {
+    if (!resource_) {
+      return;
+    }
+    // If there is a manager, ask it to reclaim the resource. If there isn't a
+    // manager (because the manager has been destroyed), just drop it on the
+    // floor here.
+    if (auto manager = resource_manager_.lock()) {
+      manager->Reclaim(std::move(resource_));
+    }
+    resource_.reset();
+  }
+
+ private:
+  std::weak_ptr<ResourceManagerVK> resource_manager_;
+  std::unique_ptr<ResourceVKT<ResourceType>> resource_;
+
+  UniqueResourceVKT(const UniqueResourceVKT&) = delete;
+
+  UniqueResourceVKT& operator=(const UniqueResourceVKT&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_RESOURCE_MANAGER_VK_H_
diff --git a/impeller/renderer/backend/vulkan/resource_manager_vk_unittests.cc b/impeller/renderer/backend/vulkan/resource_manager_vk_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..fd5f10d8e0f70b189358b793404fb1dbc67b557a
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/resource_manager_vk_unittests.cc
@@ -0,0 +1,107 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <sys/types.h>
+#include <functional>
+#include <memory>
+#include <utility>
+#include "fml/synchronization/waitable_event.h"
+#include "gtest/gtest.h"
+#include "impeller/renderer/backend/vulkan/resource_manager_vk.h"
+
+namespace impeller {
+namespace testing {
+
+// While expected to be a singleton per context, the class does not enforce it.
+TEST(ResourceManagerVKTest, CreatesANewInstance) {
+  auto const a = ResourceManagerVK::Create();
+  auto const b = ResourceManagerVK::Create();
+  EXPECT_NE(a, b);
+}
+
+namespace {
+
+// Invokes the provided callback when the destructor is called.
+//
+// Can be moved, but not copied.
+class DeathRattle final {
+ public:
+  explicit DeathRattle(std::function<void()> callback)
+      : callback_(std::move(callback)) {}
+
+  DeathRattle(DeathRattle&&) = default;
+  DeathRattle& operator=(DeathRattle&&) = default;
+
+  ~DeathRattle() { callback_(); }
+
+ private:
+  std::function<void()> callback_;
+};
+
+}  // namespace
+
+TEST(ResourceManagerVKTest, ReclaimMovesAResourceAndDestroysIt) {
+  auto const manager = ResourceManagerVK::Create();
+
+  auto waiter = fml::AutoResetWaitableEvent();
+  auto dead = false;
+  auto rattle = DeathRattle([&waiter]() { waiter.Signal(); });
+
+  // Not killed immediately.
+  EXPECT_FALSE(waiter.IsSignaledForTest());
+
+  {
+    auto resource = UniqueResourceVKT<DeathRattle>(manager, std::move(rattle));
+  }
+
+  waiter.Wait();
+}
+
+// Regression test for https://github.com/flutter/flutter/issues/134482.
+TEST(ResourceManagerVKTest, TerminatesWhenOutOfScope) {
+  // Originally, this shared_ptr was never destroyed, and the thread never
+  // terminated. This test ensures that the thread terminates when the
+  // ResourceManagerVK is out of scope.
+  std::weak_ptr<ResourceManagerVK> manager;
+
+  {
+    auto shared = ResourceManagerVK::Create();
+    manager = shared;
+  }
+
+  // The thread should have terminated.
+  EXPECT_EQ(manager.lock(), nullptr);
+}
+
+TEST(ResourceManagerVKTest, IsThreadSafe) {
+  // In a typical app, there is a single ResourceManagerVK per app, shared b/w
+  // threads.
+  //
+  // This test ensures that the ResourceManagerVK is thread-safe.
+  std::weak_ptr<ResourceManagerVK> manager;
+
+  {
+    auto const manager = ResourceManagerVK::Create();
+
+    // Spawn two threads, and have them both put resources into the manager.
+    struct MockResource {};
+
+    std::thread thread1([&manager]() {
+      UniqueResourceVKT<MockResource>(manager, MockResource{});
+    });
+
+    std::thread thread2([&manager]() {
+      UniqueResourceVKT<MockResource>(manager, MockResource{});
+    });
+
+    thread1.join();
+    thread2.join();
+  }
+
+  // The thread should have terminated.
+  EXPECT_EQ(manager.lock(), nullptr);
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/sampler_library_vk.cc b/impeller/renderer/backend/vulkan/sampler_library_vk.cc
index 149c1ae957d4cde3c33fd2af0a4d82be90bd4f32..821cc6fffdb190a0bf73ecdd26167784e772f33a 100644
--- a/impeller/renderer/backend/vulkan/sampler_library_vk.cc
+++ b/impeller/renderer/backend/vulkan/sampler_library_vk.cc
@@ -4,55 +4,32 @@
 
 #include "impeller/renderer/backend/vulkan/sampler_library_vk.h"
 
+#include "impeller/renderer/backend/vulkan/context_vk.h"
 #include "impeller/renderer/backend/vulkan/formats_vk.h"
 #include "impeller/renderer/backend/vulkan/sampler_vk.h"
 
 namespace impeller {
 
-SamplerLibraryVK::SamplerLibraryVK(vk::Device device) : device_(device) {}
+SamplerLibraryVK::SamplerLibraryVK(
+    const std::weak_ptr<DeviceHolderVK>& device_holder)
+    : device_holder_(device_holder) {}
 
 SamplerLibraryVK::~SamplerLibraryVK() = default;
 
-std::shared_ptr<const Sampler> SamplerLibraryVK::GetSampler(
+static const std::unique_ptr<const Sampler> kNullSampler = nullptr;
+
+const std::unique_ptr<const Sampler>& SamplerLibraryVK::GetSampler(
     SamplerDescriptor desc) {
   auto found = samplers_.find(desc);
   if (found != samplers_.end()) {
     return found->second;
   }
-  if (!device_) {
-    return nullptr;
-  }
-
-  const auto mip_map = ToVKSamplerMipmapMode(desc.mip_filter);
-
-  const auto min_filter = ToVKSamplerMinMagFilter(desc.min_filter);
-  const auto mag_filter = ToVKSamplerMinMagFilter(desc.mag_filter);
-
-  const auto address_mode_u = ToVKSamplerAddressMode(desc.width_address_mode);
-  const auto address_mode_v = ToVKSamplerAddressMode(desc.height_address_mode);
-  const auto address_mode_w = ToVKSamplerAddressMode(desc.depth_address_mode);
-
-  const auto sampler_create_info = vk::SamplerCreateInfo()
-                                       .setMagFilter(mag_filter)
-                                       .setMinFilter(min_filter)
-                                       .setAddressModeU(address_mode_u)
-                                       .setAddressModeV(address_mode_v)
-                                       .setAddressModeW(address_mode_w)
-                                       .setMipmapMode(mip_map);
-
-  auto res = device_.createSamplerUnique(sampler_create_info);
-  if (res.result != vk::Result::eSuccess) {
-    FML_LOG(ERROR) << "Failed to create sampler: " << vk::to_string(res.result);
-    return nullptr;
-  }
-
-  auto sampler = std::make_shared<SamplerVK>(desc, std::move(res.value));
-
-  if (!sampler->IsValid()) {
-    return nullptr;
+  auto device_holder = device_holder_.lock();
+  if (!device_holder || !device_holder->GetDevice()) {
+    return kNullSampler;
   }
-  samplers_[desc] = sampler;
-  return sampler;
+  return (samplers_[desc] =
+              std::make_unique<SamplerVK>(device_holder->GetDevice(), desc));
 }
 
 }  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/sampler_library_vk.h b/impeller/renderer/backend/vulkan/sampler_library_vk.h
index 72129ca496757eb50a5abff47fa707cf79683020..4251534031612741c97be1eb164b9f5e81c3c61c 100644
--- a/impeller/renderer/backend/vulkan/sampler_library_vk.h
+++ b/impeller/renderer/backend/vulkan/sampler_library_vk.h
@@ -2,13 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_SAMPLER_LIBRARY_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_SAMPLER_LIBRARY_VK_H_
 
-#include "flutter/fml/macros.h"
 #include "impeller/base/backend_cast.h"
-#include "impeller/base/comparable.h"
-#include "impeller/renderer/backend/vulkan/vk.h"
-#include "impeller/renderer/sampler_descriptor.h"
+#include "impeller/core/sampler_descriptor.h"
+#include "impeller/renderer/backend/vulkan/device_holder_vk.h"
 #include "impeller/renderer/sampler_library.h"
 
 namespace impeller {
@@ -23,16 +22,20 @@ class SamplerLibraryVK final
  private:
   friend class ContextVK;
 
-  vk::Device device_;
+  std::weak_ptr<DeviceHolderVK> device_holder_;
   SamplerMap samplers_;
 
-  explicit SamplerLibraryVK(vk::Device device);
+  explicit SamplerLibraryVK(const std::weak_ptr<DeviceHolderVK>& device_holder);
 
   // |SamplerLibrary|
-  std::shared_ptr<const Sampler> GetSampler(
+  const std::unique_ptr<const Sampler>& GetSampler(
       SamplerDescriptor descriptor) override;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(SamplerLibraryVK);
+  SamplerLibraryVK(const SamplerLibraryVK&) = delete;
+
+  SamplerLibraryVK& operator=(const SamplerLibraryVK&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_SAMPLER_LIBRARY_VK_H_
diff --git a/impeller/renderer/backend/vulkan/sampler_vk.cc b/impeller/renderer/backend/vulkan/sampler_vk.cc
index 6212bedd2cb326c056373b65788a31504f7b3f72..175507d1ab9bf9726913e72d0ef786bfba2ca6f6 100644
--- a/impeller/renderer/backend/vulkan/sampler_vk.cc
+++ b/impeller/renderer/backend/vulkan/sampler_vk.cc
@@ -4,20 +4,123 @@
 
 #include "impeller/renderer/backend/vulkan/sampler_vk.h"
 
+#include "impeller/renderer/backend/vulkan/context_vk.h"
+#include "impeller/renderer/backend/vulkan/formats_vk.h"
+#include "impeller/renderer/backend/vulkan/yuv_conversion_vk.h"
+
 namespace impeller {
-SamplerVK::~SamplerVK() {}
 
-vk::Sampler SamplerVK::GetSamplerVK() const {
-  return sampler_.get();
+static vk::UniqueSampler CreateSampler(
+    const vk::Device& device,
+    const SamplerDescriptor& desc,
+    const std::shared_ptr<YUVConversionVK>& yuv_conversion) {
+  const auto mip_map = ToVKSamplerMipmapMode(desc.mip_filter);
+
+  const auto min_filter = ToVKSamplerMinMagFilter(desc.min_filter);
+  const auto mag_filter = ToVKSamplerMinMagFilter(desc.mag_filter);
+
+  const auto address_mode_u = ToVKSamplerAddressMode(desc.width_address_mode);
+  const auto address_mode_v = ToVKSamplerAddressMode(desc.height_address_mode);
+  const auto address_mode_w = ToVKSamplerAddressMode(desc.depth_address_mode);
+
+  vk::StructureChain<vk::SamplerCreateInfo,
+                     // For VK_KHR_sampler_ycbcr_conversion
+                     vk::SamplerYcbcrConversionInfo>
+      sampler_chain;
+
+  auto& sampler_info = sampler_chain.get();
+
+  sampler_info.magFilter = mag_filter;
+  sampler_info.minFilter = min_filter;
+  sampler_info.addressModeU = address_mode_u;
+  sampler_info.addressModeV = address_mode_v;
+  sampler_info.addressModeW = address_mode_w;
+  sampler_info.borderColor = vk::BorderColor::eFloatTransparentBlack;
+  sampler_info.mipmapMode = mip_map;
+
+  if (yuv_conversion && yuv_conversion->IsValid()) {
+    sampler_chain.get<vk::SamplerYcbcrConversionInfo>().conversion =
+        yuv_conversion->GetConversion();
+
+    //
+    // TL;DR: When using YUV conversion, our samplers are somewhat hobbled and
+    // not all options configurable in Impeller (especially the linear
+    // filtering which is by far the most used form of filtering) can be
+    // supported. Switch to safe defaults.
+    //
+    // Spec: If sampler Y'CBCR conversion is enabled and the potential format
+    // features of the sampler Y'CBCR conversion do not support or enable
+    // separate reconstruction filters, minFilter and magFilter must be equal to
+    // the sampler Y'CBCR conversion's chromaFilter.
+    //
+    // Thing is, we don't enable separate reconstruction filters. By the time we
+    // are here, we also don't have access to the descriptor used to create this
+    // conversion. So we don't yet know what the chromaFilter is. But eNearest
+    // is a safe bet since the `AndroidHardwareBufferTextureSourceVK` defaults
+    // to that safe value. So just use that.
+    //
+    // See the validation VUID-VkSamplerCreateInfo-minFilter-01645 for more.
+    //
+    sampler_info.magFilter = vk::Filter::eNearest;
+    sampler_info.minFilter = vk::Filter::eNearest;
+
+    // Spec: If sampler Y′CBCR conversion is enabled, addressModeU,
+    // addressModeV, and addressModeW must be
+    // VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE, anisotropyEnable must be VK_FALSE,
+    // and unnormalizedCoordinates must be VK_FALSE.
+    //
+    // See the validation VUID-VkSamplerCreateInfo-addressModeU-01646 for more.
+    //
+    sampler_info.addressModeU = vk::SamplerAddressMode::eClampToEdge;
+    sampler_info.addressModeV = vk::SamplerAddressMode::eClampToEdge;
+    sampler_info.addressModeW = vk::SamplerAddressMode::eClampToEdge;
+    sampler_info.anisotropyEnable = false;
+    sampler_info.unnormalizedCoordinates = false;
+  } else {
+    sampler_chain.unlink<vk::SamplerYcbcrConversionInfo>();
+  }
+
+  auto sampler = device.createSamplerUnique(sampler_chain.get());
+  if (sampler.result != vk::Result::eSuccess) {
+    VALIDATION_LOG << "Could not create sampler: "
+                   << vk::to_string(sampler.result);
+    return {};
+  }
+
+  if (!desc.label.empty()) {
+    ContextVK::SetDebugName(device, sampler.value.get(), desc.label.c_str());
+  }
+
+  return std::move(sampler.value);
+}
+
+SamplerVK::SamplerVK(const vk::Device& device,
+                     SamplerDescriptor desc,
+                     std::shared_ptr<YUVConversionVK> yuv_conversion)
+    : Sampler(std::move(desc)),
+      device_(device),
+      sampler_(MakeSharedVK<vk::Sampler>(
+          CreateSampler(device, desc_, yuv_conversion))),
+      yuv_conversion_(std::move(yuv_conversion)) {
+  is_valid_ = sampler_ && !!sampler_->Get();
+}
+
+SamplerVK::~SamplerVK() = default;
+
+vk::Sampler SamplerVK::GetSampler() const {
+  return *sampler_;
 }
 
-SamplerVK::SamplerVK(SamplerDescriptor desc, vk::UniqueSampler sampler)
-    : Sampler(std::move(desc)), sampler_(std::move(sampler)) {
-  is_valid_ = true;
+std::shared_ptr<SamplerVK> SamplerVK::CreateVariantForConversion(
+    std::shared_ptr<YUVConversionVK> conversion) const {
+  if (!conversion || !is_valid_) {
+    return nullptr;
+  }
+  return std::make_shared<SamplerVK>(device_, desc_, std::move(conversion));
 }
 
-bool SamplerVK::IsValid() const {
-  return is_valid_;
+const std::shared_ptr<YUVConversionVK>& SamplerVK::GetYUVConversion() const {
+  return yuv_conversion_;
 }
 
 }  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/sampler_vk.h b/impeller/renderer/backend/vulkan/sampler_vk.h
index 4c11bd3660e8c3adc455a1b38fba59e49c37e9c4..aa572e1d7a8e5b85cd1748be88220537ff906b8f 100644
--- a/impeller/renderer/backend/vulkan/sampler_vk.h
+++ b/impeller/renderer/backend/vulkan/sampler_vk.h
@@ -2,37 +2,49 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_SAMPLER_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_SAMPLER_VK_H_
 
 #include "flutter/fml/macros.h"
 #include "impeller/base/backend_cast.h"
+#include "impeller/core/sampler.h"
+#include "impeller/renderer/backend/vulkan/shared_object_vk.h"
 #include "impeller/renderer/backend/vulkan/vk.h"
-#include "impeller/renderer/sampler.h"
-#include "vulkan/vulkan_handles.hpp"
 
 namespace impeller {
 
 class SamplerLibraryVK;
+class YUVConversionVK;
 
 class SamplerVK final : public Sampler, public BackendCast<SamplerVK, Sampler> {
  public:
-  SamplerVK(SamplerDescriptor desc, vk::UniqueSampler sampler);
+  SamplerVK(const vk::Device& device,
+            SamplerDescriptor desc,
+            std::shared_ptr<YUVConversionVK> yuv_conversion = {});
 
   // |Sampler|
   ~SamplerVK() override;
 
-  vk::Sampler GetSamplerVK() const;
+  vk::Sampler GetSampler() const;
+
+  std::shared_ptr<SamplerVK> CreateVariantForConversion(
+      std::shared_ptr<YUVConversionVK> conversion) const;
+
+  const std::shared_ptr<YUVConversionVK>& GetYUVConversion() const;
 
  private:
   friend SamplerLibraryVK;
 
-  vk::UniqueSampler sampler_;
+  const vk::Device device_;
+  SharedHandleVK<vk::Sampler> sampler_;
+  std::shared_ptr<YUVConversionVK> yuv_conversion_;
   bool is_valid_ = false;
 
-  // |Sampler|
-  bool IsValid() const override;
+  SamplerVK(const SamplerVK&) = delete;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(SamplerVK);
+  SamplerVK& operator=(const SamplerVK&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_SAMPLER_VK_H_
diff --git a/impeller/renderer/backend/vulkan/shader_function_vk.cc b/impeller/renderer/backend/vulkan/shader_function_vk.cc
index 03af4f9193f70028e948be6c27cebf294a84ae8a..1a2a12c8354ea456c26e07737765ce8eb07af393 100644
--- a/impeller/renderer/backend/vulkan/shader_function_vk.cc
+++ b/impeller/renderer/backend/vulkan/shader_function_vk.cc
@@ -6,14 +6,24 @@
 
 namespace impeller {
 
-ShaderFunctionVK::ShaderFunctionVK(UniqueID parent_library_id,
-                                   std::string name,
-                                   ShaderStage stage,
-                                   vk::UniqueShaderModule module)
+ShaderFunctionVK::ShaderFunctionVK(
+    const std::weak_ptr<DeviceHolderVK>& device_holder,
+    UniqueID parent_library_id,
+    std::string name,
+    ShaderStage stage,
+    vk::UniqueShaderModule module)
     : ShaderFunction(parent_library_id, std::move(name), stage),
-      module_(std::move(module)) {}
+      module_(std::move(module)),
+      device_holder_(device_holder) {}
 
-ShaderFunctionVK::~ShaderFunctionVK() = default;
+ShaderFunctionVK::~ShaderFunctionVK() {
+  std::shared_ptr<DeviceHolderVK> device_holder = device_holder_.lock();
+  if (device_holder) {
+    module_.reset();
+  } else {
+    module_.release();
+  }
+}
 
 const vk::ShaderModule& ShaderFunctionVK::GetModule() const {
   return module_.get();
diff --git a/impeller/renderer/backend/vulkan/shader_function_vk.h b/impeller/renderer/backend/vulkan/shader_function_vk.h
index 5c984980ac5dcb8d27c99a97b3414dfd910abcd5..1f4be36a6a5343c619da50fe0ff6fe2ea77e7e29 100644
--- a/impeller/renderer/backend/vulkan/shader_function_vk.h
+++ b/impeller/renderer/backend/vulkan/shader_function_vk.h
@@ -2,10 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_SHADER_FUNCTION_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_SHADER_FUNCTION_VK_H_
 
 #include "flutter/fml/macros.h"
 #include "impeller/base/backend_cast.h"
+#include "impeller/renderer/backend/vulkan/device_holder_vk.h"
 #include "impeller/renderer/backend/vulkan/shader_function_vk.h"
 #include "impeller/renderer/backend/vulkan/vk.h"
 #include "impeller/renderer/shader_function.h"
@@ -25,13 +27,19 @@ class ShaderFunctionVK final
   friend class ShaderLibraryVK;
 
   vk::UniqueShaderModule module_;
+  std::weak_ptr<DeviceHolderVK> device_holder_;
 
-  ShaderFunctionVK(UniqueID parent_library_id,
+  ShaderFunctionVK(const std::weak_ptr<DeviceHolderVK>& device_holder,
+                   UniqueID parent_library_id,
                    std::string name,
                    ShaderStage stage,
                    vk::UniqueShaderModule module);
 
-  FML_DISALLOW_COPY_AND_ASSIGN(ShaderFunctionVK);
+  ShaderFunctionVK(const ShaderFunctionVK&) = delete;
+
+  ShaderFunctionVK& operator=(const ShaderFunctionVK&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_SHADER_FUNCTION_VK_H_
diff --git a/impeller/renderer/backend/vulkan/shader_library_vk.cc b/impeller/renderer/backend/vulkan/shader_library_vk.cc
index df71ece7504f3c00d5381aa3c3301eb02f27af69..1b373b67cbacdee340d468ce43ba5ffc92fcace2 100644
--- a/impeller/renderer/backend/vulkan/shader_library_vk.cc
+++ b/impeller/renderer/backend/vulkan/shader_library_vk.cc
@@ -4,21 +4,24 @@
 
 #include "impeller/renderer/backend/vulkan/shader_library_vk.h"
 
+#include <cstdint>
+
 #include "flutter/fml/logging.h"
 #include "flutter/fml/trace_event.h"
-#include "impeller/blobcat/blob_library.h"
 #include "impeller/renderer/backend/vulkan/context_vk.h"
 #include "impeller/renderer/backend/vulkan/shader_function_vk.h"
+#include "impeller/shader_archive/multi_arch_shader_archive.h"
+#include "impeller/shader_archive/shader_archive.h"
 
 namespace impeller {
 
-static ShaderStage ToShaderStage(BlobShaderType type) {
+static ShaderStage ToShaderStage(ArchiveShaderType type) {
   switch (type) {
-    case BlobShaderType::kVertex:
+    case ArchiveShaderType::kVertex:
       return ShaderStage::kVertex;
-    case BlobShaderType::kFragment:
+    case ArchiveShaderType::kFragment:
       return ShaderStage::kFragment;
-    case BlobShaderType::kCompute:
+    case ArchiveShaderType::kCompute:
       return ShaderStage::kCompute;
   }
   FML_UNREACHABLE();
@@ -38,12 +41,6 @@ static std::string VKShaderNameToShaderKeyName(const std::string& name,
     case ShaderStage::kFragment:
       stream << "_fragment_";
       break;
-    case ShaderStage::kTessellationControl:
-      stream << "_tessellation_control_";
-      break;
-    case ShaderStage::kTessellationEvaluation:
-      stream << "_tessellation_evaluation_";
-      break;
     case ShaderStage::kCompute:
       stream << "_compute_";
       break;
@@ -53,60 +50,37 @@ static std::string VKShaderNameToShaderKeyName(const std::string& name,
 }
 
 ShaderLibraryVK::ShaderLibraryVK(
-    const vk::Device& device,
-    const std::vector<std::shared_ptr<fml::Mapping>>& shader_libraries_data) {
-  TRACE_EVENT0("impeller", "ShaderLibraryCreate");
-  ShaderFunctionMap functions;
+    std::weak_ptr<DeviceHolderVK> device_holder,
+    const std::vector<std::shared_ptr<fml::Mapping>>& shader_libraries_data)
+    : device_holder_(std::move(device_holder)) {
+  TRACE_EVENT0("impeller", "CreateShaderLibrary");
   bool success = true;
-  auto iterator = [&success, &device, &functions, library_id = library_id_](
-                      auto type,           //
-                      const auto& name,    //
-                      const auto& mapping  //
+  auto iterator = [&](auto type,         //
+                      const auto& name,  //
+                      const auto& code   //
                       ) -> bool {
-    vk::ShaderModuleCreateInfo shader_module_info;
-
-    shader_module_info.setPCode(
-        reinterpret_cast<const uint32_t*>(mapping->GetMapping()));
-    shader_module_info.setCodeSize(mapping->GetSize());
-
-    auto module = device.createShaderModuleUnique(shader_module_info);
-
-    if (module.result != vk::Result::eSuccess) {
-      VALIDATION_LOG << "Could not create shader module: "
-                     << vk::to_string(module.result);
+    const auto stage = ToShaderStage(type);
+    if (!RegisterFunction(VKShaderNameToShaderKeyName(name, stage), stage,
+                          code)) {
       success = false;
       return false;
     }
-
-    const auto stage = ToShaderStage(type);
-    const auto key_name = VKShaderNameToShaderKeyName(name, stage);
-
-    vk::UniqueShaderModule shader_module = std::move(module.value);
-    ContextVK::SetDebugName(device, *shader_module,
-                            "shader_module_" + key_name);
-
-    functions[ShaderKey{key_name, stage}] = std::shared_ptr<ShaderFunctionVK>(
-        new ShaderFunctionVK(library_id,               //
-                             key_name,                 //
-                             stage,                    //
-                             std::move(shader_module)  //
-                             ));
-
     return true;
   };
   for (const auto& library_data : shader_libraries_data) {
-    auto blob_library = BlobLibrary{library_data};
-    if (!blob_library.IsValid()) {
-      VALIDATION_LOG << "Could not construct shader blob library.";
+    auto vulkan_library = MultiArchShaderArchive::CreateArchiveFromMapping(
+        library_data, ArchiveRenderingBackend::kVulkan);
+    if (!vulkan_library || !vulkan_library->IsValid()) {
+      VALIDATION_LOG << "Could not construct Vulkan shader library archive.";
       return;
     }
-    blob_library.IterateAllBlobs(iterator);
+    vulkan_library->IterateAllShaders(iterator);
   }
 
   if (!success) {
+    VALIDATION_LOG << "Could not create shader modules for all shader blobs.";
     return;
   }
-  functions_ = std::move(functions);
   is_valid_ = true;
 }
 
@@ -116,6 +90,7 @@ bool ShaderLibraryVK::IsValid() const {
   return is_valid_;
 }
 
+// |ShaderLibrary|
 std::shared_ptr<const ShaderFunction> ShaderLibraryVK::GetFunction(
     std::string_view name,
     ShaderStage stage) {
@@ -129,14 +104,85 @@ std::shared_ptr<const ShaderFunction> ShaderLibraryVK::GetFunction(
   return nullptr;
 }
 
+// |ShaderLibrary|
+void ShaderLibraryVK::RegisterFunction(std::string name,
+                                       ShaderStage stage,
+                                       std::shared_ptr<fml::Mapping> code,
+                                       RegistrationCallback callback) {
+  const auto result = RegisterFunction(name, stage, code);
+  if (callback) {
+    callback(result);
+  }
+}
+
+static bool IsMappingSPIRV(const fml::Mapping& mapping) {
+  // https://registry.khronos.org/SPIR-V/specs/1.0/SPIRV.html#Magic
+  const uint32_t kSPIRVMagic = 0x07230203;
+  if (mapping.GetSize() < sizeof(kSPIRVMagic)) {
+    return false;
+  }
+  uint32_t magic = 0u;
+  ::memcpy(&magic, mapping.GetMapping(), sizeof(magic));
+  return magic == kSPIRVMagic;
+}
+
+bool ShaderLibraryVK::RegisterFunction(
+    const std::string& name,
+    ShaderStage stage,
+    const std::shared_ptr<fml::Mapping>& code) {
+  if (!code) {
+    return false;
+  }
+
+  if (!IsMappingSPIRV(*code)) {
+    VALIDATION_LOG << "Shader is not valid SPIRV.";
+    return false;
+  }
+
+  vk::ShaderModuleCreateInfo shader_module_info;
+
+  shader_module_info.setPCode(
+      reinterpret_cast<const uint32_t*>(code->GetMapping()));
+  shader_module_info.setCodeSize(code->GetSize());
+
+  auto device_holder = device_holder_.lock();
+  if (!device_holder) {
+    return false;
+  }
+  FML_DCHECK(device_holder->GetDevice());
+  auto module =
+      device_holder->GetDevice().createShaderModuleUnique(shader_module_info);
+
+  if (module.result != vk::Result::eSuccess) {
+    VALIDATION_LOG << "Could not create shader module: "
+                   << vk::to_string(module.result);
+    return false;
+  }
+
+  vk::UniqueShaderModule shader_module = std::move(module.value);
+  ContextVK::SetDebugName(device_holder->GetDevice(), *shader_module,
+                          "Shader " + name);
+
+  WriterLock lock(functions_mutex_);
+  functions_[ShaderKey{name, stage}] = std::shared_ptr<ShaderFunctionVK>(
+      new ShaderFunctionVK(device_holder_,
+                           library_id_,              //
+                           name,                     //
+                           stage,                    //
+                           std::move(shader_module)  //
+                           ));
+
+  return true;
+}
+
 // |ShaderLibrary|
 void ShaderLibraryVK::UnregisterFunction(std::string name, ShaderStage stage) {
-  ReaderLock lock(functions_mutex_);
+  WriterLock lock(functions_mutex_);
 
   const auto key = ShaderKey{name, stage};
 
   auto found = functions_.find(key);
-  if (found != functions_.end()) {
+  if (found == functions_.end()) {
     VALIDATION_LOG << "Library function named " << name
                    << " was not found, so it couldn't be unregistered.";
     return;
diff --git a/impeller/renderer/backend/vulkan/shader_library_vk.h b/impeller/renderer/backend/vulkan/shader_library_vk.h
index c02eedb56912a8d84b665e86a469f41987a22349..d6fc65d7f2de08adac94e4d6582ac73493e0e519 100644
--- a/impeller/renderer/backend/vulkan/shader_library_vk.h
+++ b/impeller/renderer/backend/vulkan/shader_library_vk.h
@@ -2,11 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_SHADER_LIBRARY_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_SHADER_LIBRARY_VK_H_
 
 #include "flutter/fml/macros.h"
 #include "impeller/base/comparable.h"
 #include "impeller/base/thread.h"
+#include "impeller/renderer/backend/vulkan/device_holder_vk.h"
 #include "impeller/renderer/backend/vulkan/vk.h"
 #include "impeller/renderer/shader_key.h"
 #include "impeller/renderer/shader_library.h"
@@ -23,23 +25,38 @@ class ShaderLibraryVK final : public ShaderLibrary {
 
  private:
   friend class ContextVK;
+  std::weak_ptr<DeviceHolderVK> device_holder_;
   const UniqueID library_id_;
   mutable RWMutex functions_mutex_;
-  ShaderFunctionMap functions_;
+  ShaderFunctionMap functions_ IPLR_GUARDED_BY(functions_mutex_);
   bool is_valid_ = false;
 
   ShaderLibraryVK(
-      const vk::Device& device,
+      std::weak_ptr<DeviceHolderVK> device_holder,
       const std::vector<std::shared_ptr<fml::Mapping>>& shader_libraries_data);
 
   // |ShaderLibrary|
   std::shared_ptr<const ShaderFunction> GetFunction(std::string_view name,
                                                     ShaderStage stage) override;
 
+  // |ShaderLibrary|
+  void RegisterFunction(std::string name,
+                        ShaderStage stage,
+                        std::shared_ptr<fml::Mapping> code,
+                        RegistrationCallback callback) override;
+
+  bool RegisterFunction(const std::string& name,
+                        ShaderStage stage,
+                        const std::shared_ptr<fml::Mapping>& code);
+
   // |ShaderLibrary|
   void UnregisterFunction(std::string name, ShaderStage stage) override;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(ShaderLibraryVK);
+  ShaderLibraryVK(const ShaderLibraryVK&) = delete;
+
+  ShaderLibraryVK& operator=(const ShaderLibraryVK&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_SHADER_LIBRARY_VK_H_
diff --git a/impeller/renderer/buffer.cc b/impeller/renderer/backend/vulkan/shared_object_vk.cc
similarity index 76%
rename from impeller/renderer/buffer.cc
rename to impeller/renderer/backend/vulkan/shared_object_vk.cc
index 1b0d524463dce611ae67d2f3229bf7c6c7d4dc17..ddfcdf545e3fc99061dd5e82759b5e17bae39429 100644
--- a/impeller/renderer/buffer.cc
+++ b/impeller/renderer/backend/vulkan/shared_object_vk.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/renderer/buffer.h"
+#include "impeller/renderer/backend/vulkan/shared_object_vk.h"
 
 namespace impeller {
 
-Buffer::~Buffer() = default;
+//
 
 }  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/shared_object_vk.h b/impeller/renderer/backend/vulkan/shared_object_vk.h
new file mode 100644
index 0000000000000000000000000000000000000000..7b4bbdce8686b96aea322791b4b72b0d5fe55d03
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/shared_object_vk.h
@@ -0,0 +1,56 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_SHARED_OBJECT_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_SHARED_OBJECT_VK_H_
+
+#include <memory>
+
+#include "flutter/fml/macros.h"
+#include "impeller/renderer/backend/vulkan/vk.h"
+
+namespace impeller {
+
+class SharedObjectVK {
+ public:
+  virtual ~SharedObjectVK() = default;
+};
+
+template <class T>
+class SharedObjectVKT : public SharedObjectVK {
+ public:
+  using Resource = T;
+  using UniqueResource =
+      vk::UniqueHandle<Resource, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE>;
+
+  explicit SharedObjectVKT(UniqueResource res) : resource_(std::move(res)) {}
+
+  // NOLINTNEXTLINE(google-explicit-constructor)
+  operator Resource() const { return Get(); }
+
+  const Resource& Get() const { return *resource_; }
+
+ private:
+  UniqueResource resource_;
+
+  SharedObjectVKT(const SharedObjectVKT&) = delete;
+
+  SharedObjectVKT& operator=(const SharedObjectVKT&) = delete;
+};
+
+template <class T>
+auto MakeSharedVK(
+    vk::UniqueHandle<T, VULKAN_HPP_DEFAULT_DISPATCHER_TYPE> handle) {
+  if (!handle) {
+    return std::shared_ptr<SharedObjectVKT<T>>{nullptr};
+  }
+  return std::make_shared<SharedObjectVKT<T>>(std::move(handle));
+}
+
+template <class T>
+using SharedHandleVK = std::shared_ptr<SharedObjectVKT<T>>;
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_SHARED_OBJECT_VK_H_
diff --git a/impeller/renderer/backend/vulkan/surface_context_vk.cc b/impeller/renderer/backend/vulkan/surface_context_vk.cc
new file mode 100644
index 0000000000000000000000000000000000000000..419dbf9b81e2c3df7c37a72d9ef273518d731ef7
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/surface_context_vk.cc
@@ -0,0 +1,162 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/backend/vulkan/surface_context_vk.h"
+
+#include "flutter/fml/trace_event.h"
+#include "impeller/renderer/backend/vulkan/command_pool_vk.h"
+#include "impeller/renderer/backend/vulkan/context_vk.h"
+#include "impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_vk.h"
+#include "impeller/renderer/surface.h"
+#include "vulkan/vulkan_core.h"
+
+namespace impeller {
+
+SurfaceContextVK::SurfaceContextVK(const std::shared_ptr<ContextVK>& parent)
+    : parent_(parent) {}
+
+SurfaceContextVK::~SurfaceContextVK() = default;
+
+Context::BackendType SurfaceContextVK::GetBackendType() const {
+  return parent_->GetBackendType();
+}
+
+std::string SurfaceContextVK::DescribeGpuModel() const {
+  return parent_->DescribeGpuModel();
+}
+
+bool SurfaceContextVK::IsValid() const {
+  return parent_->IsValid();
+}
+
+std::shared_ptr<Allocator> SurfaceContextVK::GetResourceAllocator() const {
+  return parent_->GetResourceAllocator();
+}
+
+std::shared_ptr<ShaderLibrary> SurfaceContextVK::GetShaderLibrary() const {
+  return parent_->GetShaderLibrary();
+}
+
+std::shared_ptr<SamplerLibrary> SurfaceContextVK::GetSamplerLibrary() const {
+  return parent_->GetSamplerLibrary();
+}
+
+std::shared_ptr<PipelineLibrary> SurfaceContextVK::GetPipelineLibrary() const {
+  return parent_->GetPipelineLibrary();
+}
+
+std::shared_ptr<CommandBuffer> SurfaceContextVK::CreateCommandBuffer() const {
+  return parent_->CreateCommandBuffer();
+}
+
+std::shared_ptr<CommandQueue> SurfaceContextVK::GetCommandQueue() const {
+  return parent_->GetCommandQueue();
+}
+
+const std::shared_ptr<const Capabilities>& SurfaceContextVK::GetCapabilities()
+    const {
+  return parent_->GetCapabilities();
+}
+
+void SurfaceContextVK::Shutdown() {
+  parent_->Shutdown();
+}
+
+bool SurfaceContextVK::SetWindowSurface(vk::UniqueSurfaceKHR surface,
+                                        const ISize& size) {
+  auto swapchain = KHRSwapchainVK::Create(parent_, std::move(surface), size);
+  if (!swapchain) {
+    VALIDATION_LOG << "Could not create swapchain.";
+    return false;
+  }
+  if (!swapchain->IsValid()) {
+    VALIDATION_LOG << "Could not create valid swapchain.";
+    return false;
+  }
+  swapchain_ = std::move(swapchain);
+  return true;
+}
+
+std::unique_ptr<Surface> SurfaceContextVK::AcquireNextSurface() {
+  TRACE_EVENT0("impeller", __FUNCTION__);
+  auto surface = swapchain_ ? swapchain_->AcquireNextDrawable() : nullptr;
+  if (!surface) {
+    return nullptr;
+  }
+  if (auto pipeline_library = parent_->GetPipelineLibrary()) {
+    impeller::PipelineLibraryVK::Cast(*pipeline_library)
+        .DidAcquireSurfaceFrame();
+  }
+  parent_->GetCommandPoolRecycler()->Dispose();
+  parent_->GetResourceAllocator()->DebugTraceMemoryStatistics();
+  return surface;
+}
+
+void SurfaceContextVK::UpdateSurfaceSize(const ISize& size) const {
+  swapchain_->UpdateSurfaceSize(size);
+}
+
+#ifdef FML_OS_ANDROID
+
+vk::UniqueSurfaceKHR SurfaceContextVK::CreateAndroidSurface(
+    ANativeWindow* window) const {
+  if (!parent_->GetInstance()) {
+    return vk::UniqueSurfaceKHR{VK_NULL_HANDLE};
+  }
+
+  auto create_info = vk::AndroidSurfaceCreateInfoKHR().setWindow(window);
+  auto surface_res =
+      parent_->GetInstance().createAndroidSurfaceKHRUnique(create_info);
+
+  if (surface_res.result != vk::Result::eSuccess) {
+    VALIDATION_LOG << "Could not create Android surface, error: "
+                   << vk::to_string(surface_res.result);
+    return vk::UniqueSurfaceKHR{VK_NULL_HANDLE};
+  }
+
+  return std::move(surface_res.value);
+}
+
+#endif  // FML_OS_ANDROID
+
+#ifdef FML_OS_OHOS
+vk::UniqueSurfaceKHR SurfaceContextVK::CreateOHOSSurface(
+    OHNativeWindow* window) const {
+  if (!parent_->GetInstance()) {
+    VALIDATION_LOG << "createSurface get null instance";
+    return vk::UniqueSurfaceKHR{VK_NULL_HANDLE};
+  }
+  static PFN_vkCreateSurfaceOHOS vkCreateSurfaceOHOS =
+      (PFN_vkCreateSurfaceOHOS)parent_->GetInstance().getProcAddr(
+          "vkCreateSurfaceOHOS");
+  if (!vkCreateSurfaceOHOS) {
+    VALIDATION_LOG << "missing vkCreateSurfaceOHOS extension";
+    return vk::UniqueSurfaceKHR{VK_NULL_HANDLE};
+  }
+  const VkSurfaceCreateInfoOHOS surfaceCreateInfo{
+      (VkStructureType)VK_STRUCTURE_TYPE_SURFACE_CREATE_INFO_OHOS, nullptr, 0,
+      window};
+  VkSurfaceKHR surface = VK_NULL_HANDLE;
+  if (vkCreateSurfaceOHOS(parent_->GetInstance(), &surfaceCreateInfo, nullptr,
+                          &surface) != VK_SUCCESS) {
+    VALIDATION_LOG << "vkCreateSurfaceOHOS get failed";
+    return vk::UniqueSurfaceKHR{VK_NULL_HANDLE};
+  }
+  return vk::UniqueSurfaceKHR(surface);
+}
+#endif  // FML_OS_OHOS
+
+const vk::Device& SurfaceContextVK::GetDevice() const {
+  return parent_->GetDevice();
+}
+
+void SurfaceContextVK::InitializeCommonlyUsedShadersIfNeeded() const {
+  parent_->InitializeCommonlyUsedShadersIfNeeded();
+}
+
+const ContextVK& SurfaceContextVK::GetParent() const {
+  return *parent_;
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/surface_context_vk.h b/impeller/renderer/backend/vulkan/surface_context_vk.h
new file mode 100644
index 0000000000000000000000000000000000000000..7b3fdc29d65399da7c90be82f04f06811abe8821
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/surface_context_vk.h
@@ -0,0 +1,109 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_SURFACE_CONTEXT_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_SURFACE_CONTEXT_VK_H_
+
+#include <memory>
+
+#include "impeller/base/backend_cast.h"
+#include "impeller/renderer/backend/vulkan/vk.h"
+#include "impeller/renderer/command_queue.h"
+#include "impeller/renderer/context.h"
+
+#ifdef FML_OS_OHOS
+#include <native_window/external_window.h>
+#include <vulkan/vulkan.h>
+#include <vulkan/vulkan_ohos.h>
+#define VK_STRUCTURE_TYPE_SURFACE_CREATE_INFO_OHOS 1000451000
+#endif
+
+namespace impeller {
+
+class ContextVK;
+class Surface;
+class KHRSwapchainVK;
+
+/// For Vulkan, there is both a ContextVK that implements Context and a
+/// SurfaceContextVK that also implements Context and takes a ContextVK as its
+/// parent. There is a one to many relationship between ContextVK and
+/// SurfaceContextVK.
+///
+/// Most operations in this class are delegated to the parent ContextVK.
+/// This class specifically manages swapchains and creation of VkSurfaces on
+/// Android. By maintaining the swapchain this way, it is possible to have
+/// multiple surfaces sharing the same ContextVK without stepping on each
+/// other's swapchains.
+class SurfaceContextVK : public Context,
+                         public BackendCast<SurfaceContextVK, Context> {
+ public:
+  explicit SurfaceContextVK(const std::shared_ptr<ContextVK>& parent);
+
+  // |Context|
+  ~SurfaceContextVK() override;
+
+  // |Context|
+  BackendType GetBackendType() const override;
+
+  // |Context|
+  std::string DescribeGpuModel() const override;
+
+  // |Context|
+  bool IsValid() const override;
+
+  // |Context|
+  std::shared_ptr<Allocator> GetResourceAllocator() const override;
+
+  // |Context|
+  std::shared_ptr<ShaderLibrary> GetShaderLibrary() const override;
+
+  // |Context|
+  std::shared_ptr<SamplerLibrary> GetSamplerLibrary() const override;
+
+  // |Context|
+  std::shared_ptr<PipelineLibrary> GetPipelineLibrary() const override;
+
+  // |Context|
+  std::shared_ptr<CommandBuffer> CreateCommandBuffer() const override;
+
+  // |Context|
+  const std::shared_ptr<const Capabilities>& GetCapabilities() const override;
+
+  // |Context|
+  std::shared_ptr<CommandQueue> GetCommandQueue() const override;
+
+  // |Context|
+  void Shutdown() override;
+
+  [[nodiscard]] bool SetWindowSurface(vk::UniqueSurfaceKHR surface,
+                                      const ISize& size);
+
+  std::unique_ptr<Surface> AcquireNextSurface();
+
+  /// @brief Mark the current swapchain configuration as dirty, forcing it to be
+  ///        recreated on the next frame.
+  void UpdateSurfaceSize(const ISize& size) const;
+
+  void InitializeCommonlyUsedShadersIfNeeded() const override;
+
+#ifdef FML_OS_ANDROID
+  vk::UniqueSurfaceKHR CreateAndroidSurface(ANativeWindow* window) const;
+#endif  // FML_OS_ANDROID
+
+#ifdef FML_OS_OHOS
+  vk::UniqueSurfaceKHR CreateOHOSSurface(OHNativeWindow* window) const;
+#endif  // FML_OS_OHOS
+
+  const vk::Device& GetDevice() const;
+
+  const ContextVK& GetParent() const;
+
+ private:
+  std::shared_ptr<ContextVK> parent_;
+  std::shared_ptr<KHRSwapchainVK> swapchain_;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_SURFACE_CONTEXT_VK_H_
diff --git a/impeller/renderer/backend/vulkan/surface_producer_vk.cc b/impeller/renderer/backend/vulkan/surface_producer_vk.cc
deleted file mode 100644
index 8bd94893753ee7fda76eea3cd1ec34b2cf429b77..0000000000000000000000000000000000000000
--- a/impeller/renderer/backend/vulkan/surface_producer_vk.cc
+++ /dev/null
@@ -1,196 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "impeller/renderer/backend/vulkan/surface_producer_vk.h"
-
-#include <array>
-#include <utility>
-
-#include "impeller/base/validation.h"
-#include "impeller/renderer/backend/vulkan/surface_vk.h"
-#include "impeller/renderer/backend/vulkan/vk.h"
-
-namespace impeller {
-
-std::unique_ptr<SurfaceProducerVK> SurfaceProducerVK::Create(
-    const std::weak_ptr<Context>& context,
-    const SurfaceProducerCreateInfoVK& create_info) {
-  auto surface_producer =
-      std::make_unique<SurfaceProducerVK>(context, create_info);
-  if (!surface_producer->SetupSyncObjects()) {
-    VALIDATION_LOG << "Failed to setup sync objects.";
-    return nullptr;
-  }
-
-  return surface_producer;
-}
-
-SurfaceProducerVK::SurfaceProducerVK(
-    std::weak_ptr<Context> context,
-    const SurfaceProducerCreateInfoVK& create_info)
-    : context_(std::move(context)), create_info_(create_info) {}
-
-SurfaceProducerVK::~SurfaceProducerVK() = default;
-
-std::unique_ptr<Surface> SurfaceProducerVK::AcquireSurface(
-    size_t current_frame) {
-  current_frame = current_frame % kMaxFramesInFlight;
-  const auto& sync_objects = sync_objects_[current_frame];
-
-  auto fence_wait_res = create_info_.device.waitForFences(
-      {*sync_objects->in_flight_fence}, VK_TRUE, UINT64_MAX);
-  if (fence_wait_res != vk::Result::eSuccess) {
-    VALIDATION_LOG << "Failed to wait for fence: "
-                   << vk::to_string(fence_wait_res);
-    return nullptr;
-  }
-
-  auto fence_reset_res =
-      create_info_.device.resetFences({*sync_objects->in_flight_fence});
-  if (fence_reset_res != vk::Result::eSuccess) {
-    VALIDATION_LOG << "Failed to reset fence: "
-                   << vk::to_string(fence_reset_res);
-    return nullptr;
-  }
-
-  uint32_t image_index;
-  auto acuire_image_res = create_info_.device.acquireNextImageKHR(
-      create_info_.swapchain->GetSwapchain(), UINT64_MAX,
-      *sync_objects->image_available_semaphore, {}, &image_index);
-
-  if (acuire_image_res != vk::Result::eSuccess &&
-      acuire_image_res != vk::Result::eSuboptimalKHR) {
-    VALIDATION_LOG << "Failed to acquire next image: "
-                   << vk::to_string(acuire_image_res);
-    return nullptr;
-  }
-
-  SurfaceVK::SwapCallback swap_callback = [this, current_frame, image_index]() {
-    return Present(current_frame, image_index);
-  };
-
-  if (auto context = context_.lock()) {
-    ContextVK* context_vk = reinterpret_cast<ContextVK*>(context.get());
-    return SurfaceVK::WrapSwapchainImage(
-        current_frame, create_info_.swapchain->GetSwapchainImage(image_index),
-        context_vk, std::move(swap_callback));
-  } else {
-    return nullptr;
-  }
-}
-
-std::unique_ptr<SurfaceSyncObjectsVK> SurfaceSyncObjectsVK::Create(
-    vk::Device device) {
-  auto sync_objects = std::make_unique<SurfaceSyncObjectsVK>();
-  vk::SemaphoreCreateInfo semaphore_create_info;
-
-  {
-    auto image_avail_res = device.createSemaphoreUnique(semaphore_create_info);
-    if (image_avail_res.result != vk::Result::eSuccess) {
-      VALIDATION_LOG << "Failed to create image available semaphore: "
-                     << vk::to_string(image_avail_res.result);
-      return nullptr;
-    }
-    sync_objects->image_available_semaphore = std::move(image_avail_res.value);
-  }
-
-  {
-    auto render_finished_res =
-        device.createSemaphoreUnique(semaphore_create_info);
-    if (render_finished_res.result != vk::Result::eSuccess) {
-      VALIDATION_LOG << "Failed to create render finished semaphore: "
-                     << vk::to_string(render_finished_res.result);
-      return nullptr;
-    }
-    sync_objects->render_finished_semaphore =
-        std::move(render_finished_res.value);
-  }
-
-  vk::FenceCreateInfo fence_create_info;
-  fence_create_info.flags = vk::FenceCreateFlagBits::eSignaled;
-  {
-    auto fence_res = device.createFenceUnique(fence_create_info);
-    if (fence_res.result != vk::Result::eSuccess) {
-      VALIDATION_LOG << "Failed to create fence: "
-                     << vk::to_string(fence_res.result);
-      return nullptr;
-    }
-    sync_objects->in_flight_fence = std::move(fence_res.value);
-  }
-
-  return sync_objects;
-}
-
-bool SurfaceProducerVK::SetupSyncObjects() {
-  for (size_t i = 0; i < kMaxFramesInFlight; i++) {
-    auto sync_objects = SurfaceSyncObjectsVK::Create(create_info_.device);
-    if (!sync_objects) {
-      return false;
-    }
-    sync_objects_[i] = std::move(sync_objects);
-  }
-  return true;
-}
-
-bool SurfaceProducerVK::Submit(uint32_t frame_num) {
-  auto& sync_objects = sync_objects_[frame_num];
-  vk::SubmitInfo submit_info;
-  std::array<vk::PipelineStageFlags, 1> wait_stages = {
-      vk::PipelineStageFlagBits::eColorAttachmentOutput};
-  submit_info.setWaitDstStageMask(wait_stages);
-
-  std::array<vk::Semaphore, 1> wait_semaphores = {
-      *sync_objects->image_available_semaphore};
-  submit_info.setWaitSemaphores(wait_semaphores);
-
-  std::array<vk::Semaphore, 1> signal_semaphores = {
-      *sync_objects->render_finished_semaphore};
-  submit_info.setSignalSemaphores(signal_semaphores);
-
-  auto graphics_submit_res = create_info_.graphics_queue.submit(
-      {submit_info}, *sync_objects->in_flight_fence);
-  if (graphics_submit_res != vk::Result::eSuccess) {
-    VALIDATION_LOG << "Failed to submit graphics queue: "
-                   << vk::to_string(graphics_submit_res);
-    return false;
-  }
-
-  auto idle_wait_res = create_info_.graphics_queue.waitIdle();
-  if (idle_wait_res != vk::Result::eSuccess) {
-    VALIDATION_LOG << "Failed to wait for graphics queue idle: "
-                   << vk::to_string(idle_wait_res);
-    return false;
-  }
-
-  return true;
-}
-
-bool SurfaceProducerVK::Present(size_t frame_num, uint32_t image_index) {
-  Submit(frame_num);
-
-  auto& sync_objects = sync_objects_[frame_num];
-
-  vk::PresentInfoKHR present_info;
-
-  std::array<vk::Semaphore, 1> signal_semaphores = {
-      *sync_objects->render_finished_semaphore};
-  present_info.setWaitSemaphores(signal_semaphores);
-
-  std::array<vk::SwapchainKHR, 1> swapchains = {
-      create_info_.swapchain->GetSwapchain()};
-  present_info.setSwapchains(swapchains);
-
-  std::array<uint32_t, 1> image_indices = {image_index};
-  present_info.setImageIndices(image_indices);
-
-  auto present_res = create_info_.present_queue.presentKHR(present_info);
-  if ((present_res != vk::Result::eSuccess) &&
-      (present_res != vk::Result::eSuboptimalKHR)) {
-    return false;
-  }
-
-  return true;
-}
-
-}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/surface_producer_vk.h b/impeller/renderer/backend/vulkan/surface_producer_vk.h
deleted file mode 100644
index 88133ea6e9d483771df14787b6fd820d9baf2461..0000000000000000000000000000000000000000
--- a/impeller/renderer/backend/vulkan/surface_producer_vk.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#pragma once
-
-#include <memory>
-
-#include "flutter/fml/macros.h"
-#include "impeller/renderer/backend/vulkan/swapchain_vk.h"
-#include "impeller/renderer/backend/vulkan/vk.h"
-#include "impeller/renderer/surface.h"
-#include "vulkan/vulkan_handles.hpp"
-
-namespace impeller {
-
-struct SurfaceProducerCreateInfoVK {
-  vk::Device device;
-  vk::Queue graphics_queue;
-  vk::Queue present_queue;
-  SwapchainVK* swapchain;
-};
-
-class SurfaceSyncObjectsVK {
- public:
-  vk::UniqueSemaphore image_available_semaphore;
-  vk::UniqueSemaphore render_finished_semaphore;
-  vk::UniqueFence in_flight_fence;
-
-  static std::unique_ptr<SurfaceSyncObjectsVK> Create(vk::Device device);
-};
-
-class SurfaceProducerVK {
- public:
-  static std::unique_ptr<SurfaceProducerVK> Create(
-      const std::weak_ptr<Context>& context,
-      const SurfaceProducerCreateInfoVK& create_info);
-
-  SurfaceProducerVK(std::weak_ptr<Context> context,
-                    const SurfaceProducerCreateInfoVK& create_info);
-
-  ~SurfaceProducerVK();
-
-  std::unique_ptr<Surface> AcquireSurface(size_t current_frame);
-
- private:
-  std::weak_ptr<Context> context_;
-
-  bool SetupSyncObjects();
-
-  bool Submit(uint32_t frame_num);
-
-  bool Present(size_t frame_num, uint32_t image_index);
-
-  const SurfaceProducerCreateInfoVK create_info_;
-
-  // sync objects
-  std::unique_ptr<SurfaceSyncObjectsVK> sync_objects_[kMaxFramesInFlight];
-
-  FML_DISALLOW_COPY_AND_ASSIGN(SurfaceProducerVK);
-};
-
-}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/surface_vk.cc b/impeller/renderer/backend/vulkan/surface_vk.cc
deleted file mode 100644
index d3963fb7d5b30b209e3c692d2fff9849da58f868..0000000000000000000000000000000000000000
--- a/impeller/renderer/backend/vulkan/surface_vk.cc
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "impeller/renderer/backend/vulkan/surface_vk.h"
-
-#include "impeller/renderer/backend/vulkan/texture_vk.h"
-#include "impeller/renderer/surface.h"
-
-namespace impeller {
-std::unique_ptr<SurfaceVK> SurfaceVK::WrapSwapchainImage(
-    uint32_t frame_num,
-    SwapchainImageVK* swapchain_image,
-    ContextVK* context,
-    SwapCallback swap_callback) {
-  if (!swapchain_image) {
-    return nullptr;
-  }
-
-  TextureDescriptor color0_tex;
-  color0_tex.type = TextureType::kTexture2D;
-  color0_tex.format = swapchain_image->GetPixelFormat();
-  color0_tex.size = swapchain_image->GetSize();
-  color0_tex.usage = static_cast<TextureUsageMask>(TextureUsage::kRenderTarget);
-  color0_tex.sample_count = SampleCount::kCount1;
-  color0_tex.storage_mode = StorageMode::kDevicePrivate;
-
-  ColorAttachment color0;
-  auto color_texture_info = std::make_unique<TextureInfoVK>(TextureInfoVK{
-      .backing_type = TextureBackingTypeVK::kWrappedTexture,
-      .wrapped_texture =
-          {
-              .swapchain_image = swapchain_image,
-              .frame_num = frame_num,
-          },
-  });
-  color0.texture = std::make_shared<TextureVK>(color0_tex, context,
-                                               std::move(color_texture_info));
-  color0.clear_color = Color::DarkSlateGray();
-  color0.load_action = LoadAction::kClear;
-  color0.store_action = StoreAction::kDontCare;
-
-  TextureDescriptor stencil0_tex;
-  stencil0_tex.type = TextureType::kTexture2D;
-  stencil0_tex.format = swapchain_image->GetPixelFormat();
-  stencil0_tex.size = swapchain_image->GetSize();
-  stencil0_tex.usage =
-      static_cast<TextureUsageMask>(TextureUsage::kRenderTarget);
-  stencil0_tex.sample_count = SampleCount::kCount1;
-
-  StencilAttachment stencil0;
-  stencil0.clear_stencil = 0;
-  auto stencil_texture_info = std::make_unique<TextureInfoVK>(TextureInfoVK{
-      .backing_type = TextureBackingTypeVK::kWrappedTexture,
-      .wrapped_texture =
-          {
-              .swapchain_image = swapchain_image,
-              .frame_num = frame_num,
-          },
-  });
-  stencil0.texture = std::make_shared<TextureVK>(
-      stencil0_tex, context, std::move(stencil_texture_info));
-  stencil0.load_action = LoadAction::kClear;
-  stencil0.store_action = StoreAction::kDontCare;
-
-  RenderTarget render_target_desc;
-  render_target_desc.SetColorAttachment(color0, 0u);
-
-  return std::unique_ptr<SurfaceVK>(new SurfaceVK(
-      render_target_desc, swapchain_image, std::move(swap_callback)));
-}
-
-SurfaceVK::SurfaceVK(const RenderTarget& target,
-                     SwapchainImageVK* swapchain_image,
-                     SwapCallback swap_callback)
-    : Surface(target) {
-  swap_callback_ = std::move(swap_callback);
-}
-
-SurfaceVK::~SurfaceVK() = default;
-
-bool SurfaceVK::Present() const {
-  return swap_callback_ ? swap_callback_() : false;
-}
-
-}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/swapchain/README.md b/impeller/renderer/backend/vulkan/swapchain/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..1d08d7e680bf55d50889e2576a98675d3577d085
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/swapchain/README.md
@@ -0,0 +1,4 @@
+Vulkan Swapchains
+=================
+
+Contains implementations of swapchains for Window System Integration (WSI) on different platforms.
diff --git a/impeller/renderer/backend/vulkan/swapchain/khr/README.md b/impeller/renderer/backend/vulkan/swapchain/khr/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..886de7e51bc894efabe81c15908bf965dbb14883
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/swapchain/khr/README.md
@@ -0,0 +1,4 @@
+KHR Swapchain
+=============
+
+An implementation of a Vulkan swapchain that depends on [`VK_KHR_swapchain`](https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_KHR_swapchain.html). This swapchain is available on most platforms but may not be ideal on all. But, it is a good fallback.
diff --git a/impeller/renderer/backend/vulkan/swapchain/khr/khr_surface_vk.cc b/impeller/renderer/backend/vulkan/swapchain/khr/khr_surface_vk.cc
new file mode 100644
index 0000000000000000000000000000000000000000..2fa35f63f37f803dd451b1a56da1e0ed14cff1c7
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/swapchain/khr/khr_surface_vk.cc
@@ -0,0 +1,104 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/backend/vulkan/swapchain/khr/khr_surface_vk.h"
+
+#include "impeller/core/formats.h"
+#include "impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_image_vk.h"
+#include "impeller/renderer/backend/vulkan/texture_vk.h"
+#include "impeller/renderer/surface.h"
+
+namespace impeller {
+
+std::unique_ptr<KHRSurfaceVK> KHRSurfaceVK::WrapSwapchainImage(
+    const std::shared_ptr<Context>& context,
+    std::shared_ptr<KHRSwapchainImageVK>& swapchain_image,
+    SwapCallback swap_callback,
+    bool enable_msaa) {
+  if (!context || !swapchain_image || !swap_callback) {
+    return nullptr;
+  }
+
+  std::shared_ptr<Texture> msaa_tex;
+  if (enable_msaa) {
+    TextureDescriptor msaa_tex_desc;
+    msaa_tex_desc.storage_mode = StorageMode::kDeviceTransient;
+    msaa_tex_desc.type = TextureType::kTexture2DMultisample;
+    msaa_tex_desc.sample_count = SampleCount::kCount4;
+    msaa_tex_desc.format = swapchain_image->GetPixelFormat();
+    msaa_tex_desc.size = swapchain_image->GetSize();
+    msaa_tex_desc.usage = TextureUsage::kRenderTarget;
+
+    if (!swapchain_image->GetMSAATexture()) {
+      msaa_tex = context->GetResourceAllocator()->CreateTexture(msaa_tex_desc);
+      msaa_tex->SetLabel("ImpellerOnscreenColorMSAA");
+      if (!msaa_tex) {
+        VALIDATION_LOG << "Could not allocate MSAA color texture.";
+        return nullptr;
+      }
+    } else {
+      msaa_tex = swapchain_image->GetMSAATexture();
+    }
+  }
+
+  TextureDescriptor resolve_tex_desc;
+  resolve_tex_desc.type = TextureType::kTexture2D;
+  resolve_tex_desc.format = swapchain_image->GetPixelFormat();
+  resolve_tex_desc.size = swapchain_image->GetSize();
+  resolve_tex_desc.usage = TextureUsage::kRenderTarget;
+  resolve_tex_desc.sample_count = SampleCount::kCount1;
+  resolve_tex_desc.storage_mode = StorageMode::kDevicePrivate;
+
+  std::shared_ptr<Texture> resolve_tex =
+      std::make_shared<TextureVK>(context,         //
+                                  swapchain_image  //
+      );
+
+  if (!resolve_tex) {
+    VALIDATION_LOG << "Could not wrap resolve texture.";
+    return nullptr;
+  }
+  resolve_tex->SetLabel("ImpellerOnscreenResolve");
+
+  ColorAttachment color0;
+  color0.clear_color = Color::DarkSlateGray();
+  color0.load_action = LoadAction::kClear;
+  if (enable_msaa) {
+    color0.texture = msaa_tex;
+    color0.store_action = StoreAction::kMultisampleResolve;
+    color0.resolve_texture = resolve_tex;
+  } else {
+    color0.texture = resolve_tex;
+    color0.store_action = StoreAction::kStore;
+  }
+
+  RenderTarget render_target_desc;
+  render_target_desc.SetColorAttachment(color0, 0u);
+  render_target_desc.SetupDepthStencilAttachments(
+      /*context=*/*context,                            //
+      /*allocator=*/*context->GetResourceAllocator(),  //
+      /*size=*/swapchain_image->GetSize(),             //
+      /*msaa=*/enable_msaa,                            //
+      /*label=*/"Onscreen",                            //
+      /*stencil_attachment_config=*/
+      RenderTarget::kDefaultStencilAttachmentConfig,                       //
+      /*depth_stencil_texture=*/swapchain_image->GetDepthStencilTexture()  //
+  );
+
+  // The constructor is private. So make_unique may not be used.
+  return std::unique_ptr<KHRSurfaceVK>(
+      new KHRSurfaceVK(render_target_desc, std::move(swap_callback)));
+}
+
+KHRSurfaceVK::KHRSurfaceVK(const RenderTarget& target,
+                           SwapCallback swap_callback)
+    : Surface(target), swap_callback_(std::move(swap_callback)) {}
+
+KHRSurfaceVK::~KHRSurfaceVK() = default;
+
+bool KHRSurfaceVK::Present() const {
+  return swap_callback_ ? swap_callback_() : false;
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/surface_vk.h b/impeller/renderer/backend/vulkan/swapchain/khr/khr_surface_vk.h
similarity index 31%
rename from impeller/renderer/backend/vulkan/surface_vk.h
rename to impeller/renderer/backend/vulkan/swapchain/khr/khr_surface_vk.h
index 77d6367e3a6476dfb0aa320ff49674257e0bd454..e504c537f4d47a8655338233ac39a8a912882f2a 100644
--- a/impeller/renderer/backend/vulkan/surface_vk.h
+++ b/impeller/renderer/backend/vulkan/swapchain/khr/khr_surface_vk.h
@@ -2,42 +2,48 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_SWAPCHAIN_KHR_KHR_SURFACE_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_SWAPCHAIN_KHR_KHR_SURFACE_VK_H_
 
 #include <memory>
 
-#include "flutter/fml/macros.h"
 #include "impeller/renderer/backend/vulkan/context_vk.h"
-#include "impeller/renderer/backend/vulkan/swapchain_vk.h"
+#include "impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_image_vk.h"
 #include "impeller/renderer/surface.h"
 
 namespace impeller {
 
-class SurfaceVK final : public Surface {
+class KHRSurfaceVK final : public Surface {
  public:
   using SwapCallback = std::function<bool(void)>;
 
-  static std::unique_ptr<SurfaceVK> WrapSwapchainImage(
-      uint32_t frame_num,
-      SwapchainImageVK* swapchain_image,
-      ContextVK* context,
-      SwapCallback swap_callback);
-
-  SurfaceVK(const RenderTarget& target,
-            SwapchainImageVK* swapchain_image,
-            SwapCallback swap_callback);
+  /// @brief Wrap the swapchain image in a Surface, which provides the
+  ///        additional configuration required for usage as on onscreen render
+  ///        target by Impeller.
+  ///
+  ///        This creates the associated MSAA and depth+stencil texture.
+  static std::unique_ptr<KHRSurfaceVK> WrapSwapchainImage(
+      const std::shared_ptr<Context>& context,
+      std::shared_ptr<KHRSwapchainImageVK>& swapchain_image,
+      SwapCallback swap_callback,
+      bool enable_msaa = true);
 
   // |Surface|
-  ~SurfaceVK() override;
+  ~KHRSurfaceVK() override;
 
  private:
-  const SwapchainImageVK* swapchain_image_;
   SwapCallback swap_callback_;
 
+  KHRSurfaceVK(const RenderTarget& target, SwapCallback swap_callback);
+
   // |Surface|
   bool Present() const override;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(SurfaceVK);
+  KHRSurfaceVK(const KHRSurfaceVK&) = delete;
+
+  KHRSurfaceVK& operator=(const KHRSurfaceVK&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_SWAPCHAIN_KHR_KHR_SURFACE_VK_H_
diff --git a/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_image_vk.cc b/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_image_vk.cc
new file mode 100644
index 0000000000000000000000000000000000000000..d3401161462d32780fc086cf695e2decaceee648
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_image_vk.cc
@@ -0,0 +1,78 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_image_vk.h"
+
+namespace impeller {
+
+KHRSwapchainImageVK::KHRSwapchainImageVK(TextureDescriptor desc,
+                                         const vk::Device& device,
+                                         vk::Image image)
+    : TextureSourceVK(desc), image_(image) {
+  vk::ImageViewCreateInfo view_info;
+  view_info.image = image_;
+  view_info.viewType = vk::ImageViewType::e2D;
+  view_info.format = ToVKImageFormat(desc.format);
+  view_info.subresourceRange.aspectMask = vk::ImageAspectFlagBits::eColor;
+  view_info.subresourceRange.baseMipLevel = 0u;
+  view_info.subresourceRange.baseArrayLayer = 0u;
+  view_info.subresourceRange.levelCount = desc.mip_count;
+  view_info.subresourceRange.layerCount = ToArrayLayerCount(desc.type);
+
+  auto [view_result, view] = device.createImageViewUnique(view_info);
+  if (view_result != vk::Result::eSuccess) {
+    return;
+  }
+
+  image_view_ = std::move(view);
+  is_valid_ = true;
+}
+
+KHRSwapchainImageVK::~KHRSwapchainImageVK() = default;
+
+bool KHRSwapchainImageVK::IsValid() const {
+  return is_valid_;
+}
+
+std::shared_ptr<Texture> KHRSwapchainImageVK::GetMSAATexture() const {
+  return msaa_texture_;
+}
+
+std::shared_ptr<Texture> KHRSwapchainImageVK::GetDepthStencilTexture() const {
+  return depth_stencil_texture_;
+}
+
+void KHRSwapchainImageVK::SetMSAATexture(std::shared_ptr<Texture> texture) {
+  msaa_texture_ = std::move(texture);
+}
+
+void KHRSwapchainImageVK::SetDepthStencilTexture(
+    std::shared_ptr<Texture> texture) {
+  depth_stencil_texture_ = std::move(texture);
+}
+
+PixelFormat KHRSwapchainImageVK::GetPixelFormat() const {
+  return desc_.format;
+}
+
+ISize KHRSwapchainImageVK::GetSize() const {
+  return desc_.size;
+}
+
+// |TextureSourceVK|
+vk::Image KHRSwapchainImageVK::GetImage() const {
+  return image_;
+}
+
+// |TextureSourceVK|
+vk::ImageView KHRSwapchainImageVK::GetImageView() const {
+  return image_view_.get();
+}
+
+// |TextureSourceVK|
+vk::ImageView KHRSwapchainImageVK::GetRenderTargetView() const {
+  return image_view_.get();
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_image_vk.h b/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_image_vk.h
new file mode 100644
index 0000000000000000000000000000000000000000..a4810a051ed5b76ac453e81a7bbefd44873300f3
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_image_vk.h
@@ -0,0 +1,63 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_SWAPCHAIN_KHR_KHR_SWAPCHAIN_IMAGE_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_SWAPCHAIN_KHR_KHR_SWAPCHAIN_IMAGE_VK_H_
+
+#include "impeller/geometry/size.h"
+#include "impeller/renderer/backend/vulkan/formats_vk.h"
+#include "impeller/renderer/backend/vulkan/texture_source_vk.h"
+#include "impeller/renderer/backend/vulkan/vk.h"
+#include "vulkan/vulkan_handles.hpp"
+
+namespace impeller {
+
+class KHRSwapchainImageVK final : public TextureSourceVK {
+ public:
+  KHRSwapchainImageVK(TextureDescriptor desc,
+                      const vk::Device& device,
+                      vk::Image image);
+
+  // |TextureSourceVK|
+  ~KHRSwapchainImageVK() override;
+
+  bool IsValid() const;
+
+  PixelFormat GetPixelFormat() const;
+
+  ISize GetSize() const;
+
+  // |TextureSourceVK|
+  vk::Image GetImage() const override;
+
+  std::shared_ptr<Texture> GetMSAATexture() const;
+
+  std::shared_ptr<Texture> GetDepthStencilTexture() const;
+
+  // |TextureSourceVK|
+  vk::ImageView GetImageView() const override;
+
+  vk::ImageView GetRenderTargetView() const override;
+
+  void SetMSAATexture(std::shared_ptr<Texture> texture);
+
+  void SetDepthStencilTexture(std::shared_ptr<Texture> texture);
+
+  bool IsSwapchainImage() const override { return true; }
+
+ private:
+  vk::Image image_ = VK_NULL_HANDLE;
+  vk::UniqueImageView image_view_ = {};
+  std::shared_ptr<Texture> msaa_texture_;
+  std::shared_ptr<Texture> depth_stencil_texture_;
+  bool is_valid_ = false;
+
+  KHRSwapchainImageVK(const KHRSwapchainImageVK&) = delete;
+
+  KHRSwapchainImageVK& operator=(const KHRSwapchainImageVK&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_SWAPCHAIN_KHR_KHR_SWAPCHAIN_IMAGE_VK_H_
diff --git a/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_impl_vk.cc b/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_impl_vk.cc
new file mode 100644
index 0000000000000000000000000000000000000000..375c53603835939c7387ecb9cca132ecc25be182
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_impl_vk.cc
@@ -0,0 +1,517 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_impl_vk.h"
+
+#include "fml/synchronization/semaphore.h"
+#include "impeller/base/validation.h"
+#include "impeller/core/formats.h"
+#include "impeller/renderer/backend/vulkan/command_buffer_vk.h"
+#include "impeller/renderer/backend/vulkan/command_encoder_vk.h"
+#include "impeller/renderer/backend/vulkan/context_vk.h"
+#include "impeller/renderer/backend/vulkan/formats_vk.h"
+#include "impeller/renderer/backend/vulkan/gpu_tracer_vk.h"
+#include "impeller/renderer/backend/vulkan/swapchain/khr/khr_surface_vk.h"
+#include "impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_image_vk.h"
+#include "impeller/renderer/context.h"
+#include "vulkan/vulkan_structs.hpp"
+
+namespace impeller {
+
+static constexpr size_t kMaxFramesInFlight = 3u;
+
+// Number of frames to poll for orientation changes. For example `1u` means
+// that the orientation will be polled every frame, while `2u` means that the
+// orientation will be polled every other frame.
+static constexpr size_t kPollFramesForOrientation = 1u;
+
+struct KHRFrameSynchronizerVK {
+  vk::UniqueFence acquire;
+  vk::UniqueSemaphore render_ready;
+  vk::UniqueSemaphore present_ready;
+  std::shared_ptr<CommandBuffer> final_cmd_buffer;
+  bool is_valid = false;
+
+  explicit KHRFrameSynchronizerVK(const vk::Device& device) {
+    auto acquire_res = device.createFenceUnique(
+        vk::FenceCreateInfo{vk::FenceCreateFlagBits::eSignaled});
+    auto render_res = device.createSemaphoreUnique({});
+    auto present_res = device.createSemaphoreUnique({});
+    if (acquire_res.result != vk::Result::eSuccess ||
+        render_res.result != vk::Result::eSuccess ||
+        present_res.result != vk::Result::eSuccess) {
+      VALIDATION_LOG << "Could not create synchronizer.";
+      return;
+    }
+    acquire = std::move(acquire_res.value);
+    render_ready = std::move(render_res.value);
+    present_ready = std::move(present_res.value);
+    is_valid = true;
+  }
+
+  ~KHRFrameSynchronizerVK() = default;
+
+  bool WaitForFence(const vk::Device& device) {
+    if (auto result = device.waitForFences(
+            *acquire,                             // fence
+            true,                                 // wait all
+            std::numeric_limits<uint64_t>::max()  // timeout (ns)
+        );
+        result != vk::Result::eSuccess) {
+      VALIDATION_LOG << "Fence wait failed: " << vk::to_string(result);
+      return false;
+    }
+    if (auto result = device.resetFences(*acquire);
+        result != vk::Result::eSuccess) {
+      VALIDATION_LOG << "Could not reset fence: " << vk::to_string(result);
+      return false;
+    }
+    return true;
+  }
+};
+
+static bool ContainsFormat(const std::vector<vk::SurfaceFormatKHR>& formats,
+                           vk::SurfaceFormatKHR format) {
+  return std::find(formats.begin(), formats.end(), format) != formats.end();
+}
+
+static std::optional<vk::SurfaceFormatKHR> ChooseSurfaceFormat(
+    const std::vector<vk::SurfaceFormatKHR>& formats,
+    PixelFormat preference) {
+  const auto colorspace = vk::ColorSpaceKHR::eSrgbNonlinear;
+  const auto vk_preference =
+      vk::SurfaceFormatKHR{ToVKImageFormat(preference), colorspace};
+  if (ContainsFormat(formats, vk_preference)) {
+    return vk_preference;
+  }
+
+  std::vector<vk::SurfaceFormatKHR> options = {
+      {vk::Format::eB8G8R8A8Unorm, colorspace},
+      {vk::Format::eR8G8B8A8Unorm, colorspace}};
+  for (const auto& format : options) {
+    if (ContainsFormat(formats, format)) {
+      return format;
+    }
+  }
+
+  return std::nullopt;
+}
+
+static std::optional<vk::CompositeAlphaFlagBitsKHR> ChooseAlphaCompositionMode(
+    vk::CompositeAlphaFlagsKHR flags) {
+  if (flags & vk::CompositeAlphaFlagBitsKHR::eInherit) {
+    return vk::CompositeAlphaFlagBitsKHR::eInherit;
+  }
+  if (flags & vk::CompositeAlphaFlagBitsKHR::ePreMultiplied) {
+    return vk::CompositeAlphaFlagBitsKHR::ePreMultiplied;
+  }
+  if (flags & vk::CompositeAlphaFlagBitsKHR::ePostMultiplied) {
+    return vk::CompositeAlphaFlagBitsKHR::ePostMultiplied;
+  }
+  if (flags & vk::CompositeAlphaFlagBitsKHR::eOpaque) {
+    return vk::CompositeAlphaFlagBitsKHR::eOpaque;
+  }
+
+  return std::nullopt;
+}
+
+std::shared_ptr<KHRSwapchainImplVK> KHRSwapchainImplVK::Create(
+    const std::shared_ptr<Context>& context,
+    vk::UniqueSurfaceKHR surface,
+    const ISize& size,
+    bool enable_msaa,
+    vk::SwapchainKHR old_swapchain) {
+  return std::shared_ptr<KHRSwapchainImplVK>(new KHRSwapchainImplVK(
+      context, std::move(surface), size, enable_msaa, old_swapchain));
+}
+
+KHRSwapchainImplVK::KHRSwapchainImplVK(const std::shared_ptr<Context>& context,
+                                       vk::UniqueSurfaceKHR surface,
+                                       const ISize& size,
+                                       bool enable_msaa,
+                                       vk::SwapchainKHR old_swapchain) {
+  if (!context) {
+    VALIDATION_LOG << "Cannot create a swapchain without a context.";
+    return;
+  }
+
+  auto& vk_context = ContextVK::Cast(*context);
+
+  const auto [caps_result, surface_caps] =
+      vk_context.GetPhysicalDevice().getSurfaceCapabilitiesKHR(*surface);
+  if (caps_result != vk::Result::eSuccess) {
+    VALIDATION_LOG << "Could not get surface capabilities: "
+                   << vk::to_string(caps_result);
+    return;
+  }
+
+  auto [formats_result, formats] =
+      vk_context.GetPhysicalDevice().getSurfaceFormatsKHR(*surface);
+  if (formats_result != vk::Result::eSuccess) {
+    VALIDATION_LOG << "Could not get surface formats: "
+                   << vk::to_string(formats_result);
+    return;
+  }
+
+  const auto format = ChooseSurfaceFormat(
+      formats, vk_context.GetCapabilities()->GetDefaultColorFormat());
+  if (!format.has_value()) {
+    VALIDATION_LOG << "Swapchain has no supported formats.";
+    return;
+  }
+  vk_context.SetOffscreenFormat(ToPixelFormat(format.value().format));
+
+  const auto composite =
+      ChooseAlphaCompositionMode(surface_caps.supportedCompositeAlpha);
+  if (!composite.has_value()) {
+    VALIDATION_LOG << "No composition mode supported.";
+    return;
+  }
+
+  vk::SwapchainCreateInfoKHR swapchain_info;
+  swapchain_info.surface = *surface;
+  swapchain_info.imageFormat = format.value().format;
+  swapchain_info.imageColorSpace = format.value().colorSpace;
+  swapchain_info.presentMode = vk::PresentModeKHR::eFifo;
+  swapchain_info.imageExtent = vk::Extent2D{
+      std::clamp(static_cast<uint32_t>(size.width),
+                 surface_caps.minImageExtent.width,
+                 surface_caps.maxImageExtent.width),
+      std::clamp(static_cast<uint32_t>(size.height),
+                 surface_caps.minImageExtent.height,
+                 surface_caps.maxImageExtent.height),
+  };
+  swapchain_info.minImageCount =
+      std::clamp(surface_caps.minImageCount + 1u,  // preferred image count
+                 surface_caps.minImageCount,       // min count cannot be zero
+                 surface_caps.maxImageCount == 0u
+                     ? surface_caps.minImageCount + 1u
+                     : surface_caps.maxImageCount  // max zero means no limit
+      );
+  swapchain_info.imageArrayLayers = 1u;
+  // Swapchain images are primarily used as color attachments (via resolve),
+  // blit targets, or input attachments.
+  swapchain_info.imageUsage = vk::ImageUsageFlagBits::eColorAttachment |
+                              vk::ImageUsageFlagBits::eTransferDst |
+                              vk::ImageUsageFlagBits::eInputAttachment;
+  swapchain_info.preTransform = vk::SurfaceTransformFlagBitsKHR::eIdentity;
+  swapchain_info.compositeAlpha = composite.value();
+  // If we set the clipped value to true, Vulkan expects we will never read back
+  // from the buffer. This is analogous to [CAMetalLayer framebufferOnly] in
+  // Metal.
+  swapchain_info.clipped = true;
+  // Setting queue family indices is irrelevant since the present mode is
+  // exclusive.
+  swapchain_info.imageSharingMode = vk::SharingMode::eExclusive;
+  swapchain_info.oldSwapchain = old_swapchain;
+
+  auto [swapchain_result, swapchain] =
+      vk_context.GetDevice().createSwapchainKHRUnique(swapchain_info);
+  if (swapchain_result != vk::Result::eSuccess) {
+    VALIDATION_LOG << "Could not create swapchain: "
+                   << vk::to_string(swapchain_result);
+    return;
+  }
+
+  auto [images_result, images] =
+      vk_context.GetDevice().getSwapchainImagesKHR(*swapchain);
+  if (images_result != vk::Result::eSuccess) {
+    VALIDATION_LOG << "Could not get swapchain images.";
+    return;
+  }
+
+  TextureDescriptor texture_desc;
+  texture_desc.usage = TextureUsage::kRenderTarget;
+  texture_desc.storage_mode = StorageMode::kDevicePrivate;
+  texture_desc.format = ToPixelFormat(swapchain_info.imageFormat);
+  texture_desc.size = ISize::MakeWH(swapchain_info.imageExtent.width,
+                                    swapchain_info.imageExtent.height);
+
+  // Allocate a single onscreen MSAA texture and Depth+Stencil Texture to
+  // be shared by all swapchain images.
+  TextureDescriptor msaa_desc;
+  msaa_desc.storage_mode = StorageMode::kDeviceTransient;
+  msaa_desc.type = TextureType::kTexture2DMultisample;
+  msaa_desc.sample_count = SampleCount::kCount4;
+  msaa_desc.format = texture_desc.format;
+  msaa_desc.size = texture_desc.size;
+  msaa_desc.usage = TextureUsage::kRenderTarget;
+
+  // The depth+stencil configuration matches the configuration used by
+  // RenderTarget::SetupDepthStencilAttachments and matching the swapchain
+  // image dimensions and sample count.
+  TextureDescriptor depth_stencil_desc;
+  depth_stencil_desc.storage_mode = StorageMode::kDeviceTransient;
+  if (enable_msaa) {
+    depth_stencil_desc.type = TextureType::kTexture2DMultisample;
+    depth_stencil_desc.sample_count = SampleCount::kCount4;
+  } else {
+    depth_stencil_desc.type = TextureType::kTexture2D;
+    depth_stencil_desc.sample_count = SampleCount::kCount1;
+  }
+  depth_stencil_desc.format =
+      context->GetCapabilities()->GetDefaultDepthStencilFormat();
+  depth_stencil_desc.size = texture_desc.size;
+  depth_stencil_desc.usage = TextureUsage::kRenderTarget;
+
+  std::shared_ptr<Texture> msaa_texture;
+  if (enable_msaa) {
+    msaa_texture = context->GetResourceAllocator()->CreateTexture(msaa_desc);
+  }
+  std::shared_ptr<Texture> depth_stencil_texture =
+      context->GetResourceAllocator()->CreateTexture(depth_stencil_desc);
+
+  std::vector<std::shared_ptr<KHRSwapchainImageVK>> swapchain_images;
+  for (const auto& image : images) {
+    auto swapchain_image = std::make_shared<KHRSwapchainImageVK>(
+        texture_desc,            // texture descriptor
+        vk_context.GetDevice(),  // device
+        image                    // image
+    );
+    if (!swapchain_image->IsValid()) {
+      VALIDATION_LOG << "Could not create swapchain image.";
+      return;
+    }
+    swapchain_image->SetMSAATexture(msaa_texture);
+    swapchain_image->SetDepthStencilTexture(depth_stencil_texture);
+
+    ContextVK::SetDebugName(
+        vk_context.GetDevice(), swapchain_image->GetImage(),
+        "SwapchainImage" + std::to_string(swapchain_images.size()));
+    ContextVK::SetDebugName(
+        vk_context.GetDevice(), swapchain_image->GetImageView(),
+        "SwapchainImageView" + std::to_string(swapchain_images.size()));
+
+    swapchain_images.emplace_back(swapchain_image);
+  }
+
+  std::vector<std::unique_ptr<KHRFrameSynchronizerVK>> synchronizers;
+  for (size_t i = 0u; i < kMaxFramesInFlight; i++) {
+    auto sync =
+        std::make_unique<KHRFrameSynchronizerVK>(vk_context.GetDevice());
+    if (!sync->is_valid) {
+      VALIDATION_LOG << "Could not create frame synchronizers.";
+      return;
+    }
+    synchronizers.emplace_back(std::move(sync));
+  }
+  FML_DCHECK(!synchronizers.empty());
+
+  context_ = context;
+  surface_ = std::move(surface);
+  surface_format_ = swapchain_info.imageFormat;
+  swapchain_ = std::move(swapchain);
+  images_ = std::move(swapchain_images);
+  synchronizers_ = std::move(synchronizers);
+  current_frame_ = synchronizers_.size() - 1u;
+  size_ = size;
+  enable_msaa_ = enable_msaa;
+  is_valid_ = true;
+}
+
+KHRSwapchainImplVK::~KHRSwapchainImplVK() {
+  DestroySwapchain();
+}
+
+const ISize& KHRSwapchainImplVK::GetSize() const {
+  return size_;
+}
+
+bool KHRSwapchainImplVK::IsValid() const {
+  return is_valid_;
+}
+
+void KHRSwapchainImplVK::WaitIdle() const {
+  if (auto context = context_.lock()) {
+    [[maybe_unused]] auto result =
+        ContextVK::Cast(*context).GetDevice().waitIdle();
+  }
+}
+
+std::pair<vk::UniqueSurfaceKHR, vk::UniqueSwapchainKHR>
+KHRSwapchainImplVK::DestroySwapchain() {
+  WaitIdle();
+  is_valid_ = false;
+  synchronizers_.clear();
+  images_.clear();
+  context_.reset();
+  return {std::move(surface_), std::move(swapchain_)};
+}
+
+vk::Format KHRSwapchainImplVK::GetSurfaceFormat() const {
+  return surface_format_;
+}
+
+std::shared_ptr<Context> KHRSwapchainImplVK::GetContext() const {
+  return context_.lock();
+}
+
+KHRSwapchainImplVK::AcquireResult KHRSwapchainImplVK::AcquireNextDrawable() {
+  auto context_strong = context_.lock();
+  if (!context_strong) {
+    return KHRSwapchainImplVK::AcquireResult{};
+  }
+
+  const auto& context = ContextVK::Cast(*context_strong);
+
+  current_frame_ = (current_frame_ + 1u) % synchronizers_.size();
+
+  const auto& sync = synchronizers_[current_frame_];
+
+  //----------------------------------------------------------------------------
+  /// Wait on the host for the synchronizer fence.
+  ///
+  if (!sync->WaitForFence(context.GetDevice())) {
+    VALIDATION_LOG << "Could not wait for fence.";
+    return KHRSwapchainImplVK::AcquireResult{};
+  }
+
+  //----------------------------------------------------------------------------
+  /// Get the next image index.
+  ///
+  auto [acq_result, index] = context.GetDevice().acquireNextImageKHR(
+      *swapchain_,          // swapchain
+      1'000'000'000,        // timeout (ns) 1000ms
+      *sync->render_ready,  // signal semaphore
+      nullptr               // fence
+  );
+
+  switch (acq_result) {
+    case vk::Result::eSuccess:
+      // Keep going.
+      break;
+    case vk::Result::eSuboptimalKHR:
+    case vk::Result::eErrorOutOfDateKHR:
+      // A recoverable error. Just say we are out of date.
+      return AcquireResult{true /* out of date */};
+      break;
+    default:
+      // An unrecoverable error.
+      VALIDATION_LOG << "Could not acquire next swapchain image: "
+                     << vk::to_string(acq_result);
+      return AcquireResult{false /* out of date */};
+  }
+
+  if (index >= images_.size()) {
+    VALIDATION_LOG << "Swapchain returned an invalid image index.";
+    return KHRSwapchainImplVK::AcquireResult{};
+  }
+
+  /// Record all subsequent cmd buffers as part of the current frame.
+  context.GetGPUTracer()->MarkFrameStart();
+
+  auto image = images_[index % images_.size()];
+  uint32_t image_index = index;
+  return AcquireResult{KHRSurfaceVK::WrapSwapchainImage(
+      context_strong,  // context
+      image,           // swapchain image
+      [weak_swapchain = weak_from_this(), image, image_index]() -> bool {
+        auto swapchain = weak_swapchain.lock();
+        if (!swapchain) {
+          return false;
+        }
+        return swapchain->Present(image, image_index);
+      },            // swap callback
+      enable_msaa_  //
+      )};
+}
+
+bool KHRSwapchainImplVK::Present(
+    const std::shared_ptr<KHRSwapchainImageVK>& image,
+    uint32_t index) {
+  auto context_strong = context_.lock();
+  if (!context_strong) {
+    return false;
+  }
+
+  const auto& context = ContextVK::Cast(*context_strong);
+  const auto& sync = synchronizers_[current_frame_];
+  context.GetGPUTracer()->MarkFrameEnd();
+
+  //----------------------------------------------------------------------------
+  /// Transition the image to color-attachment-optimal.
+  ///
+  sync->final_cmd_buffer = context.CreateCommandBuffer();
+  if (!sync->final_cmd_buffer) {
+    return false;
+  }
+
+  auto vk_final_cmd_buffer = CommandBufferVK::Cast(*sync->final_cmd_buffer)
+                                 .GetEncoder()
+                                 ->GetCommandBuffer();
+  {
+    BarrierVK barrier;
+    barrier.new_layout = vk::ImageLayout::ePresentSrcKHR;
+    barrier.cmd_buffer = vk_final_cmd_buffer;
+    barrier.src_access = vk::AccessFlagBits::eColorAttachmentWrite;
+    barrier.src_stage = vk::PipelineStageFlagBits::eColorAttachmentOutput;
+    barrier.dst_access = {};
+    barrier.dst_stage = vk::PipelineStageFlagBits::eBottomOfPipe;
+
+    if (!image->SetLayout(barrier).ok()) {
+      return false;
+    }
+
+    if (vk_final_cmd_buffer.end() != vk::Result::eSuccess) {
+      return false;
+    }
+  }
+
+  //----------------------------------------------------------------------------
+  /// Signal that the presentation semaphore is ready.
+  ///
+  {
+    vk::SubmitInfo submit_info;
+    vk::PipelineStageFlags wait_stage =
+        vk::PipelineStageFlagBits::eColorAttachmentOutput;
+    submit_info.setWaitDstStageMask(wait_stage);
+    submit_info.setWaitSemaphores(*sync->render_ready);
+    submit_info.setSignalSemaphores(*sync->present_ready);
+    submit_info.setCommandBuffers(vk_final_cmd_buffer);
+    auto result =
+        context.GetGraphicsQueue()->Submit(submit_info, *sync->acquire);
+    if (result != vk::Result::eSuccess) {
+      VALIDATION_LOG << "Could not wait on render semaphore: "
+                     << vk::to_string(result);
+      return false;
+    }
+  }
+
+  //----------------------------------------------------------------------------
+  /// Present the image.
+  ///
+  uint32_t indices[] = {static_cast<uint32_t>(index)};
+
+  vk::PresentInfoKHR present_info;
+  present_info.setSwapchains(*swapchain_);
+  present_info.setImageIndices(indices);
+  present_info.setWaitSemaphores(*sync->present_ready);
+
+  auto result = context.GetGraphicsQueue()->Present(present_info);
+
+  switch (result) {
+    case vk::Result::eErrorOutOfDateKHR:
+      // Caller will recreate the impl on acquisition, not submission.
+      [[fallthrough]];
+    case vk::Result::eErrorSurfaceLostKHR:
+      // Vulkan guarantees that the set of queue operations will still
+      // complete successfully.
+      [[fallthrough]];
+    case vk::Result::eSuboptimalKHR:
+      // Even though we're handling rotation changes via polling, we
+      // still need to handle the case where the swapchain signals that
+      // it's suboptimal (i.e. every frame when we are rotated given we
+      // aren't doing Vulkan pre-rotation).
+      [[fallthrough]];
+    case vk::Result::eSuccess:
+      break;
+    default:
+      VALIDATION_LOG << "Could not present queue: " << vk::to_string(result);
+      break;
+  }
+
+  return true;
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_impl_vk.h b/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_impl_vk.h
new file mode 100644
index 0000000000000000000000000000000000000000..84d4f35847e94bb9f642c557627fdb46548c5f96
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_impl_vk.h
@@ -0,0 +1,96 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_SWAPCHAIN_KHR_KHR_SWAPCHAIN_IMPL_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_SWAPCHAIN_KHR_KHR_SWAPCHAIN_IMPL_VK_H_
+
+#include <cstdint>
+#include <memory>
+#include <variant>
+
+#include "impeller/geometry/size.h"
+#include "impeller/renderer/backend/vulkan/vk.h"
+#include "vulkan/vulkan_enums.hpp"
+
+namespace impeller {
+
+class Context;
+class KHRSwapchainImageVK;
+class Surface;
+struct KHRFrameSynchronizerVK;
+
+//------------------------------------------------------------------------------
+/// @brief      An instance of a swapchain that does NOT adapt to going out of
+///             date with the underlying surface. Errors will be indicated when
+///             the next drawable is acquired from this implementation of the
+///             swapchain. If the error is due the swapchain going out of date,
+///             the caller must recreate another instance by optionally
+///             stealing this implementations guts.
+///
+class KHRSwapchainImplVK final
+    : public std::enable_shared_from_this<KHRSwapchainImplVK> {
+ public:
+  static std::shared_ptr<KHRSwapchainImplVK> Create(
+      const std::shared_ptr<Context>& context,
+      vk::UniqueSurfaceKHR surface,
+      const ISize& size,
+      bool enable_msaa = true,
+      vk::SwapchainKHR old_swapchain = VK_NULL_HANDLE);
+
+  ~KHRSwapchainImplVK();
+
+  bool IsValid() const;
+
+  struct AcquireResult {
+    std::unique_ptr<Surface> surface;
+    bool out_of_date = false;
+
+    explicit AcquireResult(bool p_out_of_date = false)
+        : out_of_date(p_out_of_date) {}
+
+    explicit AcquireResult(std::unique_ptr<Surface> p_surface)
+        : surface(std::move(p_surface)) {}
+  };
+
+  AcquireResult AcquireNextDrawable();
+
+  vk::Format GetSurfaceFormat() const;
+
+  std::shared_ptr<Context> GetContext() const;
+
+  std::pair<vk::UniqueSurfaceKHR, vk::UniqueSwapchainKHR> DestroySwapchain();
+
+  const ISize& GetSize() const;
+
+ private:
+  std::weak_ptr<Context> context_;
+  vk::UniqueSurfaceKHR surface_;
+  vk::Format surface_format_ = vk::Format::eUndefined;
+  vk::UniqueSwapchainKHR swapchain_;
+  std::vector<std::shared_ptr<KHRSwapchainImageVK>> images_;
+  std::vector<std::unique_ptr<KHRFrameSynchronizerVK>> synchronizers_;
+  size_t current_frame_ = 0u;
+  ISize size_;
+  bool enable_msaa_ = true;
+  bool is_valid_ = false;
+
+  KHRSwapchainImplVK(const std::shared_ptr<Context>& context,
+                     vk::UniqueSurfaceKHR surface,
+                     const ISize& size,
+                     bool enable_msaa,
+                     vk::SwapchainKHR old_swapchain);
+
+  bool Present(const std::shared_ptr<KHRSwapchainImageVK>& image,
+               uint32_t index);
+
+  void WaitIdle() const;
+
+  KHRSwapchainImplVK(const KHRSwapchainImplVK&) = delete;
+
+  KHRSwapchainImplVK& operator=(const KHRSwapchainImplVK&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_SWAPCHAIN_KHR_KHR_SWAPCHAIN_IMPL_VK_H_
diff --git a/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_vk.cc b/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_vk.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a126bc698d717af3d4ac47d8d026795cb6129395
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_vk.cc
@@ -0,0 +1,89 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_vk.h"
+
+#include "flutter/fml/trace_event.h"
+#include "impeller/base/validation.h"
+#include "impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_impl_vk.h"
+
+namespace impeller {
+
+std::shared_ptr<KHRSwapchainVK> KHRSwapchainVK::Create(
+    const std::shared_ptr<Context>& context,
+    vk::UniqueSurfaceKHR surface,
+    const ISize& size,
+    bool enable_msaa) {
+  auto impl = KHRSwapchainImplVK::Create(context, std::move(surface), size,
+                                         enable_msaa);
+  if (!impl || !impl->IsValid()) {
+    VALIDATION_LOG << "Failed to create SwapchainVK implementation.";
+    return nullptr;
+  }
+  return std::shared_ptr<KHRSwapchainVK>(
+      new KHRSwapchainVK(std::move(impl), size, enable_msaa));
+}
+
+KHRSwapchainVK::KHRSwapchainVK(std::shared_ptr<KHRSwapchainImplVK> impl,
+                               const ISize& size,
+                               bool enable_msaa)
+    : impl_(std::move(impl)), size_(size), enable_msaa_(enable_msaa) {}
+
+KHRSwapchainVK::~KHRSwapchainVK() = default;
+
+bool KHRSwapchainVK::IsValid() const {
+  return impl_ ? impl_->IsValid() : false;
+}
+
+void KHRSwapchainVK::UpdateSurfaceSize(const ISize& size) {
+  // Update the size of the swapchain. On the next acquired drawable,
+  // the sizes may no longer match, forcing the swapchain to be recreated.
+  size_ = size;
+}
+
+std::unique_ptr<Surface> KHRSwapchainVK::AcquireNextDrawable() {
+  if (!IsValid()) {
+    return nullptr;
+  }
+
+  TRACE_EVENT0("impeller", __FUNCTION__);
+
+  auto result = impl_->AcquireNextDrawable();
+  if (!result.out_of_date && size_ == impl_->GetSize()) {
+    return std::move(result.surface);
+  }
+
+  TRACE_EVENT0("impeller", "RecreateSwapchain");
+
+  // This swapchain implementation indicates that it is out of date. Tear it
+  // down and make a new one.
+  auto context = impl_->GetContext();
+  auto [surface, old_swapchain] = impl_->DestroySwapchain();
+
+  auto new_impl = KHRSwapchainImplVK::Create(context,             //
+                                             std::move(surface),  //
+                                             size_,               //
+                                             enable_msaa_,        //
+                                             *old_swapchain       //
+  );
+  if (!new_impl || !new_impl->IsValid()) {
+    VALIDATION_LOG << "Could not update swapchain.";
+    // The old swapchain is dead because we took its surface. This is
+    // unrecoverable.
+    impl_.reset();
+    return nullptr;
+  }
+  impl_ = std::move(new_impl);
+
+  //----------------------------------------------------------------------------
+  /// We managed to recreate the swapchain in the new configuration. Try again.
+  ///
+  return AcquireNextDrawable();
+}
+
+vk::Format KHRSwapchainVK::GetSurfaceFormat() const {
+  return IsValid() ? impl_->GetSurfaceFormat() : vk::Format::eUndefined;
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_vk.h b/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_vk.h
new file mode 100644
index 0000000000000000000000000000000000000000..da90fe628c19e5497e3ee26c410f6f93c5ebc2f6
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_vk.h
@@ -0,0 +1,61 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_SWAPCHAIN_KHR_KHR_SWAPCHAIN_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_SWAPCHAIN_KHR_KHR_SWAPCHAIN_VK_H_
+
+#include <memory>
+
+#include "impeller/geometry/size.h"
+#include "impeller/renderer/backend/vulkan/vk.h"
+#include "impeller/renderer/context.h"
+#include "impeller/renderer/surface.h"
+
+namespace impeller {
+
+class KHRSwapchainImplVK;
+
+//------------------------------------------------------------------------------
+/// @brief      A swapchain that adapts to the underlying surface going out of
+///             date. If the caller cannot acquire the next drawable, it is due
+///             to an unrecoverable error and the swapchain must be recreated
+///             with a new surface.
+///
+class KHRSwapchainVK {
+ public:
+  static std::shared_ptr<KHRSwapchainVK> Create(
+      const std::shared_ptr<Context>& context,
+      vk::UniqueSurfaceKHR surface,
+      const ISize& size,
+      bool enable_msaa = true);
+
+  ~KHRSwapchainVK();
+
+  bool IsValid() const;
+
+  std::unique_ptr<Surface> AcquireNextDrawable();
+
+  vk::Format GetSurfaceFormat() const;
+
+  /// @brief Mark the current swapchain configuration as dirty, forcing it to be
+  ///        recreated on the next frame.
+  void UpdateSurfaceSize(const ISize& size);
+
+ private:
+  std::shared_ptr<KHRSwapchainImplVK> impl_;
+  ISize size_;
+  const bool enable_msaa_;
+
+  KHRSwapchainVK(std::shared_ptr<KHRSwapchainImplVK> impl,
+                 const ISize& size,
+                 bool enable_msaa);
+
+  KHRSwapchainVK(const KHRSwapchainVK&) = delete;
+
+  KHRSwapchainVK& operator=(const KHRSwapchainVK&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_SWAPCHAIN_KHR_KHR_SWAPCHAIN_VK_H_
diff --git a/impeller/renderer/backend/vulkan/swapchain_details_vk.cc b/impeller/renderer/backend/vulkan/swapchain_details_vk.cc
deleted file mode 100644
index 3b1f10cc94ab96bd357ef076167983760110f1c7..0000000000000000000000000000000000000000
--- a/impeller/renderer/backend/vulkan/swapchain_details_vk.cc
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "impeller/renderer/backend/vulkan/swapchain_details_vk.h"
-
-#include "impeller/base/validation.h"
-
-namespace impeller {
-
-std::unique_ptr<SwapchainDetailsVK> SwapchainDetailsVK::Create(
-    vk::PhysicalDevice physical_device,
-    vk::SurfaceKHR surface) {
-  FML_DCHECK(surface) << "surface provided as nullptr";
-
-  auto capabilities_res = physical_device.getSurfaceCapabilitiesKHR(surface);
-  if (capabilities_res.result != vk::Result::eSuccess) {
-    VALIDATION_LOG << "Failed to get surface capabilities: "
-                   << vk::to_string(capabilities_res.result);
-    return nullptr;
-  }
-  vk::SurfaceCapabilitiesKHR capabilities = capabilities_res.value;
-
-  auto surface_formats_res = physical_device.getSurfaceFormatsKHR(surface);
-  if (surface_formats_res.result != vk::Result::eSuccess) {
-    VALIDATION_LOG << "Failed to get surface formats: "
-                   << vk::to_string(surface_formats_res.result);
-    return nullptr;
-  }
-  std::vector<vk::SurfaceFormatKHR> surface_formats = surface_formats_res.value;
-
-  auto surface_present_modes_res =
-      physical_device.getSurfacePresentModesKHR(surface);
-  if (surface_present_modes_res.result != vk::Result::eSuccess) {
-    VALIDATION_LOG << "Failed to get surface present modes: "
-                   << vk::to_string(surface_present_modes_res.result);
-    return nullptr;
-  }
-  std::vector<vk::PresentModeKHR> surface_present_modes =
-      surface_present_modes_res.value;
-
-  const auto composite_alphas = capabilities.supportedCompositeAlpha;
-  vk::CompositeAlphaFlagBitsKHR composite_alpha;
-  if (composite_alphas & vk::CompositeAlphaFlagBitsKHR::eOpaque) {
-    composite_alpha = vk::CompositeAlphaFlagBitsKHR::eOpaque;
-  } else if (composite_alphas & vk::CompositeAlphaFlagBitsKHR::eInherit) {
-    composite_alpha = vk::CompositeAlphaFlagBitsKHR::eInherit;
-  } else {
-    VALIDATION_LOG << "No supported composite alpha found.";
-    return nullptr;
-  }
-
-  return std::make_unique<SwapchainDetailsVK>(
-      capabilities, surface_formats, surface_present_modes, composite_alpha);
-}
-
-vk::SurfaceFormatKHR SwapchainDetailsVK::PickSurfaceFormat() const {
-  for (const auto& format : surface_formats_) {
-    if ((format.format == vk::Format::eR8G8B8A8Unorm ||
-         format.format == vk::Format::eB8G8R8A8Unorm) &&
-        format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear) {
-      return format;
-    }
-  }
-
-  VALIDATION_LOG << "Picking a sub-optimal surface format.";
-  return surface_formats_[0];
-}
-
-vk::PresentModeKHR SwapchainDetailsVK::PickPresentationMode() const {
-  for (const auto& mode : present_modes_) {
-    if (mode == vk::PresentModeKHR::eMailbox) {
-      return mode;
-    }
-  }
-
-  VALIDATION_LOG << "Picking a sub-optimal presentation mode.";
-  // Vulkan spec dictates that FIFO is always available.
-  return vk::PresentModeKHR::eFifo;
-}
-
-vk::CompositeAlphaFlagBitsKHR SwapchainDetailsVK::PickCompositeAlpha() const {
-  return composite_alpha_;
-}
-
-vk::Extent2D SwapchainDetailsVK::PickExtent() const {
-  if (surface_capabilities_.currentExtent.width !=
-      std::numeric_limits<uint32_t>::max()) {
-    return surface_capabilities_.currentExtent;
-  }
-
-  vk::Extent2D actual_extent = {
-      std::max(surface_capabilities_.minImageExtent.width,
-               std::min(surface_capabilities_.maxImageExtent.width,
-                        surface_capabilities_.currentExtent.width)),
-      std::max(surface_capabilities_.minImageExtent.height,
-               std::min(surface_capabilities_.maxImageExtent.height,
-                        surface_capabilities_.currentExtent.height))};
-  return actual_extent;
-}
-
-uint32_t SwapchainDetailsVK::GetImageCount() const {
-  uint32_t image_count = surface_capabilities_.minImageCount;
-  // for triple buffering
-  return image_count + 1;
-}
-
-vk::SurfaceTransformFlagBitsKHR SwapchainDetailsVK::GetTransform() const {
-  return surface_capabilities_.currentTransform;
-}
-
-SwapchainDetailsVK::SwapchainDetailsVK(
-    vk::SurfaceCapabilitiesKHR capabilities,
-    std::vector<vk::SurfaceFormatKHR> surface_formats,
-    std::vector<vk::PresentModeKHR> surface_present_modes,
-    vk::CompositeAlphaFlagBitsKHR composite_alpha)
-    : surface_capabilities_(capabilities),
-      surface_formats_(std::move(surface_formats)),
-      present_modes_(std::move(surface_present_modes)),
-      composite_alpha_(composite_alpha) {}
-
-SwapchainDetailsVK::~SwapchainDetailsVK() = default;
-
-}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/swapchain_details_vk.h b/impeller/renderer/backend/vulkan/swapchain_details_vk.h
deleted file mode 100644
index 6c2264e0f8f4ee1daef4944d0f51a9084dab9fe3..0000000000000000000000000000000000000000
--- a/impeller/renderer/backend/vulkan/swapchain_details_vk.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#pragma once
-
-#include "flutter/fml/macros.h"
-#include "impeller/renderer/backend/vulkan/vk.h"
-
-namespace impeller {
-
-class SwapchainDetailsVK {
- public:
-  static std::unique_ptr<SwapchainDetailsVK> Create(
-      vk::PhysicalDevice physical_device,
-      vk::SurfaceKHR surface);
-
-  SwapchainDetailsVK(vk::SurfaceCapabilitiesKHR capabilities,
-                     std::vector<vk::SurfaceFormatKHR> surface_formats,
-                     std::vector<vk::PresentModeKHR> surface_present_modes,
-                     vk::CompositeAlphaFlagBitsKHR composite_alpha);
-
-  ~SwapchainDetailsVK();
-
-  vk::SurfaceFormatKHR PickSurfaceFormat() const;
-
-  vk::PresentModeKHR PickPresentationMode() const;
-
-  vk::CompositeAlphaFlagBitsKHR PickCompositeAlpha() const;
-
-  vk::Extent2D PickExtent() const;
-
-  uint32_t GetImageCount() const;
-
-  vk::SurfaceTransformFlagBitsKHR GetTransform() const;
-
- private:
-  vk::SurfaceCapabilitiesKHR surface_capabilities_;
-  std::vector<vk::SurfaceFormatKHR> surface_formats_;
-  std::vector<vk::PresentModeKHR> present_modes_;
-  vk::CompositeAlphaFlagBitsKHR composite_alpha_;
-
-  FML_DISALLOW_COPY_AND_ASSIGN(SwapchainDetailsVK);
-};
-
-}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/swapchain_vk.cc b/impeller/renderer/backend/vulkan/swapchain_vk.cc
deleted file mode 100644
index a2554ed61d4769eccd786fbb061cc1dfc70f70ce..0000000000000000000000000000000000000000
--- a/impeller/renderer/backend/vulkan/swapchain_vk.cc
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "impeller/renderer/backend/vulkan/swapchain_vk.h"
-
-#include "fml/logging.h"
-#include "impeller/base/validation.h"
-#include "impeller/renderer/backend/vulkan/formats_vk.h"
-
-namespace impeller {
-
-std::unique_ptr<SwapchainVK> SwapchainVK::Create(vk::Device device,
-                                                 vk::SurfaceKHR surface,
-                                                 SwapchainDetailsVK& details) {
-  vk::SurfaceFormatKHR surface_format = details.PickSurfaceFormat();
-  vk::PresentModeKHR present_mode = details.PickPresentationMode();
-  vk::Extent2D extent = details.PickExtent();
-
-  vk::SwapchainCreateInfoKHR create_info;
-  create_info.surface = surface;
-  create_info.imageFormat = surface_format.format;
-  create_info.imageColorSpace = surface_format.colorSpace;
-  create_info.presentMode = present_mode;
-  create_info.imageExtent = extent;
-
-  create_info.minImageCount = details.GetImageCount();
-  create_info.imageArrayLayers = 1;
-  create_info.imageUsage = vk::ImageUsageFlagBits::eColorAttachment;
-  create_info.preTransform = details.GetTransform();
-  create_info.compositeAlpha = details.PickCompositeAlpha();
-  create_info.clipped = VK_TRUE;
-
-  create_info.imageSharingMode = vk::SharingMode::eExclusive;
-  {
-    // TODO (kaushikiska): This needs to change if graphics queue is not the
-    // same as present queue which is rare.
-    create_info.queueFamilyIndexCount = 0;
-    create_info.pQueueFamilyIndices = nullptr;
-  }
-
-  create_info.oldSwapchain = nullptr;
-
-  auto swapchain_res = device.createSwapchainKHRUnique(create_info);
-  if (swapchain_res.result != vk::Result::eSuccess) {
-    VALIDATION_LOG << "Failed to create swapchain: "
-                   << vk::to_string(swapchain_res.result);
-    return nullptr;
-  }
-
-  auto swapchain = std::make_unique<SwapchainVK>(
-      device, std::move(swapchain_res.value), surface_format.format, extent);
-  if (!swapchain->CreateSwapchainImages()) {
-    VALIDATION_LOG << "Failed to create swapchain images.";
-    return nullptr;
-  }
-
-  return swapchain;
-}
-
-bool SwapchainVK::CreateSwapchainImages() {
-  FML_DCHECK(swapchain_images_.empty()) << "Swapchain images already created";
-  auto res = device_.getSwapchainImagesKHR(*swapchain_);
-  if (res.result != vk::Result::eSuccess) {
-    FML_CHECK(false) << "Failed to get swapchain images: "
-                     << vk::to_string(res.result);
-    return false;
-  }
-
-  std::vector<vk::Image> images = res.value;
-  for (const auto& image : images) {
-    vk::ImageViewCreateInfo create_info;
-    create_info.image = image;
-    create_info.viewType = vk::ImageViewType::e2D;
-    create_info.format = image_format_;
-
-    create_info.components.r = vk::ComponentSwizzle::eIdentity;
-    create_info.components.g = vk::ComponentSwizzle::eIdentity;
-    create_info.components.b = vk::ComponentSwizzle::eIdentity;
-    create_info.components.a = vk::ComponentSwizzle::eIdentity;
-
-    // TODO (kaushikiska): This has to match up to the texture we will be
-    // rendering to (TextureVK).
-    create_info.subresourceRange.aspectMask = vk::ImageAspectFlagBits::eColor;
-    create_info.subresourceRange.baseMipLevel = 0;
-    create_info.subresourceRange.levelCount = 1;
-    create_info.subresourceRange.baseArrayLayer = 0;
-    create_info.subresourceRange.layerCount = 1;
-
-    auto img_view_res = device_.createImageViewUnique(create_info);
-    if (img_view_res.result != vk::Result::eSuccess) {
-      VALIDATION_LOG << "Failed to create image view: "
-                     << vk::to_string(img_view_res.result);
-      return false;
-    }
-
-    swapchain_images_.push_back(std::make_unique<SwapchainImageVK>(
-        image, std::move(img_view_res.value), image_format_, extent_));
-  }
-
-  return true;
-}
-
-SwapchainVK::SwapchainVK(vk::Device device,
-                         vk::UniqueSwapchainKHR swapchain,
-                         vk::Format image_format,
-                         vk::Extent2D extent)
-    : device_(device),
-      swapchain_(std::move(swapchain)),
-      image_format_(image_format),
-      extent_(extent) {}
-
-SwapchainVK::~SwapchainVK() = default;
-
-SwapchainImageVK::SwapchainImageVK(vk::Image image,
-                                   vk::UniqueImageView image_view,
-                                   vk::Format image_format,
-                                   vk::Extent2D extent)
-    : image_(image),
-      image_view_(std::move(image_view)),
-      image_format_(image_format),
-      extent_(extent) {}
-
-vk::SwapchainKHR SwapchainVK::GetSwapchain() const {
-  return *swapchain_;
-}
-
-SwapchainImageVK* SwapchainVK::GetSwapchainImage(uint32_t image_index) const {
-  FML_DCHECK(image_index < swapchain_images_.size());
-  return swapchain_images_[image_index].get();
-}
-
-PixelFormat SwapchainImageVK::GetPixelFormat() const {
-  return ToPixelFormat(image_format_);
-}
-
-ISize SwapchainImageVK::GetSize() const {
-  return ISize(extent_.width, extent_.height);
-}
-
-vk::Image SwapchainImageVK::GetImage() const {
-  return image_;
-}
-
-vk::ImageView SwapchainImageVK::GetImageView() const {
-  return image_view_.get();
-}
-
-SwapchainImageVK::~SwapchainImageVK() = default;
-
-}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/swapchain_vk.h b/impeller/renderer/backend/vulkan/swapchain_vk.h
deleted file mode 100644
index 11c51ee1de61996426d2bfbbf94c8b80bf03a71f..0000000000000000000000000000000000000000
--- a/impeller/renderer/backend/vulkan/swapchain_vk.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#pragma once
-
-#include <vector>
-
-#include "flutter/fml/macros.h"
-#include "impeller/geometry/size.h"
-#include "impeller/renderer/backend/vulkan/swapchain_details_vk.h"
-#include "impeller/renderer/surface.h"
-
-namespace impeller {
-
-class SwapchainImageVK {
- public:
-  SwapchainImageVK(vk::Image image,
-                   vk::UniqueImageView image_view,
-                   vk::Format image_format,
-                   vk::Extent2D extent);
-
-  ~SwapchainImageVK();
-
-  PixelFormat GetPixelFormat() const;
-
-  ISize GetSize() const;
-
-  vk::Image GetImage() const;
-
-  vk::ImageView GetImageView() const;
-
- private:
-  vk::Image image_;
-  vk::UniqueImageView image_view_;
-  vk::Format image_format_;
-  vk::Extent2D extent_;
-
-  FML_DISALLOW_COPY_AND_ASSIGN(SwapchainImageVK);
-};
-
-class SwapchainVK {
- public:
-  static std::unique_ptr<SwapchainVK> Create(vk::Device device,
-                                             vk::SurfaceKHR surface,
-                                             SwapchainDetailsVK& details);
-
-  SwapchainVK(vk::Device device,
-              vk::UniqueSwapchainKHR swapchain,
-              vk::Format image_format,
-              vk::Extent2D extent);
-
-  ~SwapchainVK();
-
-  vk::SwapchainKHR GetSwapchain() const;
-
-  SwapchainImageVK* GetSwapchainImage(uint32_t image_index) const;
-
- private:
-  bool CreateSwapchainImages();
-
-  vk::Device device_;
-  vk::UniqueSwapchainKHR swapchain_;
-  vk::Format image_format_;
-  vk::Extent2D extent_;
-  std::vector<std::unique_ptr<SwapchainImageVK>> swapchain_images_;
-
-  FML_DISALLOW_COPY_AND_ASSIGN(SwapchainVK);
-};
-
-}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/test/gpu_tracer_unittests.cc b/impeller/renderer/backend/vulkan/test/gpu_tracer_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..8f8e195d1a67075ec9ff1c055117b76339cc9d06
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/test/gpu_tracer_unittests.cc
@@ -0,0 +1,157 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <memory>
+#include "flutter/testing/testing.h"  // IWYU pragma: keep
+#include "fml/synchronization/count_down_latch.h"
+#include "gtest/gtest.h"
+#include "impeller/renderer//backend/vulkan/command_encoder_vk.h"
+#include "impeller/renderer/backend/vulkan/context_vk.h"
+#include "impeller/renderer/backend/vulkan/gpu_tracer_vk.h"
+#include "impeller/renderer/backend/vulkan/test/mock_vulkan.h"
+
+namespace impeller {
+namespace testing {
+
+#ifdef IMPELLER_DEBUG
+TEST(GPUTracerVK, CanBeDisabled) {
+  auto const context =
+      MockVulkanContextBuilder()
+          .SetSettingsCallback([](ContextVK::Settings& settings) {
+            settings.enable_gpu_tracing = false;
+          })
+          .Build();
+  auto tracer = context->GetGPUTracer();
+
+  ASSERT_FALSE(tracer->IsEnabled());
+}
+
+TEST(GPUTracerVK, DisabledFrameCycle) {
+  auto const context =
+      MockVulkanContextBuilder()
+          .SetSettingsCallback([](ContextVK::Settings& settings) {
+            settings.enable_gpu_tracing = false;
+          })
+          .Build();
+  auto tracer = context->GetGPUTracer();
+
+  // Check that a repeated frame start/end cycle does not fail any assertions.
+  for (int i = 0; i < 2; i++) {
+    tracer->MarkFrameStart();
+    tracer->MarkFrameEnd();
+  }
+}
+
+TEST(GPUTracerVK, CanTraceCmdBuffer) {
+  auto const context =
+      MockVulkanContextBuilder()
+          .SetSettingsCallback([](ContextVK::Settings& settings) {
+            settings.enable_gpu_tracing = true;
+          })
+          .Build();
+  auto tracer = context->GetGPUTracer();
+
+  ASSERT_TRUE(tracer->IsEnabled());
+  tracer->MarkFrameStart();
+
+  auto cmd_buffer = context->CreateCommandBuffer();
+  auto blit_pass = cmd_buffer->CreateBlitPass();
+  blit_pass->EncodeCommands(context->GetResourceAllocator());
+
+  auto latch = std::make_shared<fml::CountDownLatch>(1u);
+
+  if (!context->GetCommandQueue()
+           ->Submit(
+               {cmd_buffer},
+               [latch](CommandBuffer::Status status) { latch->CountDown(); })
+           .ok()) {
+    GTEST_FAIL() << "Failed to submit cmd buffer";
+  }
+
+  tracer->MarkFrameEnd();
+  latch->Wait();
+
+  auto called = GetMockVulkanFunctions(context->GetDevice());
+  ASSERT_NE(called, nullptr);
+  ASSERT_TRUE(std::find(called->begin(), called->end(), "vkCreateQueryPool") !=
+              called->end());
+  ASSERT_TRUE(std::find(called->begin(), called->end(),
+                        "vkGetQueryPoolResults") != called->end());
+}
+
+TEST(GPUTracerVK, DoesNotTraceOutsideOfFrameWorkload) {
+  auto const context =
+      MockVulkanContextBuilder()
+          .SetSettingsCallback([](ContextVK::Settings& settings) {
+            settings.enable_gpu_tracing = true;
+          })
+          .Build();
+  auto tracer = context->GetGPUTracer();
+
+  ASSERT_TRUE(tracer->IsEnabled());
+
+  auto cmd_buffer = context->CreateCommandBuffer();
+  auto blit_pass = cmd_buffer->CreateBlitPass();
+  blit_pass->EncodeCommands(context->GetResourceAllocator());
+
+  auto latch = std::make_shared<fml::CountDownLatch>(1u);
+  if (!context->GetCommandQueue()
+           ->Submit(
+               {cmd_buffer},
+               [latch](CommandBuffer::Status status) { latch->CountDown(); })
+           .ok()) {
+    GTEST_FAIL() << "Failed to submit cmd buffer";
+  }
+
+  latch->Wait();
+
+  auto called = GetMockVulkanFunctions(context->GetDevice());
+
+  ASSERT_NE(called, nullptr);
+  ASSERT_TRUE(std::find(called->begin(), called->end(),
+                        "vkGetQueryPoolResults") == called->end());
+}
+
+// This cmd buffer starts when there is a frame but finishes when there is none.
+// This should result in the same recorded work.
+TEST(GPUTracerVK, TracesWithPartialFrameOverlap) {
+  auto const context =
+      MockVulkanContextBuilder()
+          .SetSettingsCallback([](ContextVK::Settings& settings) {
+            settings.enable_gpu_tracing = true;
+          })
+          .Build();
+  auto tracer = context->GetGPUTracer();
+
+  ASSERT_TRUE(tracer->IsEnabled());
+  tracer->MarkFrameStart();
+
+  auto cmd_buffer = context->CreateCommandBuffer();
+  auto blit_pass = cmd_buffer->CreateBlitPass();
+  blit_pass->EncodeCommands(context->GetResourceAllocator());
+  tracer->MarkFrameEnd();
+
+  auto latch = std::make_shared<fml::CountDownLatch>(1u);
+  if (!context->GetCommandQueue()
+           ->Submit(
+               {cmd_buffer},
+               [latch](CommandBuffer::Status status) { latch->CountDown(); })
+           .ok()) {
+    GTEST_FAIL() << "Failed to submit cmd buffer";
+  }
+
+  latch->Wait();
+
+  auto called = GetMockVulkanFunctions(context->GetDevice());
+  ASSERT_NE(called, nullptr);
+  ASSERT_TRUE(std::find(called->begin(), called->end(), "vkCreateQueryPool") !=
+              called->end());
+  ASSERT_TRUE(std::find(called->begin(), called->end(),
+                        "vkGetQueryPoolResults") != called->end());
+}
+
+#endif  // IMPELLER_DEBUG
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/test/mock_vulkan.cc b/impeller/renderer/backend/vulkan/test/mock_vulkan.cc
new file mode 100644
index 0000000000000000000000000000000000000000..77cd8cec88f7a0f7287e36c7e2a7b0ad4dc853d2
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/test/mock_vulkan.cc
@@ -0,0 +1,937 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/backend/vulkan/test/mock_vulkan.h"
+
+#include <cstdint>
+#include <cstring>
+#include <utility>
+#include <vector>
+
+#include "impeller/base/thread_safety.h"
+#include "impeller/renderer/backend/vulkan/vk.h"  // IWYU pragma: keep.
+#include "third_party/swiftshader/include/vulkan/vulkan_core.h"
+#include "vulkan/vulkan.hpp"
+#include "vulkan/vulkan_core.h"
+
+namespace impeller {
+namespace testing {
+
+namespace {
+
+struct MockCommandBuffer {
+  explicit MockCommandBuffer(
+      std::shared_ptr<std::vector<std::string>> called_functions)
+      : called_functions_(std::move(called_functions)) {}
+  std::shared_ptr<std::vector<std::string>> called_functions_;
+};
+
+struct MockQueryPool {};
+
+struct MockCommandPool {};
+
+struct MockDescriptorPool {};
+
+struct MockSurfaceKHR {};
+
+struct MockImage {};
+
+struct MockSwapchainKHR {
+  std::array<MockImage, 3> images;
+  size_t current_image = 0;
+};
+
+struct MockSemaphore {};
+
+struct MockFramebuffer {};
+
+static ISize currentImageSize = ISize{1, 1};
+
+class MockDevice final {
+ public:
+  explicit MockDevice() : called_functions_(new std::vector<std::string>()) {}
+
+  MockCommandBuffer* NewCommandBuffer() {
+    auto buffer = std::make_unique<MockCommandBuffer>(called_functions_);
+    MockCommandBuffer* result = buffer.get();
+    Lock lock(command_buffers_mutex_);
+    command_buffers_.emplace_back(std::move(buffer));
+    return result;
+  }
+
+  MockCommandPool* NewCommandPool() {
+    auto pool = std::make_unique<MockCommandPool>();
+    MockCommandPool* result = pool.get();
+    Lock lock(commmand_pools_mutex_);
+    command_pools_.emplace_back(std::move(pool));
+    return result;
+  }
+
+  void DeleteCommandPool(MockCommandPool* pool) {
+    Lock lock(commmand_pools_mutex_);
+    auto it = std::find_if(command_pools_.begin(), command_pools_.end(),
+                           [pool](const std::unique_ptr<MockCommandPool>& p) {
+                             return p.get() == pool;
+                           });
+    if (it != command_pools_.end()) {
+      command_pools_.erase(it);
+    }
+  }
+
+  const std::shared_ptr<std::vector<std::string>>& GetCalledFunctions() {
+    return called_functions_;
+  }
+
+  void AddCalledFunction(const std::string& function) {
+    Lock lock(called_functions_mutex_);
+    called_functions_->push_back(function);
+  }
+
+ private:
+  MockDevice(const MockDevice&) = delete;
+
+  MockDevice& operator=(const MockDevice&) = delete;
+
+  Mutex called_functions_mutex_;
+  std::shared_ptr<std::vector<std::string>> called_functions_ IPLR_GUARDED_BY(
+      called_functions_mutex_);
+
+  Mutex command_buffers_mutex_;
+  std::vector<std::unique_ptr<MockCommandBuffer>> command_buffers_
+      IPLR_GUARDED_BY(command_buffers_mutex_);
+
+  Mutex commmand_pools_mutex_;
+  std::vector<std::unique_ptr<MockCommandPool>> command_pools_ IPLR_GUARDED_BY(
+      commmand_pools_mutex_);
+};
+
+void noop() {}
+
+static thread_local std::vector<std::string> g_instance_extensions;
+
+VkResult vkEnumerateInstanceExtensionProperties(
+    const char* pLayerName,
+    uint32_t* pPropertyCount,
+    VkExtensionProperties* pProperties) {
+  if (!pProperties) {
+    *pPropertyCount = g_instance_extensions.size();
+  } else {
+    uint32_t count = 0;
+    for (const std::string& ext : g_instance_extensions) {
+      strncpy(pProperties[count].extensionName, ext.c_str(),
+              sizeof(VkExtensionProperties::extensionName));
+      pProperties[count].specVersion = 0;
+      count++;
+    }
+  }
+  return VK_SUCCESS;
+}
+
+static thread_local std::vector<std::string> g_instance_layers;
+
+VkResult vkEnumerateInstanceLayerProperties(uint32_t* pPropertyCount,
+                                            VkLayerProperties* pProperties) {
+  if (!pProperties) {
+    *pPropertyCount = g_instance_layers.size();
+  } else {
+    uint32_t count = 0;
+    for (const std::string& layer : g_instance_layers) {
+      strncpy(pProperties[count].layerName, layer.c_str(),
+              sizeof(VkLayerProperties::layerName));
+      pProperties[count].specVersion = 0;
+      count++;
+    }
+  }
+  return VK_SUCCESS;
+}
+
+VkResult vkEnumeratePhysicalDevices(VkInstance instance,
+                                    uint32_t* pPhysicalDeviceCount,
+                                    VkPhysicalDevice* pPhysicalDevices) {
+  if (!pPhysicalDevices) {
+    *pPhysicalDeviceCount = 1;
+  } else {
+    pPhysicalDevices[0] = reinterpret_cast<VkPhysicalDevice>(0xfeedface);
+  }
+  return VK_SUCCESS;
+}
+
+static thread_local std::function<void(VkPhysicalDevice physicalDevice,
+                                       VkFormat format,
+                                       VkFormatProperties* pFormatProperties)>
+    g_format_properties_callback;
+
+void vkGetPhysicalDeviceFormatProperties(
+    VkPhysicalDevice physicalDevice,
+    VkFormat format,
+    VkFormatProperties* pFormatProperties) {
+  g_format_properties_callback(physicalDevice, format, pFormatProperties);
+}
+
+void vkGetPhysicalDeviceProperties(VkPhysicalDevice physicalDevice,
+                                   VkPhysicalDeviceProperties* pProperties) {
+  pProperties->limits.framebufferColorSampleCounts =
+      static_cast<VkSampleCountFlags>(VK_SAMPLE_COUNT_1_BIT |
+                                      VK_SAMPLE_COUNT_4_BIT);
+  pProperties->limits.maxImageDimension2D = 4096;
+  pProperties->limits.timestampPeriod = 1;
+}
+
+void vkGetPhysicalDeviceQueueFamilyProperties(
+    VkPhysicalDevice physicalDevice,
+    uint32_t* pQueueFamilyPropertyCount,
+    VkQueueFamilyProperties* pQueueFamilyProperties) {
+  if (!pQueueFamilyProperties) {
+    *pQueueFamilyPropertyCount = 1;
+  } else {
+    pQueueFamilyProperties[0].queueCount = 3;
+    pQueueFamilyProperties[0].queueFlags = static_cast<VkQueueFlags>(
+        VK_QUEUE_TRANSFER_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_GRAPHICS_BIT);
+  }
+}
+
+VkResult vkEnumerateDeviceExtensionProperties(
+    VkPhysicalDevice physicalDevice,
+    const char* pLayerName,
+    uint32_t* pPropertyCount,
+    VkExtensionProperties* pProperties) {
+  if (!pProperties) {
+    *pPropertyCount = 1;
+  } else {
+    strcpy(pProperties[0].extensionName, "VK_KHR_swapchain");
+    pProperties[0].specVersion = 0;
+  }
+  return VK_SUCCESS;
+}
+
+VkResult vkCreateDevice(VkPhysicalDevice physicalDevice,
+                        const VkDeviceCreateInfo* pCreateInfo,
+                        const VkAllocationCallbacks* pAllocator,
+                        VkDevice* pDevice) {
+  *pDevice = reinterpret_cast<VkDevice>(new MockDevice());
+  return VK_SUCCESS;
+}
+
+VkResult vkCreateInstance(const VkInstanceCreateInfo* pCreateInfo,
+                          const VkAllocationCallbacks* pAllocator,
+                          VkInstance* pInstance) {
+  *pInstance = reinterpret_cast<VkInstance>(0xbaadf00d);
+  return VK_SUCCESS;
+}
+
+void vkGetPhysicalDeviceMemoryProperties(
+    VkPhysicalDevice physicalDevice,
+    VkPhysicalDeviceMemoryProperties* pMemoryProperties) {
+  pMemoryProperties->memoryTypeCount = 2;
+  pMemoryProperties->memoryHeapCount = 2;
+  pMemoryProperties->memoryTypes[0].heapIndex = 0;
+  pMemoryProperties->memoryTypes[0].propertyFlags =
+      VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT |
+      VK_MEMORY_PROPERTY_HOST_COHERENT_BIT |
+      VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;
+  pMemoryProperties->memoryTypes[1].heapIndex = 1;
+  pMemoryProperties->memoryTypes[1].propertyFlags =
+      VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
+  pMemoryProperties->memoryHeaps[0].size = 1024 * 1024 * 1024;
+  pMemoryProperties->memoryHeaps[0].flags = VK_MEMORY_HEAP_DEVICE_LOCAL_BIT;
+  pMemoryProperties->memoryHeaps[1].size = 1024 * 1024 * 1024;
+  pMemoryProperties->memoryHeaps[1].flags = VK_MEMORY_HEAP_DEVICE_LOCAL_BIT;
+}
+
+VkResult vkCreatePipelineCache(VkDevice device,
+                               const VkPipelineCacheCreateInfo* pCreateInfo,
+                               const VkAllocationCallbacks* pAllocator,
+                               VkPipelineCache* pPipelineCache) {
+  MockDevice* mock_device = reinterpret_cast<MockDevice*>(device);
+  mock_device->AddCalledFunction("vkCreatePipelineCache");
+  *pPipelineCache = reinterpret_cast<VkPipelineCache>(0xb000dead);
+  return VK_SUCCESS;
+}
+
+VkResult vkCreateCommandPool(VkDevice device,
+                             const VkCommandPoolCreateInfo* pCreateInfo,
+                             const VkAllocationCallbacks* pAllocator,
+                             VkCommandPool* pCommandPool) {
+  MockDevice* mock_device = reinterpret_cast<MockDevice*>(device);
+  mock_device->AddCalledFunction("vkCreateCommandPool");
+  *pCommandPool =
+      reinterpret_cast<VkCommandPool>(mock_device->NewCommandPool());
+  return VK_SUCCESS;
+}
+
+VkResult vkResetCommandPool(VkDevice device,
+                            VkCommandPool commandPool,
+                            VkCommandPoolResetFlags flags) {
+  return VK_SUCCESS;
+}
+
+VkResult vkAllocateCommandBuffers(
+    VkDevice device,
+    const VkCommandBufferAllocateInfo* pAllocateInfo,
+    VkCommandBuffer* pCommandBuffers) {
+  MockDevice* mock_device = reinterpret_cast<MockDevice*>(device);
+  mock_device->AddCalledFunction("vkAllocateCommandBuffers");
+  *pCommandBuffers =
+      reinterpret_cast<VkCommandBuffer>(mock_device->NewCommandBuffer());
+  return VK_SUCCESS;
+}
+
+VkResult vkBeginCommandBuffer(VkCommandBuffer commandBuffer,
+                              const VkCommandBufferBeginInfo* pBeginInfo) {
+  return VK_SUCCESS;
+}
+
+VkResult vkCreateImage(VkDevice device,
+                       const VkImageCreateInfo* pCreateInfo,
+                       const VkAllocationCallbacks* pAllocator,
+                       VkImage* pImage) {
+  *pImage = reinterpret_cast<VkImage>(0xD0D0CACA);
+  return VK_SUCCESS;
+}
+
+void vkGetImageMemoryRequirements2KHR(
+    VkDevice device,
+    const VkImageMemoryRequirementsInfo2* pInfo,
+    VkMemoryRequirements2* pMemoryRequirements) {
+  pMemoryRequirements->memoryRequirements.size = 1024;
+  pMemoryRequirements->memoryRequirements.memoryTypeBits = 1;
+}
+
+VkResult vkAllocateMemory(VkDevice device,
+                          const VkMemoryAllocateInfo* pAllocateInfo,
+                          const VkAllocationCallbacks* pAllocator,
+                          VkDeviceMemory* pMemory) {
+  *pMemory = reinterpret_cast<VkDeviceMemory>(0xCAFEB0BA);
+  return VK_SUCCESS;
+}
+
+VkResult vkBindImageMemory(VkDevice device,
+                           VkImage image,
+                           VkDeviceMemory memory,
+                           VkDeviceSize memoryOffset) {
+  return VK_SUCCESS;
+}
+
+VkResult vkCreateImageView(VkDevice device,
+                           const VkImageViewCreateInfo* pCreateInfo,
+                           const VkAllocationCallbacks* pAllocator,
+                           VkImageView* pView) {
+  *pView = reinterpret_cast<VkImageView>(0xFEE1DEAD);
+  return VK_SUCCESS;
+}
+
+VkResult vkCreateBuffer(VkDevice device,
+                        const VkBufferCreateInfo* pCreateInfo,
+                        const VkAllocationCallbacks* pAllocator,
+                        VkBuffer* pBuffer) {
+  *pBuffer = reinterpret_cast<VkBuffer>(0xDEADDEAD);
+  return VK_SUCCESS;
+}
+
+void vkGetBufferMemoryRequirements2KHR(
+    VkDevice device,
+    const VkBufferMemoryRequirementsInfo2* pInfo,
+    VkMemoryRequirements2* pMemoryRequirements) {
+  pMemoryRequirements->memoryRequirements.size = 1024;
+  pMemoryRequirements->memoryRequirements.memoryTypeBits = 1;
+}
+
+VkResult vkBindBufferMemory(VkDevice device,
+                            VkBuffer buffer,
+                            VkDeviceMemory memory,
+                            VkDeviceSize memoryOffset) {
+  return VK_SUCCESS;
+}
+
+VkResult vkCreateRenderPass(VkDevice device,
+                            const VkRenderPassCreateInfo* pCreateInfo,
+                            const VkAllocationCallbacks* pAllocator,
+                            VkRenderPass* pRenderPass) {
+  *pRenderPass = reinterpret_cast<VkRenderPass>(0x12341234);
+  MockDevice* mock_device = reinterpret_cast<MockDevice*>(device);
+  mock_device->AddCalledFunction("vkCreateRenderPass");
+  return VK_SUCCESS;
+}
+
+VkResult vkCreateDescriptorSetLayout(
+    VkDevice device,
+    const VkDescriptorSetLayoutCreateInfo* pCreateInfo,
+    const VkAllocationCallbacks* pAllocator,
+    VkDescriptorSetLayout* pSetLayout) {
+  *pSetLayout = reinterpret_cast<VkDescriptorSetLayout>(0x77777777);
+  return VK_SUCCESS;
+}
+
+VkResult vkCreatePipelineLayout(VkDevice device,
+                                const VkPipelineLayoutCreateInfo* pCreateInfo,
+                                const VkAllocationCallbacks* pAllocator,
+                                VkPipelineLayout* pPipelineLayout) {
+  *pPipelineLayout = reinterpret_cast<VkPipelineLayout>(0x88888888);
+  return VK_SUCCESS;
+}
+
+VkResult vkCreateGraphicsPipelines(
+    VkDevice device,
+    VkPipelineCache pipelineCache,
+    uint32_t createInfoCount,
+    const VkGraphicsPipelineCreateInfo* pCreateInfos,
+    const VkAllocationCallbacks* pAllocator,
+    VkPipeline* pPipelines) {
+  MockDevice* mock_device = reinterpret_cast<MockDevice*>(device);
+  mock_device->AddCalledFunction("vkCreateGraphicsPipelines");
+  *pPipelines = reinterpret_cast<VkPipeline>(0x99999999);
+  return VK_SUCCESS;
+}
+
+void vkDestroyDevice(VkDevice device, const VkAllocationCallbacks* pAllocator) {
+  MockDevice* mock_device = reinterpret_cast<MockDevice*>(device);
+  mock_device->AddCalledFunction("vkDestroyDevice");
+  delete reinterpret_cast<MockDevice*>(device);
+}
+
+void vkDestroyPipeline(VkDevice device,
+                       VkPipeline pipeline,
+                       const VkAllocationCallbacks* pAllocator) {
+  MockDevice* mock_device = reinterpret_cast<MockDevice*>(device);
+  mock_device->AddCalledFunction("vkDestroyPipeline");
+}
+
+VkResult vkCreateShaderModule(VkDevice device,
+                              const VkShaderModuleCreateInfo* pCreateInfo,
+                              const VkAllocationCallbacks* pAllocator,
+                              VkShaderModule* pShaderModule) {
+  MockDevice* mock_device = reinterpret_cast<MockDevice*>(device);
+  mock_device->AddCalledFunction("vkCreateShaderModule");
+  *pShaderModule = reinterpret_cast<VkShaderModule>(0x11111111);
+  return VK_SUCCESS;
+}
+
+void vkDestroyShaderModule(VkDevice device,
+                           VkShaderModule shaderModule,
+                           const VkAllocationCallbacks* pAllocator) {
+  MockDevice* mock_device = reinterpret_cast<MockDevice*>(device);
+  mock_device->AddCalledFunction("vkDestroyShaderModule");
+}
+
+void vkDestroyPipelineCache(VkDevice device,
+                            VkPipelineCache pipelineCache,
+                            const VkAllocationCallbacks* pAllocator) {
+  MockDevice* mock_device = reinterpret_cast<MockDevice*>(device);
+  mock_device->AddCalledFunction("vkDestroyPipelineCache");
+}
+
+void vkDestroySurfaceKHR(VkInstance instance,
+                         VkSurfaceKHR surface,
+                         const VkAllocationCallbacks* pAllocator) {
+  return;
+}
+
+void vkCmdBindPipeline(VkCommandBuffer commandBuffer,
+                       VkPipelineBindPoint pipelineBindPoint,
+                       VkPipeline pipeline) {
+  MockCommandBuffer* mock_command_buffer =
+      reinterpret_cast<MockCommandBuffer*>(commandBuffer);
+  mock_command_buffer->called_functions_->push_back("vkCmdBindPipeline");
+}
+
+void vkCmdSetStencilReference(VkCommandBuffer commandBuffer,
+                              VkStencilFaceFlags faceMask,
+                              uint32_t reference) {
+  MockCommandBuffer* mock_command_buffer =
+      reinterpret_cast<MockCommandBuffer*>(commandBuffer);
+  mock_command_buffer->called_functions_->push_back("vkCmdSetStencilReference");
+}
+
+void vkCmdSetScissor(VkCommandBuffer commandBuffer,
+                     uint32_t firstScissor,
+                     uint32_t scissorCount,
+                     const VkRect2D* pScissors) {
+  MockCommandBuffer* mock_command_buffer =
+      reinterpret_cast<MockCommandBuffer*>(commandBuffer);
+  mock_command_buffer->called_functions_->push_back("vkCmdSetScissor");
+}
+
+void vkCmdSetViewport(VkCommandBuffer commandBuffer,
+                      uint32_t firstViewport,
+                      uint32_t viewportCount,
+                      const VkViewport* pViewports) {
+  MockCommandBuffer* mock_command_buffer =
+      reinterpret_cast<MockCommandBuffer*>(commandBuffer);
+  mock_command_buffer->called_functions_->push_back("vkCmdSetViewport");
+}
+
+void vkFreeCommandBuffers(VkDevice device,
+                          VkCommandPool commandPool,
+                          uint32_t commandBufferCount,
+                          const VkCommandBuffer* pCommandBuffers) {
+  MockDevice* mock_device = reinterpret_cast<MockDevice*>(device);
+  mock_device->AddCalledFunction("vkFreeCommandBuffers");
+}
+
+void vkDestroyCommandPool(VkDevice device,
+                          VkCommandPool commandPool,
+                          const VkAllocationCallbacks* pAllocator) {
+  MockDevice* mock_device = reinterpret_cast<MockDevice*>(device);
+  mock_device->DeleteCommandPool(
+      reinterpret_cast<MockCommandPool*>(commandPool));
+  mock_device->AddCalledFunction("vkDestroyCommandPool");
+}
+
+VkResult vkEndCommandBuffer(VkCommandBuffer commandBuffer) {
+  return VK_SUCCESS;
+}
+
+VkResult vkCreateFence(VkDevice device,
+                       const VkFenceCreateInfo* pCreateInfo,
+                       const VkAllocationCallbacks* pAllocator,
+                       VkFence* pFence) {
+  MockDevice* mock_device = reinterpret_cast<MockDevice*>(device);
+  *pFence = reinterpret_cast<VkFence>(new MockFence());
+  return VK_SUCCESS;
+}
+
+VkResult vkDestroyFence(VkDevice device,
+                        VkFence fence,
+                        const VkAllocationCallbacks* pAllocator) {
+  delete reinterpret_cast<MockFence*>(fence);
+  return VK_SUCCESS;
+}
+
+VkResult vkQueueSubmit(VkQueue queue,
+                       uint32_t submitCount,
+                       const VkSubmitInfo* pSubmits,
+                       VkFence fence) {
+  return VK_SUCCESS;
+}
+
+VkResult vkWaitForFences(VkDevice device,
+                         uint32_t fenceCount,
+                         const VkFence* pFences,
+                         VkBool32 waitAll,
+                         uint64_t timeout) {
+  return VK_SUCCESS;
+}
+
+VkResult vkGetFenceStatus(VkDevice device, VkFence fence) {
+  MockDevice* mock_device = reinterpret_cast<MockDevice*>(device);
+  MockFence* mock_fence = reinterpret_cast<MockFence*>(fence);
+  return mock_fence->GetStatus();
+}
+
+VkResult vkResetFences(VkDevice device,
+                       uint32_t fenceCount,
+                       const VkFence* fences) {
+  return VK_SUCCESS;
+}
+
+VkResult vkCreateDebugUtilsMessengerEXT(
+    VkInstance instance,
+    const VkDebugUtilsMessengerCreateInfoEXT* pCreateInfo,
+    const VkAllocationCallbacks* pAllocator,
+    VkDebugUtilsMessengerEXT* pMessenger) {
+  return VK_SUCCESS;
+}
+
+VkResult vkSetDebugUtilsObjectNameEXT(
+    VkDevice device,
+    const VkDebugUtilsObjectNameInfoEXT* pNameInfo) {
+  return VK_SUCCESS;
+}
+
+VkResult vkCreateQueryPool(VkDevice device,
+                           const VkQueryPoolCreateInfo* pCreateInfo,
+                           const VkAllocationCallbacks* pAllocator,
+                           VkQueryPool* pQueryPool) {
+  *pQueryPool = reinterpret_cast<VkQueryPool>(new MockQueryPool());
+  MockDevice* mock_device = reinterpret_cast<MockDevice*>(device);
+  mock_device->AddCalledFunction("vkCreateQueryPool");
+  return VK_SUCCESS;
+}
+
+void vkDestroyQueryPool(VkDevice device,
+                        VkQueryPool queryPool,
+                        const VkAllocationCallbacks* pAllocator) {
+  MockDevice* mock_device = reinterpret_cast<MockDevice*>(device);
+  mock_device->AddCalledFunction("vkDestroyQueryPool");
+  delete reinterpret_cast<MockQueryPool*>(queryPool);
+}
+
+VkResult vkGetQueryPoolResults(VkDevice device,
+                               VkQueryPool queryPool,
+                               uint32_t firstQuery,
+                               uint32_t queryCount,
+                               size_t dataSize,
+                               void* pData,
+                               VkDeviceSize stride,
+                               VkQueryResultFlags flags) {
+  MockDevice* mock_device = reinterpret_cast<MockDevice*>(device);
+  if (dataSize == sizeof(uint32_t)) {
+    uint32_t* data = static_cast<uint32_t*>(pData);
+    for (auto i = firstQuery; i < queryCount; i++) {
+      data[0] = i;
+    }
+  } else if (dataSize == sizeof(int64_t)) {
+    uint64_t* data = static_cast<uint64_t*>(pData);
+    for (auto i = firstQuery; i < queryCount; i++) {
+      data[0] = i;
+    }
+  }
+  mock_device->AddCalledFunction("vkGetQueryPoolResults");
+  return VK_SUCCESS;
+}
+
+VkResult vkCreateDescriptorPool(VkDevice device,
+                                const VkDescriptorPoolCreateInfo* pCreateInfo,
+                                const VkAllocationCallbacks* pAllocator,
+                                VkDescriptorPool* pDescriptorPool) {
+  MockDevice* mock_device = reinterpret_cast<MockDevice*>(device);
+  *pDescriptorPool =
+      reinterpret_cast<VkDescriptorPool>(new MockDescriptorPool());
+  mock_device->AddCalledFunction("vkCreateDescriptorPool");
+  return VK_SUCCESS;
+}
+
+void vkDestroyDescriptorPool(VkDevice device,
+                             VkDescriptorPool descriptorPool,
+                             const VkAllocationCallbacks* pAllocator) {
+  MockDevice* mock_device = reinterpret_cast<MockDevice*>(device);
+  mock_device->AddCalledFunction("vkDestroyDescriptorPool");
+  delete reinterpret_cast<MockDescriptorPool*>(descriptorPool);
+}
+
+VkResult vkResetDescriptorPool(VkDevice device,
+                               VkDescriptorPool descriptorPool,
+                               VkDescriptorPoolResetFlags flags) {
+  MockDevice* mock_device = reinterpret_cast<MockDevice*>(device);
+  mock_device->AddCalledFunction("vkResetDescriptorPool");
+  return VK_SUCCESS;
+}
+
+VkResult vkAllocateDescriptorSets(
+    VkDevice device,
+    const VkDescriptorSetAllocateInfo* pAllocateInfo,
+    VkDescriptorSet* pDescriptorSets) {
+  MockDevice* mock_device = reinterpret_cast<MockDevice*>(device);
+  mock_device->AddCalledFunction("vkAllocateDescriptorSets");
+  return VK_SUCCESS;
+}
+
+VkResult vkGetPhysicalDeviceSurfaceFormatsKHR(
+    VkPhysicalDevice physicalDevice,
+    VkSurfaceKHR surface,
+    uint32_t* pSurfaceFormatCount,
+    VkSurfaceFormatKHR* pSurfaceFormats) {
+  *pSurfaceFormatCount = 1u;
+  if (pSurfaceFormats != nullptr) {
+    pSurfaceFormats[0] =
+        VkSurfaceFormatKHR{.format = VK_FORMAT_R8G8B8A8_UNORM,
+                           .colorSpace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR};
+  }
+  return VK_SUCCESS;
+}
+
+VkResult vkGetPhysicalDeviceSurfaceCapabilitiesKHR(
+    VkPhysicalDevice physicalDevice,
+    VkSurfaceKHR surface,
+    VkSurfaceCapabilitiesKHR* pSurfaceCapabilities) {
+  *pSurfaceCapabilities = VkSurfaceCapabilitiesKHR{
+      .minImageCount = 3,
+      .maxImageCount = 6,
+      .currentExtent =
+          VkExtent2D{
+              .width = static_cast<uint32_t>(currentImageSize.width),
+              .height = static_cast<uint32_t>(currentImageSize.height),
+          },
+      .minImageExtent =
+          VkExtent2D{
+              .width = 0,
+              .height = 0,
+          },
+      .maxImageExtent =
+          VkExtent2D{
+              .width = static_cast<uint32_t>(currentImageSize.width),
+              .height = static_cast<uint32_t>(currentImageSize.height),
+          },
+      .maxImageArrayLayers = 1,
+      .supportedTransforms =
+          VkSurfaceTransformFlagBitsKHR::VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR,
+      .currentTransform =
+          VkSurfaceTransformFlagBitsKHR::VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR,
+      .supportedCompositeAlpha = VkCompositeAlphaFlagBitsKHR::
+          VK_COMPOSITE_ALPHA_PRE_MULTIPLIED_BIT_KHR,
+      .supportedUsageFlags =
+          VkImageUsageFlagBits::VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT};
+  return VK_SUCCESS;
+}
+
+VkResult vkGetPhysicalDeviceSurfaceSupportKHR(VkPhysicalDevice physicalDevice,
+                                              uint32_t queueFamilyIndex,
+                                              VkSurfaceKHR surface,
+                                              VkBool32* pSupported) {
+  *pSupported = VK_TRUE;
+  return VK_SUCCESS;
+}
+
+VkResult vkCreateSwapchainKHR(VkDevice device,
+                              const VkSwapchainCreateInfoKHR* pCreateInfo,
+                              const VkAllocationCallbacks* pAllocator,
+                              VkSwapchainKHR* pSwapchain) {
+  *pSwapchain = reinterpret_cast<VkSwapchainKHR>(new MockSwapchainKHR());
+  return VK_SUCCESS;
+}
+
+void vkDestroySwapchainKHR(VkDevice device,
+                           VkSwapchainKHR swapchain,
+                           const VkAllocationCallbacks* pAllocator) {
+  delete reinterpret_cast<MockSwapchainKHR*>(swapchain);
+}
+
+VkResult vkGetSwapchainImagesKHR(VkDevice device,
+                                 VkSwapchainKHR swapchain,
+                                 uint32_t* pSwapchainImageCount,
+                                 VkImage* pSwapchainImages) {
+  MockSwapchainKHR* mock_swapchain =
+      reinterpret_cast<MockSwapchainKHR*>(swapchain);
+  auto& images = mock_swapchain->images;
+  *pSwapchainImageCount = images.size();
+  if (pSwapchainImages != nullptr) {
+    for (size_t i = 0; i < images.size(); i++) {
+      pSwapchainImages[i] = reinterpret_cast<VkImage>(&images[i]);
+    }
+  }
+  return VK_SUCCESS;
+}
+
+VkResult vkCreateSemaphore(VkDevice device,
+                           const VkSemaphoreCreateInfo* pCreateInfo,
+                           const VkAllocationCallbacks* pAllocator,
+                           VkSemaphore* pSemaphore) {
+  *pSemaphore = reinterpret_cast<VkSemaphore>(new MockSemaphore());
+  return VK_SUCCESS;
+}
+
+void vkDestroySemaphore(VkDevice device,
+                        VkSemaphore semaphore,
+                        const VkAllocationCallbacks* pAllocator) {
+  delete reinterpret_cast<MockSemaphore*>(semaphore);
+}
+
+VkResult vkAcquireNextImageKHR(VkDevice device,
+                               VkSwapchainKHR swapchain,
+                               uint64_t timeout,
+                               VkSemaphore semaphore,
+                               VkFence fence,
+                               uint32_t* pImageIndex) {
+  auto current_index =
+      reinterpret_cast<MockSwapchainKHR*>(swapchain)->current_image++;
+  *pImageIndex = (current_index + 1) % 3u;
+  return VK_SUCCESS;
+}
+
+VkResult vkCreateFramebuffer(VkDevice device,
+                             const VkFramebufferCreateInfo* pCreateInfo,
+                             const VkAllocationCallbacks* pAllocator,
+                             VkFramebuffer* pFramebuffer) {
+  *pFramebuffer = reinterpret_cast<VkFramebuffer>(new MockFramebuffer());
+  return VK_SUCCESS;
+}
+
+void vkDestroyFramebuffer(VkDevice device,
+                          VkFramebuffer framebuffer,
+                          const VkAllocationCallbacks* pAllocator) {
+  delete reinterpret_cast<MockFramebuffer*>(framebuffer);
+}
+
+PFN_vkVoidFunction GetMockVulkanProcAddress(VkInstance instance,
+                                            const char* pName) {
+  if (strcmp("vkEnumerateInstanceExtensionProperties", pName) == 0) {
+    return (PFN_vkVoidFunction)vkEnumerateInstanceExtensionProperties;
+  } else if (strcmp("vkEnumerateInstanceLayerProperties", pName) == 0) {
+    return (PFN_vkVoidFunction)vkEnumerateInstanceLayerProperties;
+  } else if (strcmp("vkEnumeratePhysicalDevices", pName) == 0) {
+    return (PFN_vkVoidFunction)vkEnumeratePhysicalDevices;
+  } else if (strcmp("vkGetPhysicalDeviceFormatProperties", pName) == 0) {
+    return (PFN_vkVoidFunction)vkGetPhysicalDeviceFormatProperties;
+  } else if (strcmp("vkGetPhysicalDeviceProperties", pName) == 0) {
+    return (PFN_vkVoidFunction)vkGetPhysicalDeviceProperties;
+  } else if (strcmp("vkGetPhysicalDeviceQueueFamilyProperties", pName) == 0) {
+    return (PFN_vkVoidFunction)vkGetPhysicalDeviceQueueFamilyProperties;
+  } else if (strcmp("vkEnumerateDeviceExtensionProperties", pName) == 0) {
+    return (PFN_vkVoidFunction)vkEnumerateDeviceExtensionProperties;
+  } else if (strcmp("vkCreateDevice", pName) == 0) {
+    return (PFN_vkVoidFunction)vkCreateDevice;
+  } else if (strcmp("vkCreateInstance", pName) == 0) {
+    return (PFN_vkVoidFunction)vkCreateInstance;
+  } else if (strcmp("vkGetPhysicalDeviceMemoryProperties", pName) == 0) {
+    return (PFN_vkVoidFunction)vkGetPhysicalDeviceMemoryProperties;
+  } else if (strcmp("vkCreatePipelineCache", pName) == 0) {
+    return (PFN_vkVoidFunction)vkCreatePipelineCache;
+  } else if (strcmp("vkCreateCommandPool", pName) == 0) {
+    return (PFN_vkVoidFunction)vkCreateCommandPool;
+  } else if (strcmp("vkResetCommandPool", pName) == 0) {
+    return (PFN_vkVoidFunction)vkResetCommandPool;
+  } else if (strcmp("vkAllocateCommandBuffers", pName) == 0) {
+    return (PFN_vkVoidFunction)vkAllocateCommandBuffers;
+  } else if (strcmp("vkBeginCommandBuffer", pName) == 0) {
+    return (PFN_vkVoidFunction)vkBeginCommandBuffer;
+  } else if (strcmp("vkCreateImage", pName) == 0) {
+    return (PFN_vkVoidFunction)vkCreateImage;
+  } else if (strcmp("vkGetInstanceProcAddr", pName) == 0) {
+    return (PFN_vkVoidFunction)GetMockVulkanProcAddress;
+  } else if (strcmp("vkGetDeviceProcAddr", pName) == 0) {
+    return (PFN_vkVoidFunction)GetMockVulkanProcAddress;
+  } else if (strcmp("vkGetImageMemoryRequirements2KHR", pName) == 0 ||
+             strcmp("vkGetImageMemoryRequirements2", pName) == 0) {
+    return (PFN_vkVoidFunction)vkGetImageMemoryRequirements2KHR;
+  } else if (strcmp("vkAllocateMemory", pName) == 0) {
+    return (PFN_vkVoidFunction)vkAllocateMemory;
+  } else if (strcmp("vkBindImageMemory", pName) == 0) {
+    return (PFN_vkVoidFunction)vkBindImageMemory;
+  } else if (strcmp("vkCreateImageView", pName) == 0) {
+    return (PFN_vkVoidFunction)vkCreateImageView;
+  } else if (strcmp("vkCreateBuffer", pName) == 0) {
+    return (PFN_vkVoidFunction)vkCreateBuffer;
+  } else if (strcmp("vkGetBufferMemoryRequirements2KHR", pName) == 0 ||
+             strcmp("vkGetBufferMemoryRequirements2", pName) == 0) {
+    return (PFN_vkVoidFunction)vkGetBufferMemoryRequirements2KHR;
+  } else if (strcmp("vkBindBufferMemory", pName) == 0) {
+    return (PFN_vkVoidFunction)vkBindBufferMemory;
+  } else if (strcmp("vkCreateRenderPass", pName) == 0) {
+    return (PFN_vkVoidFunction)vkCreateRenderPass;
+  } else if (strcmp("vkCreateDescriptorSetLayout", pName) == 0) {
+    return (PFN_vkVoidFunction)vkCreateDescriptorSetLayout;
+  } else if (strcmp("vkCreatePipelineLayout", pName) == 0) {
+    return (PFN_vkVoidFunction)vkCreatePipelineLayout;
+  } else if (strcmp("vkCreateGraphicsPipelines", pName) == 0) {
+    return (PFN_vkVoidFunction)vkCreateGraphicsPipelines;
+  } else if (strcmp("vkDestroyDevice", pName) == 0) {
+    return (PFN_vkVoidFunction)vkDestroyDevice;
+  } else if (strcmp("vkDestroyPipeline", pName) == 0) {
+    return (PFN_vkVoidFunction)vkDestroyPipeline;
+  } else if (strcmp("vkCreateShaderModule", pName) == 0) {
+    return (PFN_vkVoidFunction)vkCreateShaderModule;
+  } else if (strcmp("vkDestroyShaderModule", pName) == 0) {
+    return (PFN_vkVoidFunction)vkDestroyShaderModule;
+  } else if (strcmp("vkDestroyPipelineCache", pName) == 0) {
+    return (PFN_vkVoidFunction)vkDestroyPipelineCache;
+  } else if (strcmp("vkCmdBindPipeline", pName) == 0) {
+    return (PFN_vkVoidFunction)vkCmdBindPipeline;
+  } else if (strcmp("vkCmdSetStencilReference", pName) == 0) {
+    return (PFN_vkVoidFunction)vkCmdSetStencilReference;
+  } else if (strcmp("vkCmdSetScissor", pName) == 0) {
+    return (PFN_vkVoidFunction)vkCmdSetScissor;
+  } else if (strcmp("vkCmdSetViewport", pName) == 0) {
+    return (PFN_vkVoidFunction)vkCmdSetViewport;
+  } else if (strcmp("vkDestroyCommandPool", pName) == 0) {
+    return (PFN_vkVoidFunction)vkDestroyCommandPool;
+  } else if (strcmp("vkFreeCommandBuffers", pName) == 0) {
+    return (PFN_vkVoidFunction)vkFreeCommandBuffers;
+  } else if (strcmp("vkEndCommandBuffer", pName) == 0) {
+    return (PFN_vkVoidFunction)vkEndCommandBuffer;
+  } else if (strcmp("vkCreateFence", pName) == 0) {
+    return (PFN_vkVoidFunction)vkCreateFence;
+  } else if (strcmp("vkDestroyFence", pName) == 0) {
+    return (PFN_vkVoidFunction)vkDestroyFence;
+  } else if (strcmp("vkQueueSubmit", pName) == 0) {
+    return (PFN_vkVoidFunction)vkQueueSubmit;
+  } else if (strcmp("vkWaitForFences", pName) == 0) {
+    return (PFN_vkVoidFunction)vkWaitForFences;
+  } else if (strcmp("vkGetFenceStatus", pName) == 0) {
+    return (PFN_vkVoidFunction)vkGetFenceStatus;
+  } else if (strcmp("vkResetFences", pName) == 0) {
+    return (PFN_vkVoidFunction)vkResetFences;
+  } else if (strcmp("vkCreateDebugUtilsMessengerEXT", pName) == 0) {
+    return (PFN_vkVoidFunction)vkCreateDebugUtilsMessengerEXT;
+  } else if (strcmp("vkSetDebugUtilsObjectNameEXT", pName) == 0) {
+    return (PFN_vkVoidFunction)vkSetDebugUtilsObjectNameEXT;
+  } else if (strcmp("vkCreateQueryPool", pName) == 0) {
+    return (PFN_vkVoidFunction)vkCreateQueryPool;
+  } else if (strcmp("vkDestroyQueryPool", pName) == 0) {
+    return (PFN_vkVoidFunction)vkDestroyQueryPool;
+  } else if (strcmp("vkGetQueryPoolResults", pName) == 0) {
+    return (PFN_vkVoidFunction)vkGetQueryPoolResults;
+  } else if (strcmp("vkCreateDescriptorPool", pName) == 0) {
+    return (PFN_vkVoidFunction)vkCreateDescriptorPool;
+  } else if (strcmp("vkDestroyDescriptorPool", pName) == 0) {
+    return (PFN_vkVoidFunction)vkDestroyDescriptorPool;
+  } else if (strcmp("vkResetDescriptorPool", pName) == 0) {
+    return (PFN_vkVoidFunction)vkResetDescriptorPool;
+  } else if (strcmp("vkAllocateDescriptorSets", pName) == 0) {
+    return (PFN_vkVoidFunction)vkAllocateDescriptorSets;
+  } else if (strcmp("vkGetPhysicalDeviceSurfaceFormatsKHR", pName) == 0) {
+    return (PFN_vkVoidFunction)vkGetPhysicalDeviceSurfaceFormatsKHR;
+  } else if (strcmp("vkGetPhysicalDeviceSurfaceCapabilitiesKHR", pName) == 0) {
+    return (PFN_vkVoidFunction)vkGetPhysicalDeviceSurfaceCapabilitiesKHR;
+  } else if (strcmp("vkGetPhysicalDeviceSurfaceSupportKHR", pName) == 0) {
+    return (PFN_vkVoidFunction)vkGetPhysicalDeviceSurfaceSupportKHR;
+  } else if (strcmp("vkCreateSwapchainKHR", pName) == 0) {
+    return (PFN_vkVoidFunction)vkCreateSwapchainKHR;
+  } else if (strcmp("vkDestroySwapchainKHR", pName) == 0) {
+    return (PFN_vkVoidFunction)vkDestroySwapchainKHR;
+  } else if (strcmp("vkGetSwapchainImagesKHR", pName) == 0) {
+    return (PFN_vkVoidFunction)vkGetSwapchainImagesKHR;
+  } else if (strcmp("vkCreateSemaphore", pName) == 0) {
+    return (PFN_vkVoidFunction)vkCreateSemaphore;
+  } else if (strcmp("vkDestroySemaphore", pName) == 0) {
+    return (PFN_vkVoidFunction)vkDestroySemaphore;
+  } else if (strcmp("vkDestroySurfaceKHR", pName) == 0) {
+    return (PFN_vkVoidFunction)vkDestroySurfaceKHR;
+  } else if (strcmp("vkAcquireNextImageKHR", pName) == 0) {
+    return (PFN_vkVoidFunction)vkAcquireNextImageKHR;
+  } else if (strcmp("vkCreateFramebuffer", pName) == 0) {
+    return (PFN_vkVoidFunction)vkCreateFramebuffer;
+  } else if (strcmp("vkDestroyFramebuffer", pName) == 0) {
+    return (PFN_vkVoidFunction)vkDestroyFramebuffer;
+  }
+  return noop;
+}
+
+}  // namespace
+
+MockVulkanContextBuilder::MockVulkanContextBuilder()
+    : instance_extensions_({"VK_KHR_surface", "VK_MVK_macos_surface"}),
+      format_properties_callback_([](VkPhysicalDevice physicalDevice,
+                                     VkFormat format,
+                                     VkFormatProperties* pFormatProperties) {
+        if (format == VK_FORMAT_B8G8R8A8_UNORM) {
+          pFormatProperties->optimalTilingFeatures =
+              static_cast<VkFormatFeatureFlags>(
+                  vk::FormatFeatureFlagBits::eColorAttachment);
+        } else if (format == VK_FORMAT_D32_SFLOAT_S8_UINT) {
+          pFormatProperties->optimalTilingFeatures =
+              static_cast<VkFormatFeatureFlags>(
+                  vk::FormatFeatureFlagBits::eDepthStencilAttachment);
+        } else if (format == VK_FORMAT_S8_UINT) {
+          pFormatProperties->optimalTilingFeatures =
+              static_cast<VkFormatFeatureFlags>(
+                  vk::FormatFeatureFlagBits::eDepthStencilAttachment);
+        }
+      }) {}
+
+std::shared_ptr<ContextVK> MockVulkanContextBuilder::Build() {
+  auto message_loop = fml::ConcurrentMessageLoop::Create();
+  ContextVK::Settings settings;
+  settings.proc_address_callback = GetMockVulkanProcAddress;
+  if (settings_callback_) {
+    settings_callback_(settings);
+  }
+  g_instance_extensions = instance_extensions_;
+  g_instance_layers = instance_layers_;
+  g_format_properties_callback = format_properties_callback_;
+  std::shared_ptr<ContextVK> result = ContextVK::Create(std::move(settings));
+  return result;
+}
+
+std::shared_ptr<std::vector<std::string>> GetMockVulkanFunctions(
+    VkDevice device) {
+  MockDevice* mock_device = reinterpret_cast<MockDevice*>(device);
+  return mock_device->GetCalledFunctions();
+}
+
+void SetSwapchainImageSize(ISize size) {
+  currentImageSize = size;
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/test/mock_vulkan.h b/impeller/renderer/backend/vulkan/test/mock_vulkan.h
new file mode 100644
index 0000000000000000000000000000000000000000..3febfe3bc7ff7d7aef3d4d253f36f303687c5520
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/test/mock_vulkan.h
@@ -0,0 +1,119 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_TEST_MOCK_VULKAN_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_TEST_MOCK_VULKAN_H_
+
+#include <functional>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "impeller/base/thread.h"
+#include "impeller/renderer/backend/vulkan/context_vk.h"
+#include "vulkan/vulkan_core.h"
+#include "vulkan/vulkan_enums.hpp"
+
+namespace impeller {
+namespace testing {
+
+std::shared_ptr<std::vector<std::string>> GetMockVulkanFunctions(
+    VkDevice device);
+
+// A test-controlled version of |vk::Fence|.
+class MockFence final {
+ public:
+  MockFence() = default;
+
+  // Returns the result that was set in the constructor or |SetStatus|.
+  VkResult GetStatus() { return static_cast<VkResult>(result_.load()); }
+
+  // Sets the result that will be returned by `GetFenceStatus`.
+  void SetStatus(vk::Result result) { result_ = result; }
+
+  // Sets the result that will be returned by `GetFenceStatus`.
+  static void SetStatus(vk::UniqueFence& fence, vk::Result result) {
+    // Cast the fence to a MockFence and set the result.
+    VkFence raw_fence = fence.get();
+    MockFence* mock_fence = reinterpret_cast<MockFence*>(raw_fence);
+    mock_fence->SetStatus(result);
+  }
+
+  // Gets a raw pointer to manipulate the fence after it's been moved.
+  static MockFence* GetRawPointer(vk::UniqueFence& fence) {
+    // Cast the fence to a MockFence and get the result.
+    VkFence raw_fence = fence.get();
+    MockFence* mock_fence = reinterpret_cast<MockFence*>(raw_fence);
+    return mock_fence;
+  }
+
+ private:
+  std::atomic<vk::Result> result_ = vk::Result::eSuccess;
+
+  MockFence(const MockFence&) = delete;
+
+  MockFence& operator=(const MockFence&) = delete;
+};
+
+class MockVulkanContextBuilder {
+ public:
+  MockVulkanContextBuilder();
+
+  //------------------------------------------------------------------------------
+  /// @brief      Create a Vulkan context with Vulkan functions mocked. The
+  ///             caller is given a chance to tinker on the settings right
+  ///             before a context is created.
+  ///
+  /// @return     A context if one can be created.
+  ///
+  std::shared_ptr<ContextVK> Build();
+
+  /// A callback that allows the modification of the ContextVK::Settings before
+  /// the context is made.
+  MockVulkanContextBuilder& SetSettingsCallback(
+      const std::function<void(ContextVK::Settings&)>& settings_callback) {
+    settings_callback_ = settings_callback;
+    return *this;
+  }
+
+  MockVulkanContextBuilder& SetInstanceExtensions(
+      const std::vector<std::string>& instance_extensions) {
+    instance_extensions_ = instance_extensions;
+    return *this;
+  }
+
+  MockVulkanContextBuilder& SetInstanceLayers(
+      const std::vector<std::string>& instance_layers) {
+    instance_layers_ = instance_layers;
+    return *this;
+  }
+
+  /// Set the behavior of vkGetPhysicalDeviceFormatProperties, which needs to
+  /// respond differently for different formats.
+  MockVulkanContextBuilder& SetPhysicalDeviceFormatPropertiesCallback(
+      std::function<void(VkPhysicalDevice physicalDevice,
+                         VkFormat format,
+                         VkFormatProperties* pFormatProperties)>
+          format_properties_callback) {
+    format_properties_callback_ = std::move(format_properties_callback);
+    return *this;
+  }
+
+ private:
+  std::function<void(ContextVK::Settings&)> settings_callback_;
+  std::vector<std::string> instance_extensions_;
+  std::vector<std::string> instance_layers_;
+  std::function<void(VkPhysicalDevice physicalDevice,
+                     VkFormat format,
+                     VkFormatProperties* pFormatProperties)>
+      format_properties_callback_;
+};
+
+/// @brief Override the image size returned by all swapchain images.
+void SetSwapchainImageSize(ISize size);
+
+}  // namespace testing
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_TEST_MOCK_VULKAN_H_
diff --git a/impeller/renderer/backend/vulkan/test/mock_vulkan_unittests.cc b/impeller/renderer/backend/vulkan/test/mock_vulkan_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..2555994a8fd03e023e79edfb5284dcfff8ff9b24
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/test/mock_vulkan_unittests.cc
@@ -0,0 +1,58 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/testing/testing.h"  // IWYU pragma: keep
+#include "gtest/gtest.h"
+#include "impeller/renderer/backend/vulkan/test/mock_vulkan.h"
+#include "vulkan/vulkan_enums.hpp"
+
+namespace impeller {
+namespace testing {
+
+TEST(MockVulkanContextTest, IsThreadSafe) {
+  // In a typical app, there is a single ContextVK per app, shared b/w threads.
+  //
+  // This test ensures that the (mock) ContextVK is thread-safe.
+  auto const context = MockVulkanContextBuilder().Build();
+
+  // Spawn two threads, and have them create a CommandPoolVK each.
+  std::thread thread1([&context]() {
+    auto const pool = context->GetCommandPoolRecycler()->Get();
+    EXPECT_TRUE(pool);
+  });
+
+  std::thread thread2([&context]() {
+    auto const pool = context->GetCommandPoolRecycler()->Get();
+    EXPECT_TRUE(pool);
+  });
+
+  thread1.join();
+  thread2.join();
+
+  context->Shutdown();
+}
+
+TEST(MockVulkanContextTest, DefaultFenceAlwaysReportsSuccess) {
+  auto const context = MockVulkanContextBuilder().Build();
+  auto const device = context->GetDevice();
+
+  auto fence = device.createFenceUnique({}).value;
+  EXPECT_EQ(vk::Result::eSuccess, device.getFenceStatus(*fence));
+}
+
+TEST(MockVulkanContextTest, MockedFenceReportsStatus) {
+  auto const context = MockVulkanContextBuilder().Build();
+
+  auto const device = context->GetDevice();
+  auto fence = device.createFenceUnique({}).value;
+  MockFence::SetStatus(fence, vk::Result::eNotReady);
+
+  EXPECT_EQ(vk::Result::eNotReady, device.getFenceStatus(fence.get()));
+
+  MockFence::SetStatus(fence, vk::Result::eSuccess);
+  EXPECT_EQ(vk::Result::eSuccess, device.getFenceStatus(*fence));
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/test/swapchain_unittests.cc b/impeller/renderer/backend/vulkan/test/swapchain_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..e93de69d4b98813ee705a9a4b6fb92a7efecbf3e
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/test/swapchain_unittests.cc
@@ -0,0 +1,130 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/testing/testing.h"  // IWYU pragma: keep
+#include "gtest/gtest.h"
+#include "impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_vk.h"
+#include "impeller/renderer/backend/vulkan/test/mock_vulkan.h"
+#include "impeller/renderer/backend/vulkan/texture_vk.h"
+#include "vulkan/vulkan_enums.hpp"
+#include "vulkan/vulkan_handles.hpp"
+
+namespace impeller {
+namespace testing {
+
+vk::UniqueSurfaceKHR CreateSurface(const ContextVK& context) {
+#if FML_OS_DARWIN
+  impeller::vk::MetalSurfaceCreateInfoEXT createInfo = {};
+  auto [result, surface] =
+      context.GetInstance().createMetalSurfaceEXTUnique(createInfo);
+  FML_DCHECK(result == vk::Result::eSuccess);
+  return std::move(surface);
+#else
+  return {};
+#endif  // FML_OS_DARWIN
+}
+
+TEST(SwapchainTest, CanCreateSwapchain) {
+  auto const context = MockVulkanContextBuilder().Build();
+
+  auto surface = CreateSurface(*context);
+  auto swapchain =
+      KHRSwapchainVK::Create(context, std::move(surface), ISize{1, 1});
+
+  EXPECT_TRUE(swapchain->IsValid());
+}
+
+TEST(SwapchainTest, RecreateSwapchainWhenSizeChanges) {
+  auto const context = MockVulkanContextBuilder().Build();
+
+  auto surface = CreateSurface(*context);
+  SetSwapchainImageSize(ISize{1, 1});
+  auto swapchain =
+      KHRSwapchainVK::Create(context, std::move(surface), ISize{1, 1},
+                             /*enable_msaa=*/false);
+  auto image = swapchain->AcquireNextDrawable();
+  auto expected_size = ISize{1, 1};
+  EXPECT_EQ(image->GetSize(), expected_size);
+
+  SetSwapchainImageSize(ISize{100, 100});
+  swapchain->UpdateSurfaceSize(ISize{100, 100});
+
+  auto image_b = swapchain->AcquireNextDrawable();
+  expected_size = ISize{100, 100};
+  EXPECT_EQ(image_b->GetSize(), expected_size);
+}
+
+TEST(SwapchainTest, CachesRenderPassOnSwapchainImage) {
+  auto const context = MockVulkanContextBuilder().Build();
+
+  auto surface = CreateSurface(*context);
+  auto swapchain =
+      KHRSwapchainVK::Create(context, std::move(surface), ISize{1, 1});
+
+  EXPECT_TRUE(swapchain->IsValid());
+
+  // The mock swapchain will always create 3 images, verify each one starts
+  // out with the same MSAA and depth+stencil texture, and no cached
+  // framebuffer.
+  std::vector<std::shared_ptr<Texture>> msaa_textures;
+  std::vector<std::shared_ptr<Texture>> depth_stencil_textures;
+  for (auto i = 0u; i < 3u; i++) {
+    auto drawable = swapchain->AcquireNextDrawable();
+    RenderTarget render_target = drawable->GetTargetRenderPassDescriptor();
+
+    auto texture = render_target.GetRenderTargetTexture();
+    auto& texture_vk = TextureVK::Cast(*texture);
+    EXPECT_EQ(texture_vk.GetCachedFramebuffer(), nullptr);
+    EXPECT_EQ(texture_vk.GetCachedRenderPass(), nullptr);
+
+    auto command_buffer = context->CreateCommandBuffer();
+    auto render_pass = command_buffer->CreateRenderPass(render_target);
+    render_pass->EncodeCommands();
+
+    auto& depth = render_target.GetDepthAttachment();
+    depth_stencil_textures.push_back(depth.has_value() ? depth->texture
+                                                       : nullptr);
+    msaa_textures.push_back(
+        render_target.GetColorAttachments().find(0u)->second.texture);
+  }
+
+  for (auto i = 1; i < 3; i++) {
+    EXPECT_EQ(msaa_textures[i - 1], msaa_textures[i]);
+    EXPECT_EQ(depth_stencil_textures[i - 1], depth_stencil_textures[i]);
+  }
+
+  // After each images has been acquired once and the render pass presented,
+  // each should have a cached framebuffer and render pass.
+
+  std::vector<SharedHandleVK<vk::Framebuffer>> framebuffers;
+  std::vector<SharedHandleVK<vk::RenderPass>> render_passes;
+  for (auto i = 0u; i < 3u; i++) {
+    auto drawable = swapchain->AcquireNextDrawable();
+    RenderTarget render_target = drawable->GetTargetRenderPassDescriptor();
+
+    auto texture = render_target.GetRenderTargetTexture();
+    auto& texture_vk = TextureVK::Cast(*texture);
+
+    EXPECT_NE(texture_vk.GetCachedFramebuffer(), nullptr);
+    EXPECT_NE(texture_vk.GetCachedRenderPass(), nullptr);
+    framebuffers.push_back(texture_vk.GetCachedFramebuffer());
+    render_passes.push_back(texture_vk.GetCachedRenderPass());
+  }
+
+  // Iterate through once more to verify render passes and framebuffers are
+  // unchanged.
+  for (auto i = 0u; i < 3u; i++) {
+    auto drawable = swapchain->AcquireNextDrawable();
+    RenderTarget render_target = drawable->GetTargetRenderPassDescriptor();
+
+    auto texture = render_target.GetRenderTargetTexture();
+    auto& texture_vk = TextureVK::Cast(*texture);
+
+    EXPECT_EQ(texture_vk.GetCachedFramebuffer(), framebuffers[i]);
+    EXPECT_EQ(texture_vk.GetCachedRenderPass(), render_passes[i]);
+  }
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/texture_source_vk.cc b/impeller/renderer/backend/vulkan/texture_source_vk.cc
new file mode 100644
index 0000000000000000000000000000000000000000..7fdf5caf924be5d2ef329a81a6c66b9f2a2401e3
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/texture_source_vk.cc
@@ -0,0 +1,83 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/backend/vulkan/texture_source_vk.h"
+
+namespace impeller {
+
+TextureSourceVK::TextureSourceVK(TextureDescriptor desc) : desc_(desc) {}
+
+TextureSourceVK::~TextureSourceVK() = default;
+
+const TextureDescriptor& TextureSourceVK::GetTextureDescriptor() const {
+  return desc_;
+}
+
+std::shared_ptr<YUVConversionVK> TextureSourceVK::GetYUVConversion() const {
+  return nullptr;
+}
+
+vk::ImageLayout TextureSourceVK::GetLayout() const {
+  ReaderLock lock(layout_mutex_);
+  return layout_;
+}
+
+vk::ImageLayout TextureSourceVK::SetLayoutWithoutEncoding(
+    vk::ImageLayout layout) const {
+  WriterLock lock(layout_mutex_);
+  const auto old_layout = layout_;
+  layout_ = layout;
+  return old_layout;
+}
+
+fml::Status TextureSourceVK::SetLayout(const BarrierVK& barrier) const {
+  const auto old_layout = SetLayoutWithoutEncoding(barrier.new_layout);
+  if (barrier.new_layout == old_layout) {
+    return {};
+  }
+
+  vk::ImageMemoryBarrier image_barrier;
+  image_barrier.srcAccessMask = barrier.src_access;
+  image_barrier.dstAccessMask = barrier.dst_access;
+  image_barrier.oldLayout = old_layout;
+  image_barrier.newLayout = barrier.new_layout;
+  image_barrier.image = GetImage();
+  image_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+  image_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+  image_barrier.subresourceRange.aspectMask = ToImageAspectFlags(desc_.format);
+  image_barrier.subresourceRange.baseMipLevel = 0u;
+  image_barrier.subresourceRange.levelCount = desc_.mip_count;
+  image_barrier.subresourceRange.baseArrayLayer = 0u;
+  image_barrier.subresourceRange.layerCount = ToArrayLayerCount(desc_.type);
+
+  barrier.cmd_buffer.pipelineBarrier(barrier.src_stage,  // src stage
+                                     barrier.dst_stage,  // dst stage
+                                     {},                 // dependency flags
+                                     nullptr,            // memory barriers
+                                     nullptr,            // buffer barriers
+                                     image_barrier       // image barriers
+  );
+
+  return {};
+}
+
+void TextureSourceVK::SetCachedFramebuffer(
+    const SharedHandleVK<vk::Framebuffer>& framebuffer) {
+  framebuffer_ = framebuffer;
+}
+
+void TextureSourceVK::SetCachedRenderPass(
+    const SharedHandleVK<vk::RenderPass>& render_pass) {
+  render_pass_ = render_pass;
+}
+
+SharedHandleVK<vk::Framebuffer> TextureSourceVK::GetCachedFramebuffer() const {
+  return framebuffer_;
+}
+
+SharedHandleVK<vk::RenderPass> TextureSourceVK::GetCachedRenderPass() const {
+  return render_pass_;
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/texture_source_vk.h b/impeller/renderer/backend/vulkan/texture_source_vk.h
new file mode 100644
index 0000000000000000000000000000000000000000..374907cae13a6636b6b71e06cf4d669449387923
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/texture_source_vk.h
@@ -0,0 +1,169 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_TEXTURE_SOURCE_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_TEXTURE_SOURCE_VK_H_
+
+#include "flutter/fml/status.h"
+#include "impeller/base/thread.h"
+#include "impeller/core/texture_descriptor.h"
+#include "impeller/renderer/backend/vulkan/barrier_vk.h"
+#include "impeller/renderer/backend/vulkan/formats_vk.h"
+#include "impeller/renderer/backend/vulkan/shared_object_vk.h"
+#include "impeller/renderer/backend/vulkan/vk.h"
+#include "impeller/renderer/backend/vulkan/yuv_conversion_vk.h"
+#include "vulkan/vulkan_handles.hpp"
+
+namespace impeller {
+
+//------------------------------------------------------------------------------
+/// @brief      Abstract base class that represents a vkImage and an
+///             vkImageView.
+///
+///             This is intended to be used with an impeller::TextureVK. Example
+///             implementations represent swapchain images, uploaded textures,
+///             Android Hardware Buffer backend textures, etc...
+///
+class TextureSourceVK {
+ public:
+  virtual ~TextureSourceVK();
+
+  //----------------------------------------------------------------------------
+  /// @brief      Gets the texture descriptor for this image source.
+  ///
+  /// @warning    Texture descriptors from texture sources whose capabilities
+  ///             are a superset of those that can be expressed with Vulkan
+  ///             (like Android Hardware Buffer) are inferred. Stuff like size,
+  ///             mip-counts, types is reliable. So use these descriptors as
+  ///             advisory. Creating copies of texture sources from these
+  ///             descriptors is usually not possible and  depends on the
+  ///             allocator used.
+  ///
+  /// @return     The texture descriptor.
+  ///
+  const TextureDescriptor& GetTextureDescriptor() const;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Get the image handle for this texture source.
+  ///
+  /// @return     The image.
+  ///
+  virtual vk::Image GetImage() const = 0;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Retrieve the image view used for sampling/blitting/compute
+  ///             with this texture source.
+  ///
+  /// @return     The image view.
+  ///
+  virtual vk::ImageView GetImageView() const = 0;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Retrieve the image view used for render target attachments
+  ///             with this texture source.
+  ///
+  ///             ImageViews used as render target attachments cannot have any
+  ///             mip levels. In cases where we want to generate mipmaps with
+  ///             the result of this texture, we need to create multiple image
+  ///             views.
+  ///
+  /// @return     The render target view.
+  ///
+  virtual vk::ImageView GetRenderTargetView() const = 0;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Encodes the layout transition `barrier` to
+  ///             `barrier.cmd_buffer` for the image.
+  ///
+  ///             The transition is from the layout stored via
+  ///             `SetLayoutWithoutEncoding` to `barrier.new_layout`.
+  ///
+  /// @param[in]  barrier  The barrier.
+  ///
+  /// @return     If the layout transition was successfully made.
+  ///
+  fml::Status SetLayout(const BarrierVK& barrier) const;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Store the layout of the image.
+  ///
+  ///             This just is bookkeeping on the CPU, to actually set the
+  ///             layout use `SetLayout`.
+  ///
+  /// @param[in]  layout  The new layout.
+  ///
+  /// @return     The old layout.
+  ///
+  vk::ImageLayout SetLayoutWithoutEncoding(vk::ImageLayout layout) const;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Get the last layout assigned to the TextureSourceVK.
+  ///
+  ///             This value is synchronized with the GPU via SetLayout so it
+  ///             may not reflect the actual layout.
+  ///
+  /// @return     The last known layout of the texture source.
+  ///
+  vk::ImageLayout GetLayout() const;
+
+  //----------------------------------------------------------------------------
+  /// @brief      When sampling from textures whose formats are not known to
+  ///             Vulkan, a custom conversion is necessary to setup custom
+  ///             samplers. This accessor provides this conversion if one is
+  ///             present. Most texture source have none.
+  ///
+  /// @return     The sampler conversion.
+  ///
+  virtual std::shared_ptr<YUVConversionVK> GetYUVConversion() const;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Determines if swapchain image. That is, an image used as the
+  ///             root render target.
+  ///
+  /// @return     Whether or not this is a swapchain image.
+  ///
+  virtual bool IsSwapchainImage() const = 0;
+
+  // These methods should only be used by render_pass_vk.h
+
+  /// Store the last framebuffer object used with this texture.
+  ///
+  /// This field is only set if this texture is used as the resolve texture
+  /// of a render pass. By construction, this framebuffer should be compatible
+  /// with any future render passes.
+  void SetCachedFramebuffer(const SharedHandleVK<vk::Framebuffer>& framebuffer);
+
+  /// Store the last render pass object used with this texture.
+  ///
+  /// This field is only set if this texture is used as the resolve texture
+  /// of a render pass. By construction, this framebuffer should be compatible
+  /// with any future render passes.
+  void SetCachedRenderPass(const SharedHandleVK<vk::RenderPass>& render_pass);
+
+  /// Retrieve the last framebuffer object used with this texture.
+  ///
+  /// May be nullptr if no previous framebuffer existed.
+  SharedHandleVK<vk::Framebuffer> GetCachedFramebuffer() const;
+
+  /// Retrieve the last render pass object used with this texture.
+  ///
+  /// May be nullptr if no previous render pass existed.
+  SharedHandleVK<vk::RenderPass> GetCachedRenderPass() const;
+
+ protected:
+  const TextureDescriptor desc_;
+
+  explicit TextureSourceVK(TextureDescriptor desc);
+
+ private:
+  SharedHandleVK<vk::Framebuffer> framebuffer_;
+  SharedHandleVK<vk::RenderPass> render_pass_;
+  mutable RWMutex layout_mutex_;
+  mutable vk::ImageLayout layout_ IPLR_GUARDED_BY(layout_mutex_) =
+      vk::ImageLayout::eUndefined;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_TEXTURE_SOURCE_VK_H_
diff --git a/impeller/renderer/backend/vulkan/texture_vk.cc b/impeller/renderer/backend/vulkan/texture_vk.cc
index 4faa15f3ea1d83e1b5a09c220de832d5a575449e..e34bb89e76ba6c9f606152a45a661c87c2972a90 100644
--- a/impeller/renderer/backend/vulkan/texture_vk.cc
+++ b/impeller/renderer/backend/vulkan/texture_vk.cc
@@ -4,35 +4,34 @@
 
 #include "impeller/renderer/backend/vulkan/texture_vk.h"
 
+#include "impeller/renderer/backend/vulkan/command_buffer_vk.h"
+#include "impeller/renderer/backend/vulkan/command_encoder_vk.h"
+#include "impeller/renderer/backend/vulkan/formats_vk.h"
+#include "impeller/renderer/backend/vulkan/sampler_vk.h"
+
 namespace impeller {
 
-TextureVK::TextureVK(TextureDescriptor desc,
-                     ContextVK* context,
-                     std::unique_ptr<TextureInfoVK> texture_info)
-    : Texture(desc),
-      context_(context),
-      texture_info_(std::move(texture_info)) {}
-
-TextureVK::~TextureVK() {
-  if (!IsWrapped() && IsValid()) {
-    const auto& texture = texture_info_->allocated_texture;
-    vmaDestroyImage(*texture.backing_allocation.allocator, texture.image,
-                    texture.backing_allocation.allocation);
-  }
-}
+TextureVK::TextureVK(std::weak_ptr<Context> context,
+                     std::shared_ptr<TextureSourceVK> source)
+    : Texture(source->GetTextureDescriptor()),
+      context_(std::move(context)),
+      source_(std::move(source)) {}
+
+TextureVK::~TextureVK() = default;
 
 void TextureVK::SetLabel(std::string_view label) {
-  context_->SetDebugName(GetImage(), label);
+  auto context = context_.lock();
+  if (!context) {
+    // The context may have died.
+    return;
+  }
+  ContextVK::Cast(*context).SetDebugName(GetImage(), label);
+  ContextVK::Cast(*context).SetDebugName(GetImageView(), label);
 }
 
 bool TextureVK::OnSetContents(const uint8_t* contents,
                               size_t length,
                               size_t slice) {
-  if (IsWrapped()) {
-    FML_LOG(ERROR) << "Cannot set contents of a wrapped texture";
-    return false;
-  }
-
   if (!IsValid() || !contents) {
     return false;
   }
@@ -41,19 +40,93 @@ bool TextureVK::OnSetContents(const uint8_t* contents,
 
   // Out of bounds access.
   if (length != desc.GetByteSizeOfBaseMipLevel()) {
-    VALIDATION_LOG << "illegal to set contents for invalid size";
+    VALIDATION_LOG << "Illegal to set contents for invalid size.";
+    return false;
+  }
+
+  auto context = context_.lock();
+  if (!context) {
+    VALIDATION_LOG << "Context died before setting contents on texture.";
+    return false;
+  }
+
+  auto staging_buffer =
+      context->GetResourceAllocator()->CreateBufferWithCopy(contents, length);
+
+  if (!staging_buffer) {
+    VALIDATION_LOG << "Could not create staging buffer.";
+    return false;
+  }
+
+  auto cmd_buffer = context->CreateCommandBuffer();
+
+  if (!cmd_buffer) {
+    return false;
+  }
+
+  const auto encoder = CommandBufferVK::Cast(*cmd_buffer).GetEncoder();
+
+  if (!encoder->Track(staging_buffer) || !encoder->Track(source_)) {
     return false;
   }
 
-  // currently we are only supporting 2d textures, no cube textures etc.
-  auto mapping = texture_info_->allocated_texture.staging_buffer.GetMapping();
+  const auto& vk_cmd_buffer = encoder->GetCommandBuffer();
 
-  if (mapping) {
-    memcpy(mapping, contents, length);
-    return true;
-  } else {
+  BarrierVK barrier;
+  barrier.cmd_buffer = vk_cmd_buffer;
+  barrier.new_layout = vk::ImageLayout::eTransferDstOptimal;
+  barrier.src_access = {};
+  barrier.src_stage = vk::PipelineStageFlagBits::eTopOfPipe;
+  barrier.dst_access = vk::AccessFlagBits::eTransferWrite;
+  barrier.dst_stage = vk::PipelineStageFlagBits::eTransfer;
+
+  if (!SetLayout(barrier)) {
     return false;
   }
+
+  vk::BufferImageCopy copy;
+  copy.bufferOffset = 0u;
+  copy.bufferRowLength = 0u;    // 0u means tightly packed per spec.
+  copy.bufferImageHeight = 0u;  // 0u means tightly packed per spec.
+  copy.imageOffset.x = 0u;
+  copy.imageOffset.y = 0u;
+  copy.imageOffset.z = 0u;
+  copy.imageExtent.width = desc.size.width;
+  copy.imageExtent.height = desc.size.height;
+  copy.imageExtent.depth = 1u;
+  copy.imageSubresource.aspectMask =
+      ToImageAspectFlags(GetTextureDescriptor().format);
+  copy.imageSubresource.mipLevel = 0u;
+  copy.imageSubresource.baseArrayLayer = slice;
+  copy.imageSubresource.layerCount = 1u;
+
+  vk_cmd_buffer.copyBufferToImage(
+      DeviceBufferVK::Cast(*staging_buffer).GetBuffer(),  // src buffer
+      GetImage(),                                         // dst image
+      barrier.new_layout,                                 // dst image layout
+      1u,                                                 // region count
+      &copy                                               // regions
+  );
+
+  // Transition to shader-read.
+  {
+    BarrierVK barrier;
+    barrier.cmd_buffer = vk_cmd_buffer;
+    barrier.src_access = vk::AccessFlagBits::eColorAttachmentWrite |
+                         vk::AccessFlagBits::eTransferWrite;
+    barrier.src_stage = vk::PipelineStageFlagBits::eColorAttachmentOutput |
+                        vk::PipelineStageFlagBits::eTransfer;
+    barrier.dst_access = vk::AccessFlagBits::eShaderRead;
+    barrier.dst_stage = vk::PipelineStageFlagBits::eFragmentShader;
+
+    barrier.new_layout = vk::ImageLayout::eShaderReadOnlyOptimal;
+
+    if (!SetLayout(barrier)) {
+      return false;
+    }
+  }
+
+  return context->GetCommandQueue()->Submit({cmd_buffer}).ok();
 }
 
 bool TextureVK::OnSetContents(std::shared_ptr<const fml::Mapping> mapping,
@@ -64,61 +137,81 @@ bool TextureVK::OnSetContents(std::shared_ptr<const fml::Mapping> mapping,
 }
 
 bool TextureVK::IsValid() const {
-  switch (texture_info_->backing_type) {
-    case TextureBackingTypeVK::kUnknownType:
-      return false;
-    case TextureBackingTypeVK::kAllocatedTexture:
-      return texture_info_->allocated_texture.image;
-    case TextureBackingTypeVK::kWrappedTexture:
-      return texture_info_->wrapped_texture.swapchain_image;
-  }
+  return !!source_;
 }
 
 ISize TextureVK::GetSize() const {
   return GetTextureDescriptor().size;
 }
 
-TextureInfoVK* TextureVK::GetTextureInfo() const {
-  return texture_info_.get();
+vk::Image TextureVK::GetImage() const {
+  return source_->GetImage();
 }
 
-bool TextureVK::IsWrapped() const {
-  return texture_info_->backing_type == TextureBackingTypeVK::kWrappedTexture;
+vk::ImageView TextureVK::GetImageView() const {
+  return source_->GetImageView();
 }
 
-vk::ImageView TextureVK::GetImageView() const {
-  switch (texture_info_->backing_type) {
-    case TextureBackingTypeVK::kUnknownType:
-      return nullptr;
-    case TextureBackingTypeVK::kAllocatedTexture:
-      return vk::ImageView{texture_info_->allocated_texture.image_view};
-    case TextureBackingTypeVK::kWrappedTexture:
-      return texture_info_->wrapped_texture.swapchain_image->GetImageView();
-  }
+std::shared_ptr<const TextureSourceVK> TextureVK::GetTextureSource() const {
+  return source_;
 }
 
-vk::Image TextureVK::GetImage() const {
-  switch (texture_info_->backing_type) {
-    case TextureBackingTypeVK::kUnknownType:
-      FML_CHECK(false) << "Unknown texture backing type";
-    case TextureBackingTypeVK::kAllocatedTexture:
-      return vk::Image{texture_info_->allocated_texture.image};
-    case TextureBackingTypeVK::kWrappedTexture:
-      return texture_info_->wrapped_texture.swapchain_image->GetImage();
-  }
+bool TextureVK::SetLayout(const BarrierVK& barrier) const {
+  return source_ ? source_->SetLayout(barrier).ok() : false;
+}
+
+vk::ImageLayout TextureVK::SetLayoutWithoutEncoding(
+    vk::ImageLayout layout) const {
+  return source_ ? source_->SetLayoutWithoutEncoding(layout)
+                 : vk::ImageLayout::eUndefined;
+}
+
+vk::ImageLayout TextureVK::GetLayout() const {
+  return source_ ? source_->GetLayout() : vk::ImageLayout::eUndefined;
+}
+
+vk::ImageView TextureVK::GetRenderTargetView() const {
+  return source_->GetRenderTargetView();
 }
 
-vk::Buffer TextureVK::GetStagingBuffer() const {
-  switch (texture_info_->backing_type) {
-    case TextureBackingTypeVK::kUnknownType:
-      FML_CHECK(false) << "Unknown texture backing type";
-      return nullptr;
-    case TextureBackingTypeVK::kAllocatedTexture:
-      return texture_info_->allocated_texture.staging_buffer.GetBufferHandle();
-    case TextureBackingTypeVK::kWrappedTexture:
-      FML_CHECK(false) << "Wrapped textures do not have staging buffers";
-      return nullptr;
+void TextureVK::SetCachedFramebuffer(
+    const SharedHandleVK<vk::Framebuffer>& framebuffer) {
+  source_->SetCachedFramebuffer(framebuffer);
+}
+
+void TextureVK::SetCachedRenderPass(
+    const SharedHandleVK<vk::RenderPass>& render_pass) {
+  source_->SetCachedRenderPass(render_pass);
+}
+
+SharedHandleVK<vk::Framebuffer> TextureVK::GetCachedFramebuffer() const {
+  return source_->GetCachedFramebuffer();
+}
+
+SharedHandleVK<vk::RenderPass> TextureVK::GetCachedRenderPass() const {
+  return source_->GetCachedRenderPass();
+}
+
+void TextureVK::SetMipMapGenerated() {
+  mipmap_generated_ = true;
+}
+
+bool TextureVK::IsSwapchainImage() const {
+  return source_->IsSwapchainImage();
+}
+
+std::shared_ptr<SamplerVK> TextureVK::GetImmutableSamplerVariant(
+    const SamplerVK& sampler) const {
+  if (!source_) {
+    return nullptr;
+  }
+  auto conversion = source_->GetYUVConversion();
+  if (!conversion) {
+    // Most textures don't need a sampler conversion and will go down this path.
+    // Only needed for YUV sampling from external textures.
+    return nullptr;
   }
+  return sampler.CreateVariantForConversion(std::move(conversion));
 }
 
 }  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/texture_vk.h b/impeller/renderer/backend/vulkan/texture_vk.h
index 08dd3769e22d9a42cb3f741bb62f990a01e5c35b..fe243dc3e6f3138fe577529b5866a1787473c5a5 100644
--- a/impeller/renderer/backend/vulkan/texture_vk.h
+++ b/impeller/renderer/backend/vulkan/texture_vk.h
@@ -2,66 +2,81 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_TEXTURE_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_TEXTURE_VK_H_
 
-#include "flutter/fml/macros.h"
 #include "impeller/base/backend_cast.h"
+#include "impeller/core/texture.h"
 #include "impeller/renderer/backend/vulkan/context_vk.h"
 #include "impeller/renderer/backend/vulkan/device_buffer_vk.h"
-#include "impeller/renderer/backend/vulkan/swapchain_vk.h"
+#include "impeller/renderer/backend/vulkan/formats_vk.h"
+#include "impeller/renderer/backend/vulkan/sampler_vk.h"
+#include "impeller/renderer/backend/vulkan/texture_source_vk.h"
 #include "impeller/renderer/backend/vulkan/vk.h"
-#include "impeller/renderer/texture.h"
 
 namespace impeller {
 
-enum class TextureBackingTypeVK {
-  kUnknownType,
-  kAllocatedTexture,
-  kWrappedTexture,
-};
-
-struct WrappedTextureInfoVK {
-  SwapchainImageVK* swapchain_image = nullptr;
-  uint32_t frame_num = 0;
-};
-
-struct AllocatedTextureInfoVK {
-  DeviceBufferAllocationVK staging_buffer = {};
-  BackingAllocationVK backing_allocation = {};
-  VkImage image = VK_NULL_HANDLE;
-  VkImageView image_view = VK_NULL_HANDLE;
-};
-
-struct TextureInfoVK {
-  TextureBackingTypeVK backing_type;
-  union {
-    WrappedTextureInfoVK wrapped_texture;
-    AllocatedTextureInfoVK allocated_texture;
-  };
-};
-
 class TextureVK final : public Texture, public BackendCast<TextureVK, Texture> {
  public:
-  TextureVK(TextureDescriptor desc,
-            ContextVK* context,
-            std::unique_ptr<TextureInfoVK> texture_info);
+  TextureVK(std::weak_ptr<Context> context,
+            std::shared_ptr<TextureSourceVK> source);
 
   // |Texture|
   ~TextureVK() override;
 
-  bool IsWrapped() const;
-
   vk::Image GetImage() const;
 
   vk::ImageView GetImageView() const;
 
-  vk::Buffer GetStagingBuffer() const;
+  vk::ImageView GetRenderTargetView() const;
+
+  bool SetLayout(const BarrierVK& barrier) const;
+
+  vk::ImageLayout SetLayoutWithoutEncoding(vk::ImageLayout layout) const;
+
+  vk::ImageLayout GetLayout() const;
+
+  std::shared_ptr<const TextureSourceVK> GetTextureSource() const;
 
-  TextureInfoVK* GetTextureInfo() const;
+  // |Texture|
+  ISize GetSize() const override;
+
+  void SetMipMapGenerated();
+
+  bool IsSwapchainImage() const;
+
+  std::shared_ptr<SamplerVK> GetImmutableSamplerVariant(
+      const SamplerVK& sampler) const;
+
+  // These methods should only be used by render_pass_vk.h
+
+  /// Store the last framebuffer object used with this texture.
+  ///
+  /// This field is only set if this texture is used as the resolve texture
+  /// of a render pass. By construction, this framebuffer should be compatible
+  /// with any future render passes.
+  void SetCachedFramebuffer(const SharedHandleVK<vk::Framebuffer>& framebuffer);
+
+  /// Store the last render pass object used with this texture.
+  ///
+  /// This field is only set if this texture is used as the resolve texture
+  /// of a render pass. By construction, this framebuffer should be compatible
+  /// with any future render passes.
+  void SetCachedRenderPass(const SharedHandleVK<vk::RenderPass>& render_pass);
+
+  /// Retrieve the last framebuffer object used with this texture.
+  ///
+  /// May be nullptr if no previous framebuffer existed.
+  SharedHandleVK<vk::Framebuffer> GetCachedFramebuffer() const;
+
+  /// Retrieve the last render pass object used with this texture.
+  ///
+  /// May be nullptr if no previous render pass existed.
+  SharedHandleVK<vk::RenderPass> GetCachedRenderPass() const;
 
  private:
-  ContextVK* context_;
-  std::unique_ptr<TextureInfoVK> texture_info_;
+  std::weak_ptr<Context> context_;
+  std::shared_ptr<TextureSourceVK> source_;
 
   // |Texture|
   void SetLabel(std::string_view label) override;
@@ -78,10 +93,11 @@ class TextureVK final : public Texture, public BackendCast<TextureVK, Texture> {
   // |Texture|
   bool IsValid() const override;
 
-  // |Texture|
-  ISize GetSize() const override;
+  TextureVK(const TextureVK&) = delete;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(TextureVK);
+  TextureVK& operator=(const TextureVK&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_TEXTURE_VK_H_
diff --git a/impeller/renderer/backend/vulkan/tracked_objects_vk.cc b/impeller/renderer/backend/vulkan/tracked_objects_vk.cc
new file mode 100644
index 0000000000000000000000000000000000000000..47b8477309dcb5f3d00e576afeef9f1ec21bb099
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/tracked_objects_vk.cc
@@ -0,0 +1,88 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/backend/vulkan/tracked_objects_vk.h"
+
+#include "impeller/renderer/backend/vulkan/gpu_tracer_vk.h"
+
+namespace impeller {
+
+TrackedObjectsVK::TrackedObjectsVK(
+    const std::weak_ptr<const ContextVK>& context,
+    const std::shared_ptr<CommandPoolVK>& pool,
+    std::unique_ptr<GPUProbe> probe)
+    : desc_pool_(context), probe_(std::move(probe)) {
+  if (!pool) {
+    return;
+  }
+  auto buffer = pool->CreateCommandBuffer();
+  if (!buffer) {
+    return;
+  }
+  pool_ = pool;
+  buffer_ = std::move(buffer);
+  is_valid_ = true;
+}
+
+TrackedObjectsVK::~TrackedObjectsVK() {
+  if (!buffer_) {
+    return;
+  }
+  pool_->CollectCommandBuffer(std::move(buffer_));
+}
+
+bool TrackedObjectsVK::IsValid() const {
+  return is_valid_;
+}
+
+void TrackedObjectsVK::Track(std::shared_ptr<SharedObjectVK> object) {
+  if (!object) {
+    return;
+  }
+  tracked_objects_.insert(std::move(object));
+}
+
+void TrackedObjectsVK::Track(std::shared_ptr<const DeviceBuffer> buffer) {
+  if (!buffer) {
+    return;
+  }
+  tracked_buffers_.insert(std::move(buffer));
+}
+
+bool TrackedObjectsVK::IsTracking(
+    const std::shared_ptr<const DeviceBuffer>& buffer) const {
+  if (!buffer) {
+    return false;
+  }
+  return tracked_buffers_.find(buffer) != tracked_buffers_.end();
+}
+
+void TrackedObjectsVK::Track(std::shared_ptr<const TextureSourceVK> texture) {
+  if (!texture) {
+    return;
+  }
+  tracked_textures_.insert(std::move(texture));
+}
+
+bool TrackedObjectsVK::IsTracking(
+    const std::shared_ptr<const TextureSourceVK>& texture) const {
+  if (!texture) {
+    return false;
+  }
+  return tracked_textures_.find(texture) != tracked_textures_.end();
+}
+
+vk::CommandBuffer TrackedObjectsVK::GetCommandBuffer() const {
+  return *buffer_;
+}
+
+DescriptorPoolVK& TrackedObjectsVK::GetDescriptorPool() {
+  return desc_pool_;
+}
+
+GPUProbe& TrackedObjectsVK::GetGPUProbe() const {
+  return *probe_.get();
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/tracked_objects_vk.h b/impeller/renderer/backend/vulkan/tracked_objects_vk.h
new file mode 100644
index 0000000000000000000000000000000000000000..687b085b53708390643e5681206cf0b3b5140afd
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/tracked_objects_vk.h
@@ -0,0 +1,61 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_TRACKED_OBJECTS_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_TRACKED_OBJECTS_VK_H_
+
+#include <memory>
+
+#include "impeller/renderer/backend/vulkan/command_encoder_vk.h"
+#include "impeller/renderer/backend/vulkan/context_vk.h"
+
+namespace impeller {
+
+/// @brief A per-frame object used to track resource lifetimes and allocate
+///        command buffers and descriptor sets.
+class TrackedObjectsVK {
+ public:
+  explicit TrackedObjectsVK(const std::weak_ptr<const ContextVK>& context,
+                            const std::shared_ptr<CommandPoolVK>& pool,
+                            std::unique_ptr<GPUProbe> probe);
+
+  ~TrackedObjectsVK();
+
+  bool IsValid() const;
+
+  void Track(std::shared_ptr<SharedObjectVK> object);
+
+  void Track(std::shared_ptr<const DeviceBuffer> buffer);
+
+  bool IsTracking(const std::shared_ptr<const DeviceBuffer>& buffer) const;
+
+  void Track(std::shared_ptr<const TextureSourceVK> texture);
+
+  bool IsTracking(const std::shared_ptr<const TextureSourceVK>& texture) const;
+
+  vk::CommandBuffer GetCommandBuffer() const;
+
+  DescriptorPoolVK& GetDescriptorPool();
+
+  GPUProbe& GetGPUProbe() const;
+
+ private:
+  DescriptorPoolVK desc_pool_;
+  // `shared_ptr` since command buffers have a link to the command pool.
+  std::shared_ptr<CommandPoolVK> pool_;
+  vk::UniqueCommandBuffer buffer_;
+  std::set<std::shared_ptr<SharedObjectVK>> tracked_objects_;
+  std::set<std::shared_ptr<const DeviceBuffer>> tracked_buffers_;
+  std::set<std::shared_ptr<const TextureSourceVK>> tracked_textures_;
+  std::unique_ptr<GPUProbe> probe_;
+  bool is_valid_ = false;
+
+  TrackedObjectsVK(const TrackedObjectsVK&) = delete;
+
+  TrackedObjectsVK& operator=(const TrackedObjectsVK&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_TRACKED_OBJECTS_VK_H_
diff --git a/impeller/renderer/backend/vulkan/vertex_descriptor_vk.cc b/impeller/renderer/backend/vulkan/vertex_descriptor_vk.cc
index 7c18a245a8b85089389becce3f13674f3e564248..83c344f555484529c57755d5a100d5fde1c8989b 100644
--- a/impeller/renderer/backend/vulkan/vertex_descriptor_vk.cc
+++ b/impeller/renderer/backend/vulkan/vertex_descriptor_vk.cc
@@ -4,6 +4,8 @@
 
 #include "impeller/renderer/backend/vulkan/vertex_descriptor_vk.h"
 
+#include <cstdint>
+
 namespace impeller {
 
 vk::Format ToVertexDescriptorFormat(const ShaderStageIOSlot& input) {
diff --git a/impeller/renderer/backend/vulkan/vertex_descriptor_vk.h b/impeller/renderer/backend/vulkan/vertex_descriptor_vk.h
index 519dd2e7f3a03446a63d89add01bafd8d2be4053..1768211fbeac4079bd2380e5a6641797feaad8d4 100644
--- a/impeller/renderer/backend/vulkan/vertex_descriptor_vk.h
+++ b/impeller/renderer/backend/vulkan/vertex_descriptor_vk.h
@@ -2,14 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_VERTEX_DESCRIPTOR_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_VERTEX_DESCRIPTOR_VK_H_
 
 #include "flutter/fml/macros.h"
+#include "impeller/core/shader_types.h"
 #include "impeller/renderer/backend/vulkan/vk.h"
-#include "impeller/renderer/shader_types.h"
 
 namespace impeller {
 
 vk::Format ToVertexDescriptorFormat(const ShaderStageIOSlot& input);
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_VERTEX_DESCRIPTOR_VK_H_
diff --git a/impeller/renderer/backend/vulkan/vk.h b/impeller/renderer/backend/vulkan/vk.h
index a62d94495c04109d5bee4e10a283ab124a6c0a65..ea992ce0e2d9d655061da8e7cabe75c353d06d72 100644
--- a/impeller/renderer/backend/vulkan/vk.h
+++ b/impeller/renderer/backend/vulkan/vk.h
@@ -2,13 +2,58 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_VK_H_
 
+#include "flutter/fml/build_config.h"
 #include "flutter/fml/logging.h"
-#include "impeller/base/validation.h"
 
 #define VK_NO_PROTOTYPES
 
+#if FML_OS_IOS
+
+// #ifndef VK_USE_PLATFORM_IOS_MVK
+// #define VK_USE_PLATFORM_IOS_MVK
+// #endif  // VK_USE_PLATFORM_IOS_MVK
+
+#ifndef VK_USE_PLATFORM_METAL_EXT
+#define VK_USE_PLATFORM_METAL_EXT
+#endif  // VK_USE_PLATFORM_METAL_EXT
+
+#elif FML_OS_MACOSX
+
+// #ifndef VK_USE_PLATFORM_MACOS_MVK
+// #define VK_USE_PLATFORM_MACOS_MVK
+// #endif  // VK_USE_PLATFORM_MACOS_MVK
+
+#ifndef VK_USE_PLATFORM_METAL_EXT
+#define VK_USE_PLATFORM_METAL_EXT
+#endif  // VK_USE_PLATFORM_METAL_EXT
+
+#elif FML_OS_ANDROID
+
+#ifndef VK_USE_PLATFORM_ANDROID_KHR
+#define VK_USE_PLATFORM_ANDROID_KHR
+#endif  // VK_USE_PLATFORM_ANDROID_KHR
+
+#elif FML_OS_LINUX
+
+// Nothing for now.
+
+#elif FML_OS_WIN
+
+#ifndef VK_USE_PLATFORM_WIN32_KHR
+#define VK_USE_PLATFORM_WIN32_KHR
+#endif  // VK_USE_PLATFORM_WIN32_KHR
+
+#elif OS_FUCHSIA
+
+#ifndef VK_USE_PLATFORM_ANDROID_KHR
+#define VK_USE_PLATFORM_ANDROID_KHR
+#endif  // VK_USE_PLATFORM_ANDROID_KHR
+
+#endif  // FML_OS
+
 #if !defined(NDEBUG)
 #define VULKAN_HPP_ASSERT FML_CHECK
 #else
@@ -19,20 +64,10 @@
 #define VULKAN_HPP_NAMESPACE impeller::vk
 #define VULKAN_HPP_ASSERT_ON_RESULT(ignored) \
   { [[maybe_unused]] auto res = (ignored); }
-#include "vulkan/vulkan.hpp"
-
-static_assert(VK_HEADER_VERSION >= 215,
-              "Vulkan headers are must not be too old.");
-
-#include "flutter/flutter_vma/flutter_vma.h"
-
-namespace impeller {
+#define VULKAN_HPP_NO_EXCEPTIONS
 
-const uint32_t kMaxFramesInFlight = 2;
+#include "vulkan/vulkan.hpp"  // IWYU pragma: keep.
 
-struct QueueVK {
-  size_t family = 0;
-  size_t index = 0;
-};
+static_assert(VK_HEADER_VERSION >= 215, "Vulkan headers must not be too old.");
 
-}  // namespace impeller
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_VK_H_
diff --git a/impeller/renderer/texture_descriptor.cc b/impeller/renderer/backend/vulkan/vma.cc
similarity index 81%
rename from impeller/renderer/texture_descriptor.cc
rename to impeller/renderer/backend/vulkan/vma.cc
index 190f4482ef1365f565e858e1e99eac0de6ecbe48..5c28daa885f42749c709a008d2707949129b5ed5 100644
--- a/impeller/renderer/texture_descriptor.cc
+++ b/impeller/renderer/backend/vulkan/vma.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/renderer/texture_descriptor.h"
+#include "impeller/renderer/backend/vulkan/vma.h"
 
 namespace impeller {
 
diff --git a/impeller/renderer/backend/vulkan/vma.h b/impeller/renderer/backend/vulkan/vma.h
new file mode 100644
index 0000000000000000000000000000000000000000..6787bee93c5766a8a8893679543091c70345363d
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/vma.h
@@ -0,0 +1,137 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_VMA_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_VMA_H_
+
+#include "flutter/flutter_vma/flutter_vma.h"
+#include "flutter/fml/trace_event.h"
+#include "flutter/fml/unique_object.h"
+#include "impeller/renderer/backend/vulkan/vk.h"
+
+namespace impeller {
+
+// -----------------------------------------------------------------------------
+// Unique handles to VMA allocators.
+// -----------------------------------------------------------------------------
+struct AllocatorVMATraits {
+  static VmaAllocator InvalidValue() { return {}; }
+
+  static bool IsValid(const VmaAllocator& value) {
+    return value != InvalidValue();
+  }
+
+  static void Free(VmaAllocator allocator) {
+    TRACE_EVENT0("impeller", "DestroyAllocator");
+    ::vmaDestroyAllocator(allocator);
+  }
+};
+
+using UniqueAllocatorVMA = fml::UniqueObject<VmaAllocator, AllocatorVMATraits>;
+
+// -----------------------------------------------------------------------------
+// Unique handles to VMA pools.
+// -----------------------------------------------------------------------------
+
+struct PoolVMA {
+  VmaAllocator allocator = {};
+  VmaPool pool = {};
+
+  constexpr bool operator==(const PoolVMA& other) const {
+    return allocator == other.allocator && pool == other.pool;
+  }
+
+  constexpr bool operator!=(const PoolVMA& other) const {
+    return !(*this == other);
+  }
+};
+
+struct PoolVMATraits {
+  static PoolVMA InvalidValue() { return {}; }
+
+  static bool IsValid(const PoolVMA& value) {
+    return value.allocator != VmaAllocator{};
+  }
+
+  static void Free(const PoolVMA& pool) {
+    TRACE_EVENT0("impeller", "DestroyPool");
+    ::vmaDestroyPool(pool.allocator, pool.pool);
+  }
+};
+
+using UniquePoolVMA = fml::UniqueObject<PoolVMA, PoolVMATraits>;
+
+// -----------------------------------------------------------------------------
+// Unique handles to VMA buffers.
+// -----------------------------------------------------------------------------
+
+struct BufferVMA {
+  VmaAllocator allocator = {};
+  VmaAllocation allocation = {};
+  vk::Buffer buffer = {};
+
+  constexpr bool operator==(const BufferVMA& other) const {
+    return allocator == other.allocator && allocation == other.allocation &&
+           buffer == other.buffer;
+  }
+
+  constexpr bool operator!=(const BufferVMA& other) const {
+    return !(*this == other);
+  }
+};
+
+struct BufferVMATraits {
+  static BufferVMA InvalidValue() { return {}; }
+
+  static bool IsValid(const BufferVMA& value) {
+    return value.allocator != VmaAllocator{};
+  }
+
+  static void Free(const BufferVMA& buffer) {
+    TRACE_EVENT0("impeller", "DestroyBuffer");
+    ::vmaDestroyBuffer(buffer.allocator, static_cast<VkBuffer>(buffer.buffer),
+                       buffer.allocation);
+  }
+};
+
+using UniqueBufferVMA = fml::UniqueObject<BufferVMA, BufferVMATraits>;
+
+// -----------------------------------------------------------------------------
+// Unique handles to VMA images.
+// -----------------------------------------------------------------------------
+
+struct ImageVMA {
+  VmaAllocator allocator = {};
+  VmaAllocation allocation = {};
+  vk::Image image = {};
+
+  constexpr bool operator==(const ImageVMA& other) const {
+    return allocator == other.allocator && allocation == other.allocation &&
+           image == other.image;
+  }
+
+  constexpr bool operator!=(const ImageVMA& other) const {
+    return !(*this == other);
+  }
+};
+
+struct ImageVMATraits {
+  static ImageVMA InvalidValue() { return {}; }
+
+  static bool IsValid(const ImageVMA& value) {
+    return value.allocator != VmaAllocator{};
+  }
+
+  static void Free(const ImageVMA& image) {
+    TRACE_EVENT0("impeller", "DestroyImage");
+    ::vmaDestroyImage(image.allocator, static_cast<VkImage>(image.image),
+                      image.allocation);
+  }
+};
+
+using UniqueImageVMA = fml::UniqueObject<ImageVMA, ImageVMATraits>;
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_VMA_H_
diff --git a/impeller/renderer/backend/vulkan/yuv_conversion_library_vk.cc b/impeller/renderer/backend/vulkan/yuv_conversion_library_vk.cc
new file mode 100644
index 0000000000000000000000000000000000000000..4d42de5ca0f48bc9fdafafd19ba5b6f0ecb18307
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/yuv_conversion_library_vk.cc
@@ -0,0 +1,34 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/backend/vulkan/yuv_conversion_library_vk.h"
+
+#include "impeller/base/validation.h"
+#include "impeller/renderer/backend/vulkan/device_holder_vk.h"
+
+namespace impeller {
+
+YUVConversionLibraryVK::YUVConversionLibraryVK(
+    std::weak_ptr<DeviceHolderVK> device_holder)
+    : device_holder_(std::move(device_holder)) {}
+
+YUVConversionLibraryVK::~YUVConversionLibraryVK() = default;
+
+std::shared_ptr<YUVConversionVK> YUVConversionLibraryVK::GetConversion(
+    const YUVConversionDescriptorVK& desc) {
+  Lock lock(conversions_mutex_);
+  auto found = conversions_.find(desc);
+  if (found != conversions_.end()) {
+    return found->second;
+  }
+  auto device_holder = device_holder_.lock();
+  if (!device_holder) {
+    VALIDATION_LOG << "Context loss during creation of YUV conversion.";
+    return nullptr;
+  }
+  return (conversions_[desc] = std::shared_ptr<YUVConversionVK>(
+              new YUVConversionVK(device_holder->GetDevice(), desc)));
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/yuv_conversion_library_vk.h b/impeller/renderer/backend/vulkan/yuv_conversion_library_vk.h
new file mode 100644
index 0000000000000000000000000000000000000000..755ffccaa581885ccdc69b0eedddd3d4df6d75f4
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/yuv_conversion_library_vk.h
@@ -0,0 +1,65 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_YUV_CONVERSION_LIBRARY_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_YUV_CONVERSION_LIBRARY_VK_H_
+
+#include "impeller/renderer/backend/vulkan/yuv_conversion_vk.h"
+
+namespace impeller {
+
+class DeviceHolderVK;
+
+//------------------------------------------------------------------------------
+/// @brief      Due the way the Vulkan spec. treats "identically defined"
+///             conversions, creating two conversion with identical descriptors,
+///             using one with the image and the other with the sampler, is
+///             invalid use.
+///
+///             A conversion library hashes and caches identical descriptors to
+///             de-duplicate conversions.
+///
+///             There can only be one conversion library (the constructor is
+///             private to force this) and it found in the context.
+///
+class YUVConversionLibraryVK {
+ public:
+  ~YUVConversionLibraryVK();
+
+  YUVConversionLibraryVK(const YUVConversionLibraryVK&) = delete;
+
+  YUVConversionLibraryVK& operator=(const YUVConversionLibraryVK&) = delete;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Get a conversion for the given descriptor. If there is already
+  ///             a conversion created for an equivalent descriptor, a reference
+  ///             to that descriptor is returned instead.
+  ///
+  /// @param[in]  desc  The descriptor.
+  ///
+  /// @return     The conversion. A previously created conversion if one was
+  ///             present and a new one if not. A newly created conversion is
+  ///             cached for subsequent accesses.
+  ///
+  std::shared_ptr<YUVConversionVK> GetConversion(
+      const YUVConversionDescriptorVK& chain);
+
+ private:
+  friend class ContextVK;
+
+  using ConversionsMap = std::unordered_map<YUVConversionDescriptorVK,
+                                            std::shared_ptr<YUVConversionVK>,
+                                            YUVConversionDescriptorVKHash,
+                                            YUVConversionDescriptorVKEqual>;
+
+  std::weak_ptr<DeviceHolderVK> device_holder_;
+  Mutex conversions_mutex_;
+  ConversionsMap conversions_ IPLR_GUARDED_BY(conversions_mutex_);
+
+  explicit YUVConversionLibraryVK(std::weak_ptr<DeviceHolderVK> device_holder);
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_YUV_CONVERSION_LIBRARY_VK_H_
diff --git a/impeller/renderer/backend/vulkan/yuv_conversion_vk.cc b/impeller/renderer/backend/vulkan/yuv_conversion_vk.cc
new file mode 100644
index 0000000000000000000000000000000000000000..9c3aa6ed72c3f7b0f4973fbcbdc4eedbdb779fb7
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/yuv_conversion_vk.cc
@@ -0,0 +1,119 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/backend/vulkan/yuv_conversion_vk.h"
+
+#include "flutter/fml/hash_combine.h"
+#include "impeller/base/validation.h"
+#include "impeller/renderer/backend/vulkan/device_holder_vk.h"
+#include "impeller/renderer/backend/vulkan/sampler_vk.h"
+
+namespace impeller {
+
+YUVConversionVK::YUVConversionVK(const vk::Device& device,
+                                 const YUVConversionDescriptorVK& chain)
+    : chain_(chain) {
+  auto conversion = device.createSamplerYcbcrConversionUnique(chain_.get());
+  if (conversion.result != vk::Result::eSuccess) {
+    VALIDATION_LOG << "Could not create YUV conversion: "
+                   << vk::to_string(conversion.result);
+    return;
+  }
+  conversion_ = std::move(conversion.value);
+}
+
+YUVConversionVK::~YUVConversionVK() = default;
+
+bool YUVConversionVK::IsValid() const {
+  return conversion_ && !!conversion_.get();
+}
+
+vk::SamplerYcbcrConversion YUVConversionVK::GetConversion() const {
+  return conversion_ ? conversion_.get()
+                     : static_cast<vk::SamplerYcbcrConversion>(VK_NULL_HANDLE);
+}
+
+const YUVConversionDescriptorVK& YUVConversionVK::GetDescriptor() const {
+  return chain_;
+}
+
+std::size_t YUVConversionDescriptorVKHash::operator()(
+    const YUVConversionDescriptorVK& desc) const {
+  // Hashers in Vulkan HPP hash the pNext member which isn't what we want for
+  // these to be stable.
+  const auto& conv = desc.get();
+
+  std::size_t hash = fml::HashCombine(conv.format,                      //
+                                      conv.ycbcrModel,                  //
+                                      conv.ycbcrRange,                  //
+                                      conv.components.r,                //
+                                      conv.components.g,                //
+                                      conv.components.b,                //
+                                      conv.components.a,                //
+                                      conv.xChromaOffset,               //
+                                      conv.yChromaOffset,               //
+                                      conv.chromaFilter,                //
+                                      conv.forceExplicitReconstruction  //
+  );
+#if FML_OS_ANDROID
+  const auto external_format = desc.get<vk::ExternalFormatANDROID>();
+  fml::HashCombineSeed(hash, external_format.externalFormat);
+#endif  // FML_OS_ANDROID
+
+  return hash;
+};
+
+bool YUVConversionDescriptorVKEqual::operator()(
+    const YUVConversionDescriptorVK& lhs_desc,
+    const YUVConversionDescriptorVK& rhs_desc) const {
+  // Default equality checks in Vulkan HPP checks pNext member members by
+  // pointer which isn't what we want.
+  {
+    const auto& lhs = lhs_desc.get();
+    const auto& rhs = rhs_desc.get();
+
+    if (lhs.format != rhs.format ||                                         //
+        lhs.ycbcrModel != rhs.ycbcrModel ||                                 //
+        lhs.ycbcrRange != rhs.ycbcrRange ||                                 //
+        lhs.components.r != rhs.components.r ||                             //
+        lhs.components.g != rhs.components.g ||                             //
+        lhs.components.b != rhs.components.b ||                             //
+        lhs.components.a != rhs.components.a ||                             //
+        lhs.xChromaOffset != rhs.xChromaOffset ||                           //
+        lhs.yChromaOffset != rhs.yChromaOffset ||                           //
+        lhs.chromaFilter != rhs.chromaFilter ||                             //
+        lhs.forceExplicitReconstruction != rhs.forceExplicitReconstruction  //
+    ) {
+      return false;
+    }
+  }
+#if FML_OS_ANDROID
+  {
+    const auto lhs = lhs_desc.get<vk::ExternalFormatANDROID>();
+    const auto rhs = rhs_desc.get<vk::ExternalFormatANDROID>();
+    return lhs.externalFormat == rhs.externalFormat;
+  }
+#else   // FML_OS_ANDROID
+  return true;
+#endif  // FML_OS_ANDROID
+}
+
+ImmutableSamplerKeyVK::ImmutableSamplerKeyVK(const SamplerVK& sampler)
+    : sampler(sampler.GetDescriptor()) {
+  if (const auto& conversion = sampler.GetYUVConversion()) {
+    yuv_conversion = conversion->GetDescriptor();
+  }
+}
+
+bool ImmutableSamplerKeyVK::IsEqual(const ImmutableSamplerKeyVK& other) const {
+  return sampler.IsEqual(other.sampler) &&
+         YUVConversionDescriptorVKEqual{}(yuv_conversion, other.yuv_conversion);
+}
+
+std::size_t ImmutableSamplerKeyVK::GetHash() const {
+  return fml::HashCombine(sampler.GetHash(),
+                          YUVConversionDescriptorVKHash{}(yuv_conversion));
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/yuv_conversion_vk.h b/impeller/renderer/backend/vulkan/yuv_conversion_vk.h
new file mode 100644
index 0000000000000000000000000000000000000000..88c17ec6b9ad3729001c7fa2e7489bacb4be2cdf
--- /dev/null
+++ b/impeller/renderer/backend/vulkan/yuv_conversion_vk.h
@@ -0,0 +1,109 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_YUV_CONVERSION_VK_H_
+#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_YUV_CONVERSION_VK_H_
+
+#include <unordered_map>
+
+#include "flutter/fml/build_config.h"
+#include "impeller/base/comparable.h"
+#include "impeller/base/thread.h"
+#include "impeller/core/sampler.h"
+#include "impeller/renderer/backend/vulkan/sampler_vk.h"
+#include "impeller/renderer/backend/vulkan/shared_object_vk.h"
+#include "impeller/renderer/backend/vulkan/vk.h"
+
+namespace impeller {
+
+//------------------------------------------------------------------------------
+/// A descriptor used to create a new YUV conversion in a conversion library.
+///
+using YUVConversionDescriptorVK =
+    vk::StructureChain<vk::SamplerYcbcrConversionCreateInfo
+#if FML_OS_ANDROID
+                       // For VK_ANDROID_external_memory_android_hardware_buffer
+                       ,
+                       vk::ExternalFormatANDROID
+#endif  // FML_OS_ANDROID
+                       >;
+
+class YUVConversionLibraryVK;
+
+//------------------------------------------------------------------------------
+/// @brief      It is sometimes necessary to deal with formats not native to
+///             Vulkan. In such cases, extra information is necessary to access
+///             images. A YUV conversion object is needed in such instances.
+///
+///             There are usually only a handful of viable conversions in a
+///             given context. However, due to the way the Vulkan spec. treats
+///             "identically defined" conversions, only a single conversion
+///             object is valid for an equivalent `YUVConversionDescriptorVK`.
+///             Because of this restriction, it is not possible to just create a
+///             conversion from a descriptor (as the underlying handles will be
+///             equivalent but different). Instead, a conversion may only be
+///             obtained from a conversion library. Libraries handle hashing and
+///             caching conversions by descriptor. Caller can find a library on
+///             the top-level context. They may not create their own (the
+///             constructor is private).
+///
+class YUVConversionVK final {
+ public:
+  ~YUVConversionVK();
+
+  YUVConversionVK(const YUVConversionVK&) = delete;
+
+  YUVConversionVK& operator=(const YUVConversionVK&) = delete;
+
+  //----------------------------------------------------------------------------
+  /// @return     `true` if this conversion is valid for use with images and
+  ///             samplers.
+  ///
+  bool IsValid() const;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Get the descriptor used to create this conversion.
+  ///
+  const YUVConversionDescriptorVK& GetDescriptor() const;
+
+  //----------------------------------------------------------------------------
+  /// @return     The Vulkan handle of the YUV conversion.
+  ///
+  vk::SamplerYcbcrConversion GetConversion() const;
+
+ private:
+  friend class YUVConversionLibraryVK;
+
+  YUVConversionDescriptorVK chain_;
+  vk::UniqueSamplerYcbcrConversion conversion_;
+
+  YUVConversionVK(const vk::Device& device,
+                  const YUVConversionDescriptorVK& chain);
+};
+
+struct YUVConversionDescriptorVKHash {
+  std::size_t operator()(const YUVConversionDescriptorVK& object) const;
+};
+
+struct YUVConversionDescriptorVKEqual {
+  bool operator()(const YUVConversionDescriptorVK& lhs,
+                  const YUVConversionDescriptorVK& rhs) const;
+};
+
+struct ImmutableSamplerKeyVK : public Comparable<ImmutableSamplerKeyVK> {
+  SamplerDescriptor sampler;
+  YUVConversionDescriptorVK yuv_conversion;
+
+  explicit ImmutableSamplerKeyVK(const SamplerVK& sampler);
+
+  // |Comparable<ImmutableSamplerKey>|
+  std::size_t GetHash() const override;
+
+  // |Comparable<ImmutableSamplerKey>|
+  bool IsEqual(const ImmutableSamplerKeyVK& other) const override;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_YUV_CONVERSION_VK_H_
diff --git a/impeller/renderer/backend_features.h b/impeller/renderer/backend_features.h
deleted file mode 100644
index f8ea75b134a5036bed7a6cead560ffc2de832c68..0000000000000000000000000000000000000000
--- a/impeller/renderer/backend_features.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#pragma once
-
-namespace impeller {
-
-/// @brief A struct for describing available backend features for runtime
-/// selection.
-struct BackendFeatures {
-  bool ssbo_support;
-};
-
-/// @brief feature sets available on most but not all modern hardware.
-constexpr BackendFeatures kModernBackendFeatures = {.ssbo_support = true};
-
-/// @brief Lowest common denominator feature sets.
-constexpr BackendFeatures kLegacyBackendFeatures = {.ssbo_support = false};
-
-}  // namespace impeller
diff --git a/impeller/renderer/blit_command.h b/impeller/renderer/blit_command.h
index 7fc646aa53248cdcd2b8ec505e13118ffee8dbf7..7f456f659326b3bbed3af1afd0d043dcc6e343bb 100644
--- a/impeller/renderer/blit_command.h
+++ b/impeller/renderer/blit_command.h
@@ -2,11 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BLIT_COMMAND_H_
+#define FLUTTER_IMPELLER_RENDERER_BLIT_COMMAND_H_
 
+#include "impeller/core/device_buffer.h"
+#include "impeller/core/texture.h"
 #include "impeller/geometry/rect.h"
-#include "impeller/renderer/device_buffer.h"
-#include "impeller/renderer/texture.h"
 
 namespace impeller {
 
@@ -28,8 +29,16 @@ struct BlitCopyTextureToBufferCommand : public BlitCommand {
   size_t destination_offset;
 };
 
+struct BlitCopyBufferToTextureCommand : public BlitCommand {
+  BufferView source;
+  std::shared_ptr<Texture> destination;
+  IPoint destination_origin;
+};
+
 struct BlitGenerateMipmapCommand : public BlitCommand {
   std::shared_ptr<Texture> texture;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BLIT_COMMAND_H_
diff --git a/impeller/renderer/blit_pass.cc b/impeller/renderer/blit_pass.cc
index dd53e125645b5dc96a71a09493ac9b49bf8dad54..81c4e500b0494516ab66cb3464c57d686e1199a8 100644
--- a/impeller/renderer/blit_pass.cc
+++ b/impeller/renderer/blit_pass.cc
@@ -8,24 +8,18 @@
 
 #include "impeller/base/strings.h"
 #include "impeller/base/validation.h"
-#include "impeller/renderer/blit_command.h"
-#include "impeller/renderer/host_buffer.h"
+#include "impeller/core/formats.h"
 
 namespace impeller {
 
-BlitPass::BlitPass() : transients_buffer_(HostBuffer::Create()) {}
+BlitPass::BlitPass() {}
 
 BlitPass::~BlitPass() = default;
 
-HostBuffer& BlitPass::GetTransientsBuffer() {
-  return *transients_buffer_;
-}
-
 void BlitPass::SetLabel(std::string label) {
   if (label.empty()) {
     return;
   }
-  transients_buffer_->SetLabel(SPrintF("%s Transients", label.c_str()));
   OnSetLabel(std::move(label));
 }
 
@@ -48,8 +42,18 @@ bool BlitPass::AddCopy(std::shared_ptr<Texture> source,
     VALIDATION_LOG << SPrintF(
         "The source sample count (%d) must match the destination sample count "
         "(%d) for blits.",
-        source->GetTextureDescriptor().sample_count,
-        destination->GetTextureDescriptor().sample_count);
+        static_cast<int>(source->GetTextureDescriptor().sample_count),
+        static_cast<int>(destination->GetTextureDescriptor().sample_count));
+    return false;
+  }
+  if (source->GetTextureDescriptor().format !=
+      destination->GetTextureDescriptor().format) {
+    VALIDATION_LOG << SPrintF(
+        "The source pixel format (%s) must match the destination pixel format "
+        "(%s) "
+        "for blits.",
+        PixelFormatToString(source->GetTextureDescriptor().format),
+        PixelFormatToString(destination->GetTextureDescriptor().format));
     return false;
   }
 
@@ -66,7 +70,7 @@ bool BlitPass::AddCopy(std::shared_ptr<Texture> source,
 
   // Clip the destination image.
   source_region = source_region->Intersection(
-      IRect(-destination_origin, destination->GetSize()));
+      IRect::MakeOriginSize(-destination_origin, destination->GetSize()));
   if (!source_region.has_value()) {
     return true;  // Nothing to blit.
   }
@@ -96,11 +100,11 @@ bool BlitPass::AddCopy(std::shared_ptr<Texture> source,
 
   auto bytes_per_pixel =
       BytesPerPixelForPixelFormat(source->GetTextureDescriptor().format);
-  auto bytes_per_image = source_region->size.Area() * bytes_per_pixel;
+  auto bytes_per_image = source_region->Area() * bytes_per_pixel;
   if (destination_offset + bytes_per_image >
       destination->GetDeviceBufferDescriptor().size) {
     VALIDATION_LOG
-        << "Attempted to add a texture blit with out fo bounds access.";
+        << "Attempted to add a texture blit with out of bounds access.";
     return false;
   }
 
@@ -116,6 +120,30 @@ bool BlitPass::AddCopy(std::shared_ptr<Texture> source,
                                       std::move(label));
 }
 
+bool BlitPass::AddCopy(BufferView source,
+                       std::shared_ptr<Texture> destination,
+                       IPoint destination_origin,
+                       std::string label) {
+  if (!destination) {
+    VALIDATION_LOG << "Attempted to add a texture blit with no destination.";
+    return false;
+  }
+
+  auto bytes_per_pixel =
+      BytesPerPixelForPixelFormat(destination->GetTextureDescriptor().format);
+  auto bytes_per_image =
+      destination->GetTextureDescriptor().size.Area() * bytes_per_pixel;
+
+  if (source.range.length != bytes_per_image) {
+    VALIDATION_LOG
+        << "Attempted to add a texture blit with out of bounds access.";
+    return false;
+  }
+
+  return OnCopyBufferToTextureCommand(std::move(source), std::move(destination),
+                                      destination_origin, std::move(label));
+}
+
 bool BlitPass::GenerateMipmap(std::shared_ptr<Texture> texture,
                               std::string label) {
   if (!texture) {
diff --git a/impeller/renderer/blit_pass.h b/impeller/renderer/blit_pass.h
index 7ac7b820e5972807642be6f94977649d39ff7c92..64ab734c1035b8f1e525b19933ab68a35855b508 100644
--- a/impeller/renderer/blit_pass.h
+++ b/impeller/renderer/blit_pass.h
@@ -2,14 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_BLIT_PASS_H_
+#define FLUTTER_IMPELLER_RENDERER_BLIT_PASS_H_
 
 #include <string>
-#include <variant>
 
-#include "impeller/renderer/blit_command.h"
-#include "impeller/renderer/device_buffer.h"
-#include "impeller/renderer/texture.h"
+#include "impeller/core/device_buffer.h"
+#include "impeller/core/texture.h"
 
 namespace impeller {
 
@@ -32,8 +31,6 @@ class BlitPass {
 
   void SetLabel(std::string label);
 
-  HostBuffer& GetTransientsBuffer();
-
   //----------------------------------------------------------------------------
   /// @brief      Record a command to copy the contents of one texture to
   ///             another texture. The blit area is limited by the intersection
@@ -61,8 +58,8 @@ class BlitPass {
                std::string label = "");
 
   //----------------------------------------------------------------------------
-  /// @brief      Record a command to copy the contents of the texture to
-  ///             the buffer.
+  /// @brief      Record a command to copy the contents of the buffer to
+  ///             the texture.
   ///             No work is encoded into the command buffer at this time.
   ///
   /// @param[in]  source              The texture to read for copying.
@@ -71,8 +68,8 @@ class BlitPass {
   /// @param[in]  source_region       The optional region of the source texture
   ///                                 to use for copying. If not specified, the
   ///                                 full size of the source texture is used.
-  /// @param[in]  destination_offset  The offset to start writing to in the
-  ///                                 destination buffer.
+  /// @param[in]  destination_origin  The origin to start writing to in the
+  ///                                 destination texture.
   /// @param[in]  label               The optional debug label to give the
   ///                                 command.
   ///
@@ -84,6 +81,26 @@ class BlitPass {
                size_t destination_offset = 0,
                std::string label = "");
 
+  //----------------------------------------------------------------------------
+  /// @brief      Record a command to copy the contents of the buffer to
+  ///             the texture.
+  ///             No work is encoded into the command buffer at this time.
+  ///
+  /// @param[in]  source              The buffer view to read for copying.
+  /// @param[in]  destination         The texture to overwrite using the source
+  ///                                 contents.
+  /// @param[in]  destination_offset  The offset to start writing to in the
+  ///                                 destination buffer.
+  /// @param[in]  label               The optional debug label to give the
+  ///                                 command.
+  ///
+  /// @return     If the command was valid for subsequent commitment.
+  ///
+  bool AddCopy(BufferView source,
+               std::shared_ptr<Texture> destination,
+               IPoint destination_origin = {},
+               std::string label = "");
+
   //----------------------------------------------------------------------------
   /// @brief      Record a command to generate all mip levels for a texture.
   ///             No work is encoded into the command buffer at this time.
@@ -107,8 +124,6 @@ class BlitPass {
       const std::shared_ptr<Allocator>& transients_allocator) const = 0;
 
  protected:
-  std::shared_ptr<HostBuffer> transients_buffer_;
-
   explicit BlitPass();
 
   virtual void OnSetLabel(std::string label) = 0;
@@ -127,11 +142,21 @@ class BlitPass {
       size_t destination_offset,
       std::string label) = 0;
 
+  virtual bool OnCopyBufferToTextureCommand(
+      BufferView source,
+      std::shared_ptr<Texture> destination,
+      IPoint destination_origin,
+      std::string label) = 0;
+
   virtual bool OnGenerateMipmapCommand(std::shared_ptr<Texture> texture,
                                        std::string label) = 0;
 
  private:
-  FML_DISALLOW_COPY_AND_ASSIGN(BlitPass);
+  BlitPass(const BlitPass&) = delete;
+
+  BlitPass& operator=(const BlitPass&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_BLIT_PASS_H_
diff --git a/impeller/renderer/blit_pass_unittests.cc b/impeller/renderer/blit_pass_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..dbf534d1deda5f590201210bc85970b572d299e7
--- /dev/null
+++ b/impeller/renderer/blit_pass_unittests.cc
@@ -0,0 +1,79 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "gtest/gtest.h"
+#include "impeller/base/validation.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/texture_descriptor.h"
+#include "impeller/playground/playground_test.h"
+#include "impeller/renderer/command_buffer.h"
+
+namespace impeller {
+namespace testing {
+
+using BlitPassTest = PlaygroundTest;
+INSTANTIATE_PLAYGROUND_SUITE(BlitPassTest);
+
+TEST_P(BlitPassTest, BlitAcrossDifferentPixelFormatsFails) {
+  ScopedValidationDisable scope;  // avoid noise in output.
+  auto context = GetContext();
+  auto cmd_buffer = context->CreateCommandBuffer();
+  auto blit_pass = cmd_buffer->CreateBlitPass();
+
+  TextureDescriptor src_desc;
+  src_desc.format = PixelFormat::kA8UNormInt;
+  src_desc.size = {100, 100};
+  src_desc.storage_mode = StorageMode::kHostVisible;
+  auto src = context->GetResourceAllocator()->CreateTexture(src_desc);
+
+  TextureDescriptor dst_format;
+  dst_format.format = PixelFormat::kR8G8B8A8UNormInt;
+  dst_format.size = {100, 100};
+  dst_format.storage_mode = StorageMode::kHostVisible;
+  auto dst = context->GetResourceAllocator()->CreateTexture(dst_format);
+
+  EXPECT_FALSE(blit_pass->AddCopy(src, dst));
+}
+
+TEST_P(BlitPassTest, BlitAcrossDifferentSampleCountsFails) {
+  ScopedValidationDisable scope;  // avoid noise in output.
+  auto context = GetContext();
+  auto cmd_buffer = context->CreateCommandBuffer();
+  auto blit_pass = cmd_buffer->CreateBlitPass();
+
+  TextureDescriptor src_desc;
+  src_desc.format = PixelFormat::kR8G8B8A8UNormInt;
+  src_desc.sample_count = SampleCount::kCount4;
+  src_desc.size = {100, 100};
+  auto src = context->GetResourceAllocator()->CreateTexture(src_desc);
+
+  TextureDescriptor dst_format;
+  dst_format.format = PixelFormat::kR8G8B8A8UNormInt;
+  dst_format.size = {100, 100};
+  auto dst = context->GetResourceAllocator()->CreateTexture(dst_format);
+
+  EXPECT_FALSE(blit_pass->AddCopy(src, dst));
+}
+
+TEST_P(BlitPassTest, BlitPassesForMatchingFormats) {
+  ScopedValidationDisable scope;  // avoid noise in output.
+  auto context = GetContext();
+  auto cmd_buffer = context->CreateCommandBuffer();
+  auto blit_pass = cmd_buffer->CreateBlitPass();
+
+  TextureDescriptor src_desc;
+  src_desc.format = PixelFormat::kR8G8B8A8UNormInt;
+  src_desc.size = {100, 100};
+  auto src = context->GetResourceAllocator()->CreateTexture(src_desc);
+
+  TextureDescriptor dst_format;
+  dst_format.format = PixelFormat::kR8G8B8A8UNormInt;
+  dst_format.size = {100, 100};
+  auto dst = context->GetResourceAllocator()->CreateTexture(dst_format);
+
+  EXPECT_TRUE(blit_pass->AddCopy(src, dst));
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/renderer/capabilities.cc b/impeller/renderer/capabilities.cc
new file mode 100644
index 0000000000000000000000000000000000000000..1ef1fe38a806239edf13d543d954ca6593b851c6
--- /dev/null
+++ b/impeller/renderer/capabilities.cc
@@ -0,0 +1,245 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/capabilities.h"
+#include "impeller/core/formats.h"
+
+namespace impeller {
+
+Capabilities::Capabilities() = default;
+
+Capabilities::~Capabilities() = default;
+
+class StandardCapabilities final : public Capabilities {
+ public:
+  // |Capabilities|
+  ~StandardCapabilities() override = default;
+
+  // |Capabilities|
+  bool SupportsOffscreenMSAA() const override {
+    return supports_offscreen_msaa_;
+  }
+
+  // |Capabilities|
+  bool SupportsImplicitResolvingMSAA() const override { return false; }
+
+  // |Capabilities|
+  bool SupportsSSBO() const override { return supports_ssbo_; }
+
+  // |Capabilities|
+  bool SupportsBufferToTextureBlits() const override {
+    return supports_buffer_to_texture_blits_;
+  }
+
+  // |Capabilities|
+  bool SupportsTextureToTextureBlits() const override {
+    return supports_texture_to_texture_blits_;
+  }
+
+  // |Capabilities|
+  bool SupportsFramebufferFetch() const override {
+    return supports_framebuffer_fetch_;
+  }
+
+  // |Capabilities|
+  bool SupportsCompute() const override { return supports_compute_; }
+
+  // |Capabilities|
+  bool SupportsComputeSubgroups() const override {
+    return supports_compute_subgroups_;
+  }
+
+  // |Capabilities|
+  bool SupportsReadFromResolve() const override {
+    return supports_read_from_resolve_;
+  }
+
+  // |Capabilities|
+  bool SupportsDecalSamplerAddressMode() const override {
+    return supports_decal_sampler_address_mode_;
+  }
+
+  // |Capabilities|
+  PixelFormat GetDefaultColorFormat() const override {
+    return default_color_format_;
+  }
+
+  // |Capabilities|
+  PixelFormat GetDefaultStencilFormat() const override {
+    return default_stencil_format_;
+  }
+
+  // |Capabilities|
+  PixelFormat GetDefaultDepthStencilFormat() const override {
+    return default_depth_stencil_format_;
+  }
+
+  // |Capabilities|
+  bool SupportsDeviceTransientTextures() const override {
+    return supports_device_transient_textures_;
+  }
+
+  // |Capabilities|
+  PixelFormat GetDefaultGlyphAtlasFormat() const override {
+    return default_glyph_atlas_format_;
+  }
+
+ private:
+  StandardCapabilities(bool supports_offscreen_msaa,
+                       bool supports_ssbo,
+                       bool supports_buffer_to_texture_blits,
+                       bool supports_texture_to_texture_blits,
+                       bool supports_framebuffer_fetch,
+                       bool supports_compute,
+                       bool supports_compute_subgroups,
+                       bool supports_read_from_resolve,
+                       bool supports_decal_sampler_address_mode,
+                       bool supports_device_transient_textures,
+                       PixelFormat default_color_format,
+                       PixelFormat default_stencil_format,
+                       PixelFormat default_depth_stencil_format,
+                       PixelFormat default_glyph_atlas_format)
+      : supports_offscreen_msaa_(supports_offscreen_msaa),
+        supports_ssbo_(supports_ssbo),
+        supports_buffer_to_texture_blits_(supports_buffer_to_texture_blits),
+        supports_texture_to_texture_blits_(supports_texture_to_texture_blits),
+        supports_framebuffer_fetch_(supports_framebuffer_fetch),
+        supports_compute_(supports_compute),
+        supports_compute_subgroups_(supports_compute_subgroups),
+        supports_read_from_resolve_(supports_read_from_resolve),
+        supports_decal_sampler_address_mode_(
+            supports_decal_sampler_address_mode),
+        supports_device_transient_textures_(supports_device_transient_textures),
+        default_color_format_(default_color_format),
+        default_stencil_format_(default_stencil_format),
+        default_depth_stencil_format_(default_depth_stencil_format),
+        default_glyph_atlas_format_(default_glyph_atlas_format) {}
+
+  friend class CapabilitiesBuilder;
+
+  bool supports_offscreen_msaa_ = false;
+  bool supports_ssbo_ = false;
+  bool supports_buffer_to_texture_blits_ = false;
+  bool supports_texture_to_texture_blits_ = false;
+  bool supports_framebuffer_fetch_ = false;
+  bool supports_compute_ = false;
+  bool supports_compute_subgroups_ = false;
+  bool supports_read_from_resolve_ = false;
+  bool supports_decal_sampler_address_mode_ = false;
+  bool supports_device_transient_textures_ = false;
+  PixelFormat default_color_format_ = PixelFormat::kUnknown;
+  PixelFormat default_stencil_format_ = PixelFormat::kUnknown;
+  PixelFormat default_depth_stencil_format_ = PixelFormat::kUnknown;
+  PixelFormat default_glyph_atlas_format_ = PixelFormat::kUnknown;
+
+  StandardCapabilities(const StandardCapabilities&) = delete;
+
+  StandardCapabilities& operator=(const StandardCapabilities&) = delete;
+};
+
+CapabilitiesBuilder::CapabilitiesBuilder() = default;
+
+CapabilitiesBuilder::~CapabilitiesBuilder() = default;
+
+CapabilitiesBuilder& CapabilitiesBuilder::SetSupportsOffscreenMSAA(bool value) {
+  supports_offscreen_msaa_ = value;
+  return *this;
+}
+
+CapabilitiesBuilder& CapabilitiesBuilder::SetSupportsSSBO(bool value) {
+  supports_ssbo_ = value;
+  return *this;
+}
+
+CapabilitiesBuilder& CapabilitiesBuilder::SetSupportsBufferToTextureBlits(
+    bool value) {
+  supports_buffer_to_texture_blits_ = value;
+  return *this;
+}
+
+CapabilitiesBuilder& CapabilitiesBuilder::SetSupportsTextureToTextureBlits(
+    bool value) {
+  supports_texture_to_texture_blits_ = value;
+  return *this;
+}
+
+CapabilitiesBuilder& CapabilitiesBuilder::SetSupportsFramebufferFetch(
+    bool value) {
+  supports_framebuffer_fetch_ = value;
+  return *this;
+}
+
+CapabilitiesBuilder& CapabilitiesBuilder::SetSupportsCompute(bool value) {
+  supports_compute_ = value;
+  return *this;
+}
+
+CapabilitiesBuilder& CapabilitiesBuilder::SetSupportsComputeSubgroups(
+    bool value) {
+  supports_compute_subgroups_ = value;
+  return *this;
+}
+
+CapabilitiesBuilder& CapabilitiesBuilder::SetDefaultColorFormat(
+    PixelFormat value) {
+  default_color_format_ = value;
+  return *this;
+}
+
+CapabilitiesBuilder& CapabilitiesBuilder::SetDefaultStencilFormat(
+    PixelFormat value) {
+  default_stencil_format_ = value;
+  return *this;
+}
+
+CapabilitiesBuilder& CapabilitiesBuilder::SetDefaultDepthStencilFormat(
+    PixelFormat value) {
+  default_depth_stencil_format_ = value;
+  return *this;
+}
+
+CapabilitiesBuilder& CapabilitiesBuilder::SetSupportsReadFromResolve(
+    bool read_from_resolve) {
+  supports_read_from_resolve_ = read_from_resolve;
+  return *this;
+}
+
+CapabilitiesBuilder& CapabilitiesBuilder::SetSupportsDecalSamplerAddressMode(
+    bool value) {
+  supports_decal_sampler_address_mode_ = value;
+  return *this;
+}
+
+CapabilitiesBuilder& CapabilitiesBuilder::SetSupportsDeviceTransientTextures(
+    bool value) {
+  supports_device_transient_textures_ = value;
+  return *this;
+}
+
+CapabilitiesBuilder& CapabilitiesBuilder::SetDefaultGlyphAtlasFormat(
+    PixelFormat value) {
+  default_glyph_atlas_format_ = value;
+  return *this;
+}
+
+std::unique_ptr<Capabilities> CapabilitiesBuilder::Build() {
+  return std::unique_ptr<StandardCapabilities>(new StandardCapabilities(  //
+      supports_offscreen_msaa_,                                           //
+      supports_ssbo_,                                                     //
+      supports_buffer_to_texture_blits_,                                  //
+      supports_texture_to_texture_blits_,                                 //
+      supports_framebuffer_fetch_,                                        //
+      supports_compute_,                                                  //
+      supports_compute_subgroups_,                                        //
+      supports_read_from_resolve_,                                        //
+      supports_decal_sampler_address_mode_,                               //
+      supports_device_transient_textures_,                                //
+      default_color_format_.value_or(PixelFormat::kUnknown),              //
+      default_stencil_format_.value_or(PixelFormat::kUnknown),            //
+      default_depth_stencil_format_.value_or(PixelFormat::kUnknown),      //
+      default_glyph_atlas_format_.value_or(PixelFormat::kUnknown)         //
+      ));
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/capabilities.h b/impeller/renderer/capabilities.h
new file mode 100644
index 0000000000000000000000000000000000000000..34c5839bd5959d2d849ec4f2bbbc82301bc2bca5
--- /dev/null
+++ b/impeller/renderer/capabilities.h
@@ -0,0 +1,181 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_CAPABILITIES_H_
+#define FLUTTER_IMPELLER_RENDERER_CAPABILITIES_H_
+
+#include <memory>
+
+#include "flutter/fml/macros.h"
+#include "impeller/core/formats.h"
+
+namespace impeller {
+
+class Capabilities {
+ public:
+  virtual ~Capabilities();
+
+  /// @brief  Whether the context backend supports attaching offscreen MSAA
+  ///         color/stencil textures.
+  virtual bool SupportsOffscreenMSAA() const = 0;
+
+  /// @brief  Whether the context backend supports multisampled rendering to
+  ///         the on-screen surface without requiring an explicit resolve of
+  ///         the MSAA color attachment.
+  virtual bool SupportsImplicitResolvingMSAA() const = 0;
+
+  /// @brief  Whether the context backend supports binding Shader Storage Buffer
+  ///         Objects (SSBOs) to pipelines.
+  virtual bool SupportsSSBO() const = 0;
+
+  /// @brief  Whether the context backend supports blitting from a given
+  ///         `DeviceBuffer` view to a texture region (via the relevant
+  ///         `BlitPass::AddCopy` overloads).
+  virtual bool SupportsBufferToTextureBlits() const = 0;
+
+  /// @brief  Whether the context backend supports blitting from one texture
+  ///         region to another texture region (via the relevant
+  ///         `BlitPass::AddCopy` overloads).
+  virtual bool SupportsTextureToTextureBlits() const = 0;
+
+  /// @brief  Whether the context backend is able to support pipelines with
+  ///         shaders that read from the framebuffer (i.e. pixels that have been
+  ///         written by previous draw calls in the current render pass).
+  ///
+  ///         Example of reading from the first color attachment in a GLSL
+  ///         shader:
+  ///         ```
+  ///         uniform subpassInput subpass_input;
+  ///
+  ///         out vec4 frag_color;
+  ///
+  ///         void main() {
+  ///           vec4 color = subpassLoad(subpass_input);
+  ///           // Invert the colors drawn to the framebuffer.
+  ///           frag_color = vec4(vec3(1) - color.rgb, color.a);
+  ///         }
+  ///         ```
+  virtual bool SupportsFramebufferFetch() const = 0;
+
+  /// @brief  Whether the context backend supports `ComputePass`.
+  virtual bool SupportsCompute() const = 0;
+
+  /// @brief  Whether the context backend supports configuring `ComputePass`
+  ///         command subgroups.
+  virtual bool SupportsComputeSubgroups() const = 0;
+
+  /// @brief  Whether the context backend supports binding the current
+  ///         `RenderPass` attachments. This is supported if the backend can
+  ///         guarantee that attachment textures will not be mutated until the
+  ///         render pass has fully completed.
+  ///
+  ///         This is possible because many mobile graphics cards track
+  ///         `RenderPass` attachment state in intermediary tile memory prior to
+  ///         Storing the pass in the heap allocated attachments on DRAM.
+  ///         Metal's hazard tracking and Vulkan's barriers are granular enough
+  ///         to allow for safely accessing attachment textures prior to storage
+  ///         in the same `RenderPass`.
+  virtual bool SupportsReadFromResolve() const = 0;
+
+  /// @brief  Whether the context backend supports `SamplerAddressMode::Decal`.
+  virtual bool SupportsDecalSamplerAddressMode() const = 0;
+
+  /// @brief  Whether the context backend supports allocating
+  ///         `StorageMode::kDeviceTransient` (aka "memoryless") textures, which
+  ///         are temporary textures kept in tile memory for the duration of the
+  ///         `RenderPass` it's attached to.
+  ///
+  ///         This feature is especially useful for MSAA and stencils.
+  virtual bool SupportsDeviceTransientTextures() const = 0;
+
+  /// @brief  Returns a supported `PixelFormat` for textures that store
+  ///         4-channel colors (red/green/blue/alpha).
+  virtual PixelFormat GetDefaultColorFormat() const = 0;
+
+  /// @brief  Returns a supported `PixelFormat` for textures that store stencil
+  ///         information. May include a depth channel if a stencil-only format
+  ///         is not available.
+  virtual PixelFormat GetDefaultStencilFormat() const = 0;
+
+  /// @brief  Returns a supported `PixelFormat` for textures that store both a
+  ///         stencil and depth component. This will never return a depth-only
+  ///         or stencil-only texture.
+  ///         Returns `PixelFormat::kUnknown` if no suitable depth+stencil
+  ///         format was found.
+  virtual PixelFormat GetDefaultDepthStencilFormat() const = 0;
+
+  /// @brief Returns the default pixel format for the alpha bitmap glyph atlas.
+  ///
+  ///        Some backends may use Red channel while others use grey. This
+  ///        should not have any impact
+  virtual PixelFormat GetDefaultGlyphAtlasFormat() const = 0;
+
+ protected:
+  Capabilities();
+
+  Capabilities(const Capabilities&) = delete;
+
+  Capabilities& operator=(const Capabilities&) = delete;
+};
+
+class CapabilitiesBuilder {
+ public:
+  CapabilitiesBuilder();
+
+  ~CapabilitiesBuilder();
+
+  CapabilitiesBuilder& SetSupportsOffscreenMSAA(bool value);
+
+  CapabilitiesBuilder& SetSupportsSSBO(bool value);
+
+  CapabilitiesBuilder& SetSupportsBufferToTextureBlits(bool value);
+
+  CapabilitiesBuilder& SetSupportsTextureToTextureBlits(bool value);
+
+  CapabilitiesBuilder& SetSupportsFramebufferFetch(bool value);
+
+  CapabilitiesBuilder& SetSupportsCompute(bool value);
+
+  CapabilitiesBuilder& SetSupportsComputeSubgroups(bool value);
+
+  CapabilitiesBuilder& SetSupportsReadFromResolve(bool value);
+
+  CapabilitiesBuilder& SetDefaultColorFormat(PixelFormat value);
+
+  CapabilitiesBuilder& SetDefaultStencilFormat(PixelFormat value);
+
+  CapabilitiesBuilder& SetDefaultDepthStencilFormat(PixelFormat value);
+
+  CapabilitiesBuilder& SetSupportsDecalSamplerAddressMode(bool value);
+
+  CapabilitiesBuilder& SetSupportsDeviceTransientTextures(bool value);
+
+  CapabilitiesBuilder& SetDefaultGlyphAtlasFormat(PixelFormat value);
+
+  std::unique_ptr<Capabilities> Build();
+
+ private:
+  bool supports_offscreen_msaa_ = false;
+  bool supports_ssbo_ = false;
+  bool supports_buffer_to_texture_blits_ = false;
+  bool supports_texture_to_texture_blits_ = false;
+  bool supports_framebuffer_fetch_ = false;
+  bool supports_compute_ = false;
+  bool supports_compute_subgroups_ = false;
+  bool supports_read_from_resolve_ = false;
+  bool supports_decal_sampler_address_mode_ = false;
+  bool supports_device_transient_textures_ = false;
+  std::optional<PixelFormat> default_color_format_ = std::nullopt;
+  std::optional<PixelFormat> default_stencil_format_ = std::nullopt;
+  std::optional<PixelFormat> default_depth_stencil_format_ = std::nullopt;
+  std::optional<PixelFormat> default_glyph_atlas_format_ = std::nullopt;
+
+  CapabilitiesBuilder(const CapabilitiesBuilder&) = delete;
+
+  CapabilitiesBuilder& operator=(const CapabilitiesBuilder&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_CAPABILITIES_H_
diff --git a/impeller/renderer/capabilities_unittests.cc b/impeller/renderer/capabilities_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..2692d067ad0a36c5ea5d8f2ab27be0cfa76abb25
--- /dev/null
+++ b/impeller/renderer/capabilities_unittests.cc
@@ -0,0 +1,70 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/testing/testing.h"
+#include "impeller/renderer/capabilities.h"
+
+#include "gtest/gtest.h"
+
+namespace impeller {
+namespace testing {
+
+#define CAPABILITY_TEST(name, default_value)                                 \
+  TEST(CapabilitiesTest, name) {                                             \
+    auto defaults = CapabilitiesBuilder().Build();                           \
+    ASSERT_EQ(defaults->name(), default_value);                              \
+    auto opposite = CapabilitiesBuilder().Set##name(!default_value).Build(); \
+    ASSERT_EQ(opposite->name(), !default_value);                             \
+  }
+
+CAPABILITY_TEST(SupportsOffscreenMSAA, false);
+CAPABILITY_TEST(SupportsSSBO, false);
+CAPABILITY_TEST(SupportsBufferToTextureBlits, false);
+CAPABILITY_TEST(SupportsTextureToTextureBlits, false);
+CAPABILITY_TEST(SupportsFramebufferFetch, false);
+CAPABILITY_TEST(SupportsCompute, false);
+CAPABILITY_TEST(SupportsComputeSubgroups, false);
+CAPABILITY_TEST(SupportsReadFromResolve, false);
+CAPABILITY_TEST(SupportsDecalSamplerAddressMode, false);
+CAPABILITY_TEST(SupportsDeviceTransientTextures, false);
+
+TEST(CapabilitiesTest, DefaultColorFormat) {
+  auto defaults = CapabilitiesBuilder().Build();
+  EXPECT_EQ(defaults->GetDefaultColorFormat(), PixelFormat::kUnknown);
+  auto mutated = CapabilitiesBuilder()
+                     .SetDefaultColorFormat(PixelFormat::kB10G10R10A10XR)
+                     .Build();
+  EXPECT_EQ(mutated->GetDefaultColorFormat(), PixelFormat::kB10G10R10A10XR);
+}
+
+TEST(CapabilitiesTest, DefaultStencilFormat) {
+  auto defaults = CapabilitiesBuilder().Build();
+  EXPECT_EQ(defaults->GetDefaultStencilFormat(), PixelFormat::kUnknown);
+  auto mutated = CapabilitiesBuilder()
+                     .SetDefaultStencilFormat(PixelFormat::kS8UInt)
+                     .Build();
+  EXPECT_EQ(mutated->GetDefaultStencilFormat(), PixelFormat::kS8UInt);
+}
+
+TEST(CapabilitiesTest, DefaultDepthStencilFormat) {
+  auto defaults = CapabilitiesBuilder().Build();
+  EXPECT_EQ(defaults->GetDefaultDepthStencilFormat(), PixelFormat::kUnknown);
+  auto mutated = CapabilitiesBuilder()
+                     .SetDefaultDepthStencilFormat(PixelFormat::kD32FloatS8UInt)
+                     .Build();
+  EXPECT_EQ(mutated->GetDefaultDepthStencilFormat(),
+            PixelFormat::kD32FloatS8UInt);
+}
+
+TEST(CapabilitiesTest, DefaultGlyphAtlasFormat) {
+  auto defaults = CapabilitiesBuilder().Build();
+  EXPECT_EQ(defaults->GetDefaultGlyphAtlasFormat(), PixelFormat::kUnknown);
+  auto mutated = CapabilitiesBuilder()
+                     .SetDefaultGlyphAtlasFormat(PixelFormat::kA8UNormInt)
+                     .Build();
+  EXPECT_EQ(mutated->GetDefaultGlyphAtlasFormat(), PixelFormat::kA8UNormInt);
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/renderer/command.cc b/impeller/renderer/command.cc
index e5380a83570cab92e548ffb9ab648e4377430647..773ce08c40e7890c4b1a5d770518142253ae202f 100644
--- a/impeller/renderer/command.cc
+++ b/impeller/renderer/command.cc
@@ -7,85 +7,59 @@
 #include <utility>
 
 #include "impeller/base/validation.h"
-#include "impeller/renderer/formats.h"
+#include "impeller/core/formats.h"
 #include "impeller/renderer/vertex_descriptor.h"
 
 namespace impeller {
 
-bool Command::BindVertices(const VertexBuffer& buffer) {
+bool Command::BindVertices(VertexBuffer buffer) {
   if (buffer.index_type == IndexType::kUnknown) {
     VALIDATION_LOG << "Cannot bind vertex buffer with an unknown index type.";
     return false;
   }
 
-  vertex_bindings.buffers[VertexDescriptor::kReservedVertexBufferIndex] = {
-      nullptr, buffer.vertex_buffer};
-  index_buffer = buffer.index_buffer;
-  index_count = buffer.index_count;
-  index_type = buffer.index_type;
+  vertex_buffer = std::move(buffer);
   return true;
 }
 
-BufferView Command::GetVertexBuffer() const {
-  auto found = vertex_bindings.buffers.find(
-      VertexDescriptor::kReservedVertexBufferIndex);
-  if (found != vertex_bindings.buffers.end()) {
-    return found->second.resource;
-  }
-  return {};
-}
-
 bool Command::BindResource(ShaderStage stage,
+                           DescriptorType type,
                            const ShaderUniformSlot& slot,
                            const ShaderMetadata& metadata,
-                           const BufferView& view) {
-  if (!view) {
-    return false;
-  }
-
-  switch (stage) {
-    case ShaderStage::kVertex:
-      vertex_bindings.uniforms[slot.ext_res_0] = slot;
-      vertex_bindings.buffers[slot.ext_res_0] = {&metadata, view};
-      return true;
-    case ShaderStage::kFragment:
-      fragment_bindings.uniforms[slot.ext_res_0] = slot;
-      fragment_bindings.buffers[slot.ext_res_0] = {&metadata, view};
-      return true;
-    case ShaderStage::kCompute:
-      VALIDATION_LOG << "Use ComputeCommands for compute shader stages.";
-    case ShaderStage::kTessellationControl:
-    case ShaderStage::kTessellationEvaluation:
-    case ShaderStage::kUnknown:
-      return false;
-  }
+                           BufferView view) {
+  return DoBindResource(stage, slot, &metadata, std::move(view));
+}
 
-  return false;
+bool Command::BindResource(
+    ShaderStage stage,
+    DescriptorType type,
+    const ShaderUniformSlot& slot,
+    const std::shared_ptr<const ShaderMetadata>& metadata,
+    BufferView view) {
+  return DoBindResource(stage, slot, metadata, std::move(view));
 }
 
-bool Command::BindResource(ShaderStage stage,
-                           const SampledImageSlot& slot,
-                           const ShaderMetadata& metadata,
-                           const std::shared_ptr<const Texture>& texture) {
-  if (!texture || !texture->IsValid()) {
+template <class T>
+bool Command::DoBindResource(ShaderStage stage,
+                             const ShaderUniformSlot& slot,
+                             const T metadata,
+                             BufferView view) {
+  FML_DCHECK(slot.ext_res_0 != VertexDescriptor::kReservedVertexBufferIndex);
+  if (!view) {
     return false;
   }
 
-  if (!slot.HasTexture()) {
-    return true;
-  }
-
   switch (stage) {
     case ShaderStage::kVertex:
-      vertex_bindings.textures[slot.texture_index] = {&metadata, texture};
+      vertex_bindings.buffers.emplace_back(BufferAndUniformSlot{
+          .slot = slot, .view = BufferResource(metadata, std::move(view))});
       return true;
     case ShaderStage::kFragment:
-      fragment_bindings.textures[slot.texture_index] = {&metadata, texture};
+      fragment_bindings.buffers.emplace_back(BufferAndUniformSlot{
+          .slot = slot, .view = BufferResource(metadata, std::move(view))});
       return true;
     case ShaderStage::kCompute:
       VALIDATION_LOG << "Use ComputeCommands for compute shader stages.";
-    case ShaderStage::kTessellationControl:
-    case ShaderStage::kTessellationEvaluation:
     case ShaderStage::kUnknown:
       return false;
   }
@@ -94,44 +68,40 @@ bool Command::BindResource(ShaderStage stage,
 }
 
 bool Command::BindResource(ShaderStage stage,
+                           DescriptorType type,
                            const SampledImageSlot& slot,
                            const ShaderMetadata& metadata,
-                           const std::shared_ptr<const Sampler>& sampler) {
-  if (!sampler || !sampler->IsValid()) {
+                           std::shared_ptr<const Texture> texture,
+                           const std::unique_ptr<const Sampler>& sampler) {
+  if (!sampler) {
     return false;
   }
-
-  if (!slot.HasSampler()) {
-    return true;
+  if (!texture || !texture->IsValid()) {
+    return false;
   }
 
   switch (stage) {
     case ShaderStage::kVertex:
-      vertex_bindings.samplers[slot.sampler_index] = {&metadata, sampler};
-      vertex_bindings.sampled_images[slot.sampler_index] = slot;
+      vertex_bindings.sampled_images.emplace_back(TextureAndSampler{
+          .slot = slot,
+          .texture = {&metadata, std::move(texture)},
+          .sampler = sampler,
+      });
       return true;
     case ShaderStage::kFragment:
-      fragment_bindings.samplers[slot.sampler_index] = {&metadata, sampler};
-      fragment_bindings.sampled_images[slot.sampler_index] = slot;
+      fragment_bindings.sampled_images.emplace_back(TextureAndSampler{
+          .slot = slot,
+          .texture = {&metadata, std::move(texture)},
+          .sampler = sampler,
+      });
       return true;
     case ShaderStage::kCompute:
       VALIDATION_LOG << "Use ComputeCommands for compute shader stages.";
     case ShaderStage::kUnknown:
-    case ShaderStage::kTessellationControl:
-    case ShaderStage::kTessellationEvaluation:
       return false;
   }
 
   return false;
 }
 
-bool Command::BindResource(ShaderStage stage,
-                           const SampledImageSlot& slot,
-                           const ShaderMetadata& metadata,
-                           const std::shared_ptr<const Texture>& texture,
-                           const std::shared_ptr<const Sampler>& sampler) {
-  return BindResource(stage, slot, metadata, texture) &&
-         BindResource(stage, slot, metadata, sampler);
-}
-
 }  // namespace impeller
diff --git a/impeller/renderer/command.h b/impeller/renderer/command.h
index 526fe3aaafe30568e2c393cbf0a86dc50d64d0d1..5b08d1a53125786cec3235c9841814224667887c 100644
--- a/impeller/renderer/command.h
+++ b/impeller/renderer/command.h
@@ -2,50 +2,77 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_COMMAND_H_
+#define FLUTTER_IMPELLER_RENDERER_COMMAND_H_
 
-#include <map>
+#include <cstdint>
 #include <memory>
 #include <optional>
 #include <string>
 
-#include "flutter/fml/logging.h"
-#include "flutter/fml/macros.h"
+#include "impeller/core/buffer_view.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/resource_binder.h"
+#include "impeller/core/sampler.h"
+#include "impeller/core/shader_types.h"
+#include "impeller/core/texture.h"
+#include "impeller/core/vertex_buffer.h"
 #include "impeller/geometry/rect.h"
-#include "impeller/renderer/buffer_view.h"
-#include "impeller/renderer/formats.h"
 #include "impeller/renderer/pipeline.h"
-#include "impeller/renderer/sampler.h"
-#include "impeller/renderer/shader_types.h"
-#include "impeller/renderer/texture.h"
-#include "impeller/renderer/vertex_buffer.h"
-#include "impeller/renderer/vertex_buffer_builder.h"
-#include "impeller/tessellator/tessellator.h"
 
 namespace impeller {
 
+#ifdef IMPELLER_DEBUG
+#define DEBUG_COMMAND_INFO(obj, arg) obj.label = arg;
+#else
+#define DEBUG_COMMAND_INFO(obj, arg)
+#endif  // IMPELLER_DEBUG
+
 template <class T>
 struct Resource {
   using ResourceType = T;
-  const ShaderMetadata* isa;
   ResourceType resource;
 
-  Resource() : isa(nullptr) {}
+  Resource() {}
+
+  Resource(const ShaderMetadata* metadata, ResourceType p_resource)
+      : resource(p_resource), metadata_(metadata) {}
+
+  Resource(std::shared_ptr<const ShaderMetadata>& metadata,
+           ResourceType p_resource)
+      : resource(p_resource), dynamic_metadata_(metadata) {}
+
+  const ShaderMetadata* GetMetadata() const {
+    return dynamic_metadata_ ? dynamic_metadata_.get() : metadata_;
+  }
 
-  Resource(const ShaderMetadata* p_isa, ResourceType p_resource)
-      : isa(p_isa), resource(p_resource) {}
+ private:
+  // Static shader metadata (typically generated by ImpellerC).
+  const ShaderMetadata* metadata_ = nullptr;
+
+  // Dynamically generated shader metadata.
+  std::shared_ptr<const ShaderMetadata> dynamic_metadata_;
 };
 
 using BufferResource = Resource<BufferView>;
 using TextureResource = Resource<std::shared_ptr<const Texture>>;
-using SamplerResource = Resource<std::shared_ptr<const Sampler>>;
+
+/// @brief combines the texture, sampler and sampler slot information.
+struct TextureAndSampler {
+  SampledImageSlot slot;
+  TextureResource texture;
+  const std::unique_ptr<const Sampler>& sampler;
+};
+
+/// @brief combines the buffer resource and its uniform slot information.
+struct BufferAndUniformSlot {
+  ShaderUniformSlot slot;
+  BufferResource view;
+};
 
 struct Bindings {
-  std::map<size_t, ShaderUniformSlot> uniforms;
-  std::map<size_t, SampledImageSlot> sampled_images;
-  std::map<size_t, BufferResource> buffers;
-  std::map<size_t, TextureResource> textures;
-  std::map<size_t, SamplerResource> samplers;
+  std::vector<TextureAndSampler> sampled_images;
+  std::vector<BufferAndUniformSlot> buffers;
 };
 
 //------------------------------------------------------------------------------
@@ -58,12 +85,11 @@ struct Bindings {
 ///             * Specify any stage bindings.
 ///             * (Optional) Specify a debug label.
 ///
-///             Command are very lightweight objects and can be created
-///             frequently and on demand. The resources referenced in commands
-///             views into buffers managed by other allocators and resource
-///             managers.
+///             Command can be created frequently and on demand. The resources
+///             referenced in commands views into buffers managed by other
+///             allocators and resource managers.
 ///
-struct Command {
+struct Command : public ResourceBinder {
   //----------------------------------------------------------------------------
   /// The pipeline to use for this command.
   ///
@@ -78,30 +104,14 @@ struct Command {
   /// stage.
   ///
   Bindings fragment_bindings;
-  //----------------------------------------------------------------------------
-  /// The index buffer binding used by the vertex shader stage. Instead of
-  /// setting this directly, it usually easier to specify the vertex and index
-  /// buffer bindings directly via a single call to `BindVertices`.
-  ///
-  /// @see         `BindVertices`
-  ///
-  BufferView index_buffer;
-  //----------------------------------------------------------------------------
-  /// The number of indices to use from the index buffer. Set the vertex and
-  /// index buffers as well as the index count using a call to `BindVertices`.
-  ///
-  /// @see         `BindVertices`
-  ///
-  size_t index_count = 0u;
-  //----------------------------------------------------------------------------
-  /// The type of indices in the index buffer. The indices must be tightly
-  /// packed in the index buffer.
-  ///
-  IndexType index_type = IndexType::kUnknown;
+
+#ifdef IMPELLER_DEBUG
   //----------------------------------------------------------------------------
   /// The debugging label to use for the command.
   ///
   std::string label;
+#endif  // IMPELLER_DEBUG
+
   //----------------------------------------------------------------------------
   /// The reference value to use in stenciling operations. Stencil configuration
   /// is part of pipeline setup and can be read from the pipelines descriptor.
@@ -136,39 +146,51 @@ struct Command {
   ///
   size_t instance_count = 1u;
 
+  //----------------------------------------------------------------------------
+  /// The bound per-vertex data and optional index buffer.
+  VertexBuffer vertex_buffer;
+
   //----------------------------------------------------------------------------
   /// @brief      Specify the vertex and index buffer to use for this command.
   ///
-  /// @param[in]  buffer  The vertex and index buffer definition.
+  /// @param[in]  buffer  The vertex and index buffer definition. If possible,
+  ///             this value should be moved and not copied.
   ///
   /// @return     returns if the binding was updated.
   ///
-  bool BindVertices(const VertexBuffer& buffer);
+  bool BindVertices(VertexBuffer buffer);
 
+  // |ResourceBinder|
   bool BindResource(ShaderStage stage,
+                    DescriptorType type,
                     const ShaderUniformSlot& slot,
                     const ShaderMetadata& metadata,
-                    const BufferView& view);
-
-  bool BindResource(ShaderStage stage,
-                    const SampledImageSlot& slot,
-                    const ShaderMetadata& metadata,
-                    const std::shared_ptr<const Texture>& texture);
+                    BufferView view) override;
 
   bool BindResource(ShaderStage stage,
-                    const SampledImageSlot& slot,
-                    const ShaderMetadata& metadata,
-                    const std::shared_ptr<const Sampler>& sampler);
+                    DescriptorType type,
+                    const ShaderUniformSlot& slot,
+                    const std::shared_ptr<const ShaderMetadata>& metadata,
+                    BufferView view);
 
+  // |ResourceBinder|
   bool BindResource(ShaderStage stage,
+                    DescriptorType type,
                     const SampledImageSlot& slot,
                     const ShaderMetadata& metadata,
-                    const std::shared_ptr<const Texture>& texture,
-                    const std::shared_ptr<const Sampler>& sampler);
+                    std::shared_ptr<const Texture> texture,
+                    const std::unique_ptr<const Sampler>& sampler) override;
 
-  BufferView GetVertexBuffer() const;
+  bool IsValid() const { return pipeline && pipeline->IsValid(); }
 
-  constexpr operator bool() const { return pipeline && pipeline->IsValid(); }
+ private:
+  template <class T>
+  bool DoBindResource(ShaderStage stage,
+                      const ShaderUniformSlot& slot,
+                      T metadata,
+                      BufferView view);
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_COMMAND_H_
diff --git a/impeller/renderer/command_buffer.cc b/impeller/renderer/command_buffer.cc
index c5e9c5920d18073064b409f8c38e0557ee6946f3..5ff1113c100ec5a8568d65d238621f6e2b07d106 100644
--- a/impeller/renderer/command_buffer.cc
+++ b/impeller/renderer/command_buffer.cc
@@ -4,7 +4,6 @@
 
 #include "impeller/renderer/command_buffer.h"
 
-#include "flutter/fml/trace_event.h"
 #include "impeller/renderer/compute_pass.h"
 #include "impeller/renderer/render_pass.h"
 #include "impeller/renderer/render_target.h"
@@ -17,7 +16,6 @@ CommandBuffer::CommandBuffer(std::weak_ptr<const Context> context)
 CommandBuffer::~CommandBuffer() = default;
 
 bool CommandBuffer::SubmitCommands(const CompletionCallback& callback) {
-  TRACE_EVENT0("impeller", "CommandBuffer::SubmitCommands");
   if (!IsValid()) {
     // Already committed or was never valid. Either way, this is caller error.
     if (callback) {
@@ -32,6 +30,10 @@ bool CommandBuffer::SubmitCommands() {
   return SubmitCommands(nullptr);
 }
 
+void CommandBuffer::WaitUntilScheduled() {
+  return OnWaitUntilScheduled();
+}
+
 std::shared_ptr<RenderPass> CommandBuffer::CreateRenderPass(
     const RenderTarget& render_target) {
   auto pass = OnCreateRenderPass(render_target);
@@ -42,7 +44,7 @@ std::shared_ptr<RenderPass> CommandBuffer::CreateRenderPass(
   return nullptr;
 }
 
-std::shared_ptr<BlitPass> CommandBuffer::CreateBlitPass() const {
+std::shared_ptr<BlitPass> CommandBuffer::CreateBlitPass() {
   auto pass = OnCreateBlitPass();
   if (pass && pass->IsValid()) {
     pass->SetLabel("BlitPass");
@@ -51,7 +53,7 @@ std::shared_ptr<BlitPass> CommandBuffer::CreateBlitPass() const {
   return nullptr;
 }
 
-std::shared_ptr<ComputePass> CommandBuffer::CreateComputePass() const {
+std::shared_ptr<ComputePass> CommandBuffer::CreateComputePass() {
   if (!IsValid()) {
     return nullptr;
   }
diff --git a/impeller/renderer/command_buffer.h b/impeller/renderer/command_buffer.h
index e043e165c2fd491ee7c5100067e4bd6efa6b3e0c..4794941f2857a5f1a1198eb8410e11aaad3d12e8 100644
--- a/impeller/renderer/command_buffer.h
+++ b/impeller/renderer/command_buffer.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_COMMAND_BUFFER_H_
+#define FLUTTER_IMPELLER_RENDERER_COMMAND_BUFFER_H_
 
 #include <functional>
 #include <memory>
 
-#include "flutter/fml/macros.h"
 #include "impeller/renderer/blit_pass.h"
 #include "impeller/renderer/compute_pass.h"
 
@@ -17,6 +17,11 @@ class ComputePass;
 class Context;
 class RenderPass;
 class RenderTarget;
+class CommandQueue;
+
+namespace testing {
+class CommandBufferMock;
+}
 
 //------------------------------------------------------------------------------
 /// @brief      A collection of encoded commands to be submitted to the GPU for
@@ -30,7 +35,7 @@ class RenderTarget;
 ///
 ///             A command buffer is only meant to be used on a single thread. If
 ///             a frame workload needs to be encoded from multiple threads,
-///             setup and record into multiple command buffers. The order of
+///             set up and record into multiple command buffers. The order of
 ///             submission of commands encoded in multiple command buffers can
 ///             be controlled via either the order in which the command buffers
 ///             were created, or, using the `ReserveSpotInQueue` command which
@@ -38,6 +43,8 @@ class RenderTarget;
 ///             different from the encoding order.
 ///
 class CommandBuffer {
+  friend class testing::CommandBufferMock;
+
  public:
   enum class Status {
     kPending,
@@ -54,16 +61,9 @@ class CommandBuffer {
   virtual void SetLabel(const std::string& label) const = 0;
 
   //----------------------------------------------------------------------------
-  /// @brief      Schedule the command encoded by render passes within this
-  ///             command buffer on the GPU.
-  ///
-  ///             A command buffer may only be committed once.
-  ///
-  /// @param[in]  callback  The completion callback.
+  /// @brief      Force execution of pending GPU commands.
   ///
-  [[nodiscard]] bool SubmitCommands(const CompletionCallback& callback);
-
-  [[nodiscard]] bool SubmitCommands();
+  void WaitUntilScheduled();
 
   //----------------------------------------------------------------------------
   /// @brief      Create a render pass to record render commands into.
@@ -81,14 +81,14 @@ class CommandBuffer {
   ///
   /// @return     A valid blit pass or null.
   ///
-  std::shared_ptr<BlitPass> CreateBlitPass() const;
+  std::shared_ptr<BlitPass> CreateBlitPass();
 
   //----------------------------------------------------------------------------
   /// @brief      Create a compute pass to record compute commands into.
   ///
   /// @return     A valid compute pass or null.
   ///
-  std::shared_ptr<ComputePass> CreateComputePass() const;
+  std::shared_ptr<ComputePass> CreateComputePass();
 
  protected:
   std::weak_ptr<const Context> context_;
@@ -98,14 +98,35 @@ class CommandBuffer {
   virtual std::shared_ptr<RenderPass> OnCreateRenderPass(
       RenderTarget render_target) = 0;
 
-  virtual std::shared_ptr<BlitPass> OnCreateBlitPass() const = 0;
+  virtual std::shared_ptr<BlitPass> OnCreateBlitPass() = 0;
 
   [[nodiscard]] virtual bool OnSubmitCommands(CompletionCallback callback) = 0;
 
-  virtual std::shared_ptr<ComputePass> OnCreateComputePass() const = 0;
+  virtual void OnWaitUntilScheduled() = 0;
+
+  virtual std::shared_ptr<ComputePass> OnCreateComputePass() = 0;
 
  private:
-  FML_DISALLOW_COPY_AND_ASSIGN(CommandBuffer);
+  friend class CommandQueue;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Schedule the command encoded by render passes within this
+  ///             command buffer on the GPU. The encoding of these commnands is
+  ///             performed immediately on the calling thread.
+  ///
+  ///             A command buffer may only be committed once.
+  ///
+  /// @param[in]  callback  The completion callback.
+  ///
+  [[nodiscard]] bool SubmitCommands(const CompletionCallback& callback);
+
+  [[nodiscard]] bool SubmitCommands();
+
+  CommandBuffer(const CommandBuffer&) = delete;
+
+  CommandBuffer& operator=(const CommandBuffer&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_COMMAND_BUFFER_H_
diff --git a/impeller/renderer/command_queue.cc b/impeller/renderer/command_queue.cc
new file mode 100644
index 0000000000000000000000000000000000000000..531fa8794220a2da5f4141f2206282809088a941
--- /dev/null
+++ b/impeller/renderer/command_queue.cc
@@ -0,0 +1,33 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/command_queue.h"
+#include "impeller/renderer/command_buffer.h"
+
+namespace impeller {
+
+CommandQueue::CommandQueue() = default;
+
+CommandQueue::~CommandQueue() = default;
+
+fml::Status CommandQueue::Submit(
+    const std::vector<std::shared_ptr<CommandBuffer>>& buffers,
+    const CompletionCallback& completion_callback) {
+  if (buffers.empty()) {
+    if (completion_callback) {
+      completion_callback(CommandBuffer::Status::kError);
+    }
+    return fml::Status(fml::StatusCode::kInvalidArgument,
+                       "No command buffers provided.");
+  }
+  for (const std::shared_ptr<CommandBuffer>& buffer : buffers) {
+    if (!buffer->SubmitCommands(completion_callback)) {
+      return fml::Status(fml::StatusCode::kCancelled,
+                         "Failed to submit command buffer.");
+    }
+  }
+  return fml::Status();
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/command_queue.h b/impeller/renderer/command_queue.h
new file mode 100644
index 0000000000000000000000000000000000000000..140b1c396e244f03f635b9627af3fbc4f9cd223d
--- /dev/null
+++ b/impeller/renderer/command_queue.h
@@ -0,0 +1,50 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_COMMAND_QUEUE_H_
+#define FLUTTER_IMPELLER_RENDERER_COMMAND_QUEUE_H_
+
+#include <functional>
+
+#include "fml/status.h"
+#include "impeller/renderer/command_buffer.h"
+
+namespace impeller {
+
+/// @brief An interface for submitting command buffers to the GPU for
+///        encoding and execution.
+class CommandQueue {
+ public:
+  using CompletionCallback = std::function<void(CommandBuffer::Status)>;
+
+  CommandQueue();
+
+  virtual ~CommandQueue();
+
+  /// @brief Submit one or more command buffer objects to be encoded and
+  ///        executed on the GPU.
+  ///
+  ///        The order of the provided buffers determines the ordering in which
+  ///        they are submitted.
+  ///
+  ///        The returned status only indicates if the command buffer was
+  ///        successfully submitted. Successful completion of the command buffer
+  ///        can only be checked in the optional completion callback.
+  ///
+  ///        Only the Metal and Vulkan backends can give a status beyond
+  ///        successful encoding. This callback may be called more than once and
+  ///        potentially on a different thread.
+  virtual fml::Status Submit(
+      const std::vector<std::shared_ptr<CommandBuffer>>& buffers,
+      const CompletionCallback& completion_callback = {});
+
+ private:
+  CommandQueue(const CommandQueue&) = delete;
+
+  CommandQueue& operator=(const CommandQueue&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_COMMAND_QUEUE_H_
diff --git a/impeller/renderer/compute_command.cc b/impeller/renderer/compute_command.cc
deleted file mode 100644
index e2e2812f362663c5c4ad3d331c039c28d8b76bda..0000000000000000000000000000000000000000
--- a/impeller/renderer/compute_command.cc
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "impeller/renderer/compute_command.h"
-
-#include <utility>
-
-#include "impeller/base/validation.h"
-#include "impeller/renderer/formats.h"
-#include "impeller/renderer/vertex_descriptor.h"
-
-namespace impeller {
-
-bool ComputeCommand::BindResource(ShaderStage stage,
-                                  const ShaderUniformSlot& slot,
-                                  const ShaderMetadata& metadata,
-                                  const BufferView& view) {
-  if (stage != ShaderStage::kCompute) {
-    VALIDATION_LOG << "Use Command for non-compute shader stages.";
-    return false;
-  }
-  if (!view) {
-    return false;
-  }
-
-  bindings.buffers[slot.ext_res_0] = {&metadata, view};
-  return true;
-}
-
-bool ComputeCommand::BindResource(
-    ShaderStage stage,
-    const SampledImageSlot& slot,
-    const ShaderMetadata& metadata,
-    const std::shared_ptr<const Texture>& texture) {
-  if (stage != ShaderStage::kCompute) {
-    VALIDATION_LOG << "Use Command for non-compute shader stages.";
-    return false;
-  }
-  if (!texture || !texture->IsValid()) {
-    return false;
-  }
-
-  if (!slot.HasTexture()) {
-    return true;
-  }
-
-  bindings.textures[slot.texture_index] = {&metadata, texture};
-  return true;
-}
-
-bool ComputeCommand::BindResource(
-    ShaderStage stage,
-    const SampledImageSlot& slot,
-    const ShaderMetadata& metadata,
-    const std::shared_ptr<const Sampler>& sampler) {
-  if (stage != ShaderStage::kCompute) {
-    VALIDATION_LOG << "Use Command for non-compute shader stages.";
-    return false;
-  }
-  if (!sampler || !sampler->IsValid()) {
-    return false;
-  }
-
-  if (!slot.HasSampler()) {
-    return true;
-  }
-
-  bindings.samplers[slot.sampler_index] = {&metadata, sampler};
-  return true;
-}
-
-bool ComputeCommand::BindResource(
-    ShaderStage stage,
-    const SampledImageSlot& slot,
-    const ShaderMetadata& metadata,
-    const std::shared_ptr<const Texture>& texture,
-    const std::shared_ptr<const Sampler>& sampler) {
-  if (stage != ShaderStage::kCompute) {
-    VALIDATION_LOG << "Use Command for non-compute shader stages.";
-    return false;
-  }
-  return BindResource(stage, slot, metadata, texture) &&
-         BindResource(stage, slot, metadata, sampler);
-}
-
-}  // namespace impeller
diff --git a/impeller/renderer/compute_command.h b/impeller/renderer/compute_command.h
deleted file mode 100644
index 54b467a56c8393d7bb9e14996188089d13483e7b..0000000000000000000000000000000000000000
--- a/impeller/renderer/compute_command.h
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#pragma once
-
-#include <map>
-#include <memory>
-#include <optional>
-#include <string>
-
-#include "flutter/fml/logging.h"
-#include "flutter/fml/macros.h"
-#include "impeller/geometry/rect.h"
-#include "impeller/renderer/buffer_view.h"
-#include "impeller/renderer/command.h"
-#include "impeller/renderer/compute_pipeline_descriptor.h"
-#include "impeller/renderer/formats.h"
-#include "impeller/renderer/pipeline.h"
-#include "impeller/renderer/sampler.h"
-#include "impeller/renderer/shader_types.h"
-#include "impeller/renderer/texture.h"
-#include "impeller/renderer/vertex_buffer.h"
-#include "impeller/renderer/vertex_buffer_builder.h"
-#include "impeller/tessellator/tessellator.h"
-
-namespace impeller {
-
-//------------------------------------------------------------------------------
-/// @brief      An object used to specify compute work to the GPU along with
-///             references to resources the GPU will used when doing said work.
-///
-///             To construct a valid command, follow these steps:
-///             * Specify a valid pipeline.
-///             * (Optional) Specify a debug label.
-///
-///             Command are very lightweight objects and can be created
-///             frequently and on demand. The resources referenced in commands
-///             views into buffers managed by other allocators and resource
-///             managers.
-///
-struct ComputeCommand {
-  //----------------------------------------------------------------------------
-  /// The pipeline to use for this command.
-  ///
-  std::shared_ptr<Pipeline<ComputePipelineDescriptor>> pipeline;
-  //----------------------------------------------------------------------------
-  /// The buffer, texture, and sampler bindings used by the compute pipeline
-  /// stage.
-  ///
-  Bindings bindings;
-  //----------------------------------------------------------------------------
-  /// The debugging label to use for the command.
-  ///
-  std::string label;
-
-  bool BindResource(ShaderStage stage,
-                    const ShaderUniformSlot& slot,
-                    const ShaderMetadata& metadata,
-                    const BufferView& view);
-
-  bool BindResource(ShaderStage stage,
-                    const SampledImageSlot& slot,
-                    const ShaderMetadata& metadata,
-                    const std::shared_ptr<const Texture>& texture);
-
-  bool BindResource(ShaderStage stage,
-                    const SampledImageSlot& slot,
-                    const ShaderMetadata& metadata,
-                    const std::shared_ptr<const Sampler>& sampler);
-
-  bool BindResource(ShaderStage stage,
-                    const SampledImageSlot& slot,
-                    const ShaderMetadata& metadata,
-                    const std::shared_ptr<const Texture>& texture,
-                    const std::shared_ptr<const Sampler>& sampler);
-
-  constexpr operator bool() const { return pipeline && pipeline->IsValid(); }
-};
-
-}  // namespace impeller
diff --git a/impeller/renderer/compute_pass.cc b/impeller/renderer/compute_pass.cc
index 7ca45618a95bd6eddab20973337a0b836f44938f..e069aca32e1ccaa0b90c701c184ec4a61ddd595d 100644
--- a/impeller/renderer/compute_pass.cc
+++ b/impeller/renderer/compute_pass.cc
@@ -3,56 +3,19 @@
 // found in the LICENSE file.
 
 #include "impeller/renderer/compute_pass.h"
-#include <memory>
-
-#include "impeller/base/strings.h"
-#include "impeller/base/validation.h"
-#include "impeller/renderer/host_buffer.h"
 
 namespace impeller {
 
-ComputePass::ComputePass(std::weak_ptr<const Context> context)
-    : context_(std::move(context)), transients_buffer_(HostBuffer::Create()) {}
+ComputePass::ComputePass(std::shared_ptr<const Context> context)
+    : context_(std::move(context)) {}
 
 ComputePass::~ComputePass() = default;
 
-HostBuffer& ComputePass::GetTransientsBuffer() {
-  return *transients_buffer_;
-}
-
-void ComputePass::SetLabel(std::string label) {
+void ComputePass::SetLabel(const std::string& label) {
   if (label.empty()) {
     return;
   }
-  transients_buffer_->SetLabel(SPrintF("%s Transients", label.c_str()));
-  OnSetLabel(std::move(label));
-}
-
-void ComputePass::SetGridSize(const ISize& size) {
-  grid_size_ = size;
-}
-
-void ComputePass::SetThreadGroupSize(const ISize& size) {
-  thread_group_size_ = size;
-}
-
-bool ComputePass::AddCommand(ComputeCommand command) {
-  if (!command) {
-    VALIDATION_LOG << "Attempted to add an invalid command to the render pass.";
-    return false;
-  }
-
-  commands_.emplace_back(std::move(command));
-  return true;
-}
-
-bool ComputePass::EncodeCommands() const {
-  auto context = context_.lock();
-  // The context could have been collected in the meantime.
-  if (!context) {
-    return false;
-  }
-  return OnEncodeCommands(*context, grid_size_, thread_group_size_);
+  OnSetLabel(label);
 }
 
 }  // namespace impeller
diff --git a/impeller/renderer/compute_pass.h b/impeller/renderer/compute_pass.h
index 88135a0201a4932db8ee001056a5072327c02b84..50b65c432e86b667e664f59ef26d6bb2cb485b0e 100644
--- a/impeller/renderer/compute_pass.h
+++ b/impeller/renderer/compute_pass.h
@@ -2,79 +2,78 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_COMPUTE_PASS_H_
+#define FLUTTER_IMPELLER_RENDERER_COMPUTE_PASS_H_
 
 #include <string>
-#include <variant>
 
-#include "command_buffer.h"
-#include "impeller/renderer/compute_command.h"
-#include "impeller/renderer/device_buffer.h"
-#include "impeller/renderer/texture.h"
+#include "fml/status.h"
+#include "impeller/core/resource_binder.h"
+#include "impeller/renderer/compute_pipeline_descriptor.h"
+#include "impeller/renderer/pipeline_descriptor.h"
 
 namespace impeller {
 
-class HostBuffer;
-class Allocator;
-
 //------------------------------------------------------------------------------
 /// @brief      Compute passes encode compute shader into the underlying command
 ///             buffer.
 ///
 /// @see        `CommandBuffer`
 ///
-class ComputePass {
+class ComputePass : public ResourceBinder {
  public:
   virtual ~ComputePass();
 
   virtual bool IsValid() const = 0;
 
-  void SetLabel(std::string label);
+  void SetLabel(const std::string& label);
 
-  void SetGridSize(const ISize& size);
+  virtual void SetCommandLabel(std::string_view label) = 0;
 
-  void SetThreadGroupSize(const ISize& size);
+  virtual void SetPipeline(
+      const std::shared_ptr<Pipeline<ComputePipelineDescriptor>>& pipeline) = 0;
 
-  HostBuffer& GetTransientsBuffer();
+  virtual fml::Status Compute(const ISize& grid_size) = 0;
 
-  //----------------------------------------------------------------------------
-  /// @brief      Record a command for subsequent encoding to the underlying
-  ///             command buffer. No work is encoded into the command buffer at
-  ///             this time.
-  ///
-  /// @param[in]  command  The command
+  /// @brief Ensures all previously encoded compute command's buffer writes are
+  ///        visible to any subsequent compute commands.
   ///
-  /// @return     If the command was valid for subsequent commitment.
+  ///        On Vulkan, it does not matter if the compute command is in a
+  ///        different command buffer, only that it is executed later in queue
+  ///        order.
+  virtual void AddBufferMemoryBarrier() = 0;
+
+  /// @brief Ensures all previously encoded compute command's texture writes are
+  ///        visible to any subsequent compute commands.
   ///
-  bool AddCommand(ComputeCommand command);
+  ///        On Vulkan, it does not matter if the compute command is in a
+  ///        different command buffer, only that it is executed later in queue
+  ///        order.
+  virtual void AddTextureMemoryBarrier() = 0;
 
   //----------------------------------------------------------------------------
   /// @brief      Encode the recorded commands to the underlying command buffer.
   ///
-  /// @param      transients_allocator  The transients allocator.
-  ///
   /// @return     If the commands were encoded to the underlying command
   ///             buffer.
   ///
-  bool EncodeCommands() const;
+  virtual bool EncodeCommands() const = 0;
 
- protected:
-  const std::weak_ptr<const Context> context_;
-  ISize grid_size_ = ISize(32, 32);
-  ISize thread_group_size_ = ISize(32, 32);
-  std::shared_ptr<HostBuffer> transients_buffer_;
-  std::vector<ComputeCommand> commands_;
+  const Context& GetContext() const { return *context_; }
 
-  explicit ComputePass(std::weak_ptr<const Context> context);
+ protected:
+  const std::shared_ptr<const Context> context_;
 
-  virtual void OnSetLabel(std::string label) = 0;
+  explicit ComputePass(std::shared_ptr<const Context> context);
 
-  virtual bool OnEncodeCommands(const Context& context,
-                                const ISize& grid_size,
-                                const ISize& thread_group_size) const = 0;
+  virtual void OnSetLabel(const std::string& label) = 0;
 
  private:
-  FML_DISALLOW_COPY_AND_ASSIGN(ComputePass);
+  ComputePass(const ComputePass&) = delete;
+
+  ComputePass& operator=(const ComputePass&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_COMPUTE_PASS_H_
diff --git a/impeller/renderer/compute_pipeline_builder.h b/impeller/renderer/compute_pipeline_builder.h
index 044498d6182706d41b5cb441121ad846721c0490..1e9938ea406ac992472ccc07aab89a9467908a7f 100644
--- a/impeller/renderer/compute_pipeline_builder.h
+++ b/impeller/renderer/compute_pipeline_builder.h
@@ -2,17 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_COMPUTE_PIPELINE_BUILDER_H_
+#define FLUTTER_IMPELLER_RENDERER_COMPUTE_PIPELINE_BUILDER_H_
 
-#include "flutter/fml/logging.h"
-#include "flutter/fml/macros.h"
 #include "impeller/base/strings.h"
 #include "impeller/base/validation.h"
 #include "impeller/renderer/compute_pipeline_descriptor.h"
 #include "impeller/renderer/context.h"
-#include "impeller/renderer/formats.h"
 #include "impeller/renderer/shader_library.h"
-#include "impeller/renderer/vertex_descriptor.h"
 
 namespace impeller {
 
@@ -45,9 +42,8 @@ struct ComputePipelineBuilder {
     ComputePipelineDescriptor desc;
     if (InitializePipelineDescriptorDefaults(context, desc)) {
       return {std::move(desc)};
-    } else {
-      return std::nullopt;
     }
+    return std::nullopt;
   }
 
   [[nodiscard]] static bool InitializePipelineDescriptorDefaults(
@@ -69,6 +65,14 @@ struct ComputePipelineBuilder {
         return false;
       }
 
+      if (!desc.RegisterDescriptorSetLayouts(
+              ComputeShader::kDescriptorSetLayouts)) {
+        VALIDATION_LOG << "Could not configure compute descriptor set layout "
+                          "for pipeline named '"
+                       << ComputeShader::kLabel << "'.";
+        return false;
+      }
+
       desc.SetStageEntrypoint(std::move(compute_function));
     }
     return true;
@@ -76,3 +80,5 @@ struct ComputePipelineBuilder {
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_COMPUTE_PIPELINE_BUILDER_H_
diff --git a/impeller/renderer/compute_pipeline_descriptor.cc b/impeller/renderer/compute_pipeline_descriptor.cc
index 37a69eaec955e80417c829725d64b9da2b1914cf..efb9cda26cfc0d0b74d7973c2a942c277787ab3c 100644
--- a/impeller/renderer/compute_pipeline_descriptor.cc
+++ b/impeller/renderer/compute_pipeline_descriptor.cc
@@ -4,7 +4,7 @@
 
 #include "impeller/renderer/compute_pipeline_descriptor.h"
 
-#include "impeller/renderer/formats.h"
+#include "impeller/core/formats.h"
 #include "impeller/renderer/shader_function.h"
 #include "impeller/renderer/shader_library.h"
 #include "impeller/renderer/vertex_descriptor.h"
@@ -63,4 +63,19 @@ const std::string& ComputePipelineDescriptor::GetLabel() const {
   return label_;
 }
 
+bool ComputePipelineDescriptor::RegisterDescriptorSetLayouts(
+    const DescriptorSetLayout desc_set_layout[],
+    size_t count) {
+  descriptor_set_layouts_.reserve(descriptor_set_layouts_.size() + count);
+  for (size_t i = 0; i < count; i++) {
+    descriptor_set_layouts_.emplace_back(desc_set_layout[i]);
+  }
+  return true;
+}
+
+const std::vector<DescriptorSetLayout>&
+ComputePipelineDescriptor::GetDescriptorSetLayouts() const {
+  return descriptor_set_layouts_;
+}
+
 }  // namespace impeller
diff --git a/impeller/renderer/compute_pipeline_descriptor.h b/impeller/renderer/compute_pipeline_descriptor.h
index 582844db7dd3c21e9dacc5aaa6074a1b8322a318..a92def4c78fd6b15b3a2dbfd291e40f06191bb27 100644
--- a/impeller/renderer/compute_pipeline_descriptor.h
+++ b/impeller/renderer/compute_pipeline_descriptor.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_COMPUTE_PIPELINE_DESCRIPTOR_H_
+#define FLUTTER_IMPELLER_RENDERER_COMPUTE_PIPELINE_DESCRIPTOR_H_
 
 #include <functional>
 #include <future>
@@ -16,8 +17,8 @@
 #include "flutter/fml/hash_combine.h"
 #include "flutter/fml/macros.h"
 #include "impeller/base/comparable.h"
-#include "impeller/renderer/formats.h"
-#include "impeller/renderer/shader_types.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/shader_types.h"
 #include "impeller/tessellator/tessellator.h"
 
 namespace impeller {
@@ -48,9 +49,23 @@ class ComputePipelineDescriptor final
   // Comparable<PipelineDescriptor>
   bool IsEqual(const ComputePipelineDescriptor& other) const override;
 
+  template <size_t Size>
+  bool RegisterDescriptorSetLayouts(
+      const std::array<DescriptorSetLayout, Size>& inputs) {
+    return RegisterDescriptorSetLayouts(inputs.data(), inputs.size());
+  }
+
+  bool RegisterDescriptorSetLayouts(const DescriptorSetLayout desc_set_layout[],
+                                    size_t count);
+
+  const std::vector<DescriptorSetLayout>& GetDescriptorSetLayouts() const;
+
  private:
   std::string label_;
   std::shared_ptr<const ShaderFunction> entrypoint_;
+  std::vector<DescriptorSetLayout> descriptor_set_layouts_;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_COMPUTE_PIPELINE_DESCRIPTOR_H_
diff --git a/impeller/renderer/compute_subgroup_unittests.cc b/impeller/renderer/compute_subgroup_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..dd657b1a624748f0e06e6f4750adec8dac2dcf6b
--- /dev/null
+++ b/impeller/renderer/compute_subgroup_unittests.cc
@@ -0,0 +1,473 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <future>
+#include <numeric>
+
+#include "compute_tessellator.h"
+#include "flutter/fml/synchronization/waitable_event.h"
+#include "flutter/fml/time/time_point.h"
+#include "flutter/testing/testing.h"
+#include "gmock/gmock.h"
+#include "impeller/base/strings.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/host_buffer.h"
+#include "impeller/display_list/skia_conversions.h"
+#include "impeller/entity/contents/content_context.h"
+#include "impeller/fixtures/golden_paths.h"
+#include "impeller/fixtures/sample.comp.h"
+#include "impeller/fixtures/stage1.comp.h"
+#include "impeller/fixtures/stage2.comp.h"
+#include "impeller/geometry/path.h"
+#include "impeller/geometry/path_builder.h"
+#include "impeller/geometry/path_component.h"
+#include "impeller/playground/compute_playground_test.h"
+#include "impeller/renderer/command_buffer.h"
+#include "impeller/renderer/compute_pipeline_builder.h"
+#include "impeller/renderer/compute_tessellator.h"
+#include "impeller/renderer/path_polyline.comp.h"
+#include "impeller/renderer/pipeline_library.h"
+#include "impeller/renderer/render_pass.h"
+#include "impeller/renderer/stroke.comp.h"
+#include "third_party/imgui/imgui.h"
+#include "third_party/skia/include/utils/SkParsePath.h"
+
+namespace impeller {
+namespace testing {
+
+using ComputeSubgroupTest = ComputePlaygroundTest;
+INSTANTIATE_COMPUTE_SUITE(ComputeSubgroupTest);
+
+TEST_P(ComputeSubgroupTest, CapabilitiesSuportSubgroups) {
+  auto context = GetContext();
+  ASSERT_TRUE(context);
+  ASSERT_TRUE(context->GetCapabilities()->SupportsComputeSubgroups());
+}
+
+TEST_P(ComputeSubgroupTest, PathPlayground) {
+  // Renders stroked SVG paths in an interactive playground.
+  using SS = StrokeComputeShader;
+
+  auto context = GetContext();
+  ASSERT_TRUE(context);
+  ASSERT_TRUE(context->GetCapabilities()->SupportsComputeSubgroups());
+  char svg_path_data[16384] =
+      "M140 20 "
+      "C73 20 20 74 20 140 "
+      "c0 135 136 170 228 303 "
+      "88-132 229-173 229-303 "
+      "0-66-54-120-120-120 "
+      "-48 0-90 28-109 69 "
+      "-19-41-60-69-108-69z";
+  size_t vertex_count = 0;
+  Scalar stroke_width = 1.0;
+
+  auto vertex_buffer = CreateHostVisibleDeviceBuffer<SS::VertexBuffer<2048>>(
+      context, "VertexBuffer");
+  auto vertex_buffer_count =
+      CreateHostVisibleDeviceBuffer<SS::VertexBufferCount>(context,
+                                                           "VertexCount");
+
+  auto callback = [&](RenderPass& pass) -> bool {
+    ::memset(vertex_buffer_count->OnGetContents(), 0,
+             sizeof(SS::VertexBufferCount));
+    ::memset(vertex_buffer->OnGetContents(), 0, sizeof(SS::VertexBuffer<2048>));
+    const auto* main_viewport = ImGui::GetMainViewport();
+    ImGui::SetNextWindowPos(
+        ImVec2(main_viewport->WorkPos.x + 650, main_viewport->WorkPos.y + 20));
+    ImGui::Begin("Path data", nullptr, ImGuiWindowFlags_AlwaysAutoResize);
+    ImGui::InputTextMultiline("Path", svg_path_data,
+                              IM_ARRAYSIZE(svg_path_data));
+    ImGui::DragFloat("Stroke width", &stroke_width, .1, 0.0, 25.0);
+
+    SkPath sk_path;
+    if (SkParsePath::FromSVGString(svg_path_data, &sk_path)) {
+      std::promise<bool> promise;
+      auto future = promise.get_future();
+
+      auto path = skia_conversions::ToPath(sk_path);
+      auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
+      auto status =
+          ComputeTessellator{}
+              .SetStrokeWidth(stroke_width)
+              .Tessellate(path, *host_buffer, context,
+                          DeviceBuffer::AsBufferView(vertex_buffer),
+                          DeviceBuffer::AsBufferView(vertex_buffer_count),
+                          [vertex_buffer_count, &vertex_count,
+                           &promise](CommandBuffer::Status status) {
+                            vertex_count =
+                                reinterpret_cast<SS::VertexBufferCount*>(
+                                    vertex_buffer_count->OnGetContents())
+                                    ->count;
+                            promise.set_value(
+                                status == CommandBuffer::Status::kCompleted);
+                          });
+      switch (status) {
+        case ComputeTessellator::Status::kCommandInvalid:
+          ImGui::Text("Failed to submit compute job (invalid command)");
+          break;
+        case ComputeTessellator::Status::kTooManyComponents:
+          ImGui::Text("Failed to submit compute job (too many components) ");
+          break;
+        case ComputeTessellator::Status::kOk:
+          break;
+      }
+      if (!future.get()) {
+        ImGui::Text("Failed to submit compute job.");
+        return false;
+      }
+      if (vertex_count > 0) {
+        ImGui::Text("Vertex count: %zu", vertex_count);
+      }
+    } else {
+      ImGui::Text("Failed to parse path data");
+    }
+    ImGui::End();
+
+    ContentContext renderer(context, nullptr);
+    if (!renderer.IsValid()) {
+      return false;
+    }
+
+    using VS = SolidFillPipeline::VertexShader;
+
+    pass.SetCommandLabel("Draw Stroke");
+    pass.SetStencilReference(0);
+
+    ContentContextOptions options;
+    options.sample_count = pass.GetRenderTarget().GetSampleCount();
+    options.color_attachment_pixel_format =
+        pass.GetRenderTarget().GetRenderTargetPixelFormat();
+    options.has_depth_stencil_attachments =
+        pass.GetRenderTarget().GetStencilAttachment().has_value();
+    options.blend_mode = BlendMode::kSourceIn;
+    options.primitive_type = PrimitiveType::kTriangleStrip;
+
+    options.stencil_mode =
+        ContentContextOptions::StencilMode::kLegacyClipIncrement;
+
+    pass.SetPipeline(renderer.GetSolidFillPipeline(options));
+
+    auto count = reinterpret_cast<SS::VertexBufferCount*>(
+                     vertex_buffer_count->OnGetContents())
+                     ->count;
+
+    pass.SetVertexBuffer(
+        VertexBuffer{.vertex_buffer = DeviceBuffer::AsBufferView(vertex_buffer),
+                     .vertex_count = count,
+                     .index_type = IndexType::kNone});
+
+    VS::FrameInfo frame_info;
+    auto world_matrix = Matrix::MakeScale(GetContentScale());
+    frame_info.mvp = pass.GetOrthographicTransform() * world_matrix;
+    frame_info.color = Color::Red().Premultiply();
+    VS::BindFrameInfo(
+        pass, renderer.GetTransientsBuffer().EmplaceUniform(frame_info));
+
+    return pass.Draw().ok();
+  };
+  ASSERT_TRUE(OpenPlaygroundHere(callback));
+}
+
+TEST_P(ComputeSubgroupTest, LargePath) {
+  // The path in here is large enough to highlight issues around exceeding
+  // subgroup size.
+  using SS = StrokeComputeShader;
+
+  auto context = GetContext();
+  ASSERT_TRUE(context);
+  ASSERT_TRUE(context->GetCapabilities()->SupportsComputeSubgroups());
+  size_t vertex_count = 0;
+  Scalar stroke_width = 1.0;
+
+  auto vertex_buffer = CreateHostVisibleDeviceBuffer<SS::VertexBuffer<2048>>(
+      context, "VertexBuffer");
+  auto vertex_buffer_count =
+      CreateHostVisibleDeviceBuffer<SS::VertexBufferCount>(context,
+                                                           "VertexCount");
+
+  auto complex_path =
+      PathBuilder{}
+          .MoveTo({359.934, 96.6335})
+          .CubicCurveTo({358.189, 96.7055}, {356.436, 96.7908},
+                        {354.673, 96.8895})
+          .CubicCurveTo({354.571, 96.8953}, {354.469, 96.9016},
+                        {354.367, 96.9075})
+          .CubicCurveTo({352.672, 97.0038}, {350.969, 97.113},
+                        {349.259, 97.2355})
+          .CubicCurveTo({349.048, 97.2506}, {348.836, 97.2678},
+                        {348.625, 97.2834})
+          .CubicCurveTo({347.019, 97.4014}, {345.407, 97.5299},
+                        {343.789, 97.6722})
+          .CubicCurveTo({343.428, 97.704}, {343.065, 97.7402},
+                        {342.703, 97.7734})
+          .CubicCurveTo({341.221, 97.9086}, {339.736, 98.0505},
+                        {338.246, 98.207})
+          .CubicCurveTo({337.702, 98.2642}, {337.156, 98.3292},
+                        {336.612, 98.3894})
+          .CubicCurveTo({335.284, 98.5356}, {333.956, 98.6837},
+                        {332.623, 98.8476})
+          .CubicCurveTo({332.495, 98.8635}, {332.366, 98.8818},
+                        {332.237, 98.8982})
+          .LineTo({332.237, 102.601})
+          .LineTo({321.778, 102.601})
+          .LineTo({321.778, 100.382})
+          .CubicCurveTo({321.572, 100.413}, {321.367, 100.442},
+                        {321.161, 100.476})
+          .CubicCurveTo({319.22, 100.79}, {317.277, 101.123},
+                        {315.332, 101.479})
+          .CubicCurveTo({315.322, 101.481}, {315.311, 101.482},
+                        {315.301, 101.484})
+          .LineTo({310.017, 105.94})
+          .LineTo({309.779, 105.427})
+          .LineTo({314.403, 101.651})
+          .CubicCurveTo({314.391, 101.653}, {314.379, 101.656},
+                        {314.368, 101.658})
+          .CubicCurveTo({312.528, 102.001}, {310.687, 102.366},
+                        {308.846, 102.748})
+          .CubicCurveTo({307.85, 102.955}, {306.855, 103.182}, {305.859, 103.4})
+          .CubicCurveTo({305.048, 103.579}, {304.236, 103.75},
+                        {303.425, 103.936})
+          .LineTo({299.105, 107.578})
+          .LineTo({298.867, 107.065})
+          .LineTo({302.394, 104.185})
+          .LineTo({302.412, 104.171})
+          .CubicCurveTo({301.388, 104.409}, {300.366, 104.67},
+                        {299.344, 104.921})
+          .CubicCurveTo({298.618, 105.1}, {297.89, 105.269}, {297.165, 105.455})
+          .CubicCurveTo({295.262, 105.94}, {293.36, 106.445},
+                        {291.462, 106.979})
+          .CubicCurveTo({291.132, 107.072}, {290.802, 107.163},
+                        {290.471, 107.257})
+          .CubicCurveTo({289.463, 107.544}, {288.455, 107.839},
+                        {287.449, 108.139})
+          .CubicCurveTo({286.476, 108.431}, {285.506, 108.73},
+                        {284.536, 109.035})
+          .CubicCurveTo({283.674, 109.304}, {282.812, 109.579},
+                        {281.952, 109.859})
+          .CubicCurveTo({281.177, 110.112}, {280.406, 110.377},
+                        {279.633, 110.638})
+          .CubicCurveTo({278.458, 111.037}, {277.256, 111.449},
+                        {276.803, 111.607})
+          .CubicCurveTo({276.76, 111.622}, {276.716, 111.637},
+                        {276.672, 111.653})
+          .CubicCurveTo({275.017, 112.239}, {273.365, 112.836},
+                        {271.721, 113.463})
+          .LineTo({271.717, 113.449})
+          .CubicCurveTo({271.496, 113.496}, {271.238, 113.559},
+                        {270.963, 113.628})
+          .CubicCurveTo({270.893, 113.645}, {270.822, 113.663},
+                        {270.748, 113.682})
+          .CubicCurveTo({270.468, 113.755}, {270.169, 113.834},
+                        {269.839, 113.926})
+          .CubicCurveTo({269.789, 113.94}, {269.732, 113.957},
+                        {269.681, 113.972})
+          .CubicCurveTo({269.391, 114.053}, {269.081, 114.143},
+                        {268.756, 114.239})
+          .CubicCurveTo({268.628, 114.276}, {268.5, 114.314},
+                        {268.367, 114.354})
+          .CubicCurveTo({268.172, 114.412}, {267.959, 114.478},
+                        {267.752, 114.54})
+          .CubicCurveTo({263.349, 115.964}, {258.058, 117.695},
+                        {253.564, 119.252})
+          .CubicCurveTo({253.556, 119.255}, {253.547, 119.258},
+                        {253.538, 119.261})
+          .CubicCurveTo({251.844, 119.849}, {250.056, 120.474},
+                        {248.189, 121.131})
+          .CubicCurveTo({248, 121.197}, {247.812, 121.264}, {247.621, 121.331})
+          .CubicCurveTo({247.079, 121.522}, {246.531, 121.715},
+                        {245.975, 121.912})
+          .CubicCurveTo({245.554, 122.06}, {245.126, 122.212},
+                        {244.698, 122.364})
+          .CubicCurveTo({244.071, 122.586}, {243.437, 122.811},
+                        {242.794, 123.04})
+          .CubicCurveTo({242.189, 123.255}, {241.58, 123.472},
+                        {240.961, 123.693})
+          .CubicCurveTo({240.659, 123.801}, {240.357, 123.909},
+                        {240.052, 124.018})
+          .CubicCurveTo({239.12, 124.351}, {238.18, 124.687}, {237.22, 125.032})
+          .LineTo({237.164, 125.003})
+          .CubicCurveTo({236.709, 125.184}, {236.262, 125.358},
+                        {235.81, 125.538})
+          .CubicCurveTo({235.413, 125.68}, {234.994, 125.832},
+                        {234.592, 125.977})
+          .CubicCurveTo({234.592, 125.977}, {234.591, 125.977},
+                        {234.59, 125.977})
+          .CubicCurveTo({222.206, 130.435}, {207.708, 135.753},
+                        {192.381, 141.429})
+          .CubicCurveTo({162.77, 151.336}, {122.17, 156.894}, {84.1123, 160})
+          .LineTo({360, 160})
+          .LineTo({360, 119.256})
+          .LineTo({360, 106.332})
+          .LineTo({360, 96.6307})
+          .CubicCurveTo({359.978, 96.6317}, {359.956, 96.6326},
+                        {359.934, 96.6335})
+          .Close()
+          .TakePath();
+
+  auto callback = [&](RenderPass& pass) -> bool {
+    ::memset(vertex_buffer_count->OnGetContents(), 0,
+             sizeof(SS::VertexBufferCount));
+    ::memset(vertex_buffer->OnGetContents(), 0, sizeof(SS::VertexBuffer<2048>));
+
+    ContentContext renderer(context, nullptr);
+    if (!renderer.IsValid()) {
+      return false;
+    }
+
+    ComputeTessellator{}
+        .SetStrokeWidth(stroke_width)
+        .Tessellate(
+            complex_path, renderer.GetTransientsBuffer(), context,
+            DeviceBuffer::AsBufferView(vertex_buffer),
+            DeviceBuffer::AsBufferView(vertex_buffer_count),
+            [vertex_buffer_count, &vertex_count](CommandBuffer::Status status) {
+              vertex_count = reinterpret_cast<SS::VertexBufferCount*>(
+                                 vertex_buffer_count->OnGetContents())
+                                 ->count;
+            });
+
+    using VS = SolidFillPipeline::VertexShader;
+
+    pass.SetCommandLabel("Draw Stroke");
+    pass.SetStencilReference(0);
+
+    ContentContextOptions options;
+    options.sample_count = pass.GetRenderTarget().GetSampleCount();
+    options.color_attachment_pixel_format =
+        pass.GetRenderTarget().GetRenderTargetPixelFormat();
+    options.has_depth_stencil_attachments =
+        pass.GetRenderTarget().GetStencilAttachment().has_value();
+    options.blend_mode = BlendMode::kSourceIn;
+    options.primitive_type = PrimitiveType::kTriangleStrip;
+
+    options.stencil_mode =
+        ContentContextOptions::StencilMode::kLegacyClipIncrement;
+
+    pass.SetPipeline(renderer.GetSolidFillPipeline(options));
+
+    auto count = reinterpret_cast<SS::VertexBufferCount*>(
+                     vertex_buffer_count->OnGetContents())
+                     ->count;
+
+    pass.SetVertexBuffer(
+        VertexBuffer{.vertex_buffer = DeviceBuffer::AsBufferView(vertex_buffer),
+                     .vertex_count = count,
+                     .index_type = IndexType::kNone});
+
+    VS::FrameInfo frame_info;
+    auto world_matrix = Matrix::MakeScale(GetContentScale());
+    frame_info.mvp = pass.GetOrthographicTransform() * world_matrix;
+    frame_info.color = Color::Red().Premultiply();
+    VS::BindFrameInfo(
+        pass, renderer.GetTransientsBuffer().EmplaceUniform(frame_info));
+
+    return pass.Draw().ok();
+  };
+  ASSERT_TRUE(OpenPlaygroundHere(callback));
+}
+
+TEST_P(ComputeSubgroupTest, QuadAndCubicInOnePath) {
+  using SS = StrokeComputeShader;
+
+  auto context = GetContext();
+  ASSERT_TRUE(context);
+  ASSERT_TRUE(context->GetCapabilities()->SupportsComputeSubgroups());
+
+  auto vertex_buffer = CreateHostVisibleDeviceBuffer<SS::VertexBuffer<2048>>(
+      context, "VertexBuffer");
+  auto vertex_buffer_count =
+      CreateHostVisibleDeviceBuffer<SS::VertexBufferCount>(context,
+                                                           "VertexBufferCount");
+
+  auto path = PathBuilder{}
+                  .AddCubicCurve({140, 20}, {73, 20}, {20, 74}, {20, 140})
+                  .AddQuadraticCurve({20, 140}, {93, 90}, {100, 42})
+                  .TakePath();
+
+  auto tessellator = ComputeTessellator{};
+
+  fml::AutoResetWaitableEvent latch;
+
+  auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
+  auto status = tessellator.Tessellate(
+      path, *host_buffer, context, DeviceBuffer::AsBufferView(vertex_buffer),
+      DeviceBuffer::AsBufferView(vertex_buffer_count),
+      [&latch](CommandBuffer::Status status) {
+        EXPECT_EQ(status, CommandBuffer::Status::kCompleted);
+        latch.Signal();
+      });
+
+  ASSERT_EQ(status, ComputeTessellator::Status::kOk);
+
+  auto callback = [&](RenderPass& pass) -> bool {
+    ContentContext renderer(context, nullptr);
+    if (!renderer.IsValid()) {
+      return false;
+    }
+
+    using VS = SolidFillPipeline::VertexShader;
+
+    pass.SetCommandLabel("Draw Stroke");
+    pass.SetStencilReference(0);
+
+    ContentContextOptions options;
+    options.sample_count = pass.GetRenderTarget().GetSampleCount();
+    options.color_attachment_pixel_format =
+        pass.GetRenderTarget().GetRenderTargetPixelFormat();
+    options.has_depth_stencil_attachments =
+        pass.GetRenderTarget().GetStencilAttachment().has_value();
+    options.blend_mode = BlendMode::kSourceIn;
+    options.primitive_type = PrimitiveType::kTriangleStrip;
+
+    options.stencil_mode =
+        ContentContextOptions::StencilMode::kLegacyClipIncrement;
+
+    pass.SetPipeline(renderer.GetSolidFillPipeline(options));
+
+    auto count = reinterpret_cast<SS::VertexBufferCount*>(
+                     vertex_buffer_count->OnGetContents())
+                     ->count;
+
+    pass.SetVertexBuffer(
+        VertexBuffer{.vertex_buffer = DeviceBuffer::AsBufferView(vertex_buffer),
+                     .vertex_count = count,
+                     .index_type = IndexType::kNone});
+
+    VS::FrameInfo frame_info;
+    auto world_matrix = Matrix::MakeScale(GetContentScale());
+    frame_info.mvp = pass.GetOrthographicTransform() * world_matrix;
+    frame_info.color = Color::Red().Premultiply();
+    VS::BindFrameInfo(
+        pass, renderer.GetTransientsBuffer().EmplaceUniform(frame_info));
+
+    return pass.Draw().ok();
+  };
+  ASSERT_TRUE(OpenPlaygroundHere(callback));
+
+  // The latch is down here because it's expected that on Metal the backend
+  // will take care of synchronizing the buffer between the compute and render
+  // pass usages, since it's not MTLHeap allocated. However, if playgrounds
+  // are disabled, no render pass actually gets submitted and we need to do a
+  // CPU latch here.
+  latch.Wait();
+
+  auto vertex_count = reinterpret_cast<SS::VertexBufferCount*>(
+                          vertex_buffer_count->OnGetContents())
+                          ->count;
+  EXPECT_EQ(vertex_count, golden_cubic_and_quad_points.size());
+  auto vertex_buffer_data =
+      reinterpret_cast<SS::VertexBuffer<2048>*>(vertex_buffer->OnGetContents());
+  for (size_t i = 0; i < vertex_count; i++) {
+    EXPECT_LT(std::abs(golden_cubic_and_quad_points[i].x -
+                       vertex_buffer_data->position[i].x),
+              1e-3);
+    EXPECT_LT(std::abs(golden_cubic_and_quad_points[i].y -
+                       vertex_buffer_data->position[i].y),
+              1e-3);
+  }
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/renderer/compute_tessellator.cc b/impeller/renderer/compute_tessellator.cc
new file mode 100644
index 0000000000000000000000000000000000000000..8e8d084e7a2cddfaa4206e57e348eaf39ea42e57
--- /dev/null
+++ b/impeller/renderer/compute_tessellator.cc
@@ -0,0 +1,181 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/compute_tessellator.h"
+
+#include <cstdint>
+
+#include "impeller/core/host_buffer.h"
+#include "impeller/renderer/command_buffer.h"
+#include "impeller/renderer/path_polyline.comp.h"
+#include "impeller/renderer/pipeline_library.h"
+#include "impeller/renderer/stroke.comp.h"
+
+namespace impeller {
+
+ComputeTessellator::ComputeTessellator() = default;
+ComputeTessellator::~ComputeTessellator() = default;
+
+template <typename T>
+static std::shared_ptr<DeviceBuffer> CreateDeviceBuffer(
+    const std::shared_ptr<Context>& context,
+    const std::string& label,
+    StorageMode storage_mode = StorageMode::kDevicePrivate) {
+  DeviceBufferDescriptor desc;
+  desc.storage_mode = storage_mode;
+  desc.size = sizeof(T);
+  auto buffer = context->GetResourceAllocator()->CreateBuffer(desc);
+  buffer->SetLabel(label);
+  return buffer;
+}
+
+ComputeTessellator& ComputeTessellator::SetStyle(Style value) {
+  style_ = value;
+  return *this;
+}
+
+ComputeTessellator& ComputeTessellator::SetStrokeWidth(Scalar value) {
+  stroke_width_ = value;
+  return *this;
+}
+
+ComputeTessellator& ComputeTessellator::SetStrokeJoin(Join value) {
+  stroke_join_ = value;
+  return *this;
+}
+ComputeTessellator& ComputeTessellator::SetStrokeCap(Cap value) {
+  stroke_cap_ = value;
+  return *this;
+}
+ComputeTessellator& ComputeTessellator::SetMiterLimit(Scalar value) {
+  miter_limit_ = value;
+  return *this;
+}
+ComputeTessellator& ComputeTessellator::SetCubicAccuracy(Scalar value) {
+  cubic_accuracy_ = value;
+  return *this;
+}
+ComputeTessellator& ComputeTessellator::SetQuadraticTolerance(Scalar value) {
+  quad_tolerance_ = value;
+  return *this;
+}
+
+ComputeTessellator::Status ComputeTessellator::Tessellate(
+    const Path& path,
+    HostBuffer& host_buffer,
+    const std::shared_ptr<Context>& context,
+    BufferView vertex_buffer,
+    BufferView vertex_buffer_count,
+    const CommandBuffer::CompletionCallback& callback) const {
+  FML_DCHECK(style_ == Style::kStroke);
+  using PS = PathPolylineComputeShader;
+  using SS = StrokeComputeShader;
+
+  auto cubic_count = path.GetComponentCount(Path::ComponentType::kCubic);
+  auto quad_count = path.GetComponentCount(Path::ComponentType::kQuadratic) +
+                    (cubic_count * 6);
+  auto line_count =
+      path.GetComponentCount(Path::ComponentType::kLinear) + (quad_count * 6);
+  if (cubic_count > kMaxCubicCount || quad_count > kMaxQuadCount ||
+      line_count > kMaxLineCount) {
+    return Status::kTooManyComponents;
+  }
+  PS::Cubics<kMaxCubicCount> cubics{.count = 0};
+  PS::Quads<kMaxQuadCount> quads{.count = 0};
+  PS::Lines<kMaxLineCount> lines{.count = 0};
+  PS::Components<kMaxComponentCount> components{.count = 0};
+  PS::Config config{.cubic_accuracy = cubic_accuracy_,
+                    .quad_tolerance = quad_tolerance_};
+
+  path.EnumerateComponents(
+      [&lines, &components](size_t index, const LinearPathComponent& linear) {
+        ::memcpy(&lines.data[lines.count], &linear,
+                 sizeof(LinearPathComponent));
+        components.data[components.count++] = {lines.count++, 2};
+      },
+      [&quads, &components](size_t index, const QuadraticPathComponent& quad) {
+        ::memcpy(&quads.data[quads.count], &quad,
+                 sizeof(QuadraticPathComponent));
+        components.data[components.count++] = {quads.count++, 3};
+      },
+      [&cubics, &components](size_t index, const CubicPathComponent& cubic) {
+        ::memcpy(&cubics.data[cubics.count], &cubic,
+                 sizeof(CubicPathComponent));
+        components.data[components.count++] = {cubics.count++, 4};
+      },
+      [](size_t index, const ContourComponent& contour) {});
+
+  auto polyline_buffer =
+      CreateDeviceBuffer<PS::Polyline<2048>>(context, "Polyline");
+
+  auto cmd_buffer = context->CreateCommandBuffer();
+  auto pass = cmd_buffer->CreateComputePass();
+  FML_DCHECK(pass && pass->IsValid());
+
+  {
+    using PathPolylinePipelineBuilder = ComputePipelineBuilder<PS>;
+    auto pipeline_desc =
+        PathPolylinePipelineBuilder::MakeDefaultPipelineDescriptor(*context);
+    FML_DCHECK(pipeline_desc.has_value());
+    auto compute_pipeline =
+        context->GetPipelineLibrary()->GetPipeline(pipeline_desc).Get();
+    FML_DCHECK(compute_pipeline);
+
+    pass->SetPipeline(compute_pipeline);
+    pass->SetCommandLabel("Generate Polyline");
+
+    PS::BindConfig(*pass, host_buffer.EmplaceUniform(config));
+    PS::BindCubics(*pass, host_buffer.EmplaceStorageBuffer(cubics));
+    PS::BindQuads(*pass, host_buffer.EmplaceStorageBuffer(quads));
+    PS::BindLines(*pass, host_buffer.EmplaceStorageBuffer(lines));
+    PS::BindComponents(*pass, host_buffer.EmplaceStorageBuffer(components));
+    PS::BindPolyline(*pass, DeviceBuffer::AsBufferView(polyline_buffer));
+
+    if (!pass->Compute(ISize(line_count, 1)).ok()) {
+      return Status::kCommandInvalid;
+    }
+  }
+
+  {
+    using StrokePipelineBuilder = ComputePipelineBuilder<SS>;
+    auto pipeline_desc =
+        StrokePipelineBuilder::MakeDefaultPipelineDescriptor(*context);
+    FML_DCHECK(pipeline_desc.has_value());
+    auto compute_pipeline =
+        context->GetPipelineLibrary()->GetPipeline(pipeline_desc).Get();
+    FML_DCHECK(compute_pipeline);
+
+    pass->AddBufferMemoryBarrier();
+    pass->SetPipeline(compute_pipeline);
+    pass->SetCommandLabel("Compute Stroke");
+
+    SS::Config config{
+        .width = stroke_width_,
+        .cap = static_cast<uint32_t>(stroke_cap_),
+        .join = static_cast<uint32_t>(stroke_join_),
+        .miter_limit = miter_limit_,
+    };
+    SS::BindConfig(*pass, host_buffer.EmplaceUniform(config));
+
+    SS::BindPolyline(*pass, DeviceBuffer::AsBufferView(polyline_buffer));
+    SS::BindVertexBufferCount(*pass, std::move(vertex_buffer_count));
+    SS::BindVertexBuffer(*pass, std::move(vertex_buffer));
+
+    if (!pass->Compute(ISize(line_count, 1)).ok()) {
+      return Status::kCommandInvalid;
+    }
+  }
+
+  if (!pass->EncodeCommands()) {
+    return Status::kCommandInvalid;
+  }
+
+  if (!context->GetCommandQueue()->Submit({cmd_buffer}, callback).ok()) {
+    return Status::kCommandInvalid;
+  }
+
+  return Status::kOk;
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/compute_tessellator.h b/impeller/renderer/compute_tessellator.h
new file mode 100644
index 0000000000000000000000000000000000000000..0dc6b56bc1e761878592c83e007ffed92874c2c4
--- /dev/null
+++ b/impeller/renderer/compute_tessellator.h
@@ -0,0 +1,90 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_COMPUTE_TESSELLATOR_H_
+#define FLUTTER_IMPELLER_RENDERER_COMPUTE_TESSELLATOR_H_
+
+#include "flutter/fml/macros.h"
+#include "impeller/core/buffer_view.h"
+#include "impeller/geometry/path.h"
+#include "impeller/renderer/command_buffer.h"
+#include "impeller/renderer/context.h"
+
+namespace impeller {
+
+//------------------------------------------------------------------------------
+/// @brief      A utility that generates triangles of the specified fill type
+///             given a path.
+///
+class ComputeTessellator {
+ public:
+  ComputeTessellator();
+
+  ~ComputeTessellator();
+
+  static constexpr size_t kMaxCubicCount = 512;
+  static constexpr size_t kMaxQuadCount = 2048;
+  static constexpr size_t kMaxLineCount = 4096;
+  static constexpr size_t kMaxComponentCount =
+      kMaxCubicCount + kMaxQuadCount + kMaxLineCount;
+
+  enum class Status {
+    kCommandInvalid,
+    kTooManyComponents,
+    kOk,
+  };
+
+  enum class Style {
+    kStroke,
+    // TODO(dnfield): Implement kFill.
+  };
+
+  ComputeTessellator& SetStyle(Style value);
+  ComputeTessellator& SetStrokeWidth(Scalar value);
+  ComputeTessellator& SetStrokeJoin(Join value);
+  ComputeTessellator& SetStrokeCap(Cap value);
+  ComputeTessellator& SetMiterLimit(Scalar value);
+  ComputeTessellator& SetCubicAccuracy(Scalar value);
+  ComputeTessellator& SetQuadraticTolerance(Scalar value);
+
+  //----------------------------------------------------------------------------
+  /// @brief      Generates triangles from the path.
+  ///             If the data needs to be synchronized back to the CPU, e.g.
+  ///             because one of the buffer views are host visible and will be
+  ///             used without creating a blit pass to copy them back, the
+  ///             callback is used to determine when the GPU calculation is
+  ///             complete and its status.
+  ///             On Metal, no additional synchronization is needed as long as
+  ///             the buffers are not heap allocated, so no additional
+  ///             synchronization mechanism is provided.
+  ///
+  /// @return  A |Status| value indicating success or failure of the submission.
+  ///
+  // TODO(dnfield): Provide additional synchronization methods here for Vulkan
+  // and heap allocated buffers on Metal.
+  Status Tessellate(
+      const Path& path,
+      HostBuffer& host_buffer,
+      const std::shared_ptr<Context>& context,
+      BufferView vertex_buffer,
+      BufferView vertex_buffer_count,
+      const CommandBuffer::CompletionCallback& callback = nullptr) const;
+
+ private:
+  Style style_ = Style::kStroke;
+  Scalar stroke_width_ = 1.0f;
+  Cap stroke_cap_ = Cap::kButt;
+  Join stroke_join_ = Join::kMiter;
+  Scalar miter_limit_ = 4.0f;
+  Scalar cubic_accuracy_ = kDefaultCurveTolerance;
+  Scalar quad_tolerance_ = .1f;
+
+  ComputeTessellator(const ComputeTessellator&) = delete;
+
+  ComputeTessellator& operator=(const ComputeTessellator&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_COMPUTE_TESSELLATOR_H_
diff --git a/impeller/renderer/compute_unittests.cc b/impeller/renderer/compute_unittests.cc
index 5da7fe133ec6b43974ac2bc62dcd03456382a678..39e14a0a99b236fac08b331337ed374f77fb718a 100644
--- a/impeller/renderer/compute_unittests.cc
+++ b/impeller/renderer/compute_unittests.cc
@@ -3,27 +3,37 @@
 // found in the LICENSE file.
 
 #include "flutter/fml/synchronization/waitable_event.h"
-#include "flutter/fml/time/time_point.h"
 #include "flutter/testing/testing.h"
-#include "impeller/base/strings.h"
+#include "gmock/gmock.h"
+#include "impeller/core/host_buffer.h"
 #include "impeller/fixtures/sample.comp.h"
+#include "impeller/fixtures/stage1.comp.h"
+#include "impeller/fixtures/stage2.comp.h"
 #include "impeller/playground/compute_playground_test.h"
 #include "impeller/renderer/command_buffer.h"
-#include "impeller/renderer/compute_command.h"
 #include "impeller/renderer/compute_pipeline_builder.h"
-#include "impeller/renderer/formats.h"
 #include "impeller/renderer/pipeline_library.h"
+#include "impeller/renderer/prefix_sum_test.comp.h"
+#include "impeller/renderer/threadgroup_sizing_test.comp.h"
 
 namespace impeller {
 namespace testing {
-
 using ComputeTest = ComputePlaygroundTest;
 INSTANTIATE_COMPUTE_SUITE(ComputeTest);
 
+TEST_P(ComputeTest, CapabilitiesReportSupport) {
+  auto context = GetContext();
+  ASSERT_TRUE(context);
+  ASSERT_TRUE(context->GetCapabilities()->SupportsCompute());
+}
+
 TEST_P(ComputeTest, CanCreateComputePass) {
   using CS = SampleComputeShader;
   auto context = GetContext();
+  auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
   ASSERT_TRUE(context);
+  ASSERT_TRUE(context->GetCapabilities()->SupportsCompute());
+
   using SamplePipelineBuilder = ComputePipelineBuilder<CS>;
   auto pipeline_desc =
       SamplePipelineBuilder::MakeDefaultPipelineDescriptor(*context);
@@ -38,17 +48,12 @@ TEST_P(ComputeTest, CanCreateComputePass) {
 
   static constexpr size_t kCount = 5;
 
-  pass->SetGridSize(ISize(kCount, 1));
-  pass->SetThreadGroupSize(ISize(kCount, 1));
-
-  ComputeCommand cmd;
-  cmd.label = "Compute";
-  cmd.pipeline = compute_pipeline;
+  pass->SetPipeline(compute_pipeline);
 
   CS::Info info{.count = kCount};
   CS::Input0<kCount> input_0;
   CS::Input1<kCount> input_1;
-  for (uint i = 0; i < kCount; i++) {
+  for (size_t i = 0; i < kCount; i++) {
     input_0.elements[i] = Vector4(2.0 + i, 3.0 + i, 4.0 + i, 5.0 * i);
     input_1.elements[i] = Vector4(6.0, 7.0, 8.0, 9.0);
   }
@@ -58,49 +63,441 @@ TEST_P(ComputeTest, CanCreateComputePass) {
   input_0.some_int = 5;
   input_1.some_struct = CS::SomeStruct{.vf = Point(3, 4), .i = 42};
 
-  DeviceBufferDescriptor buffer_desc;
-  buffer_desc.storage_mode = StorageMode::kHostVisible;
-  buffer_desc.size = sizeof(CS::Output<kCount>);
+  auto output_buffer = CreateHostVisibleDeviceBuffer<CS::Output<kCount>>(
+      context, "Output Buffer");
+
+  CS::BindInfo(*pass, host_buffer->EmplaceUniform(info));
+  CS::BindInput0(*pass, host_buffer->EmplaceStorageBuffer(input_0));
+  CS::BindInput1(*pass, host_buffer->EmplaceStorageBuffer(input_1));
+  CS::BindOutput(*pass, DeviceBuffer::AsBufferView(output_buffer));
+
+  ASSERT_TRUE(pass->Compute(ISize(kCount, 1)).ok());
+  ASSERT_TRUE(pass->EncodeCommands());
+
+  fml::AutoResetWaitableEvent latch;
+  ASSERT_TRUE(
+      context->GetCommandQueue()
+          ->Submit(
+              {cmd_buffer},
+              [&latch, output_buffer, &input_0,
+               &input_1](CommandBuffer::Status status) {
+                EXPECT_EQ(status, CommandBuffer::Status::kCompleted);
+
+                auto view = DeviceBuffer::AsBufferView(output_buffer);
+                EXPECT_EQ(view.range.length, sizeof(CS::Output<kCount>));
+
+                CS::Output<kCount>* output =
+                    reinterpret_cast<CS::Output<kCount>*>(
+                        output_buffer->OnGetContents());
+                EXPECT_TRUE(output);
+                for (size_t i = 0; i < kCount; i++) {
+                  Vector4 vector = output->elements[i];
+                  Vector4 computed = input_0.elements[i] * input_1.elements[i];
+                  EXPECT_EQ(vector,
+                            Vector4(computed.x + 2 + input_1.some_struct.i,
+                                    computed.y + 3 + input_1.some_struct.vf.x,
+                                    computed.z + 5 + input_1.some_struct.vf.y,
+                                    computed.w));
+                }
+                latch.Signal();
+              })
+          .ok());
+
+  latch.Wait();
+}
+
+TEST_P(ComputeTest, CanComputePrefixSum) {
+  using CS = PrefixSumTestComputeShader;
+  auto context = GetContext();
+  auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
+  ASSERT_TRUE(context);
+  ASSERT_TRUE(context->GetCapabilities()->SupportsCompute());
+
+  using SamplePipelineBuilder = ComputePipelineBuilder<CS>;
+  auto pipeline_desc =
+      SamplePipelineBuilder::MakeDefaultPipelineDescriptor(*context);
+  ASSERT_TRUE(pipeline_desc.has_value());
+  auto compute_pipeline =
+      context->GetPipelineLibrary()->GetPipeline(pipeline_desc).Get();
+  ASSERT_TRUE(compute_pipeline);
+
+  auto cmd_buffer = context->CreateCommandBuffer();
+  auto pass = cmd_buffer->CreateComputePass();
+  ASSERT_TRUE(pass && pass->IsValid());
+
+  static constexpr size_t kCount = 5;
+
+  pass->SetPipeline(compute_pipeline);
+
+  CS::InputData<kCount> input_data;
+  input_data.count = kCount;
+  for (size_t i = 0; i < kCount; i++) {
+    input_data.data[i] = 1 + i;
+  }
+
+  auto output_buffer = CreateHostVisibleDeviceBuffer<CS::OutputData<kCount>>(
+      context, "Output Buffer");
+
+  CS::BindInputData(*pass, host_buffer->EmplaceStorageBuffer(input_data));
+  CS::BindOutputData(*pass, DeviceBuffer::AsBufferView(output_buffer));
+
+  ASSERT_TRUE(pass->Compute(ISize(kCount, 1)).ok());
+  ASSERT_TRUE(pass->EncodeCommands());
+
+  fml::AutoResetWaitableEvent latch;
+  ASSERT_TRUE(
+      context->GetCommandQueue()
+          ->Submit({cmd_buffer},
+                   [&latch, output_buffer](CommandBuffer::Status status) {
+                     EXPECT_EQ(status, CommandBuffer::Status::kCompleted);
+
+                     auto view = DeviceBuffer::AsBufferView(output_buffer);
+                     EXPECT_EQ(view.range.length,
+                               sizeof(CS::OutputData<kCount>));
+
+                     CS::OutputData<kCount>* output =
+                         reinterpret_cast<CS::OutputData<kCount>*>(
+                             output_buffer->OnGetContents());
+                     EXPECT_TRUE(output);
 
-  auto output_buffer =
-      context->GetResourceAllocator()->CreateBuffer(buffer_desc);
-  output_buffer->SetLabel("Output Buffer");
+                     constexpr uint32_t expected[kCount] = {1, 3, 6, 10, 15};
+                     for (size_t i = 0; i < kCount; i++) {
+                       auto computed_sum = output->data[i];
+                       EXPECT_EQ(computed_sum, expected[i]);
+                     }
+                     latch.Signal();
+                   })
+          .ok());
 
-  CS::BindInfo(cmd, pass->GetTransientsBuffer().EmplaceUniform(info));
-  CS::BindInput0(cmd,
-                 pass->GetTransientsBuffer().EmplaceStorageBuffer(input_0));
-  CS::BindInput1(cmd,
-                 pass->GetTransientsBuffer().EmplaceStorageBuffer(input_1));
-  CS::BindOutput(cmd, output_buffer->AsBufferView());
+  latch.Wait();
+}
+
+TEST_P(ComputeTest, 1DThreadgroupSizingIsCorrect) {
+  using CS = ThreadgroupSizingTestComputeShader;
+  auto context = GetContext();
+  ASSERT_TRUE(context);
+  ASSERT_TRUE(context->GetCapabilities()->SupportsCompute());
+
+  using SamplePipelineBuilder = ComputePipelineBuilder<CS>;
+  auto pipeline_desc =
+      SamplePipelineBuilder::MakeDefaultPipelineDescriptor(*context);
+  ASSERT_TRUE(pipeline_desc.has_value());
+  auto compute_pipeline =
+      context->GetPipelineLibrary()->GetPipeline(pipeline_desc).Get();
+  ASSERT_TRUE(compute_pipeline);
 
-  ASSERT_TRUE(pass->AddCommand(std::move(cmd)));
+  auto cmd_buffer = context->CreateCommandBuffer();
+  auto pass = cmd_buffer->CreateComputePass();
+  ASSERT_TRUE(pass && pass->IsValid());
+
+  static constexpr size_t kCount = 2048;
+
+  pass->SetPipeline(compute_pipeline);
+
+  auto output_buffer = CreateHostVisibleDeviceBuffer<CS::OutputData<kCount>>(
+      context, "Output Buffer");
+
+  CS::BindOutputData(*pass, DeviceBuffer::AsBufferView(output_buffer));
+
+  ASSERT_TRUE(pass->Compute(ISize(kCount, 1)).ok());
   ASSERT_TRUE(pass->EncodeCommands());
 
   fml::AutoResetWaitableEvent latch;
   ASSERT_TRUE(
-      cmd_buffer->SubmitCommands([&latch, output_buffer, &input_0,
-                                  &input_1](CommandBuffer::Status status) {
-        EXPECT_EQ(status, CommandBuffer::Status::kCompleted);
-
-        auto view = output_buffer->AsBufferView();
-        EXPECT_EQ(view.range.length, sizeof(CS::Output<kCount>));
-
-        CS::Output<kCount>* output =
-            reinterpret_cast<CS::Output<kCount>*>(view.contents);
-        EXPECT_TRUE(output);
-        for (size_t i = 0; i < kCount; i++) {
-          Vector4 vector = output->elements[i];
-          Vector4 computed = input_0.elements[i] * input_1.elements[i];
-          EXPECT_EQ(vector, Vector4(computed.x + 2 + input_1.some_struct.i,
+      context->GetCommandQueue()
+          ->Submit({cmd_buffer},
+                   [&latch, output_buffer](CommandBuffer::Status status) {
+                     EXPECT_EQ(status, CommandBuffer::Status::kCompleted);
+
+                     auto view = DeviceBuffer::AsBufferView(output_buffer);
+                     EXPECT_EQ(view.range.length,
+                               sizeof(CS::OutputData<kCount>));
+
+                     CS::OutputData<kCount>* output =
+                         reinterpret_cast<CS::OutputData<kCount>*>(
+                             output_buffer->OnGetContents());
+                     EXPECT_TRUE(output);
+                     EXPECT_EQ(output->data[kCount - 1], kCount - 1);
+                     latch.Signal();
+                   })
+          .ok());
+
+  latch.Wait();
+}
+
+TEST_P(ComputeTest, CanComputePrefixSumLargeInteractive) {
+  using CS = PrefixSumTestComputeShader;
+
+  auto context = GetContext();
+  auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
+
+  ASSERT_TRUE(context);
+  ASSERT_TRUE(context->GetCapabilities()->SupportsCompute());
+
+  auto callback = [&](RenderPass& render_pass) -> bool {
+    using SamplePipelineBuilder = ComputePipelineBuilder<CS>;
+    auto pipeline_desc =
+        SamplePipelineBuilder::MakeDefaultPipelineDescriptor(*context);
+    auto compute_pipeline =
+        context->GetPipelineLibrary()->GetPipeline(pipeline_desc).Get();
+
+    auto cmd_buffer = context->CreateCommandBuffer();
+    auto pass = cmd_buffer->CreateComputePass();
+
+    static constexpr size_t kCount = 1023;
+
+    pass->SetPipeline(compute_pipeline);
+
+    CS::InputData<kCount> input_data;
+    input_data.count = kCount;
+    for (size_t i = 0; i < kCount; i++) {
+      input_data.data[i] = 1 + i;
+    }
+
+    auto output_buffer = CreateHostVisibleDeviceBuffer<CS::OutputData<kCount>>(
+        context, "Output Buffer");
+
+    CS::BindInputData(*pass, host_buffer->EmplaceStorageBuffer(input_data));
+    CS::BindOutputData(*pass, DeviceBuffer::AsBufferView(output_buffer));
+
+    pass->Compute(ISize(kCount, 1));
+    pass->EncodeCommands();
+    host_buffer->Reset();
+    return context->GetCommandQueue()->Submit({cmd_buffer}).ok();
+  };
+  ASSERT_TRUE(OpenPlaygroundHere(callback));
+}
+
+TEST_P(ComputeTest, MultiStageInputAndOutput) {
+  using CS1 = Stage1ComputeShader;
+  using Stage1PipelineBuilder = ComputePipelineBuilder<CS1>;
+  using CS2 = Stage2ComputeShader;
+  using Stage2PipelineBuilder = ComputePipelineBuilder<CS2>;
+
+  auto context = GetContext();
+  auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
+  ASSERT_TRUE(context);
+  ASSERT_TRUE(context->GetCapabilities()->SupportsCompute());
+
+  auto pipeline_desc_1 =
+      Stage1PipelineBuilder::MakeDefaultPipelineDescriptor(*context);
+  ASSERT_TRUE(pipeline_desc_1.has_value());
+  auto compute_pipeline_1 =
+      context->GetPipelineLibrary()->GetPipeline(pipeline_desc_1).Get();
+  ASSERT_TRUE(compute_pipeline_1);
+
+  auto pipeline_desc_2 =
+      Stage2PipelineBuilder::MakeDefaultPipelineDescriptor(*context);
+  ASSERT_TRUE(pipeline_desc_2.has_value());
+  auto compute_pipeline_2 =
+      context->GetPipelineLibrary()->GetPipeline(pipeline_desc_2).Get();
+  ASSERT_TRUE(compute_pipeline_2);
+
+  auto cmd_buffer = context->CreateCommandBuffer();
+  auto pass = cmd_buffer->CreateComputePass();
+  ASSERT_TRUE(pass && pass->IsValid());
+
+  static constexpr size_t kCount1 = 5;
+  static constexpr size_t kCount2 = kCount1 * 2;
+
+  CS1::Input<kCount1> input_1;
+  input_1.count = kCount1;
+  for (size_t i = 0; i < kCount1; i++) {
+    input_1.elements[i] = i;
+  }
+
+  CS2::Input<kCount2> input_2;
+  input_2.count = kCount2;
+  for (size_t i = 0; i < kCount2; i++) {
+    input_2.elements[i] = i;
+  }
+
+  auto output_buffer_1 = CreateHostVisibleDeviceBuffer<CS1::Output<kCount2>>(
+      context, "Output Buffer Stage 1");
+  auto output_buffer_2 = CreateHostVisibleDeviceBuffer<CS2::Output<kCount2>>(
+      context, "Output Buffer Stage 2");
+
+  {
+    pass->SetPipeline(compute_pipeline_1);
+
+    CS1::BindInput(*pass, host_buffer->EmplaceStorageBuffer(input_1));
+    CS1::BindOutput(*pass, DeviceBuffer::AsBufferView(output_buffer_1));
+
+    ASSERT_TRUE(pass->Compute(ISize(512, 1)).ok());
+    pass->AddBufferMemoryBarrier();
+  }
+
+  {
+    pass->SetPipeline(compute_pipeline_2);
+
+    CS1::BindInput(*pass, DeviceBuffer::AsBufferView(output_buffer_1));
+    CS2::BindOutput(*pass, DeviceBuffer::AsBufferView(output_buffer_2));
+    ASSERT_TRUE(pass->Compute(ISize(512, 1)).ok());
+  }
+
+  ASSERT_TRUE(pass->EncodeCommands());
+
+  fml::AutoResetWaitableEvent latch;
+  ASSERT_TRUE(
+      context->GetCommandQueue()
+          ->Submit({cmd_buffer},
+                   [&latch, &output_buffer_1,
+                    &output_buffer_2](CommandBuffer::Status status) {
+                     EXPECT_EQ(status, CommandBuffer::Status::kCompleted);
+
+                     CS1::Output<kCount2>* output_1 =
+                         reinterpret_cast<CS1::Output<kCount2>*>(
+                             output_buffer_1->OnGetContents());
+                     EXPECT_TRUE(output_1);
+                     EXPECT_EQ(output_1->count, 10u);
+                     EXPECT_THAT(
+                         output_1->elements,
+                         ::testing::ElementsAre(0, 0, 2, 3, 4, 6, 6, 9, 8, 12));
+
+                     CS2::Output<kCount2>* output_2 =
+                         reinterpret_cast<CS2::Output<kCount2>*>(
+                             output_buffer_2->OnGetContents());
+                     EXPECT_TRUE(output_2);
+                     EXPECT_EQ(output_2->count, 10u);
+                     EXPECT_THAT(output_2->elements,
+                                 ::testing::ElementsAre(0, 0, 4, 6, 8, 12, 12,
+                                                        18, 16, 24));
+
+                     latch.Signal();
+                   })
+          .ok());
+
+  latch.Wait();
+}
+
+TEST_P(ComputeTest, CanCompute1DimensionalData) {
+  using CS = SampleComputeShader;
+  auto context = GetContext();
+  auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
+  ASSERT_TRUE(context);
+  ASSERT_TRUE(context->GetCapabilities()->SupportsCompute());
+
+  using SamplePipelineBuilder = ComputePipelineBuilder<CS>;
+  auto pipeline_desc =
+      SamplePipelineBuilder::MakeDefaultPipelineDescriptor(*context);
+  ASSERT_TRUE(pipeline_desc.has_value());
+  auto compute_pipeline =
+      context->GetPipelineLibrary()->GetPipeline(pipeline_desc).Get();
+  ASSERT_TRUE(compute_pipeline);
+
+  auto cmd_buffer = context->CreateCommandBuffer();
+  auto pass = cmd_buffer->CreateComputePass();
+  ASSERT_TRUE(pass && pass->IsValid());
+
+  static constexpr size_t kCount = 5;
+
+  pass->SetPipeline(compute_pipeline);
+
+  CS::Info info{.count = kCount};
+  CS::Input0<kCount> input_0;
+  CS::Input1<kCount> input_1;
+  for (size_t i = 0; i < kCount; i++) {
+    input_0.elements[i] = Vector4(2.0 + i, 3.0 + i, 4.0 + i, 5.0 * i);
+    input_1.elements[i] = Vector4(6.0, 7.0, 8.0, 9.0);
+  }
+
+  input_0.fixed_array[1] = IPoint32(2, 2);
+  input_1.fixed_array[0] = UintPoint32(3, 3);
+  input_0.some_int = 5;
+  input_1.some_struct = CS::SomeStruct{.vf = Point(3, 4), .i = 42};
+
+  auto output_buffer = CreateHostVisibleDeviceBuffer<CS::Output<kCount>>(
+      context, "Output Buffer");
+
+  CS::BindInfo(*pass, host_buffer->EmplaceUniform(info));
+  CS::BindInput0(*pass, host_buffer->EmplaceStorageBuffer(input_0));
+  CS::BindInput1(*pass, host_buffer->EmplaceStorageBuffer(input_1));
+  CS::BindOutput(*pass, DeviceBuffer::AsBufferView(output_buffer));
+
+  ASSERT_TRUE(pass->Compute(ISize(kCount, 1)).ok());
+  ASSERT_TRUE(pass->EncodeCommands());
+
+  fml::AutoResetWaitableEvent latch;
+  ASSERT_TRUE(
+      context->GetCommandQueue()
+          ->Submit(
+              {cmd_buffer},
+              [&latch, output_buffer, &input_0,
+               &input_1](CommandBuffer::Status status) {
+                EXPECT_EQ(status, CommandBuffer::Status::kCompleted);
+
+                auto view = DeviceBuffer::AsBufferView(output_buffer);
+                EXPECT_EQ(view.range.length, sizeof(CS::Output<kCount>));
+
+                CS::Output<kCount>* output =
+                    reinterpret_cast<CS::Output<kCount>*>(
+                        output_buffer->OnGetContents());
+                EXPECT_TRUE(output);
+                for (size_t i = 0; i < kCount; i++) {
+                  Vector4 vector = output->elements[i];
+                  Vector4 computed = input_0.elements[i] * input_1.elements[i];
+                  EXPECT_EQ(vector,
+                            Vector4(computed.x + 2 + input_1.some_struct.i,
                                     computed.y + 3 + input_1.some_struct.vf.x,
                                     computed.z + 5 + input_1.some_struct.vf.y,
                                     computed.w));
-        }
-        latch.Signal();
-      }));
+                }
+                latch.Signal();
+              })
+          .ok());
 
   latch.Wait();
 }
 
+TEST_P(ComputeTest, ReturnsEarlyWhenAnyGridDimensionIsZero) {
+  using CS = SampleComputeShader;
+  auto context = GetContext();
+  auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
+  ASSERT_TRUE(context);
+  ASSERT_TRUE(context->GetCapabilities()->SupportsCompute());
+
+  using SamplePipelineBuilder = ComputePipelineBuilder<CS>;
+  auto pipeline_desc =
+      SamplePipelineBuilder::MakeDefaultPipelineDescriptor(*context);
+  ASSERT_TRUE(pipeline_desc.has_value());
+  auto compute_pipeline =
+      context->GetPipelineLibrary()->GetPipeline(pipeline_desc).Get();
+  ASSERT_TRUE(compute_pipeline);
+
+  auto cmd_buffer = context->CreateCommandBuffer();
+  auto pass = cmd_buffer->CreateComputePass();
+  ASSERT_TRUE(pass && pass->IsValid());
+
+  static constexpr size_t kCount = 5;
+
+  pass->SetPipeline(compute_pipeline);
+
+  CS::Info info{.count = kCount};
+  CS::Input0<kCount> input_0;
+  CS::Input1<kCount> input_1;
+  for (size_t i = 0; i < kCount; i++) {
+    input_0.elements[i] = Vector4(2.0 + i, 3.0 + i, 4.0 + i, 5.0 * i);
+    input_1.elements[i] = Vector4(6.0, 7.0, 8.0, 9.0);
+  }
+
+  input_0.fixed_array[1] = IPoint32(2, 2);
+  input_1.fixed_array[0] = UintPoint32(3, 3);
+  input_0.some_int = 5;
+  input_1.some_struct = CS::SomeStruct{.vf = Point(3, 4), .i = 42};
+
+  auto output_buffer = CreateHostVisibleDeviceBuffer<CS::Output<kCount>>(
+      context, "Output Buffer");
+
+  CS::BindInfo(*pass, host_buffer->EmplaceUniform(info));
+  CS::BindInput0(*pass, host_buffer->EmplaceStorageBuffer(input_0));
+  CS::BindInput1(*pass, host_buffer->EmplaceStorageBuffer(input_1));
+  CS::BindOutput(*pass, DeviceBuffer::AsBufferView(output_buffer));
+
+  // Intentionally making the grid size zero in one dimension. No GPU will
+  // tolerate this.
+  EXPECT_FALSE(pass->Compute(ISize(0, 1)).ok());
+  pass->EncodeCommands();
+}
+
 }  // namespace testing
 }  // namespace impeller
diff --git a/impeller/renderer/context.cc b/impeller/renderer/context.cc
index e278e3e156ad1b84f91e45866d256c9f19d5554d..fb42d5744a10b45c875d34d7272892d911eb61a5 100644
--- a/impeller/renderer/context.cc
+++ b/impeller/renderer/context.cc
@@ -4,22 +4,16 @@
 
 #include "impeller/renderer/context.h"
 
+#include "impeller/core/capture.h"
+
 namespace impeller {
 
 Context::~Context() = default;
 
-Context::Context() = default;
+Context::Context() : capture(CaptureContext::MakeInactive()) {}
 
-bool Context::HasThreadingRestrictions() const {
+bool Context::UpdateOffscreenLayerPixelFormat(PixelFormat format) {
   return false;
 }
 
-std::shared_ptr<GPUTracer> Context::GetGPUTracer() const {
-  return nullptr;
-}
-
-PixelFormat Context::GetColorAttachmentPixelFormat() const {
-  return PixelFormat::kDefaultColor;
-}
-
 }  // namespace impeller
diff --git a/impeller/renderer/context.h b/impeller/renderer/context.h
index 9d0fd7113a67e5981ea1aea942b422bf938d0358..59ac871aad483f13ebe3140e0d2b9b770d19b3af 100644
--- a/impeller/renderer/context.h
+++ b/impeller/renderer/context.h
@@ -2,64 +2,209 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_CONTEXT_H_
+#define FLUTTER_IMPELLER_RENDERER_CONTEXT_H_
 
 #include <memory>
 #include <string>
 
-#include "flutter/fml/macros.h"
-#include "impeller/renderer/backend_features.h"
-#include "impeller/renderer/formats.h"
+#include "impeller/core/allocator.h"
+#include "impeller/core/capture.h"
+#include "impeller/core/formats.h"
+#include "impeller/renderer/capabilities.h"
+#include "impeller/renderer/command_queue.h"
+#include "impeller/renderer/sampler_library.h"
 
 namespace impeller {
 
 class ShaderLibrary;
-class SamplerLibrary;
 class CommandBuffer;
 class PipelineLibrary;
-class Allocator;
-class GPUTracer;
-class WorkQueue;
 
-class Context : public std::enable_shared_from_this<Context> {
+//------------------------------------------------------------------------------
+/// @brief      To do anything rendering related with Impeller, you need a
+///             context.
+///
+///             Contexts are expensive to construct and typically you only need
+///             one in the process. The context represents a connection to a
+///             graphics or compute accelerator on the device.
+///
+///             If there are multiple context in a process, it would typically
+///             be for separation of concerns (say, use with multiple engines in
+///             Flutter), talking to multiple accelerators, or talking to the
+///             same accelerator using different client APIs (Metal, Vulkan,
+///             OpenGL ES, etc..).
+///
+///             Contexts are thread-safe. They may be created, used, and
+///             collected (though not from a thread used by an internal pool) on
+///             any thread. They may also be accessed simultaneously from
+///             multiple threads.
+///
+///             Contexts are abstract and a concrete instance must be created
+///             using one of the subclasses of `Context` in
+///             `//impeller/renderer/backend`.
+class Context {
  public:
+  enum class BackendType {
+    kMetal,
+    kOpenGLES,
+    kVulkan,
+  };
+
+  /// The maximum number of tasks that should ever be stored for
+  /// `StoreTaskForGPU`.
+  ///
+  /// This number was arbitrarily chosen. The idea is that this is a somewhat
+  /// rare situation where tasks happen to get executed in that tiny amount of
+  /// time while an app is being backgrounded but still executing.
+  static constexpr int32_t kMaxTasksAwaitingGPU = 10;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Destroys an Impeller context.
+  ///
   virtual ~Context();
 
+  //----------------------------------------------------------------------------
+  /// @brief      Get the graphics backend of an Impeller context.
+  ///
+  ///             This is useful for cases where a renderer needs to track and
+  ///             lookup backend-specific resources, like shaders or uniform
+  ///             layout information.
+  ///
+  ///             It's not recommended to use this as a substitute for
+  ///             per-backend capability checking. Instead, check for specific
+  ///             capabilities via `GetCapabilities()`.
+  ///
+  /// @return     The graphics backend of the `Context`.
+  ///
+  virtual BackendType GetBackendType() const = 0;
+
+  // TODO(129920): Refactor and move to capabilities.
+  virtual std::string DescribeGpuModel() const = 0;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Determines if a context is valid. If the caller ever receives
+  ///             an invalid context, they must discard it and construct a new
+  ///             context. There is no recovery mechanism to repair a bad
+  ///             context.
+  ///
+  ///             It is convention in Impeller to never return an invalid
+  ///             context from a call that returns an pointer to a context. The
+  ///             call implementation performs validity checks itself and return
+  ///             a null context instead of a pointer to an invalid context.
+  ///
+  ///             How a context goes invalid is backend specific. It could
+  ///             happen due to device loss, or any other unrecoverable error.
+  ///
+  /// @return     If the context is valid.
+  ///
   virtual bool IsValid() const = 0;
 
   //----------------------------------------------------------------------------
-  /// @return     A resource allocator.
+  /// @brief      Get the capabilities of Impeller context. All optionally
+  ///             supported feature of the platform, client-rendering API, and
+  ///             device can be queried using the `Capabilities`.
+  ///
+  /// @return     The capabilities. Can never be `nullptr` for a valid context.
+  ///
+  virtual const std::shared_ptr<const Capabilities>& GetCapabilities()
+      const = 0;
+
+  // TODO(129920): Refactor and move to capabilities.
+  virtual bool UpdateOffscreenLayerPixelFormat(PixelFormat format);
+
+  //----------------------------------------------------------------------------
+  /// @brief      Returns the allocator used to create textures and buffers on
+  ///             the device.
+  ///
+  /// @return     The resource allocator. Can never be `nullptr` for a valid
+  ///             context.
   ///
   virtual std::shared_ptr<Allocator> GetResourceAllocator() const = 0;
 
+  //----------------------------------------------------------------------------
+  /// @brief      Returns the library of shaders used to specify the
+  ///             programmable stages of a pipeline.
+  ///
+  /// @return     The shader library. Can never be `nullptr` for a valid
+  ///             context.
+  ///
   virtual std::shared_ptr<ShaderLibrary> GetShaderLibrary() const = 0;
 
+  //----------------------------------------------------------------------------
+  /// @brief      Returns the library of combined image samplers used in
+  ///             shaders.
+  ///
+  /// @return     The sampler library. Can never be `nullptr` for a valid
+  ///             context.
+  ///
   virtual std::shared_ptr<SamplerLibrary> GetSamplerLibrary() const = 0;
 
+  //----------------------------------------------------------------------------
+  /// @brief      Returns the library of pipelines used by render or compute
+  ///             commands.
+  ///
+  /// @return     The pipeline library. Can never be `nullptr` for a valid
+  ///             context.
+  ///
   virtual std::shared_ptr<PipelineLibrary> GetPipelineLibrary() const = 0;
 
+  //----------------------------------------------------------------------------
+  /// @brief      Create a new command buffer. Command buffers can be used to
+  ///             encode graphics, blit, or compute commands to be submitted to
+  ///             the device.
+  ///
+  ///             A command buffer can only be used on a single thread.
+  ///             Multi-threaded render, blit, or compute passes must create a
+  ///             new command buffer on each thread.
+  ///
+  /// @return     A new command buffer.
+  ///
   virtual std::shared_ptr<CommandBuffer> CreateCommandBuffer() const = 0;
 
-  virtual std::shared_ptr<WorkQueue> GetWorkQueue() const = 0;
+  /// @brief Return the graphics queue for submitting command buffers.
+  virtual std::shared_ptr<CommandQueue> GetCommandQueue() const = 0;
 
   //----------------------------------------------------------------------------
-  /// @return A GPU Tracer to trace gpu rendering.
+  /// @brief      Force all pending asynchronous work to finish. This is
+  ///             achieved by deleting all owned concurrent message loops.
   ///
-  virtual std::shared_ptr<GPUTracer> GetGPUTracer() const;
-
-  virtual PixelFormat GetColorAttachmentPixelFormat() const;
+  virtual void Shutdown() = 0;
 
-  virtual bool HasThreadingRestrictions() const;
+  CaptureContext capture;
 
-  virtual bool SupportsOffscreenMSAA() const = 0;
+  /// Stores a task on the `ContextMTL` that is awaiting access for the GPU.
+  ///
+  /// The task will be executed in the event that the GPU access has changed to
+  /// being available or that the task has been canceled. The task should
+  /// operate with the `SyncSwitch` to make sure the GPU is accessible.
+  ///
+  /// Threadsafe.
+  ///
+  /// `task` will be executed on the platform thread.
+  virtual void StoreTaskForGPU(const std::function<void()>& task) {
+    FML_CHECK(false && "not supported in this context");
+  }
 
-  virtual const BackendFeatures& GetBackendFeatures() const = 0;
+  /// Run backend specific additional setup and create common shader variants.
+  ///
+  /// This bootstrap is intended to improve the performance of several
+  /// first frame benchmarks that are tracked in the flutter device lab.
+  /// The workload includes initializing commonly used but not default
+  /// shader variants, as well as forcing driver initialization.
+  virtual void InitializeCommonlyUsedShadersIfNeeded() const {}
 
  protected:
   Context();
 
+  std::vector<std::function<void()>> per_frame_task_;
+
  private:
-  FML_DISALLOW_COPY_AND_ASSIGN(Context);
+  Context(const Context&) = delete;
+
+  Context& operator=(const Context&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_CONTEXT_H_
diff --git a/impeller/renderer/device_buffer_unittests.cc b/impeller/renderer/device_buffer_unittests.cc
index 49c6e626ed8b00db6a98e3fb0ee38cc8bb36fd9c..95d53812cda536e957333b4878784eba04fa7890 100644
--- a/impeller/renderer/device_buffer_unittests.cc
+++ b/impeller/renderer/device_buffer_unittests.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "flutter/testing/testing.h"
+#include "impeller/core/device_buffer.h"
 #include "impeller/playground/playground.h"
-#include "impeller/renderer/device_buffer.h"
 
 namespace impeller {
 namespace testing {
diff --git a/impeller/renderer/gpu_tracer.h b/impeller/renderer/gpu_tracer.h
deleted file mode 100644
index bc592a6681b5004de129aefeacc8d60411788f75..0000000000000000000000000000000000000000
--- a/impeller/renderer/gpu_tracer.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "flutter/fml/macros.h"
-
-namespace impeller {
-
-//------------------------------------------------------------------------------
-/// @brief      GPU tracer configuration.
-///
-struct GPUTracerConfiguration {
-  /// This param is for metal backend.
-  /// When this value is true, a gpu trace file will be saved in devices when
-  /// metal frame capture finishes. Otherwise, the Xcode will automatically open
-  /// and show trace result.
-  ///
-  bool mtl_frame_capture_save_trace_as_document = false;
-};
-
-//------------------------------------------------------------------------------
-/// @brief      A GPU tracer to trace gpu workflow during rendering.
-///
-class GPUTracer {
- public:
-  virtual ~GPUTracer();
-
-  //----------------------------------------------------------------------------
-  /// @brief      Start capturing frame. This method should only be called when
-  ///             developing.
-  ///
-  /// @param[in]  configuration  The configuration passed in for capture.
-  ///
-  /// @return The operation successful or not.
-  ///
-  virtual bool StartCapturingFrame(GPUTracerConfiguration configuration);
-
-  //----------------------------------------------------------------------------
-  /// @brief      Stop capturing frame. This should only be called when
-  ///             developing.
-  ///
-  /// @return The operation successful or not.
-  ///
-  virtual bool StopCapturingFrame();
-
- protected:
-  GPUTracer();
-
- private:
-  FML_DISALLOW_COPY_AND_ASSIGN(GPUTracer);
-};
-
-}  // namespace impeller
diff --git a/impeller/renderer/host_buffer.cc b/impeller/renderer/host_buffer.cc
deleted file mode 100644
index 84fbebc74036932b1dcce3e7186a8e9097f85d3c..0000000000000000000000000000000000000000
--- a/impeller/renderer/host_buffer.cc
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "impeller/renderer/host_buffer.h"
-
-#include <algorithm>
-#include <cstring>
-
-#include "flutter/fml/logging.h"
-
-#include "impeller/renderer/allocator.h"
-#include "impeller/renderer/buffer_view.h"
-#include "impeller/renderer/device_buffer.h"
-
-namespace impeller {
-
-std::shared_ptr<HostBuffer> HostBuffer::Create() {
-  return std::shared_ptr<HostBuffer>(new HostBuffer());
-}
-
-HostBuffer::HostBuffer() = default;
-
-HostBuffer::~HostBuffer() = default;
-
-void HostBuffer::SetLabel(std::string label) {
-  label_ = std::move(label);
-}
-
-BufferView HostBuffer::Emplace(const void* buffer,
-                               size_t length,
-                               size_t align) {
-  if (align == 0 || (GetLength() % align) == 0) {
-    return Emplace(buffer, length);
-  }
-
-  {
-    auto pad = Emplace(nullptr, align - (GetLength() % align));
-    if (!pad) {
-      return {};
-    }
-  }
-
-  return Emplace(buffer, length);
-}
-
-BufferView HostBuffer::Emplace(const void* buffer, size_t length) {
-  auto old_length = GetLength();
-  if (!Truncate(old_length + length)) {
-    return {};
-  }
-  generation_++;
-  if (buffer) {
-    ::memmove(GetBuffer() + old_length, buffer, length);
-  }
-  return BufferView{shared_from_this(), GetBuffer(), Range{old_length, length}};
-}
-
-std::shared_ptr<const DeviceBuffer> HostBuffer::GetDeviceBuffer(
-    Allocator& allocator) const {
-  if (generation_ == device_buffer_generation_) {
-    return device_buffer_;
-  }
-  auto new_buffer = allocator.CreateBufferWithCopy(GetBuffer(), GetLength());
-  if (!new_buffer) {
-    return nullptr;
-  }
-  new_buffer->SetLabel(label_);
-  device_buffer_generation_ = generation_;
-  device_buffer_ = std::move(new_buffer);
-  return device_buffer_;
-}
-
-}  // namespace impeller
diff --git a/impeller/renderer/host_buffer_unittests.cc b/impeller/renderer/host_buffer_unittests.cc
deleted file mode 100644
index 8de2339ff3738094e3d86358c415aa80c31bfaea..0000000000000000000000000000000000000000
--- a/impeller/renderer/host_buffer_unittests.cc
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "flutter/testing/testing.h"
-#include "impeller/renderer/host_buffer.h"
-
-namespace impeller {
-namespace testing {
-
-TEST(HostBufferTest, TestInitialization) {
-  ASSERT_TRUE(HostBuffer::Create());
-  // Newly allocated buffers don't touch the heap till they have to.
-  ASSERT_EQ(HostBuffer::Create()->GetLength(), 0u);
-  ASSERT_EQ(HostBuffer::Create()->GetReservedLength(), 0u);
-}
-
-TEST(HostBufferTest, CanEmplace) {
-  struct Length2 {
-    uint8_t pad[2];
-  };
-  static_assert(sizeof(Length2) == 2u);
-
-  auto buffer = HostBuffer::Create();
-
-  for (size_t i = 0; i < 12500; i++) {
-    auto view = buffer->Emplace(Length2{});
-    ASSERT_TRUE(view);
-    ASSERT_EQ(buffer->GetLength(), (i + 1) * sizeof(Length2));
-    ASSERT_EQ(view.range, Range(i * sizeof(Length2), 2u));
-  }
-}
-
-TEST(HostBufferTest, CanEmplaceWithAlignment) {
-  struct Length2 {
-    uint8_t pad[2];
-  };
-  static_assert(sizeof(Length2) == 2);
-  struct alignas(16) Align16 {
-    uint8_t pad[2];
-  };
-  static_assert(alignof(Align16) == 16);
-  static_assert(sizeof(Align16) == 16);
-
-  auto buffer = HostBuffer::Create();
-  ASSERT_TRUE(buffer);
-
-  {
-    auto view = buffer->Emplace(Length2{});
-    ASSERT_TRUE(view);
-    ASSERT_EQ(buffer->GetLength(), 2u);
-    ASSERT_EQ(view.range, Range(0u, 2u));
-  }
-
-  {
-    auto view = buffer->Emplace(Align16{});
-    ASSERT_TRUE(view);
-    ASSERT_EQ(view.range.offset, 16u);
-    ASSERT_EQ(view.range.length, 16u);
-    ASSERT_EQ(buffer->GetLength(), 32u);
-  }
-  {
-    auto view = buffer->Emplace(Length2{});
-    ASSERT_TRUE(view);
-    ASSERT_EQ(buffer->GetLength(), 34u);
-    ASSERT_EQ(view.range, Range(32u, 2u));
-  }
-
-  {
-    auto view = buffer->Emplace(Align16{});
-    ASSERT_TRUE(view);
-    ASSERT_EQ(view.range.offset, 48u);
-    ASSERT_EQ(view.range.length, 16u);
-    ASSERT_EQ(buffer->GetLength(), 64u);
-  }
-}
-
-}  // namespace  testing
-}  // namespace impeller
diff --git a/impeller/renderer/path_polyline.comp b/impeller/renderer/path_polyline.comp
new file mode 100644
index 0000000000000000000000000000000000000000..0804c8f12d8274d32856ddd7c694e92068c9591e
--- /dev/null
+++ b/impeller/renderer/path_polyline.comp
@@ -0,0 +1,170 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+#extension GL_KHR_shader_subgroup_arithmetic : enable
+
+layout(local_size_x = 256, local_size_y = 1) in;
+layout(std430) buffer;
+
+#include <impeller/path.glsl>
+
+layout(binding = 0) readonly buffer Cubics {
+  uint count;
+  CubicData data[];
+}
+cubics;
+
+layout(binding = 1) buffer Quads {
+  uint count;
+  QuadData data[];
+}
+quads;
+
+layout(binding = 2) buffer Lines {
+  uint count;
+  LineData data[];
+}
+lines;
+
+layout(binding = 3) buffer Components {
+  uint count;
+  PathComponent data[];
+}
+components;
+
+layout(binding = 4) buffer Polyline {
+  uint count;
+  vec2 data[];
+}
+polyline;
+
+uniform Config {
+  float cubic_accuracy;
+  float quad_tolerance;
+}
+config;
+
+shared uvec2 cubic_ranges[512];
+shared uvec2 quad_ranges[512];
+shared uint scratch_count[512];
+shared uint scratch_sum[512];
+
+uint ComputePosition(uint index) {
+  uint sum = scratch_sum[index];
+  for (uint position = gl_SubgroupSize - 1; position < index;
+       position += gl_SubgroupSize) {
+    sum += scratch_sum[position] + scratch_count[position];
+  }
+  return sum;
+}
+
+void ProcessCubic(uint ident) {
+  CubicData cubic;
+  uint quad_count = 0;
+  if (ident < cubics.count) {
+    cubic = cubics.data[ident];
+    quad_count = EstimateQuadraticCount(cubic, config.cubic_accuracy);
+    scratch_count[ident] = quad_count;
+  }
+
+  barrier();
+
+  uint offset = 0;
+  if (quad_count > 0) {
+    scratch_sum[ident] = subgroupExclusiveAdd(scratch_count[ident]);
+
+    offset = ComputePosition(ident) + quads.count;
+  }
+  barrier();
+  if (quad_count > 0) {
+    atomicAdd(quads.count, quad_count);
+
+    cubic_ranges[ident] = uvec2(offset, quad_count);
+    for (uint i = 0; i < quad_count; i++) {
+      quads.data[offset + i] = GenerateQuadraticFromCubic(cubic, i, quad_count);
+    }
+  }
+}
+
+void ProcessQuad(uint ident) {
+  QuadData quad;
+  QuadDecomposition decomposition;
+  if (ident < quads.count) {
+    quad = quads.data[ident];
+    decomposition = DecomposeQuad(quad, config.quad_tolerance);
+    scratch_count[ident] = decomposition.line_count;
+  }
+
+  barrier();
+
+  uint offset = 0;
+  if (decomposition.line_count > 0) {
+    scratch_sum[ident] = subgroupExclusiveAdd(scratch_count[ident]);
+    offset = ComputePosition(ident) + lines.count;
+  }
+  barrier();
+
+  if (decomposition.line_count > 0) {
+    atomicAdd(lines.count, decomposition.line_count);
+    quad_ranges[ident] = uvec2(offset, decomposition.line_count);
+
+    vec2 last_point = quad.p1;
+    for (uint i = 1; i < decomposition.line_count; i++) {
+      LineData line =
+          LineData(last_point, GenerateLineFromQuad(quad, i, decomposition));
+      last_point = line.p2;
+      lines.data[offset + i - 1] = line;
+    }
+    lines.data[offset + decomposition.line_count - 1] =
+        LineData(last_point, quad.p2);
+  }
+}
+
+void ProcessLine(uint ident) {
+  if (ident == 0) {
+    polyline.count = lines.count + 1;
+  }
+
+  PathComponent component;
+  uvec2 range = uvec2(0, 0);
+  if (ident < components.count) {
+    component = components.data[ident];
+    if (component.count == 4) {
+      // Determine location in quads
+      uvec2 quad_range = cubic_ranges[component.index];
+      uvec2 end_range = quad_ranges[quad_range.x + quad_range.y - 1];
+      range.x = quad_ranges[quad_range.x].x;
+      range.y = end_range.x + end_range.y - range.x;
+    } else if (component.count == 3) {
+      range = quad_ranges[component.index];
+    } else if (component.count == 2) {
+      range = uvec2(component.index, 1);
+    }
+
+    scratch_count[ident] = range.y;
+  }
+  barrier();
+
+  if (ident < components.count) {
+    scratch_sum[ident] = subgroupExclusiveAdd(scratch_count[ident]);
+    uint offset = ComputePosition(ident);
+    polyline.data[offset] = lines.data[range.x].p1;
+    for (uint i = 0; i < range.y; i++) {
+      polyline.data[offset + i + 1] = lines.data[range.x + i].p2;
+    }
+  }
+}
+
+void main() {
+  uint ident = gl_GlobalInvocationID.x;
+  // Turn each cubic into quads.
+  ProcessCubic(ident);
+  barrier();
+
+  // Turn each quad into lines.
+  ProcessQuad(ident);
+  barrier();
+
+  // Copy lines to the output buffer.
+  ProcessLine(ident);
+}
diff --git a/impeller/renderer/pipeline.h b/impeller/renderer/pipeline.h
index cd900b2f5dd47df98f7e01047c719b235500eeae..eda23adebc5ff4d6797438cde38c8839e7c7d64a 100644
--- a/impeller/renderer/pipeline.h
+++ b/impeller/renderer/pipeline.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_PIPELINE_H_
+#define FLUTTER_IMPELLER_RENDERER_PIPELINE_H_
 
 #include <future>
 
 #include "compute_pipeline_descriptor.h"
-#include "flutter/fml/macros.h"
 #include "impeller/renderer/compute_pipeline_builder.h"
 #include "impeller/renderer/compute_pipeline_descriptor.h"
 #include "impeller/renderer/context.h"
@@ -64,13 +64,16 @@ class Pipeline {
       std::function<void(T& desc)> descriptor_callback) const;
 
  protected:
+  const std::weak_ptr<PipelineLibrary> library_;
+
+  const T desc_;
+
   Pipeline(std::weak_ptr<PipelineLibrary> library, T desc);
 
  private:
-  const std::weak_ptr<PipelineLibrary> library_;
-  const T desc_;
+  Pipeline(const Pipeline&) = delete;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(Pipeline);
+  Pipeline& operator=(const Pipeline&) = delete;
 };
 
 extern template class Pipeline<PipelineDescriptor>;
@@ -123,7 +126,9 @@ class RenderPipelineT {
   std::shared_ptr<Pipeline<PipelineDescriptor>> pipeline_;
   bool did_wait_ = false;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(RenderPipelineT);
+  RenderPipelineT(const RenderPipelineT&) = delete;
+
+  RenderPipelineT& operator=(const RenderPipelineT&) = delete;
 };
 
 template <class ComputeShader_>
@@ -161,7 +166,11 @@ class ComputePipelineT {
   std::shared_ptr<Pipeline<ComputePipelineDescriptor>> pipeline_;
   bool did_wait_ = false;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(ComputePipelineT);
+  ComputePipelineT(const ComputePipelineT&) = delete;
+
+  ComputePipelineT& operator=(const ComputePipelineT&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_PIPELINE_H_
diff --git a/impeller/renderer/pipeline_builder.h b/impeller/renderer/pipeline_builder.h
index f41e0e337c18098d41fcda68ca2f40656ae97b65..8d70df6b427bd9a68390807b3ad57ef40d763ea4 100644
--- a/impeller/renderer/pipeline_builder.h
+++ b/impeller/renderer/pipeline_builder.h
@@ -2,14 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_PIPELINE_BUILDER_H_
+#define FLUTTER_IMPELLER_RENDERER_PIPELINE_BUILDER_H_
 
 #include "flutter/fml/logging.h"
 #include "flutter/fml/macros.h"
 #include "impeller/base/strings.h"
 #include "impeller/base/validation.h"
+#include "impeller/core/formats.h"
 #include "impeller/renderer/context.h"
-#include "impeller/renderer/formats.h"
 #include "impeller/renderer/pipeline_descriptor.h"
 #include "impeller/renderer/shader_library.h"
 #include "impeller/renderer/vertex_descriptor.h"
@@ -48,13 +49,14 @@ struct PipelineBuilder {
   ///             context, a pipeline descriptor.
   ///
   static std::optional<PipelineDescriptor> MakeDefaultPipelineDescriptor(
-      const Context& context) {
+      const Context& context,
+      const std::vector<Scalar>& constants = {}) {
     PipelineDescriptor desc;
+    desc.SetSpecializationConstants(constants);
     if (InitializePipelineDescriptorDefaults(context, desc)) {
       return {std::move(desc)};
-    } else {
-      return std::nullopt;
     }
+    return std::nullopt;
   }
 
   [[nodiscard]] static bool InitializePipelineDescriptorDefaults(
@@ -86,29 +88,12 @@ struct PipelineBuilder {
     // Setup the vertex descriptor from reflected information.
     {
       auto vertex_descriptor = std::make_shared<VertexDescriptor>();
-      if (!vertex_descriptor->SetStageInputs(
-              VertexShader::kAllShaderStageInputs)) {
-        VALIDATION_LOG
-            << "Could not configure vertex descriptor for pipeline named '"
-            << VertexShader::kLabel << "'.";
-        return false;
-      }
-      if (!vertex_descriptor->SetDescriptorSetLayouts(
-              VertexShader::kDescriptorSetLayouts)) {
-        VALIDATION_LOG << "Cound not configure vertex descriptor set layout for"
-                          " pipeline named '"
-                       << VertexShader::kLabel << "'.";
-        return false;
-      }
-
-      if (!vertex_descriptor->SetDescriptorSetLayouts(
-              FragmentShader::kDescriptorSetLayouts)) {
-        VALIDATION_LOG << "Cound not configure vertex descriptor set layout for"
-                          " pipeline named '"
-                       << VertexShader::kLabel << "'.";
-        return false;
-      }
-
+      vertex_descriptor->SetStageInputs(VertexShader::kAllShaderStageInputs,
+                                        VertexShader::kInterleavedBufferLayout);
+      vertex_descriptor->RegisterDescriptorSetLayouts(
+          VertexShader::kDescriptorSetLayouts);
+      vertex_descriptor->RegisterDescriptorSetLayouts(
+          FragmentShader::kDescriptorSetLayouts);
       desc.SetVertexDescriptor(std::move(vertex_descriptor));
     }
 
@@ -117,17 +102,27 @@ struct PipelineBuilder {
       // Configure the sole color attachments pixel format. This is by
       // convention.
       ColorAttachmentDescriptor color0;
-      color0.format = context.GetColorAttachmentPixelFormat();
+      color0.format = context.GetCapabilities()->GetDefaultColorFormat();
       color0.blending_enabled = true;
       desc.SetColorAttachmentDescriptor(0u, color0);
     }
 
+    // Setup default depth buffer descriptions.
+    {
+      DepthAttachmentDescriptor depth0;
+      depth0.depth_compare = CompareFunction::kAlways;
+      desc.SetDepthStencilAttachmentDescriptor(depth0);
+      desc.SetDepthPixelFormat(
+          context.GetCapabilities()->GetDefaultDepthStencilFormat());
+    }
+
     // Setup default stencil buffer descriptions.
     {
       StencilAttachmentDescriptor stencil0;
       stencil0.stencil_compare = CompareFunction::kEqual;
       desc.SetStencilAttachmentDescriptors(stencil0);
-      desc.SetStencilPixelFormat(PixelFormat::kDefaultStencil);
+      desc.SetStencilPixelFormat(
+          context.GetCapabilities()->GetDefaultDepthStencilFormat());
     }
 
     return true;
@@ -135,3 +130,5 @@ struct PipelineBuilder {
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_PIPELINE_BUILDER_H_
diff --git a/impeller/renderer/pipeline_descriptor.cc b/impeller/renderer/pipeline_descriptor.cc
index c6d8029e46b64424899c847253e2534b7d737af7..9ae6710426f630d0910dbb30ee58bd086abb3f59 100644
--- a/impeller/renderer/pipeline_descriptor.cc
+++ b/impeller/renderer/pipeline_descriptor.cc
@@ -4,7 +4,10 @@
 
 #include "impeller/renderer/pipeline_descriptor.h"
 
-#include "impeller/renderer/formats.h"
+#include <utility>
+
+#include "impeller/base/comparable.h"
+#include "impeller/core/formats.h"
 #include "impeller/renderer/shader_function.h"
 #include "impeller/renderer/shader_library.h"
 #include "impeller/renderer/vertex_descriptor.h"
@@ -41,6 +44,7 @@ std::size_t PipelineDescriptor::GetHash() const {
   fml::HashCombineSeed(seed, winding_order_);
   fml::HashCombineSeed(seed, cull_mode_);
   fml::HashCombineSeed(seed, primitive_type_);
+  fml::HashCombineSeed(seed, polygon_mode_);
   return seed;
 }
 
@@ -59,7 +63,9 @@ bool PipelineDescriptor::IsEqual(const PipelineDescriptor& other) const {
              other.back_stencil_attachment_descriptor_ &&
          winding_order_ == other.winding_order_ &&
          cull_mode_ == other.cull_mode_ &&
-         primitive_type_ == other.primitive_type_;
+         primitive_type_ == other.primitive_type_ &&
+         polygon_mode_ == other.polygon_mode_ &&
+         specialization_constants_ == other.specialization_constants_;
 }
 
 PipelineDescriptor& PipelineDescriptor::SetLabel(std::string label) {
@@ -93,6 +99,14 @@ PipelineDescriptor& PipelineDescriptor::SetVertexDescriptor(
   return *this;
 }
 
+size_t PipelineDescriptor::GetMaxColorAttacmentBindIndex() const {
+  size_t max = 0;
+  for (const auto& color : color_attachment_descriptors_) {
+    max = std::max(color.first, max);
+  }
+  return max;
+}
+
 PipelineDescriptor& PipelineDescriptor::SetColorAttachmentDescriptor(
     size_t index,
     ColorAttachmentDescriptor desc) {
@@ -135,24 +149,44 @@ PipelineDescriptor& PipelineDescriptor::SetStencilPixelFormat(
 }
 
 PipelineDescriptor& PipelineDescriptor::SetDepthStencilAttachmentDescriptor(
-    DepthAttachmentDescriptor desc) {
+    std::optional<DepthAttachmentDescriptor> desc) {
   depth_attachment_descriptor_ = desc;
   return *this;
 }
 
 PipelineDescriptor& PipelineDescriptor::SetStencilAttachmentDescriptors(
-    StencilAttachmentDescriptor front_and_back) {
+    std::optional<StencilAttachmentDescriptor> front_and_back) {
   return SetStencilAttachmentDescriptors(front_and_back, front_and_back);
 }
 
 PipelineDescriptor& PipelineDescriptor::SetStencilAttachmentDescriptors(
-    StencilAttachmentDescriptor front,
-    StencilAttachmentDescriptor back) {
+    std::optional<StencilAttachmentDescriptor> front,
+    std::optional<StencilAttachmentDescriptor> back) {
   front_stencil_attachment_descriptor_ = front;
   back_stencil_attachment_descriptor_ = back;
   return *this;
 }
 
+void PipelineDescriptor::ClearStencilAttachments() {
+  back_stencil_attachment_descriptor_.reset();
+  front_stencil_attachment_descriptor_.reset();
+  SetStencilPixelFormat(impeller::PixelFormat::kUnknown);
+}
+
+void PipelineDescriptor::ClearDepthAttachment() {
+  depth_attachment_descriptor_.reset();
+  SetDepthPixelFormat(impeller::PixelFormat::kUnknown);
+}
+
+void PipelineDescriptor::ClearColorAttachment(size_t index) {
+  if (color_attachment_descriptors_.find(index) ==
+      color_attachment_descriptors_.end()) {
+    return;
+  }
+
+  color_attachment_descriptors_.erase(index);
+}
+
 void PipelineDescriptor::ResetAttachments() {
   color_attachment_descriptors_.clear();
   depth_attachment_descriptor_.reset();
@@ -239,4 +273,22 @@ PrimitiveType PipelineDescriptor::GetPrimitiveType() const {
   return primitive_type_;
 }
 
+void PipelineDescriptor::SetPolygonMode(PolygonMode mode) {
+  polygon_mode_ = mode;
+}
+
+PolygonMode PipelineDescriptor::GetPolygonMode() const {
+  return polygon_mode_;
+}
+
+void PipelineDescriptor::SetSpecializationConstants(
+    std::vector<Scalar> values) {
+  specialization_constants_ = std::move(values);
+}
+
+const std::vector<Scalar>& PipelineDescriptor::GetSpecializationConstants()
+    const {
+  return specialization_constants_;
+}
+
 }  // namespace impeller
diff --git a/impeller/renderer/pipeline_descriptor.h b/impeller/renderer/pipeline_descriptor.h
index 7b1ed5aa00a18f03cf2baa850e7b63311995b8ff..3ea2ae6080c60baaaf17fe2388761016e5d9f9dd 100644
--- a/impeller/renderer/pipeline_descriptor.h
+++ b/impeller/renderer/pipeline_descriptor.h
@@ -2,22 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_PIPELINE_DESCRIPTOR_H_
+#define FLUTTER_IMPELLER_RENDERER_PIPELINE_DESCRIPTOR_H_
 
-#include <functional>
-#include <future>
 #include <map>
 #include <memory>
 #include <string>
-#include <string_view>
-#include <type_traits>
-#include <unordered_map>
 
-#include "flutter/fml/hash_combine.h"
-#include "flutter/fml/macros.h"
 #include "impeller/base/comparable.h"
-#include "impeller/renderer/formats.h"
-#include "impeller/renderer/shader_types.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/shader_types.h"
 #include "impeller/tessellator/tessellator.h"
 
 namespace impeller {
@@ -55,6 +49,8 @@ class PipelineDescriptor final : public Comparable<PipelineDescriptor> {
 
   const std::shared_ptr<VertexDescriptor>& GetVertexDescriptor() const;
 
+  size_t GetMaxColorAttacmentBindIndex() const;
+
   PipelineDescriptor& SetColorAttachmentDescriptor(
       size_t index,
       ColorAttachmentDescriptor desc);
@@ -71,17 +67,23 @@ class PipelineDescriptor final : public Comparable<PipelineDescriptor> {
   const ColorAttachmentDescriptor* GetLegacyCompatibleColorAttachment() const;
 
   PipelineDescriptor& SetDepthStencilAttachmentDescriptor(
-      DepthAttachmentDescriptor desc);
+      std::optional<DepthAttachmentDescriptor> desc);
 
   std::optional<DepthAttachmentDescriptor> GetDepthStencilAttachmentDescriptor()
       const;
 
   PipelineDescriptor& SetStencilAttachmentDescriptors(
-      StencilAttachmentDescriptor front_and_back);
+      std::optional<StencilAttachmentDescriptor> front_and_back);
 
   PipelineDescriptor& SetStencilAttachmentDescriptors(
-      StencilAttachmentDescriptor front,
-      StencilAttachmentDescriptor back);
+      std::optional<StencilAttachmentDescriptor> front,
+      std::optional<StencilAttachmentDescriptor> back);
+
+  void ClearStencilAttachments();
+
+  void ClearDepthAttachment();
+
+  void ClearColorAttachment(size_t index);
 
   std::optional<StencilAttachmentDescriptor>
   GetFrontStencilAttachmentDescriptor() const;
@@ -119,6 +121,14 @@ class PipelineDescriptor final : public Comparable<PipelineDescriptor> {
 
   PrimitiveType GetPrimitiveType() const;
 
+  void SetPolygonMode(PolygonMode mode);
+
+  PolygonMode GetPolygonMode() const;
+
+  void SetSpecializationConstants(std::vector<Scalar> values);
+
+  const std::vector<Scalar>& GetSpecializationConstants() const;
+
  private:
   std::string label_;
   SampleCount sample_count_ = SampleCount::kCount1;
@@ -136,6 +146,10 @@ class PipelineDescriptor final : public Comparable<PipelineDescriptor> {
   std::optional<StencilAttachmentDescriptor>
       back_stencil_attachment_descriptor_;
   PrimitiveType primitive_type_ = PrimitiveType::kTriangle;
+  PolygonMode polygon_mode_ = PolygonMode::kFill;
+  std::vector<Scalar> specialization_constants_;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_PIPELINE_DESCRIPTOR_H_
diff --git a/impeller/renderer/pipeline_library.h b/impeller/renderer/pipeline_library.h
index ff53b8a0dee0618549b035b6620ebe1984eef65c..d97861f5dc5d7a4d10e64f054c5d71ef1ba1235d 100644
--- a/impeller/renderer/pipeline_library.h
+++ b/impeller/renderer/pipeline_library.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_PIPELINE_LIBRARY_H_
+#define FLUTTER_IMPELLER_RENDERER_PIPELINE_LIBRARY_H_
 
 #include <optional>
 
@@ -51,7 +52,11 @@ class PipelineLibrary : public std::enable_shared_from_this<PipelineLibrary> {
   PipelineLibrary();
 
  private:
-  FML_DISALLOW_COPY_AND_ASSIGN(PipelineLibrary);
+  PipelineLibrary(const PipelineLibrary&) = delete;
+
+  PipelineLibrary& operator=(const PipelineLibrary&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_PIPELINE_LIBRARY_H_
diff --git a/impeller/renderer/pool.h b/impeller/renderer/pool.h
new file mode 100644
index 0000000000000000000000000000000000000000..399236fd238b311e92e24c06a3355d2cc3fccdb1
--- /dev/null
+++ b/impeller/renderer/pool.h
@@ -0,0 +1,58 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_POOL_H_
+#define FLUTTER_IMPELLER_RENDERER_POOL_H_
+
+#include <cstdint>
+#include <memory>
+#include <mutex>
+
+namespace impeller {
+
+/// @brief A thread-safe pool with a limited byte size.
+/// @tparam T The type that the pool will contain.
+template <typename T>
+class Pool {
+ public:
+  explicit Pool(uint32_t limit_bytes) : limit_bytes_(limit_bytes) {}
+
+  std::shared_ptr<T> Grab() {
+    std::scoped_lock lock(mutex_);
+    if (pool_.empty()) {
+      return T::Create();
+    }
+    std::shared_ptr<T> result = std::move(pool_.back());
+    pool_.pop_back();
+    size_ -= result->GetSize();
+    return result;
+  }
+
+  void Recycle(std::shared_ptr<T> object) {
+    std::scoped_lock lock(mutex_);
+    size_t object_size = object->GetSize();
+    if (size_ + object_size <= limit_bytes_ &&
+        object_size < (limit_bytes_ / 2)) {
+      object->Reset();
+      size_ += object_size;
+      pool_.emplace_back(std::move(object));
+    }
+  }
+
+  uint32_t GetSize() const {
+    std::scoped_lock lock(mutex_);
+    return size_;
+  }
+
+ private:
+  std::vector<std::shared_ptr<T>> pool_;
+  const uint32_t limit_bytes_;
+  uint32_t size_ = 0;
+  // Note: This would perform better as a lockless ring buffer.
+  mutable std::mutex mutex_;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_POOL_H_
diff --git a/impeller/renderer/pool_unittests.cc b/impeller/renderer/pool_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..65c7d84f5676bf3a2f87716c3183d60039d1d33e
--- /dev/null
+++ b/impeller/renderer/pool_unittests.cc
@@ -0,0 +1,64 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "gtest/gtest.h"
+
+#include "impeller/renderer/pool.h"
+
+namespace impeller {
+namespace testing {
+
+namespace {
+class Foobar {
+ public:
+  static std::shared_ptr<Foobar> Create() { return std::make_shared<Foobar>(); }
+
+  size_t GetSize() const { return size_; }
+
+  void SetSize(size_t size) { size_ = size; }
+
+  void Reset() { is_reset_ = true; }
+
+  bool GetIsReset() const { return is_reset_; }
+
+  void SetIsReset(bool is_reset) { is_reset_ = is_reset; }
+
+ private:
+  size_t size_;
+  bool is_reset_ = false;
+};
+}  // namespace
+
+TEST(PoolTest, Simple) {
+  Pool<Foobar> pool(1'000);
+  {
+    auto grabbed = pool.Grab();
+    grabbed->SetSize(123);
+    pool.Recycle(grabbed);
+    EXPECT_EQ(pool.GetSize(), 123u);
+  }
+  auto grabbed = pool.Grab();
+  EXPECT_EQ(grabbed->GetSize(), 123u);
+  EXPECT_TRUE(grabbed->GetIsReset());
+  EXPECT_EQ(pool.GetSize(), 0u);
+}
+
+TEST(PoolTest, Overload) {
+  Pool<Foobar> pool(1'000);
+  {
+    std::vector<std::shared_ptr<Foobar>> values;
+    values.reserve(20);
+    for (int i = 0; i < 20; i++) {
+      values.push_back(pool.Grab());
+    }
+    for (const auto& value : values) {
+      value->SetSize(100);
+      pool.Recycle(value);
+    }
+  }
+  EXPECT_EQ(pool.GetSize(), 1'000u);
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/renderer/prefix_sum_test.comp b/impeller/renderer/prefix_sum_test.comp
new file mode 100644
index 0000000000000000000000000000000000000000..7cc940fb1251e9a3cd90ef1898946103ac752fe0
--- /dev/null
+++ b/impeller/renderer/prefix_sum_test.comp
@@ -0,0 +1,46 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+layout(local_size_x_id = 0) in;
+layout(std430) buffer;
+
+#include <impeller/prefix_sum.glsl>
+
+#define BLOCK_SIZE 1024
+
+layout(binding = 0) readonly buffer InputData {
+  uint count;
+  uint data[];
+}
+input_data;
+
+layout(binding = 1) writeonly buffer OutputData {
+  uint data[];
+}
+output_data;
+
+// Needs to be number of threads per threadgroup.
+shared uint memory[BLOCK_SIZE];
+
+void main() {
+  uint ident = gl_GlobalInvocationID.x;
+
+  uint value = 0;
+  if (ident < input_data.count) {
+    value = input_data.data[ident];
+  }
+
+  if (ident < BLOCK_SIZE) {
+    memory[ident] = value;
+  }
+
+  barrier();
+
+  ExclusivePrefixSum(ident, memory, BLOCK_SIZE);
+
+  if (ident < input_data.count) {
+    // Convert exclusive to inclusive sum.
+    output_data.data[ident] = memory[ident] + value;
+  }
+}
diff --git a/impeller/renderer/render_pass.cc b/impeller/renderer/render_pass.cc
index 5ca17a0342ee0149fdda8706fc960563ef250797..3fc4f50d16b632aca5d6d3f028d4412fb980a625 100644
--- a/impeller/renderer/render_pass.cc
+++ b/impeller/renderer/render_pass.cc
@@ -3,45 +3,66 @@
 // found in the LICENSE file.
 
 #include "impeller/renderer/render_pass.h"
+#include "fml/status.h"
 
 namespace impeller {
 
-RenderPass::RenderPass(std::weak_ptr<const Context> context,
+RenderPass::RenderPass(std::shared_ptr<const Context> context,
                        const RenderTarget& target)
     : context_(std::move(context)),
+      sample_count_(target.GetSampleCount()),
+      pixel_format_(target.GetRenderTargetPixelFormat()),
+      has_depth_attachment_(target.GetDepthAttachment().has_value()),
+      has_stencil_attachment_(target.GetStencilAttachment().has_value()),
+      render_target_size_(target.GetRenderTargetSize()),
       render_target_(target),
-      transients_buffer_(HostBuffer::Create()) {}
+      orthographic_(Matrix::MakeOrthographic(render_target_size_)) {}
 
-RenderPass::~RenderPass() = default;
+RenderPass::~RenderPass() {}
+
+SampleCount RenderPass::GetSampleCount() const {
+  return sample_count_;
+}
+
+PixelFormat RenderPass::GetRenderTargetPixelFormat() const {
+  return pixel_format_;
+}
+
+bool RenderPass::HasDepthAttachment() const {
+  return has_depth_attachment_;
+}
+
+bool RenderPass::HasStencilAttachment() const {
+  return has_stencil_attachment_;
+}
 
 const RenderTarget& RenderPass::GetRenderTarget() const {
   return render_target_;
 }
 
 ISize RenderPass::GetRenderTargetSize() const {
-  return render_target_.GetRenderTargetSize();
+  return render_target_size_;
 }
 
-HostBuffer& RenderPass::GetTransientsBuffer() {
-  return *transients_buffer_;
+const Matrix& RenderPass::GetOrthographicTransform() const {
+  return orthographic_;
 }
 
 void RenderPass::SetLabel(std::string label) {
   if (label.empty()) {
     return;
   }
-  transients_buffer_->SetLabel(SPrintF("%s Transients", label.c_str()));
   OnSetLabel(std::move(label));
 }
 
-bool RenderPass::AddCommand(Command command) {
-  if (!command) {
+bool RenderPass::AddCommand(Command&& command) {
+  if (!command.IsValid()) {
     VALIDATION_LOG << "Attempted to add an invalid command to the render pass.";
     return false;
   }
 
   if (command.scissor.has_value()) {
-    auto target_rect = IRect({}, render_target_.GetRenderTargetSize());
+    auto target_rect = IRect::MakeSize(render_target_.GetRenderTargetSize());
     if (!target_rect.Contains(command.scissor.value())) {
       VALIDATION_LOG << "Cannot apply a scissor that lies outside the bounds "
                         "of the render target.";
@@ -49,13 +70,8 @@ bool RenderPass::AddCommand(Command command) {
     }
   }
 
-  if (command.index_count == 0u) {
-    // Essentially a no-op. Don't record the command but this is not necessary
-    // an error either.
-    return true;
-  }
-
-  if (command.instance_count == 0u) {
+  if (command.vertex_buffer.vertex_count == 0u ||
+      command.instance_count == 0u) {
     // Essentially a no-op. Don't record the command but this is not necessary
     // an error either.
     return true;
@@ -66,12 +82,85 @@ bool RenderPass::AddCommand(Command command) {
 }
 
 bool RenderPass::EncodeCommands() const {
-  auto context = context_.lock();
-  // The context could have been collected in the meantime.
-  if (!context) {
-    return false;
+  return OnEncodeCommands(*context_);
+}
+
+const std::shared_ptr<const Context>& RenderPass::GetContext() const {
+  return context_;
+}
+
+void RenderPass::SetPipeline(
+    const std::shared_ptr<Pipeline<PipelineDescriptor>>& pipeline) {
+  pending_.pipeline = pipeline;
+}
+
+void RenderPass::SetCommandLabel(std::string_view label) {
+#ifdef IMPELLER_DEBUG
+  pending_.label = std::string(label);
+#endif  // IMPELLER_DEBUG
+}
+
+void RenderPass::SetStencilReference(uint32_t value) {
+  pending_.stencil_reference = value;
+}
+
+void RenderPass::SetBaseVertex(uint64_t value) {
+  pending_.base_vertex = value;
+}
+
+void RenderPass::SetViewport(Viewport viewport) {
+  pending_.viewport = viewport;
+}
+
+void RenderPass::SetScissor(IRect scissor) {
+  pending_.scissor = scissor;
+}
+
+void RenderPass::SetInstanceCount(size_t count) {
+  pending_.instance_count = count;
+}
+
+bool RenderPass::SetVertexBuffer(VertexBuffer buffer) {
+  return pending_.BindVertices(std::move(buffer));
+}
+
+fml::Status RenderPass::Draw() {
+  auto result = AddCommand(std::move(pending_));
+  pending_ = Command{};
+  if (result) {
+    return fml::Status();
   }
-  return OnEncodeCommands(*context);
+  return fml::Status(fml::StatusCode::kInvalidArgument,
+                     "Failed to encode command");
+}
+
+// |ResourceBinder|
+bool RenderPass::BindResource(ShaderStage stage,
+                              DescriptorType type,
+                              const ShaderUniformSlot& slot,
+                              const ShaderMetadata& metadata,
+                              BufferView view) {
+  return pending_.BindResource(stage, type, slot, metadata, view);
+}
+
+bool RenderPass::BindResource(
+    ShaderStage stage,
+    DescriptorType type,
+    const ShaderUniformSlot& slot,
+    const std::shared_ptr<const ShaderMetadata>& metadata,
+    BufferView view) {
+  return pending_.BindResource(stage, type, slot, metadata, std::move(view));
+}
+
+// |ResourceBinder|
+bool RenderPass::BindResource(ShaderStage stage,
+                              DescriptorType type,
+                              const SampledImageSlot& slot,
+                              const ShaderMetadata& metadata,
+                              std::shared_ptr<const Texture> texture,
+                              const std::unique_ptr<const Sampler>& sampler) {
+  return pending_.BindResource(stage, type, slot, metadata, std::move(texture),
+                               sampler);
 }
 
 }  // namespace impeller
diff --git a/impeller/renderer/render_pass.h b/impeller/renderer/render_pass.h
index 1e7c2c087c12dc9fa7af66cea5bb626a1b7aa98f..1b424c35d1e3d7f3fa8196b6df66cf1debadf86a 100644
--- a/impeller/renderer/render_pass.h
+++ b/impeller/renderer/render_pass.h
@@ -2,11 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_RENDER_PASS_H_
+#define FLUTTER_IMPELLER_RENDERER_RENDER_PASS_H_
 
 #include <string>
 
+#include "fml/status.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/resource_binder.h"
+#include "impeller/core/shader_types.h"
+#include "impeller/core/vertex_buffer.h"
 #include "impeller/renderer/command.h"
+#include "impeller/renderer/command_buffer.h"
 #include "impeller/renderer/render_target.h"
 
 namespace impeller {
@@ -23,30 +30,108 @@ class Allocator;
 ///
 /// @see        `CommandBuffer`
 ///
-class RenderPass {
+class RenderPass : public ResourceBinder {
  public:
   virtual ~RenderPass();
 
+  const std::shared_ptr<const Context>& GetContext() const;
+
   const RenderTarget& GetRenderTarget() const;
 
   ISize GetRenderTargetSize() const;
 
+  const Matrix& GetOrthographicTransform() const;
+
   virtual bool IsValid() const = 0;
 
   void SetLabel(std::string label);
 
-  HostBuffer& GetTransientsBuffer();
+  /// @brief Reserve [command_count] commands in the HAL command buffer.
+  ///
+  /// Note: this is not the native command buffer.
+  virtual void ReserveCommands(size_t command_count) {
+    commands_.reserve(command_count);
+  }
 
   //----------------------------------------------------------------------------
-  /// @brief      Record a command for subsequent encoding to the underlying
-  ///             command buffer. No work is encoded into the command buffer at
-  ///             this time.
+  /// The pipeline to use for this command.
+  virtual void SetPipeline(
+      const std::shared_ptr<Pipeline<PipelineDescriptor>>& pipeline);
+
+  //----------------------------------------------------------------------------
+  /// The debugging label to use for the command.
+  virtual void SetCommandLabel(std::string_view label);
+
+  //----------------------------------------------------------------------------
+  /// The reference value to use in stenciling operations. Stencil configuration
+  /// is part of pipeline setup and can be read from the pipelines descriptor.
   ///
-  /// @param[in]  command  The command
+  /// @see         `Pipeline`
+  /// @see         `PipelineDescriptor`
   ///
-  /// @return     If the command was valid for subsequent commitment.
+  virtual void SetStencilReference(uint32_t value);
+
+  virtual void SetBaseVertex(uint64_t value);
+
+  //----------------------------------------------------------------------------
+  /// The viewport coordinates that the rasterizer linearly maps normalized
+  /// device coordinates to.
+  /// If unset, the viewport is the size of the render target with a zero
+  /// origin, znear=0, and zfar=1.
+  ///
+  virtual void SetViewport(Viewport viewport);
+
+  //----------------------------------------------------------------------------
+  /// The scissor rect to use for clipping writes to the render target. The
+  /// scissor rect must lie entirely within the render target.
+  /// If unset, no scissor is applied.
+  ///
+  virtual void SetScissor(IRect scissor);
+
+  //----------------------------------------------------------------------------
+  /// The number of instances of the given set of vertices to render. Not all
+  /// backends support rendering more than one instance at a time.
+  ///
+  /// @warning      Setting this to more than one will limit the availability of
+  ///               backends to use with this command.
+  ///
+  virtual void SetInstanceCount(size_t count);
+
+  //----------------------------------------------------------------------------
+  /// @brief      Specify the vertex and index buffer to use for this command.
+  ///
+  /// @param[in]  buffer  The vertex and index buffer definition. If possible,
+  ///             this value should be moved and not copied.
   ///
-  bool AddCommand(Command command);
+  /// @return     returns if the binding was updated.
+  ///
+  virtual bool SetVertexBuffer(VertexBuffer buffer);
+
+  /// Record the currently pending command.
+  virtual fml::Status Draw();
+
+  // |ResourceBinder|
+  virtual bool BindResource(ShaderStage stage,
+                            DescriptorType type,
+                            const ShaderUniformSlot& slot,
+                            const ShaderMetadata& metadata,
+                            BufferView view) override;
+
+  virtual bool BindResource(
+      ShaderStage stage,
+      DescriptorType type,
+      const ShaderUniformSlot& slot,
+      const std::shared_ptr<const ShaderMetadata>& metadata,
+      BufferView view);
+
+  // |ResourceBinder|
+  virtual bool BindResource(
+      ShaderStage stage,
+      DescriptorType type,
+      const SampledImageSlot& slot,
+      const ShaderMetadata& metadata,
+      std::shared_ptr<const Texture> texture,
+      const std::unique_ptr<const Sampler>& sampler) override;
 
   //----------------------------------------------------------------------------
   /// @brief      Encode the recorded commands to the underlying command buffer.
@@ -56,20 +141,71 @@ class RenderPass {
   ///
   bool EncodeCommands() const;
 
+  //----------------------------------------------------------------------------
+  /// @brief      Accessor for the current Commands.
+  ///
+  /// @details    Visible for testing.
+  ///
+  virtual const std::vector<Command>& GetCommands() const { return commands_; }
+
+  //----------------------------------------------------------------------------
+  /// @brief      The sample count of the attached render target.
+  SampleCount GetSampleCount() const;
+
+  //----------------------------------------------------------------------------
+  /// @brief      The pixel format of the attached render target.
+  PixelFormat GetRenderTargetPixelFormat() const;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Whether the render target has a depth attachment.
+  bool HasDepthAttachment() const;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Whether the render target has an stencil attachment.
+  bool HasStencilAttachment() const;
+
  protected:
-  const std::weak_ptr<const Context> context_;
+  const std::shared_ptr<const Context> context_;
+  // The following properties: sample_count, pixel_format,
+  // has_stencil_attachment, and render_target_size are cached on the
+  // RenderTarget to speed up numerous lookups during rendering. This is safe as
+  // the RenderTarget itself is copied into the RenderTarget and only exposed as
+  // a const reference.
+  const SampleCount sample_count_;
+  const PixelFormat pixel_format_;
+  const bool has_depth_attachment_;
+  const bool has_stencil_attachment_;
+  const ISize render_target_size_;
   const RenderTarget render_target_;
-  std::shared_ptr<HostBuffer> transients_buffer_;
   std::vector<Command> commands_;
+  const Matrix orthographic_;
 
-  RenderPass(std::weak_ptr<const Context> context, const RenderTarget& target);
+  //----------------------------------------------------------------------------
+  /// @brief      Record a command for subsequent encoding to the underlying
+  ///             command buffer. No work is encoded into the command buffer at
+  ///             this time.
+  ///
+  /// @param[in]  command  The command
+  ///
+  /// @return     If the command was valid for subsequent commitment.
+  ///
+  bool AddCommand(Command&& command);
+
+  RenderPass(std::shared_ptr<const Context> context,
+             const RenderTarget& target);
 
   virtual void OnSetLabel(std::string label) = 0;
 
   virtual bool OnEncodeCommands(const Context& context) const = 0;
 
  private:
-  FML_DISALLOW_COPY_AND_ASSIGN(RenderPass);
+  RenderPass(const RenderPass&) = delete;
+
+  RenderPass& operator=(const RenderPass&) = delete;
+
+  Command pending_;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_RENDER_PASS_H_
diff --git a/impeller/renderer/render_target.cc b/impeller/renderer/render_target.cc
index 7c13412a384fad24e0c1dc45848b767f56691add..6afa486bab7bb0d155be54c41f202a45a6df588a 100644
--- a/impeller/renderer/render_target.cc
+++ b/impeller/renderer/render_target.cc
@@ -4,11 +4,15 @@
 
 #include "impeller/renderer/render_target.h"
 
+#include <sstream>
+
 #include "impeller/base/strings.h"
 #include "impeller/base/validation.h"
-#include "impeller/renderer/allocator.h"
+#include "impeller/core/allocator.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/texture.h"
+#include "impeller/core/texture_descriptor.h"
 #include "impeller/renderer/context.h"
-#include "impeller/renderer/texture.h"
 
 namespace impeller {
 
@@ -59,12 +63,20 @@ bool RenderTarget::IsValid() const {
 
       if (texture_type != attachment.texture->GetTextureDescriptor().type) {
         passes_type_validation = false;
+        VALIDATION_LOG << "Render target has incompatible texture types: "
+                       << TextureTypeToString(texture_type.value()) << " != "
+                       << TextureTypeToString(
+                              attachment.texture->GetTextureDescriptor().type)
+                       << " on target " << ToString();
         return false;
       }
 
       if (sample_count !=
           attachment.texture->GetTextureDescriptor().sample_count) {
         passes_type_validation = false;
+        VALIDATION_LOG << "Render target (" << ToString()
+                       << ") has incompatible sample counts.";
+
         return false;
       }
 
@@ -72,8 +84,6 @@ bool RenderTarget::IsValid() const {
     };
     IterateAllAttachments(iterator);
     if (!passes_type_validation) {
-      VALIDATION_LOG << "Render target texture types are not of the same type "
-                        "and sample count.";
       return false;
     }
   }
@@ -140,6 +150,22 @@ std::shared_ptr<Texture> RenderTarget::GetRenderTargetTexture() const {
                                        : found->second.texture;
 }
 
+PixelFormat RenderTarget::GetRenderTargetPixelFormat() const {
+  if (auto texture = GetRenderTargetTexture(); texture != nullptr) {
+    return texture->GetTextureDescriptor().format;
+  }
+
+  return PixelFormat::kUnknown;
+}
+
+size_t RenderTarget::GetMaxColorAttacmentBindIndex() const {
+  size_t max = 0;
+  for (const auto& color : colors_) {
+    max = std::max(color.first, max);
+  }
+  return max;
+}
+
 RenderTarget& RenderTarget::SetColorAttachment(
     const ColorAttachment& attachment,
     size_t index) {
@@ -149,15 +175,21 @@ RenderTarget& RenderTarget::SetColorAttachment(
   return *this;
 }
 
-RenderTarget& RenderTarget::SetDepthAttachment(DepthAttachment attachment) {
-  if (attachment.IsValid()) {
+RenderTarget& RenderTarget::SetDepthAttachment(
+    std::optional<DepthAttachment> attachment) {
+  if (!attachment.has_value()) {
+    depth_ = std::nullopt;
+  } else if (attachment->IsValid()) {
     depth_ = std::move(attachment);
   }
   return *this;
 }
 
-RenderTarget& RenderTarget::SetStencilAttachment(StencilAttachment attachment) {
-  if (attachment.IsValid()) {
+RenderTarget& RenderTarget::SetStencilAttachment(
+    std::optional<StencilAttachment> attachment) {
+  if (!attachment.has_value()) {
+    stencil_ = std::nullopt;
+  } else if (attachment->IsValid()) {
     stencil_ = std::move(attachment);
   }
   return *this;
@@ -177,155 +209,252 @@ const std::optional<StencilAttachment>& RenderTarget::GetStencilAttachment()
   return stencil_;
 }
 
-RenderTarget RenderTarget::CreateOffscreen(const Context& context,
-                                           ISize size,
-                                           const std::string& label,
-                                           StorageMode color_storage_mode,
-                                           LoadAction color_load_action,
-                                           StoreAction color_store_action,
-                                           StorageMode stencil_storage_mode,
-                                           LoadAction stencil_load_action,
-                                           StoreAction stencil_store_action) {
-  if (size.IsEmpty()) {
-    return {};
+size_t RenderTarget::GetTotalAttachmentCount() const {
+  size_t count = 0u;
+  for (const auto& [_, color] : colors_) {
+    if (color.texture) {
+      count++;
+    }
+    if (color.resolve_texture) {
+      count++;
+    }
   }
+  if (depth_.has_value()) {
+    count++;
+  }
+  if (stencil_.has_value()) {
+    count++;
+  }
+  return count;
+}
 
-  TextureDescriptor color_tex0;
-  color_tex0.storage_mode = color_storage_mode;
-  color_tex0.format = context.GetColorAttachmentPixelFormat();
-  color_tex0.size = size;
-  color_tex0.usage = static_cast<uint64_t>(TextureUsage::kRenderTarget) |
-                     static_cast<uint64_t>(TextureUsage::kShaderRead);
-
-  TextureDescriptor stencil_tex0;
-  stencil_tex0.storage_mode = stencil_storage_mode;
-  stencil_tex0.format = PixelFormat::kDefaultStencil;
-  stencil_tex0.size = size;
-  stencil_tex0.usage =
-      static_cast<TextureUsageMask>(TextureUsage::kRenderTarget);
-
-  ColorAttachment color0;
-  color0.clear_color = Color::BlackTransparent();
-  color0.load_action = color_load_action;
-  color0.store_action = color_store_action;
-  color0.texture = context.GetResourceAllocator()->CreateTexture(color_tex0);
+std::string RenderTarget::ToString() const {
+  std::stringstream stream;
 
-  if (!color0.texture) {
-    return {};
+  for (const auto& [index, color] : colors_) {
+    stream << SPrintF("Color[%zu]=(%s)", index,
+                      ColorAttachmentToString(color).c_str());
+  }
+  if (depth_) {
+    stream << ",";
+    stream << SPrintF("Depth=(%s)",
+                      DepthAttachmentToString(depth_.value()).c_str());
+  }
+  if (stencil_) {
+    stream << ",";
+    stream << SPrintF("Stencil=(%s)",
+                      StencilAttachmentToString(stencil_.value()).c_str());
   }
+  return stream.str();
+}
 
-  color0.texture->SetLabel(SPrintF("%s Color Texture", label.c_str()));
+RenderTargetAllocator::RenderTargetAllocator(
+    std::shared_ptr<Allocator> allocator)
+    : allocator_(std::move(allocator)) {}
 
-  StencilAttachment stencil0;
-  stencil0.load_action = stencil_load_action;
-  stencil0.store_action = stencil_store_action;
-  stencil0.clear_stencil = 0u;
-  stencil0.texture =
-      context.GetResourceAllocator()->CreateTexture(stencil_tex0);
+void RenderTargetAllocator::Start() {}
 
-  if (!stencil0.texture) {
+void RenderTargetAllocator::End() {}
+
+RenderTarget RenderTargetAllocator::CreateOffscreen(
+    const Context& context,
+    ISize size,
+    int mip_count,
+    const std::string& label,
+    RenderTarget::AttachmentConfig color_attachment_config,
+    std::optional<RenderTarget::AttachmentConfig> stencil_attachment_config,
+    const std::shared_ptr<Texture>& existing_color_texture,
+    const std::shared_ptr<Texture>& existing_depth_stencil_texture) {
+  if (size.IsEmpty()) {
     return {};
   }
 
-  stencil0.texture->SetLabel(SPrintF("%s Stencil Texture", label.c_str()));
-
   RenderTarget target;
+
+  std::shared_ptr<Texture> color0_tex;
+  if (existing_color_texture) {
+    color0_tex = existing_color_texture;
+  } else {
+    PixelFormat pixel_format =
+        context.GetCapabilities()->GetDefaultColorFormat();
+    TextureDescriptor color0_tex_desc;
+    color0_tex_desc.storage_mode = color_attachment_config.storage_mode;
+    color0_tex_desc.format = pixel_format;
+    color0_tex_desc.size = size;
+    color0_tex_desc.mip_count = mip_count;
+    color0_tex_desc.usage =
+        TextureUsage::kRenderTarget | TextureUsage::kShaderRead;
+    color0_tex = allocator_->CreateTexture(color0_tex_desc);
+    if (!color0_tex) {
+      return {};
+    }
+  }
+  color0_tex->SetLabel(SPrintF("%s Color Texture", label.c_str()));
+
+  ColorAttachment color0;
+  color0.clear_color = color_attachment_config.clear_color;
+  color0.load_action = color_attachment_config.load_action;
+  color0.store_action = color_attachment_config.store_action;
+  color0.texture = color0_tex;
   target.SetColorAttachment(color0, 0u);
-  target.SetStencilAttachment(std::move(stencil0));
+
+  if (stencil_attachment_config.has_value()) {
+    target.SetupDepthStencilAttachments(
+        context, *allocator_, size, false, label,
+        stencil_attachment_config.value(), existing_depth_stencil_texture);
+  } else {
+    target.SetStencilAttachment(std::nullopt);
+    target.SetDepthAttachment(std::nullopt);
+  }
 
   return target;
 }
 
-RenderTarget RenderTarget::CreateOffscreenMSAA(
+RenderTarget RenderTargetAllocator::CreateOffscreenMSAA(
     const Context& context,
     ISize size,
+    int mip_count,
     const std::string& label,
-    StorageMode color_storage_mode,
-    StorageMode color_resolve_storage_mode,
-    LoadAction color_load_action,
-    StoreAction color_store_action,
-    StorageMode stencil_storage_mode,
-    LoadAction stencil_load_action,
-    StoreAction stencil_store_action) {
+    RenderTarget::AttachmentConfigMSAA color_attachment_config,
+    std::optional<RenderTarget::AttachmentConfig> stencil_attachment_config,
+    const std::shared_ptr<Texture>& existing_color_msaa_texture,
+    const std::shared_ptr<Texture>& existing_color_resolve_texture,
+    const std::shared_ptr<Texture>& existing_depth_stencil_texture) {
   if (size.IsEmpty()) {
     return {};
   }
 
-  // Create MSAA color texture.
+  RenderTarget target;
+  PixelFormat pixel_format = context.GetCapabilities()->GetDefaultColorFormat();
 
-  TextureDescriptor color0_tex_desc;
-  color0_tex_desc.storage_mode = color_storage_mode;
-  color0_tex_desc.type = TextureType::kTexture2DMultisample;
-  color0_tex_desc.sample_count = SampleCount::kCount4;
-  color0_tex_desc.format = context.GetColorAttachmentPixelFormat();
-  color0_tex_desc.size = size;
-  color0_tex_desc.usage = static_cast<uint64_t>(TextureUsage::kRenderTarget);
-
-  auto color0_msaa_tex =
-      context.GetResourceAllocator()->CreateTexture(color0_tex_desc);
-  if (!color0_msaa_tex) {
-    VALIDATION_LOG << "Could not create multisample color texture.";
-    return {};
+  // Create MSAA color texture.
+  std::shared_ptr<Texture> color0_msaa_tex;
+  if (existing_color_msaa_texture) {
+    color0_msaa_tex = existing_color_msaa_texture;
+  } else {
+    TextureDescriptor color0_tex_desc;
+    color0_tex_desc.storage_mode = color_attachment_config.storage_mode;
+    color0_tex_desc.type = TextureType::kTexture2DMultisample;
+    color0_tex_desc.sample_count = SampleCount::kCount4;
+    color0_tex_desc.format = pixel_format;
+    color0_tex_desc.size = size;
+    color0_tex_desc.usage = TextureUsage::kRenderTarget;
+    if (context.GetCapabilities()->SupportsImplicitResolvingMSAA()) {
+      // See below ("SupportsImplicitResolvingMSAA") for more details.
+      color0_tex_desc.storage_mode = StorageMode::kDevicePrivate;
+    }
+    color0_msaa_tex = allocator_->CreateTexture(color0_tex_desc);
+    if (!color0_msaa_tex) {
+      VALIDATION_LOG << "Could not create multisample color texture.";
+      return {};
+    }
   }
   color0_msaa_tex->SetLabel(
       SPrintF("%s Color Texture (Multisample)", label.c_str()));
 
   // Create color resolve texture.
-
-  TextureDescriptor color0_resolve_tex_desc;
-  color0_resolve_tex_desc.storage_mode = color_resolve_storage_mode;
-  color0_resolve_tex_desc.format = context.GetColorAttachmentPixelFormat();
-  color0_resolve_tex_desc.size = size;
-  color0_resolve_tex_desc.usage =
-      static_cast<uint64_t>(TextureUsage::kRenderTarget) |
-      static_cast<uint64_t>(TextureUsage::kShaderRead);
-
-  auto color0_resolve_tex =
-      context.GetResourceAllocator()->CreateTexture(color0_resolve_tex_desc);
-  if (!color0_resolve_tex) {
-    VALIDATION_LOG << "Could not create color texture.";
-    return {};
+  std::shared_ptr<Texture> color0_resolve_tex;
+  if (existing_color_resolve_texture) {
+    color0_resolve_tex = existing_color_resolve_texture;
+  } else {
+    TextureDescriptor color0_resolve_tex_desc;
+    color0_resolve_tex_desc.storage_mode =
+        color_attachment_config.resolve_storage_mode;
+    color0_resolve_tex_desc.format = pixel_format;
+    color0_resolve_tex_desc.size = size;
+    color0_resolve_tex_desc.compression_type = CompressionType::kLossy;
+    color0_resolve_tex_desc.usage =
+        TextureUsage::kRenderTarget | TextureUsage::kShaderRead;
+    color0_resolve_tex_desc.mip_count = mip_count;
+    color0_resolve_tex = allocator_->CreateTexture(color0_resolve_tex_desc);
+    if (!color0_resolve_tex) {
+      VALIDATION_LOG << "Could not create color texture.";
+      return {};
+    }
   }
   color0_resolve_tex->SetLabel(SPrintF("%s Color Texture", label.c_str()));
 
   // Color attachment.
 
   ColorAttachment color0;
-  color0.clear_color = Color::BlackTransparent();
-  color0.load_action = color_load_action;
-  color0.store_action = color_store_action;
+  color0.clear_color = color_attachment_config.clear_color;
+  color0.load_action = color_attachment_config.load_action;
+  color0.store_action = color_attachment_config.store_action;
   color0.texture = color0_msaa_tex;
   color0.resolve_texture = color0_resolve_tex;
 
+  if (context.GetCapabilities()->SupportsImplicitResolvingMSAA()) {
+    // If implicit MSAA is supported, then the resolve texture is not needed
+    // because the multisample texture is automatically resolved. We instead
+    // provide a view of the multisample texture as the resolve texture (because
+    // the HAL does expect a resolve texture).
+    //
+    // In practice, this is used for GLES 2.0 EXT_multisampled_render_to_texture
+    // https://registry.khronos.org/OpenGL/extensions/EXT/EXT_multisampled_render_to_texture.txt
+    color0.resolve_texture = color0_msaa_tex;
+  }
+
+  target.SetColorAttachment(color0, 0u);
+
   // Create MSAA stencil texture.
 
-  TextureDescriptor stencil_tex0;
-  stencil_tex0.storage_mode = stencil_storage_mode;
-  stencil_tex0.type = TextureType::kTexture2DMultisample;
-  stencil_tex0.sample_count = SampleCount::kCount4;
-  stencil_tex0.format = PixelFormat::kDefaultStencil;
-  stencil_tex0.size = size;
-  stencil_tex0.usage =
-      static_cast<TextureUsageMask>(TextureUsage::kRenderTarget);
+  if (stencil_attachment_config.has_value()) {
+    target.SetupDepthStencilAttachments(context, *allocator_, size, true, label,
+                                        stencil_attachment_config.value(),
+                                        existing_depth_stencil_texture);
+  } else {
+    target.SetDepthAttachment(std::nullopt);
+    target.SetStencilAttachment(std::nullopt);
+  }
 
-  StencilAttachment stencil0;
-  stencil0.load_action = stencil_load_action;
-  stencil0.store_action = stencil_store_action;
-  stencil0.clear_stencil = 0u;
-  stencil0.texture =
-      context.GetResourceAllocator()->CreateTexture(stencil_tex0);
+  return target;
+}
 
-  if (!stencil0.texture) {
-    return {};
+void RenderTarget::SetupDepthStencilAttachments(
+    const Context& context,
+    Allocator& allocator,
+    ISize size,
+    bool msaa,
+    const std::string& label,
+    RenderTarget::AttachmentConfig stencil_attachment_config,
+    const std::shared_ptr<Texture>& existing_depth_stencil_texture) {
+  std::shared_ptr<Texture> depth_stencil_texture;
+  if (existing_depth_stencil_texture) {
+    depth_stencil_texture = existing_depth_stencil_texture;
+  } else {
+    TextureDescriptor depth_stencil_texture_desc;
+    depth_stencil_texture_desc.storage_mode =
+        stencil_attachment_config.storage_mode;
+    if (msaa) {
+      depth_stencil_texture_desc.type = TextureType::kTexture2DMultisample;
+      depth_stencil_texture_desc.sample_count = SampleCount::kCount4;
+    }
+    depth_stencil_texture_desc.format =
+        context.GetCapabilities()->GetDefaultDepthStencilFormat();
+    depth_stencil_texture_desc.size = size;
+    depth_stencil_texture_desc.usage = TextureUsage::kRenderTarget;
+    depth_stencil_texture = allocator.CreateTexture(depth_stencil_texture_desc);
+    if (!depth_stencil_texture) {
+      return;  // Error messages are handled by `Allocator::CreateTexture`.
+    }
   }
 
-  stencil0.texture->SetLabel(SPrintF("%s Stencil Texture", label.c_str()));
+  DepthAttachment depth0;
+  depth0.load_action = stencil_attachment_config.load_action;
+  depth0.store_action = stencil_attachment_config.store_action;
+  depth0.clear_depth = 0u;
+  depth0.texture = depth_stencil_texture;
 
-  RenderTarget target;
-  target.SetColorAttachment(color0, 0u);
-  target.SetStencilAttachment(std::move(stencil0));
+  StencilAttachment stencil0;
+  stencil0.load_action = stencil_attachment_config.load_action;
+  stencil0.store_action = stencil_attachment_config.store_action;
+  stencil0.clear_stencil = 0u;
+  stencil0.texture = std::move(depth_stencil_texture);
 
-  return target;
+  stencil0.texture->SetLabel(
+      SPrintF("%s Depth+Stencil Texture", label.c_str()));
+  SetDepthAttachment(std::move(depth0));
+  SetStencilAttachment(std::move(stencil0));
 }
 
 }  // namespace impeller
diff --git a/impeller/renderer/render_target.h b/impeller/renderer/render_target.h
index 802671afa8ad4aecac7c89275d0c741397bb4fbf..6d635276ec1faf79501b94dfa2de7f66a17e30c2 100644
--- a/impeller/renderer/render_target.h
+++ b/impeller/renderer/render_target.h
@@ -2,45 +2,74 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_RENDER_TARGET_H_
+#define FLUTTER_IMPELLER_RENDERER_RENDER_TARGET_H_
 
 #include <functional>
 #include <map>
 #include <optional>
 
-#include "flutter/fml/macros.h"
+#include "flutter/fml/hash_combine.h"
+#include "impeller/core/allocator.h"
+#include "impeller/core/formats.h"
 #include "impeller/geometry/size.h"
-#include "impeller/renderer/allocator.h"
-#include "impeller/renderer/formats.h"
 
 namespace impeller {
 
 class Context;
 
-class RenderTarget {
+struct RenderTargetConfig {
+  ISize size = ISize{0, 0};
+  size_t mip_count = 0;
+  bool has_msaa = false;
+  bool has_depth_stencil = false;
+
+  constexpr bool operator==(const RenderTargetConfig& o) const {
+    return size == o.size && mip_count == o.mip_count &&
+           has_msaa == o.has_msaa && has_depth_stencil == o.has_depth_stencil;
+  }
+
+  constexpr size_t Hash() const {
+    return fml::HashCombine(size.width, size.height, mip_count, has_msaa,
+                            has_depth_stencil);
+  }
+};
+
+class RenderTarget final {
  public:
-  static RenderTarget CreateOffscreen(
-      const Context& context,
-      ISize size,
-      const std::string& label = "Offscreen",
-      StorageMode color_storage_mode = StorageMode::kDevicePrivate,
-      LoadAction color_load_action = LoadAction::kClear,
-      StoreAction color_store_action = StoreAction::kStore,
-      StorageMode stencil_storage_mode = StorageMode::kDeviceTransient,
-      LoadAction stencil_load_action = LoadAction::kClear,
-      StoreAction stencil_store_action = StoreAction::kDontCare);
-
-  static RenderTarget CreateOffscreenMSAA(
-      const Context& context,
-      ISize size,
-      const std::string& label = "Offscreen MSAA",
-      StorageMode color_storage_mode = StorageMode::kDeviceTransient,
-      StorageMode color_resolve_storage_mode = StorageMode::kDevicePrivate,
-      LoadAction color_load_action = LoadAction::kClear,
-      StoreAction color_store_action = StoreAction::kMultisampleResolve,
-      StorageMode stencil_storage_mode = StorageMode::kDeviceTransient,
-      LoadAction stencil_load_action = LoadAction::kClear,
-      StoreAction stencil_store_action = StoreAction::kDontCare);
+  struct AttachmentConfig {
+    StorageMode storage_mode;
+    LoadAction load_action;
+    StoreAction store_action;
+    Color clear_color;
+  };
+
+  struct AttachmentConfigMSAA {
+    StorageMode storage_mode;
+    StorageMode resolve_storage_mode;
+    LoadAction load_action;
+    StoreAction store_action;
+    Color clear_color;
+  };
+
+  static constexpr AttachmentConfig kDefaultColorAttachmentConfig = {
+      .storage_mode = StorageMode::kDevicePrivate,
+      .load_action = LoadAction::kClear,
+      .store_action = StoreAction::kStore,
+      .clear_color = Color::BlackTransparent()};
+
+  static constexpr AttachmentConfigMSAA kDefaultColorAttachmentConfigMSAA = {
+      .storage_mode = StorageMode::kDeviceTransient,
+      .resolve_storage_mode = StorageMode::kDevicePrivate,
+      .load_action = LoadAction::kClear,
+      .store_action = StoreAction::kMultisampleResolve,
+      .clear_color = Color::BlackTransparent()};
+
+  static constexpr AttachmentConfig kDefaultStencilAttachmentConfig = {
+      .storage_mode = StorageMode::kDeviceTransient,
+      .load_action = LoadAction::kClear,
+      .store_action = StoreAction::kDontCare,
+      .clear_color = Color::BlackTransparent()};
 
   RenderTarget();
 
@@ -48,6 +77,16 @@ class RenderTarget {
 
   bool IsValid() const;
 
+  void SetupDepthStencilAttachments(
+      const Context& context,
+      Allocator& allocator,
+      ISize size,
+      bool msaa,
+      const std::string& label = "Offscreen",
+      RenderTarget::AttachmentConfig stencil_attachment_config =
+          RenderTarget::kDefaultStencilAttachmentConfig,
+      const std::shared_ptr<Texture>& depth_stencil_texture = nullptr);
+
   SampleCount GetSampleCount() const;
 
   bool HasColorAttachment(size_t index) const;
@@ -56,14 +95,19 @@ class RenderTarget {
 
   std::shared_ptr<Texture> GetRenderTargetTexture() const;
 
+  PixelFormat GetRenderTargetPixelFormat() const;
+
   std::optional<ISize> GetColorAttachmentSize(size_t index) const;
 
   RenderTarget& SetColorAttachment(const ColorAttachment& attachment,
                                    size_t index);
 
-  RenderTarget& SetDepthAttachment(DepthAttachment attachment);
+  RenderTarget& SetDepthAttachment(std::optional<DepthAttachment> attachment);
+
+  RenderTarget& SetStencilAttachment(
+      std::optional<StencilAttachment> attachment);
 
-  RenderTarget& SetStencilAttachment(StencilAttachment attachment);
+  size_t GetMaxColorAttacmentBindIndex() const;
 
   const std::map<size_t, ColorAttachment>& GetColorAttachments() const;
 
@@ -71,13 +115,76 @@ class RenderTarget {
 
   const std::optional<StencilAttachment>& GetStencilAttachment() const;
 
+  size_t GetTotalAttachmentCount() const;
+
+  void IterateAllAttachments(
+      const std::function<bool(const Attachment& attachment)>& iterator) const;
+
+  std::string ToString() const;
+
+  RenderTargetConfig ToConfig() const {
+    auto& color_attachment = GetColorAttachments().find(0)->second;
+    return RenderTargetConfig{
+        .size = color_attachment.texture->GetSize(),
+        .mip_count = color_attachment.texture->GetMipCount(),
+        .has_msaa = color_attachment.resolve_texture != nullptr,
+        .has_depth_stencil = depth_.has_value() && stencil_.has_value()};
+  }
+
  private:
   std::map<size_t, ColorAttachment> colors_;
   std::optional<DepthAttachment> depth_;
   std::optional<StencilAttachment> stencil_;
+};
 
-  void IterateAllAttachments(
-      const std::function<bool(const Attachment& attachment)>& iterator) const;
+/// @brief a wrapper around the impeller [Allocator] instance that can be used
+///        to provide caching of allocated render target textures.
+class RenderTargetAllocator {
+ public:
+  explicit RenderTargetAllocator(std::shared_ptr<Allocator> allocator);
+
+  virtual ~RenderTargetAllocator() = default;
+
+  virtual RenderTarget CreateOffscreen(
+      const Context& context,
+      ISize size,
+      int mip_count,
+      const std::string& label = "Offscreen",
+      RenderTarget::AttachmentConfig color_attachment_config =
+          RenderTarget::kDefaultColorAttachmentConfig,
+      std::optional<RenderTarget::AttachmentConfig> stencil_attachment_config =
+          RenderTarget::kDefaultStencilAttachmentConfig,
+      const std::shared_ptr<Texture>& existing_color_texture = nullptr,
+      const std::shared_ptr<Texture>& existing_depth_stencil_texture = nullptr);
+
+  virtual RenderTarget CreateOffscreenMSAA(
+      const Context& context,
+      ISize size,
+      int mip_count,
+      const std::string& label = "Offscreen MSAA",
+      RenderTarget::AttachmentConfigMSAA color_attachment_config =
+          RenderTarget::kDefaultColorAttachmentConfigMSAA,
+      std::optional<RenderTarget::AttachmentConfig> stencil_attachment_config =
+          RenderTarget::kDefaultStencilAttachmentConfig,
+      const std::shared_ptr<Texture>& existing_color_msaa_texture = nullptr,
+      const std::shared_ptr<Texture>& existing_color_resolve_texture = nullptr,
+      const std::shared_ptr<Texture>& existing_depth_stencil_texture = nullptr);
+
+  /// @brief Mark the beginning of a frame workload.
+  ///
+  ///       This may be used to reset any tracking state on whether or not a
+  ///       particular texture instance is still in use.
+  virtual void Start();
+
+  /// @brief Mark the end of a frame workload.
+  ///
+  ///        This may be used to deallocate any unused textures.
+  virtual void End();
+
+ private:
+  std::shared_ptr<Allocator> allocator_;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_RENDER_TARGET_H_
diff --git a/impeller/renderer/renderer.cc b/impeller/renderer/renderer.cc
index d1fda89cf726f3ae67626c3843e8c8a723dce395..abc5dc2b7ce75ff60939c6bd3efb38cfec23601f 100644
--- a/impeller/renderer/renderer.cc
+++ b/impeller/renderer/renderer.cc
@@ -6,9 +6,7 @@
 
 #include <algorithm>
 
-#include "flutter/fml/logging.h"
 #include "flutter/fml/trace_event.h"
-#include "impeller/base/validation.h"
 #include "impeller/renderer/command_buffer.h"
 #include "impeller/renderer/surface.h"
 
diff --git a/impeller/renderer/renderer.h b/impeller/renderer/renderer.h
index b620e760bed637c0a9d659693b5f3deb44ab1d06..1a07e59dcd02fd34b6f8dae479d7262746f3bef6 100644
--- a/impeller/renderer/renderer.h
+++ b/impeller/renderer/renderer.h
@@ -2,21 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_RENDERER_H_
+#define FLUTTER_IMPELLER_RENDERER_RENDERER_H_
 
 #include <functional>
 #include <memory>
 
-#include "flutter/fml/macros.h"
 #include "flutter/fml/synchronization/semaphore.h"
-#include "impeller/geometry/size.h"
 #include "impeller/renderer/context.h"
 #include "impeller/renderer/render_target.h"
 
 namespace impeller {
 
 class Surface;
-class RenderPass;
 
 class Renderer {
  public:
@@ -24,8 +22,8 @@ class Renderer {
 
   using RenderCallback = std::function<bool(RenderTarget& render_target)>;
 
-  Renderer(std::shared_ptr<Context> context,
-           size_t max_frames_in_flight = kDefaultMaxFramesInFlight);
+  explicit Renderer(std::shared_ptr<Context> context,
+                    size_t max_frames_in_flight = kDefaultMaxFramesInFlight);
 
   ~Renderer();
 
@@ -41,7 +39,11 @@ class Renderer {
   std::shared_ptr<Context> context_;
   bool is_valid_ = false;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(Renderer);
+  Renderer(const Renderer&) = delete;
+
+  Renderer& operator=(const Renderer&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_RENDERER_H_
diff --git a/impeller/renderer/renderer_dart_unittests.cc b/impeller/renderer/renderer_dart_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ab69f921d96a58f41a9aef687855f481cefa22f5
--- /dev/null
+++ b/impeller/renderer/renderer_dart_unittests.cc
@@ -0,0 +1,140 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#define FML_USED_ON_EMBEDDER
+
+#include <memory>
+
+#include "flutter/common/settings.h"
+#include "flutter/common/task_runners.h"
+#include "flutter/lib/gpu/context.h"
+#include "flutter/lib/gpu/shader_library.h"
+#include "flutter/runtime/dart_isolate.h"
+#include "flutter/runtime/dart_vm_lifecycle.h"
+#include "flutter/testing/dart_fixture.h"
+#include "flutter/testing/dart_isolate_runner.h"
+#include "flutter/testing/testing.h"
+#include "fml/memory/ref_ptr.h"
+#include "impeller/playground/playground_test.h"
+#include "impeller/renderer/render_pass.h"
+
+#include "gtest/gtest.h"
+#include "third_party/imgui/imgui.h"
+
+namespace impeller {
+namespace testing {
+
+static void InstantiateTestShaderLibrary(Context::BackendType backend_type) {
+  auto fixture =
+      flutter::testing::OpenFixtureAsMapping("playground.shaderbundle");
+  auto library = flutter::gpu::ShaderLibrary::MakeFromFlatbuffer(
+      backend_type, std::move(fixture));
+  flutter::gpu::ShaderLibrary::SetOverride(library);
+}
+
+class RendererDartTest : public PlaygroundTest,
+                         public flutter::testing::DartFixture {
+ public:
+  RendererDartTest()
+      : settings_(CreateSettingsForFixture()),
+        vm_ref_(flutter::DartVMRef::Create(settings_)) {
+    fml::MessageLoop::EnsureInitializedForCurrentThread();
+
+    current_task_runner_ = fml::MessageLoop::GetCurrent().GetTaskRunner();
+
+    isolate_ = CreateDartIsolate();
+    assert(isolate_);
+    assert(isolate_->get()->GetPhase() == flutter::DartIsolate::Phase::Running);
+  }
+
+  flutter::testing::AutoIsolateShutdown* GetIsolate() {
+    // Sneak the context into the Flutter GPU API.
+    assert(GetContext() != nullptr);
+    flutter::gpu::Context::SetOverrideContext(GetContext());
+
+    InstantiateTestShaderLibrary(GetContext()->GetBackendType());
+
+    return isolate_.get();
+  }
+
+ private:
+  std::unique_ptr<flutter::testing::AutoIsolateShutdown> CreateDartIsolate() {
+    const auto settings = CreateSettingsForFixture();
+    flutter::TaskRunners task_runners(flutter::testing::GetCurrentTestName(),
+                                      current_task_runner_,  //
+                                      current_task_runner_,  //
+                                      current_task_runner_,  //
+                                      current_task_runner_   //
+    );
+    return flutter::testing::RunDartCodeInIsolate(
+        vm_ref_, settings, task_runners, "main", {},
+        flutter::testing::GetDefaultKernelFilePath());
+  }
+
+  const flutter::Settings settings_;
+  flutter::DartVMRef vm_ref_;
+  fml::RefPtr<fml::TaskRunner> current_task_runner_;
+  std::unique_ptr<flutter::testing::AutoIsolateShutdown> isolate_;
+};
+
+INSTANTIATE_PLAYGROUND_SUITE(RendererDartTest);
+
+TEST_P(RendererDartTest, CanRunDartInPlaygroundFrame) {
+  auto isolate = GetIsolate();
+
+  SinglePassCallback callback = [&](RenderPass& pass) {
+    ImGui::Begin("Dart test", nullptr);
+    ImGui::Text(
+        "This test executes Dart code during the playground frame callback.");
+    ImGui::End();
+
+    return isolate->RunInIsolateScope([]() -> bool {
+      if (tonic::CheckAndHandleError(::Dart_Invoke(
+              Dart_RootLibrary(), tonic::ToDart("sayHi"), 0, nullptr))) {
+        return false;
+      }
+      return true;
+    });
+  };
+  OpenPlaygroundHere(callback);
+}
+
+TEST_P(RendererDartTest, CanInstantiateFlutterGPUContext) {
+  auto isolate = GetIsolate();
+  bool result = isolate->RunInIsolateScope([]() -> bool {
+    if (tonic::CheckAndHandleError(::Dart_Invoke(
+            Dart_RootLibrary(), tonic::ToDart("instantiateDefaultContext"), 0,
+            nullptr))) {
+      return false;
+    }
+    return true;
+  });
+
+  ASSERT_TRUE(result);
+}
+
+#define DART_TEST_CASE(name)                                            \
+  TEST_P(RendererDartTest, name) {                                      \
+    auto isolate = GetIsolate();                                        \
+    bool result = isolate->RunInIsolateScope([]() -> bool {             \
+      if (tonic::CheckAndHandleError(::Dart_Invoke(                     \
+              Dart_RootLibrary(), tonic::ToDart(#name), 0, nullptr))) { \
+        return false;                                                   \
+      }                                                                 \
+      return true;                                                      \
+    });                                                                 \
+    ASSERT_TRUE(result);                                                \
+  }
+
+/// These test entries correspond to Dart functions located in
+/// `flutter/impeller/fixtures/dart_tests.dart`
+
+DART_TEST_CASE(canCreateShaderLibrary);
+DART_TEST_CASE(canReflectUniformStructs);
+DART_TEST_CASE(uniformBindFailsForInvalidHostBufferOffset);
+
+DART_TEST_CASE(canCreateRenderPassAndSubmit);
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/renderer/renderer_unittests.cc b/impeller/renderer/renderer_unittests.cc
index cfd3637f9a8c2c710b5221f6975204983cc9fc56..0024e42c9d8617b5f24bc9db34087f08d914bdde 100644
--- a/impeller/renderer/renderer_unittests.cc
+++ b/impeller/renderer/renderer_unittests.cc
@@ -2,8 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/testing/testing.h"
-#include "impeller/base/strings.h"
+#include "flutter/fml/logging.h"
+#include "impeller/core/device_buffer_descriptor.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/host_buffer.h"
+#include "impeller/core/sampler_descriptor.h"
 #include "impeller/fixtures/array.frag.h"
 #include "impeller/fixtures/array.vert.h"
 #include "impeller/fixtures/box_fade.frag.h"
@@ -18,27 +21,29 @@
 #include "impeller/fixtures/instanced_draw.vert.h"
 #include "impeller/fixtures/mipmaps.frag.h"
 #include "impeller/fixtures/mipmaps.vert.h"
+#include "impeller/fixtures/sepia.frag.h"
+#include "impeller/fixtures/sepia.vert.h"
+#include "impeller/fixtures/swizzle.frag.h"
 #include "impeller/fixtures/test_texture.frag.h"
 #include "impeller/fixtures/test_texture.vert.h"
+#include "impeller/fixtures/texture.frag.h"
+#include "impeller/fixtures/texture.vert.h"
 #include "impeller/geometry/path_builder.h"
-#include "impeller/image/compressed_image.h"
-#include "impeller/image/decompressed_image.h"
 #include "impeller/playground/playground_test.h"
 #include "impeller/renderer/command.h"
 #include "impeller/renderer/command_buffer.h"
-#include "impeller/renderer/device_buffer_descriptor.h"
-#include "impeller/renderer/formats.h"
 #include "impeller/renderer/pipeline_builder.h"
 #include "impeller/renderer/pipeline_library.h"
+#include "impeller/renderer/render_pass.h"
+#include "impeller/renderer/render_target.h"
 #include "impeller/renderer/renderer.h"
-#include "impeller/renderer/sampler.h"
-#include "impeller/renderer/sampler_descriptor.h"
-#include "impeller/renderer/sampler_library.h"
-#include "impeller/renderer/surface.h"
 #include "impeller/renderer/vertex_buffer_builder.h"
 #include "impeller/tessellator/tessellator.h"
 #include "third_party/imgui/imgui.h"
 
+// TODO(zanderso): https://github.com/flutter/flutter/issues/127701
+// NOLINTBEGIN(bugprone-unchecked-optional-access)
+
 namespace impeller {
 namespace testing {
 
@@ -54,9 +59,7 @@ TEST_P(RendererTest, CanCreateBoxPrimitive) {
   auto desc = BoxPipelineBuilder::MakeDefaultPipelineDescriptor(*context);
   ASSERT_TRUE(desc.has_value());
   desc->SetSampleCount(SampleCount::kCount4);
-  auto box_pipeline =
-      context->GetPipelineLibrary()->GetPipeline(std::move(desc)).Get();
-  ASSERT_TRUE(box_pipeline);
+  desc->SetStencilAttachmentDescriptors(std::nullopt);
 
   // Vertex buffer.
   VertexBufferBuilder<VS::PerVertexData> vertex_builder;
@@ -69,27 +72,36 @@ TEST_P(RendererTest, CanCreateBoxPrimitive) {
       {{800, 800, 0.0}, {1.0, 1.0}},  // 3
       {{100, 800, 0.0}, {0.0, 1.0}},  // 4
   });
-  auto vertex_buffer =
-      vertex_builder.CreateVertexBuffer(*context->GetResourceAllocator());
-  ASSERT_TRUE(vertex_buffer);
-
   auto bridge = CreateTextureForFixture("bay_bridge.jpg");
   auto boston = CreateTextureForFixture("boston.jpg");
   ASSERT_TRUE(bridge && boston);
-  auto sampler = context->GetSamplerLibrary()->GetSampler({});
+  const std::unique_ptr<const Sampler>& sampler =
+      context->GetSamplerLibrary()->GetSampler({});
   ASSERT_TRUE(sampler);
+
+  auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
   SinglePassCallback callback = [&](RenderPass& pass) {
-    Command cmd;
-    cmd.label = "Box";
-    cmd.pipeline = box_pipeline;
+    ImGui::Begin("Controls", nullptr, ImGuiWindowFlags_AlwaysAutoResize);
+    static bool wireframe;
+    ImGui::Checkbox("Wireframe", &wireframe);
+    ImGui::End();
+
+    desc->SetPolygonMode(wireframe ? PolygonMode::kLine : PolygonMode::kFill);
+    auto pipeline = context->GetPipelineLibrary()->GetPipeline(desc).Get();
 
-    cmd.BindVertices(vertex_buffer);
+    assert(pipeline && pipeline->IsValid());
+
+    pass.SetCommandLabel("Box");
+    pass.SetPipeline(pipeline);
+    pass.SetVertexBuffer(
+        vertex_builder.CreateVertexBuffer(*context->GetResourceAllocator()));
 
     VS::UniformBuffer uniforms;
-    uniforms.mvp = Matrix::MakeOrthographic(pass.GetRenderTargetSize()) *
-                   Matrix::MakeScale(GetContentScale());
-    VS::BindUniformBuffer(cmd,
-                          pass.GetTransientsBuffer().EmplaceUniform(uniforms));
+    EXPECT_EQ(pass.GetOrthographicTransform(),
+              Matrix::MakeOrthographic(pass.GetRenderTargetSize()));
+    uniforms.mvp =
+        pass.GetOrthographicTransform() * Matrix::MakeScale(GetContentScale());
+    VS::BindUniformBuffer(pass, host_buffer->EmplaceUniform(uniforms));
 
     FS::FrameInfo frame_info;
     frame_info.current_time = GetSecondsElapsed();
@@ -97,14 +109,12 @@ TEST_P(RendererTest, CanCreateBoxPrimitive) {
     frame_info.window_size.x = GetWindowSize().width;
     frame_info.window_size.y = GetWindowSize().height;
 
-    FS::BindFrameInfo(cmd,
-                      pass.GetTransientsBuffer().EmplaceUniform(frame_info));
-    FS::BindContents1(cmd, boston, sampler);
-    FS::BindContents2(cmd, bridge, sampler);
-    if (!pass.AddCommand(std::move(cmd))) {
-      return false;
-    }
-    return true;
+    FS::BindFrameInfo(pass, host_buffer->EmplaceUniform(frame_info));
+    FS::BindContents1(pass, boston, sampler);
+    FS::BindContents2(pass, bridge, sampler);
+
+    host_buffer->Reset();
+    return pass.Draw().ok();
   };
   OpenPlaygroundHere(callback);
 }
@@ -117,7 +127,9 @@ TEST_P(RendererTest, CanRenderPerspectiveCube) {
   auto desc = PipelineBuilder<VS, FS>::MakeDefaultPipelineDescriptor(*context);
   ASSERT_TRUE(desc.has_value());
   desc->SetCullMode(CullMode::kBackFace);
+  desc->SetWindingOrder(WindingOrder::kCounterClockwise);
   desc->SetSampleCount(SampleCount::kCount4);
+  desc->SetStencilAttachmentDescriptors(std::nullopt);
   auto pipeline =
       context->GetPipelineLibrary()->GetPipeline(std::move(desc)).Get();
   ASSERT_TRUE(pipeline);
@@ -155,14 +167,16 @@ TEST_P(RendererTest, CanRenderPerspectiveCube) {
     vertex_buffer.index_buffer = {
         .buffer = device_buffer,
         .range = Range(offsetof(Cube, indices), sizeof(Cube::indices))};
-    vertex_buffer.index_count = 36;
+    vertex_buffer.vertex_count = 36;
     vertex_buffer.index_type = IndexType::k16bit;
   }
 
-  auto sampler = context->GetSamplerLibrary()->GetSampler({});
+  const std::unique_ptr<const Sampler>& sampler =
+      context->GetSamplerLibrary()->GetSampler({});
   ASSERT_TRUE(sampler);
 
   Vector3 euler_angles;
+  auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
   SinglePassCallback callback = [&](RenderPass& pass) {
     static Degrees fov_y(60);
     static Scalar distance = 10;
@@ -172,11 +186,9 @@ TEST_P(RendererTest, CanRenderPerspectiveCube) {
     ImGui::SliderFloat("Camera distance", &distance, 0, 30);
     ImGui::End();
 
-    Command cmd;
-    cmd.label = "Perspective Cube";
-    cmd.pipeline = pipeline;
-
-    cmd.BindVertices(vertex_buffer);
+    pass.SetCommandLabel("Perspective Cube");
+    pass.SetPipeline(pipeline);
+    pass.SetVertexBuffer(vertex_buffer);
 
     VS::UniformBuffer uniforms;
     Scalar time = GetSecondsElapsed();
@@ -184,16 +196,14 @@ TEST_P(RendererTest, CanRenderPerspectiveCube) {
 
     uniforms.mvp =
         Matrix::MakePerspective(fov_y, pass.GetRenderTargetSize(), 0, 10) *
-        Matrix::MakeTranslation({0, 0, -distance}) *
+        Matrix::MakeTranslation({0, 0, distance}) *
         Matrix::MakeRotationX(Radians(euler_angles.x)) *
         Matrix::MakeRotationY(Radians(euler_angles.y)) *
         Matrix::MakeRotationZ(Radians(euler_angles.z));
-    VS::BindUniformBuffer(cmd,
-                          pass.GetTransientsBuffer().EmplaceUniform(uniforms));
-    if (!pass.AddCommand(std::move(cmd))) {
-      return false;
-    }
-    return true;
+    VS::BindUniformBuffer(pass, host_buffer->EmplaceUniform(uniforms));
+
+    host_buffer->Reset();
+    return pass.Draw().ok();
   };
   OpenPlaygroundHere(callback);
 }
@@ -207,6 +217,7 @@ TEST_P(RendererTest, CanRenderMultiplePrimitives) {
   auto desc = BoxPipelineBuilder::MakeDefaultPipelineDescriptor(*context);
   ASSERT_TRUE(desc.has_value());
   desc->SetSampleCount(SampleCount::kCount4);
+  desc->SetStencilAttachmentDescriptors(std::nullopt);
   auto box_pipeline =
       context->GetPipelineLibrary()->GetPipeline(std::move(desc)).Get();
   ASSERT_TRUE(box_pipeline);
@@ -229,41 +240,42 @@ TEST_P(RendererTest, CanRenderMultiplePrimitives) {
   auto bridge = CreateTextureForFixture("bay_bridge.jpg");
   auto boston = CreateTextureForFixture("boston.jpg");
   ASSERT_TRUE(bridge && boston);
-  auto sampler = context->GetSamplerLibrary()->GetSampler({});
+  const std::unique_ptr<const Sampler>& sampler =
+      context->GetSamplerLibrary()->GetSampler({});
   ASSERT_TRUE(sampler);
 
+  auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
   SinglePassCallback callback = [&](RenderPass& pass) {
-    Command cmd;
-    cmd.label = "Box";
-    cmd.pipeline = box_pipeline;
-
-    cmd.BindVertices(vertex_buffer);
+    for (size_t i = 0; i < 1; i++) {
+      for (size_t j = 0; j < 1; j++) {
+        pass.SetCommandLabel("Box");
+        pass.SetPipeline(box_pipeline);
+        pass.SetVertexBuffer(vertex_buffer);
 
-    FS::FrameInfo frame_info;
-    frame_info.current_time = GetSecondsElapsed();
-    frame_info.cursor_position = GetCursorPosition();
-    frame_info.window_size.x = GetWindowSize().width;
-    frame_info.window_size.y = GetWindowSize().height;
+        FS::FrameInfo frame_info;
+        frame_info.current_time = GetSecondsElapsed();
+        frame_info.cursor_position = GetCursorPosition();
+        frame_info.window_size.x = GetWindowSize().width;
+        frame_info.window_size.y = GetWindowSize().height;
 
-    FS::BindFrameInfo(cmd,
-                      pass.GetTransientsBuffer().EmplaceUniform(frame_info));
-    FS::BindContents1(cmd, boston, sampler);
-    FS::BindContents2(cmd, bridge, sampler);
+        FS::BindFrameInfo(pass, host_buffer->EmplaceUniform(frame_info));
+        FS::BindContents1(pass, boston, sampler);
+        FS::BindContents2(pass, bridge, sampler);
 
-    for (size_t i = 0; i < 1; i++) {
-      for (size_t j = 0; j < 1; j++) {
         VS::UniformBuffer uniforms;
-        uniforms.mvp = Matrix::MakeOrthographic(pass.GetRenderTargetSize()) *
+        EXPECT_EQ(pass.GetOrthographicTransform(),
+                  Matrix::MakeOrthographic(pass.GetRenderTargetSize()));
+        uniforms.mvp = pass.GetOrthographicTransform() *
                        Matrix::MakeScale(GetContentScale()) *
                        Matrix::MakeTranslation({i * 50.0f, j * 50.0f, 0.0f});
-        VS::BindUniformBuffer(
-            cmd, pass.GetTransientsBuffer().EmplaceUniform(uniforms));
-        if (!pass.AddCommand(cmd)) {
+        VS::BindUniformBuffer(pass, host_buffer->EmplaceUniform(uniforms));
+        if (!pass.Draw().ok()) {
           return false;
         }
       }
     }
 
+    host_buffer->Reset();
     return true;
   };
   OpenPlaygroundHere(callback);
@@ -277,10 +289,15 @@ TEST_P(RendererTest, CanRenderToTexture) {
   using BoxPipelineBuilder = PipelineBuilder<VS, FS>;
   auto pipeline_desc =
       BoxPipelineBuilder::MakeDefaultPipelineDescriptor(*context);
+  pipeline_desc->SetSampleCount(SampleCount::kCount1);
+  pipeline_desc->ClearDepthAttachment();
+  pipeline_desc->SetStencilPixelFormat(PixelFormat::kS8UInt);
+
   ASSERT_TRUE(pipeline_desc.has_value());
   auto box_pipeline =
       context->GetPipelineLibrary()->GetPipeline(pipeline_desc).Get();
   ASSERT_TRUE(box_pipeline);
+  auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
 
   VertexBufferBuilder<VS::PerVertexData> vertex_builder;
   vertex_builder.SetLabel("Box");
@@ -299,11 +316,13 @@ TEST_P(RendererTest, CanRenderToTexture) {
   auto bridge = CreateTextureForFixture("bay_bridge.jpg");
   auto boston = CreateTextureForFixture("boston.jpg");
   ASSERT_TRUE(bridge && boston);
-  auto sampler = context->GetSamplerLibrary()->GetSampler({});
+  const std::unique_ptr<const Sampler>& sampler =
+      context->GetSamplerLibrary()->GetSampler({});
   ASSERT_TRUE(sampler);
 
   std::shared_ptr<RenderPass> r2t_pass;
-
+  auto cmd_buffer = context->CreateCommandBuffer();
+  ASSERT_TRUE(cmd_buffer);
   {
     ColorAttachment color0;
     color0.load_action = LoadAction::kClear;
@@ -316,8 +335,7 @@ TEST_P(RendererTest, CanRenderToTexture) {
     texture_descriptor.storage_mode = StorageMode::kHostVisible;
     texture_descriptor.size = {400, 400};
     texture_descriptor.mip_count = 1u;
-    texture_descriptor.usage =
-        static_cast<TextureUsageMask>(TextureUsage::kRenderTarget);
+    texture_descriptor.usage = TextureUsage::kRenderTarget;
 
     color0.texture =
         context->GetResourceAllocator()->CreateTexture(texture_descriptor);
@@ -333,24 +351,20 @@ TEST_P(RendererTest, CanRenderToTexture) {
     stencil_texture_desc.storage_mode = StorageMode::kDeviceTransient;
     stencil_texture_desc.size = texture_descriptor.size;
     stencil_texture_desc.format = PixelFormat::kS8UInt;
-    stencil_texture_desc.usage =
-        static_cast<TextureUsageMask>(TextureUsage::kRenderTarget);
+    stencil_texture_desc.usage = TextureUsage::kRenderTarget;
     stencil0.texture =
         context->GetResourceAllocator()->CreateTexture(stencil_texture_desc);
 
     RenderTarget r2t_desc;
     r2t_desc.SetColorAttachment(color0, 0u);
     r2t_desc.SetStencilAttachment(stencil0);
-    auto cmd_buffer = context->CreateCommandBuffer();
     r2t_pass = cmd_buffer->CreateRenderPass(r2t_desc);
     ASSERT_TRUE(r2t_pass && r2t_pass->IsValid());
   }
 
-  Command cmd;
-  cmd.label = "Box";
-  cmd.pipeline = box_pipeline;
-
-  cmd.BindVertices(vertex_buffer);
+  r2t_pass->SetCommandLabel("Box");
+  r2t_pass->SetPipeline(box_pipeline);
+  r2t_pass->SetVertexBuffer(vertex_buffer);
 
   FS::FrameInfo frame_info;
   frame_info.current_time = GetSecondsElapsed();
@@ -358,24 +372,21 @@ TEST_P(RendererTest, CanRenderToTexture) {
   frame_info.window_size.x = GetWindowSize().width;
   frame_info.window_size.y = GetWindowSize().height;
 
-  FS::BindFrameInfo(cmd,
-                    r2t_pass->GetTransientsBuffer().EmplaceUniform(frame_info));
-  FS::BindContents1(cmd, boston, sampler);
-  FS::BindContents2(cmd, bridge, sampler);
+  FS::BindFrameInfo(*r2t_pass, host_buffer->EmplaceUniform(frame_info));
+  FS::BindContents1(*r2t_pass, boston, sampler);
+  FS::BindContents2(*r2t_pass, bridge, sampler);
 
   VS::UniformBuffer uniforms;
   uniforms.mvp = Matrix::MakeOrthographic(ISize{1024, 768}) *
                  Matrix::MakeTranslation({50.0f, 50.0f, 0.0f});
-  VS::BindUniformBuffer(
-      cmd, r2t_pass->GetTransientsBuffer().EmplaceUniform(uniforms));
-  ASSERT_TRUE(r2t_pass->AddCommand(std::move(cmd)));
+  VS::BindUniformBuffer(*r2t_pass, host_buffer->EmplaceUniform(uniforms));
+  ASSERT_TRUE(r2t_pass->Draw().ok());
   ASSERT_TRUE(r2t_pass->EncodeCommands());
 }
 
-#if IMPELLER_ENABLE_METAL
 TEST_P(RendererTest, CanRenderInstanced) {
-  if (GetParam() != PlaygroundBackend::kMetal) {
-    GTEST_SKIP_("Instancing is only supported on Metal.");
+  if (GetParam() == PlaygroundBackend::kOpenGLES) {
+    GTEST_SKIP_("Instancing is not supported on OpenGL.");
   }
   using VS = InstancedDrawVertexShader;
   using FS = InstancedDrawFragmentShader;
@@ -384,19 +395,18 @@ TEST_P(RendererTest, CanRenderInstanced) {
 
   ASSERT_EQ(Tessellator::Result::kSuccess,
             Tessellator{}.Tessellate(
-                FillType::kPositive,
                 PathBuilder{}
                     .AddRect(Rect::MakeXYWH(10, 10, 100, 100))
-                    .TakePath()
-                    .CreatePolyline(),
-                [&builder](const float* vertices, size_t vertices_size,
-                           const uint16_t* indices, size_t indices_size) {
-                  for (auto i = 0u; i < vertices_size; i += 2) {
+                    .TakePath(FillType::kOdd),
+                1.0f,
+                [&builder](const float* vertices, size_t vertices_count,
+                           const uint16_t* indices, size_t indices_count) {
+                  for (auto i = 0u; i < vertices_count * 2; i += 2) {
                     VS::PerVertexData data;
                     data.vtx = {vertices[i], vertices[i + 1]};
                     builder.AppendVertex(data);
                   }
-                  for (auto i = 0u; i < indices_size; i++) {
+                  for (auto i = 0u; i < indices_count; i++) {
                     builder.AppendIndex(indices[i]);
                   }
                   return true;
@@ -408,38 +418,44 @@ TEST_P(RendererTest, CanRenderInstanced) {
           ->GetPipelineLibrary()
           ->GetPipeline(PipelineBuilder<VS, FS>::MakeDefaultPipelineDescriptor(
                             *GetContext())
-                            ->SetSampleCount(SampleCount::kCount4))
+                            ->SetSampleCount(SampleCount::kCount4)
+                            .SetStencilAttachmentDescriptors(std::nullopt))
+
           .Get();
   ASSERT_TRUE(pipeline && pipeline->IsValid());
 
-  Command cmd;
-  cmd.pipeline = pipeline;
-  cmd.label = "InstancedDraw";
-
   static constexpr size_t kInstancesCount = 5u;
   VS::InstanceInfo<kInstancesCount> instances;
   for (size_t i = 0; i < kInstancesCount; i++) {
     instances.colors[i] = Color::Random();
   }
 
+  auto host_buffer = HostBuffer::Create(GetContext()->GetResourceAllocator());
   ASSERT_TRUE(OpenPlaygroundHere([&](RenderPass& pass) -> bool {
+    pass.SetPipeline(pipeline);
+    pass.SetCommandLabel("InstancedDraw");
+
     VS::FrameInfo frame_info;
-    frame_info.mvp = Matrix::MakeOrthographic(pass.GetRenderTargetSize()) *
-                     Matrix::MakeScale(GetContentScale());
-    VS::BindFrameInfo(cmd,
-                      pass.GetTransientsBuffer().EmplaceUniform(frame_info));
-    VS::BindInstanceInfo(
-        cmd, pass.GetTransientsBuffer().EmplaceStorageBuffer(instances));
-    cmd.BindVertices(builder.CreateVertexBuffer(pass.GetTransientsBuffer()));
-
-    cmd.instance_count = kInstancesCount;
-    pass.AddCommand(cmd);
+    EXPECT_EQ(pass.GetOrthographicTransform(),
+              Matrix::MakeOrthographic(pass.GetRenderTargetSize()));
+    frame_info.mvp =
+        pass.GetOrthographicTransform() * Matrix::MakeScale(GetContentScale());
+    VS::BindFrameInfo(pass, host_buffer->EmplaceUniform(frame_info));
+    VS::BindInstanceInfo(pass, host_buffer->EmplaceStorageBuffer(instances));
+    pass.SetVertexBuffer(builder.CreateVertexBuffer(*host_buffer));
+
+    pass.SetInstanceCount(kInstancesCount);
+    pass.Draw();
+
+    host_buffer->Reset();
     return true;
   }));
 }
-#endif  // IMPELLER_ENABLE_METAL
 
 TEST_P(RendererTest, CanBlitTextureToTexture) {
+  if (GetBackend() == PlaygroundBackend::kOpenGLES) {
+    GTEST_SKIP() << "Mipmap test shader not supported on GLES.";
+  }
   auto context = GetContext();
   ASSERT_TRUE(context);
 
@@ -448,6 +464,7 @@ TEST_P(RendererTest, CanBlitTextureToTexture) {
   auto desc = PipelineBuilder<VS, FS>::MakeDefaultPipelineDescriptor(*context);
   ASSERT_TRUE(desc.has_value());
   desc->SetSampleCount(SampleCount::kCount4);
+  desc->SetStencilAttachmentDescriptors(std::nullopt);
   auto mipmaps_pipeline =
       context->GetPipelineLibrary()->GetPipeline(std::move(desc)).Get();
   ASSERT_TRUE(mipmaps_pipeline);
@@ -457,16 +474,15 @@ TEST_P(RendererTest, CanBlitTextureToTexture) {
   texture_desc.format = PixelFormat::kR8G8B8A8UNormInt;
   texture_desc.size = {800, 600};
   texture_desc.mip_count = 1u;
-  texture_desc.usage =
-      static_cast<TextureUsageMask>(TextureUsage::kRenderTarget) |
-      static_cast<TextureUsageMask>(TextureUsage::kShaderRead);
+  texture_desc.usage = TextureUsage::kRenderTarget | TextureUsage::kShaderRead;
   auto texture = context->GetResourceAllocator()->CreateTexture(texture_desc);
   ASSERT_TRUE(texture);
 
   auto bridge = CreateTextureForFixture("bay_bridge.jpg");
   auto boston = CreateTextureForFixture("boston.jpg");
   ASSERT_TRUE(bridge && boston);
-  auto sampler = context->GetSamplerLibrary()->GetSampler({});
+  const std::unique_ptr<const Sampler>& sampler =
+      context->GetSamplerLibrary()->GetSampler({});
   ASSERT_TRUE(sampler);
 
   // Vertex buffer.
@@ -485,6 +501,7 @@ TEST_P(RendererTest, CanBlitTextureToTexture) {
       vertex_builder.CreateVertexBuffer(*context->GetResourceAllocator());
   ASSERT_TRUE(vertex_buffer);
 
+  auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
   Renderer::RenderCallback callback = [&](RenderTarget& render_target) {
     auto buffer = context->CreateCommandBuffer();
     if (!buffer) {
@@ -506,7 +523,9 @@ TEST_P(RendererTest, CanBlitTextureToTexture) {
       // Blit `bridge` to the top left corner of the texture.
       pass->AddCopy(bridge, texture);
 
-      pass->EncodeCommands(context->GetResourceAllocator());
+      if (!pass->EncodeCommands(context->GetResourceAllocator())) {
+        return false;
+      }
     }
 
     {
@@ -516,40 +535,42 @@ TEST_P(RendererTest, CanBlitTextureToTexture) {
       }
       pass->SetLabel("Playground Render Pass");
       {
-        Command cmd;
-        cmd.label = "Image";
-        cmd.pipeline = mipmaps_pipeline;
-
-        cmd.BindVertices(vertex_buffer);
+        pass->SetCommandLabel("Image");
+        pass->SetPipeline(mipmaps_pipeline);
+        pass->SetVertexBuffer(vertex_buffer);
 
-        VS::VertInfo vert_info;
-        vert_info.mvp = Matrix::MakeOrthographic(pass->GetRenderTargetSize()) *
-                        Matrix::MakeScale(GetContentScale());
-        VS::BindVertInfo(cmd,
-                         pass->GetTransientsBuffer().EmplaceUniform(vert_info));
+        VS::FrameInfo frame_info;
+        EXPECT_EQ(pass->GetOrthographicTransform(),
+                  Matrix::MakeOrthographic(pass->GetRenderTargetSize()));
+        frame_info.mvp = pass->GetOrthographicTransform() *
+                         Matrix::MakeScale(GetContentScale());
+        VS::BindFrameInfo(*pass, host_buffer->EmplaceUniform(frame_info));
 
         FS::FragInfo frag_info;
         frag_info.lod = 0;
-        FS::BindFragInfo(cmd,
-                         pass->GetTransientsBuffer().EmplaceUniform(frag_info));
+        FS::BindFragInfo(*pass, host_buffer->EmplaceUniform(frag_info));
 
-        auto sampler = context->GetSamplerLibrary()->GetSampler({});
-        FS::BindTex(cmd, texture, sampler);
+        auto& sampler = context->GetSamplerLibrary()->GetSampler({});
+        FS::BindTex(*pass, texture, sampler);
 
-        pass->AddCommand(std::move(cmd));
+        pass->Draw();
       }
       pass->EncodeCommands();
     }
 
-    if (!buffer->SubmitCommands()) {
+    if (!context->GetCommandQueue()->Submit({buffer}).ok()) {
       return false;
     }
+    host_buffer->Reset();
     return true;
   };
   OpenPlaygroundHere(callback);
 }
 
 TEST_P(RendererTest, CanBlitTextureToBuffer) {
+  if (GetBackend() == PlaygroundBackend::kOpenGLES) {
+    GTEST_SKIP() << "Mipmap test shader not supported on GLES.";
+  }
   auto context = GetContext();
   ASSERT_TRUE(context);
 
@@ -558,6 +579,7 @@ TEST_P(RendererTest, CanBlitTextureToBuffer) {
   auto desc = PipelineBuilder<VS, FS>::MakeDefaultPipelineDescriptor(*context);
   ASSERT_TRUE(desc.has_value());
   desc->SetSampleCount(SampleCount::kCount4);
+  desc->SetStencilAttachmentDescriptors(std::nullopt);
   auto mipmaps_pipeline =
       context->GetPipelineLibrary()->GetPipeline(std::move(desc)).Get();
   ASSERT_TRUE(mipmaps_pipeline);
@@ -565,7 +587,8 @@ TEST_P(RendererTest, CanBlitTextureToBuffer) {
   auto bridge = CreateTextureForFixture("bay_bridge.jpg");
   auto boston = CreateTextureForFixture("boston.jpg");
   ASSERT_TRUE(bridge && boston);
-  auto sampler = context->GetSamplerLibrary()->GetSampler({});
+  const std::unique_ptr<const Sampler>& sampler =
+      context->GetSamplerLibrary()->GetSampler({});
   ASSERT_TRUE(sampler);
 
   TextureDescriptor texture_desc;
@@ -573,10 +596,8 @@ TEST_P(RendererTest, CanBlitTextureToBuffer) {
   texture_desc.format = PixelFormat::kR8G8B8A8UNormInt;
   texture_desc.size = bridge->GetTextureDescriptor().size;
   texture_desc.mip_count = 1u;
-  texture_desc.usage =
-      static_cast<TextureUsageMask>(TextureUsage::kRenderTarget) |
-      static_cast<TextureUsageMask>(TextureUsage::kShaderWrite) |
-      static_cast<TextureUsageMask>(TextureUsage::kShaderRead);
+  texture_desc.usage = TextureUsage::kRenderTarget |
+                       TextureUsage::kShaderWrite | TextureUsage::kShaderRead;
   DeviceBufferDescriptor device_buffer_desc;
   device_buffer_desc.storage_mode = StorageMode::kHostVisible;
   device_buffer_desc.size =
@@ -600,6 +621,7 @@ TEST_P(RendererTest, CanBlitTextureToBuffer) {
       vertex_builder.CreateVertexBuffer(*context->GetResourceAllocator());
   ASSERT_TRUE(vertex_buffer);
 
+  auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
   Renderer::RenderCallback callback = [&](RenderTarget& render_target) {
     {
       auto buffer = context->CreateCommandBuffer();
@@ -619,10 +641,9 @@ TEST_P(RendererTest, CanBlitTextureToBuffer) {
 
       // Blit `bridge` to the top left corner of the texture.
       pass->AddCopy(bridge, device_buffer);
-
       pass->EncodeCommands(context->GetResourceAllocator());
 
-      if (!buffer->SubmitCommands()) {
+      if (!context->GetCommandQueue()->Submit({buffer}).ok()) {
         return false;
       }
     }
@@ -640,47 +661,50 @@ TEST_P(RendererTest, CanBlitTextureToBuffer) {
       }
       pass->SetLabel("Playground Render Pass");
       {
-        Command cmd;
-        cmd.label = "Image";
-        cmd.pipeline = mipmaps_pipeline;
+        pass->SetCommandLabel("Image");
+        pass->SetPipeline(mipmaps_pipeline);
+        pass->SetVertexBuffer(vertex_buffer);
 
-        cmd.BindVertices(vertex_buffer);
-
-        VS::VertInfo vert_info;
-        vert_info.mvp = Matrix::MakeOrthographic(pass->GetRenderTargetSize()) *
-                        Matrix::MakeScale(GetContentScale());
-        VS::BindVertInfo(cmd,
-                         pass->GetTransientsBuffer().EmplaceUniform(vert_info));
+        VS::FrameInfo frame_info;
+        EXPECT_EQ(pass->GetOrthographicTransform(),
+                  Matrix::MakeOrthographic(pass->GetRenderTargetSize()));
+        frame_info.mvp = pass->GetOrthographicTransform() *
+                         Matrix::MakeScale(GetContentScale());
+        VS::BindFrameInfo(*pass, host_buffer->EmplaceUniform(frame_info));
 
         FS::FragInfo frag_info;
         frag_info.lod = 0;
-        FS::BindFragInfo(cmd,
-                         pass->GetTransientsBuffer().EmplaceUniform(frag_info));
+        FS::BindFragInfo(*pass, host_buffer->EmplaceUniform(frag_info));
 
-        auto sampler = context->GetSamplerLibrary()->GetSampler({});
-        auto buffer_view = device_buffer->AsBufferView();
+        const std::unique_ptr<const Sampler>& sampler =
+            context->GetSamplerLibrary()->GetSampler({});
+        auto buffer_view = DeviceBuffer::AsBufferView(device_buffer);
         auto texture =
             context->GetResourceAllocator()->CreateTexture(texture_desc);
-        if (!texture->SetContents(buffer_view.contents,
+        if (!texture->SetContents(device_buffer->OnGetContents(),
                                   buffer_view.range.length)) {
           VALIDATION_LOG << "Could not upload texture to device memory";
           return false;
         }
-        FS::BindTex(cmd, texture, sampler);
+        FS::BindTex(*pass, texture, sampler);
 
-        pass->AddCommand(std::move(cmd));
+        pass->Draw().ok();
       }
       pass->EncodeCommands();
-      if (!buffer->SubmitCommands()) {
+      if (!context->GetCommandQueue()->Submit({buffer}).ok()) {
         return false;
       }
     }
+    host_buffer->Reset();
     return true;
   };
   OpenPlaygroundHere(callback);
 }
 
 TEST_P(RendererTest, CanGenerateMipmaps) {
+  if (GetBackend() == PlaygroundBackend::kOpenGLES) {
+    GTEST_SKIP() << "Mipmap test shader not supported on GLES.";
+  }
   auto context = GetContext();
   ASSERT_TRUE(context);
 
@@ -689,6 +713,7 @@ TEST_P(RendererTest, CanGenerateMipmaps) {
   auto desc = PipelineBuilder<VS, FS>::MakeDefaultPipelineDescriptor(*context);
   ASSERT_TRUE(desc.has_value());
   desc->SetSampleCount(SampleCount::kCount4);
+  desc->SetStencilAttachmentDescriptors(std::nullopt);
   auto mipmaps_pipeline =
       context->GetPipelineLibrary()->GetPipeline(std::move(desc)).Get();
   ASSERT_TRUE(mipmaps_pipeline);
@@ -713,16 +738,16 @@ TEST_P(RendererTest, CanGenerateMipmaps) {
   ASSERT_TRUE(vertex_buffer);
 
   bool first_frame = true;
+  auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
   Renderer::RenderCallback callback = [&](RenderTarget& render_target) {
-    const char* mip_filter_names[] = {"None", "Nearest", "Linear"};
-    const MipFilter mip_filters[] = {MipFilter::kNone, MipFilter::kNearest,
-                                     MipFilter::kLinear};
+    const char* mip_filter_names[] = {"Nearest", "Linear"};
+    const MipFilter mip_filters[] = {MipFilter::kNearest, MipFilter::kLinear};
     const char* min_filter_names[] = {"Nearest", "Linear"};
     const MinMagFilter min_filters[] = {MinMagFilter::kNearest,
                                         MinMagFilter::kLinear};
 
     // UI state.
-    static int selected_mip_filter = 2;
+    static int selected_mip_filter = 1;
     static int selected_min_filter = 0;
     static float lod = 4.5;
 
@@ -761,37 +786,37 @@ TEST_P(RendererTest, CanGenerateMipmaps) {
       }
       pass->SetLabel("Playground Render Pass");
       {
-        Command cmd;
-        cmd.label = "Image LOD";
-        cmd.pipeline = mipmaps_pipeline;
+        pass->SetCommandLabel("Image LOD");
+        pass->SetPipeline(mipmaps_pipeline);
+        pass->SetVertexBuffer(vertex_buffer);
 
-        cmd.BindVertices(vertex_buffer);
-
-        VS::VertInfo vert_info;
-        vert_info.mvp = Matrix::MakeOrthographic(pass->GetRenderTargetSize()) *
-                        Matrix::MakeScale(GetContentScale());
-        VS::BindVertInfo(cmd,
-                         pass->GetTransientsBuffer().EmplaceUniform(vert_info));
+        VS::FrameInfo frame_info;
+        EXPECT_EQ(pass->GetOrthographicTransform(),
+                  Matrix::MakeOrthographic(pass->GetRenderTargetSize()));
+        frame_info.mvp = pass->GetOrthographicTransform() *
+                         Matrix::MakeScale(GetContentScale());
+        VS::BindFrameInfo(*pass, host_buffer->EmplaceUniform(frame_info));
 
         FS::FragInfo frag_info;
         frag_info.lod = lod;
-        FS::BindFragInfo(cmd,
-                         pass->GetTransientsBuffer().EmplaceUniform(frag_info));
+        FS::BindFragInfo(*pass, host_buffer->EmplaceUniform(frag_info));
 
         SamplerDescriptor sampler_desc;
         sampler_desc.mip_filter = mip_filters[selected_mip_filter];
         sampler_desc.min_filter = min_filters[selected_min_filter];
-        auto sampler = context->GetSamplerLibrary()->GetSampler(sampler_desc);
-        FS::BindTex(cmd, boston, sampler);
+        const std::unique_ptr<const Sampler>& sampler =
+            context->GetSamplerLibrary()->GetSampler(sampler_desc);
+        FS::BindTex(*pass, boston, sampler);
 
-        pass->AddCommand(std::move(cmd));
+        pass->Draw();
       }
       pass->EncodeCommands();
     }
 
-    if (!buffer->SubmitCommands()) {
+    if (!context->GetCommandQueue()->Submit({buffer}).ok()) {
       return false;
     }
+    host_buffer->Reset();
     return true;
   };
   OpenPlaygroundHere(callback);
@@ -806,6 +831,7 @@ TEST_P(RendererTest, TheImpeller) {
       PipelineBuilder<VS, FS>::MakeDefaultPipelineDescriptor(*context);
   ASSERT_TRUE(pipeline_descriptor.has_value());
   pipeline_descriptor->SetSampleCount(SampleCount::kCount4);
+  pipeline_descriptor->SetStencilAttachmentDescriptors(std::nullopt);
   auto pipeline =
       context->GetPipelineLibrary()->GetPipeline(pipeline_descriptor).Get();
   ASSERT_TRUE(pipeline && pipeline->IsValid());
@@ -814,21 +840,22 @@ TEST_P(RendererTest, TheImpeller) {
   SamplerDescriptor noise_sampler_desc;
   noise_sampler_desc.width_address_mode = SamplerAddressMode::kRepeat;
   noise_sampler_desc.height_address_mode = SamplerAddressMode::kRepeat;
-  auto noise_sampler =
+  const std::unique_ptr<const Sampler>& noise_sampler =
       context->GetSamplerLibrary()->GetSampler(noise_sampler_desc);
 
   auto cube_map = CreateTextureCubeForFixture(
       {"table_mountain_px.png", "table_mountain_nx.png",
        "table_mountain_py.png", "table_mountain_ny.png",
        "table_mountain_pz.png", "table_mountain_nz.png"});
-  auto cube_map_sampler = context->GetSamplerLibrary()->GetSampler({});
+  const std::unique_ptr<const Sampler>& cube_map_sampler =
+      context->GetSamplerLibrary()->GetSampler({});
+  auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
 
   SinglePassCallback callback = [&](RenderPass& pass) {
     auto size = pass.GetRenderTargetSize();
 
-    Command cmd;
-    cmd.pipeline = pipeline;
-    cmd.label = "Impeller SDF scene";
+    pass.SetPipeline(pipeline);
+    pass.SetCommandLabel("Impeller SDF scene");
     VertexBufferBuilder<VS::PerVertexData> builder;
     builder.AddVertices({{Point()},
                          {Point(0, size.height)},
@@ -836,22 +863,22 @@ TEST_P(RendererTest, TheImpeller) {
                          {Point(size.width, 0)},
                          {Point(0, size.height)},
                          {Point(size.width, size.height)}});
-    cmd.BindVertices(builder.CreateVertexBuffer(pass.GetTransientsBuffer()));
+    pass.SetVertexBuffer(builder.CreateVertexBuffer(*host_buffer));
 
-    VS::FrameInfo vs_uniform;
-    vs_uniform.mvp = Matrix::MakeOrthographic(size);
-    VS::BindFrameInfo(cmd,
-                      pass.GetTransientsBuffer().EmplaceUniform(vs_uniform));
+    VS::FrameInfo frame_info;
+    EXPECT_EQ(pass.GetOrthographicTransform(), Matrix::MakeOrthographic(size));
+    frame_info.mvp = pass.GetOrthographicTransform();
+    VS::BindFrameInfo(pass, host_buffer->EmplaceUniform(frame_info));
 
     FS::FragInfo fs_uniform;
     fs_uniform.texture_size = Point(size);
     fs_uniform.time = GetSecondsElapsed();
-    FS::BindFragInfo(cmd,
-                     pass.GetTransientsBuffer().EmplaceUniform(fs_uniform));
-    FS::BindBlueNoise(cmd, blue_noise, noise_sampler);
-    FS::BindCubeMap(cmd, cube_map, cube_map_sampler);
+    FS::BindFragInfo(pass, host_buffer->EmplaceUniform(fs_uniform));
+    FS::BindBlueNoise(pass, blue_noise, noise_sampler);
+    FS::BindCubeMap(pass, cube_map, cube_map_sampler);
 
-    pass.AddCommand(cmd);
+    pass.Draw().ok();
+    host_buffer->Reset();
     return true;
   };
   OpenPlaygroundHere(callback);
@@ -866,16 +893,17 @@ TEST_P(RendererTest, ArrayUniforms) {
       PipelineBuilder<VS, FS>::MakeDefaultPipelineDescriptor(*context);
   ASSERT_TRUE(pipeline_descriptor.has_value());
   pipeline_descriptor->SetSampleCount(SampleCount::kCount4);
+  pipeline_descriptor->SetStencilAttachmentDescriptors(std::nullopt);
   auto pipeline =
       context->GetPipelineLibrary()->GetPipeline(pipeline_descriptor).Get();
   ASSERT_TRUE(pipeline && pipeline->IsValid());
 
+  auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
   SinglePassCallback callback = [&](RenderPass& pass) {
     auto size = pass.GetRenderTargetSize();
 
-    Command cmd;
-    cmd.pipeline = pipeline;
-    cmd.label = "Google Dots";
+    pass.SetPipeline(pipeline);
+    pass.SetCommandLabel("Google Dots");
     VertexBufferBuilder<VS::PerVertexData> builder;
     builder.AddVertices({{Point()},
                          {Point(0, size.height)},
@@ -883,13 +911,13 @@ TEST_P(RendererTest, ArrayUniforms) {
                          {Point(size.width, 0)},
                          {Point(0, size.height)},
                          {Point(size.width, size.height)}});
-    cmd.BindVertices(builder.CreateVertexBuffer(pass.GetTransientsBuffer()));
+    pass.SetVertexBuffer(builder.CreateVertexBuffer(*host_buffer));
 
-    VS::VertInfo vs_uniform;
-    vs_uniform.mvp =
-        Matrix::MakeOrthographic(size) * Matrix::MakeScale(GetContentScale());
-    VS::BindVertInfo(cmd,
-                     pass.GetTransientsBuffer().EmplaceUniform(vs_uniform));
+    VS::FrameInfo frame_info;
+    EXPECT_EQ(pass.GetOrthographicTransform(), Matrix::MakeOrthographic(size));
+    frame_info.mvp =
+        pass.GetOrthographicTransform() * Matrix::MakeScale(GetContentScale());
+    VS::BindFrameInfo(pass, host_buffer->EmplaceUniform(frame_info));
 
     auto time = GetSecondsElapsed();
     auto y_pos = [&time](float x) {
@@ -904,10 +932,10 @@ TEST_P(RendererTest, ArrayUniforms) {
                    Color::MakeRGBA8(244, 180, 0, 255),
                    Color::MakeRGBA8(15, 157, 88, 255)},
     };
-    FS::BindFragInfo(cmd,
-                     pass.GetTransientsBuffer().EmplaceUniform(fs_uniform));
+    FS::BindFragInfo(pass, host_buffer->EmplaceUniform(fs_uniform));
 
-    pass.AddCommand(cmd);
+    pass.Draw();
+    host_buffer->Reset();
     return true;
   };
   OpenPlaygroundHere(callback);
@@ -922,16 +950,18 @@ TEST_P(RendererTest, InactiveUniforms) {
       PipelineBuilder<VS, FS>::MakeDefaultPipelineDescriptor(*context);
   ASSERT_TRUE(pipeline_descriptor.has_value());
   pipeline_descriptor->SetSampleCount(SampleCount::kCount4);
+  pipeline_descriptor->SetStencilAttachmentDescriptors(std::nullopt);
   auto pipeline =
       context->GetPipelineLibrary()->GetPipeline(pipeline_descriptor).Get();
   ASSERT_TRUE(pipeline && pipeline->IsValid());
 
+  auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
   SinglePassCallback callback = [&](RenderPass& pass) {
     auto size = pass.GetRenderTargetSize();
 
-    Command cmd;
-    cmd.pipeline = pipeline;
-    cmd.label = "Inactive Uniform";
+    pass.SetPipeline(pipeline);
+    pass.SetCommandLabel("Inactive Uniform");
+
     VertexBufferBuilder<VS::PerVertexData> builder;
     builder.AddVertices({{Point()},
                          {Point(0, size.height)},
@@ -939,28 +969,28 @@ TEST_P(RendererTest, InactiveUniforms) {
                          {Point(size.width, 0)},
                          {Point(0, size.height)},
                          {Point(size.width, size.height)}});
-    cmd.BindVertices(builder.CreateVertexBuffer(pass.GetTransientsBuffer()));
+    pass.SetVertexBuffer(builder.CreateVertexBuffer(*host_buffer));
 
-    VS::VertInfo vs_uniform;
-    vs_uniform.mvp =
-        Matrix::MakeOrthographic(size) * Matrix::MakeScale(GetContentScale());
-    VS::BindVertInfo(cmd,
-                     pass.GetTransientsBuffer().EmplaceUniform(vs_uniform));
+    VS::FrameInfo frame_info;
+    EXPECT_EQ(pass.GetOrthographicTransform(), Matrix::MakeOrthographic(size));
+    frame_info.mvp =
+        pass.GetOrthographicTransform() * Matrix::MakeScale(GetContentScale());
+    VS::BindFrameInfo(pass, host_buffer->EmplaceUniform(frame_info));
 
     FS::FragInfo fs_uniform = {.unused_color = Color::Red(),
                                .color = Color::Green()};
-    FS::BindFragInfo(cmd,
-                     pass.GetTransientsBuffer().EmplaceUniform(fs_uniform));
+    FS::BindFragInfo(pass, host_buffer->EmplaceUniform(fs_uniform));
 
-    pass.AddCommand(cmd);
+    pass.Draw().ok();
+    host_buffer->Reset();
     return true;
   };
   OpenPlaygroundHere(callback);
 }
 
 TEST_P(RendererTest, CanCreateCPUBackedTexture) {
-  if (GetParam() != PlaygroundBackend::kMetal) {
-    GTEST_SKIP_("CPU backed textures only supported on Metal right now.");
+  if (GetParam() == PlaygroundBackend::kOpenGLES) {
+    GTEST_SKIP_("CPU backed textures are not supported on OpenGLES.");
   }
 
   auto context = GetContext();
@@ -1001,9 +1031,18 @@ TEST_P(RendererTest, DefaultIndexSize) {
   // Default to 16bit index buffer size, as this is a reasonable default and
   // supported on all backends without extensions.
   VertexBufferBuilder<VS::PerVertexData> vertex_builder;
+  vertex_builder.AppendIndex(0u);
   ASSERT_EQ(vertex_builder.GetIndexType(), IndexType::k16bit);
 }
 
+TEST_P(RendererTest, DefaultIndexBehavior) {
+  using VS = BoxFadeVertexShader;
+
+  // Do not create any index buffer if no indices were provided.
+  VertexBufferBuilder<VS::PerVertexData> vertex_builder;
+  ASSERT_EQ(vertex_builder.GetIndexType(), IndexType::kNone);
+}
+
 TEST_P(RendererTest, VertexBufferBuilder) {
   // Does not create index buffer if one is provided.
   using VS = BoxFadeVertexShader;
@@ -1026,5 +1065,469 @@ TEST_P(RendererTest, VertexBufferBuilder) {
   ASSERT_EQ(vertex_builder.GetVertexCount(), 4u);
 }
 
+class CompareFunctionUIData {
+ public:
+  CompareFunctionUIData() {
+    labels_.push_back("Never");
+    functions_.push_back(CompareFunction::kNever);
+    labels_.push_back("Always");
+    functions_.push_back(CompareFunction::kAlways);
+    labels_.push_back("Less");
+    functions_.push_back(CompareFunction::kLess);
+    labels_.push_back("Equal");
+    functions_.push_back(CompareFunction::kEqual);
+    labels_.push_back("LessEqual");
+    functions_.push_back(CompareFunction::kLessEqual);
+    labels_.push_back("Greater");
+    functions_.push_back(CompareFunction::kGreater);
+    labels_.push_back("NotEqual");
+    functions_.push_back(CompareFunction::kNotEqual);
+    labels_.push_back("GreaterEqual");
+    functions_.push_back(CompareFunction::kGreaterEqual);
+    assert(labels_.size() == functions_.size());
+  }
+
+  const char* const* labels() const { return &labels_[0]; }
+
+  int size() const { return labels_.size(); }
+
+  int IndexOf(CompareFunction func) const {
+    for (size_t i = 0; i < functions_.size(); i++) {
+      if (functions_[i] == func) {
+        return i;
+      }
+    }
+    FML_UNREACHABLE();
+    return -1;
+  }
+
+  CompareFunction FunctionOf(int index) const { return functions_[index]; }
+
+ private:
+  std::vector<const char*> labels_;
+  std::vector<CompareFunction> functions_;
+};
+
+static const CompareFunctionUIData& CompareFunctionUI() {
+  static CompareFunctionUIData data;
+  return data;
+}
+
+TEST_P(RendererTest, StencilMask) {
+  using VS = BoxFadeVertexShader;
+  using FS = BoxFadeFragmentShader;
+  auto context = GetContext();
+  ASSERT_TRUE(context);
+  using BoxFadePipelineBuilder = PipelineBuilder<VS, FS>;
+  auto desc = BoxFadePipelineBuilder::MakeDefaultPipelineDescriptor(*context);
+  ASSERT_TRUE(desc.has_value());
+
+  // Vertex buffer.
+  VertexBufferBuilder<VS::PerVertexData> vertex_builder;
+  vertex_builder.SetLabel("Box");
+  vertex_builder.AddVertices({
+      {{100, 100, 0.0}, {0.0, 0.0}},  // 1
+      {{800, 100, 0.0}, {1.0, 0.0}},  // 2
+      {{800, 800, 0.0}, {1.0, 1.0}},  // 3
+      {{100, 100, 0.0}, {0.0, 0.0}},  // 1
+      {{800, 800, 0.0}, {1.0, 1.0}},  // 3
+      {{100, 800, 0.0}, {0.0, 1.0}},  // 4
+  });
+  auto vertex_buffer =
+      vertex_builder.CreateVertexBuffer(*context->GetResourceAllocator());
+  ASSERT_TRUE(vertex_buffer);
+
+  desc->SetSampleCount(SampleCount::kCount4);
+  desc->SetStencilAttachmentDescriptors(std::nullopt);
+
+  auto bridge = CreateTextureForFixture("bay_bridge.jpg");
+  auto boston = CreateTextureForFixture("boston.jpg");
+  ASSERT_TRUE(bridge && boston);
+  const std::unique_ptr<const Sampler>& sampler =
+      context->GetSamplerLibrary()->GetSampler({});
+  ASSERT_TRUE(sampler);
+
+  static bool mirror = false;
+  static int stencil_reference_write = 0xFF;
+  static int stencil_reference_read = 0x1;
+  std::vector<uint8_t> stencil_contents;
+  static int last_stencil_contents_reference_value = 0;
+  static int current_front_compare =
+      CompareFunctionUI().IndexOf(CompareFunction::kLessEqual);
+  static int current_back_compare =
+      CompareFunctionUI().IndexOf(CompareFunction::kLessEqual);
+
+  auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
+  Renderer::RenderCallback callback = [&](RenderTarget& render_target) {
+    auto buffer = context->CreateCommandBuffer();
+    if (!buffer) {
+      return false;
+    }
+    buffer->SetLabel("Playground Command Buffer");
+
+    {
+      // Configure the stencil attachment for the test.
+      RenderTarget::AttachmentConfig stencil_config;
+      stencil_config.load_action = LoadAction::kLoad;
+      stencil_config.store_action = StoreAction::kDontCare;
+      stencil_config.storage_mode = StorageMode::kHostVisible;
+      render_target.SetupDepthStencilAttachments(
+          *context, *context->GetResourceAllocator(),
+          render_target.GetRenderTargetSize(), true, "stencil", stencil_config);
+      // Fill the stencil buffer with an checkerboard pattern.
+      const auto target_width = render_target.GetRenderTargetSize().width;
+      const auto target_height = render_target.GetRenderTargetSize().height;
+      const size_t target_size = target_width * target_height;
+      if (stencil_contents.size() != target_size ||
+          last_stencil_contents_reference_value != stencil_reference_write) {
+        stencil_contents.resize(target_size);
+        last_stencil_contents_reference_value = stencil_reference_write;
+        for (int y = 0; y < target_height; y++) {
+          for (int x = 0; x < target_width; x++) {
+            const auto index = y * target_width + x;
+            const auto kCheckSize = 64;
+            const auto value =
+                (((y / kCheckSize) + (x / kCheckSize)) % 2 == 0) *
+                stencil_reference_write;
+            stencil_contents[index] = value;
+          }
+        }
+      }
+      if (!render_target.GetStencilAttachment()->texture->SetContents(
+              stencil_contents.data(), stencil_contents.size(), 0, false)) {
+        VALIDATION_LOG << "Could not upload stencil contents to device memory";
+        return false;
+      }
+      auto pass = buffer->CreateRenderPass(render_target);
+      if (!pass) {
+        return false;
+      }
+      pass->SetLabel("Stencil Buffer");
+      ImGui::Begin("Controls", nullptr, ImGuiWindowFlags_AlwaysAutoResize);
+      ImGui::SliderInt("Stencil Write Value", &stencil_reference_write, 0,
+                       0xFF);
+      ImGui::SliderInt("Stencil Compare Value", &stencil_reference_read, 0,
+                       0xFF);
+      ImGui::Checkbox("Back face mode", &mirror);
+      ImGui::ListBox("Front face compare function", &current_front_compare,
+                     CompareFunctionUI().labels(), CompareFunctionUI().size());
+      ImGui::ListBox("Back face compare function", &current_back_compare,
+                     CompareFunctionUI().labels(), CompareFunctionUI().size());
+      ImGui::End();
+
+      StencilAttachmentDescriptor front;
+      front.stencil_compare =
+          CompareFunctionUI().FunctionOf(current_front_compare);
+      StencilAttachmentDescriptor back;
+      back.stencil_compare =
+          CompareFunctionUI().FunctionOf(current_back_compare);
+      desc->SetStencilAttachmentDescriptors(front, back);
+      auto pipeline = context->GetPipelineLibrary()->GetPipeline(desc).Get();
+
+      assert(pipeline && pipeline->IsValid());
+
+      pass->SetCommandLabel("Box");
+      pass->SetPipeline(pipeline);
+      pass->SetStencilReference(stencil_reference_read);
+      pass->SetVertexBuffer(vertex_buffer);
+
+      VS::UniformBuffer uniforms;
+      EXPECT_EQ(pass->GetOrthographicTransform(),
+                Matrix::MakeOrthographic(pass->GetRenderTargetSize()));
+      uniforms.mvp = pass->GetOrthographicTransform() *
+                     Matrix::MakeScale(GetContentScale());
+      if (mirror) {
+        uniforms.mvp = Matrix::MakeScale(Vector2(-1, 1)) * uniforms.mvp;
+      }
+      VS::BindUniformBuffer(*pass, host_buffer->EmplaceUniform(uniforms));
+
+      FS::FrameInfo frame_info;
+      frame_info.current_time = GetSecondsElapsed();
+      frame_info.cursor_position = GetCursorPosition();
+      frame_info.window_size.x = GetWindowSize().width;
+      frame_info.window_size.y = GetWindowSize().height;
+
+      FS::BindFrameInfo(*pass, host_buffer->EmplaceUniform(frame_info));
+      FS::BindContents1(*pass, boston, sampler);
+      FS::BindContents2(*pass, bridge, sampler);
+      if (!pass->Draw().ok()) {
+        return false;
+      }
+      pass->EncodeCommands();
+    }
+
+    if (!context->GetCommandQueue()->Submit({buffer}).ok()) {
+      return false;
+    }
+    host_buffer->Reset();
+    return true;
+  };
+  OpenPlaygroundHere(callback);
+}
+
+TEST_P(RendererTest, CanLookupRenderTargetProperties) {
+  auto context = GetContext();
+  auto cmd_buffer = context->CreateCommandBuffer();
+  auto render_target_cache = std::make_shared<RenderTargetAllocator>(
+      GetContext()->GetResourceAllocator());
+
+  auto render_target = render_target_cache->CreateOffscreen(
+      *context, {100, 100}, /*mip_count=*/1);
+  auto render_pass = cmd_buffer->CreateRenderPass(render_target);
+
+  EXPECT_EQ(render_pass->GetSampleCount(), render_target.GetSampleCount());
+  EXPECT_EQ(render_pass->GetRenderTargetPixelFormat(),
+            render_target.GetRenderTargetPixelFormat());
+  EXPECT_EQ(render_pass->HasStencilAttachment(),
+            render_target.GetStencilAttachment().has_value());
+  EXPECT_EQ(render_pass->GetRenderTargetSize(),
+            render_target.GetRenderTargetSize());
+  render_pass->EncodeCommands();
+}
+
+TEST_P(RendererTest,
+       RenderTargetCreateOffscreenMSAASetsDefaultDepthStencilFormat) {
+  auto context = GetContext();
+  auto render_target_cache = std::make_shared<RenderTargetAllocator>(
+      GetContext()->GetResourceAllocator());
+
+  RenderTarget render_target = render_target_cache->CreateOffscreenMSAA(
+      *context, {100, 100}, /*mip_count=*/1);
+  EXPECT_EQ(render_target.GetDepthAttachment()
+                ->texture->GetTextureDescriptor()
+                .format,
+            GetContext()->GetCapabilities()->GetDefaultDepthStencilFormat());
+}
+
+template <class VertexShader, class FragmentShader>
+std::shared_ptr<Pipeline<PipelineDescriptor>> CreateDefaultPipeline(
+    const std::shared_ptr<Context>& context) {
+  using TexturePipelineBuilder = PipelineBuilder<VertexShader, FragmentShader>;
+  auto pipeline_desc =
+      TexturePipelineBuilder::MakeDefaultPipelineDescriptor(*context);
+  if (!pipeline_desc.has_value()) {
+    return nullptr;
+  }
+  pipeline_desc->SetSampleCount(SampleCount::kCount4);
+  pipeline_desc->SetStencilAttachmentDescriptors(std::nullopt);
+  auto pipeline =
+      context->GetPipelineLibrary()->GetPipeline(pipeline_desc).Get();
+  if (!pipeline || !pipeline->IsValid()) {
+    return nullptr;
+  }
+  return pipeline;
+}
+
+TEST_P(RendererTest, CanSepiaToneWithSubpasses) {
+  // The GLES framebuffer fetch implementation currently does not support this.
+  // TODO(chinmaygarde): revisit after the GLES framebuffer fetch capabilities
+  // are clarified.
+  if (GetParam() == PlaygroundBackend::kOpenGLES) {
+    GTEST_SKIP_("Not supported on GLES.");
+  }
+
+  // Define shader types
+  using TextureVS = TextureVertexShader;
+  using TextureFS = TextureFragmentShader;
+
+  using SepiaVS = SepiaVertexShader;
+  using SepiaFS = SepiaFragmentShader;
+
+  auto context = GetContext();
+  ASSERT_TRUE(context);
+
+  if (!context->GetCapabilities()->SupportsFramebufferFetch()) {
+    GTEST_SKIP_(
+        "This test uses framebuffer fetch and the backend doesn't support it.");
+    return;
+  }
+
+  // Create pipelines.
+  auto texture_pipeline = CreateDefaultPipeline<TextureVS, TextureFS>(context);
+  auto sepia_pipeline = CreateDefaultPipeline<SepiaVS, SepiaFS>(context);
+
+  ASSERT_TRUE(texture_pipeline);
+  ASSERT_TRUE(sepia_pipeline);
+
+  // Vertex buffer builders.
+  VertexBufferBuilder<TextureVS::PerVertexData> texture_vtx_builder;
+  texture_vtx_builder.AddVertices({
+      {{100, 100, 0.0}, {0.0, 0.0}},  // 1
+      {{800, 100, 0.0}, {1.0, 0.0}},  // 2
+      {{800, 800, 0.0}, {1.0, 1.0}},  // 3
+      {{100, 100, 0.0}, {0.0, 0.0}},  // 1
+      {{800, 800, 0.0}, {1.0, 1.0}},  // 3
+      {{100, 800, 0.0}, {0.0, 1.0}},  // 4
+  });
+
+  VertexBufferBuilder<SepiaVS::PerVertexData> sepia_vtx_builder;
+  sepia_vtx_builder.AddVertices({
+      {{100, 100, 0.0}},  // 1
+      {{800, 100, 0.0}},  // 2
+      {{800, 800, 0.0}},  // 3
+      {{100, 100, 0.0}},  // 1
+      {{800, 800, 0.0}},  // 3
+      {{100, 800, 0.0}},  // 4
+  });
+
+  auto boston = CreateTextureForFixture("boston.jpg");
+  ASSERT_TRUE(boston);
+
+  const auto& sampler = context->GetSamplerLibrary()->GetSampler({});
+  ASSERT_TRUE(sampler);
+
+  SinglePassCallback callback = [&](RenderPass& pass) {
+    auto buffer = HostBuffer::Create(context->GetResourceAllocator());
+
+    // Draw the texture.
+    {
+      pass.SetPipeline(texture_pipeline);
+      pass.SetVertexBuffer(texture_vtx_builder.CreateVertexBuffer(
+          *context->GetResourceAllocator()));
+      TextureVS::UniformBuffer uniforms;
+      uniforms.mvp = Matrix::MakeOrthographic(pass.GetRenderTargetSize()) *
+                     Matrix::MakeScale(GetContentScale());
+      TextureVS::BindUniformBuffer(pass, buffer->EmplaceUniform(uniforms));
+      TextureFS::BindTextureContents(pass, boston, sampler);
+      if (!pass.Draw().ok()) {
+        return false;
+      }
+    }
+
+    // Draw the sepia toner.
+    {
+      pass.SetPipeline(sepia_pipeline);
+      pass.SetVertexBuffer(sepia_vtx_builder.CreateVertexBuffer(
+          *context->GetResourceAllocator()));
+      SepiaVS::UniformBuffer uniforms;
+      uniforms.mvp = Matrix::MakeOrthographic(pass.GetRenderTargetSize()) *
+                     Matrix::MakeScale(GetContentScale());
+      SepiaVS::BindUniformBuffer(pass, buffer->EmplaceUniform(uniforms));
+      if (!pass.Draw().ok()) {
+        return false;
+      }
+    }
+
+    return true;
+  };
+  OpenPlaygroundHere(callback);
+}
+
+TEST_P(RendererTest, CanSepiaToneThenSwizzleWithSubpasses) {
+  // The GLES framebuffer fetch implementation currently does not support this.
+  // TODO(chinmaygarde): revisit after the GLES framebuffer fetch capabilities
+  // are clarified.
+  if (GetParam() == PlaygroundBackend::kOpenGLES) {
+    GTEST_SKIP_("Not supported on GLES.");
+  }
+
+  // Define shader types
+  using TextureVS = TextureVertexShader;
+  using TextureFS = TextureFragmentShader;
+
+  using SwizzleVS = SepiaVertexShader;
+  using SwizzleFS = SwizzleFragmentShader;
+
+  using SepiaVS = SepiaVertexShader;
+  using SepiaFS = SepiaFragmentShader;
+
+  auto context = GetContext();
+  ASSERT_TRUE(context);
+
+  if (!context->GetCapabilities()->SupportsFramebufferFetch()) {
+    GTEST_SKIP_(
+        "This test uses framebuffer fetch and the backend doesn't support it.");
+    return;
+  }
+
+  // Create pipelines.
+  auto texture_pipeline = CreateDefaultPipeline<TextureVS, TextureFS>(context);
+  auto swizzle_pipeline = CreateDefaultPipeline<SwizzleVS, SwizzleFS>(context);
+  auto sepia_pipeline = CreateDefaultPipeline<SepiaVS, SepiaFS>(context);
+
+  ASSERT_TRUE(texture_pipeline);
+  ASSERT_TRUE(swizzle_pipeline);
+  ASSERT_TRUE(sepia_pipeline);
+
+  // Vertex buffer builders.
+  VertexBufferBuilder<TextureVS::PerVertexData> texture_vtx_builder;
+  texture_vtx_builder.AddVertices({
+      {{100, 100, 0.0}, {0.0, 0.0}},  // 1
+      {{800, 100, 0.0}, {1.0, 0.0}},  // 2
+      {{800, 800, 0.0}, {1.0, 1.0}},  // 3
+      {{100, 100, 0.0}, {0.0, 0.0}},  // 1
+      {{800, 800, 0.0}, {1.0, 1.0}},  // 3
+      {{100, 800, 0.0}, {0.0, 1.0}},  // 4
+  });
+
+  VertexBufferBuilder<SepiaVS::PerVertexData> sepia_vtx_builder;
+  sepia_vtx_builder.AddVertices({
+      {{100, 100, 0.0}},  // 1
+      {{800, 100, 0.0}},  // 2
+      {{800, 800, 0.0}},  // 3
+      {{100, 100, 0.0}},  // 1
+      {{800, 800, 0.0}},  // 3
+      {{100, 800, 0.0}},  // 4
+  });
+
+  auto boston = CreateTextureForFixture("boston.jpg");
+  ASSERT_TRUE(boston);
+
+  const auto& sampler = context->GetSamplerLibrary()->GetSampler({});
+  ASSERT_TRUE(sampler);
+
+  SinglePassCallback callback = [&](RenderPass& pass) {
+    auto buffer = HostBuffer::Create(context->GetResourceAllocator());
+
+    // Draw the texture.
+    {
+      pass.SetPipeline(texture_pipeline);
+      pass.SetVertexBuffer(texture_vtx_builder.CreateVertexBuffer(
+          *context->GetResourceAllocator()));
+      TextureVS::UniformBuffer uniforms;
+      uniforms.mvp = Matrix::MakeOrthographic(pass.GetRenderTargetSize()) *
+                     Matrix::MakeScale(GetContentScale());
+      TextureVS::BindUniformBuffer(pass, buffer->EmplaceUniform(uniforms));
+      TextureFS::BindTextureContents(pass, boston, sampler);
+      if (!pass.Draw().ok()) {
+        return false;
+      }
+    }
+
+    // Draw the sepia toner.
+    {
+      pass.SetPipeline(sepia_pipeline);
+      pass.SetVertexBuffer(sepia_vtx_builder.CreateVertexBuffer(
+          *context->GetResourceAllocator()));
+      SepiaVS::UniformBuffer uniforms;
+      uniforms.mvp = Matrix::MakeOrthographic(pass.GetRenderTargetSize()) *
+                     Matrix::MakeScale(GetContentScale());
+      SepiaVS::BindUniformBuffer(pass, buffer->EmplaceUniform(uniforms));
+      if (!pass.Draw().ok()) {
+        return false;
+      }
+    }
+
+    // Draw the swizzle.
+    {
+      pass.SetPipeline(swizzle_pipeline);
+      pass.SetVertexBuffer(sepia_vtx_builder.CreateVertexBuffer(
+          *context->GetResourceAllocator()));
+      SwizzleVS::UniformBuffer uniforms;
+      uniforms.mvp = Matrix::MakeOrthographic(pass.GetRenderTargetSize()) *
+                     Matrix::MakeScale(GetContentScale());
+      SwizzleVS::BindUniformBuffer(pass, buffer->EmplaceUniform(uniforms));
+      if (!pass.Draw().ok()) {
+        return false;
+      }
+    }
+
+    return true;
+  };
+  OpenPlaygroundHere(callback);
+}
+
 }  // namespace testing
 }  // namespace impeller
+
+// NOLINTEND(bugprone-unchecked-optional-access)
diff --git a/impeller/renderer/sampler_library.h b/impeller/renderer/sampler_library.h
index e515b6facab36a825d3a7f24d63a8ea2681bc234..0b05545b49a8fbd5907dc995320d75668eb3b59d 100644
--- a/impeller/renderer/sampler_library.h
+++ b/impeller/renderer/sampler_library.h
@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_SAMPLER_LIBRARY_H_
+#define FLUTTER_IMPELLER_RENDERER_SAMPLER_LIBRARY_H_
 
-#include <unordered_map>
-
-#include "flutter/fml/macros.h"
-#include "impeller/renderer/sampler_descriptor.h"
+#include "impeller/core/sampler.h"
+#include "impeller/core/sampler_descriptor.h"
 
 namespace impeller {
 
@@ -15,14 +14,27 @@ class SamplerLibrary {
  public:
   virtual ~SamplerLibrary();
 
-  virtual std::shared_ptr<const Sampler> GetSampler(
+  /// @brief Retrieve a backend specific sampler object for the given sampler
+  ///        descriptor.
+  ///
+  ///        If the descriptor is invalid or there is a loss of rendering
+  ///        context, this method may return a nullptr.
+  ///
+  ///        The sampler library implementations must cache this sampler object
+  ///        and guarantee that the reference will continue to be valid
+  ///        throughout the lifetime of the Impeller context.
+  virtual const std::unique_ptr<const Sampler>& GetSampler(
       SamplerDescriptor descriptor) = 0;
 
  protected:
   SamplerLibrary();
 
  private:
-  FML_DISALLOW_COPY_AND_ASSIGN(SamplerLibrary);
+  SamplerLibrary(const SamplerLibrary&) = delete;
+
+  SamplerLibrary& operator=(const SamplerLibrary&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_SAMPLER_LIBRARY_H_
diff --git a/impeller/renderer/shader_function.cc b/impeller/renderer/shader_function.cc
index b51a4888d006f204f1d5d9a429a64d7da5ca5d23..7aa8053bd5e1005ed6c0ae19edb3e0ab92d5a2a9 100644
--- a/impeller/renderer/shader_function.cc
+++ b/impeller/renderer/shader_function.cc
@@ -19,6 +19,10 @@ ShaderStage ShaderFunction::GetStage() const {
   return stage_;
 }
 
+const std::string& ShaderFunction::GetName() const {
+  return name_;
+}
+
 // |Comparable<ShaderFunction>|
 std::size_t ShaderFunction::GetHash() const {
   return fml::HashCombine(parent_library_id_, name_, stage_);
diff --git a/impeller/renderer/shader_function.h b/impeller/renderer/shader_function.h
index 273b280f068b2dd7de02cd61adc3ff24502aa1fd..d762dd2ea5a6dbbe373addc320d79f14b7b451c9 100644
--- a/impeller/renderer/shader_function.h
+++ b/impeller/renderer/shader_function.h
@@ -2,12 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_SHADER_FUNCTION_H_
+#define FLUTTER_IMPELLER_RENDERER_SHADER_FUNCTION_H_
 
+#include <string>
 #include "flutter/fml/hash_combine.h"
 #include "flutter/fml/macros.h"
 #include "impeller/base/comparable.h"
-#include "impeller/renderer/shader_types.h"
+#include "impeller/core/shader_types.h"
 
 namespace impeller {
 
@@ -18,6 +20,8 @@ class ShaderFunction : public Comparable<ShaderFunction> {
 
   ShaderStage GetStage() const;
 
+  const std::string& GetName() const;
+
   // |Comparable<ShaderFunction>|
   std::size_t GetHash() const override;
 
@@ -34,7 +38,11 @@ class ShaderFunction : public Comparable<ShaderFunction> {
   std::string name_;
   ShaderStage stage_;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(ShaderFunction);
+  ShaderFunction(const ShaderFunction&) = delete;
+
+  ShaderFunction& operator=(const ShaderFunction&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_SHADER_FUNCTION_H_
diff --git a/impeller/renderer/shader_key.h b/impeller/renderer/shader_key.h
index 24e7c0a455a7217a32781744396975b82b9ed9f0..77f03cff730b0c53755b292a379d37765f270fbe 100644
--- a/impeller/renderer/shader_key.h
+++ b/impeller/renderer/shader_key.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_SHADER_KEY_H_
+#define FLUTTER_IMPELLER_RENDERER_SHADER_KEY_H_
 
 #include <memory>
 #include <string>
@@ -10,7 +11,7 @@
 
 #include "flutter/fml/hash_combine.h"
 #include "flutter/fml/macros.h"
-#include "impeller/renderer/shader_types.h"
+#include "impeller/core/shader_types.h"
 
 namespace impeller {
 
@@ -43,3 +44,5 @@ using ShaderFunctionMap =
                        ShaderKey::Equal>;
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_SHADER_KEY_H_
diff --git a/impeller/renderer/shader_library.h b/impeller/renderer/shader_library.h
index 3c1b4f9a730d3db19efaddbcf9319dc990fd6d37..1421ea3e0d023afa065573e1f08d025e9d5accfd 100644
--- a/impeller/renderer/shader_library.h
+++ b/impeller/renderer/shader_library.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_SHADER_LIBRARY_H_
+#define FLUTTER_IMPELLER_RENDERER_SHADER_LIBRARY_H_
 
 #include <future>
 #include <memory>
 #include <string_view>
 
-#include "flutter/fml/macros.h"
 #include "fml/mapping.h"
-#include "impeller/renderer/shader_types.h"
+#include "impeller/core/shader_types.h"
 
 namespace impeller {
 
@@ -39,7 +39,11 @@ class ShaderLibrary : public std::enable_shared_from_this<ShaderLibrary> {
   ShaderLibrary();
 
  private:
-  FML_DISALLOW_COPY_AND_ASSIGN(ShaderLibrary);
+  ShaderLibrary(const ShaderLibrary&) = delete;
+
+  ShaderLibrary& operator=(const ShaderLibrary&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_SHADER_LIBRARY_H_
diff --git a/impeller/renderer/snapshot.cc b/impeller/renderer/snapshot.cc
index f5614e72cd6d7f85606cd95d05cb40333f4ea436..b55a9717083a5694184d8d9e29d6597e894268a4 100644
--- a/impeller/renderer/snapshot.cc
+++ b/impeller/renderer/snapshot.cc
@@ -12,11 +12,11 @@ std::optional<Rect> Snapshot::GetCoverage() const {
   if (!texture) {
     return std::nullopt;
   }
-  return Rect(Size(texture->GetSize())).TransformBounds(transform);
+  return Rect::MakeSize(texture->GetSize()).TransformBounds(transform);
 }
 
 std::optional<Matrix> Snapshot::GetUVTransform() const {
-  if (!texture || texture->GetSize().IsZero()) {
+  if (!texture || texture->GetSize().IsEmpty()) {
     return std::nullopt;
   }
   return Matrix::MakeScale(1 / Vector2(texture->GetSize())) *
diff --git a/impeller/renderer/snapshot.h b/impeller/renderer/snapshot.h
index 26fe49d894d2dc5a1721675d96e3cccf9ecdc755..849b7ce04ca62ef2b88e8e2c1d01edb71e42ac7f 100644
--- a/impeller/renderer/snapshot.h
+++ b/impeller/renderer/snapshot.h
@@ -2,17 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_SNAPSHOT_H_
+#define FLUTTER_IMPELLER_RENDERER_SNAPSHOT_H_
 
 #include <functional>
 #include <memory>
 #include <vector>
 
 #include "flutter/fml/macros.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/sampler_descriptor.h"
+#include "impeller/core/texture.h"
 #include "impeller/geometry/matrix.h"
 #include "impeller/geometry/rect.h"
-#include "impeller/renderer/sampler_descriptor.h"
-#include "impeller/renderer/texture.h"
 
 namespace impeller {
 
@@ -25,7 +27,11 @@ struct Snapshot {
   /// The transform that should be applied to this texture for rendering.
   Matrix transform;
 
-  SamplerDescriptor sampler_descriptor;
+  SamplerDescriptor sampler_descriptor =
+      SamplerDescriptor("Default Snapshot Sampler",
+                        MinMagFilter::kLinear,
+                        MinMagFilter::kLinear,
+                        MipFilter::kNearest);
 
   Scalar opacity = 1.0f;
 
@@ -42,3 +48,5 @@ struct Snapshot {
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_SNAPSHOT_H_
diff --git a/impeller/renderer/stroke.comp b/impeller/renderer/stroke.comp
new file mode 100644
index 0000000000000000000000000000000000000000..5d9cf55fafa4b4b851e123732a6e3cad9fdfc5bb
--- /dev/null
+++ b/impeller/renderer/stroke.comp
@@ -0,0 +1,60 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+#extension GL_KHR_shader_subgroup_arithmetic : enable
+
+layout(local_size_x = 256, local_size_y = 1) in;
+layout(std430) buffer;
+
+layout(binding = 0) buffer Polyline {
+  uint count;
+  vec2 data[];
+}
+polyline;
+
+layout(binding = 1) buffer VertexBuffer {
+  vec2 position[];
+}
+vertex_buffer;
+
+layout(binding = 2) buffer VertexBufferCount {
+  uint count;
+}
+vertex_buffer_count;
+
+uniform Config {
+  float width;
+  uint cap;
+  uint join;
+  float miter_limit;
+}
+config;
+
+vec2 compute_offset(uint index) {
+  vec2 direction = normalize(polyline.data[index + 1] - polyline.data[index]);
+  return vec2(-direction.y, direction.x) * config.width * .5;
+}
+
+void main() {
+  uint ident = gl_GlobalInvocationID.x;
+  if (ident >= polyline.count || ident == 0) {
+    // This is ok because there is no barrier() below.
+    return;
+  }
+
+  atomicAdd(vertex_buffer_count.count, 4);
+
+  uint index = ident - 1;
+  vec2 offset = compute_offset(index);
+  vertex_buffer.position[index * 4 + 0] = polyline.data[ident - 1] + offset;
+  vertex_buffer.position[index * 4 + 1] = polyline.data[ident - 1] - offset;
+  vertex_buffer.position[index * 4 + 2] = polyline.data[ident] + offset;
+  vertex_buffer.position[index * 4 + 3] = polyline.data[ident] - offset;
+
+  // TODO(dnfield): Implement other cap/join mechanisms.
+  if (ident == polyline.count - 1) {
+    vertex_buffer.position[index * 4 + 4] = polyline.data[ident] + offset;
+    vertex_buffer.position[index * 4 + 5] = polyline.data[ident] - offset;
+    atomicAdd(vertex_buffer_count.count, 2);
+  }
+}
diff --git a/impeller/renderer/surface.h b/impeller/renderer/surface.h
index fe9a8747de06d82f1df86abcfacf6217eb16a31e..e0e4abe5faa5f97c4376982f1ac5fdda5d6820a6 100644
--- a/impeller/renderer/surface.h
+++ b/impeller/renderer/surface.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_SURFACE_H_
+#define FLUTTER_IMPELLER_RENDERER_SURFACE_H_
 
 #include <functional>
 #include <memory>
@@ -36,7 +37,11 @@ class Surface {
 
   bool is_valid_ = false;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(Surface);
+  Surface(const Surface&) = delete;
+
+  Surface& operator=(const Surface&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_SURFACE_H_
diff --git a/impeller/renderer/testing/mocks.h b/impeller/renderer/testing/mocks.h
new file mode 100644
index 0000000000000000000000000000000000000000..45b519cc3c93716d03df716b723048b9d5e89e14
--- /dev/null
+++ b/impeller/renderer/testing/mocks.h
@@ -0,0 +1,235 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_TESTING_MOCKS_H_
+#define FLUTTER_IMPELLER_RENDERER_TESTING_MOCKS_H_
+
+#include "gmock/gmock.h"
+#include "impeller/core/allocator.h"
+#include "impeller/core/sampler_descriptor.h"
+#include "impeller/core/texture.h"
+#include "impeller/renderer/command_buffer.h"
+#include "impeller/renderer/command_queue.h"
+#include "impeller/renderer/context.h"
+#include "impeller/renderer/render_pass.h"
+#include "impeller/renderer/render_target.h"
+#include "impeller/renderer/sampler_library.h"
+
+namespace impeller {
+namespace testing {
+
+class MockDeviceBuffer : public DeviceBuffer {
+ public:
+  explicit MockDeviceBuffer(const DeviceBufferDescriptor& desc)
+      : DeviceBuffer(desc) {}
+
+  MOCK_METHOD(bool, SetLabel, (const std::string& label), (override));
+
+  MOCK_METHOD(bool,
+              SetLabel,
+              (const std::string& label, Range range),
+              (override));
+
+  MOCK_METHOD(uint8_t*, OnGetContents, (), (const, override));
+
+  MOCK_METHOD(bool,
+              OnCopyHostBuffer,
+              (const uint8_t* source, Range source_range, size_t offset),
+              (override));
+};
+
+class MockAllocator : public Allocator {
+ public:
+  MOCK_METHOD(ISize, GetMaxTextureSizeSupported, (), (const, override));
+  MOCK_METHOD(std::shared_ptr<DeviceBuffer>,
+              OnCreateBuffer,
+              (const DeviceBufferDescriptor& desc),
+              (override));
+  MOCK_METHOD(std::shared_ptr<Texture>,
+              OnCreateTexture,
+              (const TextureDescriptor& desc),
+              (override));
+};
+
+class MockBlitPass : public BlitPass {
+ public:
+  MOCK_METHOD(bool, IsValid, (), (const, override));
+  MOCK_METHOD(bool,
+              EncodeCommands,
+              (const std::shared_ptr<Allocator>& transients_allocator),
+              (const, override));
+  MOCK_METHOD(void, OnSetLabel, (std::string label), (override));
+
+  MOCK_METHOD(bool,
+              OnCopyTextureToTextureCommand,
+              (std::shared_ptr<Texture> source,
+               std::shared_ptr<Texture> destination,
+               IRect source_region,
+               IPoint destination_origin,
+               std::string label),
+              (override));
+
+  MOCK_METHOD(bool,
+              OnCopyTextureToBufferCommand,
+              (std::shared_ptr<Texture> source,
+               std::shared_ptr<DeviceBuffer> destination,
+               IRect source_region,
+               size_t destination_offset,
+               std::string label),
+              (override));
+  MOCK_METHOD(bool,
+              OnCopyBufferToTextureCommand,
+              (BufferView source,
+               std::shared_ptr<Texture> destination,
+               IPoint destination_origin,
+               std::string label),
+              (override));
+  MOCK_METHOD(bool,
+              OnGenerateMipmapCommand,
+              (std::shared_ptr<Texture> texture, std::string label),
+              (override));
+};
+
+class MockRenderPass : public RenderPass {
+ public:
+  MockRenderPass(std::shared_ptr<const Context> context,
+                 const RenderTarget& target)
+      : RenderPass(std::move(context), target) {}
+  MOCK_METHOD(bool, IsValid, (), (const, override));
+  MOCK_METHOD(bool,
+              OnEncodeCommands,
+              (const Context& context),
+              (const, override));
+  MOCK_METHOD(void, OnSetLabel, (std::string label), (override));
+};
+
+class MockCommandBuffer : public CommandBuffer {
+ public:
+  explicit MockCommandBuffer(std::weak_ptr<const Context> context)
+      : CommandBuffer(std::move(context)) {}
+  MOCK_METHOD(bool, IsValid, (), (const, override));
+  MOCK_METHOD(void, SetLabel, (const std::string& label), (const, override));
+  MOCK_METHOD(std::shared_ptr<BlitPass>, OnCreateBlitPass, (), (override));
+  MOCK_METHOD(bool,
+              OnSubmitCommands,
+              (CompletionCallback callback),
+              (override));
+  MOCK_METHOD(void, OnWaitUntilScheduled, (), (override));
+  MOCK_METHOD(std::shared_ptr<ComputePass>,
+              OnCreateComputePass,
+              (),
+              (override));
+  MOCK_METHOD(std::shared_ptr<RenderPass>,
+              OnCreateRenderPass,
+              (RenderTarget render_target),
+              (override));
+};
+
+class MockImpellerContext : public Context {
+ public:
+  MOCK_METHOD(Context::BackendType, GetBackendType, (), (const, override));
+
+  MOCK_METHOD(std::string, DescribeGpuModel, (), (const, override));
+
+  MOCK_METHOD(bool, IsValid, (), (const, override));
+
+  MOCK_METHOD(void, Shutdown, (), (override));
+
+  MOCK_METHOD(std::shared_ptr<Allocator>,
+              GetResourceAllocator,
+              (),
+              (const, override));
+
+  MOCK_METHOD(std::shared_ptr<ShaderLibrary>,
+              GetShaderLibrary,
+              (),
+              (const, override));
+
+  MOCK_METHOD(std::shared_ptr<SamplerLibrary>,
+              GetSamplerLibrary,
+              (),
+              (const, override));
+
+  MOCK_METHOD(std::shared_ptr<PipelineLibrary>,
+              GetPipelineLibrary,
+              (),
+              (const, override));
+
+  MOCK_METHOD(std::shared_ptr<CommandBuffer>,
+              CreateCommandBuffer,
+              (),
+              (const, override));
+
+  MOCK_METHOD(const std::shared_ptr<const Capabilities>&,
+              GetCapabilities,
+              (),
+              (const, override));
+
+  MOCK_METHOD(std::shared_ptr<CommandQueue>,
+              GetCommandQueue,
+              (),
+              (const, override));
+};
+
+class MockTexture : public Texture {
+ public:
+  explicit MockTexture(const TextureDescriptor& desc) : Texture(desc) {}
+  MOCK_METHOD(void, SetLabel, (std::string_view label), (override));
+  MOCK_METHOD(bool, IsValid, (), (const, override));
+  MOCK_METHOD(ISize, GetSize, (), (const, override));
+  MOCK_METHOD(bool,
+              OnSetContents,
+              (const uint8_t* contents, size_t length, size_t slice),
+              (override));
+  MOCK_METHOD(bool,
+              OnSetContents,
+              (std::shared_ptr<const fml::Mapping> mapping, size_t slice),
+              (override));
+};
+
+class MockCapabilities : public Capabilities {
+ public:
+  MOCK_METHOD(bool, SupportsOffscreenMSAA, (), (const, override));
+  MOCK_METHOD(bool, SupportsImplicitResolvingMSAA, (), (const, override));
+  MOCK_METHOD(bool, SupportsSSBO, (), (const, override));
+  MOCK_METHOD(bool, SupportsBufferToTextureBlits, (), (const, override));
+  MOCK_METHOD(bool, SupportsTextureToTextureBlits, (), (const, override));
+  MOCK_METHOD(bool, SupportsFramebufferFetch, (), (const, override));
+  MOCK_METHOD(bool, SupportsCompute, (), (const, override));
+  MOCK_METHOD(bool, SupportsComputeSubgroups, (), (const, override));
+  MOCK_METHOD(bool, SupportsReadFromResolve, (), (const, override));
+  MOCK_METHOD(bool, SupportsDecalSamplerAddressMode, (), (const, override));
+  MOCK_METHOD(bool, SupportsDeviceTransientTextures, (), (const, override));
+  MOCK_METHOD(PixelFormat, GetDefaultColorFormat, (), (const, override));
+  MOCK_METHOD(PixelFormat, GetDefaultStencilFormat, (), (const, override));
+  MOCK_METHOD(PixelFormat, GetDefaultDepthStencilFormat, (), (const, override));
+  MOCK_METHOD(PixelFormat, GetDefaultGlyphAtlasFormat, (), (const, override));
+};
+
+class MockCommandQueue : public CommandQueue {
+ public:
+  MOCK_METHOD(fml::Status,
+              Submit,
+              (const std::vector<std::shared_ptr<CommandBuffer>>& buffers,
+               const CompletionCallback& cb),
+              (override));
+};
+
+class MockSamplerLibrary : public SamplerLibrary {
+ public:
+  MOCK_METHOD(const std::unique_ptr<const Sampler>&,
+              GetSampler,
+              (SamplerDescriptor descriptor),
+              (override));
+};
+
+class MockSampler : public Sampler {
+ public:
+  explicit MockSampler(const SamplerDescriptor& desc) : Sampler(desc) {}
+};
+
+}  // namespace testing
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_TESTING_MOCKS_H_
diff --git a/impeller/renderer/texture_mipmap.cc b/impeller/renderer/texture_mipmap.cc
new file mode 100644
index 0000000000000000000000000000000000000000..fbe579b8234c943edaca7321357cbd2113d85636
--- /dev/null
+++ b/impeller/renderer/texture_mipmap.cc
@@ -0,0 +1,27 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/texture_mipmap.h"
+#include "impeller/renderer/blit_pass.h"
+#include "impeller/renderer/command_buffer.h"
+
+namespace impeller {
+
+fml::Status AddMipmapGeneration(
+    const std::shared_ptr<CommandBuffer>& command_buffer,
+    const std::shared_ptr<Context>& context,
+    const std::shared_ptr<Texture>& texture) {
+  std::shared_ptr<BlitPass> blit_pass = command_buffer->CreateBlitPass();
+  bool success = blit_pass->GenerateMipmap(texture);
+  if (!success) {
+    return fml::Status(fml::StatusCode::kUnknown, "");
+  }
+  success = blit_pass->EncodeCommands(context->GetResourceAllocator());
+  if (!success) {
+    return fml::Status(fml::StatusCode::kUnknown, "");
+  }
+  return fml::Status();
+}
+
+}  // namespace impeller
diff --git a/impeller/renderer/texture_mipmap.h b/impeller/renderer/texture_mipmap.h
new file mode 100644
index 0000000000000000000000000000000000000000..a968c2382fdcb0d2992899cda485b1b2a4a8d016
--- /dev/null
+++ b/impeller/renderer/texture_mipmap.h
@@ -0,0 +1,23 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_RENDERER_TEXTURE_MIPMAP_H_
+#define FLUTTER_IMPELLER_RENDERER_TEXTURE_MIPMAP_H_
+
+#include "flutter/fml/status.h"
+#include "impeller/core/texture.h"
+#include "impeller/renderer/command_buffer.h"
+#include "impeller/renderer/context.h"
+
+namespace impeller {
+
+/// Adds a blit command to the render pass.
+[[nodiscard]] fml::Status AddMipmapGeneration(
+    const std::shared_ptr<CommandBuffer>& command_buffer,
+    const std::shared_ptr<Context>& context,
+    const std::shared_ptr<Texture>& texture);
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_TEXTURE_MIPMAP_H_
diff --git a/impeller/renderer/threadgroup_sizing_test.comp b/impeller/renderer/threadgroup_sizing_test.comp
new file mode 100644
index 0000000000000000000000000000000000000000..3d2e02af507ca850eadc027295156ee5e04319d5
--- /dev/null
+++ b/impeller/renderer/threadgroup_sizing_test.comp
@@ -0,0 +1,18 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Size is passed in via specialization constant.
+layout(local_size_x_id = 0) in;
+
+layout(std430) buffer;
+
+layout(binding = 1) writeonly buffer OutputData {
+  uint data[];
+}
+output_data;
+
+void main() {
+  uint ident = gl_GlobalInvocationID.x;
+  output_data.data[ident] = ident;
+}
diff --git a/impeller/renderer/vertex_buffer.h b/impeller/renderer/vertex_buffer.h
deleted file mode 100644
index 35b9743db862162f4b26d79ed129784dd7f665ea..0000000000000000000000000000000000000000
--- a/impeller/renderer/vertex_buffer.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#pragma once
-
-#include "impeller/renderer/buffer_view.h"
-#include "impeller/renderer/formats.h"
-
-namespace impeller {
-
-struct VertexBuffer {
-  BufferView vertex_buffer;
-  BufferView index_buffer;
-  size_t index_count = 0u;
-  IndexType index_type = IndexType::kUnknown;
-
-  constexpr operator bool() const {
-    return static_cast<bool>(vertex_buffer) && static_cast<bool>(index_buffer);
-  }
-};
-
-}  // namespace impeller
diff --git a/impeller/renderer/vertex_buffer_builder.h b/impeller/renderer/vertex_buffer_builder.h
index 61cfd3156ec17edb499a8c0a06a3d1ee65f85b0b..98ca5107cd8adbf06950d27f8fd8462306d24992 100644
--- a/impeller/renderer/vertex_buffer_builder.h
+++ b/impeller/renderer/vertex_buffer_builder.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_VERTEX_BUFFER_BUILDER_H_
+#define FLUTTER_IMPELLER_RENDERER_VERTEX_BUFFER_BUILDER_H_
 
 #include <initializer_list>
 #include <map>
@@ -10,12 +11,12 @@
 
 #include "flutter/fml/macros.h"
 #include "impeller/base/strings.h"
+#include "impeller/core/allocator.h"
+#include "impeller/core/device_buffer.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/host_buffer.h"
+#include "impeller/core/vertex_buffer.h"
 #include "impeller/geometry/vector.h"
-#include "impeller/renderer/allocator.h"
-#include "impeller/renderer/device_buffer.h"
-#include "impeller/renderer/formats.h"
-#include "impeller/renderer/host_buffer.h"
-#include "impeller/renderer/vertex_buffer.h"
 
 namespace impeller {
 
@@ -30,16 +31,19 @@ class VertexBufferBuilder {
   ~VertexBufferBuilder() = default;
 
   constexpr impeller::IndexType GetIndexType() const {
+    if (indices_.size() == 0) {
+      return impeller::IndexType::kNone;
+    }
     if constexpr (sizeof(IndexType) == 2) {
       return impeller::IndexType::k16bit;
-    } else if (sizeof(IndexType) == 4) {
+    }
+    if (sizeof(IndexType) == 4) {
       return impeller::IndexType::k32bit;
-    } else {
-      return impeller::IndexType::kUnknown;
     }
+    return impeller::IndexType::kUnknown;
   }
 
-  void SetLabel(std::string label) { label_ = std::move(label); }
+  void SetLabel(const std::string& label) { label_ = label; }
 
   void Reserve(size_t count) { return vertices_.reserve(count); }
 
@@ -53,6 +57,11 @@ class VertexBufferBuilder {
     return indices_.size() > 0 ? indices_.size() : vertices_.size();
   }
 
+  const VertexType& Last() const {
+    FML_DCHECK(!vertices_.empty());
+    return vertices_.back();
+  }
+
   VertexBufferBuilder& AppendVertex(VertexType_ vertex) {
     vertices_.emplace_back(std::move(vertex));
     return *this;
@@ -76,7 +85,7 @@ class VertexBufferBuilder {
     VertexBuffer buffer;
     buffer.vertex_buffer = CreateVertexBufferView(host_buffer);
     buffer.index_buffer = CreateIndexBufferView(host_buffer);
-    buffer.index_count = GetIndexCount();
+    buffer.vertex_count = GetIndexCount();
     buffer.index_type = GetIndexType();
     return buffer;
   };
@@ -86,11 +95,17 @@ class VertexBufferBuilder {
     // This can be merged into a single allocation.
     buffer.vertex_buffer = CreateVertexBufferView(device_allocator);
     buffer.index_buffer = CreateIndexBufferView(device_allocator);
-    buffer.index_count = GetIndexCount();
+    buffer.vertex_count = GetIndexCount();
     buffer.index_type = GetIndexType();
     return buffer;
   };
 
+  void IterateVertices(const std::function<void(VertexType&)>& iterator) {
+    for (auto& vertex : vertices_) {
+      iterator(vertex);
+    }
+  }
+
  private:
   std::vector<VertexType> vertices_;
   std::vector<IndexType> indices_;
@@ -112,25 +127,16 @@ class VertexBufferBuilder {
     if (!label_.empty()) {
       buffer->SetLabel(SPrintF("%s Vertices", label_.c_str()));
     }
-    return buffer->AsBufferView();
+    return DeviceBuffer::AsBufferView(buffer);
   }
 
-  std::vector<IndexType> CreateIndexBuffer() const {
-    if (indices_.size() > 0) {
-      return indices_;
-    }
-
-    // So dumb! We don't actually need an index buffer right now. But we will
-    // once de-duplication is done. So assume this is always done.
-    std::vector<IndexType> index_buffer;
-    for (size_t i = 0; i < vertices_.size(); i++) {
-      index_buffer.push_back(i);
-    }
-    return index_buffer;
-  }
+  std::vector<IndexType> CreateIndexBuffer() const { return indices_; }
 
   BufferView CreateIndexBufferView(HostBuffer& buffer) const {
     const auto index_buffer = CreateIndexBuffer();
+    if (index_buffer.size() == 0) {
+      return {};
+    }
     return buffer.Emplace(index_buffer.data(),
                           index_buffer.size() * sizeof(IndexType),
                           alignof(IndexType));
@@ -138,6 +144,9 @@ class VertexBufferBuilder {
 
   BufferView CreateIndexBufferView(Allocator& allocator) const {
     const auto index_buffer = CreateIndexBuffer();
+    if (index_buffer.size() == 0) {
+      return {};
+    }
     auto buffer = allocator.CreateBufferWithCopy(
         reinterpret_cast<const uint8_t*>(index_buffer.data()),
         index_buffer.size() * sizeof(IndexType));
@@ -147,8 +156,10 @@ class VertexBufferBuilder {
     if (!label_.empty()) {
       buffer->SetLabel(SPrintF("%s Indices", label_.c_str()));
     }
-    return buffer->AsBufferView();
+    return DeviceBuffer::AsBufferView(buffer);
   }
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_VERTEX_BUFFER_BUILDER_H_
diff --git a/impeller/renderer/vertex_descriptor.cc b/impeller/renderer/vertex_descriptor.cc
index 963a7478a1696f304408b39134e0848d99e75d3d..a8e4ee3422de1a0d686422acd5b423ac814077a6 100644
--- a/impeller/renderer/vertex_descriptor.cc
+++ b/impeller/renderer/vertex_descriptor.cc
@@ -10,24 +10,37 @@ VertexDescriptor::VertexDescriptor() = default;
 
 VertexDescriptor::~VertexDescriptor() = default;
 
-bool VertexDescriptor::SetStageInputs(
+void VertexDescriptor::SetStageInputs(
     const ShaderStageIOSlot* const stage_inputs[],
-    size_t count) {
+    size_t count,
+    const ShaderStageBufferLayout* const stage_layout[],
+    size_t layout_count) {
   inputs_.reserve(inputs_.size() + count);
+  layouts_.reserve(layouts_.size() + layout_count);
   for (size_t i = 0; i < count; i++) {
     inputs_.emplace_back(*stage_inputs[i]);
   }
-  return true;
+  for (size_t i = 0; i < layout_count; i++) {
+    layouts_.emplace_back(*stage_layout[i]);
+  }
 }
 
-bool VertexDescriptor::SetDescriptorSetLayouts(
+void VertexDescriptor::SetStageInputs(
+    const std::vector<ShaderStageIOSlot>& inputs,
+    const std::vector<ShaderStageBufferLayout>& layout) {
+  inputs_.insert(inputs_.end(), inputs.begin(), inputs.end());
+  layouts_.insert(layouts_.end(), layout.begin(), layout.end());
+}
+
+void VertexDescriptor::RegisterDescriptorSetLayouts(
     const DescriptorSetLayout desc_set_layout[],
     size_t count) {
   desc_set_layouts_.reserve(desc_set_layouts_.size() + count);
   for (size_t i = 0; i < count; i++) {
+    uses_input_attachments_ |=
+        desc_set_layout[i].descriptor_type == DescriptorType::kInputAttachment;
     desc_set_layouts_.emplace_back(desc_set_layout[i]);
   }
-  return true;
 }
 
 // |Comparable<VertexDescriptor>|
@@ -36,21 +49,33 @@ size_t VertexDescriptor::GetHash() const {
   for (const auto& input : inputs_) {
     fml::HashCombineSeed(seed, input.GetHash());
   }
+  for (const auto& layout : layouts_) {
+    fml::HashCombineSeed(seed, layout.GetHash());
+  }
   return seed;
 }
 
 // |Comparable<VertexDescriptor>|
 bool VertexDescriptor::IsEqual(const VertexDescriptor& other) const {
-  return inputs_ == other.inputs_;
+  return inputs_ == other.inputs_ && layouts_ == other.layouts_;
 }
 
 const std::vector<ShaderStageIOSlot>& VertexDescriptor::GetStageInputs() const {
   return inputs_;
 }
 
+const std::vector<ShaderStageBufferLayout>& VertexDescriptor::GetStageLayouts()
+    const {
+  return layouts_;
+}
+
 const std::vector<DescriptorSetLayout>&
 VertexDescriptor::GetDescriptorSetLayouts() const {
   return desc_set_layouts_;
 }
 
+bool VertexDescriptor::UsesInputAttacments() const {
+  return uses_input_attachments_;
+}
+
 }  // namespace impeller
diff --git a/impeller/renderer/vertex_descriptor.h b/impeller/renderer/vertex_descriptor.h
index dffe6694f7caf1e4fc836f0f1f45dd115822ae1f..55c487e0cdf6a095ccb2e99ed5f8f6fc78469ea2 100644
--- a/impeller/renderer/vertex_descriptor.h
+++ b/impeller/renderer/vertex_descriptor.h
@@ -2,14 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RENDERER_VERTEX_DESCRIPTOR_H_
+#define FLUTTER_IMPELLER_RENDERER_VERTEX_DESCRIPTOR_H_
 
 #include <vector>
 
-#include "flutter/fml/macros.h"
 #include "impeller/base/comparable.h"
-#include "impeller/renderer/descriptor_set_layout.h"
-#include "impeller/renderer/shader_types.h"
+#include "impeller/core/shader_types.h"
 
 namespace impeller {
 
@@ -31,26 +30,35 @@ class VertexDescriptor final : public Comparable<VertexDescriptor> {
   // |Comparable<PipelineVertexDescriptor>|
   virtual ~VertexDescriptor();
 
-  template <size_t Size>
-  bool SetStageInputs(
-      const std::array<const ShaderStageIOSlot*, Size>& inputs) {
-    return SetStageInputs(inputs.data(), inputs.size());
+  template <size_t Size, size_t LayoutSize>
+  void SetStageInputs(
+      const std::array<const ShaderStageIOSlot*, Size>& inputs,
+      const std::array<const ShaderStageBufferLayout*, LayoutSize>& layout) {
+    return SetStageInputs(inputs.data(), inputs.size(), layout.data(),
+                          layout.size());
   }
 
+  void SetStageInputs(const std::vector<ShaderStageIOSlot>& inputs,
+                      const std::vector<ShaderStageBufferLayout>& layout);
+
   template <size_t Size>
-  bool SetDescriptorSetLayouts(
+  void RegisterDescriptorSetLayouts(
       const std::array<DescriptorSetLayout, Size>& inputs) {
-    return SetDescriptorSetLayouts(inputs.data(), inputs.size());
+    return RegisterDescriptorSetLayouts(inputs.data(), inputs.size());
   }
 
-  bool SetStageInputs(const ShaderStageIOSlot* const stage_inputs[],
-                      size_t count);
+  void SetStageInputs(const ShaderStageIOSlot* const stage_inputs[],
+                      size_t count,
+                      const ShaderStageBufferLayout* const stage_layout[],
+                      size_t layout_count);
 
-  bool SetDescriptorSetLayouts(const DescriptorSetLayout desc_set_layout[],
-                               size_t count);
+  void RegisterDescriptorSetLayouts(const DescriptorSetLayout desc_set_layout[],
+                                    size_t count);
 
   const std::vector<ShaderStageIOSlot>& GetStageInputs() const;
 
+  const std::vector<ShaderStageBufferLayout>& GetStageLayouts() const;
+
   const std::vector<DescriptorSetLayout>& GetDescriptorSetLayouts() const;
 
   // |Comparable<VertexDescriptor>|
@@ -59,11 +67,19 @@ class VertexDescriptor final : public Comparable<VertexDescriptor> {
   // |Comparable<VertexDescriptor>|
   bool IsEqual(const VertexDescriptor& other) const override;
 
+  bool UsesInputAttacments() const;
+
  private:
   std::vector<ShaderStageIOSlot> inputs_;
+  std::vector<ShaderStageBufferLayout> layouts_;
   std::vector<DescriptorSetLayout> desc_set_layouts_;
+  bool uses_input_attachments_ = false;
+
+  VertexDescriptor(const VertexDescriptor&) = delete;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(VertexDescriptor);
+  VertexDescriptor& operator=(const VertexDescriptor&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RENDERER_VERTEX_DESCRIPTOR_H_
diff --git a/impeller/runtime_stage/BUILD.gn b/impeller/runtime_stage/BUILD.gn
index 5756887562edb4841c4f1034ff34c17393ed93aa..8cc4f3b0a22355c16b1f995521e07b787499b082 100644
--- a/impeller/runtime_stage/BUILD.gn
+++ b/impeller/runtime_stage/BUILD.gn
@@ -2,30 +2,41 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//third_party/flatbuffers/flatbuffers.gni")
+import("//flutter/third_party/flatbuffers/flatbuffers.gni")
 import("../tools/impeller.gni")
 
 config("runtime_stage_config") {
   configs = [ "//flutter/impeller:impeller_public_config" ]
-  include_dirs = [ "$root_gen_dir/flutter" ]
+  include_dirs = [
+    "$root_gen_dir/flutter",
+    "$root_gen_dir/flutter/impeller/runtime_stage",
+  ]
+}
+
+flatbuffers("runtime_stage_types_flatbuffers") {
+  flatbuffers = [ "runtime_stage_types.fbs" ]
+  public_configs = [ ":runtime_stage_config" ]
+  public_deps = [ "//flutter/third_party/flatbuffers" ]
 }
 
 flatbuffers("runtime_stage_flatbuffers") {
   flatbuffers = [ "runtime_stage.fbs" ]
   public_configs = [ ":runtime_stage_config" ]
-  public_deps = [ "//third_party/flatbuffers" ]
+  public_deps = [
+    ":runtime_stage_types_flatbuffers",
+    "//flutter/third_party/flatbuffers",
+  ]
 }
 
 impeller_component("runtime_stage") {
   sources = [
     "runtime_stage.cc",
     "runtime_stage.h",
-    "runtime_types.cc",
-    "runtime_types.h",
   ]
   public_deps = [
     ":runtime_stage_flatbuffers",
     "../base",
+    "../core",
     "//flutter/fml",
   ]
 }
diff --git a/impeller/runtime_stage/runtime_stage.cc b/impeller/runtime_stage/runtime_stage.cc
index 919d374a3f05361d607728c6ab73cd1c00c0890e..4b5c6924fa386f36f83eb69acaa772c750c6ce38 100644
--- a/impeller/runtime_stage/runtime_stage.cc
+++ b/impeller/runtime_stage/runtime_stage.cc
@@ -5,40 +5,24 @@
 #include "impeller/runtime_stage/runtime_stage.h"
 
 #include <array>
+#include <memory>
 
+#include "fml/mapping.h"
 #include "impeller/base/validation.h"
+#include "impeller/core/runtime_types.h"
 #include "impeller/runtime_stage/runtime_stage_flatbuffers.h"
+#include "runtime_stage_types_flatbuffers.h"
 
 namespace impeller {
 
 static RuntimeUniformType ToType(fb::UniformDataType type) {
   switch (type) {
-    case fb::UniformDataType::kBoolean:
-      return RuntimeUniformType::kBoolean;
-    case fb::UniformDataType::kSignedByte:
-      return RuntimeUniformType::kSignedByte;
-    case fb::UniformDataType::kUnsignedByte:
-      return RuntimeUniformType::kUnsignedByte;
-    case fb::UniformDataType::kSignedShort:
-      return RuntimeUniformType::kSignedShort;
-    case fb::UniformDataType::kUnsignedShort:
-      return RuntimeUniformType::kUnsignedShort;
-    case fb::UniformDataType::kSignedInt:
-      return RuntimeUniformType::kSignedInt;
-    case fb::UniformDataType::kUnsignedInt:
-      return RuntimeUniformType::kUnsignedInt;
-    case fb::UniformDataType::kSignedInt64:
-      return RuntimeUniformType::kSignedInt64;
-    case fb::UniformDataType::kUnsignedInt64:
-      return RuntimeUniformType::kUnsignedInt64;
-    case fb::UniformDataType::kHalfFloat:
-      return RuntimeUniformType::kHalfFloat;
     case fb::UniformDataType::kFloat:
       return RuntimeUniformType::kFloat;
-    case fb::UniformDataType::kDouble:
-      return RuntimeUniformType::kDouble;
     case fb::UniformDataType::kSampledImage:
       return RuntimeUniformType::kSampledImage;
+    case fb::UniformDataType::kStruct:
+      return RuntimeUniformType::kStruct;
   }
   FML_UNREACHABLE();
 }
@@ -51,27 +35,55 @@ static RuntimeShaderStage ToShaderStage(fb::Stage stage) {
       return RuntimeShaderStage::kFragment;
     case fb::Stage::kCompute:
       return RuntimeShaderStage::kCompute;
-    case fb::Stage::kTessellationControl:
-      return RuntimeShaderStage::kTessellationControl;
-    case fb::Stage::kTessellationEvaluation:
-      return RuntimeShaderStage::kTessellationEvaluation;
   }
   FML_UNREACHABLE();
 }
 
-RuntimeStage::RuntimeStage(std::shared_ptr<fml::Mapping> payload)
-    : payload_(std::move(payload)) {
-  if (payload_ == nullptr || !payload_->GetMapping()) {
-    return;
+/// The generated name from GLSLang/shaderc for the UBO containing non-opaque
+/// uniforms specified in the user-written runtime effect shader.
+///
+/// Vulkan does not allow non-opaque uniforms outside of a UBO.
+const char* RuntimeStage::kVulkanUBOName =
+    "_RESERVED_IDENTIFIER_FIXUP_gl_DefaultUniformBlock";
+
+std::unique_ptr<RuntimeStage> RuntimeStage::RuntimeStageIfPresent(
+    const fb::RuntimeStage* runtime_stage,
+    const std::shared_ptr<fml::Mapping>& payload) {
+  if (!runtime_stage) {
+    return nullptr;
   }
-  if (!fb::RuntimeStageBufferHasIdentifier(payload_->GetMapping())) {
-    return;
+
+  return std::unique_ptr<RuntimeStage>(
+      new RuntimeStage(runtime_stage, payload));
+}
+
+RuntimeStage::Map RuntimeStage::DecodeRuntimeStages(
+    const std::shared_ptr<fml::Mapping>& payload) {
+  if (payload == nullptr || !payload->GetMapping()) {
+    return {};
   }
-  auto runtime_stage = fb::GetRuntimeStage(payload_->GetMapping());
-  if (!runtime_stage) {
-    return;
+  if (!fb::RuntimeStagesBufferHasIdentifier(payload->GetMapping())) {
+    return {};
   }
 
+  auto raw_stages = fb::GetRuntimeStages(payload->GetMapping());
+  return {
+      {RuntimeStageBackend::kSkSL,
+       RuntimeStageIfPresent(raw_stages->sksl(), payload)},
+      {RuntimeStageBackend::kMetal,
+       RuntimeStageIfPresent(raw_stages->metal(), payload)},
+      {RuntimeStageBackend::kOpenGLES,
+       RuntimeStageIfPresent(raw_stages->opengles(), payload)},
+      {RuntimeStageBackend::kVulkan,
+       RuntimeStageIfPresent(raw_stages->vulkan(), payload)},
+  };
+}
+
+RuntimeStage::RuntimeStage(const fb::RuntimeStage* runtime_stage,
+                           const std::shared_ptr<fml::Mapping>& payload)
+    : payload_(payload) {
+  FML_DCHECK(runtime_stage);
+
   stage_ = ToShaderStage(runtime_stage->stage());
   entrypoint_ = runtime_stage->entrypoint()->str();
 
@@ -86,6 +98,12 @@ RuntimeStage::RuntimeStage(std::shared_ptr<fml::Mapping> payload)
           static_cast<size_t>(i->rows()), static_cast<size_t>(i->columns())};
       desc.bit_width = i->bit_width();
       desc.array_elements = i->array_elements();
+      if (i->struct_layout()) {
+        for (const auto& byte_type : *i->struct_layout()) {
+          desc.struct_layout.push_back(static_cast<uint8_t>(byte_type));
+        }
+      }
+      desc.struct_float_count = i->struct_float_count();
       uniforms_.emplace_back(std::move(desc));
     }
   }
@@ -96,12 +114,6 @@ RuntimeStage::RuntimeStage(std::shared_ptr<fml::Mapping> payload)
       [payload = payload_](auto, auto) {}  //
   );
 
-  sksl_mapping_ = std::make_shared<fml::NonOwnedMapping>(
-      runtime_stage->sksl()->data(),       //
-      runtime_stage->sksl()->size(),       //
-      [payload = payload_](auto, auto) {}  //
-  );
-
   is_valid_ = true;
 }
 
@@ -117,10 +129,6 @@ const std::shared_ptr<fml::Mapping>& RuntimeStage::GetCodeMapping() const {
   return code_mapping_;
 }
 
-const std::shared_ptr<fml::Mapping>& RuntimeStage::GetSkSLMapping() const {
-  return sksl_mapping_;
-}
-
 const std::vector<RuntimeUniformDescription>& RuntimeStage::GetUniforms()
     const {
   return uniforms_;
diff --git a/impeller/runtime_stage/runtime_stage.fbs b/impeller/runtime_stage/runtime_stage.fbs
index 6e294a0eae6555a50d70a10c67986830fa86b1f2..189fbf04340498eea01634a766b5cdd131ba6844 100644
--- a/impeller/runtime_stage/runtime_stage.fbs
+++ b/impeller/runtime_stage/runtime_stage.fbs
@@ -2,56 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-namespace impeller.fb;
-
-enum Stage:byte {
-  kVertex,
-  kFragment,
-  kCompute,
-  kTessellationControl,
-  kTessellationEvaluation,
-}
-
-enum TargetPlatform:byte {
-  kMetal,
-  kOpenGLES,
-  kSkSL,
-}
+include "runtime_stage_types.fbs";
 
-enum UniformDataType:uint32 {
-  kBoolean,
-  kSignedByte,
-  kUnsignedByte,
-  kSignedShort,
-  kUnsignedShort,
-  kSignedInt,
-  kUnsignedInt,
-  kSignedInt64,
-  kUnsignedInt64,
-  kHalfFloat,
-  kFloat,
-  kDouble,
-  kSampledImage,
-}
-
-table UniformDescription {
-  name: string;
-  location: uint64;
-  type: UniformDataType;
-  bit_width: uint64;
-  rows: uint64;
-  columns: uint64;
-  array_elements: uint64;
-}
-
-table RuntimeStage {
-  stage: Stage;
-  target_platform: TargetPlatform;
-  entrypoint: string;
-  uniforms: [UniformDescription];
-  shader: [ubyte];
-  sksl: [ubyte];
-}
+namespace impeller.fb;
 
-root_type RuntimeStage;
+root_type RuntimeStages;
 file_identifier "IPLR";
diff --git a/impeller/runtime_stage/runtime_stage.h b/impeller/runtime_stage/runtime_stage.h
index 2c5eca0e3badd0601636a52bd13269d6d3f6ab31..a86344a89d4c5eaaa96c775b2d28175c1c679558 100644
--- a/impeller/runtime_stage/runtime_stage.h
+++ b/impeller/runtime_stage/runtime_stage.h
@@ -2,22 +2,29 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RUNTIME_STAGE_RUNTIME_STAGE_H_
+#define FLUTTER_IMPELLER_RUNTIME_STAGE_RUNTIME_STAGE_H_
 
+#include <map>
 #include <memory>
 #include <string>
 
-#include "flutter/fml/macros.h"
 #include "flutter/fml/mapping.h"
 
-#include "flutter/impeller/runtime_stage/runtime_types.h"
+#include "flutter/impeller/core/runtime_types.h"
+#include "runtime_stage_types_flatbuffers.h"
 
 namespace impeller {
 
 class RuntimeStage {
  public:
-  explicit RuntimeStage(std::shared_ptr<fml::Mapping> payload);
+  static const char* kVulkanUBOName;
 
+  using Map = std::map<RuntimeStageBackend, std::shared_ptr<RuntimeStage>>;
+  static Map DecodeRuntimeStages(const std::shared_ptr<fml::Mapping>& payload);
+
+  RuntimeStage(const fb::RuntimeStage* runtime_stage,
+               const std::shared_ptr<fml::Mapping>& payload);
   ~RuntimeStage();
   RuntimeStage(RuntimeStage&&);
   RuntimeStage& operator=(RuntimeStage&&);
@@ -34,23 +41,28 @@ class RuntimeStage {
 
   const std::shared_ptr<fml::Mapping>& GetCodeMapping() const;
 
-  const std::shared_ptr<fml::Mapping>& GetSkSLMapping() const;
-
   bool IsDirty() const;
 
   void SetClean();
 
  private:
-  RuntimeShaderStage stage_ = RuntimeShaderStage::kVertex;
   std::shared_ptr<fml::Mapping> payload_;
+  RuntimeShaderStage stage_ = RuntimeShaderStage::kVertex;
   std::string entrypoint_;
   std::shared_ptr<fml::Mapping> code_mapping_;
-  std::shared_ptr<fml::Mapping> sksl_mapping_;
   std::vector<RuntimeUniformDescription> uniforms_;
   bool is_valid_ = false;
   bool is_dirty_ = true;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(RuntimeStage);
+  RuntimeStage(const RuntimeStage&) = delete;
+
+  static std::unique_ptr<RuntimeStage> RuntimeStageIfPresent(
+      const fb::RuntimeStage* runtime_stage,
+      const std::shared_ptr<fml::Mapping>& payload);
+
+  RuntimeStage& operator=(const RuntimeStage&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RUNTIME_STAGE_RUNTIME_STAGE_H_
diff --git a/impeller/runtime_stage/runtime_stage_playground.cc b/impeller/runtime_stage/runtime_stage_playground.cc
index de0d3cf66f99e4b2763d75b8d5dcf23c12b1e178..1267b6031dbcec5dbb3abd307a332a780bfd862e 100644
--- a/impeller/runtime_stage/runtime_stage_playground.cc
+++ b/impeller/runtime_stage/runtime_stage_playground.cc
@@ -8,8 +8,8 @@
 
 #include "flutter/fml/make_copyable.h"
 #include "flutter/testing/testing.h"
+#include "impeller/core/shader_types.h"
 #include "impeller/renderer/shader_library.h"
-#include "impeller/renderer/shader_types.h"
 
 namespace impeller {
 
@@ -20,7 +20,8 @@ RuntimeStagePlayground::~RuntimeStagePlayground() = default;
 bool RuntimeStagePlayground::RegisterStage(const RuntimeStage& stage) {
   std::promise<bool> registration;
   auto future = registration.get_future();
-  auto library = GetContext()->GetShaderLibrary();
+  const std::shared_ptr<ShaderLibrary>& library =
+      GetContext()->GetShaderLibrary();
   GetContext()->GetShaderLibrary()->RegisterFunction(
       stage.GetEntrypoint(), ToShaderStage(stage.GetShaderStage()),
       stage.GetCodeMapping(),
diff --git a/impeller/runtime_stage/runtime_stage_playground.h b/impeller/runtime_stage/runtime_stage_playground.h
index 3a1821006c7f06789c361233ea9f77a286de0b0b..86f9cc4bc42dfd75aaa0964700faaa3aee43b775 100644
--- a/impeller/runtime_stage/runtime_stage_playground.h
+++ b/impeller/runtime_stage/runtime_stage_playground.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_RUNTIME_STAGE_RUNTIME_STAGE_PLAYGROUND_H_
+#define FLUTTER_IMPELLER_RUNTIME_STAGE_RUNTIME_STAGE_PLAYGROUND_H_
 
 #include "flutter/fml/macros.h"
 #include "impeller/playground/playground_test.h"
@@ -19,7 +20,11 @@ class RuntimeStagePlayground : public PlaygroundTest {
   bool RegisterStage(const RuntimeStage& stage);
 
  private:
-  FML_DISALLOW_COPY_AND_ASSIGN(RuntimeStagePlayground);
+  RuntimeStagePlayground(const RuntimeStagePlayground&) = delete;
+
+  RuntimeStagePlayground& operator=(const RuntimeStagePlayground&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_RUNTIME_STAGE_RUNTIME_STAGE_PLAYGROUND_H_
diff --git a/impeller/runtime_stage/runtime_stage_types.fbs b/impeller/runtime_stage/runtime_stage_types.fbs
new file mode 100644
index 0000000000000000000000000000000000000000..b6f88f1fa73b7fda1f28c2a3f7daeeca01cf32b6
--- /dev/null
+++ b/impeller/runtime_stage/runtime_stage_types.fbs
@@ -0,0 +1,86 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+namespace impeller.fb;
+
+enum Stage:byte {
+  kVertex,
+  kFragment,
+  kCompute,
+}
+
+// The subset of impeller::ShaderType that may be used for uniform bindings.
+// kStruct is only supported for Impeller Vulkan.
+// kFloat encompases multiple float-based types e.g. vec2.
+enum UniformDataType:uint32 {
+  kFloat,
+  kSampledImage,
+  kStruct,
+}
+
+// A struct is made up solely of 4 byte floats and 4-byte paddings between
+// them.
+// This enum describes whether a particular byte is a float or padding.
+enum StructByteType:uint8 {
+  kPadding = 0,
+  kFloat = 1,
+}
+
+table UniformDescription {
+  name: string;
+  location: uint64;
+  type: UniformDataType;
+  bit_width: uint64;
+  rows: uint64;
+  columns: uint64;
+  array_elements: uint64;
+  struct_layout: [StructByteType];
+  struct_float_count: uint64;
+}
+
+// The subset of impeller::ShaderType that may be used for vertex attributes.
+enum InputDataType:uint32 {
+  kBoolean,
+  kSignedByte,
+  kUnsignedByte,
+  kSignedShort,
+  kUnsignedShort,
+  kSignedInt,
+  kUnsignedInt,
+  kSignedInt64,
+  kUnsignedInt64,
+  kFloat,
+  kDouble,
+}
+
+// This contains the same attribute reflection data as
+// impeller::ShaderStageIOSlot.
+table StageInput {
+  name: string;
+  location: uint64;
+  set: uint64;
+  binding: uint64;
+  type: InputDataType;
+  bit_width: uint64;
+  vec_size: uint64;
+  columns: uint64;
+  offset: uint64;
+}
+
+table RuntimeStage {
+  stage: Stage;
+  entrypoint: string;
+  inputs: [StageInput];
+  uniforms: [UniformDescription];
+  shader: [ubyte];
+  struct_byte_length: uint64;
+  float_count: uint64;
+}
+
+table RuntimeStages {
+  sksl: RuntimeStage;
+  metal: RuntimeStage;
+  opengles: RuntimeStage;
+  vulkan: RuntimeStage;
+}
diff --git a/impeller/runtime_stage/runtime_stage_unittests.cc b/impeller/runtime_stage/runtime_stage_unittests.cc
index 1c4a9acf5e1e3244727c42545f8a4afb2a556f14..8315c6af7c4551075e4b1a9a94351bd839be60cc 100644
--- a/impeller/runtime_stage/runtime_stage_unittests.cc
+++ b/impeller/runtime_stage/runtime_stage_unittests.cc
@@ -5,15 +5,17 @@
 #include <future>
 
 #include "flutter/fml/make_copyable.h"
-#include "flutter/impeller/fixtures/simple.vert.h"
 #include "flutter/testing/testing.h"
+#include "gmock/gmock.h"
 #include "impeller/base/allocation.h"
 #include "impeller/base/validation.h"
+#include "impeller/core/runtime_types.h"
+#include "impeller/core/shader_types.h"
+#include "impeller/entity/runtime_effect.vert.h"
 #include "impeller/playground/playground.h"
 #include "impeller/renderer/pipeline_descriptor.h"
 #include "impeller/renderer/pipeline_library.h"
 #include "impeller/renderer/shader_library.h"
-#include "impeller/renderer/shader_types.h"
 #include "impeller/runtime_stage/runtime_stage.h"
 #include "impeller/runtime_stage/runtime_stage_playground.h"
 
@@ -23,19 +25,20 @@ namespace testing {
 using RuntimeStageTest = RuntimeStagePlayground;
 INSTANTIATE_PLAYGROUND_SUITE(RuntimeStageTest);
 
-TEST(RuntimeStageTest, CanReadValidBlob) {
-  auto fixture =
+TEST_P(RuntimeStageTest, CanReadValidBlob) {
+  const std::shared_ptr<fml::Mapping> fixture =
       flutter::testing::OpenFixtureAsMapping("ink_sparkle.frag.iplr");
   ASSERT_TRUE(fixture);
   ASSERT_GT(fixture->GetSize(), 0u);
-  RuntimeStage stage(std::move(fixture));
-  ASSERT_TRUE(stage.IsValid());
-  ASSERT_EQ(stage.GetShaderStage(), RuntimeShaderStage::kFragment);
+  auto stages = RuntimeStage::DecodeRuntimeStages(fixture);
+  auto stage = stages[PlaygroundBackendToRuntimeStageBackend(GetBackend())];
+  ASSERT_TRUE(stage->IsValid());
+  ASSERT_EQ(stage->GetShaderStage(), RuntimeShaderStage::kFragment);
 }
 
-TEST(RuntimeStageTest, CanRejectInvalidBlob) {
+TEST_P(RuntimeStageTest, CanRejectInvalidBlob) {
   ScopedValidationDisable disable_validation;
-  auto fixture =
+  const std::shared_ptr<fml::Mapping> fixture =
       flutter::testing::OpenFixtureAsMapping("ink_sparkle.frag.iplr");
   ASSERT_TRUE(fixture);
   auto junk_allocation = std::make_shared<Allocation>();
@@ -43,195 +46,228 @@ TEST(RuntimeStageTest, CanRejectInvalidBlob) {
   // Not meant to be secure. Just reject obviously bad blobs using magic
   // numbers.
   ::memset(junk_allocation->GetBuffer(), 127, junk_allocation->GetLength());
-  RuntimeStage stage(CreateMappingFromAllocation(junk_allocation));
-  ASSERT_FALSE(stage.IsValid());
+  auto stages = RuntimeStage::DecodeRuntimeStages(
+      CreateMappingFromAllocation(junk_allocation));
+  ASSERT_FALSE(stages[PlaygroundBackendToRuntimeStageBackend(GetBackend())]);
 }
 
-TEST(RuntimeStageTest, CanReadUniforms) {
-  auto fixture =
+TEST_P(RuntimeStageTest, CanReadUniforms) {
+  const std::shared_ptr<fml::Mapping> fixture =
       flutter::testing::OpenFixtureAsMapping("ink_sparkle.frag.iplr");
   ASSERT_TRUE(fixture);
   ASSERT_GT(fixture->GetSize(), 0u);
-  RuntimeStage stage(std::move(fixture));
-  ASSERT_TRUE(stage.IsValid());
-  ASSERT_EQ(stage.GetUniforms().size(), 17u);
-  {
-    auto uni = stage.GetUniform("u_color");
-    ASSERT_NE(uni, nullptr);
-    ASSERT_EQ(uni->dimensions.rows, 4u);
-    ASSERT_EQ(uni->dimensions.cols, 1u);
-    ASSERT_EQ(uni->location, 0u);
-    ASSERT_EQ(uni->type, RuntimeUniformType::kFloat);
-  }
-  {
-    auto uni = stage.GetUniform("u_alpha");
-    ASSERT_NE(uni, nullptr);
-    ASSERT_EQ(uni->dimensions.rows, 1u);
-    ASSERT_EQ(uni->dimensions.cols, 1u);
-    ASSERT_EQ(uni->location, 1u);
-    ASSERT_EQ(uni->type, RuntimeUniformType::kFloat);
-  }
-  {
-    auto uni = stage.GetUniform("u_sparkle_color");
-    ASSERT_NE(uni, nullptr);
-    ASSERT_EQ(uni->dimensions.rows, 4u);
-    ASSERT_EQ(uni->dimensions.cols, 1u);
-    ASSERT_EQ(uni->location, 2u);
-    ASSERT_EQ(uni->type, RuntimeUniformType::kFloat);
-  }
-  {
-    auto uni = stage.GetUniform("u_sparkle_alpha");
-    ASSERT_NE(uni, nullptr);
-    ASSERT_EQ(uni->dimensions.rows, 1u);
-    ASSERT_EQ(uni->dimensions.cols, 1u);
-    ASSERT_EQ(uni->location, 3u);
-    ASSERT_EQ(uni->type, RuntimeUniformType::kFloat);
-  }
-  {
-    auto uni = stage.GetUniform("u_blur");
-    ASSERT_NE(uni, nullptr);
-    ASSERT_EQ(uni->dimensions.rows, 1u);
-    ASSERT_EQ(uni->dimensions.cols, 1u);
-    ASSERT_EQ(uni->location, 4u);
-    ASSERT_EQ(uni->type, RuntimeUniformType::kFloat);
-  }
-  {
-    auto uni = stage.GetUniform("u_radius_scale");
-    ASSERT_NE(uni, nullptr);
-    ASSERT_EQ(uni->dimensions.rows, 1u);
-    ASSERT_EQ(uni->dimensions.cols, 1u);
-    ASSERT_EQ(uni->location, 6u);
-    ASSERT_EQ(uni->type, RuntimeUniformType::kFloat);
-  }
-  {
-    auto uni = stage.GetUniform("u_max_radius");
-    ASSERT_NE(uni, nullptr);
-    ASSERT_EQ(uni->dimensions.rows, 1u);
-    ASSERT_EQ(uni->dimensions.cols, 1u);
-    ASSERT_EQ(uni->location, 7u);
-    ASSERT_EQ(uni->type, RuntimeUniformType::kFloat);
-  }
-  {
-    auto uni = stage.GetUniform("u_resolution_scale");
-    ASSERT_NE(uni, nullptr);
-    ASSERT_EQ(uni->dimensions.rows, 2u);
-    ASSERT_EQ(uni->dimensions.cols, 1u);
-    ASSERT_EQ(uni->location, 8u);
-    ASSERT_EQ(uni->type, RuntimeUniformType::kFloat);
-  }
-  {
-    auto uni = stage.GetUniform("u_noise_scale");
-    ASSERT_NE(uni, nullptr);
-    ASSERT_EQ(uni->dimensions.rows, 2u);
-    ASSERT_EQ(uni->dimensions.cols, 1u);
-    ASSERT_EQ(uni->location, 9u);
-    ASSERT_EQ(uni->type, RuntimeUniformType::kFloat);
-  }
-  {
-    auto uni = stage.GetUniform("u_noise_phase");
-    ASSERT_NE(uni, nullptr);
-    ASSERT_EQ(uni->dimensions.rows, 1u);
-    ASSERT_EQ(uni->dimensions.cols, 1u);
-    ASSERT_EQ(uni->location, 10u);
-    ASSERT_EQ(uni->type, RuntimeUniformType::kFloat);
-  }
+  auto stages = RuntimeStage::DecodeRuntimeStages(fixture);
+  auto stage = stages[PlaygroundBackendToRuntimeStageBackend(GetBackend())];
 
-  {
-    auto uni = stage.GetUniform("u_circle1");
-    ASSERT_NE(uni, nullptr);
-    ASSERT_EQ(uni->dimensions.rows, 2u);
-    ASSERT_EQ(uni->dimensions.cols, 1u);
-    ASSERT_EQ(uni->location, 11u);
-    ASSERT_EQ(uni->type, RuntimeUniformType::kFloat);
-  }
-  {
-    auto uni = stage.GetUniform("u_circle2");
-    ASSERT_NE(uni, nullptr);
-    ASSERT_EQ(uni->dimensions.rows, 2u);
-    ASSERT_EQ(uni->dimensions.cols, 1u);
-    ASSERT_EQ(uni->location, 12u);
-    ASSERT_EQ(uni->type, RuntimeUniformType::kFloat);
-  }
-  {
-    auto uni = stage.GetUniform("u_circle3");
-    ASSERT_NE(uni, nullptr);
-    ASSERT_EQ(uni->dimensions.rows, 2u);
-    ASSERT_EQ(uni->dimensions.cols, 1u);
-    ASSERT_EQ(uni->location, 13u);
-    ASSERT_EQ(uni->type, RuntimeUniformType::kFloat);
-  }
-  {
-    auto uni = stage.GetUniform("u_rotation1");
-    ASSERT_NE(uni, nullptr);
-    ASSERT_EQ(uni->dimensions.rows, 2u);
-    ASSERT_EQ(uni->dimensions.cols, 1u);
-    ASSERT_EQ(uni->location, 14u);
-    ASSERT_EQ(uni->type, RuntimeUniformType::kFloat);
-  }
-  {
-    auto uni = stage.GetUniform("u_rotation2");
-    ASSERT_NE(uni, nullptr);
-    ASSERT_EQ(uni->dimensions.rows, 2u);
-    ASSERT_EQ(uni->dimensions.cols, 1u);
-    ASSERT_EQ(uni->location, 15u);
-    ASSERT_EQ(uni->type, RuntimeUniformType::kFloat);
-  }
-  {
-    auto uni = stage.GetUniform("u_rotation3");
-    ASSERT_NE(uni, nullptr);
-    ASSERT_EQ(uni->dimensions.rows, 2u);
-    ASSERT_EQ(uni->dimensions.cols, 1u);
-    ASSERT_EQ(uni->location, 16u);
-    ASSERT_EQ(uni->type, RuntimeUniformType::kFloat);
+  ASSERT_TRUE(stage->IsValid());
+  switch (GetBackend()) {
+    case PlaygroundBackend::kMetal:
+    case PlaygroundBackend::kOpenGLES: {
+      ASSERT_EQ(stage->GetUniforms().size(), 17u);
+      {
+        auto uni = stage->GetUniform("u_color");
+        ASSERT_NE(uni, nullptr);
+        EXPECT_EQ(uni->dimensions.rows, 4u);
+        EXPECT_EQ(uni->dimensions.cols, 1u);
+        EXPECT_EQ(uni->location, 0u);
+        EXPECT_EQ(uni->type, RuntimeUniformType::kFloat);
+      }
+      {
+        auto uni = stage->GetUniform("u_alpha");
+        ASSERT_NE(uni, nullptr);
+        EXPECT_EQ(uni->dimensions.rows, 1u);
+        EXPECT_EQ(uni->dimensions.cols, 1u);
+        EXPECT_EQ(uni->location, 1u);
+        EXPECT_EQ(uni->type, RuntimeUniformType::kFloat);
+      }
+      {
+        auto uni = stage->GetUniform("u_sparkle_color");
+        ASSERT_NE(uni, nullptr);
+        EXPECT_EQ(uni->dimensions.rows, 4u);
+        EXPECT_EQ(uni->dimensions.cols, 1u);
+        EXPECT_EQ(uni->location, 2u);
+        EXPECT_EQ(uni->type, RuntimeUniformType::kFloat);
+      }
+      {
+        auto uni = stage->GetUniform("u_sparkle_alpha");
+        ASSERT_NE(uni, nullptr);
+        EXPECT_EQ(uni->dimensions.rows, 1u);
+        EXPECT_EQ(uni->dimensions.cols, 1u);
+        EXPECT_EQ(uni->location, 3u);
+        EXPECT_EQ(uni->type, RuntimeUniformType::kFloat);
+      }
+      {
+        auto uni = stage->GetUniform("u_blur");
+        ASSERT_NE(uni, nullptr);
+        EXPECT_EQ(uni->dimensions.rows, 1u);
+        EXPECT_EQ(uni->dimensions.cols, 1u);
+        EXPECT_EQ(uni->location, 4u);
+        EXPECT_EQ(uni->type, RuntimeUniformType::kFloat);
+      }
+      {
+        auto uni = stage->GetUniform("u_radius_scale");
+        ASSERT_NE(uni, nullptr);
+        EXPECT_EQ(uni->dimensions.rows, 1u);
+        EXPECT_EQ(uni->dimensions.cols, 1u);
+        EXPECT_EQ(uni->location, 6u);
+        EXPECT_EQ(uni->type, RuntimeUniformType::kFloat);
+      }
+      {
+        auto uni = stage->GetUniform("u_max_radius");
+        ASSERT_NE(uni, nullptr);
+        EXPECT_EQ(uni->dimensions.rows, 1u);
+        EXPECT_EQ(uni->dimensions.cols, 1u);
+        EXPECT_EQ(uni->location, 7u);
+        EXPECT_EQ(uni->type, RuntimeUniformType::kFloat);
+      }
+      {
+        auto uni = stage->GetUniform("u_resolution_scale");
+        ASSERT_NE(uni, nullptr);
+        EXPECT_EQ(uni->dimensions.rows, 2u);
+        EXPECT_EQ(uni->dimensions.cols, 1u);
+        EXPECT_EQ(uni->location, 8u);
+        EXPECT_EQ(uni->type, RuntimeUniformType::kFloat);
+      }
+      {
+        auto uni = stage->GetUniform("u_noise_scale");
+        ASSERT_NE(uni, nullptr);
+        EXPECT_EQ(uni->dimensions.rows, 2u);
+        EXPECT_EQ(uni->dimensions.cols, 1u);
+        EXPECT_EQ(uni->location, 9u);
+        EXPECT_EQ(uni->type, RuntimeUniformType::kFloat);
+      }
+      {
+        auto uni = stage->GetUniform("u_noise_phase");
+        ASSERT_NE(uni, nullptr);
+        EXPECT_EQ(uni->dimensions.rows, 1u);
+        EXPECT_EQ(uni->dimensions.cols, 1u);
+        EXPECT_EQ(uni->location, 10u);
+        EXPECT_EQ(uni->type, RuntimeUniformType::kFloat);
+      }
+
+      {
+        auto uni = stage->GetUniform("u_circle1");
+        ASSERT_NE(uni, nullptr);
+        EXPECT_EQ(uni->dimensions.rows, 2u);
+        EXPECT_EQ(uni->dimensions.cols, 1u);
+        EXPECT_EQ(uni->location, 11u);
+        EXPECT_EQ(uni->type, RuntimeUniformType::kFloat);
+      }
+      {
+        auto uni = stage->GetUniform("u_circle2");
+        ASSERT_NE(uni, nullptr);
+        EXPECT_EQ(uni->dimensions.rows, 2u);
+        EXPECT_EQ(uni->dimensions.cols, 1u);
+        EXPECT_EQ(uni->location, 12u);
+        EXPECT_EQ(uni->type, RuntimeUniformType::kFloat);
+      }
+      {
+        auto uni = stage->GetUniform("u_circle3");
+        ASSERT_NE(uni, nullptr);
+        EXPECT_EQ(uni->dimensions.rows, 2u);
+        EXPECT_EQ(uni->dimensions.cols, 1u);
+        EXPECT_EQ(uni->location, 13u);
+        EXPECT_EQ(uni->type, RuntimeUniformType::kFloat);
+      }
+      {
+        auto uni = stage->GetUniform("u_rotation1");
+        ASSERT_NE(uni, nullptr);
+        EXPECT_EQ(uni->dimensions.rows, 2u);
+        EXPECT_EQ(uni->dimensions.cols, 1u);
+        EXPECT_EQ(uni->location, 14u);
+        EXPECT_EQ(uni->type, RuntimeUniformType::kFloat);
+      }
+      {
+        auto uni = stage->GetUniform("u_rotation2");
+        ASSERT_NE(uni, nullptr);
+        EXPECT_EQ(uni->dimensions.rows, 2u);
+        EXPECT_EQ(uni->dimensions.cols, 1u);
+        EXPECT_EQ(uni->location, 15u);
+        EXPECT_EQ(uni->type, RuntimeUniformType::kFloat);
+      }
+      {
+        auto uni = stage->GetUniform("u_rotation3");
+        ASSERT_NE(uni, nullptr);
+        EXPECT_EQ(uni->dimensions.rows, 2u);
+        EXPECT_EQ(uni->dimensions.cols, 1u);
+        EXPECT_EQ(uni->location, 16u);
+        EXPECT_EQ(uni->type, RuntimeUniformType::kFloat);
+      }
+      break;
+    }
+    case PlaygroundBackend::kVulkan: {
+      EXPECT_EQ(stage->GetUniforms().size(), 1u);
+      auto uni = stage->GetUniform(RuntimeStage::kVulkanUBOName);
+      ASSERT_TRUE(uni);
+      EXPECT_EQ(uni->type, RuntimeUniformType::kStruct);
+      EXPECT_EQ(uni->struct_float_count, 32u);
+
+      // There are 36 4 byte chunks in the UBO: 32 for the 32 floats, and 4 for
+      // padding. Initialize a vector as if they'll all be floats, then manually
+      // set the few padding bytes. If the shader changes, the padding locations
+      // will change as well. For example, if `u_alpha` was moved to the end,
+      // three bytes of padding could potentially be dropped - or if some of the
+      // scalar floats were changed to vec2 or vec4s, or if any vec3s are
+      // introduced.
+      // This means 36 * 4 = 144 bytes total.
+
+      EXPECT_EQ(uni->GetSize(), 144u);
+      std::vector<uint8_t> layout(uni->GetSize() / sizeof(float), 1);
+      layout[5] = 0;
+      layout[6] = 0;
+      layout[7] = 0;
+      layout[23] = 0;
+
+      EXPECT_THAT(uni->struct_layout, ::testing::ElementsAreArray(layout));
+      break;
+    }
   }
 }
 
 TEST_P(RuntimeStageTest, CanRegisterStage) {
-  if (GetParam() != PlaygroundBackend::kMetal) {
-    GTEST_SKIP_("Skipped: https://github.com/flutter/flutter/issues/105538");
-  }
-  auto fixture =
+  const std::shared_ptr<fml::Mapping> fixture =
       flutter::testing::OpenFixtureAsMapping("ink_sparkle.frag.iplr");
   ASSERT_TRUE(fixture);
   ASSERT_GT(fixture->GetSize(), 0u);
-  RuntimeStage stage(std::move(fixture));
-  ASSERT_TRUE(stage.IsValid());
+  auto stages = RuntimeStage::DecodeRuntimeStages(fixture);
+  auto stage = stages[PlaygroundBackendToRuntimeStageBackend(GetBackend())];
+  ASSERT_TRUE(stage->IsValid());
   std::promise<bool> registration;
   auto future = registration.get_future();
   auto library = GetContext()->GetShaderLibrary();
   library->RegisterFunction(
-      stage.GetEntrypoint(),                  //
-      ToShaderStage(stage.GetShaderStage()),  //
-      stage.GetCodeMapping(),                 //
+      stage->GetEntrypoint(),                  //
+      ToShaderStage(stage->GetShaderStage()),  //
+      stage->GetCodeMapping(),                 //
       fml::MakeCopyable([reg = std::move(registration)](bool result) mutable {
         reg.set_value(result);
       }));
   ASSERT_TRUE(future.get());
   {
     auto function =
-        library->GetFunction(stage.GetEntrypoint(), ShaderStage::kFragment);
+        library->GetFunction(stage->GetEntrypoint(), ShaderStage::kFragment);
     ASSERT_NE(function, nullptr);
   }
 
   // Check if unregistering works.
 
-  library->UnregisterFunction(stage.GetEntrypoint(), ShaderStage::kFragment);
+  library->UnregisterFunction(stage->GetEntrypoint(), ShaderStage::kFragment);
   {
     auto function =
-        library->GetFunction(stage.GetEntrypoint(), ShaderStage::kFragment);
+        library->GetFunction(stage->GetEntrypoint(), ShaderStage::kFragment);
     ASSERT_EQ(function, nullptr);
   }
 }
 
 TEST_P(RuntimeStageTest, CanCreatePipelineFromRuntimeStage) {
-  if (GetParam() != PlaygroundBackend::kMetal) {
-    GTEST_SKIP_("Skipped: https://github.com/flutter/flutter/issues/105538");
-  }
-  auto stage = OpenAssetAsRuntimeStage("ink_sparkle.frag.iplr");
+  auto stages = OpenAssetAsRuntimeStage("ink_sparkle.frag.iplr");
+  auto stage = stages[PlaygroundBackendToRuntimeStageBackend(GetBackend())];
+
+  ASSERT_TRUE(stage);
   ASSERT_NE(stage, nullptr);
   ASSERT_TRUE(RegisterStage(*stage));
   auto library = GetContext()->GetShaderLibrary();
-  using VS = SimpleVertexShader;
+  using VS = RuntimeEffectVertexShader;
   PipelineDescriptor desc;
   desc.SetLabel("Runtime Stage InkSparkle");
   desc.AddStageEntrypoint(
@@ -239,18 +275,45 @@ TEST_P(RuntimeStageTest, CanCreatePipelineFromRuntimeStage) {
   desc.AddStageEntrypoint(
       library->GetFunction(stage->GetEntrypoint(), ShaderStage::kFragment));
   auto vertex_descriptor = std::make_shared<VertexDescriptor>();
-  ASSERT_TRUE(vertex_descriptor->SetStageInputs(VS::kAllShaderStageInputs));
+  vertex_descriptor->SetStageInputs(VS::kAllShaderStageInputs,
+                                    VS::kInterleavedBufferLayout);
+
+  std::array<DescriptorSetLayout, 2> descriptor_set_layouts = {
+      VS::kDescriptorSetLayouts[0],
+      DescriptorSetLayout{
+          .binding = 64u,
+          .descriptor_type = DescriptorType::kUniformBuffer,
+          .shader_stage = ShaderStage::kFragment,
+      },
+  };
+  vertex_descriptor->RegisterDescriptorSetLayouts(descriptor_set_layouts);
+
   desc.SetVertexDescriptor(std::move(vertex_descriptor));
   ColorAttachmentDescriptor color0;
-  color0.format = PixelFormat::kDefaultColor;
+  color0.format = GetContext()->GetCapabilities()->GetDefaultColorFormat();
   StencilAttachmentDescriptor stencil0;
   stencil0.stencil_compare = CompareFunction::kEqual;
   desc.SetColorAttachmentDescriptor(0u, color0);
   desc.SetStencilAttachmentDescriptors(stencil0);
-  desc.SetStencilPixelFormat(PixelFormat::kDefaultStencil);
+  const auto stencil_fmt =
+      GetContext()->GetCapabilities()->GetDefaultStencilFormat();
+  desc.SetStencilPixelFormat(stencil_fmt);
   auto pipeline = GetContext()->GetPipelineLibrary()->GetPipeline(desc).Get();
   ASSERT_NE(pipeline, nullptr);
 }
 
+TEST_P(RuntimeStageTest, ContainsExpectedShaderTypes) {
+  auto stages = OpenAssetAsRuntimeStage("ink_sparkle.frag.iplr");
+  // Right now, SkSL gets implicitly bundled regardless of what the build rule
+  // for this test requested. After
+  // https://github.com/flutter/flutter/issues/138919, this may require a build
+  // rule change or a new test.
+  EXPECT_TRUE(stages[RuntimeStageBackend::kSkSL]);
+
+  EXPECT_TRUE(stages[RuntimeStageBackend::kOpenGLES]);
+  EXPECT_TRUE(stages[RuntimeStageBackend::kMetal]);
+  EXPECT_TRUE(stages[RuntimeStageBackend::kVulkan]);
+}
+
 }  // namespace testing
 }  // namespace impeller
diff --git a/impeller/scene/BUILD.gn b/impeller/scene/BUILD.gn
index 30f45eadee10952d4a9434f2a40ace1e36e94639..d937166b1ff2145474090b1bce92b64477d46087 100644
--- a/impeller/scene/BUILD.gn
+++ b/impeller/scene/BUILD.gn
@@ -6,26 +6,40 @@ import("//flutter/impeller/tools/impeller.gni")
 
 impeller_component("scene") {
   sources = [
+    "animation/animation.cc",
+    "animation/animation.h",
+    "animation/animation_clip.cc",
+    "animation/animation_clip.h",
+    "animation/animation_player.cc",
+    "animation/animation_player.h",
+    "animation/animation_transforms.h",
+    "animation/property_resolver.cc",
+    "animation/property_resolver.h",
     "camera.cc",
     "camera.h",
     "geometry.cc",
     "geometry.h",
     "material.cc",
     "material.h",
+    "mesh.cc",
+    "mesh.h",
+    "node.cc",
+    "node.h",
+    "pipeline_key.h",
     "scene.cc",
     "scene.h",
     "scene_context.cc",
     "scene_context.h",
     "scene_encoder.cc",
     "scene_encoder.h",
-    "scene_entity.cc",
-    "scene_entity.h",
-    "static_mesh_entity.cc",
-    "static_mesh_entity.h",
+    "skin.cc",
+    "skin.h",
   ]
 
   public_deps = [
     "../renderer",
+    "importer:conversions",
+    "importer:importer_flatbuffers",
     "shaders",
   ]
 
@@ -42,7 +56,5 @@ impeller_component("scene_unittests") {
     "../fixtures",
     "../playground:playground_test",
     "//flutter/testing:testing_lib",
-
-    #"//third_party/tinygltf",
   ]
 }
diff --git a/impeller/scene/README.md b/impeller/scene/README.md
index c17299293cacde63a0505955162a802e47c978e6..228a0be0491af0b8b0c7904020485f639441ef7d 100644
--- a/impeller/scene/README.md
+++ b/impeller/scene/README.md
@@ -43,30 +43,28 @@ run_action.SetLoop(impeller::scene::AnimationAction::kLoopForever);
 run_action.SetWeight(0.3f);
 run_action.Play();
 
-scene.Add(
+scene.GetRoot().AddChild(
     impeller::scene::DirectionalLight(
         /* color */ impeller::Color::AntiqueWhite(),
         /* intensity */ 5,
         /* direction */ {2, 3, 4}));
 
-impeller::scene::StaticMeshEntity sphere_entity;
-sphere_entity.SetGlobalTransform(
+Node sphere_node;
+Mesh sphere_mesh;
+sphere_node.SetGlobalTransform(
     Matrix::MakeRotationEuler({kPiOver4, kPiOver4, 0}));
-sphere_entity.SetCullingMode(impeller::scene::CullingMode::kFrustum);
 
-std::unique_ptr<impeller::scene::SphereGeometry> sphere =
+auto sphere_geometry =
     impeller::scene::Geometry::MakeSphere(allocator, /* radius */ 2);
 
-sphere_entity.SetGeometry(sphere);
-
 auto material = impeller::scene::Material::MakeStandard();
-material.SetAlbedo(impeller::Color::Red());
-material.SetRoughness(0.4);
-material.SetMetallic(0.2);
+material->SetAlbedo(impeller::Color::Red());
+material->SetRoughness(0.4);
+material->SetMetallic(0.2);
 // Common properties shared by all materials.
-material.SetEnvironmentMap(environment_hdri);
-material.SetFlatShaded(true);
-material.SetBlendConfig({
+material->SetEnvironmentMap(environment_hdri);
+material->SetFlatShaded(true);
+material->SetBlendConfig({
   impeller::BlendOperation::kAdd,               // color_op
   impeller::BlendFactor::kOne,                  // source_color_factor
   impeller::BlendFactor::kOneMinusSourceAlpha,  // destination_color_factor
@@ -74,23 +72,23 @@ material.SetBlendConfig({
   impeller::BlendFactor::kOne,                  // source_alpha_factor
   impeller::BlendFactor::kOneMinusSourceAlpha,  // destination_alpha_factor
 });
-material.SetStencilConfig({
+material->SetStencilConfig({
   impeller::StencilOperation::kIncrementClamp,  // operation
   impeller::CompareFunction::kAlways,           // compare
 });
-
-sphere_entity->SetMaterials({material});
-
-
-impeller::scene::StaticMeshEntity cube_entity;
-cube_entity.GetGeometry(
-    impeller::scene::Geometry::MakeCube(allocator, {4, 4, 4}));
-cube_entity.SetMaterials({material});
-
-cube_entity.SetLocalTransform(Matrix::MakeTranslation({4, 0, 0}));
-
-sphere_entity->Add(sube_entity);
-scene.Add(sphere_entity);
+sphere_mesh.AddPrimitive({sphere_geometry, material});
+sphere_node.SetMesh(sphere_mesh);
+
+Node cube_node;
+cube_node.SetLocalTransform(Matrix::MakeTranslation({4, 0, 0}));
+Mesh cube_mesh;
+auto cube_geometry = impeller::scene::Geometry::MakeCuboid(
+    allocator, {4, 4, 4});
+cube_mesh.AddPrimitive({cube_geometry, material});
+cube_node.SetMesh(cube_mesh);
+
+sphere_node.AddChild(cube_node);
+scene.GetRoot().AddChild(sphere_node);
 
 /// Post processing.
 
diff --git a/impeller/scene/animation/animation.cc b/impeller/scene/animation/animation.cc
new file mode 100644
index 0000000000000000000000000000000000000000..536a3a41595f7ff2e0b71d71ce3c08161fee6c34
--- /dev/null
+++ b/impeller/scene/animation/animation.cc
@@ -0,0 +1,125 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/scene/animation/animation.h"
+
+#include <algorithm>
+#include <cstring>
+#include <memory>
+#include <vector>
+
+#include "impeller/geometry/quaternion.h"
+#include "impeller/scene/importer/scene_flatbuffers.h"
+#include "impeller/scene/node.h"
+
+namespace impeller {
+namespace scene {
+
+std::shared_ptr<Animation> Animation::MakeFromFlatbuffer(
+    const fb::Animation& animation,
+    const std::vector<std::shared_ptr<Node>>& scene_nodes) {
+  auto result = std::shared_ptr<Animation>(new Animation());
+
+  result->name_ = animation.name()->str();
+  for (auto channel : *animation.channels()) {
+    if (channel->node() < 0 ||
+        static_cast<size_t>(channel->node()) >= scene_nodes.size() ||
+        !channel->timeline()) {
+      continue;
+    }
+
+    Animation::Channel out_channel;
+    out_channel.bind_target.node_name = scene_nodes[channel->node()]->GetName();
+
+    auto* times = channel->timeline();
+    std::vector<Scalar> out_times;
+    out_times.resize(channel->timeline()->size());
+    std::copy(times->begin(), times->end(), out_times.begin());
+
+    // TODO(bdero): Why are the entries in the keyframe value arrays not
+    //              contiguous in the flatbuffer? We should be able to get rid
+    //              of the subloops below and just memcpy instead.
+    switch (channel->keyframes_type()) {
+      case fb::Keyframes::TranslationKeyframes: {
+        out_channel.bind_target.property = Animation::Property::kTranslation;
+        auto* keyframes = channel->keyframes_as_TranslationKeyframes();
+        if (!keyframes->values()) {
+          continue;
+        }
+        std::vector<Vector3> out_values;
+        out_values.resize(keyframes->values()->size());
+        for (size_t value_i = 0; value_i < keyframes->values()->size();
+             value_i++) {
+          auto val = (*keyframes->values())[value_i];
+          out_values[value_i] = Vector3(val->x(), val->y(), val->z());
+        }
+        out_channel.resolver = PropertyResolver::MakeTranslationTimeline(
+            std::move(out_times), std::move(out_values));
+        break;
+      }
+      case fb::Keyframes::RotationKeyframes: {
+        out_channel.bind_target.property = Animation::Property::kRotation;
+        auto* keyframes = channel->keyframes_as_RotationKeyframes();
+        if (!keyframes->values()) {
+          continue;
+        }
+        std::vector<Quaternion> out_values;
+        out_values.resize(keyframes->values()->size());
+        for (size_t value_i = 0; value_i < keyframes->values()->size();
+             value_i++) {
+          auto val = (*keyframes->values())[value_i];
+          out_values[value_i] =
+              Quaternion(val->x(), val->y(), val->z(), val->w());
+        }
+        out_channel.resolver = PropertyResolver::MakeRotationTimeline(
+            std::move(out_times), std::move(out_values));
+        break;
+      }
+      case fb::Keyframes::ScaleKeyframes: {
+        out_channel.bind_target.property = Animation::Property::kScale;
+        auto* keyframes = channel->keyframes_as_ScaleKeyframes();
+        if (!keyframes->values()) {
+          continue;
+        }
+        std::vector<Vector3> out_values;
+        out_values.resize(keyframes->values()->size());
+        for (size_t value_i = 0; value_i < keyframes->values()->size();
+             value_i++) {
+          auto val = (*keyframes->values())[value_i];
+          out_values[value_i] = Vector3(val->x(), val->y(), val->z());
+        }
+        out_channel.resolver = PropertyResolver::MakeScaleTimeline(
+            std::move(out_times), std::move(out_values));
+        break;
+      }
+      case fb::Keyframes::NONE:
+        continue;
+    }
+
+    result->end_time_ =
+        std::max(result->end_time_, out_channel.resolver->GetEndTime());
+    result->channels_.push_back(std::move(out_channel));
+  }
+
+  return result;
+}
+
+Animation::Animation() = default;
+
+Animation::~Animation() = default;
+
+const std::string& Animation::GetName() const {
+  return name_;
+}
+
+const std::vector<Animation::Channel>& Animation::GetChannels() const {
+  return channels_;
+}
+
+SecondsF Animation::GetEndTime() const {
+  return end_time_;
+}
+
+}  // namespace scene
+}  // namespace impeller
diff --git a/impeller/scene/animation/animation.h b/impeller/scene/animation/animation.h
new file mode 100644
index 0000000000000000000000000000000000000000..09ebfac3f88170536dc6b486bf5588b60464e37b
--- /dev/null
+++ b/impeller/scene/animation/animation.h
@@ -0,0 +1,82 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_SCENE_ANIMATION_ANIMATION_H_
+#define FLUTTER_IMPELLER_SCENE_ANIMATION_ANIMATION_H_
+
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "flutter/fml/hash_combine.h"
+#include "flutter/fml/macros.h"
+#include "impeller/base/timing.h"
+#include "impeller/geometry/quaternion.h"
+#include "impeller/geometry/scalar.h"
+#include "impeller/geometry/vector.h"
+#include "impeller/scene/animation/property_resolver.h"
+#include "impeller/scene/importer/scene_flatbuffers.h"
+
+namespace impeller {
+namespace scene {
+
+class Node;
+
+class Animation final {
+ public:
+  static std::shared_ptr<Animation> MakeFromFlatbuffer(
+      const fb::Animation& animation,
+      const std::vector<std::shared_ptr<Node>>& scene_nodes);
+
+  enum class Property {
+    kTranslation,
+    kRotation,
+    kScale,
+  };
+
+  struct BindKey {
+    std::string node_name;
+    Property property = Property::kTranslation;
+
+    struct Hash {
+      std::size_t operator()(const BindKey& o) const {
+        return fml::HashCombine(o.node_name, o.property);
+      }
+    };
+
+    struct Equal {
+      bool operator()(const BindKey& lhs, const BindKey& rhs) const {
+        return lhs.node_name == rhs.node_name && lhs.property == rhs.property;
+      }
+    };
+  };
+
+  struct Channel {
+    BindKey bind_target;
+    std::unique_ptr<PropertyResolver> resolver;
+  };
+  ~Animation();
+
+  const std::string& GetName() const;
+
+  const std::vector<Channel>& GetChannels() const;
+
+  SecondsF GetEndTime() const;
+
+ private:
+  Animation();
+
+  std::string name_;
+  std::vector<Channel> channels_;
+  SecondsF end_time_;
+
+  Animation(const Animation&) = delete;
+
+  Animation& operator=(const Animation&) = delete;
+};
+
+}  // namespace scene
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_SCENE_ANIMATION_ANIMATION_H_
diff --git a/impeller/scene/animation/animation_clip.cc b/impeller/scene/animation/animation_clip.cc
new file mode 100644
index 0000000000000000000000000000000000000000..4a03bf58ba5b50e94279aada9b40cd6052f06c54
--- /dev/null
+++ b/impeller/scene/animation/animation_clip.cc
@@ -0,0 +1,147 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/scene/animation/animation_clip.h"
+
+#include <algorithm>
+#include <cmath>
+#include <memory>
+#include <valarray>
+
+#include "impeller/scene/node.h"
+
+namespace impeller {
+namespace scene {
+
+AnimationClip::AnimationClip(std::shared_ptr<Animation> animation,
+                             Node* bind_target)
+    : animation_(std::move(animation)) {
+  BindToTarget(bind_target);
+}
+
+AnimationClip::~AnimationClip() = default;
+
+AnimationClip::AnimationClip(AnimationClip&&) = default;
+AnimationClip& AnimationClip::operator=(AnimationClip&&) = default;
+
+bool AnimationClip::IsPlaying() const {
+  return playing_;
+}
+
+void AnimationClip::SetPlaying(bool playing) {
+  playing_ = playing;
+}
+
+void AnimationClip::Play() {
+  SetPlaying(true);
+}
+
+void AnimationClip::Pause() {
+  SetPlaying(false);
+}
+
+void AnimationClip::Stop() {
+  SetPlaying(false);
+  Seek(SecondsF::zero());
+}
+
+bool AnimationClip::GetLoop() const {
+  return loop_;
+}
+
+void AnimationClip::SetLoop(bool looping) {
+  loop_ = looping;
+}
+
+Scalar AnimationClip::GetPlaybackTimeScale() const {
+  return playback_time_scale_;
+}
+
+void AnimationClip::SetPlaybackTimeScale(Scalar playback_speed) {
+  playback_time_scale_ = playback_speed;
+}
+
+Scalar AnimationClip::GetWeight() const {
+  return weight_;
+}
+
+void AnimationClip::SetWeight(Scalar weight) {
+  weight_ = std::max(0.0f, weight);
+}
+
+SecondsF AnimationClip::GetPlaybackTime() const {
+  return playback_time_;
+}
+
+void AnimationClip::Seek(SecondsF time) {
+  playback_time_ = std::clamp(time, SecondsF::zero(), animation_->GetEndTime());
+}
+
+void AnimationClip::Advance(SecondsF delta_time) {
+  if (!playing_ || delta_time <= SecondsF::zero()) {
+    return;
+  }
+  delta_time *= playback_time_scale_;
+  playback_time_ += delta_time;
+
+  /// Handle looping behavior.
+
+  auto end_time = animation_->GetEndTime();
+  if (end_time == SecondsF::zero()) {
+    playback_time_ = SecondsF::zero();
+    return;
+  }
+  if (!loop_ &&
+      (playback_time_ < SecondsF::zero() || playback_time_ > end_time)) {
+    // If looping is disabled, clamp to the end (or beginning, if playing in
+    // reverse) and pause.
+    Pause();
+    playback_time_ = std::clamp(playback_time_, SecondsF::zero(), end_time);
+  } else if (/* loop && */ playback_time_ > end_time) {
+    // If looping is enabled and we ran off the end, loop to the beginning.
+    playback_time_ =
+        SecondsF(std::fmod(std::abs(playback_time_.count()), end_time.count()));
+  } else if (/* loop && */ playback_time_ < SecondsF::zero()) {
+    // If looping is enabled and we ran off the beginning, loop to the end.
+    playback_time_ =
+        end_time -
+        SecondsF(std::fmod(std::abs(playback_time_.count()), end_time.count()));
+  }
+}
+
+void AnimationClip::ApplyToBindings(
+    std::unordered_map<Node*, AnimationTransforms>& transform_decomps,
+    Scalar weight_multiplier) const {
+  for (auto& binding : bindings_) {
+    auto transforms = transform_decomps.find(binding.node);
+    if (transforms == transform_decomps.end()) {
+      continue;
+    }
+    binding.channel.resolver->Apply(transforms->second, playback_time_,
+                                    weight_ * weight_multiplier);
+  }
+}
+
+void AnimationClip::BindToTarget(Node* node) {
+  const auto& channels = animation_->GetChannels();
+  bindings_.clear();
+  bindings_.reserve(channels.size());
+
+  for (const auto& channel : channels) {
+    Node* channel_target;
+    if (channel.bind_target.node_name == node->GetName()) {
+      channel_target = node;
+    } else if (auto result =
+                   node->FindChildByName(channel.bind_target.node_name, true)) {
+      channel_target = result.get();
+    } else {
+      continue;
+    }
+    bindings_.push_back(
+        ChannelBinding{.channel = channel, .node = channel_target});
+  }
+}
+
+}  // namespace scene
+}  // namespace impeller
diff --git a/impeller/scene/animation/animation_clip.h b/impeller/scene/animation/animation_clip.h
new file mode 100644
index 0000000000000000000000000000000000000000..35c3339ae8514990d214cb69883cc5923895ce16
--- /dev/null
+++ b/impeller/scene/animation/animation_clip.h
@@ -0,0 +1,97 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_SCENE_ANIMATION_ANIMATION_CLIP_H_
+#define FLUTTER_IMPELLER_SCENE_ANIMATION_ANIMATION_CLIP_H_
+
+#include <memory>
+#include <unordered_map>
+#include <vector>
+
+#include "flutter/fml/macros.h"
+#include "impeller/scene/animation/animation.h"
+#include "impeller/scene/animation/animation_transforms.h"
+
+namespace impeller {
+namespace scene {
+
+class Node;
+class AnimationPlayer;
+
+class AnimationClip final {
+ public:
+  AnimationClip(std::shared_ptr<Animation> animation, Node* bind_target);
+  ~AnimationClip();
+
+  AnimationClip(AnimationClip&&);
+  AnimationClip& operator=(AnimationClip&&);
+
+  bool IsPlaying() const;
+
+  void SetPlaying(bool playing);
+
+  void Play();
+
+  void Pause();
+
+  void Stop();
+
+  bool GetLoop() const;
+
+  void SetLoop(bool looping);
+
+  Scalar GetPlaybackTimeScale() const;
+
+  /// @brief  Sets the animation playback speed. Negative values make the clip
+  ///         play in reverse.
+  void SetPlaybackTimeScale(Scalar playback_speed);
+
+  Scalar GetWeight() const;
+
+  void SetWeight(Scalar weight);
+
+  /// @brief  Get the current playback time of the animation.
+  SecondsF GetPlaybackTime() const;
+
+  /// @brief  Move the animation to the specified time. The given `time` is
+  ///         clamped to the animation's playback range.
+  void Seek(SecondsF time);
+
+  /// @brief  Advance the animation by `delta_time` seconds. Negative
+  ///         `delta_time` values do nothing.
+  void Advance(SecondsF delta_time);
+
+  /// @brief  Applies the animation to all binded properties in the scene.
+  void ApplyToBindings(
+      std::unordered_map<Node*, AnimationTransforms>& transform_decomps,
+      Scalar weight_multiplier) const;
+
+ private:
+  void BindToTarget(Node* node);
+
+  struct ChannelBinding {
+    const Animation::Channel& channel;
+    Node* node;
+  };
+
+  std::shared_ptr<Animation> animation_;
+  std::vector<ChannelBinding> bindings_;
+
+  SecondsF playback_time_;
+  Scalar playback_time_scale_ = 1;  // Seconds multiplier, can be negative.
+  Scalar weight_ = 1;
+  bool playing_ = false;
+  bool loop_ = false;
+
+  AnimationClip(const AnimationClip&) = delete;
+
+  AnimationClip& operator=(const AnimationClip&) = delete;
+
+  friend AnimationPlayer;
+};
+
+}  // namespace scene
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_SCENE_ANIMATION_ANIMATION_CLIP_H_
diff --git a/impeller/scene/animation/animation_player.cc b/impeller/scene/animation/animation_player.cc
new file mode 100644
index 0000000000000000000000000000000000000000..9fcf53306879f1f4855528bc886f349a567b640d
--- /dev/null
+++ b/impeller/scene/animation/animation_player.cc
@@ -0,0 +1,89 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/scene/animation/animation_player.h"
+
+#include <memory>
+#include <unordered_map>
+
+#include "flutter/fml/time/time_point.h"
+#include "impeller/base/timing.h"
+#include "impeller/scene/node.h"
+
+namespace impeller {
+namespace scene {
+
+AnimationPlayer::AnimationPlayer() = default;
+AnimationPlayer::~AnimationPlayer() = default;
+
+AnimationPlayer::AnimationPlayer(AnimationPlayer&&) = default;
+AnimationPlayer& AnimationPlayer::operator=(AnimationPlayer&&) = default;
+
+AnimationClip* AnimationPlayer::AddAnimation(
+    const std::shared_ptr<Animation>& animation,
+    Node* bind_target) {
+  if (!animation) {
+    VALIDATION_LOG << "Cannot add null animation.";
+    return nullptr;
+  }
+
+  AnimationClip clip(animation, bind_target);
+
+  // Record all of the unique default transforms that this AnimationClip
+  // will mutate.
+  for (const auto& binding : clip.bindings_) {
+    auto decomp = binding.node->GetLocalTransform().Decompose();
+    if (!decomp.has_value()) {
+      continue;
+    }
+    target_transforms_.insert(
+        {binding.node, AnimationTransforms{.bind_pose = decomp.value()}});
+  }
+
+  auto result = clips_.insert({animation->GetName(), std::move(clip)});
+  return &result.first->second;
+}
+
+AnimationClip* AnimationPlayer::GetClip(const std::string& name) const {
+  auto result = clips_.find(name);
+  if (result == clips_.end()) {
+    return nullptr;
+  }
+  return const_cast<AnimationClip*>(&result->second);
+}
+
+void AnimationPlayer::Update() {
+  if (!previous_time_.has_value()) {
+    previous_time_ = Clock::now();
+  }
+  auto new_time = Clock::now();
+  auto delta_time = new_time - previous_time_.value();
+  previous_time_ = new_time;
+
+  // Reset the animated pose state.
+  for (auto& [node, transforms] : target_transforms_) {
+    transforms.animated_pose = transforms.bind_pose;
+  }
+
+  // Compute a weight multiplier for normalizing the animation.
+  Scalar total_weight = 0;
+  for (auto& [_, clip] : clips_) {
+    total_weight += clip.GetWeight();
+  }
+  Scalar weight_multiplier = total_weight > 1 ? 1 / total_weight : 1;
+
+  // Update and apply all clips to the animation pose state.
+  for (auto& [_, clip] : clips_) {
+    clip.Advance(delta_time);
+    clip.ApplyToBindings(target_transforms_, weight_multiplier);
+  }
+
+  // Apply the animated pose to the bound joints.
+  for (auto& [node, transforms] : target_transforms_) {
+    node->SetLocalTransform(Matrix(transforms.animated_pose));
+  }
+}
+
+}  // namespace scene
+}  // namespace impeller
diff --git a/impeller/scene/animation/animation_player.h b/impeller/scene/animation/animation_player.h
new file mode 100644
index 0000000000000000000000000000000000000000..44878e1c3803cad98c896bce7ab65ca9abe99687
--- /dev/null
+++ b/impeller/scene/animation/animation_player.h
@@ -0,0 +1,57 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_SCENE_ANIMATION_ANIMATION_PLAYER_H_
+#define FLUTTER_IMPELLER_SCENE_ANIMATION_ANIMATION_PLAYER_H_
+
+#include <map>
+#include <memory>
+#include <optional>
+#include <vector>
+
+#include "flutter/fml/hash_combine.h"
+#include "flutter/fml/macros.h"
+#include "flutter/fml/time/time_delta.h"
+#include "impeller/base/timing.h"
+#include "impeller/geometry/matrix.h"
+#include "impeller/geometry/matrix_decomposition.h"
+#include "impeller/scene/animation/animation_clip.h"
+
+namespace impeller {
+namespace scene {
+
+class Node;
+
+class AnimationPlayer final {
+ public:
+  AnimationPlayer();
+  ~AnimationPlayer();
+
+  AnimationPlayer(AnimationPlayer&&);
+  AnimationPlayer& operator=(AnimationPlayer&&);
+
+  AnimationClip* AddAnimation(const std::shared_ptr<Animation>& animation,
+                              Node* bind_target);
+
+  AnimationClip* GetClip(const std::string& name) const;
+
+  /// @brief  Advanced all clips and updates animated properties in the scene.
+  void Update();
+
+ private:
+  std::unordered_map<Node*, AnimationTransforms> target_transforms_;
+
+  std::map<std::string, AnimationClip> clips_;
+
+  std::optional<TimePoint> previous_time_;
+
+  AnimationPlayer(const AnimationPlayer&) = delete;
+
+  AnimationPlayer& operator=(const AnimationPlayer&) = delete;
+};
+
+}  // namespace scene
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_SCENE_ANIMATION_ANIMATION_PLAYER_H_
diff --git a/impeller/scene/animation/animation_transforms.h b/impeller/scene/animation/animation_transforms.h
new file mode 100644
index 0000000000000000000000000000000000000000..59adb649384920fea9526fccf0fef30b1e73d8ae
--- /dev/null
+++ b/impeller/scene/animation/animation_transforms.h
@@ -0,0 +1,21 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_SCENE_ANIMATION_ANIMATION_TRANSFORMS_H_
+#define FLUTTER_IMPELLER_SCENE_ANIMATION_ANIMATION_TRANSFORMS_H_
+
+#include "impeller/geometry/matrix_decomposition.h"
+
+namespace impeller {
+namespace scene {
+
+struct AnimationTransforms {
+  MatrixDecomposition bind_pose;
+  MatrixDecomposition animated_pose;
+};
+
+}  // namespace scene
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_SCENE_ANIMATION_ANIMATION_TRANSFORMS_H_
diff --git a/impeller/scene/animation/property_resolver.cc b/impeller/scene/animation/property_resolver.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a43a308efdb75facc8fd83f191ff5f9021ebe055
--- /dev/null
+++ b/impeller/scene/animation/property_resolver.cc
@@ -0,0 +1,140 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/scene/animation/property_resolver.h"
+
+#include <algorithm>
+#include <iterator>
+#include <memory>
+
+#include "impeller/geometry/matrix_decomposition.h"
+#include "impeller/geometry/point.h"
+#include "impeller/scene/node.h"
+
+namespace impeller {
+namespace scene {
+
+std::unique_ptr<TranslationTimelineResolver>
+PropertyResolver::MakeTranslationTimeline(std::vector<Scalar> times,
+                                          std::vector<Vector3> values) {
+  FML_DCHECK(times.size() == values.size());
+  auto result = std::unique_ptr<TranslationTimelineResolver>(
+      new TranslationTimelineResolver());
+  result->times_ = std::move(times);
+  result->values_ = std::move(values);
+  return result;
+}
+
+std::unique_ptr<RotationTimelineResolver>
+PropertyResolver::MakeRotationTimeline(std::vector<Scalar> times,
+                                       std::vector<Quaternion> values) {
+  FML_DCHECK(times.size() == values.size());
+  auto result =
+      std::unique_ptr<RotationTimelineResolver>(new RotationTimelineResolver());
+  result->times_ = std::move(times);
+  result->values_ = std::move(values);
+  return result;
+}
+
+std::unique_ptr<ScaleTimelineResolver> PropertyResolver::MakeScaleTimeline(
+    std::vector<Scalar> times,
+    std::vector<Vector3> values) {
+  FML_DCHECK(times.size() == values.size());
+  auto result =
+      std::unique_ptr<ScaleTimelineResolver>(new ScaleTimelineResolver());
+  result->times_ = std::move(times);
+  result->values_ = std::move(values);
+  return result;
+}
+
+PropertyResolver::~PropertyResolver() = default;
+
+TimelineResolver::~TimelineResolver() = default;
+
+SecondsF TimelineResolver::GetEndTime() {
+  if (times_.empty()) {
+    return SecondsF::zero();
+  }
+  return SecondsF(times_.back());
+}
+
+TimelineResolver::TimelineKey TimelineResolver::GetTimelineKey(SecondsF time) {
+  if (times_.size() <= 1 || time.count() <= times_.front()) {
+    return {.index = 0, .lerp = 1};
+  }
+  if (time.count() >= times_.back()) {
+    return {.index = times_.size() - 1, .lerp = 1};
+  }
+  auto it = std::lower_bound(times_.begin(), times_.end(), time.count());
+  size_t index = std::distance(times_.begin(), it);
+
+  Scalar previous_time = *(it - 1);
+  Scalar next_time = *it;
+  return {.index = index,
+          .lerp = (time.count() - previous_time) / (next_time - previous_time)};
+}
+
+TranslationTimelineResolver::TranslationTimelineResolver() = default;
+
+TranslationTimelineResolver::~TranslationTimelineResolver() = default;
+
+void TranslationTimelineResolver::Apply(AnimationTransforms& target,
+                                        SecondsF time,
+                                        Scalar weight) {
+  if (values_.empty()) {
+    return;
+  }
+  auto key = GetTimelineKey(time);
+  auto value = values_[key.index];
+  if (key.lerp < 1) {
+    value = values_[key.index - 1].Lerp(value, key.lerp);
+  }
+
+  target.animated_pose.translation +=
+      (value - target.bind_pose.translation) * weight;
+}
+
+RotationTimelineResolver::RotationTimelineResolver() = default;
+
+RotationTimelineResolver::~RotationTimelineResolver() = default;
+
+void RotationTimelineResolver::Apply(AnimationTransforms& target,
+                                     SecondsF time,
+                                     Scalar weight) {
+  if (values_.empty()) {
+    return;
+  }
+  auto key = GetTimelineKey(time);
+  auto value = values_[key.index];
+  if (key.lerp < 1) {
+    value = values_[key.index - 1].Slerp(value, key.lerp);
+  }
+
+  target.animated_pose.rotation =
+      target.animated_pose.rotation *
+      Quaternion().Slerp(target.bind_pose.rotation.Invert() * value, weight);
+}
+
+ScaleTimelineResolver::ScaleTimelineResolver() = default;
+
+ScaleTimelineResolver::~ScaleTimelineResolver() = default;
+
+void ScaleTimelineResolver::Apply(AnimationTransforms& target,
+                                  SecondsF time,
+                                  Scalar weight) {
+  if (values_.empty()) {
+    return;
+  }
+  auto key = GetTimelineKey(time);
+  auto value = values_[key.index];
+  if (key.lerp < 1) {
+    value = values_[key.index - 1].Lerp(value, key.lerp);
+  }
+
+  target.animated_pose.scale *=
+      Vector3(1, 1, 1).Lerp(value / target.bind_pose.scale, weight);
+}
+
+}  // namespace scene
+}  // namespace impeller
diff --git a/impeller/scene/animation/property_resolver.h b/impeller/scene/animation/property_resolver.h
new file mode 100644
index 0000000000000000000000000000000000000000..722318d32d88c6910200d2eeff5be5bd29811b59
--- /dev/null
+++ b/impeller/scene/animation/property_resolver.h
@@ -0,0 +1,144 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_SCENE_ANIMATION_PROPERTY_RESOLVER_H_
+#define FLUTTER_IMPELLER_SCENE_ANIMATION_PROPERTY_RESOLVER_H_
+
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "flutter/fml/hash_combine.h"
+#include "flutter/fml/macros.h"
+#include "impeller/base/timing.h"
+#include "impeller/geometry/matrix_decomposition.h"
+#include "impeller/geometry/quaternion.h"
+#include "impeller/geometry/scalar.h"
+#include "impeller/geometry/vector.h"
+#include "impeller/scene/animation/animation_transforms.h"
+
+namespace impeller {
+namespace scene {
+
+class Node;
+class TranslationTimelineResolver;
+class RotationTimelineResolver;
+class ScaleTimelineResolver;
+
+class PropertyResolver {
+ public:
+  static std::unique_ptr<TranslationTimelineResolver> MakeTranslationTimeline(
+      std::vector<Scalar> times,
+      std::vector<Vector3> values);
+
+  static std::unique_ptr<RotationTimelineResolver> MakeRotationTimeline(
+      std::vector<Scalar> times,
+      std::vector<Quaternion> values);
+
+  static std::unique_ptr<ScaleTimelineResolver> MakeScaleTimeline(
+      std::vector<Scalar> times,
+      std::vector<Vector3> values);
+
+  virtual ~PropertyResolver();
+
+  virtual SecondsF GetEndTime() = 0;
+
+  /// @brief  Resolve and apply the property value to a target node. This
+  ///         operation is additive; a given node property may be amended by
+  ///         many different PropertyResolvers prior to rendering. For example,
+  ///         an AnimationPlayer may blend multiple Animations together by
+  ///         applying several AnimationClips.
+  virtual void Apply(AnimationTransforms& target,
+                     SecondsF time,
+                     Scalar weight) = 0;
+};
+
+class TimelineResolver : public PropertyResolver {
+ public:
+  virtual ~TimelineResolver();
+
+  // |Resolver|
+  SecondsF GetEndTime();
+
+ protected:
+  struct TimelineKey {
+    /// The index of the closest previous keyframe.
+    size_t index = 0;
+    /// Used to interpolate between the resolved values for `timeline_index - 1`
+    /// and `timeline_index`. The range of this value should always be `0>N>=1`.
+    Scalar lerp = 1;
+  };
+  TimelineKey GetTimelineKey(SecondsF time);
+
+  std::vector<Scalar> times_;
+};
+
+class TranslationTimelineResolver final : public TimelineResolver {
+ public:
+  ~TranslationTimelineResolver();
+
+  // |Resolver|
+  void Apply(AnimationTransforms& target,
+             SecondsF time,
+             Scalar weight) override;
+
+ private:
+  TranslationTimelineResolver();
+
+  std::vector<Vector3> values_;
+
+  TranslationTimelineResolver(const TranslationTimelineResolver&) = delete;
+
+  TranslationTimelineResolver& operator=(const TranslationTimelineResolver&) =
+      delete;
+
+  friend PropertyResolver;
+};
+
+class RotationTimelineResolver final : public TimelineResolver {
+ public:
+  ~RotationTimelineResolver();
+
+  // |Resolver|
+  void Apply(AnimationTransforms& target,
+             SecondsF time,
+             Scalar weight) override;
+
+ private:
+  RotationTimelineResolver();
+
+  std::vector<Quaternion> values_;
+
+  RotationTimelineResolver(const RotationTimelineResolver&) = delete;
+
+  RotationTimelineResolver& operator=(const RotationTimelineResolver&) = delete;
+
+  friend PropertyResolver;
+};
+
+class ScaleTimelineResolver final : public TimelineResolver {
+ public:
+  ~ScaleTimelineResolver();
+
+  // |Resolver|
+  void Apply(AnimationTransforms& target,
+             SecondsF time,
+             Scalar weight) override;
+
+ private:
+  ScaleTimelineResolver();
+
+  std::vector<Vector3> values_;
+
+  ScaleTimelineResolver(const ScaleTimelineResolver&) = delete;
+
+  ScaleTimelineResolver& operator=(const ScaleTimelineResolver&) = delete;
+
+  friend PropertyResolver;
+};
+
+}  // namespace scene
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_SCENE_ANIMATION_PROPERTY_RESOLVER_H_
diff --git a/impeller/scene/camera.cc b/impeller/scene/camera.cc
index b10673bd4899ce308df8ae0f9175a4c845ad9373..b4736177588f81a74c395aee08817d9e2c78ec9d 100644
--- a/impeller/scene/camera.cc
+++ b/impeller/scene/camera.cc
@@ -7,7 +7,7 @@
 namespace impeller {
 namespace scene {
 
-Camera Camera::MakePerspective(Scalar fov_y, Vector3 position) {
+Camera Camera::MakePerspective(Radians fov_y, Vector3 position) {
   Camera camera;
   camera.fov_y_ = fov_y;
   camera.position_ = position;
@@ -26,9 +26,8 @@ Matrix Camera::GetTransform(ISize target_size) const {
     return transform_.value();
   }
 
-  transform_ =
-      Matrix::MakePerspective(Radians(fov_y_), target_size, z_near_, z_far_) *
-      Matrix::MakeLookAt(position_, target_, up_).Invert();
+  transform_ = Matrix::MakePerspective(fov_y_, target_size, z_near_, z_far_) *
+               Matrix::MakeLookAt(position_, target_, up_);
 
   return transform_.value();
 }
diff --git a/impeller/scene/camera.h b/impeller/scene/camera.h
index 0eb02376ef68418303f2704d6d5c955e6602a1ce..3f833320dacb8544aff73722b1407419328eee99 100644
--- a/impeller/scene/camera.h
+++ b/impeller/scene/camera.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_SCENE_CAMERA_H_
+#define FLUTTER_IMPELLER_SCENE_CAMERA_H_
 
 #include <optional>
 
@@ -13,22 +14,24 @@ namespace scene {
 
 class Camera {
  public:
-  static Camera MakePerspective(Scalar fov_y, Vector3 position);
+  static Camera MakePerspective(Radians fov_y, Vector3 position);
 
   Camera LookAt(Vector3 target, Vector3 up = Vector3(0, -1, 0)) const;
 
   Matrix GetTransform(ISize target_size) const;
 
  private:
-  Scalar fov_y_ = 60;
+  Radians fov_y_ = Degrees(60);
   Vector3 position_ = Vector3();
   Vector3 target_ = Vector3(0, 0, -1);
   Vector3 up_ = Vector3(0, -1, 0);
-  Scalar z_near_ = 0.1;
-  Scalar z_far_ = 1000;
+  Scalar z_near_ = 0.1f;
+  Scalar z_far_ = 1000.0f;
 
   mutable std::optional<Matrix> transform_;
 };
 
 }  // namespace scene
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_SCENE_CAMERA_H_
diff --git a/impeller/scene/geometry.cc b/impeller/scene/geometry.cc
index 8a7bf01377aea16fac5734dbccb11cac6d87e855..00f7cfb665bb009cdff78540117c233bc3601b32 100644
--- a/impeller/scene/geometry.cc
+++ b/impeller/scene/geometry.cc
@@ -5,12 +5,19 @@
 #include "impeller/scene/geometry.h"
 
 #include <memory>
+#include <ostream>
 
+#include "impeller/core/device_buffer_descriptor.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/sampler_descriptor.h"
+#include "impeller/core/vertex_buffer.h"
 #include "impeller/geometry/point.h"
 #include "impeller/geometry/vector.h"
-#include "impeller/renderer/formats.h"
+#include "impeller/renderer/render_pass.h"
 #include "impeller/renderer/vertex_buffer_builder.h"
-#include "impeller/scene/shaders/geometry.vert.h"
+#include "impeller/scene/importer/scene_flatbuffers.h"
+#include "impeller/scene/shaders/skinned.vert.h"
+#include "impeller/scene/shaders/unskinned.vert.h"
 
 namespace impeller {
 namespace scene {
@@ -19,34 +26,247 @@ namespace scene {
 /// Geometry
 ///
 
+Geometry::~Geometry() = default;
+
 std::shared_ptr<CuboidGeometry> Geometry::MakeCuboid(Vector3 size) {
   auto result = std::make_shared<CuboidGeometry>();
   result->SetSize(size);
   return result;
 }
 
+std::shared_ptr<Geometry> Geometry::MakeVertexBuffer(VertexBuffer vertex_buffer,
+                                                     bool is_skinned) {
+  if (is_skinned) {
+    auto result = std::make_shared<SkinnedVertexBufferGeometry>();
+    result->SetVertexBuffer(std::move(vertex_buffer));
+    return result;
+  } else {
+    auto result = std::make_shared<UnskinnedVertexBufferGeometry>();
+    result->SetVertexBuffer(std::move(vertex_buffer));
+    return result;
+  }
+}
+
+std::shared_ptr<Geometry> Geometry::MakeFromFlatbuffer(
+    const fb::MeshPrimitive& mesh,
+    Allocator& allocator) {
+  IndexType index_type;
+  switch (mesh.indices()->type()) {
+    case fb::IndexType::k16Bit:
+      index_type = IndexType::k16bit;
+      break;
+    case fb::IndexType::k32Bit:
+      index_type = IndexType::k32bit;
+      break;
+  }
+
+  const uint8_t* vertices_start;
+  size_t vertices_bytes;
+  bool is_skinned;
+
+  switch (mesh.vertices_type()) {
+    case fb::VertexBuffer::UnskinnedVertexBuffer: {
+      const auto* vertices =
+          mesh.vertices_as_UnskinnedVertexBuffer()->vertices();
+      vertices_start = reinterpret_cast<const uint8_t*>(vertices->Get(0));
+      vertices_bytes = vertices->size() * sizeof(fb::Vertex);
+      is_skinned = false;
+      break;
+    }
+    case fb::VertexBuffer::SkinnedVertexBuffer: {
+      const auto* vertices = mesh.vertices_as_SkinnedVertexBuffer()->vertices();
+      vertices_start = reinterpret_cast<const uint8_t*>(vertices->Get(0));
+      vertices_bytes = vertices->size() * sizeof(fb::SkinnedVertex);
+      is_skinned = true;
+      break;
+    }
+    case fb::VertexBuffer::NONE:
+      VALIDATION_LOG << "Invalid vertex buffer type.";
+      return nullptr;
+  }
+
+  const uint8_t* indices_start =
+      reinterpret_cast<const uint8_t*>(mesh.indices()->data()->Data());
+
+  const size_t indices_bytes = mesh.indices()->data()->size();
+  if (vertices_bytes == 0 || indices_bytes == 0) {
+    return nullptr;
+  }
+
+  DeviceBufferDescriptor buffer_desc;
+  buffer_desc.size = vertices_bytes + indices_bytes;
+  buffer_desc.storage_mode = StorageMode::kHostVisible;
+
+  auto buffer = allocator.CreateBuffer(buffer_desc);
+  buffer->SetLabel("Mesh vertices+indices");
+
+  if (!buffer->CopyHostBuffer(vertices_start, Range(0, vertices_bytes))) {
+    return nullptr;
+  }
+  if (!buffer->CopyHostBuffer(indices_start, Range(0, indices_bytes),
+                              vertices_bytes)) {
+    return nullptr;
+  }
+
+  VertexBuffer vertex_buffer = {
+      .vertex_buffer = {.buffer = buffer, .range = Range(0, vertices_bytes)},
+      .index_buffer = {.buffer = buffer,
+                       .range = Range(vertices_bytes, indices_bytes)},
+      .vertex_count = mesh.indices()->count(),
+      .index_type = index_type,
+  };
+  return MakeVertexBuffer(std::move(vertex_buffer), is_skinned);
+}
+
+void Geometry::SetJointsTexture(const std::shared_ptr<Texture>& texture) {}
+
 //------------------------------------------------------------------------------
 /// CuboidGeometry
 ///
 
+CuboidGeometry::CuboidGeometry() = default;
+
+CuboidGeometry::~CuboidGeometry() = default;
+
 void CuboidGeometry::SetSize(Vector3 size) {
   size_ = size;
 }
 
+// |Geometry|
+GeometryType CuboidGeometry::GetGeometryType() const {
+  return GeometryType::kUnskinned;
+}
+
+// |Geometry|
 VertexBuffer CuboidGeometry::GetVertexBuffer(Allocator& allocator) const {
-  VertexBufferBuilder<GeometryVertexShader::PerVertexData, uint16_t> builder;
+  VertexBufferBuilder<UnskinnedVertexShader::PerVertexData, uint16_t> builder;
   // Layout: position, normal, tangent, uv
   builder.AddVertices({
       // Front.
-      {Vector3(0, 0, 0), Vector3(0, 0, -1), Vector3(1, 0, 0), Point(0, 0)},
-      {Vector3(1, 0, 0), Vector3(0, 0, -1), Vector3(1, 0, 0), Point(1, 0)},
-      {Vector3(1, 1, 0), Vector3(0, 0, -1), Vector3(1, 0, 0), Point(1, 1)},
-      {Vector3(1, 1, 0), Vector3(0, 0, -1), Vector3(1, 0, 0), Point(1, 1)},
-      {Vector3(0, 1, 0), Vector3(0, 0, -1), Vector3(1, 0, 0), Point(0, 1)},
-      {Vector3(0, 0, 0), Vector3(0, 0, -1), Vector3(1, 0, 0), Point(0, 0)},
+      {Vector3(0, 0, 0), Vector3(0, 0, -1), Vector3(1, 0, 0), Point(0, 0),
+       Color::White()},
+      {Vector3(1, 0, 0), Vector3(0, 0, -1), Vector3(1, 0, 0), Point(1, 0),
+       Color::White()},
+      {Vector3(1, 1, 0), Vector3(0, 0, -1), Vector3(1, 0, 0), Point(1, 1),
+       Color::White()},
+      {Vector3(1, 1, 0), Vector3(0, 0, -1), Vector3(1, 0, 0), Point(1, 1),
+       Color::White()},
+      {Vector3(0, 1, 0), Vector3(0, 0, -1), Vector3(1, 0, 0), Point(0, 1),
+       Color::White()},
+      {Vector3(0, 0, 0), Vector3(0, 0, -1), Vector3(1, 0, 0), Point(0, 0),
+       Color::White()},
   });
   return builder.CreateVertexBuffer(allocator);
 }
 
+// |Geometry|
+void CuboidGeometry::BindToCommand(const SceneContext& scene_context,
+                                   HostBuffer& buffer,
+                                   const Matrix& transform,
+                                   RenderPass& pass) const {
+  pass.SetVertexBuffer(
+      GetVertexBuffer(*scene_context.GetContext()->GetResourceAllocator()));
+
+  UnskinnedVertexShader::FrameInfo info;
+  info.mvp = transform;
+  UnskinnedVertexShader::BindFrameInfo(pass, buffer.EmplaceUniform(info));
+}
+
+//------------------------------------------------------------------------------
+/// UnskinnedVertexBufferGeometry
+///
+
+UnskinnedVertexBufferGeometry::UnskinnedVertexBufferGeometry() = default;
+
+UnskinnedVertexBufferGeometry::~UnskinnedVertexBufferGeometry() = default;
+
+void UnskinnedVertexBufferGeometry::SetVertexBuffer(
+    VertexBuffer vertex_buffer) {
+  vertex_buffer_ = std::move(vertex_buffer);
+}
+
+// |Geometry|
+GeometryType UnskinnedVertexBufferGeometry::GetGeometryType() const {
+  return GeometryType::kUnskinned;
+}
+
+// |Geometry|
+VertexBuffer UnskinnedVertexBufferGeometry::GetVertexBuffer(
+    Allocator& allocator) const {
+  return vertex_buffer_;
+}
+
+// |Geometry|
+void UnskinnedVertexBufferGeometry::BindToCommand(
+    const SceneContext& scene_context,
+    HostBuffer& buffer,
+    const Matrix& transform,
+    RenderPass& pass) const {
+  pass.SetVertexBuffer(
+      GetVertexBuffer(*scene_context.GetContext()->GetResourceAllocator()));
+
+  UnskinnedVertexShader::FrameInfo info;
+  info.mvp = transform;
+  UnskinnedVertexShader::BindFrameInfo(pass, buffer.EmplaceUniform(info));
+}
+
+//------------------------------------------------------------------------------
+/// SkinnedVertexBufferGeometry
+///
+
+SkinnedVertexBufferGeometry::SkinnedVertexBufferGeometry() = default;
+
+SkinnedVertexBufferGeometry::~SkinnedVertexBufferGeometry() = default;
+
+void SkinnedVertexBufferGeometry::SetVertexBuffer(VertexBuffer vertex_buffer) {
+  vertex_buffer_ = std::move(vertex_buffer);
+}
+
+// |Geometry|
+GeometryType SkinnedVertexBufferGeometry::GetGeometryType() const {
+  return GeometryType::kSkinned;
+}
+
+// |Geometry|
+VertexBuffer SkinnedVertexBufferGeometry::GetVertexBuffer(
+    Allocator& allocator) const {
+  return vertex_buffer_;
+}
+
+// |Geometry|
+void SkinnedVertexBufferGeometry::BindToCommand(
+    const SceneContext& scene_context,
+    HostBuffer& buffer,
+    const Matrix& transform,
+    RenderPass& pass) const {
+  pass.SetVertexBuffer(
+      GetVertexBuffer(*scene_context.GetContext()->GetResourceAllocator()));
+
+  SamplerDescriptor sampler_desc;
+  sampler_desc.min_filter = MinMagFilter::kNearest;
+  sampler_desc.mag_filter = MinMagFilter::kNearest;
+  sampler_desc.mip_filter = MipFilter::kNearest;
+  sampler_desc.width_address_mode = SamplerAddressMode::kRepeat;
+  sampler_desc.label = "NN Repeat";
+
+  SkinnedVertexShader::BindJointsTexture(
+      pass,
+      joints_texture_ ? joints_texture_ : scene_context.GetPlaceholderTexture(),
+      scene_context.GetContext()->GetSamplerLibrary()->GetSampler(
+          sampler_desc));
+
+  SkinnedVertexShader::FrameInfo info;
+  info.mvp = transform;
+  info.enable_skinning = joints_texture_ ? 1 : 0;
+  info.joint_texture_size =
+      joints_texture_ ? joints_texture_->GetSize().width : 1;
+  SkinnedVertexShader::BindFrameInfo(pass, buffer.EmplaceUniform(info));
+}
+
+// |Geometry|
+void SkinnedVertexBufferGeometry::SetJointsTexture(
+    const std::shared_ptr<Texture>& texture) {
+  joints_texture_ = texture;
+}
 }  // namespace scene
 }  // namespace impeller
diff --git a/impeller/scene/geometry.h b/impeller/scene/geometry.h
index 92c90d17850352ab1dfa6a93c9a71101f8766242..99aa6f280a6502f9f8c08d2f834c96adbbce2e66 100644
--- a/impeller/scene/geometry.h
+++ b/impeller/scene/geometry.h
@@ -2,35 +2,146 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_SCENE_GEOMETRY_H_
+#define FLUTTER_IMPELLER_SCENE_GEOMETRY_H_
 
 #include <memory>
 
+#include "flutter/fml/macros.h"
+#include "impeller/core/allocator.h"
+#include "impeller/core/device_buffer.h"
+#include "impeller/core/host_buffer.h"
+#include "impeller/core/vertex_buffer.h"
+#include "impeller/geometry/matrix.h"
 #include "impeller/geometry/vector.h"
-#include "impeller/renderer/allocator.h"
-#include "impeller/renderer/vertex_buffer.h"
+#include "impeller/renderer/command.h"
+#include "impeller/renderer/render_pass.h"
+#include "impeller/scene/importer/scene_flatbuffers.h"
+#include "impeller/scene/pipeline_key.h"
+#include "impeller/scene/scene_context.h"
 
 namespace impeller {
 namespace scene {
 
 class CuboidGeometry;
+class UnskinnedVertexBufferGeometry;
 
 class Geometry {
  public:
+  virtual ~Geometry();
+
   static std::shared_ptr<CuboidGeometry> MakeCuboid(Vector3 size);
 
+  static std::shared_ptr<Geometry> MakeVertexBuffer(VertexBuffer vertex_buffer,
+                                                    bool is_skinned);
+
+  static std::shared_ptr<Geometry> MakeFromFlatbuffer(
+      const fb::MeshPrimitive& mesh,
+      Allocator& allocator);
+
+  virtual GeometryType GetGeometryType() const = 0;
+
   virtual VertexBuffer GetVertexBuffer(Allocator& allocator) const = 0;
+
+  virtual void BindToCommand(const SceneContext& scene_context,
+                             HostBuffer& buffer,
+                             const Matrix& transform,
+                             RenderPass& pass) const = 0;
+
+  virtual void SetJointsTexture(const std::shared_ptr<Texture>& texture);
 };
 
 class CuboidGeometry final : public Geometry {
  public:
+  CuboidGeometry();
+
+  ~CuboidGeometry() override;
+
   void SetSize(Vector3 size);
 
+  // |Geometry|
+  GeometryType GetGeometryType() const override;
+
+  // |Geometry|
   VertexBuffer GetVertexBuffer(Allocator& allocator) const override;
 
+  // |Geometry|
+  void BindToCommand(const SceneContext& scene_context,
+                     HostBuffer& buffer,
+                     const Matrix& transform,
+                     RenderPass& pass) const override;
+
  private:
   Vector3 size_;
+
+  CuboidGeometry(const CuboidGeometry&) = delete;
+
+  CuboidGeometry& operator=(const CuboidGeometry&) = delete;
+};
+
+class UnskinnedVertexBufferGeometry final : public Geometry {
+ public:
+  UnskinnedVertexBufferGeometry();
+
+  ~UnskinnedVertexBufferGeometry() override;
+
+  void SetVertexBuffer(VertexBuffer vertex_buffer);
+
+  // |Geometry|
+  GeometryType GetGeometryType() const override;
+
+  // |Geometry|
+  VertexBuffer GetVertexBuffer(Allocator& allocator) const override;
+
+  // |Geometry|
+  void BindToCommand(const SceneContext& scene_context,
+                     HostBuffer& buffer,
+                     const Matrix& transform,
+                     RenderPass& pass) const override;
+
+ private:
+  VertexBuffer vertex_buffer_;
+
+  UnskinnedVertexBufferGeometry(const UnskinnedVertexBufferGeometry&) = delete;
+
+  UnskinnedVertexBufferGeometry& operator=(
+      const UnskinnedVertexBufferGeometry&) = delete;
+};
+
+class SkinnedVertexBufferGeometry final : public Geometry {
+ public:
+  SkinnedVertexBufferGeometry();
+
+  ~SkinnedVertexBufferGeometry() override;
+
+  void SetVertexBuffer(VertexBuffer vertex_buffer);
+
+  // |Geometry|
+  GeometryType GetGeometryType() const override;
+
+  // |Geometry|
+  VertexBuffer GetVertexBuffer(Allocator& allocator) const override;
+
+  // |Geometry|
+  void BindToCommand(const SceneContext& scene_context,
+                     HostBuffer& buffer,
+                     const Matrix& transform,
+                     RenderPass& pass) const override;
+
+  // |Geometry|
+  void SetJointsTexture(const std::shared_ptr<Texture>& texture) override;
+
+ private:
+  VertexBuffer vertex_buffer_;
+  std::shared_ptr<Texture> joints_texture_;
+
+  SkinnedVertexBufferGeometry(const SkinnedVertexBufferGeometry&) = delete;
+
+  SkinnedVertexBufferGeometry& operator=(const SkinnedVertexBufferGeometry&) =
+      delete;
 };
 
 }  // namespace scene
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_SCENE_GEOMETRY_H_
diff --git a/impeller/scene/importer/BUILD.gn b/impeller/scene/importer/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..8901df1215f5102678361cad51921e9d1f7ff236
--- /dev/null
+++ b/impeller/scene/importer/BUILD.gn
@@ -0,0 +1,124 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//flutter/impeller/tools/impeller.gni")
+import("//flutter/shell/version/version.gni")
+import("//flutter/third_party/flatbuffers/flatbuffers.gni")
+
+config("runtime_stage_config") {
+  configs = [ "//flutter/impeller:impeller_public_config" ]
+  include_dirs = [ "$root_gen_dir/flutter" ]
+}
+
+flatbuffers("importer_flatbuffers") {
+  flatbuffers = [ "scene.fbs" ]
+  public_configs = [ ":runtime_stage_config" ]
+  public_deps = [ "//flutter/third_party/flatbuffers" ]
+}
+
+impeller_component("conversions") {
+  sources = [
+    "conversions.cc",
+    "conversions.h",
+  ]
+
+  public_deps = [
+    ":importer_flatbuffers",
+    "../../base",
+    "../../geometry",
+    "//flutter/fml",
+  ]
+}
+
+impeller_component("importer_lib") {
+  # Current versions of libcxx have deprecated some of the UTF-16 string
+  # conversion APIs.
+  defines = [ "_LIBCPP_DISABLE_DEPRECATION_WARNINGS" ]
+
+  sources = [
+    "importer.h",
+    "importer_gltf.cc",
+    "switches.cc",
+    "switches.h",
+    "types.h",
+    "vertices_builder.cc",
+    "vertices_builder.h",
+  ]
+
+  public_deps = [
+    ":conversions",
+    ":importer_flatbuffers",
+    "../../base",
+    "../../compiler:utilities",
+    "../../geometry",
+    "//flutter/fml",
+
+    # All third_party deps must be reflected below in the scenec_license
+    # target.
+    "//flutter/third_party/tinygltf",
+  ]
+}
+
+generated_file("scenec_license") {
+  source_path = rebase_path(".", "//flutter")
+  git_url = "https://github.com/flutter/engine/tree/$engine_version"
+  outputs = [ "$target_gen_dir/LICENSE.scenec.md" ]
+  contents = [
+    "# scenec",
+    "",
+    "This tool is used by the Flutter SDK to import 3D geometry.",
+    "",
+    "Source code for this tool: [flutter/engine/$source_path]($git_url/$source_path).",
+    "",
+    "## Licenses",
+    "",
+    "### scenec",
+    "",
+    read_file("//flutter/sky/packages/sky_engine/LICENSE", "string"),
+    "",
+
+    # These licenses are ignored by the main license checker, since they are not
+    # shipped to end-application binaries and only shipped as part of developer
+    # tooling in scenec. Add them here.
+    "## Additional open source licenses",
+    "",
+    "### tinygltf",
+    "",
+    read_file("//flutter/third_party/tinygltf/LICENSE", "string"),
+  ]
+}
+
+group("importer") {
+  deps = [
+    ":scenec",
+    ":scenec_license",
+  ]
+}
+
+impeller_component("scenec") {
+  target_type = "executable"
+
+  sources = [ "scenec_main.cc" ]
+
+  deps = [ ":importer_lib" ]
+
+  metadata = {
+    entitlement_file_path = [ "scenec" ]
+  }
+}
+
+impeller_component("importer_unittests") {
+  testonly = true
+
+  output_name = "scenec_unittests"
+
+  sources = [ "importer_unittests.cc" ]
+
+  deps = [
+    ":importer_lib",
+    "../../fixtures",
+    "../../geometry:geometry_asserts",
+    "//flutter/testing:testing_lib",
+  ]
+}
diff --git a/impeller/scene/importer/conversions.cc b/impeller/scene/importer/conversions.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ceef0ef1870964b62bd03628ed98db7caa157b62
--- /dev/null
+++ b/impeller/scene/importer/conversions.cc
@@ -0,0 +1,96 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/scene/importer/conversions.h"
+
+#include <cstring>
+
+#include "impeller/scene/importer/scene_flatbuffers.h"
+
+namespace impeller {
+namespace scene {
+namespace importer {
+
+Matrix ToMatrix(const std::vector<double>& m) {
+  return Matrix(m[0], m[1], m[2], m[3],    //
+                m[4], m[5], m[6], m[7],    //
+                m[8], m[9], m[10], m[11],  //
+                m[12], m[13], m[14], m[15]);
+}
+
+//-----------------------------------------------------------------------------
+/// Flatbuffers -> Impeller
+///
+
+Matrix ToMatrix(const fb::Matrix& m) {
+  auto& a = *m.m();
+  return Matrix(a[0], a[1], a[2], a[3],    //
+                a[4], a[5], a[6], a[7],    //
+                a[8], a[9], a[10], a[11],  //
+                a[12], a[13], a[14], a[15]);
+}
+
+Vector2 ToVector2(const fb::Vec2& v) {
+  return Vector2(v.x(), v.y());
+}
+
+Vector3 ToVector3(const fb::Vec3& v) {
+  return Vector3(v.x(), v.y(), v.z());
+}
+
+Vector4 ToVector4(const fb::Vec4& v) {
+  return Vector4(v.x(), v.y(), v.z(), v.w());
+}
+
+Color ToColor(const fb::Color& c) {
+  return Color(c.r(), c.g(), c.b(), c.a());
+}
+
+//-----------------------------------------------------------------------------
+/// Impeller -> Flatbuffers
+///
+
+fb::Matrix ToFBMatrix(const Matrix& m) {
+  auto array = std::array<Scalar, 16>{m.m[0],  m.m[1],  m.m[2],  m.m[3],   //
+                                      m.m[4],  m.m[5],  m.m[6],  m.m[7],   //
+                                      m.m[8],  m.m[9],  m.m[10], m.m[11],  //
+                                      m.m[12], m.m[13], m.m[14], m.m[15]};
+  return fb::Matrix(array);
+}
+
+std::unique_ptr<fb::Matrix> ToFBMatrixUniquePtr(const Matrix& m) {
+  auto array = std::array<Scalar, 16>{m.m[0],  m.m[1],  m.m[2],  m.m[3],   //
+                                      m.m[4],  m.m[5],  m.m[6],  m.m[7],   //
+                                      m.m[8],  m.m[9],  m.m[10], m.m[11],  //
+                                      m.m[12], m.m[13], m.m[14], m.m[15]};
+  return std::make_unique<fb::Matrix>(array);
+}
+
+fb::Vec2 ToFBVec2(const Vector2 v) {
+  return fb::Vec2(v.x, v.y);
+}
+
+fb::Vec3 ToFBVec3(const Vector3 v) {
+  return fb::Vec3(v.x, v.y, v.z);
+}
+
+fb::Vec4 ToFBVec4(const Vector4 v) {
+  return fb::Vec4(v.x, v.y, v.z, v.w);
+}
+
+fb::Color ToFBColor(const Color c) {
+  return fb::Color(c.red, c.green, c.blue, c.alpha);
+}
+
+std::unique_ptr<fb::Color> ToFBColor(const std::vector<double>& c) {
+  auto* color = new fb::Color(c.size() > 0 ? c[0] : 1,  //
+                              c.size() > 1 ? c[1] : 1,  //
+                              c.size() > 2 ? c[2] : 1,  //
+                              c.size() > 3 ? c[3] : 1);
+  return std::unique_ptr<fb::Color>(color);
+}
+
+}  // namespace importer
+}  // namespace scene
+}  // namespace impeller
diff --git a/impeller/scene/importer/conversions.h b/impeller/scene/importer/conversions.h
new file mode 100644
index 0000000000000000000000000000000000000000..6c911644261f962f264516c9a7e1ae137289ca6b
--- /dev/null
+++ b/impeller/scene/importer/conversions.h
@@ -0,0 +1,57 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_SCENE_IMPORTER_CONVERSIONS_H_
+#define FLUTTER_IMPELLER_SCENE_IMPORTER_CONVERSIONS_H_
+
+#include <cstddef>
+#include <map>
+#include <vector>
+
+#include "impeller/geometry/matrix.h"
+#include "impeller/scene/importer/scene_flatbuffers.h"
+
+namespace impeller {
+namespace scene {
+namespace importer {
+
+Matrix ToMatrix(const std::vector<double>& m);
+
+//-----------------------------------------------------------------------------
+/// Flatbuffers -> Impeller
+///
+
+Matrix ToMatrix(const fb::Matrix& m);
+
+Vector2 ToVector2(const fb::Vec2& c);
+
+Vector3 ToVector3(const fb::Vec3& c);
+
+Vector4 ToVector4(const fb::Vec4& c);
+
+Color ToColor(const fb::Color& c);
+
+//-----------------------------------------------------------------------------
+/// Impeller -> Flatbuffers
+///
+
+fb::Matrix ToFBMatrix(const Matrix& m);
+
+std::unique_ptr<fb::Matrix> ToFBMatrixUniquePtr(const Matrix& m);
+
+fb::Vec2 ToFBVec2(const Vector2 v);
+
+fb::Vec3 ToFBVec3(const Vector3 v);
+
+fb::Vec4 ToFBVec4(const Vector4 v);
+
+fb::Color ToFBColor(const Color c);
+
+std::unique_ptr<fb::Color> ToFBColor(const std::vector<double>& c);
+
+}  // namespace importer
+}  // namespace scene
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_SCENE_IMPORTER_CONVERSIONS_H_
diff --git a/impeller/base/work_queue.h b/impeller/scene/importer/importer.h
similarity index 36%
rename from impeller/base/work_queue.h
rename to impeller/scene/importer/importer.h
index afd31c7acd53ccc97a5c6aa72e6a9882dde125a1..af0934522e428e41255b74963192eb39454fd9af 100644
--- a/impeller/base/work_queue.h
+++ b/impeller/scene/importer/importer.h
@@ -2,26 +2,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_SCENE_IMPORTER_IMPORTER_H_
+#define FLUTTER_IMPELLER_SCENE_IMPORTER_IMPORTER_H_
 
+#include <array>
 #include <memory>
 
-#include "flutter/fml/closure.h"
-#include "flutter/fml/macros.h"
+#include "flutter/fml/mapping.h"
+#include "impeller/scene/importer/scene_flatbuffers.h"
 
 namespace impeller {
+namespace scene {
+namespace importer {
 
-class WorkQueue : public std::enable_shared_from_this<WorkQueue> {
- public:
-  virtual ~WorkQueue();
-
-  virtual void PostTask(fml::closure task) = 0;
-
- protected:
-  WorkQueue();
-
- private:
-  FML_DISALLOW_COPY_AND_ASSIGN(WorkQueue);
-};
+bool ParseGLTF(const fml::Mapping& source_mapping, fb::SceneT& out_scene);
 
+}
+}  // namespace scene
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_SCENE_IMPORTER_IMPORTER_H_
diff --git a/impeller/scene/importer/importer_gltf.cc b/impeller/scene/importer/importer_gltf.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a3d9f0a767e57c32fe437088f1c85c7ac4e80832
--- /dev/null
+++ b/impeller/scene/importer/importer_gltf.cc
@@ -0,0 +1,501 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/scene/importer/importer.h"
+
+#include <array>
+#include <cstring>
+#include <functional>
+#include <iostream>
+#include <iterator>
+#include <memory>
+#include <vector>
+
+#include "flutter/fml/mapping.h"
+#include "flutter/third_party/tinygltf/tiny_gltf.h"
+#include "impeller/geometry/matrix.h"
+#include "impeller/scene/importer/conversions.h"
+#include "impeller/scene/importer/scene_flatbuffers.h"
+#include "impeller/scene/importer/vertices_builder.h"
+
+namespace impeller {
+namespace scene {
+namespace importer {
+
+static const std::map<std::string, VerticesBuilder::AttributeType> kAttributes =
+    {{"POSITION", VerticesBuilder::AttributeType::kPosition},
+     {"NORMAL", VerticesBuilder::AttributeType::kNormal},
+     {"TANGENT", VerticesBuilder::AttributeType::kTangent},
+     {"TEXCOORD_0", VerticesBuilder::AttributeType::kTextureCoords},
+     {"COLOR_0", VerticesBuilder::AttributeType::kColor},
+     {"JOINTS_0", VerticesBuilder::AttributeType::kJoints},
+     {"WEIGHTS_0", VerticesBuilder::AttributeType::kWeights}};
+
+static bool WithinRange(int index, size_t size) {
+  return index >= 0 && static_cast<size_t>(index) < size;
+}
+
+static bool MeshPrimitiveIsSkinned(const tinygltf::Primitive& primitive) {
+  return primitive.attributes.find("JOINTS_0") != primitive.attributes.end() &&
+         primitive.attributes.find("WEIGHTS_0") != primitive.attributes.end();
+}
+
+static void ProcessMaterial(const tinygltf::Model& gltf,
+                            const tinygltf::Material& in_material,
+                            fb::MaterialT& out_material) {
+  out_material.type = fb::MaterialType::kUnlit;
+  out_material.base_color_factor =
+      ToFBColor(in_material.pbrMetallicRoughness.baseColorFactor);
+  bool base_color_texture_valid =
+      in_material.pbrMetallicRoughness.baseColorTexture.texCoord == 0 &&
+      in_material.pbrMetallicRoughness.baseColorTexture.index >= 0 &&
+      in_material.pbrMetallicRoughness.baseColorTexture.index <
+          static_cast<int32_t>(gltf.textures.size());
+  out_material.base_color_texture =
+      base_color_texture_valid
+          // This is safe because every GLTF input texture is mapped to a
+          // `Scene->texture`.
+          ? in_material.pbrMetallicRoughness.baseColorTexture.index
+          : -1;
+}
+
+static bool ProcessMeshPrimitive(const tinygltf::Model& gltf,
+                                 const tinygltf::Primitive& primitive,
+                                 fb::MeshPrimitiveT& mesh_primitive) {
+  //---------------------------------------------------------------------------
+  /// Vertices.
+  ///
+
+  {
+    bool is_skinned = MeshPrimitiveIsSkinned(primitive);
+    std::unique_ptr<VerticesBuilder> builder =
+        is_skinned ? VerticesBuilder::MakeSkinned()
+                   : VerticesBuilder::MakeUnskinned();
+
+    for (const auto& attribute : primitive.attributes) {
+      auto attribute_type = kAttributes.find(attribute.first);
+      if (attribute_type == kAttributes.end()) {
+        std::cerr << "Vertex attribute \"" << attribute.first
+                  << "\" not supported." << std::endl;
+        continue;
+      }
+      if (!is_skinned &&
+          (attribute_type->second == VerticesBuilder::AttributeType::kJoints ||
+           attribute_type->second ==
+               VerticesBuilder::AttributeType::kWeights)) {
+        // If the primitive doesn't have enough information to be skinned, skip
+        // skinning-related attributes.
+        continue;
+      }
+
+      const auto accessor = gltf.accessors[attribute.second];
+      const auto view = gltf.bufferViews[accessor.bufferView];
+
+      const auto buffer = gltf.buffers[view.buffer];
+      const unsigned char* source_start = &buffer.data[view.byteOffset];
+
+      VerticesBuilder::ComponentType type;
+      switch (accessor.componentType) {
+        case TINYGLTF_COMPONENT_TYPE_BYTE:
+          type = VerticesBuilder::ComponentType::kSignedByte;
+          break;
+        case TINYGLTF_COMPONENT_TYPE_UNSIGNED_BYTE:
+          type = VerticesBuilder::ComponentType::kUnsignedByte;
+          break;
+        case TINYGLTF_COMPONENT_TYPE_SHORT:
+          type = VerticesBuilder::ComponentType::kSignedShort;
+          break;
+        case TINYGLTF_COMPONENT_TYPE_UNSIGNED_SHORT:
+          type = VerticesBuilder::ComponentType::kUnsignedShort;
+          break;
+        case TINYGLTF_COMPONENT_TYPE_INT:
+          type = VerticesBuilder::ComponentType::kSignedInt;
+          break;
+        case TINYGLTF_COMPONENT_TYPE_UNSIGNED_INT:
+          type = VerticesBuilder::ComponentType::kUnsignedInt;
+          break;
+        case TINYGLTF_COMPONENT_TYPE_FLOAT:
+          type = VerticesBuilder::ComponentType::kFloat;
+          break;
+        default:
+          std::cerr << "Skipping attribute \"" << attribute.first
+                    << "\" due to invalid component type." << std::endl;
+          continue;
+      }
+
+      builder->SetAttributeFromBuffer(
+          attribute_type->second,     // attribute
+          type,                       // component_type
+          source_start,               // buffer_start
+          accessor.ByteStride(view),  // stride_bytes
+          accessor.count);            // count
+    }
+
+    builder->WriteFBVertices(mesh_primitive);
+  }
+
+  //---------------------------------------------------------------------------
+  /// Indices.
+  ///
+
+  {
+    if (!WithinRange(primitive.indices, gltf.accessors.size())) {
+      std::cerr << "Mesh primitive has no index buffer. Skipping." << std::endl;
+      return false;
+    }
+
+    auto index_accessor = gltf.accessors[primitive.indices];
+    auto index_view = gltf.bufferViews[index_accessor.bufferView];
+
+    auto indices = std::make_unique<fb::IndicesT>();
+
+    switch (index_accessor.componentType) {
+      case TINYGLTF_COMPONENT_TYPE_UNSIGNED_SHORT:
+        indices->type = fb::IndexType::k16Bit;
+        break;
+      case TINYGLTF_COMPONENT_TYPE_UNSIGNED_INT:
+        indices->type = fb::IndexType::k32Bit;
+        break;
+      default:
+        std::cerr << "Mesh primitive has unsupported index type "
+                  << index_accessor.componentType << ". Skipping.";
+        return false;
+    }
+    indices->count = index_accessor.count;
+    indices->data.resize(index_view.byteLength);
+    const auto* index_buffer =
+        &gltf.buffers[index_view.buffer].data[index_view.byteOffset];
+    std::memcpy(indices->data.data(), index_buffer, indices->data.size());
+
+    mesh_primitive.indices = std::move(indices);
+  }
+
+  //---------------------------------------------------------------------------
+  /// Material.
+  ///
+
+  {
+    auto material = std::make_unique<fb::MaterialT>();
+    if (primitive.material >= 0 &&
+        primitive.material < static_cast<int>(gltf.materials.size())) {
+      ProcessMaterial(gltf, gltf.materials[primitive.material], *material);
+    } else {
+      material->type = fb::MaterialType::kUnlit;
+    }
+    mesh_primitive.material = std::move(material);
+  }
+
+  return true;
+}
+
+static void ProcessNode(const tinygltf::Model& gltf,
+                        const tinygltf::Node& in_node,
+                        fb::NodeT& out_node) {
+  out_node.name = in_node.name;
+  out_node.children = in_node.children;
+
+  //---------------------------------------------------------------------------
+  /// Transform.
+  ///
+
+  Matrix transform;
+  if (in_node.scale.size() == 3) {
+    transform =
+        transform * Matrix::MakeScale({static_cast<Scalar>(in_node.scale[0]),
+                                       static_cast<Scalar>(in_node.scale[1]),
+                                       static_cast<Scalar>(in_node.scale[2])});
+  }
+  if (in_node.rotation.size() == 4) {
+    transform = transform * Matrix::MakeRotation(Quaternion(
+                                in_node.rotation[0], in_node.rotation[1],
+                                in_node.rotation[2], in_node.rotation[3]));
+  }
+  if (in_node.translation.size() == 3) {
+    transform = transform * Matrix::MakeTranslation(
+                                {static_cast<Scalar>(in_node.translation[0]),
+                                 static_cast<Scalar>(in_node.translation[1]),
+                                 static_cast<Scalar>(in_node.translation[2])});
+  }
+  if (in_node.matrix.size() == 16) {
+    if (!transform.IsIdentity()) {
+      std::cerr << "The `matrix` attribute of node (name: " << in_node.name
+                << ") is set in addition to one or more of the "
+                   "`translation/rotation/scale` attributes. Using only the "
+                   "`matrix` "
+                   "attribute.";
+    }
+    transform = ToMatrix(in_node.matrix);
+  }
+  out_node.transform = ToFBMatrixUniquePtr(transform);
+
+  //---------------------------------------------------------------------------
+  /// Static meshes.
+  ///
+
+  if (WithinRange(in_node.mesh, gltf.meshes.size())) {
+    auto& mesh = gltf.meshes[in_node.mesh];
+    for (const auto& primitive : mesh.primitives) {
+      auto mesh_primitive = std::make_unique<fb::MeshPrimitiveT>();
+      if (!ProcessMeshPrimitive(gltf, primitive, *mesh_primitive)) {
+        continue;
+      }
+      out_node.mesh_primitives.push_back(std::move(mesh_primitive));
+    }
+  }
+
+  //---------------------------------------------------------------------------
+  /// Skin.
+  ///
+
+  if (WithinRange(in_node.skin, gltf.skins.size())) {
+    auto& skin = gltf.skins[in_node.skin];
+
+    auto ipskin = std::make_unique<fb::SkinT>();
+    ipskin->joints = skin.joints;
+    {
+      std::vector<fb::Matrix> matrices;
+      auto& matrix_accessor = gltf.accessors[skin.inverseBindMatrices];
+      auto& matrix_view = gltf.bufferViews[matrix_accessor.bufferView];
+      auto& matrix_buffer = gltf.buffers[matrix_view.buffer];
+      for (size_t matrix_i = 0; matrix_i < matrix_accessor.count; matrix_i++) {
+        auto* s = reinterpret_cast<const float*>(
+            matrix_buffer.data.data() + matrix_view.byteOffset +
+            matrix_accessor.ByteStride(matrix_view) * matrix_i);
+        Matrix m(s[0], s[1], s[2], s[3],    //
+                 s[4], s[5], s[6], s[7],    //
+                 s[8], s[9], s[10], s[11],  //
+                 s[12], s[13], s[14], s[15]);
+        matrices.push_back(ToFBMatrix(m));
+      }
+      ipskin->inverse_bind_matrices = std::move(matrices);
+    }
+    ipskin->skeleton = skin.skeleton;
+    out_node.skin = std::move(ipskin);
+  }
+}
+
+static void ProcessTexture(const tinygltf::Model& gltf,
+                           const tinygltf::Texture& in_texture,
+                           fb::TextureT& out_texture) {
+  if (!WithinRange(in_texture.source, gltf.images.size())) {
+    return;
+  }
+  auto& image = gltf.images[in_texture.source];
+
+  auto embedded = std::make_unique<fb::EmbeddedImageT>();
+  embedded->bytes = image.image;
+  size_t bytes_per_component = 0;
+  switch (image.pixel_type) {
+    case TINYGLTF_COMPONENT_TYPE_UNSIGNED_BYTE:
+      embedded->component_type = fb::ComponentType::k8Bit;
+      bytes_per_component = 1;
+      break;
+    case TINYGLTF_COMPONENT_TYPE_UNSIGNED_SHORT:
+      embedded->component_type = fb::ComponentType::k16Bit;
+      bytes_per_component = 2;
+      break;
+    default:
+      std::cerr << "Texture component type " << image.pixel_type
+                << " not supported." << std::endl;
+      return;
+  }
+  if (image.image.size() !=
+      bytes_per_component * image.component * image.width * image.height) {
+    std::cerr << "Decompressed texture had unexpected buffer size. Skipping."
+              << std::endl;
+    return;
+  }
+  embedded->component_count = image.component;
+  embedded->width = image.width;
+  embedded->height = image.height;
+  out_texture.embedded_image = std::move(embedded);
+  out_texture.uri = image.uri;
+}
+
+static void ProcessAnimation(const tinygltf::Model& gltf,
+                             const tinygltf::Animation& in_animation,
+                             fb::AnimationT& out_animation) {
+  out_animation.name = in_animation.name;
+
+  // std::vector<impeller::fb::ChannelT> channels;
+  std::vector<impeller::fb::ChannelT> translation_channels;
+  std::vector<impeller::fb::ChannelT> rotation_channels;
+  std::vector<impeller::fb::ChannelT> scale_channels;
+  for (auto& in_channel : in_animation.channels) {
+    auto out_channel = fb::ChannelT();
+
+    out_channel.node = in_channel.target_node;
+    auto& sampler = in_animation.samplers[in_channel.sampler];
+
+    /// Keyframe times.
+    auto& times_accessor = gltf.accessors[sampler.input];
+    if (times_accessor.count <= 0) {
+      continue;  // Nothing to record.
+    }
+    {
+      auto& times_bufferview = gltf.bufferViews[times_accessor.bufferView];
+      auto& times_buffer = gltf.buffers[times_bufferview.buffer];
+      if (times_accessor.componentType != TINYGLTF_COMPONENT_TYPE_FLOAT) {
+        std::cerr << "Unexpected component type \""
+                  << times_accessor.componentType
+                  << "\" for animation channel times accessor. Skipping."
+                  << std::endl;
+        continue;
+      }
+      if (times_accessor.type != TINYGLTF_TYPE_SCALAR) {
+        std::cerr << "Unexpected type \"" << times_accessor.type
+                  << "\" for animation channel times accessor. Skipping."
+                  << std::endl;
+        continue;
+      }
+      for (size_t time_i = 0; time_i < times_accessor.count; time_i++) {
+        const float* time_p = reinterpret_cast<const float*>(
+            times_buffer.data.data() + times_bufferview.byteOffset +
+            times_accessor.ByteStride(times_bufferview) * time_i);
+        out_channel.timeline.push_back(*time_p);
+      }
+    }
+
+    /// Keyframe values.
+    auto& values_accessor = gltf.accessors[sampler.output];
+    if (values_accessor.count != times_accessor.count) {
+      std::cerr << "Mismatch between time and value accessors for animation "
+                   "channel. Skipping."
+                << std::endl;
+      continue;
+    }
+    {
+      auto& values_bufferview = gltf.bufferViews[values_accessor.bufferView];
+      auto& values_buffer = gltf.buffers[values_bufferview.buffer];
+      if (values_accessor.componentType != TINYGLTF_COMPONENT_TYPE_FLOAT) {
+        std::cerr << "Unexpected component type \""
+                  << values_accessor.componentType
+                  << "\" for animation channel values accessor. Skipping."
+                  << std::endl;
+        continue;
+      }
+      if (in_channel.target_path == "translation") {
+        if (values_accessor.type != TINYGLTF_TYPE_VEC3) {
+          std::cerr << "Unexpected type \"" << values_accessor.type
+                    << "\" for animation channel \"translation\" accessor. "
+                       "Skipping."
+                    << std::endl;
+          continue;
+        }
+        fb::TranslationKeyframesT keyframes;
+        for (size_t value_i = 0; value_i < values_accessor.count; value_i++) {
+          const float* value_p = reinterpret_cast<const float*>(
+              values_buffer.data.data() + values_bufferview.byteOffset +
+              values_accessor.ByteStride(values_bufferview) * value_i);
+          keyframes.values.push_back(
+              fb::Vec3(value_p[0], value_p[1], value_p[2]));
+        }
+        out_channel.keyframes.Set(std::move(keyframes));
+        translation_channels.push_back(std::move(out_channel));
+      } else if (in_channel.target_path == "rotation") {
+        if (values_accessor.type != TINYGLTF_TYPE_VEC4) {
+          std::cerr << "Unexpected type \"" << values_accessor.type
+                    << "\" for animation channel \"rotation\" accessor. "
+                       "Skipping."
+                    << std::endl;
+          continue;
+        }
+        fb::RotationKeyframesT keyframes;
+        for (size_t value_i = 0; value_i < values_accessor.count; value_i++) {
+          const float* value_p = reinterpret_cast<const float*>(
+              values_buffer.data.data() + values_bufferview.byteOffset +
+              values_accessor.ByteStride(values_bufferview) * value_i);
+          keyframes.values.push_back(
+              fb::Vec4(value_p[0], value_p[1], value_p[2], value_p[3]));
+        }
+        out_channel.keyframes.Set(std::move(keyframes));
+        rotation_channels.push_back(std::move(out_channel));
+      } else if (in_channel.target_path == "scale") {
+        if (values_accessor.type != TINYGLTF_TYPE_VEC3) {
+          std::cerr << "Unexpected type \"" << values_accessor.type
+                    << "\" for animation channel \"scale\" accessor. "
+                       "Skipping."
+                    << std::endl;
+          continue;
+        }
+        fb::ScaleKeyframesT keyframes;
+        for (size_t value_i = 0; value_i < values_accessor.count; value_i++) {
+          const float* value_p = reinterpret_cast<const float*>(
+              values_buffer.data.data() + values_bufferview.byteOffset +
+              values_accessor.ByteStride(values_bufferview) * value_i);
+          keyframes.values.push_back(
+              fb::Vec3(value_p[0], value_p[1], value_p[2]));
+        }
+        out_channel.keyframes.Set(std::move(keyframes));
+        scale_channels.push_back(std::move(out_channel));
+      } else {
+        std::cerr << "Unsupported animation channel target path \""
+                  << in_channel.target_path << "\". Skipping." << std::endl;
+        continue;
+      }
+    }
+  }
+
+  std::vector<std::unique_ptr<impeller::fb::ChannelT>> channels;
+  for (const auto& channel_list :
+       {translation_channels, rotation_channels, scale_channels}) {
+    for (const auto& channel : channel_list) {
+      channels.push_back(std::make_unique<fb::ChannelT>(channel));
+    }
+  }
+  out_animation.channels = std::move(channels);
+}
+
+bool ParseGLTF(const fml::Mapping& source_mapping, fb::SceneT& out_scene) {
+  tinygltf::Model gltf;
+
+  {
+    tinygltf::TinyGLTF loader;
+    std::string error;
+    std::string warning;
+    bool success = loader.LoadBinaryFromMemory(&gltf, &error, &warning,
+                                               source_mapping.GetMapping(),
+                                               source_mapping.GetSize());
+    if (!warning.empty()) {
+      std::cerr << "Warning while loading GLTF: " << warning << std::endl;
+    }
+    if (!error.empty()) {
+      std::cerr << "Error while loading GLTF: " << error << std::endl;
+    }
+    if (!success) {
+      return false;
+    }
+  }
+
+  const tinygltf::Scene& scene = gltf.scenes[gltf.defaultScene];
+  out_scene.children = scene.nodes;
+
+  out_scene.transform =
+      ToFBMatrixUniquePtr(Matrix::MakeScale(Vector3(1, 1, -1)));
+
+  for (size_t texture_i = 0; texture_i < gltf.textures.size(); texture_i++) {
+    auto texture = std::make_unique<fb::TextureT>();
+    ProcessTexture(gltf, gltf.textures[texture_i], *texture);
+    out_scene.textures.push_back(std::move(texture));
+  }
+
+  for (size_t node_i = 0; node_i < gltf.nodes.size(); node_i++) {
+    auto node = std::make_unique<fb::NodeT>();
+    ProcessNode(gltf, gltf.nodes[node_i], *node);
+    out_scene.nodes.push_back(std::move(node));
+  }
+
+  for (size_t animation_i = 0; animation_i < gltf.animations.size();
+       animation_i++) {
+    auto animation = std::make_unique<fb::AnimationT>();
+    ProcessAnimation(gltf, gltf.animations[animation_i], *animation);
+    out_scene.animations.push_back(std::move(animation));
+  }
+
+  return true;
+}
+
+}  // namespace importer
+}  // namespace scene
+}  // namespace impeller
diff --git a/impeller/scene/importer/importer_unittests.cc b/impeller/scene/importer/importer_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c4aa6b27ec87219e7d8251dc5b47e01b9f49af27
--- /dev/null
+++ b/impeller/scene/importer/importer_unittests.cc
@@ -0,0 +1,127 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/testing/testing.h"
+#include "impeller/geometry/geometry_asserts.h"
+#include "impeller/geometry/matrix.h"
+#include "impeller/scene/importer/conversions.h"
+#include "impeller/scene/importer/importer.h"
+#include "impeller/scene/importer/scene_flatbuffers.h"
+
+namespace impeller {
+namespace scene {
+namespace importer {
+namespace testing {
+
+TEST(ImporterTest, CanParseUnskinnedGLTF) {
+  auto mapping =
+      flutter::testing::OpenFixtureAsMapping("flutter_logo_baked.glb");
+
+  fb::SceneT scene;
+  ASSERT_TRUE(ParseGLTF(*mapping, scene));
+
+  ASSERT_EQ(scene.children.size(), 1u);
+  auto& node = scene.nodes[scene.children[0]];
+
+  Matrix node_transform = ToMatrix(*node->transform);
+  ASSERT_MATRIX_NEAR(node_transform, Matrix());
+
+  ASSERT_EQ(node->mesh_primitives.size(), 1u);
+  auto& mesh = *node->mesh_primitives[0];
+  ASSERT_EQ(mesh.indices->count, 918u);
+
+  uint16_t first_index =
+      *reinterpret_cast<uint16_t*>(mesh.indices->data.data());
+  ASSERT_EQ(first_index, 45u);
+
+  ASSERT_EQ(mesh.vertices.type, fb::VertexBuffer::UnskinnedVertexBuffer);
+  auto& vertices = mesh.vertices.AsUnskinnedVertexBuffer()->vertices;
+  ASSERT_EQ(vertices.size(), 260u);
+  auto& vertex = vertices[0];
+
+  Vector3 position = ToVector3(vertex.position());
+  ASSERT_VECTOR3_NEAR(position, Vector3(-0.0100185, -0.522907, 0.133178));
+
+  Vector3 normal = ToVector3(vertex.normal());
+  ASSERT_VECTOR3_NEAR(normal, Vector3(0.556997, -0.810833, 0.179733));
+
+  Vector4 tangent = ToVector4(vertex.tangent());
+  ASSERT_VECTOR4_NEAR(tangent, Vector4(0.155901, -0.110485, -0.981574, 1));
+
+  Vector2 texture_coords = ToVector2(vertex.texture_coords());
+  ASSERT_POINT_NEAR(texture_coords, Vector2(0.727937, 0.713817));
+
+  Color color = ToColor(vertex.color());
+  ASSERT_COLOR_NEAR(color, Color(0.0221714, 0.467781, 0.921584, 1));
+}
+
+TEST(ImporterTest, CanParseSkinnedGLTF) {
+  auto mapping = flutter::testing::OpenFixtureAsMapping("two_triangles.glb");
+
+  fb::SceneT scene;
+  ASSERT_TRUE(ParseGLTF(*mapping, scene));
+
+  ASSERT_EQ(scene.children.size(), 1u);
+  auto& node = scene.nodes[scene.children[0]];
+
+  Matrix node_transform = ToMatrix(*node->transform);
+  ASSERT_MATRIX_NEAR(node_transform, Matrix());
+
+  ASSERT_EQ(node->mesh_primitives.size(), 0u);
+  ASSERT_EQ(node->children.size(), 2u);
+
+  // The skinned node contains both a skeleton and skinned mesh primitives that
+  // reference bones in the skeleton.
+  auto& skinned_node = scene.nodes[node->children[0]];
+  ASSERT_NE(skinned_node->skin, nullptr);
+
+  ASSERT_EQ(skinned_node->mesh_primitives.size(), 2u);
+  auto& bottom_triangle = *skinned_node->mesh_primitives[0];
+  ASSERT_EQ(bottom_triangle.indices->count, 3u);
+
+  ASSERT_EQ(bottom_triangle.vertices.type,
+            fb::VertexBuffer::SkinnedVertexBuffer);
+  auto& vertices = bottom_triangle.vertices.AsSkinnedVertexBuffer()->vertices;
+  ASSERT_EQ(vertices.size(), 3u);
+  auto& vertex = vertices[0];
+
+  Vector3 position = ToVector3(vertex.vertex().position());
+  ASSERT_VECTOR3_NEAR(position, Vector3(1, 1, 0));
+
+  Vector3 normal = ToVector3(vertex.vertex().normal());
+  ASSERT_VECTOR3_NEAR(normal, Vector3(0, 0, 1));
+
+  Vector4 tangent = ToVector4(vertex.vertex().tangent());
+  ASSERT_VECTOR4_NEAR(tangent, Vector4(1, 0, 0, -1));
+
+  Vector2 texture_coords = ToVector2(vertex.vertex().texture_coords());
+  ASSERT_POINT_NEAR(texture_coords, Vector2(0, 1));
+
+  Color color = ToColor(vertex.vertex().color());
+  ASSERT_COLOR_NEAR(color, Color(1, 1, 1, 1));
+
+  Vector4 joints = ToVector4(vertex.joints());
+  ASSERT_VECTOR4_NEAR(joints, Vector4(0, 0, 0, 0));
+
+  Vector4 weights = ToVector4(vertex.weights());
+  ASSERT_VECTOR4_NEAR(weights, Vector4(1, 0, 0, 0));
+
+  ASSERT_EQ(scene.animations.size(), 2u);
+  ASSERT_EQ(scene.animations[0]->name, "Idle");
+  ASSERT_EQ(scene.animations[1]->name, "Metronome");
+  ASSERT_EQ(scene.animations[1]->channels.size(), 6u);
+  auto& channel = scene.animations[1]->channels[3];
+  ASSERT_EQ(channel->keyframes.type, fb::Keyframes::RotationKeyframes);
+  auto* keyframes = channel->keyframes.AsRotationKeyframes();
+  ASSERT_EQ(keyframes->values.size(), 40u);
+  ASSERT_VECTOR4_NEAR(ToVector4(keyframes->values[0]),
+                      Vector4(0.653281, -0.270598, 0.270598, 0.653281));
+  ASSERT_VECTOR4_NEAR(ToVector4(keyframes->values[10]),
+                      Vector4(0.700151, 0.0989373, -0.0989373, 0.700151));
+}
+
+}  // namespace testing
+}  // namespace importer
+}  // namespace scene
+}  // namespace impeller
diff --git a/impeller/scene/importer/scene.fbs b/impeller/scene/importer/scene.fbs
new file mode 100644
index 0000000000000000000000000000000000000000..3966e0ed395d90a5878dd491ea738afa67542861
--- /dev/null
+++ b/impeller/scene/importer/scene.fbs
@@ -0,0 +1,198 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+namespace impeller.fb;
+
+//-----------------------------------------------------------------------------
+/// Materials.
+///
+
+struct Color {
+  r: float;
+  g: float;
+  b: float;
+  a: float;
+}
+
+enum ComponentType:byte {
+  k8Bit,
+  k16Bit,
+}
+
+table EmbeddedImage {
+  bytes: [ubyte];
+  component_count: ubyte = 0;
+  component_type: ComponentType;
+  width: uint;
+  height: uint;
+}
+
+/// The `bytes` field takes precedent over the `uri` field.
+/// If both the `uri` and `bytes` fields are empty, a fully opaque white
+/// placeholder will be used.
+table Texture {
+  /// A Flutter asset URI for a compressed image file to import and decode.
+  uri: string;
+  /// Decompressed image bytes for uploading to the GPU. If this field is not
+  /// empty, it takes precedent over the `uri` field for sourcing the texture.
+  embedded_image: EmbeddedImage;
+}
+
+enum MaterialType:byte {
+  kUnlit,
+  kPhysicallyBased,
+}
+
+/// The final color of each material component is the texture color multiplied
+/// by the factor of the component.
+/// Texture fields are indices into the `Scene`->`textures` array. All textures
+/// are optional -- a texture index value of -1 indicates no texture.
+table Material {
+  // When the `MaterialType` is `kUnlit`, only the `base_color` fields are used.
+  type: MaterialType;
+
+  base_color_factor: Color;
+  base_color_texture: int = -1;
+
+  metallic_factor: float = 0;
+  roughness_factor: float = 0.5;
+  metallic_roughness_texture: int = -1;  // Red=Metallic, Green=Roughness.
+
+  normal_texture: int = -1;  // Tangent space normal map.
+
+  occlusion_texture: int = -1;
+}
+
+//-----------------------------------------------------------------------------
+/// Geometry.
+///
+
+struct Vec2 {
+  x: float;
+  y: float;
+}
+
+struct Vec3 {
+  x: float;
+  y: float;
+  z: float;
+}
+
+struct Vec4 {
+  x: float;
+  y: float;
+  z: float;
+  w: float;
+}
+
+// This attribute layout is expected to be identical to that within
+// `impeller/scene/shaders/geometry.vert`.
+struct Vertex {
+  position: Vec3;
+  normal: Vec3;
+  tangent: Vec4; // The 4th component determines the handedness of the tangent.
+  texture_coords: Vec2;
+  color: Color;
+}
+
+table UnskinnedVertexBuffer {
+  vertices: [Vertex];
+}
+
+struct SkinnedVertex {
+  vertex: Vertex;
+  /// Four joint indices corresponding to this mesh's skin transforms. These
+  /// are floats instead of ints because this vertex data is uploaded directly
+  /// to the GPU, and float attributes work for all Impeller backends.
+  joints: Vec4;
+  /// Four weight values that specify the influence of the corresponding
+  /// joints.
+  weights: Vec4;
+}
+
+table SkinnedVertexBuffer {
+  vertices: [SkinnedVertex];
+}
+
+union VertexBuffer { UnskinnedVertexBuffer, SkinnedVertexBuffer }
+
+enum IndexType:byte {
+  k16Bit,
+  k32Bit,
+}
+
+table Indices {
+  data: [ubyte];
+  count: uint32;
+  type: IndexType;
+}
+
+table MeshPrimitive {
+  vertices: VertexBuffer;
+  indices: Indices;
+  material: Material;
+}
+
+//-----------------------------------------------------------------------------
+/// Animations.
+///
+
+table TranslationKeyframes {
+  values: [Vec3];
+}
+
+table RotationKeyframes {
+  values: [Vec4];
+}
+
+table ScaleKeyframes {
+  values: [Vec3];
+}
+
+union Keyframes { TranslationKeyframes, RotationKeyframes, ScaleKeyframes }
+
+table Channel {
+  node: int;  // Index into `Scene`->`nodes`.
+  timeline: [float];
+  keyframes: Keyframes;
+}
+
+table Animation {
+  name: string;
+  channels: [Channel];
+}
+
+table Skin {
+  joints: [int];  // Indices into `Scene`->`nodes`.
+  inverse_bind_matrices: [Matrix];
+  /// The root joint of the skeleton.
+  skeleton: int;  // Index into `Scene`->`nodes`.
+}
+
+//-----------------------------------------------------------------------------
+/// Scene graph.
+///
+
+struct Matrix {
+  m: [float:16];
+}
+
+table Node {
+  name: string;
+  children: [int];  // Indices into `Scene`->`nodes`.
+  transform: Matrix;
+  mesh_primitives: [MeshPrimitive];
+  skin: Skin;
+}
+
+table Scene {
+  children: [int];  // Indices into `Scene`->`nodes`.
+  transform: Matrix;
+  nodes: [Node];
+  textures: [Texture];  // Textures may be reused across different materials.
+  animations: [Animation];
+}
+
+root_type Scene;
+file_identifier "IPSC";
diff --git a/impeller/scene/importer/scenec_main.cc b/impeller/scene/importer/scenec_main.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ee89283ef6e138029c003ebefef1eadc1347b169
--- /dev/null
+++ b/impeller/scene/importer/scenec_main.cc
@@ -0,0 +1,109 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <filesystem>
+#include <memory>
+
+#include "flutter/fml/backtrace.h"
+#include "flutter/fml/command_line.h"
+#include "flutter/fml/file.h"
+#include "flutter/fml/macros.h"
+#include "flutter/fml/mapping.h"
+#include "impeller/base/strings.h"
+#include "impeller/compiler/utilities.h"
+#include "impeller/scene/importer/importer.h"
+#include "impeller/scene/importer/scene_flatbuffers.h"
+#include "impeller/scene/importer/switches.h"
+#include "impeller/scene/importer/types.h"
+
+#include "third_party/flatbuffers/include/flatbuffers/flatbuffer_builder.h"
+
+namespace impeller {
+namespace scene {
+namespace importer {
+
+// Sets the file access mode of the file at path 'p' to 0644.
+static bool SetPermissiveAccess(const std::filesystem::path& p) {
+  auto permissions =
+      std::filesystem::perms::owner_read | std::filesystem::perms::owner_write |
+      std::filesystem::perms::group_read | std::filesystem::perms::others_read;
+  std::error_code error;
+  std::filesystem::permissions(p, permissions, error);
+  if (error) {
+    std::cerr << "Failed to set access on file '" << p
+              << "': " << error.message() << std::endl;
+    return false;
+  }
+  return true;
+}
+
+bool Main(const fml::CommandLine& command_line) {
+  fml::InstallCrashHandler();
+  if (command_line.HasOption("help")) {
+    Switches::PrintHelp(std::cout);
+    return true;
+  }
+
+  Switches switches(command_line);
+  if (!switches.AreValid(std::cerr)) {
+    std::cerr << "Invalid flags specified." << std::endl;
+    Switches::PrintHelp(std::cerr);
+    return false;
+  }
+
+  auto source_file_mapping =
+      fml::FileMapping::CreateReadOnly(switches.source_file_name);
+  if (!source_file_mapping) {
+    std::cerr << "Could not open input file." << std::endl;
+    return false;
+  }
+
+  fb::SceneT scene;
+  bool success = false;
+  switch (switches.input_type) {
+    case SourceType::kGLTF:
+      success = ParseGLTF(*source_file_mapping, scene);
+      break;
+    case SourceType::kUnknown:
+      std::cerr << "Unknown input type." << std::endl;
+      return false;
+  }
+  if (!success) {
+    std::cerr << "Failed to parse input file." << std::endl;
+    return false;
+  }
+
+  flatbuffers::FlatBufferBuilder builder;
+  builder.Finish(fb::Scene::Pack(builder, &scene), fb::SceneIdentifier());
+
+  auto output_file_name = std::filesystem::absolute(
+      std::filesystem::current_path() / switches.output_file_name);
+  fml::NonOwnedMapping mapping(builder.GetCurrentBufferPointer(),
+                               builder.GetSize());
+  if (!fml::WriteAtomically(*switches.working_directory,
+                            compiler::Utf8FromPath(output_file_name).c_str(),
+                            mapping)) {
+    std::cerr << "Could not write file to " << switches.output_file_name
+              << std::endl;
+    return false;
+  }
+
+  // Tools that consume the geometry data expect the access mode to be 0644.
+  if (!SetPermissiveAccess(output_file_name)) {
+    return false;
+  }
+
+  return true;
+}
+
+}  // namespace importer
+}  // namespace scene
+}  // namespace impeller
+
+int main(int argc, char const* argv[]) {
+  return impeller::scene::importer::Main(
+             fml::CommandLineFromPlatformOrArgcArgv(argc, argv))
+             ? EXIT_SUCCESS
+             : EXIT_FAILURE;
+}
diff --git a/impeller/scene/importer/switches.cc b/impeller/scene/importer/switches.cc
new file mode 100644
index 0000000000000000000000000000000000000000..518e04d29f3ba2c699193b8b0cd8a2be5421c338
--- /dev/null
+++ b/impeller/scene/importer/switches.cc
@@ -0,0 +1,95 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/scene/importer/switches.h"
+
+#include <algorithm>
+#include <cctype>
+#include <filesystem>
+#include <map>
+
+#include "flutter/fml/file.h"
+#include "impeller/compiler/utilities.h"
+#include "impeller/scene/importer/types.h"
+
+namespace impeller {
+namespace scene {
+namespace importer {
+
+static const std::map<std::string, SourceType> kKnownSourceTypes = {
+    {"gltf", SourceType::kGLTF},
+};
+
+void Switches::PrintHelp(std::ostream& stream) {
+  stream << std::endl;
+  stream << "SceneC is an offline 3D geometry file parser." << std::endl;
+  stream << "---------------------------------------------------------------"
+         << std::endl;
+  stream << "Valid Argument are:" << std::endl;
+  stream << "--input=<source_file>" << std::endl;
+  stream << "[optional] --input-kind={";
+  for (const auto& source_type : kKnownSourceTypes) {
+    stream << source_type.first << ", ";
+  }
+  stream << "} (default: gltf)" << std::endl;
+  stream << "--output=<output_file>" << std::endl;
+}
+
+Switches::Switches() = default;
+
+Switches::~Switches() = default;
+
+static SourceType SourceTypeFromCommandLine(
+    const fml::CommandLine& command_line) {
+  auto source_type_option =
+      command_line.GetOptionValueWithDefault("input-type", "gltf");
+  auto source_type_search = kKnownSourceTypes.find(source_type_option);
+  if (source_type_search == kKnownSourceTypes.end()) {
+    return SourceType::kUnknown;
+  }
+  return source_type_search->second;
+}
+
+Switches::Switches(const fml::CommandLine& command_line)
+    : working_directory(std::make_shared<fml::UniqueFD>(fml::OpenDirectory(
+          compiler::Utf8FromPath(std::filesystem::current_path()).c_str(),
+          false,  // create if necessary,
+          fml::FilePermission::kRead))),
+      source_file_name(command_line.GetOptionValueWithDefault("input", "")),
+      input_type(SourceTypeFromCommandLine(command_line)),
+      output_file_name(command_line.GetOptionValueWithDefault("output", "")) {
+  if (!working_directory || !working_directory->is_valid()) {
+    return;
+  }
+}
+
+bool Switches::AreValid(std::ostream& explain) const {
+  bool valid = true;
+
+  if (input_type == SourceType::kUnknown) {
+    explain << "Unknown input type." << std::endl;
+    valid = false;
+  }
+
+  if (!working_directory || !working_directory->is_valid()) {
+    explain << "Could not figure out working directory." << std::endl;
+    valid = false;
+  }
+
+  if (source_file_name.empty()) {
+    explain << "Input file name was empty." << std::endl;
+    valid = false;
+  }
+
+  if (output_file_name.empty()) {
+    explain << "Target output file name was empty." << std::endl;
+    valid = false;
+  }
+
+  return valid;
+}
+
+}  // namespace importer
+}  // namespace scene
+}  // namespace impeller
diff --git a/impeller/scene/importer/switches.h b/impeller/scene/importer/switches.h
new file mode 100644
index 0000000000000000000000000000000000000000..3b5294442ad37abb38f81399b95cea6765b9e40a
--- /dev/null
+++ b/impeller/scene/importer/switches.h
@@ -0,0 +1,41 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_SCENE_IMPORTER_SWITCHES_H_
+#define FLUTTER_IMPELLER_SCENE_IMPORTER_SWITCHES_H_
+
+#include <iostream>
+#include <memory>
+
+#include "flutter/fml/command_line.h"
+#include "flutter/fml/macros.h"
+#include "flutter/fml/unique_fd.h"
+#include "impeller/scene/importer/types.h"
+
+namespace impeller {
+namespace scene {
+namespace importer {
+
+struct Switches {
+  std::shared_ptr<fml::UniqueFD> working_directory;
+  std::string source_file_name;
+  SourceType input_type;
+  std::string output_file_name;
+
+  Switches();
+
+  ~Switches();
+
+  explicit Switches(const fml::CommandLine& command_line);
+
+  bool AreValid(std::ostream& explain) const;
+
+  static void PrintHelp(std::ostream& stream);
+};
+
+}  // namespace importer
+}  // namespace scene
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_SCENE_IMPORTER_SWITCHES_H_
diff --git a/impeller/base/work_queue.cc b/impeller/scene/importer/types.h
similarity index 43%
rename from impeller/base/work_queue.cc
rename to impeller/scene/importer/types.h
index f4a375496207a882e4c01d839a466975b9e826cc..0312618e5aa04d5a08d44131043e87eb4ab16ed5 100644
--- a/impeller/base/work_queue.cc
+++ b/impeller/scene/importer/types.h
@@ -2,12 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/impeller/base/work_queue.h"
+#ifndef FLUTTER_IMPELLER_SCENE_IMPORTER_TYPES_H_
+#define FLUTTER_IMPELLER_SCENE_IMPORTER_TYPES_H_
 
 namespace impeller {
+namespace scene {
+namespace importer {
 
-WorkQueue::WorkQueue() = default;
-
-WorkQueue::~WorkQueue() = default;
+enum class SourceType {
+  kUnknown,
+  kGLTF,
+};
 
+}  // namespace importer
+}  // namespace scene
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_SCENE_IMPORTER_TYPES_H_
diff --git a/impeller/scene/importer/vertices_builder.cc b/impeller/scene/importer/vertices_builder.cc
new file mode 100644
index 0000000000000000000000000000000000000000..589bd0abf6714b5d85ff52f2f9d4673ae4e5b0fa
--- /dev/null
+++ b/impeller/scene/importer/vertices_builder.cc
@@ -0,0 +1,241 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/scene/importer/vertices_builder.h"
+
+#include <cstdint>
+#include <cstring>
+#include <limits>
+#include <memory>
+#include <type_traits>
+
+#include "flutter/fml/logging.h"
+#include "impeller/scene/importer/conversions.h"
+#include "impeller/scene/importer/scene_flatbuffers.h"
+
+namespace impeller {
+namespace scene {
+namespace importer {
+
+//------------------------------------------------------------------------------
+/// VerticesBuilder
+///
+
+std::unique_ptr<VerticesBuilder> VerticesBuilder::MakeUnskinned() {
+  return std::make_unique<UnskinnedVerticesBuilder>();
+}
+
+std::unique_ptr<VerticesBuilder> VerticesBuilder::MakeSkinned() {
+  return std::make_unique<SkinnedVerticesBuilder>();
+}
+
+VerticesBuilder::VerticesBuilder() = default;
+
+VerticesBuilder::~VerticesBuilder() = default;
+
+/// @brief  Reads a numeric component from `source` and returns a 32bit float.
+///         If `normalized` is `true`, signed SourceTypes convert to a range of
+///         -1 to 1, and unsigned SourceTypes convert to a range of 0 to 1.
+template <typename SourceType>
+static Scalar ToScalar(const void* source, size_t index, bool normalized) {
+  const SourceType* s = reinterpret_cast<const SourceType*>(source) + index;
+  Scalar result = static_cast<Scalar>(*s);
+  if (normalized) {
+    constexpr SourceType divisor = std::is_integral_v<SourceType>
+                                       ? std::numeric_limits<SourceType>::max()
+                                       : 1;
+    result = static_cast<Scalar>(*s) / static_cast<Scalar>(divisor);
+  }
+  return result;
+}
+
+/// @brief  A ComponentWriter which simply converts all of an attribute's
+///         components to normalized scalar form.
+static void PassthroughAttributeWriter(
+    Scalar* destination,
+    const void* source,
+    const VerticesBuilder::ComponentProperties& component,
+    const VerticesBuilder::AttributeProperties& attribute) {
+  FML_DCHECK(attribute.size_bytes ==
+             attribute.component_count * sizeof(Scalar));
+  for (size_t component_i = 0; component_i < attribute.component_count;
+       component_i++) {
+    *(destination + component_i) =
+        component.convert_proc(source, component_i, true);
+  }
+}
+
+/// @brief  A ComponentWriter which converts four vertex indices to scalars.
+static void JointsAttributeWriter(
+    Scalar* destination,
+    const void* source,
+    const VerticesBuilder::ComponentProperties& component,
+    const VerticesBuilder::AttributeProperties& attribute) {
+  FML_DCHECK(attribute.component_count == 4);
+  for (int i = 0; i < 4; i++) {
+    *(destination + i) = component.convert_proc(source, i, false);
+  }
+}
+
+std::map<VerticesBuilder::AttributeType, VerticesBuilder::AttributeProperties>
+    VerticesBuilder::kAttributeTypes = {
+        {VerticesBuilder::AttributeType::kPosition,
+         {.offset_bytes = offsetof(UnskinnedVerticesBuilder::Vertex, position),
+          .size_bytes = sizeof(UnskinnedVerticesBuilder::Vertex::position),
+          .component_count = 3,
+          .write_proc = PassthroughAttributeWriter}},
+        {VerticesBuilder::AttributeType::kNormal,
+         {.offset_bytes = offsetof(UnskinnedVerticesBuilder::Vertex, normal),
+          .size_bytes = sizeof(UnskinnedVerticesBuilder::Vertex::normal),
+          .component_count = 3,
+          .write_proc = PassthroughAttributeWriter}},
+        {VerticesBuilder::AttributeType::kTangent,
+         {.offset_bytes = offsetof(UnskinnedVerticesBuilder::Vertex, tangent),
+          .size_bytes = sizeof(UnskinnedVerticesBuilder::Vertex::tangent),
+          .component_count = 4,
+          .write_proc = PassthroughAttributeWriter}},
+        {VerticesBuilder::AttributeType::kTextureCoords,
+         {.offset_bytes =
+              offsetof(UnskinnedVerticesBuilder::Vertex, texture_coords),
+          .size_bytes =
+              sizeof(UnskinnedVerticesBuilder::Vertex::texture_coords),
+          .component_count = 2,
+          .write_proc = PassthroughAttributeWriter}},
+        {VerticesBuilder::AttributeType::kColor,
+         {.offset_bytes = offsetof(UnskinnedVerticesBuilder::Vertex, color),
+          .size_bytes = sizeof(UnskinnedVerticesBuilder::Vertex::color),
+          .component_count = 4,
+          .write_proc = PassthroughAttributeWriter}},
+        {VerticesBuilder::AttributeType::kJoints,
+         {.offset_bytes = offsetof(SkinnedVerticesBuilder::Vertex, joints),
+          .size_bytes = sizeof(SkinnedVerticesBuilder::Vertex::joints),
+          .component_count = 4,
+          .write_proc = JointsAttributeWriter}},
+        {VerticesBuilder::AttributeType::kWeights,
+         {.offset_bytes = offsetof(SkinnedVerticesBuilder::Vertex, weights),
+          .size_bytes = sizeof(SkinnedVerticesBuilder::Vertex::weights),
+          .component_count = 4,
+          .write_proc = JointsAttributeWriter}}};
+
+static std::map<VerticesBuilder::ComponentType,
+                VerticesBuilder::ComponentProperties>
+    kComponentTypes = {
+        {VerticesBuilder::ComponentType::kSignedByte,
+         {.size_bytes = sizeof(int8_t), .convert_proc = ToScalar<int8_t>}},
+        {VerticesBuilder::ComponentType::kUnsignedByte,
+         {.size_bytes = sizeof(int8_t), .convert_proc = ToScalar<uint8_t>}},
+        {VerticesBuilder::ComponentType::kSignedShort,
+         {.size_bytes = sizeof(int16_t), .convert_proc = ToScalar<int16_t>}},
+        {VerticesBuilder::ComponentType::kUnsignedShort,
+         {.size_bytes = sizeof(int16_t), .convert_proc = ToScalar<uint16_t>}},
+        {VerticesBuilder::ComponentType::kSignedInt,
+         {.size_bytes = sizeof(int32_t), .convert_proc = ToScalar<int32_t>}},
+        {VerticesBuilder::ComponentType::kUnsignedInt,
+         {.size_bytes = sizeof(int32_t), .convert_proc = ToScalar<uint32_t>}},
+        {VerticesBuilder::ComponentType::kFloat,
+         {.size_bytes = sizeof(float), .convert_proc = ToScalar<float>}},
+};
+
+void VerticesBuilder::WriteAttribute(void* destination,
+                                     size_t destination_stride_bytes,
+                                     AttributeType attribute,
+                                     ComponentType component_type,
+                                     const void* source,
+                                     size_t attribute_stride_bytes,
+                                     size_t attribute_count) {
+  const ComponentProperties& component_props = kComponentTypes[component_type];
+  const AttributeProperties& attribute_props = kAttributeTypes[attribute];
+  for (size_t i = 0; i < attribute_count; i++) {
+    const uint8_t* src =
+        reinterpret_cast<const uint8_t*>(source) + attribute_stride_bytes * i;
+    uint8_t* dst = reinterpret_cast<uint8_t*>(destination) +
+                   i * destination_stride_bytes + attribute_props.offset_bytes;
+
+    attribute_props.write_proc(reinterpret_cast<Scalar*>(dst), src,
+                               component_props, attribute_props);
+  }
+}
+
+//------------------------------------------------------------------------------
+/// UnskinnedVerticesBuilder
+///
+
+UnskinnedVerticesBuilder::UnskinnedVerticesBuilder() = default;
+
+UnskinnedVerticesBuilder::~UnskinnedVerticesBuilder() = default;
+
+void UnskinnedVerticesBuilder::WriteFBVertices(
+    fb::MeshPrimitiveT& primitive) const {
+  auto vertex_buffer = fb::UnskinnedVertexBufferT();
+  vertex_buffer.vertices.resize(0);
+  for (auto& v : vertices_) {
+    vertex_buffer.vertices.push_back(fb::Vertex(
+        ToFBVec3(v.position), ToFBVec3(v.normal), ToFBVec4(v.tangent),
+        ToFBVec2(v.texture_coords), ToFBColor(v.color)));
+  }
+  primitive.vertices.Set(std::move(vertex_buffer));
+}
+
+void UnskinnedVerticesBuilder::SetAttributeFromBuffer(
+    AttributeType attribute,
+    ComponentType component_type,
+    const void* buffer_start,
+    size_t attribute_stride_bytes,
+    size_t attribute_count) {
+  if (attribute_count > vertices_.size()) {
+    vertices_.resize(attribute_count, Vertex());
+  }
+  WriteAttribute(vertices_.data(),        // destination
+                 sizeof(Vertex),          // destination_stride_bytes
+                 attribute,               // attribute
+                 component_type,          // component_type
+                 buffer_start,            // source
+                 attribute_stride_bytes,  // attribute_stride_bytes
+                 attribute_count);        // attribute_count
+}
+
+//------------------------------------------------------------------------------
+/// SkinnedVerticesBuilder
+///
+
+SkinnedVerticesBuilder::SkinnedVerticesBuilder() = default;
+
+SkinnedVerticesBuilder::~SkinnedVerticesBuilder() = default;
+
+void SkinnedVerticesBuilder::WriteFBVertices(
+    fb::MeshPrimitiveT& primitive) const {
+  auto vertex_buffer = fb::SkinnedVertexBufferT();
+  vertex_buffer.vertices.resize(0);
+  for (auto& v : vertices_) {
+    auto unskinned_attributes = fb::Vertex(
+        ToFBVec3(v.vertex.position), ToFBVec3(v.vertex.normal),
+        ToFBVec4(v.vertex.tangent), ToFBVec2(v.vertex.texture_coords),
+        ToFBColor(v.vertex.color));
+    vertex_buffer.vertices.push_back(fb::SkinnedVertex(
+        unskinned_attributes, ToFBVec4(v.joints), ToFBVec4(v.weights)));
+  }
+  primitive.vertices.Set(std::move(vertex_buffer));
+}
+
+void SkinnedVerticesBuilder::SetAttributeFromBuffer(
+    AttributeType attribute,
+    ComponentType component_type,
+    const void* buffer_start,
+    size_t attribute_stride_bytes,
+    size_t attribute_count) {
+  if (attribute_count > vertices_.size()) {
+    vertices_.resize(attribute_count, Vertex());
+  }
+  WriteAttribute(vertices_.data(),        // destination
+                 sizeof(Vertex),          // destination_stride_bytes
+                 attribute,               // attribute
+                 component_type,          // component_type
+                 buffer_start,            // source
+                 attribute_stride_bytes,  // attribute_stride_bytes
+                 attribute_count);        // attribute_count
+}
+
+}  // namespace importer
+}  // namespace scene
+}  // namespace impeller
diff --git a/impeller/scene/importer/vertices_builder.h b/impeller/scene/importer/vertices_builder.h
new file mode 100644
index 0000000000000000000000000000000000000000..4244a2563d3cb573ed82bc99bb0f0a7fa75ef6f5
--- /dev/null
+++ b/impeller/scene/importer/vertices_builder.h
@@ -0,0 +1,174 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_SCENE_IMPORTER_VERTICES_BUILDER_H_
+#define FLUTTER_IMPELLER_SCENE_IMPORTER_VERTICES_BUILDER_H_
+
+#include <cstddef>
+#include <map>
+
+#include "flutter/fml/macros.h"
+#include "impeller/geometry/matrix.h"
+#include "impeller/scene/importer/scene_flatbuffers.h"
+
+namespace impeller {
+namespace scene {
+namespace importer {
+
+//------------------------------------------------------------------------------
+/// VerticesBuilder
+///
+
+class VerticesBuilder {
+ public:
+  static std::unique_ptr<VerticesBuilder> MakeUnskinned();
+
+  static std::unique_ptr<VerticesBuilder> MakeSkinned();
+
+  enum class ComponentType {
+    kSignedByte = 5120,
+    kUnsignedByte,
+    kSignedShort,
+    kUnsignedShort,
+    kSignedInt,
+    kUnsignedInt,
+    kFloat,
+  };
+
+  enum class AttributeType {
+    kPosition,
+    kNormal,
+    kTangent,
+    kTextureCoords,
+    kColor,
+    kJoints,
+    kWeights,
+  };
+
+  using ComponentConverter = std::function<
+      Scalar(const void* source, size_t byte_offset, bool normalized)>;
+  struct ComponentProperties {
+    size_t size_bytes = 0;
+    ComponentConverter convert_proc;
+  };
+
+  struct AttributeProperties;
+  using AttributeWriter =
+      std::function<void(Scalar* destination,
+                         const void* source,
+                         const ComponentProperties& component_props,
+                         const AttributeProperties& attribute_props)>;
+  struct AttributeProperties {
+    size_t offset_bytes = 0;
+    size_t size_bytes = 0;
+    size_t component_count = 0;
+    AttributeWriter write_proc;
+  };
+
+  VerticesBuilder();
+
+  virtual ~VerticesBuilder();
+
+  virtual void WriteFBVertices(fb::MeshPrimitiveT& primitive) const = 0;
+
+  virtual void SetAttributeFromBuffer(AttributeType attribute,
+                                      ComponentType component_type,
+                                      const void* buffer_start,
+                                      size_t attribute_stride_bytes,
+                                      size_t attribute_count) = 0;
+
+ protected:
+  static void WriteAttribute(void* destination,
+                             size_t destination_stride_bytes,
+                             AttributeType attribute,
+                             ComponentType component_type,
+                             const void* source,
+                             size_t attribute_stride_bytes,
+                             size_t attribute_count);
+
+ private:
+  static std::map<VerticesBuilder::AttributeType,
+                  VerticesBuilder::AttributeProperties>
+      kAttributeTypes;
+
+  VerticesBuilder(const VerticesBuilder&) = delete;
+
+  VerticesBuilder& operator=(const VerticesBuilder&) = delete;
+};
+
+//------------------------------------------------------------------------------
+/// UnskinnedVerticesBuilder
+///
+
+class UnskinnedVerticesBuilder final : public VerticesBuilder {
+ public:
+  struct Vertex {
+    Vector3 position;
+    Vector3 normal;
+    Vector4 tangent;
+    Vector2 texture_coords;
+    Color color = Color::White();
+  };
+
+  UnskinnedVerticesBuilder();
+
+  virtual ~UnskinnedVerticesBuilder() override;
+
+  // |VerticesBuilder|
+  void WriteFBVertices(fb::MeshPrimitiveT& primitive) const override;
+
+  // |VerticesBuilder|
+  void SetAttributeFromBuffer(AttributeType attribute,
+                              ComponentType component_type,
+                              const void* buffer_start,
+                              size_t attribute_stride_bytes,
+                              size_t attribute_count) override;
+
+ private:
+  std::vector<Vertex> vertices_;
+
+  UnskinnedVerticesBuilder(const UnskinnedVerticesBuilder&) = delete;
+
+  UnskinnedVerticesBuilder& operator=(const UnskinnedVerticesBuilder&) = delete;
+};
+
+//------------------------------------------------------------------------------
+/// SkinnedVerticesBuilder
+///
+
+class SkinnedVerticesBuilder final : public VerticesBuilder {
+ public:
+  struct Vertex {
+    UnskinnedVerticesBuilder::Vertex vertex;
+    Vector4 joints;
+    Vector4 weights;
+  };
+
+  SkinnedVerticesBuilder();
+
+  virtual ~SkinnedVerticesBuilder() override;
+
+  // |VerticesBuilder|
+  void WriteFBVertices(fb::MeshPrimitiveT& primitive) const override;
+
+  // |VerticesBuilder|
+  void SetAttributeFromBuffer(AttributeType attribute,
+                              ComponentType component_type,
+                              const void* buffer_start,
+                              size_t attribute_stride_bytes,
+                              size_t attribute_count) override;
+
+ private:
+  std::vector<Vertex> vertices_;
+
+  SkinnedVerticesBuilder(const SkinnedVerticesBuilder&) = delete;
+
+  SkinnedVerticesBuilder& operator=(const SkinnedVerticesBuilder&) = delete;
+};
+
+}  // namespace importer
+}  // namespace scene
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_SCENE_IMPORTER_VERTICES_BUILDER_H_
diff --git a/impeller/scene/material.cc b/impeller/scene/material.cc
index a37b2bf51f6316d2f8ed7fd44a0fbafc1e746f75..5794c95425148c5a712c780052016ed6c052100a 100644
--- a/impeller/scene/material.cc
+++ b/impeller/scene/material.cc
@@ -3,9 +3,13 @@
 // found in the LICENSE file.
 
 #include "impeller/scene/material.h"
-#include "impeller/renderer/formats.h"
-#include "impeller/renderer/sampler_descriptor.h"
-#include "impeller/renderer/sampler_library.h"
+#include "impeller/base/validation.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/sampler_descriptor.h"
+#include "impeller/renderer/render_pass.h"
+#include "impeller/scene/importer/conversions.h"
+#include "impeller/scene/importer/scene_flatbuffers.h"
+#include "impeller/scene/pipeline_key.h"
 #include "impeller/scene/scene_context.h"
 #include "impeller/scene/shaders/unlit.frag.h"
 
@@ -18,12 +22,29 @@ namespace scene {
 /// Material
 ///
 
+Material::~Material() = default;
+
+std::unique_ptr<Material> Material::MakeFromFlatbuffer(
+    const fb::Material& material,
+    const std::vector<std::shared_ptr<Texture>>& textures) {
+  switch (material.type()) {
+    case fb::MaterialType::kUnlit:
+      return UnlitMaterial::MakeFromFlatbuffer(material, textures);
+    case fb::MaterialType::kPhysicallyBased:
+      return PhysicallyBasedMaterial::MakeFromFlatbuffer(material, textures);
+  }
+}
+
 std::unique_ptr<UnlitMaterial> Material::MakeUnlit() {
   return std::make_unique<UnlitMaterial>();
 }
 
-std::unique_ptr<StandardMaterial> Material::MakeStandard() {
-  return std::make_unique<StandardMaterial>();
+std::unique_ptr<PhysicallyBasedMaterial> Material::MakePhysicallyBased() {
+  return std::make_unique<PhysicallyBasedMaterial>();
+}
+
+void Material::SetVertexColorWeight(Scalar weight) {
+  vertex_color_weight_ = weight;
 }
 
 void Material::SetBlendConfig(BlendConfig blend_config) {
@@ -47,6 +68,31 @@ SceneContextOptions Material::GetContextOptions(const RenderPass& pass) const {
 /// UnlitMaterial
 ///
 
+std::unique_ptr<UnlitMaterial> UnlitMaterial::MakeFromFlatbuffer(
+    const fb::Material& material,
+    const std::vector<std::shared_ptr<Texture>>& textures) {
+  if (material.type() != fb::MaterialType::kUnlit) {
+    VALIDATION_LOG << "Cannot unpack unlit material because the ipscene "
+                      "material type is not unlit.";
+    return nullptr;
+  }
+
+  auto result = Material::MakeUnlit();
+
+  if (material.base_color_factor()) {
+    result->SetColor(importer::ToColor(*material.base_color_factor()));
+  }
+
+  if (material.base_color_texture() >= 0 &&
+      material.base_color_texture() < static_cast<int32_t>(textures.size())) {
+    result->SetColorTexture(textures[material.base_color_texture()]);
+  }
+
+  return result;
+}
+
+UnlitMaterial::~UnlitMaterial() = default;
+
 void UnlitMaterial::SetColor(Color color) {
   color_ = color;
 }
@@ -56,21 +102,19 @@ void UnlitMaterial::SetColorTexture(std::shared_ptr<Texture> color_texture) {
 }
 
 // |Material|
-std::shared_ptr<Pipeline<PipelineDescriptor>> UnlitMaterial::GetPipeline(
-    const SceneContext& scene_context,
-    const RenderPass& pass) const {
-  return scene_context.GetUnlitPipeline(GetContextOptions(pass));
+MaterialType UnlitMaterial::GetMaterialType() const {
+  return MaterialType::kUnlit;
 }
 
 // |Material|
 void UnlitMaterial::BindToCommand(const SceneContext& scene_context,
                                   HostBuffer& buffer,
-                                  Command& command) const {
+                                  RenderPass& pass) const {
   // Uniform buffer.
-  UnlitPipeline::FragmentShader::FragInfo info;
+  UnlitFragmentShader::FragInfo info;
   info.color = color_;
-  UnlitPipeline::FragmentShader::BindFragInfo(command,
-                                              buffer.EmplaceUniform(info));
+  info.vertex_color_weight = vertex_color_weight_;
+  UnlitFragmentShader::BindFragInfo(pass, buffer.EmplaceUniform(info));
 
   // Textures.
   SamplerDescriptor sampler_descriptor;
@@ -78,8 +122,8 @@ void UnlitMaterial::BindToCommand(const SceneContext& scene_context,
   sampler_descriptor.min_filter = MinMagFilter::kLinear;
   sampler_descriptor.mag_filter = MinMagFilter::kLinear;
   sampler_descriptor.mip_filter = MipFilter::kLinear;
-  UnlitPipeline::FragmentShader::BindBaseColorTexture(
-      command,
+  UnlitFragmentShader::BindBaseColorTexture(
+      pass,
       color_texture_ ? color_texture_ : scene_context.GetPlaceholderTexture(),
       scene_context.GetContext()->GetSamplerLibrary()->GetSampler(
           sampler_descriptor));
@@ -89,50 +133,96 @@ void UnlitMaterial::BindToCommand(const SceneContext& scene_context,
 /// StandardMaterial
 ///
 
-void StandardMaterial::SetAlbedo(Color albedo) {
+std::unique_ptr<PhysicallyBasedMaterial>
+PhysicallyBasedMaterial::MakeFromFlatbuffer(
+    const fb::Material& material,
+    const std::vector<std::shared_ptr<Texture>>& textures) {
+  if (material.type() != fb::MaterialType::kPhysicallyBased) {
+    VALIDATION_LOG << "Cannot unpack unlit material because the ipscene "
+                      "material type is not unlit.";
+    return nullptr;
+  }
+
+  auto result = Material::MakePhysicallyBased();
+
+  result->SetAlbedo(material.base_color_factor()
+                        ? importer::ToColor(*material.base_color_factor())
+                        : Color::White());
+  result->SetRoughness(material.roughness_factor());
+  result->SetMetallic(material.metallic_factor());
+
+  if (material.base_color_texture() >= 0 &&
+      material.base_color_texture() < static_cast<int32_t>(textures.size())) {
+    result->SetAlbedoTexture(textures[material.base_color_texture()]);
+    result->SetVertexColorWeight(0);
+  }
+  if (material.metallic_roughness_texture() >= 0 &&
+      material.metallic_roughness_texture() <
+          static_cast<int32_t>(textures.size())) {
+    result->SetMetallicRoughnessTexture(
+        textures[material.metallic_roughness_texture()]);
+  }
+  if (material.normal_texture() >= 0 &&
+      material.normal_texture() < static_cast<int32_t>(textures.size())) {
+    result->SetNormalTexture(textures[material.normal_texture()]);
+  }
+  if (material.occlusion_texture() >= 0 &&
+      material.occlusion_texture() < static_cast<int32_t>(textures.size())) {
+    result->SetOcclusionTexture(textures[material.occlusion_texture()]);
+  }
+
+  return result;
+}
+
+PhysicallyBasedMaterial::~PhysicallyBasedMaterial() = default;
+
+void PhysicallyBasedMaterial::SetAlbedo(Color albedo) {
   albedo_ = albedo;
 }
 
-void StandardMaterial::SetRoughness(Scalar roughness) {
+void PhysicallyBasedMaterial::SetRoughness(Scalar roughness) {
   roughness_ = roughness;
 }
 
-void StandardMaterial::SetMetallic(Scalar metallic) {
+void PhysicallyBasedMaterial::SetMetallic(Scalar metallic) {
   metallic_ = metallic;
 }
 
-void StandardMaterial::SetAlbedoTexture(
+void PhysicallyBasedMaterial::SetAlbedoTexture(
     std::shared_ptr<Texture> albedo_texture) {
   albedo_texture_ = std::move(albedo_texture);
 }
 
-void StandardMaterial::SetNormalTexture(
+void PhysicallyBasedMaterial::SetMetallicRoughnessTexture(
+    std::shared_ptr<Texture> metallic_roughness_texture) {
+  metallic_roughness_texture_ = std::move(metallic_roughness_texture);
+}
+
+void PhysicallyBasedMaterial::SetNormalTexture(
     std::shared_ptr<Texture> normal_texture) {
   normal_texture_ = std::move(normal_texture);
 }
 
-void StandardMaterial::SetOcclusionRoughnessMetallicTexture(
-    std::shared_ptr<Texture> occlusion_roughness_metallic_texture) {
-  occlusion_roughness_metallic_texture_ =
-      std::move(occlusion_roughness_metallic_texture);
+void PhysicallyBasedMaterial::SetOcclusionTexture(
+    std::shared_ptr<Texture> occlusion_texture) {
+  occlusion_texture_ = std::move(occlusion_texture);
 }
 
-void StandardMaterial::SetEnvironmentMap(
+void PhysicallyBasedMaterial::SetEnvironmentMap(
     std::shared_ptr<Texture> environment_map) {
   environment_map_ = std::move(environment_map);
 }
 
 // |Material|
-std::shared_ptr<Pipeline<PipelineDescriptor>> StandardMaterial::GetPipeline(
-    const SceneContext& scene_context,
-    const RenderPass& pass) const {
-  return nullptr;
+MaterialType PhysicallyBasedMaterial::GetMaterialType() const {
+  // TODO(bdero): Replace this once a PBR shader has landed.
+  return MaterialType::kUnlit;
 }
 
 // |Material|
-void StandardMaterial::BindToCommand(const SceneContext& scene_context,
-                                     HostBuffer& buffer,
-                                     Command& command) const {}
+void PhysicallyBasedMaterial::BindToCommand(const SceneContext& scene_context,
+                                            HostBuffer& buffer,
+                                            RenderPass& pass) const {}
 
 }  // namespace scene
 }  // namespace impeller
diff --git a/impeller/scene/material.h b/impeller/scene/material.h
index a579467304846845a69332c3129fda7aba38e65c..fda78807241bfb87907f9ed3d197cd360e208f27 100644
--- a/impeller/scene/material.h
+++ b/impeller/scene/material.h
@@ -2,14 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_SCENE_MATERIAL_H_
+#define FLUTTER_IMPELLER_SCENE_MATERIAL_H_
 
 #include <memory>
 
+#include "impeller/core/formats.h"
+#include "impeller/core/texture.h"
 #include "impeller/geometry/scalar.h"
-#include "impeller/renderer/formats.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/texture.h"
+#include "impeller/scene/importer/scene_flatbuffers.h"
+#include "impeller/scene/pipeline_key.h"
 
 namespace impeller {
 namespace scene {
@@ -19,7 +22,7 @@ struct SceneContextOptions;
 class Geometry;
 
 class UnlitMaterial;
-class StandardMaterial;
+class PhysicallyBasedMaterial;
 
 class Material {
  public:
@@ -37,24 +40,31 @@ class Material {
     CompareFunction compare = CompareFunction::kAlways;
   };
 
+  static std::unique_ptr<Material> MakeFromFlatbuffer(
+      const fb::Material& material,
+      const std::vector<std::shared_ptr<Texture>>& textures);
+
   static std::unique_ptr<UnlitMaterial> MakeUnlit();
-  static std::unique_ptr<StandardMaterial> MakeStandard();
+  static std::unique_ptr<PhysicallyBasedMaterial> MakePhysicallyBased();
+
+  virtual ~Material();
 
+  void SetVertexColorWeight(Scalar weight);
   void SetBlendConfig(BlendConfig blend_config);
   void SetStencilConfig(StencilConfig stencil_config);
 
   void SetTranslucent(bool is_translucent);
 
-  virtual std::shared_ptr<Pipeline<PipelineDescriptor>> GetPipeline(
-      const SceneContext& scene_context,
-      const RenderPass& pass) const = 0;
+  SceneContextOptions GetContextOptions(const RenderPass& pass) const;
+
+  virtual MaterialType GetMaterialType() const = 0;
+
   virtual void BindToCommand(const SceneContext& scene_context,
                              HostBuffer& buffer,
-                             Command& command) const = 0;
+                             RenderPass& pass) const = 0;
 
  protected:
-  SceneContextOptions GetContextOptions(const RenderPass& pass) const;
-
+  Scalar vertex_color_weight_ = 1;
   BlendConfig blend_config_;
   StencilConfig stencil_config_;
   bool is_translucent_ = false;
@@ -62,59 +72,71 @@ class Material {
 
 class UnlitMaterial final : public Material {
  public:
+  static std::unique_ptr<UnlitMaterial> MakeFromFlatbuffer(
+      const fb::Material& material,
+      const std::vector<std::shared_ptr<Texture>>& textures);
+
+  ~UnlitMaterial();
+
   void SetColor(Color color);
 
   void SetColorTexture(std::shared_ptr<Texture> color_texture);
 
   // |Material|
-  std::shared_ptr<Pipeline<PipelineDescriptor>> GetPipeline(
-      const SceneContext& scene_context,
-      const RenderPass& pass) const override;
+  MaterialType GetMaterialType() const override;
 
   // |Material|
   void BindToCommand(const SceneContext& scene_context,
                      HostBuffer& buffer,
-                     Command& command) const override;
+                     RenderPass& pass) const override;
 
  private:
   Color color_ = Color::White();
   std::shared_ptr<Texture> color_texture_;
 };
 
-class StandardMaterial final : public Material {
+class PhysicallyBasedMaterial final : public Material {
  public:
+  static std::unique_ptr<PhysicallyBasedMaterial> MakeFromFlatbuffer(
+      const fb::Material& material,
+      const std::vector<std::shared_ptr<Texture>>& textures);
+
+  ~PhysicallyBasedMaterial();
+
   void SetAlbedo(Color albedo);
   void SetRoughness(Scalar roughness);
   void SetMetallic(Scalar metallic);
 
   void SetAlbedoTexture(std::shared_ptr<Texture> albedo_texture);
+  void SetMetallicRoughnessTexture(
+      std::shared_ptr<Texture> metallic_roughness_texture);
   void SetNormalTexture(std::shared_ptr<Texture> normal_texture);
-  void SetOcclusionRoughnessMetallicTexture(
-      std::shared_ptr<Texture> occlusion_roughness_metallic_texture);
+  void SetOcclusionTexture(std::shared_ptr<Texture> occlusion_texture);
 
   void SetEnvironmentMap(std::shared_ptr<Texture> environment_map);
 
   // |Material|
-  std::shared_ptr<Pipeline<PipelineDescriptor>> GetPipeline(
-      const SceneContext& scene_context,
-      const RenderPass& pass) const override;
+  MaterialType GetMaterialType() const override;
 
   // |Material|
   void BindToCommand(const SceneContext& scene_context,
                      HostBuffer& buffer,
-                     Command& command) const override;
+                     RenderPass& pass) const override;
 
  private:
   Color albedo_ = Color::White();
-  Scalar roughness_ = 0.5;
   Scalar metallic_ = 0.5;
+  Scalar roughness_ = 0.5;
 
   std::shared_ptr<Texture> albedo_texture_;
+  std::shared_ptr<Texture> metallic_roughness_texture_;
   std::shared_ptr<Texture> normal_texture_;
-  std::shared_ptr<Texture> occlusion_roughness_metallic_texture_;
+  std::shared_ptr<Texture> occlusion_texture_;
 
   std::shared_ptr<Texture> environment_map_;
 };
 
 }  // namespace scene
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_SCENE_MATERIAL_H_
diff --git a/impeller/scene/mesh.cc b/impeller/scene/mesh.cc
new file mode 100644
index 0000000000000000000000000000000000000000..bc4b02da00a80c3329f5abda2745ed36e5e634a5
--- /dev/null
+++ b/impeller/scene/mesh.cc
@@ -0,0 +1,53 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/scene/mesh.h"
+
+#include <memory>
+#include <optional>
+
+#include "impeller/base/validation.h"
+#include "impeller/scene/material.h"
+#include "impeller/scene/pipeline_key.h"
+#include "impeller/scene/scene_encoder.h"
+
+namespace impeller {
+namespace scene {
+
+Mesh::Mesh() = default;
+Mesh::~Mesh() = default;
+
+void Mesh::AddPrimitive(Primitive mesh) {
+  if (mesh.geometry == nullptr) {
+    VALIDATION_LOG << "Mesh geometry cannot be null.";
+  }
+  if (mesh.material == nullptr) {
+    VALIDATION_LOG << "Mesh material cannot be null.";
+  }
+
+  primitives_.push_back(std::move(mesh));
+}
+
+std::vector<Mesh::Primitive>& Mesh::GetPrimitives() {
+  return primitives_;
+}
+
+bool Mesh::Render(SceneEncoder& encoder,
+                  const Matrix& transform,
+                  const std::shared_ptr<Texture>& joints) const {
+  for (const auto& mesh : primitives_) {
+    mesh.geometry->SetJointsTexture(joints);
+    SceneCommand command = {
+        .label = "Mesh Primitive",
+        .transform = transform,
+        .geometry = mesh.geometry.get(),
+        .material = mesh.material.get(),
+    };
+    encoder.Add(command);
+  }
+  return true;
+}
+
+}  // namespace scene
+}  // namespace impeller
diff --git a/impeller/scene/static_mesh_entity.h b/impeller/scene/mesh.h
similarity index 37%
rename from impeller/scene/static_mesh_entity.h
rename to impeller/scene/mesh.h
index 7a1df4543d97335a0d97e5ef83d5f5b02d595e31..008938324cbde4e35620a9703ff6aa2e4165c61a 100644
--- a/impeller/scene/static_mesh_entity.h
+++ b/impeller/scene/mesh.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_SCENE_MESH_H_
+#define FLUTTER_IMPELLER_SCENE_MESH_H_
 
 #include <memory>
 #include <type_traits>
@@ -10,28 +11,42 @@
 #include "flutter/fml/macros.h"
 #include "impeller/scene/geometry.h"
 #include "impeller/scene/material.h"
-#include "impeller/scene/scene_entity.h"
+#include "impeller/scene/scene_encoder.h"
 
 namespace impeller {
 namespace scene {
 
-class StaticMeshEntity final : public SceneEntity {
+class Skin;
+
+class Mesh final {
  public:
-  StaticMeshEntity();
-  ~StaticMeshEntity();
+  struct Primitive {
+    std::shared_ptr<Geometry> geometry;
+    std::shared_ptr<Material> material;
+  };
+
+  Mesh();
+  ~Mesh();
+
+  Mesh(Mesh&& mesh);
+  Mesh& operator=(Mesh&& mesh);
 
-  void SetGeometry(std::shared_ptr<Geometry> material);
-  void SetMaterial(std::shared_ptr<Material> material);
+  void AddPrimitive(Primitive mesh_);
+  std::vector<Primitive>& GetPrimitives();
+
+  bool Render(SceneEncoder& encoder,
+              const Matrix& transform,
+              const std::shared_ptr<Texture>& joints) const;
 
  private:
-  // |SceneEntity|
-  bool OnRender(SceneEncoder& encoder, const Camera& camera) const override;
+  std::vector<Primitive> primitives_;
 
-  std::shared_ptr<Material> material_;
-  std::shared_ptr<Geometry> geometry_;
+  Mesh(const Mesh&) = delete;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(StaticMeshEntity);
+  Mesh& operator=(const Mesh&) = delete;
 };
 
 }  // namespace scene
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_SCENE_MESH_H_
diff --git a/impeller/scene/node.cc b/impeller/scene/node.cc
new file mode 100644
index 0000000000000000000000000000000000000000..aad7fc67199e701c42ca4731194682f36a8cd8e0
--- /dev/null
+++ b/impeller/scene/node.cc
@@ -0,0 +1,417 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/scene/node.h"
+
+#include <inttypes.h>
+#include <atomic>
+#include <memory>
+#include <vector>
+
+#include "flutter/fml/logging.h"
+#include "impeller/base/strings.h"
+#include "impeller/base/thread.h"
+#include "impeller/base/validation.h"
+#include "impeller/geometry/matrix.h"
+#include "impeller/scene/animation/animation_player.h"
+#include "impeller/scene/importer/conversions.h"
+#include "impeller/scene/importer/scene_flatbuffers.h"
+#include "impeller/scene/mesh.h"
+#include "impeller/scene/node.h"
+#include "impeller/scene/scene_encoder.h"
+
+namespace impeller {
+namespace scene {
+
+static std::atomic_uint64_t kNextNodeID = 0;
+
+void Node::MutationLog::Append(const Entry& entry) {
+  WriterLock lock(write_mutex_);
+  dirty_ = true;
+  entries_.push_back(entry);
+}
+
+std::optional<std::vector<Node::MutationLog::Entry>>
+Node::MutationLog::Flush() {
+  WriterLock lock(write_mutex_);
+  if (!dirty_) {
+    return std::nullopt;
+  }
+  dirty_ = false;
+  auto result = entries_;
+  entries_ = {};
+  return result;
+}
+
+std::shared_ptr<Node> Node::MakeFromFlatbuffer(
+    const fml::Mapping& ipscene_mapping,
+    Allocator& allocator) {
+  flatbuffers::Verifier verifier(ipscene_mapping.GetMapping(),
+                                 ipscene_mapping.GetSize());
+  if (!fb::VerifySceneBuffer(verifier)) {
+    VALIDATION_LOG << "Failed to unpack scene: Scene flatbuffer is invalid.";
+    return nullptr;
+  }
+
+  return Node::MakeFromFlatbuffer(*fb::GetScene(ipscene_mapping.GetMapping()),
+                                  allocator);
+}
+
+static std::shared_ptr<Texture> UnpackTextureFromFlatbuffer(
+    const fb::Texture* iptexture,
+    Allocator& allocator) {
+  if (iptexture == nullptr || iptexture->embedded_image() == nullptr ||
+      iptexture->embedded_image()->bytes() == nullptr) {
+    return nullptr;
+  }
+
+  auto embedded = iptexture->embedded_image();
+
+  uint8_t bytes_per_component = 0;
+  switch (embedded->component_type()) {
+    case fb::ComponentType::k8Bit:
+      bytes_per_component = 1;
+      break;
+    case fb::ComponentType::k16Bit:
+      // bytes_per_component = 2;
+      FML_LOG(WARNING) << "16 bit textures not yet supported.";
+      return nullptr;
+  }
+
+  switch (embedded->component_count()) {
+    case 4:
+      // RGBA.
+      break;
+    case 1:
+    case 3:
+    default:
+      FML_LOG(WARNING) << "Textures with " << embedded->component_count()
+                       << " components are not supported." << std::endl;
+      return nullptr;
+  }
+  if (embedded->bytes()->size() != bytes_per_component *
+                                       embedded->component_count() *
+                                       embedded->width() * embedded->height()) {
+    FML_LOG(WARNING) << "Embedded texture has an unexpected size. Skipping."
+                     << std::endl;
+    return nullptr;
+  }
+
+  auto image_mapping = std::make_shared<fml::NonOwnedMapping>(
+      embedded->bytes()->Data(), embedded->bytes()->size());
+
+  auto texture_descriptor = TextureDescriptor{};
+  texture_descriptor.storage_mode = StorageMode::kHostVisible;
+  texture_descriptor.format = PixelFormat::kR8G8B8A8UNormInt;
+  texture_descriptor.size = ISize(embedded->width(), embedded->height());
+  // TODO(bdero): Generate mipmaps for embedded textures.
+  texture_descriptor.mip_count = 1u;
+
+  auto texture = allocator.CreateTexture(texture_descriptor);
+  if (!texture) {
+    FML_LOG(ERROR) << "Could not allocate texture.";
+    return nullptr;
+  }
+
+  auto uploaded = texture->SetContents(image_mapping);
+  if (!uploaded) {
+    FML_LOG(ERROR) << "Could not upload texture to device memory.";
+    return nullptr;
+  }
+
+  return texture;
+}
+
+std::shared_ptr<Node> Node::MakeFromFlatbuffer(const fb::Scene& scene,
+                                               Allocator& allocator) {
+  // Unpack textures.
+  std::vector<std::shared_ptr<Texture>> textures;
+  if (scene.textures()) {
+    for (const auto iptexture : *scene.textures()) {
+      // The elements of the unpacked texture array must correspond exactly with
+      // the ipscene texture array. So if a texture is empty or invalid, a
+      // nullptr is inserted as a placeholder.
+      textures.push_back(UnpackTextureFromFlatbuffer(iptexture, allocator));
+    }
+  }
+
+  auto result = std::make_shared<Node>();
+  result->SetLocalTransform(importer::ToMatrix(*scene.transform()));
+
+  if (!scene.nodes() || !scene.children()) {
+    return result;  // The scene is empty.
+  }
+
+  // Initialize nodes for unpacking the entire scene.
+  std::vector<std::shared_ptr<Node>> scene_nodes;
+  scene_nodes.reserve(scene.nodes()->size());
+  for (size_t node_i = 0; node_i < scene.nodes()->size(); node_i++) {
+    scene_nodes.push_back(std::make_shared<Node>());
+  }
+
+  // Connect children to the root node.
+  for (int child : *scene.children()) {
+    if (child < 0 || static_cast<size_t>(child) >= scene_nodes.size()) {
+      VALIDATION_LOG << "Scene child index out of range.";
+      continue;
+    }
+    result->AddChild(scene_nodes[child]);
+  }
+
+  // Unpack each node.
+  for (size_t node_i = 0; node_i < scene.nodes()->size(); node_i++) {
+    scene_nodes[node_i]->UnpackFromFlatbuffer(*scene.nodes()->Get(node_i),
+                                              scene_nodes, textures, allocator);
+  }
+
+  // Unpack animations.
+  if (scene.animations()) {
+    for (const auto animation : *scene.animations()) {
+      if (auto out_animation =
+              Animation::MakeFromFlatbuffer(*animation, scene_nodes)) {
+        result->animations_.push_back(out_animation);
+      }
+    }
+  }
+
+  return result;
+}
+
+void Node::UnpackFromFlatbuffer(
+    const fb::Node& source_node,
+    const std::vector<std::shared_ptr<Node>>& scene_nodes,
+    const std::vector<std::shared_ptr<Texture>>& textures,
+    Allocator& allocator) {
+  name_ = source_node.name()->str();
+  SetLocalTransform(importer::ToMatrix(*source_node.transform()));
+
+  /// Meshes.
+
+  if (source_node.mesh_primitives()) {
+    Mesh mesh;
+    for (const auto* primitives : *source_node.mesh_primitives()) {
+      auto geometry = Geometry::MakeFromFlatbuffer(*primitives, allocator);
+      auto material =
+          primitives->material()
+              ? Material::MakeFromFlatbuffer(*primitives->material(), textures)
+              : Material::MakeUnlit();
+      mesh.AddPrimitive({std::move(geometry), std::move(material)});
+    }
+    SetMesh(std::move(mesh));
+  }
+
+  /// Child nodes.
+
+  if (source_node.children()) {
+    // Wire up graph connections.
+    for (int child : *source_node.children()) {
+      if (child < 0 || static_cast<size_t>(child) >= scene_nodes.size()) {
+        VALIDATION_LOG << "Node child index out of range.";
+        continue;
+      }
+      AddChild(scene_nodes[child]);
+    }
+  }
+
+  /// Skin.
+
+  if (source_node.skin()) {
+    skin_ = Skin::MakeFromFlatbuffer(*source_node.skin(), scene_nodes);
+  }
+}
+
+Node::Node() : name_(SPrintF("__node%" PRIu64, kNextNodeID++)){};
+
+Node::~Node() = default;
+
+Mesh::Mesh(Mesh&& mesh) = default;
+
+Mesh& Mesh::operator=(Mesh&& mesh) = default;
+
+const std::string& Node::GetName() const {
+  return name_;
+}
+
+void Node::SetName(const std::string& new_name) {
+  name_ = new_name;
+}
+
+Node* Node::GetParent() const {
+  return parent_;
+}
+
+std::shared_ptr<Node> Node::FindChildByName(
+    const std::string& name,
+    bool exclude_animation_players) const {
+  for (auto& child : children_) {
+    if (exclude_animation_players && child->animation_player_.has_value()) {
+      continue;
+    }
+    if (child->GetName() == name) {
+      return child;
+    }
+    if (auto found = child->FindChildByName(name)) {
+      return found;
+    }
+  }
+  return nullptr;
+}
+
+std::shared_ptr<Animation> Node::FindAnimationByName(
+    const std::string& name) const {
+  for (const auto& animation : animations_) {
+    if (animation->GetName() == name) {
+      return animation;
+    }
+  }
+  return nullptr;
+}
+
+AnimationClip* Node::AddAnimation(const std::shared_ptr<Animation>& animation) {
+  if (!animation_player_.has_value()) {
+    animation_player_ = AnimationPlayer();
+  }
+  return animation_player_->AddAnimation(animation, this);
+}
+
+void Node::SetLocalTransform(Matrix transform) {
+  local_transform_ = transform;
+}
+
+Matrix Node::GetLocalTransform() const {
+  return local_transform_;
+}
+
+void Node::SetGlobalTransform(Matrix transform) {
+  Matrix inverse_global_transform =
+      parent_ ? parent_->GetGlobalTransform().Invert() : Matrix();
+
+  local_transform_ = inverse_global_transform * transform;
+}
+
+Matrix Node::GetGlobalTransform() const {
+  if (parent_) {
+    return parent_->GetGlobalTransform() * local_transform_;
+  }
+  return local_transform_;
+}
+
+bool Node::AddChild(std::shared_ptr<Node> node) {
+  if (!node) {
+    VALIDATION_LOG << "Cannot add null child to node.";
+    return false;
+  }
+
+  // TODO(bdero): Figure out a better paradigm/rules for nodes with multiple
+  //              parents. We should probably disallow this, make deep
+  //              copying of nodes cheap and easy, add mesh instancing, etc.
+  //              Today, the parent link is only used for skin posing, and so
+  //              it's reasonable to not have a check and allow multi-parenting.
+  //              Even still, there should still be some kind of cycle
+  //              prevention/detection, ideally at the protocol level.
+  //
+  // if (node->parent_ != nullptr) {
+  //   VALIDATION_LOG
+  //       << "Cannot add a node as a child which already has a parent.";
+  //   return false;
+  // }
+  node->parent_ = this;
+  children_.push_back(std::move(node));
+
+  return true;
+}
+
+std::vector<std::shared_ptr<Node>>& Node::GetChildren() {
+  return children_;
+}
+
+void Node::SetMesh(Mesh mesh) {
+  mesh_ = std::move(mesh);
+}
+
+Mesh& Node::GetMesh() {
+  return mesh_;
+}
+
+void Node::SetIsJoint(bool is_joint) {
+  is_joint_ = is_joint;
+}
+
+bool Node::IsJoint() const {
+  return is_joint_;
+}
+
+bool Node::Render(SceneEncoder& encoder,
+                  Allocator& allocator,
+                  const Matrix& parent_transform) {
+  std::optional<std::vector<MutationLog::Entry>> log = mutation_log_.Flush();
+  if (log.has_value()) {
+    for (const auto& entry : log.value()) {
+      if (auto e = std::get_if<MutationLog::SetTransformEntry>(&entry)) {
+        local_transform_ = e->transform;
+      } else if (auto e =
+                     std::get_if<MutationLog::SetAnimationStateEntry>(&entry)) {
+        AnimationClip* clip =
+            animation_player_.has_value()
+                ? animation_player_->GetClip(e->animation_name)
+                : nullptr;
+        if (!clip) {
+          auto animation = FindAnimationByName(e->animation_name);
+          if (!animation) {
+            continue;
+          }
+          clip = AddAnimation(animation);
+          if (!clip) {
+            continue;
+          }
+        }
+
+        clip->SetPlaying(e->playing);
+        clip->SetLoop(e->loop);
+        clip->SetWeight(e->weight);
+        clip->SetPlaybackTimeScale(e->time_scale);
+      } else if (auto e =
+                     std::get_if<MutationLog::SeekAnimationEntry>(&entry)) {
+        AnimationClip* clip =
+            animation_player_.has_value()
+                ? animation_player_->GetClip(e->animation_name)
+                : nullptr;
+        if (!clip) {
+          auto animation = FindAnimationByName(e->animation_name);
+          if (!animation) {
+            continue;
+          }
+          clip = AddAnimation(animation);
+          if (!clip) {
+            continue;
+          }
+        }
+
+        clip->Seek(SecondsF(e->time));
+      }
+    }
+  }
+
+  if (animation_player_.has_value()) {
+    animation_player_->Update();
+  }
+
+  Matrix transform = parent_transform * local_transform_;
+  mesh_.Render(encoder, transform,
+               skin_ ? skin_->GetJointsTexture(allocator) : nullptr);
+
+  for (auto& child : children_) {
+    if (!child->Render(encoder, allocator, transform)) {
+      return false;
+    }
+  }
+  return true;
+}
+
+void Node::AddMutation(const MutationLog::Entry& entry) {
+  mutation_log_.Append(entry);
+}
+
+}  // namespace scene
+}  // namespace impeller
diff --git a/impeller/scene/node.h b/impeller/scene/node.h
new file mode 100644
index 0000000000000000000000000000000000000000..0e2649aef268a6a71d2ecda74971528824f1cb8a
--- /dev/null
+++ b/impeller/scene/node.h
@@ -0,0 +1,142 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_SCENE_NODE_H_
+#define FLUTTER_IMPELLER_SCENE_NODE_H_
+
+#include <memory>
+#include <mutex>
+#include <optional>
+#include <vector>
+
+#include "flutter/fml/macros.h"
+#include "impeller/base/thread.h"
+#include "impeller/base/thread_safety.h"
+#include "impeller/core/texture.h"
+#include "impeller/geometry/matrix.h"
+#include "impeller/renderer/render_target.h"
+#include "impeller/scene/animation/animation.h"
+#include "impeller/scene/animation/animation_clip.h"
+#include "impeller/scene/animation/animation_player.h"
+#include "impeller/scene/camera.h"
+#include "impeller/scene/mesh.h"
+#include "impeller/scene/scene_encoder.h"
+#include "impeller/scene/skin.h"
+
+namespace impeller {
+namespace scene {
+
+class Node final {
+ public:
+  class MutationLog {
+   public:
+    struct SetTransformEntry {
+      Matrix transform;
+    };
+
+    struct SetAnimationStateEntry {
+      std::string animation_name;
+      bool playing = false;
+      bool loop = false;
+      Scalar weight = 0;
+      Scalar time_scale = 1;
+    };
+
+    struct SeekAnimationEntry {
+      std::string animation_name;
+      float time = 0;
+    };
+
+    using Entry = std::
+        variant<SetTransformEntry, SetAnimationStateEntry, SeekAnimationEntry>;
+
+    void Append(const Entry& entry);
+
+   private:
+    std::optional<std::vector<Entry>> Flush();
+
+    RWMutex write_mutex_;
+    bool dirty_ IPLR_GUARDED_BY(write_mutex_) = false;
+    std::vector<Entry> entries_ IPLR_GUARDED_BY(write_mutex_);
+
+    friend Node;
+  };
+
+  static std::shared_ptr<Node> MakeFromFlatbuffer(
+      const fml::Mapping& ipscene_mapping,
+      Allocator& allocator);
+  static std::shared_ptr<Node> MakeFromFlatbuffer(const fb::Scene& scene,
+                                                  Allocator& allocator);
+
+  Node();
+  ~Node();
+
+  const std::string& GetName() const;
+  void SetName(const std::string& new_name);
+
+  Node* GetParent() const;
+
+  std::shared_ptr<Node> FindChildByName(
+      const std::string& name,
+      bool exclude_animation_players = false) const;
+
+  std::shared_ptr<Animation> FindAnimationByName(const std::string& name) const;
+  AnimationClip* AddAnimation(const std::shared_ptr<Animation>& animation);
+
+  void SetLocalTransform(Matrix transform);
+  Matrix GetLocalTransform() const;
+
+  void SetGlobalTransform(Matrix transform);
+  Matrix GetGlobalTransform() const;
+
+  bool AddChild(std::shared_ptr<Node> child);
+  std::vector<std::shared_ptr<Node>>& GetChildren();
+
+  void SetMesh(Mesh mesh);
+  Mesh& GetMesh();
+
+  void SetIsJoint(bool is_joint);
+  bool IsJoint() const;
+
+  bool Render(SceneEncoder& encoder,
+              Allocator& allocator,
+              const Matrix& parent_transform);
+
+  void AddMutation(const MutationLog::Entry& entry);
+
+ private:
+  void UnpackFromFlatbuffer(
+      const fb::Node& node,
+      const std::vector<std::shared_ptr<Node>>& scene_nodes,
+      const std::vector<std::shared_ptr<Texture>>& textures,
+      Allocator& allocator);
+
+  mutable MutationLog mutation_log_;
+
+  Matrix local_transform_;
+
+  std::string name_;
+  bool is_root_ = false;
+  bool is_joint_ = false;
+  Node* parent_ = nullptr;
+  std::vector<std::shared_ptr<Node>> children_;
+  Mesh mesh_;
+
+  // For convenience purposes, deserialized nodes hang onto an animation library
+  std::vector<std::shared_ptr<Animation>> animations_;
+  mutable std::optional<AnimationPlayer> animation_player_;
+
+  std::unique_ptr<Skin> skin_;
+
+  Node(const Node&) = delete;
+
+  Node& operator=(const Node&) = delete;
+
+  friend Scene;
+};
+
+}  // namespace scene
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_SCENE_NODE_H_
diff --git a/impeller/scene/pipeline_key.h b/impeller/scene/pipeline_key.h
new file mode 100644
index 0000000000000000000000000000000000000000..56f41f3658a263dcf54ac36934f27aea394cd2a1
--- /dev/null
+++ b/impeller/scene/pipeline_key.h
@@ -0,0 +1,45 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_SCENE_PIPELINE_KEY_H_
+#define FLUTTER_IMPELLER_SCENE_PIPELINE_KEY_H_
+
+#include "flutter/fml/hash_combine.h"
+
+namespace impeller {
+namespace scene {
+
+enum class GeometryType {
+  kUnskinned = 0,
+  kSkinned = 1,
+  kLastType = kSkinned,
+};
+enum class MaterialType {
+  kUnlit = 0,
+  kLastType = kUnlit,
+};
+
+struct PipelineKey {
+  GeometryType geometry_type = GeometryType::kUnskinned;
+  MaterialType material_type = MaterialType::kUnlit;
+
+  struct Hash {
+    constexpr std::size_t operator()(const PipelineKey& o) const {
+      return fml::HashCombine(o.geometry_type, o.material_type);
+    }
+  };
+
+  struct Equal {
+    constexpr bool operator()(const PipelineKey& lhs,
+                              const PipelineKey& rhs) const {
+      return lhs.geometry_type == rhs.geometry_type &&
+             lhs.material_type == rhs.material_type;
+    }
+  };
+};
+
+}  // namespace scene
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_SCENE_PIPELINE_KEY_H_
diff --git a/impeller/scene/scene.cc b/impeller/scene/scene.cc
index ee4fa8cf8f785a73b3c9e102046f090348f57e4d..4e5e656120e55473063b0d119d6a942fa7caf822 100644
--- a/impeller/scene/scene.cc
+++ b/impeller/scene/scene.cc
@@ -8,6 +8,7 @@
 #include <utility>
 
 #include "flutter/fml/logging.h"
+#include "fml/closure.h"
 #include "impeller/renderer/render_target.h"
 #include "impeller/scene/scene_context.h"
 #include "impeller/scene/scene_encoder.h"
@@ -15,18 +16,31 @@
 namespace impeller {
 namespace scene {
 
-Scene::Scene(std::shared_ptr<Context> context)
-    : scene_context_(std::make_unique<SceneContext>(std::move(context))){};
+Scene::Scene(std::shared_ptr<SceneContext> scene_context)
+    : scene_context_(std::move(scene_context)) {
+  root_.is_root_ = true;
+};
 
-void Scene::Add(const std::shared_ptr<SceneEntity>& child) {
-  root_.Add(child);
+Scene::~Scene() {
+  for (auto& child : GetRoot().GetChildren()) {
+    child->parent_ = nullptr;
+  }
+}
+
+Node& Scene::GetRoot() {
+  return root_;
 }
 
 bool Scene::Render(const RenderTarget& render_target,
-                   const Camera& camera) const {
+                   const Matrix& camera_transform) {
+  fml::ScopedCleanupClosure reset_state(
+      [context = scene_context_]() { context->GetTransientsBuffer().Reset(); });
+
   // Collect the render commands from the scene.
   SceneEncoder encoder;
-  if (!root_.Render(encoder, camera)) {
+  if (!root_.Render(encoder,
+                    *scene_context_->GetContext()->GetResourceAllocator(),
+                    Matrix())) {
     FML_LOG(ERROR) << "Failed to render frame.";
     return false;
   }
@@ -34,11 +48,15 @@ bool Scene::Render(const RenderTarget& render_target,
   // Encode the commands.
 
   std::shared_ptr<CommandBuffer> command_buffer =
-      encoder.BuildSceneCommandBuffer(*scene_context_, render_target);
+      encoder.BuildSceneCommandBuffer(*scene_context_, camera_transform,
+                                      render_target);
 
   // TODO(bdero): Do post processing.
 
-  if (!command_buffer->SubmitCommands()) {
+  if (!scene_context_->GetContext()
+           ->GetCommandQueue()
+           ->Submit({command_buffer})
+           .ok()) {
     FML_LOG(ERROR) << "Failed to submit command buffer.";
     return false;
   }
@@ -46,5 +64,10 @@ bool Scene::Render(const RenderTarget& render_target,
   return true;
 }
 
+bool Scene::Render(const RenderTarget& render_target, const Camera& camera) {
+  return Render(render_target,
+                camera.GetTransform(render_target.GetRenderTargetSize()));
+}
+
 }  // namespace scene
 }  // namespace impeller
diff --git a/impeller/scene/scene.h b/impeller/scene/scene.h
index 1e279f6f7fd46718f59fb3f30c5b1495a3e9f321..4cd5c0895e2e674d33991e1f755d6127ea89eb34 100644
--- a/impeller/scene/scene.h
+++ b/impeller/scene/scene.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_SCENE_SCENE_H_
+#define FLUTTER_IMPELLER_SCENE_SCENE_H_
 
 #include <memory>
 #include <vector>
@@ -11,8 +12,8 @@
 
 #include "impeller/renderer/render_target.h"
 #include "impeller/scene/camera.h"
+#include "impeller/scene/node.h"
 #include "impeller/scene/scene_context.h"
-#include "impeller/scene/scene_entity.h"
 
 namespace impeller {
 namespace scene {
@@ -20,17 +21,28 @@ namespace scene {
 class Scene {
  public:
   Scene() = delete;
-  explicit Scene(std::shared_ptr<Context> context);
 
-  void Add(const std::shared_ptr<SceneEntity>& child);
-  bool Render(const RenderTarget& render_target, const Camera& camera) const;
+  explicit Scene(std::shared_ptr<SceneContext> scene_context);
+
+  ~Scene();
+
+  Node& GetRoot();
+
+  bool Render(const RenderTarget& render_target,
+              const Matrix& camera_transform);
+
+  bool Render(const RenderTarget& render_target, const Camera& camera);
 
  private:
-  std::unique_ptr<SceneContext> scene_context_;
-  SceneEntity root_;
+  std::shared_ptr<SceneContext> scene_context_;
+  Node root_;
+
+  Scene(const Scene&) = delete;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(Scene);
+  Scene& operator=(const Scene&) = delete;
 };
 
 }  // namespace scene
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_SCENE_SCENE_H_
diff --git a/impeller/scene/scene_context.cc b/impeller/scene/scene_context.cc
index dcf1ce81f047500a5837dd8e96da11482cdb34de..c4637837b3644bd99f9a732b69794711304070b5 100644
--- a/impeller/scene/scene_context.cc
+++ b/impeller/scene/scene_context.cc
@@ -3,27 +3,36 @@
 // found in the LICENSE file.
 
 #include "impeller/scene/scene_context.h"
-#include "impeller/renderer/formats.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/host_buffer.h"
+#include "impeller/scene/material.h"
+#include "impeller/scene/shaders/skinned.vert.h"
+#include "impeller/scene/shaders/unlit.frag.h"
+#include "impeller/scene/shaders/unskinned.vert.h"
 
 namespace impeller {
 namespace scene {
 
 void SceneContextOptions::ApplyToPipelineDescriptor(
+    const Capabilities& capabilities,
     PipelineDescriptor& desc) const {
+  DepthAttachmentDescriptor depth;
+  depth.depth_compare = CompareFunction::kLess;
+  depth.depth_write_enabled = true;
+  desc.SetDepthStencilAttachmentDescriptor(depth);
+  desc.SetDepthPixelFormat(capabilities.GetDefaultDepthStencilFormat());
+
+  StencilAttachmentDescriptor stencil;
+  stencil.stencil_compare = CompareFunction::kAlways;
+  stencil.depth_stencil_pass = StencilOperation::kKeep;
+  desc.SetStencilAttachmentDescriptors(stencil);
+  desc.SetStencilPixelFormat(capabilities.GetDefaultDepthStencilFormat());
+
   desc.SetSampleCount(sample_count);
   desc.SetPrimitiveType(primitive_type);
-}
 
-template <typename PipelineT>
-static std::unique_ptr<PipelineT> CreateDefaultPipeline(
-    const Context& context) {
-  auto desc = PipelineT::Builder::MakeDefaultPipelineDescriptor(context);
-  if (!desc.has_value()) {
-    return nullptr;
-  }
-  // Apply default ContentContextOptions to the descriptor.
-  SceneContextOptions{}.ApplyToPipelineDescriptor(*desc);
-  return std::make_unique<PipelineT>(context, desc);
+  desc.SetWindingOrder(WindingOrder::kCounterClockwise);
+  desc.SetCullMode(CullMode::kBackFace);
 }
 
 SceneContext::SceneContext(std::shared_ptr<Context> context)
@@ -32,34 +41,64 @@ SceneContext::SceneContext(std::shared_ptr<Context> context)
     return;
   }
 
-  unlit_pipeline_[{}] = CreateDefaultPipeline<UnlitPipeline>(*context_);
+  auto unskinned_variant =
+      MakePipelineVariants<UnskinnedVertexShader, UnlitFragmentShader>(
+          *context_);
+  if (!unskinned_variant) {
+    FML_LOG(ERROR) << "Could not create unskinned pipeline variant.";
+    return;
+  }
+  pipelines_[{PipelineKey{GeometryType::kUnskinned, MaterialType::kUnlit}}] =
+      std::move(unskinned_variant);
+
+  auto skinned_variant =
+      MakePipelineVariants<SkinnedVertexShader, UnlitFragmentShader>(*context_);
+  if (!skinned_variant) {
+    FML_LOG(ERROR) << "Could not create skinned pipeline variant.";
+    return;
+  }
+  pipelines_[{PipelineKey{GeometryType::kSkinned, MaterialType::kUnlit}}] =
+      std::move(skinned_variant);
 
   {
     impeller::TextureDescriptor texture_descriptor;
     texture_descriptor.storage_mode = impeller::StorageMode::kHostVisible;
-    texture_descriptor.format = PixelFormat::kDefaultColor;
+    texture_descriptor.format = PixelFormat::kR8G8B8A8UNormInt;
     texture_descriptor.size = {1, 1};
     texture_descriptor.mip_count = 1u;
 
     placeholder_texture_ =
         context_->GetResourceAllocator()->CreateTexture(texture_descriptor);
+    placeholder_texture_->SetLabel("Placeholder Texture");
     if (!placeholder_texture_) {
-      FML_DLOG(ERROR) << "Could not create placeholder texture.";
+      FML_LOG(ERROR) << "Could not create placeholder texture.";
       return;
     }
 
     uint8_t pixel[] = {0xFF, 0xFF, 0xFF, 0xFF};
-    if (!placeholder_texture_->SetContents(pixel, 4, 0)) {
-      FML_DLOG(ERROR) << "Could not set contents of placeholder texture.";
+    if (!placeholder_texture_->SetContents(pixel, 4)) {
+      FML_LOG(ERROR) << "Could not set contents of placeholder texture.";
       return;
     }
   }
-
+  host_buffer_ = HostBuffer::Create(GetContext()->GetResourceAllocator());
   is_valid_ = true;
 }
 
 SceneContext::~SceneContext() = default;
 
+std::shared_ptr<Pipeline<PipelineDescriptor>> SceneContext::GetPipeline(
+    PipelineKey key,
+    SceneContextOptions opts) const {
+  if (!IsValid()) {
+    return nullptr;
+  }
+  if (auto found = pipelines_.find(key); found != pipelines_.end()) {
+    return found->second->GetPipeline(*context_, opts);
+  }
+  return nullptr;
+}
+
 bool SceneContext::IsValid() const {
   return is_valid_;
 }
diff --git a/impeller/scene/scene_context.h b/impeller/scene/scene_context.h
index 1e1a2a6b57df14ee903d0cbd9eb3bb91eb9ab98d..4c99e99867213cc8f0faefea12bf20b0764224d2 100644
--- a/impeller/scene/scene_context.h
+++ b/impeller/scene/scene_context.h
@@ -2,21 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_SCENE_SCENE_CONTEXT_H_
+#define FLUTTER_IMPELLER_SCENE_SCENE_CONTEXT_H_
 
 #include <memory>
 
+#include "impeller/core/host_buffer.h"
 #include "impeller/renderer/context.h"
+#include "impeller/renderer/pipeline.h"
 #include "impeller/renderer/pipeline_descriptor.h"
-#include "impeller/scene/shaders/geometry.vert.h"
-#include "impeller/scene/shaders/unlit.frag.h"
+#include "impeller/scene/pipeline_key.h"
 
 namespace impeller {
 namespace scene {
 
-using UnlitPipeline =
-    RenderPipelineT<GeometryVertexShader, UnlitFragmentShader>;
-
 struct SceneContextOptions {
   SampleCount sample_count = SampleCount::kCount1;
   PrimitiveType primitive_type = PrimitiveType::kTriangle;
@@ -35,7 +34,8 @@ struct SceneContextOptions {
     }
   };
 
-  void ApplyToPipelineDescriptor(PipelineDescriptor& desc) const;
+  void ApplyToPipelineDescriptor(const Capabilities& capabilities,
+                                 PipelineDescriptor& desc) const;
 };
 
 class SceneContext {
@@ -46,60 +46,115 @@ class SceneContext {
 
   bool IsValid() const;
 
+  std::shared_ptr<Pipeline<PipelineDescriptor>> GetPipeline(
+      PipelineKey key,
+      SceneContextOptions opts) const;
+
   std::shared_ptr<Context> GetContext() const;
 
   std::shared_ptr<Texture> GetPlaceholderTexture() const;
 
-  std::shared_ptr<Pipeline<PipelineDescriptor>> GetUnlitPipeline(
-      SceneContextOptions opts) const {
-    return GetPipeline(unlit_pipeline_, opts);
-  }
+  HostBuffer& GetTransientsBuffer() const { return *host_buffer_; }
 
  private:
-  template <class T>
-  using Variants = std::unordered_map<SceneContextOptions,
-                                      std::unique_ptr<T>,
-                                      SceneContextOptions::Hash,
-                                      SceneContextOptions::Equal>;
-  template <class TypedPipeline>
-  std::shared_ptr<Pipeline<PipelineDescriptor>> GetPipeline(
-      Variants<TypedPipeline>& container,
-      SceneContextOptions opts) const {
-    if (!IsValid()) {
-      return nullptr;
-    }
+  class PipelineVariants {
+   public:
+    virtual ~PipelineVariants() = default;
+
+    virtual std::shared_ptr<Pipeline<PipelineDescriptor>> GetPipeline(
+        Context& context,
+        SceneContextOptions opts) = 0;
+  };
 
-    if (auto found = container.find(opts); found != container.end()) {
-      return found->second->WaitAndGet();
+  template <class PipelineT>
+  class PipelineVariantsT final : public PipelineVariants {
+   public:
+    explicit PipelineVariantsT(Context& context) {
+      auto desc = PipelineT::Builder::MakeDefaultPipelineDescriptor(context);
+      if (!desc.has_value()) {
+        is_valid_ = false;
+        return;
+      }
+      // Apply default ContentContextOptions to the descriptor.
+      SceneContextOptions{}.ApplyToPipelineDescriptor(
+          /*capabilities=*/*context.GetCapabilities(),
+          /*desc=*/desc.value());
+      variants_[{}] = std::make_unique<PipelineT>(context, desc);
+    };
+
+    // |PipelineVariants|
+    std::shared_ptr<Pipeline<PipelineDescriptor>> GetPipeline(
+        Context& context,
+        SceneContextOptions opts) {
+      if (auto found = variants_.find(opts); found != variants_.end()) {
+        return found->second->WaitAndGet();
+      }
+
+      auto prototype = variants_.find({});
+
+      // The prototype must always be initialized in the constructor.
+      FML_CHECK(prototype != variants_.end());
+
+      auto variant_future = prototype->second->WaitAndGet()->CreateVariant(
+          [&context, &opts,
+           variants_count = variants_.size()](PipelineDescriptor& desc) {
+            opts.ApplyToPipelineDescriptor(*context.GetCapabilities(), desc);
+            desc.SetLabel(
+                SPrintF("%s V#%zu", desc.GetLabel().c_str(), variants_count));
+          });
+      auto variant = std::make_unique<PipelineT>(std::move(variant_future));
+      auto variant_pipeline = variant->WaitAndGet();
+      variants_[opts] = std::move(variant);
+      return variant_pipeline;
     }
 
-    auto prototype = container.find({});
-
-    // The prototype must always be initialized in the constructor.
-    FML_CHECK(prototype != container.end());
-
-    auto variant_future = prototype->second->WaitAndGet()->CreateVariant(
-        [&opts, variants_count = container.size()](PipelineDescriptor& desc) {
-          opts.ApplyToPipelineDescriptor(desc);
-          desc.SetLabel(
-              SPrintF("%s V#%zu", desc.GetLabel().c_str(), variants_count));
-        });
-    auto variant = std::make_unique<TypedPipeline>(std::move(variant_future));
-    auto variant_pipeline = variant->WaitAndGet();
-    container[opts] = std::move(variant);
-    return variant_pipeline;
+    bool IsValid() const { return is_valid_; }
+
+   private:
+    bool is_valid_ = true;
+    std::unordered_map<SceneContextOptions,
+                       std::unique_ptr<PipelineT>,
+                       SceneContextOptions::Hash,
+                       SceneContextOptions::Equal>
+        variants_;
+  };
+
+  template <typename VertexShader, typename FragmentShader>
+  /// Creates a PipelineVariantsT for the given vertex and fragment shaders.
+  ///
+  /// If a pipeline could not be created, returns nullptr.
+  std::unique_ptr<PipelineVariants> MakePipelineVariants(Context& context) {
+    auto pipeline =
+        PipelineVariantsT<RenderPipelineT<VertexShader, FragmentShader>>(
+            context);
+    if (!pipeline.IsValid()) {
+      return nullptr;
+    }
+    return std::make_unique<
+        PipelineVariantsT<RenderPipelineT<VertexShader, FragmentShader>>>(
+        std::move(pipeline));
   }
 
+  std::unordered_map<PipelineKey,
+                     std::unique_ptr<PipelineVariants>,
+                     PipelineKey::Hash,
+                     PipelineKey::Equal>
+      pipelines_;
+
   std::shared_ptr<Context> context_;
-  mutable Variants<UnlitPipeline> unlit_pipeline_;
 
   bool is_valid_ = false;
   // A 1x1 opaque white texture that can be used as a placeholder binding.
   // Available for the lifetime of the scene context
   std::shared_ptr<Texture> placeholder_texture_;
+  std::shared_ptr<HostBuffer> host_buffer_;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(SceneContext);
+  SceneContext(const SceneContext&) = delete;
+
+  SceneContext& operator=(const SceneContext&) = delete;
 };
 
 }  // namespace scene
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_SCENE_SCENE_CONTEXT_H_
diff --git a/impeller/scene/scene_encoder.cc b/impeller/scene/scene_encoder.cc
index fbf7e4923d1e607466f94865fbd1695f2a79dff7..a998ee00689a93166fc9403463ca46833b97c49f 100644
--- a/impeller/scene/scene_encoder.cc
+++ b/impeller/scene/scene_encoder.cc
@@ -9,7 +9,6 @@
 #include "impeller/renderer/render_target.h"
 #include "impeller/scene/scene_context.h"
 #include "impeller/scene/scene_encoder.h"
-#include "impeller/scene/shaders/geometry.vert.h"
 
 namespace impeller {
 namespace scene {
@@ -22,32 +21,63 @@ void SceneEncoder::Add(const SceneCommand& command) {
 }
 
 static void EncodeCommand(const SceneContext& scene_context,
+                          const Matrix& view_transform,
                           RenderPass& render_pass,
                           const SceneCommand& scene_command) {
-  auto& host_buffer = render_pass.GetTransientsBuffer();
+  auto& host_buffer = scene_context.GetTransientsBuffer();
 
-  Command cmd;
-  cmd.label = scene_command.label;
-  cmd.stencil_reference =
-      0;  // TODO(bdero): Configurable stencil ref per-command.
+  render_pass.SetCommandLabel(scene_command.label);
+  // TODO(bdero): Configurable stencil ref per-command.
+  render_pass.SetStencilReference(0);
 
-  cmd.BindVertices(scene_command.geometry->GetVertexBuffer(
-      *scene_context.GetContext()->GetResourceAllocator()));
+  render_pass.SetPipeline(scene_context.GetPipeline(
+      PipelineKey{scene_command.geometry->GetGeometryType(),
+                  scene_command.material->GetMaterialType()},
+      scene_command.material->GetContextOptions(render_pass)));
 
-  cmd.pipeline =
-      scene_command.material->GetPipeline(scene_context, render_pass);
-  scene_command.material->BindToCommand(scene_context, host_buffer, cmd);
+  scene_command.geometry->BindToCommand(
+      scene_context, host_buffer, view_transform * scene_command.transform,
+      render_pass);
+  scene_command.material->BindToCommand(scene_context, host_buffer,
+                                        render_pass);
 
-  GeometryVertexShader::VertInfo info;
-  info.mvp = scene_command.transform;
-  GeometryVertexShader::BindVertInfo(cmd, host_buffer.EmplaceUniform(info));
-
-  render_pass.AddCommand(std::move(cmd));
+  render_pass.Draw();
+  ;
 }
 
 std::shared_ptr<CommandBuffer> SceneEncoder::BuildSceneCommandBuffer(
     const SceneContext& scene_context,
-    const RenderTarget& render_target) const {
+    const Matrix& camera_transform,
+    RenderTarget render_target) const {
+  {
+    TextureDescriptor ds_texture;
+    ds_texture.type = TextureType::kTexture2DMultisample;
+    ds_texture.format = PixelFormat::kD32FloatS8UInt;
+    ds_texture.size = render_target.GetRenderTargetSize();
+    ds_texture.usage = TextureUsage::kRenderTarget;
+    ds_texture.sample_count = SampleCount::kCount4;
+    ds_texture.storage_mode = StorageMode::kDeviceTransient;
+    auto texture =
+        scene_context.GetContext()->GetResourceAllocator()->CreateTexture(
+            ds_texture);
+
+    DepthAttachment depth;
+    depth.load_action = LoadAction::kClear;
+    depth.store_action = StoreAction::kDontCare;
+    depth.clear_depth = 1.0;
+    depth.texture = texture;
+    render_target.SetDepthAttachment(depth);
+
+    // The stencil and depth buffers must be the same texture for MacOS ARM
+    // and Vulkan.
+    StencilAttachment stencil;
+    stencil.load_action = LoadAction::kClear;
+    stencil.store_action = StoreAction::kDontCare;
+    stencil.clear_stencil = 0u;
+    stencil.texture = texture;
+    render_target.SetStencilAttachment(stencil);
+  }
+
   auto command_buffer = scene_context.GetContext()->CreateCommandBuffer();
   if (!command_buffer) {
     FML_LOG(ERROR) << "Failed to create command buffer.";
@@ -61,7 +91,7 @@ std::shared_ptr<CommandBuffer> SceneEncoder::BuildSceneCommandBuffer(
   }
 
   for (auto& command : commands_) {
-    EncodeCommand(scene_context, *render_pass, command);
+    EncodeCommand(scene_context, camera_transform, *render_pass, command);
   }
 
   if (!render_pass->EncodeCommands()) {
diff --git a/impeller/scene/scene_encoder.h b/impeller/scene/scene_encoder.h
index e09be574e0bd9351c7acf29fbcfd3e4d1c1a185f..a3690c52c702af43e20c73eb6838e5737dccc4b0 100644
--- a/impeller/scene/scene_encoder.h
+++ b/impeller/scene/scene_encoder.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_SCENE_SCENE_ENCODER_H_
+#define FLUTTER_IMPELLER_SCENE_SCENE_ENCODER_H_
 
 #include <memory>
 #include <string>
@@ -10,6 +11,7 @@
 
 #include "flutter/fml/macros.h"
 #include "impeller/renderer/command_buffer.h"
+#include "impeller/scene/camera.h"
 #include "impeller/scene/geometry.h"
 #include "impeller/scene/material.h"
 
@@ -34,14 +36,19 @@ class SceneEncoder {
 
   std::shared_ptr<CommandBuffer> BuildSceneCommandBuffer(
       const SceneContext& scene_context,
-      const RenderTarget& render_target) const;
+      const Matrix& camera_transform,
+      RenderTarget render_target) const;
 
   std::vector<SceneCommand> commands_;
 
   friend Scene;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(SceneEncoder);
+  SceneEncoder(const SceneEncoder&) = delete;
+
+  SceneEncoder& operator=(const SceneEncoder&) = delete;
 };
 
 }  // namespace scene
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_SCENE_SCENE_ENCODER_H_
diff --git a/impeller/scene/scene_entity.cc b/impeller/scene/scene_entity.cc
deleted file mode 100644
index 4183849a9e865a8eda423cd8f37bafdc9c061be1..0000000000000000000000000000000000000000
--- a/impeller/scene/scene_entity.cc
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "impeller/scene/scene_entity.h"
-
-#include <memory>
-
-#include "impeller/base/validation.h"
-#include "impeller/geometry/matrix.h"
-#include "impeller/scene/scene_encoder.h"
-#include "impeller/scene/static_mesh_entity.h"
-
-namespace impeller {
-namespace scene {
-
-SceneEntity::SceneEntity() = default;
-
-SceneEntity::~SceneEntity() = default;
-
-std::shared_ptr<StaticMeshEntity> SceneEntity::MakeStaticMesh() {
-  return std::make_shared<StaticMeshEntity>();
-}
-
-void SceneEntity::SetLocalTransform(Matrix transform) {
-  local_transform_ = transform;
-}
-
-Matrix SceneEntity::GetLocalTransform() const {
-  return local_transform_;
-}
-
-void SceneEntity::SetGlobalTransform(Matrix transform) {
-  Matrix inverse_global_transform =
-      parent_ ? parent_->GetGlobalTransform().Invert() : Matrix();
-
-  local_transform_ = inverse_global_transform * transform;
-}
-
-Matrix SceneEntity::GetGlobalTransform() const {
-  if (parent_) {
-    return parent_->GetGlobalTransform() * local_transform_;
-  }
-  return local_transform_;
-}
-
-bool SceneEntity::Add(const std::shared_ptr<SceneEntity>& child) {
-  if (child->parent_ != nullptr) {
-    VALIDATION_LOG << "Cannot add SceneEntity as a child because it already "
-                      "has a parent assigned.";
-    return false;
-  }
-
-  children_.push_back(child);
-  child->parent_ = this;
-  return true;
-}
-
-bool SceneEntity::Render(SceneEncoder& encoder, const Camera& camera) const {
-  OnRender(encoder, camera);
-  for (auto& child : children_) {
-    if (!child->Render(encoder, camera)) {
-      return false;
-    }
-  }
-  return true;
-}
-
-bool SceneEntity::OnRender(SceneEncoder& encoder, const Camera& camera) const {
-  return true;
-}
-
-}  // namespace scene
-}  // namespace impeller
diff --git a/impeller/scene/scene_entity.h b/impeller/scene/scene_entity.h
deleted file mode 100644
index 694d0cd3616fe497b96baa67a08e52e195dec266..0000000000000000000000000000000000000000
--- a/impeller/scene/scene_entity.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#pragma once
-
-#include <memory>
-#include <vector>
-
-#include "flutter/fml/macros.h"
-
-#include "impeller/geometry/matrix.h"
-#include "impeller/renderer/render_target.h"
-#include "impeller/scene/camera.h"
-#include "impeller/scene/scene_encoder.h"
-
-namespace impeller {
-namespace scene {
-
-class StaticMeshEntity;
-
-class SceneEntity {
- public:
-  SceneEntity();
-  virtual ~SceneEntity();
-
-  static std::shared_ptr<StaticMeshEntity> MakeStaticMesh();
-
-  void SetLocalTransform(Matrix transform);
-  Matrix GetLocalTransform() const;
-
-  void SetGlobalTransform(Matrix transform);
-  Matrix GetGlobalTransform() const;
-
-  bool Add(const std::shared_ptr<SceneEntity>& child);
-
-  bool Render(SceneEncoder& encoder, const Camera& camera) const;
-
- protected:
-  Matrix local_transform_;
-
- private:
-  virtual bool OnRender(SceneEncoder& encoder, const Camera& camera) const;
-
-  SceneEntity* parent_ = nullptr;
-  std::vector<std::shared_ptr<SceneEntity>> children_;
-
-  FML_DISALLOW_COPY_AND_ASSIGN(SceneEntity);
-};
-
-}  // namespace scene
-}  // namespace impeller
diff --git a/impeller/scene/scene_unittests.cc b/impeller/scene/scene_unittests.cc
index 9f2281cd1245e34340b0bbcfc06c41bb03872fb6..ff014b80ef4481cdcd15cd4f139ff88d08b69b1b 100644
--- a/impeller/scene/scene_unittests.cc
+++ b/impeller/scene/scene_unittests.cc
@@ -2,21 +2,30 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <cmath>
+#include <memory>
+#include <vector>
+
+#include "flutter/fml/mapping.h"
 #include "flutter/testing/testing.h"
+#include "impeller/core/formats.h"
 #include "impeller/geometry/color.h"
 #include "impeller/geometry/constants.h"
 #include "impeller/geometry/matrix.h"
+#include "impeller/geometry/quaternion.h"
 #include "impeller/geometry/vector.h"
+#include "impeller/playground/image/decompressed_image.h"
 #include "impeller/playground/playground.h"
 #include "impeller/playground/playground_test.h"
-
+#include "impeller/scene/animation/animation_clip.h"
 #include "impeller/scene/camera.h"
 #include "impeller/scene/geometry.h"
+#include "impeller/scene/importer/scene_flatbuffers.h"
 #include "impeller/scene/material.h"
+#include "impeller/scene/mesh.h"
 #include "impeller/scene/scene.h"
-#include "impeller/scene/static_mesh_entity.h"
-
-// #include "third_party/tinygltf/tiny_gltf.h"
+#include "third_party/flatbuffers/include/flatbuffers/verifier.h"
+#include "third_party/imgui/imgui.h"
 
 namespace impeller {
 namespace scene {
@@ -26,31 +35,263 @@ using SceneTest = PlaygroundTest;
 INSTANTIATE_PLAYGROUND_SUITE(SceneTest);
 
 TEST_P(SceneTest, CuboidUnlit) {
+  auto scene_context = std::make_shared<SceneContext>(GetContext());
+
   Renderer::RenderCallback callback = [&](RenderTarget& render_target) {
     auto allocator = GetContext()->GetResourceAllocator();
-    auto scene = Scene(GetContext());
+    auto scene = Scene(scene_context);
 
     {
-      auto mesh = SceneEntity::MakeStaticMesh();
+      Mesh mesh;
 
       auto material = Material::MakeUnlit();
       material->SetColor(Color::Red());
-      mesh->SetMaterial(std::move(material));
-
-      Vector3 size(1, 2, 3);
-      mesh->SetGeometry(Geometry::MakeCuboid(size));
 
-      mesh->SetLocalTransform(Matrix::MakeTranslation(size / 2));
+      Vector3 size(1, 1, 0);
+      mesh.AddPrimitive({Geometry::MakeCuboid(size), std::move(material)});
 
-      scene.Add(mesh);
+      Node& root = scene.GetRoot();
+      root.SetLocalTransform(Matrix::MakeTranslation(-size / 2));
+      root.SetMesh(std::move(mesh));
     }
 
+    // Face towards the +Z direction (+X right, +Y up).
+    auto camera = Camera::MakePerspective(
+                      /* fov */ Radians(kPiOver4),
+                      /* position */ {2, 2, -5})
+                      .LookAt(
+                          /* target */ Vector3(),
+                          /* up */ {0, 1, 0});
+
+    scene.Render(render_target, camera);
+    return true;
+  };
+
+  OpenPlaygroundHere(callback);
+}
+
+TEST_P(SceneTest, FlutterLogo) {
+  auto allocator = GetContext()->GetResourceAllocator();
+
+  auto mapping =
+      flutter::testing::OpenFixtureAsMapping("flutter_logo_baked.glb.ipscene");
+  ASSERT_NE(mapping, nullptr);
+
+  flatbuffers::Verifier verifier(mapping->GetMapping(), mapping->GetSize());
+  ASSERT_TRUE(fb::VerifySceneBuffer(verifier));
+
+  std::shared_ptr<Node> gltf_scene =
+      Node::MakeFromFlatbuffer(*mapping, *allocator);
+  ASSERT_NE(gltf_scene, nullptr);
+  ASSERT_EQ(gltf_scene->GetChildren().size(), 1u);
+  ASSERT_EQ(gltf_scene->GetChildren()[0]->GetMesh().GetPrimitives().size(), 1u);
+
+  auto scene_context = std::make_shared<SceneContext>(GetContext());
+  auto scene = Scene(scene_context);
+  scene.GetRoot().AddChild(std::move(gltf_scene));
+  scene.GetRoot().SetLocalTransform(Matrix::MakeScale({3, 3, 3}));
+
+  Renderer::RenderCallback callback = [&](RenderTarget& render_target) {
+    Quaternion rotation({0, 1, 0}, -GetSecondsElapsed() * 0.5);
+    Vector3 start_position(-1, -1.5, -5);
+
+    // Face towards the +Z direction (+X right, +Y up).
     auto camera = Camera::MakePerspective(
-                      /* fov */ kPiOver4,
-                      /* position */ {50, -30, 50})
+                      /* fov */ Degrees(60),
+                      /* position */ rotation * start_position)
                       .LookAt(
                           /* target */ Vector3(),
-                          /* up */ {0, -1, 0});
+                          /* up */ {0, 1, 0});
+
+    scene.Render(render_target, camera);
+    return true;
+  };
+
+  OpenPlaygroundHere(callback);
+}
+
+TEST_P(SceneTest, TwoTriangles) {
+  if (GetBackend() == PlaygroundBackend::kVulkan) {
+    GTEST_SKIP_("Temporarily disabled.");
+  }
+  auto allocator = GetContext()->GetResourceAllocator();
+
+  auto mapping =
+      flutter::testing::OpenFixtureAsMapping("two_triangles.glb.ipscene");
+  ASSERT_NE(mapping, nullptr);
+
+  std::shared_ptr<Node> gltf_scene =
+      Node::MakeFromFlatbuffer(*mapping, *allocator);
+  ASSERT_NE(gltf_scene, nullptr);
+
+  auto animation = gltf_scene->FindAnimationByName("Metronome");
+  ASSERT_NE(animation, nullptr);
+
+  AnimationClip* metronome_clip = gltf_scene->AddAnimation(animation);
+  ASSERT_NE(metronome_clip, nullptr);
+  metronome_clip->SetLoop(true);
+  metronome_clip->Play();
+
+  auto scene_context = std::make_shared<SceneContext>(GetContext());
+  auto scene = Scene(scene_context);
+  scene.GetRoot().AddChild(std::move(gltf_scene));
+
+  Renderer::RenderCallback callback = [&](RenderTarget& render_target) {
+    ImGui::Begin("Controls", nullptr, ImGuiWindowFlags_AlwaysAutoResize);
+    {
+      static Scalar playback_time_scale = 1;
+      static Scalar weight = 1;
+      static bool loop = true;
+
+      ImGui::SliderFloat("Playback time scale", &playback_time_scale, -5, 5);
+      ImGui::SliderFloat("Weight", &weight, -2, 2);
+      ImGui::Checkbox("Loop", &loop);
+      if (ImGui::Button("Play")) {
+        metronome_clip->Play();
+      }
+      if (ImGui::Button("Pause")) {
+        metronome_clip->Pause();
+      }
+      if (ImGui::Button("Stop")) {
+        metronome_clip->Stop();
+      }
+
+      metronome_clip->SetPlaybackTimeScale(playback_time_scale);
+      metronome_clip->SetWeight(weight);
+      metronome_clip->SetLoop(loop);
+    }
+
+    ImGui::End();
+    Node& node = *scene.GetRoot().GetChildren()[0];
+    node.SetLocalTransform(node.GetLocalTransform() *
+                           Matrix::MakeRotation(0.02, {0, 1, 0, 0}));
+
+    static ImVec2 mouse_pos_prev = ImGui::GetMousePos();
+    ImVec2 mouse_pos = ImGui::GetMousePos();
+    Vector2 mouse_diff =
+        Vector2(mouse_pos.x - mouse_pos_prev.x, mouse_pos.y - mouse_pos_prev.y);
+
+    static Vector3 position(0, 1, -5);
+    static Vector3 cam_position = position;
+    auto strafe =
+        Vector3(ImGui::IsKeyDown(ImGuiKey_D) - ImGui::IsKeyDown(ImGuiKey_A),
+                ImGui::IsKeyDown(ImGuiKey_E) - ImGui::IsKeyDown(ImGuiKey_Q),
+                ImGui::IsKeyDown(ImGuiKey_W) - ImGui::IsKeyDown(ImGuiKey_S));
+    position += strafe * 0.5;
+    cam_position = cam_position.Lerp(position, 0.02);
+
+    // Face towards the +Z direction (+X right, +Y up).
+    auto camera = Camera::MakePerspective(
+                      /* fov */ Degrees(60),
+                      /* position */ cam_position)
+                      .LookAt(
+                          /* target */ cam_position + Vector3(0, 0, 1),
+                          /* up */ {0, 1, 0});
+
+    scene.Render(render_target, camera);
+    return true;
+  };
+
+  OpenPlaygroundHere(callback);
+}
+
+TEST_P(SceneTest, Dash) {
+  auto allocator = GetContext()->GetResourceAllocator();
+
+  auto mapping = flutter::testing::OpenFixtureAsMapping("dash.glb.ipscene");
+  if (!mapping) {
+    // TODO(bdero): Just skip this playground is the dash asset isn't found. I
+    //              haven't checked it in because it's way too big right now,
+    //              but this is still useful to keep around for debugging
+    //              purposes.
+    return;
+  }
+  ASSERT_NE(mapping, nullptr);
+
+  std::shared_ptr<Node> gltf_scene =
+      Node::MakeFromFlatbuffer(*mapping, *allocator);
+  ASSERT_NE(gltf_scene, nullptr);
+
+  auto walk_anim = gltf_scene->FindAnimationByName("Walk");
+  ASSERT_NE(walk_anim, nullptr);
+
+  AnimationClip* walk_clip = gltf_scene->AddAnimation(walk_anim);
+  ASSERT_NE(walk_clip, nullptr);
+  walk_clip->SetLoop(true);
+  walk_clip->Play();
+
+  auto run_anim = gltf_scene->FindAnimationByName("Run");
+  ASSERT_NE(walk_anim, nullptr);
+
+  AnimationClip* run_clip = gltf_scene->AddAnimation(run_anim);
+  ASSERT_NE(run_clip, nullptr);
+  run_clip->SetLoop(true);
+  run_clip->Play();
+
+  auto scene_context = std::make_shared<SceneContext>(GetContext());
+  auto scene = Scene(scene_context);
+  scene.GetRoot().AddChild(std::move(gltf_scene));
+
+  Renderer::RenderCallback callback = [&](RenderTarget& render_target) {
+    ImGui::Begin("Controls", nullptr, ImGuiWindowFlags_AlwaysAutoResize);
+    {
+      static Scalar playback_time_scale = 1;
+      static Scalar walk = 0.5;
+      static Scalar run = 0.5;
+      static bool loop = true;
+
+      ImGui::SliderFloat("Playback time scale", &playback_time_scale, -5, 5);
+      ImGui::SliderFloat("Walk weight", &walk, 0, 1);
+      ImGui::SliderFloat("Run weight", &run, 0, 1);
+      ImGui::Checkbox("Loop", &loop);
+      if (ImGui::Button("Play")) {
+        walk_clip->Play();
+        run_clip->Play();
+      }
+      if (ImGui::Button("Pause")) {
+        walk_clip->Pause();
+        run_clip->Pause();
+      }
+      if (ImGui::Button("Stop")) {
+        walk_clip->Stop();
+        run_clip->Stop();
+      }
+
+      walk_clip->SetPlaybackTimeScale(playback_time_scale);
+      walk_clip->SetWeight(walk);
+      walk_clip->SetLoop(loop);
+
+      run_clip->SetPlaybackTimeScale(playback_time_scale);
+      run_clip->SetWeight(run);
+      run_clip->SetLoop(loop);
+    }
+
+    ImGui::End();
+    Node& node = *scene.GetRoot().GetChildren()[0];
+    node.SetLocalTransform(node.GetLocalTransform() *
+                           Matrix::MakeRotation(0.02, {0, 1, 0, 0}));
+
+    static ImVec2 mouse_pos_prev = ImGui::GetMousePos();
+    ImVec2 mouse_pos = ImGui::GetMousePos();
+    Vector2 mouse_diff =
+        Vector2(mouse_pos.x - mouse_pos_prev.x, mouse_pos.y - mouse_pos_prev.y);
+
+    static Vector3 position(0, 1, -5);
+    static Vector3 cam_position = position;
+    auto strafe =
+        Vector3(ImGui::IsKeyDown(ImGuiKey_D) - ImGui::IsKeyDown(ImGuiKey_A),
+                ImGui::IsKeyDown(ImGuiKey_E) - ImGui::IsKeyDown(ImGuiKey_Q),
+                ImGui::IsKeyDown(ImGuiKey_W) - ImGui::IsKeyDown(ImGuiKey_S));
+    position += strafe * 0.5;
+    cam_position = cam_position.Lerp(position, 0.02);
+
+    // Face towards the +Z direction (+X right, +Y up).
+    auto camera = Camera::MakePerspective(
+                      /* fov */ Degrees(60),
+                      /* position */ cam_position)
+                      .LookAt(
+                          /* target */ cam_position + Vector3(0, 0, 1),
+                          /* up */ {0, 1, 0});
 
     scene.Render(render_target, camera);
     return true;
diff --git a/impeller/scene/shaders/BUILD.gn b/impeller/scene/shaders/BUILD.gn
index a802c63f3539018a592d9fe1ae060e1668a5bf09..658618d407191f24d4ead37545e64f8a422bdc57 100644
--- a/impeller/scene/shaders/BUILD.gn
+++ b/impeller/scene/shaders/BUILD.gn
@@ -7,8 +7,13 @@ import("//flutter/impeller/tools/impeller.gni")
 impeller_shaders("shaders") {
   name = "scene"
 
+  if (impeller_enable_vulkan) {
+    vulkan_language_version = 130
+  }
+
   shaders = [
-    "geometry.vert",
+    "skinned.vert",
+    "unskinned.vert",
     "unlit.frag",
   ]
 }
diff --git a/impeller/scene/shaders/skinned.vert b/impeller/scene/shaders/skinned.vert
new file mode 100644
index 0000000000000000000000000000000000000000..807f620b03cdebb66b189455346073e2c3596a0b
--- /dev/null
+++ b/impeller/scene/shaders/skinned.vert
@@ -0,0 +1,75 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+uniform FrameInfo {
+  mat4 mvp;
+  float enable_skinning;
+  float joint_texture_size;
+}
+frame_info;
+
+uniform sampler2D joints_texture;
+
+// This attribute layout is expected to be identical to `SkinnedVertex` within
+// `impeller/scene/importer/scene.fbs`.
+in vec3 position;
+in vec3 normal;
+in vec4 tangent;
+in vec2 texture_coords;
+in vec4 color;
+in vec4 joints;
+in vec4 weights;
+
+out vec3 v_position;
+out mat3 v_tangent_space;
+out vec2 v_texture_coords;
+out vec4 v_color;
+
+const int kMatrixTexelStride = 4;
+
+mat4 GetJoint(float joint_index) {
+  // The size of one texel in UV space. The joint texture should always be
+  // square, so the answer is the same in both dimensions.
+  float texel_size_uv = 1 / frame_info.joint_texture_size;
+
+  // Each joint matrix takes up 4 pixels (16 floats), so we jump 4 pixels per
+  // joint matrix.
+  float matrix_start = joint_index * kMatrixTexelStride;
+
+  // The texture space coordinates at the start of the matrix.
+  float x = mod(matrix_start, frame_info.joint_texture_size);
+  float y = floor(matrix_start / frame_info.joint_texture_size);
+
+  // Nearest sample the middle of each the texel by adding `0.5 * texel_size_uv`
+  // to both dimensions.
+  y = (y + 0.5) * texel_size_uv;
+  mat4 joint =
+      mat4(texture(joints_texture, vec2((x + 0.5) * texel_size_uv, y)),
+           texture(joints_texture, vec2((x + 1.5) * texel_size_uv, y)),
+           texture(joints_texture, vec2((x + 2.5) * texel_size_uv, y)),
+           texture(joints_texture, vec2((x + 3.5) * texel_size_uv, y)));
+
+  return joint;
+}
+
+void main() {
+  mat4 skin_matrix;
+  if (frame_info.enable_skinning == 1) {
+    skin_matrix =
+        GetJoint(joints.x) * weights.x + GetJoint(joints.y) * weights.y +
+        GetJoint(joints.z) * weights.z + GetJoint(joints.w) * weights.w;
+  } else {
+    skin_matrix = mat4(1);  // Identity matrix.
+  }
+
+  gl_Position = frame_info.mvp * skin_matrix * vec4(position, 1.0);
+  v_position = gl_Position.xyz;
+
+  vec3 lh_tangent = (skin_matrix * vec4(tangent.xyz * tangent.w, 0.0)).xyz;
+  vec3 out_normal = (skin_matrix * vec4(normal, 0.0)).xyz;
+  v_tangent_space = mat3(frame_info.mvp) *
+                    mat3(lh_tangent, cross(out_normal, lh_tangent), out_normal);
+  v_texture_coords = texture_coords;
+  v_color = color;
+}
diff --git a/impeller/scene/shaders/unlit.frag b/impeller/scene/shaders/unlit.frag
index 8f335913ab0e5c9f23328f52ded1557eb7e3dc00..0c5c317652047f6adc77fbca189f0dacdeb668ac 100644
--- a/impeller/scene/shaders/unlit.frag
+++ b/impeller/scene/shaders/unlit.frag
@@ -4,6 +4,7 @@
 
 uniform FragInfo {
   vec4 color;
+  float vertex_color_weight;
 }
 frag_info;
 
@@ -12,9 +13,17 @@ uniform sampler2D base_color_texture;
 in vec3 v_position;
 in mat3 v_tangent_space;
 in vec2 v_texture_coords;
+in vec4 v_color;
 
 out vec4 frag_color;
 
+float consume_unused() {
+  return (v_position.x + v_tangent_space[0][0]) * 0.001;
+}
+
 void main() {
-  frag_color = texture(base_color_texture, v_texture_coords) * frag_info.color;
+  vec4 vertex_color = mix(vec4(1), v_color, frag_info.vertex_color_weight);
+  frag_color = texture(base_color_texture, v_texture_coords) * vertex_color *
+                   frag_info.color +
+               consume_unused();
 }
diff --git a/impeller/scene/shaders/geometry.vert b/impeller/scene/shaders/unskinned.vert
similarity index 48%
rename from impeller/scene/shaders/geometry.vert
rename to impeller/scene/shaders/unskinned.vert
index fda66b8a4819a9d2f90c977511a9e1ca6b8dc951..c79be6fbb0a141b79528bcbd98c87e4638934bd9 100644
--- a/impeller/scene/shaders/geometry.vert
+++ b/impeller/scene/shaders/unskinned.vert
@@ -2,25 +2,31 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-uniform VertInfo {
+uniform FrameInfo {
   mat4 mvp;
 }
-vert_info;
+frame_info;
 
+// This attribute layout is expected to be identical to that within
+// `impeller/scene/importer/scene.fbs`.
 in vec3 position;
 in vec3 normal;
-in vec3 tangent;
+in vec4 tangent;
 in vec2 texture_coords;
+in vec4 color;
 
 out vec3 v_position;
 out mat3 v_tangent_space;
 out vec2 v_texture_coords;
+out vec4 v_color;
 
 void main() {
-  gl_Position = vert_info.mvp * vec4(position, 1.0);
+  gl_Position = frame_info.mvp * vec4(position, 1.0);
   v_position = gl_Position.xyz;
 
-  v_tangent_space =
-      mat3(vert_info.mvp) * mat3(tangent, cross(normal, tangent), normal);
+  vec3 lh_tangent = tangent.xyz * tangent.w;
+  v_tangent_space = mat3(frame_info.mvp) *
+                    mat3(lh_tangent, cross(normal, lh_tangent), normal);
   v_texture_coords = texture_coords;
+  v_color = color;
 }
diff --git a/impeller/scene/skin.cc b/impeller/scene/skin.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ffabd8253b243b864dab625a261a48682d58d516
--- /dev/null
+++ b/impeller/scene/skin.cc
@@ -0,0 +1,123 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/scene/skin.h"
+
+#include <cmath>
+#include <memory>
+#include <vector>
+
+#include "flutter/fml/logging.h"
+#include "impeller/base/allocation.h"
+#include "impeller/core/allocator.h"
+#include "impeller/scene/importer/conversions.h"
+
+namespace impeller {
+namespace scene {
+
+std::unique_ptr<Skin> Skin::MakeFromFlatbuffer(
+    const fb::Skin& skin,
+    const std::vector<std::shared_ptr<Node>>& scene_nodes) {
+  if (!skin.joints() || !skin.inverse_bind_matrices() ||
+      skin.joints()->size() != skin.inverse_bind_matrices()->size()) {
+    VALIDATION_LOG << "Skin data is missing joints or bind matrices.";
+    return nullptr;
+  }
+
+  Skin result;
+
+  result.joints_.reserve(skin.joints()->size());
+  for (auto joint : *skin.joints()) {
+    if (joint < 0 || static_cast<size_t>(joint) > scene_nodes.size()) {
+      VALIDATION_LOG << "Skin joint index out of range.";
+      result.joints_.push_back(nullptr);
+      continue;
+    }
+    if (scene_nodes[joint]) {
+      scene_nodes[joint]->SetIsJoint(true);
+    }
+    result.joints_.push_back(scene_nodes[joint]);
+  }
+
+  result.inverse_bind_matrices_.reserve(skin.inverse_bind_matrices()->size());
+  for (size_t matrix_i = 0; matrix_i < skin.inverse_bind_matrices()->size();
+       matrix_i++) {
+    const auto* ip_matrix = skin.inverse_bind_matrices()->Get(matrix_i);
+    Matrix matrix = ip_matrix ? importer::ToMatrix(*ip_matrix) : Matrix();
+
+    result.inverse_bind_matrices_.push_back(matrix);
+    // Overwrite the joint transforms with the inverse bind pose.
+    result.joints_[matrix_i]->SetGlobalTransform(matrix.Invert());
+  }
+
+  return std::make_unique<Skin>(std::move(result));
+}
+
+Skin::Skin() = default;
+
+Skin::~Skin() = default;
+
+Skin::Skin(Skin&&) = default;
+
+Skin& Skin::operator=(Skin&&) = default;
+
+std::shared_ptr<Texture> Skin::GetJointsTexture(Allocator& allocator) {
+  // Each joint has a matrix. 1 matrix = 16 floats. 1 pixel = 4 floats.
+  // Therefore, each joint needs 4 pixels.
+  auto required_pixels = joints_.size() * 4;
+  auto dimension_size = std::max(
+      2u,
+      Allocation::NextPowerOfTwoSize(std::ceil(std::sqrt(required_pixels))));
+
+  impeller::TextureDescriptor texture_descriptor;
+  texture_descriptor.storage_mode = impeller::StorageMode::kHostVisible;
+  texture_descriptor.format = PixelFormat::kR32G32B32A32Float;
+  texture_descriptor.size = {dimension_size, dimension_size};
+  texture_descriptor.mip_count = 1u;
+
+  auto result = allocator.CreateTexture(texture_descriptor);
+  result->SetLabel("Joints Texture");
+  if (!result) {
+    FML_LOG(ERROR) << "Could not create joint texture.";
+    return nullptr;
+  }
+
+  std::vector<Matrix> joints;
+  joints.resize(result->GetSize().Area() / 4, Matrix());
+  FML_DCHECK(joints.size() >= joints_.size());
+  for (size_t joint_i = 0; joint_i < joints_.size(); joint_i++) {
+    const Node* joint = joints_[joint_i].get();
+    if (!joint) {
+      // When a joint is missing, just let it remain as an identity matrix.
+      continue;
+    }
+
+    // Compute a model space matrix for the joint by walking up the bones to the
+    // skeleton root.
+    while (joint && joint->IsJoint()) {
+      joints[joint_i] = joint->GetLocalTransform() * joints[joint_i];
+      joint = joint->GetParent();
+    }
+
+    // Get the joint transform relative to the default pose of the bone by
+    // incorporating the joint's inverse bind matrix. The inverse bind matrix
+    // transforms from model space to the default pose space of the joint. The
+    // result is a model space matrix that only captures the difference between
+    // the joint's default pose and the joint's current pose in the scene. This
+    // is necessary because the skinned model's vertex positions (which _define_
+    // the default pose) are all in model space.
+    joints[joint_i] = joints[joint_i] * inverse_bind_matrices_[joint_i];
+  }
+
+  if (!result->SetContents(reinterpret_cast<uint8_t*>(joints.data()),
+                           joints.size() * sizeof(Matrix))) {
+    FML_LOG(ERROR) << "Could not set contents of joint texture.";
+    return nullptr;
+  }
+
+  return result;
+}
+
+}  // namespace scene
+}  // namespace impeller
diff --git a/impeller/scene/skin.h b/impeller/scene/skin.h
new file mode 100644
index 0000000000000000000000000000000000000000..77e663c964f0f6dfd90d57bdb051acc64b070241
--- /dev/null
+++ b/impeller/scene/skin.h
@@ -0,0 +1,47 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_SCENE_SKIN_H_
+#define FLUTTER_IMPELLER_SCENE_SKIN_H_
+
+#include <memory>
+#include <optional>
+
+#include "flutter/fml/macros.h"
+
+#include "impeller/core/allocator.h"
+#include "impeller/core/texture.h"
+#include "impeller/scene/importer/scene_flatbuffers.h"
+#include "impeller/scene/node.h"
+
+namespace impeller {
+namespace scene {
+
+class Skin final {
+ public:
+  static std::unique_ptr<Skin> MakeFromFlatbuffer(
+      const fb::Skin& skin,
+      const std::vector<std::shared_ptr<Node>>& scene_nodes);
+  ~Skin();
+
+  Skin(Skin&&);
+  Skin& operator=(Skin&&);
+
+  std::shared_ptr<Texture> GetJointsTexture(Allocator& allocator);
+
+ private:
+  Skin();
+
+  std::vector<std::shared_ptr<Node>> joints_;
+  std::vector<Matrix> inverse_bind_matrices_;
+
+  Skin(const Skin&) = delete;
+
+  Skin& operator=(const Skin&) = delete;
+};
+
+}  // namespace scene
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_SCENE_SKIN_H_
diff --git a/impeller/scene/static_mesh_entity.cc b/impeller/scene/static_mesh_entity.cc
deleted file mode 100644
index e234e956eac432c285a417629c9c4184304649a5..0000000000000000000000000000000000000000
--- a/impeller/scene/static_mesh_entity.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "impeller/scene/static_mesh_entity.h"
-
-#include <memory>
-
-#include "impeller/scene/material.h"
-#include "impeller/scene/scene_encoder.h"
-
-namespace impeller {
-namespace scene {
-
-StaticMeshEntity::StaticMeshEntity() = default;
-StaticMeshEntity::~StaticMeshEntity() = default;
-
-void StaticMeshEntity::SetGeometry(std::shared_ptr<Geometry> geometry) {
-  geometry_ = std::move(geometry);
-}
-
-void StaticMeshEntity::SetMaterial(std::shared_ptr<Material> material) {
-  material_ = std::move(material);
-}
-
-// |SceneEntity|
-bool StaticMeshEntity::OnRender(SceneEncoder& encoder,
-                                const Camera& camera) const {
-  SceneCommand command = {
-      .label = "Static Mesh",
-      .transform = GetGlobalTransform(),
-      .geometry = geometry_.get(),
-      .material = material_.get(),
-  };
-  encoder.Add(command);
-  return true;
-}
-
-}  // namespace scene
-}  // namespace impeller
diff --git a/impeller/blobcat/BUILD.gn b/impeller/shader_archive/BUILD.gn
similarity index 37%
rename from impeller/blobcat/BUILD.gn
rename to impeller/shader_archive/BUILD.gn
index a70f4a4ec10ff1955170540922d9983a0b39d9a5..ba565939b21476c466eb27d34d5e891b4e061b80 100644
--- a/impeller/blobcat/BUILD.gn
+++ b/impeller/shader_archive/BUILD.gn
@@ -2,54 +2,62 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//third_party/flatbuffers/flatbuffers.gni")
+import("//flutter/third_party/flatbuffers/flatbuffers.gni")
 import("../tools/impeller.gni")
 
-config("blobcat_config") {
+config("shader_archive_config") {
   configs = [ "//flutter/impeller:impeller_public_config" ]
   include_dirs = [ "$root_gen_dir/flutter" ]
 }
 
-flatbuffers("blobcat_flatbuffers") {
-  flatbuffers = [ "blob.fbs" ]
-  public_configs = [ ":blobcat_config" ]
-  public_deps = [ "//third_party/flatbuffers" ]
+flatbuffers("shader_archive_flatbuffers") {
+  flatbuffers = [
+    "shader_archive.fbs",
+    "multi_arch_shader_archive.fbs",
+  ]
+  public_configs = [ ":shader_archive_config" ]
+  public_deps = [ "//flutter/third_party/flatbuffers" ]
 }
 
-impeller_component("blobcat_lib") {
+impeller_component("shader_archive") {
   sources = [
-    "blob_library.cc",
-    "blob_library.h",
-    "blob_writer.cc",
-    "blob_writer.h",
+    "multi_arch_shader_archive.cc",
+    "multi_arch_shader_archive.h",
+    "multi_arch_shader_archive_writer.cc",
+    "multi_arch_shader_archive_writer.h",
+    "shader_archive.cc",
+    "shader_archive.h",
+    "shader_archive_types.h",
+    "shader_archive_writer.cc",
+    "shader_archive_writer.h",
   ]
 
   public_deps = [
-    ":blobcat_flatbuffers",
+    ":shader_archive_flatbuffers",
     "../base",
     "//flutter/fml",
   ]
 }
 
-impeller_component("blobcat") {
+impeller_component("shader_archiver") {
   target_type = "executable"
 
-  sources = [ "blobcat_main.cc" ]
+  sources = [ "shader_archive_main.cc" ]
 
   deps = [
-    ":blobcat_lib",
+    ":shader_archive",
     "../base",
     "//flutter/fml",
   ]
 }
 
-impeller_component("blobcat_unittests") {
+impeller_component("shader_archive_unittests") {
   testonly = true
 
-  sources = [ "blobcat_unittests.cc" ]
+  sources = [ "shader_archive_unittests.cc" ]
 
   deps = [
-    ":blobcat_lib",
+    ":shader_archive",
     "//flutter/fml",
     "//flutter/testing",
   ]
diff --git a/impeller/shader_archive/multi_arch_shader_archive.cc b/impeller/shader_archive/multi_arch_shader_archive.cc
new file mode 100644
index 0000000000000000000000000000000000000000..922d6eb4631469adbd765c852e649f355595f1e0
--- /dev/null
+++ b/impeller/shader_archive/multi_arch_shader_archive.cc
@@ -0,0 +1,104 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/shader_archive/multi_arch_shader_archive.h"
+
+#include "impeller/shader_archive/multi_arch_shader_archive_flatbuffers.h"
+
+namespace impeller {
+
+constexpr ArchiveRenderingBackend ToArchiveRenderingBackend(
+    fb::RenderingBackend backend) {
+  switch (backend) {
+    case fb::RenderingBackend::kOpenGLES:
+      return ArchiveRenderingBackend::kOpenGLES;
+    case fb::RenderingBackend::kVulkan:
+      return ArchiveRenderingBackend::kVulkan;
+    case fb::RenderingBackend::kMetal:
+      return ArchiveRenderingBackend::kMetal;
+  }
+  FML_UNREACHABLE();
+}
+
+std::shared_ptr<ShaderArchive> MultiArchShaderArchive::CreateArchiveFromMapping(
+    const std::shared_ptr<const fml::Mapping>& mapping,
+    ArchiveRenderingBackend backend) {
+  {
+    auto multi_archive = std::make_shared<MultiArchShaderArchive>(mapping);
+    if (multi_archive->IsValid()) {
+      return multi_archive->GetShaderArchive(backend);
+    }
+  }
+  {
+    auto single_archive =
+        std::shared_ptr<ShaderArchive>(new ShaderArchive(mapping));
+    if (single_archive->IsValid()) {
+      return single_archive;
+    }
+  }
+  return nullptr;
+}
+
+MultiArchShaderArchive::MultiArchShaderArchive(
+    const std::shared_ptr<const fml::Mapping>& mapping) {
+  if (!mapping) {
+    return;
+  }
+
+  if (!fb::MultiArchShaderArchiveBufferHasIdentifier(mapping->GetMapping())) {
+    return;
+  }
+
+  const auto* multi_arch = fb::GetMultiArchShaderArchive(mapping->GetMapping());
+
+  if (!multi_arch) {
+    return;
+  }
+
+  if (auto archives = multi_arch->items()) {
+    for (auto i = archives->begin(), end = archives->end(); i != end; i++) {
+      // This implementation is unable to handle multiple archives for the same
+      // backend.
+      backend_mappings_[ToArchiveRenderingBackend(i->rendering_backend())] =
+          std::make_shared<fml::NonOwnedMapping>(i->mapping()->Data(),
+                                                 i->mapping()->size(),
+                                                 [mapping](auto, auto) {
+                                                   // Just hold the mapping.
+                                                 });
+    }
+  }
+
+  is_valid_ = true;
+}
+
+MultiArchShaderArchive::~MultiArchShaderArchive() = default;
+
+bool MultiArchShaderArchive::IsValid() const {
+  return is_valid_;
+}
+
+std::shared_ptr<const fml::Mapping> MultiArchShaderArchive::GetArchive(
+    ArchiveRenderingBackend backend) const {
+  auto found = backend_mappings_.find(backend);
+  if (found == backend_mappings_.end()) {
+    return nullptr;
+  }
+  return found->second;
+}
+
+std::shared_ptr<ShaderArchive> MultiArchShaderArchive::GetShaderArchive(
+    ArchiveRenderingBackend backend) const {
+  auto archive = GetArchive(backend);
+  if (!archive) {
+    return nullptr;
+  }
+  auto shader_archive =
+      std::shared_ptr<ShaderArchive>(new ShaderArchive(std::move(archive)));
+  if (!shader_archive->IsValid()) {
+    return nullptr;
+  }
+  return shader_archive;
+}
+
+}  // namespace impeller
diff --git a/impeller/shader_archive/multi_arch_shader_archive.fbs b/impeller/shader_archive/multi_arch_shader_archive.fbs
new file mode 100644
index 0000000000000000000000000000000000000000..22760c6d6e0020fd27cf6db43e9a24ae5fb514cd
--- /dev/null
+++ b/impeller/shader_archive/multi_arch_shader_archive.fbs
@@ -0,0 +1,25 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+namespace impeller.fb;
+
+enum RenderingBackend:byte {
+  kOpenGLES,
+  kVulkan,
+  kMetal,
+}
+
+table ShaderArchiveBlob {
+  rendering_backend: RenderingBackend;
+  mapping: [ubyte];
+}
+
+table MultiArchShaderArchive {
+  // We could have just as easily used the existing `ShaderArchive` table here.
+  // However, those tables aren't used by Metal.
+  items: [ShaderArchiveBlob];
+}
+
+root_type MultiArchShaderArchive;
+file_identifier "MARC";
diff --git a/impeller/shader_archive/multi_arch_shader_archive.h b/impeller/shader_archive/multi_arch_shader_archive.h
new file mode 100644
index 0000000000000000000000000000000000000000..1a73380b7a6a1a5cc0dd5f020f920e605882eaf4
--- /dev/null
+++ b/impeller/shader_archive/multi_arch_shader_archive.h
@@ -0,0 +1,49 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_SHADER_ARCHIVE_MULTI_ARCH_SHADER_ARCHIVE_H_
+#define FLUTTER_IMPELLER_SHADER_ARCHIVE_MULTI_ARCH_SHADER_ARCHIVE_H_
+
+#include <map>
+#include <memory>
+
+#include "flutter/fml/macros.h"
+#include "flutter/fml/mapping.h"
+#include "impeller/shader_archive/shader_archive.h"
+#include "impeller/shader_archive/shader_archive_types.h"
+
+namespace impeller {
+
+class MultiArchShaderArchive {
+ public:
+  static std::shared_ptr<ShaderArchive> CreateArchiveFromMapping(
+      const std::shared_ptr<const fml::Mapping>& mapping,
+      ArchiveRenderingBackend backend);
+
+  explicit MultiArchShaderArchive(
+      const std::shared_ptr<const fml::Mapping>& mapping);
+
+  ~MultiArchShaderArchive();
+
+  std::shared_ptr<const fml::Mapping> GetArchive(
+      ArchiveRenderingBackend backend) const;
+
+  std::shared_ptr<ShaderArchive> GetShaderArchive(
+      ArchiveRenderingBackend backend) const;
+
+  bool IsValid() const;
+
+ private:
+  std::map<ArchiveRenderingBackend, std::shared_ptr<const fml::Mapping>>
+      backend_mappings_;
+  bool is_valid_ = false;
+
+  MultiArchShaderArchive(const MultiArchShaderArchive&) = delete;
+
+  MultiArchShaderArchive& operator=(const MultiArchShaderArchive&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_SHADER_ARCHIVE_MULTI_ARCH_SHADER_ARCHIVE_H_
diff --git a/impeller/shader_archive/multi_arch_shader_archive_writer.cc b/impeller/shader_archive/multi_arch_shader_archive_writer.cc
new file mode 100644
index 0000000000000000000000000000000000000000..98a6ada2ef47eb9044a15e3fd7364c321250e786
--- /dev/null
+++ b/impeller/shader_archive/multi_arch_shader_archive_writer.cc
@@ -0,0 +1,64 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/shader_archive/multi_arch_shader_archive_writer.h"
+
+#include "impeller/base/validation.h"
+#include "impeller/shader_archive/multi_arch_shader_archive_flatbuffers.h"
+
+namespace impeller {
+
+MultiArchShaderArchiveWriter::MultiArchShaderArchiveWriter() = default;
+
+MultiArchShaderArchiveWriter::~MultiArchShaderArchiveWriter() = default;
+
+bool MultiArchShaderArchiveWriter::RegisterShaderArchive(
+    ArchiveRenderingBackend backend,
+    std::shared_ptr<const fml::Mapping> mapping) {
+  if (!mapping || mapping->GetMapping() == nullptr) {
+    return false;
+  }
+  if (archives_.find(backend) != archives_.end()) {
+    VALIDATION_LOG << "Multi-archive already has a shader library registered "
+                      "for that backend.";
+    return false;
+  }
+  archives_[backend] = std::move(mapping);
+  return true;
+}
+
+constexpr fb::RenderingBackend ToRenderingBackend(
+    ArchiveRenderingBackend backend) {
+  switch (backend) {
+    case ArchiveRenderingBackend::kMetal:
+      return fb::RenderingBackend::kMetal;
+    case ArchiveRenderingBackend::kVulkan:
+      return fb::RenderingBackend::kVulkan;
+    case ArchiveRenderingBackend::kOpenGLES:
+      return fb::RenderingBackend::kOpenGLES;
+  }
+  FML_UNREACHABLE();
+}
+
+std::shared_ptr<fml::Mapping> MultiArchShaderArchiveWriter::CreateMapping()
+    const {
+  fb::MultiArchShaderArchiveT multi_archive;
+  for (const auto& archive : archives_) {
+    auto archive_blob = std::make_unique<fb::ShaderArchiveBlobT>();
+    archive_blob->rendering_backend = ToRenderingBackend(archive.first);
+    archive_blob->mapping = {
+        archive.second->GetMapping(),
+        archive.second->GetMapping() + archive.second->GetSize()};
+    multi_archive.items.emplace_back(std::move(archive_blob));
+  }
+  auto builder = std::make_shared<flatbuffers::FlatBufferBuilder>();
+  builder->Finish(
+      fb::MultiArchShaderArchive::Pack(*builder.get(), &multi_archive),
+      fb::MultiArchShaderArchiveIdentifier());
+  return std::make_shared<fml::NonOwnedMapping>(builder->GetBufferPointer(),
+                                                builder->GetSize(),
+                                                [builder](auto, auto) {});
+}
+
+}  // namespace impeller
diff --git a/impeller/shader_archive/multi_arch_shader_archive_writer.h b/impeller/shader_archive/multi_arch_shader_archive_writer.h
new file mode 100644
index 0000000000000000000000000000000000000000..f04df91f36f92f89b7d4508dfeef02d7cfba44d6
--- /dev/null
+++ b/impeller/shader_archive/multi_arch_shader_archive_writer.h
@@ -0,0 +1,40 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_SHADER_ARCHIVE_MULTI_ARCH_SHADER_ARCHIVE_WRITER_H_
+#define FLUTTER_IMPELLER_SHADER_ARCHIVE_MULTI_ARCH_SHADER_ARCHIVE_WRITER_H_
+
+#include <map>
+
+#include "flutter/fml/macros.h"
+#include "flutter/fml/mapping.h"
+#include "impeller/shader_archive/shader_archive_types.h"
+
+namespace impeller {
+
+class MultiArchShaderArchiveWriter {
+ public:
+  MultiArchShaderArchiveWriter();
+
+  ~MultiArchShaderArchiveWriter();
+
+  [[nodiscard]] bool RegisterShaderArchive(
+      ArchiveRenderingBackend backend,
+      std::shared_ptr<const fml::Mapping> mapping);
+
+  std::shared_ptr<fml::Mapping> CreateMapping() const;
+
+ private:
+  std::map<ArchiveRenderingBackend, std::shared_ptr<const fml::Mapping>>
+      archives_;
+
+  MultiArchShaderArchiveWriter(const MultiArchShaderArchiveWriter&) = delete;
+
+  MultiArchShaderArchiveWriter& operator=(const MultiArchShaderArchiveWriter&) =
+      delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_SHADER_ARCHIVE_MULTI_ARCH_SHADER_ARCHIVE_WRITER_H_
diff --git a/impeller/blobcat/blob_library.cc b/impeller/shader_archive/shader_archive.cc
similarity index 49%
rename from impeller/blobcat/blob_library.cc
rename to impeller/shader_archive/shader_archive.cc
index 5377fc236d3b8886d69d2f938e5a989e27803358..00ac140140ccd0e6db4c0a66fb37faedceff33f7 100644
--- a/impeller/blobcat/blob_library.cc
+++ b/impeller/shader_archive/shader_archive.cc
@@ -2,52 +2,52 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/blobcat/blob_library.h"
+#include "impeller/shader_archive/shader_archive.h"
 
 #include <array>
 #include <string>
 #include <utility>
 
 #include "impeller/base/validation.h"
-#include "impeller/blobcat/blob_flatbuffers.h"
+#include "impeller/shader_archive/shader_archive_flatbuffers.h"
 
 namespace impeller {
 
-constexpr BlobShaderType ToShaderType(fb::Stage stage) {
+constexpr ArchiveShaderType ToShaderType(fb::Stage stage) {
   switch (stage) {
     case fb::Stage::kVertex:
-      return BlobShaderType::kVertex;
+      return ArchiveShaderType::kVertex;
     case fb::Stage::kFragment:
-      return BlobShaderType::kFragment;
+      return ArchiveShaderType::kFragment;
     case fb::Stage::kCompute:
-      return BlobShaderType::kCompute;
+      return ArchiveShaderType::kCompute;
   }
   FML_UNREACHABLE();
 }
 
-BlobLibrary::BlobLibrary(std::shared_ptr<fml::Mapping> payload)
+ShaderArchive::ShaderArchive(std::shared_ptr<const fml::Mapping> payload)
     : payload_(std::move(payload)) {
   if (!payload_ || payload_->GetMapping() == nullptr) {
-    VALIDATION_LOG << "Blob mapping was absent.";
+    VALIDATION_LOG << "Shader mapping was absent.";
     return;
   }
 
-  if (!fb::BlobLibraryBufferHasIdentifier(payload_->GetMapping())) {
-    VALIDATION_LOG << "Invalid blob magic.";
+  if (!fb::ShaderArchiveBufferHasIdentifier(payload_->GetMapping())) {
+    VALIDATION_LOG << "Invalid shader archive magic.";
     return;
   }
 
-  auto blob_library = fb::GetBlobLibrary(payload_->GetMapping());
-  if (!blob_library) {
+  auto shader_archive = fb::GetShaderArchive(payload_->GetMapping());
+  if (!shader_archive) {
     return;
   }
 
-  if (auto items = blob_library->items()) {
+  if (auto items = shader_archive->items()) {
     for (auto i = items->begin(), end = items->end(); i != end; i++) {
-      BlobKey key;
+      ShaderKey key;
       key.name = i->name()->str();
       key.type = ToShaderType(i->stage());
-      blobs_[key] = std::make_shared<fml::NonOwnedMapping>(
+      shaders_[key] = std::make_shared<fml::NonOwnedMapping>(
           i->mapping()->Data(), i->mapping()->size(),
           [payload = payload_](auto, auto) {
             // The pointers are into the base payload. Instead of copying the
@@ -59,29 +59,30 @@ BlobLibrary::BlobLibrary(std::shared_ptr<fml::Mapping> payload)
   is_valid_ = true;
 }
 
-BlobLibrary::BlobLibrary(BlobLibrary&&) = default;
+ShaderArchive::ShaderArchive(ShaderArchive&&) = default;
 
-BlobLibrary::~BlobLibrary() = default;
+ShaderArchive::~ShaderArchive() = default;
 
-bool BlobLibrary::IsValid() const {
+bool ShaderArchive::IsValid() const {
   return is_valid_;
 }
 
-size_t BlobLibrary::GetShaderCount() const {
-  return blobs_.size();
+size_t ShaderArchive::GetShaderCount() const {
+  return shaders_.size();
 }
 
-std::shared_ptr<fml::Mapping> BlobLibrary::GetMapping(BlobShaderType type,
-                                                      std::string name) const {
-  BlobKey key;
+std::shared_ptr<fml::Mapping> ShaderArchive::GetMapping(
+    ArchiveShaderType type,
+    std::string name) const {
+  ShaderKey key;
   key.type = type;
   key.name = std::move(name);
-  auto found = blobs_.find(key);
-  return found == blobs_.end() ? nullptr : found->second;
+  auto found = shaders_.find(key);
+  return found == shaders_.end() ? nullptr : found->second;
 }
 
-size_t BlobLibrary::IterateAllBlobs(
-    const std::function<bool(BlobShaderType type,
+size_t ShaderArchive::IterateAllShaders(
+    const std::function<bool(ArchiveShaderType type,
                              const std::string& name,
                              const std::shared_ptr<fml::Mapping>& mapping)>&
         callback) const {
@@ -89,9 +90,9 @@ size_t BlobLibrary::IterateAllBlobs(
     return 0u;
   }
   size_t count = 0u;
-  for (const auto& blob : blobs_) {
+  for (const auto& shader : shaders_) {
     count++;
-    if (!callback(blob.first.type, blob.first.name, blob.second)) {
+    if (!callback(shader.first.type, shader.first.name, shader.second)) {
       break;
     }
   }
diff --git a/impeller/blobcat/blob.fbs b/impeller/shader_archive/shader_archive.fbs
similarity index 72%
rename from impeller/blobcat/blob.fbs
rename to impeller/shader_archive/shader_archive.fbs
index 715dd70ccbaef522fdc8b549d3daf70c4631e364..0077f54a3535b520968c9b721e61516f9201f18a 100644
--- a/impeller/blobcat/blob.fbs
+++ b/impeller/shader_archive/shader_archive.fbs
@@ -10,15 +10,15 @@ enum Stage:byte {
   kCompute,
 }
 
-table Blob {
+table ShaderBlob {
   stage: Stage;
   name: string;
   mapping: [ubyte];
 }
 
-table BlobLibrary {
-  items: [Blob];
+table ShaderArchive {
+  items: [ShaderBlob];
 }
 
-root_type BlobLibrary;
-file_identifier "BCAT";
+root_type ShaderArchive;
+file_identifier "SHAR";
diff --git a/impeller/blobcat/blob_library.h b/impeller/shader_archive/shader_archive.h
similarity index 45%
rename from impeller/blobcat/blob_library.h
rename to impeller/shader_archive/shader_archive.h
index 4a8809590fb799a9a06fa2f10d87c174ff155651..a13736d11e330c11130edff396962b43640f7444 100644
--- a/impeller/blobcat/blob_library.h
+++ b/impeller/shader_archive/shader_archive.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_SHADER_ARCHIVE_SHADER_ARCHIVE_H_
+#define FLUTTER_IMPELLER_SHADER_ARCHIVE_SHADER_ARCHIVE_H_
 
 #include <memory>
 #include <type_traits>
@@ -11,38 +12,40 @@
 #include "flutter/fml/hash_combine.h"
 #include "flutter/fml/macros.h"
 #include "flutter/fml/mapping.h"
-#include "impeller/blobcat/blob_types.h"
+#include "impeller/shader_archive/shader_archive_types.h"
 
 namespace impeller {
 
-class BlobLibrary {
- public:
-  explicit BlobLibrary(std::shared_ptr<fml::Mapping> payload);
+class MultiArchShaderArchive;
 
-  BlobLibrary(BlobLibrary&&);
+class ShaderArchive {
+ public:
+  ShaderArchive(ShaderArchive&&);
 
-  ~BlobLibrary();
+  ~ShaderArchive();
 
   bool IsValid() const;
 
   size_t GetShaderCount() const;
 
-  std::shared_ptr<fml::Mapping> GetMapping(BlobShaderType type,
+  std::shared_ptr<fml::Mapping> GetMapping(ArchiveShaderType type,
                                            std::string name) const;
 
-  size_t IterateAllBlobs(
-      const std::function<bool(BlobShaderType type,
+  size_t IterateAllShaders(
+      const std::function<bool(ArchiveShaderType type,
                                const std::string& name,
                                const std::shared_ptr<fml::Mapping>& mapping)>&)
       const;
 
  private:
-  struct BlobKey {
-    BlobShaderType type = BlobShaderType::kFragment;
+  friend MultiArchShaderArchive;
+
+  struct ShaderKey {
+    ArchiveShaderType type = ArchiveShaderType::kFragment;
     std::string name;
 
     struct Hash {
-      size_t operator()(const BlobKey& key) const {
+      size_t operator()(const ShaderKey& key) const {
         return fml::HashCombine(
             static_cast<std::underlying_type_t<decltype(key.type)>>(key.type),
             key.name);
@@ -50,22 +53,28 @@ class BlobLibrary {
     };
 
     struct Equal {
-      bool operator()(const BlobKey& lhs, const BlobKey& rhs) const {
+      bool operator()(const ShaderKey& lhs, const ShaderKey& rhs) const {
         return lhs.type == rhs.type && lhs.name == rhs.name;
       }
     };
   };
 
-  using Blobs = std::unordered_map<BlobKey,
-                                   std::shared_ptr<fml::Mapping>,
-                                   BlobKey::Hash,
-                                   BlobKey::Equal>;
+  using Shaders = std::unordered_map<ShaderKey,
+                                     std::shared_ptr<fml::Mapping>,
+                                     ShaderKey::Hash,
+                                     ShaderKey::Equal>;
 
-  std::shared_ptr<fml::Mapping> payload_;
-  Blobs blobs_;
+  std::shared_ptr<const fml::Mapping> payload_;
+  Shaders shaders_;
   bool is_valid_ = false;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(BlobLibrary);
+  explicit ShaderArchive(std::shared_ptr<const fml::Mapping> payload);
+
+  ShaderArchive(const ShaderArchive&) = delete;
+
+  ShaderArchive& operator=(const ShaderArchive&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_SHADER_ARCHIVE_SHADER_ARCHIVE_H_
diff --git a/impeller/blobcat/blobcat_main.cc b/impeller/shader_archive/shader_archive_main.cc
similarity index 71%
rename from impeller/blobcat/blobcat_main.cc
rename to impeller/shader_archive/shader_archive_main.cc
index 16a128a01d23a3d550c8a2b9ef7749c72b9dadf3..7220a8596021d3cb7e2be85305b80e1b91bcad7b 100644
--- a/impeller/blobcat/blobcat_main.cc
+++ b/impeller/shader_archive/shader_archive_main.cc
@@ -6,12 +6,12 @@
 #include <iostream>
 
 #include "flutter/fml/command_line.h"
-#include "impeller/blobcat/blob_writer.h"
+#include "impeller/shader_archive/shader_archive_writer.h"
 
 namespace impeller {
 
 bool Main(const fml::CommandLine& command_line) {
-  BlobWriter writer;
+  ShaderArchiveWriter writer;
 
   std::string output;
   if (!command_line.GetOptionValue("output", &output)) {
@@ -20,15 +20,15 @@ bool Main(const fml::CommandLine& command_line) {
   }
 
   for (const auto& input : command_line.GetOptionValues("input")) {
-    if (!writer.AddBlobAtPath(std::string{input})) {
-      std::cerr << "Could not add blob at path: " << input << std::endl;
+    if (!writer.AddShaderAtPath(std::string{input})) {
+      std::cerr << "Could not add shader at path: " << input << std::endl;
       return false;
     }
   }
 
-  auto blob = writer.CreateMapping();
-  if (!blob) {
-    std::cerr << "Could not create combined shader blob." << std::endl;
+  auto archive = writer.CreateMapping();
+  if (!archive) {
+    std::cerr << "Could not create shader archive." << std::endl;
     return false;
   }
 
@@ -38,8 +38,9 @@ bool Main(const fml::CommandLine& command_line) {
   auto output_path =
       std::filesystem::absolute(std::filesystem::current_path() / output);
   if (!fml::WriteAtomically(current_directory, output_path.string().c_str(),
-                            *blob)) {
-    std::cerr << "Could not write shader blob to path " << output << std::endl;
+                            *archive)) {
+    std::cerr << "Could not write shader archive to path " << output
+              << std::endl;
     return false;
   }
 
diff --git a/impeller/renderer/descriptor_set_layout.h b/impeller/shader_archive/shader_archive_types.h
similarity index 40%
rename from impeller/renderer/descriptor_set_layout.h
rename to impeller/shader_archive/shader_archive_types.h
index d853f0a663086113ceac71bf26eb990f077d51ef..2e2b6aae631dd3337450a1e0cda2292d49bbd58c 100644
--- a/impeller/renderer/descriptor_set_layout.h
+++ b/impeller/shader_archive/shader_archive_types.h
@@ -2,26 +2,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
-
-#include <memory>
-#include <string>
-
-#include "flutter/fml/macros.h"
-#include "impeller/renderer/shader_types.h"
+#ifndef FLUTTER_IMPELLER_SHADER_ARCHIVE_SHADER_ARCHIVE_TYPES_H_
+#define FLUTTER_IMPELLER_SHADER_ARCHIVE_SHADER_ARCHIVE_TYPES_H_
 
 namespace impeller {
 
-enum class DescriptorType {
-  kSampledImage,
-  kUniformBuffer,
+enum class ArchiveShaderType {
+  kVertex,
+  kFragment,
+  kCompute,
 };
 
-struct DescriptorSetLayout {
-  uint32_t binding;
-  DescriptorType descriptor_type;
-  uint32_t descriptor_count;
-  ShaderStage shader_stage;
+enum class ArchiveRenderingBackend {
+  kMetal,
+  kVulkan,
+  kOpenGLES,
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_SHADER_ARCHIVE_SHADER_ARCHIVE_TYPES_H_
diff --git a/impeller/shader_archive/shader_archive_unittests.cc b/impeller/shader_archive/shader_archive_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..b8c00121a573fdfb818d10c65a2de7433a12640b
--- /dev/null
+++ b/impeller/shader_archive/shader_archive_unittests.cc
@@ -0,0 +1,96 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <string>
+
+#include "flutter/fml/mapping.h"
+#include "flutter/testing/testing.h"
+#include "impeller/base/validation.h"
+#include "impeller/shader_archive/multi_arch_shader_archive.h"
+#include "impeller/shader_archive/multi_arch_shader_archive_flatbuffers.h"
+#include "impeller/shader_archive/multi_arch_shader_archive_writer.h"
+#include "impeller/shader_archive/shader_archive.h"
+#include "impeller/shader_archive/shader_archive_flatbuffers.h"
+#include "impeller/shader_archive/shader_archive_writer.h"
+
+namespace impeller {
+namespace testing {
+
+static std::shared_ptr<fml::Mapping> CreateMappingFromString(
+    std::string p_string) {
+  auto string = std::make_shared<std::string>(std::move(p_string));
+  return std::make_shared<fml::NonOwnedMapping>(
+      reinterpret_cast<const uint8_t*>(string->data()), string->size(),
+      [string](auto, auto) {});
+}
+
+const std::string CreateStringFromMapping(const fml::Mapping& mapping) {
+  return std::string{reinterpret_cast<const char*>(mapping.GetMapping()),
+                     mapping.GetSize()};
+}
+
+TEST(ShaderArchiveTest, CanReadAndWriteBlobs) {
+  ShaderArchiveWriter writer;
+  ASSERT_TRUE(writer.AddShader(ArchiveShaderType::kVertex, "Hello",
+                               CreateMappingFromString("World")));
+  ASSERT_TRUE(writer.AddShader(ArchiveShaderType::kFragment, "Foo",
+                               CreateMappingFromString("Bar")));
+  ASSERT_TRUE(writer.AddShader(ArchiveShaderType::kVertex, "Baz",
+                               CreateMappingFromString("Bang")));
+  ASSERT_TRUE(writer.AddShader(ArchiveShaderType::kVertex, "Ping",
+                               CreateMappingFromString("Pong")));
+  ASSERT_TRUE(writer.AddShader(ArchiveShaderType::kFragment, "Pang",
+                               CreateMappingFromString("World")));
+
+  auto mapping = writer.CreateMapping();
+  ASSERT_NE(mapping, nullptr);
+
+  MultiArchShaderArchiveWriter multi_writer;
+
+  ASSERT_TRUE(multi_writer.RegisterShaderArchive(
+      ArchiveRenderingBackend::kOpenGLES, mapping));
+
+  {
+    ScopedValidationDisable no_val;
+    // Can't add the same backend again.
+    ASSERT_FALSE(multi_writer.RegisterShaderArchive(
+        ArchiveRenderingBackend::kOpenGLES, mapping));
+  }
+
+  auto multi_mapping = multi_writer.CreateMapping();
+  ASSERT_TRUE(multi_mapping);
+
+  {
+    ScopedValidationDisable no_val;
+    auto no_library = MultiArchShaderArchive::CreateArchiveFromMapping(
+        multi_mapping, ArchiveRenderingBackend::kVulkan);
+    ASSERT_EQ(no_library, nullptr);
+  }
+
+  auto library = MultiArchShaderArchive::CreateArchiveFromMapping(
+      multi_mapping, ArchiveRenderingBackend::kOpenGLES);
+  ASSERT_EQ(library->GetShaderCount(), 5u);
+
+  // Wrong type.
+  ASSERT_EQ(library->GetMapping(ArchiveShaderType::kFragment, "Hello"),
+            nullptr);
+
+  auto hello_vtx = library->GetMapping(ArchiveShaderType::kVertex, "Hello");
+  ASSERT_NE(hello_vtx, nullptr);
+  ASSERT_EQ(CreateStringFromMapping(*hello_vtx), "World");
+}
+
+TEST(ShaderArchiveTest, ArchiveAndMultiArchiveHaveDifferentIdentifiers) {
+  // The unarchiving process depends on these identifiers to check to see if its
+  // a standalone archive or a multi-archive. Things will get nutty if these are
+  // ever the same.
+  auto archive_id = fb::ShaderArchiveIdentifier();
+  auto multi_archive_id = fb::MultiArchShaderArchiveIdentifier();
+  ASSERT_EQ(std::strlen(archive_id), std::strlen(multi_archive_id));
+  ASSERT_NE(std::strncmp(archive_id, multi_archive_id, std::strlen(archive_id)),
+            0);
+}
+
+}  // namespace testing
+}  // namespace impeller
diff --git a/impeller/blobcat/blob_writer.cc b/impeller/shader_archive/shader_archive_writer.cc
similarity index 58%
rename from impeller/blobcat/blob_writer.cc
rename to impeller/shader_archive/shader_archive_writer.cc
index bafebbec2b8ff88f778db3ca5292387e09942b8a..83c0459f34ebe05a40939ebdb614b7349447ca07 100644
--- a/impeller/blobcat/blob_writer.cc
+++ b/impeller/shader_archive/shader_archive_writer.cc
@@ -2,33 +2,33 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/blobcat/blob_writer.h"
+#include "impeller/shader_archive/shader_archive_writer.h"
 
 #include <array>
 #include <filesystem>
 #include <optional>
 
-#include "impeller/blobcat/blob_flatbuffers.h"
+#include "impeller/shader_archive/shader_archive_flatbuffers.h"
 
 namespace impeller {
 
-BlobWriter::BlobWriter() = default;
+ShaderArchiveWriter::ShaderArchiveWriter() = default;
 
-BlobWriter::~BlobWriter() = default;
+ShaderArchiveWriter::~ShaderArchiveWriter() = default;
 
-std::optional<BlobShaderType> InferShaderTypefromFileExtension(
+std::optional<ArchiveShaderType> InferShaderTypefromFileExtension(
     const std::filesystem::path& path) {
   if (path == ".vert") {
-    return BlobShaderType::kVertex;
+    return ArchiveShaderType::kVertex;
   } else if (path == ".frag") {
-    return BlobShaderType::kFragment;
+    return ArchiveShaderType::kFragment;
   } else if (path == ".comp") {
-    return BlobShaderType::kCompute;
+    return ArchiveShaderType::kCompute;
   }
   return std::nullopt;
 }
 
-bool BlobWriter::AddBlobAtPath(const std::string& std_path) {
+bool ShaderArchiveWriter::AddShaderAtPath(const std::string& std_path) {
   std::filesystem::path path(std_path);
 
   if (path.stem().empty()) {
@@ -68,50 +68,50 @@ bool BlobWriter::AddBlobAtPath(const std::string& std_path) {
     return false;
   }
 
-  return AddBlob(shader_type.value(), shader_name, std::move(file_mapping));
+  return AddShader(shader_type.value(), shader_name, std::move(file_mapping));
 }
 
-bool BlobWriter::AddBlob(BlobShaderType type,
-                         std::string name,
-                         std::shared_ptr<fml::Mapping> mapping) {
+bool ShaderArchiveWriter::AddShader(ArchiveShaderType type,
+                                    std::string name,
+                                    std::shared_ptr<fml::Mapping> mapping) {
   if (name.empty() || !mapping || mapping->GetMapping() == nullptr) {
     return false;
   }
 
-  blob_descriptions_.emplace_back(
-      BlobDescription{type, std::move(name), std::move(mapping)});
+  shader_descriptions_.emplace_back(
+      ShaderDescription{type, std::move(name), std::move(mapping)});
   return true;
 }
 
-constexpr fb::Stage ToStage(BlobShaderType type) {
+constexpr fb::Stage ToStage(ArchiveShaderType type) {
   switch (type) {
-    case BlobShaderType::kVertex:
+    case ArchiveShaderType::kVertex:
       return fb::Stage::kVertex;
-    case BlobShaderType::kFragment:
+    case ArchiveShaderType::kFragment:
       return fb::Stage::kFragment;
-    case BlobShaderType::kCompute:
+    case ArchiveShaderType::kCompute:
       return fb::Stage::kCompute;
   }
   FML_UNREACHABLE();
 }
 
-std::shared_ptr<fml::Mapping> BlobWriter::CreateMapping() const {
-  fb::BlobLibraryT blobs;
-  for (const auto& blob_description : blob_descriptions_) {
-    auto mapping = blob_description.mapping;
+std::shared_ptr<fml::Mapping> ShaderArchiveWriter::CreateMapping() const {
+  fb::ShaderArchiveT shader_archive;
+  for (const auto& shader_description : shader_descriptions_) {
+    auto mapping = shader_description.mapping;
     if (!mapping) {
       return nullptr;
     }
-    auto desc = std::make_unique<fb::BlobT>();
-    desc->name = blob_description.name;
-    desc->stage = ToStage(blob_description.type);
+    auto desc = std::make_unique<fb::ShaderBlobT>();
+    desc->name = shader_description.name;
+    desc->stage = ToStage(shader_description.type);
     desc->mapping = {mapping->GetMapping(),
                      mapping->GetMapping() + mapping->GetSize()};
-    blobs.items.emplace_back(std::move(desc));
+    shader_archive.items.emplace_back(std::move(desc));
   }
   auto builder = std::make_shared<flatbuffers::FlatBufferBuilder>();
-  builder->Finish(fb::BlobLibrary::Pack(*builder.get(), &blobs),
-                  fb::BlobLibraryIdentifier());
+  builder->Finish(fb::ShaderArchive::Pack(*builder.get(), &shader_archive),
+                  fb::ShaderArchiveIdentifier());
   return std::make_shared<fml::NonOwnedMapping>(builder->GetBufferPointer(),
                                                 builder->GetSize(),
                                                 [builder](auto, auto) {});
diff --git a/impeller/blobcat/blob_writer.h b/impeller/shader_archive/shader_archive_writer.h
similarity index 37%
rename from impeller/blobcat/blob_writer.h
rename to impeller/shader_archive/shader_archive_writer.h
index eb2f80c3e4a17b367d21fcd6dbf759f6faabb5eb..85f60432bbd106fcd7b01296d924a997a397b52d 100644
--- a/impeller/blobcat/blob_writer.h
+++ b/impeller/shader_archive/shader_archive_writer.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_SHADER_ARCHIVE_SHADER_ARCHIVE_WRITER_H_
+#define FLUTTER_IMPELLER_SHADER_ARCHIVE_SHADER_ARCHIVE_WRITER_H_
 
 #include <memory>
 #include <string>
@@ -10,34 +11,38 @@
 
 #include "flutter/fml/macros.h"
 #include "flutter/fml/mapping.h"
-#include "impeller/blobcat/blob_types.h"
+#include "impeller/shader_archive/shader_archive_types.h"
 
 namespace impeller {
 
-class BlobWriter {
+class ShaderArchiveWriter {
  public:
-  BlobWriter();
+  ShaderArchiveWriter();
 
-  ~BlobWriter();
+  ~ShaderArchiveWriter();
 
-  [[nodiscard]] bool AddBlobAtPath(const std::string& path);
+  [[nodiscard]] bool AddShaderAtPath(const std::string& path);
 
-  [[nodiscard]] bool AddBlob(BlobShaderType type,
-                             std::string name,
-                             std::shared_ptr<fml::Mapping> mapping);
+  [[nodiscard]] bool AddShader(ArchiveShaderType type,
+                               std::string name,
+                               std::shared_ptr<fml::Mapping> mapping);
 
   std::shared_ptr<fml::Mapping> CreateMapping() const;
 
  private:
-  struct BlobDescription {
-    BlobShaderType type;
+  struct ShaderDescription {
+    ArchiveShaderType type;
     std::string name;
     std::shared_ptr<fml::Mapping> mapping;
   };
 
-  std::vector<BlobDescription> blob_descriptions_;
+  std::vector<ShaderDescription> shader_descriptions_;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(BlobWriter);
+  ShaderArchiveWriter(const ShaderArchiveWriter&) = delete;
+
+  ShaderArchiveWriter& operator=(const ShaderArchiveWriter&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_SHADER_ARCHIVE_SHADER_ARCHIVE_WRITER_H_
diff --git a/impeller/shader_bundle/BUILD.gn b/impeller/shader_bundle/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..14b6effb23d4f5f5c666416ef8bfb1b3ea9ab2aa
--- /dev/null
+++ b/impeller/shader_bundle/BUILD.gn
@@ -0,0 +1,12 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//flutter/third_party/flatbuffers/flatbuffers.gni")
+import("../tools/impeller.gni")
+
+flatbuffers("shader_bundle_flatbuffers") {
+  flatbuffers = [ "shader_bundle.fbs" ]
+  public_configs = [ "//flutter/impeller:impeller_public_config" ]
+  public_deps = [ "//flutter/third_party/flatbuffers" ]
+}
diff --git a/impeller/shader_bundle/shader_bundle.fbs b/impeller/shader_bundle/shader_bundle.fbs
new file mode 100644
index 0000000000000000000000000000000000000000..490312223d54cf462713c7dddf184a998adf6199
--- /dev/null
+++ b/impeller/shader_bundle/shader_bundle.fbs
@@ -0,0 +1,108 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+namespace impeller.fb.shaderbundle;
+
+enum ShaderStage:byte {
+  kVertex,
+  kFragment,
+  kCompute,
+}
+
+// The subset of impeller::ShaderType that may be used for vertex attributes.
+enum InputDataType:uint32 {
+  kBoolean,
+  kSignedByte,
+  kUnsignedByte,
+  kSignedShort,
+  kUnsignedShort,
+  kSignedInt,
+  kUnsignedInt,
+  kSignedInt64,
+  kUnsignedInt64,
+  kFloat,
+  kDouble,
+}
+
+// The subset of impeller::ShaderType that may be used for uniform bindings.
+enum UniformDataType:uint32 {
+  kBoolean,
+  kSignedByte,
+  kUnsignedByte,
+  kSignedShort,
+  kUnsignedShort,
+  kSignedInt,
+  kUnsignedInt,
+  kSignedInt64,
+  kUnsignedInt64,
+  kHalfFloat,
+  kFloat,
+  kDouble,
+  kSampledImage,
+}
+
+// This contains the same attribute reflection data as
+// impeller::ShaderStageIOSlot.
+table ShaderInput {
+  name: string;
+  location: uint64;
+  set: uint64;
+  binding: uint64;
+  type: InputDataType;
+  bit_width: uint64;
+  vec_size: uint64;
+  columns: uint64;
+  offset: uint64;
+}
+
+table ShaderUniformStructField {
+  name: string;
+  type: UniformDataType;
+  offset_in_bytes: uint64;
+  element_size_in_bytes: uint64;
+  total_size_in_bytes: uint64;
+  // Zero indicates that this field is not an array element.
+  array_elements: uint64;
+}
+
+table ShaderUniformStruct {
+  name: string;
+  ext_res_0: uint64;
+  set: uint64;
+  binding: uint64;
+  size_in_bytes: uint64; // Includes all alignment padding.
+  fields: [ShaderUniformStructField];
+}
+
+table ShaderUniformTexture {
+  name: string;
+  ext_res_0: uint64;
+  set: uint64;
+  binding: uint64;
+}
+
+table BackendShader {
+  stage: ShaderStage;
+  entrypoint: string;
+  inputs: [ShaderInput];
+  uniform_structs: [ShaderUniformStruct];
+  uniform_textures: [ShaderUniformTexture];
+  shader: [ubyte];
+}
+
+table Shader {
+  name: string;
+  metal_ios: BackendShader;
+  metal_desktop: BackendShader;
+  opengl_es: BackendShader;
+  opengl_desktop: BackendShader;
+  vulkan: BackendShader;
+}
+
+table ShaderBundle {
+  shaders: [Shader];
+}
+
+root_type ShaderBundle;
+file_identifier "IPSB";
diff --git a/impeller/tessellator/BUILD.gn b/impeller/tessellator/BUILD.gn
index d3915f9996679cde0b4de1779f2e55cf6e4f0ed7..bc56fb770f0698a56a7def7d494a40b0b4f7a696 100644
--- a/impeller/tessellator/BUILD.gn
+++ b/impeller/tessellator/BUILD.gn
@@ -12,7 +12,11 @@ impeller_component("tessellator") {
 
   public_deps = [ "../geometry" ]
 
-  deps = [ "//third_party/libtess2" ]
+  deps = [
+    "../core",
+    "//flutter/fml",
+    "//third_party/libtess2",
+  ]
 }
 
 impeller_component("tessellator_shared") {
@@ -31,7 +35,9 @@ impeller_component("tessellator_shared") {
   ]
 
   deps = [
+    "../core",
     "../geometry",
+    "//flutter/fml",
     "//third_party/libtess2",
   ]
 
@@ -45,6 +51,7 @@ impeller_component("tessellator_unittests") {
   sources = [ "tessellator_unittests.cc" ]
   deps = [
     ":tessellator",
+    "../geometry:geometry_asserts",
     "//flutter/testing",
   ]
 }
diff --git a/impeller/tessellator/c/tessellator.cc b/impeller/tessellator/c/tessellator.cc
index 1bdbfde66db84c4a8ff28cc26453e20142862eda..f5300dcba1dee0ab0d8cd69ed584d1659c454629 100644
--- a/impeller/tessellator/c/tessellator.cc
+++ b/impeller/tessellator/c/tessellator.cc
@@ -41,18 +41,17 @@ struct Vertices* Tessellate(PathBuilder* builder,
                             int fill_type,
                             Scalar tolerance) {
   auto path = builder->CopyPath(static_cast<FillType>(fill_type));
-  auto polyline = path.CreatePolyline(tolerance);
   std::vector<float> points;
   if (Tessellator{}.Tessellate(
-          path.GetFillType(), polyline,
-          [&points](const float* vertices, size_t vertices_size,
-                    const uint16_t* indices, size_t indices_size) {
+          path, tolerance,
+          [&points](const float* vertices, size_t vertices_count,
+                    const uint16_t* indices, size_t indices_count) {
             // Results are expected to be re-duplicated.
             std::vector<Point> raw_points;
-            for (auto i = 0u; i < vertices_size; i += 2) {
+            for (auto i = 0u; i < vertices_count * 2; i += 2) {
               raw_points.emplace_back(Point{vertices[i], vertices[i + 1]});
             }
-            for (auto i = 0u; i < indices_size; i++) {
+            for (auto i = 0u; i < indices_count; i++) {
               auto point = raw_points[indices[i]];
               points.push_back(point.x);
               points.push_back(point.y);
diff --git a/impeller/tessellator/c/tessellator.h b/impeller/tessellator/c/tessellator.h
index 7a323b541323375a12a094c9b5c3256c623ca5f8..ef5bfc950f1077c8bdf0bc57fe064f3310e621fe 100644
--- a/impeller/tessellator/c/tessellator.h
+++ b/impeller/tessellator/c/tessellator.h
@@ -2,7 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_TESSELLATOR_C_TESSELLATOR_H_
+#define FLUTTER_IMPELLER_TESSELLATOR_C_TESSELLATOR_H_
+
+#include <cstdint>
 
 #include "impeller/geometry/path_builder.h"
 #include "impeller/tessellator/tessellator.h"
@@ -48,3 +51,5 @@ IMPELLER_API void DestroyVertices(Vertices* vertices);
 
 }  // namespace impeller
 }
+
+#endif  // FLUTTER_IMPELLER_TESSELLATOR_C_TESSELLATOR_H_
diff --git a/impeller/tessellator/dart/lib/tessellator.dart b/impeller/tessellator/dart/lib/tessellator.dart
index 1e88d49253d1f5b237cb0f13c7696f599d45233a..f899b2f630eb72fc9d08113ee6da3ab4f21b7d41 100644
--- a/impeller/tessellator/dart/lib/tessellator.dart
+++ b/impeller/tessellator/dart/lib/tessellator.dart
@@ -64,6 +64,8 @@ class SmoothingApproximation {
 /// Finally, use the [dispose] method to clean up native resources. After
 /// [dispose] has been called, this class must not be used again.
 class VerticesBuilder {
+  /// Constructs a [VerticesBuilder] instance to which path commands can be
+  /// added.
   VerticesBuilder() : _builder = _createPathFn();
 
   ffi.Pointer<_PathBuilder>? _builder;
@@ -98,7 +100,7 @@ class VerticesBuilder {
   /// Adds a close command to the start of the current contour.
   void close() {
     assert(_builder != null);
-    closeFn(_builder!, true);
+    _closeFn(_builder!, true);
   }
 
   /// Tessellates the path created by the previous method calls into a list of
@@ -145,14 +147,14 @@ final ffi.DynamicLibrary _dylib = () {
   throw UnsupportedError('Unknown platform: ${Platform.operatingSystem}');
 }();
 
-class _Vertices extends ffi.Struct {
+final class _Vertices extends ffi.Struct {
   external ffi.Pointer<ffi.Float> points;
 
   @ffi.Uint32()
   external int size;
 }
 
-class _PathBuilder extends ffi.Opaque {}
+final class _PathBuilder extends ffi.Opaque {}
 
 typedef _CreatePathBuilderType = ffi.Pointer<_PathBuilder> Function();
 typedef _create_path_builder_type = ffi.Pointer<_PathBuilder> Function();
@@ -209,7 +211,7 @@ final _CubicToType _cubicToFn =
 typedef _CloseType = void Function(ffi.Pointer<_PathBuilder>, bool);
 typedef _close_type = ffi.Void Function(ffi.Pointer<_PathBuilder>, ffi.Bool);
 
-final _CloseType closeFn =
+final _CloseType _closeFn =
     _dylib.lookupFunction<_close_type, _CloseType>('Close');
 
 typedef _TessellateType = ffi.Pointer<_Vertices> Function(
diff --git a/impeller/tessellator/dart/pubspec.yaml b/impeller/tessellator/dart/pubspec.yaml
index 4f09e8272da5cd0ea551700f56a8ab716f6e2ff4..12ec6ec21b0039006d54cc5c194c2a4efcd04889 100644
--- a/impeller/tessellator/dart/pubspec.yaml
+++ b/impeller/tessellator/dart/pubspec.yaml
@@ -8,4 +8,4 @@ publish_to: none
 homepage: https://github.com/flutter/impeller/tree/main/tessellator/dart
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=3.2.0-0 <4.0.0'
diff --git a/impeller/tessellator/tessellator.cc b/impeller/tessellator/tessellator.cc
index 4e2c3c535f41ee5eee9f6a7b8c76ac37a91afbcb..afbf01da90f839345a14d981f1bee10932aa6b49 100644
--- a/impeller/tessellator/tessellator.cc
+++ b/impeller/tessellator/tessellator.cc
@@ -21,7 +21,7 @@ static void HeapFree(void* userData, void* ptr) {
 }
 
 // Note: these units are "number of entities" for bucket size and not in KB.
-static TESSalloc alloc = {
+static const TESSalloc kAlloc = {
     HeapAlloc, HeapRealloc, HeapFree, 0, /* =userData */
     16,                                  /* =meshEdgeBucketSize */
     16,                                  /* =meshVertexBucketSize */
@@ -32,7 +32,16 @@ static TESSalloc alloc = {
 };
 
 Tessellator::Tessellator()
-    : c_tessellator_(::tessNewTess(&alloc), &DestroyTessellator) {}
+    : point_buffer_(std::make_unique<std::vector<Point>>()),
+      c_tessellator_(nullptr, &DestroyTessellator) {
+  point_buffer_->reserve(2048);
+  TESSalloc alloc = kAlloc;
+  {
+    // libTess2 copies the TESSalloc despite the non-const argument.
+    CTessellator tessellator(::tessNewTess(&alloc), &DestroyTessellator);
+    c_tessellator_ = std::move(tessellator);
+  }
+}
 
 Tessellator::~Tessellator() = default;
 
@@ -42,25 +51,27 @@ static int ToTessWindingRule(FillType fill_type) {
       return TESS_WINDING_ODD;
     case FillType::kNonZero:
       return TESS_WINDING_NONZERO;
-    case FillType::kPositive:
-      return TESS_WINDING_POSITIVE;
-    case FillType::kNegative:
-      return TESS_WINDING_NEGATIVE;
-    case FillType::kAbsGeqTwo:
-      return TESS_WINDING_ABS_GEQ_TWO;
   }
   return TESS_WINDING_ODD;
 }
 
-Tessellator::Result Tessellator::Tessellate(
-    FillType fill_type,
-    const Path::Polyline& polyline,
-    const BuilderCallback& callback) const {
+Tessellator::Result Tessellator::Tessellate(const Path& path,
+                                            Scalar tolerance,
+                                            const BuilderCallback& callback) {
   if (!callback) {
     return Result::kInputError;
   }
 
-  if (polyline.points.empty()) {
+  point_buffer_->clear();
+  auto polyline =
+      path.CreatePolyline(tolerance, std::move(point_buffer_),
+                          [this](Path::Polyline::PointBufferPtr point_buffer) {
+                            point_buffer_ = std::move(point_buffer);
+                          });
+
+  auto fill_type = path.GetFillType();
+
+  if (polyline.points->empty()) {
     return Result::kInputError;
   }
 
@@ -84,9 +95,9 @@ Tessellator::Result Tessellator::Tessellate(
 
     ::tessAddContour(tessellator,  // the C tessellator
                      kVertexSize,  //
-                     polyline.points.data() + start_point_index,  //
-                     sizeof(Point),                               //
-                     end_point_index - start_point_index          //
+                     polyline.points->data() + start_point_index,  //
+                     sizeof(Point),                                //
+                     end_point_index - start_point_index           //
     );
   }
 
@@ -105,27 +116,583 @@ Tessellator::Result Tessellator::Tessellate(
     return Result::kTessellationError;
   }
 
-  int vertexItemCount = tessGetVertexCount(tessellator) * kVertexSize;
-  auto vertices = tessGetVertices(tessellator);
-  int elementItemCount = tessGetElementCount(tessellator) * kPolygonSize;
-  auto elements = tessGetElements(tessellator);
-  // libtess uses an int index internally due to usage of -1 as a sentinel
-  // value.
-  std::vector<uint16_t> indices(elementItemCount);
-  for (int i = 0; i < elementItemCount; i++) {
-    indices[i] = static_cast<uint16_t>(elements[i]);
-  }
-  if (!callback(vertices, vertexItemCount, indices.data(), elementItemCount)) {
-    return Result::kInputError;
+  int element_item_count = tessGetElementCount(tessellator) * kPolygonSize;
+
+  // We default to using a 16bit index buffer, but in cases where we generate
+  // more tessellated data than this can contain we need to fall back to
+  // dropping the index buffer entirely. Instead code could instead switch to
+  // a uint32 index buffer, but this is done for simplicity with the other
+  // fast path above.
+  if (element_item_count < USHRT_MAX) {
+    int vertex_item_count = tessGetVertexCount(tessellator);
+    auto vertices = tessGetVertices(tessellator);
+    auto elements = tessGetElements(tessellator);
+
+    // libtess uses an int index internally due to usage of -1 as a sentinel
+    // value.
+    std::vector<uint16_t> indices(element_item_count);
+    for (int i = 0; i < element_item_count; i++) {
+      indices[i] = static_cast<uint16_t>(elements[i]);
+    }
+    if (!callback(vertices, vertex_item_count, indices.data(),
+                  element_item_count)) {
+      return Result::kInputError;
+    }
+  } else {
+    std::vector<Point> points;
+    std::vector<float> data;
+
+    int vertex_item_count = tessGetVertexCount(tessellator) * kVertexSize;
+    auto vertices = tessGetVertices(tessellator);
+    points.reserve(vertex_item_count);
+    for (int i = 0; i < vertex_item_count; i += 2) {
+      points.emplace_back(vertices[i], vertices[i + 1]);
+    }
+
+    int element_item_count = tessGetElementCount(tessellator) * kPolygonSize;
+    auto elements = tessGetElements(tessellator);
+    data.reserve(element_item_count);
+    for (int i = 0; i < element_item_count; i++) {
+      data.emplace_back(points[elements[i]].x);
+      data.emplace_back(points[elements[i]].y);
+    }
+    if (!callback(data.data(), element_item_count, nullptr, 0u)) {
+      return Result::kInputError;
+    }
   }
 
   return Result::kSuccess;
 }
 
+Path::Polyline Tessellator::CreateTempPolyline(const Path& path,
+                                               Scalar tolerance) {
+  FML_DCHECK(point_buffer_);
+  point_buffer_->clear();
+  auto polyline =
+      path.CreatePolyline(tolerance, std::move(point_buffer_),
+                          [this](Path::Polyline::PointBufferPtr point_buffer) {
+                            point_buffer_ = std::move(point_buffer);
+                          });
+  return polyline;
+}
+
+std::vector<Point> Tessellator::TessellateConvex(const Path& path,
+                                                 Scalar tolerance) {
+  FML_DCHECK(point_buffer_);
+
+  std::vector<Point> output;
+  point_buffer_->clear();
+  auto polyline =
+      path.CreatePolyline(tolerance, std::move(point_buffer_),
+                          [this](Path::Polyline::PointBufferPtr point_buffer) {
+                            point_buffer_ = std::move(point_buffer);
+                          });
+  if (polyline.points->size() == 0) {
+    return output;
+  }
+
+  output.reserve(polyline.points->size() +
+                 (4 * (polyline.contours.size() - 1)));
+  bool previous_contour_odd_points = false;
+  for (auto j = 0u; j < polyline.contours.size(); j++) {
+    auto [start, end] = polyline.GetContourPointBounds(j);
+    auto first_point = polyline.GetPoint(start);
+
+    // Some polygons will not self close and an additional triangle
+    // must be inserted, others will self close and we need to avoid
+    // inserting an extra triangle.
+    if (polyline.GetPoint(end - 1) == first_point) {
+      end--;
+    }
+
+    if (j > 0) {
+      // Triangle strip break.
+      output.emplace_back(output.back());
+      output.emplace_back(first_point);
+      output.emplace_back(first_point);
+
+      // If the contour has an odd number of points, insert an extra point when
+      // bridging to the next contour to preserve the correct triangle winding
+      // order.
+      if (previous_contour_odd_points) {
+        output.emplace_back(first_point);
+      }
+    } else {
+      output.emplace_back(first_point);
+    }
+
+    size_t a = start + 1;
+    size_t b = end - 1;
+    while (a < b) {
+      output.emplace_back(polyline.GetPoint(a));
+      output.emplace_back(polyline.GetPoint(b));
+      a++;
+      b--;
+    }
+    if (a == b) {
+      previous_contour_odd_points = false;
+      output.emplace_back(polyline.GetPoint(a));
+    } else {
+      previous_contour_odd_points = true;
+    }
+  }
+  return output;
+}
+
 void DestroyTessellator(TESStesselator* tessellator) {
   if (tessellator != nullptr) {
     ::tessDeleteTess(tessellator);
   }
 }
 
+static constexpr int kPrecomputedDivisionCount = 1024;
+static int kPrecomputedDivisions[kPrecomputedDivisionCount] = {
+    // clang-format off
+     1,  2,  3,  4,  4,  4,  5,  5,  5,  6,  6,  6,  7,  7,  7,  7,
+     8,  8,  8,  8,  8,  9,  9,  9,  9,  9,  9, 10, 10, 10, 10, 10,
+    10, 11, 11, 11, 11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 13,
+    13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+    15, 15, 15, 15, 15, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 18, 18,
+    18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19, 19, 19,
+    19, 19, 19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+    20, 20, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+    22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23,
+    23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24,
+    24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 25, 25, 25, 25, 25,
+    25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26,
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27,
+    27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28, 28, 28,
+    28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 29,
+    29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+    29, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
+    30, 30, 30, 30, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+    31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33,
+    33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+    33, 33, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+    34, 34, 34, 34, 34, 34, 34, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 36, 36,
+    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
+    36, 36, 36, 36, 36, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
+    37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 38, 38, 38, 38,
+    38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
+    38, 38, 38, 38, 38, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 40, 40,
+    40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
+    40, 40, 40, 40, 40, 40, 40, 41, 41, 41, 41, 41, 41, 41, 41, 41,
+    41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
+    41, 41, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42,
+    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 43, 43, 43, 43,
+    43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
+    43, 43, 43, 43, 43, 43, 43, 43, 44, 44, 44, 44, 44, 44, 44, 44,
+    44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+    44, 44, 44, 44, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+    45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+    45, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
+    46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 47,
+    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 48, 48, 48,
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 49, 49, 49, 49,
+    49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+    49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 50, 50, 50, 50, 50,
+    50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+    50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 51, 51, 51, 51, 51,
+    51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+    51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 52, 52, 52, 52,
+    52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
+    52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 53, 53, 53,
+    53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53,
+    53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 54,
+    54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
+    54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
+    54, 54, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
+    55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
+    55, 55, 55, 55, 55, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+    56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+    56, 56, 56, 56, 56, 56, 56, 56, 56, 57, 57, 57, 57, 57, 57, 57,
+    // clang-format on
+};
+
+static size_t ComputeQuadrantDivisions(Scalar pixel_radius) {
+  if (pixel_radius <= 0.0) {
+    return 1;
+  }
+  int radius_index = ceil(pixel_radius);
+  if (radius_index < kPrecomputedDivisionCount) {
+    return kPrecomputedDivisions[radius_index];
+  }
+
+  // For a circle with N divisions per quadrant, the maximum deviation of
+  // the polgyon approximation from the true circle will be at the center
+  // of the base of each triangular pie slice. We can compute that distance
+  // by finding the midpoint of the line of the first slice and compare
+  // its distance from the center of the circle to the radius. We will aim
+  // to have the length of that bisector to be within |kCircleTolerance|
+  // from the radius in pixels.
+  //
+  // Each vertex will appear at an angle of:
+  //   theta(i) = (kPi / 2) * (i / N)  // for i in [0..N]
+  // with each point falling at:
+  //   point(i) = r * (cos(theta), sin(theta))
+  // If we consider the unit circle to simplify the calculations below then
+  // we need to scale the tolerance from its absolute quantity into a unit
+  // circle fraction:
+  //   k = tolerance / radius
+  // Using this scaled tolerance below to avoid multiplying by the radius
+  // throughout all of the math, we have:
+  //   first point = (1, 0)   // theta(0) == 0
+  //   theta = kPi / 2 / N    // theta(1)
+  //   second point = (cos(theta), sin(theta)) = (c, s)
+  //   midpoint = (first + second) * 0.5 = ((1 + c)/2, s/2)
+  //   |midpoint| = sqrt((1 + c)*(1 + c)/4 + s*s/4)
+  //     = sqrt((1 + c + c + c*c + s*s) / 4)
+  //     = sqrt((1 + 2c + 1) / 4)
+  //     = sqrt((2 + 2c) / 4)
+  //     = sqrt((1 + c) / 2)
+  //     = cos(theta / 2)     // using half-angle cosine formula
+  //   error = 1 - |midpoint| = 1 - cos(theta / 2)
+  //   cos(theta/2) = 1 - error
+  //   theta/2 = acos(1 - error)
+  //   kPi / 2 / N / 2 = acos(1 - error)
+  //   kPi / 4 / acos(1 - error) = N
+  // Since we need error <= k, we want divisions >= N, so we use:
+  //   N = ceil(kPi / 4 / acos(1 - k))
+  //
+  // Math is confirmed in https://math.stackexchange.com/a/4132095
+  // (keeping in mind that we are computing quarter circle divisions here)
+  // which also points out a performance optimization that is accurate
+  // to within an over-estimation of 1 division would be:
+  //   N = ceil(kPi / 4 / sqrt(2 * k))
+  // Since we have precomputed the divisions for radii up to 1024, we can
+  // afford to be more accurate using the acos formula here for larger radii.
+  double k = Tessellator::kCircleTolerance / pixel_radius;
+  return ceil(kPiOver4 / std::acos(1 - k));
+}
+
+void Tessellator::Trigs::init(size_t divisions) {
+  if (!trigs_.empty()) {
+    return;
+  }
+
+  // Either not cached yet, or we are using the temp storage...
+  trigs_.reserve(divisions + 1);
+
+  double angle_scale = kPiOver2 / divisions;
+
+  trigs_.emplace_back(1.0, 0.0);
+  for (size_t i = 1; i < divisions; i++) {
+    trigs_.emplace_back(Radians(i * angle_scale));
+  }
+  trigs_.emplace_back(0.0, 1.0);
+}
+
+Tessellator::Trigs Tessellator::GetTrigsForDivisions(size_t divisions) {
+  return divisions < Tessellator::kCachedTrigCount
+             ? Trigs(precomputed_trigs_[divisions], divisions)
+             : Trigs(divisions);
+}
+
+using TessellatedVertexProc = Tessellator::TessellatedVertexProc;
+using EllipticalVertexGenerator = Tessellator::EllipticalVertexGenerator;
+
+EllipticalVertexGenerator::EllipticalVertexGenerator(
+    EllipticalVertexGenerator::GeneratorProc& generator,
+    Trigs&& trigs,
+    PrimitiveType triangle_type,
+    size_t vertices_per_trig,
+    Data&& data)
+    : impl_(generator),
+      trigs_(std::move(trigs)),
+      data_(data),
+      vertices_per_trig_(vertices_per_trig) {}
+
+EllipticalVertexGenerator Tessellator::FilledCircle(
+    const Matrix& view_transform,
+    const Point& center,
+    Scalar radius) {
+  auto divisions =
+      ComputeQuadrantDivisions(view_transform.GetMaxBasisLength() * radius);
+  return EllipticalVertexGenerator(Tessellator::GenerateFilledCircle,
+                                   GetTrigsForDivisions(divisions),
+                                   PrimitiveType::kTriangleStrip, 4,
+                                   {
+                                       .reference_centers = {center, center},
+                                       .radii = {radius, radius},
+                                       .half_width = -1.0f,
+                                   });
+}
+
+EllipticalVertexGenerator Tessellator::StrokedCircle(
+    const Matrix& view_transform,
+    const Point& center,
+    Scalar radius,
+    Scalar half_width) {
+  if (half_width > 0) {
+    auto divisions = ComputeQuadrantDivisions(
+        view_transform.GetMaxBasisLength() * radius + half_width);
+    return EllipticalVertexGenerator(Tessellator::GenerateStrokedCircle,
+                                     GetTrigsForDivisions(divisions),
+                                     PrimitiveType::kTriangleStrip, 8,
+                                     {
+                                         .reference_centers = {center, center},
+                                         .radii = {radius, radius},
+                                         .half_width = half_width,
+                                     });
+  } else {
+    return FilledCircle(view_transform, center, radius);
+  }
+}
+
+EllipticalVertexGenerator Tessellator::RoundCapLine(
+    const Matrix& view_transform,
+    const Point& p0,
+    const Point& p1,
+    Scalar radius) {
+  auto along = p1 - p0;
+  auto length = along.GetLength();
+  if (length > kEhCloseEnough) {
+    auto divisions =
+        ComputeQuadrantDivisions(view_transform.GetMaxBasisLength() * radius);
+    return EllipticalVertexGenerator(Tessellator::GenerateRoundCapLine,
+                                     GetTrigsForDivisions(divisions),
+                                     PrimitiveType::kTriangleStrip, 4,
+                                     {
+                                         .reference_centers = {p0, p1},
+                                         .radii = {radius, radius},
+                                         .half_width = -1.0f,
+                                     });
+  } else {
+    return FilledCircle(view_transform, p0, radius);
+  }
+}
+
+EllipticalVertexGenerator Tessellator::FilledEllipse(
+    const Matrix& view_transform,
+    const Rect& bounds) {
+  if (bounds.IsSquare()) {
+    return FilledCircle(view_transform, bounds.GetCenter(),
+                        bounds.GetWidth() * 0.5f);
+  }
+  auto max_radius = bounds.GetSize().MaxDimension();
+  auto divisions =
+      ComputeQuadrantDivisions(view_transform.GetMaxBasisLength() * max_radius);
+  auto center = bounds.GetCenter();
+  return EllipticalVertexGenerator(Tessellator::GenerateFilledEllipse,
+                                   GetTrigsForDivisions(divisions),
+                                   PrimitiveType::kTriangleStrip, 4,
+                                   {
+                                       .reference_centers = {center, center},
+                                       .radii = bounds.GetSize() * 0.5f,
+                                       .half_width = -1.0f,
+                                   });
+}
+
+EllipticalVertexGenerator Tessellator::FilledRoundRect(
+    const Matrix& view_transform,
+    const Rect& bounds,
+    const Size& radii) {
+  if (radii.width * 2 < bounds.GetWidth() ||
+      radii.height * 2 < bounds.GetHeight()) {
+    auto max_radius = radii.MaxDimension();
+    auto divisions = ComputeQuadrantDivisions(
+        view_transform.GetMaxBasisLength() * max_radius);
+    auto upper_left = bounds.GetLeftTop() + radii;
+    auto lower_right = bounds.GetRightBottom() - radii;
+    return EllipticalVertexGenerator(Tessellator::GenerateFilledRoundRect,
+                                     GetTrigsForDivisions(divisions),
+                                     PrimitiveType::kTriangleStrip, 4,
+                                     {
+                                         .reference_centers =
+                                             {
+                                                 upper_left,
+                                                 lower_right,
+                                             },
+                                         .radii = radii,
+                                         .half_width = -1.0f,
+                                     });
+  } else {
+    return FilledEllipse(view_transform, bounds);
+  }
+}
+
+void Tessellator::GenerateFilledCircle(
+    const Trigs& trigs,
+    const EllipticalVertexGenerator::Data& data,
+    const TessellatedVertexProc& proc) {
+  auto center = data.reference_centers[0];
+  auto radius = data.radii.width;
+
+  FML_DCHECK(center == data.reference_centers[1]);
+  FML_DCHECK(radius == data.radii.height);
+  FML_DCHECK(data.half_width < 0);
+
+  // Quadrant 1 connecting with Quadrant 4:
+  for (auto& trig : trigs) {
+    auto offset = trig * radius;
+    proc({center.x - offset.x, center.y + offset.y});
+    proc({center.x - offset.x, center.y - offset.y});
+  }
+
+  // The second half of the circle should be iterated in reverse, but
+  // we can instead iterate forward and swap the x/y values of the
+  // offset as the angles should be symmetric and thus should generate
+  // symmetrically reversed trig vectors.
+  // Quadrant 2 connecting with Quadrant 2:
+  for (auto& trig : trigs) {
+    auto offset = trig * radius;
+    proc({center.x + offset.y, center.y + offset.x});
+    proc({center.x + offset.y, center.y - offset.x});
+  }
+}
+
+void Tessellator::GenerateStrokedCircle(
+    const Trigs& trigs,
+    const EllipticalVertexGenerator::Data& data,
+    const TessellatedVertexProc& proc) {
+  auto center = data.reference_centers[0];
+
+  FML_DCHECK(center == data.reference_centers[1]);
+  FML_DCHECK(data.radii.IsSquare());
+  FML_DCHECK(data.half_width > 0 && data.half_width < data.radii.width);
+
+  auto outer_radius = data.radii.width + data.half_width;
+  auto inner_radius = data.radii.width - data.half_width;
+
+  // Zig-zag back and forth between points on the outer circle and the
+  // inner circle. Both circles are evaluated at the same number of
+  // quadrant divisions so the points for a given division should match
+  // 1 for 1 other than their applied radius.
+
+  // Quadrant 1:
+  for (auto& trig : trigs) {
+    auto outer = trig * outer_radius;
+    auto inner = trig * inner_radius;
+    proc({center.x - outer.x, center.y - outer.y});
+    proc({center.x - inner.x, center.y - inner.y});
+  }
+
+  // The even quadrants of the circle should be iterated in reverse, but
+  // we can instead iterate forward and swap the x/y values of the
+  // offset as the angles should be symmetric and thus should generate
+  // symmetrically reversed trig vectors.
+  // Quadrant 2:
+  for (auto& trig : trigs) {
+    auto outer = trig * outer_radius;
+    auto inner = trig * inner_radius;
+    proc({center.x + outer.y, center.y - outer.x});
+    proc({center.x + inner.y, center.y - inner.x});
+  }
+
+  // Quadrant 3:
+  for (auto& trig : trigs) {
+    auto outer = trig * outer_radius;
+    auto inner = trig * inner_radius;
+    proc({center.x + outer.x, center.y + outer.y});
+    proc({center.x + inner.x, center.y + inner.y});
+  }
+
+  // Quadrant 4:
+  for (auto& trig : trigs) {
+    auto outer = trig * outer_radius;
+    auto inner = trig * inner_radius;
+    proc({center.x - outer.y, center.y + outer.x});
+    proc({center.x - inner.y, center.y + inner.x});
+  }
+}
+
+void Tessellator::GenerateRoundCapLine(
+    const Trigs& trigs,
+    const EllipticalVertexGenerator::Data& data,
+    const TessellatedVertexProc& proc) {
+  auto p0 = data.reference_centers[0];
+  auto p1 = data.reference_centers[1];
+  auto radius = data.radii.width;
+
+  FML_DCHECK(radius == data.radii.height);
+  FML_DCHECK(data.half_width < 0);
+
+  auto along = p1 - p0;
+  along *= radius / along.GetLength();
+  auto across = Point(-along.y, along.x);
+
+  for (auto& trig : trigs) {
+    auto relative_along = along * trig.cos;
+    auto relative_across = across * trig.sin;
+    proc(p0 - relative_along + relative_across);
+    proc(p0 - relative_along - relative_across);
+  }
+
+  // The second half of the round caps should be iterated in reverse, but
+  // we can instead iterate forward and swap the sin/cos values as they
+  // should be symmetric.
+  for (auto& trig : trigs) {
+    auto relative_along = along * trig.sin;
+    auto relative_across = across * trig.cos;
+    proc(p1 + relative_along + relative_across);
+    proc(p1 + relative_along - relative_across);
+  }
+}
+
+void Tessellator::GenerateFilledEllipse(
+    const Trigs& trigs,
+    const EllipticalVertexGenerator::Data& data,
+    const TessellatedVertexProc& proc) {
+  auto center = data.reference_centers[0];
+  auto radii = data.radii;
+
+  FML_DCHECK(center == data.reference_centers[1]);
+  FML_DCHECK(data.half_width < 0);
+
+  // Quadrant 1 connecting with Quadrant 4:
+  for (auto& trig : trigs) {
+    auto offset = trig * radii;
+    proc({center.x - offset.x, center.y + offset.y});
+    proc({center.x - offset.x, center.y - offset.y});
+  }
+
+  // The second half of the circle should be iterated in reverse, but
+  // we can instead iterate forward and swap the x/y values of the
+  // offset as the angles should be symmetric and thus should generate
+  // symmetrically reversed trig vectors.
+  // Quadrant 2 connecting with Quadrant 2:
+  for (auto& trig : trigs) {
+    auto offset = Point(trig.sin * radii.width, trig.cos * radii.height);
+    proc({center.x + offset.x, center.y + offset.y});
+    proc({center.x + offset.x, center.y - offset.y});
+  }
+}
+
+void Tessellator::GenerateFilledRoundRect(
+    const Trigs& trigs,
+    const EllipticalVertexGenerator::Data& data,
+    const TessellatedVertexProc& proc) {
+  Scalar left = data.reference_centers[0].x;
+  Scalar top = data.reference_centers[0].y;
+  Scalar right = data.reference_centers[1].x;
+  Scalar bottom = data.reference_centers[1].y;
+  auto radii = data.radii;
+
+  FML_DCHECK(data.half_width < 0);
+
+  // Quadrant 1 connecting with Quadrant 4:
+  for (auto& trig : trigs) {
+    auto offset = trig * radii;
+    proc({left - offset.x, bottom + offset.y});
+    proc({left - offset.x, top - offset.y});
+  }
+
+  // The second half of the round rect should be iterated in reverse, but
+  // we can instead iterate forward and swap the x/y values of the
+  // offset as the angles should be symmetric and thus should generate
+  // symmetrically reversed trig vectors.
+  // Quadrant 2 connecting with Quadrant 2:
+  for (auto& trig : trigs) {
+    auto offset = Point(trig.sin * radii.width, trig.cos * radii.height);
+    proc({right + offset.x, bottom + offset.y});
+    proc({right + offset.x, top - offset.y});
+  }
+}
+
 }  // namespace impeller
diff --git a/impeller/tessellator/tessellator.h b/impeller/tessellator/tessellator.h
index 3a5ae97bb659ba6cf84af2626f3b965234b7e20f..6251e814aa764f8a14de09e4ae78041060052c28 100644
--- a/impeller/tessellator/tessellator.h
+++ b/impeller/tessellator/tessellator.h
@@ -2,14 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_TESSELLATOR_TESSELLATOR_H_
+#define FLUTTER_IMPELLER_TESSELLATOR_TESSELLATOR_H_
 
 #include <functional>
+#include <memory>
 #include <vector>
 
-#include "flutter/fml/macros.h"
+#include "impeller/core/formats.h"
 #include "impeller/geometry/path.h"
 #include "impeller/geometry/point.h"
+#include "impeller/geometry/trig.h"
 
 struct TESStesselator;
 
@@ -20,18 +23,51 @@ void DestroyTessellator(TESStesselator* tessellator);
 using CTessellator =
     std::unique_ptr<TESStesselator, decltype(&DestroyTessellator)>;
 
-enum class WindingOrder {
-  kClockwise,
-  kCounterClockwise,
-};
-
 //------------------------------------------------------------------------------
 /// @brief      A utility that generates triangles of the specified fill type
 ///             given a polyline. This happens on the CPU.
 ///
-/// @bug        This should just be called a triangulator.
+///             This object is not thread safe, and its methods must not be
+///             called from multiple threads.
 ///
 class Tessellator {
+ private:
+  /// Essentially just a vector of Trig objects, but supports storing a
+  /// reference to either a cached vector or a locally generated vector.
+  /// The constructor will fill the vector with quarter circular samples
+  /// for the indicated number of equal divisions if the vector is new.
+  class Trigs {
+   public:
+    explicit Trigs(std::vector<Trig>& trigs, size_t divisions) : trigs_(trigs) {
+      init(divisions);
+      FML_DCHECK(trigs_.size() == divisions + 1);
+    }
+
+    explicit Trigs(size_t divisions)
+        : local_storage_(std::make_unique<std::vector<Trig>>()),
+          trigs_(*local_storage_) {
+      init(divisions);
+      FML_DCHECK(trigs_.size() == divisions + 1);
+    }
+
+    // Utility forwards of the indicated vector methods.
+    auto inline size() const { return trigs_.size(); }
+    auto inline begin() const { return trigs_.begin(); }
+    auto inline end() const { return trigs_.end(); }
+
+   private:
+    // nullptr if a cached vector is used, otherwise the actual storage
+    std::unique_ptr<std::vector<Trig>> local_storage_;
+
+    // Whether or not a cached vector or the local storage is used, this
+    // this reference will always be valid
+    std::vector<Trig>& trigs_;
+
+    // Fill the vector with the indicated number of equal divisions of
+    // trigonometric values if it is empty.
+    void init(size_t divisions);
+  };
+
  public:
   enum class Result {
     kSuccess,
@@ -39,33 +75,266 @@ class Tessellator {
     kTessellationError,
   };
 
+  /// @brief  A callback function for a |VertexGenerator| to deliver
+  ///         the vertices it computes as |Point| objects.
+  using TessellatedVertexProc = std::function<void(const Point& p)>;
+
+  /// @brief  An object which produces a list of vertices as |Point|s that
+  ///         tessellate a previously provided shape and delivers the vertices
+  ///         through a |TessellatedVertexProc| callback.
+  ///
+  ///         The object can also provide advance information on how many
+  ///         vertices it will generate.
+  ///
+  /// @see |Tessellator::FilledCircle|
+  /// @see |Tessellator::StrokedCircle|
+  /// @see |Tessellator::RoundCapLine|
+  /// @see |Tessellator::FilledEllipse|
+  class VertexGenerator {
+   public:
+    /// @brief  Returns the |PrimitiveType| that describes the relationship
+    ///         among the list of vertices produced by the |GenerateVertices|
+    ///         method.
+    ///
+    ///         Most generators will deliver |kTriangleStrip| triangles
+    virtual PrimitiveType GetTriangleType() const = 0;
+
+    /// @brief  Returns the number of vertices that the generator plans to
+    ///         produce, if known.
+    ///
+    ///         This value is advisory only and can be used to reserve space
+    ///         where the vertices will be placed, but the count may be an
+    ///         estimate.
+    ///
+    ///         Implementations are encouraged to avoid overestimating
+    ///         the count by too large a number and to provide a best
+    ///         guess so as to minimize potential buffer reallocations
+    ///         as the vertices are delivered.
+    virtual size_t GetVertexCount() const = 0;
+
+    /// @brief  Generate the vertices and deliver them in the necessary
+    ///         order (as required by the PrimitiveType) to the given
+    ///         callback function.
+    virtual void GenerateVertices(const TessellatedVertexProc& proc) const = 0;
+  };
+
+  /// @brief  The |VertexGenerator| implementation common to all shapes
+  ///         that are based on a polygonal representation of an ellipse.
+  class EllipticalVertexGenerator : public virtual VertexGenerator {
+   public:
+    /// |VertexGenerator|
+    PrimitiveType GetTriangleType() const override {
+      return PrimitiveType::kTriangleStrip;
+    }
+
+    /// |VertexGenerator|
+    size_t GetVertexCount() const override {
+      return trigs_.size() * vertices_per_trig_;
+    }
+
+    /// |VertexGenerator|
+    void GenerateVertices(const TessellatedVertexProc& proc) const override {
+      impl_(trigs_, data_, proc);
+    }
+
+   private:
+    friend class Tessellator;
+
+    struct Data {
+      // Circles and Ellipses only use one of these points.
+      // RoundCapLines use both as the endpoints of the unexpanded line.
+      // A round rect can specify its interior rectangle by using the
+      // 2 points as opposing corners.
+      const Point reference_centers[2];
+      // Circular shapes have the same value in radii.width and radii.height
+      const Size radii;
+      // half_width is only used in cases where the generator will be
+      // generating 2 different outlines, such as StrokedCircle
+      const Scalar half_width;
+    };
+
+    typedef void GeneratorProc(const Trigs& trigs,
+                               const Data& data,
+                               const TessellatedVertexProc& proc);
+
+    GeneratorProc& impl_;
+    const Trigs trigs_;
+    const Data data_;
+    const size_t vertices_per_trig_;
+
+    EllipticalVertexGenerator(GeneratorProc& generator,
+                              Trigs&& trigs,
+                              PrimitiveType triangle_type,
+                              size_t vertices_per_trig,
+                              Data&& data);
+  };
+
   Tessellator();
 
   ~Tessellator();
 
+  /// @brief A callback that returns the results of the tessellation.
+  ///
+  ///        The index buffer may not be populated, in which case [indices] will
+  ///        be nullptr and indices_count will be 0.
   using BuilderCallback = std::function<bool(const float* vertices,
-                                             size_t vertices_size,
+                                             size_t vertices_count,
                                              const uint16_t* indices,
-                                             size_t indices_size)>;
+                                             size_t indices_count)>;
 
   //----------------------------------------------------------------------------
-  /// @brief      Generates filled triangles from the polyline. A callback is
+  /// @brief      Generates filled triangles from the path. A callback is
   ///             invoked once for the entire tessellation.
   ///
-  /// @param[in]  fill_type The fill rule to use when filling.
-  /// @param[in]  polyline  The polyline
+  /// @param[in]  path  The path to tessellate.
+  /// @param[in]  tolerance  The tolerance value for conversion of the path to
+  ///                        a polyline. This value is often derived from the
+  ///                        Matrix::GetMaxBasisLength of the CTM applied to the
+  ///                        path for rendering.
   /// @param[in]  callback  The callback, return false to indicate failure.
   ///
   /// @return The result status of the tessellation.
   ///
-  Tessellator::Result Tessellate(FillType fill_type,
-                                 const Path::Polyline& polyline,
-                                 const BuilderCallback& callback) const;
+  Tessellator::Result Tessellate(const Path& path,
+                                 Scalar tolerance,
+                                 const BuilderCallback& callback);
+
+  //----------------------------------------------------------------------------
+  /// @brief      Given a convex path, create a triangle fan structure.
+  ///
+  /// @param[in]  path  The path to tessellate.
+  /// @param[in]  tolerance  The tolerance value for conversion of the path to
+  ///                        a polyline. This value is often derived from the
+  ///                        Matrix::GetMaxBasisLength of the CTM applied to the
+  ///                        path for rendering.
+  ///
+  /// @return A point vector containing the vertices in triangle strip format.
+  ///
+  std::vector<Point> TessellateConvex(const Path& path, Scalar tolerance);
+
+  //----------------------------------------------------------------------------
+  /// @brief      Create a temporary polyline. Only one per-process can exist at
+  ///             a time.
+  ///
+  ///             The tessellator itself is not a thread safe class and should
+  ///             only be used from the raster thread.
+  Path::Polyline CreateTempPolyline(const Path& path, Scalar tolerance);
+
+  /// @brief   The pixel tolerance used by the algorighm to determine how
+  ///          many divisions to create for a circle.
+  ///
+  ///          No point on the polygon of vertices should deviate from the
+  ///          true circle by more than this tolerance.
+  static constexpr Scalar kCircleTolerance = 0.1f;
+
+  /// @brief   Create a |VertexGenerator| that can produce vertices for
+  ///          a filled circle of the given radius around the given center
+  ///          with enough polygon sub-divisions to provide reasonable
+  ///          fidelity when viewed under the given view transform.
+  ///
+  ///          Note that the view transform is only used to choose the
+  ///          number of sample points to use per quarter circle and the
+  ///          returned points are not transformed by it, instead they are
+  ///          relative to the coordinate space of the center point.
+  EllipticalVertexGenerator FilledCircle(const Matrix& view_transform,
+                                         const Point& center,
+                                         Scalar radius);
+
+  /// @brief   Create a |VertexGenerator| that can produce vertices for
+  ///          a stroked circle of the given radius and half_width around
+  ///          the given shared center with enough polygon sub-divisions
+  ///          to provide reasonable fidelity when viewed under the given
+  ///          view transform. The outer edge of the stroked circle is
+  ///          generated at (radius + half_width) and the inner edge is
+  ///          generated at (radius - half_width).
+  ///
+  ///          Note that the view transform is only used to choose the
+  ///          number of sample points to use per quarter circle and the
+  ///          returned points are not transformed by it, instead they are
+  ///          relative to the coordinate space of the center point.
+  EllipticalVertexGenerator StrokedCircle(const Matrix& view_transform,
+                                          const Point& center,
+                                          Scalar radius,
+                                          Scalar half_width);
+
+  /// @brief   Create a |VertexGenerator| that can produce vertices for
+  ///          a line with round end caps of the given radius with enough
+  ///          polygon sub-divisions to provide reasonable fidelity when
+  ///          viewed under the given view transform.
+  ///
+  ///          Note that the view transform is only used to choose the
+  ///          number of sample points to use per quarter circle and the
+  ///          returned points are not transformed by it, instead they are
+  ///          relative to the coordinate space of the two points.
+  EllipticalVertexGenerator RoundCapLine(const Matrix& view_transform,
+                                         const Point& p0,
+                                         const Point& p1,
+                                         Scalar radius);
+
+  /// @brief   Create a |VertexGenerator| that can produce vertices for
+  ///          a filled ellipse inscribed within the given bounds with
+  ///          enough polygon sub-divisions to provide reasonable
+  ///          fidelity when viewed under the given view transform.
+  ///
+  ///          Note that the view transform is only used to choose the
+  ///          number of sample points to use per quarter circle and the
+  ///          returned points are not transformed by it, instead they are
+  ///          relative to the coordinate space of the bounds.
+  EllipticalVertexGenerator FilledEllipse(const Matrix& view_transform,
+                                          const Rect& bounds);
+
+  /// @brief   Create a |VertexGenerator| that can produce vertices for
+  ///          a filled round rect within the given bounds and corner radii
+  ///          with enough polygon sub-divisions to provide reasonable
+  ///          fidelity when viewed under the given view transform.
+  ///
+  ///          Note that the view transform is only used to choose the
+  ///          number of sample points to use per quarter circle and the
+  ///          returned points are not transformed by it, instead they are
+  ///          relative to the coordinate space of the bounds.
+  EllipticalVertexGenerator FilledRoundRect(const Matrix& view_transform,
+                                            const Rect& bounds,
+                                            const Size& radii);
 
  private:
+  /// Used for polyline generation.
+  std::unique_ptr<std::vector<Point>> point_buffer_;
   CTessellator c_tessellator_;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(Tessellator);
+  // Data for variouos Circle/EllipseGenerator classes, cached per
+  // Tessellator instance which is usually the foreground life of an app
+  // if not longer.
+  static constexpr size_t kCachedTrigCount = 300;
+  std::vector<Trig> precomputed_trigs_[kCachedTrigCount];
+
+  Trigs GetTrigsForDivisions(size_t divisions);
+
+  static void GenerateFilledCircle(const Trigs& trigs,
+                                   const EllipticalVertexGenerator::Data& data,
+                                   const TessellatedVertexProc& proc);
+
+  static void GenerateStrokedCircle(const Trigs& trigs,
+                                    const EllipticalVertexGenerator::Data& data,
+                                    const TessellatedVertexProc& proc);
+
+  static void GenerateRoundCapLine(const Trigs& trigs,
+                                   const EllipticalVertexGenerator::Data& data,
+                                   const TessellatedVertexProc& proc);
+
+  static void GenerateFilledEllipse(const Trigs& trigs,
+                                    const EllipticalVertexGenerator::Data& data,
+                                    const TessellatedVertexProc& proc);
+
+  static void GenerateFilledRoundRect(
+      const Trigs& trigs,
+      const EllipticalVertexGenerator::Data& data,
+      const TessellatedVertexProc& proc);
+
+  Tessellator(const Tessellator&) = delete;
+
+  Tessellator& operator=(const Tessellator&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_TESSELLATOR_TESSELLATOR_H_
diff --git a/impeller/tessellator/tessellator_unittests.cc b/impeller/tessellator/tessellator_unittests.cc
index 56c24785408197415665b191d815864eb7254270..fcc2849571571f5ce36617930c4b529f33717acb 100644
--- a/impeller/tessellator/tessellator_unittests.cc
+++ b/impeller/tessellator/tessellator_unittests.cc
@@ -4,6 +4,9 @@
 
 #include "flutter/testing/testing.h"
 #include "gtest/gtest.h"
+
+#include "impeller/geometry/geometry_asserts.h"
+#include "impeller/geometry/path.h"
 #include "impeller/geometry/path_builder.h"
 #include "impeller/tessellator/tessellator.h"
 
@@ -14,39 +17,36 @@ TEST(TessellatorTest, TessellatorBuilderReturnsCorrectResultStatus) {
   // Zero points.
   {
     Tessellator t;
-    auto polyline = PathBuilder{}.TakePath().CreatePolyline();
+    auto path = PathBuilder{}.TakePath(FillType::kOdd);
     Tessellator::Result result = t.Tessellate(
-        FillType::kPositive, polyline,
-        [](const float* vertices, size_t vertices_size, const uint16_t* indices,
-           size_t indices_size) { return true; });
+        path, 1.0f,
+        [](const float* vertices, size_t vertices_count,
+           const uint16_t* indices, size_t indices_count) { return true; });
 
-    ASSERT_EQ(polyline.points.size(), 0u);
     ASSERT_EQ(result, Tessellator::Result::kInputError);
   }
 
   // One point.
   {
     Tessellator t;
-    auto polyline = PathBuilder{}.LineTo({0, 0}).TakePath().CreatePolyline();
+    auto path = PathBuilder{}.LineTo({0, 0}).TakePath(FillType::kOdd);
     Tessellator::Result result = t.Tessellate(
-        FillType::kPositive, polyline,
-        [](const float* vertices, size_t vertices_size, const uint16_t* indices,
-           size_t indices_size) { return true; });
-    ASSERT_EQ(polyline.points.size(), 1u);
+        path, 1.0f,
+        [](const float* vertices, size_t vertices_count,
+           const uint16_t* indices, size_t indices_count) { return true; });
+
     ASSERT_EQ(result, Tessellator::Result::kSuccess);
   }
 
   // Two points.
   {
     Tessellator t;
-    auto polyline =
-        PathBuilder{}.AddLine({0, 0}, {0, 1}).TakePath().CreatePolyline();
+    auto path = PathBuilder{}.AddLine({0, 0}, {0, 1}).TakePath(FillType::kOdd);
     Tessellator::Result result = t.Tessellate(
-        FillType::kPositive, polyline,
-        [](const float* vertices, size_t vertices_size, const uint16_t* indices,
-           size_t indices_size) { return true; });
+        path, 1.0f,
+        [](const float* vertices, size_t vertices_count,
+           const uint16_t* indices, size_t indices_count) { return true; });
 
-    ASSERT_EQ(polyline.points.size(), 2u);
     ASSERT_EQ(result, Tessellator::Result::kSuccess);
   }
 
@@ -58,30 +58,453 @@ TEST(TessellatorTest, TessellatorBuilderReturnsCorrectResultStatus) {
       auto coord = i * 1.0f;
       builder.AddLine({coord, coord}, {coord + 1, coord + 1});
     }
-    auto polyline = builder.TakePath().CreatePolyline();
+    auto path = builder.TakePath(FillType::kOdd);
     Tessellator::Result result = t.Tessellate(
-        FillType::kPositive, polyline,
-        [](const float* vertices, size_t vertices_size, const uint16_t* indices,
-           size_t indices_size) { return true; });
+        path, 1.0f,
+        [](const float* vertices, size_t vertices_count,
+           const uint16_t* indices, size_t indices_count) { return true; });
 
-    ASSERT_EQ(polyline.points.size(), 2000u);
     ASSERT_EQ(result, Tessellator::Result::kSuccess);
   }
 
   // Closure fails.
   {
     Tessellator t;
-    auto polyline =
-        PathBuilder{}.AddLine({0, 0}, {0, 1}).TakePath().CreatePolyline();
+    auto path = PathBuilder{}.AddLine({0, 0}, {0, 1}).TakePath(FillType::kOdd);
     Tessellator::Result result = t.Tessellate(
-        FillType::kPositive, polyline,
-        [](const float* vertices, size_t vertices_size, const uint16_t* indices,
-           size_t indices_size) { return false; });
+        path, 1.0f,
+        [](const float* vertices, size_t vertices_count,
+           const uint16_t* indices, size_t indices_count) { return false; });
 
-    ASSERT_EQ(polyline.points.size(), 2u);
     ASSERT_EQ(result, Tessellator::Result::kInputError);
   }
+
+  // More than uint16 points, odd fill mode.
+  {
+    Tessellator t;
+    PathBuilder builder = {};
+    for (auto i = 0; i < 1000; i++) {
+      builder.AddCircle(Point(i, i), 4);
+    }
+    auto path = builder.TakePath(FillType::kOdd);
+    bool no_indices = false;
+    size_t count = 0u;
+    Tessellator::Result result = t.Tessellate(
+        path, 1.0f,
+        [&no_indices, &count](const float* vertices, size_t vertices_count,
+                              const uint16_t* indices, size_t indices_count) {
+          no_indices = indices == nullptr;
+          count = vertices_count;
+          return true;
+        });
+
+    ASSERT_TRUE(no_indices);
+    ASSERT_TRUE(count >= USHRT_MAX);
+    ASSERT_EQ(result, Tessellator::Result::kSuccess);
+  }
+}
+
+TEST(TessellatorTest, TessellateConvex) {
+  {
+    Tessellator t;
+    // Sanity check simple rectangle.
+    auto pts = t.TessellateConvex(
+        PathBuilder{}.AddRect(Rect::MakeLTRB(0, 0, 10, 10)).TakePath(), 1.0);
+
+    std::vector<Point> expected = {{0, 0}, {10, 0}, {0, 10}, {10, 10}};
+    EXPECT_EQ(pts, expected);
+  }
+
+  {
+    Tessellator t;
+    auto pts = t.TessellateConvex(PathBuilder{}
+                                      .AddRect(Rect::MakeLTRB(0, 0, 10, 10))
+                                      .AddRect(Rect::MakeLTRB(20, 20, 30, 30))
+                                      .TakePath(),
+                                  1.0);
+
+    std::vector<Point> expected = {{0, 0},   {10, 0},  {0, 10},  {10, 10},
+                                   {10, 10}, {20, 20}, {20, 20}, {30, 20},
+                                   {20, 30}, {30, 30}};
+    EXPECT_EQ(pts, expected);
+  }
+}
+
+TEST(TessellatorTest, CircleVertexCounts) {
+  auto tessellator = std::make_shared<Tessellator>();
+
+  auto test = [&tessellator](const Matrix& transform, Scalar radius) {
+    auto generator = tessellator->FilledCircle(transform, {}, radius);
+    size_t quadrant_divisions = generator.GetVertexCount() / 4;
+
+    // Confirm the approximation error is within the currently accepted
+    // |kCircleTolerance| value advertised by |CircleTessellator|.
+    // (With an additional 1% tolerance for floating point rounding.)
+    double angle = kPiOver2 / quadrant_divisions;
+    Point first = {radius, 0};
+    Point next = {static_cast<Scalar>(cos(angle) * radius),
+                  static_cast<Scalar>(sin(angle) * radius)};
+    Point midpoint = (first + next) * 0.5;
+    EXPECT_GE(midpoint.GetLength(),
+              radius - Tessellator::kCircleTolerance * 1.01)
+        << ", transform = " << transform << ", radius = " << radius
+        << ", divisions = " << quadrant_divisions;
+  };
+
+  test({}, 0.0);
+  test({}, 0.9);
+  test({}, 1.0);
+  test({}, 1.9);
+  test(Matrix::MakeScale(Vector2(2.0, 2.0)), 0.95);
+  test({}, 2.0);
+  test(Matrix::MakeScale(Vector2(2.0, 2.0)), 1.0);
+  test({}, 11.9);
+  test({}, 12.0);
+  test({}, 35.9);
+  for (int i = 36; i < 10000; i += 4) {
+    test({}, i);
+  }
+}
+
+TEST(TessellatorTest, FilledCircleTessellationVertices) {
+  auto tessellator = std::make_shared<Tessellator>();
+
+  auto test = [&tessellator](const Matrix& transform, const Point& center,
+                             Scalar radius) {
+    auto generator = tessellator->FilledCircle(transform, center, radius);
+    EXPECT_EQ(generator.GetTriangleType(), PrimitiveType::kTriangleStrip);
+
+    auto vertex_count = generator.GetVertexCount();
+    auto vertices = std::vector<Point>();
+    generator.GenerateVertices([&vertices](const Point& p) {  //
+      vertices.push_back(p);
+    });
+    EXPECT_EQ(vertices.size(), vertex_count);
+    ASSERT_EQ(vertex_count % 4, 0u);
+
+    auto quadrant_count = vertex_count / 4;
+    for (size_t i = 0; i < quadrant_count; i++) {
+      double angle = kPiOver2 * i / (quadrant_count - 1);
+      double degrees = angle * 180.0 / kPi;
+      double rsin = sin(angle) * radius;
+      double rcos = cos(angle) * radius;
+      EXPECT_POINT_NEAR(vertices[i * 2],
+                        Point(center.x - rcos, center.y + rsin))
+          << "vertex " << i << ", angle = " << degrees << std::endl;
+      EXPECT_POINT_NEAR(vertices[i * 2 + 1],
+                        Point(center.x - rcos, center.y - rsin))
+          << "vertex " << i << ", angle = " << degrees << std::endl;
+      EXPECT_POINT_NEAR(vertices[vertex_count - i * 2 - 1],
+                        Point(center.x + rcos, center.y - rsin))
+          << "vertex " << i << ", angle = " << degrees << std::endl;
+      EXPECT_POINT_NEAR(vertices[vertex_count - i * 2 - 2],
+                        Point(center.x + rcos, center.y + rsin))
+          << "vertex " << i << ", angle = " << degrees << std::endl;
+    }
+  };
+
+  test({}, {}, 2.0);
+  test({}, {10, 10}, 2.0);
+  test(Matrix::MakeScale({500.0, 500.0, 0.0}), {}, 2.0);
+  test(Matrix::MakeScale({0.002, 0.002, 0.0}), {}, 1000.0);
+}
+
+TEST(TessellatorTest, StrokedCircleTessellationVertices) {
+  auto tessellator = std::make_shared<Tessellator>();
+
+  auto test = [&tessellator](const Matrix& transform, const Point& center,
+                             Scalar radius, Scalar half_width) {
+    ASSERT_GT(radius, half_width);
+    auto generator =
+        tessellator->StrokedCircle(transform, center, radius, half_width);
+    EXPECT_EQ(generator.GetTriangleType(), PrimitiveType::kTriangleStrip);
+
+    auto vertex_count = generator.GetVertexCount();
+    auto vertices = std::vector<Point>();
+    generator.GenerateVertices([&vertices](const Point& p) {  //
+      vertices.push_back(p);
+    });
+    EXPECT_EQ(vertices.size(), vertex_count);
+    ASSERT_EQ(vertex_count % 4, 0u);
+
+    auto quadrant_count = vertex_count / 8;
+
+    // Test outer points first
+    for (size_t i = 0; i < quadrant_count; i++) {
+      double angle = kPiOver2 * i / (quadrant_count - 1);
+      double degrees = angle * 180.0 / kPi;
+      double rsin = sin(angle) * (radius + half_width);
+      double rcos = cos(angle) * (radius + half_width);
+      EXPECT_POINT_NEAR(vertices[i * 2],
+                        Point(center.x - rcos, center.y - rsin))
+          << "vertex " << i << ", angle = " << degrees << std::endl;
+      EXPECT_POINT_NEAR(vertices[quadrant_count * 2 + i * 2],
+                        Point(center.x + rsin, center.y - rcos))
+          << "vertex " << i << ", angle = " << degrees << std::endl;
+      EXPECT_POINT_NEAR(vertices[quadrant_count * 4 + i * 2],
+                        Point(center.x + rcos, center.y + rsin))
+          << "vertex " << i << ", angle = " << degrees << std::endl;
+      EXPECT_POINT_NEAR(vertices[quadrant_count * 6 + i * 2],
+                        Point(center.x - rsin, center.y + rcos))
+          << "vertex " << i << ", angle = " << degrees << std::endl;
+    }
+
+    // Then test innerer points
+    for (size_t i = 0; i < quadrant_count; i++) {
+      double angle = kPiOver2 * i / (quadrant_count - 1);
+      double degrees = angle * 180.0 / kPi;
+      double rsin = sin(angle) * (radius - half_width);
+      double rcos = cos(angle) * (radius - half_width);
+      EXPECT_POINT_NEAR(vertices[i * 2 + 1],
+                        Point(center.x - rcos, center.y - rsin))
+          << "vertex " << i << ", angle = " << degrees << std::endl;
+      EXPECT_POINT_NEAR(vertices[quadrant_count * 2 + i * 2 + 1],
+                        Point(center.x + rsin, center.y - rcos))
+          << "vertex " << i << ", angle = " << degrees << std::endl;
+      EXPECT_POINT_NEAR(vertices[quadrant_count * 4 + i * 2 + 1],
+                        Point(center.x + rcos, center.y + rsin))
+          << "vertex " << i << ", angle = " << degrees << std::endl;
+      EXPECT_POINT_NEAR(vertices[quadrant_count * 6 + i * 2 + 1],
+                        Point(center.x - rsin, center.y + rcos))
+          << "vertex " << i << ", angle = " << degrees << std::endl;
+    }
+  };
+
+  test({}, {}, 2.0, 1.0);
+  test({}, {}, 2.0, 0.5);
+  test({}, {10, 10}, 2.0, 1.0);
+  test(Matrix::MakeScale({500.0, 500.0, 0.0}), {}, 2.0, 1.0);
+  test(Matrix::MakeScale({0.002, 0.002, 0.0}), {}, 1000.0, 10.0);
+}
+
+TEST(TessellatorTest, RoundCapLineTessellationVertices) {
+  auto tessellator = std::make_shared<Tessellator>();
+
+  auto test = [&tessellator](const Matrix& transform, const Point& p0,
+                             const Point& p1, Scalar radius) {
+    auto generator = tessellator->RoundCapLine(transform, p0, p1, radius);
+    EXPECT_EQ(generator.GetTriangleType(), PrimitiveType::kTriangleStrip);
+
+    auto vertex_count = generator.GetVertexCount();
+    auto vertices = std::vector<Point>();
+    generator.GenerateVertices([&vertices](const Point& p) {  //
+      vertices.push_back(p);
+    });
+    EXPECT_EQ(vertices.size(), vertex_count);
+    ASSERT_EQ(vertex_count % 4, 0u);
+
+    Point along = p1 - p0;
+    Scalar length = along.GetLength();
+    if (length > 0) {
+      along *= radius / length;
+    } else {
+      along = {radius, 0};
+    }
+    Point across = {-along.y, along.x};
+
+    auto quadrant_count = vertex_count / 4;
+    for (size_t i = 0; i < quadrant_count; i++) {
+      double angle = kPiOver2 * i / (quadrant_count - 1);
+      double degrees = angle * 180.0 / kPi;
+      Point relative_along = along * cos(angle);
+      Point relative_across = across * sin(angle);
+      EXPECT_POINT_NEAR(vertices[i * 2],  //
+                        p0 - relative_along + relative_across)
+          << "vertex " << i << ", angle = " << degrees << ", "  //
+          << "line = " << p0 << " => " << p1 << ", "            //
+          << "radius = " << radius << std::endl;
+      EXPECT_POINT_NEAR(vertices[i * 2 + 1],  //
+                        p0 - relative_along - relative_across)
+          << "vertex " << i << ", angle = " << degrees << ", "  //
+          << "line = " << p0 << " => " << p1 << ", "            //
+          << "radius = " << radius << std::endl;
+      EXPECT_POINT_NEAR(vertices[vertex_count - i * 2 - 1],  //
+                        p1 + relative_along - relative_across)
+          << "vertex " << i << ", angle = " << degrees << ", "  //
+          << "line = " << p0 << " => " << p1 << ", "            //
+          << "radius = " << radius << std::endl;
+      EXPECT_POINT_NEAR(vertices[vertex_count - i * 2 - 2],  //
+                        p1 + relative_along + relative_across)
+          << "vertex " << i << ", angle = " << degrees << ", "  //
+          << "line = " << p0 << " => " << p1 << ", "            //
+          << "radius = " << radius << std::endl;
+    }
+  };
+
+  // Empty line should actually use the circle generator, but its
+  // results should match the same math as the round cap generator.
+  test({}, {0, 0}, {0, 0}, 10);
+
+  test({}, {0, 0}, {10, 0}, 2);
+  test({}, {10, 0}, {0, 0}, 2);
+  test({}, {0, 0}, {10, 10}, 2);
+
+  test(Matrix::MakeScale({500.0, 500.0, 0.0}), {0, 0}, {10, 0}, 2);
+  test(Matrix::MakeScale({500.0, 500.0, 0.0}), {10, 0}, {0, 0}, 2);
+  test(Matrix::MakeScale({500.0, 500.0, 0.0}), {0, 0}, {10, 10}, 2);
+
+  test(Matrix::MakeScale({0.002, 0.002, 0.0}), {0, 0}, {10, 0}, 2);
+  test(Matrix::MakeScale({0.002, 0.002, 0.0}), {10, 0}, {0, 0}, 2);
+  test(Matrix::MakeScale({0.002, 0.002, 0.0}), {0, 0}, {10, 10}, 2);
+}
+
+TEST(TessellatorTest, FilledEllipseTessellationVertices) {
+  auto tessellator = std::make_shared<Tessellator>();
+
+  auto test = [&tessellator](const Matrix& transform, const Rect& bounds) {
+    auto center = bounds.GetCenter();
+    auto half_size = bounds.GetSize() * 0.5f;
+
+    auto generator = tessellator->FilledEllipse(transform, bounds);
+    EXPECT_EQ(generator.GetTriangleType(), PrimitiveType::kTriangleStrip);
+
+    auto vertex_count = generator.GetVertexCount();
+    auto vertices = std::vector<Point>();
+    generator.GenerateVertices([&vertices](const Point& p) {  //
+      vertices.push_back(p);
+    });
+    EXPECT_EQ(vertices.size(), vertex_count);
+    ASSERT_EQ(vertex_count % 4, 0u);
+
+    auto quadrant_count = vertex_count / 4;
+    for (size_t i = 0; i < quadrant_count; i++) {
+      double angle = kPiOver2 * i / (quadrant_count - 1);
+      double degrees = angle * 180.0 / kPi;
+      double rcos = cos(angle) * half_size.width;
+      double rsin = sin(angle) * half_size.height;
+      EXPECT_POINT_NEAR(vertices[i * 2],
+                        Point(center.x - rcos, center.y + rsin))
+          << "vertex " << i << ", angle = " << degrees << ", "  //
+          << "bounds = " << bounds << std::endl;
+      EXPECT_POINT_NEAR(vertices[i * 2 + 1],
+                        Point(center.x - rcos, center.y - rsin))
+          << "vertex " << i << ", angle = " << degrees << ", "  //
+          << "bounds = " << bounds << std::endl;
+      EXPECT_POINT_NEAR(vertices[vertex_count - i * 2 - 1],
+                        Point(center.x + rcos, center.y - rsin))
+          << "vertex " << i << ", angle = " << degrees << ", "  //
+          << "bounds = " << bounds << std::endl;
+      EXPECT_POINT_NEAR(vertices[vertex_count - i * 2 - 2],
+                        Point(center.x + rcos, center.y + rsin))
+          << "vertex " << i << ", angle = " << degrees << ", "  //
+          << "bounds = " << bounds << std::endl;
+    }
+  };
+
+  // Square bounds should actually use the circle generator, but its
+  // results should match the same math as the ellipse generator.
+  test({}, Rect::MakeXYWH(0, 0, 2, 2));
+
+  test({}, Rect::MakeXYWH(0, 0, 2, 3));
+  test({}, Rect::MakeXYWH(0, 0, 3, 2));
+  test({}, Rect::MakeXYWH(5, 10, 2, 3));
+  test({}, Rect::MakeXYWH(16, 7, 3, 2));
+  test(Matrix::MakeScale({500.0, 500.0, 0.0}), Rect::MakeXYWH(5, 10, 3, 2));
+  test(Matrix::MakeScale({500.0, 500.0, 0.0}), Rect::MakeXYWH(5, 10, 2, 3));
+  test(Matrix::MakeScale({0.002, 0.002, 0.0}),
+       Rect::MakeXYWH(5000, 10000, 3000, 2000));
+  test(Matrix::MakeScale({0.002, 0.002, 0.0}),
+       Rect::MakeXYWH(5000, 10000, 2000, 3000));
+}
+
+TEST(TessellatorTest, FilledRoundRectTessellationVertices) {
+  auto tessellator = std::make_shared<Tessellator>();
+
+  auto test = [&tessellator](const Matrix& transform, const Rect& bounds,
+                             const Size& radii) {
+    FML_DCHECK(radii.width * 2 <= bounds.GetWidth()) << radii << bounds;
+    FML_DCHECK(radii.height * 2 <= bounds.GetHeight()) << radii << bounds;
+
+    Scalar middle_left = bounds.GetX() + radii.width;
+    Scalar middle_top = bounds.GetY() + radii.height;
+    Scalar middle_right = bounds.GetX() + bounds.GetWidth() - radii.width;
+    Scalar middle_bottom = bounds.GetY() + bounds.GetHeight() - radii.height;
+
+    auto generator = tessellator->FilledRoundRect(transform, bounds, radii);
+    EXPECT_EQ(generator.GetTriangleType(), PrimitiveType::kTriangleStrip);
+
+    auto vertex_count = generator.GetVertexCount();
+    auto vertices = std::vector<Point>();
+    generator.GenerateVertices([&vertices](const Point& p) {  //
+      vertices.push_back(p);
+    });
+    EXPECT_EQ(vertices.size(), vertex_count);
+    ASSERT_EQ(vertex_count % 4, 0u);
+
+    auto quadrant_count = vertex_count / 4;
+    for (size_t i = 0; i < quadrant_count; i++) {
+      double angle = kPiOver2 * i / (quadrant_count - 1);
+      double degrees = angle * 180.0 / kPi;
+      double rcos = cos(angle) * radii.width;
+      double rsin = sin(angle) * radii.height;
+      EXPECT_POINT_NEAR(vertices[i * 2],
+                        Point(middle_left - rcos, middle_bottom + rsin))
+          << "vertex " << i << ", angle = " << degrees << ", "  //
+          << "bounds = " << bounds << std::endl;
+      EXPECT_POINT_NEAR(vertices[i * 2 + 1],
+                        Point(middle_left - rcos, middle_top - rsin))
+          << "vertex " << i << ", angle = " << degrees << ", "  //
+          << "bounds = " << bounds << std::endl;
+      EXPECT_POINT_NEAR(vertices[vertex_count - i * 2 - 1],
+                        Point(middle_right + rcos, middle_top - rsin))
+          << "vertex " << i << ", angle = " << degrees << ", "  //
+          << "bounds = " << bounds << std::endl;
+      EXPECT_POINT_NEAR(vertices[vertex_count - i * 2 - 2],
+                        Point(middle_right + rcos, middle_bottom + rsin))
+          << "vertex " << i << ", angle = " << degrees << ", "  //
+          << "bounds = " << bounds << std::endl;
+    }
+  };
+
+  // Both radii spanning the bounds should actually use the circle/ellipse
+  // generator, but their results should match the same math as the round
+  // rect generator.
+  test({}, Rect::MakeXYWH(0, 0, 20, 20), {10, 10});
+
+  // One radius spanning the bounds, but not the other will not match the
+  // round rect math if the generator transfers to circle/ellipse
+  test({}, Rect::MakeXYWH(0, 0, 20, 20), {10, 5});
+  test({}, Rect::MakeXYWH(0, 0, 20, 20), {5, 10});
+
+  test({}, Rect::MakeXYWH(0, 0, 20, 30), {2, 2});
+  test({}, Rect::MakeXYWH(0, 0, 30, 20), {2, 2});
+  test({}, Rect::MakeXYWH(5, 10, 20, 30), {2, 3});
+  test({}, Rect::MakeXYWH(16, 7, 30, 20), {2, 3});
+  test(Matrix::MakeScale({500.0, 500.0, 0.0}), Rect::MakeXYWH(5, 10, 30, 20),
+       {2, 3});
+  test(Matrix::MakeScale({500.0, 500.0, 0.0}), Rect::MakeXYWH(5, 10, 20, 30),
+       {2, 3});
+  test(Matrix::MakeScale({0.002, 0.002, 0.0}),
+       Rect::MakeXYWH(5000, 10000, 3000, 2000), {50, 70});
+  test(Matrix::MakeScale({0.002, 0.002, 0.0}),
+       Rect::MakeXYWH(5000, 10000, 2000, 3000), {50, 70});
+}
+
+TEST(TessellatorTest, EarlyReturnEmptyConvexShape) {
+  // This path is not technically empty (it has a size in one dimension),
+  // but is otherwise completely flat.
+  auto tessellator = std::make_shared<Tessellator>();
+  PathBuilder builder;
+  builder.MoveTo({0, 0});
+  builder.MoveTo({10, 10}, /*relative=*/true);
+
+  auto points = tessellator->TessellateConvex(builder.TakePath(), 3.0);
+
+  EXPECT_TRUE(points.empty());
+}
+
+#if !NDEBUG
+TEST(TessellatorTest, ChecksConcurrentPolylineUsage) {
+  auto tessellator = std::make_shared<Tessellator>();
+  PathBuilder builder;
+  builder.AddLine({0, 0}, {100, 100});
+  auto path = builder.TakePath();
+
+  auto polyline = tessellator->CreateTempPolyline(path, 0.1);
+  EXPECT_DEBUG_DEATH(tessellator->CreateTempPolyline(path, 0.1),
+                     "point_buffer_");
 }
+#endif  // NDEBUG
 
 }  // namespace testing
 }  // namespace impeller
diff --git a/impeller/toolkit/android/BUILD.gn b/impeller/toolkit/android/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..758a5a9e9911fd377a06d0f3f668bff124e5b406
--- /dev/null
+++ b/impeller/toolkit/android/BUILD.gn
@@ -0,0 +1,76 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//flutter/testing/android/native_activity/native_activity.gni")
+import("../../tools/impeller.gni")
+
+config("public_android_config") {
+  defines = [ "__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__" ]
+}
+
+impeller_component("android") {
+  sources = [
+    "choreographer.cc",
+    "choreographer.h",
+    "hardware_buffer.cc",
+    "hardware_buffer.h",
+    "native_window.cc",
+    "native_window.h",
+    "proc_table.cc",
+    "proc_table.h",
+    "surface_control.cc",
+    "surface_control.h",
+    "surface_transaction.cc",
+    "surface_transaction.h",
+  ]
+
+  public_deps = [
+    "../../base",
+    "../../geometry",
+    "//flutter/fml",
+  ]
+
+  public_configs = [ ":public_android_config" ]
+}
+
+test_fixtures("unittests_fixtures") {
+  fixtures = []
+}
+
+source_set("unittests_lib") {
+  visibility = [ ":*" ]
+
+  testonly = true
+
+  sources = [ "toolkit_android_unittests.cc" ]
+
+  deps = [
+    ":android",
+    ":unittests_fixtures",
+    "//flutter/testing",
+  ]
+
+  defines = [ "TESTING" ]
+}
+
+executable("unittests") {
+  assert(is_android)
+
+  testonly = true
+
+  output_name = "impeller_toolkit_android_unittests"
+
+  deps = [ ":unittests_lib" ]
+}
+
+native_activity_apk("apk_unittests") {
+  apk_name = "impeller_toolkit_android_unittests"
+
+  testonly = true
+
+  deps = [
+    ":unittests_lib",
+    "//flutter/testing/android/native_activity:gtest_activity",
+  ]
+}
diff --git a/impeller/toolkit/android/README.md b/impeller/toolkit/android/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..b52d8f6ea8f7f02bb153d50cbf9af1af4697c453
--- /dev/null
+++ b/impeller/toolkit/android/README.md
@@ -0,0 +1,7 @@
+Android Toolkit
+===============
+
+Type-safe managed wrappers around Android objects vended by the NDK. Does not
+require linking to libandroid.so. The symbols are resolved via dynamic runtime
+lookup so that the toolkit can be built with an older NDK but still run on
+modern Android versions and use the latest features.
diff --git a/impeller/toolkit/android/choreographer.cc b/impeller/toolkit/android/choreographer.cc
new file mode 100644
index 0000000000000000000000000000000000000000..89a852ae8ff339c053a07e216003b0c634d9d1a3
--- /dev/null
+++ b/impeller/toolkit/android/choreographer.cc
@@ -0,0 +1,84 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/impeller/toolkit/android/choreographer.h"
+
+#include "flutter/fml/message_loop.h"
+
+namespace impeller::android {
+
+Choreographer& Choreographer::GetInstance() {
+  static thread_local Choreographer tChoreographer;
+  return tChoreographer;
+}
+
+Choreographer::Choreographer() {
+  if (!IsAvailableOnPlatform()) {
+    return;
+  }
+
+  // We need a message loop on the current thread for the choreographer to
+  // schedule callbacks for us on.
+  fml::MessageLoop::EnsureInitializedForCurrentThread();
+  instance_ = GetProcTable().AChoreographer_getInstance();
+}
+
+Choreographer::~Choreographer() = default;
+
+bool Choreographer::IsValid() const {
+  return !!instance_;
+}
+
+static Choreographer::FrameTimePoint ClockMonotonicNanosToFrameTimePoint(
+    int64_t p_nanos) {
+  return Choreographer::FrameTimePoint{std::chrono::nanoseconds(p_nanos)};
+}
+
+bool Choreographer::PostFrameCallback(FrameCallback callback) const {
+  if (!callback || !IsValid()) {
+    return false;
+  }
+
+  struct InFlightData {
+    FrameCallback callback;
+  };
+
+  auto data = std::make_unique<InFlightData>();
+  data->callback = std::move(callback);
+
+  const auto& table = GetProcTable();
+  if (table.AChoreographer_postFrameCallback64) {
+    table.AChoreographer_postFrameCallback64(
+        const_cast<AChoreographer*>(instance_),
+        [](int64_t nanos, void* p_data) {
+          auto data = reinterpret_cast<InFlightData*>(p_data);
+          data->callback(ClockMonotonicNanosToFrameTimePoint(nanos));
+          delete data;
+        },
+        data.release());
+    return true;
+  } else if (table.AChoreographer_postFrameCallback) {
+    table.AChoreographer_postFrameCallback(
+        const_cast<AChoreographer*>(instance_),
+        [](long /*NOLINT*/ nanos, void* p_data) {
+          auto data = reinterpret_cast<InFlightData*>(p_data);
+          data->callback(ClockMonotonicNanosToFrameTimePoint(nanos));
+          delete data;
+        },
+        data.release());
+    return true;
+  }
+
+  // The validity check should have tripped by now.
+  FML_UNREACHABLE();
+  return false;
+}
+
+bool Choreographer::IsAvailableOnPlatform() {
+  return GetProcTable().AChoreographer_getInstance &&
+         (GetProcTable().AChoreographer_postFrameCallback64 ||
+          GetProcTable().AChoreographer_postFrameCallback);
+}
+
+}  // namespace impeller::android
diff --git a/impeller/toolkit/android/choreographer.h b/impeller/toolkit/android/choreographer.h
new file mode 100644
index 0000000000000000000000000000000000000000..a4b781df8535f6943f644796cfd3bb38941c0997
--- /dev/null
+++ b/impeller/toolkit/android/choreographer.h
@@ -0,0 +1,84 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_TOOLKIT_ANDROID_CHOREOGRAPHER_H_
+#define FLUTTER_IMPELLER_TOOLKIT_ANDROID_CHOREOGRAPHER_H_
+
+#include "impeller/toolkit/android/proc_table.h"
+
+#include <chrono>
+#include <memory>
+
+namespace impeller::android {
+
+//------------------------------------------------------------------------------
+/// @brief      This class describes access to the choreographer instance for
+///             the current thread. Choreographers are only available on API
+///             levels above 24. On levels below 24, an invalid choreographer
+///             will be returned.
+///
+///             Since choreographer need an event loop on the current thread,
+///             one will be setup if it doesn't already exist.
+///
+class Choreographer {
+ public:
+  static bool IsAvailableOnPlatform();
+
+  //----------------------------------------------------------------------------
+  /// @brief      Create or get the thread local instance of a choreographer. A
+  ///             message loop will be setup on the calling thread if none
+  ///             exists.
+  ///
+  /// @warning    Choreographers are only available on API levels 24 and above.
+  ///             Below this level, this will return an invalid instance.
+  ///             Availability can also be checked via the
+  ///             `IsAvailableOnPlatform` call.
+  ///
+  /// @return     The thread local choreographer instance. If none can be setup,
+  ///             an invalid object reference will be returned. See `IsValid`.
+  ///
+  static Choreographer& GetInstance();
+
+  ~Choreographer();
+
+  Choreographer(const Choreographer&) = delete;
+
+  Choreographer& operator=(const Choreographer&) = delete;
+
+  bool IsValid() const;
+
+  //----------------------------------------------------------------------------
+  /// A monotonic system clock.
+  ///
+  using FrameClock = std::chrono::steady_clock;
+
+  //----------------------------------------------------------------------------
+  /// A timepoint on a monotonic system clock.
+  ///
+  using FrameTimePoint = std::chrono::time_point<FrameClock>;
+  using FrameCallback = std::function<void(FrameTimePoint)>;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Posts a frame callback. The time that the frame is being
+  ///             rendered will be available in the callback as an argument.
+  ///             Multiple frame callbacks within the same frame interval will
+  ///             receive the same argument.
+  ///
+  /// @param[in]  callback  The callback
+  ///
+  /// @return     `true` if the frame callback could be posted. This may return
+  ///             `false` if choreographers are not available on the platform.
+  ///             See `IsAvailableOnPlatform`.
+  ///
+  bool PostFrameCallback(FrameCallback callback) const;
+
+ private:
+  AChoreographer* instance_ = nullptr;
+
+  explicit Choreographer();
+};
+
+}  // namespace impeller::android
+
+#endif  // FLUTTER_IMPELLER_TOOLKIT_ANDROID_CHOREOGRAPHER_H_
diff --git a/impeller/toolkit/android/hardware_buffer.cc b/impeller/toolkit/android/hardware_buffer.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a9ec935e95900c639fd96861dc293c54b7e96a49
--- /dev/null
+++ b/impeller/toolkit/android/hardware_buffer.cc
@@ -0,0 +1,130 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/toolkit/android/hardware_buffer.h"
+
+#include "impeller/base/validation.h"
+
+namespace impeller::android {
+
+static AHardwareBuffer_Format ToAHardwareBufferFormat(
+    HardwareBufferFormat format) {
+  switch (format) {
+    case HardwareBufferFormat::kR8G8B8A8UNormInt:
+      return AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM;
+  }
+  FML_UNREACHABLE();
+}
+
+static AHardwareBuffer_Desc ToAHardwareBufferDesc(
+    const HardwareBufferDescriptor& desc) {
+  AHardwareBuffer_Desc ahb_desc = {};
+  ahb_desc.width = desc.size.width;
+  ahb_desc.height = desc.size.height;
+  ahb_desc.format = ToAHardwareBufferFormat(desc.format);
+  ahb_desc.layers = 1u;
+  if (desc.usage & static_cast<HardwareBufferUsage>(
+                       HardwareBufferUsageFlags::kFrameBufferAttachment)) {
+    ahb_desc.usage |= AHARDWAREBUFFER_USAGE_GPU_FRAMEBUFFER;
+  }
+  if (desc.usage & static_cast<HardwareBufferUsage>(
+                       HardwareBufferUsageFlags::kCompositorOverlay)) {
+    ahb_desc.usage |= AHARDWAREBUFFER_USAGE_COMPOSER_OVERLAY;
+  }
+  if (desc.usage & static_cast<HardwareBufferUsage>(
+                       HardwareBufferUsageFlags::kSampledImage)) {
+    ahb_desc.usage |= AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE;
+  }
+  return ahb_desc;
+}
+
+bool HardwareBufferDescriptor::IsAllocatable() const {
+  const auto desc = ToAHardwareBufferDesc(*this);
+  return GetProcTable().AHardwareBuffer_isSupported(&desc) != 0u;
+}
+
+HardwareBuffer::HardwareBuffer(HardwareBufferDescriptor descriptor)
+    : descriptor_(descriptor),
+      android_descriptor_(ToAHardwareBufferDesc(descriptor_)) {
+  if (!descriptor_.IsAllocatable()) {
+    VALIDATION_LOG << "The hardware buffer descriptor is not allocatable.";
+    return;
+  }
+  const auto& proc_table = GetProcTable();
+
+  AHardwareBuffer* buffer = nullptr;
+  if (auto result =
+          proc_table.AHardwareBuffer_allocate(&android_descriptor_, &buffer);
+      result != 0 || buffer == nullptr) {
+    VALIDATION_LOG << "Could not allocate hardware buffer. Error: " << result;
+    return;
+  }
+  buffer_.reset(buffer);
+  is_valid_ = true;
+}
+
+HardwareBuffer::~HardwareBuffer() = default;
+
+bool HardwareBuffer::IsValid() const {
+  return is_valid_;
+}
+
+AHardwareBuffer* HardwareBuffer::GetHandle() const {
+  return buffer_.get();
+}
+
+HardwareBufferDescriptor HardwareBufferDescriptor::MakeForSwapchainImage(
+    const ISize& size) {
+  HardwareBufferDescriptor desc;
+  desc.format = HardwareBufferFormat::kR8G8B8A8UNormInt;
+  // Zero sized hardware buffers cannot be allocated.
+  desc.size = size.Max(ISize{1u, 1u});
+  desc.usage =
+      static_cast<HardwareBufferUsage>(
+          HardwareBufferUsageFlags::kFrameBufferAttachment) |
+      static_cast<HardwareBufferUsage>(
+          HardwareBufferUsageFlags::kCompositorOverlay) |
+      static_cast<HardwareBufferUsage>(HardwareBufferUsageFlags::kSampledImage);
+  return desc;
+}
+
+const HardwareBufferDescriptor& HardwareBuffer::GetDescriptor() const {
+  return descriptor_;
+}
+
+const AHardwareBuffer_Desc& HardwareBuffer::GetAndroidDescriptor() const {
+  return android_descriptor_;
+}
+
+bool HardwareBuffer::IsAvailableOnPlatform() {
+  return GetProcTable().IsValid() && GetProcTable().AHardwareBuffer_isSupported;
+}
+
+std::optional<uint64_t> HardwareBuffer::GetSystemUniqueID() const {
+  return GetSystemUniqueID(GetHandle());
+}
+
+std::optional<uint64_t> HardwareBuffer::GetSystemUniqueID(
+    AHardwareBuffer* buffer) {
+  if (!GetProcTable().AHardwareBuffer_getId) {
+    return std::nullopt;
+  }
+  uint64_t out_id = 0u;
+  if (GetProcTable().AHardwareBuffer_getId(buffer, &out_id) != 0) {
+    return std::nullopt;
+  }
+  return out_id;
+}
+
+std::optional<AHardwareBuffer_Desc> HardwareBuffer::Describe(
+    AHardwareBuffer* buffer) {
+  if (!buffer || !GetProcTable().AHardwareBuffer_describe) {
+    return std::nullopt;
+  }
+  AHardwareBuffer_Desc desc = {};
+  GetProcTable().AHardwareBuffer_describe(buffer, &desc);
+  return desc;
+}
+
+}  // namespace impeller::android
diff --git a/impeller/toolkit/android/hardware_buffer.h b/impeller/toolkit/android/hardware_buffer.h
new file mode 100644
index 0000000000000000000000000000000000000000..02b99b10136740f264b374bf3d263da2627ce2dc
--- /dev/null
+++ b/impeller/toolkit/android/hardware_buffer.h
@@ -0,0 +1,149 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_TOOLKIT_ANDROID_HARDWARE_BUFFER_H_
+#define FLUTTER_IMPELLER_TOOLKIT_ANDROID_HARDWARE_BUFFER_H_
+
+#include <optional>
+
+#include "flutter/fml/unique_object.h"
+#include "impeller/geometry/size.h"
+#include "impeller/toolkit/android/proc_table.h"
+
+namespace impeller::android {
+
+enum class HardwareBufferFormat {
+  //----------------------------------------------------------------------------
+  /// This format is guaranteed to be supported on all versions of Android. This
+  /// format can also be converted to an Impeller and Vulkan format.
+  ///
+  /// @see        Vulkan Format: VK_FORMAT_R8G8B8A8_UNORM
+  /// @see        OpenGL ES Format: GL_RGBA8
+  ///
+  /// Why have many format when one format do trick?
+  ///
+  kR8G8B8A8UNormInt,
+};
+
+using HardwareBufferUsage = uint8_t;
+
+enum class HardwareBufferUsageFlags : HardwareBufferUsage {
+  kFrameBufferAttachment = 1u << 0u,
+  kCompositorOverlay = 1u << 1u,
+  kSampledImage = 1u << 2u,
+};
+
+//------------------------------------------------------------------------------
+/// @brief      A descriptor use to specify hardware buffer allocations.
+///
+struct HardwareBufferDescriptor {
+  HardwareBufferFormat format = HardwareBufferFormat::kR8G8B8A8UNormInt;
+  ISize size;
+  HardwareBufferUsage usage = 0u;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Create a descriptor of the given size that is suitable for use
+  ///             as a swapchain image.
+  ///
+  /// @warning    Descriptors of zero size are not allocatable. The next best
+  ///             valid size is picked. So make sure to check the actual size of
+  ///             the descriptor after this call is made to determine the size
+  ///             of the allocated hardware buffer.
+  ///
+  /// @param[in]  size  The size. See the restrictions about valid sizes above.
+  ///
+  /// @return     The hardware buffer descriptor.
+  ///
+  static HardwareBufferDescriptor MakeForSwapchainImage(const ISize& size);
+
+  //----------------------------------------------------------------------------
+  /// @brief      If hardware buffers can be created using this descriptor.
+  ///             Allocatable descriptors may still cause failing allocations in
+  ///             case of resource exhaustion.
+  ///
+  /// @return     `true` if allocatable (unless resource exhaustion).
+  ///
+  bool IsAllocatable() const;
+
+  constexpr bool operator==(const HardwareBufferDescriptor& o) const {
+    return format == o.format && size == o.size && usage == o.usage;
+  }
+
+  constexpr bool operator!=(const HardwareBufferDescriptor& o) const {
+    return !(*this == o);
+  }
+};
+
+//------------------------------------------------------------------------------
+/// @brief      A wrapper for AHardwareBuffer
+///             https://developer.android.com/ndk/reference/group/a-hardware-buffer
+///
+///             This wrapper creates and owns a handle to a managed hardware
+///             buffer. That is, there is no ability to take a reference to an
+///             externally created hardware buffer.
+///
+///             This wrapper is only available on Android API 29 and above.
+///
+class HardwareBuffer {
+ public:
+  static bool IsAvailableOnPlatform();
+
+  explicit HardwareBuffer(HardwareBufferDescriptor descriptor);
+
+  ~HardwareBuffer();
+
+  HardwareBuffer(const HardwareBuffer&) = delete;
+
+  HardwareBuffer& operator=(const HardwareBuffer&) = delete;
+
+  bool IsValid() const;
+
+  AHardwareBuffer* GetHandle() const;
+
+  const HardwareBufferDescriptor& GetDescriptor() const;
+
+  const AHardwareBuffer_Desc& GetAndroidDescriptor() const;
+
+  static std::optional<AHardwareBuffer_Desc> Describe(AHardwareBuffer* buffer);
+
+  //----------------------------------------------------------------------------
+  /// @brief      Get the system wide unique ID of the hardware buffer if
+  ///             possible. This is only available on Android API 31 and above.
+  ///             Within the process, the handle are unique.
+  ///
+  /// @return     The system unique id if one can be obtained.
+  ///
+  std::optional<uint64_t> GetSystemUniqueID() const;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Get the system wide unique ID of the hardware buffer if
+  ///             possible. This is only available on Android API 31 and above.
+  ///             Within the process, the handle are unique.
+  ///
+  /// @return     The system unique id if one can be obtained.
+  ///
+  static std::optional<uint64_t> GetSystemUniqueID(AHardwareBuffer* buffer);
+
+ private:
+  struct UniqueAHardwareBufferTraits {
+    static AHardwareBuffer* InvalidValue() { return nullptr; }
+
+    static bool IsValid(AHardwareBuffer* value) {
+      return value != InvalidValue();
+    }
+
+    static void Free(AHardwareBuffer* value) {
+      GetProcTable().AHardwareBuffer_release(value);
+    }
+  };
+
+  const HardwareBufferDescriptor descriptor_;
+  const AHardwareBuffer_Desc android_descriptor_;
+  fml::UniqueObject<AHardwareBuffer*, UniqueAHardwareBufferTraits> buffer_;
+  bool is_valid_ = false;
+};
+
+}  // namespace impeller::android
+
+#endif  // FLUTTER_IMPELLER_TOOLKIT_ANDROID_HARDWARE_BUFFER_H_
diff --git a/impeller/toolkit/android/native_window.cc b/impeller/toolkit/android/native_window.cc
new file mode 100644
index 0000000000000000000000000000000000000000..663a482f624a389b275e84923ba981576eddd9aa
--- /dev/null
+++ b/impeller/toolkit/android/native_window.cc
@@ -0,0 +1,34 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/toolkit/android/native_window.h"
+
+namespace impeller::android {
+
+NativeWindow::NativeWindow(ANativeWindow* window) : window_(window) {
+  if (window_.get()) {
+    GetProcTable().ANativeWindow_acquire(window_.get());
+  }
+}
+
+NativeWindow::~NativeWindow() = default;
+
+bool NativeWindow::IsValid() const {
+  return window_.is_valid();
+}
+
+ISize NativeWindow::GetSize() const {
+  if (!IsValid()) {
+    return {};
+  }
+  const int32_t width = ANativeWindow_getWidth(window_.get());
+  const int32_t height = ANativeWindow_getHeight(window_.get());
+  return ISize::MakeWH(std::max(width, 0), std::max(height, 0));
+}
+
+ANativeWindow* NativeWindow::GetHandle() const {
+  return window_.get();
+}
+
+}  // namespace impeller::android
diff --git a/impeller/toolkit/android/native_window.h b/impeller/toolkit/android/native_window.h
new file mode 100644
index 0000000000000000000000000000000000000000..8af6cfb4ba5a6c7eeff023eebec22dfec48f3d93
--- /dev/null
+++ b/impeller/toolkit/android/native_window.h
@@ -0,0 +1,57 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_TOOLKIT_ANDROID_NATIVE_WINDOW_H_
+#define FLUTTER_IMPELLER_TOOLKIT_ANDROID_NATIVE_WINDOW_H_
+
+#include "flutter/fml/unique_object.h"
+#include "impeller/geometry/size.h"
+#include "impeller/toolkit/android/proc_table.h"
+
+namespace impeller::android {
+
+//------------------------------------------------------------------------------
+/// @brief      A wrapper for ANativeWindow
+///             https://developer.android.com/ndk/reference/group/a-native-window
+///
+///             This wrapper is only available on Android.
+///
+class NativeWindow {
+ public:
+  explicit NativeWindow(ANativeWindow* window);
+
+  ~NativeWindow();
+
+  NativeWindow(const NativeWindow&) = delete;
+
+  NativeWindow& operator=(const NativeWindow&) = delete;
+
+  bool IsValid() const;
+
+  //----------------------------------------------------------------------------
+  /// @return     The current size of the native window.
+  ///
+  ISize GetSize() const;
+
+  ANativeWindow* GetHandle() const;
+
+ private:
+  struct UniqueANativeWindowTraits {
+    static ANativeWindow* InvalidValue() { return nullptr; }
+
+    static bool IsValid(ANativeWindow* value) {
+      return value != InvalidValue();
+    }
+
+    static void Free(ANativeWindow* value) {
+      GetProcTable().ANativeWindow_release(value);
+    }
+  };
+
+  fml::UniqueObject<ANativeWindow*, UniqueANativeWindowTraits> window_;
+};
+
+}  // namespace impeller::android
+
+#endif  // FLUTTER_IMPELLER_TOOLKIT_ANDROID_NATIVE_WINDOW_H_
diff --git a/impeller/toolkit/android/proc_table.cc b/impeller/toolkit/android/proc_table.cc
new file mode 100644
index 0000000000000000000000000000000000000000..24f9f99008a3dcdebf31f1f9cb064f452fae6be1
--- /dev/null
+++ b/impeller/toolkit/android/proc_table.cc
@@ -0,0 +1,73 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/impeller/toolkit/android/proc_table.h"
+
+#include "flutter/fml/build_config.h"
+#include "impeller/base/validation.h"
+
+namespace impeller::android {
+
+const ProcTable& GetProcTable() {
+  static ProcTable gProcTable;
+  return gProcTable;
+}
+
+// Only used by tests.
+ProcTable& GetMutableProcTable() {
+  return const_cast<ProcTable&>(GetProcTable());
+}
+
+template <class T>
+void ResolveAndroidProc(
+    AndroidProc<T>& proc,
+    const std::vector<fml::RefPtr<fml::NativeLibrary>>& libs) {
+  for (const auto& lib : libs) {
+    proc.proc = lib->ResolveFunction<T*>(proc.proc_name).value_or(nullptr);
+    if (proc.proc) {
+      break;
+    }
+  }
+}
+
+ProcTable::ProcTable() {
+  auto lib_android = fml::NativeLibrary::Create("libandroid.so");
+  auto lib_egl = fml::NativeLibrary::Create("libEGL.so");
+
+  if (!lib_android || !lib_egl) {
+    VALIDATION_LOG << "Could not open Android libraries.";
+    return;
+  }
+
+  libraries_.push_back(std::move(lib_android));
+  libraries_.push_back(std::move(lib_egl));
+
+#define RESOLVE_PROC(proc, api) ResolveAndroidProc(proc, libraries_);
+  FOR_EACH_ANDROID_PROC(RESOLVE_PROC);
+#undef RESOLVE_PROC
+
+  if (AChoreographer_postFrameCallback64) {
+    AChoreographer_postFrameCallback.Reset();
+  }
+
+#if FML_ARCH_CPU_32_BITS
+  // On 32-bit platforms, the nanosecond resolution timestamp causes overflow on
+  // the argument in the callback. Don't use it on those platforms.
+  AChoreographer_postFrameCallback.Reset();
+#endif  // FML_ARCH_CPU_32_BITS
+
+  is_valid_ = true;
+}
+
+ProcTable::~ProcTable() = default;
+
+bool ProcTable::IsValid() const {
+  return is_valid_;
+}
+
+bool ProcTable::TraceIsEnabled() const {
+  return this->ATrace_isEnabled ? this->ATrace_isEnabled() : false;
+}
+
+}  // namespace impeller::android
diff --git a/impeller/toolkit/android/proc_table.h b/impeller/toolkit/android/proc_table.h
new file mode 100644
index 0000000000000000000000000000000000000000..af398fd396bf96d9c471ea7ba5fed2659882b375
--- /dev/null
+++ b/impeller/toolkit/android/proc_table.h
@@ -0,0 +1,133 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_TOOLKIT_ANDROID_PROC_TABLE_H_
+#define FLUTTER_IMPELLER_TOOLKIT_ANDROID_PROC_TABLE_H_
+
+#include <EGL/egl.h>
+#define EGL_EGLEXT_PROTOTYPES
+#include <EGL/eglext.h>
+#include <android/api-level.h>
+#include <android/hardware_buffer.h>
+#include <android/hardware_buffer_jni.h>
+#include <android/surface_control.h>
+#include <android/trace.h>
+
+#include <functional>
+
+#include "flutter/fml/logging.h"
+#include "flutter/fml/native_library.h"
+
+namespace impeller::android {
+
+//------------------------------------------------------------------------------
+/// @brief      The Android procs along with the device API level on which these
+///             will be available. There is no checking of the actual API level
+///             however (because getting the API level is itself only possible
+///             on API levels 29 and above).
+///
+///             Take care to explicitly check for the availability of these APIs
+///             at runtime before invoking them.
+///
+///             Typically, you'll never have to deal with the proc. table
+///             directly. Instead, rely on the handle wrappers (`Choreographer`,
+///             `HardwareBuffer`, etc..).
+///
+#define FOR_EACH_ANDROID_PROC(INVOKE)            \
+  INVOKE(AChoreographer_getInstance, 24)         \
+  INVOKE(AChoreographer_postFrameCallback, 24)   \
+  INVOKE(AChoreographer_postFrameCallback64, 29) \
+  INVOKE(AHardwareBuffer_acquire, 26)            \
+  INVOKE(AHardwareBuffer_allocate, 26)           \
+  INVOKE(AHardwareBuffer_describe, 26)           \
+  INVOKE(AHardwareBuffer_fromHardwareBuffer, 26) \
+  INVOKE(AHardwareBuffer_getId, 31)              \
+  INVOKE(AHardwareBuffer_isSupported, 29)        \
+  INVOKE(AHardwareBuffer_release, 26)            \
+  INVOKE(ANativeWindow_acquire, 0)               \
+  INVOKE(ANativeWindow_getHeight, 0)             \
+  INVOKE(ANativeWindow_getWidth, 0)              \
+  INVOKE(ANativeWindow_release, 0)               \
+  INVOKE(ASurfaceControl_createFromWindow, 29)   \
+  INVOKE(ASurfaceControl_release, 29)            \
+  INVOKE(ASurfaceTransaction_apply, 29)          \
+  INVOKE(ASurfaceTransaction_create, 29)         \
+  INVOKE(ASurfaceTransaction_delete, 29)         \
+  INVOKE(ASurfaceTransaction_reparent, 29)       \
+  INVOKE(ASurfaceTransaction_setBuffer, 29)      \
+  INVOKE(ASurfaceTransaction_setColor, 29)       \
+  INVOKE(ASurfaceTransaction_setOnComplete, 29)  \
+  INVOKE(ATrace_isEnabled, 23)                   \
+  INVOKE(eglGetNativeClientBufferANDROID, 0)
+
+template <class T>
+struct AndroidProc {
+  using AndroidProcType = T;
+
+  const char* proc_name = nullptr;
+
+  AndroidProcType* proc = nullptr;
+
+  constexpr bool IsAvailable() const { return proc != nullptr; }
+
+  explicit constexpr operator bool() const { return IsAvailable(); }
+
+  template <class... Args>
+  auto operator()(Args&&... args) const {
+    FML_DCHECK(IsAvailable())
+        << "Android method " << proc_name
+        << " is not available on this device. Missing check.";
+    return proc(std::forward<Args>(args)...);
+  }
+
+  void Reset() { proc = nullptr; }
+};
+
+//------------------------------------------------------------------------------
+/// @brief      The table of Android procs that are resolved dynamically.
+///
+struct ProcTable {
+  ProcTable();
+
+  ~ProcTable();
+
+  ProcTable(const ProcTable&) = delete;
+
+  ProcTable& operator=(const ProcTable&) = delete;
+
+  //----------------------------------------------------------------------------
+  /// @brief      If a valid proc table could be setup. This may fail in case of
+  ///             setup on non-Android platforms.
+  ///
+  /// @return     `true` if valid.
+  ///
+  bool IsValid() const;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Check if tracing in enabled in the process. This call can be
+  ///             made at any API level.
+  ///
+  /// @return     If tracing is enabled.
+  ///
+  bool TraceIsEnabled() const;
+
+#define DEFINE_PROC(name, api) \
+  AndroidProc<decltype(name)> name = {.proc_name = #name};
+  FOR_EACH_ANDROID_PROC(DEFINE_PROC);
+#undef DEFINE_PROC
+
+ private:
+  std::vector<fml::RefPtr<fml::NativeLibrary>> libraries_;
+  bool is_valid_ = false;
+};
+
+const ProcTable& GetProcTable();
+
+#ifdef TESTING
+ProcTable& GetMutableProcTable();
+#endif
+
+}  // namespace impeller::android
+
+#endif  // FLUTTER_IMPELLER_TOOLKIT_ANDROID_PROC_TABLE_H_
diff --git a/impeller/toolkit/android/surface_control.cc b/impeller/toolkit/android/surface_control.cc
new file mode 100644
index 0000000000000000000000000000000000000000..71282e7ccc9811f886413e1cdf00aaa30a422672
--- /dev/null
+++ b/impeller/toolkit/android/surface_control.cc
@@ -0,0 +1,55 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/toolkit/android/surface_control.h"
+
+#include "impeller/base/validation.h"
+#include "impeller/toolkit/android/surface_transaction.h"
+
+namespace impeller::android {
+
+SurfaceControl::SurfaceControl(ANativeWindow* window, const char* debug_name) {
+  if (window == nullptr) {
+    VALIDATION_LOG << "Parent window of surface was null.";
+    return;
+  }
+  if (debug_name == nullptr) {
+    debug_name = "Impeller Layer";
+  }
+  control_.reset(
+      GetProcTable().ASurfaceControl_createFromWindow(window, debug_name));
+}
+
+SurfaceControl::~SurfaceControl() {
+  if (IsValid() && !RemoveFromParent()) {
+    VALIDATION_LOG << "Surface control could not be removed from its parent. "
+                      "Expect a leak.";
+  }
+}
+
+bool SurfaceControl::IsValid() const {
+  return control_.is_valid();
+}
+
+ASurfaceControl* SurfaceControl::GetHandle() const {
+  return control_.get();
+}
+
+bool SurfaceControl::RemoveFromParent() const {
+  if (!IsValid()) {
+    return false;
+  }
+  SurfaceTransaction transaction;
+  if (!transaction.SetParent(*this, nullptr)) {
+    return false;
+  }
+  return transaction.Apply();
+}
+
+bool SurfaceControl::IsAvailableOnPlatform() {
+  return GetProcTable().IsValid() &&
+         GetProcTable().ASurfaceControl_createFromWindow.IsAvailable();
+}
+
+}  // namespace impeller::android
diff --git a/impeller/toolkit/android/surface_control.h b/impeller/toolkit/android/surface_control.h
new file mode 100644
index 0000000000000000000000000000000000000000..af51a4bc5b748b2b757d6579fdc3b8a0b0399f59
--- /dev/null
+++ b/impeller/toolkit/android/surface_control.h
@@ -0,0 +1,86 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_TOOLKIT_ANDROID_SURFACE_CONTROL_H_
+#define FLUTTER_IMPELLER_TOOLKIT_ANDROID_SURFACE_CONTROL_H_
+
+#include "flutter/fml/unique_object.h"
+#include "impeller/toolkit/android/proc_table.h"
+
+namespace impeller::android {
+
+//------------------------------------------------------------------------------
+/// @brief      A wrapper for ASurfaceControl.
+///             https://developer.android.com/ndk/reference/group/native-activity#asurfacecontrol
+///
+///             Instances of this class represent a node in the hierarchy of
+///             surfaces sent to the system compositor for final composition.
+///
+///             This wrapper is only available on Android API 29 and above.
+///
+class SurfaceControl {
+ public:
+  //----------------------------------------------------------------------------
+  /// @return     `true` if any surface controls can be created on this
+  ///              platform.
+  ///
+  static bool IsAvailableOnPlatform();
+
+  //----------------------------------------------------------------------------
+  /// @brief      Creates a new surface control and adds it as a child of the
+  ///             given window.
+  ///
+  /// @param      window      The window
+  /// @param[in]  debug_name  A debug name. See it using
+  ///                         `adb shell dumpsys SurfaceFlinger` along with
+  ///                         other control properties. If no debug name is
+  ///                         specified, the value "Impeller Layer" is used.
+  ///
+  explicit SurfaceControl(ANativeWindow* window,
+                          const char* debug_name = nullptr);
+
+  //----------------------------------------------------------------------------
+  /// @brief      Removes the surface control from the presentation hierarchy
+  ///             managed by the system compositor and release the client side
+  ///             reference to the control. At this point, it may be collected
+  ///             when the compositor is also done using it.
+  ///
+  ~SurfaceControl();
+
+  SurfaceControl(const SurfaceControl&) = delete;
+
+  SurfaceControl& operator=(const SurfaceControl&) = delete;
+
+  bool IsValid() const;
+
+  ASurfaceControl* GetHandle() const;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Remove the surface control from the hierarchy of nodes
+  ///             presented by the system compositor.
+  ///
+  /// @return     `true` If the control will be removed from the hierarchy of
+  ///             nodes presented by the system compositor.
+  ///
+  bool RemoveFromParent() const;
+
+ private:
+  struct UniqueASurfaceControlTraits {
+    static ASurfaceControl* InvalidValue() { return nullptr; }
+
+    static bool IsValid(ASurfaceControl* value) {
+      return value != InvalidValue();
+    }
+
+    static void Free(ASurfaceControl* value) {
+      GetProcTable().ASurfaceControl_release(value);
+    }
+  };
+
+  fml::UniqueObject<ASurfaceControl*, UniqueASurfaceControlTraits> control_;
+};
+
+}  // namespace impeller::android
+
+#endif  // FLUTTER_IMPELLER_TOOLKIT_ANDROID_SURFACE_CONTROL_H_
diff --git a/impeller/toolkit/android/surface_transaction.cc b/impeller/toolkit/android/surface_transaction.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a96eef6a26a5760906427b61741db1b5100b9a43
--- /dev/null
+++ b/impeller/toolkit/android/surface_transaction.cc
@@ -0,0 +1,104 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/impeller/toolkit/android/surface_transaction.h"
+
+#include "flutter/impeller/toolkit/android/hardware_buffer.h"
+#include "flutter/impeller/toolkit/android/surface_control.h"
+#include "impeller/base/validation.h"
+
+namespace impeller::android {
+
+SurfaceTransaction::SurfaceTransaction()
+    : transaction_(GetProcTable().ASurfaceTransaction_create()) {}
+
+SurfaceTransaction::~SurfaceTransaction() = default;
+
+bool SurfaceTransaction::IsValid() const {
+  return transaction_.is_valid();
+}
+
+struct TransactionInFlightData {
+  SurfaceTransaction::OnCompleteCallback callback;
+};
+
+bool SurfaceTransaction::Apply(OnCompleteCallback callback) {
+  if (!IsValid()) {
+    return false;
+  }
+
+  if (!callback) {
+    callback = []() {};
+  }
+
+  const auto& proc_table = GetProcTable();
+
+  auto data = std::make_unique<TransactionInFlightData>();
+  data->callback = callback;
+  proc_table.ASurfaceTransaction_setOnComplete(
+      transaction_.get(),  //
+      data.release(),      //
+      [](void* context, ASurfaceTransactionStats* stats) -> void {
+        auto data = reinterpret_cast<TransactionInFlightData*>(context);
+        data->callback();
+        delete data;
+      });
+  proc_table.ASurfaceTransaction_apply(transaction_.get());
+
+  // Transactions may not be applied over and over.
+  transaction_.reset();
+  return true;
+}
+
+bool SurfaceTransaction::SetContents(const SurfaceControl* control,
+                                     const HardwareBuffer* buffer) {
+  if (control == nullptr || buffer == nullptr) {
+    VALIDATION_LOG << "Invalid control or buffer.";
+    return false;
+  }
+  GetProcTable().ASurfaceTransaction_setBuffer(transaction_.get(),    //
+                                               control->GetHandle(),  //
+                                               buffer->GetHandle(),   //
+                                               -1);
+  return true;
+}
+
+bool SurfaceTransaction::SetBackgroundColor(const SurfaceControl& control,
+                                            const Color& color) {
+  if (!IsValid() || !control.IsValid()) {
+    return false;
+  }
+  GetProcTable().ASurfaceTransaction_setColor(transaction_.get(),     //
+                                              control.GetHandle(),    //
+                                              color.red,              //
+                                              color.green,            //
+                                              color.blue,             //
+                                              color.alpha,            //
+                                              ADATASPACE_SRGB_LINEAR  //
+  );
+  return true;
+}
+
+bool SurfaceTransaction::SetParent(const SurfaceControl& control,
+                                   const SurfaceControl* new_parent) {
+  if (!IsValid() || !control.IsValid()) {
+    return false;
+  }
+  if (new_parent && !new_parent->IsValid()) {
+    return false;
+  }
+  GetProcTable().ASurfaceTransaction_reparent(
+      transaction_.get(),                                        //
+      control.GetHandle(),                                       //
+      new_parent == nullptr ? nullptr : new_parent->GetHandle()  //
+  );
+  return true;
+}
+
+bool SurfaceTransaction::IsAvailableOnPlatform() {
+  return GetProcTable().IsValid() &&
+         GetProcTable().ASurfaceTransaction_create.IsAvailable();
+}
+
+}  // namespace impeller::android
diff --git a/impeller/toolkit/android/surface_transaction.h b/impeller/toolkit/android/surface_transaction.h
new file mode 100644
index 0000000000000000000000000000000000000000..b9460f35e0978d436eac4ef9e85ff3b8c3737af7
--- /dev/null
+++ b/impeller/toolkit/android/surface_transaction.h
@@ -0,0 +1,135 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_TOOLKIT_ANDROID_SURFACE_TRANSACTION_H_
+#define FLUTTER_IMPELLER_TOOLKIT_ANDROID_SURFACE_TRANSACTION_H_
+
+#include <functional>
+#include <map>
+
+#include "flutter/fml/unique_object.h"
+#include "impeller/geometry/color.h"
+#include "impeller/toolkit/android/proc_table.h"
+
+namespace impeller::android {
+
+class SurfaceControl;
+class HardwareBuffer;
+
+//------------------------------------------------------------------------------
+/// @brief      A wrapper for ASurfaceTransaction.
+///             https://developer.android.com/ndk/reference/group/native-activity#asurfacetransaction
+///
+///             A surface transaction is a collection of updates to the
+///             hierarchy of surfaces (represented by `ASurfaceControl`
+///             instances) that are applied atomically in the compositor.
+///
+///             This wrapper is only available on Android API 29 and above.
+///
+/// @note       Transactions should be short lived objects (create, apply,
+///             collect). But, if these are used on multiple threads, they must
+///             be externally synchronized.
+///
+class SurfaceTransaction {
+ public:
+  //----------------------------------------------------------------------------
+  /// @return     `true` if any surface transactions can be created on this
+  ///             platform.
+  ///
+  static bool IsAvailableOnPlatform();
+
+  SurfaceTransaction();
+
+  ~SurfaceTransaction();
+
+  SurfaceTransaction(const SurfaceTransaction&) = delete;
+
+  SurfaceTransaction& operator=(const SurfaceTransaction&) = delete;
+
+  bool IsValid() const;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Encodes that the updated contents of a surface control are
+  ///             specified by the given hardware buffer. The update will not be
+  ///             committed till the call to `Apply` however.
+  ///
+  /// @see        `SurfaceTransaction::Apply`.
+  ///
+  /// @param[in]  control  The control
+  /// @param[in]  buffer   The hardware buffer
+  ///
+  /// @return     If the update was encoded in the transaction.
+  ///
+  [[nodiscard]] bool SetContents(const SurfaceControl* control,
+                                 const HardwareBuffer* buffer);
+
+  //----------------------------------------------------------------------------
+  /// @brief      Encodes the updated background color of the surface control.
+  ///             The update will not be committed till the call to `Apply`
+  ///             however.
+  ///
+  /// @see        `SurfaceTransaction::Apply`.
+  ///
+  /// @param[in]  control  The control
+  /// @param[in]  color    The color
+  ///
+  /// @return     `true` if the background control will be set when transaction
+  ///              is applied.
+  ///
+  [[nodiscard]] bool SetBackgroundColor(const SurfaceControl& control,
+                                        const Color& color);
+
+  using OnCompleteCallback = std::function<void(void)>;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Applies the updated encoded in the transaction and invokes the
+  ///             callback when the updated are complete.
+  ///
+  /// @warning    The callback will be invoked on a system managed thread.
+  ///
+  /// @note       It is fine to immediately destroy the transaction after the
+  ///             call to apply. It is not necessary to wait for transaction
+  ///             completion to collect the transaction handle.
+  ///
+  /// @param[in]  callback  The callback
+  ///
+  /// @return     `true` if the surface transaction was applied. `true` does not
+  ///             indicate the application was completed however. Only the
+  ///             invocation of the callback denotes transaction completion.
+  ///
+  [[nodiscard]] bool Apply(OnCompleteCallback callback = nullptr);
+
+  //----------------------------------------------------------------------------
+  /// @brief      Set the new parent control of the given control. If the new
+  ///             parent is null, it is removed from the control hierarchy.
+  ///
+  /// @param[in]  control     The control
+  /// @param[in]  new_parent  The new parent
+  ///
+  /// @return     `true` if the control will be re-parented when the transaction
+  ///             is applied.
+  ///
+  [[nodiscard]] bool SetParent(const SurfaceControl& control,
+                               const SurfaceControl* new_parent = nullptr);
+
+ private:
+  struct UniqueASurfaceTransactionTraits {
+    static ASurfaceTransaction* InvalidValue() { return nullptr; }
+
+    static bool IsValid(ASurfaceTransaction* value) {
+      return value != InvalidValue();
+    }
+
+    static void Free(ASurfaceTransaction* value) {
+      GetProcTable().ASurfaceTransaction_delete(value);
+    }
+  };
+
+  fml::UniqueObject<ASurfaceTransaction*, UniqueASurfaceTransactionTraits>
+      transaction_;
+};
+
+}  // namespace impeller::android
+
+#endif  // FLUTTER_IMPELLER_TOOLKIT_ANDROID_SURFACE_TRANSACTION_H_
diff --git a/impeller/toolkit/android/toolkit_android_unittests.cc b/impeller/toolkit/android/toolkit_android_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c0086d4d264eb8e7d2b8d4bf622c642a804ae4cf
--- /dev/null
+++ b/impeller/toolkit/android/toolkit_android_unittests.cc
@@ -0,0 +1,137 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/fml/synchronization/waitable_event.h"
+#include "flutter/testing/testing.h"
+#include "impeller/toolkit/android/choreographer.h"
+#include "impeller/toolkit/android/hardware_buffer.h"
+#include "impeller/toolkit/android/proc_table.h"
+#include "impeller/toolkit/android/surface_control.h"
+#include "impeller/toolkit/android/surface_transaction.h"
+
+namespace impeller::android::testing {
+
+#define DISABLE_ANDROID_PROC(name)                 \
+  struct Disable##name {                           \
+    Disable##name() {                              \
+      real_proc = GetMutableProcTable().name.proc; \
+      GetMutableProcTable().name.proc = nullptr;   \
+    }                                              \
+    ~Disable##name() {                             \
+      GetMutableProcTable().name.proc = real_proc; \
+    }                                              \
+    decltype(name)* real_proc;                     \
+  } disable##name;
+
+TEST(ToolkitAndroidTest, CanCreateProcTable) {
+  ProcTable proc_table;
+  ASSERT_TRUE(proc_table.IsValid());
+}
+
+TEST(ToolkitAndroidTest, GuardsAgainstZeroSizedDescriptors) {
+  auto desc = HardwareBufferDescriptor::MakeForSwapchainImage({0, 0});
+  ASSERT_GT(desc.size.width, 0u);
+  ASSERT_GT(desc.size.height, 0u);
+}
+
+TEST(ToolkitAndroidTest, CanCreateHardwareBuffer) {
+  if (!HardwareBuffer::IsAvailableOnPlatform()) {
+    GTEST_SKIP() << "Hardware buffers are not supported on this platform.";
+  }
+  ASSERT_TRUE(HardwareBuffer::IsAvailableOnPlatform());
+  auto desc = HardwareBufferDescriptor::MakeForSwapchainImage({100, 100});
+  ASSERT_TRUE(desc.IsAllocatable());
+  HardwareBuffer buffer(desc);
+  ASSERT_TRUE(buffer.IsValid());
+}
+
+TEST(ToolkitAndroidTest, CanGetHardwareBufferIDs) {
+  if (!HardwareBuffer::IsAvailableOnPlatform()) {
+    GTEST_SKIP() << "Hardware buffers are not supported on this platform.";
+  }
+  ASSERT_TRUE(HardwareBuffer::IsAvailableOnPlatform());
+  if (!GetProcTable().AHardwareBuffer_getId.IsAvailable()) {
+    GTEST_SKIP() << "Hardware buffer IDs are not available on this platform.";
+  }
+  auto desc = HardwareBufferDescriptor::MakeForSwapchainImage({100, 100});
+  ASSERT_TRUE(desc.IsAllocatable());
+  HardwareBuffer buffer(desc);
+  ASSERT_TRUE(buffer.IsValid());
+  ASSERT_TRUE(buffer.GetSystemUniqueID().has_value());
+}
+
+TEST(ToolkitAndroidTest, HardwareBufferNullIDIfAPIUnavailable) {
+  DISABLE_ANDROID_PROC(AHardwareBuffer_getId);
+  ASSERT_FALSE(HardwareBuffer::GetSystemUniqueID(nullptr).has_value());
+}
+
+TEST(ToolkitAndroidTest, CanDescribeHardwareBufferHandles) {
+  if (!HardwareBuffer::IsAvailableOnPlatform()) {
+    GTEST_SKIP() << "Hardware buffers are not supported on this platform.";
+  }
+  ASSERT_TRUE(HardwareBuffer::IsAvailableOnPlatform());
+  auto desc = HardwareBufferDescriptor::MakeForSwapchainImage({100, 100});
+  ASSERT_TRUE(desc.IsAllocatable());
+  HardwareBuffer buffer(desc);
+  ASSERT_TRUE(buffer.IsValid());
+  auto a_desc = HardwareBuffer::Describe(buffer.GetHandle());
+  ASSERT_TRUE(a_desc.has_value());
+  ASSERT_EQ(a_desc->width, 100u);   // NOLINT
+  ASSERT_EQ(a_desc->height, 100u);  // NOLINT
+}
+
+TEST(ToolkitAndroidTest, CanApplySurfaceTransaction) {
+  if (!SurfaceTransaction::IsAvailableOnPlatform()) {
+    GTEST_SKIP() << "Surface controls are not supported on this platform.";
+  }
+  ASSERT_TRUE(SurfaceTransaction::IsAvailableOnPlatform());
+  SurfaceTransaction transaction;
+  ASSERT_TRUE(transaction.IsValid());
+  fml::AutoResetWaitableEvent event;
+  ASSERT_TRUE(transaction.Apply([&event]() { event.Signal(); }));
+  event.Wait();
+}
+
+TEST(ToolkitAndroidTest, SurfacControlsAreAvailable) {
+  if (!SurfaceControl::IsAvailableOnPlatform()) {
+    GTEST_SKIP() << "Surface controls are not supported on this platform.";
+  }
+  ASSERT_TRUE(SurfaceControl::IsAvailableOnPlatform());
+}
+
+TEST(ToolkitAndroidTest, ChoreographerIsAvailable) {
+  if (!Choreographer::IsAvailableOnPlatform()) {
+    GTEST_SKIP() << "Choreographer is not supported on this platform.";
+  }
+  ASSERT_TRUE(Choreographer::IsAvailableOnPlatform());
+}
+
+TEST(ToolkitAndroidTest, CanPostAndNotWaitForFrameCallbacks) {
+  if (!Choreographer::IsAvailableOnPlatform()) {
+    GTEST_SKIP() << "Choreographer is not supported on this platform.";
+  }
+  const auto& choreographer = Choreographer::GetInstance();
+  ASSERT_TRUE(choreographer.IsValid());
+  ASSERT_TRUE(choreographer.PostFrameCallback([](auto) {}));
+}
+
+TEST(ToolkitAndroidTest, CanPostAndWaitForFrameCallbacks) {
+  if (!Choreographer::IsAvailableOnPlatform()) {
+    GTEST_SKIP() << "Choreographer is not supported on this platform.";
+  }
+  if ((true)) {
+    GTEST_SKIP()
+        << "Disabled till the test harness is in an Android activity. "
+           "Running it without one will hang because the choreographer "
+           "frame callback will never execute.";
+  }
+  const auto& choreographer = Choreographer::GetInstance();
+  ASSERT_TRUE(choreographer.IsValid());
+  fml::AutoResetWaitableEvent event;
+  ASSERT_TRUE(choreographer.PostFrameCallback(
+      [&event](auto point) { event.Signal(); }));
+  event.Wait();
+}
+
+}  // namespace impeller::android::testing
diff --git a/impeller/toolkit/egl/BUILD.gn b/impeller/toolkit/egl/BUILD.gn
index ec34bfead9829f0bd223d6c87f157c5aa23ca7d3..82d10a14d195ebd7c8720cc8a0febdb50c18b73c 100644
--- a/impeller/toolkit/egl/BUILD.gn
+++ b/impeller/toolkit/egl/BUILD.gn
@@ -14,6 +14,8 @@ impeller_component("egl") {
     "display.h",
     "egl.cc",
     "egl.h",
+    "image.cc",
+    "image.h",
     "surface.cc",
     "surface.h",
   ]
diff --git a/impeller/toolkit/egl/config.h b/impeller/toolkit/egl/config.h
index 11d0101927f0d2dc7c9969372aeaa7b1f670d05d..45ae789e9ed2b952fe4aa237227923c050cb62cc 100644
--- a/impeller/toolkit/egl/config.h
+++ b/impeller/toolkit/egl/config.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_TOOLKIT_EGL_CONFIG_H_
+#define FLUTTER_IMPELLER_TOOLKIT_EGL_CONFIG_H_
 
 #include "flutter/fml/macros.h"
 #include "impeller/toolkit/egl/egl.h"
@@ -67,8 +68,12 @@ class Config {
   const ConfigDescriptor desc_;
   EGLConfig config_ = nullptr;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(Config);
+  Config(const Config&) = delete;
+
+  Config& operator=(const Config&) = delete;
 };
 
 }  // namespace egl
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_TOOLKIT_EGL_CONFIG_H_
diff --git a/impeller/toolkit/egl/context.h b/impeller/toolkit/egl/context.h
index 5a6f37f4f9873b06c1aa3f68ceab8d4b5130ec66..c9511ce3518329ba21df7f2bdaa28e5aa21f845e 100644
--- a/impeller/toolkit/egl/context.h
+++ b/impeller/toolkit/egl/context.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_TOOLKIT_EGL_CONTEXT_H_
+#define FLUTTER_IMPELLER_TOOLKIT_EGL_CONTEXT_H_
 
 #include <functional>
 
@@ -44,13 +45,17 @@ class Context {
   EGLDisplay display_ = EGL_NO_DISPLAY;
   EGLContext context_ = EGL_NO_CONTEXT;
   mutable RWMutex listeners_mutex_;
-  std::map<UniqueID, LifecycleListener> listeners_
-      IPLR_GUARDED_BY(listeners_mutex_);
+  std::map<UniqueID, LifecycleListener> listeners_ IPLR_GUARDED_BY(
+      listeners_mutex_);
 
   void DispatchLifecyleEvent(LifecycleEvent event) const;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(Context);
+  Context(const Context&) = delete;
+
+  Context& operator=(const Context&) = delete;
 };
 
 }  // namespace egl
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_TOOLKIT_EGL_CONTEXT_H_
diff --git a/impeller/toolkit/egl/display.cc b/impeller/toolkit/egl/display.cc
index b1c4fca1a309e7281abb415df78300262e6e1b43..7cabc314e65dde49570239a5ed1cf80de6d0b706 100644
--- a/impeller/toolkit/egl/display.cc
+++ b/impeller/toolkit/egl/display.cc
@@ -141,9 +141,9 @@ std::unique_ptr<Config> Display::ChooseConfig(ConfigDescriptor config) const {
     if (sample_count > 1) {
       attributes.push_back(EGL_SAMPLE_BUFFERS);
       attributes.push_back(1);
+      attributes.push_back(EGL_SAMPLES);
+      attributes.push_back(sample_count);
     }
-    attributes.push_back(EGL_SAMPLES);
-    attributes.push_back(sample_count);
   }
 
   // termination sentinel must be present.
diff --git a/impeller/toolkit/egl/display.h b/impeller/toolkit/egl/display.h
index 420d143697b0157fd36f7b47c798ebb83d94e51a..3e9b6236c676da4f6e037c8ca837e14bca90f8ed 100644
--- a/impeller/toolkit/egl/display.h
+++ b/impeller/toolkit/egl/display.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef EGL_DISPLAY_H
-#define EGL_DISPLAY_H
+#ifndef FLUTTER_IMPELLER_TOOLKIT_EGL_DISPLAY_H_
+#define FLUTTER_IMPELLER_TOOLKIT_EGL_DISPLAY_H_
 
 #include <memory>
 #include <optional>
@@ -22,29 +22,31 @@ class Display {
  public:
   Display();
 
-  ~Display();
+  virtual ~Display();
 
-  bool IsValid() const;
+  virtual bool IsValid() const;
 
-  std::unique_ptr<Config> ChooseConfig(ConfigDescriptor config) const;
+  virtual std::unique_ptr<Config> ChooseConfig(ConfigDescriptor config) const;
 
-  std::unique_ptr<Context> CreateContext(const Config& config,
-                                         const Context* share_context);
+  virtual std::unique_ptr<Context> CreateContext(const Config& config,
+                                                 const Context* share_context);
 
-  std::unique_ptr<Surface> CreateWindowSurface(const Config& config,
-                                               EGLNativeWindowType window);
+  virtual std::unique_ptr<Surface> CreateWindowSurface(
+      const Config& config,
+      EGLNativeWindowType window);
 
-  std::unique_ptr<Surface> CreatePixelBufferSurface(const Config& config,
-                                                    size_t width,
-                                                    size_t height);
+  virtual std::unique_ptr<Surface>
+  CreatePixelBufferSurface(const Config& config, size_t width, size_t height);
 
  private:
   EGLDisplay display_ = EGL_NO_DISPLAY;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(Display);
+  Display(const Display&) = delete;
+
+  Display& operator=(const Display&) = delete;
 };
 
 }  // namespace egl
 }  // namespace impeller
 
-#endif
+#endif  // FLUTTER_IMPELLER_TOOLKIT_EGL_DISPLAY_H_
diff --git a/impeller/toolkit/egl/egl.h b/impeller/toolkit/egl/egl.h
index 63c57075d63a9ddb19e90b6e25549c0226138384..fc22e1cdf002d795f04a8c0ab9a2e2057b105921 100644
--- a/impeller/toolkit/egl/egl.h
+++ b/impeller/toolkit/egl/egl.h
@@ -2,9 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_TOOLKIT_EGL_EGL_H_
+#define FLUTTER_IMPELLER_TOOLKIT_EGL_EGL_H_
 
 #include <EGL/egl.h>
+#define EGL_EGLEXT_PROTOTYPES
+#include <EGL/eglext.h>
 
 #include <functional>
 
@@ -19,3 +22,5 @@ void LogEGLError(const char* file, int line);
 
 }  // namespace egl
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_TOOLKIT_EGL_EGL_H_
diff --git a/impeller/toolkit/egl/image.cc b/impeller/toolkit/egl/image.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c1f17ebddc960b180c9d02044c9d8a02fc49c405
--- /dev/null
+++ b/impeller/toolkit/egl/image.cc
@@ -0,0 +1,3 @@
+#include "flutter/impeller/toolkit/egl/image.h"
+
+namespace impeller {}
diff --git a/impeller/toolkit/egl/image.h b/impeller/toolkit/egl/image.h
new file mode 100644
index 0000000000000000000000000000000000000000..51e3330065c40907767229aa3a9a6b8caa5c7820
--- /dev/null
+++ b/impeller/toolkit/egl/image.h
@@ -0,0 +1,77 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_TOOLKIT_EGL_IMAGE_H_
+#define FLUTTER_IMPELLER_TOOLKIT_EGL_IMAGE_H_
+
+#include "flutter/fml/unique_object.h"
+#include "flutter/impeller/toolkit/egl/egl.h"
+
+namespace impeller {
+
+// Simple holder of an EGLImage and the owning EGLDisplay.
+struct EGLImageWithDisplay {
+  EGLImage image = EGL_NO_IMAGE;
+  EGLDisplay display = EGL_NO_DISPLAY;
+
+  constexpr bool operator==(const EGLImageWithDisplay& other) const {
+    return image == other.image && display == other.display;
+  }
+
+  constexpr bool operator!=(const EGLImageWithDisplay& other) const {
+    return !(*this == other);
+  }
+};
+
+struct EGLImageWithDisplayTraits {
+  static EGLImageWithDisplay InvalidValue() {
+    return {EGL_NO_IMAGE, EGL_NO_DISPLAY};
+  }
+
+  static bool IsValid(const EGLImageWithDisplay& value) {
+    return value != InvalidValue();
+  }
+
+  static void Free(EGLImageWithDisplay image) {
+    eglDestroyImage(image.display, image.image);
+  }
+};
+
+using UniqueEGLImage =
+    fml::UniqueObject<EGLImageWithDisplay, EGLImageWithDisplayTraits>;
+
+// Simple holder of an EGLImageKHR and the owning EGLDisplay.
+struct EGLImageKHRWithDisplay {
+  EGLImageKHR image = EGL_NO_IMAGE_KHR;
+  EGLDisplay display = EGL_NO_DISPLAY;
+
+  constexpr bool operator==(const EGLImageKHRWithDisplay& other) const {
+    return image == other.image && display == other.display;
+  }
+
+  constexpr bool operator!=(const EGLImageKHRWithDisplay& other) const {
+    return !(*this == other);
+  }
+};
+
+struct EGLImageKHRWithDisplayTraits {
+  static EGLImageKHRWithDisplay InvalidValue() {
+    return {EGL_NO_IMAGE_KHR, EGL_NO_DISPLAY};
+  }
+
+  static bool IsValid(const EGLImageKHRWithDisplay& value) {
+    return value != InvalidValue();
+  }
+
+  static void Free(EGLImageKHRWithDisplay image) {
+    eglDestroyImageKHR(image.display, image.image);
+  }
+};
+
+using UniqueEGLImageKHR =
+    fml::UniqueObject<EGLImageKHRWithDisplay, EGLImageKHRWithDisplayTraits>;
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_TOOLKIT_EGL_IMAGE_H_
diff --git a/impeller/toolkit/egl/surface.h b/impeller/toolkit/egl/surface.h
index e506bf1fe8c0a838c82b528b9455fab9bf99de27..a8ca441660733f8eae058dfa4f1921963b4018f7 100644
--- a/impeller/toolkit/egl/surface.h
+++ b/impeller/toolkit/egl/surface.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_TOOLKIT_EGL_SURFACE_H_
+#define FLUTTER_IMPELLER_TOOLKIT_EGL_SURFACE_H_
 
 #include "flutter/fml/macros.h"
 #include "impeller/toolkit/egl/egl.h"
@@ -26,8 +27,12 @@ class Surface {
   EGLDisplay display_ = EGL_NO_DISPLAY;
   EGLSurface surface_ = EGL_NO_SURFACE;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(Surface);
+  Surface(const Surface&) = delete;
+
+  Surface& operator=(const Surface&) = delete;
 };
 
 }  // namespace egl
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_TOOLKIT_EGL_SURFACE_H_
diff --git a/fml/dart/BUILD.gn b/impeller/toolkit/gles/BUILD.gn
similarity index 38%
rename from fml/dart/BUILD.gn
rename to impeller/toolkit/gles/BUILD.gn
index 099629292cb6ad4a1af3542e0e015659353ae472..06a16f95bf3540054a5bba013733c1a4b4619d08 100644
--- a/fml/dart/BUILD.gn
+++ b/impeller/toolkit/gles/BUILD.gn
@@ -2,18 +2,19 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# Utilities for working with FML types with the Dart API. Targets that use FML
-# as well as Dart must explicitly include this target as FML itself cannot
-# depend on Dart.
-source_set("dart") {
+import("../../tools/impeller.gni")
+
+impeller_component("gles") {
   sources = [
-    "dart_converter.cc",
-    "dart_converter.h",
+    "gles.h",
+    "texture.cc",
+    "texture.h",
   ]
 
-  public_deps = [
+  deps = [
+    "../../base",
     "//flutter/fml",
-    "//flutter/runtime:libdart",
-    "//flutter/third_party/tonic",
   ]
+
+  libs = []
 }
diff --git a/impeller/toolkit/gles/gles.h b/impeller/toolkit/gles/gles.h
new file mode 100644
index 0000000000000000000000000000000000000000..9cb1609fd5c2712e733fcbc99707c0e4b1c60c10
--- /dev/null
+++ b/impeller/toolkit/gles/gles.h
@@ -0,0 +1,12 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_TOOLKIT_GLES_GLES_H_
+#define FLUTTER_IMPELLER_TOOLKIT_GLES_GLES_H_
+
+#include "GLES3/gl3.h"
+#define GL_GLEXT_PROTOTYPES
+#include "GLES2/gl2ext.h"
+
+#endif  // FLUTTER_IMPELLER_TOOLKIT_GLES_GLES_H_
diff --git a/impeller/toolkit/gles/texture.cc b/impeller/toolkit/gles/texture.cc
new file mode 100644
index 0000000000000000000000000000000000000000..56f3d5b7b746f9b2a5492eee206f3c13b3e395de
--- /dev/null
+++ b/impeller/toolkit/gles/texture.cc
@@ -0,0 +1,3 @@
+#include "flutter/impeller/toolkit/gles/texture.h"
+
+namespace impeller {}
diff --git a/impeller/toolkit/gles/texture.h b/impeller/toolkit/gles/texture.h
new file mode 100644
index 0000000000000000000000000000000000000000..cebef02e61a258b811b5419023f6272713afb0af
--- /dev/null
+++ b/impeller/toolkit/gles/texture.h
@@ -0,0 +1,42 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_TOOLKIT_GLES_TEXTURE_H_
+#define FLUTTER_IMPELLER_TOOLKIT_GLES_TEXTURE_H_
+
+#include "flutter/fml/unique_object.h"
+#include "flutter/impeller/toolkit/gles/gles.h"
+
+namespace impeller {
+
+// Simple holder of an GLTexture and the owning EGLDisplay.
+struct GLTexture {
+  GLuint texture_name;
+
+  constexpr bool operator==(const GLTexture& other) const {
+    return texture_name == other.texture_name;
+  }
+
+  constexpr bool operator!=(const GLTexture& other) const {
+    return !(*this == other);
+  }
+};
+
+struct GLTextureTraits {
+  static GLTexture InvalidValue() { return {0}; }
+
+  static bool IsValid(const GLTexture& value) {
+    return value != InvalidValue();
+  }
+
+  static void Free(GLTexture image) {
+    glDeleteTextures(1, &image.texture_name);
+  }
+};
+
+using UniqueGLTexture = fml::UniqueObject<GLTexture, GLTextureTraits>;
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_TOOLKIT_GLES_TEXTURE_H_
diff --git a/impeller/tools/BUILD.gn b/impeller/tools/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..ae1bf978241ab9af0951b3d4a9564976d26876e8
--- /dev/null
+++ b/impeller/tools/BUILD.gn
@@ -0,0 +1,19 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/compiled_action.gni")
+import("//flutter/common/config.gni")
+import("//flutter/impeller/tools/malioc.gni")
+import("//flutter/testing/testing.gni")
+
+declare_args() {
+  # Maximum number of malioc processes to run in parallel.
+  #
+  # To avoid out-of-memory errors we explicitly reduce the number of jobs.
+  impeller_concurrent_malioc_jobs = 1
+}
+
+pool("malioc_pool") {
+  depth = impeller_concurrent_malioc_jobs
+}
diff --git a/impeller/tools/build_metal_library.py b/impeller/tools/build_metal_library.py
index 8556042e5c186dae85d5ba35f87b7b71974ffd6e..8d3c3a86da0399e047b049840c924039cb8de4b4 100644
--- a/impeller/tools/build_metal_library.py
+++ b/impeller/tools/build_metal_library.py
@@ -23,14 +23,9 @@ def make_directories(path):
 def main():
   parser = argparse.ArgumentParser()
   parser.add_argument(
-      '--output',
-      type=str,
-      required=True,
-      help='The location to generate the Metal library to.'
-  )
-  parser.add_argument(
-      '--depfile', type=str, required=True, help='The location of the depfile.'
+      '--output', type=str, required=True, help='The location to generate the Metal library to.'
   )
+  parser.add_argument('--depfile', type=str, required=True, help='The location of the depfile.')
   parser.add_argument(
       '--source',
       type=str,
@@ -44,6 +39,9 @@ def main():
       choices=['mac', 'ios', 'ios-simulator'],
       help='Select the platform.'
   )
+  parser.add_argument(
+      '--metal-version', required=True, help='The language standard version to compile for.'
+  )
 
   args = parser.parse_args()
 
@@ -81,6 +79,8 @@ def main():
       '-Oz',
       # Allow aggressive, lossy floating-point optimizations.
       '-ffast-math',
+      # Record symbols in a separate *.metallibsym file.
+      '-frecord-sources=flat',
       '-MF',
       args.depfile,
       '-o',
@@ -91,17 +91,17 @@ def main():
   # The Metal standard must match the specification in impellerc.
   if args.platform == 'mac':
     command += [
-        '--std=macos-metal1.2',
+        '--std=macos-metal%s' % args.metal_version,
         '-mmacos-version-min=10.14',
     ]
   elif args.platform == 'ios':
     command += [
-        '--std=ios-metal1.2',
-        '-mios-version-min=10.0',
+        '--std=ios-metal%s' % args.metal_version,
+        '-mios-version-min=11.0',
     ]
   elif args.platform == 'ios-simulator':
     command += [
-        '--std=ios-metal1.2',
+        '--std=ios-metal%s' % args.metal_version,
         '-miphonesimulator-version-min=11.0',
     ]
   else:
@@ -109,10 +109,16 @@ def main():
 
   command += args.source
 
-  subprocess.check_call(command)
+  try:
+    subprocess.check_output(command, stderr=subprocess.STDOUT, text=True)
+  except subprocess.CalledProcessError as cpe:
+    print(cpe.output)
+    return cpe.returncode
+
+  return 0
 
 
 if __name__ == '__main__':
   if sys.platform != 'darwin':
     raise Exception('This script only runs on Mac')
-  main()
+  sys.exit(main())
diff --git a/impeller/tools/check_licenses.py b/impeller/tools/check_licenses.py
index 45607b7fb7f957706b5c322a6d8a3da2bb4517e5..58e6ef0d2b379d0224f9ac2eff124d124ce347f7 100644
--- a/impeller/tools/check_licenses.py
+++ b/impeller/tools/check_licenses.py
@@ -54,9 +54,7 @@ def is_source_file(path):
 # Checks that all source files have the same license preamble.
 def main():
   parser = argparse.ArgumentParser()
-  parser.add_argument(
-      '--source-root', type=str, required=True, help='The source root.'
-  )
+  parser.add_argument('--source-root', type=str, required=True, help='The source root.')
   args = parser.parse_args()
 
   assert os.path.exists(args.source_root)
@@ -71,9 +69,7 @@ def main():
 
   for source_file in source_files:
     if not contains_license_block(source_file):
-      raise Exception(
-          'Could not find valid license block in source ', source_file
-      )
+      raise Exception('Could not find valid license block in source ', source_file)
 
 
 if __name__ == '__main__':
diff --git a/impeller/tools/impeller.gni b/impeller/tools/impeller.gni
index e5dea68e12b99484f010137f0ed7545139c56b1d..c886f6501ff0137a4d503685b768f7a474a86887 100644
--- a/impeller/tools/impeller.gni
+++ b/impeller/tools/impeller.gni
@@ -4,39 +4,62 @@
 
 import("//build/compiled_action.gni")
 import("//flutter/common/config.gni")
+import("//flutter/impeller/tools/malioc.gni")
 import("//flutter/testing/testing.gni")
 
 declare_args() {
-  # Whether playgrounds are enabled for unit tests.
-  impeller_enable_playground = false
+  impeller_debug =
+      flutter_runtime_mode == "debug" || flutter_runtime_mode == "profile"
+
+  # Whether the runtime capture/playback system is enabled.
+  impeller_capture = flutter_runtime_mode == "debug"
 
   # Whether the Metal backend is enabled.
-  impeller_enable_metal = is_ios
+  impeller_enable_metal = (is_mac || is_ios) && target_os != "fuchsia"
 
   # Whether the OpenGLES backend is enabled.
-  impeller_enable_opengles = is_linux || is_win || is_android || is_ohos
+  impeller_enable_opengles =
+      (is_linux || is_win || is_android || is_mac || is_ohos ||
+       enable_unittests) && target_os != "fuchsia"
 
   # Whether the Vulkan backend is enabled.
-  impeller_enable_vulkan = (is_win || is_android || is_linux) && !is_ohos
+  impeller_enable_vulkan =
+      (is_linux || is_win || is_android || is_mac || is_ohos ||
+       enable_unittests) && target_os != "fuchsia"
 
   # Whether to use a prebuilt impellerc.
   # If this is the empty string, impellerc will be built.
   # If it is non-empty, it should be the absolute path to impellerc.
   impeller_use_prebuilt_impellerc = ""
 
+  # Whether to use a prebuilt scenec.
+  # If this is the empty string, scenec will be built.
+  # If it is non-empty, it should be the absolute path to scenec.
+  impeller_use_prebuilt_scenec = ""
+
   # If enabled, all OpenGL calls will be traced. Because additional trace
   # overhead may be substantial, this is not enabled by default.
   impeller_trace_all_gl_calls = false
 
-  # Call glGetError after each OpenGL call and log failures.
-  impeller_error_check_all_gl_calls = is_debug
+  # Enable experimental 3D scene rendering.
+  impeller_enable_3d = false
+
+  # Enable to get trace statements for canvas usage.
+  impeller_trace_canvas = false
 }
 
 declare_args() {
+  # Wether to build and include the validation layers.
+  impeller_enable_vulkan_validation_layers =
+      impeller_enable_vulkan && flutter_runtime_mode == "debug" &&
+      target_cpu == "arm64"
+
   # Whether Impeller supports rendering on the platform.
   impeller_supports_rendering =
       impeller_enable_metal || impeller_enable_opengles ||
       impeller_enable_vulkan
+
+  impeller_enable_compute = impeller_enable_vulkan || impeller_enable_metal
 }
 
 # ------------------------------------------------------------------------------
@@ -100,10 +123,14 @@ template("impeller_component") {
 # @param[required] sources  The GLSL (4.60) sources to compiled into the Metal
 #                           library.
 #
+# @param[required] metal_version  The Metal language version to compile for.
+#
 template("metal_library") {
   assert(is_ios || is_mac)
   assert(defined(invoker.name), "Metal library name must be specified.")
   assert(defined(invoker.sources), "Metal source files must be specified.")
+  assert(defined(invoker.metal_version),
+         "Metal language version must be specified.")
 
   metal_library_name = invoker.name
 
@@ -121,8 +148,13 @@ template("metal_library") {
     inputs = invoker.sources
 
     metal_library_path = "$root_out_dir/shaders/$metal_library_name.metallib"
+    metal_library_symbols_path =
+        "$root_out_dir/shaders/$metal_library_name.metallibsym"
 
-    outputs = [ metal_library_path ]
+    outputs = [
+      metal_library_path,
+      metal_library_symbols_path,
+    ]
 
     script = "//flutter/impeller/tools/build_metal_library.py"
 
@@ -133,6 +165,7 @@ template("metal_library") {
       rebase_path(metal_library_path, root_out_dir),
       "--depfile",
       rebase_path(depfile),
+      "--metal-version=$metal_version",
     ]
 
     if (is_ios) {
@@ -201,33 +234,95 @@ template("embed_blob") {
 }
 
 # Dispatches to the build or prebuilt impellerc depending on the value of
-# the impeller_use_prebuilt_impellerc argument. Forwards all variables to
-# compiled_action_foreach or action_foreach as appropriate.
+# the `impeller_use_prebuilt_impellerc` argument.
+# * When the `single_invocation` argument is false, all variables are
+#   forwarded to `compiled_action_foreach` or `action_foreach`, which will
+#   invoke `impellerc` separately for each source.
+# * When the `single_invocation` argument is true, `impellerc` is only
+#   invoked once via `compiled_action` or `action`.
 template("_impellerc") {
-  if (impeller_use_prebuilt_impellerc == "") {
-    compiled_action_foreach(target_name) {
-      forward_variables_from(invoker, "*")
-      tool = "//flutter/impeller/compiler:impellerc"
+  if (invoker.single_invocation) {
+    if (impeller_use_prebuilt_impellerc == "") {
+      compiled_action(target_name) {
+        forward_variables_from(invoker, "*")
+        tool = "//flutter/impeller/compiler:impellerc"
+      }
+    } else {
+      action(target_name) {
+        forward_variables_from(invoker, "*", [ "args" ])
+        script = "//build/gn_run_binary.py"
+        impellerc_path =
+            rebase_path(impeller_use_prebuilt_impellerc, root_build_dir)
+        args = [ impellerc_path ] + invoker.args
+      }
     }
   } else {
-    action_foreach(target_name) {
-      forward_variables_from(invoker, "*", [ "args" ])
-      script = "//build/gn_run_binary.py"
-      impellerc_path =
-          rebase_path(impeller_use_prebuilt_impellerc, root_build_dir)
-      args = [ impellerc_path ] + invoker.args
+    if (impeller_use_prebuilt_impellerc == "") {
+      compiled_action_foreach(target_name) {
+        forward_variables_from(invoker, "*")
+        tool = "//flutter/impeller/compiler:impellerc"
+      }
+    } else {
+      action_foreach(target_name) {
+        forward_variables_from(invoker, "*", [ "args" ])
+        script = "//build/gn_run_binary.py"
+        impellerc_path =
+            rebase_path(impeller_use_prebuilt_impellerc, root_build_dir)
+        args = [ impellerc_path ] + invoker.args
+      }
     }
   }
 }
 
+# Required: shaders                 The list of shaders inputs to compile.
+# Required: shader_target_flags     The target flag(s) to append. Valid options:
+#                                       --sksl
+#                                       --metal-ios
+#                                       --metal-desktop
+#                                       --opengl-es
+#                                       --opengl-desktop
+#                                       --vulkan
+#                                       --runtime-stage-metal
+#                                       --runtime-stage-gles
+#                                       --runtime-stage-vulkan
+#                                   Not required for --shader_bundle mode.
+# Required: sl_file_extension       The file extension to use for output files.
+#                                   Not required for --shader_bundle mode.
+# Optional: iplr                    Causes --sl output to be in iplr/runtime
+#                                   stage flatbuffer format.
+# Optional: shader_bundle           Specifies a Flutter GPU shader bundle
+#                                   configuration.
+#   Required: shader_bundle_output  Specifies the output filename of the shader
+#                                   bundle. This is only required if
+#                                   shader_bundle is supplied.
+# Optional: defines                 Specifies a list of valueless macro
+#                                   definitions.
+# Optional: intermediates_subdir    Specifies the subdirectory in which to put
+#                                   intermediates.
+# Optional: json                    Causes output format to be JSON instead of
+#                                   flatbuffer.
 template("impellerc") {
   assert(defined(invoker.shaders), "Impeller shaders must be specified.")
-  assert(defined(invoker.shader_target_flag),
+  assert(defined(invoker.shader_target_flags) || defined(invoker.shader_bundle),
          "The flag to impellerc for target selection must be specified.")
-  assert(defined(invoker.sl_file_extension),
+  assert(defined(invoker.sl_file_extension) || defined(invoker.shader_bundle),
          "The extension of the SL file must be specified (metal, glsl, etc..).")
+  if (defined(invoker.shader_bundle)) {
+    assert(
+        defined(invoker.shader_bundle_output),
+        "When shader_bundle is specified, shader_bundle_output must also be specified.")
+  }
 
-  sksl = invoker.shader_target_flag == "--sksl"
+  if (defined(invoker.shader_target_flags)) {
+    shader_target_flags = invoker.shader_target_flags
+  } else {
+    shader_target_flags = []
+  }
+
+  sksl = false
+  foreach(shader_target_flag, shader_target_flags) {
+    sksl = shader_target_flag == "--sksl"
+  }
   iplr = false
   if (defined(invoker.iplr) && invoker.iplr) {
     iplr = invoker.iplr
@@ -245,6 +340,8 @@ template("impellerc") {
   not_needed([
                "iplr",
                "sksl",
+               "shader_bundle",
+               "shader_bundle_output",
              ])
 
   # Optional: invoker.iplr Causes --sl output to be in iplr format.
@@ -256,7 +353,12 @@ template("impellerc") {
   #           declaration order instead of usage order.
 
   _impellerc(target_name) {
-    sources = invoker.shaders
+    shader_bundle = defined(invoker.shader_bundle)
+
+    # When single_invocation is true, impellerc will be invoked exactly once. When it's
+    # false, impellerc be invoked for each of the source file entries (invoker.shaders).
+    single_invocation = shader_bundle
+
     if (defined(invoker.intermediates_subdir)) {
       subdir = invoker.intermediates_subdir
       generated_dir = "$target_gen_dir/$subdir"
@@ -264,29 +366,44 @@ template("impellerc") {
       generated_dir = "$target_gen_dir"
     }
 
-    shader_target_flag = invoker.shader_target_flag
-
-    spirv_intermediate = "$generated_dir/{{source_file_part}}.spirv"
-    spirv_intermediate_path = rebase_path(spirv_intermediate, root_build_dir)
+    shader_lib_dir = rebase_path("//flutter/impeller/compiler/shader_lib")
+    args = [ "--include=$shader_lib_dir" ] + shader_target_flags
 
-    depfile_path = "$generated_dir/{{source_file_part}}.d"
-    depfile_intermediate_path = rebase_path(depfile_path, root_build_dir)
-    depfile = depfile_path
+    # When we're in single invocation mode, we can't use source enumeration.
+    if (!single_invocation) {
+      depfile_path = "$generated_dir/{{source_file_part}}.d"
+      depfile_intermediate_path = rebase_path(depfile_path, root_build_dir)
+      depfile = depfile_path
+      args += [
+        "--input={{source}}",
+        "--include={{source_dir}}",
+        "--depfile=$depfile_intermediate_path",
+      ]
 
-    shader_lib_dir = rebase_path("//flutter/impeller/compiler/shader_lib")
-    args = [
-      "--input={{source}}",
-      "--include={{source_dir}}",
-      "--include=$shader_lib_dir",
-      "--depfile=$depfile_intermediate_path",
-      "$shader_target_flag",
-    ]
+      if (defined(invoker.shader_target_flag)) {
+        args += [ "${invoker.shader_target_flag}" ]
+      }
+    }
 
     if (defined(invoker.gles_language_version)) {
       gles_language_version = invoker.gles_language_version
       args += [ "--gles-language-version=$gles_language_version" ]
     }
 
+    if (defined(invoker.metal_version)) {
+      assert(is_mac || is_ios)
+      metal_version = invoker.metal_version
+      args += [ "--metal-version=$metal_version" ]
+    }
+
+    if (defined(invoker.use_half_textures) && invoker.use_half_textures) {
+      args += [ "--use-half-textures" ]
+    }
+    if (defined(invoker.require_framebuffer_fetch) &&
+        invoker.require_framebuffer_fetch) {
+      args += [ "--require-framebuffer-fetch" ]
+    }
+
     if (json) {
       args += [ "--json" ]
     }
@@ -294,27 +411,60 @@ template("impellerc") {
       args += [ "--remap-samplers" ]
     }
 
-    if (sksl) {
-      sl_intermediate =
+    if (iplr) {
+      # When building in IPLR mode, the compiler may be executed twice
+      args += [ "--iplr" ]
+    }
+
+    # The `sl_output` is the raw shader file output by the compiler. For --iplr
+    # and --shader-bundle, this is used as the filename for the flatbuffer to
+    # output.
+
+    if (shader_bundle) {
+      # When a shader bundle is specified, don't bother supplying flags for
+      # the reflection state as these are ignored. In this mode, the compiler
+      # is invoked multiple times and the reflection state for each shader is
+      # written to the output flatbuffer.
+      sl_output = "$generated_dir/${invoker.shader_bundle_output}"
+      sl_output_path = rebase_path(sl_output, root_build_dir)
+
+      args += [
+        "--sl=$sl_output_path",
+        "--shader-bundle=${invoker.shader_bundle}",
+      ]
+
+      outputs = [ sl_output ]
+    } else if (sksl) {
+      # When SkSL is selected as a `shader_target_flags`, don't generate
+      # C++ reflection state. Nothing needs to use it and it's likely invalid
+      # given the special cases when generating SkSL.
+      # Note that this configuration is orthogonal to the "--iplr" flag
+      sl_output =
           "$generated_dir/{{source_file_part}}.${invoker.sl_file_extension}"
-      sl_intermediate_path = rebase_path(sl_intermediate, root_build_dir)
+      sl_output_path = rebase_path(sl_output, root_build_dir)
+
+      spirv_intermediate = "$generated_dir/{{source_file_part}}.spirv"
+      spirv_intermediate_path = rebase_path(spirv_intermediate, root_build_dir)
       args += [
-        "--sl=$sl_intermediate_path",
+        "--sl=$sl_output_path",
         "--spirv=$spirv_intermediate_path",
       ]
-      if (iplr) {
-        args += [ "--iplr" ]
-      }
 
-      outputs = [ sl_intermediate ]
+      outputs = [ sl_output ]
     } else {
-      sl_intermediate =
+      # The default branch. Here we just generate one shader along with all of
+      # its C++ reflection state.
+
+      sl_output =
           "$generated_dir/{{source_file_part}}.${invoker.sl_file_extension}"
+      sl_output_path = rebase_path(sl_output, root_build_dir)
+
       reflection_json_intermediate = "$generated_dir/{{source_file_part}}.json"
       reflection_header_intermediate = "$generated_dir/{{source_file_part}}.h"
       reflection_cc_intermediate = "$generated_dir/{{source_file_part}}.cc"
 
-      sl_intermediate_path = rebase_path(sl_intermediate, root_build_dir)
+      spirv_intermediate = "$generated_dir/{{source_file_part}}.spirv"
+      spirv_intermediate_path = rebase_path(spirv_intermediate, root_build_dir)
       reflection_json_path =
           rebase_path(reflection_json_intermediate, root_build_dir)
       reflection_header_path =
@@ -323,18 +473,15 @@ template("impellerc") {
           rebase_path(reflection_cc_intermediate, root_build_dir)
 
       args += [
-        "--sl=$sl_intermediate_path",
+        "--sl=$sl_output_path",
         "--spirv=$spirv_intermediate_path",
         "--reflection-json=$reflection_json_path",
         "--reflection-header=$reflection_header_path",
         "--reflection-cc=$reflection_cc_path",
       ]
-      if (iplr) {
-        args += [ "--iplr" ]
-      }
 
       outputs = [
-        sl_intermediate,
+        sl_output,
         reflection_header_intermediate,
         reflection_cc_intermediate,
       ]
@@ -345,6 +492,12 @@ template("impellerc") {
         args += [ "--define=$def" ]
       }
     }
+
+    if (single_invocation) {
+      inputs = invoker.shaders
+    } else {
+      sources = invoker.shaders
+    }
   }
 }
 
@@ -373,16 +526,26 @@ template("impellerc_reflect") {
                              ])
 
     deps = [
-      "//flutter/impeller/renderer",
+      "//flutter/impeller/core",
       impellerc_invocation,
     ]
   }
 }
 
-template("impeller_shaders_metal") {
+template("_impeller_shaders_metal") {
   assert(defined(invoker.shaders), "Impeller shaders must be specified.")
   assert(defined(invoker.name), "Name of the shader library must be specified.")
 
+  metal_version = "1.2"
+  if (defined(invoker.metal_version)) {
+    metal_version = invoker.metal_version
+  }
+
+  use_half_textures = false
+  if (defined(invoker.use_half_textures) && invoker.use_half_textures) {
+    use_half_textures = invoker.use_half_textures
+  }
+
   shaders_base_name = string_join("",
                                   [
                                     invoker.name,
@@ -391,14 +554,16 @@ template("impeller_shaders_metal") {
   impellerc_mtl = "impellerc_$target_name"
   impellerc(impellerc_mtl) {
     shaders = invoker.shaders
+    metal_version = metal_version
     sl_file_extension = "metal"
-    shader_target_flag = ""
+    use_half_textures = use_half_textures
+    shader_target_flags = []
     defines = [ "IMPELLER_TARGET_METAL" ]
     if (is_ios) {
-      shader_target_flag = "--metal-ios"
+      shader_target_flags += [ "--metal-ios" ]
       defines += [ "IMPELLER_TARGET_METAL_IOS" ]
     } else if (is_mac) {
-      shader_target_flag = "--metal-desktop"
+      shader_target_flags = [ "--metal-desktop" ]
       defines += [ "IMPELLER_TARGET_METAL_DESKTOP" ]
     } else {
       assert(false, "Metal not supported on this platform.")
@@ -408,6 +573,7 @@ template("impeller_shaders_metal") {
   mtl_lib = "genlib_$target_name"
   metal_library(mtl_lib) {
     name = invoker.name
+    metal_version = metal_version
     sources =
         filter_include(get_target_outputs(":$impellerc_mtl"), [ "*.metal" ])
     deps = [ ":$impellerc_mtl" ]
@@ -424,7 +590,7 @@ template("impeller_shaders_metal") {
     symbol_name = shaders_base_name
     blob = metal_library_files[0]
     hdr = "$target_gen_dir/mtl/$shaders_base_name.h"
-    cc = "$target_gen_dir/mtl/$shaders_base_name.c"
+    cc = "$target_gen_dir/mtl/$shaders_base_name.cc"
     deps = [ ":$mtl_lib" ]
   }
 
@@ -436,14 +602,14 @@ template("impeller_shaders_metal") {
   }
 }
 
-template("blobcat_library") {
+template("shader_archive") {
   assert(defined(invoker.shaders),
          "The shaders to build the library from must be specified.")
   assert(defined(invoker.deps), "Target dependencies must be specified.")
 
-  output_file = "$target_gen_dir/$target_name.shaderblob"
+  output_file = "$target_gen_dir/$target_name.shar"
   compiled_action(target_name) {
-    tool = "//flutter/impeller/blobcat"
+    tool = "//flutter/impeller/shader_archive:shader_archiver"
     inputs = invoker.shaders
     outputs = [ output_file ]
     output_path_rebased = rebase_path(output_file, root_build_dir)
@@ -456,9 +622,16 @@ template("blobcat_library") {
   }
 }
 
-template("impeller_shaders_gles") {
+template("_impeller_shaders_gles") {
   assert(defined(invoker.shaders), "Impeller shaders must be specified.")
   assert(defined(invoker.name), "Name of the shader library must be specified.")
+  assert(defined(invoker.analyze), "Whether to analyze must be specified.")
+
+  require_framebuffer_fetch = false
+  if (defined(invoker.require_framebuffer_fetch) &&
+      invoker.require_framebuffer_fetch) {
+    require_framebuffer_fetch = invoker.require_framebuffer_fetch
+  }
 
   shaders_base_name = string_join("",
                                   [
@@ -469,6 +642,7 @@ template("impeller_shaders_gles") {
   impellerc(impellerc_gles) {
     shaders = invoker.shaders
     sl_file_extension = "gles"
+    require_framebuffer_fetch = require_framebuffer_fetch
     if (defined(invoker.gles_language_version)) {
       gles_language_version = invoker.gles_language_version
     }
@@ -477,19 +651,28 @@ template("impeller_shaders_gles") {
     if (impeller_enable_metal || impeller_enable_vulkan) {
       intermediates_subdir = "gles"
     }
-    if (is_mac) {
-      shader_target_flag = "--opengl-desktop"
-    } else {
-      shader_target_flag = "--opengl-es"
-    }
+    shader_target_flags = [ "--opengl-es" ]
 
     defines = [ "IMPELLER_TARGET_OPENGLES" ]
   }
 
+  gles_shaders =
+      filter_include(get_target_outputs(":$impellerc_gles"), [ "*.gles" ])
+
+  if (invoker.analyze) {
+    analyze_lib = "analyze_$target_name"
+    malioc_analyze_shaders(analyze_lib) {
+      shaders = gles_shaders
+      if (defined(invoker.gles_language_version)) {
+        gles_language_version = invoker.gles_language_version
+      }
+      deps = [ ":$impellerc_gles" ]
+    }
+  }
+
   gles_lib = "genlib_$target_name"
-  blobcat_library(gles_lib) {
-    shaders =
-        filter_include(get_target_outputs(":$impellerc_gles"), [ "*.gles" ])
+  shader_archive(gles_lib) {
+    shaders = gles_shaders
     deps = [ ":$impellerc_gles" ]
   }
 
@@ -504,22 +687,27 @@ template("impeller_shaders_gles") {
     symbol_name = shaders_base_name
     blob = gles_library_files[0]
     hdr = "$target_gen_dir/gles/$shaders_base_name.h"
-    cc = "$target_gen_dir/gles/$shaders_base_name.c"
+    cc = "$target_gen_dir/gles/$shaders_base_name.cc"
     deps = [ ":$gles_lib" ]
   }
 
   group(target_name) {
     public_deps = [ ":$embed_gles_lib" ]
 
+    if (invoker.analyze) {
+      public_deps += [ ":$analyze_lib" ]
+    }
+
     if (!impeller_enable_metal && !impeller_enable_vulkan) {
       public_deps += [ ":$reflect_gles" ]
     }
   }
 }
 
-template("impeller_shaders_vk") {
+template("_impeller_shaders_vk") {
   assert(defined(invoker.shaders), "Impeller shaders must be specified.")
   assert(defined(invoker.name), "Name of the shader library must be specified.")
+  assert(defined(invoker.analyze), "Whether to analyze must be specified.")
 
   shaders_base_name = string_join("",
                                   [
@@ -533,17 +721,34 @@ template("impeller_shaders_vk") {
 
     # Metal reflectors generate a superset of information.
     if (impeller_enable_metal) {
+      if (defined(invoker.metal_version)) {
+        metal_version = invoker.metal_version
+      }
+
       intermediates_subdir = "vk"
     }
-    shader_target_flag = "--vulkan"
+    shader_target_flags = [ "--vulkan" ]
 
     defines = [ "IMPELLER_TARGET_VULKAN" ]
   }
 
+  vk_shaders =
+      filter_include(get_target_outputs(":$impellerc_vk"), [ "*.vkspv" ])
+
+  if (invoker.analyze) {
+    analyze_lib = "analyze_$target_name"
+    malioc_analyze_shaders(analyze_lib) {
+      shaders = vk_shaders
+      if (defined(invoker.vulkan_language_version)) {
+        vulkan_language_version = invoker.vulkan_language_version
+      }
+      deps = [ ":$impellerc_vk" ]
+    }
+  }
+
   vk_lib = "genlib_$target_name"
-  blobcat_library(vk_lib) {
-    shaders =
-        filter_include(get_target_outputs(":$impellerc_vk"), [ "*.vkspv" ])
+  shader_archive(vk_lib) {
+    shaders = vk_shaders
     deps = [ ":$impellerc_vk" ]
   }
 
@@ -558,32 +763,115 @@ template("impeller_shaders_vk") {
     symbol_name = shaders_base_name
     blob = vk_library_files[0]
     hdr = "$target_gen_dir/vk/$shaders_base_name.h"
-    cc = "$target_gen_dir/vk/$shaders_base_name.c"
+    cc = "$target_gen_dir/vk/$shaders_base_name.cc"
     deps = [ ":$vk_lib" ]
   }
 
   group(target_name) {
     public_deps = [ ":$embed_vk_lib" ]
 
+    if (invoker.analyze) {
+      public_deps += [ ":$analyze_lib" ]
+    }
+
     if (!impeller_enable_metal) {
       public_deps += [ ":$reflect_vk" ]
     }
   }
 }
 
+# ------------------------------------------------------------------------------
+# @brief           A target for precompiled shaders and the associated
+#                  generated reflection library.
+#
+# @param[required] name
+#
+#    The base name for the reflected C++ library.
+#
+# @param[required] shaders
+#
+#    A list of GLSL shader files.
+#
+# @param[optional] analyze
+#
+#    Whether to analyze shaders with malioc. Defaults to false. Shaders will
+#    only be analyzed if the GN argument "impeller_malioc_path" is defined.
+#
+# @param[optional] enable_opengles
+#
+#    Whether to compile the shaders for the OpenGL ES backend. Defaults to the
+#    value of the GN argument "impeller_enable_opengles".
+#
+# @param[optional] gles_language_version
+#
+#    The GLES version required by the shaders.
+#
+# @param[optional] metal_version
+#
+#    The version of the Metal API required by the shaders.
+#
+# @param[optional] vulkan_language_version
+#
+#    The SPIR-V version required by the shaders.
+#
+# @param[optional] use_half_textures
+#
+#    Whether the metal shader is using half-precision textures and requires
+#    openGL semantics when compilig SPIR-V.
+#
+# @param[optional] require_framebuffer_fetch
+#
+#    Whether to require the framebuffer fetch extension for GLES fragment shaders.
 template("impeller_shaders") {
+  if (defined(invoker.metal_version)) {
+    metal_version = invoker.metal_version
+  }
+
+  use_half_textures = false
+  if (defined(invoker.use_half_textures) && invoker.use_half_textures) {
+    use_half_textures = true
+  }
+
+  require_framebuffer_fetch = false
+  if (defined(invoker.require_framebuffer_fetch) &&
+      invoker.require_framebuffer_fetch) {
+    require_framebuffer_fetch = true
+  }
+
+  not_needed([
+               "metal_version",
+               "use_half_textures",
+               "require_framebuffer_fetch",
+             ])
+
+  enable_opengles = impeller_enable_opengles
+  if (defined(invoker.enable_opengles)) {
+    enable_opengles = invoker.enable_opengles
+  }
+
   if (impeller_enable_metal) {
+    if (!defined(metal_version)) {
+      metal_version = "1.2"
+    }
+    not_needed(invoker, [ "analyze" ])
     mtl_shaders = "mtl_$target_name"
-    impeller_shaders_metal(mtl_shaders) {
+    _impeller_shaders_metal(mtl_shaders) {
       name = invoker.name
       shaders = invoker.shaders
+      metal_version = metal_version
+      use_half_textures = use_half_textures
     }
   }
 
-  if (impeller_enable_opengles) {
+  if (enable_opengles) {
+    analyze = true
+    if (defined(invoker.analyze) && !invoker.analyze) {
+      analyze = false
+    }
     gles_shaders = "gles_$target_name"
-    impeller_shaders_gles(gles_shaders) {
+    _impeller_shaders_gles(gles_shaders) {
       name = invoker.name
+      require_framebuffer_fetch = require_framebuffer_fetch
       if (defined(invoker.gles_language_version)) {
         gles_language_version = invoker.gles_language_version
       }
@@ -592,14 +880,23 @@ template("impeller_shaders") {
       } else {
         shaders = invoker.shaders
       }
+      analyze = analyze
     }
   }
 
   if (impeller_enable_vulkan) {
+    analyze = true
+    if (defined(invoker.analyze) && !invoker.analyze) {
+      analyze = false
+    }
     vk_shaders = "vk_$target_name"
-    impeller_shaders_vk(vk_shaders) {
+    _impeller_shaders_vk(vk_shaders) {
       name = invoker.name
+      if (defined(invoker.vulkan_language_version)) {
+        vulkan_language_version = invoker.vulkan_language_version
+      }
       shaders = invoker.shaders
+      analyze = analyze
     }
   }
 
@@ -613,7 +910,7 @@ template("impeller_shaders") {
       public_deps += [ ":$mtl_shaders" ]
     }
 
-    if (impeller_enable_opengles) {
+    if (enable_opengles) {
       public_deps += [ ":$gles_shaders" ]
     }
 
@@ -622,3 +919,46 @@ template("impeller_shaders") {
     }
   }
 }
+
+# Dispatches to the build or prebuilt scenec depending on the value of
+# the impeller_use_prebuilt_scenec argument. Forwards all variables to
+# compiled_action_foreach or action_foreach as appropriate.
+template("_scenec") {
+  if (impeller_use_prebuilt_scenec == "") {
+    compiled_action_foreach(target_name) {
+      forward_variables_from(invoker, "*")
+      tool = "//flutter/impeller/scene/importer:scenec"
+    }
+  } else {
+    action_foreach(target_name) {
+      forward_variables_from(invoker, "*", [ "args" ])
+      script = "//build/gn_run_binary.py"
+      scenec_path = rebase_path(impeller_use_prebuilt_scenec, root_build_dir)
+      args = [ scenec_path ] + invoker.args
+    }
+  }
+}
+
+template("scenec") {
+  assert(defined(invoker.geometry), "Geometry input files must be specified.")
+  assert(defined(invoker.type),
+         "The type of geometry to be parsed (gltf, etc..).")
+
+  _scenec(target_name) {
+    sources = invoker.geometry
+    generated_dir = "$target_gen_dir"
+
+    input_type = invoker.type
+    args = [
+      "--input={{source}}",
+      "--input-type=$input_type",
+    ]
+
+    output = "$generated_dir/{{source_file_part}}.ipscene"
+    output_path = rebase_path(output, root_build_dir)
+
+    args += [ "--output=$output_path" ]
+
+    outputs = [ output ]
+  }
+}
diff --git a/impeller/tools/malioc.gni b/impeller/tools/malioc.gni
new file mode 100644
index 0000000000000000000000000000000000000000..bc9d7d4686d1b6f3dba95517368a26b38264c489
--- /dev/null
+++ b/impeller/tools/malioc.gni
@@ -0,0 +1,128 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/compiled_action.gni")
+import("//flutter/common/config.gni")
+import("//flutter/testing/testing.gni")
+
+declare_args() {
+  # Path to the Mali offline compiler tool 'malioc'.
+  impeller_malioc_path = ""
+
+  impeller_malioc_core_filter = [
+    "Mali-G78",
+    "Mali-T880",
+  ]
+}
+
+if (impeller_malioc_path != "") {
+  _core_list_file = "$root_build_dir/mali_core_list.json"
+  exec_script("//flutter/impeller/tools/malioc_cores.py",
+              [
+                "--malioc",
+                rebase_path(impeller_malioc_path, root_build_dir),
+                "--output",
+                rebase_path(_core_list_file),
+              ])
+  _impeller_malioc_cores = read_file(_core_list_file, "json")
+}
+
+template("malioc_analyze_shaders") {
+  if (impeller_malioc_path == "") {
+    group(target_name) {
+      not_needed(invoker, "*")
+    }
+  } else {
+    target_deps = []
+    foreach(core, _impeller_malioc_cores) {
+      foreach(filter_core, impeller_malioc_core_filter) {
+        if (core.core == filter_core) {
+          foreach(source, invoker.shaders) {
+            # Should be "gles" or "vkspv"
+            backend_ext = get_path_info(source, "extension")
+            assert(
+                backend_ext == "gles" || backend_ext == "vkspv",
+                "Shader for unsupported backend passed to malioc: {{source}}")
+            shader_file_name = get_path_info(source, "name")
+            analysis_target =
+                "${target_name}_${shader_file_name}_${core.core}_malioc"
+            if ((backend_ext == "gles" &&
+                 defined(invoker.gles_language_version) &&
+                 core.opengles_max_version < invoker.gles_language_version) ||
+                (backend_ext == "vkspv" &&
+                 defined(invoker.vulkan_language_version) &&
+                 core.vulkan_max_version < invoker.vulkan_language_version)) {
+              group(analysis_target) {
+                not_needed(invoker, "*")
+              }
+            } else {
+              target_deps += [ ":$analysis_target" ]
+              action(analysis_target) {
+                forward_variables_from(invoker,
+                                       "*",
+                                       [
+                                         "args",
+                                         "depfile",
+                                         "inputs",
+                                         "outputs",
+                                         "pool",
+                                         "script",
+                                       ])
+
+                script = "//build/gn_run_malioc.py"
+                pool = "//flutter/impeller/tools:malioc_pool"
+
+                # Nest all malioc output under its own subdirectory of root_gen_dir
+                # so that it's easier to diff it against the state before any changes.
+                subdir = rebase_path(target_gen_dir, root_gen_dir)
+                output_file = "$root_gen_dir/malioc/$subdir/${shader_file_name}.${backend_ext}.${core.core}.json"
+                outputs = [ output_file ]
+
+                # Determine the kind of the shader from the file name
+                name = get_path_info(source, "name")
+                shader_kind_ext = get_path_info(name, "extension")
+
+                if (shader_kind_ext == "comp") {
+                  shader_kind_flag = "--compute"
+                } else if (shader_kind_ext == "frag") {
+                  shader_kind_flag = "--fragment"
+                } else if (shader_kind_ext == "geom") {
+                  shader_kind_flag = "--geometry"
+                } else if (shader_kind_ext == "tesc") {
+                  shader_kind_flag = "--tessellation_control"
+                } else if (shader_kind_ext == "tese") {
+                  shader_kind_flag = "--tessellation_evaluation"
+                } else if (shader_kind_ext == "vert") {
+                  shader_kind_flag = "--vertex"
+                } else {
+                  assert(false, "Unknown shader kind: {{source}}")
+                }
+
+                args = [
+                  rebase_path(impeller_malioc_path, root_build_dir),
+                  rebase_path(output_file),
+                  "--format",
+                  "json",
+                  shader_kind_flag,
+                  "--core",
+                  core.core,
+                ]
+
+                if (backend_ext == "vkspv") {
+                  args += [ "--vulkan" ]
+                }
+
+                args += [ rebase_path(source) ]
+              }
+            }
+          }
+        }
+      }
+    }
+
+    group(target_name) {
+      deps = target_deps
+    }
+  }
+}
diff --git a/impeller/tools/malioc.json b/impeller/tools/malioc.json
new file mode 100644
index 0000000000000000000000000000000000000000..faaffd82a987d10819ae0df7742b907422652790
--- /dev/null
+++ b/impeller/tools/malioc.json
@@ -0,0 +1,11075 @@
+{
+  "flutter/impeller/entity/advanced_blend.frag.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/advanced_blend.frag.vkspv",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 2,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arith_total",
+              "arith_fma"
+            ],
+            "longest_path_cycles": [
+              0.578125,
+              0.578125,
+              0.21875,
+              0.125,
+              0.0,
+              0.5,
+              0.5
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arith_total",
+              "arith_fma"
+            ],
+            "shortest_path_cycles": [
+              0.53125,
+              0.53125,
+              0.203125,
+              0.0625,
+              0.0,
+              0.25,
+              0.25
+            ],
+            "total_bound_pipelines": [
+              "arith_total",
+              "arith_fma"
+            ],
+            "total_cycles": [
+              0.578125,
+              0.578125,
+              0.296875,
+              0.125,
+              0.0,
+              0.5,
+              0.5
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 12,
+          "work_registers_used": 25
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/advanced_blend.vert.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/advanced_blend.vert.vkspv",
+      "has_uniform_computation": true,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 30,
+          "work_registers_used": 32
+        },
+        "Varying": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.03125,
+              0.03125,
+              0.03125,
+              0.0,
+              4.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.03125,
+              0.03125,
+              0.03125,
+              0.0,
+              4.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.03125,
+              0.03125,
+              0.03125,
+              0.0,
+              4.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 22,
+          "work_registers_used": 10
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/blend.frag.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/blend.frag.vkspv",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 100,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "varying",
+              "texture"
+            ],
+            "longest_path_cycles": [
+              0.03125,
+              0.03125,
+              0.0,
+              0.0,
+              0.0,
+              0.25,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "varying",
+              "texture"
+            ],
+            "shortest_path_cycles": [
+              0.03125,
+              0.03125,
+              0.0,
+              0.0,
+              0.0,
+              0.25,
+              0.25
+            ],
+            "total_bound_pipelines": [
+              "varying",
+              "texture"
+            ],
+            "total_cycles": [
+              0.03125,
+              0.03125,
+              0.0,
+              0.0,
+              0.0,
+              0.25,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 4,
+          "work_registers_used": 4
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/blend.vert.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/blend.vert.vkspv",
+      "has_uniform_computation": true,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 30,
+          "work_registers_used": 32
+        },
+        "Varying": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 22,
+          "work_registers_used": 8
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/border_mask_blur.frag.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/border_mask_blur.frag.vkspv",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 44,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arith_total",
+              "arith_fma"
+            ],
+            "longest_path_cycles": [
+              0.875,
+              0.875,
+              0.203125,
+              0.25,
+              0.0,
+              0.25,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arith_total",
+              "arith_fma"
+            ],
+            "shortest_path_cycles": [
+              0.875,
+              0.875,
+              0.203125,
+              0.25,
+              0.0,
+              0.25,
+              0.25
+            ],
+            "total_bound_pipelines": [
+              "arith_total",
+              "arith_fma"
+            ],
+            "total_cycles": [
+              0.875,
+              0.875,
+              0.203125,
+              0.25,
+              0.0,
+              0.25,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 12,
+          "work_registers_used": 18
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/border_mask_blur.vert.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/border_mask_blur.vert.vkspv",
+      "has_uniform_computation": true,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 30,
+          "work_registers_used": 32
+        },
+        "Varying": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 22,
+          "work_registers_used": 8
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/checkerboard.frag.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/checkerboard.frag.vkspv",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 80,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.125,
+              0.125,
+              0.125,
+              0.0625,
+              1.0,
+              0.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.125,
+              0.125,
+              0.125,
+              0.0625,
+              1.0,
+              0.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.125,
+              0.125,
+              0.125,
+              0.0625,
+              1.0,
+              0.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 6,
+          "work_registers_used": 7
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/checkerboard.vert.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/checkerboard.vert.vkspv",
+      "has_uniform_computation": false,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": null,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.0,
+              0.0,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.0,
+              0.0,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.0,
+              0.0,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 8,
+          "work_registers_used": 32
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/clip.frag.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/clip.frag.vkspv",
+      "has_side_effects": false,
+      "has_uniform_computation": false,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": null,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "longest_path_cycles": [
+              0.015625,
+              0.0,
+              0.015625,
+              0.0,
+              0.0,
+              0.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "shortest_path_cycles": [
+              0.015625,
+              0.0,
+              0.015625,
+              0.0,
+              0.0,
+              0.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "total_cycles": [
+              0.015625,
+              0.0,
+              0.015625,
+              0.0,
+              0.0,
+              0.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 0,
+          "work_registers_used": 0
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/clip.vert.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/clip.vert.vkspv",
+      "has_uniform_computation": true,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.015625,
+              0.0625,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.015625,
+              0.0625,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.140625,
+              0.140625,
+              0.015625,
+              0.0625,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 24,
+          "work_registers_used": 32
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/color_matrix_color_filter.frag.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/color_matrix_color_filter.frag.vkspv",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 100,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arith_total",
+              "arith_fma",
+              "varying",
+              "texture"
+            ],
+            "longest_path_cycles": [
+              0.25,
+              0.25,
+              0.0625,
+              0.0625,
+              0.0,
+              0.25,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arith_total",
+              "arith_fma",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_cycles": [
+              0.25,
+              0.25,
+              0.0625,
+              0.0625,
+              0.0,
+              0.25,
+              0.25
+            ],
+            "total_bound_pipelines": [
+              "arith_total",
+              "arith_fma",
+              "varying",
+              "texture"
+            ],
+            "total_cycles": [
+              0.25,
+              0.25,
+              0.0625,
+              0.0625,
+              0.0,
+              0.25,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 14,
+          "work_registers_used": 10
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/color_matrix_color_filter.vert.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/color_matrix_color_filter.vert.vkspv",
+      "has_uniform_computation": true,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 30,
+          "work_registers_used": 32
+        },
+        "Varying": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 22,
+          "work_registers_used": 8
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/conical_gradient_fill.frag.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/conical_gradient_fill.frag.vkspv",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 74,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "longest_path_cycles": [
+              0.800000011920929,
+              0.328125,
+              0.800000011920929,
+              0.0625,
+              0.0,
+              0.25,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "varying"
+            ],
+            "shortest_path_cycles": [
+              0.15625,
+              0.0,
+              0.15625,
+              0.0,
+              0.0,
+              0.25,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "total_cycles": [
+              1.1375000476837158,
+              0.699999988079071,
+              1.1375000476837158,
+              0.3125,
+              0.0,
+              0.25,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 40,
+          "work_registers_used": 9
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/conical_gradient_ssbo_fill.frag.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/conical_gradient_ssbo_fill.frag.vkspv",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 68,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              null
+            ],
+            "longest_path_cycles": [
+              null,
+              null,
+              null,
+              null,
+              null,
+              null,
+              null
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arith_total",
+              "arith_sfu"
+            ],
+            "shortest_path_cycles": [
+              0.5,
+              0.109375,
+              0.296875,
+              0.5,
+              0.0,
+              0.25,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              1.4249999523162842,
+              0.862500011920929,
+              1.4249999523162842,
+              0.875,
+              4.0,
+              0.25,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 44,
+          "work_registers_used": 17
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gaussian_blur.vert.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gaussian_blur.vert.vkspv",
+      "has_uniform_computation": true,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 30,
+          "work_registers_used": 32
+        },
+        "Varying": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 22,
+          "work_registers_used": 8
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gaussian_blur_noalpha_decal.frag.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gaussian_blur_noalpha_decal.frag.vkspv",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 42,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              null
+            ],
+            "longest_path_cycles": [
+              null,
+              null,
+              null,
+              null,
+              null,
+              null,
+              null
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "shortest_path_cycles": [
+              0.109375,
+              0.03125,
+              0.109375,
+              0.0625,
+              0.0,
+              0.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "arith_total",
+              "arith_cvt",
+              "arith_sfu"
+            ],
+            "total_cycles": [
+              0.3125,
+              0.203125,
+              0.3125,
+              0.3125,
+              0.0,
+              0.25,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 10,
+          "work_registers_used": 16
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gaussian_blur_noalpha_nodecal.frag.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gaussian_blur_noalpha_nodecal.frag.vkspv",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 35,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              null
+            ],
+            "longest_path_cycles": [
+              null,
+              null,
+              null,
+              null,
+              null,
+              null,
+              null
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "shortest_path_cycles": [
+              0.109375,
+              0.03125,
+              0.109375,
+              0.0625,
+              0.0,
+              0.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "varying",
+              "texture"
+            ],
+            "total_cycles": [
+              0.203125,
+              0.203125,
+              0.203125,
+              0.125,
+              0.0,
+              0.25,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 10,
+          "work_registers_used": 13
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/advanced_blend.frag.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/advanced_blend.frag.gles",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 2,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arith_total",
+              "arith_fma"
+            ],
+            "longest_path_cycles": [
+              0.578125,
+              0.578125,
+              0.265625,
+              0.125,
+              0.0,
+              0.5,
+              0.5
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arith_total",
+              "arith_fma"
+            ],
+            "shortest_path_cycles": [
+              0.53125,
+              0.53125,
+              0.21875,
+              0.0625,
+              0.0,
+              0.25,
+              0.25
+            ],
+            "total_bound_pipelines": [
+              "arith_total",
+              "arith_fma"
+            ],
+            "total_cycles": [
+              0.578125,
+              0.578125,
+              0.34375,
+              0.125,
+              0.0,
+              0.5,
+              0.5
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 14,
+          "work_registers_used": 23
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/advanced_blend.frag.gles",
+      "has_uniform_computation": false,
+      "type": "Fragment",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arithmetic"
+            ],
+            "longest_path_cycles": [
+              4.289999961853027,
+              2.0,
+              2.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arithmetic"
+            ],
+            "shortest_path_cycles": [
+              3.299999952316284,
+              1.0,
+              1.0
+            ],
+            "total_bound_pipelines": [
+              "arithmetic"
+            ],
+            "total_cycles": [
+              4.666666507720947,
+              2.0,
+              2.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 2,
+          "work_registers_used": 4
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/advanced_blend.vert.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/advanced_blend.vert.gles",
+      "has_uniform_computation": true,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 22,
+          "work_registers_used": 32
+        },
+        "Varying": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.03125,
+              0.03125,
+              0.03125,
+              0.0,
+              4.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.03125,
+              0.03125,
+              0.03125,
+              0.0,
+              4.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.03125,
+              0.03125,
+              0.03125,
+              0.0,
+              4.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 10,
+          "work_registers_used": 10
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/advanced_blend.vert.gles",
+      "has_uniform_computation": false,
+      "type": "Vertex",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              3.299999952316284,
+              7.0,
+              0.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              3.299999952316284,
+              7.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              3.3333332538604736,
+              7.0,
+              0.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 6,
+          "work_registers_used": 3
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/blend.frag.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/blend.frag.gles",
+      "has_side_effects": false,
+      "has_uniform_computation": false,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 100,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "varying",
+              "texture"
+            ],
+            "longest_path_cycles": [
+              0.03125,
+              0.03125,
+              0.03125,
+              0.0,
+              0.0,
+              0.25,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "varying",
+              "texture"
+            ],
+            "shortest_path_cycles": [
+              0.03125,
+              0.03125,
+              0.0,
+              0.0,
+              0.0,
+              0.25,
+              0.25
+            ],
+            "total_bound_pipelines": [
+              "varying",
+              "texture"
+            ],
+            "total_cycles": [
+              0.03125,
+              0.03125,
+              0.03125,
+              0.0,
+              0.0,
+              0.25,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 4,
+          "work_registers_used": 19
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/blend.frag.gles",
+      "has_uniform_computation": false,
+      "type": "Fragment",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "longest_path_cycles": [
+              1.0,
+              1.0,
+              1.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_cycles": [
+              1.0,
+              1.0,
+              1.0
+            ],
+            "total_bound_pipelines": [
+              "load_store",
+              "texture"
+            ],
+            "total_cycles": [
+              0.6666666865348816,
+              1.0,
+              1.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 1,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/blend.vert.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/blend.vert.gles",
+      "has_uniform_computation": true,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 22,
+          "work_registers_used": 32
+        },
+        "Varying": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 10,
+          "work_registers_used": 8
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/blend.vert.gles",
+      "has_uniform_computation": false,
+      "type": "Vertex",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              2.9700000286102295,
+              5.0,
+              0.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              2.9700000286102295,
+              5.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              3.0,
+              5.0,
+              0.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 6,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/border_mask_blur.frag.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/border_mask_blur.frag.gles",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 81,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arith_total",
+              "arith_fma"
+            ],
+            "longest_path_cycles": [
+              0.9375,
+              0.9375,
+              0.296875,
+              0.25,
+              0.0,
+              0.25,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arith_total",
+              "arith_fma"
+            ],
+            "shortest_path_cycles": [
+              0.9375,
+              0.9375,
+              0.265625,
+              0.25,
+              0.0,
+              0.25,
+              0.25
+            ],
+            "total_bound_pipelines": [
+              "arith_total",
+              "arith_fma"
+            ],
+            "total_cycles": [
+              0.9375,
+              0.9375,
+              0.296875,
+              0.25,
+              0.0,
+              0.25,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 10,
+          "work_registers_used": 29
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/border_mask_blur.frag.gles",
+      "has_uniform_computation": false,
+      "type": "Fragment",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arithmetic"
+            ],
+            "longest_path_cycles": [
+              8.579999923706055,
+              1.0,
+              1.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arithmetic"
+            ],
+            "shortest_path_cycles": [
+              8.579999923706055,
+              1.0,
+              1.0
+            ],
+            "total_bound_pipelines": [
+              "arithmetic"
+            ],
+            "total_cycles": [
+              9.0,
+              1.0,
+              1.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 1,
+          "work_registers_used": 3
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/border_mask_blur.vert.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/border_mask_blur.vert.gles",
+      "has_uniform_computation": true,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 22,
+          "work_registers_used": 32
+        },
+        "Varying": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 10,
+          "work_registers_used": 8
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/border_mask_blur.vert.gles",
+      "has_uniform_computation": false,
+      "type": "Vertex",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              2.9700000286102295,
+              5.0,
+              0.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              2.9700000286102295,
+              5.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              3.0,
+              5.0,
+              0.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 6,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/checkerboard.frag.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/checkerboard.frag.gles",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 27,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.234375,
+              0.234375,
+              0.171875,
+              0.0625,
+              1.0,
+              0.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.234375,
+              0.234375,
+              0.140625,
+              0.0625,
+              1.0,
+              0.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.234375,
+              0.234375,
+              0.171875,
+              0.0625,
+              1.0,
+              0.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 12,
+          "work_registers_used": 21
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/checkerboard.frag.gles",
+      "has_uniform_computation": false,
+      "type": "Fragment",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arithmetic"
+            ],
+            "longest_path_cycles": [
+              1.9800000190734863,
+              1.0,
+              0.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arithmetic"
+            ],
+            "shortest_path_cycles": [
+              1.9800000190734863,
+              1.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "arithmetic"
+            ],
+            "total_cycles": [
+              2.3333332538604736,
+              1.0,
+              0.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 2,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/checkerboard.vert.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/checkerboard.vert.gles",
+      "has_uniform_computation": false,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": null,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.015625,
+              0.0,
+              0.015625,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.015625,
+              0.0,
+              0.015625,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.015625,
+              0.0,
+              0.015625,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 8,
+          "work_registers_used": 32
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/checkerboard.vert.gles",
+      "has_uniform_computation": false,
+      "type": "Vertex",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              1.3200000524520874,
+              3.0,
+              0.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              1.3200000524520874,
+              3.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              1.3333333730697632,
+              3.0,
+              0.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 2,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/clip.frag.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/clip.frag.gles",
+      "has_side_effects": false,
+      "has_uniform_computation": false,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": null,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "longest_path_cycles": [
+              0.015625,
+              0.0,
+              0.015625,
+              0.0,
+              0.0,
+              0.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "shortest_path_cycles": [
+              0.015625,
+              0.0,
+              0.015625,
+              0.0,
+              0.0,
+              0.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "total_cycles": [
+              0.015625,
+              0.0,
+              0.015625,
+              0.0,
+              0.0,
+              0.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 0,
+          "work_registers_used": 1
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/clip.frag.gles",
+      "has_uniform_computation": false,
+      "type": "Fragment",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arithmetic"
+            ],
+            "longest_path_cycles": [
+              1.0,
+              0.0,
+              0.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arithmetic"
+            ],
+            "shortest_path_cycles": [
+              1.0,
+              0.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "arithmetic"
+            ],
+            "total_cycles": [
+              0.6666666865348816,
+              0.0,
+              0.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 0,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/clip.vert.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/clip.vert.gles",
+      "has_uniform_computation": true,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.15625,
+              0.15625,
+              0.0,
+              0.0625,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.15625,
+              0.15625,
+              0.0,
+              0.0625,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.15625,
+              0.15625,
+              0.0,
+              0.0625,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 18,
+          "work_registers_used": 32
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/clip.vert.gles",
+      "has_uniform_computation": false,
+      "type": "Vertex",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              2.640000104904175,
+              3.0,
+              0.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              2.640000104904175,
+              3.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              2.6666667461395264,
+              3.0,
+              0.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 6,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/color_matrix_color_filter.frag.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/color_matrix_color_filter.frag.gles",
+      "has_side_effects": false,
+      "has_uniform_computation": false,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 100,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arith_total",
+              "arith_fma",
+              "varying",
+              "texture"
+            ],
+            "longest_path_cycles": [
+              0.25,
+              0.25,
+              0.09375,
+              0.0625,
+              0.0,
+              0.25,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arith_total",
+              "arith_fma",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_cycles": [
+              0.25,
+              0.25,
+              0.0625,
+              0.0625,
+              0.0,
+              0.25,
+              0.25
+            ],
+            "total_bound_pipelines": [
+              "arith_total",
+              "arith_fma",
+              "varying",
+              "texture"
+            ],
+            "total_cycles": [
+              0.25,
+              0.25,
+              0.09375,
+              0.0625,
+              0.0,
+              0.25,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 14,
+          "work_registers_used": 21
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/color_matrix_color_filter.frag.gles",
+      "has_uniform_computation": false,
+      "type": "Fragment",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arithmetic"
+            ],
+            "longest_path_cycles": [
+              2.640000104904175,
+              1.0,
+              1.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arithmetic"
+            ],
+            "shortest_path_cycles": [
+              2.640000104904175,
+              1.0,
+              1.0
+            ],
+            "total_bound_pipelines": [
+              "arithmetic"
+            ],
+            "total_cycles": [
+              3.0,
+              1.0,
+              1.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 3,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/color_matrix_color_filter.vert.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/color_matrix_color_filter.vert.gles",
+      "has_uniform_computation": true,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 22,
+          "work_registers_used": 32
+        },
+        "Varying": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 10,
+          "work_registers_used": 8
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/color_matrix_color_filter.vert.gles",
+      "has_uniform_computation": false,
+      "type": "Vertex",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              2.9700000286102295,
+              4.0,
+              0.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              2.9700000286102295,
+              4.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              3.0,
+              4.0,
+              0.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 6,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/conical_gradient_fill.frag.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/conical_gradient_fill.frag.gles",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 52,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "longest_path_cycles": [
+              0.887499988079071,
+              0.4375,
+              0.887499988079071,
+              0.1875,
+              0.0,
+              0.25,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "varying"
+            ],
+            "shortest_path_cycles": [
+              0.171875,
+              0.0,
+              0.171875,
+              0.0,
+              0.0,
+              0.25,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "total_cycles": [
+              1.28125,
+              0.824999988079071,
+              1.28125,
+              0.4375,
+              0.0,
+              0.25,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 40,
+          "work_registers_used": 21
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/conical_gradient_fill.frag.gles",
+      "has_uniform_computation": true,
+      "type": "Fragment",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arithmetic"
+            ],
+            "longest_path_cycles": [
+              12.869999885559082,
+              1.0,
+              1.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arithmetic"
+            ],
+            "shortest_path_cycles": [
+              1.3200000524520874,
+              1.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "arithmetic"
+            ],
+            "total_cycles": [
+              19.66666603088379,
+              1.0,
+              1.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 6,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/gaussian_blur.vert.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/gaussian_blur.vert.gles",
+      "has_uniform_computation": true,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 22,
+          "work_registers_used": 32
+        },
+        "Varying": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 10,
+          "work_registers_used": 8
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/gaussian_blur.vert.gles",
+      "has_uniform_computation": false,
+      "type": "Vertex",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              2.9700000286102295,
+              5.0,
+              0.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              2.9700000286102295,
+              5.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              3.0,
+              5.0,
+              0.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 6,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/gaussian_blur_noalpha_decal.frag.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/gaussian_blur_noalpha_decal.frag.gles",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 70,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              null
+            ],
+            "longest_path_cycles": [
+              null,
+              null,
+              null,
+              null,
+              null,
+              null,
+              null
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arith_total",
+              "arith_cvt",
+              "arith_sfu"
+            ],
+            "shortest_path_cycles": [
+              0.0625,
+              0.03125,
+              0.0625,
+              0.0625,
+              0.0,
+              0.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "arith_total",
+              "arith_sfu"
+            ],
+            "total_cycles": [
+              0.3125,
+              0.234375,
+              0.296875,
+              0.3125,
+              0.0,
+              0.25,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 8,
+          "work_registers_used": 19
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/gaussian_blur_noalpha_decal.frag.gles",
+      "has_uniform_computation": false,
+      "type": "Fragment",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              null
+            ],
+            "longest_path_cycles": [
+              null,
+              null,
+              null
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arithmetic"
+            ],
+            "shortest_path_cycles": [
+              1.3200000524520874,
+              1.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "arithmetic"
+            ],
+            "total_cycles": [
+              4.666666507720947,
+              1.0,
+              1.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 1,
+          "work_registers_used": 3
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/gaussian_blur_noalpha_nodecal.frag.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/gaussian_blur_noalpha_nodecal.frag.gles",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 66,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              null
+            ],
+            "longest_path_cycles": [
+              null,
+              null,
+              null,
+              null,
+              null,
+              null,
+              null
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arith_total",
+              "arith_cvt",
+              "arith_sfu"
+            ],
+            "shortest_path_cycles": [
+              0.0625,
+              0.03125,
+              0.0625,
+              0.0625,
+              0.0,
+              0.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "varying",
+              "texture"
+            ],
+            "total_cycles": [
+              0.234375,
+              0.234375,
+              0.1875,
+              0.125,
+              0.0,
+              0.25,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 8,
+          "work_registers_used": 19
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/gaussian_blur_noalpha_nodecal.frag.gles",
+      "has_uniform_computation": false,
+      "type": "Fragment",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              null
+            ],
+            "longest_path_cycles": [
+              null,
+              null,
+              null
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arithmetic"
+            ],
+            "shortest_path_cycles": [
+              1.3200000524520874,
+              1.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "arithmetic"
+            ],
+            "total_cycles": [
+              3.3333332538604736,
+              1.0,
+              1.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 1,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/glyph_atlas.frag.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/glyph_atlas.frag.gles",
+      "has_side_effects": false,
+      "has_uniform_computation": false,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 100,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "varying"
+            ],
+            "longest_path_cycles": [
+              0.03125,
+              0.03125,
+              0.03125,
+              0.0,
+              0.0,
+              0.5,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "varying"
+            ],
+            "shortest_path_cycles": [
+              0.03125,
+              0.03125,
+              0.0,
+              0.0,
+              0.0,
+              0.5,
+              0.25
+            ],
+            "total_bound_pipelines": [
+              "varying"
+            ],
+            "total_cycles": [
+              0.03125,
+              0.03125,
+              0.03125,
+              0.0,
+              0.0,
+              0.5,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 4,
+          "work_registers_used": 19
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/glyph_atlas.frag.gles",
+      "has_uniform_computation": false,
+      "type": "Fragment",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "longest_path_cycles": [
+              1.0,
+              1.0,
+              1.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_cycles": [
+              1.0,
+              1.0,
+              1.0
+            ],
+            "total_bound_pipelines": [
+              "load_store",
+              "texture"
+            ],
+            "total_cycles": [
+              0.6666666865348816,
+              1.0,
+              1.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 0,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/glyph_atlas.vert.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/glyph_atlas.vert.gles",
+      "has_uniform_computation": true,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.515625,
+              0.515625,
+              0.140625,
+              0.0,
+              4.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.484375,
+              0.484375,
+              0.03125,
+              0.0,
+              4.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.737500011920929,
+              0.737500011920929,
+              0.15625,
+              0.0,
+              4.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 48,
+          "work_registers_used": 32
+        },
+        "Varying": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.15625,
+              0.15625,
+              0.0625,
+              0.0,
+              5.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.15625,
+              0.15625,
+              0.0625,
+              0.0,
+              5.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.15625,
+              0.15625,
+              0.0625,
+              0.0,
+              5.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 18,
+          "work_registers_used": 16
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/glyph_atlas.vert.gles",
+      "has_uniform_computation": true,
+      "type": "Vertex",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              7.260000228881836,
+              8.0,
+              0.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              6.269999980926514,
+              8.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "arithmetic"
+            ],
+            "total_cycles": [
+              9.333333015441895,
+              8.0,
+              0.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 13,
+          "work_registers_used": 3
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/glyph_atlas_color.frag.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/glyph_atlas_color.frag.gles",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 100,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "varying"
+            ],
+            "longest_path_cycles": [
+              0.0625,
+              0.0625,
+              0.0625,
+              0.0,
+              0.0,
+              0.5,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "varying"
+            ],
+            "shortest_path_cycles": [
+              0.0625,
+              0.0625,
+              0.03125,
+              0.0,
+              0.0,
+              0.5,
+              0.25
+            ],
+            "total_bound_pipelines": [
+              "varying"
+            ],
+            "total_cycles": [
+              0.0625,
+              0.0625,
+              0.0625,
+              0.0,
+              0.0,
+              0.5,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 4,
+          "work_registers_used": 19
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/glyph_atlas_color.frag.gles",
+      "has_uniform_computation": false,
+      "type": "Fragment",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "longest_path_cycles": [
+              1.0,
+              1.0,
+              1.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_cycles": [
+              1.0,
+              1.0,
+              1.0
+            ],
+            "total_bound_pipelines": [
+              "arithmetic"
+            ],
+            "total_cycles": [
+              1.3333333730697632,
+              1.0,
+              1.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 1,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/gradient_fill.vert.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/gradient_fill.vert.gles",
+      "has_uniform_computation": false,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 30,
+          "work_registers_used": 32
+        },
+        "Varying": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0625,
+              3.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0625,
+              3.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0625,
+              3.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 18,
+          "work_registers_used": 11
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/gradient_fill.vert.gles",
+      "has_uniform_computation": false,
+      "type": "Vertex",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              3.299999952316284,
+              4.0,
+              0.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              3.299999952316284,
+              4.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              3.3333332538604736,
+              4.0,
+              0.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 8,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/kernel_decal.frag.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/kernel_decal.frag.gles",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 66,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              null
+            ],
+            "longest_path_cycles": [
+              null,
+              null,
+              null,
+              null,
+              null,
+              null,
+              null
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "shortest_path_cycles": [
+              0.078125,
+              0.0,
+              0.078125,
+              0.0,
+              0.0,
+              0.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.359375,
+              0.0625,
+              0.359375,
+              0.1875,
+              2.0,
+              0.25,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 4,
+          "work_registers_used": 19
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/kernel_decal.frag.gles",
+      "has_uniform_computation": false,
+      "type": "Fragment",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              null
+            ],
+            "longest_path_cycles": [
+              null,
+              null,
+              null
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arithmetic",
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              1.0,
+              1.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "arithmetic"
+            ],
+            "total_cycles": [
+              3.6666667461395264,
+              3.0,
+              1.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 1,
+          "work_registers_used": 3
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/kernel_nodecal.frag.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/kernel_nodecal.frag.gles",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 50,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              null
+            ],
+            "longest_path_cycles": [
+              null,
+              null,
+              null,
+              null,
+              null,
+              null,
+              null
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "shortest_path_cycles": [
+              0.078125,
+              0.0,
+              0.078125,
+              0.0,
+              0.0,
+              0.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.25,
+              0.0625,
+              0.25,
+              0.0,
+              2.0,
+              0.25,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 4,
+          "work_registers_used": 19
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/kernel_nodecal.frag.gles",
+      "has_uniform_computation": false,
+      "type": "Fragment",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              null
+            ],
+            "longest_path_cycles": [
+              null,
+              null,
+              null
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arithmetic",
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              1.0,
+              1.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "arithmetic"
+            ],
+            "total_cycles": [
+              2.3333332538604736,
+              2.0,
+              1.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 1,
+          "work_registers_used": 3
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/linear_gradient_fill.frag.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/linear_gradient_fill.frag.gles",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 52,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "longest_path_cycles": [
+              0.390625,
+              0.296875,
+              0.390625,
+              0.125,
+              0.0,
+              0.25,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "varying"
+            ],
+            "shortest_path_cycles": [
+              0.203125,
+              0.1875,
+              0.203125,
+              0.125,
+              0.0,
+              0.25,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "total_cycles": [
+              0.515625,
+              0.328125,
+              0.515625,
+              0.125,
+              0.0,
+              0.25,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 16,
+          "work_registers_used": 20
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/linear_gradient_fill.frag.gles",
+      "has_uniform_computation": true,
+      "type": "Fragment",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arithmetic"
+            ],
+            "longest_path_cycles": [
+              6.929999828338623,
+              1.0,
+              1.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arithmetic"
+            ],
+            "shortest_path_cycles": [
+              2.309999942779541,
+              1.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "arithmetic"
+            ],
+            "total_cycles": [
+              7.666666507720947,
+              1.0,
+              1.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 4,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/linear_to_srgb_filter.frag.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/linear_to_srgb_filter.frag.gles",
+      "has_side_effects": false,
+      "has_uniform_computation": false,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 40,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arith_total",
+              "arith_cvt",
+              "arith_sfu"
+            ],
+            "longest_path_cycles": [
+              0.4375,
+              0.328125,
+              0.4375,
+              0.4375,
+              0.0,
+              0.25,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arith_total",
+              "arith_sfu"
+            ],
+            "shortest_path_cycles": [
+              0.4375,
+              0.328125,
+              0.40625,
+              0.4375,
+              0.0,
+              0.25,
+              0.25
+            ],
+            "total_bound_pipelines": [
+              "arith_total",
+              "arith_cvt",
+              "arith_sfu"
+            ],
+            "total_cycles": [
+              0.4375,
+              0.328125,
+              0.4375,
+              0.4375,
+              0.0,
+              0.25,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 10,
+          "work_registers_used": 30
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/linear_to_srgb_filter.frag.gles",
+      "has_uniform_computation": false,
+      "type": "Fragment",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arithmetic"
+            ],
+            "longest_path_cycles": [
+              4.949999809265137,
+              1.0,
+              1.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arithmetic"
+            ],
+            "shortest_path_cycles": [
+              4.949999809265137,
+              1.0,
+              1.0
+            ],
+            "total_bound_pipelines": [
+              "arithmetic"
+            ],
+            "total_cycles": [
+              5.333333492279053,
+              1.0,
+              1.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 1,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/linear_to_srgb_filter.vert.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/linear_to_srgb_filter.vert.gles",
+      "has_uniform_computation": true,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 22,
+          "work_registers_used": 32
+        },
+        "Varying": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 10,
+          "work_registers_used": 8
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/linear_to_srgb_filter.vert.gles",
+      "has_uniform_computation": false,
+      "type": "Vertex",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              2.9700000286102295,
+              4.0,
+              0.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              2.9700000286102295,
+              4.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              3.0,
+              4.0,
+              0.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 6,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/morphology_filter.frag.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/morphology_filter.frag.gles",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 80,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              null
+            ],
+            "longest_path_cycles": [
+              null,
+              null,
+              null,
+              null,
+              null,
+              null,
+              null
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "shortest_path_cycles": [
+              0.0625,
+              0.0,
+              0.0625,
+              0.0,
+              0.0,
+              0.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "varying",
+              "texture"
+            ],
+            "total_cycles": [
+              0.234375,
+              0.078125,
+              0.234375,
+              0.0,
+              0.0,
+              0.25,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 8,
+          "work_registers_used": 21
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/morphology_filter.frag.gles",
+      "has_uniform_computation": false,
+      "type": "Fragment",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              null
+            ],
+            "longest_path_cycles": [
+              null,
+              null,
+              null
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arithmetic",
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              1.0,
+              1.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "arithmetic"
+            ],
+            "total_cycles": [
+              2.6666667461395264,
+              1.0,
+              1.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 1,
+          "work_registers_used": 4
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/morphology_filter.vert.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/morphology_filter.vert.gles",
+      "has_uniform_computation": true,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 22,
+          "work_registers_used": 32
+        },
+        "Varying": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 10,
+          "work_registers_used": 8
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/morphology_filter.vert.gles",
+      "has_uniform_computation": false,
+      "type": "Vertex",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              2.9700000286102295,
+              5.0,
+              0.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              2.9700000286102295,
+              5.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              3.0,
+              5.0,
+              0.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 6,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/porter_duff_blend.frag.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/porter_duff_blend.frag.gles",
+      "has_side_effects": false,
+      "has_uniform_computation": false,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 71,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "varying"
+            ],
+            "longest_path_cycles": [
+              0.21875,
+              0.21875,
+              0.03125,
+              0.0,
+              0.0,
+              0.5,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "varying"
+            ],
+            "shortest_path_cycles": [
+              0.21875,
+              0.21875,
+              0.0,
+              0.0,
+              0.0,
+              0.5,
+              0.25
+            ],
+            "total_bound_pipelines": [
+              "varying"
+            ],
+            "total_cycles": [
+              0.21875,
+              0.21875,
+              0.03125,
+              0.0,
+              0.0,
+              0.5,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 8,
+          "work_registers_used": 19
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/porter_duff_blend.frag.gles",
+      "has_uniform_computation": false,
+      "type": "Fragment",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arithmetic"
+            ],
+            "longest_path_cycles": [
+              1.649999976158142,
+              1.0,
+              1.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arithmetic"
+            ],
+            "shortest_path_cycles": [
+              1.649999976158142,
+              1.0,
+              1.0
+            ],
+            "total_bound_pipelines": [
+              "arithmetic"
+            ],
+            "total_cycles": [
+              2.0,
+              1.0,
+              1.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 1,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/porter_duff_blend.vert.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/porter_duff_blend.vert.gles",
+      "has_uniform_computation": true,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 22,
+          "work_registers_used": 32
+        },
+        "Varying": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              5.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              5.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              5.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 10,
+          "work_registers_used": 12
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/porter_duff_blend.vert.gles",
+      "has_uniform_computation": false,
+      "type": "Vertex",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              2.9700000286102295,
+              7.0,
+              0.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              2.9700000286102295,
+              7.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              3.0,
+              7.0,
+              0.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 6,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/position_color.vert.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/position_color.vert.gles",
+      "has_uniform_computation": false,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 20,
+          "work_registers_used": 32
+        },
+        "Varying": {
+          "fp16_arithmetic": null,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.0,
+              0.0,
+              0.0,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.0,
+              0.0,
+              0.0,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.0,
+              0.0,
+              0.0,
+              0.0,
+              3.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 8,
+          "work_registers_used": 9
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/position_color.vert.gles",
+      "has_uniform_computation": false,
+      "type": "Vertex",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              2.640000104904175,
+              5.0,
+              0.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              2.640000104904175,
+              5.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              2.6666667461395264,
+              5.0,
+              0.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 5,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/radial_gradient_fill.frag.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/radial_gradient_fill.frag.gles",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 44,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "longest_path_cycles": [
+              0.421875,
+              0.3125,
+              0.421875,
+              0.1875,
+              0.0,
+              0.25,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "varying"
+            ],
+            "shortest_path_cycles": [
+              0.234375,
+              0.203125,
+              0.234375,
+              0.1875,
+              0.0,
+              0.25,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "total_cycles": [
+              0.546875,
+              0.34375,
+              0.546875,
+              0.1875,
+              0.0,
+              0.25,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 14,
+          "work_registers_used": 20
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/radial_gradient_fill.frag.gles",
+      "has_uniform_computation": true,
+      "type": "Fragment",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arithmetic"
+            ],
+            "longest_path_cycles": [
+              6.929999828338623,
+              1.0,
+              1.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arithmetic"
+            ],
+            "shortest_path_cycles": [
+              2.309999942779541,
+              1.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "arithmetic"
+            ],
+            "total_cycles": [
+              7.666666507720947,
+              1.0,
+              1.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 3,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/rrect_blur.frag.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/rrect_blur.frag.gles",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arith_total",
+              "arith_fma"
+            ],
+            "longest_path_cycles": [
+              1.65625,
+              1.65625,
+              0.453125,
+              1.5,
+              0.0,
+              0.25,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arith_total",
+              "arith_fma"
+            ],
+            "shortest_path_cycles": [
+              1.65625,
+              1.65625,
+              0.421875,
+              1.5,
+              0.0,
+              0.25,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "arith_total",
+              "arith_fma"
+            ],
+            "total_cycles": [
+              1.65625,
+              1.65625,
+              0.453125,
+              1.5,
+              0.0,
+              0.25,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 22,
+          "work_registers_used": 32
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/rrect_blur.frag.gles",
+      "has_uniform_computation": false,
+      "type": "Fragment",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arithmetic"
+            ],
+            "longest_path_cycles": [
+              25.739999771118164,
+              1.0,
+              0.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arithmetic"
+            ],
+            "shortest_path_cycles": [
+              25.739999771118164,
+              1.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "arithmetic"
+            ],
+            "total_cycles": [
+              8.333333015441895,
+              1.0,
+              0.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 3,
+          "work_registers_used": 4
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/rrect_blur.vert.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/rrect_blur.vert.gles",
+      "has_uniform_computation": false,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 20,
+          "work_registers_used": 32
+        },
+        "Varying": {
+          "fp16_arithmetic": null,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.0,
+              0.0,
+              0.0,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.0,
+              0.0,
+              0.0,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.0,
+              0.0,
+              0.0,
+              0.0,
+              3.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 8,
+          "work_registers_used": 7
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/rrect_blur.vert.gles",
+      "has_uniform_computation": false,
+      "type": "Vertex",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              2.640000104904175,
+              4.0,
+              0.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              2.640000104904175,
+              4.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              2.6666667461395264,
+              4.0,
+              0.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 5,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/runtime_effect.vert.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/runtime_effect.vert.gles",
+      "has_uniform_computation": false,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 20,
+          "work_registers_used": 32
+        },
+        "Varying": {
+          "fp16_arithmetic": null,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.0,
+              0.0,
+              0.0,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.0,
+              0.0,
+              0.0,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.0,
+              0.0,
+              0.0,
+              0.0,
+              3.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 8,
+          "work_registers_used": 7
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/runtime_effect.vert.gles",
+      "has_uniform_computation": false,
+      "type": "Vertex",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              2.640000104904175,
+              4.0,
+              0.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              2.640000104904175,
+              4.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              2.6666667461395264,
+              4.0,
+              0.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 5,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/solid_fill.frag.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/solid_fill.frag.gles",
+      "has_side_effects": false,
+      "has_uniform_computation": false,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": null,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "varying"
+            ],
+            "longest_path_cycles": [
+              0.03125,
+              0.0,
+              0.03125,
+              0.0,
+              0.0,
+              0.25,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "varying"
+            ],
+            "shortest_path_cycles": [
+              0.0,
+              0.0,
+              0.0,
+              0.0,
+              0.0,
+              0.25,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "varying"
+            ],
+            "total_cycles": [
+              0.03125,
+              0.0,
+              0.03125,
+              0.0,
+              0.0,
+              0.25,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 0,
+          "work_registers_used": 19
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/solid_fill.frag.gles",
+      "has_uniform_computation": false,
+      "type": "Fragment",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arithmetic",
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              1.0,
+              1.0,
+              0.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arithmetic",
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              1.0,
+              1.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.6666666865348816,
+              1.0,
+              0.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 0,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/solid_fill.vert.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/solid_fill.vert.gles",
+      "has_uniform_computation": false,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 24,
+          "work_registers_used": 32
+        },
+        "Varying": {
+          "fp16_arithmetic": null,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.0625,
+              0.0,
+              0.0625,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.0625,
+              0.0,
+              0.0625,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.0625,
+              0.0,
+              0.0625,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 12,
+          "work_registers_used": 7
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/solid_fill.vert.gles",
+      "has_uniform_computation": false,
+      "type": "Vertex",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              2.640000104904175,
+              4.0,
+              0.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              2.640000104904175,
+              4.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              2.6666667461395264,
+              4.0,
+              0.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 6,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/srgb_to_linear_filter.frag.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/srgb_to_linear_filter.frag.gles",
+      "has_side_effects": false,
+      "has_uniform_computation": false,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 40,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "longest_path_cycles": [
+              0.484375,
+              0.328125,
+              0.484375,
+              0.4375,
+              0.0,
+              0.25,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "shortest_path_cycles": [
+              0.453125,
+              0.328125,
+              0.453125,
+              0.4375,
+              0.0,
+              0.25,
+              0.25
+            ],
+            "total_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "total_cycles": [
+              0.484375,
+              0.328125,
+              0.484375,
+              0.4375,
+              0.0,
+              0.25,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 10,
+          "work_registers_used": 28
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/srgb_to_linear_filter.frag.gles",
+      "has_uniform_computation": false,
+      "type": "Fragment",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arithmetic"
+            ],
+            "longest_path_cycles": [
+              4.949999809265137,
+              1.0,
+              1.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arithmetic"
+            ],
+            "shortest_path_cycles": [
+              4.949999809265137,
+              1.0,
+              1.0
+            ],
+            "total_bound_pipelines": [
+              "arithmetic"
+            ],
+            "total_cycles": [
+              5.333333492279053,
+              1.0,
+              1.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 1,
+          "work_registers_used": 3
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/srgb_to_linear_filter.vert.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/srgb_to_linear_filter.vert.gles",
+      "has_uniform_computation": true,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 22,
+          "work_registers_used": 32
+        },
+        "Varying": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 10,
+          "work_registers_used": 8
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/srgb_to_linear_filter.vert.gles",
+      "has_uniform_computation": false,
+      "type": "Vertex",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              2.9700000286102295,
+              4.0,
+              0.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              2.9700000286102295,
+              4.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              3.0,
+              4.0,
+              0.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 6,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/sweep_gradient_fill.frag.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/sweep_gradient_fill.frag.gles",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 34,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt"
+            ],
+            "longest_path_cycles": [
+              0.46875,
+              0.46875,
+              0.46875,
+              0.375,
+              0.0,
+              0.25,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arith_total",
+              "arith_sfu"
+            ],
+            "shortest_path_cycles": [
+              0.375,
+              0.359375,
+              0.25,
+              0.375,
+              0.0,
+              0.25,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "total_cycles": [
+              0.5625,
+              0.5,
+              0.5625,
+              0.375,
+              0.0,
+              0.25,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 20,
+          "work_registers_used": 24
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/sweep_gradient_fill.frag.gles",
+      "has_uniform_computation": true,
+      "type": "Fragment",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arithmetic"
+            ],
+            "longest_path_cycles": [
+              7.920000076293945,
+              1.0,
+              1.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arithmetic"
+            ],
+            "shortest_path_cycles": [
+              2.9700000286102295,
+              1.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "arithmetic"
+            ],
+            "total_cycles": [
+              8.666666984558105,
+              1.0,
+              1.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 4,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/texture_fill.frag.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/texture_fill.frag.gles",
+      "has_side_effects": false,
+      "has_uniform_computation": false,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 100,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "varying"
+            ],
+            "longest_path_cycles": [
+              0.046875,
+              0.03125,
+              0.046875,
+              0.0,
+              0.0,
+              0.375,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "varying"
+            ],
+            "shortest_path_cycles": [
+              0.03125,
+              0.03125,
+              0.015625,
+              0.0,
+              0.0,
+              0.375,
+              0.25
+            ],
+            "total_bound_pipelines": [
+              "varying"
+            ],
+            "total_cycles": [
+              0.046875,
+              0.03125,
+              0.046875,
+              0.0,
+              0.0,
+              0.375,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 2,
+          "work_registers_used": 19
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/texture_fill.frag.gles",
+      "has_uniform_computation": false,
+      "type": "Fragment",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "longest_path_cycles": [
+              1.0,
+              1.0,
+              1.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_cycles": [
+              1.0,
+              1.0,
+              1.0
+            ],
+            "total_bound_pipelines": [
+              "load_store",
+              "texture"
+            ],
+            "total_cycles": [
+              0.6666666865348816,
+              1.0,
+              1.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 0,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/texture_fill.vert.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/texture_fill.vert.gles",
+      "has_uniform_computation": true,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 22,
+          "work_registers_used": 32
+        },
+        "Varying": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.03125,
+              0.015625,
+              0.03125,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.03125,
+              0.015625,
+              0.03125,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.03125,
+              0.015625,
+              0.03125,
+              0.0,
+              3.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 10,
+          "work_registers_used": 8
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/texture_fill.vert.gles",
+      "has_uniform_computation": false,
+      "type": "Vertex",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              2.9700000286102295,
+              6.0,
+              0.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              2.9700000286102295,
+              6.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              3.0,
+              6.0,
+              0.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 6,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/texture_fill_external.frag.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/texture_fill_external.frag.gles",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "varying"
+            ],
+            "longest_path_cycles": [
+              0.203125,
+              0.203125,
+              0.03125,
+              0.0,
+              0.0,
+              0.375,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "varying"
+            ],
+            "shortest_path_cycles": [
+              0.203125,
+              0.203125,
+              0.0,
+              0.0,
+              0.0,
+              0.375,
+              0.25
+            ],
+            "total_bound_pipelines": [
+              "varying"
+            ],
+            "total_cycles": [
+              0.203125,
+              0.203125,
+              0.03125,
+              0.0,
+              0.0,
+              0.375,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 14,
+          "work_registers_used": 19
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/texture_fill_external.frag.gles",
+      "has_uniform_computation": false,
+      "type": "Fragment",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arithmetic"
+            ],
+            "longest_path_cycles": [
+              1.649999976158142,
+              1.0,
+              1.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arithmetic"
+            ],
+            "shortest_path_cycles": [
+              1.649999976158142,
+              1.0,
+              1.0
+            ],
+            "total_bound_pipelines": [
+              "arithmetic"
+            ],
+            "total_cycles": [
+              2.0,
+              1.0,
+              1.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 2,
+          "work_registers_used": 3
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/texture_fill_strict_src.frag.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/texture_fill_strict_src.frag.gles",
+      "has_side_effects": false,
+      "has_uniform_computation": false,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 33,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "varying"
+            ],
+            "longest_path_cycles": [
+              0.109375,
+              0.03125,
+              0.109375,
+              0.0,
+              0.0,
+              0.375,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "varying"
+            ],
+            "shortest_path_cycles": [
+              0.078125,
+              0.03125,
+              0.078125,
+              0.0,
+              0.0,
+              0.375,
+              0.25
+            ],
+            "total_bound_pipelines": [
+              "varying"
+            ],
+            "total_cycles": [
+              0.109375,
+              0.03125,
+              0.109375,
+              0.0,
+              0.0,
+              0.375,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 4,
+          "work_registers_used": 20
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/texture_fill_strict_src.frag.gles",
+      "has_uniform_computation": false,
+      "type": "Fragment",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "longest_path_cycles": [
+              1.0,
+              1.0,
+              1.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_cycles": [
+              1.0,
+              1.0,
+              1.0
+            ],
+            "total_bound_pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "total_cycles": [
+              1.0,
+              1.0,
+              1.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 1,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/tiled_texture_fill.frag.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/tiled_texture_fill.frag.gles",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 33,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "varying"
+            ],
+            "longest_path_cycles": [
+              0.25,
+              0.03125,
+              0.25,
+              0.0,
+              0.0,
+              0.375,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "varying"
+            ],
+            "shortest_path_cycles": [
+              0.046875,
+              0.03125,
+              0.046875,
+              0.0,
+              0.0,
+              0.375,
+              0.25
+            ],
+            "total_bound_pipelines": [
+              "varying"
+            ],
+            "total_cycles": [
+              0.25,
+              0.03125,
+              0.25,
+              0.0,
+              0.0,
+              0.375,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 4,
+          "work_registers_used": 19
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/tiled_texture_fill.frag.gles",
+      "has_uniform_computation": false,
+      "type": "Fragment",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arithmetic"
+            ],
+            "longest_path_cycles": [
+              3.299999952316284,
+              2.0,
+              1.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              1.3200000524520874,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "arithmetic"
+            ],
+            "total_cycles": [
+              3.6666667461395264,
+              2.0,
+              1.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 1,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/tiled_texture_fill_external.frag.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/tiled_texture_fill_external.frag.gles",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 70,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "longest_path_cycles": [
+              0.421875,
+              0.328125,
+              0.421875,
+              0.0,
+              0.0,
+              0.25,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "varying"
+            ],
+            "shortest_path_cycles": [
+              0.09375,
+              0.03125,
+              0.09375,
+              0.0,
+              0.0,
+              0.25,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "total_cycles": [
+              0.515625,
+              0.359375,
+              0.515625,
+              0.0,
+              0.0,
+              0.25,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 20,
+          "work_registers_used": 22
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/tiled_texture_fill_external.frag.gles",
+      "has_uniform_computation": false,
+      "type": "Fragment",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arithmetic"
+            ],
+            "longest_path_cycles": [
+              7.920000076293945,
+              2.0,
+              1.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              1.3200000524520874,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "arithmetic"
+            ],
+            "total_cycles": [
+              9.0,
+              2.0,
+              1.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 2,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/vertices.frag.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/vertices.frag.gles",
+      "has_side_effects": false,
+      "has_uniform_computation": false,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 100,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "varying"
+            ],
+            "longest_path_cycles": [
+              0.03125,
+              0.03125,
+              0.03125,
+              0.0,
+              0.0,
+              0.25,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "varying"
+            ],
+            "shortest_path_cycles": [
+              0.03125,
+              0.03125,
+              0.0,
+              0.0,
+              0.0,
+              0.25,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "varying"
+            ],
+            "total_cycles": [
+              0.03125,
+              0.03125,
+              0.03125,
+              0.0,
+              0.0,
+              0.25,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 2,
+          "work_registers_used": 19
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/vertices.frag.gles",
+      "has_uniform_computation": false,
+      "type": "Fragment",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arithmetic",
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              1.0,
+              1.0,
+              0.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arithmetic",
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              1.0,
+              1.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.6666666865348816,
+              1.0,
+              0.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 1,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/yuv_to_rgb_filter.frag.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/yuv_to_rgb_filter.frag.gles",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 100,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "texture"
+            ],
+            "longest_path_cycles": [
+              0.15625,
+              0.15625,
+              0.046875,
+              0.0,
+              0.0,
+              0.25,
+              0.5
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "texture"
+            ],
+            "shortest_path_cycles": [
+              0.15625,
+              0.15625,
+              0.015625,
+              0.0,
+              0.0,
+              0.25,
+              0.5
+            ],
+            "total_bound_pipelines": [
+              "texture"
+            ],
+            "total_cycles": [
+              0.15625,
+              0.15625,
+              0.046875,
+              0.0,
+              0.0,
+              0.25,
+              0.5
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 12,
+          "work_registers_used": 19
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/yuv_to_rgb_filter.frag.gles",
+      "has_uniform_computation": false,
+      "type": "Fragment",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arithmetic"
+            ],
+            "longest_path_cycles": [
+              2.309999942779541,
+              1.0,
+              2.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arithmetic"
+            ],
+            "shortest_path_cycles": [
+              2.309999942779541,
+              1.0,
+              2.0
+            ],
+            "total_bound_pipelines": [
+              "arithmetic"
+            ],
+            "total_cycles": [
+              2.6666667461395264,
+              1.0,
+              2.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 3,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gles/yuv_to_rgb_filter.vert.gles": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gles/yuv_to_rgb_filter.vert.gles",
+      "has_uniform_computation": true,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 22,
+          "work_registers_used": 32
+        },
+        "Varying": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 10,
+          "work_registers_used": 8
+        }
+      }
+    },
+    "Mali-T880": {
+      "core": "Mali-T880",
+      "filename": "flutter/impeller/entity/gles/yuv_to_rgb_filter.vert.gles",
+      "has_uniform_computation": false,
+      "type": "Vertex",
+      "variants": {
+        "Main": {
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              2.9700000286102295,
+              4.0,
+              0.0
+            ],
+            "pipelines": [
+              "arithmetic",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              2.9700000286102295,
+              4.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              3.0,
+              4.0,
+              0.0
+            ]
+          },
+          "thread_occupancy": 100,
+          "uniform_registers_used": 6,
+          "work_registers_used": 2
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/glyph_atlas.frag.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/glyph_atlas.frag.vkspv",
+      "has_side_effects": false,
+      "has_uniform_computation": false,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 100,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "varying"
+            ],
+            "longest_path_cycles": [
+              0.03125,
+              0.03125,
+              0.0,
+              0.0,
+              0.0,
+              0.5,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "varying"
+            ],
+            "shortest_path_cycles": [
+              0.03125,
+              0.03125,
+              0.0,
+              0.0,
+              0.0,
+              0.5,
+              0.25
+            ],
+            "total_bound_pipelines": [
+              "varying"
+            ],
+            "total_cycles": [
+              0.03125,
+              0.03125,
+              0.0,
+              0.0,
+              0.0,
+              0.5,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 4,
+          "work_registers_used": 6
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/glyph_atlas.vert.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/glyph_atlas.vert.vkspv",
+      "has_uniform_computation": true,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.5,
+              0.5,
+              0.140625,
+              0.0,
+              4.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.46875,
+              0.46875,
+              0.03125,
+              0.0,
+              4.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.71875,
+              0.71875,
+              0.15625,
+              0.0,
+              4.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 56,
+          "work_registers_used": 32
+        },
+        "Varying": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.15625,
+              0.15625,
+              0.0625,
+              0.0,
+              5.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.15625,
+              0.15625,
+              0.0625,
+              0.0,
+              5.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.15625,
+              0.15625,
+              0.0625,
+              0.0,
+              5.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 48,
+          "work_registers_used": 13
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/glyph_atlas_color.frag.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/glyph_atlas_color.frag.vkspv",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 100,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "varying"
+            ],
+            "longest_path_cycles": [
+              0.0625,
+              0.0625,
+              0.03125,
+              0.0,
+              0.0,
+              0.5,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "varying"
+            ],
+            "shortest_path_cycles": [
+              0.0625,
+              0.0625,
+              0.03125,
+              0.0,
+              0.0,
+              0.5,
+              0.25
+            ],
+            "total_bound_pipelines": [
+              "varying"
+            ],
+            "total_cycles": [
+              0.0625,
+              0.0625,
+              0.03125,
+              0.0,
+              0.0,
+              0.5,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 4,
+          "work_registers_used": 8
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/gradient_fill.vert.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/gradient_fill.vert.vkspv",
+      "has_uniform_computation": true,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 44,
+          "work_registers_used": 32
+        },
+        "Varying": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0625,
+              3.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0625,
+              3.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0625,
+              3.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 36,
+          "work_registers_used": 11
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/kernel_decal.frag.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/kernel_decal.frag.vkspv",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 66,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              null
+            ],
+            "longest_path_cycles": [
+              null,
+              null,
+              null,
+              null,
+              null,
+              null,
+              null
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "shortest_path_cycles": [
+              0.09375,
+              0.0,
+              0.09375,
+              0.0,
+              0.0,
+              0.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.34375,
+              0.0625,
+              0.34375,
+              0.1875,
+              1.0,
+              0.25,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 4,
+          "work_registers_used": 17
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/kernel_nodecal.frag.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/kernel_nodecal.frag.vkspv",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 50,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              null
+            ],
+            "longest_path_cycles": [
+              null,
+              null,
+              null,
+              null,
+              null,
+              null,
+              null
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "shortest_path_cycles": [
+              0.09375,
+              0.0,
+              0.09375,
+              0.0,
+              0.0,
+              0.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.21875,
+              0.0625,
+              0.21875,
+              0.0,
+              1.0,
+              0.25,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 4,
+          "work_registers_used": 11
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/linear_gradient_fill.frag.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/linear_gradient_fill.frag.vkspv",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 90,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arith_total",
+              "arith_cvt",
+              "varying",
+              "texture"
+            ],
+            "longest_path_cycles": [
+              0.25,
+              0.234375,
+              0.25,
+              0.0,
+              0.0,
+              0.25,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "varying"
+            ],
+            "shortest_path_cycles": [
+              0.140625,
+              0.140625,
+              0.140625,
+              0.0,
+              0.0,
+              0.25,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "total_cycles": [
+              0.34375,
+              0.265625,
+              0.34375,
+              0.0,
+              0.0,
+              0.25,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 16,
+          "work_registers_used": 7
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/linear_gradient_ssbo_fill.frag.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/linear_gradient_ssbo_fill.frag.vkspv",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 35,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              null
+            ],
+            "longest_path_cycles": [
+              null,
+              null,
+              null,
+              null,
+              null,
+              null,
+              null
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arith_total",
+              "arith_sfu"
+            ],
+            "shortest_path_cycles": [
+              0.5625,
+              0.203125,
+              0.265625,
+              0.5625,
+              0.0,
+              0.25,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.75,
+              0.421875,
+              0.75,
+              0.625,
+              4.0,
+              0.25,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 24,
+          "work_registers_used": 17
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/linear_to_srgb_filter.frag.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/linear_to_srgb_filter.frag.vkspv",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 20,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arith_total",
+              "arith_sfu"
+            ],
+            "longest_path_cycles": [
+              0.4375,
+              0.296875,
+              0.359375,
+              0.4375,
+              0.0,
+              0.25,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "varying",
+              "texture"
+            ],
+            "shortest_path_cycles": [
+              0.234375,
+              0.203125,
+              0.234375,
+              0.1875,
+              0.0,
+              0.25,
+              0.25
+            ],
+            "total_bound_pipelines": [
+              "arith_total",
+              "arith_sfu"
+            ],
+            "total_cycles": [
+              0.4375,
+              0.328125,
+              0.359375,
+              0.4375,
+              0.0,
+              0.25,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 10,
+          "work_registers_used": 12
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/linear_to_srgb_filter.vert.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/linear_to_srgb_filter.vert.vkspv",
+      "has_uniform_computation": true,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 30,
+          "work_registers_used": 32
+        },
+        "Varying": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 22,
+          "work_registers_used": 8
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/morphology_filter.frag.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/morphology_filter.frag.vkspv",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 44,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              null
+            ],
+            "longest_path_cycles": [
+              null,
+              null,
+              null,
+              null,
+              null,
+              null,
+              null
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "shortest_path_cycles": [
+              0.109375,
+              0.0,
+              0.109375,
+              0.0,
+              0.0,
+              0.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "total_cycles": [
+              0.265625,
+              0.046875,
+              0.265625,
+              0.0,
+              0.0,
+              0.25,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 8,
+          "work_registers_used": 11
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/morphology_filter.vert.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/morphology_filter.vert.vkspv",
+      "has_uniform_computation": true,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 30,
+          "work_registers_used": 32
+        },
+        "Varying": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 22,
+          "work_registers_used": 8
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/points.comp.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/points.comp.vkspv",
+      "has_uniform_computation": true,
+      "type": "Compute",
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              null
+            ],
+            "longest_path_cycles": [
+              null,
+              null,
+              null,
+              null,
+              null,
+              null
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "shortest_path_cycles": [
+              0.046875,
+              0.0,
+              0.046875,
+              0.0,
+              0.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.296875,
+              0.296875,
+              0.28125,
+              0.1875,
+              5.0,
+              0.0
+            ]
+          },
+          "shared_storage_used": 0,
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 20,
+          "work_registers_used": 16
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/porter_duff_blend.frag.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/porter_duff_blend.frag.vkspv",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 100,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "varying"
+            ],
+            "longest_path_cycles": [
+              0.21875,
+              0.21875,
+              0.0,
+              0.0,
+              0.0,
+              0.5,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "varying"
+            ],
+            "shortest_path_cycles": [
+              0.21875,
+              0.21875,
+              0.0,
+              0.0,
+              0.0,
+              0.5,
+              0.25
+            ],
+            "total_bound_pipelines": [
+              "varying"
+            ],
+            "total_cycles": [
+              0.21875,
+              0.21875,
+              0.0,
+              0.0,
+              0.0,
+              0.5,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 14,
+          "work_registers_used": 11
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/porter_duff_blend.vert.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/porter_duff_blend.vert.vkspv",
+      "has_uniform_computation": true,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 30,
+          "work_registers_used": 32
+        },
+        "Varying": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              5.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              5.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              5.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 22,
+          "work_registers_used": 10
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/position_color.vert.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/position_color.vert.vkspv",
+      "has_uniform_computation": true,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 28,
+          "work_registers_used": 32
+        },
+        "Varying": {
+          "fp16_arithmetic": null,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.0,
+              0.0,
+              0.0,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.0,
+              0.0,
+              0.0,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.0,
+              0.0,
+              0.0,
+              0.0,
+              3.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 20,
+          "work_registers_used": 9
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/radial_gradient_fill.frag.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/radial_gradient_fill.frag.vkspv",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 64,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "longest_path_cycles": [
+              0.28125,
+              0.25,
+              0.28125,
+              0.0625,
+              0.0,
+              0.25,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "varying"
+            ],
+            "shortest_path_cycles": [
+              0.171875,
+              0.15625,
+              0.171875,
+              0.0625,
+              0.0,
+              0.25,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "total_cycles": [
+              0.375,
+              0.28125,
+              0.375,
+              0.0625,
+              0.0,
+              0.25,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 16,
+          "work_registers_used": 7
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/radial_gradient_ssbo_fill.frag.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/radial_gradient_ssbo_fill.frag.vkspv",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 54,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              null
+            ],
+            "longest_path_cycles": [
+              null,
+              null,
+              null,
+              null,
+              null,
+              null,
+              null
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arith_total",
+              "arith_sfu"
+            ],
+            "shortest_path_cycles": [
+              0.5625,
+              0.21875,
+              0.28125,
+              0.5625,
+              0.0,
+              0.25,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.71875,
+              0.421875,
+              0.71875,
+              0.625,
+              4.0,
+              0.25,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 22,
+          "work_registers_used": 17
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/rrect_blur.frag.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/rrect_blur.frag.vkspv",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arith_total",
+              "arith_fma"
+            ],
+            "longest_path_cycles": [
+              1.65625,
+              1.65625,
+              0.421875,
+              1.5,
+              0.0,
+              0.25,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arith_total",
+              "arith_fma"
+            ],
+            "shortest_path_cycles": [
+              1.65625,
+              1.65625,
+              0.421875,
+              1.5,
+              0.0,
+              0.25,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "arith_total",
+              "arith_fma"
+            ],
+            "total_cycles": [
+              1.65625,
+              1.65625,
+              0.421875,
+              1.5,
+              0.0,
+              0.25,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 22,
+          "work_registers_used": 32
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/rrect_blur.vert.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/rrect_blur.vert.vkspv",
+      "has_uniform_computation": true,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 28,
+          "work_registers_used": 32
+        },
+        "Varying": {
+          "fp16_arithmetic": null,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.0,
+              0.0,
+              0.0,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.0,
+              0.0,
+              0.0,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.0,
+              0.0,
+              0.0,
+              0.0,
+              3.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 20,
+          "work_registers_used": 7
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/runtime_effect.vert.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/runtime_effect.vert.vkspv",
+      "has_uniform_computation": true,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 28,
+          "work_registers_used": 32
+        },
+        "Varying": {
+          "fp16_arithmetic": null,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.0,
+              0.0,
+              0.0,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.0,
+              0.0,
+              0.0,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.0,
+              0.0,
+              0.0,
+              0.0,
+              3.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 20,
+          "work_registers_used": 7
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/solid_fill.frag.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/solid_fill.frag.vkspv",
+      "has_side_effects": false,
+      "has_uniform_computation": false,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": null,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "varying"
+            ],
+            "longest_path_cycles": [
+              0.0,
+              0.0,
+              0.0,
+              0.0,
+              0.0,
+              0.25,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "varying"
+            ],
+            "shortest_path_cycles": [
+              0.0,
+              0.0,
+              0.0,
+              0.0,
+              0.0,
+              0.25,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "varying"
+            ],
+            "total_cycles": [
+              0.0,
+              0.0,
+              0.0,
+              0.0,
+              0.0,
+              0.25,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 0,
+          "work_registers_used": 3
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/solid_fill.vert.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/solid_fill.vert.vkspv",
+      "has_uniform_computation": true,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 32,
+          "work_registers_used": 32
+        },
+        "Varying": {
+          "fp16_arithmetic": null,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.0625,
+              0.0,
+              0.0625,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.0625,
+              0.0,
+              0.0625,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.0625,
+              0.0,
+              0.0625,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 24,
+          "work_registers_used": 7
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/srgb_to_linear_filter.frag.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/srgb_to_linear_filter.frag.vkspv",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 20,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arith_total",
+              "arith_sfu"
+            ],
+            "longest_path_cycles": [
+              0.4375,
+              0.28125,
+              0.390625,
+              0.4375,
+              0.0,
+              0.25,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "varying",
+              "texture"
+            ],
+            "shortest_path_cycles": [
+              0.15625,
+              0.140625,
+              0.15625,
+              0.0625,
+              0.0,
+              0.25,
+              0.25
+            ],
+            "total_bound_pipelines": [
+              "arith_total",
+              "arith_sfu"
+            ],
+            "total_cycles": [
+              0.4375,
+              0.328125,
+              0.390625,
+              0.4375,
+              0.0,
+              0.25,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 10,
+          "work_registers_used": 9
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/srgb_to_linear_filter.vert.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/srgb_to_linear_filter.vert.vkspv",
+      "has_uniform_computation": true,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 30,
+          "work_registers_used": 32
+        },
+        "Varying": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 22,
+          "work_registers_used": 8
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/sweep_gradient_fill.frag.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/sweep_gradient_fill.frag.vkspv",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 34,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arith_total",
+              "arith_fma"
+            ],
+            "longest_path_cycles": [
+              0.421875,
+              0.421875,
+              0.3125,
+              0.25,
+              0.0,
+              0.25,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arith_total",
+              "arith_fma"
+            ],
+            "shortest_path_cycles": [
+              0.328125,
+              0.328125,
+              0.203125,
+              0.25,
+              0.0,
+              0.25,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "arith_total",
+              "arith_fma"
+            ],
+            "total_cycles": [
+              0.453125,
+              0.453125,
+              0.40625,
+              0.25,
+              0.0,
+              0.25,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 20,
+          "work_registers_used": 13
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/sweep_gradient_ssbo_fill.frag.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/sweep_gradient_ssbo_fill.frag.vkspv",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              null
+            ],
+            "longest_path_cycles": [
+              null,
+              null,
+              null,
+              null,
+              null,
+              null,
+              null
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arith_total",
+              "arith_sfu"
+            ],
+            "shortest_path_cycles": [
+              0.8125,
+              0.421875,
+              0.328125,
+              0.8125,
+              0.0,
+              0.25,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.875,
+              0.6875,
+              0.762499988079071,
+              0.875,
+              4.0,
+              0.25,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 26,
+          "work_registers_used": 20
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/texture_fill.frag.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/texture_fill.frag.vkspv",
+      "has_side_effects": false,
+      "has_uniform_computation": false,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 100,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "varying"
+            ],
+            "longest_path_cycles": [
+              0.03125,
+              0.03125,
+              0.015625,
+              0.0,
+              0.0,
+              0.375,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "varying"
+            ],
+            "shortest_path_cycles": [
+              0.03125,
+              0.03125,
+              0.015625,
+              0.0,
+              0.0,
+              0.375,
+              0.25
+            ],
+            "total_bound_pipelines": [
+              "varying"
+            ],
+            "total_cycles": [
+              0.03125,
+              0.03125,
+              0.015625,
+              0.0,
+              0.0,
+              0.375,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 2,
+          "work_registers_used": 6
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/texture_fill.vert.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/texture_fill.vert.vkspv",
+      "has_uniform_computation": true,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 30,
+          "work_registers_used": 32
+        },
+        "Varying": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.046875,
+              0.015625,
+              0.046875,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.046875,
+              0.015625,
+              0.046875,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.046875,
+              0.015625,
+              0.046875,
+              0.0,
+              3.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 22,
+          "work_registers_used": 10
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/texture_fill_external.frag.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/texture_fill_external.frag.vkspv",
+      "has_side_effects": false,
+      "has_uniform_computation": false,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "varying"
+            ],
+            "longest_path_cycles": [
+              0.0625,
+              0.0625,
+              0.0,
+              0.0,
+              0.0,
+              0.375,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "varying"
+            ],
+            "shortest_path_cycles": [
+              0.0625,
+              0.0625,
+              0.0,
+              0.0,
+              0.0,
+              0.375,
+              0.25
+            ],
+            "total_bound_pipelines": [
+              "varying"
+            ],
+            "total_cycles": [
+              0.0625,
+              0.0625,
+              0.0,
+              0.0,
+              0.0,
+              0.375,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 4,
+          "work_registers_used": 10
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/texture_fill_strict_src.frag.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/texture_fill_strict_src.frag.vkspv",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 33,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "varying"
+            ],
+            "longest_path_cycles": [
+              0.078125,
+              0.03125,
+              0.078125,
+              0.0,
+              0.0,
+              0.375,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "varying"
+            ],
+            "shortest_path_cycles": [
+              0.078125,
+              0.03125,
+              0.078125,
+              0.0,
+              0.0,
+              0.375,
+              0.25
+            ],
+            "total_bound_pipelines": [
+              "varying"
+            ],
+            "total_cycles": [
+              0.078125,
+              0.03125,
+              0.078125,
+              0.0,
+              0.0,
+              0.375,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 6,
+          "work_registers_used": 6
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/tiled_texture_fill.frag.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/tiled_texture_fill.frag.vkspv",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 33,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "varying"
+            ],
+            "longest_path_cycles": [
+              0.25,
+              0.03125,
+              0.25,
+              0.0625,
+              0.0,
+              0.375,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "varying"
+            ],
+            "shortest_path_cycles": [
+              0.140625,
+              0.03125,
+              0.140625,
+              0.0625,
+              0.0,
+              0.375,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "varying"
+            ],
+            "total_cycles": [
+              0.25,
+              0.03125,
+              0.25,
+              0.0625,
+              0.0,
+              0.375,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 4,
+          "work_registers_used": 8
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/tiled_texture_fill_external.frag.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/tiled_texture_fill_external.frag.vkspv",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 100,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "longest_path_cycles": [
+              0.328125,
+              0.1875,
+              0.328125,
+              0.0,
+              0.0,
+              0.25,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "varying"
+            ],
+            "shortest_path_cycles": [
+              0.109375,
+              0.03125,
+              0.109375,
+              0.0,
+              0.0,
+              0.25,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "total_cycles": [
+              0.390625,
+              0.21875,
+              0.390625,
+              0.0,
+              0.0,
+              0.25,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 6,
+          "work_registers_used": 7
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/uv.comp.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/uv.comp.vkspv",
+      "has_uniform_computation": true,
+      "type": "Compute",
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.1875,
+              0.1875,
+              0.125,
+              0.0625,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "shortest_path_cycles": [
+              0.046875,
+              0.0,
+              0.046875,
+              0.0,
+              0.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.1875,
+              0.1875,
+              0.125,
+              0.0625,
+              2.0,
+              0.0
+            ]
+          },
+          "shared_storage_used": 0,
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 24,
+          "work_registers_used": 10
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/vertices.frag.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/vertices.frag.vkspv",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 100,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "varying"
+            ],
+            "longest_path_cycles": [
+              0.03125,
+              0.03125,
+              0.0,
+              0.0,
+              0.0,
+              0.25,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "varying"
+            ],
+            "shortest_path_cycles": [
+              0.03125,
+              0.03125,
+              0.0,
+              0.0,
+              0.0,
+              0.25,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "varying"
+            ],
+            "total_cycles": [
+              0.03125,
+              0.03125,
+              0.0,
+              0.0,
+              0.0,
+              0.25,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 2,
+          "work_registers_used": 4
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/yuv_to_rgb_filter.frag.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/yuv_to_rgb_filter.frag.vkspv",
+      "has_side_effects": false,
+      "has_uniform_computation": true,
+      "modifies_coverage": false,
+      "reads_color_buffer": false,
+      "type": "Fragment",
+      "uses_late_zs_test": false,
+      "uses_late_zs_update": false,
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 100,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "varying",
+              "texture"
+            ],
+            "longest_path_cycles": [
+              0.15625,
+              0.15625,
+              0.0,
+              0.0,
+              0.0,
+              0.25,
+              0.25
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "varying",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "varying",
+              "texture"
+            ],
+            "shortest_path_cycles": [
+              0.15625,
+              0.15625,
+              0.0,
+              0.0,
+              0.0,
+              0.25,
+              0.25
+            ],
+            "total_bound_pipelines": [
+              "varying",
+              "texture"
+            ],
+            "total_cycles": [
+              0.15625,
+              0.15625,
+              0.0,
+              0.0,
+              0.0,
+              0.25,
+              0.25
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 12,
+          "work_registers_used": 6
+        }
+      }
+    }
+  },
+  "flutter/impeller/entity/yuv_to_rgb_filter.vert.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/entity/yuv_to_rgb_filter.vert.vkspv",
+      "has_uniform_computation": true,
+      "type": "Vertex",
+      "variants": {
+        "Position": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.125,
+              0.125,
+              0.0,
+              0.0,
+              2.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 30,
+          "work_registers_used": 32
+        },
+        "Varying": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.015625,
+              0.015625,
+              0.015625,
+              0.0,
+              3.0,
+              0.0
+            ]
+          },
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 22,
+          "work_registers_used": 8
+        }
+      }
+    }
+  },
+  "flutter/impeller/renderer/path_polyline.comp.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/renderer/path_polyline.comp.vkspv",
+      "has_uniform_computation": true,
+      "type": "Compute",
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              null
+            ],
+            "longest_path_cycles": [
+              null,
+              null,
+              null,
+              null,
+              null,
+              null
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.609375,
+              0.0,
+              0.609375,
+              0.3125,
+              4.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              5.9375,
+              2.737499952316284,
+              4.987500190734863,
+              5.9375,
+              37.20000076293945,
+              0.0
+            ]
+          },
+          "shared_storage_used": 12288,
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 50,
+          "uniform_registers_used": 32,
+          "work_registers_used": 51
+        }
+      }
+    }
+  },
+  "flutter/impeller/renderer/prefix_sum_test.comp.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/renderer/prefix_sum_test.comp.vkspv",
+      "has_uniform_computation": true,
+      "type": "Compute",
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": null,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              2.450000047683716,
+              0.0,
+              2.450000047683716,
+              1.0,
+              72.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "shortest_path_cycles": [
+              0.762499988079071,
+              0.0,
+              0.762499988079071,
+              0.0,
+              0.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              2.46875,
+              0.0,
+              2.46875,
+              1.0,
+              72.0,
+              0.0
+            ]
+          },
+          "shared_storage_used": 4096,
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 8,
+          "work_registers_used": 18
+        }
+      }
+    }
+  },
+  "flutter/impeller/renderer/stroke.comp.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/renderer/stroke.comp.vkspv",
+      "has_uniform_computation": true,
+      "type": "Compute",
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": 0,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.3125,
+              0.3125,
+              0.1875,
+              0.125,
+              7.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "arith_total",
+              "arith_cvt"
+            ],
+            "shortest_path_cycles": [
+              0.0625,
+              0.0,
+              0.0625,
+              0.0,
+              0.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.3125,
+              0.3125,
+              0.1875,
+              0.125,
+              7.0,
+              0.0
+            ]
+          },
+          "shared_storage_used": 0,
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 10,
+          "work_registers_used": 24
+        }
+      }
+    }
+  },
+  "flutter/impeller/renderer/threadgroup_sizing_test.comp.vkspv": {
+    "Mali-G78": {
+      "core": "Mali-G78",
+      "filename": "flutter/impeller/renderer/threadgroup_sizing_test.comp.vkspv",
+      "has_uniform_computation": true,
+      "type": "Compute",
+      "variants": {
+        "Main": {
+          "fp16_arithmetic": null,
+          "has_stack_spilling": false,
+          "performance": {
+            "longest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "longest_path_cycles": [
+              0.03125,
+              0.0,
+              0.03125,
+              0.0,
+              1.0,
+              0.0
+            ],
+            "pipelines": [
+              "arith_total",
+              "arith_fma",
+              "arith_cvt",
+              "arith_sfu",
+              "load_store",
+              "texture"
+            ],
+            "shortest_path_bound_pipelines": [
+              "load_store"
+            ],
+            "shortest_path_cycles": [
+              0.03125,
+              0.0,
+              0.03125,
+              0.0,
+              1.0,
+              0.0
+            ],
+            "total_bound_pipelines": [
+              "load_store"
+            ],
+            "total_cycles": [
+              0.03125,
+              0.0,
+              0.03125,
+              0.0,
+              1.0,
+              0.0
+            ]
+          },
+          "shared_storage_used": 0,
+          "stack_spill_bytes": 0,
+          "thread_occupancy": 100,
+          "uniform_registers_used": 2,
+          "work_registers_used": 4
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/impeller/tools/malioc_cores.py b/impeller/tools/malioc_cores.py
new file mode 100755
index 0000000000000000000000000000000000000000..9bd364ec1f6f4fe1ea86856a830ca84cef5bc025
--- /dev/null
+++ b/impeller/tools/malioc_cores.py
@@ -0,0 +1,101 @@
+#!/usr/bin/env vpython3
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import argparse
+import json
+import os
+import subprocess
+import sys
+
+# This script parses the JSON output produced by malioc about GPU cores,
+# and outputs it in a form that can be consumed by GN
+
+
+def parse_args(argv):
+  parser = argparse.ArgumentParser(
+      description='This script sanitizes GPU core info output from malioc',
+  )
+  parser.add_argument(
+      '--malioc',
+      '-m',
+      type=str,
+      help='The path to malioc.',
+  )
+  parser.add_argument(
+      '--output',
+      '-o',
+      type=str,
+      help='The output path.',
+  )
+  return parser.parse_args(argv)
+
+
+def validate_args(args):
+  if not args.malioc or not os.path.isfile(args.malioc):
+    print('The --malioc argument must refer to the malioc binary.')
+    return False
+  return True
+
+
+def malioc_core_list(malioc):
+  malioc_cores = subprocess.check_output(
+      [malioc, '--list', '--format', 'json'],
+      stderr=subprocess.STDOUT,
+  )
+  cores_json = json.loads(malioc_cores)
+  cores = []
+  for core in cores_json['cores']:
+    cores.append(core['core'])
+  return cores
+
+
+def malioc_core_info(malioc, core):
+  malioc_info = subprocess.check_output(
+      [malioc, '--info', '--core', core, '--format', 'json'],
+      stderr=subprocess.STDOUT,
+  )
+  info_json = json.loads(malioc_info)
+
+  apis = info_json['apis']
+
+  opengles_max_version = 0
+  if 'opengles' in apis:
+    opengles = apis['opengles']
+    if opengles['max_version'] is not None:
+      opengles_max_version = opengles['max_version']
+  vulkan_max_version = 0
+  if 'vulkan' in apis:
+    vulkan = apis['vulkan']
+    if vulkan['max_version'] is not None:
+      vulkan_max_version = int(vulkan['max_version'] * 100)
+
+  info = {
+      'core': core,
+      'opengles_max_version': opengles_max_version,
+      'vulkan_max_version': vulkan_max_version,
+  }
+  return info
+
+
+def main(argv):
+  args = parse_args(argv[1:])
+  if not validate_args(args):
+    return 1
+
+  infos = []
+  for core in malioc_core_list(args.malioc):
+    infos.append(malioc_core_info(args.malioc, core))
+
+  if args.output:
+    with open(args.output, 'w') as file:
+      json.dump(infos, file, sort_keys=True)
+  else:
+    print(infos)
+
+  return 0
+
+
+if __name__ == '__main__':
+  sys.exit(main(sys.argv))
diff --git a/impeller/tools/malioc_diff.py b/impeller/tools/malioc_diff.py
new file mode 100755
index 0000000000000000000000000000000000000000..7df66e5190c599129ecb949b68e8a4cf6114ca9c
--- /dev/null
+++ b/impeller/tools/malioc_diff.py
@@ -0,0 +1,357 @@
+#!/usr/bin/env vpython3
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import argparse
+import difflib
+import json
+import os
+import sys
+
+# This script detects performance impacting changes to shaders.
+#
+# When the GN build is configured with the path to the `malioc` tool, the
+# results of its analysis will be placed under `out/$CONFIG/gen/malioc` in
+# separate .json files. That path should be supplied to this script as the
+# `--after` argument. This script compares those results against previous
+# results in a golden file checked in to the tree under
+# `flutter/impeller/tools/malioc.json`. That file should be passed to this
+# script as the `--before` argument. To create or update the golden file,
+# passing the `--update` flag will cause the data from the `--after` path to
+# overwrite the file at the `--before` path.
+#
+# Configure and build:
+# $ flutter/tools/gn --malioc-path path/to/malioc
+# $ ninja -C out/host_debug
+#
+# Analyze
+# $ flutter/impeller/tools/malioc_diff.py \
+#   --before flutter/impeller/tools/malioc.json \
+#   --after out/host_debug/gen/malioc
+#
+# If there are differences between before and after, whether positive or
+# negative, the exit code for this script will be 1, and 0 otherwise.
+
+SRC_ROOT = os.path.dirname(
+    os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+)
+
+CORES = [
+    'Mali-G78',  # Pixel 6 / 2020
+    'Mali-T880',  # 2016
+]
+
+# Path to the engine root checkout. This is used to calculate absolute
+# paths if relative ones are passed to the script.
+BUILD_ROOT_DIR = os.path.abspath(os.path.join(os.path.realpath(__file__), '..', '..', '..', '..'))
+
+
+def parse_args(argv):
+  parser = argparse.ArgumentParser(
+      description='A script that compares before/after malioc analysis results',
+  )
+  parser.add_argument(
+      '--after',
+      '-a',
+      type=str,
+      help='The path to a directory tree containing new malioc results in json files.',
+  )
+  parser.add_argument(
+      '--before',
+      '-b',
+      type=str,
+      help='The path to a json file containing existing malioc results.',
+  )
+  parser.add_argument(
+      '--after-relative-to-src',
+      type=str,
+      help=(
+          'A relative path calculated from the engine src directory to '
+          'a directory tree containing new malioc results in json files'
+      ),
+  )
+  parser.add_argument(
+      '--before-relative-to-src',
+      type=str,
+      help=(
+          'A relative path calculated from the engine src directory to '
+          'a json file containing existing malioc results in json files'
+      ),
+  )
+  parser.add_argument(
+      '--print-diff',
+      '-p',
+      default=False,
+      action='store_true',
+      help='Print a unified diff to stdout when differences are found.',
+  )
+  parser.add_argument(
+      '--update',
+      '-u',
+      default=False,
+      action='store_true',
+      help='Write results from the --after tree to the --before file.',
+  )
+  parser.add_argument(
+      '--verbose',
+      '-v',
+      default=False,
+      action='store_true',
+      help='Emit verbose output.',
+  )
+  return parser.parse_args(argv)
+
+
+def validate_args(args):
+  if not args.after and not args.after_relative_to_src:
+    print('--after argument or --after-relative-to-src must be specified.')
+    return False
+
+  if not args.before and not args.before_relative_to_src:
+    print('--before argument or --before-relative-to-src must be specified.')
+    return False
+
+  # Generate full paths if relative ones are provided with before and
+  # after taking precedence.
+  args.before = (args.before or os.path.join(BUILD_ROOT_DIR, args.before_relative_to_src))
+  args.after = (args.after or os.path.join(BUILD_ROOT_DIR, args.after_relative_to_src))
+
+  if not args.after or not os.path.isdir(args.after):
+    print('The --after argument must refer to a directory.')
+    return False
+  if not args.before or (not args.update and not os.path.isfile(args.before)):
+    print('The --before argument must refer to an existing file.')
+    return False
+  return True
+
+
+# Reads the 'performance' section of the malioc analysis results.
+def read_malioc_file_performance(performance_json):
+  performance = {}
+  performance['pipelines'] = performance_json['pipelines']
+
+  longest_path_cycles = performance_json['longest_path_cycles']
+  performance['longest_path_cycles'] = longest_path_cycles['cycle_count']
+  performance['longest_path_bound_pipelines'] = longest_path_cycles['bound_pipelines']
+
+  shortest_path_cycles = performance_json['shortest_path_cycles']
+  performance['shortest_path_cycles'] = shortest_path_cycles['cycle_count']
+  performance['shortest_path_bound_pipelines'] = shortest_path_cycles['bound_pipelines']
+
+  total_cycles = performance_json['total_cycles']
+  performance['total_cycles'] = total_cycles['cycle_count']
+  performance['total_bound_pipelines'] = total_cycles['bound_pipelines']
+  return performance
+
+
+# Parses the json output from malioc, which follows the schema defined in
+# `mali_offline_compiler/samples/json_schemas/performance-schema.json`.
+def read_malioc_file(malioc_tree, json_file):
+  with open(json_file, 'r') as file:
+    json_obj = json.load(file)
+
+  build_gen_dir = os.path.dirname(malioc_tree)
+
+  results = []
+  for shader in json_obj['shaders']:
+    # Ignore cores not in the allowlist above.
+    if shader['hardware']['core'] not in CORES:
+      continue
+    result = {}
+    filename = os.path.relpath(shader['filename'], build_gen_dir)
+    if filename.startswith('../..'):
+      filename = filename[6:]
+    if filename.startswith('../'):
+      filename = filename[3:]
+    result['filename'] = filename
+    result['core'] = shader['hardware']['core']
+    result['type'] = shader['shader']['type']
+    for prop in shader['properties']:
+      result[prop['name']] = prop['value']
+
+    result['variants'] = {}
+    for variant in shader['variants']:
+      variant_result = {}
+      for prop in variant['properties']:
+        variant_result[prop['name']] = prop['value']
+
+      performance_json = variant['performance']
+      performance = read_malioc_file_performance(performance_json)
+      variant_result['performance'] = performance
+      result['variants'][variant['name']] = variant_result
+    results.append(result)
+
+  return results
+
+
+# Parses a tree of malioc performance json files.
+#
+# The parsing results are returned in a map keyed by the shader file name, whose
+# values are maps keyed by the core type. The values in these maps are the
+# performance properties of the shader on the core reported by malioc. This
+# structure allows for a fast lookup and comparison against the golen file.
+def read_malioc_tree(malioc_tree):
+  results = {}
+  for root, _, files in os.walk(malioc_tree):
+    for file in files:
+      if not file.endswith('.json'):
+        continue
+      full_path = os.path.join(root, file)
+      for shader in read_malioc_file(malioc_tree, full_path):
+        if shader['filename'] not in results:
+          results[shader['filename']] = {}
+        results[shader['filename']][shader['core']] = shader
+  return results
+
+
+# Converts a list to a string in which each list element is left-aligned in
+# a space of `width` characters, and separated by `sep`. The separator does not
+# count against the `width`. If `width` is 0, then the width is unconstrained.
+def pretty_list(lst, fmt='s', sep='', width=12):
+  formats = ['{:<{width}{fmt}}' if ele is not None else '{:<{width}s}' for ele in lst]
+  sanitized_list = [x if x is not None else 'null' for x in lst]
+  return (sep.join(formats)).format(width='' if width == 0 else width, fmt=fmt, *sanitized_list)
+
+
+def compare_performance(variant, before, after):
+  cycles = [['longest_path_cycles', 'longest_path_bound_pipelines'],
+            ['shortest_path_cycles', 'shortest_path_bound_pipelines'],
+            ['total_cycles', 'total_bound_pipelines']]
+  differences = []
+  for cycle in cycles:
+    if before[cycle[0]] == after[cycle[0]]:
+      continue
+    before_cycles = before[cycle[0]]
+    before_bounds = before[cycle[1]]
+    after_cycles = after[cycle[0]]
+    after_bounds = after[cycle[1]]
+    differences += [
+        '{} in variant {}\n{}{}\n{:<8}{}{}\n{:<8}{}{}\n'.format(
+            cycle[0],
+            variant,
+            ' ' * 8,
+            pretty_list(before['pipelines'] + ['bound']),  # Column labels.
+            'before',
+            pretty_list(before_cycles, fmt='f'),
+            pretty_list(before_bounds, sep=',', width=0),
+            'after',
+            pretty_list(after_cycles, fmt='f'),
+            pretty_list(after_bounds, sep=',', width=0),
+        )
+    ]
+  return differences
+
+
+def compare_variants(befores, afters):
+  differences = []
+  for variant_name, before_variant in befores.items():
+    after_variant = afters[variant_name]
+    for variant_key, before_variant_val in before_variant.items():
+      after_variant_val = after_variant[variant_key]
+      if variant_key == 'performance':
+        differences += compare_performance(variant_name, before_variant_val, after_variant_val)
+      elif before_variant_val != after_variant_val:
+        differences += [
+            'In variant {}:\n  {vkey}: {} <- before\n  {vkey}: {} <- after'.format(
+                variant_name,
+                before_variant_val,
+                after_variant_val,
+                vkey=variant_key,
+            )
+        ]
+  return differences
+
+
+# Compares two shaders. Prints a report and returns True if there are
+# differences, and returns False otherwise.
+def compare_shaders(malioc_tree, before_shader, after_shader):
+  differences = []
+  for key, before_val in before_shader.items():
+    after_val = after_shader[key]
+    if key == 'variants':
+      differences += compare_variants(before_val, after_val)
+    elif key == 'performance':
+      differences += compare_performance('Default', before_val, after_val)
+    elif before_val != after_val:
+      differences += ['{}:\n  {} <- before\n  {} <- after'.format(key, before_val, after_val)]
+
+  if bool(differences):
+    build_gen_dir = os.path.dirname(malioc_tree)
+    filename = before_shader['filename']
+    core = before_shader['core']
+    typ = before_shader['type']
+    print('Changes found in shader {} on core {}:'.format(filename, core))
+    for diff in differences:
+      print(diff)
+    print(
+        '\nFor a full report, run:\n  $ malioc --{} --core {} {}/{}\n'.format(
+            typ.lower(), core, build_gen_dir, filename
+        )
+    )
+
+  return bool(differences)
+
+
+def main(argv):
+  args = parse_args(argv[1:])
+  if not validate_args(args):
+    return 1
+
+  after_json = read_malioc_tree(args.after)
+  if not bool(after_json):
+    print('Did not find any malioc results under {}.'.format(args.after))
+    return 1
+
+  if args.update:
+    # Write the new results to the file given by --before, then exit.
+    with open(args.before, 'w') as file:
+      json.dump(after_json, file, sort_keys=True, indent=2)
+    return 0
+
+  with open(args.before, 'r') as file:
+    before_json = json.load(file)
+
+  changed = False
+  for filename, shaders in before_json.items():
+    if filename not in after_json.keys():
+      print('Shader "{}" has been removed.'.format(filename))
+      changed = True
+      continue
+    for core, before_shader in shaders.items():
+      if core not in after_json[filename].keys():
+        continue
+      after_shader = after_json[filename][core]
+      if compare_shaders(args.after, before_shader, after_shader):
+        changed = True
+
+  for filename, shaders in after_json.items():
+    if filename not in before_json:
+      print('Shader "{}" is new.'.format(filename))
+      changed = True
+
+  if changed:
+    print(
+        'There are new shaders, shaders have been removed, or performance '
+        'changes to existing shaders. The golden file must be updated after a '
+        'build of android_debug_unopt using the --malioc-path flag to the '
+        'flutter/tools/gn script.\n\n'
+        '$ ./flutter/impeller/tools/malioc_diff.py --before {} --after {} --update'.format(
+            args.before, args.after
+        )
+    )
+    if args.print_diff:
+      before_lines = json.dumps(before_json, sort_keys=True, indent=2).splitlines(keepends=True)
+      after_lines = json.dumps(after_json, sort_keys=True, indent=2).splitlines(keepends=True)
+      before_path = os.path.relpath(os.path.abspath(args.before), start=SRC_ROOT)
+      diff = difflib.unified_diff(before_lines, after_lines, fromfile=before_path)
+      print('\nYou can alternately apply the diff below:')
+      print('patch -p0 <<DONE')
+      print(*diff, sep='')
+      print('DONE')
+
+  return 1 if changed else 0
+
+
+if __name__ == '__main__':
+  sys.exit(main(sys.argv))
diff --git a/impeller/tools/xxd.py b/impeller/tools/xxd.py
index 6a922103925bd4858c38b029d2bc169507c5e9a2..53e1dfc56a73e0b990189325f08a09e4783f4fd9 100644
--- a/impeller/tools/xxd.py
+++ b/impeller/tools/xxd.py
@@ -22,10 +22,7 @@ def make_directories(path):
 def main():
   parser = argparse.ArgumentParser()
   parser.add_argument(
-      '--symbol-name',
-      type=str,
-      required=True,
-      help='The name of the symbol referencing the data.'
+      '--symbol-name', type=str, required=True, help='The name of the symbol referencing the data.'
   )
   parser.add_argument(
       '--output-header',
@@ -34,10 +31,7 @@ def main():
       help='The header file containing the symbol reference.'
   )
   parser.add_argument(
-      '--output-source',
-      type=str,
-      required=True,
-      help='The source file containing the file bytes.'
+      '--output-source', type=str, required=True, help='The source file containing the file bytes.'
   )
   parser.add_argument(
       '--source',
@@ -60,7 +54,10 @@ def main():
   with open(args.source, 'rb') as source, open(output_source, 'w') as output:
     data_len = 0
     output.write(f'#include "{output_header_basename}"\n')
-    output.write(f'const unsigned char impeller_{args.symbol_name}_data[] =\n')
+    output.write('#include <cstddef>\n')
+    output.write(
+        f'alignas(std::max_align_t) const unsigned char impeller_{args.symbol_name}_data[] =\n'
+    )
     output.write('{\n')
     while True:
       byte = source.read(1)
@@ -69,9 +66,7 @@ def main():
       data_len += 1
       output.write(f'{ord(byte)},')
     output.write('};\n')
-    output.write(
-        f'const unsigned long impeller_{args.symbol_name}_length = {data_len};\n'
-    )
+    output.write(f'const unsigned long impeller_{args.symbol_name}_length = {data_len};\n')
 
   with open(output_header, 'w') as output:
     output.write('#pragma once\n')
@@ -79,12 +74,8 @@ def main():
     output.write('extern "C" {\n')
     output.write('#endif\n\n')
 
-    output.write(
-        f'extern const unsigned char impeller_{args.symbol_name}_data[];\n'
-    )
-    output.write(
-        f'extern const unsigned long impeller_{args.symbol_name}_length;\n\n'
-    )
+    output.write(f'extern const unsigned char impeller_{args.symbol_name}_data[];\n')
+    output.write(f'extern const unsigned long impeller_{args.symbol_name}_length;\n\n')
 
     output.write('#ifdef __cplusplus\n')
     output.write('}\n')
diff --git a/impeller/typographer/BUILD.gn b/impeller/typographer/BUILD.gn
index 761b9af1e618c7c9e034fb51e704d5f2280f689c..90789a87a4582ccd4608ab9b4078436e7695ebe4 100644
--- a/impeller/typographer/BUILD.gn
+++ b/impeller/typographer/BUILD.gn
@@ -6,12 +6,6 @@ import("//flutter/impeller/tools/impeller.gni")
 
 impeller_component("typographer") {
   sources = [
-    "backends/skia/text_frame_skia.cc",
-    "backends/skia/text_frame_skia.h",
-    "backends/skia/text_render_context_skia.cc",
-    "backends/skia/text_render_context_skia.h",
-    "backends/skia/typeface_skia.cc",
-    "backends/skia/typeface_skia.h",
     "font.cc",
     "font.h",
     "font_glyph_pair.cc",
@@ -22,21 +16,22 @@ impeller_component("typographer") {
     "glyph_atlas.h",
     "lazy_glyph_atlas.cc",
     "lazy_glyph_atlas.h",
+    "rectangle_packer.cc",
+    "rectangle_packer.h",
     "text_frame.cc",
     "text_frame.h",
-    "text_render_context.cc",
-    "text_render_context.h",
     "text_run.cc",
     "text_run.h",
     "typeface.cc",
     "typeface.h",
+    "typographer_context.cc",
+    "typographer_context.h",
   ]
 
   public_deps = [
     "../base",
     "../geometry",
     "../renderer",
-    "//third_party/skia",
   ]
 
   deps = [ "//flutter/fml" ]
@@ -48,7 +43,10 @@ impeller_component("typographer_unittests") {
   sources = [ "typographer_unittests.cc" ]
 
   deps = [
-    ":typographer",
     "../playground:playground_test",
+    "backends/skia:typographer_skia_backend",
+    "backends/stb:typographer_stb_backend",
+    "//flutter/display_list/testing:display_list_testing",
+    "//flutter/third_party/txt",
   ]
 }
diff --git a/impeller/typographer/backends/skia/BUILD.gn b/impeller/typographer/backends/skia/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..778df39e9907616eed13b21d8f6deff3fbc8e6a1
--- /dev/null
+++ b/impeller/typographer/backends/skia/BUILD.gn
@@ -0,0 +1,23 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//flutter/impeller/tools/impeller.gni")
+
+impeller_component("typographer_skia_backend") {
+  sources = [
+    "glyph_atlas_context_skia.cc",
+    "glyph_atlas_context_skia.h",
+    "text_frame_skia.cc",
+    "text_frame_skia.h",
+    "typeface_skia.cc",
+    "typeface_skia.h",
+    "typographer_context_skia.cc",
+    "typographer_context_skia.h",
+  ]
+
+  public_deps = [
+    "//flutter/impeller/typographer",
+    "//flutter/skia",
+  ]
+}
diff --git a/impeller/base/work_queue_common.cc b/impeller/typographer/backends/skia/glyph_atlas_context_skia.cc
similarity index 33%
rename from impeller/base/work_queue_common.cc
rename to impeller/typographer/backends/skia/glyph_atlas_context_skia.cc
index e23e95ad9e2f66a47bcc3b6c5fef73ef923156f0..78826736d81da644517a91fa1d041ce22cf1d927 100644
--- a/impeller/base/work_queue_common.cc
+++ b/impeller/typographer/backends/skia/glyph_atlas_context_skia.cc
@@ -2,24 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/base/work_queue_common.h"
+#include "impeller/typographer/backends/skia/glyph_atlas_context_skia.h"
+
+#include "third_party/skia/include/core/SkBitmap.h"
 
 namespace impeller {
 
-std::shared_ptr<WorkQueueCommon> WorkQueueCommon::Create() {
-  return std::shared_ptr<WorkQueueCommon>(new WorkQueueCommon());
-}
+GlyphAtlasContextSkia::GlyphAtlasContextSkia() = default;
 
-WorkQueueCommon::WorkQueueCommon()
-    : loop_(fml::ConcurrentMessageLoop::Create(2u)) {}
+GlyphAtlasContextSkia::~GlyphAtlasContextSkia() = default;
 
-WorkQueueCommon::~WorkQueueCommon() {
-  loop_->Terminate();
+std::shared_ptr<SkBitmap> GlyphAtlasContextSkia::GetBitmap() const {
+  return bitmap_;
 }
 
-// |WorkQueue|
-void WorkQueueCommon::PostTask(fml::closure task) {
-  loop_->GetTaskRunner()->PostTask(task);
+void GlyphAtlasContextSkia::UpdateBitmap(std::shared_ptr<SkBitmap> bitmap) {
+  bitmap_ = std::move(bitmap);
 }
 
 }  // namespace impeller
diff --git a/impeller/typographer/backends/skia/glyph_atlas_context_skia.h b/impeller/typographer/backends/skia/glyph_atlas_context_skia.h
new file mode 100644
index 0000000000000000000000000000000000000000..7f59eca6183c232f55695c6472c4e9ce873aa0d0
--- /dev/null
+++ b/impeller/typographer/backends/skia/glyph_atlas_context_skia.h
@@ -0,0 +1,42 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_TYPOGRAPHER_BACKENDS_SKIA_GLYPH_ATLAS_CONTEXT_SKIA_H_
+#define FLUTTER_IMPELLER_TYPOGRAPHER_BACKENDS_SKIA_GLYPH_ATLAS_CONTEXT_SKIA_H_
+
+#include "impeller/base/backend_cast.h"
+#include "impeller/typographer/glyph_atlas.h"
+
+class SkBitmap;
+
+namespace impeller {
+
+//------------------------------------------------------------------------------
+/// @brief      A container for caching a glyph atlas across frames.
+///
+class GlyphAtlasContextSkia
+    : public GlyphAtlasContext,
+      public BackendCast<GlyphAtlasContextSkia, GlyphAtlasContext> {
+ public:
+  GlyphAtlasContextSkia();
+
+  ~GlyphAtlasContextSkia() override;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Retrieve the previous (if any) SkBitmap instance.
+  std::shared_ptr<SkBitmap> GetBitmap() const;
+
+  void UpdateBitmap(std::shared_ptr<SkBitmap> bitmap);
+
+ private:
+  std::shared_ptr<SkBitmap> bitmap_;
+
+  GlyphAtlasContextSkia(const GlyphAtlasContextSkia&) = delete;
+
+  GlyphAtlasContextSkia& operator=(const GlyphAtlasContextSkia&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_TYPOGRAPHER_BACKENDS_SKIA_GLYPH_ATLAS_CONTEXT_SKIA_H_
diff --git a/impeller/typographer/backends/skia/text_frame_skia.cc b/impeller/typographer/backends/skia/text_frame_skia.cc
index e451695dc8b6dec4d18bbe3e1d20274b7dd085d9..d39e36ad2bd446bdfe26e5a785a12ef211a4b38c 100644
--- a/impeller/typographer/backends/skia/text_frame_skia.cc
+++ b/impeller/typographer/backends/skia/text_frame_skia.cc
@@ -8,7 +8,6 @@
 
 #include "flutter/fml/logging.h"
 #include "impeller/typographer/backends/skia/typeface_skia.h"
-#include "include/core/SkFontTypes.h"
 #include "include/core/SkRect.h"
 #include "third_party/skia/include/core/SkFont.h"
 #include "third_party/skia/include/core/SkFontMetrics.h"
@@ -17,15 +16,14 @@
 
 namespace impeller {
 
-static Font ToFont(const SkTextBlobRunIterator& run, Scalar scale) {
+static Font ToFont(const SkTextBlobRunIterator& run) {
   auto& font = run.font();
-  auto typeface = std::make_shared<TypefaceSkia>(font.refTypefaceOrDefault());
+  auto typeface = std::make_shared<TypefaceSkia>(font.refTypeface());
 
   SkFontMetrics sk_metrics;
   font.getMetrics(&sk_metrics);
 
   Font::Metrics metrics;
-  metrics.scale = scale;
   metrics.point_size = font.getSize();
   metrics.embolden = font.isEmbolden();
   metrics.skewX = font.getSkewX();
@@ -38,16 +36,13 @@ static Rect ToRect(const SkRect& rect) {
   return Rect::MakeLTRB(rect.fLeft, rect.fTop, rect.fRight, rect.fBottom);
 }
 
-TextFrame TextFrameFromTextBlob(const sk_sp<SkTextBlob>& blob, Scalar scale) {
-  if (!blob) {
-    return {};
-  }
-
-  TextFrame frame;
+static constexpr Scalar kScaleSize = 100000.0f;
 
+std::shared_ptr<TextFrame> MakeTextFrameFromTextBlobSkia(
+    const sk_sp<SkTextBlob>& blob) {
+  bool has_color = false;
+  std::vector<TextRun> runs;
   for (SkTextBlobRunIterator run(blob.get()); !run.done(); run.next()) {
-    TextRun text_run(ToFont(run, scale));
-
     // TODO(jonahwilliams): ask Skia for a public API to look this up.
     // https://github.com/flutter/flutter/issues/112005
     SkStrikeSpec strikeSpec = SkStrikeSpec::MakeWithNoDevice(run.font());
@@ -56,17 +51,20 @@ TextFrame TextFrameFromTextBlob(const sk_sp<SkTextBlob>& blob, Scalar scale) {
     const auto glyph_count = run.glyphCount();
     const auto* glyphs = run.glyphs();
     switch (run.positioning()) {
-      case SkTextBlobRunIterator::kDefault_Positioning:
-        FML_DLOG(ERROR) << "Unimplemented.";
-        break;
-      case SkTextBlobRunIterator::kHorizontal_Positioning:
-        FML_DLOG(ERROR) << "Unimplemented.";
-        break;
       case SkTextBlobRunIterator::kFull_Positioning: {
         std::vector<SkRect> glyph_bounds;
         glyph_bounds.resize(glyph_count);
-        run.font().getBounds(glyphs, glyph_count, glyph_bounds.data(), nullptr);
-
+        SkFont font = run.font();
+        auto font_size = font.getSize();
+        // For some platforms (including Android), `SkFont::getBounds()` snaps
+        // the computed bounds to integers. And so we scale up the font size
+        // prior to fetching the bounds to ensure that the returned bounds are
+        // always precise enough.
+        font.setSize(kScaleSize);
+        font.getBounds(glyphs, glyph_count, glyph_bounds.data(), nullptr);
+
+        std::vector<TextRun::GlyphPosition> positions;
+        positions.reserve(glyph_count);
         for (auto i = 0u; i < glyph_count; i++) {
           // kFull_Positioning has two scalars per glyph.
           const SkPoint* glyph_points = run.points();
@@ -74,23 +72,23 @@ TextFrame TextFrameFromTextBlob(const sk_sp<SkTextBlob>& blob, Scalar scale) {
           Glyph::Type type = paths.glyph(glyphs[i])->isColor()
                                  ? Glyph::Type::kBitmap
                                  : Glyph::Type::kPath;
+          has_color |= type == Glyph::Type::kBitmap;
 
-          text_run.AddGlyph(Glyph{glyphs[i], type, ToRect(glyph_bounds[i])},
-                            Point{point->x(), point->y()});
+          positions.emplace_back(TextRun::GlyphPosition{
+              Glyph{glyphs[i], type,
+                    ToRect(glyph_bounds[i]).Scale(font_size / kScaleSize)},
+              Point{point->x(), point->y()}});
         }
+        TextRun text_run(ToFont(run), positions);
+        runs.emplace_back(text_run);
         break;
       }
-      case SkTextBlobRunIterator::kRSXform_Positioning:
-        FML_DLOG(ERROR) << "Unimplemented.";
-        break;
       default:
         FML_DLOG(ERROR) << "Unimplemented.";
         continue;
     }
-    frame.AddTextRun(text_run);
   }
-
-  return frame;
+  return std::make_shared<TextFrame>(runs, ToRect(blob->bounds()), has_color);
 }
 
 }  // namespace impeller
diff --git a/impeller/typographer/backends/skia/text_frame_skia.h b/impeller/typographer/backends/skia/text_frame_skia.h
index 80d6c33921fa3d347e7291d12f01976879e65d02..fdb9d7693ecbfa488866d8f67a51ca9b595f100a 100644
--- a/impeller/typographer/backends/skia/text_frame_skia.h
+++ b/impeller/typographer/backends/skia/text_frame_skia.h
@@ -2,15 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_TYPOGRAPHER_BACKENDS_SKIA_TEXT_FRAME_SKIA_H_
+#define FLUTTER_IMPELLER_TYPOGRAPHER_BACKENDS_SKIA_TEXT_FRAME_SKIA_H_
 
-#include "flutter/fml/macros.h"
 #include "impeller/typographer/text_frame.h"
 #include "third_party/skia/include/core/SkTextBlob.h"
 
 namespace impeller {
 
-TextFrame TextFrameFromTextBlob(const sk_sp<SkTextBlob>& blob,
-                                Scalar scale = 1.0f);
+std::shared_ptr<impeller::TextFrame> MakeTextFrameFromTextBlobSkia(
+    const sk_sp<SkTextBlob>& blob);
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_TYPOGRAPHER_BACKENDS_SKIA_TEXT_FRAME_SKIA_H_
diff --git a/impeller/typographer/backends/skia/text_render_context_skia.h b/impeller/typographer/backends/skia/text_render_context_skia.h
deleted file mode 100644
index 0c97a8716e7ad5aee29691114a9f0e481c65143d..0000000000000000000000000000000000000000
--- a/impeller/typographer/backends/skia/text_render_context_skia.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#pragma once
-
-#include "flutter/fml/macros.h"
-#include "impeller/typographer/text_render_context.h"
-
-namespace impeller {
-
-class TextRenderContextSkia : public TextRenderContext {
- public:
-  TextRenderContextSkia(std::shared_ptr<Context> context);
-
-  ~TextRenderContextSkia() override;
-
-  // |TextRenderContext|
-  std::shared_ptr<GlyphAtlas> CreateGlyphAtlas(
-      GlyphAtlas::Type type,
-      std::shared_ptr<GlyphAtlasContext> atlas_context,
-      FrameIterator iterator) const override;
-
- private:
-  FML_DISALLOW_COPY_AND_ASSIGN(TextRenderContextSkia);
-};
-
-}  // namespace impeller
diff --git a/impeller/typographer/backends/skia/typeface_skia.cc b/impeller/typographer/backends/skia/typeface_skia.cc
index 552e159f1f82412da9dcffae1583c43ff0c32a19..df0b88be16a5e8c526a8fade9b49e65fb999e5bc 100644
--- a/impeller/typographer/backends/skia/typeface_skia.cc
+++ b/impeller/typographer/backends/skia/typeface_skia.cc
@@ -28,17 +28,6 @@ bool TypefaceSkia::IsEqual(const Typeface& other) const {
   return sk_other->typeface_ == typeface_;
 }
 
-Rect TypefaceSkia::GetBoundingBox() const {
-  if (!IsValid()) {
-    return {};
-  }
-
-  const auto bounds = typeface_->getBounds();
-
-  return Rect::MakeLTRB(bounds.left(), bounds.top(), bounds.right(),
-                        bounds.bottom());
-}
-
 const sk_sp<SkTypeface>& TypefaceSkia::GetSkiaTypeface() const {
   return typeface_;
 }
diff --git a/impeller/typographer/backends/skia/typeface_skia.h b/impeller/typographer/backends/skia/typeface_skia.h
index 6ac52c47761fe6e15be39ecb76ab8b78b424d250..dc14c48f6a8c9ac097dbabd9479076cd96ff4cc5 100644
--- a/impeller/typographer/backends/skia/typeface_skia.h
+++ b/impeller/typographer/backends/skia/typeface_skia.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_TYPOGRAPHER_BACKENDS_SKIA_TYPEFACE_SKIA_H_
+#define FLUTTER_IMPELLER_TYPOGRAPHER_BACKENDS_SKIA_TYPEFACE_SKIA_H_
 
 #include "flutter/fml/macros.h"
 #include "impeller/base/backend_cast.h"
@@ -15,7 +16,7 @@ namespace impeller {
 class TypefaceSkia final : public Typeface,
                            public BackendCast<TypefaceSkia, Typeface> {
  public:
-  TypefaceSkia(sk_sp<SkTypeface> typeface);
+  explicit TypefaceSkia(sk_sp<SkTypeface> typeface);
 
   ~TypefaceSkia() override;
 
@@ -28,15 +29,16 @@ class TypefaceSkia final : public Typeface,
   // |Comparable<Typeface>|
   bool IsEqual(const Typeface& other) const override;
 
-  // |Typeface|
-  Rect GetBoundingBox() const override;
-
   const sk_sp<SkTypeface>& GetSkiaTypeface() const;
 
  private:
   sk_sp<SkTypeface> typeface_;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(TypefaceSkia);
+  TypefaceSkia(const TypefaceSkia&) = delete;
+
+  TypefaceSkia& operator=(const TypefaceSkia&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_TYPOGRAPHER_BACKENDS_SKIA_TYPEFACE_SKIA_H_
diff --git a/impeller/typographer/backends/skia/text_render_context_skia.cc b/impeller/typographer/backends/skia/typographer_context_skia.cc
similarity index 36%
rename from impeller/typographer/backends/skia/text_render_context_skia.cc
rename to impeller/typographer/backends/skia/typographer_context_skia.cc
index c09f1fff8e5ee42a6c6207a23b52c3392f24cf33..28fb5036e982fbe266b25ceaacfcf4faec1345a3 100644
--- a/impeller/typographer/backends/skia/text_render_context_skia.cc
+++ b/impeller/typographer/backends/skia/typographer_context_skia.cc
@@ -2,89 +2,68 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/typographer/backends/skia/text_render_context_skia.h"
+#include "impeller/typographer/backends/skia/typographer_context_skia.h"
 
+#include <numeric>
 #include <utility>
 
 #include "flutter/fml/logging.h"
 #include "flutter/fml/trace_event.h"
 #include "impeller/base/allocation.h"
-#include "impeller/renderer/allocator.h"
+#include "impeller/core/allocator.h"
+#include "impeller/typographer/backends/skia/glyph_atlas_context_skia.h"
 #include "impeller/typographer/backends/skia/typeface_skia.h"
+#include "impeller/typographer/rectangle_packer.h"
+#include "impeller/typographer/typographer_context.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkSize.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkFont.h"
-#include "third_party/skia/include/core/SkFontMetrics.h"
-#include "third_party/skia/include/core/SkRSXform.h"
 #include "third_party/skia/include/core/SkSurface.h"
-#include "third_party/skia/src/core/SkIPoint16.h"   // nogncheck
-#include "third_party/skia/src/gpu/GrRectanizer.h"  // nogncheck
 
 namespace impeller {
 
-TextRenderContextSkia::TextRenderContextSkia(std::shared_ptr<Context> context)
-    : TextRenderContext(std::move(context)) {}
+// TODO(bdero): We might be able to remove this per-glyph padding if we fix
+//              the underlying causes of the overlap.
+//              https://github.com/flutter/flutter/issues/114563
+constexpr auto kPadding = 2;
 
-TextRenderContextSkia::~TextRenderContextSkia() = default;
-
-static FontGlyphPair::Set CollectUniqueFontGlyphPairsSet(
-    GlyphAtlas::Type type,
-    const TextRenderContext::FrameIterator& frame_iterator) {
-  FontGlyphPair::Set set;
-  while (auto frame = frame_iterator()) {
-    for (const auto& run : frame->GetRuns()) {
-      auto font = run.GetFont();
-      // TODO(dnfield): If we're doing SDF here, we should be using a consistent
-      // point size.
-      // https://github.com/flutter/flutter/issues/112016
-      for (const auto& glyph_position : run.GetGlyphPositions()) {
-        set.insert({font, glyph_position.glyph});
-      }
-    }
-  }
-  return set;
+std::shared_ptr<TypographerContext> TypographerContextSkia::Make() {
+  return std::make_shared<TypographerContextSkia>();
 }
 
-static FontGlyphPair::Vector CollectUniqueFontGlyphPairs(
-    GlyphAtlas::Type type,
-    const TextRenderContext::FrameIterator& frame_iterator) {
-  TRACE_EVENT0("impeller", __FUNCTION__);
-  FontGlyphPair::Vector vector;
-  auto set = CollectUniqueFontGlyphPairsSet(type, frame_iterator);
-  vector.reserve(set.size());
-  for (const auto& item : set) {
-    vector.emplace_back(item);
-  }
-  return vector;
+TypographerContextSkia::TypographerContextSkia() = default;
+
+TypographerContextSkia::~TypographerContextSkia() = default;
+
+std::shared_ptr<GlyphAtlasContext>
+TypographerContextSkia::CreateGlyphAtlasContext() const {
+  return std::make_shared<GlyphAtlasContextSkia>();
 }
 
-static size_t PairsFitInAtlasOfSize(const FontGlyphPair::Vector& pairs,
-                                    const ISize& atlas_size,
-                                    std::vector<Rect>& glyph_positions) {
+static size_t PairsFitInAtlasOfSize(
+    const std::vector<FontGlyphPair>& pairs,
+    const ISize& atlas_size,
+    std::vector<Rect>& glyph_positions,
+    const std::shared_ptr<RectanglePacker>& rect_packer) {
   if (atlas_size.IsEmpty()) {
     return false;
   }
 
-  auto rect_packer = std::unique_ptr<GrRectanizer>(
-      GrRectanizer::Factory(atlas_size.width, atlas_size.height));
-
   glyph_positions.clear();
   glyph_positions.reserve(pairs.size());
 
-  // TODO(bdero): We might be able to remove this per-glyph padding if we fix
-  //              the underlying causes of the overlap.
-  //              https://github.com/flutter/flutter/issues/114563
-  constexpr auto padding = 2;
-
-  for (size_t i = 0; i < pairs.size(); i++) {
-    const auto& pair = pairs[i];
+  size_t i = 0;
+  for (auto it = pairs.begin(); it != pairs.end(); ++i, ++it) {
+    const auto& pair = *it;
 
     const auto glyph_size =
-        ISize::Ceil((pair.glyph.bounds * pair.font.GetMetrics().scale).size);
-    SkIPoint16 location_in_atlas;
-    if (!rect_packer->addRect(glyph_size.width + padding,   //
-                              glyph_size.height + padding,  //
-                              &location_in_atlas            //
+        ISize::Ceil(pair.glyph.bounds.GetSize() * pair.scaled_font.scale);
+    IPoint16 location_in_atlas;
+    if (!rect_packer->addRect(glyph_size.width + kPadding,   //
+                              glyph_size.height + kPadding,  //
+                              &location_in_atlas             //
                               )) {
       return pairs.size() - i;
     }
@@ -98,20 +77,67 @@ static size_t PairsFitInAtlasOfSize(const FontGlyphPair::Vector& pairs,
   return 0;
 }
 
+static bool CanAppendToExistingAtlas(
+    const std::shared_ptr<GlyphAtlas>& atlas,
+    const std::vector<FontGlyphPair>& extra_pairs,
+    std::vector<Rect>& glyph_positions,
+    ISize atlas_size,
+    const std::shared_ptr<RectanglePacker>& rect_packer) {
+  TRACE_EVENT0("impeller", __FUNCTION__);
+  if (!rect_packer || atlas_size.IsEmpty()) {
+    return false;
+  }
+
+  // We assume that all existing glyphs will fit. After all, they fit before.
+  // The glyph_positions only contains the values for the additional glyphs
+  // from extra_pairs.
+  FML_DCHECK(glyph_positions.size() == 0);
+  glyph_positions.reserve(extra_pairs.size());
+  for (size_t i = 0; i < extra_pairs.size(); i++) {
+    const FontGlyphPair& pair = extra_pairs[i];
+
+    const auto glyph_size =
+        ISize::Ceil(pair.glyph.bounds.GetSize() * pair.scaled_font.scale);
+    IPoint16 location_in_atlas;
+    if (!rect_packer->addRect(glyph_size.width + kPadding,   //
+                              glyph_size.height + kPadding,  //
+                              &location_in_atlas             //
+                              )) {
+      return false;
+    }
+    glyph_positions.emplace_back(Rect::MakeXYWH(location_in_atlas.x(),  //
+                                                location_in_atlas.y(),  //
+                                                glyph_size.width,       //
+                                                glyph_size.height       //
+                                                ));
+  }
+
+  return true;
+}
+
 static ISize OptimumAtlasSizeForFontGlyphPairs(
-    const FontGlyphPair::Vector& pairs,
-    std::vector<Rect>& glyph_positions) {
+    const std::vector<FontGlyphPair>& pairs,
+    std::vector<Rect>& glyph_positions,
+    const std::shared_ptr<GlyphAtlasContext>& atlas_context,
+    GlyphAtlas::Type type,
+    const ISize& max_texture_size) {
   static constexpr auto kMinAtlasSize = 8u;
-  static constexpr auto kMaxAtlasSize = 4096u;
+  static constexpr auto kMinAlphaBitmapSize = 1024u;
 
   TRACE_EVENT0("impeller", __FUNCTION__);
 
-  ISize current_size(kMinAtlasSize, kMinAtlasSize);
+  ISize current_size = type == GlyphAtlas::Type::kAlphaBitmap
+                           ? ISize(kMinAlphaBitmapSize, kMinAlphaBitmapSize)
+                           : ISize(kMinAtlasSize, kMinAtlasSize);
   size_t total_pairs = pairs.size() + 1;
   do {
-    auto remaining_pairs =
-        PairsFitInAtlasOfSize(pairs, current_size, glyph_positions);
+    auto rect_packer = std::shared_ptr<RectanglePacker>(
+        RectanglePacker::Factory(current_size.width, current_size.height));
+
+    auto remaining_pairs = PairsFitInAtlasOfSize(pairs, current_size,
+                                                 glyph_positions, rect_packer);
     if (remaining_pairs == 0) {
+      atlas_context->UpdateRectPacker(rect_packer);
       return current_size;
     } else if (remaining_pairs < std::ceil(total_pairs / 2)) {
       current_size = ISize::MakeWH(
@@ -123,124 +149,69 @@ static ISize OptimumAtlasSizeForFontGlyphPairs(
           Allocation::NextPowerOfTwoSize(current_size.width + 1),
           Allocation::NextPowerOfTwoSize(current_size.height + 1));
     }
-  } while (current_size.width <= kMaxAtlasSize &&
-           current_size.height <= kMaxAtlasSize);
+  } while (current_size.width <= max_texture_size.width &&
+           current_size.height <= max_texture_size.height);
   return ISize{0, 0};
 }
 
-/// Compute signed-distance field for an 8-bpp grayscale image (values greater
-/// than 127 are considered "on") For details of this algorithm, see "The 'dead
-/// reckoning' signed distance transform" [Grevera 2004]
-static void ConvertBitmapToSignedDistanceField(uint8_t* pixels,
-                                               uint16_t width,
-                                               uint16_t height) {
-  if (!pixels || width == 0 || height == 0) {
-    return;
-  }
-
-  using ShortPoint = TPoint<uint16_t>;
-
-  // distance to nearest boundary point map
-  std::vector<Scalar> distance_map(width * height);
-  // nearest boundary point map
-  std::vector<ShortPoint> boundary_point_map(width * height);
-
-  // Some helpers for manipulating the above arrays
-#define image(_x, _y) (pixels[(_y)*width + (_x)] > 0x7f)
-#define distance(_x, _y) distance_map[(_y)*width + (_x)]
-#define nearestpt(_x, _y) boundary_point_map[(_y)*width + (_x)]
-
-  const Scalar maxDist = hypot(width, height);
-  const Scalar distUnit = 1;
-  const Scalar distDiag = sqrt(2);
-
-  // Initialization phase: set all distances to "infinity"; zero out nearest
-  // boundary point map
-  for (uint16_t y = 0; y < height; ++y) {
-    for (uint16_t x = 0; x < width; ++x) {
-      distance(x, y) = maxDist;
-      nearestpt(x, y) = ShortPoint{0, 0};
-    }
-  }
+static void DrawGlyph(SkCanvas* canvas,
+                      const ScaledFont& scaled_font,
+                      const Glyph& glyph,
+                      const Rect& location,
+                      bool has_color) {
+  const auto& metrics = scaled_font.font.GetMetrics();
+  const auto position = SkPoint::Make(location.GetX() / scaled_font.scale,
+                                      location.GetY() / scaled_font.scale);
+  SkGlyphID glyph_id = glyph.index;
+
+  SkFont sk_font(
+      TypefaceSkia::Cast(*scaled_font.font.GetTypeface()).GetSkiaTypeface(),
+      metrics.point_size, metrics.scaleX, metrics.skewX);
+  sk_font.setEdging(SkFont::Edging::kAntiAlias);
+  sk_font.setHinting(SkFontHinting::kSlight);
+  sk_font.setEmbolden(metrics.embolden);
+
+  auto glyph_color = has_color ? SK_ColorWHITE : SK_ColorBLACK;
+
+  SkPaint glyph_paint;
+  glyph_paint.setColor(glyph_color);
+  canvas->resetMatrix();
+  canvas->scale(scaled_font.scale, scaled_font.scale);
+  canvas->drawGlyphs(1u,         // count
+                     &glyph_id,  // glyphs
+                     &position,  // positions
+                     SkPoint::Make(-glyph.bounds.GetLeft(),
+                                   -glyph.bounds.GetTop()),  // origin
+                     sk_font,                                // font
+                     glyph_paint                             // paint
+  );
+}
 
-  // Immediate interior/exterior phase: mark all points along the boundary as
-  // such
-  for (uint16_t y = 1; y < height - 1; ++y) {
-    for (uint16_t x = 1; x < width - 1; ++x) {
-      bool inside = image(x, y);
-      if (image(x - 1, y) != inside || image(x + 1, y) != inside ||
-          image(x, y - 1) != inside || image(x, y + 1) != inside) {
-        distance(x, y) = 0;
-        nearestpt(x, y) = ShortPoint{x, y};
-      }
-    }
-  }
+static bool UpdateAtlasBitmap(const GlyphAtlas& atlas,
+                              const std::shared_ptr<SkBitmap>& bitmap,
+                              const std::vector<FontGlyphPair>& new_pairs) {
+  TRACE_EVENT0("impeller", __FUNCTION__);
+  FML_DCHECK(bitmap != nullptr);
 
-  // Forward dead-reckoning pass
-  for (uint16_t y = 1; y < height - 2; ++y) {
-    for (uint16_t x = 1; x < width - 2; ++x) {
-      if (distance_map[(y - 1) * width + (x - 1)] + distDiag < distance(x, y)) {
-        nearestpt(x, y) = nearestpt(x - 1, y - 1);
-        distance(x, y) = hypot(x - nearestpt(x, y).x, y - nearestpt(x, y).y);
-      }
-      if (distance(x, y - 1) + distUnit < distance(x, y)) {
-        nearestpt(x, y) = nearestpt(x, y - 1);
-        distance(x, y) = hypot(x - nearestpt(x, y).x, y - nearestpt(x, y).y);
-      }
-      if (distance(x + 1, y - 1) + distDiag < distance(x, y)) {
-        nearestpt(x, y) = nearestpt(x + 1, y - 1);
-        distance(x, y) = hypot(x - nearestpt(x, y).x, y - nearestpt(x, y).y);
-      }
-      if (distance(x - 1, y) + distUnit < distance(x, y)) {
-        nearestpt(x, y) = nearestpt(x - 1, y);
-        distance(x, y) = hypot(x - nearestpt(x, y).x, y - nearestpt(x, y).y);
-      }
-    }
+  auto surface = SkSurfaces::WrapPixels(bitmap->pixmap());
+  if (!surface) {
+    return false;
   }
-
-  // Backward dead-reckoning pass
-  for (uint16_t y = height - 2; y >= 1; --y) {
-    for (uint16_t x = width - 2; x >= 1; --x) {
-      if (distance(x + 1, y) + distUnit < distance(x, y)) {
-        nearestpt(x, y) = nearestpt(x + 1, y);
-        distance(x, y) = hypot(x - nearestpt(x, y).x, y - nearestpt(x, y).y);
-      }
-      if (distance(x - 1, y + 1) + distDiag < distance(x, y)) {
-        nearestpt(x, y) = nearestpt(x - 1, y + 1);
-        distance(x, y) = hypot(x - nearestpt(x, y).x, y - nearestpt(x, y).y);
-      }
-      if (distance(x, y + 1) + distUnit < distance(x, y)) {
-        nearestpt(x, y) = nearestpt(x, y + 1);
-        distance(x, y) = hypot(x - nearestpt(x, y).x, y - nearestpt(x, y).y);
-      }
-      if (distance(x + 1, y + 1) + distDiag < distance(x, y)) {
-        nearestpt(x, y) = nearestpt(x + 1, y + 1);
-        distance(x, y) = hypot(x - nearestpt(x, y).x, y - nearestpt(x, y).y);
-      }
-    }
+  auto canvas = surface->getCanvas();
+  if (!canvas) {
+    return false;
   }
 
-  // Interior distance negation pass; distances outside the figure are
-  // considered negative
-  // Also does final quantization.
-  for (uint16_t y = 0; y < height; ++y) {
-    for (uint16_t x = 0; x < width; ++x) {
-      if (!image(x, y)) {
-        distance(x, y) = -distance(x, y);
-      }
+  bool has_color = atlas.GetType() == GlyphAtlas::Type::kColorBitmap;
 
-      float norm_factor = 13.5;
-      float dist = distance(x, y);
-      float clamped_dist = fmax(-norm_factor, fmin(dist, norm_factor));
-      float scaled_dist = clamped_dist / norm_factor;
-      uint8_t quantized_value = ((scaled_dist + 1) / 2) * UINT8_MAX;
-      pixels[y * width + x] = quantized_value;
+  for (const FontGlyphPair& pair : new_pairs) {
+    auto pos = atlas.FindFontGlyphBounds(pair);
+    if (!pos.has_value()) {
+      continue;
     }
+    DrawGlyph(canvas, pair.scaled_font, pair.glyph, pos.value(), has_color);
   }
-
-#undef image
-#undef distance
-#undef nearestpt
+  return true;
 }
 
 static std::shared_ptr<SkBitmap> CreateAtlasBitmap(const GlyphAtlas& atlas,
@@ -250,9 +221,10 @@ static std::shared_ptr<SkBitmap> CreateAtlasBitmap(const GlyphAtlas& atlas,
   SkImageInfo image_info;
 
   switch (atlas.GetType()) {
-    case GlyphAtlas::Type::kSignedDistanceField:
     case GlyphAtlas::Type::kAlphaBitmap:
-      image_info = SkImageInfo::MakeA8(atlas_size.width, atlas_size.height);
+      image_info =
+          SkImageInfo::MakeA8(SkISize{static_cast<int32_t>(atlas_size.width),
+                                      static_cast<int32_t>(atlas_size.height)});
       break;
     case GlyphAtlas::Type::kColorBitmap:
       image_info =
@@ -263,7 +235,8 @@ static std::shared_ptr<SkBitmap> CreateAtlasBitmap(const GlyphAtlas& atlas,
   if (!bitmap->tryAllocPixels(image_info)) {
     return nullptr;
   }
-  auto surface = SkSurface::MakeRasterDirect(bitmap->pixmap());
+
+  auto surface = SkSurfaces::WrapPixels(bitmap->pixmap());
   if (!surface) {
     return nullptr;
   }
@@ -274,41 +247,32 @@ static std::shared_ptr<SkBitmap> CreateAtlasBitmap(const GlyphAtlas& atlas,
 
   bool has_color = atlas.GetType() == GlyphAtlas::Type::kColorBitmap;
 
-  atlas.IterateGlyphs([canvas, has_color](const FontGlyphPair& font_glyph,
+  atlas.IterateGlyphs([canvas, has_color](const ScaledFont& scaled_font,
+                                          const Glyph& glyph,
                                           const Rect& location) -> bool {
-    const auto& metrics = font_glyph.font.GetMetrics();
-    const auto position = SkPoint::Make(location.origin.x / metrics.scale,
-                                        location.origin.y / metrics.scale);
-    SkGlyphID glyph_id = font_glyph.glyph.index;
-
-    SkFont sk_font(
-        TypefaceSkia::Cast(*font_glyph.font.GetTypeface()).GetSkiaTypeface(),
-        metrics.point_size, metrics.scaleX, metrics.skewX);
-    sk_font.setEdging(SkFont::Edging::kAntiAlias);
-    sk_font.setHinting(SkFontHinting::kSlight);
-    sk_font.setEmbolden(metrics.embolden);
-
-    auto glyph_color = has_color ? SK_ColorWHITE : SK_ColorBLACK;
-
-    SkPaint glyph_paint;
-    glyph_paint.setColor(glyph_color);
-    canvas->resetMatrix();
-    canvas->scale(metrics.scale, metrics.scale);
-    canvas->drawGlyphs(
-        1u,         // count
-        &glyph_id,  // glyphs
-        &position,  // positions
-        SkPoint::Make(-font_glyph.glyph.bounds.GetLeft(),
-                      -font_glyph.glyph.bounds.GetTop()),  // origin
-        sk_font,                                           // font
-        glyph_paint                                        // paint
-    );
+    DrawGlyph(canvas, scaled_font, glyph, location, has_color);
     return true;
   });
 
   return bitmap;
 }
 
+static bool UpdateGlyphTextureAtlas(std::shared_ptr<SkBitmap> bitmap,
+                                    const std::shared_ptr<Texture>& texture) {
+  TRACE_EVENT0("impeller", __FUNCTION__);
+
+  FML_DCHECK(bitmap != nullptr);
+  auto texture_descriptor = texture->GetTextureDescriptor();
+
+  auto mapping = std::make_shared<fml::NonOwnedMapping>(
+      reinterpret_cast<const uint8_t*>(bitmap->getAddr(0, 0)),  // data
+      texture_descriptor.GetByteSizeOfBaseMipLevel(),           // size
+      [bitmap](auto, auto) mutable { bitmap.reset(); }          // proc
+  );
+
+  return texture->SetContents(mapping);
+}
+
 static std::shared_ptr<Texture> UploadGlyphTextureAtlas(
     const std::shared_ptr<Allocator>& allocator,
     std::shared_ptr<SkBitmap> bitmap,
@@ -350,49 +314,114 @@ static std::shared_ptr<Texture> UploadGlyphTextureAtlas(
   return texture;
 }
 
-std::shared_ptr<GlyphAtlas> TextRenderContextSkia::CreateGlyphAtlas(
+std::shared_ptr<GlyphAtlas> TypographerContextSkia::CreateGlyphAtlas(
+    Context& context,
     GlyphAtlas::Type type,
-    std::shared_ptr<GlyphAtlasContext> atlas_context,
-    FrameIterator frame_iterator) const {
+    const std::shared_ptr<GlyphAtlasContext>& atlas_context,
+    const FontGlyphMap& font_glyph_map) const {
   TRACE_EVENT0("impeller", __FUNCTION__);
   if (!IsValid()) {
     return nullptr;
   }
-  auto last_atlas = atlas_context->GetGlyphAtlas();
+  auto& atlas_context_skia = GlyphAtlasContextSkia::Cast(*atlas_context);
+  std::shared_ptr<GlyphAtlas> last_atlas = atlas_context->GetGlyphAtlas();
+
+  if (font_glyph_map.empty()) {
+    return last_atlas;
+  }
 
   // ---------------------------------------------------------------------------
-  // Step 1: Collect unique font-glyph pairs in the frame.
+  // Step 1: Determine if the atlas type and font glyph pairs are compatible
+  //         with the current atlas and reuse if possible.
   // ---------------------------------------------------------------------------
-
-  auto font_glyph_pairs = CollectUniqueFontGlyphPairs(type, frame_iterator);
-  if (font_glyph_pairs.empty()) {
+  std::vector<FontGlyphPair> new_glyphs;
+  for (const auto& font_value : font_glyph_map) {
+    const ScaledFont& scaled_font = font_value.first;
+    const FontGlyphAtlas* font_glyph_atlas =
+        last_atlas->GetFontGlyphAtlas(scaled_font.font, scaled_font.scale);
+    if (font_glyph_atlas) {
+      for (const Glyph& glyph : font_value.second) {
+        if (!font_glyph_atlas->FindGlyphBounds(glyph)) {
+          new_glyphs.emplace_back(scaled_font, glyph);
+        }
+      }
+    } else {
+      for (const Glyph& glyph : font_value.second) {
+        new_glyphs.emplace_back(scaled_font, glyph);
+      }
+    }
+  }
+  if (last_atlas->GetType() == type && new_glyphs.size() == 0) {
     return last_atlas;
   }
 
   // ---------------------------------------------------------------------------
-  // Step 2: Determine if the atlas type and font glyph pairs are compatible
-  //         with the current atlas and reuse if possible.
+  // Step 2: Determine if the additional missing glyphs can be appended to the
+  //         existing bitmap without recreating the atlas. This requires that
+  //         the type is identical.
   // ---------------------------------------------------------------------------
+  std::vector<Rect> glyph_positions;
   if (last_atlas->GetType() == type &&
-      last_atlas->HasSamePairs(font_glyph_pairs)) {
+      CanAppendToExistingAtlas(last_atlas, new_glyphs, glyph_positions,
+                               atlas_context->GetAtlasSize(),
+                               atlas_context->GetRectPacker())) {
+    // The old bitmap will be reused and only the additional glyphs will be
+    // added.
+
+    // ---------------------------------------------------------------------------
+    // Step 3a: Record the positions in the glyph atlas of the newly added
+    //          glyphs.
+    // ---------------------------------------------------------------------------
+    for (size_t i = 0, count = glyph_positions.size(); i < count; i++) {
+      last_atlas->AddTypefaceGlyphPosition(new_glyphs[i], glyph_positions[i]);
+    }
+
+    // ---------------------------------------------------------------------------
+    // Step 4a: Draw new font-glyph pairs into the existing bitmap.
+    // ---------------------------------------------------------------------------
+    auto bitmap = atlas_context_skia.GetBitmap();
+    if (!UpdateAtlasBitmap(*last_atlas, bitmap, new_glyphs)) {
+      return nullptr;
+    }
+
+    // ---------------------------------------------------------------------------
+    // Step 5a: Update the existing texture with the updated bitmap.
+    // ---------------------------------------------------------------------------
+    if (!UpdateGlyphTextureAtlas(bitmap, last_atlas->GetTexture())) {
+      return nullptr;
+    }
     return last_atlas;
   }
-
-  auto glyph_atlas = std::make_shared<GlyphAtlas>(type);
-  atlas_context->UpdateGlyphAtlas(glyph_atlas);
+  // A new glyph atlas must be created.
 
   // ---------------------------------------------------------------------------
-  // Step 3: Get the optimum size of the texture atlas.
+  // Step 3b: Get the optimum size of the texture atlas.
   // ---------------------------------------------------------------------------
-  std::vector<Rect> glyph_positions;
-  const auto atlas_size =
-      OptimumAtlasSizeForFontGlyphPairs(font_glyph_pairs, glyph_positions);
+  std::vector<FontGlyphPair> font_glyph_pairs;
+  font_glyph_pairs.reserve(std::accumulate(
+      font_glyph_map.begin(), font_glyph_map.end(), 0,
+      [](const int a, const auto& b) { return a + b.second.size(); }));
+  for (const auto& font_value : font_glyph_map) {
+    const ScaledFont& scaled_font = font_value.first;
+    for (const Glyph& glyph : font_value.second) {
+      font_glyph_pairs.push_back({scaled_font, glyph});
+    }
+  }
+  auto glyph_atlas = std::make_shared<GlyphAtlas>(type);
+  auto atlas_size = OptimumAtlasSizeForFontGlyphPairs(
+      font_glyph_pairs,                                             //
+      glyph_positions,                                              //
+      atlas_context,                                                //
+      type,                                                         //
+      context.GetResourceAllocator()->GetMaxTextureSizeSupported()  //
+  );
+
+  atlas_context->UpdateGlyphAtlas(glyph_atlas, atlas_size);
   if (atlas_size.IsEmpty()) {
     return nullptr;
   }
-
   // ---------------------------------------------------------------------------
-  // Step 4: Find location of font-glyph pairs in the atlas. We have this from
+  // Step 4b: Find location of font-glyph pairs in the atlas. We have this from
   // the last step. So no need to do create another rect packer. But just do a
   // sanity check of counts. This could also be just an assertion as only a
   // construction issue would cause such a failure.
@@ -402,45 +431,45 @@ std::shared_ptr<GlyphAtlas> TextRenderContextSkia::CreateGlyphAtlas(
   }
 
   // ---------------------------------------------------------------------------
-  // Step 5: Record the positions in the glyph atlas.
+  // Step 5b: Record the positions in the glyph atlas.
   // ---------------------------------------------------------------------------
-  for (size_t i = 0, count = glyph_positions.size(); i < count; i++) {
-    glyph_atlas->AddTypefaceGlyphPosition(font_glyph_pairs[i],
-                                          glyph_positions[i]);
+  {
+    size_t i = 0;
+    for (auto it = font_glyph_pairs.begin(); it != font_glyph_pairs.end();
+         ++i, ++it) {
+      glyph_atlas->AddTypefaceGlyphPosition(*it, glyph_positions[i]);
+    }
   }
 
   // ---------------------------------------------------------------------------
-  // Step 6: Draw font-glyph pairs in the correct spot in the atlas.
+  // Step 6b: Draw font-glyph pairs in the correct spot in the atlas.
   // ---------------------------------------------------------------------------
   auto bitmap = CreateAtlasBitmap(*glyph_atlas, atlas_size);
   if (!bitmap) {
     return nullptr;
   }
+  atlas_context_skia.UpdateBitmap(bitmap);
 
   // ---------------------------------------------------------------------------
-  // Step 7: Upload the atlas as a texture.
+  // Step 7b: Upload the atlas as a texture.
   // ---------------------------------------------------------------------------
   PixelFormat format;
   switch (type) {
-    case GlyphAtlas::Type::kSignedDistanceField:
-      ConvertBitmapToSignedDistanceField(
-          reinterpret_cast<uint8_t*>(bitmap->getPixels()), atlas_size.width,
-          atlas_size.height);
     case GlyphAtlas::Type::kAlphaBitmap:
-      format = PixelFormat::kA8UNormInt;
+      format = context.GetCapabilities()->GetDefaultGlyphAtlasFormat();
       break;
     case GlyphAtlas::Type::kColorBitmap:
       format = PixelFormat::kR8G8B8A8UNormInt;
       break;
   }
-  auto texture = UploadGlyphTextureAtlas(GetContext()->GetResourceAllocator(),
-                                         bitmap, atlas_size, format);
+  auto texture = UploadGlyphTextureAtlas(context.GetResourceAllocator(), bitmap,
+                                         atlas_size, format);
   if (!texture) {
     return nullptr;
   }
 
   // ---------------------------------------------------------------------------
-  // Step 8: Record the texture in the glyph atlas.
+  // Step 8b: Record the texture in the glyph atlas.
   // ---------------------------------------------------------------------------
   glyph_atlas->SetTexture(std::move(texture));
 
diff --git a/impeller/typographer/backends/skia/typographer_context_skia.h b/impeller/typographer/backends/skia/typographer_context_skia.h
new file mode 100644
index 0000000000000000000000000000000000000000..bc215f205fc9079b892c5a8e5b4755177e4ab6d3
--- /dev/null
+++ b/impeller/typographer/backends/skia/typographer_context_skia.h
@@ -0,0 +1,38 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_TYPOGRAPHER_BACKENDS_SKIA_TYPOGRAPHER_CONTEXT_SKIA_H_
+#define FLUTTER_IMPELLER_TYPOGRAPHER_BACKENDS_SKIA_TYPOGRAPHER_CONTEXT_SKIA_H_
+
+#include "impeller/typographer/typographer_context.h"
+
+namespace impeller {
+
+class TypographerContextSkia : public TypographerContext {
+ public:
+  static std::shared_ptr<TypographerContext> Make();
+
+  TypographerContextSkia();
+
+  ~TypographerContextSkia() override;
+
+  // |TypographerContext|
+  std::shared_ptr<GlyphAtlasContext> CreateGlyphAtlasContext() const override;
+
+  // |TypographerContext|
+  std::shared_ptr<GlyphAtlas> CreateGlyphAtlas(
+      Context& context,
+      GlyphAtlas::Type type,
+      const std::shared_ptr<GlyphAtlasContext>& atlas_context,
+      const FontGlyphMap& font_glyph_map) const override;
+
+ private:
+  TypographerContextSkia(const TypographerContextSkia&) = delete;
+
+  TypographerContextSkia& operator=(const TypographerContextSkia&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_TYPOGRAPHER_BACKENDS_SKIA_TYPOGRAPHER_CONTEXT_SKIA_H_
diff --git a/impeller/typographer/backends/stb/BUILD.gn b/impeller/typographer/backends/stb/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..1976e3d16488811e2d574ca551281a5d615d53e5
--- /dev/null
+++ b/impeller/typographer/backends/stb/BUILD.gn
@@ -0,0 +1,25 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//flutter/impeller/tools/impeller.gni")
+
+impeller_component("typographer_stb_backend") {
+  testonly = true
+
+  sources = [
+    "glyph_atlas_context_stb.cc",
+    "glyph_atlas_context_stb.h",
+    "text_frame_stb.cc",
+    "text_frame_stb.h",
+    "typeface_stb.cc",
+    "typeface_stb.h",
+    "typographer_context_stb.cc",
+    "typographer_context_stb.h",
+  ]
+
+  public_deps = [
+    "//flutter/impeller/typographer",
+    "//flutter/third_party/stb:stb_truetype",
+  ]
+}
diff --git a/impeller/typographer/backends/stb/glyph_atlas_context_stb.cc b/impeller/typographer/backends/stb/glyph_atlas_context_stb.cc
new file mode 100644
index 0000000000000000000000000000000000000000..fb6c105afe16d7c704166de0ffb7be64044a1159
--- /dev/null
+++ b/impeller/typographer/backends/stb/glyph_atlas_context_stb.cc
@@ -0,0 +1,58 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/typographer/backends/stb/glyph_atlas_context_stb.h"
+
+namespace impeller {
+
+BitmapSTB::BitmapSTB() = default;
+
+BitmapSTB::~BitmapSTB() = default;
+
+BitmapSTB::BitmapSTB(size_t width, size_t height, size_t bytes_per_pixel)
+    : width_(width),
+      height_(height),
+      bytes_per_pixel_(bytes_per_pixel),
+      pixels_(std::vector<uint8_t>(width * height * bytes_per_pixel, 0)) {}
+
+uint8_t* BitmapSTB::GetPixels() {
+  return pixels_.data();
+}
+
+uint8_t* BitmapSTB::GetPixelAddress(TPoint<size_t> coords) {
+  FML_DCHECK(coords.x < width_);
+  FML_DCHECK(coords.x < height_);
+
+  return &pixels_.data()[(coords.x + width_ * coords.y) * bytes_per_pixel_];
+}
+
+size_t BitmapSTB::GetRowBytes() const {
+  return width_ * bytes_per_pixel_;
+}
+
+size_t BitmapSTB::GetWidth() const {
+  return width_;
+}
+
+size_t BitmapSTB::GetHeight() const {
+  return height_;
+}
+
+size_t BitmapSTB::GetSize() const {
+  return width_ * height_ * bytes_per_pixel_;
+}
+
+GlyphAtlasContextSTB::GlyphAtlasContextSTB() = default;
+
+GlyphAtlasContextSTB::~GlyphAtlasContextSTB() = default;
+
+std::shared_ptr<BitmapSTB> GlyphAtlasContextSTB::GetBitmap() const {
+  return bitmap_;
+}
+
+void GlyphAtlasContextSTB::UpdateBitmap(std::shared_ptr<BitmapSTB> bitmap) {
+  bitmap_ = std::move(bitmap);
+}
+
+}  // namespace impeller
diff --git a/impeller/typographer/backends/stb/glyph_atlas_context_stb.h b/impeller/typographer/backends/stb/glyph_atlas_context_stb.h
new file mode 100644
index 0000000000000000000000000000000000000000..58962570d9297ada12d1a50ba57100ad6fd78ef4
--- /dev/null
+++ b/impeller/typographer/backends/stb/glyph_atlas_context_stb.h
@@ -0,0 +1,64 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_TYPOGRAPHER_BACKENDS_STB_GLYPH_ATLAS_CONTEXT_STB_H_
+#define FLUTTER_IMPELLER_TYPOGRAPHER_BACKENDS_STB_GLYPH_ATLAS_CONTEXT_STB_H_
+
+#include "impeller/base/backend_cast.h"
+#include "impeller/typographer/glyph_atlas.h"
+
+namespace impeller {
+
+class BitmapSTB {
+ public:
+  BitmapSTB();
+
+  ~BitmapSTB();
+
+  BitmapSTB(size_t width, size_t height, size_t bytes_per_pixel);
+
+  uint8_t* GetPixels();
+
+  uint8_t* GetPixelAddress(TPoint<size_t> coords);
+
+  size_t GetRowBytes() const;
+
+  size_t GetWidth() const;
+
+  size_t GetHeight() const;
+
+  size_t GetSize() const;
+
+ private:
+  size_t width_ = 0;
+  size_t height_ = 0;
+  size_t bytes_per_pixel_ = 0;
+  std::vector<uint8_t> pixels_;
+};
+
+class GlyphAtlasContextSTB
+    : public GlyphAtlasContext,
+      public BackendCast<GlyphAtlasContextSTB, GlyphAtlasContext> {
+ public:
+  GlyphAtlasContextSTB();
+
+  ~GlyphAtlasContextSTB() override;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Retrieve the previous (if any) BitmapSTB instance.
+  std::shared_ptr<BitmapSTB> GetBitmap() const;
+
+  void UpdateBitmap(std::shared_ptr<BitmapSTB> bitmap);
+
+ private:
+  std::shared_ptr<BitmapSTB> bitmap_;
+
+  GlyphAtlasContextSTB(const GlyphAtlasContextSTB&) = delete;
+
+  GlyphAtlasContextSTB& operator=(const GlyphAtlasContextSTB&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_TYPOGRAPHER_BACKENDS_STB_GLYPH_ATLAS_CONTEXT_STB_H_
diff --git a/impeller/typographer/backends/stb/text_frame_stb.cc b/impeller/typographer/backends/stb/text_frame_stb.cc
new file mode 100644
index 0000000000000000000000000000000000000000..db4005befa30e54fc4b464dbbf6b88bbf69a413e
--- /dev/null
+++ b/impeller/typographer/backends/stb/text_frame_stb.cc
@@ -0,0 +1,69 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/typographer/backends/stb/text_frame_stb.h"
+
+#include "impeller/typographer/font.h"
+
+namespace impeller {
+
+std::shared_ptr<TextFrame> MakeTextFrameSTB(
+    const std::shared_ptr<TypefaceSTB>& typeface_stb,
+    Font::Metrics metrics,
+    const std::string& text) {
+  TextRun run(Font(typeface_stb, metrics));
+
+  // Shape the text run using STB. The glyph positions could also be resolved
+  // using a more advanced text shaper such as harfbuzz.
+
+  float scale = stbtt_ScaleForPixelHeight(
+      typeface_stb->GetFontInfo(),
+      metrics.point_size * TypefaceSTB::kPointsToPixels);
+
+  int ascent, descent, line_gap;
+  stbtt_GetFontVMetrics(typeface_stb->GetFontInfo(), &ascent, &descent,
+                        &line_gap);
+  ascent = std::round(ascent * scale);
+  descent = std::round(descent * scale);
+
+  float x = 0;
+  for (size_t i = 0; i < text.size(); i++) {
+    int glyph_index =
+        stbtt_FindGlyphIndex(typeface_stb->GetFontInfo(), text[i]);
+
+    int x0, y0, x1, y1;
+    stbtt_GetGlyphBitmapBox(typeface_stb->GetFontInfo(), glyph_index, scale,
+                            scale, &x0, &y0, &x1, &y1);
+    float y = y0;
+
+    int advance_width;
+    int left_side_bearing;
+    stbtt_GetGlyphHMetrics(typeface_stb->GetFontInfo(), glyph_index,
+                           &advance_width, &left_side_bearing);
+
+    Glyph glyph(glyph_index, Glyph::Type::kPath,
+                Rect::MakeXYWH(0, 0, x1 - x0, y1 - y0));
+    run.AddGlyph(glyph, {x + (left_side_bearing * scale), y});
+
+    if (i + 1 < text.size()) {
+      int kerning = stbtt_GetCodepointKernAdvance(typeface_stb->GetFontInfo(),
+                                                  text[i], text[i + 1]);
+      x += std::round((advance_width + kerning) * scale);
+    }
+  }
+
+  std::optional<Rect> result;
+  for (const auto& glyph_position : run.GetGlyphPositions()) {
+    Rect glyph_rect = Rect::MakeOriginSize(
+        glyph_position.position + glyph_position.glyph.bounds.GetOrigin(),
+        glyph_position.glyph.bounds.GetSize());
+    result = result.has_value() ? result->Union(glyph_rect) : glyph_rect;
+  }
+
+  std::vector<TextRun> runs = {run};
+  return std::make_shared<TextFrame>(
+      runs, result.value_or(Rect::MakeLTRB(0, 0, 0, 0)), false);
+}
+
+}  // namespace impeller
diff --git a/impeller/base/platform/darwin/work_queue_darwin.h b/impeller/typographer/backends/stb/text_frame_stb.h
similarity index 34%
rename from impeller/base/platform/darwin/work_queue_darwin.h
rename to impeller/typographer/backends/stb/text_frame_stb.h
index c82aca9eb285fd9f533754c3631349c9450efba9..f37426f2d8c58adc497ebf4ec8339ae048672f18 100644
--- a/impeller/base/platform/darwin/work_queue_darwin.h
+++ b/impeller/typographer/backends/stb/text_frame_stb.h
@@ -2,35 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
-
-#include <dispatch/dispatch.h>
-
-#include <memory>
+#ifndef FLUTTER_IMPELLER_TYPOGRAPHER_BACKENDS_STB_TEXT_FRAME_STB_H_
+#define FLUTTER_IMPELLER_TYPOGRAPHER_BACKENDS_STB_TEXT_FRAME_STB_H_
 
 #include "flutter/fml/macros.h"
-#include "impeller/base/work_queue.h"
+#include "impeller/typographer/backends/stb/typeface_stb.h"
+#include "impeller/typographer/text_frame.h"
 
 namespace impeller {
 
-class WorkQueueDarwin final : public WorkQueue {
- public:
-  static std::shared_ptr<WorkQueueDarwin> Create();
-
-  // |WorkQueue|
-  ~WorkQueueDarwin();
-
-  bool IsValid() const;
-
- private:
-  dispatch_queue_t queue_ = NULL;
-
-  WorkQueueDarwin();
-
-  // |WorkQueue|
-  void PostTask(fml::closure task) override;
-
-  FML_DISALLOW_COPY_AND_ASSIGN(WorkQueueDarwin);
-};
+std::shared_ptr<TextFrame> MakeTextFrameSTB(
+    const std::shared_ptr<TypefaceSTB>& typeface_stb,
+    Font::Metrics metrics,
+    const std::string& text);
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_TYPOGRAPHER_BACKENDS_STB_TEXT_FRAME_STB_H_
diff --git a/impeller/typographer/backends/stb/typeface_stb.cc b/impeller/typographer/backends/stb/typeface_stb.cc
new file mode 100644
index 0000000000000000000000000000000000000000..573aec6c49d56a26910889f381b607188d4e0405
--- /dev/null
+++ b/impeller/typographer/backends/stb/typeface_stb.cc
@@ -0,0 +1,53 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/typographer/backends/stb/typeface_stb.h"
+
+#include <cstring>
+
+#include "flutter/fml/logging.h"
+
+namespace impeller {
+
+// Instantiate a typeface based on a .ttf or other font file
+TypefaceSTB::TypefaceSTB(std::unique_ptr<fml::Mapping> typeface_mapping)
+    : typeface_mapping_(std::move(typeface_mapping)),
+      font_info_(std::make_unique<stbtt_fontinfo>()) {
+  // We need an "offset" into the ttf file
+  auto offset = stbtt_GetFontOffsetForIndex(typeface_mapping_->GetMapping(), 0);
+  if (stbtt_InitFont(font_info_.get(), typeface_mapping_->GetMapping(),
+                     offset) == 0) {
+    FML_LOG(ERROR) << "Failed to initialize stb font from binary data.";
+  } else {
+    is_valid_ = true;
+  }
+}
+
+TypefaceSTB::~TypefaceSTB() = default;
+
+bool TypefaceSTB::IsValid() const {
+  return is_valid_;
+}
+
+std::size_t TypefaceSTB::GetHash() const {
+  if (!IsValid()) {
+    return 0u;
+  }
+  return reinterpret_cast<size_t>(typeface_mapping_->GetMapping());
+}
+
+bool TypefaceSTB::IsEqual(const Typeface& other) const {
+  auto stb_other = reinterpret_cast<const TypefaceSTB*>(&other);
+  return stb_other->GetHash() == GetHash();
+}
+
+const uint8_t* TypefaceSTB::GetTypefaceFile() const {
+  return typeface_mapping_->GetMapping();
+}
+
+const stbtt_fontinfo* TypefaceSTB::GetFontInfo() const {
+  return font_info_.get();
+}
+
+}  // namespace impeller
diff --git a/impeller/typographer/backends/stb/typeface_stb.h b/impeller/typographer/backends/stb/typeface_stb.h
new file mode 100644
index 0000000000000000000000000000000000000000..c0f2c04083fcaef11190a669c43b055d2dc58002
--- /dev/null
+++ b/impeller/typographer/backends/stb/typeface_stb.h
@@ -0,0 +1,51 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_TYPOGRAPHER_BACKENDS_STB_TYPEFACE_STB_H_
+#define FLUTTER_IMPELLER_TYPOGRAPHER_BACKENDS_STB_TYPEFACE_STB_H_
+
+#include "flutter/fml/macros.h"
+#include "flutter/fml/mapping.h"
+#include "flutter/third_party/stb/stb_truetype.h"
+#include "impeller/base/backend_cast.h"
+#include "impeller/typographer/typeface.h"
+
+namespace impeller {
+
+class TypefaceSTB final : public Typeface,
+                          public BackendCast<TypefaceSTB, Typeface> {
+ public:
+  // "Typical" conversion from font Points to Pixels.
+  // This assumes a constant pixels per em.
+  static constexpr float kPointsToPixels = 96.0 / 72.0;
+
+  explicit TypefaceSTB(std::unique_ptr<fml::Mapping> typeface_mapping);
+
+  ~TypefaceSTB() override;
+
+  // |Typeface|
+  bool IsValid() const override;
+
+  // |Comparable<Typeface>|
+  std::size_t GetHash() const override;
+
+  // |Comparable<Typeface>|
+  bool IsEqual(const Typeface& other) const override;
+
+  const uint8_t* GetTypefaceFile() const;
+  const stbtt_fontinfo* GetFontInfo() const;
+
+ private:
+  std::unique_ptr<fml::Mapping> typeface_mapping_;
+  std::unique_ptr<stbtt_fontinfo> font_info_;
+  bool is_valid_ = false;
+
+  TypefaceSTB(const TypefaceSTB&) = delete;
+
+  TypefaceSTB& operator=(const TypefaceSTB&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_TYPOGRAPHER_BACKENDS_STB_TYPEFACE_STB_H_
diff --git a/impeller/typographer/backends/stb/typographer_context_stb.cc b/impeller/typographer/backends/stb/typographer_context_stb.cc
new file mode 100644
index 0000000000000000000000000000000000000000..6c5bcad66748315b6aa3babe923775af47cb887a
--- /dev/null
+++ b/impeller/typographer/backends/stb/typographer_context_stb.cc
@@ -0,0 +1,541 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/typographer/backends/stb/typographer_context_stb.h"
+
+#include <numeric>
+#include <utility>
+
+#include "flutter/fml/logging.h"
+#include "flutter/fml/trace_event.h"
+#include "impeller/base/allocation.h"
+#include "impeller/core/allocator.h"
+#include "impeller/typographer/backends/stb/glyph_atlas_context_stb.h"
+#include "impeller/typographer/font_glyph_pair.h"
+#include "typeface_stb.h"
+
+#define DISABLE_COLOR_FONT_SUPPORT 1
+#ifdef DISABLE_COLOR_FONT_SUPPORT
+constexpr auto kColorFontBitsPerPixel = 1;
+#else
+constexpr auto kColorFontBitsPerPixel = 4;
+#endif
+
+namespace impeller {
+
+constexpr size_t kPadding = 1;
+
+std::unique_ptr<TypographerContext> TypographerContextSTB::Make() {
+  return std::make_unique<TypographerContextSTB>();
+}
+
+TypographerContextSTB::TypographerContextSTB() : TypographerContext() {}
+
+TypographerContextSTB::~TypographerContextSTB() = default;
+
+std::shared_ptr<GlyphAtlasContext>
+TypographerContextSTB::CreateGlyphAtlasContext() const {
+  return std::make_shared<GlyphAtlasContextSTB>();
+}
+
+// Function returns the count of "remaining pairs" not packed into rect of given
+// size.
+static size_t PairsFitInAtlasOfSize(
+    const std::vector<FontGlyphPair>& pairs,
+    const ISize& atlas_size,
+    std::vector<Rect>& glyph_positions,
+    const std::shared_ptr<RectanglePacker>& rect_packer) {
+  if (atlas_size.IsEmpty()) {
+    return false;
+  }
+
+  glyph_positions.clear();
+  glyph_positions.reserve(pairs.size());
+
+  size_t i = 0;
+  for (auto it = pairs.begin(); it != pairs.end(); ++i, ++it) {
+    const auto& pair = *it;
+    const Font& font = pair.scaled_font.font;
+
+    // We downcast to the correct typeface type to access `stb` specific
+    // methods.
+    std::shared_ptr<TypefaceSTB> typeface_stb =
+        std::reinterpret_pointer_cast<TypefaceSTB>(font.GetTypeface());
+    // Conversion factor to scale font size in Points to pixels.
+    // Note this assumes typical DPI.
+    float text_size_pixels =
+        font.GetMetrics().point_size * TypefaceSTB::kPointsToPixels;
+
+    ISize glyph_size;
+    {
+      int x0 = 0, y0 = 0, x1 = 0, y1 = 0;
+      // NOTE: We increase the size of the glyph by one pixel in all dimensions
+      // to allow us to cut out padding later.
+      float scale = stbtt_ScaleForPixelHeight(typeface_stb->GetFontInfo(),
+                                              text_size_pixels);
+      stbtt_GetGlyphBitmapBox(typeface_stb->GetFontInfo(), pair.glyph.index,
+                              scale, scale, &x0, &y0, &x1, &y1);
+
+      glyph_size = ISize(x1 - x0, y1 - y0);
+    }
+
+    IPoint16 location_in_atlas;
+    if (!rect_packer->addRect(glyph_size.width + kPadding,   //
+                              glyph_size.height + kPadding,  //
+                              &location_in_atlas             //
+                              )) {
+      return pairs.size() - i;
+    }
+    glyph_positions.emplace_back(Rect::MakeXYWH(location_in_atlas.x(),  //
+                                                location_in_atlas.y(),  //
+                                                glyph_size.width,       //
+                                                glyph_size.height       //
+                                                ));
+  }
+
+  return 0;
+}
+
+static bool CanAppendToExistingAtlas(
+    const std::shared_ptr<GlyphAtlas>& atlas,
+    const std::vector<FontGlyphPair>& extra_pairs,
+    std::vector<Rect>& glyph_positions,
+    ISize atlas_size,
+    const std::shared_ptr<RectanglePacker>& rect_packer) {
+  TRACE_EVENT0("impeller", __FUNCTION__);
+  if (!rect_packer || atlas_size.IsEmpty()) {
+    return false;
+  }
+
+  // We assume that all existing glyphs will fit. After all, they fit before.
+  // The glyph_positions only contains the values for the additional glyphs
+  // from extra_pairs.
+  FML_DCHECK(glyph_positions.size() == 0);
+  glyph_positions.reserve(extra_pairs.size());
+  for (size_t i = 0; i < extra_pairs.size(); i++) {
+    const FontGlyphPair& pair = extra_pairs[i];
+    const Font& font = pair.scaled_font.font;
+
+    // We downcast to the correct typeface type to access `stb` specific methods
+    std::shared_ptr<TypefaceSTB> typeface_stb =
+        std::reinterpret_pointer_cast<TypefaceSTB>(font.GetTypeface());
+    // Conversion factor to scale font size in Points to pixels.
+    // Note this assumes typical DPI.
+    float text_size_pixels =
+        font.GetMetrics().point_size * TypefaceSTB::kPointsToPixels;
+
+    ISize glyph_size;
+    {
+      int x0 = 0, y0 = 0, x1 = 0, y1 = 0;
+      // NOTE: We increase the size of the glyph by one pixel in all dimensions
+      // to allow us to cut out padding later.
+      float scale_y = stbtt_ScaleForPixelHeight(typeface_stb->GetFontInfo(),
+                                                text_size_pixels);
+      float scale_x = scale_y;
+      stbtt_GetGlyphBitmapBox(typeface_stb->GetFontInfo(), pair.glyph.index,
+                              scale_x, scale_y, &x0, &y0, &x1, &y1);
+
+      glyph_size = ISize(x1 - x0, y1 - y0);
+    }
+
+    IPoint16 location_in_atlas;
+    if (!rect_packer->addRect(glyph_size.width + kPadding,   //
+                              glyph_size.height + kPadding,  //
+                              &location_in_atlas             //
+                              )) {
+      return false;
+    }
+    glyph_positions.emplace_back(Rect::MakeXYWH(location_in_atlas.x(),  //
+                                                location_in_atlas.y(),  //
+                                                glyph_size.width,       //
+                                                glyph_size.height       //
+                                                ));
+  }
+
+  return true;
+}
+
+static ISize OptimumAtlasSizeForFontGlyphPairs(
+    const std::vector<FontGlyphPair>& pairs,
+    std::vector<Rect>& glyph_positions,
+    const std::shared_ptr<GlyphAtlasContext>& atlas_context,
+    GlyphAtlas::Type type,
+    const ISize& max_texture_size) {
+  static constexpr auto kMinAtlasSize = 8u;
+  static constexpr auto kMinAlphaBitmapSize = 1024u;
+
+  TRACE_EVENT0("impeller", __FUNCTION__);
+
+  ISize current_size = type == GlyphAtlas::Type::kAlphaBitmap
+                           ? ISize(kMinAlphaBitmapSize, kMinAlphaBitmapSize)
+                           : ISize(kMinAtlasSize, kMinAtlasSize);
+  size_t total_pairs = pairs.size() + 1;
+  do {
+    auto rect_packer = std::shared_ptr<RectanglePacker>(
+        RectanglePacker::Factory(current_size.width, current_size.height));
+
+    auto remaining_pairs = PairsFitInAtlasOfSize(pairs, current_size,
+                                                 glyph_positions, rect_packer);
+    if (remaining_pairs == 0) {
+      atlas_context->UpdateRectPacker(rect_packer);
+      return current_size;
+    } else if (remaining_pairs < std::ceil(total_pairs / 2)) {
+      current_size = ISize::MakeWH(
+          std::max(current_size.width, current_size.height),
+          Allocation::NextPowerOfTwoSize(
+              std::min(current_size.width, current_size.height) + 1));
+    } else {
+      current_size = ISize::MakeWH(
+          Allocation::NextPowerOfTwoSize(current_size.width + 1),
+          Allocation::NextPowerOfTwoSize(current_size.height + 1));
+    }
+  } while (current_size.width <= max_texture_size.width &&
+           current_size.height <= max_texture_size.height);
+  return ISize{0, 0};
+}
+
+static void DrawGlyph(BitmapSTB* bitmap,
+                      const ScaledFont& scaled_font,
+                      const Glyph& glyph,
+                      const Rect& location,
+                      bool has_color) {
+  const auto& metrics = scaled_font.font.GetMetrics();
+
+  const impeller::Font& font = scaled_font.font;
+  auto typeface = font.GetTypeface();
+  // We downcast to the correct typeface type to access `stb` specific methods
+  std::shared_ptr<TypefaceSTB> typeface_stb =
+      std::reinterpret_pointer_cast<TypefaceSTB>(typeface);
+  // Conversion factor to scale font size in Points to pixels.
+  // Note this assumes typical DPI.
+  float text_size_pixels = metrics.point_size * TypefaceSTB::kPointsToPixels;
+  float scale_y =
+      stbtt_ScaleForPixelHeight(typeface_stb->GetFontInfo(), text_size_pixels);
+  float scale_x = scale_y;
+
+  auto output = bitmap->GetPixelAddress({static_cast<size_t>(location.GetX()),
+                                         static_cast<size_t>(location.GetY())});
+  // For Alpha and Signed Distance field bitmaps we can use STB to draw the
+  // Glyph in place
+  if (!has_color || DISABLE_COLOR_FONT_SUPPORT) {
+    stbtt_MakeGlyphBitmap(typeface_stb->GetFontInfo(), output,
+                          location.GetWidth() - kPadding,
+                          location.GetHeight() - kPadding,
+                          bitmap->GetRowBytes(), scale_x, scale_y, glyph.index);
+  } else {
+    // But for color bitmaps we need to get the glyph pixels and then carry all
+    // channels into the atlas bitmap. This may not be performant but I'm unsure
+    // of any other approach currently.
+    int glyph_bitmap_width = 0;
+    int glyph_bitmap_height = 0;
+    int glyph_bitmap_xoff = 0;
+    int glyph_bitmap_yoff = 0;
+    auto glyph_pixels = stbtt_GetGlyphBitmap(
+        typeface_stb->GetFontInfo(), scale_x, scale_y, glyph.index,
+        &glyph_bitmap_width, &glyph_bitmap_height, &glyph_bitmap_xoff,
+        &glyph_bitmap_yoff);
+
+    uint8_t* write_pos = output;
+    for (auto y = 0; y < glyph_bitmap_height; ++y) {
+      for (auto x = 0; x < glyph_bitmap_width; ++x) {
+        // Color bitmaps write as White (i.e. what is 0 in an alpha bitmap is
+        // 255 in a color bitmap) But not alpha. Alpha still carries
+        // transparency info in the normal way.
+        // There's some issue with color fonts, in that if the pixel color is
+        // nonzero, the alpha is ignored during rendering. That is, partially
+        // (or fully) transparent pixels with nonzero color are rendered as
+        // fully opaque.
+        uint8_t a = glyph_pixels[x + y * glyph_bitmap_width];
+        uint8_t c = 255 - a;
+
+        // Red channel
+        *write_pos = c;
+        write_pos++;
+        // Green channel
+        *write_pos = c;
+        write_pos++;
+        // Blue channel
+        *write_pos = c;
+        write_pos++;
+        // Alpha channel
+        *write_pos = a;
+        write_pos++;
+      }
+      // next row
+      write_pos = output + (y * bitmap->GetRowBytes());
+    }
+    stbtt_FreeBitmap(glyph_pixels, nullptr);
+  }
+}
+
+static bool UpdateAtlasBitmap(const GlyphAtlas& atlas,
+                              const std::shared_ptr<BitmapSTB>& bitmap,
+                              const std::vector<FontGlyphPair>& new_pairs) {
+  TRACE_EVENT0("impeller", __FUNCTION__);
+  FML_DCHECK(bitmap != nullptr);
+
+  bool has_color = atlas.GetType() == GlyphAtlas::Type::kColorBitmap;
+
+  for (const FontGlyphPair& pair : new_pairs) {
+    auto pos = atlas.FindFontGlyphBounds(pair);
+    if (!pos.has_value()) {
+      continue;
+    }
+    DrawGlyph(bitmap.get(), pair.scaled_font, pair.glyph, pos.value(),
+              has_color);
+  }
+  return true;
+}
+
+static std::shared_ptr<BitmapSTB> CreateAtlasBitmap(const GlyphAtlas& atlas,
+                                                    const ISize& atlas_size) {
+  TRACE_EVENT0("impeller", __FUNCTION__);
+
+  size_t bytes_per_pixel = 1;
+  if (atlas.GetType() == GlyphAtlas::Type::kColorBitmap &&
+      !DISABLE_COLOR_FONT_SUPPORT) {
+    bytes_per_pixel = kColorFontBitsPerPixel;
+  }
+  auto bitmap = std::make_shared<BitmapSTB>(atlas_size.width, atlas_size.height,
+                                            bytes_per_pixel);
+
+  bool has_color = atlas.GetType() == GlyphAtlas::Type::kColorBitmap;
+
+  atlas.IterateGlyphs([&bitmap, has_color](const ScaledFont& scaled_font,
+                                           const Glyph& glyph,
+                                           const Rect& location) -> bool {
+    DrawGlyph(bitmap.get(), scaled_font, glyph, location, has_color);
+    return true;
+  });
+
+  return bitmap;
+}
+
+// static bool UpdateGlyphTextureAtlas(std::shared_ptr<SkBitmap> bitmap,
+static bool UpdateGlyphTextureAtlas(std::shared_ptr<BitmapSTB>& bitmap,
+                                    const std::shared_ptr<Texture>& texture) {
+  TRACE_EVENT0("impeller", __FUNCTION__);
+
+  FML_DCHECK(bitmap != nullptr);
+
+  auto texture_descriptor = texture->GetTextureDescriptor();
+
+  auto mapping = std::make_shared<fml::NonOwnedMapping>(
+      reinterpret_cast<const uint8_t*>(bitmap->GetPixels()),  // data
+      texture_descriptor.GetByteSizeOfBaseMipLevel()          // size
+      // As the bitmap is static in this module I believe we don't need to
+      // specify a release proc.
+  );
+
+  return texture->SetContents(mapping);
+}
+
+static std::shared_ptr<Texture> UploadGlyphTextureAtlas(
+    const std::shared_ptr<Allocator>& allocator,
+    std::shared_ptr<BitmapSTB>& bitmap,
+    const ISize& atlas_size,
+    PixelFormat format) {
+  TRACE_EVENT0("impeller", __FUNCTION__);
+  if (!allocator) {
+    return nullptr;
+  }
+
+  FML_DCHECK(bitmap != nullptr);
+
+  TextureDescriptor texture_descriptor;
+  texture_descriptor.storage_mode = StorageMode::kHostVisible;
+  texture_descriptor.format = format;
+  texture_descriptor.size = atlas_size;
+
+  if (bitmap->GetRowBytes() * bitmap->GetHeight() !=
+      texture_descriptor.GetByteSizeOfBaseMipLevel()) {
+    return nullptr;
+  }
+
+  auto texture = allocator->CreateTexture(texture_descriptor);
+  if (!texture || !texture->IsValid()) {
+    return nullptr;
+  }
+  texture->SetLabel("GlyphAtlas");
+
+  auto mapping = std::make_shared<fml::NonOwnedMapping>(
+      reinterpret_cast<const uint8_t*>(bitmap->GetPixels()),  // data
+      texture_descriptor.GetByteSizeOfBaseMipLevel()          // size
+      // As the bitmap is static in this module I believe we don't need to
+      // specify a release proc.
+  );
+
+  if (!texture->SetContents(mapping)) {
+    return nullptr;
+  }
+  return texture;
+}
+
+std::shared_ptr<GlyphAtlas> TypographerContextSTB::CreateGlyphAtlas(
+    Context& context,
+    GlyphAtlas::Type type,
+    const std::shared_ptr<GlyphAtlasContext>& atlas_context,
+    const FontGlyphMap& font_glyph_map) const {
+  TRACE_EVENT0("impeller", __FUNCTION__);
+  if (!IsValid()) {
+    return nullptr;
+  }
+  auto& atlas_context_stb = GlyphAtlasContextSTB::Cast(*atlas_context);
+  std::shared_ptr<GlyphAtlas> last_atlas = atlas_context->GetGlyphAtlas();
+
+  if (font_glyph_map.empty()) {
+    return last_atlas;
+  }
+
+  // ---------------------------------------------------------------------------
+  // Step 1: Determine if the atlas type and font glyph pairs are compatible
+  //         with the current atlas and reuse if possible.
+  // ---------------------------------------------------------------------------
+  std::vector<FontGlyphPair> new_glyphs;
+  for (const auto& font_value : font_glyph_map) {
+    const ScaledFont& scaled_font = font_value.first;
+    const FontGlyphAtlas* font_glyph_atlas =
+        last_atlas->GetFontGlyphAtlas(scaled_font.font, scaled_font.scale);
+    if (font_glyph_atlas) {
+      for (const Glyph& glyph : font_value.second) {
+        if (!font_glyph_atlas->FindGlyphBounds(glyph)) {
+          new_glyphs.emplace_back(scaled_font, glyph);
+        }
+      }
+    } else {
+      for (const Glyph& glyph : font_value.second) {
+        new_glyphs.emplace_back(scaled_font, glyph);
+      }
+    }
+  }
+  if (last_atlas->GetType() == type && new_glyphs.size() == 0) {
+    return last_atlas;
+  }
+
+  // ---------------------------------------------------------------------------
+  // Step 2: Determine if the additional missing glyphs can be appended to the
+  //         existing bitmap without recreating the atlas. This requires that
+  //         the type is identical.
+  // ---------------------------------------------------------------------------
+  std::vector<Rect> glyph_positions;
+  if (last_atlas->GetType() == type &&
+      CanAppendToExistingAtlas(last_atlas, new_glyphs, glyph_positions,
+                               atlas_context->GetAtlasSize(),
+                               atlas_context->GetRectPacker())) {
+    // The old bitmap will be reused and only the additional glyphs will be
+    // added.
+
+    // ---------------------------------------------------------------------------
+    // Step 3a: Record the positions in the glyph atlas of the newly added
+    // glyphs.
+    // ---------------------------------------------------------------------------
+    for (size_t i = 0, count = glyph_positions.size(); i < count; i++) {
+      last_atlas->AddTypefaceGlyphPosition(new_glyphs[i], glyph_positions[i]);
+    }
+
+    // ---------------------------------------------------------------------------
+    // Step 4a: Draw new font-glyph pairs into the existing bitmap.
+    // ---------------------------------------------------------------------------
+    // auto bitmap = atlas_context->GetBitmap();
+    auto bitmap = atlas_context_stb.GetBitmap();
+    if (!UpdateAtlasBitmap(*last_atlas, bitmap, new_glyphs)) {
+      return nullptr;
+    }
+
+    // ---------------------------------------------------------------------------
+    // Step 5a: Update the existing texture with the updated bitmap.
+    // ---------------------------------------------------------------------------
+    if (!UpdateGlyphTextureAtlas(bitmap, last_atlas->GetTexture())) {
+      return nullptr;
+    }
+    return last_atlas;
+  }
+  // A new glyph atlas must be created.
+
+  // ---------------------------------------------------------------------------
+  // Step 3b: Get the optimum size of the texture atlas.
+  // ---------------------------------------------------------------------------
+  std::vector<FontGlyphPair> font_glyph_pairs;
+  font_glyph_pairs.reserve(std::accumulate(
+      font_glyph_map.begin(), font_glyph_map.end(), 0,
+      [](const int a, const auto& b) { return a + b.second.size(); }));
+  for (const auto& font_value : font_glyph_map) {
+    const ScaledFont& scaled_font = font_value.first;
+    for (const Glyph& glyph : font_value.second) {
+      font_glyph_pairs.push_back({scaled_font, glyph});
+    }
+  }
+  auto glyph_atlas = std::make_shared<GlyphAtlas>(type);
+  auto atlas_size = OptimumAtlasSizeForFontGlyphPairs(
+      font_glyph_pairs,                                             //
+      glyph_positions,                                              //
+      atlas_context,                                                //
+      type,                                                         //
+      context.GetResourceAllocator()->GetMaxTextureSizeSupported()  //
+  );
+
+  atlas_context->UpdateGlyphAtlas(glyph_atlas, atlas_size);
+  if (atlas_size.IsEmpty()) {
+    return nullptr;
+  }
+
+  // ---------------------------------------------------------------------------
+  // Step 4b: Find location of font-glyph pairs in the atlas. We have this from
+  // the last step. So no need to do create another rect packer. But just do a
+  // sanity check of counts. This could also be just an assertion as only a
+  // construction issue would cause such a failure.
+  // ---------------------------------------------------------------------------
+  if (glyph_positions.size() != font_glyph_pairs.size()) {
+    return nullptr;
+  }
+
+  // ---------------------------------------------------------------------------
+  // Step 5b: Record the positions in the glyph atlas.
+  // ---------------------------------------------------------------------------
+  {
+    size_t i = 0;
+    for (auto it = font_glyph_pairs.begin(); it != font_glyph_pairs.end();
+         ++i, ++it) {
+      glyph_atlas->AddTypefaceGlyphPosition(*it, glyph_positions[i]);
+    }
+  }
+
+  // ---------------------------------------------------------------------------
+  // Step 6b: Draw font-glyph pairs in the correct spot in the atlas.
+  // ---------------------------------------------------------------------------
+  auto bitmap = CreateAtlasBitmap(*glyph_atlas, atlas_size);
+  if (!bitmap) {
+    return nullptr;
+  }
+  atlas_context_stb.UpdateBitmap(bitmap);
+
+  // ---------------------------------------------------------------------------
+  // Step 7b: Upload the atlas as a texture.
+  // ---------------------------------------------------------------------------
+  PixelFormat format;
+  switch (type) {
+    case GlyphAtlas::Type::kAlphaBitmap:
+      format = context.GetCapabilities()->GetDefaultGlyphAtlasFormat();
+      break;
+    case GlyphAtlas::Type::kColorBitmap:
+      format = DISABLE_COLOR_FONT_SUPPORT
+                   ? context.GetCapabilities()->GetDefaultGlyphAtlasFormat()
+                   : PixelFormat::kR8G8B8A8UNormInt;
+      break;
+  }
+  auto texture = UploadGlyphTextureAtlas(context.GetResourceAllocator(), bitmap,
+                                         atlas_size, format);
+  if (!texture) {
+    return nullptr;
+  }
+
+  // ---------------------------------------------------------------------------
+  // Step 8b: Record the texture in the glyph atlas.
+  // ---------------------------------------------------------------------------
+  glyph_atlas->SetTexture(std::move(texture));
+
+  return glyph_atlas;
+}
+
+}  // namespace impeller
diff --git a/impeller/typographer/backends/stb/typographer_context_stb.h b/impeller/typographer/backends/stb/typographer_context_stb.h
new file mode 100644
index 0000000000000000000000000000000000000000..30f54a031ca50b39347a44f5749f9205c20e0fba
--- /dev/null
+++ b/impeller/typographer/backends/stb/typographer_context_stb.h
@@ -0,0 +1,41 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_TYPOGRAPHER_BACKENDS_STB_TYPOGRAPHER_CONTEXT_STB_H_
+#define FLUTTER_IMPELLER_TYPOGRAPHER_BACKENDS_STB_TYPOGRAPHER_CONTEXT_STB_H_
+
+#include "impeller/typographer/typographer_context.h"
+
+#include <memory>
+#include "flutter/fml/macros.h"
+
+namespace impeller {
+
+class TypographerContextSTB : public TypographerContext {
+ public:
+  static std::unique_ptr<TypographerContext> Make();
+
+  TypographerContextSTB();
+
+  ~TypographerContextSTB() override;
+
+  // |TypographerContext|
+  std::shared_ptr<GlyphAtlasContext> CreateGlyphAtlasContext() const override;
+
+  // |TypographerContext|
+  std::shared_ptr<GlyphAtlas> CreateGlyphAtlas(
+      Context& context,
+      GlyphAtlas::Type type,
+      const std::shared_ptr<GlyphAtlasContext>& atlas_context,
+      const FontGlyphMap& font_glyph_map) const override;
+
+ private:
+  TypographerContextSTB(const TypographerContextSTB&) = delete;
+
+  TypographerContextSTB& operator=(const TypographerContextSTB&) = delete;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_TYPOGRAPHER_BACKENDS_STB_TYPOGRAPHER_CONTEXT_STB_H_
diff --git a/impeller/typographer/font.h b/impeller/typographer/font.h
index 0867edcbf71c6f60cce2dbb3cf7162eb45b894b1..4f21748d5e7692674fdd96a3c176139f8dd218bc 100644
--- a/impeller/typographer/font.h
+++ b/impeller/typographer/font.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_TYPOGRAPHER_FONT_H_
+#define FLUTTER_IMPELLER_TYPOGRAPHER_FONT_H_
 
 #include <memory>
 #include <optional>
@@ -11,7 +12,6 @@
 #include "impeller/base/comparable.h"
 #include "impeller/typographer/glyph.h"
 #include "impeller/typographer/typeface.h"
-#include "include/core/SkFont.h"
 
 namespace impeller {
 
@@ -29,12 +29,6 @@ class Font : public Comparable<Font> {
   ///             the baseline with an upper-left-origin coordinate system.
   ///
   struct Metrics {
-    //--------------------------------------------------------------------------
-    /// The scaling factor that should be used when rendering this font to an
-    /// atlas. This should normally be set in accordance with the transformation
-    /// matrix that will be used to position glyph geometry.
-    ///
-    Scalar scale = 1.0f;
     //--------------------------------------------------------------------------
     /// The point size of the font.
     ///
@@ -44,8 +38,8 @@ class Font : public Comparable<Font> {
     Scalar scaleX = 1.0f;
 
     constexpr bool operator==(const Metrics& o) const {
-      return scale == o.scale && point_size == o.point_size &&
-             embolden == o.embolden && skewX == o.skewX && scaleX == o.scaleX;
+      return point_size == o.point_size && embolden == o.embolden &&
+             skewX == o.skewX && scaleX == o.scaleX;
     }
   };
 
@@ -81,6 +75,8 @@ class Font : public Comparable<Font> {
 template <>
 struct std::hash<impeller::Font::Metrics> {
   constexpr std::size_t operator()(const impeller::Font::Metrics& m) const {
-    return fml::HashCombine(m.scale, m.point_size);
+    return fml::HashCombine(m.point_size, m.skewX, m.scaleX);
   }
 };
+
+#endif  // FLUTTER_IMPELLER_TYPOGRAPHER_FONT_H_
diff --git a/impeller/typographer/font_glyph_pair.h b/impeller/typographer/font_glyph_pair.h
index b8cb7b0af2811b32c1f497dbe4126204d1a830e9..dd2d47e82b4eef45f19347adbef85f32b1a66fee 100644
--- a/impeller/typographer/font_glyph_pair.h
+++ b/impeller/typographer/font_glyph_pair.h
@@ -2,9 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_TYPOGRAPHER_FONT_GLYPH_PAIR_H_
+#define FLUTTER_IMPELLER_TYPOGRAPHER_FONT_GLYPH_PAIR_H_
 
 #include <optional>
+#include <unordered_map>
 #include <unordered_set>
 #include <vector>
 
@@ -16,29 +18,42 @@
 namespace impeller {
 
 //------------------------------------------------------------------------------
-/// @brief      A font along with a glyph in that font. Used in glyph atlases as
-///             keys.
+/// @brief      A font and a scale.  Used as a key that represents a typeface
+///             within a glyph atlas.
 ///
-struct FontGlyphPair {
-  struct Hash;
-  struct Equal;
+struct ScaledFont {
+  Font font;
+  Scalar scale;
+};
 
-  using Set = std::unordered_set<FontGlyphPair, Hash, Equal>;
-  using Vector = std::vector<FontGlyphPair>;
+using FontGlyphMap = std::unordered_map<ScaledFont, std::unordered_set<Glyph>>;
 
-  Font font;
-  Glyph glyph;
-
-  struct Hash {
-    std::size_t operator()(const FontGlyphPair& p) const {
-      return fml::HashCombine(p.font.GetHash(), p.glyph);
-    }
-  };
-  struct Equal {
-    bool operator()(const FontGlyphPair& lhs, const FontGlyphPair& rhs) const {
-      return lhs.font.IsEqual(rhs.font) && lhs.glyph.index == rhs.glyph.index;
-    }
-  };
+//------------------------------------------------------------------------------
+/// @brief      A font along with a glyph in that font rendered at a particular
+///             scale.
+///
+struct FontGlyphPair {
+  FontGlyphPair(const ScaledFont& sf, const Glyph& g)
+      : scaled_font(sf), glyph(g) {}
+  const ScaledFont& scaled_font;
+  const Glyph& glyph;
 };
 
 }  // namespace impeller
+
+template <>
+struct std::hash<impeller::ScaledFont> {
+  constexpr std::size_t operator()(const impeller::ScaledFont& sf) const {
+    return fml::HashCombine(sf.font.GetHash(), sf.scale);
+  }
+};
+
+template <>
+struct std::equal_to<impeller::ScaledFont> {
+  constexpr bool operator()(const impeller::ScaledFont& lhs,
+                            const impeller::ScaledFont& rhs) const {
+    return lhs.font.IsEqual(rhs.font) && lhs.scale == rhs.scale;
+  }
+};
+
+#endif  // FLUTTER_IMPELLER_TYPOGRAPHER_FONT_GLYPH_PAIR_H_
diff --git a/impeller/typographer/glyph.h b/impeller/typographer/glyph.h
index 82ba5e4b299d89bc651683ad6444602b02b25797..7e2d688d2b43b0b5f706b919753681c0c1238314 100644
--- a/impeller/typographer/glyph.h
+++ b/impeller/typographer/glyph.h
@@ -2,11 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_TYPOGRAPHER_GLYPH_H_
+#define FLUTTER_IMPELLER_TYPOGRAPHER_GLYPH_H_
 
 #include <cstdint>
 #include <functional>
 
+#include "flutter/fml/hash_combine.h"
 #include "flutter/fml/macros.h"
 #include "impeller/geometry/rect.h"
 
@@ -16,7 +18,7 @@ namespace impeller {
 /// @brief      The glyph index in the typeface.
 ///
 struct Glyph {
-  enum class Type {
+  enum class Type : uint8_t {
     kPath,
     kBitmap,
   };
@@ -38,12 +40,26 @@ struct Glyph {
       : index(p_index), type(p_type), bounds(p_bounds) {}
 };
 
+// Many Glyph instances are instantiated, so care should be taken when
+// increasing the size.
+static_assert(sizeof(Glyph) == 20);
+
 }  // namespace impeller
 
 template <>
 struct std::hash<impeller::Glyph> {
   constexpr std::size_t operator()(const impeller::Glyph& g) const {
-    return g.index;
+    static_assert(sizeof(g.index) == 2);
+    static_assert(sizeof(g.type) == 1);
+    return (static_cast<size_t>(g.type) << 16) | g.index;
+  }
+};
+
+template <>
+struct std::equal_to<impeller::Glyph> {
+  constexpr bool operator()(const impeller::Glyph& lhs,
+                            const impeller::Glyph& rhs) const {
+    return lhs.index == rhs.index && lhs.type == rhs.type;
   }
 };
 
@@ -54,3 +70,5 @@ struct std::less<impeller::Glyph> {
     return lhs.index < rhs.index;
   }
 };
+
+#endif  // FLUTTER_IMPELLER_TYPOGRAPHER_GLYPH_H_
diff --git a/impeller/typographer/glyph_atlas.cc b/impeller/typographer/glyph_atlas.cc
index 3a6470e97404df9da7421ee74ed54e93f7edad5a..1f9bfaff8d7aeb24496dad64b8697e0c4339bbec 100644
--- a/impeller/typographer/glyph_atlas.cc
+++ b/impeller/typographer/glyph_atlas.cc
@@ -4,12 +4,14 @@
 
 #include "impeller/typographer/glyph_atlas.h"
 
+#include <numeric>
 #include <utility>
 
 namespace impeller {
 
 GlyphAtlasContext::GlyphAtlasContext()
-    : atlas_(std::make_shared<GlyphAtlas>(GlyphAtlas::Type::kAlphaBitmap)) {}
+    : atlas_(std::make_shared<GlyphAtlas>(GlyphAtlas::Type::kAlphaBitmap)),
+      atlas_size_(ISize(0, 0)) {}
 
 GlyphAtlasContext::~GlyphAtlasContext() {}
 
@@ -17,8 +19,23 @@ std::shared_ptr<GlyphAtlas> GlyphAtlasContext::GetGlyphAtlas() const {
   return atlas_;
 }
 
-void GlyphAtlasContext::UpdateGlyphAtlas(std::shared_ptr<GlyphAtlas> atlas) {
+const ISize& GlyphAtlasContext::GetAtlasSize() const {
+  return atlas_size_;
+}
+
+std::shared_ptr<RectanglePacker> GlyphAtlasContext::GetRectPacker() const {
+  return rect_packer_;
+}
+
+void GlyphAtlasContext::UpdateGlyphAtlas(std::shared_ptr<GlyphAtlas> atlas,
+                                         ISize size) {
   atlas_ = std::move(atlas);
+  atlas_size_ = size;
+}
+
+void GlyphAtlasContext::UpdateRectPacker(
+    std::shared_ptr<RectanglePacker> rect_packer) {
+  rect_packer_ = std::move(rect_packer);
 }
 
 GlyphAtlas::GlyphAtlas(Type type) : type_(type) {}
@@ -43,46 +60,60 @@ void GlyphAtlas::SetTexture(std::shared_ptr<Texture> texture) {
 
 void GlyphAtlas::AddTypefaceGlyphPosition(const FontGlyphPair& pair,
                                           Rect rect) {
-  positions_[pair] = rect;
+  font_atlas_map_[pair.scaled_font].positions_[pair.glyph] = rect;
 }
 
-std::optional<Rect> GlyphAtlas::FindFontGlyphPosition(
+std::optional<Rect> GlyphAtlas::FindFontGlyphBounds(
     const FontGlyphPair& pair) const {
-  auto found = positions_.find(pair);
-  if (found == positions_.end()) {
+  const auto& found = font_atlas_map_.find(pair.scaled_font);
+  if (found == font_atlas_map_.end()) {
     return std::nullopt;
   }
-  return found->second;
+  return found->second.FindGlyphBounds(pair.glyph);
+}
+
+const FontGlyphAtlas* GlyphAtlas::GetFontGlyphAtlas(const Font& font,
+                                                    Scalar scale) const {
+  const auto& found = font_atlas_map_.find({font, scale});
+  if (found == font_atlas_map_.end()) {
+    return nullptr;
+  }
+  return &found->second;
 }
 
 size_t GlyphAtlas::GetGlyphCount() const {
-  return positions_.size();
+  return std::accumulate(font_atlas_map_.begin(), font_atlas_map_.end(), 0,
+                         [](const int a, const auto& b) {
+                           return a + b.second.positions_.size();
+                         });
 }
 
 size_t GlyphAtlas::IterateGlyphs(
-    const std::function<bool(const FontGlyphPair& pair, const Rect& rect)>&
-        iterator) const {
+    const std::function<bool(const ScaledFont& scaled_font,
+                             const Glyph& glyph,
+                             const Rect& rect)>& iterator) const {
   if (!iterator) {
     return 0u;
   }
 
   size_t count = 0u;
-  for (const auto& position : positions_) {
-    count++;
-    if (!iterator(position.first, position.second)) {
-      return count;
+  for (const auto& font_value : font_atlas_map_) {
+    for (const auto& glyph_value : font_value.second.positions_) {
+      count++;
+      if (!iterator(font_value.first, glyph_value.first, glyph_value.second)) {
+        return count;
+      }
     }
   }
   return count;
 }
 
-bool GlyphAtlas::HasSamePairs(const FontGlyphPair::Vector& new_glyphs) {
-  for (const auto& pair : new_glyphs) {
-    if (positions_.find(pair) == positions_.end()) {
-      return false;
-    }
+std::optional<Rect> FontGlyphAtlas::FindGlyphBounds(const Glyph& glyph) const {
+  const auto& found = positions_.find(glyph);
+  if (found == positions_.end()) {
+    return std::nullopt;
   }
-  return true;
+  return found->second;
 }
 
 }  // namespace impeller
diff --git a/impeller/typographer/glyph_atlas.h b/impeller/typographer/glyph_atlas.h
index 0b533643b643712a2058ee249a3e0761960b1c42..9df7eecd4bd71195537aaa1dbfc3f41c8078f6fc 100644
--- a/impeller/typographer/glyph_atlas.h
+++ b/impeller/typographer/glyph_atlas.h
@@ -2,21 +2,24 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_TYPOGRAPHER_GLYPH_ATLAS_H_
+#define FLUTTER_IMPELLER_TYPOGRAPHER_GLYPH_ATLAS_H_
 
 #include <functional>
 #include <memory>
 #include <optional>
 #include <unordered_map>
 
-#include "flutter/fml/macros.h"
+#include "impeller/core/texture.h"
 #include "impeller/geometry/rect.h"
 #include "impeller/renderer/pipeline.h"
-#include "impeller/renderer/texture.h"
 #include "impeller/typographer/font_glyph_pair.h"
+#include "impeller/typographer/rectangle_packer.h"
 
 namespace impeller {
 
+class FontGlyphAtlas;
+
 //------------------------------------------------------------------------------
 /// @brief      A texture containing the bitmap representation of glyphs in
 ///             different fonts along with the ability to query the location of
@@ -27,17 +30,12 @@ class GlyphAtlas {
   //----------------------------------------------------------------------------
   /// @brief      Describes how the glyphs are represented in the texture.
   enum class Type {
-    //--------------------------------------------------------------------------
-    /// The glyphs are represented at a fixed size in an 8-bit grayscale texture
-    /// where the value of each pixel represents a signed-distance field that
-    /// stores the glyph outlines.
-    ///
-    kSignedDistanceField,
-
     //--------------------------------------------------------------------------
     /// The glyphs are reprsented at their requested size using only an 8-bit
-    /// alpha channel.
+    /// color channel.
     ///
+    /// This might be backed by a grey or red single channel texture, depending
+    /// on the backend capabilities.
     kAlphaBitmap,
 
     //--------------------------------------------------------------------------
@@ -103,8 +101,9 @@ class GlyphAtlas {
   /// @return     The number of glyphs iterated over.
   ///
   size_t IterateGlyphs(
-      const std::function<bool(const FontGlyphPair& pair, const Rect& rect)>&
-          iterator) const;
+      const std::function<bool(const ScaledFont& scaled_font,
+                               const Glyph& glyph,
+                               const Rect& rect)>& iterator) const;
 
   //----------------------------------------------------------------------------
   /// @brief      Find the location of a specific font-glyph pair in the atlas.
@@ -112,31 +111,33 @@ class GlyphAtlas {
   /// @param[in]  pair  The font-glyph pair
   ///
   /// @return     The location of the font-glyph pair in the atlas.
-  ///             `std::nullopt` of the pair in not in the atlas.
+  ///             `std::nullopt` if the pair is not in the atlas.
   ///
-  std::optional<Rect> FindFontGlyphPosition(const FontGlyphPair& pair) const;
+  std::optional<Rect> FindFontGlyphBounds(const FontGlyphPair& pair) const;
 
   //----------------------------------------------------------------------------
-  /// @brief      whether this atlas contains all of the same font-glyph pairs
-  ///             as the vector.
+  /// @brief      Obtain an interface for querying the location of glyphs in the
+  ///             atlas for the given font and scale.  This provides a more
+  ///             efficient way to look up a run of glyphs in the same font.
   ///
-  /// @param[in]  new_glyphs  The full set of new glyphs
+  /// @param[in]  font  The font
+  /// @param[in]  scale The scale
   ///
-  /// @return     Whether this atlas contains all passed pairs.
+  /// @return     A pointer to a FontGlyphAtlas, or nullptr if the font and
+  ///             scale are not available in the atlas.  The pointer is only
+  ///             valid for the lifetime of the GlyphAtlas.
   ///
-  bool HasSamePairs(const FontGlyphPair::Vector& new_glyphs);
+  const FontGlyphAtlas* GetFontGlyphAtlas(const Font& font, Scalar scale) const;
 
  private:
   const Type type_;
   std::shared_ptr<Texture> texture_;
 
-  std::unordered_map<FontGlyphPair,
-                     Rect,
-                     FontGlyphPair::Hash,
-                     FontGlyphPair::Equal>
-      positions_;
+  std::unordered_map<ScaledFont, FontGlyphAtlas> font_atlas_map_;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(GlyphAtlas);
+  GlyphAtlas(const GlyphAtlas&) = delete;
+
+  GlyphAtlas& operator=(const GlyphAtlas&) = delete;
 };
 
 //------------------------------------------------------------------------------
@@ -144,22 +145,66 @@ class GlyphAtlas {
 ///
 class GlyphAtlasContext {
  public:
-  GlyphAtlasContext();
-
-  ~GlyphAtlasContext();
+  virtual ~GlyphAtlasContext();
 
   //----------------------------------------------------------------------------
   /// @brief      Retrieve the current glyph atlas.
   std::shared_ptr<GlyphAtlas> GetGlyphAtlas() const;
 
+  //----------------------------------------------------------------------------
+  /// @brief      Retrieve the size of the current glyph atlas.
+  const ISize& GetAtlasSize() const;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Retrieve the previous (if any) rect packer.
+  std::shared_ptr<RectanglePacker> GetRectPacker() const;
+
   //----------------------------------------------------------------------------
   /// @brief      Update the context with a newly constructed glyph atlas.
-  void UpdateGlyphAtlas(std::shared_ptr<GlyphAtlas> atlas);
+  void UpdateGlyphAtlas(std::shared_ptr<GlyphAtlas> atlas, ISize size);
+
+  void UpdateRectPacker(std::shared_ptr<RectanglePacker> rect_packer);
+
+ protected:
+  GlyphAtlasContext();
 
  private:
   std::shared_ptr<GlyphAtlas> atlas_;
+  ISize atlas_size_;
+  std::shared_ptr<RectanglePacker> rect_packer_;
+
+  GlyphAtlasContext(const GlyphAtlasContext&) = delete;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(GlyphAtlasContext);
+  GlyphAtlasContext& operator=(const GlyphAtlasContext&) = delete;
+};
+
+//------------------------------------------------------------------------------
+/// @brief      An object that can look up glyph locations within the GlyphAtlas
+///             for a particular typeface.
+///
+class FontGlyphAtlas {
+ public:
+  FontGlyphAtlas() = default;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Find the location of a glyph in the atlas.
+  ///
+  /// @param[in]  glyph The glyph
+  ///
+  /// @return     The location of the glyph in the atlas.
+  ///             `std::nullopt` if the glyph is not in the atlas.
+  ///
+  std::optional<Rect> FindGlyphBounds(const Glyph& glyph) const;
+
+ private:
+  friend class GlyphAtlas;
+  std::unordered_map<Glyph, Rect> positions_;
+
+  FontGlyphAtlas(const FontGlyphAtlas&) = delete;
+
+  FontGlyphAtlas& operator=(const FontGlyphAtlas&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_TYPOGRAPHER_GLYPH_ATLAS_H_
diff --git a/impeller/typographer/lazy_glyph_atlas.cc b/impeller/typographer/lazy_glyph_atlas.cc
index 3e415716a528c405dc507d413d7768fb4b46d131..28f3e47be9e67c9bfa32005ac3df296fb5a2d26f 100644
--- a/impeller/typographer/lazy_glyph_atlas.cc
+++ b/impeller/typographer/lazy_glyph_atlas.cc
@@ -4,60 +4,90 @@
 
 #include "impeller/typographer/lazy_glyph_atlas.h"
 
+#include "fml/logging.h"
 #include "impeller/base/validation.h"
-#include "impeller/typographer/text_render_context.h"
-#include "lazy_glyph_atlas.h"
+#include "impeller/typographer/glyph_atlas.h"
+#include "impeller/typographer/typographer_context.h"
 
+#include <memory>
 #include <utility>
 
 namespace impeller {
 
-LazyGlyphAtlas::LazyGlyphAtlas() = default;
+static const std::shared_ptr<GlyphAtlas> kNullGlyphAtlas = nullptr;
+
+LazyGlyphAtlas::LazyGlyphAtlas(
+    std::shared_ptr<TypographerContext> typographer_context)
+    : typographer_context_(std::move(typographer_context)),
+      alpha_context_(typographer_context_
+                         ? typographer_context_->CreateGlyphAtlasContext()
+                         : nullptr),
+      color_context_(typographer_context_
+                         ? typographer_context_->CreateGlyphAtlasContext()
+                         : nullptr) {}
 
 LazyGlyphAtlas::~LazyGlyphAtlas() = default;
 
-void LazyGlyphAtlas::AddTextFrame(const TextFrame& frame) {
-  FML_DCHECK(atlas_map_.empty());
-  has_color_ |= frame.HasColor();
-  frames_.emplace_back(frame);
+void LazyGlyphAtlas::AddTextFrame(const TextFrame& frame, Scalar scale) {
+  FML_DCHECK(alpha_atlas_ == nullptr && color_atlas_ == nullptr);
+  if (frame.GetAtlasType() == GlyphAtlas::Type::kAlphaBitmap) {
+    frame.CollectUniqueFontGlyphPairs(alpha_glyph_map_, scale);
+  } else {
+    frame.CollectUniqueFontGlyphPairs(color_glyph_map_, scale);
+  }
 }
 
-bool LazyGlyphAtlas::HasColor() const {
-  return has_color_;
+void LazyGlyphAtlas::ResetTextFrames() {
+  alpha_glyph_map_.clear();
+  color_glyph_map_.clear();
+  alpha_atlas_.reset();
+  color_atlas_.reset();
 }
 
-std::shared_ptr<GlyphAtlas> LazyGlyphAtlas::CreateOrGetGlyphAtlas(
-    GlyphAtlas::Type type,
-    std::shared_ptr<GlyphAtlasContext> atlas_context,
-    std::shared_ptr<Context> context) const {
+const std::shared_ptr<GlyphAtlas>& LazyGlyphAtlas::CreateOrGetGlyphAtlas(
+    Context& context,
+    GlyphAtlas::Type type) const {
   {
-    auto atlas_it = atlas_map_.find(type);
-    if (atlas_it != atlas_map_.end()) {
-      return atlas_it->second;
+    if (type == GlyphAtlas::Type::kAlphaBitmap && alpha_atlas_) {
+      return alpha_atlas_;
+    }
+    if (type == GlyphAtlas::Type::kColorBitmap && color_atlas_) {
+      return color_atlas_;
     }
   }
 
-  auto text_context = TextRenderContext::Create(std::move(context));
-  if (!text_context || !text_context->IsValid()) {
-    return nullptr;
+  if (!typographer_context_) {
+    VALIDATION_LOG << "Unable to render text because a TypographerContext has "
+                      "not been set.";
+    return kNullGlyphAtlas;
   }
-  size_t i = 0;
-  TextRenderContext::FrameIterator iterator = [&]() -> const TextFrame* {
-    if (i >= frames_.size()) {
-      return nullptr;
-    }
-    const auto& result = frames_[i];
-    i++;
-    return &result;
-  };
-  auto atlas =
-      text_context->CreateGlyphAtlas(type, std::move(atlas_context), iterator);
+  if (!typographer_context_->IsValid()) {
+    VALIDATION_LOG
+        << "Unable to render text because the TypographerContext is invalid.";
+    return kNullGlyphAtlas;
+  }
+
+  auto& glyph_map = type == GlyphAtlas::Type::kAlphaBitmap ? alpha_glyph_map_
+                                                           : color_glyph_map_;
+  const std::shared_ptr<GlyphAtlasContext>& atlas_context =
+      type == GlyphAtlas::Type::kAlphaBitmap ? alpha_context_ : color_context_;
+  std::shared_ptr<GlyphAtlas> atlas = typographer_context_->CreateGlyphAtlas(
+      context, type, atlas_context, glyph_map);
   if (!atlas || !atlas->IsValid()) {
     VALIDATION_LOG << "Could not create valid atlas.";
-    return nullptr;
+    return kNullGlyphAtlas;
+  }
+  if (type == GlyphAtlas::Type::kAlphaBitmap) {
+    alpha_atlas_ = std::move(atlas);
+    return alpha_atlas_;
+  }
+  if (type == GlyphAtlas::Type::kColorBitmap) {
+    color_atlas_ = std::move(atlas);
+    return color_atlas_;
   }
-  atlas_map_[type] = atlas;
-  return atlas;
+  FML_UNREACHABLE();
+  static std::shared_ptr<GlyphAtlas> null_atlas(nullptr);
+  return null_atlas;
 }
 
 }  // namespace impeller
diff --git a/impeller/typographer/lazy_glyph_atlas.h b/impeller/typographer/lazy_glyph_atlas.h
index 841bb4f2e0e46898c9ec3c50aa03c2d510e47b26..12c2f71a1ea539821c5979fa69159ceb4bfa4d55 100644
--- a/impeller/typographer/lazy_glyph_atlas.h
+++ b/impeller/typographer/lazy_glyph_atlas.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_TYPOGRAPHER_LAZY_GLYPH_ATLAS_H_
+#define FLUTTER_IMPELLER_TYPOGRAPHER_LAZY_GLYPH_ATLAS_H_
 
 #include <unordered_map>
 
@@ -10,31 +11,40 @@
 #include "impeller/renderer/context.h"
 #include "impeller/typographer/glyph_atlas.h"
 #include "impeller/typographer/text_frame.h"
+#include "impeller/typographer/typographer_context.h"
 
 namespace impeller {
 
 class LazyGlyphAtlas {
  public:
-  LazyGlyphAtlas();
+  explicit LazyGlyphAtlas(
+      std::shared_ptr<TypographerContext> typographer_context);
 
   ~LazyGlyphAtlas();
 
-  void AddTextFrame(const TextFrame& frame);
+  void AddTextFrame(const TextFrame& frame, Scalar scale);
 
-  std::shared_ptr<GlyphAtlas> CreateOrGetGlyphAtlas(
-      GlyphAtlas::Type type,
-      std::shared_ptr<GlyphAtlasContext> atlas_context,
-      std::shared_ptr<Context> context) const;
+  void ResetTextFrames();
 
-  bool HasColor() const;
+  const std::shared_ptr<GlyphAtlas>& CreateOrGetGlyphAtlas(
+      Context& context,
+      GlyphAtlas::Type type) const;
 
  private:
-  std::vector<TextFrame> frames_;
-  mutable std::unordered_map<GlyphAtlas::Type, std::shared_ptr<GlyphAtlas>>
-      atlas_map_;
-  bool has_color_ = false;
+  std::shared_ptr<TypographerContext> typographer_context_;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(LazyGlyphAtlas);
+  FontGlyphMap alpha_glyph_map_;
+  FontGlyphMap color_glyph_map_;
+  std::shared_ptr<GlyphAtlasContext> alpha_context_;
+  std::shared_ptr<GlyphAtlasContext> color_context_;
+  mutable std::shared_ptr<GlyphAtlas> alpha_atlas_;
+  mutable std::shared_ptr<GlyphAtlas> color_atlas_;
+
+  LazyGlyphAtlas(const LazyGlyphAtlas&) = delete;
+
+  LazyGlyphAtlas& operator=(const LazyGlyphAtlas&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_TYPOGRAPHER_LAZY_GLYPH_ATLAS_H_
diff --git a/impeller/typographer/rectangle_packer.cc b/impeller/typographer/rectangle_packer.cc
new file mode 100644
index 0000000000000000000000000000000000000000..bebecf69ae3f392c8ddbb3b3d5f5890babb85d6f
--- /dev/null
+++ b/impeller/typographer/rectangle_packer.cc
@@ -0,0 +1,174 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/typographer/rectangle_packer.h"
+
+#include <algorithm>
+#include <vector>
+
+namespace impeller {
+
+// Pack rectangles and track the current silhouette
+// Based, in part, on Jukka Jylanki's work at http://clb.demon.fi
+// and ported from Skia's implementation
+// https://github.com/google/skia/blob/b5de4b8ae95c877a9ecfad5eab0765bc22550301/src/gpu/RectanizerSkyline.cpp
+class SkylineRectanglePacker final : public RectanglePacker {
+ public:
+  SkylineRectanglePacker(int w, int h) : RectanglePacker(w, h) {
+    this->reset();
+  }
+
+  ~SkylineRectanglePacker() final {}
+
+  void reset() final {
+    area_so_far_ = 0;
+    skyline_.clear();
+    skyline_.push_back(SkylineSegment{0, 0, this->width()});
+  }
+
+  bool addRect(int w, int h, IPoint16* loc) final;
+
+  float percentFull() const final {
+    return area_so_far_ / ((float)this->width() * this->height());
+  }
+
+ private:
+  struct SkylineSegment {
+    int x_;
+    int y_;
+    int width_;
+  };
+
+  std::vector<SkylineSegment> skyline_;
+
+  int32_t area_so_far_;
+
+  // Can a width x height rectangle fit in the free space represented by
+  // the skyline segments >= 'skylineIndex'? If so, return true and fill in
+  // 'y' with the y-location at which it fits (the x location is pulled from
+  // 'skylineIndex's segment.
+  bool rectangleFits(int skylineIndex, int width, int height, int* y) const;
+  // Update the skyline structure to include a width x height rect located
+  // at x,y.
+  void addSkylineLevel(int skylineIndex, int x, int y, int width, int height);
+};
+
+bool SkylineRectanglePacker::addRect(int width, int height, IPoint16* loc) {
+  if ((unsigned)width > (unsigned)this->width() ||
+      (unsigned)height > (unsigned)this->height()) {
+    return false;
+  }
+
+  // find position for new rectangle
+  int bestWidth = this->width() + 1;
+  int bestX = 0;
+  int bestY = this->height() + 1;
+  int bestIndex = -1;
+  for (int i = 0; i < (int)skyline_.size(); ++i) {
+    int y;
+    if (this->rectangleFits(i, width, height, &y)) {
+      // minimize y position first, then width of skyline
+      if (y < bestY || (y == bestY && skyline_[i].width_ < bestWidth)) {
+        bestIndex = i;
+        bestWidth = skyline_[i].width_;
+        bestX = skyline_[i].x_;
+        bestY = y;
+      }
+    }
+  }
+
+  // add rectangle to skyline
+  if (-1 != bestIndex) {
+    this->addSkylineLevel(bestIndex, bestX, bestY, width, height);
+    loc->x_ = bestX;
+    loc->y_ = bestY;
+
+    area_so_far_ += width * height;
+    return true;
+  }
+
+  loc->x_ = 0;
+  loc->y_ = 0;
+  return false;
+}
+
+bool SkylineRectanglePacker::rectangleFits(int skylineIndex,
+                                           int width,
+                                           int height,
+                                           int* ypos) const {
+  int x = skyline_[skylineIndex].x_;
+  if (x + width > this->width()) {
+    return false;
+  }
+
+  int widthLeft = width;
+  int i = skylineIndex;
+  int y = skyline_[skylineIndex].y_;
+  while (widthLeft > 0 && i < (int)skyline_.size()) {
+    y = std::max(y, skyline_[i].y_);
+    if (y + height > this->height()) {
+      return false;
+    }
+    widthLeft -= skyline_[i].width_;
+    ++i;
+  }
+
+  *ypos = y;
+  return true;
+}
+
+void SkylineRectanglePacker::addSkylineLevel(int skylineIndex,
+                                             int x,
+                                             int y,
+                                             int width,
+                                             int height) {
+  SkylineSegment newSegment;
+  newSegment.x_ = x;
+  newSegment.y_ = y + height;
+  newSegment.width_ = width;
+  skyline_.insert(std::next(skyline_.begin(), skylineIndex), newSegment);
+
+  FML_DCHECK(newSegment.x_ + newSegment.width_ <= this->width());
+  FML_DCHECK(newSegment.y_ <= this->height());
+
+  // delete width of the new skyline segment from following ones
+  for (int i = skylineIndex + 1; i < (int)skyline_.size(); ++i) {
+    // The new segment subsumes all or part of skyline_[i]
+    FML_DCHECK(skyline_[i - 1].x_ <= skyline_[i].x_);
+
+    if (skyline_[i].x_ < skyline_[i - 1].x_ + skyline_[i - 1].width_) {
+      int shrink = skyline_[i - 1].x_ + skyline_[i - 1].width_ - skyline_[i].x_;
+
+      skyline_[i].x_ += shrink;
+      skyline_[i].width_ -= shrink;
+
+      if (skyline_[i].width_ <= 0) {
+        // fully consumed, remove item at index i
+        skyline_.erase(std::next(skyline_.begin(), i));
+        --i;
+      } else {
+        // only partially consumed
+        break;
+      }
+    } else {
+      break;
+    }
+  }
+
+  // merge skyline_s
+  for (int i = 0; i < ((int)skyline_.size()) - 1; ++i) {
+    if (skyline_[i].y_ == skyline_[i + 1].y_) {
+      skyline_[i].width_ += skyline_[i + 1].width_;
+      skyline_.erase(std::next(skyline_.begin(), i));
+      --i;
+    }
+  }
+}
+
+std::unique_ptr<RectanglePacker> RectanglePacker::Factory(int width,
+                                                          int height) {
+  return std::make_unique<SkylineRectanglePacker>(width, height);
+}
+
+}  // namespace impeller
diff --git a/impeller/typographer/rectangle_packer.h b/impeller/typographer/rectangle_packer.h
new file mode 100644
index 0000000000000000000000000000000000000000..48365a515fce398df2a29be552324f0741143d2c
--- /dev/null
+++ b/impeller/typographer/rectangle_packer.h
@@ -0,0 +1,74 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_IMPELLER_TYPOGRAPHER_RECTANGLE_PACKER_H_
+#define FLUTTER_IMPELLER_TYPOGRAPHER_RECTANGLE_PACKER_H_
+
+#include "flutter/fml/logging.h"
+
+#include <cstdint>
+
+namespace impeller {
+
+struct IPoint16 {
+  int16_t x() const { return x_; }
+  int16_t y() const { return y_; }
+
+  int16_t x_;
+  int16_t y_;
+};
+
+//------------------------------------------------------------------------------
+/// @brief      Packs rectangles into a specified area without rotating them.
+///
+class RectanglePacker {
+ public:
+  //----------------------------------------------------------------------------
+  /// @brief     Return an empty packer with area specified by width and height.
+  ///
+  static std::unique_ptr<RectanglePacker> Factory(int width, int height);
+
+  virtual ~RectanglePacker() {}
+
+  //----------------------------------------------------------------------------
+  /// @brief     Attempt to add a rect without moving already placed rectangles.
+  ///
+  /// @param[in]   width   The width of the rectangle to add.
+  /// @param[in]   height  The height of the rectangle to add.
+  /// @param[out]  loc     If successful, will be set to the position of the
+  ///                      upper-left corner of the rectangle.
+  ///
+  /// @return     Return true on success; false on failure.
+  ///
+  virtual bool addRect(int width, int height, IPoint16* loc) = 0;
+
+  //----------------------------------------------------------------------------
+  /// @brief     Returns how much area has been filled with rectangles.
+  ///
+  /// @return    Percentage as a decimal between 0.0 and 1.0
+  ///
+  virtual float percentFull() const = 0;
+
+  //----------------------------------------------------------------------------
+  /// @brief     Empty out all previously added rectangles.
+  ///
+  virtual void reset() = 0;
+
+ protected:
+  RectanglePacker(int width, int height) : width_(width), height_(height) {
+    FML_DCHECK(width >= 0);
+    FML_DCHECK(height >= 0);
+  }
+
+  int width() const { return width_; }
+  int height() const { return height_; }
+
+ private:
+  const int width_;
+  const int height_;
+};
+
+}  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_TYPOGRAPHER_RECTANGLE_PACKER_H_
diff --git a/impeller/typographer/text_frame.cc b/impeller/typographer/text_frame.cc
index ff05c28f4106163609bc0492d002b6570a4186a7..5e38b68a76729e0facf19e8d083c66505efacef3 100644
--- a/impeller/typographer/text_frame.cc
+++ b/impeller/typographer/text_frame.cc
@@ -8,42 +8,84 @@ namespace impeller {
 
 TextFrame::TextFrame() = default;
 
+TextFrame::TextFrame(std::vector<TextRun>& runs, Rect bounds, bool has_color)
+    : runs_(std::move(runs)), bounds_(bounds), has_color_(has_color) {}
+
 TextFrame::~TextFrame() = default;
 
-std::optional<Rect> TextFrame::GetBounds() const {
-  std::optional<Rect> result;
+Rect TextFrame::GetBounds() const {
+  return bounds_;
+}
 
-  for (const auto& run : runs_) {
-    for (const auto& glyph_position : run.GetGlyphPositions()) {
-      Rect glyph_rect =
-          Rect(glyph_position.position + glyph_position.glyph.bounds.origin,
-               glyph_position.glyph.bounds.size);
-      result = result.has_value() ? result->Union(glyph_rect) : glyph_rect;
-    }
-  }
+size_t TextFrame::GetRunCount() const {
+  return runs_.size();
+}
+
+const std::vector<TextRun>& TextFrame::GetRuns() const {
+  return runs_;
+}
 
-  return result;
+GlyphAtlas::Type TextFrame::GetAtlasType() const {
+  return has_color_ ? GlyphAtlas::Type::kColorBitmap
+                    : GlyphAtlas::Type::kAlphaBitmap;
 }
 
-bool TextFrame::AddTextRun(const TextRun& run) {
-  if (!run.IsValid()) {
+bool TextFrame::MaybeHasOverlapping() const {
+  if (runs_.size() > 1) {
+    return true;
+  }
+  auto glyph_positions = runs_[0].GetGlyphPositions();
+  if (glyph_positions.size() > 10) {
+    return true;
+  }
+  if (glyph_positions.size() == 1) {
     return false;
   }
-  has_color_ |= run.HasColor();
-  runs_.emplace_back(run);
-  return true;
+  // To avoid quadradic behavior the overlapping is checked against an
+  // accumulated bounds rect. This gives faster but less precise information
+  // on text runs.
+  auto first_position = glyph_positions[0];
+  auto overlapping_rect = Rect::MakeOriginSize(
+      first_position.position + first_position.glyph.bounds.GetOrigin(),
+      first_position.glyph.bounds.GetSize());
+  for (auto i = 1u; i < glyph_positions.size(); i++) {
+    auto glyph_position = glyph_positions[i];
+    auto glyph_rect = Rect::MakeOriginSize(
+        glyph_position.position + glyph_position.glyph.bounds.GetOrigin(),
+        glyph_position.glyph.bounds.GetSize());
+    auto intersection = glyph_rect.Intersection(overlapping_rect);
+    if (intersection.has_value()) {
+      return true;
+    }
+    overlapping_rect = overlapping_rect.Union(glyph_rect);
+  }
+  return false;
 }
 
-size_t TextFrame::GetRunCount() const {
-  return runs_.size();
+// static
+Scalar TextFrame::RoundScaledFontSize(Scalar scale, Scalar point_size) {
+  return std::round(scale * 100) / 100;
 }
 
-const std::vector<TextRun>& TextFrame::GetRuns() const {
-  return runs_;
+void TextFrame::CollectUniqueFontGlyphPairs(FontGlyphMap& glyph_map,
+                                            Scalar scale) const {
+  for (const TextRun& run : GetRuns()) {
+    const Font& font = run.GetFont();
+    auto rounded_scale =
+        RoundScaledFontSize(scale, font.GetMetrics().point_size);
+    auto& set = glyph_map[{font, rounded_scale}];
+    for (const TextRun::GlyphPosition& glyph_position :
+         run.GetGlyphPositions()) {
+#if false
+// Glyph size error due to RoundScaledFontSize usage above.
+if (rounded_scale != scale) {
+  auto delta = std::abs(rounded_scale - scale);
+  FML_LOG(ERROR) << glyph_position.glyph.bounds.size * delta;
 }
-
-bool TextFrame::HasColor() const {
-  return has_color_;
+#endif
+      set.insert(glyph_position.glyph);
+    }
+  }
 }
 
 }  // namespace impeller
diff --git a/impeller/typographer/text_frame.h b/impeller/typographer/text_frame.h
index f64bef492e842cb4dbf2a9e73f76bc85e14d332a..1089039cb2a14e8dddac28082a1e7480ec19da45 100644
--- a/impeller/typographer/text_frame.h
+++ b/impeller/typographer/text_frame.h
@@ -2,9 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_TYPOGRAPHER_TEXT_FRAME_H_
+#define FLUTTER_IMPELLER_TYPOGRAPHER_TEXT_FRAME_H_
 
 #include "flutter/fml/macros.h"
+#include "impeller/typographer/glyph_atlas.h"
 #include "impeller/typographer/text_run.h"
 
 namespace impeller {
@@ -19,15 +21,21 @@ class TextFrame {
  public:
   TextFrame();
 
+  TextFrame(std::vector<TextRun>& runs, Rect bounds, bool has_color);
+
   ~TextFrame();
 
+  void CollectUniqueFontGlyphPairs(FontGlyphMap& glyph_map, Scalar scale) const;
+
+  static Scalar RoundScaledFontSize(Scalar scale, Scalar point_size);
+
   //----------------------------------------------------------------------------
   /// @brief      The conservative bounding box for this text frame.
   ///
   /// @return     The bounds rectangle. If there are no glyphs in this text
-  ///             frame, std::nullopt is returned.
+  ///             frame and empty Rectangle is returned instead.
   ///
-  std::optional<Rect> GetBounds() const;
+  Rect GetBounds() const;
 
   //----------------------------------------------------------------------------
   /// @brief      The number of runs in this text frame.
@@ -36,15 +44,6 @@ class TextFrame {
   ///
   size_t GetRunCount() const;
 
-  //----------------------------------------------------------------------------
-  /// @brief      Adds a new text run to the text frame.
-  ///
-  /// @param[in]  run   The run
-  ///
-  /// @return     If the text run could be added to this frame.
-  ///
-  bool AddTextRun(const TextRun& run);
-
   //----------------------------------------------------------------------------
   /// @brief      Returns a reference to all the text runs in this frame.
   ///
@@ -53,12 +52,29 @@ class TextFrame {
   const std::vector<TextRun>& GetRuns() const;
 
   //----------------------------------------------------------------------------
-  /// @brief      Whether any run in this frame has color.
-  bool HasColor() const;
+  /// @brief      Whether any of the glyphs of this run are potentially
+  /// overlapping
+  ///
+  ///             It is always safe to return true from this method. Generally,
+  ///             any large blobs of text should return true to avoid
+  ///             computationally complex calculations. This information is used
+  ///             to apply opacity peephole optimizations to text blobs.
+  bool MaybeHasOverlapping() const;
+
+  //----------------------------------------------------------------------------
+  /// @brief      The type of atlas this run should be emplaced in.
+  GlyphAtlas::Type GetAtlasType() const;
+
+  TextFrame& operator=(TextFrame&& other) = default;
+
+  TextFrame(const TextFrame& other) = default;
 
  private:
   std::vector<TextRun> runs_;
+  Rect bounds_;
   bool has_color_ = false;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_TYPOGRAPHER_TEXT_FRAME_H_
diff --git a/impeller/typographer/text_render_context.cc b/impeller/typographer/text_render_context.cc
deleted file mode 100644
index 072e33ab882d052b0662f0a2a6e25f67090fcd13..0000000000000000000000000000000000000000
--- a/impeller/typographer/text_render_context.cc
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "impeller/typographer/text_render_context.h"
-
-#include <utility>
-
-#include "impeller/typographer/backends/skia/text_render_context_skia.h"
-
-namespace impeller {
-
-std::unique_ptr<TextRenderContext> TextRenderContext::Create(
-    std::shared_ptr<Context> context) {
-  // There is only one backend today.
-  return std::make_unique<TextRenderContextSkia>(std::move(context));
-}
-
-TextRenderContext::TextRenderContext(std::shared_ptr<Context> context)
-    : context_(std::move(context)) {
-  if (!context_ || !context_->IsValid()) {
-    return;
-  }
-  is_valid_ = true;
-}
-
-TextRenderContext::~TextRenderContext() = default;
-
-bool TextRenderContext::IsValid() const {
-  return is_valid_;
-}
-
-const std::shared_ptr<Context>& TextRenderContext::GetContext() const {
-  return context_;
-}
-
-std::shared_ptr<GlyphAtlas> TextRenderContext::CreateGlyphAtlas(
-    GlyphAtlas::Type type,
-    std::shared_ptr<GlyphAtlasContext> atlas_context,
-    const TextFrame& frame) const {
-  size_t count = 0;
-  FrameIterator iterator = [&]() -> const TextFrame* {
-    count++;
-    if (count == 1) {
-      return &frame;
-    }
-    return nullptr;
-  };
-  return CreateGlyphAtlas(type, std::move(atlas_context), iterator);
-}
-
-}  // namespace impeller
diff --git a/impeller/typographer/text_run.cc b/impeller/typographer/text_run.cc
index ee0af62b5029f6c5dd993e90cfd2b4c04481b708..6fc3a3ba261c4e17a28c703a898b3c6f60bc604b 100644
--- a/impeller/typographer/text_run.cc
+++ b/impeller/typographer/text_run.cc
@@ -13,11 +13,18 @@ TextRun::TextRun(const Font& font) : font_(font) {
   is_valid_ = true;
 }
 
+TextRun::TextRun(const Font& font, std::vector<GlyphPosition>& glyphs)
+    : font_(font), glyphs_(std::move(glyphs)) {
+  if (!font_.IsValid()) {
+    return;
+  }
+  is_valid_ = true;
+}
+
 TextRun::~TextRun() = default;
 
 bool TextRun::AddGlyph(Glyph glyph, Point position) {
   glyphs_.emplace_back(GlyphPosition{glyph, position});
-  has_color_ |= glyph.type == Glyph::Type::kBitmap;
   return true;
 }
 
@@ -37,8 +44,4 @@ const Font& TextRun::GetFont() const {
   return font_;
 }
 
-bool TextRun::HasColor() const {
-  return has_color_;
-}
-
 }  // namespace impeller
diff --git a/impeller/typographer/text_run.h b/impeller/typographer/text_run.h
index 2bf433afca2f8a822eab0fef59334d5c4d5f1338..6bec4d19187a282af6a98a5d54282efefc7f4079 100644
--- a/impeller/typographer/text_run.h
+++ b/impeller/typographer/text_run.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_TYPOGRAPHER_TEXT_RUN_H_
+#define FLUTTER_IMPELLER_TYPOGRAPHER_TEXT_RUN_H_
 
 #include <vector>
 
@@ -31,7 +32,9 @@ class TextRun {
   ///
   /// @param[in]  font  The font
   ///
-  TextRun(const Font& font);
+  explicit TextRun(const Font& font);
+
+  TextRun(const Font& font, std::vector<GlyphPosition>& glyphs);
 
   ~TextRun();
 
@@ -68,15 +71,12 @@ class TextRun {
   ///
   const Font& GetFont() const;
 
-  //----------------------------------------------------------------------------
-  /// @brief      Whether any glyph in this run has color.
-  bool HasColor() const;
-
  private:
   Font font_;
   std::vector<GlyphPosition> glyphs_;
   bool is_valid_ = false;
-  bool has_color_ = false;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_TYPOGRAPHER_TEXT_RUN_H_
diff --git a/impeller/typographer/typeface.h b/impeller/typographer/typeface.h
index f3a4fe265af7f5ecc0a5cc4a1a8ec61e21958fdf..bf5123a46ec40e4fef70f6117a22e6b4d870ee1b 100644
--- a/impeller/typographer/typeface.h
+++ b/impeller/typographer/typeface.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_TYPOGRAPHER_TYPEFACE_H_
+#define FLUTTER_IMPELLER_TYPOGRAPHER_TYPEFACE_H_
 
 #include "flutter/fml/macros.h"
 #include "impeller/base/comparable.h"
@@ -24,17 +25,12 @@ class Typeface : public Comparable<Typeface> {
 
   virtual bool IsValid() const = 0;
 
-  //----------------------------------------------------------------------------
-  /// @brief      Get the union of the bounding boxes of all glyphs in the
-  ///             typeface. This box is unit-scaled and conservatively large to
-  ///             cover all glyphs.
-  ///
-  /// @return     The conservative unit-scaled bounding box.
-  ///
-  virtual Rect GetBoundingBox() const = 0;
-
  private:
-  FML_DISALLOW_COPY_AND_ASSIGN(Typeface);
+  Typeface(const Typeface&) = delete;
+
+  Typeface& operator=(const Typeface&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_TYPOGRAPHER_TYPEFACE_H_
diff --git a/impeller/renderer/gpu_tracer.cc b/impeller/typographer/typographer_context.cc
similarity index 46%
rename from impeller/renderer/gpu_tracer.cc
rename to impeller/typographer/typographer_context.cc
index b6e440e40ce4bdfc18ea0c5b10dc1fcddd165f4f..91c3129039ccf19a47f20521a7c4bf2eda87c5ec 100644
--- a/impeller/renderer/gpu_tracer.cc
+++ b/impeller/typographer/typographer_context.cc
@@ -2,20 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "gpu_tracer.h"
+#include "impeller/typographer/typographer_context.h"
 
-namespace impeller {
-
-GPUTracer::GPUTracer() = default;
+#include <utility>
 
-GPUTracer::~GPUTracer() = default;
+namespace impeller {
 
-bool GPUTracer::StartCapturingFrame(GPUTracerConfiguration configuration) {
-  return false;
+TypographerContext::TypographerContext() {
+  is_valid_ = true;
 }
 
-bool GPUTracer::StopCapturingFrame() {
-  return false;
+TypographerContext::~TypographerContext() = default;
+
+bool TypographerContext::IsValid() const {
+  return is_valid_;
 }
 
 }  // namespace impeller
diff --git a/impeller/typographer/text_render_context.h b/impeller/typographer/typographer_context.h
similarity index 53%
rename from impeller/typographer/text_render_context.h
rename to impeller/typographer/typographer_context.h
index c63ac912a1fa817c720c85ed7730610f40ebf265..9d62a6d98009e0eb42b2d59657743c534081a5cc 100644
--- a/impeller/typographer/text_render_context.h
+++ b/impeller/typographer/typographer_context.h
@@ -2,15 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_IMPELLER_TYPOGRAPHER_TYPOGRAPHER_CONTEXT_H_
+#define FLUTTER_IMPELLER_TYPOGRAPHER_TYPOGRAPHER_CONTEXT_H_
 
-#include <functional>
 #include <memory>
 
 #include "flutter/fml/macros.h"
 #include "impeller/renderer/context.h"
 #include "impeller/typographer/glyph_atlas.h"
-#include "impeller/typographer/text_frame.h"
 
 namespace impeller {
 
@@ -21,51 +20,39 @@ namespace impeller {
 ///             rendering text on the GPU.
 ///
 ///
-class TextRenderContext {
+class TypographerContext {
  public:
-  static std::unique_ptr<TextRenderContext> Create(
-      std::shared_ptr<Context> context);
-
-  virtual ~TextRenderContext();
+  virtual ~TypographerContext();
 
   virtual bool IsValid() const;
 
-  //----------------------------------------------------------------------------
-  /// @brief      Get the underlying graphics context.
-  ///
-  /// @return     The context.
-  ///
-  const std::shared_ptr<Context>& GetContext() const;
-
-  using FrameIterator = std::function<const TextFrame*(void)>;
+  virtual std::shared_ptr<GlyphAtlasContext> CreateGlyphAtlasContext()
+      const = 0;
 
   // TODO(dnfield): Callers should not need to know which type of atlas to
   // create. https://github.com/flutter/flutter/issues/111640
 
   virtual std::shared_ptr<GlyphAtlas> CreateGlyphAtlas(
+      Context& context,
       GlyphAtlas::Type type,
-      std::shared_ptr<GlyphAtlasContext> atlas_context,
-      FrameIterator iterator) const = 0;
-
-  std::shared_ptr<GlyphAtlas> CreateGlyphAtlas(
-      GlyphAtlas::Type type,
-      std::shared_ptr<GlyphAtlasContext> atlas_context,
-      const TextFrame& frame) const;
+      const std::shared_ptr<GlyphAtlasContext>& atlas_context,
+      const FontGlyphMap& font_glyph_map) const = 0;
 
  protected:
   //----------------------------------------------------------------------------
   /// @brief      Create a new context to render text that talks to an
   ///             underlying graphics context.
   ///
-  /// @param[in]  context  The graphics context
-  ///
-  TextRenderContext(std::shared_ptr<Context> context);
+  TypographerContext();
 
  private:
-  std::shared_ptr<Context> context_;
   bool is_valid_ = false;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(TextRenderContext);
+  TypographerContext(const TypographerContext&) = delete;
+
+  TypographerContext& operator=(const TypographerContext&) = delete;
 };
 
 }  // namespace impeller
+
+#endif  // FLUTTER_IMPELLER_TYPOGRAPHER_TYPOGRAPHER_CONTEXT_H_
diff --git a/impeller/typographer/typographer_unittests.cc b/impeller/typographer/typographer_unittests.cc
index 978f5d700ee0563723cc73692ce4f3b61fe70acd..4ac8e7e412c808ecdaf433742eaefbca97702cff 100644
--- a/impeller/typographer/typographer_unittests.cc
+++ b/impeller/typographer/typographer_unittests.cc
@@ -2,13 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "flutter/display_list/testing/dl_test_snippets.h"
 #include "flutter/testing/testing.h"
 #include "impeller/playground/playground_test.h"
 #include "impeller/typographer/backends/skia/text_frame_skia.h"
-#include "impeller/typographer/backends/skia/text_render_context_skia.h"
+#include "impeller/typographer/backends/skia/typographer_context_skia.h"
 #include "impeller/typographer/lazy_glyph_atlas.h"
-#include "third_party/skia/include/core/SkData.h"
+#include "impeller/typographer/rectangle_packer.h"
+#include "third_party/skia/include/core/SkFont.h"
+#include "third_party/skia/include/core/SkFontMgr.h"
+#include "third_party/skia/include/core/SkRect.h"
 #include "third_party/skia/include/core/SkTextBlob.h"
+#include "third_party/skia/include/core/SkTypeface.h"
+#include "txt/platform.h"
+
+// TODO(zanderso): https://github.com/flutter/flutter/issues/127701
+// NOLINTBEGIN(bugprone-unchecked-optional-access)
 
 namespace impeller {
 namespace testing {
@@ -16,95 +25,118 @@ namespace testing {
 using TypographerTest = PlaygroundTest;
 INSTANTIATE_PLAYGROUND_SUITE(TypographerTest);
 
+static std::shared_ptr<GlyphAtlas> CreateGlyphAtlas(
+    Context& context,
+    const TypographerContext* typographer_context,
+    GlyphAtlas::Type type,
+    Scalar scale,
+    const std::shared_ptr<GlyphAtlasContext>& atlas_context,
+    const TextFrame& frame) {
+  FontGlyphMap font_glyph_map;
+  frame.CollectUniqueFontGlyphPairs(font_glyph_map, scale);
+  return typographer_context->CreateGlyphAtlas(context, type, atlas_context,
+                                               font_glyph_map);
+}
+
 TEST_P(TypographerTest, CanConvertTextBlob) {
-  SkFont font;
+  SkFont font = flutter::testing::CreateTestFontOfSize(12);
   auto blob = SkTextBlob::MakeFromString(
       "the quick brown fox jumped over the lazy dog.", font);
   ASSERT_TRUE(blob);
-  auto frame = TextFrameFromTextBlob(blob);
-  ASSERT_EQ(frame.GetRunCount(), 1u);
-  for (const auto& run : frame.GetRuns()) {
+  auto frame = MakeTextFrameFromTextBlobSkia(blob);
+  ASSERT_EQ(frame->GetRunCount(), 1u);
+  for (const auto& run : frame->GetRuns()) {
     ASSERT_TRUE(run.IsValid());
     ASSERT_EQ(run.GetGlyphCount(), 45u);
   }
 }
 
 TEST_P(TypographerTest, CanCreateRenderContext) {
-  auto context = TextRenderContext::Create(GetContext());
+  auto context = TypographerContextSkia::Make();
   ASSERT_TRUE(context && context->IsValid());
 }
 
 TEST_P(TypographerTest, CanCreateGlyphAtlas) {
-  auto context = TextRenderContext::Create(GetContext());
-  auto atlas_context = std::make_shared<GlyphAtlasContext>();
+  auto context = TypographerContextSkia::Make();
+  auto atlas_context = context->CreateGlyphAtlasContext();
   ASSERT_TRUE(context && context->IsValid());
-  SkFont sk_font;
+  SkFont sk_font = flutter::testing::CreateTestFontOfSize(12);
   auto blob = SkTextBlob::MakeFromString("hello", sk_font);
   ASSERT_TRUE(blob);
-  auto atlas =
-      context->CreateGlyphAtlas(GlyphAtlas::Type::kAlphaBitmap, atlas_context,
-                                TextFrameFromTextBlob(blob));
+  auto atlas = CreateGlyphAtlas(
+      *GetContext(), context.get(), GlyphAtlas::Type::kAlphaBitmap, 1.0f,
+      atlas_context, *MakeTextFrameFromTextBlobSkia(blob));
   ASSERT_NE(atlas, nullptr);
-  OpenPlaygroundHere([](RenderTarget&) { return true; });
-}
+  ASSERT_NE(atlas->GetTexture(), nullptr);
+  ASSERT_EQ(atlas->GetType(), GlyphAtlas::Type::kAlphaBitmap);
+  ASSERT_EQ(atlas->GetGlyphCount(), 4llu);
 
-static sk_sp<SkData> OpenFixtureAsSkData(const char* fixture_name) {
-  auto mapping = flutter::testing::OpenFixtureAsMapping(fixture_name);
-  if (!mapping) {
-    return nullptr;
-  }
-  auto data = SkData::MakeWithProc(
-      mapping->GetMapping(), mapping->GetSize(),
-      [](const void* ptr, void* context) {
-        delete reinterpret_cast<fml::Mapping*>(context);
-      },
-      mapping.get());
-  mapping.release();
-  return data;
+  std::optional<impeller::ScaledFont> first_scaled_font;
+  std::optional<impeller::Glyph> first_glyph;
+  Rect first_rect;
+  atlas->IterateGlyphs([&](const ScaledFont& scaled_font, const Glyph& glyph,
+                           const Rect& rect) -> bool {
+    first_scaled_font = scaled_font;
+    first_glyph = glyph;
+    first_rect = rect;
+    return false;
+  });
+
+  ASSERT_TRUE(first_scaled_font.has_value());
+  ASSERT_TRUE(atlas
+                  ->FindFontGlyphBounds(
+                      {first_scaled_font.value(), first_glyph.value()})
+                  .has_value());
 }
 
 TEST_P(TypographerTest, LazyAtlasTracksColor) {
 #if FML_OS_MACOSX
-  auto mapping = OpenFixtureAsSkData("Apple Color Emoji.ttc");
+  auto mapping = flutter::testing::OpenFixtureAsSkData("Apple Color Emoji.ttc");
 #else
-  auto mapping = OpenFixtureAsSkData("NotoColorEmoji.ttf");
+  auto mapping = flutter::testing::OpenFixtureAsSkData("NotoColorEmoji.ttf");
 #endif
   ASSERT_TRUE(mapping);
-  SkFont emoji_font(SkTypeface::MakeFromData(mapping), 50.0);
-  SkFont sk_font;
+  sk_sp<SkFontMgr> font_mgr = txt::GetDefaultFontManager();
+  SkFont emoji_font(font_mgr->makeFromData(mapping), 50.0);
+  SkFont sk_font = flutter::testing::CreateTestFontOfSize(12);
 
   auto blob = SkTextBlob::MakeFromString("hello", sk_font);
   ASSERT_TRUE(blob);
-  auto frame = TextFrameFromTextBlob(blob);
+  auto frame = MakeTextFrameFromTextBlobSkia(blob);
+
+  ASSERT_FALSE(frame->GetAtlasType() == GlyphAtlas::Type::kColorBitmap);
 
-  ASSERT_FALSE(frame.HasColor());
+  LazyGlyphAtlas lazy_atlas(TypographerContextSkia::Make());
 
-  LazyGlyphAtlas lazy_atlas;
-  ASSERT_FALSE(lazy_atlas.HasColor());
+  lazy_atlas.AddTextFrame(*frame, 1.0f);
 
-  lazy_atlas.AddTextFrame(frame);
+  frame = MakeTextFrameFromTextBlobSkia(
+      SkTextBlob::MakeFromString("😀 ", emoji_font));
 
-  ASSERT_FALSE(lazy_atlas.HasColor());
+  ASSERT_TRUE(frame->GetAtlasType() == GlyphAtlas::Type::kColorBitmap);
 
-  frame = TextFrameFromTextBlob(SkTextBlob::MakeFromString("😀 ", emoji_font));
+  lazy_atlas.AddTextFrame(*frame, 1.0f);
 
-  ASSERT_TRUE(frame.HasColor());
+  // Creates different atlases for color and red bitmap.
+  auto color_atlas = lazy_atlas.CreateOrGetGlyphAtlas(
+      *GetContext(), GlyphAtlas::Type::kColorBitmap);
 
-  lazy_atlas.AddTextFrame(frame);
+  auto bitmap_atlas = lazy_atlas.CreateOrGetGlyphAtlas(
+      *GetContext(), GlyphAtlas::Type::kAlphaBitmap);
 
-  ASSERT_TRUE(lazy_atlas.HasColor());
+  ASSERT_FALSE(color_atlas == bitmap_atlas);
 }
 
 TEST_P(TypographerTest, GlyphAtlasWithOddUniqueGlyphSize) {
-  auto context = TextRenderContext::Create(GetContext());
-  auto atlas_context = std::make_shared<GlyphAtlasContext>();
+  auto context = TypographerContextSkia::Make();
+  auto atlas_context = context->CreateGlyphAtlasContext();
   ASSERT_TRUE(context && context->IsValid());
-  SkFont sk_font;
+  SkFont sk_font = flutter::testing::CreateTestFontOfSize(12);
   auto blob = SkTextBlob::MakeFromString("AGH", sk_font);
   ASSERT_TRUE(blob);
-  auto atlas =
-      context->CreateGlyphAtlas(GlyphAtlas::Type::kAlphaBitmap, atlas_context,
-                                TextFrameFromTextBlob(blob));
+  auto atlas = CreateGlyphAtlas(
+      *GetContext(), context.get(), GlyphAtlas::Type::kAlphaBitmap, 1.0f,
+      atlas_context, *MakeTextFrameFromTextBlobSkia(blob));
   ASSERT_NE(atlas, nullptr);
   ASSERT_NE(atlas->GetTexture(), nullptr);
 
@@ -113,60 +145,237 @@ TEST_P(TypographerTest, GlyphAtlasWithOddUniqueGlyphSize) {
 }
 
 TEST_P(TypographerTest, GlyphAtlasIsRecycledIfUnchanged) {
-  auto context = TextRenderContext::Create(GetContext());
-  auto atlas_context = std::make_shared<GlyphAtlasContext>();
+  auto context = TypographerContextSkia::Make();
+  auto atlas_context = context->CreateGlyphAtlasContext();
   ASSERT_TRUE(context && context->IsValid());
-  SkFont sk_font;
+  SkFont sk_font = flutter::testing::CreateTestFontOfSize(12);
   auto blob = SkTextBlob::MakeFromString("spooky skellingtons", sk_font);
   ASSERT_TRUE(blob);
-  auto atlas =
-      context->CreateGlyphAtlas(GlyphAtlas::Type::kAlphaBitmap, atlas_context,
-                                TextFrameFromTextBlob(blob));
+  auto atlas = CreateGlyphAtlas(
+      *GetContext(), context.get(), GlyphAtlas::Type::kAlphaBitmap, 1.0f,
+      atlas_context, *MakeTextFrameFromTextBlobSkia(blob));
   ASSERT_NE(atlas, nullptr);
   ASSERT_NE(atlas->GetTexture(), nullptr);
   ASSERT_EQ(atlas, atlas_context->GetGlyphAtlas());
 
   // now attempt to re-create an atlas with the same text blob.
 
-  auto next_atlas =
-      context->CreateGlyphAtlas(GlyphAtlas::Type::kAlphaBitmap, atlas_context,
-                                TextFrameFromTextBlob(blob));
+  auto next_atlas = CreateGlyphAtlas(
+      *GetContext(), context.get(), GlyphAtlas::Type::kAlphaBitmap, 1.0f,
+      atlas_context, *MakeTextFrameFromTextBlobSkia(blob));
   ASSERT_EQ(atlas, next_atlas);
   ASSERT_EQ(atlas_context->GetGlyphAtlas(), atlas);
 }
 
 TEST_P(TypographerTest, GlyphAtlasWithLotsOfdUniqueGlyphSize) {
-  auto context = TextRenderContext::Create(GetContext());
-  auto atlas_context = std::make_shared<GlyphAtlasContext>();
+  auto context = TypographerContextSkia::Make();
+  auto atlas_context = context->CreateGlyphAtlasContext();
   ASSERT_TRUE(context && context->IsValid());
-  SkFont sk_font;
 
-  auto blob = SkTextBlob::MakeFromString(
+  const char* test_string =
       "QWERTYUIOPASDFGHJKLZXCVBNMqewrtyuiopasdfghjklzxcvbnm,.<>[]{};':"
       "2134567890-=!@#$%^&*()_+"
       "œ∑´®†¥¨ˆøπ““‘‘åß∂ƒ©˙∆˚¬…æ≈ç√∫˜µ≤≥≥≥≥÷¡™£¢∞§¶•ªº–≠⁄€‹›fifl‡°·‚—±Œ„´‰Á¨Ø∏”’/"
-      "* Í˝ */¸˛Ç◊ı˜Â¯˘¿",
-      sk_font);
+      "* Í˝ */¸˛Ç◊ı˜Â¯˘¿";
+
+  SkFont sk_font = flutter::testing::CreateTestFontOfSize(12);
+  auto blob = SkTextBlob::MakeFromString(test_string, sk_font);
   ASSERT_TRUE(blob);
 
-  TextFrame frame;
-  size_t count = 0;
-  TextRenderContext::FrameIterator iterator = [&]() -> const TextFrame* {
-    if (count < 8) {
-      count++;
-      frame = TextFrameFromTextBlob(blob, 0.6 * count);
-      return &frame;
-    }
-    return nullptr;
+  FontGlyphMap font_glyph_map;
+  size_t size_count = 8;
+  for (size_t index = 0; index < size_count; index += 1) {
+    MakeTextFrameFromTextBlobSkia(blob)->CollectUniqueFontGlyphPairs(
+        font_glyph_map, 0.6 * index);
   };
-  auto atlas = context->CreateGlyphAtlas(GlyphAtlas::Type::kAlphaBitmap,
-                                         atlas_context, iterator);
+  auto atlas =
+      context->CreateGlyphAtlas(*GetContext(), GlyphAtlas::Type::kAlphaBitmap,
+                                atlas_context, font_glyph_map);
   ASSERT_NE(atlas, nullptr);
   ASSERT_NE(atlas->GetTexture(), nullptr);
 
-  ASSERT_EQ(atlas->GetTexture()->GetSize().width * 2,
-            atlas->GetTexture()->GetSize().height);
+  std::set<uint16_t> unique_glyphs;
+  std::vector<uint16_t> total_glyphs;
+  atlas->IterateGlyphs(
+      [&](const ScaledFont& scaled_font, const Glyph& glyph, const Rect& rect) {
+        unique_glyphs.insert(glyph.index);
+        total_glyphs.push_back(glyph.index);
+        return true;
+      });
+
+  EXPECT_EQ(unique_glyphs.size() * size_count, atlas->GetGlyphCount());
+  EXPECT_EQ(total_glyphs.size(), atlas->GetGlyphCount());
+
+  EXPECT_TRUE(atlas->GetGlyphCount() > 0);
+  EXPECT_TRUE(atlas->GetTexture()->GetSize().width > 0);
+  EXPECT_TRUE(atlas->GetTexture()->GetSize().height > 0);
+}
+
+TEST_P(TypographerTest, GlyphAtlasTextureIsRecycledIfUnchanged) {
+  auto context = TypographerContextSkia::Make();
+  auto atlas_context = context->CreateGlyphAtlasContext();
+  ASSERT_TRUE(context && context->IsValid());
+  SkFont sk_font = flutter::testing::CreateTestFontOfSize(12);
+  auto blob = SkTextBlob::MakeFromString("spooky 1", sk_font);
+  ASSERT_TRUE(blob);
+  auto atlas = CreateGlyphAtlas(
+      *GetContext(), context.get(), GlyphAtlas::Type::kAlphaBitmap, 1.0f,
+      atlas_context, *MakeTextFrameFromTextBlobSkia(blob));
+  auto old_packer = atlas_context->GetRectPacker();
+
+  ASSERT_NE(atlas, nullptr);
+  ASSERT_NE(atlas->GetTexture(), nullptr);
+  ASSERT_EQ(atlas, atlas_context->GetGlyphAtlas());
+
+  auto* first_texture = atlas->GetTexture().get();
+
+  // Now create a new glyph atlas with a nearly identical blob.
+
+  auto blob2 = SkTextBlob::MakeFromString("spooky 2", sk_font);
+  auto next_atlas = CreateGlyphAtlas(
+      *GetContext(), context.get(), GlyphAtlas::Type::kAlphaBitmap, 1.0f,
+      atlas_context, *MakeTextFrameFromTextBlobSkia(blob2));
+  ASSERT_EQ(atlas, next_atlas);
+  auto* second_texture = next_atlas->GetTexture().get();
+
+  auto new_packer = atlas_context->GetRectPacker();
+
+  ASSERT_EQ(second_texture, first_texture);
+  ASSERT_EQ(old_packer, new_packer);
+}
+
+TEST_P(TypographerTest, GlyphAtlasTextureIsRecreatedIfTypeChanges) {
+  auto context = TypographerContextSkia::Make();
+  auto atlas_context = context->CreateGlyphAtlasContext();
+  ASSERT_TRUE(context && context->IsValid());
+  SkFont sk_font = flutter::testing::CreateTestFontOfSize(12);
+  auto blob = SkTextBlob::MakeFromString("spooky 1", sk_font);
+  ASSERT_TRUE(blob);
+  auto atlas = CreateGlyphAtlas(
+      *GetContext(), context.get(), GlyphAtlas::Type::kAlphaBitmap, 1.0f,
+      atlas_context, *MakeTextFrameFromTextBlobSkia(blob));
+  auto old_packer = atlas_context->GetRectPacker();
+
+  ASSERT_NE(atlas, nullptr);
+  ASSERT_NE(atlas->GetTexture(), nullptr);
+  ASSERT_EQ(atlas, atlas_context->GetGlyphAtlas());
+
+  auto* first_texture = atlas->GetTexture().get();
+
+  // now create a new glyph atlas with an identical blob,
+  // but change the type.
+
+  auto blob2 = SkTextBlob::MakeFromString("spooky 1", sk_font);
+  auto next_atlas = CreateGlyphAtlas(
+      *GetContext(), context.get(), GlyphAtlas::Type::kColorBitmap, 1.0f,
+      atlas_context, *MakeTextFrameFromTextBlobSkia(blob2));
+  ASSERT_NE(atlas, next_atlas);
+  auto* second_texture = next_atlas->GetTexture().get();
+
+  auto new_packer = atlas_context->GetRectPacker();
+
+  ASSERT_NE(second_texture, first_texture);
+  ASSERT_NE(old_packer, new_packer);
+}
+
+TEST_P(TypographerTest, MaybeHasOverlapping) {
+  sk_sp<SkFontMgr> font_mgr = txt::GetDefaultFontManager();
+  sk_sp<SkTypeface> typeface =
+      font_mgr->matchFamilyStyle("Arial", SkFontStyle::Normal());
+  SkFont sk_font(typeface, 0.5f);
+
+  auto frame =
+      MakeTextFrameFromTextBlobSkia(SkTextBlob::MakeFromString("1", sk_font));
+  // Single character has no overlapping
+  ASSERT_FALSE(frame->MaybeHasOverlapping());
+
+  auto frame_2 = MakeTextFrameFromTextBlobSkia(
+      SkTextBlob::MakeFromString("123456789", sk_font));
+  ASSERT_FALSE(frame_2->MaybeHasOverlapping());
+}
+
+TEST_P(TypographerTest, RectanglePackerAddsNonoverlapingRectangles) {
+  auto packer = RectanglePacker::Factory(200, 100);
+  ASSERT_NE(packer, nullptr);
+  ASSERT_EQ(packer->percentFull(), 0);
+
+  const SkIRect packer_area = SkIRect::MakeXYWH(0, 0, 200, 100);
+
+  IPoint16 first_output = {-1, -1};  // Fill with sentinel values
+  ASSERT_TRUE(packer->addRect(20, 20, &first_output));
+  // Make sure the rectangle is placed such that it is inside the bounds of
+  // the packer's area.
+  const SkIRect first_rect =
+      SkIRect::MakeXYWH(first_output.x(), first_output.y(), 20, 20);
+  ASSERT_TRUE(SkIRect::Intersects(packer_area, first_rect));
+
+  // Initial area was 200 x 100 = 20_000
+  // We added 20x20 = 400. 400 / 20_000 == 0.02 == 2%
+  ASSERT_TRUE(flutter::testing::NumberNear(packer->percentFull(), 0.02));
+
+  IPoint16 second_output = {-1, -1};
+  ASSERT_TRUE(packer->addRect(140, 90, &second_output));
+  const SkIRect second_rect =
+      SkIRect::MakeXYWH(second_output.x(), second_output.y(), 140, 90);
+  // Make sure the rectangle is placed such that it is inside the bounds of
+  // the packer's area but not in the are of the first rectangle.
+  ASSERT_TRUE(SkIRect::Intersects(packer_area, second_rect));
+  ASSERT_FALSE(SkIRect::Intersects(first_rect, second_rect));
+
+  // We added another 90 x 140 = 12_600 units, now taking us to 13_000
+  // 13_000 / 20_000 == 0.65 == 65%
+  ASSERT_TRUE(flutter::testing::NumberNear(packer->percentFull(), 0.65));
+
+  // There's enough area to add this rectangle, but no space big enough for
+  // the 50 units of width.
+  IPoint16 output;
+  ASSERT_FALSE(packer->addRect(50, 50, &output));
+  // Should be unchanged.
+  ASSERT_TRUE(flutter::testing::NumberNear(packer->percentFull(), 0.65));
+
+  packer->reset();
+  // Should be empty now.
+  ASSERT_EQ(packer->percentFull(), 0);
+}
+
+TEST_P(TypographerTest,
+       GlyphAtlasTextureIsRecycledWhenContentsAreNotRecreated) {
+  auto context = TypographerContextSkia::Make();
+  auto atlas_context = context->CreateGlyphAtlasContext();
+  ASSERT_TRUE(context && context->IsValid());
+  SkFont sk_font = flutter::testing::CreateTestFontOfSize(12);
+  auto blob = SkTextBlob::MakeFromString("ABCDEFGHIJKLMNOPQRSTUVQXYZ123456789",
+                                         sk_font);
+  ASSERT_TRUE(blob);
+  auto atlas = CreateGlyphAtlas(
+      *GetContext(), context.get(), GlyphAtlas::Type::kColorBitmap, 32.0f,
+      atlas_context, *MakeTextFrameFromTextBlobSkia(blob));
+  auto old_packer = atlas_context->GetRectPacker();
+
+  ASSERT_NE(atlas, nullptr);
+  ASSERT_NE(atlas->GetTexture(), nullptr);
+  ASSERT_EQ(atlas, atlas_context->GetGlyphAtlas());
+
+  auto* first_texture = atlas->GetTexture().get();
+
+  // Now create a new glyph atlas with a completely different textblob.
+  // everything should be different except for the underlying atlas texture.
+
+  auto blob2 = SkTextBlob::MakeFromString("abcdefghijklmnopqrstuvwxyz123456789",
+                                          sk_font);
+  auto next_atlas = CreateGlyphAtlas(
+      *GetContext(), context.get(), GlyphAtlas::Type::kColorBitmap, 32.0f,
+      atlas_context, *MakeTextFrameFromTextBlobSkia(blob2));
+  ASSERT_NE(atlas, next_atlas);
+  auto* second_texture = next_atlas->GetTexture().get();
+
+  auto new_packer = atlas_context->GetRectPacker();
+
+  ASSERT_NE(second_texture, first_texture);
+  ASSERT_NE(old_packer, new_packer);
 }
 
 }  // namespace testing
 }  // namespace impeller
+
+// NOLINTEND(bugprone-unchecked-optional-access)
diff --git a/lib/gpu/BUILD.gn b/lib/gpu/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..abaad37932437a95ae3bb33e22a7a962e4edf4ae
--- /dev/null
+++ b/lib/gpu/BUILD.gn
@@ -0,0 +1,79 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//flutter/common/config.gni")
+import("//flutter/impeller/tools/impeller.gni")
+import("//flutter/testing/testing.gni")
+
+source_set("gpu") {
+  cflags = [
+    # Dart gives us doubles. Skia and Impeller work in floats.
+    # If Dart gives us a double > FLT_MAX or < -FLT_MAX, implicit conversion
+    # will convert it to either inf/-inf or FLT_MAX/-FLT_MAX (undefined
+    # behavior). This can result in surprising and difficult to debug behavior
+    # for Flutter application developers, so it should be explicitly handled
+    # via SafeNarrow.
+    "-Wimplicit-float-conversion",
+  ]
+
+  if (is_win) {
+    # This causes build failures in third_party dependencies on Windows.
+    cflags += [ "-Wno-implicit-int-float-conversion" ]
+  }
+
+  public_configs = [ "//flutter:config" ]
+
+  public_deps = []
+
+  if (!defined(defines)) {
+    defines = []
+  }
+
+  if (!is_fuchsia) {
+    sources = [
+      "command_buffer.cc",
+      "command_buffer.h",
+      "context.cc",
+      "context.h",
+      "device_buffer.cc",
+      "device_buffer.h",
+      "export.cc",
+      "export.h",
+      "fixtures.cc",
+      "fixtures.h",
+      "formats.cc",
+      "formats.h",
+      "host_buffer.cc",
+      "host_buffer.h",
+      "render_pass.cc",
+      "render_pass.h",
+      "render_pipeline.cc",
+      "render_pipeline.h",
+      "shader.cc",
+      "shader.h",
+      "shader_library.cc",
+      "shader_library.h",
+      "smoketest.cc",
+      "smoketest.h",
+      "texture.cc",
+      "texture.h",
+    ]
+  }
+  deps = [
+    "//flutter/assets",
+    "//flutter/impeller",
+    "//flutter/impeller/display_list:skia_conversions",
+    "//flutter/impeller/shader_bundle:shader_bundle_flatbuffers",
+    "//flutter/lib/ui",
+    "//flutter/third_party/tonic",
+  ]
+
+  if (is_win) {
+    # Required for M_PI and others.
+    defines += [ "_USE_MATH_DEFINES" ]
+  }
+}
+
+if (enable_unittests) {
+}
diff --git a/lib/gpu/analysis_options.yaml b/lib/gpu/analysis_options.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ee294d5a344daa5600b7f4f16ba0e5ccb745eacb
--- /dev/null
+++ b/lib/gpu/analysis_options.yaml
@@ -0,0 +1,7 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+linter:
+  rules:
+    - public_member_api_docs
diff --git a/lib/gpu/command_buffer.cc b/lib/gpu/command_buffer.cc
new file mode 100644
index 0000000000000000000000000000000000000000..b2f8fcd6c509844ffbbf1471cc2f0f2d6692d6bf
--- /dev/null
+++ b/lib/gpu/command_buffer.cc
@@ -0,0 +1,120 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/lib/gpu/command_buffer.h"
+
+#include "dart_api.h"
+#include "fml/make_copyable.h"
+#include "impeller/renderer/command_buffer.h"
+#include "impeller/renderer/render_pass.h"
+#include "lib/ui/ui_dart_state.h"
+#include "tonic/converter/dart_converter.h"
+
+namespace flutter {
+namespace gpu {
+
+IMPLEMENT_WRAPPERTYPEINFO(flutter_gpu, CommandBuffer);
+
+CommandBuffer::CommandBuffer(
+    std::shared_ptr<impeller::Context> context,
+    std::shared_ptr<impeller::CommandBuffer> command_buffer)
+    : context_(std::move(context)),
+      command_buffer_(std::move(command_buffer)) {}
+
+CommandBuffer::~CommandBuffer() = default;
+
+std::shared_ptr<impeller::CommandBuffer> CommandBuffer::GetCommandBuffer() {
+  return command_buffer_;
+}
+
+void CommandBuffer::AddRenderPass(
+    std::shared_ptr<impeller::RenderPass> render_pass) {
+  encodables_.push_back(std::move(render_pass));
+}
+
+bool CommandBuffer::Submit() {
+  for (auto& encodable : encodables_) {
+    encodable->EncodeCommands();
+  }
+
+  return context_->GetCommandQueue()->Submit({command_buffer_}).ok();
+}
+
+bool CommandBuffer::Submit(
+    const impeller::CommandBuffer::CompletionCallback& completion_callback) {
+  for (auto& encodable : encodables_) {
+    encodable->EncodeCommands();
+  }
+  return context_->GetCommandQueue()
+      ->Submit({command_buffer_}, completion_callback)
+      .ok();
+}
+
+}  // namespace gpu
+}  // namespace flutter
+
+//----------------------------------------------------------------------------
+/// Exports
+///
+
+bool InternalFlutterGpu_CommandBuffer_Initialize(
+    Dart_Handle wrapper,
+    flutter::gpu::Context* contextWrapper) {
+  auto res = fml::MakeRefCounted<flutter::gpu::CommandBuffer>(
+      contextWrapper->GetContext(),
+      contextWrapper->GetContext()->CreateCommandBuffer());
+  res->AssociateWithDartWrapper(wrapper);
+
+  return true;
+}
+
+Dart_Handle InternalFlutterGpu_CommandBuffer_Submit(
+    flutter::gpu::CommandBuffer* wrapper,
+    Dart_Handle completion_callback) {
+  if (Dart_IsNull(completion_callback)) {
+    bool success = wrapper->Submit();
+    if (!success) {
+      return tonic::ToDart("Failed to submit CommandBuffer");
+    }
+    return Dart_Null();
+  }
+
+  if (!Dart_IsClosure(completion_callback)) {
+    return tonic::ToDart("Completion callback must be a function");
+  }
+
+  auto dart_state = flutter::UIDartState::Current();
+  auto& task_runners = dart_state->GetTaskRunners();
+
+  auto persistent_completion_callback =
+      std::make_unique<tonic::DartPersistentValue>(dart_state,
+                                                   completion_callback);
+
+  bool success = wrapper->Submit(fml::MakeCopyable(
+      [callback = std::move(persistent_completion_callback),
+       task_runners](impeller::CommandBuffer::Status status) mutable {
+        bool success = status != impeller::CommandBuffer::Status::kError;
+
+        auto ui_completion_task = fml::MakeCopyable(
+            [callback = std::move(callback), success]() mutable {
+              auto dart_state = callback->dart_state().lock();
+              if (!dart_state) {
+                // The root isolate could have died in the meantime.
+                return;
+              }
+              tonic::DartState::Scope scope(dart_state);
+
+              tonic::DartInvoke(callback->Get(), {tonic::ToDart(success)});
+
+              // callback is associated with the Dart isolate and must be
+              // deleted on the UI thread.
+              callback.reset();
+            });
+        task_runners.GetUITaskRunner()->PostTask(ui_completion_task);
+      }));
+  if (!success) {
+    return tonic::ToDart("Failed to submit CommandBuffer");
+  }
+  return Dart_Null();
+}
diff --git a/lib/gpu/command_buffer.h b/lib/gpu/command_buffer.h
new file mode 100644
index 0000000000000000000000000000000000000000..7e4e3c01985e175ab749d5236cb7417654ccd719
--- /dev/null
+++ b/lib/gpu/command_buffer.h
@@ -0,0 +1,63 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_LIB_GPU_COMMAND_BUFFER_H_
+#define FLUTTER_LIB_GPU_COMMAND_BUFFER_H_
+
+#include "flutter/lib/gpu/context.h"
+#include "flutter/lib/gpu/export.h"
+#include "flutter/lib/ui/dart_wrapper.h"
+#include "impeller/renderer/command_buffer.h"
+
+namespace flutter {
+namespace gpu {
+
+class CommandBuffer : public RefCountedDartWrappable<CommandBuffer> {
+  DEFINE_WRAPPERTYPEINFO();
+  FML_FRIEND_MAKE_REF_COUNTED(CommandBuffer);
+
+ public:
+  CommandBuffer(std::shared_ptr<impeller::Context> context,
+                std::shared_ptr<impeller::CommandBuffer> command_buffer);
+
+  std::shared_ptr<impeller::CommandBuffer> GetCommandBuffer();
+
+  void AddRenderPass(std::shared_ptr<impeller::RenderPass> render_pass);
+
+  bool Submit();
+  bool Submit(
+      const impeller::CommandBuffer::CompletionCallback& completion_callback);
+
+  ~CommandBuffer() override;
+
+ private:
+  std::shared_ptr<impeller::Context> context_;
+  std::shared_ptr<impeller::CommandBuffer> command_buffer_;
+  std::vector<std::shared_ptr<impeller::RenderPass>> encodables_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(CommandBuffer);
+};
+
+}  // namespace gpu
+}  // namespace flutter
+
+//----------------------------------------------------------------------------
+/// Exports
+///
+
+extern "C" {
+
+FLUTTER_GPU_EXPORT
+extern bool InternalFlutterGpu_CommandBuffer_Initialize(
+    Dart_Handle wrapper,
+    flutter::gpu::Context* contextWrapper);
+
+FLUTTER_GPU_EXPORT
+extern Dart_Handle InternalFlutterGpu_CommandBuffer_Submit(
+    flutter::gpu::CommandBuffer* wrapper,
+    Dart_Handle completion_callback);
+
+}  // extern "C"
+
+#endif  // FLUTTER_LIB_GPU_COMMAND_BUFFER_H_
diff --git a/lib/gpu/context.cc b/lib/gpu/context.cc
new file mode 100644
index 0000000000000000000000000000000000000000..6f5d0bd29b53d293053ab29e2170b649e2fbd9f1
--- /dev/null
+++ b/lib/gpu/context.cc
@@ -0,0 +1,107 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/lib/gpu/context.h"
+
+#include <future>
+
+#include "flutter/lib/gpu/formats.h"
+#include "flutter/lib/ui/ui_dart_state.h"
+#include "fml/make_copyable.h"
+#include "tonic/converter/dart_converter.h"
+
+namespace flutter {
+namespace gpu {
+
+IMPLEMENT_WRAPPERTYPEINFO(flutter_gpu, Context);
+
+std::shared_ptr<impeller::Context> Context::default_context_;
+
+void Context::SetOverrideContext(std::shared_ptr<impeller::Context> context) {
+  default_context_ = std::move(context);
+}
+
+std::shared_ptr<impeller::Context> Context::GetOverrideContext() {
+  return default_context_;
+}
+
+std::shared_ptr<impeller::Context> Context::GetDefaultContext(
+    std::optional<std::string>& out_error) {
+  auto override_context = GetOverrideContext();
+  if (override_context) {
+    return override_context;
+  }
+
+  auto dart_state = flutter::UIDartState::Current();
+  if (!dart_state->IsImpellerEnabled()) {
+    out_error =
+        "Flutter GPU requires the Impeller rendering backend to be enabled.";
+    return nullptr;
+  }
+  // Grab the Impeller context from the IO manager.
+  std::promise<std::shared_ptr<impeller::Context>> context_promise;
+  auto impeller_context_future = context_promise.get_future();
+  fml::TaskRunner::RunNowOrPostTask(
+      dart_state->GetTaskRunners().GetIOTaskRunner(),
+      fml::MakeCopyable([promise = std::move(context_promise),
+                         io_manager = dart_state->GetIOManager()]() mutable {
+        promise.set_value(io_manager ? io_manager->GetImpellerContext()
+                                     : nullptr);
+      }));
+  auto context = impeller_context_future.get();
+
+  if (!context) {
+    out_error = "Unable to retrieve the Impeller context.";
+  }
+  return context;
+}
+
+Context::Context(std::shared_ptr<impeller::Context> context)
+    : context_(std::move(context)) {}
+
+Context::~Context() = default;
+
+std::shared_ptr<impeller::Context> Context::GetContext() {
+  return context_;
+}
+
+}  // namespace gpu
+}  // namespace flutter
+
+//----------------------------------------------------------------------------
+/// Exports
+///
+
+Dart_Handle InternalFlutterGpu_Context_InitializeDefault(Dart_Handle wrapper) {
+  std::optional<std::string> out_error;
+  auto impeller_context = flutter::gpu::Context::GetDefaultContext(out_error);
+  if (out_error.has_value()) {
+    return tonic::ToDart(out_error.value());
+  }
+
+  auto res = fml::MakeRefCounted<flutter::gpu::Context>(impeller_context);
+  res->AssociateWithDartWrapper(wrapper);
+
+  return Dart_Null();
+}
+
+extern int InternalFlutterGpu_Context_GetDefaultColorFormat(
+    flutter::gpu::Context* wrapper) {
+  return static_cast<int>(flutter::gpu::FromImpellerPixelFormat(
+      wrapper->GetContext()->GetCapabilities()->GetDefaultColorFormat()));
+}
+
+extern int InternalFlutterGpu_Context_GetDefaultStencilFormat(
+    flutter::gpu::Context* wrapper) {
+  return static_cast<int>(flutter::gpu::FromImpellerPixelFormat(
+      wrapper->GetContext()->GetCapabilities()->GetDefaultStencilFormat()));
+}
+
+extern int InternalFlutterGpu_Context_GetDefaultDepthStencilFormat(
+    flutter::gpu::Context* wrapper) {
+  return static_cast<int>(flutter::gpu::FromImpellerPixelFormat(
+      wrapper->GetContext()
+          ->GetCapabilities()
+          ->GetDefaultDepthStencilFormat()));
+}
diff --git a/lib/gpu/context.h b/lib/gpu/context.h
new file mode 100644
index 0000000000000000000000000000000000000000..903b4a0af98e5f117b9cf22b628185a1d6227003
--- /dev/null
+++ b/lib/gpu/context.h
@@ -0,0 +1,75 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_LIB_GPU_CONTEXT_H_
+#define FLUTTER_LIB_GPU_CONTEXT_H_
+
+#include "dart_api.h"
+#include "flutter/lib/gpu/export.h"
+#include "flutter/lib/ui/dart_wrapper.h"
+#include "impeller/renderer/context.h"
+
+namespace flutter {
+namespace gpu {
+
+class Context : public RefCountedDartWrappable<Context> {
+  DEFINE_WRAPPERTYPEINFO();
+  FML_FRIEND_MAKE_REF_COUNTED(Context);
+
+ public:
+  static void SetOverrideContext(std::shared_ptr<impeller::Context> context);
+
+  static std::shared_ptr<impeller::Context> GetOverrideContext();
+
+  static std::shared_ptr<impeller::Context> GetDefaultContext(
+      std::optional<std::string>& out_error);
+
+  explicit Context(std::shared_ptr<impeller::Context> context);
+  ~Context() override;
+
+  std::shared_ptr<impeller::Context> GetContext();
+
+ private:
+  /// An Impeller context that takes precedent over the IO state context when
+  /// set. This is used to inject the context when running with the Impeller
+  /// playground, which doesn't instantiate an Engine instance.
+  static std::shared_ptr<impeller::Context> default_context_;
+
+  std::shared_ptr<impeller::Context> context_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(Context);
+};
+
+}  // namespace gpu
+}  // namespace flutter
+
+//----------------------------------------------------------------------------
+/// Exports
+///
+
+extern "C" {
+
+FLUTTER_GPU_EXPORT
+extern Dart_Handle InternalFlutterGpu_Context_InitializeDefault(
+    Dart_Handle wrapper);
+
+FLUTTER_GPU_EXPORT
+extern int InternalFlutterGpu_Context_GetBackendType(
+    flutter::gpu::Context* wrapper);
+
+FLUTTER_GPU_EXPORT
+extern int InternalFlutterGpu_Context_GetDefaultColorFormat(
+    flutter::gpu::Context* wrapper);
+
+FLUTTER_GPU_EXPORT
+extern int InternalFlutterGpu_Context_GetDefaultStencilFormat(
+    flutter::gpu::Context* wrapper);
+
+FLUTTER_GPU_EXPORT
+extern int InternalFlutterGpu_Context_GetDefaultDepthStencilFormat(
+    flutter::gpu::Context* wrapper);
+
+}  // extern "C"
+
+#endif  // FLUTTER_LIB_GPU_CONTEXT_H_
diff --git a/lib/gpu/device_buffer.cc b/lib/gpu/device_buffer.cc
new file mode 100644
index 0000000000000000000000000000000000000000..1b495350543d832cd6cced05a81d12298f8791a7
--- /dev/null
+++ b/lib/gpu/device_buffer.cc
@@ -0,0 +1,101 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/lib/gpu/device_buffer.h"
+
+#include "dart_api.h"
+#include "flutter/lib/gpu/formats.h"
+#include "fml/mapping.h"
+#include "impeller/core/device_buffer.h"
+#include "impeller/core/device_buffer_descriptor.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/platform.h"
+#include "impeller/core/range.h"
+#include "third_party/tonic/typed_data/dart_byte_data.h"
+#include "tonic/converter/dart_converter.h"
+
+namespace flutter {
+namespace gpu {
+
+IMPLEMENT_WRAPPERTYPEINFO(flutter_gpu, DeviceBuffer);
+
+DeviceBuffer::DeviceBuffer(
+    std::shared_ptr<impeller::DeviceBuffer> device_buffer)
+    : device_buffer_(std::move(device_buffer)) {}
+
+DeviceBuffer::~DeviceBuffer() = default;
+
+std::shared_ptr<impeller::DeviceBuffer> DeviceBuffer::GetBuffer() {
+  return device_buffer_;
+}
+
+bool DeviceBuffer::Overwrite(const tonic::DartByteData& source_bytes,
+                             size_t destination_offset_in_bytes) {
+  if (!device_buffer_->CopyHostBuffer(
+          reinterpret_cast<const uint8_t*>(source_bytes.data()),
+          impeller::Range(0, source_bytes.length_in_bytes()),
+          destination_offset_in_bytes)) {
+    return false;
+  }
+  return true;
+}
+
+}  // namespace gpu
+}  // namespace flutter
+
+//----------------------------------------------------------------------------
+/// Exports
+///
+
+bool InternalFlutterGpu_DeviceBuffer_Initialize(
+    Dart_Handle wrapper,
+    flutter::gpu::Context* gpu_context,
+    int storage_mode,
+    int size_in_bytes) {
+  impeller::DeviceBufferDescriptor desc;
+  desc.storage_mode = flutter::gpu::ToImpellerStorageMode(storage_mode);
+  desc.size = size_in_bytes;
+  auto device_buffer =
+      gpu_context->GetContext()->GetResourceAllocator()->CreateBuffer(desc);
+  if (!device_buffer) {
+    FML_LOG(ERROR) << "Failed to create device buffer.";
+    return false;
+  }
+
+  auto res =
+      fml::MakeRefCounted<flutter::gpu::DeviceBuffer>(std::move(device_buffer));
+  res->AssociateWithDartWrapper(wrapper);
+
+  return true;
+}
+
+bool InternalFlutterGpu_DeviceBuffer_InitializeWithHostData(
+    Dart_Handle wrapper,
+    flutter::gpu::Context* gpu_context,
+    Dart_Handle byte_data) {
+  auto data = tonic::DartByteData(byte_data);
+  auto mapping = fml::NonOwnedMapping(reinterpret_cast<uint8_t*>(data.data()),
+                                      data.length_in_bytes());
+  auto device_buffer =
+      gpu_context->GetContext()->GetResourceAllocator()->CreateBufferWithCopy(
+          mapping);
+  if (!device_buffer) {
+    FML_LOG(ERROR) << "Failed to create device buffer with copy.";
+    return false;
+  }
+
+  auto res =
+      fml::MakeRefCounted<flutter::gpu::DeviceBuffer>(std::move(device_buffer));
+  res->AssociateWithDartWrapper(wrapper);
+
+  return true;
+}
+
+bool InternalFlutterGpu_DeviceBuffer_Overwrite(
+    flutter::gpu::DeviceBuffer* device_buffer,
+    Dart_Handle source_byte_data,
+    int destination_offset_in_bytes) {
+  return device_buffer->Overwrite(tonic::DartByteData(source_byte_data),
+                                  destination_offset_in_bytes);
+}
diff --git a/lib/gpu/device_buffer.h b/lib/gpu/device_buffer.h
new file mode 100644
index 0000000000000000000000000000000000000000..a2b262b3795c9bda83e882ecd77fdffe5d7f0d14
--- /dev/null
+++ b/lib/gpu/device_buffer.h
@@ -0,0 +1,67 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_LIB_GPU_DEVICE_BUFFER_H_
+#define FLUTTER_LIB_GPU_DEVICE_BUFFER_H_
+
+#include "flutter/lib/gpu/context.h"
+#include "flutter/lib/gpu/export.h"
+#include "flutter/lib/ui/dart_wrapper.h"
+
+#include "third_party/tonic/typed_data/dart_byte_data.h"
+
+namespace flutter {
+namespace gpu {
+
+class DeviceBuffer : public RefCountedDartWrappable<DeviceBuffer> {
+  DEFINE_WRAPPERTYPEINFO();
+  FML_FRIEND_MAKE_REF_COUNTED(DeviceBuffer);
+
+ public:
+  explicit DeviceBuffer(std::shared_ptr<impeller::DeviceBuffer> device_buffer);
+
+  ~DeviceBuffer() override;
+
+  std::shared_ptr<impeller::DeviceBuffer> GetBuffer();
+
+  bool Overwrite(const tonic::DartByteData& source_bytes,
+                 size_t destination_offset_in_bytes);
+
+ private:
+  std::shared_ptr<impeller::DeviceBuffer> device_buffer_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(DeviceBuffer);
+};
+
+}  // namespace gpu
+}  // namespace flutter
+
+//----------------------------------------------------------------------------
+/// Exports
+///
+
+extern "C" {
+
+FLUTTER_GPU_EXPORT
+extern bool InternalFlutterGpu_DeviceBuffer_Initialize(
+    Dart_Handle wrapper,
+    flutter::gpu::Context* gpu_context,
+    int storage_mode,
+    int size_in_bytes);
+
+FLUTTER_GPU_EXPORT
+extern bool InternalFlutterGpu_DeviceBuffer_InitializeWithHostData(
+    Dart_Handle wrapper,
+    flutter::gpu::Context* gpu_context,
+    Dart_Handle byte_data);
+
+FLUTTER_GPU_EXPORT
+extern bool InternalFlutterGpu_DeviceBuffer_Overwrite(
+    flutter::gpu::DeviceBuffer* wrapper,
+    Dart_Handle source_byte_data,
+    int destination_offset_in_bytes);
+
+}  // extern "C"
+
+#endif  // FLUTTER_LIB_GPU_DEVICE_BUFFER_H_
diff --git a/display_list/display_list_dispatcher.cc b/lib/gpu/export.cc
similarity index 78%
rename from display_list/display_list_dispatcher.cc
rename to lib/gpu/export.cc
index e321f02ea6c7f8b0cc62a6c145d3ebca2613031c..43ecb08ef8715fc09b02faa9b4e21de20a0a93a1 100644
--- a/display_list/display_list_dispatcher.cc
+++ b/lib/gpu/export.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/display_list/display_list_dispatcher.h"
+#include "flutter/lib/gpu/export.h"
 
 namespace flutter {
 
diff --git a/lib/gpu/export.h b/lib/gpu/export.h
new file mode 100644
index 0000000000000000000000000000000000000000..e4fa421ca9919ee91050a2bdc6b94c76a132c3b1
--- /dev/null
+++ b/lib/gpu/export.h
@@ -0,0 +1,16 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/fml/build_config.h"
+
+#ifndef FLUTTER_LIB_GPU_EXPORT_H_
+#define FLUTTER_LIB_GPU_EXPORT_H_
+
+#if FML_OS_WIN
+#define FLUTTER_GPU_EXPORT __declspec(dllexport)
+#else  // FML_OS_WIN
+#define FLUTTER_GPU_EXPORT __attribute__((visibility("default")))
+#endif  // FML_OS_WIN
+
+#endif  // FLUTTER_LIB_GPU_EXPORT_H_
diff --git a/lib/gpu/fixtures.cc b/lib/gpu/fixtures.cc
new file mode 100644
index 0000000000000000000000000000000000000000..26b2d8dc9e277ac80de119ec9ffa00f1182f97d1
--- /dev/null
+++ b/lib/gpu/fixtures.cc
@@ -0,0 +1,280 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/lib/gpu/fixtures.h"
+
+// These blobs are generated using xxd -i [myfile.iplr].
+// This is a temporary hack to provision the shader library before the importer
+// is done.
+
+unsigned char kFlutterGPUUnlitVertIPLR[] = {
+    0x18, 0x00, 0x00, 0x00, 0x49, 0x50, 0x4c, 0x52, 0x00, 0x00, 0x0e, 0x00,
+    0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x08, 0x00, 0x0c, 0x00,
+    0x0e, 0x00, 0x00, 0x00, 0x18, 0x03, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00,
+    0x04, 0x00, 0x00, 0x00, 0x72, 0x02, 0x00, 0x00, 0x23, 0x69, 0x6e, 0x63,
+    0x6c, 0x75, 0x64, 0x65, 0x20, 0x3c, 0x6d, 0x65, 0x74, 0x61, 0x6c, 0x5f,
+    0x73, 0x74, 0x64, 0x6c, 0x69, 0x62, 0x3e, 0x0a, 0x23, 0x69, 0x6e, 0x63,
+    0x6c, 0x75, 0x64, 0x65, 0x20, 0x3c, 0x73, 0x69, 0x6d, 0x64, 0x2f, 0x73,
+    0x69, 0x6d, 0x64, 0x2e, 0x68, 0x3e, 0x0a, 0x0a, 0x75, 0x73, 0x69, 0x6e,
+    0x67, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x20,
+    0x6d, 0x65, 0x74, 0x61, 0x6c, 0x3b, 0x0a, 0x0a, 0x73, 0x74, 0x72, 0x75,
+    0x63, 0x74, 0x20, 0x66, 0x6c, 0x75, 0x74, 0x74, 0x65, 0x72, 0x5f, 0x67,
+    0x70, 0x75, 0x5f, 0x75, 0x6e, 0x6c, 0x69, 0x74, 0x5f, 0x76, 0x65, 0x72,
+    0x74, 0x65, 0x78, 0x5f, 0x6d, 0x61, 0x69, 0x6e, 0x5f, 0x6f, 0x75, 0x74,
+    0x0a, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6c, 0x6f, 0x61, 0x74,
+    0x34, 0x20, 0x76, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x5b, 0x5b,
+    0x75, 0x73, 0x65, 0x72, 0x28, 0x6c, 0x6f, 0x63, 0x6e, 0x30, 0x29, 0x5d,
+    0x5d, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6c, 0x6f, 0x61, 0x74,
+    0x34, 0x20, 0x67, 0x6c, 0x5f, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f,
+    0x6e, 0x20, 0x5b, 0x5b, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e,
+    0x5d, 0x5d, 0x3b, 0x0a, 0x7d, 0x3b, 0x0a, 0x0a, 0x73, 0x74, 0x72, 0x75,
+    0x63, 0x74, 0x20, 0x66, 0x6c, 0x75, 0x74, 0x74, 0x65, 0x72, 0x5f, 0x67,
+    0x70, 0x75, 0x5f, 0x75, 0x6e, 0x6c, 0x69, 0x74, 0x5f, 0x76, 0x65, 0x72,
+    0x74, 0x65, 0x78, 0x5f, 0x6d, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x6e, 0x0a,
+    0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x32,
+    0x20, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x5b, 0x5b,
+    0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, 0x30, 0x29,
+    0x5d, 0x5d, 0x3b, 0x0a, 0x7d, 0x3b, 0x0a, 0x0a, 0x76, 0x65, 0x72, 0x74,
+    0x65, 0x78, 0x20, 0x66, 0x6c, 0x75, 0x74, 0x74, 0x65, 0x72, 0x5f, 0x67,
+    0x70, 0x75, 0x5f, 0x75, 0x6e, 0x6c, 0x69, 0x74, 0x5f, 0x76, 0x65, 0x72,
+    0x74, 0x65, 0x78, 0x5f, 0x6d, 0x61, 0x69, 0x6e, 0x5f, 0x6f, 0x75, 0x74,
+    0x20, 0x66, 0x6c, 0x75, 0x74, 0x74, 0x65, 0x72, 0x5f, 0x67, 0x70, 0x75,
+    0x5f, 0x75, 0x6e, 0x6c, 0x69, 0x74, 0x5f, 0x76, 0x65, 0x72, 0x74, 0x65,
+    0x78, 0x5f, 0x6d, 0x61, 0x69, 0x6e, 0x28, 0x66, 0x6c, 0x75, 0x74, 0x74,
+    0x65, 0x72, 0x5f, 0x67, 0x70, 0x75, 0x5f, 0x75, 0x6e, 0x6c, 0x69, 0x74,
+    0x5f, 0x76, 0x65, 0x72, 0x74, 0x65, 0x78, 0x5f, 0x6d, 0x61, 0x69, 0x6e,
+    0x5f, 0x69, 0x6e, 0x20, 0x69, 0x6e, 0x20, 0x5b, 0x5b, 0x73, 0x74, 0x61,
+    0x67, 0x65, 0x5f, 0x69, 0x6e, 0x5d, 0x5d, 0x2c, 0x20, 0x63, 0x6f, 0x6e,
+    0x73, 0x74, 0x61, 0x6e, 0x74, 0x20, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x34,
+    0x26, 0x20, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x5b, 0x5b, 0x62, 0x75,
+    0x66, 0x66, 0x65, 0x72, 0x28, 0x30, 0x29, 0x5d, 0x5d, 0x2c, 0x20, 0x63,
+    0x6f, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x20, 0x66, 0x6c, 0x6f, 0x61,
+    0x74, 0x34, 0x78, 0x34, 0x26, 0x20, 0x6d, 0x76, 0x70, 0x20, 0x5b, 0x5b,
+    0x62, 0x75, 0x66, 0x66, 0x65, 0x72, 0x28, 0x31, 0x29, 0x5d, 0x5d, 0x29,
+    0x0a, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6c, 0x75, 0x74, 0x74,
+    0x65, 0x72, 0x5f, 0x67, 0x70, 0x75, 0x5f, 0x75, 0x6e, 0x6c, 0x69, 0x74,
+    0x5f, 0x76, 0x65, 0x72, 0x74, 0x65, 0x78, 0x5f, 0x6d, 0x61, 0x69, 0x6e,
+    0x5f, 0x6f, 0x75, 0x74, 0x20, 0x6f, 0x75, 0x74, 0x20, 0x3d, 0x20, 0x7b,
+    0x7d, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6f, 0x75, 0x74, 0x2e, 0x76,
+    0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x63, 0x6f, 0x6c,
+    0x6f, 0x72, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6f, 0x75, 0x74, 0x2e,
+    0x67, 0x6c, 0x5f, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x20,
+    0x3d, 0x20, 0x6d, 0x76, 0x70, 0x20, 0x2a, 0x20, 0x66, 0x6c, 0x6f, 0x61,
+    0x74, 0x34, 0x28, 0x69, 0x6e, 0x2e, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69,
+    0x6f, 0x6e, 0x2c, 0x20, 0x30, 0x2e, 0x30, 0x2c, 0x20, 0x31, 0x2e, 0x30,
+    0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72,
+    0x6e, 0x20, 0x6f, 0x75, 0x74, 0x3b, 0x0a, 0x7d, 0x0a, 0x0a, 0x00, 0x00,
+    0x02, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
+    0x10, 0x00, 0x2c, 0x00, 0x04, 0x00, 0x0c, 0x00, 0x08, 0x00, 0x14, 0x00,
+    0x1c, 0x00, 0x24, 0x00, 0x10, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00,
+    0x0a, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x05, 0x00, 0x00, 0x00, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x00, 0x00, 0x00,
+    0x10, 0x00, 0x28, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x0c, 0x00,
+    0x14, 0x00, 0x1c, 0x00, 0x10, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00,
+    0x0a, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+    0x6d, 0x76, 0x70, 0x00, 0x1d, 0x00, 0x00, 0x00, 0x66, 0x6c, 0x75, 0x74,
+    0x74, 0x65, 0x72, 0x5f, 0x67, 0x70, 0x75, 0x5f, 0x75, 0x6e, 0x6c, 0x69,
+    0x74, 0x5f, 0x76, 0x65, 0x72, 0x74, 0x65, 0x78, 0x5f, 0x6d, 0x61, 0x69,
+    0x6e, 0x00, 0x00, 0x00};
+
+unsigned char kFlutterGPUUnlitFragIPLR[] = {
+    0x18, 0x00, 0x00, 0x00, 0x49, 0x50, 0x4c, 0x52, 0x00, 0x00, 0x0e, 0x00,
+    0x10, 0x00, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0c, 0x00,
+    0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xe8, 0x01, 0x00, 0x00,
+    0x04, 0x00, 0x00, 0x00, 0xda, 0x01, 0x00, 0x00, 0x23, 0x69, 0x6e, 0x63,
+    0x6c, 0x75, 0x64, 0x65, 0x20, 0x3c, 0x6d, 0x65, 0x74, 0x61, 0x6c, 0x5f,
+    0x73, 0x74, 0x64, 0x6c, 0x69, 0x62, 0x3e, 0x0a, 0x23, 0x69, 0x6e, 0x63,
+    0x6c, 0x75, 0x64, 0x65, 0x20, 0x3c, 0x73, 0x69, 0x6d, 0x64, 0x2f, 0x73,
+    0x69, 0x6d, 0x64, 0x2e, 0x68, 0x3e, 0x0a, 0x0a, 0x75, 0x73, 0x69, 0x6e,
+    0x67, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x20,
+    0x6d, 0x65, 0x74, 0x61, 0x6c, 0x3b, 0x0a, 0x0a, 0x73, 0x74, 0x72, 0x75,
+    0x63, 0x74, 0x20, 0x66, 0x6c, 0x75, 0x74, 0x74, 0x65, 0x72, 0x5f, 0x67,
+    0x70, 0x75, 0x5f, 0x75, 0x6e, 0x6c, 0x69, 0x74, 0x5f, 0x66, 0x72, 0x61,
+    0x67, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x6d, 0x61, 0x69, 0x6e, 0x5f, 0x6f,
+    0x75, 0x74, 0x0a, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6c, 0x6f,
+    0x61, 0x74, 0x34, 0x20, 0x66, 0x72, 0x61, 0x67, 0x5f, 0x63, 0x6f, 0x6c,
+    0x6f, 0x72, 0x20, 0x5b, 0x5b, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x28, 0x30,
+    0x29, 0x5d, 0x5d, 0x3b, 0x0a, 0x7d, 0x3b, 0x0a, 0x0a, 0x73, 0x74, 0x72,
+    0x75, 0x63, 0x74, 0x20, 0x66, 0x6c, 0x75, 0x74, 0x74, 0x65, 0x72, 0x5f,
+    0x67, 0x70, 0x75, 0x5f, 0x75, 0x6e, 0x6c, 0x69, 0x74, 0x5f, 0x66, 0x72,
+    0x61, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x6d, 0x61, 0x69, 0x6e, 0x5f,
+    0x69, 0x6e, 0x0a, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6c, 0x6f,
+    0x61, 0x74, 0x34, 0x20, 0x76, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x20,
+    0x5b, 0x5b, 0x75, 0x73, 0x65, 0x72, 0x28, 0x6c, 0x6f, 0x63, 0x6e, 0x30,
+    0x29, 0x5d, 0x5d, 0x3b, 0x0a, 0x7d, 0x3b, 0x0a, 0x0a, 0x66, 0x72, 0x61,
+    0x67, 0x6d, 0x65, 0x6e, 0x74, 0x20, 0x66, 0x6c, 0x75, 0x74, 0x74, 0x65,
+    0x72, 0x5f, 0x67, 0x70, 0x75, 0x5f, 0x75, 0x6e, 0x6c, 0x69, 0x74, 0x5f,
+    0x66, 0x72, 0x61, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x6d, 0x61, 0x69,
+    0x6e, 0x5f, 0x6f, 0x75, 0x74, 0x20, 0x66, 0x6c, 0x75, 0x74, 0x74, 0x65,
+    0x72, 0x5f, 0x67, 0x70, 0x75, 0x5f, 0x75, 0x6e, 0x6c, 0x69, 0x74, 0x5f,
+    0x66, 0x72, 0x61, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x6d, 0x61, 0x69,
+    0x6e, 0x28, 0x66, 0x6c, 0x75, 0x74, 0x74, 0x65, 0x72, 0x5f, 0x67, 0x70,
+    0x75, 0x5f, 0x75, 0x6e, 0x6c, 0x69, 0x74, 0x5f, 0x66, 0x72, 0x61, 0x67,
+    0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x6d, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x6e,
+    0x20, 0x69, 0x6e, 0x20, 0x5b, 0x5b, 0x73, 0x74, 0x61, 0x67, 0x65, 0x5f,
+    0x69, 0x6e, 0x5d, 0x5d, 0x29, 0x0a, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
+    0x66, 0x6c, 0x75, 0x74, 0x74, 0x65, 0x72, 0x5f, 0x67, 0x70, 0x75, 0x5f,
+    0x75, 0x6e, 0x6c, 0x69, 0x74, 0x5f, 0x66, 0x72, 0x61, 0x67, 0x6d, 0x65,
+    0x6e, 0x74, 0x5f, 0x6d, 0x61, 0x69, 0x6e, 0x5f, 0x6f, 0x75, 0x74, 0x20,
+    0x6f, 0x75, 0x74, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x3b, 0x0a, 0x20, 0x20,
+    0x20, 0x20, 0x6f, 0x75, 0x74, 0x2e, 0x66, 0x72, 0x61, 0x67, 0x5f, 0x63,
+    0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x69, 0x6e, 0x2e, 0x76, 0x5f,
+    0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72,
+    0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6f, 0x75, 0x74, 0x3b, 0x0a, 0x7d,
+    0x0a, 0x0a, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x66, 0x6c, 0x75, 0x74,
+    0x74, 0x65, 0x72, 0x5f, 0x67, 0x70, 0x75, 0x5f, 0x75, 0x6e, 0x6c, 0x69,
+    0x74, 0x5f, 0x66, 0x72, 0x61, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x6d,
+    0x61, 0x69, 0x6e, 0x00};
+
+unsigned char kFlutterGPUTextureVertIPLR[] = {
+    0x18, 0x00, 0x00, 0x00, 0x49, 0x50, 0x4c, 0x52, 0x00, 0x00, 0x0e, 0x00,
+    0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x08, 0x00, 0x0c, 0x00,
+    0x0e, 0x00, 0x00, 0x00, 0x58, 0x03, 0x00, 0x00, 0x0c, 0x03, 0x00, 0x00,
+    0x04, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x23, 0x69, 0x6e, 0x63,
+    0x6c, 0x75, 0x64, 0x65, 0x20, 0x3c, 0x6d, 0x65, 0x74, 0x61, 0x6c, 0x5f,
+    0x73, 0x74, 0x64, 0x6c, 0x69, 0x62, 0x3e, 0x0a, 0x23, 0x69, 0x6e, 0x63,
+    0x6c, 0x75, 0x64, 0x65, 0x20, 0x3c, 0x73, 0x69, 0x6d, 0x64, 0x2f, 0x73,
+    0x69, 0x6d, 0x64, 0x2e, 0x68, 0x3e, 0x0a, 0x0a, 0x75, 0x73, 0x69, 0x6e,
+    0x67, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x20,
+    0x6d, 0x65, 0x74, 0x61, 0x6c, 0x3b, 0x0a, 0x0a, 0x73, 0x74, 0x72, 0x75,
+    0x63, 0x74, 0x20, 0x66, 0x6c, 0x75, 0x74, 0x74, 0x65, 0x72, 0x5f, 0x67,
+    0x70, 0x75, 0x5f, 0x74, 0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x5f, 0x76,
+    0x65, 0x72, 0x74, 0x65, 0x78, 0x5f, 0x6d, 0x61, 0x69, 0x6e, 0x5f, 0x6f,
+    0x75, 0x74, 0x0a, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6c, 0x6f,
+    0x61, 0x74, 0x32, 0x20, 0x76, 0x5f, 0x74, 0x65, 0x78, 0x74, 0x75, 0x72,
+    0x65, 0x5f, 0x63, 0x6f, 0x6f, 0x72, 0x64, 0x73, 0x20, 0x5b, 0x5b, 0x75,
+    0x73, 0x65, 0x72, 0x28, 0x6c, 0x6f, 0x63, 0x6e, 0x30, 0x29, 0x5d, 0x5d,
+    0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x34,
+    0x20, 0x76, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x5b, 0x5b, 0x75,
+    0x73, 0x65, 0x72, 0x28, 0x6c, 0x6f, 0x63, 0x6e, 0x31, 0x29, 0x5d, 0x5d,
+    0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x34,
+    0x20, 0x67, 0x6c, 0x5f, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e,
+    0x20, 0x5b, 0x5b, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x5d,
+    0x5d, 0x3b, 0x0a, 0x7d, 0x3b, 0x0a, 0x0a, 0x73, 0x74, 0x72, 0x75, 0x63,
+    0x74, 0x20, 0x66, 0x6c, 0x75, 0x74, 0x74, 0x65, 0x72, 0x5f, 0x67, 0x70,
+    0x75, 0x5f, 0x74, 0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x5f, 0x76, 0x65,
+    0x72, 0x74, 0x65, 0x78, 0x5f, 0x6d, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x6e,
+    0x0a, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6c, 0x6f, 0x61, 0x74,
+    0x33, 0x20, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x5b,
+    0x5b, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, 0x30,
+    0x29, 0x5d, 0x5d, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6c, 0x6f,
+    0x61, 0x74, 0x32, 0x20, 0x74, 0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x5f,
+    0x63, 0x6f, 0x6f, 0x72, 0x64, 0x73, 0x20, 0x5b, 0x5b, 0x61, 0x74, 0x74,
+    0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, 0x31, 0x29, 0x5d, 0x5d, 0x3b,
+    0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x34, 0x20,
+    0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x5b, 0x5b, 0x61, 0x74, 0x74, 0x72,
+    0x69, 0x62, 0x75, 0x74, 0x65, 0x28, 0x32, 0x29, 0x5d, 0x5d, 0x3b, 0x0a,
+    0x7d, 0x3b, 0x0a, 0x0a, 0x76, 0x65, 0x72, 0x74, 0x65, 0x78, 0x20, 0x66,
+    0x6c, 0x75, 0x74, 0x74, 0x65, 0x72, 0x5f, 0x67, 0x70, 0x75, 0x5f, 0x74,
+    0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x5f, 0x76, 0x65, 0x72, 0x74, 0x65,
+    0x78, 0x5f, 0x6d, 0x61, 0x69, 0x6e, 0x5f, 0x6f, 0x75, 0x74, 0x20, 0x66,
+    0x6c, 0x75, 0x74, 0x74, 0x65, 0x72, 0x5f, 0x67, 0x70, 0x75, 0x5f, 0x74,
+    0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x5f, 0x76, 0x65, 0x72, 0x74, 0x65,
+    0x78, 0x5f, 0x6d, 0x61, 0x69, 0x6e, 0x28, 0x66, 0x6c, 0x75, 0x74, 0x74,
+    0x65, 0x72, 0x5f, 0x67, 0x70, 0x75, 0x5f, 0x74, 0x65, 0x78, 0x74, 0x75,
+    0x72, 0x65, 0x5f, 0x76, 0x65, 0x72, 0x74, 0x65, 0x78, 0x5f, 0x6d, 0x61,
+    0x69, 0x6e, 0x5f, 0x69, 0x6e, 0x20, 0x69, 0x6e, 0x20, 0x5b, 0x5b, 0x73,
+    0x74, 0x61, 0x67, 0x65, 0x5f, 0x69, 0x6e, 0x5d, 0x5d, 0x2c, 0x20, 0x63,
+    0x6f, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x20, 0x66, 0x6c, 0x6f, 0x61,
+    0x74, 0x34, 0x78, 0x34, 0x26, 0x20, 0x6d, 0x76, 0x70, 0x20, 0x5b, 0x5b,
+    0x62, 0x75, 0x66, 0x66, 0x65, 0x72, 0x28, 0x30, 0x29, 0x5d, 0x5d, 0x29,
+    0x0a, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6c, 0x75, 0x74, 0x74,
+    0x65, 0x72, 0x5f, 0x67, 0x70, 0x75, 0x5f, 0x74, 0x65, 0x78, 0x74, 0x75,
+    0x72, 0x65, 0x5f, 0x76, 0x65, 0x72, 0x74, 0x65, 0x78, 0x5f, 0x6d, 0x61,
+    0x69, 0x6e, 0x5f, 0x6f, 0x75, 0x74, 0x20, 0x6f, 0x75, 0x74, 0x20, 0x3d,
+    0x20, 0x7b, 0x7d, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6f, 0x75, 0x74,
+    0x2e, 0x76, 0x5f, 0x74, 0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x5f, 0x63,
+    0x6f, 0x6f, 0x72, 0x64, 0x73, 0x20, 0x3d, 0x20, 0x69, 0x6e, 0x2e, 0x74,
+    0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x5f, 0x63, 0x6f, 0x6f, 0x72, 0x64,
+    0x73, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6f, 0x75, 0x74, 0x2e, 0x76,
+    0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x69, 0x6e, 0x2e,
+    0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6f,
+    0x75, 0x74, 0x2e, 0x67, 0x6c, 0x5f, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69,
+    0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x6d, 0x76, 0x70, 0x20, 0x2a, 0x20, 0x66,
+    0x6c, 0x6f, 0x61, 0x74, 0x34, 0x28, 0x69, 0x6e, 0x2e, 0x70, 0x6f, 0x73,
+    0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2c, 0x20, 0x31, 0x2e, 0x30, 0x29, 0x3b,
+    0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20,
+    0x6f, 0x75, 0x74, 0x3b, 0x0a, 0x7d, 0x0a, 0x0a, 0x01, 0x00, 0x00, 0x00,
+    0x14, 0x00, 0x00, 0x00, 0x10, 0x00, 0x28, 0x00, 0x04, 0x00, 0x00, 0x00,
+    0x08, 0x00, 0x0c, 0x00, 0x14, 0x00, 0x1c, 0x00, 0x10, 0x00, 0x00, 0x00,
+    0x24, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x03, 0x00, 0x00, 0x00, 0x6d, 0x76, 0x70, 0x00, 0x1f, 0x00, 0x00, 0x00,
+    0x66, 0x6c, 0x75, 0x74, 0x74, 0x65, 0x72, 0x5f, 0x67, 0x70, 0x75, 0x5f,
+    0x74, 0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x5f, 0x76, 0x65, 0x72, 0x74,
+    0x65, 0x78, 0x5f, 0x6d, 0x61, 0x69, 0x6e, 0x00};
+
+unsigned char kFlutterGPUTextureFragIPLR[] = {
+    0x1c, 0x00, 0x00, 0x00, 0x49, 0x50, 0x4c, 0x52, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x0e, 0x00, 0x14, 0x00, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00,
+    0x0c, 0x00, 0x10, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+    0xd4, 0x02, 0x00, 0x00, 0x94, 0x02, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+    0x85, 0x02, 0x00, 0x00, 0x23, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65,
+    0x20, 0x3c, 0x6d, 0x65, 0x74, 0x61, 0x6c, 0x5f, 0x73, 0x74, 0x64, 0x6c,
+    0x69, 0x62, 0x3e, 0x0a, 0x23, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65,
+    0x20, 0x3c, 0x73, 0x69, 0x6d, 0x64, 0x2f, 0x73, 0x69, 0x6d, 0x64, 0x2e,
+    0x68, 0x3e, 0x0a, 0x0a, 0x75, 0x73, 0x69, 0x6e, 0x67, 0x20, 0x6e, 0x61,
+    0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x20, 0x6d, 0x65, 0x74, 0x61,
+    0x6c, 0x3b, 0x0a, 0x0a, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x20, 0x66,
+    0x6c, 0x75, 0x74, 0x74, 0x65, 0x72, 0x5f, 0x67, 0x70, 0x75, 0x5f, 0x74,
+    0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x5f, 0x66, 0x72, 0x61, 0x67, 0x6d,
+    0x65, 0x6e, 0x74, 0x5f, 0x6d, 0x61, 0x69, 0x6e, 0x5f, 0x6f, 0x75, 0x74,
+    0x0a, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6c, 0x6f, 0x61, 0x74,
+    0x34, 0x20, 0x66, 0x72, 0x61, 0x67, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
+    0x20, 0x5b, 0x5b, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x28, 0x30, 0x29, 0x5d,
+    0x5d, 0x3b, 0x0a, 0x7d, 0x3b, 0x0a, 0x0a, 0x73, 0x74, 0x72, 0x75, 0x63,
+    0x74, 0x20, 0x66, 0x6c, 0x75, 0x74, 0x74, 0x65, 0x72, 0x5f, 0x67, 0x70,
+    0x75, 0x5f, 0x74, 0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x5f, 0x66, 0x72,
+    0x61, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x6d, 0x61, 0x69, 0x6e, 0x5f,
+    0x69, 0x6e, 0x0a, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6c, 0x6f,
+    0x61, 0x74, 0x32, 0x20, 0x76, 0x5f, 0x74, 0x65, 0x78, 0x74, 0x75, 0x72,
+    0x65, 0x5f, 0x63, 0x6f, 0x6f, 0x72, 0x64, 0x73, 0x20, 0x5b, 0x5b, 0x75,
+    0x73, 0x65, 0x72, 0x28, 0x6c, 0x6f, 0x63, 0x6e, 0x30, 0x29, 0x5d, 0x5d,
+    0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x34,
+    0x20, 0x76, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x5b, 0x5b, 0x75,
+    0x73, 0x65, 0x72, 0x28, 0x6c, 0x6f, 0x63, 0x6e, 0x31, 0x29, 0x5d, 0x5d,
+    0x3b, 0x0a, 0x7d, 0x3b, 0x0a, 0x0a, 0x66, 0x72, 0x61, 0x67, 0x6d, 0x65,
+    0x6e, 0x74, 0x20, 0x66, 0x6c, 0x75, 0x74, 0x74, 0x65, 0x72, 0x5f, 0x67,
+    0x70, 0x75, 0x5f, 0x74, 0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x5f, 0x66,
+    0x72, 0x61, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x6d, 0x61, 0x69, 0x6e,
+    0x5f, 0x6f, 0x75, 0x74, 0x20, 0x66, 0x6c, 0x75, 0x74, 0x74, 0x65, 0x72,
+    0x5f, 0x67, 0x70, 0x75, 0x5f, 0x74, 0x65, 0x78, 0x74, 0x75, 0x72, 0x65,
+    0x5f, 0x66, 0x72, 0x61, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x6d, 0x61,
+    0x69, 0x6e, 0x28, 0x66, 0x6c, 0x75, 0x74, 0x74, 0x65, 0x72, 0x5f, 0x67,
+    0x70, 0x75, 0x5f, 0x74, 0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x5f, 0x66,
+    0x72, 0x61, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x6d, 0x61, 0x69, 0x6e,
+    0x5f, 0x69, 0x6e, 0x20, 0x69, 0x6e, 0x20, 0x5b, 0x5b, 0x73, 0x74, 0x61,
+    0x67, 0x65, 0x5f, 0x69, 0x6e, 0x5d, 0x5d, 0x2c, 0x20, 0x74, 0x65, 0x78,
+    0x74, 0x75, 0x72, 0x65, 0x32, 0x64, 0x3c, 0x66, 0x6c, 0x6f, 0x61, 0x74,
+    0x3e, 0x20, 0x74, 0x65, 0x78, 0x20, 0x5b, 0x5b, 0x74, 0x65, 0x78, 0x74,
+    0x75, 0x72, 0x65, 0x28, 0x30, 0x29, 0x5d, 0x5d, 0x2c, 0x20, 0x73, 0x61,
+    0x6d, 0x70, 0x6c, 0x65, 0x72, 0x20, 0x74, 0x65, 0x78, 0x53, 0x6d, 0x70,
+    0x6c, 0x72, 0x20, 0x5b, 0x5b, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x72,
+    0x28, 0x30, 0x29, 0x5d, 0x5d, 0x29, 0x0a, 0x7b, 0x0a, 0x20, 0x20, 0x20,
+    0x20, 0x66, 0x6c, 0x75, 0x74, 0x74, 0x65, 0x72, 0x5f, 0x67, 0x70, 0x75,
+    0x5f, 0x74, 0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x5f, 0x66, 0x72, 0x61,
+    0x67, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x6d, 0x61, 0x69, 0x6e, 0x5f, 0x6f,
+    0x75, 0x74, 0x20, 0x6f, 0x75, 0x74, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x3b,
+    0x0a, 0x20, 0x20, 0x20, 0x20, 0x6f, 0x75, 0x74, 0x2e, 0x66, 0x72, 0x61,
+    0x67, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x69, 0x6e,
+    0x2e, 0x76, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x2a, 0x20, 0x74,
+    0x65, 0x78, 0x2e, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x28, 0x74, 0x65,
+    0x78, 0x53, 0x6d, 0x70, 0x6c, 0x72, 0x2c, 0x20, 0x69, 0x6e, 0x2e, 0x76,
+    0x5f, 0x74, 0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x5f, 0x63, 0x6f, 0x6f,
+    0x72, 0x64, 0x73, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65,
+    0x74, 0x75, 0x72, 0x6e, 0x20, 0x6f, 0x75, 0x74, 0x3b, 0x0a, 0x7d, 0x0a,
+    0x0a, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
+    0x10, 0x00, 0x1c, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+    0x0c, 0x00, 0x14, 0x00, 0x10, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00,
+    0x0c, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+    0x74, 0x65, 0x78, 0x00, 0x21, 0x00, 0x00, 0x00, 0x66, 0x6c, 0x75, 0x74,
+    0x74, 0x65, 0x72, 0x5f, 0x67, 0x70, 0x75, 0x5f, 0x74, 0x65, 0x78, 0x74,
+    0x75, 0x72, 0x65, 0x5f, 0x66, 0x72, 0x61, 0x67, 0x6d, 0x65, 0x6e, 0x74,
+    0x5f, 0x6d, 0x61, 0x69, 0x6e, 0x00, 0x00, 0x00};
diff --git a/lib/gpu/fixtures.h b/lib/gpu/fixtures.h
new file mode 100644
index 0000000000000000000000000000000000000000..acd936ddd045e9ff5d33060df8b0859d3865a172
--- /dev/null
+++ b/lib/gpu/fixtures.h
@@ -0,0 +1,114 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_LIB_GPU_FIXTURES_H_
+#define FLUTTER_LIB_GPU_FIXTURES_H_
+
+#include "impeller/core/shader_types.h"
+
+struct FlutterGPUUnlitVertexShader {
+  struct PerVertexData {
+    impeller::Point position;  // (offset 0, size 8)
+  };  // struct PerVertexData (size 8)
+
+  static constexpr auto kInputPosition = impeller::ShaderStageIOSlot{
+      // position
+      "position",                    // name
+      0u,                            // attribute location
+      0u,                            // attribute set
+      0u,                            // attribute binding
+      impeller::ShaderType::kFloat,  // type
+      32u,                           // bit width of type
+      2u,                            // vec size
+      1u,                            // number of columns
+      0u,                            // offset for interleaved layout
+  };
+
+  static constexpr std::array<const impeller::ShaderStageIOSlot*, 1>
+      kAllShaderStageInputs = {
+          &kInputPosition,  // position
+  };
+
+  static constexpr auto kInterleavedLayout = impeller::ShaderStageBufferLayout{
+      sizeof(PerVertexData),  // stride for interleaved layout
+      0u,                     // attribute binding
+  };
+  static constexpr std::array<const impeller::ShaderStageBufferLayout*, 1>
+      kInterleavedBufferLayout = {&kInterleavedLayout};
+};
+
+constexpr unsigned int kFlutterGPUUnlitVertIPLRLength = 856;
+extern unsigned char kFlutterGPUUnlitVertIPLR[];
+
+constexpr unsigned int kFlutterGPUUnlitFragIPLRLength = 556;
+extern unsigned char kFlutterGPUUnlitFragIPLR[];
+
+struct FlutterGPUTextureVertexShader {
+  struct PerVertexData {
+    impeller::Vector3 position;      // (offset 0, size 12)
+    impeller::Point texture_coords;  // (offset 12, size 8)
+    impeller::Vector4 color;         // (offset 20, size 16)
+  };  // struct PerVertexData (size 36)
+
+  static constexpr auto kInputTextureCoords = impeller::ShaderStageIOSlot{
+      // texture_coords
+      "texture_coords",              // name
+      1u,                            // attribute location
+      0u,                            // attribute set
+      0u,                            // attribute binding
+      impeller::ShaderType::kFloat,  // type
+      32u,                           // bit width of type
+      2u,                            // vec size
+      1u,                            // number of columns
+      12u,                           // offset for interleaved layout
+  };
+
+  static constexpr auto kInputColor = impeller::ShaderStageIOSlot{
+      // color
+      "color",                       // name
+      2u,                            // attribute location
+      0u,                            // attribute set
+      0u,                            // attribute binding
+      impeller::ShaderType::kFloat,  // type
+      32u,                           // bit width of type
+      4u,                            // vec size
+      1u,                            // number of columns
+      20u,                           // offset for interleaved layout
+  };
+
+  static constexpr auto kInputPosition = impeller::ShaderStageIOSlot{
+      // position
+      "position",                    // name
+      0u,                            // attribute location
+      0u,                            // attribute set
+      0u,                            // attribute binding
+      impeller::ShaderType::kFloat,  // type
+      32u,                           // bit width of type
+      3u,                            // vec size
+      1u,                            // number of columns
+      0u,                            // offset for interleaved layout
+  };
+
+  static constexpr std::array<const impeller::ShaderStageIOSlot*, 3>
+      kAllShaderStageInputs = {
+          &kInputTextureCoords,  // texture_coords
+          &kInputColor,          // color
+          &kInputPosition,       // position
+  };
+
+  static constexpr auto kInterleavedLayout = impeller::ShaderStageBufferLayout{
+      sizeof(PerVertexData),  // stride for interleaved layout
+      0u,                     // attribute binding
+  };
+  static constexpr std::array<const impeller::ShaderStageBufferLayout*, 1>
+      kInterleavedBufferLayout = {&kInterleavedLayout};
+};
+
+constexpr unsigned int kFlutterGPUTextureVertIPLRLength = 920;
+extern unsigned char kFlutterGPUTextureVertIPLR[];
+
+constexpr unsigned int kFlutterGPUTextureFragIPLRLength = 800;
+extern unsigned char kFlutterGPUTextureFragIPLR[];
+
+#endif  // FLUTTER_LIB_GPU_FIXTURES_H_
diff --git a/lib/gpu/formats.cc b/lib/gpu/formats.cc
new file mode 100644
index 0000000000000000000000000000000000000000..07f1f6b17fbd56d7620ee64981c215fa409dd389
--- /dev/null
+++ b/lib/gpu/formats.cc
@@ -0,0 +1,13 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/lib/gpu/formats.h"
+
+namespace flutter {
+namespace gpu {
+
+//
+
+}  // namespace gpu
+}  // namespace flutter
diff --git a/lib/gpu/formats.h b/lib/gpu/formats.h
new file mode 100644
index 0000000000000000000000000000000000000000..7a9135d8bf57e70d2f3faf7781693c9f1fbd7dc2
--- /dev/null
+++ b/lib/gpu/formats.h
@@ -0,0 +1,508 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_LIB_GPU_FORMATS_H_
+#define FLUTTER_LIB_GPU_FORMATS_H_
+
+#include "fml/logging.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/shader_types.h"
+
+// ATTENTION! ATTENTION! ATTENTION!
+// All enums defined in this file must exactly match the contents and order of
+// the corresponding enums defined in `gpu/lib/src/formats.dart`.
+
+namespace flutter {
+namespace gpu {
+
+enum class FlutterGPUStorageMode {
+  kHostVisible,
+  kDevicePrivate,
+  kDeviceTransient,
+};
+
+constexpr impeller::StorageMode ToImpellerStorageMode(
+    FlutterGPUStorageMode value) {
+  switch (value) {
+    case FlutterGPUStorageMode::kHostVisible:
+      return impeller::StorageMode::kHostVisible;
+    case FlutterGPUStorageMode::kDevicePrivate:
+      return impeller::StorageMode::kDevicePrivate;
+    case FlutterGPUStorageMode::kDeviceTransient:
+      return impeller::StorageMode::kDeviceTransient;
+  }
+}
+
+constexpr impeller::StorageMode ToImpellerStorageMode(int value) {
+  return ToImpellerStorageMode(static_cast<FlutterGPUStorageMode>(value));
+}
+
+enum class FlutterGPUPixelFormat {
+  kUnknown,
+  kA8UNormInt,
+  kR8UNormInt,
+  kR8G8UNormInt,
+  kR8G8B8A8UNormInt,
+  kR8G8B8A8UNormIntSRGB,
+  kB8G8R8A8UNormInt,
+  kB8G8R8A8UNormIntSRGB,
+  kR32G32B32A32Float,
+  kR16G16B16A16Float,
+  kB10G10R10XR,
+  kB10G10R10XRSRGB,
+  kB10G10R10A10XR,
+  kS8UInt,
+  kD24UnormS8Uint,
+  kD32FloatS8UInt,
+};
+
+constexpr impeller::PixelFormat ToImpellerPixelFormat(
+    FlutterGPUPixelFormat value) {
+  switch (value) {
+    case FlutterGPUPixelFormat::kUnknown:
+      return impeller::PixelFormat::kUnknown;
+    case FlutterGPUPixelFormat::kA8UNormInt:
+      return impeller::PixelFormat::kA8UNormInt;
+    case FlutterGPUPixelFormat::kR8UNormInt:
+      return impeller::PixelFormat::kR8UNormInt;
+    case FlutterGPUPixelFormat::kR8G8UNormInt:
+      return impeller::PixelFormat::kR8G8UNormInt;
+    case FlutterGPUPixelFormat::kR8G8B8A8UNormInt:
+      return impeller::PixelFormat::kR8G8B8A8UNormInt;
+    case FlutterGPUPixelFormat::kR8G8B8A8UNormIntSRGB:
+      return impeller::PixelFormat::kR8G8B8A8UNormIntSRGB;
+    case FlutterGPUPixelFormat::kB8G8R8A8UNormInt:
+      return impeller::PixelFormat::kB8G8R8A8UNormInt;
+    case FlutterGPUPixelFormat::kB8G8R8A8UNormIntSRGB:
+      return impeller::PixelFormat::kB8G8R8A8UNormIntSRGB;
+    case FlutterGPUPixelFormat::kR32G32B32A32Float:
+      return impeller::PixelFormat::kR32G32B32A32Float;
+    case FlutterGPUPixelFormat::kR16G16B16A16Float:
+      return impeller::PixelFormat::kR16G16B16A16Float;
+    case FlutterGPUPixelFormat::kB10G10R10XR:
+      return impeller::PixelFormat::kB10G10R10XR;
+    case FlutterGPUPixelFormat::kB10G10R10XRSRGB:
+      return impeller::PixelFormat::kB10G10R10XRSRGB;
+    case FlutterGPUPixelFormat::kB10G10R10A10XR:
+      return impeller::PixelFormat::kB10G10R10A10XR;
+    case FlutterGPUPixelFormat::kS8UInt:
+      return impeller::PixelFormat::kS8UInt;
+    case FlutterGPUPixelFormat::kD24UnormS8Uint:
+      return impeller::PixelFormat::kD24UnormS8Uint;
+    case FlutterGPUPixelFormat::kD32FloatS8UInt:
+      return impeller::PixelFormat::kD32FloatS8UInt;
+  }
+}
+
+constexpr impeller::PixelFormat ToImpellerPixelFormat(int value) {
+  return ToImpellerPixelFormat(static_cast<FlutterGPUPixelFormat>(value));
+}
+
+constexpr FlutterGPUPixelFormat FromImpellerPixelFormat(
+    impeller::PixelFormat value) {
+  switch (value) {
+    case impeller::PixelFormat::kUnknown:
+      return FlutterGPUPixelFormat::kUnknown;
+    case impeller::PixelFormat::kA8UNormInt:
+      return FlutterGPUPixelFormat::kA8UNormInt;
+    case impeller::PixelFormat::kR8UNormInt:
+      return FlutterGPUPixelFormat::kR8UNormInt;
+    case impeller::PixelFormat::kR8G8UNormInt:
+      return FlutterGPUPixelFormat::kR8G8UNormInt;
+    case impeller::PixelFormat::kR8G8B8A8UNormInt:
+      return FlutterGPUPixelFormat::kR8G8B8A8UNormInt;
+    case impeller::PixelFormat::kR8G8B8A8UNormIntSRGB:
+      return FlutterGPUPixelFormat::kR8G8B8A8UNormIntSRGB;
+    case impeller::PixelFormat::kB8G8R8A8UNormInt:
+      return FlutterGPUPixelFormat::kB8G8R8A8UNormInt;
+    case impeller::PixelFormat::kB8G8R8A8UNormIntSRGB:
+      return FlutterGPUPixelFormat::kB8G8R8A8UNormIntSRGB;
+    case impeller::PixelFormat::kR32G32B32A32Float:
+      return FlutterGPUPixelFormat::kR32G32B32A32Float;
+    case impeller::PixelFormat::kR16G16B16A16Float:
+      return FlutterGPUPixelFormat::kR16G16B16A16Float;
+    case impeller::PixelFormat::kB10G10R10XR:
+      return FlutterGPUPixelFormat::kB10G10R10XR;
+    case impeller::PixelFormat::kB10G10R10XRSRGB:
+      return FlutterGPUPixelFormat::kB10G10R10XRSRGB;
+    case impeller::PixelFormat::kB10G10R10A10XR:
+      return FlutterGPUPixelFormat::kB10G10R10A10XR;
+    case impeller::PixelFormat::kS8UInt:
+      return FlutterGPUPixelFormat::kS8UInt;
+    case impeller::PixelFormat::kD24UnormS8Uint:
+      return FlutterGPUPixelFormat::kD24UnormS8Uint;
+    case impeller::PixelFormat::kD32FloatS8UInt:
+      return FlutterGPUPixelFormat::kD32FloatS8UInt;
+  }
+}
+
+enum class FlutterGPUTextureCoordinateSystem {
+  kUploadFromHost,
+  kRenderToTexture,
+};
+
+constexpr impeller::TextureCoordinateSystem ToImpellerTextureCoordinateSystem(
+    FlutterGPUTextureCoordinateSystem value) {
+  switch (value) {
+    case FlutterGPUTextureCoordinateSystem::kUploadFromHost:
+      return impeller::TextureCoordinateSystem::kUploadFromHost;
+    case FlutterGPUTextureCoordinateSystem::kRenderToTexture:
+      return impeller::TextureCoordinateSystem::kRenderToTexture;
+  }
+}
+
+constexpr impeller::TextureCoordinateSystem ToImpellerTextureCoordinateSystem(
+    int value) {
+  return ToImpellerTextureCoordinateSystem(
+      static_cast<FlutterGPUTextureCoordinateSystem>(value));
+}
+
+enum class FlutterGPUBlendFactor {
+  kZero,
+  kOne,
+  kSourceColor,
+  kOneMinusSourceColor,
+  kSourceAlpha,
+  kOneMinusSourceAlpha,
+  kDestinationColor,
+  kOneMinusDestinationColor,
+  kDestinationAlpha,
+  kOneMinusDestinationAlpha,
+  kSourceAlphaSaturated,
+  kBlendColor,
+  kOneMinusBlendColor,
+  kBlendAlpha,
+  kOneMinusBlendAlpha,
+};
+
+constexpr impeller::BlendFactor ToImpellerBlendFactor(
+    FlutterGPUBlendFactor value) {
+  switch (value) {
+    case FlutterGPUBlendFactor::kZero:
+      return impeller::BlendFactor::kZero;
+    case FlutterGPUBlendFactor::kOne:
+      return impeller::BlendFactor::kOne;
+    case FlutterGPUBlendFactor::kSourceColor:
+      return impeller::BlendFactor::kSourceColor;
+    case FlutterGPUBlendFactor::kOneMinusSourceColor:
+      return impeller::BlendFactor::kOneMinusSourceColor;
+    case FlutterGPUBlendFactor::kSourceAlpha:
+      return impeller::BlendFactor::kSourceAlpha;
+    case FlutterGPUBlendFactor::kOneMinusSourceAlpha:
+      return impeller::BlendFactor::kOneMinusSourceAlpha;
+    case FlutterGPUBlendFactor::kDestinationColor:
+      return impeller::BlendFactor::kDestinationColor;
+    case FlutterGPUBlendFactor::kOneMinusDestinationColor:
+      return impeller::BlendFactor::kOneMinusDestinationColor;
+    case FlutterGPUBlendFactor::kDestinationAlpha:
+      return impeller::BlendFactor::kDestinationAlpha;
+    case FlutterGPUBlendFactor::kOneMinusDestinationAlpha:
+      return impeller::BlendFactor::kOneMinusDestinationAlpha;
+    case FlutterGPUBlendFactor::kSourceAlphaSaturated:
+      return impeller::BlendFactor::kSourceAlphaSaturated;
+    case FlutterGPUBlendFactor::kBlendColor:
+      return impeller::BlendFactor::kBlendColor;
+    case FlutterGPUBlendFactor::kOneMinusBlendColor:
+      return impeller::BlendFactor::kOneMinusBlendColor;
+    case FlutterGPUBlendFactor::kBlendAlpha:
+      return impeller::BlendFactor::kBlendAlpha;
+    case FlutterGPUBlendFactor::kOneMinusBlendAlpha:
+      return impeller::BlendFactor::kOneMinusBlendAlpha;
+  }
+}
+
+constexpr impeller::BlendFactor ToImpellerBlendFactor(int value) {
+  return ToImpellerBlendFactor(static_cast<FlutterGPUBlendFactor>(value));
+}
+
+enum class FlutterGPUBlendOperation {
+  kAdd,
+  kSubtract,
+  kReverseSubtract,
+};
+
+constexpr impeller::BlendOperation ToImpellerBlendOperation(
+    FlutterGPUBlendOperation value) {
+  switch (value) {
+    case FlutterGPUBlendOperation::kAdd:
+      return impeller::BlendOperation::kAdd;
+    case FlutterGPUBlendOperation::kSubtract:
+      return impeller::BlendOperation::kSubtract;
+    case FlutterGPUBlendOperation::kReverseSubtract:
+      return impeller::BlendOperation::kReverseSubtract;
+  }
+}
+
+constexpr impeller::BlendOperation ToImpellerBlendOperation(int value) {
+  return ToImpellerBlendOperation(static_cast<FlutterGPUBlendOperation>(value));
+}
+
+enum class FlutterGPULoadAction {
+  kDontCare,
+  kLoad,
+  kClear,
+};
+
+constexpr impeller::LoadAction ToImpellerLoadAction(
+    FlutterGPULoadAction value) {
+  switch (value) {
+    case FlutterGPULoadAction::kDontCare:
+      return impeller::LoadAction::kDontCare;
+    case FlutterGPULoadAction::kLoad:
+      return impeller::LoadAction::kLoad;
+    case FlutterGPULoadAction::kClear:
+      return impeller::LoadAction::kClear;
+  }
+}
+
+constexpr impeller::LoadAction ToImpellerLoadAction(int value) {
+  return ToImpellerLoadAction(static_cast<FlutterGPULoadAction>(value));
+}
+
+enum class FlutterGPUStoreAction {
+  kDontCare,
+  kStore,
+  kMultisampleResolve,
+  kStoreAndMultisampleResolve,
+};
+
+constexpr impeller::StoreAction ToImpellerStoreAction(
+    FlutterGPUStoreAction value) {
+  switch (value) {
+    case FlutterGPUStoreAction::kDontCare:
+      return impeller::StoreAction::kDontCare;
+    case FlutterGPUStoreAction::kStore:
+      return impeller::StoreAction::kStore;
+    case FlutterGPUStoreAction::kMultisampleResolve:
+      return impeller::StoreAction::kMultisampleResolve;
+    case FlutterGPUStoreAction::kStoreAndMultisampleResolve:
+      return impeller::StoreAction::kStoreAndMultisampleResolve;
+  }
+}
+
+constexpr impeller::StoreAction ToImpellerStoreAction(int value) {
+  return ToImpellerStoreAction(static_cast<FlutterGPUStoreAction>(value));
+}
+
+enum class FlutterGPUShaderStage {
+  kVertex,
+  kFragment,
+};
+
+constexpr impeller::ShaderStage ToImpellerShaderStage(
+    FlutterGPUShaderStage value) {
+  switch (value) {
+    case FlutterGPUShaderStage::kVertex:
+      return impeller::ShaderStage::kVertex;
+    case FlutterGPUShaderStage::kFragment:
+      return impeller::ShaderStage::kFragment;
+  }
+}
+
+constexpr impeller::ShaderStage ToImpellerShaderStage(int value) {
+  return ToImpellerShaderStage(static_cast<FlutterGPUShaderStage>(value));
+}
+
+constexpr FlutterGPUShaderStage FromImpellerShaderStage(
+    impeller::ShaderStage value) {
+  switch (value) {
+    case impeller::ShaderStage::kVertex:
+      return FlutterGPUShaderStage::kVertex;
+    case impeller::ShaderStage::kFragment:
+      return FlutterGPUShaderStage::kFragment;
+    case impeller::ShaderStage::kUnknown:
+    case impeller::ShaderStage::kCompute:
+      FML_LOG(FATAL) << "Invalid Flutter GPU ShaderStage "
+                     << static_cast<size_t>(value);
+      FML_UNREACHABLE();
+  }
+  return FlutterGPUShaderStage::kVertex;
+}
+
+enum class FlutterGPUMinMagFilter {
+  kNearest,
+  kLinear,
+};
+
+constexpr impeller::MinMagFilter ToImpellerMinMagFilter(
+    FlutterGPUMinMagFilter value) {
+  switch (value) {
+    case FlutterGPUMinMagFilter::kNearest:
+      return impeller::MinMagFilter::kNearest;
+    case FlutterGPUMinMagFilter::kLinear:
+      return impeller::MinMagFilter::kLinear;
+  }
+}
+
+constexpr impeller::MinMagFilter ToImpellerMinMagFilter(int value) {
+  return ToImpellerMinMagFilter(static_cast<FlutterGPUMinMagFilter>(value));
+}
+
+enum class FlutterGPUMipFilter {
+  kNearest,
+  kLinear,
+};
+
+constexpr impeller::MipFilter ToImpellerMipFilter(FlutterGPUMipFilter value) {
+  switch (value) {
+    case FlutterGPUMipFilter::kNearest:
+      return impeller::MipFilter::kNearest;
+    case FlutterGPUMipFilter::kLinear:
+      return impeller::MipFilter::kLinear;
+  }
+}
+
+constexpr impeller::MipFilter ToImpellerMipFilter(int value) {
+  return ToImpellerMipFilter(static_cast<FlutterGPUMipFilter>(value));
+}
+
+enum class FlutterGPUSamplerAddressMode {
+  kClampToEdge,
+  kRepeat,
+  kMirror,
+};
+
+constexpr impeller::SamplerAddressMode ToImpellerSamplerAddressMode(
+    FlutterGPUSamplerAddressMode value) {
+  switch (value) {
+    case FlutterGPUSamplerAddressMode::kClampToEdge:
+      return impeller::SamplerAddressMode::kClampToEdge;
+    case FlutterGPUSamplerAddressMode::kRepeat:
+      return impeller::SamplerAddressMode::kRepeat;
+    case FlutterGPUSamplerAddressMode::kMirror:
+      return impeller::SamplerAddressMode::kMirror;
+  }
+}
+
+constexpr impeller::SamplerAddressMode ToImpellerSamplerAddressMode(int value) {
+  return ToImpellerSamplerAddressMode(
+      static_cast<FlutterGPUSamplerAddressMode>(value));
+}
+
+enum class FlutterGPUIndexType {
+  k16bit,
+  k32bit,
+};
+
+constexpr impeller::IndexType ToImpellerIndexType(FlutterGPUIndexType value) {
+  switch (value) {
+    case FlutterGPUIndexType::k16bit:
+      return impeller::IndexType::k16bit;
+    case FlutterGPUIndexType::k32bit:
+      return impeller::IndexType::k32bit;
+  }
+}
+
+constexpr impeller::IndexType ToImpellerIndexType(int value) {
+  return ToImpellerIndexType(static_cast<FlutterGPUIndexType>(value));
+}
+
+enum class FlutterGPUPrimitiveType {
+  kTriangle,
+  kTriangleStrip,
+  kLine,
+  kLineStrip,
+  kPoint,
+};
+
+constexpr impeller::PrimitiveType ToImpellerPrimitiveType(
+    FlutterGPUPrimitiveType value) {
+  switch (value) {
+    case FlutterGPUPrimitiveType::kTriangle:
+      return impeller::PrimitiveType::kTriangle;
+    case FlutterGPUPrimitiveType::kTriangleStrip:
+      return impeller::PrimitiveType::kTriangleStrip;
+    case FlutterGPUPrimitiveType::kLine:
+      return impeller::PrimitiveType::kLine;
+    case FlutterGPUPrimitiveType::kLineStrip:
+      return impeller::PrimitiveType::kLineStrip;
+    case FlutterGPUPrimitiveType::kPoint:
+      return impeller::PrimitiveType::kPoint;
+  }
+}
+
+constexpr impeller::PrimitiveType ToImpellerPrimitiveType(int value) {
+  return ToImpellerPrimitiveType(static_cast<FlutterGPUPrimitiveType>(value));
+}
+
+enum class FlutterGPUCompareFunction {
+  kNever,
+  kAlways,
+  kLess,
+  kEqual,
+  kLessEqual,
+  kGreater,
+  kNotEqual,
+  kGreaterEqual,
+};
+
+constexpr impeller::CompareFunction ToImpellerCompareFunction(
+    FlutterGPUCompareFunction value) {
+  switch (value) {
+    case FlutterGPUCompareFunction::kNever:
+      return impeller::CompareFunction::kNever;
+    case FlutterGPUCompareFunction::kAlways:
+      return impeller::CompareFunction::kAlways;
+    case FlutterGPUCompareFunction::kLess:
+      return impeller::CompareFunction::kLess;
+    case FlutterGPUCompareFunction::kEqual:
+      return impeller::CompareFunction::kEqual;
+    case FlutterGPUCompareFunction::kLessEqual:
+      return impeller::CompareFunction::kLessEqual;
+    case FlutterGPUCompareFunction::kGreater:
+      return impeller::CompareFunction::kGreater;
+    case FlutterGPUCompareFunction::kNotEqual:
+      return impeller::CompareFunction::kNotEqual;
+    case FlutterGPUCompareFunction::kGreaterEqual:
+      return impeller::CompareFunction::kGreaterEqual;
+  }
+}
+
+constexpr impeller::CompareFunction ToImpellerCompareFunction(int value) {
+  return ToImpellerCompareFunction(
+      static_cast<FlutterGPUCompareFunction>(value));
+}
+
+enum class FlutterGPUStencilOperation {
+  kKeep,
+  kZero,
+  kSetToReferenceValue,
+  kIncrementClamp,
+  kDecrementClamp,
+  kInvert,
+  kIncrementWrap,
+  kDecrementWrap,
+};
+
+constexpr impeller::StencilOperation ToImpellerStencilOperation(
+    FlutterGPUStencilOperation value) {
+  switch (value) {
+    case FlutterGPUStencilOperation::kKeep:
+      return impeller::StencilOperation::kKeep;
+    case FlutterGPUStencilOperation::kZero:
+      return impeller::StencilOperation::kZero;
+    case FlutterGPUStencilOperation::kSetToReferenceValue:
+      return impeller::StencilOperation::kSetToReferenceValue;
+    case FlutterGPUStencilOperation::kIncrementClamp:
+      return impeller::StencilOperation::kIncrementClamp;
+    case FlutterGPUStencilOperation::kDecrementClamp:
+      return impeller::StencilOperation::kDecrementClamp;
+    case FlutterGPUStencilOperation::kInvert:
+      return impeller::StencilOperation::kInvert;
+    case FlutterGPUStencilOperation::kIncrementWrap:
+      return impeller::StencilOperation::kIncrementWrap;
+    case FlutterGPUStencilOperation::kDecrementWrap:
+      return impeller::StencilOperation::kDecrementWrap;
+  }
+}
+
+constexpr impeller::StencilOperation ToImpellerStencilOperation(int value) {
+  return ToImpellerStencilOperation(
+      static_cast<FlutterGPUStencilOperation>(value));
+}
+
+}  // namespace gpu
+}  // namespace flutter
+
+#endif  // FLUTTER_LIB_GPU_FORMATS_H_
diff --git a/lib/gpu/host_buffer.cc b/lib/gpu/host_buffer.cc
new file mode 100644
index 0000000000000000000000000000000000000000..eb4b6fae088e63a5c9b13bda79d0a156e682844b
--- /dev/null
+++ b/lib/gpu/host_buffer.cc
@@ -0,0 +1,61 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/lib/gpu/host_buffer.h"
+
+#include <optional>
+
+#include "dart_api.h"
+#include "impeller/core/host_buffer.h"
+#include "impeller/core/platform.h"
+#include "third_party/tonic/typed_data/dart_byte_data.h"
+
+namespace flutter {
+namespace gpu {
+
+IMPLEMENT_WRAPPERTYPEINFO(flutter_gpu, HostBuffer);
+
+HostBuffer::HostBuffer(Context* context)
+    : host_buffer_(impeller::HostBuffer::Create(
+          context->GetContext()->GetResourceAllocator())) {}
+
+HostBuffer::~HostBuffer() = default;
+
+std::shared_ptr<impeller::HostBuffer> HostBuffer::GetBuffer() {
+  return host_buffer_;
+}
+
+size_t HostBuffer::EmplaceBytes(const tonic::DartByteData& byte_data) {
+  auto view =
+      host_buffer_->Emplace(byte_data.data(), byte_data.length_in_bytes(),
+                            impeller::DefaultUniformAlignment());
+  emplacements_[current_offset_] = view;
+  size_t previous_offset = current_offset_;
+  current_offset_ += view.range.length;
+  return previous_offset;
+}
+
+std::optional<impeller::BufferView> HostBuffer::GetBufferViewForOffset(
+    size_t offset) {
+  return emplacements_[offset];
+}
+
+}  // namespace gpu
+}  // namespace flutter
+
+//----------------------------------------------------------------------------
+/// Exports
+///
+
+void InternalFlutterGpu_HostBuffer_Initialize(Dart_Handle wrapper,
+                                              flutter::gpu::Context* context) {
+  auto res = fml::MakeRefCounted<flutter::gpu::HostBuffer>(context);
+  res->AssociateWithDartWrapper(wrapper);
+}
+
+size_t InternalFlutterGpu_HostBuffer_EmplaceBytes(
+    flutter::gpu::HostBuffer* wrapper,
+    Dart_Handle byte_data) {
+  return wrapper->EmplaceBytes(tonic::DartByteData(byte_data));
+}
diff --git a/lib/gpu/host_buffer.h b/lib/gpu/host_buffer.h
new file mode 100644
index 0000000000000000000000000000000000000000..31a5750303b41645adf7d9766b79f2b6d97097e2
--- /dev/null
+++ b/lib/gpu/host_buffer.h
@@ -0,0 +1,62 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_LIB_GPU_HOST_BUFFER_H_
+#define FLUTTER_LIB_GPU_HOST_BUFFER_H_
+
+#include "flutter/lib/gpu/export.h"
+#include "flutter/lib/ui/dart_wrapper.h"
+#include "impeller/core/buffer_view.h"
+#include "impeller/core/host_buffer.h"
+#include "lib/gpu/context.h"
+#include "third_party/tonic/typed_data/dart_byte_data.h"
+
+namespace flutter {
+namespace gpu {
+
+class HostBuffer : public RefCountedDartWrappable<HostBuffer> {
+  DEFINE_WRAPPERTYPEINFO();
+  FML_FRIEND_MAKE_REF_COUNTED(HostBuffer);
+
+ public:
+  explicit HostBuffer(Context* context);
+
+  ~HostBuffer() override;
+
+  std::shared_ptr<impeller::HostBuffer> GetBuffer();
+
+  size_t EmplaceBytes(const tonic::DartByteData& byte_data);
+
+  std::optional<impeller::BufferView> GetBufferViewForOffset(size_t offset);
+
+ private:
+  size_t current_offset_ = 0;
+  std::shared_ptr<impeller::HostBuffer> host_buffer_;
+  std::unordered_map<size_t, impeller::BufferView> emplacements_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(HostBuffer);
+};
+
+}  // namespace gpu
+}  // namespace flutter
+
+//----------------------------------------------------------------------------
+/// Exports
+///
+
+extern "C" {
+
+FLUTTER_GPU_EXPORT
+extern void InternalFlutterGpu_HostBuffer_Initialize(
+    Dart_Handle wrapper,
+    flutter::gpu::Context* context);
+
+FLUTTER_GPU_EXPORT
+extern size_t InternalFlutterGpu_HostBuffer_EmplaceBytes(
+    flutter::gpu::HostBuffer* wrapper,
+    Dart_Handle byte_data);
+
+}  // extern "C"
+
+#endif  // FLUTTER_LIB_GPU_HOST_BUFFER_H_
diff --git a/lib/gpu/lib/gpu.dart b/lib/gpu/lib/gpu.dart
new file mode 100644
index 0000000000000000000000000000000000000000..8603811c3fd8b1642272a7d9f20ded05009326ab
--- /dev/null
+++ b/lib/gpu/lib/gpu.dart
@@ -0,0 +1,30 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+/// The Flutter GPU library.
+///
+/// To use, import `package:flutter_gpu/gpu.dart`.
+///
+/// See also:
+///
+///  * [Flutter GPU Wiki page](https://github.com/flutter/flutter/wiki/Flutter-GPU).
+library flutter_gpu;
+
+import 'dart:ffi';
+import 'dart:nativewrappers';
+import 'dart:typed_data';
+// ignore: uri_does_not_exist
+import 'dart:ui' as ui;
+
+export 'src/smoketest.dart';
+
+part 'src/buffer.dart';
+part 'src/command_buffer.dart';
+part 'src/context.dart';
+part 'src/formats.dart';
+part 'src/texture.dart';
+part 'src/render_pass.dart';
+part 'src/render_pipeline.dart';
+part 'src/shader.dart';
+part 'src/shader_library.dart';
diff --git a/lib/gpu/lib/src/buffer.dart b/lib/gpu/lib/src/buffer.dart
new file mode 100644
index 0000000000000000000000000000000000000000..51ab0a3513b60803f5593bba60a92ca17c54a0da
--- /dev/null
+++ b/lib/gpu/lib/src/buffer.dart
@@ -0,0 +1,186 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// ignore_for_file: public_member_api_docs
+
+part of flutter_gpu;
+
+/// A reference to a byte range within a GPU-resident [Buffer].
+class BufferView {
+  /// The buffer of this view.
+  final Buffer buffer;
+
+  /// The start of the view, in bytes starting from the beginning of the
+  /// [buffer].
+  final int offsetInBytes;
+
+  /// The length of the view.
+  final int lengthInBytes;
+
+  /// Create a new view into a buffer on the GPU.
+  const BufferView(this.buffer,
+      {required this.offsetInBytes, required this.lengthInBytes});
+}
+
+/// A buffer that can be referenced by commands on the GPU.
+mixin Buffer {
+  void _bindAsVertexBuffer(RenderPass renderPass, int offsetInBytes,
+      int lengthInBytes, int vertexCount);
+
+  void _bindAsIndexBuffer(RenderPass renderPass, int offsetInBytes,
+      int lengthInBytes, IndexType indexType, int indexCount);
+
+  bool _bindAsUniform(RenderPass renderPass, UniformSlot slot,
+      int offsetInBytes, int lengthInBytes);
+}
+
+/// [DeviceBuffer] is a region of memory allocated on the device heap
+/// (GPU-resident memory).
+base class DeviceBuffer extends NativeFieldWrapperClass1 with Buffer {
+  bool _valid = false;
+  get isValid {
+    return _valid;
+  }
+
+  /// Creates a new DeviceBuffer.
+  DeviceBuffer._initialize(
+      GpuContext gpuContext, StorageMode storageMode, int sizeInBytes)
+      : storageMode = storageMode,
+        sizeInBytes = sizeInBytes {
+    _valid = _initialize(gpuContext, storageMode.index, sizeInBytes);
+  }
+
+  /// Creates a new host visible DeviceBuffer with data copied from the host.
+  DeviceBuffer._initializeWithHostData(GpuContext gpuContext, ByteData data)
+      : storageMode = StorageMode.hostVisible,
+        sizeInBytes = data.lengthInBytes {
+    _valid = _initializeWithHostData(gpuContext, data);
+  }
+
+  final StorageMode storageMode;
+  final int sizeInBytes;
+
+  @override
+  void _bindAsVertexBuffer(RenderPass renderPass, int offsetInBytes,
+      int lengthInBytes, int vertexCount) {
+    renderPass._bindVertexBufferDevice(
+        this, offsetInBytes, lengthInBytes, vertexCount);
+  }
+
+  @override
+  void _bindAsIndexBuffer(RenderPass renderPass, int offsetInBytes,
+      int lengthInBytes, IndexType indexType, int indexCount) {
+    renderPass._bindIndexBufferDevice(
+        this, offsetInBytes, lengthInBytes, indexType.index, indexCount);
+  }
+
+  @override
+  bool _bindAsUniform(RenderPass renderPass, UniformSlot slot,
+      int offsetInBytes, int lengthInBytes) {
+    return renderPass._bindUniformDevice(
+        slot.shader, slot.uniformName, this, offsetInBytes, lengthInBytes);
+  }
+
+  /// Wrap with native counterpart.
+  @Native<Bool Function(Handle, Pointer<Void>, Int, Int)>(
+      symbol: 'InternalFlutterGpu_DeviceBuffer_Initialize')
+  external bool _initialize(
+      GpuContext gpuContext, int storageMode, int sizeInBytes);
+
+  /// Wrap with native counterpart.
+  @Native<Bool Function(Handle, Pointer<Void>, Handle)>(
+      symbol: 'InternalFlutterGpu_DeviceBuffer_InitializeWithHostData')
+  external bool _initializeWithHostData(GpuContext gpuContext, ByteData data);
+
+  /// Overwrite a range of bytes in the already created [DeviceBuffer].
+  ///
+  /// This method can only be used if the [DeviceBuffer] was created with
+  /// [StorageMode.hostVisible]. An exception will be thrown otherwise.
+  ///
+  /// The entire length of [sourceBytes] will be copied into the [DeviceBuffer],
+  /// starting at byte index [destinationOffsetInBytes] in the [DeviceBuffer].
+  /// If performing this copy would result in an out of bounds write to the
+  /// buffer, then the write will not be attempted and will fail.
+  ///
+  /// Returns [true] if the write was successful, or [false] if the write
+  /// failed due to an internal error.
+  bool overwrite(ByteData sourceBytes, {int destinationOffsetInBytes = 0}) {
+    if (storageMode != StorageMode.hostVisible) {
+      throw Exception(
+          'DeviceBuffer.overwrite can only be used with DeviceBuffers that are host visible');
+    }
+    if (destinationOffsetInBytes < 0) {
+      throw Exception('destinationOffsetInBytes must be positive');
+    }
+    return _overwrite(sourceBytes, destinationOffsetInBytes);
+  }
+
+  @Native<Bool Function(Pointer<Void>, Handle, Int)>(
+      symbol: 'InternalFlutterGpu_DeviceBuffer_Overwrite')
+  external bool _overwrite(ByteData bytes, int destinationOffsetInBytes);
+}
+
+/// [HostBuffer] is a [Buffer] which is allocated on the host (native CPU
+/// resident memory) and lazily uploaded to the GPU. A [HostBuffer] can be
+/// safely mutated or extended at any time on the host, and will be
+/// automatically re-uploaded to the GPU the next time a GPU operation needs to
+/// access it.
+///
+/// This is useful for efficiently chunking sparse data uploads, especially
+/// ephemeral uniform data that needs to change from frame to frame.
+///
+/// Different platforms have different data alignment requirements for accessing
+/// device buffer data. The [HostBuffer] takes these requirements into account
+/// and automatically inserts padding between emplaced data if necessary.
+base class HostBuffer extends NativeFieldWrapperClass1 with Buffer {
+  /// Creates a new HostBuffer.
+  HostBuffer._initialize(GpuContext gpuContext) {
+    _initialize(gpuContext);
+  }
+
+  @override
+  void _bindAsVertexBuffer(RenderPass renderPass, int offsetInBytes,
+      int lengthInBytes, int vertexCount) {
+    renderPass._bindVertexBufferHost(
+        this, offsetInBytes, lengthInBytes, vertexCount);
+  }
+
+  @override
+  void _bindAsIndexBuffer(RenderPass renderPass, int offsetInBytes,
+      int lengthInBytes, IndexType indexType, int indexCount) {
+    renderPass._bindIndexBufferHost(
+        this, offsetInBytes, lengthInBytes, indexType.index, indexCount);
+  }
+
+  @override
+  bool _bindAsUniform(RenderPass renderPass, UniformSlot slot,
+      int offsetInBytes, int lengthInBytes) {
+    return renderPass._bindUniformHost(
+        slot.shader, slot.uniformName, this, offsetInBytes, lengthInBytes);
+  }
+
+  /// Wrap with native counterpart.
+  @Native<Void Function(Handle, Pointer<Void>)>(
+      symbol: 'InternalFlutterGpu_HostBuffer_Initialize')
+  external void _initialize(GpuContext gpuContext);
+
+  /// Append byte data to the end of the [HostBuffer] and produce a [BufferView]
+  /// that references the new data in the buffer.
+  ///
+  /// This method automatically inserts padding in-between emplace calls in the
+  /// buffer if necessary to abide by platform-specific uniform alignment
+  /// requirements.
+  ///
+  /// The updated buffer will be uploaded to the GPU if the returned
+  /// [BufferView] is used by a rendering command.
+  BufferView emplace(ByteData bytes) {
+    int resultOffset = _emplaceBytes(bytes);
+    return BufferView(this,
+        offsetInBytes: resultOffset, lengthInBytes: bytes.lengthInBytes);
+  }
+
+  @Native<Uint64 Function(Pointer<Void>, Handle)>(
+      symbol: 'InternalFlutterGpu_HostBuffer_EmplaceBytes')
+  external int _emplaceBytes(ByteData bytes);
+}
diff --git a/lib/gpu/lib/src/command_buffer.dart b/lib/gpu/lib/src/command_buffer.dart
new file mode 100644
index 0000000000000000000000000000000000000000..09cae10b8fa75e01ac2fdff8a398386176996f24
--- /dev/null
+++ b/lib/gpu/lib/src/command_buffer.dart
@@ -0,0 +1,36 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// ignore_for_file: public_member_api_docs
+
+part of flutter_gpu;
+
+typedef CompletionCallback<T> = void Function(bool success);
+
+base class CommandBuffer extends NativeFieldWrapperClass1 {
+  /// Creates a new CommandBuffer.
+  CommandBuffer._(GpuContext gpuContext) {
+    _initialize(gpuContext);
+  }
+
+  RenderPass createRenderPass(RenderTarget renderTarget) {
+    return RenderPass._(this, renderTarget);
+  }
+
+  void submit({CompletionCallback? completionCallback}) {
+    String? error = _submit(completionCallback);
+    if (error != null) {
+      throw Exception(error);
+    }
+  }
+
+  /// Wrap with native counterpart.
+  @Native<Bool Function(Handle, Pointer<Void>)>(
+      symbol: 'InternalFlutterGpu_CommandBuffer_Initialize')
+  external bool _initialize(GpuContext gpuContext);
+
+  @Native<Handle Function(Pointer<Void>, Handle)>(
+      symbol: 'InternalFlutterGpu_CommandBuffer_Submit')
+  external String? _submit(CompletionCallback? completionCallback);
+}
diff --git a/lib/gpu/lib/src/context.dart b/lib/gpu/lib/src/context.dart
new file mode 100644
index 0000000000000000000000000000000000000000..c4ae71eabf55848c4dafa1ace2e2797f3e357f37
--- /dev/null
+++ b/lib/gpu/lib/src/context.dart
@@ -0,0 +1,130 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// ignore_for_file: public_member_api_docs
+
+part of flutter_gpu;
+
+/// A handle to a graphics context. Used to create and manage GPU resources.
+///
+/// To obtain the default graphics context, use [getContext].
+base class GpuContext extends NativeFieldWrapperClass1 {
+  /// Creates a new graphics context that corresponds to the default Impeller
+  /// context.
+  GpuContext._createDefault() {
+    final String? error = _initializeDefault();
+    if (error != null) {
+      throw Exception(error);
+    }
+  }
+
+  /// A supported [PixelFormat] for textures that store 4-channel colors
+  /// (red/green/blue/alpha).
+  PixelFormat get defaultColorFormat {
+    return PixelFormat.values[_getDefaultColorFormat()];
+  }
+
+  /// A supported [PixelFormat] for textures that store stencil information.
+  /// May include a depth channel if a stencil-only format is not available.
+  PixelFormat get defaultStencilFormat {
+    return PixelFormat.values[_getDefaultStencilFormat()];
+  }
+
+  /// A supported `PixelFormat` for textures that store both a stencil and depth
+  /// component. This will never return a depth-only or stencil-only texture.
+  ///
+  /// May be [PixelFormat.unknown] if no suitable depth+stencil format was
+  /// found.
+  PixelFormat get defaultDepthStencilFormat {
+    return PixelFormat.values[_getDefaultDepthStencilFormat()];
+  }
+
+  /// Allocates a new region of GPU-resident memory.
+  ///
+  /// The [storageMode] must be either [StorageMode.hostVisible] or
+  /// [StorageMode.devicePrivate], otherwise an exception will be thrown.
+  ///
+  /// Returns [null] if the [DeviceBuffer] creation failed.
+  DeviceBuffer? createDeviceBuffer(StorageMode storageMode, int sizeInBytes) {
+    if (storageMode == StorageMode.deviceTransient) {
+      throw Exception(
+          'DeviceBuffers cannot be set to StorageMode.deviceTransient');
+    }
+    DeviceBuffer result =
+        DeviceBuffer._initialize(this, storageMode, sizeInBytes);
+    return result.isValid ? result : null;
+  }
+
+  /// Allocates a new region of host-visible GPU-resident memory, initialized
+  /// with the given [data].
+  ///
+  /// Given that the buffer will be immediately populated with [data] uploaded
+  /// from the host, the [StorageMode] of the new [DeviceBuffer] is
+  /// automatically set to [StorageMode.hostVisible].
+  ///
+  /// Returns [null] if the [DeviceBuffer] creation failed.
+  DeviceBuffer? createDeviceBufferWithCopy(ByteData data) {
+    DeviceBuffer result = DeviceBuffer._initializeWithHostData(this, data);
+    return result.isValid ? result : null;
+  }
+
+  HostBuffer createHostBuffer() {
+    return HostBuffer._initialize(this);
+  }
+
+  /// Allocates a new texture in GPU-resident memory.
+  ///
+  /// Returns [null] if the [Texture] creation failed.
+  Texture? createTexture(StorageMode storageMode, int width, int height,
+      {PixelFormat format = PixelFormat.r8g8b8a8UNormInt,
+      sampleCount = 1,
+      TextureCoordinateSystem coordinateSystem =
+          TextureCoordinateSystem.renderToTexture,
+      bool enableRenderTargetUsage = true,
+      bool enableShaderReadUsage = true,
+      bool enableShaderWriteUsage = false}) {
+    Texture result = Texture._initialize(
+        this,
+        storageMode,
+        format,
+        width,
+        height,
+        sampleCount,
+        coordinateSystem,
+        enableRenderTargetUsage,
+        enableShaderReadUsage,
+        enableShaderWriteUsage);
+    return result.isValid ? result : null;
+  }
+
+  /// Create a new command buffer that can be used to submit GPU commands.
+  CommandBuffer createCommandBuffer() {
+    return CommandBuffer._(this);
+  }
+
+  RenderPipeline createRenderPipeline(
+      Shader vertexShader, Shader fragmentShader) {
+    return RenderPipeline._(this, vertexShader, fragmentShader);
+  }
+
+  /// Associates the default Impeller context with this Context.
+  @Native<Handle Function(Handle)>(
+      symbol: 'InternalFlutterGpu_Context_InitializeDefault')
+  external String? _initializeDefault();
+
+  @Native<Int Function(Pointer<Void>)>(
+      symbol: 'InternalFlutterGpu_Context_GetDefaultColorFormat')
+  external int _getDefaultColorFormat();
+
+  @Native<Int Function(Pointer<Void>)>(
+      symbol: 'InternalFlutterGpu_Context_GetDefaultStencilFormat')
+  external int _getDefaultStencilFormat();
+
+  @Native<Int Function(Pointer<Void>)>(
+      symbol: 'InternalFlutterGpu_Context_GetDefaultDepthStencilFormat')
+  external int _getDefaultDepthStencilFormat();
+}
+
+/// The default graphics context.
+final GpuContext gpuContext = GpuContext._createDefault();
diff --git a/lib/gpu/lib/src/formats.dart b/lib/gpu/lib/src/formats.dart
new file mode 100644
index 0000000000000000000000000000000000000000..9ee89bb6cc50cb81ef679b6578f9fb2896178984
--- /dev/null
+++ b/lib/gpu/lib/src/formats.dart
@@ -0,0 +1,188 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// ignore_for_file: public_member_api_docs
+
+part of flutter_gpu;
+
+// ATTENTION! ATTENTION! ATTENTION!
+// All enum classes defined in this file must exactly match the contents and
+// order of the corresponding enums defined in `gpu/formats.h`.
+
+/// Specifies where an allocation resides and how it may be used.
+enum StorageMode {
+  /// Allocations can be mapped onto the hosts address space and also be used by
+  /// the device.
+  hostVisible,
+
+  /// Allocations can only be used by the device. This location is optimal for
+  /// use by the device. If the host needs to access these allocations, the
+  /// data must first be copied into a host visible allocation.
+  devicePrivate,
+
+  /// Used by the device for temporary render targets. These allocations cannot
+  /// be copied to or from other allocations. This storage mode is only valid
+  /// for Textures.
+  ///
+  /// These allocations reside in tile memory which has higher bandwidth, lower
+  /// latency and lower power consumption. The total device memory usage is
+  /// also lower as a separate allocation does not need to be created in
+  /// device memory. Prefer using these allocations for intermediates like depth
+  /// and stencil buffers.
+  deviceTransient,
+}
+
+enum PixelFormat {
+  unknown,
+  a8UNormInt,
+  r8UNormInt,
+  r8g8UNormInt,
+  r8g8b8a8UNormInt,
+  r8g8b8a8UNormIntSRGB,
+  b8g8r8a8UNormInt,
+  b8g8r8a8UNormIntSRGB,
+  r32g32b32a32Float,
+  r16g16b16a16Float,
+  b10g10r10XR,
+  b10g10r10XRSRGB,
+  b10g10r10a10XR,
+  // Depth and stencil formats.
+  s8UInt,
+  d24UnormS8Uint,
+  d32FloatS8UInt,
+}
+
+enum TextureCoordinateSystem {
+  /// Alternative coordinate system used when uploading texture data from the
+  /// host.
+  /// (0, 0) is the bottom-left of the image with +Y going up.
+  uploadFromHost,
+
+  /// Default coordinate system.
+  /// (0, 0) is the top-left of the image with +Y going down.
+  renderToTexture,
+}
+
+enum BlendFactor {
+  zero,
+  one,
+  sourceColor,
+  oneMinusSourceColor,
+  sourceAlpha,
+  oneMinusSourceAlpha,
+  destinationColor,
+  oneMinusDestinationColor,
+  destinationAlpha,
+  oneMinusDestinationAlpha,
+  sourceAlphaSaturated,
+  blendColor,
+  oneMinusBlendColor,
+  blendAlpha,
+  oneMinusBlendAlpha,
+}
+
+enum BlendOperation {
+  add,
+  subtract,
+  reverseSubtract,
+}
+
+enum LoadAction {
+  dontCare,
+  load,
+  clear,
+}
+
+enum StoreAction {
+  dontCare,
+  store,
+  multisampleResolve,
+  storeAndMultisampleResolve,
+}
+
+enum ShaderStage {
+  vertex,
+  fragment,
+}
+
+enum MinMagFilter {
+  nearest,
+  linear,
+}
+
+enum MipFilter {
+  nearest,
+  linear,
+}
+
+enum SamplerAddressMode {
+  clampToEdge,
+  repeat,
+  mirror,
+}
+
+enum IndexType {
+  int16,
+  int32,
+}
+
+enum PrimitiveType {
+  triangle,
+  triangleStrip,
+  line,
+  lineStrip,
+  point,
+}
+
+enum CompareFunction {
+  /// Comparison test never passes.
+  never,
+
+  /// Comparison test passes always passes.
+  always,
+
+  /// Comparison test passes if new_value < current_value.
+  less,
+
+  /// Comparison test passes if new_value == current_value.
+  equal,
+
+  /// Comparison test passes if new_value <= current_value.
+  lessEqual,
+
+  /// Comparison test passes if new_value > current_value.
+  greater,
+
+  /// Comparison test passes if new_value != current_value.
+  notEqual,
+
+  /// Comparison test passes if new_value >= current_value.
+  greaterEqual,
+}
+
+enum StencilOperation {
+  /// Don't modify the current stencil value.
+  keep,
+
+  /// Reset the stencil value to zero.
+  zero,
+
+  /// Reset the stencil value to the reference value.
+  setToReferenceValue,
+
+  /// Increment the current stencil value by 1. Clamp it to the maximum.
+  incrementClamp,
+
+  /// Decrement the current stencil value by 1. Clamp it to zero.
+  decrementClamp,
+
+  /// Perform a logical bitwise invert on the current stencil value.
+  invert,
+
+  /// Increment the current stencil value by 1. If at maximum, set to zero.
+  incrementWrap,
+
+  /// Decrement the current stencil value by 1. If at zero, set to maximum.
+  decrementWrap,
+}
diff --git a/lib/gpu/lib/src/render_pass.dart b/lib/gpu/lib/src/render_pass.dart
new file mode 100644
index 0000000000000000000000000000000000000000..0b2cae00b8ba9eb3ae9887af05d8ebedd88f5e0f
--- /dev/null
+++ b/lib/gpu/lib/src/render_pass.dart
@@ -0,0 +1,332 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// ignore_for_file: public_member_api_docs
+
+part of flutter_gpu;
+
+base class ColorAttachment {
+  ColorAttachment({
+    this.loadAction = LoadAction.clear,
+    this.storeAction = StoreAction.store,
+    this.clearValue = const ui.Color(0x00000000),
+    required this.texture,
+    this.resolveTexture = null,
+  });
+
+  LoadAction loadAction;
+  StoreAction storeAction;
+  ui.Color clearValue;
+
+  Texture texture;
+  Texture? resolveTexture;
+}
+
+base class DepthStencilAttachment {
+  DepthStencilAttachment({
+    this.depthLoadAction = LoadAction.clear,
+    this.depthStoreAction = StoreAction.dontCare,
+    this.depthClearValue = 0.0,
+    this.stencilLoadAction = LoadAction.clear,
+    this.stencilStoreAction = StoreAction.dontCare,
+    this.stencilClearValue = 0,
+    required this.texture,
+  });
+
+  LoadAction depthLoadAction;
+  StoreAction depthStoreAction;
+  double depthClearValue;
+
+  LoadAction stencilLoadAction;
+  StoreAction stencilStoreAction;
+  int stencilClearValue;
+
+  Texture texture;
+}
+
+base class ColorBlendEquation {
+  ColorBlendEquation({
+    this.colorBlendOperation = BlendOperation.add,
+    this.sourceColorBlendFactor = BlendFactor.one,
+    this.destinationColorBlendFactor = BlendFactor.oneMinusSourceAlpha,
+    this.alphaBlendOperation = BlendOperation.add,
+    this.sourceAlphaBlendFactor = BlendFactor.one,
+    this.destinationAlphaBlendFactor = BlendFactor.oneMinusSourceAlpha,
+  });
+
+  BlendOperation colorBlendOperation;
+  BlendFactor sourceColorBlendFactor;
+  BlendFactor destinationColorBlendFactor;
+
+  BlendOperation alphaBlendOperation;
+  BlendFactor sourceAlphaBlendFactor;
+  BlendFactor destinationAlphaBlendFactor;
+}
+
+base class SamplerOptions {
+  SamplerOptions({
+    this.minFilter = MinMagFilter.nearest,
+    this.magFilter = MinMagFilter.nearest,
+    this.mipFilter = MipFilter.nearest,
+    this.widthAddressMode = SamplerAddressMode.clampToEdge,
+    this.heightAddressMode = SamplerAddressMode.clampToEdge,
+  });
+
+  MinMagFilter minFilter;
+  MinMagFilter magFilter;
+  MipFilter mipFilter;
+  SamplerAddressMode widthAddressMode;
+  SamplerAddressMode heightAddressMode;
+}
+
+base class RenderTarget {
+  const RenderTarget(
+      {this.colorAttachments = const <ColorAttachment>[],
+      this.depthStencilAttachment});
+
+  RenderTarget.singleColor(ColorAttachment colorAttachment,
+      {DepthStencilAttachment? depthStencilAttachment})
+      : this(
+            colorAttachments: [colorAttachment],
+            depthStencilAttachment: depthStencilAttachment);
+
+  final List<ColorAttachment> colorAttachments;
+  final DepthStencilAttachment? depthStencilAttachment;
+}
+
+base class RenderPass extends NativeFieldWrapperClass1 {
+  /// Creates a new RenderPass.
+  RenderPass._(CommandBuffer commandBuffer, RenderTarget renderTarget) {
+    _initialize();
+    String? error;
+    for (final (index, color) in renderTarget.colorAttachments.indexed) {
+      error = _setColorAttachment(
+          index,
+          color.loadAction.index,
+          color.storeAction.index,
+          color.clearValue.value,
+          color.texture,
+          color.resolveTexture);
+      if (error != null) {
+        throw Exception(error);
+      }
+    }
+    if (renderTarget.depthStencilAttachment != null) {
+      final ds = renderTarget.depthStencilAttachment!;
+      error = _setDepthStencilAttachment(
+          ds.depthLoadAction.index,
+          ds.depthStoreAction.index,
+          ds.depthClearValue,
+          ds.stencilLoadAction.index,
+          ds.stencilStoreAction.index,
+          ds.stencilClearValue,
+          ds.texture);
+      if (error != null) {
+        throw Exception(error);
+      }
+    }
+    error = _begin(commandBuffer);
+    if (error != null) {
+      throw Exception(error);
+    }
+  }
+
+  void bindPipeline(RenderPipeline pipeline) {
+    _bindPipeline(pipeline);
+  }
+
+  void bindVertexBuffer(BufferView bufferView, int vertexCount) {
+    bufferView.buffer._bindAsVertexBuffer(
+        this, bufferView.offsetInBytes, bufferView.lengthInBytes, vertexCount);
+  }
+
+  void bindIndexBuffer(
+      BufferView bufferView, IndexType indexType, int indexCount) {
+    bufferView.buffer._bindAsIndexBuffer(this, bufferView.offsetInBytes,
+        bufferView.lengthInBytes, indexType, indexCount);
+  }
+
+  void bindUniform(UniformSlot slot, BufferView bufferView) {
+    bool success = bufferView.buffer._bindAsUniform(
+        this, slot, bufferView.offsetInBytes, bufferView.lengthInBytes);
+    if (!success) {
+      throw Exception("Failed to bind uniform");
+    }
+  }
+
+  void bindTexture(UniformSlot slot, Texture texture,
+      {SamplerOptions? sampler}) {
+    if (sampler == null) {
+      sampler = SamplerOptions();
+    }
+
+    bool success = _bindTexture(
+        slot.shader,
+        slot.uniformName,
+        texture,
+        sampler.minFilter.index,
+        sampler.magFilter.index,
+        sampler.mipFilter.index,
+        sampler.widthAddressMode.index,
+        sampler.heightAddressMode.index);
+    if (!success) {
+      throw Exception("Failed to bind texture");
+    }
+  }
+
+  void clearBindings() {
+    _clearBindings();
+  }
+
+  void setColorBlendEnable(bool enable, {int colorAttachmentIndex = 0}) {
+    _setColorBlendEnable(colorAttachmentIndex, enable);
+  }
+
+  void setColorBlendEquation(ColorBlendEquation equation,
+      {int colorAttachmentIndex = 0}) {
+    _setColorBlendEquation(
+        colorAttachmentIndex,
+        equation.colorBlendOperation.index,
+        equation.sourceColorBlendFactor.index,
+        equation.destinationColorBlendFactor.index,
+        equation.alphaBlendOperation.index,
+        equation.sourceAlphaBlendFactor.index,
+        equation.destinationAlphaBlendFactor.index);
+  }
+
+  void setDepthWriteEnable(bool enable) {
+    _setDepthWriteEnable(enable);
+  }
+
+  void setDepthCompareOperation(CompareFunction compareFunction) {
+    _setDepthCompareOperation(compareFunction.index);
+  }
+
+  void draw() {
+    if (!_draw()) {
+      throw Exception("Failed to append draw");
+    }
+  }
+
+  /// Wrap with native counterpart.
+  @Native<Void Function(Handle)>(
+      symbol: 'InternalFlutterGpu_RenderPass_Initialize')
+  external void _initialize();
+
+  @Native<
+      Handle Function(Pointer<Void>, Int, Int, Int, Int, Pointer<Void>,
+          Handle)>(symbol: 'InternalFlutterGpu_RenderPass_SetColorAttachment')
+  external String? _setColorAttachment(
+      int colorAttachmentIndex,
+      int loadAction,
+      int storeAction,
+      int clearColor,
+      Texture texture,
+      Texture? resolveTexture);
+
+  @Native<
+          Handle Function(
+              Pointer<Void>, Int, Int, Float, Int, Int, Int, Pointer<Void>)>(
+      symbol: 'InternalFlutterGpu_RenderPass_SetDepthStencilAttachment')
+  external String? _setDepthStencilAttachment(
+      int depthLoadAction,
+      int depthStoreAction,
+      double depthClearValue,
+      int stencilLoadAction,
+      int stencilStoreAction,
+      int stencilClearValue,
+      Texture texture);
+
+  @Native<Handle Function(Pointer<Void>, Pointer<Void>)>(
+      symbol: 'InternalFlutterGpu_RenderPass_Begin')
+  external String? _begin(CommandBuffer commandBuffer);
+
+  @Native<Void Function(Pointer<Void>, Pointer<Void>)>(
+      symbol: 'InternalFlutterGpu_RenderPass_BindPipeline')
+  external void _bindPipeline(RenderPipeline pipeline);
+
+  @Native<Void Function(Pointer<Void>, Pointer<Void>, Int, Int, Int)>(
+      symbol: 'InternalFlutterGpu_RenderPass_BindVertexBufferDevice')
+  external void _bindVertexBufferDevice(DeviceBuffer buffer, int offsetInBytes,
+      int lengthInBytes, int vertexCount);
+
+  @Native<Void Function(Pointer<Void>, Pointer<Void>, Int, Int, Int)>(
+      symbol: 'InternalFlutterGpu_RenderPass_BindVertexBufferHost')
+  external void _bindVertexBufferHost(
+      HostBuffer buffer, int offsetInBytes, int lengthInBytes, int vertexCount);
+
+  @Native<Void Function(Pointer<Void>, Pointer<Void>, Int, Int, Int, Int)>(
+      symbol: 'InternalFlutterGpu_RenderPass_BindIndexBufferDevice')
+  external void _bindIndexBufferDevice(DeviceBuffer buffer, int offsetInBytes,
+      int lengthInBytes, int indexType, int indexCount);
+
+  @Native<Void Function(Pointer<Void>, Pointer<Void>, Int, Int, Int, Int)>(
+      symbol: 'InternalFlutterGpu_RenderPass_BindIndexBufferHost')
+  external void _bindIndexBufferHost(HostBuffer buffer, int offsetInBytes,
+      int lengthInBytes, int indexType, int indexCount);
+
+  @Native<
+      Bool Function(Pointer<Void>, Pointer<Void>, Handle, Pointer<Void>, Int,
+          Int)>(symbol: 'InternalFlutterGpu_RenderPass_BindUniformDevice')
+  external bool _bindUniformDevice(Shader shader, String uniformName,
+      DeviceBuffer buffer, int offsetInBytes, int lengthInBytes);
+
+  @Native<
+      Bool Function(Pointer<Void>, Pointer<Void>, Handle, Pointer<Void>, Int,
+          Int)>(symbol: 'InternalFlutterGpu_RenderPass_BindUniformHost')
+  external bool _bindUniformHost(Shader shader, String uniformName,
+      HostBuffer buffer, int offsetInBytes, int lengthInBytes);
+
+  @Native<
+      Bool Function(
+          Pointer<Void>,
+          Pointer<Void>,
+          Handle,
+          Pointer<Void>,
+          Int,
+          Int,
+          Int,
+          Int,
+          Int)>(symbol: 'InternalFlutterGpu_RenderPass_BindTexture')
+  external bool _bindTexture(
+      Shader shader,
+      String uniformName,
+      Texture texture,
+      int minFilter,
+      int magFilter,
+      int mipFilter,
+      int widthAddressMode,
+      int heightAddressMode);
+
+  @Native<Void Function(Pointer<Void>)>(
+      symbol: 'InternalFlutterGpu_RenderPass_ClearBindings')
+  external void _clearBindings();
+
+  @Native<Void Function(Pointer<Void>, Int, Bool)>(
+      symbol: 'InternalFlutterGpu_RenderPass_SetColorBlendEnable')
+  external void _setColorBlendEnable(int colorAttachmentIndex, bool enable);
+
+  @Native<Void Function(Pointer<Void>, Int, Int, Int, Int, Int, Int, Int)>(
+      symbol: 'InternalFlutterGpu_RenderPass_SetColorBlendEquation')
+  external void _setColorBlendEquation(
+      int colorAttachmentIndex,
+      int colorBlendOperation,
+      int sourceColorBlendFactor,
+      int destinationColorBlendFactor,
+      int alphaBlendOperation,
+      int sourceAlphaBlendFactor,
+      int destinationAlphaBlendFactor);
+
+  @Native<Void Function(Pointer<Void>, Bool)>(
+      symbol: 'InternalFlutterGpu_RenderPass_SetDepthWriteEnable')
+  external void _setDepthWriteEnable(bool enable);
+
+  @Native<Void Function(Pointer<Void>, Int)>(
+      symbol: 'InternalFlutterGpu_RenderPass_SetDepthCompareOperation')
+  external void _setDepthCompareOperation(int compareOperation);
+
+  @Native<Bool Function(Pointer<Void>)>(
+      symbol: 'InternalFlutterGpu_RenderPass_Draw')
+  external bool _draw();
+}
diff --git a/lib/gpu/lib/src/render_pipeline.dart b/lib/gpu/lib/src/render_pipeline.dart
new file mode 100644
index 0000000000000000000000000000000000000000..a8d110e29a2fd381d2c981a8a50cff96163996e4
--- /dev/null
+++ b/lib/gpu/lib/src/render_pipeline.dart
@@ -0,0 +1,29 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// ignore_for_file: public_member_api_docs
+
+part of flutter_gpu;
+
+base class RenderPipeline extends NativeFieldWrapperClass1 {
+  /// Creates a new RenderPipeline.
+  RenderPipeline._(
+      GpuContext gpuContext, Shader vertexShader, Shader fragmentShader)
+      : vertexShader = vertexShader,
+        fragmentShader = fragmentShader {
+    String? error = _initialize(gpuContext, vertexShader, fragmentShader);
+    if (error != null) {
+      throw Exception(error);
+    }
+  }
+
+  final Shader vertexShader;
+  final Shader fragmentShader;
+
+  /// Wrap with native counterpart.
+  @Native<Handle Function(Handle, Pointer<Void>, Pointer<Void>, Pointer<Void>)>(
+      symbol: 'InternalFlutterGpu_RenderPipeline_Initialize')
+  external String? _initialize(
+      GpuContext gpuContext, Shader vertexShader, Shader fragmentShader);
+}
diff --git a/lib/gpu/lib/src/shader.dart b/lib/gpu/lib/src/shader.dart
new file mode 100644
index 0000000000000000000000000000000000000000..ad34346dd36ea5f2346e128d26161566bf1d7e73
--- /dev/null
+++ b/lib/gpu/lib/src/shader.dart
@@ -0,0 +1,50 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// ignore_for_file: public_member_api_docs
+
+part of flutter_gpu;
+
+base class UniformSlot {
+  UniformSlot._(this.shader, this.uniformName);
+  final Shader shader;
+  final String uniformName;
+
+  /// The reflected total size of a shader's uniform struct by name.
+  ///
+  /// Returns [null] if the shader does not contain a uniform struct with the
+  /// given name.
+  int? get sizeInBytes {
+    int size = shader._getUniformStructSize(uniformName);
+    return size < 0 ? null : size;
+  }
+
+  /// Get the reflected offset of a named member in the uniform struct.
+  ///
+  /// Returns [null] if the shader does not contain a uniform struct with the
+  /// given name, or if the uniform struct does not contain a member with the
+  /// given name.
+  int? getMemberOffsetInBytes(String memberName) {
+    int offset = shader._getUniformMemberOffset(uniformName, memberName);
+    return offset < 0 ? null : offset;
+  }
+}
+
+base class Shader extends NativeFieldWrapperClass1 {
+  // [Shader] handles are instantiated when interacting with a [ShaderLibrary].
+  Shader._();
+
+  UniformSlot getUniformSlot(String uniformName) {
+    return UniformSlot._(this, uniformName);
+  }
+
+  @Native<Int Function(Pointer<Void>, Handle)>(
+      symbol: 'InternalFlutterGpu_Shader_GetUniformStructSize')
+  external int _getUniformStructSize(String uniformStructName);
+
+  @Native<Int Function(Pointer<Void>, Handle, Handle)>(
+      symbol: 'InternalFlutterGpu_Shader_GetUniformMemberOffset')
+  external int _getUniformMemberOffset(
+      String uniformStructName, String memberName);
+}
diff --git a/lib/gpu/lib/src/shader_library.dart b/lib/gpu/lib/src/shader_library.dart
new file mode 100644
index 0000000000000000000000000000000000000000..859ba02d38f2951e6babf984d6568690724503d4
--- /dev/null
+++ b/lib/gpu/lib/src/shader_library.dart
@@ -0,0 +1,44 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// ignore_for_file: public_member_api_docs
+
+part of flutter_gpu;
+
+base class ShaderLibrary extends NativeFieldWrapperClass1 {
+  static ShaderLibrary? fromAsset(String assetName) {
+    final lib = ShaderLibrary._();
+    final error = lib._initializeWithAsset(assetName);
+    if (error != null) {
+      throw Exception("Failed to initialize ShaderLibrary: ${error}");
+    }
+    return lib;
+  }
+
+  ShaderLibrary._();
+
+  // Hold a Dart-side reference to shaders in the library as they're wrapped for
+  // the first time. This prevents the wrapper from getting prematurely
+  // destroyed.
+  final Map<String, Shader?> shaders_ = {};
+
+  Shader? operator [](String shaderName) {
+    // This `flutter_gpu` library isn't always registered as part of the builtin
+    // DartClassLibrary, and so we can't instantiate the Dart classes on the
+    // engine side.
+    // Providing a new wrapper to [_getShader] for wrapping the native
+    // counterpart (if it hasn't been wrapped already) is a hack to work around
+    // this.
+    return shaders_.putIfAbsent(
+        shaderName, () => _getShader(shaderName, Shader._()));
+  }
+
+  @Native<Handle Function(Handle, Handle)>(
+      symbol: 'InternalFlutterGpu_ShaderLibrary_InitializeWithAsset')
+  external String? _initializeWithAsset(String assetName);
+
+  @Native<Handle Function(Pointer<Void>, Handle, Handle)>(
+      symbol: 'InternalFlutterGpu_ShaderLibrary_GetShader')
+  external Shader? _getShader(String shaderName, Shader shaderWrapper);
+}
diff --git a/lib/gpu/lib/src/smoketest.dart b/lib/gpu/lib/src/smoketest.dart
new file mode 100644
index 0000000000000000000000000000000000000000..b7cebffc7d3b008f43646e19cdc4e346dabff168
--- /dev/null
+++ b/lib/gpu/lib/src/smoketest.dart
@@ -0,0 +1,40 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:ffi';
+import 'dart:nativewrappers';
+
+/// This is a simple test fuction.
+@Native<Int32 Function()>(symbol: 'InternalFlutterGpuTestProc')
+external int testProc();
+
+/// A single parameter callback.
+typedef Callback<T> = void Function(T result);
+
+/// This is a test callback that follows the same pattern as much of dart:ui --
+/// immediately returning an error string and supplying an asynchronous result
+/// via callback later.
+@Native<Handle Function(Handle)>(
+    symbol: 'InternalFlutterGpuTestProcWithCallback')
+external String? testProcWithCallback(Callback<int> callback);
+
+/// This is a test of NativeFieldWrapperClass1, which is commonly used in
+/// dart:ui to enable Dart to dictate the lifetime of a C counterpart.
+base class FlutterGpuTestClass extends NativeFieldWrapperClass1 {
+  /// Default constructor for the test class
+  FlutterGpuTestClass() {
+    _constructor();
+  }
+
+  /// This "constructor" is used to instantiate and wrap the C counterpart.
+  /// This is a common pattern in dart:ui.
+  @Native<Void Function(Handle)>(symbol: 'InternalFlutterGpuTestClass_Create')
+  external void _constructor();
+
+  /// This is a method that will supply a pointer to the C data counterpart when
+  /// calling the function
+  @Native<Void Function(Pointer<Void>, Int)>(
+      symbol: 'InternalFlutterGpuTestClass_Method')
+  external void coolMethod(int something);
+}
diff --git a/lib/gpu/lib/src/texture.dart b/lib/gpu/lib/src/texture.dart
new file mode 100644
index 0000000000000000000000000000000000000000..12455ccaf3b84242436949aa5c41ba6948f0ed1e
--- /dev/null
+++ b/lib/gpu/lib/src/texture.dart
@@ -0,0 +1,142 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// ignore_for_file: public_member_api_docs
+
+part of flutter_gpu;
+
+base class Texture extends NativeFieldWrapperClass1 {
+  bool _valid = false;
+  get isValid {
+    return _valid;
+  }
+
+  /// Creates a new Texture.
+  Texture._initialize(
+      GpuContext gpuContext,
+      this.storageMode,
+      this.format,
+      this.width,
+      this.height,
+      this.sampleCount,
+      TextureCoordinateSystem coordinateSystem,
+      this.enableRenderTargetUsage,
+      this.enableShaderReadUsage,
+      this.enableShaderWriteUsage)
+      : _coordinateSystem = coordinateSystem {
+    if (sampleCount != 1 && sampleCount != 4) {
+      throw Exception("Only a sample count of 1 or 4 is currently supported");
+    }
+    _valid = _initialize(
+        gpuContext,
+        storageMode.index,
+        format.index,
+        width,
+        height,
+        sampleCount,
+        coordinateSystem.index,
+        enableRenderTargetUsage,
+        enableShaderReadUsage,
+        enableShaderWriteUsage);
+  }
+
+  final StorageMode storageMode;
+  final PixelFormat format;
+  final int width;
+  final int height;
+  final int sampleCount;
+
+  /// Enable using this texture as a render pass attachment.
+  final bool enableRenderTargetUsage;
+
+  /// Enable reading or sampling from this texture in a shader.
+  final bool enableShaderReadUsage;
+
+  /// Enable writing to the texture in a shader.
+  ///
+  /// Note that this is distinct from [enableRenderTargetUsage].
+  final bool enableShaderWriteUsage;
+
+  TextureCoordinateSystem _coordinateSystem;
+  TextureCoordinateSystem get coordinateSystem {
+    return _coordinateSystem;
+  }
+
+  set coordinateSystem(TextureCoordinateSystem value) {
+    value;
+    _setCoordinateSystem(value.index);
+  }
+
+  int get bytesPerTexel {
+    return _bytesPerTexel();
+  }
+
+  int GetBaseMipLevelSizeInBytes() {
+    return bytesPerTexel * width * height;
+  }
+
+  /// Overwrite the entire base mipmap level of this [Texture].
+  ///
+  /// This method can only be used if the [Texture] was created with
+  /// [StorageMode.hostVisible]. An exception will be thrown otherwise.
+  ///
+  /// The length of [sourceBytes] must be exactly the size of the base mip
+  /// level, otherwise an exception will be thrown. The size of the base mip
+  /// level is always `width * height * bytesPerPixel`.
+  ///
+  /// Returns [true] if the write was successful, or [false] if the write
+  /// failed due to an internal error.
+  bool overwrite(ByteData sourceBytes) {
+    if (storageMode != StorageMode.hostVisible) {
+      throw Exception(
+          'Texture.overwrite can only be used with Textures that are host visible');
+    }
+    int baseMipSize = GetBaseMipLevelSizeInBytes();
+    if (sourceBytes.lengthInBytes != baseMipSize) {
+      throw Exception(
+          'The length of sourceBytes (bytes: ${sourceBytes.lengthInBytes}) must exactly match the size of the base mip level (bytes: ${baseMipSize})');
+    }
+    return _overwrite(sourceBytes);
+  }
+
+  ui.Image asImage() {
+    if (!enableShaderReadUsage) {
+      throw Exception(
+          'Only shader readable Flutter GPU textures can be used as UI Images');
+    }
+    return _asImage();
+  }
+
+  /// Wrap with native counterpart.
+  @Native<
+      Bool Function(Handle, Pointer<Void>, Int, Int, Int, Int, Int, Int, Bool,
+          Bool, Bool)>(symbol: 'InternalFlutterGpu_Texture_Initialize')
+  external bool _initialize(
+      GpuContext gpuContext,
+      int storageMode,
+      int format,
+      int width,
+      int height,
+      int sampleCount,
+      int coordinateSystem,
+      bool enableRenderTargetUsage,
+      bool enableShaderReadUsage,
+      bool enableShaderWriteUsage);
+
+  @Native<Void Function(Handle, Int)>(
+      symbol: 'InternalFlutterGpu_Texture_SetCoordinateSystem')
+  external void _setCoordinateSystem(int coordinateSystem);
+
+  @Native<Int Function(Pointer<Void>)>(
+      symbol: 'InternalFlutterGpu_Texture_BytesPerTexel')
+  external int _bytesPerTexel();
+
+  @Native<Bool Function(Pointer<Void>, Handle)>(
+      symbol: 'InternalFlutterGpu_Texture_Overwrite')
+  external bool _overwrite(ByteData bytes);
+
+  @Native<Handle Function(Pointer<Void>)>(
+      symbol: 'InternalFlutterGpu_Texture_AsImage')
+  external ui.Image _asImage();
+}
diff --git a/lib/gpu/pubspec.yaml b/lib/gpu/pubspec.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..204f445df09fbf42d0d53cb1e4787fccb06e24cd
--- /dev/null
+++ b/lib/gpu/pubspec.yaml
@@ -0,0 +1,14 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+name: flutter_gpu
+description: A framework for writing Flutter applications
+homepage: https://flutter.dev
+
+environment:
+  sdk: '>=3.2.0-0 <4.0.0'
+
+dependencies:
+  sky_engine:
+    sdk: flutter
diff --git a/lib/gpu/render_pass.cc b/lib/gpu/render_pass.cc
new file mode 100644
index 0000000000000000000000000000000000000000..1bbbb92108bc4f92f6ac644250e2bb0fc8c5bc82
--- /dev/null
+++ b/lib/gpu/render_pass.cc
@@ -0,0 +1,516 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/lib/gpu/render_pass.h"
+
+#include "flutter/lib/gpu/formats.h"
+#include "flutter/lib/gpu/render_pipeline.h"
+#include "flutter/lib/gpu/shader.h"
+#include "fml/memory/ref_ptr.h"
+#include "impeller/core/buffer_view.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/sampler_descriptor.h"
+#include "impeller/core/shader_types.h"
+#include "impeller/core/vertex_buffer.h"
+#include "impeller/geometry/color.h"
+#include "impeller/renderer/pipeline_library.h"
+#include "tonic/converter/dart_converter.h"
+
+namespace flutter {
+namespace gpu {
+
+IMPLEMENT_WRAPPERTYPEINFO(flutter_gpu, RenderPass);
+
+RenderPass::RenderPass()
+    : vertex_buffer_(
+          impeller::VertexBuffer{.index_type = impeller::IndexType::kNone}){};
+
+RenderPass::~RenderPass() = default;
+
+const std::shared_ptr<const impeller::Context>& RenderPass::GetContext() const {
+  return render_pass_->GetContext();
+}
+
+impeller::Command& RenderPass::GetCommand() {
+  return command_;
+}
+
+const impeller::Command& RenderPass::GetCommand() const {
+  return command_;
+}
+
+impeller::RenderTarget& RenderPass::GetRenderTarget() {
+  return render_target_;
+}
+
+const impeller::RenderTarget& RenderPass::GetRenderTarget() const {
+  return render_target_;
+}
+
+impeller::ColorAttachmentDescriptor& RenderPass::GetColorAttachmentDescriptor(
+    size_t color_attachment_index) {
+  auto color = color_descriptors_.find(color_attachment_index);
+  if (color == color_descriptors_.end()) {
+    return color_descriptors_[color_attachment_index] = {};
+  }
+  return color->second;
+}
+
+impeller::DepthAttachmentDescriptor&
+RenderPass::GetDepthAttachmentDescriptor() {
+  return depth_desc_;
+}
+
+impeller::VertexBuffer& RenderPass::GetVertexBuffer() {
+  return vertex_buffer_;
+}
+
+bool RenderPass::Begin(flutter::gpu::CommandBuffer& command_buffer) {
+  render_pass_ =
+      command_buffer.GetCommandBuffer()->CreateRenderPass(render_target_);
+  if (!render_pass_) {
+    return false;
+  }
+  command_buffer.AddRenderPass(render_pass_);
+  return true;
+}
+
+void RenderPass::SetPipeline(fml::RefPtr<RenderPipeline> pipeline) {
+  render_pipeline_ = std::move(pipeline);
+}
+
+std::shared_ptr<impeller::Pipeline<impeller::PipelineDescriptor>>
+RenderPass::GetOrCreatePipeline() {
+  // Infer the pipeline layout based on the shape of the RenderTarget.
+  auto pipeline_desc = pipeline_descriptor_;
+  for (const auto& it : render_target_.GetColorAttachments()) {
+    auto& color = GetColorAttachmentDescriptor(it.first);
+    color.format = render_target_.GetRenderTargetPixelFormat();
+  }
+  pipeline_desc.SetColorAttachmentDescriptors(color_descriptors_);
+
+  {
+    auto stencil = render_target_.GetStencilAttachment();
+    if (stencil && impeller::IsStencilWritable(
+                       stencil->texture->GetTextureDescriptor().format)) {
+      pipeline_desc.SetStencilPixelFormat(
+          stencil->texture->GetTextureDescriptor().format);
+      pipeline_desc.SetStencilAttachmentDescriptors(stencil_front_desc_,
+                                                    stencil_back_desc_);
+    } else {
+      pipeline_desc.ClearStencilAttachments();
+    }
+  }
+
+  {
+    auto depth = render_target_.GetDepthAttachment();
+    if (depth && impeller::IsDepthWritable(
+                     depth->texture->GetTextureDescriptor().format)) {
+      pipeline_desc.SetDepthPixelFormat(
+          depth->texture->GetTextureDescriptor().format);
+      pipeline_desc.SetDepthStencilAttachmentDescriptor(depth_desc_);
+    } else {
+      pipeline_desc.ClearDepthAttachment();
+    }
+  }
+
+  auto& context = *GetContext();
+
+  render_pipeline_->BindToPipelineDescriptor(*context.GetShaderLibrary(),
+                                             pipeline_desc);
+
+  auto pipeline =
+      context.GetPipelineLibrary()->GetPipeline(pipeline_desc).Get();
+  FML_DCHECK(pipeline) << "Couldn't resolve render pipeline";
+  return pipeline;
+}
+
+impeller::Command RenderPass::ProvisionRasterCommand() {
+  impeller::Command result = command_;
+
+  result.pipeline = GetOrCreatePipeline();
+  result.BindVertices(vertex_buffer_);
+
+  return result;
+}
+
+bool RenderPass::Draw() {
+  impeller::Command result = ProvisionRasterCommand();
+#ifdef IMPELLER_DEBUG
+  render_pass_->SetCommandLabel(result.label);
+#endif  // IMPELLER_DEBUG
+  render_pass_->SetPipeline(result.pipeline);
+  render_pass_->SetStencilReference(result.stencil_reference);
+  render_pass_->SetBaseVertex(result.base_vertex);
+  if (result.viewport.has_value()) {
+    render_pass_->SetViewport(result.viewport.value());
+  }
+  if (result.scissor.has_value()) {
+    render_pass_->SetScissor(result.scissor.value());
+  }
+  render_pass_->SetVertexBuffer(result.vertex_buffer);
+  for (const auto& buffer : result.vertex_bindings.buffers) {
+    render_pass_->BindResource(impeller::ShaderStage::kVertex,
+                               impeller::DescriptorType::kUniformBuffer,
+                               buffer.slot, *buffer.view.GetMetadata(),
+                               buffer.view.resource);
+  }
+  for (const auto& texture : result.vertex_bindings.sampled_images) {
+    render_pass_->BindResource(impeller::ShaderStage::kVertex,
+                               impeller::DescriptorType::kSampledImage,
+                               texture.slot, *texture.texture.GetMetadata(),
+                               texture.texture.resource, texture.sampler);
+  }
+  for (const auto& buffer : result.fragment_bindings.buffers) {
+    render_pass_->BindResource(impeller::ShaderStage::kFragment,
+                               impeller::DescriptorType::kUniformBuffer,
+                               buffer.slot, *buffer.view.GetMetadata(),
+                               buffer.view.resource);
+  }
+  for (const auto& texture : result.fragment_bindings.sampled_images) {
+    render_pass_->BindResource(impeller::ShaderStage::kFragment,
+                               impeller::DescriptorType::kSampledImage,
+                               texture.slot, *texture.texture.GetMetadata(),
+                               texture.texture.resource, texture.sampler);
+  }
+  return render_pass_->Draw().ok();
+}
+
+}  // namespace gpu
+}  // namespace flutter
+
+static impeller::Color ToImpellerColor(uint32_t argb) {
+  return impeller::Color::MakeRGBA8((argb >> 16) & 0xFF,  // R
+                                    (argb >> 8) & 0xFF,   // G
+                                    argb & 0xFF,          // B
+                                    argb >> 24);          // A
+}
+
+//----------------------------------------------------------------------------
+/// Exports
+///
+
+void InternalFlutterGpu_RenderPass_Initialize(Dart_Handle wrapper) {
+  auto res = fml::MakeRefCounted<flutter::gpu::RenderPass>();
+  res->AssociateWithDartWrapper(wrapper);
+}
+
+Dart_Handle InternalFlutterGpu_RenderPass_SetColorAttachment(
+    flutter::gpu::RenderPass* wrapper,
+    int color_attachment_index,
+    int load_action,
+    int store_action,
+    int clear_color,
+    flutter::gpu::Texture* texture,
+    Dart_Handle resolve_texture_wrapper) {
+  impeller::ColorAttachment desc;
+  desc.load_action = flutter::gpu::ToImpellerLoadAction(load_action);
+  desc.store_action = flutter::gpu::ToImpellerStoreAction(store_action);
+  desc.clear_color = ToImpellerColor(static_cast<uint32_t>(clear_color));
+  desc.texture = texture->GetTexture();
+  if (!Dart_IsNull(resolve_texture_wrapper)) {
+    flutter::gpu::Texture* resolve_texture =
+        tonic::DartConverter<flutter::gpu::Texture*>::FromDart(
+            resolve_texture_wrapper);
+    desc.resolve_texture = resolve_texture->GetTexture();
+  }
+  wrapper->GetRenderTarget().SetColorAttachment(desc, color_attachment_index);
+  return Dart_Null();
+}
+
+Dart_Handle InternalFlutterGpu_RenderPass_SetDepthStencilAttachment(
+    flutter::gpu::RenderPass* wrapper,
+    int depth_load_action,
+    int depth_store_action,
+    float depth_clear_value,
+    int stencil_load_action,
+    int stencil_store_action,
+    int stencil_clear_value,
+    flutter::gpu::Texture* texture) {
+  {
+    impeller::DepthAttachment desc;
+    desc.load_action = flutter::gpu::ToImpellerLoadAction(depth_load_action);
+    desc.store_action = flutter::gpu::ToImpellerStoreAction(depth_store_action);
+    desc.clear_depth = depth_clear_value;
+    desc.texture = texture->GetTexture();
+    wrapper->GetRenderTarget().SetDepthAttachment(desc);
+  }
+  {
+    impeller::StencilAttachment desc;
+    desc.load_action = flutter::gpu::ToImpellerLoadAction(stencil_load_action);
+    desc.store_action =
+        flutter::gpu::ToImpellerStoreAction(stencil_store_action);
+    desc.clear_stencil = stencil_clear_value;
+    desc.texture = texture->GetTexture();
+    wrapper->GetRenderTarget().SetStencilAttachment(desc);
+  }
+
+  return Dart_Null();
+}
+
+Dart_Handle InternalFlutterGpu_RenderPass_Begin(
+    flutter::gpu::RenderPass* wrapper,
+    flutter::gpu::CommandBuffer* command_buffer) {
+  if (!wrapper->Begin(*command_buffer)) {
+    return tonic::ToDart("Failed to begin RenderPass");
+  }
+  return Dart_Null();
+}
+
+void InternalFlutterGpu_RenderPass_BindPipeline(
+    flutter::gpu::RenderPass* wrapper,
+    flutter::gpu::RenderPipeline* pipeline) {
+  auto ref = fml::RefPtr<flutter::gpu::RenderPipeline>(pipeline);
+  wrapper->SetPipeline(std::move(ref));
+}
+
+template <typename TBuffer>
+static void BindVertexBuffer(flutter::gpu::RenderPass* wrapper,
+                             TBuffer buffer,
+                             int offset_in_bytes,
+                             int length_in_bytes,
+                             int vertex_count) {
+  auto& vertex_buffer = wrapper->GetVertexBuffer();
+  vertex_buffer.vertex_buffer = impeller::BufferView{
+      .buffer = buffer,
+      .range = impeller::Range(offset_in_bytes, length_in_bytes),
+  };
+  // If the index type is set, then the `vertex_count` becomes the index
+  // count... So don't overwrite the count if it's already been set when binding
+  // the index buffer.
+  // TODO(bdero): Consider just doing a more traditional API with
+  //              draw(vertexCount) and drawIndexed(indexCount). This is fine,
+  //              but overall it would be a bit more explicit and we wouldn't
+  //              have to document this behavior where the presence of the index
+  //              buffer always takes precedent.
+  if (vertex_buffer.index_type == impeller::IndexType::kNone) {
+    vertex_buffer.vertex_count = vertex_count;
+  }
+}
+
+void InternalFlutterGpu_RenderPass_BindVertexBufferDevice(
+    flutter::gpu::RenderPass* wrapper,
+    flutter::gpu::DeviceBuffer* device_buffer,
+    int offset_in_bytes,
+    int length_in_bytes,
+    int vertex_count) {
+  BindVertexBuffer(wrapper, device_buffer->GetBuffer(), offset_in_bytes,
+                   length_in_bytes, vertex_count);
+}
+
+void InternalFlutterGpu_RenderPass_BindVertexBufferHost(
+    flutter::gpu::RenderPass* wrapper,
+    flutter::gpu::HostBuffer* host_buffer,
+    int offset_in_bytes,
+    int length_in_bytes,
+    int vertex_count) {
+  std::optional<impeller::BufferView> view =
+      host_buffer->GetBufferViewForOffset(offset_in_bytes);
+  if (!view.has_value()) {
+    FML_LOG(ERROR)
+        << "Failed to bind vertex buffer due to invalid HostBuffer offset: "
+        << offset_in_bytes;
+    return;
+  }
+  BindVertexBuffer(wrapper, view->buffer, view->range.offset,
+                   view->range.length, vertex_count);
+}
+
+template <typename TBuffer>
+static void BindIndexBuffer(flutter::gpu::RenderPass* wrapper,
+                            TBuffer buffer,
+                            int offset_in_bytes,
+                            int length_in_bytes,
+                            int index_type,
+                            int index_count) {
+  auto& vertex_buffer = wrapper->GetVertexBuffer();
+  vertex_buffer.index_buffer = impeller::BufferView{
+      .buffer = buffer,
+      .range = impeller::Range(offset_in_bytes, length_in_bytes),
+  };
+  vertex_buffer.index_type = flutter::gpu::ToImpellerIndexType(index_type);
+  vertex_buffer.vertex_count = index_count;
+}
+
+void InternalFlutterGpu_RenderPass_BindIndexBufferDevice(
+    flutter::gpu::RenderPass* wrapper,
+    flutter::gpu::DeviceBuffer* device_buffer,
+    int offset_in_bytes,
+    int length_in_bytes,
+    int index_type,
+    int index_count) {
+  BindIndexBuffer(wrapper, device_buffer->GetBuffer(), offset_in_bytes,
+                  length_in_bytes, index_type, index_count);
+}
+
+void InternalFlutterGpu_RenderPass_BindIndexBufferHost(
+    flutter::gpu::RenderPass* wrapper,
+    flutter::gpu::HostBuffer* host_buffer,
+    int offset_in_bytes,
+    int length_in_bytes,
+    int index_type,
+    int index_count) {
+  auto view = host_buffer->GetBufferViewForOffset(offset_in_bytes);
+  if (!view.has_value()) {
+    FML_LOG(ERROR)
+        << "Failed to bind index buffer due to invalid HostBuffer offset: "
+        << offset_in_bytes;
+    return;
+  }
+  BindIndexBuffer(wrapper, view->buffer, view->range.offset, view->range.length,
+                  index_type, index_count);
+}
+
+template <typename TBuffer>
+static bool BindUniform(flutter::gpu::RenderPass* wrapper,
+                        flutter::gpu::Shader* shader,
+                        Dart_Handle uniform_name_handle,
+                        TBuffer buffer,
+                        int offset_in_bytes,
+                        int length_in_bytes) {
+  auto& command = wrapper->GetCommand();
+
+  auto uniform_name = tonic::StdStringFromDart(uniform_name_handle);
+  const flutter::gpu::Shader::UniformBinding* uniform_struct =
+      shader->GetUniformStruct(uniform_name);
+  // TODO(bdero): Return an error string stating that no uniform struct with
+  //              this name exists and throw an exception.
+  if (!uniform_struct) {
+    return false;
+  }
+
+  return command.BindResource(
+      shader->GetShaderStage(), impeller::DescriptorType::kUniformBuffer,
+      uniform_struct->slot, uniform_struct->metadata,
+      impeller::BufferView{
+          .buffer = buffer,
+          .range = impeller::Range(offset_in_bytes, length_in_bytes),
+      });
+}
+
+bool InternalFlutterGpu_RenderPass_BindUniformDevice(
+    flutter::gpu::RenderPass* wrapper,
+    flutter::gpu::Shader* shader,
+    Dart_Handle uniform_name_handle,
+    flutter::gpu::DeviceBuffer* device_buffer,
+    int offset_in_bytes,
+    int length_in_bytes) {
+  return BindUniform(wrapper, shader, uniform_name_handle,
+                     device_buffer->GetBuffer(), offset_in_bytes,
+                     length_in_bytes);
+}
+
+bool InternalFlutterGpu_RenderPass_BindUniformHost(
+    flutter::gpu::RenderPass* wrapper,
+    flutter::gpu::Shader* shader,
+    Dart_Handle uniform_name_handle,
+    flutter::gpu::HostBuffer* host_buffer,
+    int offset_in_bytes,
+    int length_in_bytes) {
+  auto view = host_buffer->GetBufferViewForOffset(offset_in_bytes);
+  if (!view.has_value()) {
+    FML_LOG(ERROR)
+        << "Failed to bind index buffer due to invalid HostBuffer offset: "
+        << offset_in_bytes;
+    return false;
+  }
+  return BindUniform(wrapper, shader, uniform_name_handle, view->buffer,
+                     view->range.offset, view->range.length);
+}
+
+bool InternalFlutterGpu_RenderPass_BindTexture(
+    flutter::gpu::RenderPass* wrapper,
+    flutter::gpu::Shader* shader,
+    Dart_Handle uniform_name_handle,
+    flutter::gpu::Texture* texture,
+    int min_filter,
+    int mag_filter,
+    int mip_filter,
+    int width_address_mode,
+    int height_address_mode) {
+  auto& command = wrapper->GetCommand();
+
+  auto uniform_name = tonic::StdStringFromDart(uniform_name_handle);
+  const impeller::SampledImageSlot* image_slot =
+      shader->GetUniformTexture(uniform_name);
+  // TODO(bdero): Return an error string stating that no uniform texture with
+  //              this name exists and throw an exception.
+  if (!image_slot) {
+    return false;
+  }
+
+  impeller::SamplerDescriptor sampler_desc;
+  sampler_desc.min_filter = flutter::gpu::ToImpellerMinMagFilter(min_filter);
+  sampler_desc.mag_filter = flutter::gpu::ToImpellerMinMagFilter(mag_filter);
+  sampler_desc.mip_filter = flutter::gpu::ToImpellerMipFilter(mip_filter);
+  sampler_desc.width_address_mode =
+      flutter::gpu::ToImpellerSamplerAddressMode(width_address_mode);
+  sampler_desc.height_address_mode =
+      flutter::gpu::ToImpellerSamplerAddressMode(height_address_mode);
+  const std::unique_ptr<const impeller::Sampler>& sampler =
+      wrapper->GetContext()->GetSamplerLibrary()->GetSampler(sampler_desc);
+
+  return command.BindResource(
+      shader->GetShaderStage(), impeller::DescriptorType::kSampledImage,
+      *image_slot, impeller::ShaderMetadata{}, texture->GetTexture(), sampler);
+}
+
+void InternalFlutterGpu_RenderPass_ClearBindings(
+    flutter::gpu::RenderPass* wrapper) {
+  auto& command = wrapper->GetCommand();
+  command.vertex_buffer = {};
+  command.vertex_bindings = {};
+  command.fragment_bindings = {};
+}
+
+void InternalFlutterGpu_RenderPass_SetColorBlendEnable(
+    flutter::gpu::RenderPass* wrapper,
+    int color_attachment_index,
+    bool enable) {
+  auto& color = wrapper->GetColorAttachmentDescriptor(color_attachment_index);
+  color.blending_enabled = enable;
+}
+
+void InternalFlutterGpu_RenderPass_SetColorBlendEquation(
+    flutter::gpu::RenderPass* wrapper,
+    int color_attachment_index,
+    int color_blend_operation,
+    int source_color_blend_factor,
+    int destination_color_blend_factor,
+    int alpha_blend_operation,
+    int source_alpha_blend_factor,
+    int destination_alpha_blend_factor) {
+  auto& color = wrapper->GetColorAttachmentDescriptor(color_attachment_index);
+  color.color_blend_op =
+      flutter::gpu::ToImpellerBlendOperation(color_blend_operation);
+  color.src_color_blend_factor =
+      flutter::gpu::ToImpellerBlendFactor(source_color_blend_factor);
+  color.dst_color_blend_factor =
+      flutter::gpu::ToImpellerBlendFactor(destination_color_blend_factor);
+  color.alpha_blend_op =
+      flutter::gpu::ToImpellerBlendOperation(alpha_blend_operation);
+  color.src_alpha_blend_factor =
+      flutter::gpu::ToImpellerBlendFactor(source_alpha_blend_factor);
+  color.dst_alpha_blend_factor =
+      flutter::gpu::ToImpellerBlendFactor(destination_alpha_blend_factor);
+}
+
+void InternalFlutterGpu_RenderPass_SetDepthWriteEnable(
+    flutter::gpu::RenderPass* wrapper,
+    bool enable) {
+  auto& depth = wrapper->GetDepthAttachmentDescriptor();
+  depth.depth_write_enabled = true;
+}
+
+void InternalFlutterGpu_RenderPass_SetDepthCompareOperation(
+    flutter::gpu::RenderPass* wrapper,
+    int compare_operation) {
+  auto& depth = wrapper->GetDepthAttachmentDescriptor();
+  depth.depth_compare =
+      flutter::gpu::ToImpellerCompareFunction(compare_operation);
+}
+
+bool InternalFlutterGpu_RenderPass_Draw(flutter::gpu::RenderPass* wrapper) {
+  return wrapper->Draw();
+}
diff --git a/lib/gpu/render_pass.h b/lib/gpu/render_pass.h
new file mode 100644
index 0000000000000000000000000000000000000000..94b7d5faebccaf87dfd37d27de88a4995dbce29f
--- /dev/null
+++ b/lib/gpu/render_pass.h
@@ -0,0 +1,230 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_LIB_GPU_RENDER_PASS_H_
+#define FLUTTER_LIB_GPU_RENDER_PASS_H_
+
+#include <map>
+#include <memory>
+#include "flutter/lib/gpu/command_buffer.h"
+#include "flutter/lib/gpu/export.h"
+#include "flutter/lib/ui/dart_wrapper.h"
+#include "fml/memory/ref_ptr.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/vertex_buffer.h"
+#include "impeller/renderer/command.h"
+#include "impeller/renderer/render_pass.h"
+#include "impeller/renderer/render_target.h"
+#include "lib/gpu/device_buffer.h"
+#include "lib/gpu/host_buffer.h"
+#include "lib/gpu/render_pipeline.h"
+#include "lib/gpu/texture.h"
+
+namespace flutter {
+namespace gpu {
+
+class RenderPass : public RefCountedDartWrappable<RenderPass> {
+  DEFINE_WRAPPERTYPEINFO();
+  FML_FRIEND_MAKE_REF_COUNTED(RenderPass);
+
+ public:
+  RenderPass();
+
+  ~RenderPass() override;
+
+  const std::shared_ptr<const impeller::Context>& GetContext() const;
+
+  impeller::Command& GetCommand();
+  const impeller::Command& GetCommand() const;
+
+  impeller::RenderTarget& GetRenderTarget();
+  const impeller::RenderTarget& GetRenderTarget() const;
+
+  impeller::ColorAttachmentDescriptor& GetColorAttachmentDescriptor(
+      size_t color_attachment_index);
+
+  impeller::DepthAttachmentDescriptor& GetDepthAttachmentDescriptor();
+
+  impeller::VertexBuffer& GetVertexBuffer();
+
+  bool Begin(flutter::gpu::CommandBuffer& command_buffer);
+
+  void SetPipeline(fml::RefPtr<RenderPipeline> pipeline);
+
+  /// Lookup an Impeller pipeline by building a descriptor based on the current
+  /// command state.
+  std::shared_ptr<impeller::Pipeline<impeller::PipelineDescriptor>>
+  GetOrCreatePipeline();
+
+  impeller::Command ProvisionRasterCommand();
+
+  bool Draw();
+
+ private:
+  impeller::RenderTarget render_target_;
+  std::shared_ptr<impeller::RenderPass> render_pass_;
+
+  // Command encoding state.
+  impeller::Command command_;
+  fml::RefPtr<RenderPipeline> render_pipeline_;
+  impeller::PipelineDescriptor pipeline_descriptor_;
+
+  // Pipeline descriptor layout state. We always keep track of this state, but
+  // we'll only apply it as necessary to match the RenderTarget.
+  std::map<size_t, impeller::ColorAttachmentDescriptor> color_descriptors_;
+  impeller::StencilAttachmentDescriptor stencil_front_desc_;
+  impeller::StencilAttachmentDescriptor stencil_back_desc_;
+  impeller::DepthAttachmentDescriptor depth_desc_;
+
+  // Command state.
+  impeller::VertexBuffer vertex_buffer_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(RenderPass);
+};
+
+}  // namespace gpu
+}  // namespace flutter
+
+//----------------------------------------------------------------------------
+/// Exports
+///
+
+extern "C" {
+
+FLUTTER_GPU_EXPORT
+extern void InternalFlutterGpu_RenderPass_Initialize(Dart_Handle wrapper);
+
+FLUTTER_GPU_EXPORT
+extern Dart_Handle InternalFlutterGpu_RenderPass_SetColorAttachment(
+    flutter::gpu::RenderPass* wrapper,
+    int color_attachment_index,
+    int load_action,
+    int store_action,
+    int clear_color,
+    flutter::gpu::Texture* texture,
+    Dart_Handle resolve_texture_wrapper);
+
+FLUTTER_GPU_EXPORT
+extern Dart_Handle InternalFlutterGpu_RenderPass_SetDepthStencilAttachment(
+    flutter::gpu::RenderPass* wrapper,
+    int depth_load_action,
+    int depth_store_action,
+    float depth_clear_value,
+    int stencil_load_action,
+    int stencil_store_action,
+    int stencil_clear_value,
+    flutter::gpu::Texture* texture);
+
+FLUTTER_GPU_EXPORT
+extern Dart_Handle InternalFlutterGpu_RenderPass_Begin(
+    flutter::gpu::RenderPass* wrapper,
+    flutter::gpu::CommandBuffer* command_buffer);
+
+FLUTTER_GPU_EXPORT
+extern void InternalFlutterGpu_RenderPass_BindPipeline(
+    flutter::gpu::RenderPass* wrapper,
+    flutter::gpu::RenderPipeline* pipeline);
+
+FLUTTER_GPU_EXPORT
+extern void InternalFlutterGpu_RenderPass_BindVertexBufferDevice(
+    flutter::gpu::RenderPass* wrapper,
+    flutter::gpu::DeviceBuffer* device_buffer,
+    int offset_in_bytes,
+    int length_in_bytes,
+    int vertex_count);
+
+FLUTTER_GPU_EXPORT
+extern void InternalFlutterGpu_RenderPass_BindVertexBufferHost(
+    flutter::gpu::RenderPass* wrapper,
+    flutter::gpu::HostBuffer* host_buffer,
+    int offset_in_bytes,
+    int length_in_bytes,
+    int vertex_count);
+
+FLUTTER_GPU_EXPORT
+extern void InternalFlutterGpu_RenderPass_BindIndexBufferDevice(
+    flutter::gpu::RenderPass* wrapper,
+    flutter::gpu::DeviceBuffer* device_buffer,
+    int offset_in_bytes,
+    int length_in_bytes,
+    int index_type,
+    int index_count);
+
+FLUTTER_GPU_EXPORT
+extern void InternalFlutterGpu_RenderPass_BindIndexBufferHost(
+    flutter::gpu::RenderPass* wrapper,
+    flutter::gpu::HostBuffer* host_buffer,
+    int offset_in_bytes,
+    int length_in_bytes,
+    int index_type,
+    int index_count);
+
+FLUTTER_GPU_EXPORT
+extern bool InternalFlutterGpu_RenderPass_BindUniformDevice(
+    flutter::gpu::RenderPass* wrapper,
+    flutter::gpu::Shader* shader,
+    Dart_Handle uniform_name_handle,
+    flutter::gpu::DeviceBuffer* device_buffer,
+    int offset_in_bytes,
+    int length_in_bytes);
+
+FLUTTER_GPU_EXPORT
+extern bool InternalFlutterGpu_RenderPass_BindUniformHost(
+    flutter::gpu::RenderPass* wrapper,
+    flutter::gpu::Shader* shader,
+    Dart_Handle uniform_name_handle,
+    flutter::gpu::HostBuffer* host_buffer,
+    int offset_in_bytes,
+    int length_in_bytes);
+
+FLUTTER_GPU_EXPORT
+extern bool InternalFlutterGpu_RenderPass_BindTexture(
+    flutter::gpu::RenderPass* wrapper,
+    flutter::gpu::Shader* shader,
+    Dart_Handle uniform_name_handle,
+    flutter::gpu::Texture* texture,
+    int min_filter,
+    int mag_filter,
+    int mip_filter,
+    int width_address_mode,
+    int height_address_mode);
+
+FLUTTER_GPU_EXPORT
+extern void InternalFlutterGpu_RenderPass_ClearBindings(
+    flutter::gpu::RenderPass* wrapper);
+
+FLUTTER_GPU_EXPORT
+extern void InternalFlutterGpu_RenderPass_SetColorBlendEnable(
+    flutter::gpu::RenderPass* wrapper,
+    int color_attachment_index,
+    bool enable);
+
+FLUTTER_GPU_EXPORT
+extern void InternalFlutterGpu_RenderPass_SetColorBlendEquation(
+    flutter::gpu::RenderPass* wrapper,
+    int color_attachment_index,
+    int color_blend_operation,
+    int source_color_blend_factor,
+    int destination_color_blend_factor,
+    int alpha_blend_operation,
+    int source_alpha_blend_factor,
+    int destination_alpha_blend_factor);
+
+FLUTTER_GPU_EXPORT
+extern void InternalFlutterGpu_RenderPass_SetDepthWriteEnable(
+    flutter::gpu::RenderPass* wrapper,
+    bool enable);
+
+FLUTTER_GPU_EXPORT
+extern void InternalFlutterGpu_RenderPass_SetDepthCompareOperation(
+    flutter::gpu::RenderPass* wrapper,
+    int compare_operation);
+
+FLUTTER_GPU_EXPORT
+extern bool InternalFlutterGpu_RenderPass_Draw(
+    flutter::gpu::RenderPass* wrapper);
+
+}  // extern "C"
+
+#endif  // FLUTTER_LIB_GPU_RENDER_PASS_H_
diff --git a/lib/gpu/render_pipeline.cc b/lib/gpu/render_pipeline.cc
new file mode 100644
index 0000000000000000000000000000000000000000..df93e8770ef830c25da783be179043bd2f000fc4
--- /dev/null
+++ b/lib/gpu/render_pipeline.cc
@@ -0,0 +1,54 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/lib/gpu/render_pipeline.h"
+
+#include "flutter/lib/gpu/shader.h"
+#include "impeller/renderer/pipeline_descriptor.h"
+
+namespace flutter {
+namespace gpu {
+
+IMPLEMENT_WRAPPERTYPEINFO(flutter_gpu, RenderPipeline);
+
+RenderPipeline::RenderPipeline(
+    fml::RefPtr<flutter::gpu::Shader> vertex_shader,
+    fml::RefPtr<flutter::gpu::Shader> fragment_shader)
+    : vertex_shader_(std::move(vertex_shader)),
+      fragment_shader_(std::move(fragment_shader)) {}
+
+void RenderPipeline::BindToPipelineDescriptor(
+    impeller::ShaderLibrary& library,
+    impeller::PipelineDescriptor& desc) {
+  desc.SetVertexDescriptor(vertex_shader_->GetVertexDescriptor());
+
+  desc.AddStageEntrypoint(vertex_shader_->GetFunctionFromLibrary(library));
+  desc.AddStageEntrypoint(fragment_shader_->GetFunctionFromLibrary(library));
+}
+
+RenderPipeline::~RenderPipeline() = default;
+
+}  // namespace gpu
+}  // namespace flutter
+
+//----------------------------------------------------------------------------
+/// Exports
+///
+
+Dart_Handle InternalFlutterGpu_RenderPipeline_Initialize(
+    Dart_Handle wrapper,
+    flutter::gpu::Context* gpu_context,
+    flutter::gpu::Shader* vertex_shader,
+    flutter::gpu::Shader* fragment_shader) {
+  // Lazily register the shaders synchronously if they haven't been already.
+  vertex_shader->RegisterSync(*gpu_context);
+  fragment_shader->RegisterSync(*gpu_context);
+
+  auto res = fml::MakeRefCounted<flutter::gpu::RenderPipeline>(
+      fml::RefPtr<flutter::gpu::Shader>(vertex_shader),  //
+      fml::RefPtr<flutter::gpu::Shader>(fragment_shader));
+  res->AssociateWithDartWrapper(wrapper);
+
+  return Dart_Null();
+}
diff --git a/lib/gpu/render_pipeline.h b/lib/gpu/render_pipeline.h
new file mode 100644
index 0000000000000000000000000000000000000000..8d52e70ee601ab86c8be32fb81557ccd06822307
--- /dev/null
+++ b/lib/gpu/render_pipeline.h
@@ -0,0 +1,55 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_LIB_GPU_RENDER_PIPELINE_H_
+#define FLUTTER_LIB_GPU_RENDER_PIPELINE_H_
+
+#include "flutter/lib/gpu/context.h"
+#include "flutter/lib/gpu/export.h"
+#include "flutter/lib/gpu/shader.h"
+#include "flutter/lib/ui/dart_wrapper.h"
+#include "impeller/renderer/pipeline_descriptor.h"
+
+namespace flutter {
+namespace gpu {
+
+class RenderPipeline : public RefCountedDartWrappable<RenderPipeline> {
+  DEFINE_WRAPPERTYPEINFO();
+  FML_FRIEND_MAKE_REF_COUNTED(RenderPipeline);
+
+ public:
+  RenderPipeline(fml::RefPtr<flutter::gpu::Shader> vertex_shader,
+                 fml::RefPtr<flutter::gpu::Shader> fragment_shader);
+
+  ~RenderPipeline() override;
+
+  void BindToPipelineDescriptor(impeller::ShaderLibrary& library,
+                                impeller::PipelineDescriptor& desc);
+
+ private:
+  fml::RefPtr<flutter::gpu::Shader> vertex_shader_;
+  fml::RefPtr<flutter::gpu::Shader> fragment_shader_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(RenderPipeline);
+};
+
+}  // namespace gpu
+}  // namespace flutter
+
+//----------------------------------------------------------------------------
+/// Exports
+///
+
+extern "C" {
+
+FLUTTER_GPU_EXPORT
+extern Dart_Handle InternalFlutterGpu_RenderPipeline_Initialize(
+    Dart_Handle wrapper,
+    flutter::gpu::Context* gpu_context,
+    flutter::gpu::Shader* vertex_shader,
+    flutter::gpu::Shader* fragment_shader);
+
+}  // extern "C"
+
+#endif  // FLUTTER_LIB_GPU_RENDER_PIPELINE_H_
diff --git a/lib/gpu/shader.cc b/lib/gpu/shader.cc
new file mode 100644
index 0000000000000000000000000000000000000000..337baadd0f59c1bbdd9295ac120cf3ef2110e1d7
--- /dev/null
+++ b/lib/gpu/shader.cc
@@ -0,0 +1,149 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/lib/gpu/shader.h"
+
+#include <utility>
+
+#include "flutter/lib/gpu/formats.h"
+#include "fml/make_copyable.h"
+#include "impeller/core/runtime_types.h"
+#include "impeller/renderer/shader_function.h"
+#include "impeller/renderer/shader_library.h"
+#include "tonic/converter/dart_converter.h"
+
+namespace flutter {
+namespace gpu {
+
+const impeller::ShaderStructMemberMetadata*
+Shader::UniformBinding::GetMemberMetadata(const std::string& name) const {
+  auto result =
+      std::find_if(metadata.members.begin(), metadata.members.end(),
+                   [&name](const impeller::ShaderStructMemberMetadata& member) {
+                     return member.name == name;
+                   });
+  if (result == metadata.members.end()) {
+    return nullptr;
+  }
+  return &(*result);
+}
+
+IMPLEMENT_WRAPPERTYPEINFO(flutter_gpu, Shader);
+
+Shader::Shader() = default;
+
+Shader::~Shader() = default;
+
+fml::RefPtr<Shader> Shader::Make(
+    std::string entrypoint,
+    impeller::ShaderStage stage,
+    std::shared_ptr<fml::Mapping> code_mapping,
+    std::shared_ptr<impeller::VertexDescriptor> vertex_desc,
+    std::unordered_map<std::string, UniformBinding> uniform_structs,
+    std::unordered_map<std::string, impeller::SampledImageSlot>
+        uniform_textures) {
+  auto shader = fml::MakeRefCounted<Shader>();
+  shader->entrypoint_ = std::move(entrypoint);
+  shader->stage_ = stage;
+  shader->code_mapping_ = std::move(code_mapping);
+  shader->vertex_desc_ = std::move(vertex_desc);
+  shader->uniform_structs_ = std::move(uniform_structs);
+  shader->uniform_textures_ = std::move(uniform_textures);
+  return shader;
+}
+
+std::shared_ptr<const impeller::ShaderFunction> Shader::GetFunctionFromLibrary(
+    impeller::ShaderLibrary& library) {
+  return library.GetFunction(entrypoint_, stage_);
+}
+
+bool Shader::IsRegistered(Context& context) {
+  auto& lib = *context.GetContext()->GetShaderLibrary();
+  return GetFunctionFromLibrary(lib) != nullptr;
+}
+
+bool Shader::RegisterSync(Context& context) {
+  if (IsRegistered(context)) {
+    return true;  // Already registered.
+  }
+
+  auto& lib = *context.GetContext()->GetShaderLibrary();
+
+  std::promise<bool> promise;
+  auto future = promise.get_future();
+  lib.RegisterFunction(
+      entrypoint_, stage_, code_mapping_,
+      fml::MakeCopyable([promise = std::move(promise)](bool result) mutable {
+        promise.set_value(result);
+      }));
+  if (!future.get()) {
+    return false;  // Registration failed.
+  }
+  return true;
+}
+
+std::shared_ptr<impeller::VertexDescriptor> Shader::GetVertexDescriptor()
+    const {
+  return vertex_desc_;
+}
+
+impeller::ShaderStage Shader::GetShaderStage() const {
+  return stage_;
+}
+
+const Shader::UniformBinding* Shader::GetUniformStruct(
+    const std::string& name) const {
+  auto uniform = uniform_structs_.find(name);
+  if (uniform == uniform_structs_.end()) {
+    return nullptr;
+  }
+  return &uniform->second;
+}
+
+const impeller::SampledImageSlot* Shader::GetUniformTexture(
+    const std::string& name) const {
+  auto uniform = uniform_textures_.find(name);
+  if (uniform == uniform_textures_.end()) {
+    return nullptr;
+  }
+  return &uniform->second;
+}
+
+}  // namespace gpu
+}  // namespace flutter
+
+//----------------------------------------------------------------------------
+/// Exports
+///
+
+int InternalFlutterGpu_Shader_GetUniformStructSize(
+    flutter::gpu::Shader* wrapper,
+    Dart_Handle struct_name_handle) {
+  auto name = tonic::StdStringFromDart(struct_name_handle);
+  const auto* uniform = wrapper->GetUniformStruct(name);
+  if (uniform == nullptr) {
+    return -1;
+  }
+
+  return uniform->size_in_bytes;
+}
+
+int InternalFlutterGpu_Shader_GetUniformMemberOffset(
+    flutter::gpu::Shader* wrapper,
+    Dart_Handle struct_name_handle,
+    Dart_Handle member_name_handle) {
+  auto struct_name = tonic::StdStringFromDart(struct_name_handle);
+  const auto* uniform = wrapper->GetUniformStruct(struct_name);
+  if (uniform == nullptr) {
+    return -1;
+  }
+
+  auto member_name = tonic::StdStringFromDart(member_name_handle);
+  const auto* member = uniform->GetMemberMetadata(member_name);
+  if (member == nullptr) {
+    return -1;
+  }
+
+  return member->offset;
+}
diff --git a/lib/gpu/shader.h b/lib/gpu/shader.h
new file mode 100644
index 0000000000000000000000000000000000000000..b2d88b9bb82cb08c086e45fdff971010df8fde2d
--- /dev/null
+++ b/lib/gpu/shader.h
@@ -0,0 +1,99 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_LIB_GPU_SHADER_H_
+#define FLUTTER_LIB_GPU_SHADER_H_
+
+#include <algorithm>
+#include <memory>
+#include <string>
+
+#include "flutter/lib/gpu/context.h"
+#include "flutter/lib/ui/dart_wrapper.h"
+#include "fml/memory/ref_ptr.h"
+#include "impeller/core/shader_types.h"
+#include "impeller/renderer/shader_function.h"
+#include "impeller/renderer/vertex_descriptor.h"
+
+namespace flutter {
+namespace gpu {
+
+/// An immutable collection of shaders loaded from a shader bundle asset.
+class Shader : public RefCountedDartWrappable<Shader> {
+  DEFINE_WRAPPERTYPEINFO();
+  FML_FRIEND_MAKE_REF_COUNTED(Shader);
+
+ public:
+  struct UniformBinding {
+    impeller::ShaderUniformSlot slot;
+    impeller::ShaderMetadata metadata;
+    size_t size_in_bytes = 0;
+
+    const impeller::ShaderStructMemberMetadata* GetMemberMetadata(
+        const std::string& name) const;
+  };
+
+  ~Shader() override;
+
+  static fml::RefPtr<Shader> Make(
+      std::string entrypoint,
+      impeller::ShaderStage stage,
+      std::shared_ptr<fml::Mapping> code_mapping,
+      std::shared_ptr<impeller::VertexDescriptor> vertex_desc,
+      std::unordered_map<std::string, UniformBinding> uniform_structs,
+      std::unordered_map<std::string, impeller::SampledImageSlot>
+          uniform_textures);
+
+  std::shared_ptr<const impeller::ShaderFunction> GetFunctionFromLibrary(
+      impeller::ShaderLibrary& library);
+
+  bool IsRegistered(Context& context);
+
+  bool RegisterSync(Context& context);
+
+  std::shared_ptr<impeller::VertexDescriptor> GetVertexDescriptor() const;
+
+  impeller::ShaderStage GetShaderStage() const;
+
+  const Shader::UniformBinding* GetUniformStruct(const std::string& name) const;
+
+  const impeller::SampledImageSlot* GetUniformTexture(
+      const std::string& name) const;
+
+ private:
+  Shader();
+
+  std::string entrypoint_;
+  impeller::ShaderStage stage_;
+  std::shared_ptr<fml::Mapping> code_mapping_;
+  std::shared_ptr<impeller::VertexDescriptor> vertex_desc_;
+  std::unordered_map<std::string, UniformBinding> uniform_structs_;
+  std::unordered_map<std::string, impeller::SampledImageSlot> uniform_textures_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(Shader);
+};
+
+}  // namespace gpu
+}  // namespace flutter
+
+//----------------------------------------------------------------------------
+/// Exports
+///
+
+extern "C" {
+
+FLUTTER_GPU_EXPORT
+extern int InternalFlutterGpu_Shader_GetUniformStructSize(
+    flutter::gpu::Shader* wrapper,
+    Dart_Handle struct_name_handle);
+
+FLUTTER_GPU_EXPORT
+extern int InternalFlutterGpu_Shader_GetUniformMemberOffset(
+    flutter::gpu::Shader* wrapper,
+    Dart_Handle struct_name_handle,
+    Dart_Handle member_name_handle);
+
+}  // extern "C"
+
+#endif  // FLUTTER_LIB_GPU_SHADER_H_
diff --git a/lib/gpu/shader_library.cc b/lib/gpu/shader_library.cc
new file mode 100644
index 0000000000000000000000000000000000000000..8ef631bc71ad14ddc809798913c0bedc2b3db11b
--- /dev/null
+++ b/lib/gpu/shader_library.cc
@@ -0,0 +1,376 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/lib/gpu/shader_library.h"
+
+#include <optional>
+#include <utility>
+
+#include "flutter/assets/asset_manager.h"
+#include "flutter/lib/gpu/fixtures.h"
+#include "flutter/lib/gpu/shader.h"
+#include "flutter/lib/ui/ui_dart_state.h"
+#include "flutter/lib/ui/window/platform_configuration.h"
+#include "fml/mapping.h"
+#include "fml/memory/ref_ptr.h"
+#include "impeller/core/shader_types.h"
+#include "impeller/renderer/vertex_descriptor.h"
+#include "impeller/shader_bundle/shader_bundle_flatbuffers.h"
+#include "lib/gpu/context.h"
+
+namespace flutter {
+namespace gpu {
+
+IMPLEMENT_WRAPPERTYPEINFO(flutter_gpu, ShaderLibrary);
+
+fml::RefPtr<ShaderLibrary> ShaderLibrary::override_shader_library_;
+
+fml::RefPtr<ShaderLibrary> ShaderLibrary::MakeFromAsset(
+    impeller::Context::BackendType backend_type,
+    const std::string& name,
+    std::string& out_error) {
+  if (override_shader_library_) {
+    return override_shader_library_;
+  }
+
+  auto dart_state = UIDartState::Current();
+  std::shared_ptr<AssetManager> asset_manager =
+      dart_state->platform_configuration()->client()->GetAssetManager();
+
+  std::unique_ptr<fml::Mapping> data = asset_manager->GetAsMapping(name);
+  if (data == nullptr) {
+    out_error = std::string("Asset '") + name + std::string("' not found.");
+    return nullptr;
+  }
+
+  return MakeFromFlatbuffer(backend_type, std::move(data));
+}
+
+fml::RefPtr<ShaderLibrary> ShaderLibrary::MakeFromShaders(ShaderMap shaders) {
+  return fml::MakeRefCounted<flutter::gpu::ShaderLibrary>(nullptr,
+                                                          std::move(shaders));
+}
+
+static impeller::ShaderStage ToShaderStage(
+    impeller::fb::shaderbundle::ShaderStage stage) {
+  switch (stage) {
+    case impeller::fb::shaderbundle::ShaderStage::kVertex:
+      return impeller::ShaderStage::kVertex;
+    case impeller::fb::shaderbundle::ShaderStage::kFragment:
+      return impeller::ShaderStage::kFragment;
+    case impeller::fb::shaderbundle::ShaderStage::kCompute:
+      return impeller::ShaderStage::kCompute;
+  }
+  FML_UNREACHABLE();
+}
+
+static impeller::ShaderType FromInputType(
+    impeller::fb::shaderbundle::InputDataType input_type) {
+  switch (input_type) {
+    case impeller::fb::shaderbundle::InputDataType::kBoolean:
+      return impeller::ShaderType::kBoolean;
+    case impeller::fb::shaderbundle::InputDataType::kSignedByte:
+      return impeller::ShaderType::kSignedByte;
+    case impeller::fb::shaderbundle::InputDataType::kUnsignedByte:
+      return impeller::ShaderType::kUnsignedByte;
+    case impeller::fb::shaderbundle::InputDataType::kSignedShort:
+      return impeller::ShaderType::kSignedShort;
+    case impeller::fb::shaderbundle::InputDataType::kUnsignedShort:
+      return impeller::ShaderType::kUnsignedShort;
+    case impeller::fb::shaderbundle::InputDataType::kSignedInt:
+      return impeller::ShaderType::kSignedInt;
+    case impeller::fb::shaderbundle::InputDataType::kUnsignedInt:
+      return impeller::ShaderType::kUnsignedInt;
+    case impeller::fb::shaderbundle::InputDataType::kSignedInt64:
+      return impeller::ShaderType::kSignedInt64;
+    case impeller::fb::shaderbundle::InputDataType::kUnsignedInt64:
+      return impeller::ShaderType::kUnsignedInt64;
+    case impeller::fb::shaderbundle::InputDataType::kFloat:
+      return impeller::ShaderType::kFloat;
+    case impeller::fb::shaderbundle::InputDataType::kDouble:
+      return impeller::ShaderType::kDouble;
+  }
+}
+
+static impeller::ShaderType FromUniformType(
+    impeller::fb::shaderbundle::UniformDataType uniform_type) {
+  switch (uniform_type) {
+    case impeller::fb::shaderbundle::UniformDataType::kBoolean:
+      return impeller::ShaderType::kBoolean;
+    case impeller::fb::shaderbundle::UniformDataType::kSignedByte:
+      return impeller::ShaderType::kSignedByte;
+    case impeller::fb::shaderbundle::UniformDataType::kUnsignedByte:
+      return impeller::ShaderType::kUnsignedByte;
+    case impeller::fb::shaderbundle::UniformDataType::kSignedShort:
+      return impeller::ShaderType::kSignedShort;
+    case impeller::fb::shaderbundle::UniformDataType::kUnsignedShort:
+      return impeller::ShaderType::kUnsignedShort;
+    case impeller::fb::shaderbundle::UniformDataType::kSignedInt:
+      return impeller::ShaderType::kSignedInt;
+    case impeller::fb::shaderbundle::UniformDataType::kUnsignedInt:
+      return impeller::ShaderType::kUnsignedInt;
+    case impeller::fb::shaderbundle::UniformDataType::kSignedInt64:
+      return impeller::ShaderType::kSignedInt64;
+    case impeller::fb::shaderbundle::UniformDataType::kUnsignedInt64:
+      return impeller::ShaderType::kUnsignedInt64;
+    case impeller::fb::shaderbundle::UniformDataType::kFloat:
+      return impeller::ShaderType::kFloat;
+    case impeller::fb::shaderbundle::UniformDataType::kDouble:
+      return impeller::ShaderType::kDouble;
+    case impeller::fb::shaderbundle::UniformDataType::kHalfFloat:
+      return impeller::ShaderType::kHalfFloat;
+    case impeller::fb::shaderbundle::UniformDataType::kSampledImage:
+      return impeller::ShaderType::kSampledImage;
+  }
+}
+
+static size_t SizeOfInputType(
+    impeller::fb::shaderbundle::InputDataType input_type) {
+  switch (input_type) {
+    case impeller::fb::shaderbundle::InputDataType::kBoolean:
+      return 1;
+    case impeller::fb::shaderbundle::InputDataType::kSignedByte:
+      return 1;
+    case impeller::fb::shaderbundle::InputDataType::kUnsignedByte:
+      return 1;
+    case impeller::fb::shaderbundle::InputDataType::kSignedShort:
+      return 2;
+    case impeller::fb::shaderbundle::InputDataType::kUnsignedShort:
+      return 2;
+    case impeller::fb::shaderbundle::InputDataType::kSignedInt:
+      return 4;
+    case impeller::fb::shaderbundle::InputDataType::kUnsignedInt:
+      return 4;
+    case impeller::fb::shaderbundle::InputDataType::kSignedInt64:
+      return 8;
+    case impeller::fb::shaderbundle::InputDataType::kUnsignedInt64:
+      return 8;
+    case impeller::fb::shaderbundle::InputDataType::kFloat:
+      return 4;
+    case impeller::fb::shaderbundle::InputDataType::kDouble:
+      return 8;
+  }
+}
+
+static const impeller::fb::shaderbundle::BackendShader* GetShaderBackend(
+    impeller::Context::BackendType backend_type,
+    const impeller::fb::shaderbundle::Shader* shader) {
+  switch (backend_type) {
+    case impeller::Context::BackendType::kMetal:
+#ifdef FML_OS_IOS
+      return shader->metal_ios();
+#else
+      return shader->metal_desktop();
+#endif
+    case impeller::Context::BackendType::kOpenGLES:
+#ifdef FML_OS_ANDROID
+      return shader->opengl_es();
+#else
+      return shader->opengl_desktop();
+#endif
+    case impeller::Context::BackendType::kVulkan:
+      return shader->vulkan();
+  }
+}
+
+fml::RefPtr<ShaderLibrary> ShaderLibrary::MakeFromFlatbuffer(
+    impeller::Context::BackendType backend_type,
+    std::shared_ptr<fml::Mapping> payload) {
+  if (payload == nullptr || !payload->GetMapping()) {
+    return nullptr;
+  }
+  if (!impeller::fb::shaderbundle::ShaderBundleBufferHasIdentifier(
+          payload->GetMapping())) {
+    return nullptr;
+  }
+  auto* bundle =
+      impeller::fb::shaderbundle::GetShaderBundle(payload->GetMapping());
+  if (!bundle) {
+    return nullptr;
+  }
+
+  ShaderLibrary::ShaderMap shader_map;
+
+  for (const auto* bundled_shader : *bundle->shaders()) {
+    const impeller::fb::shaderbundle::BackendShader* backend_shader =
+        GetShaderBackend(backend_type, bundled_shader);
+    if (!backend_shader) {
+      VALIDATION_LOG << "Failed to unpack shader \""
+                     << bundled_shader->name()->c_str() << "\" from bundle.";
+      continue;
+    }
+
+    auto code_mapping = std::make_shared<fml::NonOwnedMapping>(
+        backend_shader->shader()->data(),   //
+        backend_shader->shader()->size(),   //
+        [payload = payload](auto, auto) {}  //
+    );
+
+    std::unordered_map<std::string, Shader::UniformBinding> uniform_structs;
+    if (backend_shader->uniform_structs() != nullptr) {
+      for (const auto& uniform : *backend_shader->uniform_structs()) {
+        std::vector<impeller::ShaderStructMemberMetadata> members;
+        if (uniform->fields() != nullptr) {
+          for (const auto& struct_member : *uniform->fields()) {
+            members.push_back(impeller::ShaderStructMemberMetadata{
+                .type = FromUniformType(struct_member->type()),
+                .name = struct_member->name()->c_str(),
+                .offset = static_cast<size_t>(struct_member->offset_in_bytes()),
+                .size =
+                    static_cast<size_t>(struct_member->element_size_in_bytes()),
+                .byte_length =
+                    static_cast<size_t>(struct_member->total_size_in_bytes()),
+                .array_elements =
+                    struct_member->array_elements() != 0
+                        ? std::optional<size_t>(std::nullopt)
+                        : static_cast<size_t>(struct_member->array_elements()),
+            });
+          }
+        }
+
+        uniform_structs[uniform->name()->str()] = Shader::UniformBinding{
+            .slot =
+                impeller::ShaderUniformSlot{
+                    .name = uniform->name()->c_str(),
+                    .ext_res_0 = static_cast<size_t>(uniform->ext_res_0()),
+                    .set = static_cast<size_t>(uniform->set()),
+                    .binding = static_cast<size_t>(uniform->binding()),
+                },
+            .metadata =
+                impeller::ShaderMetadata{
+                    .name = uniform->name()->c_str(),
+                    .members = members,
+                },
+            .size_in_bytes = static_cast<size_t>(uniform->size_in_bytes()),
+        };
+      }
+    }
+
+    std::unordered_map<std::string, impeller::SampledImageSlot>
+        uniform_textures;
+    if (backend_shader->uniform_textures() != nullptr) {
+      for (const auto& uniform : *backend_shader->uniform_textures()) {
+        uniform_textures[uniform->name()->str()] = impeller::SampledImageSlot{
+            .name = uniform->name()->c_str(),
+            .texture_index = static_cast<size_t>(uniform->ext_res_0()),
+            .set = static_cast<size_t>(uniform->set()),
+            .binding = static_cast<size_t>(uniform->binding()),
+        };
+      }
+    }
+
+    std::shared_ptr<impeller::VertexDescriptor> vertex_descriptor = nullptr;
+    if (backend_shader->stage() ==
+        impeller::fb::shaderbundle::ShaderStage::kVertex) {
+      vertex_descriptor = std::make_shared<impeller::VertexDescriptor>();
+      auto inputs_fb = backend_shader->inputs();
+
+      std::vector<impeller::ShaderStageIOSlot> inputs;
+      inputs.reserve(inputs_fb->size());
+      size_t default_stride = 0;
+      for (const auto& input : *inputs_fb) {
+        impeller::ShaderStageIOSlot slot;
+        slot.name = input->name()->c_str();
+        slot.location = input->location();
+        slot.set = input->set();
+        slot.binding = input->binding();
+        slot.type = FromInputType(input->type());
+        slot.bit_width = input->bit_width();
+        slot.vec_size = input->vec_size();
+        slot.columns = input->columns();
+        slot.offset = input->offset();
+        inputs.emplace_back(slot);
+
+        default_stride +=
+            SizeOfInputType(input->type()) * slot.vec_size * slot.columns;
+      }
+      std::vector<impeller::ShaderStageBufferLayout> layouts = {
+          impeller::ShaderStageBufferLayout{
+              .stride = default_stride,
+              .binding = 0u,
+          }};
+
+      vertex_descriptor->SetStageInputs(inputs, layouts);
+    }
+
+    auto shader = flutter::gpu::Shader::Make(
+        backend_shader->entrypoint()->str(),
+        ToShaderStage(backend_shader->stage()), std::move(code_mapping),
+        std::move(vertex_descriptor), std::move(uniform_structs),
+        std::move(uniform_textures));
+    shader_map[bundled_shader->name()->str()] = std::move(shader);
+  }
+
+  return fml::MakeRefCounted<flutter::gpu::ShaderLibrary>(
+      std::move(payload), std::move(shader_map));
+}
+
+void ShaderLibrary::SetOverride(
+    fml::RefPtr<ShaderLibrary> override_shader_library) {
+  override_shader_library_ = std::move(override_shader_library);
+}
+
+fml::RefPtr<Shader> ShaderLibrary::GetShader(const std::string& shader_name,
+                                             Dart_Handle shader_wrapper) const {
+  auto it = shaders_.find(shader_name);
+  if (it == shaders_.end()) {
+    return nullptr;  // No matching shaders.
+  }
+  auto shader = it->second;
+
+  if (shader->dart_wrapper() == nullptr) {
+    shader->AssociateWithDartWrapper(shader_wrapper);
+  }
+  return shader;
+}
+
+ShaderLibrary::ShaderLibrary(std::shared_ptr<fml::Mapping> payload,
+                             ShaderMap shaders)
+    : payload_(std::move(payload)), shaders_(std::move(shaders)) {}
+
+ShaderLibrary::~ShaderLibrary() = default;
+
+}  // namespace gpu
+}  // namespace flutter
+
+//----------------------------------------------------------------------------
+/// Exports
+///
+
+Dart_Handle InternalFlutterGpu_ShaderLibrary_InitializeWithAsset(
+    Dart_Handle wrapper,
+    Dart_Handle asset_name) {
+  if (!Dart_IsString(asset_name)) {
+    return tonic::ToDart("Asset name must be a string");
+  }
+
+  std::optional<std::string> out_error;
+  auto impeller_context = flutter::gpu::Context::GetDefaultContext(out_error);
+  if (out_error.has_value()) {
+    return tonic::ToDart(out_error.value());
+  }
+
+  std::string error;
+  auto res = flutter::gpu::ShaderLibrary::MakeFromAsset(
+      impeller_context->GetBackendType(), tonic::StdStringFromDart(asset_name),
+      error);
+  if (!res) {
+    return tonic::ToDart(error);
+  }
+  res->AssociateWithDartWrapper(wrapper);
+  return Dart_Null();
+}
+
+Dart_Handle InternalFlutterGpu_ShaderLibrary_GetShader(
+    flutter::gpu::ShaderLibrary* wrapper,
+    Dart_Handle shader_name,
+    Dart_Handle shader_wrapper) {
+  FML_DCHECK(Dart_IsString(shader_name));
+  auto shader =
+      wrapper->GetShader(tonic::StdStringFromDart(shader_name), shader_wrapper);
+  if (!shader) {
+    return Dart_Null();
+  }
+  return tonic::ToDart(shader.get());
+}
diff --git a/lib/gpu/shader_library.h b/lib/gpu/shader_library.h
new file mode 100644
index 0000000000000000000000000000000000000000..55eaec4d0a64fcf4376a72a0e7f88dd523acba67
--- /dev/null
+++ b/lib/gpu/shader_library.h
@@ -0,0 +1,84 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_LIB_GPU_SHADER_LIBRARY_H_
+#define FLUTTER_LIB_GPU_SHADER_LIBRARY_H_
+
+#include <memory>
+#include <string>
+#include <unordered_map>
+
+#include "flutter/lib/gpu/export.h"
+#include "flutter/lib/gpu/shader.h"
+#include "flutter/lib/ui/dart_wrapper.h"
+#include "fml/memory/ref_ptr.h"
+
+namespace flutter {
+namespace gpu {
+
+/// An immutable collection of shaders loaded from a shader bundle asset.
+class ShaderLibrary : public RefCountedDartWrappable<ShaderLibrary> {
+  DEFINE_WRAPPERTYPEINFO();
+  FML_FRIEND_MAKE_REF_COUNTED(ShaderLibrary);
+
+ public:
+  using ShaderMap = std::unordered_map<std::string, fml::RefPtr<Shader>>;
+
+  static fml::RefPtr<ShaderLibrary> MakeFromAsset(
+      impeller::Context::BackendType backend_type,
+      const std::string& name,
+      std::string& out_error);
+
+  static fml::RefPtr<ShaderLibrary> MakeFromShaders(ShaderMap shaders);
+
+  static fml::RefPtr<ShaderLibrary> MakeFromFlatbuffer(
+      impeller::Context::BackendType backend_type,
+      std::shared_ptr<fml::Mapping> payload);
+
+  /// Sets a return override for `MakeFromAsset` for testing purposes.
+  static void SetOverride(fml::RefPtr<ShaderLibrary> override_shader_library);
+
+  fml::RefPtr<Shader> GetShader(const std::string& shader_name,
+                                Dart_Handle shader_wrapper) const;
+
+  ~ShaderLibrary() override;
+
+ private:
+  /// A global override used to inject a ShaderLibrary when running with the
+  /// Impeller playground. When set, `MakeFromAsset` will always just return
+  /// this library.
+  static fml::RefPtr<ShaderLibrary> override_shader_library_;
+
+  std::shared_ptr<fml::Mapping> payload_;
+  ShaderMap shaders_;
+
+  explicit ShaderLibrary(std::shared_ptr<fml::Mapping> payload,
+                         ShaderMap shaders);
+
+  FML_DISALLOW_COPY_AND_ASSIGN(ShaderLibrary);
+};
+
+}  // namespace gpu
+}  // namespace flutter
+
+//----------------------------------------------------------------------------
+/// Exports
+///
+
+extern "C" {
+
+FLUTTER_GPU_EXPORT
+extern Dart_Handle InternalFlutterGpu_ShaderLibrary_InitializeWithAsset(
+    Dart_Handle wrapper,
+    Dart_Handle asset_name);
+
+FLUTTER_GPU_EXPORT
+extern Dart_Handle InternalFlutterGpu_ShaderLibrary_GetShader(
+    flutter::gpu::ShaderLibrary* wrapper,
+    Dart_Handle shader_name,
+    Dart_Handle shader_wrapper);
+
+}  // extern "C"
+
+#endif  // FLUTTER_LIB_GPU_SHADER_LIBRARY_H_
diff --git a/lib/gpu/smoketest.cc b/lib/gpu/smoketest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..e7524cd10efa55c8cf4aa97178bbf94fa35e6c60
--- /dev/null
+++ b/lib/gpu/smoketest.cc
@@ -0,0 +1,58 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/lib/gpu/smoketest.h"
+#include "flutter/fml/memory/ref_ptr.h"
+#include "flutter/lib/ui/dart_wrapper.h"
+#include "flutter/lib/ui/ui_dart_state.h"
+#include "third_party/dart/runtime/include/dart_api.h"
+#include "third_party/tonic/converter/dart_converter.h"
+#include "third_party/tonic/dart_state.h"
+#include "third_party/tonic/dart_wrappable.h"
+#include "third_party/tonic/dart_wrapper_info.h"
+#include "third_party/tonic/logging/dart_invoke.h"
+
+namespace flutter {
+
+// TODO(131346): Remove this once we migrate the Dart GPU API into this space.
+IMPLEMENT_WRAPPERTYPEINFO(flutter_gpu, FlutterGpuTestClass);
+
+// TODO(131346): Remove this once we migrate the Dart GPU API into this space.
+FlutterGpuTestClass::~FlutterGpuTestClass() = default;
+
+}  // namespace flutter
+
+//----------------------------------------------------------------------------
+/// Exports
+///
+
+// TODO(131346): Remove this once we migrate the Dart GPU API into this space.
+uint32_t InternalFlutterGpuTestProc() {
+  return 1;
+}
+
+// TODO(131346): Remove this once we migrate the Dart GPU API into this space.
+Dart_Handle InternalFlutterGpuTestProcWithCallback(Dart_Handle callback) {
+  flutter::UIDartState::ThrowIfUIOperationsProhibited();
+  if (!Dart_IsClosure(callback)) {
+    return tonic::ToDart("Callback must be a function");
+  }
+
+  tonic::DartInvoke(callback, {tonic::ToDart(1234)});
+
+  return Dart_Null();
+}
+
+// TODO(131346): Remove this once we migrate the Dart GPU API into this space.
+void InternalFlutterGpuTestClass_Create(Dart_Handle wrapper) {
+  auto res = fml::MakeRefCounted<flutter::FlutterGpuTestClass>();
+  res->AssociateWithDartWrapper(wrapper);
+  FML_LOG(INFO) << "FlutterGpuTestClass Wrapped.";
+}
+
+// TODO(131346): Remove this once we migrate the Dart GPU API into this space.
+void InternalFlutterGpuTestClass_Method(flutter::FlutterGpuTestClass* self,
+                                        int something) {
+  FML_LOG(INFO) << "Something: " << something;
+}
diff --git a/lib/gpu/smoketest.h b/lib/gpu/smoketest.h
new file mode 100644
index 0000000000000000000000000000000000000000..895b3dd16a957d0a5bac39028b20f3fe957bf063
--- /dev/null
+++ b/lib/gpu/smoketest.h
@@ -0,0 +1,56 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_LIB_GPU_SMOKETEST_H_
+#define FLUTTER_LIB_GPU_SMOKETEST_H_
+
+#include <cstdint>
+
+#include "flutter/lib/gpu/export.h"
+#include "flutter/lib/ui/dart_wrapper.h"
+#include "third_party/dart/runtime/include/dart_api.h"
+#include "third_party/tonic/dart_state.h"
+#include "third_party/tonic/dart_wrapper_info.h"
+
+namespace flutter {
+
+// TODO(131346): Remove this once we migrate the Dart GPU API into this space.
+class FlutterGpuTestClass
+    : public RefCountedDartWrappable<FlutterGpuTestClass> {
+  DEFINE_WRAPPERTYPEINFO();
+  FML_FRIEND_MAKE_REF_COUNTED(FlutterGpuTestClass);
+
+ public:
+  ~FlutterGpuTestClass() override;
+};
+
+}  // namespace flutter
+
+//----------------------------------------------------------------------------
+/// Exports
+///
+
+extern "C" {
+
+// TODO(131346): Remove this once we migrate the Dart GPU API into this space.
+FLUTTER_GPU_EXPORT
+extern uint32_t InternalFlutterGpuTestProc();
+
+// TODO(131346): Remove this once we migrate the Dart GPU API into this space.
+FLUTTER_GPU_EXPORT
+extern Dart_Handle InternalFlutterGpuTestProcWithCallback(Dart_Handle callback);
+
+// TODO(131346): Remove this once we migrate the Dart GPU API into this space.
+FLUTTER_GPU_EXPORT
+extern void InternalFlutterGpuTestClass_Create(Dart_Handle wrapper);
+
+// TODO(131346): Remove this once we migrate the Dart GPU API into this space.
+FLUTTER_GPU_EXPORT
+extern void InternalFlutterGpuTestClass_Method(
+    flutter::FlutterGpuTestClass* self,
+    int something);
+
+}  // extern "C"
+
+#endif  // FLUTTER_LIB_GPU_SMOKETEST_H_
diff --git a/lib/gpu/texture.cc b/lib/gpu/texture.cc
new file mode 100644
index 0000000000000000000000000000000000000000..740e3dc51ae4410278b98ca9a580ecfc666fc750
--- /dev/null
+++ b/lib/gpu/texture.cc
@@ -0,0 +1,146 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/lib/gpu/texture.h"
+
+#include "flutter/lib/gpu/formats.h"
+#include "flutter/lib/ui/painting/image.h"
+#include "fml/mapping.h"
+#include "impeller/core/allocator.h"
+#include "impeller/core/formats.h"
+#include "impeller/core/texture.h"
+#include "impeller/display_list/dl_image_impeller.h"
+#include "third_party/tonic/typed_data/dart_byte_data.h"
+
+namespace flutter {
+namespace gpu {
+
+IMPLEMENT_WRAPPERTYPEINFO(flutter_gpu, Texture);
+
+Texture::Texture(std::shared_ptr<impeller::Texture> texture)
+    : texture_(std::move(texture)) {}
+
+Texture::~Texture() = default;
+
+std::shared_ptr<impeller::Texture> Texture::GetTexture() {
+  return texture_;
+}
+
+void Texture::SetCoordinateSystem(
+    impeller::TextureCoordinateSystem coordinate_system) {
+  texture_->SetCoordinateSystem(coordinate_system);
+}
+
+bool Texture::Overwrite(const tonic::DartByteData& source_bytes) {
+  const uint8_t* data = static_cast<const uint8_t*>(source_bytes.data());
+  auto copy = std::vector<uint8_t>(data, data + source_bytes.length_in_bytes());
+  // Texture::SetContents is a bit funky right now. It takes a shared_ptr of a
+  // mapping and we're forced to copy here.
+  auto mapping = std::make_shared<fml::DataMapping>(copy);
+  if (!texture_->SetContents(mapping)) {
+    return false;
+  }
+  return true;
+}
+
+size_t Texture::GetBytesPerTexel() {
+  return impeller::BytesPerPixelForPixelFormat(
+      texture_->GetTextureDescriptor().format);
+}
+
+Dart_Handle Texture::AsImage() const {
+  // DlImageImpeller isn't compiled in builds with Impeller disabled. If
+  // Impeller is disabled, it's impossible to get here anyhow, so just ifdef it
+  // out.
+#if IMPELLER_SUPPORTS_RENDERING
+  auto image = flutter::CanvasImage::Create();
+  auto dl_image = impeller::DlImageImpeller::Make(texture_);
+  image->set_image(dl_image);
+  auto wrapped = image->CreateOuterWrapping();
+  return wrapped;
+#else
+  return Dart_Null();
+#endif
+}
+
+}  // namespace gpu
+}  // namespace flutter
+
+//----------------------------------------------------------------------------
+/// Exports
+///
+
+bool InternalFlutterGpu_Texture_Initialize(Dart_Handle wrapper,
+                                           flutter::gpu::Context* gpu_context,
+                                           int storage_mode,
+                                           int format,
+                                           int width,
+                                           int height,
+                                           int sample_count,
+                                           int coordinate_system,
+                                           bool enable_render_target_usage,
+                                           bool enable_shader_read_usage,
+                                           bool enable_shader_write_usage) {
+  impeller::TextureDescriptor desc;
+  desc.storage_mode = flutter::gpu::ToImpellerStorageMode(storage_mode);
+  desc.size = {width, height};
+  desc.format = flutter::gpu::ToImpellerPixelFormat(format);
+  desc.usage = {};
+  if (enable_render_target_usage) {
+    desc.usage |= impeller::TextureUsage::kRenderTarget;
+  }
+  if (enable_shader_read_usage) {
+    desc.usage |= impeller::TextureUsage::kShaderRead;
+  }
+  if (enable_shader_write_usage) {
+    desc.usage |= impeller::TextureUsage::kShaderWrite;
+  }
+  switch (sample_count) {
+    case 1:
+      desc.type = impeller::TextureType::kTexture2D;
+      desc.sample_count = impeller::SampleCount::kCount1;
+      break;
+    case 4:
+      desc.type = impeller::TextureType::kTexture2DMultisample;
+      desc.sample_count = impeller::SampleCount::kCount4;
+      break;
+    default:
+      return false;
+  }
+  auto texture =
+      gpu_context->GetContext()->GetResourceAllocator()->CreateTexture(desc);
+  if (!texture) {
+    FML_LOG(ERROR) << "Failed to create texture.";
+    return false;
+  }
+
+  texture->SetCoordinateSystem(
+      flutter::gpu::ToImpellerTextureCoordinateSystem(coordinate_system));
+
+  auto res = fml::MakeRefCounted<flutter::gpu::Texture>(std::move(texture));
+  res->AssociateWithDartWrapper(wrapper);
+
+  return true;
+}
+
+void InternalFlutterGpu_Texture_SetCoordinateSystem(
+    flutter::gpu::Texture* wrapper,
+    int coordinate_system) {
+  return wrapper->SetCoordinateSystem(
+      flutter::gpu::ToImpellerTextureCoordinateSystem(coordinate_system));
+}
+
+bool InternalFlutterGpu_Texture_Overwrite(flutter::gpu::Texture* texture,
+                                          Dart_Handle source_byte_data) {
+  return texture->Overwrite(tonic::DartByteData(source_byte_data));
+}
+
+extern int InternalFlutterGpu_Texture_BytesPerTexel(
+    flutter::gpu::Texture* wrapper) {
+  return wrapper->GetBytesPerTexel();
+}
+
+Dart_Handle InternalFlutterGpu_Texture_AsImage(flutter::gpu::Texture* wrapper) {
+  return wrapper->AsImage();
+}
diff --git a/lib/gpu/texture.h b/lib/gpu/texture.h
new file mode 100644
index 0000000000000000000000000000000000000000..a08619b0b68341c4fd3ccab63533fbaba8d19383
--- /dev/null
+++ b/lib/gpu/texture.h
@@ -0,0 +1,84 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_LIB_GPU_TEXTURE_H_
+#define FLUTTER_LIB_GPU_TEXTURE_H_
+
+#include "flutter/lib/gpu/context.h"
+#include "flutter/lib/gpu/export.h"
+#include "flutter/lib/ui/dart_wrapper.h"
+#include "impeller/core/formats.h"
+#include "third_party/tonic/typed_data/dart_byte_data.h"
+
+namespace flutter {
+namespace gpu {
+
+class Texture : public RefCountedDartWrappable<Texture> {
+  DEFINE_WRAPPERTYPEINFO();
+  FML_FRIEND_MAKE_REF_COUNTED(Texture);
+
+ public:
+  explicit Texture(std::shared_ptr<impeller::Texture> texture);
+
+  ~Texture() override;
+
+  std::shared_ptr<impeller::Texture> GetTexture();
+
+  void SetCoordinateSystem(impeller::TextureCoordinateSystem coordinate_system);
+
+  bool Overwrite(const tonic::DartByteData& source_bytes);
+
+  size_t GetBytesPerTexel();
+
+  Dart_Handle AsImage() const;
+
+ private:
+  std::shared_ptr<impeller::Texture> texture_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(Texture);
+};
+
+}  // namespace gpu
+}  // namespace flutter
+
+//----------------------------------------------------------------------------
+/// Exports
+///
+
+extern "C" {
+
+FLUTTER_GPU_EXPORT
+extern bool InternalFlutterGpu_Texture_Initialize(
+    Dart_Handle wrapper,
+    flutter::gpu::Context* gpu_context,
+    int storage_mode,
+    int format,
+    int width,
+    int height,
+    int sample_count,
+    int coordinate_system,
+    bool enable_render_target_usage,
+    bool enable_shader_read_usage,
+    bool enable_shader_write_usage);
+
+FLUTTER_GPU_EXPORT
+extern void InternalFlutterGpu_Texture_SetCoordinateSystem(
+    flutter::gpu::Texture* wrapper,
+    int coordinate_system);
+
+FLUTTER_GPU_EXPORT
+extern bool InternalFlutterGpu_Texture_Overwrite(flutter::gpu::Texture* wrapper,
+                                                 Dart_Handle source_byte_data);
+
+FLUTTER_GPU_EXPORT
+extern int InternalFlutterGpu_Texture_BytesPerTexel(
+    flutter::gpu::Texture* wrapper);
+
+FLUTTER_GPU_EXPORT
+extern Dart_Handle InternalFlutterGpu_Texture_AsImage(
+    flutter::gpu::Texture* wrapper);
+
+}  // extern "C"
+
+#endif  // FLUTTER_LIB_GPU_TEXTURE_H_
diff --git a/lib/io/BUILD.gn b/lib/io/BUILD.gn
index 529872c30d23c4491647c1349dc2cacb2722a40b..8eaff8ff5c2eae63e9f83560187d3a93664eaf16 100644
--- a/lib/io/BUILD.gn
+++ b/lib/io/BUILD.gn
@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//flutter/build/dart/dart.gni")
+
 source_set("io") {
   sources = [
     "dart_io.cc",
@@ -9,13 +11,13 @@ source_set("io") {
   ]
 
   deps = [
+    "$dart_src/runtime:dart_api",
+    "$dart_src/runtime/bin:dart_io_api",
     "//flutter/fml",
     "//flutter/third_party/tonic",
-    "//third_party/dart/runtime:dart_api",
-    "//third_party/dart/runtime/bin:dart_io_api",
   ]
 
-  configs += [ "//third_party/dart/runtime:dart_config" ]
+  configs += [ "$dart_src/runtime:dart_config" ]
 
   public_configs = [ "//flutter:config" ]
 }
diff --git a/lib/snapshot/BUILD.gn b/lib/snapshot/BUILD.gn
index d8176bdf5151d41cabfaabd432bb02208274b1c0..270dc680f60c79fa1b9aa89a4024392a86dc8165 100644
--- a/lib/snapshot/BUILD.gn
+++ b/lib/snapshot/BUILD.gn
@@ -3,10 +3,15 @@
 # found in the LICENSE file.
 
 import("//build/compiled_action.gni")
-import("//build/fuchsia/sdk.gni")
+import("//flutter/build/bin_to_obj.gni")
 import("//flutter/common/config.gni")
+import("//flutter/impeller/tools/impeller.gni")
 import("//flutter/lib/ui/dart_ui.gni")
-import("//third_party/dart/utils/compile_platform.gni")
+import("$dart_src/utils/compile_platform.gni")
+
+if (is_fuchsia) {
+  import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
+}
 
 # Generates the Dart/Flutter core platform files and tools.
 #
@@ -35,10 +40,9 @@ group("generate_snapshot_bins") {
     deps += [ ":create_arm_gen_snapshot" ]
   }
 
-  # Build analyze_snapshot for for 64-bit target CPUs.
-  if (target_cpu == "x64" || target_cpu == "arm64") {
-    deps +=
-        [ "//third_party/dart/runtime/bin:analyze_snapshot($host_toolchain)" ]
+  # Build analyze_snapshot for 64-bit target CPUs.
+  if (host_os == "linux" && (target_cpu == "x64" || target_cpu == "arm64")) {
+    deps += [ "$dart_src/runtime/bin:analyze_snapshot($host_toolchain)" ]
   }
 }
 
@@ -63,10 +67,10 @@ compiled_action("generate_snapshot_bin") {
     # By default Dart will create a 32-bit gen_snapshot host binary if the target
     # platform is 32-bit.  Override this to create a 64-bit gen_snapshot for x86
     # targets because some host platforms may not support 32-bit binaries.
-    tool = "//third_party/dart/runtime/bin:gen_snapshot_host_targeting_host"
+    tool = "$dart_src/runtime/bin:gen_snapshot_host_targeting_host"
     toolchain = "//build/toolchain/$host_os:clang_x64"
   } else {
-    tool = "//third_party/dart/runtime/bin:gen_snapshot"
+    tool = "$dart_src/runtime/bin:gen_snapshot"
   }
 
   platform_kernel = "$root_out_dir/flutter_patched_sdk/platform_strong.dill"
@@ -109,103 +113,6 @@ compiled_action("generate_snapshot_bin") {
   }
 }
 
-# Generates an assembly file defining a given symbol with the bytes from a
-# binary file. Places the symbol in a text section if 'executable' is true,
-# otherwise places the symbol in a read-only data section.
-template("bin_to_assembly") {
-  assert(defined(invoker.deps), "Must define deps")
-  assert(defined(invoker.input), "Must define input binary file")
-  assert(defined(invoker.symbol), "Must define symbol name")
-  assert(defined(invoker.executable), "Must define boolean executable")
-
-  action(target_name) {
-    deps = invoker.deps
-    script = "//third_party/dart/runtime/tools/bin_to_assembly.py"
-    output = invoker.input + ".S"
-    args = [
-      "--input",
-      rebase_path(invoker.input),
-      "--output",
-      rebase_path(output),
-      "--symbol_name",
-      invoker.symbol,
-      "--target_os",
-      current_os,
-    ]
-    if (defined(invoker.size_symbol)) {
-      args += [
-        "--size_symbol_name",
-        invoker.size_symbol,
-        "--target_arch",
-        current_cpu,
-      ]
-    }
-    if (invoker.executable) {
-      args += [ "--executable" ]
-    }
-    inputs = [
-      script,
-      invoker.input,
-    ]
-    outputs = [ output ]
-  }
-}
-
-# Generates an object file defining a given symbol with the bytes from a
-# binary file. Places the symbol in the read-only data section.
-template("bin_to_coff") {
-  assert(defined(invoker.deps), "Must define deps")
-  assert(defined(invoker.input), "Must define input binary file")
-  assert(defined(invoker.symbol), "Must define symbol name")
-  assert(defined(invoker.executable), "Must define executable")
-
-  action(target_name) {
-    deps = invoker.deps
-    script = "//third_party/dart/runtime/tools/bin_to_coff.py"
-    output = invoker.input + ".o"
-    args = [
-      "--input",
-      rebase_path(invoker.input),
-      "--output",
-      rebase_path(output),
-      "--symbol_name",
-      invoker.symbol,
-    ]
-
-    if (defined(invoker.size_symbol)) {
-      args += [
-        "--size_symbol_name",
-        invoker.size_symbol,
-      ]
-    }
-
-    if (invoker.executable) {
-      args += [ "--executable" ]
-    }
-
-    args += [ "--arch=$current_cpu" ]
-    inputs = [ invoker.input ]
-    outputs = [ output ]
-  }
-}
-
-# Generates a linkable output file defining the specified symbol with the bytes
-# from the binary file. Emits a COFF object file when targeting Windows,
-# otherwise assembly.
-template("bin_to_linkable") {
-  assert(defined(invoker.deps), "Must define deps")
-  assert(defined(invoker.input), "Must define input binary file")
-  assert(defined(invoker.symbol), "Must define symbol name")
-  target_type = "bin_to_assembly"
-  if (is_win) {
-    target_type = "bin_to_coff"
-  }
-
-  target(target_type, target_name) {
-    forward_variables_from(invoker, "*")
-  }
-}
-
 bin_to_linkable("vm_snapshot_data_linkable") {
   deps = [ ":generate_snapshot_bin" ]
   input = "$target_gen_dir/vm_isolate_snapshot.bin"
@@ -254,9 +161,9 @@ if (host_os == "mac" && target_os != "mac" &&
   copy("create_arm_gen_snapshot") {
     # The toolchain-specific output directory. For cross-compiles, this is a
     # clang-x64 or clang-arm64 subdirectory of the top-level build directory.
-    host_output_dir = get_label_info(
-            "//third_party/dart/runtime/bin:gen_snapshot($host_toolchain)",
-            "root_out_dir")
+    host_output_dir =
+        get_label_info("$dart_src/runtime/bin:gen_snapshot($host_toolchain)",
+                       "root_out_dir")
 
     # Determine suffixed output gen_snapshot name.
     target_cpu_suffix = target_cpu
@@ -266,7 +173,7 @@ if (host_os == "mac" && target_os != "mac" &&
 
     sources = [ "${host_output_dir}/gen_snapshot" ]
     outputs = [ "${host_output_dir}/gen_snapshot_${target_cpu_suffix}" ]
-    deps = [ "//third_party/dart/runtime/bin:gen_snapshot($host_toolchain)" ]
+    deps = [ "$dart_src/runtime/bin:gen_snapshot($host_toolchain)" ]
     visibility = [ ":*" ]
   }
 }
@@ -282,16 +189,13 @@ if (host_os == "mac" && target_os == "mac") {
   copy("create_macos_gen_snapshots") {
     # The toolchain-specific output directory. For cross-compiles, this is a
     # clang-x64 or clang-arm64 subdirectory of the top-level build directory.
-    host_output_dir = get_label_info(
-            "//third_party/dart/runtime/bin:gen_snapshot($host_toolchain)",
-            "root_out_dir")
+    host_output_dir =
+        get_label_info("$dart_src/runtime/bin:gen_snapshot($host_toolchain)",
+                       "root_out_dir")
 
     sources = [ "${host_output_dir}/gen_snapshot" ]
     outputs = [ "${root_out_dir}/gen_snapshot_${target_cpu}" ]
-    deps = [ "//third_party/dart/runtime/bin:gen_snapshot($host_toolchain)" ]
-    metadata = {
-      snapshot_entitlement_file_path = [ "gen_snapshot_{$target_cpu}" ]
-    }
+    deps = [ "$dart_src/runtime/bin:gen_snapshot($host_toolchain)" ]
   }
 }
 
@@ -315,8 +219,13 @@ source_set("snapshot") {
 compile_platform("strong_platform") {
   single_root_scheme = "org-dartlang-sdk"
   single_root_base = rebase_path("../../../")
-  libraries_specification_uri =
-      "org-dartlang-sdk:///flutter/lib/snapshot/libraries.json"
+  if (impeller_enable_3d) {
+    libraries_specification_uri =
+        "org-dartlang-sdk:///flutter/lib/snapshot/libraries_experimental.json"
+  } else {
+    libraries_specification_uri =
+        "org-dartlang-sdk:///flutter/lib/snapshot/libraries.json"
+  }
 
   outputs = [
     "$root_out_dir/flutter_patched_sdk/platform_strong.dill",
diff --git a/lib/snapshot/libraries_experimental.json b/lib/snapshot/libraries_experimental.json
new file mode 100644
index 0000000000000000000000000000000000000000..08577acb38ace0cc51d9bb5b7c357159f5b94bc6
--- /dev/null
+++ b/lib/snapshot/libraries_experimental.json
@@ -0,0 +1,17 @@
+{
+    "comment:0": "NOTE: THIS FILE IS GENERATED. DO NOT EDIT.",
+    "comment:1": "Instead modify 'flutter/lib/snapshot/libraries.yaml' and follow the instructions therein.",
+    "flutter": {
+      "include": [
+        {
+          "path": "../../../third_party/dart/sdk/lib/libraries.json",
+          "target": "vm_common"
+        }
+      ],
+      "libraries": {
+        "ui": {
+          "uri": "../../lib/ui/experiments/ui.dart"
+        }
+      }
+    }
+  }
\ No newline at end of file
diff --git a/lib/snapshot/pubspec.yaml b/lib/snapshot/pubspec.yaml
index f9aaabf8801638cc2688056fdf711c23235ac1b3..0fa6a26f9ecaa6cb3b37b871605a11e91f7af1e1 100644
--- a/lib/snapshot/pubspec.yaml
+++ b/lib/snapshot/pubspec.yaml
@@ -5,4 +5,4 @@
 # This file is needed by Fuchsia's dart_library template.
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=3.2.0-0 <4.0.0'
diff --git a/lib/snapshot/snapshot.h b/lib/snapshot/snapshot.h
index 6a9ebfe4ea6e739cf0a65dcc2b9d1e17e7dfc8af..9938f9fc420261b41722605efea1bb94bb888531 100644
--- a/lib/snapshot/snapshot.h
+++ b/lib/snapshot/snapshot.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_LIB_SNAPSHOT_SNAPSHOT_H_
+#define FLUTTER_LIB_SNAPSHOT_SNAPSHOT_H_
+
 #include <inttypes.h>
 #include <stddef.h>
 #include <stdint.h>
@@ -12,3 +15,5 @@ extern const uint8_t kDartVmSnapshotInstructions[];
 extern const uint8_t kDartIsolateSnapshotData[];
 extern const uint8_t kDartIsolateSnapshotInstructions[];
 }
+
+#endif  // FLUTTER_LIB_SNAPSHOT_SNAPSHOT_H_
diff --git a/lib/ui/BUILD.gn b/lib/ui/BUILD.gn
index fff9b1cf7bc4ac61b0befe943a0ac1b9fa2a7cff..1d00f1dfeba50b47d73cecd195ae1988757f8347 100644
--- a/lib/ui/BUILD.gn
+++ b/lib/ui/BUILD.gn
@@ -2,12 +2,31 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/fuchsia/sdk.gni")
 import("//flutter/common/config.gni")
 import("//flutter/impeller/tools/impeller.gni")
+import("//flutter/shell/config.gni")
 import("//flutter/testing/testing.gni")
 
+if (is_fuchsia) {
+  import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
+}
+
 source_set("ui") {
+  cflags = [
+    # Dart gives us doubles. Skia and Impeller work in floats.
+    # If Dart gives us a double > FLT_MAX or < -FLT_MAX, implicit conversion
+    # will convert it to either inf/-inf or FLT_MAX/-FLT_MAX (undefined
+    # behavior). This can result in surprising and difficult to debug behavior
+    # for Flutter application developers, so it should be explicitly handled
+    # via SafeNarrow.
+    "-Wimplicit-float-conversion",
+  ]
+
+  if (is_win) {
+    # This causes build failures in third_party dependencies on Windows.
+    cflags += [ "-Wno-implicit-int-float-conversion" ]
+  }
+
   sources = [
     "compositing/scene.cc",
     "compositing/scene.h",
@@ -18,6 +37,7 @@ source_set("ui") {
     "dart_ui.cc",
     "dart_ui.h",
     "dart_wrapper.h",
+    "floating_point.h",
     "io_manager.cc",
     "io_manager.h",
     "isolate_name_server/isolate_name_server.cc",
@@ -59,6 +79,8 @@ source_set("ui") {
     "painting/image_filter.h",
     "painting/image_generator.cc",
     "painting/image_generator.h",
+    "painting/image_generator_apng.cc",
+    "painting/image_generator_apng.h",
     "painting/image_generator_registry.cc",
     "painting/image_generator_registry.h",
     "painting/image_shader.cc",
@@ -104,12 +126,10 @@ source_set("ui") {
     "text/asset_manager_font_provider.h",
     "text/font_collection.cc",
     "text/font_collection.h",
-    "text/line_metrics.h",
     "text/paragraph.cc",
     "text/paragraph.h",
     "text/paragraph_builder.cc",
     "text/paragraph_builder.h",
-    "text/text_box.h",
     "ui_dart_state.cc",
     "ui_dart_state.h",
     "volatile_path_tracker.cc",
@@ -120,6 +140,8 @@ source_set("ui") {
     "window/key_data_packet.h",
     "window/platform_configuration.cc",
     "window/platform_configuration.h",
+    "window/platform_isolate.cc",
+    "window/platform_isolate.h",
     "window/platform_message.cc",
     "window/platform_message.h",
     "window/platform_message_response.cc",
@@ -136,19 +158,20 @@ source_set("ui") {
     "window/pointer_data_packet_converter.h",
     "window/viewport_metrics.cc",
     "window/viewport_metrics.h",
-    "window/window.cc",
-    "window/window.h",
   ]
 
   public_configs = [ "//flutter:config" ]
 
   public_deps = [
     "//flutter/flow",
+    "//flutter/shell/common:display",
     "//flutter/shell/common:platform_message_handler",
+    "//flutter/skia/modules/skparagraph",
     "//flutter/third_party/txt",
   ]
 
   deps = [
+    "$dart_src/runtime/bin:dart_io_api",
     "//flutter/assets",
     "//flutter/common",
     "//flutter/common/graphics",
@@ -157,10 +180,10 @@ source_set("ui") {
     "//flutter/impeller/runtime_stage",
     "//flutter/runtime:dart_plugin_registrant",
     "//flutter/runtime:test_font",
+    "//flutter/skia",
+    "//flutter/third_party/rapidjson",
     "//flutter/third_party/tonic",
-    "//third_party/dart/runtime/bin:dart_io_api",
-    "//third_party/rapidjson",
-    "//third_party/skia",
+    "//third_party/zlib:zlib",
   ]
 
   if (impeller_supports_rendering) {
@@ -173,22 +196,30 @@ source_set("ui") {
       "painting/image_encoding_impeller.h",
     ]
 
-    deps += [ "//flutter/impeller" ]
+    deps += [
+      "//flutter/impeller",
+      "//flutter/impeller/display_list:skia_conversions",
+    ]
   }
 
   if (!defined(defines)) {
     defines = []
   }
-  if (flutter_enable_skshaper) {
-    defines += [ "FLUTTER_ENABLE_SKSHAPER" ]
-  }
-  if (flutter_always_use_skshaper) {
-    defines += [ "FLUTTER_ALWAYS_USE_SKSHAPER" ]
-  }
   if (is_win) {
     # Required for M_PI and others.
     defines += [ "_USE_MATH_DEFINES" ]
   }
+  if (impeller_enable_3d) {
+    defines += [ "IMPELLER_ENABLE_3D" ]
+    sources += [
+      "painting/scene/scene_node.cc",
+      "painting/scene/scene_node.h",
+      "painting/scene/scene_shader.cc",
+      "painting/scene/scene_shader.h",
+    ]
+
+    deps += [ "//flutter/impeller/scene" ]
+  }
 }
 
 if (enable_unittests) {
@@ -198,11 +229,15 @@ if (enable_unittests) {
     fixtures = [
       "fixtures/DashInNooglerHat.jpg",
       "fixtures/DashInNooglerHat%20WithSpace.jpg",
+      "fixtures/DisplayP3Logo.jpg",
+      "fixtures/DisplayP3Logo.png",
       "fixtures/Horizontal.jpg",
       "fixtures/Horizontal.png",
+      "fixtures/heart_end.png",
       "fixtures/hello_loop_2.gif",
       "fixtures/hello_loop_2.webp",
       "fixtures/FontManifest.json",
+      "fixtures/WideGamutIndexed.png",
       "//flutter/third_party/txt/third_party/fonts/Roboto-Medium.ttf",
     ]
   }
@@ -232,6 +267,8 @@ if (enable_unittests) {
     sources = [
       "compositing/scene_builder_unittests.cc",
       "hooks_unittests.cc",
+      "painting/image_decoder_no_gl_unittests.cc",
+      "painting/image_decoder_no_gl_unittests.h",
       "painting/image_dispose_unittests.cc",
       "painting/image_encoding_unittests.cc",
       "painting/image_generator_registry_unittests.cc",
@@ -249,18 +286,19 @@ if (enable_unittests) {
     deps = [
       ":ui",
       ":ui_unittests_fixtures",
+      "$dart_src/runtime/bin:elf_loader",
       "//flutter/common",
+      "//flutter/impeller",
       "//flutter/lib/snapshot",
       "//flutter/shell/common:shell_test_fixture_sources",
       "//flutter/testing",
       "//flutter/testing:dart",
       "//flutter/testing:fixture_test",
       "//flutter/third_party/tonic",
-      "//third_party/dart/runtime/bin:elf_loader",
     ]
 
     # TODO(https://github.com/flutter/flutter/issues/63837): This test is hard-coded to use a TestGLSurface so it cannot run on fuchsia.
-    if (!is_fuchsia) {
+    if (shell_enable_gl) {
       sources += [ "painting/image_decoder_unittests.cc" ]
 
       deps += [ "//flutter/testing:opengl" ]
diff --git a/lib/ui/analysis_options.yaml b/lib/ui/analysis_options.yaml
index df714af9891480c87593d873417f7d1bae361bed..e84ed2920e8f6d61f30a83d878a0bebee025ed61 100644
--- a/lib/ui/analysis_options.yaml
+++ b/lib/ui/analysis_options.yaml
@@ -4,3 +4,7 @@ analyzer:
   exclude:
     # fixtures/ depends on dart:ui and raises false positives.
     - fixtures/**
+
+linter:
+  rules:
+    unreachable_from_main: false # lint not compatible with how dart:ui is structured
diff --git a/lib/ui/annotations.dart b/lib/ui/annotations.dart
index 6722ba40070fe5432a7504061bd597d02c2867d6..5f7670d2fd5dbebdc47417484cf886d0ef12e61d 100644
--- a/lib/ui/annotations.dart
+++ b/lib/ui/annotations.dart
@@ -4,20 +4,20 @@
 
 part of dart.ui;
 
-// TODO(dnfield): Update this if/when we default this to on in the tool,
-// see: https://github.com/flutter/flutter/issues/52759
-/// Annotation used by Flutter's Dart compiler to indicate that an
-/// [Object.toString] override should not be replaced with a supercall.
-///
-/// Since `dart:ui` and `package:flutter` override `toString` purely for
-/// debugging purposes, the frontend compiler is instructed to replace all
-/// `toString` bodies with `return super.toString()` during compilation. This
-/// significantly reduces release code size, and would make it impossible to
-/// implement a meaningful override of `toString` for release mode without
-/// disabling the feature and losing the size savings. If a package uses this
-/// feature and has some unavoidable need to keep the `toString` implementation
-/// for a specific class, applying this annotation will direct the compiler
-/// to leave the method body as-is.
+/// Annotation to keep [Object.toString] overrides as-is instead of removing
+/// them for size optimization purposes.
+///
+/// For certain uris (currently `dart:ui` and `package:flutter`) the Dart
+/// compiler will remove [Object.toString] overrides from classes in
+/// profile/release mode to reduce code size.
+///
+/// Individual classes can opt out of this behavior via the following
+/// annotations:
+///
+///    * `@pragma('flutter:keep-to-string')`
+///    * `@pragma('flutter:keep-to-string-in-subtypes')`
+///
+/// See https://github.com/dart-lang/sdk/blob/main/runtime/docs/pragmas.md
 ///
 /// For example, in the following class the `toString` method will remain as
 /// `return _buffer.toString();`, even if the  `--delete-tostring-package-uri`
diff --git a/lib/ui/channel_buffers.dart b/lib/ui/channel_buffers.dart
index 84b7a90ae48f9cb9015b34e9ab86f202a1680015..4c0d16a6c5ffd25c636e838da9d4776f75a896da 100644
--- a/lib/ui/channel_buffers.dart
+++ b/lib/ui/channel_buffers.dart
@@ -6,13 +6,18 @@
 // KEEP THIS SYNCHRONIZED WITH ../web_ui/lib/channel_buffers.dart
 part of dart.ui;
 
+/// Deprecated. Migrate to [ChannelCallback] instead.
+///
 /// Signature for [ChannelBuffers.drain]'s `callback` argument.
 ///
 /// The first argument is the data sent by the plugin.
 ///
 /// The second argument is a closure that, when called, will send messages
 /// back to the plugin.
-// TODO(ianh): deprecate this once the framework is migrated to [ChannelCallback].
+@Deprecated(
+  'Migrate to ChannelCallback instead. '
+  'This feature was deprecated after v3.11.0-20.0.pre.',
+)
 typedef DrainChannelCallback = Future<void> Function(ByteData? data, PlatformMessageResponseCallback callback);
 
 /// Signature for [ChannelBuffers.setListener]'s `callback` argument.
@@ -238,6 +243,14 @@ class _Channel {
 /// Typically these buffers are drained once a callback is set up on
 /// the [BinaryMessenger] in the Flutter framework. (See [setListener].)
 ///
+/// ## Channel names
+///
+/// By convention, channels are normally named with a reverse-DNS prefix, a
+/// slash, and then a domain-specific name. For example, `com.example/demo`.
+///
+/// Channel names cannot contain the U+0000 NULL character, because they
+/// are passed through APIs that use null-terminated strings.
+///
 /// ## Buffer capacity and overflow
 ///
 /// Each channel has a finite buffer capacity and messages will
@@ -260,7 +273,7 @@ class _Channel {
 /// size a plugin can send a message using the control channel,
 /// as described below.
 ///
-/// Size 0 is appropriate for channels where channels sent before
+/// Size 0 is appropriate for channels where messages sent before
 /// the engine and framework are ready should be ignored. For
 /// example, a plugin that notifies the framework any time a
 /// radiation sensor detects an ionization event might set its size
@@ -321,7 +334,11 @@ class ChannelBuffers {
   /// If a message overflows the channel, and the channel has not been
   /// configured to expect overflow, then, in debug mode, a message
   /// will be printed to the console warning about the overflow.
+  ///
+  /// Channel names cannot contain the U+0000 NULL character, because they
+  /// are passed through APIs that use null-terminated strings.
   void push(String name, ByteData? data, PlatformMessageResponseCallback callback) {
+    assert(!name.contains('\u0000'), 'Channel names must not contain U+0000 NULL characters.');
     final _Channel channel = _channels.putIfAbsent(name, () => _Channel());
     if (channel.push(_StoredMessage(data, callback))) {
       _printDebug(
@@ -330,7 +347,8 @@ class ChannelBuffers {
         'framework has had an opportunity to register a listener. See the ChannelBuffers '
         'API documentation for details on how to configure the channel to expect more '
         'messages, or to expect messages to get discarded:\n'
-        '  https://api.flutter.dev/flutter/dart-ui/ChannelBuffers-class.html'
+        '  https://api.flutter.dev/flutter/dart-ui/ChannelBuffers-class.html\n'
+        'The capacity of the $name channel is ${channel._capacity} message${channel._capacity != 1 ? 's' : ''}.',
       );
     }
   }
@@ -359,8 +377,10 @@ class ChannelBuffers {
   ///
   /// The draining stops if the listener is removed.
   void setListener(String name, ChannelCallback callback) {
+    assert(!name.contains('\u0000'), 'Channel names must not contain U+0000 NULL characters.');
     final _Channel channel = _channels.putIfAbsent(name, () => _Channel());
     channel.setListener(callback);
+    sendChannelUpdate(name, listening: true);
   }
 
   /// Clears the listener for the specified channel.
@@ -373,9 +393,17 @@ class ChannelBuffers {
     final _Channel? channel = _channels[name];
     if (channel != null) {
       channel.clearListener();
+      sendChannelUpdate(name, listening: false);
     }
   }
 
+  @Native<Void Function(Handle, Bool)>(symbol: 'PlatformConfigurationNativeApi::SendChannelUpdate')
+  external static void _sendChannelUpdate(String name, bool listening);
+
+  void sendChannelUpdate(String name, {required bool listening}) => _sendChannelUpdate(name, listening);
+
+  /// Deprecated. Migrate to [setListener] instead.
+  ///
   /// Remove and process all stored messages for a given channel.
   ///
   /// This should be called once a channel is prepared to handle messages
@@ -383,7 +411,10 @@ class ChannelBuffers {
   ///
   /// The messages are processed by calling the given `callback`. Each message
   /// is processed in its own microtask.
-  // TODO(ianh): deprecate once framework uses [setListener].
+  @Deprecated(
+    'Migrate to setListener instead. '
+    'This feature was deprecated after v3.11.0-20.0.pre.',
+  )
   Future<void> drain(String name, DrainChannelCallback callback) async {
     final _Channel? channel = _channels[name];
     while (channel != null && !channel._queue.isEmpty) {
@@ -405,8 +436,9 @@ class ChannelBuffers {
   /// ## `resize`
   ///
   /// The `resize` method takes as its argument a list with two values, first
-  /// the channel name (a UTF-8 string less than 254 bytes long), and second the
-  /// allowed size of the channel buffer (an integer between 0 and 2147483647).
+  /// the channel name (a UTF-8 string less than 254 bytes long and not
+  /// containing any null bytes), and second the allowed size of the channel
+  /// buffer (an integer between 0 and 2147483647).
   ///
   /// Upon receiving the message, the channel's buffer is resized. If necessary,
   /// messages are silently discarded to ensure the buffer is no bigger than
@@ -422,8 +454,9 @@ class ChannelBuffers {
   /// ## `overflow`
   ///
   /// The `overflow` method takes as its argument a list with two values, first
-  /// the channel name (a UTF-8 string less than 254 bytes long), and second a
-  /// boolean which is true if overflow is expected and false if it is not.
+  /// the channel name (a UTF-8 string less than 254 bytes long and not
+  /// containing any null bytes), and second a boolean which is true if overflow
+  /// is expected and false if it is not.
   ///
   /// This sets a flag on the channel in debug mode. In release mode the message
   /// is silently ignored. The flag indicates whether overflow is expected on this
@@ -462,13 +495,15 @@ class ChannelBuffers {
           }
           index += 1;
           final String channelName = utf8.decode(bytes.sublist(index, index + channelNameLength));
+          if (channelName.contains('\u0000')) {
+            throw Exception("Invalid arguments for 'resize' method sent to $kControlChannelName (channel name must not contain any null bytes)");
+          }
           index += channelNameLength;
           if (bytes[index] != 0x03) { // 3 = value code for uint32
             throw Exception("Invalid arguments for 'resize' method sent to $kControlChannelName (second argument must be an integer in the range 0 to 2147483647)");
           }
           index += 1;
           resize(channelName, data.getUint32(index, Endian.host));
-          break;
         case 'overflow':
           if (bytes[index] != 0x0C) { // 12 = value code for list
             throw Exception("Invalid arguments for 'overflow' method sent to $kControlChannelName (arguments must be a two-element list, channel name and flag state)");
@@ -493,7 +528,6 @@ class ChannelBuffers {
             throw Exception("Invalid arguments for 'overflow' method sent to $kControlChannelName (second argument must be a boolean)");
           }
           allowOverflow(channelName, bytes[index] == 0x01);
-          break;
         default:
           throw Exception("Unrecognized method '$methodName' sent to $kControlChannelName");
       }
@@ -524,6 +558,7 @@ class ChannelBuffers {
   void resize(String name, int newSize) {
     _Channel? channel = _channels[name];
     if (channel == null) {
+      assert(!name.contains('\u0000'), 'Channel names must not contain U+0000 NULL characters.');
       channel = _Channel(newSize);
       _channels[name] = channel;
     } else {
@@ -547,6 +582,7 @@ class ChannelBuffers {
     assert(() {
       _Channel? channel = _channels[name];
       if (channel == null && allowed) {
+        assert(!name.contains('\u0000'), 'Channel names must not contain U+0000 NULL characters.');
         channel = _Channel();
         _channels[name] = channel;
       }
diff --git a/lib/ui/compositing.dart b/lib/ui/compositing.dart
index b039e67ff10301d53f331357b87654dc1040b3b7..8fdec02dc90e46d4526efbde8709a00b72a47b52 100644
--- a/lib/ui/compositing.dart
+++ b/lib/ui/compositing.dart
@@ -9,18 +9,40 @@ part of dart.ui;
 ///
 /// Scene objects can be displayed on the screen using the [FlutterView.render]
 /// method.
+abstract class Scene {
+  /// Synchronously creates a handle to an image from this scene.
+  ///
+  /// {@macro dart.ui.painting.Picture.toImageSync}
+  Image toImageSync(int width, int height);
+
+  /// Creates a raster image representation of the current state of the scene.
+  ///
+  /// This is a slow operation that is performed on a background thread.
+  ///
+  /// Callers must dispose the [Image] when they are done with it. If the result
+  /// will be shared with other methods or classes, [Image.clone] should be used
+  /// and each handle created must be disposed.
+  Future<Image> toImage(int width, int height);
+
+  /// Releases the resources used by this scene.
+  ///
+  /// After calling this function, the scene is cannot be used further.
+  ///
+  /// This can't be a leaf call because the native function calls Dart API
+  /// (Dart_SetNativeInstanceField).
+  void dispose();
+}
+
 @pragma('vm:entry-point')
-class Scene extends NativeFieldWrapperClass1 {
+base class _NativeScene extends NativeFieldWrapperClass1 implements Scene {
   /// This class is created by the engine, and should not be instantiated
   /// or extended directly.
   ///
   /// To create a Scene object, use a [SceneBuilder].
   @pragma('vm:entry-point')
-  Scene._();
+  _NativeScene._();
 
-  /// Synchronously creates a handle to an image from this scene.
-  ///
-  /// {@macro dart.ui.painting.Picture.toImageSync}
+  @override
   Image toImageSync(int width, int height) {
     if (width <= 0 || height <= 0) {
       throw Exception('Invalid image dimensions.');
@@ -34,16 +56,10 @@ class Scene extends NativeFieldWrapperClass1 {
     return Image._(image, image.width, image.height);
   }
 
-  @FfiNative<Handle Function(Pointer<Void>, Uint32, Uint32, Handle)>('Scene::toImageSync')
+  @Native<Handle Function(Pointer<Void>, Uint32, Uint32, Handle)>(symbol: 'Scene::toImageSync')
   external String? _toImageSync(int width, int height, _Image outImage);
 
-  /// Creates a raster image representation of the current state of the scene.
-  ///
-  /// This is a slow operation that is performed on a background thread.
-  ///
-  /// Callers must dispose the [Image] when they are done with it. If the result
-  /// will be shared with other methods or classes, [Image.clone] should be used
-  /// and each handle created must be disposed.
+  @override
   Future<Image> toImage(int width, int height) {
     if (width <= 0 || height <= 0) {
       throw Exception('Invalid image dimensions.');
@@ -58,17 +74,15 @@ class Scene extends NativeFieldWrapperClass1 {
     );
   }
 
-  @FfiNative<Handle Function(Pointer<Void>, Uint32, Uint32, Handle)>('Scene::toImage')
+  @Native<Handle Function(Pointer<Void>, Uint32, Uint32, Handle)>(symbol: 'Scene::toImage')
   external String? _toImage(int width, int height, _Callback<_Image?> callback);
 
-  /// Releases the resources used by this scene.
-  ///
-  /// After calling this function, the scene is cannot be used further.
-  ///
-  /// This can't be a leaf call because the native function calls Dart API
-  /// (Dart_SetNativeInstanceField).
-  @FfiNative<Void Function(Pointer<Void>)>('Scene::dispose')
+  @override
+  @Native<Void Function(Pointer<Void>)>(symbol: 'Scene::dispose')
   external void dispose();
+
+  @override
+  String toString() => 'Scene';
 }
 
 // Lightweight wrapper of a native layer object.
@@ -212,15 +226,6 @@ class ShaderMaskEngineLayer extends _EngineLayerWrapper {
   ShaderMaskEngineLayer._(super.nativeLayer) : super._();
 }
 
-/// An opaque handle to a physical shape engine layer.
-///
-/// Instances of this class are created by [SceneBuilder.pushPhysicalShape].
-///
-/// {@macro dart.ui.sceneBuilder.oldLayerCompatibility}
-class PhysicalShapeEngineLayer extends _EngineLayerWrapper {
-  PhysicalShapeEngineLayer._(super.nativeLayer) : super._();
-}
-
 /// Builds a [Scene] containing the given visuals.
 ///
 /// A [Scene] can then be rendered using [FlutterView.render].
@@ -228,68 +233,8 @@ class PhysicalShapeEngineLayer extends _EngineLayerWrapper {
 /// To draw graphical operations onto a [Scene], first create a
 /// [Picture] using a [PictureRecorder] and a [Canvas], and then add
 /// it to the scene using [addPicture].
-class SceneBuilder extends NativeFieldWrapperClass1 {
-  /// Creates an empty [SceneBuilder] object.
-  @pragma('vm:entry-point')
-  SceneBuilder() {
-    _constructor();
-  }
-
-  @FfiNative<Void Function(Handle)>('SceneBuilder::Create')
-  external void _constructor();
-
-  // Layers used in this scene.
-  //
-  // The key is the layer used. The value is the description of what the layer
-  // is used for, e.g. "pushOpacity" or "addRetained".
-  final Map<EngineLayer, String> _usedLayers = <EngineLayer, String>{};
-
-  // In debug mode checks that the `layer` is only used once in a given scene.
-  bool _debugCheckUsedOnce(EngineLayer layer, String usage) {
-    assert(() {
-      assert(
-          !_usedLayers.containsKey(layer),
-          'Layer ${layer.runtimeType} already used.\n'
-          'The layer is already being used as ${_usedLayers[layer]} in this scene.\n'
-          'A layer may only be used once in a given scene.');
-
-      _usedLayers[layer] = usage;
-      return true;
-    }());
-
-    return true;
-  }
-
-  bool _debugCheckCanBeUsedAsOldLayer(_EngineLayerWrapper? layer, String methodName) {
-    assert(() {
-      if (layer == null) {
-        return true;
-      }
-      assert(layer._nativeLayer != null, 'Object disposed');
-      layer._debugCheckNotUsedAsOldLayer();
-      assert(_debugCheckUsedOnce(layer, 'oldLayer in $methodName'));
-      layer._debugWasUsedAsOldLayer = true;
-      return true;
-    }());
-    return true;
-  }
-
-  final List<_EngineLayerWrapper> _layerStack = <_EngineLayerWrapper>[];
-
-  // Pushes the `newLayer` onto the `_layerStack` and adds it to the
-  // `_debugChildren` of the current layer in the stack, if any.
-  bool _debugPushLayer(_EngineLayerWrapper newLayer) {
-    assert(() {
-      if (_layerStack.isNotEmpty) {
-        final _EngineLayerWrapper currentLayer = _layerStack.last;
-        currentLayer._debugChildren ??= <_EngineLayerWrapper>[];
-        currentLayer._debugChildren!.add(newLayer);
-      }
-      _layerStack.add(newLayer);
-      return true;
-    }());
-    return true;
-  }
+abstract class SceneBuilder {
+  factory SceneBuilder() = _NativeSceneBuilder;
 
   /// Pushes a transform operation onto the operation stack.
   ///
@@ -322,18 +267,7 @@ class SceneBuilder extends NativeFieldWrapperClass1 {
   TransformEngineLayer pushTransform(
     Float64List matrix4, {
     TransformEngineLayer? oldLayer,
-  }) {
-    assert(_matrix4IsValid(matrix4));
-    assert(_debugCheckCanBeUsedAsOldLayer(oldLayer, 'pushTransform'));
-    final EngineLayer engineLayer = EngineLayer._();
-    _pushTransform(engineLayer, matrix4, oldLayer?._nativeLayer);
-    final TransformEngineLayer layer = TransformEngineLayer._(engineLayer);
-    assert(_debugPushLayer(layer));
-    return layer;
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Handle, Handle, Handle)>('SceneBuilder::pushTransformHandle')
-  external void _pushTransform(EngineLayer layer, Float64List matrix4, EngineLayer? oldLayer);
+  });
 
   /// Pushes an offset operation onto the operation stack.
   ///
@@ -348,17 +282,7 @@ class SceneBuilder extends NativeFieldWrapperClass1 {
     double dx,
     double dy, {
     OffsetEngineLayer? oldLayer,
-  }) {
-    assert(_debugCheckCanBeUsedAsOldLayer(oldLayer, 'pushOffset'));
-    final EngineLayer engineLayer = EngineLayer._();
-    _pushOffset(engineLayer, dx, dy, oldLayer?._nativeLayer);
-    final OffsetEngineLayer layer = OffsetEngineLayer._(engineLayer);
-    assert(_debugPushLayer(layer));
-    return layer;
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Handle, Double, Double, Handle)>('SceneBuilder::pushOffset')
-  external void _pushOffset(EngineLayer layer, double dx, double dy, EngineLayer? oldLayer);
+  });
 
   /// Pushes a rectangular clip operation onto the operation stack.
   ///
@@ -374,27 +298,7 @@ class SceneBuilder extends NativeFieldWrapperClass1 {
     Rect rect, {
     Clip clipBehavior = Clip.antiAlias,
     ClipRectEngineLayer? oldLayer,
-  }) {
-    assert(clipBehavior != null);
-    assert(clipBehavior != Clip.none);
-    assert(_debugCheckCanBeUsedAsOldLayer(oldLayer, 'pushClipRect'));
-    final EngineLayer engineLayer = EngineLayer._();
-    _pushClipRect(engineLayer, rect.left, rect.right, rect.top, rect.bottom, clipBehavior.index,
-        oldLayer?._nativeLayer);
-    final ClipRectEngineLayer layer = ClipRectEngineLayer._(engineLayer);
-    assert(_debugPushLayer(layer));
-    return layer;
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Handle, Double, Double, Double, Double, Int32, Handle)>('SceneBuilder::pushClipRect')
-  external void _pushClipRect(
-      EngineLayer outEngineLayer,
-      double left,
-      double right,
-      double top,
-      double bottom,
-      int clipBehavior,
-      EngineLayer? oldLayer);
+  });
 
   /// Pushes a rounded-rectangular clip operation onto the operation stack.
   ///
@@ -410,19 +314,7 @@ class SceneBuilder extends NativeFieldWrapperClass1 {
     RRect rrect, {
     Clip clipBehavior = Clip.antiAlias,
     ClipRRectEngineLayer? oldLayer,
-  }) {
-    assert(clipBehavior != null);
-    assert(clipBehavior != Clip.none);
-    assert(_debugCheckCanBeUsedAsOldLayer(oldLayer, 'pushClipRRect'));
-    final EngineLayer engineLayer = EngineLayer._();
-    _pushClipRRect(engineLayer, rrect._getValue32(), clipBehavior.index, oldLayer?._nativeLayer);
-    final ClipRRectEngineLayer layer = ClipRRectEngineLayer._(engineLayer);
-    assert(_debugPushLayer(layer));
-    return layer;
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Handle, Handle, Int32, Handle)>('SceneBuilder::pushClipRRect')
-  external void _pushClipRRect(EngineLayer layer, Float32List rrect, int clipBehavior, EngineLayer? oldLayer);
+  });
 
   /// Pushes a path clip operation onto the operation stack.
   ///
@@ -438,19 +330,7 @@ class SceneBuilder extends NativeFieldWrapperClass1 {
     Path path, {
     Clip clipBehavior = Clip.antiAlias,
     ClipPathEngineLayer? oldLayer,
-  }) {
-    assert(clipBehavior != null);
-    assert(clipBehavior != Clip.none);
-    assert(_debugCheckCanBeUsedAsOldLayer(oldLayer, 'pushClipPath'));
-    final EngineLayer engineLayer = EngineLayer._();
-    _pushClipPath(engineLayer, path, clipBehavior.index, oldLayer?._nativeLayer);
-    final ClipPathEngineLayer layer = ClipPathEngineLayer._(engineLayer);
-    assert(_debugPushLayer(layer));
-    return layer;
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Handle, Pointer<Void>, Int32, Handle)>('SceneBuilder::pushClipPath')
-  external void _pushClipPath(EngineLayer layer, Path path, int clipBehavior, EngineLayer? oldLayer);
+  });
 
   /// Pushes an opacity operation onto the operation stack.
   ///
@@ -468,17 +348,7 @@ class SceneBuilder extends NativeFieldWrapperClass1 {
     int alpha, {
     Offset? offset = Offset.zero,
     OpacityEngineLayer? oldLayer,
-  }) {
-    assert(_debugCheckCanBeUsedAsOldLayer(oldLayer, 'pushOpacity'));
-    final EngineLayer engineLayer = EngineLayer._();
-    _pushOpacity(engineLayer, alpha, offset!.dx, offset.dy, oldLayer?._nativeLayer);
-    final OpacityEngineLayer layer = OpacityEngineLayer._(engineLayer);
-    assert(_debugPushLayer(layer));
-    return layer;
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Handle, Int32, Double, Double, Handle)>('SceneBuilder::pushOpacity')
-  external void _pushOpacity(EngineLayer layer, int alpha, double dx, double dy, EngineLayer? oldLayer);
+  });
 
   /// Pushes a color filter operation onto the operation stack.
   ///
@@ -493,20 +363,7 @@ class SceneBuilder extends NativeFieldWrapperClass1 {
   ColorFilterEngineLayer pushColorFilter(
     ColorFilter filter, {
     ColorFilterEngineLayer? oldLayer,
-  }) {
-    assert(filter != null);
-    assert(_debugCheckCanBeUsedAsOldLayer(oldLayer, 'pushColorFilter'));
-    final _ColorFilter nativeFilter = filter._toNativeColorFilter()!;
-    assert(nativeFilter != null);
-    final EngineLayer engineLayer = EngineLayer._();
-    _pushColorFilter(engineLayer, nativeFilter, oldLayer?._nativeLayer);
-    final ColorFilterEngineLayer layer = ColorFilterEngineLayer._(engineLayer);
-    assert(_debugPushLayer(layer));
-    return layer;
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Handle, Pointer<Void>, Handle)>('SceneBuilder::pushColorFilter')
-  external void _pushColorFilter(EngineLayer layer, _ColorFilter filter, EngineLayer? oldLayer);
+  });
 
   /// Pushes an image filter operation onto the operation stack.
   ///
@@ -522,20 +379,7 @@ class SceneBuilder extends NativeFieldWrapperClass1 {
     ImageFilter filter, {
     Offset offset = Offset.zero,
     ImageFilterEngineLayer? oldLayer,
-  }) {
-    assert(filter != null);
-    assert(_debugCheckCanBeUsedAsOldLayer(oldLayer, 'pushImageFilter'));
-    final _ImageFilter nativeFilter = filter._toNativeImageFilter();
-    assert(nativeFilter != null);
-    final EngineLayer engineLayer = EngineLayer._();
-    _pushImageFilter(engineLayer, nativeFilter, offset.dx, offset.dy, oldLayer?._nativeLayer);
-    final ImageFilterEngineLayer layer = ImageFilterEngineLayer._(engineLayer);
-    assert(_debugPushLayer(layer));
-    return layer;
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Handle, Pointer<Void>, Double, Double, Handle)>('SceneBuilder::pushImageFilter')
-  external void _pushImageFilter(EngineLayer outEngineLayer, _ImageFilter filter, double dx, double dy, EngineLayer? oldLayer);
+  });
 
   /// Pushes a backdrop filter operation onto the operation stack.
   ///
@@ -552,17 +396,7 @@ class SceneBuilder extends NativeFieldWrapperClass1 {
     ImageFilter filter, {
     BlendMode blendMode = BlendMode.srcOver,
     BackdropFilterEngineLayer? oldLayer,
-  }) {
-    assert(_debugCheckCanBeUsedAsOldLayer(oldLayer, 'pushBackdropFilter'));
-    final EngineLayer engineLayer = EngineLayer._();
-    _pushBackdropFilter(engineLayer, filter._toNativeImageFilter(), blendMode.index, oldLayer?._nativeLayer);
-    final BackdropFilterEngineLayer layer = BackdropFilterEngineLayer._(engineLayer);
-    assert(_debugPushLayer(layer));
-    return layer;
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Handle, Pointer<Void>, Int32, Handle)>('SceneBuilder::pushBackdropFilter')
-  external void _pushBackdropFilter(EngineLayer outEngineLayer, _ImageFilter filter, int blendMode, EngineLayer? oldLayer);
+  });
 
   /// Pushes a shader mask operation onto the operation stack.
   ///
@@ -580,84 +414,7 @@ class SceneBuilder extends NativeFieldWrapperClass1 {
     BlendMode blendMode, {
     ShaderMaskEngineLayer? oldLayer,
     FilterQuality filterQuality = FilterQuality.low,
-  }) {
-    assert(_debugCheckCanBeUsedAsOldLayer(oldLayer, 'pushShaderMask'));
-    final EngineLayer engineLayer = EngineLayer._();
-    _pushShaderMask(
-      engineLayer,
-      shader,
-      maskRect.left,
-      maskRect.right,
-      maskRect.top,
-      maskRect.bottom,
-      blendMode.index,
-      filterQuality.index,
-      oldLayer?._nativeLayer,
-    );
-    final ShaderMaskEngineLayer layer = ShaderMaskEngineLayer._(engineLayer);
-    assert(_debugPushLayer(layer));
-    return layer;
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Handle, Pointer<Void>, Double, Double, Double, Double, Int32, Int32, Handle)>(
-      'SceneBuilder::pushShaderMask')
-  external void _pushShaderMask(
-      EngineLayer engineLayer,
-      Shader shader,
-      double maskRectLeft,
-      double maskRectRight,
-      double maskRectTop,
-      double maskRectBottom,
-      int blendMode,
-      int filterQualityIndex,
-      EngineLayer? oldLayer);
-
-  /// Pushes a physical layer operation for an arbitrary shape onto the
-  /// operation stack.
-  ///
-  /// By default, the layer's content will not be clipped (clip = [Clip.none]).
-  /// If clip equals [Clip.hardEdge], [Clip.antiAlias], or [Clip.antiAliasWithSaveLayer],
-  /// then the content is clipped to the given shape defined by [path].
-  ///
-  /// If [elevation] is greater than 0.0, then a shadow is drawn around the layer.
-  /// [shadowColor] defines the color of the shadow if present and [color] defines the
-  /// color of the layer background.
-  ///
-  /// {@macro dart.ui.sceneBuilder.oldLayer}
-  ///
-  /// {@macro dart.ui.sceneBuilder.oldLayerVsRetained}
-  ///
-  /// See [pop] for details about the operation stack, and [Clip] for different clip modes.
-  @Deprecated(
-    'Use a clip and canvas operations directly (See RenderPhysicalModel). '
-    'This feature was deprecated after v3.1.0-0.0.pre.',
-  )
-  PhysicalShapeEngineLayer pushPhysicalShape({
-    required Path path,
-    required double elevation,
-    required Color color,
-    Color? shadowColor,
-    Clip clipBehavior = Clip.none,
-    PhysicalShapeEngineLayer? oldLayer,
-  }) {
-    assert(_debugCheckCanBeUsedAsOldLayer(oldLayer, 'pushPhysicalShape'));
-    final EngineLayer engineLayer = EngineLayer._();
-    _pushPhysicalShape(engineLayer, path, elevation, color.value, shadowColor?.value ?? 0xFF000000,
-        clipBehavior.index, oldLayer?._nativeLayer);
-    final PhysicalShapeEngineLayer layer = PhysicalShapeEngineLayer._(engineLayer);
-    assert(_debugPushLayer(layer));
-    return layer;
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Handle, Pointer<Void>, Double, Int32, Int32, Int32, Handle)>('SceneBuilder::pushPhysicalShape')
-  external void _pushPhysicalShape(
-      EngineLayer outEngineLayer,
-      Path path,
-      double elevation,
-      int color,
-      int shadowColor,
-      int clipBehavior,
-      EngineLayer? oldLayer);
+  });
 
   /// Ends the effect of the most recently pushed operation.
   ///
@@ -665,15 +422,7 @@ class SceneBuilder extends NativeFieldWrapperClass1 {
   /// operations in the stack applies to each of the objects added to the scene.
   /// Calling this function removes the most recently added operation from the
   /// stack.
-  void pop() {
-    if (_layerStack.isNotEmpty) {
-      _layerStack.removeLast();
-    }
-    _pop();
-  }
-
-  @FfiNative<Void Function(Pointer<Void>)>('SceneBuilder::pop', isLeaf: true)
-  external void _pop();
+  void pop();
 
   /// Add a retained engine layer subtree from previous frames.
   ///
@@ -685,35 +434,7 @@ class SceneBuilder extends NativeFieldWrapperClass1 {
   /// no need to call [Layer.addToScene] for its children layers.
   ///
   /// {@macro dart.ui.sceneBuilder.oldLayerVsRetained}
-  void addRetained(EngineLayer retainedLayer) {
-    assert(retainedLayer is _EngineLayerWrapper);
-    assert(() {
-      final _EngineLayerWrapper layer = retainedLayer as _EngineLayerWrapper;
-
-      assert(layer._nativeLayer != null);
-
-      void recursivelyCheckChildrenUsedOnce(_EngineLayerWrapper parentLayer) {
-        _debugCheckUsedOnce(parentLayer, 'retained layer');
-        parentLayer._debugCheckNotUsedAsOldLayer();
-
-        final List<_EngineLayerWrapper>? children = parentLayer._debugChildren;
-        if (children == null || children.isEmpty) {
-          return;
-        }
-        children.forEach(recursivelyCheckChildrenUsedOnce);
-      }
-
-      recursivelyCheckChildrenUsedOnce(layer);
-
-      return true;
-    }());
-
-    final _EngineLayerWrapper wrapper = retainedLayer as _EngineLayerWrapper;
-    _addRetained(wrapper._nativeLayer!);
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Handle)>('SceneBuilder::addRetained')
-  external void _addRetained(EngineLayer retainedLayer);
+  void addRetained(EngineLayer retainedLayer);
 
   /// Adds an object to the scene that displays performance statistics.
   ///
@@ -739,29 +460,35 @@ class SceneBuilder extends NativeFieldWrapperClass1 {
   /// See also the [PerformanceOverlayOption] enum in the rendering library.
   /// for more details.
   // Values above must match constants in //engine/src/sky/compositor/performance_overlay_layer.h
-  void addPerformanceOverlay(int enabledOptions, Rect bounds) {
-    _addPerformanceOverlay(enabledOptions, bounds.left, bounds.right, bounds.top, bounds.bottom);
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Uint64, Double, Double, Double, Double)>('SceneBuilder::addPerformanceOverlay', isLeaf: true)
-  external void _addPerformanceOverlay(int enabledOptions, double left, double right, double top, double bottom);
+  void addPerformanceOverlay(int enabledOptions, Rect bounds);
 
   /// Adds a [Picture] to the scene.
   ///
-  /// The picture is rasterized at the given offset.
+  /// The picture is rasterized at the given `offset`.
+  ///
+  /// The rendering _may_ be cached to reduce the cost of painting the picture
+  /// if it is reused in subsequent frames. Whether a picture is cached or not
+  /// depends on the backend implementation. When caching is considered, the
+  /// choice to cache or not cache is a heuristic based on how often the picture
+  /// is being painted and the cost of painting the picture. To disable this
+  /// caching, set `willChangeHint` to true. To force the caching to happen (in
+  /// backends that do caching), set `isComplexHint` to true. When both are set,
+  /// `willChangeHint` prevails.
+  ///
+  /// In general, setting these hints is not very useful. Backends that cache
+  /// pictures only do so for pictures that have been rendered three times
+  /// already; setting `willChangeHint` to true to avoid caching an animating
+  /// picture that changes every frame is therefore redundant, the picture
+  /// wouldn't have been cached anyway. Similarly, backends that cache pictures
+  /// are relatively aggressive about doing so, such that any image complicated
+  /// enough to warrant caching is probably already being cached even without
+  /// `isComplexHint` being set to true.
   void addPicture(
     Offset offset,
     Picture picture, {
     bool isComplexHint = false,
     bool willChangeHint = false,
-  }) {
-    assert(!picture.debugDisposed);
-    final int hints = (isComplexHint ? 1 : 0) | (willChangeHint ? 2 : 0);
-    _addPicture(offset.dx, offset.dy, picture, hints);
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Double, Double, Pointer<Void>, Int32)>('SceneBuilder::addPicture')
-  external void _addPicture(double dx, double dy, Picture picture, int hints);
+  });
 
   /// Adds a backend texture to the scene.
   ///
@@ -781,13 +508,7 @@ class SceneBuilder extends NativeFieldWrapperClass1 {
     double height = 0.0,
     bool freeze = false,
     FilterQuality filterQuality = FilterQuality.low,
-  }) {
-    assert(offset != null, 'Offset argument was null');
-    _addTexture(offset.dx, offset.dy, width, height, textureId, freeze, filterQuality.index);
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Double, Double, Double, Double, Int64, Bool, Int32)>('SceneBuilder::addTexture', isLeaf: true)
-  external void _addTexture(double dx, double dy, double width, double height, int textureId, bool freeze, int filterQuality);
+  });
 
   /// Adds a platform view (e.g an iOS UIView) to the scene.
   ///
@@ -810,13 +531,7 @@ class SceneBuilder extends NativeFieldWrapperClass1 {
     Offset offset = Offset.zero,
     double width = 0.0,
     double height = 0.0,
-  }) {
-    assert(offset != null, 'Offset argument was null');
-    _addPlatformView(offset.dx, offset.dy, width, height, viewId);
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Double, Double, Double, Double, Int64)>('SceneBuilder::addPlatformView', isLeaf: true)
-  external void _addPlatformView(double dx, double dy, double width, double height, int viewId);
+  });
 
   /// Sets a threshold after which additional debugging information should be recorded.
   ///
@@ -824,8 +539,7 @@ class SceneBuilder extends NativeFieldWrapperClass1 {
   /// interested in using this feature, please contact [flutter-dev](https://groups.google.com/forum/#!forum/flutter-dev).
   /// We'll hopefully be able to figure out how to make this feature more useful
   /// to you.
-  @FfiNative<Void Function(Pointer<Void>, Uint32)>('SceneBuilder::setRasterizerTracingThreshold', isLeaf: true)
-  external void setRasterizerTracingThreshold(int frameInterval);
+  void setRasterizerTracingThreshold(int frameInterval);
 
   /// Sets whether the raster cache should checkerboard cached entries. This is
   /// only useful for debugging purposes.
@@ -842,15 +556,13 @@ class SceneBuilder extends NativeFieldWrapperClass1 {
   ///
   /// Currently this interface is difficult to use by end-developers. If you're
   /// interested in using this feature, please contact [flutter-dev](https://groups.google.com/forum/#!forum/flutter-dev).
-  @FfiNative<Void Function(Pointer<Void>, Bool)>('SceneBuilder::setCheckerboardRasterCacheImages', isLeaf: true)
-  external void setCheckerboardRasterCacheImages(bool checkerboard);
+  void setCheckerboardRasterCacheImages(bool checkerboard);
 
   /// Sets whether the compositor should checkerboard layers that are rendered
   /// to offscreen bitmaps.
   ///
   /// This is only useful for debugging purposes.
-  @FfiNative<Void Function(Pointer<Void>, Bool)>('SceneBuilder::setCheckerboardOffscreenLayers', isLeaf: true)
-  external void setCheckerboardOffscreenLayers(bool checkerboard);
+  void setCheckerboardOffscreenLayers(bool checkerboard);
 
   /// Finishes building the scene.
   ///
@@ -860,12 +572,389 @@ class SceneBuilder extends NativeFieldWrapperClass1 {
   ///
   /// After calling this function, the scene builder object is invalid and
   /// cannot be used further.
+  Scene build();
+}
+
+base class _NativeSceneBuilder extends NativeFieldWrapperClass1 implements SceneBuilder {
+  /// Creates an empty [SceneBuilder] object.
+  _NativeSceneBuilder() {
+    _constructor();
+  }
+
+  @Native<Void Function(Handle)>(symbol: 'SceneBuilder::Create')
+  external void _constructor();
+
+  // Layers used in this scene.
+  //
+  // The key is the layer used. The value is the description of what the layer
+  // is used for, e.g. "pushOpacity" or "addRetained".
+  final Map<EngineLayer, String> _usedLayers = <EngineLayer, String>{};
+
+  // In debug mode checks that the `layer` is only used once in a given scene.
+  bool _debugCheckUsedOnce(EngineLayer layer, String usage) {
+    assert(() {
+      assert(
+          !_usedLayers.containsKey(layer),
+          'Layer ${layer.runtimeType} already used.\n'
+          'The layer is already being used as ${_usedLayers[layer]} in this scene.\n'
+          'A layer may only be used once in a given scene.');
+
+      _usedLayers[layer] = usage;
+      return true;
+    }());
+
+    return true;
+  }
+
+  bool _debugCheckCanBeUsedAsOldLayer(_EngineLayerWrapper? layer, String methodName) {
+    assert(() {
+      if (layer == null) {
+        return true;
+      }
+      assert(layer._nativeLayer != null, 'Object disposed');
+      layer._debugCheckNotUsedAsOldLayer();
+      assert(_debugCheckUsedOnce(layer, 'oldLayer in $methodName'));
+      layer._debugWasUsedAsOldLayer = true;
+      return true;
+    }());
+    return true;
+  }
+
+  final List<_EngineLayerWrapper> _layerStack = <_EngineLayerWrapper>[];
+
+  // Pushes the `newLayer` onto the `_layerStack` and adds it to the
+  // `_debugChildren` of the current layer in the stack, if any.
+  bool _debugPushLayer(_EngineLayerWrapper newLayer) {
+    assert(() {
+      if (_layerStack.isNotEmpty) {
+        final _EngineLayerWrapper currentLayer = _layerStack.last;
+        currentLayer._debugChildren ??= <_EngineLayerWrapper>[];
+        currentLayer._debugChildren!.add(newLayer);
+      }
+      _layerStack.add(newLayer);
+      return true;
+    }());
+    return true;
+  }
+
+  @override
+  TransformEngineLayer pushTransform(
+    Float64List matrix4, {
+    TransformEngineLayer? oldLayer,
+  }) {
+    assert(_matrix4IsValid(matrix4));
+    assert(_debugCheckCanBeUsedAsOldLayer(oldLayer, 'pushTransform'));
+    final EngineLayer engineLayer = _NativeEngineLayer._();
+    _pushTransform(engineLayer, matrix4, oldLayer?._nativeLayer);
+    final TransformEngineLayer layer = TransformEngineLayer._(engineLayer);
+    assert(_debugPushLayer(layer));
+    return layer;
+  }
+
+  @Native<Void Function(Pointer<Void>, Handle, Handle, Handle)>(symbol: 'SceneBuilder::pushTransformHandle')
+  external void _pushTransform(EngineLayer layer, Float64List matrix4, EngineLayer? oldLayer);
+
+  @override
+  OffsetEngineLayer pushOffset(
+    double dx,
+    double dy, {
+    OffsetEngineLayer? oldLayer,
+  }) {
+    assert(_debugCheckCanBeUsedAsOldLayer(oldLayer, 'pushOffset'));
+    final EngineLayer engineLayer = _NativeEngineLayer._();
+    _pushOffset(engineLayer, dx, dy, oldLayer?._nativeLayer);
+    final OffsetEngineLayer layer = OffsetEngineLayer._(engineLayer);
+    assert(_debugPushLayer(layer));
+    return layer;
+  }
+
+  @Native<Void Function(Pointer<Void>, Handle, Double, Double, Handle)>(symbol: 'SceneBuilder::pushOffset')
+  external void _pushOffset(EngineLayer layer, double dx, double dy, EngineLayer? oldLayer);
+
+  @override
+  ClipRectEngineLayer pushClipRect(
+    Rect rect, {
+    Clip clipBehavior = Clip.antiAlias,
+    ClipRectEngineLayer? oldLayer,
+  }) {
+    assert(clipBehavior != Clip.none);
+    assert(_debugCheckCanBeUsedAsOldLayer(oldLayer, 'pushClipRect'));
+    final EngineLayer engineLayer = _NativeEngineLayer._();
+    _pushClipRect(engineLayer, rect.left, rect.right, rect.top, rect.bottom, clipBehavior.index,
+        oldLayer?._nativeLayer);
+    final ClipRectEngineLayer layer = ClipRectEngineLayer._(engineLayer);
+    assert(_debugPushLayer(layer));
+    return layer;
+  }
+
+  @Native<Void Function(Pointer<Void>, Handle, Double, Double, Double, Double, Int32, Handle)>(symbol: 'SceneBuilder::pushClipRect')
+  external void _pushClipRect(
+      EngineLayer outEngineLayer,
+      double left,
+      double right,
+      double top,
+      double bottom,
+      int clipBehavior,
+      EngineLayer? oldLayer);
+
+  @override
+  ClipRRectEngineLayer pushClipRRect(
+    RRect rrect, {
+    Clip clipBehavior = Clip.antiAlias,
+    ClipRRectEngineLayer? oldLayer,
+  }) {
+    assert(clipBehavior != Clip.none);
+    assert(_debugCheckCanBeUsedAsOldLayer(oldLayer, 'pushClipRRect'));
+    final EngineLayer engineLayer = _NativeEngineLayer._();
+    _pushClipRRect(engineLayer, rrect._getValue32(), clipBehavior.index, oldLayer?._nativeLayer);
+    final ClipRRectEngineLayer layer = ClipRRectEngineLayer._(engineLayer);
+    assert(_debugPushLayer(layer));
+    return layer;
+  }
+
+  @Native<Void Function(Pointer<Void>, Handle, Handle, Int32, Handle)>(symbol: 'SceneBuilder::pushClipRRect')
+  external void _pushClipRRect(EngineLayer layer, Float32List rrect, int clipBehavior, EngineLayer? oldLayer);
+
+  @override
+  ClipPathEngineLayer pushClipPath(
+    Path path, {
+    Clip clipBehavior = Clip.antiAlias,
+    ClipPathEngineLayer? oldLayer,
+  }) {
+    assert(clipBehavior != Clip.none);
+    assert(_debugCheckCanBeUsedAsOldLayer(oldLayer, 'pushClipPath'));
+    final EngineLayer engineLayer = _NativeEngineLayer._();
+    _pushClipPath(engineLayer, path as _NativePath, clipBehavior.index, oldLayer?._nativeLayer);
+    final ClipPathEngineLayer layer = ClipPathEngineLayer._(engineLayer);
+    assert(_debugPushLayer(layer));
+    return layer;
+  }
+
+  @Native<Void Function(Pointer<Void>, Handle, Pointer<Void>, Int32, Handle)>(symbol: 'SceneBuilder::pushClipPath')
+  external void _pushClipPath(EngineLayer layer, _NativePath path, int clipBehavior, EngineLayer? oldLayer);
+
+  @override
+  OpacityEngineLayer pushOpacity(
+    int alpha, {
+    Offset? offset = Offset.zero,
+    OpacityEngineLayer? oldLayer,
+  }) {
+    assert(_debugCheckCanBeUsedAsOldLayer(oldLayer, 'pushOpacity'));
+    final EngineLayer engineLayer = _NativeEngineLayer._();
+    _pushOpacity(engineLayer, alpha, offset!.dx, offset.dy, oldLayer?._nativeLayer);
+    final OpacityEngineLayer layer = OpacityEngineLayer._(engineLayer);
+    assert(_debugPushLayer(layer));
+    return layer;
+  }
+
+  @Native<Void Function(Pointer<Void>, Handle, Int32, Double, Double, Handle)>(symbol: 'SceneBuilder::pushOpacity')
+  external void _pushOpacity(EngineLayer layer, int alpha, double dx, double dy, EngineLayer? oldLayer);
+
+  @override
+  ColorFilterEngineLayer pushColorFilter(
+    ColorFilter filter, {
+    ColorFilterEngineLayer? oldLayer,
+  }) {
+    assert(_debugCheckCanBeUsedAsOldLayer(oldLayer, 'pushColorFilter'));
+    final _ColorFilter nativeFilter = filter._toNativeColorFilter()!;
+    final EngineLayer engineLayer = _NativeEngineLayer._();
+    _pushColorFilter(engineLayer, nativeFilter, oldLayer?._nativeLayer);
+    final ColorFilterEngineLayer layer = ColorFilterEngineLayer._(engineLayer);
+    assert(_debugPushLayer(layer));
+    return layer;
+  }
+
+  @Native<Void Function(Pointer<Void>, Handle, Pointer<Void>, Handle)>(symbol: 'SceneBuilder::pushColorFilter')
+  external void _pushColorFilter(EngineLayer layer, _ColorFilter filter, EngineLayer? oldLayer);
+
+  @override
+  ImageFilterEngineLayer pushImageFilter(
+    ImageFilter filter, {
+    Offset offset = Offset.zero,
+    ImageFilterEngineLayer? oldLayer,
+  }) {
+    assert(_debugCheckCanBeUsedAsOldLayer(oldLayer, 'pushImageFilter'));
+    final _ImageFilter nativeFilter = filter._toNativeImageFilter();
+    final EngineLayer engineLayer = _NativeEngineLayer._();
+    _pushImageFilter(engineLayer, nativeFilter, offset.dx, offset.dy, oldLayer?._nativeLayer);
+    final ImageFilterEngineLayer layer = ImageFilterEngineLayer._(engineLayer);
+    assert(_debugPushLayer(layer));
+    return layer;
+  }
+
+  @Native<Void Function(Pointer<Void>, Handle, Pointer<Void>, Double, Double, Handle)>(symbol: 'SceneBuilder::pushImageFilter')
+  external void _pushImageFilter(EngineLayer outEngineLayer, _ImageFilter filter, double dx, double dy, EngineLayer? oldLayer);
+
+  @override
+  BackdropFilterEngineLayer pushBackdropFilter(
+    ImageFilter filter, {
+    BlendMode blendMode = BlendMode.srcOver,
+    BackdropFilterEngineLayer? oldLayer,
+  }) {
+    assert(_debugCheckCanBeUsedAsOldLayer(oldLayer, 'pushBackdropFilter'));
+    final EngineLayer engineLayer = _NativeEngineLayer._();
+    _pushBackdropFilter(engineLayer, filter._toNativeImageFilter(), blendMode.index, oldLayer?._nativeLayer);
+    final BackdropFilterEngineLayer layer = BackdropFilterEngineLayer._(engineLayer);
+    assert(_debugPushLayer(layer));
+    return layer;
+  }
+
+  @Native<Void Function(Pointer<Void>, Handle, Pointer<Void>, Int32, Handle)>(symbol: 'SceneBuilder::pushBackdropFilter')
+  external void _pushBackdropFilter(EngineLayer outEngineLayer, _ImageFilter filter, int blendMode, EngineLayer? oldLayer);
+
+  @override
+  ShaderMaskEngineLayer pushShaderMask(
+    Shader shader,
+    Rect maskRect,
+    BlendMode blendMode, {
+    ShaderMaskEngineLayer? oldLayer,
+    FilterQuality filterQuality = FilterQuality.low,
+  }) {
+    assert(_debugCheckCanBeUsedAsOldLayer(oldLayer, 'pushShaderMask'));
+    final EngineLayer engineLayer = _NativeEngineLayer._();
+    _pushShaderMask(
+      engineLayer,
+      shader,
+      maskRect.left,
+      maskRect.right,
+      maskRect.top,
+      maskRect.bottom,
+      blendMode.index,
+      filterQuality.index,
+      oldLayer?._nativeLayer,
+    );
+    final ShaderMaskEngineLayer layer = ShaderMaskEngineLayer._(engineLayer);
+    assert(_debugPushLayer(layer));
+    return layer;
+  }
+
+  @Native<Void Function(Pointer<Void>, Handle, Pointer<Void>, Double, Double, Double, Double, Int32, Int32, Handle)>(symbol: 'SceneBuilder::pushShaderMask')
+  external void _pushShaderMask(
+      EngineLayer engineLayer,
+      Shader shader,
+      double maskRectLeft,
+      double maskRectRight,
+      double maskRectTop,
+      double maskRectBottom,
+      int blendMode,
+      int filterQualityIndex,
+      EngineLayer? oldLayer);
+
+  @override
+  void pop() {
+    if (_layerStack.isNotEmpty) {
+      _layerStack.removeLast();
+    }
+    _pop();
+  }
+
+  @Native<Void Function(Pointer<Void>)>(symbol: 'SceneBuilder::pop', isLeaf: true)
+  external void _pop();
+
+  @override
+  void addRetained(EngineLayer retainedLayer) {
+    assert(retainedLayer is _EngineLayerWrapper);
+    assert(() {
+      final _EngineLayerWrapper layer = retainedLayer as _EngineLayerWrapper;
+
+      assert(layer._nativeLayer != null);
+
+      void recursivelyCheckChildrenUsedOnce(_EngineLayerWrapper parentLayer) {
+        _debugCheckUsedOnce(parentLayer, 'retained layer');
+        parentLayer._debugCheckNotUsedAsOldLayer();
+
+        final List<_EngineLayerWrapper>? children = parentLayer._debugChildren;
+        if (children == null || children.isEmpty) {
+          return;
+        }
+        children.forEach(recursivelyCheckChildrenUsedOnce);
+      }
+
+      recursivelyCheckChildrenUsedOnce(layer);
+
+      return true;
+    }());
+
+    final _EngineLayerWrapper wrapper = retainedLayer as _EngineLayerWrapper;
+    _addRetained(wrapper._nativeLayer!);
+  }
+
+  @Native<Void Function(Pointer<Void>, Handle)>(symbol: 'SceneBuilder::addRetained')
+  external void _addRetained(EngineLayer retainedLayer);
+
+  @override
+  void addPerformanceOverlay(int enabledOptions, Rect bounds) {
+    _addPerformanceOverlay(enabledOptions, bounds.left, bounds.right, bounds.top, bounds.bottom);
+  }
+
+  @Native<Void Function(Pointer<Void>, Uint64, Double, Double, Double, Double)>(symbol: 'SceneBuilder::addPerformanceOverlay', isLeaf: true)
+  external void _addPerformanceOverlay(int enabledOptions, double left, double right, double top, double bottom);
+
+  @override
+  void addPicture(
+    Offset offset,
+    Picture picture, {
+    bool isComplexHint = false,
+    bool willChangeHint = false,
+  }) {
+    assert(!picture.debugDisposed);
+    final int hints = (isComplexHint ? 1 : 0) | (willChangeHint ? 2 : 0);
+    _addPicture(offset.dx, offset.dy, picture as _NativePicture, hints);
+  }
+
+  @Native<Void Function(Pointer<Void>, Double, Double, Pointer<Void>, Int32)>(symbol: 'SceneBuilder::addPicture')
+  external void _addPicture(double dx, double dy, _NativePicture picture, int hints);
+
+  @override
+  void addTexture(
+    int textureId, {
+    Offset offset = Offset.zero,
+    double width = 0.0,
+    double height = 0.0,
+    bool freeze = false,
+    FilterQuality filterQuality = FilterQuality.low,
+  }) {
+    _addTexture(offset.dx, offset.dy, width, height, textureId, freeze, filterQuality.index);
+  }
+
+  @Native<Void Function(Pointer<Void>, Double, Double, Double, Double, Int64, Bool, Int32)>(symbol: 'SceneBuilder::addTexture', isLeaf: true)
+  external void _addTexture(double dx, double dy, double width, double height, int textureId, bool freeze, int filterQuality);
+
+  @override
+  void addPlatformView(
+    int viewId, {
+    Offset offset = Offset.zero,
+    double width = 0.0,
+    double height = 0.0,
+  }) {
+    _addPlatformView(offset.dx, offset.dy, width, height, viewId);
+  }
+
+  @Native<Void Function(Pointer<Void>, Double, Double, Double, Double, Int64)>(symbol: 'SceneBuilder::addPlatformView', isLeaf: true)
+  external void _addPlatformView(double dx, double dy, double width, double height, int viewId);
+
+  @override
+  @Native<Void Function(Pointer<Void>, Uint32)>(symbol: 'SceneBuilder::setRasterizerTracingThreshold', isLeaf: true)
+  external void setRasterizerTracingThreshold(int frameInterval);
+
+  @override
+  @Native<Void Function(Pointer<Void>, Bool)>(symbol: 'SceneBuilder::setCheckerboardRasterCacheImages', isLeaf: true)
+  external void setCheckerboardRasterCacheImages(bool checkerboard);
+
+  @override
+  @Native<Void Function(Pointer<Void>, Bool)>(symbol: 'SceneBuilder::setCheckerboardOffscreenLayers', isLeaf: true)
+  external void setCheckerboardOffscreenLayers(bool checkerboard);
+
+  @override
   Scene build() {
-    final Scene scene = Scene._();
+    final Scene scene = _NativeScene._();
     _build(scene);
     return scene;
   }
 
-  @FfiNative<Void Function(Pointer<Void>, Handle)>('SceneBuilder::build')
+  @Native<Void Function(Pointer<Void>, Handle)>(symbol: 'SceneBuilder::build')
   external void _build(Scene outScene);
+
+  @override
+  String toString() => 'SceneBuilder';
 }
diff --git a/lib/ui/compositing/scene.cc b/lib/ui/compositing/scene.cc
index c5070c637609109fad7ee41834c354732b5a8e5e..5e44f3fcc27bf76843203ec08453a10d757f487c 100644
--- a/lib/ui/compositing/scene.cc
+++ b/lib/ui/compositing/scene.cc
@@ -10,7 +10,6 @@
 #include "flutter/lib/ui/painting/picture.h"
 #include "flutter/lib/ui/ui_dart_state.h"
 #include "flutter/lib/ui/window/platform_configuration.h"
-#include "flutter/lib/ui/window/window.h"
 #if IMPELLER_SUPPORTS_RENDERING
 #include "flutter/lib/ui/painting/display_list_deferred_image_gpu_impeller.h"
 #endif  // IMPELLER_SUPPORTS_RENDERING
@@ -40,27 +39,22 @@ Scene::Scene(std::shared_ptr<flutter::Layer> rootLayer,
              uint32_t rasterizerTracingThreshold,
              bool checkerboardRasterCacheImages,
              bool checkerboardOffscreenLayers) {
-  // Currently only supports a single window.
-  auto viewport_metrics = UIDartState::Current()
-                              ->platform_configuration()
-                              ->get_window(0)
-                              ->viewport_metrics();
-
-  layer_tree_ = std::make_shared<LayerTree>(
-      SkISize::Make(viewport_metrics.physical_width,
-                    viewport_metrics.physical_height),
-      static_cast<float>(viewport_metrics.device_pixel_ratio));
-  layer_tree_->set_root_layer(std::move(rootLayer));
-  layer_tree_->set_rasterizer_tracing_threshold(rasterizerTracingThreshold);
-  layer_tree_->set_checkerboard_raster_cache_images(
-      checkerboardRasterCacheImages);
-  layer_tree_->set_checkerboard_offscreen_layers(checkerboardOffscreenLayers);
+  layer_tree_config_.root_layer = std::move(rootLayer);
+  layer_tree_config_.rasterizer_tracing_threshold = rasterizerTracingThreshold;
+  layer_tree_config_.checkerboard_raster_cache_images =
+      checkerboardRasterCacheImages;
+  layer_tree_config_.checkerboard_offscreen_layers =
+      checkerboardOffscreenLayers;
 }
 
 Scene::~Scene() {}
 
+bool Scene::valid() {
+  return layer_tree_config_.root_layer != nullptr;
+}
+
 void Scene::dispose() {
-  layer_tree_.reset();
+  layer_tree_config_.root_layer.reset();
   ClearDartWrapper();
 }
 
@@ -69,8 +63,8 @@ Dart_Handle Scene::toImageSync(uint32_t width,
                                Dart_Handle raw_image_handle) {
   TRACE_EVENT0("flutter", "Scene::toImageSync");
 
-  if (!layer_tree_) {
-    return tonic::ToDart("Scene did not contain a layer tree.");
+  if (!valid()) {
+    return tonic::ToDart("Scene has been disposed.");
   }
 
   Scene::RasterizeToImage(width, height, raw_image_handle);
@@ -82,32 +76,32 @@ Dart_Handle Scene::toImage(uint32_t width,
                            Dart_Handle raw_image_callback) {
   TRACE_EVENT0("flutter", "Scene::toImage");
 
-  if (!layer_tree_) {
-    return tonic::ToDart("Scene did not contain a layer tree.");
+  if (!valid()) {
+    return tonic::ToDart("Scene has been disposed.");
   }
 
-  return Picture::RasterizeLayerTreeToImage(std::move(layer_tree_), width,
-                                            height, raw_image_callback);
+  return Picture::RasterizeLayerTreeToImage(BuildLayerTree(width, height),
+                                            raw_image_callback);
 }
 
 static sk_sp<DlImage> CreateDeferredImage(
     bool impeller,
-    std::shared_ptr<LayerTree> layer_tree,
-    uint32_t width,
-    uint32_t height,
+    std::unique_ptr<LayerTree> layer_tree,
     fml::TaskRunnerAffineWeakPtr<SnapshotDelegate> snapshot_delegate,
     fml::RefPtr<fml::TaskRunner> raster_task_runner,
     fml::RefPtr<SkiaUnrefQueue> unref_queue) {
 #if IMPELLER_SUPPORTS_RENDERING
   if (impeller) {
-    return DlDeferredImageGPUImpeller::Make(
-        std::move(layer_tree), SkISize::Make(width, height),
-        std::move(snapshot_delegate), std::move(raster_task_runner));
+    return DlDeferredImageGPUImpeller::Make(std::move(layer_tree),
+                                            std::move(snapshot_delegate),
+                                            std::move(raster_task_runner));
   }
 #endif  // IMPELLER_SUPPORTS_RENDERING
 
-  const SkImageInfo image_info = SkImageInfo::Make(
-      width, height, kRGBA_8888_SkColorType, kPremul_SkAlphaType);
+  const auto& frame_size = layer_tree->frame_size();
+  const SkImageInfo image_info =
+      SkImageInfo::Make(frame_size.width(), frame_size.height(),
+                        kRGBA_8888_SkColorType, kPremul_SkAlphaType);
   return DlDeferredImageGPUSkia::MakeFromLayerTree(
       image_info, std::move(layer_tree), std::move(snapshot_delegate),
       raster_task_runner, std::move(unref_queue));
@@ -126,15 +120,25 @@ void Scene::RasterizeToImage(uint32_t width,
 
   auto image = CanvasImage::Create();
   auto dl_image = CreateDeferredImage(
-      dart_state->IsImpellerEnabled(), layer_tree_, width, height,
+      dart_state->IsImpellerEnabled(), BuildLayerTree(width, height),
       std::move(snapshot_delegate), std::move(raster_task_runner),
       std::move(unref_queue));
   image->set_image(dl_image);
   image->AssociateWithDartWrapper(raw_image_handle);
 }
 
-std::shared_ptr<flutter::LayerTree> Scene::takeLayerTree() {
-  return std::move(layer_tree_);
+std::unique_ptr<flutter::LayerTree> Scene::takeLayerTree(uint64_t width,
+                                                         uint64_t height) {
+  return BuildLayerTree(width, height);
+}
+
+std::unique_ptr<LayerTree> Scene::BuildLayerTree(uint32_t width,
+                                                 uint32_t height) {
+  if (!valid()) {
+    return nullptr;
+  }
+  return std::make_unique<LayerTree>(layer_tree_config_,
+                                     SkISize::Make(width, height));
 }
 
 }  // namespace flutter
diff --git a/lib/ui/compositing/scene.h b/lib/ui/compositing/scene.h
index aca797836fcb1541e3a6dfef0d57c93b51039fd2..55ca5cd0bead03852964958ed40433643dfc28eb 100644
--- a/lib/ui/compositing/scene.h
+++ b/lib/ui/compositing/scene.h
@@ -10,7 +10,6 @@
 
 #include "flutter/flow/layers/layer_tree.h"
 #include "flutter/lib/ui/dart_wrapper.h"
-#include "third_party/skia/include/core/SkPicture.h"
 
 namespace flutter {
 
@@ -26,7 +25,8 @@ class Scene : public RefCountedDartWrappable<Scene> {
                      bool checkerboardRasterCacheImages,
                      bool checkerboardOffscreenLayers);
 
-  std::shared_ptr<flutter::LayerTree> takeLayerTree();
+  std::unique_ptr<flutter::LayerTree> takeLayerTree(uint64_t width,
+                                                    uint64_t height);
 
   Dart_Handle toImageSync(uint32_t width,
                           uint32_t height,
@@ -44,16 +44,16 @@ class Scene : public RefCountedDartWrappable<Scene> {
         bool checkerboardRasterCacheImages,
         bool checkerboardOffscreenLayers);
 
+  // Returns true if `dispose()` has not been called.
+  bool valid();
+
   void RasterizeToImage(uint32_t width,
                         uint32_t height,
                         Dart_Handle raw_image_handle);
 
-  // This is a shared_ptr to support flattening the layer tree from the UI
-  // thread onto the raster thread - allowing access to the texture registry
-  // required to render TextureLayers.
-  //
-  // No longer valid after calling `takeLayerTree`.
-  std::shared_ptr<flutter::LayerTree> layer_tree_;
+  std::unique_ptr<LayerTree> BuildLayerTree(uint32_t width, uint32_t height);
+
+  flutter::LayerTree::Config layer_tree_config_;
 };
 
 }  // namespace flutter
diff --git a/lib/ui/compositing/scene_builder.cc b/lib/ui/compositing/scene_builder.cc
index 6f1c718fa1b5f7617a6671c97ac7a5a9a5d6739d..6f535f301e8613b090c405dba95aaef028ae9ada 100644
--- a/lib/ui/compositing/scene_builder.cc
+++ b/lib/ui/compositing/scene_builder.cc
@@ -16,15 +16,14 @@
 #include "flutter/flow/layers/layer_tree.h"
 #include "flutter/flow/layers/opacity_layer.h"
 #include "flutter/flow/layers/performance_overlay_layer.h"
-#include "flutter/flow/layers/physical_shape_layer.h"
 #include "flutter/flow/layers/platform_view_layer.h"
 #include "flutter/flow/layers/shader_mask_layer.h"
 #include "flutter/flow/layers/texture_layer.h"
 #include "flutter/flow/layers/transform_layer.h"
 #include "flutter/fml/build_config.h"
+#include "flutter/lib/ui/floating_point.h"
 #include "flutter/lib/ui/painting/matrix.h"
 #include "flutter/lib/ui/painting/shader.h"
-#include "third_party/skia/include/core/SkColorFilter.h"
 #include "third_party/tonic/converter/dart_converter.h"
 #include "third_party/tonic/dart_args.h"
 #include "third_party/tonic/dart_binding_macros.h"
@@ -45,7 +44,7 @@ SceneBuilder::~SceneBuilder() = default;
 void SceneBuilder::pushTransform(Dart_Handle layer_handle,
                                  tonic::Float64List& matrix4,
                                  const fml::RefPtr<EngineLayer>& oldLayer) {
-  SkMatrix sk_matrix = ToSkMatrix(matrix4);
+  SkM44 sk_matrix = ToSkM44(matrix4);
   auto layer = std::make_shared<flutter::TransformLayer>(sk_matrix);
   PushLayer(layer);
   // matrix4 has to be released before we can return another Dart object
@@ -61,7 +60,7 @@ void SceneBuilder::pushOffset(Dart_Handle layer_handle,
                               double dx,
                               double dy,
                               const fml::RefPtr<EngineLayer>& oldLayer) {
-  SkMatrix sk_matrix = SkMatrix::Translate(dx, dy);
+  SkMatrix sk_matrix = SkMatrix::Translate(SafeNarrow(dx), SafeNarrow(dy));
   auto layer = std::make_shared<flutter::TransformLayer>(sk_matrix);
   PushLayer(layer);
   EngineLayer::MakeRetained(layer_handle, layer);
@@ -78,7 +77,8 @@ void SceneBuilder::pushClipRect(Dart_Handle layer_handle,
                                 double bottom,
                                 int clipBehavior,
                                 const fml::RefPtr<EngineLayer>& oldLayer) {
-  SkRect clipRect = SkRect::MakeLTRB(left, top, right, bottom);
+  SkRect clipRect = SkRect::MakeLTRB(SafeNarrow(left), SafeNarrow(top),
+                                     SafeNarrow(right), SafeNarrow(bottom));
   flutter::Clip clip_behavior = static_cast<flutter::Clip>(clipBehavior);
   auto layer =
       std::make_shared<flutter::ClipRectLayer>(clipRect, clip_behavior);
@@ -110,7 +110,7 @@ void SceneBuilder::pushClipPath(Dart_Handle layer_handle,
                                 int clipBehavior,
                                 const fml::RefPtr<EngineLayer>& oldLayer) {
   flutter::Clip clip_behavior = static_cast<flutter::Clip>(clipBehavior);
-  FML_DCHECK(clip_behavior != flutter::Clip::none);
+  FML_DCHECK(clip_behavior != flutter::Clip::kNone);
   auto layer =
       std::make_shared<flutter::ClipPathLayer>(path->path(), clip_behavior);
   PushLayer(layer);
@@ -126,8 +126,8 @@ void SceneBuilder::pushOpacity(Dart_Handle layer_handle,
                                double dx,
                                double dy,
                                const fml::RefPtr<EngineLayer>& oldLayer) {
-  auto layer =
-      std::make_shared<flutter::OpacityLayer>(alpha, SkPoint::Make(dx, dy));
+  auto layer = std::make_shared<flutter::OpacityLayer>(
+      alpha, SkPoint::Make(SafeNarrow(dx), SafeNarrow(dy)));
   PushLayer(layer);
   EngineLayer::MakeRetained(layer_handle, layer);
 
@@ -155,7 +155,7 @@ void SceneBuilder::pushImageFilter(Dart_Handle layer_handle,
                                    double dy,
                                    const fml::RefPtr<EngineLayer>& oldLayer) {
   auto layer = std::make_shared<flutter::ImageFilterLayer>(
-      image_filter->filter(), SkPoint::Make(dx, dy));
+      image_filter->filter(), SkPoint::Make(SafeNarrow(dx), SafeNarrow(dy)));
   PushLayer(layer);
   EngineLayer::MakeRetained(layer_handle, layer);
 
@@ -188,8 +188,9 @@ void SceneBuilder::pushShaderMask(Dart_Handle layer_handle,
                                   int blendMode,
                                   int filterQualityIndex,
                                   const fml::RefPtr<EngineLayer>& oldLayer) {
-  SkRect rect = SkRect::MakeLTRB(maskRectLeft, maskRectTop, maskRectRight,
-                                 maskRectBottom);
+  SkRect rect =
+      SkRect::MakeLTRB(SafeNarrow(maskRectLeft), SafeNarrow(maskRectTop),
+                       SafeNarrow(maskRectRight), SafeNarrow(maskRectBottom));
   auto sampling = ImageFilter::SamplingFromIndex(filterQualityIndex);
   auto layer = std::make_shared<flutter::ShaderMaskLayer>(
       shader->shader(sampling), rect, static_cast<DlBlendMode>(blendMode));
@@ -201,25 +202,6 @@ void SceneBuilder::pushShaderMask(Dart_Handle layer_handle,
   }
 }
 
-void SceneBuilder::pushPhysicalShape(Dart_Handle layer_handle,
-                                     const CanvasPath* path,
-                                     double elevation,
-                                     int color,
-                                     int shadow_color,
-                                     int clipBehavior,
-                                     const fml::RefPtr<EngineLayer>& oldLayer) {
-  auto layer = std::make_shared<flutter::PhysicalShapeLayer>(
-      static_cast<SkColor>(color), static_cast<SkColor>(shadow_color),
-      static_cast<float>(elevation), path->path(),
-      static_cast<flutter::Clip>(clipBehavior));
-  PushLayer(layer);
-  EngineLayer::MakeRetained(layer_handle, layer);
-
-  if (oldLayer && oldLayer->Layer()) {
-    layer->AssignOldLayer(oldLayer->Layer().get());
-  }
-}
-
 void SceneBuilder::addRetained(const fml::RefPtr<EngineLayer>& retainedLayer) {
   AddLayer(retainedLayer->Layer());
 }
@@ -241,9 +223,8 @@ void SceneBuilder::addPicture(double dx,
   // been disposed but not collected yet, but the display list is null.
   if (picture->display_list()) {
     auto layer = std::make_unique<flutter::DisplayListLayer>(
-        SkPoint::Make(dx, dy),
-        UIDartState::CreateGPUObject(picture->display_list()), !!(hints & 1),
-        !!(hints & 2));
+        SkPoint::Make(SafeNarrow(dx), SafeNarrow(dy)), picture->display_list(),
+        !!(hints & 1), !!(hints & 2));
     AddLayer(std::move(layer));
   }
 }
@@ -257,7 +238,8 @@ void SceneBuilder::addTexture(double dx,
                               int filterQualityIndex) {
   auto sampling = ImageFilter::SamplingFromIndex(filterQualityIndex);
   auto layer = std::make_unique<flutter::TextureLayer>(
-      SkPoint::Make(dx, dy), SkSize::Make(width, height), textureId, freeze,
+      SkPoint::Make(SafeNarrow(dx), SafeNarrow(dy)),
+      SkSize::Make(SafeNarrow(width), SafeNarrow(height)), textureId, freeze,
       sampling);
   AddLayer(std::move(layer));
 }
@@ -268,7 +250,8 @@ void SceneBuilder::addPlatformView(double dx,
                                    double height,
                                    int64_t viewId) {
   auto layer = std::make_unique<flutter::PlatformViewLayer>(
-      SkPoint::Make(dx, dy), SkSize::Make(width, height), viewId);
+      SkPoint::Make(SafeNarrow(dx), SafeNarrow(dy)),
+      SkSize::Make(SafeNarrow(width), SafeNarrow(height)), viewId);
   AddLayer(std::move(layer));
 }
 
@@ -277,7 +260,8 @@ void SceneBuilder::addPerformanceOverlay(uint64_t enabledOptions,
                                          double right,
                                          double top,
                                          double bottom) {
-  SkRect rect = SkRect::MakeLTRB(left, top, right, bottom);
+  SkRect rect = SkRect::MakeLTRB(SafeNarrow(left), SafeNarrow(top),
+                                 SafeNarrow(right), SafeNarrow(bottom));
   auto layer =
       std::make_unique<flutter::PerformanceOverlayLayer>(enabledOptions);
   layer->set_paint_bounds(rect);
diff --git a/lib/ui/compositing/scene_builder.h b/lib/ui/compositing/scene_builder.h
index f2de29c4802d21b3b443c2ceb3a1a43a9ab63ce8..dc9255cf47fd05812fa17c7e7f710958c6e867c4 100644
--- a/lib/ui/compositing/scene_builder.h
+++ b/lib/ui/compositing/scene_builder.h
@@ -38,7 +38,7 @@ class SceneBuilder : public RefCountedDartWrappable<SceneBuilder> {
 
   void pushTransformHandle(Dart_Handle layer_handle,
                            Dart_Handle matrix4_handle,
-                           fml::RefPtr<EngineLayer> oldLayer) {
+                           const fml::RefPtr<EngineLayer>& oldLayer) {
     tonic::Float64List matrix4(matrix4_handle);
     pushTransform(layer_handle, matrix4, oldLayer);
   }
@@ -90,13 +90,6 @@ class SceneBuilder : public RefCountedDartWrappable<SceneBuilder> {
                       int blendMode,
                       int filterQualityIndex,
                       const fml::RefPtr<EngineLayer>& oldLayer);
-  void pushPhysicalShape(Dart_Handle layer_handle,
-                         const CanvasPath* path,
-                         double elevation,
-                         int color,
-                         int shadowColor,
-                         int clipBehavior,
-                         const fml::RefPtr<EngineLayer>& oldLayer);
 
   void addRetained(const fml::RefPtr<EngineLayer>& retainedLayer);
 
diff --git a/lib/ui/compositing/scene_builder_unittests.cc b/lib/ui/compositing/scene_builder_unittests.cc
index 41efcdc64efd503b5c5505a358befc1884466354..702d83bf61417fac090f4503e717d98ab3f5e566 100644
--- a/lib/ui/compositing/scene_builder_unittests.cc
+++ b/lib/ui/compositing/scene_builder_unittests.cc
@@ -59,7 +59,7 @@ TEST_F(ShellTest, SceneBuilderBuildAndSceneDisposeReleasesLayerStack) {
 
   auto validate_scene_has_no_layers =
       [message_latch, &retained_scene](Dart_NativeArguments args) {
-        EXPECT_FALSE(retained_scene->takeLayerTree());
+        EXPECT_FALSE(retained_scene->takeLayerTree(100, 100));
         retained_scene->Release();
         retained_scene = nullptr;
         message_latch->Signal();
diff --git a/lib/ui/dart_runtime_hooks.cc b/lib/ui/dart_runtime_hooks.cc
index 1b3dde7b448861fe86a1d98df356d1d78de99c55..7e7157edefef14c85e5f787ac0ef3b8518e927bf 100644
--- a/lib/ui/dart_runtime_hooks.cc
+++ b/lib/ui/dart_runtime_hooks.cc
@@ -120,6 +120,7 @@ static void InitDartIO(Dart_Handle builtin_library,
       Dart_SetField(platform_type, ToDart("_localeClosure"), locale_closure);
   PropagateIfError(result);
 
+#if !FLUTTER_RELEASE
   // Register dart:io service extensions used for network profiling.
   Dart_Handle network_profiling_type =
       Dart_GetNonNullableType(io_lib, ToDart("_NetworkProfiling"), 0, nullptr);
@@ -127,6 +128,7 @@ static void InitDartIO(Dart_Handle builtin_library,
   result = Dart_Invoke(network_profiling_type,
                        ToDart("_registerServiceExtension"), 0, nullptr);
   PropagateIfError(result);
+#endif  // !FLUTTER_RELEASE
 }
 
 void DartRuntimeHooks::Install(bool is_ui_isolate,
diff --git a/lib/ui/dart_ui.cc b/lib/ui/dart_ui.cc
index 0410926e683345a64eb944a0d40353032443db00..712ce553481278b83f64f7213de75e340df9b01f 100644
--- a/lib/ui/dart_ui.cc
+++ b/lib/ui/dart_ui.cc
@@ -7,6 +7,7 @@
 #include <mutex>
 #include <string_view>
 
+#include "flutter/common/constants.h"
 #include "flutter/common/settings.h"
 #include "flutter/fml/build_config.h"
 #include "flutter/lib/ui/compositing/scene.h"
@@ -37,10 +38,16 @@
 #include "flutter/lib/ui/text/paragraph.h"
 #include "flutter/lib/ui/text/paragraph_builder.h"
 #include "flutter/lib/ui/window/platform_configuration.h"
+#include "flutter/lib/ui/window/platform_isolate.h"
 #include "third_party/tonic/converter/dart_converter.h"
 #include "third_party/tonic/dart_args.h"
 #include "third_party/tonic/logging/dart_error.h"
 
+#ifdef IMPELLER_ENABLE_3D
+#include "flutter/lib/ui/painting/scene/scene_node.h"
+#include "flutter/lib/ui/painting/scene/scene_shader.h"
+#endif  // IMPELLER_ENABLE_3D
+
 using tonic::ToDart;
 
 namespace flutter {
@@ -50,7 +57,7 @@ typedef CanvasPathMeasure PathMeasure;
 typedef CanvasGradient Gradient;
 typedef CanvasPath Path;
 
-// List of native static functions used as @FfiNative functions.
+// List of native static functions used as @Native functions.
 // Items are tuples of ('function_name', 'parameter_count'), where:
 //   'function_name' is the fully qualified name of the native function.
 //   'parameter_count' is the number of parameters the function has.
@@ -60,59 +67,64 @@ typedef CanvasPath Path;
 //   bindings.
 //   If the name does not match a native function, the template will fail to
 //   instatiate, resulting in a compile time error.
-// - Resolve the native function pointer associated with an @FfiNative function.
-//   If there is a mismatch between name or parameter count an @FfiNative is
+// - Resolve the native function pointer associated with an @Native function.
+//   If there is a mismatch between name or parameter count an @Native is
 //   trying to resolve, an exception will be thrown.
-#define FFI_FUNCTION_LIST(V)                                          \
-  /* Constructors */                                                  \
-  V(Canvas::Create, 6)                                                \
-  V(ColorFilter::Create, 1)                                           \
-  V(FragmentProgram::Create, 1)                                       \
-  V(ReusableFragmentShader::Create, 4)                                \
-  V(Gradient::Create, 1)                                              \
-  V(ImageFilter::Create, 1)                                           \
-  V(ImageShader::Create, 1)                                           \
-  V(ParagraphBuilder::Create, 9)                                      \
-  V(PathMeasure::Create, 3)                                           \
-  V(Path::Create, 1)                                                  \
-  V(PictureRecorder::Create, 1)                                       \
-  V(SceneBuilder::Create, 1)                                          \
-  V(SemanticsUpdateBuilder::Create, 1)                                \
-  /* Other */                                                         \
-  V(FontCollection::LoadFontFromList, 3)                              \
-  V(ImageDescriptor::initEncoded, 3)                                  \
-  V(ImmutableBuffer::init, 3)                                         \
-  V(ImmutableBuffer::initFromAsset, 3)                                \
-  V(ImmutableBuffer::initFromFile, 3)                                 \
-  V(ImageDescriptor::initRaw, 6)                                      \
-  V(IsolateNameServerNatives::LookupPortByName, 1)                    \
-  V(IsolateNameServerNatives::RegisterPortWithName, 2)                \
-  V(IsolateNameServerNatives::RemovePortNameMapping, 1)               \
-  V(NativeStringAttribute::initLocaleStringAttribute, 4)              \
-  V(NativeStringAttribute::initSpellOutStringAttribute, 3)            \
-  V(PlatformConfigurationNativeApi::DefaultRouteName, 0)              \
-  V(PlatformConfigurationNativeApi::ScheduleFrame, 0)                 \
-  V(PlatformConfigurationNativeApi::Render, 1)                        \
-  V(PlatformConfigurationNativeApi::UpdateSemantics, 1)               \
-  V(PlatformConfigurationNativeApi::SetNeedsReportTimings, 1)         \
-  V(PlatformConfigurationNativeApi::SetIsolateDebugName, 1)           \
-  V(PlatformConfigurationNativeApi::RequestDartPerformanceMode, 1)    \
-  V(PlatformConfigurationNativeApi::GetPersistentIsolateData, 0)      \
-  V(PlatformConfigurationNativeApi::ComputePlatformResolvedLocale, 1) \
-  V(PlatformConfigurationNativeApi::SendPlatformMessage, 3)           \
-  V(PlatformConfigurationNativeApi::RespondToPlatformMessage, 2)      \
-  V(PlatformConfigurationNativeApi::GetRootIsolateToken, 0)           \
-  V(PlatformConfigurationNativeApi::RegisterBackgroundIsolate, 1)     \
-  V(PlatformConfigurationNativeApi::SendPortPlatformMessage, 4)       \
-  V(DartRuntimeHooks::Logger_PrintDebugString, 1)                     \
-  V(DartRuntimeHooks::Logger_PrintString, 1)                          \
-  V(DartRuntimeHooks::ScheduleMicrotask, 1)                           \
-  V(DartRuntimeHooks::GetCallbackHandle, 1)                           \
-  V(DartRuntimeHooks::GetCallbackFromHandle, 1)                       \
-  V(DartPluginRegistrant_EnsureInitialized, 0)                        \
-  V(Vertices::init, 6)
+#define FFI_FUNCTION_LIST(V)                                       \
+  /* Constructors */                                               \
+  V(Canvas::Create)                                                \
+  V(ColorFilter::Create)                                           \
+  V(FragmentProgram::Create)                                       \
+  V(ReusableFragmentShader::Create)                                \
+  V(Gradient::Create)                                              \
+  V(ImageFilter::Create)                                           \
+  V(ImageShader::Create)                                           \
+  V(ParagraphBuilder::Create)                                      \
+  V(PathMeasure::Create)                                           \
+  V(Path::Create)                                                  \
+  V(PictureRecorder::Create)                                       \
+  V(SceneBuilder::Create)                                          \
+  V(SemanticsUpdateBuilder::Create)                                \
+  /* Other */                                                      \
+  V(FontCollection::LoadFontFromList)                              \
+  V(ImageDescriptor::initEncoded)                                  \
+  V(ImmutableBuffer::init)                                         \
+  V(ImmutableBuffer::initFromAsset)                                \
+  V(ImmutableBuffer::initFromFile)                                 \
+  V(ImageDescriptor::initRaw)                                      \
+  V(IsolateNameServerNatives::LookupPortByName)                    \
+  V(IsolateNameServerNatives::RegisterPortWithName)                \
+  V(IsolateNameServerNatives::RemovePortNameMapping)               \
+  V(NativeStringAttribute::initLocaleStringAttribute)              \
+  V(NativeStringAttribute::initSpellOutStringAttribute)            \
+  V(PlatformConfigurationNativeApi::DefaultRouteName)              \
+  V(PlatformConfigurationNativeApi::ScheduleFrame)                 \
+  V(PlatformConfigurationNativeApi::EndWarmUpFrame)                \
+  V(PlatformConfigurationNativeApi::Render)                        \
+  V(PlatformConfigurationNativeApi::UpdateSemantics)               \
+  V(PlatformConfigurationNativeApi::SetNeedsReportTimings)         \
+  V(PlatformConfigurationNativeApi::SetIsolateDebugName)           \
+  V(PlatformConfigurationNativeApi::RequestDartPerformanceMode)    \
+  V(PlatformConfigurationNativeApi::GetPersistentIsolateData)      \
+  V(PlatformConfigurationNativeApi::ComputePlatformResolvedLocale) \
+  V(PlatformConfigurationNativeApi::SendPlatformMessage)           \
+  V(PlatformConfigurationNativeApi::RespondToPlatformMessage)      \
+  V(PlatformConfigurationNativeApi::GetRootIsolateToken)           \
+  V(PlatformConfigurationNativeApi::RegisterBackgroundIsolate)     \
+  V(PlatformConfigurationNativeApi::SendPortPlatformMessage)       \
+  V(PlatformConfigurationNativeApi::SendChannelUpdate)             \
+  V(PlatformConfigurationNativeApi::GetScaledFontSize)             \
+  V(PlatformIsolateNativeApi::IsRunningOnPlatformThread)           \
+  V(PlatformIsolateNativeApi::Spawn)                               \
+  V(DartRuntimeHooks::Logger_PrintDebugString)                     \
+  V(DartRuntimeHooks::Logger_PrintString)                          \
+  V(DartRuntimeHooks::ScheduleMicrotask)                           \
+  V(DartRuntimeHooks::GetCallbackHandle)                           \
+  V(DartRuntimeHooks::GetCallbackFromHandle)                       \
+  V(DartPluginRegistrant_EnsureInitialized)                        \
+  V(Vertices::init)
 
-// List of native instance methods used as @FfiNative functions.
+// List of native instance methods used as @Native functions.
 // Items are tuples of ('class_name', 'method_name', 'parameter_count'), where:
 //   'class_name' is the name of the class containing the method.
 //   'method_name' is the name of the method.
@@ -124,183 +136,206 @@ typedef CanvasPath Path;
 //   bindings.
 //   If the name does not match a native function, the template will fail to
 //   instatiate, resulting in a compile time error.
-// - Resolve the native function pointer associated with an @FfiNative function.
-//   If there is a mismatch between names or parameter count an @FfiNative is
+// - Resolve the native function pointer associated with an @Native function.
+//   If there is a mismatch between names or parameter count an @Native is
 //   trying to resolve, an exception will be thrown.
-#define FFI_METHOD_LIST(V)                             \
-  V(Canvas, clipPath, 3)                               \
-  V(Canvas, clipRect, 7)                               \
-  V(Canvas, clipRRect, 3)                              \
-  V(Canvas, drawArc, 10)                               \
-  V(Canvas, drawAtlas, 10)                             \
-  V(Canvas, drawCircle, 6)                             \
-  V(Canvas, drawColor, 3)                              \
-  V(Canvas, drawDRRect, 5)                             \
-  V(Canvas, drawImage, 7)                              \
-  V(Canvas, drawImageNine, 13)                         \
-  V(Canvas, drawImageRect, 13)                         \
-  V(Canvas, drawLine, 7)                               \
-  V(Canvas, drawOval, 7)                               \
-  V(Canvas, drawPaint, 3)                              \
-  V(Canvas, drawPath, 4)                               \
-  V(Canvas, drawPicture, 2)                            \
-  V(Canvas, drawPoints, 5)                             \
-  V(Canvas, drawRRect, 4)                              \
-  V(Canvas, drawRect, 7)                               \
-  V(Canvas, drawShadow, 5)                             \
-  V(Canvas, drawVertices, 5)                           \
-  V(Canvas, getDestinationClipBounds, 2)               \
-  V(Canvas, getLocalClipBounds, 2)                     \
-  V(Canvas, getSaveCount, 1)                           \
-  V(Canvas, getTransform, 2)                           \
-  V(Canvas, restore, 1)                                \
-  V(Canvas, restoreToCount, 2)                         \
-  V(Canvas, rotate, 2)                                 \
-  V(Canvas, save, 1)                                   \
-  V(Canvas, saveLayer, 7)                              \
-  V(Canvas, saveLayerWithoutBounds, 3)                 \
-  V(Canvas, scale, 3)                                  \
-  V(Canvas, skew, 3)                                   \
-  V(Canvas, transform, 2)                              \
-  V(Canvas, translate, 3)                              \
-  V(Codec, dispose, 1)                                 \
-  V(Codec, frameCount, 1)                              \
-  V(Codec, getNextFrame, 2)                            \
-  V(Codec, repetitionCount, 1)                         \
-  V(ColorFilter, initLinearToSrgbGamma, 1)             \
-  V(ColorFilter, initMatrix, 2)                        \
-  V(ColorFilter, initMode, 3)                          \
-  V(ColorFilter, initSrgbToLinearGamma, 1)             \
-  V(EngineLayer, dispose, 1)                           \
-  V(FragmentProgram, initFromAsset, 2)                 \
-  V(ReusableFragmentShader, Dispose, 1)                \
-  V(ReusableFragmentShader, SetImageSampler, 3)        \
-  V(ReusableFragmentShader, ValidateSamplers, 1)       \
-  V(Gradient, initLinear, 6)                           \
-  V(Gradient, initRadial, 8)                           \
-  V(Gradient, initSweep, 9)                            \
-  V(Gradient, initTwoPointConical, 11)                 \
-  V(Image, dispose, 1)                                 \
-  V(Image, width, 1)                                   \
-  V(Image, height, 1)                                  \
-  V(Image, toByteData, 3)                              \
-  V(ImageDescriptor, bytesPerPixel, 1)                 \
-  V(ImageDescriptor, dispose, 1)                       \
-  V(ImageDescriptor, height, 1)                        \
-  V(ImageDescriptor, instantiateCodec, 4)              \
-  V(ImageDescriptor, width, 1)                         \
-  V(ImageFilter, initBlur, 4)                          \
-  V(ImageFilter, initDilate, 3)                        \
-  V(ImageFilter, initErode, 3)                         \
-  V(ImageFilter, initColorFilter, 2)                   \
-  V(ImageFilter, initComposeFilter, 3)                 \
-  V(ImageFilter, initMatrix, 3)                        \
-  V(ImageShader, dispose, 1)                           \
-  V(ImageShader, initWithImage, 6)                     \
-  V(ImmutableBuffer, dispose, 1)                       \
-  V(ImmutableBuffer, length, 1)                        \
-  V(ParagraphBuilder, addPlaceholder, 6)               \
-  V(ParagraphBuilder, addText, 2)                      \
-  V(ParagraphBuilder, build, 2)                        \
-  V(ParagraphBuilder, pop, 1)                          \
-  V(ParagraphBuilder, pushStyle, 16)                   \
-  V(Paragraph, alphabeticBaseline, 1)                  \
-  V(Paragraph, computeLineMetrics, 1)                  \
-  V(Paragraph, didExceedMaxLines, 1)                   \
-  V(Paragraph, dispose, 1)                             \
-  V(Paragraph, getLineBoundary, 2)                     \
-  V(Paragraph, getPositionForOffset, 3)                \
-  V(Paragraph, getRectsForPlaceholders, 1)             \
-  V(Paragraph, getRectsForRange, 5)                    \
-  V(Paragraph, getWordBoundary, 2)                     \
-  V(Paragraph, height, 1)                              \
-  V(Paragraph, ideographicBaseline, 1)                 \
-  V(Paragraph, layout, 2)                              \
-  V(Paragraph, longestLine, 1)                         \
-  V(Paragraph, maxIntrinsicWidth, 1)                   \
-  V(Paragraph, minIntrinsicWidth, 1)                   \
-  V(Paragraph, paint, 4)                               \
-  V(Paragraph, width, 1)                               \
-  V(PathMeasure, setPath, 3)                           \
-  V(PathMeasure, getLength, 2)                         \
-  V(PathMeasure, getPosTan, 3)                         \
-  V(PathMeasure, getSegment, 6)                        \
-  V(PathMeasure, isClosed, 2)                          \
-  V(PathMeasure, nextContour, 1)                       \
-  V(Path, addArc, 7)                                   \
-  V(Path, addOval, 5)                                  \
-  V(Path, addPath, 4)                                  \
-  V(Path, addPathWithMatrix, 5)                        \
-  V(Path, addPolygon, 3)                               \
-  V(Path, addRRect, 2)                                 \
-  V(Path, addRect, 5)                                  \
-  V(Path, arcTo, 8)                                    \
-  V(Path, arcToPoint, 8)                               \
-  V(Path, clone, 2)                                    \
-  V(Path, close, 1)                                    \
-  V(Path, conicTo, 6)                                  \
-  V(Path, contains, 3)                                 \
-  V(Path, cubicTo, 7)                                  \
-  V(Path, extendWithPath, 4)                           \
-  V(Path, extendWithPathAndMatrix, 5)                  \
-  V(Path, getBounds, 1)                                \
-  V(Path, getFillType, 1)                              \
-  V(Path, lineTo, 3)                                   \
-  V(Path, moveTo, 3)                                   \
-  V(Path, op, 4)                                       \
-  V(Path, quadraticBezierTo, 5)                        \
-  V(Path, relativeArcToPoint, 8)                       \
-  V(Path, relativeConicTo, 6)                          \
-  V(Path, relativeCubicTo, 7)                          \
-  V(Path, relativeLineTo, 3)                           \
-  V(Path, relativeMoveTo, 3)                           \
-  V(Path, relativeQuadraticBezierTo, 5)                \
-  V(Path, reset, 1)                                    \
-  V(Path, setFillType, 2)                              \
-  V(Path, shift, 4)                                    \
-  V(Path, transform, 3)                                \
-  V(PictureRecorder, endRecording, 2)                  \
-  V(Picture, GetAllocationSize, 1)                     \
-  V(Picture, dispose, 1)                               \
-  V(Picture, toImage, 4)                               \
-  V(Picture, toImageSync, 4)                           \
-  V(SceneBuilder, addPerformanceOverlay, 6)            \
-  V(SceneBuilder, addPicture, 5)                       \
-  V(SceneBuilder, addPlatformView, 6)                  \
-  V(SceneBuilder, addRetained, 2)                      \
-  V(SceneBuilder, addTexture, 8)                       \
-  V(SceneBuilder, build, 2)                            \
-  V(SceneBuilder, pop, 1)                              \
-  V(SceneBuilder, pushBackdropFilter, 5)               \
-  V(SceneBuilder, pushClipPath, 5)                     \
-  V(SceneBuilder, pushClipRRect, 5)                    \
-  V(SceneBuilder, pushClipRect, 8)                     \
-  V(SceneBuilder, pushColorFilter, 4)                  \
-  V(SceneBuilder, pushImageFilter, 4)                  \
-  V(SceneBuilder, pushOffset, 5)                       \
-  V(SceneBuilder, pushOpacity, 6)                      \
-  V(SceneBuilder, pushPhysicalShape, 8)                \
-  V(SceneBuilder, pushShaderMask, 10)                  \
-  V(SceneBuilder, pushTransformHandle, 4)              \
-  V(SceneBuilder, setCheckerboardOffscreenLayers, 2)   \
-  V(SceneBuilder, setCheckerboardRasterCacheImages, 2) \
-  V(SceneBuilder, setRasterizerTracingThreshold, 2)    \
-  V(Scene, dispose, 1)                                 \
-  V(Scene, toImage, 4)                                 \
-  V(Scene, toImageSync, 4)                             \
-  V(SemanticsUpdateBuilder, build, 2)                  \
-  V(SemanticsUpdateBuilder, updateCustomAction, 5)     \
-  V(SemanticsUpdateBuilder, updateNode, 36)            \
-  V(SemanticsUpdate, dispose, 1)                       \
-  V(Vertices, dispose, 1)
+#define FFI_METHOD_LIST(V)                          \
+  V(Canvas, clipPath)                               \
+  V(Canvas, clipRect)                               \
+  V(Canvas, clipRRect)                              \
+  V(Canvas, drawArc)                                \
+  V(Canvas, drawAtlas)                              \
+  V(Canvas, drawCircle)                             \
+  V(Canvas, drawColor)                              \
+  V(Canvas, drawDRRect)                             \
+  V(Canvas, drawImage)                              \
+  V(Canvas, drawImageNine)                          \
+  V(Canvas, drawImageRect)                          \
+  V(Canvas, drawLine)                               \
+  V(Canvas, drawOval)                               \
+  V(Canvas, drawPaint)                              \
+  V(Canvas, drawPath)                               \
+  V(Canvas, drawPicture)                            \
+  V(Canvas, drawPoints)                             \
+  V(Canvas, drawRRect)                              \
+  V(Canvas, drawRect)                               \
+  V(Canvas, drawShadow)                             \
+  V(Canvas, drawVertices)                           \
+  V(Canvas, getDestinationClipBounds)               \
+  V(Canvas, getLocalClipBounds)                     \
+  V(Canvas, getSaveCount)                           \
+  V(Canvas, getTransform)                           \
+  V(Canvas, restore)                                \
+  V(Canvas, restoreToCount)                         \
+  V(Canvas, rotate)                                 \
+  V(Canvas, save)                                   \
+  V(Canvas, saveLayer)                              \
+  V(Canvas, saveLayerWithoutBounds)                 \
+  V(Canvas, scale)                                  \
+  V(Canvas, skew)                                   \
+  V(Canvas, transform)                              \
+  V(Canvas, translate)                              \
+  V(Codec, dispose)                                 \
+  V(Codec, frameCount)                              \
+  V(Codec, getNextFrame)                            \
+  V(Codec, repetitionCount)                         \
+  V(ColorFilter, initLinearToSrgbGamma)             \
+  V(ColorFilter, initMatrix)                        \
+  V(ColorFilter, initMode)                          \
+  V(ColorFilter, initSrgbToLinearGamma)             \
+  V(EngineLayer, dispose)                           \
+  V(FragmentProgram, initFromAsset)                 \
+  V(ReusableFragmentShader, Dispose)                \
+  V(ReusableFragmentShader, SetImageSampler)        \
+  V(ReusableFragmentShader, ValidateSamplers)       \
+  V(Gradient, initLinear)                           \
+  V(Gradient, initRadial)                           \
+  V(Gradient, initSweep)                            \
+  V(Gradient, initTwoPointConical)                  \
+  V(Image, dispose)                                 \
+  V(Image, width)                                   \
+  V(Image, height)                                  \
+  V(Image, toByteData)                              \
+  V(Image, colorSpace)                              \
+  V(ImageDescriptor, bytesPerPixel)                 \
+  V(ImageDescriptor, dispose)                       \
+  V(ImageDescriptor, height)                        \
+  V(ImageDescriptor, instantiateCodec)              \
+  V(ImageDescriptor, width)                         \
+  V(ImageFilter, initBlur)                          \
+  V(ImageFilter, initDilate)                        \
+  V(ImageFilter, initErode)                         \
+  V(ImageFilter, initColorFilter)                   \
+  V(ImageFilter, initComposeFilter)                 \
+  V(ImageFilter, initMatrix)                        \
+  V(ImageShader, dispose)                           \
+  V(ImageShader, initWithImage)                     \
+  V(ImmutableBuffer, dispose)                       \
+  V(ImmutableBuffer, length)                        \
+  V(ParagraphBuilder, addPlaceholder)               \
+  V(ParagraphBuilder, addText)                      \
+  V(ParagraphBuilder, build)                        \
+  V(ParagraphBuilder, pop)                          \
+  V(ParagraphBuilder, pushStyle)                    \
+  V(Paragraph, alphabeticBaseline)                  \
+  V(Paragraph, computeLineMetrics)                  \
+  V(Paragraph, didExceedMaxLines)                   \
+  V(Paragraph, dispose)                             \
+  V(Paragraph, getClosestGlyphInfo)                 \
+  V(Paragraph, getGlyphInfoAt)                      \
+  V(Paragraph, getLineBoundary)                     \
+  V(Paragraph, getLineMetricsAt)                    \
+  V(Paragraph, getLineNumberAt)                     \
+  V(Paragraph, getNumberOfLines)                    \
+  V(Paragraph, getPositionForOffset)                \
+  V(Paragraph, getRectsForPlaceholders)             \
+  V(Paragraph, getRectsForRange)                    \
+  V(Paragraph, getWordBoundary)                     \
+  V(Paragraph, height)                              \
+  V(Paragraph, ideographicBaseline)                 \
+  V(Paragraph, layout)                              \
+  V(Paragraph, longestLine)                         \
+  V(Paragraph, maxIntrinsicWidth)                   \
+  V(Paragraph, minIntrinsicWidth)                   \
+  V(Paragraph, paint)                               \
+  V(Paragraph, width)                               \
+  V(PathMeasure, setPath)                           \
+  V(PathMeasure, getLength)                         \
+  V(PathMeasure, getPosTan)                         \
+  V(PathMeasure, getSegment)                        \
+  V(PathMeasure, isClosed)                          \
+  V(PathMeasure, nextContour)                       \
+  V(Path, addArc)                                   \
+  V(Path, addOval)                                  \
+  V(Path, addPath)                                  \
+  V(Path, addPathWithMatrix)                        \
+  V(Path, addPolygon)                               \
+  V(Path, addRRect)                                 \
+  V(Path, addRect)                                  \
+  V(Path, arcTo)                                    \
+  V(Path, arcToPoint)                               \
+  V(Path, clone)                                    \
+  V(Path, close)                                    \
+  V(Path, conicTo)                                  \
+  V(Path, contains)                                 \
+  V(Path, cubicTo)                                  \
+  V(Path, extendWithPath)                           \
+  V(Path, extendWithPathAndMatrix)                  \
+  V(Path, getBounds)                                \
+  V(Path, getFillType)                              \
+  V(Path, lineTo)                                   \
+  V(Path, moveTo)                                   \
+  V(Path, op)                                       \
+  V(Path, quadraticBezierTo)                        \
+  V(Path, relativeArcToPoint)                       \
+  V(Path, relativeConicTo)                          \
+  V(Path, relativeCubicTo)                          \
+  V(Path, relativeLineTo)                           \
+  V(Path, relativeMoveTo)                           \
+  V(Path, relativeQuadraticBezierTo)                \
+  V(Path, reset)                                    \
+  V(Path, setFillType)                              \
+  V(Path, shift)                                    \
+  V(Path, transform)                                \
+  V(PictureRecorder, endRecording)                  \
+  V(Picture, GetAllocationSize)                     \
+  V(Picture, dispose)                               \
+  V(Picture, toImage)                               \
+  V(Picture, toImageSync)                           \
+  V(SceneBuilder, addPerformanceOverlay)            \
+  V(SceneBuilder, addPicture)                       \
+  V(SceneBuilder, addPlatformView)                  \
+  V(SceneBuilder, addRetained)                      \
+  V(SceneBuilder, addTexture)                       \
+  V(SceneBuilder, build)                            \
+  V(SceneBuilder, pop)                              \
+  V(SceneBuilder, pushBackdropFilter)               \
+  V(SceneBuilder, pushClipPath)                     \
+  V(SceneBuilder, pushClipRRect)                    \
+  V(SceneBuilder, pushClipRect)                     \
+  V(SceneBuilder, pushColorFilter)                  \
+  V(SceneBuilder, pushImageFilter)                  \
+  V(SceneBuilder, pushOffset)                       \
+  V(SceneBuilder, pushOpacity)                      \
+  V(SceneBuilder, pushShaderMask)                   \
+  V(SceneBuilder, pushTransformHandle)              \
+  V(SceneBuilder, setCheckerboardOffscreenLayers)   \
+  V(SceneBuilder, setCheckerboardRasterCacheImages) \
+  V(SceneBuilder, setRasterizerTracingThreshold)    \
+  V(Scene, dispose)                                 \
+  V(Scene, toImage)                                 \
+  V(Scene, toImageSync)                             \
+  V(SemanticsUpdateBuilder, build)                  \
+  V(SemanticsUpdateBuilder, updateCustomAction)     \
+  V(SemanticsUpdateBuilder, updateNode)             \
+  V(SemanticsUpdate, dispose)                       \
+  V(Vertices, dispose)
+
+#ifdef IMPELLER_ENABLE_3D
+
+#define FFI_FUNCTION_LIST_3D(V) \
+  V(SceneNode::Create)          \
+  V(SceneShader::Create)
+
+#define FFI_METHOD_LIST_3D(V)        \
+  V(SceneNode, initFromAsset)        \
+  V(SceneNode, initFromTransform)    \
+  V(SceneNode, AddChild)             \
+  V(SceneNode, SetTransform)         \
+  V(SceneNode, SetAnimationState)    \
+  V(SceneNode, SeekAnimation)        \
+  V(SceneShader, SetCameraTransform) \
+  V(SceneShader, Dispose)
+
+#endif  // IMPELLER_ENABLE_3D
 
-#define FFI_FUNCTION_INSERT(FUNCTION, ARGS)     \
+#define FFI_FUNCTION_INSERT(FUNCTION)           \
   g_function_dispatchers.insert(std::make_pair( \
       std::string_view(#FUNCTION),              \
       reinterpret_cast<void*>(                  \
           tonic::FfiDispatcher<void, decltype(&FUNCTION), &FUNCTION>::Call)));
 
-#define FFI_METHOD_INSERT(CLASS, METHOD, ARGS)                                 \
+#define FFI_METHOD_INSERT(CLASS, METHOD)                                       \
   g_function_dispatchers.insert(                                               \
       std::make_pair(std::string_view(#CLASS "::" #METHOD),                    \
                      reinterpret_cast<void*>(                                  \
@@ -320,6 +355,11 @@ void* ResolveFfiNativeFunction(const char* name, uintptr_t args) {
 void InitDispatcherMap() {
   FFI_FUNCTION_LIST(FFI_FUNCTION_INSERT)
   FFI_METHOD_LIST(FFI_METHOD_INSERT)
+
+#ifdef IMPELLER_ENABLE_3D
+  FFI_FUNCTION_LIST_3D(FFI_FUNCTION_INSERT)
+  FFI_METHOD_LIST_3D(FFI_METHOD_INSERT)
+#endif  // IMPELLER_ENABLE_3D
 }
 
 }  // anonymous namespace
@@ -345,6 +385,12 @@ void DartUI::InitForIsolate(const Settings& settings) {
       Dart_PropagateError(result);
     }
   }
+
+  result = Dart_SetField(dart_ui, ToDart("_implicitViewId"),
+                         Dart_NewInteger(kFlutterImplicitViewId));
+  if (Dart_IsError(result)) {
+    Dart_PropagateError(result);
+  }
 }
 
 }  // namespace flutter
diff --git a/lib/ui/dart_ui.gni b/lib/ui/dart_ui.gni
index 7059f7ab2ae0819e848526b43864f44a35eae6f8..173035f25adba0dfb48478636ecae4fd7bff9494 100644
--- a/lib/ui/dart_ui.gni
+++ b/lib/ui/dart_ui.gni
@@ -16,6 +16,7 @@ dart_ui_files = [
   "//flutter/lib/ui/natives.dart",
   "//flutter/lib/ui/painting.dart",
   "//flutter/lib/ui/platform_dispatcher.dart",
+  "//flutter/lib/ui/platform_isolate.dart",
   "//flutter/lib/ui/plugins.dart",
   "//flutter/lib/ui/pointer.dart",
   "//flutter/lib/ui/semantics.dart",
@@ -25,3 +26,10 @@ dart_ui_files = [
 ]
 
 dart_ui_path = "//flutter/lib/ui/ui.dart"
+
+dart_ui_web_files = [
+  "$root_out_dir/flutter_web_sdk/lib/ui_web/ui_web/url_strategy.dart",
+  "$root_out_dir/flutter_web_sdk/lib/ui_web/ui_web.dart",
+]
+
+dart_ui_web_path = "//flutter/lib/web_ui/lib/ui_web/src/ui_web.dart"
diff --git a/lib/ui/experiments/scene.dart b/lib/ui/experiments/scene.dart
new file mode 100644
index 0000000000000000000000000000000000000000..34fbe6358560eb3637b24df9f0e0ef972983deee
--- /dev/null
+++ b/lib/ui/experiments/scene.dart
@@ -0,0 +1,212 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+part of dart.ui;
+
+/// A composable [SceneNode].
+base class SceneNode extends NativeFieldWrapperClass1 {
+  @pragma('vm:entry-point')
+  SceneNode._create() {
+    _constructor();
+  }
+
+  String? _debugName;
+
+  /// Creates a scene node from the asset with key [assetKey].
+  ///
+  /// The asset must be a file produced as the output of the `scenec` importer.
+  /// The constructed object should then be reused via the [shader]
+  /// method to create [Shader] objects that can be used by [Shader.paint].
+  static SceneNodeValue fromAsset(String assetKey) {
+    // The flutter tool converts all asset keys with spaces into URI
+    // encoded paths (replacing ' ' with '%20', for example). We perform
+    // the same encoding here so that users can load assets with the same
+    // key they have written in the pubspec.
+    final String encodedKey = Uri(path: Uri.encodeFull(assetKey)).path;
+    {
+      final SceneNodeValue? futureSceneNode = _ipsceneRegistry[encodedKey]?.target;
+      if (futureSceneNode != null) {
+        return futureSceneNode;
+      }
+    }
+
+    final SceneNode sceneNode = SceneNode._create();
+
+    final Future<SceneNode> futureSceneNode = _futurize((_Callback<void> callback) {
+      final String error = sceneNode._initFromAsset(assetKey, callback);
+      if (error.isNotEmpty) {
+        return error;
+      }
+      assert(() {
+        sceneNode._debugName = assetKey;
+        return true;
+      }());
+
+      return null;
+    }).then((_) => sceneNode);
+
+    final SceneNodeValue result = SceneNodeValue.fromFuture(futureSceneNode);
+    _ipsceneRegistry[encodedKey] = WeakReference<SceneNodeValue>(result);
+    return result;
+  }
+
+  static SceneNodeValue fromTransform(Float64List matrix4) {
+    final SceneNode sceneNode = SceneNode._create();
+    sceneNode._initFromTransform(matrix4);
+    return SceneNodeValue.fromValue(sceneNode);
+  }
+
+  void addChild(SceneNode sceneNode) {
+    _addChild(sceneNode);
+  }
+
+  void setTransform(Float64List matrix4) {
+    _setTransform(matrix4);
+  }
+
+  void setAnimationState(String animationName, bool playing, bool loop, double weight, double timeScale) {
+    _setAnimationState(animationName, playing, loop, weight, timeScale);
+  }
+
+  void seekAnimation(String animationName, double time) {
+    _seekAnimation(animationName, time);
+  }
+
+  // This is a cache of ipscene-backed scene nodes that have been loaded via
+  // SceneNode.fromAsset. It holds weak references to the SceneNodes so that the
+  // case where an in-use ipscene is requested again can be fast, but scenes
+  // that are no longer referenced are not retained because of the cache.
+  static final Map<String, WeakReference<SceneNodeValue>> _ipsceneRegistry =
+      <String, WeakReference<SceneNodeValue>>{};
+
+  static Future<void> _reinitializeScene(String assetKey) async {
+    final WeakReference<SceneNodeValue>? sceneRef = _ipsceneRegistry[assetKey];
+
+    // If a scene for the asset isn't already registered, then there's no
+    // need to reinitialize it.
+    if (sceneRef == null) {
+      return;
+    }
+
+    final Future<SceneNode>? sceneNodeFuture = sceneRef.target?.future;
+    if (sceneNodeFuture == null) {
+      return;
+    }
+    final SceneNode sceneNode = await sceneNodeFuture;
+
+    await _futurize((_Callback<void> callback) {
+      final String error = sceneNode._initFromAsset(assetKey, callback);
+      if (error.isNotEmpty) {
+        return error;
+      }
+      return null;
+    });
+  }
+
+  @Native<Void Function(Handle)>(symbol: 'SceneNode::Create')
+  external void _constructor();
+
+  @Native<Handle Function(Pointer<Void>, Handle, Handle)>(symbol: 'SceneNode::initFromAsset')
+  external String _initFromAsset(String assetKey, _Callback<void> completionCallback);
+
+  @Native<Void Function(Pointer<Void>, Handle)>(symbol: 'SceneNode::initFromTransform')
+  external void _initFromTransform(Float64List matrix4);
+
+  @Native<Void Function(Pointer<Void>, Handle)>(symbol: 'SceneNode::AddChild')
+  external void _addChild(SceneNode sceneNode);
+
+  @Native<Void Function(Pointer<Void>, Handle)>(symbol: 'SceneNode::SetTransform')
+  external void _setTransform(Float64List matrix4);
+
+  @Native<Void Function(Pointer<Void>, Handle, Bool, Bool, Double, Double)>(symbol: 'SceneNode::SetAnimationState')
+  external void _setAnimationState(String animationName, bool playing, bool loop, double weight, double timeScale);
+
+  @Native<Void Function(Pointer<Void>, Handle, Double)>(symbol: 'SceneNode::SeekAnimation')
+  external void _seekAnimation(String animationName, double time);
+
+  /// Returns a fresh instance of [SceneShader].
+  SceneShader sceneShader() => SceneShader._(this, debugName: _debugName);
+}
+
+class SceneNodeValue {
+  SceneNodeValue._(this._future, this._value) {
+    _future?.then((SceneNode result) => _value = result);
+  }
+
+  static SceneNodeValue fromFuture(Future<SceneNode> future) {
+    return SceneNodeValue._(future, null);
+  }
+
+  static SceneNodeValue fromValue(SceneNode value) {
+    return SceneNodeValue._(null, value);
+  }
+
+  final Future<SceneNode>? _future;
+  SceneNode? _value;
+
+  bool get isComplete {
+    return _value != null;
+  }
+
+  Future<SceneNode>? get future {
+    return _future;
+  }
+
+  SceneNode? get value {
+    return _value;
+  }
+
+  /// Calls `callback` when the `SceneNode` has finished initializing. If the
+  /// initialization is already finished, `callback` is called synchronously.
+  SceneNodeValue whenComplete(void Function(SceneNode) callback) {
+    if (_value == null && _future == null) {
+      return this;
+    }
+
+    if (_value != null) {
+      callback(_value!);
+      return this;
+    }
+
+    // _future != null
+    _future!.then((SceneNode node) => callback(node));
+    return this;
+  }
+}
+
+/// A [Shader] generated from a [SceneNode].
+///
+/// Instances of this class can be obtained from the
+/// [SceneNode.sceneShader] method.
+base class SceneShader extends Shader {
+  SceneShader._(SceneNode node, { String? debugName }) : _debugName = debugName, super._() {
+    _constructor(node);
+  }
+
+  // ignore: unused_field
+  final String? _debugName;
+
+  void setCameraTransform(Float64List matrix4) {
+    _setCameraTransform(matrix4);
+  }
+
+  /// Releases the native resources held by the [SceneShader].
+  ///
+  /// After this method is called, calling methods on the shader, or attaching
+  /// it to a [Paint] object will fail with an exception. Calling [dispose]
+  /// twice will also result in an exception being thrown.
+  @override
+  void dispose() {
+    super.dispose();
+    _dispose();
+  }
+
+  @Native<Void Function(Handle, Handle)>(symbol: 'SceneShader::Create')
+  external void _constructor(SceneNode node);
+
+  @Native<Void Function(Pointer<Void>, Handle)>(symbol: 'SceneShader::SetCameraTransform')
+  external void _setCameraTransform(Float64List matrix4);
+
+  @Native<Void Function(Pointer<Void>)>(symbol: 'SceneShader::Dispose')
+  external void _dispose();
+}
diff --git a/lib/ui/experiments/setup_hooks.dart b/lib/ui/experiments/setup_hooks.dart
new file mode 100644
index 0000000000000000000000000000000000000000..8d5dfdd966da877bb28fefcdceb81efc63e16330
--- /dev/null
+++ b/lib/ui/experiments/setup_hooks.dart
@@ -0,0 +1,51 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+part of dart.ui;
+
+Future<developer.ServiceExtensionResponse> _reinitializeScene(
+  String method,
+  Map<String, String> parameters,
+) async {
+  final String? assetKey = parameters['assetKey'];
+  if (assetKey != null) {
+    await SceneNode._reinitializeScene(assetKey);
+  }
+
+  // Always succeed.
+  return developer.ServiceExtensionResponse.result(json.encode(<String, String>{
+    'type': 'Success',
+  }));
+}
+
+// This is a copy of ui/setup_hooks.dart, but with reinitializeScene added for hot reloading 3D scenes.
+
+@pragma('vm:entry-point')
+void _setupHooks() {
+  assert(() {
+    // In debug mode, register the schedule frame extension.
+    developer.registerExtension('ext.ui.window.scheduleFrame', _scheduleFrame);
+
+    // In debug mode, allow shaders to be reinitialized.
+    developer.registerExtension(
+      'ext.ui.window.reinitializeShader',
+      _reinitializeShader,
+    );
+
+    // In debug mode, allow 3D scenes to be reinitialized.
+    developer.registerExtension(
+      'ext.ui.window.reinitializeScene',
+      _reinitializeScene,
+    );
+    return true;
+  }());
+
+  // In debug and profile mode, allow tools to display the current rendering backend.
+  if (!_kReleaseMode) {
+    developer.registerExtension(
+      'ext.ui.window.impellerEnabled',
+      _getImpellerEnabled,
+    );
+  }
+}
diff --git a/lib/ui/experiments/ui.dart b/lib/ui/experiments/ui.dart
new file mode 100644
index 0000000000000000000000000000000000000000..beaf3e143f4fe0d2a61302f788a1dc30b6f4e3f1
--- /dev/null
+++ b/lib/ui/experiments/ui.dart
@@ -0,0 +1,52 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+/// Built-in types and core primitives for a Flutter application.
+///
+/// To use, import `dart:ui`.
+///
+/// This library exposes the lowest-level services that Flutter frameworks use
+/// to bootstrap applications, such as classes for driving the input, graphics
+/// text, layout, and rendering subsystems.
+library dart.ui;
+
+import 'dart:async';
+import 'dart:collection' as collection;
+import 'dart:convert';
+import 'dart:developer' as developer;
+import 'dart:ffi';
+import 'dart:io';
+import 'dart:isolate'
+    show
+        Isolate,
+        IsolateSpawnException,
+        RawReceivePort,
+        RemoteError,
+        SendPort;
+import 'dart:math' as math;
+import 'dart:nativewrappers';
+import 'dart:typed_data';
+
+part '../annotations.dart';
+part '../channel_buffers.dart';
+part '../compositing.dart';
+part '../geometry.dart';
+part '../hash_codes.dart';
+part '../hooks.dart';
+part '../isolate_name_server.dart';
+part '../key.dart';
+part '../lerp.dart';
+part '../math.dart';
+part '../natives.dart';
+part '../painting.dart';
+part '../platform_dispatcher.dart';
+part '../platform_isolate.dart';
+part '../plugins.dart';
+part '../pointer.dart';
+part '../semantics.dart';
+part 'setup_hooks.dart';
+part '../text.dart';
+part '../window.dart';
+
+part 'scene.dart';
diff --git a/lib/ui/fixtures/2_dispose_op_restore_previous.apng b/lib/ui/fixtures/2_dispose_op_restore_previous.apng
new file mode 100644
index 0000000000000000000000000000000000000000..54f73736abc493ab22cd46338bcdc2d0b418b355
Binary files /dev/null and b/lib/ui/fixtures/2_dispose_op_restore_previous.apng differ
diff --git a/lib/ui/fixtures/2_dispose_op_restore_previous.apng.67.png b/lib/ui/fixtures/2_dispose_op_restore_previous.apng.67.png
new file mode 100644
index 0000000000000000000000000000000000000000..5410b759c04f499513e2dfaf359ebbde96f27a4d
Binary files /dev/null and b/lib/ui/fixtures/2_dispose_op_restore_previous.apng.67.png differ
diff --git a/lib/ui/fixtures/2_dispose_op_restore_previous.apng.68.png b/lib/ui/fixtures/2_dispose_op_restore_previous.apng.68.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f08106ccef06823377dfb7ec2c12fb8df20a32d
Binary files /dev/null and b/lib/ui/fixtures/2_dispose_op_restore_previous.apng.68.png differ
diff --git a/lib/ui/fixtures/2_dispose_op_restore_previous.apng.69.png b/lib/ui/fixtures/2_dispose_op_restore_previous.apng.69.png
new file mode 100644
index 0000000000000000000000000000000000000000..5335435864c99af97cdc2ae7069bfa414989e37f
Binary files /dev/null and b/lib/ui/fixtures/2_dispose_op_restore_previous.apng.69.png differ
diff --git a/lib/ui/fixtures/DisplayP3Logo.jpg b/lib/ui/fixtures/DisplayP3Logo.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..ea6a104d4faee82957c43778d96c1dea9f10ffed
Binary files /dev/null and b/lib/ui/fixtures/DisplayP3Logo.jpg differ
diff --git a/lib/ui/fixtures/DisplayP3Logo.png b/lib/ui/fixtures/DisplayP3Logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..32f032bae3de42c8c7ba9529d2d18ad41e81bede
Binary files /dev/null and b/lib/ui/fixtures/DisplayP3Logo.png differ
diff --git a/lib/ui/fixtures/WideGamutIndexed.png b/lib/ui/fixtures/WideGamutIndexed.png
new file mode 100644
index 0000000000000000000000000000000000000000..b35593c7e89262b80e207ec970ad91c1619e2877
Binary files /dev/null and b/lib/ui/fixtures/WideGamutIndexed.png differ
diff --git a/lib/ui/fixtures/alpha_animated.apng b/lib/ui/fixtures/alpha_animated.apng
new file mode 100644
index 0000000000000000000000000000000000000000..277987993f6fc74d2a92f712b859baf1787e4bd3
Binary files /dev/null and b/lib/ui/fixtures/alpha_animated.apng differ
diff --git a/lib/ui/fixtures/dispose_op_background.apng b/lib/ui/fixtures/dispose_op_background.apng
new file mode 100644
index 0000000000000000000000000000000000000000..94ce56c783f5d88592369d173ffc82dae9393ca8
Binary files /dev/null and b/lib/ui/fixtures/dispose_op_background.apng differ
diff --git a/lib/ui/fixtures/four_frame_with_reuse.gif b/lib/ui/fixtures/four_frame_with_reuse.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c2844f1ae020291b8d2bdd6a627432c28b3f2558
Binary files /dev/null and b/lib/ui/fixtures/four_frame_with_reuse.gif differ
diff --git a/lib/ui/fixtures/four_frame_with_reuse_end.png b/lib/ui/fixtures/four_frame_with_reuse_end.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0433f9c2b8d37db30707ea4c8857631a9c407c7
Binary files /dev/null and b/lib/ui/fixtures/four_frame_with_reuse_end.png differ
diff --git a/lib/ui/fixtures/heart.webp b/lib/ui/fixtures/heart.webp
new file mode 100644
index 0000000000000000000000000000000000000000..e71cb118f0c8c242932405d2f8ce7de5f47e13b7
Binary files /dev/null and b/lib/ui/fixtures/heart.webp differ
diff --git a/lib/ui/fixtures/heart_end.png b/lib/ui/fixtures/heart_end.png
new file mode 100644
index 0000000000000000000000000000000000000000..5fd9a7061d0b3cf8bf38941c9ddd8736c8b1274d
Binary files /dev/null and b/lib/ui/fixtures/heart_end.png differ
diff --git a/lib/ui/fixtures/impeller_2_dispose_op_restore_previous.apng.67.png b/lib/ui/fixtures/impeller_2_dispose_op_restore_previous.apng.67.png
new file mode 100644
index 0000000000000000000000000000000000000000..bdec9bc8f149955ba3eaea280d583fef4ec368d7
Binary files /dev/null and b/lib/ui/fixtures/impeller_2_dispose_op_restore_previous.apng.67.png differ
diff --git a/lib/ui/fixtures/impeller_2_dispose_op_restore_previous.apng.68.png b/lib/ui/fixtures/impeller_2_dispose_op_restore_previous.apng.68.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ade80e00e468cbe5c1fb195548bd0234d927e65
Binary files /dev/null and b/lib/ui/fixtures/impeller_2_dispose_op_restore_previous.apng.68.png differ
diff --git a/lib/ui/fixtures/impeller_2_dispose_op_restore_previous.apng.69.png b/lib/ui/fixtures/impeller_2_dispose_op_restore_previous.apng.69.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3006d0c2f89b85cc07349026bae3ebf9beb370f
Binary files /dev/null and b/lib/ui/fixtures/impeller_2_dispose_op_restore_previous.apng.69.png differ
diff --git a/lib/ui/fixtures/impeller_four_frame_with_reuse_end.png b/lib/ui/fixtures/impeller_four_frame_with_reuse_end.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c6723681062115d9b2779b508e8b47df08ac6ad
Binary files /dev/null and b/lib/ui/fixtures/impeller_four_frame_with_reuse_end.png differ
diff --git a/lib/ui/fixtures/impeller_heart_end.png b/lib/ui/fixtures/impeller_heart_end.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd33ff064c60571b28d14aff5bb3235993e7eca9
Binary files /dev/null and b/lib/ui/fixtures/impeller_heart_end.png differ
diff --git a/lib/ui/fixtures/shaders/BUILD.gn b/lib/ui/fixtures/shaders/BUILD.gn
index 37d881e3539f85162d74508fa723a7f460742699..ff3b6eb3cc896f28f725f9a5e07b26ae53b719bf 100644
--- a/lib/ui/fixtures/shaders/BUILD.gn
+++ b/lib/ui/fixtures/shaders/BUILD.gn
@@ -18,7 +18,7 @@ if (enable_unittests) {
 
   impellerc("ink_sparkle") {
     shaders = [ "//flutter/impeller/fixtures/ink_sparkle.frag" ]
-    shader_target_flag = "--sksl"
+    shader_target_flags = [ "--sksl" ]
     intermediates_subdir = "iplr"
     sl_file_extension = "iplr"
     iplr = true
@@ -26,7 +26,7 @@ if (enable_unittests) {
 
   impellerc("ink_sparkle_web") {
     shaders = [ "//flutter/impeller/fixtures/ink_sparkle.frag" ]
-    shader_target_flag = "--sksl"
+    shader_target_flags = [ "--sksl" ]
     intermediates_subdir = "iplr-json"
     sl_file_extension = "iplr"
     iplr = true
@@ -38,11 +38,14 @@ if (enable_unittests) {
       "//flutter/impeller/fixtures/ordering/shader_with_samplers.frag",
       "//flutter/third_party/test_shaders/selman/glow_shader.frag",
     ]
-    shader_target_flag = "--runtime-stage-metal"
+    shader_target_flags = [
+      "--runtime-stage-metal",
+      "--runtime-stage-gles",
+      "--runtime-stage-vulkan",
+    ]
     intermediates_subdir = "iplr-remap"
     sl_file_extension = "iplr"
     iplr = true
-    remap_samplers = true
   }
 
   test_fixtures("fixtures") {
diff --git a/lib/ui/fixtures/shaders/general_shaders/BUILD.gn b/lib/ui/fixtures/shaders/general_shaders/BUILD.gn
index 640823715e8f2c302598f5991f1c6925ad64e9db..9e9eb0be008121a8e2b8573c348e07fc60d9d21e 100644
--- a/lib/ui/fixtures/shaders/general_shaders/BUILD.gn
+++ b/lib/ui/fixtures/shaders/general_shaders/BUILD.gn
@@ -26,7 +26,7 @@ if (enable_unittests) {
 
   impellerc("compile_general_shaders") {
     shaders = test_shaders
-    shader_target_flag = "--sksl"
+    shader_target_flags = [ "--sksl" ]
     intermediates_subdir = "iplr"
     sl_file_extension = "iplr"
     iplr = true
diff --git a/lib/ui/fixtures/shaders/supported_glsl_op_shaders/71_reflect.frag b/lib/ui/fixtures/shaders/supported_glsl_op_shaders/71_reflect.frag
index a02e8af0b97ae6bf6819dd3c3086657ece6f7ffe..b38ea9ba6a79c8cc68e8649c66f77fa591390615 100644
--- a/lib/ui/fixtures/shaders/supported_glsl_op_shaders/71_reflect.frag
+++ b/lib/ui/fixtures/shaders/supported_glsl_op_shaders/71_reflect.frag
@@ -10,21 +10,19 @@ layout(location = 0) out vec4 fragColor;
 
 layout(location = 0) uniform float a;
 
-// For a given incident vector I and surface normal N reflect returns the reflection direction calculated as I - 2.0 * dot(N, I) * N.
+// For a given incident vector I and surface normal N reflect returns the
+// reflection direction calculated as I - 2.0 * dot(N, I) * N.
 void main() {
-    // To get [0.0, 1.0] as the output, choose [0.6, 0.8] as N, and solve for I.
-    // Since the reflection is symmetric:
-    // I’ = reflect(I)
-    // I’ = I - 2 dot(N, I) N
-    // I = I’ - 2 dot(N, I’) N
-    // N = [0.6, 0.8]
-    // I’ = [0, 1]
-    // I = [0, 1] - 2 * 0.8 [0.6, 0.8]
-    // I = [-0.96, -0.28]
-    fragColor = vec4(
-        reflect(vec2(a * -0.96, -0.28), vec2(0.6, 0.8))[0],
-        reflect(vec2(a * -0.96, -0.28), vec2(0.6, 0.8))[1],
-        0.0,
-        1.0
-    );
+  // To get [0.0, 1.0] as the output, choose [0.6, 0.8] as N, and solve for I.
+  // Since the reflection is symmetric:
+  // I’ = reflect(I)
+  // I’ = I - 2 dot(N, I) N
+  // I = I’ - 2 dot(N, I’) N
+  // N = [0.6, 0.8]
+  // I’ = [0, 1]
+  // I = [0, 1] - 2 * 0.8 [0.6, 0.8]
+  // I = [-0.96, -0.28]
+  fragColor =
+      vec4(reflect(vec2(a * -0.96, -0.28), vec2(0.6, 0.8))[0],
+           reflect(vec2(a * -0.96, -0.28), vec2(0.6, 0.8))[1], 0.0, 1.0);
 }
diff --git a/lib/ui/fixtures/shaders/supported_glsl_op_shaders/BUILD.gn b/lib/ui/fixtures/shaders/supported_glsl_op_shaders/BUILD.gn
index e3480feb759878d3409348c514c6bd2fbac56554..825e46e1bade88bb39d4e14cf382509713dce7f3 100644
--- a/lib/ui/fixtures/shaders/supported_glsl_op_shaders/BUILD.gn
+++ b/lib/ui/fixtures/shaders/supported_glsl_op_shaders/BUILD.gn
@@ -50,7 +50,7 @@ if (enable_unittests) {
 
   impellerc("compile_supported_glsl_shaders") {
     shaders = test_shaders
-    shader_target_flag = "--sksl"
+    shader_target_flags = [ "--sksl" ]
     intermediates_subdir = "iplr"
     sl_file_extension = "iplr"
     iplr = true
diff --git a/lib/ui/fixtures/shaders/supported_op_shaders/BUILD.gn b/lib/ui/fixtures/shaders/supported_op_shaders/BUILD.gn
index 880500f9c4fd0c258182b046b308df114590c1de..b0c3c8a79ac5c18d0dcffb9646fd27e90428536c 100644
--- a/lib/ui/fixtures/shaders/supported_op_shaders/BUILD.gn
+++ b/lib/ui/fixtures/shaders/supported_op_shaders/BUILD.gn
@@ -46,7 +46,7 @@ if (enable_unittests) {
 
   impellerc("compile_supported_op_shaders") {
     shaders = test_shaders
-    shader_target_flag = "--sksl"
+    shader_target_flags = [ "--sksl" ]
     intermediates_subdir = "iplr"
     sl_file_extension = "iplr"
     iplr = true
diff --git a/lib/ui/fixtures/ui_test.dart b/lib/ui/fixtures/ui_test.dart
index f1d213ec22cd8422aa3ab00ff6b072d15deb5f5d..05727c6e9e01112fa9273717ac45218f3670fb64 100644
--- a/lib/ui/fixtures/ui_test.dart
+++ b/lib/ui/fixtures/ui_test.dart
@@ -6,7 +6,7 @@ import 'dart:async';
 import 'dart:typed_data';
 import 'dart:ui';
 import 'dart:isolate';
-import 'dart:ffi';
+import 'dart:ffi' hide Size;
 
 void main() {}
 
@@ -145,6 +145,7 @@ external void _validateVertices(Vertices vertices);
 @pragma('vm:entry-point')
 void sendSemanticsUpdate() {
   final SemanticsUpdateBuilder builder = SemanticsUpdateBuilder();
+  final String identifier = "identifier";
   final String label = "label";
   final List<StringAttribute> labelAttributes = <StringAttribute> [
     SpellOutStringAttribute(range: TextRange(start: 1, end: 2)),
@@ -172,6 +173,8 @@ void sendSemanticsUpdate() {
     ),
   ];
 
+  String tooltip = "tooltip";
+
   final Float64List transform = Float64List(16);
   final Int32List childrenInTraversalOrder = Int32List(0);
   final Int32List childrenInHitTestOrder = Int32List(0);
@@ -212,6 +215,7 @@ void sendSemanticsUpdate() {
     rect: Rect.fromLTRB(0, 0, 10, 10),
     elevation: 0,
     thickness: 0,
+    identifier: identifier,
     label: label,
     labelAttributes: labelAttributes,
     value: value,
@@ -222,6 +226,7 @@ void sendSemanticsUpdate() {
     decreasedValueAttributes: decreasedValueAttributes,
     hint: hint,
     hintAttributes: hintAttributes,
+    tooltip: tooltip,
     textDirection: TextDirection.ltr,
     transform: transform,
     childrenInTraversalOrder: childrenInTraversalOrder,
@@ -248,10 +253,13 @@ void createPath() {
 external void _validatePath(Path path);
 
 @pragma('vm:entry-point')
-void frameCallback(_Image, int) {
-  print('called back');
+void frameCallback(Object? image, int durationMilliseconds, String decodeError) {
+  validateFrameCallback(image, durationMilliseconds, decodeError);
 }
 
+@pragma('vm:external-name', 'ValidateFrameCallback')
+external void validateFrameCallback(Object? image, int durationMilliseconds, String decodeError);
+
 @pragma('vm:entry-point')
 void platformMessagePortResponseTest() async {
   ReceivePort receivePort = ReceivePort();
@@ -270,9 +278,16 @@ void platformMessagePortResponseTest() async {
 @pragma('vm:entry-point')
 void platformMessageResponseTest() {
   _callPlatformMessageResponseDart((ByteData? result) {
-    if (result is UnmodifiableByteDataView &&
-        result.lengthInBytes == 100) {
-      _finishCallResponse(true);
+    if (result is ByteData && result.lengthInBytes == 100) {
+      int value = result.getInt8(0);
+      bool didThrowOnModify = false;
+      try {
+        result.setInt8(0, value);
+      } catch (e) {
+        didThrowOnModify = true;
+      }
+      // This should be a read only buffer.
+      _finishCallResponse(didThrowOnModify);
     } else {
       _finishCallResponse(false);
     }
@@ -307,7 +322,7 @@ Future<void> encodeImageProducesExternalUint8List() async {
   canvas.drawCircle(c, 25.0, paint);
   final Picture picture = pictureRecorder.endRecording();
   final Image image = await picture.toImage(100, 100);
-  _encodeImage(image, ImageByteFormat.png.index, (Uint8List result) {
+  _encodeImage(image, ImageByteFormat.png.index, (Uint8List result, String? error) {
     // The buffer should be non-null and writable.
     result[0] = 0;
     // The buffer should be external typed data.
@@ -316,9 +331,65 @@ Future<void> encodeImageProducesExternalUint8List() async {
 }
 
 @pragma('vm:external-name', 'EncodeImage')
-external void _encodeImage(Image i, int format, void Function(Uint8List result));
+external void _encodeImage(Image i, int format, void Function(Uint8List result, String? error));
 @pragma('vm:external-name', 'ValidateExternal')
 external void _validateExternal(Uint8List result);
+@pragma('vm:external-name', 'ValidateError')
+external void _validateError(String? error);
+@pragma('vm:external-name', 'TurnOffGPU')
+external void _turnOffGPU(bool value);
+@pragma('vm:external-name', 'FlushGpuAwaitingTasks')
+external void _flushGpuAwaitingTasks();
+@pragma('vm:external-name', 'ValidateNotNull')
+external void _validateNotNull(Object? object);
+
+@pragma('vm:entry-point')
+Future<void> toByteDataWithoutGPU() async {
+  final PictureRecorder pictureRecorder = PictureRecorder();
+  final Canvas canvas = Canvas(pictureRecorder);
+  final Paint paint = Paint()
+    ..color = Color.fromRGBO(255, 255, 255, 1.0)
+    ..style = PaintingStyle.fill;
+  final Offset c = Offset(50.0, 50.0);
+  canvas.drawCircle(c, 25.0, paint);
+  final Picture picture = pictureRecorder.endRecording();
+  final Image image = await picture.toImage(100, 100);
+  _turnOffGPU(true);
+  Timer flusher = Timer.periodic(Duration(milliseconds: 1), (timer) {
+    _flushGpuAwaitingTasks();
+  });
+  try {
+    ByteData? byteData = await image.toByteData();
+    _validateError(null);
+  } catch (error) {
+    _validateError(error.toString());
+  } finally {
+    flusher.cancel();
+  }
+}
+
+@pragma('vm:entry-point')
+Future<void> toByteDataRetries() async {
+  final PictureRecorder pictureRecorder = PictureRecorder();
+  final Canvas canvas = Canvas(pictureRecorder);
+  final Paint paint = Paint()
+    ..color = Color.fromRGBO(255, 255, 255, 1.0)
+    ..style = PaintingStyle.fill;
+  final Offset c = Offset(50.0, 50.0);
+  canvas.drawCircle(c, 25.0, paint);
+  final Picture picture = pictureRecorder.endRecording();
+  final Image image = await picture.toImage(100, 100);
+  _turnOffGPU(true);
+  Future<void>.delayed(Duration(milliseconds: 10), () {
+    _turnOffGPU(false);
+  });
+  try {
+    ByteData? byteData = await image.toByteData();
+    _validateNotNull(byteData);
+  } catch (error) {
+    _validateNotNull(null);
+  }
+}
 
 @pragma('vm:entry-point')
 Future<void> pumpImage() async {
@@ -441,7 +512,7 @@ void hooksTests() async {
     window.onMetricsChanged!();
     _callHook(
       '_updateWindowMetrics',
-      20,
+      21,
       0, // window Id
       0.1234, // device pixel ratio
       0.0,    // width
@@ -462,6 +533,7 @@ void hooksTests() async {
       <double>[],  // display features bounds
       <int>[],     // display features types
       <int>[],     // display features states
+      0, // Display ID
     );
 
     expectIdentical(originalZone, callbackZone);
@@ -534,10 +606,15 @@ void hooksTests() async {
     expectEquals(x.countryCode, y.countryCode);
   });
 
-  await test('Window padding/insets/viewPadding/systemGestureInsets', () {
+  await test('PlatformDispatcher.view getter returns view with provided ID', () {
+    const int viewId = 0;
+    expectEquals(PlatformDispatcher.instance.view(id: viewId)?.viewId, viewId);
+  });
+
+  await test('View padding/insets/viewPadding/systemGestureInsets', () {
     _callHook(
       '_updateWindowMetrics',
-      20,
+      21,
       0, // window Id
       1.0, // devicePixelRatio
       800.0, // width
@@ -558,6 +635,7 @@ void hooksTests() async {
       <double>[],  // display features bounds
       <int>[],     // display features types
       <int>[],     // display features states
+      0, // Display ID
     );
 
     expectEquals(window.viewInsets.bottom, 0.0);
@@ -567,7 +645,7 @@ void hooksTests() async {
 
     _callHook(
       '_updateWindowMetrics',
-      20,
+      21,
       0, // window Id
       1.0, // devicePixelRatio
       800.0, // width
@@ -588,6 +666,7 @@ void hooksTests() async {
       <double>[],  // display features bounds
       <int>[],     // display features types
       <int>[],     // display features states
+      0, // Display ID
     );
 
     expectEquals(window.viewInsets.bottom, 400.0);
@@ -596,10 +675,10 @@ void hooksTests() async {
     expectEquals(window.systemGestureInsets.bottom, 44.0);
   });
 
-   await test('Window physical touch slop', () {
+  await test('Window physical touch slop', () {
     _callHook(
       '_updateWindowMetrics',
-      20,
+      21,
       0, // window Id
       1.0, // devicePixelRatio
       800.0, // width
@@ -620,14 +699,15 @@ void hooksTests() async {
       <double>[],  // display features bounds
       <int>[],     // display features types
       <int>[],     // display features states
+      0, // Display ID
     );
 
-    expectEquals(window.viewConfiguration.gestureSettings,
+    expectEquals(window.gestureSettings,
       GestureSettings(physicalTouchSlop: 11.0));
 
     _callHook(
       '_updateWindowMetrics',
-      20,
+      21,
       0, // window Id
       1.0, // devicePixelRatio
       800.0, // width
@@ -648,14 +728,15 @@ void hooksTests() async {
       <double>[],  // display features bounds
       <int>[],     // display features types
       <int>[],     // display features states
+      0, // Display ID
     );
 
-    expectEquals(window.viewConfiguration.gestureSettings,
+    expectEquals(window.gestureSettings,
       GestureSettings(physicalTouchSlop: null));
 
     _callHook(
       '_updateWindowMetrics',
-      20,
+      21,
       0, // window Id
       1.0, // devicePixelRatio
       800.0, // width
@@ -676,9 +757,10 @@ void hooksTests() async {
       <double>[],  // display features bounds
       <int>[],     // display features types
       <int>[],     // display features states
+      0, // Display ID
     );
 
-    expectEquals(window.viewConfiguration.gestureSettings,
+    expectEquals(window.gestureSettings,
       GestureSettings(physicalTouchSlop: 22.0));
   });
 
@@ -786,25 +868,23 @@ void hooksTests() async {
     expectEquals(enabled, newValue);
   });
 
-  await test('onSemanticsAction preserves callback zone', () {
+  await test('onSemanticsActionEvent preserves callback zone', () {
     late Zone innerZone;
     late Zone runZone;
-    late int id;
-    late int action;
+    late SemanticsActionEvent action;
 
     runZoned(() {
       innerZone = Zone.current;
-      window.onSemanticsAction = (int i, SemanticsAction a, ByteData? _) {
+      PlatformDispatcher.instance.onSemanticsActionEvent = (SemanticsActionEvent actionEvent) {
         runZone = Zone.current;
-        action = a.index;
-        id = i;
+        action = actionEvent;
       };
     });
 
     _callHook('_dispatchSemanticsAction', 3, 1234, 4, null);
     expectIdentical(runZone, innerZone);
-    expectEquals(id, 1234);
-    expectEquals(action, 4);
+    expectEquals(action.nodeId, 1234);
+    expectEquals(action.type.index, 4);
   });
 
   await test('onPlatformMessage preserves callback zone', () {
@@ -878,6 +958,28 @@ void hooksTests() async {
     expectEquals(frameNumber, 2);
   });
 
+  await test('_updateDisplays preserves callback zone', () {
+    late Zone innerZone;
+    late Zone runZone;
+    late Display display;
+
+    runZoned(() {
+      innerZone = Zone.current;
+      window.onMetricsChanged = () {
+        runZone = Zone.current;
+        display = PlatformDispatcher.instance.displays.first;
+      };
+    });
+
+    _callHook('_updateDisplays', 5, <int>[0], <double>[800], <double>[600], <double>[1.5], <double>[65]);
+    expectNotEquals(runZone, null);
+    expectIdentical(runZone, innerZone);
+    expectEquals(display.id, 0);
+    expectEquals(display.size, const Size(800, 600));
+    expectEquals(display.devicePixelRatio, 1.5);
+    expectEquals(display.refreshRate, 65);
+  });
+
   await test('_futureize handles callbacker sync error', () async {
     String? callbacker(void Function(Object? arg) cb) {
       return 'failure';
@@ -1040,4 +1142,5 @@ external void _callHook(
   Object? arg18,
   Object? arg19,
   Object? arg20,
+  Object? arg21,
 ]);
diff --git a/lib/ui/floating_point.h b/lib/ui/floating_point.h
new file mode 100644
index 0000000000000000000000000000000000000000..eb587603ff2b2cde926657850057ec7a4f485c19
--- /dev/null
+++ b/lib/ui/floating_point.h
@@ -0,0 +1,28 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_LIB_UI_FLOATING_POINT_H_
+#define FLUTTER_LIB_UI_FLOATING_POINT_H_
+
+#include <algorithm>
+#include <limits>
+
+namespace flutter {
+
+/// Converts a double to a float, truncating finite values that are larger than
+/// FLT_MAX or smaller than FLT_MIN to those values.
+static float SafeNarrow(double value) {
+  if (std::isinf(value) || std::isnan(value)) {
+    return static_cast<float>(value);
+  } else {
+    // Avoid truncation to inf/-inf.
+    return std::clamp(static_cast<float>(value),
+                      std::numeric_limits<float>::lowest(),
+                      std::numeric_limits<float>::max());
+  }
+}
+
+}  // namespace flutter
+
+#endif  // FLUTTER_LIB_UI_FLOATING_POINT_H_
diff --git a/lib/ui/geometry.dart b/lib/ui/geometry.dart
index 9945ba8666898729cdfb34ceb7f17a8900d9e790..6f00295aaa40ae7cb0815981aa9d63c836f20b64 100644
--- a/lib/ui/geometry.dart
+++ b/lib/ui/geometry.dart
@@ -12,9 +12,7 @@ abstract class OffsetBase {
   ///
   /// The first argument sets the horizontal component, and the second the
   /// vertical component.
-  const OffsetBase(this._dx, this._dy)
-      : assert(_dx != null),
-        assert(_dy != null);
+  const OffsetBase(this._dx, this._dy);
 
   final double _dx;
   final double _dy;
@@ -314,7 +312,6 @@ class Offset extends OffsetBase {
   /// Values for `t` are usually obtained from an [Animation<double>], such as
   /// an [AnimationController].
   static Offset? lerp(Offset? a, Offset? b, double t) {
-    assert(t != null);
     if (b == null) {
       if (a == null) {
         return null;
@@ -590,7 +587,6 @@ class Size extends OffsetBase {
   /// Values for `t` are usually obtained from an [Animation<double>], such as
   /// an [AnimationController].
   static Size? lerp(Size? a, Size? b, double t) {
-    assert(t != null);
     if (b == null) {
       if (a == null) {
         return null;
@@ -625,7 +621,7 @@ class Size extends OffsetBase {
 /// An immutable, 2D, axis-aligned, floating-point rectangle whose coordinates
 /// are relative to a given origin.
 ///
-/// A Rect can be created with one its constructors or from an [Offset] and a
+/// A Rect can be created with one of its constructors or from an [Offset] and a
 /// [Size] using the `&` operator:
 ///
 /// ```dart
@@ -636,12 +632,7 @@ class Rect {
   ///
   /// ![](https://flutter.github.io/assets-for-api-docs/assets/dart-ui/rect_from_ltrb.png#gh-light-mode-only)
   /// ![](https://flutter.github.io/assets-for-api-docs/assets/dart-ui/rect_from_ltrb_dark.png#gh-dark-mode-only)
-  @pragma('vm:entry-point')
-  const Rect.fromLTRB(this.left, this.top, this.right, this.bottom)
-      : assert(left != null),
-        assert(top != null),
-        assert(right != null),
-        assert(bottom != null);
+  const Rect.fromLTRB(this.left, this.top, this.right, this.bottom);
 
   /// Construct a rectangle from its left and top edges, its width, and its
   /// height.
@@ -891,7 +882,6 @@ class Rect {
   /// Values for `t` are usually obtained from an [Animation<double>], such as
   /// an [AnimationController].
   static Rect? lerp(Rect? a, Rect? b, double t) {
-    assert(t != null);
     if (b == null) {
       if (a == null) {
         return null;
@@ -1059,7 +1049,6 @@ class Radius {
   /// Values for `t` are usually obtained from an [Animation<double>], such as
   /// an [AnimationController].
   static Radius? lerp(Radius? a, Radius? b, double t) {
-    assert(t != null);
     if (b == null) {
       if (a == null) {
         return null;
@@ -1227,7 +1216,7 @@ class RRect {
          brRadiusY: bottomRight.y,
        );
 
-  /// Construct a rounded rectangle from its bounding box and and topLeft,
+  /// Construct a rounded rectangle from its bounding box and topLeft,
   /// topRight, bottomRight, and bottomLeft radii.
   ///
   /// The corner radii default to [Radius.zero], i.e. right-angled corners. Will
@@ -1268,19 +1257,7 @@ class RRect {
     this.brRadiusY = 0.0,
     this.blRadiusX = 0.0,
     this.blRadiusY = 0.0,
-  }) : assert(left != null),
-       assert(top != null),
-       assert(right != null),
-       assert(bottom != null),
-       assert(tlRadiusX != null),
-       assert(tlRadiusY != null),
-       assert(trRadiusX != null),
-       assert(trRadiusY != null),
-       assert(brRadiusX != null),
-       assert(brRadiusY != null),
-       assert(blRadiusX != null),
-       assert(blRadiusY != null),
-       assert(tlRadiusX >= 0),
+  }) : assert(tlRadiusX >= 0),
        assert(tlRadiusY >= 0),
        assert(trRadiusX >= 0),
        assert(trRadiusY >= 0),
@@ -1661,7 +1638,6 @@ class RRect {
   /// Values for `t` are usually obtained from an [Animation<double>], such as
   /// an [AnimationController].
   static RRect? lerp(RRect? a, RRect? b, double t) {
-    assert(t != null);
     if (b == null) {
       if (a == null) {
         return null;
diff --git a/lib/ui/hash_codes.dart b/lib/ui/hash_codes.dart
index ea0f5b9162ba7bf55a2fe9f1c6b484f5f0a5c12c..661f7a6adcb8ec8edc575d51960f60e4e147a8f1 100644
--- a/lib/ui/hash_codes.dart
+++ b/lib/ui/hash_codes.dart
@@ -8,6 +8,7 @@ part of dart.ui;
 // int foo = 0;
 // int bar = 0;
 // List<int> quux = <int>[];
+// List<int>? thud;
 // int baz = 0;
 
 class _HashEnd { const _HashEnd(); }
@@ -59,11 +60,11 @@ class _Jenkins {
 /// int get hashCode => Object.hash(foo, bar, Object.hashAll(quux), baz);
 /// ```
 ///
-/// If `quux` in this example was nullable, then it would need special handling,
+/// If a parameter is nullable, then it needs special handling,
 /// because [Object.hashAll]'s argument is not nullable:
 ///
 /// ```dart
-/// int get hashCode => Object.hash(foo, bar, quux == null ? null : Object.hashAll(quux), baz);
+/// int get hashCode => Object.hash(foo, bar, thud == null ? null : Object.hashAll(thud!), baz);
 /// ```
 @Deprecated(
   'Use Object.hash() instead. '
diff --git a/lib/ui/hooks.dart b/lib/ui/hooks.dart
index 1cdbf90baeebfe2d3a0493c7d28694a6edd42306..1888e1d575a77f111000bd9a3efaa75e1f7a34a3 100644
--- a/lib/ui/hooks.dart
+++ b/lib/ui/hooks.dart
@@ -4,9 +4,178 @@
 
 part of dart.ui;
 
+@pragma('vm:entry-point')
+void _addView(
+  int viewId,
+  double devicePixelRatio,
+  double width,
+  double height,
+  double viewPaddingTop,
+  double viewPaddingRight,
+  double viewPaddingBottom,
+  double viewPaddingLeft,
+  double viewInsetTop,
+  double viewInsetRight,
+  double viewInsetBottom,
+  double viewInsetLeft,
+  double systemGestureInsetTop,
+  double systemGestureInsetRight,
+  double systemGestureInsetBottom,
+  double systemGestureInsetLeft,
+  double physicalTouchSlop,
+  List<double> displayFeaturesBounds,
+  List<int> displayFeaturesType,
+  List<int> displayFeaturesState,
+  int displayId,
+) {
+  final _ViewConfiguration viewConfiguration = _buildViewConfiguration(
+    devicePixelRatio,
+    width,
+    height,
+    viewPaddingTop,
+    viewPaddingRight,
+    viewPaddingBottom,
+    viewPaddingLeft,
+    viewInsetTop,
+    viewInsetRight,
+    viewInsetBottom,
+    viewInsetLeft,
+    systemGestureInsetTop,
+    systemGestureInsetRight,
+    systemGestureInsetBottom,
+    systemGestureInsetLeft,
+    physicalTouchSlop,
+    displayFeaturesBounds,
+    displayFeaturesType,
+    displayFeaturesState,
+    displayId,
+  );
+  PlatformDispatcher.instance._addView(viewId, viewConfiguration);
+}
+
+@pragma('vm:entry-point')
+void _removeView(int viewId) {
+  PlatformDispatcher.instance._removeView(viewId);
+}
+
+@pragma('vm:entry-point')
+void _updateDisplays(
+  List<int> ids,
+  List<double> widths,
+  List<double> heights,
+  List<double> devicePixelRatios,
+  List<double> refreshRates,
+) {
+  assert(ids.length == widths.length);
+  assert(ids.length == heights.length);
+  assert(ids.length == devicePixelRatios.length);
+  assert(ids.length == refreshRates.length);
+  final List<Display> displays = <Display>[];
+  for (int index = 0; index < ids.length; index += 1) {
+    final int displayId = ids[index];
+    displays.add(Display._(
+      id: displayId,
+      size: Size(widths[index], heights[index]),
+      devicePixelRatio: devicePixelRatios[index],
+      refreshRate: refreshRates[index],
+    ));
+  }
+
+  PlatformDispatcher.instance._updateDisplays(displays);
+}
+
+List<DisplayFeature> _decodeDisplayFeatures({
+  required List<double> bounds,
+  required List<int> type,
+  required List<int> state,
+  required double devicePixelRatio,
+}) {
+  assert(bounds.length / 4 == type.length, 'Bounds are rectangles, requiring 4 measurements each');
+  assert(type.length == state.length);
+  final List<DisplayFeature> result = <DisplayFeature>[];
+  for(int i = 0; i < type.length; i++) {
+    final int rectOffset = i * 4;
+    result.add(DisplayFeature(
+      bounds: Rect.fromLTRB(
+        bounds[rectOffset] / devicePixelRatio,
+        bounds[rectOffset + 1] / devicePixelRatio,
+        bounds[rectOffset + 2] / devicePixelRatio,
+        bounds[rectOffset + 3] / devicePixelRatio,
+      ),
+      type: DisplayFeatureType.values[type[i]],
+      state: state[i] < DisplayFeatureState.values.length
+          ? DisplayFeatureState.values[state[i]]
+          : DisplayFeatureState.unknown,
+    ));
+  }
+  return result;
+}
+
+_ViewConfiguration _buildViewConfiguration(
+  double devicePixelRatio,
+  double width,
+  double height,
+  double viewPaddingTop,
+  double viewPaddingRight,
+  double viewPaddingBottom,
+  double viewPaddingLeft,
+  double viewInsetTop,
+  double viewInsetRight,
+  double viewInsetBottom,
+  double viewInsetLeft,
+  double systemGestureInsetTop,
+  double systemGestureInsetRight,
+  double systemGestureInsetBottom,
+  double systemGestureInsetLeft,
+  double physicalTouchSlop,
+  List<double> displayFeaturesBounds,
+  List<int> displayFeaturesType,
+  List<int> displayFeaturesState,
+  int displayId,
+) {
+  return _ViewConfiguration(
+    devicePixelRatio: devicePixelRatio,
+    size: Size(width, height),
+    viewPadding: ViewPadding._(
+      top: viewPaddingTop,
+      right: viewPaddingRight,
+      bottom: viewPaddingBottom,
+      left: viewPaddingLeft,
+    ),
+    viewInsets: ViewPadding._(
+      top: viewInsetTop,
+      right: viewInsetRight,
+      bottom: viewInsetBottom,
+      left: viewInsetLeft,
+    ),
+    padding: ViewPadding._(
+      top: math.max(0.0, viewPaddingTop - viewInsetTop),
+      right: math.max(0.0, viewPaddingRight - viewInsetRight),
+      bottom: math.max(0.0, viewPaddingBottom - viewInsetBottom),
+      left: math.max(0.0, viewPaddingLeft - viewInsetLeft),
+    ),
+    systemGestureInsets: ViewPadding._(
+      top: math.max(0.0, systemGestureInsetTop),
+      right: math.max(0.0, systemGestureInsetRight),
+      bottom: math.max(0.0, systemGestureInsetBottom),
+      left: math.max(0.0, systemGestureInsetLeft),
+    ),
+    gestureSettings: GestureSettings(
+      physicalTouchSlop: physicalTouchSlop == _kUnsetGestureSetting ? null : physicalTouchSlop,
+    ),
+    displayFeatures: _decodeDisplayFeatures(
+      bounds: displayFeaturesBounds,
+      type: displayFeaturesType,
+      state: displayFeaturesState,
+      devicePixelRatio: devicePixelRatio,
+    ),
+    displayId: displayId,
+  );
+}
+
 @pragma('vm:entry-point')
 void _updateWindowMetrics(
-  Object id,
+  int viewId,
   double devicePixelRatio,
   double width,
   double height,
@@ -26,9 +195,9 @@ void _updateWindowMetrics(
   List<double> displayFeaturesBounds,
   List<int> displayFeaturesType,
   List<int> displayFeaturesState,
+  int displayId,
 ) {
-  PlatformDispatcher.instance._updateWindowMetrics(
-    id,
+  final _ViewConfiguration viewConfiguration = _buildViewConfiguration(
     devicePixelRatio,
     width,
     height,
@@ -48,7 +217,9 @@ void _updateWindowMetrics(
     displayFeaturesBounds,
     displayFeaturesType,
     displayFeaturesState,
+    displayId,
   );
+  PlatformDispatcher.instance._updateWindowMetrics(viewId, viewConfiguration);
 }
 
 typedef _LocaleClosure = String Function();
@@ -67,8 +238,8 @@ void _updateUserSettingsData(String jsonData) {
 }
 
 @pragma('vm:entry-point')
-void _updateLifecycleState(String state) {
-  PlatformDispatcher.instance._updateLifecycleState(state);
+void _updateInitialLifecycleState(String state) {
+  PlatformDispatcher.instance._updateInitialLifecycleState(state);
 }
 
 @pragma('vm:entry-point')
@@ -92,8 +263,8 @@ void _dispatchPointerDataPacket(ByteData packet) {
 }
 
 @pragma('vm:entry-point')
-void _dispatchSemanticsAction(int id, int action, ByteData? args) {
-  PlatformDispatcher.instance._dispatchSemanticsAction(id, action, args);
+void _dispatchSemanticsAction(int nodeId, int action, ByteData? args) {
+  PlatformDispatcher.instance._dispatchSemanticsAction(nodeId, action, args);
 }
 
 @pragma('vm:entry-point')
@@ -117,8 +288,7 @@ bool _onError(Object error, StackTrace? stackTrace) {
   return PlatformDispatcher.instance._dispatchError(error, stackTrace ?? StackTrace.empty);
 }
 
-// ignore: always_declare_return_types, prefer_generic_function_type_aliases
-typedef _ListStringArgFunction(List<String> args);
+typedef _ListStringArgFunction = Object? Function(List<String> args);
 
 @pragma('vm:entry-point')
 void _runMain(Function startMainIsolateFunction,
@@ -138,9 +308,6 @@ void _invoke(void Function()? callback, Zone zone) {
   if (callback == null) {
     return;
   }
-
-  assert(zone != null);
-
   if (identical(zone, Zone.current)) {
     callback();
   } else {
@@ -157,9 +324,6 @@ void _invoke1<A>(void Function(A a)? callback, Zone zone, A arg) {
   if (callback == null) {
     return;
   }
-
-  assert(zone != null);
-
   if (identical(zone, Zone.current)) {
     callback(arg);
   } else {
@@ -176,9 +340,6 @@ void _invoke2<A1, A2>(void Function(A1 a1, A2 a2)? callback, Zone zone, A1 arg1,
   if (callback == null) {
     return;
   }
-
-  assert(zone != null);
-
   if (identical(zone, Zone.current)) {
     callback(arg1, arg2);
   } else {
@@ -197,9 +358,6 @@ void _invoke3<A1, A2, A3>(void Function(A1 a1, A2 a2, A3 a3)? callback, Zone zon
   if (callback == null) {
     return;
   }
-
-  assert(zone != null);
-
   if (identical(zone, Zone.current)) {
     callback(arg1, arg2, arg3);
   } else {
diff --git a/lib/ui/hooks_unittests.cc b/lib/ui/hooks_unittests.cc
index 8fc69f42dcd7dd81be5e45201bed875d7debceba..9158e4410c5ef268fa366ea79f1230be5ad08f70 100644
--- a/lib/ui/hooks_unittests.cc
+++ b/lib/ui/hooks_unittests.cc
@@ -54,14 +54,14 @@ TEST_F(HooksTest, HooksUnitTests) {
     int64_t arg_count;
     Dart_IntegerToInt64(arg_count_handle, &arg_count);
 
-    Dart_Handle hook_args[arg_count];
+    std::vector<Dart_Handle> hook_args;
     for (int i = 0; i < static_cast<int>(arg_count); i++) {
-      hook_args[i] = Dart_GetNativeArgument(args, 2 + i);
-      CHECK_DART_ERROR(hook_args[i]);
+      hook_args.push_back(Dart_GetNativeArgument(args, 2 + i));
+      CHECK_DART_ERROR(hook_args.back());
     }
 
     Dart_Handle hook_result =
-        Dart_InvokeClosure(hook, static_cast<int>(arg_count), hook_args);
+        Dart_InvokeClosure(hook, hook_args.size(), hook_args.data());
     CHECK_DART_ERROR(hook_result);
   };
 
diff --git a/lib/ui/isolate_name_server.dart b/lib/ui/isolate_name_server.dart
index d19012fe859c3b64e2e6f478a2080798dc535abf..4b1a64300d897bcdf97c8c13cd57a293aa1a4eb2 100644
--- a/lib/ui/isolate_name_server.dart
+++ b/lib/ui/isolate_name_server.dart
@@ -19,11 +19,7 @@ part of dart.ui;
 /// communication or multiple-message communication is necessary, it is
 /// recommended to establish a separate communication channel in that first
 /// message (e.g. by passing a dedicated [SendPort]).
-class IsolateNameServer {
-  // This class is only a namespace, and should not be instantiated or
-  // extended directly.
-  factory IsolateNameServer._() => throw UnsupportedError('Namespace');
-
+abstract final class IsolateNameServer {
   /// Looks up the [SendPort] associated with a given name.
   ///
   /// Returns null if the name does not exist. To register the name in the first
@@ -31,7 +27,6 @@ class IsolateNameServer {
   ///
   /// The `name` argument must not be null.
   static SendPort? lookupPortByName(String name) {
-    assert(name != null, "'name' cannot be null.");
     return _lookupPortByName(name);
   }
 
@@ -49,8 +44,6 @@ class IsolateNameServer {
   ///
   /// The `port` and `name` arguments must not be null.
   static bool registerPortWithName(SendPort port, String name) {
-    assert(port != null, "'port' cannot be null.");
-    assert(name != null, "'name' cannot be null.");
     return _registerPortWithName(port, name);
   }
 
@@ -66,16 +59,15 @@ class IsolateNameServer {
   ///
   /// The `name` argument must not be null.
   static bool removePortNameMapping(String name) {
-    assert(name != null, "'name' cannot be null.");
     return _removePortNameMapping(name);
   }
 
-  @FfiNative<Handle Function(Handle)>('IsolateNameServerNatives::LookupPortByName')
+  @Native<Handle Function(Handle)>(symbol: 'IsolateNameServerNatives::LookupPortByName')
   external static SendPort? _lookupPortByName(String name);
 
-  @FfiNative<Bool Function(Handle, Handle)>('IsolateNameServerNatives::RegisterPortWithName')
+  @Native<Bool Function(Handle, Handle)>(symbol: 'IsolateNameServerNatives::RegisterPortWithName')
   external static bool _registerPortWithName(SendPort port, String name);
 
-  @FfiNative<Bool Function(Handle)>('IsolateNameServerNatives::RemovePortNameMapping')
+  @Native<Bool Function(Handle)>(symbol: 'IsolateNameServerNatives::RemovePortNameMapping')
   external static bool _removePortNameMapping(String name);
 }
diff --git a/lib/ui/isolate_name_server/isolate_name_server.h b/lib/ui/isolate_name_server/isolate_name_server.h
index 22594cfb6166eacc9a516870662890c573ffd41e..4d0b98a526aae34b25b967265ef0f1bd9e543730 100644
--- a/lib/ui/isolate_name_server/isolate_name_server.h
+++ b/lib/ui/isolate_name_server/isolate_name_server.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_LIB_UI_ISOLATE_NAME_SERVER_H_
-#define FLUTTER_LIB_UI_ISOLATE_NAME_SERVER_H_
+#ifndef FLUTTER_LIB_UI_ISOLATE_NAME_SERVER_ISOLATE_NAME_SERVER_H_
+#define FLUTTER_LIB_UI_ISOLATE_NAME_SERVER_ISOLATE_NAME_SERVER_H_
 
 #include <map>
 #include <mutex>
@@ -43,4 +43,4 @@ class IsolateNameServer {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_LIB_UI_ISOLATE_NAME_SERVER_H_
+#endif  // FLUTTER_LIB_UI_ISOLATE_NAME_SERVER_ISOLATE_NAME_SERVER_H_
diff --git a/lib/ui/isolate_name_server/isolate_name_server_natives.h b/lib/ui/isolate_name_server/isolate_name_server_natives.h
index cd7c0a77e474434dc2d0b3ec37c372d48cf8decd..65f9aef43e806f1c66bd12d1cf0cacfe12e5dde0 100644
--- a/lib/ui/isolate_name_server/isolate_name_server_natives.h
+++ b/lib/ui/isolate_name_server/isolate_name_server_natives.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_LIB_UI_ISOLATE_NAME_SERVER_NATIVES_H_
-#define FLUTTER_LIB_UI_ISOLATE_NAME_SERVER_NATIVES_H_
+#ifndef FLUTTER_LIB_UI_ISOLATE_NAME_SERVER_ISOLATE_NAME_SERVER_NATIVES_H_
+#define FLUTTER_LIB_UI_ISOLATE_NAME_SERVER_ISOLATE_NAME_SERVER_NATIVES_H_
 
 #include <string>
 
@@ -21,4 +21,4 @@ class IsolateNameServerNatives {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_LIB_UI_ISOLATE_NAME_SERVER_NATIVES_H_
+#endif  // FLUTTER_LIB_UI_ISOLATE_NAME_SERVER_ISOLATE_NAME_SERVER_NATIVES_H_
diff --git a/lib/ui/key.dart b/lib/ui/key.dart
index ed58e56cdba39e20e2d5538a4b5ac5914990e41a..25eab4ac947548c7ba9199bfe8b168af5cfc82df 100644
--- a/lib/ui/key.dart
+++ b/lib/ui/key.dart
@@ -14,7 +14,47 @@ enum KeyEventType {
   up,
 
   /// The key is held, causing a repeated key input.
-  repeat,
+  repeat;
+
+  String get label {
+    return switch (this) {
+      down => 'Key Down',
+      up => 'Key Up',
+      repeat => 'Key Repeat',
+    };
+  }
+}
+
+/// The source device for the key event.
+///
+/// Not all platforms supply an accurate type.
+// Must match the KeyEventDeviceType enum in ui/window/key_data.h.
+enum KeyEventDeviceType {
+  /// The device is a keyboard.
+  keyboard,
+
+  /// The device is a directional pad on something like a television remote
+  /// control or similar.
+  directionalPad,
+
+  /// The device is a gamepad button
+  gamepad,
+
+  /// The device is a joystick button
+  joystick,
+
+  /// The device is a device connected to an HDMI bus.
+  hdmi;
+
+  String get label {
+    return switch (this) {
+      keyboard => 'Keyboard',
+      directionalPad => 'Directional Pad',
+      gamepad => 'Gamepad',
+      joystick => 'Joystick',
+      hdmi => 'HDMI',
+    };
+  }
 }
 
 /// Information about a key event.
@@ -27,6 +67,7 @@ class KeyData {
     required this.logical,
     required this.character,
     required this.synthesized,
+    this.deviceType = KeyEventDeviceType.keyboard,
   });
 
   /// Time of event dispatch, relative to an arbitrary timeline.
@@ -38,6 +79,10 @@ class KeyData {
   /// The type of the event.
   final KeyEventType type;
 
+  /// Describes what type of device (keyboard, directional pad, etc.) this event
+  /// originated from.
+  final KeyEventDeviceType deviceType;
+
   /// The key code for the physical key that has changed.
   final int physical;
 
@@ -49,30 +94,31 @@ class KeyData {
   /// Ignored for up events.
   final String? character;
 
-  /// If [synthesized] is true, this event does not correspond to a native event.
+  /// If [synthesized] is true, this event does not correspond to a native
+  /// event.
   ///
   /// Although most of Flutter's keyboard events are transformed from native
   /// events, some events are not based on native events, and are synthesized
-  /// only to conform Flutter's key event model (as documented in
-  /// the `HardwareKeyboard` class in the framework).
+  /// only to conform Flutter's key event model (as documented in the
+  /// `HardwareKeyboard` class in the framework).
   ///
   /// For example, some key downs or ups might be lost when the window loses
-  /// focus. Some platforms provides ways to query whether a key is being held.
+  /// focus. Some platforms provide ways to query whether a key is being held.
   /// If the embedder detects an inconsistency between its internal record and
   /// the state returned by the system, the embedder will synthesize a
   /// corresponding event to synchronize the state without breaking the event
   /// model.
   ///
-  /// As another example, macOS treats CapsLock in a special way by sending
-  /// down and up events at the down of alterate presses to indicate the
-  /// direction in which the lock is toggled instead of that the physical key is
-  /// going. A macOS embedder should normalize the behavior by converting a
-  /// native down event into a down event followed immediately by a synthesized
-  /// up event, and the native up event also into a down event followed
-  /// immediately by a synthesized up event.
+  /// As another example, macOS treats CapsLock in a special way by sending down
+  /// and up events at the down of alternate presses to indicate the direction
+  /// in which the lock is toggled instead of that the physical key is going. A
+  /// macOS embedder should normalize the behavior by converting a native down
+  /// event into a down event followed immediately by a synthesized up event,
+  /// and the native up event also into a down event followed immediately by a
+  /// synthesized up event.
   ///
-  /// Synthesized events do not have a trustworthy [timeStamp], and should not be
-  /// processed as if the key actually went down or up at the time of the
+  /// Synthesized events do not have a trustworthy [timeStamp], and should not
+  /// be processed as if the key actually went down or up at the time of the
   /// callback.
   ///
   /// [KeyRepeatEvent] is never synthesized.
@@ -172,29 +218,23 @@ class KeyData {
   }
 
   @override
-  String toString() => 'KeyData(key ${_typeToString(type)}, physical: 0x${physical.toRadixString(16)}, '
-    'logical: ${_logicalToString()}, character: ${_escapeCharacter()}${_quotedCharCode()}${synthesized ? ', synthesized' : ''})';
+  String toString() {
+    return 'KeyData(${type.label}, '
+           'physical: 0x${physical.toRadixString(16)}, '
+           'logical: ${_logicalToString()}, '
+           'character: ${_escapeCharacter()}${_quotedCharCode()}'
+           '${synthesized ? ', synthesized' : ''}';
+  }
 
   /// Returns a complete textual description of the information in this object.
   String toStringFull() {
-    return '$runtimeType('
-            'type: ${_typeToString(type)}, '
-            'timeStamp: $timeStamp, '
-            'physical: 0x${physical.toRadixString(16)}, '
-            'logical: 0x${logical.toRadixString(16)}, '
-            'character: ${_escapeCharacter()}, '
-            'synthesized: $synthesized'
+    return '$runtimeType(type: ${type.label}, '
+           'deviceType: ${deviceType.label}, '
+           'timeStamp: $timeStamp, '
+           'physical: 0x${physical.toRadixString(16)}, '
+           'logical: 0x${logical.toRadixString(16)}, '
+           'character: ${_escapeCharacter()}, '
+           'synthesized: $synthesized'
            ')';
   }
-
-  static String _typeToString(KeyEventType type) {
-    switch (type) {
-      case KeyEventType.up:
-        return 'up';
-      case KeyEventType.down:
-        return 'down';
-      case KeyEventType.repeat:
-        return 'repeat';
-    }
-  }
 }
diff --git a/lib/ui/natives.dart b/lib/ui/natives.dart
index 49a567e5b5db6e35b804cfe3cfa8ea6862200448..72a55ab8b7d57e2eb4afbd95c1c87fb788e2b529 100644
--- a/lib/ui/natives.dart
+++ b/lib/ui/natives.dart
@@ -6,7 +6,7 @@ part of dart.ui;
 // ignore_for_file: avoid_classes_with_only_static_members
 
 /// Helper functions for Dart Plugin Registrants.
-class DartPluginRegistrant {
+abstract final class DartPluginRegistrant {
   static bool _wasInitialized = false;
 
   /// Makes sure the that the Dart Plugin Registrant has been called for this
@@ -18,7 +18,7 @@ class DartPluginRegistrant {
       _ensureInitialized();
     }
   }
-  @FfiNative<Void Function()>('DartPluginRegistrant_EnsureInitialized')
+  @Native<Void Function()>(symbol: 'DartPluginRegistrant_EnsureInitialized')
   external static void _ensureInitialized();
 }
 
@@ -32,10 +32,10 @@ void _printDebug(String arg) {
 }
 
 class _Logger {
-  @FfiNative<Void Function(Handle)>('DartRuntimeHooks::Logger_PrintString')
+  @Native<Void Function(Handle)>(symbol: 'DartRuntimeHooks::Logger_PrintString')
   external static void _printString(String? s);
 
-  @FfiNative<Void Function(Handle)>('DartRuntimeHooks::Logger_PrintDebugString')
+  @Native<Void Function(Handle)>(symbol: 'DartRuntimeHooks::Logger_PrintDebugString')
   external static void _printDebugString(String? s);
 }
 
@@ -83,61 +83,15 @@ Future<developer.ServiceExtensionResponse> _getImpellerEnabled(
   }));
 }
 
-@pragma('vm:entry-point')
-void _setupHooks() {
-  assert(() {
-    // In debug mode, register the schedule frame extension.
-    developer.registerExtension('ext.ui.window.scheduleFrame', _scheduleFrame);
-
-    // In debug mode, allow shaders to be reinitialized.
-    developer.registerExtension(
-      'ext.ui.window.reinitializeShader',
-      _reinitializeShader,
-    );
-    return true;
-  }());
-
-  // In debug and profile mode, allow tools to display the current rendering backend.
-  if (!_kReleaseMode) {
-    developer.registerExtension(
-      'ext.ui.window.impellerEnabled',
-      _getImpellerEnabled,
-    );
-  }
-}
-
 const bool _kReleaseMode = bool.fromEnvironment('dart.vm.product');
 
-/// Returns runtime Dart compilation trace as a UTF-8 encoded memory buffer.
-///
-/// The buffer contains a list of symbols compiled by the Dart JIT at runtime up
-/// to the point when this function was called. This list can be saved to a text
-/// file and passed to tools such as `flutter build` or Dart `gen_snapshot` in
-/// order to pre-compile this code offline.
-///
-/// The list has one symbol per line of the following format:
-/// `<namespace>,<class>,<symbol>\n`.
-///
-/// Here are some examples:
-///
-/// ```csv
-/// dart:core,Duration,get:inMilliseconds
-/// package:flutter/src/widgets/binding.dart,::,runApp
-/// file:///.../my_app.dart,::,main
-/// ```
-///
-/// This function is only effective in debug and dynamic modes, and will throw in AOT mode.
-List<int> saveCompilationTrace() {
-  throw UnimplementedError();
-}
-
-@FfiNative<Void Function(Handle)>('DartRuntimeHooks::ScheduleMicrotask')
+@Native<Void Function(Handle)>(symbol: 'DartRuntimeHooks::ScheduleMicrotask')
 external void _scheduleMicrotask(void Function() callback);
 
-@FfiNative<Handle Function(Handle)>('DartRuntimeHooks::GetCallbackHandle')
+@Native<Handle Function(Handle)>(symbol: 'DartRuntimeHooks::GetCallbackHandle')
 external int? _getCallbackHandle(Function closure);
 
-@FfiNative<Handle Function(Int64)>('DartRuntimeHooks::GetCallbackFromHandle')
+@Native<Handle Function(Int64)>(symbol: 'DartRuntimeHooks::GetCallbackFromHandle')
 external Function? _getCallbackFromHandle(int handle);
 
 typedef _PrintClosure = void Function(String line);
@@ -158,3 +112,12 @@ _ScheduleImmediateClosure _getScheduleMicrotaskClosure() => _scheduleMicrotask;
 // rendering.
 @pragma('vm:entry-point')
 bool _impellerEnabled = false;
+
+// Used internally to indicate whether the embedder enables the implicit view,
+// and the implicit view's ID if so.
+//
+// The exact value of this variable is an implementation detail that may change
+// at any time. Apps should always use PlatformDispatcher.implicitView to
+// determine the current implicit view, if any.
+@pragma('vm:entry-point')
+int? _implicitViewId;
diff --git a/lib/ui/painting.dart b/lib/ui/painting.dart
index d32b570112bedca46f7af0f2285d74a48f2f39d9..a2757b7359ce81fd10bb7b5900f024e0d8352eb1 100644
--- a/lib/ui/painting.dart
+++ b/lib/ui/painting.dart
@@ -23,32 +23,27 @@ part of dart.ui;
 // which can not be rendered by Skia.
 
 bool _rectIsValid(Rect rect) {
-  assert(rect != null, 'Rect argument was null.');
   assert(!rect.hasNaN, 'Rect argument contained a NaN value.');
   return true;
 }
 
 bool _rrectIsValid(RRect rrect) {
-  assert(rrect != null, 'RRect argument was null.');
   assert(!rrect.hasNaN, 'RRect argument contained a NaN value.');
   return true;
 }
 
 bool _offsetIsValid(Offset offset) {
-  assert(offset != null, 'Offset argument was null.');
   assert(!offset.dx.isNaN && !offset.dy.isNaN, 'Offset argument contained a NaN value.');
   return true;
 }
 
 bool _matrix4IsValid(Float64List matrix4) {
-  assert(matrix4 != null, 'Matrix4 argument was null.');
   assert(matrix4.length == 16, 'Matrix4 must have 16 entries.');
   assert(matrix4.every((double value) => value.isFinite), 'Matrix4 entries must be finite.');
   return true;
 }
 
 bool _radiusIsValid(Radius radius) {
-  assert(radius != null, 'Radius argument was null.');
   assert(!radius.x.isNaN && !radius.y.isNaN, 'Radius argument contained a NaN value.');
   return true;
 }
@@ -104,7 +99,6 @@ class Color {
   /// For example, to get a fully opaque orange, you would use `const
   /// Color(0xFFFF9000)` (`FF` for the alpha, `FF` for the red, `90` for the
   /// green, and `00` for the blue).
-  @pragma('vm:entry-point')
   const Color(int value) : value = value & 0xFFFFFFFF;
 
   /// Construct a color from the lower 8 bits of four integers.
@@ -259,7 +253,6 @@ class Color {
   /// Values for `t` are usually obtained from an [Animation<double>], such as
   /// an [AnimationController].
   static Color? lerp(Color? a, Color? b, double t) {
-    assert(t != null);
     if (b == null) {
       if (a == null) {
         return null;
@@ -319,7 +312,6 @@ class Color {
   ///
   /// The [opacity] value may not be null.
   static int getAlphaFromOpacity(double opacity) {
-    assert(opacity != null);
     return (clampDouble(opacity, 0.0, 1.0) * 255).round();
   }
 
@@ -551,6 +543,12 @@ enum BlendMode {
   ///
   /// This corresponds to the "Source plus Destination" Porter-Duff operator.
   ///
+  /// This is the right blend mode for cross-fading between two images. Consider
+  /// two images A and B, and an interpolation time variable _t_ (from 0.0 to
+  /// 1.0). To cross fade between them, A should be drawn with opacity 1.0 - _t_
+  /// into a new layer using [BlendMode.srcOver], and B should be drawn on top
+  /// of it, at opacity _t_, into the same layer, using [BlendMode.plus].
+  ///
   /// ![](https://flutter.github.io/assets-for-api-docs/assets/dart-ui/blend_mode_plus.png)
   plus,
 
@@ -897,7 +895,7 @@ enum FilterQuality {
 ///
 ///  * [Paint.strokeCap] for how this value is used.
 ///  * [StrokeJoin] for the different kinds of line segment joins.
-// These enum values must be kept in sync with SkPaint::Cap.
+// These enum values must be kept in sync with DlStrokeCap.
 enum StrokeCap {
   /// Begin and end contours with a flat edge and no extension.
   ///
@@ -943,7 +941,7 @@ enum StrokeCap {
 /// * [Paint.strokeJoin] and [Paint.strokeMiterLimit] for how this value is
 ///   used.
 /// * [StrokeCap] for the different kinds of line endings.
-// These enum values must be kept in sync with SkPaint::Join.
+// These enum values must be kept in sync with DlStrokeJoin.
 enum StrokeJoin {
   /// Joins between line segments form sharp corners.
   ///
@@ -994,9 +992,9 @@ enum StrokeJoin {
 /// Strategies for painting shapes and paths on a canvas.
 ///
 /// See [Paint.style].
-// These enum values must be kept in sync with SkPaint::Style.
+// These enum values must be kept in sync with DlDrawStyle.
 enum PaintingStyle {
-  // This list comes from Skia's SkPaint.h and the values (order) should be kept
+  // This list comes from dl_paint.h and the values (order) should be kept
   // in sync.
 
   /// Apply the [Paint] to the inside of the shape. For example, when
@@ -1089,14 +1087,10 @@ enum Clip {
 ///
 /// Most APIs on [Canvas] take a [Paint] object to describe the style
 /// to use for that operation.
-class Paint {
+final class Paint {
   /// Constructs an empty [Paint] object with all fields initialized to
   /// their defaults.
-  Paint() {
-    if (enableDithering) {
-      _dither = true;
-    }
-  }
+  Paint();
 
   // Paint objects are encoded in two buffers:
   //
@@ -1129,7 +1123,6 @@ class Paint {
   static const int _kMaskFilterBlurStyleIndex = 10;
   static const int _kMaskFilterSigmaIndex = 11;
   static const int _kInvertColorIndex = 12;
-  static const int _kDitherIndex = 13;
 
   static const int _kIsAntiAliasOffset = _kIsAntiAliasIndex << 2;
   static const int _kColorOffset = _kColorIndex << 2;
@@ -1144,9 +1137,9 @@ class Paint {
   static const int _kMaskFilterBlurStyleOffset = _kMaskFilterBlurStyleIndex << 2;
   static const int _kMaskFilterSigmaOffset = _kMaskFilterSigmaIndex << 2;
   static const int _kInvertColorOffset = _kInvertColorIndex << 2;
-  static const int _kDitherOffset = _kDitherIndex << 2;
+
   // If you add more fields, remember to update _kDataByteCount.
-  static const int _kDataByteCount = 56;
+  static const int _kDataByteCount = 52; // 4 * (last index + 1).
 
   // Binary format must match the deserialization code in paint.cc.
   // C++ unit tests access this.
@@ -1196,7 +1189,6 @@ class Paint {
     return Color(encoded ^ _kColorDefault);
   }
   set color(Color value) {
-    assert(value != null);
     final int encoded = value.value ^ _kColorDefault;
     _data.setInt32(_kColorOffset, encoded, _kFakeHostEndian);
   }
@@ -1227,7 +1219,6 @@ class Paint {
     return BlendMode.values[encoded ^ _kBlendModeDefault];
   }
   set blendMode(BlendMode value) {
-    assert(value != null);
     final int encoded = value.index ^ _kBlendModeDefault;
     _data.setInt32(_kBlendModeOffset, encoded, _kFakeHostEndian);
   }
@@ -1239,7 +1230,6 @@ class Paint {
     return PaintingStyle.values[_data.getInt32(_kStyleOffset, _kFakeHostEndian)];
   }
   set style(PaintingStyle value) {
-    assert(value != null);
     final int encoded = value.index;
     _data.setInt32(_kStyleOffset, encoded, _kFakeHostEndian);
   }
@@ -1253,7 +1243,6 @@ class Paint {
     return _data.getFloat32(_kStrokeWidthOffset, _kFakeHostEndian);
   }
   set strokeWidth(double value) {
-    assert(value != null);
     final double encoded = value;
     _data.setFloat32(_kStrokeWidthOffset, encoded, _kFakeHostEndian);
   }
@@ -1266,7 +1255,6 @@ class Paint {
     return StrokeCap.values[_data.getInt32(_kStrokeCapOffset, _kFakeHostEndian)];
   }
   set strokeCap(StrokeCap value) {
-    assert(value != null);
     final int encoded = value.index;
     _data.setInt32(_kStrokeCapOffset, encoded, _kFakeHostEndian);
   }
@@ -1300,7 +1288,6 @@ class Paint {
     return StrokeJoin.values[_data.getInt32(_kStrokeJoinOffset, _kFakeHostEndian)];
   }
   set strokeJoin(StrokeJoin value) {
-    assert(value != null);
     final int encoded = value.index;
     _data.setInt32(_kStrokeJoinOffset, encoded, _kFakeHostEndian);
   }
@@ -1338,7 +1325,6 @@ class Paint {
     return _data.getFloat32(_kStrokeMiterLimitOffset, _kFakeHostEndian);
   }
   set strokeMiterLimit(double value) {
-    assert(value != null);
     final double encoded = value - _kStrokeMiterLimitDefault;
     _data.setFloat32(_kStrokeMiterLimitOffset, encoded, _kFakeHostEndian);
   }
@@ -1383,7 +1369,6 @@ class Paint {
     return FilterQuality.values[_data.getInt32(_kFilterQualityOffset, _kFakeHostEndian)];
   }
   set filterQuality(FilterQuality value) {
-    assert(value != null);
     final int encoded = value.index;
     _data.setInt32(_kFilterQualityOffset, encoded, _kFakeHostEndian);
   }
@@ -1489,30 +1474,6 @@ class Paint {
     _data.setInt32(_kInvertColorOffset, value ? 1 : 0, _kFakeHostEndian);
   }
 
-  bool get _dither {
-    return _data.getInt32(_kDitherOffset, _kFakeHostEndian) == 1;
-  }
-  set _dither(bool value) {
-    _data.setInt32(_kDitherOffset, value ? 1 : 0, _kFakeHostEndian);
-  }
-
-  /// Whether to dither the output when drawing images.
-  ///
-  /// If false, the default value, dithering will be enabled when the input
-  /// color depth is higher than the output color depth. For example,
-  /// drawing an RGB8 image onto an RGB565 canvas.
-  ///
-  /// This value also controls dithering of [shader]s, which can make
-  /// gradients appear smoother.
-  ///
-  /// Whether or not dithering affects the output is implementation defined.
-  /// Some implementations may choose to ignore this completely, if they're
-  /// unable to control dithering.
-  ///
-  /// To ensure that dithering is consistently enabled for your entire
-  /// application, set this to true before invoking any drawing related code.
-  static bool enableDithering = false;
-
   @override
   String toString() {
     if (const bool.fromEnvironment('dart.vm.product')) {
@@ -1540,7 +1501,7 @@ class Paint {
       }
       semicolon = '; ';
     }
-    if (isAntiAlias != true) {
+    if (!isAntiAlias) {
       result.write('${semicolon}antialias off');
       semicolon = '; ';
     }
@@ -1575,14 +1536,36 @@ class Paint {
     if (invertColors) {
       result.write('${semicolon}invert: $invertColors');
     }
-    if (_dither) {
-      result.write('${semicolon}dither: $_dither');
-    }
     result.write(')');
     return result.toString();
   }
 }
 
+/// The color space describes the colors that are available to an [Image].
+///
+/// This value can help decide which [ImageByteFormat] to use with
+/// [Image.toByteData]. Images that are in the [extendedSRGB] color space
+/// should use something like [ImageByteFormat.rawExtendedRgba128] so that
+/// colors outside of the sRGB gamut aren't lost.
+///
+/// This is also the result of [Image.colorSpace].
+///
+/// See also: https://en.wikipedia.org/wiki/Color_space
+enum ColorSpace {
+  /// The sRGB color space.
+  ///
+  /// You may know this as the standard color space for the web or the color
+  /// space of non-wide-gamut Flutter apps.
+  ///
+  /// See also: https://en.wikipedia.org/wiki/SRGB
+  sRGB,
+  /// A color space that is backwards compatible with sRGB but can represent
+  /// colors outside of that gamut with values outside of [0..1]. In order to
+  /// see the extended values an [ImageByteFormat] like
+  /// [ImageByteFormat.rawExtendedRgba128] must be used.
+  extendedSRGB,
+}
+
 /// The format in which image bytes should be returned when using
 /// [Image.toByteData].
 // We do not expect to add more encoding formats to the ImageByteFormat enum,
@@ -1606,6 +1589,31 @@ enum ImageByteFormat {
   /// image may use a single 8-bit channel for each pixel.
   rawUnmodified,
 
+  /// Raw extended range RGBA format.
+  ///
+  /// Unencoded bytes, in RGBA row-primary form with straight alpha, 32 bit
+  /// float (IEEE 754 binary32) per channel.
+  ///
+  /// Example usage:
+  ///
+  /// ```dart
+  /// import 'dart:ui' as ui;
+  /// import 'dart:typed_data';
+  ///
+  /// Future<Map<String, double>> getFirstPixel(ui.Image image) async {
+  ///   final ByteData data =
+  ///       (await image.toByteData(format: ui.ImageByteFormat.rawExtendedRgba128))!;
+  ///   final Float32List floats = Float32List.view(data.buffer);
+  ///   return <String, double>{
+  ///     'r': floats[0],
+  ///     'g': floats[1],
+  ///     'b': floats[2],
+  ///     'a': floats[3],
+  ///   };
+  /// }
+  /// ```
+  rawExtendedRgba128,
+
   /// PNG format.
   ///
   /// A loss-less compression format for images. This format is well suited for
@@ -1628,13 +1636,19 @@ enum ImageByteFormat {
 enum PixelFormat {
   /// Each pixel is 32 bits, with the highest 8 bits encoding red, the next 8
   /// bits encoding green, the next 8 bits encoding blue, and the lowest 8 bits
-  /// encoding alpha.
+  /// encoding alpha. Premultiplied alpha is used.
   rgba8888,
 
   /// Each pixel is 32 bits, with the highest 8 bits encoding blue, the next 8
   /// bits encoding green, the next 8 bits encoding red, and the lowest 8 bits
-  /// encoding alpha.
+  /// encoding alpha. Premultiplied alpha is used.
   bgra8888,
+
+  /// Each pixel is 128 bits, where each color component is a 32 bit float that
+  /// is normalized across the sRGB gamut.  The first float is the red
+  /// component, followed by: green, blue and alpha. Premultiplied alpha isn't
+  /// used, matching [ImageByteFormat.rawExtendedRgba128].
+  rgbaFloat32,
 }
 
 /// Signature for [Image] lifecycle events.
@@ -1741,6 +1755,10 @@ class Image {
   /// The [format] argument specifies the format in which the bytes will be
   /// returned.
   ///
+  /// Using [ImageByteFormat.rawRgba] on an image in the color space
+  /// [ColorSpace.extendedSRGB] will result in the gamut being squished to fit
+  /// into the sRGB gamut, resulting in the loss of wide-gamut colors.
+  ///
   /// Returns a future that completes with the binary image data or an error
   /// if encoding fails.
   // We do not expect to add more encoding formats to the ImageByteFormat enum,
@@ -1752,6 +1770,29 @@ class Image {
     return _image.toByteData(format: format);
   }
 
+  /// The color space that is used by the [Image]'s colors.
+  ///
+  /// This value is a consequence of how the [Image] has been created.  For
+  /// example, loading a PNG that is in the Display P3 color space will result
+  /// in a [ColorSpace.extendedSRGB] image.
+  ///
+  /// On rendering backends that don't support wide gamut colors (anything but
+  /// iOS impeller), wide gamut images will still report [ColorSpace.sRGB] if
+  /// rendering wide gamut colors isn't supported.
+  // Note: The docstring will become outdated as new platforms support wide
+  // gamut color, please keep it up to date.
+  ColorSpace get colorSpace {
+    final int colorSpaceValue = _image.colorSpace;
+    switch (colorSpaceValue) {
+      case 0:
+        return ColorSpace.sRGB;
+      case 1:
+        return ColorSpace.extendedSRGB;
+      default:
+        throw UnsupportedError('Unrecognized color space: $colorSpaceValue');
+    }
+  }
+
   /// If asserts are enabled, returns the [StackTrace]s of each open handle from
   /// [clone], in creation order.
   ///
@@ -1870,7 +1911,7 @@ class Image {
 }
 
 @pragma('vm:entry-point')
-class _Image extends NativeFieldWrapperClass1 {
+base class _Image extends NativeFieldWrapperClass1 {
   // This class is created by the engine, and should not be instantiated
   // or extended directly.
   //
@@ -1879,23 +1920,27 @@ class _Image extends NativeFieldWrapperClass1 {
   @pragma('vm:entry-point')
   _Image._();
 
-  @FfiNative<Int32 Function(Pointer<Void>)>('Image::width', isLeaf: true)
+  @Native<Int32 Function(Pointer<Void>)>(symbol: 'Image::width', isLeaf: true)
   external int get width;
 
-  @FfiNative<Int32 Function(Pointer<Void>)>('Image::height', isLeaf: true)
+  @Native<Int32 Function(Pointer<Void>)>(symbol: 'Image::height', isLeaf: true)
   external int get height;
 
   Future<ByteData?> toByteData({ImageByteFormat format = ImageByteFormat.rawRgba}) {
-    return _futurize((_Callback<ByteData> callback) {
-      return _toByteData(format.index, (Uint8List? encoded) {
-        callback(encoded!.buffer.asByteData());
+    return _futurizeWithError((_CallbackWithError<ByteData?> callback) {
+      return _toByteData(format.index, (Uint8List? encoded, String? error) {
+        if (error == null && encoded != null) {
+          callback(encoded.buffer.asByteData(), null);
+        } else {
+          callback(null, error);
+        }
       });
     });
   }
 
   /// Returns an error message on failure, null on success.
-  @FfiNative<Handle Function(Pointer<Void>, Int32, Handle)>('Image::toByteData')
-  external String? _toByteData(int format, _Callback<Uint8List?> callback);
+  @Native<Handle Function(Pointer<Void>, Int32, Handle)>(symbol: 'Image::toByteData')
+  external String? _toByteData(int format, void Function(Uint8List?, String?) callback);
 
   bool _disposed = false;
   void dispose() {
@@ -1913,15 +1958,23 @@ class _Image extends NativeFieldWrapperClass1 {
 
   /// This can't be a leaf call because the native function calls Dart API
   /// (Dart_SetNativeInstanceField).
-  @FfiNative<Void Function(Pointer<Void>)>('Image::dispose')
+  @Native<Void Function(Pointer<Void>)>(symbol: 'Image::dispose')
   external void _dispose();
 
   final Set<Image> _handles = <Image>{};
 
+  @Native<Int32 Function(Pointer<Void>)>(symbol: 'Image::colorSpace')
+  external int get colorSpace;
+
   @override
   String toString() => '[$width\u00D7$height]';
 }
 
+@pragma('vm:entry-point')
+Image _wrapImage(_Image image) {
+  return Image._(image, image.width, image.height);
+}
+
 /// Callback signature for [decodeImageFromList].
 typedef ImageDecoderCallback = void Function(Image result);
 
@@ -1996,47 +2049,68 @@ class FrameInfo {
 ///
 /// To obtain an instance of the [Codec] interface, see
 /// [instantiateImageCodec].
-@pragma('vm:entry-point')
-class Codec extends NativeFieldWrapperClass1 {
+abstract class Codec {
+  /// Number of frames in this image.
+  int get frameCount;
+
+  /// Number of times to repeat the animation.
+  ///
+  /// * 0 when the animation should be played once.
+  /// * -1 for infinity repetitions.
+  int get repetitionCount;
+
+  /// Fetches the next animation frame.
+  ///
+  /// Wraps back to the first frame after returning the last frame.
+  ///
+  /// The returned future can complete with an error if the decoding has failed.
+  ///
+  /// The caller of this method is responsible for disposing the
+  /// [FrameInfo.image] on the returned object.
+  Future<FrameInfo> getNextFrame();
+
+  /// Release the resources used by this object. The object is no longer usable
+  /// after this method is called.
+  ///
+  /// This can't be a leaf call because the native function calls Dart API
+  /// (Dart_SetNativeInstanceField).
+  void dispose();
+}
+
+base class _NativeCodec extends NativeFieldWrapperClass1 implements Codec {
   //
   // This class is created by the engine, and should not be instantiated
   // or extended directly.
   //
   // To obtain an instance of the [Codec] interface, see
   // [instantiateImageCodec].
-  @pragma('vm:entry-point')
-  Codec._();
+  _NativeCodec._();
 
   int? _cachedFrameCount;
-  /// Number of frames in this image.
+
+  @override
   int get frameCount => _cachedFrameCount ??= _frameCount;
 
-  @FfiNative<Int32 Function(Pointer<Void>)>('Codec::frameCount', isLeaf: true)
+  @Native<Int32 Function(Pointer<Void>)>(symbol: 'Codec::frameCount', isLeaf: true)
   external int get _frameCount;
 
   int? _cachedRepetitionCount;
-  /// Number of times to repeat the animation.
-  ///
-  /// * 0 when the animation should be played once.
-  /// * -1 for infinity repetitions.
+
+  @override
   int get repetitionCount => _cachedRepetitionCount ??= _repetitionCount;
 
-  @FfiNative<Int32 Function(Pointer<Void>)>('Codec::repetitionCount', isLeaf: true)
+  @Native<Int32 Function(Pointer<Void>)>(symbol: 'Codec::repetitionCount', isLeaf: true)
   external int get _repetitionCount;
 
-  /// Fetches the next animation frame.
-  ///
-  /// Wraps back to the first frame after returning the last frame.
-  ///
-  /// The returned future can complete with an error if the decoding has failed.
-  ///
-  /// The caller of this method is responsible for disposing the
-  /// [FrameInfo.image] on the returned object.
+  @override
   Future<FrameInfo> getNextFrame() async {
     final Completer<FrameInfo> completer = Completer<FrameInfo>.sync();
-    final String? error = _getNextFrame((_Image? image, int durationMilliseconds) {
+    final String? error = _getNextFrame((_Image? image, int durationMilliseconds, String decodeError) {
       if (image == null) {
-        completer.completeError(Exception('Codec failed to produce an image, possibly due to invalid image data.'));
+        if (decodeError.isEmpty) {
+          decodeError = 'Codec failed to produce an image, possibly due to invalid image data.';
+        }
+        completer.completeError(Exception(decodeError));
       } else {
         completer.complete(FrameInfo._(
           image: Image._(image, image.width, image.height),
@@ -2051,16 +2125,15 @@ class Codec extends NativeFieldWrapperClass1 {
   }
 
   /// Returns an error message on failure, null on success.
-  @FfiNative<Handle Function(Pointer<Void>, Handle)>('Codec::getNextFrame')
-  external String? _getNextFrame(void Function(_Image?, int) callback);
+  @Native<Handle Function(Pointer<Void>, Handle)>(symbol: 'Codec::getNextFrame')
+  external String? _getNextFrame(void Function(_Image?, int, String) callback);
 
-  /// Release the resources used by this object. The object is no longer usable
-  /// after this method is called.
-  ///
-  /// This can't be a leaf call because the native function calls Dart API
-  /// (Dart_SetNativeInstanceField).
-  @FfiNative<Void Function(Pointer<Void>)>('Codec::dispose')
+  @override
+  @Native<Void Function(Pointer<Void>)>(symbol: 'Codec::dispose')
   external void dispose();
+
+  @override
+  String toString() => 'Codec(${_cachedFrameCount == null ? "" : "$_cachedFrameCount frames"})';
 }
 
 /// Instantiates an image [Codec].
@@ -2124,6 +2197,10 @@ Future<Codec> instantiateImageCodec(
 /// The data can be for either static or animated images. The following image
 /// formats are supported: {@macro dart.ui.imageFormats}
 ///
+/// The [buffer] will be disposed by this method once the codec has been created,
+/// so the caller must relinquish ownership of the [buffer] when they call this
+/// method.
+///
 /// The [targetWidth] and [targetHeight] arguments specify the size of the
 /// output image, in image pixels. If they are not equal to the intrinsic
 /// dimensions of the image, then the image will be scaled after being decoded.
@@ -2141,26 +2218,145 @@ Future<Codec> instantiateImageCodec(
 ///
 /// The returned future can complete with an error if the image decoding has
 /// failed.
+///
+/// ## Compatibility note on the web
+///
+/// When running Flutter on the web, only the CanvasKit renderer supports image
+/// resizing capabilities (not the HTML renderer). So if image resizing is
+/// critical to your use case, and you're deploying to the web, you should
+/// build using the CanvasKit renderer.
 Future<Codec> instantiateImageCodecFromBuffer(
   ImmutableBuffer buffer, {
   int? targetWidth,
   int? targetHeight,
   bool allowUpscaling = true,
+}) {
+  return instantiateImageCodecWithSize(
+    buffer,
+    getTargetSize: (int intrinsicWidth, int intrinsicHeight) {
+      if (!allowUpscaling) {
+        if (targetWidth != null && targetWidth! > intrinsicWidth) {
+          targetWidth = intrinsicWidth;
+        }
+        if (targetHeight != null && targetHeight! > intrinsicHeight) {
+          targetHeight = intrinsicHeight;
+        }
+      }
+      return TargetImageSize(width: targetWidth, height: targetHeight);
+    },
+  );
+}
+
+/// Instantiates an image [Codec].
+///
+/// This method is a convenience wrapper around the [ImageDescriptor] API.
+///
+/// The [buffer] parameter is the binary image data (e.g a PNG or GIF binary
+/// data). The data can be for either static or animated images. The following
+/// image formats are supported: {@macro dart.ui.imageFormats}
+///
+/// The [buffer] will be disposed by this method once the codec has been
+/// created, so the caller must relinquish ownership of the [buffer] when they
+/// call this method.
+///
+/// The [getTargetSize] parameter, when specified, will be invoked and passed
+/// the image's intrinsic size to determine the size to decode the image to.
+/// The width and the height of the size it returns must be positive values
+/// greater than or equal to 1, or null. It is valid to return a
+/// [TargetImageSize] that specifies only one of `width` and `height` with the
+/// other remaining null, in which case the omitted dimension will be scaled to
+/// maintain the aspect ratio of the original dimensions. When both are null or
+/// omitted, the image will be decoded at its native resolution (as will be the
+/// case if the [getTargetSize] parameter is omitted).
+///
+/// Scaling the image to larger than its intrinsic size should usually be
+/// avoided, since it causes the image to use more memory than necessary.
+/// Instead, prefer scaling the [Canvas] transform.
+///
+/// The returned future can complete with an error if the image decoding has
+/// failed.
+///
+/// ## Compatibility note on the web
+///
+/// When running Flutter on the web, only the CanvasKit renderer supports image
+/// resizing capabilities (not the HTML renderer). So if image resizing is
+/// critical to your use case, and you're deploying to the web, you should
+/// build using the CanvasKit renderer.
+Future<Codec> instantiateImageCodecWithSize(
+  ImmutableBuffer buffer, {
+  TargetImageSizeCallback? getTargetSize,
 }) async {
+  getTargetSize ??= _getDefaultImageSize;
   final ImageDescriptor descriptor = await ImageDescriptor.encoded(buffer);
-  if (!allowUpscaling) {
-    if (targetWidth != null && targetWidth > descriptor.width) {
-      targetWidth = descriptor.width;
-    }
-    if (targetHeight != null && targetHeight > descriptor.height) {
-      targetHeight = descriptor.height;
-    }
+  try {
+    final TargetImageSize targetSize = getTargetSize(descriptor.width, descriptor.height);
+    assert(targetSize.width == null || targetSize.width! > 0);
+    assert(targetSize.height == null || targetSize.height! > 0);
+    return descriptor.instantiateCodec(
+      targetWidth: targetSize.width,
+      targetHeight: targetSize.height,
+    );
+  } finally {
+    buffer.dispose();
   }
-  buffer.dispose();
-  return descriptor.instantiateCodec(
-    targetWidth: targetWidth,
-    targetHeight: targetHeight,
-  );
+}
+
+TargetImageSize _getDefaultImageSize(int intrinsicWidth, int intrinsicHeight) {
+  return const TargetImageSize();
+}
+
+/// Signature for a callback that determines the size to which an image should
+/// be decoded given its intrinsic size.
+///
+/// See also:
+///
+///  * [instantiateImageCodecWithSize], which used this signature for its
+///    `getTargetSize` argument.
+typedef TargetImageSizeCallback = TargetImageSize Function(
+  int intrinsicWidth,
+  int intrinsicHeight,
+);
+
+/// A specification of the size to which an image should be decoded.
+///
+/// See also:
+///
+///  * [TargetImageSizeCallback], a callback that returns instances of this
+///    class when consulted by image decoding methods such as
+///    [instantiateImageCodecWithSize].
+class TargetImageSize {
+  /// Creates a new instance of this class.
+  ///
+  /// The `width` and `height` may both be null, but if they're non-null, they
+  /// must be positive.
+  const TargetImageSize({this.width, this.height})
+      : assert(width == null || width > 0),
+        assert(height == null || height > 0);
+
+  /// The width into which to load the image.
+  ///
+  /// If this is non-null, the image will be decoded into the specified width.
+  /// If this is null and [height] is also null, the image will be decoded into
+  /// its intrinsic size. If this is null and [height] is non-null, the image
+  /// will be decoded into a width that maintains its intrinsic aspect ratio
+  /// while respecting the [height] value.
+  ///
+  /// If this value is non-null, it must be positive.
+  final int? width;
+
+  /// The height into which to load the image.
+  ///
+  /// If this is non-null, the image will be decoded into the specified height.
+  /// If this is null and [width] is also null, the image will be decoded into
+  /// its intrinsic size. If this is null and [width] is non-null, the image
+  /// will be decoded into a height that maintains its intrinsic aspect ratio
+  /// while respecting the [width] value.
+  ///
+  /// If this value is non-null, it must be positive.
+  final int? height;
+
+  @override
+  String toString() => 'TargetImageSize($width x $height)';
 }
 
 /// Loads a single image frame from a byte array into an [Image] object.
@@ -2339,13 +2535,7 @@ enum PathOperation {
 }
 
 /// A handle for the framework to hold and retain an engine layer across frames.
-@pragma('vm:entry-point')
-class EngineLayer extends NativeFieldWrapperClass1 {
-  /// This class is created by the engine, and should not be instantiated
-  /// or extended directly.
-  @pragma('vm:entry-point')
-  EngineLayer._();
-
+abstract class EngineLayer {
   /// Release the resources used by this object. The object is no longer usable
   /// after this method is called.
   ///
@@ -2361,7 +2551,16 @@ class EngineLayer extends NativeFieldWrapperClass1 {
   ///
   /// This can't be a leaf call because the native function calls Dart API
   /// (Dart_SetNativeInstanceField).
-  @FfiNative<Void Function(Pointer<Void>)>('EngineLayer::dispose')
+  void dispose();
+}
+
+base class _NativeEngineLayer extends NativeFieldWrapperClass1 implements EngineLayer {
+  /// This class is created by the engine, and should not be instantiated
+  /// or extended directly.
+  _NativeEngineLayer._();
+
+  @override
+  @Native<Void Function(Pointer<Void>)>(symbol: 'EngineLayer::dispose')
   external void dispose();
 }
 
@@ -2382,61 +2581,38 @@ class EngineLayer extends NativeFieldWrapperClass1 {
 ///
 /// Paths can be drawn on canvases using [Canvas.drawPath], and can
 /// used to create clip regions using [Canvas.clipPath].
-@pragma('vm:entry-point')
-class Path extends NativeFieldWrapperClass1 {
-  /// Create a new empty [Path] object.
-  @pragma('vm:entry-point')
-  Path() { _constructor(); }
-
-  /// Avoids creating a new native backing for the path for methods that will
-  /// create it later, such as [Path.from], [shift] and [transform].
-  Path._();
+abstract class Path {
+  factory Path() = _NativePath;
 
   /// Creates a copy of another [Path].
   ///
   /// This copy is fast and does not require additional memory unless either
   /// the `source` path or the path returned by this constructor are modified.
   factory Path.from(Path source) {
-    final Path clonedPath = Path._();
-    source._clone(clonedPath);
+    final _NativePath clonedPath = _NativePath._();
+    (source as _NativePath)._clone(clonedPath);
     return clonedPath;
   }
 
-  @FfiNative<Void Function(Handle)>('Path::Create')
-  external void _constructor();
-
-  @FfiNative<Void Function(Pointer<Void>, Handle)>('Path::clone')
-  external void _clone(Path outPath);
-
   /// Determines how the interior of this path is calculated.
   ///
   /// Defaults to the non-zero winding rule, [PathFillType.nonZero].
-  PathFillType get fillType => PathFillType.values[_getFillType()];
-  set fillType(PathFillType value) => _setFillType(value.index);
-
-  @FfiNative<Int32 Function(Pointer<Void>)>('Path::getFillType', isLeaf: true)
-  external int _getFillType();
-
-  @FfiNative<Void Function(Pointer<Void>, Int32)>('Path::setFillType', isLeaf: true)
-  external void _setFillType(int fillType);
+  PathFillType get fillType;
+  set fillType(PathFillType value);
 
   /// Starts a new sub-path at the given coordinate.
-  @FfiNative<Void Function(Pointer<Void>, Float, Float)>('Path::moveTo', isLeaf: true)
-  external void moveTo(double x, double y);
+  void moveTo(double x, double y);
 
   /// Starts a new sub-path at the given offset from the current point.
-  @FfiNative<Void Function(Pointer<Void>, Float, Float)>('Path::relativeMoveTo', isLeaf: true)
-  external void relativeMoveTo(double dx, double dy);
+  void relativeMoveTo(double dx, double dy);
 
   /// Adds a straight line segment from the current point to the given
   /// point.
-  @FfiNative<Void Function(Pointer<Void>, Float, Float)>('Path::lineTo', isLeaf: true)
-  external void lineTo(double x, double y);
+  void lineTo(double x, double y);
 
   /// Adds a straight line segment from the current point to the point
   /// at the given offset from the current point.
-  @FfiNative<Void Function(Pointer<Void>, Float, Float)>('Path::relativeLineTo', isLeaf: true)
-  external void relativeLineTo(double dx, double dy);
+  void relativeLineTo(double dx, double dy);
 
   /// Adds a quadratic bezier segment that curves from the current
   /// point to the given point (x2,y2), using the control point
@@ -2444,16 +2620,13 @@ class Path extends NativeFieldWrapperClass1 {
   ///
   /// ![](https://flutter.github.io/assets-for-api-docs/assets/dart-ui/path_quadratic_to.png#gh-light-mode-only)
   /// ![](https://flutter.github.io/assets-for-api-docs/assets/dart-ui/path_quadratic_to_dark.png#gh-dark-mode-only)
-  @FfiNative<Void Function(Pointer<Void>, Float, Float, Float, Float)>('Path::quadraticBezierTo', isLeaf: true)
-  external void quadraticBezierTo(double x1, double y1, double x2, double y2);
+  void quadraticBezierTo(double x1, double y1, double x2, double y2);
 
   /// Adds a quadratic bezier segment that curves from the current
   /// point to the point at the offset (x2,y2) from the current point,
   /// using the control point at the offset (x1,y1) from the current
   /// point.
-  @FfiNative<Void Function(Pointer<Void>, Float, Float, Float, Float)>('Path::relativeQuadraticBezierTo', isLeaf: true)
-  external void relativeQuadraticBezierTo(
-      double x1, double y1, double x2, double y2);
+  void relativeQuadraticBezierTo(double x1, double y1, double x2, double y2);
 
   /// Adds a cubic bezier segment that curves from the current point
   /// to the given point (x3,y3), using the control points (x1,y1) and
@@ -2461,15 +2634,13 @@ class Path extends NativeFieldWrapperClass1 {
   ///
   /// ![](https://flutter.github.io/assets-for-api-docs/assets/dart-ui/path_cubic_to.png#gh-light-mode-only)
   /// ![](https://flutter.github.io/assets-for-api-docs/assets/dart-ui/path_cubic_to_dark.png#gh-dark-mode-only)
-  @FfiNative<Void Function(Pointer<Void>, Float, Float, Float, Float, Float, Float)>('Path::cubicTo', isLeaf: true)
-  external void cubicTo(double x1, double y1, double x2, double y2, double x3, double y3);
+  void cubicTo(double x1, double y1, double x2, double y2, double x3, double y3);
 
   /// Adds a cubic bezier segment that curves from the current point
   /// to the point at the offset (x3,y3) from the current point, using
   /// the control points at the offsets (x1,y1) and (x2,y2) from the
   /// current point.
-  @FfiNative<Void Function(Pointer<Void>, Float, Float, Float, Float, Float, Float)>('Path::relativeCubicTo', isLeaf: true)
-  external void relativeCubicTo(double x1, double y1, double x2, double y2, double x3, double y3);
+  void relativeCubicTo(double x1, double y1, double x2, double y2, double x3, double y3);
 
   /// Adds a bezier segment that curves from the current point to the
   /// given point (x2,y2), using the control points (x1,y1) and the
@@ -2479,8 +2650,7 @@ class Path extends NativeFieldWrapperClass1 {
   ///
   /// ![](https://flutter.github.io/assets-for-api-docs/assets/dart-ui/path_conic_to.png#gh-light-mode-only)
   /// ![](https://flutter.github.io/assets-for-api-docs/assets/dart-ui/path_conic_to_dark.png#gh-dark-mode-only)
-  @FfiNative<Void Function(Pointer<Void>, Float, Float, Float, Float, Float)>('Path::conicTo', isLeaf: true)
-  external void conicTo(double x1, double y1, double x2, double y2, double w);
+  void conicTo(double x1, double y1, double x2, double y2, double w);
 
   /// Adds a bezier segment that curves from the current point to the
   /// point at the offset (x2,y2) from the current point, using the
@@ -2488,8 +2658,7 @@ class Path extends NativeFieldWrapperClass1 {
   /// the weight w. If the weight is greater than 1, then the curve is
   /// a hyperbola; if the weight equals 1, it's a parabola; and if it
   /// is less than 1, it is an ellipse.
-  @FfiNative<Void Function(Pointer<Void>, Float, Float, Float, Float, Float)>('Path::relativeConicTo', isLeaf: true)
-  external void relativeConicTo(double x1, double y1, double x2, double y2, double w);
+  void relativeConicTo(double x1, double y1, double x2, double y2, double w);
 
   /// If the `forceMoveTo` argument is false, adds a straight line
   /// segment and an arc segment.
@@ -2507,13 +2676,7 @@ class Path extends NativeFieldWrapperClass1 {
   ///
   /// The line segment added if `forceMoveTo` is false starts at the
   /// current point and ends at the start of the arc.
-  void arcTo(Rect rect, double startAngle, double sweepAngle, bool forceMoveTo) {
-    assert(_rectIsValid(rect));
-    _arcTo(rect.left, rect.top, rect.right, rect.bottom, startAngle, sweepAngle, forceMoveTo);
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Float, Float, Float, Float, Float, Float, Bool)>('Path::arcTo', isLeaf: true)
-  external void _arcTo(double left, double top, double right, double bottom, double startAngle, double sweepAngle, bool forceMoveTo);
+  void arcTo(Rect rect, double startAngle, double sweepAngle, bool forceMoveTo);
 
   /// Appends up to four conic curves weighted to describe an oval of `radius`
   /// and rotated by `rotation` (measured in degrees and clockwise).
@@ -2523,7 +2686,7 @@ class Path extends NativeFieldWrapperClass1 {
   /// `clockwise` and `largeArc` in such a way that the sweep angle
   /// is always less than 360 degrees.
   ///
-  /// A simple line is appended if either either radii are zero or the last
+  /// A simple line is appended if either radii are zero or the last
   /// point in the path is `arcEnd`. The radii are scaled to fit the last path
   /// point if both are greater than zero but too small to describe an arc.
   ///
@@ -2532,14 +2695,7 @@ class Path extends NativeFieldWrapperClass1 {
     double rotation = 0.0,
     bool largeArc = false,
     bool clockwise = true,
-  }) {
-    assert(_offsetIsValid(arcEnd));
-    assert(_radiusIsValid(radius));
-    _arcToPoint(arcEnd.dx, arcEnd.dy, radius.x, radius.y, rotation, largeArc, clockwise);
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Float, Float, Float, Float, Float, Bool, Bool)>('Path::arcToPoint', isLeaf: true)
-  external void _arcToPoint(double arcEndX, double arcEndY, double radiusX, double radiusY, double rotation, bool largeArc, bool clockwise);
+  });
 
   /// Appends up to four conic curves weighted to describe an oval of `radius`
   /// and rotated by `rotation` (measured in degrees and clockwise).
@@ -2551,7 +2707,7 @@ class Path extends NativeFieldWrapperClass1 {
   /// path in a direction determined by `clockwise` and `largeArc`
   /// in such a way that the sweep angle is always less than 360 degrees.
   ///
-  /// A simple line is appended if either either radii are zero, or, both
+  /// A simple line is appended if either radii are zero, or, both
   /// `arcEndDelta.dx` and `arcEndDelta.dy` are zero. The radii are scaled to
   /// fit the last path point if both are greater than zero but too small to
   /// describe an arc.
@@ -2561,44 +2717,18 @@ class Path extends NativeFieldWrapperClass1 {
     double rotation = 0.0,
     bool largeArc = false,
     bool clockwise = true,
-  }) {
-    assert(_offsetIsValid(arcEndDelta));
-    assert(_radiusIsValid(radius));
-    _relativeArcToPoint(arcEndDelta.dx, arcEndDelta.dy, radius.x, radius.y, rotation, largeArc, clockwise);
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Float, Float, Float, Float, Float, Bool, Bool)>('Path::relativeArcToPoint', isLeaf: true)
-  external void _relativeArcToPoint(
-      double arcEndX,
-      double arcEndY,
-      double radiusX,
-      double radiusY,
-      double rotation,
-      bool largeArc,
-      bool clockwise);
+  });
 
   /// Adds a new sub-path that consists of four lines that outline the
   /// given rectangle.
-  void addRect(Rect rect) {
-    assert(_rectIsValid(rect));
-    _addRect(rect.left, rect.top, rect.right, rect.bottom);
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Float, Float, Float, Float)>('Path::addRect', isLeaf: true)
-  external void _addRect(double left, double top, double right, double bottom);
+  void addRect(Rect rect);
 
   /// Adds a new sub-path that consists of a curve that forms the
   /// ellipse that fills the given rectangle.
   ///
   /// To add a circle, pass an appropriate rectangle as `oval`. [Rect.fromCircle]
   /// can be used to easily describe the circle's center [Offset] and radius.
-  void addOval(Rect oval) {
-    assert(_rectIsValid(oval));
-    _addOval(oval.left, oval.top, oval.right, oval.bottom);
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Float, Float, Float, Float)>('Path::addOval', isLeaf: true)
-  external void _addOval(double left, double top, double right, double bottom);
+  void addOval(Rect oval);
 
   /// Adds a new sub-path with one arc segment that consists of the arc
   /// that follows the edge of the oval bounded by the given
@@ -2614,13 +2744,7 @@ class Path extends NativeFieldWrapperClass1 {
   ///
   /// ![](https://flutter.github.io/assets-for-api-docs/assets/dart-ui/path_add_arc_ccw.png#gh-light-mode-only)
   /// ![](https://flutter.github.io/assets-for-api-docs/assets/dart-ui/path_add_arc_ccw_dark.png#gh-dark-mode-only)
-  void addArc(Rect oval, double startAngle, double sweepAngle) {
-    assert(_rectIsValid(oval));
-    _addArc(oval.left, oval.top, oval.right, oval.bottom, startAngle, sweepAngle);
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Float, Float, Float, Float, Float, Float)>('Path::addArc', isLeaf: true)
-  external void _addArc(double left, double top, double right, double bottom, double startAngle, double sweepAngle);
+  void addArc(Rect oval, double startAngle, double sweepAngle);
 
   /// Adds a new sub-path with a sequence of line segments that connect the given
   /// points.
@@ -2629,46 +2753,19 @@ class Path extends NativeFieldWrapperClass1 {
   /// last point to the first point.
   ///
   /// The `points` argument is interpreted as offsets from the origin.
-  void addPolygon(List<Offset> points, bool close) {
-    assert(points != null);
-    _addPolygon(_encodePointList(points), close);
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Handle, Bool)>('Path::addPolygon')
-  external void _addPolygon(Float32List points, bool close);
+  void addPolygon(List<Offset> points, bool close);
 
   /// Adds a new sub-path that consists of the straight lines and
   /// curves needed to form the rounded rectangle described by the
   /// argument.
-  void addRRect(RRect rrect) {
-    assert(_rrectIsValid(rrect));
-    _addRRect(rrect._getValue32());
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Handle)>('Path::addRRect')
-  external void _addRRect(Float32List rrect);
+  void addRRect(RRect rrect);
 
   /// Adds the sub-paths of `path`, offset by `offset`, to this path.
   ///
   /// If `matrix4` is specified, the path will be transformed by this matrix
   /// after the matrix is translated by the given offset. The matrix is a 4x4
   /// matrix stored in column major order.
-  void addPath(Path path, Offset offset, {Float64List? matrix4}) {
-    assert(path != null); // path is checked on the engine side
-    assert(_offsetIsValid(offset));
-    if (matrix4 != null) {
-      assert(_matrix4IsValid(matrix4));
-      _addPathWithMatrix(path, offset.dx, offset.dy, matrix4);
-    } else {
-      _addPath(path, offset.dx, offset.dy);
-    }
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Pointer<Void>, Double, Double)>('Path::addPath')
-  external void _addPath(Path path, double dx, double dy);
-
-  @FfiNative<Void Function(Pointer<Void>, Pointer<Void>, Double, Double, Handle)>('Path::addPathWithMatrix')
-  external void _addPathWithMatrix(Path path, double dx, double dy, Float64List matrix);
+  void addPath(Path path, Offset offset, {Float64List? matrix4});
 
   /// Adds the sub-paths of `path`, offset by `offset`, to this path.
   /// The current sub-path is extended with the first sub-path
@@ -2677,33 +2774,16 @@ class Path extends NativeFieldWrapperClass1 {
   /// If `matrix4` is specified, the path will be transformed by this matrix
   /// after the matrix is translated by the given `offset`.  The matrix is a 4x4
   /// matrix stored in column major order.
-  void extendWithPath(Path path, Offset offset, {Float64List? matrix4}) {
-    assert(path != null); // path is checked on the engine side
-    assert(_offsetIsValid(offset));
-    if (matrix4 != null) {
-      assert(_matrix4IsValid(matrix4));
-      _extendWithPathAndMatrix(path, offset.dx, offset.dy, matrix4);
-    } else {
-      _extendWithPath(path, offset.dx, offset.dy);
-    }
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Pointer<Void>, Double, Double)>('Path::extendWithPath')
-  external void _extendWithPath(Path path, double dx, double dy);
-
-  @FfiNative<Void Function(Pointer<Void>, Pointer<Void>, Double, Double, Handle)>('Path::extendWithPathAndMatrix')
-  external void _extendWithPathAndMatrix(Path path, double dx, double dy, Float64List matrix);
+  void extendWithPath(Path path, Offset offset, {Float64List? matrix4});
 
   /// Closes the last sub-path, as if a straight line had been drawn
   /// from the current point to the first point of the sub-path.
-  @FfiNative<Void Function(Pointer<Void>)>('Path::close', isLeaf: true)
-  external void close();
+  void close();
 
   /// Clears the [Path] object of all sub-paths, returning it to the
   /// same state it had when it was created. The _current point_ is
   /// reset to the origin.
-  @FfiNative<Void Function(Pointer<Void>)>('Path::reset', isLeaf: true)
-  external void reset();
+  void reset();
 
   /// Tests to see if the given point is within the path. (That is, whether the
   /// point would be in the visible portion of the path if the path was used
@@ -2712,37 +2792,15 @@ class Path extends NativeFieldWrapperClass1 {
   /// The `point` argument is interpreted as an offset from the origin.
   ///
   /// Returns true if the point is in the path, and false otherwise.
-  bool contains(Offset point) {
-    assert(_offsetIsValid(point));
-    return _contains(point.dx, point.dy);
-  }
-
-  @FfiNative<Bool Function(Pointer<Void>, Double, Double)>('Path::contains', isLeaf: true)
-  external bool _contains(double x, double y);
+  bool contains(Offset point);
 
   /// Returns a copy of the path with all the segments of every
   /// sub-path translated by the given offset.
-  Path shift(Offset offset) {
-    assert(_offsetIsValid(offset));
-    final Path path = Path._();
-    _shift(path, offset.dx, offset.dy);
-    return path;
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Handle, Double, Double)>('Path::shift')
-  external void _shift(Path outPath, double dx, double dy);
+  Path shift(Offset offset);
 
   /// Returns a copy of the path with all the segments of every
   /// sub-path transformed by the given matrix.
-  Path transform(Float64List matrix4) {
-    assert(_matrix4IsValid(matrix4));
-    final Path path = Path._();
-    _transform(path, matrix4);
-    return path;
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Handle, Handle)>('Path::transform')
-  external void _transform(Path outPath, Float64List matrix4);
+  Path transform(Float64List matrix4);
 
   /// Computes the bounding rectangle for this path.
   ///
@@ -2759,13 +2817,7 @@ class Path extends NativeFieldWrapperClass1 {
   /// therefore ends up grossly overestimating the actual area covered by the
   /// circle.
   // see https://skia.org/user/api/SkPath_Reference#SkPath_getBounds
-  Rect getBounds() {
-    final Float32List rect = _getBounds();
-    return Rect.fromLTRB(rect[0], rect[1], rect[2], rect[3]);
-  }
-
-  @FfiNative<Handle Function(Pointer<Void>)>('Path::getBounds')
-  external Float32List _getBounds();
+  Rect getBounds();
 
   /// Combines the two paths according to the manner specified by the given
   /// `operation`.
@@ -2774,18 +2826,13 @@ class Path extends NativeFieldWrapperClass1 {
   /// curve order is reduced where possible so that cubics may be turned into
   /// quadratics, and quadratics maybe turned into lines.
   static Path combine(PathOperation operation, Path path1, Path path2) {
-    assert(path1 != null);
-    assert(path2 != null);
-    final Path path = Path();
-    if (path._op(path1, path2, operation.index)) {
+    final _NativePath path = _NativePath();
+    if (path._op(path1 as _NativePath, path2 as _NativePath, operation.index)) {
       return path;
     }
     throw StateError('Path.combine() failed.  This may be due an invalid path; in particular, check for NaN values.');
   }
 
-  @FfiNative<Bool Function(Pointer<Void>, Pointer<Void>, Pointer<Void>, Int32)>('Path::op')
-  external bool _op(Path path1, Path path2, int operation);
-
   /// Creates a [PathMetrics] object for this path, which can describe various
   /// properties about the contours of the path.
   ///
@@ -2817,9 +2864,258 @@ class Path extends NativeFieldWrapperClass1 {
   ///
   /// If `forceClosed` is set to true, the contours of the path will be measured
   /// as if they had been closed, even if they were not explicitly closed.
+  PathMetrics computeMetrics({bool forceClosed = false});
+}
+
+base class _NativePath extends NativeFieldWrapperClass1 implements Path {
+  /// Create a new empty [Path] object.
+  _NativePath() { _constructor(); }
+
+  /// Avoids creating a new native backing for the path for methods that will
+  /// create it later, such as [Path.from], [shift] and [transform].
+  _NativePath._();
+
+  @Native<Void Function(Handle)>(symbol: 'Path::Create')
+  external void _constructor();
+
+  @Native<Void Function(Pointer<Void>, Handle)>(symbol: 'Path::clone')
+  external void _clone(Path outPath);
+
+  @override
+  PathFillType get fillType => PathFillType.values[_getFillType()];
+  @override
+  set fillType(PathFillType value) => _setFillType(value.index);
+
+  @Native<Int32 Function(Pointer<Void>)>(symbol: 'Path::getFillType', isLeaf: true)
+  external int _getFillType();
+
+  @Native<Void Function(Pointer<Void>, Int32)>(symbol: 'Path::setFillType', isLeaf: true)
+  external void _setFillType(int fillType);
+
+  @override
+  @Native<Void Function(Pointer<Void>, Double, Double)>(symbol: 'Path::moveTo', isLeaf: true)
+  external void moveTo(double x, double y);
+
+  @override
+  @Native<Void Function(Pointer<Void>, Double, Double)>(symbol: 'Path::relativeMoveTo', isLeaf: true)
+  external void relativeMoveTo(double dx, double dy);
+
+  @override
+  @Native<Void Function(Pointer<Void>, Double, Double)>(symbol: 'Path::lineTo', isLeaf: true)
+  external void lineTo(double x, double y);
+
+  @override
+  @Native<Void Function(Pointer<Void>, Double, Double)>(symbol: 'Path::relativeLineTo', isLeaf: true)
+  external void relativeLineTo(double dx, double dy);
+
+  @override
+  @Native<Void Function(Pointer<Void>, Double, Double, Double, Double)>(symbol: 'Path::quadraticBezierTo', isLeaf: true)
+  external void quadraticBezierTo(double x1, double y1, double x2, double y2);
+
+  @override
+  @Native<Void Function(Pointer<Void>, Double, Double, Double, Double)>(symbol: 'Path::relativeQuadraticBezierTo', isLeaf: true)
+  external void relativeQuadraticBezierTo(
+      double x1, double y1, double x2, double y2);
+
+  @override
+  @Native<Void Function(Pointer<Void>, Double, Double, Double, Double, Double, Double)>(symbol: 'Path::cubicTo', isLeaf: true)
+  external void cubicTo(double x1, double y1, double x2, double y2, double x3, double y3);
+
+  @override
+  @Native<Void Function(Pointer<Void>, Double, Double, Double, Double, Double, Double)>(symbol: 'Path::relativeCubicTo', isLeaf: true)
+  external void relativeCubicTo(double x1, double y1, double x2, double y2, double x3, double y3);
+
+  @override
+  @Native<Void Function(Pointer<Void>, Double, Double, Double, Double, Double)>(symbol: 'Path::conicTo', isLeaf: true)
+  external void conicTo(double x1, double y1, double x2, double y2, double w);
+
+  @override
+  @Native<Void Function(Pointer<Void>, Double, Double, Double, Double, Double)>(symbol: 'Path::relativeConicTo', isLeaf: true)
+  external void relativeConicTo(double x1, double y1, double x2, double y2, double w);
+
+  @override
+  void arcTo(Rect rect, double startAngle, double sweepAngle, bool forceMoveTo) {
+    assert(_rectIsValid(rect));
+    _arcTo(rect.left, rect.top, rect.right, rect.bottom, startAngle, sweepAngle, forceMoveTo);
+  }
+
+  @Native<Void Function(Pointer<Void>, Double, Double, Double, Double, Double, Double, Bool)>(symbol: 'Path::arcTo', isLeaf: true)
+  external void _arcTo(double left, double top, double right, double bottom, double startAngle, double sweepAngle, bool forceMoveTo);
+
+  @override
+  void arcToPoint(Offset arcEnd, {
+    Radius radius = Radius.zero,
+    double rotation = 0.0,
+    bool largeArc = false,
+    bool clockwise = true,
+  }) {
+    assert(_offsetIsValid(arcEnd));
+    assert(_radiusIsValid(radius));
+    _arcToPoint(arcEnd.dx, arcEnd.dy, radius.x, radius.y, rotation, largeArc, clockwise);
+  }
+
+  @Native<Void Function(Pointer<Void>, Double, Double, Double, Double, Double, Bool, Bool)>(symbol: 'Path::arcToPoint', isLeaf: true)
+  external void _arcToPoint(double arcEndX, double arcEndY, double radiusX, double radiusY, double rotation, bool largeArc, bool clockwise);
+
+  @override
+  void relativeArcToPoint(
+    Offset arcEndDelta, {
+    Radius radius = Radius.zero,
+    double rotation = 0.0,
+    bool largeArc = false,
+    bool clockwise = true,
+  }) {
+    assert(_offsetIsValid(arcEndDelta));
+    assert(_radiusIsValid(radius));
+    _relativeArcToPoint(arcEndDelta.dx, arcEndDelta.dy, radius.x, radius.y, rotation, largeArc, clockwise);
+  }
+
+  @Native<Void Function(Pointer<Void>, Double, Double, Double, Double, Double, Bool, Bool)>(symbol: 'Path::relativeArcToPoint', isLeaf: true)
+  external void _relativeArcToPoint(
+      double arcEndX,
+      double arcEndY,
+      double radiusX,
+      double radiusY,
+      double rotation,
+      bool largeArc,
+      bool clockwise);
+
+  @override
+  void addRect(Rect rect) {
+    assert(_rectIsValid(rect));
+    _addRect(rect.left, rect.top, rect.right, rect.bottom);
+  }
+
+  @Native<Void Function(Pointer<Void>, Double, Double, Double, Double)>(symbol: 'Path::addRect', isLeaf: true)
+  external void _addRect(double left, double top, double right, double bottom);
+
+  @override
+  void addOval(Rect oval) {
+    assert(_rectIsValid(oval));
+    _addOval(oval.left, oval.top, oval.right, oval.bottom);
+  }
+
+  @Native<Void Function(Pointer<Void>, Double, Double, Double, Double)>(symbol: 'Path::addOval', isLeaf: true)
+  external void _addOval(double left, double top, double right, double bottom);
+
+  @override
+  void addArc(Rect oval, double startAngle, double sweepAngle) {
+    assert(_rectIsValid(oval));
+    _addArc(oval.left, oval.top, oval.right, oval.bottom, startAngle, sweepAngle);
+  }
+
+  @Native<Void Function(Pointer<Void>, Double, Double, Double, Double, Double, Double)>(symbol: 'Path::addArc', isLeaf: true)
+  external void _addArc(double left, double top, double right, double bottom, double startAngle, double sweepAngle);
+
+  @override
+  void addPolygon(List<Offset> points, bool close) {
+    _addPolygon(_encodePointList(points), close);
+  }
+
+  @Native<Void Function(Pointer<Void>, Handle, Bool)>(symbol: 'Path::addPolygon')
+  external void _addPolygon(Float32List points, bool close);
+
+  @override
+  void addRRect(RRect rrect) {
+    assert(_rrectIsValid(rrect));
+    _addRRect(rrect._getValue32());
+  }
+
+  @Native<Void Function(Pointer<Void>, Handle)>(symbol: 'Path::addRRect')
+  external void _addRRect(Float32List rrect);
+
+  @override
+  void addPath(Path path, Offset offset, {Float64List? matrix4}) {
+    assert(_offsetIsValid(offset));
+    if (matrix4 != null) {
+      assert(_matrix4IsValid(matrix4));
+      _addPathWithMatrix(path as _NativePath, offset.dx, offset.dy, matrix4);
+    } else {
+      _addPath(path as _NativePath, offset.dx, offset.dy);
+    }
+  }
+
+  @Native<Void Function(Pointer<Void>, Pointer<Void>, Double, Double)>(symbol: 'Path::addPath')
+  external void _addPath(_NativePath path, double dx, double dy);
+
+  @Native<Void Function(Pointer<Void>, Pointer<Void>, Double, Double, Handle)>(symbol: 'Path::addPathWithMatrix')
+  external void _addPathWithMatrix(_NativePath path, double dx, double dy, Float64List matrix);
+
+  @override
+  void extendWithPath(Path path, Offset offset, {Float64List? matrix4}) {
+    assert(_offsetIsValid(offset));
+    if (matrix4 != null) {
+      assert(_matrix4IsValid(matrix4));
+      _extendWithPathAndMatrix(path as _NativePath, offset.dx, offset.dy, matrix4);
+    } else {
+      _extendWithPath(path as _NativePath, offset.dx, offset.dy);
+    }
+  }
+
+  @Native<Void Function(Pointer<Void>, Pointer<Void>, Double, Double)>(symbol: 'Path::extendWithPath')
+  external void _extendWithPath(_NativePath path, double dx, double dy);
+
+  @Native<Void Function(Pointer<Void>, Pointer<Void>, Double, Double, Handle)>(symbol: 'Path::extendWithPathAndMatrix')
+  external void _extendWithPathAndMatrix(_NativePath path, double dx, double dy, Float64List matrix);
+
+  @override
+  @Native<Void Function(Pointer<Void>)>(symbol: 'Path::close', isLeaf: true)
+  external void close();
+
+  @override
+  @Native<Void Function(Pointer<Void>)>(symbol: 'Path::reset', isLeaf: true)
+  external void reset();
+
+  @override
+  bool contains(Offset point) {
+    assert(_offsetIsValid(point));
+    return _contains(point.dx, point.dy);
+  }
+
+  @Native<Bool Function(Pointer<Void>, Double, Double)>(symbol: 'Path::contains', isLeaf: true)
+  external bool _contains(double x, double y);
+
+  @override
+  Path shift(Offset offset) {
+    assert(_offsetIsValid(offset));
+    final _NativePath path = _NativePath._();
+    _shift(path, offset.dx, offset.dy);
+    return path;
+  }
+
+  @Native<Void Function(Pointer<Void>, Handle, Double, Double)>(symbol: 'Path::shift')
+  external void _shift(Path outPath, double dx, double dy);
+
+  @override
+  Path transform(Float64List matrix4) {
+    assert(_matrix4IsValid(matrix4));
+    final _NativePath path = _NativePath._();
+    _transform(path, matrix4);
+    return path;
+  }
+
+  @Native<Void Function(Pointer<Void>, Handle, Handle)>(symbol: 'Path::transform')
+  external void _transform(Path outPath, Float64List matrix4);
+
+  @override
+  Rect getBounds() {
+    final Float32List rect = _getBounds();
+    return Rect.fromLTRB(rect[0], rect[1], rect[2], rect[3]);
+  }
+
+  @Native<Handle Function(Pointer<Void>)>(symbol: 'Path::getBounds')
+  external Float32List _getBounds();
+
+  @Native<Bool Function(Pointer<Void>, Pointer<Void>, Pointer<Void>, Int32)>(symbol: 'Path::op')
+  external bool _op(_NativePath path1, _NativePath path2, int operation);
+
+  @override
   PathMetrics computeMetrics({bool forceClosed = false}) {
     return PathMetrics._(this, forceClosed);
   }
+
+  @override
+  String toString() => 'Path';
 }
 
 /// The geometric description of a tangent: the angle at a point.
@@ -2830,9 +3126,7 @@ class Tangent {
   /// Creates a [Tangent] with the given values.
   ///
   /// The arguments must not be null.
-  const Tangent(this.position, this.vector)
-    : assert(position != null),
-      assert(vector != null);
+  const Tangent(this.position, this.vector);
 
   /// Creates a [Tangent] based on the angle rather than the vector.
   ///
@@ -2887,7 +3181,7 @@ class Tangent {
 /// use [toList] on this object.
 class PathMetrics extends collection.IterableBase<PathMetric> {
   PathMetrics._(Path path, bool forceClosed) :
-    _iterator = PathMetricIterator._(_PathMeasure(path, forceClosed));
+    _iterator = PathMetricIterator._(_PathMeasure(path as _NativePath, forceClosed));
 
   final Iterator<PathMetric> _iterator;
 
@@ -2898,7 +3192,7 @@ class PathMetrics extends collection.IterableBase<PathMetric> {
 /// Used by [PathMetrics] to track iteration from one segment of a path to the
 /// next for measurement.
 class PathMetricIterator implements Iterator<PathMetric> {
-  PathMetricIterator._(this._pathMeasure) : assert(_pathMeasure != null);
+  PathMetricIterator._(this._pathMeasure);
 
   PathMetric? _pathMetric;
   final _PathMeasure _pathMeasure;
@@ -2942,8 +3236,7 @@ class PathMetricIterator implements Iterator<PathMetric> {
 /// the path.
 class PathMetric {
   PathMetric._(this._measure)
-    : assert(_measure != null),
-      length = _measure.length(_measure.currentContourIndex),
+    : length = _measure.length(_measure.currentContourIndex),
       isClosed = _measure.isClosed(_measure.currentContourIndex),
       contourIndex = _measure.currentContourIndex;
 
@@ -3001,23 +3294,23 @@ class PathMetric {
   }
 
   @override
-  String toString() => '$runtimeType{length: $length, isClosed: $isClosed, contourIndex:$contourIndex}';
+  String toString() => 'PathMetric(length: $length, isClosed: $isClosed, contourIndex: $contourIndex)';
 }
 
-class _PathMeasure extends NativeFieldWrapperClass1 {
-  _PathMeasure(Path path, bool forceClosed) {
+base class _PathMeasure extends NativeFieldWrapperClass1 {
+  _PathMeasure(_NativePath path, bool forceClosed) {
     _constructor(path, forceClosed);
   }
 
-  @FfiNative<Void Function(Handle, Pointer<Void>, Bool)>('PathMeasure::Create')
-  external void _constructor(Path path, bool forceClosed);
+  @Native<Void Function(Handle, Pointer<Void>, Bool)>(symbol: 'PathMeasure::Create')
+  external void _constructor(_NativePath path, bool forceClosed);
 
   double length(int contourIndex) {
     assert(contourIndex <= currentContourIndex, 'Iterator must be advanced before index $contourIndex can be used.');
     return _length(contourIndex);
   }
 
-  @FfiNative<Float Function(Pointer<Void>, Int32)>('PathMeasure::getLength', isLeaf: true)
+  @Native<Double Function(Pointer<Void>, Int32)>(symbol: 'PathMeasure::getLength', isLeaf: true)
   external double _length(int contourIndex);
 
   Tangent? getTangentForOffset(int contourIndex, double distance) {
@@ -3035,18 +3328,18 @@ class _PathMeasure extends NativeFieldWrapperClass1 {
     }
   }
 
-  @FfiNative<Handle Function(Pointer<Void>, Int32, Float)>('PathMeasure::getPosTan')
+  @Native<Handle Function(Pointer<Void>, Int32, Double)>(symbol: 'PathMeasure::getPosTan')
   external Float32List _getPosTan(int contourIndex, double distance);
 
   Path extractPath(int contourIndex, double start, double end,
       {bool startWithMoveTo = true}) {
     assert(contourIndex <= currentContourIndex, 'Iterator must be advanced before index $contourIndex can be used.');
-    final Path path = Path._();
+    final _NativePath path = _NativePath._();
     _extractPath(path, contourIndex, start, end, startWithMoveTo);
     return path;
   }
 
-  @FfiNative<Void Function(Pointer<Void>, Handle, Int32, Float, Float, Bool)>('PathMeasure::getSegment')
+  @Native<Void Function(Pointer<Void>, Handle, Int32, Double, Double, Bool)>(symbol: 'PathMeasure::getSegment')
   external void _extractPath(Path outPath, int contourIndex, double start, double end, bool startWithMoveTo);
 
   bool isClosed(int contourIndex) {
@@ -3054,7 +3347,7 @@ class _PathMeasure extends NativeFieldWrapperClass1 {
     return _isClosed(contourIndex);
   }
 
-  @FfiNative<Bool Function(Pointer<Void>, Int32)>('PathMeasure::isClosed', isLeaf: true)
+  @Native<Bool Function(Pointer<Void>, Int32)>(symbol: 'PathMeasure::isClosed', isLeaf: true)
   external bool _isClosed(int contourIndex);
 
   // Move to the next contour in the path.
@@ -3069,7 +3362,7 @@ class _PathMeasure extends NativeFieldWrapperClass1 {
     return next;
   }
 
-  @FfiNative<Bool Function(Pointer<Void>)>('PathMeasure::nextContour', isLeaf: true)
+  @Native<Bool Function(Pointer<Void>)>(symbol: 'PathMeasure::nextContour', isLeaf: true)
   external bool _nativeNextContour();
 
   /// The index of the current contour in the list of contours in the path.
@@ -3079,9 +3372,9 @@ class _PathMeasure extends NativeFieldWrapperClass1 {
 }
 
 /// Styles to use for blurs in [MaskFilter] objects.
-// These enum values must be kept in sync with SkBlurStyle.
+// These enum values must be kept in sync with DlBlurStyle.
 enum BlurStyle {
-  // These mirror SkBlurStyle and must be kept in sync.
+  // These mirror DlBlurStyle and must be kept in sync.
 
   /// Fuzzy inside and outside. This is useful for painting shadows that are
   /// offset from the shape that ostensibly is casting the shadow.
@@ -3129,16 +3422,15 @@ class MaskFilter {
   const MaskFilter.blur(
     this._style,
     this._sigma,
-  ) : assert(_style != null),
-      assert(_sigma != null);
+  );
 
   final BlurStyle _style;
   final double _sigma;
 
-  // The type of MaskFilter class to create for Skia.
+  // The type of MaskFilter class to create for flutter::DisplayList.
   // These constants must be kept in sync with MaskFilterType in paint.cc.
   static const int _TypeNone = 0; // null
-  static const int _TypeBlur = 1; // SkBlurMaskFilter
+  static const int _TypeBlur = 1; // DlBlurMaskFilter
 
   @override
   bool operator ==(Object other) {
@@ -3176,16 +3468,17 @@ class ColorFilter implements ImageFilter {
         _matrix = null,
         _type = _kTypeMode;
 
-  /// Construct a color filter that transforms a color by a 5x5 matrix, where
-  /// the fifth row is implicitly added in an identity configuration.
+  /// Construct a color filter from a 4x5 row-major matrix. The matrix is
+  /// interpreted as a 5x5 matrix, where the fifth row is the identity
+  /// configuration.
   ///
-  /// Every pixel's color value, repsented as an `[R, G, B, A]`, is matrix
+  /// Every pixel's color value, represented as an `[R, G, B, A]`, is matrix
   /// multiplied to create a new color:
   ///
   ///     | R' |   | a00 a01 a02 a03 a04 |   | R |
-  ///     | G' |   | a10 a11 a22 a33 a44 |   | G |
-  ///     | B' | = | a20 a21 a22 a33 a44 | * | B |
-  ///     | A' |   | a30 a31 a22 a33 a44 |   | A |
+  ///     | G' |   | a10 a11 a12 a13 a14 |   | G |
+  ///     | B' | = | a20 a21 a22 a23 a24 | * | B |
+  ///     | A' |   | a30 a31 a32 a33 a34 |   | A |
   ///     | 1  |   |  0   0   0   0   1  |   | 1 |
   ///
   /// The matrix is in row-major order and the translation column is specified
@@ -3261,13 +3554,13 @@ class ColorFilter implements ImageFilter {
   final List<double>? _matrix;
   final int _type;
 
-  // The type of SkColorFilter class to create for Skia.
+  // The type of DlColorFilter class to create.
   static const int _kTypeMode = 1; // MakeModeFilter
   static const int _kTypeMatrix = 2; // MakeMatrixFilterRowMajor255
   static const int _kTypeLinearToSrgbGamma = 3; // MakeLinearToSRGBGamma
   static const int _kTypeSrgbToLinearGamma = 4; // MakeSRGBToLinearGamma
 
-  // SkImageFilters::ColorFilter
+  // DlColorImageFilter
   @override
   _ImageFilter _toNativeImageFilter() => _ImageFilter.fromColorFilter(this);
 
@@ -3279,10 +3572,11 @@ class ColorFilter implements ImageFilter {
         }
         return _ColorFilter.mode(this);
       case _kTypeMatrix:
-        if (_matrix == null) {
+        final List<double>? matrix = _matrix;
+        if (matrix == null) {
           return null;
         }
-        assert(_matrix!.length == 20, 'Color Matrix must have 20 entries.');
+        assert(matrix.length == 20, 'Color Matrix must have 20 entries.');
         return _ColorFilter.matrix(this);
       case _kTypeLinearToSrgbGamma:
         return _ColorFilter.linearToSrgbGamma(this);
@@ -3306,7 +3600,10 @@ class ColorFilter implements ImageFilter {
   }
 
   @override
-  int get hashCode => Object.hash(_color, _blendMode, _matrix == null ? null : Object.hashAll(_matrix!), _type);
+  int get hashCode {
+    final List<double>? matrix = _matrix;
+    return Object.hash(_color, _blendMode, matrix == null ? null : Object.hashAll(matrix), _type);
+  }
 
   @override
   String get _shortDescription {
@@ -3341,36 +3638,32 @@ class ColorFilter implements ImageFilter {
   }
 }
 
-/// A [ColorFilter] that is backed by a native SkColorFilter.
+/// A [ColorFilter] that is backed by a native DlColorFilter.
 ///
 /// This is a private class, rather than being the implementation of the public
 /// ColorFilter, because we want ColorFilter to be const constructible and
 /// efficiently comparable, so that widgets can check for ColorFilter equality to
 /// avoid repainting.
-class _ColorFilter extends NativeFieldWrapperClass1 {
+base class _ColorFilter extends NativeFieldWrapperClass1 {
   _ColorFilter.mode(this.creator)
-    : assert(creator != null),
-      assert(creator._type == ColorFilter._kTypeMode) {
+    : assert(creator._type == ColorFilter._kTypeMode) {
     _constructor();
     _initMode(creator._color!.value, creator._blendMode!.index);
   }
 
   _ColorFilter.matrix(this.creator)
-    : assert(creator != null),
-      assert(creator._type == ColorFilter._kTypeMatrix) {
+    : assert(creator._type == ColorFilter._kTypeMatrix) {
     _constructor();
     _initMatrix(Float32List.fromList(creator._matrix!));
   }
   _ColorFilter.linearToSrgbGamma(this.creator)
-    : assert(creator != null),
-      assert(creator._type == ColorFilter._kTypeLinearToSrgbGamma) {
+    : assert(creator._type == ColorFilter._kTypeLinearToSrgbGamma) {
     _constructor();
     _initLinearToSrgbGamma();
   }
 
   _ColorFilter.srgbToLinearGamma(this.creator)
-    : assert(creator != null),
-      assert(creator._type == ColorFilter._kTypeSrgbToLinearGamma) {
+    : assert(creator._type == ColorFilter._kTypeSrgbToLinearGamma) {
     _constructor();
     _initSrgbToLinearGamma();
   }
@@ -3379,19 +3672,19 @@ class _ColorFilter extends NativeFieldWrapperClass1 {
   /// the values used for the filter.
   final ColorFilter creator;
 
-  @FfiNative<Void Function(Handle)>('ColorFilter::Create')
+  @Native<Void Function(Handle)>(symbol: 'ColorFilter::Create')
   external void _constructor();
 
-  @FfiNative<Void Function(Pointer<Void>, Int32, Int32)>('ColorFilter::initMode', isLeaf: true)
+  @Native<Void Function(Pointer<Void>, Int32, Int32)>(symbol: 'ColorFilter::initMode', isLeaf: true)
   external void _initMode(int color, int blendMode);
 
-  @FfiNative<Void Function(Pointer<Void>, Handle)>('ColorFilter::initMatrix')
+  @Native<Void Function(Pointer<Void>, Handle)>(symbol: 'ColorFilter::initMatrix')
   external void _initMatrix(Float32List matrix);
 
-  @FfiNative<Void Function(Pointer<Void>)>('ColorFilter::initLinearToSrgbGamma', isLeaf: true)
+  @Native<Void Function(Pointer<Void>)>(symbol: 'ColorFilter::initLinearToSrgbGamma', isLeaf: true)
   external void _initLinearToSrgbGamma();
 
-  @FfiNative<Void Function(Pointer<Void>)>('ColorFilter::initSrgbToLinearGamma', isLeaf: true)
+  @Native<Void Function(Pointer<Void>)>(symbol: 'ColorFilter::initSrgbToLinearGamma', isLeaf: true)
   external void _initSrgbToLinearGamma();
 }
 
@@ -3406,27 +3699,23 @@ class _ColorFilter extends NativeFieldWrapperClass1 {
 ///  * [SceneBuilder.pushImageFilter], which is the low-level API for using
 ///    this class as a child layer filter.
 abstract class ImageFilter {
+  // This class is not meant to be extended; this constructor prevents extension.
+  ImageFilter._(); // ignore: unused_element
+
   /// Creates an image filter that applies a Gaussian blur.
   factory ImageFilter.blur({ double sigmaX = 0.0, double sigmaY = 0.0, TileMode tileMode = TileMode.clamp }) {
-    assert(sigmaX != null);
-    assert(sigmaY != null);
-    assert(tileMode != null);
     return _GaussianBlurImageFilter(sigmaX: sigmaX, sigmaY: sigmaY, tileMode: tileMode);
   }
 
   /// Creates an image filter that dilates each input pixel's channel values
   /// to the max value within the given radii along the x and y axes.
   factory ImageFilter.dilate({ double radiusX = 0.0, double radiusY = 0.0 }) {
-    assert(radiusX != null);
-    assert(radiusY != null);
     return _DilateImageFilter(radiusX: radiusX, radiusY: radiusY);
   }
 
   /// Create a filter that erodes each input pixel's channel values
   /// to the minimum channel value within the given radii along the x and y axes.
   factory ImageFilter.erode({ double radiusX = 0.0, double radiusY = 0.0 }) {
-    assert(radiusX != null);
-    assert(radiusY != null);
     return _ErodeImageFilter(radiusX: radiusX, radiusY: radiusY);
   }
 
@@ -3436,8 +3725,6 @@ abstract class ImageFilter {
   /// when used with [BackdropFilter] would magnify the background image.
   factory ImageFilter.matrix(Float64List matrix4,
                      { FilterQuality filterQuality = FilterQuality.low }) {
-    assert(matrix4 != null);
-    assert(filterQuality != null);
     if (matrix4.length != 16) {
       throw ArgumentError('"matrix4" must have 16 entries.');
     }
@@ -3450,12 +3737,11 @@ abstract class ImageFilter {
   /// subsequently applying `inner` and `outer`, i.e.,
   /// result = outer(inner(source)).
   factory ImageFilter.compose({ required ImageFilter outer, required ImageFilter inner }) {
-    assert(inner != null && outer != null);
     return _ComposeImageFilter(innerFilter: inner, outerFilter: outer);
   }
 
-  // Converts this to a native SkImageFilter. See the comments of this method in
-  // subclasses for the exact type of SkImageFilter this method converts to.
+  // Converts this to a native DlImageFilter. See the comments of this method in
+  // subclasses for the exact type of DlImageFilter this method converts to.
   _ImageFilter _toNativeImageFilter();
 
   // The description text to show when the filter is part of a composite
@@ -3602,7 +3888,7 @@ class _ComposeImageFilter implements ImageFilter {
   final ImageFilter innerFilter;
   final ImageFilter outerFilter;
 
-  // SkImageFilters::Compose
+  // DlComposeImageFilter
   late final _ImageFilter nativeFilter = _ImageFilter.composed(this);
   @override
   _ImageFilter _toNativeImageFilter() => nativeFilter;
@@ -3627,16 +3913,15 @@ class _ComposeImageFilter implements ImageFilter {
   int get hashCode => Object.hash(innerFilter, outerFilter);
 }
 
-/// An [ImageFilter] that is backed by a native SkImageFilter.
+/// An [ImageFilter] that is backed by a native DlImageFilter.
 ///
 /// This is a private class, rather than being the implementation of the public
 /// ImageFilter, because we want ImageFilter to be efficiently comparable, so that
 /// widgets can check for ImageFilter equality to avoid repainting.
-class _ImageFilter extends NativeFieldWrapperClass1 {
+base class _ImageFilter extends NativeFieldWrapperClass1 {
   /// Creates an image filter that applies a Gaussian blur.
   _ImageFilter.blur(_GaussianBlurImageFilter filter)
-    : assert(filter != null),
-      creator = filter {
+    : creator = filter {
     _constructor();
     _initBlur(filter.sigmaX, filter.sigmaY, filter.tileMode.index);
   }
@@ -3644,8 +3929,7 @@ class _ImageFilter extends NativeFieldWrapperClass1 {
   /// Creates an image filter that dilates each input pixel's channel values
   /// to the max value within the given radii along the x and y axes.
   _ImageFilter.dilate(_DilateImageFilter filter)
-    : assert(filter != null),
-      creator = filter {
+    : creator = filter {
     _constructor();
     _initDilate(filter.radiusX, filter.radiusY);
   }
@@ -3653,8 +3937,7 @@ class _ImageFilter extends NativeFieldWrapperClass1 {
   /// Create a filter that erodes each input pixel's channel values
   /// to the minimum channel value within the given radii along the x and y axes.
   _ImageFilter.erode(_ErodeImageFilter filter)
-    : assert(filter != null),
-      creator = filter {
+    : creator = filter {
     _constructor();
     _initErode(filter.radiusX, filter.radiusY);
   }
@@ -3664,8 +3947,7 @@ class _ImageFilter extends NativeFieldWrapperClass1 {
   /// For example, applying a positive scale matrix (see [Matrix4.diagonal3])
   /// when used with [BackdropFilter] would magnify the background image.
   _ImageFilter.matrix(_MatrixImageFilter filter)
-    : assert(filter != null),
-      creator = filter {
+    : creator = filter {
     if (filter.data.length != 16) {
       throw ArgumentError('"matrix4" must have 16 entries.');
     }
@@ -3675,8 +3957,7 @@ class _ImageFilter extends NativeFieldWrapperClass1 {
 
   /// Converts a color filter to an image filter.
   _ImageFilter.fromColorFilter(ColorFilter filter)
-    : assert(filter != null),
-      creator = filter {
+    : creator = filter {
     _constructor();
     final _ColorFilter? nativeFilter = filter._toNativeColorFilter();
     _initColorFilter(nativeFilter);
@@ -3684,33 +3965,32 @@ class _ImageFilter extends NativeFieldWrapperClass1 {
 
   /// Composes `_innerFilter` with `_outerFilter`.
   _ImageFilter.composed(_ComposeImageFilter filter)
-    : assert(filter != null),
-      creator = filter {
+    : creator = filter {
     _constructor();
     final _ImageFilter nativeFilterInner = filter.innerFilter._toNativeImageFilter();
     final _ImageFilter nativeFilterOuter = filter.outerFilter._toNativeImageFilter();
     _initComposed(nativeFilterOuter, nativeFilterInner);
   }
 
-  @FfiNative<Void Function(Handle)>('ImageFilter::Create')
+  @Native<Void Function(Handle)>(symbol: 'ImageFilter::Create')
   external void _constructor();
 
-  @FfiNative<Void Function(Pointer<Void>, Double, Double, Int32)>('ImageFilter::initBlur', isLeaf: true)
+  @Native<Void Function(Pointer<Void>, Double, Double, Int32)>(symbol: 'ImageFilter::initBlur', isLeaf: true)
   external void _initBlur(double sigmaX, double sigmaY, int tileMode);
 
-  @FfiNative<Void Function(Pointer<Void>, Double, Double)>('ImageFilter::initDilate', isLeaf: true)
+  @Native<Void Function(Pointer<Void>, Double, Double)>(symbol: 'ImageFilter::initDilate', isLeaf: true)
   external void _initDilate(double radiusX, double radiusY);
 
-  @FfiNative<Void Function(Pointer<Void>, Double, Double)>('ImageFilter::initErode', isLeaf: true)
+  @Native<Void Function(Pointer<Void>, Double, Double)>(symbol: 'ImageFilter::initErode', isLeaf: true)
   external void _initErode(double radiusX, double radiusY);
 
-  @FfiNative<Void Function(Pointer<Void>, Handle, Int32)>('ImageFilter::initMatrix')
+  @Native<Void Function(Pointer<Void>, Handle, Int32)>(symbol: 'ImageFilter::initMatrix')
   external void _initMatrix(Float64List matrix4, int filterQuality);
 
-  @FfiNative<Void Function(Pointer<Void>, Pointer<Void>)>('ImageFilter::initColorFilter')
+  @Native<Void Function(Pointer<Void>, Pointer<Void>)>(symbol: 'ImageFilter::initColorFilter')
   external void _initColorFilter(_ColorFilter? colorFilter);
 
-  @FfiNative<Void Function(Pointer<Void>, Pointer<Void>, Pointer<Void>)>('ImageFilter::initComposeFilter')
+  @Native<Void Function(Pointer<Void>, Pointer<Void>, Pointer<Void>)>(symbol: 'ImageFilter::initComposeFilter')
   external void _initComposed(_ImageFilter outerFilter, _ImageFilter innerFilter);
 
   /// The original Dart object that created the native wrapper, which retains
@@ -3720,7 +4000,7 @@ class _ImageFilter extends NativeFieldWrapperClass1 {
 
 /// Base class for objects such as [Gradient] and [ImageShader] which
 /// correspond to shaders as used by [Paint.shader].
-class Shader extends NativeFieldWrapperClass1 {
+base class Shader extends NativeFieldWrapperClass1 {
   /// This class is created by the engine, and should not be instantiated
   /// or extended directly.
   @pragma('vm:entry-point')
@@ -3788,7 +4068,7 @@ class Shader extends NativeFieldWrapperClass1 {
 ///  * [dart:ui.ImageFilter.blur], an ImageFilter that may sometimes need to
 ///    read samples from outside an image to combine with the pixels near the
 ///    edge of the image.
-// These enum values must be kept in sync with SkTileMode.
+// These enum values must be kept in sync with DlTileMode.
 enum TileMode {
   /// Samples beyond the edge are clamped to the nearest color in the defined inner area.
   ///
@@ -3858,7 +4138,6 @@ Int32List _encodeColorList(List<Color> colors) {
 }
 
 Float32List _encodePointList(List<Offset> points) {
-  assert(points != null);
   final int pointCount = points.length;
   final Float32List result = Float32List(pointCount * 2);
   for (int i = 0; i < pointCount; ++i) {
@@ -3892,13 +4171,17 @@ Float32List _encodeTwoPoints(Offset pointA, Offset pointB) {
 ///
 ///  * [Gradient](https://api.flutter.dev/flutter/painting/Gradient-class.html), the class in the [painting] library.
 ///
-class Gradient extends Shader {
+base class Gradient extends Shader {
   /// Creates a linear gradient from `from` to `to`.
   ///
   /// If `colorStops` is provided, `colorStops[i]` is a number from 0.0 to 1.0
   /// that specifies where `color[i]` begins in the gradient. If `colorStops` is
   /// not provided, then only two stops, at 0.0 and 1.0, are implied (and
-  /// `color` must therefore only have two entries).
+  /// `color` must therefore only have two entries). Stop values less than 0.0
+  /// will be rounded up to 0.0 and stop values greater than 1.0 will be rounded
+  /// down to 1.0. Each stop value must be greater than or equal to the previous
+  /// stop value. Stop values that do not meet this criteria will be rounded up
+  /// to the previous stop value.
   ///
   /// The behavior before `from` and after `to` is described by the `tileMode`
   /// argument. For details, see the [TileMode] enum.
@@ -3924,8 +4207,6 @@ class Gradient extends Shader {
     Float64List? matrix4,
   ]) : assert(_offsetIsValid(from)),
        assert(_offsetIsValid(to)),
-       assert(colors != null),
-       assert(tileMode != null),
        assert(matrix4 == null || _matrix4IsValid(matrix4)),
        super._() {
     _validateColorStops(colors, colorStops);
@@ -3942,7 +4223,11 @@ class Gradient extends Shader {
   /// If `colorStops` is provided, `colorStops[i]` is a number from 0.0 to 1.0
   /// that specifies where `color[i]` begins in the gradient. If `colorStops` is
   /// not provided, then only two stops, at 0.0 and 1.0, are implied (and
-  /// `color` must therefore only have two entries).
+  /// `color` must therefore only have two entries). Stop values less than 0.0
+  /// will be rounded up to 0.0 and stop values greater than 1.0 will be rounded
+  /// down to 1.0. Each stop value must be greater than or equal to the previous
+  /// stop value. Stop values that do not meet this criteria will be rounded up
+  /// to the previous stop value.
   ///
   /// The behavior before and after the radius is described by the `tileMode`
   /// argument. For details, see the [TileMode] enum.
@@ -3976,8 +4261,6 @@ class Gradient extends Shader {
     Offset? focal,
     double focalRadius = 0.0
   ]) : assert(_offsetIsValid(center)),
-       assert(colors != null),
-       assert(tileMode != null),
        assert(matrix4 == null || _matrix4IsValid(matrix4)),
        super._() {
     _validateColorStops(colors, colorStops);
@@ -4006,7 +4289,11 @@ class Gradient extends Shader {
   /// If `colorStops` is provided, `colorStops[i]` is a number from 0.0 to 1.0
   /// that specifies where `color[i]` begins in the gradient. If `colorStops` is
   /// not provided, then only two stops, at 0.0 and 1.0, are implied (and
-  /// `color` must therefore only have two entries).
+  /// `color` must therefore only have two entries). Stop values less than 0.0
+  /// will be rounded up to 0.0 and stop values greater than 1.0 will be rounded
+  /// down to 1.0. Each stop value must be greater than or equal to the previous
+  /// stop value. Stop values that do not meet this criteria will be rounded up
+  /// to the previous stop value.
   ///
   /// The behavior before `startAngle` and after `endAngle` is described by the
   /// `tileMode` argument. For details, see the [TileMode] enum.
@@ -4032,10 +4319,6 @@ class Gradient extends Shader {
     double endAngle = math.pi * 2,
     Float64List? matrix4,
   ]) : assert(_offsetIsValid(center)),
-       assert(colors != null),
-       assert(tileMode != null),
-       assert(startAngle != null),
-       assert(endAngle != null),
        assert(startAngle < endAngle),
        assert(matrix4 == null || _matrix4IsValid(matrix4)),
        super._() {
@@ -4046,13 +4329,13 @@ class Gradient extends Shader {
     _initSweep(center.dx, center.dy, colorsBuffer, colorStopsBuffer, tileMode.index, startAngle, endAngle, matrix4);
   }
 
-  @FfiNative<Void Function(Handle)>('Gradient::Create')
+  @Native<Void Function(Handle)>(symbol: 'Gradient::Create')
   external void _constructor();
 
-  @FfiNative<Void Function(Pointer<Void>, Handle, Handle, Handle, Int32, Handle)>('Gradient::initLinear')
+  @Native<Void Function(Pointer<Void>, Handle, Handle, Handle, Int32, Handle)>(symbol: 'Gradient::initLinear')
   external void _initLinear(Float32List endPoints, Int32List colors, Float32List? colorStops, int tileMode, Float64List? matrix4);
 
-  @FfiNative<Void Function(Pointer<Void>, Double, Double, Double, Handle, Handle, Int32, Handle)>('Gradient::initRadial')
+  @Native<Void Function(Pointer<Void>, Double, Double, Double, Handle, Handle, Int32, Handle)>(symbol: 'Gradient::initRadial')
   external void _initRadial(
       double centerX,
       double centerY,
@@ -4062,8 +4345,7 @@ class Gradient extends Shader {
       int tileMode,
       Float64List? matrix4);
 
-  @FfiNative<Void Function(Pointer<Void>, Double, Double, Double, Double, Double, Double, Handle, Handle, Int32, Handle)>(
-      'Gradient::initTwoPointConical')
+  @Native<Void Function(Pointer<Void>, Double, Double, Double, Double, Double, Double, Handle, Handle, Int32, Handle)>(symbol: 'Gradient::initTwoPointConical')
   external void _initConical(
       double startX,
       double startY,
@@ -4076,7 +4358,7 @@ class Gradient extends Shader {
       int tileMode,
       Float64List? matrix4);
 
-  @FfiNative<Void Function(Pointer<Void>, Double, Double, Handle, Handle, Int32, Double, Double, Handle)>('Gradient::initSweep')
+  @Native<Void Function(Pointer<Void>, Double, Double, Handle, Handle, Int32, Double, Double, Handle)>(symbol: 'Gradient::initSweep')
   external void _initSweep(
       double centerX,
       double centerY,
@@ -4102,23 +4384,31 @@ class Gradient extends Shader {
 }
 
 /// A shader (as used by [Paint.shader]) that tiles an image.
-class ImageShader extends Shader {
-  /// Creates an image-tiling shader. The first argument specifies the image to
-  /// tile. The second and third arguments specify the [TileMode] for the x
-  /// direction and y direction respectively. The fourth argument gives the
-  /// matrix to apply to the effect. All the arguments are required and must not
-  /// be null, except for [filterQuality]. If [filterQuality] is not specified
-  /// at construction time it will be deduced from the environment where it is used,
-  /// such as from [Paint.filterQuality].
+base class ImageShader extends Shader {
+  /// Creates an image-tiling shader.
+  ///
+  /// The first argument specifies the image to render. The
+  /// [decodeImageFromList] function can be used to decode an image from bytes
+  /// into the form expected here. (In production code, starting from
+  /// [instantiateImageCodec] may be preferable.)
+  ///
+  /// The second and third arguments specify the [TileMode] for the x direction
+  /// and y direction respectively. [TileMode.repeated] can be used for tiling
+  /// images.
+  ///
+  /// The fourth argument gives the matrix to apply to the effect. The
+  /// expression `Matrix4.identity().storage` creates a [Float64List]
+  /// prepopulated with the identity matrix.
+  ///
+  /// All the arguments are required and must not be null, except for
+  /// [filterQuality]. If [filterQuality] is not specified at construction time
+  /// it will be deduced from the environment where it is used, such as from
+  /// [Paint.filterQuality].
   @pragma('vm:entry-point')
   ImageShader(Image image, TileMode tmx, TileMode tmy, Float64List matrix4, {
     FilterQuality? filterQuality,
   }) :
-    assert(image != null), // image is checked on the engine side
     assert(!image.debugDisposed),
-    assert(tmx != null),
-    assert(tmy != null),
-    assert(matrix4 != null),
     super._() {
     if (matrix4.length != 16) {
       throw ArgumentError('"matrix4" must have 16 entries.');
@@ -4136,15 +4426,15 @@ class ImageShader extends Shader {
     _dispose();
   }
 
-  @FfiNative<Void Function(Handle)>('ImageShader::Create')
+  @Native<Void Function(Handle)>(symbol: 'ImageShader::Create')
   external void _constructor();
 
-  @FfiNative<Handle Function(Pointer<Void>, Pointer<Void>, Int32, Int32, Int32, Handle)>('ImageShader::initWithImage')
+  @Native<Handle Function(Pointer<Void>, Pointer<Void>, Int32, Int32, Int32, Handle)>(symbol: 'ImageShader::initWithImage')
   external String? _initWithImage(_Image image, int tmx, int tmy, int filterQualityIndex, Float64List matrix4);
 
   /// This can't be a leaf call because the native function calls Dart API
   /// (Dart_SetNativeInstanceField).
-  @FfiNative<Void Function(Pointer<Void>)>('ImageShader::dispose')
+  @Native<Void Function(Pointer<Void>)>(symbol: 'ImageShader::dispose')
   external void _dispose();
 }
 
@@ -4153,7 +4443,7 @@ class ImageShader extends Shader {
 ///
 /// For more information, see the website
 /// [documentation]( https://docs.flutter.dev/development/ui/advanced/shaders).
-class FragmentProgram extends NativeFieldWrapperClass1 {
+base class FragmentProgram extends NativeFieldWrapperClass1 {
   @pragma('vm:entry-point')
   FragmentProgram._fromAsset(String assetKey) {
     _constructor();
@@ -4172,45 +4462,40 @@ class FragmentProgram extends NativeFieldWrapperClass1 {
   /// Creates a fragment program from the asset with key [assetKey].
   ///
   /// The asset must be a file produced as the output of the `impellerc`
-  /// compiler. The constructed object should then be reused via the [shader]
-  /// method to create [Shader] objects that can be used by [Shader.paint].
+  /// compiler. The constructed object should then be reused via the
+  /// [fragmentShader] method to create [Shader] objects that can be used by
+  /// [Paint.shader].
   static Future<FragmentProgram> fromAsset(String assetKey) {
     // The flutter tool converts all asset keys with spaces into URI
     // encoded paths (replacing ' ' with '%20', for example). We perform
     // the same encoding here so that users can load assets with the same
     // key they have written in the pubspec.
     final String encodedKey = Uri(path: Uri.encodeFull(assetKey)).path;
-    final FragmentProgram? program = _shaderRegistry[encodedKey]?.target;
+    final FragmentProgram? program = _shaderRegistry[encodedKey];
     if (program != null) {
       return Future<FragmentProgram>.value(program);
     }
     return Future<FragmentProgram>.microtask(() {
       final FragmentProgram program = FragmentProgram._fromAsset(encodedKey);
-      _shaderRegistry[encodedKey] = WeakReference<FragmentProgram>(program);
+      _shaderRegistry[encodedKey] = program;
       return program;
     });
   }
 
   // This is a cache of shaders that have been loaded by
-  // FragmentProgram.fromAsset. It holds weak references to the FragmentPrograms
-  // so that the case where an in-use program is requested again can be fast,
-  // but programs that are no longer referenced are not retained because of the
-  // cache.
-  static final Map<String, WeakReference<FragmentProgram>> _shaderRegistry =
-      <String, WeakReference<FragmentProgram>>{};
+  // FragmentProgram.fromAsset. It holds a strong reference to theFragmentPrograms
+  // The native engine will retain the resources associated with this shader
+  // program (PSO variants) until shutdown, so maintaining a strong reference
+  // here ensures we do not perform extra work if the dart object is continually
+  // re-initialized.
+  static final Map<String, FragmentProgram> _shaderRegistry =
+      <String, FragmentProgram>{};
 
   static void _reinitializeShader(String assetKey) {
     // If a shader for the asset isn't already registered, then there's no
     // need to reinitialize it. The new shader will be loaded and initialized
     // the next time the program access it.
-    final WeakReference<FragmentProgram>? programRef = _shaderRegistry == null
-      ? null
-      : _shaderRegistry[assetKey];
-    if (programRef == null) {
-      return;
-    }
-
-    final FragmentProgram? program = programRef.target;
+    final FragmentProgram? program = _shaderRegistry[assetKey];
     if (program == null) {
       return;
     }
@@ -4227,10 +4512,10 @@ class FragmentProgram extends NativeFieldWrapperClass1 {
   @pragma('vm:entry-point')
   late int _samplerCount;
 
-  @FfiNative<Void Function(Handle)>('FragmentProgram::Create')
+  @Native<Void Function(Handle)>(symbol: 'FragmentProgram::Create')
   external void _constructor();
 
-  @FfiNative<Handle Function(Pointer<Void>, Handle)>('FragmentProgram::initFromAsset')
+  @Native<Handle Function(Pointer<Void>, Handle)>(symbol: 'FragmentProgram::initFromAsset')
   external String _initFromAsset(String assetKey);
 
   /// Returns a fresh instance of [FragmentShader].
@@ -4250,7 +4535,7 @@ class FragmentProgram extends NativeFieldWrapperClass1 {
 /// if two [FragmentShader] objects with different float uniforms or samplers
 /// are required to exist simultaneously, they must be obtained from two
 /// different calls to [FragmentProgram.fragmentShader].
-class FragmentShader extends Shader {
+base class FragmentShader extends Shader {
   FragmentShader._(FragmentProgram program, { String? debugName }) : _debugName = debugName, super._() {
     _floats = _constructor(
       program,
@@ -4336,23 +4621,23 @@ class FragmentShader extends Shader {
     _dispose();
   }
 
-  @FfiNative<Handle Function(Handle, Handle, Handle, Handle)>('ReusableFragmentShader::Create')
+  @Native<Handle Function(Handle, Handle, Handle, Handle)>(symbol: 'ReusableFragmentShader::Create')
   external Float32List _constructor(FragmentProgram program, int floatUniforms, int samplerUniforms);
 
-  @FfiNative<Void Function(Pointer<Void>, Handle, Handle)>('ReusableFragmentShader::SetImageSampler')
+  @Native<Void Function(Pointer<Void>, Handle, Handle)>(symbol: 'ReusableFragmentShader::SetImageSampler')
   external void _setImageSampler(int index, _Image sampler);
 
-  @FfiNative<Bool Function(Pointer<Void>)>('ReusableFragmentShader::ValidateSamplers')
+  @Native<Bool Function(Pointer<Void>)>(symbol: 'ReusableFragmentShader::ValidateSamplers')
   external bool _validateSamplers();
 
-  @FfiNative<Void Function(Pointer<Void>)>('ReusableFragmentShader::Dispose')
+  @Native<Void Function(Pointer<Void>)>(symbol: 'ReusableFragmentShader::Dispose')
   external void _dispose();
 }
 
 /// Defines how a list of points is interpreted when drawing a set of triangles.
 ///
 /// Used by [Canvas.drawVertices].
-// These enum values must be kept in sync with SkVertices::VertexMode.
+// These enum values must be kept in sync with DlVertexMode.
 enum VertexMode {
   /// Draw each sequence of three points as the vertices of a triangle.
   triangles,
@@ -4360,46 +4645,118 @@ enum VertexMode {
   /// Draw each sliding window of three points as the vertices of a triangle.
   triangleStrip,
 
-  /// Draw the first point and each sliding window of two points as the vertices of a triangle.
+  /// Draw the first point and each sliding window of two points as the vertices
+  /// of a triangle.
+  ///
+  /// This mode is not natively supported by most backends, and is instead
+  /// implemented by unrolling the points into the equivalent
+  /// [VertexMode.triangles], which is generally more efficient.
   triangleFan,
 }
 
 /// A set of vertex data used by [Canvas.drawVertices].
-class Vertices extends NativeFieldWrapperClass1 {
+///
+/// Vertex data consists of a series of points in the canvas coordinate space.
+/// Based on the [VertexMode], these points are interpreted either as
+/// independent triangles ([VertexMode.triangles]), as a sliding window of
+/// points forming a chain of triangles each sharing one side with the next
+/// ([VertexMode.triangleStrip]), or as a fan of triangles with a single shared
+/// point ([VertexMode.triangleFan]).
+///
+/// Each point can be associated with a color. Each triangle is painted as a
+/// gradient that blends between the three colors at the three points of that
+/// triangle. If no colors are specified, transparent black is assumed for all
+/// the points.
+///
+/// These colors are then blended with the [Paint] specified in the call to
+/// [Canvas.drawVertices]. This paint is either a solid color ([Paint.color]),
+/// or a bitmap, specified using a shader ([Paint.shader]), typically either a
+/// gradient ([Gradient]) or image ([ImageFilter]). The bitmap uses the same
+/// coordinate space as the canvas (in the case of an [ImageFilter], this is
+/// notably different than the coordinate space of the source image; the source
+/// image is tiled according to the filter's configuration, and the image that
+/// is sampled when painting the triangles is the infinite one after all the
+/// repeating is applied.)
+///
+/// Each point in the [Vertices] is associated with a specific point on this
+/// image. Each triangle is painted by sampling points from this image by
+/// interpolating between the three points of the image corresponding to the
+/// three points of the triangle.
+///
+/// The [Vertices.new] constructor configures all this using lists of [Offset]
+/// and [Color] objects. The [Vertices.raw] constructor instead uses
+/// [Float32List], [Int32List], and [Uint16List] objects, which more closely
+/// corresponds to the data format used internally and therefore reduces some of
+/// the conversion overhead. The raw constructor is useful if the data is coming
+/// from another source (e.g. a file) and can therefore be parsed directly into
+/// the underlying representation.
+base class Vertices extends NativeFieldWrapperClass1 {
   /// Creates a set of vertex data for use with [Canvas.drawVertices].
   ///
-  /// The [mode] and [positions] parameters must not be null.
-  /// The [positions] parameter is a list of triangular mesh vertices(xy).
-  ///
-  /// If the [textureCoordinates] or [colors] parameters are provided, they must
-  /// be the same length as [positions].
-  ///
-  /// The [textureCoordinates] parameter is used to cutout
-  /// the image set in the image shader.
-  /// The cut part is applied to the triangular mesh.
-  /// Note that the [textureCoordinates] are the coordinates on the image.
-  ///
-  /// If the [indices] parameter is provided, all values in the list must be
-  /// valid index values for [positions].
-  /// e.g. The [indices] parameter for a simple triangle is [0,1,2].
+  /// The `mode` parameter describes how the points should be interpreted: as
+  /// independent triangles ([VertexMode.triangles]), as a sliding window of
+  /// points forming a chain of triangles each sharing one side with the next
+  /// ([VertexMode.triangleStrip]), or as a fan of triangles with a single
+  /// shared point ([VertexMode.triangleFan]).
+  ///
+  /// The `positions` parameter provides the points in the canvas space that
+  /// will be use to draw the triangles.
+  ///
+  /// The `colors` parameter, if specified, provides the color for each point in
+  /// `positions`. Each triangle is painted as a gradient that blends between
+  /// the three colors at the three points of that triangle. (These colors are
+  /// then blended with the [Paint] specified in the call to
+  /// [Canvas.drawVertices].)
+  ///
+  /// The `textureCoordinates` parameter, if specified, provides the points in
+  /// the [Paint] image to sample for the corresponding points in `positions`.
+  ///
+  /// If the `colors` or `textureCoordinates` parameters are specified, they must
+  /// be the same length as `positions`.
+  ///
+  /// The `indices` parameter specifies the order in which the points should be
+  /// painted. If it is omitted (or present but empty), the points are processed
+  /// in the order they are given in `positions`, as if the `indices` was a list
+  /// from 0 to n-1, where _n_ is the number of entries in `positions`. The
+  /// `indices` parameter, if present and non-empty, must have at least three
+  /// entries, but may be of any length beyond this. Indicies may refer to
+  /// offsets in the positions array multiple times, or may skip positions
+  /// entirely.
+  ///
+  /// If the `indices` parameter is specified, all values in the list must be
+  /// valid index values for `positions`.
+  ///
+  /// The `mode` and `positions` parameters must not be null.
+  ///
+  /// This constructor converts its parameters into [dart:typed_data] lists
+  /// (e.g. using [Float32List]s for the coordinates) before sending them to the
+  /// Flutter engine. If the data provided to this constructor is not already in
+  /// [List] form, consider using the [Vertices.raw] constructor instead to
+  /// avoid converting the data twice.
   Vertices(
     VertexMode mode,
     List<Offset> positions, {
-    List<Offset>? textureCoordinates,
     List<Color>? colors,
+    List<Offset>? textureCoordinates,
     List<int>? indices,
-  }) : assert(mode != null),
-       assert(positions != null) {
-    if (textureCoordinates != null && textureCoordinates.length != positions.length) {
-      throw ArgumentError('"positions" and "textureCoordinates" lengths must match.');
-    }
+  }) {
     if (colors != null && colors.length != positions.length) {
       throw ArgumentError('"positions" and "colors" lengths must match.');
     }
-    if (indices != null && indices.any((int i) => i < 0 || i >= positions.length)) {
-      throw ArgumentError('"indices" values must be valid indices in the positions list.');
+    if (textureCoordinates != null && textureCoordinates.length != positions.length) {
+      throw ArgumentError('"positions" and "textureCoordinates" lengths must match.');
+    }
+    if (indices != null) {
+      for (int index = 0; index < indices.length; index += 1) {
+        if (indices[index] >= positions.length) {
+          throw ArgumentError(
+            '"indices" values must be valid indices in the positions list '
+            '(i.e. numbers in the range 0..${positions.length - 1}), '
+            'but indices[$index] is ${indices[index]}, which is too big.',
+          );
+        }
+      }
     }
-
     final Float32List encodedPositions = _encodePointList(positions);
     final Float32List? encodedTextureCoordinates = (textureCoordinates != null)
       ? _encodePointList(textureCoordinates)
@@ -4416,57 +4773,83 @@ class Vertices extends NativeFieldWrapperClass1 {
     }
   }
 
-  /// Creates a set of vertex data for use with [Canvas.drawVertices], directly
-  /// using the encoding methods of [Vertices.new].
-  /// Note that this constructor uses raw typed data lists,
-  /// so it runs faster than the [Vertices()] constructor
-  /// because it doesn't require any conversion from Dart lists.
-  ///
-  /// The [mode] parameter must not be null.
-  ///
-  /// The [positions] parameter is a list of triangular mesh vertices and
-  /// is interpreted as a list of repeated pairs of x,y coordinates.
-  /// It must not be null.
-  ///
-  /// The [textureCoordinates] list is interpreted as a list of repeated pairs
-  /// of x,y coordinates, and must be the same length of [positions] if it
-  /// is not null.
-  /// The [textureCoordinates] parameter is used to cutout
-  /// the image set in the image shader.
-  /// The cut part is applied to the triangular mesh.
-  /// Note that the [textureCoordinates] are the coordinates on the image.
-  ///
-  /// The [colors] list is interpreted as a list of ARGB encoded colors, similar
-  /// to [Color.value]. It must be half length of [positions] if it is not
-  /// null.
-  ///
-  /// If the [indices] list is provided, all values in the list must be
-  /// valid index values for [positions].
-  /// e.g. The [indices] parameter for a simple triangle is [0,1,2].
+  /// Creates a set of vertex data for use with [Canvas.drawVertices], using the
+  /// encoding expected by the Flutter engine.
+  ///
+  /// The `mode` parameter describes how the points should be interpreted: as
+  /// independent triangles ([VertexMode.triangles]), as a sliding window of
+  /// points forming a chain of triangles each sharing one side with the next
+  /// ([VertexMode.triangleStrip]), or as a fan of triangles with a single
+  /// shared point ([VertexMode.triangleFan]).
+  ///
+  /// The `positions` parameter provides the points in the canvas space that
+  /// will be use to draw the triangles. Each point is represented as two
+  /// numbers in the list, the first giving the x coordinate and the second
+  /// giving the y coordinate. (As a result, the list must have an even number
+  /// of entries.)
+  ///
+  /// The `colors` parameter, if specified, provides the color for each point in
+  /// `positions`. Each color is represented as ARGB with 8 bit color channels
+  /// (like [Color.value]'s internal representation), and the list, if
+  /// specified, must therefore be half the length of `positions`. Each triangle
+  /// is painted as a gradient that blends between the three colors at the three
+  /// points of that triangle. (These colors are then blended with the [Paint]
+  /// specified in the call to [Canvas.drawVertices].)
+  ///
+  /// The `textureCoordinates` parameter, if specified, provides the points in
+  /// the [Paint] image to sample for the corresponding points in `positions`.
+  /// Each point is represented as two numbers in the list, the first giving the
+  /// x coordinate and the second giving the y coordinate. This list, if
+  /// specified, must be the same length as `positions`.
+  ///
+  /// The `indices` parameter specifies the order in which the points should be
+  /// painted. If it is omitted (or present but empty), the points are processed
+  /// in the order they are given in `positions`, as if the `indices` was a list
+  /// from 0 to n-2, where _n_ is the number of pairs in `positions` (i.e. half
+  /// the length of `positions`). The `indices` parameter, if present and
+  /// non-empty, must have at least three entries, but may be of any length
+  /// beyond this. Indicies may refer to offsets in the positions array multiple
+  /// times, or may skip positions entirely.
+  ///
+  /// If the `indices` parameter is specified, all values in the list must be
+  /// valid index values for pairs in `positions`. For example, if there are 12
+  /// numbers in `positions` (representing 6 coordinates), the `indicies` must
+  /// be numbers in the range 0..5 inclusive.
+  ///
+  /// The `mode` and `positions` parameters must not be null.
   Vertices.raw(
     VertexMode mode,
     Float32List positions, {
-    Float32List? textureCoordinates,
     Int32List? colors,
+    Float32List? textureCoordinates,
     Uint16List? indices,
-  }) : assert(mode != null),
-       assert(positions != null) {
-    if (textureCoordinates != null && textureCoordinates.length != positions.length) {
-      throw ArgumentError('"positions" and "textureCoordinates" lengths must match.');
+  }) {
+    if (positions.length % 2 != 0) {
+      throw ArgumentError('"positions" must have an even number of entries (each coordinate is an x,y pair).');
     }
     if (colors != null && colors.length * 2 != positions.length) {
       throw ArgumentError('"positions" and "colors" lengths must match.');
     }
-    if (indices != null && indices.any((int i) => i < 0 || i >= positions.length)) {
-      throw ArgumentError('"indices" values must be valid indices in the positions list.');
+    if (textureCoordinates != null && textureCoordinates.length != positions.length) {
+      throw ArgumentError('"positions" and "textureCoordinates" lengths must match.');
+    }
+    if (indices != null) {
+      for (int index = 0; index < indices.length; index += 1) {
+        if (indices[index] * 2 >= positions.length) {
+          throw ArgumentError(
+            '"indices" values must be valid indices in the positions list '
+            '(i.e. numbers in the range 0..${positions.length ~/ 2 - 1}), '
+            'but indices[$index] is ${indices[index]}, which is too big.',
+          );
+        }
+      }
     }
-
     if (!_init(this, mode.index, positions, textureCoordinates, colors, indices)) {
       throw ArgumentError('Invalid configuration for vertices.');
     }
   }
 
-  @FfiNative<Bool Function(Handle, Int32, Handle, Handle, Handle, Handle)>('Vertices::init')
+  @Native<Bool Function(Handle, Int32, Handle, Handle, Handle, Handle)>(symbol: 'Vertices::init')
   external static bool _init(Vertices outVertices,
                              int mode,
                              Float32List positions,
@@ -4487,11 +4870,11 @@ class Vertices extends NativeFieldWrapperClass1 {
 
   /// This can't be a leaf call because the native function calls Dart API
   /// (Dart_SetNativeInstanceField).
-  @FfiNative<Void Function(Pointer<Void>)>('Vertices::dispose')
+  @Native<Void Function(Pointer<Void>)>(symbol: 'Vertices::dispose')
   external void _dispose();
 
   bool _disposed = false;
-  /// Whether this reference to the underlying picture is [dispose]d.
+  /// Whether this reference to the underlying vertex data is [dispose]d.
   ///
   /// This only returns a valid value if asserts are enabled, and must not be
   /// used otherwise.
@@ -4501,14 +4884,14 @@ class Vertices extends NativeFieldWrapperClass1 {
       disposed = _disposed;
       return true;
     }());
-    return disposed ?? (throw StateError('$runtimeType.debugDisposed is only available when asserts are enabled.'));
+    return disposed ?? (throw StateError('Vertices.debugDisposed is only available when asserts are enabled.'));
   }
 }
 
 /// Defines how a list of points is interpreted when drawing a set of points.
 ///
-/// Used by [Canvas.drawPoints].
-// These enum values must be kept in sync with SkCanvas::PointMode.
+/// Used by [Canvas.drawPoints] and [Canvas.drawRawPoints].
+// These enum values must be kept in sync with DlCanvas::PointMode.
 enum PointMode {
   /// Draw each point separately.
   ///
@@ -4529,7 +4912,7 @@ enum PointMode {
   /// [Paint.style]).
   lines,
 
-  /// Draw the entire sequence of point as one line.
+  /// Draw the entire sequence of points as one line.
   ///
   /// The lines are stroked as described by the [Paint] (ignoring
   /// [Paint.style]).
@@ -4565,7 +4948,7 @@ enum ClipOp {
 ///
 /// The current transform and clip can be saved and restored using the stack
 /// managed by the [save], [saveLayer], and [restore] methods.
-class Canvas extends NativeFieldWrapperClass1 {
+abstract class Canvas {
   /// Creates a canvas for recording graphical operations into the
   /// given picture recorder.
   ///
@@ -4578,24 +4961,7 @@ class Canvas extends NativeFieldWrapperClass1 {
   ///
   /// To end the recording, call [PictureRecorder.endRecording] on the
   /// given recorder.
-  @pragma('vm:entry-point')
-  Canvas(PictureRecorder recorder, [ Rect? cullRect ]) : assert(recorder != null) {
-    if (recorder.isRecording) {
-      throw ArgumentError('"recorder" must not already be associated with another Canvas.');
-    }
-    _recorder = recorder;
-    _recorder!._canvas = this;
-    cullRect ??= Rect.largest;
-    _constructor(recorder, cullRect.left, cullRect.top, cullRect.right, cullRect.bottom);
-  }
-
-  @FfiNative<Void Function(Handle, Pointer<Void>, Double, Double, Double, Double)>('Canvas::Create')
-  external void _constructor(PictureRecorder recorder, double left, double top, double right, double bottom);
-
-  // The underlying Skia SkCanvas is owned by the PictureRecorder used to create this Canvas.
-  // The Canvas holds a reference to the PictureRecorder to prevent the recorder from being
-  // garbage collected until PictureRecorder.endRecording is called.
-  PictureRecorder? _recorder;
+  factory Canvas(PictureRecorder recorder, [ Rect? cullRect ]) = _NativeCanvas;
 
   /// Saves a copy of the current transform and clip on the save stack.
   ///
@@ -4605,8 +4971,7 @@ class Canvas extends NativeFieldWrapperClass1 {
   ///
   ///  * [saveLayer], which does the same thing but additionally also groups the
   ///    commands done until the matching [restore].
-  @FfiNative<Void Function(Pointer<Void>)>('Canvas::save', isLeaf: true)
-  external void save();
+  void save();
 
   /// Saves a copy of the current transform and clip on the save stack, and then
   /// creates a new group which subsequent calls will become a part of. When the
@@ -4717,31 +5082,16 @@ class Canvas extends NativeFieldWrapperClass1 {
   ///    for subsequent commands.
   ///  * [BlendMode], which discusses the use of [Paint.blendMode] with
   ///    [saveLayer].
-  void saveLayer(Rect? bounds, Paint paint) {
-    assert(paint != null);
-    if (bounds == null) {
-      _saveLayerWithoutBounds(paint._objects, paint._data);
-    } else {
-      assert(_rectIsValid(bounds));
-      _saveLayer(bounds.left, bounds.top, bounds.right, bounds.bottom, paint._objects, paint._data);
-    }
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Handle, Handle)>('Canvas::saveLayerWithoutBounds')
-  external void _saveLayerWithoutBounds(List<Object?>? paintObjects, ByteData paintData);
-
-  @FfiNative<Void Function(Pointer<Void>, Double, Double, Double, Double, Handle, Handle)>('Canvas::saveLayer')
-  external void _saveLayer(double left, double top, double right, double bottom, List<Object?>? paintObjects, ByteData paintData);
+  void saveLayer(Rect? bounds, Paint paint);
 
   /// Pops the current save stack, if there is anything to pop.
   /// Otherwise, does nothing.
   ///
   /// Use [save] and [saveLayer] to push state onto the stack.
   ///
-  /// If the state was pushed with with [saveLayer], then this call will also
+  /// If the state was pushed with [saveLayer], then this call will also
   /// cause the new layer to be composited into the previous layer.
-  @FfiNative<Void Function(Pointer<Void>)>('Canvas::restore', isLeaf: true)
-  external void restore();
+  void restore();
 
   /// Restores the save stack to a previous level as might be obtained from [getSaveCount].
   /// If [count] is less than 1, the stack is restored to its initial state.
@@ -4752,8 +5102,7 @@ class Canvas extends NativeFieldWrapperClass1 {
   /// If any of the state stack levels restored by this call were pushed with
   /// [saveLayer], then this call will also cause those layers to be composited
   /// into their previous layers.
-  @FfiNative<Void Function(Pointer<Void>, Int32)>('Canvas::restoreToCount', isLeaf: true)
-  external void restoreToCount(int count);
+  void restoreToCount(int count);
 
   /// Returns the number of items on the save stack, including the
   /// initial state. This means it returns 1 for a clean canvas, and
@@ -4761,13 +5110,11 @@ class Canvas extends NativeFieldWrapperClass1 {
   /// each matching call to [restore] decrements it.
   ///
   /// This number cannot go below 1.
-  @FfiNative<Int32 Function(Pointer<Void>)>('Canvas::getSaveCount', isLeaf: true)
-  external int getSaveCount();
+  int getSaveCount();
 
   /// Add a translation to the current transform, shifting the coordinate space
   /// horizontally by the first argument and vertically by the second argument.
-  @FfiNative<Void Function(Pointer<Void>, Double, Double)>('Canvas::translate', isLeaf: true)
-  external void translate(double dx, double dy);
+  void translate(double dx, double dy);
 
   /// Add an axis-aligned scale to the current transform, scaling by the first
   /// argument in the horizontal direction and the second in the vertical
@@ -4775,34 +5122,20 @@ class Canvas extends NativeFieldWrapperClass1 {
   ///
   /// If [sy] is unspecified, [sx] will be used for the scale in both
   /// directions.
-  void scale(double sx, [double? sy]) => _scale(sx, sy ?? sx);
-
-  @FfiNative<Void Function(Pointer<Void>, Double, Double)>('Canvas::scale', isLeaf: true)
-  external void _scale(double sx, double sy);
+  void scale(double sx, [double? sy]);
 
   /// Add a rotation to the current transform. The argument is in radians clockwise.
-  @FfiNative<Void Function(Pointer<Void>, Double)>('Canvas::rotate', isLeaf: true)
-  external void rotate(double radians);
+  void rotate(double radians);
 
   /// Add an axis-aligned skew to the current transform, with the first argument
   /// being the horizontal skew in rise over run units clockwise around the
   /// origin, and the second argument being the vertical skew in rise over run
   /// units clockwise around the origin.
-  @FfiNative<Void Function(Pointer<Void>, Double, Double)>('Canvas::skew', isLeaf: true)
-  external void skew(double sx, double sy);
+  void skew(double sx, double sy);
 
   /// Multiply the current transform by the specified 4⨉4 transformation matrix
   /// specified as a list of values in column-major order.
-  void transform(Float64List matrix4) {
-    assert(matrix4 != null);
-    if (matrix4.length != 16) {
-      throw ArgumentError('"matrix4" must have 16 entries.');
-    }
-    _transform(matrix4);
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Handle)>('Canvas::transform')
-  external void _transform(Float64List matrix4);
+  void transform(Float64List matrix4);
 
   /// Returns the current transform including the combined result of all transform
   /// methods executed since the creation of this [Canvas] object, and respecting the
@@ -4812,14 +5145,7 @@ class Canvas extends NativeFieldWrapperClass1 {
   /// [rotate], [skew], and [transform]. The [restore] method can also modify
   /// the current transform by restoring it to the same value it had before its
   /// associated [save] or [saveLayer] call.
-  Float64List getTransform() {
-    final Float64List matrix4 = Float64List(16);
-    _getTransform(matrix4);
-    return matrix4;
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Handle)>('Canvas::getTransform')
-  external void _getTransform(Float64List matrix4);
+  Float64List getTransform();
 
   /// Reduces the clip region to the intersection of the current clip and the
   /// given rectangle.
@@ -4834,15 +5160,7 @@ class Canvas extends NativeFieldWrapperClass1 {
   ///
   /// Use [ClipOp.difference] to subtract the provided rectangle from the
   /// current clip.
-  void clipRect(Rect rect, { ClipOp clipOp = ClipOp.intersect, bool doAntiAlias = true }) {
-    assert(_rectIsValid(rect));
-    assert(clipOp != null);
-    assert(doAntiAlias != null);
-    _clipRect(rect.left, rect.top, rect.right, rect.bottom, clipOp.index, doAntiAlias);
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Double, Double, Double, Double, Int32, Bool)>('Canvas::clipRect', isLeaf: true)
-  external void _clipRect(double left, double top, double right, double bottom, int clipOp, bool doAntiAlias);
+  void clipRect(Rect rect, { ClipOp clipOp = ClipOp.intersect, bool doAntiAlias = true });
 
   /// Reduces the clip region to the intersection of the current clip and the
   /// given rounded rectangle.
@@ -4854,14 +5172,7 @@ class Canvas extends NativeFieldWrapperClass1 {
   /// If multiple draw commands intersect with the clip boundary, this can result
   /// in incorrect blending at the clip boundary. See [saveLayer] for a
   /// discussion of how to address that and some examples of using [clipRRect].
-  void clipRRect(RRect rrect, {bool doAntiAlias = true}) {
-    assert(_rrectIsValid(rrect));
-    assert(doAntiAlias != null);
-    _clipRRect(rrect._getValue32(), doAntiAlias);
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Handle, Bool)>('Canvas::clipRRect')
-  external void _clipRRect(Float32List rrect, bool doAntiAlias);
+  void clipRRect(RRect rrect, {bool doAntiAlias = true});
 
   /// Reduces the clip region to the intersection of the current clip and the
   /// given [Path].
@@ -4873,18 +5184,11 @@ class Canvas extends NativeFieldWrapperClass1 {
   /// If multiple draw commands intersect with the clip boundary, this can result
   /// in incorrect blending at the clip boundary. See [saveLayer] for a
   /// discussion of how to address that.
-  void clipPath(Path path, {bool doAntiAlias = true}) {
-    assert(path != null); // path is checked on the engine side
-    assert(doAntiAlias != null);
-    _clipPath(path, doAntiAlias);
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Pointer<Void>, Bool)>('Canvas::clipPath')
-  external void _clipPath(Path path, bool doAntiAlias);
+  void clipPath(Path path, {bool doAntiAlias = true});
 
   /// Returns the conservative bounds of the combined result of all clip methods
   /// executed within the current save stack of this [Canvas] object, as measured
-  /// in the local coordinate space under which rendering operations are curretnly
+  /// in the local coordinate space under which rendering operations are currently
   /// performed.
   ///
   /// The combined clip results are rounded out to an integer pixel boundary before
@@ -4921,7 +5225,7 @@ class Canvas extends NativeFieldWrapperClass1 {
   ///
   /// After executing both of those calls there is no area left in which to draw
   /// because the two paths have no overlapping regions. But, in this case,
-  /// [getClipBounds] would return a rectangle from `10, 10` to `100, 100` because it
+  /// [getLocalClipBounds] would return a rectangle from `10, 10` to `100, 100` because it
   /// only intersects the bounds of the two path objects to obtain its conservative
   /// estimate.
   ///
@@ -4934,14 +5238,7 @@ class Canvas extends NativeFieldWrapperClass1 {
   /// restoring it to the same value it had before its associated [save] or
   /// [saveLayer] call.
   /// {@endtemplate}
-  Rect getLocalClipBounds() {
-    final Float64List bounds = Float64List(4);
-    _getLocalClipBounds(bounds);
-    return Rect.fromLTRB(bounds[0], bounds[1], bounds[2], bounds[3]);
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Handle)>('Canvas::getLocalClipBounds')
-  external void _getLocalClipBounds(Float64List bounds);
+  Rect getLocalClipBounds();
 
   /// Returns the conservative bounds of the combined result of all clip methods
   /// executed within the current save stack of this [Canvas] object, as measured
@@ -4957,26 +5254,12 @@ class Canvas extends NativeFieldWrapperClass1 {
   /// Ratio.
   ///
   /// {@macro dart.ui.canvas.conservativeClipBounds}
-  Rect getDestinationClipBounds() {
-    final Float64List bounds = Float64List(4);
-    _getDestinationClipBounds(bounds);
-    return Rect.fromLTRB(bounds[0], bounds[1], bounds[2], bounds[3]);
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Handle)>('Canvas::getDestinationClipBounds')
-  external void _getDestinationClipBounds(Float64List bounds);
+  Rect getDestinationClipBounds();
 
   /// Paints the given [Color] onto the canvas, applying the given
   /// [BlendMode], with the given color being the source and the background
   /// being the destination.
-  void drawColor(Color color, BlendMode blendMode) {
-    assert(color != null);
-    assert(blendMode != null);
-    _drawColor(color.value, blendMode.index);
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Uint32, Int32)>('Canvas::drawColor', isLeaf: true)
-  external void _drawColor(int color, int blendMode);
+  void drawColor(Color color, BlendMode blendMode);
 
   /// Draws a line between the given points using the given paint. The line is
   /// stroked, the value of the [Paint.style] is ignored for this call.
@@ -4985,70 +5268,34 @@ class Canvas extends NativeFieldWrapperClass1 {
   ///
   /// ![](https://flutter.github.io/assets-for-api-docs/assets/dart-ui/canvas_line.png#gh-light-mode-only)
   /// ![](https://flutter.github.io/assets-for-api-docs/assets/dart-ui/canvas_line_dark.png#gh-dark-mode-only)
-  void drawLine(Offset p1, Offset p2, Paint paint) {
-    assert(_offsetIsValid(p1));
-    assert(_offsetIsValid(p2));
-    assert(paint != null);
-    _drawLine(p1.dx, p1.dy, p2.dx, p2.dy, paint._objects, paint._data);
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Double, Double, Double, Double, Handle, Handle)>('Canvas::drawLine')
-  external void _drawLine(double x1, double y1, double x2, double y2, List<Object?>? paintObjects, ByteData paintData);
+  void drawLine(Offset p1, Offset p2, Paint paint);
 
   /// Fills the canvas with the given [Paint].
   ///
   /// To fill the canvas with a solid color and blend mode, consider
   /// [drawColor] instead.
-  void drawPaint(Paint paint) {
-    assert(paint != null);
-    _drawPaint(paint._objects, paint._data);
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Handle, Handle)>('Canvas::drawPaint')
-  external void _drawPaint(List<Object?>? paintObjects, ByteData paintData);
+  void drawPaint(Paint paint);
 
   /// Draws a rectangle with the given [Paint]. Whether the rectangle is filled
   /// or stroked (or both) is controlled by [Paint.style].
   ///
   /// ![](https://flutter.github.io/assets-for-api-docs/assets/dart-ui/canvas_rect.png#gh-light-mode-only)
   /// ![](https://flutter.github.io/assets-for-api-docs/assets/dart-ui/canvas_rect_dark.png#gh-dark-mode-only)
-  void drawRect(Rect rect, Paint paint) {
-    assert(_rectIsValid(rect));
-    assert(paint != null);
-    _drawRect(rect.left, rect.top, rect.right, rect.bottom, paint._objects, paint._data);
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Double, Double, Double, Double, Handle, Handle)>('Canvas::drawRect')
-  external void _drawRect(double left, double top, double right, double bottom, List<Object?>? paintObjects, ByteData paintData);
+  void drawRect(Rect rect, Paint paint);
 
   /// Draws a rounded rectangle with the given [Paint]. Whether the rectangle is
   /// filled or stroked (or both) is controlled by [Paint.style].
   ///
   /// ![](https://flutter.github.io/assets-for-api-docs/assets/dart-ui/canvas_rrect.png#gh-light-mode-only)
   /// ![](https://flutter.github.io/assets-for-api-docs/assets/dart-ui/canvas_rrect_dark.png#gh-dark-mode-only)
-  void drawRRect(RRect rrect, Paint paint) {
-    assert(_rrectIsValid(rrect));
-    assert(paint != null);
-    _drawRRect(rrect._getValue32(), paint._objects, paint._data);
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Handle, Handle, Handle)>('Canvas::drawRRect')
-  external void _drawRRect(Float32List rrect, List<Object?>? paintObjects, ByteData paintData);
+  void drawRRect(RRect rrect, Paint paint);
 
   /// Draws a shape consisting of the difference between two rounded rectangles
   /// with the given [Paint]. Whether this shape is filled or stroked (or both)
   /// is controlled by [Paint.style].
   ///
   /// This shape is almost but not quite entirely unlike an annulus.
-  void drawDRRect(RRect outer, RRect inner, Paint paint) {
-    assert(_rrectIsValid(outer));
-    assert(_rrectIsValid(inner));
-    assert(paint != null);
-    _drawDRRect(outer._getValue32(), inner._getValue32(), paint._objects, paint._data);
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Handle, Handle, Handle, Handle)>('Canvas::drawDRRect')
-  external void _drawDRRect(Float32List outer, Float32List inner, List<Object?>? paintObjects, ByteData paintData);
+  void drawDRRect(RRect outer, RRect inner, Paint paint);
 
   /// Draws an axis-aligned oval that fills the given axis-aligned rectangle
   /// with the given [Paint]. Whether the oval is filled or stroked (or both) is
@@ -5056,14 +5303,7 @@ class Canvas extends NativeFieldWrapperClass1 {
   ///
   /// ![](https://flutter.github.io/assets-for-api-docs/assets/dart-ui/canvas_oval.png#gh-light-mode-only)
   /// ![](https://flutter.github.io/assets-for-api-docs/assets/dart-ui/canvas_oval_dark.png#gh-dark-mode-only)
-  void drawOval(Rect rect, Paint paint) {
-    assert(_rectIsValid(rect));
-    assert(paint != null);
-    _drawOval(rect.left, rect.top, rect.right, rect.bottom, paint._objects, paint._data);
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Double, Double, Double, Double, Handle, Handle)>('Canvas::drawOval')
-  external void _drawOval(double left, double top, double right, double bottom, List<Object?>? paintObjects, ByteData paintData);
+  void drawOval(Rect rect, Paint paint);
 
   /// Draws a circle centered at the point given by the first argument and
   /// that has the radius given by the second argument, with the [Paint] given in
@@ -5072,14 +5312,7 @@ class Canvas extends NativeFieldWrapperClass1 {
   ///
   /// ![](https://flutter.github.io/assets-for-api-docs/assets/dart-ui/canvas_circle.png#gh-light-mode-only)
   /// ![](https://flutter.github.io/assets-for-api-docs/assets/dart-ui/canvas_circle_dark.png#gh-dark-mode-only)
-  void drawCircle(Offset c, double radius, Paint paint) {
-    assert(_offsetIsValid(c));
-    assert(paint != null);
-    _drawCircle(c.dx, c.dy, radius, paint._objects, paint._data);
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Double, Double, Double, Handle, Handle)>('Canvas::drawCircle')
-  external void _drawCircle(double x, double y, double radius, List<Object?>? paintObjects, ByteData paintData);
+  void drawCircle(Offset c, double radius, Paint paint);
 
   /// Draw an arc scaled to fit inside the given rectangle.
   ///
@@ -5095,53 +5328,18 @@ class Canvas extends NativeFieldWrapperClass1 {
   /// ![](https://flutter.github.io/assets-for-api-docs/assets/dart-ui/canvas_draw_arc_dark.png#gh-dark-mode-only)
   ///
   /// This method is optimized for drawing arcs and should be faster than [Path.arcTo].
-  void drawArc(Rect rect, double startAngle, double sweepAngle, bool useCenter, Paint paint) {
-    assert(_rectIsValid(rect));
-    assert(paint != null);
-    _drawArc(rect.left, rect.top, rect.right, rect.bottom, startAngle, sweepAngle, useCenter, paint._objects, paint._data);
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Double, Double, Double, Double, Double, Double, Bool, Handle, Handle)>('Canvas::drawArc')
-  external void _drawArc(
-      double left,
-      double top,
-      double right,
-      double bottom,
-      double startAngle,
-      double sweepAngle,
-      bool useCenter,
-      List<Object?>? paintObjects,
-      ByteData paintData);
+  void drawArc(Rect rect, double startAngle, double sweepAngle, bool useCenter, Paint paint);
 
   /// Draws the given [Path] with the given [Paint].
   ///
   /// Whether this shape is filled or stroked (or both) is controlled by
   /// [Paint.style]. If the path is filled, then sub-paths within it are
   /// implicitly closed (see [Path.close]).
-  void drawPath(Path path, Paint paint) {
-    assert(path != null); // path is checked on the engine side
-    assert(paint != null);
-    _drawPath(path, paint._objects, paint._data);
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Pointer<Void>, Handle, Handle)>('Canvas::drawPath')
-  external void _drawPath(Path path, List<Object?>? paintObjects, ByteData paintData);
+  void drawPath(Path path, Paint paint);
 
   /// Draws the given [Image] into the canvas with its top-left corner at the
   /// given [Offset]. The image is composited into the canvas using the given [Paint].
-  void drawImage(Image image, Offset offset, Paint paint) {
-    assert(image != null); // image is checked on the engine side
-    assert(!image.debugDisposed);
-    assert(_offsetIsValid(offset));
-    assert(paint != null);
-    final String? error = _drawImage(image._image, offset.dx, offset.dy, paint._objects, paint._data, paint.filterQuality.index);
-    if (error != null) {
-      throw PictureRasterizationException._(error, stack: image._debugStack);
-    }
-  }
-
-  @FfiNative<Handle Function(Pointer<Void>, Pointer<Void>, Double, Double, Handle, Handle, Int32)>('Canvas::drawImage')
-  external String? _drawImage(_Image image, double x, double y, List<Object?>? paintObjects, ByteData paintData, int filterQualityIndex);
+  void drawImage(Image image, Offset offset, Paint paint);
 
   /// Draws the subset of the given image described by the `src` argument into
   /// the canvas in the axis-aligned rectangle given by the `dst` argument.
@@ -5152,43 +5350,7 @@ class Canvas extends NativeFieldWrapperClass1 {
   /// Multiple calls to this method with different arguments (from the same
   /// image) can be batched into a single call to [drawAtlas] to improve
   /// performance.
-  void drawImageRect(Image image, Rect src, Rect dst, Paint paint) {
-    assert(image != null); // image is checked on the engine side
-    assert(!image.debugDisposed);
-    assert(_rectIsValid(src));
-    assert(_rectIsValid(dst));
-    assert(paint != null);
-    final String? error = _drawImageRect(image._image,
-                                         src.left,
-                                         src.top,
-                                         src.right,
-                                         src.bottom,
-                                         dst.left,
-                                         dst.top,
-                                         dst.right,
-                                         dst.bottom,
-                                         paint._objects,
-                                         paint._data,
-                                         paint.filterQuality.index);
-    if (error != null) {
-      throw PictureRasterizationException._(error, stack: image._debugStack);
-    }
-  }
-
-  @FfiNative<Handle Function(Pointer<Void>, Pointer<Void>, Double, Double, Double, Double, Double, Double, Double, Double, Handle, Handle, Int32)>('Canvas::drawImageRect')
-  external String? _drawImageRect(
-      _Image image,
-      double srcLeft,
-      double srcTop,
-      double srcRight,
-      double srcBottom,
-      double dstLeft,
-      double dstTop,
-      double dstRight,
-      double dstBottom,
-      List<Object?>? paintObjects,
-      ByteData paintData,
-      int filterQualityIndex);
+  void drawImageRect(Image image, Rect src, Rect dst, Paint paint);
 
   /// Draws the given [Image] into the canvas using the given [Paint].
   ///
@@ -5203,54 +5365,11 @@ class Canvas extends NativeFieldWrapperClass1 {
   /// five regions are drawn by stretching them to fit such that they exactly
   /// cover the destination rectangle while maintaining their relative
   /// positions.
-  void drawImageNine(Image image, Rect center, Rect dst, Paint paint) {
-    assert(image != null); // image is checked on the engine side
-    assert(!image.debugDisposed);
-    assert(_rectIsValid(center));
-    assert(_rectIsValid(dst));
-    assert(paint != null);
-    final String? error = _drawImageNine(image._image,
-                                         center.left,
-                                         center.top,
-                                         center.right,
-                                         center.bottom,
-                                         dst.left,
-                                         dst.top,
-                                         dst.right,
-                                         dst.bottom,
-                                         paint._objects,
-                                         paint._data,
-                                         paint.filterQuality.index);
-    if (error != null) {
-      throw PictureRasterizationException._(error, stack: image._debugStack);
-    }
-  }
-
-  @FfiNative<Handle Function(Pointer<Void>, Pointer<Void>, Double, Double, Double, Double, Double, Double, Double, Double, Handle, Handle, Int32)>('Canvas::drawImageNine')
-  external String? _drawImageNine(
-      _Image image,
-      double centerLeft,
-      double centerTop,
-      double centerRight,
-      double centerBottom,
-      double dstLeft,
-      double dstTop,
-      double dstRight,
-      double dstBottom,
-      List<Object?>? paintObjects,
-      ByteData paintData,
-      int filterQualityIndex);
+  void drawImageNine(Image image, Rect center, Rect dst, Paint paint);
 
   /// Draw the given picture onto the canvas. To create a picture, see
   /// [PictureRecorder].
-  void drawPicture(Picture picture) {
-    assert(picture != null); // picture is checked on the engine side
-    assert(!picture.debugDisposed);
-    _drawPicture(picture);
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Pointer<Void>)>('Canvas::drawPicture')
-  external void _drawPicture(Picture picture);
+  void drawPicture(Picture picture);
 
   /// Draws the text in the given [Paragraph] into this canvas at the given
   /// [Offset].
@@ -5272,63 +5391,55 @@ class Canvas extends NativeFieldWrapperClass1 {
   /// If the text is centered, the centering axis will be at the position
   /// described by adding half of the [ParagraphConstraints.width] given to
   /// [Paragraph.layout], to the `offset` argument's [Offset.dx] coordinate.
-  void drawParagraph(Paragraph paragraph, Offset offset) {
-    assert(paragraph != null);
-    assert(!paragraph.debugDisposed);
-    assert(_offsetIsValid(offset));
-    assert(!paragraph._needsLayout);
-    paragraph._paint(this, offset.dx, offset.dy);
-  }
+  void drawParagraph(Paragraph paragraph, Offset offset);
 
   /// Draws a sequence of points according to the given [PointMode].
   ///
   /// The `points` argument is interpreted as offsets from the origin.
   ///
+  /// The `paint` is used for each point ([PointMode.points]) or line
+  /// ([PointMode.lines] or [PointMode.polygon]), ignoring [Paint.style].
+  ///
   /// See also:
   ///
   ///  * [drawRawPoints], which takes `points` as a [Float32List] rather than a
   ///    [List<Offset>].
-  void drawPoints(PointMode pointMode, List<Offset> points, Paint paint) {
-    assert(pointMode != null);
-    assert(points != null);
-    assert(paint != null);
-    _drawPoints(paint._objects, paint._data, pointMode.index, _encodePointList(points));
-  }
+  void drawPoints(PointMode pointMode, List<Offset> points, Paint paint);
 
   /// Draws a sequence of points according to the given [PointMode].
   ///
   /// The `points` argument is interpreted as a list of pairs of floating point
   /// numbers, where each pair represents an x and y offset from the origin.
   ///
+  /// The `paint` is used for each point ([PointMode.points]) or line
+  /// ([PointMode.lines] or [PointMode.polygon]), ignoring [Paint.style].
+  ///
   /// See also:
   ///
   ///  * [drawPoints], which takes `points` as a [List<Offset>] rather than a
   ///    [List<Float32List>].
-  void drawRawPoints(PointMode pointMode, Float32List points, Paint paint) {
-    assert(pointMode != null);
-    assert(points != null);
-    assert(paint != null);
-    if (points.length % 2 != 0) {
-      throw ArgumentError('"points" must have an even number of values.');
-    }
-    _drawPoints(paint._objects, paint._data, pointMode.index, points);
-  }
+  void drawRawPoints(PointMode pointMode, Float32List points, Paint paint);
 
-  @FfiNative<Void Function(Pointer<Void>, Handle, Handle, Int32, Handle)>('Canvas::drawPoints')
-  external void _drawPoints(List<Object?>? paintObjects, ByteData paintData, int pointMode, Float32List points);
-
-  /// Draws the set of [Vertices] onto the canvas.
+  /// Draws a set of [Vertices] onto the canvas as one or more triangles.
+  ///
+  /// The [Paint.color] property specifies the default color to use for the
+  /// triangles.
   ///
-  /// The [blendMode] parameter is used to control how the colors in
-  /// the [vertices] are combined with the colors in the [paint].
-  /// If there are no colors specified in [vertices] then the [blendMode] has
-  /// no effect. If there are colors in the [vertices],
-  /// then the color taken from the [Shader] or [Color] in the [paint] is
-  /// blended with the colors specified in the [vertices] using
-  /// the [blendMode] parameter.
-  /// For purposes of this blending,
-  /// the colors from the [paint] are considered the source and the colors from
-  /// the [vertices] are considered the destination.
+  /// The [Paint.shader] property, if set, overrides the color entirely,
+  /// replacing it with the colors from the specified [ImageShader], [Gradient],
+  /// or other shader.
+  ///
+  /// The `blendMode` parameter is used to control how the colors in the
+  /// `vertices` are combined with the colors in the `paint`. If there are no
+  /// colors specified in `vertices` then the `blendMode` has no effect. If
+  /// there are colors in the `vertices`, then the color taken from the
+  /// [Paint.shader] or [Paint.color] in the `paint` is blended with the colors
+  /// specified in the `vertices` using the `blendMode` parameter. For the
+  /// purposes of this blending, the colors from the `paint` parameter are
+  /// considered the source, and the colors from the `vertices` are considered
+  /// the destination. [BlendMode.dst] ignores the `paint` and uses only the
+  /// colors of the `vertices`; [BlendMode.src] ignores the colors of the
+  /// `vertices` and uses only the colors in the `paint`.
   ///
   /// All parameters must not be null.
   ///
@@ -5337,16 +5448,7 @@ class Canvas extends NativeFieldWrapperClass1 {
   ///   * [Vertices.raw], which creates the vertices using typed data lists
   ///     rather than unencoded lists.
   ///   * [paint], Image shaders can be used to draw images on a triangular mesh.
-  void drawVertices(Vertices vertices, BlendMode blendMode, Paint paint) {
-    assert(vertices != null); // vertices is checked on the engine side
-    assert(!vertices.debugDisposed);
-    assert(paint != null);
-    assert(blendMode != null);
-    _drawVertices(vertices, blendMode.index, paint._objects, paint._data);
-  }
-
-  @FfiNative<Void Function(Pointer<Void>, Pointer<Void>, Int32, Handle, Handle)>('Canvas::drawVertices')
-  external void _drawVertices(Vertices vertices, int blendMode, List<Object?>? paintObjects, ByteData paintData);
+  void drawVertices(Vertices vertices, BlendMode blendMode, Paint paint);
 
   /// Draws many parts of an image - the [atlas] - onto the canvas.
   ///
@@ -5404,7 +5506,7 @@ class Canvas extends NativeFieldWrapperClass1 {
   ///   void paint(Canvas canvas, Size size) {
   ///     Paint paint = Paint();
   ///     canvas.drawAtlas(spriteAtlas, <RSTransform>[
-  ///       for (Sprite sprite in allSprites)
+  ///       for (final Sprite sprite in allSprites)
   ///         RSTransform.fromComponents(
   ///           rotation: 0.0,
   ///           scale: 1.0,
@@ -5416,7 +5518,7 @@ class Canvas extends NativeFieldWrapperClass1 {
   ///           translateY: sprite.center.dy,
   ///         ),
   ///     ], <Rect>[
-  ///       for (Sprite sprite in allSprites)
+  ///       for (final Sprite sprite in allSprites)
   ///         Rect.fromLTWH(sprite.index * 10.0, 0.0, 10.0, 10.0),
   ///     ], null, null, null, paint);
   ///   }
@@ -5447,7 +5549,7 @@ class Canvas extends NativeFieldWrapperClass1 {
   ///   void paint(Canvas canvas, Size size) {
   ///     Paint paint = Paint();
   ///     canvas.drawAtlas(spriteAtlas, <RSTransform>[
-  ///       for (Sprite sprite in allSprites)
+  ///       for (final Sprite sprite in allSprites)
   ///         RSTransform.fromComponents(
   ///           rotation: sprite.rotation,
   ///           scale: 1.0,
@@ -5459,10 +5561,10 @@ class Canvas extends NativeFieldWrapperClass1 {
   ///           translateY: sprite.center.dy,
   ///         ),
   ///     ], <Rect>[
-  ///       for (Sprite sprite in allSprites)
+  ///       for (final Sprite sprite in allSprites)
   ///         Rect.fromLTWH(sprite.index * 10.0, 0.0, 10.0, 10.0),
   ///     ], <Color>[
-  ///       for (Sprite sprite in allSprites)
+  ///       for (final Sprite sprite in allSprites)
   ///         Colors.white.withAlpha(sprite.alpha),
   ///     ], BlendMode.srcIn, null, paint);
   ///   }
@@ -5485,56 +5587,7 @@ class Canvas extends NativeFieldWrapperClass1 {
                  List<Color>? colors,
                  BlendMode? blendMode,
                  Rect? cullRect,
-                 Paint paint) {
-    assert(atlas != null); // atlas is checked on the engine side
-    assert(!atlas.debugDisposed);
-    assert(transforms != null);
-    assert(rects != null);
-    assert(colors == null || colors.isEmpty || blendMode != null);
-    assert(paint != null);
-
-    final int rectCount = rects.length;
-    if (transforms.length != rectCount) {
-      throw ArgumentError('"transforms" and "rects" lengths must match.');
-    }
-    if (colors != null && colors.isNotEmpty && colors.length != rectCount) {
-      throw ArgumentError('If non-null, "colors" length must match that of "transforms" and "rects".');
-    }
-
-    final Float32List rstTransformBuffer = Float32List(rectCount * 4);
-    final Float32List rectBuffer = Float32List(rectCount * 4);
-
-    for (int i = 0; i < rectCount; ++i) {
-      final int index0 = i * 4;
-      final int index1 = index0 + 1;
-      final int index2 = index0 + 2;
-      final int index3 = index0 + 3;
-      final RSTransform rstTransform = transforms[i];
-      final Rect rect = rects[i];
-      assert(_rectIsValid(rect));
-      rstTransformBuffer[index0] = rstTransform.scos;
-      rstTransformBuffer[index1] = rstTransform.ssin;
-      rstTransformBuffer[index2] = rstTransform.tx;
-      rstTransformBuffer[index3] = rstTransform.ty;
-      rectBuffer[index0] = rect.left;
-      rectBuffer[index1] = rect.top;
-      rectBuffer[index2] = rect.right;
-      rectBuffer[index3] = rect.bottom;
-    }
-
-    final Int32List? colorBuffer = (colors == null || colors.isEmpty) ? null : _encodeColorList(colors);
-    final Float32List? cullRectBuffer = cullRect?._getValue32();
-    final int qualityIndex = paint.filterQuality.index;
-
-    final String? error = _drawAtlas(
-      paint._objects, paint._data, qualityIndex, atlas._image, rstTransformBuffer, rectBuffer,
-      colorBuffer, (blendMode ?? BlendMode.src).index, cullRectBuffer
-    );
-
-    if (error != null) {
-      throw PictureRasterizationException._(error, stack: atlas._debugStack);
-    }
-  }
+                 Paint paint);
 
   /// Draws many parts of an image - the [atlas] - onto the canvas.
   ///
@@ -5683,6 +5736,464 @@ class Canvas extends NativeFieldWrapperClass1 {
   ///
   ///  * [drawAtlas], which takes its arguments as objects rather than typed
   ///    data lists.
+  void drawRawAtlas(Image atlas,
+                    Float32List rstTransforms,
+                    Float32List rects,
+                    Int32List? colors,
+                    BlendMode? blendMode,
+                    Rect? cullRect,
+                    Paint paint);
+
+  /// Draws a shadow for a [Path] representing the given material elevation.
+  ///
+  /// The `transparentOccluder` argument should be true if the occluding object
+  /// is not opaque.
+  ///
+  /// The arguments must not be null.
+  void drawShadow(Path path, Color color, double elevation, bool transparentOccluder);
+}
+
+base class _NativeCanvas extends NativeFieldWrapperClass1 implements Canvas {
+  _NativeCanvas(PictureRecorder recorder, [ Rect? cullRect ])  {
+    if (recorder.isRecording) {
+      throw ArgumentError('"recorder" must not already be associated with another Canvas.');
+    }
+    _recorder = recorder as _NativePictureRecorder;
+    _recorder!._canvas = this;
+    cullRect ??= Rect.largest;
+    _constructor(_recorder!, cullRect.left, cullRect.top, cullRect.right, cullRect.bottom);
+  }
+
+  @Native<Void Function(Handle, Pointer<Void>, Double, Double, Double, Double)>(symbol: 'Canvas::Create')
+  external void _constructor(_NativePictureRecorder recorder, double left, double top, double right, double bottom);
+
+  // The underlying DlCanvas is owned by the DisplayListBuilder used to create this Canvas.
+  // The Canvas holds a reference to the PictureRecorder to prevent the recorder from being
+  // garbage collected until PictureRecorder.endRecording is called.
+  _NativePictureRecorder? _recorder;
+
+  @override
+  @Native<Void Function(Pointer<Void>)>(symbol: 'Canvas::save', isLeaf: true)
+  external void save();
+
+  static Rect _sorted(Rect rect) {
+    if (rect.isEmpty) {
+      rect = Rect.fromLTRB(
+        math.min(rect.left, rect.right),
+        math.min(rect.top, rect.bottom),
+        math.max(rect.left, rect.right),
+        math.max(rect.top, rect.bottom),
+      );
+    }
+    return rect;
+  }
+
+  @override
+  void saveLayer(Rect? bounds, Paint paint) {
+    if (bounds == null) {
+      _saveLayerWithoutBounds(paint._objects, paint._data);
+    } else {
+      assert(_rectIsValid(bounds));
+      _saveLayer(bounds.left, bounds.top, bounds.right, bounds.bottom, paint._objects, paint._data);
+    }
+  }
+
+  @Native<Void Function(Pointer<Void>, Handle, Handle)>(symbol: 'Canvas::saveLayerWithoutBounds')
+  external void _saveLayerWithoutBounds(List<Object?>? paintObjects, ByteData paintData);
+
+  @Native<Void Function(Pointer<Void>, Double, Double, Double, Double, Handle, Handle)>(symbol: 'Canvas::saveLayer')
+  external void _saveLayer(double left, double top, double right, double bottom, List<Object?>? paintObjects, ByteData paintData);
+
+  @override
+  @Native<Void Function(Pointer<Void>)>(symbol: 'Canvas::restore', isLeaf: true)
+  external void restore();
+
+  @override
+  @Native<Void Function(Pointer<Void>, Int32)>(symbol: 'Canvas::restoreToCount', isLeaf: true)
+  external void restoreToCount(int count);
+
+  @override
+  @Native<Int32 Function(Pointer<Void>)>(symbol: 'Canvas::getSaveCount', isLeaf: true)
+  external int getSaveCount();
+
+  @override
+  @Native<Void Function(Pointer<Void>, Double, Double)>(symbol: 'Canvas::translate', isLeaf: true)
+  external void translate(double dx, double dy);
+
+  @override
+  void scale(double sx, [double? sy]) => _scale(sx, sy ?? sx);
+
+  @Native<Void Function(Pointer<Void>, Double, Double)>(symbol: 'Canvas::scale', isLeaf: true)
+  external void _scale(double sx, double sy);
+
+  @override
+  @Native<Void Function(Pointer<Void>, Double)>(symbol: 'Canvas::rotate', isLeaf: true)
+  external void rotate(double radians);
+
+  @override
+  @Native<Void Function(Pointer<Void>, Double, Double)>(symbol: 'Canvas::skew', isLeaf: true)
+  external void skew(double sx, double sy);
+
+  @override
+  void transform(Float64List matrix4) {
+    if (matrix4.length != 16) {
+      throw ArgumentError('"matrix4" must have 16 entries.');
+    }
+    _transform(matrix4);
+  }
+
+  @Native<Void Function(Pointer<Void>, Handle)>(symbol: 'Canvas::transform')
+  external void _transform(Float64List matrix4);
+
+  @override
+  Float64List getTransform() {
+    final Float64List matrix4 = Float64List(16);
+    _getTransform(matrix4);
+    return matrix4;
+  }
+
+  @Native<Void Function(Pointer<Void>, Handle)>(symbol: 'Canvas::getTransform')
+  external void _getTransform(Float64List matrix4);
+
+  @override
+  void clipRect(Rect rect, { ClipOp clipOp = ClipOp.intersect, bool doAntiAlias = true }) {
+    assert(_rectIsValid(rect));
+    rect = _sorted(rect);
+    // Even if rect is still empty - which implies it has a zero dimension -
+    // we still need to perform the clipRect operation as it will effectively
+    // nullify any further rendering until the next restore call.
+    _clipRect(rect.left, rect.top, rect.right, rect.bottom, clipOp.index, doAntiAlias);
+  }
+
+  @Native<Void Function(Pointer<Void>, Double, Double, Double, Double, Int32, Bool)>(symbol: 'Canvas::clipRect', isLeaf: true)
+  external void _clipRect(double left, double top, double right, double bottom, int clipOp, bool doAntiAlias);
+
+  @override
+  void clipRRect(RRect rrect, {bool doAntiAlias = true}) {
+    assert(_rrectIsValid(rrect));
+    _clipRRect(rrect._getValue32(), doAntiAlias);
+  }
+
+  @Native<Void Function(Pointer<Void>, Handle, Bool)>(symbol: 'Canvas::clipRRect')
+  external void _clipRRect(Float32List rrect, bool doAntiAlias);
+
+  @override
+  void clipPath(Path path, {bool doAntiAlias = true}) {
+    _clipPath(path as _NativePath, doAntiAlias);
+  }
+
+  @Native<Void Function(Pointer<Void>, Pointer<Void>, Bool)>(symbol: 'Canvas::clipPath')
+  external void _clipPath(_NativePath path, bool doAntiAlias);
+
+  @override
+  Rect getLocalClipBounds() {
+    final Float64List bounds = Float64List(4);
+    _getLocalClipBounds(bounds);
+    return Rect.fromLTRB(bounds[0], bounds[1], bounds[2], bounds[3]);
+  }
+
+  @Native<Void Function(Pointer<Void>, Handle)>(symbol: 'Canvas::getLocalClipBounds')
+  external void _getLocalClipBounds(Float64List bounds);
+
+  @override
+  Rect getDestinationClipBounds() {
+    final Float64List bounds = Float64List(4);
+    _getDestinationClipBounds(bounds);
+    return Rect.fromLTRB(bounds[0], bounds[1], bounds[2], bounds[3]);
+  }
+
+  @Native<Void Function(Pointer<Void>, Handle)>(symbol: 'Canvas::getDestinationClipBounds')
+  external void _getDestinationClipBounds(Float64List bounds);
+
+  @override
+  void drawColor(Color color, BlendMode blendMode) {
+    _drawColor(color.value, blendMode.index);
+  }
+
+  @Native<Void Function(Pointer<Void>, Uint32, Int32)>(symbol: 'Canvas::drawColor', isLeaf: true)
+  external void _drawColor(int color, int blendMode);
+
+  @override
+  void drawLine(Offset p1, Offset p2, Paint paint) {
+    assert(_offsetIsValid(p1));
+    assert(_offsetIsValid(p2));
+    _drawLine(p1.dx, p1.dy, p2.dx, p2.dy, paint._objects, paint._data);
+  }
+
+  @Native<Void Function(Pointer<Void>, Double, Double, Double, Double, Handle, Handle)>(symbol: 'Canvas::drawLine')
+  external void _drawLine(double x1, double y1, double x2, double y2, List<Object?>? paintObjects, ByteData paintData);
+
+  @override
+  void drawPaint(Paint paint) {
+    _drawPaint(paint._objects, paint._data);
+  }
+
+  @Native<Void Function(Pointer<Void>, Handle, Handle)>(symbol: 'Canvas::drawPaint')
+  external void _drawPaint(List<Object?>? paintObjects, ByteData paintData);
+
+  @override
+  void drawRect(Rect rect, Paint paint) {
+    assert(_rectIsValid(rect));
+    rect = _sorted(rect);
+    if (paint.style != PaintingStyle.fill || !rect.isEmpty) {
+      _drawRect(rect.left, rect.top, rect.right, rect.bottom, paint._objects, paint._data);
+    }
+  }
+
+  @Native<Void Function(Pointer<Void>, Double, Double, Double, Double, Handle, Handle)>(symbol: 'Canvas::drawRect')
+  external void _drawRect(double left, double top, double right, double bottom, List<Object?>? paintObjects, ByteData paintData);
+
+  @override
+  void drawRRect(RRect rrect, Paint paint) {
+    assert(_rrectIsValid(rrect));
+    _drawRRect(rrect._getValue32(), paint._objects, paint._data);
+  }
+
+  @Native<Void Function(Pointer<Void>, Handle, Handle, Handle)>(symbol: 'Canvas::drawRRect')
+  external void _drawRRect(Float32List rrect, List<Object?>? paintObjects, ByteData paintData);
+
+  @override
+  void drawDRRect(RRect outer, RRect inner, Paint paint) {
+    assert(_rrectIsValid(outer));
+    assert(_rrectIsValid(inner));
+    _drawDRRect(outer._getValue32(), inner._getValue32(), paint._objects, paint._data);
+  }
+
+  @Native<Void Function(Pointer<Void>, Handle, Handle, Handle, Handle)>(symbol: 'Canvas::drawDRRect')
+  external void _drawDRRect(Float32List outer, Float32List inner, List<Object?>? paintObjects, ByteData paintData);
+
+  @override
+  void drawOval(Rect rect, Paint paint) {
+    assert(_rectIsValid(rect));
+    rect = _sorted(rect);
+    if (paint.style != PaintingStyle.fill || !rect.isEmpty) {
+      _drawOval(rect.left, rect.top, rect.right, rect.bottom, paint._objects, paint._data);
+    }
+  }
+
+  @Native<Void Function(Pointer<Void>, Double, Double, Double, Double, Handle, Handle)>(symbol: 'Canvas::drawOval')
+  external void _drawOval(double left, double top, double right, double bottom, List<Object?>? paintObjects, ByteData paintData);
+
+  @override
+  void drawCircle(Offset c, double radius, Paint paint) {
+    assert(_offsetIsValid(c));
+    _drawCircle(c.dx, c.dy, radius, paint._objects, paint._data);
+  }
+
+  @Native<Void Function(Pointer<Void>, Double, Double, Double, Handle, Handle)>(symbol: 'Canvas::drawCircle')
+  external void _drawCircle(double x, double y, double radius, List<Object?>? paintObjects, ByteData paintData);
+
+  @override
+  void drawArc(Rect rect, double startAngle, double sweepAngle, bool useCenter, Paint paint) {
+    assert(_rectIsValid(rect));
+    _drawArc(rect.left, rect.top, rect.right, rect.bottom, startAngle, sweepAngle, useCenter, paint._objects, paint._data);
+  }
+
+  @Native<Void Function(Pointer<Void>, Double, Double, Double, Double, Double, Double, Bool, Handle, Handle)>(symbol: 'Canvas::drawArc')
+  external void _drawArc(
+      double left,
+      double top,
+      double right,
+      double bottom,
+      double startAngle,
+      double sweepAngle,
+      bool useCenter,
+      List<Object?>? paintObjects,
+      ByteData paintData);
+
+  @override
+  void drawPath(Path path, Paint paint) {
+    _drawPath(path as _NativePath, paint._objects, paint._data);
+  }
+
+  @Native<Void Function(Pointer<Void>, Pointer<Void>, Handle, Handle)>(symbol: 'Canvas::drawPath')
+  external void _drawPath(_NativePath path, List<Object?>? paintObjects, ByteData paintData);
+
+  @override
+  void drawImage(Image image, Offset offset, Paint paint) {
+    assert(!image.debugDisposed);
+    assert(_offsetIsValid(offset));
+    final String? error = _drawImage(image._image, offset.dx, offset.dy, paint._objects, paint._data, paint.filterQuality.index);
+    if (error != null) {
+      throw PictureRasterizationException._(error, stack: image._debugStack);
+    }
+  }
+
+  @Native<Handle Function(Pointer<Void>, Pointer<Void>, Double, Double, Handle, Handle, Int32)>(symbol: 'Canvas::drawImage')
+  external String? _drawImage(_Image image, double x, double y, List<Object?>? paintObjects, ByteData paintData, int filterQualityIndex);
+
+  @override
+  void drawImageRect(Image image, Rect src, Rect dst, Paint paint) {
+    assert(!image.debugDisposed);
+    assert(_rectIsValid(src));
+    assert(_rectIsValid(dst));
+    final String? error = _drawImageRect(image._image,
+                                         src.left,
+                                         src.top,
+                                         src.right,
+                                         src.bottom,
+                                         dst.left,
+                                         dst.top,
+                                         dst.right,
+                                         dst.bottom,
+                                         paint._objects,
+                                         paint._data,
+                                         paint.filterQuality.index);
+    if (error != null) {
+      throw PictureRasterizationException._(error, stack: image._debugStack);
+    }
+  }
+
+  @Native<Handle Function(Pointer<Void>, Pointer<Void>, Double, Double, Double, Double, Double, Double, Double, Double, Handle, Handle, Int32)>(symbol: 'Canvas::drawImageRect')
+  external String? _drawImageRect(
+      _Image image,
+      double srcLeft,
+      double srcTop,
+      double srcRight,
+      double srcBottom,
+      double dstLeft,
+      double dstTop,
+      double dstRight,
+      double dstBottom,
+      List<Object?>? paintObjects,
+      ByteData paintData,
+      int filterQualityIndex);
+
+  @override
+  void drawImageNine(Image image, Rect center, Rect dst, Paint paint) {
+    assert(!image.debugDisposed);
+    assert(_rectIsValid(center));
+    assert(_rectIsValid(dst));
+    final String? error = _drawImageNine(image._image,
+                                         center.left,
+                                         center.top,
+                                         center.right,
+                                         center.bottom,
+                                         dst.left,
+                                         dst.top,
+                                         dst.right,
+                                         dst.bottom,
+                                         paint._objects,
+                                         paint._data,
+                                         paint.filterQuality.index);
+    if (error != null) {
+      throw PictureRasterizationException._(error, stack: image._debugStack);
+    }
+  }
+
+  @Native<Handle Function(Pointer<Void>, Pointer<Void>, Double, Double, Double, Double, Double, Double, Double, Double, Handle, Handle, Int32)>(symbol: 'Canvas::drawImageNine')
+  external String? _drawImageNine(
+      _Image image,
+      double centerLeft,
+      double centerTop,
+      double centerRight,
+      double centerBottom,
+      double dstLeft,
+      double dstTop,
+      double dstRight,
+      double dstBottom,
+      List<Object?>? paintObjects,
+      ByteData paintData,
+      int filterQualityIndex);
+
+  @override
+  void drawPicture(Picture picture) {
+    assert(!picture.debugDisposed);
+    _drawPicture(picture as _NativePicture);
+  }
+
+  @Native<Void Function(Pointer<Void>, Pointer<Void>)>(symbol: 'Canvas::drawPicture')
+  external void _drawPicture(_NativePicture picture);
+
+  @override
+  void drawParagraph(Paragraph paragraph, Offset offset) {
+    final _NativeParagraph nativeParagraph = paragraph as _NativeParagraph;
+    assert(!nativeParagraph.debugDisposed);
+    assert(_offsetIsValid(offset));
+    assert(!nativeParagraph._needsLayout);
+    nativeParagraph._paint(this, offset.dx, offset.dy);
+  }
+
+  @override
+  void drawPoints(PointMode pointMode, List<Offset> points, Paint paint) {
+    _drawPoints(paint._objects, paint._data, pointMode.index, _encodePointList(points));
+  }
+
+  @override
+  void drawRawPoints(PointMode pointMode, Float32List points, Paint paint) {
+    if (points.length % 2 != 0) {
+      throw ArgumentError('"points" must have an even number of values.');
+    }
+    _drawPoints(paint._objects, paint._data, pointMode.index, points);
+  }
+
+  @Native<Void Function(Pointer<Void>, Handle, Handle, Int32, Handle)>(symbol: 'Canvas::drawPoints')
+  external void _drawPoints(List<Object?>? paintObjects, ByteData paintData, int pointMode, Float32List points);
+
+  @override
+  void drawVertices(Vertices vertices, BlendMode blendMode, Paint paint) {
+    assert(!vertices.debugDisposed);
+    _drawVertices(vertices, blendMode.index, paint._objects, paint._data);
+  }
+
+  @Native<Void Function(Pointer<Void>, Pointer<Void>, Int32, Handle, Handle)>(symbol: 'Canvas::drawVertices')
+  external void _drawVertices(Vertices vertices, int blendMode, List<Object?>? paintObjects, ByteData paintData);
+
+  @override
+  void drawAtlas(Image atlas,
+                 List<RSTransform> transforms,
+                 List<Rect> rects,
+                 List<Color>? colors,
+                 BlendMode? blendMode,
+                 Rect? cullRect,
+                 Paint paint) {
+    assert(!atlas.debugDisposed);
+    assert(colors == null || colors.isEmpty || blendMode != null);
+
+    final int rectCount = rects.length;
+    if (transforms.length != rectCount) {
+      throw ArgumentError('"transforms" and "rects" lengths must match.');
+    }
+    if (colors != null && colors.isNotEmpty && colors.length != rectCount) {
+      throw ArgumentError('If non-null, "colors" length must match that of "transforms" and "rects".');
+    }
+
+    final Float32List rstTransformBuffer = Float32List(rectCount * 4);
+    final Float32List rectBuffer = Float32List(rectCount * 4);
+
+    for (int i = 0; i < rectCount; ++i) {
+      final int index0 = i * 4;
+      final int index1 = index0 + 1;
+      final int index2 = index0 + 2;
+      final int index3 = index0 + 3;
+      final RSTransform rstTransform = transforms[i];
+      final Rect rect = rects[i];
+      assert(_rectIsValid(rect));
+      rstTransformBuffer[index0] = rstTransform.scos;
+      rstTransformBuffer[index1] = rstTransform.ssin;
+      rstTransformBuffer[index2] = rstTransform.tx;
+      rstTransformBuffer[index3] = rstTransform.ty;
+      rectBuffer[index0] = rect.left;
+      rectBuffer[index1] = rect.top;
+      rectBuffer[index2] = rect.right;
+      rectBuffer[index3] = rect.bottom;
+    }
+
+    final Int32List? colorBuffer = (colors == null || colors.isEmpty) ? null : _encodeColorList(colors);
+    final Float32List? cullRectBuffer = cullRect?._getValue32();
+    final int qualityIndex = paint.filterQuality.index;
+
+    final String? error = _drawAtlas(
+      paint._objects, paint._data, qualityIndex, atlas._image, rstTransformBuffer, rectBuffer,
+      colorBuffer, (blendMode ?? BlendMode.src).index, cullRectBuffer
+    );
+
+    if (error != null) {
+      throw PictureRasterizationException._(error, stack: atlas._debugStack);
+    }
+  }
+
+  @override
   void drawRawAtlas(Image atlas,
                     Float32List rstTransforms,
                     Float32List rects,
@@ -5690,11 +6201,7 @@ class Canvas extends NativeFieldWrapperClass1 {
                     BlendMode? blendMode,
                     Rect? cullRect,
                     Paint paint) {
-    assert(atlas != null); // atlas is checked on the engine side
-    assert(rstTransforms != null);
-    assert(rects != null);
     assert(colors == null || blendMode != null);
-    assert(paint != null);
 
     final int rectCount = rects.length;
     if (rstTransforms.length != rectCount) {
@@ -5718,7 +6225,7 @@ class Canvas extends NativeFieldWrapperClass1 {
     }
   }
 
-  @FfiNative<Handle Function(Pointer<Void>, Handle, Handle, Int32, Pointer<Void>, Handle, Handle, Handle, Int32, Handle)>('Canvas::drawAtlas')
+  @Native<Handle Function(Pointer<Void>, Handle, Handle, Int32, Pointer<Void>, Handle, Handle, Handle, Int32, Handle)>(symbol: 'Canvas::drawAtlas')
   external String? _drawAtlas(
       List<Object?>? paintObjects,
       ByteData paintData,
@@ -5730,21 +6237,16 @@ class Canvas extends NativeFieldWrapperClass1 {
       int blendMode,
       Float32List? cullRect);
 
-  /// Draws a shadow for a [Path] representing the given material elevation.
-  ///
-  /// The `transparentOccluder` argument should be true if the occluding object
-  /// is not opaque.
-  ///
-  /// The arguments must not be null.
+  @override
   void drawShadow(Path path, Color color, double elevation, bool transparentOccluder) {
-    assert(path != null); // path is checked on the engine side
-    assert(color != null);
-    assert(transparentOccluder != null);
-    _drawShadow(path, color.value, elevation, transparentOccluder);
+    _drawShadow(path as _NativePath, color.value, elevation, transparentOccluder);
   }
 
-  @FfiNative<Void Function(Pointer<Void>, Pointer<Void>, Uint32, Double, Bool)>('Canvas::drawShadow')
-  external void _drawShadow(Path path, int color, double elevation, bool transparentOccluder);
+  @Native<Void Function(Pointer<Void>, Pointer<Void>, Uint32, Double, Bool)>(symbol: 'Canvas::drawShadow')
+  external void _drawShadow(_NativePath path, int color, double elevation, bool transparentOccluder);
+
+  @override
+  String toString() => 'Canvas(recording: ${_recorder != null})';
 }
 
 /// Signature for [Picture] lifecycle events.
@@ -5757,15 +6259,7 @@ typedef PictureEventCallback = void Function(Picture picture);
 /// A [Picture] can be placed in a [Scene] using a [SceneBuilder], via
 /// the [SceneBuilder.addPicture] method. A [Picture] can also be
 /// drawn into a [Canvas], using the [Canvas.drawPicture] method.
-@pragma('vm:entry-point')
-class Picture extends NativeFieldWrapperClass1 {
-  /// This class is created by the engine, and should not be instantiated
-  /// or extended directly.
-  ///
-  /// To create a [Picture], use a [PictureRecorder].
-  @pragma('vm:entry-point')
-  Picture._();
-
+abstract class Picture {
   /// A callback that is invoked to report a picture creation.
   ///
   /// It's preferred to use [MemoryAllocations] in flutter/foundation.dart
@@ -5785,24 +6279,7 @@ class Picture extends NativeFieldWrapperClass1 {
   /// The returned image will be `width` pixels wide and `height` pixels high.
   /// The picture is rasterized within the 0 (left), 0 (top), `width` (right),
   /// `height` (bottom) bounds. Content outside these bounds is clipped.
-  Future<Image> toImage(int width, int height) {
-    assert(!_disposed);
-    if (width <= 0 || height <= 0) {
-      throw Exception('Invalid image dimensions.');
-    }
-    return _futurize(
-      (_Callback<Image?> callback) => _toImage(width, height, (_Image? image) {
-        if (image == null) {
-          callback(null);
-        } else {
-          callback(Image._(image, image.width, image.height));
-        }
-      }),
-    );
-  }
-
-  @FfiNative<Handle Function(Pointer<Void>, Uint32, Uint32, Handle)>('Picture::toImage')
-  external String? _toImage(int width, int height, void Function(_Image?) callback);
+  Future<Image> toImage(int width, int height);
 
   /// Synchronously creates a handle to an image of this picture.
   ///
@@ -5821,6 +6298,53 @@ class Picture extends NativeFieldWrapperClass1 {
   ///
   /// If no GPU context is available, the image will be rasterized on the CPU.
   /// {@endtemplate}
+  Image toImageSync(int width, int height);
+
+  /// Release the resources used by this object. The object is no longer usable
+  /// after this method is called.
+  void dispose();
+
+  /// Whether this reference to the underlying picture is [dispose]d.
+  ///
+  /// This only returns a valid value if asserts are enabled, and must not be
+  /// used otherwise.
+  bool get debugDisposed;
+
+  /// Returns the approximate number of bytes allocated for this object.
+  ///
+  /// The actual size of this picture may be larger, particularly if it contains
+  /// references to image or other large objects.
+  int get approximateBytesUsed;
+}
+
+base class _NativePicture extends NativeFieldWrapperClass1 implements Picture {
+  /// This class is created by the engine, and should not be instantiated
+  /// or extended directly.
+  ///
+  /// To create a [Picture], use a [PictureRecorder].
+  _NativePicture._();
+
+  @override
+  Future<Image> toImage(int width, int height) {
+    assert(!_disposed);
+    if (width <= 0 || height <= 0) {
+      throw Exception('Invalid image dimensions.');
+    }
+    return _futurize(
+      (_Callback<Image?> callback) => _toImage(width, height, (_Image? image) {
+        if (image == null) {
+          callback(null);
+        } else {
+          callback(Image._(image, image.width, image.height));
+        }
+      }),
+    );
+  }
+
+  @Native<Handle Function(Pointer<Void>, Uint32, Uint32, Handle)>(symbol: 'Picture::toImage')
+  external String? _toImage(int width, int height, void Function(_Image?) callback);
+
+  @override
   Image toImageSync(int width, int height) {
     assert(!_disposed);
     if (width <= 0 || height <= 0) {
@@ -5832,31 +6356,28 @@ class Picture extends NativeFieldWrapperClass1 {
     return Image._(image, image.width, image.height);
   }
 
-  @FfiNative<Void Function(Pointer<Void>, Uint32, Uint32, Handle)>('Picture::toImageSync')
+  @Native<Void Function(Pointer<Void>, Uint32, Uint32, Handle)>(symbol: 'Picture::toImageSync')
   external void _toImageSync(int width, int height, _Image outImage);
 
-  /// Release the resources used by this object. The object is no longer usable
-  /// after this method is called.
+  @override
   void dispose() {
     assert(!_disposed);
     assert(() {
       _disposed = true;
       return true;
     }());
-    onDispose?.call(this);
+    Picture.onDispose?.call(this);
     _dispose();
   }
 
   /// This can't be a leaf call because the native function calls Dart API
   /// (Dart_SetNativeInstanceField).
-  @FfiNative<Void Function(Pointer<Void>)>('Picture::dispose')
+  @Native<Void Function(Pointer<Void>)>(symbol: 'Picture::dispose')
   external void _dispose();
 
   bool _disposed = false;
-  /// Whether this reference to the underlying picture is [dispose]d.
-  ///
-  /// This only returns a valid value if asserts are enabled, and must not be
-  /// used otherwise.
+
+  @override
   bool get debugDisposed {
     bool? disposed;
     assert(() {
@@ -5866,27 +6387,23 @@ class Picture extends NativeFieldWrapperClass1 {
     return disposed ?? (throw StateError('Picture.debugDisposed is only available when asserts are enabled.'));
   }
 
-  /// Returns the approximate number of bytes allocated for this object.
-  ///
-  /// The actual size of this picture may be larger, particularly if it contains
-  /// references to image or other large objects.
-  @FfiNative<Uint64 Function(Pointer<Void>)>('Picture::GetAllocationSize', isLeaf: true)
+  @override
+  @Native<Uint64 Function(Pointer<Void>)>(symbol: 'Picture::GetAllocationSize', isLeaf: true)
   external int get approximateBytesUsed;
+
+  @override
+  String toString() => 'Picture';
 }
 
 /// Records a [Picture] containing a sequence of graphical operations.
 ///
 /// To begin recording, construct a [Canvas] to record the commands.
 /// To end recording, use the [PictureRecorder.endRecording] method.
-class PictureRecorder extends NativeFieldWrapperClass1 {
+abstract class PictureRecorder {
   /// Creates a new idle PictureRecorder. To associate it with a
   /// [Canvas] and begin recording, pass this [PictureRecorder] to the
   /// [Canvas] constructor.
-  @pragma('vm:entry-point')
-  PictureRecorder() { _constructor(); }
-
-  @FfiNative<Void Function(Handle)>('PictureRecorder::Create')
-  external void _constructor();
+  factory PictureRecorder() = _NativePictureRecorder;
 
   /// Whether this object is currently recording commands.
   ///
@@ -5895,18 +6412,31 @@ class PictureRecorder extends NativeFieldWrapperClass1 {
   /// call to [endRecording], and false if either this
   /// [PictureRecorder] has not yet been associated with a [Canvas],
   /// or the [endRecording] method has already been called.
-  bool get isRecording => _canvas != null;
+  bool get isRecording;
 
   /// Finishes recording graphical operations.
   ///
   /// Returns a picture containing the graphical operations that have been
   /// recorded thus far. After calling this function, both the picture recorder
   /// and the canvas objects are invalid and cannot be used further.
+  Picture endRecording();
+}
+
+base class _NativePictureRecorder extends NativeFieldWrapperClass1 implements PictureRecorder {
+  _NativePictureRecorder() { _constructor(); }
+
+  @Native<Void Function(Handle)>(symbol: 'PictureRecorder::Create')
+  external void _constructor();
+
+  @override
+  bool get isRecording => _canvas != null;
+
+  @override
   Picture endRecording() {
     if (_canvas == null) {
       throw StateError('PictureRecorder did not start recording.');
     }
-    final Picture picture = Picture._();
+    final _NativePicture picture = _NativePicture._();
     _endRecording(picture);
     _canvas!._recorder = null;
     _canvas = null;
@@ -5916,10 +6446,13 @@ class PictureRecorder extends NativeFieldWrapperClass1 {
     return picture;
   }
 
-  @FfiNative<Void Function(Pointer<Void>, Handle)>('PictureRecorder::endRecording')
-  external void _endRecording(Picture outPicture);
+  @Native<Void Function(Pointer<Void>, Handle)>(symbol: 'PictureRecorder::endRecording')
+  external void _endRecording(_NativePicture outPicture);
+
+  _NativeCanvas? _canvas;
 
-  Canvas? _canvas;
+  @override
+  String toString() => 'PictureRecorder(recording: $isRecording)';
 }
 
 /// A single shadow.
@@ -5940,9 +6473,7 @@ class Shadow {
     this.color = const Color(_kColorDefault),
     this.offset = Offset.zero,
     this.blurRadius = 0.0,
-  }) : assert(color != null, 'Text shadow color was null.'),
-       assert(offset != null, 'Text shadow offset was null.'),
-       assert(blurRadius >= 0.0, 'Text shadow blur radius should be non-negative.');
+  }) : assert(blurRadius >= 0.0, 'Text shadow blur radius should be non-negative.');
 
   static const int _kColorDefault = 0xFF000000;
   // Constants for shadow encoding.
@@ -6011,7 +6542,7 @@ class Shadow {
 
   /// Linearly interpolate between two shadows.
   ///
-  /// If either shadow is null, this function linearly interpolates from a
+  /// If either shadow is null, this function linearly interpolates from
   /// a shadow that matches the other shadow in color but has a zero
   /// offset and a zero blurRadius.
   ///
@@ -6029,7 +6560,6 @@ class Shadow {
   /// an [AnimationController].
   /// {@endtemplate}
   static Shadow? lerp(Shadow? a, Shadow? b, double t) {
-    assert(t != null);
     if (b == null) {
       if (a == null) {
         return null;
@@ -6055,7 +6585,6 @@ class Shadow {
   ///
   /// {@macro dart.ui.shadow.lerp}
   static List<Shadow>? lerpList(List<Shadow>? a, List<Shadow>? b, double t) {
-    assert(t != null);
     if (a == null && b == null) {
       return null;
     }
@@ -6103,25 +6632,20 @@ class Shadow {
     int shadowOffset = 0;
     for (int shadowIndex = 0; shadowIndex < shadows.length; ++shadowIndex) {
       final Shadow shadow = shadows[shadowIndex];
-      // TODO(yjbanov): remove the null check when the framework is migrated. While the list
-      //                of shadows contains non-nullable elements, unmigrated code can still
-      //                pass nulls.
-      if (shadow != null) {
-        shadowOffset = shadowIndex * _kBytesPerShadow;
+      shadowOffset = shadowIndex * _kBytesPerShadow;
 
-        shadowsData.setInt32(_kColorOffset + shadowOffset,
-          shadow.color.value ^ Shadow._kColorDefault, _kFakeHostEndian);
+      shadowsData.setInt32(_kColorOffset + shadowOffset,
+        shadow.color.value ^ Shadow._kColorDefault, _kFakeHostEndian);
 
-        shadowsData.setFloat32(_kXOffset + shadowOffset,
-          shadow.offset.dx, _kFakeHostEndian);
+      shadowsData.setFloat32(_kXOffset + shadowOffset,
+        shadow.offset.dx, _kFakeHostEndian);
 
-        shadowsData.setFloat32(_kYOffset + shadowOffset,
-          shadow.offset.dy, _kFakeHostEndian);
+      shadowsData.setFloat32(_kYOffset + shadowOffset,
+        shadow.offset.dy, _kFakeHostEndian);
 
-        final double blurSigma = Shadow.convertRadiusToSigma(shadow.blurRadius);
-        shadowsData.setFloat32(_kBlurOffset + shadowOffset,
-          blurSigma, _kFakeHostEndian);
-      }
+      final double blurSigma = Shadow.convertRadiusToSigma(shadow.blurRadius);
+      shadowsData.setFloat32(_kBlurOffset + shadowOffset,
+        blurSigma, _kFakeHostEndian);
     }
 
     return shadowsData;
@@ -6135,7 +6659,7 @@ class Shadow {
 ///
 /// The creator of this object is responsible for calling [dispose] when it is
 /// no longer needed.
-class ImmutableBuffer extends NativeFieldWrapperClass1 {
+base class ImmutableBuffer extends NativeFieldWrapperClass1 {
   ImmutableBuffer._(this._length);
 
   /// Creates a copy of the data from a [Uint8List] suitable for internal use
@@ -6159,7 +6683,12 @@ class ImmutableBuffer extends NativeFieldWrapperClass1 {
     final ImmutableBuffer instance = ImmutableBuffer._(0);
     return _futurize((_Callback<int> callback) {
       return instance._initFromAsset(encodedKey, callback);
-    }).then((int length) => instance.._length = length);
+    }).then((int length) {
+      if (length == -1) {
+        throw Exception('Asset not found');
+      }
+      return instance.._length = length;
+    });
   }
 
   /// Create a buffer from the file with [path].
@@ -6177,13 +6706,13 @@ class ImmutableBuffer extends NativeFieldWrapperClass1 {
     });
   }
 
-  @FfiNative<Handle Function(Handle, Handle, Handle)>('ImmutableBuffer::init')
+  @Native<Handle Function(Handle, Handle, Handle)>(symbol: 'ImmutableBuffer::init')
   external String? _init(Uint8List list, _Callback<void> callback);
 
-  @FfiNative<Handle Function(Handle, Handle, Handle)>('ImmutableBuffer::initFromAsset')
+  @Native<Handle Function(Handle, Handle, Handle)>(symbol: 'ImmutableBuffer::initFromAsset')
   external String? _initFromAsset(String assetKey, _Callback<int> callback);
 
-  @FfiNative<Handle Function(Handle, Handle, Handle)>('ImmutableBuffer::initFromFile')
+  @Native<Handle Function(Handle, Handle, Handle)>(symbol: 'ImmutableBuffer::initFromFile')
   external String? _initFromFile(String assetKey, _Callback<int> callback);
 
   /// The length, in bytes, of the underlying data.
@@ -6224,7 +6753,7 @@ class ImmutableBuffer extends NativeFieldWrapperClass1 {
 
   /// This can't be a leaf call because the native function calls Dart API
   /// (Dart_SetNativeInstanceField).
-  @FfiNative<Void Function(Pointer<Void>)>('ImmutableBuffer::dispose')
+  @Native<Void Function(Pointer<Void>)>(symbol: 'ImmutableBuffer::dispose')
   external void _dispose();
 }
 
@@ -6232,9 +6761,7 @@ class ImmutableBuffer extends NativeFieldWrapperClass1 {
 ///
 /// Use this class to determine the height, width, and byte size of image data
 /// before decoding it.
-class ImageDescriptor extends NativeFieldWrapperClass1 {
-  ImageDescriptor._();
-
+abstract class ImageDescriptor {
   /// Creates an image descriptor from raw image pixels.
   ///
   /// The `pixels` parameter is the pixel data. They are packed in bytes in the
@@ -6245,71 +6772,43 @@ class ImageDescriptor extends NativeFieldWrapperClass1 {
   /// pixels in the data buffer. If unspecified, it defaults to `width` multiplied
   /// by the number of bytes per pixel in the provided `format`.
   // Not async because there's no expensive work to do here.
-  ImageDescriptor.raw(
+  factory ImageDescriptor.raw(
     ImmutableBuffer buffer, {
     required int width,
     required int height,
     int? rowBytes,
     required PixelFormat pixelFormat,
-  }) {
-    _width = width;
-    _height = height;
-    // We only support 4 byte pixel formats in the PixelFormat enum.
-    _bytesPerPixel = 4;
-    _initRaw(this, buffer, width, height, rowBytes ?? -1, pixelFormat.index);
-  }
+  }) = _NativeImageDescriptor.raw;
 
   /// Creates an image descriptor from encoded data in a supported format.
   static Future<ImageDescriptor> encoded(ImmutableBuffer buffer) {
-    final ImageDescriptor descriptor = ImageDescriptor._();
+    final _NativeImageDescriptor descriptor = _NativeImageDescriptor._();
     return _futurize((_Callback<void> callback) {
       return descriptor._initEncoded(buffer, callback);
     }).then((_) => descriptor);
   }
 
-  @FfiNative<Handle Function(Handle, Pointer<Void>, Handle)>('ImageDescriptor::initEncoded')
-  external String? _initEncoded(ImmutableBuffer buffer, _Callback<void> callback);
-
-  @FfiNative<Void Function(Handle, Handle, Int32, Int32, Int32, Int32)>('ImageDescriptor::initRaw')
-  external static void _initRaw(ImageDescriptor outDescriptor, ImmutableBuffer buffer, int width, int height, int rowBytes, int pixelFormat);
-
-  int? _width;
-
-  @FfiNative<Int32 Function(Pointer<Void>)>('ImageDescriptor::width', isLeaf: true)
-  external int _getWidth();
-
   /// The width, in pixels, of the image.
   ///
   /// On the Web, this is only supported for [raw] images.
-  int get width => _width ??= _getWidth();
-
-  int? _height;
-
-  @FfiNative<Int32 Function(Pointer<Void>)>('ImageDescriptor::height', isLeaf: true)
-  external int _getHeight();
+  int get width;
 
   /// The height, in pixels, of the image.
   ///
   /// On the Web, this is only supported for [raw] images.
-  int get height => _height ??= _getHeight();
-
-  int? _bytesPerPixel;
-
-  @FfiNative<Int32 Function(Pointer<Void>)>('ImageDescriptor::bytesPerPixel', isLeaf: true)
-  external int _getBytesPerPixel();
+  int get height;
 
   /// The number of bytes per pixel in the image.
   ///
   /// On web, this is only supported for [raw] images.
-  int get bytesPerPixel => _bytesPerPixel ??= _getBytesPerPixel();
+  int get bytesPerPixel;
 
   /// Release the resources used by this object. The object is no longer usable
   /// after this method is called.
   ///
   /// This can't be a leaf call because the native function calls Dart API
   /// (Dart_SetNativeInstanceField).
-  @FfiNative<Void Function(Pointer<Void>)>('ImageDescriptor::dispose')
-  external void dispose();
+  void dispose();
 
   /// Creates a [Codec] object which is suitable for decoding the data in the
   /// buffer to an [Image].
@@ -6320,6 +6819,71 @@ class ImageDescriptor extends NativeFieldWrapperClass1 {
   ///
   /// If either targetWidth or targetHeight is less than or equal to zero, it
   /// will be treated as if it is null.
+  Future<Codec> instantiateCodec({int? targetWidth, int? targetHeight});
+}
+
+base class _NativeImageDescriptor extends NativeFieldWrapperClass1 implements ImageDescriptor {
+  _NativeImageDescriptor._();
+
+  /// Creates an image descriptor from raw image pixels.
+  ///
+  /// The `pixels` parameter is the pixel data. They are packed in bytes in the
+  /// order described by `pixelFormat`, then grouped in rows, from left to right,
+  /// then top to bottom.
+  ///
+  /// The `rowBytes` parameter is the number of bytes consumed by each row of
+  /// pixels in the data buffer. If unspecified, it defaults to `width` multiplied
+  /// by the number of bytes per pixel in the provided `format`.
+  // Not async because there's no expensive work to do here.
+  _NativeImageDescriptor.raw(
+    ImmutableBuffer buffer, {
+    required int width,
+    required int height,
+    int? rowBytes,
+    required PixelFormat pixelFormat,
+  }) {
+    _width = width;
+    _height = height;
+    // We only support 4 byte pixel formats in the PixelFormat enum.
+    _bytesPerPixel = 4;
+    _initRaw(this, buffer, width, height, rowBytes ?? -1, pixelFormat.index);
+  }
+
+  @Native<Handle Function(Handle, Pointer<Void>, Handle)>(symbol: 'ImageDescriptor::initEncoded')
+  external String? _initEncoded(ImmutableBuffer buffer, _Callback<void> callback);
+
+  @Native<Void Function(Handle, Handle, Int32, Int32, Int32, Int32)>(symbol: 'ImageDescriptor::initRaw')
+  external static void _initRaw(ImageDescriptor outDescriptor, ImmutableBuffer buffer, int width, int height, int rowBytes, int pixelFormat);
+
+  int? _width;
+
+  @Native<Int32 Function(Pointer<Void>)>(symbol: 'ImageDescriptor::width', isLeaf: true)
+  external int _getWidth();
+
+  @override
+  int get width => _width ??= _getWidth();
+
+  int? _height;
+
+  @Native<Int32 Function(Pointer<Void>)>(symbol: 'ImageDescriptor::height', isLeaf: true)
+  external int _getHeight();
+
+  @override
+  int get height => _height ??= _getHeight();
+
+  int? _bytesPerPixel;
+
+  @Native<Int32 Function(Pointer<Void>)>(symbol: 'ImageDescriptor::bytesPerPixel', isLeaf: true)
+  external int _getBytesPerPixel();
+
+  @override
+  int get bytesPerPixel => _bytesPerPixel ??= _getBytesPerPixel();
+
+  @override
+  @Native<Void Function(Pointer<Void>)>(symbol: 'ImageDescriptor::dispose')
+  external void dispose();
+
+  @override
   Future<Codec> instantiateCodec({int? targetWidth, int? targetHeight}) async {
     if (targetWidth != null && targetWidth <= 0) {
       targetWidth = null;
@@ -6333,32 +6897,40 @@ class ImageDescriptor extends NativeFieldWrapperClass1 {
       targetHeight = height;
     } else if (targetWidth == null && targetHeight != null) {
       targetWidth = (targetHeight * (width / height)).round();
-      targetHeight = targetHeight;
     } else if (targetHeight == null && targetWidth != null) {
-      targetWidth = targetWidth;
       targetHeight = targetWidth ~/ (width / height);
     }
     assert(targetWidth != null);
     assert(targetHeight != null);
 
-    final Codec codec = Codec._();
+    final Codec codec = _NativeCodec._();
     _instantiateCodec(codec, targetWidth!, targetHeight!);
     return codec;
   }
 
-  @FfiNative<Void Function(Pointer<Void>, Handle, Int32, Int32)>('ImageDescriptor::instantiateCodec')
+  @Native<Void Function(Pointer<Void>, Handle, Int32, Int32)>(symbol: 'ImageDescriptor::instantiateCodec')
   external void _instantiateCodec(Codec outCodec, int targetWidth, int targetHeight);
+
+  @override
+  String toString() => 'ImageDescriptor(width: ${_width ?? '?'}, height: ${_height ?? '?'}, bytes per pixel: ${_bytesPerPixel ?? '?'})';
 }
 
 /// Generic callback signature, used by [_futurize].
 typedef _Callback<T> = void Function(T result);
 
+/// Generic callback signature, used by [_futurizeWithError].
+typedef _CallbackWithError<T> = void Function(T result, String? error);
+
 /// Signature for a method that receives a [_Callback].
 ///
 /// Return value should be null on success, and a string error message on
 /// failure.
 typedef _Callbacker<T> = String? Function(_Callback<T?> callback);
 
+/// Signature for a method that receives a [_CallbackWithError].
+/// See also: [_Callbacker]
+typedef _CallbackerWithError<T> = String? Function(_CallbackWithError<T?> callback);
+
 // Converts a method that receives a value-returning callback to a method that
 // returns a Future.
 //
@@ -6391,10 +6963,10 @@ Future<T> _futurize<T>(_Callbacker<T> callbacker) {
   // If the callback synchronously throws an error, then synchronously
   // rethrow that error instead of adding it to the completer. This
   // prevents the Zone from receiving an uncaught exception.
-  bool sync = true;
+  bool isSync = true;
   final String? error = callbacker((T? t) {
     if (t == null) {
-      if (sync) {
+      if (isSync) {
         throw Exception('operation failed');
       } else {
         completer.completeError(Exception('operation failed'));
@@ -6403,7 +6975,32 @@ Future<T> _futurize<T>(_Callbacker<T> callbacker) {
       completer.complete(t);
     }
   });
-  sync = false;
+  isSync = false;
+  if (error != null) {
+    throw Exception(error);
+  }
+  return completer.future;
+}
+
+/// A variant of `_futurize` that can communicate specific errors.
+Future<T> _futurizeWithError<T>(_CallbackerWithError<T> callbacker) {
+  final Completer<T> completer = Completer<T>.sync();
+  // If the callback synchronously throws an error, then synchronously
+  // rethrow that error instead of adding it to the completer. This
+  // prevents the Zone from receiving an uncaught exception.
+  bool isSync = true;
+  final String? error = callbacker((T? t, String? error) {
+    if (t != null) {
+      completer.complete(t);
+    } else {
+      if (isSync) {
+        throw Exception(error ?? 'operation failed');
+      } else {
+        completer.completeError(Exception(error ?? 'operation failed'));
+      }
+    }
+  });
+  isSync = false;
   if (error != null) {
     throw Exception(error);
   }
diff --git a/lib/ui/painting/canvas.cc b/lib/ui/painting/canvas.cc
index 9cd15cd4ead378eea37465e7bf7e8fa83b62b9af..b8889bfcbcd49b9870faa77c1e94d49704c7d8ef 100644
--- a/lib/ui/painting/canvas.cc
+++ b/lib/ui/painting/canvas.cc
@@ -3,27 +3,16 @@
 // found in the LICENSE file.
 
 #include "flutter/lib/ui/painting/canvas.h"
-#include "flutter/lib/ui/painting/image_filter.h"
 
 #include <cmath>
 
-#include "flutter/display_list/display_list_blend_mode.h"
-#include "flutter/display_list/display_list_builder.h"
-#include "flutter/display_list/display_list_canvas_dispatcher.h"
-#include "flutter/flow/layers/physical_shape_layer.h"
+#include "flutter/display_list/dl_builder.h"
+#include "flutter/lib/ui/floating_point.h"
 #include "flutter/lib/ui/painting/image.h"
-#include "flutter/lib/ui/painting/matrix.h"
+#include "flutter/lib/ui/painting/image_filter.h"
 #include "flutter/lib/ui/painting/paint.h"
 #include "flutter/lib/ui/ui_dart_state.h"
 #include "flutter/lib/ui/window/platform_configuration.h"
-#include "flutter/lib/ui/window/window.h"
-#include "third_party/skia/include/core/SkBitmap.h"
-#include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkRSXform.h"
-#include "third_party/tonic/converter/dart_converter.h"
-#include "third_party/tonic/dart_args.h"
-#include "third_party/tonic/dart_binding_macros.h"
-#include "third_party/tonic/dart_library_natives.h"
 
 #include "flutter/fml/logging.h"
 
@@ -47,28 +36,22 @@ void Canvas::Create(Dart_Handle wrapper,
     return;
   }
 
-  // This call will implicitly initialize the |canvas_| field with an SkCanvas
-  // whether or not we are using display_list. Now that all of the code here
-  // in canvas.cc will direct calls to the DisplayListBuilder we could almost
-  // stop initializing that field for the display list case. Unfortunately,
-  // the text code in paragraph.cc still needs to present its output to an
-  // SkCanvas* which means without significant work to the internals of the
-  // paragraph code, we are going to continue to need the canvas adapter and
-  // field and getter.
-  fml::RefPtr<Canvas> canvas = fml::MakeRefCounted<Canvas>(
-      recorder->BeginRecording(SkRect::MakeLTRB(left, top, right, bottom)));
+  fml::RefPtr<Canvas> canvas =
+      fml::MakeRefCounted<Canvas>(recorder->BeginRecording(
+          SkRect::MakeLTRB(SafeNarrow(left), SafeNarrow(top), SafeNarrow(right),
+                           SafeNarrow(bottom))));
   recorder->set_canvas(canvas);
-  canvas->display_list_recorder_ = recorder->display_list_recorder();
   canvas->AssociateWithDartWrapper(wrapper);
 }
 
-Canvas::Canvas(SkCanvas* canvas) : canvas_(canvas) {}
+Canvas::Canvas(sk_sp<DisplayListBuilder> builder)
+    : display_list_builder_(std::move(builder)) {}
 
 Canvas::~Canvas() {}
 
 void Canvas::save() {
-  if (display_list_recorder_) {
-    builder()->save();
+  if (display_list_builder_) {
+    builder()->Save();
   }
 }
 
@@ -77,12 +60,12 @@ void Canvas::saveLayerWithoutBounds(Dart_Handle paint_objects,
   Paint paint(paint_objects, paint_data);
 
   FML_DCHECK(paint.isNotNull());
-  if (display_list_recorder_) {
-    bool restore_with_paint =
-        paint.sync_to(builder(), kSaveLayerWithPaintFlags);
-    FML_DCHECK(restore_with_paint);
+  if (display_list_builder_) {
+    DlPaint dl_paint;
+    const DlPaint* save_paint = paint.paint(dl_paint, kSaveLayerWithPaintFlags);
+    FML_DCHECK(save_paint);
     TRACE_EVENT0("flutter", "ui.Canvas::saveLayer (Recorded)");
-    builder()->saveLayer(nullptr, restore_with_paint);
+    builder()->SaveLayer(nullptr, save_paint);
   }
 }
 
@@ -95,85 +78,85 @@ void Canvas::saveLayer(double left,
   Paint paint(paint_objects, paint_data);
 
   FML_DCHECK(paint.isNotNull());
-  SkRect bounds = SkRect::MakeLTRB(left, top, right, bottom);
-  if (display_list_recorder_) {
-    bool restore_with_paint =
-        paint.sync_to(builder(), kSaveLayerWithPaintFlags);
-    FML_DCHECK(restore_with_paint);
+  SkRect bounds = SkRect::MakeLTRB(SafeNarrow(left), SafeNarrow(top),
+                                   SafeNarrow(right), SafeNarrow(bottom));
+  if (display_list_builder_) {
+    DlPaint dl_paint;
+    const DlPaint* save_paint = paint.paint(dl_paint, kSaveLayerWithPaintFlags);
+    FML_DCHECK(save_paint);
     TRACE_EVENT0("flutter", "ui.Canvas::saveLayer (Recorded)");
-    builder()->saveLayer(&bounds, restore_with_paint);
+    builder()->SaveLayer(&bounds, save_paint);
   }
 }
 
 void Canvas::restore() {
-  if (display_list_recorder_) {
-    builder()->restore();
+  if (display_list_builder_) {
+    builder()->Restore();
   }
 }
 
 int Canvas::getSaveCount() {
-  if (display_list_recorder_) {
-    return builder()->getSaveCount();
+  if (display_list_builder_) {
+    return builder()->GetSaveCount();
   } else {
     return 0;
   }
 }
 
 void Canvas::restoreToCount(int count) {
-  if (display_list_recorder_ && count < getSaveCount()) {
-    builder()->restoreToCount(count);
+  if (display_list_builder_ && count < getSaveCount()) {
+    builder()->RestoreToCount(count);
   }
 }
 
 void Canvas::translate(double dx, double dy) {
-  if (display_list_recorder_) {
-    builder()->translate(dx, dy);
+  if (display_list_builder_) {
+    builder()->Translate(SafeNarrow(dx), SafeNarrow(dy));
   }
 }
 
 void Canvas::scale(double sx, double sy) {
-  if (display_list_recorder_) {
-    builder()->scale(sx, sy);
+  if (display_list_builder_) {
+    builder()->Scale(SafeNarrow(sx), SafeNarrow(sy));
   }
 }
 
 void Canvas::rotate(double radians) {
-  if (display_list_recorder_) {
-    builder()->rotate(radians * 180.0 / M_PI);
+  if (display_list_builder_) {
+    builder()->Rotate(SafeNarrow(radians) * 180.0f / static_cast<float>(M_PI));
   }
 }
 
 void Canvas::skew(double sx, double sy) {
-  if (display_list_recorder_) {
-    builder()->skew(sx, sy);
+  if (display_list_builder_) {
+    builder()->Skew(SafeNarrow(sx), SafeNarrow(sy));
   }
 }
 
 void Canvas::transform(const tonic::Float64List& matrix4) {
   // The Float array stored by Dart Matrix4 is in column-major order
   // Both DisplayList and SkM44 constructor take row-major matrix order
-  if (display_list_recorder_) {
+  if (display_list_builder_) {
     // clang-format off
-    builder()->transformFullPerspective(
-        matrix4[ 0], matrix4[ 4], matrix4[ 8], matrix4[12],
-        matrix4[ 1], matrix4[ 5], matrix4[ 9], matrix4[13],
-        matrix4[ 2], matrix4[ 6], matrix4[10], matrix4[14],
-        matrix4[ 3], matrix4[ 7], matrix4[11], matrix4[15]);
+    builder()->TransformFullPerspective(
+        SafeNarrow(matrix4[ 0]), SafeNarrow(matrix4[ 4]), SafeNarrow(matrix4[ 8]), SafeNarrow(matrix4[12]),
+        SafeNarrow(matrix4[ 1]), SafeNarrow(matrix4[ 5]), SafeNarrow(matrix4[ 9]), SafeNarrow(matrix4[13]),
+        SafeNarrow(matrix4[ 2]), SafeNarrow(matrix4[ 6]), SafeNarrow(matrix4[10]), SafeNarrow(matrix4[14]),
+        SafeNarrow(matrix4[ 3]), SafeNarrow(matrix4[ 7]), SafeNarrow(matrix4[11]), SafeNarrow(matrix4[15]));
     // clang-format on
   }
 }
 
 void Canvas::getTransform(Dart_Handle matrix4_handle) {
-  SkM44 sk_m44 =
-      display_list_recorder_
-          ? display_list_recorder_->builder()->getTransformFullPerspective()
-          : canvas_->getLocalToDevice();
-  SkScalar m44_values[16];
-  // The Float array stored by Dart Matrix4 is in column-major order
-  sk_m44.getColMajor(m44_values);
-  auto matrix4 = tonic::Float64List(matrix4_handle);
-  for (int i = 0; i < 16; i++) {
-    matrix4[i] = m44_values[i];
+  if (display_list_builder_) {
+    SkM44 sk_m44 = builder()->GetTransformFullPerspective();
+    SkScalar m44_values[16];
+    // The Float array stored by Dart Matrix4 is in column-major order
+    sk_m44.getColMajor(m44_values);
+    auto matrix4 = tonic::Float64List(matrix4_handle);
+    for (int i = 0; i < 16; i++) {
+      matrix4[i] = m44_values[i];
+    }
   }
 }
 
@@ -181,17 +164,19 @@ void Canvas::clipRect(double left,
                       double top,
                       double right,
                       double bottom,
-                      SkClipOp clipOp,
+                      DlCanvas::ClipOp clipOp,
                       bool doAntiAlias) {
-  if (display_list_recorder_) {
-    builder()->clipRect(SkRect::MakeLTRB(left, top, right, bottom), clipOp,
-                        doAntiAlias);
+  if (display_list_builder_) {
+    builder()->ClipRect(SkRect::MakeLTRB(SafeNarrow(left), SafeNarrow(top),
+                                         SafeNarrow(right), SafeNarrow(bottom)),
+                        clipOp, doAntiAlias);
   }
 }
 
 void Canvas::clipRRect(const RRect& rrect, bool doAntiAlias) {
-  if (display_list_recorder_) {
-    builder()->clipRRect(rrect.sk_rrect, SkClipOp::kIntersect, doAntiAlias);
+  if (display_list_builder_) {
+    builder()->ClipRRect(rrect.sk_rrect, DlCanvas::ClipOp::kIntersect,
+                         doAntiAlias);
   }
 }
 
@@ -201,15 +186,16 @@ void Canvas::clipPath(const CanvasPath* path, bool doAntiAlias) {
         ToDart("Canvas.clipPath called with non-genuine Path."));
     return;
   }
-  if (display_list_recorder_) {
-    builder()->clipPath(path->path(), SkClipOp::kIntersect, doAntiAlias);
+  if (display_list_builder_) {
+    builder()->ClipPath(path->path(), DlCanvas::ClipOp::kIntersect,
+                        doAntiAlias);
   }
 }
 
 void Canvas::getDestinationClipBounds(Dart_Handle rect_handle) {
-  if (display_list_recorder_) {
+  if (display_list_builder_) {
     auto rect = tonic::Float64List(rect_handle);
-    SkRect bounds = builder()->getDestinationClipBounds();
+    SkRect bounds = builder()->GetDestinationClipBounds();
     rect[0] = bounds.fLeft;
     rect[1] = bounds.fTop;
     rect[2] = bounds.fRight;
@@ -218,9 +204,9 @@ void Canvas::getDestinationClipBounds(Dart_Handle rect_handle) {
 }
 
 void Canvas::getLocalClipBounds(Dart_Handle rect_handle) {
-  if (display_list_recorder_) {
+  if (display_list_builder_) {
     auto rect = tonic::Float64List(rect_handle);
-    SkRect bounds = display_list_recorder_->builder()->getLocalClipBounds();
+    SkRect bounds = builder()->GetLocalClipBounds();
     rect[0] = bounds.fLeft;
     rect[1] = bounds.fTop;
     rect[2] = bounds.fRight;
@@ -229,8 +215,8 @@ void Canvas::getLocalClipBounds(Dart_Handle rect_handle) {
 }
 
 void Canvas::drawColor(SkColor color, DlBlendMode blend_mode) {
-  if (display_list_recorder_) {
-    builder()->drawColor(color, blend_mode);
+  if (display_list_builder_) {
+    builder()->DrawColor(DlColor(color), blend_mode);
   }
 }
 
@@ -243,9 +229,12 @@ void Canvas::drawLine(double x1,
   Paint paint(paint_objects, paint_data);
 
   FML_DCHECK(paint.isNotNull());
-  if (display_list_recorder_) {
-    paint.sync_to(builder(), kDrawLineFlags);
-    builder()->drawLine(SkPoint::Make(x1, y1), SkPoint::Make(x2, y2));
+  if (display_list_builder_) {
+    DlPaint dl_paint;
+    paint.paint(dl_paint, kDrawLineFlags);
+    builder()->DrawLine(SkPoint::Make(SafeNarrow(x1), SafeNarrow(y1)),
+                        SkPoint::Make(SafeNarrow(x2), SafeNarrow(y2)),
+                        dl_paint);
   }
 }
 
@@ -253,15 +242,16 @@ void Canvas::drawPaint(Dart_Handle paint_objects, Dart_Handle paint_data) {
   Paint paint(paint_objects, paint_data);
   FML_DLOG(INFO)<<"drawPaint:" <<(int64_t)paint_objects ;
   FML_DCHECK(paint.isNotNull());
-  if (display_list_recorder_) {
-    paint.sync_to(builder(), kDrawPaintFlags);
-    std::shared_ptr<const DlImageFilter> filter = builder()->getImageFilter();
+  if (display_list_builder_) {
+    DlPaint dl_paint;
+    paint.paint(dl_paint, kDrawPaintFlags);
+    std::shared_ptr<const DlImageFilter> filter = dl_paint.getImageFilter();
     if (filter && !filter->asColorFilter()) {
       // drawPaint does an implicit saveLayer if an SkImageFilter is
       // present that cannot be replaced by an SkColorFilter.
       TRACE_EVENT0("flutter", "ui.Canvas::saveLayer (Recorded)");
     }
-    builder()->drawPaint();
+    builder()->DrawPaint(dl_paint);
   }
 }
 
@@ -274,9 +264,12 @@ void Canvas::drawRect(double left,
   Paint paint(paint_objects, paint_data);
 
   FML_DCHECK(paint.isNotNull());
-  if (display_list_recorder_) {
-    paint.sync_to(builder(), kDrawRectFlags);
-    builder()->drawRect(SkRect::MakeLTRB(left, top, right, bottom));
+  if (display_list_builder_) {
+    DlPaint dl_paint;
+    paint.paint(dl_paint, kDrawRectFlags);
+    builder()->DrawRect(SkRect::MakeLTRB(SafeNarrow(left), SafeNarrow(top),
+                                         SafeNarrow(right), SafeNarrow(bottom)),
+                        dl_paint);
   }
 }
 
@@ -286,9 +279,10 @@ void Canvas::drawRRect(const RRect& rrect,
   Paint paint(paint_objects, paint_data);
 
   FML_DCHECK(paint.isNotNull());
-  if (display_list_recorder_) {
-    paint.sync_to(builder(), kDrawRRectFlags);
-    builder()->drawRRect(rrect.sk_rrect);
+  if (display_list_builder_) {
+    DlPaint dl_paint;
+    paint.paint(dl_paint, kDrawRRectFlags);
+    builder()->DrawRRect(rrect.sk_rrect, dl_paint);
   }
 }
 
@@ -299,9 +293,10 @@ void Canvas::drawDRRect(const RRect& outer,
   Paint paint(paint_objects, paint_data);
 
   FML_DCHECK(paint.isNotNull());
-  if (display_list_recorder_) {
-    paint.sync_to(builder(), kDrawDRRectFlags);
-    builder()->drawDRRect(outer.sk_rrect, inner.sk_rrect);
+  if (display_list_builder_) {
+    DlPaint dl_paint;
+    paint.paint(dl_paint, kDrawDRRectFlags);
+    builder()->DrawDRRect(outer.sk_rrect, inner.sk_rrect, dl_paint);
   }
 }
 
@@ -314,9 +309,12 @@ void Canvas::drawOval(double left,
   Paint paint(paint_objects, paint_data);
 
   FML_DCHECK(paint.isNotNull());
-  if (display_list_recorder_) {
-    paint.sync_to(builder(), kDrawOvalFlags);
-    builder()->drawOval(SkRect::MakeLTRB(left, top, right, bottom));
+  if (display_list_builder_) {
+    DlPaint dl_paint;
+    paint.paint(dl_paint, kDrawOvalFlags);
+    builder()->DrawOval(SkRect::MakeLTRB(SafeNarrow(left), SafeNarrow(top),
+                                         SafeNarrow(right), SafeNarrow(bottom)),
+                        dl_paint);
   }
 }
 
@@ -328,9 +326,11 @@ void Canvas::drawCircle(double x,
   Paint paint(paint_objects, paint_data);
 
   FML_DCHECK(paint.isNotNull());
-  if (display_list_recorder_) {
-    paint.sync_to(builder(), kDrawCircleFlags);
-    builder()->drawCircle(SkPoint::Make(x, y), radius);
+  if (display_list_builder_) {
+    DlPaint dl_paint;
+    paint.paint(dl_paint, kDrawCircleFlags);
+    builder()->DrawCircle(SkPoint::Make(SafeNarrow(x), SafeNarrow(y)),
+                          SafeNarrow(radius), dl_paint);
   }
 }
 
@@ -346,14 +346,17 @@ void Canvas::drawArc(double left,
   Paint paint(paint_objects, paint_data);
 
   FML_DCHECK(paint.isNotNull());
-  if (display_list_recorder_) {
-    paint.sync_to(builder(),
-                  useCenter  //
-                      ? kDrawArcWithCenterFlags
-                      : kDrawArcNoCenterFlags);
-    builder()->drawArc(SkRect::MakeLTRB(left, top, right, bottom),
-                       startAngle * 180.0 / M_PI, sweepAngle * 180.0 / M_PI,
-                       useCenter);
+  if (display_list_builder_) {
+    DlPaint dl_paint;
+    paint.paint(dl_paint, useCenter  //
+                              ? kDrawArcWithCenterFlags
+                              : kDrawArcNoCenterFlags);
+    builder()->DrawArc(
+        SkRect::MakeLTRB(SafeNarrow(left), SafeNarrow(top), SafeNarrow(right),
+                         SafeNarrow(bottom)),
+        SafeNarrow(startAngle) * 180.0f / static_cast<float>(M_PI),
+        SafeNarrow(sweepAngle) * 180.0f / static_cast<float>(M_PI), useCenter,
+        dl_paint);
   }
 }
 
@@ -368,9 +371,10 @@ void Canvas::drawPath(const CanvasPath* path,
         ToDart("Canvas.drawPath called with non-genuine Path."));
     return;
   }
-  if (display_list_recorder_) {
-    paint.sync_to(builder(), kDrawPathFlags);
-    builder()->drawPath(path->path());
+  if (display_list_builder_) {
+    DlPaint dl_paint;
+    paint.paint(dl_paint, kDrawPathFlags);
+    builder()->DrawPath(path->path(), dl_paint);
   }
 }
 
@@ -397,10 +401,11 @@ Dart_Handle Canvas::drawImage(const CanvasImage* image,
   }
 
   auto sampling = ImageFilter::SamplingFromIndex(filterQualityIndex);
-  if (display_list_recorder_) {
-    bool with_attributes = paint.sync_to(builder(), kDrawImageWithPaintFlags);
-    builder()->drawImage(dl_image, SkPoint::Make(x, y), sampling,
-                         with_attributes);
+  if (display_list_builder_) {
+    DlPaint dl_paint;
+    const DlPaint* opt_paint = paint.paint(dl_paint, kDrawImageWithPaintFlags);
+    builder()->DrawImage(dl_image, SkPoint::Make(SafeNarrow(x), SafeNarrow(y)),
+                         sampling, opt_paint);
   }
   return Dart_Null();
 }
@@ -433,14 +438,17 @@ Dart_Handle Canvas::drawImageRect(const CanvasImage* image,
     return ToDart(error.value());
   }
 
-  SkRect src = SkRect::MakeLTRB(src_left, src_top, src_right, src_bottom);
-  SkRect dst = SkRect::MakeLTRB(dst_left, dst_top, dst_right, dst_bottom);
+  SkRect src = SkRect::MakeLTRB(SafeNarrow(src_left), SafeNarrow(src_top),
+                                SafeNarrow(src_right), SafeNarrow(src_bottom));
+  SkRect dst = SkRect::MakeLTRB(SafeNarrow(dst_left), SafeNarrow(dst_top),
+                                SafeNarrow(dst_right), SafeNarrow(dst_bottom));
   auto sampling = ImageFilter::SamplingFromIndex(filterQualityIndex);
-  if (display_list_recorder_) {
-    bool with_attributes =
-        paint.sync_to(builder(), kDrawImageRectWithPaintFlags);
-    builder()->drawImageRect(dl_image, src, dst, sampling, with_attributes,
-                             SkCanvas::kFast_SrcRectConstraint);
+  if (display_list_builder_) {
+    DlPaint dl_paint;
+    const DlPaint* opt_paint =
+        paint.paint(dl_paint, kDrawImageRectWithPaintFlags);
+    builder()->DrawImageRect(dl_image, src, dst, sampling, opt_paint,
+                             DlCanvas::SrcRectConstraint::kFast);
   }
   return Dart_Null();
 }
@@ -473,15 +481,18 @@ Dart_Handle Canvas::drawImageNine(const CanvasImage* image,
   }
 
   SkRect center =
-      SkRect::MakeLTRB(center_left, center_top, center_right, center_bottom);
+      SkRect::MakeLTRB(SafeNarrow(center_left), SafeNarrow(center_top),
+                       SafeNarrow(center_right), SafeNarrow(center_bottom));
   SkIRect icenter;
   center.round(&icenter);
-  SkRect dst = SkRect::MakeLTRB(dst_left, dst_top, dst_right, dst_bottom);
+  SkRect dst = SkRect::MakeLTRB(SafeNarrow(dst_left), SafeNarrow(dst_top),
+                                SafeNarrow(dst_right), SafeNarrow(dst_bottom));
   auto filter = ImageFilter::FilterModeFromIndex(bitmapSamplingIndex);
-  if (display_list_recorder_) {
-    bool with_attributes =
-        paint.sync_to(builder(), kDrawImageNineWithPaintFlags);
-    builder()->drawImageNine(dl_image, icenter, dst, filter, with_attributes);
+  if (display_list_builder_) {
+    DlPaint dl_paint;
+    const DlPaint* opt_paint =
+        paint.paint(dl_paint, kDrawImageNineWithPaintFlags);
+    builder()->DrawImageNine(dl_image, icenter, dst, filter, opt_paint);
   }
   return Dart_Null();
 }
@@ -493,10 +504,8 @@ void Canvas::drawPicture(Picture* picture) {
     return;
   }
   if (picture->display_list()) {
-    if (display_list_recorder_) {
-      builder()->drawDisplayList(picture->display_list());
-    } else if (canvas_) {
-      picture->display_list()->RenderTo(canvas_);
+    if (display_list_builder_) {
+      builder()->DrawDisplayList(picture->display_list());
     }
   } else {
     FML_DCHECK(false);
@@ -505,7 +514,7 @@ void Canvas::drawPicture(Picture* picture) {
 
 void Canvas::drawPoints(Dart_Handle paint_objects,
                         Dart_Handle paint_data,
-                        SkCanvas::PointMode point_mode,
+                        DlCanvas::PointMode point_mode,
                         const tonic::Float32List& points) {
   Paint paint(paint_objects, paint_data);
 
@@ -513,21 +522,23 @@ void Canvas::drawPoints(Dart_Handle paint_objects,
                 "SkPoint doesn't use floats.");
 
   FML_DCHECK(paint.isNotNull());
-  if (display_list_recorder_) {
+  if (display_list_builder_) {
+    DlPaint dl_paint;
     switch (point_mode) {
-      case SkCanvas::kPoints_PointMode:
-        paint.sync_to(builder(), kDrawPointsAsPointsFlags);
+      case DlCanvas::PointMode::kPoints:
+        paint.paint(dl_paint, kDrawPointsAsPointsFlags);
         break;
-      case SkCanvas::kLines_PointMode:
-        paint.sync_to(builder(), kDrawPointsAsLinesFlags);
+      case DlCanvas::PointMode::kLines:
+        paint.paint(dl_paint, kDrawPointsAsLinesFlags);
         break;
-      case SkCanvas::kPolygon_PointMode:
-        paint.sync_to(builder(), kDrawPointsAsPolygonFlags);
+      case DlCanvas::PointMode::kPolygon:
+        paint.paint(dl_paint, kDrawPointsAsPolygonFlags);
         break;
     }
-    builder()->drawPoints(point_mode,
+    builder()->DrawPoints(point_mode,
                           points.num_elements() / 2,  // SkPoints have 2 floats
-                          reinterpret_cast<const SkPoint*>(points.data()));
+                          reinterpret_cast<const SkPoint*>(points.data()),
+                          dl_paint);
   }
 }
 
@@ -543,9 +554,10 @@ void Canvas::drawVertices(const Vertices* vertices,
     return;
   }
   FML_DCHECK(paint.isNotNull());
-  if (display_list_recorder_) {
-    paint.sync_to(builder(), kDrawVerticesFlags);
-    builder()->drawVertices(vertices->vertices(), blend_mode);
+  if (display_list_builder_) {
+    DlPaint dl_paint;
+    paint.paint(dl_paint, kDrawVerticesFlags);
+    builder()->DrawVertices(vertices->vertices(), blend_mode, dl_paint);
   }
 }
 
@@ -580,20 +592,21 @@ Dart_Handle Canvas::drawAtlas(Dart_Handle paint_objects,
   auto sampling = ImageFilter::SamplingFromIndex(filterQualityIndex);
 
   FML_DCHECK(paint.isNotNull());
-  if (display_list_recorder_) {
+  if (display_list_builder_) {
     tonic::Float32List transforms(transforms_handle);
     tonic::Float32List rects(rects_handle);
     tonic::Int32List colors(colors_handle);
     tonic::Float32List cull_rect(cull_rect_handle);
 
-    bool with_attributes = paint.sync_to(builder(), kDrawAtlasWithPaintFlags);
-    builder()->drawAtlas(
+    DlPaint dl_paint;
+    const DlPaint* opt_paint = paint.paint(dl_paint, kDrawAtlasWithPaintFlags);
+    builder()->DrawAtlas(
         dl_image, reinterpret_cast<const SkRSXform*>(transforms.data()),
         reinterpret_cast<const SkRect*>(rects.data()),
         reinterpret_cast<const DlColor*>(colors.data()),
         rects.num_elements() / 4,  // SkRect have four floats.
         blend_mode, sampling, reinterpret_cast<const SkRect*>(cull_rect.data()),
-        with_attributes);
+        opt_paint);
   }
   return Dart_Null();
 }
@@ -607,12 +620,19 @@ void Canvas::drawShadow(const CanvasPath* path,
         ToDart("Canvas.drawShader called with non-genuine Path."));
     return;
   }
-  SkScalar dpr = UIDartState::Current()
-                     ->platform_configuration()
-                     ->get_window(0)
-                     ->viewport_metrics()
-                     .device_pixel_ratio;
-  if (display_list_recorder_) {
+
+  // Not using SafeNarrow because DPR will always be a relatively small number.
+  const ViewportMetrics* metrics =
+      UIDartState::Current()->platform_configuration()->GetMetrics(0);
+  SkScalar dpr;
+  // TODO(dkwingsmt): We should support rendering shadows on non-implicit views.
+  // However, currently this method has no way to get the target view ID.
+  if (metrics == nullptr) {
+    dpr = 1.0f;
+  } else {
+    dpr = static_cast<float>(metrics->device_pixel_ratio);
+  }
+  if (display_list_builder_) {
     // The DrawShadow mechanism results in non-public operations to be
     // performed on the canvas involving an SkDrawShadowRec. Since we
     // cannot include the header that defines that structure, we cannot
@@ -620,14 +640,13 @@ void Canvas::drawShadow(const CanvasPath* path,
     // that situation we bypass the canvas interface and inject the
     // shadow parameters directly into the underlying DisplayList.
     // See: https://bugs.chromium.org/p/skia/issues/detail?id=12125
-    builder()->drawShadow(path->path(), color, elevation, transparentOccluder,
-                          dpr);
+    builder()->DrawShadow(path->path(), DlColor(color), SafeNarrow(elevation),
+                          transparentOccluder, dpr);
   }
 }
 
 void Canvas::Invalidate() {
-  canvas_ = nullptr;
-  display_list_recorder_ = nullptr;
+  display_list_builder_ = nullptr;
   if (dart_wrapper()) {
     ClearDartWrapper();
   }
diff --git a/lib/ui/painting/canvas.h b/lib/ui/painting/canvas.h
index 0855c52c20f8ce867582a55ce672d93618c5f346..20ab1c9eafa9d0bc0e5f7402b61b8248120ec970 100644
--- a/lib/ui/painting/canvas.h
+++ b/lib/ui/painting/canvas.h
@@ -5,17 +5,14 @@
 #ifndef FLUTTER_LIB_UI_PAINTING_CANVAS_H_
 #define FLUTTER_LIB_UI_PAINTING_CANVAS_H_
 
-#include "flutter/display_list/display_list_blend_mode.h"
+#include "flutter/display_list/dl_blend_mode.h"
+#include "flutter/display_list/dl_op_flags.h"
 #include "flutter/lib/ui/dart_wrapper.h"
-#include "flutter/lib/ui/painting/paint.h"
 #include "flutter/lib/ui/painting/path.h"
 #include "flutter/lib/ui/painting/picture.h"
 #include "flutter/lib/ui/painting/picture_recorder.h"
 #include "flutter/lib/ui/painting/rrect.h"
 #include "flutter/lib/ui/painting/vertices.h"
-#include "flutter/lib/ui/ui_dart_state.h"
-#include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/utils/SkShadowUtils.h"
 #include "third_party/tonic/typed_data/typed_list.h"
 
 namespace flutter {
@@ -61,7 +58,7 @@ class Canvas : public RefCountedDartWrappable<Canvas>, DisplayListOpFlags {
                 double top,
                 double right,
                 double bottom,
-                SkClipOp clipOp,
+                DlCanvas::ClipOp clipOp,
                 bool doAntiAlias = true);
   void clipRRect(const RRect& rrect, bool doAntiAlias = true);
   void clipPath(const CanvasPath* path, bool doAntiAlias = true);
@@ -164,7 +161,7 @@ class Canvas : public RefCountedDartWrappable<Canvas>, DisplayListOpFlags {
 
   void drawPoints(Dart_Handle paint_objects,
                   Dart_Handle paint_data,
-                  SkCanvas::PointMode point_mode,
+                  DlCanvas::PointMode point_mode,
                   const tonic::Float32List& points);
 
   void drawVertices(const Vertices* vertices,
@@ -187,29 +184,14 @@ class Canvas : public RefCountedDartWrappable<Canvas>, DisplayListOpFlags {
                   double elevation,
                   bool transparentOccluder);
 
-  SkCanvas* canvas() const { return canvas_; }
   void Invalidate();
 
-  DisplayListBuilder* builder() {
-    return display_list_recorder_ ? display_list_recorder_->builder().get()
-                                  : nullptr;
-  }
+  DisplayListBuilder* builder() { return display_list_builder_.get(); }
 
  private:
-  explicit Canvas(SkCanvas* canvas);
-
-  // The SkCanvas is supplied by a call to SkPictureRecorder::beginRecording,
-  // which does not transfer ownership.  For this reason, we hold a raw
-  // pointer and manually set to null in Clear.
-  SkCanvas* canvas_;
-
-  // A copy of the recorder used by the SkCanvas->DisplayList adapter for cases
-  // where we cannot record the SkCanvas method call through the various OnOp()
-  // virtual methods or where we can be more efficient by talking directly in
-  // the DisplayList operation lexicon. The recorder has a method for recording
-  // paint attributes from an SkPaint and an operation type as well as access
-  // to the raw DisplayListBuilder for emitting custom rendering operations.
-  sk_sp<DisplayListCanvasRecorder> display_list_recorder_;
+  explicit Canvas(sk_sp<DisplayListBuilder> builder);
+
+  sk_sp<DisplayListBuilder> display_list_builder_;
 };
 
 }  // namespace flutter
diff --git a/lib/ui/painting/color_filter.cc b/lib/ui/painting/color_filter.cc
index 12b0db95892df72be64e98f5924c4abeb8cec108..f0d780d27208d6f95060363c7b2ff73a212464b3 100644
--- a/lib/ui/painting/color_filter.cc
+++ b/lib/ui/painting/color_filter.cc
@@ -23,8 +23,8 @@ void ColorFilter::Create(Dart_Handle wrapper) {
 }
 
 void ColorFilter::initMode(int color, int blend_mode) {
-  filter_ = std::make_shared<DlBlendColorFilter>(
-      static_cast<DlColor>(color), static_cast<DlBlendMode>(blend_mode));
+  filter_ = DlBlendColorFilter::Make(static_cast<DlColor>(color),
+                                     static_cast<DlBlendMode>(blend_mode));
 }
 
 void ColorFilter::initMatrix(const tonic::Float32List& color_matrix) {
@@ -39,15 +39,15 @@ void ColorFilter::initMatrix(const tonic::Float32List& color_matrix) {
   matrix[9] *= 1.0f / 255;
   matrix[14] *= 1.0f / 255;
   matrix[19] *= 1.0f / 255;
-  filter_ = std::make_shared<DlMatrixColorFilter>(matrix);
+  filter_ = DlMatrixColorFilter::Make(matrix);
 }
 
 void ColorFilter::initLinearToSrgbGamma() {
-  filter_ = DlLinearToSrgbGammaColorFilter::instance;
+  filter_ = DlLinearToSrgbGammaColorFilter::kInstance;
 }
 
 void ColorFilter::initSrgbToLinearGamma() {
-  filter_ = DlSrgbToLinearGammaColorFilter::instance;
+  filter_ = DlSrgbToLinearGammaColorFilter::kInstance;
 }
 
 ColorFilter::~ColorFilter() = default;
diff --git a/lib/ui/painting/color_filter.h b/lib/ui/painting/color_filter.h
index f80c48d96fe2ff07773f81a32cb1db509c6c6957..2d43c68995ed773b5113b196ef09554e6aab0d9b 100644
--- a/lib/ui/painting/color_filter.h
+++ b/lib/ui/painting/color_filter.h
@@ -2,15 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_LIB_UI_COLOR_FILTER_H_
-#define FLUTTER_LIB_UI_COLOR_FILTER_H_
+#ifndef FLUTTER_LIB_UI_PAINTING_COLOR_FILTER_H_
+#define FLUTTER_LIB_UI_PAINTING_COLOR_FILTER_H_
 
-#include "flutter/display_list/display_list_color_filter.h"
+#include "flutter/display_list/effects/dl_color_filter.h"
 #include "flutter/lib/ui/dart_wrapper.h"
 #include "third_party/tonic/typed_data/typed_list.h"
 
-using tonic::DartPersistentValue;
-
 namespace flutter {
 
 // A handle to an SkCodec object.
@@ -31,9 +29,6 @@ class ColorFilter : public RefCountedDartWrappable<ColorFilter> {
   ~ColorFilter() override;
 
   const std::shared_ptr<const DlColorFilter> filter() const { return filter_; }
-  const DlColorFilter* dl_filter() const {
-    return (filter_ && filter_->skia_object()) ? filter_.get() : nullptr;
-  }
 
  private:
   std::shared_ptr<const DlColorFilter> filter_;
@@ -41,4 +36,4 @@ class ColorFilter : public RefCountedDartWrappable<ColorFilter> {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_LIB_UI_COLOR_FILTER_H_
+#endif  // FLUTTER_LIB_UI_PAINTING_COLOR_FILTER_H_
diff --git a/lib/ui/painting/display_list_deferred_image_gpu_impeller.cc b/lib/ui/painting/display_list_deferred_image_gpu_impeller.cc
index 49fb3e214d77726db9726208aa48be3cb5d7f7c6..0c2a7de57cca4a1df1744cc1b57b079d90cd10a7 100644
--- a/lib/ui/painting/display_list_deferred_image_gpu_impeller.cc
+++ b/lib/ui/painting/display_list_deferred_image_gpu_impeller.cc
@@ -3,20 +3,20 @@
 // found in the LICENSE file.
 
 #include "flutter/lib/ui/painting/display_list_deferred_image_gpu_impeller.h"
-#include "display_list_deferred_image_gpu_impeller.h"
 
 #include <utility>
 
+#include "flutter/fml/make_copyable.h"
+
 namespace flutter {
 
 sk_sp<DlDeferredImageGPUImpeller> DlDeferredImageGPUImpeller::Make(
-    std::shared_ptr<LayerTree> layer_tree,
-    const SkISize& size,
+    std::unique_ptr<LayerTree> layer_tree,
     fml::TaskRunnerAffineWeakPtr<SnapshotDelegate> snapshot_delegate,
     fml::RefPtr<fml::TaskRunner> raster_task_runner) {
   return sk_sp<DlDeferredImageGPUImpeller>(new DlDeferredImageGPUImpeller(
       DlDeferredImageGPUImpeller::ImageWrapper::Make(
-          std::move(layer_tree), size, std::move(snapshot_delegate),
+          std::move(layer_tree), std::move(snapshot_delegate),
           std::move(raster_task_runner))));
 }
 
@@ -63,6 +63,11 @@ bool DlDeferredImageGPUImpeller::isTextureBacked() const {
   return wrapper_ && wrapper_->isTextureBacked();
 }
 
+// |DlImage|
+bool DlDeferredImageGPUImpeller::isUIThreadSafe() const {
+  return true;
+}
+
 // |DlImage|
 SkISize DlDeferredImageGPUImpeller::dimensions() const {
   if (!wrapper_) {
@@ -101,13 +106,12 @@ DlDeferredImageGPUImpeller::ImageWrapper::Make(
 
 std::shared_ptr<DlDeferredImageGPUImpeller::ImageWrapper>
 DlDeferredImageGPUImpeller::ImageWrapper::Make(
-    std::shared_ptr<LayerTree> layer_tree,
-    const SkISize& size,
+    std::unique_ptr<LayerTree> layer_tree,
     fml::TaskRunnerAffineWeakPtr<SnapshotDelegate> snapshot_delegate,
     fml::RefPtr<fml::TaskRunner> raster_task_runner) {
-  auto wrapper = std::shared_ptr<ImageWrapper>(
-      new ImageWrapper(nullptr, size, std::move(snapshot_delegate),
-                       std::move(raster_task_runner)));
+  auto wrapper = std::shared_ptr<ImageWrapper>(new ImageWrapper(
+      nullptr, layer_tree->frame_size(), std::move(snapshot_delegate),
+      std::move(raster_task_runner)));
   wrapper->SnapshotDisplayList(std::move(layer_tree));
   return wrapper;
 }
@@ -147,10 +151,11 @@ bool DlDeferredImageGPUImpeller::ImageWrapper::isTextureBacked() const {
 }
 
 void DlDeferredImageGPUImpeller::ImageWrapper::SnapshotDisplayList(
-    std::shared_ptr<LayerTree> layer_tree) {
+    std::unique_ptr<LayerTree> layer_tree) {
   fml::TaskRunner::RunNowOrPostTask(
       raster_task_runner_,
-      [weak_this = weak_from_this(), layer_tree = std::move(layer_tree)] {
+      fml::MakeCopyable([weak_this = weak_from_this(),
+                         layer_tree = std::move(layer_tree)]() {
         TRACE_EVENT0("flutter", "SnapshotDisplayList (impeller)");
         auto wrapper = weak_this.lock();
         if (!wrapper) {
@@ -178,7 +183,7 @@ void DlDeferredImageGPUImpeller::ImageWrapper::SnapshotDisplayList(
           return;
         }
         wrapper->texture_ = snapshot->impeller_texture();
-      });
+      }));
 }
 
 std::optional<std::string>
diff --git a/lib/ui/painting/display_list_deferred_image_gpu_impeller.h b/lib/ui/painting/display_list_deferred_image_gpu_impeller.h
index 84d6e9aec33a2ca1dfe76a21e787beb9c16fdb1b..e0b79bec8df935a06df43321a5189c6426208f20 100644
--- a/lib/ui/painting/display_list_deferred_image_gpu_impeller.h
+++ b/lib/ui/painting/display_list_deferred_image_gpu_impeller.h
@@ -2,24 +2,24 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_LIB_UI_PAINTING_DISPLAY_LIST_DEFERRED_IMAGE_GPU_IMPELLER_H_
+#define FLUTTER_LIB_UI_PAINTING_DISPLAY_LIST_DEFERRED_IMAGE_GPU_IMPELLER_H_
 
 #include "flutter/common/graphics/texture.h"
-#include "flutter/display_list/display_list_image.h"
+#include "flutter/display_list/image/dl_image.h"
 #include "flutter/flow/layers/layer_tree.h"
 #include "flutter/fml/macros.h"
 #include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/fml/task_runner.h"
 #include "flutter/lib/ui/snapshot_delegate.h"
-#include "impeller/renderer/texture.h"
+#include "impeller/core/texture.h"
 
 namespace flutter {
 
 class DlDeferredImageGPUImpeller final : public DlImage {
  public:
   static sk_sp<DlDeferredImageGPUImpeller> Make(
-      std::shared_ptr<LayerTree> layer_tree,
-      const SkISize& size,
+      std::unique_ptr<LayerTree> layer_tree,
       fml::TaskRunnerAffineWeakPtr<SnapshotDelegate> snapshot_delegate,
       fml::RefPtr<fml::TaskRunner> raster_task_runner);
 
@@ -44,6 +44,9 @@ class DlDeferredImageGPUImpeller final : public DlImage {
   // |DlImage|
   bool isTextureBacked() const override;
 
+  // |DlImage|
+  bool isUIThreadSafe() const override;
+
   // |DlImage|
   SkISize dimensions() const override;
 
@@ -68,8 +71,7 @@ class DlDeferredImageGPUImpeller final : public DlImage {
         fml::RefPtr<fml::TaskRunner> raster_task_runner);
 
     static std::shared_ptr<ImageWrapper> Make(
-        std::shared_ptr<LayerTree> layer_tree,
-        const SkISize& size,
+        std::unique_ptr<LayerTree> layer_tree,
         fml::TaskRunnerAffineWeakPtr<SnapshotDelegate> snapshot_delegate,
         fml::RefPtr<fml::TaskRunner> raster_task_runner);
 
@@ -101,10 +103,10 @@ class DlDeferredImageGPUImpeller final : public DlImage {
         fml::RefPtr<fml::TaskRunner> raster_task_runner);
 
     // If a layer tree is provided, it will be flattened during the raster
-    // thread task spwaned by this method. After being flattened into a display
+    // thread task spawned by this method. After being flattened into a display
     // list, the image wrapper will be updated to hold this display list and the
     // layer tree can be dropped.
-    void SnapshotDisplayList(std::shared_ptr<LayerTree> layer_tree = nullptr);
+    void SnapshotDisplayList(std::unique_ptr<LayerTree> layer_tree = nullptr);
 
     // |ContextListener|
     void OnGrContextCreated() override;
@@ -123,3 +125,5 @@ class DlDeferredImageGPUImpeller final : public DlImage {
 };
 
 }  // namespace flutter
+
+#endif  // FLUTTER_LIB_UI_PAINTING_DISPLAY_LIST_DEFERRED_IMAGE_GPU_IMPELLER_H_
diff --git a/lib/ui/painting/display_list_deferred_image_gpu_skia.cc b/lib/ui/painting/display_list_deferred_image_gpu_skia.cc
index 14874c2133c0ee89b66e21561b63ac59c644a4e4..0cec39c737a5df066992206491c39eb945f25cfa 100644
--- a/lib/ui/painting/display_list_deferred_image_gpu_skia.cc
+++ b/lib/ui/painting/display_list_deferred_image_gpu_skia.cc
@@ -4,7 +4,10 @@
 
 #include "flutter/lib/ui/painting/display_list_deferred_image_gpu_skia.h"
 
+#include "flutter/fml/make_copyable.h"
 #include "third_party/skia/include/core/SkColorSpace.h"
+#include "third_party/skia/include/core/SkImage.h"
+#include "third_party/skia/include/gpu/ganesh/SkImageGanesh.h"
 
 namespace flutter {
 
@@ -23,7 +26,7 @@ sk_sp<DlDeferredImageGPUSkia> DlDeferredImageGPUSkia::Make(
 
 sk_sp<DlDeferredImageGPUSkia> DlDeferredImageGPUSkia::MakeFromLayerTree(
     const SkImageInfo& image_info,
-    std::shared_ptr<LayerTree> layer_tree,
+    std::unique_ptr<LayerTree> layer_tree,
     fml::TaskRunnerAffineWeakPtr<SnapshotDelegate> snapshot_delegate,
     const fml::RefPtr<fml::TaskRunner>& raster_task_runner,
     fml::RefPtr<SkiaUnrefQueue> unref_queue) {
@@ -73,6 +76,11 @@ bool DlDeferredImageGPUSkia::isTextureBacked() const {
   return image_wrapper_ ? image_wrapper_->isTextureBacked() : false;
 }
 
+// |DlImage|
+bool DlDeferredImageGPUSkia::isUIThreadSafe() const {
+  return true;
+}
+
 // |DlImage|
 SkISize DlDeferredImageGPUSkia::dimensions() const {
   return image_wrapper_ ? image_wrapper_->image_info().dimensions()
@@ -81,9 +89,9 @@ SkISize DlDeferredImageGPUSkia::dimensions() const {
 
 // |DlImage|
 size_t DlDeferredImageGPUSkia::GetApproximateByteSize() const {
-  return sizeof(this) + (image_wrapper_
-                             ? image_wrapper_->image_info().computeMinByteSize()
-                             : 0);
+  return sizeof(*this) +
+         (image_wrapper_ ? image_wrapper_->image_info().computeMinByteSize()
+                         : 0);
 }
 
 std::optional<std::string> DlDeferredImageGPUSkia::get_error() const {
@@ -107,7 +115,7 @@ DlDeferredImageGPUSkia::ImageWrapper::Make(
 std::shared_ptr<DlDeferredImageGPUSkia::ImageWrapper>
 DlDeferredImageGPUSkia::ImageWrapper::MakeFromLayerTree(
     const SkImageInfo& image_info,
-    std::shared_ptr<LayerTree> layer_tree,
+    std::unique_ptr<LayerTree> layer_tree,
     fml::TaskRunnerAffineWeakPtr<SnapshotDelegate> snapshot_delegate,
     fml::RefPtr<fml::TaskRunner> raster_task_runner,
     fml::RefPtr<SkiaUnrefQueue> unref_queue) {
@@ -137,7 +145,6 @@ void DlDeferredImageGPUSkia::ImageWrapper::OnGrContextCreated() {
 
 void DlDeferredImageGPUSkia::ImageWrapper::OnGrContextDestroyed() {
   FML_DCHECK(raster_task_runner_->RunsTasksOnCurrentThread());
-
   DeleteTexture();
 }
 
@@ -145,7 +152,7 @@ sk_sp<SkImage> DlDeferredImageGPUSkia::ImageWrapper::CreateSkiaImage() const {
   FML_DCHECK(raster_task_runner_->RunsTasksOnCurrentThread());
 
   if (texture_.isValid() && context_) {
-    return SkImage::MakeFromTexture(
+    return SkImages::BorrowTextureFrom(
         context_.get(), texture_, kTopLeft_GrSurfaceOrigin,
         image_info_.colorType(), image_info_.alphaType(),
         image_info_.refColorSpace());
@@ -158,10 +165,11 @@ bool DlDeferredImageGPUSkia::ImageWrapper::isTextureBacked() const {
 }
 
 void DlDeferredImageGPUSkia::ImageWrapper::SnapshotDisplayList(
-    std::shared_ptr<LayerTree> layer_tree) {
+    std::unique_ptr<LayerTree> layer_tree) {
   fml::TaskRunner::RunNowOrPostTask(
       raster_task_runner_,
-      [weak_this = weak_from_this(), layer_tree = std::move(layer_tree)]() {
+      fml::MakeCopyable([weak_this = weak_from_this(),
+                         layer_tree = std::move(layer_tree)]() mutable {
         auto wrapper = weak_this.lock();
         if (!wrapper) {
           return;
@@ -193,7 +201,7 @@ void DlDeferredImageGPUSkia::ImageWrapper::SnapshotDisplayList(
           std::scoped_lock lock(wrapper->error_mutex_);
           wrapper->error_ = result->error;
         }
-      });
+      }));
 }
 
 std::optional<std::string> DlDeferredImageGPUSkia::ImageWrapper::get_error() {
diff --git a/lib/ui/painting/display_list_deferred_image_gpu_skia.h b/lib/ui/painting/display_list_deferred_image_gpu_skia.h
index f80e9e10c97c96befd0f672879fbfd37724fdfe7..cec6c974d6205bb241da60f278a1cfa3bd2d4421 100644
--- a/lib/ui/painting/display_list_deferred_image_gpu_skia.h
+++ b/lib/ui/painting/display_list_deferred_image_gpu_skia.h
@@ -10,14 +10,15 @@
 
 #include "flutter/common/graphics/texture.h"
 #include "flutter/display_list/display_list.h"
-#include "flutter/display_list/display_list_image.h"
+#include "flutter/display_list/image/dl_image.h"
 #include "flutter/flow/layers/layer_tree.h"
-#include "flutter/flow/skia_gpu_object.h"
 #include "flutter/fml/macros.h"
 #include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/lib/ui/io_manager.h"
 #include "flutter/lib/ui/snapshot_delegate.h"
 
+#include "third_party/skia/include/gpu/GrBackendSurface.h"
+
 namespace flutter {
 
 class DlDeferredImageGPUSkia final : public DlImage {
@@ -31,7 +32,7 @@ class DlDeferredImageGPUSkia final : public DlImage {
 
   static sk_sp<DlDeferredImageGPUSkia> MakeFromLayerTree(
       const SkImageInfo& image_info,
-      std::shared_ptr<LayerTree> layer_tree,
+      std::unique_ptr<LayerTree> layer_tree,
       fml::TaskRunnerAffineWeakPtr<SnapshotDelegate> snapshot_delegate,
       const fml::RefPtr<fml::TaskRunner>& raster_task_runner,
       fml::RefPtr<SkiaUnrefQueue> unref_queue);
@@ -55,6 +56,9 @@ class DlDeferredImageGPUSkia final : public DlImage {
   // |DlImage|
   bool isTextureBacked() const override;
 
+  // |DlImage|
+  bool isUIThreadSafe() const override;
+
   // |DlImage|
   SkISize dimensions() const override;
 
@@ -83,7 +87,7 @@ class DlDeferredImageGPUSkia final : public DlImage {
 
     static std::shared_ptr<ImageWrapper> MakeFromLayerTree(
         const SkImageInfo& image_info,
-        std::shared_ptr<LayerTree> layer_tree,
+        std::unique_ptr<LayerTree> layer_tree,
         fml::TaskRunnerAffineWeakPtr<SnapshotDelegate> snapshot_delegate,
         fml::RefPtr<fml::TaskRunner> raster_task_runner,
         fml::RefPtr<SkiaUnrefQueue> unref_queue);
@@ -120,10 +124,10 @@ class DlDeferredImageGPUSkia final : public DlImage {
         fml::RefPtr<SkiaUnrefQueue> unref_queue);
 
     // If a layer tree is provided, it will be flattened during the raster
-    // thread task spwaned by this method. After being flattened into a display
+    // thread task spawned by this method. After being flattened into a display
     // list, the image wrapper will be updated to hold this display list and the
     // layer tree can be dropped.
-    void SnapshotDisplayList(std::shared_ptr<LayerTree> layer_tree = nullptr);
+    void SnapshotDisplayList(std::unique_ptr<LayerTree> layer_tree = nullptr);
 
     // |ContextListener|
     void OnGrContextCreated() override;
diff --git a/lib/ui/painting/display_list_image_gpu.cc b/lib/ui/painting/display_list_image_gpu.cc
index ff52840568cf1e172ca177c9caa000f72ffb41c6..b4e87090534d391eef021be820093769ae115718 100644
--- a/lib/ui/painting/display_list_image_gpu.cc
+++ b/lib/ui/painting/display_list_image_gpu.cc
@@ -45,6 +45,11 @@ bool DlImageGPU::isTextureBacked() const {
   return false;
 }
 
+// |DlImage|
+bool DlImageGPU::isUIThreadSafe() const {
+  return true;
+}
+
 // |DlImage|
 SkISize DlImageGPU::dimensions() const {
   const auto image = skia_image();
@@ -53,10 +58,10 @@ SkISize DlImageGPU::dimensions() const {
 
 // |DlImage|
 size_t DlImageGPU::GetApproximateByteSize() const {
-  auto size = sizeof(this);
+  auto size = sizeof(*this);
   if (auto image = skia_image()) {
     const auto& info = image->imageInfo();
-    const auto kMipmapOverhead = 4.0 / 3.0;
+    const auto kMipmapOverhead = image->hasMipmaps() ? 4.0 / 3.0 : 1.0;
     const size_t image_byte_size = info.computeMinByteSize() * kMipmapOverhead;
     size += image_byte_size;
   }
diff --git a/lib/ui/painting/display_list_image_gpu.h b/lib/ui/painting/display_list_image_gpu.h
index dbc7febc465ce122ec785d6ed5a5cc9e815ca60d..4290c724c8f20c689ef4b3b83d0528f5bb8951e1 100644
--- a/lib/ui/painting/display_list_image_gpu.h
+++ b/lib/ui/painting/display_list_image_gpu.h
@@ -5,7 +5,7 @@
 #ifndef FLUTTER_LIB_UI_PAINTING_DISPLAY_LIST_IMAGE_GPU_H_
 #define FLUTTER_LIB_UI_PAINTING_DISPLAY_LIST_IMAGE_GPU_H_
 
-#include "flutter/display_list/display_list_image.h"
+#include "flutter/display_list/image/dl_image.h"
 #include "flutter/flow/skia_gpu_object.h"
 #include "flutter/fml/macros.h"
 
@@ -30,6 +30,9 @@ class DlImageGPU final : public DlImage {
   // |DlImage|
   bool isTextureBacked() const override;
 
+  // |DlImage|
+  bool isUIThreadSafe() const override;
+
   // |DlImage|
   SkISize dimensions() const override;
 
diff --git a/lib/ui/painting/engine_layer.h b/lib/ui/painting/engine_layer.h
index e13a7517183d541e7263ca5809b2c20a1c6d67ef..163091d7bffd866301330da1e7b2c410031ec01f 100644
--- a/lib/ui/painting/engine_layer.h
+++ b/lib/ui/painting/engine_layer.h
@@ -18,8 +18,9 @@ class EngineLayer : public RefCountedDartWrappable<EngineLayer> {
  public:
   ~EngineLayer() override;
 
-  static void MakeRetained(Dart_Handle dart_handle,
-                           std::shared_ptr<flutter::ContainerLayer> layer) {
+  static void MakeRetained(
+      Dart_Handle dart_handle,
+      const std::shared_ptr<flutter::ContainerLayer>& layer) {
     auto engine_layer = fml::MakeRefCounted<EngineLayer>(layer);
     engine_layer->AssociateWithDartWrapper(dart_handle);
   }
diff --git a/lib/ui/painting/fragment_program.cc b/lib/ui/painting/fragment_program.cc
index 97536caf752153cc5ef78716dd59cdfceefc7f8a..5e1f91cac6ebdc5894b73f18fa3111dd0b3b5e38 100644
--- a/lib/ui/painting/fragment_program.cc
+++ b/lib/ui/painting/fragment_program.cc
@@ -5,7 +5,7 @@
 #include <memory>
 #include <sstream>
 
-#include "display_list/display_list_runtime_effect.h"
+#include "display_list/effects/dl_runtime_effect.h"
 #include "flutter/lib/ui/painting/fragment_program.h"
 
 #include "flutter/assets/asset_manager.h"
@@ -15,6 +15,7 @@
 #include "flutter/lib/ui/ui_dart_state.h"
 #include "flutter/lib/ui/window/platform_configuration.h"
 
+#include "impeller/core/runtime_types.h"
 #include "third_party/skia/include/core/SkString.h"
 #include "third_party/tonic/converter/dart_converter.h"
 #include "third_party/tonic/dart_args.h"
@@ -26,6 +27,20 @@ namespace flutter {
 
 IMPLEMENT_WRAPPERTYPEINFO(ui, FragmentProgram);
 
+static std::string RuntimeStageBackendToString(
+    impeller::RuntimeStageBackend backend) {
+  switch (backend) {
+    case impeller::RuntimeStageBackend::kSkSL:
+      return "SkSL";
+    case impeller::RuntimeStageBackend::kMetal:
+      return "Metal";
+    case impeller::RuntimeStageBackend::kOpenGLES:
+      return "OpenGLES";
+    case impeller::RuntimeStageBackend::kVulkan:
+      return "Vulkan";
+  }
+}
+
 std::string FragmentProgram::initFromAsset(const std::string& asset_name) {
   FML_TRACE_EVENT("flutter", "FragmentProgram::initFromAsset", "asset",
                   asset_name);
@@ -38,15 +53,34 @@ std::string FragmentProgram::initFromAsset(const std::string& asset_name) {
     return std::string("Asset '") + asset_name + std::string("' not found");
   }
 
-  auto runtime_stage = impeller::RuntimeStage(std::move(data));
-  if (!runtime_stage.IsValid()) {
+  auto runtime_stages =
+      impeller::RuntimeStage::DecodeRuntimeStages(std::move(data));
+
+  if (runtime_stages.empty()) {
     return std::string("Asset '") + asset_name +
-           std::string("' does not contain valid shader data.");
+           std::string("' does not contain any shader data.");
+  }
+
+  auto backend = UIDartState::Current()->GetRuntimeStageBackend();
+  auto runtime_stage = runtime_stages[backend];
+  if (!runtime_stage) {
+    std::ostringstream stream;
+    stream << "Asset '" << asset_name
+           << "' does not contain appropriate runtime stage data for current "
+              "backend ("
+           << RuntimeStageBackendToString(backend) << ")." << std::endl
+           << "Found stages: ";
+    for (const auto& kvp : runtime_stages) {
+      if (kvp.second) {
+        stream << RuntimeStageBackendToString(kvp.first) << " ";
+      }
+    }
+    return stream.str();
   }
 
   int sampled_image_count = 0;
   size_t other_uniforms_bytes = 0;
-  for (const auto& uniform_description : runtime_stage.GetUniforms()) {
+  for (const auto& uniform_description : runtime_stage->GetUniforms()) {
     if (uniform_description.type ==
         impeller::RuntimeUniformType::kSampledImage) {
       sampled_image_count++;
@@ -56,10 +90,9 @@ std::string FragmentProgram::initFromAsset(const std::string& asset_name) {
   }
 
   if (UIDartState::Current()->IsImpellerEnabled()) {
-    runtime_effect_ = DlRuntimeEffect::MakeImpeller(
-        std::make_unique<impeller::RuntimeStage>(std::move(runtime_stage)));
+    runtime_effect_ = DlRuntimeEffect::MakeImpeller(std::move(runtime_stage));
   } else {
-    auto code_mapping = runtime_stage.GetSkSLMapping();
+    const auto& code_mapping = runtime_stage->GetCodeMapping();
     auto code_size = code_mapping->GetSize();
     const char* sksl =
         reinterpret_cast<const char*>(code_mapping->GetMapping());
@@ -80,16 +113,17 @@ std::string FragmentProgram::initFromAsset(const std::string& asset_name) {
   Dart_Handle result = Dart_SetField(ths, tonic::ToDart("_samplerCount"),
                                      Dart_NewInteger(sampled_image_count));
   if (Dart_IsError(result)) {
-    Dart_PropagateError(result);
+    return "Failed to set sampler count for fragment program.";
   }
 
   size_t rounded_uniform_bytes =
       (other_uniforms_bytes + sizeof(float) - 1) & ~(sizeof(float) - 1);
   size_t float_count = rounded_uniform_bytes / sizeof(float);
+
   result = Dart_SetField(ths, tonic::ToDart("_uniformFloatCount"),
                          Dart_NewInteger(float_count));
   if (Dart_IsError(result)) {
-    Dart_PropagateError(result);
+    return "Failed to set uniform float count for fragment program.";
   }
 
   return "";
diff --git a/lib/ui/painting/fragment_program.h b/lib/ui/painting/fragment_program.h
index 50da9cbf9dba0fe45ea8e447b5a08c37928a9622..65d4d8809fd9a5621938f49e8e376d40ad12796f 100644
--- a/lib/ui/painting/fragment_program.h
+++ b/lib/ui/painting/fragment_program.h
@@ -5,9 +5,8 @@
 #ifndef FLUTTER_LIB_UI_PAINTING_FRAGMENT_PROGRAM_H_
 #define FLUTTER_LIB_UI_PAINTING_FRAGMENT_PROGRAM_H_
 
-#include "flutter/display_list/display_list_runtime_effect.h"
+#include "flutter/display_list/effects/dl_runtime_effect.h"
 #include "flutter/lib/ui/dart_wrapper.h"
-#include "flutter/lib/ui/painting/fragment_shader.h"
 #include "flutter/lib/ui/painting/shader.h"
 
 #include "third_party/tonic/dart_library_natives.h"
diff --git a/lib/ui/painting/fragment_shader.cc b/lib/ui/painting/fragment_shader.cc
index 0a153a0f008ccb5c45f52cb92f937640eb963e65..491d312e7e6c0d82a3cfac4a8949bb11149345bf 100644
--- a/lib/ui/painting/fragment_shader.cc
+++ b/lib/ui/painting/fragment_shader.cc
@@ -7,8 +7,8 @@
 
 #include "flutter/lib/ui/painting/fragment_shader.h"
 
-#include "flutter/display_list/display_list_color_source.h"
-#include "flutter/display_list/display_list_tile_mode.h"
+#include "flutter/display_list/dl_tile_mode.h"
+#include "flutter/display_list/effects/dl_color_source.h"
 #include "flutter/lib/ui/dart_wrapper.h"
 #include "flutter/lib/ui/painting/fragment_program.h"
 #include "flutter/lib/ui/ui_dart_state.h"
@@ -59,6 +59,9 @@ bool ReusableFragmentShader::ValidateSamplers() {
     if (samplers_[i] == nullptr) {
       return false;
     }
+    // The samplers should have been checked as they were added, this
+    // is a double-sanity-check.
+    FML_DCHECK(samplers_[i]->isUIThreadSafe());
   }
   return true;
 }
@@ -71,12 +74,18 @@ void ReusableFragmentShader::SetImageSampler(Dart_Handle index_handle,
   if (index >= samplers_.size()) {
     Dart_ThrowException(tonic::ToDart("Sampler index out of bounds"));
   }
+  if (!image->image()->isUIThreadSafe()) {
+    Dart_ThrowException(tonic::ToDart("Image is not thread-safe"));
+  }
 
   // TODO(115794): Once the DlImageSampling enum is replaced, expose the
   //               sampling options as a new default parameter for users.
   samplers_[index] = std::make_shared<DlImageColorSource>(
       image->image(), DlTileMode::kClamp, DlTileMode::kClamp,
       DlImageSampling::kNearestNeighbor, nullptr);
+  // This should be true since we already checked the image above, but
+  // we check again for sanity.
+  FML_DCHECK(samplers_[index]->isUIThreadSafe());
 
   auto* uniform_floats =
       reinterpret_cast<float*>(uniform_data_->writable_data());
@@ -95,7 +104,11 @@ std::shared_ptr<DlColorSource> ReusableFragmentShader::shader(
   uniform_data->resize(uniform_data_->size());
   memcpy(uniform_data->data(), uniform_data_->bytes(), uniform_data->size());
 
-  return program_->MakeDlColorSource(std::move(uniform_data), samplers_);
+  auto source = program_->MakeDlColorSource(std::move(uniform_data), samplers_);
+  // The samplers should have been checked as they were added, this
+  // is a double-sanity-check.
+  FML_DCHECK(source->isUIThreadSafe());
+  return source;
 }
 
 void ReusableFragmentShader::Dispose() {
diff --git a/lib/ui/painting/gradient.cc b/lib/ui/painting/gradient.cc
index 9651982c183c409282934eb83de0dfe176603537..e54f39f41fadd5bffa58f7b83f23df9c4ddc26c7 100644
--- a/lib/ui/painting/gradient.cc
+++ b/lib/ui/painting/gradient.cc
@@ -4,6 +4,7 @@
 
 #include "flutter/lib/ui/painting/gradient.h"
 
+#include "flutter/lib/ui/floating_point.h"
 #include "third_party/tonic/converter/dart_converter.h"
 #include "third_party/tonic/dart_args.h"
 #include "third_party/tonic/dart_binding_macros.h"
@@ -25,7 +26,7 @@ void CanvasGradient::Create(Dart_Handle wrapper) {
 void CanvasGradient::initLinear(const tonic::Float32List& end_points,
                                 const tonic::Int32List& colors,
                                 const tonic::Float32List& color_stops,
-                                SkTileMode tile_mode,
+                                DlTileMode tile_mode,
                                 const tonic::Float64List& matrix4) {
   FML_DCHECK(end_points.num_elements() == 4);
   FML_DCHECK(colors.num_elements() == color_stops.num_elements() ||
@@ -48,7 +49,9 @@ void CanvasGradient::initLinear(const tonic::Float32List& end_points,
 
   dl_shader_ = DlColorSource::MakeLinear(
       p0, p1, colors.num_elements(), colors_array, color_stops.data(),
-      ToDl(tile_mode), has_matrix ? &sk_matrix : nullptr);
+      tile_mode, has_matrix ? &sk_matrix : nullptr);
+  // Just a sanity check, all gradient shaders should be thread-safe
+  FML_DCHECK(dl_shader_->isUIThreadSafe());
 }
 
 void CanvasGradient::initRadial(double center_x,
@@ -56,7 +59,7 @@ void CanvasGradient::initRadial(double center_x,
                                 double radius,
                                 const tonic::Int32List& colors,
                                 const tonic::Float32List& color_stops,
-                                SkTileMode tile_mode,
+                                DlTileMode tile_mode,
                                 const tonic::Float64List& matrix4) {
   FML_DCHECK(colors.num_elements() == color_stops.num_elements() ||
              color_stops.data() == nullptr);
@@ -73,16 +76,18 @@ void CanvasGradient::initRadial(double center_x,
   const DlColor* colors_array = reinterpret_cast<const DlColor*>(colors.data());
 
   dl_shader_ = DlColorSource::MakeRadial(
-      SkPoint::Make(center_x, center_y), radius, colors.num_elements(),
-      colors_array, color_stops.data(), ToDl(tile_mode),
-      has_matrix ? &sk_matrix : nullptr);
+      SkPoint::Make(SafeNarrow(center_x), SafeNarrow(center_y)),
+      SafeNarrow(radius), colors.num_elements(), colors_array,
+      color_stops.data(), tile_mode, has_matrix ? &sk_matrix : nullptr);
+  // Just a sanity check, all gradient shaders should be thread-safe
+  FML_DCHECK(dl_shader_->isUIThreadSafe());
 }
 
 void CanvasGradient::initSweep(double center_x,
                                double center_y,
                                const tonic::Int32List& colors,
                                const tonic::Float32List& color_stops,
-                               SkTileMode tile_mode,
+                               DlTileMode tile_mode,
                                double start_angle,
                                double end_angle,
                                const tonic::Float64List& matrix4) {
@@ -101,9 +106,13 @@ void CanvasGradient::initSweep(double center_x,
   const DlColor* colors_array = reinterpret_cast<const DlColor*>(colors.data());
 
   dl_shader_ = DlColorSource::MakeSweep(
-      SkPoint::Make(center_x, center_y), start_angle * 180.0 / M_PI,
-      end_angle * 180.0 / M_PI, colors.num_elements(), colors_array,
-      color_stops.data(), ToDl(tile_mode), has_matrix ? &sk_matrix : nullptr);
+      SkPoint::Make(SafeNarrow(center_x), SafeNarrow(center_y)),
+      SafeNarrow(start_angle) * 180.0f / static_cast<float>(M_PI),
+      SafeNarrow(end_angle) * 180.0f / static_cast<float>(M_PI),
+      colors.num_elements(), colors_array, color_stops.data(), tile_mode,
+      has_matrix ? &sk_matrix : nullptr);
+  // Just a sanity check, all gradient shaders should be thread-safe
+  FML_DCHECK(dl_shader_->isUIThreadSafe());
 }
 
 void CanvasGradient::initTwoPointConical(double start_x,
@@ -114,7 +123,7 @@ void CanvasGradient::initTwoPointConical(double start_x,
                                          double end_radius,
                                          const tonic::Int32List& colors,
                                          const tonic::Float32List& color_stops,
-                                         SkTileMode tile_mode,
+                                         DlTileMode tile_mode,
                                          const tonic::Float64List& matrix4) {
   FML_DCHECK(colors.num_elements() == color_stops.num_elements() ||
              color_stops.data() == nullptr);
@@ -131,10 +140,13 @@ void CanvasGradient::initTwoPointConical(double start_x,
   const DlColor* colors_array = reinterpret_cast<const DlColor*>(colors.data());
 
   dl_shader_ = DlColorSource::MakeConical(
-      SkPoint::Make(start_x, start_y), start_radius,            //
-      SkPoint::Make(end_x, end_y), end_radius,                  //
-      colors.num_elements(), colors_array, color_stops.data(),  //
-      ToDl(tile_mode), has_matrix ? &sk_matrix : nullptr);
+      SkPoint::Make(SafeNarrow(start_x), SafeNarrow(start_y)),
+      SafeNarrow(start_radius),
+      SkPoint::Make(SafeNarrow(end_x), SafeNarrow(end_y)),
+      SafeNarrow(end_radius), colors.num_elements(), colors_array,
+      color_stops.data(), tile_mode, has_matrix ? &sk_matrix : nullptr);
+  // Just a sanity check, all gradient shaders should be thread-safe
+  FML_DCHECK(dl_shader_->isUIThreadSafe());
 }
 
 CanvasGradient::CanvasGradient() = default;
diff --git a/lib/ui/painting/gradient.h b/lib/ui/painting/gradient.h
index 5041ab27426f303a58009b875ed66c8ab5825f15..a0338d05fa5e7b4dc377fbf0b95bb336bddf09e8 100644
--- a/lib/ui/painting/gradient.h
+++ b/lib/ui/painting/gradient.h
@@ -5,16 +5,13 @@
 #ifndef FLUTTER_LIB_UI_PAINTING_GRADIENT_H_
 #define FLUTTER_LIB_UI_PAINTING_GRADIENT_H_
 
-#include "flutter/display_list/display_list_color_source.h"
+#include "flutter/display_list/effects/dl_color_source.h"
 #include "flutter/lib/ui/painting/matrix.h"
 #include "flutter/lib/ui/painting/shader.h"
 #include "third_party/tonic/typed_data/typed_list.h"
 
 namespace flutter {
 
-// TODO: update this if/when Skia adds Decal mode skbug.com/7638
-static_assert(kSkTileModeCount >= 3, "Need to update tile mode enum");
-
 class CanvasGradient : public Shader {
   DEFINE_WRAPPERTYPEINFO();
   FML_FRIEND_MAKE_REF_COUNTED(CanvasGradient);
@@ -26,7 +23,7 @@ class CanvasGradient : public Shader {
   void initLinear(const tonic::Float32List& end_points,
                   const tonic::Int32List& colors,
                   const tonic::Float32List& color_stops,
-                  SkTileMode tile_mode,
+                  DlTileMode tile_mode,
                   const tonic::Float64List& matrix4);
 
   void initRadial(double center_x,
@@ -34,14 +31,14 @@ class CanvasGradient : public Shader {
                   double radius,
                   const tonic::Int32List& colors,
                   const tonic::Float32List& color_stops,
-                  SkTileMode tile_mode,
+                  DlTileMode tile_mode,
                   const tonic::Float64List& matrix4);
 
   void initSweep(double center_x,
                  double center_y,
                  const tonic::Int32List& colors,
                  const tonic::Float32List& color_stops,
-                 SkTileMode tile_mode,
+                 DlTileMode tile_mode,
                  double start_angle,
                  double end_angle,
                  const tonic::Float64List& matrix4);
@@ -54,11 +51,12 @@ class CanvasGradient : public Shader {
                            double end_radius,
                            const tonic::Int32List& colors,
                            const tonic::Float32List& color_stops,
-                           SkTileMode tile_mode,
+                           DlTileMode tile_mode,
                            const tonic::Float64List& matrix4);
 
   std::shared_ptr<DlColorSource> shader(DlImageSampling sampling) override {
-    return dl_shader_->with_sampling(sampling);
+    // Gradient color sources do not have image sampling variants...
+    return dl_shader_;
   }
 
  private:
diff --git a/lib/ui/painting/image.cc b/lib/ui/painting/image.cc
index 2a9ab500c8e41a6e976e00c061eeecc307b669fe..b31ceb71ed73ad050f1a48ea2a3b92df8093bbc4 100644
--- a/lib/ui/painting/image.cc
+++ b/lib/ui/painting/image.cc
@@ -6,7 +6,11 @@
 
 #include <algorithm>
 #include <limits>
+#include "tonic/logging/dart_invoke.h"
 
+#if IMPELLER_SUPPORTS_RENDERING
+#include "flutter/lib/ui/painting/image_encoding_impeller.h"
+#endif
 #include "flutter/lib/ui/painting/image_encoding.h"
 #include "third_party/tonic/converter/dart_converter.h"
 #include "third_party/tonic/dart_args.h"
@@ -26,6 +30,11 @@ CanvasImage::CanvasImage() = default;
 
 CanvasImage::~CanvasImage() = default;
 
+Dart_Handle CanvasImage::CreateOuterWrapping() {
+  Dart_Handle ui_lib = Dart_LookupLibrary(tonic::ToDart("dart:ui"));
+  return tonic::DartInvokeField(ui_lib, "_wrapImage", {ToDart(this)});
+}
+
 Dart_Handle CanvasImage::toByteData(int format, Dart_Handle callback) {
   return EncodeImage(this, format, callback);
 }
@@ -35,4 +44,16 @@ void CanvasImage::dispose() {
   ClearDartWrapper();
 }
 
+int CanvasImage::colorSpace() {
+  if (image_->skia_image()) {
+    return ColorSpace::kSRGB;
+  } else if (image_->impeller_texture()) {
+#if IMPELLER_SUPPORTS_RENDERING
+    return ImageEncodingImpeller::GetColorSpace(image_->impeller_texture());
+#endif  // IMPELLER_SUPPORTS_RENDERING
+  }
+
+  return -1;
+}
+
 }  // namespace flutter
diff --git a/lib/ui/painting/image.h b/lib/ui/painting/image.h
index 35b710160ed54229db2eedd158eec6ae10804100..23ff80c99d4597cfeabe4c93abb72163e41af2bf 100644
--- a/lib/ui/painting/image.h
+++ b/lib/ui/painting/image.h
@@ -5,15 +5,19 @@
 #ifndef FLUTTER_LIB_UI_PAINTING_IMAGE_H_
 #define FLUTTER_LIB_UI_PAINTING_IMAGE_H_
 
-#include "flutter/display_list/display_list_image.h"
-#include "flutter/flow/skia_gpu_object.h"
+#include "flutter/display_list/image/dl_image.h"
 #include "flutter/lib/ui/dart_wrapper.h"
-#include "flutter/lib/ui/painting/display_list_image_gpu.h"
 #include "flutter/lib/ui/ui_dart_state.h"
 #include "third_party/skia/include/core/SkImage.h"
 
 namespace flutter {
 
+// Must be kept in sync with painting.dart.
+enum ColorSpace {
+  kSRGB,
+  kExtendedSRGB,
+};
+
 class CanvasImage final : public RefCountedDartWrappable<CanvasImage> {
   DEFINE_WRAPPERTYPEINFO();
   FML_FRIEND_MAKE_REF_COUNTED(CanvasImage);
@@ -25,6 +29,8 @@ class CanvasImage final : public RefCountedDartWrappable<CanvasImage> {
     return fml::MakeRefCounted<CanvasImage>();
   }
 
+  Dart_Handle CreateOuterWrapping();
+
   int width() { return image_ ? image_->width() : 0; }
 
   int height() { return image_ ? image_->height() : 0; }
@@ -35,7 +41,12 @@ class CanvasImage final : public RefCountedDartWrappable<CanvasImage> {
 
   sk_sp<DlImage> image() const { return image_; }
 
-  void set_image(sk_sp<DlImage> image) { image_ = image; }
+  void set_image(const sk_sp<DlImage>& image) {
+    FML_DCHECK(image->isUIThreadSafe());
+    image_ = image;
+  }
+
+  int colorSpace();
 
  private:
   CanvasImage();
diff --git a/lib/ui/painting/image_decoder.cc b/lib/ui/painting/image_decoder.cc
index dabdb2b7513ae450bdacd516183012d3380abfb4..b598de3823058c97ec36d14682ded81dcb88a40c 100644
--- a/lib/ui/painting/image_decoder.cc
+++ b/lib/ui/painting/image_decoder.cc
@@ -16,14 +16,16 @@ std::unique_ptr<ImageDecoder> ImageDecoder::Make(
     const Settings& settings,
     const TaskRunners& runners,
     std::shared_ptr<fml::ConcurrentTaskRunner> concurrent_task_runner,
-    fml::WeakPtr<IOManager> io_manager) {
+    fml::WeakPtr<IOManager> io_manager,
+    const std::shared_ptr<fml::SyncSwitch>& gpu_disabled_switch) {
 #if IMPELLER_SUPPORTS_RENDERING
   if (settings.enable_impeller) {
     return std::make_unique<ImageDecoderImpeller>(
         runners,                            //
         std::move(concurrent_task_runner),  //
-        std::move(io_manager)               //
-    );
+        std::move(io_manager),              //
+        settings.enable_wide_gamut,         //
+        gpu_disabled_switch);
   }
 #endif  // IMPELLER_SUPPORTS_RENDERING
   return std::make_unique<ImageDecoderSkia>(
diff --git a/lib/ui/painting/image_decoder.h b/lib/ui/painting/image_decoder.h
index e6e82d7146627a95e168bc5e3fb57d437d9b0329..ebb104efd44f7f9ae8d7696bb06b8bfad8d8603a 100644
--- a/lib/ui/painting/image_decoder.h
+++ b/lib/ui/painting/image_decoder.h
@@ -9,7 +9,7 @@
 
 #include "flutter/common/settings.h"
 #include "flutter/common/task_runners.h"
-#include "flutter/display_list/display_list_image.h"
+#include "flutter/display_list/image/dl_image.h"
 #include "flutter/fml/concurrent_message_loop.h"
 #include "flutter/lib/ui/io_manager.h"
 #include "flutter/lib/ui/painting/image_descriptor.h"
@@ -27,11 +27,12 @@ class ImageDecoder {
       const Settings& settings,
       const TaskRunners& runners,
       std::shared_ptr<fml::ConcurrentTaskRunner> concurrent_task_runner,
-      fml::WeakPtr<IOManager> io_manager);
+      fml::WeakPtr<IOManager> io_manager,
+      const std::shared_ptr<fml::SyncSwitch>& gpu_disabled_switch);
 
   virtual ~ImageDecoder();
 
-  using ImageResult = std::function<void(sk_sp<DlImage>)>;
+  using ImageResult = std::function<void(sk_sp<DlImage>, std::string)>;
 
   // Takes an image descriptor and returns a handle to a texture resident on the
   // GPU. All image decompression and resizes are done on a worker thread
diff --git a/lib/ui/painting/image_decoder_impeller.cc b/lib/ui/painting/image_decoder_impeller.cc
index 6e13772f6287f7da47aa1e1787e1cc079828c673..587960f2baf3c5ef907b8dcc295b74e9ed08321c 100644
--- a/lib/ui/painting/image_decoder_impeller.cc
+++ b/lib/ui/painting/image_decoder_impeller.cc
@@ -9,25 +9,118 @@
 #include "flutter/fml/closure.h"
 #include "flutter/fml/make_copyable.h"
 #include "flutter/fml/trace_event.h"
-#include "flutter/impeller/display_list/display_list_image_impeller.h"
-#include "flutter/impeller/renderer/allocator.h"
+#include "flutter/impeller/core/allocator.h"
+#include "flutter/impeller/core/texture.h"
+#include "flutter/impeller/display_list/dl_image_impeller.h"
 #include "flutter/impeller/renderer/command_buffer.h"
 #include "flutter/impeller/renderer/context.h"
-#include "flutter/impeller/renderer/texture.h"
 #include "flutter/lib/ui/painting/image_decoder_skia.h"
 #include "impeller/base/strings.h"
+#include "impeller/display_list/skia_conversions.h"
 #include "impeller/geometry/size.h"
-#include "include/core/SkSize.h"
+#include "third_party/skia/include/core/SkAlphaType.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "third_party/skia/include/core/SkColorSpace.h"
+#include "third_party/skia/include/core/SkColorType.h"
+#include "third_party/skia/include/core/SkImageInfo.h"
 #include "third_party/skia/include/core/SkMallocPixelRef.h"
+#include "third_party/skia/include/core/SkPixelRef.h"
 #include "third_party/skia/include/core/SkPixmap.h"
+#include "third_party/skia/include/core/SkPoint.h"
+#include "third_party/skia/include/core/SkSamplingOptions.h"
+#include "third_party/skia/include/core/SkSize.h"
 
 namespace flutter {
 
+class MallocDeviceBuffer : public impeller::DeviceBuffer {
+ public:
+  explicit MallocDeviceBuffer(impeller::DeviceBufferDescriptor desc)
+      : impeller::DeviceBuffer(desc) {
+    data_ = static_cast<uint8_t*>(malloc(desc.size));
+  }
+
+  ~MallocDeviceBuffer() override { free(data_); }
+
+  bool SetLabel(const std::string& label) override { return true; }
+
+  bool SetLabel(const std::string& label, impeller::Range range) override {
+    return true;
+  }
+
+  uint8_t* OnGetContents() const override { return data_; }
+
+  bool OnCopyHostBuffer(const uint8_t* source,
+                        impeller::Range source_range,
+                        size_t offset) override {
+    memcpy(data_ + offset, source + source_range.offset, source_range.length);
+    return true;
+  }
+
+ private:
+  uint8_t* data_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(MallocDeviceBuffer);
+};
+
+#ifdef FML_OS_ANDROID
+static constexpr bool kShouldUseMallocDeviceBuffer = true;
+#else
+static constexpr bool kShouldUseMallocDeviceBuffer = false;
+#endif  // FML_OS_ANDROID
+
+namespace {
+/**
+ *  Loads the gamut as a set of three points (triangle).
+ */
+void LoadGamut(SkPoint abc[3], const skcms_Matrix3x3& xyz) {
+  // rx = rX / (rX + rY + rZ)
+  // ry = rY / (rX + rY + rZ)
+  // gx, gy, bx, and gy are calculated similarly.
+  for (int index = 0; index < 3; index++) {
+    float sum = xyz.vals[index][0] + xyz.vals[index][1] + xyz.vals[index][2];
+    abc[index].fX = xyz.vals[index][0] / sum;
+    abc[index].fY = xyz.vals[index][1] / sum;
+  }
+}
+
+/**
+ *  Calculates the area of the triangular gamut.
+ */
+float CalculateArea(SkPoint abc[3]) {
+  const SkPoint& a = abc[0];
+  const SkPoint& b = abc[1];
+  const SkPoint& c = abc[2];
+  return 0.5f * fabsf(a.fX * b.fY + b.fX * c.fY - a.fX * c.fY - c.fX * b.fY -
+                      b.fX * a.fY);
+}
+
+// Note: This was calculated from SkColorSpace::MakeSRGB().
+static constexpr float kSrgbGamutArea = 0.0982f;
+
+// Source:
+// https://source.chromium.org/chromium/_/skia/skia.git/+/393fb1ec80f41d8ad7d104921b6920e69749fda1:src/codec/SkAndroidCodec.cpp;l=67;drc=46572b4d445f41943059d0e377afc6d6748cd5ca;bpv=1;bpt=0
+bool IsWideGamut(const SkColorSpace* color_space) {
+  if (!color_space) {
+    return false;
+  }
+  skcms_Matrix3x3 xyzd50;
+  color_space->toXYZD50(&xyzd50);
+  SkPoint rgb[3];
+  LoadGamut(rgb, xyzd50);
+  float area = CalculateArea(rgb);
+  return area > kSrgbGamutArea;
+}
+}  // namespace
+
 ImageDecoderImpeller::ImageDecoderImpeller(
     const TaskRunners& runners,
     std::shared_ptr<fml::ConcurrentTaskRunner> concurrent_task_runner,
-    const fml::WeakPtr<IOManager>& io_manager)
-    : ImageDecoder(runners, std::move(concurrent_task_runner), io_manager) {
+    const fml::WeakPtr<IOManager>& io_manager,
+    bool supports_wide_gamut,
+    const std::shared_ptr<fml::SyncSwitch>& gpu_disabled_switch)
+    : ImageDecoder(runners, std::move(concurrent_task_runner), io_manager),
+      supports_wide_gamut_(supports_wide_gamut),
+      gpu_disabled_switch_(gpu_disabled_switch) {
   std::promise<std::shared_ptr<impeller::Context>> context_promise;
   context_ = context_promise.get_future();
   runners_.GetIOTaskRunner()->PostTask(fml::MakeCopyable(
@@ -40,31 +133,29 @@ ImageDecoderImpeller::ImageDecoderImpeller(
 ImageDecoderImpeller::~ImageDecoderImpeller() = default;
 
 static SkColorType ChooseCompatibleColorType(SkColorType type) {
-  return kRGBA_8888_SkColorType;
+  switch (type) {
+    case kRGBA_F32_SkColorType:
+      return kRGBA_F16_SkColorType;
+    default:
+      return kRGBA_8888_SkColorType;
+  }
 }
 
 static SkAlphaType ChooseCompatibleAlphaType(SkAlphaType type) {
   return type;
 }
 
-static std::optional<impeller::PixelFormat> ToPixelFormat(SkColorType type) {
-  switch (type) {
-    case kRGBA_8888_SkColorType:
-      return impeller::PixelFormat::kR8G8B8A8UNormInt;
-    default:
-      return std::nullopt;
-  }
-  return std::nullopt;
-}
-
-std::shared_ptr<SkBitmap> ImageDecoderImpeller::DecompressTexture(
+DecompressResult ImageDecoderImpeller::DecompressTexture(
     ImageDescriptor* descriptor,
     SkISize target_size,
-    impeller::ISize max_texture_size) {
+    impeller::ISize max_texture_size,
+    bool supports_wide_gamut,
+    const std::shared_ptr<impeller::Allocator>& allocator) {
   TRACE_EVENT0("impeller", __FUNCTION__);
   if (!descriptor) {
-    FML_DLOG(ERROR) << "Invalid descriptor.";
-    return nullptr;
+    std::string decode_error("Invalid descriptor (should never happen)");
+    FML_DLOG(ERROR) << decode_error;
+    return DecompressResult{.decode_error = decode_error};
   }
 
   target_size.set(std::min(static_cast<int32_t>(max_texture_size.width),
@@ -76,8 +167,8 @@ std::shared_ptr<SkBitmap> ImageDecoderImpeller::DecompressTexture(
   auto decode_size = source_size;
   if (descriptor->is_compressed()) {
     decode_size = descriptor->get_scaled_dimensions(std::max(
-        static_cast<double>(target_size.width()) / source_size.width(),
-        static_cast<double>(target_size.height()) / source_size.height()));
+        static_cast<float>(target_size.width()) / source_size.width(),
+        static_cast<float>(target_size.height()) / source_size.height()));
   }
 
   //----------------------------------------------------------------------------
@@ -85,40 +176,80 @@ std::shared_ptr<SkBitmap> ImageDecoderImpeller::DecompressTexture(
   ///
 
   const auto base_image_info = descriptor->image_info();
-  const auto image_info =
-      base_image_info.makeWH(decode_size.width(), decode_size.height())
-          .makeColorType(ChooseCompatibleColorType(base_image_info.colorType()))
-          .makeAlphaType(
-              ChooseCompatibleAlphaType(base_image_info.alphaType()));
+  const bool is_wide_gamut =
+      supports_wide_gamut ? IsWideGamut(base_image_info.colorSpace()) : false;
+  SkAlphaType alpha_type =
+      ChooseCompatibleAlphaType(base_image_info.alphaType());
+  SkImageInfo image_info;
+  if (is_wide_gamut) {
+    SkColorType color_type = alpha_type == SkAlphaType::kOpaque_SkAlphaType
+                                 ? kBGR_101010x_XR_SkColorType
+                                 : kRGBA_F16_SkColorType;
+    image_info =
+        base_image_info.makeWH(decode_size.width(), decode_size.height())
+            .makeColorType(color_type)
+            .makeAlphaType(alpha_type)
+            .makeColorSpace(SkColorSpace::MakeSRGB());
+  } else {
+    image_info =
+        base_image_info.makeWH(decode_size.width(), decode_size.height())
+            .makeColorType(
+                ChooseCompatibleColorType(base_image_info.colorType()))
+            .makeAlphaType(alpha_type);
+  }
 
-  const auto pixel_format = ToPixelFormat(image_info.colorType());
+  const auto pixel_format =
+      impeller::skia_conversions::ToPixelFormat(image_info.colorType());
   if (!pixel_format.has_value()) {
-    FML_DLOG(ERROR) << "Codec pixel format not supported by Impeller.";
-    return nullptr;
+    std::string decode_error(impeller::SPrintF(
+        "Codec pixel format is not supported (SkColorType=%d)",
+        image_info.colorType()));
+    FML_DLOG(ERROR) << decode_error;
+    return DecompressResult{.decode_error = decode_error};
   }
 
   auto bitmap = std::make_shared<SkBitmap>();
+  bitmap->setInfo(image_info);
+  auto bitmap_allocator = std::make_shared<ImpellerAllocator>(allocator);
+
   if (descriptor->is_compressed()) {
-    if (!bitmap->tryAllocPixels(image_info)) {
-      FML_DLOG(ERROR)
-          << "Could not allocate intermediate for image decompression.";
-      return nullptr;
+    if (!bitmap->tryAllocPixels(bitmap_allocator.get())) {
+      std::string decode_error(
+          "Could not allocate intermediate for image decompression.");
+      FML_DLOG(ERROR) << decode_error;
+      return DecompressResult{.decode_error = decode_error};
     }
     // Decode the image into the image generator's closest supported size.
     if (!descriptor->get_pixels(bitmap->pixmap())) {
-      FML_DLOG(ERROR) << "Could not decompress image.";
-      return nullptr;
+      std::string decode_error("Could not decompress image.");
+      FML_DLOG(ERROR) << decode_error;
+      return DecompressResult{.decode_error = decode_error};
     }
   } else {
-    bitmap->setInfo(image_info);
+    auto temp_bitmap = std::make_shared<SkBitmap>();
+    temp_bitmap->setInfo(base_image_info);
     auto pixel_ref = SkMallocPixelRef::MakeWithData(
-        image_info, descriptor->row_bytes(), descriptor->data());
-    bitmap->setPixelRef(pixel_ref, 0, 0);
+        base_image_info, descriptor->row_bytes(), descriptor->data());
+    temp_bitmap->setPixelRef(pixel_ref, 0, 0);
+
+    if (!bitmap->tryAllocPixels(bitmap_allocator.get())) {
+      std::string decode_error(
+          "Could not allocate intermediate for pixel conversion.");
+      FML_DLOG(ERROR) << decode_error;
+      return DecompressResult{.decode_error = decode_error};
+    }
+    temp_bitmap->readPixels(bitmap->pixmap());
     bitmap->setImmutable();
   }
 
   if (bitmap->dimensions() == target_size) {
-    return bitmap;
+    auto buffer = bitmap_allocator->GetDeviceBuffer();
+    if (!buffer) {
+      return DecompressResult{.decode_error = "Unable to get device buffer"};
+    }
+    return DecompressResult{.device_buffer = buffer,
+                            .sk_bitmap = bitmap,
+                            .image_info = bitmap->info()};
   }
 
   //----------------------------------------------------------------------------
@@ -129,10 +260,13 @@ std::shared_ptr<SkBitmap> ImageDecoderImpeller::DecompressTexture(
   const auto scaled_image_info = image_info.makeDimensions(target_size);
 
   auto scaled_bitmap = std::make_shared<SkBitmap>();
-  if (!scaled_bitmap->tryAllocPixels(scaled_image_info)) {
-    FML_LOG(ERROR)
-        << "Could not allocate scaled bitmap for image decompression.";
-    return nullptr;
+  auto scaled_allocator = std::make_shared<ImpellerAllocator>(allocator);
+  scaled_bitmap->setInfo(scaled_image_info);
+  if (!scaled_bitmap->tryAllocPixels(scaled_allocator.get())) {
+    std::string decode_error(
+        "Could not allocate scaled bitmap for image decompression.");
+    FML_DLOG(ERROR) << decode_error;
+    return DecompressResult{.decode_error = decode_error};
   }
   if (!bitmap->pixmap().scalePixels(
           scaled_bitmap->pixmap(),
@@ -141,34 +275,149 @@ std::shared_ptr<SkBitmap> ImageDecoderImpeller::DecompressTexture(
   }
   scaled_bitmap->setImmutable();
 
-  return scaled_bitmap;
+  auto buffer = scaled_allocator->GetDeviceBuffer();
+  if (!buffer) {
+    return DecompressResult{.decode_error = "Unable to get device buffer"};
+  }
+  return DecompressResult{.device_buffer = buffer,
+                          .sk_bitmap = scaled_bitmap,
+                          .image_info = scaled_bitmap->info()};
 }
 
-sk_sp<DlImage> ImageDecoderImpeller::UploadTexture(
+/// Only call this method if the GPU is available.
+static std::pair<sk_sp<DlImage>, std::string> UnsafeUploadTextureToPrivate(
     const std::shared_ptr<impeller::Context>& context,
-    std::shared_ptr<SkBitmap> bitmap) {
+    const std::shared_ptr<impeller::DeviceBuffer>& buffer,
+    const SkImageInfo& image_info) {
+  const auto pixel_format =
+      impeller::skia_conversions::ToPixelFormat(image_info.colorType());
+  if (!pixel_format) {
+    std::string decode_error(impeller::SPrintF(
+        "Unsupported pixel format (SkColorType=%d)", image_info.colorType()));
+    FML_DLOG(ERROR) << decode_error;
+    return std::make_pair(nullptr, decode_error);
+  }
+
+  impeller::TextureDescriptor texture_descriptor;
+  texture_descriptor.storage_mode = impeller::StorageMode::kDevicePrivate;
+  texture_descriptor.format = pixel_format.value();
+  texture_descriptor.size = {image_info.width(), image_info.height()};
+  texture_descriptor.mip_count = texture_descriptor.size.MipCount();
+  texture_descriptor.compression_type = impeller::CompressionType::kLossy;
+
+  auto dest_texture =
+      context->GetResourceAllocator()->CreateTexture(texture_descriptor);
+  if (!dest_texture) {
+    std::string decode_error("Could not create Impeller texture.");
+    FML_DLOG(ERROR) << decode_error;
+    return std::make_pair(nullptr, decode_error);
+  }
+
+  dest_texture->SetLabel(
+      impeller::SPrintF("ui.Image(%p)", dest_texture.get()).c_str());
+
+  auto command_buffer = context->CreateCommandBuffer();
+  if (!command_buffer) {
+    std::string decode_error(
+        "Could not create command buffer for mipmap generation.");
+    FML_DLOG(ERROR) << decode_error;
+    return std::make_pair(nullptr, decode_error);
+  }
+  command_buffer->SetLabel("Mipmap Command Buffer");
+
+  auto blit_pass = command_buffer->CreateBlitPass();
+  if (!blit_pass) {
+    std::string decode_error(
+        "Could not create blit pass for mipmap generation.");
+    FML_DLOG(ERROR) << decode_error;
+    return std::make_pair(nullptr, decode_error);
+  }
+  blit_pass->SetLabel("Mipmap Blit Pass");
+  blit_pass->AddCopy(impeller::DeviceBuffer::AsBufferView(buffer),
+                     dest_texture);
+  if (texture_descriptor.size.MipCount() > 1) {
+    blit_pass->GenerateMipmap(dest_texture);
+  }
+
+  blit_pass->EncodeCommands(context->GetResourceAllocator());
+  if (!context->GetCommandQueue()->Submit({command_buffer}).ok()) {
+    std::string decode_error("Failed to submit blit pass command buffer.");
+    FML_DLOG(ERROR) << decode_error;
+    return std::make_pair(nullptr, decode_error);
+  }
+
+  return std::make_pair(
+      impeller::DlImageImpeller::Make(std::move(dest_texture)), std::string());
+}
+
+std::pair<sk_sp<DlImage>, std::string>
+ImageDecoderImpeller::UploadTextureToPrivate(
+    const std::shared_ptr<impeller::Context>& context,
+    const std::shared_ptr<impeller::DeviceBuffer>& buffer,
+    const SkImageInfo& image_info,
+    const std::shared_ptr<SkBitmap>& bitmap,
+    const std::shared_ptr<fml::SyncSwitch>& gpu_disabled_switch) {
   TRACE_EVENT0("impeller", __FUNCTION__);
-  if (!context || !bitmap) {
-    return nullptr;
+  if (!context) {
+    return std::make_pair(nullptr, "No Impeller context is available");
+  }
+  if (!buffer) {
+    return std::make_pair(nullptr, "No Impeller device buffer is available");
+  }
+
+  std::pair<sk_sp<DlImage>, std::string> result;
+  gpu_disabled_switch->Execute(
+      fml::SyncSwitch::Handlers()
+          .SetIfFalse([&result, context, buffer, image_info] {
+            result = UnsafeUploadTextureToPrivate(context, buffer, image_info);
+          })
+          .SetIfTrue([&result, context, bitmap, gpu_disabled_switch] {
+            // create_mips is false because we already know the GPU is disabled.
+            result =
+                UploadTextureToStorage(context, bitmap, gpu_disabled_switch,
+                                       impeller::StorageMode::kHostVisible,
+                                       /*create_mips=*/false);
+          }));
+  return result;
+}
+
+std::pair<sk_sp<DlImage>, std::string>
+ImageDecoderImpeller::UploadTextureToStorage(
+    const std::shared_ptr<impeller::Context>& context,
+    std::shared_ptr<SkBitmap> bitmap,
+    const std::shared_ptr<fml::SyncSwitch>& gpu_disabled_switch,
+    impeller::StorageMode storage_mode,
+    bool create_mips) {
+  TRACE_EVENT0("impeller", __FUNCTION__);
+  if (!context) {
+    return std::make_pair(nullptr, "No Impeller context is available");
+  }
+  if (!bitmap) {
+    return std::make_pair(nullptr, "No texture bitmap is available");
   }
   const auto image_info = bitmap->info();
-  const auto pixel_format = ToPixelFormat(image_info.colorType());
+  const auto pixel_format =
+      impeller::skia_conversions::ToPixelFormat(image_info.colorType());
   if (!pixel_format) {
-    FML_DLOG(ERROR) << "Pixel format unsupported by Impeller.";
-    return nullptr;
+    std::string decode_error(impeller::SPrintF(
+        "Unsupported pixel format (SkColorType=%d)", image_info.colorType()));
+    FML_DLOG(ERROR) << decode_error;
+    return std::make_pair(nullptr, decode_error);
   }
 
   impeller::TextureDescriptor texture_descriptor;
-  texture_descriptor.storage_mode = impeller::StorageMode::kHostVisible;
+  texture_descriptor.storage_mode = storage_mode;
   texture_descriptor.format = pixel_format.value();
   texture_descriptor.size = {image_info.width(), image_info.height()};
-  texture_descriptor.mip_count = texture_descriptor.size.MipCount();
+  texture_descriptor.mip_count =
+      create_mips ? texture_descriptor.size.MipCount() : 1;
 
   auto texture =
       context->GetResourceAllocator()->CreateTexture(texture_descriptor);
   if (!texture) {
-    FML_DLOG(ERROR) << "Could not create Impeller texture.";
-    return nullptr;
+    std::string decode_error("Could not create Impeller texture.");
+    FML_DLOG(ERROR) << decode_error;
+    return std::make_pair(nullptr, decode_error);
   }
 
   auto mapping = std::make_shared<fml::NonOwnedMapping>(
@@ -178,37 +427,52 @@ sk_sp<DlImage> ImageDecoderImpeller::UploadTexture(
   );
 
   if (!texture->SetContents(mapping)) {
-    FML_DLOG(ERROR) << "Could not copy contents into Impeller texture.";
-    return nullptr;
+    std::string decode_error("Could not copy contents into Impeller texture.");
+    FML_DLOG(ERROR) << decode_error;
+    return std::make_pair(nullptr, decode_error);
   }
 
   texture->SetLabel(impeller::SPrintF("ui.Image(%p)", texture.get()).c_str());
 
-  {
-    auto command_buffer = context->CreateCommandBuffer();
-    if (!command_buffer) {
-      FML_DLOG(ERROR)
-          << "Could not create command buffer for mipmap generation.";
-      return nullptr;
-    }
-    command_buffer->SetLabel("Mipmap Command Buffer");
-
-    auto blit_pass = command_buffer->CreateBlitPass();
-    if (!blit_pass) {
-      FML_DLOG(ERROR) << "Could not create blit pass for mipmap generation.";
-      return nullptr;
-    }
-    blit_pass->SetLabel("Mipmap Blit Pass");
-    blit_pass->GenerateMipmap(texture);
-
-    blit_pass->EncodeCommands(context->GetResourceAllocator());
-    if (!command_buffer->SubmitCommands()) {
-      FML_DLOG(ERROR) << "Failed to submit blit pass command buffer.";
-      return nullptr;
+  if (texture_descriptor.mip_count > 1u && create_mips) {
+    std::optional<std::string> decode_error;
+
+    // The only platform that needs mipmapping unconditionally is GL.
+    // GL based platforms never disable GPU access.
+    // This is only really needed for iOS.
+    gpu_disabled_switch->Execute(fml::SyncSwitch::Handlers().SetIfFalse(
+        [context, &texture, &decode_error] {
+          auto command_buffer = context->CreateCommandBuffer();
+          if (!command_buffer) {
+            decode_error =
+                "Could not create command buffer for mipmap generation.";
+            return;
+          }
+          command_buffer->SetLabel("Mipmap Command Buffer");
+
+          auto blit_pass = command_buffer->CreateBlitPass();
+          if (!blit_pass) {
+            decode_error = "Could not create blit pass for mipmap generation.";
+            return;
+          }
+          blit_pass->SetLabel("Mipmap Blit Pass");
+          blit_pass->GenerateMipmap(texture);
+
+          blit_pass->EncodeCommands(context->GetResourceAllocator());
+          if (!context->GetCommandQueue()->Submit({command_buffer}).ok()) {
+            decode_error = "Failed to submit blit pass command buffer.";
+            return;
+          }
+          command_buffer->WaitUntilScheduled();
+        }));
+    if (decode_error.has_value()) {
+      FML_DLOG(ERROR) << decode_error.value();
+      return std::make_pair(nullptr, decode_error.value());
     }
   }
 
-  return impeller::DlImageImpeller::Make(std::move(texture));
+  return std::make_pair(impeller::DlImageImpeller::Make(std::move(texture)),
+                        std::string());
 }
 
 // |ImageDecoder|
@@ -225,10 +489,10 @@ void ImageDecoderImpeller::Decode(fml::RefPtr<ImageDescriptor> descriptor,
   ImageResult result = [p_result,                               //
                         raw_descriptor,                         //
                         ui_runner = runners_.GetUITaskRunner()  //
-  ](auto image) {
-    ui_runner->PostTask([raw_descriptor, p_result, image]() {
+  ](auto image, auto decode_error) {
+    ui_runner->PostTask([raw_descriptor, p_result, image, decode_error]() {
       raw_descriptor->Release();
-      p_result(std::move(image));
+      p_result(std::move(image), decode_error);
     });
   };
 
@@ -237,31 +501,97 @@ void ImageDecoderImpeller::Decode(fml::RefPtr<ImageDescriptor> descriptor,
        context = context_.get(),                                  //
        target_size = SkISize::Make(target_width, target_height),  //
        io_runner = runners_.GetIOTaskRunner(),                    //
-       result                                                     //
-  ]() {
-        FML_CHECK(context) << "No valid impeller context";
+       result,
+       supports_wide_gamut = supports_wide_gamut_,  //
+       gpu_disabled_switch = gpu_disabled_switch_]() {
+        if (!context) {
+          result(nullptr, "No Impeller context is available");
+          return;
+        }
         auto max_size_supported =
             context->GetResourceAllocator()->GetMaxTextureSizeSupported();
 
         // Always decompress on the concurrent runner.
-        auto bitmap =
-            DecompressTexture(raw_descriptor, target_size, max_size_supported);
-        if (!bitmap) {
-          result(nullptr);
+        auto bitmap_result = DecompressTexture(
+            raw_descriptor, target_size, max_size_supported,
+            supports_wide_gamut, context->GetResourceAllocator());
+        if (!bitmap_result.device_buffer) {
+          result(nullptr, bitmap_result.decode_error);
           return;
         }
-        auto upload_texture_and_invoke_result = [result, context, bitmap]() {
-          result(UploadTexture(context, bitmap));
+        auto upload_texture_and_invoke_result = [result, context, bitmap_result,
+                                                 gpu_disabled_switch]() {
+          sk_sp<DlImage> image;
+          std::string decode_error;
+          if (!kShouldUseMallocDeviceBuffer &&
+              context->GetCapabilities()->SupportsBufferToTextureBlits()) {
+            std::tie(image, decode_error) = UploadTextureToPrivate(
+                context, bitmap_result.device_buffer, bitmap_result.image_info,
+                bitmap_result.sk_bitmap, gpu_disabled_switch);
+            result(image, decode_error);
+          } else {
+            std::tie(image, decode_error) = UploadTextureToStorage(
+                context, bitmap_result.sk_bitmap, gpu_disabled_switch,
+                impeller::StorageMode::kDevicePrivate,
+                /*create_mips=*/true);
+            result(image, decode_error);
+          }
         };
-        // Depending on whether the context has threading restrictions, stay on
-        // the concurrent runner to perform texture upload or move to an IO
-        // runner.
-        if (context->HasThreadingRestrictions()) {
-          io_runner->PostTask(upload_texture_and_invoke_result);
-        } else {
-          upload_texture_and_invoke_result();
-        }
+        // TODO(jonahwilliams):
+        // https://github.com/flutter/flutter/issues/123058 Technically we
+        // don't need to post tasks to the io runner, but without this
+        // forced serialization we can end up overloading the GPU and/or
+        // competing with raster workloads.
+        io_runner->PostTask(upload_texture_and_invoke_result);
       });
 }
 
+ImpellerAllocator::ImpellerAllocator(
+    std::shared_ptr<impeller::Allocator> allocator)
+    : allocator_(std::move(allocator)) {}
+
+std::shared_ptr<impeller::DeviceBuffer> ImpellerAllocator::GetDeviceBuffer()
+    const {
+  return buffer_;
+}
+
+bool ImpellerAllocator::allocPixelRef(SkBitmap* bitmap) {
+  if (!bitmap) {
+    return false;
+  }
+  const SkImageInfo& info = bitmap->info();
+  if (kUnknown_SkColorType == info.colorType() || info.width() < 0 ||
+      info.height() < 0 || !info.validRowBytes(bitmap->rowBytes())) {
+    return false;
+  }
+
+  impeller::DeviceBufferDescriptor descriptor;
+  descriptor.storage_mode = impeller::StorageMode::kHostVisible;
+  descriptor.size = ((bitmap->height() - 1) * bitmap->rowBytes()) +
+                    (bitmap->width() * bitmap->bytesPerPixel());
+
+  std::shared_ptr<impeller::DeviceBuffer> device_buffer =
+      kShouldUseMallocDeviceBuffer
+          ? std::make_shared<MallocDeviceBuffer>(descriptor)
+          : allocator_->CreateBuffer(descriptor);
+  if (!device_buffer) {
+    return false;
+  }
+
+  struct ImpellerPixelRef final : public SkPixelRef {
+    ImpellerPixelRef(int w, int h, void* s, size_t r)
+        : SkPixelRef(w, h, s, r) {}
+
+    ~ImpellerPixelRef() override {}
+  };
+
+  auto pixel_ref = sk_sp<SkPixelRef>(
+      new ImpellerPixelRef(info.width(), info.height(),
+                           device_buffer->OnGetContents(), bitmap->rowBytes()));
+
+  bitmap->setPixelRef(std::move(pixel_ref), 0, 0);
+  buffer_ = std::move(device_buffer);
+  return true;
+}
+
 }  // namespace flutter
diff --git a/lib/ui/painting/image_decoder_impeller.h b/lib/ui/painting/image_decoder_impeller.h
index fdaa0a600f00663be2fcc84338ba98cf9764e090..063327b490d03558de6e8efdfe5d4806b5bdb3c2 100644
--- a/lib/ui/painting/image_decoder_impeller.h
+++ b/lib/ui/painting/image_decoder_impeller.h
@@ -9,20 +9,49 @@
 
 #include "flutter/fml/macros.h"
 #include "flutter/lib/ui/painting/image_decoder.h"
+#include "impeller/core/formats.h"
 #include "impeller/geometry/size.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 
 namespace impeller {
 class Context;
+class Allocator;
+class DeviceBuffer;
 }  // namespace impeller
 
 namespace flutter {
 
+class ImpellerAllocator : public SkBitmap::Allocator {
+ public:
+  explicit ImpellerAllocator(std::shared_ptr<impeller::Allocator> allocator);
+
+  ~ImpellerAllocator() = default;
+
+  // |Allocator|
+  bool allocPixelRef(SkBitmap* bitmap) override;
+
+  std::shared_ptr<impeller::DeviceBuffer> GetDeviceBuffer() const;
+
+ private:
+  std::shared_ptr<impeller::Allocator> allocator_;
+  std::shared_ptr<impeller::DeviceBuffer> buffer_;
+};
+
+struct DecompressResult {
+  std::shared_ptr<impeller::DeviceBuffer> device_buffer;
+  std::shared_ptr<SkBitmap> sk_bitmap;
+  SkImageInfo image_info;
+  std::string decode_error;
+};
+
 class ImageDecoderImpeller final : public ImageDecoder {
  public:
   ImageDecoderImpeller(
       const TaskRunners& runners,
       std::shared_ptr<fml::ConcurrentTaskRunner> concurrent_task_runner,
-      const fml::WeakPtr<IOManager>& io_manager);
+      const fml::WeakPtr<IOManager>& io_manager,
+      bool supports_wide_gamut,
+      const std::shared_ptr<fml::SyncSwitch>& gpu_disabled_switch);
 
   ~ImageDecoderImpeller() override;
 
@@ -32,18 +61,48 @@ class ImageDecoderImpeller final : public ImageDecoder {
               uint32_t target_height,
               const ImageResult& result) override;
 
-  static std::shared_ptr<SkBitmap> DecompressTexture(
+  static DecompressResult DecompressTexture(
       ImageDescriptor* descriptor,
       SkISize target_size,
-      impeller::ISize max_texture_size);
+      impeller::ISize max_texture_size,
+      bool supports_wide_gamut,
+      const std::shared_ptr<impeller::Allocator>& allocator);
+
+  /// @brief Create a device private texture from the provided host buffer.
+  ///        This method is only suported on the metal backend.
+  /// @param context    The Impeller graphics context.
+  /// @param buffer     A host buffer containing the image to be uploaded.
+  /// @param image_info Format information about the particular image.
+  /// @param bitmap      A bitmap containg the image to be uploaded.
+  /// @param gpu_disabled_switch Whether the GPU is available command encoding.
+  /// @return           A DlImage.
+  static std::pair<sk_sp<DlImage>, std::string> UploadTextureToPrivate(
+      const std::shared_ptr<impeller::Context>& context,
+      const std::shared_ptr<impeller::DeviceBuffer>& buffer,
+      const SkImageInfo& image_info,
+      const std::shared_ptr<SkBitmap>& bitmap,
+      const std::shared_ptr<fml::SyncSwitch>& gpu_disabled_switch);
 
-  static sk_sp<DlImage> UploadTexture(
+  /// @brief Create a host visible texture from the provided bitmap.
+  /// @param context     The Impeller graphics context.
+  /// @param bitmap      A bitmap containg the image to be uploaded.
+  /// @param create_mips Whether mipmaps should be generated for the given
+  /// image.
+  /// @param gpu_disabled_switch Whether the GPU is available for mipmap
+  /// creation.
+  /// @return            A DlImage.
+  static std::pair<sk_sp<DlImage>, std::string> UploadTextureToStorage(
       const std::shared_ptr<impeller::Context>& context,
-      std::shared_ptr<SkBitmap> bitmap);
+      std::shared_ptr<SkBitmap> bitmap,
+      const std::shared_ptr<fml::SyncSwitch>& gpu_disabled_switch,
+      impeller::StorageMode storage_mode,
+      bool create_mips = true);
 
  private:
   using FutureContext = std::shared_future<std::shared_ptr<impeller::Context>>;
   FutureContext context_;
+  const bool supports_wide_gamut_;
+  std::shared_ptr<fml::SyncSwitch> gpu_disabled_switch_;
 
   FML_DISALLOW_COPY_AND_ASSIGN(ImageDecoderImpeller);
 };
diff --git a/lib/ui/painting/image_decoder_no_gl_unittests.cc b/lib/ui/painting/image_decoder_no_gl_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..975282328b48b4caa5687ddf3b805dddad8c6dd2
--- /dev/null
+++ b/lib/ui/painting/image_decoder_no_gl_unittests.cc
@@ -0,0 +1,190 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/lib/ui/painting/image_decoder_no_gl_unittests.h"
+
+#include "flutter/fml/endianness.h"
+
+namespace flutter {
+namespace testing {
+
+// Tests are disabled for fuchsia.
+#if defined(OS_FUCHSIA)
+#pragma GCC diagnostic ignored "-Wunreachable-code"
+#endif
+
+namespace {
+
+bool IsPngWithPLTE(const uint8_t* bytes, size_t size) {
+  constexpr std::string_view kPngMagic = "\x89PNG\x0d\x0a\x1a\x0a";
+  constexpr std::string_view kPngPlte = "PLTE";
+  constexpr uint32_t kLengthBytes = 4;
+  constexpr uint32_t kTypeBytes = 4;
+  constexpr uint32_t kCrcBytes = 4;
+
+  if (size < kPngMagic.size()) {
+    return false;
+  }
+
+  if (memcmp(bytes, kPngMagic.data(), kPngMagic.size()) != 0) {
+    return false;
+  }
+
+  const uint8_t* end = bytes + size;
+  const uint8_t* loc = bytes + kPngMagic.size();
+  while (loc + kLengthBytes + kTypeBytes <= end) {
+    uint32_t chunk_length =
+        fml::BigEndianToArch(*reinterpret_cast<const uint32_t*>(loc));
+
+    if (memcmp(loc + kLengthBytes, kPngPlte.data(), kPngPlte.size()) == 0) {
+      return true;
+    }
+
+    loc += kLengthBytes + kTypeBytes + chunk_length + kCrcBytes;
+  }
+
+  return false;
+}
+
+}  // namespace
+
+float HalfToFloat(uint16_t half) {
+  switch (half) {
+    case 0x7c00:
+      return std::numeric_limits<float>::infinity();
+    case 0xfc00:
+      return -std::numeric_limits<float>::infinity();
+  }
+  bool negative = half >> 15;
+  uint16_t exponent = (half >> 10) & 0x1f;
+  uint16_t fraction = half & 0x3ff;
+  float fExponent = exponent - 15.0f;
+  float fFraction = static_cast<float>(fraction) / 1024.f;
+  float pow_value = powf(2.0f, fExponent);
+  return (negative ? -1.f : 1.f) * pow_value * (1.0f + fFraction);
+}
+
+float DecodeBGR10(uint32_t x) {
+  const float max = 1.25098f;
+  const float min = -0.752941f;
+  const float intercept = min;
+  const float slope = (max - min) / 1024.0f;
+  return (x * slope) + intercept;
+}
+
+TEST(ImageDecoderNoGLTest, ImpellerWideGamutDisplayP3) {
+#if defined(OS_FUCHSIA)
+  GTEST_SKIP() << "Fuchsia can't load the test fixtures.";
+#endif
+  auto data = flutter::testing::OpenFixtureAsSkData("DisplayP3Logo.png");
+  auto image = SkImages::DeferredFromEncodedData(data);
+  ASSERT_TRUE(image != nullptr);
+  ASSERT_EQ(SkISize::Make(100, 100), image->dimensions());
+
+  ImageGeneratorRegistry registry;
+  std::shared_ptr<ImageGenerator> generator =
+      registry.CreateCompatibleGenerator(data);
+  ASSERT_TRUE(generator);
+
+  auto descriptor = fml::MakeRefCounted<ImageDescriptor>(std::move(data),
+                                                         std::move(generator));
+
+  ASSERT_FALSE(
+      IsPngWithPLTE(descriptor->data()->bytes(), descriptor->data()->size()));
+
+#if IMPELLER_SUPPORTS_RENDERING
+  std::shared_ptr<impeller::Allocator> allocator =
+      std::make_shared<impeller::TestImpellerAllocator>();
+  std::optional<DecompressResult> wide_result =
+      ImageDecoderImpeller::DecompressTexture(
+          descriptor.get(), SkISize::Make(100, 100), {100, 100},
+          /*supports_wide_gamut=*/true, allocator);
+  ASSERT_TRUE(wide_result.has_value());
+  ASSERT_EQ(wide_result->image_info.colorType(), kRGBA_F16_SkColorType);
+  ASSERT_TRUE(wide_result->image_info.colorSpace()->isSRGB());
+
+  const SkPixmap& wide_pixmap = wide_result->sk_bitmap->pixmap();
+  const uint16_t* half_ptr = static_cast<const uint16_t*>(wide_pixmap.addr());
+  bool found_deep_red = false;
+  for (int i = 0; i < wide_pixmap.width() * wide_pixmap.height(); ++i) {
+    float red = HalfToFloat(*half_ptr++);
+    float green = HalfToFloat(*half_ptr++);
+    float blue = HalfToFloat(*half_ptr++);
+    half_ptr++;  // alpha
+    if (fabsf(red - 1.0931f) < 0.01f && fabsf(green - -0.2268f) < 0.01f &&
+        fabsf(blue - -0.1501f) < 0.01f) {
+      found_deep_red = true;
+      break;
+    }
+  }
+
+  ASSERT_TRUE(found_deep_red);
+  std::optional<DecompressResult> narrow_result =
+      ImageDecoderImpeller::DecompressTexture(
+          descriptor.get(), SkISize::Make(100, 100), {100, 100},
+          /*supports_wide_gamut=*/false, allocator);
+
+  ASSERT_TRUE(narrow_result.has_value());
+  ASSERT_EQ(narrow_result->image_info.colorType(), kRGBA_8888_SkColorType);
+#endif  // IMPELLER_SUPPORTS_RENDERING
+}
+
+TEST(ImageDecoderNoGLTest, ImpellerWideGamutIndexedPng) {
+#if defined(OS_FUCHSIA)
+  GTEST_SKIP() << "Fuchsia can't load the test fixtures.";
+#endif
+  auto data = flutter::testing::OpenFixtureAsSkData("WideGamutIndexed.png");
+  auto image = SkImages::DeferredFromEncodedData(data);
+  ASSERT_TRUE(image != nullptr);
+  ASSERT_EQ(SkISize::Make(100, 100), image->dimensions());
+
+  ImageGeneratorRegistry registry;
+  std::shared_ptr<ImageGenerator> generator =
+      registry.CreateCompatibleGenerator(data);
+  ASSERT_TRUE(generator);
+
+  auto descriptor = fml::MakeRefCounted<ImageDescriptor>(std::move(data),
+                                                         std::move(generator));
+
+  ASSERT_TRUE(
+      IsPngWithPLTE(descriptor->data()->bytes(), descriptor->data()->size()));
+
+#if IMPELLER_SUPPORTS_RENDERING
+  std::shared_ptr<impeller::Allocator> allocator =
+      std::make_shared<impeller::TestImpellerAllocator>();
+  std::optional<DecompressResult> wide_result =
+      ImageDecoderImpeller::DecompressTexture(
+          descriptor.get(), SkISize::Make(100, 100), {100, 100},
+          /*supports_wide_gamut=*/true, allocator);
+  ASSERT_EQ(wide_result->image_info.colorType(), kBGR_101010x_XR_SkColorType);
+  ASSERT_TRUE(wide_result->image_info.colorSpace()->isSRGB());
+
+  const SkPixmap& wide_pixmap = wide_result->sk_bitmap->pixmap();
+  const uint32_t* pixel_ptr = static_cast<const uint32_t*>(wide_pixmap.addr());
+  bool found_deep_red = false;
+  for (int i = 0; i < wide_pixmap.width() * wide_pixmap.height(); ++i) {
+    uint32_t pixel = *pixel_ptr++;
+    float blue = DecodeBGR10((pixel >> 0) & 0x3ff);
+    float green = DecodeBGR10((pixel >> 10) & 0x3ff);
+    float red = DecodeBGR10((pixel >> 20) & 0x3ff);
+    if (fabsf(red - 1.0931f) < 0.01f && fabsf(green - -0.2268f) < 0.01f &&
+        fabsf(blue - -0.1501f) < 0.01f) {
+      found_deep_red = true;
+      break;
+    }
+  }
+
+  ASSERT_TRUE(found_deep_red);
+  std::optional<DecompressResult> narrow_result =
+      ImageDecoderImpeller::DecompressTexture(
+          descriptor.get(), SkISize::Make(100, 100), {100, 100},
+          /*supports_wide_gamut=*/false, allocator);
+
+  ASSERT_TRUE(narrow_result.has_value());
+  ASSERT_EQ(narrow_result->image_info.colorType(), kRGBA_8888_SkColorType);
+#endif  // IMPELLER_SUPPORTS_RENDERING
+}
+
+}  // namespace testing
+}  // namespace flutter
diff --git a/lib/ui/painting/image_decoder_no_gl_unittests.h b/lib/ui/painting/image_decoder_no_gl_unittests.h
new file mode 100644
index 0000000000000000000000000000000000000000..0376f6a2cd72c9b7118e1cf5b5e1f3e0216bbd34
--- /dev/null
+++ b/lib/ui/painting/image_decoder_no_gl_unittests.h
@@ -0,0 +1,106 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_LIB_UI_PAINTING_IMAGE_DECODER_NO_GL_UNITTESTS_H_
+#define FLUTTER_LIB_UI_PAINTING_IMAGE_DECODER_NO_GL_UNITTESTS_H_
+
+#include <stdint.h>
+
+#include "flutter/impeller/core/allocator.h"
+#include "flutter/impeller/core/device_buffer.h"
+#include "flutter/impeller/core/formats.h"
+#include "flutter/impeller/geometry/size.h"
+#include "flutter/lib/ui/painting/image_decoder.h"
+#include "flutter/lib/ui/painting/image_decoder_impeller.h"
+#include "flutter/testing/testing.h"
+
+namespace impeller {
+
+class TestImpellerTexture : public Texture {
+ public:
+  explicit TestImpellerTexture(TextureDescriptor desc) : Texture(desc) {}
+
+  void SetLabel(std::string_view label) override {}
+  bool IsValid() const override { return true; }
+  ISize GetSize() const { return GetTextureDescriptor().size; }
+
+  bool OnSetContents(const uint8_t* contents, size_t length, size_t slice) {
+    return true;
+  }
+  bool OnSetContents(std::shared_ptr<const fml::Mapping> mapping,
+                     size_t slice) {
+    return true;
+  }
+};
+
+class TestImpellerDeviceBuffer : public DeviceBuffer {
+ public:
+  explicit TestImpellerDeviceBuffer(DeviceBufferDescriptor desc)
+      : DeviceBuffer(desc) {
+    bytes_ = static_cast<uint8_t*>(malloc(desc.size));
+  }
+
+  ~TestImpellerDeviceBuffer() { free(bytes_); }
+
+ private:
+  std::shared_ptr<Texture> AsTexture(Allocator& allocator,
+                                     const TextureDescriptor& descriptor,
+                                     uint16_t row_bytes) const override {
+    return nullptr;
+  }
+
+  bool SetLabel(const std::string& label) override { return true; }
+
+  bool SetLabel(const std::string& label, Range range) override { return true; }
+
+  uint8_t* OnGetContents() const override { return bytes_; }
+
+  bool OnCopyHostBuffer(const uint8_t* source,
+                        Range source_range,
+                        size_t offset) override {
+    for (auto i = source_range.offset; i < source_range.length; i++, offset++) {
+      bytes_[offset] = source[i];
+    }
+    return true;
+  }
+
+  uint8_t* bytes_;
+};
+
+class TestImpellerAllocator : public impeller::Allocator {
+ public:
+  TestImpellerAllocator() {}
+
+  ~TestImpellerAllocator() = default;
+
+ private:
+  uint16_t MinimumBytesPerRow(PixelFormat format) const override { return 0; }
+
+  ISize GetMaxTextureSizeSupported() const override {
+    return ISize{2048, 2048};
+  }
+
+  std::shared_ptr<DeviceBuffer> OnCreateBuffer(
+      const DeviceBufferDescriptor& desc) override {
+    return std::make_shared<TestImpellerDeviceBuffer>(desc);
+  }
+
+  std::shared_ptr<Texture> OnCreateTexture(
+      const TextureDescriptor& desc) override {
+    return std::make_shared<TestImpellerTexture>(desc);
+  }
+};
+
+}  // namespace impeller
+
+namespace flutter {
+namespace testing {
+
+float HalfToFloat(uint16_t half);
+float DecodeBGR10(uint32_t x);
+
+}  // namespace testing
+}  // namespace flutter
+
+#endif  // FLUTTER_LIB_UI_PAINTING_IMAGE_DECODER_NO_GL_UNITTESTS_H_
diff --git a/lib/ui/painting/image_decoder_skia.cc b/lib/ui/painting/image_decoder_skia.cc
index 2dc6891c86d1f2ee5b5d9a7d26175f959dda50bd..6584a1c32f0cf2e2c0bc6f96d30bf5f55e6d86b9 100644
--- a/lib/ui/painting/image_decoder_skia.cc
+++ b/lib/ui/painting/image_decoder_skia.cc
@@ -9,6 +9,9 @@
 #include "flutter/fml/logging.h"
 #include "flutter/fml/make_copyable.h"
 #include "flutter/lib/ui/painting/display_list_image_gpu.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "third_party/skia/include/core/SkImage.h"
+#include "third_party/skia/include/gpu/ganesh/SkImageGanesh.h"
 
 namespace flutter {
 
@@ -61,7 +64,7 @@ static sk_sp<SkImage> ResizeRasterImage(const sk_sp<SkImage>& image,
   // instead of copying.
   scaled_bitmap.setImmutable();
 
-  auto scaled_image = SkImage::MakeFromBitmap(scaled_bitmap);
+  auto scaled_image = SkImages::RasterFromBitmap(scaled_bitmap);
   if (!scaled_image) {
     FML_LOG(ERROR) << "Could not create a scaled image from a scaled bitmap.";
     return nullptr;
@@ -77,7 +80,7 @@ static sk_sp<SkImage> ImageFromDecompressedData(
     const fml::tracing::TraceFlow& flow) {
   TRACE_EVENT0("flutter", __FUNCTION__);
   flow.Step(__FUNCTION__);
-  auto image = SkImage::MakeRasterData(
+  auto image = SkImages::RasterFromData(
       descriptor->image_info(), descriptor->data(), descriptor->row_bytes());
 
   if (!image) {
@@ -113,9 +116,9 @@ sk_sp<SkImage> ImageDecoderSkia::ImageFromCompressedData(
                                       static_cast<int32_t>(target_height)};
 
   auto decode_dimensions = descriptor->get_scaled_dimensions(
-      std::max(static_cast<double>(resized_dimensions.width()) /
+      std::max(static_cast<float>(resized_dimensions.width()) /
                    source_dimensions.width(),
-               static_cast<double>(resized_dimensions.height()) /
+               static_cast<float>(resized_dimensions.height()) /
                    source_dimensions.height()));
 
   // If the codec supports efficient sub-pixel decoding, decoded at a resolution
@@ -137,7 +140,7 @@ sk_sp<SkImage> ImageDecoderSkia::ImageFromCompressedData(
       // the pixels instead of copying.
       scaled_bitmap.setImmutable();
 
-      auto decoded_image = SkImage::MakeFromBitmap(scaled_bitmap);
+      auto decoded_image = SkImages::RasterFromBitmap(scaled_bitmap);
       FML_DCHECK(decoded_image);
       if (!decoded_image) {
         FML_LOG(ERROR)
@@ -184,9 +187,9 @@ static SkiaGPUObject<SkImage> UploadRasterImage(
       fml::SyncSwitch::Handlers()
           .SetIfTrue([&result, &pixmap, &image] {
             SkSafeRef(image.get());
-            sk_sp<SkImage> texture_image = SkImage::MakeFromRaster(
+            sk_sp<SkImage> texture_image = SkImages::RasterFromPixmap(
                 pixmap,
-                [](const void* pixels, SkImage::ReleaseContext context) {
+                [](const void* pixels, SkImages::ReleaseContext context) {
                   SkSafeUnref(static_cast<SkImage*>(context));
                 },
                 image.get());
@@ -195,12 +198,13 @@ static SkiaGPUObject<SkImage> UploadRasterImage(
           .SetIfFalse([&result, context = io_manager->GetResourceContext(),
                        &pixmap, queue = io_manager->GetSkiaUnrefQueue()] {
             TRACE_EVENT0("flutter", "MakeCrossContextImageFromPixmap");
-            sk_sp<SkImage> texture_image = SkImage::MakeCrossContextFromPixmap(
-                context.get(),  // context
-                pixmap,         // pixmap
-                true,           // buildMips,
-                true            // limitToMaxTextureSize
-            );
+            sk_sp<SkImage> texture_image =
+                SkImages::CrossContextTextureFromPixmap(
+                    context.get(),  // context
+                    pixmap,         // pixmap
+                    true,           // buildMips,
+                    true            // limitToMaxTextureSize
+                );
             if (!texture_image) {
               FML_LOG(ERROR) << "Could not make x-context image.";
               result = {};
@@ -250,7 +254,7 @@ void ImageDecoderSkia::Decode(fml::RefPtr<ImageDescriptor> descriptor_ref_ptr,
               // terminate without a base trace. Add one explicitly.
               TRACE_EVENT0("flutter", "ImageDecodeCallback");
               flow.End();
-              callback(DlImageGPU::Make(std::move(image)));
+              callback(DlImageGPU::Make(std::move(image)), {});
               raw_descriptor->Release();
             }));
       };
diff --git a/lib/ui/painting/image_decoder_unittests.cc b/lib/ui/painting/image_decoder_unittests.cc
index 7a5e3cfd0aa00de89a699bfeabae0fd8fb27b1dd..88f43d915a5aff3cec981b87d52e3f4f091b9fbe 100644
--- a/lib/ui/painting/image_decoder_unittests.cc
+++ b/lib/ui/painting/image_decoder_unittests.cc
@@ -5,8 +5,13 @@
 #include "flutter/common/task_runners.h"
 #include "flutter/fml/mapping.h"
 #include "flutter/fml/synchronization/waitable_event.h"
+#include "flutter/impeller/core/allocator.h"
+#include "flutter/impeller/core/device_buffer.h"
+#include "flutter/impeller/geometry/size.h"
+#include "flutter/impeller/renderer/context.h"
 #include "flutter/lib/ui/painting/image_decoder.h"
 #include "flutter/lib/ui/painting/image_decoder_impeller.h"
+#include "flutter/lib/ui/painting/image_decoder_no_gl_unittests.h"
 #include "flutter/lib/ui/painting/image_decoder_skia.h"
 #include "flutter/lib/ui/painting/multi_frame_codec.h"
 #include "flutter/runtime/dart_vm.h"
@@ -18,11 +23,69 @@
 #include "flutter/testing/test_dart_native_resolver.h"
 #include "flutter/testing/test_gl_surface.h"
 #include "flutter/testing/testing.h"
+#include "fml/logging.h"
+#include "impeller/renderer/command_queue.h"
 #include "third_party/skia/include/codec/SkCodecAnimation.h"
 #include "third_party/skia/include/core/SkData.h"
-#include "third_party/skia/include/core/SkEncodedImageFormat.h"
+#include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkImageInfo.h"
 #include "third_party/skia/include/core/SkSize.h"
+#include "third_party/skia/include/encode/SkPngEncoder.h"
+
+// CREATE_NATIVE_ENTRY is leaky by design
+// NOLINTBEGIN(clang-analyzer-core.StackAddressEscape)
+
+namespace impeller {
+
+class TestImpellerContext : public impeller::Context {
+ public:
+  TestImpellerContext() = default;
+
+  BackendType GetBackendType() const override { return BackendType::kMetal; }
+
+  std::string DescribeGpuModel() const override { return "TestGpu"; }
+
+  bool IsValid() const override { return true; }
+
+  const std::shared_ptr<const Capabilities>& GetCapabilities() const override {
+    return capabilities_;
+  }
+
+  std::shared_ptr<Allocator> GetResourceAllocator() const override {
+    return std::make_shared<TestImpellerAllocator>();
+  }
+
+  std::shared_ptr<ShaderLibrary> GetShaderLibrary() const override {
+    return nullptr;
+  }
+
+  std::shared_ptr<SamplerLibrary> GetSamplerLibrary() const override {
+    return nullptr;
+  }
+
+  std::shared_ptr<PipelineLibrary> GetPipelineLibrary() const override {
+    return nullptr;
+  }
+
+  std::shared_ptr<CommandQueue> GetCommandQueue() const override {
+    FML_UNREACHABLE();
+    return std::make_shared<CommandQueue>();
+  }
+
+  std::shared_ptr<CommandBuffer> CreateCommandBuffer() const override {
+    command_buffer_count_ += 1;
+    return nullptr;
+  }
+
+  void Shutdown() override {}
+
+  mutable size_t command_buffer_count_ = 0;
+
+ private:
+  std::shared_ptr<const Capabilities> capabilities_;
+};
+
+}  // namespace impeller
 
 namespace flutter {
 namespace testing {
@@ -32,6 +95,7 @@ class TestIOManager final : public IOManager {
   explicit TestIOManager(const fml::RefPtr<fml::TaskRunner>& task_runner,
                          bool has_gpu_context = true)
       : gl_surface_(SkISize::Make(1, 1)),
+        impeller_context_(std::make_shared<impeller::TestImpellerContext>()),
         gl_context_(has_gpu_context ? gl_surface_.CreateGrContext() : nullptr),
         weak_gl_context_factory_(
             has_gpu_context
@@ -83,10 +147,20 @@ class TestIOManager final : public IOManager {
     return is_gpu_disabled_sync_switch_;
   }
 
+  // |IOManager|
+  std::shared_ptr<impeller::Context> GetImpellerContext() const override {
+    return impeller_context_;
+  }
+
+  void SetGpuDisabled(bool disabled) {
+    is_gpu_disabled_sync_switch_->SetSwitch(disabled);
+  }
+
   bool did_access_is_gpu_disabled_sync_switch_ = false;
 
  private:
   TestGLSurface gl_surface_;
+  std::shared_ptr<impeller::Context> impeller_context_;
   sk_sp<GrDirectContext> gl_context_;
   std::unique_ptr<fml::WeakPtrFactory<GrDirectContext>>
       weak_gl_context_factory_;
@@ -99,36 +173,6 @@ class TestIOManager final : public IOManager {
   FML_DISALLOW_COPY_AND_ASSIGN(TestIOManager);
 };
 
-static sk_sp<SkData> OpenFixtureAsSkData(const char* name) {
-  auto fixtures_directory =
-      fml::OpenDirectory(GetFixturesPath(), false, fml::FilePermission::kRead);
-  if (!fixtures_directory.is_valid()) {
-    return nullptr;
-  }
-
-  auto fixture_mapping =
-      fml::FileMapping::CreateReadOnly(fixtures_directory, name);
-
-  if (!fixture_mapping) {
-    return nullptr;
-  }
-
-  SkData::ReleaseProc on_release = [](const void* ptr, void* context) -> void {
-    delete reinterpret_cast<fml::FileMapping*>(context);
-  };
-
-  auto data = SkData::MakeWithProc(fixture_mapping->GetMapping(),
-                                   fixture_mapping->GetSize(), on_release,
-                                   fixture_mapping.get());
-
-  if (!data) {
-    return nullptr;
-  }
-  // The data is now owned by Skia.
-  fixture_mapping.release();
-  return data;
-}
-
 class ImageDecoderFixtureTest : public FixtureTest {};
 
 TEST_F(ImageDecoderFixtureTest, CanCreateImageDecoder) {
@@ -146,7 +190,8 @@ TEST_F(ImageDecoderFixtureTest, CanCreateImageDecoder) {
     TestIOManager manager(runners.GetIOTaskRunner());
     Settings settings;
     auto decoder = ImageDecoder::Make(settings, runners, loop->GetTaskRunner(),
-                                      manager.GetWeakIOManager());
+                                      manager.GetWeakIOManager(),
+                                      std::make_shared<fml::SyncSwitch>());
     ASSERT_NE(decoder, nullptr);
   });
 }
@@ -162,7 +207,7 @@ class UnknownImageGenerator : public ImageGenerator {
 
   unsigned int GetPlayCount() const { return 1; }
 
-  const ImageGenerator::FrameInfo GetFrameInfo(unsigned int frame_index) const {
+  const ImageGenerator::FrameInfo GetFrameInfo(unsigned int frame_index) {
     return {std::nullopt, 0, SkCodecAnimation::DisposalMethod::kKeep};
   }
 
@@ -197,16 +242,18 @@ TEST_F(ImageDecoderFixtureTest, InvalidImageResultsError) {
     TestIOManager manager(runners.GetIOTaskRunner());
     Settings settings;
     auto decoder = ImageDecoder::Make(settings, runners, loop->GetTaskRunner(),
-                                      manager.GetWeakIOManager());
+                                      manager.GetWeakIOManager(),
+                                      std::make_shared<fml::SyncSwitch>());
 
-    auto data = OpenFixtureAsSkData("ThisDoesNotExist.jpg");
+    auto data = flutter::testing::OpenFixtureAsSkData("ThisDoesNotExist.jpg");
     ASSERT_FALSE(data);
 
     fml::RefPtr<ImageDescriptor> image_descriptor =
         fml::MakeRefCounted<ImageDescriptor>(
             std::move(data), std::make_unique<UnknownImageGenerator>());
 
-    ImageDecoder::ImageResult callback = [&](const sk_sp<DlImage>& image) {
+    ImageDecoder::ImageResult callback = [&](const sk_sp<DlImage>& image,
+                                             const std::string& decode_error) {
       ASSERT_TRUE(runners.GetUITaskRunner()->RunsTasksOnCurrentThread());
       ASSERT_FALSE(image);
       latch.Signal();
@@ -235,11 +282,11 @@ TEST_F(ImageDecoderFixtureTest, ValidImageResultsInSuccess) {
   };
   auto decode_image = [&]() {
     Settings settings;
-    std::unique_ptr<ImageDecoder> image_decoder =
-        ImageDecoder::Make(settings, runners, loop->GetTaskRunner(),
-                           io_manager->GetWeakIOManager());
+    std::unique_ptr<ImageDecoder> image_decoder = ImageDecoder::Make(
+        settings, runners, loop->GetTaskRunner(),
+        io_manager->GetWeakIOManager(), std::make_shared<fml::SyncSwitch>());
 
-    auto data = OpenFixtureAsSkData("DashInNooglerHat.jpg");
+    auto data = flutter::testing::OpenFixtureAsSkData("DashInNooglerHat.jpg");
 
     ASSERT_TRUE(data);
     ASSERT_GE(data->size(), 0u);
@@ -252,7 +299,8 @@ TEST_F(ImageDecoderFixtureTest, ValidImageResultsInSuccess) {
     auto descriptor = fml::MakeRefCounted<ImageDescriptor>(
         std::move(data), std::move(generator));
 
-    ImageDecoder::ImageResult callback = [&](const sk_sp<DlImage>& image) {
+    ImageDecoder::ImageResult callback = [&](const sk_sp<DlImage>& image,
+                                             const std::string& decode_error) {
       ASSERT_TRUE(runners.GetUITaskRunner()->RunsTasksOnCurrentThread());
       ASSERT_TRUE(image && image->skia_image());
       EXPECT_TRUE(io_manager->did_access_is_gpu_disabled_sync_switch_);
@@ -263,15 +311,178 @@ TEST_F(ImageDecoderFixtureTest, ValidImageResultsInSuccess) {
                           callback);
   };
 
-  auto setup_io_manager_and_decode = [&]() {
+  auto set_up_io_manager_and_decode = [&]() {
     io_manager = std::make_unique<TestIOManager>(runners.GetIOTaskRunner());
     runners.GetUITaskRunner()->PostTask(decode_image);
   };
 
-  runners.GetIOTaskRunner()->PostTask(setup_io_manager_and_decode);
+  runners.GetIOTaskRunner()->PostTask(set_up_io_manager_and_decode);
   latch.Wait();
 }
 
+TEST_F(ImageDecoderFixtureTest, ImpellerUploadToSharedNoGpu) {
+#if !IMPELLER_SUPPORTS_RENDERING
+  GTEST_SKIP() << "Impeller only test.";
+#endif  // IMPELLER_SUPPORTS_RENDERING
+
+  auto no_gpu_access_context =
+      std::make_shared<impeller::TestImpellerContext>();
+  auto gpu_disabled_switch = std::make_shared<fml::SyncSwitch>(true);
+
+  auto info = SkImageInfo::Make(10, 10, SkColorType::kRGBA_8888_SkColorType,
+                                SkAlphaType::kPremul_SkAlphaType);
+  auto bitmap = std::make_shared<SkBitmap>();
+  bitmap->allocPixels(info, 10 * 4);
+  impeller::DeviceBufferDescriptor desc;
+  desc.size = bitmap->computeByteSize();
+  auto buffer = std::make_shared<impeller::TestImpellerDeviceBuffer>(desc);
+
+  auto result = ImageDecoderImpeller::UploadTextureToPrivate(
+      no_gpu_access_context, buffer, info, bitmap, gpu_disabled_switch);
+  ASSERT_EQ(no_gpu_access_context->command_buffer_count_, 0ul);
+  ASSERT_EQ(result.second, "");
+
+  result = ImageDecoderImpeller::UploadTextureToStorage(
+      no_gpu_access_context, bitmap, gpu_disabled_switch,
+      impeller::StorageMode::kHostVisible, true);
+  ASSERT_EQ(no_gpu_access_context->command_buffer_count_, 0ul);
+  ASSERT_EQ(result.second, "");
+}
+
+TEST_F(ImageDecoderFixtureTest, ImpellerNullColorspace) {
+  auto info = SkImageInfo::Make(10, 10, SkColorType::kRGBA_8888_SkColorType,
+                                SkAlphaType::kPremul_SkAlphaType);
+  SkBitmap bitmap;
+  bitmap.allocPixels(info, 10 * 4);
+  auto data = SkData::MakeWithoutCopy(bitmap.getPixels(), 10 * 10 * 4);
+  auto image = SkImages::RasterFromBitmap(bitmap);
+  ASSERT_TRUE(image != nullptr);
+  ASSERT_EQ(SkISize::Make(10, 10), image->dimensions());
+  ASSERT_EQ(nullptr, image->colorSpace());
+
+  auto descriptor = fml::MakeRefCounted<ImageDescriptor>(
+      std::move(data), image->imageInfo(), 10 * 4);
+
+#if IMPELLER_SUPPORTS_RENDERING
+  std::shared_ptr<impeller::Allocator> allocator =
+      std::make_shared<impeller::TestImpellerAllocator>();
+  std::optional<DecompressResult> decompressed =
+      ImageDecoderImpeller::DecompressTexture(
+          descriptor.get(), SkISize::Make(100, 100), {100, 100},
+          /*supports_wide_gamut=*/true, allocator);
+  ASSERT_TRUE(decompressed.has_value());
+  ASSERT_EQ(decompressed->image_info.colorType(), kRGBA_8888_SkColorType);
+  ASSERT_EQ(decompressed->image_info.colorSpace(), nullptr);
+#endif  // IMPELLER_SUPPORTS_RENDERING
+}
+
+TEST_F(ImageDecoderFixtureTest, ImpellerPixelConversion32F) {
+  auto info = SkImageInfo::Make(10, 10, SkColorType::kRGBA_F32_SkColorType,
+                                SkAlphaType::kUnpremul_SkAlphaType);
+  SkBitmap bitmap;
+  bitmap.allocPixels(info, 10 * 16);
+  auto data = SkData::MakeWithoutCopy(bitmap.getPixels(), 10 * 10 * 16);
+  auto image = SkImages::RasterFromBitmap(bitmap);
+  ASSERT_TRUE(image != nullptr);
+  ASSERT_EQ(SkISize::Make(10, 10), image->dimensions());
+  ASSERT_EQ(nullptr, image->colorSpace());
+
+  auto descriptor = fml::MakeRefCounted<ImageDescriptor>(
+      std::move(data), image->imageInfo(), 10 * 16);
+
+#if IMPELLER_SUPPORTS_RENDERING
+  std::shared_ptr<impeller::Allocator> allocator =
+      std::make_shared<impeller::TestImpellerAllocator>();
+  std::optional<DecompressResult> decompressed =
+      ImageDecoderImpeller::DecompressTexture(
+          descriptor.get(), SkISize::Make(100, 100), {100, 100},
+          /*supports_wide_gamut=*/true, allocator);
+
+  ASSERT_TRUE(decompressed.has_value());
+  ASSERT_EQ(decompressed->image_info.colorType(), kRGBA_F16_SkColorType);
+  ASSERT_EQ(decompressed->image_info.colorSpace(), nullptr);
+#endif  // IMPELLER_SUPPORTS_RENDERING
+}
+
+TEST_F(ImageDecoderFixtureTest, ImpellerWideGamutDisplayP3Opaque) {
+  auto data = flutter::testing::OpenFixtureAsSkData("DisplayP3Logo.jpg");
+  auto image = SkImages::DeferredFromEncodedData(data);
+  ASSERT_TRUE(image != nullptr);
+  ASSERT_EQ(SkISize::Make(100, 100), image->dimensions());
+
+  ImageGeneratorRegistry registry;
+  std::shared_ptr<ImageGenerator> generator =
+      registry.CreateCompatibleGenerator(data);
+  ASSERT_TRUE(generator);
+
+  auto descriptor = fml::MakeRefCounted<ImageDescriptor>(std::move(data),
+                                                         std::move(generator));
+
+#if IMPELLER_SUPPORTS_RENDERING
+  std::shared_ptr<impeller::Allocator> allocator =
+      std::make_shared<impeller::TestImpellerAllocator>();
+  std::optional<DecompressResult> wide_result =
+      ImageDecoderImpeller::DecompressTexture(
+          descriptor.get(), SkISize::Make(100, 100), {100, 100},
+          /*supports_wide_gamut=*/true, allocator);
+
+  ASSERT_TRUE(wide_result.has_value());
+  ASSERT_EQ(wide_result->image_info.colorType(), kBGR_101010x_XR_SkColorType);
+  ASSERT_TRUE(wide_result->image_info.colorSpace()->isSRGB());
+
+  const SkPixmap& wide_pixmap = wide_result->sk_bitmap->pixmap();
+  const uint32_t* pixel_ptr = static_cast<const uint32_t*>(wide_pixmap.addr());
+  bool found_deep_red = false;
+  for (int i = 0; i < wide_pixmap.width() * wide_pixmap.height(); ++i) {
+    uint32_t pixel = *pixel_ptr++;
+    float blue = DecodeBGR10((pixel >> 0) & 0x3ff);
+    float green = DecodeBGR10((pixel >> 10) & 0x3ff);
+    float red = DecodeBGR10((pixel >> 20) & 0x3ff);
+    if (fabsf(red - 1.0931f) < 0.01f && fabsf(green - -0.2268f) < 0.01f &&
+        fabsf(blue - -0.1501f) < 0.01f) {
+      found_deep_red = true;
+      break;
+    }
+  }
+  ASSERT_TRUE(found_deep_red);
+
+  std::optional<DecompressResult> narrow_result =
+      ImageDecoderImpeller::DecompressTexture(
+          descriptor.get(), SkISize::Make(100, 100), {100, 100},
+          /*supports_wide_gamut=*/false, allocator);
+
+  ASSERT_TRUE(narrow_result.has_value());
+  ASSERT_EQ(narrow_result->image_info.colorType(), kRGBA_8888_SkColorType);
+#endif  // IMPELLER_SUPPORTS_RENDERING
+}
+
+TEST_F(ImageDecoderFixtureTest, ImpellerNonWideGamut) {
+  auto data = flutter::testing::OpenFixtureAsSkData("Horizontal.jpg");
+  auto image = SkImages::DeferredFromEncodedData(data);
+  ASSERT_TRUE(image != nullptr);
+  ASSERT_EQ(SkISize::Make(600, 200), image->dimensions());
+
+  ImageGeneratorRegistry registry;
+  std::shared_ptr<ImageGenerator> generator =
+      registry.CreateCompatibleGenerator(data);
+  ASSERT_TRUE(generator);
+
+  auto descriptor = fml::MakeRefCounted<ImageDescriptor>(std::move(data),
+                                                         std::move(generator));
+
+#if IMPELLER_SUPPORTS_RENDERING
+  std::shared_ptr<impeller::Allocator> allocator =
+      std::make_shared<impeller::TestImpellerAllocator>();
+  std::optional<DecompressResult> result =
+      ImageDecoderImpeller::DecompressTexture(
+          descriptor.get(), SkISize::Make(600, 200), {600, 200},
+          /*supports_wide_gamut=*/true, allocator);
+
+  ASSERT_TRUE(result.has_value());
+  ASSERT_EQ(result->image_info.colorType(), kRGBA_8888_SkColorType);
+#endif  // IMPELLER_SUPPORTS_RENDERING
+}
+
 TEST_F(ImageDecoderFixtureTest, ExifDataIsRespectedOnDecode) {
   auto loop = fml::ConcurrentMessageLoop::Create();
   TaskRunners runners(GetCurrentTestName(),         // label
@@ -293,11 +504,11 @@ TEST_F(ImageDecoderFixtureTest, ExifDataIsRespectedOnDecode) {
   SkISize decoded_size = SkISize::MakeEmpty();
   auto decode_image = [&]() {
     Settings settings;
-    std::unique_ptr<ImageDecoder> image_decoder =
-        ImageDecoder::Make(settings, runners, loop->GetTaskRunner(),
-                           io_manager->GetWeakIOManager());
+    std::unique_ptr<ImageDecoder> image_decoder = ImageDecoder::Make(
+        settings, runners, loop->GetTaskRunner(),
+        io_manager->GetWeakIOManager(), std::make_shared<fml::SyncSwitch>());
 
-    auto data = OpenFixtureAsSkData("Horizontal.jpg");
+    auto data = flutter::testing::OpenFixtureAsSkData("Horizontal.jpg");
 
     ASSERT_TRUE(data);
     ASSERT_GE(data->size(), 0u);
@@ -310,7 +521,8 @@ TEST_F(ImageDecoderFixtureTest, ExifDataIsRespectedOnDecode) {
     auto descriptor = fml::MakeRefCounted<ImageDescriptor>(
         std::move(data), std::move(generator));
 
-    ImageDecoder::ImageResult callback = [&](const sk_sp<DlImage>& image) {
+    ImageDecoder::ImageResult callback = [&](const sk_sp<DlImage>& image,
+                                             const std::string& decode_error) {
       ASSERT_TRUE(runners.GetUITaskRunner()->RunsTasksOnCurrentThread());
       ASSERT_TRUE(image && image->skia_image());
       decoded_size = image->skia_image()->dimensions();
@@ -320,12 +532,12 @@ TEST_F(ImageDecoderFixtureTest, ExifDataIsRespectedOnDecode) {
                           callback);
   };
 
-  auto setup_io_manager_and_decode = [&]() {
+  auto set_up_io_manager_and_decode = [&]() {
     io_manager = std::make_unique<TestIOManager>(runners.GetIOTaskRunner());
     runners.GetUITaskRunner()->PostTask(decode_image);
   };
 
-  runners.GetIOTaskRunner()->PostTask(setup_io_manager_and_decode);
+  runners.GetIOTaskRunner()->PostTask(set_up_io_manager_and_decode);
 
   latch.Wait();
 
@@ -353,11 +565,11 @@ TEST_F(ImageDecoderFixtureTest, CanDecodeWithoutAGPUContext) {
 
   auto decode_image = [&]() {
     Settings settings;
-    std::unique_ptr<ImageDecoder> image_decoder =
-        ImageDecoder::Make(settings, runners, loop->GetTaskRunner(),
-                           io_manager->GetWeakIOManager());
+    std::unique_ptr<ImageDecoder> image_decoder = ImageDecoder::Make(
+        settings, runners, loop->GetTaskRunner(),
+        io_manager->GetWeakIOManager(), std::make_shared<fml::SyncSwitch>());
 
-    auto data = OpenFixtureAsSkData("DashInNooglerHat.jpg");
+    auto data = flutter::testing::OpenFixtureAsSkData("DashInNooglerHat.jpg");
 
     ASSERT_TRUE(data);
     ASSERT_GE(data->size(), 0u);
@@ -370,7 +582,8 @@ TEST_F(ImageDecoderFixtureTest, CanDecodeWithoutAGPUContext) {
     auto descriptor = fml::MakeRefCounted<ImageDescriptor>(
         std::move(data), std::move(generator));
 
-    ImageDecoder::ImageResult callback = [&](const sk_sp<DlImage>& image) {
+    ImageDecoder::ImageResult callback = [&](const sk_sp<DlImage>& image,
+                                             const std::string& decode_error) {
       ASSERT_TRUE(runners.GetUITaskRunner()->RunsTasksOnCurrentThread());
       ASSERT_TRUE(image && image->skia_image());
       runners.GetIOTaskRunner()->PostTask(release_io_manager);
@@ -379,20 +592,21 @@ TEST_F(ImageDecoderFixtureTest, CanDecodeWithoutAGPUContext) {
                           callback);
   };
 
-  auto setup_io_manager_and_decode = [&]() {
+  auto set_up_io_manager_and_decode = [&]() {
     io_manager =
         std::make_unique<TestIOManager>(runners.GetIOTaskRunner(), false);
     runners.GetUITaskRunner()->PostTask(decode_image);
   };
 
-  runners.GetIOTaskRunner()->PostTask(setup_io_manager_and_decode);
+  runners.GetIOTaskRunner()->PostTask(set_up_io_manager_and_decode);
 
   latch.Wait();
 }
 
 TEST_F(ImageDecoderFixtureTest, CanDecodeWithResizes) {
   const auto image_dimensions =
-      SkImage::MakeFromEncoded(OpenFixtureAsSkData("DashInNooglerHat.jpg"))
+      SkImages::DeferredFromEncodedData(
+          flutter::testing::OpenFixtureAsSkData("DashInNooglerHat.jpg"))
           ->dimensions();
 
   ASSERT_FALSE(image_dimensions.isEmpty());
@@ -420,7 +634,8 @@ TEST_F(ImageDecoderFixtureTest, CanDecodeWithResizes) {
   PostTaskSync(runners.GetUITaskRunner(), [&]() {
     Settings settings;
     image_decoder = ImageDecoder::Make(settings, runners, loop->GetTaskRunner(),
-                                       io_manager->GetWeakIOManager());
+                                       io_manager->GetWeakIOManager(),
+                                       std::make_shared<fml::SyncSwitch>());
   });
 
   // Setup a generic decoding utility that gives us the final decoded size.
@@ -428,7 +643,7 @@ TEST_F(ImageDecoderFixtureTest, CanDecodeWithResizes) {
                           uint32_t target_height) -> SkISize {
     SkISize final_size = SkISize::MakeEmpty();
     runners.GetUITaskRunner()->PostTask([&]() {
-      auto data = OpenFixtureAsSkData("DashInNooglerHat.jpg");
+      auto data = flutter::testing::OpenFixtureAsSkData("DashInNooglerHat.jpg");
 
       ASSERT_TRUE(data);
       ASSERT_GE(data->size(), 0u);
@@ -441,12 +656,13 @@ TEST_F(ImageDecoderFixtureTest, CanDecodeWithResizes) {
       auto descriptor = fml::MakeRefCounted<ImageDescriptor>(
           std::move(data), std::move(generator));
 
-      ImageDecoder::ImageResult callback = [&](const sk_sp<DlImage>& image) {
-        ASSERT_TRUE(runners.GetUITaskRunner()->RunsTasksOnCurrentThread());
-        ASSERT_TRUE(image && image->skia_image());
-        final_size = image->skia_image()->dimensions();
-        latch.Signal();
-      };
+      ImageDecoder::ImageResult callback =
+          [&](const sk_sp<DlImage>& image, const std::string& decode_error) {
+            ASSERT_TRUE(runners.GetUITaskRunner()->RunsTasksOnCurrentThread());
+            ASSERT_TRUE(image && image->skia_image());
+            final_size = image->skia_image()->dimensions();
+            latch.Signal();
+          };
       image_decoder->Decode(descriptor, target_width, target_height, callback);
     });
     latch.Wait();
@@ -468,8 +684,9 @@ TEST_F(ImageDecoderFixtureTest, CanDecodeWithResizes) {
 // Flutter.
 TEST(ImageDecoderTest,
      VerifyCodecRepeatCountsForGifAndWebPAreConsistentWithLoopCounts) {
-  auto gif_mapping = OpenFixtureAsSkData("hello_loop_2.gif");
-  auto webp_mapping = OpenFixtureAsSkData("hello_loop_2.webp");
+  auto gif_mapping = flutter::testing::OpenFixtureAsSkData("hello_loop_2.gif");
+  auto webp_mapping =
+      flutter::testing::OpenFixtureAsSkData("hello_loop_2.webp");
 
   ASSERT_TRUE(gif_mapping);
   ASSERT_TRUE(webp_mapping);
@@ -488,10 +705,11 @@ TEST(ImageDecoderTest,
 }
 
 TEST(ImageDecoderTest, VerifySimpleDecoding) {
-  auto data = OpenFixtureAsSkData("Horizontal.jpg");
-  auto image = SkImage::MakeFromEncoded(data);
+  auto data = flutter::testing::OpenFixtureAsSkData("Horizontal.jpg");
+  auto image = SkImages::DeferredFromEncodedData(data);
   ASSERT_TRUE(image != nullptr);
-  ASSERT_EQ(SkISize::Make(600, 200), image->dimensions());
+  ASSERT_EQ(600, image->width());
+  ASSERT_EQ(200, image->height());
 
   ImageGeneratorRegistry registry;
   std::shared_ptr<ImageGenerator> generator =
@@ -500,26 +718,49 @@ TEST(ImageDecoderTest, VerifySimpleDecoding) {
 
   auto descriptor = fml::MakeRefCounted<ImageDescriptor>(std::move(data),
                                                          std::move(generator));
-
-  ASSERT_EQ(ImageDecoderSkia::ImageFromCompressedData(
-                descriptor.get(), 6, 2, fml::tracing::TraceFlow(""))
-                ->dimensions(),
-            SkISize::Make(6, 2));
+  auto compressed_image = ImageDecoderSkia::ImageFromCompressedData(
+      descriptor.get(), 6, 2, fml::tracing::TraceFlow(""));
+  ASSERT_EQ(compressed_image->width(), 6);
+  ASSERT_EQ(compressed_image->height(), 2);
+  ASSERT_EQ(compressed_image->alphaType(), kOpaque_SkAlphaType);
 
 #if IMPELLER_SUPPORTS_RENDERING
-  ASSERT_EQ(ImageDecoderImpeller::DecompressTexture(
-                descriptor.get(), SkISize::Make(6, 2), {100, 100})
-                ->dimensions(),
-            SkISize::Make(6, 2));
-  ASSERT_EQ(ImageDecoderImpeller::DecompressTexture(
-                descriptor.get(), SkISize::Make(60, 20), {10, 10})
-                ->dimensions(),
-            SkISize::Make(10, 10));
+  std::shared_ptr<impeller::Allocator> allocator =
+      std::make_shared<impeller::TestImpellerAllocator>();
+  auto result_1 = ImageDecoderImpeller::DecompressTexture(
+      descriptor.get(), SkISize::Make(6, 2), {100, 100},
+      /*supports_wide_gamut=*/false, allocator);
+  ASSERT_EQ(result_1.sk_bitmap->width(), 6);
+  ASSERT_EQ(result_1.sk_bitmap->height(), 2);
+
+  auto result_2 = ImageDecoderImpeller::DecompressTexture(
+      descriptor.get(), SkISize::Make(60, 20), {10, 10},
+      /*supports_wide_gamut=*/false, allocator);
+  ASSERT_EQ(result_2.sk_bitmap->width(), 10);
+  ASSERT_EQ(result_2.sk_bitmap->height(), 10);
 #endif  // IMPELLER_SUPPORTS_RENDERING
 }
 
+TEST(ImageDecoderTest, ImagesWithTransparencyArePremulAlpha) {
+  auto data = flutter::testing::OpenFixtureAsSkData("heart_end.png");
+  ASSERT_TRUE(data);
+  ImageGeneratorRegistry registry;
+  std::shared_ptr<ImageGenerator> generator =
+      registry.CreateCompatibleGenerator(data);
+  ASSERT_TRUE(generator);
+
+  auto descriptor = fml::MakeRefCounted<ImageDescriptor>(std::move(data),
+                                                         std::move(generator));
+  auto compressed_image = ImageDecoderSkia::ImageFromCompressedData(
+      descriptor.get(), 250, 250, fml::tracing::TraceFlow(""));
+  ASSERT_TRUE(compressed_image);
+  ASSERT_EQ(compressed_image->width(), 250);
+  ASSERT_EQ(compressed_image->height(), 250);
+  ASSERT_EQ(compressed_image->alphaType(), kPremul_SkAlphaType);
+}
+
 TEST(ImageDecoderTest, VerifySubpixelDecodingPreservesExifOrientation) {
-  auto data = OpenFixtureAsSkData("Horizontal.jpg");
+  auto data = flutter::testing::OpenFixtureAsSkData("Horizontal.jpg");
 
   ImageGeneratorRegistry registry;
   std::shared_ptr<ImageGenerator> generator =
@@ -528,9 +769,15 @@ TEST(ImageDecoderTest, VerifySubpixelDecodingPreservesExifOrientation) {
   auto descriptor =
       fml::MakeRefCounted<ImageDescriptor>(data, std::move(generator));
 
-  auto image = SkImage::MakeFromEncoded(data);
+  // If Exif metadata is ignored, the height and width will be swapped because
+  // "Rotate 90 CW" is what is encoded there.
+  ASSERT_EQ(600, descriptor->width());
+  ASSERT_EQ(200, descriptor->height());
+
+  auto image = SkImages::DeferredFromEncodedData(data);
   ASSERT_TRUE(image != nullptr);
-  ASSERT_EQ(SkISize::Make(600, 200), image->dimensions());
+  ASSERT_EQ(600, image->width());
+  ASSERT_EQ(200, image->height());
 
   auto decode = [descriptor](uint32_t target_width, uint32_t target_height) {
     return ImageDecoderSkia::ImageFromCompressedData(
@@ -538,17 +785,18 @@ TEST(ImageDecoderTest, VerifySubpixelDecodingPreservesExifOrientation) {
         fml::tracing::TraceFlow(""));
   };
 
-  auto expected_data = OpenFixtureAsSkData("Horizontal.png");
+  auto expected_data = flutter::testing::OpenFixtureAsSkData("Horizontal.png");
   ASSERT_TRUE(expected_data != nullptr);
   ASSERT_FALSE(expected_data->isEmpty());
 
-  auto assert_image = [&](auto decoded_image) {
+  auto assert_image = [&](auto decoded_image, const std::string& decode_error) {
     ASSERT_EQ(decoded_image->dimensions(), SkISize::Make(300, 100));
-    ASSERT_TRUE(decoded_image->encodeToData(SkEncodedImageFormat::kPNG, 100)
-                    ->equals(expected_data.get()));
+    sk_sp<SkData> encoded =
+        SkPngEncoder::Encode(nullptr, decoded_image.get(), {});
+    ASSERT_TRUE(encoded->equals(expected_data.get()));
   };
 
-  assert_image(decode(300, 100));
+  assert_image(decode(300, 100), {});
 }
 
 TEST_F(ImageDecoderFixtureTest,
@@ -570,7 +818,7 @@ TEST_F(ImageDecoderFixtureTest,
   auto vm_ref = DartVMRef::Create(settings);
   auto vm_data = vm_ref.GetVMData();
 
-  auto gif_mapping = OpenFixtureAsSkData("hello_loop_2.gif");
+  auto gif_mapping = flutter::testing::OpenFixtureAsSkData("hello_loop_2.gif");
 
   ASSERT_TRUE(gif_mapping);
 
@@ -639,7 +887,91 @@ TEST_F(ImageDecoderFixtureTest, MultiFrameCodecDidAccessGpuDisabledSyncSwitch) {
   auto vm_ref = DartVMRef::Create(settings);
   auto vm_data = vm_ref.GetVMData();
 
-  auto gif_mapping = OpenFixtureAsSkData("hello_loop_2.gif");
+  auto gif_mapping = flutter::testing::OpenFixtureAsSkData("hello_loop_2.gif");
+
+  ASSERT_TRUE(gif_mapping);
+
+  ImageGeneratorRegistry registry;
+  std::shared_ptr<ImageGenerator> gif_generator =
+      registry.CreateCompatibleGenerator(gif_mapping);
+  ASSERT_TRUE(gif_generator);
+
+  TaskRunners runners(GetCurrentTestName(),         // label
+                      CreateNewThread("platform"),  // platform
+                      CreateNewThread("raster"),    // raster
+                      CreateNewThread("ui"),        // ui
+                      CreateNewThread("io")         // io
+  );
+
+  std::unique_ptr<TestIOManager> io_manager;
+  fml::RefPtr<MultiFrameCodec> codec;
+  fml::AutoResetWaitableEvent latch;
+
+  auto validate_frame_callback = [&latch](Dart_NativeArguments args) {
+    EXPECT_FALSE(Dart_IsNull(Dart_GetNativeArgument(args, 0)));
+    latch.Signal();
+  };
+
+  AddNativeCallback("ValidateFrameCallback",
+                    CREATE_NATIVE_ENTRY(validate_frame_callback));
+  // Setup the IO manager.
+  PostTaskSync(runners.GetIOTaskRunner(), [&]() {
+    io_manager = std::make_unique<TestIOManager>(runners.GetIOTaskRunner());
+  });
+
+  auto isolate = RunDartCodeInIsolate(vm_ref, settings, runners, "main", {},
+                                      GetDefaultKernelFilePath(),
+                                      io_manager->GetWeakIOManager());
+
+  PostTaskSync(runners.GetUITaskRunner(), [&]() {
+    fml::AutoResetWaitableEvent isolate_latch;
+
+    EXPECT_TRUE(isolate->RunInIsolateScope([&]() -> bool {
+      Dart_Handle library = Dart_RootLibrary();
+      if (Dart_IsError(library)) {
+        isolate_latch.Signal();
+        return false;
+      }
+      Dart_Handle closure =
+          Dart_GetField(library, Dart_NewStringFromCString("frameCallback"));
+      if (Dart_IsError(closure) || !Dart_IsClosure(closure)) {
+        isolate_latch.Signal();
+        return false;
+      }
+
+      EXPECT_FALSE(io_manager->did_access_is_gpu_disabled_sync_switch_);
+      codec = fml::MakeRefCounted<MultiFrameCodec>(std::move(gif_generator));
+      codec->getNextFrame(closure);
+      isolate_latch.Signal();
+      return true;
+    }));
+    isolate_latch.Wait();
+  });
+
+  PostTaskSync(runners.GetIOTaskRunner(), [&]() {
+    EXPECT_TRUE(io_manager->did_access_is_gpu_disabled_sync_switch_);
+  });
+
+  latch.Wait();
+
+  // Destroy the Isolate
+  isolate = nullptr;
+
+  // Destroy the MultiFrameCodec
+  PostTaskSync(runners.GetUITaskRunner(), [&]() { codec = nullptr; });
+
+  // Destroy the IO manager
+  PostTaskSync(runners.GetIOTaskRunner(), [&]() { io_manager.reset(); });
+}
+
+TEST_F(ImageDecoderFixtureTest,
+       MultiFrameCodecProducesATextureEvenIfGPUIsDisabledOnImpeller) {
+  auto settings = CreateSettingsForFixture();
+  settings.enable_impeller = true;
+  auto vm_ref = DartVMRef::Create(settings);
+  auto vm_data = vm_ref.GetVMData();
+
+  auto gif_mapping = flutter::testing::OpenFixtureAsSkData("hello_loop_2.gif");
 
   ASSERT_TRUE(gif_mapping);
 
@@ -657,10 +989,21 @@ TEST_F(ImageDecoderFixtureTest, MultiFrameCodecDidAccessGpuDisabledSyncSwitch) {
 
   std::unique_ptr<TestIOManager> io_manager;
   fml::RefPtr<MultiFrameCodec> codec;
+  fml::AutoResetWaitableEvent latch;
+
+  auto validate_frame_callback = [&latch](Dart_NativeArguments args) {
+    EXPECT_FALSE(Dart_IsNull(Dart_GetNativeArgument(args, 0)));
+    latch.Signal();
+  };
+
+  AddNativeCallback("ValidateFrameCallback",
+                    CREATE_NATIVE_ENTRY(validate_frame_callback));
 
   // Setup the IO manager.
   PostTaskSync(runners.GetIOTaskRunner(), [&]() {
     io_manager = std::make_unique<TestIOManager>(runners.GetIOTaskRunner());
+    // Mark GPU disabled.
+    io_manager->SetGpuDisabled(true);
   });
 
   auto isolate = RunDartCodeInIsolate(vm_ref, settings, runners, "main", {},
@@ -696,6 +1039,8 @@ TEST_F(ImageDecoderFixtureTest, MultiFrameCodecDidAccessGpuDisabledSyncSwitch) {
     EXPECT_TRUE(io_manager->did_access_is_gpu_disabled_sync_switch_);
   });
 
+  latch.Wait();
+
   // Destroy the Isolate
   isolate = nullptr;
 
@@ -706,5 +1051,14 @@ TEST_F(ImageDecoderFixtureTest, MultiFrameCodecDidAccessGpuDisabledSyncSwitch) {
   PostTaskSync(runners.GetIOTaskRunner(), [&]() { io_manager.reset(); });
 }
 
+TEST_F(ImageDecoderFixtureTest, NullCheckBuffer) {
+  auto context = std::make_shared<impeller::TestImpellerContext>();
+  auto allocator = ImpellerAllocator(context->GetResourceAllocator());
+
+  EXPECT_FALSE(allocator.allocPixelRef(nullptr));
+}
+
 }  // namespace testing
 }  // namespace flutter
+
+// NOLINTEND(clang-analyzer-core.StackAddressEscape)
diff --git a/lib/ui/painting/image_descriptor.cc b/lib/ui/painting/image_descriptor.cc
index c31d1ba0cd1ddf787e31886ca9cfd0da14827859..9a98b87e61d3729558a5f30c205078da4f15d057 100644
--- a/lib/ui/painting/image_descriptor.cc
+++ b/lib/ui/painting/image_descriptor.cc
@@ -85,6 +85,7 @@ void ImageDescriptor::initRaw(Dart_Handle descriptor_handle,
                               int row_bytes,
                               PixelFormat pixel_format) {
   SkColorType color_type = kUnknown_SkColorType;
+  SkAlphaType alpha_type = kPremul_SkAlphaType;
   switch (pixel_format) {
     case PixelFormat::kRGBA8888:
       color_type = kRGBA_8888_SkColorType;
@@ -92,10 +93,14 @@ void ImageDescriptor::initRaw(Dart_Handle descriptor_handle,
     case PixelFormat::kBGRA8888:
       color_type = kBGRA_8888_SkColorType;
       break;
+    case PixelFormat::kRGBAFloat32:
+      // `PixelFormat.rgbaFloat32` is documented to not use premultiplied alpha.
+      color_type = kRGBA_F32_SkColorType;
+      alpha_type = kUnpremul_SkAlphaType;
+      break;
   }
   FML_DCHECK(color_type != kUnknown_SkColorType);
-  auto image_info =
-      SkImageInfo::Make(width, height, color_type, kPremul_SkAlphaType);
+  auto image_info = SkImageInfo::Make(width, height, color_type, alpha_type);
   auto descriptor = fml::MakeRefCounted<ImageDescriptor>(
       data->data(), std::move(image_info),
       row_bytes == -1 ? std::nullopt : std::optional<size_t>(row_bytes));
diff --git a/lib/ui/painting/image_descriptor.h b/lib/ui/painting/image_descriptor.h
index c712f247df7bcfa0c04ba6be69ef9bd8892de5ab..18e175b2b1fa95916d9610da792337002db2845f 100644
--- a/lib/ui/painting/image_descriptor.h
+++ b/lib/ui/painting/image_descriptor.h
@@ -13,10 +13,11 @@
 #include "flutter/lib/ui/dart_wrapper.h"
 #include "flutter/lib/ui/painting/image_generator_registry.h"
 #include "flutter/lib/ui/painting/immutable_buffer.h"
-#include "third_party/skia/include/codec/SkCodec.h"
-#include "third_party/skia/include/core/SkImageGenerator.h"
+#include "third_party/skia/include/core/SkData.h"
+#include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkImageInfo.h"
-#include "third_party/skia/src/codec/SkCodecImageGenerator.h"
+#include "third_party/skia/include/core/SkPixmap.h"
+#include "third_party/skia/include/core/SkSize.h"
 #include "third_party/tonic/dart_library_natives.h"
 
 namespace flutter {
@@ -36,9 +37,10 @@ class ImageDescriptor : public RefCountedDartWrappable<ImageDescriptor> {
   enum PixelFormat {
     kRGBA8888,
     kBGRA8888,
+    kRGBAFloat32,
   };
 
-  /// @brief  Asynchronously initlializes an ImageDescriptor for an encoded
+  /// @brief  Asynchronously initializes an ImageDescriptor for an encoded
   ///         image, as long as the format is recognized by an encoder installed
   ///         in the `ImageGeneratorRegistry`. Calling this method will create
   ///         an `ImageGenerator` and read EXIF corrected dimensions from the
diff --git a/lib/ui/painting/image_dispose_unittests.cc b/lib/ui/painting/image_dispose_unittests.cc
index 0f8bb6d027062a9f34eda68329f1ffad5a810822..93600ca83c93dca2b4adc6db74b93578e4486e63 100644
--- a/lib/ui/painting/image_dispose_unittests.cc
+++ b/lib/ui/painting/image_dispose_unittests.cc
@@ -5,6 +5,7 @@
 #define FML_USED_ON_EMBEDDER
 
 #include "flutter/common/task_runners.h"
+#include "flutter/fml/synchronization/count_down_latch.h"
 #include "flutter/fml/synchronization/waitable_event.h"
 #include "flutter/lib/ui/painting/canvas.h"
 #include "flutter/lib/ui/painting/image.h"
@@ -57,6 +58,10 @@ TEST_F(ImageDisposeTest, ImageReleasedAfterFrameAndDisposePictureAndLayer) {
   };
 
   Settings settings = CreateSettingsForFixture();
+  fml::CountDownLatch frame_latch{2};
+  settings.frame_rasterized_callback = [&frame_latch](const FrameTiming& t) {
+    frame_latch.CountDown();
+  };
   auto task_runner = CreateNewThread();
   TaskRunners task_runners("test",                  // label
                            GetCurrentTaskRunner(),  // platform
@@ -83,12 +88,15 @@ TEST_F(ImageDisposeTest, ImageReleasedAfterFrameAndDisposePictureAndLayer) {
   shell->RunEngine(std::move(configuration), [&](auto result) {
     ASSERT_EQ(result, Engine::RunStatus::Success);
   });
-
   message_latch_.Wait();
 
   ASSERT_TRUE(current_display_list_);
   ASSERT_TRUE(current_image_);
 
+  // Wait for 2 frames to be rasterized. The 2nd frame releases resources of the
+  // 1st frame.
+  frame_latch.Wait();
+
   // Force a drain the SkiaUnrefQueue. The engine does this normally as frames
   // pump, but we force it here to make the test more deterministic.
   message_latch_.Reset();
diff --git a/lib/ui/painting/image_encoding.cc b/lib/ui/painting/image_encoding.cc
index 2e60d5f55f0e304f31a3c58b0206a94bda3ccbc8..69d3bd38f87bac6b376c789abc8ea8c26bf5f08a 100644
--- a/lib/ui/painting/image_encoding.cc
+++ b/lib/ui/painting/image_encoding.cc
@@ -11,13 +11,16 @@
 #include "flutter/common/task_runners.h"
 #include "flutter/fml/build_config.h"
 #include "flutter/fml/make_copyable.h"
+#include "flutter/fml/status_or.h"
 #include "flutter/fml/trace_event.h"
 #include "flutter/lib/ui/painting/image.h"
 #if IMPELLER_SUPPORTS_RENDERING
 #include "flutter/lib/ui/painting/image_encoding_impeller.h"
 #endif  // IMPELLER_SUPPORTS_RENDERING
 #include "flutter/lib/ui/painting/image_encoding_skia.h"
-#include "third_party/skia/include/core/SkEncodedImageFormat.h"
+#include "third_party/skia/include/core/SkImage.h"
+#include "third_party/skia/include/core/SkSurface.h"
+#include "third_party/skia/include/encode/SkPngEncoder.h"
 #include "third_party/tonic/dart_persistent_value.h"
 #include "third_party/tonic/logging/dart_invoke.h"
 #include "third_party/tonic/typed_data/typed_list.h"
@@ -32,39 +35,33 @@ class Context;
 namespace flutter {
 namespace {
 
-// This must be kept in sync with the enum in painting.dart
-enum ImageByteFormat {
-  kRawRGBA,
-  kRawStraightRGBA,
-  kRawUnmodified,
-  kPNG,
-};
-
 void FinalizeSkData(void* isolate_callback_data, void* peer) {
   SkData* buffer = reinterpret_cast<SkData*>(peer);
   buffer->unref();
 }
 
 void InvokeDataCallback(std::unique_ptr<DartPersistentValue> callback,
-                        sk_sp<SkData> buffer) {
+                        fml::StatusOr<sk_sp<SkData>>&& buffer) {
   std::shared_ptr<tonic::DartState> dart_state = callback->dart_state().lock();
   if (!dart_state) {
     return;
   }
   tonic::DartState::Scope scope(dart_state);
-  if (!buffer) {
-    DartInvoke(callback->value(), {Dart_Null()});
+  if (!buffer.ok()) {
+    std::string error_copy(buffer.status().message());
+    Dart_Handle dart_string = ToDart(error_copy);
+    DartInvoke(callback->value(), {Dart_Null(), dart_string});
     return;
   }
   // Skia will not modify the buffer, and it is backed by memory that is
   // read/write, so Dart can be given direct access to the buffer through an
   // external Uint8List.
-  void* bytes = const_cast<void*>(buffer->data());
-  const intptr_t length = buffer->size();
-  void* peer = reinterpret_cast<void*>(buffer.release());
+  void* bytes = const_cast<void*>(buffer.value()->data());
+  const intptr_t length = buffer.value()->size();
+  void* peer = reinterpret_cast<void*>(buffer.value().release());
   Dart_Handle dart_data = Dart_NewExternalTypedDataWithFinalizer(
       Dart_TypedData_kUint8, bytes, length, peer, length, FinalizeSkData);
-  DartInvoke(callback->value(), {dart_data});
+  DartInvoke(callback->value(), {dart_data, Dart_Null()});
 }
 
 sk_sp<SkData> CopyImageByteData(const sk_sp<SkImage>& raster_image,
@@ -85,7 +82,7 @@ sk_sp<SkData> CopyImageByteData(const sk_sp<SkImage>& raster_image,
   }
 
   // Perform swizzle if the type doesnt match the specification.
-  auto surface = SkSurface::MakeRaster(
+  auto surface = SkSurfaces::Raster(
       SkImageInfo::Make(raster_image->width(), raster_image->height(),
                         color_type, alpha_type, nullptr));
 
@@ -104,43 +101,6 @@ sk_sp<SkData> CopyImageByteData(const sk_sp<SkImage>& raster_image,
   return SkData::MakeWithCopy(pixmap.addr(), pixmap.computeByteSize());
 }
 
-sk_sp<SkData> EncodeImage(const sk_sp<SkImage>& raster_image,
-                          ImageByteFormat format) {
-  TRACE_EVENT0("flutter", __FUNCTION__);
-
-  if (!raster_image) {
-    return nullptr;
-  }
-
-  switch (format) {
-    case kPNG: {
-      auto png_image =
-          raster_image->encodeToData(SkEncodedImageFormat::kPNG, 0);
-
-      if (png_image == nullptr) {
-        FML_LOG(ERROR) << "Could not convert raster image to PNG.";
-        return nullptr;
-      };
-      return png_image;
-    } break;
-    case kRawRGBA: {
-      return CopyImageByteData(raster_image, kRGBA_8888_SkColorType,
-                               kPremul_SkAlphaType);
-    } break;
-    case kRawStraightRGBA: {
-      return CopyImageByteData(raster_image, kRGBA_8888_SkColorType,
-                               kUnpremul_SkAlphaType);
-    } break;
-    case kRawUnmodified: {
-      return CopyImageByteData(raster_image, raster_image->colorType(),
-                               raster_image->alphaType());
-    } break;
-  }
-
-  FML_LOG(ERROR) << "Unknown error encoding image.";
-  return nullptr;
-}
-
 void EncodeImageAndInvokeDataCallback(
     const sk_sp<DlImage>& image,
     std::unique_ptr<DartPersistentValue> callback,
@@ -153,28 +113,37 @@ void EncodeImageAndInvokeDataCallback(
     const std::shared_ptr<const fml::SyncSwitch>& is_gpu_disabled_sync_switch,
     const std::shared_ptr<impeller::Context>& impeller_context,
     bool is_impeller_enabled) {
-  auto callback_task = fml::MakeCopyable(
-      [callback = std::move(callback)](sk_sp<SkData> encoded) mutable {
+  auto callback_task =
+      fml::MakeCopyable([callback = std::move(callback)](
+                            fml::StatusOr<sk_sp<SkData>>&& encoded) mutable {
         InvokeDataCallback(std::move(callback), std::move(encoded));
       });
   // The static leak checker gets confused by the use of fml::MakeCopyable in
   // EncodeImage.
   // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks)
-  auto encode_task = [callback_task = std::move(callback_task), format,
-                      ui_task_runner](const sk_sp<SkImage>& raster_image) {
-    sk_sp<SkData> encoded = EncodeImage(raster_image, format);
-    ui_task_runner->PostTask([callback_task = callback_task,
-                              encoded = std::move(encoded)]() mutable {
-      callback_task(std::move(encoded));
-    });
-  };
+  auto encode_task =
+      [callback_task = std::move(callback_task), format,
+       ui_task_runner](const fml::StatusOr<sk_sp<SkImage>>& raster_image) {
+        if (raster_image.ok()) {
+          sk_sp<SkData> encoded = EncodeImage(raster_image.value(), format);
+          ui_task_runner->PostTask([callback_task = callback_task,
+                                    encoded = std::move(encoded)]() mutable {
+            callback_task(std::move(encoded));
+          });
+        } else {
+          ui_task_runner->PostTask([callback_task = callback_task,
+                                    raster_image = raster_image]() mutable {
+            callback_task(raster_image.status());
+          });
+        }
+      };
 
   FML_DCHECK(image);
 #if IMPELLER_SUPPORTS_RENDERING
   if (is_impeller_enabled) {
-    ConvertImageToRasterImpeller(image, encode_task, raster_task_runner,
-                                 io_task_runner, is_gpu_disabled_sync_switch,
-                                 impeller_context);
+    ImageEncodingImpeller::ConvertImageToRaster(
+        image, encode_task, raster_task_runner, io_task_runner,
+        is_gpu_disabled_sync_switch, impeller_context);
     return;
   }
 #endif  // IMPELLER_SUPPORTS_RENDERING
@@ -225,4 +194,42 @@ Dart_Handle EncodeImage(CanvasImage* canvas_image,
   return Dart_Null();
 }
 
+sk_sp<SkData> EncodeImage(const sk_sp<SkImage>& raster_image,
+                          ImageByteFormat format) {
+  TRACE_EVENT0("flutter", __FUNCTION__);
+
+  if (!raster_image) {
+    return nullptr;
+  }
+
+  switch (format) {
+    case kPNG: {
+      auto png_image = SkPngEncoder::Encode(nullptr, raster_image.get(), {});
+
+      if (png_image == nullptr) {
+        FML_LOG(ERROR) << "Could not convert raster image to PNG.";
+        return nullptr;
+      };
+      return png_image;
+    }
+    case kRawRGBA:
+      return CopyImageByteData(raster_image, kRGBA_8888_SkColorType,
+                               kPremul_SkAlphaType);
+
+    case kRawStraightRGBA:
+      return CopyImageByteData(raster_image, kRGBA_8888_SkColorType,
+                               kUnpremul_SkAlphaType);
+
+    case kRawUnmodified:
+      return CopyImageByteData(raster_image, raster_image->colorType(),
+                               raster_image->alphaType());
+    case kRawExtendedRgba128:
+      return CopyImageByteData(raster_image, kRGBA_F32_SkColorType,
+                               kUnpremul_SkAlphaType);
+  }
+
+  FML_LOG(ERROR) << "Unknown error encoding image.";
+  return nullptr;
+}
+
 }  // namespace flutter
diff --git a/lib/ui/painting/image_encoding.h b/lib/ui/painting/image_encoding.h
index df7801302d9be5df510a782f7ddec898eb4867a5..be852043022ae9c1ea33319457edac85ec75c39e 100644
--- a/lib/ui/painting/image_encoding.h
+++ b/lib/ui/painting/image_encoding.h
@@ -5,16 +5,29 @@
 #ifndef FLUTTER_LIB_UI_PAINTING_IMAGE_ENCODING_H_
 #define FLUTTER_LIB_UI_PAINTING_IMAGE_ENCODING_H_
 
+#include "third_party/skia/include/core/SkImage.h"
 #include "third_party/tonic/dart_library_natives.h"
 
 namespace flutter {
 
 class CanvasImage;
 
+// This must be kept in sync with the enum in painting.dart
+enum ImageByteFormat {
+  kRawRGBA,
+  kRawStraightRGBA,
+  kRawUnmodified,
+  kRawExtendedRgba128,
+  kPNG,
+};
+
 Dart_Handle EncodeImage(CanvasImage* canvas_image,
                         int format,
                         Dart_Handle callback_handle);
 
+sk_sp<SkData> EncodeImage(const sk_sp<SkImage>& raster_image,
+                          ImageByteFormat format);
+
 }  // namespace flutter
 
 #endif  // FLUTTER_LIB_UI_PAINTING_IMAGE_ENCODING_H_
diff --git a/lib/ui/painting/image_encoding_impeller.cc b/lib/ui/painting/image_encoding_impeller.cc
index bfb2365e428a49b6b5738901489340b149155c8b..6eb3c201d2944b983c91ff3c529b6e9119c12558 100644
--- a/lib/ui/painting/image_encoding_impeller.cc
+++ b/lib/ui/painting/image_encoding_impeller.cc
@@ -2,11 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "flutter/lib/ui/painting/image_encoding_impeller.h"
+
 #include "flutter/lib/ui/painting/image.h"
+#include "impeller/core/device_buffer.h"
+#include "impeller/core/formats.h"
 #include "impeller/renderer/command_buffer.h"
 #include "impeller/renderer/context.h"
-#include "impeller/renderer/device_buffer.h"
-#include "impeller/renderer/formats.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "third_party/skia/include/core/SkImage.h"
 
 namespace flutter {
 namespace {
@@ -15,12 +19,14 @@ std::optional<SkColorType> ToSkColorType(impeller::PixelFormat format) {
   switch (format) {
     case impeller::PixelFormat::kR8G8B8A8UNormInt:
       return SkColorType::kRGBA_8888_SkColorType;
+    case impeller::PixelFormat::kR16G16B16A16Float:
+      return SkColorType::kRGBA_F16_SkColorType;
     case impeller::PixelFormat::kB8G8R8A8UNormInt:
       return SkColorType::kBGRA_8888_SkColorType;
-      break;
+    case impeller::PixelFormat::kB10G10R10XR:
+      return SkColorType::kBGR_101010x_XR_SkColorType;
     default:
       return std::nullopt;
-      break;
   }
 }
 
@@ -28,11 +34,8 @@ sk_sp<SkImage> ConvertBufferToSkImage(
     const std::shared_ptr<impeller::DeviceBuffer>& buffer,
     SkColorType color_type,
     SkISize dimensions) {
-  auto buffer_view = buffer->AsBufferView();
-
   SkImageInfo image_info = SkImageInfo::Make(dimensions, color_type,
                                              SkAlphaType::kPremul_SkAlphaType);
-
   SkBitmap bitmap;
   auto func = [](void* addr, void* context) {
     auto buffer =
@@ -41,30 +44,96 @@ sk_sp<SkImage> ConvertBufferToSkImage(
     delete buffer;
   };
   auto bytes_per_pixel = image_info.bytesPerPixel();
-  bitmap.installPixels(image_info, buffer_view.contents,
+  bitmap.installPixels(image_info, buffer->OnGetContents(),
                        dimensions.width() * bytes_per_pixel, func,
                        new std::shared_ptr<impeller::DeviceBuffer>(buffer));
   bitmap.setImmutable();
 
-  sk_sp<SkImage> raster_image = SkImage::MakeFromBitmap(bitmap);
+  sk_sp<SkImage> raster_image = SkImages::RasterFromBitmap(bitmap);
   return raster_image;
 }
 
-void ConvertDlImageImpellerToSkImage(
+[[nodiscard]] fml::Status DoConvertImageToRasterImpeller(
     const sk_sp<DlImage>& dl_image,
-    std::function<void(sk_sp<SkImage>)> encode_task,
+    const std::function<void(fml::StatusOr<sk_sp<SkImage>>)>& encode_task,
+    const std::shared_ptr<const fml::SyncSwitch>& is_gpu_disabled_sync_switch,
+    const std::shared_ptr<impeller::Context>& impeller_context) {
+  fml::Status result;
+  is_gpu_disabled_sync_switch->Execute(
+      fml::SyncSwitch::Handlers()
+          .SetIfTrue([&result] {
+            result =
+                fml::Status(fml::StatusCode::kUnavailable, "GPU unavailable.");
+          })
+          .SetIfFalse([&dl_image, &encode_task, &impeller_context] {
+            ImageEncodingImpeller::ConvertDlImageToSkImage(
+                dl_image, encode_task, impeller_context);
+          }));
+  return result;
+}
+
+/// Same as `DoConvertImageToRasterImpeller` but it will attempt to retry the
+/// operation if `DoConvertImageToRasterImpeller` returns kUnavailable when the
+/// GPU becomes available again.
+void DoConvertImageToRasterImpellerWithRetry(
+    const sk_sp<DlImage>& dl_image,
+    std::function<void(fml::StatusOr<sk_sp<SkImage>>)>&& encode_task,
+    const std::shared_ptr<const fml::SyncSwitch>& is_gpu_disabled_sync_switch,
+    const std::shared_ptr<impeller::Context>& impeller_context,
+    const fml::RefPtr<fml::TaskRunner>& retry_runner) {
+  fml::Status status = DoConvertImageToRasterImpeller(
+      dl_image, encode_task, is_gpu_disabled_sync_switch, impeller_context);
+  if (!status.ok()) {
+    // If the conversion failed because of the GPU is unavailable, store the
+    // task on the Context so it can be executed when the GPU becomes available.
+    if (status.code() == fml::StatusCode::kUnavailable) {
+      impeller_context->StoreTaskForGPU(
+          [dl_image, encode_task = std::move(encode_task),
+           is_gpu_disabled_sync_switch, impeller_context,
+           retry_runner]() mutable {
+            auto retry_task = [dl_image, encode_task = std::move(encode_task),
+                               is_gpu_disabled_sync_switch, impeller_context] {
+              fml::Status retry_status = DoConvertImageToRasterImpeller(
+                  dl_image, encode_task, is_gpu_disabled_sync_switch,
+                  impeller_context);
+              if (!retry_status.ok()) {
+                // The retry failed for some reason, maybe the GPU became
+                // unavailable again. Don't retry again, just fail in this case.
+                encode_task(retry_status);
+              }
+            };
+            // If a `retry_runner` is specified, post the retry to it, otherwise
+            // execute it directly.
+            if (retry_runner) {
+              retry_runner->PostTask(retry_task);
+            } else {
+              retry_task();
+            }
+          });
+    } else {
+      // Pass on errors that are not `kUnavailable`.
+      encode_task(status);
+    }
+  }
+}
+
+}  // namespace
+
+void ImageEncodingImpeller::ConvertDlImageToSkImage(
+    const sk_sp<DlImage>& dl_image,
+    std::function<void(fml::StatusOr<sk_sp<SkImage>>)> encode_task,
     const std::shared_ptr<impeller::Context>& impeller_context) {
   auto texture = dl_image->impeller_texture();
 
   if (impeller_context == nullptr) {
-    FML_LOG(ERROR) << "Impeller context was null.";
-    encode_task(nullptr);
+    encode_task(fml::Status(fml::StatusCode::kFailedPrecondition,
+                            "Impeller context was null."));
     return;
   }
 
   if (texture == nullptr) {
-    FML_LOG(ERROR) << "Image was null.";
-    encode_task(nullptr);
+    encode_task(
+        fml::Status(fml::StatusCode::kFailedPrecondition, "Image was null."));
     return;
   }
 
@@ -72,19 +141,20 @@ void ConvertDlImageImpellerToSkImage(
   auto color_type = ToSkColorType(texture->GetTextureDescriptor().format);
 
   if (dimensions.isEmpty()) {
-    FML_LOG(ERROR) << "Image dimensions were empty.";
-    encode_task(nullptr);
+    encode_task(fml::Status(fml::StatusCode::kFailedPrecondition,
+                            "Image dimensions were empty."));
     return;
   }
 
   if (!color_type.has_value()) {
-    FML_LOG(ERROR) << "Failed to get color type from pixel format.";
-    encode_task(nullptr);
+    encode_task(fml::Status(fml::StatusCode::kUnimplemented,
+                            "Failed to get color type from pixel format."));
     return;
   }
 
   impeller::DeviceBufferDescriptor buffer_desc;
   buffer_desc.storage_mode = impeller::StorageMode::kHostVisible;
+  buffer_desc.readback = true;  // set to false for testing.
   buffer_desc.size =
       texture->GetTextureDescriptor().GetByteSizeOfBaseMipLevel();
   auto buffer =
@@ -99,44 +169,31 @@ void ConvertDlImageImpellerToSkImage(
                      encode_task = std::move(encode_task)](
                         impeller::CommandBuffer::Status status) {
     if (status != impeller::CommandBuffer::Status::kCompleted) {
-      encode_task(nullptr);
+      encode_task(fml::Status(fml::StatusCode::kUnknown, ""));
       return;
     }
+    buffer->Invalidate();
     auto sk_image = ConvertBufferToSkImage(buffer, color_type, dimensions);
     encode_task(sk_image);
   };
 
-  if (!command_buffer->SubmitCommands(completion)) {
+  if (!impeller_context->GetCommandQueue()
+           ->Submit({command_buffer}, completion)
+           .ok()) {
     FML_LOG(ERROR) << "Failed to submit commands.";
   }
 }
 
-void DoConvertImageToRasterImpeller(
+void ImageEncodingImpeller::ConvertImageToRaster(
     const sk_sp<DlImage>& dl_image,
-    std::function<void(sk_sp<SkImage>)> encode_task,
-    const std::shared_ptr<const fml::SyncSwitch>& is_gpu_disabled_sync_switch,
-    const std::shared_ptr<impeller::Context>& impeller_context) {
-  is_gpu_disabled_sync_switch->Execute(
-      fml::SyncSwitch::Handlers()
-          .SetIfTrue([&encode_task] { encode_task(nullptr); })
-          .SetIfFalse([&dl_image, &encode_task, &impeller_context] {
-            ConvertDlImageImpellerToSkImage(dl_image, std::move(encode_task),
-                                            impeller_context);
-          }));
-}
-
-}  // namespace
-
-void ConvertImageToRasterImpeller(
-    const sk_sp<DlImage>& dl_image,
-    std::function<void(sk_sp<SkImage>)> encode_task,
+    std::function<void(fml::StatusOr<sk_sp<SkImage>>)> encode_task,
     const fml::RefPtr<fml::TaskRunner>& raster_task_runner,
     const fml::RefPtr<fml::TaskRunner>& io_task_runner,
     const std::shared_ptr<const fml::SyncSwitch>& is_gpu_disabled_sync_switch,
     const std::shared_ptr<impeller::Context>& impeller_context) {
   auto original_encode_task = std::move(encode_task);
   encode_task = [original_encode_task = std::move(original_encode_task),
-                 io_task_runner](sk_sp<SkImage> image) mutable {
+                 io_task_runner](fml::StatusOr<sk_sp<SkImage>> image) mutable {
     fml::TaskRunner::RunNowOrPostTask(
         io_task_runner,
         [original_encode_task = std::move(original_encode_task),
@@ -144,19 +201,33 @@ void ConvertImageToRasterImpeller(
   };
 
   if (dl_image->owning_context() != DlImage::OwningContext::kRaster) {
-    DoConvertImageToRasterImpeller(dl_image, std::move(encode_task),
-                                   is_gpu_disabled_sync_switch,
-                                   impeller_context);
+    DoConvertImageToRasterImpellerWithRetry(dl_image, std::move(encode_task),
+                                            is_gpu_disabled_sync_switch,
+                                            impeller_context,
+                                            /*retry_runner=*/nullptr);
     return;
   }
 
   raster_task_runner->PostTask([dl_image, encode_task = std::move(encode_task),
                                 io_task_runner, is_gpu_disabled_sync_switch,
-                                impeller_context]() mutable {
-    DoConvertImageToRasterImpeller(dl_image, std::move(encode_task),
-                                   is_gpu_disabled_sync_switch,
-                                   impeller_context);
+                                impeller_context,
+                                raster_task_runner]() mutable {
+    DoConvertImageToRasterImpellerWithRetry(
+        dl_image, std::move(encode_task), is_gpu_disabled_sync_switch,
+        impeller_context, raster_task_runner);
   });
 }
 
+int ImageEncodingImpeller::GetColorSpace(
+    const std::shared_ptr<impeller::Texture>& texture) {
+  const impeller::TextureDescriptor& desc = texture->GetTextureDescriptor();
+  switch (desc.format) {
+    case impeller::PixelFormat::kB10G10R10XR:  // intentional_fallthrough
+    case impeller::PixelFormat::kR16G16B16A16Float:
+      return ColorSpace::kExtendedSRGB;
+    default:
+      return ColorSpace::kSRGB;
+  }
+}
+
 }  // namespace flutter
diff --git a/lib/ui/painting/image_encoding_impeller.h b/lib/ui/painting/image_encoding_impeller.h
index 459ecf50909c4ce1f07215d773cd5d467738545e..84894407854a3efe87de4bc55c6f18e09ed1c665 100644
--- a/lib/ui/painting/image_encoding_impeller.h
+++ b/lib/ui/painting/image_encoding_impeller.h
@@ -6,7 +6,8 @@
 #define FLUTTER_LIB_UI_PAINTING_IMAGE_ENCODING_IMPELLER_H_
 
 #include "flutter/common/task_runners.h"
-#include "flutter/display_list/display_list_image.h"
+#include "flutter/display_list/image/dl_image.h"
+#include "flutter/fml/status_or.h"
 #include "flutter/fml/synchronization/sync_switch.h"
 
 namespace impeller {
@@ -15,14 +16,30 @@ class Context;
 
 namespace flutter {
 
-void ConvertImageToRasterImpeller(
-    const sk_sp<DlImage>& dl_image,
-    std::function<void(sk_sp<SkImage>)> encode_task,
-    const fml::RefPtr<fml::TaskRunner>& raster_task_runner,
-    const fml::RefPtr<fml::TaskRunner>& io_task_runner,
-    const std::shared_ptr<const fml::SyncSwitch>& is_gpu_disabled_sync_switch,
-    const std::shared_ptr<impeller::Context>& impeller_context);
+class ImageEncodingImpeller {
+ public:
+  static int GetColorSpace(const std::shared_ptr<impeller::Texture>& texture);
 
+  /// Converts a DlImage to a SkImage.
+  /// This should be called from the thread that corresponds to
+  /// `dl_image->owning_context()` when gpu access is guaranteed.
+  /// See also: `ConvertImageToRaster`.
+  /// Visible for testing.
+  static void ConvertDlImageToSkImage(
+      const sk_sp<DlImage>& dl_image,
+      std::function<void(fml::StatusOr<sk_sp<SkImage>>)> encode_task,
+      const std::shared_ptr<impeller::Context>& impeller_context);
+
+  /// Converts a DlImage to a SkImage.
+  /// `encode_task` is executed with the resulting `SkImage`.
+  static void ConvertImageToRaster(
+      const sk_sp<DlImage>& dl_image,
+      std::function<void(fml::StatusOr<sk_sp<SkImage>>)> encode_task,
+      const fml::RefPtr<fml::TaskRunner>& raster_task_runner,
+      const fml::RefPtr<fml::TaskRunner>& io_task_runner,
+      const std::shared_ptr<const fml::SyncSwitch>& is_gpu_disabled_sync_switch,
+      const std::shared_ptr<impeller::Context>& impeller_context);
+};
 }  // namespace flutter
 
 #endif  // FLUTTER_LIB_UI_PAINTING_IMAGE_ENCODING_IMPELLER_H_
diff --git a/lib/ui/painting/image_encoding_impl.h b/lib/ui/painting/image_encoding_impl.h
index 8708f38996e5d6076756fa0f5e575669076b6be5..c8af051dc5a0bb1f1eb431ef02a7cf9e75f9066b 100644
--- a/lib/ui/painting/image_encoding_impl.h
+++ b/lib/ui/painting/image_encoding_impl.h
@@ -9,13 +9,15 @@
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkSurface.h"
+#include "third_party/skia/include/gpu/GrDirectContext.h"
+#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
 
 namespace flutter {
 
 template <typename SyncSwitch>
 sk_sp<SkImage> ConvertToRasterUsingResourceContext(
-    sk_sp<SkImage> image,
-    fml::WeakPtr<GrDirectContext> resource_context,
+    const sk_sp<SkImage>& image,
+    const fml::WeakPtr<GrDirectContext>& resource_context,
     const std::shared_ptr<const SyncSwitch>& is_gpu_disabled_sync_switch) {
   sk_sp<SkSurface> surface;
   SkImageInfo surface_info = SkImageInfo::MakeN32Premul(image->dimensions());
@@ -23,14 +25,14 @@ sk_sp<SkImage> ConvertToRasterUsingResourceContext(
   is_gpu_disabled_sync_switch->Execute(
       typename SyncSwitch::Handlers()
           .SetIfTrue([&surface, &surface_info] {
-            surface = SkSurface::MakeRaster(surface_info);
+            surface = SkSurfaces::Raster(surface_info);
           })
           .SetIfFalse([&surface, &surface_info, resource_context] {
             if (resource_context) {
-              surface = SkSurface::MakeRenderTarget(
-                  resource_context.get(), SkBudgeted::kNo, surface_info);
+              surface = SkSurfaces::RenderTarget(
+                  resource_context.get(), skgpu::Budgeted::kNo, surface_info);
             } else {
-              surface = SkSurface::MakeRaster(surface_info);
+              surface = SkSurfaces::Raster(surface_info);
             }
           }));
 
@@ -40,7 +42,9 @@ sk_sp<SkImage> ConvertToRasterUsingResourceContext(
   }
 
   surface->getCanvas()->drawImage(image, 0, 0);
-  surface->getCanvas()->flush();
+  if (resource_context) {
+    resource_context->flushAndSubmit();
+  }
 
   auto snapshot = surface->makeImageSnapshot();
 
diff --git a/lib/ui/painting/image_encoding_skia.h b/lib/ui/painting/image_encoding_skia.h
index 071aadbeba7cda90a69be2d43e562f61b50cc93d..48cac8eabca886b8e5b6e617c8b716170891419a 100644
--- a/lib/ui/painting/image_encoding_skia.h
+++ b/lib/ui/painting/image_encoding_skia.h
@@ -6,7 +6,7 @@
 #define FLUTTER_LIB_UI_PAINTING_IMAGE_ENCODING_SKIA_H_
 
 #include "flutter/common/task_runners.h"
-#include "flutter/display_list/display_list_image.h"
+#include "flutter/display_list/image/dl_image.h"
 #include "flutter/fml/synchronization/sync_switch.h"
 #include "flutter/lib/ui/snapshot_delegate.h"
 
diff --git a/lib/ui/painting/image_encoding_unittests.cc b/lib/ui/painting/image_encoding_unittests.cc
index 1899054a94c1d6678207b36c7e1b0e2dccab8961..b035e5963124aa3a1e82c54c1c3abe1a8d3a0ae5 100644
--- a/lib/ui/painting/image_encoding_unittests.cc
+++ b/lib/ui/painting/image_encoding_unittests.cc
@@ -13,17 +13,40 @@
 #include "flutter/shell/common/thread_host.h"
 #include "flutter/testing/testing.h"
 #include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+#if IMPELLER_SUPPORTS_RENDERING
+#include "flutter/lib/ui/painting/image_encoding_impeller.h"
+#include "impeller/renderer/testing/mocks.h"
+#endif  // IMPELLER_SUPPORTS_RENDERING
 
 // CREATE_NATIVE_ENTRY is leaky by design
 // NOLINTBEGIN(clang-analyzer-core.StackAddressEscape)
 
+#pragma GCC diagnostic ignored "-Wunreachable-code"
+
 namespace flutter {
 namespace testing {
 
 namespace {
 fml::AutoResetWaitableEvent message_latch;
+
+class MockDlImage : public DlImage {
+ public:
+  MOCK_METHOD(sk_sp<SkImage>, skia_image, (), (const, override));
+  MOCK_METHOD(std::shared_ptr<impeller::Texture>,
+              impeller_texture,
+              (),
+              (const, override));
+  MOCK_METHOD(bool, isOpaque, (), (const, override));
+  MOCK_METHOD(bool, isTextureBacked, (), (const, override));
+  MOCK_METHOD(bool, isUIThreadSafe, (), (const, override));
+  MOCK_METHOD(SkISize, dimensions, (), (const, override));
+  MOCK_METHOD(size_t, GetApproximateByteSize, (), (const, override));
 };
 
+}  // namespace
+
 class MockSyncSwitch {
  public:
   struct Handlers {
@@ -39,8 +62,8 @@ class MockSyncSwitch {
     std::function<void()> false_handler = [] {};
   };
 
-  MOCK_CONST_METHOD1(Execute, void(const Handlers& handlers));
-  MOCK_METHOD1(SetSwitch, void(bool value));
+  MOCK_METHOD(void, Execute, (const Handlers& handlers), (const));
+  MOCK_METHOD(void, SetSwitch, (bool value));
 };
 
 TEST_F(ShellTest, EncodeImageGivesExternalTypedData) {
@@ -166,6 +189,241 @@ TEST_F(ShellTest, EncodeImageAccessesSyncSwitch) {
   DestroyShell(std::move(shell), task_runners);
 }
 
+#if IMPELLER_SUPPORTS_RENDERING
+using ::impeller::testing::MockAllocator;
+using ::impeller::testing::MockBlitPass;
+using ::impeller::testing::MockCommandBuffer;
+using ::impeller::testing::MockCommandQueue;
+using ::impeller::testing::MockDeviceBuffer;
+using ::impeller::testing::MockImpellerContext;
+using ::impeller::testing::MockTexture;
+using ::testing::_;
+using ::testing::DoAll;
+using ::testing::Invoke;
+using ::testing::InvokeArgument;
+using ::testing::Return;
+
+namespace {
+std::shared_ptr<impeller::Context> MakeConvertDlImageToSkImageContext(
+    std::vector<uint8_t>& buffer) {
+  auto context = std::make_shared<MockImpellerContext>();
+  auto command_buffer = std::make_shared<MockCommandBuffer>(context);
+  auto allocator = std::make_shared<MockAllocator>();
+  auto blit_pass = std::make_shared<MockBlitPass>();
+  auto command_queue = std::make_shared<MockCommandQueue>();
+  impeller::DeviceBufferDescriptor device_buffer_desc;
+  device_buffer_desc.size = buffer.size();
+  auto device_buffer = std::make_shared<MockDeviceBuffer>(device_buffer_desc);
+  EXPECT_CALL(*allocator, OnCreateBuffer).WillOnce(Return(device_buffer));
+  EXPECT_CALL(*blit_pass, IsValid).WillRepeatedly(Return(true));
+  EXPECT_CALL(*command_buffer, IsValid).WillRepeatedly(Return(true));
+  EXPECT_CALL(*command_buffer, OnCreateBlitPass).WillOnce(Return(blit_pass));
+  EXPECT_CALL(*context, GetResourceAllocator).WillRepeatedly(Return(allocator));
+  EXPECT_CALL(*context, CreateCommandBuffer).WillOnce(Return(command_buffer));
+  EXPECT_CALL(*device_buffer, OnGetContents).WillOnce(Return(buffer.data()));
+  EXPECT_CALL(*command_queue, Submit(_, _))
+      .WillRepeatedly(
+          DoAll(InvokeArgument<1>(impeller::CommandBuffer::Status::kCompleted),
+                Return(fml::Status())));
+  EXPECT_CALL(*context, GetCommandQueue).WillRepeatedly(Return(command_queue));
+  return context;
+}
+}  // namespace
+
+TEST_F(ShellTest, EncodeImageRetries) {
+#ifndef FML_OS_MACOSX
+  // Only works on macos currently.
+  GTEST_SKIP();
+#endif
+  Settings settings = CreateSettingsForFixture();
+  settings.enable_impeller = true;
+  TaskRunners task_runners("test",                  // label
+                           GetCurrentTaskRunner(),  // platform
+                           CreateNewThread(),       // raster
+                           CreateNewThread(),       // ui
+                           CreateNewThread()        // io
+  );
+
+  std::unique_ptr<Shell> shell = CreateShell({
+      .settings = settings,
+      .task_runners = task_runners,
+  });
+
+  auto turn_off_gpu = [&](Dart_NativeArguments args) {
+    auto handle = Dart_GetNativeArgument(args, 0);
+    bool value = true;
+    ASSERT_TRUE(Dart_IsBoolean(handle));
+    Dart_BooleanValue(handle, &value);
+    TurnOffGPU(shell.get(), value);
+  };
+
+  AddNativeCallback("TurnOffGPU", CREATE_NATIVE_ENTRY(turn_off_gpu));
+
+  auto validate_not_null = [&](Dart_NativeArguments args) {
+    auto handle = Dart_GetNativeArgument(args, 0);
+    EXPECT_FALSE(Dart_IsNull(handle));
+    message_latch.Signal();
+  };
+
+  AddNativeCallback("ValidateNotNull", CREATE_NATIVE_ENTRY(validate_not_null));
+
+  ASSERT_TRUE(shell->IsSetup());
+  auto configuration = RunConfiguration::InferFromSettings(settings);
+  configuration.SetEntrypoint("toByteDataRetries");
+
+  shell->RunEngine(std::move(configuration), [&](auto result) {
+    ASSERT_EQ(result, Engine::RunStatus::Success);
+  });
+
+  message_latch.Wait();
+  DestroyShell(std::move(shell), task_runners);
+}
+
+TEST_F(ShellTest, EncodeImageFailsWithoutGPUImpeller) {
+#ifndef FML_OS_MACOSX
+  // Only works on macos currently.
+  GTEST_SKIP();
+#endif
+  Settings settings = CreateSettingsForFixture();
+  settings.enable_impeller = true;
+  TaskRunners task_runners("test",                  // label
+                           GetCurrentTaskRunner(),  // platform
+                           CreateNewThread(),       // raster
+                           CreateNewThread(),       // ui
+                           CreateNewThread()        // io
+  );
+
+  auto native_validate_error = [&](Dart_NativeArguments args) {
+    auto handle = Dart_GetNativeArgument(args, 0);
+
+    EXPECT_FALSE(Dart_IsNull(handle));
+
+    message_latch.Signal();
+  };
+
+  AddNativeCallback("ValidateError",
+                    CREATE_NATIVE_ENTRY(native_validate_error));
+
+  std::unique_ptr<Shell> shell = CreateShell({
+      .settings = settings,
+      .task_runners = task_runners,
+  });
+
+  auto turn_off_gpu = [&](Dart_NativeArguments args) {
+    auto handle = Dart_GetNativeArgument(args, 0);
+    bool value = true;
+    ASSERT_TRUE(Dart_IsBoolean(handle));
+    Dart_BooleanValue(handle, &value);
+    TurnOffGPU(shell.get(), true);
+  };
+
+  AddNativeCallback("TurnOffGPU", CREATE_NATIVE_ENTRY(turn_off_gpu));
+
+  auto flush_awaiting_tasks = [&](Dart_NativeArguments args) {
+    task_runners.GetIOTaskRunner()->PostTask([&] {
+      std::shared_ptr<impeller::Context> impeller_context =
+          shell->GetIOManager()->GetImpellerContext();
+      // This will cause the stored tasks to overflow and start throwing them
+      // away.
+      for (int i = 0; i < impeller::Context::kMaxTasksAwaitingGPU; ++i) {
+        impeller_context->StoreTaskForGPU([] {});
+      }
+    });
+  };
+
+  AddNativeCallback("FlushGpuAwaitingTasks",
+                    CREATE_NATIVE_ENTRY(flush_awaiting_tasks));
+
+  ASSERT_TRUE(shell->IsSetup());
+  auto configuration = RunConfiguration::InferFromSettings(settings);
+  configuration.SetEntrypoint("toByteDataWithoutGPU");
+
+  shell->RunEngine(std::move(configuration), [&](auto result) {
+    ASSERT_EQ(result, Engine::RunStatus::Success);
+  });
+
+  message_latch.Wait();
+  DestroyShell(std::move(shell), task_runners);
+}
+
+TEST(ImageEncodingImpellerTest, ConvertDlImageToSkImage16Float) {
+  sk_sp<MockDlImage> image(new MockDlImage());
+  EXPECT_CALL(*image, dimensions)
+      .WillRepeatedly(Return(SkISize::Make(100, 100)));
+  impeller::TextureDescriptor desc;
+  desc.format = impeller::PixelFormat::kR16G16B16A16Float;
+  auto texture = std::make_shared<MockTexture>(desc);
+  EXPECT_CALL(*image, impeller_texture).WillOnce(Return(texture));
+  std::vector<uint8_t> buffer;
+  buffer.reserve(100 * 100 * 8);
+  auto context = MakeConvertDlImageToSkImageContext(buffer);
+  bool did_call = false;
+  ImageEncodingImpeller::ConvertDlImageToSkImage(
+      image,
+      [&did_call](const fml::StatusOr<sk_sp<SkImage>>& image) {
+        did_call = true;
+        ASSERT_TRUE(image.ok());
+        ASSERT_TRUE(image.value());
+        EXPECT_EQ(100, image.value()->width());
+        EXPECT_EQ(100, image.value()->height());
+        EXPECT_EQ(kRGBA_F16_SkColorType, image.value()->colorType());
+        EXPECT_EQ(nullptr, image.value()->colorSpace());
+      },
+      context);
+  EXPECT_TRUE(did_call);
+}
+
+TEST(ImageEncodingImpellerTest, ConvertDlImageToSkImage10XR) {
+  sk_sp<MockDlImage> image(new MockDlImage());
+  EXPECT_CALL(*image, dimensions)
+      .WillRepeatedly(Return(SkISize::Make(100, 100)));
+  impeller::TextureDescriptor desc;
+  desc.format = impeller::PixelFormat::kB10G10R10XR;
+  auto texture = std::make_shared<MockTexture>(desc);
+  EXPECT_CALL(*image, impeller_texture).WillOnce(Return(texture));
+  std::vector<uint8_t> buffer;
+  buffer.reserve(100 * 100 * 4);
+  auto context = MakeConvertDlImageToSkImageContext(buffer);
+  bool did_call = false;
+  ImageEncodingImpeller::ConvertDlImageToSkImage(
+      image,
+      [&did_call](const fml::StatusOr<sk_sp<SkImage>>& image) {
+        did_call = true;
+        ASSERT_TRUE(image.ok());
+        ASSERT_TRUE(image.value());
+        EXPECT_EQ(100, image.value()->width());
+        EXPECT_EQ(100, image.value()->height());
+        EXPECT_EQ(kBGR_101010x_XR_SkColorType, image.value()->colorType());
+        EXPECT_EQ(nullptr, image.value()->colorSpace());
+      },
+      context);
+  EXPECT_TRUE(did_call);
+}
+
+TEST(ImageEncodingImpellerTest, PngEncoding10XR) {
+  int width = 100;
+  int height = 100;
+  SkImageInfo info = SkImageInfo::Make(
+      width, height, kBGR_101010x_XR_SkColorType, kUnpremul_SkAlphaType);
+
+  auto surface = SkSurfaces::Raster(info);
+  SkCanvas* canvas = surface->getCanvas();
+
+  SkPaint paint;
+  paint.setColor(SK_ColorBLUE);
+  paint.setAntiAlias(true);
+
+  canvas->clear(SK_ColorWHITE);
+  canvas->drawCircle(width / 2, height / 2, 100, paint);
+
+  sk_sp<SkImage> image = surface->makeImageSnapshot();
+
+  sk_sp<SkData> png = EncodeImage(image, ImageByteFormat::kPNG);
+  EXPECT_TRUE(png);
+}
+
+#endif  // IMPELLER_SUPPORTS_RENDERING
+
 }  // namespace testing
 }  // namespace flutter
 
diff --git a/lib/ui/painting/image_filter.cc b/lib/ui/painting/image_filter.cc
index 90105f4054ed1be4d8eecba1be0f4c6700bd8ec8..74f89834fe7573d85b067b6d46d386694264a405 100644
--- a/lib/ui/painting/image_filter.cc
+++ b/lib/ui/painting/image_filter.cc
@@ -4,6 +4,7 @@
 
 #include "flutter/lib/ui/painting/image_filter.h"
 
+#include "flutter/lib/ui/floating_point.h"
 #include "flutter/lib/ui/painting/matrix.h"
 #include "flutter/lib/ui/ui_dart_state.h"
 #include "third_party/tonic/converter/dart_converter.h"
@@ -52,39 +53,35 @@ ImageFilter::~ImageFilter() {}
 
 void ImageFilter::initBlur(double sigma_x,
                            double sigma_y,
-                           SkTileMode tile_mode) {
-  filter_ =
-      std::make_shared<DlBlurImageFilter>(sigma_x, sigma_y, ToDl(tile_mode));
+                           DlTileMode tile_mode) {
+  filter_ = DlBlurImageFilter::Make(SafeNarrow(sigma_x), SafeNarrow(sigma_y),
+                                    tile_mode);
 }
 
 void ImageFilter::initDilate(double radius_x, double radius_y) {
-  filter_ = std::make_shared<DlDilateImageFilter>(radius_x, radius_y);
+  filter_ =
+      DlDilateImageFilter::Make(SafeNarrow(radius_x), SafeNarrow(radius_y));
 }
 
 void ImageFilter::initErode(double radius_x, double radius_y) {
-  filter_ = std::make_shared<DlErodeImageFilter>(radius_x, radius_y);
+  filter_ =
+      DlErodeImageFilter::Make(SafeNarrow(radius_x), SafeNarrow(radius_y));
 }
 
 void ImageFilter::initMatrix(const tonic::Float64List& matrix4,
                              int filterQualityIndex) {
   auto sampling = ImageFilter::SamplingFromIndex(filterQualityIndex);
-  filter_ =
-      std::make_shared<DlMatrixImageFilter>(ToSkMatrix(matrix4), sampling);
+  filter_ = DlMatrixImageFilter::Make(ToSkMatrix(matrix4), sampling);
 }
 
 void ImageFilter::initColorFilter(ColorFilter* colorFilter) {
   FML_DCHECK(colorFilter);
-  auto dl_filter = colorFilter->dl_filter();
-  // Skia may return nullptr if the colorfilter is a no-op.
-  if (dl_filter) {
-    filter_ = std::make_shared<DlColorFilterImageFilter>(dl_filter);
-  }
+  filter_ = DlColorFilterImageFilter::Make(colorFilter->filter());
 }
 
 void ImageFilter::initComposeFilter(ImageFilter* outer, ImageFilter* inner) {
   FML_DCHECK(outer && inner);
-  filter_ = std::make_shared<DlComposeImageFilter>(outer->dl_filter(),
-                                                   inner->dl_filter());
+  filter_ = DlComposeImageFilter::Make(outer->filter(), inner->filter());
 }
 
 }  // namespace flutter
diff --git a/lib/ui/painting/image_filter.h b/lib/ui/painting/image_filter.h
index 67d97385e702dbd04a7cec3ab36a671c71a5f563..68d70b3f150c5aaeeb49f34f09e8d116d769d11e 100644
--- a/lib/ui/painting/image_filter.h
+++ b/lib/ui/painting/image_filter.h
@@ -5,14 +5,12 @@
 #ifndef FLUTTER_LIB_UI_PAINTING_IMAGE_FILTER_H_
 #define FLUTTER_LIB_UI_PAINTING_IMAGE_FILTER_H_
 
-#include "flutter/display_list/display_list_image_filter.h"
-#include "flutter/display_list/display_list_sampling_options.h"
+#include "flutter/display_list/dl_sampling_options.h"
+#include "flutter/display_list/effects/dl_image_filter.h"
 #include "flutter/lib/ui/dart_wrapper.h"
 #include "flutter/lib/ui/painting/color_filter.h"
 #include "third_party/tonic/typed_data/typed_list.h"
 
-using tonic::DartPersistentValue;
-
 namespace tonic {
 class DartLibraryNatives;
 }  // namespace tonic
@@ -30,7 +28,7 @@ class ImageFilter : public RefCountedDartWrappable<ImageFilter> {
   static DlImageSampling SamplingFromIndex(int filterQualityIndex);
   static DlFilterMode FilterModeFromIndex(int index);
 
-  void initBlur(double sigma_x, double sigma_y, SkTileMode tile_mode);
+  void initBlur(double sigma_x, double sigma_y, DlTileMode tile_mode);
   void initDilate(double radius_x, double radius_y);
   void initErode(double radius_x, double radius_y);
   void initMatrix(const tonic::Float64List& matrix4, int filter_quality_index);
@@ -38,9 +36,6 @@ class ImageFilter : public RefCountedDartWrappable<ImageFilter> {
   void initComposeFilter(ImageFilter* outer, ImageFilter* inner);
 
   const std::shared_ptr<const DlImageFilter> filter() const { return filter_; }
-  const DlImageFilter* dl_filter() const {
-    return (filter_ && filter_->skia_object()) ? filter_.get() : nullptr;
-  }
 
   static void RegisterNatives(tonic::DartLibraryNatives* natives);
 
diff --git a/lib/ui/painting/image_generator.cc b/lib/ui/painting/image_generator.cc
index d8dbe8371b4e2db1dc3fafb9d26ee55e1f19e95b..1ba1c4f4785bb2d0ce75bcf2d98c924f15a3cece 100644
--- a/lib/ui/painting/image_generator.cc
+++ b/lib/ui/painting/image_generator.cc
@@ -7,6 +7,10 @@
 #include <utility>
 
 #include "flutter/fml/logging.h"
+#include "third_party/skia/include/codec/SkEncodedOrigin.h"
+#include "third_party/skia/include/codec/SkPixmapUtils.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "third_party/skia/include/core/SkImage.h"
 
 namespace flutter {
 
@@ -28,7 +32,7 @@ sk_sp<SkImage> ImageGenerator::GetImage() {
     return nullptr;
   }
   bitmap.setImmutable();
-  return SkImage::MakeFromBitmap(bitmap);
+  return SkImages::RasterFromBitmap(bitmap);
 }
 
 BuiltinSkiaImageGenerator::~BuiltinSkiaImageGenerator() = default;
@@ -50,7 +54,7 @@ unsigned int BuiltinSkiaImageGenerator::GetPlayCount() const {
 }
 
 const ImageGenerator::FrameInfo BuiltinSkiaImageGenerator::GetFrameInfo(
-    unsigned int frame_index) const {
+    unsigned int frame_index) {
   return {.required_frame = std::nullopt,
           .duration = 0,
           .disposal_method = SkCodecAnimation::DisposalMethod::kKeep};
@@ -79,34 +83,47 @@ std::unique_ptr<ImageGenerator> BuiltinSkiaImageGenerator::MakeFromGenerator(
 
 BuiltinSkiaCodecImageGenerator::~BuiltinSkiaCodecImageGenerator() = default;
 
+static SkImageInfo getInfoIncludingExif(SkCodec* codec) {
+  SkImageInfo info = codec->getInfo();
+  if (SkEncodedOriginSwapsWidthHeight(codec->getOrigin())) {
+    info = SkPixmapUtils::SwapWidthHeight(info);
+  }
+  if (kUnpremul_SkAlphaType == info.alphaType()) {
+    // Prefer premul over unpremul (this produces better filtering in general)
+    info = info.makeAlphaType(kPremul_SkAlphaType);
+  }
+  return info;
+}
+
 BuiltinSkiaCodecImageGenerator::BuiltinSkiaCodecImageGenerator(
     std::unique_ptr<SkCodec> codec)
-    : codec_generator_(static_cast<SkCodecImageGenerator*>(
-          SkCodecImageGenerator::MakeFromCodec(std::move(codec)).release())) {}
+    : codec_(std::move(codec)) {
+  image_info_ = getInfoIncludingExif(codec_.get());
+}
 
 BuiltinSkiaCodecImageGenerator::BuiltinSkiaCodecImageGenerator(
     sk_sp<SkData> buffer)
-    : codec_generator_(static_cast<SkCodecImageGenerator*>(
-          SkCodecImageGenerator::MakeFromEncodedCodec(std::move(buffer))
-              .release())) {}
+    : codec_(SkCodec::MakeFromData(std::move(buffer)).release()) {
+  image_info_ = getInfoIncludingExif(codec_.get());
+}
 
 const SkImageInfo& BuiltinSkiaCodecImageGenerator::GetInfo() {
-  return codec_generator_->getInfo();
+  return image_info_;
 }
 
 unsigned int BuiltinSkiaCodecImageGenerator::GetFrameCount() const {
-  return codec_generator_->getFrameCount();
+  return codec_->getFrameCount();
 }
 
 unsigned int BuiltinSkiaCodecImageGenerator::GetPlayCount() const {
-  auto repetition_count = codec_generator_->getRepetitionCount();
+  auto repetition_count = codec_->getRepetitionCount();
   return repetition_count < 0 ? kInfinitePlayCount : repetition_count + 1;
 }
 
 const ImageGenerator::FrameInfo BuiltinSkiaCodecImageGenerator::GetFrameInfo(
-    unsigned int frame_index) const {
+    unsigned int frame_index) {
   SkCodec::FrameInfo info = {};
-  codec_generator_->getFrameInfo(frame_index, &info);
+  codec_->getFrameInfo(frame_index, &info);
   return {
       .required_frame = info.fRequiredFrame == SkCodec::kNoFrame
                             ? std::nullopt
@@ -117,7 +134,11 @@ const ImageGenerator::FrameInfo BuiltinSkiaCodecImageGenerator::GetFrameInfo(
 
 SkISize BuiltinSkiaCodecImageGenerator::GetScaledDimensions(
     float desired_scale) {
-  return codec_generator_->getScaledDimensions(desired_scale);
+  SkISize size = codec_->getScaledDimensions(desired_scale);
+  if (SkEncodedOriginSwapsWidthHeight(codec_->getOrigin())) {
+    std::swap(size.fWidth, size.fHeight);
+  }
+  return size;
 }
 
 bool BuiltinSkiaCodecImageGenerator::GetPixels(
@@ -131,7 +152,40 @@ bool BuiltinSkiaCodecImageGenerator::GetPixels(
   if (prior_frame.has_value()) {
     options.fPriorFrame = prior_frame.value();
   }
-  return codec_generator_->getPixels(info, pixels, row_bytes, &options);
+  SkEncodedOrigin origin = codec_->getOrigin();
+
+  SkPixmap output_pixmap(info, pixels, row_bytes);
+  SkPixmap temp_pixmap;
+  SkBitmap temp_bitmap;
+  if (origin == kTopLeft_SkEncodedOrigin) {
+    // We can decode directly into the output buffer.
+    temp_pixmap = output_pixmap;
+  } else {
+    // We need to decode into a different buffer so we can re-orient
+    // the pixels later.
+    SkImageInfo temp_info = output_pixmap.info();
+    if (SkEncodedOriginSwapsWidthHeight(origin)) {
+      // We'll be decoding into a buffer that has height and width swapped.
+      temp_info = SkPixmapUtils::SwapWidthHeight(temp_info);
+    }
+    if (!temp_bitmap.tryAllocPixels(temp_info)) {
+      FML_DLOG(ERROR) << "Failed to allocate memory for bitmap of size "
+                      << temp_info.computeMinByteSize() << "B";
+      return false;
+    }
+    temp_pixmap = temp_bitmap.pixmap();
+  }
+
+  SkCodec::Result result = codec_->getPixels(temp_pixmap, &options);
+  if (result != SkCodec::kSuccess) {
+    FML_DLOG(WARNING) << "codec could not get pixels. "
+                      << SkCodec::ResultToString(result);
+    return false;
+  }
+  if (origin == kTopLeft_SkEncodedOrigin) {
+    return true;
+  }
+  return SkPixmapUtils::Orient(output_pixmap, temp_pixmap, origin);
 }
 
 std::unique_ptr<ImageGenerator> BuiltinSkiaCodecImageGenerator::MakeFromData(
diff --git a/lib/ui/painting/image_generator.h b/lib/ui/painting/image_generator.h
index 13b93fc94c3dce0583eb6a96a9e2355ed62d776e..e461eae5b302d7f693a817514c69d855807d995c 100644
--- a/lib/ui/painting/image_generator.h
+++ b/lib/ui/painting/image_generator.h
@@ -7,9 +7,13 @@
 
 #include <optional>
 #include "flutter/fml/macros.h"
+#include "third_party/skia/include/codec/SkCodec.h"
 #include "third_party/skia/include/codec/SkCodecAnimation.h"
+#include "third_party/skia/include/core/SkData.h"
+#include "third_party/skia/include/core/SkImage.h"
+#include "third_party/skia/include/core/SkImageGenerator.h"
 #include "third_party/skia/include/core/SkImageInfo.h"
-#include "third_party/skia/src/codec/SkCodecImageGenerator.h"
+#include "third_party/skia/include/core/SkSize.h"
 
 namespace flutter {
 
@@ -33,11 +37,18 @@ class ImageGenerator {
     /// blended with.
     std::optional<unsigned int> required_frame;
 
-    /// Number of milliseconds to show this frame.
+    /// Number of milliseconds to show this frame. 0 means only show it for one
+    /// frame.
     unsigned int duration;
 
     /// How this frame should be modified before decoding the next one.
     SkCodecAnimation::DisposalMethod disposal_method;
+
+    /// The region of the frame that is affected by the disposal method.
+    std::optional<SkIRect> disposal_rect;
+
+    /// How this frame should be blended with the previous frame.
+    SkCodecAnimation::Blend blend_mode;
   };
 
   virtual ~ImageGenerator();
@@ -76,7 +87,7 @@ class ImageGenerator {
   /// @return     Information about the given frame. If the image is
   ///             single-frame, a default result is returned.
   /// @see        `GetFrameCount`
-  virtual const FrameInfo GetFrameInfo(unsigned int frame_index) const = 0;
+  virtual const FrameInfo GetFrameInfo(unsigned int frame_index) = 0;
 
   /// @brief      Given a scale value, find the closest image size that can be
   ///             used for efficiently decoding the image. If subpixel image
@@ -148,7 +159,7 @@ class BuiltinSkiaImageGenerator : public ImageGenerator {
 
   // |ImageGenerator|
   const ImageGenerator::FrameInfo GetFrameInfo(
-      unsigned int frame_index) const override;
+      unsigned int frame_index) override;
 
   // |ImageGenerator|
   SkISize GetScaledDimensions(float desired_scale) override;
@@ -188,7 +199,7 @@ class BuiltinSkiaCodecImageGenerator : public ImageGenerator {
 
   // |ImageGenerator|
   const ImageGenerator::FrameInfo GetFrameInfo(
-      unsigned int frame_index) const override;
+      unsigned int frame_index) override;
 
   // |ImageGenerator|
   SkISize GetScaledDimensions(float desired_scale) override;
@@ -205,7 +216,8 @@ class BuiltinSkiaCodecImageGenerator : public ImageGenerator {
 
  private:
   FML_DISALLOW_COPY_ASSIGN_AND_MOVE(BuiltinSkiaCodecImageGenerator);
-  std::unique_ptr<SkCodecImageGenerator> codec_generator_;
+  std::unique_ptr<SkCodec> codec_;
+  SkImageInfo image_info_;
 };
 
 }  // namespace flutter
diff --git a/lib/ui/painting/image_generator_apng.cc b/lib/ui/painting/image_generator_apng.cc
new file mode 100644
index 0000000000000000000000000000000000000000..159d87638aeb2b47b6b8b91166e0afbc702e34bf
--- /dev/null
+++ b/lib/ui/painting/image_generator_apng.cc
@@ -0,0 +1,643 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "image_generator_apng.h"
+#include <cstddef>
+#include <cstring>
+
+#include "flutter/fml/logging.h"
+#include "third_party/skia/include/codec/SkCodec.h"
+#include "third_party/skia/include/codec/SkCodecAnimation.h"
+#include "third_party/skia/include/core/SkAlphaType.h"
+#include "third_party/skia/include/core/SkColorType.h"
+#include "third_party/skia/include/core/SkImageInfo.h"
+#include "third_party/skia/include/core/SkStream.h"
+#include "third_party/zlib/zlib.h"  // For crc32
+
+namespace flutter {
+
+APNGImageGenerator::~APNGImageGenerator() = default;
+
+APNGImageGenerator::APNGImageGenerator(sk_sp<SkData>& data,
+                                       SkImageInfo& image_info,
+                                       APNGImage&& default_image,
+                                       unsigned int frame_count,
+                                       unsigned int play_count,
+                                       const void* next_chunk_p,
+                                       const std::vector<uint8_t>& header)
+    : data_(data),
+      image_info_(image_info),
+      frame_count_(frame_count),
+      play_count_(play_count),
+      first_frame_index_(default_image.frame_info.has_value() ? 0 : 1),
+      next_chunk_p_(next_chunk_p),
+      header_(header) {
+  images_.push_back(std::move(default_image));
+}
+
+const SkImageInfo& APNGImageGenerator::GetInfo() {
+  return image_info_;
+}
+
+unsigned int APNGImageGenerator::GetFrameCount() const {
+  return frame_count_;
+}
+
+unsigned int APNGImageGenerator::GetPlayCount() const {
+  return frame_count_ > 1 ? play_count_ : 1;
+}
+
+const ImageGenerator::FrameInfo APNGImageGenerator::GetFrameInfo(
+    unsigned int frame_index) {
+  unsigned int image_index = first_frame_index_ + frame_index;
+  if (!DemuxToImageIndex(image_index)) {
+    return {};
+  }
+
+  auto frame_info = images_[image_index].frame_info;
+  if (frame_info.has_value()) {
+    return frame_info.value();
+  }
+  return {};
+}
+
+SkISize APNGImageGenerator::GetScaledDimensions(float desired_scale) {
+  return image_info_.dimensions();
+}
+
+bool APNGImageGenerator::GetPixels(const SkImageInfo& info,
+                                   void* pixels,
+                                   size_t row_bytes,
+                                   unsigned int frame_index,
+                                   std::optional<unsigned int> prior_frame) {
+  FML_DCHECK(images_.size() > 0);
+  unsigned int image_index = first_frame_index_ + frame_index;
+
+  //----------------------------------------------------------------------------
+  /// 1. Demux the frame from the APNG stream.
+  ///
+
+  if (!DemuxToImageIndex(image_index)) {
+    FML_DLOG(ERROR) << "Couldn't demux image at index " << image_index
+                    << " (frame index: " << frame_index
+                    << ") from APNG stream.";
+    return RenderDefaultImage(info, pixels, row_bytes);
+  }
+
+  //----------------------------------------------------------------------------
+  /// 2. Decode the frame.
+  ///
+
+  APNGImage& frame = images_[image_index];
+  SkImageInfo frame_info = frame.codec->getInfo();
+  auto frame_row_bytes = frame_info.bytesPerPixel() * frame_info.width();
+
+  if (frame.pixels.empty()) {
+    frame.pixels.resize(frame_row_bytes * frame_info.height());
+    SkCodec::Result result = frame.codec->getPixels(
+        frame.codec->getInfo(), frame.pixels.data(), frame_row_bytes);
+    if (result != SkCodec::kSuccess) {
+      FML_DLOG(ERROR) << "Failed to decode image at index " << image_index
+                      << " (frame index: " << frame_index
+                      << ") of APNG. SkCodec::Result: " << result;
+      return RenderDefaultImage(info, pixels, row_bytes);
+    }
+  }
+  if (!frame.frame_info.has_value()) {
+    FML_DLOG(ERROR) << "Failed to decode image at index " << image_index
+                    << " (frame index: " << frame_index
+                    << ") of APNG due to the frame missing data (frame_info).";
+    return false;
+  }
+
+  //----------------------------------------------------------------------------
+  /// 3. Composite the frame onto the canvas.
+  ///
+
+  if (info.colorType() != kN32_SkColorType) {
+    FML_DLOG(ERROR) << "Failed to composite image at index " << image_index
+                    << " (frame index: " << frame_index
+                    << ") of APNG due to the destination surface having an "
+                       "unsupported color type.";
+    return false;
+  }
+  if (frame_info.colorType() != kN32_SkColorType) {
+    FML_DLOG(ERROR)
+        << "Failed to composite image at index " << image_index
+        << " (frame index: " << frame_index
+        << ") of APNG due to the frame having an unsupported color type.";
+    return false;
+  }
+
+  // Regardless of the byte order (RGBA vs BGRA), the blending operations are
+  // the same.
+  struct Pixel {
+    uint8_t channel[4];
+
+    uint8_t GetAlpha() { return channel[3]; }
+
+    void Premultiply() {
+      for (int i = 0; i < 3; i++) {
+        channel[i] = channel[i] * GetAlpha() / 0xFF;
+      }
+    }
+
+    void Unpremultiply() {
+      if (GetAlpha() == 0) {
+        channel[0] = channel[1] = channel[2] = 0;
+        return;
+      }
+      for (int i = 0; i < 3; i++) {
+        channel[i] = channel[i] * 0xFF / GetAlpha();
+      }
+    }
+  };
+
+  FML_DCHECK(frame_info.bytesPerPixel() == sizeof(Pixel));
+
+  bool result = true;
+
+  if (frame.frame_info->blend_mode == SkCodecAnimation::Blend::kSrc) {
+    SkPixmap src_pixmap(frame_info, frame.pixels.data(), frame_row_bytes);
+    uint8_t* dst_pixels = static_cast<uint8_t*>(pixels) +
+                          frame.y_offset * row_bytes +
+                          frame.x_offset * frame_info.bytesPerPixel();
+    result = src_pixmap.readPixels(info, dst_pixels, row_bytes);
+    if (!result) {
+      FML_DLOG(ERROR) << "Failed to copy pixels at index " << image_index
+                      << " (frame index: " << frame_index << ") of APNG.";
+    }
+  } else if (frame.frame_info->blend_mode ==
+             SkCodecAnimation::Blend::kSrcOver) {
+    for (int y = 0; y < frame_info.height(); y++) {
+      auto src_row = frame.pixels.data() + y * frame_row_bytes;
+      auto dst_row = static_cast<uint8_t*>(pixels) +
+                     (y + frame.y_offset) * row_bytes +
+                     frame.x_offset * frame_info.bytesPerPixel();
+
+      for (int x = 0; x < frame_info.width(); x++) {
+        auto x_offset_bytes = x * frame_info.bytesPerPixel();
+
+        Pixel src = *reinterpret_cast<Pixel*>(src_row + x_offset_bytes);
+        Pixel* dst_p = reinterpret_cast<Pixel*>(dst_row + x_offset_bytes);
+        Pixel dst = *dst_p;
+
+        // Ensure both colors are premultiplied for the blending operation.
+        if (info.alphaType() == kUnpremul_SkAlphaType) {
+          dst.Premultiply();
+        }
+        if (frame_info.alphaType() == kUnpremul_SkAlphaType) {
+          src.Premultiply();
+        }
+
+        for (int i = 0; i < 4; i++) {
+          dst.channel[i] =
+              src.channel[i] + dst.channel[i] * (0xFF - src.GetAlpha()) / 0xFF;
+        }
+
+        // The final color is premultiplied. Unpremultiply to match the
+        // backdrop surface if necessary.
+        if (info.alphaType() == kUnpremul_SkAlphaType) {
+          dst.Unpremultiply();
+        }
+
+        *dst_p = dst;
+      }
+    }
+  }
+
+  return result;
+}
+
+std::unique_ptr<ImageGenerator> APNGImageGenerator::MakeFromData(
+    sk_sp<SkData> data) {
+  // Ensure the buffer is large enough to at least contain the PNG signature
+  // and a chunk header.
+  if (data->size() < sizeof(kPngSignature) + sizeof(ChunkHeader)) {
+    return nullptr;
+  }
+  // Validate the full PNG signature.
+  const uint8_t* data_p = static_cast<const uint8_t*>(data.get()->data());
+  if (memcmp(data_p, kPngSignature, sizeof(kPngSignature))) {
+    return nullptr;
+  }
+
+  // Validate the header chunk.
+  const ChunkHeader* chunk = reinterpret_cast<const ChunkHeader*>(data_p + 8);
+  if (!IsValidChunkHeader(data_p, data->size(), chunk) ||
+      chunk->get_data_length() != sizeof(ImageHeaderChunkData) ||
+      chunk->get_type() != kImageHeaderChunkType) {
+    return nullptr;
+  }
+
+  // Walk the chunks to find the "animation control" chunk. If an "image data"
+  // chunk is found first, this PNG is not animated.
+  while (true) {
+    chunk = GetNextChunk(data_p, data->size(), chunk);
+
+    if (chunk == nullptr) {
+      return nullptr;
+    }
+    if (chunk->get_type() == kImageDataChunkType) {
+      return nullptr;
+    }
+    if (chunk->get_type() == kAnimationControlChunkType) {
+      break;
+    }
+  }
+
+  const AnimationControlChunkData* animation_data =
+      CastChunkData<AnimationControlChunkData>(chunk);
+
+  // Extract the header signature and chunks to prepend when demuxing images.
+  std::optional<std::vector<uint8_t>> header;
+  const void* first_chunk_p;
+  std::tie(header, first_chunk_p) = ExtractHeader(data_p, data->size());
+  if (!header.has_value()) {
+    return nullptr;
+  }
+
+  // Demux the first image in the APNG chunk stream in order to interpret
+  // extent and blending info immediately.
+  std::optional<APNGImage> default_image;
+  const void* next_chunk_p;
+  std::tie(default_image, next_chunk_p) =
+      DemuxNextImage(data_p, data->size(), header.value(), first_chunk_p);
+  if (!default_image.has_value()) {
+    return nullptr;
+  }
+
+  unsigned int play_count = animation_data->get_num_plays();
+  if (play_count == 0) {
+    play_count = kInfinitePlayCount;
+  }
+
+  SkImageInfo image_info = default_image.value().codec->getInfo();
+  return std::unique_ptr<APNGImageGenerator>(
+      new APNGImageGenerator(data, image_info, std::move(default_image.value()),
+                             animation_data->get_num_frames(), play_count,
+                             next_chunk_p, header.value()));
+}
+
+bool APNGImageGenerator::IsValidChunkHeader(const void* buffer,
+                                            size_t size,
+                                            const ChunkHeader* chunk) {
+  // Ensure the chunk doesn't start before the beginning of the buffer.
+  if (reinterpret_cast<const uint8_t*>(chunk) <
+      static_cast<const uint8_t*>(buffer)) {
+    return false;
+  }
+
+  // Ensure the buffer is large enough to contain at least the chunk header.
+  if (reinterpret_cast<const uint8_t*>(chunk) + sizeof(ChunkHeader) >
+      static_cast<const uint8_t*>(buffer) + size) {
+    return false;
+  }
+
+  // Ensure the buffer is large enough to contain the chunk's given data size
+  // and CRC.
+  const uint8_t* chunk_end =
+      reinterpret_cast<const uint8_t*>(chunk) + GetChunkSize(chunk);
+  if (chunk_end > static_cast<const uint8_t*>(buffer) + size) {
+    return false;
+  }
+
+  // Ensure the 4-byte type only contains ISO 646 letters.
+  uint32_t type = chunk->get_type();
+  for (int i = 0; i < 4; i++) {
+    uint8_t c = type >> i * 8 & 0xFF;
+    if (!((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z'))) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+const APNGImageGenerator::ChunkHeader* APNGImageGenerator::GetNextChunk(
+    const void* buffer,
+    size_t size,
+    const ChunkHeader* current_chunk) {
+  FML_DCHECK((uint8_t*)current_chunk + sizeof(ChunkHeader) <=
+             (uint8_t*)buffer + size);
+
+  const ChunkHeader* next_chunk = reinterpret_cast<const ChunkHeader*>(
+      reinterpret_cast<const uint8_t*>(current_chunk) +
+      GetChunkSize(current_chunk));
+  if (!IsValidChunkHeader(buffer, size, next_chunk)) {
+    return nullptr;
+  }
+
+  return next_chunk;
+}
+
+std::pair<std::optional<std::vector<uint8_t>>, const void*>
+APNGImageGenerator::ExtractHeader(const void* buffer_p, size_t buffer_size) {
+  std::vector<uint8_t> result(sizeof(kPngSignature));
+  memcpy(result.data(), kPngSignature, sizeof(kPngSignature));
+
+  const ChunkHeader* chunk = reinterpret_cast<const ChunkHeader*>(
+      static_cast<const uint8_t*>(buffer_p) + sizeof(kPngSignature));
+  // Validate the first chunk to ensure it's safe to read.
+  if (!IsValidChunkHeader(buffer_p, buffer_size, chunk)) {
+    return std::make_pair(std::nullopt, nullptr);
+  }
+
+  // Walk the chunks and copy in the non-APNG chunks until we come across a
+  // frame or image chunk.
+  do {
+    if (chunk->get_type() != kAnimationControlChunkType) {
+      size_t chunk_size = GetChunkSize(chunk);
+      result.resize(result.size() + chunk_size);
+      memcpy(result.data() + result.size() - chunk_size, chunk, chunk_size);
+    }
+
+    chunk = GetNextChunk(buffer_p, buffer_size, chunk);
+  } while (chunk != nullptr && chunk->get_type() != kFrameControlChunkType &&
+           chunk->get_type() != kImageDataChunkType &&
+           chunk->get_type() != kFrameDataChunkType);
+
+  // nullptr means the end of the buffer was reached, which means there's no
+  // frame or image data, so just return nothing because the PNG isn't even
+  // valid.
+  if (chunk == nullptr) {
+    return std::make_pair(std::nullopt, nullptr);
+  }
+
+  return std::make_pair(result, chunk);
+}
+
+std::pair<std::optional<APNGImageGenerator::APNGImage>, const void*>
+APNGImageGenerator::DemuxNextImage(const void* buffer_p,
+                                   size_t buffer_size,
+                                   const std::vector<uint8_t>& header,
+                                   const void* chunk_p) {
+  const ChunkHeader* chunk = reinterpret_cast<const ChunkHeader*>(chunk_p);
+  // Validate the given chunk to ensure it's safe to read.
+  if (!IsValidChunkHeader(buffer_p, buffer_size, chunk)) {
+    return std::make_pair(std::nullopt, nullptr);
+  }
+
+  // Expect frame data to begin at fdAT or IDAT
+  if (chunk->get_type() != kFrameControlChunkType &&
+      chunk->get_type() != kImageDataChunkType) {
+    return std::make_pair(std::nullopt, nullptr);
+  }
+
+  APNGImage result;
+  const FrameControlChunkData* control_data = nullptr;
+
+  // The presence of an fcTL chunk is optional for the first (default) image
+  // of a PNG. Both cases are handled in APNGImage.
+  if (chunk->get_type() == kFrameControlChunkType) {
+    control_data = CastChunkData<FrameControlChunkData>(chunk);
+
+    ImageGenerator::FrameInfo frame_info;
+    switch (control_data->get_blend_op()) {
+      case 0:  // APNG_BLEND_OP_SOURCE
+        frame_info.blend_mode = SkCodecAnimation::Blend::kSrc;
+        break;
+      case 1:  // APNG_BLEND_OP_OVER
+        frame_info.blend_mode = SkCodecAnimation::Blend::kSrcOver;
+        break;
+      default:
+        return std::make_pair(std::nullopt, nullptr);
+    }
+
+    SkIRect frame_rect = SkIRect::MakeXYWH(
+        control_data->get_x_offset(), control_data->get_y_offset(),
+        control_data->get_width(), control_data->get_height());
+    switch (control_data->get_dispose_op()) {
+      case 0:  // APNG_DISPOSE_OP_NONE
+        frame_info.disposal_method = SkCodecAnimation::DisposalMethod::kKeep;
+        break;
+      case 1:  // APNG_DISPOSE_OP_BACKGROUND
+        frame_info.disposal_method =
+            SkCodecAnimation::DisposalMethod::kRestoreBGColor;
+        frame_info.disposal_rect = frame_rect;
+        break;
+      case 2:  // APNG_DISPOSE_OP_PREVIOUS
+        frame_info.disposal_method =
+            SkCodecAnimation::DisposalMethod::kRestorePrevious;
+        break;
+      default:
+        return std::make_pair(std::nullopt, nullptr);
+    }
+    uint16_t denominator = control_data->get_delay_den() == 0
+                               ? 100
+                               : control_data->get_delay_den();
+    frame_info.duration =
+        static_cast<int>(control_data->get_delay_num() * 1000.f / denominator);
+
+    result.frame_info = frame_info;
+    result.x_offset = control_data->get_x_offset();
+    result.y_offset = control_data->get_y_offset();
+  }
+
+  std::vector<const ChunkHeader*> image_chunks;
+  size_t chunk_space = 0;
+
+  // Walk the chunks until the next frame, end chunk, or an invalid chunk is
+  // reached, recording the chunks to copy along with their required space.
+  // TODO(bdero): Validate that IDAT/fdAT chunks are contiguous.
+  // TODO(bdero): Validate the acTL/fcTL/fdAT sequence number ordering.
+  do {
+    if (chunk->get_type() != kFrameControlChunkType) {
+      image_chunks.push_back(chunk);
+      chunk_space += GetChunkSize(chunk);
+
+      // fdAT chunks are converted into IDAT chunks when demuxed. The only
+      // difference between these chunk types is that fdAT has a 4 byte
+      // sequence number prepended to its data, so subtract that space from
+      // the buffer.
+      if (chunk->get_type() == kFrameDataChunkType) {
+        chunk_space -= 4;
+      }
+    }
+
+    chunk = GetNextChunk(buffer_p, buffer_size, chunk);
+  } while (chunk != nullptr && chunk->get_type() != kFrameControlChunkType &&
+           chunk->get_type() != kImageTrailerChunkType);
+
+  const uint8_t end_chunk[] = {0,   0,   0,    0,    'I',  'E',
+                               'N', 'D', 0xAE, 0x42, 0x60, 0x82};
+
+  // Form a buffer for the new encoded PNG and copy the chunks in.
+  sk_sp<SkData> new_png_buffer = SkData::MakeUninitialized(
+      header.size() + chunk_space + sizeof(end_chunk));
+
+  {
+    uint8_t* write_cursor =
+        static_cast<uint8_t*>(new_png_buffer->writable_data());
+
+    // Copy the signature/header chunks
+    memcpy(write_cursor, header.data(), header.size());
+    // If this is a frame, override the width/height in the IHDR chunk.
+    if (control_data) {
+      ChunkHeader* ihdr_header =
+          reinterpret_cast<ChunkHeader*>(write_cursor + sizeof(kPngSignature));
+      ImageHeaderChunkData* ihdr_data = const_cast<ImageHeaderChunkData*>(
+          CastChunkData<ImageHeaderChunkData>(ihdr_header));
+      ihdr_data->set_width(control_data->get_width());
+      ihdr_data->set_height(control_data->get_height());
+      ihdr_header->UpdateChunkCrc32();
+    }
+    write_cursor += header.size();
+
+    // Copy the image data/ancillary chunks.
+    for (const ChunkHeader* c : image_chunks) {
+      if (c->get_type() == kFrameDataChunkType) {
+        // Write a new IDAT chunk header.
+        ChunkHeader* write_header =
+            reinterpret_cast<ChunkHeader*>(write_cursor);
+        write_header->set_data_length(c->get_data_length() - 4);
+        write_header->set_type(kImageDataChunkType);
+        write_cursor += sizeof(ChunkHeader);
+
+        // Copy all of the data except for the 4 byte sequence number at the
+        // beginning of the fdAT data.
+        memcpy(write_cursor,
+               reinterpret_cast<const uint8_t*>(c) + sizeof(ChunkHeader) + 4,
+               write_header->get_data_length());
+        write_cursor += write_header->get_data_length();
+
+        // Recompute the chunk CRC.
+        write_header->UpdateChunkCrc32();
+        write_cursor += 4;
+      } else {
+        size_t chunk_size = GetChunkSize(c);
+        memcpy(write_cursor, c, chunk_size);
+        write_cursor += chunk_size;
+      }
+    }
+
+    // Copy the trailer chunk.
+    memcpy(write_cursor, &end_chunk, sizeof(end_chunk));
+  }
+
+  SkCodec::Result header_parse_result;
+  result.codec = SkCodec::MakeFromStream(SkMemoryStream::Make(new_png_buffer),
+                                         &header_parse_result);
+  if (header_parse_result != SkCodec::Result::kSuccess) {
+    FML_DLOG(ERROR)
+        << "Failed to parse image header during APNG demux. SkCodec::Result: "
+        << header_parse_result;
+    return std::make_pair(std::nullopt, nullptr);
+  }
+
+  if (chunk->get_type() == kImageTrailerChunkType) {
+    chunk = nullptr;
+  }
+
+  return std::make_pair(std::optional<APNGImage>{std::move(result)}, chunk);
+}
+
+bool APNGImageGenerator::DemuxNextImageInternal() {
+  if (next_chunk_p_ == nullptr) {
+    return false;
+  }
+
+  std::optional<APNGImage> image;
+  const void* data_p = const_cast<void*>(data_.get()->data());
+  std::tie(image, next_chunk_p_) =
+      DemuxNextImage(data_p, data_->size(), header_, next_chunk_p_);
+  if (!image.has_value() || !image->frame_info.has_value()) {
+    return false;
+  }
+
+  auto last_frame_info = images_.back().frame_info;
+  if (!last_frame_info.has_value()) {
+    return false;
+  }
+
+  if (images_.size() > first_frame_index_ &&
+      (last_frame_info->disposal_method ==
+           SkCodecAnimation::DisposalMethod::kKeep ||
+       last_frame_info->disposal_method ==
+           SkCodecAnimation::DisposalMethod::kRestoreBGColor)) {
+    // Mark the required frame as the previous frame in all cases.
+    image->frame_info->required_frame = images_.size() - 1;
+  } else if (images_.size() > (first_frame_index_ + 1) &&
+             last_frame_info->disposal_method ==
+                 SkCodecAnimation::DisposalMethod::kRestorePrevious) {
+    // Mark the required frame as the last previous frame
+    // It is not valid if there are 2 or above frames set |disposal_method| to
+    // |kRestorePrevious|. But it also works in MultiFrameCodec.
+    image->frame_info->required_frame = images_.size() - 2;
+  }
+
+  // Calling SkCodec::getInfo at least once prior to decoding is mandatory.
+  SkImageInfo info = image.value().codec->getInfo();
+  FML_DCHECK(info.colorInfo() == image_info_.colorInfo());
+
+  images_.push_back(std::move(image.value()));
+
+  auto default_info = images_[0].codec->getInfo();
+  if (info.colorType() != default_info.colorType()) {
+    return false;
+  }
+  return true;
+}
+
+bool APNGImageGenerator::DemuxToImageIndex(unsigned int image_index) {
+  // If the requested image doesn't exist yet, demux more frames from the APNG
+  // stream.
+  if (image_index >= images_.size()) {
+    while (DemuxNextImageInternal() && image_index >= images_.size()) {
+    }
+
+    if (image_index >= images_.size()) {
+      // The chunk stream was exhausted before the image was found.
+      return false;
+    }
+  }
+
+  return true;
+}
+
+void APNGImageGenerator::ChunkHeader::UpdateChunkCrc32() {
+  uint32_t* crc_p =
+      reinterpret_cast<uint32_t*>(reinterpret_cast<uint8_t*>(this) +
+                                  sizeof(ChunkHeader) + get_data_length());
+  *crc_p = fml::BigEndianToArch(ComputeChunkCrc32());
+}
+
+uint32_t APNGImageGenerator::ChunkHeader::ComputeChunkCrc32() {
+  // Exclude the length field at the beginning of the chunk header.
+  size_t length = sizeof(ChunkHeader) - 4 + get_data_length();
+  uint8_t* chunk_data_p = reinterpret_cast<uint8_t*>(this) + 4;
+  uint32_t crc = 0;
+
+  // zlib's crc32 can only take 16 bits at a time for the length, but PNG
+  // supports a 32 bit chunk length, so looping is necessary here.
+  // Note that crc32 is always called at least once, even if the chunk has an
+  // empty data section.
+  do {
+    uint16_t length16 = length;
+    if (length16 == 0 && length > 0) {
+      length16 = std::numeric_limits<uint16_t>::max();
+    }
+
+    crc = crc32(crc, chunk_data_p, length16);
+    length -= length16;
+    chunk_data_p += length16;
+  } while (length > 0);
+
+  return crc;
+}
+
+bool APNGImageGenerator::RenderDefaultImage(const SkImageInfo& info,
+                                            void* pixels,
+                                            size_t row_bytes) {
+  SkCodec::Result result = images_[0].codec->getPixels(info, pixels, row_bytes);
+  if (result != SkCodec::kSuccess) {
+    FML_DLOG(ERROR) << "Failed to decode the APNG's default/fallback image. "
+                       "SkCodec::Result: "
+                    << result;
+    return false;
+  }
+  return true;
+}
+
+}  // namespace flutter
diff --git a/lib/ui/painting/image_generator_apng.h b/lib/ui/painting/image_generator_apng.h
new file mode 100644
index 0000000000000000000000000000000000000000..1bf1c26e298d0c56cc1701934597d86f980f7e79
--- /dev/null
+++ b/lib/ui/painting/image_generator_apng.h
@@ -0,0 +1,221 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_LIB_UI_PAINTING_IMAGE_GENERATOR_APNG_H_
+#define FLUTTER_LIB_UI_PAINTING_IMAGE_GENERATOR_APNG_H_
+
+#include "image_generator.h"
+
+#include "flutter/fml/endianness.h"
+#include "flutter/fml/logging.h"
+
+#define PNG_FIELD(T, name)                \
+ private:                                 \
+  T name;                                 \
+                                          \
+ public:                                  \
+  T get_##name() const {                  \
+    return fml::BigEndianToArch<T>(name); \
+  }                                       \
+  void set_##name(T n) {                  \
+    name = fml::BigEndianToArch<T>(n);    \
+  }
+
+namespace flutter {
+
+class APNGImageGenerator : public ImageGenerator {
+ public:
+  ~APNGImageGenerator();
+
+  // |ImageGenerator|
+  const SkImageInfo& GetInfo() override;
+
+  // |ImageGenerator|
+  unsigned int GetFrameCount() const override;
+
+  // |ImageGenerator|
+  unsigned int GetPlayCount() const override;
+
+  // |ImageGenerator|
+  const ImageGenerator::FrameInfo GetFrameInfo(
+      unsigned int frame_index) override;
+
+  // |ImageGenerator|
+  SkISize GetScaledDimensions(float desired_scale) override;
+
+  // |ImageGenerator|
+  bool GetPixels(const SkImageInfo& info,
+                 void* pixels,
+                 size_t row_bytes,
+                 unsigned int frame_index,
+                 std::optional<unsigned int> prior_frame) override;
+
+  static std::unique_ptr<ImageGenerator> MakeFromData(sk_sp<SkData> data);
+
+ private:
+  static constexpr uint8_t kPngSignature[8] = {137, 80, 78, 71, 13, 10, 26, 10};
+  static constexpr size_t kChunkCrcSize = 4;
+
+  enum ChunkType {
+    kImageHeaderChunkType = 'IHDR',
+    kAnimationControlChunkType = 'acTL',
+    kImageDataChunkType = 'IDAT',
+    kFrameControlChunkType = 'fcTL',
+    kFrameDataChunkType = 'fdAT',
+    kImageTrailerChunkType = 'IEND',
+  };
+
+  class __attribute__((packed, aligned(1))) ChunkHeader {
+    PNG_FIELD(uint32_t, data_length)
+    PNG_FIELD(ChunkType, type)
+
+   public:
+    void UpdateChunkCrc32();
+
+   private:
+    uint32_t ComputeChunkCrc32();
+  };
+
+  class __attribute__((packed, aligned(1))) ImageHeaderChunkData {
+    PNG_FIELD(uint32_t, width)
+    PNG_FIELD(uint32_t, height)
+    PNG_FIELD(uint8_t, bit_depth)
+    PNG_FIELD(uint8_t, color_type)
+    PNG_FIELD(uint8_t, compression_method)
+    PNG_FIELD(uint8_t, filter_method)
+    PNG_FIELD(uint8_t, interlace_method)
+  };
+
+  class __attribute__((packed, aligned(1))) AnimationControlChunkData {
+    PNG_FIELD(uint32_t, num_frames)
+    PNG_FIELD(uint32_t, num_plays)
+  };
+
+  class __attribute__((packed, aligned(1))) FrameControlChunkData {
+    PNG_FIELD(uint32_t, sequence_number)
+    PNG_FIELD(uint32_t, width)
+    PNG_FIELD(uint32_t, height)
+    PNG_FIELD(uint32_t, x_offset)
+    PNG_FIELD(uint32_t, y_offset)
+    PNG_FIELD(uint16_t, delay_num)
+    PNG_FIELD(uint16_t, delay_den)
+    PNG_FIELD(uint8_t, dispose_op)
+    PNG_FIELD(uint8_t, blend_op)
+  };
+
+  /// @brief  The first PNG frame is always the "default" PNG frame. Absence of
+  ///         `frame_info` is only possible on the "default" PNG frame.
+  ///         Each frame goes through two decoding stages:
+  ///         1. Demuxing stage: An individual PNG codec is created for a frame
+  ///            while walking through the APNG chunk stream -- this is placed
+  ///            in the `codec` field.
+  ///         2. Decoding stage: When a frame is requested for the first time,
+  ///            the decoded image is requested from the `SkCodec` and then
+  ///            (depending on the `frame_info`) composited with a previous
+  ///            frame. The final "canvas" frame is placed in the
+  ///            `composited_image` field. At this point, the `codec` is freed
+  ///            and the `composited_image` is handed to the caller for drawing.
+  struct APNGImage {
+    std::unique_ptr<SkCodec> codec;
+
+    // The rendered frame pixels.
+    std::vector<uint8_t> pixels;
+
+    // Absence of frame info is possible on the "default" image.
+    std::optional<ImageGenerator::FrameInfo> frame_info;
+
+    // X offset of this image when composited. Only applicable to frames.
+    unsigned int x_offset;
+
+    // Y offset of this image when composited. Only applicable to frames.
+    unsigned int y_offset;
+  };
+
+  APNGImageGenerator(sk_sp<SkData>& data,
+                     SkImageInfo& image_info,
+                     APNGImage&& default_image,
+                     unsigned int frame_count,
+                     unsigned int play_count,
+                     const void* next_chunk_p,
+                     const std::vector<uint8_t>& header);
+
+  static bool IsValidChunkHeader(const void* buffer,
+                                 size_t size,
+                                 const ChunkHeader* chunk);
+
+  static const ChunkHeader* GetNextChunk(const void* buffer,
+                                         size_t size,
+                                         const ChunkHeader* current_chunk);
+
+  /// @brief  This is a utility template for casting a png buffer pointer to a
+  ///         chunk header. Its primary purpose is to statically insert runtime
+  ///         debug checks that detect invalid decoding behavior.
+  template <typename T>
+  static constexpr const T* CastChunkData(const ChunkHeader* chunk) {
+    if constexpr (std::is_same_v<T, ImageHeaderChunkData>) {
+      FML_DCHECK(chunk->get_type() == kImageHeaderChunkType);
+    } else if constexpr (std::is_same_v<T, AnimationControlChunkData>) {
+      FML_DCHECK(chunk->get_type() == kAnimationControlChunkType);
+    } else if constexpr (std::is_same_v<T, FrameControlChunkData>) {
+      FML_DCHECK(chunk->get_type() == kFrameControlChunkType);
+    } else {
+      static_assert(!sizeof(T), "Invalid chunk struct");
+    }
+
+    return reinterpret_cast<const T*>(reinterpret_cast<const uint8_t*>(chunk) +
+                                      sizeof(ChunkHeader));
+  }
+
+  static constexpr size_t GetChunkSize(const ChunkHeader* chunk) {
+    return sizeof(ChunkHeader) + chunk->get_data_length() + kChunkCrcSize;
+  }
+
+  static constexpr bool IsChunkCopySafe(const ChunkHeader* chunk) {
+    // The safe-to-copy bit is the 5th bit of the chunk name's 4th byte. This is
+    // the same as checking that the 4th byte is lowercase.
+    return (chunk->get_type() & 0x20) != 0;
+  }
+
+  /// @brief  Extract a header that's safe to use for both the "default" image
+  ///         and individual PNG frames. Strip the animation control chunk.
+  static std::pair<std::optional<std::vector<uint8_t>>, const void*>
+  ExtractHeader(const void* buffer_p, size_t buffer_size);
+
+  /// @brief  Takes a chunk pointer to a chunk and demuxes/interprets the next
+  ///         image in the APNG sequence. It also provides the next `chunk_p`
+  ///         to use.
+  /// @see    `APNGImage`
+  static std::pair<std::optional<APNGImage>, const void*> DemuxNextImage(
+      const void* buffer_p,
+      size_t buffer_size,
+      const std::vector<uint8_t>& header,
+      const void* chunk_p);
+
+  bool DemuxNextImageInternal();
+
+  bool DemuxToImageIndex(unsigned int image_index);
+
+  bool RenderDefaultImage(const SkImageInfo& info,
+                          void* pixels,
+                          size_t row_bytes);
+
+  FML_DISALLOW_COPY_ASSIGN_AND_MOVE(APNGImageGenerator);
+  sk_sp<SkData> data_;
+  SkImageInfo image_info_;
+  unsigned int frame_count_;
+  unsigned int play_count_;
+
+  // The first image is always the default image, which may or may not be a
+  // frame. All subsequent images are guaranteed to have frame data.
+  std::vector<APNGImage> images_;
+
+  unsigned int first_frame_index_;
+
+  const void* next_chunk_p_;
+  std::vector<uint8_t> header_;
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_LIB_UI_PAINTING_IMAGE_GENERATOR_APNG_H_
diff --git a/lib/ui/painting/image_generator_registry.cc b/lib/ui/painting/image_generator_registry.cc
index 4460182f0a6738c5018494a007114d0b22bbb1b0..ca5d83a36d359e0f2adc33ad372dd89f61a4eed4 100644
--- a/lib/ui/painting/image_generator_registry.cc
+++ b/lib/ui/painting/image_generator_registry.cc
@@ -14,9 +14,17 @@
 #include "third_party/skia/include/ports/SkImageGeneratorWIC.h"
 #endif
 
+#include "image_generator_apng.h"
+
 namespace flutter {
 
 ImageGeneratorRegistry::ImageGeneratorRegistry() : weak_factory_(this) {
+  AddFactory(
+      [](sk_sp<SkData> buffer) {
+        return APNGImageGenerator::MakeFromData(std::move(buffer));
+      },
+      0);
+
   AddFactory(
       [](sk_sp<SkData> buffer) {
         return BuiltinSkiaCodecImageGenerator::MakeFromData(std::move(buffer));
diff --git a/lib/ui/painting/image_generator_registry.h b/lib/ui/painting/image_generator_registry.h
index 96f8dc86a6fc1c96d3561a5f8a4465a3b4d3b5f7..09227d7c92592ec0ca99ee757b58d1840dd90beb 100644
--- a/lib/ui/painting/image_generator_registry.h
+++ b/lib/ui/painting/image_generator_registry.h
@@ -90,4 +90,4 @@ class ImageGeneratorRegistry {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_LIB_UI_PAINTING_IMAGE_DECODER_H_
+#endif  // FLUTTER_LIB_UI_PAINTING_IMAGE_GENERATOR_REGISTRY_H_
diff --git a/lib/ui/painting/image_generator_registry_unittests.cc b/lib/ui/painting/image_generator_registry_unittests.cc
index 3051e424106444f479c50e5c53ad2327a665a304..54eb45309e3a02440424fc3c36cd4e41ff660517 100644
--- a/lib/ui/painting/image_generator_registry_unittests.cc
+++ b/lib/ui/painting/image_generator_registry_unittests.cc
@@ -62,7 +62,7 @@ class FakeImageGenerator : public ImageGenerator {
 
   unsigned int GetPlayCount() const { return 1; }
 
-  const ImageGenerator::FrameInfo GetFrameInfo(unsigned int frame_index) const {
+  const ImageGenerator::FrameInfo GetFrameInfo(unsigned int frame_index) {
     return {std::nullopt, 0, SkCodecAnimation::DisposalMethod::kKeep};
   }
 
diff --git a/lib/ui/painting/image_shader.cc b/lib/ui/painting/image_shader.cc
index bd00fd1766e78660162f14b46051e3de5c6521ea..5093f51433c0ee3010d45d967a3b266e83eeb6ab 100644
--- a/lib/ui/painting/image_shader.cc
+++ b/lib/ui/painting/image_shader.cc
@@ -24,11 +24,12 @@ void ImageShader::Create(Dart_Handle wrapper) {
 }
 
 Dart_Handle ImageShader::initWithImage(CanvasImage* image,
-                                       SkTileMode tmx,
-                                       SkTileMode tmy,
+                                       DlTileMode tmx,
+                                       DlTileMode tmy,
                                        int filter_quality_index,
                                        Dart_Handle matrix_handle) {
-  if (!image) {
+  // CanvasImage should have already checked for a UI thread safe image.
+  if (!image || !image->image()->isUIThreadSafe()) {
     return ToDart("ImageShader constructor called with non-genuine Image.");
   }
 
@@ -40,25 +41,17 @@ Dart_Handle ImageShader::initWithImage(CanvasImage* image,
   DlImageSampling sampling =
       sampling_is_locked_ ? ImageFilter::SamplingFromIndex(filter_quality_index)
                           : DlImageSampling::kLinear;
-  cached_shader_ = UIDartState::CreateGPUObject(sk_make_sp<DlImageColorSource>(
-      image_, ToDl(tmx), ToDl(tmy), sampling, &local_matrix));
+  cached_shader_ = std::make_shared<DlImageColorSource>(
+      image_, tmx, tmy, sampling, &local_matrix);
+  FML_DCHECK(cached_shader_->isUIThreadSafe());
   return Dart_Null();
 }
 
 std::shared_ptr<DlColorSource> ImageShader::shader(DlImageSampling sampling) {
-  if (sampling_is_locked_) {
-    return cached_shader_.skia_object()->with_sampling(
-        cached_shader_.skia_object()->sampling());
+  if (sampling_is_locked_ || sampling == cached_shader_->sampling()) {
+    return cached_shader_;
   }
-  // It might seem that if the sampling is locked we can just return the
-  // cached version, but since we need to hold the cached shader in a
-  // Skia GPU wrapper, and that wrapper requires an sk_sp<>, we are holding
-  // an sk_sp<> version of the shared object and we need a shared_ptr version.
-  // So, either way, we need the with_sampling() method to shared_ptr'ify
-  // our copy.
-  // If we can get rid of the need for the GPU unref queue, then this can all
-  // be simplified down to just a shared_ptr.
-  return cached_shader_.skia_object()->with_sampling(sampling);
+  return cached_shader_->with_sampling(sampling);
 }
 
 int ImageShader::width() {
diff --git a/lib/ui/painting/image_shader.h b/lib/ui/painting/image_shader.h
index d130c5d53c3905051448f1aa03b0d5cb86d9b6fb..61b4a851ebb15c06dbe233d8ae948032534279dc 100644
--- a/lib/ui/painting/image_shader.h
+++ b/lib/ui/painting/image_shader.h
@@ -25,8 +25,8 @@ class ImageShader : public Shader {
   static void Create(Dart_Handle wrapper);
 
   Dart_Handle initWithImage(CanvasImage* image,
-                            SkTileMode tmx,
-                            SkTileMode tmy,
+                            DlTileMode tmx,
+                            DlTileMode tmy,
                             int filter_quality_index,
                             Dart_Handle matrix_handle);
 
@@ -43,7 +43,7 @@ class ImageShader : public Shader {
   sk_sp<const DlImage> image_;
   bool sampling_is_locked_;
 
-  flutter::SkiaGPUObject<DlImageColorSource> cached_shader_;
+  std::shared_ptr<DlImageColorSource> cached_shader_;
 };
 
 }  // namespace flutter
diff --git a/lib/ui/painting/immutable_buffer.cc b/lib/ui/painting/immutable_buffer.cc
index 0d86b07c24e4afe885eb97c1094e368a026b1796..0f859f3420140fd8954a95d1338bafa1842dc5e4 100644
--- a/lib/ui/painting/immutable_buffer.cc
+++ b/lib/ui/painting/immutable_buffer.cc
@@ -43,7 +43,7 @@ Dart_Handle ImmutableBuffer::init(Dart_Handle buffer_handle,
   return Dart_Null();
 }
 
-Dart_Handle ImmutableBuffer::initFromAsset(Dart_Handle buffer_handle,
+Dart_Handle ImmutableBuffer::initFromAsset(Dart_Handle raw_buffer_handle,
                                            Dart_Handle asset_name_handle,
                                            Dart_Handle callback_handle) {
   UIDartState::ThrowIfUIOperationsProhibited();
@@ -62,21 +62,60 @@ Dart_Handle ImmutableBuffer::initFromAsset(Dart_Handle buffer_handle,
   std::string asset_name = std::string{reinterpret_cast<const char*>(chars),
                                        static_cast<size_t>(asset_length)};
 
-  std::shared_ptr<AssetManager> asset_manager = UIDartState::Current()
-                                                    ->platform_configuration()
-                                                    ->client()
-                                                    ->GetAssetManager();
-  std::unique_ptr<fml::Mapping> data = asset_manager->GetAsMapping(asset_name);
-  if (data == nullptr) {
-    return tonic::ToDart("Asset not found");
-  }
+  auto* dart_state = UIDartState::Current();
+  auto ui_task_runner = dart_state->GetTaskRunners().GetUITaskRunner();
+  auto* buffer_callback_ptr =
+      new tonic::DartPersistentValue(dart_state, callback_handle);
+  auto* buffer_handle_ptr =
+      new tonic::DartPersistentValue(dart_state, raw_buffer_handle);
+  auto asset_manager = UIDartState::Current()
+                           ->platform_configuration()
+                           ->client()
+                           ->GetAssetManager();
 
-  auto size = data->GetSize();
-  const void* bytes = static_cast<const void*>(data->GetMapping());
-  auto sk_data = MakeSkDataWithCopy(bytes, size);
-  auto buffer = fml::MakeRefCounted<ImmutableBuffer>(sk_data);
-  buffer->AssociateWithDartWrapper(buffer_handle);
-  tonic::DartInvoke(callback_handle, {tonic::ToDart(size)});
+  auto ui_task = fml::MakeCopyable(
+      [buffer_callback_ptr, buffer_handle_ptr](const sk_sp<SkData>& sk_data,
+                                               size_t buffer_size) mutable {
+        std::unique_ptr<tonic::DartPersistentValue> buffer_handle(
+            buffer_handle_ptr);
+        std::unique_ptr<tonic::DartPersistentValue> buffer_callback(
+            buffer_callback_ptr);
+
+        auto dart_state = buffer_callback->dart_state().lock();
+        if (!dart_state) {
+          return;
+        }
+        tonic::DartState::Scope scope(dart_state);
+
+        if (!sk_data) {
+          // -1 is used as a sentinel that the file could not be opened.
+          tonic::DartInvoke(buffer_callback->Get(), {tonic::ToDart(-1)});
+          return;
+        }
+        auto buffer = fml::MakeRefCounted<ImmutableBuffer>(sk_data);
+        buffer->AssociateWithDartWrapper(buffer_handle->Get());
+        tonic::DartInvoke(buffer_callback->Get(), {tonic::ToDart(buffer_size)});
+      });
+
+  dart_state->GetConcurrentTaskRunner()->PostTask(
+      [asset_name = std::move(asset_name),
+       asset_manager = std::move(asset_manager),
+       ui_task_runner = std::move(ui_task_runner), ui_task] {
+        std::unique_ptr<fml::Mapping> mapping =
+            asset_manager->GetAsMapping(asset_name);
+
+        sk_sp<SkData> sk_data;
+        size_t buffer_size = 0;
+        if (mapping != nullptr) {
+          buffer_size = mapping->GetSize();
+          const void* bytes = static_cast<const void*>(mapping->GetMapping());
+          sk_data = MakeSkDataWithCopy(bytes, buffer_size);
+        }
+        ui_task_runner->PostTask(
+            [sk_data = std::move(sk_data), ui_task = ui_task, buffer_size]() {
+              ui_task(sk_data, buffer_size);
+            });
+      });
   return Dart_Null();
 }
 
@@ -101,20 +140,24 @@ Dart_Handle ImmutableBuffer::initFromFile(Dart_Handle raw_buffer_handle,
 
   auto* dart_state = UIDartState::Current();
   auto ui_task_runner = dart_state->GetTaskRunners().GetUITaskRunner();
-  auto buffer_callback =
-      std::make_unique<tonic::DartPersistentValue>(dart_state, callback_handle);
-  auto buffer_handle = std::make_unique<tonic::DartPersistentValue>(
-      dart_state, raw_buffer_handle);
+  auto* buffer_callback_ptr =
+      new tonic::DartPersistentValue(dart_state, callback_handle);
+  auto* buffer_handle_ptr =
+      new tonic::DartPersistentValue(dart_state, raw_buffer_handle);
 
   auto ui_task = fml::MakeCopyable(
-      [buffer_callback = std::move(buffer_callback),
-       buffer_handle = std::move(buffer_handle)](const sk_sp<SkData>& sk_data,
-                                                 size_t buffer_size) mutable {
+      [buffer_callback_ptr, buffer_handle_ptr](const sk_sp<SkData>& sk_data,
+                                               size_t buffer_size) mutable {
+        std::unique_ptr<tonic::DartPersistentValue> buffer_handle(
+            buffer_handle_ptr);
+        std::unique_ptr<tonic::DartPersistentValue> buffer_callback(
+            buffer_callback_ptr);
         auto dart_state = buffer_callback->dart_state().lock();
         if (!dart_state) {
           return;
         }
         tonic::DartState::Scope scope(dart_state);
+
         if (!sk_data) {
           // -1 is used as a sentinel that the file could not be opened.
           tonic::DartInvoke(buffer_callback->Get(), {tonic::ToDart(-1)});
diff --git a/lib/ui/painting/immutable_buffer.h b/lib/ui/painting/immutable_buffer.h
index daf1d6ca6d2f8da49ec98e2e1b7cfd7809a55615..42f825f03edce8b9ea39d25a58b649bed474fe1b 100644
--- a/lib/ui/painting/immutable_buffer.h
+++ b/lib/ui/painting/immutable_buffer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_LIB_UI_PAINTNIG_IMMUTABLE_BUFER_H_
-#define FLUTTER_LIB_UI_PAINTNIG_IMMUTABLE_BUFER_H_
+#ifndef FLUTTER_LIB_UI_PAINTING_IMMUTABLE_BUFFER_H_
+#define FLUTTER_LIB_UI_PAINTING_IMMUTABLE_BUFFER_H_
 
 #include <cstdint>
 
@@ -103,4 +103,4 @@ class ImmutableBuffer : public RefCountedDartWrappable<ImmutableBuffer> {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_LIB_UI_PAINTNIG_IMMUTABLE_BUFER_H_
+#endif  // FLUTTER_LIB_UI_PAINTING_IMMUTABLE_BUFFER_H_
diff --git a/lib/ui/painting/matrix.cc b/lib/ui/painting/matrix.cc
index f4f22c2b2894f3a141fdc37320672ec400747292..7b8e5ed98106bd2a86f714f906db8d31bfa4dae5 100644
--- a/lib/ui/painting/matrix.cc
+++ b/lib/ui/painting/matrix.cc
@@ -5,6 +5,7 @@
 #include "flutter/lib/ui/painting/matrix.h"
 
 #include "flutter/fml/logging.h"
+#include "flutter/lib/ui/floating_point.h"
 
 namespace flutter {
 
@@ -17,15 +18,26 @@ static const int kSkMatrixIndexToMatrix4Index[] = {
     // clang-format on
 };
 
+SkM44 ToSkM44(const tonic::Float64List& matrix4) {
+  // clang-format off
+  return SkM44(
+    SafeNarrow(matrix4[ 0]), SafeNarrow(matrix4[ 4]), SafeNarrow(matrix4[ 8]), SafeNarrow(matrix4[12]),
+    SafeNarrow(matrix4[ 1]), SafeNarrow(matrix4[ 5]), SafeNarrow(matrix4[ 9]), SafeNarrow(matrix4[13]),
+    SafeNarrow(matrix4[ 2]), SafeNarrow(matrix4[ 6]), SafeNarrow(matrix4[10]), SafeNarrow(matrix4[14]),
+    SafeNarrow(matrix4[ 3]), SafeNarrow(matrix4[ 7]), SafeNarrow(matrix4[11]), SafeNarrow(matrix4[15])
+  );
+  // clang-format on
+}
+
 SkMatrix ToSkMatrix(const tonic::Float64List& matrix4) {
   FML_DCHECK(matrix4.data());
   SkMatrix sk_matrix;
   for (int i = 0; i < 9; ++i) {
     int matrix4_index = kSkMatrixIndexToMatrix4Index[i];
     if (matrix4_index < matrix4.num_elements()) {
-      sk_matrix[i] = matrix4[matrix4_index];
+      sk_matrix[i] = SafeNarrow(matrix4[matrix4_index]);
     } else {
-      sk_matrix[i] = 0.0;
+      sk_matrix[i] = 0.0f;
     }
   }
   return sk_matrix;
diff --git a/lib/ui/painting/matrix.h b/lib/ui/painting/matrix.h
index bda531472263ec2857594c7b174b007ece1a496a..94b618cd6ff733071e642c4982ee052ee633bcd7 100644
--- a/lib/ui/painting/matrix.h
+++ b/lib/ui/painting/matrix.h
@@ -5,11 +5,13 @@
 #ifndef FLUTTER_LIB_UI_PAINTING_MATRIX_H_
 #define FLUTTER_LIB_UI_PAINTING_MATRIX_H_
 
+#include "third_party/skia/include/core/SkM44.h"
 #include "third_party/skia/include/core/SkMatrix.h"
 #include "third_party/tonic/typed_data/typed_list.h"
 
 namespace flutter {
 
+SkM44 ToSkM44(const tonic::Float64List& matrix4);
 SkMatrix ToSkMatrix(const tonic::Float64List& matrix4);
 tonic::Float64List ToMatrix4(const SkMatrix& sk_matrix);
 
diff --git a/lib/ui/painting/multi_frame_codec.cc b/lib/ui/painting/multi_frame_codec.cc
index 76af13ba161fab51b268f43801bb4c5e4c0afda1..32d1bd069592040a4b036b02562d8604fe88fbdc 100644
--- a/lib/ui/painting/multi_frame_codec.cc
+++ b/lib/ui/painting/multi_frame_codec.cc
@@ -7,13 +7,16 @@
 #include <utility>
 
 #include "flutter/fml/make_copyable.h"
+#include "flutter/lib/ui/painting/display_list_image_gpu.h"
 #include "flutter/lib/ui/painting/image.h"
 #if IMPELLER_SUPPORTS_RENDERING
 #include "flutter/lib/ui/painting/image_decoder_impeller.h"
 #endif  // IMPELLER_SUPPORTS_RENDERING
 #include "third_party/dart/runtime/include/dart_api.h"
 #include "third_party/skia/include/codec/SkCodecAnimation.h"
+#include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkPixelRef.h"
+#include "third_party/skia/include/gpu/ganesh/SkImageGanesh.h"
 #include "third_party/tonic/logging/dart_invoke.h"
 
 namespace flutter {
@@ -30,13 +33,13 @@ MultiFrameCodec::State::State(std::shared_ptr<ImageGenerator> generator)
                                ImageGenerator::kInfinitePlayCount
                            ? -1
                            : generator_->GetPlayCount() - 1),
-      is_impeller_enabled_(UIDartState::Current()->IsImpellerEnabled()),
-      nextFrameIndex_(0) {}
+      is_impeller_enabled_(UIDartState::Current()->IsImpellerEnabled()) {}
 
 static void InvokeNextFrameCallback(
     const fml::RefPtr<CanvasImage>& image,
     int duration,
-    std::unique_ptr<DartPersistentValue> callback,
+    const std::string& decode_error,
+    std::unique_ptr<tonic::DartPersistentValue> callback,
     size_t trace_id) {
   std::shared_ptr<tonic::DartState> dart_state = callback->dart_state().lock();
   if (!dart_state) {
@@ -46,46 +49,15 @@ static void InvokeNextFrameCallback(
   }
   tonic::DartState::Scope scope(dart_state);
   tonic::DartInvoke(callback->value(),
-                    {tonic::ToDart(image), tonic::ToDart(duration)});
+                    {tonic::ToDart(image), tonic::ToDart(duration),
+                     tonic::ToDart(decode_error)});
 }
 
-// Copied the source bitmap to the destination. If this cannot occur due to
-// running out of memory or the image info not being compatible, returns false.
-static bool CopyToBitmap(SkBitmap* dst,
-                         SkColorType dstColorType,
-                         const SkBitmap& src) {
-  SkPixmap srcPM;
-  if (!src.peekPixels(&srcPM)) {
-    return false;
-  }
-
-  SkBitmap tmpDst;
-  SkImageInfo dstInfo = srcPM.info().makeColorType(dstColorType);
-  if (!tmpDst.setInfo(dstInfo)) {
-    return false;
-  }
-
-  if (!tmpDst.tryAllocPixels()) {
-    return false;
-  }
-
-  SkPixmap dstPM;
-  if (!tmpDst.peekPixels(&dstPM)) {
-    return false;
-  }
-
-  if (!srcPM.readPixels(dstPM)) {
-    return false;
-  }
-
-  dst->swap(tmpDst);
-  return true;
-}
-
-sk_sp<DlImage> MultiFrameCodec::State::GetNextFrameImage(
+std::pair<sk_sp<DlImage>, std::string>
+MultiFrameCodec::State::GetNextFrameImage(
     fml::WeakPtr<GrDirectContext> resourceContext,
     const std::shared_ptr<const fml::SyncSwitch>& gpu_disable_sync_switch,
-    std::shared_ptr<impeller::Context> impeller_context_,
+    const std::shared_ptr<impeller::Context>& impeller_context,
     fml::RefPtr<flutter::SkiaUnrefQueue> unref_queue) {
   SkBitmap bitmap = SkBitmap();
   SkImageInfo info = generator_->GetInfo().makeColorType(kN32_SkColorType);
@@ -94,9 +66,12 @@ sk_sp<DlImage> MultiFrameCodec::State::GetNextFrameImage(
     info = updated;
   }
   if (!bitmap.tryAllocPixels(info)) {
-    FML_LOG(ERROR) << "Failed to allocate memory for bitmap of size "
-                   << info.computeMinByteSize() << "B";
-    return nullptr;
+    std::ostringstream ostr;
+    ostr << "Failed to allocate memory for bitmap of size "
+         << info.computeMinByteSize() << "B";
+    std::string decode_error = ostr.str();
+    FML_LOG(ERROR) << decode_error;
+    return std::make_pair(nullptr, decode_error);
   }
 
   ImageGenerator::FrameInfo frameInfo =
@@ -104,50 +79,78 @@ sk_sp<DlImage> MultiFrameCodec::State::GetNextFrameImage(
 
   const int requiredFrameIndex =
       frameInfo.required_frame.value_or(SkCodec::kNoFrame);
-  std::optional<unsigned int> prior_frame_index = std::nullopt;
 
   if (requiredFrameIndex != SkCodec::kNoFrame) {
-    if (lastRequiredFrame_ == nullptr) {
-      FML_LOG(ERROR) << "Frame " << nextFrameIndex_ << " depends on frame "
-                     << requiredFrameIndex
-                     << " and no required frames are cached.";
-      return nullptr;
-    } else if (lastRequiredFrameIndex_ != requiredFrameIndex) {
-      FML_DLOG(INFO) << "Required frame " << requiredFrameIndex
-                     << " is not cached. Using " << lastRequiredFrameIndex_
-                     << " instead";
-    }
-
-    if (lastRequiredFrame_->getPixels() &&
-        CopyToBitmap(&bitmap, lastRequiredFrame_->colorType(),
-                     *lastRequiredFrame_)) {
-      prior_frame_index = requiredFrameIndex;
+    // We are here when the frame said |disposal_method| is
+    // `DisposalMethod::kKeep` or `DisposalMethod::kRestorePrevious` and
+    // |requiredFrameIndex| is set to ex-frame or ex-ex-frame.
+    if (!lastRequiredFrame_.has_value()) {
+      FML_DLOG(INFO)
+          << "Frame " << nextFrameIndex_ << " depends on frame "
+          << requiredFrameIndex
+          << " and no required frames are cached. Using blank slate instead.";
+    } else {
+      // Copy the previous frame's output buffer into the current frame as the
+      // starting point.
+      bitmap.writePixels(lastRequiredFrame_->pixmap());
+      if (restoreBGColorRect_.has_value()) {
+        bitmap.erase(SK_ColorTRANSPARENT, restoreBGColorRect_.value());
+      }
     }
   }
 
+  // Write the new frame to the output buffer. The bitmap pixels as supplied
+  // are already set in accordance with the previous frame's disposal policy.
   if (!generator_->GetPixels(info, bitmap.getPixels(), bitmap.rowBytes(),
                              nextFrameIndex_, requiredFrameIndex)) {
-    FML_LOG(ERROR) << "Could not getPixels for frame " << nextFrameIndex_;
-    return nullptr;
+    std::ostringstream ostr;
+    ostr << "Could not getPixels for frame " << nextFrameIndex_;
+    std::string decode_error = ostr.str();
+    FML_LOG(ERROR) << decode_error;
+    return std::make_pair(nullptr, decode_error);
   }
 
-  // Hold onto this if we need it to decode future frames.
-  if (frameInfo.disposal_method == SkCodecAnimation::DisposalMethod::kKeep) {
-    lastRequiredFrame_ = std::make_unique<SkBitmap>(bitmap);
+  const bool keep_current_frame =
+      frameInfo.disposal_method == SkCodecAnimation::DisposalMethod::kKeep;
+  const bool restore_previous_frame =
+      frameInfo.disposal_method ==
+      SkCodecAnimation::DisposalMethod::kRestorePrevious;
+  const bool previous_frame_available = lastRequiredFrame_.has_value();
+
+  // Store the current frame in `lastRequiredFrame_` if the frame's disposal
+  // method indicates we should do so.
+  // * When the disposal method is "Keep", the stored frame should always be
+  //   overwritten with the new frame we just crafted.
+  // * When the disposal method is "RestorePrevious", the previously stored
+  //   frame should be retained and used as the backdrop for the next frame
+  //   again. If there isn't already a stored frame, that means we haven't
+  //   rendered any frames yet! When this happens, we just fall back to "Keep"
+  //   behavior and store the current frame as the backdrop of the next frame.
+
+  if (keep_current_frame ||
+      (previous_frame_available && !restore_previous_frame)) {
+    // Replace the stored frame. The `lastRequiredFrame_` will get used as the
+    // starting backdrop for the next frame.
+    lastRequiredFrame_ = bitmap;
     lastRequiredFrameIndex_ = nextFrameIndex_;
   }
 
+  if (frameInfo.disposal_method ==
+      SkCodecAnimation::DisposalMethod::kRestoreBGColor) {
+    restoreBGColorRect_ = frameInfo.disposal_rect;
+  } else {
+    restoreBGColorRect_.reset();
+  }
+
 #if IMPELLER_SUPPORTS_RENDERING
   if (is_impeller_enabled_) {
-    sk_sp<DlImage> result;
-    // impeller, transfer to DlImageImpeller
-    gpu_disable_sync_switch->Execute(fml::SyncSwitch::Handlers().SetIfFalse(
-        [&result, &bitmap, &impeller_context_] {
-          result = ImageDecoderImpeller::UploadTexture(
-              impeller_context_, std::make_shared<SkBitmap>(bitmap));
-        }));
-
-    return result;
+    // This is safe regardless of whether the GPU is available or not because
+    // without mipmap creation there is no command buffer encoding done.
+    return ImageDecoderImpeller::UploadTextureToStorage(
+        impeller_context, std::make_shared<SkBitmap>(bitmap),
+        std::make_shared<fml::SyncSwitch>(),
+        impeller::StorageMode::kHostVisible,
+        /*create_mips=*/false);
   }
 #endif  // IMPELLER_SUPPORTS_RENDERING
 
@@ -155,41 +158,44 @@ sk_sp<DlImage> MultiFrameCodec::State::GetNextFrameImage(
   gpu_disable_sync_switch->Execute(
       fml::SyncSwitch::Handlers()
           .SetIfTrue([&skImage, &bitmap] {
-            // Defer decoding until time of draw later on the raster thread. Can
-            // happen when GL operations are currently forbidden such as in the
-            // background on iOS.
-            skImage = SkImage::MakeFromBitmap(bitmap);
+            // Defer decoding until time of draw later on the raster thread.
+            // Can happen when GL operations are currently forbidden such as
+            // in the background on iOS.
+            skImage = SkImages::RasterFromBitmap(bitmap);
           })
           .SetIfFalse([&skImage, &resourceContext, &bitmap] {
             if (resourceContext) {
               SkPixmap pixmap(bitmap.info(), bitmap.pixelRef()->pixels(),
                               bitmap.pixelRef()->rowBytes());
-              skImage = SkImage::MakeCrossContextFromPixmap(
+              skImage = SkImages::CrossContextTextureFromPixmap(
                   resourceContext.get(), pixmap, true);
             } else {
               // Defer decoding until time of draw later on the raster thread.
               // Can happen when GL operations are currently forbidden such as
               // in the background on iOS.
-              skImage = SkImage::MakeFromBitmap(bitmap);
+              skImage = SkImages::RasterFromBitmap(bitmap);
             }
           }));
 
-  return DlImageGPU::Make({skImage, std::move(unref_queue)});
+  return std::make_pair(DlImageGPU::Make({skImage, std::move(unref_queue)}),
+                        std::string());
 }
 
 void MultiFrameCodec::State::GetNextFrameAndInvokeCallback(
-    std::unique_ptr<DartPersistentValue> callback,
+    std::unique_ptr<tonic::DartPersistentValue> callback,
     const fml::RefPtr<fml::TaskRunner>& ui_task_runner,
     fml::WeakPtr<GrDirectContext> resourceContext,
     fml::RefPtr<flutter::SkiaUnrefQueue> unref_queue,
     const std::shared_ptr<const fml::SyncSwitch>& gpu_disable_sync_switch,
     size_t trace_id,
-    std::shared_ptr<impeller::Context> impeller_context) {
+    const std::shared_ptr<impeller::Context>& impeller_context) {
   fml::RefPtr<CanvasImage> image = nullptr;
   int duration = 0;
-  sk_sp<DlImage> dlImage =
+  sk_sp<DlImage> dlImage;
+  std::string decode_error;
+  std::tie(dlImage, decode_error) =
       GetNextFrameImage(std::move(resourceContext), gpu_disable_sync_switch,
-                        std::move(impeller_context), std::move(unref_queue));
+                        impeller_context, std::move(unref_queue));
   if (dlImage) {
     image = CanvasImage::Create();
     image->set_image(dlImage);
@@ -201,11 +207,12 @@ void MultiFrameCodec::State::GetNextFrameAndInvokeCallback(
 
   // The static leak checker gets confused by the use of fml::MakeCopyable.
   // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks)
-  ui_task_runner->PostTask(fml::MakeCopyable([callback = std::move(callback),
-                                              image = std::move(image),
-                                              duration, trace_id]() mutable {
-    InvokeNextFrameCallback(image, duration, std::move(callback), trace_id);
-  }));
+  ui_task_runner->PostTask(fml::MakeCopyable(
+      [callback = std::move(callback), image = std::move(image),
+       decode_error = std::move(decode_error), duration, trace_id]() mutable {
+        InvokeNextFrameCallback(image, duration, decode_error,
+                                std::move(callback), trace_id);
+      }));
 }
 
 Dart_Handle MultiFrameCodec::getNextFrame(Dart_Handle callback_handle) {
@@ -221,18 +228,20 @@ Dart_Handle MultiFrameCodec::getNextFrame(Dart_Handle callback_handle) {
   const auto& task_runners = dart_state->GetTaskRunners();
 
   if (state_->frameCount_ == 0) {
-    FML_LOG(ERROR) << "Could not provide any frame.";
+    std::string decode_error("Could not provide any frame.");
+    FML_LOG(ERROR) << decode_error;
     task_runners.GetUITaskRunner()->PostTask(fml::MakeCopyable(
-        [trace_id,
-         callback = std::make_unique<DartPersistentValue>(
+        [trace_id, decode_error = std::move(decode_error),
+         callback = std::make_unique<tonic::DartPersistentValue>(
              tonic::DartState::Current(), callback_handle)]() mutable {
-          InvokeNextFrameCallback(nullptr, 0, std::move(callback), trace_id);
+          InvokeNextFrameCallback(nullptr, 0, decode_error, std::move(callback),
+                                  trace_id);
         }));
     return Dart_Null();
   }
 
   task_runners.GetIOTaskRunner()->PostTask(fml::MakeCopyable(
-      [callback = std::make_unique<DartPersistentValue>(
+      [callback = std::make_unique<tonic::DartPersistentValue>(
            tonic::DartState::Current(), callback_handle),
        weak_state = std::weak_ptr<MultiFrameCodec::State>(state_), trace_id,
        ui_task_runner = task_runners.GetUITaskRunner(),
@@ -251,8 +260,8 @@ Dart_Handle MultiFrameCodec::getNextFrame(Dart_Handle callback_handle) {
       }));
 
   return Dart_Null();
-  // The static leak checker gets confused by the control flow, unique pointers
-  // and closures in this function.
+  // The static leak checker gets confused by the control flow, unique
+  // pointers and closures in this function.
   // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks)
 }
 
diff --git a/lib/ui/painting/multi_frame_codec.h b/lib/ui/painting/multi_frame_codec.h
index 3cb42b0706bc4e3b3cd1e97a7d6215d9fd551cef..4a49b84570b26c7e02f64d3dbd6e9c9639b9b9e4 100644
--- a/lib/ui/painting/multi_frame_codec.h
+++ b/lib/ui/painting/multi_frame_codec.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_LIB_UI_PAINTING_MUTLI_FRAME_CODEC_H_
-#define FLUTTER_LIB_UI_PAINTING_MUTLI_FRAME_CODEC_H_
+#ifndef FLUTTER_LIB_UI_PAINTING_MULTI_FRAME_CODEC_H_
+#define FLUTTER_LIB_UI_PAINTING_MULTI_FRAME_CODEC_H_
 
 #include "flutter/fml/macros.h"
 #include "flutter/lib/ui/painting/codec.h"
 #include "flutter/lib/ui/painting/image_generator.h"
 
-using tonic::DartPersistentValue;
+#include <utility>
 
 namespace flutter {
 
@@ -49,27 +49,30 @@ class MultiFrameCodec : public Codec {
     // The non-const members and functions below here are only read or written
     // to on the IO thread. They are not safe to access or write on the UI
     // thread.
-    int nextFrameIndex_;
+    int nextFrameIndex_ = 0;
     // The last decoded frame that's required to decode any subsequent frames.
-    std::unique_ptr<SkBitmap> lastRequiredFrame_;
-
+    std::optional<SkBitmap> lastRequiredFrame_;
     // The index of the last decoded required frame.
     int lastRequiredFrameIndex_ = -1;
 
-    sk_sp<DlImage> GetNextFrameImage(
+    // The rectangle that should be cleared if the previous frame's disposal
+    // method was kRestoreBGColor.
+    std::optional<SkIRect> restoreBGColorRect_;
+
+    std::pair<sk_sp<DlImage>, std::string> GetNextFrameImage(
         fml::WeakPtr<GrDirectContext> resourceContext,
         const std::shared_ptr<const fml::SyncSwitch>& gpu_disable_sync_switch,
-        std::shared_ptr<impeller::Context> impeller_context_,
+        const std::shared_ptr<impeller::Context>& impeller_context,
         fml::RefPtr<flutter::SkiaUnrefQueue> unref_queue);
 
     void GetNextFrameAndInvokeCallback(
-        std::unique_ptr<DartPersistentValue> callback,
+        std::unique_ptr<tonic::DartPersistentValue> callback,
         const fml::RefPtr<fml::TaskRunner>& ui_task_runner,
         fml::WeakPtr<GrDirectContext> resourceContext,
         fml::RefPtr<flutter::SkiaUnrefQueue> unref_queue,
         const std::shared_ptr<const fml::SyncSwitch>& gpu_disable_sync_switch,
         size_t trace_id,
-        std::shared_ptr<impeller::Context> impeller_context_);
+        const std::shared_ptr<impeller::Context>& impeller_context);
   };
 
   // Shared across the UI and IO task runners.
@@ -81,4 +84,4 @@ class MultiFrameCodec : public Codec {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_LIB_UI_PAINTING_MUTLI_FRAME_CODEC_H_
+#endif  // FLUTTER_LIB_UI_PAINTING_MULTI_FRAME_CODEC_H_
diff --git a/lib/ui/painting/paint.cc b/lib/ui/painting/paint.cc
index e7daf2a3375e035e255992090c67eec5ff3fcc13..44bf51270664a41caeecb0d0513c8f49f13764e9 100644
--- a/lib/ui/painting/paint.cc
+++ b/lib/ui/painting/paint.cc
@@ -4,8 +4,9 @@
 
 #include "flutter/lib/ui/painting/paint.h"
 
-#include "flutter/display_list/display_list_builder.h"
+#include "flutter/display_list/dl_builder.h"
 #include "flutter/fml/logging.h"
+#include "flutter/lib/ui/floating_point.h"
 #include "flutter/lib/ui/painting/color_filter.h"
 #include "flutter/lib/ui/painting/image_filter.h"
 #include "flutter/lib/ui/painting/shader.h"
@@ -33,8 +34,9 @@ constexpr int kMaskFilterIndex = 9;
 constexpr int kMaskFilterBlurStyleIndex = 10;
 constexpr int kMaskFilterSigmaIndex = 11;
 constexpr int kInvertColorIndex = 12;
-constexpr int kDitherIndex = 13;
-constexpr size_t kDataByteCount = 56;  // 4 * (last index + 1)
+constexpr size_t kDataByteCount = 52;  // 4 * (last index + 1)
+static_assert(kDataByteCount == sizeof(uint32_t) * (kInvertColorIndex + 1),
+              "kDataByteCount must match the size of the data array.");
 
 // Indices for objects.
 constexpr int kShaderIndex = 0;
@@ -51,17 +53,7 @@ constexpr uint32_t kBlendModeDefault =
 
 // Must be kept in sync with the default in painting.dart, and also with the
 // default SkPaintDefaults_MiterLimit in Skia (which is not in a public header).
-constexpr double kStrokeMiterLimitDefault = 4.0;
-
-// A color matrix which inverts colors.
-// clang-format off
-constexpr float kInvertColors[20] = {
-  -1.0,    0,    0, 1.0, 0,
-     0, -1.0,    0, 1.0, 0,
-     0,    0, -1.0, 1.0, 0,
-   1.0,  1.0,  1.0, 1.0, 0
-};
-// clang-format on
+constexpr float kStrokeMiterLimitDefault = 4.0f;
 
 // Must be kept in sync with the MaskFilter private constants in painting.dart.
 enum MaskFilterType { kNull, kBlur };
@@ -69,132 +61,11 @@ enum MaskFilterType { kNull, kBlur };
 Paint::Paint(Dart_Handle paint_objects, Dart_Handle paint_data)
     : paint_objects_(paint_objects), paint_data_(paint_data) {}
 
-const SkPaint* Paint::paint(SkPaint& paint) const {
+const DlPaint* Paint::paint(DlPaint& paint,
+                            const DisplayListAttributeFlags& flags) const {
   if (isNull()) {
     return nullptr;
   }
-  FML_DCHECK(paint == SkPaint());
-  FML_DLOG(INFO) << " Paint::paint " ;
-  tonic::DartByteData byte_data(paint_data_);
-  FML_CHECK(byte_data.length_in_bytes() == kDataByteCount);
-
-  const uint32_t* uint_data = static_cast<const uint32_t*>(byte_data.data());
-  const float* float_data = static_cast<const float*>(byte_data.data());
-
-  Dart_Handle values[kObjectCount];
-  if (!Dart_IsNull(paint_objects_)) {
-    FML_DCHECK(Dart_IsList(paint_objects_));
-    intptr_t length = 0;
-    Dart_ListLength(paint_objects_, &length);
-
-    FML_CHECK(length == kObjectCount);
-    if (Dart_IsError(
-            Dart_ListGetRange(paint_objects_, 0, kObjectCount, values))) {
-      return nullptr;
-    }
-
-    Dart_Handle shader = values[kShaderIndex];
-    if (!Dart_IsNull(shader)) {
-      if (Shader* decoded = tonic::DartConverter<Shader*>::FromDart(shader)) {
-        auto sampling =
-            ImageFilter::SamplingFromIndex(uint_data[kFilterQualityIndex]);
-        auto color_source = decoded->shader(sampling);
-        // TODO(dnfield): Remove this restriction.
-        // This currently is only used by paragraph code. Once SkParagraph does
-        // not need to take an SkPaint, we won't be restricted in this way
-        // because we will not need to access the shader on the UI task runner.
-        if (color_source->owning_context() != DlImage::OwningContext::kRaster) {
-          paint.setShader(color_source->skia_object());
-        }
-      }
-    }
-
-    Dart_Handle color_filter = values[kColorFilterIndex];
-    if (!Dart_IsNull(color_filter)) {
-      ColorFilter* decoded =
-          tonic::DartConverter<ColorFilter*>::FromDart(color_filter);
-      paint.setColorFilter(decoded->filter()->skia_object());
-    }
-
-    Dart_Handle image_filter = values[kImageFilterIndex];
-    if (!Dart_IsNull(image_filter)) {
-      ImageFilter* decoded =
-          tonic::DartConverter<ImageFilter*>::FromDart(image_filter);
-      paint.setImageFilter(decoded->filter()->skia_object());
-    }
-  }
-
-  paint.setAntiAlias(uint_data[kIsAntiAliasIndex] == 0);
-
-  uint32_t encoded_color = uint_data[kColorIndex];
-  if (encoded_color) {
-    SkColor color = encoded_color ^ kColorDefault;
-    paint.setColor(color);
-  }
-
-  uint32_t encoded_blend_mode = uint_data[kBlendModeIndex];
-  if (encoded_blend_mode) {
-    uint32_t blend_mode = encoded_blend_mode ^ kBlendModeDefault;
-    paint.setBlendMode(static_cast<SkBlendMode>(blend_mode));
-  }
-
-  uint32_t style = uint_data[kStyleIndex];
-  if (style) {
-    paint.setStyle(static_cast<SkPaint::Style>(style));
-  }
-
-  float stroke_width = float_data[kStrokeWidthIndex];
-  if (stroke_width != 0.0) {
-    paint.setStrokeWidth(stroke_width);
-  }
-
-  uint32_t stroke_cap = uint_data[kStrokeCapIndex];
-  if (stroke_cap) {
-    paint.setStrokeCap(static_cast<SkPaint::Cap>(stroke_cap));
-  }
-
-  uint32_t stroke_join = uint_data[kStrokeJoinIndex];
-  if (stroke_join) {
-    paint.setStrokeJoin(static_cast<SkPaint::Join>(stroke_join));
-  }
-
-  float stroke_miter_limit = float_data[kStrokeMiterLimitIndex];
-  if (stroke_miter_limit != 0.0) {
-    paint.setStrokeMiter(stroke_miter_limit + kStrokeMiterLimitDefault);
-  }
-
-  if (uint_data[kInvertColorIndex]) {
-    sk_sp<SkColorFilter> invert_filter = SkColorFilters::Matrix(kInvertColors);
-    sk_sp<SkColorFilter> current_filter = paint.refColorFilter();
-    if (current_filter) {
-      invert_filter = invert_filter->makeComposed(current_filter);
-    }
-    paint.setColorFilter(invert_filter);
-  }
-
-  if (uint_data[kDitherIndex]) {
-    paint.setDither(true);
-  }
-
-  switch (uint_data[kMaskFilterIndex]) {
-    case kNull:
-      break;
-    case kBlur:
-      SkBlurStyle blur_style =
-          static_cast<SkBlurStyle>(uint_data[kMaskFilterBlurStyleIndex]);
-      double sigma = float_data[kMaskFilterSigmaIndex];
-      paint.setMaskFilter(SkMaskFilter::MakeBlur(blur_style, sigma));
-      break;
-  }
-
-  return &paint;
-}
-
-bool Paint::sync_to(DisplayListBuilder* builder,
-                    const DisplayListAttributeFlags& flags) const {
-  if (isNull()) {
-    return false;
-  }
   tonic::DartByteData byte_data(paint_data_);
   FML_CHECK(byte_data.length_in_bytes() == kDataByteCount);
 
@@ -204,13 +75,13 @@ bool Paint::sync_to(DisplayListBuilder* builder,
   Dart_Handle values[kObjectCount];
   if (Dart_IsNull(paint_objects_)) {
     if (flags.applies_shader()) {
-      builder->setColorSource(nullptr);
+      paint.setColorSource(nullptr);
     }
     if (flags.applies_color_filter()) {
-      builder->setColorFilter(nullptr);
+      paint.setColorFilter(nullptr);
     }
     if (flags.applies_image_filter()) {
-      builder->setImageFilter(nullptr);
+      paint.setImageFilter(nullptr);
     }
   } else {
     FML_DCHECK(Dart_IsList(paint_objects_));
@@ -220,20 +91,20 @@ bool Paint::sync_to(DisplayListBuilder* builder,
     FML_CHECK(length == kObjectCount);
     if (Dart_IsError(
             Dart_ListGetRange(paint_objects_, 0, kObjectCount, values))) {
-      return false;
+      return nullptr;
     }
 
     if (flags.applies_shader()) {
       Dart_Handle shader = values[kShaderIndex];
       if (Dart_IsNull(shader)) {
-        builder->setColorSource(nullptr);
+        paint.setColorSource(nullptr);
       } else {
         if (Shader* decoded = tonic::DartConverter<Shader*>::FromDart(shader)) {
           auto sampling =
               ImageFilter::SamplingFromIndex(uint_data[kFilterQualityIndex]);
-          builder->setColorSource(decoded->shader(sampling).get());
+          paint.setColorSource(decoded->shader(sampling));
         } else {
-          builder->setColorSource(nullptr);
+          paint.setColorSource(nullptr);
         }
       }
     }
@@ -241,94 +112,86 @@ bool Paint::sync_to(DisplayListBuilder* builder,
     if (flags.applies_color_filter()) {
       Dart_Handle color_filter = values[kColorFilterIndex];
       if (Dart_IsNull(color_filter)) {
-        builder->setColorFilter(nullptr);
+        paint.setColorFilter(nullptr);
       } else {
         ColorFilter* decoded =
             tonic::DartConverter<ColorFilter*>::FromDart(color_filter);
-        builder->setColorFilter(decoded->dl_filter());
+        paint.setColorFilter(decoded->filter());
       }
     }
 
     if (flags.applies_image_filter()) {
       Dart_Handle image_filter = values[kImageFilterIndex];
       if (Dart_IsNull(image_filter)) {
-        builder->setImageFilter(nullptr);
+        paint.setImageFilter(nullptr);
       } else {
         ImageFilter* decoded =
             tonic::DartConverter<ImageFilter*>::FromDart(image_filter);
-        builder->setImageFilter(decoded->dl_filter());
+        paint.setImageFilter(decoded->filter());
       }
     }
   }
 
   if (flags.applies_anti_alias()) {
-    builder->setAntiAlias(uint_data[kIsAntiAliasIndex] == 0);
+    paint.setAntiAlias(uint_data[kIsAntiAliasIndex] == 0);
   }
 
   if (flags.applies_alpha_or_color()) {
     uint32_t encoded_color = uint_data[kColorIndex];
-    builder->setColor(encoded_color ^ kColorDefault);
+    paint.setColor(DlColor(encoded_color ^ kColorDefault));
   }
 
   if (flags.applies_blend()) {
     uint32_t encoded_blend_mode = uint_data[kBlendModeIndex];
     uint32_t blend_mode = encoded_blend_mode ^ kBlendModeDefault;
-    builder->setBlendMode(static_cast<DlBlendMode>(blend_mode));
+    paint.setBlendMode(static_cast<DlBlendMode>(blend_mode));
   }
 
   if (flags.applies_style()) {
     uint32_t style = uint_data[kStyleIndex];
-    builder->setStyle(static_cast<DlDrawStyle>(style));
+    paint.setDrawStyle(static_cast<DlDrawStyle>(style));
   }
 
-  if (flags.is_stroked(builder->getStyle())) {
+  if (flags.is_stroked(paint.getDrawStyle())) {
     float stroke_width = float_data[kStrokeWidthIndex];
-    builder->setStrokeWidth(stroke_width);
+    paint.setStrokeWidth(stroke_width);
 
     float stroke_miter_limit = float_data[kStrokeMiterLimitIndex];
-    builder->setStrokeMiter(stroke_miter_limit + kStrokeMiterLimitDefault);
+    paint.setStrokeMiter(stroke_miter_limit + kStrokeMiterLimitDefault);
 
     uint32_t stroke_cap = uint_data[kStrokeCapIndex];
-    builder->setStrokeCap(static_cast<DlStrokeCap>(stroke_cap));
+    paint.setStrokeCap(static_cast<DlStrokeCap>(stroke_cap));
 
     uint32_t stroke_join = uint_data[kStrokeJoinIndex];
-    builder->setStrokeJoin(static_cast<DlStrokeJoin>(stroke_join));
+    paint.setStrokeJoin(static_cast<DlStrokeJoin>(stroke_join));
   }
 
   if (flags.applies_color_filter()) {
-    builder->setInvertColors(uint_data[kInvertColorIndex] != 0);
-  }
-
-  if (flags.applies_dither()) {
-    builder->setDither(uint_data[kDitherIndex] != 0);
+    paint.setInvertColors(uint_data[kInvertColorIndex] != 0);
   }
 
   if (flags.applies_path_effect()) {
     // The paint API exposed to Dart does not support path effects.  But other
     // operations such as text may set a path effect, which must be cleared.
-    builder->setPathEffect(nullptr);
+    paint.setPathEffect(nullptr);
   }
 
   if (flags.applies_mask_filter()) {
     switch (uint_data[kMaskFilterIndex]) {
       case kNull:
-        builder->setMaskFilter(nullptr);
+        paint.setMaskFilter(nullptr);
         break;
       case kBlur:
-        SkBlurStyle blur_style =
-            static_cast<SkBlurStyle>(uint_data[kMaskFilterBlurStyleIndex]);
+        DlBlurStyle blur_style =
+            static_cast<DlBlurStyle>(uint_data[kMaskFilterBlurStyleIndex]);
         double sigma = float_data[kMaskFilterSigmaIndex];
-        DlBlurMaskFilter dl_filter(blur_style, sigma);
-        if (dl_filter.skia_object()) {
-          builder->setMaskFilter(&dl_filter);
-        } else {
-          builder->setMaskFilter(nullptr);
-        }
+        paint.setMaskFilter(
+            DlBlurMaskFilter::Make(blur_style, SafeNarrow(sigma)));
         break;
     }
   }
 
-  return true;
+  return &paint;
 }
 
 void Paint::toDlPaint(DlPaint& paint) const {
@@ -383,7 +246,7 @@ void Paint::toDlPaint(DlPaint& paint) const {
   paint.setAntiAlias(uint_data[kIsAntiAliasIndex] == 0);
 
   uint32_t encoded_color = uint_data[kColorIndex];
-  paint.setColor(encoded_color ^ kColorDefault);
+  paint.setColor(DlColor(encoded_color ^ kColorDefault));
 
   uint32_t encoded_blend_mode = uint_data[kBlendModeIndex];
   uint32_t blend_mode = encoded_blend_mode ^ kBlendModeDefault;
@@ -406,20 +269,21 @@ void Paint::toDlPaint(DlPaint& paint) const {
 
   paint.setInvertColors(uint_data[kInvertColorIndex] != 0);
 
-  paint.setDither(uint_data[kDitherIndex] != 0);
-
   switch (uint_data[kMaskFilterIndex]) {
     case kNull:
       break;
     case kBlur:
-      SkBlurStyle blur_style =
-          static_cast<SkBlurStyle>(uint_data[kMaskFilterBlurStyleIndex]);
-      double sigma = float_data[kMaskFilterSigmaIndex];
-      std::shared_ptr<DlBlurMaskFilter> dl_filter =
-          std::make_shared<DlBlurMaskFilter>(blur_style, sigma);
-      if (dl_filter->skia_object()) {
-        paint.setMaskFilter(dl_filter);
-      }
+      DlBlurStyle blur_style =
+          static_cast<DlBlurStyle>(uint_data[kMaskFilterBlurStyleIndex]);
+      float sigma = SafeNarrow(float_data[kMaskFilterSigmaIndex]);
+      // Make could return a nullptr here if the values are NOP or
+      // do not make sense. We could interpret that as if there was
+      // no value passed from Dart at all (i.e. don't change the
+      // setting in the paint object as in the kNull branch right
+      // above here), but the maskfilter flag was actually set
+      // indicating that the developer "tried" to set a mask, so we
+      // should set the null value rather than do nothing.
+      paint.setMaskFilter(DlBlurMaskFilter::Make(blur_style, sigma));
       break;
   }
 }
diff --git a/lib/ui/painting/paint.h b/lib/ui/painting/paint.h
index 6e74535dbe7269a5a17d3f0aab2d9e02c9f949ff..e87313a489dcb6bd6a201e172596baf4450949bb 100644
--- a/lib/ui/painting/paint.h
+++ b/lib/ui/painting/paint.h
@@ -6,7 +6,7 @@
 #define FLUTTER_LIB_UI_PAINTING_PAINT_H_
 
 #include "flutter/display_list/display_list.h"
-#include "flutter/display_list/display_list_flags.h"
+#include "flutter/display_list/dl_op_flags.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/tonic/converter/dart_converter.h"
 
@@ -17,19 +17,11 @@ class Paint {
   Paint() = default;
   Paint(Dart_Handle paint_objects, Dart_Handle paint_data);
 
-  const SkPaint* paint(SkPaint& paint) const;
+  const DlPaint* paint(DlPaint& paint,
+                       const DisplayListAttributeFlags& flags) const;
 
   void toDlPaint(DlPaint& paint) const;
 
-  /// Synchronize the Dart properties to the display list according
-  /// to the attribute flags that indicate which properties are needed.
-  /// The return value indicates if the paint was non-null and can
-  /// either be DCHECKed or used to indicate to the DisplayList
-  /// draw operation whether or not to use the synchronized attributes
-  /// (mainly the drawImage and saveLayer methods).
-  bool sync_to(DisplayListBuilder* builder,
-               const DisplayListAttributeFlags& flags) const;
-
   bool isNull() const { return Dart_IsNull(paint_data_); }
   bool isNotNull() const { return !Dart_IsNull(paint_data_); }
 
diff --git a/lib/ui/painting/paint_unittests.cc b/lib/ui/painting/paint_unittests.cc
index d7b2edd09e4636fb1759a96a509c7f67dbcfc88e..87447fa548124cb1f2f5fedb55fcb5e3105eb403 100644
--- a/lib/ui/painting/paint_unittests.cc
+++ b/lib/ui/painting/paint_unittests.cc
@@ -50,11 +50,11 @@ TEST_F(ShellTest, ConvertPaintToDlPaint) {
   DestroyShell(std::move(shell), task_runners);
 
   ASSERT_EQ(dl_paint.getBlendMode(), DlBlendMode::kModulate);
-  ASSERT_EQ(static_cast<uint32_t>(dl_paint.getColor()), 0x11223344u);
+  ASSERT_EQ(static_cast<uint32_t>(dl_paint.getColor().argb()), 0x11223344u);
   ASSERT_EQ(*dl_paint.getColorFilter(),
-            DlBlendColorFilter(0x55667788, DlBlendMode::kXor));
+            DlBlendColorFilter(DlColor(0x55667788), DlBlendMode::kXor));
   ASSERT_EQ(*dl_paint.getMaskFilter(),
-            DlBlurMaskFilter(SkBlurStyle::kInner_SkBlurStyle, 0.75));
+            DlBlurMaskFilter(DlBlurStyle::kInner, 0.75));
   ASSERT_EQ(dl_paint.getDrawStyle(), DlDrawStyle::kStroke);
 }
 
diff --git a/lib/ui/painting/path.cc b/lib/ui/painting/path.cc
index 647250e4512456be18453e635e1f915756b11d70..ddf2ebaac17b973499b3d261ba79c2a2a27c43b2 100644
--- a/lib/ui/painting/path.cc
+++ b/lib/ui/painting/path.cc
@@ -6,6 +6,7 @@
 
 #include <cmath>
 
+#include "flutter/lib/ui/floating_point.h"
 #include "flutter/lib/ui/painting/matrix.h"
 #include "flutter/lib/ui/ui_dart_state.h"
 #include "third_party/tonic/converter/dart_converter.h"
@@ -48,91 +49,99 @@ void CanvasPath::setFillType(int fill_type) {
   resetVolatility();
 }
 
-void CanvasPath::moveTo(float x, float y) {
-  mutable_path().moveTo(x, y);
+void CanvasPath::moveTo(double x, double y) {
+  mutable_path().moveTo(SafeNarrow(x), SafeNarrow(y));
   resetVolatility();
 }
 
-void CanvasPath::relativeMoveTo(float x, float y) {
-  mutable_path().rMoveTo(x, y);
+void CanvasPath::relativeMoveTo(double x, double y) {
+  mutable_path().rMoveTo(SafeNarrow(x), SafeNarrow(y));
   resetVolatility();
 }
 
-void CanvasPath::lineTo(float x, float y) {
-  mutable_path().lineTo(x, y);
+void CanvasPath::lineTo(double x, double y) {
+  mutable_path().lineTo(SafeNarrow(x), SafeNarrow(y));
   resetVolatility();
 }
 
-void CanvasPath::relativeLineTo(float x, float y) {
-  mutable_path().rLineTo(x, y);
+void CanvasPath::relativeLineTo(double x, double y) {
+  mutable_path().rLineTo(SafeNarrow(x), SafeNarrow(y));
   resetVolatility();
 }
 
-void CanvasPath::quadraticBezierTo(float x1, float y1, float x2, float y2) {
-  mutable_path().quadTo(x1, y1, x2, y2);
+void CanvasPath::quadraticBezierTo(double x1, double y1, double x2, double y2) {
+  mutable_path().quadTo(SafeNarrow(x1), SafeNarrow(y1), SafeNarrow(x2),
+                        SafeNarrow(y2));
   resetVolatility();
 }
 
-void CanvasPath::relativeQuadraticBezierTo(float x1,
-                                           float y1,
-                                           float x2,
-                                           float y2) {
-  mutable_path().rQuadTo(x1, y1, x2, y2);
+void CanvasPath::relativeQuadraticBezierTo(double x1,
+                                           double y1,
+                                           double x2,
+                                           double y2) {
+  mutable_path().rQuadTo(SafeNarrow(x1), SafeNarrow(y1), SafeNarrow(x2),
+                         SafeNarrow(y2));
   resetVolatility();
 }
 
-void CanvasPath::cubicTo(float x1,
-                         float y1,
-                         float x2,
-                         float y2,
-                         float x3,
-                         float y3) {
-  mutable_path().cubicTo(x1, y1, x2, y2, x3, y3);
+void CanvasPath::cubicTo(double x1,
+                         double y1,
+                         double x2,
+                         double y2,
+                         double x3,
+                         double y3) {
+  mutable_path().cubicTo(SafeNarrow(x1), SafeNarrow(y1), SafeNarrow(x2),
+                         SafeNarrow(y2), SafeNarrow(x3), SafeNarrow(y3));
   resetVolatility();
 }
 
-void CanvasPath::relativeCubicTo(float x1,
-                                 float y1,
-                                 float x2,
-                                 float y2,
-                                 float x3,
-                                 float y3) {
-  mutable_path().rCubicTo(x1, y1, x2, y2, x3, y3);
+void CanvasPath::relativeCubicTo(double x1,
+                                 double y1,
+                                 double x2,
+                                 double y2,
+                                 double x3,
+                                 double y3) {
+  mutable_path().rCubicTo(SafeNarrow(x1), SafeNarrow(y1), SafeNarrow(x2),
+                          SafeNarrow(y2), SafeNarrow(x3), SafeNarrow(y3));
   resetVolatility();
 }
 
-void CanvasPath::conicTo(float x1, float y1, float x2, float y2, float w) {
-  mutable_path().conicTo(x1, y1, x2, y2, w);
+void CanvasPath::conicTo(double x1, double y1, double x2, double y2, double w) {
+  mutable_path().conicTo(SafeNarrow(x1), SafeNarrow(y1), SafeNarrow(x2),
+                         SafeNarrow(y2), SafeNarrow(w));
   resetVolatility();
 }
 
-void CanvasPath::relativeConicTo(float x1,
-                                 float y1,
-                                 float x2,
-                                 float y2,
-                                 float w) {
-  mutable_path().rConicTo(x1, y1, x2, y2, w);
+void CanvasPath::relativeConicTo(double x1,
+                                 double y1,
+                                 double x2,
+                                 double y2,
+                                 double w) {
+  mutable_path().rConicTo(SafeNarrow(x1), SafeNarrow(y1), SafeNarrow(x2),
+                          SafeNarrow(y2), SafeNarrow(w));
   resetVolatility();
 }
 
-void CanvasPath::arcTo(float left,
-                       float top,
-                       float right,
-                       float bottom,
-                       float startAngle,
-                       float sweepAngle,
+void CanvasPath::arcTo(double left,
+                       double top,
+                       double right,
+                       double bottom,
+                       double startAngle,
+                       double sweepAngle,
                        bool forceMoveTo) {
-  mutable_path().arcTo(SkRect::MakeLTRB(left, top, right, bottom),
-                       startAngle * 180.0 / M_PI, sweepAngle * 180.0 / M_PI,
-                       forceMoveTo);
+  mutable_path().arcTo(
+      SkRect::MakeLTRB(SafeNarrow(left), SafeNarrow(top), SafeNarrow(right),
+                       SafeNarrow(bottom)),
+      SafeNarrow(startAngle) * 180.0f / static_cast<float>(M_PI),
+      SafeNarrow(sweepAngle) * 180.0f / static_cast<float>(M_PI), forceMoveTo);
   resetVolatility();
 }
 
-void CanvasPath::arcToPoint(float arcEndX,
-                            float arcEndY,
-                            float radiusX,
-                            float radiusY,
-                            float xAxisRotation,
+void CanvasPath::arcToPoint(double arcEndX,
+                            double arcEndY,
+                            double radiusX,
+                            double radiusY,
+                            double xAxisRotation,
                             bool isLargeArc,
                             bool isClockwiseDirection) {
   const auto arcSize = isLargeArc ? SkPath::ArcSize::kLarge_ArcSize
@@ -140,45 +149,54 @@ void CanvasPath::arcToPoint(float arcEndX,
   const auto direction =
       isClockwiseDirection ? SkPathDirection::kCW : SkPathDirection::kCCW;
 
-  mutable_path().arcTo(radiusX, radiusY, xAxisRotation, arcSize, direction,
-                       arcEndX, arcEndY);
+  mutable_path().arcTo(SafeNarrow(radiusX), SafeNarrow(radiusY),
+                       SafeNarrow(xAxisRotation), arcSize, direction,
+                       SafeNarrow(arcEndX), SafeNarrow(arcEndY));
   resetVolatility();
 }
 
-void CanvasPath::relativeArcToPoint(float arcEndDeltaX,
-                                    float arcEndDeltaY,
-                                    float radiusX,
-                                    float radiusY,
-                                    float xAxisRotation,
+void CanvasPath::relativeArcToPoint(double arcEndDeltaX,
+                                    double arcEndDeltaY,
+                                    double radiusX,
+                                    double radiusY,
+                                    double xAxisRotation,
                                     bool isLargeArc,
                                     bool isClockwiseDirection) {
   const auto arcSize = isLargeArc ? SkPath::ArcSize::kLarge_ArcSize
                                   : SkPath::ArcSize::kSmall_ArcSize;
   const auto direction =
       isClockwiseDirection ? SkPathDirection::kCW : SkPathDirection::kCCW;
-  mutable_path().rArcTo(radiusX, radiusY, xAxisRotation, arcSize, direction,
-                        arcEndDeltaX, arcEndDeltaY);
+  mutable_path().rArcTo(SafeNarrow(radiusX), SafeNarrow(radiusY),
+                        SafeNarrow(xAxisRotation), arcSize, direction,
+                        SafeNarrow(arcEndDeltaX), SafeNarrow(arcEndDeltaY));
   resetVolatility();
 }
 
-void CanvasPath::addRect(float left, float top, float right, float bottom) {
-  mutable_path().addRect(SkRect::MakeLTRB(left, top, right, bottom));
+void CanvasPath::addRect(double left, double top, double right, double bottom) {
+  mutable_path().addRect(SkRect::MakeLTRB(SafeNarrow(left), SafeNarrow(top),
+                                          SafeNarrow(right),
+                                          SafeNarrow(bottom)));
   resetVolatility();
 }
 
-void CanvasPath::addOval(float left, float top, float right, float bottom) {
-  mutable_path().addOval(SkRect::MakeLTRB(left, top, right, bottom));
+void CanvasPath::addOval(double left, double top, double right, double bottom) {
+  mutable_path().addOval(SkRect::MakeLTRB(SafeNarrow(left), SafeNarrow(top),
+                                          SafeNarrow(right),
+                                          SafeNarrow(bottom)));
   resetVolatility();
 }
 
-void CanvasPath::addArc(float left,
-                        float top,
-                        float right,
-                        float bottom,
-                        float startAngle,
-                        float sweepAngle) {
-  mutable_path().addArc(SkRect::MakeLTRB(left, top, right, bottom),
-                        startAngle * 180.0 / M_PI, sweepAngle * 180.0 / M_PI);
+void CanvasPath::addArc(double left,
+                        double top,
+                        double right,
+                        double bottom,
+                        double startAngle,
+                        double sweepAngle) {
+  mutable_path().addArc(
+      SkRect::MakeLTRB(SafeNarrow(left), SafeNarrow(top), SafeNarrow(right),
+                       SafeNarrow(bottom)),
+      SafeNarrow(startAngle) * 180.0f / static_cast<float>(M_PI),
+      SafeNarrow(sweepAngle) * 180.0f / static_cast<float>(M_PI));
   resetVolatility();
 }
 
@@ -198,7 +216,8 @@ void CanvasPath::addPath(CanvasPath* path, double dx, double dy) {
     Dart_ThrowException(ToDart("Path.addPath called with non-genuine Path."));
     return;
   }
-  mutable_path().addPath(path->path(), dx, dy, SkPath::kAppend_AddPathMode);
+  mutable_path().addPath(path->path(), SafeNarrow(dx), SafeNarrow(dy),
+                         SkPath::kAppend_AddPathMode);
   resetVolatility();
 }
 
@@ -217,8 +236,8 @@ void CanvasPath::addPathWithMatrix(CanvasPath* path,
 
   SkMatrix matrix = ToSkMatrix(matrix4);
   matrix4.Release();
-  matrix.setTranslateX(matrix.getTranslateX() + dx);
-  matrix.setTranslateY(matrix.getTranslateY() + dy);
+  matrix.setTranslateX(matrix.getTranslateX() + SafeNarrow(dx));
+  matrix.setTranslateY(matrix.getTranslateY() + SafeNarrow(dy));
   mutable_path().addPath(path->path(), matrix, SkPath::kAppend_AddPathMode);
   resetVolatility();
 }
@@ -229,7 +248,8 @@ void CanvasPath::extendWithPath(CanvasPath* path, double dx, double dy) {
         ToDart("Path.extendWithPath called with non-genuine Path."));
     return;
   }
-  mutable_path().addPath(path->path(), dx, dy, SkPath::kExtend_AddPathMode);
+  mutable_path().addPath(path->path(), SafeNarrow(dx), SafeNarrow(dy),
+                         SkPath::kExtend_AddPathMode);
   resetVolatility();
 }
 
@@ -248,8 +268,8 @@ void CanvasPath::extendWithPathAndMatrix(CanvasPath* path,
 
   SkMatrix matrix = ToSkMatrix(matrix4);
   matrix4.Release();
-  matrix.setTranslateX(matrix.getTranslateX() + dx);
-  matrix.setTranslateY(matrix.getTranslateY() + dy);
+  matrix.setTranslateX(matrix.getTranslateX() + SafeNarrow(dx));
+  matrix.setTranslateY(matrix.getTranslateY() + SafeNarrow(dy));
   mutable_path().addPath(path->path(), matrix, SkPath::kExtend_AddPathMode);
   resetVolatility();
 }
@@ -265,13 +285,13 @@ void CanvasPath::reset() {
 }
 
 bool CanvasPath::contains(double x, double y) {
-  return path().contains(x, y);
+  return path().contains(SafeNarrow(x), SafeNarrow(y));
 }
 
 void CanvasPath::shift(Dart_Handle path_handle, double dx, double dy) {
   fml::RefPtr<CanvasPath> path = Create(path_handle);
   auto& other_mutable_path = path->mutable_path();
-  mutable_path().offset(dx, dy, &other_mutable_path);
+  mutable_path().offset(SafeNarrow(dx), SafeNarrow(dy), &other_mutable_path);
   resetVolatility();
 }
 
@@ -296,9 +316,10 @@ tonic::Float32List CanvasPath::getBounds() {
 }
 
 bool CanvasPath::op(CanvasPath* path1, CanvasPath* path2, int operation) {
-  return Op(path1->path(), path2->path(), static_cast<SkPathOp>(operation),
-            &tracked_path_->path);
+  bool result = Op(path1->path(), path2->path(),
+                   static_cast<SkPathOp>(operation), &tracked_path_->path);
   resetVolatility();
+  return result;
 }
 
 void CanvasPath::clone(Dart_Handle path_handle) {
diff --git a/lib/ui/painting/path.h b/lib/ui/painting/path.h
index 60f07e5d520641ebab236ee59d0915dde42ed06c..c1a30eb6d39de2fdc9ef9e6b933c83832e77f37a 100644
--- a/lib/ui/painting/path.h
+++ b/lib/ui/painting/path.h
@@ -38,50 +38,55 @@ class CanvasPath : public RefCountedDartWrappable<CanvasPath> {
   int getFillType();
   void setFillType(int fill_type);
 
-  void moveTo(float x, float y);
-  void relativeMoveTo(float x, float y);
-  void lineTo(float x, float y);
-  void relativeLineTo(float x, float y);
-  void quadraticBezierTo(float x1, float y1, float x2, float y2);
-  void relativeQuadraticBezierTo(float x1, float y1, float x2, float y2);
-  void cubicTo(float x1, float y1, float x2, float y2, float x3, float y3);
-  void relativeCubicTo(float x1,
-                       float y1,
-                       float x2,
-                       float y2,
-                       float x3,
-                       float y3);
-  void conicTo(float x1, float y1, float x2, float y2, float w);
-  void relativeConicTo(float x1, float y1, float x2, float y2, float w);
-  void arcTo(float left,
-             float top,
-             float right,
-             float bottom,
-             float startAngle,
-             float sweepAngle,
+  void moveTo(double x, double y);
+  void relativeMoveTo(double x, double y);
+  void lineTo(double x, double y);
+  void relativeLineTo(double x, double y);
+  void quadraticBezierTo(double x1, double y1, double x2, double y2);
+  void relativeQuadraticBezierTo(double x1, double y1, double x2, double y2);
+  void cubicTo(double x1,
+               double y1,
+               double x2,
+               double y2,
+               double x3,
+               double y3);
+  void relativeCubicTo(double x1,
+                       double y1,
+                       double x2,
+                       double y2,
+                       double x3,
+                       double y3);
+  void conicTo(double x1, double y1, double x2, double y2, double w);
+  void relativeConicTo(double x1, double y1, double x2, double y2, double w);
+  void arcTo(double left,
+             double top,
+             double right,
+             double bottom,
+             double startAngle,
+             double sweepAngle,
              bool forceMoveTo);
-  void arcToPoint(float arcEndX,
-                  float arcEndY,
-                  float radiusX,
-                  float radiusY,
-                  float xAxisRotation,
+  void arcToPoint(double arcEndX,
+                  double arcEndY,
+                  double radiusX,
+                  double radiusY,
+                  double xAxisRotation,
                   bool isLargeArc,
                   bool isClockwiseDirection);
-  void relativeArcToPoint(float arcEndDeltaX,
-                          float arcEndDeltaY,
-                          float radiusX,
-                          float radiusY,
-                          float xAxisRotation,
+  void relativeArcToPoint(double arcEndDeltaX,
+                          double arcEndDeltaY,
+                          double radiusX,
+                          double radiusY,
+                          double xAxisRotation,
                           bool isLargeArc,
                           bool isClockwiseDirection);
-  void addRect(float left, float top, float right, float bottom);
-  void addOval(float left, float top, float right, float bottom);
-  void addArc(float left,
-              float top,
-              float right,
-              float bottom,
-              float startAngle,
-              float sweepAngle);
+  void addRect(double left, double top, double right, double bottom);
+  void addOval(double left, double top, double right, double bottom);
+  void addArc(double left,
+              double top,
+              double right,
+              double bottom,
+              double startAngle,
+              double sweepAngle);
   void addPolygon(const tonic::Float32List& points, bool close);
   void addRRect(const RRect& rrect);
   void addPath(CanvasPath* path, double dx, double dy);
diff --git a/lib/ui/painting/path_measure.cc b/lib/ui/painting/path_measure.cc
index a620efda68bd04a45fa9e5f4db4857361da6b0e4..d6498fdf9828775540a6aae332b7a1194736ddb7 100644
--- a/lib/ui/painting/path_measure.cc
+++ b/lib/ui/painting/path_measure.cc
@@ -6,6 +6,7 @@
 
 #include <cmath>
 
+#include "flutter/lib/ui/floating_point.h"
 #include "flutter/lib/ui/painting/matrix.h"
 #include "flutter/lib/ui/ui_dart_state.h"
 #include "third_party/tonic/converter/dart_converter.h"
@@ -26,7 +27,7 @@ void CanvasPathMeasure::Create(Dart_Handle wrapper,
   fml::RefPtr<CanvasPathMeasure> pathMeasure =
       fml::MakeRefCounted<CanvasPathMeasure>();
   if (path) {
-    const SkPath skPath = path->path();
+    const SkPath& skPath = path->path();
     SkScalar resScale = 1;
     pathMeasure->path_measure_ =
         std::make_unique<SkContourMeasureIter>(skPath, forceClosed, resScale);
@@ -45,7 +46,7 @@ void CanvasPathMeasure::setPath(const CanvasPath* path, bool isClosed) {
   path_measure_->reset(skPath, isClosed);
 }
 
-float CanvasPathMeasure::getLength(int contour_index) {
+double CanvasPathMeasure::getLength(int contour_index) {
   if (static_cast<std::vector<sk_sp<SkContourMeasure>>::size_type>(
           contour_index) < measures_.size()) {
     return measures_[contour_index]->length();
@@ -54,7 +55,7 @@ float CanvasPathMeasure::getLength(int contour_index) {
 }
 
 tonic::Float32List CanvasPathMeasure::getPosTan(int contour_index,
-                                                float distance) {
+                                                double distance) {
   tonic::Float32List posTan(Dart_NewTypedData(Dart_TypedData_kFloat32, 5));
   posTan[0] = 0;  // dart code will check for this for failure
   if (static_cast<std::vector<sk_sp<SkContourMeasure>>::size_type>(
@@ -64,7 +65,8 @@ tonic::Float32List CanvasPathMeasure::getPosTan(int contour_index,
 
   SkPoint pos;
   SkVector tan;
-  bool success = measures_[contour_index]->getPosTan(distance, &pos, &tan);
+  float fdistance = SafeNarrow(distance);
+  bool success = measures_[contour_index]->getPosTan(fdistance, &pos, &tan);
 
   if (success) {
     posTan[0] = 1;  // dart code will check for this for success
@@ -79,16 +81,16 @@ tonic::Float32List CanvasPathMeasure::getPosTan(int contour_index,
 
 void CanvasPathMeasure::getSegment(Dart_Handle path_handle,
                                    int contour_index,
-                                   float start_d,
-                                   float stop_d,
+                                   double start_d,
+                                   double stop_d,
                                    bool start_with_move_to) {
   if (static_cast<std::vector<sk_sp<SkContourMeasure>>::size_type>(
           contour_index) >= measures_.size()) {
     CanvasPath::Create(path_handle);
   }
   SkPath dst;
-  bool success = measures_[contour_index]->getSegment(start_d, stop_d, &dst,
-                                                      start_with_move_to);
+  bool success = measures_[contour_index]->getSegment(
+      SafeNarrow(start_d), SafeNarrow(stop_d), &dst, start_with_move_to);
   if (!success) {
     CanvasPath::Create(path_handle);
   } else {
diff --git a/lib/ui/painting/path_measure.h b/lib/ui/painting/path_measure.h
index 32ee021c05fed0a13ec8b78ae3020deaff4c5821..f52b3943f30898107de441a6504c42fa227a0564 100644
--- a/lib/ui/painting/path_measure.h
+++ b/lib/ui/painting/path_measure.h
@@ -29,12 +29,12 @@ class CanvasPathMeasure : public RefCountedDartWrappable<CanvasPathMeasure> {
                      bool forceClosed);
 
   void setPath(const CanvasPath* path, bool isClosed);
-  float getLength(int contour_index);
-  tonic::Float32List getPosTan(int contour_index, float distance);
+  double getLength(int contour_index);
+  tonic::Float32List getPosTan(int contour_index, double distance);
   void getSegment(Dart_Handle path_handle,
                   int contour_index,
-                  float start_d,
-                  float stop_d,
+                  double start_d,
+                  double stop_d,
                   bool start_with_move_to);
   bool isClosed(int contour_index);
   bool nextContour();
diff --git a/lib/ui/painting/picture.cc b/lib/ui/painting/picture.cc
index 0121c85c7c6623c100c5c968512423ec5bf3e53d..400c766500298438374ff91470461a642cdb9178 100644
--- a/lib/ui/painting/picture.cc
+++ b/lib/ui/painting/picture.cc
@@ -14,6 +14,7 @@
 #if IMPELLER_SUPPORTS_RENDERING
 #include "flutter/lib/ui/painting/display_list_deferred_image_gpu_impeller.h"
 #endif  // IMPELLER_SUPPORTS_RENDERING
+#include "flutter/lib/ui/painting/display_list_image_gpu.h"
 #include "third_party/tonic/converter/dart_converter.h"
 #include "third_party/tonic/dart_args.h"
 #include "third_party/tonic/dart_binding_macros.h"
@@ -25,16 +26,15 @@ namespace flutter {
 
 IMPLEMENT_WRAPPERTYPEINFO(ui, Picture);
 
-fml::RefPtr<Picture> Picture::Create(
+void Picture::CreateAndAssociateWithDartWrapper(
     Dart_Handle dart_handle,
-    flutter::SkiaGPUObject<DisplayList> display_list) {
+    sk_sp<DisplayList> display_list) {
+  FML_DCHECK(display_list->isUIThreadSafe());
   auto canvas_picture = fml::MakeRefCounted<Picture>(std::move(display_list));
-
   canvas_picture->AssociateWithDartWrapper(dart_handle);
-  return canvas_picture;
 }
 
-Picture::Picture(flutter::SkiaGPUObject<DisplayList> display_list)
+Picture::Picture(sk_sp<DisplayList> display_list)
     : display_list_(std::move(display_list)) {}
 
 Picture::~Picture() = default;
@@ -42,19 +42,17 @@ Picture::~Picture() = default;
 Dart_Handle Picture::toImage(uint32_t width,
                              uint32_t height,
                              Dart_Handle raw_image_callback) {
-  if (!display_list_.skia_object()) {
+  if (!display_list_) {
     return tonic::ToDart("Picture is null");
   }
-  return RasterizeToImage(display_list_.skia_object(), width, height,
-                          raw_image_callback);
+  return RasterizeToImage(display_list_, width, height, raw_image_callback);
 }
 
 void Picture::toImageSync(uint32_t width,
                           uint32_t height,
                           Dart_Handle raw_image_handle) {
-  FML_DCHECK(display_list_.skia_object());
-  RasterizeToImageSync(display_list_.skia_object(), width, height,
-                       raw_image_handle);
+  FML_DCHECK(display_list_);
+  RasterizeToImageSync(display_list_, width, height, raw_image_handle);
 }
 
 static sk_sp<DlImage> CreateDeferredImage(
@@ -108,8 +106,8 @@ void Picture::dispose() {
 }
 
 size_t Picture::GetAllocationSize() const {
-  if (auto display_list = display_list_.skia_object()) {
-    return display_list->bytes() + sizeof(Picture);
+  if (display_list_) {
+    return display_list_->bytes() + sizeof(Picture);
   } else {
     return sizeof(Picture);
   }
@@ -119,24 +117,27 @@ Dart_Handle Picture::RasterizeToImage(const sk_sp<DisplayList>& display_list,
                                       uint32_t width,
                                       uint32_t height,
                                       Dart_Handle raw_image_callback) {
-  return RasterizeToImage(display_list, nullptr, width, height,
-                          raw_image_callback);
+  return DoRasterizeToImage(display_list, nullptr, width, height,
+                            raw_image_callback);
 }
 
 Dart_Handle Picture::RasterizeLayerTreeToImage(
-    std::shared_ptr<LayerTree> layer_tree,
-    uint32_t width,
-    uint32_t height,
+    std::unique_ptr<LayerTree> layer_tree,
     Dart_Handle raw_image_callback) {
-  return RasterizeToImage(nullptr, std::move(layer_tree), width, height,
-                          raw_image_callback);
+  FML_DCHECK(layer_tree != nullptr);
+  auto frame_size = layer_tree->frame_size();
+  return DoRasterizeToImage(nullptr, std::move(layer_tree), frame_size.width(),
+                            frame_size.height(), raw_image_callback);
 }
 
-Dart_Handle Picture::RasterizeToImage(const sk_sp<DisplayList>& display_list,
-                                      std::shared_ptr<LayerTree> layer_tree,
-                                      uint32_t width,
-                                      uint32_t height,
-                                      Dart_Handle raw_image_callback) {
+Dart_Handle Picture::DoRasterizeToImage(const sk_sp<DisplayList>& display_list,
+                                        std::unique_ptr<LayerTree> layer_tree,
+                                        uint32_t width,
+                                        uint32_t height,
+                                        Dart_Handle raw_image_callback) {
+  // Either display_list or layer_tree should be provided.
+  FML_DCHECK((display_list == nullptr) != (layer_tree == nullptr));
+
   if (Dart_IsNull(raw_image_callback) || !Dart_IsClosure(raw_image_callback)) {
     return tonic::ToDart("Image callback was invalid");
   }
@@ -158,8 +159,6 @@ Dart_Handle Picture::RasterizeToImage(const sk_sp<DisplayList>& display_list,
   // thread owns the sole reference to the layer tree. So we do it in the
   // raster thread.
 
-  auto picture_bounds = SkISize::Make(width, height);
-
   auto ui_task =
       // The static leak checker gets confused by the use of fml::MakeCopyable.
       // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks)
@@ -177,7 +176,9 @@ Dart_Handle Picture::RasterizeToImage(const sk_sp<DisplayList>& display_list,
           return;
         }
 
-        if (image->skia_image()) {
+        if (!image->isUIThreadSafe()) {
+          // All images with impeller textures should already be safe.
+          FML_DCHECK(image->impeller_texture() == nullptr);
           image =
               DlImageGPU::Make({image->skia_image(), std::move(unref_queue)});
         }
@@ -197,14 +198,17 @@ Dart_Handle Picture::RasterizeToImage(const sk_sp<DisplayList>& display_list,
   // Kick things off on the raster rask runner.
   fml::TaskRunner::RunNowOrPostTask(
       raster_task_runner,
-      [ui_task_runner, snapshot_delegate, display_list, picture_bounds, ui_task,
-       layer_tree = std::move(layer_tree)] {
+      fml::MakeCopyable([ui_task_runner, snapshot_delegate, display_list, width,
+                         height, ui_task,
+                         layer_tree = std::move(layer_tree)]() mutable {
+        auto picture_bounds = SkISize::Make(width, height);
         sk_sp<DlImage> image;
         if (layer_tree) {
-          auto display_list = layer_tree->Flatten(
-              SkRect::MakeWH(picture_bounds.width(), picture_bounds.height()),
-              snapshot_delegate->GetTextureRegistry(),
-              snapshot_delegate->GetGrContext());
+          FML_DCHECK(picture_bounds == layer_tree->frame_size());
+          auto display_list =
+              layer_tree->Flatten(SkRect::MakeWH(width, height),
+                                  snapshot_delegate->GetTextureRegistry(),
+                                  snapshot_delegate->GetGrContext());
 
           image = snapshot_delegate->MakeRasterSnapshot(display_list,
                                                         picture_bounds);
@@ -215,7 +219,7 @@ Dart_Handle Picture::RasterizeToImage(const sk_sp<DisplayList>& display_list,
 
         fml::TaskRunner::RunNowOrPostTask(
             ui_task_runner, [ui_task, image]() { ui_task(image); });
-      });
+      }));
 
   return Dart_Null();
 }
diff --git a/lib/ui/painting/picture.h b/lib/ui/painting/picture.h
index 33bee1994f9ec952e60774dcd5b3f5d081e4fcac..eb25b9a92788068541447f4a75ebcfd2f0b7784e 100644
--- a/lib/ui/painting/picture.h
+++ b/lib/ui/painting/picture.h
@@ -7,11 +7,9 @@
 
 #include "flutter/display_list/display_list.h"
 #include "flutter/flow/layers/layer_tree.h"
-#include "flutter/flow/skia_gpu_object.h"
 #include "flutter/lib/ui/dart_wrapper.h"
 #include "flutter/lib/ui/painting/image.h"
 #include "flutter/lib/ui/ui_dart_state.h"
-#include "third_party/skia/include/core/SkPicture.h"
 
 namespace flutter {
 class Canvas;
@@ -22,13 +20,11 @@ class Picture : public RefCountedDartWrappable<Picture> {
 
  public:
   ~Picture() override;
-  static fml::RefPtr<Picture> Create(
+  static void CreateAndAssociateWithDartWrapper(
       Dart_Handle dart_handle,
-      flutter::SkiaGPUObject<DisplayList> display_list);
+      sk_sp<DisplayList> display_list);
 
-  sk_sp<DisplayList> display_list() const {
-    return display_list_.skia_object();
-  }
+  sk_sp<DisplayList> display_list() const { return display_list_; }
 
   Dart_Handle toImage(uint32_t width,
                       uint32_t height,
@@ -53,24 +49,23 @@ class Picture : public RefCountedDartWrappable<Picture> {
                                       Dart_Handle raw_image_callback);
 
   static Dart_Handle RasterizeLayerTreeToImage(
-      std::shared_ptr<LayerTree> layer_tree,
-      uint32_t width,
-      uint32_t height,
+      std::unique_ptr<LayerTree> layer_tree,
       Dart_Handle raw_image_callback);
 
-  // Callers may provide either a display list or a layer tree. If a layer tree
-  // is provided, it will be flattened on the raster thread. In this case the
-  // display list will be ignored.
-  static Dart_Handle RasterizeToImage(const sk_sp<DisplayList>& display_list,
-                                      std::shared_ptr<LayerTree> layer_tree,
-                                      uint32_t width,
-                                      uint32_t height,
-                                      Dart_Handle raw_image_callback);
+  // Callers may provide either a display list or a layer tree, but not both.
+  //
+  // If a layer tree is provided, it will be flattened on the raster thread, and
+  // picture_bounds should be the layer tree's frame_size().
+  static Dart_Handle DoRasterizeToImage(const sk_sp<DisplayList>& display_list,
+                                        std::unique_ptr<LayerTree> layer_tree,
+                                        uint32_t width,
+                                        uint32_t height,
+                                        Dart_Handle raw_image_callback);
 
  private:
-  explicit Picture(flutter::SkiaGPUObject<DisplayList> display_list);
+  explicit Picture(sk_sp<DisplayList> display_list);
 
-  flutter::SkiaGPUObject<DisplayList> display_list_;
+  sk_sp<DisplayList> display_list_;
 };
 
 }  // namespace flutter
diff --git a/lib/ui/painting/picture_recorder.cc b/lib/ui/painting/picture_recorder.cc
index 8a625603d3a1c6e93d3121e27307c17210ee9d37..58d9d86632a7d338f3a689d3fe967d41f552df52 100644
--- a/lib/ui/painting/picture_recorder.cc
+++ b/lib/ui/painting/picture_recorder.cc
@@ -4,7 +4,6 @@
 
 #include "flutter/lib/ui/painting/picture_recorder.h"
 
-#include "flutter/display_list/display_list.h"
 #include "flutter/lib/ui/painting/canvas.h"
 #include "flutter/lib/ui/painting/picture.h"
 #include "third_party/tonic/converter/dart_converter.h"
@@ -26,26 +25,26 @@ PictureRecorder::PictureRecorder() {}
 
 PictureRecorder::~PictureRecorder() {}
 
-SkCanvas* PictureRecorder::BeginRecording(SkRect bounds) {
-  display_list_recorder_ = sk_make_sp<DisplayListCanvasRecorder>(bounds);
-  return display_list_recorder_.get();
+sk_sp<DisplayListBuilder> PictureRecorder::BeginRecording(SkRect bounds) {
+  display_list_builder_ =
+      sk_make_sp<DisplayListBuilder>(bounds, /*prepare_rtree=*/true);
+  return display_list_builder_;
 }
 
-fml::RefPtr<Picture> PictureRecorder::endRecording(Dart_Handle dart_picture) {
+void PictureRecorder::endRecording(Dart_Handle dart_picture) {
   if (!canvas_) {
-    return nullptr;
+    return;
   }
 
-  fml::RefPtr<Picture> picture;
+  auto display_list = display_list_builder_->Build();
+  display_list_builder_ = nullptr;
 
-  picture = Picture::Create(dart_picture, UIDartState::CreateGPUObject(
-                                              display_list_recorder_->Build()));
-  display_list_recorder_ = nullptr;
+  FML_DCHECK(display_list->has_rtree());
+  Picture::CreateAndAssociateWithDartWrapper(dart_picture, display_list);
 
   canvas_->Invalidate();
   canvas_ = nullptr;
   ClearDartWrapper();
-  return picture;
 }
 
 }  // namespace flutter
diff --git a/lib/ui/painting/picture_recorder.h b/lib/ui/painting/picture_recorder.h
index f510da77a1999f0ebcb93fbdde3de1cc8e962238..ccbc8d030e3e700e22e2a8133d674ecad50b97ca 100644
--- a/lib/ui/painting/picture_recorder.h
+++ b/lib/ui/painting/picture_recorder.h
@@ -5,9 +5,8 @@
 #ifndef FLUTTER_LIB_UI_PAINTING_PICTURE_RECORDER_H_
 #define FLUTTER_LIB_UI_PAINTING_PICTURE_RECORDER_H_
 
-#include "flutter/display_list/display_list_canvas_recorder.h"
+#include "flutter/display_list/dl_builder.h"
 #include "flutter/lib/ui/dart_wrapper.h"
-#include "third_party/skia/include/core/SkPictureRecorder.h"
 
 namespace flutter {
 class Canvas;
@@ -22,19 +21,15 @@ class PictureRecorder : public RefCountedDartWrappable<PictureRecorder> {
 
   ~PictureRecorder() override;
 
-  SkCanvas* BeginRecording(SkRect bounds);
-  fml::RefPtr<Picture> endRecording(Dart_Handle dart_picture);
-
-  sk_sp<DisplayListCanvasRecorder> display_list_recorder() {
-    return display_list_recorder_;
-  }
+  sk_sp<DisplayListBuilder> BeginRecording(SkRect bounds);
+  void endRecording(Dart_Handle dart_picture);
 
   void set_canvas(fml::RefPtr<Canvas> canvas) { canvas_ = std::move(canvas); }
 
  private:
   PictureRecorder();
 
-  sk_sp<DisplayListCanvasRecorder> display_list_recorder_;
+  sk_sp<DisplayListBuilder> display_list_builder_;
 
   fml::RefPtr<Canvas> canvas_;
 };
diff --git a/lib/ui/painting/scene/scene_node.cc b/lib/ui/painting/scene/scene_node.cc
new file mode 100644
index 0000000000000000000000000000000000000000..bb18de7bc7805cecb808996e13075263089585a5
--- /dev/null
+++ b/lib/ui/painting/scene/scene_node.cc
@@ -0,0 +1,172 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/lib/ui/painting/scene/scene_node.h"
+
+#include <memory>
+#include <sstream>
+
+#include "flutter/assets/asset_manager.h"
+#include "flutter/fml/make_copyable.h"
+#include "flutter/fml/trace_event.h"
+#include "flutter/lib/ui/dart_wrapper.h"
+#include "flutter/lib/ui/painting/scene/scene_shader.h"
+#include "flutter/lib/ui/ui_dart_state.h"
+#include "flutter/lib/ui/window/platform_configuration.h"
+#include "impeller/geometry/matrix.h"
+#include "impeller/scene/animation/property_resolver.h"
+
+#include "third_party/tonic/converter/dart_converter.h"
+#include "third_party/tonic/dart_args.h"
+#include "third_party/tonic/dart_binding_macros.h"
+#include "third_party/tonic/dart_library_natives.h"
+#include "third_party/tonic/typed_data/typed_list.h"
+
+namespace flutter {
+
+IMPLEMENT_WRAPPERTYPEINFO(ui, SceneNode);
+
+void SceneNode::Create(Dart_Handle wrapper) {
+  auto res = fml::MakeRefCounted<SceneNode>();
+  res->AssociateWithDartWrapper(wrapper);
+}
+
+std::string SceneNode::initFromAsset(const std::string& asset_name,
+                                     Dart_Handle completion_callback_handle) {
+  FML_TRACE_EVENT("flutter", "SceneNode::initFromAsset", "asset", asset_name);
+
+  if (!Dart_IsClosure(completion_callback_handle)) {
+    return "Completion callback must be a function.";
+  }
+
+  auto dart_state = UIDartState::Current();
+  if (!dart_state->IsImpellerEnabled()) {
+    return "3D scenes require the Impeller rendering backend to be enabled.";
+  }
+
+  std::shared_ptr<AssetManager> asset_manager =
+      dart_state->platform_configuration()->client()->GetAssetManager();
+  std::unique_ptr<fml::Mapping> data = asset_manager->GetAsMapping(asset_name);
+  if (data == nullptr) {
+    return std::string("Asset '") + asset_name + std::string("' not found.");
+  }
+
+  auto& task_runners = dart_state->GetTaskRunners();
+
+  std::promise<std::shared_ptr<impeller::Context>> context_promise;
+  auto impeller_context_promise = context_promise.get_future();
+  task_runners.GetIOTaskRunner()->PostTask(
+      fml::MakeCopyable([promise = std::move(context_promise),
+                         io_manager = dart_state->GetIOManager()]() mutable {
+        promise.set_value(io_manager ? io_manager->GetImpellerContext()
+                                     : nullptr);
+      }));
+
+  auto persistent_completion_callback =
+      std::make_unique<tonic::DartPersistentValue>(dart_state,
+                                                   completion_callback_handle);
+
+  auto ui_task = fml::MakeCopyable(
+      [this, callback = std::move(persistent_completion_callback)](
+          std::shared_ptr<impeller::scene::Node> node) mutable {
+        auto dart_state = callback->dart_state().lock();
+        if (!dart_state) {
+          // The root isolate could have died in the meantime.
+          return;
+        }
+        tonic::DartState::Scope scope(dart_state);
+
+        node_ = std::move(node);
+        tonic::DartInvoke(callback->Get(), {Dart_TypeVoid()});
+
+        // callback is associated with the Dart isolate and must be
+        // deleted on the UI thread.
+        callback.reset();
+      });
+
+  task_runners.GetRasterTaskRunner()->PostTask(
+      fml::MakeCopyable([ui_task = std::move(ui_task), task_runners,
+                         impeller_context = impeller_context_promise.get(),
+                         data = std::move(data)]() {
+        auto node = impeller::scene::Node::MakeFromFlatbuffer(
+            *data, *impeller_context->GetResourceAllocator());
+
+        task_runners.GetUITaskRunner()->PostTask(
+            [ui_task, node = std::move(node)]() { ui_task(node); });
+      }));
+
+  return "";
+}
+
+static impeller::Matrix ToMatrix(const tonic::Float64List& matrix4) {
+  return impeller::Matrix(static_cast<impeller::Scalar>(matrix4[0]),
+                          static_cast<impeller::Scalar>(matrix4[1]),
+                          static_cast<impeller::Scalar>(matrix4[2]),
+                          static_cast<impeller::Scalar>(matrix4[3]),
+                          static_cast<impeller::Scalar>(matrix4[4]),
+                          static_cast<impeller::Scalar>(matrix4[5]),
+                          static_cast<impeller::Scalar>(matrix4[6]),
+                          static_cast<impeller::Scalar>(matrix4[7]),
+                          static_cast<impeller::Scalar>(matrix4[8]),
+                          static_cast<impeller::Scalar>(matrix4[9]),
+                          static_cast<impeller::Scalar>(matrix4[10]),
+                          static_cast<impeller::Scalar>(matrix4[11]),
+                          static_cast<impeller::Scalar>(matrix4[12]),
+                          static_cast<impeller::Scalar>(matrix4[13]),
+                          static_cast<impeller::Scalar>(matrix4[14]),
+                          static_cast<impeller::Scalar>(matrix4[15]));
+}
+
+void SceneNode::initFromTransform(const tonic::Float64List& matrix4) {
+  node_ = std::make_shared<impeller::scene::Node>();
+  node_->SetLocalTransform(ToMatrix(matrix4));
+}
+
+void SceneNode::AddChild(Dart_Handle scene_node_handle) {
+  if (!node_) {
+    return;
+  }
+  auto* scene_node =
+      tonic::DartConverter<SceneNode*>::FromDart(scene_node_handle);
+  if (!scene_node) {
+    return;
+  }
+  node_->AddChild(scene_node->node_);
+  children_.push_back(fml::Ref(scene_node));
+}
+
+void SceneNode::SetTransform(const tonic::Float64List& matrix4) {
+  impeller::scene::Node::MutationLog::SetTransformEntry entry = {
+      ToMatrix(matrix4)};
+  node_->AddMutation(entry);
+}
+
+void SceneNode::SetAnimationState(const std::string& animation_name,
+                                  bool playing,
+                                  bool loop,
+                                  double weight,
+                                  double time_scale) {
+  impeller::scene::Node::MutationLog::SetAnimationStateEntry entry = {
+      .animation_name = animation_name,
+      .playing = playing,
+      .loop = loop,
+      .weight = static_cast<float>(weight),
+      .time_scale = static_cast<float>(time_scale),
+  };
+  node_->AddMutation(entry);
+}
+
+void SceneNode::SeekAnimation(const std::string& animation_name, double time) {
+  impeller::scene::Node::MutationLog::SeekAnimationEntry entry = {
+      .animation_name = animation_name,
+      .time = static_cast<float>(time),
+  };
+  node_->AddMutation(entry);
+}
+
+SceneNode::SceneNode() = default;
+
+SceneNode::~SceneNode() = default;
+
+}  // namespace flutter
diff --git a/lib/ui/painting/scene/scene_node.h b/lib/ui/painting/scene/scene_node.h
new file mode 100644
index 0000000000000000000000000000000000000000..2a44f934597769176c214879c4c2072eeb2d9a08
--- /dev/null
+++ b/lib/ui/painting/scene/scene_node.h
@@ -0,0 +1,68 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_LIB_UI_PAINTING_SCENE_SCENE_NODE_H_
+#define FLUTTER_LIB_UI_PAINTING_SCENE_SCENE_NODE_H_
+
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "flutter/fml/memory/ref_ptr.h"
+#include "flutter/lib/ui/dart_wrapper.h"
+#include "flutter/lib/ui/painting/shader.h"
+
+#include "third_party/tonic/dart_library_natives.h"
+
+namespace flutter {
+
+class SceneShader;
+
+/// @brief  A scene node, which may be a deserialized ipscene asset. This node
+///         can be safely added as a child to multiple scene nodes, whether
+///         they're in the same scene or a different scene. The deserialized
+///         node itself is treated as immutable on the IO thread.
+///
+///         Internally, nodes may have an animation player, which is controlled
+///         via the mutation log in the `DlSceneColorSource`, which is built by
+///         `SceneShader`.
+class SceneNode : public RefCountedDartWrappable<SceneNode> {
+  DEFINE_WRAPPERTYPEINFO();
+  FML_FRIEND_MAKE_REF_COUNTED(SceneShader);
+
+ public:
+  SceneNode();
+  ~SceneNode() override;
+
+  static void Create(Dart_Handle wrapper);
+
+  std::string initFromAsset(const std::string& asset_name,
+                            Dart_Handle completion_callback_handle);
+
+  void initFromTransform(const tonic::Float64List& matrix4);
+
+  void AddChild(Dart_Handle scene_node_handle);
+
+  void SetTransform(const tonic::Float64List& matrix4);
+
+  void SetAnimationState(const std::string& animation_name,
+                         bool playing,
+                         bool loop,
+                         double weight,
+                         double time_scale);
+
+  void SeekAnimation(const std::string& animation_name, double time);
+
+  fml::RefPtr<SceneNode> node(Dart_Handle shader);
+
+ private:
+  std::shared_ptr<impeller::scene::Node> node_;
+  std::vector<fml::RefPtr<SceneNode>> children_;
+
+  friend SceneShader;
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_LIB_UI_PAINTING_SCENE_SCENE_NODE_H_
diff --git a/lib/ui/painting/scene/scene_shader.cc b/lib/ui/painting/scene/scene_shader.cc
new file mode 100644
index 0000000000000000000000000000000000000000..fdfc0a176346168744755a5036086242b4bdfdcd
--- /dev/null
+++ b/lib/ui/painting/scene/scene_shader.cc
@@ -0,0 +1,97 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/lib/ui/painting/scene/scene_shader.h"
+
+#include <memory>
+#include <utility>
+
+#include "flutter/display_list/dl_tile_mode.h"
+#include "flutter/display_list/effects/dl_color_source.h"
+#include "flutter/lib/ui/dart_wrapper.h"
+#include "flutter/lib/ui/painting/scene/scene_node.h"
+#include "flutter/lib/ui/ui_dart_state.h"
+#include "impeller/geometry/scalar.h"
+#include "impeller/geometry/size.h"
+
+#include "third_party/tonic/converter/dart_converter.h"
+#include "third_party/tonic/dart_args.h"
+#include "third_party/tonic/dart_binding_macros.h"
+#include "third_party/tonic/dart_library_natives.h"
+#include "third_party/tonic/typed_data/typed_list.h"
+
+namespace flutter {
+
+IMPLEMENT_WRAPPERTYPEINFO(ui, SceneShader);
+
+SceneShader::SceneShader(fml::RefPtr<SceneNode> scene_node)
+    : scene_node_(std::move(scene_node)) {}
+
+void SceneShader::Create(Dart_Handle wrapper, Dart_Handle scene_node_handle) {
+  auto* scene_node =
+      tonic::DartConverter<SceneNode*>::FromDart(scene_node_handle);
+  if (!scene_node) {
+    return;
+  }
+
+  auto res = fml::MakeRefCounted<SceneShader>(fml::Ref(scene_node));
+  res->AssociateWithDartWrapper(wrapper);
+}
+
+void SceneShader::SetCameraTransform(const tonic::Float64List& matrix4) {
+  camera_transform_ =
+      impeller::Matrix(static_cast<impeller::Scalar>(matrix4[0]),
+                       static_cast<impeller::Scalar>(matrix4[1]),
+                       static_cast<impeller::Scalar>(matrix4[2]),
+                       static_cast<impeller::Scalar>(matrix4[3]),
+                       static_cast<impeller::Scalar>(matrix4[4]),
+                       static_cast<impeller::Scalar>(matrix4[5]),
+                       static_cast<impeller::Scalar>(matrix4[6]),
+                       static_cast<impeller::Scalar>(matrix4[7]),
+                       static_cast<impeller::Scalar>(matrix4[8]),
+                       static_cast<impeller::Scalar>(matrix4[9]),
+                       static_cast<impeller::Scalar>(matrix4[10]),
+                       static_cast<impeller::Scalar>(matrix4[11]),
+                       static_cast<impeller::Scalar>(matrix4[12]),
+                       static_cast<impeller::Scalar>(matrix4[13]),
+                       static_cast<impeller::Scalar>(matrix4[14]),
+                       static_cast<impeller::Scalar>(matrix4[15]));
+}
+
+static impeller::Matrix DefaultCameraTransform() {
+  // TODO(bdero): There's no way to know what the draw area will be yet, so
+  //              make the DlSceneColorSource camera transform optional and
+  //              defer this default (or parameterize the camera instead).
+  return impeller::Matrix::MakePerspective(
+             impeller::Degrees(45), impeller::ISize{800, 600}, 0.1f, 1000) *
+         impeller::Matrix::MakeLookAt({0, 0, -5}, {0, 0, 0}, {0, 1, 0});
+}
+
+std::shared_ptr<DlColorSource> SceneShader::shader(DlImageSampling sampling) {
+  FML_CHECK(scene_node_);
+
+  if (!scene_node_->node_) {
+    return nullptr;
+  }
+
+  // TODO(bdero): Gather the mutation log and include it in the scene color
+  // source.
+
+  auto source = std::make_shared<DlSceneColorSource>(
+      scene_node_->node_, camera_transform_.IsIdentity()
+                              ? DefaultCameraTransform()
+                              : camera_transform_);
+  // Just a sanity check, all scene shaders should be thread-safe
+  FML_DCHECK(source->isUIThreadSafe());
+  return source;
+}
+
+void SceneShader::Dispose() {
+  scene_node_ = nullptr;
+  ClearDartWrapper();
+}
+
+SceneShader::~SceneShader() = default;
+
+}  // namespace flutter
diff --git a/lib/ui/painting/scene/scene_shader.h b/lib/ui/painting/scene/scene_shader.h
new file mode 100644
index 0000000000000000000000000000000000000000..0dbb73d8f7233775657369fa46ed2ea7d87db223
--- /dev/null
+++ b/lib/ui/painting/scene/scene_shader.h
@@ -0,0 +1,45 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_LIB_UI_PAINTING_SCENE_SCENE_SHADER_H_
+#define FLUTTER_LIB_UI_PAINTING_SCENE_SCENE_SHADER_H_
+
+#include <string>
+#include <vector>
+
+#include "flutter/lib/ui/dart_wrapper.h"
+#include "flutter/lib/ui/painting/scene/scene_node.h"
+#include "flutter/lib/ui/painting/shader.h"
+#include "impeller/geometry/matrix.h"
+
+#include "third_party/tonic/dart_library_natives.h"
+
+namespace flutter {
+
+class SceneShader : public Shader {
+  DEFINE_WRAPPERTYPEINFO();
+  FML_FRIEND_MAKE_REF_COUNTED(SceneShader);
+
+ public:
+  ~SceneShader() override;
+
+  static void Create(Dart_Handle wrapper, Dart_Handle scene_node_handle);
+
+  void SetCameraTransform(const tonic::Float64List& matrix4);
+
+  void Dispose();
+
+  // |Shader|
+  std::shared_ptr<DlColorSource> shader(DlImageSampling) override;
+
+ private:
+  explicit SceneShader(fml::RefPtr<SceneNode> scene_node);
+
+  impeller::Matrix camera_transform_;
+  fml::RefPtr<SceneNode> scene_node_;
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_LIB_UI_PAINTING_SCENE_SCENE_SHADER_H_
diff --git a/lib/ui/painting/shader.h b/lib/ui/painting/shader.h
index e5a261b1cdd2f2f890773be022c0d2584ce84627..24c00afa31436f3d9dcbed99061f0ed3141a70b1 100644
--- a/lib/ui/painting/shader.h
+++ b/lib/ui/painting/shader.h
@@ -5,7 +5,7 @@
 #ifndef FLUTTER_LIB_UI_PAINTING_SHADER_H_
 #define FLUTTER_LIB_UI_PAINTING_SHADER_H_
 
-#include "flutter/display_list/display_list_color_source.h"
+#include "flutter/display_list/effects/dl_color_source.h"
 #include "flutter/lib/ui/ui_dart_state.h"
 
 namespace flutter {
diff --git a/lib/ui/painting/single_frame_codec.cc b/lib/ui/painting/single_frame_codec.cc
index e962b405cd1f8f988384bd4abdc44d97651b4b58..7f55ac8c85100cf52d5ac84dded5043ee24584d7 100644
--- a/lib/ui/painting/single_frame_codec.cc
+++ b/lib/ui/painting/single_frame_codec.cc
@@ -9,11 +9,11 @@
 
 namespace flutter {
 
-SingleFrameCodec::SingleFrameCodec(fml::RefPtr<ImageDescriptor> descriptor,
-                                   uint32_t target_width,
-                                   uint32_t target_height)
-    : status_(Status::kNew),
-      descriptor_(std::move(descriptor)),
+SingleFrameCodec::SingleFrameCodec(
+    const fml::RefPtr<ImageDescriptor>& descriptor,
+    uint32_t target_width,
+    uint32_t target_height)
+    : descriptor_(descriptor),
       target_width_(target_width),
       target_height_(target_height) {}
 
@@ -36,8 +36,8 @@ Dart_Handle SingleFrameCodec::getNextFrame(Dart_Handle callback_handle) {
     if (!cached_image_->image()) {
       return tonic::ToDart("Decoded image has been disposed");
     }
-    tonic::DartInvoke(callback_handle,
-                      {tonic::ToDart(cached_image_), tonic::ToDart(0)});
+    tonic::DartInvoke(callback_handle, {tonic::ToDart(cached_image_),
+                                        tonic::ToDart(0), tonic::ToDart("")});
     return Dart_Null();
   }
 
@@ -69,7 +69,8 @@ Dart_Handle SingleFrameCodec::getNextFrame(Dart_Handle callback_handle) {
       new fml::RefPtr<SingleFrameCodec>(this);
 
   decoder->Decode(
-      descriptor_, target_width_, target_height_, [raw_codec_ref](auto image) {
+      descriptor_, target_width_, target_height_,
+      [raw_codec_ref](auto image, auto decode_error) {
         std::unique_ptr<fml::RefPtr<SingleFrameCodec>> codec_ref(raw_codec_ref);
         fml::RefPtr<SingleFrameCodec> codec(std::move(*codec_ref));
 
@@ -96,10 +97,11 @@ Dart_Handle SingleFrameCodec::getNextFrame(Dart_Handle callback_handle) {
         codec->status_ = Status::kComplete;
 
         // Invoke any callbacks that were provided before the frame was decoded.
-        for (const DartPersistentValue& callback : codec->pending_callbacks_) {
-          tonic::DartInvoke(
-              callback.value(),
-              {tonic::ToDart(codec->cached_image_), tonic::ToDart(0)});
+        for (const tonic::DartPersistentValue& callback :
+             codec->pending_callbacks_) {
+          tonic::DartInvoke(callback.value(),
+                            {tonic::ToDart(codec->cached_image_),
+                             tonic::ToDart(0), tonic::ToDart(decode_error)});
         }
         codec->pending_callbacks_.clear();
       });
diff --git a/lib/ui/painting/single_frame_codec.h b/lib/ui/painting/single_frame_codec.h
index ef5fca8e58adb3a430d177c6b41ae3305e2da02c..8a1080b4d55e0fdae6acd14618d777678686920f 100644
--- a/lib/ui/painting/single_frame_codec.h
+++ b/lib/ui/painting/single_frame_codec.h
@@ -11,13 +11,11 @@
 #include "flutter/lib/ui/painting/image_decoder.h"
 #include "flutter/lib/ui/painting/image_descriptor.h"
 
-using tonic::DartPersistentValue;
-
 namespace flutter {
 
 class SingleFrameCodec : public Codec {
  public:
-  SingleFrameCodec(fml::RefPtr<ImageDescriptor> descriptor,
+  SingleFrameCodec(const fml::RefPtr<ImageDescriptor>& descriptor,
                    uint32_t target_width,
                    uint32_t target_height);
 
@@ -34,12 +32,12 @@ class SingleFrameCodec : public Codec {
 
  private:
   enum class Status { kNew, kInProgress, kComplete };
-  Status status_;
+  Status status_ = Status::kNew;
   fml::RefPtr<ImageDescriptor> descriptor_;
   uint32_t target_width_;
   uint32_t target_height_;
   fml::RefPtr<CanvasImage> cached_image_;
-  std::vector<DartPersistentValue> pending_callbacks_;
+  std::vector<tonic::DartPersistentValue> pending_callbacks_;
 
   FML_FRIEND_MAKE_REF_COUNTED(SingleFrameCodec);
   FML_FRIEND_REF_COUNTED_THREAD_SAFE(SingleFrameCodec);
diff --git a/lib/ui/painting/vertices.h b/lib/ui/painting/vertices.h
index 9c94f81359989abdd6e7bfded0a95f494b7eec5a..d0390dbc4ce30c0b10927a29aa62214f7d570c80 100644
--- a/lib/ui/painting/vertices.h
+++ b/lib/ui/painting/vertices.h
@@ -5,7 +5,7 @@
 #ifndef FLUTTER_LIB_UI_PAINTING_VERTICES_H_
 #define FLUTTER_LIB_UI_PAINTING_VERTICES_H_
 
-#include "flutter/display_list/display_list_vertices.h"
+#include "flutter/display_list/dl_vertices.h"
 #include "flutter/lib/ui/dart_wrapper.h"
 #include "third_party/skia/include/core/SkVertices.h"
 #include "third_party/tonic/typed_data/typed_list.h"
diff --git a/lib/ui/platform_dispatcher.dart b/lib/ui/platform_dispatcher.dart
index 392062ebdec3f8ed079ff443f42ad5ed02da4eba..1bbba16a8576769a6636d21ef2abf2f75b6b2d52 100644
--- a/lib/ui/platform_dispatcher.dart
+++ b/lib/ui/platform_dispatcher.dart
@@ -32,8 +32,8 @@ typedef PointerDataPacketCallback = void Function(PointerDataPacket packet);
 /// framework and should not be propagated further.
 typedef KeyDataCallback = bool Function(KeyData data);
 
-/// Signature for [PlatformDispatcher.onSemanticsAction].
-typedef SemanticsActionCallback = void Function(int id, SemanticsAction action, ByteData? args);
+/// Signature for [PlatformDispatcher.onSemanticsActionEvent].
+typedef SemanticsActionEventCallback = void Function(SemanticsActionEvent action);
 
 /// Signature for responses to platform messages.
 ///
@@ -41,16 +41,18 @@ typedef SemanticsActionCallback = void Function(int id, SemanticsAction action,
 /// [PlatformDispatcher.onPlatformMessage].
 typedef PlatformMessageResponseCallback = void Function(ByteData? data);
 
+/// Deprecated. Migrate to [ChannelBuffers.setListener] instead.
+///
 /// Signature for [PlatformDispatcher.onPlatformMessage].
-// TODO(ianh): deprecate once framework uses [ChannelBuffers.setListener].
+@Deprecated(
+  'Migrate to ChannelBuffers.setListener instead. '
+  'This feature was deprecated after v3.11.0-20.0.pre.',
+)
 typedef PlatformMessageCallback = void Function(String name, ByteData? data, PlatformMessageResponseCallback? callback);
 
 // Signature for _setNeedsReportTimings.
 typedef _SetNeedsReportTimingsFunc = void Function(bool value);
 
-/// Signature for [PlatformDispatcher.onConfigurationChanged].
-typedef PlatformConfigurationChangedCallback = void Function(PlatformConfiguration configuration);
-
 /// Signature for [PlatformDispatcher.onError].
 ///
 /// If this method returns false, the engine may use some fallback method to
@@ -71,7 +73,7 @@ const String _kFlutterKeyDataChannel = 'flutter/keydata';
 
 @pragma('vm:entry-point')
 ByteData? _wrapUnmodifiableByteData(ByteData? byteData) =>
-    byteData == null ? null : UnmodifiableByteDataView(byteData);
+    byteData?.asUnmodifiableView();
 
 /// A token that represents a root isolate.
 class RootIsolateToken {
@@ -87,7 +89,7 @@ class RootIsolateToken {
     return token == 0 ? null : RootIsolateToken._(token);
   }();
 
-  @FfiNative<Int64 Function()>('PlatformConfigurationNativeApi::GetRootIsolateToken')
+  @Native<Int64 Function()>(symbol: 'PlatformConfigurationNativeApi::GetRootIsolateToken')
   external static int __getRootIsolateToken();
 }
 
@@ -101,9 +103,8 @@ class RootIsolateToken {
 /// It exposes the core scheduler API, the input event callback, the graphics
 /// drawing API, and other such core services.
 ///
-/// It manages the list of the application's [views] and the [screens] attached
-/// to the device, as well as the [configuration] of various platform
-/// attributes.
+/// It manages the list of the application's [views] as well as the
+/// [configuration] of various platform attributes.
 ///
 /// Consider avoiding static references to this singleton through
 /// [PlatformDispatcher.instance] and instead prefer using a binding for
@@ -119,7 +120,7 @@ class PlatformDispatcher {
 
   /// The [PlatformDispatcher] singleton.
   ///
-  /// Consider avoiding static references to this singleton though
+  /// Consider avoiding static references to this singleton through
   /// [PlatformDispatcher.instance] and instead prefer using a binding for
   /// dependency resolution such as `WidgetsBinding.instance.platformDispatcher`.
   ///
@@ -139,12 +140,7 @@ class PlatformDispatcher {
   static PlatformDispatcher get instance => _instance;
   static final PlatformDispatcher _instance = PlatformDispatcher._();
 
-  /// The current platform configuration.
-  ///
-  /// If values in this configuration change, [onPlatformConfigurationChanged]
-  /// will be called.
-  PlatformConfiguration get configuration => _configuration;
-  PlatformConfiguration _configuration = const PlatformConfiguration();
+  _PlatformConfiguration _configuration = const _PlatformConfiguration();
 
   /// Called when the platform configuration changes.
   ///
@@ -158,15 +154,85 @@ class PlatformDispatcher {
     _onPlatformConfigurationChangedZone = Zone.current;
   }
 
+  /// The current list of displays.
+  ///
+  /// If any of their configurations change, [onMetricsChanged] will be called.
+  ///
+  /// To get the display for a [FlutterView], use [FlutterView.display].
+  ///
+  /// Platforms may limit what information is available to the application with
+  /// regard to secondary displays and/or displays that do not have an active
+  /// application window.
+  ///
+  /// Presently, on Android and Web this collection will only contain the
+  /// display that the current window is on. On iOS, it will only contains the
+  /// main display on the phone or tablet. On Desktop, it will contain only
+  /// a main display with a valid refresh rate but invalid size and device
+  /// pixel ratio values.
+  // TODO(dnfield): Update these docs when https://github.com/flutter/flutter/issues/125939
+  // and https://github.com/flutter/flutter/issues/125938 are resolved.
+  Iterable<Display> get displays => _displays.values;
+  final Map<int, Display> _displays = <int, Display>{};
+
   /// The current list of views, including top level platform windows used by
   /// the application.
   ///
   /// If any of their configurations change, [onMetricsChanged] will be called.
   Iterable<FlutterView> get views => _views.values;
-  final Map<Object, FlutterView> _views = <Object, FlutterView>{};
+  final Map<int, FlutterView> _views = <int, FlutterView>{};
 
-  // A map of opaque platform view identifiers to view configurations.
-  final Map<Object, ViewConfiguration> _viewConfigurations = <Object, ViewConfiguration>{};
+  /// Returns the [FlutterView] with the provided ID if one exists, or null
+  /// otherwise.
+  FlutterView? view({required int id}) => _views[id];
+
+  /// The [FlutterView] provided by the engine if the platform is unable to
+  /// create windows, or, for backwards compatibility.
+  ///
+  /// If the platform provides an implicit view, it can be used to bootstrap
+  /// the framework. This is common for platforms designed for single-view
+  /// applications like mobile devices with a single display.
+  ///
+  /// Applications and libraries must not rely on this property being set
+  /// as it may be null depending on the engine's configuration. Instead,
+  /// consider using [View.of] to lookup the [FlutterView] the current
+  /// [BuildContext] is drawing into.
+  ///
+  /// While the properties on the referenced [FlutterView] may change,
+  /// the reference itself is guaranteed to never change over the lifetime
+  /// of the application: if this property is null at startup, it will remain
+  /// so throughout the entire lifetime of the application. If it points to a
+  /// specific [FlutterView], it will continue to point to the same view until
+  /// the application is shut down (although the engine may replace or remove
+  /// the underlying backing surface of the view at its discretion).
+  ///
+  /// See also:
+  ///
+  /// * [View.of], for accessing the current view.
+  /// * [PlatformDispatcher.views] for a list of all [FlutterView]s provided
+  ///   by the platform.
+  FlutterView? get implicitView {
+    final FlutterView? result = _views[_implicitViewId];
+    // Make sure [implicitView] agrees with `_implicitViewId`.
+    assert((result != null) == (_implicitViewId != null),
+      (_implicitViewId != null) ?
+        'The implicit view ID is $_implicitViewId, but the implicit view does not exist.' :
+        'The implicit view ID is null, but the implicit view exists.');
+    // Make sure [implicitView] never chages.
+    assert(() {
+      if (_debugRecordedLastImplicitView) {
+        assert(identical(_debugLastImplicitView, result),
+          'The implicitView has changed:\n'
+          'Last: $_debugLastImplicitView\nCurrent: $result');
+      } else {
+        _debugLastImplicitView = result;
+        _debugRecordedLastImplicitView = true;
+      }
+      return true;
+    }());
+    return result;
+  }
+  FlutterView? _debugLastImplicitView;
+  bool _debugRecordedLastImplicitView = false;
 
   /// A callback that is invoked whenever the [ViewConfiguration] of any of the
   /// [views] changes.
@@ -196,101 +262,116 @@ class PlatformDispatcher {
 
   // Called from the engine, via hooks.dart
   //
-  // Updates the metrics of the window with the given id.
-  void _updateWindowMetrics(
-    Object id,
-    double devicePixelRatio,
-    double width,
-    double height,
-    double viewPaddingTop,
-    double viewPaddingRight,
-    double viewPaddingBottom,
-    double viewPaddingLeft,
-    double viewInsetTop,
-    double viewInsetRight,
-    double viewInsetBottom,
-    double viewInsetLeft,
-    double systemGestureInsetTop,
-    double systemGestureInsetRight,
-    double systemGestureInsetBottom,
-    double systemGestureInsetLeft,
-    double physicalTouchSlop,
-    List<double> displayFeaturesBounds,
-    List<int> displayFeaturesType,
-    List<int> displayFeaturesState,
-  ) {
-    final ViewConfiguration previousConfiguration =
-        _viewConfigurations[id] ?? const ViewConfiguration();
-    if (!_views.containsKey(id)) {
-      _views[id] = FlutterWindow._(id, this);
+  // Adds a new view with the specific view configuration.
+  //
+  // The implicit view must be added before [implicitView] is first called,
+  // which is typically the main function.
+  void _addView(int id, _ViewConfiguration viewConfiguration) {
+    assert(!_views.containsKey(id), 'View ID $id already exists.');
+    _views[id] = FlutterView._(id, this, viewConfiguration);
+    _invoke(onMetricsChanged, _onMetricsChangedZone);
+  }
+
+  // Called from the engine, via hooks.dart
+  //
+  // Removes the specific view.
+  //
+  // The target view must must exist. The implicit view must not be removed,
+  // or an assertion will be triggered.
+  void _removeView(int id) {
+    assert(id != _implicitViewId, 'The implicit view #$id can not be removed.');
+    if (id == _implicitViewId) {
+      return;
     }
-    _viewConfigurations[id] = previousConfiguration.copyWith(
-      window: _views[id],
-      devicePixelRatio: devicePixelRatio,
-      geometry: Rect.fromLTWH(0.0, 0.0, width, height),
-      viewPadding: WindowPadding._(
-        top: viewPaddingTop,
-        right: viewPaddingRight,
-        bottom: viewPaddingBottom,
-        left: viewPaddingLeft,
-      ),
-      viewInsets: WindowPadding._(
-        top: viewInsetTop,
-        right: viewInsetRight,
-        bottom: viewInsetBottom,
-        left: viewInsetLeft,
-      ),
-      padding: WindowPadding._(
-        top: math.max(0.0, viewPaddingTop - viewInsetTop),
-        right: math.max(0.0, viewPaddingRight - viewInsetRight),
-        bottom: math.max(0.0, viewPaddingBottom - viewInsetBottom),
-        left: math.max(0.0, viewPaddingLeft - viewInsetLeft),
-      ),
-      systemGestureInsets: WindowPadding._(
-        top: math.max(0.0, systemGestureInsetTop),
-        right: math.max(0.0, systemGestureInsetRight),
-        bottom: math.max(0.0, systemGestureInsetBottom),
-        left: math.max(0.0, systemGestureInsetLeft),
-      ),
-      // -1 is used as a sentinel for an undefined touch slop
-      gestureSettings: GestureSettings(
-        physicalTouchSlop: physicalTouchSlop == _kUnsetGestureSetting ? null : physicalTouchSlop,
-      ),
-      displayFeatures: _decodeDisplayFeatures(
-        bounds: displayFeaturesBounds,
-        type: displayFeaturesType,
-        state: displayFeaturesState,
-        devicePixelRatio: devicePixelRatio,
-      ),
-    );
+    assert(_views.containsKey(id), 'View ID $id does not exist.');
+    _views.remove(id);
     _invoke(onMetricsChanged, _onMetricsChangedZone);
   }
 
-  List<DisplayFeature> _decodeDisplayFeatures({
-    required List<double> bounds,
-    required List<int> type,
-    required List<int> state,
-    required double devicePixelRatio,
-  }) {
-    assert(bounds.length / 4 == type.length, 'Bounds are rectangles, requiring 4 measurements each');
-    assert(type.length == state.length);
-    final List<DisplayFeature> result = <DisplayFeature>[];
-    for(int i = 0; i < type.length; i++) {
-      final int rectOffset = i * 4;
-      result.add(DisplayFeature(
-        bounds: Rect.fromLTRB(
-          bounds[rectOffset] / devicePixelRatio,
-          bounds[rectOffset + 1] / devicePixelRatio,
-          bounds[rectOffset + 2] / devicePixelRatio,
-          bounds[rectOffset + 3] / devicePixelRatio,
-        ),
-        type: DisplayFeatureType.values[type[i]],
-        state: state[i] < DisplayFeatureState.values.length
-            ? DisplayFeatureState.values[state[i]]
-            : DisplayFeatureState.unknown,
-      ));
+  // Called from the engine, via hooks.dart.
+  //
+  // Updates the available displays.
+  void _updateDisplays(List<Display> displays) {
+    _displays.clear();
+    for (final Display display in displays) {
+      _displays[display.id] = display;
     }
-    return result;
+    _invoke(onMetricsChanged, _onMetricsChangedZone);
+  }
+
+  // Called from the engine, via hooks.dart
+  //
+  // Updates the metrics of the window with the given id.
+  void _updateWindowMetrics(int viewId, _ViewConfiguration viewConfiguration) {
+    assert(_views.containsKey(viewId), 'View $viewId does not exist.');
+    _views[viewId]!._viewConfiguration = viewConfiguration;
+    _invoke(onMetricsChanged, _onMetricsChangedZone);
+  }
+
+  /// A callback invoked immediately after the focus is transitioned across [FlutterView]s.
+  ///
+  /// When the platform moves the focus from one [FlutterView] to another, this
+  /// callback is invoked indicating the new view that has focus and the direction
+  /// in which focus was received. For example, if focus is moved to the [FlutterView]
+  /// with ID 2 in the forward direction (could be the result of pressing tab)
+  /// the callback receives a [ViewFocusEvent] with [ViewFocusState.focused] and
+  /// [ViewFocusDirection.forward].
+  ///
+  /// Typically, receivers of this event respond by moving the focus to the first
+  /// focusable widget inside the [FlutterView] with ID 2. If a view receives
+  /// focus in the backward direction (could be the result of pressing shift + tab),
+  /// typically the last focusable widget inside that view is focused.
+  ///
+  /// The platform may remove focus from a [FlutterView]. For example, on the web,
+  /// the browser can move focus to another element, or to the browser's built-in UI.
+  /// On desktop, the operating system can switch to another window (e.g. using Alt + Tab on Windows).
+  /// In scenarios like these, [onViewFocusChange] will be invoked with [ViewFocusState.unfocused] and
+  /// [ViewFocusDirection.undefined].
+  ///
+  /// Receivers typically respond to this event by removing all focus indications
+  /// from the app.
+  ///
+  /// Apps can also programmatically request to move the focus to a desired
+  /// [FlutterView] by calling [requestViewFocusChange].
+  ///
+  /// The callback is invoked in the same zone in which the callback was set.
+  ///
+  /// See also:
+  ///
+  ///   * [requestViewFocusChange] to programmatically instruct the platform to move focus to a different [FlutterView].
+  ///   * [ViewFocusState] for a list of allowed focus transitions.
+  ///   * [ViewFocusDirection] for a list of allowed focus directions.
+  ///   * [ViewFocusEvent], which is the event object provided to the callback.
+  ViewFocusChangeCallback? get onViewFocusChange => _onViewFocusChange;
+  ViewFocusChangeCallback? _onViewFocusChange;
+  // ignore: unused_field, field will be used when platforms other than web use these focus APIs.
+  Zone _onViewFocusChangeZone = Zone.root;
+  set onViewFocusChange(ViewFocusChangeCallback? callback) {
+    _onViewFocusChange = callback;
+    _onViewFocusChangeZone = Zone.current;
+  }
+
+  /// Requests a focus change of the [FlutterView] with ID [viewId].
+  ///
+  /// If an app would like to request the engine to move focus, in forward direction,
+  /// to the [FlutterView] with ID 1 it should call this method with [ViewFocusState.focused]
+  /// and [ViewFocusDirection.forward].
+  ///
+  /// There is no need to call this method if the view in question already has
+  /// focus as it won't have any effect.
+  ///
+  /// A call to this method will lead to the engine calling [onViewFocusChange]
+  /// if the request is successfully fulfilled.
+  ///
+  /// See also:
+  ///
+  ///  * [onViewFocusChange], a callback to subscribe to view focus change events.
+  void requestViewFocusChange({
+    required int viewId,
+    required ViewFocusState state,
+    required ViewFocusDirection direction,
+  }) {
+    // TODO(tugorez): implement this method. At the moment will be a no op call.
   }
 
   /// A callback invoked when any view begins a frame.
@@ -367,12 +448,9 @@ class PlatformDispatcher {
     }
   }
 
-  // If this value changes, update the encoding code in the following files:
-  //
-  //  * pointer_data.cc
-  //  * pointer.dart
-  //  * AndroidTouchProcessor.java
-  static const int _kPointerDataFieldCount = 35;
+  // This value must match kPointerDataFieldCount in pointer_data.cc. (The
+  // pointer_data.cc also lists other locations that must be kept consistent.)
+  static const int _kPointerDataFieldCount = 36;
 
   static PointerDataPacket _unpackPointerDataPacket(ByteData packet) {
     const int kStride = Int64List.bytesPerElement;
@@ -383,6 +461,7 @@ class PlatformDispatcher {
     for (int i = 0; i < length; ++i) {
       int offset = i * _kPointerDataFieldCount;
       data.add(PointerData(
+        // The unpacking code must match the struct in pointer_data.h.
         embedderId: packet.getInt64(kStride * offset++, _kFakeHostEndian),
         timeStamp: Duration(microseconds: packet.getInt64(kStride * offset++, _kFakeHostEndian)),
         change: PointerChange.values[packet.getInt64(kStride * offset++, _kFakeHostEndian)],
@@ -418,6 +497,7 @@ class PlatformDispatcher {
         panDeltaY: packet.getFloat64(kStride * offset++, _kFakeHostEndian),
         scale: packet.getFloat64(kStride * offset++, _kFakeHostEndian),
         rotation: packet.getFloat64(kStride * offset++, _kFakeHostEndian),
+        viewId: packet.getInt64(kStride * offset++, _kFakeHostEndian),
       ));
       assert(offset == (i + 1) * _kPointerDataFieldCount);
     }
@@ -458,11 +538,9 @@ class PlatformDispatcher {
 
   // If this value changes, update the encoding code in the following files:
   //
-  //  * key_data.h
-  //  * key.dart (ui)
-  //  * key.dart (web_ui)
-  //  * HardwareKeyboard.java
-  static const int _kKeyDataFieldCount = 5;
+  //  * key_data.h (kKeyDataFieldCount)
+  //  * KeyData.java (KeyData.FIELD_COUNT)
+  static const int _kKeyDataFieldCount = 6;
 
   // The packet structure is described in `key_data_packet.h`.
   static KeyData _unpackKeyData(ByteData packet) {
@@ -521,7 +599,7 @@ class PlatformDispatcher {
 
   void _nativeSetNeedsReportTimings(bool value) => __nativeSetNeedsReportTimings(value);
 
-  @FfiNative<Void Function(Bool)>('PlatformConfigurationNativeApi::SetNeedsReportTimings')
+  @Native<Void Function(Bool)>(symbol: 'PlatformConfigurationNativeApi::SetNeedsReportTimings')
   external static void __nativeSetNeedsReportTimings(bool value);
 
   // Called from the engine, via hooks.dart
@@ -554,7 +632,7 @@ class PlatformDispatcher {
   String? _sendPlatformMessage(String name, PlatformMessageResponseCallback? callback, ByteData? data) =>
       __sendPlatformMessage(name, callback, data);
 
-  @FfiNative<Handle Function(Handle, Handle, Handle)>('PlatformConfigurationNativeApi::SendPlatformMessage')
+  @Native<Handle Function(Handle, Handle, Handle)>(symbol: 'PlatformConfigurationNativeApi::SendPlatformMessage')
   external static String? __sendPlatformMessage(String name, PlatformMessageResponseCallback? callback, ByteData? data);
 
   /// Sends a message to a platform-specific plugin via a [SendPort].
@@ -580,7 +658,7 @@ class PlatformDispatcher {
   String? _sendPortPlatformMessage(String name, int identifier, int port, ByteData? data) =>
       __sendPortPlatformMessage(name, identifier, port, data);
 
-  @FfiNative<Handle Function(Handle, Handle, Handle, Handle)>('PlatformConfigurationNativeApi::SendPortPlatformMessage')
+  @Native<Handle Function(Handle, Handle, Handle, Handle)>(symbol: 'PlatformConfigurationNativeApi::SendPortPlatformMessage')
   external static String? __sendPortPlatformMessage(String name, int identifier, int port, ByteData? data);
 
   /// Registers the current isolate with the isolate identified with by the
@@ -590,9 +668,11 @@ class PlatformDispatcher {
     DartPluginRegistrant.ensureInitialized();
     __registerBackgroundIsolate(token._token);
   }
-  @FfiNative<Void Function(Int64)>('PlatformConfigurationNativeApi::RegisterBackgroundIsolate')
+  @Native<Void Function(Int64)>(symbol: 'PlatformConfigurationNativeApi::RegisterBackgroundIsolate')
   external static void __registerBackgroundIsolate(int rootIsolateId);
 
+  /// Deprecated. Migrate to [ChannelBuffers.setListener] instead.
+  ///
   /// Called whenever this platform dispatcher receives a message from a
   /// platform-specific plugin.
   ///
@@ -606,11 +686,17 @@ class PlatformDispatcher {
   ///
   /// The framework invokes this callback in the same zone in which the callback
   /// was set.
-  // TODO(ianh): Deprecate onPlatformMessage once the framework is moved over
-  // to using channel buffers exclusively.
+  @Deprecated(
+    'Migrate to ChannelBuffers.setListener instead. '
+    'This feature was deprecated after v3.11.0-20.0.pre.',
+  )
   PlatformMessageCallback? get onPlatformMessage => _onPlatformMessage;
   PlatformMessageCallback? _onPlatformMessage;
   Zone _onPlatformMessageZone = Zone.root;
+  @Deprecated(
+    'Migrate to ChannelBuffers.setListener instead. '
+    'This feature was deprecated after v3.11.0-20.0.pre.',
+  )
   set onPlatformMessage(PlatformMessageCallback? callback) {
     _onPlatformMessage = callback;
     _onPlatformMessageZone = Zone.current;
@@ -619,7 +705,7 @@ class PlatformDispatcher {
   /// Called by [_dispatchPlatformMessage].
   void _respondToPlatformMessage(int responseId, ByteData? data) => __respondToPlatformMessage(responseId, data);
 
-  @FfiNative<Void Function(IntPtr, Handle)>('PlatformConfigurationNativeApi::RespondToPlatformMessage')
+  @Native<Void Function(IntPtr, Handle)>(symbol: 'PlatformConfigurationNativeApi::RespondToPlatformMessage')
   external static void __respondToPlatformMessage(int responseId, ByteData? data);
 
   /// Wraps the given [callback] in another callback that ensures that the
@@ -679,7 +765,7 @@ class PlatformDispatcher {
   /// Note that this does not rename any child isolates of the root.
   void setIsolateDebugName(String name) => _setIsolateDebugName(name);
 
-  @FfiNative<Void Function(Handle)>('PlatformConfigurationNativeApi::SetIsolateDebugName')
+  @Native<Void Function(Handle)>(symbol: 'PlatformConfigurationNativeApi::SetIsolateDebugName')
   external static void _setIsolateDebugName(String name);
 
   /// Requests the Dart VM to adjusts the GC heuristics based on the requested `performance_mode`.
@@ -692,7 +778,7 @@ class PlatformDispatcher {
     _requestDartPerformanceMode(mode.index);
   }
 
-  @FfiNative<Int Function(Int)>('PlatformConfigurationNativeApi::RequestDartPerformanceMode')
+  @Native<Int Function(Int)>(symbol: 'PlatformConfigurationNativeApi::RequestDartPerformanceMode')
   external static int _requestDartPerformanceMode(int mode);
 
   /// The embedder can specify data that the isolate can request synchronously
@@ -706,7 +792,7 @@ class PlatformDispatcher {
   /// platform channel may be used.
   ByteData? getPersistentIsolateData() => _getPersistentIsolateData();
 
-  @FfiNative<Handle Function()>('PlatformConfigurationNativeApi::GetPersistentIsolateData')
+  @Native<Handle Function()>(symbol: 'PlatformConfigurationNativeApi::GetPersistentIsolateData')
   external static ByteData? _getPersistentIsolateData();
 
   /// Requests that, at the next appropriate opportunity, the [onBeginFrame] and
@@ -716,13 +802,49 @@ class PlatformDispatcher {
   ///
   ///  * [SchedulerBinding], the Flutter framework class which manages the
   ///    scheduling of frames.
+  ///  * [scheduleWarmUpFrame], which should only be used to schedule warm up
+  ///    frames.
   void scheduleFrame() => _scheduleFrame();
 
-  @FfiNative<Void Function()>('PlatformConfigurationNativeApi::ScheduleFrame')
+  @Native<Void Function()>(symbol: 'PlatformConfigurationNativeApi::ScheduleFrame')
   external static void _scheduleFrame();
 
+  /// Schedule a frame to run as soon as possible, rather than waiting for the
+  /// engine to request a frame in response to a system "Vsync" signal.
+  ///
+  /// The application can call this method as soon as it starts up so that the
+  /// first frame (which is likely to be quite expensive) can start a few extra
+  /// milliseconds earlier. Using it in other situations might lead to
+  /// unintended results, such as screen tearing. Depending on platforms and
+  /// situations, the warm up frame might or might not be actually rendered onto
+  /// the screen.
+  ///
+  /// For more introduction to the warm up frame, see
+  /// [SchedulerBinding.scheduleWarmUpFrame].
+  ///
+  /// This method uses the provided callbacks as the begin frame callback and
+  /// the draw frame callback instead of [onBeginFrame] and [onDrawFrame].
+  ///
+  /// See also:
+  ///
+  ///  * [SchedulerBinding.scheduleWarmUpFrame], which uses this method, and
+  ///    introduces the warm up frame in more details.
+  ///  * [scheduleFrame], which schedules the frame at the next appropriate
+  ///    opportunity and should be used to render regular frames.
+  void scheduleWarmUpFrame({required VoidCallback beginFrame, required VoidCallback drawFrame}) {
+    // We use timers here to ensure that microtasks flush in between.
+    Timer.run(beginFrame);
+    Timer.run(() {
+      drawFrame();
+      _endWarmUpFrame();
+    });
+  }
+
+  @Native<Void Function()>(symbol: 'PlatformConfigurationNativeApi::EndWarmUpFrame')
+  external static void _endWarmUpFrame();
+
   /// Additional accessibility features that may be enabled by the platform.
-  AccessibilityFeatures get accessibilityFeatures => configuration.accessibilityFeatures;
+  AccessibilityFeatures get accessibilityFeatures => _configuration.accessibilityFeatures;
 
   /// A callback that is invoked when the value of [accessibilityFeatures]
   /// changes.
@@ -740,7 +862,7 @@ class PlatformDispatcher {
   // Called from the engine, via hooks.dart
   void _updateAccessibilityFeatures(int values) {
     final AccessibilityFeatures newFeatures = AccessibilityFeatures._(values);
-    final PlatformConfiguration previousConfiguration = configuration;
+    final _PlatformConfiguration previousConfiguration = _configuration;
     if (newFeatures == previousConfiguration.accessibilityFeatures) {
       return;
     }
@@ -767,10 +889,10 @@ class PlatformDispatcher {
     semantics, use PlatformDispatcher.instance.views to get a [FlutterView] and
     call `updateSemantics`.
   ''')
-  void updateSemantics(SemanticsUpdate update) => _updateSemantics(update);
+  void updateSemantics(SemanticsUpdate update) => _updateSemantics(update as _NativeSemanticsUpdate);
 
-  @FfiNative<Void Function(Pointer<Void>)>('PlatformConfigurationNativeApi::UpdateSemantics')
-  external static void _updateSemantics(SemanticsUpdate update);
+  @Native<Void Function(Pointer<Void>)>(symbol: 'PlatformConfigurationNativeApi::UpdateSemantics')
+  external static void _updateSemantics(_NativeSemanticsUpdate update);
 
   /// The system-reported default locale of the device.
   ///
@@ -800,7 +922,7 @@ class PlatformDispatcher {
   ///
   ///  * [WidgetsBindingObserver], for a mechanism at the widgets layer to
   ///    observe when this value changes.
-  List<Locale> get locales => configuration.locales;
+  List<Locale> get locales => _configuration.locales;
 
   /// Performs the platform-native locale resolution.
   ///
@@ -831,7 +953,7 @@ class PlatformDispatcher {
 
   List<String> _computePlatformResolvedLocale(List<String?> supportedLocalesData) => __computePlatformResolvedLocale(supportedLocalesData);
 
-  @FfiNative<Handle Function(Handle)>('PlatformConfigurationNativeApi::ComputePlatformResolvedLocale')
+  @Native<Handle Function(Handle)>(symbol: 'PlatformConfigurationNativeApi::ComputePlatformResolvedLocale')
   external static List<String> __computePlatformResolvedLocale(List<String?> supportedLocalesData);
 
   /// A callback that is invoked whenever [locale] changes value.
@@ -855,7 +977,7 @@ class PlatformDispatcher {
   void _updateLocales(List<String> locales) {
     const int stringsPerLocale = 4;
     final int numLocales = locales.length ~/ stringsPerLocale;
-    final PlatformConfiguration previousConfiguration = configuration;
+    final _PlatformConfiguration previousConfiguration = _configuration;
     final List<Locale> newLocales = <Locale>[];
     bool localesDiffer = numLocales != previousConfiguration.locales.length;
     for (int localeIndex = 0; localeIndex < numLocales; localeIndex++) {
@@ -901,7 +1023,7 @@ class PlatformDispatcher {
   bool _initialLifecycleStateAccessed = false;
 
   // Called from the engine, via hooks.dart
-  void _updateLifecycleState(String state) {
+  void _updateInitialLifecycleState(String state) {
     // We do not update the state if the state has already been used to initialize
     // the lifecycleState.
     if (!_initialLifecycleStateAccessed) {
@@ -913,7 +1035,7 @@ class PlatformDispatcher {
   /// format.
   ///
   /// This option is used by [showTimePicker].
-  bool get alwaysUse24HourFormat => configuration.alwaysUse24HourFormat;
+  bool get alwaysUse24HourFormat => _configuration.alwaysUse24HourFormat;
 
   /// The system-reported text scale.
   ///
@@ -927,7 +1049,7 @@ class PlatformDispatcher {
   ///
   ///  * [WidgetsBindingObserver], for a mechanism at the widgets layer to
   ///    observe when this value changes.
-  double get textScaleFactor => configuration.textScaleFactor;
+  double get textScaleFactor => _configuration.textScaleFactor;
 
   /// A callback that is invoked whenever [textScaleFactor] changes value.
   ///
@@ -967,7 +1089,7 @@ class PlatformDispatcher {
   /// The setting indicating the current brightness mode of the host platform.
   /// If the platform has no preference, [platformBrightness] defaults to
   /// [Brightness.light].
-  Brightness get platformBrightness => configuration.platformBrightness;
+  Brightness get platformBrightness => _configuration.platformBrightness;
 
   /// A callback that is invoked whenever [platformBrightness] changes value.
   ///
@@ -987,7 +1109,7 @@ class PlatformDispatcher {
   }
 
   /// The setting indicating the current system font of the host platform.
-  String? get systemFontFamily => configuration.systemFontFamily;
+  String? get systemFontFamily => _configuration.systemFontFamily;
 
   /// A callback that is invoked whenever [systemFontFamily] changes value.
   ///
@@ -1026,17 +1148,19 @@ class PlatformDispatcher {
     if (brieflyShowPassword != null) {
       _brieflyShowPassword = brieflyShowPassword;
     }
-    final Brightness platformBrightness =
-    data['platformBrightness']! as String == 'dark' ? Brightness.dark : Brightness.light;
+    final Brightness platformBrightness = switch (data['platformBrightness']) {
+      'dark'              => Brightness.dark,
+      'light'             => Brightness.light,
+      final Object? value => throw StateError('$value is not a valid platformBrightness.'),
+    };
     final String? systemFontFamily = data['systemFontFamily'] as String?;
-    final PlatformConfiguration previousConfiguration = configuration;
+    final int? configurationId = data['configurationId'] as int?;
+    final _PlatformConfiguration previousConfiguration = _configuration;
     final bool platformBrightnessChanged = previousConfiguration.platformBrightness != platformBrightness;
     final bool textScaleFactorChanged = previousConfiguration.textScaleFactor != textScaleFactor;
-    final bool alwaysUse24HourFormatChanged =
-        previousConfiguration.alwaysUse24HourFormat != alwaysUse24HourFormat;
-    final bool systemFontFamilyChanged =
-        previousConfiguration.systemFontFamily != systemFontFamily;
-    if (!platformBrightnessChanged && !textScaleFactorChanged && !alwaysUse24HourFormatChanged && !systemFontFamilyChanged) {
+    final bool alwaysUse24HourFormatChanged = previousConfiguration.alwaysUse24HourFormat != alwaysUse24HourFormat;
+    final bool systemFontFamilyChanged = previousConfiguration.systemFontFamily != systemFontFamily;
+    if (!platformBrightnessChanged && !textScaleFactorChanged && !alwaysUse24HourFormatChanged && !systemFontFamilyChanged && configurationId == null) {
       return;
     }
     _configuration = previousConfiguration.copyWith(
@@ -1044,9 +1168,11 @@ class PlatformDispatcher {
       alwaysUse24HourFormat: alwaysUse24HourFormat,
       platformBrightness: platformBrightness,
       systemFontFamily: systemFontFamily,
+      configurationId: configurationId,
     );
     _invoke(onPlatformConfigurationChanged, _onPlatformConfigurationChangedZone);
     if (textScaleFactorChanged) {
+      _cachedFontSizes = null;
       _invoke(onTextScaleFactorChanged, _onTextScaleFactorChangedZone);
     }
     if (platformBrightnessChanged) {
@@ -1062,7 +1188,7 @@ class PlatformDispatcher {
   ///
   /// The [onSemanticsEnabledChanged] callback is called whenever this value
   /// changes.
-  bool get semanticsEnabled => configuration.semanticsEnabled;
+  bool get semanticsEnabled => _configuration.semanticsEnabled;
 
   /// A callback that is invoked when the value of [semanticsEnabled] changes.
   ///
@@ -1078,7 +1204,7 @@ class PlatformDispatcher {
 
   // Called from the engine, via hooks.dart
   void _updateSemanticsEnabled(bool enabled) {
-    final PlatformConfiguration previousConfiguration = configuration;
+    final _PlatformConfiguration previousConfiguration = _configuration;
     if (previousConfiguration.semanticsEnabled == enabled) {
       return;
     }
@@ -1090,19 +1216,19 @@ class PlatformDispatcher {
   }
 
   /// A callback that is invoked whenever the user requests an action to be
-  /// performed.
+  /// performed on a semantics node.
   ///
   /// This callback is used when the user expresses the action they wish to
-  /// perform based on the semantics supplied by updateSemantics.
+  /// perform based on the semantics node supplied by updateSemantics.
   ///
   /// The framework invokes this callback in the same zone in which the
   /// callback was set.
-  SemanticsActionCallback? get onSemanticsAction => _onSemanticsAction;
-  SemanticsActionCallback? _onSemanticsAction;
-  Zone _onSemanticsActionZone = Zone.root;
-  set onSemanticsAction(SemanticsActionCallback? callback) {
-    _onSemanticsAction = callback;
-    _onSemanticsActionZone = Zone.current;
+  SemanticsActionEventCallback? get onSemanticsActionEvent => _onSemanticsActionEvent;
+  SemanticsActionEventCallback? _onSemanticsActionEvent;
+  Zone _onSemanticsActionEventZone = Zone.root;
+  set onSemanticsActionEvent(SemanticsActionEventCallback? callback) {
+    _onSemanticsActionEvent = callback;
+    _onSemanticsActionEventZone = Zone.current;
   }
 
   // Called from the engine via hooks.dart.
@@ -1129,13 +1255,16 @@ class PlatformDispatcher {
   }
 
   // Called from the engine, via hooks.dart
-  void _dispatchSemanticsAction(int id, int action, ByteData? args) {
-    _invoke3<int, SemanticsAction, ByteData?>(
-      onSemanticsAction,
-      _onSemanticsActionZone,
-      id,
-      SemanticsAction.values[action]!,
-      args,
+  void _dispatchSemanticsAction(int nodeId, int action, ByteData? args) {
+    _invoke1<SemanticsActionEvent>(
+      onSemanticsActionEvent,
+      _onSemanticsActionEventZone,
+      SemanticsActionEvent(
+        type: SemanticsAction.fromIndex(action)!,
+        nodeId: nodeId,
+        viewId: 0, // TODO(goderbauer): Wire up the real view ID.
+        arguments: args,
+      ),
     );
   }
 
@@ -1157,8 +1286,7 @@ class PlatformDispatcher {
   ///
   /// This callback is not directly invoked by errors in child isolates of the
   /// root isolate. Programs that create new isolates must listen for errors on
-  /// those isolates and forward the errors to the root isolate. An example of
-  /// this can be found in the Flutter framework's `compute` function.
+  /// those isolates and forward the errors to the root isolate.
   ErrorCallback? get onError => _onError;
   set onError(ErrorCallback? callback) {
     _onError = callback;
@@ -1202,7 +1330,7 @@ class PlatformDispatcher {
   /// ## iOS
   ///
   /// On iOS, calling
-  /// [`FlutterViewController.setInitialRoute`](/objcdoc/Classes/FlutterViewController.html#/c:objc%28cs%29FlutterViewController%28im%29setInitialRoute:)
+  /// [`FlutterViewController.setInitialRoute`](/ios-embedder/interface_flutter_view_controller.html#a7f269c2da73312f856d42611cc12a33f)
   /// will set this value. The value must be set sufficiently early, i.e. before
   /// the [runApp] call is executed in Dart, for this to have any effect on the
   /// framework. The `application:didFinishLaunchingWithOptions:` method is a
@@ -1215,16 +1343,108 @@ class PlatformDispatcher {
   ///    requests from the embedder.
   String get defaultRouteName => _defaultRouteName();
 
-  @FfiNative<Handle Function()>('PlatformConfigurationNativeApi::DefaultRouteName')
+  @Native<Handle Function()>(symbol: 'PlatformConfigurationNativeApi::DefaultRouteName')
   external static String _defaultRouteName();
+
+  /// Computes the scaled font size from the given `unscaledFontSize`, according
+  /// to the user's platform preferences.
+  ///
+  /// Many platforms allow users to scale text globally for better readability.
+  /// Given the font size the app developer specified in logical pixels, this
+  /// method converts it to the preferred font size (also in logical pixels) that
+  /// accounts for platform-wide text scaling. The return value is always
+  /// non-negative.
+  ///
+  /// The scaled value of the same font size input may change if the user changes
+  /// the text scaling preference (in system settings for example). The
+  /// [onTextScaleFactorChanged] callback can be used to monitor such changes.
+  ///
+  /// Instead of directly calling this method, applications should typically use
+  /// [MediaQuery.textScalerOf] to retrive the scaled font size in a widget tree,
+  /// so text in the app resizes properly when the text scaling preference
+  /// changes.
+  double scaleFontSize(double unscaledFontSize) {
+    assert(unscaledFontSize >= 0);
+    assert(unscaledFontSize.isFinite);
+
+    if (textScaleFactor == 1.0) {
+      return unscaledFontSize;
+    }
+
+    final int unscaledFloor = unscaledFontSize.floor();
+    final int unscaledCeil = unscaledFontSize.ceil();
+    if (unscaledFloor == unscaledCeil) {
+      // No need to interpolate if the input value is an integer.
+      return _scaleAndMemoize(unscaledFloor) ?? unscaledFontSize * textScaleFactor;
+    }
+    assert(unscaledCeil - unscaledFloor == 1, 'Unexpected interpolation range: $unscaledFloor - $unscaledCeil.');
+
+    return switch ((_scaleAndMemoize(unscaledFloor), _scaleAndMemoize(unscaledCeil))) {
+      (null, _) || (_, null)                   => unscaledFontSize * textScaleFactor,
+      (final double lower, final double upper) => lower + (upper - lower) * (unscaledFontSize - unscaledFloor),
+    };
+  }
+
+  // The cache is cleared when the text scale factor changes.
+  Map<int, double>? _cachedFontSizes;
+  // This method returns null if an error is encountered.
+  double? _scaleAndMemoize(int unscaledFontSize) {
+    final int? configurationId = _configuration.configurationId;
+    if (configurationId == null) {
+      // The platform uses linear scaling, or the platform hasn't sent us a
+      // configuration yet.
+      return null;
+    }
+    final double? cachedValue = _cachedFontSizes?[unscaledFontSize];
+    if (cachedValue != null) {
+      assert(cachedValue >= 0);
+      return cachedValue;
+    }
+
+    final double unscaledFontSizeDouble = unscaledFontSize.toDouble();
+    final double fontSize = PlatformDispatcher._getScaledFontSize(unscaledFontSizeDouble, configurationId);
+    if (fontSize >= 0) {
+      return (_cachedFontSizes ??= <int, double>{})[unscaledFontSize] = fontSize;
+    }
+    switch (fontSize) {
+      case -1:
+        // Invalid configuration id. This error can be unrecoverable as the
+        // _getScaledFontSize function can be destructive.
+        assert(false, 'Flutter Error: incorrect configuration id: $configurationId.');
+      case final double errorCode:
+        assert(false, 'Unknown error: GetScaledFontSize failed with $errorCode.');
+    }
+    return null;
+  }
+
+  // Calls the platform's text scaling implementation to scale the given
+  // `unscaledFontSize`.
+  //
+  // The `configurationId` parameter tells the embedder which platform
+  // configuration to use for computing the scaled font size. When the user
+  // changes the platform configuration, the configuration data will first be
+  // made available on the platform thread before being dispatched asynchronously
+  // to the Flutter UI thread. Since this call is synchronous, without this
+  // identifier, it could call into the embber who's using a newer configuration
+  // that Flutter has not received yet. The `configurationId` parameter must be
+  // the lastest configuration id received from the platform
+  // (`_configuration.configurationId`). Using an incorrect id could result in
+  // an unrecoverable error.
+  //
+  // Currently this is only implemented on newer versions of Android (SDK level
+  // 34, using the `TypedValue#applyDimension` API). Platforms that do not have
+  // the capability will never send a `configurationId` to [PlatformDispatcher],
+  // and should not call this method. This method returns -1 when the specified
+  // configurationId does not match any configuration.
+  @Native<Double Function(Double, Int)>(symbol: 'PlatformConfigurationNativeApi::GetScaledFontSize')
+  external static double _getScaledFontSize(double unscaledFontSize, int configurationId);
 }
 
 /// Configuration of the platform.
 ///
 /// Immutable class (but can't use @immutable in dart:ui)
-class PlatformConfiguration {
-  /// Const constructor for [PlatformConfiguration].
-  const PlatformConfiguration({
+class _PlatformConfiguration {
+  const _PlatformConfiguration({
     this.accessibilityFeatures = const AccessibilityFeatures._(0),
     this.alwaysUse24HourFormat = false,
     this.semanticsEnabled = false,
@@ -1233,10 +1453,10 @@ class PlatformConfiguration {
     this.locales = const <Locale>[],
     this.defaultRouteName,
     this.systemFontFamily,
+    this.configurationId,
   });
 
-  /// Copy a [PlatformConfiguration] with some fields replaced.
-  PlatformConfiguration copyWith({
+  _PlatformConfiguration copyWith({
     AccessibilityFeatures? accessibilityFeatures,
     bool? alwaysUse24HourFormat,
     bool? semanticsEnabled,
@@ -1245,8 +1465,9 @@ class PlatformConfiguration {
     List<Locale>? locales,
     String? defaultRouteName,
     String? systemFontFamily,
+    int? configurationId,
   }) {
-    return PlatformConfiguration(
+    return _PlatformConfiguration(
       accessibilityFeatures: accessibilityFeatures ?? this.accessibilityFeatures,
       alwaysUse24HourFormat: alwaysUse24HourFormat ?? this.alwaysUse24HourFormat,
       semanticsEnabled: semanticsEnabled ?? this.semanticsEnabled,
@@ -1255,6 +1476,7 @@ class PlatformConfiguration {
       locales: locales ?? this.locales,
       defaultRouteName: defaultRouteName ?? this.defaultRouteName,
       systemFontFamily: systemFontFamily ?? this.systemFontFamily,
+      configurationId: configurationId ?? this.configurationId,
     );
   }
 
@@ -1286,119 +1508,88 @@ class PlatformConfiguration {
 
   /// The system-reported default font family.
   final String? systemFontFamily;
+
+  /// A unique identifier for this [_PlatformConfiguration].
+  ///
+  /// This unique identifier is optionally assigned by the platform embedder.
+  /// Dart code that runs on the Flutter UI thread and synchronously invokes
+  /// platform APIs can use this identifier to tell the embedder to use the
+  /// configuration that matches the current [_PlatformConfiguration] in
+  /// dart:ui. See the [_getScaledFontSize] function for an example.
+  ///
+  /// This field's nullability also indicates whether the platform supports
+  /// nonlinear text scaling (as it's the only feature that requires synchronous
+  /// invocation of platform APIs). This field is always null if the platform
+  /// does not use nonlinear text scaling, or when dart:ui has not received any
+  /// configuration updates from the embedder yet. The _getScaledFontSize
+  /// function should not be called in either case.
+  final int? configurationId;
 }
 
 /// An immutable view configuration.
-class ViewConfiguration {
-  /// A const constructor for an immutable [ViewConfiguration].
-  const ViewConfiguration({
-    this.window,
+class _ViewConfiguration {
+  const _ViewConfiguration({
     this.devicePixelRatio = 1.0,
-    this.geometry = Rect.zero,
-    this.visible = false,
-    this.viewInsets = WindowPadding.zero,
-    this.viewPadding = WindowPadding.zero,
-    this.systemGestureInsets = WindowPadding.zero,
-    this.padding = WindowPadding.zero,
+    this.size = Size.zero,
+    this.viewInsets = ViewPadding.zero,
+    this.viewPadding = ViewPadding.zero,
+    this.systemGestureInsets = ViewPadding.zero,
+    this.padding = ViewPadding.zero,
     this.gestureSettings = const GestureSettings(),
     this.displayFeatures = const <DisplayFeature>[],
+    this.displayId = 0,
   });
 
-  /// Copy this configuration with some fields replaced.
-  ViewConfiguration copyWith({
-    FlutterView? window,
-    double? devicePixelRatio,
-    Rect? geometry,
-    bool? visible,
-    WindowPadding? viewInsets,
-    WindowPadding? viewPadding,
-    WindowPadding? systemGestureInsets,
-    WindowPadding? padding,
-    GestureSettings? gestureSettings,
-    List<DisplayFeature>? displayFeatures,
-  }) {
-    return ViewConfiguration(
-      window: window ?? this.window,
-      devicePixelRatio: devicePixelRatio ?? this.devicePixelRatio,
-      geometry: geometry ?? this.geometry,
-      visible: visible ?? this.visible,
-      viewInsets: viewInsets ?? this.viewInsets,
-      viewPadding: viewPadding ?? this.viewPadding,
-      systemGestureInsets: systemGestureInsets ?? this.systemGestureInsets,
-      padding: padding ?? this.padding,
-      gestureSettings: gestureSettings ?? this.gestureSettings,
-      displayFeatures: displayFeatures ?? this.displayFeatures,
-    );
-  }
-
-  /// The top level view into which the view is placed and its geometry is
-  /// relative to.
-  ///
-  /// If null, then this configuration represents a top level view itself.
-  final FlutterView? window;
+  /// The identifier for a display for this view, in
+  /// [PlatformDispatcher._displays].
+  final int displayId;
 
   /// The pixel density of the output surface.
   final double devicePixelRatio;
 
-  /// The geometry requested for the view on the screen or within its parent
-  /// window, in logical pixels.
-  final Rect geometry;
-
-  /// Whether or not the view is currently visible on the screen.
-  final bool visible;
+  /// The size requested for the view in physical pixels.
+  final Size size;
 
-  /// The view insets, as it intersects with [Screen.viewInsets] for the screen
-  /// it is on.
-  ///
-  /// For instance, if the view doesn't overlap the
-  /// [ScreenConfiguration.viewInsets] area, [viewInsets] will be
-  /// [WindowPadding.zero].
+  /// The number of physical pixels on each side of the display rectangle into
+  /// which the view can render, but over which the operating system will likely
+  /// place system UI, such as the keyboard, that fully obscures any content.
   ///
-  /// The number of physical pixels on each side of this view rectangle into
-  /// which the application can draw, but over which the operating system will
-  /// likely place system UI, such as the keyboard or system menus, that fully
-  /// obscures any content.
-  final WindowPadding viewInsets;
+  /// The relationship between this [viewInsets], [viewPadding], and [padding]
+  /// are described in more detail in the documentation for [FlutterView].
+  final ViewPadding viewInsets;
 
-  /// The view insets, as it intersects with [ScreenConfiguration.viewPadding]
-  /// for the screen it is on.
+  /// The number of physical pixels on each side of the display rectangle into
+  /// which the view can render, but which may be partially obscured by system
+  /// UI (such as the system notification area), or physical intrusions in
+  /// the display (e.g. overscan regions on television screens or phone sensor
+  /// housings).
   ///
-  /// For instance, if the view doesn't overlap the
-  /// [ScreenConfiguration.viewPadding] area, [viewPadding] will be
-  /// [WindowPadding.zero].
+  /// Unlike [padding], this value does not change relative to [viewInsets].
+  /// For example, on an iPhone X, it will not change in response to the soft
+  /// keyboard being visible or hidden, whereas [padding] will.
   ///
-  /// The number of physical pixels on each side of this screen rectangle into
-  /// which the application can place a view, but which may be partially
-  /// obscured by system UI (such as the system notification area), or physical
-  /// intrusions in the display (e.g. overscan regions on television screens or
-  /// phone sensor housings).
-  final WindowPadding viewPadding;
+  /// The relationship between this [viewInsets], [viewPadding], and [padding]
+  /// are described in more detail in the documentation for [FlutterView].
+  final ViewPadding viewPadding;
 
-  /// The view insets, as it intersects with
-  /// [ScreenConfiguration.systemGestureInsets] for the screen it is on.
+  /// The number of physical pixels on each side of the display rectangle into
+  /// which the view can render, but where the operating system will consume
+  /// input gestures for the sake of system navigation.
   ///
-  /// For instance, if the view doesn't overlap the
-  /// [ScreenConfiguration.systemGestureInsets] area, [systemGestureInsets] will
-  /// be [WindowPadding.zero].
-  ///
-  /// The number of physical pixels on each side of this screen rectangle into
-  /// which the application can place a view, but where the operating system
-  /// will consume input gestures for the sake of system navigation.
-  final WindowPadding systemGestureInsets;
+  /// For example, an operating system might use the vertical edges of the
+  /// screen, where swiping inwards from the edges takes users backward
+  /// through the history of screens they previously visited.
+  final ViewPadding systemGestureInsets;
 
-  /// The view insets, as it intersects with [ScreenConfiguration.padding] for
-  /// the screen it is on.
-  ///
-  /// For instance, if the view doesn't overlap the
-  /// [ScreenConfiguration.padding] area, [padding] will be
-  /// [WindowPadding.zero].
+  /// The number of physical pixels on each side of the display rectangle into
+  /// which the view can render, but which may be partially obscured by system
+  /// UI (such as the system notification area), or physical intrusions in
+  /// the display (e.g. overscan regions on television screens or phone sensor
+  /// housings).
   ///
-  /// The number of physical pixels on each side of this screen rectangle into
-  /// which the application can place a view, but which may be partially
-  /// obscured by system UI (such as the system notification area), or physical
-  /// intrusions in the display (e.g. overscan regions on television screens or
-  /// phone sensor housings).
-  final WindowPadding padding;
+  /// The relationship between this [viewInsets], [viewPadding], and [padding]
+  /// are described in more detail in the documentation for [FlutterView].
+  final ViewPadding padding;
 
   /// Additional configuration for touch gestures performed on this view.
   ///
@@ -1407,7 +1598,6 @@ class ViewConfiguration {
   /// touch slop constant.
   final GestureSettings gestureSettings;
 
-  /// {@template dart.ui.ViewConfiguration.displayFeatures}
   /// Areas of the display that are obstructed by hardware features.
   ///
   /// This list is populated only on Android. If the device has no display
@@ -1424,12 +1614,11 @@ class ViewConfiguration {
   /// Folding [DisplayFeature]s like the [DisplayFeatureType.hinge] and
   /// [DisplayFeatureType.fold] also have a [DisplayFeature.state] which can be
   /// used to determine the posture the device is in.
-  /// {@endtemplate}
   final List<DisplayFeature> displayFeatures;
 
   @override
   String toString() {
-    return '$runtimeType[window: $window, geometry: $geometry]';
+    return '$runtimeType[size: $size]';
   }
 }
 
@@ -1641,54 +1830,174 @@ class FrameTiming {
   }
 }
 
-/// States that an application can be in.
+/// States that an application can be in once it is running.
+///
+/// States not supported on a platform will be synthesized by the framework when
+/// transitioning between states which are supported, so that all
+/// implementations share the same state machine.
+///
+/// The initial value for the state is the [detached] state, updated to the
+/// current state (usually [resumed]) as soon as the first lifecycle update is
+/// received from the platform.
+///
+/// For historical and name collision reasons, Flutter's application state names
+/// do not correspond one to one with the state names on all platforms. On
+/// Android, for instance, when the OS calls
+/// [`Activity.onPause`](https://developer.android.com/reference/android/app/Activity#onPause()),
+/// Flutter will enter the [inactive] state, but when Android calls
+/// [`Activity.onStop`](https://developer.android.com/reference/android/app/Activity#onStop()),
+/// Flutter enters the [paused] state. See the individual state's documentation
+/// for descriptions of what they mean on each platform.
+///
+/// The current application state can be obtained from
+/// [SchedulerBinding.instance.lifecycleState], and changes to the state can be
+/// observed by creating an [AppLifecycleListener], or by using a
+/// [WidgetsBindingObserver] by overriding the
+/// [WidgetsBindingObserver.didChangeAppLifecycleState] method.
+///
+/// Applications should not rely on always receiving all possible notifications.
 ///
-/// The values below describe notifications from the operating system.
-/// Applications should not expect to always receive all possible
-/// notifications. For example, if the users pulls out the battery from the
-/// device, no notification will be sent before the application is suddenly
-/// terminated, along with the rest of the operating system.
+/// For example, if the application is killed with a task manager, a kill
+/// signal, the user pulls the power from the device, or there is a rapid
+/// unscheduled disassembly of the device, no notification will be sent before
+/// the application is suddenly terminated, and some states may be skipped.
 ///
 /// See also:
 ///
-///  * [WidgetsBindingObserver], for a mechanism to observe the lifecycle state
-///    from the widgets layer.
+/// * [AppLifecycleListener], an object used observe the lifecycle state that
+///   provides state transition callbacks.
+/// * [WidgetsBindingObserver], for a mechanism to observe the lifecycle state
+///   from the widgets layer.
+/// * iOS's [IOKit activity
+///   lifecycle](https://developer.apple.com/documentation/uikit/app_and_environment/managing_your_app_s_life_cycle?language=objc)
+///   documentation.
+/// * Android's [activity
+///   lifecycle](https://developer.android.com/guide/components/activities/activity-lifecycle)
+///   documentation.
+/// * macOS's [AppKit activity
+///   lifecycle](https://developer.apple.com/documentation/appkit/nsapplicationdelegate?language=objc)
+///   documentation.
 enum AppLifecycleState {
-  /// The application is visible and responding to user input.
-  resumed,
-
-  /// The application is in an inactive state and is not receiving user input.
+  /// The application is still hosted by a Flutter engine but is detached from
+  /// any host views.
   ///
-  /// On iOS, this state corresponds to an app or the Flutter host view running
-  /// in the foreground inactive state. Apps transition to this state when in
-  /// a phone call, responding to a TouchID request, when entering the app
-  /// switcher or the control center, or when the UIViewController hosting the
-  /// Flutter app is transitioning.
+  /// The application defaults to this state before it initializes, and can be
+  /// in this state (applicable on Android, iOS, and web) after all views have been
+  /// detached.
   ///
-  /// On Android, this corresponds to an app or the Flutter host view running
-  /// in the foreground inactive state.  Apps transition to this state when
-  /// another activity is focused, such as a split-screen app, a phone call,
-  /// a picture-in-picture app, a system dialog, or another window.
+  /// When the application is in this state, the engine is running without a
+  /// view.
   ///
-  /// Apps in this state should assume that they may be [paused] at any time.
+  /// This state is only entered on iOS, Android, and web, although on all platforms
+  /// it is the default state before the application begins running.
+  detached,
+
+  /// On all platforms, this state indicates that the application is in the
+  /// default running mode for a running application that has input focus and is
+  /// visible.
+  ///
+  /// On Android, this state corresponds to the Flutter host view having focus
+  /// ([`Activity.onWindowFocusChanged`](https://developer.android.com/reference/android/app/Activity#onWindowFocusChanged(boolean))
+  /// was called with true) while in Android's "resumed" state. It is possible
+  /// for the Flutter app to be in the [inactive] state while still being in
+  /// Android's
+  /// ["onResume"](https://developer.android.com/guide/components/activities/activity-lifecycle)
+  /// state if the app has lost focus
+  /// ([`Activity.onWindowFocusChanged`](https://developer.android.com/reference/android/app/Activity#onWindowFocusChanged(boolean))
+  /// was called with false), but hasn't had
+  /// [`Activity.onPause`](https://developer.android.com/reference/android/app/Activity#onPause())
+  /// called on it.
+  ///
+  /// On iOS and macOS, this corresponds to the app running in the foreground
+  /// active state.
+  resumed,
+
+  /// At least one view of the application is visible, but none have input
+  /// focus. The application is otherwise running normally.
+  ///
+  /// On non-web desktop platforms, this corresponds to an application that is
+  /// not in the foreground, but still has visible windows.
+  ///
+  /// On the web, this corresponds to an application that is running in a
+  /// window or tab that does not have input focus.
+  ///
+  /// On iOS and macOS, this state corresponds to the Flutter host view running in the
+  /// foreground inactive state. Apps transition to this state when in a phone
+  /// call, when responding to a TouchID request, when entering the app switcher
+  /// or the control center, or when the UIViewController hosting the Flutter
+  /// app is transitioning.
+  ///
+  /// On Android, this corresponds to the Flutter host view running in Android's
+  /// paused state (i.e.
+  /// [`Activity.onPause`](https://developer.android.com/reference/android/app/Activity#onPause())
+  /// has been called), or in Android's "resumed" state (i.e.
+  /// [`Activity.onResume`](https://developer.android.com/reference/android/app/Activity#onResume())
+  /// has been called) but does not have window focus. Examples of when apps
+  /// transition to this state include when the app is partially obscured or
+  /// another activity is focused, a app running in a split screen that isn't
+  /// the current app, an app interrupted by a phone call, a picture-in-picture
+  /// app, a system dialog, another view. It will also be inactive when the
+  /// notification window shade is down, or the application switcher is visible.
+  ///
+  /// On Android and iOS, apps in this state should assume that they may be
+  /// [hidden] and [paused] at any time.
   inactive,
 
-  /// The application is not currently visible to the user, not responding to
-  /// user input, and running in the background.
+  /// All views of an application are hidden, either because the application is
+  /// about to be paused (on iOS and Android), or because it has been minimized
+  /// or placed on a desktop that is no longer visible (on non-web desktop), or
+  /// is running in a window or tab that is no longer visible (on the web).
+  ///
+  /// On iOS and Android, in order to keep the state machine the same on all
+  /// platforms, a transition to this state is synthesized before the [paused]
+  /// state is entered when coming from [inactive], and before the [inactive]
+  /// state is entered when coming from [paused]. This allows cross-platform
+  /// implementations that want to know when an app is conceptually "hidden" to
+  /// only write one handler.
+  hidden,
+
+  /// The application is not currently visible to the user, and not responding
+  /// to user input.
   ///
   /// When the application is in this state, the engine will not call the
   /// [PlatformDispatcher.onBeginFrame] and [PlatformDispatcher.onDrawFrame]
   /// callbacks.
+  ///
+  /// This state is only entered on iOS and Android.
   paused,
+}
 
-  /// The application is still hosted on a flutter engine but is detached from
-  /// any host views.
-  ///
-  /// When the application is in this state, the engine is running without
-  /// a view. It can either be in the progress of attaching a view when engine
-  /// was first initializes, or after the view being destroyed due to a Navigator
-  /// pop.
-  detached,
+/// The possible responses to a request to exit the application.
+///
+/// The request is typically responded to by creating an [AppLifecycleListener]
+/// and supplying an [AppLifecycleListener.onExitRequested] callback, or by
+/// overriding [WidgetsBindingObserver.didRequestAppExit].
+enum AppExitResponse {
+  /// Exiting the application can proceed.
+  exit,
+  /// Cancel the exit: do not exit the application.
+  cancel,
+}
+
+/// The type of application exit to perform when calling
+/// [ServicesBinding.exitApplication].
+enum AppExitType {
+  /// Requests that the application start an orderly exit, sending a request
+  /// back to the framework through the [WidgetsBinding]. If that responds
+  /// with [AppExitResponse.exit], then proceed with the same steps as a
+  /// [required] exit. If that responds with [AppExitResponse.cancel], then the
+  /// exit request is canceled and the application continues executing normally.
+  cancelable,
+
+  /// A non-cancelable orderly exit request. The engine will shut down the
+  /// engine and call the native UI toolkit's exit API.
+  ///
+  /// If you need an even faster and more dangerous exit, then call `dart:io`'s
+  /// `exit()` directly, and even the native toolkit's exit API won't be called.
+  /// This is quite dangerous, though, since it's possible that the engine will
+  /// crash because it hasn't been properly shut down, causing the app to crash
+  /// on exit.
+  required,
 }
 
 /// A representation of distances for each of the four edges of a rectangle,
@@ -1707,8 +2016,8 @@ enum AppLifecycleState {
 ///  * [MediaQuery.of], for the preferred mechanism for accessing these values.
 ///  * [Scaffold], which automatically applies the padding in material design
 ///    applications.
-class WindowPadding {
-  const WindowPadding._({ required this.left, required this.top, required this.right, required this.bottom });
+class ViewPadding {
+  const ViewPadding._({ required this.left, required this.top, required this.right, required this.bottom });
 
   /// The distance from the left edge to the first unpadded pixel, in physical pixels.
   final double left;
@@ -1722,12 +2031,128 @@ class WindowPadding {
   /// The distance from the bottom edge to the first unpadded pixel, in physical pixels.
   final double bottom;
 
-  /// A window padding that has zeros for each edge.
-  static const WindowPadding zero = WindowPadding._(left: 0.0, top: 0.0, right: 0.0, bottom: 0.0);
+  /// A view padding that has zeros for each edge.
+  static const ViewPadding zero = ViewPadding._(left: 0.0, top: 0.0, right: 0.0, bottom: 0.0);
+
+  @override
+  String toString() {
+    return 'ViewPadding(left: $left, top: $top, right: $right, bottom: $bottom)';
+  }
+}
+
+/// Deprecated. Will be removed in a future version of Flutter.
+///
+/// Use [ViewPadding] instead.
+@Deprecated(
+  'Use ViewPadding instead. '
+  'This feature was deprecated after v3.8.0-14.0.pre.',
+)
+typedef WindowPadding = ViewPadding;
+
+/// Immutable layout constraints for [FlutterView]s.
+///
+/// Similar to [BoxConstraints], a [Size] respects a [ViewConstraints] if, and
+/// only if, all of the following relations hold:
+///
+/// * [minWidth] <= [Size.width] <= [maxWidth]
+/// * [minHeight] <= [Size.height] <= [maxHeight]
+///
+/// The constraints themselves must satisfy these relations:
+///
+/// * 0.0 <= [minWidth] <= [maxWidth] <= [double.infinity]
+/// * 0.0 <= [minHeight] <= [maxHeight] <= [double.infinity]
+///
+/// For each constraint, [double.infinity] is a legal value.
+///
+/// For a generic class that represents these kind of constraints, see the
+/// [BoxConstraints] class.
+class ViewConstraints {
+  /// Creates view constraints with the given constraints.
+  const ViewConstraints({
+    this.minWidth = 0.0,
+    this.maxWidth = double.infinity,
+    this.minHeight = 0.0,
+    this.maxHeight = double.infinity,
+  });
+
+  /// Creates view constraints that is respected only by the given size.
+  ViewConstraints.tight(Size size)
+    : minWidth = size.width,
+      maxWidth = size.width,
+      minHeight = size.height,
+      maxHeight = size.height;
+
+  /// The minimum width that satisfies the constraints.
+  final double minWidth;
+
+  /// The maximum width that satisfies the constraints.
+  ///
+  /// Might be [double.infinity].
+  final double maxWidth;
+
+  /// The minimum height that satisfies the constraints.
+  final double minHeight;
+
+  /// The maximum height that satisfies the constraints.
+  ///
+  /// Might be [double.infinity].
+  final double maxHeight;
+
+  /// Whether the given size satisfies the constraints.
+  bool isSatisfiedBy(Size size) {
+    return (minWidth <= size.width) && (size.width <= maxWidth) &&
+           (minHeight <= size.height) && (size.height <= maxHeight);
+  }
+
+  /// Whether there is exactly one size that satisfies the constraints.
+  bool get isTight => minWidth >= maxWidth && minHeight >= maxHeight;
+
+  /// Scales each constraint parameter by the inverse of the given factor.
+  ViewConstraints operator/(double factor) {
+    return ViewConstraints(
+      minWidth: minWidth / factor,
+      maxWidth: maxWidth / factor,
+      minHeight: minHeight / factor,
+      maxHeight: maxHeight / factor,
+    );
+  }
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) {
+      return true;
+    }
+    if (other.runtimeType != runtimeType) {
+      return false;
+    }
+    return other is ViewConstraints
+        && other.minWidth == minWidth
+        && other.maxWidth == maxWidth
+        && other.minHeight == minHeight
+        && other.maxHeight == maxHeight;
+  }
+
+  @override
+  int get hashCode => Object.hash(minWidth, maxWidth, minHeight, maxHeight);
 
   @override
   String toString() {
-    return 'WindowPadding(left: $left, top: $top, right: $right, bottom: $bottom)';
+    if (minWidth == double.infinity && minHeight == double.infinity) {
+      return 'ViewConstraints(biggest)';
+    }
+    if (minWidth == 0 && maxWidth == double.infinity &&
+        minHeight == 0 && maxHeight == double.infinity) {
+      return 'ViewConstraints(unconstrained)';
+    }
+    String describe(double min, double max, String dim) {
+      if (min == max) {
+        return '$dim=${min.toStringAsFixed(1)}';
+      }
+      return '${min.toStringAsFixed(1)}<=$dim<=${max.toStringAsFixed(1)}';
+    }
+    final String width = describe(minWidth, maxWidth, 'w');
+    final String height = describe(minHeight, maxHeight, 'h');
+    return 'ViewConstraints($width, $height)';
   }
 }
 
@@ -1736,7 +2161,7 @@ class WindowPadding {
 /// This is populated only on Android.
 ///
 /// The [bounds] are measured in logical pixels. On devices with two screens the
-/// coordinate system starts with [0,0] in the top-left corner of the left or top screen
+/// coordinate system starts with (0,0) in the top-left corner of the left or top screen
 /// and expands to include both screens and the visual space between them.
 ///
 /// The [type] describes the behaviour and if [DisplayFeature] obstructs the display.
@@ -1770,8 +2195,8 @@ class DisplayFeature {
   ///
   /// For example, on a dual screen device in portrait mode:
   ///
-  /// * [bounds.left] gives you the size of left screen, in logical pixels.
-  /// * [bounds.right] gives you the size of the left screen + the hinge width.
+  /// * [Rect.left] gives you the size of left screen, in logical pixels.
+  /// * [Rect.right] gives you the size of the left screen + the hinge width.
   final Rect bounds;
 
   /// Type of display feature, e.g. hinge, fold, cutout.
@@ -1816,8 +2241,7 @@ class DisplayFeature {
 /// The shape formed by the screens for types [DisplayFeatureType.fold] and
 /// [DisplayFeatureType.hinge] is called the posture and is exposed in
 /// [DisplayFeature.state]. For example, the [DisplayFeatureState.postureFlat] posture
-/// means the screens form a flat surface, while [DisplayFeatureState.postureFlipped]
-/// posture means the screens are facing opposite directions.
+/// means the screens form a flat surface.
 ///
 /// ![Device with a hinge display feature](https://flutter.github.io/assets-for-api-docs/assets/hardware/display_feature_hinge.png)
 ///
@@ -1901,7 +2325,7 @@ class Locale {
   /// [language](https://github.com/unicode-org/cldr/blob/master/common/validity/language.xml),
   /// [region](https://github.com/unicode-org/cldr/blob/master/common/validity/region.xml). The
   /// primary language subtag must be at least two and at most eight lowercase
-  /// letters, but not four letters. The region region subtag must be two
+  /// letters, but not four letters. The region subtag must be two
   /// uppercase letters or three digits. See the [Unicode Language
   /// Identifier](https://www.unicode.org/reports/tr35/#Unicode_language_identifier)
   /// specification.
@@ -1916,8 +2340,7 @@ class Locale {
   const Locale(
     this._languageCode, [
     this._countryCode,
-  ]) : assert(_languageCode != null),
-       assert(_languageCode != ''),
+  ]) : assert(_languageCode != ''),
        scriptCode = null;
 
   /// Creates a new Locale object.
@@ -1944,8 +2367,7 @@ class Locale {
     String languageCode = 'und',
     this.scriptCode,
     String? countryCode,
-  }) : assert(languageCode != null),
-       assert(languageCode != ''),
+  }) : assert(languageCode != ''),
        _languageCode = languageCode,
        assert(scriptCode != ''),
        assert(countryCode != ''),
@@ -2157,8 +2579,9 @@ class Locale {
     if (scriptCode != null && scriptCode!.isNotEmpty) {
       out.write('$separator$scriptCode');
     }
-    if (_countryCode != null && _countryCode!.isNotEmpty) {
-      out.write('$separator$countryCode');
+    final String? countryCode = _countryCode;
+    if (countryCode != null && countryCode.isNotEmpty) {
+      out.write('$separator${this.countryCode}');
     }
     return out.toString();
   }
@@ -2186,3 +2609,126 @@ enum DartPerformanceMode {
   /// frequently performing work.
   memory,
 }
+
+/// An event to request a [SemanticsAction] of [type] to be performed on the
+/// [SemanticsNode] identified by [nodeId] owned by the [FlutterView] identified
+/// by [viewId].
+///
+/// Used by [SemanticsBinding.performSemanticsAction].
+class SemanticsActionEvent {
+  /// Creates a [SemanticsActionEvent].
+  const SemanticsActionEvent({
+    required this.type,
+    required this.viewId,
+    required this.nodeId,
+    this.arguments,
+  });
+
+  /// The type of action to be performed.
+  final SemanticsAction type;
+
+  /// The id of the [FlutterView] the [SemanticsNode] identified by [nodeId] is
+  /// associated with.
+  final int viewId;
+
+  /// The id of the [SemanticsNode] on which the action is to be performed.
+  final int nodeId;
+
+  /// Optional arguments for the action.
+  final Object? arguments;
+
+  static const Object _noArgumentPlaceholder = Object();
+
+  /// Create a clone of the [SemanticsActionEvent] but with provided parameters
+  /// replaced.
+  SemanticsActionEvent copyWith({
+    SemanticsAction? type,
+    int? viewId,
+    int? nodeId,
+    Object? arguments = _noArgumentPlaceholder,
+  }) {
+    return SemanticsActionEvent(
+      type: type ?? this.type,
+      viewId: viewId ?? this.viewId,
+      nodeId: nodeId ?? this.nodeId,
+      arguments: arguments == _noArgumentPlaceholder ? this.arguments : arguments,
+    );
+  }
+}
+
+/// Signature for [PlatformDispatcher.onViewFocusChange].
+typedef ViewFocusChangeCallback = void Function(ViewFocusEvent viewFocusEvent);
+
+/// An event for the engine to communicate view focus changes to the app.
+///
+/// This value will be typically passed to the [PlatformDispatcher.onViewFocusChange]
+/// callback.
+final class ViewFocusEvent {
+  /// Creates a [ViewFocusChange].
+  const ViewFocusEvent({
+    required this.viewId,
+    required this.state,
+    required this.direction,
+  });
+
+  /// The ID of the [FlutterView] that experienced a focus change.
+  final int viewId;
+
+  /// The state focus changed to.
+  final ViewFocusState state;
+
+  /// The direction focus changed to.
+  final ViewFocusDirection direction;
+
+  @override
+  String toString() {
+    return 'ViewFocusEvent(viewId: $viewId, state: $state, direction: $direction)';
+  }
+}
+
+/// Represents the focus state of a given [FlutterView].
+///
+/// When focus is lost, the view's focus state changes to [ViewFocusState.unfocused].
+///
+/// When focus is gained, the view's focus state changes to [ViewFocusState.focused].
+///
+/// Valid transitions within a view are:
+///
+/// - [ViewFocusState.focused] to [ViewFocusState.unfocused].
+/// - [ViewFocusState.unfocused] to [ViewFocusState.focused].
+///
+/// See also:
+///
+///   * [ViewFocusDirection], that specifies the focus direction.
+///   * [ViewFocusEvent], that conveys information about a [FlutterView] focus change.
+enum ViewFocusState {
+  /// Specifies that a view does not have platform focus.
+  unfocused,
+
+  /// Specifies that a view has platform focus.
+  focused,
+}
+
+/// Represents the direction in which the focus transitioned across [FlutterView]s.
+///
+/// See also:
+///
+///   * [ViewFocusState], that specifies the current focus state of a [FlutterView].
+///   * [ViewFocusEvent], that conveys information about a [FlutterView] focus change.
+enum ViewFocusDirection {
+  /// Indicates the focus transition did not have a direction.
+  ///
+  /// This is typically associated with focus being programmatically requested or
+  /// when focus is lost.
+  undefined,
+
+  /// Indicates the focus transition was performed in a forward direction.
+  ///
+  /// This is typically result of the user pressing tab.
+  forward,
+
+  /// Indicates the focus transition was performed in a backward direction.
+  ///
+  /// This is typically result of the user pressing shift + tab.
+  backward,
+}
diff --git a/lib/ui/platform_isolate.dart b/lib/ui/platform_isolate.dart
new file mode 100644
index 0000000000000000000000000000000000000000..074f90c2cbb5945641a8099b92fe5d013b83172a
--- /dev/null
+++ b/lib/ui/platform_isolate.dart
@@ -0,0 +1,189 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+part of dart.ui;
+
+/// Runs [computation] on the platform thread and returns the result.
+///
+/// This may run the computation on a separate isolate. That isolate will be
+/// reused for subsequent [runOnPlatformThread] calls. This means that global
+/// state is maintained in that isolate between calls.
+///
+/// The [computation] and any state it captures may be sent to that isolate.
+/// See [SendPort.send] for information about what types can be sent.
+///
+/// If [computation] is asynchronous (returns a `Future<R>`) then
+/// that future is awaited in the new isolate, completing the entire
+/// asynchronous computation, before returning the result.
+///
+/// If [computation] throws, the `Future` returned by this function completes
+/// with that error.
+///
+/// The [computation] function and its result (or error) must be
+/// sendable between isolates. Objects that cannot be sent include open
+/// files and sockets (see [SendPort.send] for details).
+///
+/// This method can only be invoked from the main isolate.
+///
+/// This API is currently experimental.
+Future<R> runOnPlatformThread<R>(FutureOr<R> Function() computation) {
+  if (isRunningOnPlatformThread) {
+    return Future<R>(computation);
+  }
+  final SendPort? sendPort = _platformRunnerSendPort;
+  if (sendPort != null) {
+    return _sendComputation(sendPort, computation);
+  } else {
+    return (_platformRunnerSendPortFuture ??= _spawnPlatformIsolate())
+        .then((SendPort port) => _sendComputation(port, computation));
+  }
+}
+
+SendPort? _platformRunnerSendPort;
+Future<SendPort>? _platformRunnerSendPortFuture;
+final Map<int, Completer<Object?>> _pending = <int, Completer<Object?>>{};
+int _nextId = 0;
+
+Future<SendPort> _spawnPlatformIsolate() {
+  final Completer<SendPort> sendPortCompleter = Completer<SendPort>();
+  final RawReceivePort receiver = RawReceivePort()..keepIsolateAlive = false;
+  receiver.handler = (Object? message) {
+    if (message == null) {
+      // This is the platform isolate's onExit handler.
+      // This shouldn't really happen, since Isolate.exit is disabled, the
+      // pause and terminate capabilities aren't provided to the parent
+      // isolate, and errors are fatal is false. But if the isolate does
+      // shutdown unexpectedly, clear the singleton so we can create another.
+      for (final Completer<Object?> completer in _pending.values) {
+        completer.completeError(RemoteError(
+            'PlatformIsolate shutdown unexpectedly',
+            StackTrace.empty.toString()));
+      }
+      _pending.clear();
+      _platformRunnerSendPort = null;
+      _platformRunnerSendPortFuture = null;
+    } else if (message is _PlatformIsolateReadyMessage) {
+      _platformRunnerSendPort = message.computationPort;
+      sendPortCompleter.complete(message.computationPort);
+    } else if (message is _ComputationResult) {
+      final Completer<Object?> resultCompleter = _pending.remove(message.id)!;
+      final Object? remoteStack = message.remoteStack;
+      final Object? remoteError = message.remoteError;
+      if (remoteStack != null) {
+        if (remoteStack is StackTrace) {
+          // Typed error.
+          resultCompleter.completeError(remoteError!, remoteStack);
+        } else {
+          // onError handler message, uncaught async error.
+          // Both values are strings, so calling `toString` is efficient.
+          final RemoteError error =
+              RemoteError(remoteError!.toString(), remoteStack.toString());
+          resultCompleter.completeError(error, error.stackTrace);
+        }
+      } else {
+        resultCompleter.complete(message.result);
+      }
+    } else {
+      // We encountered an error while starting the new isolate.
+      if (!sendPortCompleter.isCompleted) {
+        sendPortCompleter.completeError(
+            IsolateSpawnException('Unable to spawn isolate: $message'));
+        return;
+      }
+      // This shouldn't happen.
+      throw IsolateSpawnException(
+          "Internal error: unexpected message: '$message'");
+    }
+  };
+  final Isolate parentIsolate = Isolate.current;
+  final SendPort sendPort = receiver.sendPort;
+  try {
+    _nativeSpawn(() => _platformIsolateMain(parentIsolate, sendPort));
+  } on Object {
+    receiver.close();
+    rethrow;
+  }
+  return sendPortCompleter.future;
+}
+
+Future<R> _sendComputation<R>(
+    SendPort port, FutureOr<R> Function() computation) {
+  final int id = ++_nextId;
+  final Completer<R> resultCompleter = Completer<R>();
+  _pending[id] = resultCompleter;
+  port.send(_ComputationRequest(id, computation));
+  return resultCompleter.future;
+}
+
+void _safeSend(SendPort sendPort, int id, Object? result, Object? error,
+    Object? stackTrace) {
+  try {
+    sendPort.send(_ComputationResult(id, result, error, stackTrace));
+  } catch (sendError, sendStack) {
+    sendPort.send(_ComputationResult(id, null, sendError, sendStack));
+  }
+}
+
+void _platformIsolateMain(Isolate parentIsolate, SendPort sendPort) {
+  final RawReceivePort computationPort = RawReceivePort();
+  computationPort.handler = (_ComputationRequest? message) {
+    if (message == null) {
+      // The parent isolate has shutdown. Allow this isolate to shutdown.
+      computationPort.keepIsolateAlive = false;
+      return;
+    }
+
+    late final FutureOr<Object?> potentiallyAsyncResult;
+    try {
+      potentiallyAsyncResult = message.computation();
+    } catch (e, s) {
+      _safeSend(sendPort, message.id, null, e, s);
+      return;
+    }
+
+    if (potentiallyAsyncResult is Future<Object?>) {
+      potentiallyAsyncResult.then((Object? result) {
+        _safeSend(sendPort, message.id, result, null, null);
+      }, onError: (Object? e, Object? s) {
+        _safeSend(sendPort, message.id, null, e, s ?? StackTrace.empty);
+      });
+    } else {
+      _safeSend(sendPort, message.id, potentiallyAsyncResult, null, null);
+    }
+  };
+  Isolate.current.addOnExitListener(sendPort);
+  parentIsolate.addOnExitListener(computationPort.sendPort);
+  sendPort.send(_PlatformIsolateReadyMessage(computationPort.sendPort));
+}
+
+@Native<Void Function(Handle)>(symbol: 'PlatformIsolateNativeApi::Spawn')
+external void _nativeSpawn(Function entryPoint);
+
+/// Whether the current isolate is running on the platform thread.
+final bool isRunningOnPlatformThread = _isRunningOnPlatformThread();
+
+@Native<Bool Function()>(
+    symbol: 'PlatformIsolateNativeApi::IsRunningOnPlatformThread', isLeaf: true)
+external bool _isRunningOnPlatformThread();
+
+class _PlatformIsolateReadyMessage {
+  _PlatformIsolateReadyMessage(this.computationPort);
+
+  final SendPort computationPort;
+}
+
+class _ComputationRequest {
+  _ComputationRequest(this.id, this.computation);
+
+  final int id;
+  final FutureOr<Object?> Function() computation;
+}
+
+class _ComputationResult {
+  _ComputationResult(this.id, this.result, this.remoteError, this.remoteStack);
+
+  final int id;
+  final Object? result;
+  final Object? remoteError;
+  final Object? remoteStack;
+}
diff --git a/lib/ui/plugins.dart b/lib/ui/plugins.dart
index 50543d2acc0bca2ea8af9b49a0fc96714e1f194d..b517530c6f19c63b780bc1d385f79a63cb663cf2 100644
--- a/lib/ui/plugins.dart
+++ b/lib/ui/plugins.dart
@@ -12,8 +12,7 @@ class CallbackHandle {
   ///
   /// Only values produced by a call to [CallbackHandle.toRawHandle] should be
   /// used, otherwise this object will be an invalid handle.
-  CallbackHandle.fromRawHandle(this._handle)
-      : assert(_handle != null, "'_handle' must not be null.");
+  CallbackHandle.fromRawHandle(this._handle);
 
   final int _handle;
 
@@ -40,11 +39,7 @@ class CallbackHandle {
 ///
 ///  * [IsolateNameServer], which provides utilities for dealing with
 ///    [Isolate]s.
-class PluginUtilities {
-  // This class is only a namespace, and should not be instantiated or
-  // extended directly.
-  factory PluginUtilities._() => throw UnsupportedError('Namespace');
-
+abstract final class PluginUtilities {
   static final Map<Function, CallbackHandle?> _forwardCache =
       <Function, CallbackHandle?>{};
   static final Map<CallbackHandle, Function?> _backwardCache =
@@ -60,7 +55,6 @@ class PluginUtilities {
   /// original callback. If `callback` is not a top-level or static function,
   /// null is returned.
   static CallbackHandle? getCallbackHandle(Function callback) {
-    assert(callback != null, "'callback' must not be null.");
     return _forwardCache.putIfAbsent(callback, () {
       final int? handle = _getCallbackHandle(callback);
       return handle != null ? CallbackHandle.fromRawHandle(handle) : null;
@@ -76,7 +70,6 @@ class PluginUtilities {
   /// [PluginUtilities.getCallbackHandle], null is returned. Otherwise, a
   /// tear-off of the callback associated with `handle` is returned.
   static Function? getCallbackFromHandle(CallbackHandle handle) {
-    assert(handle != null, "'handle' must not be null.");
     return _backwardCache.putIfAbsent(
         handle, () => _getCallbackFromHandle(handle.toRawHandle()));
   }
diff --git a/lib/ui/plugins/callback_cache.h b/lib/ui/plugins/callback_cache.h
index 84a2606c37f61652752c500f00393391d1ce8f68..e9c47fddbd466c7d51b04b3904125dcec8962b2b 100644
--- a/lib/ui/plugins/callback_cache.h
+++ b/lib/ui/plugins/callback_cache.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_LIB_UI_CALLBACK_CACHE_H_
-#define FLUTTER_LIB_UI_CALLBACK_CACHE_H_
+#ifndef FLUTTER_LIB_UI_PLUGINS_CALLBACK_CACHE_H_
+#define FLUTTER_LIB_UI_PLUGINS_CALLBACK_CACHE_H_
 
 #include <map>
 #include <memory>
@@ -54,4 +54,4 @@ class DartCallbackCache {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_LIB_UI_CALLBACK_CACHE_H_
+#endif  // FLUTTER_LIB_UI_PLUGINS_CALLBACK_CACHE_H_
diff --git a/lib/ui/pointer.dart b/lib/ui/pointer.dart
index 059e41ac6d316f0dc2ea56b4e67153cc4c7a3e0a..fe99de4b90ed2d395db93a8a8640ff6cb8caef99 100644
--- a/lib/ui/pointer.dart
+++ b/lib/ui/pointer.dart
@@ -141,6 +141,7 @@ enum PointerSignalKind {
 class PointerData {
   /// Creates an object that represents the state of a pointer.
   const PointerData({
+    this.viewId = 0,
     this.embedderId = 0,
     this.timeStamp = Duration.zero,
     this.change = PointerChange.cancel,
@@ -178,11 +179,16 @@ class PointerData {
     this.rotation = 0.0,
   });
 
-  /// Unique identifier that ties the [PointerEvent] to embedder event created it.
+  /// The ID of the [FlutterView] this [PointerEvent] originated from.
+  final int viewId;
+
+  /// Unique identifier that ties the [PointerEvent] to the embedder
+  /// event that created it.
+  /// it.
   ///
-  /// No two pointer events can have the same [embedderId]. This is different from
-  /// [pointerIdentifier] - used for hit-testing, whereas [embedderId] is used to
-  /// identify the platform event.
+  /// No two pointer events can have the same [embedderId]. This is different
+  /// from [pointerIdentifier] - used for hit-testing, whereas [embedderId] is
+  /// used to identify the platform event.
   final int embedderId;
 
   /// Time of event dispatch, relative to an arbitrary timeline.
@@ -375,7 +381,7 @@ class PointerData {
   final double rotation;
 
   @override
-  String toString() => 'PointerData(x: $physicalX, y: $physicalY)';
+  String toString() => 'PointerData(viewId: $viewId, x: $physicalX, y: $physicalY)';
 
   /// Returns a complete textual description of the information in this object.
   String toStringFull() {
@@ -413,7 +419,8 @@ class PointerData {
              'panDeltaX: $panDeltaX, '
              'panDeltaY: $panDeltaY, '
              'scale: $scale, '
-             'rotation: $rotation'
+             'rotation: $rotation, '
+             'viewId: $viewId'
            ')';
   }
 }
@@ -421,7 +428,7 @@ class PointerData {
 /// A sequence of reports about the state of pointers.
 class PointerDataPacket {
   /// Creates a packet of pointer data reports.
-  const PointerDataPacket({ this.data = const <PointerData>[] }) : assert(data != null);
+  const PointerDataPacket({ this.data = const <PointerData>[] });
 
   /// Data about the individual pointers in this packet.
   ///
diff --git a/lib/ui/semantics.dart b/lib/ui/semantics.dart
index 9bf8d2be76d8ce15e17906d25b0234f04f458554..3a99e8322a817ea3711ead7628edba125ddcf19e 100644
--- a/lib/ui/semantics.dart
+++ b/lib/ui/semantics.dart
@@ -13,7 +13,15 @@ part of dart.ui;
 /// See also:
 ///   - file://./../../lib/ui/semantics/semantics_node.h
 class SemanticsAction {
-  const SemanticsAction._(this.index) : assert(index != null);
+  const SemanticsAction._(this.index, this.name);
+
+  /// The numerical value for this action.
+  ///
+  /// Each action has one bit set in this bit field.
+  final int index;
+
+  /// A human-readable name for this flag, used for debugging purposes.
+  final String name;
 
   static const int _kTapIndex = 1 << 0;
   static const int _kLongPressIndex = 1 << 1;
@@ -41,62 +49,57 @@ class SemanticsAction {
   // numSemanticsActions value in testing/dart/semantics_test.dart, or tests
   // will fail.
 
-  /// The numerical value for this action.
-  ///
-  /// Each action has one bit set in this bit field.
-  final int index;
-
   /// The equivalent of a user briefly tapping the screen with the finger
   /// without moving it.
-  static const SemanticsAction tap = SemanticsAction._(_kTapIndex);
+  static const SemanticsAction tap = SemanticsAction._(_kTapIndex, 'tap');
 
   /// The equivalent of a user pressing and holding the screen with the finger
   /// for a few seconds without moving it.
-  static const SemanticsAction longPress = SemanticsAction._(_kLongPressIndex);
+  static const SemanticsAction longPress = SemanticsAction._(_kLongPressIndex, 'longPress');
 
   /// The equivalent of a user moving their finger across the screen from right
   /// to left.
   ///
   /// This action should be recognized by controls that are horizontally
   /// scrollable.
-  static const SemanticsAction scrollLeft = SemanticsAction._(_kScrollLeftIndex);
+  static const SemanticsAction scrollLeft = SemanticsAction._(_kScrollLeftIndex, 'scrollLeft');
 
   /// The equivalent of a user moving their finger across the screen from left
   /// to right.
   ///
   /// This action should be recognized by controls that are horizontally
   /// scrollable.
-  static const SemanticsAction scrollRight = SemanticsAction._(_kScrollRightIndex);
+  static const SemanticsAction scrollRight = SemanticsAction._(_kScrollRightIndex, 'scrollRight');
 
   /// The equivalent of a user moving their finger across the screen from
   /// bottom to top.
   ///
   /// This action should be recognized by controls that are vertically
   /// scrollable.
-  static const SemanticsAction scrollUp = SemanticsAction._(_kScrollUpIndex);
+  static const SemanticsAction scrollUp = SemanticsAction._(_kScrollUpIndex, 'scrollUp');
 
   /// The equivalent of a user moving their finger across the screen from top
   /// to bottom.
   ///
   /// This action should be recognized by controls that are vertically
   /// scrollable.
-  static const SemanticsAction scrollDown = SemanticsAction._(_kScrollDownIndex);
+  static const SemanticsAction scrollDown = SemanticsAction._(_kScrollDownIndex, 'scrollDown');
 
   /// A request to increase the value represented by the semantics node.
   ///
   /// For example, this action might be recognized by a slider control.
-  static const SemanticsAction increase = SemanticsAction._(_kIncreaseIndex);
+  static const SemanticsAction increase = SemanticsAction._(_kIncreaseIndex, 'increase');
 
   /// A request to decrease the value represented by the semantics node.
   ///
   /// For example, this action might be recognized by a slider control.
-  static const SemanticsAction decrease = SemanticsAction._(_kDecreaseIndex);
+  static const SemanticsAction decrease = SemanticsAction._(_kDecreaseIndex, 'decrease');
 
   /// A request to fully show the semantics node on screen.
   ///
   /// For example, this action might be send to a node in a scrollable list that
   /// is partially off screen to bring it on screen.
-  static const SemanticsAction showOnScreen = SemanticsAction._(_kShowOnScreenIndex);
+  static const SemanticsAction showOnScreen = SemanticsAction._(_kShowOnScreenIndex, 'showOnScreen');
 
   /// Move the cursor forward by one character.
   ///
@@ -104,7 +107,7 @@ class SemanticsAction {
   ///
   /// The action includes a boolean argument, which indicates whether the cursor
   /// movement should extend (or start) a selection.
-  static const SemanticsAction moveCursorForwardByCharacter = SemanticsAction._(_kMoveCursorForwardByCharacterIndex);
+  static const SemanticsAction moveCursorForwardByCharacter = SemanticsAction._(_kMoveCursorForwardByCharacterIndex, 'moveCursorForwardByCharacter');
 
   /// Move the cursor backward by one character.
   ///
@@ -112,7 +115,7 @@ class SemanticsAction {
   ///
   /// The action includes a boolean argument, which indicates whether the cursor
   /// movement should extend (or start) a selection.
-  static const SemanticsAction moveCursorBackwardByCharacter = SemanticsAction._(_kMoveCursorBackwardByCharacterIndex);
+  static const SemanticsAction moveCursorBackwardByCharacter = SemanticsAction._(_kMoveCursorBackwardByCharacterIndex, 'moveCursorBackwardByCharacter');
 
   /// Replaces the current text in the text field.
   ///
@@ -120,7 +123,7 @@ class SemanticsAction {
   ///
   /// The action includes a string argument, which is the new text to
   /// replace.
-  static const SemanticsAction setText = SemanticsAction._(_kSetTextIndex);
+  static const SemanticsAction setText = SemanticsAction._(_kSetTextIndex, 'setText');
 
   /// Set the text selection to the given range.
   ///
@@ -131,16 +134,16 @@ class SemanticsAction {
   ///
   /// Setting `base` and `extent` to the same value will move the cursor to
   /// that position (without selecting anything).
-  static const SemanticsAction setSelection = SemanticsAction._(_kSetSelectionIndex);
+  static const SemanticsAction setSelection = SemanticsAction._(_kSetSelectionIndex, 'setSelection');
 
   /// Copy the current selection to the clipboard.
-  static const SemanticsAction copy = SemanticsAction._(_kCopyIndex);
+  static const SemanticsAction copy = SemanticsAction._(_kCopyIndex, 'copy');
 
   /// Cut the current selection and place it in the clipboard.
-  static const SemanticsAction cut = SemanticsAction._(_kCutIndex);
+  static const SemanticsAction cut = SemanticsAction._(_kCutIndex, 'cut');
 
   /// Paste the current content of the clipboard.
-  static const SemanticsAction paste = SemanticsAction._(_kPasteIndex);
+  static const SemanticsAction paste = SemanticsAction._(_kPasteIndex, 'paste');
 
   /// Indicates that the node has gained accessibility focus.
   ///
@@ -153,7 +156,7 @@ class SemanticsAction {
   /// The accessibility focus is different from the input focus. The input focus
   /// is usually held by the element that currently responds to keyboard inputs.
   /// Accessibility focus and input focus can be held by two different nodes!
-  static const SemanticsAction didGainAccessibilityFocus = SemanticsAction._(_kDidGainAccessibilityFocusIndex);
+  static const SemanticsAction didGainAccessibilityFocus = SemanticsAction._(_kDidGainAccessibilityFocusIndex, 'didGainAccessibilityFocus');
 
   /// Indicates that the node has lost accessibility focus.
   ///
@@ -166,13 +169,13 @@ class SemanticsAction {
   /// The accessibility focus is different from the input focus. The input focus
   /// is usually held by the element that currently responds to keyboard inputs.
   /// Accessibility focus and input focus can be held by two different nodes!
-  static const SemanticsAction didLoseAccessibilityFocus = SemanticsAction._(_kDidLoseAccessibilityFocusIndex);
+  static const SemanticsAction didLoseAccessibilityFocus = SemanticsAction._(_kDidLoseAccessibilityFocusIndex, 'didLoseAccessibilityFocus');
 
   /// Indicates that the user has invoked a custom accessibility action.
   ///
   /// This handler is added automatically whenever a custom accessibility
   /// action is added to a semantics node.
-  static const SemanticsAction customAction = SemanticsAction._(_kCustomActionIndex);
+  static const SemanticsAction customAction = SemanticsAction._(_kCustomActionIndex, 'customAction');
 
   /// A request that the node should be dismissed.
   ///
@@ -181,7 +184,7 @@ class SemanticsAction {
   /// (with TalkBack) special hint text is spoken when focusing the node and
   /// a custom action is available in the local context menu. On iOS,
   /// (with VoiceOver) users can perform a standard gesture to dismiss it.
-  static const SemanticsAction dismiss = SemanticsAction._(_kDismissIndex);
+  static const SemanticsAction dismiss = SemanticsAction._(_kDismissIndex, 'dismiss');
 
   /// Move the cursor forward by one word.
   ///
@@ -189,7 +192,7 @@ class SemanticsAction {
   ///
   /// The action includes a boolean argument, which indicates whether the cursor
   /// movement should extend (or start) a selection.
-  static const SemanticsAction moveCursorForwardByWord = SemanticsAction._(_kMoveCursorForwardByWordIndex);
+  static const SemanticsAction moveCursorForwardByWord = SemanticsAction._(_kMoveCursorForwardByWordIndex, 'moveCursorForwardByWord');
 
   /// Move the cursor backward by one word.
   ///
@@ -197,13 +200,13 @@ class SemanticsAction {
   ///
   /// The action includes a boolean argument, which indicates whether the cursor
   /// movement should extend (or start) a selection.
-  static const SemanticsAction moveCursorBackwardByWord = SemanticsAction._(_kMoveCursorBackwardByWordIndex);
+  static const SemanticsAction moveCursorBackwardByWord = SemanticsAction._(_kMoveCursorBackwardByWordIndex, 'moveCursorBackwardByWord');
 
   /// The possible semantics actions.
   ///
   /// The map's key is the [index] of the action and the value is the action
   /// itself.
-  static const Map<int, SemanticsAction> values = <int, SemanticsAction>{
+  static const Map<int, SemanticsAction> _kActionById = <int, SemanticsAction>{
     _kTapIndex: tap,
     _kLongPressIndex: longPress,
     _kScrollLeftIndex: scrollLeft,
@@ -228,57 +231,12 @@ class SemanticsAction {
     _kSetTextIndex: setText,
   };
 
+  static List<SemanticsAction> get values => _kActionById.values.toList(growable: false);
+
+  static SemanticsAction? fromIndex(int index) => _kActionById[index];
+
   @override
-  String toString() {
-    switch (index) {
-      case _kTapIndex:
-        return 'SemanticsAction.tap';
-      case _kLongPressIndex:
-        return 'SemanticsAction.longPress';
-      case _kScrollLeftIndex:
-        return 'SemanticsAction.scrollLeft';
-      case _kScrollRightIndex:
-        return 'SemanticsAction.scrollRight';
-      case _kScrollUpIndex:
-        return 'SemanticsAction.scrollUp';
-      case _kScrollDownIndex:
-        return 'SemanticsAction.scrollDown';
-      case _kIncreaseIndex:
-        return 'SemanticsAction.increase';
-      case _kDecreaseIndex:
-        return 'SemanticsAction.decrease';
-      case _kShowOnScreenIndex:
-        return 'SemanticsAction.showOnScreen';
-      case _kMoveCursorForwardByCharacterIndex:
-        return 'SemanticsAction.moveCursorForwardByCharacter';
-      case _kMoveCursorBackwardByCharacterIndex:
-        return 'SemanticsAction.moveCursorBackwardByCharacter';
-      case _kSetSelectionIndex:
-        return 'SemanticsAction.setSelection';
-      case _kCopyIndex:
-        return 'SemanticsAction.copy';
-      case _kCutIndex:
-        return 'SemanticsAction.cut';
-      case _kPasteIndex:
-        return 'SemanticsAction.paste';
-      case _kDidGainAccessibilityFocusIndex:
-        return 'SemanticsAction.didGainAccessibilityFocus';
-      case _kDidLoseAccessibilityFocusIndex:
-        return 'SemanticsAction.didLoseAccessibilityFocus';
-      case _kCustomActionIndex:
-        return 'SemanticsAction.customAction';
-      case _kDismissIndex:
-        return 'SemanticsAction.dismiss';
-      case _kMoveCursorForwardByWordIndex:
-        return 'SemanticsAction.moveCursorForwardByWord';
-      case _kMoveCursorBackwardByWordIndex:
-        return 'SemanticsAction.moveCursorBackwardByWord';
-      case _kSetTextIndex:
-        return 'SemanticsAction.setText';
-    }
-    assert(false, 'Unhandled index: $index (0x${index.toRadixString(8).padLeft(4, "0")})');
-    return '';
-  }
+  String toString() => 'SemanticsAction.$name';
 }
 
 /// A Boolean value that can be associated with a semantics node.
@@ -289,13 +247,16 @@ class SemanticsAction {
 // accessibility services, `flutter_test/controller.dart#SemanticsController._importantFlags`
 // must be updated as well.
 class SemanticsFlag {
-  const SemanticsFlag._(this.index) : assert(index != null);
+  const SemanticsFlag._(this.index, this.name);
 
   /// The numerical value for this flag.
   ///
   /// Each flag has one bit set in this bit field.
   final int index;
 
+  /// A human-readable name for this flag, used for debugging purposes.
+  final String name;
+
   static const int _kHasCheckedStateIndex = 1 << 0;
   static const int _kIsCheckedIndex = 1 << 1;
   static const int _kIsSelectedIndex = 1 << 2;
@@ -322,6 +283,8 @@ class SemanticsFlag {
   static const int _kIsSliderIndex = 1 << 23;
   static const int _kIsKeyboardKeyIndex = 1 << 24;
   static const int _kIsCheckStateMixedIndex = 1 << 25;
+  static const int _kHasExpandedStateIndex = 1 << 26;
+  static const int _kIsExpandedIndex = 1 << 27;
   // READ THIS: if you add a flag here, you MUST update the numSemanticsFlags
   // value in testing/dart/semantics_test.dart, or tests will fail. Also,
   // please update the Flag enum in
@@ -340,7 +303,7 @@ class SemanticsFlag {
   /// See also:
   ///
   ///   * [SemanticsFlag.isChecked], which controls whether the node is "checked" or "unchecked".
-  static const SemanticsFlag hasCheckedState = SemanticsFlag._(_kHasCheckedStateIndex);
+  static const SemanticsFlag hasCheckedState = SemanticsFlag._(_kHasCheckedStateIndex, 'hasCheckedState');
 
   /// Whether a semantics node that [hasCheckedState] is checked.
   ///
@@ -352,7 +315,7 @@ class SemanticsFlag {
   /// See also:
   ///
   ///   * [SemanticsFlag.hasCheckedState], which enables a checked state.
-  static const SemanticsFlag isChecked = SemanticsFlag._(_kIsCheckedIndex);
+  static const SemanticsFlag isChecked = SemanticsFlag._(_kIsCheckedIndex, 'isChecked');
 
   /// Whether a tristate checkbox is in its mixed state.
   ///
@@ -363,7 +326,7 @@ class SemanticsFlag {
   /// can have checked,  unchecked, or mixed state.
   ///
   /// Must be false when the checkbox is either checked or unchecked.
-  static const SemanticsFlag isCheckStateMixed = SemanticsFlag._(_kIsCheckStateMixedIndex);
+  static const SemanticsFlag isCheckStateMixed = SemanticsFlag._(_kIsCheckStateMixedIndex, 'isCheckStateMixed');
 
 
   /// Whether a semantics node is selected.
@@ -372,48 +335,48 @@ class SemanticsFlag {
   /// "unselected".
   ///
   /// For example, the active tab in a tab bar has [isSelected] set to true.
-  static const SemanticsFlag isSelected = SemanticsFlag._(_kIsSelectedIndex);
+  static const SemanticsFlag isSelected = SemanticsFlag._(_kIsSelectedIndex, 'isSelected');
 
   /// Whether the semantic node represents a button.
   ///
   /// Platforms have special handling for buttons, for example Android's TalkBack
   /// and iOS's VoiceOver provides an additional hint when the focused object is
   /// a button.
-  static const SemanticsFlag isButton = SemanticsFlag._(_kIsButtonIndex);
+  static const SemanticsFlag isButton = SemanticsFlag._(_kIsButtonIndex, 'isButton');
 
   /// Whether the semantic node represents a text field.
   ///
   /// Text fields are announced as such and allow text input via accessibility
   /// affordances.
-  static const SemanticsFlag isTextField = SemanticsFlag._(_kIsTextFieldIndex);
+  static const SemanticsFlag isTextField = SemanticsFlag._(_kIsTextFieldIndex, 'isTextField');
 
   /// Whether the semantic node represents a slider.
-  static const SemanticsFlag isSlider = SemanticsFlag._(_kIsSliderIndex);
+  static const SemanticsFlag isSlider = SemanticsFlag._(_kIsSliderIndex, 'isSlider');
 
   /// Whether the semantic node represents a keyboard key.
-  static const SemanticsFlag isKeyboardKey = SemanticsFlag._(_kIsKeyboardKeyIndex);
+  static const SemanticsFlag isKeyboardKey = SemanticsFlag._(_kIsKeyboardKeyIndex, 'isKeyboardKey');
 
   /// Whether the semantic node is read only.
   ///
   /// Only applicable when [isTextField] is true.
-  static const SemanticsFlag isReadOnly = SemanticsFlag._(_kIsReadOnlyIndex);
+  static const SemanticsFlag isReadOnly = SemanticsFlag._(_kIsReadOnlyIndex, 'isReadOnly');
 
   /// Whether the semantic node is an interactive link.
   ///
   /// Platforms have special handling for links, for example iOS's VoiceOver
   /// provides an additional hint when the focused object is a link, as well as
   /// the ability to parse the links through another navigation menu.
-  static const SemanticsFlag isLink = SemanticsFlag._(_kIsLinkIndex);
+  static const SemanticsFlag isLink = SemanticsFlag._(_kIsLinkIndex, 'isLink');
 
   /// Whether the semantic node is able to hold the user's focus.
   ///
   /// The focused element is usually the current receiver of keyboard inputs.
-  static const SemanticsFlag isFocusable = SemanticsFlag._(_kIsFocusableIndex);
+  static const SemanticsFlag isFocusable = SemanticsFlag._(_kIsFocusableIndex, 'isFocusable');
 
   /// Whether the semantic node currently holds the user's focus.
   ///
   /// The focused element is usually the current receiver of keyboard inputs.
-  static const SemanticsFlag isFocused = SemanticsFlag._(_kIsFocusedIndex);
+  static const SemanticsFlag isFocused = SemanticsFlag._(_kIsFocusedIndex, 'isFocused');
 
   /// The semantics node has the quality of either being "enabled" or
   /// "disabled".
@@ -421,40 +384,40 @@ class SemanticsFlag {
   /// For example, a button can be enabled or disabled and therefore has an
   /// "enabled" state. Static text is usually neither enabled nor disabled and
   /// therefore does not have an "enabled" state.
-  static const SemanticsFlag hasEnabledState = SemanticsFlag._(_kHasEnabledStateIndex);
+  static const SemanticsFlag hasEnabledState = SemanticsFlag._(_kHasEnabledStateIndex, 'hasEnabledState');
 
   /// Whether a semantic node that [hasEnabledState] is currently enabled.
   ///
   /// A disabled element does not respond to user interaction. For example, a
   /// button that currently does not respond to user interaction should be
   /// marked as disabled.
-  static const SemanticsFlag isEnabled = SemanticsFlag._(_kIsEnabledIndex);
+  static const SemanticsFlag isEnabled = SemanticsFlag._(_kIsEnabledIndex, 'isEnabled');
 
   /// Whether a semantic node is in a mutually exclusive group.
   ///
   /// For example, a radio button is in a mutually exclusive group because
   /// only one radio button in that group can be marked as [isChecked].
-  static const SemanticsFlag isInMutuallyExclusiveGroup = SemanticsFlag._(_kIsInMutuallyExclusiveGroupIndex);
+  static const SemanticsFlag isInMutuallyExclusiveGroup = SemanticsFlag._(_kIsInMutuallyExclusiveGroupIndex, 'isInMutuallyExclusiveGroup');
 
   /// Whether a semantic node is a header that divides content into sections.
   ///
   /// For example, headers can be used to divide a list of alphabetically
   /// sorted words into the sections A, B, C, etc. as can be found in many
   /// address book applications.
-  static const SemanticsFlag isHeader = SemanticsFlag._(_kIsHeaderIndex);
+  static const SemanticsFlag isHeader = SemanticsFlag._(_kIsHeaderIndex, 'isHeader');
 
   /// Whether the value of the semantics node is obscured.
   ///
   /// This is usually used for text fields to indicate that its content
   /// is a password or contains other sensitive information.
-  static const SemanticsFlag isObscured = SemanticsFlag._(_kIsObscuredIndex);
+  static const SemanticsFlag isObscured = SemanticsFlag._(_kIsObscuredIndex, 'isObscured');
 
   /// Whether the value of the semantics node is coming from a multi-line text
   /// field.
   ///
   /// This is used for text fields to distinguish single-line text fields from
   /// multi-line ones.
-  static const SemanticsFlag isMultiline = SemanticsFlag._(_kIsMultilineIndex);
+  static const SemanticsFlag isMultiline = SemanticsFlag._(_kIsMultilineIndex, 'isMultiline');
 
   /// Whether the semantics node is the root of a subtree for which a route name
   /// should be announced.
@@ -479,7 +442,7 @@ class SemanticsFlag {
   ///
   /// This is used in widgets such as Routes, Drawers, and Dialogs to
   /// communicate significant changes in the visible screen.
-  static const SemanticsFlag scopesRoute = SemanticsFlag._(_kScopesRouteIndex);
+  static const SemanticsFlag scopesRoute = SemanticsFlag._(_kScopesRouteIndex, 'scopesRoute');
 
   /// Whether the semantics node label is the name of a visually distinct
   /// route.
@@ -492,7 +455,7 @@ class SemanticsFlag {
   ///
   /// Updating this label within the same active route subtree will not cause
   /// additional announcements.
-  static const SemanticsFlag namesRoute = SemanticsFlag._(_kNamesRouteIndex);
+  static const SemanticsFlag namesRoute = SemanticsFlag._(_kNamesRouteIndex, 'namesRoute');
 
   /// Whether the semantics node is considered hidden.
   ///
@@ -514,13 +477,13 @@ class SemanticsFlag {
   /// See also:
   ///
   /// * [RenderObject.describeSemanticsClip]
-  static const SemanticsFlag isHidden = SemanticsFlag._(_kIsHiddenIndex);
+  static const SemanticsFlag isHidden = SemanticsFlag._(_kIsHiddenIndex, 'isHidden');
 
   /// Whether the semantics node represents an image.
   ///
   /// Both TalkBack and VoiceOver will inform the user the semantics node
   /// represents an image.
-  static const SemanticsFlag isImage = SemanticsFlag._(_kIsImageIndex);
+  static const SemanticsFlag isImage = SemanticsFlag._(_kIsImageIndex, 'isImage');
 
   /// Whether the semantics node is a live region.
   ///
@@ -534,7 +497,7 @@ class SemanticsFlag {
   /// may not be spoken if the OS accessibility services are already
   /// announcing something else, such as reading the label of a focused
   /// widget or providing a system announcement.
-  static const SemanticsFlag isLiveRegion = SemanticsFlag._(_kIsLiveRegionIndex);
+  static const SemanticsFlag isLiveRegion = SemanticsFlag._(_kIsLiveRegionIndex, 'isLiveRegion');
 
   /// The semantics node has the quality of either being "on" or "off".
   ///
@@ -545,7 +508,7 @@ class SemanticsFlag {
   /// See also:
   ///
   ///    * [SemanticsFlag.isToggled], which controls whether the node is "on" or "off".
-  static const SemanticsFlag hasToggledState = SemanticsFlag._(_kHasToggledStateIndex);
+  static const SemanticsFlag hasToggledState = SemanticsFlag._(_kHasToggledStateIndex, 'hasToggledState');
 
   /// If true, the semantics node is "on". If false, the semantics node is
   /// "off".
@@ -555,7 +518,7 @@ class SemanticsFlag {
   /// See also:
   ///
   ///   * [SemanticsFlag.hasToggledState], which enables a toggled state.
-  static const SemanticsFlag isToggled = SemanticsFlag._(_kIsToggledIndex);
+  static const SemanticsFlag isToggled = SemanticsFlag._(_kIsToggledIndex, 'isToggled');
 
   /// Whether the platform can scroll the semantics node when the user attempts
   /// to move focus to an offscreen child.
@@ -564,12 +527,33 @@ class SemanticsFlag {
   /// easily move the accessibility focus to the next set of children. A
   /// [PageView] widget does not have implicit scrolling, so that users don't
   /// navigate to the next page when reaching the end of the current one.
-  static const SemanticsFlag hasImplicitScrolling = SemanticsFlag._(_kHasImplicitScrollingIndex);
+  static const SemanticsFlag hasImplicitScrolling = SemanticsFlag._(_kHasImplicitScrollingIndex, 'hasImplicitScrolling');
+
+  /// The semantics node has the quality of either being "expanded" or "collapsed".
+  ///
+  /// For example, a [SubmenuButton] widget has expanded state.
+  ///
+  /// See also:
+  ///
+  ///   * [SemanticsFlag.isExpanded], which controls whether the node is "expanded" or "collapsed".
+  static const SemanticsFlag hasExpandedState = SemanticsFlag._(_kHasExpandedStateIndex, 'hasExpandedState');
+
+  /// Whether a semantics node is expanded.
+  ///
+  /// If true, the semantics node is "expanded". If false, the semantics node is
+  /// "collapsed".
+  ///
+  /// For example, if a [SubmenuButton] shows its children, [isExpanded] is true.
+  ///
+  /// See also:
+  ///
+  ///   * [SemanticsFlag.hasExpandedState], which enables an expanded/collapsed state.
+  static const SemanticsFlag isExpanded = SemanticsFlag._(_kIsExpandedIndex, 'isExpanded');
 
   /// The possible semantics flags.
   ///
   /// The map's key is the [index] of the flag and the value is the flag itself.
-  static const Map<int, SemanticsFlag> values = <int, SemanticsFlag>{
+  static const Map<int, SemanticsFlag> _kFlagById = <int, SemanticsFlag>{
     _kHasCheckedStateIndex: hasCheckedState,
     _kIsCheckedIndex: isChecked,
     _kIsSelectedIndex: isSelected,
@@ -596,67 +580,16 @@ class SemanticsFlag {
     _kIsSliderIndex: isSlider,
     _kIsKeyboardKeyIndex: isKeyboardKey,
     _kIsCheckStateMixedIndex: isCheckStateMixed,
+    _kHasExpandedStateIndex: hasExpandedState,
+    _kIsExpandedIndex: isExpanded,
   };
 
+  static List<SemanticsFlag> get values => _kFlagById.values.toList(growable: false);
+
+  static SemanticsFlag? fromIndex(int index) => _kFlagById[index];
+
   @override
-  String toString() {
-    switch (index) {
-      case _kHasCheckedStateIndex:
-        return 'SemanticsFlag.hasCheckedState';
-      case _kIsCheckedIndex:
-        return 'SemanticsFlag.isChecked';
-      case _kIsSelectedIndex:
-        return 'SemanticsFlag.isSelected';
-      case _kIsButtonIndex:
-        return 'SemanticsFlag.isButton';
-      case _kIsTextFieldIndex:
-        return 'SemanticsFlag.isTextField';
-      case _kIsFocusedIndex:
-        return 'SemanticsFlag.isFocused';
-      case _kHasEnabledStateIndex:
-        return 'SemanticsFlag.hasEnabledState';
-      case _kIsEnabledIndex:
-        return 'SemanticsFlag.isEnabled';
-      case _kIsInMutuallyExclusiveGroupIndex:
-        return 'SemanticsFlag.isInMutuallyExclusiveGroup';
-      case _kIsHeaderIndex:
-        return 'SemanticsFlag.isHeader';
-      case _kIsObscuredIndex:
-        return 'SemanticsFlag.isObscured';
-      case _kScopesRouteIndex:
-        return 'SemanticsFlag.scopesRoute';
-      case _kNamesRouteIndex:
-        return 'SemanticsFlag.namesRoute';
-      case _kIsHiddenIndex:
-        return 'SemanticsFlag.isHidden';
-      case _kIsImageIndex:
-        return 'SemanticsFlag.isImage';
-      case _kIsLiveRegionIndex:
-        return 'SemanticsFlag.isLiveRegion';
-      case _kHasToggledStateIndex:
-        return 'SemanticsFlag.hasToggledState';
-      case _kIsToggledIndex:
-        return 'SemanticsFlag.isToggled';
-      case _kHasImplicitScrollingIndex:
-        return 'SemanticsFlag.hasImplicitScrolling';
-      case _kIsMultilineIndex:
-        return 'SemanticsFlag.isMultiline';
-      case _kIsReadOnlyIndex:
-        return 'SemanticsFlag.isReadOnly';
-      case _kIsFocusableIndex:
-        return 'SemanticsFlag.isFocusable';
-      case _kIsLinkIndex:
-        return 'SemanticsFlag.isLink';
-      case _kIsSliderIndex:
-        return 'SemanticsFlag.isSlider';
-      case _kIsKeyboardKeyIndex:
-        return 'SemanticsFlag.isKeyboardKey';
-      case _kIsCheckStateMixedIndex:
-        return 'SemanticsFlag.isCheckStateMixed';
-    }
-    assert(false, 'Unhandled index: $index (0x${index.toRadixString(8).padLeft(4, "0")})');
-    return '';
-  }
+  String toString() => 'SemanticsFlag.$name';
 }
 
 // When adding a new StringAttribute, the classes in these files must be
@@ -677,7 +610,7 @@ class SemanticsFlag {
 ///    spell out the string character by character when announcing the string.
 ///  * [LocaleStringAttribute], which causes the assistive technologies to
 ///    treat the string in the specific language.
-abstract class StringAttribute extends NativeFieldWrapperClass1 {
+abstract base class StringAttribute extends NativeFieldWrapperClass1 {
   StringAttribute._({
     required this.range,
   });
@@ -703,7 +636,7 @@ abstract class StringAttribute extends NativeFieldWrapperClass1 {
 ///  * [AttributedString], where the string attributes are used.
 ///  * [LocaleStringAttribute], which causes the assistive technologies to
 ///    treat the string in the specific language.
-class SpellOutStringAttribute extends StringAttribute {
+base class SpellOutStringAttribute extends StringAttribute {
   /// Creates a string attribute that denotes the text in [range] must be
   /// spell out when the assistive technologies announce the string.
   SpellOutStringAttribute({
@@ -712,7 +645,7 @@ class SpellOutStringAttribute extends StringAttribute {
     _initSpellOutStringAttribute(this, range.start, range.end);
   }
 
-  @FfiNative<Void Function(Handle, Int32, Int32)>('NativeStringAttribute::initSpellOutStringAttribute')
+  @Native<Void Function(Handle, Int32, Int32)>(symbol: 'NativeStringAttribute::initSpellOutStringAttribute')
   external static void _initSpellOutStringAttribute(SpellOutStringAttribute instance, int start, int end);
 
   @override
@@ -734,7 +667,7 @@ class SpellOutStringAttribute extends StringAttribute {
 ///  * [AttributedString], where the string attributes are used.
 ///  * [SpellOutStringAttribute], which causes the assistive technologies to
 ///    spell out the string character by character when announcing the string.
-class LocaleStringAttribute extends StringAttribute {
+base class LocaleStringAttribute extends StringAttribute {
   /// Creates a string attribute that denotes the text in [range] must be
   /// treated as the language specified by the [locale] when the assistive
   /// technologies announce the string.
@@ -748,7 +681,7 @@ class LocaleStringAttribute extends StringAttribute {
   /// The lanuage of this attribute.
   final Locale locale;
 
-  @FfiNative<Void Function(Handle, Int32, Int32, Handle)>('NativeStringAttribute::initLocaleStringAttribute')
+  @Native<Void Function(Handle, Int32, Int32, Handle)>(symbol: 'NativeStringAttribute::initLocaleStringAttribute')
   external static void _initLocaleStringAttribute(LocaleStringAttribute instance, int start, int end, String locale);
 
   @override
@@ -767,14 +700,9 @@ class LocaleStringAttribute extends StringAttribute {
 /// Once created, the [SemanticsUpdate] objects can be passed to
 /// [PlatformDispatcher.updateSemantics] to update the semantics conveyed to the
 /// user.
-@pragma('vm:entry-point')
-class SemanticsUpdateBuilder extends NativeFieldWrapperClass1 {
+abstract class SemanticsUpdateBuilder {
   /// Creates an empty [SemanticsUpdateBuilder] object.
-  @pragma('vm:entry-point')
-  SemanticsUpdateBuilder() { _constructor(); }
-
-  @FfiNative<Void Function(Handle)>('SemanticsUpdateBuilder::Create')
-  external void _constructor();
+  factory SemanticsUpdateBuilder() = _NativeSemanticsUpdateBuilder;
 
   /// Update the information associated with the node with the given `id`.
   ///
@@ -796,10 +724,15 @@ class SemanticsUpdateBuilder extends NativeFieldWrapperClass1 {
   ///
   /// The `actions` are a bit field of [SemanticsAction]s that can be undertaken
   /// by this node. If the user wishes to undertake one of these actions on this
-  /// node, the [PlatformDispatcher.onSemanticsAction] will be called with `id`
-  /// and one of the possible [SemanticsAction]s. Because the semantics tree is
-  /// maintained asynchronously, the [PlatformDispatcher.onSemanticsAction]
-  /// callback might be called with an action that is no longer possible.
+  /// node, the [PlatformDispatcher.onSemanticsActionEvent] will be called with
+  /// a [SemanticsActionEvent] specifying the action to be performed. Because
+  /// the semantics tree is maintained asynchronously, the
+  /// [PlatformDispatcher.onSemanticsActionEvent] callback might be called with
+  /// an action that is no longer possible.
+  ///
+  /// The `identifier` is a string that describes the node for UI automation
+  /// tools that work by querying the accessibility hierarchy, such as Android
+  /// UI Automator, iOS XCUITest, or Appium. It's not exposed to users.
   ///
   /// The `label` is a string that describes this node. The `value` property
   /// describes the current value of the node as a string. The `increasedValue`
@@ -809,8 +742,8 @@ class SemanticsUpdateBuilder extends NativeFieldWrapperClass1 {
   /// string describes what result an action performed on this node has. The
   /// reading direction of all these strings is given by `textDirection`.
   ///
-  /// The `labelAttirbutes`, `valueAttirbutes`, `hintAttributes`,
-  /// `increasedValueAttirbutes`, and `decreasedValueAttributes` are the lists of
+  /// The `labelAttributes`, `valueAttributes`, `hintAttributes`,
+  /// `increasedValueAttributes`, and `decreasedValueAttributes` are the lists of
   /// [StringAttribute] carried by the `label`, `value`, `hint`, `increasedValue`,
   /// and `decreasedValue` respectively. Their contents must not be changed during
   /// the semantics update.
@@ -874,6 +807,7 @@ class SemanticsUpdateBuilder extends NativeFieldWrapperClass1 {
     required double elevation,
     required double thickness,
     required Rect rect,
+    required String identifier,
     required String label,
     required List<StringAttribute> labelAttributes,
     required String value,
@@ -884,18 +818,84 @@ class SemanticsUpdateBuilder extends NativeFieldWrapperClass1 {
     required List<StringAttribute> decreasedValueAttributes,
     required String hint,
     required List<StringAttribute> hintAttributes,
-    String? tooltip,
-    TextDirection? textDirection,
+    required String tooltip,
+    required TextDirection? textDirection,
+    required Float64List transform,
+    required Int32List childrenInTraversalOrder,
+    required Int32List childrenInHitTestOrder,
+    required Int32List additionalActions,
+  });
+
+  /// Update the custom semantics action associated with the given `id`.
+  ///
+  /// The name of the action exposed to the user is the `label`. For overridden
+  /// standard actions this value is ignored.
+  ///
+  /// The `hint` should describe what happens when an action occurs, not the
+  /// manner in which a tap is accomplished. For example, use "delete" instead
+  /// of "double tap to delete".
+  ///
+  /// The text direction of the `hint` and `label` is the same as the global
+  /// window.
+  ///
+  /// For overridden standard actions, `overrideId` corresponds with a
+  /// [SemanticsAction.index] value. For custom actions this argument should not be
+  /// provided.
+  void updateCustomAction({required int id, String? label, String? hint, int overrideId = -1});
+
+  /// Creates a [SemanticsUpdate] object that encapsulates the updates recorded
+  /// by this object.
+  ///
+  /// The returned object can be passed to [PlatformDispatcher.updateSemantics]
+  /// to actually update the semantics retained by the system.
+  ///
+  /// This object is unusable after calling build.
+  SemanticsUpdate build();
+}
+
+base class _NativeSemanticsUpdateBuilder extends NativeFieldWrapperClass1 implements SemanticsUpdateBuilder {
+  _NativeSemanticsUpdateBuilder() { _constructor(); }
+
+  @Native<Void Function(Handle)>(symbol: 'SemanticsUpdateBuilder::Create')
+  external void _constructor();
+
+  @override
+  void updateNode({
+    required int id,
+    required int flags,
+    required int actions,
+    required int maxValueLength,
+    required int currentValueLength,
+    required int textSelectionBase,
+    required int textSelectionExtent,
+    required int platformViewId,
+    required int scrollChildren,
+    required int scrollIndex,
+    required double scrollPosition,
+    required double scrollExtentMax,
+    required double scrollExtentMin,
+    required double elevation,
+    required double thickness,
+    required Rect rect,
+    required String identifier,
+    required String label,
+    required List<StringAttribute> labelAttributes,
+    required String value,
+    required List<StringAttribute> valueAttributes,
+    required String increasedValue,
+    required List<StringAttribute> increasedValueAttributes,
+    required String decreasedValue,
+    required List<StringAttribute> decreasedValueAttributes,
+    required String hint,
+    required List<StringAttribute> hintAttributes,
+    required String tooltip,
+    required TextDirection? textDirection,
     required Float64List transform,
     required Int32List childrenInTraversalOrder,
     required Int32List childrenInHitTestOrder,
     required Int32List additionalActions,
   }) {
     assert(_matrix4IsValid(transform));
-    assert(
-      scrollChildren == 0 || scrollChildren == null || (scrollChildren > 0 && childrenInHitTestOrder != null),
-      'If a node has scrollChildren, it must have childrenInHitTestOrder',
-    );
     _updateNode(
       id,
       flags,
@@ -916,6 +916,7 @@ class SemanticsUpdateBuilder extends NativeFieldWrapperClass1 {
       rect.bottom,
       elevation,
       thickness,
+      identifier,
       label,
       labelAttributes,
       value,
@@ -926,7 +927,7 @@ class SemanticsUpdateBuilder extends NativeFieldWrapperClass1 {
       decreasedValueAttributes,
       hint,
       hintAttributes,
-      tooltip ?? '',
+      tooltip,
       textDirection != null ? textDirection.index + 1 : 0,
       transform,
       childrenInTraversalOrder,
@@ -934,7 +935,7 @@ class SemanticsUpdateBuilder extends NativeFieldWrapperClass1 {
       additionalActions,
     );
   }
-  @FfiNative<
+  @Native<
       Void Function(
           Pointer<Void>,
           Int32,
@@ -967,11 +968,12 @@ class SemanticsUpdateBuilder extends NativeFieldWrapperClass1 {
           Handle,
           Handle,
           Handle,
+          Handle,
           Int32,
           Handle,
           Handle,
           Handle,
-          Handle)>('SemanticsUpdateBuilder::updateNode')
+          Handle)>(symbol: 'SemanticsUpdateBuilder::updateNode')
   external void _updateNode(
       int id,
       int flags,
@@ -992,6 +994,7 @@ class SemanticsUpdateBuilder extends NativeFieldWrapperClass1 {
       double bottom,
       double elevation,
       double thickness,
+      String? identifier,
       String label,
       List<StringAttribute> labelAttributes,
       String value,
@@ -1009,43 +1012,24 @@ class SemanticsUpdateBuilder extends NativeFieldWrapperClass1 {
       Int32List childrenInHitTestOrder,
       Int32List additionalActions);
 
-  /// Update the custom semantics action associated with the given `id`.
-  ///
-  /// The name of the action exposed to the user is the `label`. For overridden
-  /// standard actions this value is ignored.
-  ///
-  /// The `hint` should describe what happens when an action occurs, not the
-  /// manner in which a tap is accomplished. For example, use "delete" instead
-  /// of "double tap to delete".
-  ///
-  /// The text direction of the `hint` and `label` is the same as the global
-  /// window.
-  ///
-  /// For overridden standard actions, `overrideId` corresponds with a
-  /// [SemanticsAction.index] value. For custom actions this argument should not be
-  /// provided.
+  @override
   void updateCustomAction({required int id, String? label, String? hint, int overrideId = -1}) {
-    assert(id != null);
-    assert(overrideId != null);
     _updateCustomAction(id, label ?? '', hint ?? '', overrideId);
   }
-  @FfiNative<Void Function(Pointer<Void>, Int32, Handle, Handle, Int32)>('SemanticsUpdateBuilder::updateCustomAction')
+  @Native<Void Function(Pointer<Void>, Int32, Handle, Handle, Int32)>(symbol: 'SemanticsUpdateBuilder::updateCustomAction')
   external void _updateCustomAction(int id, String label, String hint, int overrideId);
 
-  /// Creates a [SemanticsUpdate] object that encapsulates the updates recorded
-  /// by this object.
-  ///
-  /// The returned object can be passed to [PlatformDispatcher.updateSemantics]
-  /// to actually update the semantics retained by the system.
-  ///
-  /// This object is unusable after calling build.
+  @override
   SemanticsUpdate build() {
-    final SemanticsUpdate semanticsUpdate = SemanticsUpdate._();
+    final _NativeSemanticsUpdate semanticsUpdate = _NativeSemanticsUpdate._();
     _build(semanticsUpdate);
     return semanticsUpdate;
   }
-  @FfiNative<Void Function(Pointer<Void>, Handle)>('SemanticsUpdateBuilder::build')
-  external void _build(SemanticsUpdate outSemanticsUpdate);
+  @Native<Void Function(Pointer<Void>, Handle)>(symbol: 'SemanticsUpdateBuilder::build')
+  external void _build(_NativeSemanticsUpdate outSemanticsUpdate);
+
+  @override
+  String toString() => 'SemanticsUpdateBuilder';
 }
 
 /// An opaque object representing a batch of semantics updates.
@@ -1054,15 +1038,7 @@ class SemanticsUpdateBuilder extends NativeFieldWrapperClass1 {
 ///
 /// Semantics updates can be applied to the system's retained semantics tree
 /// using the [PlatformDispatcher.updateSemantics] method.
-@pragma('vm:entry-point')
-class SemanticsUpdate extends NativeFieldWrapperClass1 {
-  /// This class is created by the engine, and should not be instantiated
-  /// or extended directly.
-  ///
-  /// To create a SemanticsUpdate object, use a [SemanticsUpdateBuilder].
-  @pragma('vm:entry-point')
-  SemanticsUpdate._();
-
+abstract class SemanticsUpdate {
   /// Releases the resources used by this semantics update.
   ///
   /// After calling this function, the semantics update is cannot be used
@@ -1070,6 +1046,20 @@ class SemanticsUpdate extends NativeFieldWrapperClass1 {
   ///
   /// This can't be a leaf call because the native function calls Dart API
   /// (Dart_SetNativeInstanceField).
-  @FfiNative<Void Function(Pointer<Void>)>('SemanticsUpdate::dispose')
+  void dispose();
+}
+
+base class _NativeSemanticsUpdate extends NativeFieldWrapperClass1 implements SemanticsUpdate {
+  /// This class is created by the engine, and should not be instantiated
+  /// or extended directly.
+  ///
+  /// To create a SemanticsUpdate object, use a [SemanticsUpdateBuilder].
+  _NativeSemanticsUpdate._();
+
+  @override
+  @Native<Void Function(Pointer<Void>)>(symbol: 'SemanticsUpdate::dispose')
   external void dispose();
+
+  @override
+  String toString() => 'SemanticsUpdate';
 }
diff --git a/lib/ui/semantics/custom_accessibility_action.h b/lib/ui/semantics/custom_accessibility_action.h
index 732b30d726b1fd827d86c7a3c735e60672f34f4f..e093c6bae0b90a28799462ce66ec087fbd3b9d76 100644
--- a/lib/ui/semantics/custom_accessibility_action.h
+++ b/lib/ui/semantics/custom_accessibility_action.h
@@ -33,4 +33,4 @@ using CustomAccessibilityActionUpdates =
 
 }  // namespace flutter
 
-#endif  // FLUTTER_LIB_UI_SEMANTICS_LOCAL_CONTEXT_ACTION_H_
+#endif  // FLUTTER_LIB_UI_SEMANTICS_CUSTOM_ACCESSIBILITY_ACTION_H_
diff --git a/lib/ui/semantics/semantics_node.h b/lib/ui/semantics/semantics_node.h
index 3fad29b844bbda285c05d360471bea8e8fe80fcd..993c1dc80eb4046bc699bd6dde6e4df4b01f4bc3 100644
--- a/lib/ui/semantics/semantics_node.h
+++ b/lib/ui/semantics/semantics_node.h
@@ -88,6 +88,8 @@ enum class SemanticsFlags : int32_t {
   kIsSlider = 1 << 23,
   kIsKeyboardKey = 1 << 24,
   kIsCheckStateMixed = 1 << 25,
+  kHasExpandedState = 1 << 26,
+  kIsExpanded = 1 << 27,
 };
 
 const int kScrollableSemanticsFlags =
@@ -121,6 +123,7 @@ struct SemanticsNode {
   double scrollExtentMin = std::nan("");
   double elevation = 0.0;
   double thickness = 0.0;
+  std::string identifier;
   std::string label;
   StringAttributes labelAttributes;
   std::string hint;
diff --git a/lib/ui/semantics/semantics_update_builder.cc b/lib/ui/semantics/semantics_update_builder.cc
index 595ecf85f7c671dc601542e7bc0bae327df180fd..f7c0d8294fb4f7076b9444b8f7f281fe347a6793 100644
--- a/lib/ui/semantics/semantics_update_builder.cc
+++ b/lib/ui/semantics/semantics_update_builder.cc
@@ -6,6 +6,7 @@
 
 #include <utility>
 
+#include "flutter/lib/ui/floating_point.h"
 #include "flutter/lib/ui/ui_dart_state.h"
 #include "third_party/skia/include/core/SkScalar.h"
 #include "third_party/tonic/converter/dart_converter.h"
@@ -49,6 +50,7 @@ void SemanticsUpdateBuilder::updateNode(
     double bottom,
     double elevation,
     double thickness,
+    std::string identifier,
     std::string label,
     const std::vector<NativeStringAttribute*>& labelAttributes,
     std::string value,
@@ -65,8 +67,6 @@ void SemanticsUpdateBuilder::updateNode(
     const tonic::Int32List& childrenInTraversalOrder,
     const tonic::Int32List& childrenInHitTestOrder,
     const tonic::Int32List& localContextActions) {
-  FML_CHECK(transform.data() && SkScalarsAreFinite(*transform.data(), 9))
-      << "Semantics update transform was not set or not finite.";
   FML_CHECK(scrollChildren == 0 ||
             (scrollChildren > 0 && childrenInHitTestOrder.data()))
       << "Semantics update contained scrollChildren but did not have "
@@ -85,9 +85,11 @@ void SemanticsUpdateBuilder::updateNode(
   node.scrollPosition = scrollPosition;
   node.scrollExtentMax = scrollExtentMax;
   node.scrollExtentMin = scrollExtentMin;
-  node.rect = SkRect::MakeLTRB(left, top, right, bottom);
+  node.rect = SkRect::MakeLTRB(SafeNarrow(left), SafeNarrow(top),
+                               SafeNarrow(right), SafeNarrow(bottom));
   node.elevation = elevation;
   node.thickness = thickness;
+  node.identifier = std::move(identifier);
   node.label = std::move(label);
   pushStringAttributes(node.labelAttributes, labelAttributes);
   node.value = std::move(value);
@@ -102,7 +104,7 @@ void SemanticsUpdateBuilder::updateNode(
   node.textDirection = textDirection;
   SkScalar scalarTransform[16];
   for (int i = 0; i < 16; ++i) {
-    scalarTransform[i] = transform.data()[i];
+    scalarTransform[i] = SafeNarrow(transform.data()[i]);
   }
   node.transform = SkM44::ColMajor(scalarTransform);
   node.childrenInTraversalOrder =
diff --git a/lib/ui/semantics/semantics_update_builder.h b/lib/ui/semantics/semantics_update_builder.h
index 37d45d9f746beb8d705c9fb8d58e7e764a84ba5a..abe4c2806b21070e4c755f6f1f16189b6d793777 100644
--- a/lib/ui/semantics/semantics_update_builder.h
+++ b/lib/ui/semantics/semantics_update_builder.h
@@ -49,6 +49,7 @@ class SemanticsUpdateBuilder
       double bottom,
       double elevation,
       double thickness,
+      std::string identifier,
       std::string label,
       const std::vector<NativeStringAttribute*>& labelAttributes,
       std::string value,
diff --git a/lib/ui/semantics/string_attribute.h b/lib/ui/semantics/string_attribute.h
index b9ee3bc958a60a16e9d60d670221d7a0aaa10f05..1e2dce57e614feff90ee9adb1a9c7e07a67062ab 100644
--- a/lib/ui/semantics/string_attribute.h
+++ b/lib/ui/semantics/string_attribute.h
@@ -20,6 +20,7 @@ using StringAttributes = std::vector<StringAttributePtr>;
 //  * engine/src/flutter/lib/ui/semantics.dart
 //  * engine/src/flutter/lib/web_ui/lib/semantics.dart
 //  * engine/src/flutter/shell/platform/android/io/flutter/view/AccessibilityBridge.java
+//  * engine/src/flutter/shell/platform/embedder/embedder.h
 //  * engine/src/flutter/lib/web_ui/test/engine/semantics/semantics_api_test.dart
 //  * engine/src/flutter/testing/dart/semantics_test.dart
 
diff --git a/lib/ui/setup_hooks.dart b/lib/ui/setup_hooks.dart
new file mode 100644
index 0000000000000000000000000000000000000000..cb79a052c25bfa3991ac7927856c78e3a651f99a
--- /dev/null
+++ b/lib/ui/setup_hooks.dart
@@ -0,0 +1,29 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+part of dart.ui;
+
+@pragma('vm:entry-point')
+void _setupHooks() {
+  assert(() {
+    // In debug mode, register the schedule frame extension.
+    developer.registerExtension('ext.ui.window.scheduleFrame', _scheduleFrame);
+
+    // In debug mode, allow shaders to be reinitialized.
+    developer.registerExtension(
+      'ext.ui.window.reinitializeShader',
+      _reinitializeShader,
+    );
+
+    return true;
+  }());
+
+  // In debug and profile mode, allow tools to display the current rendering backend.
+  if (!_kReleaseMode) {
+    developer.registerExtension(
+      'ext.ui.window.impellerEnabled',
+      _getImpellerEnabled,
+    );
+  }
+}
diff --git a/lib/ui/snapshot_delegate.h b/lib/ui/snapshot_delegate.h
index 6f9fc113a330ec566290d908476dc61fdb0100f2..2c3677d8551a809bf22ce50fe696543879f9b2fa 100644
--- a/lib/ui/snapshot_delegate.h
+++ b/lib/ui/snapshot_delegate.h
@@ -9,10 +9,8 @@
 
 #include "flutter/common/graphics/texture.h"
 #include "flutter/display_list/display_list.h"
-#include "flutter/flow/skia_gpu_object.h"
 #include "third_party/skia/include/core/SkImage.h"
-#include "third_party/skia/include/core/SkPicture.h"
-#include "third_party/skia/include/core/SkPromiseImageTexture.h"
+#include "third_party/skia/include/gpu/GrBackendSurface.h"
 #include "third_party/skia/include/gpu/GrContextThreadSafeProxy.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
 
diff --git a/lib/ui/text.dart b/lib/ui/text.dart
index 69983ae736e27e258af0afabee449e809c0fbe57..a45a2d53c868c12420669037a184cbaee57cbb4f 100644
--- a/lib/ui/text.dart
+++ b/lib/ui/text.dart
@@ -3,16 +3,51 @@
 // found in the LICENSE file.
 part of dart.ui;
 
-/// Whether to slant the glyphs in the font
+/// Whether to use the italic type variation of glyphs in the font.
+///
+/// Some modern fonts allow this to be selected in a more fine-grained manner.
+/// See [FontVariation.italic] for details.
+///
+/// Italic type is distinct from slanted glyphs. To control the slant of a
+/// glyph, consider the [FontVariation.slant] font feature.
 enum FontStyle {
-  /// Use the upright glyphs
+  /// Use the upright ("Roman") glyphs.
   normal,
 
-  /// Use glyphs designed for slanting
+  /// Use glyphs that have a more pronounced angle and typically a cursive style
+  /// ("italic type").
   italic,
 }
 
-/// The thickness of the glyphs used to draw the text
+/// The thickness of the glyphs used to draw the text.
+///
+/// Fonts are typically weighted on a 9-point scale, which, for historical
+/// reasons, uses the names 100 to 900. In Flutter, these are named `w100` to
+/// `w900` and have the following conventional meanings:
+///
+///  * [w100]: Thin, the thinnest font weight.
+///
+///  * [w200]: Extra light.
+///
+///  * [w300]: Light.
+///
+///  * [w400]: Normal. The constant [FontWeight.normal] is an alias for this value.
+///
+///  * [w500]: Medium.
+///
+///  * [w600]: Semi-bold.
+///
+///  * [w700]: Bold. The constant [FontWeight.bold] is an alias for this value.
+///
+///  * [w800]: Extra-bold.
+///
+///  * [w900]: Black, the thickest font weight.
+///
+/// For example, the font named "Roboto Medium" is typically exposed as a font
+/// with the name "Roboto" and the weight [FontWeight.w500].
+///
+/// Some modern fonts allow the weight to be adjusted in arbitrary increments.
+/// See [FontVariation.weight] for details.
 class FontWeight {
   const FontWeight._(this.index, this.value);
 
@@ -22,31 +57,31 @@ class FontWeight {
   /// The thickness value of this font weight.
   final int value;
 
-  /// Thin, the least thick
+  /// Thin, the least thick.
   static const FontWeight w100 = FontWeight._(0, 100);
 
-  /// Extra-light
+  /// Extra-light.
   static const FontWeight w200 = FontWeight._(1, 200);
 
-  /// Light
+  /// Light.
   static const FontWeight w300 = FontWeight._(2, 300);
 
-  /// Normal / regular / plain
+  /// Normal / regular / plain.
   static const FontWeight w400 = FontWeight._(3, 400);
 
-  /// Medium
+  /// Medium.
   static const FontWeight w500 = FontWeight._(4, 500);
 
-  /// Semi-bold
+  /// Semi-bold.
   static const FontWeight w600 = FontWeight._(5, 600);
 
-  /// Bold
+  /// Bold.
   static const FontWeight w700 = FontWeight._(6, 700);
 
-  /// Extra-bold
+  /// Extra-bold.
   static const FontWeight w800 = FontWeight._(7, 800);
 
-  /// Black, the most thick
+  /// Black, the most thick.
   static const FontWeight w900 = FontWeight._(8, 900);
 
   /// The default font weight.
@@ -65,6 +100,9 @@ class FontWeight {
   /// Rather than using fractional weights, the interpolation rounds to the
   /// nearest weight.
   ///
+  /// For a smoother animation of font weight, consider using
+  /// [FontVariation.weight] if the font in question supports it.
+  ///
   /// If both `a` and `b` are null, then this method will return null. Otherwise,
   /// any null values for `a` or `b` are interpreted as equivalent to [normal]
   /// (also known as [w400]).
@@ -82,7 +120,6 @@ class FontWeight {
   /// Values for `t` are usually obtained from an [Animation<double>], such as
   /// an [AnimationController].
   static FontWeight? lerp(FontWeight? a, FontWeight? b, double t) {
-    assert(t != null);
     if (a == null && b == null) {
       return null;
     }
@@ -119,6 +156,9 @@ class FontWeight {
 /// ** See code in examples/api/lib/ui/text/font_feature.0.dart **
 /// {@end-tool}
 ///
+/// Some fonts also support continuous font variations; see the [FontVariation]
+/// class.
+///
 /// See also:
 ///
 ///  * <https://en.wikipedia.org/wiki/List_of_typographic_features>,
@@ -141,9 +181,7 @@ class FontFeature {
   const FontFeature(
     this.feature,
     [ this.value = 1 ]
-  ) : assert(feature != null),
-      assert(feature.length == 4, 'Feature tag must be exactly four characters long.'),
-      assert(value != null),
+  ) : assert(feature.length == 4, 'Feature tag must be exactly four characters long.'),
       assert(value >= 0, 'Feature value must be zero or a positive integer.');
 
   /// Create a [FontFeature] object that enables the feature with the given tag.
@@ -179,7 +217,7 @@ class FontFeature {
   /// letters. With value 2, the lowercase "a" changes to a stemless
   /// "a", whereas the lowercase "t" changes to a vertical bar instead
   /// of having a curve. By targeting specific letters in the text
-  /// (using [Text.rich]), the desired rendering for each glyph can be
+  /// (using [widgets.Text.rich]), the desired rendering for each glyph can be
   /// achieved.
   ///
   /// ![](https://flutter.github.io/assets-for-api-docs/assets/dart-ui/font_feature_aalt.png)
@@ -343,7 +381,7 @@ class FontFeature {
   /// U+2044 FRACTION SLASH (⁄) are replaced by ligatures that
   /// represent the corresponding fraction.
   ///
-  /// This feature may imply the [FontFeature.numerator] and
+  /// This feature may imply the [FontFeature.numerators] and
   /// [FontFeature.denominator] features.
   ///
   /// {@tool sample}
@@ -941,34 +979,158 @@ class FontFeature {
 /// Some fonts are variable fonts that can generate a range of different
 /// font faces by altering the values of the font's design axes.
 ///
-/// See https://docs.microsoft.com/en-us/typography/opentype/spec/otvaroverview
+/// For example:
+///
+/// ```dart
+/// const TextStyle(fontVariations: <ui.FontVariation>[ui.FontVariation('wght', 800.0)])
+/// ```
+///
+/// Font variations are distinct from font features, as exposed by the
+/// [FontFeature] class. Where features can be enabled or disabled in a discrete
+/// manner, font variations provide a continuous axis of control.
+///
+/// See also:
+///
+///  * <https://learn.microsoft.com/en-us/typography/opentype/spec/dvaraxisreg#registered-axis-tags>,
+///    which lists registered axis tags.
 ///
-/// Example:
-/// `TextStyle(fontVariations: <FontVariation>[FontVariation('wght', 800.0)])`
+///  * <https://docs.microsoft.com/en-us/typography/opentype/spec/otvaroverview>,
+///    an overview of the font variations technology.
 class FontVariation {
   /// Creates a [FontVariation] object, which can be added to a [TextStyle] to
   /// change the variable attributes of a font.
   ///
   /// `axis` is the four-character tag that identifies the design axis.
-  /// These tags are specified by font formats such as OpenType.
-  /// See https://docs.microsoft.com/en-us/typography/opentype/spec/dvaraxisreg
+  /// OpenType lists the [currently registered axis
+  /// tags](https://docs.microsoft.com/en-us/typography/opentype/spec/dvaraxisreg).
   ///
   /// `value` is the value that the axis will be set to. The behavior
   /// depends on how the font implements the axis.
   const FontVariation(
     this.axis,
     this.value,
-  ) : assert(axis != null),
-      assert(axis.length == 4, 'Axis tag must be exactly four characters long.'),
-      assert(value != null);
+  ) : assert(axis.length == 4, 'Axis tag must be exactly four characters long.'),
+      assert(value >= -32768.0 && value < 32768.0, 'Value must be representable as a signed 16.16 fixed-point number, i.e. it must be in this range: -32768.0 ≤ value < 32768.0');
+
+  // Constructors below should be alphabetic by axis tag. This makes it easier
+  // to determine when an axis is missing so that we avoid adding duplicates.
+
+  // Start of axis tag list.
+  // ------------------------------------------------------------------------
+
+  /// Variable font style. (`ital`)
+  ///
+  /// Varies the style of glyphs in the font between normal and italic.
+  ///
+  /// Values must in the range 0.0 (meaning normal, or Roman, as in
+  /// [FontStyle.normal]) to 1.0 (meaning fully italic, as in
+  /// [FontStyle.italic]).
+  ///
+  /// This is distinct from [FontVariation.slant], which leans the characters
+  /// without changing the font style.
+  ///
+  /// See also:
+  ///
+  ///  * <https://learn.microsoft.com/en-us/typography/opentype/spec/dvaraxistag_ital>
+  const FontVariation.italic(this.value) : assert(value >= 0.0), assert(value <= 1.0), axis = 'ital';
+
+  /// Optical size optimization. (`opzs`)
+  ///
+  /// Changes the rendering of the font to be optimized for the given text size.
+  /// Normally, the optical size of the font will be derived from the font size.
+  ///
+  /// This feature could be used when the text represents a particular physical
+  /// font size, for example text in the representation of a hardcopy magazine,
+  /// which does not correspond to the actual font size being used to render the
+  /// text. By setting the optical size explicitly, font variations that might
+  /// be applied as the text is zoomed will be fixed at the size being
+  /// represented by the text.
+  ///
+  /// This feature could also be used to smooth animations. If a font varies its
+  /// rendering as the font size is adjusted, it may appear to "quiver" (or, one
+  /// might even say, "flutter") if the font size is animated. By setting a
+  /// fixed optical size, the rendering can be fixed to one particular style as
+  /// the text size animates.
+  ///
+  /// Values must be greater than zero, and are interpreted as points. A point
+  /// is 1/72 of an inch, or 1.333 logical pixels (96/72).
+  ///
+  /// See also:
+  ///
+  ///  * <https://learn.microsoft.com/en-us/typography/opentype/spec/dvaraxistag_opsz>
+  const FontVariation.opticalSize(this.value) : assert(value > 0.0), axis = 'opsz';
+
+  /// Variable font width. (`slnt`)
+  ///
+  /// Varies the slant of glyphs in the font.
+  ///
+  /// Values must be greater than -90.0 and less than +90.0, and represents the
+  /// angle in _counter-clockwise_ degrees relative to "normal", at 0.0.
+  ///
+  /// For example, to lean the glyphs forward by 45 degrees, one would use
+  /// `FontVariation.slant(-45.0)`.
+  ///
+  /// This is distinct from [FontVariation.italic], in that slant leans the
+  /// characters without changing the font style.
+  ///
+  /// See also:
+  ///
+  ///  * <https://learn.microsoft.com/en-us/typography/opentype/spec/dvaraxistag_slnt>
+  const FontVariation.slant(this.value) : assert(value > -90.0), assert(value < 90.0), axis = 'slnt';
+
+  /// Variable font width. (`wdth`)
+  ///
+  /// Varies the width of glyphs in the font.
+  ///
+  /// Values must be greater than zero, with no upper limit. 100.0 represents
+  /// the "normal" width. Smaller values are "condensed", greater values are
+  /// "extended".
+  ///
+  /// See also:
+  ///
+  ///  * <https://learn.microsoft.com/en-us/typography/opentype/spec/dvaraxistag_wdth>
+  const FontVariation.width(this.value) : assert(value >= 0.0), axis = 'wdth';
+
+  /// Variable font weight. (`wght`)
+  ///
+  /// Varies the stroke thickness of the font, similar to [FontWeight] but on a
+  /// continuous axis.
+  ///
+  /// Values must be in the range 1..1000, and are to be interpreted in a manner
+  /// consistent with the values of [FontWeight]. For instance, `400` is the
+  /// "normal" weight, and `700` is "bold".
+  ///
+  /// See also:
+  ///
+  ///  * <https://learn.microsoft.com/en-us/typography/opentype/spec/dvaraxistag_wght>
+  const FontVariation.weight(this.value) : assert(value >= 1), assert(value <= 1000), axis = 'wght';
 
-  /// The tag that identifies the design axis.  Must consist of 4 ASCII
-  /// characters.
+  // ------------------------------------------------------------------------
+  // End of axis tags list.
+
+  /// The tag that identifies the design axis.
+  ///
+  /// An axis tag must consist of 4 ASCII characters.
   final String axis;
 
   /// The value assigned to this design axis.
   ///
   /// The range of usable values depends on the specification of the axis.
+  ///
+  /// While this property is represented as a [double] in this API
+  /// ([binary64](https://en.wikipedia.org/wiki/Double-precision_floating-point_format)),
+  /// fonts use the fixed-point 16.16 format to represent the value of font
+  /// variations. This means that the actual range is -32768.0 to approximately
+  /// 32767.999985 and in principle the smallest increment between two values is
+  /// approximately 0.000015 (1/65536).
+  ///
+  /// Unfortunately for technical reasons the value is first converted to the
+  /// [binary32 floating point
+  /// format](https://en.wikipedia.org/wiki/Single-precision_floating-point_format),
+  /// which only has 24 bits of precision. This means that for values outside
+  /// the range -256.0 to 256.0, the smallest increment is larger than what is
+  /// technically supported by OpenType. At the extreme edge of the range, the
+  /// smallest increment is only approximately ±0.002.
   final double value;
 
   static const int _kEncodedSize = 8;
@@ -994,10 +1156,92 @@ class FontVariation {
   @override
   int get hashCode => Object.hash(axis, value);
 
+  /// Linearly interpolates between two font variations.
+  ///
+  /// If the two variations have different axis tags, the interpolation switches
+  /// abruptly from one to the other at t=0.5. Otherwise, the value is
+  /// interpolated (see [lerpDouble].
+  ///
+  /// The value is not clamped to the valid values of the axis tag, but it is
+  /// clamped to the valid range of font variations values in general (the range
+  /// of signed 16.16 fixed point numbers).
+  ///
+  /// The `t` argument represents position on the timeline, with 0.0 meaning
+  /// that the interpolation has not started, returning `a` (or something
+  /// equivalent to `a`), 1.0 meaning that the interpolation has finished,
+  /// returning `b` (or something equivalent to `b`), and values in between
+  /// meaning that the interpolation is at the relevant point on the timeline
+  /// between `a` and `b`. The interpolation can be extrapolated beyond 0.0 and
+  /// 1.0, so negative values and values greater than 1.0 are valid (and can
+  /// easily be generated by curves such as [Curves.elasticInOut]).
+  ///
+  /// Values for `t` are usually obtained from an [Animation<double>], such as
+  /// an [AnimationController].
+  static FontVariation? lerp(FontVariation? a, FontVariation? b, double t) {
+    if (a?.axis != b?.axis || (a == null && b == null)) {
+      return t < 0.5 ? a : b;
+    }
+    return FontVariation(
+      a!.axis,
+      clampDouble(lerpDouble(a.value, b!.value, t)!, -32768.0, 32768.0 - 1.0/65536.0),
+    );
+  }
+
   @override
   String toString() => "FontVariation('$axis', $value)";
 }
 
+/// The measurements of a character (or a sequence of visually connected
+/// characters) within a paragraph.
+///
+/// See also:
+///
+///  * [Paragraph.getGlyphInfoAt], which finds the [GlyphInfo] associated with
+///    a code unit in the text.
+///  * [Paragraph.getClosestGlyphInfoForOffset], which finds the [GlyphInfo] of
+///    the glyph(s) onscreen that's closest to the given [Offset].
+final class GlyphInfo {
+  /// Creates a [GlyphInfo] with the specified values.
+  GlyphInfo(this.graphemeClusterLayoutBounds, this.graphemeClusterCodeUnitRange, this.writingDirection);
+
+  GlyphInfo._(double left, double top, double right, double bottom, int graphemeStart, int graphemeEnd, bool isLTR)
+    : graphemeClusterLayoutBounds = Rect.fromLTRB(left, top, right, bottom),
+      graphemeClusterCodeUnitRange = TextRange(start: graphemeStart, end: graphemeEnd),
+      writingDirection = isLTR ? TextDirection.ltr : TextDirection.rtl;
+
+  /// The layout bounding rect of the associated character, in the paragraph's
+  /// coordinates.
+  ///
+  /// This is **not** a tight bounding box that encloses the character's outline.
+  /// The vertical extent reported is derived from the font metrics (instead of
+  /// glyph metrics), and the horizontal extent is the horizontal advance of the
+  /// character.
+  final Rect graphemeClusterLayoutBounds;
+
+  /// The UTF-16 range of the associated character in the text.
+  final TextRange graphemeClusterCodeUnitRange;
+
+  /// The writing direction within the [GlyphInfo].
+  final TextDirection writingDirection;
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) {
+      return true;
+    }
+    return other is GlyphInfo
+        && graphemeClusterLayoutBounds == other.graphemeClusterLayoutBounds
+        && graphemeClusterCodeUnitRange == other.graphemeClusterCodeUnitRange
+        && writingDirection == other.writingDirection;
+  }
+
+  @override
+  int get hashCode => Object.hash(graphemeClusterLayoutBounds, graphemeClusterCodeUnitRange, writingDirection);
+
+  @override
+  String toString() => 'Glyph($graphemeClusterLayoutBounds, textRange: $graphemeClusterCodeUnitRange, direction: $writingDirection)';
+}
+
 /// Whether and how to align text horizontally.
 // The order of this enum must match the order of the values in RenderStyleConstants.h's ETextAlign.
 enum TextAlign {
@@ -1194,7 +1438,7 @@ class TextHeightBehavior {
   /// Whether to apply the [TextStyle.height] modifier to the ascent of the first
   /// line in the paragraph.
   ///
-  /// When true, the [TextStyle.height] modifier will be applied to to the ascent
+  /// When true, the [TextStyle.height] modifier will be applied to the ascent
   /// of the first line. When false, the font's default ascent will be used and
   /// the [TextStyle.height] will have no effect on the ascent of the first line.
   ///
@@ -1206,7 +1450,7 @@ class TextHeightBehavior {
   /// Whether to apply the [TextStyle.height] modifier to the descent of the last
   /// line in the paragraph.
   ///
-  /// When true, the [TextStyle.height] modifier will be applied to to the descent
+  /// When true, the [TextStyle.height] modifier will be applied to the descent
   /// of the last line. When false, the font's default descent will be used and
   /// the [TextStyle.height] will have no effect on the descent of the last line.
   ///
@@ -1555,26 +1799,32 @@ class TextStyle {
   }
 
   @override
-  int get hashCode => Object.hash(
-    Object.hashAll(_encoded),
-    _leadingDistribution,
-    _fontFamily,
-    _fontFamilyFallback,
-    _fontSize,
-    _letterSpacing,
-    _wordSpacing,
-    _height,
-    _locale,
-    _background,
-    _foreground,
-    _shadows == null ? null : Object.hashAll(_shadows!),
-    _decorationThickness,
-    _fontFeatures == null ? null : Object.hashAll(_fontFeatures!),
-    _fontVariations == null ? null : Object.hashAll(_fontVariations!),
-  );
+  int get hashCode {
+    final List<Shadow>? shadows = _shadows;
+    final List<FontFeature>? fontFeatures = _fontFeatures;
+    final List<FontVariation>? fontVariations = _fontVariations;
+    return Object.hash(
+      Object.hashAll(_encoded),
+      _leadingDistribution,
+      _fontFamily,
+      _fontFamilyFallback,
+      _fontSize,
+      _letterSpacing,
+      _wordSpacing,
+      _height,
+      _locale,
+      _background,
+      _foreground,
+      shadows == null ? null : Object.hashAll(shadows),
+      _decorationThickness,
+      fontFeatures == null ? null : Object.hashAll(fontFeatures),
+      fontVariations == null ? null : Object.hashAll(fontVariations),
+    );
+  }
 
   @override
   String toString() {
+    final List<String>? fontFamilyFallback = _fontFamilyFallback;
     return 'TextStyle('
              'color: ${              _encoded[0] & 0x00002 == 0x00002  ? Color(_encoded[1])                           : "unspecified"}, '
              'decoration: ${         _encoded[0] & 0x00004 == 0x00004  ? TextDecoration._(_encoded[2])                : "unspecified"}, '
@@ -1588,8 +1838,8 @@ class TextStyle {
              'fontFamily: ${         _encoded[0] & 0x00200 == 0x00200
                                      && _fontFamily != ''              ? _fontFamily                                  : "unspecified"}, '
              'fontFamilyFallback: ${ _encoded[0] & 0x00200 == 0x00200
-                                     && _fontFamilyFallback != null
-                                     && _fontFamilyFallback!.isNotEmpty ? _fontFamilyFallback                         : "unspecified"}, '
+                                     && fontFamilyFallback != null
+                                     && fontFamilyFallback.isNotEmpty ? fontFamilyFallback                            : "unspecified"}, '
              'fontSize: ${           _encoded[0] & 0x00400 == 0x00400  ? _fontSize                                    : "unspecified"}, '
              'letterSpacing: ${      _encoded[0] & 0x00800 == 0x00800  ? "${_letterSpacing}x"                         : "unspecified"}, '
              'wordSpacing: ${        _encoded[0] & 0x01000 == 0x01000  ? "${_wordSpacing}x"                           : "unspecified"}, '
@@ -1834,8 +2084,9 @@ class ParagraphStyle {
              'fontFamily: ${    _encoded[0] & 0x080 == 0x080 ? _fontFamily                       : "unspecified"}, '
              'fontSize: ${      _encoded[0] & 0x100 == 0x100 ? _fontSize                         : "unspecified"}, '
              'height: ${        _encoded[0] & 0x200 == 0x200 ? "${_height}x"                     : "unspecified"}, '
-             'ellipsis: ${      _encoded[0] & 0x400 == 0x400 ? '"$_ellipsis"'                    : "unspecified"}, '
-             'locale: ${        _encoded[0] & 0x800 == 0x800 ? _locale                           : "unspecified"}'
+             'strutStyle: ${    _encoded[0] & 0x400 == 0x400 ? _strutStyle                       : "unspecified"}, '
+             'ellipsis: ${      _encoded[0] & 0x800 == 0x800 ? '"$_ellipsis"'                    : "unspecified"}, '
+             'locale: ${        _encoded[0] & 0x1000 == 0x1000 ? _locale                         : "unspecified"}'
            ')';
   }
 }
@@ -2059,10 +2310,10 @@ class StrutStyle {
 ///
 /// At the higher levels (specifically starting at the widgets library), an
 /// ambient [Directionality] is introduced, which provides a default. Thus, for
-/// instance, a [Text] widget in the scope of a [MaterialApp] widget does not
-/// need to be given an explicit writing direction. The [Directionality.of]
-/// static method can be used to obtain the ambient text direction for a
-/// particular [BuildContext].
+/// instance, a [widgets.Text] widget in the scope of a [MaterialApp] widget
+/// does not need to be given an explicit writing direction. The
+/// [Directionality.of] static method can be used to obtain the ambient text
+/// direction for a particular [BuildContext].
 ///
 /// ### Known left-to-right biases in Flutter
 ///
@@ -2114,7 +2365,6 @@ enum TextDirection {
 /// A rectangle enclosing a run of text.
 ///
 /// This is similar to [Rect] but includes an inherent [TextDirection].
-@pragma('vm:entry-point')
 class TextBox {
   /// Creates an object that describes a box containing text.
   const TextBox.fromLTRBD(
@@ -2258,8 +2508,7 @@ class TextPosition {
   const TextPosition({
     required this.offset,
     this.affinity = TextAffinity.downstream,
-  }) : assert(offset != null),
-       assert(affinity != null);
+  });
 
   /// The index of the character that immediately follows the position in the
   /// string representation of the text.
@@ -2312,14 +2561,14 @@ class TextRange {
   const TextRange({
     required this.start,
     required this.end,
-  }) : assert(start != null && start >= -1),
-       assert(end != null && end >= -1);
+  }) : assert(start >= -1),
+       assert(end >= -1);
 
   /// A text range that starts and ends at offset.
   ///
   /// The [offset] argument must be non-null and greater than or equal to -1.
   const TextRange.collapsed(int offset)
-      : assert(offset != null && offset >= -1),
+      : assert(offset >= -1),
         start = offset,
         end = offset;
 
@@ -2395,7 +2644,7 @@ class ParagraphConstraints {
   /// The [width] argument must not be null.
   const ParagraphConstraints({
     required this.width,
-  }) : assert(width != null);
+  });
 
   /// The width the paragraph should use whey computing the positions of glyphs.
   ///
@@ -2574,6 +2823,18 @@ class LineMetrics {
     required this.lineNumber,
   });
 
+  LineMetrics._(
+    this.hardBreak,
+    this.ascent,
+    this.descent,
+    this.unscaledAscent,
+    this.height,
+    this.width,
+    this.left,
+    this.baseline,
+    this.lineNumber,
+  );
+
   /// True if this line ends with an explicit line break (e.g. '\n') or is the end
   /// of the paragraph. False otherwise.
   final bool hardBreak;
@@ -2683,59 +2944,42 @@ class LineMetrics {
 ///
 /// Paragraphs can be displayed on a [Canvas] using the [Canvas.drawParagraph]
 /// method.
-@pragma('vm:entry-point')
-class Paragraph extends NativeFieldWrapperClass1 {
-  /// This class is created by the engine, and should not be instantiated
-  /// or extended directly.
-  ///
-  /// To create a [Paragraph] object, use a [ParagraphBuilder].
-  @pragma('vm:entry-point')
-  Paragraph._();
-
-  bool _needsLayout = true;
-
+abstract class Paragraph {
   /// The amount of horizontal space this paragraph occupies.
   ///
   /// Valid only after [layout] has been called.
-  @FfiNative<Double Function(Pointer<Void>)>('Paragraph::width', isLeaf: true)
-  external double get width;
+  double get width;
 
   /// The amount of vertical space this paragraph occupies.
   ///
   /// Valid only after [layout] has been called.
-  @FfiNative<Double Function(Pointer<Void>)>('Paragraph::height', isLeaf: true)
-  external double get height;
+  double get height;
 
   /// The distance from the left edge of the leftmost glyph to the right edge of
   /// the rightmost glyph in the paragraph.
   ///
   /// Valid only after [layout] has been called.
-  @FfiNative<Double Function(Pointer<Void>)>('Paragraph::longestLine', isLeaf: true)
-  external double get longestLine;
+  double get longestLine;
 
   /// The minimum width that this paragraph could be without failing to paint
   /// its contents within itself.
   ///
   /// Valid only after [layout] has been called.
-  @FfiNative<Double Function(Pointer<Void>)>('Paragraph::minIntrinsicWidth', isLeaf: true)
-  external double get minIntrinsicWidth;
+  double get minIntrinsicWidth;
 
   /// Returns the smallest width beyond which increasing the width never
   /// decreases the height.
   ///
   /// Valid only after [layout] has been called.
-  @FfiNative<Double Function(Pointer<Void>)>('Paragraph::maxIntrinsicWidth', isLeaf: true)
-  external double get maxIntrinsicWidth;
+  double get maxIntrinsicWidth;
 
   /// The distance from the top of the paragraph to the alphabetic
   /// baseline of the first line, in logical pixels.
-  @FfiNative<Double Function(Pointer<Void>)>('Paragraph::alphabeticBaseline', isLeaf: true)
-  external double get alphabeticBaseline;
+  double get alphabeticBaseline;
 
   /// The distance from the top of the paragraph to the ideographic
   /// baseline of the first line, in logical pixels.
-  @FfiNative<Double Function(Pointer<Void>)>('Paragraph::ideographicBaseline', isLeaf: true)
-  external double get ideographicBaseline;
+  double get ideographicBaseline;
 
   /// True if there is more vertical content, but the text was truncated, either
   /// because we reached `maxLines` lines of text or because the `maxLines` was
@@ -2744,12 +2988,175 @@ class Paragraph extends NativeFieldWrapperClass1 {
   ///
   /// See the discussion of the `maxLines` and `ellipsis` arguments at
   /// [ParagraphStyle.new].
-  @FfiNative<Bool Function(Pointer<Void>)>('Paragraph::didExceedMaxLines', isLeaf: true)
-  external bool get didExceedMaxLines;
+  bool get didExceedMaxLines;
 
   /// Computes the size and position of each glyph in the paragraph.
   ///
   /// The [ParagraphConstraints] control how wide the text is allowed to be.
+  void layout(ParagraphConstraints constraints);
+
+  /// Returns a list of text boxes that enclose the given text range.
+  ///
+  /// The [boxHeightStyle] and [boxWidthStyle] parameters allow customization
+  /// of how the boxes are bound vertically and horizontally. Both style
+  /// parameters default to the tight option, which will provide close-fitting
+  /// boxes and will not account for any line spacing.
+  ///
+  /// Coordinates of the TextBox are relative to the upper-left corner of the paragraph,
+  /// where positive y values indicate down.
+  ///
+  /// The [boxHeightStyle] and [boxWidthStyle] parameters must not be null.
+  ///
+  /// See [BoxHeightStyle] and [BoxWidthStyle] for full descriptions of each option.
+  List<TextBox> getBoxesForRange(int start, int end, {BoxHeightStyle boxHeightStyle = BoxHeightStyle.tight, BoxWidthStyle boxWidthStyle = BoxWidthStyle.tight});
+
+  /// Returns a list of text boxes that enclose all placeholders in the paragraph.
+  ///
+  /// The order of the boxes are in the same order as passed in through
+  /// [ParagraphBuilder.addPlaceholder].
+  ///
+  /// Coordinates of the [TextBox] are relative to the upper-left corner of the paragraph,
+  /// where positive y values indicate down.
+  List<TextBox> getBoxesForPlaceholders();
+
+  /// Returns the text position closest to the given offset.
+  ///
+  /// This method always returns a [TextPosition] for any given [offset], even
+  /// when the [offset] is not close to any text, or when the paragraph is empty.
+  /// This is useful for determining the text to select when the user drags the
+  /// text selection handle.
+  ///
+  /// See also:
+  ///
+  ///  * [getClosestGlyphInfoForOffset], which returns more information about
+  ///    the closest character to an [Offset].
+  TextPosition getPositionForOffset(Offset offset);
+
+  /// Returns the [GlyphInfo] of the glyph closest to the given `offset` in the
+  /// paragraph coordinate system, or null if if the text is empty, or is
+  /// entirely clipped or ellipsized away.
+  ///
+  /// This method first finds the line closest to `offset.dy`, and then returns
+  /// the [GlyphInfo] of the closest glyph(s) within that line.
+  GlyphInfo? getClosestGlyphInfoForOffset(Offset offset);
+
+  /// Returns the [GlyphInfo] located at the given UTF-16 `codeUnitOffset` in
+  /// the paragraph, or null if the given `codeUnitOffset` is out of the visible
+  /// lines or is ellipsized.
+  GlyphInfo? getGlyphInfoAt(int codeUnitOffset);
+
+  /// Returns the [TextRange] of the word at the given [TextPosition].
+  ///
+  /// Characters not part of a word, such as spaces, symbols, and punctuation,
+  /// have word breaks on both sides. In such cases, this method will return
+  /// (offset, offset+1). Word boundaries are defined more precisely in Unicode
+  /// Standard Annex #29 http://www.unicode.org/reports/tr29/#Word_Boundaries
+  ///
+  /// The [TextPosition] is treated as caret position, its [TextPosition.affinity]
+  /// is used to determine which character this position points to. For example,
+  /// the word boundary at `TextPosition(offset: 5, affinity: TextPosition.upstream)`
+  /// of the `string = 'Hello word'` will return range (0, 5) because the position
+  /// points to the character 'o' instead of the space.
+  TextRange getWordBoundary(TextPosition position);
+
+  /// Returns the [TextRange] of the line at the given [TextPosition].
+  ///
+  /// The newline (if any) is returned as part of the range.
+  ///
+  /// Not valid until after layout.
+  ///
+  /// This can potentially be expensive, since it needs to compute the line
+  /// metrics, so use it sparingly.
+  TextRange getLineBoundary(TextPosition position);
+
+  /// Returns the full list of [LineMetrics] that describe in detail the various
+  /// metrics of each laid out line.
+  ///
+  /// Not valid until after layout.
+  ///
+  /// This can potentially return a large amount of data, so it is not recommended
+  /// to repeatedly call this. Instead, cache the results.
+  List<LineMetrics> computeLineMetrics();
+
+  /// Returns the [LineMetrics] for the line at `lineNumber`, or null if the
+  /// given `lineNumber` is greater than or equal to [numberOfLines].
+  LineMetrics? getLineMetricsAt(int lineNumber);
+
+  /// The total number of visible lines in the paragraph.
+  ///
+  /// Returns a non-negative number. If `maxLines` is non-null, the value of
+  /// [numberOfLines] never exceeds `maxLines`.
+  int get numberOfLines;
+
+  /// Returns the line number of the line that contains the code unit that
+  /// `codeUnitOffset` points to.
+  ///
+  /// This method returns null if the given `codeUnitOffset` is out of bounds, or
+  /// is logically after the last visible codepoint. This includes the case where
+  /// its codepoint belongs to a visible line, but the text layout library
+  /// replaced it with an ellipsis.
+  ///
+  /// If the target code unit points to a control character that introduces
+  /// mandatory line breaks (most notably the line feed character `LF`, typically
+  /// represented in strings as the escape sequence "\n"), to conform to
+  /// [the unicode rules](https://unicode.org/reports/tr14/#LB4), the control
+  /// character itself is always considered to be at the end of "current" line
+  /// rather than the beginning of the new line.
+  int? getLineNumberAt(int codeUnitOffset);
+
+  /// Release the resources used by this object. The object is no longer usable
+  /// after this method is called.
+  void dispose();
+
+  /// Whether this reference to the underlying picture is [dispose]d.
+  ///
+  /// This only returns a valid value if asserts are enabled, and must not be
+  /// used otherwise.
+  bool get debugDisposed;
+}
+
+base class _NativeParagraph extends NativeFieldWrapperClass1 implements Paragraph {
+  /// This class is created by the engine, and should not be instantiated
+  /// or extended directly.
+  ///
+  /// To create a [Paragraph] object, use a [ParagraphBuilder].
+  _NativeParagraph._();
+
+  bool _needsLayout = true;
+
+  @override
+  @Native<Double Function(Pointer<Void>)>(symbol: 'Paragraph::width', isLeaf: true)
+  external double get width;
+
+  @override
+  @Native<Double Function(Pointer<Void>)>(symbol: 'Paragraph::height', isLeaf: true)
+  external double get height;
+
+  @override
+  @Native<Double Function(Pointer<Void>)>(symbol: 'Paragraph::longestLine', isLeaf: true)
+  external double get longestLine;
+
+  @override
+  @Native<Double Function(Pointer<Void>)>(symbol: 'Paragraph::minIntrinsicWidth', isLeaf: true)
+  external double get minIntrinsicWidth;
+
+  @override
+  @Native<Double Function(Pointer<Void>)>(symbol: 'Paragraph::maxIntrinsicWidth', isLeaf: true)
+  external double get maxIntrinsicWidth;
+
+  @override
+  @Native<Double Function(Pointer<Void>)>(symbol: 'Paragraph::alphabeticBaseline', isLeaf: true)
+  external double get alphabeticBaseline;
+
+  @override
+  @Native<Double Function(Pointer<Void>)>(symbol: 'Paragraph::ideographicBaseline', isLeaf: true)
+  external double get ideographicBaseline;
+
+  @override
+  @Native<Bool Function(Pointer<Void>)>(symbol: 'Paragraph::didExceedMaxLines', isLeaf: true)
+  external bool get didExceedMaxLines;
+
+  @override
   void layout(ParagraphConstraints constraints) {
     _layout(constraints.width);
     assert(() {
@@ -2757,7 +3164,7 @@ class Paragraph extends NativeFieldWrapperClass1 {
       return true;
     }());
   }
-  @FfiNative<Void Function(Pointer<Void>, Double)>('Paragraph::layout', isLeaf: true)
+  @Native<Void Function(Pointer<Void>, Double)>(symbol: 'Paragraph::layout', isLeaf: true)
   external void _layout(double width);
 
   List<TextBox> _decodeTextBoxes(Float32List encoded) {
@@ -2776,89 +3183,59 @@ class Paragraph extends NativeFieldWrapperClass1 {
     return boxes;
   }
 
-  /// Returns a list of text boxes that enclose the given text range.
-  ///
-  /// The [boxHeightStyle] and [boxWidthStyle] parameters allow customization
-  /// of how the boxes are bound vertically and horizontally. Both style
-  /// parameters default to the tight option, which will provide close-fitting
-  /// boxes and will not account for any line spacing.
-  ///
-  /// Coordinates of the TextBox are relative to the upper-left corner of the paragraph,
-  /// where positive y values indicate down.
-  ///
-  /// The [boxHeightStyle] and [boxWidthStyle] parameters must not be null.
-  ///
-  /// See [BoxHeightStyle] and [BoxWidthStyle] for full descriptions of each option.
+  @override
   List<TextBox> getBoxesForRange(int start, int end, {BoxHeightStyle boxHeightStyle = BoxHeightStyle.tight, BoxWidthStyle boxWidthStyle = BoxWidthStyle.tight}) {
-    assert(boxHeightStyle != null);
-    assert(boxWidthStyle != null);
     return _decodeTextBoxes(_getBoxesForRange(start, end, boxHeightStyle.index, boxWidthStyle.index));
   }
 
   // See paragraph.cc for the layout of this return value.
-  @FfiNative<Handle Function(Pointer<Void>, Uint32, Uint32, Uint32, Uint32)>('Paragraph::getRectsForRange')
+  @Native<Handle Function(Pointer<Void>, Uint32, Uint32, Uint32, Uint32)>(symbol: 'Paragraph::getRectsForRange')
   external Float32List _getBoxesForRange(int start, int end, int boxHeightStyle, int boxWidthStyle);
 
-  /// Returns a list of text boxes that enclose all placeholders in the paragraph.
-  ///
-  /// The order of the boxes are in the same order as passed in through
-  /// [ParagraphBuilder.addPlaceholder].
-  ///
-  /// Coordinates of the [TextBox] are relative to the upper-left corner of the paragraph,
-  /// where positive y values indicate down.
+  @override
   List<TextBox> getBoxesForPlaceholders() {
     return _decodeTextBoxes(_getBoxesForPlaceholders());
   }
 
-  @FfiNative<Handle Function(Pointer<Void>)>('Paragraph::getRectsForPlaceholders')
+  @Native<Handle Function(Pointer<Void>)>(symbol: 'Paragraph::getRectsForPlaceholders')
   external Float32List _getBoxesForPlaceholders();
 
-  /// Returns the text position closest to the given offset.
+  @override
   TextPosition getPositionForOffset(Offset offset) {
     final List<int> encoded = _getPositionForOffset(offset.dx, offset.dy);
     return TextPosition(offset: encoded[0], affinity: TextAffinity.values[encoded[1]]);
   }
 
-  @FfiNative<Handle Function(Pointer<Void>, Double, Double)>('Paragraph::getPositionForOffset')
+  @Native<Handle Function(Pointer<Void>, Double, Double)>(symbol: 'Paragraph::getPositionForOffset')
   external List<int> _getPositionForOffset(double dx, double dy);
 
-  /// Returns the [TextRange] of the word at the given [TextPosition].
-  ///
-  /// Characters not part of a word, such as spaces, symbols, and punctuation,
-  /// have word breaks on both sides. In such cases, this method will return
-  /// [offset, offset+1]. Word boundaries are defined more precisely in Unicode
-  /// Standard Annex #29 http://www.unicode.org/reports/tr29/#Word_Boundaries
-  ///
-  /// The [TextPosition] is treated as caret position, its [TextPosition.affinity]
-  /// is used to determine which character this position points to. For example,
-  /// the word boundary at `TextPosition(offset: 5, affinity: TextPosition.upstream)`
-  /// of the `string = 'Hello word'` will return range (0, 5) because the position
-  /// points to the character 'o' instead of the space.
+  @override
+  GlyphInfo? getGlyphInfoAt(int codeUnitOffset) => _getGlyphInfoAt(codeUnitOffset, GlyphInfo._);
+  @Native<Handle Function(Pointer<Void>, Uint32, Handle)>(symbol: 'Paragraph::getGlyphInfoAt')
+  external GlyphInfo? _getGlyphInfoAt(int codeUnitOffset, Function constructor);
+
+  @override
+  GlyphInfo? getClosestGlyphInfoForOffset(Offset offset) => _getClosestGlyphInfoForOffset(offset.dx, offset.dy, GlyphInfo._);
+  @Native<Handle Function(Pointer<Void>, Double, Double, Handle)>(symbol: 'Paragraph::getClosestGlyphInfo')
+  external GlyphInfo? _getClosestGlyphInfoForOffset(double dx, double dy, Function constructor);
+
+  @override
   TextRange getWordBoundary(TextPosition position) {
     final int characterPosition;
     switch (position.affinity) {
       case TextAffinity.upstream:
         characterPosition = position.offset - 1;
-        break;
       case TextAffinity.downstream:
         characterPosition = position.offset;
-        break;
     }
     final List<int> boundary = _getWordBoundary(characterPosition);
     return TextRange(start: boundary[0], end: boundary[1]);
   }
 
-  @FfiNative<Handle Function(Pointer<Void>, Uint32)>('Paragraph::getWordBoundary')
+  @Native<Handle Function(Pointer<Void>, Uint32)>(symbol: 'Paragraph::getWordBoundary')
   external List<int> _getWordBoundary(int offset);
 
-  /// Returns the [TextRange] of the line at the given [TextPosition].
-  ///
-  /// The newline (if any) is returned as part of the range.
-  ///
-  /// Not valid until after layout.
-  ///
-  /// This can potentially be expensive, since it needs to compute the line
-  /// metrics, so use it sparingly.
+  @override
   TextRange getLineBoundary(TextPosition position) {
     final List<int> boundary = _getLineBoundary(position.offset);
     final TextRange line = TextRange(start: boundary[0], end: boundary[1]);
@@ -2880,22 +3257,16 @@ class Paragraph extends NativeFieldWrapperClass1 {
     return line;
   }
 
-  @FfiNative<Handle Function(Pointer<Void>, Uint32)>('Paragraph::getLineBoundary')
+  @Native<Handle Function(Pointer<Void>, Uint32)>(symbol: 'Paragraph::getLineBoundary')
   external List<int> _getLineBoundary(int offset);
 
   // Redirecting the paint function in this way solves some dependency problems
   // in the C++ code. If we straighten out the C++ dependencies, we can remove
   // this indirection.
-  @FfiNative<Void Function(Pointer<Void>, Pointer<Void>, Double, Double)>('Paragraph::paint')
-  external void _paint(Canvas canvas, double x, double y);
+  @Native<Void Function(Pointer<Void>, Pointer<Void>, Double, Double)>(symbol: 'Paragraph::paint')
+  external void _paint(_NativeCanvas canvas, double x, double y);
 
-  /// Returns the full list of [LineMetrics] that describe in detail the various
-  /// metrics of each laid out line.
-  ///
-  /// Not valid until after layout.
-  ///
-  /// This can potentially return a large amount of data, so it is not recommended
-  /// to repeatedly call this. Instead, cache the results.
+  @override
   List<LineMetrics> computeLineMetrics() {
     final Float64List encoded = _computeLineMetrics();
     final int count = encoded.length ~/ 9;
@@ -2917,11 +3288,27 @@ class Paragraph extends NativeFieldWrapperClass1 {
     return metrics;
   }
 
-  @FfiNative<Handle Function(Pointer<Void>)>('Paragraph::computeLineMetrics')
+  @Native<Handle Function(Pointer<Void>)>(symbol: 'Paragraph::computeLineMetrics')
   external Float64List _computeLineMetrics();
 
-  /// Release the resources used by this object. The object is no longer usable
-  /// after this method is called.
+  @override
+  LineMetrics? getLineMetricsAt(int lineNumber) => _getLineMetricsAt(lineNumber, LineMetrics._);
+  @Native<Handle Function(Pointer<Void>, Uint32, Handle)>(symbol: 'Paragraph::getLineMetricsAt')
+  external LineMetrics? _getLineMetricsAt(int lineNumber, Function constructor);
+
+  @override
+  @Native<Uint32 Function(Pointer<Void>)>(symbol: 'Paragraph::getNumberOfLines')
+  external int get numberOfLines;
+
+  @override
+  int? getLineNumberAt(int codeUnitOffset) {
+    final int lineNumber = _getLineNumber(codeUnitOffset);
+    return lineNumber < 0 ? null : lineNumber;
+  }
+  @Native<Int32 Function(Pointer<Void>, Uint32)>(symbol: 'Paragraph::getLineNumberAt')
+  external int _getLineNumber(int codeUnitOffset);
+
+  @override
   void dispose() {
     assert(!_disposed);
     assert(() {
@@ -2933,14 +3320,12 @@ class Paragraph extends NativeFieldWrapperClass1 {
 
   /// This can't be a leaf call because the native function calls Dart API
   /// (Dart_SetNativeInstanceField).
-  @FfiNative<Void Function(Pointer<Void>)>('Paragraph::dispose')
+  @Native<Void Function(Pointer<Void>)>(symbol: 'Paragraph::dispose')
   external void _dispose();
 
   bool _disposed = false;
-  /// Whether this reference to the underlying picture is [dispose]d.
-  ///
-  /// This only returns a valid value if asserts are enabled, and must not be
-  /// used otherwise.
+
+  @override
   bool get debugDisposed {
     bool? disposed;
     assert(() {
@@ -2949,6 +3334,27 @@ class Paragraph extends NativeFieldWrapperClass1 {
     }());
     return disposed ?? (throw StateError('$runtimeType.debugDisposed is only available when asserts are enabled.'));
   }
+
+  @override
+  String toString() {
+    String? result;
+    assert(() {
+      if (_disposed && _needsLayout) {
+        result = 'Paragraph(DISPOSED while dirty)';
+      }
+      if (_disposed && !_needsLayout) {
+        result = 'Paragraph(DISPOSED)';
+      }
+      return true;
+    }());
+    if (result != null) {
+      return result!;
+    }
+    if (_needsLayout) {
+      return 'Paragraph(dirty)';
+    }
+    return 'Paragraph()';
+  }
 }
 
 /// Builds a [Paragraph] containing text with the given styling information.
@@ -2965,12 +3371,98 @@ class Paragraph extends NativeFieldWrapperClass1 {
 ///
 /// After constructing a [Paragraph], call [Paragraph.layout] on it and then
 /// paint it with [Canvas.drawParagraph].
-class ParagraphBuilder extends NativeFieldWrapperClass1 {
-
+abstract class ParagraphBuilder {
   /// Creates a new [ParagraphBuilder] object, which is used to create a
   /// [Paragraph].
-  @pragma('vm:entry-point')
-  ParagraphBuilder(ParagraphStyle style)
+  factory ParagraphBuilder(ParagraphStyle style) = _NativeParagraphBuilder;
+
+  /// The number of placeholders currently in the paragraph.
+  int get placeholderCount;
+
+  /// The scales of the placeholders in the paragraph.
+  List<double> get placeholderScales;
+
+  /// Applies the given style to the added text until [pop] is called.
+  ///
+  /// See [pop] for details.
+  void pushStyle(TextStyle style);
+
+  /// Ends the effect of the most recent call to [pushStyle].
+  ///
+  /// Internally, the paragraph builder maintains a stack of text styles. Text
+  /// added to the paragraph is affected by all the styles in the stack. Calling
+  /// [pop] removes the topmost style in the stack, leaving the remaining styles
+  /// in effect.
+  void pop();
+
+  /// Adds the given text to the paragraph.
+  ///
+  /// The text will be styled according to the current stack of text styles.
+  void addText(String text);
+
+  /// Adds an inline placeholder space to the paragraph.
+  ///
+  /// The paragraph will contain a rectangular space with no text of the dimensions
+  /// specified.
+  ///
+  /// The `width` and `height` parameters specify the size of the placeholder rectangle.
+  ///
+  /// The `alignment` parameter specifies how the placeholder rectangle will be vertically
+  /// aligned with the surrounding text. When [PlaceholderAlignment.baseline],
+  /// [PlaceholderAlignment.aboveBaseline], and [PlaceholderAlignment.belowBaseline]
+  /// alignment modes are used, the baseline needs to be set with the `baseline`.
+  /// When using [PlaceholderAlignment.baseline], `baselineOffset` indicates the distance
+  /// of the baseline down from the top of the rectangle. The default `baselineOffset`
+  /// is the `height`.
+  ///
+  /// Examples:
+  ///
+  /// * For a 30x50 placeholder with the bottom edge aligned with the bottom of the text, use:
+  /// `addPlaceholder(30, 50, PlaceholderAlignment.bottom);`
+  /// * For a 30x50 placeholder that is vertically centered around the text, use:
+  /// `addPlaceholder(30, 50, PlaceholderAlignment.middle);`.
+  /// * For a 30x50 placeholder that sits completely on top of the alphabetic baseline, use:
+  /// `addPlaceholder(30, 50, PlaceholderAlignment.aboveBaseline, baseline: TextBaseline.alphabetic)`.
+  /// * For a 30x50 placeholder with 40 pixels above and 10 pixels below the alphabetic baseline, use:
+  /// `addPlaceholder(30, 50, PlaceholderAlignment.baseline, baseline: TextBaseline.alphabetic, baselineOffset: 40)`.
+  ///
+  /// Lines are permitted to break around each placeholder.
+  ///
+  /// Decorations will be drawn based on the font defined in the most recently
+  /// pushed [TextStyle]. The decorations are drawn as if unicode text were present
+  /// in the placeholder space, and will draw the same regardless of the height and
+  /// alignment of the placeholder. To hide or manually adjust decorations to fit,
+  /// a text style with the desired decoration behavior should be pushed before
+  /// adding a placeholder.
+  ///
+  /// Any decorations drawn through a placeholder will exist on the same canvas/layer
+  /// as the text. This means any content drawn on top of the space reserved by
+  /// the placeholder will be drawn over the decoration, possibly obscuring the
+  /// decoration.
+  ///
+  /// Placeholders are represented by a unicode 0xFFFC "object replacement character"
+  /// in the text buffer. For each placeholder, one object replacement character is
+  /// added on to the text buffer.
+  ///
+  /// The `scale` parameter will scale the `width` and `height` by the specified amount,
+  /// and keep track of the scale. The scales of placeholders added can be accessed
+  /// through [placeholderScales]. This is primarily used for accessibility scaling.
+  void addPlaceholder(double width, double height, PlaceholderAlignment alignment, {
+    double scale = 1.0,
+    double? baselineOffset,
+    TextBaseline? baseline,
+  });
+
+  /// Applies the given paragraph style and returns a [Paragraph] containing the
+  /// added text and associated styling.
+  ///
+  /// After calling this function, the paragraph builder object is invalid and
+  /// cannot be used further.
+  Paragraph build();
+}
+
+base class _NativeParagraphBuilder extends NativeFieldWrapperClass1 implements ParagraphBuilder {
+  _NativeParagraphBuilder(ParagraphStyle style)
     : _defaultLeadingDistribution = style._leadingDistribution {
       List<String>? strutFontFamilies;
       final StrutStyle? strutStyle = style._strutStyle;
@@ -3000,11 +3492,11 @@ class ParagraphBuilder extends NativeFieldWrapperClass1 {
         style._fontSize ?? 0,
         style._height ?? 0,
         style._ellipsis ?? '',
-        _encodeLocale(style._locale)
+        _encodeLocale(style._locale),
       );
   }
 
-  @FfiNative<Void Function(Handle, Handle, Handle, Handle, Handle, Double, Double, Handle, Handle)>('ParagraphBuilder::Create')
+  @Native<Void Function(Handle, Handle, Handle, Handle, Handle, Double, Double, Handle, Handle)>(symbol: 'ParagraphBuilder::Create')
   external void _constructor(
       Int32List encoded,
       ByteData? strutData,
@@ -3013,25 +3505,26 @@ class ParagraphBuilder extends NativeFieldWrapperClass1 {
       double fontSize,
       double height,
       String ellipsis,
-      String locale);
+      String locale,
+  );
 
-  /// The number of placeholders currently in the paragraph.
+  @override
   int get placeholderCount => _placeholderCount;
   int _placeholderCount = 0;
 
-  /// The scales of the placeholders in the paragraph.
+  @override
   List<double> get placeholderScales => _placeholderScales;
   final List<double> _placeholderScales = <double>[];
 
   final TextLeadingDistribution _defaultLeadingDistribution;
-  /// Applies the given style to the added text until [pop] is called.
-  ///
-  /// See [pop] for details.
+
+  @override
   void pushStyle(TextStyle style) {
     final List<String> fullFontFamilies = <String>[];
     fullFontFamilies.add(style._fontFamily);
-    if (style._fontFamilyFallback != null) {
-      fullFontFamilies.addAll(style._fontFamilyFallback!);
+    final List<String>? fontFamilyFallback = style._fontFamilyFallback;
+    if (fontFamilyFallback != null) {
+      fullFontFamilies.addAll(fontFamilyFallback);
     }
 
     final Int32List encoded = style._encoded;
@@ -3084,7 +3577,7 @@ class ParagraphBuilder extends NativeFieldWrapperClass1 {
     );
   }
 
-  @FfiNative<
+  @Native<
       Void Function(
           Pointer<Void>,
           Handle,
@@ -3101,7 +3594,7 @@ class ParagraphBuilder extends NativeFieldWrapperClass1 {
           Handle,
           Handle,
           Handle,
-          Handle)>('ParagraphBuilder::pushStyle')
+          Handle)>(symbol: 'ParagraphBuilder::pushStyle')
   external void _pushStyle(
     Int32List encoded,
     List<Object?> fontFamilies,
@@ -3122,18 +3615,11 @@ class ParagraphBuilder extends NativeFieldWrapperClass1 {
 
   static String _encodeLocale(Locale? locale) => locale?.toString() ?? '';
 
-  /// Ends the effect of the most recent call to [pushStyle].
-  ///
-  /// Internally, the paragraph builder maintains a stack of text styles. Text
-  /// added to the paragraph is affected by all the styles in the stack. Calling
-  /// [pop] removes the topmost style in the stack, leaving the remaining styles
-  /// in effect.
-  @FfiNative<Void Function(Pointer<Void>)>('ParagraphBuilder::pop', isLeaf: true)
+  @override
+  @Native<Void Function(Pointer<Void>)>(symbol: 'ParagraphBuilder::pop', isLeaf: true)
   external void pop();
 
-  /// Adds the given text to the paragraph.
-  ///
-  /// The text will be styled according to the current stack of text styles.
+  @override
   void addText(String text) {
     final String? error = _addText(text);
     if (error != null) {
@@ -3141,56 +3627,10 @@ class ParagraphBuilder extends NativeFieldWrapperClass1 {
     }
   }
 
-  @FfiNative<Handle Function(Pointer<Void>, Handle)>('ParagraphBuilder::addText')
+  @Native<Handle Function(Pointer<Void>, Handle)>(symbol: 'ParagraphBuilder::addText')
   external String? _addText(String text);
 
-  /// Adds an inline placeholder space to the paragraph.
-  ///
-  /// The paragraph will contain a rectangular space with no text of the dimensions
-  /// specified.
-  ///
-  /// The `width` and `height` parameters specify the size of the placeholder rectangle.
-  ///
-  /// The `alignment` parameter specifies how the placeholder rectangle will be vertically
-  /// aligned with the surrounding text. When [PlaceholderAlignment.baseline],
-  /// [PlaceholderAlignment.aboveBaseline], and [PlaceholderAlignment.belowBaseline]
-  /// alignment modes are used, the baseline needs to be set with the `baseline`.
-  /// When using [PlaceholderAlignment.baseline], `baselineOffset` indicates the distance
-  /// of the baseline down from the top of the rectangle. The default `baselineOffset`
-  /// is the `height`.
-  ///
-  /// Examples:
-  ///
-  /// * For a 30x50 placeholder with the bottom edge aligned with the bottom of the text, use:
-  /// `addPlaceholder(30, 50, PlaceholderAlignment.bottom);`
-  /// * For a 30x50 placeholder that is vertically centered around the text, use:
-  /// `addPlaceholder(30, 50, PlaceholderAlignment.middle);`.
-  /// * For a 30x50 placeholder that sits completely on top of the alphabetic baseline, use:
-  /// `addPlaceholder(30, 50, PlaceholderAlignment.aboveBaseline, baseline: TextBaseline.alphabetic)`.
-  /// * For a 30x50 placeholder with 40 pixels above and 10 pixels below the alphabetic baseline, use:
-  /// `addPlaceholder(30, 50, PlaceholderAlignment.baseline, baseline: TextBaseline.alphabetic, baselineOffset: 40)`.
-  ///
-  /// Lines are permitted to break around each placeholder.
-  ///
-  /// Decorations will be drawn based on the font defined in the most recently
-  /// pushed [TextStyle]. The decorations are drawn as if unicode text were present
-  /// in the placeholder space, and will draw the same regardless of the height and
-  /// alignment of the placeholder. To hide or manually adjust decorations to fit,
-  /// a text style with the desired decoration behavior should be pushed before
-  /// adding a placeholder.
-  ///
-  /// Any decorations drawn through a placeholder will exist on the same canvas/layer
-  /// as the text. This means any content drawn on top of the space reserved by
-  /// the placeholder will be drawn over the decoration, possibly obscuring the
-  /// decoration.
-  ///
-  /// Placeholders are represented by a unicode 0xFFFC "object replacement character"
-  /// in the text buffer. For each placeholder, one object replacement character is
-  /// added on to the text buffer.
-  ///
-  /// The `scale` parameter will scale the `width` and `height` by the specified amount,
-  /// and keep track of the scale. The scales of placeholders added can be accessed
-  /// through [placeholderScales]. This is primarily used for accessibility scaling.
+  @override
   void addPlaceholder(double width, double height, PlaceholderAlignment alignment, {
     double scale = 1.0,
     double? baselineOffset,
@@ -3208,22 +3648,21 @@ class ParagraphBuilder extends NativeFieldWrapperClass1 {
     _placeholderScales.add(scale);
   }
 
-  @FfiNative<Void Function(Pointer<Void>, Double, Double, Uint32, Double, Uint32)>('ParagraphBuilder::addPlaceholder')
+  @Native<Void Function(Pointer<Void>, Double, Double, Uint32, Double, Uint32)>(symbol: 'ParagraphBuilder::addPlaceholder')
   external void _addPlaceholder(double width, double height, int alignment, double baselineOffset, int baseline);
 
-  /// Applies the given paragraph style and returns a [Paragraph] containing the
-  /// added text and associated styling.
-  ///
-  /// After calling this function, the paragraph builder object is invalid and
-  /// cannot be used further.
+  @override
   Paragraph build() {
-    final Paragraph paragraph = Paragraph._();
+    final _NativeParagraph paragraph = _NativeParagraph._();
     _build(paragraph);
     return paragraph;
   }
 
-  @FfiNative<Void Function(Pointer<Void>, Handle)>('ParagraphBuilder::build')
-  external void _build(Paragraph outParagraph);
+  @Native<Void Function(Pointer<Void>, Handle)>(symbol: 'ParagraphBuilder::build')
+  external void _build(_NativeParagraph outParagraph);
+
+  @override
+  String toString() => 'ParagraphBuilder';
 }
 
 /// Loads a font from a buffer and makes it available for rendering text.
@@ -3240,7 +3679,7 @@ Future<void> loadFontFromList(Uint8List list, {String? fontFamily}) {
   ).then((_) => _sendFontChangeMessage());
 }
 
-final ByteData _fontChangeMessage = utf8.encoder.convert(
+final ByteData _fontChangeMessage = utf8.encode(
   json.encode(<String, Object?>{'type': 'fontsChange'})
 ).buffer.asByteData();
 
@@ -3259,5 +3698,5 @@ FutureOr<void> _sendFontChangeMessage() async {
   }
 }
 
-@FfiNative<Void Function(Handle, Handle, Handle)>('FontCollection::LoadFontFromList')
+@Native<Void Function(Handle, Handle, Handle)>(symbol: 'FontCollection::LoadFontFromList')
 external void _loadFontFromList(Uint8List list, _Callback<void> callback, String fontFamily);
diff --git a/lib/ui/text/asset_manager_font_provider.cc b/lib/ui/text/asset_manager_font_provider.cc
index fe3d258cfd0419d6420b2beae0a92dde0267c696..519da3726e676795c47beb88c9315054d50447f2 100644
--- a/lib/ui/text/asset_manager_font_provider.cc
+++ b/lib/ui/text/asset_manager_font_provider.cc
@@ -8,9 +8,11 @@
 
 #include "flutter/fml/logging.h"
 #include "third_party/skia/include/core/SkData.h"
+#include "third_party/skia/include/core/SkFontMgr.h"
 #include "third_party/skia/include/core/SkStream.h"
 #include "third_party/skia/include/core/SkString.h"
 #include "third_party/skia/include/core/SkTypeface.h"
+#include "txt/platform.h"
 
 namespace flutter {
 
@@ -40,14 +42,13 @@ std::string AssetManagerFontProvider::GetFamilyName(int index) const {
 }
 
 // |FontAssetProvider|
-SkFontStyleSet* AssetManagerFontProvider::MatchFamily(
+sk_sp<SkFontStyleSet> AssetManagerFontProvider::MatchFamily(
     const std::string& family_name) {
   auto found = registered_families_.find(CanonicalFamilyName(family_name));
   if (found == registered_families_.end()) {
     return nullptr;
   }
-  sk_sp<SkFontStyleSet> font_style_set = found->second;
-  return font_style_set.release();
+  return found->second;
 }
 
 void AssetManagerFontProvider::RegisterAsset(const std::string& family_name,
@@ -97,7 +98,7 @@ void AssetManagerFontStyleSet::getStyle(int index,
   }
 }
 
-SkTypeface* AssetManagerFontStyleSet::createTypeface(int i) {
+auto AssetManagerFontStyleSet::createTypeface(int i) -> CreateTypefaceRet {
   size_t index = i;
   if (index >= assets_.size()) {
     return nullptr;
@@ -117,8 +118,9 @@ SkTypeface* AssetManagerFontStyleSet::createTypeface(int i) {
         MappingReleaseProc, asset_mapping_ptr);
     std::unique_ptr<SkMemoryStream> stream = SkMemoryStream::Make(asset_data);
 
+    sk_sp<SkFontMgr> font_mgr = txt::GetDefaultFontManager();
     // Ownership of the stream is transferred.
-    asset.typeface = SkTypeface::MakeFromStream(std::move(stream));
+    asset.typeface = font_mgr->makeFromStream(std::move(stream));
     if (!asset.typeface) {
       FML_DLOG(ERROR) << "Unable to load font asset for family: "
                       << family_name_;
@@ -126,10 +128,11 @@ SkTypeface* AssetManagerFontStyleSet::createTypeface(int i) {
     }
   }
 
-  return SkRef(asset.typeface.get());
+  return CreateTypefaceRet(SkRef(asset.typeface.get()));
 }
 
-SkTypeface* AssetManagerFontStyleSet::matchStyle(const SkFontStyle& pattern) {
+auto AssetManagerFontStyleSet::matchStyle(const SkFontStyle& pattern)
+    -> MatchStyleRet {
   return matchStyleCSS3(pattern);
 }
 
diff --git a/lib/ui/text/asset_manager_font_provider.h b/lib/ui/text/asset_manager_font_provider.h
index ba78ad2ecd45a5955c46634ad4cc672cfc14cff8..6ff5322c7548d20cbd4a1cd64ffde5478a3f7056 100644
--- a/lib/ui/text/asset_manager_font_provider.h
+++ b/lib/ui/text/asset_manager_font_provider.h
@@ -34,10 +34,14 @@ class AssetManagerFontStyleSet : public SkFontStyleSet {
   void getStyle(int index, SkFontStyle*, SkString* style) override;
 
   // |SkFontStyleSet|
-  SkTypeface* createTypeface(int index) override;
+  using CreateTypefaceRet =
+      decltype(std::declval<SkFontStyleSet>().createTypeface(0));
+  CreateTypefaceRet createTypeface(int index) override;
 
   // |SkFontStyleSet|
-  SkTypeface* matchStyle(const SkFontStyle& pattern) override;
+  using MatchStyleRet = decltype(std::declval<SkFontStyleSet>().matchStyle(
+      std::declval<SkFontStyle>()));
+  MatchStyleRet matchStyle(const SkFontStyle& pattern) override;
 
  private:
   std::shared_ptr<AssetManager> asset_manager_;
@@ -74,7 +78,7 @@ class AssetManagerFontProvider : public txt::FontAssetProvider {
   std::string GetFamilyName(int index) const override;
 
   // |FontAssetProvider|
-  SkFontStyleSet* MatchFamily(const std::string& family_name) override;
+  sk_sp<SkFontStyleSet> MatchFamily(const std::string& family_name) override;
 
  private:
   std::shared_ptr<AssetManager> asset_manager_;
diff --git a/lib/ui/text/font_collection.cc b/lib/ui/text/font_collection.cc
index afc39b007aca398ff790319cb03ea6130c913e74..34ff63ea87df6de1ed71b8cbda04d28878dc0155 100644
--- a/lib/ui/text/font_collection.cc
+++ b/lib/ui/text/font_collection.cc
@@ -21,8 +21,13 @@
 #include "third_party/tonic/logging/dart_invoke.h"
 #include "third_party/tonic/typed_data/typed_list.h"
 #include "txt/asset_font_manager.h"
+#include "txt/platform.h"
 #include "txt/test_font_manager.h"
 
+#if FML_OS_MACOSX || FML_OS_IOS
+#include "txt/platform_mac.h"
+#endif
+
 namespace flutter {
 
 FontCollection::FontCollection()
@@ -63,6 +68,9 @@ void FontCollection::SetupDefaultFontManager(
 // Structure described in https://docs.flutter.dev/cookbook/design/fonts
 void FontCollection::RegisterFonts(
     const std::shared_ptr<AssetManager>& asset_manager) {
+#if FML_OS_MACOSX || FML_OS_IOS
+  RegisterSystemFonts(*dynamic_font_manager_);
+#endif
   std::unique_ptr<fml::Mapping> manifest_mapping =
       asset_manager->GetAsMapping("FontManifest.json");
   if (manifest_mapping == nullptr) {
@@ -121,19 +129,16 @@ void FontCollection::RegisterFonts(
 }
 
 void FontCollection::RegisterTestFonts() {
-  std::vector<sk_sp<SkTypeface>> test_typefaces;
-  std::vector<std::unique_ptr<SkStreamAsset>> font_data = GetTestFontData();
-  for (auto& font : font_data) {
-    test_typefaces.push_back(SkTypeface::MakeFromStream(std::move(font)));
-  }
-
+  std::vector<sk_sp<SkTypeface>> test_typefaces = GetTestFontData();
   std::unique_ptr<txt::TypefaceFontAssetProvider> font_provider =
       std::make_unique<txt::TypefaceFontAssetProvider>();
 
   size_t index = 0;
   std::vector<std::string> names = GetTestFontFamilyNames();
   for (sk_sp<SkTypeface> typeface : test_typefaces) {
-    font_provider->RegisterTypeface(std::move(typeface), names[index]);
+    if (typeface) {
+      font_provider->RegisterTypeface(std::move(typeface), names[index]);
+    }
     index++;
   }
 
@@ -155,8 +160,8 @@ void FontCollection::LoadFontFromList(Dart_Handle font_data_handle,
 
   std::unique_ptr<SkStreamAsset> font_stream = std::make_unique<SkMemoryStream>(
       font_data.data(), font_data.num_elements(), true);
-  sk_sp<SkTypeface> typeface =
-      SkTypeface::MakeFromStream(std::move(font_stream));
+  sk_sp<SkFontMgr> font_mgr = txt::GetDefaultFontManager();
+  sk_sp<SkTypeface> typeface = font_mgr->makeFromStream(std::move(font_stream));
   txt::TypefaceFontAssetProvider& font_provider =
       font_collection.dynamic_font_manager_->font_provider();
   if (family_name.empty()) {
diff --git a/lib/ui/text/font_collection.h b/lib/ui/text/font_collection.h
index 9c8d41f3ba7738c54069e607542c87152a129a0a..78e4ff9125b52dfd4602ba55a5b71d119c36609f 100644
--- a/lib/ui/text/font_collection.h
+++ b/lib/ui/text/font_collection.h
@@ -20,13 +20,15 @@ class FontCollection {
  public:
   FontCollection();
 
-  ~FontCollection();
+  virtual ~FontCollection();
 
   std::shared_ptr<txt::FontCollection> GetFontCollection() const;
 
   void SetupDefaultFontManager(uint32_t font_initialization_data);
 
-  void RegisterFonts(const std::shared_ptr<AssetManager>& asset_manager);
+  // Virtual for testing.
+  virtual void RegisterFonts(
+      const std::shared_ptr<AssetManager>& asset_manager);
 
   void RegisterTestFonts();
 
diff --git a/lib/ui/text/line_metrics.h b/lib/ui/text/line_metrics.h
deleted file mode 100644
index f5f656cd816f9aa4be884af66b0407496071801f..0000000000000000000000000000000000000000
--- a/lib/ui/text/line_metrics.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_LIB_UI_TEXT_LINE_METRICS_H_
-#define FLUTTER_LIB_UI_TEXT_LINE_METRICS_H_
-
-#include "third_party/dart/runtime/include/dart_api.h"
-#include "third_party/tonic/converter/dart_converter.h"
-
-namespace flutter {
-
-struct LineMetrics {
-  const bool* hard_break;
-
-  // The final computed ascent and descent for the line. This can be impacted by
-  // the strut, height, scaling, as well as outlying runs that are very tall.
-  //
-  // The top edge is `baseline - ascent` and the bottom edge is `baseline +
-  // descent`. Ascent and descent are provided as positive numbers. Raw numbers
-  // for specific runs of text can be obtained in run_metrics_map. These values
-  // are the cumulative metrics for the entire line.
-  const double* ascent;
-  const double* descent;
-  const double* unscaled_ascent;
-  // Height of the line.
-  const double* height;
-  // Width of the line.
-  const double* width;
-  // The left edge of the line. The right edge can be obtained with `left +
-  // width`
-  const double* left;
-  // The y position of the baseline for this line from the top of the paragraph.
-  const double* baseline;
-  // Zero indexed line number.
-  const size_t* line_number;
-
-  LineMetrics();
-
-  LineMetrics(const bool* hard_break,
-              const double* ascent,
-              const double* descent,
-              const double* unscaled_ascent,
-              const double* height,
-              const double* width,
-              const double* left,
-              const double* baseline,
-              const size_t* line_number)
-      : hard_break(hard_break),
-        ascent(ascent),
-        descent(descent),
-        unscaled_ascent(unscaled_ascent),
-        height(height),
-        width(width),
-        left(left),
-        baseline(baseline),
-        line_number(line_number) {}
-};
-
-}  // namespace flutter
-
-#endif  // FLUTTER_LIB_UI_TEXT_LINE_METRICS_H_
diff --git a/lib/ui/text/paragraph.cc b/lib/ui/text/paragraph.cc
index 4b3df6439186d3ad61da08a3b28ce17bb7d97b40..509c6e586edd517ac2eceeac5f40de98c1262749 100644
--- a/lib/ui/text/paragraph.cc
+++ b/lib/ui/text/paragraph.cc
@@ -8,70 +8,69 @@
 #include "flutter/common/task_runners.h"
 #include "flutter/fml/logging.h"
 #include "flutter/fml/task_runner.h"
+#include "third_party/dart/runtime/include/dart_api.h"
+#include "third_party/skia/modules/skparagraph/include/DartTypes.h"
+#include "third_party/skia/modules/skparagraph/include/Paragraph.h"
 #include "third_party/tonic/converter/dart_converter.h"
 #include "third_party/tonic/dart_args.h"
 #include "third_party/tonic/dart_binding_macros.h"
 #include "third_party/tonic/dart_library_natives.h"
+#include "third_party/tonic/logging/dart_invoke.h"
 
 namespace flutter {
 
 IMPLEMENT_WRAPPERTYPEINFO(ui, Paragraph);
 
 Paragraph::Paragraph(std::unique_ptr<txt::Paragraph> paragraph)
-    : m_paragraph(std::move(paragraph)) {}
+    : m_paragraph_(std::move(paragraph)) {}
 
 Paragraph::~Paragraph() = default;
 
 double Paragraph::width() {
-  return m_paragraph->GetMaxWidth();
+  return m_paragraph_->GetMaxWidth();
 }
 
 double Paragraph::height() {
-  return m_paragraph->GetHeight();
+  return m_paragraph_->GetHeight();
 }
 
 double Paragraph::longestLine() {
-  return m_paragraph->GetLongestLine();
+  return m_paragraph_->GetLongestLine();
 }
 
 double Paragraph::minIntrinsicWidth() {
-  return m_paragraph->GetMinIntrinsicWidth();
+  return m_paragraph_->GetMinIntrinsicWidth();
 }
 
 double Paragraph::maxIntrinsicWidth() {
-  return m_paragraph->GetMaxIntrinsicWidth();
+  return m_paragraph_->GetMaxIntrinsicWidth();
 }
 
 double Paragraph::alphabeticBaseline() {
-  return m_paragraph->GetAlphabeticBaseline();
+  return m_paragraph_->GetAlphabeticBaseline();
 }
 
 double Paragraph::ideographicBaseline() {
-  return m_paragraph->GetIdeographicBaseline();
+  return m_paragraph_->GetIdeographicBaseline();
 }
 
 bool Paragraph::didExceedMaxLines() {
-  return m_paragraph->DidExceedMaxLines();
+  return m_paragraph_->DidExceedMaxLines();
 }
 
 void Paragraph::layout(double width) {
-  m_paragraph->Layout(width);
+  m_paragraph_->Layout(width);
 }
 
 void Paragraph::paint(Canvas* canvas, double x, double y) {
-  if (!m_paragraph || !canvas) {
+  if (!m_paragraph_ || !canvas) {
     // disposed.
     return;
   }
 
   DisplayListBuilder* builder = canvas->builder();
-  if (builder && m_paragraph->Paint(builder, x, y)) {
-    return;
-  }
-  // Fall back to SkCanvas if painting to DisplayListBuilder is not supported.
-  SkCanvas* sk_canvas = canvas->canvas();
-  if (sk_canvas) {
-    m_paragraph->Paint(sk_canvas, x, y);
+  if (builder) {
+    m_paragraph_->Paint(builder, x, y);
   }
 }
 
@@ -99,7 +98,7 @@ tonic::Float32List Paragraph::getRectsForRange(unsigned start,
                                                unsigned end,
                                                unsigned boxHeightStyle,
                                                unsigned boxWidthStyle) {
-  std::vector<txt::Paragraph::TextBox> boxes = m_paragraph->GetRectsForRange(
+  std::vector<txt::Paragraph::TextBox> boxes = m_paragraph_->GetRectsForRange(
       start, end, static_cast<txt::Paragraph::RectHeightStyle>(boxHeightStyle),
       static_cast<txt::Paragraph::RectWidthStyle>(boxWidthStyle));
   return EncodeTextBoxes(boxes);
@@ -107,13 +106,13 @@ tonic::Float32List Paragraph::getRectsForRange(unsigned start,
 
 tonic::Float32List Paragraph::getRectsForPlaceholders() {
   std::vector<txt::Paragraph::TextBox> boxes =
-      m_paragraph->GetRectsForPlaceholders();
+      m_paragraph_->GetRectsForPlaceholders();
   return EncodeTextBoxes(boxes);
 }
 
 Dart_Handle Paragraph::getPositionForOffset(double dx, double dy) {
   txt::Paragraph::PositionWithAffinity pos =
-      m_paragraph->GetGlyphPositionAtCoordinate(dx, dy);
+      m_paragraph_->GetGlyphPositionAtCoordinate(dx, dy);
   std::vector<size_t> result = {
       pos.position,                      // size_t already
       static_cast<size_t>(pos.affinity)  // affinity (enum)
@@ -121,18 +120,61 @@ Dart_Handle Paragraph::getPositionForOffset(double dx, double dy) {
   return tonic::DartConverter<decltype(result)>::ToDart(result);
 }
 
-Dart_Handle Paragraph::getWordBoundary(unsigned offset) {
-  txt::Paragraph::Range<size_t> point = m_paragraph->GetWordBoundary(offset);
+Dart_Handle glyphInfoFrom(
+    Dart_Handle constructor,
+    const skia::textlayout::Paragraph::GlyphInfo& glyphInfo) {
+  std::array<Dart_Handle, 7> arguments = {
+      Dart_NewDouble(glyphInfo.fGraphemeLayoutBounds.fLeft),
+      Dart_NewDouble(glyphInfo.fGraphemeLayoutBounds.fTop),
+      Dart_NewDouble(glyphInfo.fGraphemeLayoutBounds.fRight),
+      Dart_NewDouble(glyphInfo.fGraphemeLayoutBounds.fBottom),
+      Dart_NewInteger(glyphInfo.fGraphemeClusterTextRange.start),
+      Dart_NewInteger(glyphInfo.fGraphemeClusterTextRange.end),
+      Dart_NewBoolean(glyphInfo.fDirection ==
+                      skia::textlayout::TextDirection::kLtr),
+  };
+  return Dart_InvokeClosure(constructor, arguments.size(), arguments.data());
+}
+
+Dart_Handle Paragraph::getGlyphInfoAt(unsigned utf16Offset,
+                                      Dart_Handle constructor) const {
+  skia::textlayout::Paragraph::GlyphInfo glyphInfo;
+  const bool found = m_paragraph_->GetGlyphInfoAt(utf16Offset, &glyphInfo);
+  if (!found) {
+    return Dart_Null();
+  }
+  Dart_Handle handle = glyphInfoFrom(constructor, glyphInfo);
+  tonic::CheckAndHandleError(handle);
+  return handle;
+}
+
+Dart_Handle Paragraph::getClosestGlyphInfo(double dx,
+                                           double dy,
+                                           Dart_Handle constructor) const {
+  skia::textlayout::Paragraph::GlyphInfo glyphInfo;
+  const bool found =
+      m_paragraph_->GetClosestGlyphInfoAtCoordinate(dx, dy, &glyphInfo);
+  if (!found) {
+    return Dart_Null();
+  }
+  Dart_Handle handle = glyphInfoFrom(constructor, glyphInfo);
+  tonic::CheckAndHandleError(handle);
+  return handle;
+}
+
+Dart_Handle Paragraph::getWordBoundary(unsigned utf16Offset) {
+  txt::Paragraph::Range<size_t> point =
+      m_paragraph_->GetWordBoundary(utf16Offset);
   std::vector<size_t> result = {point.start, point.end};
   return tonic::DartConverter<decltype(result)>::ToDart(result);
 }
 
-Dart_Handle Paragraph::getLineBoundary(unsigned offset) {
-  std::vector<txt::LineMetrics> metrics = m_paragraph->GetLineMetrics();
+Dart_Handle Paragraph::getLineBoundary(unsigned utf16Offset) {
+  std::vector<txt::LineMetrics> metrics = m_paragraph_->GetLineMetrics();
   int line_start = -1;
   int line_end = -1;
   for (txt::LineMetrics& line : metrics) {
-    if (offset >= line.start_index && offset <= line.end_index) {
+    if (utf16Offset >= line.start_index && utf16Offset <= line.end_index) {
       line_start = line.start_index;
       line_end = line.end_index;
       break;
@@ -142,8 +184,8 @@ Dart_Handle Paragraph::getLineBoundary(unsigned offset) {
   return tonic::DartConverter<decltype(result)>::ToDart(result);
 }
 
-tonic::Float64List Paragraph::computeLineMetrics() {
-  std::vector<txt::LineMetrics> metrics = m_paragraph->GetLineMetrics();
+tonic::Float64List Paragraph::computeLineMetrics() const {
+  std::vector<txt::LineMetrics> metrics = m_paragraph_->GetLineMetrics();
 
   // Layout:
   // boxes.size() groups of 9 which are the line metrics
@@ -170,8 +212,44 @@ tonic::Float64List Paragraph::computeLineMetrics() {
   return result;
 }
 
+Dart_Handle Paragraph::getLineMetricsAt(int lineNumber,
+                                        Dart_Handle constructor) const {
+  skia::textlayout::LineMetrics line;
+  const bool found = m_paragraph_->GetLineMetricsAt(lineNumber, &line);
+  if (!found) {
+    return Dart_Null();
+  }
+  std::array<Dart_Handle, 9> arguments = {
+      Dart_NewBoolean(line.fHardBreak),
+      Dart_NewDouble(line.fAscent),
+      Dart_NewDouble(line.fDescent),
+      Dart_NewDouble(line.fUnscaledAscent),
+      // We add then round to get the height. The
+      // definition of height here is different
+      // than the one in LibTxt.
+      Dart_NewDouble(round(line.fAscent + line.fDescent)),
+      Dart_NewDouble(line.fWidth),
+      Dart_NewDouble(line.fLeft),
+      Dart_NewDouble(line.fBaseline),
+      Dart_NewInteger(line.fLineNumber),
+  };
+
+  Dart_Handle handle =
+      Dart_InvokeClosure(constructor, arguments.size(), arguments.data());
+  tonic::CheckAndHandleError(handle);
+  return handle;
+}
+
+size_t Paragraph::getNumberOfLines() const {
+  return m_paragraph_->GetNumberOfLines();
+}
+
+int Paragraph::getLineNumberAt(size_t utf16Offset) const {
+  return m_paragraph_->GetLineNumberAt(utf16Offset);
+}
+
 void Paragraph::dispose() {
-  m_paragraph.reset();
+  m_paragraph_.reset();
   ClearDartWrapper();
 }
 
diff --git a/lib/ui/text/paragraph.h b/lib/ui/text/paragraph.h
index 1a5d8217aafc4b6e5ac764cf53e4d2ea513fad0f..d37e1ae62a13f9a2323ea9ab0796109244ed1952 100644
--- a/lib/ui/text/paragraph.h
+++ b/lib/ui/text/paragraph.h
@@ -8,8 +8,6 @@
 #include "flutter/fml/message_loop.h"
 #include "flutter/lib/ui/dart_wrapper.h"
 #include "flutter/lib/ui/painting/canvas.h"
-#include "flutter/lib/ui/text/line_metrics.h"
-#include "flutter/lib/ui/text/text_box.h"
 #include "flutter/third_party/txt/src/txt/paragraph.h"
 
 namespace flutter {
@@ -45,14 +43,22 @@ class Paragraph : public RefCountedDartWrappable<Paragraph> {
                                       unsigned boxWidthStyle);
   tonic::Float32List getRectsForPlaceholders();
   Dart_Handle getPositionForOffset(double dx, double dy);
+  Dart_Handle getGlyphInfoAt(unsigned utf16Offset,
+                             Dart_Handle constructor) const;
+  Dart_Handle getClosestGlyphInfo(double dx,
+                                  double dy,
+                                  Dart_Handle constructor) const;
   Dart_Handle getWordBoundary(unsigned offset);
   Dart_Handle getLineBoundary(unsigned offset);
-  tonic::Float64List computeLineMetrics();
+  tonic::Float64List computeLineMetrics() const;
+  Dart_Handle getLineMetricsAt(int lineNumber, Dart_Handle constructor) const;
+  size_t getNumberOfLines() const;
+  int getLineNumberAt(size_t utf16Offset) const;
 
   void dispose();
 
  private:
-  std::unique_ptr<txt::Paragraph> m_paragraph;
+  std::unique_ptr<txt::Paragraph> m_paragraph_;
 
   explicit Paragraph(std::unique_ptr<txt::Paragraph> paragraph);
 };
diff --git a/lib/ui/text/paragraph_builder.cc b/lib/ui/text/paragraph_builder.cc
index 82881ede24eda59f5303b9d6b6d09ba0f4c6927e..c79c09110b6e94b95ed73df65df2c293ab631f4f 100644
--- a/lib/ui/text/paragraph_builder.cc
+++ b/lib/ui/text/paragraph_builder.cc
@@ -297,23 +297,9 @@ ParagraphBuilder::ParagraphBuilder(
                                         ->client()
                                         ->GetFontCollection();
 
-  typedef std::unique_ptr<txt::ParagraphBuilder> (*ParagraphBuilderFactory)(
-      const txt::ParagraphStyle& style,
-      std::shared_ptr<txt::FontCollection> font_collection);
-  ParagraphBuilderFactory factory = txt::ParagraphBuilder::CreateTxtBuilder;
-
-#if FLUTTER_ENABLE_SKSHAPER
-#if FLUTTER_ALWAYS_USE_SKSHAPER
-  bool enable_skparagraph = true;
-#else
-  bool enable_skparagraph = UIDartState::Current()->enable_skparagraph();
-#endif
-  if (enable_skparagraph) {
-    factory = txt::ParagraphBuilder::CreateSkiaBuilder;
-  }
-#endif  // FLUTTER_ENABLE_SKSHAPER
-
-  m_paragraphBuilder = factory(style, font_collection.GetFontCollection());
+  auto impeller_enabled = UIDartState::Current()->IsImpellerEnabled();
+  m_paragraph_builder_ = txt::ParagraphBuilder::CreateSkiaBuilder(
+      style, font_collection.GetFontCollection(), impeller_enabled);
 }
 
 ParagraphBuilder::~ParagraphBuilder() = default;
@@ -400,7 +386,7 @@ void ParagraphBuilder::pushStyle(const tonic::Int32List& encoded,
 
   // Set to use the properties of the previous style if the property is not
   // explicitly given.
-  txt::TextStyle style = m_paragraphBuilder->PeekStyle();
+  txt::TextStyle style = m_paragraph_builder_->PeekStyle();
 
   style.half_leading = mask & kTSLeadingDistributionMask;
   // Only change the style property from the previous value if a new explicitly
@@ -469,24 +455,18 @@ void ParagraphBuilder::pushStyle(const tonic::Int32List& encoded,
   if (mask & kTSBackgroundMask) {
     Paint background(background_objects, background_data);
     if (background.isNotNull()) {
-      SkPaint sk_paint;
-      style.has_background = true;
-      style.background = *background.paint(sk_paint);
       DlPaint dl_paint;
       background.toDlPaint(dl_paint);
-      style.background_dl = dl_paint;
+      style.background = dl_paint;
     }
   }
 
   if (mask & kTSForegroundMask) {
     Paint foreground(foreground_objects, foreground_data);
     if (foreground.isNotNull()) {
-      SkPaint sk_paint;
-      style.has_foreground = true;
-      style.foreground = *foreground.paint(sk_paint);
       DlPaint dl_paint;
       foreground.toDlPaint(dl_paint);
-      style.foreground_dl = dl_paint;
+      style.foreground = dl_paint;
     }
   }
 
@@ -509,11 +489,11 @@ void ParagraphBuilder::pushStyle(const tonic::Int32List& encoded,
     decodeFontVariations(font_variations_data, style.font_variations);
   }
 
-  m_paragraphBuilder->PushStyle(style);
+  m_paragraph_builder_->PushStyle(style);
 }
 
 void ParagraphBuilder::pop() {
-  m_paragraphBuilder->Pop();
+  m_paragraph_builder_->Pop();
 }
 
 Dart_Handle ParagraphBuilder::addText(const std::u16string& text) {
@@ -531,7 +511,7 @@ Dart_Handle ParagraphBuilder::addText(const std::u16string& text) {
     return tonic::ToDart("string is not well-formed UTF-16");
   }
 
-  m_paragraphBuilder->AddText(text);
+  m_paragraph_builder_->AddText(text);
 
   return Dart_Null();
 }
@@ -545,12 +525,12 @@ void ParagraphBuilder::addPlaceholder(double width,
       width, height, static_cast<txt::PlaceholderAlignment>(alignment),
       static_cast<txt::TextBaseline>(baseline), baseline_offset);
 
-  m_paragraphBuilder->AddPlaceholder(placeholder_run);
+  m_paragraph_builder_->AddPlaceholder(placeholder_run);
 }
 
 void ParagraphBuilder::build(Dart_Handle paragraph_handle) {
-  Paragraph::Create(paragraph_handle, m_paragraphBuilder->Build());
-  m_paragraphBuilder.reset();
+  Paragraph::Create(paragraph_handle, m_paragraph_builder_->Build());
+  m_paragraph_builder_.reset();
   ClearDartWrapper();
 }
 
diff --git a/lib/ui/text/paragraph_builder.h b/lib/ui/text/paragraph_builder.h
index 0018f969da68fd4bc62c566f5701932f6a6da0d4..809f91bc3fd2017e2c0dafe0beae221aa02b2f84 100644
--- a/lib/ui/text/paragraph_builder.h
+++ b/lib/ui/text/paragraph_builder.h
@@ -78,7 +78,7 @@ class ParagraphBuilder : public RefCountedDartWrappable<ParagraphBuilder> {
                             const std::u16string& ellipsis,
                             const std::string& locale);
 
-  std::unique_ptr<txt::ParagraphBuilder> m_paragraphBuilder;
+  std::unique_ptr<txt::ParagraphBuilder> m_paragraph_builder_;
 };
 
 }  // namespace flutter
diff --git a/lib/ui/ui.dart b/lib/ui/ui.dart
index 36818d3c74480f83c10102dd6cec1c18155667b4..86d4e5dc2edfab04c41eda4586e2483402810676 100644
--- a/lib/ui/ui.dart
+++ b/lib/ui/ui.dart
@@ -17,7 +17,13 @@ import 'dart:convert';
 import 'dart:developer' as developer;
 import 'dart:ffi';
 import 'dart:io';
-import 'dart:isolate' show SendPort;
+import 'dart:isolate'
+    show
+        Isolate,
+        IsolateSpawnException,
+        RawReceivePort,
+        RemoteError,
+        SendPort;
 import 'dart:math' as math;
 import 'dart:nativewrappers';
 import 'dart:typed_data';
@@ -35,8 +41,10 @@ part 'math.dart';
 part 'natives.dart';
 part 'painting.dart';
 part 'platform_dispatcher.dart';
+part 'platform_isolate.dart';
 part 'plugins.dart';
 part 'pointer.dart';
 part 'semantics.dart';
+part 'setup_hooks.dart';
 part 'text.dart';
 part 'window.dart';
diff --git a/lib/ui/ui_benchmarks.cc b/lib/ui/ui_benchmarks.cc
index ce1d4c67bfe3f050728e78473a510f5ed4ae05a1..91d109c5e637f00fa2d57d44558e6290a8a9ffb1 100644
--- a/lib/ui/ui_benchmarks.cc
+++ b/lib/ui/ui_benchmarks.cc
@@ -16,13 +16,13 @@
 namespace flutter {
 
 class Fixture : public testing::FixtureTest {
-  void TestBody() override{};
+  void TestBody() override {};
 };
 
 static void BM_PlatformMessageResponseDartComplete(benchmark::State& state) {
   ThreadHost thread_host(ThreadHost::ThreadHostConfig(
-      "test", ThreadHost::Type::Platform | ThreadHost::Type::RASTER |
-                  ThreadHost::Type::IO | ThreadHost::Type::UI));
+      "test", ThreadHost::Type::kPlatform | ThreadHost::Type::kRaster |
+                  ThreadHost::Type::kIo | ThreadHost::Type::kUi));
   TaskRunners task_runners("test", thread_host.platform_thread->GetTaskRunner(),
                            thread_host.raster_thread->GetTaskRunner(),
                            thread_host.ui_thread->GetTaskRunner(),
@@ -69,8 +69,8 @@ static void BM_PlatformMessageResponseDartComplete(benchmark::State& state) {
 
 static void BM_PathVolatilityTracker(benchmark::State& state) {
   ThreadHost thread_host(ThreadHost::ThreadHostConfig(
-      "test", ThreadHost::Type::Platform | ThreadHost::Type::RASTER |
-                  ThreadHost::Type::IO | ThreadHost::Type::UI));
+      "test", ThreadHost::Type::kPlatform | ThreadHost::Type::kRaster |
+                  ThreadHost::Type::kIo | ThreadHost::Type::kUi));
   TaskRunners task_runners("test", thread_host.platform_thread->GetTaskRunner(),
                            thread_host.raster_thread->GetTaskRunner(),
                            thread_host.ui_thread->GetTaskRunner(),
@@ -90,7 +90,7 @@ static void BM_PathVolatilityTracker(benchmark::State& state) {
 
     fml::AutoResetWaitableEvent latch;
     task_runners.GetUITaskRunner()->PostTask([&]() {
-      for (auto path : paths) {
+      for (const auto& path : paths) {
         tracker.Track(path);
       }
       latch.Signal();
diff --git a/lib/ui/ui_dart_state.cc b/lib/ui/ui_dart_state.cc
index 65cef346ec1735483f9b92e79b8b02214ae16e6a..b9a3a9ecf893568d89a3df85c2bcf57846e15b38 100644
--- a/lib/ui/ui_dart_state.cc
+++ b/lib/ui/ui_dart_state.cc
@@ -9,6 +9,7 @@
 
 #include "flutter/fml/message_loop.h"
 #include "flutter/lib/ui/window/platform_configuration.h"
+#include "flutter/lib/ui/window/platform_message.h"
 #include "third_party/tonic/converter/dart_converter.h"
 #include "third_party/tonic/dart_message_handler.h"
 
@@ -39,7 +40,8 @@ UIDartState::Context::Context(
     std::string advisory_script_entrypoint,
     std::shared_ptr<VolatilePathTracker> volatile_path_tracker,
     std::shared_ptr<fml::ConcurrentTaskRunner> concurrent_task_runner,
-    bool enable_impeller)
+    bool enable_impeller,
+    impeller::RuntimeStageBackend runtime_stage_backend)
     : task_runners(task_runners),
       snapshot_delegate(std::move(snapshot_delegate)),
       io_manager(std::move(io_manager)),
@@ -50,7 +52,8 @@ UIDartState::Context::Context(
       advisory_script_entrypoint(std::move(advisory_script_entrypoint)),
       volatile_path_tracker(std::move(volatile_path_tracker)),
       concurrent_task_runner(std::move(concurrent_task_runner)),
-      enable_impeller(enable_impeller) {}
+      enable_impeller(enable_impeller),
+      runtime_stage_backend(runtime_stage_backend) {}
 
 UIDartState::UIDartState(
     TaskObserverAdd add_callback,
@@ -60,7 +63,6 @@ UIDartState::UIDartState(
     LogMessageCallback log_message_callback,
     std::shared_ptr<IsolateNameServer> isolate_name_server,
     bool is_root_isolate,
-    bool enable_skparagraph,
     const UIDartState::Context& context)
     : add_callback_(std::move(add_callback)),
       remove_callback_(std::move(remove_callback)),
@@ -69,7 +71,6 @@ UIDartState::UIDartState(
       unhandled_exception_callback_(std::move(unhandled_exception_callback)),
       log_message_callback_(std::move(log_message_callback)),
       isolate_name_server_(std::move(isolate_name_server)),
-      enable_skparagraph_(enable_skparagraph),
       context_(context) {
   AddOrRemoveTaskObserver(true /* add */);
 }
@@ -86,6 +87,10 @@ bool UIDartState::IsImpellerEnabled() const {
   return context_.enable_impeller;
 }
 
+impeller::RuntimeStageBackend UIDartState::GetRuntimeStageBackend() const {
+  return context_.runtime_stage_backend;
+}
+
 void UIDartState::DidSetIsolate() {
   main_port_ = Dart_GetMainPortId();
   std::ostringstream debug_name;
@@ -234,10 +239,6 @@ void UIDartState::LogMessage(const std::string& tag,
   }
 }
 
-bool UIDartState::enable_skparagraph() const {
-  return enable_skparagraph_;
-}
-
 Dart_Handle UIDartState::HandlePlatformMessage(
     std::unique_ptr<PlatformMessage> message) {
   if (platform_configuration_) {
@@ -261,4 +262,10 @@ int64_t UIDartState::GetRootIsolateToken() const {
   return IsRootIsolate() ? reinterpret_cast<int64_t>(this) : 0;
 }
 
+Dart_Isolate UIDartState::CreatePlatformIsolate(Dart_Handle entry_point,
+                                                char** error) {
+  FML_UNREACHABLE();
+  return nullptr;
+}
+
 }  // namespace flutter
diff --git a/lib/ui/ui_dart_state.h b/lib/ui/ui_dart_state.h
index b00d6bd72975a9c25bfdfad7326e9566ba0c9803..127c0293caa035b15101f88e041c87b92965ef89 100644
--- a/lib/ui/ui_dart_state.h
+++ b/lib/ui/ui_dart_state.h
@@ -11,7 +11,6 @@
 
 #include "flutter/common/settings.h"
 #include "flutter/common/task_runners.h"
-#include "flutter/flow/skia_gpu_object.h"
 #include "flutter/fml/build_config.h"
 #include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/fml/synchronization/waitable_event.h"
@@ -21,6 +20,7 @@
 #include "flutter/lib/ui/snapshot_delegate.h"
 #include "flutter/lib/ui/volatile_path_tracker.h"
 #include "flutter/shell/common/platform_message_handler.h"
+#include "impeller/runtime_stage/runtime_stage.h"
 #include "third_party/dart/runtime/include/dart_api.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
 #include "third_party/tonic/dart_microtask_queue.h"
@@ -55,7 +55,8 @@ class UIDartState : public tonic::DartState {
             std::string advisory_script_entrypoint,
             std::shared_ptr<VolatilePathTracker> volatile_path_tracker,
             std::shared_ptr<fml::ConcurrentTaskRunner> concurrent_task_runner,
-            bool enable_impeller);
+            bool enable_impeller,
+            impeller::RuntimeStageBackend runtime_stage_backend);
 
     /// The task runners used by the shell hosting this runtime controller. This
     /// may be used by the isolate to scheduled asynchronous texture uploads or
@@ -100,6 +101,9 @@ class UIDartState : public tonic::DartState {
 
     /// Whether Impeller is enabled or not.
     bool enable_impeller = false;
+
+    /// The expected backend for runtime stage shaders.
+    impeller::RuntimeStageBackend runtime_stage_backend;
   };
 
   Dart_Port main_port() const { return main_port_; }
@@ -153,30 +157,23 @@ class UIDartState : public tonic::DartState {
   // @param[in]  message  The message to be logged.
   void LogMessage(const std::string& tag, const std::string& message) const;
 
-  bool enable_skparagraph() const;
-
-  template <class T>
-  static flutter::SkiaGPUObject<T> CreateGPUObject(sk_sp<T> object) {
-    if (!object) {
-      return {};
-    }
-    auto* state = UIDartState::Current();
-    FML_DCHECK(state);
-    auto queue = state->GetSkiaUnrefQueue();
-    return {std::move(object), std::move(queue)};
-  };
-
   UnhandledExceptionCallback unhandled_exception_callback() const {
     return unhandled_exception_callback_;
   }
 
-  /// Returns a enumeration that that uniquely represents this root isolate.
+  /// Returns a enumeration that uniquely represents this root isolate.
   /// Returns `0` if called from a non-root isolate.
   int64_t GetRootIsolateToken() const;
 
   /// Whether Impeller is enabled for this application.
   bool IsImpellerEnabled() const;
 
+  /// The expected type for runtime stage shaders.
+  impeller::RuntimeStageBackend GetRuntimeStageBackend() const;
+
+  virtual Dart_Isolate CreatePlatformIsolate(Dart_Handle entry_point,
+                                             char** error);
+
  protected:
   UIDartState(TaskObserverAdd add_callback,
               TaskObserverRemove remove_callback,
@@ -185,7 +182,6 @@ class UIDartState : public tonic::DartState {
               LogMessageCallback log_message_callback,
               std::shared_ptr<IsolateNameServer> isolate_name_server,
               bool is_root_isolate_,
-              bool enable_skparagraph,
               const UIDartState::Context& context);
 
   ~UIDartState() override;
@@ -210,7 +206,6 @@ class UIDartState : public tonic::DartState {
   UnhandledExceptionCallback unhandled_exception_callback_;
   LogMessageCallback log_message_callback_;
   const std::shared_ptr<IsolateNameServer> isolate_name_server_;
-  const bool enable_skparagraph_;
   UIDartState::Context context_;
 
   void AddOrRemoveTaskObserver(bool add);
diff --git a/lib/ui/volatile_path_tracker.h b/lib/ui/volatile_path_tracker.h
index 1506239c31ac092e36f33b685eb2b9864591e76c..aadad4405775861811c87db3f031014b212ce65c 100644
--- a/lib/ui/volatile_path_tracker.h
+++ b/lib/ui/volatile_path_tracker.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_LIB_VOLATILE_PATH_TRACKER_H_
-#define FLUTTER_LIB_VOLATILE_PATH_TRACKER_H_
+#ifndef FLUTTER_LIB_UI_VOLATILE_PATH_TRACKER_H_
+#define FLUTTER_LIB_UI_VOLATILE_PATH_TRACKER_H_
 
 #include <deque>
 #include <memory>
@@ -76,4 +76,4 @@ class VolatilePathTracker {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_LIB_VOLATILE_PATH_TRACKER_H_
+#endif  // FLUTTER_LIB_UI_VOLATILE_PATH_TRACKER_H_
diff --git a/lib/ui/window.dart b/lib/ui/window.dart
index 6450fad95c41391766e886572c176b325a1a885e..c33a06812541a4151dc2cdc7868168e1708b7d43 100644
--- a/lib/ui/window.dart
+++ b/lib/ui/window.dart
@@ -3,10 +3,46 @@
 // found in the LICENSE file.
 part of dart.ui;
 
+/// A configurable display that a [FlutterView] renders on.
+///
+/// Use [FlutterView.display] to get the current display for that view.
+class Display {
+  const Display._({
+    required this.id,
+    required this.devicePixelRatio,
+    required this.size,
+    required this.refreshRate,
+  });
+
+  /// A unique identifier for this display.
+  ///
+  /// This identifier is unique among a list of displays the Flutter framework
+  /// is aware of, and is not derived from any platform specific identifiers for
+  /// displays.
+  final int id;
+
+  /// The device pixel ratio of this display.
+  ///
+  /// This value is the same as the value of [FlutterView.devicePixelRatio] for
+  /// all view objects attached to this display.
+  final double devicePixelRatio;
+
+  /// The physical size of this display.
+  final Size size;
+
+  /// The refresh rate in FPS of this display.
+  final double refreshRate;
+
+  @override
+  String toString() => 'Display(id: $id, size: $size, devicePixelRatio: $devicePixelRatio, refreshRate: $refreshRate)';
+}
+
 /// A view into which a Flutter [Scene] is drawn.
 ///
-/// Each [FlutterView] has its own layer tree that is rendered into an area
-/// inside of a [FlutterWindow] whenever [render] is called with a [Scene].
+/// Each [FlutterView] has its own layer tree that is rendered
+/// whenever [render] is called on it with a [Scene].
+///
+/// References to [FlutterView] objects are obtained via the [PlatformDispatcher].
 ///
 /// ## Insets and Padding
 ///
@@ -51,18 +87,24 @@ part of dart.ui;
 /// the [viewPadding] anyway, so there is no need to account for
 /// that in the [padding], which is always safe to use for such
 /// calculations.
-///
-/// See also:
-///
-///  * [FlutterWindow], a special case of a [FlutterView] that is represented on
-///    the platform as a separate window which can host other [FlutterView]s.
-abstract class FlutterView {
+class FlutterView {
+  FlutterView._(this.viewId, this.platformDispatcher, this._viewConfiguration);
+
+  /// The opaque ID for this view.
+  final int viewId;
+
   /// The platform dispatcher that this view is registered with, and gets its
   /// information from.
-  PlatformDispatcher get platformDispatcher;
+  final PlatformDispatcher platformDispatcher;
 
   /// The configuration of this view.
-  ViewConfiguration get viewConfiguration;
+  _ViewConfiguration _viewConfiguration;
+
+  /// The [Display] this view is drawn in.
+  Display get display {
+    assert(platformDispatcher._displays.containsKey(_viewConfiguration.displayId));
+    return platformDispatcher._displays[_viewConfiguration.displayId]!;
+  }
 
   /// The number of device pixels for each logical pixel for the screen this
   /// view is displayed on.
@@ -83,37 +125,64 @@ abstract class FlutterView {
   /// The Flutter framework operates in logical pixels, so it is rarely
   /// necessary to directly deal with this property.
   ///
-  /// When this changes, [onMetricsChanged] is called.
+  /// When this changes, [PlatformDispatcher.onMetricsChanged] is called. When
+  /// using the Flutter framework, using [MediaQuery.of] to obtain the device
+  /// pixel ratio (via [MediaQueryData.devicePixelRatio]), instead of directly
+  /// obtaining the [devicePixelRatio] from a [FlutterView], will automatically
+  /// cause any widgets dependent on this value to rebuild when it changes,
+  /// without having to listen to [PlatformDispatcher.onMetricsChanged].
   ///
   /// See also:
   ///
   ///  * [WidgetsBindingObserver], for a mechanism at the widgets layer to
   ///    observe when this value changes.
-  double get devicePixelRatio => viewConfiguration.devicePixelRatio;
+  ///  * [Display.devicePixelRatio], which reports the DPR of the display.
+  ///    The value here is equal to the value exposed on [display].
+  double get devicePixelRatio => _viewConfiguration.devicePixelRatio;
 
-  /// The dimensions and location of the rectangle into which the scene rendered
-  /// in this view will be drawn on the screen, in physical pixels.
+  /// The sizing constraints in physical pixels for this view.
   ///
-  /// When this changes, [onMetricsChanged] is called.
+  /// The view can take on any [Size] that fulfills these constraints. These
+  /// constraints are typically used by an UI framework as the input for its
+  /// layout algorithm to determine an approrpiate size for the view. To size
+  /// the view, the selected size must be provided to the [render] method and it
+  /// must satisfy the constraints.
   ///
-  /// At startup, the size and location of the view may not be known before Dart
-  /// code runs. If this value is observed early in the application lifecycle,
-  /// it may report [Rect.zero].
+  /// When this changes, [PlatformDispatcher.onMetricsChanged] is called.
+  ///
+  /// At startup, the constraints for the view may not be known before Dart code
+  /// runs. If this value is observed early in the application lifecycle, it may
+  /// report constraints with all dimensions set to zero.
   ///
   /// This value does not take into account any on-screen keyboards or other
-  /// system UI. The [padding] and [viewInsets] properties provide a view into
-  /// how much of each side of the view may be obscured by system UI.
+  /// system UI. If the constraints are tight, the [padding] and [viewInsets]
+  /// properties provide information about how much of each side of the view may
+  /// be obscured by system UI. If the constraints are loose, this information
+  /// is not known upfront.
   ///
   /// See also:
   ///
-  ///  * [WidgetsBindingObserver], for a mechanism at the widgets layer to
-  ///    observe when this value changes.
-  Rect get physicalGeometry => viewConfiguration.geometry;
+  ///  * [physicalSize], which returns the current size of the view.
+  // TODO(goderbauer): Wire this up so embedders can configure it. This will
+  //   also require to message the size provided to the render call back to the
+  //   embedder.
+  ViewConstraints get physicalConstraints => ViewConstraints.tight(physicalSize);
 
-  /// The dimensions of the rectangle into which the scene rendered in this view
-  /// will be drawn on the screen, in physical pixels.
+  /// The current dimensions of the rectangle as last reported by the platform
+  /// into which scenes rendered in this view are drawn.
+  ///
+  /// If the view is configured with loose [physicalConstraints] this value
+  /// may be outdated by a few frames as it only updates when the size chosen
+  /// for a frame (as provided to the [render] method) is processed by the
+  /// platform. Because of this, [physicalConstraints] should be used instead of
+  /// this value as the root input to the layout algorithm of UI frameworks.
   ///
-  /// When this changes, [onMetricsChanged] is called.
+  /// When this changes, [PlatformDispatcher.onMetricsChanged] is called. When
+  /// using the Flutter framework, using [MediaQuery.of] to obtain the size (via
+  /// [MediaQueryData.size]), instead of directly obtaining the [physicalSize]
+  /// from a [FlutterView], will automatically cause any widgets dependent on the
+  /// size to rebuild when the size changes, without having to listen to
+  /// [PlatformDispatcher.onMetricsChanged].
   ///
   /// At startup, the size of the view may not be known before Dart code runs.
   /// If this value is observed early in the application lifecycle, it may
@@ -123,21 +192,22 @@ abstract class FlutterView {
   /// system UI. The [padding] and [viewInsets] properties provide information
   /// about how much of each side of the view may be obscured by system UI.
   ///
-  /// This value is the same as the `size` member of [physicalGeometry].
-  ///
   /// See also:
   ///
-  ///  * [physicalGeometry], which reports the location of the view as well as
-  ///    its size.
   ///  * [WidgetsBindingObserver], for a mechanism at the widgets layer to
   ///    observe when this value changes.
-  Size get physicalSize => viewConfiguration.geometry.size;
+  Size get physicalSize => _viewConfiguration.size;
 
   /// The number of physical pixels on each side of the display rectangle into
   /// which the view can render, but over which the operating system will likely
   /// place system UI, such as the keyboard, that fully obscures any content.
   ///
-  /// When this property changes, [onMetricsChanged] is called.
+  /// When this property changes, [PlatformDispatcher.onMetricsChanged] is
+  /// called. When using the Flutter framework, using [MediaQuery.of] to obtain
+  /// the insets (via [MediaQueryData.viewInsets]), instead of directly
+  /// obtaining the [viewInsets] from a [FlutterView], will automatically cause
+  /// any widgets dependent on the insets to rebuild when they change, without
+  /// having to listen to [PlatformDispatcher.onMetricsChanged].
   ///
   /// The relationship between this [viewInsets],
   /// [viewPadding], and [padding] are described in
@@ -150,7 +220,7 @@ abstract class FlutterView {
   ///  * [MediaQuery.of], a simpler mechanism for the same.
   ///  * [Scaffold], which automatically applies the view insets in material
   ///    design applications.
-  WindowPadding get viewInsets => viewConfiguration.viewInsets;
+  ViewPadding get viewInsets => _viewConfiguration.viewInsets;
 
   /// The number of physical pixels on each side of the display rectangle into
   /// which the view can render, but which may be partially obscured by system
@@ -163,7 +233,12 @@ abstract class FlutterView {
   /// change in response to the soft keyboard being visible or hidden, whereas
   /// [padding] will.
   ///
-  /// When this property changes, [onMetricsChanged] is called.
+  /// When this property changes, [PlatformDispatcher.onMetricsChanged] is
+  /// called. When using the Flutter framework, using [MediaQuery.of] to obtain
+  /// the padding (via [MediaQueryData.viewPadding]), instead of directly
+  /// obtaining the [viewPadding] from a [FlutterView], will automatically cause
+  /// any widgets dependent on the padding to rebuild when it changes, without
+  /// having to listen to [PlatformDispatcher.onMetricsChanged].
   ///
   /// The relationship between this [viewInsets],
   /// [viewPadding], and [padding] are described in
@@ -176,7 +251,7 @@ abstract class FlutterView {
   ///  * [MediaQuery.of], a simpler mechanism for the same.
   ///  * [Scaffold], which automatically applies the padding in material design
   ///    applications.
-  WindowPadding get viewPadding => viewConfiguration.viewPadding;
+  ViewPadding get viewPadding => _viewConfiguration.viewPadding;
 
   /// The number of physical pixels on each side of the display rectangle into
   /// which the view can render, but where the operating system will consume
@@ -186,14 +261,14 @@ abstract class FlutterView {
   /// screen, where swiping inwards from the edges takes users backward
   /// through the history of screens they previously visited.
   ///
-  /// When this property changes, [onMetricsChanged] is called.
+  /// When this property changes, [PlatformDispatcher.onMetricsChanged] is called.
   ///
   /// See also:
   ///
   ///  * [WidgetsBindingObserver], for a mechanism at the widgets layer to
   ///    observe when this value changes.
   ///  * [MediaQuery.of], a simpler mechanism for the same.
-  WindowPadding get systemGestureInsets => viewConfiguration.systemGestureInsets;
+  ViewPadding get systemGestureInsets => _viewConfiguration.systemGestureInsets;
 
   /// The number of physical pixels on each side of the display rectangle into
   /// which the view can render, but which may be partially obscured by system
@@ -209,7 +284,12 @@ abstract class FlutterView {
   /// not drawn (to account for the bottom soft button area), but will be `0.0`
   /// when the soft keyboard is visible.
   ///
-  /// When this changes, [onMetricsChanged] is called.
+  /// When this changes, [PlatformDispatcher.onMetricsChanged] is called. When
+  /// using the Flutter framework, using [MediaQuery.of] to obtain the padding
+  /// (via [MediaQueryData.padding]), instead of directly obtaining the
+  /// [padding] from a [FlutterView], will automatically cause any widgets
+  /// dependent on the padding to rebuild when it changes, without having to
+  /// listen to [PlatformDispatcher.onMetricsChanged].
   ///
   /// The relationship between this [viewInsets], [viewPadding], and [padding]
   /// are described in more detail in the documentation for [FlutterView].
@@ -221,18 +301,42 @@ abstract class FlutterView {
   /// * [MediaQuery.of], a simpler mechanism for the same.
   /// * [Scaffold], which automatically applies the padding in material design
   ///   applications.
-  WindowPadding get padding => viewConfiguration.padding;
+  ViewPadding get padding => _viewConfiguration.padding;
+
+  /// Additional configuration for touch gestures performed on this view.
+  ///
+  /// For example, the touch slop defined in physical pixels may be provided
+  /// by the gesture settings and should be preferred over the framework
+  /// touch slop constant.
+  GestureSettings get gestureSettings => _viewConfiguration.gestureSettings;
 
-  /// {@macro dart.ui.ViewConfiguration.displayFeatures}
+  /// {@template dart.ui.ViewConfiguration.displayFeatures}
+  /// Areas of the display that are obstructed by hardware features.
+  ///
+  /// This list is populated only on Android. If the device has no display
+  /// features, this list is empty.
   ///
-  /// When this changes, [onMetricsChanged] is called.
+  /// The coordinate space in which the [DisplayFeature.bounds] are defined spans
+  /// across the screens currently in use. This means that the space between the screens
+  /// is virtually part of the Flutter view space, with the [DisplayFeature.bounds]
+  /// of the display feature as an obstructed area. The [DisplayFeature.type] can
+  /// be used to determine if this display feature obstructs the screen or not.
+  /// For example, [DisplayFeatureType.hinge] and [DisplayFeatureType.cutout] both
+  /// obstruct the display, while [DisplayFeatureType.fold] is a crease in the display.
+  ///
+  /// Folding [DisplayFeature]s like the [DisplayFeatureType.hinge] and
+  /// [DisplayFeatureType.fold] also have a [DisplayFeature.state] which can be
+  /// used to determine the posture the device is in.
+  /// {@endtemplate}
+  ///
+  /// When this changes, [PlatformDispatcher.onMetricsChanged] is called.
   ///
   /// See also:
   ///
   ///  * [WidgetsBindingObserver], for a mechanism at the widgets layer to
   ///    observe when this value changes.
   ///  * [MediaQuery.of], a simpler mechanism to access this data.
-  List<DisplayFeature> get displayFeatures => viewConfiguration.displayFeatures;
+  List<DisplayFeature> get displayFeatures => _viewConfiguration.displayFeatures;
 
   /// Updates the view's rendering on the GPU with the newly provided [Scene].
   ///
@@ -256,16 +360,25 @@ abstract class FlutterView {
   /// then obtain a [Scene] object, which you can display to the user via this
   /// [render] function.
   ///
+  /// If the view is configured with loose [physicalConstraints] (i.e.
+  /// [ViewConstraints.isTight] returns false) a `size` satisfying those
+  /// constraints must be provided. This method does not check that the provided
+  /// `size` actually meets the constraints (this should be done in a higher
+  /// level), but an illegal `size` may result in undefined rendering behavior.
+  /// If no `size` is provided, [physicalSize] is used instead.
+  ///
   /// See also:
   ///
   /// * [SchedulerBinding], the Flutter framework class which manages the
   ///   scheduling of frames.
   /// * [RendererBinding], the Flutter framework class which manages layout and
   ///   painting.
-  void render(Scene scene) => _render(scene);
+  void render(Scene scene, {Size? size}) {
+    _render(viewId, scene as _NativeScene, size?.width ?? physicalSize.width, size?.height ?? physicalSize.height);
+  }
 
-  @FfiNative<Void Function(Pointer<Void>)>('PlatformConfigurationNativeApi::Render')
-  external static void _render(Scene scene);
+  @Native<Void Function(Int64, Pointer<Void>, Double, Double)>(symbol: 'PlatformConfigurationNativeApi::Render')
+  external static void _render(int viewId, _NativeScene scene, double width, double height);
 
   /// Change the retained semantics data about this [FlutterView].
   ///
@@ -275,62 +388,58 @@ abstract class FlutterView {
   ///
   /// This function disposes the given update, which means the semantics update
   /// cannot be used further.
-  void updateSemantics(SemanticsUpdate update) => _updateSemantics(update);
+  void updateSemantics(SemanticsUpdate update) => _updateSemantics(update as _NativeSemanticsUpdate);
+
+  @Native<Void Function(Pointer<Void>)>(symbol: 'PlatformConfigurationNativeApi::UpdateSemantics')
+  external static void _updateSemantics(_NativeSemanticsUpdate update);
 
-  @FfiNative<Void Function(Pointer<Void>)>('PlatformConfigurationNativeApi::UpdateSemantics')
-  external static void _updateSemantics(SemanticsUpdate update);
+  @override
+  String toString() => 'FlutterView(id: $viewId)';
 }
 
-/// A top-level platform window displaying a Flutter layer tree drawn from a
-/// [Scene].
+/// Deprecated. Will be removed in a future version of Flutter.
+///
+/// This class is deprecated to prepare for Flutter's upcoming support for
+/// multiple views and eventually multiple windows.
 ///
-/// The current list of all Flutter views for the application is available from
-/// `WidgetsBinding.instance.platformDispatcher.views`. Only views that are of type
-/// [FlutterWindow] are top level platform windows.
+/// This class has been split into two classes: [FlutterView] and
+/// [PlatformDispatcher]. A [FlutterView] gives an application access to
+/// view-specific functionality while the [PlatformDispatcher] contains
+/// platform-specific functionality that applies to all views.
 ///
-/// There is also a [PlatformDispatcher.instance] singleton object in `dart:ui`
-/// if `WidgetsBinding` is unavailable, but we strongly advise avoiding a static
-/// reference to it. See the documentation for [PlatformDispatcher.instance] for
-/// more details about why it should be avoided.
+/// This class backs the global [window] singleton, which is also deprecated.
+/// See the docs on [window] for migration options.
 ///
 /// See also:
 ///
-/// * [PlatformDispatcher], which manages the current list of [FlutterView] (and
-///   thus [FlutterWindow]) instances.
-class FlutterWindow extends FlutterView {
-  FlutterWindow._(this._windowId, this.platformDispatcher);
-
-  /// The opaque ID for this view.
-  final Object _windowId;
-
-  @override
-  final PlatformDispatcher platformDispatcher;
-
+/// * [FlutterView], which gives an application access to view-specific
+///   functionality.
+/// * [PlatformDispatcher], which gives an application access to
+///   platform-specific functionality.
+@Deprecated(
+  'Use FlutterView or PlatformDispatcher instead. '
+  'Deprecated to prepare for the upcoming multi-window support. '
+  'This feature was deprecated after v3.7.0-32.0.pre.'
+)
+class SingletonFlutterWindow extends FlutterView {
+  @Deprecated(
+    'Use FlutterView or PlatformDispatcher instead. '
+    'Deprecated to prepare for the upcoming multi-window support. '
+    'This feature was deprecated after v3.7.0-32.0.pre.'
+  )
+  SingletonFlutterWindow._() : super._(
+    // TODO(dkwingsmt): This crashes if the implicit view is disabled. We need
+    // to resolve this by the time embedders are allowed to disable the implicit
+    // view.
+    // https://github.com/flutter/flutter/issues/131651
+    _implicitViewId!,
+    PlatformDispatcher.instance,
+    const _ViewConfiguration(),
+  );
+
+  // Gets its configuration from the FlutterView with the same ID if it exists.
   @override
-  ViewConfiguration get viewConfiguration {
-    assert(platformDispatcher._viewConfigurations.containsKey(_windowId));
-    return platformDispatcher._viewConfigurations[_windowId]!;
-  }
-}
-
-/// A [FlutterWindow] that includes access to setting callbacks and retrieving
-/// properties that reside on the [PlatformDispatcher].
-///
-/// It is the type of the global [window] singleton used by applications that
-/// only have a single main window.
-///
-/// In addition to the properties of [FlutterView], this class provides access
-/// to platform-specific properties. To modify or retrieve these properties,
-/// applications designed for more than one main window should prefer using
-/// `WidgetsBinding.instance.platformDispatcher` instead.
-///
-/// Prefer access through `WidgetsBinding.instance.window` or
-/// `WidgetsBinding.instance.platformDispatcher` over a static reference to
-/// [window], or [PlatformDispatcher.instance]. See the documentation for
-/// [PlatformDispatcher.instance] for more details about this recommendation.
-class SingletonFlutterWindow extends FlutterWindow {
-  SingletonFlutterWindow._(super.windowId, super.platformDispatcher)
-      : super._();
+  _ViewConfiguration get _viewConfiguration => platformDispatcher._views[viewId]?._viewConfiguration ?? super._viewConfiguration;
 
   /// A callback that is invoked whenever the [devicePixelRatio],
   /// [physicalSize], [padding], [viewInsets], [PlatformDispatcher.views], or
@@ -338,6 +447,11 @@ class SingletonFlutterWindow extends FlutterWindow {
   ///
   /// {@macro dart.ui.window.accessorForwardWarning}
   ///
+  /// When using the Flutter framework, the [MediaQuery] widget exposes much of
+  /// these metrics. Using [MediaQuery.of] to obtain them allows the framework
+  /// to automatically rebuild widgets that depend on them, without having to
+  /// manage the [onMetricsChanged] callback.
+  ///
   /// See [PlatformDispatcher.onMetricsChanged] for more information.
   VoidCallback? get onMetricsChanged => platformDispatcher.onMetricsChanged;
   set onMetricsChanged(VoidCallback? callback) {
@@ -349,11 +463,11 @@ class SingletonFlutterWindow extends FlutterWindow {
   /// {@template dart.ui.window.accessorForwardWarning}
   /// Accessing this value returns the value contained in the
   /// [PlatformDispatcher] singleton, so instead of getting it from here, you
-  /// should consider getting it from `WidgetsBinding.instance.platformDispatcher` instead
-  /// (or, when `WidgetsBinding` isn't available, from
-  /// [PlatformDispatcher.instance]). The reason this value forwards to the
-  /// [PlatformDispatcher] is to provide convenience for applications that only
-  /// use a single main window.
+  /// should consider getting it from
+  /// `WidgetsBinding.instance.platformDispatcher` instead (or, when
+  /// `WidgetsBinding` isn't available, from [PlatformDispatcher.instance]). The
+  /// reason this value forwards to the [PlatformDispatcher] is to provide
+  /// convenience for applications that only use a single main window.
   /// {@endtemplate}
   ///
   /// This establishes the language and formatting conventions that window
@@ -581,7 +695,7 @@ class SingletonFlutterWindow extends FlutterWindow {
   /// {@macro dart.ui.window.accessorForwardWarning}
   ///
   /// It's preferred to use [SchedulerBinding.addTimingsCallback] than to use
-  /// [SingletonFlutterWindow.onReportTimings] directly because
+  /// [PlatformDispatcher.onReportTimings] directly because
   /// [SchedulerBinding.addTimingsCallback] allows multiple callbacks.
   ///
   /// This can be used to see if the window has missed frames (through
@@ -645,8 +759,8 @@ class SingletonFlutterWindow extends FlutterWindow {
   ///
   /// ## iOS
   ///
-  /// On iOS, the initial route can be set on the `initialRoute`
-  /// parameter of the [FlutterViewController](/objcdoc/Classes/FlutterViewController.html)'s
+  /// On iOS, the initial route can be set with the
+  /// [`FlutterViewController.setInitialRoute`](/ios-embedder/interface_flutter_view_controller.html#a7f269c2da73312f856d42611cc12a33f)
   /// initializer.
   ///
   /// On a standalone engine, see https://flutter.dev/docs/development/add-to-app/ios/add-flutter-screen#route.
@@ -705,21 +819,6 @@ class SingletonFlutterWindow extends FlutterWindow {
     platformDispatcher.onFrameDataChanged = callback;
   }
 
-  /// A callback that is invoked whenever the user requests an action to be
-  /// performed.
-  ///
-  /// {@macro dart.ui.window.accessorForwardWarning}
-  ///
-  /// This callback is used when the user expresses the action they wish to
-  /// perform based on the semantics supplied by [updateSemantics].
-  ///
-  /// The framework invokes this callback in the same zone in which the
-  /// callback was set.
-  SemanticsActionCallback? get onSemanticsAction => platformDispatcher.onSemanticsAction;
-  set onSemanticsAction(SemanticsActionCallback? callback) {
-    platformDispatcher.onSemanticsAction = callback;
-  }
-
   /// Additional accessibility features that may be enabled by the platform.
   AccessibilityFeatures get accessibilityFeatures => platformDispatcher.accessibilityFeatures;
 
@@ -751,6 +850,8 @@ class SingletonFlutterWindow extends FlutterWindow {
     platformDispatcher.sendPlatformMessage(name, data, callback);
   }
 
+  /// Deprecated. Migrate to [ChannelBuffers.setListener] instead.
+  ///
   /// Called whenever this window receives a message from a platform-specific
   /// plugin.
   ///
@@ -766,8 +867,15 @@ class SingletonFlutterWindow extends FlutterWindow {
   ///
   /// The framework invokes this callback in the same zone in which the
   /// callback was set.
-  // TODO(ianh): deprecate once framework uses [ChannelBuffers.setListener].
+  @Deprecated(
+    'Migrate to ChannelBuffers.setListener instead. '
+    'This feature was deprecated after v3.11.0-20.0.pre.',
+  )
   PlatformMessageCallback? get onPlatformMessage => platformDispatcher.onPlatformMessage;
+  @Deprecated(
+    'Migrate to ChannelBuffers.setListener instead. '
+    'This feature was deprecated after v3.11.0-20.0.pre.',
+  )
   set onPlatformMessage(PlatformMessageCallback? callback) {
     platformDispatcher.onPlatformMessage = callback;
   }
@@ -822,7 +930,7 @@ class AccessibilityFeatures {
 
   /// The platform is requesting that text be rendered at a bold font weight.
   ///
-  /// Only supported on iOS.
+  /// Only supported on iOS and Android API 31+.
   bool get boldText => _kBoldTextIndex & _index != 0;
 
   /// The platform is requesting that certain animations be simplified and
@@ -896,36 +1004,52 @@ enum Brightness {
   light,
 }
 
-/// The [SingletonFlutterWindow] representing the main window for applications
-/// where there is only one window, such as applications designed for
-/// single-display mobile devices.
+/// Deprecated. Will be removed in a future version of Flutter.
+///
+/// This global property is deprecated to prepare for Flutter's upcoming support
+/// for multiple views and multiple windows.
 ///
-/// Applications that are designed to use more than one window should interact
-/// with the `WidgetsBinding.instance.platformDispatcher` instead.
+/// It represents the main view for applications where there is only one
+/// view, such as applications designed for single-display mobile devices.
+/// If the embedder supports multiple views, it points to the first view
+/// created which is assumed to be the main view. It throws if no view has
+/// been created yet or if the first view has been removed again.
 ///
-/// Consider avoiding static references to this singleton through
-/// [PlatformDispatcher.instance] and instead prefer using a binding for
-/// dependency resolution such as `WidgetsBinding.instance.window`.
+/// The following options exists to migrate code that relies on accessing
+/// this deprecated property:
 ///
-/// Static access of this `window` object means that Flutter has few, if any
-/// options to fake or mock the given object in tests. Even in cases where Dart
-/// offers special language constructs to forcefully shadow such properties,
-/// those mechanisms would only be reasonable for tests and they would not be
-/// reasonable for a future of Flutter where we legitimately want to select an
-/// appropriate implementation at runtime.
+/// If a [BuildContext] is available, consider looking up the current
+/// [FlutterView] associated with that context via [View.of]. It gives access
+/// to the same functionality as this deprecated property. However, the
+/// platform-specific functionality has moved to the [PlatformDispatcher],
+/// which may be accessed from the view returned by [View.of] via
+/// [FlutterView.platformDispatcher]. Using [View.of] with a [BuildContext] is
+/// the preferred option to migrate away from this deprecated [window]
+/// property.
 ///
-/// The only place that `WidgetsBinding.instance.window` is inappropriate is if
-/// access to these APIs is required before the binding is initialized by
-/// invoking `runApp()` or `WidgetsFlutterBinding.instance.ensureInitialized()`.
-/// In that case, it is necessary (though unfortunate) to use the
-/// [PlatformDispatcher.instance] object statically.
+/// If no context is available to look up a [FlutterView], the
+/// [PlatformDispatcher] can be used directly for platform-specific
+/// functionality. It also maintains a list of all available [FlutterView]s in
+/// [PlatformDispatcher.views] to access view-specific functionality without a
+/// context. If possible, consider accessing the [PlatformDispatcher] via the
+/// binding (e.g. `WidgetsBinding.instance.platformDispatcher`) instead of the
+/// static singleton [PlatformDispatcher.instance]. See
+/// [PlatformDispatcher.instance] for more information about why this is
+/// preferred.
 ///
 /// See also:
 ///
-/// * [PlatformDispatcher.views], contains the current list of Flutter windows
-///   belonging to the application, including top level application windows like
-///   this one.
-final SingletonFlutterWindow window = SingletonFlutterWindow._(0, PlatformDispatcher.instance);
+/// * [FlutterView], which gives an application access to view-specific
+///   functionality.
+/// * [PlatformDispatcher], which gives an application access to
+///   platform-specific functionality.
+/// * [PlatformDispatcher.views], for a list of all available views.
+@Deprecated(
+  'Look up the current FlutterView from the context via View.of(context) or consult the PlatformDispatcher directly instead. '
+  'Deprecated to prepare for the upcoming multi-window support. '
+  'This feature was deprecated after v3.7.0-32.0.pre.'
+)
+final SingletonFlutterWindow window = SingletonFlutterWindow._();
 
 /// Additional data available on each flutter frame.
 class FrameData {
@@ -942,8 +1066,9 @@ class FrameData {
 
 /// Platform specific configuration for gesture behavior, such as touch slop.
 ///
-/// These settings are provided via [ViewConfiguration] to each window, and should
-/// be favored for configuring gesture behavior over the framework constants.
+/// These settings are provided via [FlutterView.gestureSettings] to each
+/// view, and should be favored for configuring gesture behavior over the
+/// framework constants.
 ///
 /// A `null` field indicates that the platform or view does not have a preference
 /// and the fallback constants should be used instead.
@@ -971,7 +1096,7 @@ class GestureSettings {
   /// instead.
   final double? physicalDoubleTapSlop;
 
-  /// Create a new [GestureSetting]s object from an existing value, overwriting
+  /// Create a new [GestureSettings] object from an existing value, overwriting
   /// all of the provided fields.
   GestureSettings copyWith({
     double? physicalTouchSlop,
diff --git a/lib/ui/window/key_data.h b/lib/ui/window/key_data.h
index e3b3ea5d6459d544100ec7224ecdfad7df25bc7f..0238e63cf8d591bde234a6da2b3b559d354575ef 100644
--- a/lib/ui/window/key_data.h
+++ b/lib/ui/window/key_data.h
@@ -9,8 +9,11 @@
 
 namespace flutter {
 
-// If this value changes, update the key data unpacking code in hooks.dart.
-static constexpr int kKeyDataFieldCount = 5;
+// If this value changes, update the encoding code in the following files:
+//
+//  * KeyData.java (KeyData.FIELD_COUNT)
+//  * platform_dispatcher.dart (_kKeyDataFieldCount)
+static constexpr int kKeyDataFieldCount = 6;
 static constexpr int kBytesPerKeyField = sizeof(int64_t);
 
 // The change of the key event, used by KeyData.
@@ -22,6 +25,30 @@ enum class KeyEventType : int64_t {
   kRepeat,
 };
 
+// The source device for the key event.
+//
+// Not all platforms supply an accurate source.
+//
+// Defaults to [keyboard].
+// Must match the KeyEventDeviceType enum in ui/key.dart.
+enum class KeyEventDeviceType : int64_t {
+  // The source is a keyboard.
+  kKeyboard = 0,
+
+  // The source is a directional pad on something like a television remote
+  // control or similar.
+  kDirectionalPad,
+
+  // The source is a gamepad button.
+  kGamepad,
+
+  // The source is a joystick button.
+  kJoystick,
+
+  // The source is a device connected to an HDMI bus.
+  kHdmi,
+};
+
 // The fixed-length sections of a KeyDataPacket.
 //
 // KeyData does not contain `character`, for variable-length data are stored in
@@ -41,6 +68,7 @@ struct alignas(8) KeyData {
   //
   // The value is 1 for true, and 0 for false.
   uint64_t synthesized;
+  KeyEventDeviceType device_type;
 
   // Sets all contents of `Keydata` to 0.
   void Clear();
@@ -48,4 +76,4 @@ struct alignas(8) KeyData {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_LIB_UI_WINDOW_POINTER_DATA_H_
+#endif  // FLUTTER_LIB_UI_WINDOW_KEY_DATA_H_
diff --git a/lib/ui/window/key_data_packet.cc b/lib/ui/window/key_data_packet.cc
index fe24af210cd67f52c412859dcb923f856d3cf5ac..15c213cb20876a662c60a368670bae1225cee1f1 100644
--- a/lib/ui/window/key_data_packet.cc
+++ b/lib/ui/window/key_data_packet.cc
@@ -5,6 +5,7 @@
 #include "flutter/lib/ui/window/key_data_packet.h"
 
 #include <cstring>
+#include <iostream>
 
 #include "flutter/fml/logging.h"
 
@@ -13,8 +14,8 @@ namespace flutter {
 KeyDataPacket::KeyDataPacket(const KeyData& event, const char* character) {
   size_t char_size = character == nullptr ? 0 : strlen(character);
   uint64_t char_size_64 = char_size;
-  data_.resize(sizeof(uint64_t) + sizeof(KeyData) + char_size);
-  memcpy(CharacterSizeStart(), &char_size_64, sizeof(char_size));
+  data_.resize(sizeof(char_size_64) + sizeof(KeyData) + char_size);
+  memcpy(CharacterSizeStart(), &char_size_64, sizeof(char_size_64));
   memcpy(KeyDataStart(), &event, sizeof(KeyData));
   if (character != nullptr) {
     memcpy(CharacterStart(), character, char_size);
diff --git a/lib/ui/window/key_data_packet.h b/lib/ui/window/key_data_packet.h
index c6d31707d6f5ada027438abc00c62e0e5feaed3d..9db3ea335bc2c1a9967108fecb5c984ca0a57fc3 100644
--- a/lib/ui/window/key_data_packet.h
+++ b/lib/ui/window/key_data_packet.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_LIB_UI_WINDOW_KEY_DATA_MESSAGE_H_
-#define FLUTTER_LIB_UI_WINDOW_KEY_DATA_MESSAGE_H_
+#ifndef FLUTTER_LIB_UI_WINDOW_KEY_DATA_PACKET_H_
+#define FLUTTER_LIB_UI_WINDOW_KEY_DATA_PACKET_H_
 
 #include <functional>
 #include <vector>
@@ -46,4 +46,4 @@ class KeyDataPacket {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_LIB_UI_WINDOW_POINTER_DATA_MESSAGE_H_
+#endif  // FLUTTER_LIB_UI_WINDOW_KEY_DATA_PACKET_H_
diff --git a/lib/ui/window/platform_configuration.cc b/lib/ui/window/platform_configuration.cc
index d4333231d468b28e8cf140f89519dc287940ed4f..0607c703cc4c08b084db8268f599a4fd2cdeb28c 100644
--- a/lib/ui/window/platform_configuration.cc
+++ b/lib/ui/window/platform_configuration.cc
@@ -6,12 +6,13 @@
 
 #include <cstring>
 
+#include "flutter/common/constants.h"
 #include "flutter/lib/ui/compositing/scene.h"
 #include "flutter/lib/ui/ui_dart_state.h"
+#include "flutter/lib/ui/window/platform_message.h"
 #include "flutter/lib/ui/window/platform_message_response_dart.h"
 #include "flutter/lib/ui/window/platform_message_response_dart_port.h"
 #include "flutter/lib/ui/window/viewport_metrics.h"
-#include "flutter/lib/ui/window/window.h"
 #include "third_party/tonic/converter/dart_converter.h"
 #include "third_party/tonic/dart_args.h"
 #include "third_party/tonic/dart_library_natives.h"
@@ -19,6 +20,8 @@
 #include "third_party/tonic/logging/dart_invoke.h"
 #include "third_party/tonic/typed_data/dart_byte_data.h"
 
+#include "flutter/fml/platform/ohos/hisysevent_c.h"
+
 namespace flutter {
 namespace {
 
@@ -41,14 +44,24 @@ void PlatformConfiguration::DidCreateIsolate() {
 
   on_error_.Set(tonic::DartState::Current(),
                 Dart_GetField(library, tonic::ToDart("_onError")));
+  add_view_.Set(tonic::DartState::Current(),
+                Dart_GetField(library, tonic::ToDart("_addView")));
+  remove_view_.Set(tonic::DartState::Current(),
+                   Dart_GetField(library, tonic::ToDart("_removeView")));
+  update_window_metrics_.Set(
+      tonic::DartState::Current(),
+      Dart_GetField(library, tonic::ToDart("_updateWindowMetrics")));
+  update_displays_.Set(
+      tonic::DartState::Current(),
+      Dart_GetField(library, tonic::ToDart("_updateDisplays")));
   update_locales_.Set(tonic::DartState::Current(),
                       Dart_GetField(library, tonic::ToDart("_updateLocales")));
   update_user_settings_data_.Set(
       tonic::DartState::Current(),
       Dart_GetField(library, tonic::ToDart("_updateUserSettingsData")));
-  update_lifecycle_state_.Set(
+  update_initial_lifecycle_state_.Set(
       tonic::DartState::Current(),
-      Dart_GetField(library, tonic::ToDart("_updateLifecycleState")));
+      Dart_GetField(library, tonic::ToDart("_updateInitialLifecycleState")));
   update_semantics_enabled_.Set(
       tonic::DartState::Current(),
       Dart_GetField(library, tonic::ToDart("_updateSemanticsEnabled")));
@@ -58,6 +71,9 @@ void PlatformConfiguration::DidCreateIsolate() {
   dispatch_platform_message_.Set(
       tonic::DartState::Current(),
       Dart_GetField(library, tonic::ToDart("_dispatchPlatformMessage")));
+  dispatch_pointer_data_packet_.Set(
+      tonic::DartState::Current(),
+      Dart_GetField(library, tonic::ToDart("_dispatchPointerDataPacket")));
   dispatch_semantics_action_.Set(
       tonic::DartState::Current(),
       Dart_GetField(library, tonic::ToDart("_dispatchSemanticsAction")));
@@ -67,8 +83,143 @@ void PlatformConfiguration::DidCreateIsolate() {
                   Dart_GetField(library, tonic::ToDart("_drawFrame")));
   report_timings_.Set(tonic::DartState::Current(),
                       Dart_GetField(library, tonic::ToDart("_reportTimings")));
-  windows_.insert(std::make_pair(
-      0, std::make_unique<Window>(0, ViewportMetrics{1.0, 0.0, 0.0, -1})));
+}
+
+void PlatformConfiguration::AddView(int64_t view_id,
+                                    const ViewportMetrics& view_metrics) {
+  auto [view_iterator, insertion_happened] =
+      metrics_.emplace(view_id, view_metrics);
+  FML_DCHECK(insertion_happened);
+
+  std::shared_ptr<tonic::DartState> dart_state = add_view_.dart_state().lock();
+  if (!dart_state) {
+    return;
+  }
+  tonic::DartState::Scope scope(dart_state);
+  tonic::CheckAndHandleError(tonic::DartInvoke(
+      add_view_.Get(),
+      {
+          tonic::ToDart(view_id),
+          tonic::ToDart(view_metrics.device_pixel_ratio),
+          tonic::ToDart(view_metrics.physical_width),
+          tonic::ToDart(view_metrics.physical_height),
+          tonic::ToDart(view_metrics.physical_padding_top),
+          tonic::ToDart(view_metrics.physical_padding_right),
+          tonic::ToDart(view_metrics.physical_padding_bottom),
+          tonic::ToDart(view_metrics.physical_padding_left),
+          tonic::ToDart(view_metrics.physical_view_inset_top),
+          tonic::ToDart(view_metrics.physical_view_inset_right),
+          tonic::ToDart(view_metrics.physical_view_inset_bottom),
+          tonic::ToDart(view_metrics.physical_view_inset_left),
+          tonic::ToDart(view_metrics.physical_system_gesture_inset_top),
+          tonic::ToDart(view_metrics.physical_system_gesture_inset_right),
+          tonic::ToDart(view_metrics.physical_system_gesture_inset_bottom),
+          tonic::ToDart(view_metrics.physical_system_gesture_inset_left),
+          tonic::ToDart(view_metrics.physical_touch_slop),
+          tonic::ToDart(view_metrics.physical_display_features_bounds),
+          tonic::ToDart(view_metrics.physical_display_features_type),
+          tonic::ToDart(view_metrics.physical_display_features_state),
+          tonic::ToDart(view_metrics.display_id),
+      }));
+}
+
+bool PlatformConfiguration::RemoveView(int64_t view_id) {
+  if (view_id == kFlutterImplicitViewId) {
+    FML_LOG(FATAL) << "The implicit view #" << view_id << " cannot be removed.";
+    return false;
+  }
+  size_t erased_elements = metrics_.erase(view_id);
+  if (erased_elements == 0) {
+    FML_LOG(ERROR) << "View #" << view_id << " doesn't exist.";
+    return false;
+  }
+
+  std::shared_ptr<tonic::DartState> dart_state =
+      remove_view_.dart_state().lock();
+  if (!dart_state) {
+    return false;
+  }
+  tonic::DartState::Scope scope(dart_state);
+  tonic::CheckAndHandleError(
+      tonic::DartInvoke(remove_view_.Get(), {
+                                                tonic::ToDart(view_id),
+                                            }));
+  return true;
+}
+
+bool PlatformConfiguration::UpdateViewMetrics(
+    int64_t view_id,
+    const ViewportMetrics& view_metrics) {
+  auto found_iter = metrics_.find(view_id);
+  if (found_iter == metrics_.end()) {
+    return false;
+  }
+
+  found_iter->second = view_metrics;
+
+  std::shared_ptr<tonic::DartState> dart_state =
+      update_window_metrics_.dart_state().lock();
+  if (!dart_state) {
+    return false;
+  }
+  tonic::DartState::Scope scope(dart_state);
+  tonic::CheckAndHandleError(tonic::DartInvoke(
+      update_window_metrics_.Get(),
+      {
+          tonic::ToDart(view_id),
+          tonic::ToDart(view_metrics.device_pixel_ratio),
+          tonic::ToDart(view_metrics.physical_width),
+          tonic::ToDart(view_metrics.physical_height),
+          tonic::ToDart(view_metrics.physical_padding_top),
+          tonic::ToDart(view_metrics.physical_padding_right),
+          tonic::ToDart(view_metrics.physical_padding_bottom),
+          tonic::ToDart(view_metrics.physical_padding_left),
+          tonic::ToDart(view_metrics.physical_view_inset_top),
+          tonic::ToDart(view_metrics.physical_view_inset_right),
+          tonic::ToDart(view_metrics.physical_view_inset_bottom),
+          tonic::ToDart(view_metrics.physical_view_inset_left),
+          tonic::ToDart(view_metrics.physical_system_gesture_inset_top),
+          tonic::ToDart(view_metrics.physical_system_gesture_inset_right),
+          tonic::ToDart(view_metrics.physical_system_gesture_inset_bottom),
+          tonic::ToDart(view_metrics.physical_system_gesture_inset_left),
+          tonic::ToDart(view_metrics.physical_touch_slop),
+          tonic::ToDart(view_metrics.physical_display_features_bounds),
+          tonic::ToDart(view_metrics.physical_display_features_type),
+          tonic::ToDart(view_metrics.physical_display_features_state),
+          tonic::ToDart(view_metrics.display_id),
+      }));
+  return true;
+}
+
+void PlatformConfiguration::UpdateDisplays(
+    const std::vector<DisplayData>& displays) {
+  std::vector<DisplayId> ids;
+  std::vector<double> widths;
+  std::vector<double> heights;
+  std::vector<double> device_pixel_ratios;
+  std::vector<double> refresh_rates;
+  for (const auto& display : displays) {
+    ids.push_back(display.id);
+    widths.push_back(display.width);
+    heights.push_back(display.height);
+    device_pixel_ratios.push_back(display.pixel_ratio);
+    refresh_rates.push_back(display.refresh_rate);
+  }
+  std::shared_ptr<tonic::DartState> dart_state =
+      update_displays_.dart_state().lock();
+  if (!dart_state) {
+    return;
+  }
+  tonic::DartState::Scope scope(dart_state);
+  tonic::CheckAndHandleError(tonic::DartInvoke(
+      update_displays_.Get(),
+      {
+          tonic::ToDart<std::vector<DisplayId>>(ids),
+          tonic::ToDart<std::vector<double>>(widths),
+          tonic::ToDart<std::vector<double>>(heights),
+          tonic::ToDart<std::vector<double>>(device_pixel_ratios),
+          tonic::ToDart<std::vector<double>>(refresh_rates),
+      }));
 }
 
 void PlatformConfiguration::UpdateLocales(
@@ -101,17 +252,18 @@ void PlatformConfiguration::UpdateUserSettingsData(const std::string& data) {
                                                }));
 }
 
-void PlatformConfiguration::UpdateLifecycleState(const std::string& data) {
+void PlatformConfiguration::UpdateInitialLifecycleState(
+    const std::string& data) {
   std::shared_ptr<tonic::DartState> dart_state =
-      update_lifecycle_state_.dart_state().lock();
+      update_initial_lifecycle_state_.dart_state().lock();
   if (!dart_state) {
     return;
   }
   tonic::DartState::Scope scope(dart_state);
-  tonic::CheckAndHandleError(tonic::DartInvoke(update_lifecycle_state_.Get(),
-                                               {
-                                                   tonic::StdStringToDart(data),
-                                               }));
+  tonic::CheckAndHandleError(tonic::DartInvoke(
+      update_initial_lifecycle_state_.Get(), {
+                                                 tonic::StdStringToDart(data),
+                                             }));
 }
 
 void PlatformConfiguration::UpdateSemanticsEnabled(bool enabled) {
@@ -144,9 +296,7 @@ void PlatformConfiguration::DispatchPlatformMessage(
   std::shared_ptr<tonic::DartState> dart_state =
       dispatch_platform_message_.dart_state().lock();
 
-    FML_DLOG(INFO)
-        << "DispatchPlatformMessage channel: "
-        << message->channel();
+  FML_DLOG(INFO) << "DispatchPlatformMessage channel: " << message->channel();
   if (!dart_state) {
     FML_DLOG(WARNING)
         << "Dropping platform message for lack of DartState on channel: "
@@ -175,14 +325,32 @@ void PlatformConfiguration::DispatchPlatformMessage(
                          tonic::ToDart(response_id)}));
 }
 
-void PlatformConfiguration::DispatchSemanticsAction(int32_t id,
+void PlatformConfiguration::DispatchPointerDataPacket(
+    const PointerDataPacket& packet) {
+  std::shared_ptr<tonic::DartState> dart_state =
+      dispatch_pointer_data_packet_.dart_state().lock();
+  if (!dart_state) {
+    return;
+  }
+  tonic::DartState::Scope scope(dart_state);
+
+  const std::vector<uint8_t>& buffer = packet.data();
+  Dart_Handle data_handle =
+      tonic::DartByteData::Create(buffer.data(), buffer.size());
+  if (Dart_IsError(data_handle)) {
+    return;
+  }
+
+  tonic::CheckAndHandleError(
+      tonic::DartInvoke(dispatch_pointer_data_packet_.Get(), {data_handle}));
+}
+
+void PlatformConfiguration::DispatchSemanticsAction(int32_t node_id,
                                                     SemanticsAction action,
                                                     fml::MallocMapping args) {
   std::shared_ptr<tonic::DartState> dart_state =
       dispatch_semantics_action_.dart_state().lock();
-    FML_DLOG(INFO)
-        << "DispatchSemanticsAction : "
-        << id ;
+  FML_DLOG(INFO) << "DispatchSemanticsAction : " << node_id;
   if (!dart_state) {
     return;
   }
@@ -197,7 +365,7 @@ void PlatformConfiguration::DispatchSemanticsAction(int32_t id,
 
   tonic::CheckAndHandleError(tonic::DartInvoke(
       dispatch_semantics_action_.Get(),
-      {tonic::ToDart(id), tonic::ToDart(static_cast<int32_t>(action)),
+      {tonic::ToDart(node_id), tonic::ToDart(static_cast<int32_t>(action)),
        args_handle}));
 }
 
@@ -212,6 +380,7 @@ void PlatformConfiguration::BeginFrame(fml::TimePoint frameTime,
 
   int64_t microseconds = (frameTime - fml::TimePoint()).ToMicroseconds();
 
+  HISYSEVENT_WRITE_DURATION("flutter build frame time");
   tonic::CheckAndHandleError(
       tonic::DartInvoke(begin_frame_.Get(), {
                                                 Dart_NewInteger(microseconds),
@@ -250,6 +419,15 @@ void PlatformConfiguration::ReportTimings(std::vector<int64_t> timings) {
                                                }));
 }
 
+const ViewportMetrics* PlatformConfiguration::GetMetrics(int view_id) {
+  auto found = metrics_.find(view_id);
+  if (found != metrics_.end()) {
+    return &found->second;
+  } else {
+    return nullptr;
+  }
+}
+
 void PlatformConfiguration::CompletePlatformMessageEmptyResponse(
     int response_id) {
   if (!response_id) {
@@ -279,9 +457,13 @@ void PlatformConfiguration::CompletePlatformMessageResponse(
   response->Complete(std::make_unique<fml::DataMapping>(std::move(data)));
 }
 
-void PlatformConfigurationNativeApi::Render(Scene* scene) {
+void PlatformConfigurationNativeApi::Render(int64_t view_id,
+                                            Scene* scene,
+                                            double width,
+                                            double height) {
   UIDartState::ThrowIfUIOperationsProhibited();
-  UIDartState::Current()->platform_configuration()->client()->Render(scene);
+  UIDartState::Current()->platform_configuration()->client()->Render(
+      view_id, scene, width, height);
 }
 
 void PlatformConfigurationNativeApi::SetNeedsReportTimings(bool value) {
@@ -357,7 +539,8 @@ Dart_Handle PlatformConfigurationNativeApi::SendPortPlatformMessage(
 void PlatformConfigurationNativeApi::RespondToPlatformMessage(
     int response_id,
     const tonic::DartByteData& data) {
-  FML_DLOG(INFO)<<"PlatformConfigurationNativeApi::RespondToPlatformMessage:" << response_id;
+  FML_DLOG(INFO) << "PlatformConfigurationNativeApi::RespondToPlatformMessage:"
+                 << response_id;
   if (Dart_IsNull(data.dart_handle())) {
     UIDartState::Current()
         ->platform_configuration()
@@ -379,17 +562,17 @@ void PlatformConfigurationNativeApi::SetIsolateDebugName(
   UIDartState::Current()->SetDebugName(name);
 }
 
-Dart_PerformanceMode PlatformConfigurationNativeApi::current_performace_mode_ =
+Dart_PerformanceMode PlatformConfigurationNativeApi::current_performance_mode_ =
     Dart_PerformanceMode_Default;
 
 Dart_PerformanceMode PlatformConfigurationNativeApi::GetDartPerformanceMode() {
-  return current_performace_mode_;
+  return current_performance_mode_;
 }
 
 int PlatformConfigurationNativeApi::RequestDartPerformanceMode(int mode) {
   UIDartState::ThrowIfUIOperationsProhibited();
-  current_performace_mode_ = static_cast<Dart_PerformanceMode>(mode);
-  return Dart_SetPerformanceMode(current_performace_mode_);
+  current_performance_mode_ = static_cast<Dart_PerformanceMode>(mode);
+  return Dart_SetPerformanceMode(current_performance_mode_);
 }
 
 Dart_Handle PlatformConfigurationNativeApi::GetPersistentIsolateData() {
@@ -413,6 +596,11 @@ void PlatformConfigurationNativeApi::ScheduleFrame() {
   UIDartState::Current()->platform_configuration()->client()->ScheduleFrame();
 }
 
+void PlatformConfigurationNativeApi::EndWarmUpFrame() {
+  UIDartState::ThrowIfUIOperationsProhibited();
+  UIDartState::Current()->platform_configuration()->client()->EndWarmUpFrame();
+}
+
 void PlatformConfigurationNativeApi::UpdateSemantics(SemanticsUpdate* update) {
   UIDartState::ThrowIfUIOperationsProhibited();
   UIDartState::Current()->platform_configuration()->client()->UpdateSemantics(
@@ -462,4 +650,19 @@ void PlatformConfigurationNativeApi::RegisterBackgroundIsolate(
   dart_state->SetPlatformMessageHandler(weak_platform_message_handler);
 }
 
+void PlatformConfigurationNativeApi::SendChannelUpdate(const std::string& name,
+                                                       bool listening) {
+  UIDartState::Current()->platform_configuration()->client()->SendChannelUpdate(
+      name, listening);
+}
+
+double PlatformConfigurationNativeApi::GetScaledFontSize(
+    double unscaled_font_size,
+    int configuration_id) {
+  UIDartState::ThrowIfUIOperationsProhibited();
+  return UIDartState::Current()
+      ->platform_configuration()
+      ->client()
+      ->GetScaledFontSize(unscaled_font_size, configuration_id);
+}
 }  // namespace flutter
diff --git a/lib/ui/window/platform_configuration.h b/lib/ui/window/platform_configuration.h
index c5019962867cc5d1d407ed3316b27ca182de689a..6a583765d962f36807060ad794ff91f23db84802 100644
--- a/lib/ui/window/platform_configuration.h
+++ b/lib/ui/window/platform_configuration.h
@@ -14,9 +14,10 @@
 #include "flutter/assets/asset_manager.h"
 #include "flutter/fml/time/time_point.h"
 #include "flutter/lib/ui/semantics/semantics_update.h"
+#include "flutter/lib/ui/window/platform_message_response.h"
 #include "flutter/lib/ui/window/pointer_data_packet.h"
 #include "flutter/lib/ui/window/viewport_metrics.h"
-#include "flutter/lib/ui/window/window.h"
+#include "flutter/shell/common/display.h"
 #include "third_party/tonic/dart_persistent_value.h"
 #include "third_party/tonic/typed_data/dart_byte_data.h"
 
@@ -24,13 +25,14 @@ namespace flutter {
 class FontCollection;
 class PlatformMessage;
 class PlatformMessageHandler;
+class PlatformIsolateManager;
 class Scene;
 
 //--------------------------------------------------------------------------
 /// @brief An enum for defining the different kinds of accessibility features
 ///        that can be enabled by the platform.
 ///
-///         Must match the `AccessibilityFeatureFlag` enum in framework.
+///         Must match the `AccessibilityFeatures` class in framework.
 enum class AccessibilityFeatureFlag : int32_t {
   kAccessibleNavigation = 1 << 0,
   kInvertColors = 1 << 1,
@@ -64,14 +66,24 @@ class PlatformConfigurationClient {
   ///
   virtual void ScheduleFrame() = 0;
 
+  //--------------------------------------------------------------------------
+  /// @brief    Called when a warm up frame has ended.
+  ///
+  ///           For more introduction, see `Animator::EndWarmUpFrame`.
+  ///
+  virtual void EndWarmUpFrame() = 0;
+
   //--------------------------------------------------------------------------
   /// @brief      Updates the client's rendering on the GPU with the newly
   ///             provided Scene.
   ///
-  virtual void Render(Scene* scene) = 0;
+  virtual void Render(int64_t view_id,
+                      Scene* scene,
+                      double width,
+                      double height) = 0;
 
   //--------------------------------------------------------------------------
-  /// @brief      Receives a updated semantics tree from the Framework.
+  /// @brief      Receives an updated semantics tree from the Framework.
   ///
   /// @param[in] update The updated semantic tree to apply.
   ///
@@ -206,6 +218,42 @@ class PlatformConfigurationClient {
   ///
   virtual void RequestDartDeferredLibrary(intptr_t loading_unit_id) = 0;
 
+  //--------------------------------------------------------------------------
+  /// @brief      Invoked when a listener is registered on a platform channel.
+  ///
+  /// @param[in]  name             The name of the platform channel to which a
+  ///                              listener has been registered or cleared.
+  ///
+  /// @param[in]  listening        Whether the listener has been set (true) or
+  ///                              cleared (false).
+  ///
+  virtual void SendChannelUpdate(std::string name, bool listening) = 0;
+
+  //--------------------------------------------------------------------------
+  /// @brief      Synchronously invokes platform-specific APIs to apply the
+  ///             system text scaling on the given unscaled font size.
+  ///
+  ///             Platforms that support this feature (currently it's only
+  ///             implemented for Android SDK level 34+) will send a valid
+  ///             configuration_id to potential callers, before this method can
+  ///             be called.
+  ///
+  /// @param[in]  unscaled_font_size  The unscaled font size specified by the
+  ///                                 app developer. The value is in logical
+  ///                                 pixels, and is guaranteed to be finite and
+  ///                                 non-negative.
+  /// @param[in]  configuration_id    The unique id of the configuration to use
+  ///                                 for computing the scaled font size.
+  ///
+  /// @return     The scaled font size in logical pixels, or -1 if the given
+  ///             configuration_id did not match a valid configuration.
+  ///
+  virtual double GetScaledFontSize(double unscaled_font_size,
+                                   int configuration_id) const = 0;
+
+  virtual std::shared_ptr<PlatformIsolateManager>
+  GetPlatformIsolateManager() = 0;
+
  protected:
   virtual ~PlatformConfigurationClient();
 };
@@ -258,10 +306,52 @@ class PlatformConfiguration final {
   void DidCreateIsolate();
 
   //----------------------------------------------------------------------------
-  /// @brief      Update the specified locale data in the framework.
+  /// @brief      Notify the framework that a new view is available.
+  ///
+  ///             A view must be added before other methods can refer to it,
+  ///             including the implicit view. Adding a view that already exists
+  ///             triggers an assertion.
+  ///
+  /// @param[in]  view_id           The ID of the new view.
+  /// @param[in]  viewport_metrics  The initial viewport metrics for the view.
+  ///
+  void AddView(int64_t view_id, const ViewportMetrics& view_metrics);
+
+  //----------------------------------------------------------------------------
+  /// @brief      Notify the framework that a view is no longer available.
+  ///
+  ///             Removing a view that does not exist triggers an assertion.
+  ///
+  ///             The implicit view (kFlutterImplicitViewId) should never be
+  ///             removed. Doing so triggers an assertion.
+  ///
+  /// @param[in]  view_id  The ID of the view.
   ///
-  /// @deprecated The persistent isolate data must be used for this purpose
-  ///             instead.
+  /// @return     Whether the view was removed.
+  ///
+  bool RemoveView(int64_t view_id);
+
+  //----------------------------------------------------------------------------
+  /// @brief      Update the view metrics for the specified view.
+  ///
+  ///             If the view is not found, silently return false.
+  ///
+  /// @param[in]  view_id  The ID of the view.
+  /// @param[in]  metrics  The new metrics of the view.
+  ///
+  /// @return     Whether the view is found.
+  ///
+  bool UpdateViewMetrics(int64_t view_id, const ViewportMetrics& metrics);
+
+  //----------------------------------------------------------------------------
+  /// @brief      Update the specified display data in the framework.
+  ///
+  /// @param[in]  displays  The display data to send to Dart.
+  ///
+  void UpdateDisplays(const std::vector<DisplayData>& displays);
+
+  //----------------------------------------------------------------------------
+  /// @brief      Update the specified locale data in the framework.
   ///
   /// @param[in]  locale_data  The locale data. This should consist of groups of
   ///             4 strings, each group representing a single locale.
@@ -271,9 +361,6 @@ class PlatformConfiguration final {
   //----------------------------------------------------------------------------
   /// @brief      Update the user settings data in the framework.
   ///
-  /// @deprecated The persistent isolate data must be used for this purpose
-  ///             instead.
-  ///
   /// @param[in]  data  The user settings data.
   ///
   void UpdateUserSettingsData(const std::string& data);
@@ -281,12 +368,9 @@ class PlatformConfiguration final {
   //----------------------------------------------------------------------------
   /// @brief      Updates the lifecycle state data in the framework.
   ///
-  /// @deprecated The persistent isolate data must be used for this purpose
-  ///             instead.
-  ///
   /// @param[in]  data  The lifecycle state data.
   ///
-  void UpdateLifecycleState(const std::string& data);
+  void UpdateInitialLifecycleState(const std::string& data);
 
   //----------------------------------------------------------------------------
   /// @brief      Notifies the PlatformConfiguration that the embedder has
@@ -319,18 +403,27 @@ class PlatformConfiguration final {
   ///
   void DispatchPlatformMessage(std::unique_ptr<PlatformMessage> message);
 
+  //----------------------------------------------------------------------------
+  /// @brief      Notifies the PlatformConfiguration that the client has sent
+  ///             it pointer events. This call originates in the platform view
+  ///             and has been forwarded through the engine to here.
+  ///
+  /// @param[in]  packet  The pointer event(s) serialized into a packet.
+  ///
+  void DispatchPointerDataPacket(const PointerDataPacket& packet);
+
   //----------------------------------------------------------------------------
   /// @brief      Notifies the framework that the embedder encountered an
   ///             accessibility related action on the specified node. This call
   ///             originates on the platform view and has been forwarded to the
   ///             platform configuration here by the engine.
   ///
-  /// @param[in]  id      The identifier of the accessibility node.
+  /// @param[in]  node_id The identifier of the accessibility node.
   /// @param[in]  action  The accessibility related action performed on the
   ///                     node of the specified ID.
   /// @param[in]  args    Optional data that applies to the specified action.
   ///
-  void DispatchSemanticsAction(int32_t id,
+  void DispatchSemanticsAction(int32_t node_id,
                                SemanticsAction action,
                                fml::MallocMapping args);
 
@@ -390,14 +483,15 @@ class PlatformConfiguration final {
   void ReportTimings(std::vector<int64_t> timings);
 
   //----------------------------------------------------------------------------
-  /// @brief      Retrieves the Window with the given ID managed by the
-  ///             `PlatformConfiguration`.
+  /// @brief      Retrieves the viewport metrics with the given ID managed by
+  ///             the `PlatformConfiguration`.
   ///
-  /// @param[in] window_id The id of the window to find and return.
+  /// @param[in]  view_id The id of the view's viewport metrics to return.
   ///
-  /// @return     a pointer to the Window.
+  /// @return     a pointer to the ViewportMetrics. Returns nullptr if the ID is
+  ///             not found.
   ///
-  Window* get_window(int window_id) { return windows_[window_id].get(); }
+  const ViewportMetrics* GetMetrics(int view_id);
 
   //----------------------------------------------------------------------------
   /// @brief      Responds to a previous platform message to the engine from the
@@ -424,18 +518,24 @@ class PlatformConfiguration final {
  private:
   PlatformConfigurationClient* client_;
   tonic::DartPersistentValue on_error_;
+  tonic::DartPersistentValue add_view_;
+  tonic::DartPersistentValue remove_view_;
+  tonic::DartPersistentValue update_window_metrics_;
+  tonic::DartPersistentValue update_displays_;
   tonic::DartPersistentValue update_locales_;
   tonic::DartPersistentValue update_user_settings_data_;
-  tonic::DartPersistentValue update_lifecycle_state_;
+  tonic::DartPersistentValue update_initial_lifecycle_state_;
   tonic::DartPersistentValue update_semantics_enabled_;
   tonic::DartPersistentValue update_accessibility_features_;
   tonic::DartPersistentValue dispatch_platform_message_;
+  tonic::DartPersistentValue dispatch_pointer_data_packet_;
   tonic::DartPersistentValue dispatch_semantics_action_;
   tonic::DartPersistentValue begin_frame_;
   tonic::DartPersistentValue draw_frame_;
   tonic::DartPersistentValue report_timings_;
 
-  std::unordered_map<int64_t, std::unique_ptr<Window>> windows_;
+  // All current views' view metrics mapped from view IDs.
+  std::unordered_map<int64_t, ViewportMetrics> metrics_;
 
   // ID starts at 1 because an ID of 0 indicates that no response is expected.
   int next_response_id_ = 1;
@@ -473,7 +573,12 @@ class PlatformConfigurationNativeApi {
 
   static void ScheduleFrame();
 
-  static void Render(Scene* scene);
+  static void EndWarmUpFrame();
+
+  static void Render(int64_t view_id,
+                     Scene* scene,
+                     double width,
+                     double height);
 
   static void UpdateSemantics(SemanticsUpdate* update);
 
@@ -498,6 +603,8 @@ class PlatformConfigurationNativeApi {
   static void RespondToPlatformMessage(int response_id,
                                        const tonic::DartByteData& data);
 
+  static void SendChannelUpdate(const std::string& name, bool listening);
+
   //--------------------------------------------------------------------------
   /// @brief      Requests the Dart VM to adjusts the GC heuristics based on
   ///             the requested `performance_mode`. Returns the old performance
@@ -525,8 +632,11 @@ class PlatformConfigurationNativeApi {
 
   static void RegisterBackgroundIsolate(int64_t root_isolate_token);
 
+  static double GetScaledFontSize(double unscaled_font_size,
+                                  int configuration_id);
+
  private:
-  static Dart_PerformanceMode current_performace_mode_;
+  static Dart_PerformanceMode current_performance_mode_;
 };
 
 }  // namespace flutter
diff --git a/lib/ui/window/platform_configuration_unittests.cc b/lib/ui/window/platform_configuration_unittests.cc
index 9b971947f5e845af6b264266b6b30bb7fda447f0..7410caeb66d6caa96f5cfb1e604dc8f0fecfe1b2 100644
--- a/lib/ui/window/platform_configuration_unittests.cc
+++ b/lib/ui/window/platform_configuration_unittests.cc
@@ -19,24 +19,22 @@
 namespace flutter {
 namespace testing {
 
-TEST_F(ShellTest, PlatformConfigurationInitialization) {
+class PlatformConfigurationTest : public ShellTest {};
+
+TEST_F(PlatformConfigurationTest, Initialization) {
   auto message_latch = std::make_shared<fml::AutoResetWaitableEvent>();
 
-  auto nativeValidateConfiguration = [message_latch](
-                                         Dart_NativeArguments args) {
-    PlatformConfiguration* configuration =
-        UIDartState::Current()->platform_configuration();
-    ASSERT_NE(configuration->get_window(0), nullptr);
-    ASSERT_EQ(
-        configuration->get_window(0)->viewport_metrics().device_pixel_ratio,
-        1.0);
-    ASSERT_EQ(configuration->get_window(0)->viewport_metrics().physical_width,
-              0.0);
-    ASSERT_EQ(configuration->get_window(0)->viewport_metrics().physical_height,
-              0.0);
+  auto nativeValidateConfiguration =
+      [message_latch](Dart_NativeArguments args) {
+        PlatformConfiguration* configuration =
+            UIDartState::Current()->platform_configuration();
+        ASSERT_NE(configuration->GetMetrics(0), nullptr);
+        ASSERT_EQ(configuration->GetMetrics(0)->device_pixel_ratio, 1.0);
+        ASSERT_EQ(configuration->GetMetrics(0)->physical_width, 0.0);
+        ASSERT_EQ(configuration->GetMetrics(0)->physical_height, 0.0);
 
-    message_latch->Signal();
-  };
+        message_latch->Signal();
+      };
 
   Settings settings = CreateSettingsForFixture();
   TaskRunners task_runners("test",                  // label
@@ -63,30 +61,64 @@ TEST_F(ShellTest, PlatformConfigurationInitialization) {
   DestroyShell(std::move(shell), task_runners);
 }
 
-TEST_F(ShellTest, PlatformConfigurationWindowMetricsUpdate) {
+TEST_F(PlatformConfigurationTest, WindowMetricsUpdate) {
   auto message_latch = std::make_shared<fml::AutoResetWaitableEvent>();
 
-  auto nativeValidateConfiguration = [message_latch](
-                                         Dart_NativeArguments args) {
-    PlatformConfiguration* configuration =
-        UIDartState::Current()->platform_configuration();
-
-    ASSERT_NE(configuration->get_window(0), nullptr);
-    configuration->get_window(0)->UpdateWindowMetrics(
-        ViewportMetrics{2.0, 10.0, 20.0, 22});
-    ASSERT_EQ(
-        configuration->get_window(0)->viewport_metrics().device_pixel_ratio,
-        2.0);
-    ASSERT_EQ(configuration->get_window(0)->viewport_metrics().physical_width,
-              10.0);
-    ASSERT_EQ(configuration->get_window(0)->viewport_metrics().physical_height,
-              20.0);
-    ASSERT_EQ(
-        configuration->get_window(0)->viewport_metrics().physical_touch_slop,
-        22);
+  auto nativeValidateConfiguration =
+      [message_latch](Dart_NativeArguments args) {
+        PlatformConfiguration* configuration =
+            UIDartState::Current()->platform_configuration();
 
-    message_latch->Signal();
-  };
+        ASSERT_NE(configuration->GetMetrics(0), nullptr);
+        bool has_view = configuration->UpdateViewMetrics(
+            0, ViewportMetrics{2.0, 10.0, 20.0, 22, 0});
+        ASSERT_TRUE(has_view);
+        ASSERT_EQ(configuration->GetMetrics(0)->device_pixel_ratio, 2.0);
+        ASSERT_EQ(configuration->GetMetrics(0)->physical_width, 10.0);
+        ASSERT_EQ(configuration->GetMetrics(0)->physical_height, 20.0);
+        ASSERT_EQ(configuration->GetMetrics(0)->physical_touch_slop, 22);
+
+        message_latch->Signal();
+      };
+
+  Settings settings = CreateSettingsForFixture();
+  TaskRunners task_runners("test",                  // label
+                           GetCurrentTaskRunner(),  // platform
+                           CreateNewThread(),       // raster
+                           CreateNewThread(),       // ui
+                           CreateNewThread()        // io
+  );
+
+  AddNativeCallback("ValidateConfiguration",
+                    CREATE_NATIVE_ENTRY(nativeValidateConfiguration));
+
+  std::unique_ptr<Shell> shell = CreateShell(settings, task_runners);
+
+  ASSERT_TRUE(shell->IsSetup());
+  auto run_configuration = RunConfiguration::InferFromSettings(settings);
+  run_configuration.SetEntrypoint("validateConfiguration");
+
+  shell->RunEngine(std::move(run_configuration), [&](auto result) {
+    ASSERT_EQ(result, Engine::RunStatus::Success);
+  });
+
+  message_latch->Wait();
+  DestroyShell(std::move(shell), task_runners);
+}
+
+TEST_F(PlatformConfigurationTest, GetWindowReturnsNullForNonexistentId) {
+  auto message_latch = std::make_shared<fml::AutoResetWaitableEvent>();
+
+  auto nativeValidateConfiguration =
+      [message_latch](Dart_NativeArguments args) {
+        PlatformConfiguration* configuration =
+            UIDartState::Current()->platform_configuration();
+
+        ASSERT_EQ(configuration->GetMetrics(1), nullptr);
+        ASSERT_EQ(configuration->GetMetrics(2), nullptr);
+
+        message_latch->Signal();
+      };
 
   Settings settings = CreateSettingsForFixture();
   TaskRunners task_runners("test",                  // label
@@ -113,7 +145,7 @@ TEST_F(ShellTest, PlatformConfigurationWindowMetricsUpdate) {
   DestroyShell(std::move(shell), task_runners);
 }
 
-TEST_F(ShellTest, PlatformConfigurationOnErrorHandlesError) {
+TEST_F(PlatformConfigurationTest, OnErrorHandlesError) {
   auto message_latch = std::make_shared<fml::AutoResetWaitableEvent>();
   bool did_throw = false;
 
@@ -159,7 +191,7 @@ TEST_F(ShellTest, PlatformConfigurationOnErrorHandlesError) {
   DestroyShell(std::move(shell), task_runners);
 }
 
-TEST_F(ShellTest, PlatformConfigurationOnErrorDoesNotHandleError) {
+TEST_F(PlatformConfigurationTest, OnErrorDoesNotHandleError) {
   auto message_latch = std::make_shared<fml::AutoResetWaitableEvent>();
   std::string ex;
   std::string st;
@@ -211,7 +243,7 @@ TEST_F(ShellTest, PlatformConfigurationOnErrorDoesNotHandleError) {
   DestroyShell(std::move(shell), task_runners);
 }
 
-TEST_F(ShellTest, PlatformConfigurationOnErrorThrows) {
+TEST_F(PlatformConfigurationTest, OnErrorThrows) {
   auto message_latch = std::make_shared<fml::AutoResetWaitableEvent>();
   std::vector<std::string> errors;
   size_t throw_count = 0;
@@ -266,7 +298,7 @@ TEST_F(ShellTest, PlatformConfigurationOnErrorThrows) {
   DestroyShell(std::move(shell), task_runners);
 }
 
-TEST_F(ShellTest, PlatformConfigurationSetDartPerformanceMode) {
+TEST_F(PlatformConfigurationTest, SetDartPerformanceMode) {
   auto message_latch = std::make_shared<fml::AutoResetWaitableEvent>();
   auto finish = [message_latch](Dart_NativeArguments args) {
     // call needs to happen on the UI thread.
diff --git a/lib/ui/window/platform_isolate.cc b/lib/ui/window/platform_isolate.cc
new file mode 100644
index 0000000000000000000000000000000000000000..8b36e8a994a599f603c781077cc62c17d8efc935
--- /dev/null
+++ b/lib/ui/window/platform_isolate.cc
@@ -0,0 +1,47 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <iostream>
+#include <thread>
+
+#include "flutter/fml/macros.h"
+#include "flutter/fml/task_runner.h"
+#include "flutter/lib/ui/ui_dart_state.h"
+#include "flutter/lib/ui/window/platform_isolate.h"
+#include "third_party/tonic/converter/dart_converter.h"
+
+namespace flutter {
+
+void PlatformIsolateNativeApi::Spawn(Dart_Handle entry_point) {
+  UIDartState* current_state = UIDartState::Current();
+  FML_DCHECK(current_state != nullptr);
+  if (!current_state->IsRootIsolate()) {
+    // TODO(flutter/flutter#136314): Remove this restriction.
+    Dart_EnterScope();
+    Dart_ThrowException(tonic::ToDart(
+        "PlatformIsolates can only be spawned on the root isolate."));
+  }
+
+  char* error = nullptr;
+  current_state->CreatePlatformIsolate(entry_point, &error);
+  if (error) {
+    Dart_EnterScope();
+    Dart_Handle error_handle = tonic::ToDart<const char*>(error);
+    ::free(error);
+    Dart_ThrowException(error_handle);
+  }
+}
+
+bool PlatformIsolateNativeApi::IsRunningOnPlatformThread() {
+  UIDartState* current_state = UIDartState::Current();
+  FML_DCHECK(current_state != nullptr);
+  fml::RefPtr<fml::TaskRunner> platform_task_runner =
+      current_state->GetTaskRunners().GetPlatformTaskRunner();
+  if (!platform_task_runner) {
+    return false;
+  }
+  return platform_task_runner->RunsTasksOnCurrentThread();
+}
+
+}  // namespace flutter
diff --git a/lib/ui/text/text_box.h b/lib/ui/window/platform_isolate.h
similarity index 40%
rename from lib/ui/text/text_box.h
rename to lib/ui/window/platform_isolate.h
index 27f60670f232f0ede30d583e7a34856437f0ef25..47de2b282a9a28164c3aec6e1e1db0e29db64d42 100644
--- a/lib/ui/text/text_box.h
+++ b/lib/ui/window/platform_isolate.h
@@ -2,27 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_LIB_UI_TEXT_TEXT_BOX_H_
-#define FLUTTER_LIB_UI_TEXT_TEXT_BOX_H_
+#ifndef FLUTTER_LIB_UI_WINDOW_PLATFORM_ISOLATE_H_
+#define FLUTTER_LIB_UI_WINDOW_PLATFORM_ISOLATE_H_
 
 #include "third_party/dart/runtime/include/dart_api.h"
-#include "third_party/skia/include/core/SkRect.h"
-#include "third_party/tonic/converter/dart_converter.h"
 
 namespace flutter {
 
-enum class TextDirection {
-  rtl,
-  ltr,
-};
-
-struct TextBox {
-  SkRect rect;
-  TextDirection direction;
+class PlatformIsolateNativeApi {
+ public:
+  static void Spawn(Dart_Handle entry_point);
 
-  TextBox(SkRect r, TextDirection d) : rect(r), direction(d) {}
+  static bool IsRunningOnPlatformThread();
 };
 
 }  // namespace flutter
 
-#endif  // FLUTTER_LIB_UI_TEXT_TEXT_BOX_H_
+#endif  // FLUTTER_LIB_UI_WINDOW_PLATFORM_ISOLATE_H_
diff --git a/lib/ui/window/platform_message.cc b/lib/ui/window/platform_message.cc
index 14cd7bb21c9d1b0bf9b417726e6f3c37758c4693..88b271d9b55871cd666a0975ec26fdcd6ed70f5a 100644
--- a/lib/ui/window/platform_message.cc
+++ b/lib/ui/window/platform_message.cc
@@ -13,13 +13,13 @@ PlatformMessage::PlatformMessage(std::string channel,
                                  fml::RefPtr<PlatformMessageResponse> response)
     : channel_(std::move(channel)),
       data_(std::move(data)),
-      hasData_(true),
+      has_data_(true),
       response_(std::move(response)) {}
 PlatformMessage::PlatformMessage(std::string channel,
                                  fml::RefPtr<PlatformMessageResponse> response)
     : channel_(std::move(channel)),
       data_(),
-      hasData_(false),
+      has_data_(false),
       response_(std::move(response)) {}
 
 PlatformMessage::~PlatformMessage() = default;
diff --git a/lib/ui/window/platform_message.h b/lib/ui/window/platform_message.h
index 7fe09cdcac1c77db86c396a0b7c9a379f28a4e66..1e79f037413fe38621126e8a2370ebfb14c03dfb 100644
--- a/lib/ui/window/platform_message.h
+++ b/lib/ui/window/platform_message.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_LIB_UI_PLATFORM_PLATFORM_MESSAGE_H_
-#define FLUTTER_LIB_UI_PLATFORM_PLATFORM_MESSAGE_H_
+#ifndef FLUTTER_LIB_UI_WINDOW_PLATFORM_MESSAGE_H_
+#define FLUTTER_LIB_UI_WINDOW_PLATFORM_MESSAGE_H_
 
 #include <string>
 #include <vector>
@@ -25,7 +25,7 @@ class PlatformMessage {
 
   const std::string& channel() const { return channel_; }
   const fml::MallocMapping& data() const { return data_; }
-  bool hasData() { return hasData_; }
+  bool hasData() { return has_data_; }
 
   const fml::RefPtr<PlatformMessageResponse>& response() const {
     return response_;
@@ -36,10 +36,10 @@ class PlatformMessage {
  private:
   std::string channel_;
   fml::MallocMapping data_;
-  bool hasData_;
+  bool has_data_;
   fml::RefPtr<PlatformMessageResponse> response_;
 };
 
 }  // namespace flutter
 
-#endif  // FLUTTER_LIB_UI_PLATFORM_PLATFORM_MESSAGE_H_
+#endif  // FLUTTER_LIB_UI_WINDOW_PLATFORM_MESSAGE_H_
diff --git a/lib/ui/window/platform_message_response.h b/lib/ui/window/platform_message_response.h
index e0404c5adc749f5919c460265959c426d3330a51..8d5dff9f0fcb9f2ef9db0a4bdc8f2756eae94925 100644
--- a/lib/ui/window/platform_message_response.h
+++ b/lib/ui/window/platform_message_response.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_LIB_UI_PLATFORM_PLATFORM_MESSAGE_RESPONSE_H_
-#define FLUTTER_LIB_UI_PLATFORM_PLATFORM_MESSAGE_RESPONSE_H_
+#ifndef FLUTTER_LIB_UI_WINDOW_PLATFORM_MESSAGE_RESPONSE_H_
+#define FLUTTER_LIB_UI_WINDOW_PLATFORM_MESSAGE_RESPONSE_H_
 
 #include <vector>
 
@@ -33,4 +33,4 @@ class PlatformMessageResponse
 
 }  // namespace flutter
 
-#endif  // FLUTTER_LIB_UI_PLATFORM_PLATFORM_MESSAGE_RESPONSE_H_
+#endif  // FLUTTER_LIB_UI_WINDOW_PLATFORM_MESSAGE_RESPONSE_H_
diff --git a/lib/ui/window/platform_message_response_dart.h b/lib/ui/window/platform_message_response_dart.h
index f290faf6494546adb77f4b1b144bd5f661c9d14f..b716f5fc1f806d3c39af550d86909a11005e7642 100644
--- a/lib/ui/window/platform_message_response_dart.h
+++ b/lib/ui/window/platform_message_response_dart.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_LIB_UI_PLATFORM_PLATFORM_MESSAGE_RESPONSE_DART_H_
-#define FLUTTER_LIB_UI_PLATFORM_PLATFORM_MESSAGE_RESPONSE_DART_H_
+#ifndef FLUTTER_LIB_UI_WINDOW_PLATFORM_MESSAGE_RESPONSE_DART_H_
+#define FLUTTER_LIB_UI_WINDOW_PLATFORM_MESSAGE_RESPONSE_DART_H_
 
 #include "flutter/fml/message_loop.h"
 #include "flutter/lib/ui/window/platform_message_response.h"
@@ -33,4 +33,4 @@ class PlatformMessageResponseDart : public PlatformMessageResponse {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_LIB_UI_PLATFORM_PLATFORM_MESSAGE_RESPONSE_DART_H_
+#endif  // FLUTTER_LIB_UI_WINDOW_PLATFORM_MESSAGE_RESPONSE_DART_H_
diff --git a/lib/ui/window/platform_message_response_dart_port.h b/lib/ui/window/platform_message_response_dart_port.h
index f32806980ee48bf181b0914797ce6c5c81b48461..3652813858252fb83db1cfe3e5d3055642a7c778 100644
--- a/lib/ui/window/platform_message_response_dart_port.h
+++ b/lib/ui/window/platform_message_response_dart_port.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_LIB_UI_PLATFORM_PLATFORM_MESSAGE_RESPONSE_DART_PORT_H_
-#define FLUTTER_LIB_UI_PLATFORM_PLATFORM_MESSAGE_RESPONSE_DART_PORT_H_
+#ifndef FLUTTER_LIB_UI_WINDOW_PLATFORM_MESSAGE_RESPONSE_DART_PORT_H_
+#define FLUTTER_LIB_UI_WINDOW_PLATFORM_MESSAGE_RESPONSE_DART_PORT_H_
 
 #include "flutter/fml/message_loop.h"
 #include "flutter/lib/ui/window/platform_message_response.h"
@@ -32,4 +32,4 @@ class PlatformMessageResponseDartPort : public PlatformMessageResponse {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_LIB_UI_PLATFORM_PLATFORM_MESSAGE_RESPONSE_DART_PORT_H_
+#endif  // FLUTTER_LIB_UI_WINDOW_PLATFORM_MESSAGE_RESPONSE_DART_PORT_H_
diff --git a/lib/ui/window/pointer_data.cc b/lib/ui/window/pointer_data.cc
index d628ca7015fca5ab550cae82ef21efad1cefc149..e507db3337b4c50afe7aae0736171f997adfb19c 100644
--- a/lib/ui/window/pointer_data.cc
+++ b/lib/ui/window/pointer_data.cc
@@ -8,6 +8,17 @@
 
 namespace flutter {
 
+// The number of fields of PointerData.
+//
+// If kPointerDataFieldCount changes, update the corresponding values to:
+//
+//  * _kPointerDataFieldCount in platform_dispatcher.dart
+//  * POINTER_DATA_FIELD_COUNT in AndroidTouchProcessor.java
+//
+// (This is a centralized list of all locations that should be kept up-to-date.)
+static constexpr int kPointerDataFieldCount = 36;
+static constexpr int kBytesPerField = sizeof(int64_t);
+
 static_assert(sizeof(PointerData) == kBytesPerField * kPointerDataFieldCount,
               "PointerData has the wrong size");
 
diff --git a/lib/ui/window/pointer_data.h b/lib/ui/window/pointer_data.h
index 1f323cc4f81696d3214698d0d84409993d636e77..7e18e4dae230d6afe7999162f2218b4e4257f256 100644
--- a/lib/ui/window/pointer_data.h
+++ b/lib/ui/window/pointer_data.h
@@ -9,10 +9,6 @@
 
 namespace flutter {
 
-// If this value changes, update the pointer data unpacking code in
-// platform_dispatcher.dart.
-static constexpr int kPointerDataFieldCount = 35;
-static constexpr int kBytesPerField = sizeof(int64_t);
 // Must match the button constants in events.dart.
 enum PointerButtonMouse : int64_t {
   kPointerButtonMousePrimary = 1 << 0,
@@ -32,7 +28,13 @@ enum PointerButtonStylus : int64_t {
   kPointerButtonStylusSecondary = 1 << 2,
 };
 
-// This structure is unpacked by hooks.dart.
+// This structure is unpacked by platform_dispatcher.dart.
+//
+// If this struct changes, update:
+//  * kPointerDataFieldCount in pointer_data.cc. (The pointer_data.cc also
+//    lists out other locations that must be kept consistent.)
+//  * The functions to create simulated data in
+//    pointer_data_packet_converter_unittests.cc.
 struct alignas(8) PointerData {
   // Must match the PointerChange enum in pointer.dart.
   enum class Change : int64_t {
@@ -100,6 +102,7 @@ struct alignas(8) PointerData {
   double pan_delta_y;
   double scale;
   double rotation;
+  int64_t view_id;
 
   void Clear();
 };
diff --git a/lib/ui/window/pointer_data_packet_converter.cc b/lib/ui/window/pointer_data_packet_converter.cc
index 6750a7da227615185a0536884513516b0321f225..a2270382e226d09c415c2b11a249bca83d124c1e 100644
--- a/lib/ui/window/pointer_data_packet_converter.cc
+++ b/lib/ui/window/pointer_data_packet_converter.cc
@@ -11,7 +11,7 @@
 
 namespace flutter {
 
-PointerDataPacketConverter::PointerDataPacketConverter() : pointer_(0) {}
+PointerDataPacketConverter::PointerDataPacketConverter() {}
 
 PointerDataPacketConverter::~PointerDataPacketConverter() = default;
 
diff --git a/lib/ui/window/pointer_data_packet_converter.h b/lib/ui/window/pointer_data_packet_converter.h
index c837d610ae5afc15e74d41d70d373ccb2ffa6deb..d0e59803255aae086ec5f8b8eaaecc62b5a312b5 100644
--- a/lib/ui/window/pointer_data_packet_converter.h
+++ b/lib/ui/window/pointer_data_packet_converter.h
@@ -99,7 +99,7 @@ class PointerDataPacketConverter {
  private:
   std::map<int64_t, PointerState> states_;
 
-  int64_t pointer_;
+  int64_t pointer_ = 0;
 
   void ConvertPointerData(PointerData pointer_data,
                           std::vector<PointerData>& converted_pointers);
diff --git a/lib/ui/window/pointer_data_packet_converter_unittests.cc b/lib/ui/window/pointer_data_packet_converter_unittests.cc
index 7c4c98162a3ebec2bc75edc4cdfa9b1d2a14a7db..69e43cba54fe0dab286e5a92e8e2e4f5ae31a7a9 100644
--- a/lib/ui/window/pointer_data_packet_converter_unittests.cc
+++ b/lib/ui/window/pointer_data_packet_converter_unittests.cc
@@ -45,6 +45,7 @@ void CreateSimulatedPointerData(PointerData& data,  // NOLINT
   data.platformData = 0;
   data.scroll_delta_x = 0.0;
   data.scroll_delta_y = 0.0;
+  data.view_id = 0;
 }
 
 void CreateSimulatedMousePointerData(PointerData& data,  // NOLINT
@@ -84,6 +85,7 @@ void CreateSimulatedMousePointerData(PointerData& data,  // NOLINT
   data.platformData = 0;
   data.scroll_delta_x = scroll_delta_x;
   data.scroll_delta_y = scroll_delta_y;
+  data.view_id = 0;
 }
 
 void CreateSimulatedTrackpadGestureData(PointerData& data,  // NOLINT
@@ -129,6 +131,7 @@ void CreateSimulatedTrackpadGestureData(PointerData& data,  // NOLINT
   data.pan_delta_y = 0.0;
   data.scale = scale;
   data.rotation = rotation;
+  data.view_id = 0;
 }
 
 void UnpackPointerPacket(std::vector<PointerData>& output,  // NOLINT
@@ -713,5 +716,25 @@ TEST(PointerDataPacketConverterTest, CanConvertTrackpadGesture) {
   ASSERT_EQ(result[3].synthesized, 0);
 }
 
+TEST(PointerDataPacketConverterTest, CanConvertViewId) {
+  PointerDataPacketConverter converter;
+  auto packet = std::make_unique<PointerDataPacket>(2);
+  PointerData data;
+  CreateSimulatedPointerData(data, PointerData::Change::kAdd, 0, 0.0, 0.0, 0);
+  data.view_id = 100;
+  packet->SetPointerData(0, data);
+  CreateSimulatedPointerData(data, PointerData::Change::kHover, 0, 1.0, 0.0, 0);
+  data.view_id = 200;
+  packet->SetPointerData(1, data);
+  auto converted_packet = converter.Convert(std::move(packet));
+
+  std::vector<PointerData> result;
+  UnpackPointerPacket(result, std::move(converted_packet));
+
+  ASSERT_EQ(result.size(), (size_t)2);
+  ASSERT_EQ(result[0].view_id, 100);
+  ASSERT_EQ(result[1].view_id, 200);
+}
+
 }  // namespace testing
 }  // namespace flutter
diff --git a/lib/ui/window/viewport_metrics.cc b/lib/ui/window/viewport_metrics.cc
index 1d61a6fc552a33c6b98217fcfca264244d5bbbbb..05d01c47c8e34fe9c81b77d0e8606cab70c61c70 100644
--- a/lib/ui/window/viewport_metrics.cc
+++ b/lib/ui/window/viewport_metrics.cc
@@ -13,11 +13,13 @@ ViewportMetrics::ViewportMetrics() = default;
 ViewportMetrics::ViewportMetrics(double p_device_pixel_ratio,
                                  double p_physical_width,
                                  double p_physical_height,
-                                 double p_physical_touch_slop)
+                                 double p_physical_touch_slop,
+                                 size_t p_display_id)
     : device_pixel_ratio(p_device_pixel_ratio),
       physical_width(p_physical_width),
       physical_height(p_physical_height),
-      physical_touch_slop(p_physical_touch_slop) {}
+      physical_touch_slop(p_physical_touch_slop),
+      display_id(p_display_id) {}
 
 ViewportMetrics::ViewportMetrics(
     double p_device_pixel_ratio,
@@ -38,7 +40,8 @@ ViewportMetrics::ViewportMetrics(
     double p_physical_touch_slop,
     const std::vector<double>& p_physical_display_features_bounds,
     const std::vector<int>& p_physical_display_features_type,
-    const std::vector<int>& p_physical_display_features_state)
+    const std::vector<int>& p_physical_display_features_state,
+    size_t p_display_id)
     : device_pixel_ratio(p_device_pixel_ratio),
       physical_width(p_physical_width),
       physical_height(p_physical_height),
@@ -59,7 +62,8 @@ ViewportMetrics::ViewportMetrics(
       physical_touch_slop(p_physical_touch_slop),
       physical_display_features_bounds(p_physical_display_features_bounds),
       physical_display_features_type(p_physical_display_features_type),
-      physical_display_features_state(p_physical_display_features_state) {}
+      physical_display_features_state(p_physical_display_features_state),
+      display_id(p_display_id) {}
 
 bool operator==(const ViewportMetrics& a, const ViewportMetrics& b) {
   return a.device_pixel_ratio == b.device_pixel_ratio &&
@@ -85,23 +89,25 @@ bool operator==(const ViewportMetrics& a, const ViewportMetrics& b) {
          a.physical_display_features_bounds ==
              b.physical_display_features_bounds &&
          a.physical_display_features_type == b.physical_display_features_type &&
-         a.physical_display_features_state == b.physical_display_features_state;
+         a.physical_display_features_state ==
+             b.physical_display_features_state &&
+         a.display_id == b.display_id;
 }
 
 std::ostream& operator<<(std::ostream& os, const ViewportMetrics& a) {
-  os << "DPR: " << a.device_pixel_ratio << " "
-     << "Size: [" << a.physical_width << "W " << a.physical_height << "H] "
-     << "Padding: [" << a.physical_padding_top << "T "
-     << a.physical_padding_right << "R " << a.physical_padding_bottom << "B "
-     << a.physical_padding_left << "L] "
+  os << "DPR: " << a.device_pixel_ratio << " " << "Size: [" << a.physical_width
+     << "W " << a.physical_height << "H] " << "Padding: ["
+     << a.physical_padding_top << "T " << a.physical_padding_right << "R "
+     << a.physical_padding_bottom << "B " << a.physical_padding_left << "L] "
      << "Insets: [" << a.physical_view_inset_top << "T "
      << a.physical_view_inset_right << "R " << a.physical_view_inset_bottom
-     << "B " << a.physical_view_inset_left << "L] "
-     << "Gesture Insets: [" << a.physical_system_gesture_inset_top << "T "
+     << "B " << a.physical_view_inset_left << "L] " << "Gesture Insets: ["
+     << a.physical_system_gesture_inset_top << "T "
      << a.physical_system_gesture_inset_right << "R "
      << a.physical_system_gesture_inset_bottom << "B "
      << a.physical_system_gesture_inset_left << "L] "
-     << "Display Features: " << a.physical_display_features_type.size();
+     << "Display Features: " << a.physical_display_features_type.size() << " "
+     << "Display ID: " << a.display_id;
   return os;
 }
 
diff --git a/lib/ui/window/viewport_metrics.h b/lib/ui/window/viewport_metrics.h
index 414a8b132d56d7625d1a915f5d416ec6afb91636..13a0dee9439ea7a9676260dd3fd78861d41f6539 100644
--- a/lib/ui/window/viewport_metrics.h
+++ b/lib/ui/window/viewport_metrics.h
@@ -15,7 +15,8 @@ struct ViewportMetrics {
   ViewportMetrics(double p_device_pixel_ratio,
                   double p_physical_width,
                   double p_physical_height,
-                  double p_physical_touch_slop);
+                  double p_physical_touch_slop,
+                  size_t display_id);
   ViewportMetrics(double p_device_pixel_ratio,
                   double p_physical_width,
                   double p_physical_height,
@@ -34,7 +35,8 @@ struct ViewportMetrics {
                   double p_physical_touch_slop,
                   const std::vector<double>& p_physical_display_features_bounds,
                   const std::vector<int>& p_physical_display_features_type,
-                  const std::vector<int>& p_physical_display_features_state);
+                  const std::vector<int>& p_physical_display_features_state,
+                  size_t p_display_id);
 
   double device_pixel_ratio = 1.0;
   double physical_width = 0;
@@ -55,6 +57,7 @@ struct ViewportMetrics {
   std::vector<double> physical_display_features_bounds;
   std::vector<int> physical_display_features_type;
   std::vector<int> physical_display_features_state;
+  size_t display_id = 0;
 };
 
 bool operator==(const ViewportMetrics& a, const ViewportMetrics& b);
diff --git a/lib/ui/window/window.cc b/lib/ui/window/window.cc
deleted file mode 100644
index b269e97f7bf87015bef5298cb9c3ad5fbdf67c59..0000000000000000000000000000000000000000
--- a/lib/ui/window/window.cc
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "flutter/lib/ui/window/window.h"
-
-#include <utility>
-
-#include "third_party/tonic/converter/dart_converter.h"
-#include "third_party/tonic/dart_args.h"
-#include "third_party/tonic/logging/dart_invoke.h"
-#include "third_party/tonic/typed_data/dart_byte_data.h"
-
-namespace flutter {
-
-Window::Window(int64_t window_id, ViewportMetrics metrics)
-    : window_id_(window_id), viewport_metrics_(std::move(metrics)) {
-  library_.Set(tonic::DartState::Current(),
-               Dart_LookupLibrary(tonic::ToDart("dart:ui")));
-}
-
-Window::~Window() {}
-
-void Window::DispatchPointerDataPacket(const PointerDataPacket& packet) {
-  std::shared_ptr<tonic::DartState> dart_state = library_.dart_state().lock();
-  if (!dart_state) {
-    return;
-  }
-  tonic::DartState::Scope scope(dart_state);
-
-  const std::vector<uint8_t>& buffer = packet.data();
-  Dart_Handle data_handle =
-      tonic::DartByteData::Create(buffer.data(), buffer.size());
-  if (Dart_IsError(data_handle)) {
-    return;
-  }
-  tonic::CheckAndHandleError(tonic::DartInvokeField(
-      library_.value(), "_dispatchPointerDataPacket", {data_handle}));
-}
-
-void Window::UpdateWindowMetrics(const ViewportMetrics& metrics) {
-  viewport_metrics_ = metrics;
-
-  std::shared_ptr<tonic::DartState> dart_state = library_.dart_state().lock();
-  if (!dart_state) {
-    return;
-  }
-  tonic::DartState::Scope scope(dart_state);
-  tonic::CheckAndHandleError(tonic::DartInvokeField(
-      library_.value(), "_updateWindowMetrics",
-      {
-          tonic::ToDart(window_id_),
-          tonic::ToDart(metrics.device_pixel_ratio),
-          tonic::ToDart(metrics.physical_width),
-          tonic::ToDart(metrics.physical_height),
-          tonic::ToDart(metrics.physical_padding_top),
-          tonic::ToDart(metrics.physical_padding_right),
-          tonic::ToDart(metrics.physical_padding_bottom),
-          tonic::ToDart(metrics.physical_padding_left),
-          tonic::ToDart(metrics.physical_view_inset_top),
-          tonic::ToDart(metrics.physical_view_inset_right),
-          tonic::ToDart(metrics.physical_view_inset_bottom),
-          tonic::ToDart(metrics.physical_view_inset_left),
-          tonic::ToDart(metrics.physical_system_gesture_inset_top),
-          tonic::ToDart(metrics.physical_system_gesture_inset_right),
-          tonic::ToDart(metrics.physical_system_gesture_inset_bottom),
-          tonic::ToDart(metrics.physical_system_gesture_inset_left),
-          tonic::ToDart(metrics.physical_touch_slop),
-          tonic::ToDart(metrics.physical_display_features_bounds),
-          tonic::ToDart(metrics.physical_display_features_type),
-          tonic::ToDart(metrics.physical_display_features_state),
-      }));
-}
-
-}  // namespace flutter
diff --git a/lib/ui/window/window.h b/lib/ui/window/window.h
deleted file mode 100644
index aad79f9963f72c6a31d394d0f5fd5248ae486269..0000000000000000000000000000000000000000
--- a/lib/ui/window/window.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_LIB_UI_WINDOW_WINDOW_H_
-#define FLUTTER_LIB_UI_WINDOW_WINDOW_H_
-
-#include <functional>
-#include <string>
-#include <unordered_map>
-#include <vector>
-
-#include "flutter/lib/ui/window/key_data_packet.h"
-#include "flutter/lib/ui/window/platform_message.h"
-#include "flutter/lib/ui/window/pointer_data_packet.h"
-#include "flutter/lib/ui/window/viewport_metrics.h"
-#include "third_party/skia/include/gpu/GrDirectContext.h"
-#include "third_party/tonic/dart_persistent_value.h"
-
-namespace flutter {
-class Window final {
- public:
-  Window(int64_t window_id, ViewportMetrics metrics);
-
-  ~Window();
-
-  int window_id() const { return window_id_; }
-
-  const ViewportMetrics& viewport_metrics() const { return viewport_metrics_; }
-
-  // Dispatch a packet to the framework that indicates one or a few pointer
-  // events.
-  void DispatchPointerDataPacket(const PointerDataPacket& packet);
-  void UpdateWindowMetrics(const ViewportMetrics& metrics);
-
- private:
-  tonic::DartPersistentValue library_;
-  int64_t window_id_;
-  ViewportMetrics viewport_metrics_;
-};
-
-}  // namespace flutter
-
-#endif  // FLUTTER_LIB_UI_WINDOW_WINDOW_H_
diff --git a/lib/web_ui/README.md b/lib/web_ui/README.md
index 057ec0874f1ca8adc75e436b866c945885842ad6..3b2991afc3addd7bd6a5a18e1347a54acd44bb49 100644
--- a/lib/web_ui/README.md
+++ b/lib/web_ui/README.md
@@ -22,76 +22,100 @@ To tell `felt` to do anything you call `felt SUBCOMMAND`, where `SUBCOMMAND` is
 one of the available subcommands, which can be listed by running `felt help`. To
 get help for a specific subcommand, run `felt help SUBCOMMAND`.
 
-The most useful subcommands are:
-
-- `felt build` - builds a local Flutter Web engine ready to be used by the
-  Flutter framework. To use the local engine build, build with
-  `felt build --host`, then pass `--local-engine=host_debug_unopt` to the
-  `flutter` command, or to `dev/bots/test.dart` when running a web shard, such
-  as `web_tests`.
-- `felt test` - runs web engine tests. By default, this runs all tests using
-  Chromium. Passing one or more paths to specific tests would run just the
-  specified tests. Run `felt help test` for more options.
-
-`build` and `test` take the `--watch` option, which automatically reruns the
-subcommand when a source file changes. This is handy when you are iterating
-quickly.
-
-#### Examples
-
-Builds the web engine, the runs a Flutter app using it:
-
+#### `felt build`
+The `build` subcommand builds web engine gn/ninja targets. Targets can be
+individually specified in the command line invocation, or if none are specified,
+all web engine targets are built. Common targets are as follows:
+  * `sdk` - The flutter_web_sdk itself.
+  * `canvaskit` - Flutter's version of canvakit.
+  * `canvaskit_chromium` - A version of canvaskit optimized for use with
+    chromium-based browsers.
+  * `skwasm` - Builds experimental skia wasm module renderer.
+The output of these steps is used in unit tests, and can be used with the flutter
+command via the `--local-web-sdk=wasm_release` command.
+
+The `build` command also accepts either the `--profile` or `--debug` flags, which
+can be used to change the build profile of the artifacts.
+
+##### Examples
+Builds all web engine targets, then runs a Flutter app using it:
 ```
 felt build
 cd path/to/some/app
-flutter --local-engine=host_debug_unopt run -d chrome
+flutter --local-web-sdk=wasm_release run -d chrome
 ```
 
-Runs all tests in Chromium:
-
+Builds only the `sdk` and the `canvaskit` targets:
 ```
-felt test
+felt build sdk canvaskit
 ```
 
-Runs a specific test:
-
+#### `felt test`
+The `test` subcommand will compile and/or run web engine unit test suites. For
+information on how test suites are structured, see the test configuration
+[readme][2].
+
+By default, `felt test` compiles and runs all suites that are compatible with the
+host system. Some useful flags supported by this command:
+  * Action flags which say what parts of the test pipeline to perform. More of one
+    of these can be specified to run multiple actions. If none are specified, then
+    *all* of these actions are performed
+    * `--compile` performs compilation of the test bundles.
+    * `--run` runs the unit tests
+    * `--copy-artifacts` will copy build artifacts needed for the tests to run.
+      * The `--profile` or `--debug` flags can be specified to copy over artifacts
+        from the profile or debug build folders instead of release.
+  * `--list` will list all the test suites and test bundles and exit without
+    compiling or running anything.
+  * `--verbose` will output some extra information that may be useful for debugging.
+  * `--start-paused` will open a browser window and pause the tests before starting
+    so that breakpoints can be set before starting the test suites.
+
+Several other flags can be passed that filter which test suites should be run:
+  * `--browser` runs only the test suites that test on the browsers passed. Valid
+    values for this are `chrome`, `firefox`, `safari`, or `edge`.
+  * `--compiler` runs only the test suites that use a particular compiler. Valid
+    values for this are `dart2js` or `dart2wasm`
+  * `--renderer` runs only the test suites that use a particular renderer. Valid
+    values for this are `html`, `canvakit`, or `skwasm`
+  * `--suite` runs a suite by name.
+  * `--bundle` runs suites that target a particular test bundle.
+
+Filters of different types are logically ANDed together, but multiple filter flags
+of the same type are logically ORed together.
+
+The `test` command will also accept a list of paths to specific test files to be
+compiled and run. If none of these paths are specified, all tests are run, otherwise
+only the tests that are specified will run.
+
+##### Examples
+Runs all test suites in all compatible browsers:
 ```
-felt test test/engine/util_test.dart
+felt test
 ```
-
-Runs multiple specific tests:
-
+Runs a specific test on all compatible browsers:
 ```
-felt test test/engine/util_test.dart test/alarm_clock_test.dart
+felt test test/engine/util_test.dart
 ```
-
-Enable watch mode so that the test re-runs every time a source file changes:
-
+Runs multiple specific tests on all compatible browsers:
 ```
-felt test --watch test/engine/util_test.dart
+felt test test/engine/util_test.dart test/engine/alarm_clock_test.dart
 ```
-
-Runs tests in Firefox (requires a Linux computer):
-
+Runs only test suites that compile via dart2wasm:
 ```
-felt test --browser=firefox
+felt test --compiler dart2wasm
 ```
-
-Chromium and Firefox support debugging tests using the browser's developer
-tools. To run tests in debug mode add `--debug` to the `test` command, e.g.:
-
+Runs only test suites that run in Chrome and Safari:
 ```
-felt test --debug --browser=firefox test/alarm_clock_test.dart
+felt test --browser chrome --browser safari
 ```
 
 ### Optimizing local builds
 
 Concurrency of various build steps can be configured via environment variables:
 
-- `FELT_DART2JS_CONCURRENCY` specifies the number of concurrent `dart2js`
+- `FELT_COMPILE_CONCURRENCY` specifies the number of concurrent compiler
   processes used to compile tests. Default value is 8.
-- `FELT_TEST_CONCURRENCY` specifies the number of tests run concurrently.
-  Default value is 10.
 
 If you are a Google employee, you can use an internal instance of Goma (go/ma)
 to parallelize your ninja builds. Because Goma compiles code on remote servers,
@@ -100,7 +124,7 @@ this option is particularly effective for building on low-powered laptops.
 ### Test browsers
 
 Chromium, Firefox, and Safari for iOS are version-locked using the
-[browser_lock.yaml][2] configuration file. Safari for macOS is supplied by the
+[browser_lock.yaml][3] configuration file. Safari for macOS is supplied by the
 computer's operating system. Tests can be run in Edge locally, but Edge is not
 enabled on LUCI. Chromium is used as a proxy for Chrome, Edge, and other
 Chromium-based browsers.
@@ -111,18 +135,42 @@ tests locally. To make changes effective on LUCI follow instructions in
 
 ### Rolling browsers
 
-When running tests on LUCI using Chromium, LUCI uses the version of Chromium
-fetched from CIPD.
+When running tests on LUCI using Chrome, LUCI uses the version of Chrome for 
+Testing 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.
 
-#### Chromium
+### Rolling fallback fonts
+
+To generate new fallback font data and push the fallback fonts into a CIPD
+package for engine unit tests to consume, run the following felt command:
+
+```
+cipd auth-login
+felt roll-fallback-fonts --key=<Google Fonts API key>
+```
 
-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:
+You can obtain a GoogleFonts API key from here: https://developers.google.com/fonts/docs/developer_api#APIKey
+
+This will take the following steps:
+* Fetch a list of fonts from the Google Fonts API
+* Download each font we use for fallbacks and calculate its unicode ranges
+* Generate the `font_fallback_data.dart` file that is used in the engine
+* Push the fonts up to a CIPD package called `flutter/flutter_font_fallbacks`
+* Update the `DEPS` file in the engine to use the new version of the package
+
+To perform all these steps except actually uploading the package to CIPD, pass
+the `--dry-run` flag to the felt command.
+
+NOTE: Because this script uses `fc-config`, this roll step only actually works
+on Linux, not on macOS or Windows.
+
+#### Chrome for Testing
+
+Chrome for Testing is an independent project that gets rolled into Flutter
+manually, and as needed. Flutter consumes a pre-built Chrome for Testing build.
+The available versions of Chrome for Testing available can be found [here](https://googlechromelabs.github.io/chrome-for-testing/). To roll to a newer version:
 
 - Make sure you have `depot_tools` installed (if you are regularly hacking on
   the engine code, you probably do).
@@ -130,13 +178,8 @@ is needed, follow these steps to roll the new version:
   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).
+  - Set `version` to the full four part version number of the build of Chrome 
+    for Testing you want to roll (for example, `118.0.5993.70`)
 - 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),
@@ -163,7 +206,7 @@ After rolling Chrome and/or Firefox, also update the CI dependencies in
         [
           {"dependency": "chrome_and_driver", "version": "version:107.0"},
           {"dependency": "firefox", "version": "version:83.0"},
-          {"dependency": "goldctl", "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"}
+          {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
         ]
 ```
 
@@ -198,47 +241,6 @@ Resources:
 2. LUCI web [recipe][5]
 3. More general reading on CIPD packages [link][6]
 
-### Rolling CanvasKit
-
-CanvasKit is versioned separately from Skia and rolled manually. Flutter
-consumes a pre-built CanvasKit provided by the Skia team, currently hosted on
-unpkg.com. When a new version of CanvasKit is available (check
-https://www.npmjs.com/package/canvaskit-wasm or consult the Skia team
-directly), follow these steps to roll to 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; file a github
-  infra ticket queue issue: https://github.com/flutter/flutter/wiki/Infra-Ticket-Queue
-  to get access)
-- Edit `dev/canvaskit_lock.yaml` and update the value of `canvaskit_version`
-  to the new version.
-- Run `dart dev/canvaskit_roller.dart` and make sure it completes successfully.
-  The script uploads the new version of CanvasKit to the
-  `flutter/web/canvaskit_bundle` CIPD package, and writes the CIPD package
-  instance ID to the DEPS file.
-- Rerun `gclient sync` and do a clean build to test that the new version is
-  picked up.
-- Send a pull request containing the above file changes. If the new version
-  contains breaking changes, the PR must also contain corresponding fixes.
-
-If you have questions, contact the Flutter Web team on Flutter Discord on the
-#hackers-web-🌍 channel.
-
-### Rolling Noto Font Data
-
-In order to generate new data for the Noto fallback fonts, you will need
-a GoogleFonts API key. Once you have one, run:
-
-```
-./dev/felt generate-fallback-font-data --key=<your GoogleFonts API key>
-```
-
-This will generate the file `lib/src/engine/canvaskit/font_fallback_data.dart` with
-the latest data from GoogleFonts. This generated file should then be rolled in with
-a PR to the engine.
-
 ### Configuration files
 
 `browser_lock.yaml` contains the version of browsers we use to test Flutter for
@@ -248,39 +250,6 @@ Instead, we update this file manually once in a while.
 `canvaskit_lock.yaml` locks the version of CanvasKit for tests and production
 use.
 
-## Troubleshooting
-
-### Can't load Kernel binary: Invalid kernel binary format version.
-
-Sometimes `.dart_tool` cache invalidation fails, and you'll end up with a
-cached version of `felt` that is not compatible with the Dart SDK that you're
-using.
-
-In that case, any invocation to `felt` will fail with:
-
-```
-Can't load Kernel binary: Invalid kernel binary format version.
-```
-
-The solution is to delete the cached `felt.snapshot` files under `lib/web_ui`:
-
-```
-rm .dart_tool/felt.snapshot*
-```
-
-## Hacking on the `felt` tool itself
-
-If you are making changes in the `felt` tool itself, you need to be aware of
-Dart snapshots. We create a Dart snapshot of the `felt` tool to make the startup
-faster.
-
-To run `felt` from sources, disable the snapshot using the `FELT_USE_SNAPSHOT`
-environment variable:
-
-```
-FELT_USE_SNAPSHOT=false felt <command>
-```
-
 ## Building CanvasKit
 
 To build CanvasKit locally, you must first set up your gclient config to
@@ -335,7 +304,8 @@ Once you know the version for the Emscripten SDK, change the line in
 
 
 [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
+[2]: https://github.com/flutter/flutter/blob/main/lib/web_ui/test/README
+[3]: https://github.com/flutter/engine/blob/main/lib/web_ui/dev/browser_lock.yaml
 [4]: https://chrome-infra-packages.appspot.com/p/flutter_internal
 [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
diff --git a/lib/web_ui/analysis_options.yaml b/lib/web_ui/analysis_options.yaml
index 383ab4d7b0ec67abbe67de02fcbf8d09c576d861..a840680ab72e16eefb748975d95e38e6bedbf82b 100644
--- a/lib/web_ui/analysis_options.yaml
+++ b/lib/web_ui/analysis_options.yaml
@@ -6,6 +6,12 @@
 
 include: ../../analysis_options.yaml
 
+analyzer:
+  errors:
+    # We need this in the web engine in order to prevent committing `solo: true`
+    # in tests.
+    deprecated_member_use: true
+
 linter:
   rules:
     avoid_dynamic_calls: false
diff --git a/lib/web_ui/dart_test_chrome.yaml b/lib/web_ui/dart_test_chrome.yaml
index a43e4e114d98010417628b9d791c346001044348..8f232e4983d85f6e71d9dfa2743deb9af12ab059 100644
--- a/lib/web_ui/dart_test_chrome.yaml
+++ b/lib/web_ui/dart_test_chrome.yaml
@@ -5,14 +5,3 @@
 platforms:
   - chrome
   - vm
-
-presets:
-  cirrus:
-    override_platforms:
-      chrome:
-        settings:
-          # Required because Cirrus runs us as root.
-          # https://chromium.googlesource.com/chromium/src/+/master/docs/design/sandbox.md
-          # https://docs.travis-ci.com/user/chrome#Sandboxing
-          arguments: --no-sandbox
-    reporter: expanded
diff --git a/lib/web_ui/dev/browser.dart b/lib/web_ui/dev/browser.dart
index fda2bb9ca32813da73df2d09889d21cab496f7a6..ed40d295ca05a3867e183a338463f6298456a73c 100644
--- a/lib/web_ui/dev/browser.dart
+++ b/lib/web_ui/dev/browser.dart
@@ -6,7 +6,7 @@ import 'dart:async';
 import 'dart:math' as math;
 
 import 'package:image/image.dart';
-import 'package:test_api/src/backend/runtime.dart';
+import 'package:test_api/backend.dart';
 
 /// Provides the environment for a specific web browser.
 abstract class BrowserEnvironment {
@@ -42,7 +42,10 @@ abstract class BrowserEnvironment {
   /// browser in debug mode by pausing test execution after the code is loaded
   /// but before calling the `main()` function of the test, giving the
   /// developer a chance to set breakpoints.
-  Future<Browser> launchBrowserInstance(Uri url, {bool debug = false});
+  Future<Browser> launchBrowserInstance(
+    Uri url, {
+    bool debug = false,
+  });
 }
 
 /// An interface for running browser instances.
@@ -54,11 +57,11 @@ abstract class BrowserEnvironment {
 /// Any errors starting or running the browser process are reported through
 /// [onExit].
 abstract class Browser {
-  /// The Observatory URL for this browser.
+  /// The Dart VM Service URL for this browser.
   ///
   /// Returns `null` for browsers that aren't running the Dart VM, or
-  /// if the Observatory URL can't be found.
-  Future<Uri>? get observatoryUrl => null;
+  /// if the Dart VM Service URL can't be found.
+  Future<Uri>? get vmServiceUrl => null;
 
   /// The remote debugger URL for this browser.
   ///
diff --git a/lib/web_ui/dev/browser_lock.yaml b/lib/web_ui/dev/browser_lock.yaml
deleted file mode 100644
index 5666ba8df3f92bf5596f1d71d7d56555ff8d6946..0000000000000000000000000000000000000000
--- a/lib/web_ui/dev/browser_lock.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-# Please refer to the "Upgrade Browser Version" section in the README.md for
-# more details on how to update browser version numbers.
-chrome:
-  # It seems Chrome can't always release from the same build for all operating
-  # systems, so we specify per-OS build number.
-  #
-  # Follow these instructions to find the correct build number for a specific
-  # Chromium version + OS combo:
-  #
-  # https://www.chromium.org/getting-involved/download-chromium/#downloading-old-builds-of-chrome-chromium
-  #
-  # The OS names here must match what recipe Python expression
-  # `self.m.platform.name.capitalize()` evaluates to. See:
-  #
-  # recipe_modules/web_util/api.py
-  Linux: 1047731
-  Mac: 1047732
-  Mac_Arm: 1047734
-  Win: 1047731
-  version: '107.0' # CIPD tag for the above Build IDs. Normally "ChromeMajorVersion.UploadAttempt". ;)
-
-firefox:
-  version: '83.0'
-
-edge:
-  launcher_version: '1.2.0.0'
diff --git a/lib/web_ui/dev/build.dart b/lib/web_ui/dev/build.dart
index 215d59a2dbf95bd3128c1ddf8a27b6874a31d39f..1b6fcf3cbe5f66183a7c0ef2aebb2d9a5aa61962 100644
--- a/lib/web_ui/dev/build.dart
+++ b/lib/web_ui/dev/build.dart
@@ -3,16 +3,25 @@
 // found in the LICENSE file.
 
 import 'dart:async';
-import 'dart:io' show Directory;
 
 import 'package:args/command_runner.dart';
 import 'package:path/path.dart' as path;
-import 'package:watcher/src/watch_event.dart';
+import 'package:watcher/watcher.dart';
 
 import 'environment.dart';
+import 'exceptions.dart';
 import 'pipeline.dart';
 import 'utils.dart';
 
+const Map<String, String> targetAliases = <String, String>{
+  'sdk': 'flutter/web_sdk',
+  'web_sdk': 'flutter/web_sdk',
+  'canvaskit': 'flutter/third_party/canvaskit:canvaskit_group',
+  'canvaskit_chromium': 'flutter/third_party/canvaskit:canvaskit_chromium_group',
+  'skwasm': 'flutter/third_party/canvaskit:skwasm_group',
+  'archive': 'flutter/web_sdk:flutter_web_sdk_archive',
+};
+
 class BuildCommand extends Command<bool> with ArgUtils<bool> {
   BuildCommand() {
     argParser.addFlag(
@@ -21,17 +30,28 @@ class BuildCommand extends Command<bool> with ArgUtils<bool> {
       help: 'Run the build in watch mode so it rebuilds whenever a change is '
           'made. Disabled by default.',
     );
-    argParser.addFlag(
-      'build-canvaskit',
-      help: 'Build CanvasKit locally instead of getting it from CIPD. Enabled '
-          'by default.',
-      defaultsTo: true
-    );
     argParser.addFlag(
       'host',
       help: 'Build the host build instead of the wasm build, which is '
           'currently needed for `flutter run --local-engine` to work.'
     );
+    argParser.addFlag(
+      'profile',
+      help: 'Build in profile mode instead of release mode. In this mode, the '
+          'output will be located at "out/wasm_profile".\nThis only applies to '
+          'the wasm build. The host build is always built in release mode.',
+    );
+    argParser.addFlag(
+      'debug',
+      help: 'Build in debug mode instead of release mode. In this mode, the '
+          'output will be located at "out/wasm_debug".\nThis only applies to '
+          'the wasm build. The host build is always built in release mode.',
+    );
+    argParser.addFlag(
+      'dwarf',
+      help: 'Embed DWARF debugging info into the output wasm modules. This is '
+          'only valid in debug mode.',
+    );
   }
 
   @override
@@ -42,16 +62,28 @@ class BuildCommand extends Command<bool> with ArgUtils<bool> {
 
   bool get isWatchMode => boolArg('watch');
 
-  bool get buildCanvasKit => boolArg('build-canvaskit');
-
   bool get host => boolArg('host');
 
+  List<String> get targets => argResults?.rest ?? <String>[];
+  bool get embedDwarf => boolArg('dwarf');
+
   @override
   FutureOr<bool> run() async {
+    if (embedDwarf && runtimeMode != RuntimeMode.debug) {
+      throw ToolExit('Embedding DWARF data requires debug runtime mode.');
+    }
     final FilePath libPath = FilePath.fromWebUi('lib');
     final List<PipelineStep> steps = <PipelineStep>[
-      GnPipelineStep(buildCanvasKit: buildCanvasKit, host: host),
-      NinjaPipelineStep(target: host ? environment.hostDebugUnoptDir : environment.wasmReleaseOutDir),
+      GnPipelineStep(
+        host: host,
+        runtimeMode: runtimeMode,
+        embedDwarf: embedDwarf,
+      ),
+      NinjaPipelineStep(
+        host: host,
+        runtimeMode: runtimeMode,
+        targets: targets.map((String target) => targetAliases[target] ?? target),
+      ),
     ];
     final Pipeline buildPipeline = Pipeline(steps: steps);
     await buildPipeline.run();
@@ -75,10 +107,15 @@ class BuildCommand extends Command<bool> with ArgUtils<bool> {
 /// Not safe to interrupt as it may leave the `out/` directory in a corrupted
 /// state. GN is pretty quick though, so it's OK to not support interruption.
 class GnPipelineStep extends ProcessStep {
-  GnPipelineStep({required this.buildCanvasKit, required this.host});
+  GnPipelineStep({
+    required this.host,
+    required this.runtimeMode,
+    required this.embedDwarf,
+  });
 
-  final bool buildCanvasKit;
   final bool host;
+  final RuntimeMode runtimeMode;
+  final bool embedDwarf;
 
   @override
   String get description => 'gn';
@@ -95,8 +132,11 @@ class GnPipelineStep extends ProcessStep {
     } else {
       return <String>[
         '--web',
-        '--runtime-mode=release',
-        if (buildCanvasKit) '--build-canvaskit',
+        '--runtime-mode=${runtimeMode.name}',
+        if (runtimeMode == RuntimeMode.debug)
+          '--unoptimized',
+        if (embedDwarf)
+          '--wasm-use-dwarf',
       ];
     }
   }
@@ -115,7 +155,11 @@ class GnPipelineStep extends ProcessStep {
 ///
 /// Can be safely interrupted.
 class NinjaPipelineStep extends ProcessStep {
-  NinjaPipelineStep({required this.target});
+  NinjaPipelineStep({
+    required this.host,
+    required this.runtimeMode,
+    required this.targets,
+  });
 
   @override
   String get description => 'ninja';
@@ -123,8 +167,16 @@ class NinjaPipelineStep extends ProcessStep {
   @override
   bool get isSafeToInterrupt => true;
 
-  /// The target directory to build.
-  final Directory target;
+  final bool host;
+  final Iterable<String> targets;
+  final RuntimeMode runtimeMode;
+
+  String get buildDirectory {
+    if (host) {
+      return environment.hostDebugUnoptDir.path;
+    }
+    return getBuildDirectoryForRuntimeMode(runtimeMode).path;
+  }
 
   @override
   Future<ProcessManager> createProcess() {
@@ -133,7 +185,8 @@ class NinjaPipelineStep extends ProcessStep {
       'autoninja',
       <String>[
         '-C',
-        target.path,
+        buildDirectory,
+        ...targets,
       ],
     );
   }
diff --git a/lib/web_ui/dev/canvaskit_lock.yaml b/lib/web_ui/dev/canvaskit_lock.yaml
deleted file mode 100644
index 251e759555951e152e87095787c5283047f22deb..0000000000000000000000000000000000000000
--- a/lib/web_ui/dev/canvaskit_lock.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-# Specifies the version of CanvasKit to use for Flutter Web apps.
-#
-# See `lib/web_ui/README.md` for how to update this file.
-canvaskit_version: "0.37.1"
diff --git a/lib/web_ui/dev/canvaskit_roller.dart b/lib/web_ui/dev/canvaskit_roller.dart
deleted file mode 100644
index 44b4de43f9d61df0256760c69a44c18f033129f8..0000000000000000000000000000000000000000
--- a/lib/web_ui/dev/canvaskit_roller.dart
+++ /dev/null
@@ -1,169 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'dart:convert' show json;
-import 'dart:io';
-
-import 'package:path/path.dart' as pathlib;
-import 'package:yaml/yaml.dart';
-
-import 'environment.dart';
-import 'utils.dart';
-
-/// Rolls CanvasKit to the version specified in `dev/canvaskit_lock.yaml`.
-///
-/// Detailed instructions for how to use this script can be found in
-/// `lib/web_ui/README.md`.
-Future<void> main(List<String> args) async {
-  final String canvaskitVersion = _readCanvaskitVersion();
-  print('Rolling CanvasKit to version $canvaskitVersion');
-
-  final Directory canvaskitDirectory = await Directory.systemTemp.createTemp('canvaskit-roll-$canvaskitVersion-');
-  print('Will use ${canvaskitDirectory.path} as staging directory.');
-
-  final String baseUrl = 'https://unpkg.com/canvaskit-wasm@$canvaskitVersion/bin/';
-  print('Downloading CanvasKit from $baseUrl');
-  final HttpClient client = HttpClient();
-  for (final String assetPath in _canvaskitAssets) {
-    final String assetUrl = '$baseUrl/$assetPath';
-    final File assetFile = File(pathlib.joinAll(<String>[
-      canvaskitDirectory.path,
-      'canvaskit',
-      ...assetPath.split('/'), // so it's compatible with Windows
-    ]));
-    await assetFile.parent.create(recursive: true);
-    final HttpClientRequest request = await client.getUrl(Uri.parse(assetUrl));
-    final HttpClientResponse response = await request.close();
-    final IOSink fileSink = assetFile.openWrite();
-    await response.pipe(fileSink);
-  }
-  client.close();
-
-  final File cipdConfigFile = File(pathlib.join(
-    canvaskitDirectory.path,
-    'cipd.yaml',
-  ));
-  await cipdConfigFile.writeAsString('''
-package: flutter/web/canvaskit_bundle
-description: A build of CanvasKit bundled with Flutter Web apps
-preserve_writable: true
-data:
-  - dir: canvaskit
-''');
-
-  print('Uploading to CIPD');
-  await runProcess('cipd', <String>[
-    'create',
-    '--tag=version:$canvaskitVersion',
-    '--pkg-def=cipd.yaml',
-    '--json-output=result.json',
-  ], workingDirectory: canvaskitDirectory.path);
-
-  final Map<String, dynamic> cipdResult = json.decode(File(pathlib.join(
-    canvaskitDirectory.path,
-    'result.json',
-  )).readAsStringSync()) as Map<String, dynamic>;
-  final String cipdInstanceId = (cipdResult['result'] as Map<dynamic, dynamic>)['instance_id'] as String;
-
-  print('CIPD instance information:');
-  final String cipdInfo = await evalProcess('cipd', <String>[
-    'describe',
-    'flutter/web/canvaskit_bundle',
-    '--version=$cipdInstanceId',
-  ], workingDirectory: canvaskitDirectory.path);
-  print(cipdInfo.trim().split('\n').map((String line) => ' • $line').join('\n'));
-
-  print('Updating DEPS file');
-  await _updateDepsFile(cipdInstanceId);
-  await _updateCanvaskitInitializationCode(canvaskitVersion);
-
-  print('\nATTENTION: the roll process is not complete yet.');
-  print('Last step: for the roll to take effect submit an engine pull request from local git changes.');
-}
-
-const List<String> _canvaskitAssets = <String>[
-  'canvaskit.js',
-  'canvaskit.wasm',
-  'profiling/canvaskit.js',
-  'profiling/canvaskit.wasm',
-];
-
-String _readCanvaskitVersion() {
-  final YamlMap canvaskitLock = loadYaml(File(pathlib.join(
-    environment.webUiDevDir.path,
-    'canvaskit_lock.yaml',
-  )).readAsStringSync()) as YamlMap;
-  return canvaskitLock['canvaskit_version'] as String;
-}
-
-Future<void> _updateDepsFile(String cipdInstanceId) async {
-  final File depsFile = File(pathlib.join(
-    environment.flutterDirectory.path,
-    'DEPS',
-  ));
-
-  final String originalDepsCode = await depsFile.readAsString();
-  final List<String> rewrittenDepsCode = <String>[];
-  const String kCanvasKitDependencyKeyInDeps = "'canvaskit_cipd_instance': '";
-  bool canvaskitDependencyFound = false;
-  for (final String line in originalDepsCode.split('\n')) {
-    if (line.trim().startsWith(kCanvasKitDependencyKeyInDeps)) {
-      canvaskitDependencyFound = true;
-      rewrittenDepsCode.add(
-        "  'canvaskit_cipd_instance': '$cipdInstanceId',",
-      );
-    } else {
-      rewrittenDepsCode.add(line);
-    }
-  }
-
-  if (!canvaskitDependencyFound) {
-    stderr.writeln(
-      'Failed to update the DEPS file.\n'
-      'Could not to locate CanvasKit dependency in the DEPS file. Make sure the '
-      'DEPS file contains a line like this:\n'
-      '\n'
-      "  'canvaskit_cipd_instance': 'SOME_VALUE',"
-    );
-    exit(1);
-  }
-
-  await depsFile.writeAsString(rewrittenDepsCode.join('\n'));
-}
-
-Future<void> _updateCanvaskitInitializationCode(String canvaskitVersion) async {
-  const String kCanvasKitVersionKey = 'const String _canvaskitVersion';
-  const String kPathToConfigurationCode = 'lib/src/engine/configuration.dart';
-  final File initializationFile = File(pathlib.join(
-    environment.webUiRootDir.path,
-    kPathToConfigurationCode,
-  ));
-  final String originalInitializationCode = await initializationFile.readAsString();
-
-  final List<String> rewrittenCode = <String>[];
-  bool canvaskitVersionFound = false;
-  for (final String line in originalInitializationCode.split('\n')) {
-    if (line.trim().startsWith(kCanvasKitVersionKey)) {
-      canvaskitVersionFound = true;
-      rewrittenCode.add(
-        "const String _canvaskitVersion = '$canvaskitVersion';",
-      );
-    } else {
-      rewrittenCode.add(line);
-    }
-  }
-
-  if (!canvaskitVersionFound) {
-    stderr.writeln(
-      'Failed to update CanvasKit version in $kPathToConfigurationCode.\n'
-      'Could not to locate the constant that defines the version. Make sure the '
-      '$kPathToConfigurationCode file contains a line like this:\n'
-      '\n'
-      "const String _canvaskitVersion = 'VERSION';"
-    );
-    exit(1);
-  }
-
-  await initializationFile.writeAsString(rewrittenCode.join('\n'));
-}
diff --git a/lib/web_ui/dev/chrome.dart b/lib/web_ui/dev/chrome.dart
index 8bae9250d4ccfe2cbd652123195c1364d09aec6d..d6ecd3d2daafd19cd3edb690488ab0230bfcf487 100644
--- a/lib/web_ui/dev/chrome.dart
+++ b/lib/web_ui/dev/chrome.dart
@@ -8,28 +8,39 @@ import 'dart:io';
 import 'dart:math' as math;
 
 import 'package:image/image.dart';
-import 'package:test_api/src/backend/runtime.dart';
+import 'package:path/path.dart' as path;
+import 'package:test_api/backend.dart';
 import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart'
     as wip;
 
 import 'browser.dart';
-import 'browser_lock.dart';
 import 'browser_process.dart';
 import 'chrome_installer.dart';
 import 'common.dart';
 import 'environment.dart';
+import 'package_lock.dart';
 
 /// Provides an environment for desktop Chrome.
 class ChromeEnvironment implements BrowserEnvironment {
-  ChromeEnvironment(this._enableWasmGC);
+  ChromeEnvironment({
+    required bool useDwarf,
+  }) : _useDwarf = useDwarf;
 
   late final BrowserInstallation _installation;
 
-  final bool _enableWasmGC;
+  final bool _useDwarf;
 
   @override
-  Future<Browser> launchBrowserInstance(Uri url, {bool debug = false}) async {
-    return Chrome(url, _installation, debug: debug, enableWasmGC: _enableWasmGC);
+  Future<Browser> launchBrowserInstance(
+    Uri url, {
+    bool debug = false,
+  }) async {
+    return Chrome(
+      url,
+      _installation,
+      debug: debug,
+      useDwarf: _useDwarf
+    );
   }
 
   @override
@@ -37,7 +48,7 @@ class ChromeEnvironment implements BrowserEnvironment {
 
   @override
   Future<void> prepare() async {
-    final String version = browserLock.chromeLock.versionForCurrentPlatform;
+    final String version = packageLock.chromeLock.version;
     _installation = await getOrInstallChrome(
       version,
       infoLog: isCi ? stdout : DevNull(),
@@ -64,7 +75,12 @@ class ChromeEnvironment implements BrowserEnvironment {
 class Chrome extends Browser {
   /// Starts a new instance of Chrome open to the given [url], which may be a
   /// [Uri] or a [String].
-  factory Chrome(Uri url, BrowserInstallation installation, {required bool debug, required bool enableWasmGC}) {
+  factory Chrome(
+    Uri url,
+    BrowserInstallation installation, {
+    required bool debug,
+    required bool useDwarf,
+  }) {
     final Completer<Uri> remoteDebuggerCompleter = Completer<Uri>.sync();
     return Chrome._(BrowserProcess(() async {
       // A good source of various Chrome CLI options:
@@ -79,14 +95,8 @@ class Chrome extends Browser {
       // --disable-font-subpixel-positioning
       final bool isChromeNoSandbox =
           Platform.environment['CHROME_NO_SANDBOX'] == 'true';
-      final String dir = environment.webUiDartToolDir.createTempSync('test_chrome_user_data_').resolveSymbolicLinksSync();
-      final String jsFlags = enableWasmGC ? <String>[
-        '--experimental-wasm-gc',
-        '--experimental-wasm-stack-switching',
-        '--experimental-wasm-type-reflection',
-      ].join(' ') : '';
+      final String dir = await generateUserDirectory(installation, useDwarf);
       final List<String> args = <String>[
-        if (jsFlags.isNotEmpty) '--js-flags=$jsFlags',
         '--user-data-dir=$dir',
         url.toString(),
         if (!debug)
@@ -101,7 +111,13 @@ class Chrome extends Browser {
           '--start-maximized',
         if (debug)
           '--auto-open-devtools-for-tabs',
-        '--disable-extensions',
+        if (useDwarf)
+          '--devtools-flags=enabledExperiments=wasmDWARFDebugging',
+        // Always run unit tests at a 1x scale factor
+        '--force-device-scale-factor=1',
+        if (!useDwarf)
+          // DWARF debugging requires a Chrome extension.
+          '--disable-extensions',
         '--disable-popup-blocking',
         // Indicates that the browser is in "browse without sign-in" (Guest session) mode.
         '--bwsi',
@@ -110,6 +126,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 =
@@ -127,6 +151,64 @@ class Chrome extends Browser {
 
   Chrome._(this._process, this.remoteDebuggerUrl);
 
+  static Future<String> generateUserDirectory(
+    BrowserInstallation installation,
+    bool useDwarf
+  ) async {
+    final String userDirectoryPath = environment
+        .webUiDartToolDir
+        .createTempSync('test_chrome_user_data_')
+        .resolveSymbolicLinksSync();
+    if (!useDwarf) {
+      return userDirectoryPath;
+    }
+
+    // Using DWARF debugging info requires installation of a Chrome extension.
+    // We can prompt for this, but in order to avoid prompting on every single
+    // browser launch, we cache the user directory after it has been installed.
+    final Directory baselineUserDirectory = Directory(path.join(
+      environment.webUiDartToolDir.path,
+      'chrome_user_data_base',
+    ));
+    final Directory dwarfExtensionInstallDirectory = Directory(path.join(
+      baselineUserDirectory.path,
+      'Default',
+      'Extensions',
+      // This is the ID of the dwarf debugging extension.
+      'pdcpmagijalfljmkmjngeonclgbbannb',
+    ));
+    if (!baselineUserDirectory.existsSync()) {
+      baselineUserDirectory.createSync(recursive: true);
+    }
+    if (!dwarfExtensionInstallDirectory.existsSync()) {
+      print('DWARF debugging requested. Launching Chrome. Please install the '
+            'extension and then exit Chrome when the installation is complete...');
+      final Process addExtension = await Process.start(
+        installation.executable,
+        <String>[
+          '--user-data-dir=${baselineUserDirectory.path}',
+          'https://goo.gle/wasm-debugging-extension',
+          '--bwsi',
+          '--no-first-run',
+          '--no-default-browser-check',
+          '--disable-default-apps',
+          '--disable-translate',
+        ]
+      );
+      await addExtension.exitCode;
+    }
+    for (final FileSystemEntity input in baselineUserDirectory.listSync(recursive: true)) {
+      final String relative = path.relative(input.path, from: baselineUserDirectory.path);
+      final String outputPath = path.join(userDirectoryPath, relative);
+      if (input is Directory) {
+        await Directory(outputPath).create(recursive: true);
+      } else if (input is File) {
+        await input.copy(outputPath);
+      }
+    }
+    return userDirectoryPath;
+  }
+
   final BrowserProcess _process;
 
   @override
diff --git a/lib/web_ui/dev/chrome_installer.dart b/lib/web_ui/dev/chrome_installer.dart
index fda05dbfe01d81e3fa0532ec46b869ea9448e3cb..0f812319806c887289ed48dd877d5e93ae3ef796 100644
--- a/lib/web_ui/dev/chrome_installer.dart
+++ b/lib/web_ui/dev/chrome_installer.dart
@@ -180,7 +180,7 @@ class ChromeInstaller {
     /// Windows LUCI bots does not have a `unzip`. Instead we are
     /// using `archive` pub package.
     ///
-    /// We didn't use `archieve` on Mac/Linux since the new files have
+    /// We didn't use `archive` on Mac/Linux since the new files have
     /// permission issues. For now we are not able change file permissions
     /// from dart.
     /// See: https://github.com/dart-lang/sdk/issues/15078.
@@ -219,7 +219,7 @@ class ChromeInstaller {
       // named e.g. 'chrome-linux'. We need to copy the files out of that
       // directory and into the version directory.
       final io.Directory tmpDir = await io.Directory.systemTemp.createTemp();
-      final io.Directory unzipDir = io.Platform.isLinux ? tmpDir : versionDir;
+      final io.Directory unzipDir = tmpDir;
       final io.ProcessResult unzipResult =
           await io.Process.run('unzip', <String>[
         downloadedFile.path,
@@ -233,17 +233,13 @@ class ChromeInstaller {
             'The unzip process exited with code ${unzipResult.exitCode}.');
       }
 
-      // Remove the "chrome-linux/" path prefix, which is the Linux
-      // convention for Chromium directory structure.
-      if (io.Platform.isLinux) {
-        final io.Directory chromeLinuxDir =
-            await tmpDir.list().single as io.Directory;
-        await for (final io.FileSystemEntity entity in chromeLinuxDir.list()) {
-          await entity
-              .rename(path.join(versionDir.path, path.basename(entity.path)));
-        }
-        await tmpDir.delete(recursive: true);
+      final io.Directory topLevelDir =
+          await tmpDir.list().single as io.Directory;
+      await for (final io.FileSystemEntity entity in topLevelDir.list()) {
+        await entity
+            .rename(path.join(versionDir.path, path.basename(entity.path)));
       }
+      await tmpDir.delete(recursive: true);
     }
 
     downloadedFile.deleteSync();
diff --git a/lib/web_ui/dev/cipd.dart b/lib/web_ui/dev/cipd.dart
new file mode 100644
index 0000000000000000000000000000000000000000..70a17b170acefc42345c2db5c320b91c59d52851
--- /dev/null
+++ b/lib/web_ui/dev/cipd.dart
@@ -0,0 +1,81 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io' as io;
+
+import 'package:path/path.dart' as path;
+
+import 'utils.dart';
+
+// Determine if a `package` tagged with version:`versionTag` already exists in CIPD.
+Future<bool> cipdKnowsPackageVersion({
+  required String package,
+  required String versionTag,
+  bool isVerbose = false,
+}) async {
+  // $ cipd search $package -tag version:$versionTag
+  // Instances:
+  //   $package:CIPD_PACKAGE_ID
+  // or:
+  // No matching instances.
+  final String logLevel = isVerbose ? 'debug' : 'warning';
+  final String stdout = await evalProcess('cipd', <String>[
+    'search',
+    package,
+    '--tag',
+    'version:$versionTag',
+    '--log-level',
+    logLevel,
+  ]);
+
+  return stdout.contains('Instances:') && stdout.contains(package);
+}
+
+// Runs a CIPD command to upload a package defined by its `config` file.
+Future<int> uploadDirectoryToCipd({
+  required io.Directory directory,
+  required String packageName,
+  required String configFileName,
+  required String description,
+  required String root,
+  required String version,
+  bool isDryRun = false,
+  bool isVerbose = false,
+}) async {
+  final String cipdConfig = '''
+package: $packageName
+description: $description
+preserve_writable: true
+root: $root
+data:
+  - dir: .
+''';
+
+  // Create the config manifest to upload to CIPD
+  final io.File configFile = io.File(path.join(directory.path, configFileName));
+  await configFile.writeAsString(cipdConfig);
+
+  final String cipdCommand = isDryRun ? 'pkg-build' : 'create';
+  // CIPD won't fully shut up even in 'error' mode
+  final String logLevel = isVerbose ? 'debug' : 'warning';
+  return runProcess('cipd', <String>[
+    cipdCommand,
+    '--pkg-def',
+    path.basename(configFile.path),
+    '--json-output',
+    '${path.basenameWithoutExtension(configFile.path)}.json',
+    '--log-level',
+    logLevel,
+    if (!isDryRun) ...<String>[
+      '--tag',
+      'version:$version',
+      '--ref',
+      version,
+    ],
+    if (isDryRun) ...<String>[
+      '--out',
+      '${path.basenameWithoutExtension(configFile.path)}.zip',
+    ],
+  ], workingDirectory: directory.path);
+}
diff --git a/lib/web_ui/dev/clean.dart b/lib/web_ui/dev/clean.dart
index 176f6303a45f1f3dc81e6a01626cbb2d7cb6779b..48584c7b81be213deedbfa9b10f640804b74c24c 100644
--- a/lib/web_ui/dev/clean.dart
+++ b/lib/web_ui/dev/clean.dart
@@ -37,9 +37,12 @@ class CleanCommand extends Command<bool> with ArgUtils<bool> {
 
   @override
   FutureOr<bool> run() async {
+    // This is the old path that tests used to be built into. Clean this path too.
+    final String legacyBuildPath = path.join(environment.webUiRootDir.path, 'build');
     final List<io.FileSystemEntity> thingsToBeCleaned = <io.FileSystemEntity>[
       environment.webUiDartToolDir,
       environment.webUiBuildDir,
+      io.Directory(legacyBuildPath),
       io.File(path.join(environment.webUiRootDir.path, '.dart_tool', 'package_config.json')),
       io.File(path.join(environment.webUiRootDir.path, 'pubspec.lock')),
       if (_alsoCleanNinja)
diff --git a/lib/web_ui/dev/common.dart b/lib/web_ui/dev/common.dart
index eab1360ac87c26809feb66aaa16561ad9bda4264..2f19ef15af48e8936a7efd7ad615badb2783d434 100644
--- a/lib/web_ui/dev/common.dart
+++ b/lib/web_ui/dev/common.dart
@@ -7,10 +7,10 @@ import 'dart:io' as io;
 import 'package:path/path.dart' as path;
 
 import 'browser.dart';
-import 'browser_lock.dart';
 import 'chrome.dart';
 import 'edge.dart';
 import 'environment.dart';
+import 'felt_config.dart';
 import 'firefox.dart';
 import 'safari_macos.dart';
 
@@ -42,9 +42,14 @@ abstract class PlatformBinding {
     throw UnsupportedError('${io.Platform.operatingSystem} is not supported');
   }
 
-  String getChromeBuild(ChromeLock chromeLock);
-  String getChromeDownloadUrl(String version);
-  String getChromeDriverDownloadUrl(String version);
+  String get chromePlatformString;
+
+  String getChromeDownloadUrl(String version) =>
+      'https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/$version/$chromePlatformString/chrome-$chromePlatformString.zip';
+
+  String getChromeDriverDownloadUrl(String version) =>
+      'https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/$version/$chromePlatformString/chromedriver-$chromePlatformString.zip';
+
   String getFirefoxDownloadUrl(String version);
   String getFirefoxDownloadFilename(String version);
   String getChromeExecutablePath(io.Directory versionDir);
@@ -52,24 +57,15 @@ abstract class PlatformBinding {
   String getFirefoxLatestVersionUrl();
   String getMacApplicationLauncher();
   String getCommandToRunEdge();
-}
 
-const String _kBaseDownloadUrl =
-    'https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o';
-
-class WindowsPlatformBinding implements PlatformBinding {
-  @override
-  String getChromeBuild(ChromeLock chromeLock) {
-    return chromeLock.windows;
-  }
-
-  @override
-  String getChromeDownloadUrl(String version) =>
-      'https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Win%2F$version%2Fchrome-win.zip?alt=media';
+  String getEsbuildDownloadUrl(String version) =>
+      'https://registry.npmjs.org/@esbuild/$esbuildPlatformName/-/$esbuildPlatformName-$version.tgz';
+  String get esbuildPlatformName;
+}
 
+class WindowsPlatformBinding extends PlatformBinding {
   @override
-  String getChromeDriverDownloadUrl(String version) =>
-      'https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Win%2F$version%2Fchromedriver_win32.zip?alt=media';
+  String get chromePlatformString => 'win64';
 
   @override
   String getChromeExecutablePath(io.Directory versionDir) =>
@@ -97,21 +93,14 @@ class WindowsPlatformBinding implements PlatformBinding {
 
   @override
   String getCommandToRunEdge() => 'MicrosoftEdgeLauncher';
-}
 
-class LinuxPlatformBinding implements PlatformBinding {
   @override
-  String getChromeBuild(ChromeLock chromeLock) {
-    return chromeLock.linux;
-  }
-
-  @override
-  String getChromeDownloadUrl(String version) =>
-      '$_kBaseDownloadUrl/Linux_x64%2F$version%2Fchrome-linux.zip?alt=media';
+  String get esbuildPlatformName => 'win32-x64';
+}
 
+class LinuxPlatformBinding extends PlatformBinding {
   @override
-  String getChromeDriverDownloadUrl(String version) =>
-      '$_kBaseDownloadUrl/Linux_x64%2F$version%2Fchromedriver_linux64.zip?alt=media';
+  String get chromePlatformString => 'linux64';
 
   @override
   String getChromeExecutablePath(io.Directory versionDir) =>
@@ -141,27 +130,19 @@ class LinuxPlatformBinding implements PlatformBinding {
   @override
   String getCommandToRunEdge() =>
       throw UnsupportedError('Edge is not supported on Linux');
-}
-
-abstract class MacPlatformBinding implements PlatformBinding {
-  String get chromePlatformString;
 
   @override
-  String getChromeDownloadUrl(String version) =>
-      '$_kBaseDownloadUrl/$chromePlatformString%2F$version%2Fchrome-mac.zip?alt=media';
-
-  @override
-  String getChromeDriverDownloadUrl(String version) =>
-      '$_kBaseDownloadUrl/$chromePlatformString%2F$version%2Fchromedriver_mac64.zip?alt=media';
+  String get esbuildPlatformName => 'linux-x64';
+}
 
+abstract class MacPlatformBinding extends PlatformBinding {
   @override
   String getChromeExecutablePath(io.Directory versionDir) => path.join(
         versionDir.path,
-        'chrome-mac',
-        'Chromium.app',
+        'Google Chrome for Testing.app',
         'Contents',
         'MacOS',
-        'Chromium',
+        'Google Chrome for Testing',
       );
 
   @override
@@ -190,22 +171,18 @@ abstract class MacPlatformBinding implements PlatformBinding {
 
 class MacArmPlatformBinding extends MacPlatformBinding {
   @override
-  String get chromePlatformString => 'Mac_Arm';
+  String get chromePlatformString => 'mac-arm64';
 
   @override
-  String getChromeBuild(ChromeLock chromeLock) {
-    return chromeLock.macArm;
-  }
+  String get esbuildPlatformName => 'darwin-arm64';
 }
 
 class Macx64PlatformBinding extends MacPlatformBinding {
   @override
-  String get chromePlatformString => 'Mac';
+  String get chromePlatformString => 'mac-x64';
 
   @override
-  String getChromeBuild(ChromeLock chromeLock) {
-    return chromeLock.mac;
-  }
+  String get esbuildPlatformName => 'darwin-x64';
 }
 
 class BrowserInstallation {
@@ -236,15 +213,12 @@ class DevNull implements StringSink {
   void writeln([Object? obj = '']) {}
 }
 
-/// Whether the felt command is running on Cirrus CI.
-bool get isCirrus => io.Platform.environment['CIRRUS_CI'] == 'true';
-
 /// Whether the felt command is running on LUCI.
 bool get isLuci => io.Platform.environment['LUCI_CONTEXT'] != null;
 
 /// Whether the felt command is running on one of the Continuous Integration
 /// environements.
-bool get isCi => isCirrus || isLuci;
+bool get isCi => isLuci;
 
 const String kChrome = 'chrome';
 const String kEdge = 'edge';
@@ -261,16 +235,18 @@ const List<String> kAllBrowserNames = <String>[
 /// Creates an environment for a browser.
 ///
 /// The [browserName] matches the browser name passed as the `--browser` option.
-BrowserEnvironment getBrowserEnvironment(String browserName, { required bool enableWasmGC }) {
+BrowserEnvironment getBrowserEnvironment(
+  BrowserName browserName, {
+  required bool useDwarf,
+}) {
   switch (browserName) {
-    case kChrome:
-      return ChromeEnvironment(enableWasmGC);
-    case kEdge:
+    case BrowserName.chrome:
+      return ChromeEnvironment(useDwarf: useDwarf);
+    case BrowserName.edge:
       return EdgeEnvironment();
-    case kFirefox:
+    case BrowserName.firefox:
       return FirefoxEnvironment();
-    case kSafari:
+    case BrowserName.safari:
       return SafariMacOsEnvironment();
   }
-  throw UnsupportedError('Browser $browserName is not supported.');
 }
diff --git a/lib/web_ui/dev/edge.dart b/lib/web_ui/dev/edge.dart
index 032071ae8b3dcb8cd12ad3b726ff93fade7f6ec1..b27a401b425949359ad1125bf8614eb0dc19e804 100644
--- a/lib/web_ui/dev/edge.dart
+++ b/lib/web_ui/dev/edge.dart
@@ -5,13 +5,13 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:test_api/src/backend/runtime.dart';
+import 'package:test_api/backend.dart';
 
 import 'browser.dart';
-import 'browser_lock.dart';
 import 'browser_process.dart';
 import 'common.dart';
 import 'edge_installation.dart';
+import 'package_lock.dart';
 
 /// Provides an environment for the desktop Microsoft Edge (Chromium-based).
 class EdgeEnvironment implements BrowserEnvironment {
@@ -24,7 +24,7 @@ class EdgeEnvironment implements BrowserEnvironment {
   }
 
   @override
-  Runtime get packageTestRuntime => Runtime.internetExplorer;
+  Runtime get packageTestRuntime => Runtime.edge;
 
   @override
   Future<void> prepare() async {
@@ -51,7 +51,7 @@ class Edge extends Browser {
   factory Edge(Uri url) {
     return Edge._(BrowserProcess(() async {
       final BrowserInstallation installation = await getEdgeInstallation(
-        browserLock.edgeLock.launcherVersion,
+        packageLock.edgeLock.launcherVersion,
         infoLog: DevNull(),
       );
 
diff --git a/lib/web_ui/dev/edge_installation.dart b/lib/web_ui/dev/edge_installation.dart
index 28e3e0599175c501c0808cc4673c30b066d2bc27..2f6f893777270a02a5e9e3d6cf904bbe6d903314 100644
--- a/lib/web_ui/dev/edge_installation.dart
+++ b/lib/web_ui/dev/edge_installation.dart
@@ -8,9 +8,9 @@ import 'dart:io' as io;
 import 'package:http/http.dart';
 import 'package:path/path.dart' as path;
 
-import 'browser_lock.dart';
 import 'common.dart';
 import 'environment.dart';
+import 'package_lock.dart';
 
 /// Returns the installation of Edge.
 ///
@@ -84,7 +84,7 @@ class EdgeLauncher {
   bool get isInstalled => executable.existsSync();
 
   /// Version number launcher executable  `MicrosoftEdgeLauncher`.
-  String get version => browserLock.edgeLock.launcherVersion;
+  String get version => packageLock.edgeLock.launcherVersion;
 
   /// Url for downloading  `MicrosoftEdgeLauncher`.
   ///
diff --git a/lib/web_ui/dev/environment.dart b/lib/web_ui/dev/environment.dart
index 436d8cf47dcf9bcb58bc0a0a0b3604516bb090c4..061994dfa3cb709bd45a1b72a483756a5705238a 100644
--- a/lib/web_ui/dev/environment.dart
+++ b/lib/web_ui/dev/environment.dart
@@ -30,6 +30,10 @@ class Environment {
         io.Directory(pathlib.join(engineSrcDir.path, 'out'));
     final io.Directory wasmReleaseOutDir =
         io.Directory(pathlib.join(outDir.path, 'wasm_release'));
+    final io.Directory wasmProfileOutDir =
+        io.Directory(pathlib.join(outDir.path, 'wasm_profile'));
+    final io.Directory wasmDebugUnoptOutDir =
+        io.Directory(pathlib.join(outDir.path, 'wasm_debug_unopt'));
     final io.Directory hostDebugUnoptDir =
         io.Directory(pathlib.join(outDir.path, 'host_debug_unopt'));
     final io.Directory dartSdkDir = dartExecutable.parent.parent;
@@ -54,6 +58,8 @@ class Environment {
       engineToolsDir: engineToolsDir,
       outDir: outDir,
       wasmReleaseOutDir: wasmReleaseOutDir,
+      wasmProfileOutDir: wasmProfileOutDir,
+      wasmDebugUnoptOutDir: wasmDebugUnoptOutDir,
       hostDebugUnoptDir: hostDebugUnoptDir,
       dartSdkDir: dartSdkDir,
     );
@@ -67,6 +73,8 @@ class Environment {
     required this.engineToolsDir,
     required this.outDir,
     required this.wasmReleaseOutDir,
+    required this.wasmProfileOutDir,
+    required this.wasmDebugUnoptOutDir,
     required this.hostDebugUnoptDir,
     required this.dartSdkDir,
   });
@@ -96,6 +104,12 @@ class Environment {
   /// We build CanvasKit in release mode to reduce code size.
   final io.Directory wasmReleaseOutDir;
 
+  /// The output directory for the wasm_profile build.
+  final io.Directory wasmProfileOutDir;
+
+  /// The output directory for the wasm_debug build.
+  final io.Directory wasmDebugUnoptOutDir;
+
   /// The output directory for the host_debug_unopt build.
   final io.Directory hostDebugUnoptDir;
 
@@ -141,12 +155,17 @@ class Environment {
 
   /// Path to the "build" directory, generated by "package:build_runner".
   ///
-  /// This is where compiled output goes.
+  /// This is where compiled test output goes.
   io.Directory get webUiBuildDir => io.Directory(pathlib.join(
-        webUiRootDir.path,
-        'build',
+        outDir.path,
+        'web_tests',
       ));
 
+  io.Directory get webTestsArtifactsDir => io.Directory(pathlib.join(
+    webUiBuildDir.path,
+    'artifacts',
+  ));
+
   /// Path to the ".dart_tool" directory, generated by various Dart tools.
   io.Directory get webUiDartToolDir => io.Directory(pathlib.join(
         webUiRootDir.path,
@@ -194,22 +213,4 @@ class Environment {
         webUiDartToolDir.path,
         'test_results',
       ));
-
-  /// Path to the script that clones the Flutter repo.
-  io.File get cloneFlutterScript => io.File(pathlib.join(
-        engineToolsDir.path,
-        'clone_flutter.sh',
-      ));
-
-  /// Path to flutter.
-  ///
-  /// For example, this can be used to run `flutter pub get`.
-  ///
-  /// Only use [cloneFlutterScript] to clone flutter to the engine build.
-  io.File get flutterCommand => io.File(pathlib.join(
-        engineDartToolDir.path,
-        'flutter',
-        'bin',
-        'flutter',
-      ));
 }
diff --git a/lib/web_ui/dev/felt b/lib/web_ui/dev/felt
index a798640673a7dd3902e2cf44d75a123d66dce921..0f2a751a35495691c6ddc0883b45519585686c16 100755
--- a/lib/web_ui/dev/felt
+++ b/lib/web_ui/dev/felt
@@ -8,29 +8,32 @@ set -e
 
 FELT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-if [ -z "`which gclient`" ]
-then
-  echo "ERROR: gclient is not in your PATH"
-  echo "Fix: add the path to your installation of depot_tools to your PATH"
-  exit 1
-fi
-GCLIENT_PATH=`which gclient`
-
-if [ -z "`which autoninja`" ]
-then
-  echo "ERROR: autoninja is not in your PATH"
-  echo "Fix: add the path to your installation of depot_tools to your PATH"
-  exit 1
-fi
-NINJA_PATH=`which autoninja`
-
 KERNEL_NAME=`uname`
 CPU_NAME=`uname -m`
 ENGINE_SRC_DIR="$(dirname $(dirname $(dirname $(dirname ${FELT_DIR}))))"
 FLUTTER_DIR="${ENGINE_SRC_DIR}/flutter"
 SDK_PREBUILTS_DIR="${FLUTTER_DIR}/prebuilts"
 
-if [ -z "${DART_SDK_DIR}"]
+# If set to 0 (the default) will run felt non-incrementally. For example, it will
+# run pub get.
+# If set to 1 (via the -i option) will run felt incrementally.
+INCREMENTAL=0
+
+# All arguments passed to felt, except -i, if any.
+ARGS=""
+for arg in "$@" ; do
+  case "$arg" in
+    -i)
+      INCREMENTAL=1
+      shift
+      ;;
+    *)
+      ARGS="${ARGS} ${arg}"
+      ;;
+  esac
+done
+
+if [ -z "${DART_SDK_DIR}" ]
 then
   if [[ $KERNEL_NAME == *"Darwin"* ]]
   then
@@ -66,7 +69,7 @@ then
 
 else
   if [ ! -d "$DART_SDK_DIR" ]
-  then 
+  then
     echo "Explicitly specified dart SDK not found at ${DART_SDK_DIR}."
     exit 1
   fi
@@ -80,53 +83,30 @@ then
   FELT_DEBUG_FLAGS="--enable-vm-service --pause-isolates-on-start"
 fi
 
+SILENT_LOG=/tmp/felt_pub_get_silent_log.txt
+trap "rm -f $SILENT_LOG" EXIT
+
+verbose_on_failure() {
+  echo "FAILED with the following output:"
+  cat $SILENT_LOG
+  exit 1
+}
+
+silent_on_success() {
+  COMMAND=${1+"$@"}
+  $COMMAND > $SILENT_LOG 2>&1 || verbose_on_failure
+}
+
 install_deps() {
   # We need to run pub get here before we actually invoke felt.
   echo "Running \`dart pub get\` in 'engine/src/flutter/lib/web_ui'"
-  (cd "$WEB_UI_DIR"; $DART_PATH pub get)
+  (cd "$WEB_UI_DIR"; silent_on_success $DART_PATH pub get)
 }
 
-if [[ $KERNEL_NAME == *"Darwin"* ]]
+cd $WEB_UI_DIR
+if [[ "$INCREMENTAL" == "0" ]]
 then
-  echo "Running on MacOS. Will check the file and user limits."
-  # Disable exit if the commands fails. We want to give more actionable
-  # error message.
-  set +e
-  ULIMIT_FILES=`ulimit -n`
-  # Increase the file limit if it is low. Note that these limits are changed
-  # only for this script (for this shell). After felt execution is completed
-  # no change is required to reset the original shell.
-  if [[ $ULIMIT_FILES -lt 50000 ]]
-  then
-    echo "File limits too low increasing the file limits"
-    # Get the max file limit.
-    MAX_ULIMIT_FILES=`launchctl limit maxfiles | sed -e 's/^[[:space:]]*//' | sed 's/ \{1,\}/ /g' | cut -d' ' -f2`
-    if [[ $MAX_ULIMIT_FILES -lt 50000 ]]
-    then
-      # Increase the maximum file limit.
-      sudo launchctl limit maxfiles 50000 200000
-    fi
-    ERROR=$(ulimit -n 50000 2>&1 >/dev/null)
-    if [[ ! -z $ERROR ]]
-    then
-      echo "Problem changing the file limit. Please try to reboot to use the higher limits. error: \n$ERROR" 1>&2
-    fi
-  fi
-  ULIMIT_USER=`ulimit -u`
-  # Increase the hard user limit if it is lower than 2048.
-  if [[ $ULIMIT_USER -lt 4096 ]]
-  then
-    echo "User limits too low increasing the user limits"
-    ERROR2=$(ulimit -u 4096 2>&1 >/dev/null)
-    if [[ ! -z $ERROR2 ]]
-    then
-      echo "Problem changing the user limit. Please try to reboot to use the higher limits. error: \n$ERROR2" 1>&2
-    fi
-  fi
-  # Set the value back to exit on non zero results.
-  set -e
+  install_deps
 fi
 
-cd $WEB_UI_DIR
-install_deps
-(cd $WEB_UI_DIR && $DART_SDK_DIR/bin/dart run $FELT_DEBUG_FLAGS dev/felt.dart $@)
+(cd $WEB_UI_DIR && $DART_SDK_DIR/bin/dart run $FELT_DEBUG_FLAGS dev/felt.dart ${ARGS})
diff --git a/lib/web_ui/dev/felt.bat b/lib/web_ui/dev/felt.bat
index 9096c36a7c9f28f054233d26546f0ba558e8941a..4d13b43786ee802df7544a52b6222b2e6245cd3c 100644
--- a/lib/web_ui/dev/felt.bat
+++ b/lib/web_ui/dev/felt.bat
@@ -5,13 +5,6 @@
 @ECHO OFF
 SETLOCAL
 
-:: Make sure gclient and ninja exist. Otherwise felt won't work.
-FOR /F "tokens=1-2 delims=:" %%a in ('where gclient') DO SET GCLIENT_PATH=%%b
-IF %GCLIENT_PATH%==[] (ECHO "ERROR: gclient is not in your PATH")
-
-FOR /F "tokens=1-2 delims=:" %%a in ('where ninja') DO SET NINJA_PATH=%%b
-IF %NINJA_PATH%==[] (ECHO "ERROR: ninja is not in your PATH")
-
 :: Starting from this script's path, walk up to engine source directory.
 SET SCRIPT_DIR=%~dp0
 FOR %%a IN ("%SCRIPT_DIR:~0,-1%") DO SET TMP=%%~dpa
diff --git a/lib/web_ui/dev/felt.dart b/lib/web_ui/dev/felt.dart
index 1dc0ccbb74d0011c2d5afda28ad8a63781063ec3..0db0771ee2ba369ba786e8ab64731984a2b16a72 100644
--- a/lib/web_ui/dev/felt.dart
+++ b/lib/web_ui/dev/felt.dart
@@ -10,9 +10,8 @@ import 'analyze.dart';
 import 'build.dart';
 import 'clean.dart';
 import 'exceptions.dart';
-import 'generate_fallback_font_data.dart';
 import 'licenses.dart';
-import 'run.dart';
+import 'roll_fallback_fonts.dart';
 import 'test_runner.dart';
 import 'utils.dart';
 
@@ -23,9 +22,8 @@ CommandRunner<bool> runner = CommandRunner<bool>(
   ..addCommand(AnalyzeCommand())
   ..addCommand(BuildCommand())
   ..addCommand(CleanCommand())
-  ..addCommand(GenerateFallbackFontDataCommand())
+  ..addCommand(RollFallbackFontsCommand())
   ..addCommand(LicensesCommand())
-  ..addCommand(RunCommand())
   ..addCommand(TestCommand());
 
 Future<void> main(List<String> rawArgs) async {
diff --git a/lib/web_ui/dev/felt_config.dart b/lib/web_ui/dev/felt_config.dart
new file mode 100644
index 0000000000000000000000000000000000000000..31f873938a830c6ebbdccbed7eef1a24894211b0
--- /dev/null
+++ b/lib/web_ui/dev/felt_config.dart
@@ -0,0 +1,252 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io' as io;
+import 'package:yaml/yaml.dart';
+
+enum Compiler {
+  dart2js,
+  dart2wasm
+}
+
+enum Renderer {
+  html,
+  canvaskit,
+  skwasm,
+}
+
+class CompileConfiguration {
+  CompileConfiguration(this.name, this.compiler, this.renderer);
+
+  final String name;
+  final Compiler compiler;
+  final Renderer renderer;
+}
+
+class TestSet {
+  TestSet(this.name, this.directory);
+
+  final String name;
+  final String directory;
+}
+
+class TestBundle {
+  TestBundle(this.name, this.testSet, this.compileConfigs);
+
+  final String name;
+  final TestSet testSet;
+  final List<CompileConfiguration> compileConfigs;
+}
+
+enum CanvasKitVariant {
+  full,
+  chromium,
+}
+
+enum BrowserName {
+  chrome,
+  edge,
+  firefox,
+  safari,
+}
+
+class RunConfiguration {
+  RunConfiguration(this.name, this.browser, this.variant);
+
+  final String name;
+  final BrowserName browser;
+  final CanvasKitVariant? variant;
+}
+
+class ArtifactDependencies {
+  ArtifactDependencies({
+    required this.canvasKit,
+    required this.canvasKitChromium,
+    required this.skwasm
+  });
+
+  ArtifactDependencies.none() :
+    canvasKit = false,
+    canvasKitChromium = false,
+    skwasm = false;
+  final bool canvasKit;
+  final bool canvasKitChromium;
+  final bool skwasm;
+
+  ArtifactDependencies operator|(ArtifactDependencies other) {
+    return ArtifactDependencies(
+      canvasKit: canvasKit || other.canvasKit,
+      canvasKitChromium: canvasKitChromium || other.canvasKitChromium,
+      skwasm: skwasm || other.skwasm,
+    );
+  }
+
+  ArtifactDependencies operator&(ArtifactDependencies other) {
+    return ArtifactDependencies(
+      canvasKit: canvasKit && other.canvasKit,
+      canvasKitChromium: canvasKitChromium && other.canvasKitChromium,
+      skwasm: skwasm && other.skwasm,
+    );
+  }
+}
+
+class TestSuite {
+  TestSuite(
+    this.name,
+    this.testBundle,
+    this.runConfig,
+    this.artifactDependencies
+  );
+
+  String name;
+  TestBundle testBundle;
+  RunConfiguration runConfig;
+  ArtifactDependencies artifactDependencies;
+}
+
+class FeltConfig {
+  FeltConfig(
+    this.compileConfigs,
+    this.testSets,
+    this.testBundles,
+    this.runConfigs,
+    this.testSuites,
+  );
+
+  factory FeltConfig.fromFile(String filePath) {
+    final io.File configFile = io.File(filePath);
+    final YamlMap yaml = loadYaml(configFile.readAsStringSync()) as YamlMap;
+
+    final List<CompileConfiguration> compileConfigs = <CompileConfiguration>[];
+    final Map<String, CompileConfiguration> compileConfigsByName = <String, CompileConfiguration>{};
+    for (final dynamic node in yaml['compile-configs'] as YamlList) {
+      final YamlMap configYaml = node as YamlMap;
+      final String name = configYaml['name'] as String;
+      final Compiler compiler = Compiler.values.byName(configYaml['compiler'] as String);
+      final Renderer renderer = Renderer.values.byName(configYaml['renderer'] as String);
+      final CompileConfiguration config = CompileConfiguration(name, compiler, renderer);
+      compileConfigs.add(config);
+      if (compileConfigsByName.containsKey(name)) {
+        throw AssertionError('Duplicate compile config name: $name');
+      }
+      compileConfigsByName[name] = config;
+    }
+
+    final List<TestSet> testSets = <TestSet>[];
+    final Map<String, TestSet> testSetsByName = <String, TestSet>{};
+    for (final dynamic node in yaml['test-sets'] as YamlList) {
+      final YamlMap testSetYaml = node as YamlMap;
+      final String name = testSetYaml['name'] as String;
+      final String directory = testSetYaml['directory'] as String;
+      final TestSet testSet = TestSet(name, directory);
+      testSets.add(testSet);
+      if (testSetsByName.containsKey(name)) {
+        throw AssertionError('Duplicate test set name: $name');
+      }
+      testSetsByName[name] = testSet;
+    }
+
+    final List<TestBundle> testBundles = <TestBundle>[];
+    final Map<String, TestBundle> testBundlesByName = <String, TestBundle>{};
+    for (final dynamic node in yaml['test-bundles'] as YamlList) {
+      final YamlMap testBundleYaml = node as YamlMap;
+      final String name = testBundleYaml['name'] as String;
+      final String testSetName = testBundleYaml['test-set'] as String;
+      final TestSet? testSet = testSetsByName[testSetName];
+      if (testSet == null) {
+        throw AssertionError('Test set not found with name: `$testSetName` (referenced by test bundle: `$name`)');
+      }
+      final dynamic compileConfigsValue = testBundleYaml['compile-configs'];
+      final List<CompileConfiguration> compileConfigs;
+      if (compileConfigsValue is String) {
+        compileConfigs = <CompileConfiguration>[compileConfigsByName[compileConfigsValue]!];
+      } else {
+        compileConfigs = (compileConfigsValue as List<dynamic>).map(
+          (dynamic configName) => compileConfigsByName[configName as String]!
+        ).toList();
+      }
+      final TestBundle bundle = TestBundle(name, testSet, compileConfigs);
+      testBundles.add(bundle);
+      if (testBundlesByName.containsKey(name)) {
+        throw AssertionError('Duplicate test bundle name: $name');
+      }
+      testBundlesByName[name] = bundle;
+    }
+
+    final List<RunConfiguration> runConfigs = <RunConfiguration>[];
+    final Map<String, RunConfiguration> runConfigsByName = <String, RunConfiguration>{};
+    for (final dynamic node in yaml['run-configs'] as YamlList) {
+      final YamlMap runConfigYaml = node as YamlMap;
+      final String name = runConfigYaml['name'] as String;
+      final BrowserName browser = BrowserName.values.byName(runConfigYaml['browser'] as String);
+      final dynamic variantNode = runConfigYaml['canvaskit-variant'];
+      final CanvasKitVariant? variant = variantNode == null
+        ? null
+        : CanvasKitVariant.values.byName(variantNode as String);
+      final RunConfiguration runConfig = RunConfiguration(name, browser, variant);
+      runConfigs.add(runConfig);
+      if (runConfigsByName.containsKey(name)) {
+        throw AssertionError('Duplicate run config name: $name');
+      }
+      runConfigsByName[name] = runConfig;
+    }
+
+    final List<TestSuite> testSuites = <TestSuite>[];
+    for (final dynamic node in yaml['test-suites'] as YamlList) {
+      final YamlMap testSuiteYaml = node as YamlMap;
+      final String name = testSuiteYaml['name'] as String;
+      final String testBundleName = testSuiteYaml['test-bundle'] as String;
+      final TestBundle? bundle = testBundlesByName[testBundleName];
+      if (bundle == null) {
+        throw AssertionError('Test bundle not found with name: `$testBundleName` (referenced by test suite: `$name`)');
+      }
+      final String runConfigName = testSuiteYaml['run-config'] as String;
+      final RunConfiguration? runConfig = runConfigsByName[runConfigName];
+      if (runConfig == null) {
+        throw AssertionError('Run config not found with name: `$runConfigName` (referenced by test suite: `$name`)');
+      }
+      bool canvasKit = false;
+      bool canvasKitChromium = false;
+      bool skwasm = false;
+      final dynamic depsNode = testSuiteYaml['artifact-deps'];
+      if (depsNode != null) {
+        for (final dynamic dep in depsNode as YamlList) {
+          switch (dep as String) {
+            case 'canvaskit':
+              if (canvasKit) {
+                throw AssertionError('Artifact dep $dep listed twice in suite $name.');
+              }
+              canvasKit = true;
+            case 'canvaskit_chromium':
+              if (canvasKitChromium) {
+                throw AssertionError('Artifact dep $dep listed twice in suite $name.');
+              }
+              canvasKitChromium = true;
+            case 'skwasm':
+              if (skwasm) {
+                throw AssertionError('Artifact dep $dep listed twice in suite $name.');
+              }
+              skwasm = true;
+            default:
+              throw AssertionError('Unrecognized artifact dependency: $dep');
+          }
+        }
+      }
+      final ArtifactDependencies artifactDeps = ArtifactDependencies(
+        canvasKit: canvasKit,
+        canvasKitChromium: canvasKitChromium,
+        skwasm: skwasm
+      );
+      final TestSuite suite = TestSuite(name, bundle, runConfig, artifactDeps);
+      testSuites.add(suite);
+    }
+    return FeltConfig(compileConfigs, testSets, testBundles, runConfigs, testSuites);
+  }
+
+  List<CompileConfiguration> compileConfigs;
+  List<TestSet> testSets;
+  List<TestBundle> testBundles;
+  List<RunConfiguration> runConfigs;
+  List<TestSuite> testSuites;
+}
diff --git a/lib/web_ui/dev/felt_windows.bat b/lib/web_ui/dev/felt_windows.bat
deleted file mode 100644
index 94edf0ea1d6885acaef3aaa99647854ad6b3cffe..0000000000000000000000000000000000000000
--- a/lib/web_ui/dev/felt_windows.bat
+++ /dev/null
@@ -1,68 +0,0 @@
-:: TODO(yjbanov): migrate LUCI to felt.bat and delete this file.
-:: felt_windows: a command-line utility for Windows for building and testing
-:: Flutter web engine.
-:: FELT stands for Flutter Engine Local Tester.
-
-@ECHO OFF
-SETLOCAL
-
-FOR /F "tokens=1-2 delims=:" %%a in ('where gclient') DO SET GCLIENT_PATH=%%b
-IF %GCLIENT_PATH%==[] (ECHO "ERROR: gclient is not in your PATH")
-
-FOR /F "tokens=1-2 delims=:" %%a in ('where ninja') DO SET NINJA_PATH=%%b
-IF %NINJA_PATH%==[] (ECHO "ERROR: ninja is not in your PATH")
-
-SET FELT_DIR=%~dp0
-
-:: web_ui directory is the parent of felt directory.
-FOR %%a IN ("%FELT_DIR:~0,-1%") DO SET WEB_UI_DIR=%%~dpa
-
-:: Flutter Directory is grandparent of web_ui directory.
-FOR %%a IN ("%WEB_UI_DIR:~0,-1%") DO SET orTempValue=%%~dpa
-FOR %%a IN ("%orTempValue:~0,-1%") DO SET FLUTTER_DIR=%%~dpa
-
-:: Engine source directory is the parent of flutter directory.
-FOR %%a IN ("%FLUTTER_DIR:~0,-1%") DO SET ENGINE_SRC_DIR=%%~dpa
-
-SET DEV_DIR="%WEB_UI_DIR%dev"
-SET OUT_DIR="%ENGINE_SRC_DIR%out"
-SET HOST_DEBUG_UNOPT_DIR="%ENGINE_SRC_DIR%out\host_debug_unopt"
-SET SCRIPT_PATH="%DEV_DIR%felt.dart"
-SET STAMP_PATH="%DART_TOOL_DIR%felt.snapshot.stamp"
-SET GN="%FLUTTER_DIR%tools\gn"
-SET DART_TOOL_DIR="%WEB_UI_DIR%.dart_tool"
-SET SNAPSHOT_PATH="%DART_TOOL_DIR%felt.snapshot"
-SET SDK_PREBUILTS_DIR=%FLUTTER_DIR%\prebuilts
-SET PREBUILT_TARGET=windows-x64
-IF NOT DEFINED DART_SDK_DIR (
-  SET DART_SDK_DIR=%SDK_PREBUILTS_DIR%\%PREBUILT_TARGET%\dart-sdk
-)
-
-:: Set revision from using git in Flutter directory.
-CD %FLUTTER_DIR%
-FOR /F "tokens=1 delims=:" %%a in ('git rev-parse HEAD') DO SET REVISION=%%a
-
-SET orTempValue=1
-IF NOT EXIST %OUT_DIR% (SET orTempValue=0)
-IF NOT EXIST %HOST_DEBUG_UNOPT_DIR% (SET orTempValue=0)
-IF %orTempValue%==0 (
-  ECHO "Compiling the Dart SDK."
-  CALL gclient sync
-  CALL python %GN% --unoptimized --full-dart-sdk
-  CALL ninja -C %HOST_DEBUG_UNOPT_DIR%)
-
-:: TODO(yjbanov): The batch script does not support snapshot option.
-:: Support snapshot option.
-CALL :installdeps
-IF "%1"=="test" (%DART_SDK_DIR%\bin\dart %DEV_DIR%\felt.dart %* --browser=chrome) ELSE ( %DART_SDK_DIR%\bin\dart %DEV_DIR%\felt.dart %* )
-
-EXIT /B %ERRORLEVEL%
-
-:installdeps
-ECHO "Running \`pub get\` in 'engine/src/flutter/web_sdk/web_engine_tester'"
-cd "%FLUTTER_DIR%web_sdk\web_engine_tester"
-CALL %DART_SDK_DIR%\bin\dart pub get
-ECHO "Running \`pub get\` in 'engine/src/flutter/lib/web_ui'"
-cd %WEB_UI_DIR%
-CALL %DART_SDK_DIR%\bin\dart pub get
-EXIT /B 0
diff --git a/lib/web_ui/dev/firefox.dart b/lib/web_ui/dev/firefox.dart
index 3b9caa8ad59b753dea6ba7f695e9ea01d661d2fe..2495456019d3965af5394805b521d2d406980d3c 100644
--- a/lib/web_ui/dev/firefox.dart
+++ b/lib/web_ui/dev/firefox.dart
@@ -6,15 +6,16 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:path/path.dart' as path;
-import 'package:test_api/src/backend/runtime.dart';
-import 'package:test_core/src/util/io.dart';
+import 'package:test_api/backend.dart';
+// TODO(ditman): Fix ignore when https://github.com/flutter/flutter/issues/143599 is resolved.
+import 'package:test_core/src/util/io.dart'; // ignore: implementation_imports
 
 import 'browser.dart';
-import 'browser_lock.dart';
 import 'browser_process.dart';
 import 'common.dart';
 import 'environment.dart';
 import 'firefox_installer.dart';
+import 'package_lock.dart';
 
 /// Provides an environment for the desktop Firefox.
 class FirefoxEnvironment implements BrowserEnvironment {
@@ -31,7 +32,7 @@ class FirefoxEnvironment implements BrowserEnvironment {
   @override
   Future<void> prepare() async {
     _installation = await getOrInstallFirefox(
-      browserLock.firefoxLock.version,
+      packageLock.firefoxLock.version,
       infoLog: isCi ? stdout : DevNull(),
     );
   }
diff --git a/lib/web_ui/dev/generate_builder_json.dart b/lib/web_ui/dev/generate_builder_json.dart
new file mode 100644
index 0000000000000000000000000000000000000000..b2d9a5adc6bd596a5cafab3fec2f9e1e5ae8097e
--- /dev/null
+++ b/lib/web_ui/dev/generate_builder_json.dart
@@ -0,0 +1,181 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:convert';
+
+import 'felt_config.dart';
+
+String generateBuilderJson(FeltConfig config) {
+  final Map<String, dynamic> outputJson = <String, dynamic>{
+    '_comment': 'THIS IS A GENERATED FILE. Do not edit this file directly.',
+    '_comment2': 'See `generate_builder_json.dart` for the generator code',
+    'builds': <dynamic>[
+      _getArtifactBuildStep(),
+      for (final TestBundle bundle in config.testBundles)
+        _getBundleBuildStep(bundle),
+    ],
+    'tests': _getAllTestSteps(config.testSuites)
+  };
+  return const JsonEncoder.withIndent('  ').convert(outputJson);
+}
+
+Map<String, dynamic> _getArtifactBuildStep() {
+  return <String, dynamic>{
+    'name': 'web_tests/artifacts',
+    'drone_dimensions': <String>[
+      'device_type=none',
+      'os=Linux',
+      'cores=32'
+    ],
+    'gclient_variables': <String, dynamic>{
+      'download_android_deps': false,
+      'download_emsdk': true,
+    },
+    'gn': <String>[
+      '--web',
+      '--runtime-mode=release',
+      '--no-goma',
+    ],
+    'ninja': <String, dynamic>{
+      'config': 'wasm_release',
+      'targets': <String>[
+        'flutter/web_sdk:flutter_web_sdk_archive'
+      ]
+    },
+    'archives': <dynamic>[
+      <String, dynamic>{
+        'name': 'wasm_release',
+        'base_path': 'out/wasm_release/zip_archives/',
+        'type': 'gcs',
+        'include_paths': <String>[
+          'out/wasm_release/zip_archives/flutter-web-sdk.zip'
+        ],
+        'realm': 'production',
+      }
+    ],
+    'generators': <String, dynamic>{
+      'tasks': <dynamic>[
+        <String, dynamic>{
+          'name': 'check licenses',
+          'parameters': <String>[
+            'check-licenses'
+          ],
+          'scripts': <String>[ 'flutter/lib/web_ui/dev/felt' ],
+
+        },
+        <String, dynamic>{
+          'name': 'web engine analysis',
+          'parameters': <String>[
+            'analyze'
+          ],
+          'scripts': <String>[ 'flutter/lib/web_ui/dev/felt' ],
+        },
+        <String, dynamic>{
+          'name': 'copy artifacts for web tests',
+          'parameters': <String>[
+            'test',
+            '--copy-artifacts',
+          ],
+          'scripts': <String>[ 'flutter/lib/web_ui/dev/felt' ],
+        },
+      ]
+    },
+  };
+}
+
+Map<String, dynamic> _getBundleBuildStep(TestBundle bundle) {
+  return <String, dynamic>{
+    'name': 'web_tests/test_bundles/${bundle.name}',
+    'drone_dimensions': <String>[
+      'device_type=none',
+      'os=Linux',
+    ],
+    'generators': <String, dynamic>{
+      'tasks': <dynamic>[
+        <String, dynamic>{
+          'name': 'compile bundle ${bundle.name}',
+          'parameters': <String>[
+            'test',
+            '--compile',
+            '--bundle=${bundle.name}',
+          ],
+          'scripts': <String>[ 'flutter/lib/web_ui/dev/felt' ],
+        }
+      ]
+    },
+  };
+}
+
+Iterable<dynamic> _getAllTestSteps(List<TestSuite> suites) {
+  return <dynamic>[
+    ..._getTestStepsForPlatform(suites, 'Linux', (TestSuite suite) =>
+      suite.runConfig.browser == BrowserName.chrome ||
+      suite.runConfig.browser == BrowserName.firefox
+    ),
+    // TODO(jacksongardner): Stop filtering to Mac-12 after macOS 13 issues are fixed:
+    // https://github.com/flutter/flutter/issues/136274,
+    // https://github.com/flutter/flutter/issues/136279
+    ..._getTestStepsForPlatform(suites, 'Mac', specificOS: 'Mac-13', cpu: 'arm64', (TestSuite suite) =>
+      suite.runConfig.browser == BrowserName.safari
+    ),
+    ..._getTestStepsForPlatform(suites, 'Windows', (TestSuite suite) =>
+      suite.runConfig.browser == BrowserName.chrome
+    ),
+  ];
+}
+
+Iterable<dynamic> _getTestStepsForPlatform(
+  List<TestSuite> suites,
+  String platform,
+  bool Function(TestSuite suite) filter, {
+  String? specificOS,
+  String? cpu,
+}) {
+  return suites
+    .where(filter)
+    .map((TestSuite suite) => <String, dynamic>{
+        'name': '$platform run ${suite.name} suite',
+        'recipe': 'engine_v2/tester_engine',
+        'drone_dimensions': <String>[
+          'device_type=none',
+          'os=${specificOS ?? platform}',
+          if (cpu != null) 'cpu=$cpu',
+        ],
+        'gclient_variables': <String, dynamic>{
+          'download_android_deps': false,
+        },
+        'dependencies': <String>[
+          'web_tests/artifacts',
+          'web_tests/test_bundles/${suite.testBundle.name}',
+        ],
+        'test_dependencies': <dynamic>[
+          <String, dynamic>{
+            'dependency': 'goldctl',
+            'version': 'git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd',
+          },
+          if (suite.runConfig.browser == BrowserName.chrome)
+            <String, dynamic>{
+              'dependency': 'chrome_and_driver',
+              'version': '119.0.6045.9',
+            },
+          if (suite.runConfig.browser == BrowserName.firefox)
+            <String, dynamic>{
+              'dependency': 'firefox',
+              'version': 'version:106.0',
+            }
+        ],
+        'tasks': <dynamic>[
+          <String, dynamic>{
+            'name': 'run suite ${suite.name}',
+            'parameters': <String>[
+              'test',
+              '--run',
+              '--suite=${suite.name}'
+            ],
+            'script': 'flutter/lib/web_ui/dev/felt',
+          }
+        ]
+      }
+    );
+}
diff --git a/lib/web_ui/dev/generate_fallback_font_data.dart b/lib/web_ui/dev/generate_fallback_font_data.dart
deleted file mode 100644
index 9a5dd27f25463301888dbc1e19b17ce6e115f241..0000000000000000000000000000000000000000
--- a/lib/web_ui/dev/generate_fallback_font_data.dart
+++ /dev/null
@@ -1,289 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'dart:convert' show jsonDecode;
-import 'dart:io' as io;
-
-import 'package:args/command_runner.dart';
-import 'package:http/http.dart' as http;
-import 'package:path/path.dart' as path;
-
-import 'environment.dart';
-import 'exceptions.dart';
-import 'utils.dart';
-
-class GenerateFallbackFontDataCommand extends Command<bool>
-    with ArgUtils<bool> {
-  GenerateFallbackFontDataCommand() {
-    argParser.addOption(
-      'key',
-      defaultsTo: '',
-      help: 'The Google Fonts API key. Used to get data about fonts hosted on '
-          'Google Fonts.',
-    );
-    argParser.addFlag(
-      'download-test-fonts',
-      defaultsTo: true,
-      help: 'Whether to download the Noto fonts into a local folder to use in'
-          'tests.',
-    );
-  }
-
-  @override
-  final String name = 'generate-fallback-font-data';
-
-  @override
-  final String description = 'Generate fallback font data from GoogleFonts';
-
-  String get apiKey => stringArg('key');
-
-  bool get downloadTestFonts => boolArg('download-test-fonts');
-
-  @override
-  Future<bool> run() async {
-    await _generateFallbackFontData();
-    return true;
-  }
-
-  Future<void> _generateFallbackFontData() async {
-    if (apiKey.isEmpty) {
-      throw UsageException('No Google Fonts API key provided', argParser.usage);
-    }
-    final http.Client client = http.Client();
-    final http.Response response = await client.get(Uri.parse(
-        'https://www.googleapis.com/webfonts/v1/webfonts?key=$apiKey'));
-    if (response.statusCode != 200) {
-      throw ToolExit('Failed to download Google Fonts list.');
-    }
-    final Map<String, dynamic> googleFontsResult =
-        jsonDecode(response.body) as Map<String, dynamic>;
-    final List<Map<String, dynamic>> fontDatas =
-        (googleFontsResult['items'] as List<dynamic>)
-            .cast<Map<String, dynamic>>();
-    final Map<String, Uri> urlForFamily = <String, Uri>{};
-    for (final Map<String, dynamic> fontData in fontDatas) {
-      if (fallbackFonts.contains(fontData['family'])) {
-        final Uri uri = Uri.parse(fontData['files']['regular'] as String).replace(scheme: 'https');
-        urlForFamily[fontData['family'] as String] = uri;
-      }
-    }
-    final Map<String, String> charsetForFamily = <String, String>{};
-    final io.Directory fontDir = downloadTestFonts
-        ? await io.Directory(path.join(
-            environment.webUiBuildDir.path,
-            'assets',
-            'noto',
-          )).create(recursive: true)
-        : await io.Directory.systemTemp.createTemp('fonts');
-    // Delete old fonts in the font directory.
-    await for (final io.FileSystemEntity file in fontDir.list()) {
-      await file.delete();
-    }
-    for (final String family in fallbackFonts) {
-      print('Downloading $family...');
-      final Uri uri = urlForFamily[family]!;
-      final http.Response fontResponse = await client.get(uri);
-      if (fontResponse.statusCode != 200) {
-        throw ToolExit('Failed to download font for $family');
-      }
-      final io.File fontFile =
-          io.File(path.join(fontDir.path, path.basename(uri.path)));
-      await fontFile.writeAsBytes(fontResponse.bodyBytes);
-      final io.ProcessResult fcQueryResult =
-          await io.Process.run('fc-query', <String>[
-        '--format=%{charset}',
-        '--',
-        fontFile.path,
-      ]);
-      final String encodedCharset = fcQueryResult.stdout as String;
-      charsetForFamily[family] = encodedCharset;
-    }
-
-    final StringBuffer sb = StringBuffer();
-
-    sb.writeln('// Copyright 2013 The Flutter Authors. All rights reserved.');
-    sb.writeln('// Use of this source code is governed by a BSD-style license '
-        'that can be');
-    sb.writeln('// found in the LICENSE file.');
-    sb.writeln();
-    sb.writeln('// DO NOT EDIT! This file is generated. See:');
-    sb.writeln('// dev/generate_fallback_font_data.dart');
-    sb.writeln("import 'noto_font.dart';");
-    sb.writeln();
-    sb.writeln('final List<NotoFont> fallbackFonts = <NotoFont>[');
-    for (final String family in fallbackFonts) {
-      sb.write("  NotoFont.fromFlatRanges('$family', '${urlForFamily[family]!}', "
-          '<int>[');
-      for (final String range in charsetForFamily[family]!.split(' ')) {
-        String? start;
-        String? end;
-        final List<String> parts = range.split('-');
-        if (parts.length == 1) {
-          start = parts[0];
-          end = parts[0];
-        } else {
-          start = parts[0];
-          end = parts[1];
-        }
-        sb.write('0x$start,0x$end,');
-      }
-      sb.writeln(']),');
-    }
-    sb.writeln('];');
-
-    final io.File fontDataFile = io.File(path.join(
-      environment.webUiRootDir.path,
-      'lib',
-      'src',
-      'engine',
-      'canvaskit',
-      'font_fallback_data.dart',
-    ));
-    await fontDataFile.writeAsString(sb.toString());
-  }
-}
-
-const List<String> fallbackFonts = <String>[
-  'Noto Sans',
-  'Noto Emoji',
-  'Noto Sans Symbols',
-  'Noto Sans Symbols 2',
-  'Noto Sans Adlam',
-  'Noto Sans Anatolian Hieroglyphs',
-  'Noto Sans Arabic',
-  'Noto Sans Armenian',
-  'Noto Sans Avestan',
-  'Noto Sans Balinese',
-  'Noto Sans Bamum',
-  'Noto Sans Bassa Vah',
-  'Noto Sans Batak',
-  'Noto Sans Bengali',
-  'Noto Sans Bhaiksuki',
-  'Noto Sans Brahmi',
-  'Noto Sans Buginese',
-  'Noto Sans Buhid',
-  'Noto Sans Canadian Aboriginal',
-  'Noto Sans Carian',
-  'Noto Sans Caucasian Albanian',
-  'Noto Sans Chakma',
-  'Noto Sans Cham',
-  'Noto Sans Cherokee',
-  'Noto Sans Coptic',
-  'Noto Sans Cuneiform',
-  'Noto Sans Cypriot',
-  'Noto Sans Deseret',
-  'Noto Sans Devanagari',
-  'Noto Sans Duployan',
-  'Noto Sans Egyptian Hieroglyphs',
-  'Noto Sans Elbasan',
-  'Noto Sans Elymaic',
-  'Noto Sans Georgian',
-  'Noto Sans Glagolitic',
-  'Noto Sans Gothic',
-  'Noto Sans Grantha',
-  'Noto Sans Gujarati',
-  'Noto Sans Gunjala Gondi',
-  'Noto Sans Gurmukhi',
-  'Noto Sans HK',
-  'Noto Sans Hanunoo',
-  'Noto Sans Hatran',
-  'Noto Sans Hebrew',
-  'Noto Sans Imperial Aramaic',
-  'Noto Sans Indic Siyaq Numbers',
-  'Noto Sans Inscriptional Pahlavi',
-  'Noto Sans Inscriptional Parthian',
-  'Noto Sans JP',
-  'Noto Sans Javanese',
-  'Noto Sans KR',
-  'Noto Sans Kaithi',
-  'Noto Sans Kannada',
-  'Noto Sans Kayah Li',
-  'Noto Sans Kharoshthi',
-  'Noto Sans Khmer',
-  'Noto Sans Khojki',
-  'Noto Sans Khudawadi',
-  'Noto Sans Lao',
-  'Noto Sans Lepcha',
-  'Noto Sans Limbu',
-  'Noto Sans Linear A',
-  'Noto Sans Linear B',
-  'Noto Sans Lisu',
-  'Noto Sans Lycian',
-  'Noto Sans Lydian',
-  'Noto Sans Mahajani',
-  'Noto Sans Malayalam',
-  'Noto Sans Mandaic',
-  'Noto Sans Manichaean',
-  'Noto Sans Marchen',
-  'Noto Sans Masaram Gondi',
-  'Noto Sans Math',
-  'Noto Sans Mayan Numerals',
-  'Noto Sans Medefaidrin',
-  'Noto Sans Meetei Mayek',
-  'Noto Sans Meroitic',
-  'Noto Sans Miao',
-  'Noto Sans Modi',
-  'Noto Sans Mongolian',
-  'Noto Sans Mro',
-  'Noto Sans Multani',
-  'Noto Sans Myanmar',
-  'Noto Sans N Ko',
-  'Noto Sans Nabataean',
-  'Noto Sans New Tai Lue',
-  'Noto Sans Newa',
-  'Noto Sans Nushu',
-  'Noto Sans Ogham',
-  'Noto Sans Ol Chiki',
-  'Noto Sans Old Hungarian',
-  'Noto Sans Old Italic',
-  'Noto Sans Old North Arabian',
-  'Noto Sans Old Permic',
-  'Noto Sans Old Persian',
-  'Noto Sans Old Sogdian',
-  'Noto Sans Old South Arabian',
-  'Noto Sans Old Turkic',
-  'Noto Sans Oriya',
-  'Noto Sans Osage',
-  'Noto Sans Osmanya',
-  'Noto Sans Pahawh Hmong',
-  'Noto Sans Palmyrene',
-  'Noto Sans Pau Cin Hau',
-  'Noto Sans Phags Pa',
-  'Noto Sans Phoenician',
-  'Noto Sans Psalter Pahlavi',
-  'Noto Sans Rejang',
-  'Noto Sans Runic',
-  'Noto Sans SC',
-  'Noto Sans Saurashtra',
-  'Noto Sans Sharada',
-  'Noto Sans Shavian',
-  'Noto Sans Siddham',
-  'Noto Sans Sinhala',
-  'Noto Sans Sogdian',
-  'Noto Sans Sora Sompeng',
-  'Noto Sans Soyombo',
-  'Noto Sans Sundanese',
-  'Noto Sans Syloti Nagri',
-  'Noto Sans Syriac',
-  'Noto Sans TC',
-  'Noto Sans Tagalog',
-  'Noto Sans Tagbanwa',
-  'Noto Sans Tai Le',
-  'Noto Sans Tai Tham',
-  'Noto Sans Tai Viet',
-  'Noto Sans Takri',
-  'Noto Sans Tamil',
-  'Noto Sans Tamil Supplement',
-  'Noto Sans Telugu',
-  'Noto Sans Thaana',
-  'Noto Sans Thai',
-  'Noto Sans Tifinagh',
-  'Noto Sans Tirhuta',
-  'Noto Sans Ugaritic',
-  'Noto Sans Vai',
-  'Noto Sans Wancho',
-  'Noto Sans Warang Citi',
-  'Noto Sans Yi',
-  'Noto Sans Zanabazar Square',
-];
diff --git a/lib/web_ui/dev/licenses.dart b/lib/web_ui/dev/licenses.dart
index 21383493479a2fe19b80e85102326a166d00b99f..8ce8090d628cdf3890f727fcdfead00a5090bacf 100644
--- a/lib/web_ui/dev/licenses.dart
+++ b/lib/web_ui/dev/licenses.dart
@@ -79,13 +79,17 @@ class LicensesCommand extends Command<bool> {
   }
 
   List<io.File> _flatListSourceFiles(io.Directory directory) {
+    // This is the old path that tests used to be built into. Ignore anything
+    // within this path.
+    final String legacyBuildPath = path.join(environment.webUiRootDir.path, 'build');
     return directory.listSync(recursive: true).whereType<io.File>().where((io.File f) {
       if (!f.path.endsWith('.dart') && !f.path.endsWith('.js')) {
         // Not a source file we're checking.
         return false;
       }
       if (path.isWithin(environment.webUiBuildDir.path, f.path) ||
-          path.isWithin(environment.webUiDartToolDir.path, f.path)) {
+          path.isWithin(environment.webUiDartToolDir.path, f.path) ||
+          path.isWithin(legacyBuildPath, f.path)) {
         // Generated files.
         return false;
       }
diff --git a/lib/web_ui/dev/browser_lock.dart b/lib/web_ui/dev/package_lock.dart
similarity index 52%
rename from lib/web_ui/dev/browser_lock.dart
rename to lib/web_ui/dev/package_lock.dart
index d460975fd19946ef9717d6feb36f3eb4e752ad56..9eb517f83175e6ed1967493ff76ba245fa38f91f 100644
--- a/lib/web_ui/dev/browser_lock.dart
+++ b/lib/web_ui/dev/package_lock.dart
@@ -7,52 +7,40 @@ import 'dart:io' as io;
 import 'package:path/path.dart' as path;
 import 'package:yaml/yaml.dart';
 
-import 'common.dart';
 import 'environment.dart';
 
-/// Returns the browser configuration based on the `browser_lock.yaml` file in
+/// Returns the browser configuration based on the `package_lock.yaml` file in
 /// the current engine workspace.
-final BrowserLock browserLock = BrowserLock();
+final PackageLock packageLock = PackageLock();
 
-/// Provides access to the contents of the `browser_lock.yaml` file.
-class BrowserLock {
-  factory BrowserLock() {
+/// Provides access to the contents of the `package_lock.yaml` file.
+class PackageLock {
+  factory PackageLock() {
     final io.File lockFile = io.File(
-      path.join(environment.webUiRootDir.path, 'dev', 'browser_lock.yaml'),
+      path.join(environment.webUiRootDir.path, 'dev', 'package_lock.yaml'),
     );
     final YamlMap yaml = loadYaml(lockFile.readAsStringSync()) as YamlMap;
-    return BrowserLock._fromYaml(yaml);
+    return PackageLock._fromYaml(yaml);
   }
 
-  BrowserLock._fromYaml(YamlMap yaml) :
+  PackageLock._fromYaml(YamlMap yaml) :
     chromeLock = ChromeLock._fromYaml(yaml['chrome'] as YamlMap),
     firefoxLock = FirefoxLock._fromYaml(yaml['firefox'] as YamlMap),
-    edgeLock = EdgeLock._fromYaml(yaml['edge'] as YamlMap);
+    edgeLock = EdgeLock._fromYaml(yaml['edge'] as YamlMap),
+    esbuildLock = EsbuildLock._fromYaml(yaml['esbuild'] as YamlMap);
 
   final ChromeLock chromeLock;
   final FirefoxLock firefoxLock;
   final EdgeLock edgeLock;
+  final EsbuildLock esbuildLock;
 }
 
 class ChromeLock {
   ChromeLock._fromYaml(YamlMap yaml) :
-    linux = (yaml['Linux'] as int).toString(),
-    mac = (yaml['Mac'] as int).toString(),
-    macArm = (yaml['Mac_Arm'] as int).toString(),
-    windows = (yaml['Win'] as int).toString(),
     version = yaml['version'] as String;
 
-  final String linux;
-  final String mac;
-  final String macArm;
-  final String windows;
-  /// The major version of Chromium represented by this lock. E.g: '96' (for Chromium 96.0.554.51)
+  /// The full version of Chromium represented by this lock. E.g: '119.0.6045.9'
   final String version;
-
-  /// Return the Chromium Build ID to use for the current operating system.
-  String get versionForCurrentPlatform {
-    return PlatformBinding.instance.getChromeBuild(this);
-  }
 }
 
 class FirefoxLock {
@@ -68,3 +56,10 @@ class EdgeLock {
 
   final String launcherVersion;
 }
+
+class EsbuildLock {
+  EsbuildLock._fromYaml(YamlMap yaml) :
+    version = yaml['version'] as String;
+
+  final String version;
+}
diff --git a/lib/web_ui/dev/package_lock.yaml b/lib/web_ui/dev/package_lock.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..8219c2c560cb459e1116de5626281e5a0ed59da4
--- /dev/null
+++ b/lib/web_ui/dev/package_lock.yaml
@@ -0,0 +1,13 @@
+# Please refer to the "Upgrade Browser Version" section in the README.md for
+# more details on how to update browser version numbers.
+chrome:
+  version: '119.0.6045.9'
+
+firefox:
+  version: '106.0'
+
+edge:
+  launcher_version: '1.2.0.0'
+
+esbuild:
+  version: '0.19.5'
diff --git a/lib/web_ui/dev/browser_roller.dart b/lib/web_ui/dev/package_roller.dart
similarity index 59%
rename from lib/web_ui/dev/browser_roller.dart
rename to lib/web_ui/dev/package_roller.dart
index d31db9a0256f04f503c5f50f7fcaef028d221e01..4e0f19e47127b5ab88d84084f9669c5873c5c059 100644
--- a/lib/web_ui/dev/browser_roller.dart
+++ b/lib/web_ui/dev/package_roller.dart
@@ -8,8 +8,9 @@ import 'package:args/args.dart';
 import 'package:http/http.dart';
 import 'package:path/path.dart' as path;
 
-import 'browser_lock.dart';
+import 'cipd.dart';
 import 'common.dart';
+import 'package_lock.dart';
 import 'utils.dart';
 
 final ArgParser _argParser = ArgParser(allowTrailingOptions: false)
@@ -32,7 +33,7 @@ late final bool verbose;
 
 final Client _client = Client();
 
-/// Rolls browser CIPD packages to the version specified in `browser_lock.yaml`.
+/// Rolls browser CIPD packages to the version specified in `package_lock.yaml`.
 ///
 /// Currently only rolls Chrome.
 ///
@@ -60,7 +61,7 @@ final Client _client = Client();
 Future<void> main(List<String> args) async {
   try {
     processArgs(_argParser.parse(args));
-    await _BrowserRoller().roll();
+    await _PackageRoller().roll();
     io.exitCode = 0;
   } on FormatException catch (e) {
     print('''
@@ -92,8 +93,8 @@ class _Platform {
   String get name => '$os-$arch';
 }
 
-class _BrowserRoller {
-  _BrowserRoller();
+class _PackageRoller {
+  _PackageRoller();
 
   final io.Directory _rollDir = io.Directory.systemTemp.createTempSync('browser-roll-');
 
@@ -104,7 +105,7 @@ class _BrowserRoller {
     _Platform('windows', 'amd64', WindowsPlatformBinding()),
   ];
 
-  final BrowserLock _lock = BrowserLock();
+  final PackageLock _lock = PackageLock();
 
   // Prints output when --verbose is set.
   void vprint(String out) {
@@ -122,6 +123,7 @@ class _BrowserRoller {
       if (platform.os == 'linux') {
         await _rollFirefox(platform);
       }
+      await _rollEsbuild(platform);
     }
     if (dryRun) {
       print('\nDry Run Done!\nNon-published roll artifacts kept here: ${_rollDir.path}\n');
@@ -133,56 +135,6 @@ class _BrowserRoller {
     }
   }
 
-  // Returns the contents for the CIPD config required to publish a new chromium package.
-  String _getCipdChromiumConfig({
-    required String package,
-    required String majorVersion,
-    required String buildId,
-    required String root,
-  }) {
-    return '''
-package: $package
-description: Chromium $majorVersion (build $buildId) used for testing
-preserve_writable: true
-root: $root
-data:
-  - dir: .
-''';
-  }
-
-  // Returns the contents for the CIPD config required to publish a new chromedriver package.
-  String _getCipdChromedriverConfig({
-    required String package,
-    required String majorVersion,
-    required String buildId,
-    required String root,
-  }) {
-    return '''
-package: $package
-description: Chromedriver for Chromium $majorVersion (build $buildId) used for testing
-preserve_writable: true
-root: $root
-data:
-  - dir: .
-''';
-  }
-
-  // Returns the contents for the CIPD config required to publish a new Firefox package.
-  String _getCipdFirefoxConfig({
-    required String package,
-    required String majorVersion,
-    required String root,
-  }) {
-    return '''
-package: $package
-description: Firefox $majorVersion used for testing
-preserve_writable: true
-root: $root
-data:
-  - dir: .
-''';
-  }
-
   // Download a file from the internet, and put it in a temporary location.
   Future<io.File> _downloadTemporaryFile(String url) async {
     // Use the hash of the Url to temporarily store a file under tmp
@@ -233,16 +185,6 @@ data:
     await tarFile.delete();
   }
 
-  // Write String `contents` to a file in `path`.
-  //
-  // This is used to write CIPD config files to disk.
-  Future<io.File> _writeFile(String path, String contents) async {
-    vprint('  Writing file [$path]');
-    final io.File file = io.File(path, );
-    await file.writeAsString(contents);
-    return file;
-  }
-
   // Locate the first subdirectory that contains more than one file under `root`.
   // (or one ".app" bundle for mac)
   //
@@ -265,74 +207,22 @@ data:
     return root;
   }
 
-  // Runs a CIPD command to upload a package defined by its `config` file.
-  Future<int> _uploadToCipd({
-    required io.File config,
-    required String version,
-    required String buildId,
-  }) {
-    final String cipdCommand = dryRun ? 'pkg-build' : 'create';
-    // CIPD won't fully shut up even in 'error' mode
-    final String logLevel = verbose ? 'debug' : 'warning';
-    vprint('  Running CIPD $cipdCommand');
-    return runProcess('cipd', <String>[
-      cipdCommand,
-      '--pkg-def',
-      path.basename(config.path),
-      '--json-output',
-      '${path.basenameWithoutExtension(config.path)}.json',
-      '--log-level',
-      logLevel,
-      if (!dryRun) ...<String>[
-        '--tag',
-        'version:$version',
-        '--ref',
-        buildId,
-      ],
-      if (dryRun) ...<String>[
-        '--out',
-        '${path.basenameWithoutExtension(config.path)}.zip',
-      ],
-    ], workingDirectory: _rollDir.path);
-  }
-
-  // Determine if a `package` tagged with version:`versionTag` already exists in CIPD.
-  Future<bool> _cipdKnowsPackageVersion({
-    required String package,
-    required String versionTag,
-  }) async {
-    // $ cipd search $package -tag version:$versionTag
-    // Instances:
-    //   $package:CIPD_PACKAGE_ID
-    // or:
-    // No matching instances.
-    final String logLevel = verbose ? 'debug' : 'warning';
-    vprint('  Searching for $package version:$versionTag in CIPD');
-    final String stdout = await evalProcess('cipd', <String>[
-      'search',
-      package,
-      '--tag',
-      'version:$versionTag',
-      '--log-level',
-      logLevel,
-    ], workingDirectory: _rollDir.path);
-
-    return stdout.contains('Instances:') && stdout.contains(package);
-  }
-
   // Downloads Chromium from the internet, packs it in the directory structure
   // that the LUCI script wants. The result of this will be then uploaded to CIPD.
   Future<void> _rollChromium(_Platform platform) async {
-    final String chromeBuild = platform.binding.getChromeBuild(_lock.chromeLock);
-    final String majorVersion = _lock.chromeLock.version;
-    final String url = platform.binding.getChromeDownloadUrl(chromeBuild);
+    final String version = _lock.chromeLock.version;
+    final String url = platform.binding.getChromeDownloadUrl(version);
     final String cipdPackageName = 'flutter_internal/browsers/chrome/${platform.name}';
     final io.Directory platformDir = io.Directory(path.join(_rollDir.path, platform.name));
-    print('\nRolling Chromium for ${platform.name} (version:$majorVersion, build $chromeBuild)');
+    print('\nRolling Chromium for ${platform.name} (version:$version)');
     // Bail out if CIPD already has version:$majorVersion for this package!
-    if (!dryRun && await _cipdKnowsPackageVersion(package: cipdPackageName, versionTag: majorVersion)) {
-      print('  Skipping $cipdPackageName version:$majorVersion. Already uploaded to CIPD!');
-      vprint('  Update  browser_lock.yaml  and use a different version value.');
+    if (!dryRun && await cipdKnowsPackageVersion(
+      package: cipdPackageName,
+      versionTag: version,
+      isVerbose: verbose
+    )) {
+      print('  Skipping $cipdPackageName version:$version. Already uploaded to CIPD!');
+      vprint('  Update  package_lock.yaml  and use a different version value.');
       return;
     }
 
@@ -343,42 +233,39 @@ data:
 
     await _unzipAndDeleteFile(chromeDownload, platformDir);
 
-    late String relativePlatformDirPath;
-    // Preserve the `chrome-mac` directory when bundling, but remove it for win and linux.
-    if (platform.os == 'mac') {
-      relativePlatformDirPath = path.relative(platformDir.path, from: _rollDir.path);
-    } else {
-      final io.Directory? actualContentRoot = await _locateContentRoot(platformDir);
-      assert(actualContentRoot != null);
-      relativePlatformDirPath = path.relative(actualContentRoot!.path, from: _rollDir.path);
-    }
+    final io.Directory? actualContentRoot = await _locateContentRoot(platformDir);
+    assert(actualContentRoot != null);
+    final String relativePlatformDirPath = path.relative(actualContentRoot!.path, from: _rollDir.path);
 
-    // Create the config manifest to upload to CIPD
-    final io.File cipdConfigFile = await _writeFile(
-        path.join(_rollDir.path, 'cipd.chromium.${platform.name}.yaml'),
-        _getCipdChromiumConfig(
-            package: cipdPackageName,
-            majorVersion: majorVersion,
-            buildId: chromeBuild,
-            root: relativePlatformDirPath,
-        ));
-    // Run CIPD
-    await _uploadToCipd(config: cipdConfigFile, version: majorVersion, buildId: chromeBuild);
+    vprint('  Uploading Chromium (${platform.name}) to CIPD...');
+    await uploadDirectoryToCipd(
+      directory: _rollDir,
+      packageName: cipdPackageName,
+      configFileName: 'cipd.chromium.${platform.name}.yaml',
+      description: 'Chromium $version used for testing',
+      version: version,
+      root: relativePlatformDirPath,
+      isDryRun: dryRun,
+      isVerbose: verbose,
+    );
   }
 
   // Downloads Chromedriver from the internet, packs it in the directory structure
   // that the LUCI script wants. The result of this will be then uploaded to CIPD.
   Future<void> _rollChromeDriver(_Platform platform) async {
-    final String chromeBuild = platform.binding.getChromeBuild(_lock.chromeLock);
-    final String majorVersion = _lock.chromeLock.version;
-    final String url = platform.binding.getChromeDriverDownloadUrl(chromeBuild);
+    final String version = _lock.chromeLock.version;
+    final String url = platform.binding.getChromeDriverDownloadUrl(version);
     final String cipdPackageName = 'flutter_internal/browser-drivers/chrome/${platform.name}';
     final io.Directory platformDir = io.Directory(path.join(_rollDir.path, '${platform.name}_driver'));
-    print('\nRolling Chromedriver for ${platform.os}-${platform.arch} (version:$majorVersion, build $chromeBuild)');
+    print('\nRolling Chromedriver for ${platform.os}-${platform.arch} (version:$version)');
     // Bail out if CIPD already has version:$majorVersion for this package!
-    if (!dryRun && await _cipdKnowsPackageVersion(package: cipdPackageName, versionTag: majorVersion)) {
-      print('  Skipping $cipdPackageName version:$majorVersion. Already uploaded to CIPD!');
-      vprint('  Update  browser_lock.yaml  and use a different version value.');
+    if (!dryRun && await cipdKnowsPackageVersion(
+      package: cipdPackageName,
+      versionTag: version,
+      isVerbose: verbose
+    )) {
+      print('  Skipping $cipdPackageName version:$version. Already uploaded to CIPD!');
+      vprint('  Update  package_lock.yaml  and use a different version value.');
       return;
     }
 
@@ -394,17 +281,17 @@ data:
     assert(actualContentRoot != null);
     final String relativePlatformDirPath = path.relative(actualContentRoot!.path, from: _rollDir.path);
 
-    // Create the config manifest to upload to CIPD
-    final io.File cipdConfigFile = await _writeFile(
-        path.join(_rollDir.path, 'cipd.chromedriver.${platform.name}.yaml'),
-        _getCipdChromedriverConfig(
-            package: cipdPackageName,
-            majorVersion: majorVersion,
-            buildId: chromeBuild,
-            root: relativePlatformDirPath,
-        ));
-    // Run CIPD
-    await _uploadToCipd(config: cipdConfigFile, version: majorVersion, buildId: chromeBuild);
+    vprint('  Uploading Chromedriver (${platform.name}) to CIPD...');
+    await uploadDirectoryToCipd(
+      directory: _rollDir,
+      packageName: cipdPackageName,
+      configFileName: 'cipd.chromedriver.${platform.name}.yaml',
+      description: 'Chromedriver for Chromium $version used for testing',
+      version: version,
+      root: relativePlatformDirPath,
+      isDryRun: dryRun,
+      isVerbose: verbose,
+    );
   }
 
 
@@ -417,9 +304,13 @@ data:
     final io.Directory platformDir = io.Directory(path.join(_rollDir.path, platform.name));
     print('\nRolling Firefox for ${platform.name} (version:$version)');
     // Bail out if CIPD already has version:$majorVersion for this package!
-    if (!dryRun && await _cipdKnowsPackageVersion(package: cipdPackageName, versionTag: version)) {
+    if (!dryRun && await cipdKnowsPackageVersion(
+      package: cipdPackageName,
+      versionTag: version,
+      isVerbose: verbose
+    )) {
       print('  Skipping $cipdPackageName version:$version. Already uploaded to CIPD!');
-      vprint('  Update  browser_lock.yaml  and use a different version value.');
+      vprint('  Update  package_lock.yaml  and use a different version value.');
       return;
     }
 
@@ -434,15 +325,72 @@ data:
     assert(actualContentRoot != null);
     final String relativePlatformDirPath = path.relative(actualContentRoot!.path, from: _rollDir.path);
 
-    // Create the config manifest to upload to CIPD
-    final io.File cipdConfigFile = await _writeFile(
-        path.join(_rollDir.path, 'cipd.firefox.${platform.name}.yaml'),
-        _getCipdFirefoxConfig(
-            package: cipdPackageName,
-            majorVersion: version,
-            root: relativePlatformDirPath,
-        ));
-    // Run CIPD
-    await _uploadToCipd(config: cipdConfigFile, version: version, buildId: version);
+    vprint('  Uploading Firefox (${platform.name}) to CIPD...');
+    await uploadDirectoryToCipd(
+      directory: _rollDir,
+      packageName: cipdPackageName,
+      configFileName: 'cipd.firefox.${platform.name}.yaml',
+      description: 'Firefox $version used for testing',
+      version: version,
+      root: relativePlatformDirPath,
+      isDryRun: dryRun,
+      isVerbose: verbose,
+    );
+  }
+
+  Future<void> _rollEsbuild(_Platform platform) async {
+    final String version = _lock.esbuildLock.version;
+    final String url = platform.binding.getEsbuildDownloadUrl(version);
+    final String cipdPackageName = 'flutter/tools/esbuild/${platform.name}';
+    final io.Directory platformDir = io.Directory(path.join(_rollDir.path, platform.name));
+    print('\nRolling esbuild for ${platform.name} (version:$version)');
+    // Bail out if CIPD already has version:$majorVersion for this package!
+    if (!dryRun && await cipdKnowsPackageVersion(
+      package: cipdPackageName,
+      versionTag: version,
+      isVerbose: verbose
+    )) {
+      print('  Skipping $cipdPackageName version:$version. Already uploaded to CIPD!');
+      vprint('  Update  package_lock.yaml  and use a different version value.');
+      return;
+    }
+
+    await platformDir.create(recursive: true);
+    vprint('  Created target directory [${platformDir.path}]');
+
+    final io.File esbuildDownload = await _downloadTemporaryFile(url);
+
+    await _uncompressAndDeleteFile(esbuildDownload, platformDir);
+    final String packageDir = path.join(platformDir.path, 'package');
+
+    // Write out the license file from the github repo.
+    // Copied from https://github.com/evanw/esbuild/blob/main/LICENSE.md
+    final io.File licenseFile = io.File(path.join(
+      packageDir,
+      'LICENSE.md',
+    ));
+    licenseFile..createSync()..writeAsStringSync('''
+MIT License
+
+Copyright (c) 2020 Evan Wallace
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+''');
+
+    vprint('  Uploading esbuild (${platform.name}) to CIPD...');
+    await uploadDirectoryToCipd(
+      directory: _rollDir,
+      packageName: cipdPackageName,
+      configFileName: 'cipd.esbuild.${platform.name}.yaml',
+      description: 'esbuild used by the flutter engine for bundling JavaScript',
+      version: version,
+      root: packageDir,
+      isDryRun: dryRun,
+      isVerbose: verbose,
+    );
   }
 }
diff --git a/lib/web_ui/dev/pipeline.dart b/lib/web_ui/dev/pipeline.dart
index 8a7b286acbefc8b98cbc3c150bec0295d3648c94..e8e8a4d2e7f7b698285b400f28c7684f487272d9 100644
--- a/lib/web_ui/dev/pipeline.dart
+++ b/lib/web_ui/dev/pipeline.dart
@@ -8,6 +8,7 @@ import 'dart:io' as io;
 import 'package:path/path.dart' as path;
 import 'package:watcher/watcher.dart';
 
+import 'exceptions.dart';
 import 'utils.dart';
 
 /// Describes what [Pipeline] is currently doing.
@@ -87,6 +88,13 @@ abstract class ProcessStep implements PipelineStep {
   }
 }
 
+class _PipelineStepFailure {
+  _PipelineStepFailure(this.step, this.error);
+
+  final PipelineStep step;
+  final Object error;
+}
+
 /// Executes a sequence of asynchronous tasks, typically as part of a build/test
 /// process.
 ///
@@ -112,27 +120,34 @@ class Pipeline {
   ///
   /// Returns a future that resolves after all steps have been performed.
   ///
-  /// The future resolves to an error as soon as any of the steps fails.
+  /// If any steps fail, the pipeline attempts to continue to subsequent steps,
+  /// but will fail at the end.
   ///
   /// The pipeline may be interrupted by calling [stop] before the future
   /// resolves.
   Future<void> run() async {
     _status = PipelineStatus.started;
-    try {
-      for (final PipelineStep step in steps) {
-        if (status != PipelineStatus.started) {
-          break;
-        }
-        _currentStep = step;
-        _currentStepFuture = step.run();
+    final List<_PipelineStepFailure> failures = <_PipelineStepFailure>[];
+    for (final PipelineStep step in steps) {
+      _currentStep = step;
+      _currentStepFuture = step.run();
+      try {
         await _currentStepFuture;
+      } catch (e) {
+        failures.add(_PipelineStepFailure(step, e));
+      } finally {
+        _currentStep = null;
       }
+    }
+    if (failures.isEmpty) {
       _status = PipelineStatus.done;
-    } catch (_) {
+    } else {
       _status = PipelineStatus.error;
-      rethrow;
-    } finally {
-      _currentStep = null;
+      print('Pipeline experienced the following failures:');
+      for (final _PipelineStepFailure failure in failures) {
+        print('  "${failure.step.description}": ${failure.error}');
+      }
+      throw ToolExit('Test pipeline failed.');
     }
   }
 
diff --git a/lib/web_ui/dev/roll_fallback_fonts.dart b/lib/web_ui/dev/roll_fallback_fonts.dart
new file mode 100644
index 0000000000000000000000000000000000000000..5981e28d627ef46f427ce89a7b626d7177ba0adc
--- /dev/null
+++ b/lib/web_ui/dev/roll_fallback_fonts.dart
@@ -0,0 +1,863 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:convert' show ByteConversionSink, jsonDecode, utf8;
+import 'dart:io' as io;
+import 'dart:typed_data';
+
+import 'package:args/command_runner.dart';
+import 'package:convert/convert.dart';
+import 'package:crypto/crypto.dart' as crypto;
+import 'package:http/http.dart' as http;
+import 'package:path/path.dart' as path;
+
+// ignore: avoid_relative_lib_imports
+import '../lib/src/engine/noto_font_encoding.dart';
+
+import 'cipd.dart';
+import 'environment.dart';
+import 'exceptions.dart';
+import 'utils.dart';
+
+const String expectedUrlPrefix = 'https://fonts.gstatic.com/s/';
+
+class RollFallbackFontsCommand extends Command<bool>
+    with ArgUtils<bool> {
+  RollFallbackFontsCommand() {
+    argParser.addOption(
+      'key',
+      defaultsTo: '',
+      help: 'The Google Fonts API key. Used to get data about fonts hosted on '
+          'Google Fonts.',
+    );
+    argParser.addFlag(
+      'dry-run',
+      help: 'Whether or not to push changes to CIPD. When --dry-run is set, the '
+            'script will download everything and attempt to prepare the bundle '
+            'but will stop before publishing. When not set, the bundle will be '
+            'published.',
+      negatable: false,
+    );
+  }
+
+  @override
+  final String name = 'roll-fallback-fonts';
+
+  @override
+  final String description = 'Generate fallback font data from GoogleFonts and '
+                             'upload fonts to cipd.';
+
+  String get apiKey => stringArg('key');
+  bool get isDryRun => boolArg('dry-run');
+
+  @override
+  Future<bool> run() async {
+    await _generateFallbackFontData();
+    return true;
+  }
+
+  Future<void> _generateFallbackFontData() async {
+    if (apiKey.isEmpty) {
+      throw UsageException('No Google Fonts API key provided', argParser.usage);
+    }
+    final http.Client client = http.Client();
+    final http.Response response = await client.get(Uri.parse(
+        'https://www.googleapis.com/webfonts/v1/webfonts?key=$apiKey'));
+    if (response.statusCode != 200) {
+      throw ToolExit('Failed to download Google Fonts list.');
+    }
+    final Map<String, dynamic> googleFontsResult =
+        jsonDecode(response.body) as Map<String, dynamic>;
+    final List<Map<String, dynamic>> fontDatas =
+        (googleFontsResult['items'] as List<dynamic>)
+            .cast<Map<String, dynamic>>();
+    final Map<String, Uri> urlForFamily = <String, Uri>{};
+    for (final Map<String, dynamic> fontData in fontDatas) {
+      if (fallbackFonts.contains(fontData['family'])) {
+        final Uri uri = Uri.parse(fontData['files']['regular'] as String)
+            .replace(scheme: 'https');
+        urlForFamily[fontData['family'] as String] = uri;
+      }
+    }
+    final Map<String, String> charsetForFamily = <String, String>{};
+    final io.Directory fontDir = await io.Directory.systemTemp.createTemp('flutter_fallback_fonts');
+    print('Downloading fonts into temp directory: ${fontDir.path}');
+    final AccumulatorSink<crypto.Digest> hashSink = AccumulatorSink<crypto.Digest>();
+    final ByteConversionSink hasher = crypto.sha256.startChunkedConversion(hashSink);
+    for (final String family in fallbackFonts) {
+      print('Downloading $family...');
+      final Uri? uri = urlForFamily[family];
+      if (uri == null) {
+        throw ToolExit('Unable to determine URL to download $family. '
+            'Check if it is still hosted on Google Fonts.');
+      }
+      final http.Response fontResponse = await client.get(uri);
+      if (fontResponse.statusCode != 200) {
+        throw ToolExit('Failed to download font for $family');
+      }
+      final String urlString = uri.toString();
+      if (!urlString.startsWith(expectedUrlPrefix)) {
+        throw ToolExit('Unexpected url format received from Google Fonts API: $urlString.');
+      }
+      final String urlSuffix = urlString.substring(expectedUrlPrefix.length);
+      final io.File fontFile =
+          io.File(path.join(fontDir.path, urlSuffix));
+
+      final Uint8List bodyBytes = fontResponse.bodyBytes;
+      if (!_checkForLicenseAttribution(bodyBytes)) {
+        throw ToolExit(
+            'Expected license attribution not found in file: $urlString');
+      }
+      hasher.add(utf8.encode(urlSuffix));
+      hasher.add(bodyBytes);
+
+      await fontFile.create(recursive: true);
+      await fontFile.writeAsBytes(bodyBytes, flush: true);
+      final io.ProcessResult fcQueryResult =
+          await io.Process.run('fc-query', <String>[
+        '--format=%{charset}',
+        '--',
+        fontFile.path,
+      ]);
+      final String encodedCharset = fcQueryResult.stdout as String;
+      charsetForFamily[family] = encodedCharset;
+    }
+
+    final StringBuffer sb = StringBuffer();
+
+    final List<_Font> fonts = <_Font>[];
+
+    for (final String family in fallbackFonts) {
+      final List<int> starts = <int>[];
+      final List<int> ends = <int>[];
+      final String charset = charsetForFamily[family]!;
+      for (final String range in charset.split(' ')) {
+        // Range is one hexadecimal number or two, separated by `-`.
+        final List<String> parts = range.split('-');
+        if (parts.length != 1 && parts.length != 2) {
+          throw ToolExit('Malformed charset range "$range"');
+        }
+        final int first = int.parse(parts.first, radix: 16);
+        final int last = int.parse(parts.last, radix: 16);
+        starts.add(first);
+        ends.add(last);
+      }
+
+      fonts.add(_Font(family, fonts.length, starts, ends));
+    }
+
+    final String fontSetsCode = _computeEncodedFontSets(fonts);
+
+    sb.writeln('// Copyright 2013 The Flutter Authors. All rights reserved.');
+    sb.writeln('// Use of this source code is governed by a BSD-style license '
+        'that can be');
+    sb.writeln('// found in the LICENSE file.');
+    sb.writeln();
+    sb.writeln('// DO NOT EDIT! This file is generated. See:');
+    sb.writeln('// dev/roll_fallback_fonts.dart');
+    sb.writeln("import 'noto_font.dart';");
+    sb.writeln();
+    sb.writeln('List<NotoFont> getFallbackFontList(bool useColorEmoji) => <NotoFont>[');
+
+    for (final _Font font in fonts) {
+      final String family = font.family;
+      String enabledArgument = '';
+      if (family == 'Noto Emoji') {
+        enabledArgument = 'enabled: !useColorEmoji, ';
+      }
+      if (family == 'Noto Color Emoji') {
+        enabledArgument = 'enabled: useColorEmoji, ';
+      }
+      final String urlString = urlForFamily[family]!.toString();
+      if (!urlString.startsWith(expectedUrlPrefix)) {
+        throw ToolExit(
+            'Unexpected url format received from Google Fonts API: $urlString.');
+      }
+      final String urlSuffix = urlString.substring(expectedUrlPrefix.length);
+      sb.writeln(" NotoFont('$family', $enabledArgument'$urlSuffix'),");
+    }
+    sb.writeln('];');
+    sb.writeln();
+    sb.write(fontSetsCode);
+
+    final io.File fontDataFile = io.File(path.join(
+      environment.webUiRootDir.path,
+      'lib',
+      'src',
+      'engine',
+      'font_fallback_data.dart',
+    ));
+    await fontDataFile.writeAsString(sb.toString());
+
+    final io.File licenseFile = io.File(path.join(
+      fontDir.path,
+      'LICENSE.txt',
+    ));
+    const String licenseString = r'''
+© Copyright 2015-2021 Google LLC. All Rights Reserved.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
+''';
+    final List<int> licenseData = utf8.encode(licenseString);
+    await licenseFile.create(recursive: true);
+    await licenseFile.writeAsBytes(licenseData);
+    hasher.add(licenseData);
+    hasher.close();
+
+    final crypto.Digest digest = hashSink.events.single;
+    final String versionString = digest.toString();
+    const String packageName = 'flutter/flutter_font_fallbacks';
+    if (await cipdKnowsPackageVersion(
+      package: packageName,
+      versionTag: versionString)) {
+        print('Package already exists with hash $versionString. Skipping upload');
+    } else {
+      print('Uploading fallback fonts to CIPD with hash $versionString');
+      await uploadDirectoryToCipd(
+        directory: fontDir,
+        packageName: packageName,
+        configFileName: 'cipd.flutter_font_fallbacks.yaml',
+        description: 'A set of Noto fonts to fall back to for use in testing.',
+        root: fontDir.path,
+        version: versionString,
+        isDryRun: isDryRun,
+      );
+    }
+
+    print('Setting new fallback fonts deps version to $versionString');
+    final String depFilePath = path.join(
+      environment.engineSrcDir.path,
+      'flutter',
+      'DEPS',
+    );
+    await runProcess('gclient', <String>[
+      'setdep',
+      '--revision=src/flutter/third_party/google_fonts_for_unit_tests:$packageName@$versionString',
+      '--deps-file=$depFilePath'
+    ]);
+  }
+}
+
+const List<String> fallbackFonts = <String>[
+  'Noto Sans',
+  'Noto Color Emoji',
+  'Noto Emoji',
+  'Noto Music',
+  'Noto Sans Symbols',
+  'Noto Sans Symbols 2',
+  'Noto Sans Adlam',
+  'Noto Sans Anatolian Hieroglyphs',
+  'Noto Sans Arabic',
+  'Noto Sans Armenian',
+  'Noto Sans Avestan',
+  'Noto Sans Balinese',
+  'Noto Sans Bamum',
+  'Noto Sans Bassa Vah',
+  'Noto Sans Batak',
+  'Noto Sans Bengali',
+  'Noto Sans Bhaiksuki',
+  'Noto Sans Brahmi',
+  'Noto Sans Buginese',
+  'Noto Sans Buhid',
+  'Noto Sans Canadian Aboriginal',
+  'Noto Sans Carian',
+  'Noto Sans Caucasian Albanian',
+  'Noto Sans Chakma',
+  'Noto Sans Cham',
+  'Noto Sans Cherokee',
+  'Noto Sans Coptic',
+  'Noto Sans Cuneiform',
+  'Noto Sans Cypriot',
+  'Noto Sans Deseret',
+  'Noto Sans Devanagari',
+  'Noto Sans Duployan',
+  'Noto Sans Egyptian Hieroglyphs',
+  'Noto Sans Elbasan',
+  'Noto Sans Elymaic',
+  'Noto Sans Georgian',
+  'Noto Sans Glagolitic',
+  'Noto Sans Gothic',
+  'Noto Sans Grantha',
+  'Noto Sans Gujarati',
+  'Noto Sans Gunjala Gondi',
+  'Noto Sans Gurmukhi',
+  'Noto Sans HK',
+  'Noto Sans Hanunoo',
+  'Noto Sans Hatran',
+  'Noto Sans Hebrew',
+  'Noto Sans Imperial Aramaic',
+  'Noto Sans Indic Siyaq Numbers',
+  'Noto Sans Inscriptional Pahlavi',
+  'Noto Sans Inscriptional Parthian',
+  'Noto Sans JP',
+  'Noto Sans Javanese',
+  'Noto Sans KR',
+  'Noto Sans Kaithi',
+  'Noto Sans Kannada',
+  'Noto Sans Kayah Li',
+  'Noto Sans Kharoshthi',
+  'Noto Sans Khmer',
+  'Noto Sans Khojki',
+  'Noto Sans Khudawadi',
+  'Noto Sans Lao',
+  'Noto Sans Lepcha',
+  'Noto Sans Limbu',
+  'Noto Sans Linear A',
+  'Noto Sans Linear B',
+  'Noto Sans Lisu',
+  'Noto Sans Lycian',
+  'Noto Sans Lydian',
+  'Noto Sans Mahajani',
+  'Noto Sans Malayalam',
+  'Noto Sans Mandaic',
+  'Noto Sans Manichaean',
+  'Noto Sans Marchen',
+  'Noto Sans Masaram Gondi',
+  'Noto Sans Math',
+  'Noto Sans Mayan Numerals',
+  'Noto Sans Medefaidrin',
+  'Noto Sans Meetei Mayek',
+  'Noto Sans Meroitic',
+  'Noto Sans Miao',
+  'Noto Sans Modi',
+  'Noto Sans Mongolian',
+  'Noto Sans Mro',
+  'Noto Sans Multani',
+  'Noto Sans Myanmar',
+  'Noto Sans NKo',
+  'Noto Sans Nabataean',
+  'Noto Sans New Tai Lue',
+  'Noto Sans Newa',
+  'Noto Sans Nushu',
+  'Noto Sans Ogham',
+  'Noto Sans Ol Chiki',
+  'Noto Sans Old Hungarian',
+  'Noto Sans Old Italic',
+  'Noto Sans Old North Arabian',
+  'Noto Sans Old Permic',
+  'Noto Sans Old Persian',
+  'Noto Sans Old Sogdian',
+  'Noto Sans Old South Arabian',
+  'Noto Sans Old Turkic',
+  'Noto Sans Oriya',
+  'Noto Sans Osage',
+  'Noto Sans Osmanya',
+  'Noto Sans Pahawh Hmong',
+  'Noto Sans Palmyrene',
+  'Noto Sans Pau Cin Hau',
+  'Noto Sans Phags Pa',
+  'Noto Sans Phoenician',
+  'Noto Sans Psalter Pahlavi',
+  'Noto Sans Rejang',
+  'Noto Sans Runic',
+  'Noto Sans SC',
+  'Noto Sans Saurashtra',
+  'Noto Sans Sharada',
+  'Noto Sans Shavian',
+  'Noto Sans Siddham',
+  'Noto Sans Sinhala',
+  'Noto Sans Sogdian',
+  'Noto Sans Sora Sompeng',
+  'Noto Sans Soyombo',
+  'Noto Sans Sundanese',
+  'Noto Sans Syloti Nagri',
+  'Noto Sans Syriac',
+  'Noto Sans TC',
+  'Noto Sans Tagalog',
+  'Noto Sans Tagbanwa',
+  'Noto Sans Tai Le',
+  'Noto Sans Tai Tham',
+  'Noto Sans Tai Viet',
+  'Noto Sans Takri',
+  'Noto Sans Tamil',
+  'Noto Sans Tamil Supplement',
+  'Noto Sans Telugu',
+  'Noto Sans Thaana',
+  'Noto Sans Thai',
+  'Noto Sans Tifinagh',
+  'Noto Sans Tirhuta',
+  'Noto Sans Ugaritic',
+  'Noto Sans Vai',
+  'Noto Sans Wancho',
+  'Noto Sans Warang Citi',
+  'Noto Sans Yi',
+  'Noto Sans Zanabazar Square',
+];
+
+bool _checkForLicenseAttribution(Uint8List fontBytes) {
+  final ByteData fontData = fontBytes.buffer.asByteData();
+  final int codePointCount = fontData.lengthInBytes ~/ 2;
+  const String attributionString =
+      'This Font Software is licensed under the SIL Open Font License, Version 1.1.';
+  for (int i = 0; i < codePointCount - attributionString.length; i++) {
+    bool match = true;
+    for (int j = 0; j < attributionString.length; j++) {
+      if (fontData.getUint16((i + j) * 2) != attributionString.codeUnitAt(j)) {
+        match = false;
+        break;
+      }
+    }
+    if (match) {
+      return true;
+    }
+  }
+  return false;
+}
+
+class _Font {
+  _Font(this.family, this.index, this.starts, this.ends);
+
+  final String family;
+  final int index;
+  final List<int> starts;
+  final List<int> ends; // inclusive ends
+
+  static int compare(_Font a, _Font b) => a.index.compareTo(b.index);
+
+  String get shortName =>
+      _shortName +
+      String.fromCharCodes(
+          '$index'.codeUnits.map((int ch) => ch - 48 + 0x2080));
+
+  String get _shortName => family.startsWith('Noto Sans ')
+      ? family.substring('Noto Sans '.length)
+      : family;
+}
+
+/// The boundary of a range of a font.
+class _Boundary {
+  _Boundary(this.value, this.isStart, this.font);
+  final int value; // inclusive start or exclusive end.
+  final bool isStart;
+  final _Font font;
+
+  static int compare(_Boundary a, _Boundary b) => a.value.compareTo(b.value);
+}
+
+class _Range {
+  _Range(this.start, this.end, this.fontSet);
+  final int start;
+  final int end;
+  final _FontSet fontSet;
+
+  @override
+  String toString() {
+    return '[${start.toRadixString(16)}, ${end.toRadixString(16)}]'
+        ' (${end - start + 1})'
+        ' ${fontSet.description()}';
+  }
+}
+
+/// A canonical representative for a set of _Fonts. The fonts are stored in
+/// order of increasing `_Font.index`.
+class _FontSet {
+  _FontSet(this.fonts);
+
+  /// The number of [_Font]s in this set.
+  int get length => fonts.length;
+
+  /// The members of this set.
+  final List<_Font> fonts;
+
+  /// Number of unicode ranges that are supported by this set of fonts.
+  int rangeCount = 0;
+
+  /// The serialization order of this set. This index is assigned after building
+  /// all the sets.
+  late final int index;
+
+  static int orderByDecreasingRangeCount(_FontSet a, _FontSet b) {
+    final int r = b.rangeCount.compareTo(a.rangeCount);
+    if (r != 0) {
+      return r;
+    }
+    return orderByLexicographicFontIndexes(a, b);
+  }
+
+  static int orderByLexicographicFontIndexes(_FontSet a, _FontSet b) {
+    for (int i = 0; i < a.length && i < b.length; i++) {
+      final int r = _Font.compare(a.fonts[i], b.fonts[i]);
+      if (r != 0) {
+        return r;
+      }
+    }
+    assert(a.length != b.length); // _FontSets are canonical.
+    return a.length - b.length;
+  }
+
+  @override
+  String toString() {
+    return description();
+  }
+
+  String description() {
+    return fonts.map((_Font font) => font.shortName).join(', ');
+  }
+}
+
+/// A trie node [1] used to find the canonical _FontSet.
+///
+/// [1]: https://en.wikipedia.org/wiki/Trie
+class _TrieNode {
+  final Map<_Font, _TrieNode> _children = <_Font, _TrieNode>{};
+  _FontSet? fontSet;
+
+  /// Inserts a string of fonts into the trie and returns the trie node
+  /// representing the string. [this] must be the root node of the trie.
+  ///
+  /// Inserting the same sequence again will traverse the same path through the
+  /// trie and return the same node, canonicalizing the sequence to its
+  /// representative node.
+  _TrieNode insertSequenceAtRoot(Iterable<_Font> fonts) {
+    _TrieNode node = this;
+    for (final _Font font in fonts) {
+      node = node._children[font] ??= _TrieNode();
+    }
+    return node;
+  }
+}
+
+/// Computes the Dart source code for the encoded data structures used by the
+/// fallback font selection algorithm.
+///
+/// The data structures allow the fallback font selection algorithm to quickly
+/// determine which fonts support a given code point. The structures are
+/// essentially a map from a code point to a set of fonts that support that code
+/// point.
+///
+/// The universe of code points is partitioned into a set of subsets, or
+/// components, where each component contains all the code points that are in
+/// exactly the same set of fonts. A font can be considered to be a union of
+/// some subset of the components and may share components with other fonts.  A
+/// `_FontSet` is used to represent a component and the set of fonts that use
+/// the component. One way to visualize this is as a Venn diagram. The fonts are
+/// the overlapping circles and the components are the spaces between the lines.
+///
+/// The emitted data structures are
+///
+///  (1) A list of sets of fonts.
+///  (2) A list of code point ranges mapping to an index of list (1).
+///
+/// Each set of fonts is represented as a list of font indexes. The indexes are
+/// always increasing so the delta is stored. The stored value is biased by -1
+/// (i.e.  `delta - 1`) since a delta is never less than 1. The deltas are STMR
+/// encoded.
+///
+/// A code point with no fonts is mapped to an empty set of fonts. This allows
+/// the list of code point ranges to be complete, covering every code
+/// point. There are no gaps between ranges; instead there are some ranges that
+/// map to the empty set. Each range is encoded as the size (number of code
+/// points) in the range followed by the value which is the index of the
+/// corresponding set in the list of sets.
+///
+///
+/// STMR (Self terminating multiple radix) encoding
+/// ---
+///
+/// This encoding is a minor adaptation of [VLQ encoding][1], using different
+/// ranges of characters to represent continuing or terminating digits instead
+/// of using a 'continuation' bit.
+///
+/// The separators between the numbers can be a significant proportion of the
+/// number of characters needed to encode a sequence of numbers as a string.
+/// Instead values are encoded with two kinds of digits: prefix digits and
+/// terminating digits. Each kind of digit uses a different set of characters,
+/// and the radix (number of digit characters) can differ between the different
+/// kinds of digit.  Lets say we use decimal digits `0`..`9` for prefix digits
+/// and `A`..`Z` as terminating digits.
+///
+///     M = ('M' - 'A') = 12
+///     38M = (3 * 10 + 8) * 26 + 12 = 38 * 26 + 12 = 1000
+///
+/// Choosing a large terminating radix is especially effective when most of the
+/// encoded values are small, as is the case with delta-encoding.
+///
+/// There can be multiple terminating digit kinds to represent different sorts
+/// of values. For the range table, the size uses a different terminating digit,
+/// 'a'..'z'. This allows the very common size of 1 (accounting over a third of
+/// the range sizes) to be omitted. A range is encoded as either
+/// `<size><value>`, or `<value>` with an implicit size of 1.  Since the size 1
+/// can be implicit, it is always implicit, and the stored sizes are biased by
+/// -2.
+///
+/// | encoding | value | size |
+/// | :---     | ---:  | ---: |
+/// | A        | 0     | 1    |
+/// | B        | 1     | 1    |
+/// | 38M      | 1000  | 1    |
+/// | aA       | 0     | 2    |
+/// | bB       | 1     | 3    |
+/// | zZ       | 25    | 27   |
+/// | 1a1A     | 26    | 28   |
+/// | 38a38M   | 1000  | 1002 |
+///
+/// STMR-encoded strings are decoded efficiently by a simple loop that updates
+/// the current value and performs some additional operation for a terminating
+/// digit, e.g. recording the optional size, or creating a range.
+///
+/// [1]: https://en.wikipedia.org/wiki/Variable-length_quantity
+
+String _computeEncodedFontSets(List<_Font> fonts) {
+  final List<_Range> ranges = <_Range>[];
+  final List<_FontSet> allSets = <_FontSet>[];
+
+  {
+    // The fonts have their supported code points provided as list of inclusive
+    // [start, end] ranges. We want to intersect all of these ranges and find
+    // the fonts that overlap each intersected range.
+    //
+    // It is easier to work with the boundaries of the ranges rather than the
+    // ranges themselves. The boundaries of the intersected ranges is the union
+    // of the boundaries of the individual font ranges.  We scan the boundaries
+    // in increasing order, keeping track of the current set of fonts that are
+    // in the current intersected range.  Each time the boundary value changes,
+    // the current set of fonts is canonicalized and recorded.
+    //
+    // There has to be a wiki article for this algorithm but I didn't find one.
+    final List<_Boundary> boundaries = <_Boundary>[];
+    for (final _Font font in fonts) {
+      for (final int start in font.starts) {
+        boundaries.add(_Boundary(start, true, font));
+      }
+      for (final int end in font.ends) {
+        boundaries.add(_Boundary(end + 1, false, font));
+      }
+    }
+    boundaries.sort(_Boundary.compare);
+
+    // The trie root represents the empty set of fonts.
+    final _TrieNode trieRoot = _TrieNode();
+    final Set<_Font> currentElements = <_Font>{};
+
+    void newRange(int start, int end) {
+      // Ensure we are using the canonical font order.
+      final List<_Font> fonts = List<_Font>.of(currentElements)
+        ..sort(_Font.compare);
+      final _TrieNode node = trieRoot.insertSequenceAtRoot(fonts);
+      final _FontSet fontSet = node.fontSet ??= _FontSet(fonts);
+      if (fontSet.rangeCount == 0) {
+        allSets.add(fontSet);
+      }
+      fontSet.rangeCount++;
+      final _Range range = _Range(start, end, fontSet);
+      ranges.add(range);
+    }
+
+    int start = 0;
+    for (final _Boundary boundary in boundaries) {
+      final int value = boundary.value;
+      if (value > start) {
+        // Boundary has changed, record the pending range `[start, value - 1]`,
+        // and start a new range at `value`. `value` must be > 0 to get here.
+        newRange(start, value - 1);
+        start = value;
+      }
+      if (boundary.isStart) {
+        currentElements.add(boundary.font);
+      } else {
+        currentElements.remove(boundary.font);
+      }
+    }
+    assert(currentElements.isEmpty);
+    // Ensure the ranges cover the whole unicode code point space.
+    if (start <= kMaxCodePoint) {
+      newRange(start, kMaxCodePoint);
+    }
+  }
+
+  print('${allSets.length} sets covering ${ranges.length} ranges');
+
+  // Sort _FontSets by the number of ranges that map to that _FontSet, so that
+  // _FontSets that are referenced from many ranges have smaller indexes.  This
+  // makes the range table encoding smaller, by about half.
+  allSets.sort(_FontSet.orderByDecreasingRangeCount);
+
+  for (int i = 0; i < allSets.length; i++) {
+    allSets[i].index = i;
+  }
+
+  final StringBuffer code = StringBuffer();
+
+  final StringBuffer sb = StringBuffer();
+  int totalEncodedLength = 0;
+
+  void encode(int value, int radix, int firstDigitCode) {
+    final int prefix = value ~/ radix;
+    assert(kPrefixDigit0 == '0'.codeUnitAt(0) && kPrefixRadix == 10);
+    if (prefix != 0) {
+      sb.write(prefix);
+    }
+    sb.writeCharCode(firstDigitCode + value.remainder(radix));
+  }
+
+  for (final _FontSet fontSet in allSets) {
+    int previousFontIndex = -1;
+    for (final _Font font in fontSet.fonts) {
+      final int fontIndexDelta = font.index - previousFontIndex;
+      previousFontIndex = font.index;
+      encode(fontIndexDelta - 1, kFontIndexRadix, kFontIndexDigit0);
+    }
+    if (fontSet != allSets.last) {
+      sb.write(',');
+    }
+    final String fragment = sb.toString();
+    sb.clear();
+    totalEncodedLength += fragment.length;
+
+    final int length = fontSet.fonts.length;
+    code.write('    // #${fontSet.index}: $length font');
+    if (length != 1) {
+      code.write('s');
+    }
+    if (length > 0) {
+      code.write(': ${fontSet.description()}');
+    }
+    code.writeln('.');
+
+    code.writeln("    '$fragment'");
+  }
+
+  final StringBuffer declarations = StringBuffer();
+
+  final int references =
+      allSets.fold(0, (int sum, _FontSet set) => sum + set.length);
+  declarations
+    ..writeln('// ${allSets.length} unique sets of fonts'
+        ' containing $references font references'
+        ' encoded in $totalEncodedLength characters')
+    ..writeln('const String encodedFontSets =')
+    ..write(code)
+    ..writeln('    ;');
+
+  // Encode ranges.
+  code.clear();
+  totalEncodedLength = 0;
+
+  for (final _Range range in ranges) {
+    final int start = range.start;
+    final int end = range.end;
+    final int index = range.fontSet.index;
+    final int size = end - start + 1;
+
+    // Encode <size><index> or <index> for unit ranges.
+    if (size >= 2) {
+      encode(size - 2, kRangeSizeRadix, kRangeSizeDigit0);
+    }
+    encode(index, kRangeValueRadix, kRangeValueDigit0);
+
+    final String encoding = sb.toString();
+    sb.clear();
+    totalEncodedLength += encoding.length;
+
+    String description = start.toRadixString(16);
+    if (end != start) {
+      description = '$description-${end.toRadixString(16)}';
+    }
+    if (range.fontSet.fonts.isNotEmpty) {
+      description = '${description.padRight(12)} #$index';
+    }
+    final String encodingText = "'$encoding'".padRight(10);
+    code.writeln('    $encodingText // $description');
+  }
+
+  declarations
+    ..writeln()
+    ..writeln(
+        '// ${ranges.length} ranges encoded in $totalEncodedLength characters')
+    ..writeln('const String encodedFontSetRanges =')
+    ..write(code)
+    ..writeln('    ;');
+
+  return declarations.toString();
+}
diff --git a/lib/web_ui/dev/run.dart b/lib/web_ui/dev/run.dart
deleted file mode 100644
index eaed34bfbf80ce318218f13384eeb6430b77dada..0000000000000000000000000000000000000000
--- a/lib/web_ui/dev/run.dart
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'dart:async';
-import 'dart:io' as io;
-
-import 'package:args/command_runner.dart';
-
-import 'common.dart';
-import 'pipeline.dart';
-import 'steps/compile_tests_step.dart';
-import 'steps/run_tests_step.dart';
-import 'utils.dart';
-
-/// Runs build and test steps.
-///
-/// This command is designed to be invoked by the LUCI build graph. However, it
-/// is also usable locally.
-///
-/// Usage:
-///
-///     felt run name_of_build_step
-class RunCommand extends Command<bool> with ArgUtils<bool> {
-  RunCommand() {
-    argParser.addFlag(
-      'list',
-      abbr: 'l',
-      help: 'Lists all available build steps.',
-    );
-    argParser.addFlag(
-      'require-skia-gold',
-      help: 'Whether we require Skia Gold to be available or not. When this '
-            'flag is true, the tests will fail if Skia Gold is not available.',
-    );
-    argParser.addFlag(
-      'wasm',
-      help: 'Whether the test we are running are compiled to webassembly.'
-    );
-  }
-
-  @override
-  String get name => 'run';
-
-  bool get isWasm => boolArg('wasm');
-
-  bool get isListSteps => boolArg('list');
-
-  /// When running screenshot tests, require Skia Gold to be available and
-  /// reachable.
-  bool get requireSkiaGold => boolArg('require-skia-gold');
-
-  @override
-  String get description => 'Runs a build step.';
-
-  /// Build steps to run, in order specified.
-  List<String> get stepNames => argResults!.rest;
-
-  @override
-  FutureOr<bool> run() async {
-    // All available build steps.
-    final Map<String, PipelineStep> buildSteps = <String, PipelineStep>{
-      'compile_tests': CompileTestsStep(),
-      for (final String browserName in kAllBrowserNames)
-        'run_tests_$browserName': RunTestsStep(
-          browserName: browserName,
-          isDebug: false,
-          isWasm: isWasm,
-          doUpdateScreenshotGoldens: false,
-          requireSkiaGold: requireSkiaGold,
-          overridePathToCanvasKit: null,
-        ),
-    };
-
-    if (isListSteps) {
-      buildSteps.keys.forEach(print);
-      return true;
-    }
-
-    if (stepNames.isEmpty) {
-      throw UsageException('No build steps specified.', argParser.usage);
-    }
-
-    final List<String> unrecognizedStepNames = <String>[];
-    for (final String stepName in stepNames) {
-      if (!buildSteps.containsKey(stepName)) {
-        unrecognizedStepNames.add(stepName);
-      }
-    }
-    if (unrecognizedStepNames.isNotEmpty) {
-      io.stderr.writeln(
-        'Unknown build steps specified: ${unrecognizedStepNames.join(', ')}',
-      );
-      return false;
-    }
-
-    final List<PipelineStep> steps = <PipelineStep>[];
-    print('Running steps ${steps.join(', ')}');
-    for (final String stepName in stepNames) {
-      steps.add(buildSteps[stepName]!);
-    }
-
-    final Stopwatch stopwatch = Stopwatch()..start();
-    final Pipeline pipeline = Pipeline(steps: steps);
-    await pipeline.run();
-    stopwatch.stop();
-    print('Finished running steps in ${stopwatch.elapsedMilliseconds / 1000} seconds.');
-
-    return true;
-  }
-}
diff --git a/lib/web_ui/dev/safari_macos.dart b/lib/web_ui/dev/safari_macos.dart
index bb0727b8ec865bbf460ac6791c16964154c91d18..fe726b3f7b7b652f7db55911ad1aa5761e7ce331 100644
--- a/lib/web_ui/dev/safari_macos.dart
+++ b/lib/web_ui/dev/safari_macos.dart
@@ -3,9 +3,10 @@
 // found in the LICENSE file.
 
 import 'dart:async';
+import 'dart:convert';
 import 'dart:io';
 
-import 'package:test_api/src/backend/runtime.dart';
+import 'package:test_api/backend.dart';
 
 import 'webdriver_browser.dart';
 
@@ -23,6 +24,58 @@ class SafariMacOsEnvironment extends WebDriverBrowserEnvironment {
   @override
   Uri get driverUri => Uri(scheme: 'http', host: 'localhost', port: portNumber);
 
+  late Process _driverProcess;
+  int _retryCount = 0;
+  static const int _waitBetweenRetryInSeconds = 1;
+  static const int _maxRetryCount = 10;
+
   @override
   Future<Process> spawnDriverProcess() => Process.start('safaridriver', <String>['-p', portNumber.toString()]);
+
+  @override
+  Future<void> prepare() async {
+    await _startDriverProcess();
+  }
+
+  /// Pick an unused port and start `safaridriver` using that port.
+  ///
+  /// On macOS 13, starting `safaridriver` can be flaky so if it returns an
+  /// "Operation not permitted" error, kill the `safaridriver` process and try
+  /// again with a different port. Wait [_waitBetweenRetryInSeconds] seconds
+  /// between retries. Try up to [_maxRetryCount] times.
+  Future<void> _startDriverProcess() async {
+    _retryCount += 1;
+    if (_retryCount > 1) {
+      await Future<void>.delayed(const Duration(seconds: _waitBetweenRetryInSeconds));
+    }
+    portNumber = await pickUnusedPort();
+
+    print('Attempt $_retryCount to start safaridriver on port $portNumber');
+
+    _driverProcess = await spawnDriverProcess();
+
+    _driverProcess.stderr
+        .transform(utf8.decoder)
+        .transform(const LineSplitter())
+        .listen((String error) {
+      print('[Webdriver][Error] $error');
+      if (_retryCount > _maxRetryCount) {
+        print('[Webdriver][Error] Failed to start after $_maxRetryCount tries.');
+      } else if (error.contains('Operation not permitted')) {
+        _driverProcess.kill();
+        _startDriverProcess();
+      }
+    });
+    _driverProcess.stdout
+        .transform(utf8.decoder)
+        .transform(const LineSplitter())
+        .listen((String log) {
+      print('[Webdriver] $log');
+    });
+  }
+
+  @override
+  Future<void> cleanup() async {
+    _driverProcess.kill();
+  }
 }
diff --git a/lib/web_ui/dev/steps/compile_bundle_step.dart b/lib/web_ui/dev/steps/compile_bundle_step.dart
new file mode 100644
index 0000000000000000000000000000000000000000..b1d86ce8eeb2c237afa39a73bc27e002998bfa21
--- /dev/null
+++ b/lib/web_ui/dev/steps/compile_bundle_step.dart
@@ -0,0 +1,315 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:convert';
+import 'dart:io' as io;
+
+import 'package:path/path.dart' as pathlib;
+import 'package:pool/pool.dart';
+
+import '../environment.dart';
+import '../exceptions.dart';
+import '../felt_config.dart';
+import '../pipeline.dart';
+import '../utils.dart' show AnsiColors, FilePath, ProcessManager, cleanup, getBundleBuildDirectory, startProcess;
+
+/// Compiles a web test bundle into web_ui/build/test_bundles/<bundle-name>.
+class CompileBundleStep implements PipelineStep {
+  CompileBundleStep({
+    required this.bundle,
+    required this.isVerbose,
+    this.testFiles,
+  });
+
+  final TestBundle bundle;
+  final bool isVerbose;
+  final Set<FilePath>? testFiles;
+
+  // Maximum number of concurrent compile processes to use.
+  static final int _compileConcurrency = int.parse(io.Platform.environment['FELT_COMPILE_CONCURRENCY'] ?? '8');
+  final Pool compilePool = Pool(_compileConcurrency);
+
+  @override
+  String get description => 'compile_bundle';
+
+  @override
+  bool get isSafeToInterrupt => true;
+
+  @override
+  Future<void> interrupt() async {
+    await cleanup();
+  }
+
+  io.Directory get testSetDirectory => io.Directory(
+    pathlib.join(environment.webUiTestDir.path, bundle.testSet.directory)
+  );
+
+  io.Directory get outputBundleDirectory => getBundleBuildDirectory(bundle);
+
+  List<FilePath> _findTestFiles() {
+    final io.Directory testDirectory = testSetDirectory;
+    if (!testDirectory.existsSync()) {
+      throw ToolExit('Test directory "${testDirectory.path}" for bundle ${bundle.name.ansiMagenta} does not exist.');
+    }
+    return testDirectory
+      .listSync(recursive: true)
+      .whereType<io.File>()
+      .where((io.File f) => f.path.endsWith('_test.dart'))
+      .map<FilePath>((io.File f) => FilePath.fromWebUi(
+          pathlib.relative(f.path, from: environment.webUiRootDir.path)))
+      .toList();
+  }
+
+  TestCompiler _createCompiler(CompileConfiguration config) {
+    switch (config.compiler) {
+      case Compiler.dart2js:
+        return Dart2JSCompiler(
+          testSetDirectory,
+          outputBundleDirectory,
+          renderer: config.renderer,
+          isVerbose: isVerbose,
+        );
+      case Compiler.dart2wasm:
+        return Dart2WasmCompiler(
+          testSetDirectory,
+          outputBundleDirectory,
+          renderer: config.renderer,
+          isVerbose: isVerbose,
+        );
+    }
+  }
+
+  @override
+  Future<void> run() async {
+    print('Compiling test bundle ${bundle.name.ansiMagenta}...');
+    final List<FilePath> allTests = _findTestFiles();
+    final List<TestCompiler> compilers = bundle.compileConfigs.map(
+      (CompileConfiguration config) => _createCompiler(config)
+    ).toList();
+    final Stopwatch stopwatch = Stopwatch()..start();
+    final String testSetDirectoryPath = testSetDirectory.path;
+
+    // Clear out old bundle compilations, if they exist
+    if (outputBundleDirectory.existsSync()) {
+      outputBundleDirectory.deleteSync(recursive: true );
+    }
+
+    final List<Future<MapEntry<String, CompileResult>>> pendingResults = <Future<MapEntry<String, CompileResult>>>[];
+    for (final TestCompiler compiler in compilers) {
+      for (final FilePath testFile in allTests) {
+        final String relativePath = pathlib.relative(
+          testFile.absolute,
+          from: testSetDirectoryPath);
+        final Future<MapEntry<String, CompileResult>> result = compilePool.withResource(() async {
+          if (testFiles != null && !testFiles!.contains(testFile)) {
+            return MapEntry<String, CompileResult>(relativePath, CompileResult.filtered);
+          }
+          final bool success = await compiler.compileTest(testFile);
+          const int maxTestNameLength = 80;
+          final String truncatedPath = relativePath.length > maxTestNameLength
+            ? relativePath.replaceRange(maxTestNameLength - 3, relativePath.length, '...')
+            : relativePath;
+          final String expandedPath = truncatedPath.padRight(maxTestNameLength);
+          io.stdout.write('\r  ${success ? expandedPath.ansiGreen : expandedPath.ansiRed}');
+          return success
+            ? MapEntry<String, CompileResult>(relativePath, CompileResult.success)
+            : MapEntry<String, CompileResult>(relativePath, CompileResult.compilationFailure);
+        });
+        pendingResults.add(result);
+      }
+    }
+    final Map<String, CompileResult> results = Map<String, CompileResult>.fromEntries(await Future.wait(pendingResults));
+    stopwatch.stop();
+
+    final String resultsJson = const JsonEncoder.withIndent('  ').convert(<String, dynamic>{
+      'name': bundle.name,
+      'directory': bundle.testSet.directory,
+      'builds': bundle.compileConfigs.map(
+        (CompileConfiguration config) => <String, dynamic>{
+          'compiler': config.compiler.name,
+          'renderer': config.renderer.name,
+        }).toList(),
+      'compileTimeInMs': stopwatch.elapsedMilliseconds,
+      'results': results.map((String k, CompileResult v) => MapEntry<String, String>(k, v.name)),
+    });
+    final io.File outputResultsFile = io.File(pathlib.join(
+      outputBundleDirectory.path,
+      'results.json',
+    ));
+    outputResultsFile.writeAsStringSync(resultsJson);
+    final List<String> failedFiles = <String>[];
+    results.forEach((String fileName, CompileResult result) {
+      if (result == CompileResult.compilationFailure) {
+        failedFiles.add(fileName);
+      }
+    });
+    if (failedFiles.isEmpty) {
+      print('\rCompleted compilation of ${bundle.name.ansiMagenta} in ${stopwatch.elapsedMilliseconds}ms.'.padRight(82));
+    } else {
+      print('\rThe bundle ${bundle.name.ansiMagenta} compiled with some failures in ${stopwatch.elapsedMilliseconds}ms.');
+      print('Compilation failures:');
+      for (final String fileName in failedFiles) {
+        print('  $fileName');
+      }
+      throw ToolExit('Failed to compile ${bundle.name.ansiMagenta}.');
+    }
+  }
+}
+
+enum CompileResult {
+  success,
+  compilationFailure,
+  filtered,
+}
+
+abstract class TestCompiler {
+  TestCompiler(
+    this.inputTestSetDirectory,
+    this.outputTestBundleDirectory,
+    {
+      required this.renderer,
+      required this.isVerbose,
+    }
+  );
+
+  final io.Directory inputTestSetDirectory;
+  final io.Directory outputTestBundleDirectory;
+  final Renderer renderer;
+  final bool isVerbose;
+
+  Future<bool> compileTest(FilePath input);
+}
+
+class Dart2JSCompiler extends TestCompiler {
+  Dart2JSCompiler(
+    super.inputTestSetDirectory,
+    super.outputTestBundleDirectory,
+    {
+      required super.renderer,
+      required super.isVerbose,
+    }
+  );
+
+  @override
+  Future<bool> compileTest(FilePath input) async {
+    final String relativePath = pathlib.relative(
+      input.absolute,
+      from: inputTestSetDirectory.path
+    );
+
+    final String targetFileName = pathlib.join(
+      outputTestBundleDirectory.path,
+      '$relativePath.browser_test.dart.js',
+    );
+
+    final io.Directory outputDirectory = io.File(targetFileName).parent;
+    if (!outputDirectory.existsSync()) {
+      outputDirectory.createSync(recursive: true);
+    }
+
+    final List<String> arguments = <String>[
+      'compile',
+      'js',
+      '--no-minify',
+      '--disable-inlining',
+      '--enable-asserts',
+
+      // We do not want to auto-select a renderer in tests. As of today, tests
+      // are designed to run in one specific mode. So instead, we specify the
+      // renderer explicitly.
+      '-DFLUTTER_WEB_AUTO_DETECT=false',
+      '-DFLUTTER_WEB_USE_SKIA=${renderer == Renderer.canvaskit}',
+      '-DFLUTTER_WEB_USE_SKWASM=${renderer == Renderer.skwasm}',
+
+      '-O2',
+      '-o',
+      targetFileName, // target path.
+      relativePath, // current path.
+    ];
+
+    final ProcessManager process = await startProcess(
+      environment.dartExecutable,
+      arguments,
+      workingDirectory: inputTestSetDirectory.path,
+      failureIsSuccess: true,
+      evalOutput: !isVerbose,
+    );
+    final int exitCode = await process.wait();
+    if (exitCode != 0) {
+      io.stderr.writeln('ERROR: Failed to compile test $input. '
+          'Dart2js exited with exit code $exitCode');
+      return false;
+    } else {
+      return true;
+    }
+  }
+}
+
+class Dart2WasmCompiler extends TestCompiler {
+  Dart2WasmCompiler(
+    super.inputTestSetDirectory,
+    super.outputTestBundleDirectory,
+    {
+      required super.renderer,
+      required super.isVerbose,
+    }
+  );
+
+  @override
+  Future<bool> compileTest(FilePath input) async {
+    final String relativePath = pathlib.relative(
+      input.absolute,
+      from: inputTestSetDirectory.path
+    );
+
+    final String targetFileName = pathlib.join(
+      outputTestBundleDirectory.path,
+      '$relativePath.browser_test.dart.wasm',
+    );
+
+    final io.Directory outputDirectory = io.File(targetFileName).parent;
+    if (!outputDirectory.existsSync()) {
+      outputDirectory.createSync(recursive: true);
+    }
+
+    final List<String> arguments = <String>[
+      environment.dart2wasmSnapshotPath,
+
+      '--dart-sdk=${environment.dartSdkDir.path}',
+      '--enable-asserts',
+
+      // We do not want to auto-select a renderer in tests. As of today, tests
+      // are designed to run in one specific mode. So instead, we specify the
+      // renderer explicitly.
+      '-DFLUTTER_WEB_AUTO_DETECT=false',
+      '-DFLUTTER_WEB_USE_SKIA=${renderer == Renderer.canvaskit}',
+      '-DFLUTTER_WEB_USE_SKWASM=${renderer == Renderer.skwasm}',
+
+      if (renderer == Renderer.skwasm) ...<String>[
+        '--import-shared-memory',
+        '--shared-memory-max-pages=32768',
+      ],
+
+      relativePath, // current path.
+      targetFileName, // target path.
+    ];
+
+    final ProcessManager process = await startProcess(
+      environment.dartAotRuntimePath,
+      arguments,
+      workingDirectory: inputTestSetDirectory.path,
+      failureIsSuccess: true,
+      evalOutput: !isVerbose,
+    );
+    final int exitCode = await process.wait();
+
+    if (exitCode != 0) {
+      io.stderr.writeln('ERROR: Failed to compile test $input. '
+          'dart2wasm exited with exit code $exitCode');
+      return false;
+    } else {
+      return true;
+    }
+  }
+}
diff --git a/lib/web_ui/dev/steps/compile_tests_step.dart b/lib/web_ui/dev/steps/compile_tests_step.dart
deleted file mode 100644
index b1d221af092c9f6650df403c6eca4c6f4b071897..0000000000000000000000000000000000000000
--- a/lib/web_ui/dev/steps/compile_tests_step.dart
+++ /dev/null
@@ -1,482 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'dart:convert' show JsonEncoder;
-import 'dart:io' as io;
-
-import 'package:path/path.dart' as pathlib;
-import 'package:pool/pool.dart';
-
-import '../environment.dart';
-import '../exceptions.dart';
-import '../pipeline.dart';
-import '../utils.dart';
-
-/// Compiles web tests and their dependencies into web_ui/build/.
-///
-/// Outputs of this step:
-///
-///  * canvaskit/   - CanvasKit artifacts
-///  * assets/      - test fonts
-///  * host/        - compiled test host page and static artifacts
-///  * test/        - compiled test code
-///  * test_images/ - test images copied from Skis sources.
-class CompileTestsStep implements PipelineStep {
-  CompileTestsStep({this.testFiles, this.useLocalCanvasKit = false, this.isWasm = false});
-
-  final List<FilePath>? testFiles;
-  final bool isWasm;
-
-  final bool useLocalCanvasKit;
-
-  @override
-  String get description => 'compile_tests';
-
-  @override
-  bool get isSafeToInterrupt => true;
-
-  @override
-  Future<void> interrupt() async {
-    await cleanup();
-  }
-
-  @override
-  Future<void> run() async {
-    await environment.webUiBuildDir.create();
-    if (isWasm) {
-      await copyDart2WasmTestScript();
-      await copyDart2WasmRuntime();
-    }
-    await copyCanvasKitFiles(useLocalCanvasKit: useLocalCanvasKit);
-    await buildHostPage();
-    await copyTestFonts();
-    await copySkiaTestImages();
-    await compileTests(testFiles ?? findAllTests(), isWasm);
-  }
-}
-
-const Map<String, String> _kTestFonts = <String, String>{
-  'Ahem': 'ahem.ttf',
-  'Roboto': 'Roboto-Regular.ttf',
-  'RobotoVariable': 'RobotoSlab-VariableFont_wght.ttf',
-  'Noto Naskh Arabic UI': 'NotoNaskhArabic-Regular.ttf',
-  'Noto Color Emoji': 'NotoColorEmoji.ttf',
-};
-
-Future<void> copyTestFonts() async {
-  final String fontsPath = pathlib.join(
-    environment.flutterDirectory.path,
-    'third_party',
-    'txt',
-    'third_party',
-    'fonts',
-  );
-
-  final List<dynamic> fontManifest = <dynamic>[];
-  for (final MapEntry<String, String> fontEntry in _kTestFonts.entries) {
-    final String family = fontEntry.key;
-    final String fontFile = fontEntry.value;
-
-    fontManifest.add(<String, dynamic>{
-      'family': family,
-      'fonts': <dynamic>[
-        <String, String>{
-          'asset': 'fonts/$fontFile',
-        },
-      ],
-    });
-
-    final io.File sourceTtf = io.File(pathlib.join(fontsPath, fontFile));
-    final io.File destinationTtf = io.File(pathlib.join(
-      environment.webUiBuildDir.path,
-      'assets',
-      'fonts',
-      fontFile,
-    ));
-    await destinationTtf.create(recursive: true);
-    await sourceTtf.copy(destinationTtf.path);
-  }
-
-  final io.File fontManifestFile = io.File(pathlib.join(
-    environment.webUiBuildDir.path,
-    'assets',
-    'FontManifest.json',
-  ));
-  await fontManifestFile.create(recursive: true);
-  await fontManifestFile.writeAsString(
-    const JsonEncoder.withIndent('  ').convert(fontManifest),
-  );
-}
-
-Future<void> copySkiaTestImages() async {
-  final io.Directory testImagesDir = io.Directory(pathlib.join(
-    environment.engineSrcDir.path,
-    'third_party',
-    'skia',
-    'resources',
-    'images',
-  ));
-
-  for (final io.File imageFile in testImagesDir.listSync(recursive: true).whereType<io.File>()) {
-    final io.File destination = io.File(pathlib.join(
-      environment.webUiBuildDir.path,
-      'test_images',
-      pathlib.relative(imageFile.path, from: testImagesDir.path),
-    ));
-    destination.createSync(recursive: true);
-    await imageFile.copy(destination.path);
-  }
-}
-
-Future<void> copyDart2WasmRuntime() async {
-  final io.File sourceFile = io.File(pathlib.join(
-    environment.dartSdkDir.path,
-    'bin',
-    'dart2wasm_runtime.mjs',
-  ));
-  final io.Directory targetDir = io.Directory(pathlib.join(
-    environment.webUiBuildDir.path,
-    'dart2wasm_runtime.mjs',
-  ));
-
-  await sourceFile.copy(targetDir.path);
-}
-
-Future<void> copyDart2WasmTestScript() async {
-  final io.File sourceFile = io.File(pathlib.join(
-    environment.webUiDevDir.path,
-    'test_dart2wasm.js',
-  ));
-  final io.Directory targetDir = io.Directory(pathlib.join(
-    environment.webUiBuildDir.path,
-    'test_dart2wasm.js',
-  ));
-  await sourceFile.copy(targetDir.path);
-}
-
-Future<void> copyCanvasKitFiles({bool useLocalCanvasKit = false}) async {
-  // If CanvasKit has been built locally, use that instead of the CIPD version.
-  final io.File localCanvasKitWasm = io.File(pathlib.join(
-    environment.wasmReleaseOutDir.path,
-    'canvaskit.wasm',
-  ));
-  final bool builtLocalCanvasKit = localCanvasKitWasm.existsSync();
-  if (useLocalCanvasKit && !builtLocalCanvasKit) {
-    throw ArgumentError('Requested to use local CanvasKit but could not find the '
-        'built CanvasKit at ${localCanvasKitWasm.path}. Falling back to '
-        'CanvasKit from CIPD.');
-  }
-
-  final io.Directory targetDir = io.Directory(pathlib.join(
-    environment.webUiBuildDir.path,
-    'canvaskit',
-  ));
-
-  if (useLocalCanvasKit) {
-    final List<io.File> canvasKitFiles = <io.File>[
-      localCanvasKitWasm,
-      io.File(pathlib.join(
-        environment.wasmReleaseOutDir.path,
-        'canvaskit.js',
-      )),
-    ];
-    for (final io.File file in canvasKitFiles) {
-      final io.File normalTargetFile = io.File(pathlib.join(
-        targetDir.path,
-        pathlib.basename(file.path),
-      ));
-      final io.File profileTargetFile = io.File(pathlib.join(
-        targetDir.path,
-        'profiling',
-        pathlib.basename(file.path),
-      ));
-      await normalTargetFile.create(recursive: true);
-      await profileTargetFile.create(recursive: true);
-      await file.copy(normalTargetFile.path);
-      await file.copy(profileTargetFile.path);
-    }
-  } else {
-    final io.Directory canvasKitDir = io.Directory(pathlib.join(
-      environment.engineSrcDir.path,
-      'third_party',
-      'web_dependencies',
-      'canvaskit',
-    ));
-
-    final Iterable<io.File> canvasKitFiles = canvasKitDir
-        .listSync(recursive: true)
-        .whereType<io.File>();
-
-    for (final io.File file in canvasKitFiles) {
-      final String relativePath =
-          pathlib.relative(file.path, from: canvasKitDir.path);
-      final io.File targetFile = io.File(pathlib.join(
-        targetDir.path,
-        relativePath,
-      ));
-      await targetFile.create(recursive: true);
-      await file.copy(targetFile.path);
-    }
-  }
-}
-
-/// Compiles the specified unit tests.
-Future<void> compileTests(List<FilePath> testFiles, bool isWasm) async {
-  final Stopwatch stopwatch = Stopwatch()..start();
-
-  final TestsByRenderer sortedTests = sortTestsByRenderer(testFiles);
-
-  await Future.wait(<Future<void>>[
-    if (sortedTests.htmlTests.isNotEmpty)
-      _compileTestsInParallel(targets: sortedTests.htmlTests, isWasm: isWasm),
-    if (sortedTests.canvasKitTests.isNotEmpty)
-      _compileTestsInParallel(targets: sortedTests.canvasKitTests, renderer: Renderer.canvasKit, isWasm: isWasm),
-    if (sortedTests.skwasmTests.isNotEmpty)
-      _compileTestsInParallel(targets: sortedTests.skwasmTests, renderer: Renderer.skwasm, isWasm: isWasm),
-  ]);
-
-  stopwatch.stop();
-
-  final int targetCount = sortedTests.numTargetsToCompile;
-  print(
-    'Built $targetCount tests in ${stopwatch.elapsedMilliseconds ~/ 1000} '
-    'seconds using $_dart2jsConcurrency concurrent compile processes.',
-  );
-}
-
-// Maximum number of concurrent dart2js processes to use.
-int _dart2jsConcurrency = int.parse(io.Platform.environment['FELT_DART2JS_CONCURRENCY'] ?? '8');
-
-final Pool _dart2jsPool = Pool(_dart2jsConcurrency);
-
-/// Spawns multiple dart2js processes to compile [targets] in parallel.
-Future<void> _compileTestsInParallel({
-  required List<FilePath> targets,
-  Renderer renderer = Renderer.html,
-  bool isWasm = false,
-}) async {
-  final Stream<bool> results = _dart2jsPool.forEach(
-    targets,
-    (FilePath file) => compileUnitTest(file, renderer: renderer, isWasm: isWasm),
-  );
-  await for (final bool isSuccess in results) {
-    if (!isSuccess) {
-      throw ToolExit('Failed to compile tests.');
-    }
-  }
-}
-
-Future<bool> compileUnitTest(FilePath input, {required Renderer renderer, required bool isWasm}) async {
-  return isWasm ? compileUnitTestToWasm(input, renderer: renderer)
-    : compileUnitTestToJS(input, renderer: renderer);
-}
-
-/// Compiles one unit test using `dart2js`.
-///
-/// When building for CanvasKit we have to use extra argument
-/// `DFLUTTER_WEB_USE_SKIA=true`.
-///
-/// Dart2js creates the following outputs:
-/// - target.browser_test.dart.js
-/// - target.browser_test.dart.js.deps
-/// - target.browser_test.dart.js.map
-/// under the same directory with test file. If all these files are not in
-/// the same directory, Chrome dev tools cannot load the source code during
-/// debug.
-///
-/// All the files under test already copied from /test directory to /build
-/// directory before test are build. See [_copyFilesFromTestToBuild].
-///
-/// Later the extra files will be deleted in [_cleanupExtraFilesUnderTestDir].
-Future<bool> compileUnitTestToJS(FilePath input, {required Renderer renderer}) async {
-  // Compile to different directories for different renderers. This allows us
-  // to run the same test in multiple renderers.
-  final String targetFileName = pathlib.join(
-    environment.webUiBuildDir.path,
-    getBuildDirForRenderer(renderer),
-    '${input.relativeToWebUi}.browser_test.dart.js',
-  );
-
-  final io.Directory directoryToTarget = io.Directory(pathlib.join(
-      environment.webUiBuildDir.path,
-      getBuildDirForRenderer(renderer),
-      pathlib.dirname(input.relativeToWebUi)));
-
-  if (!directoryToTarget.existsSync()) {
-    directoryToTarget.createSync(recursive: true);
-  }
-
-  final List<String> arguments = <String>[
-    'compile',
-    'js',
-    '--no-minify',
-    '--disable-inlining',
-    '--enable-asserts',
-
-    // We do not want to auto-select a renderer in tests. As of today, tests
-    // are designed to run in one specific mode. So instead, we specify the
-    // renderer explicitly.
-    '-DFLUTTER_WEB_AUTO_DETECT=false',
-    '-DFLUTTER_WEB_USE_SKIA=${renderer == Renderer.canvasKit}',
-    '-DFLUTTER_WEB_USE_SKWASM=${renderer == Renderer.skwasm}',
-
-    '-O2',
-    '-o',
-    targetFileName, // target path.
-    input.relativeToWebUi, // current path.
-  ];
-
-  final int exitCode = await runProcess(
-    environment.dartExecutable,
-    arguments,
-    workingDirectory: environment.webUiRootDir.path,
-  );
-
-  if (exitCode != 0) {
-    io.stderr.writeln('ERROR: Failed to compile test $input. '
-        'Dart2js exited with exit code $exitCode');
-    return false;
-  } else {
-    return true;
-  }
-}
-
-Future<bool> compileUnitTestToWasm(FilePath input, {required Renderer renderer}) async {
-  final String targetFileName = pathlib.join(
-    environment.webUiBuildDir.path,
-    '${input.relativeToWebUi}.browser_test.dart.wasm',
-  );
-
-  final io.Directory directoryToTarget = io.Directory(pathlib.join(
-      environment.webUiBuildDir.path,
-      pathlib.dirname(input.relativeToWebUi)));
-
-  if (!directoryToTarget.existsSync()) {
-    directoryToTarget.createSync(recursive: true);
-  }
-
-  final List<String> arguments = <String>[
-    environment.dart2wasmSnapshotPath,
-
-    '--dart-sdk=${environment.dartSdkDir.path}',
-
-    // We do not want to auto-select a renderer in tests. As of today, tests
-    // are designed to run in one specific mode. So instead, we specify the
-    // renderer explicitly.
-    '-DFLUTTER_WEB_AUTO_DETECT=false',
-    '-DFLUTTER_WEB_USE_SKIA=${renderer == Renderer.canvasKit}',
-    '-DFLUTTER_WEB_USE_SKWASM=${renderer == Renderer.skwasm}',
-    input.relativeToWebUi, // current path.
-    targetFileName, // target path.
-  ];
-
-  final int exitCode = await runProcess(
-    environment.dartAotRuntimePath,
-    arguments,
-    workingDirectory: environment.webUiRootDir.path,
-  );
-
-  if (exitCode != 0) {
-    io.stderr.writeln('ERROR: Failed to compile test $input. '
-        'dart2wasm exited with exit code $exitCode');
-    return false;
-  } else {
-    return true;
-  }
-}
-
-Future<void> buildHostPage() async {
-  final String hostDartPath = pathlib.join('lib', 'static', 'host.dart');
-  final io.File hostDartFile = io.File(pathlib.join(
-    environment.webEngineTesterRootDir.path,
-    hostDartPath,
-  ));
-  final String targetDirectoryPath = pathlib.join(
-    environment.webUiBuildDir.path,
-    'host',
-  );
-  io.Directory(targetDirectoryPath).createSync(recursive: true);
-  final String targetFilePath = pathlib.join(
-    targetDirectoryPath,
-    'host.dart',
-  );
-
-  const List<String> staticFiles = <String>[
-    'favicon.ico',
-    'host.css',
-    'index.html',
-  ];
-  for (final String staticFilePath in staticFiles) {
-    final io.File source = io.File(pathlib.join(
-      environment.webEngineTesterRootDir.path,
-      'lib',
-      'static',
-      staticFilePath,
-    ));
-    final io.File destination = io.File(pathlib.join(
-      targetDirectoryPath,
-      staticFilePath,
-    ));
-    await source.copy(destination.path);
-  }
-
-  final io.File timestampFile = io.File(pathlib.join(
-    environment.webEngineTesterRootDir.path,
-    '$targetFilePath.js.timestamp',
-  ));
-
-  final String timestamp =
-      hostDartFile.statSync().modified.millisecondsSinceEpoch.toString();
-  if (timestampFile.existsSync()) {
-    final String lastBuildTimestamp = timestampFile.readAsStringSync();
-    if (lastBuildTimestamp == timestamp) {
-      // The file is still fresh. No need to rebuild.
-      return;
-    } else {
-      // Record new timestamp, but don't return. We need to rebuild.
-      print('${hostDartFile.path} timestamp changed. Rebuilding.');
-    }
-  } else {
-    print('Building ${hostDartFile.path}.');
-  }
-
-  int exitCode = await runProcess(
-    environment.dartExecutable,
-    <String>[
-      'pub',
-      'get',
-    ],
-    workingDirectory: environment.webEngineTesterRootDir.path
-  );
-
-  if (exitCode != 0) {
-    throw ToolExit(
-      'Failed to run pub get for web_engine_tester, exit code $exitCode',
-      exitCode: exitCode,
-    );
-  }
-
-  exitCode = await runProcess(
-    environment.dartExecutable,
-    <String>[
-      'compile',
-      'js',
-      hostDartPath,
-      '-o',
-      '$targetFilePath.js',
-    ],
-    workingDirectory: environment.webEngineTesterRootDir.path,
-  );
-
-  if (exitCode != 0) {
-    throw ToolExit(
-      'Failed to compile ${hostDartFile.path}. Compiler '
-      'exited with exit code $exitCode',
-      exitCode: exitCode,
-    );
-  }
-
-  // Record the timestamp to avoid rebuilding unless the file changes.
-  timestampFile.writeAsStringSync(timestamp);
-}
diff --git a/lib/web_ui/dev/steps/copy_artifacts_step.dart b/lib/web_ui/dev/steps/copy_artifacts_step.dart
new file mode 100644
index 0000000000000000000000000000000000000000..7c7293bbd5fc66397064e753cf11bc1f3223a50a
--- /dev/null
+++ b/lib/web_ui/dev/steps/copy_artifacts_step.dart
@@ -0,0 +1,352 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:convert' show JsonEncoder;
+import 'dart:io' as io;
+
+import 'package:path/path.dart' as pathlib;
+
+import '../environment.dart';
+import '../exceptions.dart';
+import '../felt_config.dart';
+import '../pipeline.dart';
+import '../utils.dart';
+
+class CopyArtifactsStep implements PipelineStep {
+  CopyArtifactsStep(this.artifactDeps, { required this.runtimeMode });
+
+  final ArtifactDependencies artifactDeps;
+  final RuntimeMode runtimeMode;
+
+  @override
+  String get description => 'copy_artifacts';
+
+  @override
+  bool get isSafeToInterrupt => true;
+
+  @override
+  Future<void> interrupt() async {
+    await cleanup();
+  }
+
+  @override
+  Future<void> run() async {
+    await environment.webTestsArtifactsDir.create(recursive: true);
+    await buildHostPage();
+    await copyTestFonts();
+    await copySkiaTestImages();
+    await copyFlutterJsFiles();
+    if (artifactDeps.canvasKit) {
+      print('Copying CanvasKit...');
+      await copyCanvasKitFiles('canvaskit', 'canvaskit');
+    }
+    if (artifactDeps.canvasKitChromium) {
+      print('Copying CanvasKit (Chromium)...');
+      await copyCanvasKitFiles('canvaskit_chromium', 'canvaskit/chromium');
+    }
+    if (artifactDeps.skwasm) {
+      print('Copying Skwasm...');
+      await copySkwasm();
+    }
+  }
+
+  Future<void> copyTestFonts() async {
+    const Map<String, String> testFonts = <String, String>{
+      'Ahem': 'ahem.ttf',
+      'Roboto': 'Roboto-Regular.ttf',
+      'RobotoVariable': 'RobotoSlab-VariableFont_wght.ttf',
+      'Noto Naskh Arabic UI': 'NotoNaskhArabic-Regular.ttf',
+      'Noto Color Emoji': 'NotoColorEmoji.ttf',
+    };
+
+    final String fontsPath = pathlib.join(
+      environment.flutterDirectory.path,
+      'third_party',
+      'txt',
+      'third_party',
+      'fonts',
+    );
+
+    final List<dynamic> fontManifest = <dynamic>[];
+    for (final MapEntry<String, String> fontEntry in testFonts.entries) {
+      final String family = fontEntry.key;
+      final String fontFile = fontEntry.value;
+
+      fontManifest.add(<String, dynamic>{
+        'family': family,
+        'fonts': <dynamic>[
+          <String, String>{
+            'asset': 'fonts/$fontFile',
+          },
+        ],
+      });
+
+      final io.File sourceTtf = io.File(pathlib.join(fontsPath, fontFile));
+      final io.File destinationTtf = io.File(pathlib.join(
+        environment.webTestsArtifactsDir.path,
+        'assets',
+        'fonts',
+        fontFile,
+      ));
+      await destinationTtf.create(recursive: true);
+      await sourceTtf.copy(destinationTtf.path);
+    }
+
+    final io.File fontManifestFile = io.File(pathlib.join(
+      environment.webTestsArtifactsDir.path,
+      'assets',
+      'FontManifest.json',
+    ));
+    await fontManifestFile.create(recursive: true);
+    await fontManifestFile.writeAsString(
+      const JsonEncoder.withIndent('  ').convert(fontManifest),
+    );
+
+    final io.Directory fallbackFontsSource = io.Directory(pathlib.join(
+      environment.engineSrcDir.path,
+      'flutter',
+      'third_party',
+      'google_fonts_for_unit_tests',
+    ));
+    final String fallbackFontsDestinationPath = pathlib.join(
+      environment.webTestsArtifactsDir.path,
+      'assets',
+      'fallback_fonts',
+    );
+    for (final io.File file in
+      fallbackFontsSource.listSync(recursive: true).whereType<io.File>()
+    ) {
+      final String relativePath = pathlib.relative(file.path, from: fallbackFontsSource.path);
+      final io.File destinationFile = io.File(pathlib.join(fallbackFontsDestinationPath, relativePath));
+      if (!destinationFile.parent.existsSync()) {
+        destinationFile.parent.createSync(recursive: true);
+      }
+      file.copySync(destinationFile.path);
+    }
+  }
+
+  Future<void> copySkiaTestImages() async {
+    final io.Directory testImagesDir = io.Directory(pathlib.join(
+      environment.engineSrcDir.path,
+      'flutter',
+      'third_party',
+      'skia',
+      'resources',
+      'images',
+    ));
+
+    for (final io.File imageFile in testImagesDir.listSync(recursive: true).whereType<io.File>()) {
+      final io.File destination = io.File(pathlib.join(
+        environment.webTestsArtifactsDir.path,
+        'test_images',
+        pathlib.relative(imageFile.path, from: testImagesDir.path),
+      ));
+      destination.createSync(recursive: true);
+      await imageFile.copy(destination.path);
+    }
+  }
+
+  Future<void> copyFlutterJsFiles() async {
+    final io.Directory flutterJsInputDirectory = io.Directory(pathlib.join(
+      outBuildPath,
+      'flutter_web_sdk',
+      'flutter_js',
+    ));
+    final String targetDirectoryPath = pathlib.join(
+      environment.webTestsArtifactsDir.path,
+      'flutter_js',
+    );
+
+    for (final io.File sourceFile in flutterJsInputDirectory
+      .listSync(recursive: true)
+      .whereType<io.File>()
+    ) {
+      final String relativePath = pathlib.relative(
+        sourceFile.path,
+        from: flutterJsInputDirectory.path
+      );
+      final String targetPath = pathlib.join(
+        targetDirectoryPath,
+        relativePath,
+      );
+      final io.File targetFile = io.File(targetPath);
+      if (!targetFile.parent.existsSync()) {
+        targetFile.parent.createSync(recursive: true);
+      }
+      sourceFile.copySync(targetPath);
+    }
+  }
+
+  Future<void> copyCanvasKitFiles(String sourcePath, String destinationPath) async {
+    final String sourceDirectoryPath = pathlib.join(
+      outBuildPath,
+      sourcePath,
+    );
+
+    final String targetDirectoryPath = pathlib.join(
+      environment.webTestsArtifactsDir.path,
+      destinationPath,
+    );
+
+    for (final String filename in <String>[
+      'canvaskit.js',
+      'canvaskit.wasm',
+      'canvaskit.wasm.map',
+    ]) {
+      final io.File sourceFile = io.File(pathlib.join(
+        sourceDirectoryPath,
+        filename,
+      ));
+      final io.File targetFile = io.File(pathlib.join(
+        targetDirectoryPath,
+        filename,
+      ));
+      if (!sourceFile.existsSync()) {
+        if (filename.endsWith('.map')) {
+          // Sourcemaps are only generated under certain build conditions, so
+          // they are optional.
+          continue;
+        } {
+          throw ToolExit('Built CanvasKit artifact not found at path "$sourceFile".');
+        }
+      }
+      await targetFile.create(recursive: true);
+      await sourceFile.copy(targetFile.path);
+    }
+  }
+
+  String get outBuildPath => getBuildDirectoryForRuntimeMode(runtimeMode).path;
+
+  Future<void> copySkwasm() async {
+    final io.Directory targetDir = io.Directory(pathlib.join(
+      environment.webTestsArtifactsDir.path,
+      'canvaskit',
+    ));
+
+    await targetDir.create(recursive: true);
+
+    for (final String fileName in <String>[
+      'skwasm.wasm',
+      'skwasm.wasm.map',
+      'skwasm.js',
+      'skwasm.worker.js',
+    ]) {
+      final io.File sourceFile = io.File(pathlib.join(
+        outBuildPath,
+        'flutter_web_sdk',
+        'canvaskit',
+        fileName,
+      ));
+      if (!sourceFile.existsSync()) {
+        if (fileName.endsWith('.map')) {
+          // Sourcemaps are only generated under certain build conditions, so
+          // they are optional.
+          continue;
+        } {
+          throw ToolExit('Built Skwasm artifact not found at path "$sourceFile".');
+        }
+      }
+      final io.File targetFile = io.File(pathlib.join(
+        targetDir.path,
+        fileName,
+      ));
+      await sourceFile.copy(targetFile.path);
+    }
+  }
+
+  Future<void> buildHostPage() async {
+    final String hostDartPath = pathlib.join('lib', 'static', 'host.dart');
+    final io.File hostDartFile = io.File(pathlib.join(
+      environment.webEngineTesterRootDir.path,
+      hostDartPath,
+    ));
+    final String targetDirectoryPath = pathlib.join(
+      environment.webTestsArtifactsDir.path,
+      'host',
+    );
+    io.Directory(targetDirectoryPath).createSync(recursive: true);
+    final String targetFilePath = pathlib.join(
+      targetDirectoryPath,
+      'host.dart',
+    );
+
+    const List<String> staticFiles = <String>[
+      'favicon.ico',
+      'host.css',
+      'index.html',
+    ];
+    for (final String staticFilePath in staticFiles) {
+      final io.File source = io.File(pathlib.join(
+        environment.webEngineTesterRootDir.path,
+        'lib',
+        'static',
+        staticFilePath,
+      ));
+      final io.File destination = io.File(pathlib.join(
+        targetDirectoryPath,
+        staticFilePath,
+      ));
+      await source.copy(destination.path);
+    }
+
+    final io.File timestampFile = io.File(pathlib.join(
+      environment.webEngineTesterRootDir.path,
+      '$targetFilePath.js.timestamp',
+    ));
+
+    final String timestamp =
+        hostDartFile.statSync().modified.millisecondsSinceEpoch.toString();
+    if (timestampFile.existsSync()) {
+      final String lastBuildTimestamp = timestampFile.readAsStringSync();
+      if (lastBuildTimestamp == timestamp) {
+        // The file is still fresh. No need to rebuild.
+        return;
+      } else {
+        // Record new timestamp, but don't return. We need to rebuild.
+        print('${hostDartFile.path} timestamp changed. Rebuilding.');
+      }
+    } else {
+      print('Building ${hostDartFile.path}.');
+    }
+
+    int exitCode = await runProcess(
+      environment.dartExecutable,
+      <String>[
+        'pub',
+        'get',
+      ],
+      workingDirectory: environment.webEngineTesterRootDir.path
+    );
+
+    if (exitCode != 0) {
+      throw ToolExit(
+        'Failed to run pub get for web_engine_tester, exit code $exitCode',
+        exitCode: exitCode,
+      );
+    }
+
+    exitCode = await runProcess(
+      environment.dartExecutable,
+      <String>[
+        'compile',
+        'js',
+        hostDartPath,
+        '-o',
+        '$targetFilePath.js',
+      ],
+      workingDirectory: environment.webEngineTesterRootDir.path,
+    );
+
+    if (exitCode != 0) {
+      throw ToolExit(
+        'Failed to compile ${hostDartFile.path}. Compiler '
+        'exited with exit code $exitCode',
+        exitCode: exitCode,
+      );
+    }
+
+    // Record the timestamp to avoid rebuilding unless the file changes.
+    timestampFile.writeAsStringSync(timestamp);
+  }
+}
diff --git a/lib/web_ui/dev/steps/run_tests_step.dart b/lib/web_ui/dev/steps/run_suite_step.dart
similarity index 30%
rename from lib/web_ui/dev/steps/run_tests_step.dart
rename to lib/web_ui/dev/steps/run_suite_step.dart
index b6d51154c7f2761140992585475cb544d96a706f..2944187a7f38b1642998d29d80775722bb2b0e7d 100644
--- a/lib/web_ui/dev/steps/run_tests_step.dart
+++ b/lib/web_ui/dev/steps/run_suite_step.dart
@@ -2,57 +2,56 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:convert';
 import 'dart:io' as io;
 
 import 'package:path/path.dart' as pathlib;
 // TODO(yjbanov): remove hacks when this is fixed:
 //                https://github.com/dart-lang/test/issues/1521
 import 'package:skia_gold_client/skia_gold_client.dart';
-import 'package:test_api/src/backend/group.dart' as hack;
-import 'package:test_api/src/backend/live_test.dart' as hack;
-import 'package:test_api/src/backend/runtime.dart' as hack;
-import 'package:test_core/src/executable.dart' as test;
-import 'package:test_core/src/runner/configuration/reporters.dart' as hack;
-import 'package:test_core/src/runner/engine.dart' as hack;
-import 'package:test_core/src/runner/hack_register_platform.dart' as hack;
-import 'package:test_core/src/runner/reporter.dart' as hack;
+import 'package:test_api/backend.dart' as hack;
+// TODO(ditman): Fix ignores when https://github.com/flutter/flutter/issues/143599 is resolved.
+import 'package:test_core/src/executable.dart' as test; // ignore: implementation_imports
+import 'package:test_core/src/runner/hack_register_platform.dart' as hack; // ignore: implementation_imports
 
 import '../browser.dart';
 import '../common.dart';
 import '../environment.dart';
 import '../exceptions.dart';
+import '../felt_config.dart';
 import '../pipeline.dart';
 import '../test_platform.dart';
 import '../utils.dart';
 
-/// Runs web tests.
+/// Runs a test suite.
 ///
-/// Assumes the artifacts from [CompileTestsStep] are available, either from
-/// running it prior to this step locally, or by having the build graph copy
+/// Assumes the artifacts from previous steps are available, either from
+/// running them prior to this step locally, or by having the build graph copy
 /// them from another bot.
-class RunTestsStep implements PipelineStep {
-  RunTestsStep({
-    required this.browserName,
-    required this.isDebug,
+class RunSuiteStep implements PipelineStep {
+  RunSuiteStep(this.suite, {
+    required this.startPaused,
+    required this.isVerbose,
     required this.doUpdateScreenshotGoldens,
     required this.requireSkiaGold,
-    this.testFiles,
     required this.overridePathToCanvasKit,
-    required this.isWasm
+    required this.useDwarf,
+    this.testFiles,
   });
 
-  final String browserName;
-  final List<FilePath>? testFiles;
-  final bool isDebug;
-  final bool isWasm;
+  final TestSuite suite;
+  final Set<FilePath>? testFiles;
+  final bool startPaused;
+  final bool isVerbose;
   final bool doUpdateScreenshotGoldens;
   final String? overridePathToCanvasKit;
+  final bool useDwarf;
 
   /// Require Skia Gold to be available and reachable.
   final bool requireSkiaGold;
 
   @override
-  String get description => 'run_tests';
+  String get description => 'run_suite';
 
   @override
   bool get isSafeToInterrupt => true;
@@ -62,77 +61,145 @@ class RunTestsStep implements PipelineStep {
 
   @override
   Future<void> run() async {
-    await _prepareTestResultsDirectory();
-
-    final BrowserEnvironment browserEnvironment = getBrowserEnvironment(browserName, enableWasmGC: isWasm);
+    _prepareTestResultsDirectory();
+    final BrowserEnvironment browserEnvironment = getBrowserEnvironment(
+      suite.runConfig.browser,
+      useDwarf: useDwarf,
+    );
     await browserEnvironment.prepare();
 
     final SkiaGoldClient? skiaClient = await _createSkiaClient();
-    final List<FilePath> testFiles = this.testFiles ?? findAllTests();
-
-    final TestsByRenderer sortedTests = sortTestsByRenderer(testFiles);
-
-    bool testsPassed = true;
-
-    if (sortedTests.htmlTests.isNotEmpty) {
-      await _runTestBatch(
-        testFiles: sortedTests.htmlTests,
-        renderer: Renderer.html,
+    final String configurationFilePath = pathlib.join(
+      environment.webUiRootDir.path,
+      browserEnvironment.packageTestConfigurationYamlFile,
+    );
+    final String bundleBuildPath = getBundleBuildDirectory(suite.testBundle).path;
+    final List<String> testArgs = <String>[
+      ...<String>['-r', 'compact'],
+      // Disable concurrency. Running with concurrency proved to be flaky.
+      '--concurrency=1',
+      if (startPaused) '--pause-after-load',
+      '--platform=${browserEnvironment.packageTestRuntime.identifier}',
+      '--precompiled=$bundleBuildPath',
+      '--configuration=$configurationFilePath',
+      if (AnsiColors.shouldEscape) '--color' else '--no-color',
+
+      // TODO(jacksongardner): Set the default timeout to five minutes when
+      // https://github.com/dart-lang/test/issues/2006 is fixed.
+      '--',
+      ..._collectTestPaths(),
+    ];
+
+    hack.registerPlatformPlugin(<hack.Runtime>[
+      browserEnvironment.packageTestRuntime,
+    ], () {
+      return BrowserPlatform.start(
+        suite,
         browserEnvironment: browserEnvironment,
-        expectFailure: false,
-        isDebug: isDebug,
-        isWasm: isWasm,
         doUpdateScreenshotGoldens: doUpdateScreenshotGoldens,
         skiaClient: skiaClient,
         overridePathToCanvasKit: overridePathToCanvasKit,
+        isVerbose: isVerbose,
       );
-      testsPassed &= io.exitCode == 0;
+    });
+
+    print('[${suite.name.ansiCyan}] Running...');
+
+    // We want to run tests with the test set's directory as a working directory.
+    final io.Directory testSetDirectory = io.Directory(pathlib.join(
+      environment.webUiTestDir.path,
+      suite.testBundle.testSet.directory,
+    ));
+    final dynamic originalCwd = io.Directory.current;
+    io.Directory.current = testSetDirectory;
+    try {
+      await test.main(testArgs);
+    } finally {
+      io.Directory.current = originalCwd;
     }
 
-    if (sortedTests.canvasKitTests.isNotEmpty) {
-      await _runTestBatch(
-        testFiles: sortedTests.canvasKitTests,
-        renderer: Renderer.canvasKit,
-        browserEnvironment: browserEnvironment,
-        expectFailure: false,
-        isDebug: isDebug,
-        isWasm: isWasm,
-        doUpdateScreenshotGoldens: doUpdateScreenshotGoldens,
-        skiaClient: skiaClient,
-        overridePathToCanvasKit: overridePathToCanvasKit,
-      );
-      testsPassed &= io.exitCode == 0;
-    }
+    await browserEnvironment.cleanup();
 
-    // TODO(jacksongardner): enable this test suite on safari
-    // For some reason, Safari is flaky when running the Skwasm test suite
-    // See https://github.com/flutter/flutter/issues/115312
-    if (browserName != kSafari && sortedTests.skwasmTests.isNotEmpty) {
-      await _runTestBatch(
-        testFiles: sortedTests.skwasmTests,
-        renderer: Renderer.skwasm,
-        browserEnvironment: browserEnvironment,
-        expectFailure: false,
-        isDebug: isDebug,
-        isWasm: isWasm,
-        doUpdateScreenshotGoldens: doUpdateScreenshotGoldens,
-        skiaClient: skiaClient,
-        overridePathToCanvasKit: overridePathToCanvasKit,
-      );
-      testsPassed &= io.exitCode == 0;
+    // Since we are just calling `main()` on the test executable, it will modify
+    // the exit code. We use this as a signal that there were some tests that failed.
+    if (io.exitCode != 0) {
+      print('[${suite.name.ansiCyan}] ${'Some tests failed.'.ansiRed}');
+      // Change the exit code back to 0 when we're done. Failures will be bubbled up
+      // at the end of the pipeline and we'll exit abnormally if there were any
+      // failures in the pipeline.
+      io.exitCode = 0;
+      throw ToolExit('Some unit tests failed in suite ${suite.name.ansiCyan}.');
+    } else {
+      print('[${suite.name.ansiCyan}] ${'All tests passed!'.ansiGreen}');
     }
+  }
 
-    await browserEnvironment.cleanup();
+  io.Directory _prepareTestResultsDirectory() {
+    final io.Directory resultsDirectory = io.Directory(pathlib.join(
+      environment.webUiTestResultsDirectory.path,
+      suite.name,
+    ));
+    if (resultsDirectory.existsSync()) {
+      resultsDirectory.deleteSync(recursive: true);
+    }
+    resultsDirectory.createSync(recursive: true);
+    return resultsDirectory;
+  }
 
-    if (!testsPassed) {
-      throw ToolExit('Some tests failed');
+  List<String> _collectTestPaths() {
+    final io.Directory bundleBuild = getBundleBuildDirectory(suite.testBundle);
+    final io.File resultsJsonFile = io.File(pathlib.join(
+      bundleBuild.path,
+      'results.json',
+    ));
+    if (!resultsJsonFile.existsSync()) {
+      throw ToolExit('Could not find built bundle ${suite.testBundle.name.ansiMagenta} for suite ${suite.name.ansiCyan}.');
     }
+    final String jsonString = resultsJsonFile.readAsStringSync();
+    final dynamic jsonContents = const JsonDecoder().convert(jsonString);
+    final dynamic results = jsonContents['results'];
+    final List<String> testPaths = <String>[];
+    results.forEach((dynamic k, dynamic v) {
+      final String result = v as String;
+      final String testPath = k as String;
+      if (testFiles != null) {
+        if (!testFiles!.contains(FilePath.fromTestSet(suite.testBundle.testSet, testPath))) {
+          return;
+        }
+      }
+      if (result == 'success') {
+        testPaths.add(testPath);
+      }
+    });
+    return testPaths;
   }
 
   Future<SkiaGoldClient?> _createSkiaClient() async {
+    if (suite.testBundle.compileConfigs.length > 1) {
+      // Multiple compile configs are only used for our fallback tests, which
+      // do not collect goldens.
+      return null;
+    }
+    if (suite.runConfig.browser == BrowserName.safari) {
+      // Goldens from Safari produce too many diffs, disabled for now.
+      // See https://github.com/flutter/flutter/issues/143591
+      return null;
+    }
+    final Renderer renderer = suite.testBundle.compileConfigs.first.renderer;
+    final CanvasKitVariant? variant = suite.runConfig.variant;
+    final io.Directory workDirectory = getSkiaGoldDirectoryForSuite(suite);
+    if (workDirectory.existsSync()) {
+      workDirectory.deleteSync(recursive: true);
+    }
+    final bool isWasm = suite.testBundle.compileConfigs.first.compiler == Compiler.dart2wasm;
     final SkiaGoldClient skiaClient = SkiaGoldClient(
-      environment.webUiSkiaGoldDirectory,
-      dimensions: <String, String> {'Browser': browserName},
+      workDirectory,
+      dimensions: <String, String> {
+        'Browser': suite.runConfig.browser.name,
+        if (isWasm) 'Wasm': 'true',
+        'Renderer': renderer.name,
+        if (variant != null) 'CanvasKitVariant': variant.name,
+      },
     );
 
     if (await _checkSkiaClient(skiaClient)) {
@@ -150,7 +217,7 @@ class RunTestsStep implements PipelineStep {
   Future<bool> _checkSkiaClient(SkiaGoldClient skiaClient) async {
     // Now let's check whether Skia Gold is reachable or not.
     if (isLuci) {
-      if (isSkiaGoldClientAvailable) {
+      if (SkiaGoldClient.isAvailable()) {
         try {
           await skiaClient.auth();
           return true;
@@ -173,115 +240,3 @@ class RunTestsStep implements PipelineStep {
     return false;
   }
 }
-
-Future<void> _prepareTestResultsDirectory() async {
-  if (environment.webUiTestResultsDirectory.existsSync()) {
-    environment.webUiTestResultsDirectory.deleteSync(recursive: true);
-  }
-  environment.webUiTestResultsDirectory.createSync(recursive: true);
-}
-
-/// Runs a batch of tests.
-///
-/// Unless [expectFailure] is set to false, sets [io.exitCode] to a non-zero
-/// value if any tests fail.
-Future<void> _runTestBatch({
-  required List<FilePath> testFiles,
-  required Renderer renderer,
-  required bool isDebug,
-  required bool isWasm,
-  required BrowserEnvironment browserEnvironment,
-  required bool doUpdateScreenshotGoldens,
-  required bool expectFailure,
-  required SkiaGoldClient? skiaClient,
-  required String? overridePathToCanvasKit,
-}) async {
-  final String configurationFilePath = pathlib.join(
-    environment.webUiRootDir.path,
-    browserEnvironment.packageTestConfigurationYamlFile,
-  );
-  final String precompiledBuildDir = pathlib.join(
-    environment.webUiBuildDir.path,
-    getBuildDirForRenderer(renderer),
-  );
-  final List<String> testArgs = <String>[
-    ...<String>['-r', 'compact'],
-    // Disable concurrency. Running with concurrency proved to be flaky.
-    '--concurrency=1',
-    if (isDebug) '--pause-after-load',
-    // Don't pollute logs with output from tests that are expected to fail.
-    if (expectFailure)
-      '--reporter=name-only',
-    '--platform=${browserEnvironment.packageTestRuntime.identifier}',
-    '--precompiled=$precompiledBuildDir',
-    '--configuration=$configurationFilePath',
-    '--',
-    ...testFiles.map((FilePath f) => f.relativeToWebUi),
-  ];
-
-  if (expectFailure) {
-    hack.registerReporter(
-      'name-only',
-      hack.ReporterDetails(
-      'Prints the name of the test, but suppresses all other test output.',
-      (_, hack.Engine engine, __) => NameOnlyReporter(engine)),
-    );
-  }
-
-  hack.registerPlatformPlugin(<hack.Runtime>[
-    browserEnvironment.packageTestRuntime,
-  ], () {
-    return BrowserPlatform.start(
-      browserEnvironment: browserEnvironment,
-      renderer: renderer,
-      // It doesn't make sense to update a screenshot for a test that is
-      // expected to fail.
-      doUpdateScreenshotGoldens: !expectFailure && doUpdateScreenshotGoldens,
-      skiaClient: skiaClient,
-      overridePathToCanvasKit: overridePathToCanvasKit,
-      isWasm: isWasm,
-    );
-  });
-
-  // We want to run tests with `web_ui` as a working directory.
-  final dynamic originalCwd = io.Directory.current;
-  io.Directory.current = environment.webUiRootDir.path;
-  try {
-    await test.main(testArgs);
-  } finally {
-    io.Directory.current = originalCwd;
-  }
-
-  if (expectFailure) {
-    if (io.exitCode != 0) {
-      // It failed, as expected.
-      print('Test successfully failed, as expected.');
-      io.exitCode = 0;
-    } else {
-      io.stderr.writeln(
-        'Tests ${testFiles.join(', ')} did not fail. Expected failure.',
-      );
-      io.exitCode = 1;
-    }
-  }
-}
-
-/// Prints the name of the test, but suppresses all other test output.
-///
-/// This is useful to prevent pollution of logs by tests that are expected to
-/// fail.
-class NameOnlyReporter implements hack.Reporter {
-  NameOnlyReporter(hack.Engine testEngine) {
-    testEngine.onTestStarted.listen(_printTestName);
-  }
-
-  void _printTestName(hack.LiveTest test) {
-    print('Running ${test.groups.map((hack.Group group) => group.name).join(' ')} ${test.individualName}');
-  }
-
-  @override
-  void pause() {}
-
-  @override
-  void resume() {}
-}
diff --git a/lib/web_ui/dev/suite_filter.dart b/lib/web_ui/dev/suite_filter.dart
new file mode 100644
index 0000000000000000000000000000000000000000..91f26610bbb8730513ebeedb63764804a865a520
--- /dev/null
+++ b/lib/web_ui/dev/suite_filter.dart
@@ -0,0 +1,133 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io' as io;
+
+import 'felt_config.dart';
+
+class SuiteFilterResult {
+  SuiteFilterResult.accepted();
+  SuiteFilterResult.rejected(String reason) : rejectReason = reason;
+
+  String? rejectReason;
+
+  bool get isAccepted => rejectReason == null;
+}
+
+abstract class SuiteFilter {
+  SuiteFilterResult filterSuite(TestSuite suite);
+}
+
+abstract class AllowListSuiteFilter<T> implements SuiteFilter {
+  AllowListSuiteFilter({ required this.allowList });
+
+  final Set<T> allowList;
+
+  T getAttributeForSuite(TestSuite suite);
+
+  String rejectReason(TestSuite suite) {
+    return '${getAttributeForSuite(suite)} does not match filter.';
+  }
+
+  @override
+  SuiteFilterResult filterSuite(TestSuite suite) {
+    if (allowList.contains(getAttributeForSuite(suite))) {
+      return SuiteFilterResult.accepted();
+    } else {
+      return SuiteFilterResult.rejected(rejectReason(suite));
+    }
+  }
+}
+
+class BrowserSuiteFilter extends AllowListSuiteFilter<BrowserName> {
+  BrowserSuiteFilter({required super.allowList});
+
+  @override
+  BrowserName getAttributeForSuite(TestSuite suite) => suite.runConfig.browser;
+}
+
+class SuiteNameFilter extends AllowListSuiteFilter<String> {
+  SuiteNameFilter({required super.allowList});
+
+  @override
+  String getAttributeForSuite(TestSuite suite) => suite.name;
+}
+
+class BundleNameFilter extends AllowListSuiteFilter<String> {
+  BundleNameFilter({required super.allowList});
+
+  @override
+  String getAttributeForSuite(TestSuite suite) => suite.testBundle.name;
+}
+
+class FileFilter extends BundleNameFilter {
+  FileFilter({required super.allowList});
+
+  @override
+  String rejectReason(TestSuite suite) {
+    return "Doesn't contain any of the indicated files.";
+  }
+}
+
+class CompilerFilter extends SuiteFilter {
+  CompilerFilter({required this.allowList});
+
+  final Set<Compiler> allowList;
+
+  @override
+  SuiteFilterResult filterSuite(TestSuite suite) => suite.testBundle.compileConfigs.any(
+    (CompileConfiguration config) => allowList.contains(config.compiler)
+  ) ? SuiteFilterResult.accepted()
+    : SuiteFilterResult.rejected('Selected compilers not used in suite.');
+}
+
+class RendererFilter extends SuiteFilter {
+  RendererFilter({required this.allowList});
+
+  final Set<Renderer> allowList;
+
+  @override
+  SuiteFilterResult filterSuite(TestSuite suite) => suite.testBundle.compileConfigs.any(
+    (CompileConfiguration config) => allowList.contains(config.renderer)
+  ) ? SuiteFilterResult.accepted()
+    : SuiteFilterResult.rejected('Selected renderers not used in suite.');
+}
+
+class CanvasKitVariantFilter extends AllowListSuiteFilter<CanvasKitVariant> {
+  CanvasKitVariantFilter({required super.allowList});
+
+  @override
+  // TODO(jackson): Is this the right default?
+  CanvasKitVariant getAttributeForSuite(TestSuite suite) => suite.runConfig.variant ?? CanvasKitVariant.full;
+}
+
+Set<BrowserName> get _supportedPlatformBrowsers {
+  if (io.Platform.isLinux) {
+    return <BrowserName>{
+      BrowserName.chrome,
+      BrowserName.firefox
+    };
+  } else if (io.Platform.isMacOS) {
+    return <BrowserName>{
+      BrowserName.chrome,
+      BrowserName.firefox,
+      BrowserName.safari,
+    };
+  } else if (io.Platform.isWindows) {
+    return <BrowserName>{
+      BrowserName.chrome,
+      BrowserName.edge,
+    };
+  } else {
+    throw AssertionError('Unsupported OS: ${io.Platform.operatingSystem}');
+  }
+}
+
+class PlatformBrowserFilter extends BrowserSuiteFilter {
+  PlatformBrowserFilter() : super(allowList: _supportedPlatformBrowsers);
+
+  @override
+  String rejectReason(TestSuite suite) =>
+    'Current platform (${io.Platform.operatingSystem}) does not support browser ${suite.runConfig.browser}';
+}
diff --git a/lib/web_ui/dev/test_dart2wasm.js b/lib/web_ui/dev/test_dart2wasm.js
deleted file mode 100644
index 0ce4cfee510dda9378c1228b26c768bc45ba5f81..0000000000000000000000000000000000000000
--- a/lib/web_ui/dev/test_dart2wasm.js
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// This script runs in HTML files and loads and instantiates dart unit tests
-// that are compiled to WebAssembly. It is based off of the `test/dart.js`
-// script from the `test` dart package.
-
-window.onload = async function () {
-  // Sends an error message to the server indicating that the script failed to
-  // load.
-  //
-  // This mimics a MultiChannel-formatted message.
-  var sendLoadException = function (message) {
-    window.parent.postMessage({
-      "href": window.location.href,
-      "data": [0, { "type": "loadException", "message": message }],
-      "exception": true,
-    }, window.location.origin);
-  }
-
-  // Listen for dartLoadException events and forward to the server.
-  window.addEventListener('dartLoadException', function (e) {
-    sendLoadException(e.detail);
-  });
-
-  // The basename of the current page.
-  var name = window.location.href.replace(/.*\//, '').replace(/#.*/, '');
-
-  // Find <link rel="x-dart-test">.
-  var links = document.getElementsByTagName("link");
-  var testLinks = [];
-  var length = links.length;
-  for (var i = 0; i < length; ++i) {
-    if (links[i].rel == "x-dart-test") testLinks.push(links[i]);
-  }
-
-  if (testLinks.length != 1) {
-    sendLoadException(
-      'Expected exactly 1 <link rel="x-dart-test"> in ' + name + ', found ' +
-      testLinks.length + '.');
-    return;
-  }
-
-  var link = testLinks[0];
-
-  if (link.href == '') {
-    sendLoadException(
-      'Expected <link rel="x-dart-test"> in ' + name + ' to have an "href" ' +
-      'attribute.');
-    return;
-  }
-
-  let dart2wasm_runtime;
-  let moduleInstance;
-  try {
-    dart2wasm_runtime = await import('./dart2wasm_runtime.mjs');
-    const dartModulePromise = WebAssembly.compileStreaming(fetch(link.href + ".browser_test.dart.wasm"));
-    moduleInstance = await dart2wasm_runtime.instantiate(dartModulePromise, {});
-  } catch (exception) {
-    const message = `Failed to fetch and instantiate wasm module: ${exception}`;
-    sendLoadException(message);
-  }
-
-  if (moduleInstance) {
-    try {
-      await dart2wasm_runtime.invoke(moduleInstance);
-    } catch (exception) {
-      const message = `Exception while invoking test: ${exception}`;
-      sendLoadException(message);
-    }
-  }
-};
diff --git a/lib/web_ui/dev/test_platform.dart b/lib/web_ui/dev/test_platform.dart
index dbb29c81e15f30625f44eaed70f6e08e1b5f61fa..edcc4adb86dfde6b7154f1d91746fb6139fd46c8 100644
--- a/lib/web_ui/dev/test_platform.dart
+++ b/lib/web_ui/dev/test_platform.dart
@@ -22,32 +22,36 @@ import 'package:shelf_web_socket/shelf_web_socket.dart';
 import 'package:skia_gold_client/skia_gold_client.dart';
 import 'package:stream_channel/stream_channel.dart';
 
-import 'package:test_api/src/backend/runtime.dart';
-import 'package:test_api/src/backend/suite_platform.dart';
-import 'package:test_core/src/runner/configuration.dart';
-import 'package:test_core/src/runner/environment.dart';
-import 'package:test_core/src/runner/platform.dart';
-import 'package:test_core/src/runner/plugin/platform_helpers.dart';
-import 'package:test_core/src/runner/runner_suite.dart';
-import 'package:test_core/src/runner/suite.dart';
-import 'package:test_core/src/util/io.dart';
-import 'package:test_core/src/util/stack_trace_mapper.dart';
+// ignore: deprecated_member_use
+import 'package:test_core/backend.dart' hide Compiler;
+// TODO(ditman): Fix ignores when https://github.com/flutter/flutter/issues/143599 is resolved.
+import 'package:test_core/src/runner/environment.dart'; // ignore: implementation_imports
+import 'package:test_core/src/runner/platform.dart'; // ignore: implementation_imports
+import 'package:test_core/src/runner/plugin/platform_helpers.dart'; // ignore: implementation_imports
+import 'package:test_core/src/runner/runner_suite.dart'; // ignore: implementation_imports
+import 'package:test_core/src/util/io.dart'; // ignore: implementation_imports
+import 'package:test_core/src/util/stack_trace_mapper.dart'; // ignore: implementation_imports
 
 import 'package:web_socket_channel/web_socket_channel.dart';
 import 'package:web_test_utils/image_compare.dart';
 
 import 'browser.dart';
 import 'environment.dart' as env;
+import 'felt_config.dart';
 import 'utils.dart';
 
+const Map<String, String> coopCoepHeaders = <String, String>{
+  'Cross-Origin-Opener-Policy': 'same-origin',
+  'Cross-Origin-Embedder-Policy': 'require-corp',
+};
+
 /// Custom test platform that serves web engine unit tests.
 class BrowserPlatform extends PlatformPlugin {
-  BrowserPlatform._({
+  BrowserPlatform._(this.suite, {
     required this.browserEnvironment,
     required this.server,
-    required this.renderer,
     required this.isDebug,
-    required this.isWasm,
+    required this.isVerbose,
     required this.doUpdateScreenshotGoldens,
     required this.packageConfig,
     required this.skiaClient,
@@ -69,27 +73,36 @@ class BrowserPlatform extends PlatformPlugin {
         .add(_packageUrlHandler)
         .add(_canvasKitOverrideHandler)
 
-        // Serves files from the web_ui/build/ directory at the root (/) URL path.
-        .add(buildDirectoryHandler)
+        // Serves files from the bundle's output build directory
+        .add(createSimpleDirectoryHandler(getBundleBuildDirectory(suite.testBundle)))
+
+        // Serves files from the out/web_tests/artifacts directory at the root (/) URL path.
+        .add(createSimpleDirectoryHandler(env.environment.webTestsArtifactsDir))
+
+        // Serves files from the test set directory
+        .add(createSimpleDirectoryHandler(getTestSetDirectory(suite.testBundle.testSet)))
         .add(_testImageListingHandler)
 
         // Serves the initial HTML for the test.
         .add(_testBootstrapHandler)
 
-        // Serves files from the root of web_ui.
-        //
-        // This is needed because sourcemaps refer to local files, i.e. those
-        // that don't come from package dependencies, relative to web_ui/.
-        //
-        // Examples of URLs that this handles:
-        //  * /test/alarm_clock_test.dart
-        //  * /lib/src/engine/alarm_clock.dart
+        // Serves source files from the engine src root for devtools debugging.
+        .add(_createSourceHandler())
+
+        // Serves files from the root of web_ui. Some tests download assets that are embedded
+        // directly in the test folder, such as test/engine/image/sample_image1.png etc
         .add(createStaticHandler(env.environment.webUiRootDir.path))
 
         // Serves absolute package URLs (i.e. not /packages/* but /Users/user/*/hosted/pub.dartlang.org/*).
         // This handler goes last, after all more specific handlers failed to handle the request.
         .add(_createAbsolutePackageUrlHandler())
         .add(_screenshotHandler)
+
+        // Generates and serves a test payload of given length, split into chunks
+        // of given size. Reponds to requests to /long_test_payload.
+        .add(_testPayloadGenerator)
+
+        // If none of the handlers above handled the request, return 404.
         .add(_fileNotFoundCatcher);
 
     server.mount(cascade.handler);
@@ -101,22 +114,21 @@ class BrowserPlatform extends PlatformPlugin {
   ///
   /// If [doUpdateScreenshotGoldens] is true updates screenshot golden files
   /// instead of failing the test on screenshot mismatches.
-  static Future<BrowserPlatform> start({
+  static Future<BrowserPlatform> start(TestSuite suite, {
     required BrowserEnvironment browserEnvironment,
-    required Renderer renderer,
     required bool doUpdateScreenshotGoldens,
     required SkiaGoldClient? skiaClient,
     required String? overridePathToCanvasKit,
-    required bool isWasm,
+    required bool isVerbose,
   }) async {
     final shelf_io.IOServer server =
         shelf_io.IOServer(await HttpMultiServer.loopback(0));
     return BrowserPlatform._(
+      suite,
       browserEnvironment: browserEnvironment,
-      renderer: renderer,
       server: server,
       isDebug: Configuration.current.pauseAfterLoad,
-      isWasm: isWasm,
+      isVerbose: isVerbose,
       doUpdateScreenshotGoldens: doUpdateScreenshotGoldens,
       packageConfig: await loadPackageConfigUri((await Isolate.packageConfig)!),
       skiaClient: skiaClient,
@@ -124,12 +136,14 @@ class BrowserPlatform extends PlatformPlugin {
     );
   }
 
+  final TestSuite suite;
+
   /// If true, runs the browser with a visible windows (i.e. not headless) and
   /// pauses before running the tests to give the developer a chance to set
   /// breakpoints in the code.
   final bool isDebug;
 
-  final bool isWasm;
+  final bool isVerbose;
 
   /// The underlying server.
   final shelf.Server server;
@@ -137,12 +151,13 @@ class BrowserPlatform extends PlatformPlugin {
   /// Provides the environment for the browser running tests.
   final BrowserEnvironment browserEnvironment;
 
-  /// The renderer that tests are running under.
-  final Renderer renderer;
-
   /// The URL for this server.
   Uri get url => server.url.resolve('/');
 
+  bool get needsCrossOriginIsolated => suite.testBundle.compileConfigs.any(
+    (CompileConfiguration config) => config.renderer == Renderer.skwasm
+  );
+
   /// A [OneOffHandler] for servicing WebSocket connections for
   /// [BrowserManager]s.
   ///
@@ -203,7 +218,7 @@ class BrowserPlatform extends PlatformPlugin {
     );
   }
 
-  /// Lists available test images under `web_ui/build/test_images`.
+  /// Lists available test images under `out/web_tests/test_images`.
   Future<shelf.Response> _testImageListingHandler(shelf.Request request) async {
     const Map<String, String> supportedImageTypes = <String, String>{
       '.png': 'image/png',
@@ -219,7 +234,7 @@ class BrowserPlatform extends PlatformPlugin {
     }
 
     final Directory testImageDirectory = Directory(p.join(
-      env.environment.webUiBuildDir.path,
+      env.environment.webTestsArtifactsDir.path,
       'test_images',
     ));
 
@@ -241,10 +256,32 @@ class BrowserPlatform extends PlatformPlugin {
   }
 
   Future<shelf.Response> _fileNotFoundCatcher(shelf.Request request) async {
-    print('HTTP 404: ${request.url}');
+    if (isVerbose) {
+      print('HTTP 404: ${request.url}');
+    }
     return shelf.Response.notFound('File not found');
   }
 
+  shelf.Handler _createSourceHandler() => (shelf.Request request) async {
+    final String path = p.fromUri(request.url);
+    final String extension = p.extension(path);
+    final bool isSource =
+      extension == '.dart' ||
+      extension == '.c' ||
+      extension == '.cc' ||
+      extension == '.cpp' ||
+      extension == '.h';
+    if (isSource && p.isRelative(path)) {
+      final String fullPath = p.join(env.environment.engineSrcDir.path, path);
+      final File file = File(fullPath);
+      if (file.existsSync()) {
+        return shelf.Response.ok(file.openRead());
+      }
+    }
+
+    return shelf.Response.notFound('Not found.');
+  };
+
   /// Handles URLs pointing to Dart sources using absolute URI paths.
   ///
   /// Dart source paths that dart2js puts in source maps for pub packages are
@@ -320,6 +357,46 @@ class BrowserPlatform extends PlatformPlugin {
     };
   }
 
+  Future<shelf.Response> _testPayloadGenerator(shelf.Request request) async {
+    if (!request.requestedUri.path.endsWith('/long_test_payload')) {
+      return shelf.Response.notFound(
+          'This request is not handled by the test payload generator');
+    }
+
+    final int payloadLength = int.parse(request.requestedUri.queryParameters['length']!);
+    final int chunkLength = int.parse(request.requestedUri.queryParameters['chunk']!);
+
+    final StreamController<List<int>> controller = StreamController<List<int>>();
+
+    Future<void> fillPayload() async {
+      int remainingByteCount = payloadLength;
+      int byteCounter = 0;
+      while (remainingByteCount > 0) {
+        final int currentChunkLength = min(chunkLength, remainingByteCount);
+        final List<int> chunk = List<int>.generate(
+          currentChunkLength,
+          (int i) => (byteCounter + i) & 0xFF,
+        );
+        byteCounter = (byteCounter + currentChunkLength) & 0xFF;
+        remainingByteCount -= currentChunkLength;
+        controller.add(chunk);
+        await Future<void>.delayed(const Duration(milliseconds: 100));
+      }
+      await controller.close();
+    }
+
+    // Kick off payload filling function but don't block on it. The stream should
+    // be returned immediately, and the client should receive data in chunks.
+    unawaited(fillPayload());
+    return shelf.Response.ok(
+      controller.stream,
+      headers: <String, String>{
+        'Content-Type': 'application/octet-stream',
+        'Content-Length': '$payloadLength',
+      },
+    );
+  }
+
   Future<shelf.Response> _screenshotHandler(shelf.Request request) async {
     if (!request.requestedUri.path.endsWith('/screenshot')) {
       return shelf.Response.notFound(
@@ -332,10 +409,12 @@ class BrowserPlatform extends PlatformPlugin {
     final String filename = requestData['filename'] as String;
 
     if (!(await browserManager).supportsScreenshots) {
-      print(
-        'Skipping screenshot check for $filename. Current browser/OS '
-        'combination does not support screenshots.',
-      );
+      if (isVerbose) {
+        print(
+          'Skipping screenshot check for $filename. Current browser/OS '
+          'combination does not support screenshots.',
+        );
+      }
       return shelf.Response.ok(json.encode('OK'));
     }
 
@@ -366,8 +445,10 @@ class BrowserPlatform extends PlatformPlugin {
       screenshot,
       doUpdateScreenshotGoldens,
       filename,
+      getSkiaGoldDirectoryForSuite(suite),
       skiaClient,
       isCanvaskitTest: isCanvaskitTest,
+      verbose: isVerbose,
     );
   }
 
@@ -387,51 +468,79 @@ class BrowserPlatform extends PlatformPlugin {
     '.bmp': 'image/bmp',
     '.svg': 'image/svg+xml',
     '.json': 'application/json',
+    '.map': 'application/json',
     '.ttf': 'font/ttf',
+    '.otf': 'font/otf',
     '.woff': 'font/woff',
     '.woff2': 'font/woff2',
   };
 
-  /// A simple file handler that serves files whose URLs and paths are
+  /// Creates a simple file handler that serves files whose URLs and paths are
   /// statically known.
   ///
   /// This is used for trivial use-cases, such as `favicon.ico`, host pages, etc.
-  shelf.Response buildDirectoryHandler(shelf.Request request) {
-    File fileInBuild = File(p.join(
-      env.environment.webUiBuildDir.path,
-      request.url.path,
-    ));
-
-    // If we can't find the file in the top-level `build` directory, then it
-    // may be in the renderer-specific `build` subdirectory.
-    if (!fileInBuild.existsSync()) {
-      fileInBuild = File(p.join(
-        env.environment.webUiBuildDir.path,
-        getBuildDirForRenderer(renderer),
+  shelf.Handler createSimpleDirectoryHandler(Directory directory) {
+    return (shelf.Request request) {
+      final File fileInDirectory = File(p.join(
+        directory.path,
         request.url.path,
       ));
-    }
 
-    if (!fileInBuild.existsSync()) {
-      return shelf.Response.notFound('File not found: ${request.url.path}');
-    }
+      if (request.url.path.contains('//') || !fileInDirectory.existsSync()) {
+        return shelf.Response.notFound('File not found: ${request.url.path}');
+      }
 
-    final String extension = p.extension(fileInBuild.path);
-    final String? contentType = contentTypes[extension];
+      final String extension = p.extension(fileInDirectory.path);
+      final String? contentType = contentTypes[extension];
 
-    if (contentType == null) {
-      final String error =
-          'Failed to determine Content-Type for "${request.url.path}".';
-      stderr.writeln(error);
-      return shelf.Response.internalServerError(body: error);
+      if (contentType == null) {
+        final String error =
+            'Failed to determine Content-Type for "${request.url.path}".';
+        stderr.writeln(error);
+        return shelf.Response.internalServerError(body: error);
+      }
+
+      final bool isScript =
+        extension == '.js' ||
+        extension == '.mjs' ||
+        extension == '.html';
+      return shelf.Response.ok(
+        fileInDirectory.readAsBytesSync(),
+        headers: <String, Object>{
+          HttpHeaders.contentTypeHeader: contentType,
+          if (isScript && needsCrossOriginIsolated)
+            ...coopCoepHeaders,
+        },
+      );
+    };
+  }
+
+  String getCanvasKitVariant() {
+    switch (suite.runConfig.variant) {
+      case CanvasKitVariant.full:
+        return 'full';
+      case CanvasKitVariant.chromium:
+        return 'chromium';
+      case null:
+        return 'auto';
     }
+  }
 
-    return shelf.Response.ok(
-      fileInBuild.readAsBytesSync(),
-      headers: <String, Object>{
-        HttpHeaders.contentTypeHeader: contentType,
-      },
-    );
+  String _makeBuildConfigString(String scriptBase, CompileConfiguration config) {
+    return config.compiler == Compiler.dart2wasm ? '''
+      {
+        compileTarget: "${config.compiler.name}",
+        renderer: "${config.renderer.name}",
+        mainWasmPath: "$scriptBase.browser_test.dart.wasm",
+        jsSupportRuntimePath: "$scriptBase.browser_test.dart.mjs",
+      }
+''' : '''
+      {
+        compileTarget: "${config.compiler.name}",
+        renderer: "${config.renderer.name}",
+        mainJsPath: "$scriptBase.browser_test.dart.js",
+      }
+''';
   }
 
   /// Serves the HTML file that bootstraps the test.
@@ -440,29 +549,51 @@ class BrowserPlatform extends PlatformPlugin {
 
     if (path.endsWith('.html')) {
       final String test = '${p.withoutExtension(path)}.dart';
-
-      // Link to the Dart wrapper.
       final String scriptBase = htmlEscape.convert(p.basename(test));
-      final String link = '<link rel="x-dart-test" href="$scriptBase">';
 
-      final String testRunner = isWasm ? '/test_dart2wasm.js' : 'packages/test/dart.js';
+      final String buildConfigsString = suite.testBundle.compileConfigs.map(
+        (CompileConfiguration config) => _makeBuildConfigString(scriptBase, config)
+      ).join(',\n');
+      final String bootstrapScript = '''
+<script>
+  // Define this before loading flutter.js to test PR flutter/engine#51294
+  if (!window._flutter) {
+    window._flutter = {};
+  }
+</script>
+<script>
+  _flutter.buildConfig = {
+    builds: [
+      $buildConfigsString
+    ]
+  };
+</script>
+<script src="/flutter_js/flutter.js"></script>
+<script>
+  _flutter.loader.load({
+    config: {
+      canvasKitBaseUrl: "/canvaskit/",
+      // Some of our tests rely on color emoji
+      useColorEmoji: true,
+      canvasKitVariant: "${getCanvasKitVariant()}",
+    },
+  });
+</script>
+''';
 
       return shelf.Response.ok('''
         <!DOCTYPE html>
         <html>
         <head>
-          <title>${htmlEscape.convert(test)} Test</title>
           <meta name="assetBase" content="/">
-          <script>
-            window.flutterConfiguration = {
-              canvasKitBaseUrl: "/canvaskit/"
-            };
-          </script>
-          $link
-          <script src="$testRunner"></script>
+          $bootstrapScript
         </head>
         </html>
-      ''', headers: <String, String>{'Content-Type': 'text/html'});
+      ''', headers: <String, String>{
+        'Content-Type': 'text/html',
+        if (needsCrossOriginIsolated)
+          ...coopCoepHeaders
+      });
     }
 
     return shelf.Response.notFound('Not found.');
@@ -493,8 +624,7 @@ class BrowserPlatform extends PlatformPlugin {
     }
     _checkNotClosed();
 
-    final Uri suiteUrl = url.resolveUri(p.toUri('${p.withoutExtension(
-            p.relative(path, from: env.environment.webUiBuildDir.path))}.html'));
+    final Uri suiteUrl = url.resolveUri(p.toUri('${p.withoutExtension(path)}.html'));
     _checkNotClosed();
 
     final BrowserManager? browserManager = await _startBrowserManager();
@@ -504,10 +634,10 @@ class BrowserPlatform extends PlatformPlugin {
     }
     _checkNotClosed();
 
-    final RunnerSuite suite =
+    final RunnerSuite runnerSuite =
         await browserManager.load(path, suiteUrl, suiteConfig, message);
     _checkNotClosed();
-    return suite;
+    return runnerSuite;
   }
 
   Future<BrowserManager?>? _browserManager;
@@ -532,14 +662,16 @@ class BrowserPlatform extends PlatformPlugin {
           'debug': isDebug.toString()
         });
 
+    final bool hasSourceMaps = suite.testBundle.compileConfigs.any(
+      (CompileConfiguration config) => config.compiler == Compiler.dart2js
+    );
     final Future<BrowserManager?> future = BrowserManager.start(
       browserEnvironment: browserEnvironment,
       url: hostUrl,
       future: completer.future,
       packageConfig: packageConfig,
-      isWasm: isWasm,
       debug: isDebug,
-      renderer: renderer,
+      sourceMapDirectory: hasSourceMaps ? getBundleBuildDirectory(suite.testBundle) : null,
     );
 
     // Store null values for browsers that error out so we know not to load them
@@ -634,8 +766,13 @@ class OneOffHandler {
 class BrowserManager {
   /// Creates a new BrowserManager that communicates with the browser over
   /// [webSocket].
-  BrowserManager._(this.packageConfig, this._browser, this._browserEnvironment,
-      this._renderer, this._isWasm, WebSocketChannel webSocket) {
+  BrowserManager._(
+    this.packageConfig,
+    this._browser,
+    this._browserEnvironment,
+    this._sourceMapDirectory,
+    WebSocketChannel webSocket,
+  ) {
     // The duration should be short enough that the debugging console is open as
     // soon as the user is done setting breakpoints, but long enough that a test
     // doing a lot of synchronous work doesn't trigger a false positive.
@@ -646,8 +783,7 @@ class BrowserManager {
       for (final RunnerSuiteController controller in _controllers) {
         controller.setDebugging(true);
       }
-    })
-      ..cancel();
+    })..cancel();
 
     // Whenever we get a message, no matter which child channel it's for, we the
     // know browser is still running code which means the user isn't debugging.
@@ -681,8 +817,8 @@ class BrowserManager {
   /// The browser environment for this test.
   final BrowserEnvironment _browserEnvironment;
 
-  /// The renderer for this test.
-  final Renderer _renderer;
+  /// The directory containing sourcemaps for test files
+  final Directory? _sourceMapDirectory;
 
   /// The channel used to communicate with the browser.
   ///
@@ -707,9 +843,6 @@ class BrowserManager {
   /// Whether the channel to the browser has closed.
   bool _closed = false;
 
-  /// Whether we are running tests that have been compiled to WebAssembly.
-  final bool _isWasm;
-
   /// The completer for [_BrowserEnvironment.displayPause].
   ///
   /// This will be `null` as long as the browser isn't displaying a pause
@@ -751,21 +884,23 @@ class BrowserManager {
     required Uri url,
     required Future<WebSocketChannel> future,
     required PackageConfig packageConfig,
-    required Renderer renderer,
-    required bool isWasm,
+    Directory? sourceMapDirectory,
     bool debug = false,
   }) async {
-    final Browser browser =
-        await _newBrowser(url, browserEnvironment, debug: debug);
+    final Browser browser = await _newBrowser(
+      url,
+      browserEnvironment,
+      debug: debug,
+    );
     return _startBrowserManager(
-        browserEnvironment: browserEnvironment,
-        url: url,
-        future: future,
-        packageConfig: packageConfig,
-        browser: browser,
-        renderer: renderer,
-        isWasm: isWasm,
-        debug: debug);
+      browserEnvironment: browserEnvironment,
+      url: url,
+      future: future,
+      packageConfig: packageConfig,
+      browser: browser,
+      sourceMapDirectory: sourceMapDirectory,
+      debug: debug,
+    );
   }
 
   static Future<BrowserManager?> _startBrowserManager({
@@ -774,8 +909,7 @@ class BrowserManager {
     required Future<WebSocketChannel> future,
     required PackageConfig packageConfig,
     required Browser browser,
-    required Renderer renderer,
-    required bool isWasm,
+    Directory? sourceMapDirectory,
     bool debug = false,
   }) {
     final Completer<BrowserManager> completer = Completer<BrowserManager>();
@@ -797,7 +931,12 @@ class BrowserManager {
         return;
       }
       completer.complete(BrowserManager._(
-          packageConfig, browser, browserEnvironment, renderer, isWasm, webSocket));
+          packageConfig,
+          browser,
+          browserEnvironment,
+          sourceMapDirectory,
+          webSocket,
+      ));
     }).catchError((Object error, StackTrace stackTrace) {
       browser.close();
       if (completer.isCompleted) {
@@ -813,15 +952,24 @@ class BrowserManager {
   ///
   /// If [debug] is true, starts the browser in debug mode.
   static Future<Browser> _newBrowser(
-      Uri url, BrowserEnvironment browserEnvironment,
-      {bool debug = false}) {
-    return browserEnvironment.launchBrowserInstance(url, debug: debug);
+    Uri url,
+    BrowserEnvironment browserEnvironment, {
+    bool debug = false,
+  }) {
+    return browserEnvironment.launchBrowserInstance(
+      url,
+      debug: debug,
+    );
   }
 
   /// Loads [_BrowserEnvironment].
   Future<_BrowserEnvironment> _loadBrowserEnvironment() async {
-    return _BrowserEnvironment(this, await _browser.observatoryUrl,
-        await _browser.remoteDebuggerUrl, _onRestartController.stream);
+    return _BrowserEnvironment(
+      this,
+      await _browser.vmServiceUrl,
+      await _browser.remoteDebuggerUrl,
+      _onRestartController.stream
+    );
   }
 
   /// Tells the browser the load a test suite from the URL [url].
@@ -881,7 +1029,7 @@ class BrowserManager {
             suiteChannel,
             message);
 
-        if (_isWasm) {
+        if (_sourceMapDirectory == null) {
           // We don't have mapping for wasm yet. But we should send a message
           // to let the host page move forward.
           controller!.channel('test.browser.mapper').sink.add(null);
@@ -890,11 +1038,15 @@ class BrowserManager {
               '${p.basename(path)}.browser_test.dart.js.map';
           final String pathToTest = p.dirname(path);
 
-          final String mapPath = p.join(env.environment.webUiRootDir.path,
-              'build', getBuildDirForRenderer(_renderer), pathToTest, sourceMapFileName);
+          final String mapPath = p.join(
+            _sourceMapDirectory.path,
+            pathToTest,
+            sourceMapFileName
+          );
 
           final Map<String, Uri> packageMap = <String, Uri>{
-            for (Package p in packageConfig.packages) p.name: p.packageUriRoot
+            for (final Package p in packageConfig.packages)
+              p.name: p.packageUriRoot
           };
           final JSStackTraceMapper mapper = JSStackTraceMapper(
             await File(mapPath).readAsString(),
@@ -945,11 +1097,9 @@ class BrowserManager {
 
       case 'restart':
         _onRestartController.add(null);
-        break;
 
       case 'resume':
         _pauseCompleter?.complete();
-        break;
 
       default:
         // Unreachable.
@@ -1004,5 +1154,3 @@ class _BrowserEnvironment implements Environment {
   @override
   CancelableOperation<void> displayPause() => _manager._displayPause();
 }
-
-bool get isCirrus => Platform.environment['CIRRUS_CI'] == 'true';
diff --git a/lib/web_ui/dev/test_runner.dart b/lib/web_ui/dev/test_runner.dart
index 6d552fd75819ce9cec7f701f4aad9fa4698fcabb..da5559b363a4907db189df9af73fbb95f606daeb 100644
--- a/lib/web_ui/dev/test_runner.dart
+++ b/lib/web_ui/dev/test_runner.dart
@@ -10,9 +10,15 @@ import 'package:path/path.dart' as path;
 
 import 'package:watcher/src/watch_event.dart';
 
+import 'environment.dart';
+import 'exceptions.dart';
+import 'felt_config.dart';
+import 'generate_builder_json.dart';
 import 'pipeline.dart';
-import 'steps/compile_tests_step.dart';
-import 'steps/run_tests_step.dart';
+import 'steps/compile_bundle_step.dart';
+import 'steps/copy_artifacts_step.dart';
+import 'steps/run_suite_step.dart';
+import 'suite_filter.dart';
 import 'utils.dart';
 
 /// Runs tests.
@@ -20,11 +26,16 @@ class TestCommand extends Command<bool> with ArgUtils<bool> {
   TestCommand() {
     argParser
       ..addFlag(
-        'debug',
+        'start-paused',
         help: 'Pauses the browser before running a test, giving you an '
             'opportunity to add breakpoints or inspect loaded code before '
             'running the code.',
       )
+      ..addFlag(
+        'verbose',
+        abbr: 'v',
+        help: 'Enable verbose output.'
+      )
       ..addFlag(
         'watch',
         abbr: 'w',
@@ -32,16 +43,51 @@ class TestCommand extends Command<bool> with ArgUtils<bool> {
             'made.',
       )
       ..addFlag(
-        'use-system-flutter',
-        help: 'integration tests are using flutter repository for various tasks'
-            ', such as flutter drive, flutter pub get. If this flag is set, felt '
-            'will use flutter command without cloning the repository. This flag '
-            'can save internet bandwidth. However use with caution. Note that '
-            'since flutter repo is always synced to youngest commit older than '
-            'the engine commit for the tests running in CI, the tests results '
-            "won't be consistent with CIs when this flag is set. flutter "
-            'command should be set in the PATH for this flag to be useful.'
-            'This flag can also be used to test local Flutter changes.')
+        'list',
+        help:
+            'Lists the bundles that would be compiled and the suites that '
+            'will be run as part of this invocation, without actually '
+            'compiling or running them.'
+      )
+      ..addFlag(
+        'generate-builder-json',
+        help:
+            'Generates JSON for the engine_v2 builders to build and copy all'
+            'artifacts, compile all test bundles, and run all test suites on'
+            'all platforms.'
+      )
+      ..addFlag(
+        'compile',
+        help:
+            'Compile test bundles. If this is specified on its own, we will '
+            'only compile and not run the suites.'
+      )
+      ..addFlag(
+        'run',
+        help:
+            'Run test suites. If this is specified on its own, we will only '
+            'run the suites and not compile the bundles.'
+      )
+      ..addFlag(
+        'copy-artifacts',
+        help:
+            'Copy artifacts needed for test suites. If this is specified on '
+            'its own, we will only copy the artifacts and not compile or run'
+            'the tests bundles or suites.'
+      )
+      ..addFlag(
+        'profile',
+        help:
+            'Use artifacts from the profile build instead of release.'
+      )
+      ..addFlag(
+        'debug',
+        help: 'Use artifacts from the debug build instead of release.'
+      )
+      ..addFlag(
+        'dwarf',
+        help: 'Debug wasm modules using embedded DWARF data.'
+      )
       ..addFlag(
         'require-skia-gold',
         help:
@@ -55,11 +101,29 @@ class TestCommand extends Command<bool> with ArgUtils<bool> {
             '.dart_tool/goldens. Use this option to bulk-update all screenshots, '
             'for example, when a new browser version affects pixels.',
       )
-      ..addOption(
+      ..addMultiOption(
         'browser',
-        defaultsTo: 'chrome',
-        help: 'An option to choose a browser to run the tests. By default '
-              'tests run in Chrome.',
+        help: 'Filter test suites by browser.',
+      )
+      ..addMultiOption(
+        'compiler',
+        help: 'Filter test suites by compiler.',
+      )
+      ..addMultiOption(
+        'renderer',
+        help: 'Filter test suites by renderer.',
+      )
+      ..addMultiOption(
+        'canvaskit-variant',
+        help: 'Filter test suites by CanvasKit variant.',
+      )
+      ..addMultiOption(
+        'suite',
+        help: 'Filter test suites by suite name.',
+      )
+      ..addMultiOption(
+        'bundle',
+        help: 'Filter test suites by bundle name.',
       )
       ..addFlag(
         'fail-early',
@@ -77,11 +141,6 @@ class TestCommand extends Command<bool> with ArgUtils<bool> {
       ..addFlag(
         'wasm',
         help: 'Whether the test we are running are compiled to webassembly.'
-      )
-      ..addFlag(
-        'use-local-canvaskit',
-        help: 'Optional. Whether or not to use the locally built version of '
-              'CanvasKit in the tests.',
       );
   }
 
@@ -93,27 +152,20 @@ class TestCommand extends Command<bool> with ArgUtils<bool> {
 
   bool get isWatchMode => boolArg('watch');
 
-  bool get failEarly => boolArg('fail-early');
+  bool get isList => boolArg('list');
 
-  bool get isWasm => boolArg('wasm');
+  bool get failEarly => boolArg('fail-early');
 
   /// Whether to start the browser in debug mode.
   ///
   /// In this mode the browser pauses before running the test to allow
   /// you set breakpoints or inspect the code.
-  bool get isDebug => boolArg('debug');
+  bool get startPaused => boolArg('start-paused');
 
-  /// Paths to targets to run, e.g. a single test.
-  List<String> get targets => argResults!.rest;
+  bool get isVerbose => boolArg('verbose');
 
   /// The target test files to run.
-  List<FilePath> get targetFiles => targets.map((String t) => FilePath.fromCwd(t)).toList();
-
-  /// Whether all tests should run.
-  bool get runAllTests => targets.isEmpty;
-
-  /// The name of the browser to run tests in.
-  String get browserName => stringArg('browser');
+  List<FilePath> get targetFiles => argResults!.rest.map((String t) => FilePath.fromCwd(t)).toList();
 
   /// When running screenshot tests, require Skia Gold to be available and
   /// reachable.
@@ -126,27 +178,227 @@ class TestCommand extends Command<bool> with ArgUtils<bool> {
   /// Path to a CanvasKit build. Overrides the default CanvasKit.
   String? get overridePathToCanvasKit => argResults!['canvaskit-path'] as String?;
 
-  /// Whether or not to use the locally built version of CanvasKit.
-  bool get useLocalCanvasKit => boolArg('use-local-canvaskit');
+  final FeltConfig config = FeltConfig.fromFile(
+    path.join(environment.webUiTestDir.path, 'felt_config.yaml')
+  );
+
+  BrowserSuiteFilter? makeBrowserFilter() {
+    final List<String>? browserArgs = argResults!['browser'] as List<String>?;
+    if (browserArgs == null || browserArgs.isEmpty) {
+      return null;
+    }
+    final Set<BrowserName> browserNames = Set<BrowserName>.from(browserArgs.map((String arg) => BrowserName.values.byName(arg)));
+    return BrowserSuiteFilter(allowList: browserNames);
+  }
+
+  CompilerFilter? makeCompilerFilter() {
+    final List<String>? compilerArgs = argResults!['compiler'] as List<String>?;
+    if (compilerArgs == null || compilerArgs.isEmpty) {
+      return null;
+    }
+    final Set<Compiler> compilers = Set<Compiler>.from(compilerArgs.map((String arg) => Compiler.values.byName(arg)));
+    return CompilerFilter(allowList: compilers);
+  }
+
+  RendererFilter? makeRendererFilter() {
+    final List<String>? rendererArgs = argResults!['renderer'] as List<String>?;
+    if (rendererArgs == null || rendererArgs.isEmpty) {
+      return null;
+    }
+    final Set<Renderer> renderers = Set<Renderer>.from(rendererArgs.map((String arg) => Renderer.values.byName(arg)));
+    return RendererFilter(allowList: renderers);
+  }
+
+  CanvasKitVariantFilter? makeCanvasKitVariantFilter() {
+    final List<String>? variantArgs = argResults!['canvaskit-variant'] as List<String>?;
+    if (variantArgs == null || variantArgs.isEmpty) {
+      return null;
+    }
+    final Set<CanvasKitVariant> variants = Set<CanvasKitVariant>.from(variantArgs.map((String arg) => CanvasKitVariant.values.byName(arg)));
+    return CanvasKitVariantFilter(allowList: variants);
+  }
+
+  SuiteNameFilter? makeSuiteNameFilter() {
+    final List<String>? suiteNameArgs = argResults!['suite'] as List<String>?;
+    if (suiteNameArgs == null || suiteNameArgs.isEmpty) {
+      return null;
+    }
+
+    final Iterable<String> allSuiteNames = config.testSuites.map((TestSuite suite) => suite.name);
+    for (final String suiteName in suiteNameArgs) {
+      if (!allSuiteNames.contains(suiteName)) {
+        throw ToolExit('No suite found named $suiteName');
+      }
+    }
+    return SuiteNameFilter(allowList: Set<String>.from(suiteNameArgs));
+  }
+
+  BundleNameFilter? makeBundleNameFilter() {
+    final List<String>? bundleNameArgs = argResults!['bundle'] as List<String>?;
+    if (bundleNameArgs == null || bundleNameArgs.isEmpty) {
+      return null;
+    }
+
+    final Iterable<String> allBundleNames = config.testSuites.map(
+      (TestSuite suite) => suite.testBundle.name
+    );
+    for (final String bundleName in bundleNameArgs) {
+      if (!allBundleNames.contains(bundleName)) {
+        throw ToolExit('No bundle found named $bundleName');
+      }
+    }
+    return BundleNameFilter(allowList: Set<String>.from(bundleNameArgs));
+  }
+
+  FileFilter? makeFileFilter() {
+    final List<FilePath> tests = targetFiles;
+    if (tests.isEmpty) {
+      return null;
+    }
+    final Set<String> bundleNames = <String>{};
+    for (final FilePath testPath in tests) {
+      if (!io.File(testPath.absolute).existsSync()) {
+        throw ToolExit('Test path not found: $testPath');
+      }
+      bool bundleFound = false;
+      for (final TestBundle bundle in config.testBundles) {
+        final String testSetPath = getTestSetDirectory(bundle.testSet).path;
+        if (path.isWithin(testSetPath, testPath.absolute)) {
+          bundleFound = true;
+          bundleNames.add(bundle.name);
+        }
+      }
+      if (!bundleFound) {
+        throw ToolExit('Test path not in any known test bundle: $testPath');
+      }
+    }
+    return FileFilter(allowList: bundleNames);
+  }
+
+  List<SuiteFilter> get suiteFilters {
+    final BrowserSuiteFilter? browserFilter = makeBrowserFilter();
+    final CompilerFilter? compilerFilter = makeCompilerFilter();
+    final RendererFilter? rendererFilter = makeRendererFilter();
+    final CanvasKitVariantFilter? canvaskitVariantFilter = makeCanvasKitVariantFilter();
+    final SuiteNameFilter? suiteNameFilter = makeSuiteNameFilter();
+    final BundleNameFilter? bundleNameFilter = makeBundleNameFilter();
+    final FileFilter? fileFilter = makeFileFilter();
+    return <SuiteFilter>[
+      PlatformBrowserFilter(),
+      if (browserFilter != null) browserFilter,
+      if (compilerFilter != null) compilerFilter,
+      if (rendererFilter != null) rendererFilter,
+      if (canvaskitVariantFilter != null) canvaskitVariantFilter,
+      if (suiteNameFilter != null) suiteNameFilter,
+      if (bundleNameFilter != null) bundleNameFilter,
+      if (fileFilter != null) fileFilter,
+    ];
+  }
+
+  List<TestSuite> _filterTestSuites() {
+    if (isVerbose) {
+      print('Filtering suites...');
+    }
+    final List<SuiteFilter> filters = suiteFilters;
+    final List<TestSuite> filteredSuites = config.testSuites.where((TestSuite suite) {
+      for (final SuiteFilter filter in filters) {
+        final SuiteFilterResult result = filter.filterSuite(suite);
+        if (!result.isAccepted) {
+          if (isVerbose) {
+            print('  ${suite.name.ansiCyan} rejected for reason: ${result.rejectReason}');
+          }
+          return false;
+        }
+      }
+      return true;
+    }).toList();
+    return filteredSuites;
+  }
+
+  List<TestBundle> _filterBundlesForSuites(List<TestSuite> suites) {
+    final Set<TestBundle> seenBundles =
+      Set<TestBundle>.from(suites.map((TestSuite suite) => suite.testBundle));
+    return config.testBundles.where((TestBundle bundle) => seenBundles.contains(bundle)).toList();
+  }
+
+  ArtifactDependencies _artifactsForSuites(List<TestSuite> suites) {
+    return suites.fold(ArtifactDependencies.none(),
+      (ArtifactDependencies deps, TestSuite suite) => deps | suite.artifactDependencies);
+  }
 
   @override
   Future<bool> run() async {
-    final List<FilePath> testFiles = runAllTests
-          ? findAllTests()
-          : targetFiles;
+    final List<TestSuite> filteredSuites = _filterTestSuites();
+    final List<TestBundle> bundles = _filterBundlesForSuites(filteredSuites);
+    final ArtifactDependencies artifacts = _artifactsForSuites(filteredSuites);
+    if (boolArg('generate-builder-json')) {
+      final String configString = generateBuilderJson(config);
+      final io.File configFile = io.File(path.join(
+        environment.flutterDirectory.path,
+        'ci',
+        'builders',
+        'linux_web_engine.json',
+      ));
+      configFile.writeAsStringSync(configString);
+      return true;
+    }
+    if (isList || isVerbose) {
+      print('Suites:');
+      for (final TestSuite suite in filteredSuites) {
+        print('  ${suite.name.ansiCyan}');
+      }
+      print('Bundles:');
+      for (final TestBundle bundle in bundles) {
+        print('  ${bundle.name.ansiMagenta}');
+      }
+      print('Artifacts:');
+      if (artifacts.canvasKit) {
+        print('  canvaskit'.ansiYellow);
+      }
+      if (artifacts.canvasKitChromium) {
+        print('  canvaskit_chromium'.ansiYellow);
+      }
+      if (artifacts.skwasm) {
+        print('  skwasm'.ansiYellow);
+      }
+    }
+    if (isList) {
+      return true;
+    }
+
+    bool shouldRun = boolArg('run');
+    bool shouldCompile = boolArg('compile');
+    bool shouldCopyArtifacts = boolArg('copy-artifacts');
+    if (!shouldRun && !shouldCompile && !shouldCopyArtifacts) {
+      // If none of these is specified, we should assume we need to do all of them.
+      shouldRun = true;
+      shouldCompile = true;
+      shouldCopyArtifacts = true;
+    }
 
+    final Set<FilePath>? testFiles = targetFiles.isEmpty ? null : Set<FilePath>.from(targetFiles);
     final Pipeline testPipeline = Pipeline(steps: <PipelineStep>[
       if (isWatchMode) ClearTerminalScreenStep(),
-      CompileTestsStep(testFiles: testFiles, useLocalCanvasKit: useLocalCanvasKit, isWasm: isWasm),
-      RunTestsStep(
-        browserName: browserName,
-        testFiles: testFiles,
-        isDebug: isDebug,
-        isWasm: isWasm,
-        doUpdateScreenshotGoldens: doUpdateScreenshotGoldens,
-        requireSkiaGold: requireSkiaGold,
-        overridePathToCanvasKit: overridePathToCanvasKit,
-      ),
+      if (shouldCopyArtifacts) CopyArtifactsStep(artifacts, runtimeMode: runtimeMode),
+      if (shouldCompile)
+        for (final TestBundle bundle in bundles)
+          CompileBundleStep(
+            bundle: bundle,
+            isVerbose: isVerbose,
+            testFiles: testFiles,
+          ),
+      if (shouldRun)
+        for (final TestSuite suite in filteredSuites)
+          RunSuiteStep(
+            suite,
+            startPaused: startPaused,
+            isVerbose: isVerbose,
+            doUpdateScreenshotGoldens: doUpdateScreenshotGoldens,
+            requireSkiaGold: requireSkiaGold,
+            overridePathToCanvasKit: overridePathToCanvasKit,
+            testFiles: testFiles,
+            useDwarf: boolArg('dwarf'),
+          ),
     ]);
 
     try {
diff --git a/lib/web_ui/dev/utils.dart b/lib/web_ui/dev/utils.dart
index 775da7f3b9802a81f3d410c485962d1889a1e5a9..78a79a96dbc91fee354f3a944e148289322dc2ed 100644
--- a/lib/web_ui/dev/utils.dart
+++ b/lib/web_ui/dev/utils.dart
@@ -10,14 +10,24 @@ import 'package:args/command_runner.dart';
 import 'package:meta/meta.dart';
 import 'package:path/path.dart' as path;
 
+import 'common.dart';
 import 'environment.dart';
 import 'exceptions.dart';
+import 'felt_config.dart';
+
+enum RuntimeMode {
+  debug,
+  profile,
+  release,
+}
 
 class FilePath {
   FilePath.fromCwd(String relativePath)
       : _absolutePath = path.absolute(relativePath);
   FilePath.fromWebUi(String relativePath)
       : _absolutePath = path.join(environment.webUiRootDir.path, relativePath);
+  FilePath.fromTestSet(TestSet testSet, String relativePath)
+      : _absolutePath = path.join(getTestSetDirectory(testSet).path, relativePath);
 
   final String _absolutePath;
 
@@ -258,29 +268,6 @@ class ProcessOutput {
   final String stderr;
 }
 
-Future<void> runFlutter(
-  String workingDirectory,
-  List<String> arguments, {
-  bool useSystemFlutter = false,
-}) async {
-  final String executable =
-      useSystemFlutter ? 'flutter' : environment.flutterCommand.path;
-  arguments.add('--local-engine=host_debug_unopt');
-  final int exitCode = await runProcess(
-    executable,
-    arguments,
-    workingDirectory: workingDirectory,
-  );
-
-  if (exitCode != 0) {
-    throw ToolExit(
-      'ERROR: Failed to run $executable with '
-      'arguments $arguments. Exited with exit code $exitCode',
-      exitCode: exitCode,
-    );
-  }
-}
-
 /// An exception related to an attempt to spawn a sub-process.
 @immutable
 class ProcessException implements Exception {
@@ -325,8 +312,30 @@ mixin ArgUtils<T> on Command<T> {
 
   /// Extracts a string argument from [argResults].
   String stringArg(String name) => argResults![name] as String;
+
+  RuntimeMode get runtimeMode {
+    final bool isProfile = boolArg('profile');
+    final bool isDebug = boolArg('debug');
+    if (isProfile && isDebug) {
+      throw ToolExit('Cannot specify both --profile and --debug at the same time.');
+    }
+    if (isProfile) {
+      return RuntimeMode.profile;
+    } else if (isDebug) {
+      return RuntimeMode.debug;
+    } else {
+      return RuntimeMode.release;
+    }
+  }
 }
 
+io.Directory getBuildDirectoryForRuntimeMode(RuntimeMode runtimeMode) =>
+  switch (runtimeMode) {
+    RuntimeMode.debug => environment.wasmDebugUnoptOutDir,
+    RuntimeMode.profile => environment.wasmProfileOutDir,
+    RuntimeMode.release => environment.wasmReleaseOutDir,
+  };
+
 /// There might be proccesses started during the tests.
 ///
 /// Use this list to store those Processes, for cleaning up before shutdown.
@@ -368,78 +377,58 @@ Future<void> cleanup() async {
   }
 }
 
-/// Scans the test/ directory for test files and returns them.
-List<FilePath> findAllTests() {
-  return environment.webUiTestDir
-      .listSync(recursive: true)
-      .whereType<io.File>()
-      .where((io.File f) => f.path.endsWith('_test.dart'))
-      .map<FilePath>((io.File f) => FilePath.fromWebUi(
-          path.relative(f.path, from: environment.webUiRootDir.path)))
-      .toList();
+io.Directory getTestSetDirectory(TestSet testSet) {
+  return io.Directory(
+    path.join(
+      environment.webUiTestDir.path,
+      testSet.directory,
+    )
+  );
 }
 
-/// The renderer used to run the test.
-enum Renderer {
-  html,
-  canvasKit,
-  skwasm,
+io.Directory getBundleBuildDirectory(TestBundle bundle) {
+  return io.Directory(
+    path.join(
+      environment.webUiBuildDir.path,
+      'test_bundles',
+      bundle.name,
+    )
+  );
 }
 
-/// The `FilePath`s for all the tests, organized by renderer.
-class TestsByRenderer {
-  TestsByRenderer(this.htmlTests, this.canvasKitTests, this.skwasmTests);
+io.Directory getSkiaGoldDirectoryForSuite(TestSuite suite) {
+  return io.Directory(
+    path.join(
+      environment.webUiSkiaGoldDirectory.path,
+      suite.name,
+    )
+  );
+}
 
-  /// Tests which should be run with the HTML renderer.
-  final List<FilePath> htmlTests;
+extension AnsiColors on String {
+  static bool shouldEscape = () {
+    if (isLuci) {
+      // Produce clean output on LUCI.
+      return false;
+    }
+    return io.stdout.hasTerminal && io.stdout.supportsAnsiEscapes;
+  }();
 
-  /// Tests which should be run with the CanvasKit renderer.
-  final List<FilePath> canvasKitTests;
+  static const String _noColorCode = '\u001b[39m';
 
-  /// Tests which should be run with the Skwasm renderer.
-  final List<FilePath> skwasmTests;
+  String _wrapText(String prefix, String suffix) => shouldEscape
+    ? '$prefix$this$suffix' : this;
 
-  /// The total number of targets to compile.
-  ///
-  /// The number of uiTests is doubled since they are compiled twice: once for
-  /// the HTML renderer and once for the CanvasKit renderer.
-  int get numTargetsToCompile => htmlTests.length + canvasKitTests.length + skwasmTests.length;
-}
+  String _colorText(String colorCode) => _wrapText(colorCode, _noColorCode);
 
-/// Given a list of test files, organizes them by which renderer should run them.
-TestsByRenderer sortTestsByRenderer(List<FilePath> testFiles) {
-  final List<FilePath> htmlTargets = <FilePath>[];
-  final List<FilePath> canvasKitTargets = <FilePath>[];
-  final List<FilePath> skwasmTargets = <FilePath>[];
-  final String canvasKitTestDirectory =
-      path.join(environment.webUiTestDir.path, 'canvaskit');
-  final String skwasmTestDirectory =
-      path.join(environment.webUiTestDir.path, 'skwasm');
-  final String uiTestDirectory =
-      path.join(environment.webUiTestDir.path, 'ui');
-  for (final FilePath testFile in testFiles) {
-    if (path.isWithin(canvasKitTestDirectory, testFile.absolute)) {
-      canvasKitTargets.add(testFile);
-    } else if (path.isWithin(skwasmTestDirectory, testFile.absolute)) {
-      skwasmTargets.add(testFile);
-    } else if (path.isWithin(uiTestDirectory, testFile.absolute)) {
-      htmlTargets.add(testFile);
-      canvasKitTargets.add(testFile);
-    } else {
-      htmlTargets.add(testFile);
-    }
-  }
-  return TestsByRenderer(htmlTargets, canvasKitTargets, skwasmTargets);
-}
+  String get ansiBlack => _colorText('\u001b[30m');
+  String get ansiRed => _colorText('\u001b[31m');
+  String get ansiGreen => _colorText('\u001b[32m');
+  String get ansiYellow => _colorText('\u001b[33m');
+  String get ansiBlue => _colorText('\u001b[34m');
+  String get ansiMagenta => _colorText('\u001b[35m');
+  String get ansiCyan => _colorText('\u001b[36m');
+  String get ansiWhite => _colorText('\u001b[37m');
 
-/// The build directory to compile a test into given the renderer.
-String getBuildDirForRenderer(Renderer renderer) {
-  switch (renderer) {
-    case Renderer.html:
-      return 'html_tests';
-    case Renderer.canvasKit:
-      return 'canvaskit_tests';
-    case Renderer.skwasm:
-      return 'skwasm_tests';
-  }
+  String get ansiBold => _wrapText('\u001b[1m', '\u001b[0m');
 }
diff --git a/lib/web_ui/dev/web_engine_analysis.sh b/lib/web_ui/dev/web_engine_analysis.sh
index fd1224d727a342150151b718d63d76f2c8097077..3d112941c984ec8150d922d4cc6b589ba9cbe87d 100755
--- a/lib/web_ui/dev/web_engine_analysis.sh
+++ b/lib/web_ui/dev/web_engine_analysis.sh
@@ -13,7 +13,7 @@ DART_SDK_DIR="${ENGINE_PATH}/src/out/host_debug_unopt/dart-sdk"
 DART_PATH="$DART_SDK_DIR/bin/dart"
 
 echo "Running \`dart pub get\` in 'engine/src/flutter/lib/web_ui'"
-(cd "$WEB_UI_DIR"; $DART_PATH pub get)
+(cd "$WEB_UI_DIR"; $DART_PATH pub --suppress-analytics get)
 
 echo "Running \`dart analyze\` in 'engine/src/flutter/lib/web_ui'"
-(cd "$WEB_UI_DIR"; $DART_PATH analyze --fatal-infos)
+(cd "$WEB_UI_DIR"; $DART_PATH analyze --suppress-analytics --fatal-infos)
diff --git a/lib/web_ui/dev/webdriver_browser.dart b/lib/web_ui/dev/webdriver_browser.dart
index 8c1c82a9b01c1294e1e1d7b5ae63997f29702291..024a04580a40b5702384fe27b95c6a8cac4d85d6 100644
--- a/lib/web_ui/dev/webdriver_browser.dart
+++ b/lib/web_ui/dev/webdriver_browser.dart
@@ -8,19 +8,19 @@ import 'dart:io';
 import 'dart:math';
 
 import 'package:image/image.dart';
-import 'package:webdriver/io.dart' show WebDriver, createDriver;
+import 'package:webdriver/async_io.dart' show WebDriver, createDriver;
 
 import 'browser.dart';
 
 abstract class WebDriverBrowserEnvironment extends BrowserEnvironment {
-  late final int portNumber;
+  late int portNumber;
   late final Process _driverProcess;
 
   Future<Process> spawnDriverProcess();
   Uri get driverUri;
 
   /// Finds and returns an unused port on the test host in the local port range.
-  Future<int> _pickUnusedPort() async {
+  Future<int> pickUnusedPort() async {
     // Use bind to allocate an unused port, then unbind from that port to
     // make it available for use.
     final ServerSocket socket = await ServerSocket.bind('localhost', 0);
@@ -33,7 +33,7 @@ abstract class WebDriverBrowserEnvironment extends BrowserEnvironment {
 
   @override
   Future<void> prepare() async {
-    portNumber = await _pickUnusedPort();
+    portNumber = await pickUnusedPort();
 
     _driverProcess = await spawnDriverProcess();
 
diff --git a/lib/web_ui/flutter_js/BUILD.gn b/lib/web_ui/flutter_js/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..255cd2c513fe3f6eeb8160481e7256295a144c2f
--- /dev/null
+++ b/lib/web_ui/flutter_js/BUILD.gn
@@ -0,0 +1,31 @@
+# Copyright 2019 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//flutter/build/esbuild/esbuild.gni")
+import("//flutter/shell/version/version.gni")
+import("sources.gni")
+
+group("flutter_js") {
+  public_deps = [
+    ":flutter_js_bundle",
+    ":flutter_js_sources",
+  ]
+}
+
+copy("flutter_js_sources") {
+  sources = flutter_js_source_list
+  outputs =
+      [ "$root_out_dir/flutter_web_sdk/flutter_js/{{source_target_relative}}" ]
+}
+
+esbuild("flutter_js_bundle") {
+  entry_point = "$root_out_dir/flutter_web_sdk/flutter_js/src/flutter.js"
+  output_bundle = "$root_out_dir/flutter_web_sdk/flutter_js"
+
+  bundle = true
+  minify = true
+  sourcemap = true
+
+  public_deps = [ ":flutter_js_sources" ]
+}
diff --git a/lib/web_ui/flutter_js/sources.gni b/lib/web_ui/flutter_js/sources.gni
new file mode 100644
index 0000000000000000000000000000000000000000..11da02b2004556ad59dad674e3db321324cc8e0e
--- /dev/null
+++ b/lib/web_ui/flutter_js/sources.gni
@@ -0,0 +1,18 @@
+# Copyright 2019 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+flutter_js_source_list = [
+  "src/base_uri.js",
+  "src/browser_environment.js",
+  "src/canvaskit_loader.js",
+  "src/entrypoint_loader.js",
+  "src/flutter.js",
+  "src/instantiate_wasm.js",
+  "src/loader.js",
+  "src/service_worker_loader.js",
+  "src/skwasm_loader.js",
+  "src/trusted_types.js",
+
+  "src/types.d.ts",
+]
diff --git a/lib/web_ui/flutter_js/src/base_uri.js b/lib/web_ui/flutter_js/src/base_uri.js
new file mode 100644
index 0000000000000000000000000000000000000000..bfca8d341bde7b621c852b369b862777e9c51a7c
--- /dev/null
+++ b/lib/web_ui/flutter_js/src/base_uri.js
@@ -0,0 +1,17 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+export const baseUri = ensureTrailingSlash(getBaseURI());
+
+function getBaseURI() {
+  const base = document.querySelector("base");
+  return (base && base.getAttribute("href")) || "";
+}
+
+function ensureTrailingSlash(uri) {
+  if (uri === "") {
+    return uri;
+  }
+  return uri.endsWith("/") ? uri : `${uri}/`;
+}
diff --git a/lib/web_ui/flutter_js/src/browser_environment.js b/lib/web_ui/flutter_js/src/browser_environment.js
new file mode 100644
index 0000000000000000000000000000000000000000..64baabc0242703d6635d8a358bc562697150ec68
--- /dev/null
+++ b/lib/web_ui/flutter_js/src/browser_environment.js
@@ -0,0 +1,46 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+const isBlink = () => {
+  return (navigator.vendor === 'Google Inc.') ||
+    (navigator.agent === 'Edg/');
+}
+
+const hasImageCodecs = () => {
+  if (typeof ImageDecoder === 'undefined') {
+    return false;
+  }
+  // TODO(yjbanov): https://github.com/flutter/flutter/issues/122761
+  // Frequently, when a browser launches an API that other browsers already
+  // support, there are subtle incompatibilities that may cause apps to crash if,
+  // we blindly adopt the new implementation. This check prevents us from picking
+  // up potentially incompatible implementations of ImagdeDecoder API. Instead,
+  // when a new browser engine launches the API, we'll evaluate it and enable it
+  // explicitly.
+  return isBlink();
+}
+
+const hasChromiumBreakIterators = () => {
+  return (typeof Intl.v8BreakIterator !== "undefined") &&
+    (typeof Intl.Segmenter !== "undefined");
+}
+
+const supportsWasmGC = () => {
+  // This attempts to instantiate a wasm module that only will validate if the
+  // final WasmGC spec is implemented in the browser.
+  //
+  // Copied from https://github.com/GoogleChromeLabs/wasm-feature-detect/blob/main/src/detectors/gc/index.js
+  const bytes = [0, 97, 115, 109, 1, 0, 0, 0, 1, 5, 1, 95, 1, 120, 0];
+  return WebAssembly.validate(new Uint8Array(bytes));
+}
+
+/**
+ * @returns {import("./types").BrowserEnvironment}
+ */
+export const browserEnvironment = {
+  hasImageCodecs: hasImageCodecs(),
+  hasChromiumBreakIterators: hasChromiumBreakIterators(),
+  supportsWasmGC: supportsWasmGC(),
+  crossOriginIsolated: window.crossOriginIsolated,
+};
diff --git a/lib/web_ui/flutter_js/src/canvaskit_loader.js b/lib/web_ui/flutter_js/src/canvaskit_loader.js
new file mode 100644
index 0000000000000000000000000000000000000000..39a696a6a86861b0257b2ec8892a3afcdfff37cd
--- /dev/null
+++ b/lib/web_ui/flutter_js/src/canvaskit_loader.js
@@ -0,0 +1,47 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import { createWasmInstantiator } from "./instantiate_wasm.js";
+
+export const loadCanvasKit = (deps, config, browserEnvironment, engineRevision) => {
+  if (window.flutterCanvasKit) {
+    // The user has set this global variable ahead of time, so we just return that.
+    return Promise.resolve(window.flutterCanvasKit);
+  }
+  window.flutterCanvasKitLoaded = new Promise((resolve, reject) => {
+    const supportsChromiumCanvasKit = browserEnvironment.hasChromiumBreakIterators && browserEnvironment.hasImageCodecs;
+    if (!supportsChromiumCanvasKit && config.canvasKitVariant == "chromium") {
+      throw "Chromium CanvasKit variant specifically requested, but unsupported in this browser";
+    }
+    const useChromiumCanvasKit = supportsChromiumCanvasKit && (config.canvasKitVariant !== "full");
+    let baseUrl = config.canvasKitBaseUrl ?? `https://www.gstatic.com/flutter-canvaskit/${engineRevision}/`;
+    if (useChromiumCanvasKit) {
+      baseUrl = `${baseUrl}chromium/`;
+    }
+    let canvasKitUrl = `${baseUrl}canvaskit.js`;
+    if (deps.flutterTT.policy) {
+      canvasKitUrl = deps.flutterTT.policy.createScriptURL(canvasKitUrl);
+    }
+    const wasmInstantiator = createWasmInstantiator(`${baseUrl}canvaskit.wasm`);
+    const script = document.createElement("script");
+    script.src = canvasKitUrl;
+    if (config.nonce) {
+      script.nonce = config.nonce;
+    }
+    script.addEventListener('load', async () => {
+      try {
+        const canvasKit = await CanvasKitInit({
+          instantiateWasm: wasmInstantiator,
+        });
+        window.flutterCanvasKit = canvasKit;
+        resolve(canvasKit);  
+      } catch (e) {
+        reject(e);
+      }
+    });
+    script.addEventListener('error', reject);
+    document.head.appendChild(script);
+  });
+  return window.flutterCanvasKitLoaded;
+}
diff --git a/lib/web_ui/flutter_js/src/entrypoint_loader.js b/lib/web_ui/flutter_js/src/entrypoint_loader.js
new file mode 100644
index 0000000000000000000000000000000000000000..db8b33159dc48dc1d04da98fafcec8528d0cf6ee
--- /dev/null
+++ b/lib/web_ui/flutter_js/src/entrypoint_loader.js
@@ -0,0 +1,198 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import { baseUri } from "./base_uri.js";
+
+/**
+ * Handles injecting the main Flutter web entrypoint (main.dart.js), and notifying
+ * the user when Flutter is ready, through `didCreateEngineInitializer`.
+ *
+ * @see https://docs.flutter.dev/development/platform-integration/web/initialization
+ */
+export class FlutterEntrypointLoader {
+  /**
+   * Creates a FlutterEntrypointLoader.
+   */
+  constructor() {
+    // Watchdog to prevent injecting the main entrypoint multiple times.
+    this._scriptLoaded = false;
+  }
+  /**
+   * Injects a TrustedTypesPolicy (or undefined if the feature is not supported).
+   * @param {TrustedTypesPolicy | undefined} policy
+   */
+  setTrustedTypesPolicy(policy) {
+    this._ttPolicy = policy;
+  }
+  /**
+   * @deprecated
+   * Loads flutter main entrypoint, specified by `entrypointUrl`, and calls a
+   * user-specified `onEntrypointLoaded` callback with an EngineInitializer
+   * object when it's done.
+   *
+   * @param {*} options
+   * @returns {Promise | undefined} that will eventually resolve with an
+   * EngineInitializer, or will be rejected with the error caused by the loader.
+   * Returns undefined when an `onEntrypointLoaded` callback is supplied in `options`.
+   */
+  async loadEntrypoint(options) {
+    const { entrypointUrl = `${baseUri}main.dart.js`, onEntrypointLoaded, nonce } =
+      options || {};
+    return this._loadJSEntrypoint(entrypointUrl, onEntrypointLoaded, nonce);
+  }
+
+  /**
+   * Loads the entry point for a flutter application.
+   * @param {import("./types").ApplicationBuild} build
+   *   Information about the specific build that is to be loaded
+   * @param {*} deps
+   *   External dependencies that may be needed to load the app.
+   * @param {import("./types").FlutterConfiguration} config
+   *   The application configuration. If no callback is specified, this will be
+   *   passed along to engine when initializing it.
+   * @param {string} nonce
+   *   A nonce to apply to the main application script tag, if necessary.
+   * @param {import("./types").OnEntrypointLoadedCallback?} onEntrypointLoaded
+   *   An optional callback to invoke when the entrypoint is loaded. If no
+   *   callback is supplied, the engine initializer and app runner will be
+   *   automatically invoked on load, passing along the supplied flutter
+   *   configuration.
+   */
+  async load(build, deps, config, nonce, onEntrypointLoaded) {
+    onEntrypointLoaded ??= (engineInitializer) => {
+      engineInitializer.initializeEngine(config).then((appRunner) => appRunner.runApp())
+    };
+    if (build.compileTarget === "dart2wasm") {
+      return this._loadWasmEntrypoint(build, deps, onEntrypointLoaded);
+    } else {
+      const mainPath = build.mainJsPath ?? "main.dart.js";
+      const entrypointUrl = `${baseUri}${mainPath}`;
+      return this._loadJSEntrypoint(entrypointUrl, onEntrypointLoaded, nonce);
+    }
+  }
+
+  /**
+   * Resolves the promise created by loadEntrypoint, and calls the `onEntrypointLoaded`
+   * function supplied by the user (if needed).
+   *
+   * Called by Flutter through `_flutter.loader.didCreateEngineInitializer` method,
+   * which is bound to the correct instance of the FlutterEntrypointLoader by
+   * the FlutterLoader object.
+   *
+   * @param {Function} engineInitializer @see https://github.com/flutter/engine/blob/main/lib/web_ui/lib/src/engine/js_interop/js_loader.dart#L42
+   */
+  didCreateEngineInitializer(engineInitializer) {
+    if (typeof this._didCreateEngineInitializerResolve === "function") {
+      this._didCreateEngineInitializerResolve(engineInitializer);
+      // Remove the resolver after the first time, so Flutter Web can hot restart.
+      this._didCreateEngineInitializerResolve = null;
+      // Make the engine revert to "auto" initialization on hot restart.
+      delete _flutter.loader.didCreateEngineInitializer;
+    }
+    if (typeof this._onEntrypointLoaded === "function") {
+      this._onEntrypointLoaded(engineInitializer);
+    }
+  }
+  /**
+   * Injects a script tag into the DOM, and configures this loader to be able to
+   * handle the "entrypoint loaded" notifications received from Flutter web.
+   *
+   * @param {string} entrypointUrl the URL of the script that will initialize
+   *                 Flutter.
+   * @param {Function} onEntrypointLoaded a callback that will be called when
+   *                   Flutter web notifies this object that the entrypoint is
+   *                   loaded.
+   * @returns {Promise | undefined} a Promise that resolves when the entrypoint
+   *                                is loaded, or undefined if `onEntrypointLoaded`
+   *                                is a function.
+   */
+  _loadJSEntrypoint(entrypointUrl, onEntrypointLoaded, nonce) {
+    const useCallback = typeof onEntrypointLoaded === "function";
+    if (!this._scriptLoaded) {
+      this._scriptLoaded = true;
+      const scriptTag = this._createScriptTag(entrypointUrl, nonce);
+      if (useCallback) {
+        // Just inject the script tag, and return nothing; Flutter will call
+        // `didCreateEngineInitializer` when it's done.
+        console.debug("Injecting <script> tag. Using callback.");
+        this._onEntrypointLoaded = onEntrypointLoaded;
+        document.head.append(scriptTag);
+      } else {
+        // Inject the script tag and return a promise that will get resolved
+        // with the EngineInitializer object from Flutter when it calls
+        // `didCreateEngineInitializer` later.
+        return new Promise((resolve, reject) => {
+          console.debug(
+            "Injecting <script> tag. Using Promises. Use the callback approach instead!"
+          );
+          this._didCreateEngineInitializerResolve = resolve;
+          scriptTag.addEventListener("error", reject);
+          document.head.append(scriptTag);
+        });
+      }
+    }
+  }
+
+  /**
+   *
+   * @param {import("./types").WasmApplicationBuild} build
+   * @param {*} deps
+   * @param {import("./types").OnEntrypointLoadedCallback} onEntrypointLoaded
+   */
+  async _loadWasmEntrypoint(build, deps, onEntrypointLoaded) {
+    if (!this._scriptLoaded) {
+      this._scriptLoaded = true;
+
+      this._onEntrypointLoaded = onEntrypointLoaded;
+      const { mainWasmPath, jsSupportRuntimePath } = build;
+      const moduleUri = `${baseUri}${mainWasmPath}`;
+      let jsSupportRuntimeUri = `${baseUri}${jsSupportRuntimePath}`;
+      if (this._ttPolicy != null) {
+        jsSupportRuntimeUri = this._ttPolicy.createScriptURL(jsSupportRuntimeUri);
+      }  
+      const dartModulePromise = WebAssembly.compileStreaming(fetch(moduleUri));
+
+      const jsSupportRuntime = await import(jsSupportRuntimeUri);
+
+      let imports;
+      if (build.renderer === "skwasm") {
+        imports = (async () => {
+          const skwasmInstance = await deps.skwasm;
+          window._flutter_skwasmInstance = skwasmInstance;
+          return {
+            skwasm: skwasmInstance.wasmExports,
+            skwasmWrapper: skwasmInstance,
+            ffi: {
+              memory: skwasmInstance.wasmMemory,
+            },
+          };
+        })();
+      } else {
+        imports = {};
+      }
+      const moduleInstance = await jsSupportRuntime.instantiate(dartModulePromise, imports);
+      await jsSupportRuntime.invoke(moduleInstance);
+    }
+  }
+
+  /**
+   * Creates a script tag for the given URL.
+   * @param {string} url
+   * @returns {HTMLScriptElement}
+   */
+  _createScriptTag(url, nonce) {
+    const scriptTag = document.createElement("script");
+    scriptTag.type = "application/javascript";
+    if (nonce) {
+      scriptTag.nonce = nonce;
+    }
+    // Apply TrustedTypes validation, if available.
+    let trustedUrl = url;
+    if (this._ttPolicy != null) {
+      trustedUrl = this._ttPolicy.createScriptURL(url);
+    }
+    scriptTag.src = trustedUrl;
+    return scriptTag;
+  }
+}
diff --git a/lib/web_ui/flutter_js/src/flutter.js b/lib/web_ui/flutter_js/src/flutter.js
new file mode 100644
index 0000000000000000000000000000000000000000..4b381b60151f48e33922b49cc334befc8b8ddd6f
--- /dev/null
+++ b/lib/web_ui/flutter_js/src/flutter.js
@@ -0,0 +1,13 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import { FlutterLoader } from './loader.js';
+
+if (!window._flutter) {
+  window._flutter = {};
+}
+
+if (!window._flutter.loader) {
+  window._flutter.loader = new FlutterLoader();
+}
diff --git a/lib/web_ui/flutter_js/src/instantiate_wasm.js b/lib/web_ui/flutter_js/src/instantiate_wasm.js
new file mode 100644
index 0000000000000000000000000000000000000000..29827f6563131b42026031b67cdee997e672098f
--- /dev/null
+++ b/lib/web_ui/flutter_js/src/instantiate_wasm.js
@@ -0,0 +1,17 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// This is a little helper function that helps us start the fetch and compilation
+// of an emscripten wasm module in parallel with the fetch of its script.
+export const createWasmInstantiator = (url) => {
+  const modulePromise = WebAssembly.compileStreaming(fetch(url));
+  return (imports, successCallback) => {
+    (async () => {
+      const module = await modulePromise;
+      const instance = await WebAssembly.instantiate(module, imports);
+      successCallback(instance, module);
+    })();
+    return {};
+  };
+}
diff --git a/lib/web_ui/flutter_js/src/loader.js b/lib/web_ui/flutter_js/src/loader.js
new file mode 100644
index 0000000000000000000000000000000000000000..3d5fb4e8ddbefec33181c009f03bbb941bfcb40a
--- /dev/null
+++ b/lib/web_ui/flutter_js/src/loader.js
@@ -0,0 +1,130 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import { browserEnvironment } from './browser_environment.js';
+import { FlutterEntrypointLoader } from './entrypoint_loader.js';
+import { FlutterServiceWorkerLoader } from './service_worker_loader.js';
+import { FlutterTrustedTypesPolicy } from './trusted_types.js';
+import { loadCanvasKit } from './canvaskit_loader.js';
+import { loadSkwasm } from './skwasm_loader.js';
+
+/**
+ * The public interface of _flutter.loader. Exposes two methods:
+ * * loadEntrypoint (which coordinates the default Flutter web loading procedure)
+ * * didCreateEngineInitializer (which is called by Flutter to notify that its
+ *                              Engine is ready to be initialized)
+ */
+export class FlutterLoader {
+  /**
+   * @deprecated Use `load` instead.
+   * Initializes the Flutter web app.
+   * @param {*} options
+   * @returns {Promise?} a (Deprecated) Promise that will eventually resolve
+   *                     with an EngineInitializer, or will be rejected with
+   *                     any error caused by the loader. Or Null, if the user
+   *                     supplies an `onEntrypointLoaded` Function as an option.
+   */
+  async loadEntrypoint(options) {
+    const { serviceWorker, ...entrypoint } = options || {};
+    // A Trusted Types policy that is going to be used by the loader.
+    const flutterTT = new FlutterTrustedTypesPolicy();
+    // The FlutterServiceWorkerLoader instance could be injected as a dependency
+    // (and dynamically imported from a module if not present).
+    const serviceWorkerLoader = new FlutterServiceWorkerLoader();
+    serviceWorkerLoader.setTrustedTypesPolicy(flutterTT.policy);
+    await serviceWorkerLoader.loadServiceWorker(serviceWorker).catch(e => {
+      // Regardless of what happens with the injection of the SW, the show must go on
+      console.warn("Exception while loading service worker:", e);
+    });
+    // The FlutterEntrypointLoader instance could be injected as a dependency
+    // (and dynamically imported from a module if not present).
+    const entrypointLoader = new FlutterEntrypointLoader();
+    entrypointLoader.setTrustedTypesPolicy(flutterTT.policy);
+    // Install the `didCreateEngineInitializer` listener where Flutter web expects it to be.
+    this.didCreateEngineInitializer =
+      entrypointLoader.didCreateEngineInitializer.bind(entrypointLoader);
+    return entrypointLoader.loadEntrypoint(entrypoint);
+  }
+
+  /**
+   * Loads and initializes a flutter application.
+   * @param {Object} options
+   * @param {import("/.types".ServiceWorkerSettings?)} options.serviceWorkerSettings
+   *   Settings for the service worker to be loaded. Can pass `undefined` or
+   *   `null` to not launch a service worker at all.
+   * @param {import("/.types".OnEntryPointLoadedCallback)} options.onEntrypointLoaded
+   *   An optional callback to invoke 
+   * @param {string} options.nonce
+   *   A nonce to be applied to the main JS script when loading it, which may
+   *   be required by the sites Content-Security-Policy.
+   *   For more details, see {@link https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/script-src here}.
+   * @param {import("./types".FlutterConfiguration)} arg.config
+   */
+  async load({
+    serviceWorkerSettings,
+    onEntrypointLoaded,
+    nonce,
+    config,
+  } = {}) {
+    config ??= {};
+
+    /** @type {import("./types").BuildConfig} */
+    const buildConfig = _flutter.buildConfig;
+    if (!buildConfig) {
+      throw "FlutterLoader.load requires _flutter.buildConfig to be set";
+    }
+
+    const rendererIsCompatible = (renderer) => {
+      switch (renderer) {
+        case "skwasm":
+          return browserEnvironment.crossOriginIsolated
+            && browserEnvironment.hasChromiumBreakIterators
+            && browserEnvironment.hasImageCodecs
+            && browserEnvironment.supportsWasmGC;
+        default:
+          return true;
+      }
+    }
+
+    const buildIsCompatible = (build) => {
+      if (build.compileTarget === "dart2wasm" && !browserEnvironment.supportsWasmGC) {
+        return false;
+      }
+      if (config.renderer && config.renderer != build.renderer) {
+        return false;
+      }
+      return rendererIsCompatible(build.renderer);
+    };
+    const build = buildConfig.builds.find(buildIsCompatible);
+    if (!build) {
+      throw "FlutterLoader could not find a build compatible with configuration and environment.";
+    }
+
+    const deps = {};
+    deps.flutterTT = new FlutterTrustedTypesPolicy();
+    if (serviceWorkerSettings) {
+      deps.serviceWorkerLoader = new FlutterServiceWorkerLoader();
+      deps.serviceWorkerLoader.setTrustedTypesPolicy(deps.flutterTT.policy);
+      await deps.serviceWorkerLoader.loadServiceWorker(serviceWorkerSettings).catch(e => {
+        // Regardless of what happens with the injection of the SW, the show must go on
+        console.warn("Exception while loading service worker:", e);
+      });
+    }
+
+    if (build.renderer === "canvaskit") {
+      deps.canvasKit = loadCanvasKit(deps, config, browserEnvironment, buildConfig.engineRevision);
+    } else if (build.renderer === "skwasm") {
+      deps.skwasm = loadSkwasm(deps, config, browserEnvironment, buildConfig.engineRevision);
+    }
+
+    // The FlutterEntrypointLoader instance could be injected as a dependency
+    // (and dynamically imported from a module if not present).
+    const entrypointLoader = new FlutterEntrypointLoader();
+    entrypointLoader.setTrustedTypesPolicy(deps.flutterTT.policy);
+    // Install the `didCreateEngineInitializer` listener where Flutter web expects it to be.
+    this.didCreateEngineInitializer =
+      entrypointLoader.didCreateEngineInitializer.bind(entrypointLoader);
+    return entrypointLoader.load(build, deps, config, nonce, onEntrypointLoaded);
+  }
+}
diff --git a/lib/web_ui/flutter_js/src/service_worker_loader.js b/lib/web_ui/flutter_js/src/service_worker_loader.js
new file mode 100644
index 0000000000000000000000000000000000000000..7c4ff3e6c39bdbce9429029eec92e480ed32a3c2
--- /dev/null
+++ b/lib/web_ui/flutter_js/src/service_worker_loader.js
@@ -0,0 +1,152 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import { baseUri } from "./base_uri.js";
+
+/**
+ * Wraps `promise` in a timeout of the given `duration` in ms.
+ *
+ * Resolves/rejects with whatever the original `promises` does, or rejects
+ * if `promise` takes longer to complete than `duration`. In that case,
+ * `debugName` is used to compose a legible error message.
+ *
+ * If `duration` is < 0, the original `promise` is returned unchanged.
+ * @param {Promise} promise
+ * @param {number} duration
+ * @param {string} debugName
+ * @returns {Promise} a wrapped promise.
+ */
+async function timeout(promise, duration, debugName) {
+  if (duration < 0) {
+    return promise;
+  }
+  let timeoutId;
+  const _clock = new Promise((_, reject) => {
+    timeoutId = setTimeout(() => {
+      reject(
+        new Error(
+          `${debugName} took more than ${duration}ms to resolve. Moving on.`,
+          {
+            cause: timeout,
+          }
+        )
+      );
+    }, duration);
+  });
+  return Promise.race([promise, _clock]).finally(() => {
+    clearTimeout(timeoutId);
+  });
+}
+
+/**
+ * Handles loading/reloading Flutter's service worker, if configured.
+ *
+ * @see: https://developers.google.com/web/fundamentals/primers/service-workers
+ */
+export class FlutterServiceWorkerLoader {
+  /**
+   * Injects a TrustedTypesPolicy (or undefined if the feature is not supported).
+   * @param {TrustedTypesPolicy | undefined} policy
+   */
+  setTrustedTypesPolicy(policy) {
+    this._ttPolicy = policy;
+  }
+  /**
+   * Returns a Promise that resolves when the latest Flutter service worker,
+   * configured by `settings` has been loaded and activated.
+   *
+   * Otherwise, the promise is rejected with an error message.
+   * @param {import("./types").ServiceWorkerSettings} settings Service worker settings
+   * @returns {Promise} that resolves when the latest serviceWorker is ready.
+   */
+  loadServiceWorker(settings) {
+    if (!settings) {
+      // In the future, settings = null -> uninstall service worker?
+      console.debug("Null serviceWorker configuration. Skipping.");
+      return Promise.resolve();
+    }
+    if (!("serviceWorker" in navigator)) {
+      let errorMessage = "Service Worker API unavailable.";
+      if (!window.isSecureContext) {
+        errorMessage += "\nThe current context is NOT secure."
+        errorMessage += "\nRead more: https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts";
+      }
+      return Promise.reject(
+        new Error(errorMessage)
+      );
+    }
+    const {
+      serviceWorkerVersion,
+      serviceWorkerUrl = `${baseUri}flutter_service_worker.js?v=${serviceWorkerVersion}`,
+      timeoutMillis = 4000,
+    } = settings;
+    // Apply the TrustedTypes policy, if present.
+    let url = serviceWorkerUrl;
+    if (this._ttPolicy != null) {
+      url = this._ttPolicy.createScriptURL(url);
+    }
+    const serviceWorkerActivation = navigator.serviceWorker
+      .register(url)
+      .then((serviceWorkerRegistration) => this._getNewServiceWorker(serviceWorkerRegistration, serviceWorkerVersion))
+      .then(this._waitForServiceWorkerActivation);
+    // Timeout race promise
+    return timeout(
+      serviceWorkerActivation,
+      timeoutMillis,
+      "prepareServiceWorker"
+    );
+  }
+  /**
+   * Returns the latest service worker for the given `serviceWorkerRegistration`.
+   *
+   * This might return the current service worker, if there's no new service worker
+   * awaiting to be installed/updated.
+   *
+   * @param {ServiceWorkerRegistration} serviceWorkerRegistration
+   * @param {string} serviceWorkerVersion
+   * @returns {Promise<ServiceWorker>}
+   */
+  async _getNewServiceWorker(serviceWorkerRegistration, serviceWorkerVersion) {
+    if (!serviceWorkerRegistration.active && (serviceWorkerRegistration.installing || serviceWorkerRegistration.waiting)) {
+      // No active web worker and we have installed or are installing
+      // one for the first time. Simply wait for it to activate.
+      console.debug("Installing/Activating first service worker.");
+      return serviceWorkerRegistration.installing || serviceWorkerRegistration.waiting;
+    } else if (!serviceWorkerRegistration.active.scriptURL.endsWith(serviceWorkerVersion)) {
+      // When the app updates the serviceWorkerVersion changes, so we
+      // need to ask the service worker to update.
+      const newRegistration = await serviceWorkerRegistration.update();
+      console.debug("Updating service worker.");
+      return newRegistration.installing || newRegistration.waiting || newRegistration.active;
+    } else {
+      console.debug("Loading from existing service worker.");
+      return serviceWorkerRegistration.active;
+    }
+  }
+  /**
+   * Returns a Promise that resolves when the `serviceWorker` changes its
+   * state to "activated".
+   *
+   * @param {ServiceWorker} serviceWorker
+   * @returns {Promise<void>}
+   */
+  async _waitForServiceWorkerActivation(serviceWorker) {
+    if (!serviceWorker || serviceWorker.state === "activated") {
+      if (!serviceWorker) {
+        throw new Error("Cannot activate a null service worker!");
+      } else {
+        console.debug("Service worker already active.");
+        return;
+      }
+    }
+    return new Promise((resolve, _) => {
+      serviceWorker.addEventListener("statechange", () => {
+        if (serviceWorker.state === "activated") {
+          console.debug("Activated new service worker.");
+          resolve();
+        }
+      });
+    });
+  }
+}
diff --git a/lib/web_ui/flutter_js/src/skwasm_loader.js b/lib/web_ui/flutter_js/src/skwasm_loader.js
new file mode 100644
index 0000000000000000000000000000000000000000..86e1b529784d32565ad3d7834d5a019969bc65d4
--- /dev/null
+++ b/lib/web_ui/flutter_js/src/skwasm_loader.js
@@ -0,0 +1,47 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import { createWasmInstantiator } from "./instantiate_wasm.js";
+
+export const loadSkwasm = (deps, config, browserEnvironment, engineRevision) => {
+  return new Promise((resolve, reject) => {
+    const baseUrl = config.canvasKitBaseUrl ?? `https://www.gstatic.com/flutter-canvaskit/${engineRevision}/`;
+    let skwasmUrl = `${baseUrl}skwasm.js`;
+    if (deps.flutterTT.policy) {
+      skwasmUrl = deps.flutterTT.policy.createScriptURL(skwasmUrl);
+    }
+    const wasmInstantiator = createWasmInstantiator(`${baseUrl}skwasm.wasm`);
+    const script = document.createElement("script");
+    script.src = skwasmUrl;
+    if (config.nonce) {
+      script.nonce = config.nonce;
+    }
+    script.addEventListener('load', async () => {
+      try {
+        const skwasmInstance = await skwasm({
+          instantiateWasm: wasmInstantiator,
+          locateFile: (fileName, scriptDirectory) => {
+            // When hosted via a CDN or some other url that is not the same
+            // origin as the main script of the page, we will fail to create
+            // a web worker with the .worker.js script. This workaround will
+            // make sure that the worker JS can be loaded regardless of where
+            // it is hosted.
+            const url = scriptDirectory + fileName;
+            if (url.endsWith('.worker.js')) {
+              return URL.createObjectURL(new Blob(
+                [`importScripts('${url}');`],
+                { 'type': 'application/javascript' }));
+            }
+            return url;
+          }
+        });
+        resolve(skwasmInstance);
+      } catch (e) {
+        reject(e);
+      }
+    });
+    script.addEventListener('error', reject);
+    document.head.appendChild(script);
+  });
+}
diff --git a/lib/web_ui/flutter_js/src/trusted_types.js b/lib/web_ui/flutter_js/src/trusted_types.js
new file mode 100644
index 0000000000000000000000000000000000000000..eeeef9a1ba16d7fd46dbf2d6bf32e7dfdfb83c18
--- /dev/null
+++ b/lib/web_ui/flutter_js/src/trusted_types.js
@@ -0,0 +1,41 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+/**
+ * Handles the creation of a TrustedTypes `policy` that validates URLs based
+ * on an (optional) incoming array of RegExes.
+ */
+export class FlutterTrustedTypesPolicy {
+  /**
+   * Constructs the policy.
+   * @param {[RegExp]} validPatterns the patterns to test URLs
+   * @param {String} policyName the policy name (optional)
+   */
+  constructor(validPatterns, policyName = "flutter-js") {
+    const patterns = validPatterns || [
+      /\.js$/,
+      /\.mjs$/,
+    ];
+    if (window.trustedTypes) {
+      this.policy = trustedTypes.createPolicy(policyName, {
+        createScriptURL: function (url) {
+          // Return blob urls without manipulating them
+          if (url.startsWith('blob:')) {
+            return url;
+          }
+          // Validate other urls
+          const parsed = new URL(url, window.location);
+          const file = parsed.pathname.split("/").pop();
+          const matches = patterns.some((pattern) => pattern.test(file));
+          if (matches) {
+            return parsed.toString();
+          }
+          console.error(
+            "URL rejected by TrustedTypes policy",
+            policyName, ":", url, "(download prevented)");
+        }
+      });
+    }
+  }
+}
diff --git a/lib/web_ui/flutter_js/src/types.d.ts b/lib/web_ui/flutter_js/src/types.d.ts
new file mode 100644
index 0000000000000000000000000000000000000000..4013ddbcec264baf9966dc582ed2c145982b38c8
--- /dev/null
+++ b/lib/web_ui/flutter_js/src/types.d.ts
@@ -0,0 +1,74 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+type JSCompileTarget = "dart2js" | "dartdevc";
+type WasmCompileTarget = "dart2wasm";
+
+export type CompileTarget = JSCompileTarget | WasmCompileTarget;
+
+export type WebRenderer =
+  "html" |
+  "canvaskit" |
+  "skwasm";
+
+interface ApplicationBuildBase {
+  renderer: WebRenderer;
+}
+
+export interface JSApplicationBuild extends ApplicationBuildBase {
+  compileTarget: JSCompileTarget;
+  mainJsPath: string;
+}
+
+export interface WasmApplicationBuild extends ApplicationBuildBase {
+  compileTarget: WasmCompileTarget;
+  mainWasmPath: string;
+  jsSupportRuntimePath: string;
+}
+
+export type ApplicationBuild = JSApplicationBuild | WasmApplicationBuild;
+
+export interface BuildConfig {
+  serviceWorkerVersion: string;
+  engineRevision: string;
+  builds: ApplicationBuild[];
+}
+
+export interface BrowserEnvironment {
+  hasImageCodecs: boolean;
+  hasChromiumBreakIterators: boolean;
+  supportsWasmGC: boolean;
+  crossOriginIsolated: boolean;
+}
+
+type CanvasKitVariant =
+  "auto" |
+  "full" |
+  "chromium";
+
+export interface FlutterConfiguration {
+  assetBase: string?;
+  canvasKitBaseUrl: string?;
+  canvasKitVariant: CanvasKitVariant?;
+  renderer: WebRenderer?;
+  hostElement: HtmlElement?;
+  fontFallbackBaseUrl: string?;
+}
+
+export interface ServiceWorkerSettings {
+  serviceWorkerVersion: string;
+  serviceWorkerUrl: string?;
+  timeoutMillis: number?;
+}
+
+export interface AppRunner {
+  runApp: () => void;
+}
+
+export interface EngineInitializer {
+  initializeEngine: () => Promise<AppRunner>;
+}
+
+export type OnEntrypointLoadedCallback =
+  (initializer: EngineInitializer) => void;
diff --git a/lib/web_ui/lib/annotations.dart b/lib/web_ui/lib/annotations.dart
index 3dbd5823e060d53d8b81bc21ad92670db2d465a9..f66945a667d75b9434111b53e22fb443ecf505fe 100644
--- a/lib/web_ui/lib/annotations.dart
+++ b/lib/web_ui/lib/annotations.dart
@@ -2,14 +2,39 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(dnfield): Remove unused_import ignores when https://github.com/dart-lang/sdk/issues/35164 is resolved.
-
 part of ui;
 
-// TODO(dnfield): Update this if/when we default this to on in the tool,
-// see: https://github.com/flutter/flutter/issues/52759
-const _KeepToString keepToString = _KeepToString();
-
-class _KeepToString {
-  const _KeepToString();
-}
+/// Annotation to keep [Object.toString] overrides as-is instead of removing
+/// them for size optimization purposes.
+///
+/// For certain uris (currently `dart:ui` and `package:flutter`) the Dart
+/// compiler may remove [Object.toString] overrides from classes in
+/// profile/release mode to reduce code size.
+///
+/// Individual classes can opt out of this behavior via the following
+/// annotations:
+///
+///    * `@pragma('flutter:keep-to-string')`
+///    * `@pragma('flutter:keep-to-string-in-subtypes')`
+///
+/// See https://github.com/dart-lang/sdk/blob/main/runtime/docs/pragmas.md
+///
+/// For example, in the following class the `toString` method will remain as
+/// `return _buffer.toString();`, even if the  `--delete-tostring-package-uri`
+/// option would otherwise apply and replace it with `return super.toString()`.
+/// (By convention, `dart:ui` is usually imported `as ui`, hence the prefix.)
+///
+/// ```dart
+/// class MyStringBuffer {
+///   final StringBuffer _buffer = StringBuffer();
+///
+///   // ...
+///
+///   @ui.keepToString
+///   @override
+///   String toString() {
+///     return _buffer.toString();
+///   }
+/// }
+/// ```
+const pragma keepToString = pragma('flutter:keep-to-string');
diff --git a/lib/web_ui/lib/canvas.dart b/lib/web_ui/lib/canvas.dart
index afed170c199a322527d184def5eb36f56abf6491..6e845799be22a5ad2b82c45b85a7dd6835b55f19 100644
--- a/lib/web_ui/lib/canvas.dart
+++ b/lib/web_ui/lib/canvas.dart
@@ -25,8 +25,8 @@ abstract class Vertices {
   factory Vertices(
     VertexMode mode,
     List<Offset> positions, {
-    List<Offset>? textureCoordinates,
     List<Color>? colors,
+    List<Offset>? textureCoordinates,
     List<int>? indices,
   }) {
     return engine.renderer.createVertices(mode,
@@ -38,8 +38,8 @@ abstract class Vertices {
   factory Vertices.raw(
     VertexMode mode,
     Float32List positions, {
-    Float32List? textureCoordinates,
     Int32List? colors,
+    Float32List? textureCoordinates,
     Uint16List? indices,
   }) {
     return engine.renderer.createVerticesRaw(mode,
diff --git a/lib/web_ui/lib/channel_buffers.dart b/lib/web_ui/lib/channel_buffers.dart
index 4677e790f092e2ceb253bb19a049c6b106dd0b4c..48d777ce2d539edb9f89b0fa675a7f4918072d0f 100644
--- a/lib/web_ui/lib/channel_buffers.dart
+++ b/lib/web_ui/lib/channel_buffers.dart
@@ -199,7 +199,6 @@ class ChannelBuffers {
           }
           index += 1;
           resize(channelName, data.getUint32(index, Endian.host));
-          break;
         case 'overflow':
           if (bytes[index] != 0x0C) {
             throw Exception("Invalid arguments for 'overflow' method sent to $kControlChannelName (arguments must be a two-element list, channel name and flag state)");
@@ -224,7 +223,6 @@ class ChannelBuffers {
             throw Exception("Invalid arguments for 'overflow' method sent to $kControlChannelName (second argument must be a boolean)");
           }
           allowOverflow(channelName, bytes[index] == 0x01);
-          break;
         default:
           throw Exception("Unrecognized method '$methodName' sent to $kControlChannelName");
       }
@@ -259,6 +257,8 @@ class ChannelBuffers {
       return true;
     }());
   }
+
+  void sendChannelUpdate(String name, {required bool listening}) {}
 }
 
 final ChannelBuffers channelBuffers = ChannelBuffers();
diff --git a/lib/web_ui/lib/compositing.dart b/lib/web_ui/lib/compositing.dart
index d3f0acddd679709b6d75be4912c55e9807371b73..050a5425e792ced874c8c350a89e81175ce91230 100644
--- a/lib/web_ui/lib/compositing.dart
+++ b/lib/web_ui/lib/compositing.dart
@@ -30,8 +30,6 @@ abstract class BackdropFilterEngineLayer implements EngineLayer {}
 
 abstract class ShaderMaskEngineLayer implements EngineLayer {}
 
-abstract class PhysicalShapeEngineLayer implements EngineLayer {}
-
 abstract class SceneBuilder {
   factory SceneBuilder() =>
     engine.renderer.createSceneBuilder();
@@ -86,18 +84,6 @@ abstract class SceneBuilder {
     ShaderMaskEngineLayer? oldLayer,
     FilterQuality filterQuality = FilterQuality.low,
   });
-  @Deprecated(
-    'Use a clip and canvas operations directly (See RenderPhysicalModel). '
-    'This feature was deprecated after v3.1.0-0.0.pre.',
-  )
-  PhysicalShapeEngineLayer pushPhysicalShape({
-    required Path path,
-    required double elevation,
-    required Color color,
-    Color? shadowColor,
-    Clip clipBehavior = Clip.none,
-    PhysicalShapeEngineLayer? oldLayer,
-  });
   void addRetained(EngineLayer retainedLayer);
   void pop();
   void addPerformanceOverlay(int enabledOptions, Rect bounds);
diff --git a/lib/web_ui/lib/geometry.dart b/lib/web_ui/lib/geometry.dart
index 7d17c73f14131322c56d1428f68e6aaa4d33af01..ff5abf31bf51de5fc7c4210905b04061d8b8c838 100644
--- a/lib/web_ui/lib/geometry.dart
+++ b/lib/web_ui/lib/geometry.dart
@@ -6,10 +6,12 @@
 // documentation of APIs.
 part of ui;
 
+double toDegrees(double radians) {
+  return radians * 180 / math.pi;
+}
+
 abstract class OffsetBase {
-  const OffsetBase(this._dx, this._dy)
-      : assert(_dx != null),
-        assert(_dy != null);
+  const OffsetBase(this._dx, this._dy);
 
   final double _dx;
   final double _dy;
@@ -57,7 +59,6 @@ class Offset extends OffsetBase {
   Offset operator %(double operand) => Offset(dx % operand, dy % operand);
   Rect operator &(Size other) => Rect.fromLTWH(dx, dy, other.width, other.height);
   static Offset? lerp(Offset? a, Offset? b, double t) {
-    assert(t != null);
     if (b == null) {
       if (a == null) {
         return null;
@@ -148,7 +149,6 @@ class Size extends OffsetBase {
 
   Size get flipped => Size(height, width);
   static Size? lerp(Size? a, Size? b, double t) {
-    assert(t != null);
     if (b == null) {
       if (a == null) {
         return null;
@@ -180,11 +180,7 @@ class Size extends OffsetBase {
 }
 
 class Rect {
-  const Rect.fromLTRB(this.left, this.top, this.right, this.bottom)
-      : assert(left != null),
-        assert(top != null),
-        assert(right != null),
-        assert(bottom != null);
+  const Rect.fromLTRB(this.left, this.top, this.right, this.bottom);
 
   const Rect.fromLTWH(double left, double top, double width, double height)
       : this.fromLTRB(left, top, left + width, top + height);
@@ -291,7 +287,6 @@ class Rect {
   }
 
   static Rect? lerp(Rect? a, Rect? b, double t) {
-    assert(t != null);
     if (b == null) {
       if (a == null) {
         return null;
@@ -368,7 +363,6 @@ class Radius {
   Radius operator ~/(double operand) => Radius.elliptical((x ~/ operand).toDouble(), (y ~/ operand).toDouble());
   Radius operator %(double operand) => Radius.elliptical(x % operand, y % operand);
   static Radius? lerp(Radius? a, Radius? b, double t) {
-    assert(t != null);
     if (b == null) {
       if (a == null) {
         return null;
@@ -566,19 +560,7 @@ class RRect {
     this.blRadiusX = 0.0,
     this.blRadiusY = 0.0,
     bool uniformRadii = false,
-  })  : assert(left != null),
-        assert(top != null),
-        assert(right != null),
-        assert(bottom != null),
-        assert(tlRadiusX != null),
-        assert(tlRadiusY != null),
-        assert(trRadiusX != null),
-        assert(trRadiusY != null),
-        assert(brRadiusX != null),
-        assert(brRadiusY != null),
-        assert(blRadiusX != null),
-        assert(blRadiusY != null),
-        assert(tlRadiusX >= 0),
+  })  : assert(tlRadiusX >= 0),
         assert(tlRadiusY >= 0),
         assert(trRadiusX >= 0),
         assert(trRadiusY >= 0),
@@ -832,7 +814,6 @@ class RRect {
   }
 
   static RRect? lerp(RRect? a, RRect? b, double t) {
-    assert(t != null);
     if (b == null) {
       if (a == null) {
         return null;
diff --git a/lib/web_ui/lib/initialization.dart b/lib/web_ui/lib/initialization.dart
index 9412fb86b4de499e0711b94a5262e177e517a972..43dc09e7bd0ca7f4aca03b11600aa5e6301d9560 100644
--- a/lib/web_ui/lib/initialization.dart
+++ b/lib/web_ui/lib/initialization.dart
@@ -23,125 +23,88 @@
 
 part of ui;
 
-/// Performs one-time initialization of the web environment that supports the
-/// Flutter framework.
-///
-/// This is only available on the Web, as native Flutter configures the
-/// environment in the native embedder.
-Future<void> webOnlyInitializePlatform() async {
-  await engine.initializeEngine();
-}
-
-/// Initializes essential bits of the engine before it fully initializes.
-/// When [didCreateEngineInitializer] is set, it delegates engine initialization
-/// and app startup to the programmer.
-/// Else, it immediately triggers the full engine + app bootstrap.
-///
-/// This method is called by the flutter_tools package, from the entrypoint that
-/// it generates around the main method provided by the programmer. See:
-/// * https://github.com/flutter/flutter/blob/2bd3e0d914854aa8c12e933f25c5fd8532ae5571/packages/flutter_tools/lib/src/build_system/targets/web.dart#L135-L163
-/// * https://github.com/flutter/flutter/blob/61fb2de52c7bdac19b7f2f74eaf3f11237e1e91d/packages/flutter_tools/lib/src/isolated/resident_web_runner.dart#L460-L485
-///
-/// This function first calls [engine.initializeEngineServices] so the engine
-/// can prepare the js-interop layer that is used by web apps (instead of the
-/// old `ui.webOnlyFoo` methods/getters).
-///
-/// It then creates a JsObject that is passed to the [didCreateEngineInitializer]
-/// JS callback, to delegate bootstrapping the app to the programmer.
-///
-/// If said callback is not defined, this assumes that the Flutter Web app is
-/// initializing "automatically", as was normal before this feature was
-/// introduced. This will immediately run the initEngine and runApp methods
-/// (via [engine.AppBootstrap.now]).
-///
-/// This is the only bit of `dart:ui` that should be directly called by Flutter
-/// web apps. Everything else should go through the JS-interop layer created in
-/// `engine.warmup`.
-///
-/// This method should NOT trigger the download of any additional resources
-/// (except when the app is in "autoStart" mode).
+// TODO(mdebbar): Deprecate this and remove it.
+// https://github.com/flutter/flutter/issues/127395
 Future<void> webOnlyWarmupEngine({
-  Function? registerPlugins,
-  Function? runApp,
-}) async {
-  // Create the object that knows how to bootstrap an app from JS and Dart.
-  final engine.AppBootstrap bootstrap = engine.AppBootstrap(
-    initializeEngine: ([engine.JsFlutterConfiguration? configuration]) async {
-      await engine.initializeEngineServices(jsConfiguration: configuration);
-    }, runApp: () async {
-      if (registerPlugins != null) {
-        registerPlugins();
-      }
-      await engine.initializeEngineUi();
-      if (runApp != null) {
-        runApp();
-      }
-    },
+  VoidCallback? registerPlugins,
+  VoidCallback? runApp,
+}) {
+  assert(() {
+    engine.printWarning(
+      'The webOnlyWarmupEngine API is deprecated and will be removed in a '
+      'future release. Please use `bootstrapEngine` from `dart:ui_web` instead.',
+    );
+    return true;
+  }());
+  return ui_web.bootstrapEngine(
+    registerPlugins: registerPlugins,
+    runApp: runApp,
   );
+}
 
-  // Should the app "autoStart"?
-  bool autoStart = true;
-  if (engine.flutter != null && engine.loader != null) {
-    autoStart = engine.didCreateEngineInitializer == null;
-  }
-  if (autoStart) {
-    // The user does not want control of the app, bootstrap immediately.
-    engine.domWindow.console.debug('Flutter Web Bootstrap: Auto.');
-    await bootstrap.autoStart();
-  } else {
-    // Yield control of the bootstrap procedure to the user.
-    engine.domWindow.console.debug('Flutter Web Bootstrap: Programmatic.');
-    engine.didCreateEngineInitializer!(bootstrap.prepareEngineInitializer());
-  }
+// TODO(mdebbar): Deprecate this and remove it.
+// https://github.com/flutter/flutter/issues/127395
+bool get debugEmulateFlutterTesterEnvironment {
+  assert(() {
+    engine.printWarning(
+      'The debugEmulateFlutterTesterEnvironment getter is deprecated and will '
+      'be removed in a future release. Please use '
+      '`debugEmulateFlutterTesterEnvironment` from `dart:ui_web` instead.',
+    );
+    return true;
+  }());
+  return ui_web.debugEmulateFlutterTesterEnvironment;
 }
 
-/// Emulates the `flutter test` environment.
-///
-/// When set to true, the engine will emulate a specific screen size, and always
-/// use the "Ahem" font to reduce test flakiness and dependence on the test
-/// environment.
-bool get debugEmulateFlutterTesterEnvironment =>
-    _debugEmulateFlutterTesterEnvironment;
+// TODO(mdebbar): Deprecate this and remove it.
+// https://github.com/flutter/flutter/issues/127395
 set debugEmulateFlutterTesterEnvironment(bool value) {
-  _debugEmulateFlutterTesterEnvironment = value;
-  if (_debugEmulateFlutterTesterEnvironment) {
-    const Size logicalSize = Size(800.0, 600.0);
-    engine.window.webOnlyDebugPhysicalSizeOverride =
-        logicalSize * window.devicePixelRatio;
-  }
-  engine.debugDisableFontFallbacks = value;
+  assert(() {
+    engine.printWarning(
+      'The debugEmulateFlutterTesterEnvironment setter is deprecated and will '
+      'be removed in a future release. Please use '
+      '`debugEmulateFlutterTesterEnvironment` from `dart:ui_web` instead.',
+    );
+    return true;
+  }());
+  ui_web.debugEmulateFlutterTesterEnvironment = value;
 }
 
-bool _debugEmulateFlutterTesterEnvironment = false;
-
-/// Provides the asset manager.
-// TODO(yjbanov): this function should not return a private type. Instead, we
-//                should create a public interface for the returned value that's
-//                implemented by the engine.
-//                https://github.com/flutter/flutter/issues/100394
-engine.AssetManager get webOnlyAssetManager => engine.assetManager;
-
-/// Sets the handler that forwards platform messages to web plugins.
-///
-/// This function exists because unlike mobile, on the web plugins are also
-/// implemented using Dart code, and that code needs a way to receive messages.
-void webOnlySetPluginHandler(Future<void> Function(String, ByteData?, PlatformMessageResponseCallback?) handler) {
-  engine.pluginMessageCallHandler = handler;
+// TODO(mdebbar): Deprecate this and remove it.
+// https://github.com/flutter/flutter/issues/127395
+ui_web.AssetManager get webOnlyAssetManager {
+  assert(() {
+    engine.printWarning(
+      'The webOnlyAssetManager getter is deprecated and will be removed in a '
+      'future release. Please use `assetManager` from `dart:ui_web` instead.',
+    );
+    return true;
+  }());
+  return ui_web.assetManager;
 }
 
-/// A registry for factories that create platform views.
-class PlatformViewRegistry {
-  /// Register [viewTypeId] as being creating by the given [viewFactory].
-  /// [viewFactory] can be any function that takes an integer and returns an
-  /// `HTMLElement` DOM object.
-  bool registerViewFactory(String viewTypeId,
-      Object Function(int viewId) viewFactory,
-      {bool isVisible = true}) {
-    // TODO(web): Deprecate this once there's another way of calling `registerFactory` (js interop?)
-    return engine.platformViewManager
-        .registerFactory(viewTypeId, viewFactory, isVisible: isVisible);
-  }
+// TODO(mdebbar): Deprecate this and remove it.
+// https://github.com/flutter/flutter/issues/127395
+void webOnlySetPluginHandler(PlatformMessageCallback handler) {
+  assert(() {
+    engine.printWarning(
+      'The webOnlySetPluginHandler API is deprecated and will be removed in a '
+      'future release. Please use `setPluginHandler` from `dart:ui_web` instead.',
+    );
+    return true;
+  }());
+  ui_web.setPluginHandler(handler);
 }
 
-/// The platform view registry for this app.
-final PlatformViewRegistry platformViewRegistry = PlatformViewRegistry();
+// TODO(mdebbar): Deprecate this and remove it.
+// https://github.com/flutter/flutter/issues/127395
+ui_web.PlatformViewRegistry get platformViewRegistry {
+  assert(() {
+    engine.printWarning(
+      'The platformViewRegistry getter is deprecated and will be removed in a '
+      'future release. Please import it from `dart:ui_web` instead.',
+    );
+    return true;
+  }());
+  return ui_web.platformViewRegistry;
+}
diff --git a/lib/web_ui/lib/key.dart b/lib/web_ui/lib/key.dart
index 64934d59b098965adb3e5aaa645af8e01e33e4f4..35fbf42d9a5a08f7d9c33359bf5ceeb6db2b08f6 100644
--- a/lib/web_ui/lib/key.dart
+++ b/lib/web_ui/lib/key.dart
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-
 part of ui;
 
 /// The type of a key event.
@@ -15,7 +14,47 @@ enum KeyEventType {
   up,
 
   /// The key is held, causing a repeated key input.
-  repeat,
+  repeat;
+
+  String get label {
+    return switch (this) {
+      down => 'Key Down',
+      up => 'Key Up',
+      repeat => 'Key Repeat',
+    };
+  }
+}
+
+/// The source device for the key event.
+///
+/// Not all platforms supply an accurate type.
+// Must match the KeyEventDeviceType enum in ui/window/key_data.h.
+enum KeyEventDeviceType {
+  /// The device is a keyboard.
+  keyboard,
+
+  /// The device is a directional pad on something like a television remote
+  /// control or similar.
+  directionalPad,
+
+  /// The device is a gamepad button
+  gamepad,
+
+  /// The device is a joystick button
+  joystick,
+
+  /// The device is a device connected to an HDMI bus.
+  hdmi;
+
+  String get label {
+    return switch (this) {
+      keyboard => 'Keyboard',
+      directionalPad => 'Directional Pad',
+      gamepad => 'Gamepad',
+      joystick => 'Joystick',
+      hdmi => 'HDMI',
+    };
+  }
 }
 
 /// Information about a key event.
@@ -28,17 +67,22 @@ class KeyData {
     required this.logical,
     required this.character,
     required this.synthesized,
+    this.deviceType = KeyEventDeviceType.keyboard,
   });
 
   /// Time of event dispatch, relative to an arbitrary timeline.
   ///
-  /// For [KeyEventType.synchronize] and [KeyEventType.cancel] events, the [timeStamp]
-  /// might not be the actual time that the key press or release happens.
+  /// For synthesized events, the [timeStamp] might not be the actual time that
+  /// the key press or release happens.
   final Duration timeStamp;
 
   /// The type of the event.
   final KeyEventType type;
 
+  /// Describes what type of device (keyboard, directional pad, etc.) this event
+  /// originated from.
+  final KeyEventDeviceType deviceType;
+
   /// The key code for the physical key that has changed.
   final int physical;
 
@@ -50,29 +94,31 @@ class KeyData {
   /// Ignored for up events.
   final String? character;
 
-  /// If [synthesized] is true, this event does not correspond to a native event.
+  /// If [synthesized] is true, this event does not correspond to a native
+  /// event.
   ///
   /// Although most of Flutter's keyboard events are transformed from native
   /// events, some events are not based on native events, and are synthesized
-  /// only to conform Flutter's key event model (as documented in
-  /// the `HardwareKeyboard` class in the framework).
+  /// only to conform Flutter's key event model (as documented in the
+  /// `HardwareKeyboard` class in the framework).
   ///
   /// For example, some key downs or ups might be lost when the window loses
-  /// focus. Some platforms provides ways to query whether a key is being held.
-  /// If Flutter detects an inconsistency between the state Flutter records and
-  /// the state returned by the system, Flutter will synthesize a corresponding
-  /// event to synchronize the state without breaking the event model.
+  /// focus. Some platforms provide ways to query whether a key is being held.
+  /// If the embedder detects an inconsistency between its internal record and
+  /// the state returned by the system, the embedder will synthesize a
+  /// corresponding event to synchronize the state without breaking the event
+  /// model.
   ///
-  /// As another example, macOS treats CapsLock in a special way by sending
-  /// down and up events at the down of alterate presses to indicate the
-  /// direction in which the lock is toggled instead of that the physical key is
-  /// going. Flutter normalizes the behavior by converting a native down event
-  /// into a down event followed immediately by a synthesized up event, and
-  /// the native up event also into a down event followed immediately by a
+  /// As another example, macOS treats CapsLock in a special way by sending down
+  /// and up events at the down of alternate presses to indicate the direction
+  /// in which the lock is toggled instead of that the physical key is going. A
+  /// macOS embedder should normalize the behavior by converting a native down
+  /// event into a down event followed immediately by a synthesized up event,
+  /// and the native up event also into a down event followed immediately by a
   /// synthesized up event.
   ///
-  /// Synthesized events do not have a trustworthy [timeStamp], and should not be
-  /// processed as if the key actually went down or up at the time of the
+  /// Synthesized events do not have a trustworthy [timeStamp], and should not
+  /// be processed as if the key actually went down or up at the time of the
   /// callback.
   ///
   /// [KeyRepeatEvent] is never synthesized.
@@ -95,8 +141,22 @@ class KeyData {
           return ' (Unprintable)';
         case 0x002:
           return ' (Flutter)';
+        case 0x011:
+          return ' (Android)';
+        case 0x012:
+          return ' (Fuchsia)';
+        case 0x013:
+          return ' (iOS)';
+        case 0x014:
+          return ' (macOS)';
+        case 0x015:
+          return ' (GTK)';
+        case 0x016:
+          return ' (Windows)';
         case 0x017:
           return ' (Web)';
+        case 0x018:
+          return ' (GLFW)';
       }
       return '';
     })();
@@ -105,7 +165,7 @@ class KeyData {
 
   String? _escapeCharacter() {
     if (character == null) {
-      return character ?? '<none>';
+      return '<none>';
     }
     switch (character!) {
       case '\n':
@@ -133,29 +193,24 @@ class KeyData {
   }
 
   @override
-  String toString() => 'KeyData(type: ${_typeToString(type)}, physical: 0x${physical.toRadixString(16)}, '
-    'logical: ${_logicalToString()}, character: ${_escapeCharacter()}${_quotedCharCode()}${synthesized ? ', synthesized' : ''})';
+  String toString() {
+    return 'KeyData(${type.label}, '
+           'physical: 0x${physical.toRadixString(16)}, '
+           'logical: ${_logicalToString()}, '
+           'character: ${_escapeCharacter()}${_quotedCharCode()}'
+           '${synthesized ? ', synthesized' : ''})';
+  }
 
   /// Returns a complete textual description of the information in this object.
   String toStringFull() {
     return '$runtimeType('
-            'type: ${_typeToString(type)}, '
-            'timeStamp: $timeStamp, '
-            'physical: 0x${physical.toRadixString(16)}, '
-            'logical: 0x${logical.toRadixString(16)}, '
-            'character: $character, '
-            'synthesized: $synthesized'
+           'type: ${type.label}, '
+           'deviceType: ${deviceType.label}, '
+           'timeStamp: $timeStamp, '
+           'physical: 0x${physical.toRadixString(16)}, '
+           'logical: 0x${logical.toRadixString(16)}, '
+           'character: ${_escapeCharacter()}, '
+           'synthesized: $synthesized'
            ')';
   }
-
-  static String _typeToString(KeyEventType type) {
-    switch (type) {
-      case KeyEventType.up:
-        return 'up';
-      case KeyEventType.down:
-        return 'down';
-      case KeyEventType.repeat:
-        return 'repeat';
-    }
-  }
 }
diff --git a/lib/web_ui/lib/natives.dart b/lib/web_ui/lib/natives.dart
index 731e36d07f475c22b8d4d1d48b60dee771e81fb8..37ba2b7efcae9152ca641581906cfc5ffba2d885 100644
--- a/lib/web_ui/lib/natives.dart
+++ b/lib/web_ui/lib/natives.dart
@@ -12,14 +12,7 @@ class DartPluginRegistrant {
   /// isolate. This can safely be executed multiple times on the same isolate,
   /// but should not be called on the Root isolate.
   static void ensureInitialized() {
-    throw UnimplementedError('`ensureInitialized` is not implemented on the web.');
+    throw UnimplementedError(
+        '`ensureInitialized` is not implemented on the web.');
   }
 }
-
-
-List<int> saveCompilationTrace() {
-  if (engine.assertionsEnabled) {
-    throw UnimplementedError('saveCompilationTrace is not implemented on the web.');
-  }
-  throw UnimplementedError();
-}
diff --git a/lib/web_ui/lib/painting.dart b/lib/web_ui/lib/painting.dart
index 0d602c10fc3b4ec341dcaee8aa86059fce4d7298..c050e43dec6119e36dfb0dd2956f996fde05c583 100644
--- a/lib/web_ui/lib/painting.dart
+++ b/lib/web_ui/lib/painting.dart
@@ -5,20 +5,6 @@
 // For documentation see https://github.com/flutter/engine/blob/main/lib/ui/painting.dart
 part of ui;
 
-// ignore: unused_element, Used in Shader assert.
-bool _offsetIsValid(Offset offset) {
-  assert(offset != null, 'Offset argument was null.');
-  assert(!offset.dx.isNaN && !offset.dy.isNaN, 'Offset argument contained a NaN value.');
-  return true;
-}
-
-// ignore: unused_element, Used in Shader assert.
-bool _matrix4IsValid(Float32List matrix4) {
-  assert(matrix4 != null, 'Matrix4 argument was null.');
-  assert(matrix4.length == 16, 'Matrix4 must have 16 entries.');
-  return true;
-}
-
 void _validateColorStops(List<Color> colors, List<double>? colorStops) {
   if (colorStops == null) {
     if (colors.length != 2) {
@@ -93,7 +79,6 @@ class Color {
   }
 
   static Color? lerp(Color? a, Color? b, double t) {
-    assert(t != null);
     if (b == null) {
       if (a == null) {
         return null;
@@ -145,7 +130,6 @@ class Color {
   }
 
   static int getAlphaFromOpacity(double opacity) {
-    assert(opacity != null);
     return (clampDouble(opacity, 0.0, 1.0) * 255).round();
   }
 
@@ -233,7 +217,6 @@ enum Clip {
 
 abstract class Paint {
   factory Paint() => engine.renderer.createPaint();
-  static bool enableDithering = false;
   BlendMode get blendMode;
   set blendMode(BlendMode value);
   PaintingStyle get style;
@@ -276,7 +259,7 @@ abstract class Shader {
   bool get debugDisposed;
 }
 
-abstract class Gradient extends Shader {
+abstract class Gradient implements Shader {
   factory Gradient.linear(
     Offset from,
     Offset to,
@@ -355,6 +338,8 @@ abstract class Image {
 
   List<StackTrace>? debugGetOpenHandleStackTraces() => null;
 
+  ColorSpace get colorSpace => ColorSpace.sRGB;
+
   @override
   String toString() => '[$width\u00D7$height]';
 }
@@ -379,8 +364,7 @@ class MaskFilter {
   const MaskFilter.blur(
     this._style,
     this._sigma,
-  )   : assert(_style != null),
-        assert(_sigma != null);
+  );
 
   final BlurStyle _style;
   final double _sigma;
@@ -401,6 +385,7 @@ class MaskFilter {
   String toString() => 'MaskFilter.blur($_style, ${_sigma.toStringAsFixed(1)})';
 }
 
+// This needs to be kept in sync with the "_FilterQuality" enum in skwasm's canvas.cpp
 enum FilterQuality {
   none,
   low,
@@ -436,6 +421,12 @@ class ImageFilter {
     engine.renderer.composeImageFilters(outer: outer, inner: inner);
 }
 
+enum ColorSpace {
+  sRGB,
+  extendedSRGB,
+}
+
+// This must be kept in sync with the `ImageByteFormat` enum in Skwasm's surface.cpp.
 enum ImageByteFormat {
   rawRgba,
   rawStraightRgba,
@@ -443,9 +434,11 @@ enum ImageByteFormat {
   png,
 }
 
+// This must be kept in sync with the `PixelFormat` enum in Skwasm's image.cpp.
 enum PixelFormat {
   rgba8888,
   bgra8888,
+  rgbaFloat32,
 }
 
 typedef ImageDecoderCallback = void Function(Image result);
@@ -491,9 +484,58 @@ Future<Codec> instantiateImageCodecFromBuffer(
   targetHeight: targetHeight,
   allowUpscaling: allowUpscaling);
 
-Future<Codec> webOnlyInstantiateImageCodecFromUrl(Uri uri,
-  {engine.WebOnlyImageCodecChunkCallback? chunkCallback}) =>
-  engine.renderer.instantiateImageCodecFromUrl(uri, chunkCallback: chunkCallback);
+Future<Codec> instantiateImageCodecWithSize(
+  ImmutableBuffer buffer, {
+  TargetImageSizeCallback? getTargetSize,
+}) async {
+  if (getTargetSize == null) {
+    return engine.renderer.instantiateImageCodec(buffer._list!);
+  } else {
+    final Codec codec = await engine.renderer.instantiateImageCodec(buffer._list!);
+    try {
+      final FrameInfo info = await codec.getNextFrame();
+      try {
+        final int width = info.image.width;
+        final int height = info.image.height;
+        final TargetImageSize targetSize = getTargetSize(width, height);
+        return engine.renderer.instantiateImageCodec(buffer._list!,
+            targetWidth: targetSize.width, targetHeight: targetSize.height, allowUpscaling: false);
+      } finally {
+        info.image.dispose();
+      }
+    } finally {
+      codec.dispose();
+    }
+  }
+}
+
+typedef TargetImageSizeCallback = TargetImageSize Function(int intrinsicWidth, int intrinsicHeight);
+
+class TargetImageSize {
+  const TargetImageSize({this.width, this.height})
+      : assert(width == null || width > 0),
+        assert(height == null || height > 0);
+
+  final int? width;
+  final int? height;
+}
+
+// TODO(mdebbar): Deprecate this and remove it.
+// https://github.com/flutter/flutter/issues/127395
+Future<Codec> webOnlyInstantiateImageCodecFromUrl(
+  Uri uri, {
+  ui_web.ImageCodecChunkCallback? chunkCallback,
+}) {
+  assert(() {
+    engine.printWarning(
+      'The webOnlyInstantiateImageCodecFromUrl API is deprecated and will be '
+      'removed in a future release. Please use `createImageCodecFromUrl` from '
+      '`dart:ui_web` instead.',
+    );
+    return true;
+  }());
+  return ui_web.createImageCodecFromUrl(uri, chunkCallback: chunkCallback);
+}
 
 void decodeImageFromList(Uint8List list, ImageDecoderCallback callback) {
   _decodeImageFromListAsync(list, callback);
@@ -521,10 +563,10 @@ Future<Codec> createBmp(
   switch (format) {
     case PixelFormat.bgra8888:
       swapRedBlue = true;
-      break;
     case PixelFormat.rgba8888:
       swapRedBlue = false;
-      break;
+    case PixelFormat.rgbaFloat32:
+      throw UnimplementedError('RGB conversion from rgbaFloat32 data is not implemented');
   }
 
   // See https://en.wikipedia.org/wiki/BMP_file_format for format examples.
@@ -615,9 +657,7 @@ class Shadow {
     this.color = const Color(_kColorDefault),
     this.offset = Offset.zero,
     this.blurRadius = 0.0,
-  })  : assert(color != null, 'Text shadow color was null.'),
-        assert(offset != null, 'Text shadow offset was null.'),
-        assert(blurRadius >= 0.0, 'Text shadow blur radius should be non-negative.');
+  })  : assert(blurRadius >= 0.0, 'Text shadow blur radius should be non-negative.');
 
   static const int _kColorDefault = 0xFF000000;
   final Color color;
@@ -645,7 +685,6 @@ class Shadow {
   }
 
   static Shadow? lerp(Shadow? a, Shadow? b, double t) {
-    assert(t != null);
     if (b == null) {
       if (a == null) {
         return null;
@@ -666,7 +705,6 @@ class Shadow {
   }
 
   static List<Shadow>? lerpList(List<Shadow>? a, List<Shadow>? b, double t) {
-    assert(t != null);
     if (a == null && b == null) {
       return null;
     }
@@ -704,10 +742,20 @@ class Shadow {
   String toString() => 'TextShadow($color, $offset, $blurRadius)';
 }
 
-abstract class ImageShader extends Shader {
-  factory ImageShader(Image image, TileMode tmx, TileMode tmy, Float64List matrix4, {
+abstract class ImageShader implements Shader {
+  factory ImageShader(
+    Image image,
+    TileMode tmx,
+    TileMode tmy,
+    Float64List matrix4, {
     FilterQuality? filterQuality,
-  }) => engine.renderer.createImageShader(image, tmx, tmy, matrix4, filterQuality);
+  }) => engine.renderer.createImageShader(
+    image,
+    tmx,
+    tmy,
+    matrix4,
+    filterQuality
+  );
 
   @override
   void dispose();
diff --git a/lib/web_ui/lib/path_metrics.dart b/lib/web_ui/lib/path_metrics.dart
index 5cf8df9552641a72308485587a7bedb57709dc0d..f7f509e72d1a70634b74c95894444b3c5d674276 100644
--- a/lib/web_ui/lib/path_metrics.dart
+++ b/lib/web_ui/lib/path_metrics.dart
@@ -26,9 +26,7 @@ abstract class PathMetric {
 }
 
 class Tangent {
-  const Tangent(this.position, this.vector)
-      : assert(position != null),
-        assert(vector != null);
+  const Tangent(this.position, this.vector);
   factory Tangent.fromAngle(Offset position, double angle) {
     return Tangent(position, Offset(math.cos(angle), math.sin(angle)));
   }
diff --git a/lib/web_ui/lib/platform_dispatcher.dart b/lib/web_ui/lib/platform_dispatcher.dart
index 6d508576df1ccef430a6d00864120e8b130c0e99..9180ef6b22869a6da557e55dc9bbba6437c57b7f 100644
--- a/lib/web_ui/lib/platform_dispatcher.dart
+++ b/lib/web_ui/lib/platform_dispatcher.dart
@@ -5,15 +5,15 @@
 part of ui;
 
 typedef VoidCallback = void Function();
+typedef ViewFocusChangeCallback = void Function(ViewFocusEvent viewFocusEvent);
 typedef FrameCallback = void Function(Duration duration);
 typedef TimingsCallback = void Function(List<FrameTiming> timings);
 typedef PointerDataPacketCallback = void Function(PointerDataPacket packet);
 typedef KeyDataCallback = bool Function(KeyData data);
-typedef SemanticsActionCallback = void Function(int id, SemanticsAction action, ByteData? args);
+typedef SemanticsActionEventCallback = void Function(SemanticsActionEvent action);
 typedef PlatformMessageResponseCallback = void Function(ByteData? data);
 typedef PlatformMessageCallback = void Function(
     String name, ByteData? data, PlatformMessageResponseCallback? callback);
-typedef PlatformConfigurationChangedCallback = void Function(PlatformConfiguration configuration);
 typedef ErrorCallback = bool Function(Object exception, StackTrace stackTrace);
 
 // ignore: avoid_classes_with_only_static_members
@@ -27,15 +27,29 @@ class RootIsolateToken {
 abstract class PlatformDispatcher {
   static PlatformDispatcher get instance => engine.EnginePlatformDispatcher.instance;
 
-  PlatformConfiguration get configuration;
   VoidCallback? get onPlatformConfigurationChanged;
   set onPlatformConfigurationChanged(VoidCallback? callback);
 
+  Iterable<Display> get displays;
+
   Iterable<FlutterView> get views;
 
+  FlutterView? view({required int id});
+
+  FlutterView? get implicitView;
+
   VoidCallback? get onMetricsChanged;
   set onMetricsChanged(VoidCallback? callback);
 
+  ViewFocusChangeCallback? get onViewFocusChange;
+  set onViewFocusChange(ViewFocusChangeCallback? callback);
+
+  void requestViewFocusChange({
+    required int viewId,
+    required ViewFocusState state,
+    required ViewFocusDirection direction,
+  });
+
   FrameCallback? get onBeginFrame;
   set onBeginFrame(FrameCallback? callback);
 
@@ -76,7 +90,7 @@ abstract class PlatformDispatcher {
 
   void scheduleFrame();
 
-  void render(Scene scene, [FlutterView view]);
+  void scheduleWarmUpFrame({required VoidCallback beginFrame, required VoidCallback drawFrame});
 
   AccessibilityFeatures get accessibilityFeatures;
 
@@ -95,18 +109,18 @@ abstract class PlatformDispatcher {
 
   Locale get locale;
 
-  List<Locale> get locales => configuration.locales;
+  List<Locale> get locales;
 
   Locale? computePlatformResolvedLocale(List<Locale> supportedLocales);
 
   VoidCallback? get onLocaleChanged;
   set onLocaleChanged(VoidCallback? callback);
 
-  String get initialLifecycleState => 'AppLifecycleState.resumed';
+  String get initialLifecycleState => '';
 
-  bool get alwaysUse24HourFormat => configuration.alwaysUse24HourFormat;
+  bool get alwaysUse24HourFormat;
 
-  double get textScaleFactor => configuration.textScaleFactor;
+  double get textScaleFactor;
 
   bool get nativeSpellCheckServiceDefined => false;
 
@@ -115,23 +129,23 @@ abstract class PlatformDispatcher {
   VoidCallback? get onTextScaleFactorChanged;
   set onTextScaleFactorChanged(VoidCallback? callback);
 
-  Brightness get platformBrightness => configuration.platformBrightness;
+  Brightness get platformBrightness;
 
   VoidCallback? get onPlatformBrightnessChanged;
   set onPlatformBrightnessChanged(VoidCallback? callback);
 
-  String? get systemFontFamily => configuration.systemFontFamily;
+  String? get systemFontFamily;
 
   VoidCallback? get onSystemFontFamilyChanged;
   set onSystemFontFamilyChanged(VoidCallback? callback);
 
-  bool get semanticsEnabled => configuration.semanticsEnabled;
+  bool get semanticsEnabled;
 
   VoidCallback? get onSemanticsEnabledChanged;
   set onSemanticsEnabledChanged(VoidCallback? callback);
 
-  SemanticsActionCallback? get onSemanticsAction;
-  set onSemanticsAction(SemanticsActionCallback? callback);
+  SemanticsActionEventCallback? get onSemanticsActionEvent;
+  set onSemanticsActionEvent(SemanticsActionEventCallback? callback);
 
   ErrorCallback? get onError;
   set onError(ErrorCallback? callback);
@@ -142,107 +156,8 @@ abstract class PlatformDispatcher {
 
   VoidCallback? get onFrameDataChanged => null;
   set onFrameDataChanged(VoidCallback? callback) {}
-}
-
-class PlatformConfiguration {
-  const PlatformConfiguration({
-    this.accessibilityFeatures = const engine.EngineAccessibilityFeatures(0),
-    this.alwaysUse24HourFormat = false,
-    this.semanticsEnabled = false,
-    this.platformBrightness = Brightness.light,
-    this.textScaleFactor = 1.0,
-    this.locales = const <Locale>[],
-    this.defaultRouteName = '/',
-    this.systemFontFamily,
-  });
-
-  PlatformConfiguration copyWith({
-    AccessibilityFeatures? accessibilityFeatures,
-    bool? alwaysUse24HourFormat,
-    bool? semanticsEnabled,
-    Brightness? platformBrightness,
-    double? textScaleFactor,
-    List<Locale>? locales,
-    String? defaultRouteName,
-    String? systemFontFamily,
-  }) {
-    return PlatformConfiguration(
-      accessibilityFeatures: accessibilityFeatures ?? this.accessibilityFeatures,
-      alwaysUse24HourFormat: alwaysUse24HourFormat ?? this.alwaysUse24HourFormat,
-      semanticsEnabled: semanticsEnabled ?? this.semanticsEnabled,
-      platformBrightness: platformBrightness ?? this.platformBrightness,
-      textScaleFactor: textScaleFactor ?? this.textScaleFactor,
-      locales: locales ?? this.locales,
-      defaultRouteName: defaultRouteName ?? this.defaultRouteName,
-      systemFontFamily: systemFontFamily ?? this.systemFontFamily,
-    );
-  }
 
-  final AccessibilityFeatures accessibilityFeatures;
-  final bool alwaysUse24HourFormat;
-  final bool semanticsEnabled;
-  final Brightness platformBrightness;
-  final double textScaleFactor;
-  final List<Locale> locales;
-  final String defaultRouteName;
-  final String? systemFontFamily;
-}
-
-class ViewConfiguration {
-  const ViewConfiguration({
-    this.window,
-    this.devicePixelRatio = 1.0,
-    this.geometry = Rect.zero,
-    this.visible = false,
-    this.viewInsets = WindowPadding.zero,
-    this.viewPadding = WindowPadding.zero,
-    this.systemGestureInsets = WindowPadding.zero,
-    this.padding = WindowPadding.zero,
-    this.gestureSettings = const GestureSettings(),
-    this.displayFeatures = const <DisplayFeature>[],
-  });
-
-  ViewConfiguration copyWith({
-    FlutterWindow? window,
-    double? devicePixelRatio,
-    Rect? geometry,
-    bool? visible,
-    WindowPadding? viewInsets,
-    WindowPadding? viewPadding,
-    WindowPadding? systemGestureInsets,
-    WindowPadding? padding,
-    GestureSettings? gestureSettings,
-    List<DisplayFeature>? displayFeatures,
-  }) {
-    return ViewConfiguration(
-      window: window ?? this.window,
-      devicePixelRatio: devicePixelRatio ?? this.devicePixelRatio,
-      geometry: geometry ?? this.geometry,
-      visible: visible ?? this.visible,
-      viewInsets: viewInsets ?? this.viewInsets,
-      viewPadding: viewPadding ?? this.viewPadding,
-      systemGestureInsets: systemGestureInsets ?? this.systemGestureInsets,
-      padding: padding ?? this.padding,
-      gestureSettings: gestureSettings ?? this.gestureSettings,
-      displayFeatures: displayFeatures ?? this.displayFeatures,
-    );
-  }
-
-  final FlutterWindow? window;
-  final double devicePixelRatio;
-  final Rect geometry;
-  final bool visible;
-  final WindowPadding viewInsets;
-  final WindowPadding viewPadding;
-  final WindowPadding systemGestureInsets;
-  final WindowPadding padding;
-  final GestureSettings gestureSettings;
-  final List<DisplayFeature> displayFeatures;
-
-  @override
-  String toString() {
-    return '$runtimeType[window: $window, geometry: $geometry]';
-  }
+  double scaleFontSize(double unscaledFontSize);
 }
 
 enum FramePhase {
@@ -346,32 +261,68 @@ class FrameTiming {
 }
 
 enum AppLifecycleState {
+  detached,
   resumed,
   inactive,
+  hidden,
   paused,
-  detached,
 }
 
-abstract class WindowPadding {
-  const factory WindowPadding._(
+enum AppExitResponse {
+  exit,
+  cancel,
+}
+
+enum AppExitType {
+  cancelable,
+  required,
+}
+
+abstract class ViewPadding {
+  const factory ViewPadding._(
       {required double left,
       required double top,
       required double right,
-      required double bottom}) = engine.WindowPadding;
+      required double bottom}) = engine.ViewPadding;
 
   double get left;
   double get top;
   double get right;
   double get bottom;
 
-  static const WindowPadding zero = WindowPadding._(left: 0.0, top: 0.0, right: 0.0, bottom: 0.0);
+  static const ViewPadding zero = ViewPadding._(left: 0.0, top: 0.0, right: 0.0, bottom: 0.0);
 
   @override
   String toString() {
-    return 'WindowPadding(left: $left, top: $top, right: $right, bottom: $bottom)';
+    return 'ViewPadding(left: $left, top: $top, right: $right, bottom: $bottom)';
   }
 }
 
+abstract class ViewConstraints {
+  const factory ViewConstraints({
+    double minWidth,
+    double maxWidth,
+    double minHeight,
+    double maxHeight,
+  }) = engine.ViewConstraints;
+
+  factory ViewConstraints.tight(Size size) = engine.ViewConstraints.tight;
+
+  double get minWidth;
+  double get maxWidth;
+  double get minHeight;
+  double get maxHeight;
+  bool isSatisfiedBy(Size size);
+  bool get isTight;
+  ViewConstraints operator/(double factor);
+}
+
+@Deprecated(
+  'Use ViewPadding instead. '
+  'This feature was deprecated after v3.8.0-14.0.pre.',
+)
+typedef WindowPadding = ViewPadding;
+
 class DisplayFeature {
   const DisplayFeature({
     required this.bounds,
@@ -422,16 +373,14 @@ class Locale {
   const Locale(
     this._languageCode, [
     this._countryCode,
-  ])  : assert(_languageCode != null),
-        assert(_languageCode != ''),
+  ])  : assert(_languageCode != ''),
         scriptCode = null;
 
   const Locale.fromSubtags({
     String languageCode = 'und',
     this.scriptCode,
     String? countryCode,
-  })  : assert(languageCode != null),
-        assert(languageCode != ''),
+  })  : assert(languageCode != ''),
         _languageCode = languageCode,
         assert(scriptCode != ''),
         assert(countryCode != ''),
@@ -553,6 +502,7 @@ class Locale {
   @override
   int get hashCode => Object.hash(languageCode, scriptCode, countryCode);
 
+  @keepToString
   @override
   String toString() => _rawToString('_');
 
@@ -577,3 +527,66 @@ enum DartPerformanceMode {
   throughput,
   memory,
 }
+
+class SemanticsActionEvent {
+  const SemanticsActionEvent({
+    required this.type,
+    required this.viewId,
+    required this.nodeId,
+    this.arguments,
+  });
+
+  final SemanticsAction type;
+  final int viewId;
+  final int nodeId;
+  final Object? arguments;
+
+  static const Object _noArgumentPlaceholder = Object();
+
+  SemanticsActionEvent copyWith({
+    SemanticsAction? type,
+    int? viewId,
+    int? nodeId,
+    Object? arguments = _noArgumentPlaceholder,
+  }) {
+    return SemanticsActionEvent(
+      type: type ?? this.type,
+      viewId: viewId ?? this.viewId,
+      nodeId: nodeId ?? this.nodeId,
+      arguments: arguments == _noArgumentPlaceholder ? this.arguments : arguments,
+    );
+  }
+
+  @override
+  String toString() => 'SemanticsActionEvent($type, view: $viewId, node: $nodeId)';
+}
+
+final class ViewFocusEvent {
+  const ViewFocusEvent({
+    required this.viewId,
+    required this.state,
+    required this.direction,
+  });
+
+  final int viewId;
+
+  final ViewFocusState state;
+
+  final ViewFocusDirection direction;
+
+  @override
+  String toString() {
+    return 'ViewFocusEvent(viewId: $viewId, state: $state, direction: $direction)';
+  }
+}
+
+enum ViewFocusState {
+  unfocused,
+  focused,
+}
+
+enum ViewFocusDirection {
+  undefined,
+  forward,
+  backward,
+}
diff --git a/lib/web_ui/lib/platform_isolate.dart b/lib/web_ui/lib/platform_isolate.dart
new file mode 100644
index 0000000000000000000000000000000000000000..067d462b42654f567888f068d870831ae5adc513
--- /dev/null
+++ b/lib/web_ui/lib/platform_isolate.dart
@@ -0,0 +1,34 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+part of ui;
+
+/// Runs [computation] on the platform thread and returns the result.
+///
+/// This may run the computation on a separate isolate. That isolate will be
+/// reused for subsequent [runOnPlatformThread] calls. This means that global
+/// state is maintained in that isolate between calls.
+///
+/// The [computation] and any state it captures may be sent to that isolate.
+/// See [SendPort.send] for information about what types can be sent.
+///
+/// If [computation] is asynchronous (returns a `Future<R>`) then
+/// that future is awaited in the new isolate, completing the entire
+/// asynchronous computation, before returning the result.
+///
+/// If [computation] throws, the `Future` returned by this function completes
+/// with that error.
+///
+/// The [computation] function and its result (or error) must be
+/// sendable between isolates. Objects that cannot be sent include open
+/// files and sockets (see [SendPort.send] for details).
+///
+/// This method can only be invoked from the main isolate.
+///
+/// This API is currently experimental.
+Future<R> runOnPlatformThread<R>(FutureOr<R> Function() computation) =>
+    Future<R>(computation);
+
+/// Returns whether the current isolate is running on the platform thread.
+bool isRunningOnPlatformThread = true;
diff --git a/lib/web_ui/lib/pointer.dart b/lib/web_ui/lib/pointer.dart
index 254afafe5f75fb371fedfb689f120b34d3ce8b70..cd69ee6350d04e946f9d465196077ac1f205055c 100644
--- a/lib/web_ui/lib/pointer.dart
+++ b/lib/web_ui/lib/pointer.dart
@@ -36,6 +36,7 @@ enum PointerSignalKind {
 
 class PointerData {
   const PointerData({
+    this.viewId = 0,
     this.embedderId = 0,
     this.timeStamp = Duration.zero,
     this.change = PointerChange.cancel,
@@ -72,6 +73,7 @@ class PointerData {
     this.scale = 0.0,
     this.rotation = 0.0,
   });
+  final int viewId;
   final int embedderId;
   final Duration timeStamp;
   final PointerChange change;
@@ -109,7 +111,7 @@ class PointerData {
   final double rotation;
 
   @override
-  String toString() => 'PointerData(x: $physicalX, y: $physicalY)';
+  String toString() => 'PointerData(viewId: $viewId, x: $physicalX, y: $physicalY)';
   String toStringFull() {
     return '$runtimeType('
            'embedderId: $embedderId, '
@@ -145,13 +147,13 @@ class PointerData {
            'panDeltaX: $panDeltaX, '
            'panDeltaY: $panDeltaY, '
            'scale: $scale, '
-           'rotation: $rotation'
+           'rotation: $rotation, '
+           'viewId: $viewId'
            ')';
   }
 }
 
 class PointerDataPacket {
-  const PointerDataPacket({this.data = const <PointerData>[]})
-      : assert(data != null);
+  const PointerDataPacket({this.data = const <PointerData>[]});
   final List<PointerData> data;
 }
diff --git a/lib/web_ui/lib/semantics.dart b/lib/web_ui/lib/semantics.dart
index 2c4909a4986755506fb9fa2a0b1b9dc7d30ae15c..4ede9f248f4858c93a5d76902b028d9e2d9e77d4 100644
--- a/lib/web_ui/lib/semantics.dart
+++ b/lib/web_ui/lib/semantics.dart
@@ -5,7 +5,10 @@
 part of ui;
 
 class SemanticsAction {
-  const SemanticsAction._(this.index) : assert(index != null);
+  const SemanticsAction._(this.index, this.name);
+
+  final int index;
+  final String name;
 
   static const int _kTapIndex = 1 << 0;
   static const int _kLongPressIndex = 1 << 1;
@@ -30,32 +33,30 @@ class SemanticsAction {
   static const int _kMoveCursorBackwardByWordIndex = 1 << 20;
   static const int _kSetTextIndex = 1 << 21;
 
-  final int index;
+  static const SemanticsAction tap = SemanticsAction._(_kTapIndex, 'tap');
+  static const SemanticsAction longPress = SemanticsAction._(_kLongPressIndex, 'longPress');
+  static const SemanticsAction scrollLeft = SemanticsAction._(_kScrollLeftIndex, 'scrollLeft');
+  static const SemanticsAction scrollRight = SemanticsAction._(_kScrollRightIndex, 'scrollRight');
+  static const SemanticsAction scrollUp = SemanticsAction._(_kScrollUpIndex, 'scrollUp');
+  static const SemanticsAction scrollDown = SemanticsAction._(_kScrollDownIndex, 'scrollDown');
+  static const SemanticsAction increase = SemanticsAction._(_kIncreaseIndex, 'increase');
+  static const SemanticsAction decrease = SemanticsAction._(_kDecreaseIndex, 'decrease');
+  static const SemanticsAction showOnScreen = SemanticsAction._(_kShowOnScreenIndex, 'showOnScreen');
+  static const SemanticsAction moveCursorForwardByCharacter = SemanticsAction._(_kMoveCursorForwardByCharacterIndex, 'moveCursorForwardByCharacter');
+  static const SemanticsAction moveCursorBackwardByCharacter = SemanticsAction._(_kMoveCursorBackwardByCharacterIndex, 'moveCursorBackwardByCharacter');
+  static const SemanticsAction setText = SemanticsAction._(_kSetTextIndex, 'setText');
+  static const SemanticsAction setSelection = SemanticsAction._(_kSetSelectionIndex, 'setSelection');
+  static const SemanticsAction copy = SemanticsAction._(_kCopyIndex, 'copy');
+  static const SemanticsAction cut = SemanticsAction._(_kCutIndex, 'cut');
+  static const SemanticsAction paste = SemanticsAction._(_kPasteIndex, 'paste');
+  static const SemanticsAction didGainAccessibilityFocus = SemanticsAction._(_kDidGainAccessibilityFocusIndex, 'didGainAccessibilityFocus');
+  static const SemanticsAction didLoseAccessibilityFocus = SemanticsAction._(_kDidLoseAccessibilityFocusIndex, 'didLoseAccessibilityFocus');
+  static const SemanticsAction customAction = SemanticsAction._(_kCustomActionIndex, 'customAction');
+  static const SemanticsAction dismiss = SemanticsAction._(_kDismissIndex, 'dismiss');
+  static const SemanticsAction moveCursorForwardByWord = SemanticsAction._(_kMoveCursorForwardByWordIndex, 'moveCursorForwardByWord');
+  static const SemanticsAction moveCursorBackwardByWord = SemanticsAction._(_kMoveCursorBackwardByWordIndex, 'moveCursorBackwardByWord');
 
-  static const SemanticsAction tap = SemanticsAction._(_kTapIndex);
-  static const SemanticsAction longPress = SemanticsAction._(_kLongPressIndex);
-  static const SemanticsAction scrollLeft = SemanticsAction._(_kScrollLeftIndex);
-  static const SemanticsAction scrollRight = SemanticsAction._(_kScrollRightIndex);
-  static const SemanticsAction scrollUp = SemanticsAction._(_kScrollUpIndex);
-  static const SemanticsAction scrollDown = SemanticsAction._(_kScrollDownIndex);
-  static const SemanticsAction increase = SemanticsAction._(_kIncreaseIndex);
-  static const SemanticsAction decrease = SemanticsAction._(_kDecreaseIndex);
-  static const SemanticsAction showOnScreen = SemanticsAction._(_kShowOnScreenIndex);
-  static const SemanticsAction moveCursorForwardByCharacter = SemanticsAction._(_kMoveCursorForwardByCharacterIndex);
-  static const SemanticsAction moveCursorBackwardByCharacter = SemanticsAction._(_kMoveCursorBackwardByCharacterIndex);
-  static const SemanticsAction setText = SemanticsAction._(_kSetTextIndex);
-  static const SemanticsAction setSelection = SemanticsAction._(_kSetSelectionIndex);
-  static const SemanticsAction copy = SemanticsAction._(_kCopyIndex);
-  static const SemanticsAction cut = SemanticsAction._(_kCutIndex);
-  static const SemanticsAction paste = SemanticsAction._(_kPasteIndex);
-  static const SemanticsAction didGainAccessibilityFocus = SemanticsAction._(_kDidGainAccessibilityFocusIndex);
-  static const SemanticsAction didLoseAccessibilityFocus = SemanticsAction._(_kDidLoseAccessibilityFocusIndex);
-  static const SemanticsAction customAction = SemanticsAction._(_kCustomActionIndex);
-  static const SemanticsAction dismiss = SemanticsAction._(_kDismissIndex);
-  static const SemanticsAction moveCursorForwardByWord = SemanticsAction._(_kMoveCursorForwardByWordIndex);
-  static const SemanticsAction moveCursorBackwardByWord = SemanticsAction._(_kMoveCursorBackwardByWordIndex);
-
-  static const Map<int, SemanticsAction> values = <int, SemanticsAction>{
+  static const Map<int, SemanticsAction> _kActionById = <int, SemanticsAction>{
     _kTapIndex: tap,
     _kLongPressIndex: longPress,
     _kScrollLeftIndex: scrollLeft,
@@ -80,63 +81,19 @@ class SemanticsAction {
     _kSetTextIndex: setText,
   };
 
+  static List<SemanticsAction> get values => _kActionById.values.toList(growable: false);
+
+  static SemanticsAction? fromIndex(int index) => _kActionById[index];
+
   @override
-  String toString() {
-    switch (index) {
-      case _kTapIndex:
-        return 'SemanticsAction.tap';
-      case _kLongPressIndex:
-        return 'SemanticsAction.longPress';
-      case _kScrollLeftIndex:
-        return 'SemanticsAction.scrollLeft';
-      case _kScrollRightIndex:
-        return 'SemanticsAction.scrollRight';
-      case _kScrollUpIndex:
-        return 'SemanticsAction.scrollUp';
-      case _kScrollDownIndex:
-        return 'SemanticsAction.scrollDown';
-      case _kIncreaseIndex:
-        return 'SemanticsAction.increase';
-      case _kDecreaseIndex:
-        return 'SemanticsAction.decrease';
-      case _kShowOnScreenIndex:
-        return 'SemanticsAction.showOnScreen';
-      case _kMoveCursorForwardByCharacterIndex:
-        return 'SemanticsAction.moveCursorForwardByCharacter';
-      case _kMoveCursorBackwardByCharacterIndex:
-        return 'SemanticsAction.moveCursorBackwardByCharacter';
-      case _kSetSelectionIndex:
-        return 'SemanticsAction.setSelection';
-      case _kCopyIndex:
-        return 'SemanticsAction.copy';
-      case _kCutIndex:
-        return 'SemanticsAction.cut';
-      case _kPasteIndex:
-        return 'SemanticsAction.paste';
-      case _kDidGainAccessibilityFocusIndex:
-        return 'SemanticsAction.didGainAccessibilityFocus';
-      case _kDidLoseAccessibilityFocusIndex:
-        return 'SemanticsAction.didLoseAccessibilityFocus';
-      case _kCustomActionIndex:
-        return 'SemanticsAction.customAction';
-      case _kDismissIndex:
-        return 'SemanticsAction.dismiss';
-      case _kMoveCursorForwardByWordIndex:
-        return 'SemanticsAction.moveCursorForwardByWord';
-      case _kMoveCursorBackwardByWordIndex:
-        return 'SemanticsAction.moveCursorBackwardByWord';
-      case _kSetTextIndex:
-        return 'SemanticsAction.setText';
-    }
-    assert(false, 'Unhandled index: $index (0x${index.toRadixString(8).padLeft(4, "0")})');
-    return '';
-  }
+  String toString() => 'SemanticsAction.$name';
 }
 
 class SemanticsFlag {
-  const SemanticsFlag._(this.index) : assert(index != null);
+  const SemanticsFlag._(this.index, this.name);
 
   final int index;
+  final String name;
 
   static const int _kHasCheckedStateIndex = 1 << 0;
   static const int _kIsCheckedIndex = 1 << 1;
@@ -164,35 +121,39 @@ class SemanticsFlag {
   static const int _kIsSliderIndex = 1 << 23;
   static const int _kIsKeyboardKeyIndex = 1 << 24;
   static const int _kIsCheckStateMixedIndex = 1 << 25;
+  static const int _kHasExpandedStateIndex = 1 << 26;
+  static const int _kIsExpandedIndex = 1 << 27;
+
+  static const SemanticsFlag hasCheckedState = SemanticsFlag._(_kHasCheckedStateIndex, 'hasCheckedState');
+  static const SemanticsFlag isChecked = SemanticsFlag._(_kIsCheckedIndex, 'isChecked');
+  static const SemanticsFlag isSelected = SemanticsFlag._(_kIsSelectedIndex, 'isSelected');
+  static const SemanticsFlag isButton = SemanticsFlag._(_kIsButtonIndex, 'isButton');
+  static const SemanticsFlag isTextField = SemanticsFlag._(_kIsTextFieldIndex, 'isTextField');
+  static const SemanticsFlag isSlider = SemanticsFlag._(_kIsSliderIndex, 'isSlider');
+  static const SemanticsFlag isKeyboardKey = SemanticsFlag._(_kIsKeyboardKeyIndex, 'isKeyboardKey');
+  static const SemanticsFlag isReadOnly = SemanticsFlag._(_kIsReadOnlyIndex, 'isReadOnly');
+  static const SemanticsFlag isLink = SemanticsFlag._(_kIsLinkIndex, 'isLink');
+  static const SemanticsFlag isFocusable = SemanticsFlag._(_kIsFocusableIndex, 'isFocusable');
+  static const SemanticsFlag isFocused = SemanticsFlag._(_kIsFocusedIndex, 'isFocused');
+  static const SemanticsFlag hasEnabledState = SemanticsFlag._(_kHasEnabledStateIndex, 'hasEnabledState');
+  static const SemanticsFlag isEnabled = SemanticsFlag._(_kIsEnabledIndex, 'isEnabled');
+  static const SemanticsFlag isInMutuallyExclusiveGroup = SemanticsFlag._(_kIsInMutuallyExclusiveGroupIndex, 'isInMutuallyExclusiveGroup');
+  static const SemanticsFlag isHeader = SemanticsFlag._(_kIsHeaderIndex, 'isHeader');
+  static const SemanticsFlag isObscured = SemanticsFlag._(_kIsObscuredIndex, 'isObscured');
+  static const SemanticsFlag isMultiline = SemanticsFlag._(_kIsMultilineIndex, 'isMultiline');
+  static const SemanticsFlag scopesRoute = SemanticsFlag._(_kScopesRouteIndex, 'scopesRoute');
+  static const SemanticsFlag namesRoute = SemanticsFlag._(_kNamesRouteIndex, 'namesRoute');
+  static const SemanticsFlag isHidden = SemanticsFlag._(_kIsHiddenIndex, 'isHidden');
+  static const SemanticsFlag isImage = SemanticsFlag._(_kIsImageIndex, 'isImage');
+  static const SemanticsFlag isLiveRegion = SemanticsFlag._(_kIsLiveRegionIndex, 'isLiveRegion');
+  static const SemanticsFlag hasToggledState = SemanticsFlag._(_kHasToggledStateIndex, 'hasToggledState');
+  static const SemanticsFlag isToggled = SemanticsFlag._(_kIsToggledIndex, 'isToggled');
+  static const SemanticsFlag hasImplicitScrolling = SemanticsFlag._(_kHasImplicitScrollingIndex, 'hasImplicitScrolling');
+  static const SemanticsFlag isCheckStateMixed = SemanticsFlag._(_kIsCheckStateMixedIndex, 'isCheckStateMixed');
+  static const SemanticsFlag hasExpandedState = SemanticsFlag._(_kHasExpandedStateIndex, 'hasExpandedState');
+  static const SemanticsFlag isExpanded = SemanticsFlag._(_kIsExpandedIndex, 'isExpanded');
 
-  static const SemanticsFlag hasCheckedState = SemanticsFlag._(_kHasCheckedStateIndex);
-  static const SemanticsFlag isChecked = SemanticsFlag._(_kIsCheckedIndex);
-  static const SemanticsFlag isSelected = SemanticsFlag._(_kIsSelectedIndex);
-  static const SemanticsFlag isButton = SemanticsFlag._(_kIsButtonIndex);
-  static const SemanticsFlag isTextField = SemanticsFlag._(_kIsTextFieldIndex);
-  static const SemanticsFlag isSlider = SemanticsFlag._(_kIsSliderIndex);
-  static const SemanticsFlag isKeyboardKey = SemanticsFlag._(_kIsKeyboardKeyIndex);
-  static const SemanticsFlag isReadOnly = SemanticsFlag._(_kIsReadOnlyIndex);
-  static const SemanticsFlag isLink = SemanticsFlag._(_kIsLinkIndex);
-  static const SemanticsFlag isFocusable = SemanticsFlag._(_kIsFocusableIndex);
-  static const SemanticsFlag isFocused = SemanticsFlag._(_kIsFocusedIndex);
-  static const SemanticsFlag hasEnabledState = SemanticsFlag._(_kHasEnabledStateIndex);
-  static const SemanticsFlag isEnabled = SemanticsFlag._(_kIsEnabledIndex);
-  static const SemanticsFlag isInMutuallyExclusiveGroup = SemanticsFlag._(_kIsInMutuallyExclusiveGroupIndex);
-  static const SemanticsFlag isHeader = SemanticsFlag._(_kIsHeaderIndex);
-  static const SemanticsFlag isObscured = SemanticsFlag._(_kIsObscuredIndex);
-  static const SemanticsFlag isMultiline = SemanticsFlag._(_kIsMultilineIndex);
-  static const SemanticsFlag scopesRoute = SemanticsFlag._(_kScopesRouteIndex);
-  static const SemanticsFlag namesRoute = SemanticsFlag._(_kNamesRouteIndex);
-  static const SemanticsFlag isHidden = SemanticsFlag._(_kIsHiddenIndex);
-  static const SemanticsFlag isImage = SemanticsFlag._(_kIsImageIndex);
-  static const SemanticsFlag isLiveRegion = SemanticsFlag._(_kIsLiveRegionIndex);
-  static const SemanticsFlag hasToggledState = SemanticsFlag._(_kHasToggledStateIndex);
-  static const SemanticsFlag isToggled = SemanticsFlag._(_kIsToggledIndex);
-  static const SemanticsFlag hasImplicitScrolling = SemanticsFlag._(_kHasImplicitScrollingIndex);
-  static const SemanticsFlag isCheckStateMixed = SemanticsFlag._(_kIsCheckStateMixedIndex);
-
-  static const Map<int, SemanticsFlag> values = <int, SemanticsFlag>{
+  static const Map<int, SemanticsFlag> _kFlagById = <int, SemanticsFlag>{
     _kHasCheckedStateIndex: hasCheckedState,
     _kIsCheckedIndex: isChecked,
     _kIsSelectedIndex: isSelected,
@@ -219,67 +180,16 @@ class SemanticsFlag {
     _kIsSliderIndex: isSlider,
     _kIsKeyboardKeyIndex: isKeyboardKey,
     _kIsCheckStateMixedIndex: isCheckStateMixed,
+    _kHasExpandedStateIndex: hasExpandedState,
+    _kIsExpandedIndex: isExpanded,
   };
 
+  static List<SemanticsFlag> get values => _kFlagById.values.toList(growable: false);
+
+  static SemanticsFlag? fromIndex(int index) => _kFlagById[index];
+
   @override
-  String toString() {
-    switch (index) {
-      case _kHasCheckedStateIndex:
-        return 'SemanticsFlag.hasCheckedState';
-      case _kIsCheckedIndex:
-        return 'SemanticsFlag.isChecked';
-      case _kIsSelectedIndex:
-        return 'SemanticsFlag.isSelected';
-      case _kIsButtonIndex:
-        return 'SemanticsFlag.isButton';
-      case _kIsTextFieldIndex:
-        return 'SemanticsFlag.isTextField';
-      case _kIsFocusedIndex:
-        return 'SemanticsFlag.isFocused';
-      case _kHasEnabledStateIndex:
-        return 'SemanticsFlag.hasEnabledState';
-      case _kIsEnabledIndex:
-        return 'SemanticsFlag.isEnabled';
-      case _kIsInMutuallyExclusiveGroupIndex:
-        return 'SemanticsFlag.isInMutuallyExclusiveGroup';
-      case _kIsHeaderIndex:
-        return 'SemanticsFlag.isHeader';
-      case _kIsObscuredIndex:
-        return 'SemanticsFlag.isObscured';
-      case _kScopesRouteIndex:
-        return 'SemanticsFlag.scopesRoute';
-      case _kNamesRouteIndex:
-        return 'SemanticsFlag.namesRoute';
-      case _kIsHiddenIndex:
-        return 'SemanticsFlag.isHidden';
-      case _kIsImageIndex:
-        return 'SemanticsFlag.isImage';
-      case _kIsLiveRegionIndex:
-        return 'SemanticsFlag.isLiveRegion';
-      case _kHasToggledStateIndex:
-        return 'SemanticsFlag.hasToggledState';
-      case _kIsToggledIndex:
-        return 'SemanticsFlag.isToggled';
-      case _kHasImplicitScrollingIndex:
-        return 'SemanticsFlag.hasImplicitScrolling';
-      case _kIsMultilineIndex:
-        return 'SemanticsFlag.isMultiline';
-      case _kIsReadOnlyIndex:
-        return 'SemanticsFlag.isReadOnly';
-      case _kIsFocusableIndex:
-        return 'SemanticsFlag.isFocusable';
-      case _kIsLinkIndex:
-        return 'SemanticsFlag.isLink';
-      case _kIsSliderIndex:
-        return 'SemanticsFlag.isSlider';
-      case _kIsKeyboardKeyIndex:
-        return 'SemanticsFlag.isKeyboardKey';
-      case _kIsCheckStateMixedIndex:
-        return 'SemanticsFlag.isCheckStateMixed';
-    }
-    assert(false, 'Unhandled index: $index (0x${index.toRadixString(8).padLeft(4, "0")})');
-    return '';
-  }
+  String toString() => 'SemanticsFlag.$name';
 }
 
 // When adding a new StringAttributeType, the classes in these file must be
@@ -356,6 +266,7 @@ class SemanticsUpdateBuilder {
     required double elevation,
     required double thickness,
     required Rect rect,
+    required String identifier,
     required String label,
     required List<StringAttribute> labelAttributes,
     required String value,
@@ -390,6 +301,7 @@ class SemanticsUpdateBuilder {
       scrollExtentMax: scrollExtentMax,
       scrollExtentMin: scrollExtentMin,
       rect: rect,
+      identifier: identifier,
       label: label,
       labelAttributes: labelAttributes,
       value: value,
diff --git a/lib/web_ui/lib/src/engine.dart b/lib/web_ui/lib/src/engine.dart
index f83e43ce5245d8706f726f462f88f6b65f1a359b..48932ef12a53349c0b1f49440cfd6943bdf6cdbc 100644
--- a/lib/web_ui/lib/src/engine.dart
+++ b/lib/web_ui/lib/src/engine.dart
@@ -12,34 +12,33 @@
 // The code that performs the transformations lives in:
 //
 //  - https://github.com/flutter/engine/blob/main/web_sdk/sdk_rewriter.dart
-
+// ignore: unnecessary_library_directive
 library engine;
 
 export 'engine/alarm_clock.dart';
 export 'engine/app_bootstrap.dart';
-export 'engine/assets.dart';
 export 'engine/browser_detection.dart';
 export 'engine/canvas_pool.dart';
 export 'engine/canvaskit/canvas.dart';
 export 'engine/canvaskit/canvaskit_api.dart';
 export 'engine/canvaskit/canvaskit_canvas.dart';
 export 'engine/canvaskit/color_filter.dart';
+export 'engine/canvaskit/display_canvas_factory.dart';
 export 'engine/canvaskit/embedded_views.dart';
-export 'engine/canvaskit/embedded_views_diff.dart';
-export 'engine/canvaskit/font_fallback_data.dart';
-export 'engine/canvaskit/font_fallbacks.dart';
 export 'engine/canvaskit/fonts.dart';
 export 'engine/canvaskit/image.dart';
 export 'engine/canvaskit/image_filter.dart';
 export 'engine/canvaskit/image_wasm_codecs.dart';
 export 'engine/canvaskit/image_web_codecs.dart';
-export 'engine/canvaskit/interval_tree.dart';
 export 'engine/canvaskit/layer.dart';
 export 'engine/canvaskit/layer_scene_builder.dart';
 export 'engine/canvaskit/layer_tree.dart';
 export 'engine/canvaskit/mask_filter.dart';
+export 'engine/canvaskit/multi_surface_rasterizer.dart';
 export 'engine/canvaskit/n_way_canvas.dart';
-export 'engine/canvaskit/noto_font.dart';
+export 'engine/canvaskit/native_memory.dart';
+export 'engine/canvaskit/offscreen_canvas_rasterizer.dart';
+export 'engine/canvaskit/overlay_scene_optimizer.dart';
 export 'engine/canvaskit/painting.dart';
 export 'engine/canvaskit/path.dart';
 export 'engine/canvaskit/path_metrics.dart';
@@ -47,24 +46,26 @@ export 'engine/canvaskit/picture.dart';
 export 'engine/canvaskit/picture_recorder.dart';
 export 'engine/canvaskit/raster_cache.dart';
 export 'engine/canvaskit/rasterizer.dart';
+export 'engine/canvaskit/render_canvas.dart';
 export 'engine/canvaskit/renderer.dart';
 export 'engine/canvaskit/shader.dart';
-export 'engine/canvaskit/skia_object_cache.dart';
 export 'engine/canvaskit/surface.dart';
-export 'engine/canvaskit/surface_factory.dart';
 export 'engine/canvaskit/text.dart';
+export 'engine/canvaskit/text_fragmenter.dart';
 export 'engine/canvaskit/util.dart';
 export 'engine/canvaskit/vertices.dart';
 export 'engine/clipboard.dart';
 export 'engine/color_filter.dart';
 export 'engine/configuration.dart';
+export 'engine/display.dart';
 export 'engine/dom.dart';
-export 'engine/embedder.dart';
 export 'engine/engine_canvas.dart';
 export 'engine/font_change_util.dart';
+export 'engine/font_fallback_data.dart';
+export 'engine/font_fallbacks.dart';
 export 'engine/fonts.dart';
 export 'engine/frame_reference.dart';
-export 'engine/host_node.dart';
+export 'engine/frame_timing_recorder.dart';
 export 'engine/html/backdrop_filter.dart';
 export 'engine/html/bitmap_canvas.dart';
 export 'engine/html/canvas.dart';
@@ -92,6 +93,7 @@ export 'engine/html/platform_view.dart';
 export 'engine/html/recording_canvas.dart';
 export 'engine/html/render_vertices.dart';
 export 'engine/html/renderer.dart';
+export 'engine/html/resource_manager.dart';
 export 'engine/html/scene.dart';
 export 'engine/html/scene_builder.dart';
 export 'engine/html/shader_mask.dart';
@@ -104,36 +106,52 @@ export 'engine/html/surface.dart';
 export 'engine/html/surface_stats.dart';
 export 'engine/html/transform.dart';
 export 'engine/html_image_codec.dart';
+export 'engine/image_decoder.dart';
 export 'engine/initialization.dart';
+export 'engine/js_interop/js_app.dart';
 export 'engine/js_interop/js_loader.dart';
 export 'engine/js_interop/js_promise.dart';
+export 'engine/js_interop/js_typed_data.dart';
 export 'engine/key_map.g.dart';
 export 'engine/keyboard_binding.dart';
-export 'engine/mouse_cursor.dart';
+export 'engine/layers.dart';
+export 'engine/mouse/context_menu.dart';
+export 'engine/mouse/cursor.dart';
+export 'engine/mouse/prevent_default.dart';
 export 'engine/navigation/history.dart';
-export 'engine/navigation/js_url_strategy.dart';
-export 'engine/navigation/url_strategy.dart';
+export 'engine/noto_font.dart';
+export 'engine/noto_font_encoding.dart';
 export 'engine/onscreen_logging.dart';
 export 'engine/picture.dart';
 export 'engine/platform_dispatcher.dart';
+export 'engine/platform_dispatcher/app_lifecycle_state.dart';
+export 'engine/platform_dispatcher/view_focus_binding.dart';
 export 'engine/platform_views.dart';
 export 'engine/platform_views/content_manager.dart';
 export 'engine/platform_views/message_handler.dart';
 export 'engine/platform_views/slots.dart';
 export 'engine/plugins.dart';
 export 'engine/pointer_binding.dart';
+export 'engine/pointer_binding/event_position_helper.dart';
 export 'engine/pointer_converter.dart';
 export 'engine/profiler.dart';
 export 'engine/raw_keyboard.dart';
 export 'engine/renderer.dart';
 export 'engine/rrect_renderer.dart';
 export 'engine/safe_browser_api.dart';
+export 'engine/scene_builder.dart';
+export 'engine/scene_painting.dart';
+export 'engine/scene_view.dart';
 export 'engine/semantics/accessibility.dart';
 export 'engine/semantics/checkable.dart';
+export 'engine/semantics/dialog.dart';
+export 'engine/semantics/focusable.dart';
 export 'engine/semantics/image.dart';
 export 'engine/semantics/incrementable.dart';
 export 'engine/semantics/label_and_value.dart';
+export 'engine/semantics/link.dart';
 export 'engine/semantics/live_region.dart';
+export 'engine/semantics/platform_view.dart';
 export 'engine/semantics/scrollable.dart';
 export 'engine/semantics/semantics.dart';
 export 'engine/semantics/semantics_helper.dart';
@@ -143,6 +161,7 @@ export 'engine/services/buffers.dart';
 export 'engine/services/message_codec.dart';
 export 'engine/services/message_codecs.dart';
 export 'engine/services/serialization.dart';
+export 'engine/shader_data.dart';
 export 'engine/shadow.dart';
 export 'engine/svg.dart';
 export 'engine/test_embedding.dart';
@@ -170,4 +189,16 @@ export 'engine/text_editing/text_editing.dart';
 export 'engine/util.dart';
 export 'engine/validators.dart';
 export 'engine/vector_math.dart';
+export 'engine/view_embedder/dimensions_provider/custom_element_dimensions_provider.dart';
+export 'engine/view_embedder/dimensions_provider/dimensions_provider.dart';
+export 'engine/view_embedder/dimensions_provider/full_page_dimensions_provider.dart';
+export 'engine/view_embedder/display_dpr_stream.dart';
+export 'engine/view_embedder/dom_manager.dart';
+export 'engine/view_embedder/embedding_strategy/custom_element_embedding_strategy.dart';
+export 'engine/view_embedder/embedding_strategy/embedding_strategy.dart';
+export 'engine/view_embedder/embedding_strategy/full_page_embedding_strategy.dart';
+export 'engine/view_embedder/flutter_view_manager.dart';
+export 'engine/view_embedder/global_html_attributes.dart';
+export 'engine/view_embedder/hot_restart_cache_handler.dart';
+export 'engine/view_embedder/style_manager.dart';
 export 'engine/window.dart';
diff --git a/lib/web_ui/lib/src/engine/app_bootstrap.dart b/lib/web_ui/lib/src/engine/app_bootstrap.dart
index 6d76f0c005c840e95b937e18ad5e07186b0d38da..686811314775f1d443accbbd250fa1abc7572326 100644
--- a/lib/web_ui/lib/src/engine/app_bootstrap.dart
+++ b/lib/web_ui/lib/src/engine/app_bootstrap.dart
@@ -2,11 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:js/js.dart';
-
 import 'configuration.dart';
+import 'js_interop/js_app.dart';
 import 'js_interop/js_loader.dart';
-import 'js_interop/js_promise.dart';
+
+import 'platform_dispatcher.dart';
+import 'view_embedder/flutter_view_manager.dart';
 
 /// The type of a function that initializes an engine (in Dart).
 typedef InitEngineFn = Future<void> Function([JsFlutterConfiguration? params]);
@@ -40,50 +41,41 @@ class AppBootstrap {
       // This is a convenience method that lets the programmer call "autoStart"
       // from JavaScript immediately after the main.dart.js has loaded.
       // Returns a promise that resolves to the Flutter app that was started.
-      autoStart: allowInterop(() {
-        return Promise<FlutterApp>(allowInterop((
-          PromiseResolver<FlutterApp> resolve,
-          PromiseRejecter _,
-        ) async {
-          await autoStart();
-          // Return the App that was just started
-          resolve(_prepareFlutterApp());
-        }));
-      }),
+      autoStart: () async {
+        await autoStart();
+        // Return the App that was just started
+        return _prepareFlutterApp();
+      },
       // Calls [_initEngine], and returns a JS Promise that resolves to an
       // app runner object.
-      initializeEngine: allowInterop(([JsFlutterConfiguration? configuration]) {
-        // `params` coming from Javascript may be used to configure the engine intialization.
-        // The internal `initEngine` function must accept those params.
-        return Promise<FlutterAppRunner>(allowInterop((
-          PromiseResolver<FlutterAppRunner> resolve,
-          PromiseRejecter _,
-        ) async {
-          await _initializeEngine(configuration);
-          // Return an app runner object
-          resolve(_prepareAppRunner());
-        }));
-      }),
+      initializeEngine: ([JsFlutterConfiguration? configuration]) async {
+        await _initializeEngine(configuration);
+        return _prepareAppRunner();
+      }
     );
   }
 
   /// Creates an appRunner that runs our encapsulated runApp function.
   FlutterAppRunner _prepareAppRunner() {
-    return FlutterAppRunner(runApp: allowInterop(([RunAppFnParameters? params]) {
-      // `params` coming from JS may be used to configure the run app method.
-      return Promise<FlutterApp>(allowInterop((
-        PromiseResolver<FlutterApp> resolve,
-        PromiseRejecter _,
-      ) async {
-        await _runApp();
-        // Return the App that was just started
-        resolve(_prepareFlutterApp());
-      }));
-    }));
+    return FlutterAppRunner(runApp: ([RunAppFnParameters? params]) async {
+      await _runApp();
+      return _prepareFlutterApp();
+    });
   }
 
+  FlutterViewManager get viewManager => EnginePlatformDispatcher.instance.viewManager;
+
   /// Represents the App that was just started, and its JS API.
   FlutterApp _prepareFlutterApp() {
-    return FlutterApp();
+    return FlutterApp(
+      addView: (JsFlutterViewOptions options) {
+        assert(configuration.multiViewEnabled, 'Cannot addView when multiView is not enabled');
+        return viewManager.createAndRegisterView(options).viewId;
+      },
+      removeView: (int viewId) {
+        assert(configuration.multiViewEnabled, 'Cannot removeView when multiView is not enabled');
+        return viewManager.disposeAndUnregisterView(viewId);
+      }
+    );
   }
 }
diff --git a/lib/web_ui/lib/src/engine/browser_detection.dart b/lib/web_ui/lib/src/engine/browser_detection.dart
index 3ff3c714e0907235c75f60778be6d273647e314d..e248969a7c83d1f2ceb2c1eac82e9ce57443e1b5 100644
--- a/lib/web_ui/lib/src/engine/browser_detection.dart
+++ b/lib/web_ui/lib/src/engine/browser_detection.dart
@@ -28,6 +28,19 @@ enum BrowserEngine {
   firefox,
 }
 
+/// The signature of [getUserAgent].
+typedef UserAgentGetter = String Function();
+
+/// Returns the current user agent string.
+///
+/// This function is read-writable, so it can be overridden in tests.
+UserAgentGetter getUserAgent = defaultGetUserAgent;
+
+/// The default implementation of [getUserAgent].
+String defaultGetUserAgent() {
+  return domWindow.navigator.userAgent;
+}
+
 /// html webgl version qualifier constants.
 abstract class WebGLVersion {
   /// WebGL 1.0 is based on OpenGL ES 2.0 / GLSL 1.00
@@ -81,7 +94,8 @@ BrowserEngine detectBrowserEngineByVendorAgent(String vendor, String agent) {
   }
 
   // Assume Blink otherwise, but issue a warning.
-  print('WARNING: failed to detect current browser engine. Assuming this is a Chromium-compatible browser.');
+  print(
+      'WARNING: failed to detect current browser engine. Assuming this is a Chromium-compatible browser.');
   return BrowserEngine.blink;
 }
 
@@ -132,17 +146,17 @@ OperatingSystem? debugOperatingSystemOverride;
 @visibleForTesting
 OperatingSystem detectOperatingSystem({
   String? overridePlatform,
-  String? overrideUserAgent,
   int? overrideMaxTouchPoints,
 }) {
   final String platform = overridePlatform ?? domWindow.navigator.platform!;
-  final String userAgent = overrideUserAgent ?? domWindow.navigator.userAgent;
+  final String userAgent = getUserAgent();
 
   if (platform.startsWith('Mac')) {
     // iDevices requesting a "desktop site" spoof their UA so it looks like a Mac.
     // This checks if we're in a touch device, or on a real mac.
-    final int maxTouchPoints =
-        overrideMaxTouchPoints ?? domWindow.navigator.maxTouchPoints?.toInt() ?? 0;
+    final int maxTouchPoints = overrideMaxTouchPoints ??
+        domWindow.navigator.maxTouchPoints?.toInt() ??
+        0;
     if (maxTouchPoints > 2) {
       return OperatingSystem.iOs;
     }
@@ -204,6 +218,34 @@ bool get isIOS15 {
       domWindow.navigator.userAgent.contains('OS 15_');
 }
 
+/// Detect if running on Chrome version 110 or older.
+///
+/// These versions of Chrome have a bug which causes rendering to be flipped
+/// upside down when using `createImageBitmap`: see
+/// https://chromium.googlesource.com/chromium/src/+/a7f9b00e422a1755918f8ca5500380f98b6fddf2
+// TODO(harryterkelsen): Remove this check once we stop supporting Chrome 110
+// and earlier, https://github.com/flutter/flutter/issues/139186.
+bool get isChrome110OrOlder {
+  if (debugIsChrome110OrOlder != null) {
+    return debugIsChrome110OrOlder!;
+  }
+  if (_cachedIsChrome110OrOlder != null) {
+    return _cachedIsChrome110OrOlder!;
+  }
+  final RegExp chromeRegexp = RegExp(r'Chrom(e|ium)\/([0-9]+)\.');
+  final RegExpMatch? match =
+      chromeRegexp.firstMatch(domWindow.navigator.userAgent);
+  if (match != null) {
+    final int chromeVersion = int.parse(match.group(2)!);
+    return _cachedIsChrome110OrOlder = chromeVersion <= 110;
+  }
+  return _cachedIsChrome110OrOlder = false;
+}
+
+// Cache the result of checking if the app is running on Chrome 110 on Windows
+// since we check this on every frame.
+bool? _cachedIsChrome110OrOlder;
+
 /// If set to true pretends that the current browser is iOS Safari.
 ///
 /// Useful for tests. Do not use in production code.
@@ -223,9 +265,20 @@ bool get isSafari => browserEngine == BrowserEngine.webkit;
 /// Whether the current browser is Firefox.
 bool get isFirefox => browserEngine == BrowserEngine.firefox;
 
+/// Whether the current browser is Edge.
+bool get isEdge => domWindow.navigator.userAgent.contains('Edg/');
+
+/// Whether we are running from a wasm module compiled with dart2wasm.
+/// Note: Currently the ffi library is available from dart2wasm but not dart2js
+/// or dartdevc.
+bool get isWasm => const bool.fromEnvironment('dart.library.ffi');
+
 /// Use in tests to simulate the detection of iOS 15.
 bool? debugIsIOS15;
 
+/// Use in tests to simulated the detection of Chrome 110 or older on Windows.
+bool? debugIsChrome110OrOlder;
+
 int? _cachedWebGLVersion;
 
 /// The highest WebGL version supported by the current browser, or -1 if WebGL
@@ -258,3 +311,7 @@ int _detectWebGLVersion() {
   }
   return -1;
 }
+
+/// Whether the current browser supports the Chromium variant of CanvasKit.
+bool get browserSupportsCanvaskitChromium =>
+    domIntl.v8BreakIterator != null && domIntl.Segmenter != null;
diff --git a/lib/web_ui/lib/src/engine/canvas_pool.dart b/lib/web_ui/lib/src/engine/canvas_pool.dart
index 60365b892d0e37f1cee3b3ace11e79744d4da2e9..c5fe8378b5ba1e4dc07f9d2aab343dc3e9f02723 100644
--- a/lib/web_ui/lib/src/engine/canvas_pool.dart
+++ b/lib/web_ui/lib/src/engine/canvas_pool.dart
@@ -9,6 +9,7 @@ import 'package:meta/meta.dart';
 import 'package:ui/ui.dart' as ui;
 
 import 'browser_detection.dart';
+import 'display.dart';
 import 'dom.dart';
 import 'engine_canvas.dart';
 import 'html/bitmap_canvas.dart';
@@ -20,13 +21,11 @@ import 'html/path/path_utils.dart';
 import 'html/picture.dart';
 import 'html/shaders/image_shader.dart';
 import 'html/shaders/shader.dart';
-import 'platform_dispatcher.dart';
 import 'rrect_renderer.dart';
 import 'safe_browser_api.dart';
 import 'shadow.dart';
 import 'util.dart';
 import 'vector_math.dart';
-import 'window.dart';
 
 /// Renders picture to a CanvasElement by allocating and caching 0 or more
 /// canvas(s) for [BitmapCanvas].
@@ -156,9 +155,9 @@ class CanvasPool extends _SaveStackTracking {
       // * To make sure that when we scale the canvas by devicePixelRatio (see
       //   _initializeViewport below) the pixels line up.
       final double cssWidth =
-          _widthInBitmapPixels / EnginePlatformDispatcher.browserDevicePixelRatio;
+          _widthInBitmapPixels / EngineFlutterDisplay.instance.browserDevicePixelRatio;
       final double cssHeight =
-          _heightInBitmapPixels / EnginePlatformDispatcher.browserDevicePixelRatio;
+          _heightInBitmapPixels / EngineFlutterDisplay.instance.browserDevicePixelRatio;
       canvas = _allocCanvas(_widthInBitmapPixels, _heightInBitmapPixels);
       _canvas = canvas;
 
@@ -385,8 +384,7 @@ class CanvasPool extends _SaveStackTracking {
   }
 
   /// Returns effective dpi (browser DPI and pixel density due to transform).
-  double get dpi =>
-      EnginePlatformDispatcher.browserDevicePixelRatio * _density;
+  double get dpi => EngineFlutterDisplay.instance.browserDevicePixelRatio * _density;
 
   void _resetTransform() {
     final DomCanvasElement? canvas = _canvas;
@@ -541,7 +539,7 @@ class CanvasPool extends _SaveStackTracking {
   void drawColor(ui.Color color, ui.BlendMode blendMode) {
     final DomCanvasRenderingContext2D ctx = context;
     contextHandle.blendMode = blendMode;
-    contextHandle.fillStyle = colorToCssString(color);
+    contextHandle.fillStyle = color.toCssString();
     contextHandle.strokeStyle = '';
     ctx.beginPath();
     // Fill a virtually infinite rect with the color.
@@ -592,7 +590,6 @@ class CanvasPool extends _SaveStackTracking {
           ctx.arc(x, y, radius, 0, 2.0 * math.pi);
           ctx.fill();
         }
-        break;
       case ui.PointMode.lines:
         ctx.beginPath();
         for (int i = 0; i < (len - 2); i += 4) {
@@ -600,7 +597,6 @@ class CanvasPool extends _SaveStackTracking {
           ctx.lineTo(points[i + 2] + offsetX, points[i + 3] + offsetY);
           ctx.stroke();
         }
-        break;
       case ui.PointMode.polygon:
         ctx.beginPath();
         ctx.moveTo(points[0] + offsetX, points[1] + offsetY);
@@ -608,7 +604,6 @@ class CanvasPool extends _SaveStackTracking {
           ctx.lineTo(points[i] + offsetX, points[i + 1] + offsetY);
         }
         ctx.stroke();
-        break;
     }
   }
 
@@ -625,16 +620,12 @@ class CanvasPool extends _SaveStackTracking {
       switch (verb) {
         case SPath.kMoveVerb:
           ctx.moveTo(p[0], p[1]);
-          break;
         case SPath.kLineVerb:
           ctx.lineTo(p[2], p[3]);
-          break;
         case SPath.kCubicVerb:
           ctx.bezierCurveTo(p[2], p[3], p[4], p[5], p[6], p[7]);
-          break;
         case SPath.kQuadVerb:
           ctx.quadraticCurveTo(p[2], p[3], p[4], p[5]);
-          break;
         case SPath.kConicVerb:
           final double w = iter.conicWeight;
           final Conic conic = Conic(p[0], p[1], p[2], p[3], p[4], p[5], w);
@@ -647,10 +638,8 @@ class CanvasPool extends _SaveStackTracking {
             final double p2y = points[i + 1].dy;
             ctx.quadraticCurveTo(p1x, p1y, p2x, p2y);
           }
-          break;
         case SPath.kCloseVerb:
           ctx.closePath();
-          break;
         default:
           throw UnimplementedError('Unknown path verb $verb');
       }
@@ -683,18 +672,14 @@ class CanvasPool extends _SaveStackTracking {
       switch (verb) {
         case SPath.kMoveVerb:
           ctx.moveTo(p[0] + offsetX, p[1] + offsetY);
-          break;
         case SPath.kLineVerb:
           ctx.lineTo(p[2] + offsetX, p[3] + offsetY);
-          break;
         case SPath.kCubicVerb:
           ctx.bezierCurveTo(p[2] + offsetX, p[3] + offsetY,
               p[4] + offsetX, p[5] + offsetY, p[6] + offsetX, p[7] + offsetY);
-          break;
         case SPath.kQuadVerb:
           ctx.quadraticCurveTo(p[2] + offsetX, p[3] + offsetY,
               p[4] + offsetX, p[5] + offsetY);
-          break;
         case SPath.kConicVerb:
           final double w = iter.conicWeight;
           final Conic conic = Conic(p[0], p[1], p[2], p[3], p[4], p[5], w);
@@ -708,10 +693,8 @@ class CanvasPool extends _SaveStackTracking {
             ctx.quadraticCurveTo(p1x + offsetX, p1y + offsetY,
                 p2x + offsetX, p2y + offsetY);
           }
-          break;
         case SPath.kCloseVerb:
           ctx.closePath();
-          break;
         default:
           throw UnimplementedError('Unknown path verb $verb');
       }
@@ -978,10 +961,12 @@ class ContextStateHandle {
   ///
   /// [tearDownPaint] must be called after calling this method.
   void setUpPaint(SurfacePaintData paint, ui.Rect? shaderBounds) {
-    if (assertionsEnabled) {
-      assert(!_debugIsPaintSetUp);
+    assert(() {
+      final bool wasPaintSetUp = _debugIsPaintSetUp;
       _debugIsPaintSetUp = true;
-    }
+      // When setting up paint, the previous paint must be torn down.
+      return !wasPaintSetUp;
+    }());
 
     _lastUsedPaint = paint;
     lineWidth = paint.strokeWidth ?? 1.0;
@@ -1011,13 +996,10 @@ class ContextStateHandle {
           context.translate(shaderBounds!.left, shaderBounds.top);
         }
       }
-    } else if (paint.color != null) {
-      final String? colorString = colorValueToCssString(paint.color);
+    } else {
+      final String colorString = colorValueToCssString(paint.color);
       fillStyle = colorString;
       strokeStyle = colorString;
-    } else {
-      fillStyle = '#000000';
-      strokeStyle = '#000000';
     }
 
     final ui.MaskFilter? maskFilter = paint.maskFilter;
@@ -1037,7 +1019,7 @@ class ContextStateHandle {
         context.save();
         context.shadowBlur = convertSigmaToRadius(maskFilter.webOnlySigma);
         // Shadow color must be fully opaque.
-        context.shadowColor = colorToCssString(ui.Color(paint.color).withAlpha(255));
+        context.shadowColor = ui.Color(paint.color).withAlpha(255).toCssString();
 
         // On the web a shadow must always be painted together with the shape
         // that casts it. In order to paint just the shadow, we offset the shape
@@ -1056,7 +1038,7 @@ class ContextStateHandle {
         //
         // transformedShadowDelta = M*shadowDelta - M*origin.
         final Float32List tempVector = Float32List(2);
-        tempVector[0] = kOutsideTheBoundsOffset * window.devicePixelRatio;
+        tempVector[0] = kOutsideTheBoundsOffset * EngineFlutterDisplay.instance.devicePixelRatio;
         _canvasPool.currentTransform.transform2(tempVector);
         final double shadowOffsetX = tempVector[0];
         final double shadowOffsetY = tempVector[1];
@@ -1077,10 +1059,12 @@ class ContextStateHandle {
   ///
   /// Must be called after calling [setUpPaint].
   void tearDownPaint() {
-    if (assertionsEnabled) {
-      assert(_debugIsPaintSetUp);
+    assert(() {
+      final bool wasPaintSetUp = _debugIsPaintSetUp;
       _debugIsPaintSetUp = false;
-    }
+      // When tearing down paint, we expect that it was set up before.
+      return wasPaintSetUp;
+    }());
 
     final ui.MaskFilter? maskFilter = _lastUsedPaint?.maskFilter;
     if (maskFilter != null && _renderMaskFilterForWebkit) {
@@ -1146,9 +1130,6 @@ class ContextStateHandle {
 /// Provides save stack tracking functionality to implementations of
 /// [EngineCanvas].
 class _SaveStackTracking {
-  // !Warning: this vector should not be mutated.
-  static final Vector3 _unitZ = Vector3(0.0, 0.0, 1.0);
-
   final List<SaveStackEntry> _saveStack = <SaveStackEntry>[];
 
   /// The stack that maintains clipping operations used when text is painted
@@ -1207,7 +1188,7 @@ class _SaveStackTracking {
   /// Rotates the [currentTransform] matrix.
   @mustCallSuper
   void rotate(double radians) {
-    _currentTransform.rotate(_unitZ, radians);
+    _currentTransform.rotate(kUnitZ, radians);
   }
 
   /// Skews the [currentTransform] matrix.
diff --git a/lib/web_ui/lib/src/engine/canvaskit/canvas.dart b/lib/web_ui/lib/src/engine/canvaskit/canvas.dart
index e3c358e45f044b79abac7051bf4ed2e0a228239f..26c780c6ce0bb11db8ac71a92c1769c0a396638c 100644
--- a/lib/web_ui/lib/src/engine/canvaskit/canvas.dart
+++ b/lib/web_ui/lib/src/engine/canvaskit/canvas.dart
@@ -8,6 +8,7 @@ import 'dart:typed_data';
 import 'package:ui/ui.dart' as ui;
 
 import '../color_filter.dart';
+import '../display.dart';
 import 'canvaskit_api.dart';
 import 'color_filter.dart';
 import 'image.dart';
@@ -118,7 +119,7 @@ class CkCanvas {
 
   void drawColor(ui.Color color, ui.BlendMode blendMode) {
     skCanvas.drawColorInt(
-      color.value,
+      color.value.toDouble(),
       toSkBlendMode(blendMode),
     );
   }
@@ -215,7 +216,6 @@ class CkCanvas {
       offset.dx,
       offset.dy,
     );
-    paragraph.markUsed();
   }
 
   void drawPath(CkPath path, CkPaint paint) {
@@ -249,7 +249,7 @@ class CkCanvas {
   void drawShadow(
       CkPath path, ui.Color color, double elevation, bool transparentOccluder) {
     drawSkShadow(skCanvas, path, color, elevation, transparentOccluder,
-        ui.window.devicePixelRatio);
+        EngineFlutterDisplay.instance.devicePixelRatio);
   }
 
   void drawVertices(
@@ -266,7 +266,7 @@ class CkCanvas {
   }
 
   void restoreToCount(int count) {
-    skCanvas.restoreToCount(count);
+    skCanvas.restoreToCount(count.toDouble());
   }
 
   void rotate(double radians) {
@@ -292,18 +292,20 @@ class CkCanvas {
 
   void saveLayerWithFilter(ui.Rect bounds, ui.ImageFilter filter,
       [CkPaint? paint]) {
-      final CkManagedSkImageFilterConvertible convertible;
-      if (filter is ui.ColorFilter) {
-        convertible = createCkColorFilter(filter as EngineColorFilter)!;
-      } else {
-        convertible = filter as CkManagedSkImageFilterConvertible;
-      }
-    return skCanvas.saveLayer(
-      paint?.skiaObject,
-      toSkRect(bounds),
-      convertible.imageFilter.skiaObject,
-      0,
-    );
+    final CkManagedSkImageFilterConvertible convertible;
+    if (filter is ui.ColorFilter) {
+      convertible = createCkColorFilter(filter as EngineColorFilter)!;
+    } else {
+      convertible = filter as CkManagedSkImageFilterConvertible;
+    }
+    convertible.imageFilter((SkImageFilter filter) {
+      skCanvas.saveLayer(
+        paint?.skiaObject,
+        toSkRect(bounds),
+        filter,
+        0,
+      );
+    });
   }
 
   void scale(double sx, double sy) {
@@ -332,854 +334,4 @@ class CkCanvas {
     }
     return matrix4;
   }
-
-  CkPictureSnapshot? get pictureSnapshot => null;
-}
-
-class RecordingCkCanvas extends CkCanvas {
-  RecordingCkCanvas(super.skCanvas, ui.Rect bounds)
-      : pictureSnapshot = CkPictureSnapshot(bounds);
-
-  @override
-  final CkPictureSnapshot pictureSnapshot;
-
-  void _addCommand(CkPaintCommand command) {
-    pictureSnapshot._commands.add(command);
-  }
-
-  @override
-  void clear(ui.Color color) {
-    super.clear(color);
-    _addCommand(CkClearCommand(color));
-  }
-
-  @override
-  void clipPath(CkPath path, bool doAntiAlias) {
-    super.clipPath(path, doAntiAlias);
-    _addCommand(CkClipPathCommand(path, doAntiAlias));
-  }
-
-  @override
-  void clipRRect(ui.RRect rrect, bool doAntiAlias) {
-    super.clipRRect(rrect, doAntiAlias);
-    _addCommand(CkClipRRectCommand(rrect, doAntiAlias));
-  }
-
-  @override
-  void clipRect(ui.Rect rect, ui.ClipOp clipOp, bool doAntiAlias) {
-    super.clipRect(rect, clipOp, doAntiAlias);
-    _addCommand(CkClipRectCommand(rect, clipOp, doAntiAlias));
-  }
-
-  @override
-  void drawArc(
-    ui.Rect oval,
-    double startAngle,
-    double sweepAngle,
-    bool useCenter,
-    CkPaint paint,
-  ) {
-    super.drawArc(oval, startAngle, sweepAngle, useCenter, paint);
-    _addCommand(
-        CkDrawArcCommand(oval, startAngle, sweepAngle, useCenter, paint));
-  }
-
-  @override
-  void drawAtlasRaw(
-    CkPaint paint,
-    CkImage atlas,
-    Float32List rstTransforms,
-    Float32List rects,
-    Uint32List? colors,
-    ui.BlendMode blendMode,
-  ) {
-    super.drawAtlasRaw(paint, atlas, rstTransforms, rects, colors, blendMode);
-    _addCommand(CkDrawAtlasCommand(
-        paint, atlas, rstTransforms, rects, colors, blendMode));
-  }
-
-  @override
-  void drawCircle(ui.Offset c, double radius, CkPaint paint) {
-    super.drawCircle(c, radius, paint);
-    _addCommand(CkDrawCircleCommand(c, radius, paint));
-  }
-
-  @override
-  void drawColor(ui.Color color, ui.BlendMode blendMode) {
-    super.drawColor(color, blendMode);
-    _addCommand(CkDrawColorCommand(color, blendMode));
-  }
-
-  @override
-  void drawDRRect(ui.RRect outer, ui.RRect inner, CkPaint paint) {
-    super.drawDRRect(outer, inner, paint);
-    _addCommand(CkDrawDRRectCommand(outer, inner, paint));
-  }
-
-  @override
-  void drawImage(CkImage image, ui.Offset offset, CkPaint paint) {
-    super.drawImage(image, offset, paint);
-    _addCommand(CkDrawImageCommand(image, offset, paint));
-  }
-
-  @override
-  void drawImageRect(CkImage image, ui.Rect src, ui.Rect dst, CkPaint paint) {
-    super.drawImageRect(image, src, dst, paint);
-    _addCommand(CkDrawImageRectCommand(image, src, dst, paint));
-  }
-
-  @override
-  void drawImageNine(
-      CkImage image, ui.Rect center, ui.Rect dst, CkPaint paint) {
-    super.drawImageNine(image, center, dst, paint);
-    _addCommand(CkDrawImageNineCommand(image, center, dst, paint));
-  }
-
-  @override
-  void drawLine(ui.Offset p1, ui.Offset p2, CkPaint paint) {
-    super.drawLine(p1, p2, paint);
-    _addCommand(CkDrawLineCommand(p1, p2, paint));
-  }
-
-  @override
-  void drawOval(ui.Rect rect, CkPaint paint) {
-    super.drawOval(rect, paint);
-    _addCommand(CkDrawOvalCommand(rect, paint));
-  }
-
-  @override
-  void drawPaint(CkPaint paint) {
-    super.drawPaint(paint);
-    _addCommand(CkDrawPaintCommand(paint));
-  }
-
-  @override
-  void drawParagraph(CkParagraph paragraph, ui.Offset offset) {
-    super.drawParagraph(paragraph, offset);
-    _addCommand(CkDrawParagraphCommand(paragraph, offset));
-  }
-
-  @override
-  void drawPath(CkPath path, CkPaint paint) {
-    super.drawPath(path, paint);
-    _addCommand(CkDrawPathCommand(path, paint));
-  }
-
-  @override
-  void drawPicture(CkPicture picture) {
-    super.drawPicture(picture);
-    _addCommand(CkDrawPictureCommand(picture));
-  }
-
-  @override
-  void drawPoints(CkPaint paint, ui.PointMode pointMode, Float32List points) {
-    super.drawPoints(paint, pointMode, points);
-    _addCommand(CkDrawPointsCommand(pointMode, points, paint));
-  }
-
-  @override
-  void drawRRect(ui.RRect rrect, CkPaint paint) {
-    super.drawRRect(rrect, paint);
-    _addCommand(CkDrawRRectCommand(rrect, paint));
-  }
-
-  @override
-  void drawRect(ui.Rect rect, CkPaint paint) {
-    super.drawRect(rect, paint);
-    _addCommand(CkDrawRectCommand(rect, paint));
-  }
-
-  @override
-  void drawShadow(
-      CkPath path, ui.Color color, double elevation, bool transparentOccluder) {
-    super.drawShadow(path, color, elevation, transparentOccluder);
-    _addCommand(
-        CkDrawShadowCommand(path, color, elevation, transparentOccluder));
-  }
-
-  @override
-  void drawVertices(
-      CkVertices vertices, ui.BlendMode blendMode, CkPaint paint) {
-    super.drawVertices(vertices, blendMode, paint);
-    _addCommand(CkDrawVerticesCommand(vertices, blendMode, paint));
-  }
-
-  @override
-  void restore() {
-    super.restore();
-    _addCommand(const CkRestoreCommand());
-  }
-
-  @override
-  void restoreToCount(int count) {
-    super.restoreToCount(count);
-    _addCommand(CkRestoreToCountCommand(count));
-  }
-
-  @override
-  void rotate(double radians) {
-    super.rotate(radians);
-    _addCommand(CkRotateCommand(radians));
-  }
-
-  @override
-  int save() {
-    _addCommand(const CkSaveCommand());
-    return super.save();
-  }
-
-  @override
-  void saveLayer(ui.Rect bounds, CkPaint? paint) {
-    super.saveLayer(bounds, paint);
-    _addCommand(CkSaveLayerCommand(bounds, paint));
-  }
-
-  @override
-  void saveLayerWithoutBounds(CkPaint? paint) {
-    super.saveLayerWithoutBounds(paint);
-    _addCommand(CkSaveLayerWithoutBoundsCommand(paint));
-  }
-
-  @override
-  void saveLayerWithFilter(ui.Rect bounds, ui.ImageFilter filter,
-      [CkPaint? paint]) {
-    super.saveLayerWithFilter(bounds, filter, paint);
-    _addCommand(CkSaveLayerWithFilterCommand(bounds, filter, paint));
-  }
-
-  @override
-  void scale(double sx, double sy) {
-    super.scale(sx, sy);
-    _addCommand(CkScaleCommand(sx, sy));
-  }
-
-  @override
-  void skew(double sx, double sy) {
-    super.skew(sx, sy);
-    _addCommand(CkSkewCommand(sx, sy));
-  }
-
-  @override
-  void transform(Float32List matrix4) {
-    super.transform(matrix4);
-    _addCommand(CkTransformCommand(matrix4));
-  }
-
-  @override
-  void translate(double dx, double dy) {
-    super.translate(dx, dy);
-    _addCommand(CkTranslateCommand(dx, dy));
-  }
-}
-
-class CkPictureSnapshot {
-  CkPictureSnapshot(this._bounds);
-
-  final ui.Rect _bounds;
-  final List<CkPaintCommand> _commands = <CkPaintCommand>[];
-
-  SkPicture toPicture() {
-    final SkPictureRecorder recorder = SkPictureRecorder();
-    final Float32List skRect = toSkRect(_bounds);
-    final SkCanvas skCanvas = recorder.beginRecording(skRect);
-    for (final CkPaintCommand command in _commands) {
-      command.apply(skCanvas);
-    }
-    final SkPicture skPicture = recorder.finishRecordingAsPicture();
-    recorder.delete();
-    return skPicture;
-  }
-
-  void dispose() {
-    for (final CkPaintCommand command in _commands) {
-      command.dispose();
-    }
-  }
-}
-
-/// A paint command recorded by [RecordingCkCanvas].
-///
-/// # Special rules when drawing images
-///
-/// A command painting an image must clone the original image to bump the ref
-/// count. Otherwise when the framework decides it doesn't need the image any
-/// more it will bump the ref count down and delete the underlying Skia object,
-/// leaving the picture that recorded this paint command with a dangling
-/// pointer. If we attempt to resurrect the picture we'll hit a use-after-free
-/// error. The command must call [CkImage.dispose] in its [dispose]
-/// implementation.
-abstract class CkPaintCommand {
-  const CkPaintCommand();
-
-  /// Applies the command onto the [canvas].
-  void apply(SkCanvas canvas);
-
-  /// Frees resources associated with the command.
-  void dispose() {}
-}
-
-class CkClearCommand extends CkPaintCommand {
-  const CkClearCommand(this.color);
-
-  final ui.Color color;
-
-  @override
-  void apply(SkCanvas canvas) {
-    canvas.clear(toSharedSkColor1(color));
-  }
-}
-
-class CkSaveCommand extends CkPaintCommand {
-  const CkSaveCommand();
-
-  @override
-  void apply(SkCanvas canvas) {
-    canvas.save();
-  }
-}
-
-class CkRestoreCommand extends CkPaintCommand {
-  const CkRestoreCommand();
-
-  @override
-  void apply(SkCanvas canvas) {
-    canvas.restore();
-  }
-}
-
-class CkRestoreToCountCommand extends CkPaintCommand {
-  const CkRestoreToCountCommand(this.count);
-
-  final int count;
-
-  @override
-  void apply(SkCanvas canvas) {
-    canvas.restoreToCount(count);
-  }
-}
-
-class CkTranslateCommand extends CkPaintCommand {
-  CkTranslateCommand(this.dx, this.dy);
-
-  final double dx;
-  final double dy;
-
-  @override
-  void apply(SkCanvas canvas) {
-    canvas.translate(dx, dy);
-  }
-}
-
-class CkScaleCommand extends CkPaintCommand {
-  CkScaleCommand(this.sx, this.sy);
-
-  final double sx;
-  final double sy;
-
-  @override
-  void apply(SkCanvas canvas) {
-    canvas.scale(sx, sy);
-  }
-}
-
-class CkRotateCommand extends CkPaintCommand {
-  CkRotateCommand(this.radians);
-
-  final double radians;
-
-  @override
-  void apply(SkCanvas canvas) {
-    canvas.rotate(radians * 180.0 / math.pi, 0.0, 0.0);
-  }
-}
-
-class CkTransformCommand extends CkPaintCommand {
-  CkTransformCommand(this.matrix4);
-
-  final Float32List matrix4;
-
-  @override
-  void apply(SkCanvas canvas) {
-    canvas.concat(toSkM44FromFloat32(matrix4));
-  }
-}
-
-class CkSkewCommand extends CkPaintCommand {
-  CkSkewCommand(this.sx, this.sy);
-
-  final double sx;
-  final double sy;
-
-  @override
-  void apply(SkCanvas canvas) {
-    canvas.skew(sx, sy);
-  }
-}
-
-class CkClipRectCommand extends CkPaintCommand {
-  CkClipRectCommand(this.rect, this.clipOp, this.doAntiAlias);
-
-  final ui.Rect rect;
-  final ui.ClipOp clipOp;
-  final bool doAntiAlias;
-
-  @override
-  void apply(SkCanvas canvas) {
-    canvas.clipRect(
-      toSkRect(rect),
-      toSkClipOp(clipOp),
-      doAntiAlias,
-    );
-  }
-}
-
-class CkDrawArcCommand extends CkPaintCommand {
-  CkDrawArcCommand(
-      this.oval, this.startAngle, this.sweepAngle, this.useCenter, this.paint);
-
-  final ui.Rect oval;
-  final double startAngle;
-  final double sweepAngle;
-  final bool useCenter;
-  final CkPaint paint;
-
-  @override
-  void apply(SkCanvas canvas) {
-    const double toDegrees = 180 / math.pi;
-    canvas.drawArc(
-      toSkRect(oval),
-      startAngle * toDegrees,
-      sweepAngle * toDegrees,
-      useCenter,
-      paint.skiaObject,
-    );
-  }
-}
-
-class CkDrawAtlasCommand extends CkPaintCommand {
-  CkDrawAtlasCommand(this.paint, this.atlas, this.rstTransforms, this.rects,
-      this.colors, this.blendMode);
-
-  final CkPaint paint;
-  final CkImage atlas;
-  final Float32List rstTransforms;
-  final Float32List rects;
-  final Uint32List? colors;
-  final ui.BlendMode blendMode;
-
-  @override
-  void apply(SkCanvas canvas) {
-    canvas.drawAtlas(
-      atlas.skImage,
-      rects,
-      rstTransforms,
-      paint.skiaObject,
-      toSkBlendMode(blendMode),
-      colors,
-    );
-  }
-}
-
-class CkClipRRectCommand extends CkPaintCommand {
-  CkClipRRectCommand(this.rrect, this.doAntiAlias);
-
-  final ui.RRect rrect;
-  final bool doAntiAlias;
-
-  @override
-  void apply(SkCanvas canvas) {
-    canvas.clipRRect(
-      toSkRRect(rrect),
-      _clipOpIntersect,
-      doAntiAlias,
-    );
-  }
-}
-
-class CkClipPathCommand extends CkPaintCommand {
-  CkClipPathCommand(this.path, this.doAntiAlias);
-
-  final CkPath path;
-  final bool doAntiAlias;
-
-  @override
-  void apply(SkCanvas canvas) {
-    canvas.clipPath(
-      path.skiaObject,
-      _clipOpIntersect,
-      doAntiAlias,
-    );
-  }
-}
-
-class CkDrawColorCommand extends CkPaintCommand {
-  CkDrawColorCommand(this.color, this.blendMode);
-
-  final ui.Color color;
-  final ui.BlendMode blendMode;
-
-  @override
-  void apply(SkCanvas canvas) {
-    canvas.drawColorInt(
-      color.value,
-      toSkBlendMode(blendMode),
-    );
-  }
-}
-
-class CkDrawLineCommand extends CkPaintCommand {
-  CkDrawLineCommand(this.p1, this.p2, this.paint);
-
-  final ui.Offset p1;
-  final ui.Offset p2;
-  final CkPaint paint;
-
-  @override
-  void apply(SkCanvas canvas) {
-    canvas.drawLine(
-      p1.dx,
-      p1.dy,
-      p2.dx,
-      p2.dy,
-      paint.skiaObject,
-    );
-  }
-}
-
-class CkDrawPaintCommand extends CkPaintCommand {
-  CkDrawPaintCommand(this.paint);
-
-  final CkPaint paint;
-
-  @override
-  void apply(SkCanvas canvas) {
-    canvas.drawPaint(paint.skiaObject);
-  }
-}
-
-class CkDrawVerticesCommand extends CkPaintCommand {
-  CkDrawVerticesCommand(this.vertices, this.blendMode, this.paint);
-
-  final CkVertices vertices;
-  final ui.BlendMode blendMode;
-  final CkPaint paint;
-
-  @override
-  void apply(SkCanvas canvas) {
-    canvas.drawVertices(
-      vertices.skiaObject,
-      toSkBlendMode(blendMode),
-      paint.skiaObject,
-    );
-  }
-}
-
-class CkDrawPointsCommand extends CkPaintCommand {
-  CkDrawPointsCommand(this.pointMode, this.points, this.paint);
-
-  final Float32List points;
-  final ui.PointMode pointMode;
-  final CkPaint paint;
-
-  @override
-  void apply(SkCanvas canvas) {
-    canvas.drawPoints(
-      toSkPointMode(pointMode),
-      points,
-      paint.skiaObject,
-    );
-  }
-}
-
-class CkDrawRectCommand extends CkPaintCommand {
-  CkDrawRectCommand(this.rect, this.paint);
-
-  final ui.Rect rect;
-  final CkPaint paint;
-
-  @override
-  void apply(SkCanvas canvas) {
-    canvas.drawRect(toSkRect(rect), paint.skiaObject);
-  }
-}
-
-class CkDrawRRectCommand extends CkPaintCommand {
-  CkDrawRRectCommand(this.rrect, this.paint);
-
-  final ui.RRect rrect;
-  final CkPaint paint;
-
-  @override
-  void apply(SkCanvas canvas) {
-    canvas.drawRRect(
-      toSkRRect(rrect),
-      paint.skiaObject,
-    );
-  }
-}
-
-class CkDrawDRRectCommand extends CkPaintCommand {
-  CkDrawDRRectCommand(this.outer, this.inner, this.paint);
-
-  final ui.RRect outer;
-  final ui.RRect inner;
-  final CkPaint paint;
-
-  @override
-  void apply(SkCanvas canvas) {
-    canvas.drawDRRect(
-      toSkRRect(outer),
-      toSkRRect(inner),
-      paint.skiaObject,
-    );
-  }
-}
-
-class CkDrawOvalCommand extends CkPaintCommand {
-  CkDrawOvalCommand(this.rect, this.paint);
-
-  final ui.Rect rect;
-  final CkPaint paint;
-
-  @override
-  void apply(SkCanvas canvas) {
-    canvas.drawOval(
-      toSkRect(rect),
-      paint.skiaObject,
-    );
-  }
-}
-
-class CkDrawCircleCommand extends CkPaintCommand {
-  CkDrawCircleCommand(this.c, this.radius, this.paint);
-
-  final ui.Offset c;
-  final double radius;
-  final CkPaint paint;
-
-  @override
-  void apply(SkCanvas canvas) {
-    canvas.drawCircle(
-      c.dx,
-      c.dy,
-      radius,
-      paint.skiaObject,
-    );
-  }
-}
-
-class CkDrawPathCommand extends CkPaintCommand {
-  CkDrawPathCommand(this.path, this.paint);
-
-  final CkPath path;
-  final CkPaint paint;
-
-  @override
-  void apply(SkCanvas canvas) {
-    canvas.drawPath(path.skiaObject, paint.skiaObject);
-  }
-}
-
-class CkDrawShadowCommand extends CkPaintCommand {
-  CkDrawShadowCommand(
-      this.path, this.color, this.elevation, this.transparentOccluder);
-
-  final CkPath path;
-  final ui.Color color;
-  final double elevation;
-  final bool transparentOccluder;
-
-  @override
-  void apply(SkCanvas canvas) {
-    drawSkShadow(canvas, path, color, elevation, transparentOccluder,
-        ui.window.devicePixelRatio);
-  }
-}
-
-class CkDrawImageCommand extends CkPaintCommand {
-  CkDrawImageCommand(CkImage ckImage, this.offset, this.paint)
-      : image = ckImage.clone();
-
-  final CkImage image;
-  final ui.Offset offset;
-  final CkPaint paint;
-
-  @override
-  void apply(SkCanvas canvas) {
-    final ui.FilterQuality filterQuality = paint.filterQuality;
-    if (filterQuality == ui.FilterQuality.high) {
-      canvas.drawImageCubic(
-        image.skImage,
-        offset.dx,
-        offset.dy,
-        CkCanvas._kMitchellNetravali_B,
-        CkCanvas._kMitchellNetravali_C,
-        paint.skiaObject,
-      );
-    } else {
-      canvas.drawImageOptions(
-        image.skImage,
-        offset.dx,
-        offset.dy,
-        toSkFilterMode(filterQuality),
-        toSkMipmapMode(filterQuality),
-        paint.skiaObject,
-      );
-    }
-  }
-
-  @override
-  void dispose() {
-    image.dispose();
-  }
-}
-
-class CkDrawImageRectCommand extends CkPaintCommand {
-  CkDrawImageRectCommand(CkImage ckImage, this.src, this.dst, this.paint)
-      : image = ckImage.clone();
-
-  final CkImage image;
-  final ui.Rect src;
-  final ui.Rect dst;
-  final CkPaint paint;
-
-  @override
-  void apply(SkCanvas canvas) {
-    final ui.FilterQuality filterQuality = paint.filterQuality;
-    if (filterQuality == ui.FilterQuality.high) {
-      canvas.drawImageRectCubic(
-        image.skImage,
-        toSkRect(src),
-        toSkRect(dst),
-        CkCanvas._kMitchellNetravali_B,
-        CkCanvas._kMitchellNetravali_C,
-        paint.skiaObject,
-      );
-    } else {
-      canvas.drawImageRectOptions(
-        image.skImage,
-        toSkRect(src),
-        toSkRect(dst),
-        toSkFilterMode(filterQuality),
-        toSkMipmapMode(filterQuality),
-        paint.skiaObject,
-      );
-    }
-  }
-
-  @override
-  void dispose() {
-    image.dispose();
-  }
-}
-
-class CkDrawImageNineCommand extends CkPaintCommand {
-  CkDrawImageNineCommand(CkImage ckImage, this.center, this.dst, this.paint)
-      : image = ckImage.clone();
-
-  final CkImage image;
-  final ui.Rect center;
-  final ui.Rect dst;
-  final CkPaint paint;
-
-  @override
-  void apply(SkCanvas canvas) {
-    canvas.drawImageNine(
-      image.skImage,
-      toSkRect(center),
-      toSkRect(dst),
-      toSkFilterMode(paint.filterQuality),
-      paint.skiaObject,
-    );
-  }
-
-  @override
-  void dispose() {
-    image.dispose();
-  }
-}
-
-class CkDrawParagraphCommand extends CkPaintCommand {
-  CkDrawParagraphCommand(this.paragraph, this.offset);
-
-  final CkParagraph paragraph;
-  final ui.Offset offset;
-
-  @override
-  void apply(SkCanvas canvas) {
-    canvas.drawParagraph(
-      paragraph.skiaObject,
-      offset.dx,
-      offset.dy,
-    );
-    paragraph.markUsed();
-  }
-}
-
-class CkDrawPictureCommand extends CkPaintCommand {
-  CkDrawPictureCommand(this.picture);
-
-  final CkPicture picture;
-
-  @override
-  void apply(SkCanvas canvas) {
-    canvas.drawPicture(picture.skiaObject);
-  }
-}
-
-class CkSaveLayerCommand extends CkPaintCommand {
-  CkSaveLayerCommand(this.bounds, this.paint);
-
-  final ui.Rect bounds;
-  final CkPaint? paint;
-
-  @override
-  void apply(SkCanvas canvas) {
-    canvas.saveLayer(
-      paint?.skiaObject,
-      toSkRect(bounds),
-      null,
-      null,
-    );
-  }
-}
-
-class CkSaveLayerWithoutBoundsCommand extends CkPaintCommand {
-  CkSaveLayerWithoutBoundsCommand(this.paint);
-
-  final CkPaint? paint;
-
-  @override
-  void apply(SkCanvas canvas) {
-    canvas.saveLayer(
-      paint?.skiaObject,
-      null,
-      null,
-      null,
-    );
-  }
-}
-
-class CkSaveLayerWithFilterCommand extends CkPaintCommand {
-  CkSaveLayerWithFilterCommand(this.bounds, this.filter, this.paint);
-
-  final ui.Rect bounds;
-  final ui.ImageFilter filter;
-  final CkPaint? paint;
-
-  @override
-  void apply(SkCanvas canvas) {
-    final CkManagedSkImageFilterConvertible convertible;
-    if (filter is ui.ColorFilter) {
-      convertible = createCkColorFilter(filter as EngineColorFilter)!;
-    } else {
-      convertible = filter as CkManagedSkImageFilterConvertible;
-    }
-    return canvas.saveLayer(
-      paint?.skiaObject,
-      toSkRect(bounds),
-      convertible.imageFilter.skiaObject,
-      0,
-    );
-  }
 }
diff --git a/lib/web_ui/lib/src/engine/canvaskit/canvaskit_api.dart b/lib/web_ui/lib/src/engine/canvaskit/canvaskit_api.dart
index 25e5f79e83874184adf44f2a81ce53fe6a128294..39608d26cc652fe9d0ed36b4b7b7d339e4beae55 100644
--- a/lib/web_ui/lib/src/engine/canvaskit/canvaskit_api.dart
+++ b/lib/web_ui/lib/src/engine/canvaskit/canvaskit_api.dart
@@ -11,20 +11,24 @@
 library canvaskit_api;
 
 import 'dart:async';
+import 'dart:convert';
+import 'dart:js_interop';
 import 'dart:js_util' as js_util;
 import 'dart:typed_data';
 
-import 'package:js/js.dart';
+import 'package:meta/meta.dart';
 import 'package:ui/ui.dart' as ui;
 
+import '../browser_detection.dart';
 import '../configuration.dart';
 import '../dom.dart';
-import '../initialization.dart';
-import '../profiler.dart';
+import 'renderer.dart';
 
 /// Entrypoint into the CanvasKit API.
 late CanvasKit canvasKit;
 
+bool get _enableCanvasKitChromiumInAutoMode => browserSupportsCanvaskitChromium;
+
 /// Sets the [CanvasKit] object on `window` so we can use `@JS()` to bind to
 /// static APIs.
 ///
@@ -39,6 +43,9 @@ external set windowFlutterCanvasKit(CanvasKit? value);
 @JS('window.flutterCanvasKit')
 external CanvasKit? get windowFlutterCanvasKit;
 
+@JS('window.flutterCanvasKitLoaded')
+external JSPromise<JSAny>? get windowFlutterCanvasKitLoaded;
+
 @JS()
 @anonymous
 @staticInterop
@@ -68,38 +75,77 @@ extension CanvasKitExtension on CanvasKit {
   external SkTextDirectionEnum get TextDirection;
   external SkFontWeightEnum get FontWeight;
   external SkFontSlantEnum get FontSlant;
-  external SkAnimatedImage? MakeAnimatedImageFromEncoded(Uint8List imageData);
+
+  @JS('MakeAnimatedImageFromEncoded')
+  external SkAnimatedImage? _MakeAnimatedImageFromEncoded(
+      JSUint8Array imageData);
+  SkAnimatedImage? MakeAnimatedImageFromEncoded(Uint8List imageData) =>
+      _MakeAnimatedImageFromEncoded(imageData.toJS);
+
   external SkShaderNamespace get Shader;
   external SkMaskFilterNamespace get MaskFilter;
   external SkColorFilterNamespace get ColorFilter;
   external SkImageFilterNamespace get ImageFilter;
   external SkPathNamespace get Path;
   external SkTonalColors computeTonalColors(SkTonalColors inTonalColors);
-  external SkVertices MakeVertices(
+
+  @JS('MakeVertices')
+  external SkVertices _MakeVertices(
+    SkVertexMode mode,
+    JSFloat32Array positions,
+    JSFloat32Array? textureCoordinates,
+    JSUint32Array? colors,
+    JSUint16Array? indices,
+  );
+  SkVertices MakeVertices(
     SkVertexMode mode,
     Float32List positions,
     Float32List? textureCoordinates,
     Uint32List? colors,
     Uint16List? indices,
-  );
+  ) => _MakeVertices(mode, positions.toJS, textureCoordinates?.toJS,
+      colors?.toJS, indices?.toJS);
+
   external SkParagraphBuilderNamespace get ParagraphBuilder;
   external SkParagraphStyle ParagraphStyle(
       SkParagraphStyleProperties properties);
   external SkTextStyle TextStyle(SkTextStyleProperties properties);
   external SkSurface MakeWebGLCanvasSurface(DomCanvasElement canvas);
-  external SkSurface MakeSurface(
-    int width,
-    int height,
+
+  @JS('MakeSurface')
+  external SkSurface _MakeSurface(
+    JSNumber width,
+    JSNumber height,
   );
-  external Uint8List getDataBytes(
+  SkSurface MakeSurface(
+    double width,
+    double height,
+  ) => _MakeSurface(width.toJS, height.toJS);
+
+  @JS('getDataBytes')
+  external JSUint8Array _getDataBytes(
     SkData skData,
   );
+  Uint8List getDataBytes(
+    SkData skData,
+  ) => _getDataBytes(skData).toDart;
 
   // Text decoration enum is embedded in the CanvasKit object itself.
-  external double get NoDecoration;
-  external double get UnderlineDecoration;
-  external double get OverlineDecoration;
-  external double get LineThroughDecoration;
+  @JS('NoDecoration')
+  external JSNumber get _NoDecoration;
+  double get NoDecoration => _NoDecoration.toDartDouble;
+
+  @JS('UnderlineDecoration')
+  external JSNumber get _UnderlineDecoration;
+  double get UnderlineDecoration => _UnderlineDecoration.toDartDouble;
+
+  @JS('OverlineDecoration')
+  external JSNumber get _OverlineDecoration;
+  double get OverlineDecoration => _OverlineDecoration.toDartDouble;
+
+  @JS('LineThroughDecoration')
+  external JSNumber get _LineThroughDecoration;
+  double get LineThroughDecoration => _LineThroughDecoration.toDartDouble;
   // End of text decoration enum.
 
   external SkTextDecorationStyleEnum get DecorationStyle;
@@ -108,18 +154,64 @@ extension CanvasKitExtension on CanvasKit {
 
   external SkFontMgrNamespace get FontMgr;
   external TypefaceFontProviderNamespace get TypefaceFontProvider;
+  external FontCollectionNamespace get FontCollection;
   external SkTypefaceFactory get Typeface;
-  external double GetWebGLContext(
+
+  @JS('GetWebGLContext')
+  external JSNumber _GetWebGLContext(
       DomCanvasElement canvas, SkWebGLContextOptions options);
-  external SkGrContext MakeGrContext(int glContext);
-  external SkSurface? MakeOnScreenGLSurface(
+  double GetWebGLContext(
+      DomCanvasElement canvas, SkWebGLContextOptions options) =>
+        _GetWebGLContext(canvas, options).toDartDouble;
+
+  @JS('GetWebGLContext')
+  external JSNumber _GetOffscreenWebGLContext(
+      DomOffscreenCanvas canvas, SkWebGLContextOptions options);
+  double GetOffscreenWebGLContext(
+          DomOffscreenCanvas canvas, SkWebGLContextOptions options) =>
+      _GetOffscreenWebGLContext(canvas, options).toDartDouble;
+
+  @JS('MakeGrContext')
+  external SkGrContext _MakeGrContext(JSNumber glContext);
+  SkGrContext MakeGrContext(double glContext) =>
+      _MakeGrContext(glContext.toJS);
+
+  @JS('MakeOnScreenGLSurface')
+  external SkSurface? _MakeOnScreenGLSurface(
     SkGrContext grContext,
-    int width,
-    int height,
+    JSNumber width,
+    JSNumber height,
     ColorSpace colorSpace,
+    JSNumber sampleCount,
+    JSNumber stencil,
   );
+  SkSurface? MakeOnScreenGLSurface(
+    SkGrContext grContext,
+    double width,
+    double height,
+    ColorSpace colorSpace,
+    int sampleCount,
+    int stencil,
+  ) => _MakeOnScreenGLSurface(grContext, width.toJS, height.toJS, colorSpace,
+                              sampleCount.toJS, stencil.toJS);
+
+  @JS('MakeRenderTarget')
+  external SkSurface? _MakeRenderTarget(
+    SkGrContext grContext,
+    JSNumber width,
+    JSNumber height,
+  );
+  SkSurface? MakeRenderTarget(
+    SkGrContext grContext,
+    int width,
+    int height,
+  ) => _MakeRenderTarget(grContext, width.toJS, height.toJS);
+
   external SkSurface MakeSWCanvasSurface(DomCanvasElement canvas);
 
+  @JS('MakeSWCanvasSurface')
+  external SkSurface MakeOffscreenSWCanvasSurface(DomOffscreenCanvas canvas);
+
   /// Creates an image from decoded pixels represented as a list of bytes.
   ///
   /// The pixel data must be encoded according to the image info in [info].
@@ -127,49 +219,68 @@ extension CanvasKitExtension on CanvasKit {
   /// Typically pixel data is obtained using [SkImage.readPixels]. The
   /// parameters specified in [SkImageInfo] passed [SkImage.readPixels] must
   /// match [info].
-  external SkImage? MakeImage(
+  @JS('MakeImage')
+  external SkImage? _MakeImage(
+    SkImageInfo info,
+    JSUint8Array pixels,
+    JSNumber bytesPerRow,
+  );
+  SkImage? MakeImage(
     SkImageInfo info,
     Uint8List pixels,
-    int bytesPerRow,
+    double bytesPerRow,
+  ) => _MakeImage(info, pixels.toJS, bytesPerRow.toJS);
+
+  @JS('MakeLazyImageFromTextureSource')
+  external SkImage? _MakeLazyImageFromTextureSource2(
+    JSAny src,
+    SkPartialImageInfo info,
   );
-  external SkImage? MakeLazyImageFromTextureSource(
+
+  @JS('MakeLazyImageFromTextureSource')
+  external SkImage? _MakeLazyImageFromTextureSource3(
+    JSAny src,
+    JSNumber zeroSecondArgument,
+    JSBoolean srcIsPremultiplied,
+  );
+
+  SkImage? MakeLazyImageFromTextureSourceWithInfo(
     Object src,
     SkPartialImageInfo info,
-  );
+  ) => _MakeLazyImageFromTextureSource2(src.toJSAnyShallow, info);
 
-  /// Retrieve the RuntimeEffect namespace for null checking.
-  external Object? get RuntimeEffect;
+  SkImage? MakeLazyImageFromImageBitmap(
+    DomImageBitmap imageBitmap,
+    bool hasPremultipliedAlpha,
+  ) => _MakeLazyImageFromTextureSource3(
+    imageBitmap as JSObject,
+    0.toJS,
+    hasPremultipliedAlpha.toJS,
+  );
 }
 
-// TODO(jonahwilliams): remove this once all CanvasKit versions
-// are built in the SDK.
-// https://github.com/flutter/flutter/issues/114260
-final bool isRuntimeEffectAvailable = windowFlutterCanvasKit?.RuntimeEffect != null;
-
 @JS('window.CanvasKitInit')
-external CanvasKitInitPromise CanvasKitInit(CanvasKitInitOptions options);
+external JSAny _CanvasKitInit(CanvasKitInitOptions options);
+
+Future<CanvasKit> CanvasKitInit(CanvasKitInitOptions options) {
+  return js_util.promiseToFuture<CanvasKit>(
+          _CanvasKitInit(options).toObjectShallow);
+}
 
 typedef LocateFileCallback = String Function(String file, String unusedBase);
 
+JSFunction createLocateFileCallback(LocateFileCallback callback) =>
+    callback.toJS;
+
 @JS()
 @anonymous
 @staticInterop
 class CanvasKitInitOptions {
   external factory CanvasKitInitOptions({
-    required LocateFileCallback locateFile,
+    required JSFunction locateFile,
   });
 }
 
-typedef CanvasKitInitCallback = void Function(CanvasKit canvasKit);
-
-@JS()
-@staticInterop
-class CanvasKitInitPromise {}
-
-extension CanvasKitInitPromiseExtension on CanvasKitInitPromise {
-  external void then(CanvasKitInitCallback callback);
-}
-
 @JS('window.flutterCanvasKit.ColorSpace.SRGB')
 external ColorSpace get SkColorSpaceSRGB;
 
@@ -181,10 +292,17 @@ class ColorSpace {}
 @anonymous
 @staticInterop
 class SkWebGLContextOptions {
-  external factory SkWebGLContextOptions({
-    required int antialias,
+  factory SkWebGLContextOptions({
+    required double antialias,
     // WebGL version: 1 or 2.
-    required int majorVersion,
+    required double majorVersion,
+  }) => SkWebGLContextOptions._(
+    antialias: antialias.toJS, majorVersion: majorVersion.toJS
+  );
+  external factory SkWebGLContextOptions._({
+    required JSNumber antialias,
+    // WebGL version: 1 or 2.
+    required JSNumber majorVersion,
   });
 }
 
@@ -194,10 +312,17 @@ class SkSurface {}
 
 extension SkSurfaceExtension on SkSurface {
   external SkCanvas getCanvas();
-  external void flush();
-  external double width();
-  external double height();
-  external void dispose();
+  external JSVoid flush();
+
+  @JS('width')
+  external JSNumber _width();
+  double width() => _width().toDartDouble;
+
+  @JS('height')
+  external JSNumber _height();
+  double height() => _height().toDartDouble;
+
+  external JSVoid dispose();
   external SkImage makeImageSnapshot();
 }
 
@@ -206,9 +331,13 @@ extension SkSurfaceExtension on SkSurface {
 class SkGrContext {}
 
 extension SkGrContextExtension on SkGrContext {
-  external void setResourceCacheLimitBytes(int limit);
-  external void releaseResourcesAndAbandonContext();
-  external void delete();
+  @JS('setResourceCacheLimitBytes')
+  external JSVoid _setResourceCacheLimitBytes(JSNumber limit);
+  void setResourceCacheLimitBytes(double limit) =>
+      _setResourceCacheLimitBytes(limit.toJS);
+
+  external JSVoid releaseResourcesAndAbandonContext();
+  external JSVoid delete();
 }
 
 @JS()
@@ -226,7 +355,9 @@ extension SkFontSlantEnumExtension on SkFontSlantEnum {
 class SkFontSlant {}
 
 extension SkFontSlantExtension on SkFontSlant {
-  external double get value;
+  @JS('value')
+  external JSNumber get _value;
+  double get value => _value.toDartDouble;
 }
 
 final List<SkFontSlant> _skFontSlants = <SkFontSlant>[
@@ -260,7 +391,9 @@ extension SkFontWeightEnumExtension on SkFontWeightEnum {
 class SkFontWeight {}
 
 extension SkFontWeightExtension on SkFontWeight {
-  external double get value;
+  @JS('value')
+  external JSNumber get _value;
+  double get value => _value.toDartDouble;
 }
 
 final List<SkFontWeight> _skFontWeights = <SkFontWeight>[
@@ -293,7 +426,9 @@ extension SkAffinityEnumExtension on SkAffinityEnum {
 class SkAffinity {}
 
 extension SkAffinityExtension on SkAffinity {
-  external double get value;
+  @JS('value')
+  external JSNumber get _value;
+  double get value => _value.toDartDouble;
 }
 
 final List<SkAffinity> _skAffinitys = <SkAffinity>[
@@ -319,7 +454,9 @@ extension SkTextDirectionEnumExtension on SkTextDirectionEnum {
 class SkTextDirection {}
 
 extension SkTextDirectionExtension on SkTextDirection {
-  external double get value;
+  @JS('value')
+  external JSNumber get _value;
+  double get value => _value.toDartDouble;
 }
 
 // Flutter enumerates text directions as RTL, LTR, while CanvasKit
@@ -351,7 +488,9 @@ extension SkTextAlignEnumExtension on SkTextAlignEnum {
 class SkTextAlign {}
 
 extension SkTextAlignExtension on SkTextAlign {
-  external double get value;
+  @JS('value')
+  external JSNumber get _value;
+  double get value => _value.toDartDouble;
 }
 
 final List<SkTextAlign> _skTextAligns = <SkTextAlign>[
@@ -383,7 +522,9 @@ extension SkTextHeightBehaviorEnumExtension on SkTextHeightBehaviorEnum {
 class SkTextHeightBehavior {}
 
 extension SkTextHeightBehaviorExtension on SkTextHeightBehavior {
-  external double get value;
+  @JS('value')
+  external JSNumber get _value;
+  double get value => _value.toDartDouble;
 }
 
 final List<SkTextHeightBehavior> _skTextHeightBehaviors =
@@ -418,7 +559,9 @@ extension SkRectHeightStyleEnumExtension on SkRectHeightStyleEnum {
 class SkRectHeightStyle {}
 
 extension SkRectHeightStyleExtension on SkRectHeightStyle {
-  external double get value;
+  @JS('value')
+  external JSNumber get _value;
+  double get value => _value.toDartDouble;
 }
 
 final List<SkRectHeightStyle> _skRectHeightStyles = <SkRectHeightStyle>[
@@ -448,7 +591,9 @@ extension SkRectWidthStyleEnumExtension on SkRectWidthStyleEnum {
 class SkRectWidthStyle {}
 
 extension SkRectWidthStyleExtension on SkRectWidthStyle {
-  external double get value;
+  @JS('value')
+  external JSNumber get _value;
+  double get value => _value.toDartDouble;
 }
 
 final List<SkRectWidthStyle> _skRectWidthStyles = <SkRectWidthStyle>[
@@ -476,7 +621,9 @@ extension SkVertexModeEnumExtension on SkVertexModeEnum {
 class SkVertexMode {}
 
 extension SkVertexModeExtension on SkVertexMode {
-  external double get value;
+  @JS('value')
+  external JSNumber get _value;
+  double get value => _value.toDartDouble;
 }
 
 final List<SkVertexMode> _skVertexModes = <SkVertexMode>[
@@ -504,7 +651,9 @@ extension SkPointModeEnumExtension on SkPointModeEnum {
 class SkPointMode {}
 
 extension SkPointModeExtension on SkPointMode {
-  external double get value;
+  @JS('value')
+  external JSNumber get _value;
+  double get value => _value.toDartDouble;
 }
 
 final List<SkPointMode> _skPointModes = <SkPointMode>[
@@ -531,7 +680,9 @@ extension SkClipOpEnumExtension on SkClipOpEnum {
 class SkClipOp {}
 
 extension SkClipOpExtension on SkClipOp {
-  external double get value;
+  @JS('value')
+  external JSNumber get _value;
+  double get value => _value.toDartDouble;
 }
 
 final List<SkClipOp> _skClipOps = <SkClipOp>[
@@ -557,7 +708,9 @@ extension SkFillTypeEnumExtension on SkFillTypeEnum {
 class SkFillType {}
 
 extension SkFillTypeExtension on SkFillType {
-  external double get value;
+  @JS('value')
+  external JSNumber get _value;
+  double get value => _value.toDartDouble;
 }
 
 final List<SkFillType> _skFillTypes = <SkFillType>[
@@ -586,7 +739,9 @@ extension SkPathOpEnumExtension on SkPathOpEnum {
 class SkPathOp {}
 
 extension SkPathOpExtension on SkPathOp {
-  external double get value;
+  @JS('value')
+  external JSNumber get _value;
+  double get value => _value.toDartDouble;
 }
 
 final List<SkPathOp> _skPathOps = <SkPathOp>[
@@ -617,7 +772,9 @@ extension SkBlurStyleEnumExtension on SkBlurStyleEnum {
 class SkBlurStyle {}
 
 extension SkBlurStyleExtension on SkBlurStyle {
-  external double get value;
+  @JS('value')
+  external JSNumber get _value;
+  double get value => _value.toDartDouble;
 }
 
 final List<SkBlurStyle> _skBlurStyles = <SkBlurStyle>[
@@ -646,7 +803,9 @@ extension SkStrokeCapEnumExtension on SkStrokeCapEnum {
 class SkStrokeCap {}
 
 extension SkStrokeCapExtension on SkStrokeCap {
-  external double get value;
+  @JS('value')
+  external JSNumber get _value;
+  double get value => _value.toDartDouble;
 }
 
 final List<SkStrokeCap> _skStrokeCaps = <SkStrokeCap>[
@@ -673,7 +832,9 @@ extension SkPaintStyleEnumExtension on SkPaintStyleEnum {
 class SkPaintStyle {}
 
 extension SkPaintStyleExtension on SkPaintStyle {
-  external double get value;
+  @JS('value')
+  external JSNumber get _value;
+  double get value => _value.toDartDouble;
 }
 
 final List<SkPaintStyle> _skPaintStyles = <SkPaintStyle>[
@@ -726,7 +887,9 @@ extension SkBlendModeEnumExtension on SkBlendModeEnum {
 class SkBlendMode {}
 
 extension SkBlendModeExtension on SkBlendMode {
-  external double get value;
+  @JS('value')
+  external JSNumber get _value;
+  double get value => _value.toDartDouble;
 }
 
 final List<SkBlendMode> _skBlendModes = <SkBlendMode>[
@@ -780,7 +943,9 @@ extension SkStrokeJoinEnumExtension on SkStrokeJoinEnum {
 class SkStrokeJoin {}
 
 extension SkStrokeJoinExtension on SkStrokeJoin {
-  external double get value;
+  @JS('value')
+  external JSNumber get _value;
+  double get value => _value.toDartDouble;
 }
 
 final List<SkStrokeJoin> _skStrokeJoins = <SkStrokeJoin>[
@@ -809,7 +974,9 @@ extension SkTileModeEnumExtension on SkTileModeEnum {
 class SkTileMode {}
 
 extension SkTileModeExtension on SkTileMode {
-  external double get value;
+  @JS('value')
+  external JSNumber get _value;
+  double get value => _value.toDartDouble;
 }
 
 final List<SkTileMode> _skTileModes = <SkTileMode>[
@@ -837,7 +1004,9 @@ extension SkFilterModeEnumExtension on SkFilterModeEnum {
 class SkFilterMode {}
 
 extension SkFilterModeExtension on SkFilterMode {
-  external double get value;
+  @JS('value')
+  external JSNumber get _value;
+  double get value => _value.toDartDouble;
 }
 
 SkFilterMode toSkFilterMode(ui.FilterQuality filterQuality) {
@@ -861,7 +1030,9 @@ extension SkMipmapModeEnumExtension on SkMipmapModeEnum {
 class SkMipmapMode {}
 
 extension SkMipmapModeExtension on SkMipmapMode {
-  external double get value;
+  @JS('value')
+  external JSNumber get _value;
+  double get value => _value.toDartDouble;
 }
 
 SkMipmapMode toSkMipmapMode(ui.FilterQuality filterQuality) {
@@ -885,7 +1056,9 @@ extension SkAlphaTypeEnumExtension on SkAlphaTypeEnum {
 class SkAlphaType {}
 
 extension SkAlphaTypeExtension on SkAlphaType {
-  external double get value;
+  @JS('value')
+  external JSNumber get _value;
+  double get value => _value.toDartDouble;
 }
 
 @JS()
@@ -911,7 +1084,9 @@ extension SkColorTypeEnumExtension on SkColorTypeEnum {
 class SkColorType {}
 
 extension SkColorTypeExtension on SkColorType {
-  external double get value;
+  @JS('value')
+  external JSNumber get _value;
+  double get value => _value.toDartDouble;
 }
 
 @JS()
@@ -920,25 +1095,42 @@ extension SkColorTypeExtension on SkColorType {
 class SkAnimatedImage {}
 
 extension SkAnimatedImageExtension on SkAnimatedImage {
-  external double getFrameCount();
+  @JS('getFrameCount')
+  external JSNumber _getFrameCount();
+  double getFrameCount() => _getFrameCount().toDartDouble;
 
-  external double getRepetitionCount();
+  @JS('getRepetitionCount')
+  external JSNumber _getRepetitionCount();
+  double getRepetitionCount() => _getRepetitionCount().toDartDouble;
 
   /// Returns duration in milliseconds.
-  external double currentFrameDuration();
+  @JS('currentFrameDuration')
+  external JSNumber _currentFrameDuration();
+  double currentFrameDuration() => _currentFrameDuration().toDartDouble;
 
   /// Advances to the next frame and returns its duration in milliseconds.
-  external double decodeNextFrame();
+  @JS('decodeNextFrame')
+  external JSNumber _decodeNextFrame();
+  double decodeNextFrame() => _decodeNextFrame().toDartDouble;
 
   external SkImage makeImageAtCurrentFrame();
-  external double width();
-  external double height();
+
+  @JS('width')
+  external JSNumber _width();
+  double width() => _width().toDartDouble;
+
+  @JS('height')
+  external JSNumber _height();
+  double height() => _height().toDartDouble;
 
   /// Deletes the C++ object.
   ///
   /// This object is no longer usable after calling this method.
-  external void delete();
-  external bool isDeleted();
+  external JSVoid delete();
+
+  @JS('isDeleted')
+  external JSBoolean _isDeleted();
+  bool isDeleted() => _isDeleted().toDart;
 }
 
 @JS()
@@ -947,27 +1139,66 @@ extension SkAnimatedImageExtension on SkAnimatedImage {
 class SkImage {}
 
 extension SkImageExtension on SkImage {
-  external void delete();
-  external double width();
-  external double height();
-  external SkShader makeShaderCubic(
+  external JSVoid delete();
+
+  @JS('width')
+  external JSNumber _width();
+  double width() => _width().toDartDouble;
+
+  @JS('height')
+  external JSNumber _height();
+  double height() => _height().toDartDouble;
+
+  @JS('makeShaderCubic')
+  external SkShader _makeShaderCubic(
+    SkTileMode tileModeX,
+    SkTileMode tileModeY,
+    JSNumber B,
+    JSNumber C,
+    JSFloat32Array? matrix, // 3x3 matrix
+  );
+  SkShader makeShaderCubic(
     SkTileMode tileModeX,
     SkTileMode tileModeY,
     double B,
     double C,
     Float32List? matrix, // 3x3 matrix
+  ) => _makeShaderCubic(tileModeX, tileModeY, B.toJS, C.toJS, matrix?.toJS);
+
+  @JS('makeShaderOptions')
+  external SkShader _makeShaderOptions(
+    SkTileMode tileModeX,
+    SkTileMode tileModeY,
+    SkFilterMode filterMode,
+    SkMipmapMode mipmapMode,
+    JSFloat32Array? matrix, // 3x3 matrix
   );
-  external SkShader makeShaderOptions(
+  SkShader makeShaderOptions(
     SkTileMode tileModeX,
     SkTileMode tileModeY,
     SkFilterMode filterMode,
     SkMipmapMode mipmapMode,
     Float32List? matrix, // 3x3 matrix
-  );
-  external Uint8List readPixels(int srcX, int srcY, SkImageInfo imageInfo);
-  external Uint8List? encodeToBytes();
-  external bool isAliasOf(SkImage other);
-  external bool isDeleted();
+  ) => _makeShaderOptions(tileModeX, tileModeY, filterMode, mipmapMode,
+                          matrix?.toJS);
+
+  @JS('readPixels')
+  external JSUint8Array _readPixels(
+      JSNumber srcX, JSNumber srcY, SkImageInfo imageInfo);
+  Uint8List readPixels(double srcX, double srcY, SkImageInfo imageInfo) =>
+      _readPixels(srcX.toJS, srcY.toJS, imageInfo).toDart;
+
+  @JS('encodeToBytes')
+  external JSUint8Array? _encodeToBytes();
+  Uint8List? encodeToBytes() => _encodeToBytes()?.toDart;
+
+  @JS('isAliasOf')
+  external JSBoolean _isAliasOf(SkImage other);
+  bool isAliasOf(SkImage other) => _isAliasOf(other).toDart;
+
+  @JS('isDeleted')
+  external JSBoolean _isDeleted();
+  bool isDeleted() => _isDeleted().toDart;
 }
 
 @JS()
@@ -975,26 +1206,60 @@ extension SkImageExtension on SkImage {
 class SkShaderNamespace {}
 
 extension SkShaderNamespaceExtension on SkShaderNamespace {
-  external SkShader MakeLinearGradient(
+  @JS('MakeLinearGradient')
+  external SkShader _MakeLinearGradient(
+    JSFloat32Array from, // 2-element array
+    JSFloat32Array to, // 2-element array
+    JSUint32Array colors,
+    JSFloat32Array colorStops,
+    SkTileMode tileMode,
+    JSFloat32Array? matrix,
+  );
+  SkShader MakeLinearGradient(
     Float32List from, // 2-element array
     Float32List to, // 2-element array
     Uint32List colors,
     Float32List colorStops,
     SkTileMode tileMode,
     Float32List? matrix,
+  ) => _MakeLinearGradient(from.toJS, to.toJS, colors.toJS, colorStops.toJS,
+                           tileMode, matrix?.toJS);
+
+  @JS('MakeRadialGradient')
+  external SkShader _MakeRadialGradient(
+    JSFloat32Array center, // 2-element array
+    JSNumber radius,
+    JSUint32Array colors,
+    JSFloat32Array colorStops,
+    SkTileMode tileMode,
+    JSFloat32Array? matrix, // 3x3 matrix
+    JSNumber flags,
   );
-
-  external SkShader MakeRadialGradient(
+  SkShader MakeRadialGradient(
     Float32List center, // 2-element array
     double radius,
     Uint32List colors,
     Float32List colorStops,
     SkTileMode tileMode,
     Float32List? matrix, // 3x3 matrix
-    int flags,
+    double flags,
+  ) => _MakeRadialGradient(center.toJS, radius.toJS, colors.toJS,
+                           colorStops.toJS, tileMode, matrix?.toJS,
+                           flags.toJS);
+
+  @JS('MakeTwoPointConicalGradient')
+  external SkShader _MakeTwoPointConicalGradient(
+    JSFloat32Array focal,
+    JSNumber focalRadius,
+    JSFloat32Array center,
+    JSNumber radius,
+    JSUint32Array colors,
+    JSFloat32Array colorStops,
+    SkTileMode tileMode,
+    JSFloat32Array? matrix, // 3x3 matrix
+    JSNumber flags,
   );
-
-  external SkShader MakeTwoPointConicalGradient(
+  SkShader MakeTwoPointConicalGradient(
     Float32List focal,
     double focalRadius,
     Float32List center,
@@ -1003,20 +1268,36 @@ extension SkShaderNamespaceExtension on SkShaderNamespace {
     Float32List colorStops,
     SkTileMode tileMode,
     Float32List? matrix, // 3x3 matrix
-    int flags,
+    double flags,
+  ) => _MakeTwoPointConicalGradient(focal.toJS, focalRadius.toJS, center.toJS,
+                                    radius.toJS, colors.toJS, colorStops.toJS,
+                                    tileMode, matrix?.toJS, flags.toJS);
+
+  @JS('MakeSweepGradient')
+  external SkShader _MakeSweepGradient(
+    JSNumber cx,
+    JSNumber cy,
+    JSUint32Array colors,
+    JSFloat32Array colorStops,
+    SkTileMode tileMode,
+    JSFloat32Array? matrix, // 3x3 matrix
+    JSNumber flags,
+    JSNumber startAngle,
+    JSNumber endAngle,
   );
-
-  external SkShader MakeSweepGradient(
+  SkShader MakeSweepGradient(
     double cx,
     double cy,
     Uint32List colors,
     Float32List colorStops,
     SkTileMode tileMode,
     Float32List? matrix, // 3x3 matrix
-    int flags,
+    double flags,
     double startAngle,
     double endAngle,
-  );
+  ) => _MakeSweepGradient(cx.toJS, cy.toJS, colors.toJS, colorStops.toJS,
+                          tileMode, matrix?.toJS, flags.toJS, startAngle.toJS,
+                          endAngle.toJS);
 }
 
 @JS()
@@ -1025,7 +1306,7 @@ extension SkShaderNamespaceExtension on SkShaderNamespace {
 class SkShader {}
 
 extension SkShaderExtension on SkShader {
-  external void delete();
+  external JSVoid delete();
 }
 
 @JS()
@@ -1036,8 +1317,12 @@ extension SkMaskFilterNamespaceExtension on SkMaskFilterNamespace {
   // Creates a blur MaskFilter.
   //
   // Returns `null` if [sigma] is 0 or infinite.
-  external SkMaskFilter? MakeBlur(
-      SkBlurStyle blurStyle, double sigma, bool respectCTM);
+  @JS('MakeBlur')
+  external SkMaskFilter? _MakeBlur(
+      SkBlurStyle blurStyle, JSNumber sigma, JSBoolean respectCTM);
+  SkMaskFilter? MakeBlur(
+      SkBlurStyle blurStyle, double sigma, bool respectCTM) =>
+      _MakeBlur(blurStyle, sigma.toJS, respectCTM.toJS);
 }
 
 // This needs to be bound to top-level because SkPaint is initialized
@@ -1051,19 +1336,34 @@ class SkPaint {
 }
 
 extension SkPaintExtension on SkPaint {
-  external void setBlendMode(SkBlendMode blendMode);
-  external void setStyle(SkPaintStyle paintStyle);
-  external void setStrokeWidth(double width);
-  external void setStrokeCap(SkStrokeCap cap);
-  external void setStrokeJoin(SkStrokeJoin join);
-  external void setAntiAlias(bool isAntiAlias);
-  external void setColorInt(int color);
-  external void setShader(SkShader? shader);
-  external void setMaskFilter(SkMaskFilter? maskFilter);
-  external void setColorFilter(SkColorFilter? colorFilter);
-  external void setStrokeMiter(double miterLimit);
-  external void setImageFilter(SkImageFilter? imageFilter);
-  external void delete();
+  external JSVoid setBlendMode(SkBlendMode blendMode);
+  external JSVoid setStyle(SkPaintStyle paintStyle);
+
+  @JS('setStrokeWidth')
+  external JSVoid _setStrokeWidth(JSNumber width);
+  JSVoid setStrokeWidth(double width) => _setStrokeWidth(width.toJS);
+
+  external JSVoid setStrokeCap(SkStrokeCap cap);
+  external JSVoid setStrokeJoin(SkStrokeJoin join);
+
+  @JS('setAntiAlias')
+  external JSVoid _setAntiAlias(JSBoolean isAntiAlias);
+  void setAntiAlias(bool isAntiAlias) => _setAntiAlias(isAntiAlias.toJS);
+
+  @JS('setColorInt')
+  external JSVoid _setColorInt(JSNumber color);
+  void setColorInt(double color) => _setColorInt(color.toJS);
+
+  external JSVoid setShader(SkShader? shader);
+  external JSVoid setMaskFilter(SkMaskFilter? maskFilter);
+  external JSVoid setColorFilter(SkColorFilter? colorFilter);
+
+  @JS('setStrokeMiter')
+  external JSVoid _setStrokeMiter(JSNumber miterLimit);
+  void setStrokeMiter(double miterLimit) => _setStrokeMiter(miterLimit.toJS);
+
+  external JSVoid setImageFilter(SkImageFilter? imageFilter);
+  external JSVoid delete();
 }
 
 @JS()
@@ -1075,7 +1375,8 @@ abstract class CkFilterOptions {}
 @anonymous
 @staticInterop
 class _CkCubicFilterOptions extends CkFilterOptions {
-  external factory _CkCubicFilterOptions({double B, double C});
+  external factory _CkCubicFilterOptions(
+      {required JSNumber B, required JSNumber C});
 }
 
 @JS()
@@ -1101,8 +1402,8 @@ final Map<ui.FilterQuality, CkFilterOptions> _filterOptions =
     mipmap: canvasKit.MipmapMode.Linear,
   ),
   ui.FilterQuality.high: _CkCubicFilterOptions(
-    B: 1.0 / 3,
-    C: 1.0 / 3,
+    B: (1.0 / 3).toJS,
+    C: (1.0 / 3).toJS,
   ),
 };
 
@@ -1116,7 +1417,7 @@ CkFilterOptions toSkFilterOptions(ui.FilterQuality filterQuality) {
 class SkMaskFilter {}
 
 extension SkMaskFilterExtension on SkMaskFilter {
-  external void delete();
+  external JSVoid delete();
 }
 
 @JS()
@@ -1124,10 +1425,20 @@ extension SkMaskFilterExtension on SkMaskFilter {
 class SkColorFilterNamespace {}
 
 extension SkColorFilterNamespaceExtension on SkColorFilterNamespace {
-  external SkColorFilter? MakeBlend(Float32List color, SkBlendMode blendMode);
-  external SkColorFilter MakeMatrix(
-    Float32List matrix, // 20-element matrix
+  @JS('MakeBlend')
+  external SkColorFilter? _MakeBlend(
+      JSFloat32Array color, SkBlendMode blendMode);
+  SkColorFilter? MakeBlend(Float32List color, SkBlendMode blendMode) =>
+      _MakeBlend(color.toJS, blendMode);
+
+  @JS('MakeMatrix')
+  external SkColorFilter _MakeMatrix(
+    JSFloat32Array matrix, // 20-element matrix
   );
+  SkColorFilter MakeMatrix(
+    Float32List matrix, // 20-element matrix
+  ) => _MakeMatrix(matrix.toJS);
+
   external SkColorFilter MakeLinearToSRGBGamma();
   external SkColorFilter MakeSRGBToLinearGamma();
   external SkColorFilter MakeCompose(SkColorFilter? outer, SkColorFilter inner);
@@ -1139,7 +1450,7 @@ extension SkColorFilterNamespaceExtension on SkColorFilterNamespace {
 class SkColorFilter {}
 
 extension SkColorFilterExtension on SkColorFilter {
-  external void delete();
+  external JSVoid delete();
 }
 
 @JS()
@@ -1147,22 +1458,35 @@ extension SkColorFilterExtension on SkColorFilter {
 class SkImageFilterNamespace {}
 
 extension SkImageFilterNamespaceExtension on SkImageFilterNamespace {
-  external SkImageFilter MakeBlur(
+  @JS('MakeBlur')
+  external SkImageFilter _MakeBlur(
+    JSNumber sigmaX,
+    JSNumber sigmaY,
+    SkTileMode tileMode,
+    JSVoid input, // we don't use this yet
+  );
+  SkImageFilter MakeBlur(
     double sigmaX,
     double sigmaY,
     SkTileMode tileMode,
     void input, // we don't use this yet
-  );
+  ) => _MakeBlur(sigmaX.toJS, sigmaY.toJS, tileMode, input);
 
-  external SkImageFilter MakeMatrixTransform(
+  @JS('MakeMatrixTransform')
+  external SkImageFilter _MakeMatrixTransform(
+    JSFloat32Array matrix, // 3x3 matrix
+    CkFilterOptions filterOptions,
+    JSVoid input, // we don't use this yet
+  );
+  SkImageFilter MakeMatrixTransform(
     Float32List matrix, // 3x3 matrix
     CkFilterOptions filterOptions,
     void input, // we don't use this yet
-  );
+  ) => _MakeMatrixTransform(matrix.toJS, filterOptions, input);
 
   external SkImageFilter MakeColorFilter(
     SkColorFilter colorFilter,
-    void input, // we don't use this yet
+    JSVoid input, // we don't use this yet
   );
 
   external SkImageFilter MakeCompose(
@@ -1177,7 +1501,13 @@ extension SkImageFilterNamespaceExtension on SkImageFilterNamespace {
 class SkImageFilter {}
 
 extension SkImageFilterExtension on SkImageFilter {
-  external void delete();
+  external JSVoid delete();
+
+
+  @JS('getOutputBounds')
+  external JSInt32Array _getOutputBounds(JSFloat32Array bounds);
+  Int32List getOutputBounds(Float32List bounds) =>
+      _getOutputBounds(bounds.toJS).toDart;
 }
 
 @JS()
@@ -1186,7 +1516,10 @@ class SkPathNamespace {}
 
 extension SkPathNamespaceExtension on SkPathNamespace {
   /// Creates an [SkPath] using commands obtained from [SkPath.toCmds].
-  external SkPath MakeFromCmds(List<dynamic> pathCommands);
+  @JS('MakeFromCmds')
+  external SkPath _MakeFromCmds(JSAny pathCommands);
+  SkPath MakeFromCmds(List<dynamic> pathCommands) =>
+      _MakeFromCmds(pathCommands.toJSAnyShallow);
 
   /// Creates an [SkPath] by combining [path1] and [path2] using [pathOp].
   external SkPath MakeFromOp(SkPath path1, SkPath path2, SkPathOp pathOp);
@@ -1273,34 +1606,46 @@ Float32List toSkColorStops(List<double>? colorStops) {
   return skColorStops;
 }
 
-@JS('Float32Array')
-external _NativeFloat32ArrayType get _nativeFloat32ArrayType;
-
 @JS()
 @staticInterop
-class _NativeFloat32ArrayType {}
+abstract class _NativeType {}
+
+@JS('Float32Array')
+external _NativeType get _nativeFloat32ArrayType;
+
+@JS('Uint32Array')
+external _NativeType get _nativeUint32ArrayType;
 
 @JS('window.flutterCanvasKit.Malloc')
-external SkFloat32List _mallocFloat32List(
-  _NativeFloat32ArrayType float32ListType,
-  int size,
-);
+external JSAny _malloc(_NativeType nativeType, JSNumber length);
 
-/// Allocates a [Float32List] backed by WASM memory, managed by
-/// a [SkFloat32List].
+/// Allocates a [Float32List] of [length] elements, backed by WASM memory,
+/// managed by a [SkFloat32List].
 ///
-/// To free the allocated array use [freeFloat32List].
-SkFloat32List mallocFloat32List(int size) {
-  return _mallocFloat32List(_nativeFloat32ArrayType, size);
+/// To free the allocated array use [free].
+SkFloat32List mallocFloat32List(int length) {
+  return _malloc(_nativeFloat32ArrayType, length.toJS) as SkFloat32List;
 }
 
-/// Frees the WASM memory occupied by a [SkFloat32List].
+/// Allocates a [Uint32List] of [length] elements, backed by WASM memory,
+/// managed by a [SkUint32List].
+///
+/// To free the allocated array use [free].
+SkUint32List mallocUint32List(int length) {
+  return _malloc(_nativeUint32ArrayType, length.toJS) as SkUint32List;
+}
+
+/// Frees the WASM memory occupied by a [SkFloat32List] or [SkUint32List].
 ///
 /// The [list] is no longer usable after calling this function.
 ///
 /// Use this function to free lists owned by the engine.
 @JS('window.flutterCanvasKit.Free')
-external void freeFloat32List(SkFloat32List list);
+external JSVoid free(MallocObj list);
+
+@JS()
+@staticInterop
+abstract class MallocObj {}
 
 /// Wraps a [Float32List] backed by WASM memory.
 ///
@@ -1309,17 +1654,59 @@ external void freeFloat32List(SkFloat32List list);
 /// that's attached to the current WASM memory block.
 @JS()
 @staticInterop
-class SkFloat32List {}
+class SkFloat32List extends MallocObj {}
 
 extension SkFloat32ListExtension on SkFloat32List {
+  /// The number of objects this pointer refers to.
+  @JS('length')
+  external JSNumber get _length;
+  double get length => _length.toDartDouble;
+
+  @JS('length')
+  external set _length(JSNumber length);
+  set length(double l) => _length = l.toJS;
+
   /// Returns the [Float32List] object backed by WASM memory.
   ///
-  /// Do not reuse the returned list across multiple WASM function/method
+  /// Do not reuse the returned array across multiple WASM function/method
+  /// invocations that may lead to WASM memory to grow. When WASM memory
+  /// grows, the returned [Float32List] object becomes "detached" and is no
+  /// longer usable. Instead, call this method every time you need to read from
+  /// or write to the list.
+  @JS('toTypedArray')
+  external JSFloat32Array _toTypedArray();
+  Float32List toTypedArray() => _toTypedArray().toDart;
+}
+
+/// Wraps a [Uint32List] backed by WASM memory.
+///
+/// This wrapper is necessary because the raw [Uint32List] will get detached
+/// when WASM grows its memory. Call [toTypedArray] to get a new instance
+/// that's attached to the current WASM memory block.
+@JS()
+@staticInterop
+class SkUint32List extends MallocObj {}
+
+extension SkUint32ListExtension on SkUint32List {
+  /// The number of objects this pointer refers to.
+  @JS('length')
+  external JSNumber get _length;
+  double get length => _length.toDartDouble;
+
+  @JS('length')
+  external set _length(JSNumber length);
+  set length(double l) => _length = l.toJS;
+
+  /// Returns the [Uint32List] object backed by WASM memory.
+  ///
+  /// Do not reuse the returned array across multiple WASM function/method
   /// invocations that may lead to WASM memory to grow. When WASM memory
-  /// grows the [Float32List] object becomes "detached" and is no longer
-  /// usable. Instead, call this method every time you need to read from
+  /// grows, the returned [Uint32List] object becomes "detached" and is no
+  /// longer usable. Instead, call this method every time you need to read from
   /// or write to the list.
-  external Float32List toTypedArray();
+  @JS('toTypedArray')
+  external JSUint32Array _toTypedArray();
+  Uint32List toTypedArray() => _toTypedArray().toDart;
 }
 
 /// Writes [color] information into the given [skColor] buffer.
@@ -1368,22 +1755,52 @@ final SkFloat32List _sharedSkColor3 = mallocFloat32List(4);
 @JS('window.flutterCanvasKit.Path')
 @staticInterop
 class SkPath {
-  external factory SkPath([SkPath? other]);
+  external factory SkPath();
+  external factory SkPath.from(SkPath other);
 }
 
 extension SkPathExtension on SkPath {
-  external void setFillType(SkFillType fillType);
-  external void addArc(
+  external JSVoid setFillType(SkFillType fillType);
+
+  @JS('addArc')
+  external JSVoid _addArc(
+    JSFloat32Array oval,
+    JSNumber startAngleDegrees,
+    JSNumber sweepAngleDegrees,
+  );
+  void addArc(
     Float32List oval,
     double startAngleDegrees,
     double sweepAngleDegrees,
+  ) => _addArc(oval.toJS, startAngleDegrees.toJS, sweepAngleDegrees.toJS);
+
+  @JS('addOval')
+  external JSVoid _addOval(
+    JSFloat32Array oval,
+    JSBoolean counterClockWise,
+    JSNumber startIndex,
   );
-  external void addOval(
+  void addOval(
     Float32List oval,
     bool counterClockWise,
-    int startIndex,
-  );
-  external void addPath(
+    double startIndex,
+  ) => _addOval(oval.toJS, counterClockWise.toJS, startIndex.toJS);
+
+  @JS('addPath')
+  external JSVoid _addPath(
+    SkPath other,
+    JSNumber scaleX,
+    JSNumber skewX,
+    JSNumber transX,
+    JSNumber skewY,
+    JSNumber scaleY,
+    JSNumber transY,
+    JSNumber pers0,
+    JSNumber pers1,
+    JSNumber pers2,
+    JSBoolean extendPath,
+  );
+  void addPath(
     SkPath other,
     double scaleX,
     double skewX,
@@ -1395,25 +1812,64 @@ extension SkPathExtension on SkPath {
     double pers1,
     double pers2,
     bool extendPath,
+  ) => _addPath(other, scaleX.toJS, skewX.toJS, transX.toJS, skewY.toJS,
+                scaleY.toJS, transY.toJS, pers0.toJS, pers1.toJS, pers2.toJS,
+                extendPath.toJS);
+
+  @JS('addPoly')
+  external JSVoid _addPoly(
+    JSFloat32Array points,
+    JSBoolean close,
   );
-  external void addPoly(
+  void addPoly(
     Float32List points,
     bool close,
+  ) => _addPoly(points.toJS, close.toJS);
+
+  @JS('addRRect')
+  external JSVoid _addRRect(
+    JSFloat32Array rrect,
+    JSBoolean counterClockWise,
   );
-  external void addRRect(
+  void addRRect(
     Float32List rrect,
     bool counterClockWise,
+  ) => _addRRect(rrect.toJS, counterClockWise.toJS);
+
+  @JS('addRect')
+  external JSVoid _addRect(
+    JSFloat32Array rect,
   );
-  external void addRect(
+  void addRect(
     Float32List rect,
+  ) => _addRect(rect.toJS);
+
+  @JS('arcToOval')
+  external JSVoid _arcToOval(
+    JSFloat32Array oval,
+    JSNumber startAngleDegrees,
+    JSNumber sweepAngleDegrees,
+    JSBoolean forceMoveTo,
   );
-  external void arcToOval(
+  void arcToOval(
     Float32List oval,
     double startAngleDegrees,
     double sweepAngleDegrees,
     bool forceMoveTo,
-  );
-  external void arcToRotated(
+  ) => _arcToOval(oval.toJS, startAngleDegrees.toJS, sweepAngleDegrees.toJS,
+                  forceMoveTo.toJS);
+
+  @JS('arcToRotated')
+  external JSVoid _arcToRotated(
+    JSNumber radiusX,
+    JSNumber radiusY,
+    JSNumber rotation,
+    JSBoolean useSmallArc,
+    JSBoolean counterClockWise,
+    JSNumber x,
+    JSNumber y,
+  );
+  void arcToRotated(
     double radiusX,
     double radiusY,
     double rotation,
@@ -1421,37 +1877,93 @@ extension SkPathExtension on SkPath {
     bool counterClockWise,
     double x,
     double y,
+  ) => _arcToRotated(radiusX.toJS, radiusY.toJS, rotation.toJS,
+                     useSmallArc.toJS, counterClockWise.toJS,
+                     x.toJS, y.toJS);
+
+  external JSVoid close();
+
+  @JS('conicTo')
+  external JSVoid _conicTo(
+    JSNumber x1,
+    JSNumber y1,
+    JSNumber x2,
+    JSNumber y2,
+    JSNumber w,
   );
-  external void close();
-  external void conicTo(
+  void conicTo(
     double x1,
     double y1,
     double x2,
     double y2,
     double w,
+  ) => _conicTo(x1.toJS, y1.toJS, x2.toJS, y2.toJS, w.toJS);
+
+  @JS('contains')
+  external JSBoolean _contains(
+    JSNumber x,
+    JSNumber y,
   );
-  external bool contains(
+  bool contains(
     double x,
     double y,
-  );
-  external void cubicTo(
+  ) => _contains(x.toJS, y.toJS).toDart;
+
+  @JS('cubicTo')
+  external JSVoid _cubicTo(
+    JSNumber x1,
+    JSNumber y1,
+    JSNumber x2,
+    JSNumber y2,
+    JSNumber x3,
+    JSNumber y3,
+  );
+  void cubicTo(
     double x1,
     double y1,
     double x2,
     double y2,
     double x3,
     double y3,
+  ) => _cubicTo(x1.toJS, y1.toJS, x2.toJS, y2.toJS, x3.toJS, y3.toJS);
+
+  @JS('getBounds')
+  external JSFloat32Array _getBounds();
+  Float32List getBounds() => _getBounds().toDart;
+
+  @JS('lineTo')
+  external JSVoid _lineTo(JSNumber x, JSNumber y);
+  void lineTo(double x, double y) => _lineTo(x.toJS, y.toJS);
+
+  @JS('moveTo')
+  external JSVoid _moveTo(JSNumber x, JSNumber y);
+  void moveTo(double x, double y) => _moveTo(x.toJS, y.toJS);
+
+  @JS('quadTo')
+  external JSVoid _quadTo(
+    JSNumber x1,
+    JSNumber y1,
+    JSNumber x2,
+    JSNumber y2,
   );
-  external Float32List getBounds();
-  external void lineTo(double x, double y);
-  external void moveTo(double x, double y);
-  external void quadTo(
+  void quadTo(
     double x1,
     double y1,
     double x2,
     double y2,
-  );
-  external void rArcTo(
+  ) => _quadTo(x1.toJS, y1.toJS, x2.toJS, y2.toJS);
+
+  @JS('rArcTo')
+  external JSVoid _rArcTo(
+    JSNumber x,
+    JSNumber y,
+    JSNumber rotation,
+    JSBoolean useSmallArc,
+    JSBoolean counterClockWise,
+    JSNumber deltaX,
+    JSNumber deltaY,
+  );
+  void rArcTo(
     double x,
     double y,
     double rotation,
@@ -1459,35 +1971,90 @@ extension SkPathExtension on SkPath {
     bool counterClockWise,
     double deltaX,
     double deltaY,
-  );
-  external void rConicTo(
+  ) => _rArcTo(x.toJS, y.toJS, rotation.toJS, useSmallArc.toJS,
+               counterClockWise.toJS, deltaX.toJS, deltaY.toJS);
+
+  @JS('rConicTo')
+  external JSVoid _rConicTo(
+    JSNumber x1,
+    JSNumber y1,
+    JSNumber x2,
+    JSNumber y2,
+    JSNumber w,
+  );
+  void rConicTo(
     double x1,
     double y1,
     double x2,
     double y2,
     double w,
-  );
-  external void rCubicTo(
+  ) => _rConicTo(x1.toJS, y1.toJS, x2.toJS, y2.toJS, w.toJS);
+
+  @JS('rCubicTo')
+  external JSVoid _rCubicTo(
+    JSNumber x1,
+    JSNumber y1,
+    JSNumber x2,
+    JSNumber y2,
+    JSNumber x3,
+    JSNumber y3,
+  );
+  void rCubicTo(
     double x1,
     double y1,
     double x2,
     double y2,
     double x3,
     double y3,
+  ) => _rCubicTo(x1.toJS, y1.toJS, x2.toJS, y2.toJS, x3.toJS, y3.toJS);
+
+  @JS('rLineTo')
+  external JSVoid _rLineTo(JSNumber x, JSNumber y);
+  void rLineTo(double x, double y) => _rLineTo(x.toJS, y.toJS);
+
+  @JS('rMoveTo')
+  external JSVoid _rMoveTo(JSNumber x, JSNumber y);
+  void rMoveTo(double x, double y) => _rMoveTo(x.toJS, y.toJS);
+
+  @JS('rQuadTo')
+  external JSVoid _rQuadTo(
+    JSNumber x1,
+    JSNumber y1,
+    JSNumber x2,
+    JSNumber y2,
   );
-  external void rLineTo(double x, double y);
-  external void rMoveTo(double x, double y);
-  external void rQuadTo(
+  void rQuadTo(
     double x1,
     double y1,
     double x2,
     double y2,
-  );
-  external void reset();
-  external String toSVGString();
-  external bool isEmpty();
+  ) => _rQuadTo(x1.toJS, y1.toJS, x2.toJS, y2.toJS);
+
+  external JSVoid reset();
+
+  @JS('toSVGString')
+  external JSString _toSVGString();
+  String toSVGString() => _toSVGString().toDart;
+
+  @JS('isEmpty')
+  external JSBoolean _isEmpty();
+  bool isEmpty() => _isEmpty().toDart;
+
   external SkPath copy();
-  external void transform(
+
+  @JS('transform')
+  external JSVoid _transform(
+    JSNumber scaleX,
+    JSNumber skewX,
+    JSNumber transX,
+    JSNumber skewY,
+    JSNumber scaleY,
+    JSNumber transY,
+    JSNumber pers0,
+    JSNumber pers1,
+    JSNumber pers2,
+  );
+  void transform(
     double scaleX,
     double skewX,
     double transX,
@@ -1497,29 +2064,38 @@ extension SkPathExtension on SkPath {
     double pers0,
     double pers1,
     double pers2,
-  );
+  ) => _transform(scaleX.toJS, skewX.toJS, transX.toJS,
+                  skewY.toJS, scaleY.toJS, transY.toJS,
+                  pers0.toJS, pers1.toJS, pers2.toJS);
 
   /// Serializes the path into a list of commands.
   ///
   /// The list can be used to create a new [SkPath] using
   /// [CanvasKit.Path.MakeFromCmds].
-  external List<dynamic> toCmds();
+  @JS('toCmds')
+  external JSAny _toCmds();
+  List<dynamic> toCmds() => _toCmds().toObjectShallow as List<dynamic>;
 
-  external void delete();
+  external JSVoid delete();
 }
 
 @JS('window.flutterCanvasKit.ContourMeasureIter')
 @staticInterop
 class SkContourMeasureIter {
-  external factory SkContourMeasureIter(
+  factory SkContourMeasureIter(
       SkPath path,
       bool forceClosed,
-      double resScale);
+      double resScale) => SkContourMeasureIter._(path, forceClosed.toJS,
+      resScale.toJS);
+  external factory SkContourMeasureIter._(
+      SkPath path,
+      JSBoolean forceClosed,
+      JSNumber resScale);
 }
 
 extension SkContourMeasureIterExtension on SkContourMeasureIter {
   external SkContourMeasure? next();
-  external void delete();
+  external JSVoid delete();
 }
 
 @JS()
@@ -1527,11 +2103,26 @@ extension SkContourMeasureIterExtension on SkContourMeasureIter {
 class SkContourMeasure {}
 
 extension SkContourMeasureExtension on SkContourMeasure {
-  external SkPath getSegment(double start, double end, bool startWithMoveTo);
-  external Float32List getPosTan(double distance);
-  external bool isClosed();
-  external double length();
-  external void delete();
+  @JS('getSegment')
+  external SkPath _getSegment(
+      JSNumber start, JSNumber end, JSBoolean startWithMoveTo);
+  SkPath getSegment(double start, double end, bool startWithMoveTo) =>
+      _getSegment(start.toJS, end.toJS, startWithMoveTo.toJS);
+
+  @JS('getPosTan')
+  external JSFloat32Array _getPosTan(JSNumber distance);
+  Float32List getPosTan(double distance) =>
+      _getPosTan(distance.toJS).toDart;
+
+  @JS('isClosed')
+  external JSBoolean _isClosed();
+  bool isClosed() => _isClosed().toDart;
+
+  @JS('length')
+  external JSNumber _length();
+  double length() => _length().toDartDouble;
+
+  external JSVoid delete();
 }
 
 // TODO(hterkelsen): Use a shared malloc'ed array for performance.
@@ -1590,7 +2181,7 @@ Float32List toOuterSkRect(ui.RRect rrect) {
 /// Uses `CanvasKit.Malloc` to allocate storage for the points in the WASM
 /// memory to avoid unnecessary copying. Unless CanvasKit takes ownership of
 /// the list the returned list must be explicitly freed using
-/// [freeMallocedFloat32List].
+/// [free].
 SkFloat32List toMallocedSkPoints(List<ui.Offset> points) {
   final int len = points.length;
   final SkFloat32List skPoints = mallocFloat32List(len * 2);
@@ -1639,9 +2230,14 @@ class SkPictureRecorder {
 }
 
 extension SkPictureRecorderExtension on SkPictureRecorder {
-  external SkCanvas beginRecording(Float32List bounds);
+  @JS('beginRecording')
+  external SkCanvas _beginRecording(
+      JSFloat32Array bounds, JSBoolean computeBounds);
+  SkCanvas beginRecording(Float32List bounds) =>
+      _beginRecording(bounds.toJS, true.toJS);
+
   external SkPicture finishRecordingAsPicture();
-  external void delete();
+  external JSVoid delete();
 }
 
 /// We do not use the `delete` method (which may be removed in the future anyway).
@@ -1655,163 +2251,378 @@ extension SkPictureRecorderExtension on SkPictureRecorder {
 class SkCanvas {}
 
 extension SkCanvasExtension on SkCanvas {
-  external void clear(Float32List color);
-  external void clipPath(
+  @JS('clear')
+  external JSVoid _clear(JSFloat32Array color);
+  void clear(Float32List color) => _clear(color.toJS);
+
+  @JS('clipPath')
+  external JSVoid _clipPath(
+    SkPath path,
+    SkClipOp clipOp,
+    JSBoolean doAntiAlias,
+  );
+  void clipPath(
     SkPath path,
     SkClipOp clipOp,
     bool doAntiAlias,
+  ) => _clipPath(path, clipOp, doAntiAlias.toJS);
+
+  @JS('clipRRect')
+  external JSVoid _clipRRect(
+    JSFloat32Array rrect,
+    SkClipOp clipOp,
+    JSBoolean doAntiAlias,
   );
-  external void clipRRect(
+  void clipRRect(
     Float32List rrect,
     SkClipOp clipOp,
     bool doAntiAlias,
+  ) => _clipRRect(rrect.toJS, clipOp, doAntiAlias.toJS);
+
+  @JS('clipRect')
+  external JSVoid _clipRect(
+    JSFloat32Array rect,
+    SkClipOp clipOp,
+    JSBoolean doAntiAlias,
   );
-  external void clipRect(
-    Float32List rrect,
+  void clipRect(
+    Float32List rect,
     SkClipOp clipOp,
     bool doAntiAlias,
+  ) => _clipRect(rect.toJS, clipOp, doAntiAlias.toJS);
+
+  @JS('getDeviceClipBounds')
+  external JSInt32Array _getDeviceClipBounds();
+  Int32List getDeviceClipBounds() => _getDeviceClipBounds().toDart;
+
+  @JS('drawArc')
+  external JSVoid _drawArc(
+    JSFloat32Array oval,
+    JSNumber startAngleDegrees,
+    JSNumber sweepAngleDegrees,
+    JSBoolean useCenter,
+    SkPaint paint,
   );
-  external Int32List getDeviceClipBounds();
-  external void drawArc(
+  void drawArc(
     Float32List oval,
     double startAngleDegrees,
     double sweepAngleDegrees,
     bool useCenter,
     SkPaint paint,
+  ) => _drawArc(oval.toJS, startAngleDegrees.toJS, sweepAngleDegrees.toJS,
+                useCenter.toJS, paint);
+
+  @JS('drawAtlas')
+  external JSVoid _drawAtlas(
+    SkImage image,
+    JSFloat32Array rects,
+    JSFloat32Array rstTransforms,
+    SkPaint paint,
+    SkBlendMode blendMode,
+    JSUint32Array? colors,
   );
-  external void drawAtlas(
+  void drawAtlas(
     SkImage image,
     Float32List rects,
     Float32List rstTransforms,
     SkPaint paint,
     SkBlendMode blendMode,
     Uint32List? colors,
+  ) => _drawAtlas(image, rects.toJS, rstTransforms.toJS, paint,
+                  blendMode, colors?.toJS);
+
+  @JS('drawCircle')
+  external JSVoid _drawCircle(
+    JSNumber x,
+    JSNumber y,
+    JSNumber radius,
+    SkPaint paint,
   );
-  external void drawCircle(
+  void drawCircle(
     double x,
     double y,
     double radius,
     SkPaint paint,
+  ) => _drawCircle(x.toJS, y.toJS, radius.toJS, paint);
+
+  @JS('drawColorInt')
+  external JSVoid _drawColorInt(
+    JSNumber color,
+    SkBlendMode blendMode,
   );
-  external void drawColorInt(
-    int color,
+  void drawColorInt(
+    double color,
     SkBlendMode blendMode,
+  ) => _drawColorInt(color.toJS, blendMode);
+
+  @JS('drawDRRect')
+  external JSVoid _drawDRRect(
+    JSFloat32Array outer,
+    JSFloat32Array inner,
+    SkPaint paint,
   );
-  external void drawDRRect(
+  void drawDRRect(
     Float32List outer,
     Float32List inner,
     SkPaint paint,
+  ) => _drawDRRect(outer.toJS, inner.toJS, paint);
+
+  @JS('drawImageCubic')
+  external JSVoid _drawImageCubic(
+    SkImage image,
+    JSNumber x,
+    JSNumber y,
+    JSNumber B,
+    JSNumber C,
+    SkPaint paint,
   );
-  external void drawImageCubic(
+  void drawImageCubic(
     SkImage image,
     double x,
     double y,
     double B,
     double C,
     SkPaint paint,
+  ) => _drawImageCubic(image, x.toJS, y.toJS, B.toJS, C.toJS, paint);
+
+  @JS('drawImageOptions')
+  external JSVoid _drawImageOptions(
+    SkImage image,
+    JSNumber x,
+    JSNumber y,
+    SkFilterMode filterMode,
+    SkMipmapMode mipmapMode,
+    SkPaint paint,
   );
-  external void drawImageOptions(
+  void drawImageOptions(
     SkImage image,
     double x,
     double y,
     SkFilterMode filterMode,
     SkMipmapMode mipmapMode,
     SkPaint paint,
+  ) => _drawImageOptions(image, x.toJS, y.toJS, filterMode, mipmapMode, paint);
+
+  @JS('drawImageRectCubic')
+  external JSVoid _drawImageRectCubic(
+    SkImage image,
+    JSFloat32Array src,
+    JSFloat32Array dst,
+    JSNumber B,
+    JSNumber C,
+    SkPaint paint,
   );
-  external void drawImageRectCubic(
+  void drawImageRectCubic(
     SkImage image,
     Float32List src,
     Float32List dst,
     double B,
     double C,
     SkPaint paint,
+  ) => _drawImageRectCubic(image, src.toJS, dst.toJS, B.toJS, C.toJS, paint);
+
+  @JS('drawImageRectOptions')
+  external JSVoid _drawImageRectOptions(
+    SkImage image,
+    JSFloat32Array src,
+    JSFloat32Array dst,
+    SkFilterMode filterMode,
+    SkMipmapMode mipmapMode,
+    SkPaint paint,
   );
-  external void drawImageRectOptions(
+  void drawImageRectOptions(
     SkImage image,
     Float32List src,
     Float32List dst,
     SkFilterMode filterMode,
     SkMipmapMode mipmapMode,
     SkPaint paint,
+  ) => _drawImageRectOptions(image, src.toJS, dst.toJS, filterMode, mipmapMode,
+                             paint);
+
+  @JS('drawImageNine')
+  external JSVoid _drawImageNine(
+    SkImage image,
+    JSFloat32Array center,
+    JSFloat32Array dst,
+    SkFilterMode filterMode,
+    SkPaint paint,
   );
-  external void drawImageNine(
+  void drawImageNine(
     SkImage image,
     Float32List center,
     Float32List dst,
     SkFilterMode filterMode,
     SkPaint paint,
+  ) => _drawImageNine(image, center.toJS, dst.toJS, filterMode, paint);
+
+  @JS('drawLine')
+  external JSVoid _drawLine(
+    JSNumber x1,
+    JSNumber y1,
+    JSNumber x2,
+    JSNumber y2,
+    SkPaint paint,
   );
-  external void drawLine(
+  void drawLine(
     double x1,
     double y1,
     double x2,
     double y2,
     SkPaint paint,
+  ) => _drawLine(x1.toJS, y1.toJS, x2.toJS, y2.toJS, paint);
+
+  @JS('drawOval')
+  external JSVoid _drawOval(
+    JSFloat32Array rect,
+    SkPaint paint,
   );
-  external void drawOval(
+  void drawOval(
     Float32List rect,
     SkPaint paint,
-  );
-  external void drawPaint(
+  ) => _drawOval(rect.toJS, paint);
+
+  external JSVoid drawPaint(
     SkPaint paint,
   );
-  external void drawPath(
+  external JSVoid drawPath(
     SkPath path,
     SkPaint paint,
   );
-  external void drawPoints(
+
+  @JS('drawPoints')
+  external JSVoid _drawPoints(
     SkPointMode pointMode,
-    Float32List points,
+    JSFloat32Array points,
     SkPaint paint,
   );
-  external void drawRRect(
-    Float32List rrect,
+  void drawPoints(
+    SkPointMode pointMode,
+    Float32List points,
+    SkPaint paint,
+  ) => _drawPoints(pointMode, points.toJS, paint);
+
+  @JS('drawRRect')
+  external JSVoid _drawRRect(
+    JSFloat32Array rrect,
     SkPaint paint,
   );
-  external void drawRect(
+  void drawRRect(
     Float32List rrect,
     SkPaint paint,
+  ) => _drawRRect(rrect.toJS, paint);
+
+  @JS('drawRect')
+  external JSVoid _drawRect(
+    JSFloat32Array rect,
+    SkPaint paint,
   );
-  external void drawShadow(
+  void drawRect(
+    Float32List rect,
+    SkPaint paint,
+  ) => _drawRect(rect.toJS, paint);
+
+  @JS('drawShadow')
+  external JSVoid _drawShadow(
+    SkPath path,
+    JSFloat32Array zPlaneParams,
+    JSFloat32Array lightPos,
+    JSNumber lightRadius,
+    JSFloat32Array ambientColor,
+    JSFloat32Array spotColor,
+    JSNumber flags,
+  );
+  void drawShadow(
     SkPath path,
     Float32List zPlaneParams,
     Float32List lightPos,
     double lightRadius,
     Float32List ambientColor,
     Float32List spotColor,
-    int flags,
-  );
-  external void drawVertices(
+    double flags,
+  ) => _drawShadow(path, zPlaneParams.toJS, lightPos.toJS, lightRadius.toJS,
+                   ambientColor.toJS, spotColor.toJS, flags.toJS);
+
+  external JSVoid drawVertices(
     SkVertices vertices,
     SkBlendMode blendMode,
     SkPaint paint,
   );
-  external double save();
-  external double getSaveCount();
-  external void saveLayer(
+
+  @JS('save')
+  external JSNumber _save();
+  double save() => _save().toDartDouble;
+
+  @JS('getSaveCount')
+  external JSNumber _getSaveCount();
+  double getSaveCount() => _getSaveCount().toDartDouble;
+
+  @JS('saveLayer')
+  external JSVoid _saveLayer(
+    SkPaint? paint,
+    JSFloat32Array? bounds,
+    SkImageFilter? backdrop,
+    JSNumber? flags,
+  );
+  void saveLayer(
     SkPaint? paint,
     Float32List? bounds,
     SkImageFilter? backdrop,
     int? flags,
+  ) => _saveLayer(paint, bounds?.toJS, backdrop, flags?.toJS);
+
+  external JSVoid restore();
+
+  @JS('restoreToCount')
+  external JSVoid _restoreToCount(JSNumber count);
+  void restoreToCount(double count) => _restoreToCount(count.toJS);
+
+  @JS('rotate')
+  external JSVoid _rotate(
+    JSNumber angleDegrees,
+    JSNumber px,
+    JSNumber py,
   );
-  external void restore();
-  external void restoreToCount(int count);
-  external void rotate(
+  void rotate(
     double angleDegrees,
     double px,
     double py,
+  ) => _rotate(angleDegrees.toJS, px.toJS, py.toJS);
+
+  @JS('scale')
+  external JSVoid _scale(JSNumber x, JSNumber y);
+  void scale(double x, double y) => _scale(x.toJS, y.toJS);
+
+  @JS('skew')
+  external JSVoid _skew(JSNumber x, JSNumber y);
+  void skew(double x, double y) => _skew(x.toJS, y.toJS);
+
+  @JS('concat')
+  external JSVoid _concat(JSFloat32Array matrix);
+  void concat(Float32List matrix) => _concat(matrix.toJS);
+
+  @JS('translate')
+  external JSVoid _translate(JSNumber x, JSNumber y);
+  void translate(double x, double y) => _translate(x.toJS, y.toJS);
+
+  @JS('getLocalToDevice')
+  external JSAny _getLocalToDevice();
+  List<dynamic> getLocalToDevice() => _getLocalToDevice().toObjectShallow as
+      List<dynamic>;
+
+  external JSVoid drawPicture(SkPicture picture);
+
+  @JS('drawParagraph')
+  external JSVoid _drawParagraph(
+    SkParagraph paragraph,
+    JSNumber x,
+    JSNumber y,
   );
-  external void scale(double x, double y);
-  external void skew(double x, double y);
-  external void concat(Float32List matrix);
-  external void translate(double x, double y);
-  external List<dynamic> getLocalToDevice();
-  external void drawPicture(SkPicture picture);
-  external void drawParagraph(
+  void drawParagraph(
     SkParagraph paragraph,
     double x,
     double y,
-  );
+  ) => _drawParagraph(paragraph, x.toJS, y.toJS);
 }
 
 @JS()
@@ -1820,7 +2631,15 @@ extension SkCanvasExtension on SkCanvas {
 class SkPicture {}
 
 extension SkPictureExtension on SkPicture {
-  external void delete();
+  external JSVoid delete();
+
+  @JS('cullRect')
+  external JSFloat32Array _cullRect();
+  Float32List cullRect() => _cullRect().toDart;
+
+  @JS('approximateBytesUsed')
+  external JSNumber _approximateBytesUsed();
+  int approximateBytesUsed() => _approximateBytesUsed().toDartInt;
 }
 
 @JS()
@@ -1829,10 +2648,17 @@ extension SkPictureExtension on SkPicture {
 class SkParagraphBuilderNamespace {}
 
 extension SkParagraphBuilderNamespaceExtension on SkParagraphBuilderNamespace {
-  external SkParagraphBuilder MakeFromFontProvider(
+  external SkParagraphBuilder MakeFromFontCollection(
     SkParagraphStyle paragraphStyle,
-    TypefaceFontProvider? fontManager,
+    SkFontCollection? fontCollection,
   );
+
+  bool RequiresClientICU() {
+    if (!js_util.hasProperty(this, 'RequiresClientICU')) {
+      return false;
+    }
+    return js_util.callMethod(this, 'RequiresClientICU', const <Object>[],) as bool;
+  }
 }
 
 @JS()
@@ -1841,20 +2667,69 @@ extension SkParagraphBuilderNamespaceExtension on SkParagraphBuilderNamespace {
 class SkParagraphBuilder {}
 
 extension SkParagraphBuilderExtension on SkParagraphBuilder {
-  external void addText(String text);
-  external void pushStyle(SkTextStyle textStyle);
-  external void pushPaintStyle(
+  @JS('addText')
+  external JSVoid _addText(JSString text);
+  void addText(String text) => _addText(text.toJS);
+
+  external JSVoid pushStyle(SkTextStyle textStyle);
+  external JSVoid pushPaintStyle(
       SkTextStyle textStyle, SkPaint foreground, SkPaint background);
-  external void pop();
-  external void addPlaceholder(
+  external JSVoid pop();
+
+  @JS('addPlaceholder')
+  external JSVoid _addPlaceholder(
+    JSNumber width,
+    JSNumber height,
+    SkPlaceholderAlignment alignment,
+    SkTextBaseline baseline,
+    JSNumber offset,
+  );
+  void addPlaceholder(
     double width,
     double height,
     SkPlaceholderAlignment alignment,
     SkTextBaseline baseline,
     double offset,
-  );
+  ) => _addPlaceholder(width.toJS, height.toJS, alignment,
+                       baseline, offset.toJS);
+
+  @JS('getText')
+  external JSString _getTextUtf8();
+  String getTextUtf8() => _getTextUtf8().toDart;
+  // SkParagraphBuilder.getText() returns a utf8 string, we need to decode it
+  // into a utf16 string.
+  String getText() => utf8.decode(getTextUtf8().codeUnits);
+
+  @JS('setWordsUtf8')
+  external JSVoid _setWordsUtf8(JSUint32Array words);
+  void setWordsUtf8(Uint32List words) => _setWordsUtf8(words.toJS);
+
+  @JS('setWordsUtf16')
+  external JSVoid _setWordsUtf16(JSUint32Array words);
+  void setWordsUtf16(Uint32List words) => _setWordsUtf16(words.toJS);
+
+  @JS('setGraphemeBreaksUtf8')
+  external JSVoid _setGraphemeBreaksUtf8(JSUint32Array graphemes);
+  void setGraphemeBreaksUtf8(Uint32List graphemes) =>
+      _setGraphemeBreaksUtf8(graphemes.toJS);
+
+  @JS('setGraphemeBreaksUtf16')
+  external JSVoid _setGraphemeBreaksUtf16(JSUint32Array graphemes);
+  void setGraphemeBreaksUtf16(Uint32List graphemes) =>
+      _setGraphemeBreaksUtf16(graphemes.toJS);
+
+  @JS('setLineBreaksUtf8')
+  external JSVoid _setLineBreaksUtf8(JSUint32Array lineBreaks);
+  void setLineBreaksUtf8(Uint32List lineBreaks) =>
+      _setLineBreaksUtf8(lineBreaks.toJS);
+
+  @JS('setLineBreaksUtf16')
+  external JSVoid _setLineBreaksUtf16(JSUint32Array lineBreaks);
+  void setLineBreaksUtf16(Uint32List lineBreaks) =>
+      _setLineBreaksUtf16(lineBreaks.toJS);
+
   external SkParagraph build();
-  external void delete();
+  external JSVoid delete();
 }
 
 @JS()
@@ -1872,13 +2747,29 @@ class SkParagraphStyleProperties {
 extension SkParagraphStylePropertiesExtension on SkParagraphStyleProperties {
   external set textAlign(SkTextAlign? value);
   external set textDirection(SkTextDirection? value);
-  external set heightMultiplier(double? value);
+
+  @JS('heightMultiplier')
+  external set _heightMultiplier(JSNumber? value);
+  set heightMultiplier(double? value) => _heightMultiplier = value?.toJS;
+
   external set textHeightBehavior(SkTextHeightBehavior? value);
-  external set maxLines(int? value);
-  external set ellipsis(String? value);
+
+  @JS('maxLines')
+  external set _maxLines(JSNumber? value);
+  set maxLines(int? value) => _maxLines = value?.toJS;
+
+  @JS('ellipsis')
+  external set _ellipsis(JSString? value);
+  set ellipsis(String? value) => _ellipsis = value?.toJS;
+
   external set textStyle(SkTextStyleProperties? value);
   external set strutStyle(SkStrutStyleProperties? strutStyle);
-  external set replaceTabCharacters(bool? bool);
+
+  @JS('replaceTabCharacters')
+  external set _replaceTabCharacters(JSBoolean? bool);
+  set replaceTabCharacters(bool? bool) => _replaceTabCharacters = bool?.toJS;
+
+  external set applyRoundingHack(bool applyRoundingHack);
 }
 
 @JS()
@@ -1902,7 +2793,9 @@ extension SkTextDecorationStyleEnumExtension on SkTextDecorationStyleEnum {
 class SkTextDecorationStyle {}
 
 extension SkTextDecorationStyleExtension on SkTextDecorationStyle {
-  external double get value;
+  @JS('value')
+  external JSNumber get _value;
+  double get value => _value.toDartDouble;
 }
 
 final List<SkTextDecorationStyle> _skTextDecorationStyles =
@@ -1932,7 +2825,9 @@ extension SkTextBaselineEnumExtension on SkTextBaselineEnum {
 class SkTextBaseline {}
 
 extension SkTextBaselineExtension on SkTextBaseline {
-  external double get value;
+  @JS('value')
+  external JSNumber get _value;
+  double get value => _value.toDartDouble;
 }
 
 final List<SkTextBaseline> _skTextBaselines = <SkTextBaseline>[
@@ -1962,7 +2857,9 @@ extension SkPlaceholderAlignmentEnumExtension on SkPlaceholderAlignmentEnum {
 class SkPlaceholderAlignment {}
 
 extension SkPlaceholderAlignmentExtension on SkPlaceholderAlignment {
-  external double get value;
+  @JS('value')
+  external JSNumber get _value;
+  double get value => _value.toDartDouble;
 }
 
 final List<SkPlaceholderAlignment> _skPlaceholderAlignments =
@@ -1988,25 +2885,88 @@ class SkTextStyleProperties {
 }
 
 extension SkTextStylePropertiesExtension on SkTextStyleProperties {
-  external set backgroundColor(Float32List? value);
-  external set color(Float32List? value);
-  external set foregroundColor(Float32List? value);
-  external set decoration(int? value);
-  external set decorationThickness(double? value);
-  external set decorationColor(Float32List? value);
+  @JS('backgroundColor')
+  external set _backgroundColor(JSFloat32Array? value);
+  set backgroundColor(Float32List? value) =>
+      _backgroundColor = value?.toJS;
+
+  @JS('color')
+  external set _color(JSFloat32Array? value);
+  set color(Float32List? value) => _color = value?.toJS;
+
+  @JS('foregroundColor')
+  external set _foregroundColor(JSFloat32Array? value);
+  set foregroundColor(Float32List? value) => _foregroundColor = value?.toJS;
+
+  @JS('decoration')
+  external set _decoration(JSNumber? value);
+  set decoration(int? value) => _decoration = value?.toJS;
+
+  @JS('decorationThickness')
+  external set _decorationThickness(JSNumber? value);
+  set decorationThickness(double? value) =>
+      _decorationThickness = value?.toJS;
+
+  @JS('decorationColor')
+  external set _decorationColor(JSFloat32Array? value);
+  set decorationColor(Float32List? value) => _decorationColor = value?.toJS;
+
   external set decorationStyle(SkTextDecorationStyle? value);
   external set textBaseline(SkTextBaseline? value);
-  external set fontSize(double? value);
-  external set letterSpacing(double? value);
-  external set wordSpacing(double? value);
-  external set heightMultiplier(double? value);
-  external set halfLeading(bool? value);
-  external set locale(String? value);
-  external set fontFamilies(List<String>? value);
+
+  @JS('fontSize')
+  external set _fontSize(JSNumber? value);
+  set fontSize(double? value) => _fontSize = value?.toJS;
+
+  @JS('letterSpacing')
+  external set _letterSpacing(JSNumber? value);
+  set letterSpacing(double? value) => _letterSpacing = value?.toJS;
+
+  @JS('wordSpacing')
+  external set _wordSpacing(JSNumber? value);
+  set wordSpacing(double? value) => _wordSpacing = value?.toJS;
+
+  @JS('heightMultiplier')
+  external set _heightMultiplier(JSNumber? value);
+  set heightMultiplier(double? value) => _heightMultiplier = value?.toJS;
+
+  @JS('halfLeading')
+  external set _halfLeading(JSBoolean? value);
+  set halfLeading(bool? value) => _halfLeading = value?.toJS;
+
+  @JS('locale')
+  external set _locale(JSString? value);
+  set locale(String? value) => _locale = value?.toJS;
+
+  @JS('fontFamilies')
+  external set _fontFamilies(JSAny? value);
+  set fontFamilies(List<String>? value) => _fontFamilies = value?.toJSAnyShallow;
+
   external set fontStyle(SkFontStyle? value);
-  external set shadows(List<SkTextShadow>? value);
-  external set fontFeatures(List<SkFontFeature>? value);
-  external set fontVariations(List<SkFontVariation>? value);
+
+  @JS('shadows')
+  external set _shadows(JSArray<JSAny?>? value);
+  set shadows(List<SkTextShadow>? value) =>
+      // TODO(joshualitt): remove this cast when we reify JS types on JS
+      // backends.
+      // ignore: unnecessary_cast
+      _shadows = (value as List<JSAny>?)?.toJS;
+
+  @JS('fontFeatures')
+  external set _fontFeatures(JSArray<JSAny?>? value);
+  set fontFeatures(List<SkFontFeature>? value) =>
+      // TODO(joshualitt): remove this cast when we reify JS types on JS
+      // backends.
+      // ignore: unnecessary_cast
+      _fontFeatures = (value as List<JSAny>?)?.toJS;
+
+  @JS('fontVariations')
+  external set _fontVariations(JSArray<JSAny?>? value);
+  set fontVariations(List<SkFontVariation>? value) =>
+      // TODO(joshualitt): remove this cast when we reify JS types on JS
+      // backends.
+      // ignore: unnecessary_cast
+      _fontVariations = (value as List<JSAny>?)?.toJS;
 }
 
 @JS()
@@ -2017,14 +2977,36 @@ class SkStrutStyleProperties {
 }
 
 extension SkStrutStylePropertiesExtension on SkStrutStyleProperties {
-  external set fontFamilies(List<String>? value);
+  @JS('fontFamilies')
+  external set _fontFamilies(JSAny? value);
+  set fontFamilies(List<String>? value) =>
+      _fontFamilies = value?.toJSAnyShallow;
+
   external set fontStyle(SkFontStyle? value);
-  external set fontSize(double? value);
-  external set heightMultiplier(double? value);
-  external set halfLeading(bool? value);
-  external set leading(double? value);
-  external set strutEnabled(bool? value);
-  external set forceStrutHeight(bool? value);
+
+  @JS('fontSize')
+  external set _fontSize(JSNumber? value);
+  set fontSize(double? value) => _fontSize = value?.toJS;
+
+  @JS('heightMultiplier')
+  external set _heightMultiplier(JSNumber? value);
+  set heightMultiplier(double? value) => _heightMultiplier = value?.toJS;
+
+  @JS('halfLeading')
+  external set _halfLeading(JSBoolean? value);
+  set halfLeading(bool? value) => _halfLeading = value?.toJS;
+
+  @JS('leading')
+  external set _leading(JSNumber? value);
+  set leading(double? value) => _leading = value?.toJS;
+
+  @JS('strutEnabled')
+  external set _strutEnabled(JSBoolean? value);
+  set strutEnabled(bool? value) => _strutEnabled = value?.toJS;
+
+  @JS('forceStrutHeight')
+  external set _forceStrutHeight(JSBoolean? value);
+  set forceStrutHeight(bool? value) => _forceStrutHeight = value?.toJS;
 }
 
 @JS()
@@ -2047,9 +3029,17 @@ class SkTextShadow {
 }
 
 extension SkTextShadowExtension on SkTextShadow {
-  external set color(Float32List? value);
-  external set offset(Float32List? value);
-  external set blurRadius(double? value);
+  @JS('color')
+  external set _color(JSFloat32Array? value);
+  set color(Float32List? value) => _color = value?.toJS;
+
+  @JS('offset')
+  external set _offset(JSFloat32Array? value);
+  set offset(Float32List? value) => _offset = value?.toJS;
+
+  @JS('blurRadius')
+  external set _blurRadius(JSNumber? value);
+  set blurRadius(double? value) => _blurRadius = value?.toJS;
 }
 
 @JS()
@@ -2060,8 +3050,13 @@ class SkFontFeature {
 }
 
 extension SkFontFeatureExtension on SkFontFeature {
-  external set name(String? value);
-  external set value(int? value);
+  @JS('name')
+  external set _name(JSString? value);
+  set name(String? value) => _name = value?.toJS;
+
+  @JS('value')
+  external set _value(JSNumber? value);
+  set value(int? v) => _value = v?.toJS;
 }
 
 @JS()
@@ -2072,8 +3067,13 @@ class SkFontVariation {
 }
 
 extension SkFontVariationExtension on SkFontVariation {
-  external set axis(String? value);
-  external set value(double? value);
+  @JS('axis')
+  external set _axis(JSString? value);
+  set axis(String? value) => _axis = value?.toJS;
+
+  @JS('value')
+  external set _value(JSNumber? value);
+  set value(double? v) => _value = v?.toJS;
 }
 
 @JS()
@@ -2088,9 +3088,16 @@ class SkFont {
 }
 
 extension SkFontExtension on SkFont {
-  external Uint16List getGlyphIDs(String text);
-  external void getGlyphBounds(
-      List<int> glyphs, SkPaint? paint, Uint8List? output);
+  @JS('getGlyphIDs')
+  external JSUint16Array _getGlyphIDs(JSString text);
+  Uint16List getGlyphIDs(String text) => _getGlyphIDs(text.toJS).toDart;
+
+  @JS('getGlyphBounds')
+  external JSVoid _getGlyphBounds(
+      JSAny glyphs, SkPaint? paint, JSUint8Array? output);
+  void getGlyphBounds(
+      List<int> glyphs, SkPaint? paint, Uint8List? output) =>
+      _getGlyphBounds(glyphs.toJSAnyShallow, paint, output?.toJS);
 }
 
 @JS()
@@ -2099,19 +3106,39 @@ extension SkFontExtension on SkFont {
 class SkFontMgr {}
 
 extension SkFontMgrExtension on SkFontMgr {
-  external String? getFamilyName(int fontId);
-  external void delete();
-  external SkTypeface? MakeTypefaceFromData(Uint8List font);
+  @JS('getFamilyName')
+  external JSString? _getFamilyName(JSNumber fontId);
+  String? getFamilyName(double fontId) => _getFamilyName(fontId.toJS)?.toDart;
+
+  external JSVoid delete();
+
+  @JS('MakeTypefaceFromData')
+  external SkTypeface? _MakeTypefaceFromData(JSUint8Array font);
+  SkTypeface? MakeTypefaceFromData(Uint8List font) =>
+      _MakeTypefaceFromData(font.toJS);
 }
 
 @JS('window.flutterCanvasKit.TypefaceFontProvider')
 @staticInterop
 class TypefaceFontProvider extends SkFontMgr {
-  external factory TypefaceFontProvider();
 }
 
 extension TypefaceFontProviderExtension on TypefaceFontProvider {
-  external void registerFont(Uint8List font, String family);
+  @JS('registerFont')
+  external JSVoid _registerFont(JSUint8Array font, JSString family);
+  void registerFont(Uint8List font, String family) =>
+      _registerFont(font.toJS, family.toJS);
+}
+
+@JS()
+@anonymous
+@staticInterop
+class SkFontCollection {}
+
+extension SkFontCollectionExtension on SkFontCollection {
+  external void enableFontFallback();
+  external void setDefaultFontManager(TypefaceFontProvider? fontManager);
+  external void delete();
 }
 
 @JS()
@@ -2120,18 +3147,93 @@ extension TypefaceFontProviderExtension on TypefaceFontProvider {
 class SkLineMetrics {}
 
 extension SkLineMetricsExtension on SkLineMetrics {
-  external double get startIndex;
-  external double get endIndex;
-  external double get endExcludingWhitespaces;
-  external double get endIncludingNewline;
-  external bool get isHardBreak;
-  external double get ascent;
-  external double get descent;
-  external double get height;
-  external double get width;
-  external double get left;
-  external double get baseline;
-  external double get lineNumber;
+  @JS('startIndex')
+  external JSNumber get _startIndex;
+  double get startIndex => _startIndex.toDartDouble;
+
+  @JS('endIndex')
+  external JSNumber get _endIndex;
+  double get endIndex => _endIndex.toDartDouble;
+
+  @JS('endExcludingWhitespaces')
+  external JSNumber get _endExcludingWhitespaces;
+  double get endExcludingWhitespaces => _endExcludingWhitespaces.toDartDouble;
+
+  @JS('endIncludingNewline')
+  external JSNumber get _endIncludingNewline;
+  double get endIncludingNewline => _endIncludingNewline.toDartDouble;
+
+  @JS('isHardBreak')
+  external JSBoolean get _isHardBreak;
+  bool get isHardBreak => _isHardBreak.toDart;
+
+  @JS('ascent')
+  external JSNumber get _ascent;
+  double get ascent => _ascent.toDartDouble;
+
+  @JS('descent')
+  external JSNumber get _descent;
+  double get descent => _descent.toDartDouble;
+
+  @JS('height')
+  external JSNumber get _height;
+  double get height => _height.toDartDouble;
+
+  @JS('width')
+  external JSNumber get _width;
+  double get width => _width.toDartDouble;
+
+  @JS('left')
+  external JSNumber get _left;
+  double get left => _left.toDartDouble;
+
+  @JS('baseline')
+  external JSNumber get _baseline;
+  double get baseline => _baseline.toDartDouble;
+
+  @JS('lineNumber')
+  external JSNumber get _lineNumber;
+  double get lineNumber => _lineNumber.toDartDouble;
+}
+
+@JS()
+@anonymous
+@staticInterop
+class SkGlyphClusterInfo {}
+
+extension SkGlyphClusterInfoExtension on SkGlyphClusterInfo {
+  @JS('graphemeLayoutBounds')
+  external JSArray<JSAny?> get _bounds;
+
+  @JS('dir')
+  external SkTextDirection get _direction;
+
+  @JS('graphemeClusterTextRange')
+  external SkTextRange get _textRange;
+
+  ui.GlyphInfo get _glyphInfo {
+    final List<JSNumber> list = _bounds.toDart.cast<JSNumber>();
+    final ui.Rect bounds = ui.Rect.fromLTRB(list[0].toDartDouble, list[1].toDartDouble, list[2].toDartDouble, list[3].toDartDouble);
+    final ui.TextRange textRange = ui.TextRange(start: _textRange.start.toInt(), end: _textRange.end.toInt());
+    return ui.GlyphInfo(bounds, textRange, ui.TextDirection.values[_direction.value.toInt()]);
+  }
+}
+
+@JS()
+@anonymous
+@staticInterop
+class SkRectWithDirection {}
+
+extension SkRectWithDirectionExtension on SkRectWithDirection {
+  @JS('rect')
+  external JSFloat32Array get _rect;
+  Float32List get rect => _rect.toDart;
+
+  @JS('rect')
+  external set _rect(JSFloat32Array rect);
+  set rect(Float32List r) => _rect = r.toJS;
+
+  external SkTextDirection dir;
 }
 
 @JS()
@@ -2140,29 +3242,103 @@ extension SkLineMetricsExtension on SkLineMetrics {
 class SkParagraph {}
 
 extension SkParagraphExtension on SkParagraph {
-  external double getAlphabeticBaseline();
-  external bool didExceedMaxLines();
-  external double getHeight();
-  external double getIdeographicBaseline();
-  external /* List<SkLineMetrics> */ List<Object?> getLineMetrics();
-  external double getLongestLine();
-  external double getMaxIntrinsicWidth();
-  external double getMinIntrinsicWidth();
-  external double getMaxWidth();
-  external /* List<Float32List> */ List<Object?> getRectsForRange(
-    int start,
-    int end,
+  @JS('getAlphabeticBaseline')
+  external JSNumber _getAlphabeticBaseline();
+  double getAlphabeticBaseline() => _getAlphabeticBaseline().toDartDouble;
+
+  @JS('didExceedMaxLines')
+  external JSBoolean _didExceedMaxLines();
+  bool didExceedMaxLines() => _didExceedMaxLines().toDart;
+
+  @JS('getHeight')
+  external JSNumber _getHeight();
+  double getHeight() => _getHeight().toDartDouble;
+
+  @JS('getIdeographicBaseline')
+  external JSNumber _getIdeographicBaseline();
+  double getIdeographicBaseline() => _getIdeographicBaseline().toDartDouble;
+
+  @JS('getLineMetrics')
+  external JSArray<JSAny?> _getLineMetrics();
+  List<SkLineMetrics> getLineMetrics() =>
+      _getLineMetrics().toDart.cast<SkLineMetrics>();
+
+  @JS('getLineMetricsAt')
+  external SkLineMetrics? _getLineMetricsAt(JSNumber index);
+  SkLineMetrics? getLineMetricsAt(double index) => _getLineMetricsAt(index.toJS);
+
+  @JS('getNumberOfLines')
+  external JSNumber _getNumberOfLines();
+  double getNumberOfLines() => _getNumberOfLines().toDartDouble;
+
+  @JS('getLineNumberAt')
+  external JSNumber _getLineNumberAt(JSNumber index);
+  double getLineNumberAt(double index) => _getLineNumberAt(index.toJS).toDartDouble;
+
+  @JS('getLongestLine')
+  external JSNumber _getLongestLine();
+  double getLongestLine() => _getLongestLine().toDartDouble;
+
+  @JS('getMaxIntrinsicWidth')
+  external JSNumber _getMaxIntrinsicWidth();
+  double getMaxIntrinsicWidth() => _getMaxIntrinsicWidth().toDartDouble;
+
+  @JS('getMinIntrinsicWidth')
+  external JSNumber _getMinIntrinsicWidth();
+  double getMinIntrinsicWidth() => _getMinIntrinsicWidth().toDartDouble;
+
+  @JS('getMaxWidth')
+  external JSNumber _getMaxWidth();
+  double getMaxWidth() => _getMaxWidth().toDartDouble;
+
+  @JS('getRectsForRange')
+  external JSArray<JSAny?> _getRectsForRange(
+    JSNumber start,
+    JSNumber end,
     SkRectHeightStyle heightStyle,
     SkRectWidthStyle widthStyle,
   );
-  external /* List<Float32List> */ List<Object?> getRectsForPlaceholders();
-  external SkTextPosition getGlyphPositionAtCoordinate(
+  List<SkRectWithDirection> getRectsForRange(
+    double start,
+    double end,
+    SkRectHeightStyle heightStyle,
+    SkRectWidthStyle widthStyle,
+  ) => _getRectsForRange(start.toJS, end.toJS, heightStyle,
+                         widthStyle).toDart.cast<SkRectWithDirection>();
+
+  @JS('getRectsForPlaceholders')
+  external JSArray<JSAny?> _getRectsForPlaceholders();
+  List<SkRectWithDirection> getRectsForPlaceholders() =>
+      _getRectsForPlaceholders().toDart.cast<SkRectWithDirection>();
+
+  @JS('getGlyphPositionAtCoordinate')
+  external SkTextPosition _getGlyphPositionAtCoordinate(
+    JSNumber x,
+    JSNumber y,
+  );
+  SkTextPosition getGlyphPositionAtCoordinate(
     double x,
     double y,
-  );
-  external SkTextRange getWordBoundary(int position);
-  external void layout(double width);
-  external void delete();
+  ) => _getGlyphPositionAtCoordinate(x.toJS, y.toJS);
+
+  @JS('getGlyphInfoAt')
+  external SkGlyphClusterInfo? _getGlyphInfoAt(JSNumber position);
+  ui.GlyphInfo? getGlyphInfoAt(double position) => _getGlyphInfoAt(position.toJS)?._glyphInfo;
+
+  @JS('getClosestGlyphInfoAtCoordinate')
+  external SkGlyphClusterInfo? _getClosestGlyphInfoAtCoordinate(JSNumber x, JSNumber y);
+  ui.GlyphInfo? getClosestGlyphInfoAt(double x, double y) => _getClosestGlyphInfoAtCoordinate(x.toJS, y.toJS)?._glyphInfo;
+
+  @JS('getWordBoundary')
+  external SkTextRange _getWordBoundary(JSNumber position);
+  SkTextRange getWordBoundary(double position) =>
+      _getWordBoundary(position.toJS);
+
+  @JS('layout')
+  external JSVoid _layout(JSNumber width);
+  void layout(double width) => _layout(width.toJS);
+
+  external JSVoid delete();
 }
 
 @JS()
@@ -2171,7 +3347,10 @@ class SkTextPosition {}
 
 extension SkTextPositionExtnsion on SkTextPosition {
   external SkAffinity get affinity;
-  external double get pos;
+
+  @JS('pos')
+  external JSNumber get _pos;
+  double get pos => _pos.toDartDouble;
 }
 
 @JS()
@@ -2179,8 +3358,13 @@ extension SkTextPositionExtnsion on SkTextPosition {
 class SkTextRange {}
 
 extension SkTextRangeExtension on SkTextRange {
-  external double get start;
-  external double get end;
+  @JS('start')
+  external JSNumber get _start;
+  double get start => _start.toDartDouble;
+
+  @JS('end')
+  external JSNumber get _end;
+  double get end => _end.toDartDouble;
 }
 
 @JS()
@@ -2189,22 +3373,31 @@ extension SkTextRangeExtension on SkTextRange {
 class SkVertices {}
 
 extension SkVerticesExtension on SkVertices {
-  external void delete();
+  external JSVoid delete();
 }
 
 @JS()
 @anonymous
 @staticInterop
 class SkTonalColors {
-  external factory SkTonalColors({
+  factory SkTonalColors({
     required Float32List ambient,
     required Float32List spot,
+  }) => SkTonalColors._(ambient: ambient.toJS, spot: spot.toJS);
+  external factory SkTonalColors._({
+    required JSFloat32Array ambient,
+    required JSFloat32Array spot,
   });
 }
 
 extension SkTonalColorsExtension on SkTonalColors {
-  external Float32List get ambient;
-  external Float32List get spot;
+  @JS('ambient')
+  external JSFloat32Array get _ambient;
+  Float32List get ambient => _ambient.toDart;
+
+  @JS('spot')
+  external JSFloat32Array get _spot;
+  Float32List get spot => _spot.toDart;
 }
 
 @JS()
@@ -2213,7 +3406,9 @@ class SkFontMgrNamespace {}
 
 extension SkFontMgrNamespaceExtension on SkFontMgrNamespace {
   // TODO(yjbanov): can this be made non-null? It returns null in our unit-tests right now.
-  external SkFontMgr? FromData(List<Uint8List> fonts);
+  @JS('FromData')
+  external SkFontMgr? _FromData(JSAny fonts);
+  SkFontMgr? FromData(List<Uint8List> fonts) => _FromData(fonts.toJSAnyShallow);
 }
 
 @JS()
@@ -2225,178 +3420,23 @@ extension TypefaceFontProviderNamespaceExtension on TypefaceFontProviderNamespac
 }
 
 @JS()
-@anonymous
 @staticInterop
-class SkTypefaceFactory {}
-
-extension SkTypefaceFactoryExtension on SkTypefaceFactory {
-  external SkTypeface? MakeFreeTypeFaceFromData(ByteBuffer fontData);
-}
-
-/// Collects Skia objects that are no longer necessary.
-abstract class Collector {
-  /// The production collector implementation.
-  static final Collector _productionInstance = ProductionCollector();
-
-  /// The collector implementation currently in use.
-  static Collector get instance => _instance;
-  static Collector _instance = _productionInstance;
-
-  /// In tests overrides the collector implementation.
-  static void debugOverrideCollector(Collector override) {
-    _instance = override;
-  }
-
-  /// In tests restores the collector to the production implementation.
-  static void debugRestoreCollector() {
-    _instance = _productionInstance;
-  }
-
-  /// Registers a [deletable] for collection when the [wrapper] object is
-  /// garbage collected.
-  ///
-  /// The [debugLabel] is used to track the origin of the deletable.
-  void register(Object wrapper, SkDeletable deletable);
-
-  /// Deletes the [deletable].
-  ///
-  /// The exact timing of the deletion is implementation-specific. For example,
-  /// a production implementation may want to batch deletables and schedule a
-  /// timer to collect them instead of deleting right away.
-  ///
-  /// A test implementation may want a collection strategy that's less efficient
-  /// but more predictable.
-  void collect(SkDeletable deletable);
-}
-
-/// Uses the browser's real `FinalizationRegistry` to collect objects.
-///
-/// Uses timers to delete objects in batches and outside the animation frame.
-class ProductionCollector implements Collector {
-  ProductionCollector() {
-    _skObjectFinalizationRegistry =
-        SkObjectFinalizationRegistry(allowInterop((SkDeletable deletable) {
-      // This is called when GC decides to collect the wrapper object and
-      // notify us, which may happen after the object is already deleted
-      // explicitly, e.g. when its ref count drops to zero. When that happens
-      // skip collection of this object.
-      if (!deletable.isDeleted()) {
-        collect(deletable);
-      }
-    }));
-  }
-
-  late final SkObjectFinalizationRegistry _skObjectFinalizationRegistry;
-  List<SkDeletable> _skiaObjectCollectionQueue = <SkDeletable>[];
-  Timer? _skiaObjectCollectionTimer;
-
-  @override
-  void register(Object wrapper, SkDeletable deletable) {
-    if (Instrumentation.enabled) {
-      Instrumentation.instance.incrementCounter(
-        '${deletable.constructor.name} registered',
-      );
-    }
-    _skObjectFinalizationRegistry.register(wrapper, deletable);
-  }
-
-  /// Schedules a Skia object for deletion in an asap timer.
-  ///
-  /// A timer is used for the following reasons:
-  ///
-  ///  - Deleting the object immediately may lead to dangling pointer as the Skia
-  ///    object may still be used by a function in the current frame. For example,
-  ///    a `CkPaint` + `SkPaint` pair may be created by the framework, passed to
-  ///    the engine, and the `CkPaint` dropped immediately. Because GC can kick in
-  ///    any time, including in the middle of the event, we may delete `SkPaint`
-  ///    prematurely.
-  ///  - A microtask, while solves the problem above, would prevent the event from
-  ///    yielding to the graphics system to render the frame on the screen if there
-  ///    is a large number of objects to delete, causing jank.
-  ///
-  /// Because scheduling a timer is expensive, the timer is shared by all objects
-  /// deleted this frame. No timer is created if no objects were scheduled for
-  /// deletion.
-  @override
-  void collect(SkDeletable deletable) {
-    assert(
-      !deletable.isDeleted(),
-      'Attempted to delete an already deleted Skia object.',
-    );
-    _skiaObjectCollectionQueue.add(deletable);
-
-    _skiaObjectCollectionTimer ??= Timer(Duration.zero, () {
-      // Null out the timer so we can schedule a new one next time objects are
-      // scheduled for deletion.
-      _skiaObjectCollectionTimer = null;
-      collectSkiaObjectsNow();
-    });
-  }
+class FontCollectionNamespace{}
 
-  /// Deletes all Skia objects pending deletion synchronously.
-  ///
-  /// After calling this method [_skiaObjectCollectionQueue] is empty.
-  ///
-  /// Throws a [SkiaObjectCollectionError] if CanvasKit fails to delete at least
-  /// one object. The error is populated with information about the first failed
-  /// object. Upon an error the collection continues and the collection queue is
-  /// emptied out to prevent memory leaks. This may happen, for example, when the
-  /// same object is deleted more than once.
-  void collectSkiaObjectsNow() {
-    domWindow.performance.mark('SkObject collection-start');
-    final int length = _skiaObjectCollectionQueue.length;
-    dynamic firstError;
-    StackTrace? firstStackTrace;
-    for (int i = 0; i < length; i++) {
-      final SkDeletable deletable = _skiaObjectCollectionQueue[i];
-      if (deletable.isDeleted()) {
-        // Some Skia objects are ref counted and are deleted before GC and/or
-        // the collection timer begins collecting them. So we have to check
-        // again if the objects is worth collecting.
-        continue;
-      }
-      if (Instrumentation.enabled) {
-        Instrumentation.instance.incrementCounter(
-          '${deletable.constructor.name} deleted',
-        );
-      }
-      try {
-        deletable.delete();
-      } catch (error, stackTrace) {
-        // Remember the error, but keep going. If for some reason CanvasKit fails
-        // to delete an object we still want to delete other objects and empty
-        // out the queue. Otherwise, the queue will never be flushed and keep
-        // accumulating objects, a.k.a. memory leak.
-        if (firstError == null) {
-          firstError = error;
-          firstStackTrace = stackTrace;
-        }
-      }
-    }
-    _skiaObjectCollectionQueue = <SkDeletable>[];
-
-    domWindow.performance.mark('SkObject collection-end');
-    domWindow.performance.measure('SkObject collection',
-        'SkObject collection-start', 'SkObject collection-end');
-
-    // It's safe to throw the error here, now that we've processed the queue.
-    if (firstError != null) {
-      throw SkiaObjectCollectionError(firstError, firstStackTrace);
-    }
-  }
+extension FontCollectionNamespaceExtension on FontCollectionNamespace {
+  external SkFontCollection Make();
 }
 
-/// Thrown by [ProductionCollector] when Skia object collection fails.
-class SkiaObjectCollectionError implements Error {
-  SkiaObjectCollectionError(this.error, this.stackTrace);
-
-  final dynamic error;
-
-  @override
-  final StackTrace? stackTrace;
+@JS()
+@anonymous
+@staticInterop
+class SkTypefaceFactory {}
 
-  @override
-  String toString() => 'SkiaObjectCollectionError: $error\n$stackTrace';
+extension SkTypefaceFactoryExtension on SkTypefaceFactory {
+  @JS('MakeFreeTypeFaceFromData')
+  external SkTypeface? _MakeFreeTypeFaceFromData(JSArrayBuffer fontData);
+  SkTypeface? MakeFreeTypeFaceFromData(ByteBuffer fontData) =>
+      _MakeFreeTypeFaceFromData(fontData.toJS);
 }
 
 /// Any Skia object that has a `delete` method.
@@ -2407,10 +3447,12 @@ class SkDeletable {}
 
 extension SkDeletableExtension on SkDeletable {
   /// Deletes the C++ side object.
-  external void delete();
+  external JSVoid delete();
 
-  /// Returns whether the correcponding C++ object has been deleted.
-  external bool isDeleted();
+  /// Returns whether the corresponding C++ object has been deleted.
+  @JS('isDeleted')
+  external JSBoolean _isDeleted();
+  bool isDeleted() => _isDeleted().toDart;
 
   /// Returns the JavaScript constructor for this object.
   ///
@@ -2428,46 +3470,9 @@ extension JsConstructorExtension on JsConstructor {
   /// the `new` keyword, or the ES6 class name.
   ///
   /// This is useful for debugging.
-  external String get name;
-}
-
-/// Attaches a weakly referenced object to another object and calls a finalizer
-/// with the latter when weakly referenced object is garbage collected.
-///
-/// We use this to delete Skia objects when their "Ck" wrapper is garbage
-/// collected.
-///
-/// Example sequence of events:
-///
-/// 1. A (CkPaint, SkPaint) pair created.
-/// 2. The paint is used to paint some picture.
-/// 3. CkPaint is dropped by the app.
-/// 4. GC decides to perform a GC cycle and collects CkPaint.
-/// 5. The finalizer function is called with the SkPaint as the sole argument.
-/// 6. We call `delete` on SkPaint.
-@JS('window.FinalizationRegistry')
-@staticInterop
-class SkObjectFinalizationRegistry {
-  // TODO(hterkelsen): Add a type for the `cleanup` function when
-  // native constructors support type parameters.
-  external factory SkObjectFinalizationRegistry(Function cleanup);
-}
-
-extension SkObjectFinalizationRegistryExtension on SkObjectFinalizationRegistry {
-  external void register(Object ckObject, Object skObject);
-}
-
-@JS('window.FinalizationRegistry')
-external Object? get _finalizationRegistryConstructor;
-
-/// Whether the current browser supports `FinalizationRegistry`.
-bool browserSupportsFinalizationRegistry =
-    _finalizationRegistryConstructor != null;
-
-/// Sets the value of [browserSupportsFinalizationRegistry] to its true value.
-void debugResetBrowserSupportsFinalizationRegistry() {
-  browserSupportsFinalizationRegistry =
-      _finalizationRegistryConstructor != null;
+  @JS('name')
+  external JSString get _name;
+  String get name => _name.toDart;
 }
 
 @JS()
@@ -2475,19 +3480,39 @@ void debugResetBrowserSupportsFinalizationRegistry() {
 class SkData {}
 
 extension SkDataExtension on SkData {
-  external double size();
-  external bool isEmpty();
-  external Uint8List bytes();
-  external void delete();
+  @JS('size')
+  external JSNumber _size();
+  double size() => _size().toDartDouble;
+
+  @JS('isEmpty')
+  external JSBoolean _isEmpty();
+  bool isEmpty() => _isEmpty().toDart;
+
+  @JS('bytes')
+  external JSUint8Array _bytes();
+  Uint8List bytes() => _bytes().toDart;
+
+  external JSVoid delete();
 }
 
 @JS()
 @anonymous
 @staticInterop
 class SkImageInfo {
-  external factory SkImageInfo({
-    required int width,
-    required int height,
+  factory SkImageInfo({
+    required double width,
+    required double height,
+    required SkColorType colorType,
+    required SkAlphaType alphaType,
+    required ColorSpace colorSpace,
+  }) => SkImageInfo._(width: width.toJS,
+                      height: height.toJS,
+                      colorType: colorType,
+                      alphaType: alphaType,
+                      colorSpace: colorSpace);
+  external factory SkImageInfo._({
+    required JSNumber width,
+    required JSNumber height,
     required SkColorType colorType,
     required SkAlphaType alphaType,
     required ColorSpace colorSpace,
@@ -2498,24 +3523,55 @@ extension SkImageInfoExtension on SkImageInfo {
   external SkAlphaType get alphaType;
   external ColorSpace get colorSpace;
   external SkColorType get colorType;
-  external double get height;
-  external bool get isEmpty;
-  external bool get isOpaque;
-  external Float32List get bounds;
-  external double get width;
+
+  @JS('height')
+  external JSNumber get _height;
+  double get height => _height.toDartDouble;
+
+  @JS('isEmpty')
+  external JSBoolean get _isEmpty;
+  bool get isEmpty => _isEmpty.toDart;
+
+  @JS('isOpaque')
+  external JSBoolean get _isOpaque;
+  bool get isOpaque => _isOpaque.toDart;
+
+  @JS('bounds')
+  external JSFloat32Array get _bounds;
+  Float32List get bounds => _bounds.toDart;
+
+  @JS('width')
+  external JSNumber get _width;
+  double get width => _width.toDartDouble;
+
   external SkImageInfo makeAlphaType(SkAlphaType alphaType);
   external SkImageInfo makeColorSpace(ColorSpace colorSpace);
   external SkImageInfo makeColorType(SkColorType colorType);
-  external SkImageInfo makeWH(int width, int height);
+
+  @JS('makeWH')
+  external SkImageInfo _makeWH(JSNumber width, JSNumber height);
+  SkImageInfo makeWH(double width, double height) =>
+      _makeWH(width.toJS, height.toJS);
 }
 
 @JS()
 @anonymous
 @staticInterop
 class SkPartialImageInfo {
-  external factory SkPartialImageInfo({
-    required int width,
-    required int height,
+  factory SkPartialImageInfo({
+    required double width,
+    required double height,
+    required SkColorType colorType,
+    required SkAlphaType alphaType,
+    required ColorSpace colorSpace,
+  }) => SkPartialImageInfo._(width: width.toJS,
+                             height: height.toJS,
+                             colorType: colorType,
+                             alphaType: alphaType,
+                             colorSpace: colorSpace);
+  external factory SkPartialImageInfo._({
+    required JSNumber width,
+    required JSNumber height,
     required SkColorType colorType,
     required SkAlphaType alphaType,
     required ColorSpace colorSpace,
@@ -2526,31 +3582,15 @@ extension SkPartialImageInfoExtension on SkPartialImageInfo {
   external SkAlphaType get alphaType;
   external ColorSpace get colorSpace;
   external SkColorType get colorType;
-  external double get height;
-  external double get width;
-}
-
-/// Helper interop methods for [patchCanvasKitModule].
-@JS()
-external set _flutterWebCachedModule(Object? module);
 
-@JS()
-external Object? get _flutterWebCachedModule;
-
-@JS()
-external set _flutterWebCachedExports(Object? exports);
-
-@JS()
-external Object? get _flutterWebCachedExports;
-
-@JS('Object')
-external Object get objectConstructor;
-
-@JS()
-external Object? get exports;
+  @JS('height')
+  external JSNumber get _height;
+  double get height => _height.toDartDouble;
 
-@JS()
-external Object? get module;
+  @JS('width')
+  external JSNumber get _width;
+  double get width => _width.toDartDouble;
+}
 
 @JS('window.flutterCanvasKit.RuntimeEffect')
 @anonymous
@@ -2558,78 +3598,50 @@ external Object? get module;
 class SkRuntimeEffect {}
 
 @JS('window.flutterCanvasKit.RuntimeEffect.Make')
-external SkRuntimeEffect? MakeRuntimeEffect(String program);
+external SkRuntimeEffect? _MakeRuntimeEffect(JSString program);
+SkRuntimeEffect? MakeRuntimeEffect(String program) =>
+    _MakeRuntimeEffect(program.toJS);
 
 extension SkSkRuntimeEffectExtension on SkRuntimeEffect {
-  external SkShader? makeShader(List<Object> uniforms);
-  external SkShader? makeShaderWithChildren(List<Object> uniforms, List<Object?> children);
-}
-
-/// Monkey-patch the top-level `module` and `exports` objects so that
-/// CanvasKit doesn't attempt to register itself as an anonymous module.
-///
-/// The idea behind making these fake `exports` and `module` objects is
-/// that `canvaskit.js` contains the following lines of code:
-///
-///     if (typeof exports === 'object' && typeof module === 'object')
-///       module.exports = CanvasKitInit;
-///     else if (typeof define === 'function' && define['amd'])
-///       define([], function() { return CanvasKitInit; });
-///
-/// We need to avoid hitting the case where CanvasKit defines an anonymous
-/// module, since this breaks RequireJS, which DDC and some plugins use.
-/// Temporarily removing the `define` function won't work because RequireJS
-/// could load in between this code running and the CanvasKit code running.
-/// Also, we cannot monkey-patch the `define` function because it is
-/// non-configurable (it is a top-level 'var').
-// TODO(hterkelsen): Rather than this monkey-patch hack, we should
-// build CanvasKit ourselves. See:
-// https://github.com/flutter/flutter/issues/52588
-void patchCanvasKitModule(DomHTMLScriptElement canvasKitScript) {
-  // First check if `exports` and `module` are already defined. If so, then
-  // CommonJS is being used, and we shouldn't have any problems.
-  if (exports == null) {
-    final Object? exportsAccessor = js_util.jsify(<String, dynamic>{
-      'get': allowInterop(() {
-        if (domDocument.currentScript == canvasKitScript) {
-          return objectConstructor;
-        } else {
-          return _flutterWebCachedExports;
-        }
-      }),
-      'set': allowInterop((dynamic value) {
-        _flutterWebCachedExports = value;
-      }),
-      'configurable': true,
-    });
-    js_util.callMethod(objectConstructor,
-        'defineProperty', <dynamic>[domWindow, 'exports', exportsAccessor]);
-  }
-  if (module == null) {
-    final Object? moduleAccessor = js_util.jsify(<String, dynamic>{
-      'get': allowInterop(() {
-        if (domDocument.currentScript == canvasKitScript) {
-          return objectConstructor;
-        } else {
-          return _flutterWebCachedModule;
-        }
-      }),
-      'set': allowInterop((dynamic value) {
-        _flutterWebCachedModule = value;
-      }),
-      'configurable': true,
-    });
-    js_util.callMethod(objectConstructor,
-        'defineProperty', <dynamic>[domWindow, 'module', moduleAccessor]);
+  @JS('makeShader')
+  external SkShader? _makeShader(JSAny uniforms);
+  SkShader? makeShader(List<Object> uniforms) =>
+      _makeShader(uniforms.toJSAnyShallow);
+
+  @JS('makeShaderWithChildren')
+  external SkShader? _makeShaderWithChildren(JSAny uniforms, JSAny children);
+  SkShader? makeShaderWithChildren(
+      List<Object> uniforms, List<Object?> children) =>
+          _makeShaderWithChildren(uniforms.toJSAnyShallow,
+              children.toJSAnyShallow);
+}
+
+const String _kFullCanvasKitJsFileName = 'canvaskit.js';
+const String _kChromiumCanvasKitJsFileName = 'chromium/canvaskit.js';
+
+String get _canvasKitBaseUrl => configuration.canvasKitBaseUrl;
+
+@visibleForTesting
+List<String> getCanvasKitJsFileNames(CanvasKitVariant variant) {
+  switch (variant) {
+    case CanvasKitVariant.auto:
+      return <String>[
+        if (_enableCanvasKitChromiumInAutoMode) _kChromiumCanvasKitJsFileName,
+        _kFullCanvasKitJsFileName,
+      ];
+    case CanvasKitVariant.full:
+      return <String>[_kFullCanvasKitJsFileName];
+    case CanvasKitVariant.chromium:
+      return <String>[_kChromiumCanvasKitJsFileName];
   }
-  domDocument.head!.appendChild(canvasKitScript);
 }
-
-String get canvasKitBuildUrl =>
-  configuration.canvasKitBaseUrl + (kProfileMode ? 'profiling/' : '');
-String get canvasKitJavaScriptBindingsUrl =>
-    '${canvasKitBuildUrl}canvaskit.js';
-String canvasKitWasmModuleUrl(String canvasKitBase, String file) =>
+Iterable<String> get _canvasKitJsUrls {
+  return getCanvasKitJsFileNames(configuration.canvasKitVariant).map(
+    (String filename) => '$_canvasKitBaseUrl$filename',
+  );
+}
+@visibleForTesting
+String canvasKitWasmModuleUrl(String file, String canvasKitBase) =>
     canvasKitBase + file;
 
 /// Download and initialize the CanvasKit module.
@@ -2637,36 +3649,69 @@ String canvasKitWasmModuleUrl(String canvasKitBase, String file) =>
 /// Downloads the CanvasKit JavaScript, then calls `CanvasKitInit` to download
 /// and intialize the CanvasKit wasm.
 Future<CanvasKit> downloadCanvasKit() async {
-  await _downloadCanvasKitJs();
-  final Completer<CanvasKit> canvasKitInitCompleter = Completer<CanvasKit>();
-  final CanvasKitInitPromise canvasKitInitPromise =
-      CanvasKitInit(CanvasKitInitOptions(
-    locateFile: allowInterop((String file, String unusedBase) =>
-        canvasKitWasmModuleUrl(canvasKitBuildUrl, file)),
+  await _downloadOneOf(_canvasKitJsUrls);
+
+  final CanvasKit canvasKit = await CanvasKitInit(CanvasKitInitOptions(
+    locateFile: createLocateFileCallback(canvasKitWasmModuleUrl),
   ));
-  canvasKitInitPromise.then(allowInterop((CanvasKit ck) {
-    canvasKitInitCompleter.complete(ck);
-  }));
-  return canvasKitInitCompleter.future;
+
+  if (canvasKit.ParagraphBuilder.RequiresClientICU() && !browserSupportsCanvaskitChromium) {
+    throw Exception(
+      'The CanvasKit variant you are using only works on Chromium browsers. '
+      'Please use a different CanvasKit variant, or use a Chromium browser.',
+    );
+  }
+
+  return canvasKit;
 }
 
-/// Downloads the CanvasKit JavaScript file at [canvasKitBase].
-Future<void> _downloadCanvasKitJs() {
-  final String canvasKitJavaScriptUrl = canvasKitJavaScriptBindingsUrl;
+/// Finds the first URL in [urls] that can be downloaded successfully, and
+/// downloads it.
+///
+/// If none of the URLs can be downloaded, throws an [Exception].
+Future<void> _downloadOneOf(Iterable<String> urls) async {
+  for (final String url in urls) {
+    if (await _downloadCanvasKitJs(url)) {
+      return;
+    }
+  }
 
-  final DomHTMLScriptElement canvasKitScript = createDomHTMLScriptElement();
-  canvasKitScript.src = createTrustedScriptUrl(canvasKitJavaScriptUrl);
+  // Reaching this point means that all URLs failed to download.
+  throw Exception(
+    'Failed to download any of the following CanvasKit URLs: $urls',
+  );
+}
+
+/// Downloads the CanvasKit JavaScript file at [url].
+///
+/// Returns a [Future] that completes with `true` if the CanvasKit JavaScript
+/// file was successfully downloaded, or `false` if it failed.
+Future<bool> _downloadCanvasKitJs(String url) {
+  final DomHTMLScriptElement canvasKitScript =
+      createDomHTMLScriptElement(configuration.nonce);
+  canvasKitScript.src = createTrustedScriptUrl(url);
+
+  final Completer<bool> canvasKitLoadCompleter = Completer<bool>();
+
+  late final DomEventListener loadCallback;
+  late final DomEventListener errorCallback;
 
-  final Completer<void> canvasKitLoadCompleter = Completer<void>();
-  late DomEventListener callback;
   void loadEventHandler(DomEvent _) {
-    canvasKitLoadCompleter.complete();
-    canvasKitScript.removeEventListener('load', callback);
+    canvasKitScript.remove();
+    canvasKitLoadCompleter.complete(true);
+  }
+  void errorEventHandler(DomEvent errorEvent) {
+    canvasKitScript.remove();
+    canvasKitLoadCompleter.complete(false);
   }
-  callback = allowInterop(loadEventHandler);
-  canvasKitScript.addEventListener('load', callback);
 
-  patchCanvasKitModule(canvasKitScript);
+  loadCallback = createDomEventListener(loadEventHandler);
+  errorCallback = createDomEventListener(errorEventHandler);
+
+  canvasKitScript.addEventListener('load', loadCallback);
+  canvasKitScript.addEventListener('error', errorCallback);
+
+  domDocument.head!.appendChild(canvasKitScript);
 
   return canvasKitLoadCompleter.future;
 }
diff --git a/lib/web_ui/lib/src/engine/canvaskit/canvaskit_canvas.dart b/lib/web_ui/lib/src/engine/canvaskit/canvaskit_canvas.dart
index 444860bae5649e34da3e456d63df662ad728ca0b..70fb9a79a366f976a201074e3dbed41ed43401d2 100644
--- a/lib/web_ui/lib/src/engine/canvaskit/canvaskit_canvas.dart
+++ b/lib/web_ui/lib/src/engine/canvaskit/canvaskit_canvas.dart
@@ -6,7 +6,6 @@ import 'dart:typed_data';
 
 import 'package:ui/ui.dart' as ui;
 
-import '../util.dart';
 import '../validators.dart';
 import '../vector_math.dart';
 import 'canvas.dart';
@@ -22,7 +21,6 @@ import 'vertices.dart';
 /// An implementation of [ui.Canvas] that is backed by a CanvasKit canvas.
 class CanvasKitCanvas implements ui.Canvas {
   factory CanvasKitCanvas(ui.PictureRecorder recorder, [ui.Rect? cullRect]) {
-    assert(recorder != null);
     if (recorder.isRecording) {
       throw ArgumentError(
           '"recorder" must not already be associated with another Canvas.');
@@ -43,7 +41,6 @@ class CanvasKitCanvas implements ui.Canvas {
 
   @override
   void saveLayer(ui.Rect? bounds, ui.Paint paint) {
-    assert(paint != null);
     if (bounds == null) {
       _saveLayerWithoutBounds(paint);
     } else {
@@ -99,7 +96,6 @@ class CanvasKitCanvas implements ui.Canvas {
 
   @override
   void transform(Float64List matrix4) {
-    assert(matrix4 != null);
     if (matrix4.length != 16) {
       throw ArgumentError('"matrix4" must have 16 entries.');
     }
@@ -119,8 +115,6 @@ class CanvasKitCanvas implements ui.Canvas {
   void clipRect(ui.Rect rect,
       {ui.ClipOp clipOp = ui.ClipOp.intersect, bool doAntiAlias = true}) {
     assert(rectIsValid(rect));
-    assert(clipOp != null);
-    assert(doAntiAlias != null);
     _clipRect(rect, clipOp, doAntiAlias);
   }
 
@@ -131,7 +125,6 @@ class CanvasKitCanvas implements ui.Canvas {
   @override
   void clipRRect(ui.RRect rrect, {bool doAntiAlias = true}) {
     assert(rrectIsValid(rrect));
-    assert(doAntiAlias != null);
     _clipRRect(rrect, doAntiAlias);
   }
 
@@ -141,8 +134,6 @@ class CanvasKitCanvas implements ui.Canvas {
 
   @override
   void clipPath(ui.Path path, {bool doAntiAlias = true}) {
-    assert(path != null); // path is checked on the engine side
-    assert(doAntiAlias != null);
     _canvas.clipPath(path as CkPath, doAntiAlias);
   }
 
@@ -153,7 +144,7 @@ class CanvasKitCanvas implements ui.Canvas {
       // non-invertible transforms collapse space to a line or point
       return ui.Rect.zero;
     }
-    return transformRect(transform, _canvas.getDeviceClipBounds());
+    return transform.transformRect(_canvas.getDeviceClipBounds());
   }
 
   @override
@@ -163,8 +154,6 @@ class CanvasKitCanvas implements ui.Canvas {
 
   @override
   void drawColor(ui.Color color, ui.BlendMode blendMode) {
-    assert(color != null);
-    assert(blendMode != null);
     _drawColor(color, blendMode);
   }
 
@@ -176,7 +165,6 @@ class CanvasKitCanvas implements ui.Canvas {
   void drawLine(ui.Offset p1, ui.Offset p2, ui.Paint paint) {
     assert(offsetIsValid(p1));
     assert(offsetIsValid(p2));
-    assert(paint != null);
     _drawLine(p1, p2, paint);
   }
 
@@ -186,7 +174,6 @@ class CanvasKitCanvas implements ui.Canvas {
 
   @override
   void drawPaint(ui.Paint paint) {
-    assert(paint != null);
     _drawPaint(paint);
   }
 
@@ -197,7 +184,6 @@ class CanvasKitCanvas implements ui.Canvas {
   @override
   void drawRect(ui.Rect rect, ui.Paint paint) {
     assert(rectIsValid(rect));
-    assert(paint != null);
     _drawRect(rect, paint);
   }
 
@@ -208,7 +194,6 @@ class CanvasKitCanvas implements ui.Canvas {
   @override
   void drawRRect(ui.RRect rrect, ui.Paint paint) {
     assert(rrectIsValid(rrect));
-    assert(paint != null);
     _drawRRect(rrect, paint);
   }
 
@@ -220,7 +205,6 @@ class CanvasKitCanvas implements ui.Canvas {
   void drawDRRect(ui.RRect outer, ui.RRect inner, ui.Paint paint) {
     assert(rrectIsValid(outer));
     assert(rrectIsValid(inner));
-    assert(paint != null);
     _drawDRRect(outer, inner, paint);
   }
 
@@ -231,7 +215,6 @@ class CanvasKitCanvas implements ui.Canvas {
   @override
   void drawOval(ui.Rect rect, ui.Paint paint) {
     assert(rectIsValid(rect));
-    assert(paint != null);
     _drawOval(rect, paint);
   }
 
@@ -242,7 +225,6 @@ class CanvasKitCanvas implements ui.Canvas {
   @override
   void drawCircle(ui.Offset c, double radius, ui.Paint paint) {
     assert(offsetIsValid(c));
-    assert(paint != null);
     _drawCircle(c, radius, paint);
   }
 
@@ -254,7 +236,6 @@ class CanvasKitCanvas implements ui.Canvas {
   void drawArc(ui.Rect rect, double startAngle, double sweepAngle,
       bool useCenter, ui.Paint paint) {
     assert(rectIsValid(rect));
-    assert(paint != null);
     _drawArc(rect, startAngle, sweepAngle, useCenter, paint);
   }
 
@@ -265,47 +246,37 @@ class CanvasKitCanvas implements ui.Canvas {
 
   @override
   void drawPath(ui.Path path, ui.Paint paint) {
-    assert(path != null); // path is checked on the engine side
-    assert(paint != null);
     _canvas.drawPath(path as CkPath, paint as CkPaint);
   }
 
   @override
   void drawImage(ui.Image image, ui.Offset p, ui.Paint paint) {
-    assert(image != null); // image is checked on the engine side
     assert(offsetIsValid(p));
-    assert(paint != null);
     _canvas.drawImage(image as CkImage, p, paint as CkPaint);
   }
 
   @override
   void drawImageRect(ui.Image image, ui.Rect src, ui.Rect dst, ui.Paint paint) {
-    assert(image != null); // image is checked on the engine side
     assert(rectIsValid(src));
     assert(rectIsValid(dst));
-    assert(paint != null);
     _canvas.drawImageRect(image as CkImage, src, dst, paint as CkPaint);
   }
 
   @override
   void drawImageNine(
       ui.Image image, ui.Rect center, ui.Rect dst, ui.Paint paint) {
-    assert(image != null); // image is checked on the engine side
     assert(rectIsValid(center));
     assert(rectIsValid(dst));
-    assert(paint != null);
     _canvas.drawImageNine(image as CkImage, center, dst, paint as CkPaint);
   }
 
   @override
   void drawPicture(ui.Picture picture) {
-    assert(picture != null); // picture is checked on the engine side
     _canvas.drawPicture(picture as CkPicture);
   }
 
   @override
   void drawParagraph(ui.Paragraph paragraph, ui.Offset offset) {
-    assert(paragraph != null);
     assert(offsetIsValid(offset));
     _drawParagraph(paragraph, offset);
   }
@@ -317,24 +288,18 @@ class CanvasKitCanvas implements ui.Canvas {
   @override
   void drawPoints(
       ui.PointMode pointMode, List<ui.Offset> points, ui.Paint paint) {
-    assert(pointMode != null);
-    assert(points != null);
-    assert(paint != null);
     final SkFloat32List skPoints = toMallocedSkPoints(points);
     _canvas.drawPoints(
       paint as CkPaint,
       pointMode,
       skPoints.toTypedArray(),
     );
-    freeFloat32List(skPoints);
+    free(skPoints);
   }
 
   @override
   void drawRawPoints(
       ui.PointMode pointMode, Float32List points, ui.Paint paint) {
-    assert(pointMode != null);
-    assert(points != null);
-    assert(paint != null);
     if (points.length % 2 != 0) {
       throw ArgumentError('"points" must have an even number of values.');
     }
@@ -348,9 +313,6 @@ class CanvasKitCanvas implements ui.Canvas {
   @override
   void drawVertices(
       ui.Vertices vertices, ui.BlendMode blendMode, ui.Paint paint) {
-    assert(vertices != null); // vertices is checked on the engine side
-    assert(paint != null);
-    assert(blendMode != null);
     _canvas.drawVertices(vertices as CkVertices, blendMode, paint as CkPaint);
   }
 
@@ -363,11 +325,7 @@ class CanvasKitCanvas implements ui.Canvas {
       ui.BlendMode? blendMode,
       ui.Rect? cullRect,
       ui.Paint paint) {
-    assert(atlas != null); // atlas is checked on the engine side
-    assert(transforms != null);
-    assert(rects != null);
     assert(colors == null || colors.isEmpty || blendMode != null);
-    assert(paint != null);
 
     final int rectCount = rects.length;
     if (transforms.length != rectCount) {
@@ -415,11 +373,7 @@ class CanvasKitCanvas implements ui.Canvas {
       ui.BlendMode? blendMode,
       ui.Rect? cullRect,
       ui.Paint paint) {
-    assert(atlas != null); // atlas is checked on the engine side
-    assert(rstTransforms != null);
-    assert(rects != null);
     assert(colors == null || blendMode != null);
-    assert(paint != null);
 
     final int rectCount = rects.length;
     if (rstTransforms.length != rectCount) {
@@ -434,8 +388,13 @@ class CanvasKitCanvas implements ui.Canvas {
           'If non-null, "colors" length must be one fourth the length of "rstTransforms" and "rects".');
     }
 
+    Uint32List? unsignedColors;
+    if (colors != null) {
+      unsignedColors = colors.buffer.asUint32List(colors.offsetInBytes, colors.length);
+    }
+
     _drawAtlas(paint, atlas, rstTransforms, rects,
-        colors?.buffer.asUint32List(), blendMode ?? ui.BlendMode.src);
+        unsignedColors, blendMode ?? ui.BlendMode.src);
   }
 
   // TODO(hterkelsen): Pass a cull_rect once CanvasKit supports that.
@@ -460,9 +419,6 @@ class CanvasKitCanvas implements ui.Canvas {
   @override
   void drawShadow(ui.Path path, ui.Color color, double elevation,
       bool transparentOccluder) {
-    assert(path != null); // path is checked on the engine side
-    assert(color != null);
-    assert(transparentOccluder != null);
     _drawShadow(path, color, elevation, transparentOccluder);
   }
 
diff --git a/lib/web_ui/lib/src/engine/canvaskit/color_filter.dart b/lib/web_ui/lib/src/engine/canvaskit/color_filter.dart
index bc3422cb05ed1cb9f1e1b5dc7d96fcfa52b57eff..569a48edb9552f10807b3e983a5c29100045b91d 100644
--- a/lib/web_ui/lib/src/engine/canvaskit/color_filter.dart
+++ b/lib/web_ui/lib/src/engine/canvaskit/color_filter.dart
@@ -4,37 +4,32 @@
 
 import 'dart:typed_data';
 
+import 'package:ui/src/engine/vector_math.dart';
 import 'package:ui/ui.dart' as ui;
 
 import '../color_filter.dart';
 import '../util.dart';
 import 'canvaskit_api.dart';
 import 'image_filter.dart';
-import 'skia_object_cache.dart';
+import 'native_memory.dart';
 
-/// A concrete [ManagedSkiaObject] subclass that owns a [SkColorFilter] and
-/// manages its lifecycle.
+/// Owns a [SkColorFilter] and manages its lifecycle.
 ///
-/// Seealso:
+/// See also:
 ///
 /// * [CkPaint.colorFilter], which uses a [ManagedSkColorFilter] to manage
 ///   the lifecycle of its [SkColorFilter].
-class ManagedSkColorFilter extends ManagedSkiaObject<SkColorFilter> {
+class ManagedSkColorFilter {
   ManagedSkColorFilter(CkColorFilter ckColorFilter)
-      : colorFilter = ckColorFilter;
+      : colorFilter = ckColorFilter {
+    _ref = UniqueRef<SkColorFilter>(this, colorFilter._initRawColorFilter(), 'ColorFilter');
+  }
 
   final CkColorFilter colorFilter;
 
-  @override
-  SkColorFilter createDefault() => colorFilter._initRawColorFilter();
-
-  @override
-  SkColorFilter resurrect() => colorFilter._initRawColorFilter();
+  late final UniqueRef<SkColorFilter> _ref;
 
-  @override
-  void delete() {
-    rawSkiaObject?.delete();
-  }
+  SkColorFilter get skiaObject => _ref.nativeObject;
 
   @override
   int get hashCode => colorFilter.hashCode;
@@ -51,64 +46,85 @@ class ManagedSkColorFilter extends ManagedSkiaObject<SkColorFilter> {
   String toString() => colorFilter.toString();
 }
 
-/// A [ui.ColorFilter] backed by Skia's [SkColorFilter].
-///
-/// Additionally, this class provides the interface for converting itself to a
-/// [ManagedSkiaObject] that manages a skia image filter.
-abstract class CkColorFilter
-    implements CkManagedSkImageFilterConvertible {
+/// CanvasKit implementation of [ui.ColorFilter].
+abstract class CkColorFilter implements CkManagedSkImageFilterConvertible {
   const CkColorFilter();
 
-  /// Called by [ManagedSkiaObject.createDefault] and
-  /// [ManagedSkiaObject.resurrect] to create a new [SkImageFilter], when this
-  /// filter is used as an [ImageFilter].
-  SkImageFilter initRawImageFilter() =>
-      canvasKit.ImageFilter.MakeColorFilter(_initRawColorFilter(), null);
+  /// Converts this color filter into an image filter.
+  ///
+  /// Passes the ownership of the returned [SkImageFilter] to the caller. It is
+  /// the caller's responsibility to manage the lifecycle of the returned value.
+  SkImageFilter initRawImageFilter() {
+    final SkColorFilter skColorFilter = _initRawColorFilter();
+    final SkImageFilter result = canvasKit.ImageFilter.MakeColorFilter(skColorFilter, null);
+
+    // The underlying SkColorFilter is now owned by the SkImageFilter, so we
+    // need to drop the reference to allow it to be collected.
+    skColorFilter.delete();
+    return result;
+  }
 
-  /// Called by [ManagedSkiaObject.createDefault] and
-  /// [ManagedSkiaObject.resurrect] to create a new [SkColorFilter], when this
-  /// filter is used as a [ColorFilter].
+  /// Creates a Skia object based on the properties of this color filter.
+  ///
+  /// Passes the ownership of the returned [SkColorFilter] to the caller. It is
+  /// the caller's responsibility to manage the lifecycle of the returned value.
   SkColorFilter _initRawColorFilter();
 
   @override
-  ManagedSkiaObject<SkImageFilter> get imageFilter =>
-      CkColorFilterImageFilter(colorFilter: this);
+  void imageFilter(SkImageFilterBorrow borrow) {
+    // Since ColorFilter has a const constructor it cannot store dynamically
+    // created Skia objects. Therefore a new SkImageFilter is created every time
+    // it's used. However, once used it's no longer needed, so it's deleted
+    // immediately to free memory.
+    final SkImageFilter skImageFilter = initRawImageFilter();
+    borrow(skImageFilter);
+    skImageFilter.delete();
+  }
+
+  @override
+  Matrix4 get transform => Matrix4.identity();
+}
+
+/// A reusable identity transform matrix.
+///
+/// WARNING: DO NOT MUTATE THIS MATRIX! It is a shared global singleton.
+Float32List _identityTransform = _computeIdentityTransform();
+
+Float32List _computeIdentityTransform() {
+  final Float32List result = Float32List(20);
+  const List<int> translationIndices = <int>[0, 6, 12, 18];
+  for (final int i in translationIndices) {
+    result[i] = 1;
+  }
+  _identityTransform = result;
+  return result;
+}
+
+SkColorFilter createSkColorFilterFromColorAndBlendMode(
+    ui.Color color, ui.BlendMode blendMode) {
+  final SkColorFilter? filter = canvasKit.ColorFilter.MakeBlend(
+    toSharedSkColor1(color),
+    toSkBlendMode(blendMode),
+  );
+  if (filter == null) {
+    // If CanvasKit returns null, then the ColorFilter with this combination of
+    // color and blend mode is a no-op. So just return a dummy color filter that
+    // does nothing.
+    return canvasKit.ColorFilter.MakeMatrix(_identityTransform);
+  }
+  return filter;
 }
 
+
 class CkBlendModeColorFilter extends CkColorFilter {
   const CkBlendModeColorFilter(this.color, this.blendMode);
 
   final ui.Color color;
   final ui.BlendMode blendMode;
 
-  static Float32List get identityTransform => _identityTransform ?? _computeIdentityTransform();
-  static Float32List? _identityTransform;
-
-  static Float32List _computeIdentityTransform() {
-    final Float32List result = Float32List(20);
-    const List<int> translationIndices = <int>[0, 6, 12, 18];
-    for (final int i in translationIndices) {
-      result[i] = 1;
-    }
-    _identityTransform = result;
-    return result;
-  }
-
   @override
   SkColorFilter _initRawColorFilter() {
-    /// Return the identity matrix when the color opacity is 0. Replicates
-    /// effect of applying no filter
-    if (color.opacity == 0) {
-      return canvasKit.ColorFilter.MakeMatrix(identityTransform);
-    }
-    final SkColorFilter? filter = canvasKit.ColorFilter.MakeBlend(
-      toSharedSkColor1(color),
-      toSkBlendMode(blendMode),
-    );
-    if (filter == null) {
-      throw ArgumentError('Invalid parameters for blend mode ColorFilter');
-    }
-    return filter;
+    return createSkColorFilterFromColorAndBlendMode(color, blendMode);
   }
 
   @override
diff --git a/lib/web_ui/lib/src/engine/canvaskit/display_canvas_factory.dart b/lib/web_ui/lib/src/engine/canvaskit/display_canvas_factory.dart
new file mode 100644
index 0000000000000000000000000000000000000000..93807b60bb596347c18b4107a91e089210aca241
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/canvaskit/display_canvas_factory.dart
@@ -0,0 +1,130 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+import 'package:meta/meta.dart';
+
+import '../../engine.dart';
+
+/// Caches canvases used to display Skia-drawn content.
+class DisplayCanvasFactory<T extends DisplayCanvas> {
+  DisplayCanvasFactory({required this.createCanvas}) {
+    assert(() {
+      registerHotRestartListener(dispose);
+      return true;
+    }());
+  }
+
+  /// A function which is passed in as a constructor parameter which is used to
+  /// create new display canvases.
+  final T Function() createCanvas;
+
+  /// The base canvas to paint on. This is the default canvas which will be
+  /// painted to. If there are no platform views, then this canvas will render
+  /// the entire scene.
+  late final T baseCanvas = createCanvas()..initialize();
+
+  /// Canvases created by this factory which are currently in use.
+  final List<T> _liveCanvases = <T>[];
+
+  /// Canvases created by this factory which are no longer in use. These can be
+  /// reused.
+  final List<T> _cache = <T>[];
+
+  /// The number of canvases which have been created by this factory.
+  int get _canvasCount => _liveCanvases.length + _cache.length + 1;
+
+  /// The number of surfaces created by this factory. Used for testing.
+  @visibleForTesting
+  int get debugSurfaceCount => _canvasCount;
+
+  /// Returns the number of cached surfaces.
+  ///
+  /// Useful in tests.
+  int get debugCacheSize => _cache.length;
+
+  /// Gets a display canvas from the cache or creates a new one if there are
+  /// none in the cache.
+  T getCanvas() {
+    if (_cache.isNotEmpty) {
+      final T canvas = _cache.removeLast();
+      _liveCanvases.add(canvas);
+      return canvas;
+    } else {
+      final T canvas = createCanvas();
+      canvas.initialize();
+      _liveCanvases.add(canvas);
+      return canvas;
+    }
+  }
+
+  /// Releases all surfaces so they can be reused in the next frame.
+  ///
+  /// If a released surface is in the DOM, it is not removed. This allows the
+  /// engine to release the surfaces at the end of the frame so they are ready
+  /// to be used in the next frame, but still used for painting in the current
+  /// frame.
+  void releaseCanvases() {
+    _cache.addAll(_liveCanvases);
+    _liveCanvases.clear();
+  }
+
+  /// Removes all canvases except the base canvas from the DOM.
+  ///
+  /// This is called at the beginning of the frame to prepare for painting into
+  /// the new canvases.
+  void removeCanvasesFromDom() {
+    _cache.forEach(_removeFromDom);
+    _liveCanvases.forEach(_removeFromDom);
+  }
+
+  /// Calls [callback] on each canvas created by this factory.
+  void forEachCanvas(void Function(T canvas) callback) {
+    callback(baseCanvas);
+    _cache.forEach(callback);
+    _liveCanvases.forEach(callback);
+  }
+
+  // Removes [canvas] from the DOM.
+  void _removeFromDom(T canvas) {
+    canvas.hostElement.remove();
+  }
+
+  /// Signals that a canvas is no longer being used. It can be reused.
+  void releaseCanvas(T canvas) {
+    assert(canvas != baseCanvas, 'Attempting to release the base canvas');
+    assert(
+        _liveCanvases.contains(canvas),
+        'Attempting to release a Canvas which '
+        'was not created by this factory');
+    canvas.hostElement.remove();
+    _liveCanvases.remove(canvas);
+    _cache.add(canvas);
+  }
+
+  /// Returns [true] if [canvas] is currently being used to paint content.
+  ///
+  /// The base canvas always counts as live.
+  ///
+  /// If a canvas is not live, then it must be in the cache and ready to be
+  /// reused.
+  bool isLive(T canvas) {
+    if (canvas == baseCanvas || _liveCanvases.contains(canvas)) {
+      return true;
+    }
+    assert(_cache.contains(canvas));
+    return false;
+  }
+
+  /// Dispose all canvases created by this factory.
+  void dispose() {
+    for (final T canvas in _cache) {
+      canvas.dispose();
+    }
+    for (final T canvas in _liveCanvases) {
+      canvas.dispose();
+    }
+    baseCanvas.dispose();
+    _liveCanvases.clear();
+    _cache.clear();
+  }
+}
diff --git a/lib/web_ui/lib/src/engine/canvaskit/embedded_views.dart b/lib/web_ui/lib/src/engine/canvaskit/embedded_views.dart
index 27694946d5a233034b5ce044e020fc31bb704ef7..846107d4ad038e6f44d1d9d4328fa81aae8a044f 100644
--- a/lib/web_ui/lib/src/engine/canvaskit/embedded_views.dart
+++ b/lib/web_ui/lib/src/engine/canvaskit/embedded_views.dart
@@ -1,70 +1,32 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+import 'dart:math' as math;
 
 import 'package:ui/ui.dart' as ui;
 
-import '../../engine.dart' show platformViewManager;
-import '../configuration.dart';
+import '../../engine.dart' show PlatformViewManager, longestIncreasingSubsequence;
+import '../display.dart';
 import '../dom.dart';
 import '../html/path_to_svg_clip.dart';
 import '../platform_views/slots.dart';
 import '../svg.dart';
 import '../util.dart';
 import '../vector_math.dart';
-import '../window.dart';
 import 'canvas.dart';
-import 'embedded_views_diff.dart';
+import 'overlay_scene_optimizer.dart';
+import 'painting.dart';
 import 'path.dart';
+import 'picture.dart';
 import 'picture_recorder.dart';
-import 'renderer.dart';
-import 'surface.dart';
-import 'surface_factory.dart';
+import 'rasterizer.dart';
 
 /// This composites HTML views into the [ui.Scene].
 class HtmlViewEmbedder {
-  HtmlViewEmbedder._();
+  HtmlViewEmbedder(this.sceneHost, this.rasterizer);
 
-  /// The [HtmlViewEmbedder] singleton.
-  static HtmlViewEmbedder instance = HtmlViewEmbedder._();
-
-  DomElement get skiaSceneHost => CanvasKitRenderer.instance.sceneHost!;
-
-  /// Force the view embedder to disable overlays.
-  ///
-  /// This should never be used outside of tests.
-  static set debugDisableOverlays(bool disable) {
-    // Short circuit if the value is the same as what we already have.
-    if (disable == _debugOverlaysDisabled) {
-      return;
-    }
-    _debugOverlaysDisabled = disable;
-    final SurfaceFactory? instance = SurfaceFactory.debugUninitializedInstance;
-    if (instance != null) {
-      instance.releaseSurfaces();
-      instance.removeSurfacesFromDom();
-      instance.debugClear();
-    }
-    if (disable) {
-      // If we are disabling overlays then get the current [SurfaceFactory]
-      // instance, clear it, and overwrite it with a new instance with only
-      // one surface for the base surface.
-      SurfaceFactory.debugSetInstance(SurfaceFactory(1));
-    } else {
-      // If we are re-enabling overlays then replace the current
-      // [SurfaceFactory]instance with one with
-      // [configuration.canvasKitMaximumSurfaces] overlays.
-      SurfaceFactory.debugSetInstance(
-          SurfaceFactory(configuration.canvasKitMaximumSurfaces));
-    }
-  }
-
-  static bool _debugOverlaysDisabled = false;
-
-  /// Whether or not we have issues a warning to the user about having too many
-  /// surfaces on screen at once. This is so we only warn once, instead of every
-  /// frame.
-  bool _warnedAboutTooManySurfaces = false;
+  final DomElement sceneHost;
+  final ViewRasterizer rasterizer;
 
   /// The context for the current frame.
   EmbedderFrameContext _context = EmbedderFrameContext();
@@ -85,10 +47,9 @@ class HtmlViewEmbedder {
   /// * The number of clipping elements used last time the view was composited.
   final Map<int, ViewClipChain> _viewClipChains = <int, ViewClipChain>{};
 
-  /// Surfaces used to draw on top of platform views, keyed by platform view ID.
-  ///
-  /// These surfaces are cached in the [OverlayCache] and reused.
-  final Map<int, Surface> _overlays = <int, Surface>{};
+  /// The maximum number of render canvases to create. Too many canvases can
+  /// cause a performance burden.
+  static const int maximumCanvases = 8;
 
   /// The views that need to be recomposited into the scene on the next frame.
   final Set<int> _viewsToRecomposite = <int>{};
@@ -99,8 +60,13 @@ class HtmlViewEmbedder {
   /// The most recent composition order.
   final List<int> _activeCompositionOrder = <int>[];
 
+  /// The most recent rendering.
+  Rendering _activeRendering = Rendering();
+
+  DisplayCanvas? debugBoundsCanvas;
+
   /// The size of the frame, in physical pixels.
-  ui.Size _frameSize = ui.window.physicalSize;
+  late ui.Size _frameSize;
 
   set frameSize(ui.Size size) {
     _frameSize = size;
@@ -123,31 +89,9 @@ class HtmlViewEmbedder {
   }
 
   void prerollCompositeEmbeddedView(int viewId, EmbeddedViewParams params) {
-    final bool hasAvailableOverlay =
-        _context.pictureRecordersCreatedDuringPreroll.length <
-            SurfaceFactory.instance.maximumOverlays;
-    if (!hasAvailableOverlay && !_warnedAboutTooManySurfaces) {
-      _warnedAboutTooManySurfaces = true;
-      printWarning('Flutter was unable to create enough overlay surfaces. '
-          'This is usually caused by too many platform views being '
-          'displayed at once. '
-          'You may experience incorrect rendering.');
-    }
-    // We need an overlay for the first platform view no matter what. The first
-    // visible platform view doesn't need to create a new one if we already
-    // created one.
-    final bool needNewOverlay = (platformViewManager.isVisible(viewId) &&
-            _context.seenFirstVisibleViewInPreroll) ||
-        _context.pictureRecordersCreatedDuringPreroll.isEmpty;
-    if (platformViewManager.isVisible(viewId)) {
-      _context.seenFirstVisibleViewInPreroll = true;
-    }
-    if (needNewOverlay && hasAvailableOverlay) {
-      final CkPictureRecorder pictureRecorder = CkPictureRecorder();
-      pictureRecorder.beginRecording(ui.Offset.zero & _frameSize);
-      pictureRecorder.recordingCanvas!.clear(const ui.Color(0x00000000));
-      _context.pictureRecordersCreatedDuringPreroll.add(pictureRecorder);
-    }
+    final CkPictureRecorder pictureRecorder = CkPictureRecorder();
+    pictureRecorder.beginRecording(ui.Offset.zero & _frameSize);
+    _context.pictureRecordersCreatedDuringPreroll.add(pictureRecorder);
 
     // Do nothing if the params didn't change.
     if (_currentCompositionParams[viewId] == params) {
@@ -167,26 +111,18 @@ class HtmlViewEmbedder {
   /// If this returns a [CkCanvas], then that canvas should be the new leaf
   /// node. Otherwise, keep the same leaf node.
   CkCanvas? compositeEmbeddedView(int viewId) {
-    final int overlayIndex = _context.visibleViewCount;
+    // Ensure platform view with `viewId` is injected into the `rasterizer.view`.
+    rasterizer.view.dom.injectPlatformView(viewId);
+
+    final int overlayIndex = _context.viewCount;
     _compositionOrder.add(viewId);
-    if (platformViewManager.isVisible(viewId) ||
-        _context.pictureRecorders.isEmpty) {
-      _context.visibleViewCount++;
-    }
-    // We need a new overlay if this is a visible view or if we don't have one yet.
-    final bool needNewOverlay = (platformViewManager.isVisible(viewId) &&
-            _context.seenFirstVisibleView) ||
-        _context.pictureRecorders.isEmpty;
-    if (platformViewManager.isVisible(viewId)) {
-      _context.seenFirstVisibleView = true;
-    }
+    _context.viewCount++;
+
     CkPictureRecorder? recorderToUseForRendering;
-    if (needNewOverlay) {
-      if (overlayIndex < _context.pictureRecordersCreatedDuringPreroll.length) {
-        recorderToUseForRendering =
-            _context.pictureRecordersCreatedDuringPreroll[overlayIndex];
-        _context.pictureRecorders.add(recorderToUseForRendering);
-      }
+    if (overlayIndex < _context.pictureRecordersCreatedDuringPreroll.length) {
+      recorderToUseForRendering =
+          _context.pictureRecordersCreatedDuringPreroll[overlayIndex];
+      _context.pictureRecorders.add(recorderToUseForRendering);
     }
 
     if (_viewsToRecomposite.contains(viewId)) {
@@ -196,10 +132,11 @@ class HtmlViewEmbedder {
     return recorderToUseForRendering?.recordingCanvas;
   }
 
-  void _compositeWithParams(int viewId, EmbeddedViewParams params) {
+  void _compositeWithParams(int platformViewId, EmbeddedViewParams params) {
     // If we haven't seen this viewId yet, cache it for clips/transforms.
-    final ViewClipChain clipChain = _viewClipChains.putIfAbsent(viewId, () {
-      return ViewClipChain(view: createPlatformViewSlot(viewId));
+    final ViewClipChain clipChain =
+        _viewClipChains.putIfAbsent(platformViewId, () {
+      return ViewClipChain(view: createPlatformViewSlot(platformViewId));
     });
 
     final DomElement slot = clipChain.slot;
@@ -229,7 +166,7 @@ class HtmlViewEmbedder {
     }
 
     // Apply mutators to the slot
-    _applyMutators(params, slot, viewId);
+    _applyMutators(params, slot, platformViewId);
   }
 
   int _countClips(MutatorsStack mutators) {
@@ -272,7 +209,7 @@ class HtmlViewEmbedder {
 
     // If the chain was previously attached, attach it to the same position.
     if (headClipViewWasAttached) {
-      skiaSceneHost.insertBefore(head, headClipViewNextSibling);
+      sceneHost.insertBefore(head, headClipViewNextSibling);
     }
     return head;
   }
@@ -313,7 +250,6 @@ class HtmlViewEmbedder {
           headTransform = mutator.matrix!.multiplied(headTransform);
           head.style.transform =
               float64ListToCssTransform(headTransform.storage);
-          break;
         case MutatorType.clipRect:
         case MutatorType.clipRRect:
         case MutatorType.clipPath:
@@ -324,7 +260,7 @@ class HtmlViewEmbedder {
           clipView.style.transform = '';
           // We need to set width and height for the clipView to cover the
           // bounds of the path since Safari seem to incorrectly intersect
-          // the  element bounding rect with the clip path.
+          // the element bounding rect with the clip path.
           clipView.style.width = '100%';
           clipView.style.height = '100%';
           if (mutator.rect != null) {
@@ -370,10 +306,8 @@ class HtmlViewEmbedder {
           }
           _resetAnchor(clipView);
           head = clipView;
-          break;
         case MutatorType.opacity:
           embeddedOpacity *= mutator.alphaFloat;
-          break;
       }
     }
 
@@ -383,7 +317,7 @@ class HtmlViewEmbedder {
     //
     // HTML elements use logical (CSS) pixels, but we have been using physical
     // pixels, so scale down the head element to match the logical resolution.
-    final double scale = window.devicePixelRatio;
+    final double scale = EngineFlutterDisplay.instance.devicePixelRatio;
     final double inverseScale = 1 / scale;
     final Matrix4 scaleMatrix =
         Matrix4.diagonal3Values(inverseScale, inverseScale, 1);
@@ -415,36 +349,69 @@ class HtmlViewEmbedder {
     }
     _svgPathDefs = kSvgResourceHeader.cloneNode(false) as SVGElement;
     _svgPathDefs!.append(createSVGDefsElement()..id = 'sk_path_defs');
-    skiaSceneHost.append(_svgPathDefs!);
+    sceneHost.append(_svgPathDefs!);
   }
 
-  void submitFrame() {
-    final ViewListDiffResult? diffResult =
-        (_activeCompositionOrder.isEmpty || _compositionOrder.isEmpty)
-            ? null
-            : diffViewList(_activeCompositionOrder, _compositionOrder);
-    _updateOverlays(diffResult);
-    assert(_context.pictureRecorders.length == _overlays.length);
-    int pictureRecorderIndex = 0;
-
-    for (int i = 0; i < _compositionOrder.length; i++) {
-      final int viewId = _compositionOrder[i];
-      if (_overlays[viewId] != null) {
-        final SurfaceFrame frame = _overlays[viewId]!.acquireFrame(_frameSize);
-        final CkCanvas canvas = frame.skiaCanvas;
-        canvas.drawPicture(
-          _context.pictureRecorders[pictureRecorderIndex].endRecording(),
-        );
-        pictureRecorderIndex++;
-        frame.submit();
+  Future<void> submitFrame(CkPicture basePicture) async {
+    final List<CkPicture> pictures = <CkPicture>[basePicture];
+    for (final CkPictureRecorder recorder in _context.pictureRecorders) {
+      pictures.add(recorder.endRecording());
+    }
+    Rendering rendering = createOptimizedRendering(
+        pictures, _compositionOrder, _currentCompositionParams);
+    rendering = _modifyRenderingForMaxCanvases(rendering);
+    _updateDomForNewRendering(rendering);
+    if (rendering.equalsForRendering(_activeRendering)) {
+      // Copy the display canvases to the new rendering.
+      for (int i = 0; i < rendering.canvases.length; i++) {
+        rendering.canvases[i].displayCanvas =
+            _activeRendering.canvases[i].displayCanvas;
+        _activeRendering.canvases[i].displayCanvas = null;
       }
     }
+    _activeRendering = rendering;
+
+    final List<RenderingRenderCanvas> renderCanvases = rendering.canvases;
+    for (final RenderingRenderCanvas renderCanvas in renderCanvases) {
+      await rasterizer.rasterizeToCanvas(
+          renderCanvas.displayCanvas!, renderCanvas.pictures);
+    }
+
     for (final CkPictureRecorder recorder
         in _context.pictureRecordersCreatedDuringPreroll) {
       if (recorder.isRecording) {
         recorder.endRecording();
       }
     }
+
+    // Draw the computed bounds for pictures and platform views if overlay
+    // optimization debugging is enabled.
+    if (debugOverlayOptimizationBounds) {
+      debugBoundsCanvas ??= rasterizer.displayFactory.getCanvas();
+      final CkPictureRecorder boundsRecorder = CkPictureRecorder();
+      final CkCanvas boundsCanvas = boundsRecorder.beginRecording(
+          ui.Rect.fromLTWH(0, 0, _frameSize.width, _frameSize.height));
+      final CkPaint platformViewBoundsPaint = CkPaint()
+        ..color = const ui.Color.fromARGB(100, 0, 255, 0);
+      final CkPaint pictureBoundsPaint = CkPaint()
+        ..color = const ui.Color.fromARGB(100, 0, 0, 255);
+      for (final RenderingEntity entity in _activeRendering.entities) {
+        if (entity is RenderingPlatformView) {
+          if (entity.debugComputedBounds != null) {
+            boundsCanvas.drawRect(
+                entity.debugComputedBounds!, platformViewBoundsPaint);
+          }
+        } else if (entity is RenderingRenderCanvas) {
+          for (final CkPicture picture in entity.pictures) {
+            boundsCanvas.drawRect(picture.cullRect, pictureBoundsPaint);
+          }
+        }
+      }
+      await rasterizer.rasterizeToCanvas(
+          debugBoundsCanvas!, <CkPicture>[boundsRecorder.endRecording()]);
+      sceneHost.append(debugBoundsCanvas!.hostElement);
+    }
+
     // Reset the context.
     _context = EmbedderFrameContext();
     if (listEquals(_compositionOrder, _activeCompositionOrder)) {
@@ -457,241 +424,256 @@ class HtmlViewEmbedder {
 
     List<int>? debugInvalidViewIds;
 
-    if (diffResult != null) {
-      // Dispose of the views that should be removed, except for the ones which
-      // are going to be added back. Moving rather than removing and re-adding
-      // the view helps it maintain state.
-      disposeViews(diffResult.viewsToRemove
-          .where((int view) => !diffResult.viewsToAdd.contains(view))
-          .toSet());
-      _activeCompositionOrder.addAll(_compositionOrder);
-      unusedViews.removeAll(_compositionOrder);
-
-      DomElement? elementToInsertBefore;
-      if (diffResult.addToBeginning) {
-        elementToInsertBefore =
-            _viewClipChains[diffResult.viewToInsertBefore!]!.root;
-      }
+    for (int i = 0; i < _compositionOrder.length; i++) {
+      final int viewId = _compositionOrder[i];
 
-      for (final int viewId in diffResult.viewsToAdd) {
-        if (assertionsEnabled) {
-          if (!platformViewManager.knowsViewId(viewId)) {
-            debugInvalidViewIds ??= <int>[];
-            debugInvalidViewIds.add(viewId);
-            continue;
-          }
-        }
-        if (diffResult.addToBeginning) {
-          final DomElement platformViewRoot = _viewClipChains[viewId]!.root;
-          skiaSceneHost.insertBefore(platformViewRoot, elementToInsertBefore);
-          final Surface? overlay = _overlays[viewId];
-          if (overlay != null) {
-            skiaSceneHost.insertBefore(
-                overlay.htmlElement, elementToInsertBefore);
-          }
-        } else {
-          final DomElement platformViewRoot = _viewClipChains[viewId]!.root;
-          skiaSceneHost.append(platformViewRoot);
-          final Surface? overlay = _overlays[viewId];
-          if (overlay != null) {
-            skiaSceneHost.append(overlay.htmlElement);
-          }
+      bool isViewInvalid = false;
+      assert(() {
+        isViewInvalid = !PlatformViewManager.instance.knowsViewId(viewId);
+        if (isViewInvalid) {
+          debugInvalidViewIds ??= <int>[];
+          debugInvalidViewIds!.add(viewId);
         }
+        return true;
+      }());
+      if (isViewInvalid) {
+        continue;
       }
-      // It's possible that some platform views which were in the unchanged
-      // section have newly assigned overlays. If so, add them to the DOM.
-      for (int i = 0; i < _compositionOrder.length; i++) {
-        final int view = _compositionOrder[i];
-        if (_overlays[view] != null) {
-          final DomElement overlayElement = _overlays[view]!.htmlElement;
-          if (!overlayElement.isConnected!) {
-            // This overlay wasn't added to the DOM.
-            if (i == _compositionOrder.length - 1) {
-              skiaSceneHost.append(overlayElement);
-            } else {
-              final int nextView = _compositionOrder[i + 1];
-              final DomElement nextElement = _viewClipChains[nextView]!.root;
-              skiaSceneHost.insertBefore(overlayElement, nextElement);
-            }
-          }
-        }
-      }
-    } else {
-      SurfaceFactory.instance.removeSurfacesFromDom();
-      for (int i = 0; i < _compositionOrder.length; i++) {
-        final int viewId = _compositionOrder[i];
-
-        if (assertionsEnabled) {
-          if (!platformViewManager.knowsViewId(viewId)) {
-            debugInvalidViewIds ??= <int>[];
-            debugInvalidViewIds.add(viewId);
-            continue;
-          }
-        }
 
-        final DomElement platformViewRoot = _viewClipChains[viewId]!.root;
-        final Surface? overlay = _overlays[viewId];
-        skiaSceneHost.append(platformViewRoot);
-        if (overlay != null) {
-          skiaSceneHost.append(overlay.htmlElement);
-        }
-        _activeCompositionOrder.add(viewId);
-        unusedViews.remove(viewId);
-      }
+      _activeCompositionOrder.add(viewId);
+      unusedViews.remove(viewId);
     }
 
     _compositionOrder.clear();
 
-    disposeViews(unusedViews);
+    unusedViews.forEach(disposeView);
 
-    if (assertionsEnabled) {
-      if (debugInvalidViewIds != null && debugInvalidViewIds.isNotEmpty) {
-        throw AssertionError(
-          'Cannot render platform views: ${debugInvalidViewIds.join(', ')}. '
-          'These views have not been created, or they have been deleted.',
-        );
-      }
-    }
+    assert(
+      debugInvalidViewIds == null || debugInvalidViewIds!.isEmpty,
+      'Cannot render platform views: ${debugInvalidViewIds!.join(', ')}. '
+      'These views have not been created, or they have been deleted.',
+    );
   }
 
-  void disposeViews(Set<int> viewsToDispose) {
-    for (final int viewId in viewsToDispose) {
-      // Remove viewId from the _viewClipChains Map, and then from the DOM.
-      final ViewClipChain? clipChain = _viewClipChains.remove(viewId);
-      clipChain?.root.remove();
-      // More cleanup
-      _currentCompositionParams.remove(viewId);
-      _viewsToRecomposite.remove(viewId);
-      _cleanUpClipDefs(viewId);
-      _svgClipDefs.remove(viewId);
-    }
+  void disposeView(int viewId) {
+    final ViewClipChain? clipChain = _viewClipChains.remove(viewId);
+    clipChain?.root.remove();
+    // More cleanup
+    _currentCompositionParams.remove(viewId);
+    _viewsToRecomposite.remove(viewId);
+    _cleanUpClipDefs(viewId);
+    _svgClipDefs.remove(viewId);
   }
 
-  void _releaseOverlay(int viewId) {
-    if (_overlays[viewId] != null) {
-      final Surface overlay = _overlays[viewId]!;
-      SurfaceFactory.instance.releaseSurface(overlay);
-      _overlays.remove(viewId);
+  /// Modify the given rendering by removing canvases until the number of
+  /// canvases is less than or equal to the maximum number of canvases.
+  Rendering _modifyRenderingForMaxCanvases(Rendering rendering) {
+    final Rendering result = Rendering();
+    final int numCanvases = rendering.canvases.length;
+    if (numCanvases <= maximumCanvases) {
+      return rendering;
+    }
+    int numCanvasesToDelete = numCanvases - maximumCanvases;
+    final List<CkPicture> picturesForLastCanvas = <CkPicture>[];
+    final List<RenderingEntity> modifiedEntities =
+        List<RenderingEntity>.from(rendering.entities);
+    bool sawLastCanvas = false;
+    for (int i = rendering.entities.length - 1; i > 0; i--) {
+      final RenderingEntity entity = modifiedEntities[i];
+      if (entity is RenderingRenderCanvas) {
+        if (!sawLastCanvas) {
+          sawLastCanvas = true;
+          picturesForLastCanvas.insertAll(0, entity.pictures);
+          continue;
+        }
+        modifiedEntities.removeAt(i);
+        picturesForLastCanvas.insertAll(0, entity.pictures);
+        numCanvasesToDelete--;
+        if (numCanvasesToDelete == 0) {
+          break;
+        }
+      }
+    }
+    // Replace the pictures in the last canvas with all the pictures from the
+    // deleted canvases.
+    for (int i = modifiedEntities.length - 1; i > 0; i--) {
+      final RenderingEntity entity = modifiedEntities[i];
+      if (entity is RenderingRenderCanvas) {
+        entity.pictures.clear();
+        entity.pictures.addAll(picturesForLastCanvas);
+        break;
+      }
     }
+
+    result.entities.addAll(modifiedEntities);
+    return result;
   }
 
-  // Assigns overlays to the embedded views in the scene.
-  //
-  // This method attempts to be efficient by taking advantage of the
-  // [diffResult] and trying to re-use overlays which have already been
-  // assigned.
-  //
-  // This method accounts for invisible platform views by grouping them
-  // with the last visible platform view which precedes it. All invisible
-  // platform views that come after a visible view share the same overlay
-  // as the preceding visible view.
-  //
-  // This is called right before compositing the scene.
-  //
-  // [_compositionOrder] and [_activeComposition] order should contain the
-  // composition order of the current and previous frame, respectively.
-  //
-  // TODO(hterkelsen): Test this more thoroughly.
-  void _updateOverlays(ViewListDiffResult? diffResult) {
-    if (diffResult != null &&
-        diffResult.viewsToAdd.isEmpty &&
-        diffResult.viewsToRemove.isEmpty) {
-      // The composition order has not changed, continue using the assigned
-      // overlays.
+  void _updateDomForNewRendering(Rendering rendering) {
+    if (rendering.equalsForRendering(_activeRendering)) {
+      // The rendering has not changed, so no DOM manipulation is needed.
       return;
     }
-    final List<List<int>> overlayGroups = getOverlayGroups(_compositionOrder);
-    final List<int> viewsNeedingOverlays =
-        overlayGroups.map((List<int> group) => group.last).toList();
-    // If there were more visible views than overlays, then the last group
-    // doesn't have an overlay.
-    if (viewsNeedingOverlays.length > SurfaceFactory.instance.maximumOverlays) {
-      assert(viewsNeedingOverlays.length ==
-          SurfaceFactory.instance.maximumOverlays + 1);
-      viewsNeedingOverlays.removeLast();
-    }
-    if (diffResult == null) {
-      // Everything is going to be explicitly recomposited anyway. Release all
-      // the surfaces and assign an overlay to all the surfaces needing one.
-      SurfaceFactory.instance.releaseSurfaces();
-      _overlays.clear();
-      viewsNeedingOverlays.forEach(_initializeOverlay);
-    } else {
-      // We want to preserve the overlays in the "unchanged" section of the
-      // diff result as much as possible. Iterate over all the views needing
-      // overlays and assign them an overlay if they don't have one already.
-
-      // Use `toList` here since we will modify `_overlays` in the for-loop
-      // below.
-      final Iterable<int> viewsWithOverlays = _overlays.keys.toList();
-      viewsWithOverlays
-          .where((int view) => !viewsNeedingOverlays.contains(view))
-          .forEach(_releaseOverlay);
-      viewsNeedingOverlays
-          .where((int view) => !_overlays.containsKey(view))
-          .forEach(_initializeOverlay);
-    }
-    assert(_overlays.length == viewsNeedingOverlays.length);
-  }
+    final List<int> indexMap =
+        _getIndexMapFromPreviousRendering(_activeRendering, rendering);
+    final List<int> existingIndexMap =
+        indexMap.where((int index) => index != -1).toList();
+
+    final List<int> staticElements =
+        longestIncreasingSubsequence(existingIndexMap);
+    // Convert longest increasing subsequence from subsequence of indices of
+    // `existingIndexMap` to a subsequence of indices in previous rendering.
+    for (int i = 0; i < staticElements.length; i++) {
+      staticElements[i] = existingIndexMap[staticElements[i]];
+    }
+
+    // Remove elements which are in the active rendering, but not in the new
+    // rendering.
+    for (int i = 0; i < _activeRendering.entities.length; i++) {
+      if (indexMap.contains(i)) {
+        continue;
+      }
+      final RenderingEntity entity = _activeRendering.entities[i];
+      if (entity is RenderingPlatformView) {
+        disposeView(entity.viewId);
+      } else if (entity is RenderingRenderCanvas) {
+        assert(
+            entity.displayCanvas != null,
+            'RenderCanvas in previous rendering was '
+            'not assigned a DisplayCanvas');
+        rasterizer.releaseOverlay(entity.displayCanvas!);
+        entity.displayCanvas = null;
+      }
+    }
 
-  // Group the platform views into "overlay groups". These are sublists
-  // of the composition order which can share the same overlay. Every overlay
-  // group is a list containing a visible view followed by zero or more
-  // invisible views.
-  //
-  // If there are more visible views than overlays, then the views which cannot
-  // be assigned an overlay are grouped together and will be rendered on top of
-  // the rest of the scene.
-  List<List<int>> getOverlayGroups(List<int> views) {
-    // Visibility groups are typically a visible view followed by zero or more
-    // invisible views. However, if the view list begins with one or more
-    // invisible views, we can group them with the first visible view.
-    final int maxOverlays = SurfaceFactory.instance.maximumOverlays;
-    if (maxOverlays == 0) {
-      return const <List<int>>[];
-    }
-    bool foundFirstVisibleView = false;
-    final List<List<int>> result = <List<int>>[];
-    List<int> currentGroup = <int>[];
-    int i = 0;
-    for (; i < views.length; i++) {
-      final int view = views[i];
-      if (platformViewManager.isInvisible(view)) {
-        currentGroup.add(view);
+    // Updates [renderCanvas] (located in [index] in the next rendering) to have
+    // a display canvas, either taken from the associated render canvas in the
+    // previous rendering, or newly created.
+    void updateRenderCanvasWithDisplay(
+        RenderingRenderCanvas renderCanvas, int index) {
+      // Does [nextEntity] correspond with a render canvas in the previous
+      // rendering? If so, then the render canvas in the previous rendering
+      // had an associated display canvas. Use this display canvas for
+      // [nextEntity].
+      if (indexMap[index] != -1) {
+        final RenderingEntity previousEntity =
+            _activeRendering.entities[indexMap[index]];
+        assert(previousEntity is RenderingRenderCanvas &&
+            previousEntity.displayCanvas != null);
+        renderCanvas.displayCanvas =
+            (previousEntity as RenderingRenderCanvas).displayCanvas;
+        previousEntity.displayCanvas = null;
       } else {
-        if (foundFirstVisibleView) {
-          result.add(currentGroup);
-          // If we are out of overlays, then break let the rest of the views be
-          // added to an extra group that will be rendered on top of the scene.
-          if (result.length == maxOverlays) {
-            currentGroup = <int>[];
-            break;
-          } else {
-            currentGroup = <int>[view];
-          }
-        } else {
-          // We hit this case if this is the first visible view.
-          foundFirstVisibleView = true;
-          currentGroup.add(view);
+        // There is no corresponding render canvas in the previous
+        // rendering. So this render canvas needs a display canvas.
+        renderCanvas.displayCanvas = rasterizer.getOverlay();
+      }
+    }
+
+    // At this point, the DOM contains the static elements and the elements from
+    // the previous rendering which need to move. We iterate over the static
+    // elements and insert the elements which come before them into the DOM.
+    int staticElementIndex = 0;
+    int nextRenderingIndex = 0;
+    while (staticElementIndex < staticElements.length) {
+      final int staticElementIndexInActiveRendering =
+          staticElements[staticElementIndex];
+      final DomElement staticDomElement = _getElement(
+          _activeRendering.entities[staticElementIndexInActiveRendering]);
+      // Go through next rendering elements until we reach the static element.
+      while (
+          indexMap[nextRenderingIndex] != staticElementIndexInActiveRendering) {
+        final RenderingEntity nextEntity =
+            rendering.entities[nextRenderingIndex];
+        if (nextEntity is RenderingRenderCanvas) {
+          updateRenderCanvasWithDisplay(nextEntity, nextRenderingIndex);
         }
+        sceneHost.insertBefore(_getElement(nextEntity), staticDomElement);
+        nextRenderingIndex++;
+      }
+      if (rendering.entities[nextRenderingIndex] is RenderingRenderCanvas) {
+        updateRenderCanvasWithDisplay(
+            rendering.entities[nextRenderingIndex] as RenderingRenderCanvas,
+            nextRenderingIndex);
       }
+      // Also increment the next rendering index because this is the static
+      // element.
+      nextRenderingIndex++;
+      staticElementIndex++;
     }
-    if (i < views.length) {
-      currentGroup.addAll(views.sublist(i));
+
+    // Add the leftover entities.
+    while (nextRenderingIndex < rendering.entities.length) {
+      final RenderingEntity nextEntity = rendering.entities[nextRenderingIndex];
+      if (nextEntity is RenderingRenderCanvas) {
+        updateRenderCanvasWithDisplay(nextEntity, nextRenderingIndex);
+      }
+      sceneHost.append(_getElement(nextEntity));
+      nextRenderingIndex++;
     }
-    if (currentGroup.isNotEmpty) {
-      result.add(currentGroup);
+  }
+
+  DomElement _getElement(RenderingEntity entity) {
+    switch (entity) {
+      case RenderingRenderCanvas():
+        return entity.displayCanvas!.hostElement;
+      case RenderingPlatformView():
+        return _viewClipChains[entity.viewId]!.root;
     }
-    return result;
   }
 
-  void _initializeOverlay(int viewId) {
-    assert(!_overlays.containsKey(viewId));
+  /// Returns a [List] of ints mapping elements from the [next] rendering to
+  /// elements of the [previous] rendering. If there is no matching element in
+  /// the previous rendering, then the index map for that element is `-1`.
+  List<int> _getIndexMapFromPreviousRendering(
+      Rendering previous, Rendering next) {
+    assert(!previous.equalsForRendering(next),
+        'Should not be in this method if the Renderings are equal');
+    final List<int> result = <int>[];
+    int index = 0;
+
+    final int maxUnchangedLength =
+        math.min(previous.entities.length, next.entities.length);
+
+    // A canvas in the previous rendering can only be used once in the next
+    // rendering. So if it is matched with one in the next rendering, mark it
+    // here so it is only matched once.
+    final Set<int> alreadyClaimedCanvases = <int>{};
+
+    // Add the unchanged elements from the beginning of the list.
+    while (index < maxUnchangedLength &&
+        previous.entities[index].equalsForRendering(next.entities[index])) {
+      result.add(index);
+      if (previous.entities[index] is RenderingRenderCanvas) {
+        alreadyClaimedCanvases.add(index);
+      }
+      index += 1;
+    }
+
+    while (index < next.entities.length) {
+      bool foundForIndex = false;
+      for (int oldIndex = 0;
+          oldIndex < previous.entities.length;
+          oldIndex += 1) {
+        if (previous.entities[oldIndex]
+                .equalsForRendering(next.entities[index]) &&
+            !alreadyClaimedCanvases.contains(oldIndex)) {
+          result.add(oldIndex);
+          if (previous.entities[oldIndex] is RenderingRenderCanvas) {
+            alreadyClaimedCanvases.add(oldIndex);
+          }
+          foundForIndex = true;
+          break;
+        }
+      }
+      if (!foundForIndex) {
+        result.add(-1);
+      }
+      index += 1;
+    }
 
-    // Try reusing a cached overlay created for another platform view.
-    final Surface overlay = SurfaceFactory.instance.getSurface()!;
-    overlay.createOrUpdateSurface(_frameSize);
-    _overlays[viewId] = overlay;
+    assert(result.length == next.entities.length);
+    return result;
   }
 
   /// Deletes SVG clip paths, useful for tests.
@@ -711,19 +693,24 @@ class HtmlViewEmbedder {
     element.remove();
   }
 
-  /// Clears the state of this view embedder. Used in tests.
-  void debugClear() {
-    final Set<int> allViews = platformViewManager.debugClear();
-    disposeViews(allViews);
+  /// Disposes the state of this view embedder.
+  void dispose() {
+    _viewClipChains.keys.toList().forEach(disposeView);
     _context = EmbedderFrameContext();
     _currentCompositionParams.clear();
     debugCleanupSvgClipPaths();
     _currentCompositionParams.clear();
     _viewClipChains.clear();
-    _overlays.clear();
     _viewsToRecomposite.clear();
     _activeCompositionOrder.clear();
     _compositionOrder.clear();
+    _activeRendering = Rendering();
+  }
+
+  /// Clears the state. Used in tests.
+  void debugClear() {
+    dispose();
+    rasterizer.removeOverlaysFromDom();
   }
 }
 
@@ -901,16 +888,13 @@ class MutatorsStack extends Iterable<Mutator> {
 
   @override
   Iterator<Mutator> get iterator => _mutators.reversed.iterator;
+
+  /// Iterate over the mutators in reverse.
+  Iterable<Mutator> get reversed => _mutators;
 }
 
 /// The state for the current frame.
 class EmbedderFrameContext {
-  /// Whether or not we have seen a visible platform view in this frame yet.
-  bool seenFirstVisibleViewInPreroll = false;
-
-  /// Whether or not we have seen a visible platform view in this frame yet.
-  bool seenFirstVisibleView = false;
-
   /// Picture recorders which were created during the preroll phase.
   ///
   /// These picture recorders will be "claimed" in the paint phase by platform
@@ -923,8 +907,6 @@ class EmbedderFrameContext {
   /// This is a subset of [_pictureRecordersCreatedDuringPreroll].
   final List<CkPictureRecorder> pictureRecorders = <CkPictureRecorder>[];
 
-  /// The number of platform views in this frame which are visible.
-  ///
-  /// These platform views will require overlays.
-  int visibleViewCount = 0;
+  /// The number of platform views in this frame.
+  int viewCount = 0;
 }
diff --git a/lib/web_ui/lib/src/engine/canvaskit/embedded_views_diff.dart b/lib/web_ui/lib/src/engine/canvaskit/embedded_views_diff.dart
deleted file mode 100644
index b07cc97711782399cb84b1bababd20530bb51f05..0000000000000000000000000000000000000000
--- a/lib/web_ui/lib/src/engine/canvaskit/embedded_views_diff.dart
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-/// The results of diffing the current composition order with the active
-/// composition order.
-class ViewListDiffResult {
-  const ViewListDiffResult(
-      this.viewsToRemove, this.viewsToAdd, this.addToBeginning,
-      {this.viewToInsertBefore});
-
-  /// Views which should be removed from the scene.
-  final List<int> viewsToRemove;
-
-  /// Views to add to the scene.
-  final List<int> viewsToAdd;
-
-  /// If `true`, [viewsToAdd] should be added at the beginning of the scene.
-  /// Otherwise, they should be added at the end of the scene.
-  final bool addToBeginning;
-
-  /// If [addToBeginning] is `true`, then this is the id of the platform view
-  /// to insert [viewsToAdd] before.
-  ///
-  /// `null` if [addToBeginning] is `false`.
-  final int? viewToInsertBefore;
-}
-
-/// Diff the composition order with the active composition order. It is
-/// common for the composition order and active composition order to differ
-/// only slightly.
-///
-/// Consider a scrolling list of platform views; from frame
-/// to frame the composition order will change in one of two ways, depending
-/// on which direction the list is scrolling. One or more views will be added
-/// to the beginning of the list, and one or more views will be removed from
-/// the end of the list, with the order of the unchanged middle views
-/// remaining the same.
-// TODO(hterkelsen): Refactor to use [longestIncreasingSubsequence] and logic
-// similar to `Surface._insertChildDomNodes` to efficiently handle more cases,
-// https://github.com/flutter/flutter/issues/89611.
-ViewListDiffResult? diffViewList(List<int> active, List<int> next) {
-  if (active.isEmpty || next.isEmpty) {
-    return null;
-  }
-
-  // This is tried if the first element of the next list is contained in the
-  // active list at `index`. If the active and next lists are in the expected
-  // form, then we should be able to iterate from `index` to the end of the
-  // active list where every element matches in the next list.
-  ViewListDiffResult? lookForwards(int index) {
-    for (int i = 0; i + index < active.length; i++) {
-      if (active[i + index] != next[i]) {
-        // An element in the next list didn't match. This isn't in the expected
-        // form we can optimize.
-        return null;
-      }
-      if (i == next.length - 1) {
-        // The entire next list was contained in the active list.
-        if (index == 0) {
-          // If the first index of the next list is also the first index in the
-          // active list, then the next list is the same as the active list with
-          // views removed from the end.
-          return ViewListDiffResult(
-              active.sublist(i + 1), const <int>[], false);
-        } else if (i + index == active.length - 1) {
-          // If this is also the end of the active list, then the next list is
-          // the same as the active list with some views removed from the
-          // beginning.
-          return ViewListDiffResult(
-              active.sublist(0, index), const <int>[], false);
-        } else {
-          return null;
-        }
-      }
-    }
-    // We reached the end of the active list but have not reached the end of the
-    // next list. The lists are in the expected form. We should remove the
-    // elements from `0` to `index` in the active list from the DOM and add the
-    // elements from `active.length - index` (the entire active list minus the
-    // number of new elements at the beginning) to the end of the next list to
-    // the DOM at the end of the list of platform views.
-    final List<int> viewsToRemove = active.sublist(0, index);
-    final List<int> viewsToAdd = next.sublist(active.length - index);
-
-    return ViewListDiffResult(
-      viewsToRemove,
-      viewsToAdd,
-      false,
-    );
-  }
-
-  // This is tried if the last element of the next list is contained in the
-  // active list at `index`. If the lists are in the expected form, we should be
-  // able to iterate backwards from index to the beginning of the active list
-  // and have every element match the corresponding element from the next list.
-  ViewListDiffResult? lookBackwards(int index) {
-    for (int i = 0; index - i >= 0; i++) {
-      if (active[index - i] != next[next.length - 1 - i]) {
-        // An element from the next list didn't match the coresponding element
-        // from the active list. These lists aren't in the expected form.
-        return null;
-      }
-      if (i == next.length - 1) {
-        // The entire next list was contained in the active list.
-        if (index == active.length - 1) {
-          // If the last element of the next list is also the last element of
-          // the active list, then the next list is just the active list with
-          // some elements removed from the beginning.
-          return ViewListDiffResult(
-              active.sublist(0, active.length - i - 1), const <int>[], false);
-        } else if (index == i) {
-          // If we also reached the beginning of the active list, then the next
-          // list is the same as the active list with some views removed from
-          // the end.
-          return ViewListDiffResult(
-              active.sublist(index + 1), const <int>[], false);
-        } else {
-          return null;
-        }
-      }
-    }
-
-    // We reached the beginning of the active list but have not exhausted the
-    // entire next list. The lists are in the expected form. We should remove
-    // the elements from the end of the active list which come after the element
-    // which matches the last index of the next list (everything after `index`).
-    // We should add the elements from the next list which we didn't reach while
-    // iterating above (the first `next.length - index` views).
-    final List<int> viewsToRemove = active.sublist(index + 1);
-    final List<int> viewsToAdd = next.sublist(0, next.length - 1 - index);
-
-    return ViewListDiffResult(
-      viewsToRemove,
-      viewsToAdd,
-      true,
-      viewToInsertBefore: active.first,
-    );
-  }
-
-  // If the [active] and [next] lists are in the expected form described above,
-  // then either the first or last element of [next] will be in [active].
-  final int firstIndex = active.indexOf(next.first);
-  final int lastIndex = active.lastIndexOf(next.last);
-  if (firstIndex != -1 && lastIndex != -1) {
-    // Both the first element and the last element of the next list are in the
-    // active list. Search in the direction that will result in the least
-    // amount of deletions.
-    if (firstIndex <= (active.length - lastIndex)) {
-      return lookForwards(firstIndex);
-    } else {
-      return lookBackwards(lastIndex);
-    }
-  } else if (firstIndex != -1) {
-    return lookForwards(firstIndex);
-  } else if (lastIndex != -1) {
-    return lookBackwards(lastIndex);
-  } else {
-    return null;
-  }
-}
diff --git a/lib/web_ui/lib/src/engine/canvaskit/font_fallback_data.dart b/lib/web_ui/lib/src/engine/canvaskit/font_fallback_data.dart
deleted file mode 100644
index 18e137813ed7942d9d945ba98a864bdd8a77869f..0000000000000000000000000000000000000000
--- a/lib/web_ui/lib/src/engine/canvaskit/font_fallback_data.dart
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// DO NOT EDIT! This file is generated. See:
-// dev/generate_fallback_font_data.dart
-import 'noto_font.dart';
-
-final List<NotoFont> fallbackFonts = <NotoFont>[
-  NotoFont.fromFlatRanges('Noto Sans', 'https://fonts.gstatic.com/s/notosans/v27/o-0IIpQlx3QUlC5A4PNb4j5Ba_2c7A.ttf', <int>[0x20,0x7e,0xa0,0x377,0x37a,0x37f,0x384,0x38a,0x38c,0x38c,0x38e,0x3a1,0x3a3,0x3e1,0x3f0,0x52f,0x900,0x97f,0x1ab0,0x1ac0,0x1c80,0x1c88,0x1cd0,0x1cf6,0x1cf8,0x1cf9,0x1d00,0x1df9,0x1dfb,0x1f15,0x1f18,0x1f1d,0x1f20,0x1f45,0x1f48,0x1f4d,0x1f50,0x1f57,0x1f59,0x1f59,0x1f5b,0x1f5b,0x1f5d,0x1f5d,0x1f5f,0x1f7d,0x1f80,0x1fb4,0x1fb6,0x1fc4,0x1fc6,0x1fd3,0x1fd6,0x1fdb,0x1fdd,0x1fef,0x1ff2,0x1ff4,0x1ff6,0x1ffe,0x2000,0x2064,0x2066,0x2071,0x2074,0x208e,0x2090,0x209c,0x20a0,0x20bf,0x20f0,0x20f0,0x2100,0x215f,0x2184,0x2184,0x2189,0x2189,0x2212,0x2212,0x2215,0x2215,0x25cc,0x25cc,0x2c60,0x2c7f,0x2de0,0x2e52,0xa640,0xa69f,0xa700,0xa7bf,0xa7c2,0xa7ca,0xa7f5,0xa7ff,0xa830,0xa839,0xa8e0,0xa8ff,0xa92e,0xa92e,0xab30,0xab6b,0xfb00,0xfb06,0xfe00,0xfe00,0xfe20,0xfe2f,0xfeff,0xfeff,0xfffc,0xfffd,]),
-  NotoFont.fromFlatRanges('Noto Emoji', 'https://fonts.gstatic.com/s/notoemoji/v32/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0jwvS-FGJCMY.ttf', <int>[0x20,0x20,0x23,0x23,0x2a,0x2a,0x30,0x39,0xa9,0xa9,0xae,0xae,0x200d,0x200d,0x203c,0x203c,0x2049,0x2049,0x20e3,0x20e3,0x2122,0x2122,0x2139,0x2139,0x2194,0x2199,0x21a9,0x21aa,0x231a,0x231b,0x2328,0x2328,0x23cf,0x23cf,0x23e9,0x23f3,0x23f8,0x23fa,0x24c2,0x24c2,0x25aa,0x25ab,0x25b6,0x25b6,0x25c0,0x25c0,0x25fb,0x25fe,0x2600,0x2604,0x260e,0x260e,0x2611,0x2611,0x2614,0x2615,0x2618,0x2618,0x261d,0x261d,0x2620,0x2620,0x2622,0x2623,0x2626,0x2626,0x262a,0x262a,0x262e,0x262f,0x2638,0x263a,0x2640,0x2640,0x2642,0x2642,0x2648,0x2653,0x265f,0x2660,0x2663,0x2663,0x2665,0x2666,0x2668,0x2668,0x267b,0x267b,0x267e,0x267f,0x2692,0x2697,0x2699,0x2699,0x269b,0x269c,0x26a0,0x26a1,0x26a7,0x26a7,0x26aa,0x26ab,0x26b0,0x26b1,0x26bd,0x26be,0x26c4,0x26c5,0x26c8,0x26c8,0x26ce,0x26cf,0x26d1,0x26d1,0x26d3,0x26d4,0x26e9,0x26ea,0x26f0,0x26f5,0x26f7,0x26fa,0x26fd,0x26fd,0x2702,0x2702,0x2705,0x2705,0x2708,0x270d,0x270f,0x270f,0x2712,0x2712,0x2714,0x2714,0x2716,0x2716,0x271d,0x271d,0x2721,0x2721,0x2728,0x2728,0x2733,0x2734,0x2744,0x2744,0x2747,0x2747,0x274c,0x274c,0x274e,0x274e,0x2753,0x2755,0x2757,0x2757,0x2763,0x2764,0x2795,0x2797,0x27a1,0x27a1,0x27b0,0x27b0,0x27bf,0x27bf,0x2934,0x2935,0x2b05,0x2b07,0x2b1b,0x2b1c,0x2b50,0x2b50,0x2b55,0x2b55,0x3030,0x3030,0x303d,0x303d,0x3297,0x3297,0x3299,0x3299,0xfe0e,0xfe0f,0x1f004,0x1f004,0x1f0cf,0x1f0cf,0x1f170,0x1f171,0x1f17e,0x1f17f,0x1f18e,0x1f18e,0x1f191,0x1f19a,0x1f1e6,0x1f1ff,0x1f201,0x1f202,0x1f21a,0x1f21a,0x1f22f,0x1f22f,0x1f232,0x1f23a,0x1f250,0x1f251,0x1f300,0x1f321,0x1f324,0x1f393,0x1f396,0x1f397,0x1f399,0x1f39b,0x1f39e,0x1f3f0,0x1f3f3,0x1f3f5,0x1f3f7,0x1f4fd,0x1f4ff,0x1f53d,0x1f549,0x1f54e,0x1f550,0x1f567,0x1f56f,0x1f570,0x1f573,0x1f57a,0x1f587,0x1f587,0x1f58a,0x1f58d,0x1f590,0x1f590,0x1f595,0x1f596,0x1f5a4,0x1f5a5,0x1f5a8,0x1f5a8,0x1f5b1,0x1f5b2,0x1f5bc,0x1f5bc,0x1f5c2,0x1f5c4,0x1f5d1,0x1f5d3,0x1f5dc,0x1f5de,0x1f5e1,0x1f5e1,0x1f5e3,0x1f5e3,0x1f5e8,0x1f5e8,0x1f5ef,0x1f5ef,0x1f5f3,0x1f5f3,0x1f5fa,0x1f64f,0x1f680,0x1f6c5,0x1f6cb,0x1f6d2,0x1f6d5,0x1f6d7,0x1f6dc,0x1f6e5,0x1f6e9,0x1f6e9,0x1f6eb,0x1f6ec,0x1f6f0,0x1f6f0,0x1f6f3,0x1f6fc,0x1f7e0,0x1f7eb,0x1f7f0,0x1f7f0,0x1f90c,0x1f93a,0x1f93c,0x1f945,0x1f947,0x1f9ff,0x1fa70,0x1fa7c,0x1fa80,0x1fa88,0x1fa90,0x1fabd,0x1fabf,0x1fac5,0x1face,0x1fadb,0x1fae0,0x1fae8,0x1faf0,0x1faf8,0xe0030,0xe0039,0xe0061,0xe007a,0xe007f,0xe007f,0xfe4e5,0xfe4ee,0xfe82c,0xfe82c,0xfe82e,0xfe837,]),
-  NotoFont.fromFlatRanges('Noto Sans Symbols', 'https://fonts.gstatic.com/s/notosanssymbols/v34/rP2up3q65FkAtHfwd-eIS2brbDN6gxP34F9jRRCe4W3gfQ8gavVFRkzrbQ.ttf', <int>[0x20,0x20,0x30,0x39,0x41,0x5a,0x61,0x7a,0xa0,0xa0,0x20dd,0x20e0,0x20e2,0x20e4,0x2160,0x2183,0x2185,0x2188,0x218a,0x218b,0x2190,0x2199,0x2300,0x230f,0x2311,0x2315,0x2317,0x2317,0x231c,0x231f,0x2322,0x2323,0x2329,0x232a,0x232c,0x2335,0x237c,0x237c,0x2380,0x2394,0x2396,0x239a,0x23af,0x23af,0x23be,0x23cd,0x23d0,0x23db,0x23e2,0x23e8,0x2460,0x24ff,0x25cc,0x25cc,0x260a,0x260d,0x2613,0x2613,0x2624,0x262f,0x2638,0x263b,0x263d,0x2653,0x2669,0x267e,0x2690,0x269d,0x26a2,0x26a9,0x26ad,0x26bc,0x26ce,0x26ce,0x26e2,0x26ff,0x271d,0x2721,0x2776,0x2793,0x2921,0x2922,0x1f100,0x1f10c,0x1f110,0x1f16c,0x1f170,0x1f190,0x1f19b,0x1f1ac,0x1f546,0x1f549,0x1f54f,0x1f54f,0x1f610,0x1f610,0x1f700,0x1f773,]),
-  NotoFont.fromFlatRanges('Noto Sans Symbols 2', 'https://fonts.gstatic.com/s/notosanssymbols2/v15/I_uyMoGduATTei9eI8daxVHDyfisHr71ypPqfX71-AI.ttf', <int>[0x20,0x20,0x23,0x23,0x2a,0x2a,0x30,0x39,0x7f,0xa0,0x2022,0x2022,0x20e2,0x20e3,0x21af,0x21af,0x21e6,0x21f0,0x21f3,0x21f3,0x2218,0x2219,0x2299,0x2299,0x22c4,0x22c6,0x2316,0x2316,0x2318,0x2318,0x231a,0x231b,0x2324,0x2328,0x232b,0x232b,0x237b,0x237b,0x237d,0x237f,0x2394,0x2394,0x23ce,0x23cf,0x23e9,0x23ea,0x23ed,0x23ef,0x23f1,0x2426,0x2440,0x244a,0x25a0,0x2609,0x260e,0x2612,0x2614,0x2623,0x2630,0x2637,0x263c,0x263c,0x2654,0x2668,0x267f,0x268f,0x269e,0x26a1,0x26aa,0x26ac,0x26bd,0x26cd,0x26cf,0x26e1,0x2700,0x2704,0x2706,0x2709,0x270b,0x271c,0x2722,0x2727,0x2729,0x274b,0x274d,0x274d,0x274f,0x2753,0x2756,0x2775,0x2794,0x2794,0x2798,0x27af,0x27b1,0x27be,0x2800,0x28ff,0x2981,0x2981,0x29bf,0x29bf,0x29eb,0x29eb,0x2b00,0x2b0d,0x2b12,0x2b2f,0x2b4d,0x2b73,0x2b76,0x2b95,0x2b97,0x2bfd,0x2bff,0x2bff,0x4dc0,0x4dff,0xfff9,0xfffb,0x10140,0x1018e,0x10190,0x1019c,0x101a0,0x101a0,0x101d0,0x101fd,0x102e0,0x102fb,0x10e60,0x10e7e,0x1d2e0,0x1d2f3,0x1d300,0x1d356,0x1d360,0x1d378,0x1f000,0x1f02b,0x1f030,0x1f093,0x1f0a0,0x1f0ae,0x1f0b1,0x1f0bf,0x1f0c1,0x1f0cf,0x1f0d1,0x1f0f5,0x1f30d,0x1f30f,0x1f315,0x1f315,0x1f31c,0x1f31c,0x1f321,0x1f32c,0x1f336,0x1f336,0x1f378,0x1f378,0x1f37d,0x1f37d,0x1f393,0x1f39f,0x1f3a7,0x1f3a7,0x1f3ac,0x1f3ae,0x1f3c2,0x1f3c2,0x1f3c4,0x1f3c4,0x1f3c6,0x1f3c6,0x1f3ca,0x1f3ce,0x1f3d4,0x1f3e0,0x1f3ed,0x1f3ed,0x1f3f1,0x1f3f3,0x1f3f5,0x1f3f7,0x1f408,0x1f408,0x1f415,0x1f415,0x1f41f,0x1f41f,0x1f426,0x1f426,0x1f43f,0x1f43f,0x1f441,0x1f442,0x1f446,0x1f449,0x1f44c,0x1f44e,0x1f453,0x1f453,0x1f46a,0x1f46a,0x1f47d,0x1f47d,0x1f4a3,0x1f4a3,0x1f4b0,0x1f4b0,0x1f4b3,0x1f4b3,0x1f4b9,0x1f4b9,0x1f4bb,0x1f4bb,0x1f4bf,0x1f4bf,0x1f4c8,0x1f4cb,0x1f4da,0x1f4da,0x1f4df,0x1f4df,0x1f4e4,0x1f4e6,0x1f4ea,0x1f4ed,0x1f4f7,0x1f4f7,0x1f4f9,0x1f4fb,0x1f4fd,0x1f4fe,0x1f503,0x1f503,0x1f507,0x1f50a,0x1f50d,0x1f50d,0x1f512,0x1f513,0x1f53e,0x1f545,0x1f54a,0x1f54a,0x1f550,0x1f579,0x1f57b,0x1f594,0x1f597,0x1f5a3,0x1f5a5,0x1f5fa,0x1f650,0x1f67f,0x1f687,0x1f687,0x1f68d,0x1f68d,0x1f691,0x1f691,0x1f694,0x1f694,0x1f698,0x1f698,0x1f6ad,0x1f6ad,0x1f6b2,0x1f6b2,0x1f6b9,0x1f6ba,0x1f6bc,0x1f6bc,0x1f6c6,0x1f6cb,0x1f6cd,0x1f6cf,0x1f6d3,0x1f6d7,0x1f6e0,0x1f6ea,0x1f6f0,0x1f6f3,0x1f6f7,0x1f6fc,0x1f780,0x1f7d8,0x1f7e0,0x1f7eb,0x1f800,0x1f80b,0x1f810,0x1f847,0x1f850,0x1f859,0x1f860,0x1f887,0x1f890,0x1f8ad,0x1f8b0,0x1f8b1,0x1f93b,0x1f93b,0x1f946,0x1f946,0x1fa00,0x1fa53,0x1fa60,0x1fa6d,0x1fa70,0x1fa74,0x1fa78,0x1fa7a,0x1fa80,0x1fa86,0x1fa90,0x1faa8,0x1fab0,0x1fab6,0x1fac0,0x1fac2,0x1fad0,0x1fad6,0x1fb00,0x1fb92,0x1fb94,0x1fbca,0x1fbf0,0x1fbf9,]),
-  NotoFont.fromFlatRanges('Noto Sans Adlam', 'https://fonts.gstatic.com/s/notosansadlam/v19/neIczCCpqp0s5pPusPamd81eMfjPonvqdbYxxpgufnv0TGnBZLwhuvk.ttf', <int>[0x20,0x2f,0x3a,0x40,0x5b,0x5f,0x7b,0x7d,0xa0,0xa0,0xab,0xab,0xbb,0xbb,0x61f,0x61f,0x640,0x640,0x2013,0x2015,0x2018,0x201e,0x2020,0x2022,0x2026,0x2026,0x2030,0x2030,0x2039,0x203a,0x2044,0x2044,0x204f,0x204f,0x25cc,0x25cc,0x2e28,0x2e29,0x2e41,0x2e41,0x1e900,0x1e94b,0x1e950,0x1e959,0x1e95e,0x1e95f,]),
-  NotoFont.fromFlatRanges('Noto Sans Anatolian Hieroglyphs', 'https://fonts.gstatic.com/s/notosansanatolianhieroglyphs/v14/ijw9s4roRME5LLRxjsRb8A0gKPSWq4BbDmHHu6j2pEtUJzZWXybIymc5QYo.ttf', <int>[0x20,0x20,0xa0,0xa0,0x200b,0x200b,0x14400,0x14646,]),
-  NotoFont.fromFlatRanges('Noto Sans Arabic', 'https://fonts.gstatic.com/s/notosansarabic/v18/nwpxtLGrOAZMl5nJ_wfgRg3DrWFZWsnVBJ_sS6tlqHHFlhQ5l3sQWIHPqzCfyGyvu3CBFQLaig.ttf', <int>[0x20,0x21,0x2c,0x2e,0x30,0x3a,0xa0,0xa0,0xab,0xab,0xbb,0xbb,0x34f,0x34f,0x600,0x61c,0x61e,0x6ff,0x750,0x77f,0x8a0,0x8b4,0x8b6,0x8be,0x8d3,0x8ff,0x200b,0x2011,0x204f,0x204f,0x25cc,0x25cc,0x2e41,0x2e41,0xfb50,0xfbc1,0xfbd3,0xfd3f,0xfd50,0xfd8f,0xfd92,0xfdc7,0xfdf0,0xfdfd,0xfe70,0xfe74,0xfe76,0xfefc,]),
-  NotoFont.fromFlatRanges('Noto Sans Armenian', 'https://fonts.gstatic.com/s/notosansarmenian/v32/ZgN0jOZKPa7CHqq0h37c7ReDUubm2SEdFXp7ig73qtTY5idb74R9UdM3y2nZLorxb60iYy6zF3Eg.ttf', <int>[0x20,0x20,0x2d,0x2d,0xa0,0xa0,0x308,0x308,0x531,0x556,0x559,0x58a,0x58d,0x58f,0x2010,0x2010,0x25cc,0x25cc,0xfb13,0xfb17,]),
-  NotoFont.fromFlatRanges('Noto Sans Avestan', 'https://fonts.gstatic.com/s/notosansavestan/v17/bWti7ejKfBziStx7lIzKOLQZKhIJkyu9SASLji8U.ttf', <int>[0x20,0x7e,0xa0,0xa3,0xa5,0xa5,0xa7,0xab,0xae,0xb0,0xb4,0xb4,0xb6,0xb8,0xba,0xbb,0xbf,0x107,0x10a,0x113,0x116,0x11b,0x11e,0x123,0x126,0x127,0x12a,0x12b,0x12e,0x133,0x136,0x137,0x139,0x13e,0x141,0x148,0x14a,0x14d,0x150,0x15b,0x15e,0x161,0x164,0x165,0x16a,0x17e,0x1cd,0x1ce,0x218,0x21b,0x237,0x237,0x2c6,0x2c7,0x2c9,0x2c9,0x2d8,0x2dd,0x300,0x304,0x306,0x308,0x30a,0x30c,0x312,0x312,0x326,0x328,0x1e80,0x1e85,0x1e9e,0x1e9e,0x1ef2,0x1ef3,0x200c,0x200d,0x2013,0x2014,0x2018,0x201a,0x201c,0x201e,0x2022,0x2022,0x2026,0x2026,0x2039,0x203a,0x20ac,0x20ac,0x2122,0x2122,0x2212,0x2212,0x2e30,0x2e31,0x10b00,0x10b35,0x10b39,0x10b3f,]),
-  NotoFont.fromFlatRanges('Noto Sans Balinese', 'https://fonts.gstatic.com/s/notosansbalinese/v18/NaPwcYvSBuhTirw6IaFn6UrRDaqje-lpbbRtYf-Fwu2Ov7fdhE5Vd222PPY.ttf', <int>[0x20,0x7e,0xa0,0xa3,0xa5,0xa5,0xa7,0xab,0xae,0xb0,0xb4,0xb4,0xb6,0xb8,0xba,0xbb,0xbf,0x107,0x10a,0x113,0x116,0x11b,0x11e,0x123,0x126,0x127,0x12a,0x12b,0x12e,0x133,0x136,0x137,0x139,0x13e,0x141,0x148,0x14a,0x14d,0x150,0x15b,0x15e,0x161,0x164,0x165,0x16a,0x17e,0x1cd,0x1ce,0x218,0x21b,0x237,0x237,0x2c6,0x2c7,0x2c9,0x2c9,0x2d8,0x2dd,0x300,0x304,0x306,0x308,0x30a,0x30c,0x312,0x312,0x326,0x328,0x1b00,0x1b4b,0x1b50,0x1b7c,0x1e80,0x1e85,0x1e9e,0x1e9e,0x1ef2,0x1ef3,0x200b,0x200d,0x2013,0x2014,0x2018,0x201a,0x201c,0x201e,0x2022,0x2022,0x2026,0x2026,0x2039,0x203a,0x20ac,0x20ac,0x2122,0x2122,0x2212,0x2212,0x25cc,0x25cc,]),
-  NotoFont.fromFlatRanges('Noto Sans Bamum', 'https://fonts.gstatic.com/s/notosansbamum/v18/uk-0EGK3o6EruUbnwovcbBTkkklK_Ya_PBHfNGTPEddO-_gLykxEkxA.ttf', <int>[0x20,0x20,0xa0,0xa0,0xa6a0,0xa6f7,0x16800,0x16a38,]),
-  NotoFont.fromFlatRanges('Noto Sans Bassa Vah', 'https://fonts.gstatic.com/s/notosansbassavah/v15/PN_sRee-r3f7LnqsD5sax12gjZn7mBpL_4c2VNUQptE.ttf', <int>[0x20,0x20,0xa0,0xa0,0x25cc,0x25cc,0x16ad0,0x16aed,0x16af0,0x16af5,]),
-  NotoFont.fromFlatRanges('Noto Sans Batak', 'https://fonts.gstatic.com/s/notosansbatak/v15/gok2H6TwAEdtF9N8-mdTCQvT-Zdgo4_PHuk74A.ttf', <int>[0x20,0x20,0xa0,0xa0,0x1bc0,0x1bf3,0x1bfc,0x1bff,0x200b,0x200d,0x25cc,0x25cc,]),
-  NotoFont.fromFlatRanges('Noto Sans Bengali', 'https://fonts.gstatic.com/s/notosansbengali/v20/Cn-SJsCGWQxOjaGwMQ6fIiMywrNJIky6nvd8BjzVMvJx2mcSPVFpVEqE-6KmsolLudCk8izI0lc.ttf', <int>[0x20,0x7e,0xa0,0xa3,0xa5,0xa5,0xa7,0xab,0xad,0xb0,0xb4,0xb4,0xb6,0xb8,0xba,0xbb,0xbf,0x107,0x10a,0x113,0x116,0x11b,0x11e,0x123,0x126,0x127,0x12a,0x12b,0x12e,0x133,0x136,0x137,0x139,0x13e,0x141,0x148,0x14a,0x14d,0x150,0x15b,0x15e,0x161,0x164,0x165,0x16a,0x17e,0x1cd,0x1ce,0x218,0x21b,0x237,0x237,0x2bc,0x2bc,0x2c6,0x2c7,0x2c9,0x2c9,0x2d8,0x2dd,0x300,0x304,0x306,0x308,0x30a,0x30c,0x312,0x312,0x326,0x328,0x951,0x952,0x964,0x965,0x980,0x983,0x985,0x98c,0x98f,0x990,0x993,0x9a8,0x9aa,0x9b0,0x9b2,0x9b2,0x9b6,0x9b9,0x9bc,0x9c4,0x9c7,0x9c8,0x9cb,0x9ce,0x9d7,0x9d7,0x9dc,0x9dd,0x9df,0x9e3,0x9e6,0x9fe,0x1cd0,0x1cd0,0x1cd2,0x1cd2,0x1cd5,0x1cd6,0x1cd8,0x1cd8,0x1ce1,0x1ce1,0x1cea,0x1cea,0x1ced,0x1ced,0x1cf2,0x1cf2,0x1cf5,0x1cf7,0x1e80,0x1e85,0x1e9e,0x1e9e,0x1ef2,0x1ef3,0x200b,0x200d,0x2010,0x2010,0x2013,0x2014,0x2018,0x201a,0x201c,0x201e,0x2022,0x2022,0x2026,0x2026,0x2039,0x203a,0x20ac,0x20ac,0x20b9,0x20b9,0x2122,0x2122,0x2212,0x2212,0x25cc,0x25cc,0xa8f1,0xa8f1,]),
-  NotoFont.fromFlatRanges('Noto Sans Bhaiksuki', 'https://fonts.gstatic.com/s/notosansbhaiksuki/v15/UcC63EosKniBH4iELXATsSBWdvUHXxhj8rLUdU4wh9U.ttf', <int>[0x20,0x20,0xa0,0xa0,0x200b,0x200b,0x25cc,0x25cc,0x11c00,0x11c08,0x11c0a,0x11c36,0x11c38,0x11c45,0x11c50,0x11c6c,]),
-  NotoFont.fromFlatRanges('Noto Sans Brahmi', 'https://fonts.gstatic.com/s/notosansbrahmi/v15/vEFK2-VODB8RrNDvZSUmQQIIByV18tK1W77HtMo.ttf', <int>[0x20,0x20,0xa0,0xa0,0x200b,0x200d,0x25cc,0x25cc,0x11000,0x1104d,0x11052,0x1106f,0x1107f,0x1107f,]),
-  NotoFont.fromFlatRanges('Noto Sans Buginese', 'https://fonts.gstatic.com/s/notosansbuginese/v15/esDM30ldNv-KYGGJpKGk18phe_7Da6_gtfuEXLmNtw.ttf', <int>[0x20,0x20,0xa0,0xa0,0x1a00,0x1a1b,0x1a1e,0x1a1f,0x200b,0x200d,0x25cc,0x25cc,0xa9cf,0xa9cf,]),
-  NotoFont.fromFlatRanges('Noto Sans Buhid', 'https://fonts.gstatic.com/s/notosansbuhid/v17/Dxxy8jiXMW75w3OmoDXVWJD7YwzAe6tgnaFoGA.ttf', <int>[0x20,0x7e,0xa0,0xa3,0xa5,0xa5,0xa7,0xab,0xae,0xb0,0xb4,0xb4,0xb6,0xb8,0xba,0xbb,0xbf,0x107,0x10a,0x113,0x116,0x11b,0x11e,0x123,0x126,0x127,0x12a,0x12b,0x12e,0x133,0x136,0x137,0x139,0x13e,0x141,0x148,0x14a,0x14d,0x150,0x15b,0x15e,0x161,0x164,0x165,0x16a,0x17e,0x1cd,0x1ce,0x218,0x21b,0x237,0x237,0x2c6,0x2c7,0x2c9,0x2c9,0x2d8,0x2dd,0x300,0x304,0x306,0x308,0x30a,0x30c,0x312,0x312,0x326,0x328,0x1735,0x1736,0x1740,0x1753,0x1e80,0x1e85,0x1e9e,0x1e9e,0x1ef2,0x1ef3,0x200b,0x200d,0x2013,0x2014,0x2018,0x201a,0x201c,0x201e,0x2022,0x2022,0x2026,0x2026,0x2039,0x203a,0x20ac,0x20ac,0x2122,0x2122,0x2212,0x2212,0x25cc,0x25cc,]),
-  NotoFont.fromFlatRanges('Noto Sans Canadian Aboriginal', 'https://fonts.gstatic.com/s/notosanscanadianaboriginal/v19/4C_TLjTuEqPj-8J01CwaGkiZ9os0iGVkezM1mUT-j_Lmlzda6uH_nnX1bzigWLn_yAsg0q0uhQ.ttf', <int>[0x20,0x20,0xa0,0xa0,0x131,0x131,0x2c7,0x2c7,0x2d8,0x2db,0x307,0x307,0x1400,0x167f,0x18b0,0x18f5,0x25cc,0x25cc,]),
-  NotoFont.fromFlatRanges('Noto Sans Carian', 'https://fonts.gstatic.com/s/notosanscarian/v15/LDIpaoiONgYwA9Yc6f0gUILeMIOgs7ob9yGLmfI.ttf', <int>[0x20,0x20,0xa0,0xa0,0x102a0,0x102d0,]),
-  NotoFont.fromFlatRanges('Noto Sans Caucasian Albanian', 'https://fonts.gstatic.com/s/notosanscaucasianalbanian/v16/nKKA-HM_FYFRJvXzVXaANsU0VzsAc46QGOkWytlTs-TXrYDmoVmRSZo.ttf', <int>[0x20,0x20,0xa0,0xa0,0x304,0x304,0x331,0x331,0x25cc,0x25cc,0xfe20,0xfe2f,0x10530,0x10563,0x1056f,0x1056f,]),
-  NotoFont.fromFlatRanges('Noto Sans Chakma', 'https://fonts.gstatic.com/s/notosanschakma/v15/Y4GQYbJ8VTEp4t3MKJSMjg5OIzhi4JjTQhYBeYo.ttf', <int>[0x20,0x20,0xa0,0xa0,0x9e6,0x9ef,0x1040,0x1049,0x200c,0x200d,0x25cc,0x25cc,0x11100,0x11134,0x11136,0x11146,]),
-  NotoFont.fromFlatRanges('Noto Sans Cham', 'https://fonts.gstatic.com/s/notosanscham/v19/pe06MIySN5pO62Z5YkFyQb_bbuRhe6D4yip43qfcERwcv7GykboaLg.ttf', <int>[0x20,0x22,0x27,0x29,0x2c,0x2f,0x3a,0x3b,0x3f,0x3f,0xa0,0xa0,0xad,0xad,0x200c,0x200d,0x2010,0x2010,0x25cc,0x25cc,0xaa00,0xaa36,0xaa40,0xaa4d,0xaa50,0xaa59,0xaa5c,0xaa5f,]),
-  NotoFont.fromFlatRanges('Noto Sans Cherokee', 'https://fonts.gstatic.com/s/notosanscherokee/v17/KFOPCm6Yu8uF-29fiz9vQF9YWK6Z8O10cHNA0cSkZCHYWi5PDkm5rAffjl0.ttf', <int>[0x20,0x20,0xa0,0xa0,0x300,0x302,0x304,0x304,0x30b,0x30c,0x323,0x324,0x330,0x331,0x13a0,0x13f5,0x13f8,0x13fd,0xab70,0xabbf,]),
-  NotoFont.fromFlatRanges('Noto Sans Coptic', 'https://fonts.gstatic.com/s/notosanscoptic/v15/iJWfBWmUZi_OHPqn4wq6kgqumOEd78u_VG0xR4Y.ttf', <int>[0x20,0x20,0x2d,0x2d,0xa0,0xa0,0x300,0x302,0x304,0x305,0x307,0x308,0x323,0x323,0x33f,0x33f,0x361,0x361,0x374,0x375,0x3e2,0x3ef,0x1dcd,0x1dcd,0x2010,0x2010,0x25cc,0x25cc,0x2c80,0x2cf3,0x2cf9,0x2cff,0xfe24,0xfe26,0x102e0,0x102fb,]),
-  NotoFont.fromFlatRanges('Noto Sans Cuneiform', 'https://fonts.gstatic.com/s/notosanscuneiform/v15/bMrrmTWK7YY-MF22aHGGd7H8PhJtvBDWgb9JlRQueeQ.ttf', <int>[0x20,0x20,0xa0,0xa0,0x12000,0x12399,0x12400,0x1246e,0x12470,0x12474,0x12480,0x12543,]),
-  NotoFont.fromFlatRanges('Noto Sans Cypriot', 'https://fonts.gstatic.com/s/notosanscypriot/v15/8AtzGta9PYqQDjyp79a6f8Cj-3a3cxIsK5MPpahF.ttf', <int>[0x20,0x20,0xa0,0xa0,0x10800,0x10805,0x10808,0x10808,0x1080a,0x10835,0x10837,0x10838,0x1083c,0x1083c,0x1083f,0x1083f,]),
-  NotoFont.fromFlatRanges('Noto Sans Deseret', 'https://fonts.gstatic.com/s/notosansdeseret/v15/MwQsbgPp1eKH6QsAVuFb9AZM6MMr2Vq9ZnJSZtQG.ttf', <int>[0x20,0x20,0xa0,0xa0,0x10400,0x1044f,]),
-  NotoFont.fromFlatRanges('Noto Sans Devanagari', 'https://fonts.gstatic.com/s/notosansdevanagari/v19/TuGoUUFzXI5FBtUq5a8bjKYTZjtRU6Sgv3NaV_SNmI0b8QQCQmHn6B2OHjbL_08AlXQly-AzoFoW4Ow.ttf', <int>[0x20,0x7e,0xa0,0xa3,0xa5,0xa5,0xa7,0xab,0xad,0xb0,0xb4,0xb4,0xb6,0xb8,0xba,0xbb,0xbf,0x107,0x10a,0x113,0x116,0x11b,0x11e,0x123,0x126,0x127,0x12a,0x12b,0x12e,0x133,0x136,0x137,0x139,0x13e,0x141,0x148,0x14a,0x14d,0x150,0x15b,0x15e,0x161,0x164,0x165,0x16a,0x17e,0x1cd,0x1ce,0x218,0x21b,0x237,0x237,0x2bc,0x2bc,0x2c6,0x2c7,0x2c9,0x2c9,0x2d8,0x2dd,0x300,0x304,0x306,0x308,0x30a,0x30c,0x312,0x312,0x326,0x328,0x900,0x97f,0x1cd0,0x1cf6,0x1cf8,0x1cf9,0x1e80,0x1e85,0x1e9e,0x1e9e,0x1ef2,0x1ef3,0x200b,0x200d,0x2010,0x2010,0x2013,0x2014,0x2018,0x201a,0x201c,0x201e,0x2022,0x2022,0x2026,0x2026,0x2039,0x203a,0x20ac,0x20ac,0x20b9,0x20b9,0x20f0,0x20f0,0x2122,0x2122,0x2212,0x2212,0x25cc,0x25cc,0xa830,0xa839,0xa8e0,0xa8ff,]),
-  NotoFont.fromFlatRanges('Noto Sans Duployan', 'https://fonts.gstatic.com/s/notosansduployan/v16/gokzH7nwAEdtF9N8-mdTDx_X9JM5wsvrFsIn6WYDvA.ttf', <int>[0x20,0x20,0xa0,0xa0,0x200c,0x200d,0x25cc,0x25cc,0x1bc00,0x1bc6a,0x1bc70,0x1bc7c,0x1bc80,0x1bc88,0x1bc90,0x1bc99,0x1bc9c,0x1bca3,]),
-  NotoFont.fromFlatRanges('Noto Sans Egyptian Hieroglyphs', 'https://fonts.gstatic.com/s/notosansegyptianhieroglyphs/v26/vEF42-tODB8RrNDvZSUmRhcQHzx1s7y_F9-j3qSzEcbEYindSVK8xRg7iw.ttf', <int>[0x20,0x20,0xa0,0xa0,0x200c,0x200d,0x25cc,0x25cc,0x13000,0x1342e,]),
-  NotoFont.fromFlatRanges('Noto Sans Elbasan', 'https://fonts.gstatic.com/s/notosanselbasan/v15/-F6rfiZqLzI2JPCgQBnw400qp1trvHdlre4dFcFh.ttf', <int>[0x20,0x20,0xa0,0xa0,0xb7,0xb7,0x305,0x305,0x391,0x3a1,0x3a3,0x3a9,0x3da,0x3da,0x3dc,0x3dc,0x3de,0x3de,0x25cc,0x25cc,0x10500,0x10527,]),
-  NotoFont.fromFlatRanges('Noto Sans Elymaic', 'https://fonts.gstatic.com/s/notosanselymaic/v15/UqyKK9YTJW5liNMhTMqe9vUFP65ZD4AjWOT0zi2V.ttf', <int>[0x20,0x20,0xa0,0xa0,0x10fe0,0x10ff6,]),
-  NotoFont.fromFlatRanges('Noto Sans Georgian', 'https://fonts.gstatic.com/s/notosansgeorgian/v36/PlIaFke5O6RzLfvNNVSitxkr76PRHBC4Ytyq-Gof7PUs4S7zWn-8YDB09HFNdpvnzFj-f5WK0OQV.ttf', <int>[0x20,0x7e,0xa0,0xa3,0xa5,0xa5,0xa7,0xab,0xae,0xb0,0xb4,0xb4,0xb6,0xb8,0xba,0xbb,0xbf,0x107,0x10a,0x113,0x116,0x11b,0x11e,0x123,0x126,0x127,0x12a,0x12b,0x12e,0x133,0x136,0x137,0x139,0x13e,0x141,0x148,0x14a,0x14d,0x150,0x15b,0x15e,0x161,0x164,0x165,0x16a,0x17e,0x1cd,0x1ce,0x218,0x21b,0x237,0x237,0x2c6,0x2c7,0x2c9,0x2c9,0x2d8,0x2dd,0x300,0x304,0x306,0x308,0x30a,0x30c,0x312,0x312,0x326,0x328,0x589,0x589,0x10a0,0x10c5,0x10c7,0x10c7,0x10cd,0x10cd,0x10d0,0x10ff,0x1c90,0x1cba,0x1cbd,0x1cbf,0x1e80,0x1e85,0x1e9e,0x1e9e,0x1ef2,0x1ef3,0x2010,0x2010,0x2013,0x2014,0x2018,0x201a,0x201c,0x201e,0x2022,0x2022,0x2026,0x2026,0x2039,0x203a,0x20ac,0x20ac,0x20be,0x20be,0x2122,0x2122,0x2212,0x2212,0x2d00,0x2d25,0x2d27,0x2d27,0x2d2d,0x2d2d,]),
-  NotoFont.fromFlatRanges('Noto Sans Glagolitic', 'https://fonts.gstatic.com/s/notosansglagolitic/v15/1q2ZY4-BBFBst88SU_tOj4J-4yuNF_HI4ERK4Amu7nM1.ttf', <int>[0x20,0x20,0xa0,0xa0,0x303,0x303,0x305,0x305,0x484,0x484,0x487,0x487,0x2c00,0x2c2e,0x2c30,0x2c5e,0xa66f,0xa66f,0x1e000,0x1e006,0x1e008,0x1e018,0x1e01b,0x1e021,0x1e023,0x1e024,0x1e026,0x1e02a,]),
-  NotoFont.fromFlatRanges('Noto Sans Gothic', 'https://fonts.gstatic.com/s/notosansgothic/v15/TuGKUUVzXI5FBtUq5a8bj6wRbzxTFMX40kFQRx0.ttf', <int>[0x20,0x20,0xa0,0xa0,0x304,0x305,0x308,0x308,0x331,0x331,0x10330,0x1034a,]),
-  NotoFont.fromFlatRanges('Noto Sans Grantha', 'https://fonts.gstatic.com/s/notosansgrantha/v15/3y976akwcCjmsU8NDyrKo3IQfQ4o-r8cFeulHc6N.ttf', <int>[0x20,0x20,0xa0,0xa0,0x951,0x952,0x964,0x965,0xbaa,0xbaa,0xbb5,0xbb5,0xbe6,0xbf2,0x1cd0,0x1cd0,0x1cd2,0x1cd3,0x1cf2,0x1cf4,0x1cf8,0x1cf9,0x200c,0x200d,0x20f0,0x20f0,0x25cc,0x25cc,0x11300,0x11303,0x11305,0x1130c,0x1130f,0x11310,0x11313,0x11328,0x1132a,0x11330,0x11332,0x11333,0x11335,0x11339,0x1133b,0x11344,0x11347,0x11348,0x1134b,0x1134d,0x11350,0x11350,0x11357,0x11357,0x1135d,0x11363,0x11366,0x1136c,0x11370,0x11374,]),
-  NotoFont.fromFlatRanges('Noto Sans Gujarati', 'https://fonts.gstatic.com/s/notosansgujarati/v19/wlpWgx_HC1ti5ViekvcxnhMlCVo3f5pv17ivlzsUB14gg1TMR2Gw4VceEl7MA_ypFwPM_OdiEH0s.ttf', <int>[0x20,0x7e,0xa0,0xa3,0xa5,0xa5,0xa7,0xab,0xad,0xb0,0xb4,0xb4,0xb6,0xb8,0xba,0xbb,0xbf,0x107,0x10a,0x113,0x116,0x11b,0x11e,0x123,0x126,0x127,0x12a,0x12b,0x12e,0x133,0x136,0x137,0x139,0x13e,0x141,0x148,0x14a,0x14d,0x150,0x15b,0x15e,0x161,0x164,0x165,0x16a,0x17e,0x1cd,0x1ce,0x218,0x21b,0x237,0x237,0x2c6,0x2c7,0x2c9,0x2c9,0x2d8,0x2dd,0x300,0x304,0x306,0x308,0x30a,0x30c,0x312,0x312,0x326,0x328,0x951,0x952,0x964,0x965,0xa81,0xa83,0xa85,0xa8d,0xa8f,0xa91,0xa93,0xaa8,0xaaa,0xab0,0xab2,0xab3,0xab5,0xab9,0xabc,0xac5,0xac7,0xac9,0xacb,0xacd,0xad0,0xad0,0xae0,0xae3,0xae6,0xaf1,0xaf9,0xaff,0x1e80,0x1e85,0x1e9e,0x1e9e,0x1ef2,0x1ef3,0x200b,0x200d,0x2010,0x2010,0x2013,0x2014,0x2018,0x201a,0x201c,0x201e,0x2022,0x2022,0x2026,0x2026,0x2039,0x203a,0x20ac,0x20ac,0x20b9,0x20b9,0x2122,0x2122,0x2212,0x2212,0x25cc,0x25cc,0xa830,0xa839,]),
-  NotoFont.fromFlatRanges('Noto Sans Gunjala Gondi', 'https://fonts.gstatic.com/s/notosansgunjalagondi/v15/bWto7e7KfBziStx7lIzKPrcSMwcEnCv6DW7n5hcVXYMTK4q1.ttf', <int>[0x20,0x21,0x25,0x25,0x27,0x2f,0x3a,0x3a,0x3c,0x3f,0xa0,0xa0,0xd7,0xd7,0xf7,0xf7,0x200c,0x200d,0x2018,0x2019,0x201c,0x201d,0x2026,0x2026,0x2212,0x2212,0x25cc,0x25cc,0x11d60,0x11d65,0x11d67,0x11d68,0x11d6a,0x11d8e,0x11d90,0x11d91,0x11d93,0x11d98,0x11da0,0x11da9,]),
-  NotoFont.fromFlatRanges('Noto Sans Gurmukhi', 'https://fonts.gstatic.com/s/notosansgurmukhi/v18/w8g9H3EvQP81sInb43inmyN9zZ7hb7ATbSWo4q8dJ74a3cVrYFQ_bogT0-gPeG1OenbxZ_trdp7h.ttf', <int>[0x20,0x23,0x25,0x25,0x27,0x3f,0x5b,0x5f,0x7b,0x7e,0xa0,0xa0,0xad,0xad,0xd7,0xd7,0xf7,0xf7,0x951,0x952,0x964,0x965,0xa01,0xa03,0xa05,0xa0a,0xa0f,0xa10,0xa13,0xa28,0xa2a,0xa30,0xa32,0xa33,0xa35,0xa36,0xa38,0xa39,0xa3c,0xa3c,0xa3e,0xa42,0xa47,0xa48,0xa4b,0xa4d,0xa51,0xa51,0xa59,0xa5c,0xa5e,0xa5e,0xa66,0xa76,0x200b,0x200d,0x2010,0x2010,0x2013,0x2014,0x2018,0x2019,0x201c,0x201d,0x2026,0x2026,0x20b9,0x20b9,0x2212,0x2212,0x25cc,0x25cc,0x262c,0x262c,0xa830,0xa839,]),
-  NotoFont.fromFlatRanges('Noto Sans HK', 'https://fonts.gstatic.com/s/notosanshk/v21/nKKQ-GM_FYFRJvXzVXaAPe9hMnB3Eu7mOQ.otf', <int>[0x20,0x7e,0xa0,0x103,0x110,0x113,0x11a,0x11b,0x128,0x12b,0x143,0x144,0x147,0x148,0x14c,0x14f,0x152,0x153,0x168,0x16d,0x192,0x192,0x1a0,0x1a1,0x1af,0x1b0,0x1cd,0x1dc,0x1f8,0x1f9,0x251,0x251,0x261,0x261,0x2bb,0x2bb,0x2c7,0x2c7,0x2c9,0x2cb,0x2d9,0x2d9,0x2ea,0x2eb,0x300,0x301,0x304,0x304,0x307,0x307,0x30c,0x30c,0x391,0x3a1,0x3a3,0x3a9,0x3b1,0x3c9,0x401,0x401,0x410,0x44f,0x451,0x451,0x1e3e,0x1e3f,0x1ea0,0x1ef9,0x2002,0x2003,0x2010,0x2016,0x2018,0x201a,0x201c,0x201e,0x2020,0x2022,0x2025,0x2027,0x2030,0x2030,0x2032,0x2033,0x2035,0x2035,0x2039,0x203c,0x2042,0x2042,0x2047,0x2049,0x2051,0x2051,0x2074,0x2074,0x20a9,0x20a9,0x20ab,0x20ac,0x20dd,0x20de,0x2100,0x2100,0x2103,0x2103,0x2105,0x2105,0x2109,0x210a,0x210f,0x210f,0x2113,0x2113,0x2116,0x2116,0x2121,0x2122,0x2126,0x2127,0x212b,0x212b,0x212e,0x212e,0x2135,0x2135,0x213b,0x213b,0x2160,0x216b,0x2170,0x217b,0x2190,0x2199,0x21b8,0x21b9,0x21c4,0x21c6,0x21cb,0x21cc,0x21d0,0x21d0,0x21d2,0x21d2,0x21d4,0x21d4,0x21e6,0x21e9,0x21f5,0x21f5,0x2200,0x2200,0x2202,0x2203,0x2205,0x220b,0x220f,0x220f,0x2211,0x2213,0x2215,0x2215,0x221a,0x221a,0x221d,0x2220,0x2223,0x2223,0x2225,0x222e,0x2234,0x2237,0x223d,0x223d,0x2243,0x2243,0x2245,0x2245,0x2248,0x2248,0x224c,0x224c,0x2252,0x2252,0x2260,0x2262,0x2264,0x2267,0x226a,0x226b,0x226e,0x226f,0x2272,0x2273,0x2276,0x2277,0x2282,0x2287,0x228a,0x228b,0x2295,0x2299,0x22a0,0x22a0,0x22a5,0x22a5,0x22bf,0x22bf,0x22da,0x22db,0x22ef,0x22ef,0x2305,0x2307,0x2312,0x2312,0x2318,0x2318,0x2329,0x232a,0x23b0,0x23b1,0x23be,0x23cc,0x23ce,0x23ce,0x23da,0x23db,0x2423,0x2423,0x2460,0x25ab,0x25b1,0x25b3,0x25b6,0x25b7,0x25bc,0x25bd,0x25c0,0x25c1,0x25c6,0x25cc,0x25ce,0x25d3,0x25e2,0x25e6,0x25ef,0x25ef,0x2600,0x2603,0x2605,0x2606,0x2609,0x2609,0x260e,0x260f,0x2616,0x2617,0x261c,0x261f,0x262f,0x262f,0x2640,0x2642,0x2660,0x266f,0x2672,0x267d,0x26a0,0x26a0,0x26bd,0x26be,0x2702,0x2702,0x2713,0x2713,0x271a,0x271a,0x273d,0x273d,0x273f,0x2740,0x2756,0x2756,0x2776,0x2793,0x27a1,0x27a1,0x2934,0x2935,0x29bf,0x29bf,0x29fa,0x29fb,0x2b05,0x2b07,0x2b1a,0x2b1a,0x2b95,0x2b95,0x2e3a,0x2e3b,0x2e80,0x2e99,0x2e9b,0x2ef3,0x2f00,0x2fd5,0x2ff0,0x2ffb,0x3000,0x303f,0x3041,0x3096,0x3099,0x30ff,0x3105,0x312f,0x3131,0x3163,0x3165,0x318e,0x3190,0x31bb,0x31c0,0x31e3,0x31f0,0x321e,0x3220,0x332b,0x332d,0x33ff,0x3435,0x3435,0x3440,0x3440,0x344a,0x344a,0x344c,0x344c,0x3464,0x3464,0x3473,0x3473,0x347a,0x347a,0x347d,0x347e,0x3493,0x3493,0x3496,0x3496,0x34a5,0x34a5,0x34af,0x34af,0x34bc,0x34bc,0x34c1,0x34c1,0x34c8,0x34c8,0x34df,0x34df,0x34e4,0x34e4,0x34e6,0x34e6,0x34fb,0x34fb,0x3506,0x3506,0x353e,0x353e,0x3551,0x3551,0x3553,0x3553,0x3559,0x3559,0x3561,0x3561,0x356d,0x356d,0x3570,0x3570,0x3572,0x3572,0x3577,0x3578,0x3584,0x3584,0x3597,0x3598,0x35a1,0x35a1,0x35a5,0x35a5,0x35ad,0x35ad,0x35bf,0x35bf,0x35c1,0x35c1,0x35c5,0x35c5,0x35c7,0x35c7,0x35ca,0x35ca,0x35ce,0x35ce,0x35d2,0x35d2,0x35d6,0x35d6,0x35db,0x35db,0x35dd,0x35dd,0x35f1,0x35f3,0x35fb,0x35fb,0x35fe,0x35fe,0x3609,0x3609,0x3618,0x3618,0x361a,0x361a,0x3623,0x3623,0x3625,0x3625,0x362d,0x362d,0x3635,0x3635,0x3639,0x3639,0x363e,0x363e,0x3647,0x3649,0x364e,0x364e,0x365f,0x365f,0x3661,0x3661,0x367a,0x367a,0x3681,0x3681,0x369a,0x369a,0x36a5,0x36a5,0x36aa,0x36aa,0x36ac,0x36ac,0x36b0,0x36b1,0x36b5,0x36b5,0x36b9,0x36b9,0x36bc,0x36bc,0x36c1,0x36c1,0x36c3,0x36c5,0x36c7,0x36c8,0x36d3,0x36d4,0x36d6,0x36d6,0x36dd,0x36dd,0x36e1,0x36e2,0x36e5,0x36e6,0x36f5,0x36f5,0x3701,0x3701,0x3703,0x3703,0x3708,0x3708,0x370a,0x370a,0x370d,0x370d,0x371c,0x371c,0x3722,0x3723,0x3725,0x3725,0x372c,0x372d,0x3730,0x3730,0x3732,0x3733,0x373a,0x373a,0x3740,0x3740,0x3743,0x3743,0x3762,0x3762,0x376f,0x376f,0x3797,0x3797,0x37a0,0x37a0,0x37b9,0x37b9,0x37be,0x37be,0x37d6,0x37d6,0x37f2,0x37f2,0x37f8,0x37f8,0x37fb,0x37fb,0x380f,0x380f,0x3819,0x3819,0x3820,0x3820,0x382d,0x382d,0x3836,0x3836,0x3838,0x3838,0x3863,0x3863,0x3875,0x3875,0x38a0,0x38a0,0x38c3,0x38c3,0x38cc,0x38cc,0x38d1,0x38d1,0x38d4,0x38d4,0x38fa,0x38fa,0x3908,0x3908,0x3914,0x3914,0x3927,0x3927,0x3932,0x3932,0x393f,0x393f,0x394d,0x394d,0x3963,0x3963,0x3978,0x3978,0x3980,0x3980,0x3989,0x398a,0x3992,0x3992,0x3999,0x3999,0x399b,0x399b,0x39a1,0x39a1,0x39a4,0x39a4,0x39b8,0x39b8,0x39dc,0x39dc,0x39e2,0x39e2,0x39e5,0x39e5,0x39ec,0x39ec,0x39f8,0x39f8,0x39fb,0x39fb,0x39fe,0x39fe,0x3a01,0x3a01,0x3a03,0x3a03,0x3a06,0x3a06,0x3a17,0x3a18,0x3a29,0x3a2a,0x3a34,0x3a34,0x3a4b,0x3a4b,0x3a52,0x3a52,0x3a57,0x3a57,0x3a5c,0x3a5c,0x3a5e,0x3a5e,0x3a66,0x3a67,0x3a97,0x3a97,0x3aab,0x3aab,0x3abd,0x3abd,0x3ade,0x3ade,0x3ae0,0x3ae0,0x3af0,0x3af0,0x3af2,0x3af2,0x3af5,0x3af5,0x3afb,0x3afb,0x3b0e,0x3b0e,0x3b19,0x3b19,0x3b22,0x3b22,0x3b2b,0x3b2b,0x3b39,0x3b39,0x3b42,0x3b42,0x3b58,0x3b58,0x3b60,0x3b60,0x3b71,0x3b72,0x3b7b,0x3b7c,0x3b80,0x3b80,0x3b95,0x3b96,0x3b99,0x3b99,0x3ba1,0x3ba1,0x3bbc,0x3bbc,0x3bbe,0x3bbe,0x3bc2,0x3bc2,0x3bc4,0x3bc4,0x3bd7,0x3bd7,0x3bdd,0x3bdd,0x3bec,0x3bec,0x3bf2,0x3bf4,0x3c0d,0x3c0d,0x3c11,0x3c11,0x3c15,0x3c15,0x3c18,0x3c18,0x3c54,0x3c54,0x3c8b,0x3c8b,0x3ccb,0x3ccb,0x3ccd,0x3ccd,0x3cd1,0x3cd1,0x3cd6,0x3cd6,0x3cdc,0x3cdc,0x3ceb,0x3ceb,0x3cef,0x3cef,0x3d12,0x3d13,0x3d1d,0x3d1d,0x3d32,0x3d32,0x3d3b,0x3d3b,0x3d46,0x3d46,0x3d4c,0x3d4c,0x3d4e,0x3d4e,0x3d51,0x3d51,0x3d5f,0x3d5f,0x3d62,0x3d62,0x3d69,0x3d6a,0x3d6f,0x3d6f,0x3d75,0x3d75,0x3d7d,0x3d7d,0x3d85,0x3d85,0x3d88,0x3d88,0x3d8a,0x3d8a,0x3d8f,0x3d8f,0x3d91,0x3d91,0x3da5,0x3da5,0x3dad,0x3dad,0x3db4,0x3db4,0x3dbf,0x3dbf,0x3dc6,0x3dc7,0x3dc9,0x3dc9,0x3dcc,0x3dcd,0x3dd3,0x3dd3,0x3ddb,0x3ddb,0x3de7,0x3de8,0x3deb,0x3deb,0x3df3,0x3df4,0x3df7,0x3df7,0x3dfc,0x3dfd,0x3e06,0x3e06,0x3e40,0x3e40,0x3e43,0x3e43,0x3e48,0x3e48,0x3e55,0x3e55,0x3e74,0x3e74,0x3ea8,0x3eaa,0x3ead,0x3ead,0x3eb1,0x3eb1,0x3eb8,0x3eb8,0x3ebf,0x3ebf,0x3ec2,0x3ec2,0x3ec7,0x3ec7,0x3eca,0x3eca,0x3ecc,0x3ecc,0x3ed0,0x3ed1,0x3ed6,0x3ed7,0x3eda,0x3edb,0x3ede,0x3ede,0x3ee1,0x3ee2,0x3ee7,0x3ee7,0x3ee9,0x3ee9,0x3eeb,0x3eec,0x3ef0,0x3ef0,0x3ef3,0x3ef4,0x3efa,0x3efa,0x3efc,0x3efc,0x3eff,0x3f00,0x3f04,0x3f04,0x3f06,0x3f07,0x3f0e,0x3f0e,0x3f53,0x3f53,0x3f58,0x3f59,0x3f63,0x3f63,0x3f7c,0x3f7c,0x3f93,0x3f93,0x3fc0,0x3fc0,0x3fc8,0x3fc8,0x3fd7,0x3fd7,0x3fdc,0x3fdc,0x3fe5,0x3fe5,0x3fed,0x3fed,0x3ff9,0x3ffa,0x4004,0x4004,0x4009,0x4009,0x401d,0x401d,0x4039,0x4039,0x4045,0x4045,0x4053,0x4053,0x4057,0x4057,0x4062,0x4062,0x4065,0x4065,0x406a,0x406a,0x406f,0x406f,0x4071,0x4071,0x40a8,0x40a8,0x40b4,0x40b4,0x40bb,0x40bb,0x40bf,0x40bf,0x40c8,0x40c8,0x40d8,0x40d8,0x40df,0x40df,0x40f8,0x40f8,0x40fa,0x40fa,0x4102,0x4104,0x4109,0x4109,0x410e,0x410e,0x4131,0x4132,0x4167,0x4167,0x416c,0x416c,0x416e,0x416e,0x417c,0x417c,0x417f,0x417f,0x4181,0x4181,0x4190,0x4190,0x41b2,0x41b2,0x41c4,0x41c4,0x41ca,0x41ca,0x41cf,0x41cf,0x41db,0x41db,0x41ed,0x41ed,0x41ef,0x41ef,0x41f9,0x41f9,0x4211,0x4211,0x4223,0x4223,0x4240,0x4240,0x4260,0x4260,0x426a,0x426a,0x4276,0x4276,0x427a,0x427a,0x428c,0x428c,0x4294,0x4294,0x42a2,0x42a2,0x42b5,0x42b5,0x42b9,0x42b9,0x42bc,0x42bc,0x42f4,0x42f4,0x42fb,0x42fc,0x430a,0x430a,0x432b,0x432b,0x436e,0x436e,0x4397,0x4397,0x439a,0x439a,0x43ba,0x43ba,0x43c1,0x43c1,0x43d9,0x43d9,0x43df,0x43df,0x43ed,0x43ed,0x43f0,0x43f0,0x43f2,0x43f2,0x4401,0x4402,0x4413,0x4413,0x4425,0x4425,0x442d,0x442d,0x447a,0x447a,0x448f,0x448f,0x4491,0x4491,0x449f,0x44a0,0x44a2,0x44a2,0x44b0,0x44b0,0x44b7,0x44b7,0x44bd,0x44bd,0x44c0,0x44c0,0x44c3,0x44c3,0x44c5,0x44c5,0x44ce,0x44ce,0x44dd,0x44df,0x44e1,0x44e1,0x44e4,0x44e4,0x44e9,0x44ec,0x44f4,0x44f4,0x4503,0x4504,0x4509,0x4509,0x450b,0x450b,0x4516,0x4516,0x451b,0x451b,0x451d,0x451d,0x4527,0x4527,0x452e,0x452e,0x4533,0x4533,0x4536,0x4536,0x453b,0x453b,0x453d,0x453d,0x453f,0x453f,0x4543,0x4543,0x4551,0x4552,0x4555,0x4555,0x4558,0x4558,0x455c,0x455c,0x4561,0x4562,0x456a,0x456a,0x456d,0x456d,0x4577,0x4578,0x4585,0x4585,0x45a6,0x45a6,0x45b3,0x45b3,0x45da,0x45da,0x45e9,0x45ea,0x4603,0x4603,0x4606,0x4606,0x460f,0x460f,0x4615,0x4615,0x4617,0x4617,0x465b,0x465b,0x467a,0x467a,0x4680,0x4680,0x46a1,0x46a1,0x46ae,0x46ae,0x46bb,0x46bb,0x46cf,0x46d0,0x46f5,0x46f5,0x46f7,0x46f7,0x4713,0x4713,0x4718,0x4718,0x4736,0x4736,0x4744,0x4744,0x474e,0x474f,0x477c,0x477c,0x4798,0x4798,0x47a6,0x47a6,0x47d5,0x47d5,0x47ed,0x47ed,0x47f4,0x47f4,0x4800,0x4800,0x480b,0x480b,0x4837,0x4837,0x485d,0x485d,0x4871,0x4871,0x489b,0x489b,0x48ad,0x48ae,0x48d0,0x48d0,0x48dd,0x48dd,0x48ed,0x48ed,0x48f3,0x48f3,0x48fa,0x48fa,0x4906,0x4906,0x4911,0x4911,0x491e,0x491e,0x4925,0x4925,0x492a,0x492a,0x492d,0x492d,0x492f,0x4930,0x4935,0x4935,0x493c,0x493c,0x493e,0x493e,0x4945,0x4945,0x4951,0x4951,0x4953,0x4953,0x4965,0x4965,0x496a,0x496a,0x4972,0x4972,0x4989,0x4989,0x49a1,0x49a1,0x49a7,0x49a7,0x49df,0x49df,0x49e5,0x49e5,0x49e7,0x49e7,0x4a0f,0x4a0f,0x4a1d,0x4a1d,0x4a24,0x4a24,0x4a35,0x4a35,0x4a96,0x4a96,0x4aa4,0x4aa4,0x4ab4,0x4ab4,0x4ab8,0x4ab8,0x4ad1,0x4ad1,0x4ae4,0x4ae4,0x4aff,0x4aff,0x4b10,0x4b10,0x4b19,0x4b19,0x4b20,0x4b20,0x4b2c,0x4b2c,0x4b37,0x4b37,0x4b6f,0x4b70,0x4b72,0x4b72,0x4b7b,0x4b7b,0x4b7e,0x4b7e,0x4b8e,0x4b8e,0x4b90,0x4b90,0x4b93,0x4b93,0x4b96,0x4b97,0x4b9d,0x4b9d,0x4bbd,0x4bbe,0x4bc0,0x4bc0,0x4c04,0x4c04,0x4c07,0x4c07,0x4c0e,0x4c0e,0x4c32,0x4c32,0x4c3b,0x4c3b,0x4c3e,0x4c3e,0x4c40,0x4c40,0x4c47,0x4c47,0x4c57,0x4c57,0x4c5b,0x4c5b,0x4c6d,0x4c6d,0x4c77,0x4c77,0x4c7b,0x4c7b,0x4c7d,0x4c7d,0x4c81,0x4c81,0x4c85,0x4c85,0x4ca4,0x4ca4,0x4cae,0x4cae,0x4cb0,0x4cb0,0x4cb7,0x4cb7,0x4ccd,0x4ccd,0x4ce1,0x4ce2,0x4ced,0x4ced,0x4d07,0x4d07,0x4d09,0x4d09,0x4d10,0x4d10,0x4d34,0x4d34,0x4d76,0x4d77,0x4d89,0x4d89,0x4d91,0x4d91,0x4d9c,0x4d9c,0x4e00,0x4e01,0x4e03,0x4e04,0x4e07,0x4e11,0x4e14,0x4e16,0x4e18,0x4e1a,0x4e1c,0x4e1c,0x4e1e,0x4e1f,0x4e21,0x4e22,0x4e24,0x4e24,0x4e26,0x4e26,0x4e28,0x4e28,0x4e2a,0x4e33,0x4e36,0x4e39,0x4e3b,0x4e3d,0x4e3f,0x4e3f,0x4e42,0x4e43,0x4e45,0x4e45,0x4e47,0x4e49,0x4e4b,0x4e4b,0x4e4d,0x4e4f,0x4e52,0x4e53,0x4e56,0x4e56,0x4e58,0x4e5f,0x4e69,0x4e6a,0x4e73,0x4e73,0x4e78,0x4e78,0x4e7e,0x4e89,0x4e8b,0x4e8e,0x4e91,0x4e95,0x4e98,0x4e9b,0x4e9e,0x4ea6,0x4ea8,0x4ea8,0x4eab,0x4eae,0x4eb3,0x4eb3,0x4eb6,0x4eb7,0x4eb9,0x4ebc,0x4ebf,0x4ec4,0x4ec6,0x4ecb,0x4ecd,0x4ece,0x4ed4,0x4eda,0x4edc,0x4edf,0x4ee1,0x4ee1,0x4ee3,0x4ee5,0x4ee8,0x4eeb,0x4eee,0x4eee,0x4ef0,0x4ef8,0x4efb,0x4efb,0x4efd,0x4efd,0x4eff,0x4f05,0x4f08,0x4f0b,0x4f0d,0x4f15,0x4f17,0x4f1a,0x4f1d,0x4f1d,0x4f22,0x4f22,0x4f28,0x4f29,0x4f2c,0x4f2d,0x4f2f,0x4f30,0x4f32,0x4f34,0x4f36,0x4f3f,0x4f41,0x4f43,0x4f45,0x4f49,0x4f4b,0x4f64,0x4f67,0x4f67,0x4f69,0x4f6c,0x4f6e,0x4f70,0x4f72,0x4f8b,0x4f8d,0x4f8d,0x4f8f,0x4f92,0x4f94,0x4f98,0x4f9a,0x4f9e,0x4fa2,0x4fa2,0x4fa8,0x4fa8,0x4fab,0x4fab,0x4fae,0x4fb0,0x4fb2,0x4fb7,0x4fb9,0x4fbb,0x4fbd,0x4fbd,0x4fbf,0x4fc5,0x4fc7,0x4fd1,0x4fd3,0x4fd4,0x4fd6,0x4fe1,0x4fe4,0x4fe5,0x4fec,0x4fec,0x4fee,0x4ffa,0x4ffd,0x4ffe,0x5000,0x5000,0x5003,0x5003,0x5005,0x5009,0x500b,0x500f,0x5011,0x501c,0x501e,0x5023,0x5025,0x5031,0x5033,0x5035,0x5037,0x5037,0x503b,0x503c,0x5040,0x5041,0x5043,0x5043,0x5045,0x504f,0x5051,0x5051,0x5053,0x5053,0x5055,0x5058,0x505a,0x5066,0x5068,0x5070,0x5072,0x5077,0x507a,0x507a,0x507d,0x507d,0x5080,0x5083,0x5085,0x5085,0x5087,0x5088,0x508b,0x508e,0x5090,0x5092,0x5094,0x5096,0x5098,0x509e,0x50a2,0x50a3,0x50a6,0x50a6,0x50ac,0x50b8,0x50ba,0x50bf,0x50c1,0x50c2,0x50c4,0x50cb,0x50cd,0x50d1,0x50d3,0x50d7,0x50d9,0x50db,0x50dd,0x50dd,0x50df,0x50e1,0x50e3,0x50ea,0x50ec,0x50f1,0x50f3,0x50f6,0x50f8,0x50f9,0x50fb,0x510e,0x5110,0x5115,0x5117,0x5118,0x511a,0x511a,0x511c,0x511c,0x511f,0x5122,0x5124,0x5126,0x5129,0x512b,0x512d,0x512e,0x5130,0x5135,0x5137,0x513d,0x513f,0x5141,0x5143,0x5149,0x514b,0x514d,0x5151,0x5152,0x5154,0x5157,0x5159,0x5163,0x5165,0x5165,0x5167,0x516e,0x5171,0x5171,0x5174,0x5179,0x517c,0x517c,0x5180,0x5180,0x5182,0x5182,0x5186,0x518a,0x518d,0x518d,0x518f,0x518f,0x5191,0x5198,0x519a,0x519a,0x519c,0x519c,0x519e,0x519e,0x51a0,0x51a0,0x51a2,0x51a2,0x51a4,0x51a5,0x51a7,0x51a8,0x51aa,0x51ac,0x51ae,0x51ae,0x51b0,0x51b9,0x51bc,0x51be,0x51c3,0x51d4,0x51d7,0x51d8,0x51db,0x51e2,0x51e4,0x51e4,0x51ed,0x51ed,0x51f0,0x51f1,0x51f3,0x51f6,0x51f8,0x51fa,0x51fc,0x51fe,0x5200,0x5203,0x5205,0x520c,0x520e,0x520e,0x5210,0x5213,0x5216,0x5217,0x521c,0x5221,0x5224,0x522a,0x522e,0x522e,0x5230,0x5238,0x523a,0x523c,0x5241,0x5241,0x5243,0x5244,0x5246,0x5247,0x5249,0x524f,0x5252,0x5252,0x5254,0x5257,0x5259,0x5262,0x5268,0x526f,0x5272,0x5275,0x5277,0x527d,0x527f,0x5284,0x5287,0x528d,0x528f,0x5291,0x5293,0x5294,0x5296,0x529b,0x529f,0x52a1,0x52a3,0x52a4,0x52a6,0x52a6,0x52a8,0x52ae,0x52b5,0x52b5,0x52b9,0x52b9,0x52bb,0x52bc,0x52be,0x52be,0x52c0,0x52c3,0x52c5,0x52c5,0x52c7,0x52c7,0x52c9,0x52c9,0x52cc,0x52cd,0x52d0,0x52d3,0x52d5,0x52d9,0x52db,0x52db,0x52dd,0x52e4,0x52e6,0x52e6,0x52e9,0x52e9,0x52eb,0x52eb,0x52ef,0x52f1,0x52f3,0x52f5,0x52f7,0x52fc,0x52fe,0x52ff,0x5301,0x5301,0x5305,0x5306,0x5308,0x530b,0x530d,0x5312,0x5315,0x5317,0x5319,0x531a,0x531c,0x531d,0x531f,0x5324,0x5327,0x5327,0x532a,0x532a,0x532c,0x532d,0x532f,0x5334,0x5337,0x5339,0x533b,0x5345,0x5347,0x534a,0x534c,0x534e,0x5351,0x5354,0x5357,0x5357,0x535a,0x535a,0x535c,0x5361,0x5363,0x5364,0x5366,0x5367,0x5369,0x5369,0x536c,0x5375,0x5377,0x5379,0x537b,0x537f,0x5382,0x5382,0x5384,0x5384,0x538a,0x538a,0x538e,0x538f,0x5392,0x5394,0x5396,0x539a,0x539c,0x53a0,0x53a2,0x53a2,0x53a4,0x53ae,0x53b0,0x53b0,0x53b2,0x53b2,0x53b4,0x53b4,0x53b6,0x53b6,0x53b9,0x53b9,0x53bb,0x53bb,0x53c1,0x53c3,0x53c5,0x53c5,0x53c8,0x53cd,0x53d0,0x53d2,0x53d4,0x53d4,0x53d6,0x53db,0x53df,0x53e6,0x53e8,0x53f3,0x53f5,0x53f8,0x53fb,0x53fc,0x53fe,0x53fe,0x5401,0x5401,0x5403,0x5404,0x5406,0x5414,0x5416,0x5416,0x5418,0x5421,0x5423,0x5439,0x543b,0x5443,0x5445,0x5448,0x544a,0x544f,0x5454,0x5454,0x5460,0x546d,0x546f,0x5478,0x547a,0x5482,0x5484,0x5488,0x548b,0x5498,0x549a,0x549a,0x549c,0x549c,0x549e,0x549e,0x54a0,0x54b4,0x54b6,0x54c9,0x54cb,0x54d0,0x54d6,0x54d6,0x54da,0x54da,0x54de,0x54de,0x54e0,0x54eb,0x54ed,0x54ef,0x54f1,0x54f3,0x54f7,0x54f8,0x54fa,0x54fd,0x54ff,0x54ff,0x5501,0x5514,0x5517,0x5518,0x551a,0x551a,0x551e,0x551e,0x5523,0x5523,0x5525,0x5528,0x552a,0x5539,0x553b,0x553c,0x553e,0x5541,0x5543,0x554b,0x554d,0x5553,0x5555,0x5557,0x555c,0x555f,0x5561,0x5566,0x5569,0x556b,0x5571,0x5573,0x5575,0x5577,0x5579,0x5579,0x557b,0x5584,0x5586,0x5595,0x5598,0x559a,0x559c,0x559d,0x559f,0x559f,0x55a1,0x55ae,0x55b0,0x55b5,0x55b9,0x55bc,0x55bf,0x55df,0x55e1,0x55ea,0x55ec,0x55ec,0x55ee,0x55f2,0x55f5,0x55f7,0x55f9,0x5602,0x5604,0x5606,0x5608,0x5609,0x560c,0x5617,0x561b,0x5623,0x5625,0x5625,0x5627,0x5627,0x5629,0x562a,0x562c,0x5630,0x5632,0x563b,0x563d,0x5643,0x5645,0x5646,0x5648,0x564a,0x564c,0x5650,0x5652,0x5654,0x5657,0x565a,0x565d,0x565e,0x5660,0x5666,0x5668,0x5674,0x5676,0x567c,0x567e,0x5687,0x5689,0x5690,0x5692,0x5693,0x5695,0x5695,0x5697,0x569a,0x569c,0x569f,0x56a1,0x56a1,0x56a4,0x56a8,0x56aa,0x56af,0x56b1,0x56b7,0x56b9,0x56b9,0x56bc,0x56c3,0x56c5,0x56c6,0x56c8,0x56cd,0x56d1,0x56d1,0x56d3,0x56d4,0x56d6,0x56d7,0x56da,0x56db,0x56dd,0x56e2,0x56e4,0x56e5,0x56e7,0x56e7,0x56ea,0x56eb,0x56ed,0x56f1,0x56f7,0x56f7,0x56f9,0x56fb,0x56fd,0x56fd,0x56ff,0x5704,0x5707,0x570d,0x5712,0x5716,0x5718,0x5718,0x571a,0x5720,0x5722,0x5723,0x5728,0x572a,0x572c,0x5730,0x5732,0x5734,0x573b,0x573b,0x573d,0x5743,0x5745,0x5747,0x5749,0x5752,0x5754,0x5754,0x5757,0x5757,0x575b,0x575b,0x575f,0x575f,0x5761,0x5762,0x5764,0x5764,0x5766,0x576b,0x576d,0x576d,0x576f,0x5777,0x577a,0x5780,0x5782,0x5783,0x5788,0x5788,0x578a,0x578d,0x578f,0x5790,0x5793,0x5795,0x5797,0x57a5,0x57a7,0x57a7,0x57aa,0x57aa,0x57ae,0x57ae,0x57b3,0x57b6,0x57b8,0x57bf,0x57c1,0x57c4,0x57c6,0x57c8,0x57cb,0x57cc,0x57ce,0x57d0,0x57d2,0x57d2,0x57d4,0x57d5,0x57d7,0x57d7,0x57dc,0x57e7,0x57e9,0x57e9,0x57ec,0x57fe,0x5800,0x580e,0x5810,0x5810,0x5812,0x5812,0x5814,0x5814,0x5818,0x5819,0x581b,0x581e,0x5820,0x582a,0x582c,0x583b,0x583d,0x583d,0x583f,0x5840,0x5844,0x5844,0x5847,0x584f,0x5851,0x5855,0x5857,0x585f,0x5862,0x5865,0x5868,0x5869,0x586b,0x586d,0x586f,0x586f,0x5871,0x5876,0x5879,0x5883,0x5885,0x588b,0x588e,0x5894,0x5896,0x5896,0x5898,0x589a,0x589c,0x58a1,0x58a3,0x58a3,0x58a5,0x58ac,0x58ae,0x58b1,0x58b3,0x58b3,0x58b5,0x58b6,0x58ba,0x58bf,0x58c1,0x58c2,0x58c5,0x58c9,0x58cb,0x58cb,0x58ce,0x58d6,0x58d8,0x58e0,0x58e2,0x58e4,0x58e7,0x58e9,0x58eb,0x58ec,0x58ef,0x58f0,0x58f2,0x58f4,0x58f9,0x58ff,0x5902,0x5907,0x590a,0x590a,0x590c,0x590f,0x5911,0x5912,0x5914,0x5917,0x5919,0x591a,0x591c,0x591d,0x591f,0x5920,0x5922,0x5922,0x5924,0x5925,0x5927,0x5927,0x5929,0x592f,0x5931,0x5932,0x5934,0x5934,0x5937,0x5938,0x593c,0x593c,0x593e,0x593e,0x5940,0x5940,0x5944,0x5945,0x5947,0x594a,0x594e,0x5951,0x5953,0x5955,0x5957,0x5958,0x595a,0x595a,0x595c,0x595c,0x5960,0x5962,0x5965,0x5965,0x5967,0x5967,0x5969,0x596e,0x5970,0x5979,0x597b,0x5985,0x5989,0x598a,0x598d,0x5990,0x5992,0x5994,0x5996,0x599a,0x599d,0x59a8,0x59ac,0x59ac,0x59ae,0x59c1,0x59c3,0x59d4,0x59d6,0x59d6,0x59d8,0x59de,0x59e0,0x59e1,0x59e3,0x59e6,0x59e8,0x5a03,0x5a09,0x5a0d,0x5a0f,0x5a0f,0x5a11,0x5a13,0x5a15,0x5a1c,0x5a1e,0x5a21,0x5a23,0x5a25,0x5a27,0x5a27,0x5a29,0x5a2e,0x5a33,0x5a33,0x5a35,0x5a39,0x5a3c,0x5a3e,0x5a40,0x5a4a,0x5a4c,0x5a4d,0x5a50,0x5a6e,0x5a70,0x5a71,0x5a77,0x5a7f,0x5a81,0x5a84,0x5a86,0x5a86,0x5a88,0x5a88,0x5a8a,0x5a8c,0x5a8e,0x5a97,0x5a99,0x5aa2,0x5aa4,0x5aa7,0x5aa9,0x5aac,0x5aae,0x5ac4,0x5ac6,0x5acf,0x5ad1,0x5ad1,0x5ad3,0x5ad3,0x5ad5,0x5ae6,0x5ae8,0x5aee,0x5af0,0x5af0,0x5af2,0x5afb,0x5afd,0x5aff,0x5b01,0x5b03,0x5b05,0x5b05,0x5b07,0x5b09,0x5b0b,0x5b0d,0x5b0f,0x5b11,0x5b13,0x5b17,0x5b19,0x5b1b,0x5b1d,0x5b21,0x5b23,0x5b28,0x5b2a,0x5b30,0x5b32,0x5b32,0x5b34,0x5b34,0x5b38,0x5b38,0x5b3c,0x5b41,0x5b43,0x5b48,0x5b4a,0x5b51,0x5b53,0x5b58,0x5b5a,0x5b5d,0x5b5f,0x5b5f,0x5b62,0x5b66,0x5b68,0x5b69,0x5b6b,0x5b6e,0x5b70,0x5b78,0x5b7a,0x5b7d,0x5b7f,0x5b85,0x5b87,0x5b89,0x5b8b,0x5b8c,0x5b8e,0x5b90,0x5b92,0x5b93,0x5b95,0x5b9f,0x5ba2,0x5ba8,0x5baa,0x5baa,0x5bac,0x5bae,0x5bb0,0x5bb0,0x5bb3,0x5bb9,0x5bbf,0x5bc7,0x5bca,0x5bce,0x5bd0,0x5bd9,0x5bdb,0x5bdb,0x5bde,0x5bec,0x5bee,0x5bf3,0x5bf5,0x5bf6,0x5bf8,0x5bf8,0x5bfa,0x5bfa,0x5bff,0x5bff,0x5c01,0x5c01,0x5c03,0x5c05,0x5c07,0x5c16,0x5c1a,0x5c1a,0x5c1c,0x5c1c,0x5c1e,0x5c20,0x5c22,0x5c25,0x5c28,0x5c28,0x5c2a,0x5c2a,0x5c2c,0x5c2c,0x5c30,0x5c31,0x5c33,0x5c33,0x5c37,0x5c3c,0x5c3e,0x5c41,0x5c44,0x5c51,0x5c53,0x5c56,0x5c58,0x5c59,0x5c5c,0x5c5e,0x5c60,0x5c60,0x5c62,0x5c65,0x5c67,0x5c6a,0x5c6c,0x5c6f,0x5c71,0x5c71,0x5c73,0x5c74,0x5c78,0x5c7c,0x5c7e,0x5c7e,0x5c83,0x5c83,0x5c85,0x5c86,0x5c88,0x5c8d,0x5c8f,0x5c95,0x5c99,0x5c9a,0x5c9c,0x5cb1,0x5cb3,0x5cb3,0x5cb5,0x5cb8,0x5cba,0x5cba,0x5cc1,0x5cc2,0x5cc6,0x5ccc,0x5cce,0x5cdb,0x5cde,0x5cdf,0x5ce5,0x5ce5,0x5ce8,0x5cea,0x5cec,0x5cf1,0x5cf4,0x5cf9,0x5cfb,0x5cfd,0x5cff,0x5d01,0x5d06,0x5d07,0x5d0b,0x5d12,0x5d14,0x5d1b,0x5d1d,0x5d20,0x5d22,0x5d29,0x5d2c,0x5d2c,0x5d2e,0x5d3a,0x5d3c,0x5d43,0x5d45,0x5d4c,0x5d4e,0x5d4e,0x5d50,0x5d52,0x5d55,0x5d57,0x5d59,0x5d59,0x5d5b,0x5d5b,0x5d5e,0x5d5e,0x5d62,0x5d63,0x5d65,0x5d65,0x5d67,0x5d69,0x5d6b,0x5d6c,0x5d6f,0x5d72,0x5d74,0x5d74,0x5d77,0x5d82,0x5d84,0x5d8b,0x5d8d,0x5d8e,0x5d92,0x5d95,0x5d97,0x5d97,0x5d99,0x5d9a,0x5d9c,0x5da2,0x5da4,0x5da4,0x5da7,0x5db2,0x5db4,0x5dba,0x5dbc,0x5dbd,0x5dc0,0x5dc3,0x5dc6,0x5dc7,0x5dc9,0x5dc9,0x5dcb,0x5dcb,0x5dcd,0x5dcd,0x5dcf,0x5dcf,0x5dd1,0x5dd2,0x5dd4,0x5dd8,0x5ddb,0x5ddb,0x5ddd,0x5de2,0x5de5,0x5de8,0x5deb,0x5deb,0x5dee,0x5dee,0x5df0,0x5df5,0x5df7,0x5df7,0x5df9,0x5df9,0x5dfd,0x5dff,0x5e02,0x5e04,0x5e06,0x5e06,0x5e09,0x5e0c,0x5e0e,0x5e0e,0x5e11,0x5e12,0x5e14,0x5e1b,0x5e1d,0x5e1d,0x5e1f,0x5e25,0x5e28,0x5e29,0x5e2b,0x5e2b,0x5e2d,0x5e2e,0x5e33,0x5e34,0x5e36,0x5e38,0x5e3d,0x5e3e,0x5e40,0x5e45,0x5e48,0x5e48,0x5e4a,0x5e4f,0x5e53,0x5e55,0x5e57,0x5e59,0x5e5b,0x5e63,0x5e66,0x5e70,0x5e72,0x5e76,0x5e78,0x5e80,0x5e82,0x5e84,0x5e86,0x5e8d,0x5e8f,0x5e8f,0x5e92,0x5e92,0x5e95,0x5e97,0x5e99,0x5e9c,0x5ea0,0x5ea0,0x5ea2,0x5ea8,0x5eaa,0x5eae,0x5eb0,0x5eb9,0x5ebd,0x5ebe,0x5ec1,0x5ec2,0x5ec4,0x5ece,0x5ed0,0x5ee3,0x5ee5,0x5ee9,0x5eec,0x5eec,0x5eee,0x5eef,0x5ef1,0x5ef4,0x5ef6,0x5efc,0x5efe,0x5eff,0x5f01,0x5f02,0x5f04,0x5f05,0x5f07,0x5f08,0x5f0a,0x5f0f,0x5f12,0x5f15,0x5f17,0x5f18,0x5f1a,0x5f1b,0x5f1d,0x5f1d,0x5f1f,0x5f1f,0x5f22,0x5f29,0x5f2d,0x5f2e,0x5f30,0x5f31,0x5f33,0x5f33,0x5f35,0x5f38,0x5f3a,0x5f3c,0x5f40,0x5f40,0x5f43,0x5f46,0x5f48,0x5f51,0x5f54,0x5f54,0x5f56,0x5f59,0x5f5c,0x5f5e,0x5f61,0x5f65,0x5f67,0x5f67,0x5f69,0x5f6d,0x5f6f,0x5f74,0x5f76,0x5f79,0x5f7b,0x5f83,0x5f85,0x5f8c,0x5f90,0x5f92,0x5f96,0x5f99,0x5f9b,0x5f9c,0x5f9e,0x5fa1,0x5fa4,0x5faf,0x5fb1,0x5fb2,0x5fb5,0x5fb7,0x5fb9,0x5fc5,0x5fc9,0x5fc9,0x5fcc,0x5fcd,0x5fcf,0x5fd2,0x5fd4,0x5fd9,0x5fdb,0x5fdb,0x5fdd,0x5fe1,0x5fe3,0x5fe5,0x5fe8,0x5fe8,0x5fea,0x5feb,0x5fed,0x5fef,0x5ff1,0x5ff1,0x5ff3,0x5ff5,0x5ff7,0x5ff8,0x5ffa,0x5ffb,0x5ffd,0x5ffd,0x5fff,0x6000,0x6009,0x6017,0x6019,0x601e,0x6020,0x602f,0x6031,0x6035,0x6037,0x6037,0x6039,0x6039,0x603b,0x603b,0x6040,0x6047,0x6049,0x604d,0x6050,0x6050,0x6052,0x6055,0x6058,0x605b,0x605d,0x605f,0x6062,0x6070,0x6072,0x6072,0x6075,0x6075,0x6077,0x6077,0x607e,0x6081,0x6083,0x608a,0x608c,0x608e,0x6090,0x6090,0x6092,0x6092,0x6094,0x6097,0x609a,0x60a0,0x60a2,0x60a4,0x60a6,0x60a8,0x60b0,0x60c1,0x60c3,0x60cf,0x60d1,0x60d1,0x60d3,0x60d5,0x60d7,0x60e4,0x60e6,0x60e9,0x60f0,0x6101,0x6103,0x6110,0x6112,0x6116,0x6118,0x611d,0x611f,0x6120,0x6122,0x6123,0x6127,0x6129,0x612b,0x612c,0x612e,0x6130,0x6132,0x6132,0x6134,0x6134,0x6136,0x6137,0x613b,0x613b,0x613d,0x6142,0x6144,0x6150,0x6152,0x6156,0x6158,0x6168,0x616a,0x616c,0x616e,0x6177,0x6179,0x617a,0x617c,0x617e,0x6180,0x6183,0x6187,0x6187,0x6189,0x618e,0x6190,0x6196,0x6198,0x619d,0x619f,0x619f,0x61a1,0x61a2,0x61a4,0x61a4,0x61a7,0x61ba,0x61bc,0x61bc,0x61be,0x61c3,0x61c5,0x61cd,0x61cf,0x61d0,0x61d3,0x61d3,0x61d6,0x61d6,0x61d8,0x61d8,0x61da,0x61da,0x61de,0x61e0,0x61e2,0x61eb,0x61ed,0x61ee,0x61f0,0x61f2,0x61f5,0x6201,0x6203,0x6204,0x6207,0x620a,0x620c,0x620e,0x6210,0x6212,0x6214,0x6216,0x6219,0x621b,0x621f,0x6225,0x6227,0x6227,0x6229,0x622e,0x6230,0x6230,0x6232,0x6234,0x6236,0x6237,0x6239,0x623a,0x623d,0x6243,0x6246,0x624e,0x6250,0x6254,0x6258,0x625c,0x625e,0x625e,0x6260,0x6266,0x6268,0x6268,0x626d,0x6274,0x6276,0x6277,0x6279,0x628a,0x628c,0x628c,0x628e,0x6298,0x629d,0x629d,0x62a4,0x62a4,0x62a6,0x62a6,0x62a8,0x62b1,0x62b3,0x62b6,0x62b8,0x62b9,0x62bb,0x62bf,0x62c1,0x62dc,0x62df,0x62df,0x62e5,0x62e5,0x62eb,0x6303,0x6307,0x6309,0x630b,0x6311,0x6313,0x6316,0x6318,0x6318,0x6328,0x632f,0x6331,0x633e,0x6340,0x6351,0x6354,0x635a,0x635d,0x635d,0x6364,0x6365,0x6367,0x6369,0x636b,0x6372,0x6375,0x637d,0x637f,0x6385,0x6387,0x6392,0x6394,0x6394,0x6396,0x6399,0x639b,0x63a5,0x63a7,0x63b1,0x63b9,0x63b9,0x63bd,0x63be,0x63c0,0x63d3,0x63d5,0x63eb,0x63ed,0x63f6,0x63f8,0x63f9,0x63fb,0x63fc,0x63fe,0x63fe,0x6406,0x6407,0x6409,0x6410,0x6412,0x6418,0x641a,0x641c,0x641e,0x6428,0x642a,0x6430,0x6432,0x643b,0x643d,0x6441,0x6443,0x6443,0x644b,0x644b,0x644d,0x644e,0x6450,0x6454,0x6458,0x6461,0x6465,0x6469,0x646b,0x647d,0x647f,0x647f,0x6482,0x6482,0x6485,0x6485,0x6487,0x648d,0x648f,0x6493,0x6495,0x649a,0x649c,0x64a0,0x64a2,0x64a6,0x64a9,0x64a9,0x64ab,0x64b4,0x64b6,0x64b6,0x64bb,0x64c5,0x64c7,0x64c7,0x64c9,0x64cb,0x64cd,0x64d0,0x64d2,0x64d4,0x64d6,0x64db,0x64dd,0x64dd,0x64e0,0x64ed,0x64ef,0x64f4,0x64f7,0x64f8,0x64fa,0x6501,0x6503,0x6504,0x6506,0x6507,0x6509,0x650a,0x650c,0x6511,0x6513,0x6519,0x651b,0x6526,0x6529,0x6530,0x6532,0x6539,0x653b,0x653b,0x653d,0x653f,0x6541,0x6541,0x6543,0x6543,0x6545,0x6546,0x6548,0x654a,0x654d,0x654d,0x654f,0x654f,0x6551,0x6551,0x6553,0x655a,0x655c,0x655f,0x6562,0x6568,0x656a,0x656d,0x656f,0x656f,0x6572,0x657c,0x657f,0x6589,0x658b,0x658c,0x6590,0x6592,0x6594,0x6597,0x6599,0x6599,0x659b,0x65a2,0x65a4,0x65a5,0x65a7,0x65a8,0x65aa,0x65ac,0x65ae,0x65b0,0x65b2,0x65b3,0x65b5,0x65b9,0x65bb,0x65bf,0x65c1,0x65c6,0x65cb,0x65d4,0x65d6,0x65d7,0x65da,0x65db,0x65dd,0x65e3,0x65e5,0x65e6,0x65e8,0x65e9,0x65ec,0x65f5,0x65fa,0x65fd,0x65ff,0x6600,0x6602,0x6615,0x6618,0x6618,0x661c,0x6628,0x662b,0x662b,0x662d,0x6636,0x6639,0x663a,0x6641,0x6645,0x6647,0x664d,0x664f,0x664f,0x6651,0x6653,0x6657,0x6657,0x6659,0x6668,0x666a,0x666c,0x666e,0x6674,0x6676,0x667e,0x6680,0x6680,0x6684,0x668e,0x6690,0x6692,0x6694,0x669a,0x669d,0x669d,0x669f,0x66a2,0x66a4,0x66a4,0x66a8,0x66ab,0x66ad,0x66bb,0x66bd,0x66c0,0x66c4,0x66c4,0x66c6,0x66cf,0x66d2,0x66d2,0x66d6,0x66d6,0x66d8,0x66de,0x66e0,0x66e0,0x66e3,0x66e4,0x66e6,0x66e9,0x66eb,0x66ee,0x66f0,0x66f4,0x66f6,0x66f9,0x66fc,0x66fc,0x66fe,0x6705,0x6708,0x6710,0x6712,0x6719,0x671b,0x671b,0x671d,0x6723,0x6725,0x6728,0x672a,0x672e,0x6731,0x6731,0x6733,0x6736,0x6738,0x673f,0x6744,0x6749,0x674b,0x6751,0x6753,0x6753,0x6755,0x6757,0x6759,0x675a,0x675c,0x6762,0x6767,0x6767,0x676a,0x677f,0x6781,0x6787,0x6789,0x6789,0x678b,0x6795,0x6797,0x679a,0x679c,0x679d,0x679f,0x67a0,0x67a4,0x67a4,0x67ac,0x67ac,0x67ae,0x67bb,0x67bf,0x67c6,0x67c8,0x67d4,0x67d6,0x67df,0x67e2,0x67e7,0x67e9,0x67fa,0x67fc,0x67fc,0x67fe,0x6804,0x680d,0x680d,0x6810,0x6810,0x6812,0x6814,0x6816,0x6818,0x681a,0x6822,0x6825,0x6826,0x6828,0x682b,0x682d,0x682f,0x6831,0x683e,0x6840,0x6851,0x6853,0x6856,0x685d,0x685d,0x6865,0x6865,0x686b,0x686b,0x686d,0x686f,0x6871,0x6872,0x6874,0x6879,0x687b,0x688c,0x688f,0x6894,0x6896,0x6898,0x689b,0x689d,0x689f,0x68a4,0x68a6,0x68b6,0x68b9,0x68b9,0x68bd,0x68bd,0x68c1,0x68c1,0x68c3,0x68ce,0x68d0,0x68d8,0x68da,0x68da,0x68dc,0x68e1,0x68e3,0x68e4,0x68e6,0x68ec,0x68ee,0x68fd,0x6900,0x6915,0x6917,0x691b,0x6925,0x6925,0x692a,0x692a,0x692c,0x692c,0x692f,0x6930,0x6932,0x6939,0x693b,0x6946,0x6948,0x694c,0x694e,0x694f,0x6951,0x697b,0x6980,0x6980,0x6982,0x6983,0x6985,0x6986,0x698a,0x698a,0x698d,0x698e,0x6990,0x6991,0x6993,0x699c,0x699e,0x69b7,0x69b9,0x69b9,0x69bb,0x69c4,0x69c6,0x69c6,0x69c9,0x69d1,0x69d3,0x69d6,0x69d9,0x69d9,0x69e1,0x69e2,0x69e4,0x69e9,0x69eb,0x69ee,0x69f1,0x69f4,0x69f6,0x6a0d,0x6a0f,0x6a0f,0x6a11,0x6a11,0x6a13,0x6a21,0x6a23,0x6a23,0x6a25,0x6a29,0x6a2b,0x6a2d,0x6a32,0x6a35,0x6a38,0x6a41,0x6a43,0x6a49,0x6a4b,0x6a5b,0x6a5d,0x6a6b,0x6a6d,0x6a6d,0x6a6f,0x6a6f,0x6a71,0x6a71,0x6a74,0x6a74,0x6a76,0x6a76,0x6a7a,0x6a7a,0x6a7e,0x6a85,0x6a87,0x6a87,0x6a89,0x6a8a,0x6a8c,0x6a97,0x6a99,0x6aa8,0x6aab,0x6aaf,0x6ab1,0x6abb,0x6abd,0x6abe,0x6ac2,0x6ac3,0x6ac5,0x6acd,0x6acf,0x6ad1,0x6ad3,0x6ad4,0x6ad8,0x6ae1,0x6ae5,0x6ae5,0x6ae7,0x6ae8,0x6aea,0x6aec,0x6aee,0x6af1,0x6af3,0x6af3,0x6af6,0x6af6,0x6af8,0x6afc,0x6b00,0x6b00,0x6b02,0x6b05,0x6b08,0x6b0b,0x6b0f,0x6b13,0x6b16,0x6b1a,0x6b1d,0x6b1e,0x6b20,0x6b21,0x6b23,0x6b23,0x6b25,0x6b25,0x6b28,0x6b28,0x6b2c,0x6b2d,0x6b2f,0x6b2f,0x6b31,0x6b3f,0x6b41,0x6b43,0x6b45,0x6b4e,0x6b50,0x6b52,0x6b54,0x6b57,0x6b59,0x6b59,0x6b5b,0x6b5c,0x6b5e,0x6b67,0x6b6a,0x6b6a,0x6b6d,0x6b6d,0x6b6f,0x6b6f,0x6b72,0x6b72,0x6b74,0x6b74,0x6b76,0x6b7b,0x6b7e,0x6b84,0x6b86,0x6b86,0x6b88,0x6b8a,0x6b8c,0x6b8f,0x6b91,0x6b91,0x6b94,0x6b99,0x6b9b,0x6b9b,0x6b9e,0x6ba0,0x6ba2,0x6ba7,0x6baa,0x6bab,0x6bad,0x6bb0,0x6bb2,0x6bb3,0x6bb5,0x6bb7,0x6bba,0x6bba,0x6bbc,0x6bbd,0x6bbf,0x6bc1,0x6bc3,0x6bcd,0x6bcf,0x6bd0,0x6bd2,0x6bd4,0x6bd6,0x6bd8,0x6bda,0x6bdc,0x6bde,0x6bde,0x6be0,0x6be4,0x6be6,0x6be8,0x6bea,0x6bec,0x6bef,0x6bf0,0x6bf2,0x6bf3,0x6bf7,0x6c06,0x6c08,0x6c09,0x6c0b,0x6c0d,0x6c0f,0x6c11,0x6c13,0x6c16,0x6c18,0x6c1d,0x6c1f,0x6c21,0x6c23,0x6c28,0x6c2a,0x6c2c,0x6c2e,0x6c3b,0x6c3d,0x6c43,0x6c46,0x6c46,0x6c49,0x6c50,0x6c52,0x6c52,0x6c54,0x6c55,0x6c57,0x6c61,0x6c65,0x6c6b,0x6c6d,0x6c76,0x6c78,0x6c7b,0x6c7d,0x6c90,0x6c92,0x6c96,0x6c98,0x6c9d,0x6c9f,0x6c9f,0x6ca2,0x6ca2,0x6caa,0x6cb4,0x6cb6,0x6cc7,0x6cc9,0x6cd7,0x6cd9,0x6ce3,0x6ce5,0x6ce5,0x6ce7,0x6cf3,0x6cf5,0x6cf5,0x6cf9,0x6cf9,0x6cff,0x6d12,0x6d16,0x6d1b,0x6d1d,0x6d20,0x6d22,0x6d22,0x6d24,0x6d42,0x6d4e,0x6d4e,0x6d57,0x6d5c,0x6d5e,0x6d6a,0x6d6c,0x6d72,0x6d74,0x6d98,0x6d9a,0x6d9a,0x6da4,0x6da5,0x6daa,0x6dac,0x6dae,0x6daf,0x6db1,0x6db5,0x6db7,0x6dc0,0x6dc2,0x6dc2,0x6dc4,0x6dcd,0x6dcf,0x6de6,0x6de8,0x6df7,0x6df9,0x6dfe,0x6e00,0x6e00,0x6e02,0x6e05,0x6e0a,0x6e0a,0x6e0f,0x6e0f,0x6e15,0x6e15,0x6e18,0x6e1d,0x6e1f,0x6e36,0x6e38,0x6e41,0x6e43,0x6e47,0x6e49,0x6e4b,0x6e4d,0x6e69,0x6e6b,0x6e6b,0x6e6e,0x6e6f,0x6e71,0x6e74,0x6e76,0x6e79,0x6e7c,0x6e7c,0x6e86,0x6e86,0x6e88,0x6e89,0x6e8b,0x6e8b,0x6e8d,0x6e90,0x6e92,0x6e94,0x6e96,0x6ea7,0x6eaa,0x6eab,0x6eae,0x6ed6,0x6ed8,0x6edd,0x6ee2,0x6ee2,0x6ee8,0x6ee9,0x6eeb,0x6eef,0x6ef1,0x6ef2,0x6ef4,0x6f0f,0x6f12,0x6f1a,0x6f1c,0x6f1c,0x6f1e,0x6f27,0x6f29,0x6f41,0x6f43,0x6f44,0x6f4e,0x6f58,0x6f5a,0x6f64,0x6f66,0x6f67,0x6f69,0x6f70,0x6f72,0x6f74,0x6f76,0x6f82,0x6f84,0x6f8e,0x6f90,0x6f90,0x6f92,0x6f97,0x6f9d,0x6fb6,0x6fb8,0x6fc4,0x6fc6,0x6fcf,0x6fd3,0x6fd5,0x6fd8,0x6fe4,0x6fe6,0x6fe9,0x6feb,0x6ff2,0x6ff4,0x6ff4,0x6ff6,0x6ff8,0x6ffa,0x6ffc,0x6ffe,0x7001,0x7003,0x7007,0x7009,0x700f,0x7011,0x7011,0x7014,0x7024,0x7026,0x702c,0x702f,0x7035,0x7037,0x703c,0x703e,0x7046,0x7048,0x704d,0x7050,0x7052,0x7054,0x7058,0x705a,0x706c,0x706e,0x7071,0x7074,0x707a,0x707c,0x707f,0x7081,0x7086,0x7089,0x708b,0x708e,0x708f,0x7091,0x7096,0x7098,0x709a,0x709f,0x70a1,0x70a3,0x70a7,0x70a9,0x70a9,0x70ab,0x70b1,0x70b3,0x70b5,0x70b7,0x70be,0x70c0,0x70c0,0x70c4,0x70c8,0x70ca,0x70da,0x70dc,0x70e2,0x70e4,0x70e4,0x70ef,0x70f1,0x70f3,0x7100,0x7102,0x7102,0x7104,0x7106,0x7109,0x710e,0x7110,0x7110,0x7113,0x7113,0x7117,0x7117,0x7119,0x7123,0x7125,0x7126,0x7128,0x7129,0x712b,0x712c,0x712e,0x7136,0x713a,0x713b,0x713e,0x713e,0x7140,0x7147,0x7149,0x7154,0x7156,0x715a,0x715c,0x716c,0x716e,0x716e,0x7170,0x7178,0x717a,0x717e,0x7180,0x7182,0x7184,0x718a,0x718c,0x718c,0x718e,0x7192,0x7194,0x7194,0x7196,0x71a5,0x71a7,0x71aa,0x71ac,0x71ad,0x71af,0x71b5,0x71b7,0x71ba,0x71bc,0x71cb,0x71ce,0x71d2,0x71d4,0x71d6,0x71d8,0x71dd,0x71df,0x71e2,0x71e4,0x71e8,0x71eb,0x71ee,0x71f0,0x71f2,0x71f4,0x71f6,0x71f8,0x71f9,0x71fb,0x7203,0x7205,0x7207,0x7209,0x720a,0x720c,0x7210,0x7213,0x7217,0x7219,0x721b,0x721d,0x721f,0x7222,0x722e,0x7230,0x7230,0x7235,0x7236,0x7238,0x723b,0x723d,0x7242,0x7244,0x7244,0x7246,0x724c,0x724f,0x7250,0x7252,0x7253,0x7255,0x7263,0x7266,0x7267,0x7269,0x726a,0x726c,0x726c,0x726e,0x7270,0x7272,0x7274,0x7276,0x7279,0x727b,0x7282,0x7284,0x7289,0x728b,0x7298,0x729a,0x729b,0x729d,0x729f,0x72a1,0x72aa,0x72ac,0x72b0,0x72b2,0x72b2,0x72b4,0x72b5,0x72ba,0x72ba,0x72bd,0x72bd,0x72bf,0x72c6,0x72c9,0x72ce,0x72d0,0x72d2,0x72d4,0x72d4,0x72d6,0x72da,0x72dc,0x72dc,0x72df,0x72e4,0x72e6,0x72e6,0x72e8,0x72eb,0x72f3,0x72f4,0x72f6,0x7302,0x7304,0x7304,0x7307,0x7308,0x730a,0x730c,0x730f,0x7313,0x7316,0x7319,0x731b,0x731e,0x7322,0x7323,0x7325,0x732e,0x7330,0x733c,0x733e,0x7345,0x7348,0x734a,0x734c,0x7352,0x7357,0x735b,0x735d,0x7362,0x7365,0x736c,0x736e,0x7378,0x737a,0x738c,0x738e,0x738f,0x7392,0x7398,0x739c,0x73a2,0x73a4,0x73ad,0x73b2,0x73bc,0x73be,0x73c0,0x73c2,0x73d0,0x73d2,0x73de,0x73e0,0x73eb,0x73ed,0x73ef,0x73f3,0x740d,0x7411,0x7412,0x7414,0x7417,0x7419,0x7426,0x7428,0x743a,0x743c,0x743c,0x743f,0x7457,0x7459,0x7465,0x7467,0x7476,0x7479,0x747a,0x747c,0x7483,0x7485,0x748d,0x7490,0x7490,0x7492,0x7492,0x7494,0x7495,0x7497,0x74a1,0x74a3,0x74ab,0x74ad,0x74ad,0x74af,0x74b2,0x74b4,0x74bb,0x74bd,0x74c3,0x74c5,0x74c6,0x74c8,0x74c8,0x74ca,0x74cc,0x74cf,0x74d0,0x74d3,0x74e9,0x74ec,0x74ec,0x74ee,0x74ee,0x74f0,0x74f2,0x74f4,0x74f8,0x74fb,0x74fb,0x74fd,0x7500,0x7502,0x7505,0x7507,0x7508,0x750b,0x751a,0x751c,0x751f,0x7521,0x7522,0x7525,0x7526,0x7528,0x7535,0x7537,0x753b,0x753d,0x7540,0x7542,0x7542,0x7546,0x7548,0x754a,0x754f,0x7551,0x7551,0x7553,0x7555,0x7559,0x755d,0x755f,0x7560,0x7562,0x7567,0x756a,0x7570,0x7572,0x7572,0x7576,0x757a,0x757d,0x7580,0x7583,0x7584,0x7586,0x7587,0x758a,0x7592,0x7594,0x7595,0x7598,0x759a,0x759d,0x759e,0x75a2,0x75a5,0x75a7,0x75a7,0x75aa,0x75ab,0x75b0,0x75b6,0x75b8,0x75c5,0x75c7,0x75c8,0x75ca,0x75d2,0x75d4,0x75d5,0x75d7,0x75e4,0x75e6,0x75e7,0x75ed,0x75ed,0x75ef,0x7603,0x7607,0x760d,0x760f,0x7611,0x7613,0x7616,0x7619,0x7629,0x762c,0x762d,0x762f,0x7635,0x7638,0x7638,0x763a,0x763d,0x7640,0x7640,0x7642,0x7643,0x7646,0x7649,0x764c,0x7654,0x7656,0x765a,0x765c,0x765c,0x765f,0x7662,0x7664,0x7667,0x7669,0x766a,0x766c,0x7676,0x7678,0x767f,0x7681,0x7682,0x7684,0x7684,0x7686,0x768b,0x768e,0x7690,0x7692,0x7693,0x7695,0x7696,0x7699,0x769e,0x76a1,0x76a1,0x76a4,0x76a6,0x76aa,0x76ab,0x76ad,0x76b0,0x76b4,0x76b5,0x76b7,0x76b8,0x76ba,0x76bb,0x76bd,0x76bf,0x76c2,0x76c6,0x76c8,0x76ca,0x76cc,0x76ce,0x76d2,0x76d4,0x76d6,0x76d6,0x76d9,0x76df,0x76e1,0x76e1,0x76e3,0x76e7,0x76e9,0x76ea,0x76ec,0x76f5,0x76f7,0x76fc,0x76fe,0x76fe,0x7701,0x7701,0x7703,0x7705,0x7707,0x770c,0x770e,0x7713,0x7715,0x7715,0x7719,0x771b,0x771d,0x7720,0x7722,0x7729,0x772b,0x772b,0x772d,0x772d,0x772f,0x772f,0x7731,0x773e,0x7740,0x7740,0x7743,0x7747,0x774a,0x774f,0x7752,0x7752,0x7754,0x7756,0x7758,0x775c,0x775e,0x7763,0x7765,0x776f,0x7772,0x7772,0x7777,0x7785,0x7787,0x7789,0x778b,0x778f,0x7791,0x7791,0x7793,0x7793,0x7795,0x7795,0x7797,0x77a3,0x77a5,0x77a5,0x77a7,0x77a8,0x77aa,0x77ad,0x77af,0x77b7,0x77b9,0x77bf,0x77c2,0x77c5,0x77c7,0x77c7,0x77c9,0x77d0,0x77d3,0x77d5,0x77d7,0x77de,0x77e0,0x77e0,0x77e2,0x77e3,0x77e5,0x77e9,0x77ec,0x77f4,0x77f7,0x77fe,0x7802,0x7803,0x7805,0x7806,0x7808,0x7809,0x780c,0x7814,0x7818,0x7818,0x781c,0x7823,0x7825,0x7835,0x7837,0x7839,0x783c,0x783d,0x7842,0x7845,0x7847,0x784e,0x7850,0x7854,0x785c,0x785e,0x7860,0x7860,0x7862,0x7862,0x7864,0x7866,0x7868,0x7871,0x7879,0x787c,0x787e,0x7881,0x7883,0x7889,0x788c,0x788f,0x7891,0x7891,0x7893,0x789a,0x789e,0x78a5,0x78a7,0x78ad,0x78af,0x78b4,0x78b6,0x78b6,0x78b8,0x78bc,0x78be,0x78be,0x78c1,0x78c1,0x78c3,0x78c5,0x78c7,0x78d5,0x78d7,0x78d8,0x78da,0x78db,0x78dd,0x78e5,0x78e7,0x78ea,0x78ec,0x78f5,0x78f7,0x78f7,0x78f9,0x78ff,0x7901,0x7902,0x7904,0x7906,0x7909,0x7909,0x790c,0x790c,0x790e,0x790e,0x7910,0x7914,0x7917,0x7917,0x7919,0x7919,0x791b,0x791e,0x7921,0x7921,0x7923,0x792f,0x7931,0x7936,0x7938,0x7942,0x7944,0x794c,0x794f,0x7965,0x7967,0x796b,0x796d,0x796d,0x7970,0x7974,0x7979,0x797a,0x797c,0x7983,0x7986,0x7988,0x798a,0x798b,0x798d,0x799d,0x799f,0x79a2,0x79a4,0x79ae,0x79b0,0x79b4,0x79b6,0x79bb,0x79bd,0x79c1,0x79c4,0x79c6,0x79c8,0x79d2,0x79d4,0x79d6,0x79d8,0x79d8,0x79dc,0x79e0,0x79e2,0x79e4,0x79e6,0x79e7,0x79e9,0x79ee,0x79f1,0x79f1,0x79f4,0x79f4,0x79f6,0x79f8,0x79fa,0x79fb,0x7a00,0x7a00,0x7a02,0x7a06,0x7a08,0x7a08,0x7a0a,0x7a0e,0x7a10,0x7a15,0x7a17,0x7a1c,0x7a1e,0x7a20,0x7a22,0x7a22,0x7a26,0x7a26,0x7a28,0x7a28,0x7a2a,0x7a32,0x7a37,0x7a37,0x7a39,0x7a40,0x7a43,0x7a4e,0x7a54,0x7a54,0x7a56,0x7a58,0x7a5a,0x7a5c,0x7a5f,0x7a62,0x7a65,0x7a65,0x7a67,0x7a69,0x7a6b,0x7a6e,0x7a70,0x7a72,0x7a74,0x7a76,0x7a78,0x7a7b,0x7a7d,0x7a81,0x7a83,0x7a8c,0x7a8f,0x7a99,0x7a9e,0x7aa0,0x7aa2,0x7aa3,0x7aa8,0x7aac,0x7aae,0x7ab8,0x7aba,0x7abc,0x7abe,0x7ac5,0x7ac7,0x7acb,0x7acf,0x7acf,0x7ad1,0x7ad1,0x7ad3,0x7ad3,0x7ad8,0x7add,0x7adf,0x7ae0,0x7ae2,0x7ae7,0x7ae9,0x7aeb,0x7aed,0x7aef,0x7af6,0x7af7,0x7af9,0x7b01,0x7b04,0x7b06,0x7b08,0x7b0c,0x7b0e,0x7b14,0x7b18,0x7b1b,0x7b1d,0x7b20,0x7b22,0x7b35,0x7b38,0x7b39,0x7b3b,0x7b3b,0x7b40,0x7b40,0x7b42,0x7b52,0x7b54,0x7b56,0x7b58,0x7b58,0x7b60,0x7b67,0x7b69,0x7b69,0x7b6c,0x7b78,0x7b7b,0x7b7b,0x7b82,0x7b82,0x7b84,0x7b85,0x7b87,0x7b88,0x7b8a,0x7b92,0x7b94,0x7b9d,0x7ba0,0x7ba4,0x7bac,0x7baf,0x7bb1,0x7bb2,0x7bb4,0x7bb5,0x7bb7,0x7bb9,0x7bbe,0x7bbe,0x7bc0,0x7bc1,0x7bc4,0x7bc7,0x7bc9,0x7bcc,0x7bce,0x7bd0,0x7bd4,0x7bd5,0x7bd8,0x7bec,0x7bf0,0x7bf4,0x7bf7,0x7c03,0x7c05,0x7c07,0x7c09,0x7c12,0x7c15,0x7c15,0x7c19,0x7c19,0x7c1b,0x7c23,0x7c25,0x7c2d,0x7c30,0x7c30,0x7c33,0x7c33,0x7c35,0x7c35,0x7c37,0x7c39,0x7c3b,0x7c40,0x7c42,0x7c45,0x7c47,0x7c4a,0x7c4c,0x7c4d,0x7c50,0x7c51,0x7c53,0x7c54,0x7c56,0x7c57,0x7c59,0x7c5d,0x7c5f,0x7c60,0x7c63,0x7c67,0x7c69,0x7c70,0x7c72,0x7c75,0x7c78,0x7c81,0x7c83,0x7c86,0x7c88,0x7c8a,0x7c8c,0x7c8e,0x7c91,0x7c92,0x7c94,0x7c98,0x7c9c,0x7c9c,0x7c9e,0x7c9f,0x7ca1,0x7ca3,0x7ca5,0x7ca8,0x7cac,0x7cac,0x7cae,0x7caf,0x7cb1,0x7cb5,0x7cb8,0x7cbf,0x7cc2,0x7cc3,0x7cc5,0x7cc5,0x7cc7,0x7cce,0x7cd0,0x7cd7,0x7cd9,0x7cda,0x7cdc,0x7ce0,0x7ce2,0x7ce2,0x7ce6,0x7ce8,0x7cea,0x7cea,0x7cec,0x7cf9,0x7cfb,0x7cfe,0x7d00,0x7d22,0x7d25,0x7d25,0x7d28,0x7d29,0x7d2b,0x7d2c,0x7d2e,0x7d33,0x7d35,0x7d36,0x7d38,0x7d47,0x7d4a,0x7d4a,0x7d4d,0x7d56,0x7d58,0x7d58,0x7d5a,0x7d5f,0x7d61,0x7d63,0x7d66,0x7d6b,0x7d6d,0x7d73,0x7d79,0x7d7d,0x7d7f,0x7d81,0x7d83,0x7d86,0x7d88,0x7d89,0x7d8b,0x7d8f,0x7d91,0x7d97,0x7d9c,0x7da4,0x7da6,0x7db5,0x7db7,0x7dc2,0x7dc4,0x7dc7,0x7dc9,0x7dd0,0x7dd2,0x7dd4,0x7dd7,0x7de1,0x7de3,0x7dea,0x7dec,0x7dec,0x7dee,0x7df7,0x7df9,0x7dfe,0x7e03,0x7e03,0x7e07,0x7e17,0x7e1a,0x7e25,0x7e27,0x7e27,0x7e29,0x7e2b,0x7e2d,0x7e49,0x7e4c,0x7e4c,0x7e50,0x7e5c,0x7e5e,0x7e63,0x7e65,0x7e65,0x7e67,0x7e70,0x7e72,0x7e82,0x7e86,0x7e88,0x7e8a,0x7e8f,0x7e91,0x7e9c,0x7e9f,0x7e9f,0x7ea4,0x7ea4,0x7eac,0x7eac,0x7eba,0x7eba,0x7ec7,0x7ec7,0x7ecf,0x7ecf,0x7edf,0x7edf,0x7f06,0x7f06,0x7f36,0x7f3a,0x7f3d,0x7f41,0x7f43,0x7f45,0x7f47,0x7f55,0x7f58,0x7f58,0x7f5b,0x7f61,0x7f63,0x7f63,0x7f65,0x7f6e,0x7f70,0x7f73,0x7f75,0x7f7f,0x7f83,0x7f83,0x7f85,0x7f8f,0x7f91,0x7f97,0x7f9a,0x7f9e,0x7fa0,0x7fa9,0x7fac,0x7fc3,0x7fc5,0x7fc5,0x7fc7,0x7fc7,0x7fc9,0x7fd2,0x7fd4,0x7fd5,0x7fd7,0x7fd7,0x7fdb,0x7fe3,0x7fe5,0x7ff5,0x7ff7,0x8008,0x800b,0x8012,0x8014,0x8019,0x801b,0x8021,0x8024,0x8026,0x8028,0x802a,0x802c,0x802c,0x802e,0x8031,0x8033,0x8037,0x8039,0x8039,0x803b,0x803f,0x8043,0x8043,0x8046,0x8048,0x804a,0x804a,0x804f,0x8052,0x8054,0x8054,0x8056,0x8056,0x8058,0x8058,0x805a,0x805e,0x8061,0x8064,0x8066,0x8067,0x806c,0x806c,0x806f,0x8073,0x8075,0x8079,0x807d,0x8080,0x8082,0x8082,0x8084,0x8087,0x8089,0x808c,0x808f,0x8090,0x8092,0x8093,0x8095,0x8096,0x8098,0x809d,0x809f,0x809f,0x80a1,0x80a3,0x80a5,0x80a5,0x80a7,0x80a7,0x80a9,0x80ab,0x80ad,0x80af,0x80b1,0x80b2,0x80b4,0x80b8,0x80ba,0x80ba,0x80bc,0x80bd,0x80c2,0x80ca,0x80cc,0x80d1,0x80d4,0x80de,0x80e0,0x80e1,0x80e3,0x80e6,0x80e9,0x80e9,0x80ec,0x80ed,0x80ef,0x80f6,0x80f8,0x80fe,0x8100,0x8103,0x8105,0x810a,0x810c,0x810c,0x810e,0x810e,0x8112,0x8112,0x8114,0x811b,0x811d,0x811f,0x8121,0x8125,0x8127,0x8127,0x8129,0x812d,0x812f,0x8132,0x8134,0x8134,0x8137,0x8137,0x8139,0x813a,0x813d,0x813e,0x8142,0x8144,0x8146,0x8148,0x814a,0x8156,0x8159,0x815c,0x815e,0x815e,0x8160,0x8162,0x8164,0x8167,0x8169,0x8169,0x816b,0x8174,0x8176,0x817a,0x817c,0x817d,0x817f,0x8180,0x8182,0x8184,0x8186,0x818d,0x818f,0x818f,0x8193,0x8193,0x8195,0x8195,0x8197,0x81a0,0x81a2,0x81a3,0x81a5,0x81ac,0x81ae,0x81ae,0x81b0,0x81b7,0x81b9,0x81ca,0x81cc,0x81cd,0x81cf,0x81d2,0x81d5,0x81d5,0x81d7,0x81db,0x81dd,0x81ea,0x81ec,0x81ef,0x81f2,0x81f4,0x81f6,0x81fc,0x81fe,0x8202,0x8204,0x8205,0x8207,0x820d,0x8210,0x8212,0x8214,0x8216,0x8218,0x8218,0x821a,0x8222,0x8225,0x8226,0x8228,0x822d,0x822f,0x822f,0x8232,0x823a,0x823c,0x8240,0x8242,0x8242,0x8244,0x8245,0x8247,0x8247,0x8249,0x8249,0x824b,0x824b,0x824e,0x825c,0x825e,0x825f,0x8261,0x8266,0x8268,0x8269,0x826b,0x826f,0x8271,0x8272,0x8274,0x8280,0x8283,0x8285,0x8287,0x8287,0x828a,0x828b,0x828d,0x8294,0x8298,0x829b,0x829d,0x82b1,0x82b3,0x82c0,0x82c2,0x82c4,0x82ca,0x82ca,0x82cf,0x82d9,0x82db,0x82dc,0x82de,0x82e8,0x82ea,0x8309,0x830b,0x830d,0x8316,0x831e,0x8320,0x8320,0x8322,0x8322,0x8324,0x832d,0x832f,0x832f,0x8331,0x833d,0x833f,0x8345,0x8347,0x8354,0x8356,0x8357,0x8362,0x8363,0x8366,0x8366,0x836f,0x836f,0x8373,0x8378,0x837a,0x837f,0x8381,0x8381,0x8383,0x8383,0x8385,0x839e,0x83a0,0x83a0,0x83a2,0x83ac,0x83ae,0x83b0,0x83b9,0x83b9,0x83bd,0x83cf,0x83d1,0x83d1,0x83d3,0x83d9,0x83db,0x83e5,0x83e7,0x83f6,0x83f8,0x83ff,0x8401,0x8401,0x8403,0x8407,0x8409,0x8414,0x8416,0x8416,0x8418,0x8418,0x841b,0x841c,0x8420,0x8421,0x8423,0x8424,0x8426,0x8426,0x8429,0x8429,0x842b,0x8440,0x8442,0x844e,0x8450,0x8469,0x846b,0x847a,0x847d,0x8480,0x8482,0x8482,0x8484,0x8484,0x8486,0x8486,0x8488,0x8488,0x848d,0x8494,0x8496,0x84a4,0x84a7,0x84b2,0x84b4,0x84b4,0x84b6,0x84b6,0x84b8,0x84c2,0x84c4,0x84c7,0x84c9,0x84d4,0x84d6,0x84d7,0x84da,0x84db,0x84de,0x84de,0x84e1,0x84e2,0x84e4,0x84e5,0x84e7,0x84ec,0x84ee,0x84f4,0x84f6,0x8500,0x8502,0x851a,0x851c,0x8521,0x8523,0x8531,0x8533,0x8534,0x8538,0x8538,0x853b,0x853b,0x853d,0x853e,0x8540,0x854e,0x8551,0x855b,0x855d,0x8571,0x8573,0x8573,0x8575,0x857c,0x857e,0x857e,0x8580,0x8591,0x8593,0x85a4,0x85a6,0x85aa,0x85af,0x85b1,0x85b3,0x85ba,0x85bd,0x85c9,0x85cb,0x85cb,0x85cd,0x85d2,0x85d5,0x85da,0x85dc,0x85e6,0x85e8,0x85f2,0x85f4,0x85f4,0x85f6,0x8602,0x8604,0x8607,0x8609,0x860d,0x860f,0x8611,0x8613,0x8614,0x8616,0x861c,0x861e,0x862a,0x862c,0x862f,0x8631,0x8636,0x8638,0x863c,0x863e,0x8640,0x8642,0x8643,0x8645,0x8648,0x864b,0x864e,0x8650,0x8650,0x8652,0x8656,0x8659,0x8659,0x865b,0x865c,0x865e,0x865f,0x8661,0x8665,0x8667,0x8674,0x8677,0x8677,0x8679,0x867c,0x867e,0x867e,0x8685,0x8687,0x868a,0x868e,0x8690,0x869a,0x869c,0x869e,0x86a0,0x86a5,0x86a7,0x86aa,0x86ad,0x86ad,0x86af,0x86c9,0x86cb,0x86cc,0x86d0,0x86d1,0x86d3,0x86d4,0x86d6,0x86df,0x86e2,0x86e4,0x86e6,0x86e6,0x86e8,0x86ed,0x86ef,0x86ef,0x86f5,0x86fb,0x86fe,0x86fe,0x8700,0x870e,0x8711,0x8713,0x8715,0x8715,0x8718,0x871c,0x871e,0x871e,0x8720,0x872a,0x872c,0x872e,0x8730,0x8735,0x8737,0x8738,0x873a,0x873c,0x873e,0x8743,0x8746,0x8746,0x874c,0x8771,0x8773,0x877b,0x877d,0x877d,0x8781,0x8789,0x878b,0x878d,0x878f,0x8794,0x8796,0x8798,0x879a,0x879f,0x87a2,0x87a5,0x87a9,0x87c6,0x87c8,0x87cc,0x87ce,0x87ce,0x87d1,0x87d4,0x87d6,0x87e8,0x87ea,0x87ef,0x87f2,0x87f7,0x87f9,0x87fc,0x87fe,0x8806,0x8808,0x880d,0x880f,0x8811,0x8813,0x8819,0x881b,0x881d,0x881f,0x8833,0x8835,0x8839,0x883b,0x8846,0x8848,0x8848,0x884a,0x884f,0x8852,0x8853,0x8855,0x8857,0x8859,0x885b,0x885d,0x885e,0x8860,0x8865,0x8867,0x886b,0x886d,0x8872,0x8874,0x8877,0x8879,0x8879,0x887c,0x8884,0x8887,0x8889,0x888b,0x8893,0x8895,0x88a2,0x88a4,0x88a4,0x88a7,0x88a8,0x88aa,0x88ac,0x88ae,0x88ae,0x88b1,0x88b2,0x88b4,0x88ba,0x88bc,0x88c2,0x88c5,0x88c5,0x88c7,0x88c7,0x88c9,0x88d0,0x88d2,0x88d2,0x88d4,0x88df,0x88e1,0x88e1,0x88e6,0x88e8,0x88eb,0x88ec,0x88ee,0x8902,0x8905,0x8907,0x8909,0x890c,0x890e,0x890e,0x8910,0x891a,0x891e,0x891f,0x8921,0x8927,0x8929,0x8933,0x8935,0x8938,0x893b,0x893e,0x8941,0x8944,0x8946,0x8947,0x8949,0x8949,0x894b,0x894d,0x894f,0x8954,0x8956,0x8966,0x8969,0x896f,0x8971,0x8974,0x8976,0x8977,0x8979,0x897c,0x897e,0x8983,0x8985,0x898b,0x898f,0x898f,0x8991,0x8991,0x8993,0x8998,0x899b,0x899f,0x89a1,0x89a7,0x89a9,0x89aa,0x89ac,0x89af,0x89b2,0x89b2,0x89b6,0x89b7,0x89b9,0x89ba,0x89bc,0x89c1,0x89c6,0x89c6,0x89d2,0x89d6,0x89d9,0x89dd,0x89df,0x89e9,0x89eb,0x89ed,0x89f0,0x89f4,0x89f6,0x89f8,0x89fa,0x89fc,0x89fe,0x8a00,0x8a02,0x8a04,0x8a07,0x8a08,0x8a0a,0x8a0a,0x8a0c,0x8a0c,0x8a0e,0x8a13,0x8a15,0x8a18,0x8a1b,0x8a1f,0x8a22,0x8a23,0x8a25,0x8a25,0x8a27,0x8a27,0x8a29,0x8a2d,0x8a30,0x8a31,0x8a34,0x8a34,0x8a36,0x8a36,0x8a38,0x8a41,0x8a44,0x8a46,0x8a48,0x8a4a,0x8a4c,0x8a52,0x8a54,0x8a59,0x8a5b,0x8a5b,0x8a5e,0x8a5e,0x8a60,0x8a63,0x8a66,0x8a69,0x8a6b,0x8a6e,0x8a70,0x8a77,0x8a79,0x8a7c,0x8a7e,0x8a7f,0x8a81,0x8a87,0x8a8b,0x8a8d,0x8a8f,0x8a96,0x8a98,0x8a9a,0x8a9c,0x8a9c,0x8a9e,0x8a9e,0x8aa0,0x8aa1,0x8aa3,0x8aac,0x8aaf,0x8ab0,0x8ab2,0x8ab2,0x8ab4,0x8ab4,0x8ab6,0x8ab6,0x8ab8,0x8ac0,0x8ac2,0x8ac9,0x8acb,0x8acd,0x8acf,0x8acf,0x8ad1,0x8ae2,0x8ae4,0x8ae4,0x8ae6,0x8ae8,0x8aea,0x8aeb,0x8aed,0x8afc,0x8afe,0x8b02,0x8b04,0x8b08,0x8b0a,0x8b20,0x8b22,0x8b28,0x8b2a,0x8b31,0x8b33,0x8b33,0x8b35,0x8b37,0x8b39,0x8b43,0x8b45,0x8b5a,0x8b5c,0x8b60,0x8b62,0x8b63,0x8b65,0x8b6d,0x8b6f,0x8b70,0x8b74,0x8b74,0x8b77,0x8b7b,0x8b7d,0x8b86,0x8b88,0x8b88,0x8b8a,0x8b8c,0x8b8e,0x8b90,0x8b92,0x8b96,0x8b98,0x8b9c,0x8b9e,0x8ba0,0x8bbe,0x8bbe,0x8be2,0x8be2,0x8c37,0x8c37,0x8c39,0x8c39,0x8c3b,0x8c3f,0x8c41,0x8c43,0x8c45,0x8c51,0x8c54,0x8c57,0x8c5a,0x8c5a,0x8c5c,0x8c5d,0x8c5f,0x8c5f,0x8c61,0x8c62,0x8c64,0x8c66,0x8c68,0x8c6d,0x8c6f,0x8c73,0x8c75,0x8c7b,0x8c7d,0x8c7d,0x8c80,0x8c82,0x8c84,0x8c86,0x8c89,0x8c8a,0x8c8c,0x8c8d,0x8c8f,0x8c95,0x8c97,0x8ca5,0x8ca7,0x8cad,0x8caf,0x8cb0,0x8cb2,0x8cc5,0x8cc7,0x8cc8,0x8cca,0x8cca,0x8ccc,0x8ccd,0x8ccf,0x8ccf,0x8cd1,0x8cd7,0x8cd9,0x8cee,0x8cf0,0x8cf5,0x8cf7,0x8cfe,0x8d00,0x8d00,0x8d02,0x8d0d,0x8d0f,0x8d19,0x8d1b,0x8d1d,0x8d64,0x8d64,0x8d66,0x8d69,0x8d6b,0x8d70,0x8d72,0x8d74,0x8d76,0x8d7b,0x8d7d,0x8d7d,0x8d80,0x8d82,0x8d84,0x8d85,0x8d89,0x8d8a,0x8d8c,0x8d96,0x8d99,0x8d99,0x8d9b,0x8d9c,0x8d9f,0x8da1,0x8da3,0x8da3,0x8da5,0x8daf,0x8db2,0x8db7,0x8db9,0x8dba,0x8dbc,0x8dbc,0x8dbe,0x8dc3,0x8dc5,0x8dc8,0x8dcb,0x8dd1,0x8dd3,0x8ddd,0x8ddf,0x8de4,0x8de6,0x8dec,0x8dee,0x8df4,0x8dfa,0x8dfa,0x8dfc,0x8e07,0x8e09,0x8e0a,0x8e0d,0x8e2b,0x8e2d,0x8e2e,0x8e30,0x8e31,0x8e33,0x8e36,0x8e38,0x8e3a,0x8e3c,0x8e42,0x8e44,0x8e50,0x8e53,0x8e57,0x8e59,0x8e6a,0x8e6c,0x8e6d,0x8e6f,0x8e6f,0x8e71,0x8e78,0x8e7a,0x8e7c,0x8e7e,0x8e7e,0x8e80,0x8e82,0x8e84,0x8e8e,0x8e90,0x8e98,0x8e9a,0x8e9a,0x8e9d,0x8ea1,0x8ea3,0x8ead,0x8eb0,0x8eb0,0x8eb2,0x8eb2,0x8eb6,0x8eb6,0x8eb9,0x8eba,0x8ebc,0x8ebd,0x8ec0,0x8ec0,0x8ec2,0x8ec3,0x8ec9,0x8ecf,0x8ed1,0x8ed4,0x8ed7,0x8ed8,0x8eda,0x8ee2,0x8ee4,0x8ee9,0x8eeb,0x8eef,0x8ef1,0x8ef2,0x8ef4,0x8efc,0x8efe,0x8f03,0x8f05,0x8f0b,0x8f0d,0x8f0e,0x8f10,0x8f20,0x8f23,0x8f26,0x8f29,0x8f2a,0x8f2c,0x8f30,0x8f32,0x8f39,0x8f3b,0x8f3c,0x8f3e,0x8f4b,0x8f4d,0x8f64,0x8f66,0x8f67,0x8f6e,0x8f6e,0x8f93,0x8f93,0x8f9b,0x8f9c,0x8f9f,0x8fa0,0x8fa3,0x8fa3,0x8fa5,0x8fa8,0x8fad,0x8fbc,0x8fbe,0x8fbf,0x8fc1,0x8fc2,0x8fc4,0x8fc6,0x8fc9,0x8fd7,0x8fda,0x8fda,0x8fe0,0x8fe6,0x8fe8,0x8fe8,0x8fea,0x8feb,0x8fed,0x8fee,0x8ff0,0x8ff0,0x8ff4,0x9006,0x9008,0x9008,0x900b,0x900d,0x900f,0x9012,0x9014,0x9017,0x9019,0x9024,0x902d,0x902f,0x9031,0x9038,0x903c,0x903f,0x9041,0x9042,0x9044,0x9044,0x9046,0x9047,0x9049,0x9056,0x9058,0x9059,0x905b,0x905e,0x9060,0x9064,0x9067,0x9069,0x906b,0x9070,0x9072,0x9088,0x908a,0x908b,0x908d,0x908d,0x908f,0x9091,0x9094,0x9095,0x9097,0x9099,0x909b,0x909b,0x909e,0x90a3,0x90a5,0x90a8,0x90aa,0x90aa,0x90ae,0x90b6,0x90b8,0x90b8,0x90bb,0x90bb,0x90bd,0x90bf,0x90c1,0x90c1,0x90c3,0x90c5,0x90c7,0x90c8,0x90ca,0x90cb,0x90ce,0x90ce,0x90d4,0x90dd,0x90df,0x90e5,0x90e8,0x90ed,0x90ef,0x90f5,0x90f9,0x9109,0x910b,0x910b,0x910d,0x9112,0x9114,0x9114,0x9116,0x9124,0x9126,0x9136,0x9138,0x913b,0x913e,0x9141,0x9143,0x9153,0x9155,0x915a,0x915c,0x915c,0x915e,0x9165,0x9167,0x916a,0x916c,0x916c,0x916e,0x9170,0x9172,0x917a,0x917c,0x917c,0x9180,0x9187,0x9189,0x9193,0x9196,0x9196,0x9199,0x91a3,0x91a5,0x91a5,0x91a7,0x91b7,0x91b9,0x91be,0x91c0,0x91c7,0x91c9,0x91c9,0x91cb,0x91d1,0x91d3,0x91da,0x91dc,0x91dd,0x91df,0x91df,0x91e2,0x91ee,0x91f1,0x91f1,0x91f3,0x91fa,0x91fd,0x920a,0x920c,0x921a,0x921c,0x921c,0x921e,0x921e,0x9221,0x9221,0x9223,0x9228,0x922a,0x922b,0x922d,0x922e,0x9230,0x923a,0x923c,0x9241,0x9244,0x9246,0x9248,0x9258,0x925a,0x925b,0x925d,0x9267,0x926b,0x9270,0x9272,0x9272,0x9276,0x928f,0x9291,0x9291,0x9293,0x929d,0x92a0,0x92ac,0x92ae,0x92ae,0x92b1,0x92b7,0x92b9,0x92bc,0x92be,0x92d5,0x92d7,0x92d9,0x92db,0x92db,0x92dd,0x92e1,0x92e3,0x92f4,0x92f6,0x9304,0x9306,0x9309,0x930b,0x9310,0x9312,0x9316,0x9318,0x931b,0x931d,0x9331,0x9333,0x9336,0x9338,0x9339,0x933c,0x933c,0x9340,0x9352,0x9354,0x935c,0x935e,0x936e,0x9370,0x9371,0x9373,0x937e,0x9380,0x938a,0x938c,0x9392,0x9394,0x93aa,0x93ac,0x93b5,0x93b7,0x93b8,0x93bb,0x93bb,0x93bd,0x93bd,0x93bf,0x93c0,0x93c2,0x93c4,0x93c6,0x93c8,0x93ca,0x93e4,0x93e6,0x93e8,0x93ec,0x93ec,0x93ee,0x93ee,0x93f0,0x93f1,0x93f3,0x9401,0x9403,0x9404,0x9406,0x9419,0x941b,0x941b,0x941d,0x941d,0x9420,0x9420,0x9424,0x9433,0x9435,0x9440,0x9442,0x944d,0x944f,0x9452,0x9454,0x9455,0x9457,0x9458,0x945b,0x945b,0x945d,0x945e,0x9460,0x9460,0x9462,0x9465,0x9467,0x9479,0x947b,0x9483,0x9485,0x9485,0x949f,0x949f,0x94a2,0x94a2,0x94c1,0x94c1,0x94c3,0x94c3,0x94dc,0x94dc,0x94f6,0x94f6,0x952d,0x952d,0x9547,0x9547,0x9577,0x9578,0x957a,0x957d,0x957f,0x9580,0x9582,0x9583,0x9585,0x9586,0x9588,0x9589,0x958b,0x9594,0x9596,0x9599,0x959b,0x959c,0x959e,0x95ae,0x95b0,0x95b2,0x95b5,0x95b7,0x95b9,0x95c0,0x95c3,0x95c3,0x95c5,0x95cd,0x95d0,0x95d6,0x95da,0x95dc,0x95de,0x95e5,0x95e8,0x95e8,0x95f4,0x95f4,0x961c,0x961e,0x9620,0x9624,0x9628,0x9628,0x962a,0x962a,0x962c,0x9633,0x9638,0x963d,0x963f,0x9645,0x964a,0x9651,0x9653,0x9654,0x9656,0x9656,0x9658,0x9658,0x965b,0x965f,0x9661,0x9664,0x9669,0x966d,0x966f,0x9678,0x967b,0x967e,0x9680,0x9681,0x9683,0x968b,0x968d,0x968f,0x9691,0x9699,0x969b,0x969c,0x969e,0x969e,0x96a1,0x96a5,0x96a7,0x96aa,0x96ac,0x96ac,0x96ae,0x96ae,0x96b0,0x96b1,0x96b3,0x96b4,0x96b6,0x96b6,0x96b8,0x96b9,0x96bb,0x96bd,0x96bf,0x96ce,0x96d2,0x96df,0x96e1,0x96e3,0x96e5,0x96e5,0x96e8,0x96ea,0x96ef,0x96f2,0x96f4,0x96fb,0x96fd,0x96fd,0x96ff,0x9700,0x9702,0x9709,0x970b,0x970b,0x970d,0x9713,0x9716,0x9716,0x9718,0x9719,0x971b,0x972c,0x972e,0x9732,0x9734,0x9736,0x9738,0x973a,0x973d,0x9744,0x9746,0x974b,0x9751,0x9752,0x9755,0x9758,0x975a,0x9762,0x9766,0x9766,0x9768,0x976a,0x976c,0x976e,0x9770,0x9774,0x9776,0x9778,0x977a,0x9785,0x9787,0x978b,0x978d,0x978f,0x9794,0x9794,0x9797,0x97a6,0x97a8,0x97a8,0x97aa,0x97ae,0x97b1,0x97b4,0x97b6,0x97bb,0x97bd,0x97c9,0x97cb,0x97d0,0x97d2,0x97d9,0x97dc,0x97e1,0x97e3,0x97e3,0x97e5,0x97e6,0x97ed,0x97ee,0x97f0,0x97f3,0x97f5,0x97f6,0x97f8,0x97fb,0x97fd,0x9808,0x980a,0x980a,0x980c,0x9818,0x981b,0x9821,0x9823,0x9824,0x9826,0x9829,0x982b,0x982b,0x982d,0x9830,0x9832,0x9835,0x9837,0x9839,0x983b,0x983b,0x9841,0x9841,0x9843,0x9853,0x9856,0x9859,0x985b,0x9860,0x9862,0x986c,0x986f,0x9875,0x98a8,0x98a9,0x98ac,0x98af,0x98b1,0x98b4,0x98b6,0x98c4,0x98c6,0x98cc,0x98ce,0x98ce,0x98db,0x98dc,0x98de,0x98e3,0x98e5,0x98e7,0x98e9,0x98ed,0x98ef,0x98ef,0x98f1,0x98f2,0x98f4,0x98f6,0x98f9,0x98fa,0x98fc,0x98fe,0x9900,0x9900,0x9902,0x9903,0x9905,0x9905,0x9907,0x990a,0x990c,0x990c,0x990e,0x990e,0x9910,0x991c,0x991e,0x991f,0x9921,0x9921,0x9924,0x9925,0x9927,0x9933,0x9935,0x9935,0x9937,0x9943,0x9945,0x9945,0x9947,0x994e,0x9950,0x9959,0x995b,0x995f,0x9961,0x9963,0x9996,0x9999,0x999b,0x999e,0x99a1,0x99a1,0x99a3,0x99a8,0x99aa,0x99b5,0x99b8,0x99bd,0x99c1,0x99c5,0x99c7,0x99c7,0x99c9,0x99c9,0x99cb,0x99dd,0x99df,0x99e7,0x99e9,0x99ea,0x99ec,0x99ee,0x99f0,0x99f1,0x99f4,0x99ff,0x9a01,0x9a07,0x9a09,0x9a11,0x9a14,0x9a16,0x9a19,0x9a27,0x9a29,0x9a32,0x9a34,0x9a46,0x9a48,0x9a4a,0x9a4c,0x9a50,0x9a52,0x9a5c,0x9a5e,0x9a60,0x9a62,0x9a6c,0x9a8f,0x9a8f,0x9aa8,0x9aa8,0x9aab,0x9aab,0x9aad,0x9aad,0x9aaf,0x9ab4,0x9ab6,0x9ac2,0x9ac6,0x9ac7,0x9aca,0x9aca,0x9acd,0x9acd,0x9acf,0x9ad8,0x9adc,0x9adc,0x9adf,0x9ae3,0x9ae6,0x9ae7,0x9aeb,0x9aef,0x9af1,0x9af4,0x9af6,0x9af7,0x9af9,0x9aff,0x9b01,0x9b06,0x9b08,0x9b12,0x9b14,0x9b1a,0x9b1e,0x9b20,0x9b22,0x9b25,0x9b27,0x9b2b,0x9b2d,0x9b2f,0x9b31,0x9b35,0x9b37,0x9b37,0x9b39,0x9b3c,0x9b3e,0x9b46,0x9b48,0x9b48,0x9b4a,0x9b52,0x9b54,0x9b56,0x9b58,0x9b5b,0x9b5f,0x9b61,0x9b64,0x9b64,0x9b66,0x9b69,0x9b6c,0x9b6c,0x9b6f,0x9b71,0x9b74,0x9b77,0x9b7a,0x9b83,0x9b85,0x9b88,0x9b8b,0x9b8b,0x9b8d,0x9b93,0x9b95,0x9b95,0x9b97,0x9b97,0x9b9a,0x9b9b,0x9b9d,0x9ba2,0x9ba4,0x9ba6,0x9ba8,0x9ba8,0x9baa,0x9bab,0x9bad,0x9bb0,0x9bb5,0x9bb6,0x9bb8,0x9bb9,0x9bbd,0x9bbd,0x9bbf,0x9bc1,0x9bc3,0x9bc4,0x9bc6,0x9bca,0x9bcf,0x9bcf,0x9bd3,0x9bd7,0x9bd9,0x9bde,0x9be0,0x9be2,0x9be4,0x9bed,0x9bf0,0x9bf1,0x9bf4,0x9bf4,0x9bf7,0x9bf8,0x9bfd,0x9bfd,0x9bff,0x9bff,0x9c02,0x9c02,0x9c05,0x9c0e,0x9c10,0x9c10,0x9c12,0x9c15,0x9c17,0x9c17,0x9c1b,0x9c1d,0x9c1f,0x9c21,0x9c23,0x9c26,0x9c28,0x9c29,0x9c2b,0x9c2d,0x9c2f,0x9c2f,0x9c31,0x9c37,0x9c39,0x9c41,0x9c44,0x9c50,0x9c52,0x9c59,0x9c5d,0x9c60,0x9c62,0x9c63,0x9c66,0x9c68,0x9c6d,0x9c6e,0x9c71,0x9c75,0x9c77,0x9c7c,0x9ce5,0x9ce7,0x9ce9,0x9cea,0x9ced,0x9ced,0x9cf1,0x9cf7,0x9cf9,0x9cfd,0x9cff,0x9d00,0x9d02,0x9d09,0x9d0c,0x9d0c,0x9d10,0x9d10,0x9d12,0x9d12,0x9d14,0x9d19,0x9d1b,0x9d1b,0x9d1d,0x9d23,0x9d25,0x9d26,0x9d28,0x9d29,0x9d2d,0x9d31,0x9d33,0x9d34,0x9d36,0x9d39,0x9d3b,0x9d3b,0x9d3d,0x9d45,0x9d49,0x9d4c,0x9d4e,0x9d54,0x9d56,0x9d61,0x9d67,0x9d75,0x9d77,0x9d79,0x9d7b,0x9d8c,0x9d90,0x9d90,0x9d92,0x9d94,0x9d96,0x9dad,0x9daf,0x9daf,0x9db1,0x9dc5,0x9dc7,0x9ddf,0x9de1,0x9de6,0x9de8,0x9de9,0x9deb,0x9df0,0x9df2,0x9e07,0x9e09,0x9e15,0x9e17,0x9e1f,0x9e75,0x9e75,0x9e79,0x9e7d,0x9e7f,0x9e8e,0x9e90,0x9ea2,0x9ea4,0x9eb1,0x9eb4,0x9eb7,0x9ebb,0x9ec4,0x9ec6,0x9ec8,0x9ecc,0x9ed1,0x9ed3,0x9ed6,0x9ed8,0x9ed8,0x9eda,0x9ee0,0x9ee2,0x9ee2,0x9ee4,0x9ee8,0x9eeb,0x9eeb,0x9eed,0x9f02,0x9f06,0x9f0a,0x9f0e,0x9f10,0x9f12,0x9f13,0x9f15,0x9f1c,0x9f1e,0x9f1e,0x9f20,0x9f20,0x9f22,0x9f39,0x9f3b,0x9f3b,0x9f3d,0x9f3e,0x9f40,0x9f50,0x9f52,0x9f67,0x9f69,0x9f6c,0x9f6e,0x9f72,0x9f74,0x9f7b,0x9f7e,0x9f7f,0x9f8d,0x9f8e,0x9f90,0x9f92,0x9f94,0x9f99,0x9f9c,0x9f9c,0x9f9f,0x9fa0,0x9fa2,0x9fa2,0x9fa4,0x9fb3,0x9fc7,0x9fcb,0x9fd0,0x9fd0,0xf900,0xf908,0xf90b,0xf90d,0xf915,0xf915,0xf917,0xf917,0xf91a,0xf91a,0xf922,0xf922,0xf92d,0xf92d,0xf934,0xf934,0xf937,0xf937,0xf93a,0xf93a,0xf943,0xf943,0xf947,0xf948,0xf94a,0xf94a,0xf952,0xf952,0xf95e,0xf95e,0xf962,0xf962,0xf965,0xf965,0xf967,0xf967,0xf96d,0xf96d,0xf972,0xf972,0xf976,0xf976,0xf978,0xf979,0xf97b,0xf97b,0xf97e,0xf97e,0xf980,0xf980,0xf986,0xf986,0xf98a,0xf98a,0xf98e,0xf98e,0xf995,0xf995,0xf99c,0xf99d,0xf99f,0xf99f,0xf9b5,0xf9b5,0xf9bb,0xf9bb,0xf9bd,0xf9be,0xf9c5,0xf9c6,0xf9c8,0xf9c8,0xf9d0,0xf9d0,0xf9d8,0xf9d9,0xf9dc,0xf9de,0xf9e0,0xf9e0,0xf9e2,0xf9e4,0xf9e7,0xf9e7,0xf9e9,0xf9e9,0xf9f4,0xf9f5,0xf9fa,0xf9fa,0xf9fd,0xf9fd,0xf9ff,0xf9ff,0xfa02,0xfa02,0xfa05,0xfa08,0xfa0a,0xfa0a,0xfa0c,0xfa0d,0xfa33,0xfa35,0xfa3a,0xfa3a,0xfa49,0xfa49,0xfa4b,0xfa4b,0xfa5d,0xfa5e,0xfb00,0xfb04,0xfe10,0xfe19,0xfe30,0xfe52,0xfe54,0xfe66,0xfe68,0xfe6b,0xff01,0xff9f,0xffa1,0xffbe,0xffc2,0xffc7,0xffca,0xffcf,0xffd2,0xffd7,0xffda,0xffdc,0xffe0,0xffe6,0xffe8,0xffee,0x1f100,0x1f10c,0x1f110,0x1f16c,0x1f170,0x1f1ac,0x1f200,0x1f202,0x1f210,0x1f23b,0x1f240,0x1f248,0x1f250,0x1f251,0x20021,0x20021,0x2003e,0x2003e,0x20046,0x20046,0x2004e,0x2004e,0x20068,0x20068,0x20086,0x20087,0x2008a,0x2008a,0x20094,0x20094,0x200ca,0x200cd,0x200d1,0x200d1,0x200ee,0x200ee,0x2010c,0x2010c,0x2010e,0x2010e,0x20118,0x20118,0x201a4,0x201a4,0x201a9,0x201a9,0x201ab,0x201ab,0x201c1,0x201c1,0x201d4,0x201d4,0x201f2,0x201f2,0x20204,0x20204,0x2020c,0x2020c,0x20214,0x20214,0x20239,0x20239,0x2025b,0x2025b,0x20274,0x20275,0x20299,0x20299,0x2029e,0x2029e,0x202a0,0x202a0,0x202b7,0x202b7,0x202bf,0x202c0,0x202e5,0x202e5,0x2030a,0x2030a,0x20325,0x20325,0x20341,0x20341,0x20345,0x20347,0x2037e,0x20380,0x203a0,0x203a0,0x203a7,0x203a7,0x203b5,0x203b5,0x203c9,0x203c9,0x203cb,0x203cb,0x203f5,0x203f5,0x203fc,0x203fc,0x20413,0x20414,0x2041f,0x2041f,0x20465,0x20465,0x20487,0x20487,0x2048e,0x2048e,0x20491,0x20492,0x204a3,0x204a3,0x204d7,0x204d7,0x204fc,0x204fc,0x204fe,0x204fe,0x20547,0x20547,0x2058e,0x2058e,0x205a5,0x205a5,0x205b3,0x205b3,0x205c3,0x205c3,0x205ca,0x205ca,0x205d0,0x205d0,0x205d5,0x205d5,0x205df,0x205e0,0x205eb,0x205eb,0x20611,0x20611,0x20615,0x20615,0x20619,0x2061a,0x20628,0x20628,0x20630,0x20630,0x20656,0x20656,0x20676,0x20676,0x2070e,0x2070e,0x20731,0x20731,0x20779,0x20779,0x2082c,0x2082c,0x20873,0x20873,0x208d5,0x208d5,0x20916,0x20916,0x20923,0x20923,0x20954,0x20954,0x20979,0x20979,0x209e7,0x209e7,0x20a11,0x20a11,0x20a50,0x20a50,0x20a6f,0x20a6f,0x20a8a,0x20a8a,0x20ab4,0x20ab4,0x20ac2,0x20ac2,0x20acd,0x20acd,0x20b0d,0x20b0d,0x20b8f,0x20b8f,0x20b9f,0x20b9f,0x20ba8,0x20ba9,0x20bbf,0x20bbf,0x20bc6,0x20bc6,0x20bcb,0x20bcb,0x20be2,0x20be2,0x20beb,0x20beb,0x20bfb,0x20bfb,0x20bff,0x20bff,0x20c0b,0x20c0b,0x20c0d,0x20c0d,0x20c20,0x20c20,0x20c34,0x20c34,0x20c3a,0x20c3b,0x20c41,0x20c43,0x20c53,0x20c53,0x20c65,0x20c65,0x20c77,0x20c78,0x20c7c,0x20c7c,0x20c8d,0x20c8d,0x20c96,0x20c96,0x20c9c,0x20c9c,0x20cb5,0x20cb5,0x20cb8,0x20cb8,0x20ccf,0x20ccf,0x20cd3,0x20cd6,0x20cdd,0x20cdd,0x20ced,0x20ced,0x20cff,0x20cff,0x20d15,0x20d15,0x20d28,0x20d28,0x20d31,0x20d32,0x20d46,0x20d49,0x20d4c,0x20d4e,0x20d6f,0x20d6f,0x20d71,0x20d71,0x20d74,0x20d74,0x20d7c,0x20d7c,0x20d7e,0x20d7f,0x20d96,0x20d96,0x20d9c,0x20d9c,0x20da7,0x20da7,0x20db2,0x20db2,0x20dc8,0x20dc8,0x20e04,0x20e04,0x20e09,0x20e0a,0x20e0d,0x20e11,0x20e16,0x20e16,0x20e1d,0x20e1d,0x20e4c,0x20e4c,0x20e6d,0x20e6d,0x20e73,0x20e73,0x20e75,0x20e7b,0x20e8c,0x20e8c,0x20e96,0x20e96,0x20e98,0x20e98,0x20e9d,0x20e9d,0x20ea2,0x20ea2,0x20eaa,0x20eac,0x20eb6,0x20eb6,0x20ed7,0x20ed8,0x20edd,0x20edd,0x20ef8,0x20efb,0x20f1d,0x20f1d,0x20f26,0x20f26,0x20f2d,0x20f2e,0x20f30,0x20f31,0x20f3b,0x20f3b,0x20f4c,0x20f4c,0x20f64,0x20f64,0x20f8d,0x20f8d,0x20f90,0x20f90,0x20fad,0x20fad,0x20fb4,0x20fb6,0x20fbc,0x20fbc,0x20fdf,0x20fdf,0x20fea,0x20fed,0x21014,0x21014,0x2101d,0x2101e,0x2104f,0x2104f,0x2105c,0x2105c,0x2106f,0x2106f,0x21075,0x21078,0x2107b,0x2107b,0x21088,0x21088,0x21096,0x21096,0x2109d,0x2109d,0x210b4,0x210b4,0x210bf,0x210c1,0x210c7,0x210c9,0x210cf,0x210cf,0x210d3,0x210d3,0x210e4,0x210e4,0x210f4,0x210f6,0x2112f,0x2112f,0x2113b,0x2113b,0x2113d,0x2113d,0x21145,0x21145,0x21148,0x21148,0x2114f,0x2114f,0x21180,0x21180,0x21187,0x21187,0x211d9,0x211d9,0x2123c,0x2123c,0x2124f,0x2124f,0x2127c,0x2127c,0x212a8,0x212a9,0x212b0,0x212b0,0x212e3,0x212e3,0x212fe,0x212fe,0x21302,0x21305,0x21336,0x21336,0x2133a,0x2133a,0x21375,0x21376,0x2138e,0x2138e,0x21398,0x21398,0x2139c,0x2139c,0x213c5,0x213c6,0x213ed,0x213ed,0x213fe,0x213fe,0x21413,0x21413,0x21416,0x21416,0x21424,0x21424,0x2143f,0x2143f,0x21452,0x21452,0x21454,0x21455,0x2148a,0x2148a,0x21497,0x21497,0x214b6,0x214b6,0x214e8,0x214e8,0x214fd,0x214fd,0x21577,0x21577,0x21582,0x21582,0x21596,0x21596,0x2160a,0x2160a,0x21613,0x21613,0x21619,0x21619,0x2163e,0x2163e,0x21661,0x21661,0x21692,0x21692,0x216b8,0x216b8,0x216ba,0x216ba,0x216c0,0x216c2,0x216d3,0x216d3,0x216d5,0x216d5,0x216df,0x216df,0x216e6,0x216e8,0x216fa,0x216fc,0x216fe,0x216fe,0x2170d,0x2170d,0x21710,0x21710,0x21726,0x21726,0x2173a,0x2173c,0x21757,0x21757,0x2176c,0x21771,0x21773,0x21774,0x217ab,0x217ab,0x217b0,0x217b5,0x217c3,0x217c3,0x217c7,0x217c7,0x217d9,0x217dc,0x217df,0x217df,0x217ef,0x217ef,0x217f5,0x217f6,0x217f8,0x217fc,0x21820,0x21820,0x21828,0x2182a,0x2182d,0x2182d,0x21839,0x2183b,0x21840,0x21840,0x21845,0x21845,0x21852,0x21852,0x2185e,0x2185e,0x21861,0x21864,0x21877,0x21877,0x2187b,0x2187b,0x21883,0x21885,0x2189e,0x218a2,0x218be,0x218bf,0x218d1,0x218d1,0x218d6,0x218d9,0x218fa,0x218fa,0x21903,0x21905,0x21910,0x21912,0x21915,0x21915,0x2191c,0x2191c,0x21922,0x21922,0x21927,0x21927,0x2193b,0x2193b,0x21944,0x21944,0x21958,0x21958,0x2196a,0x2196a,0x2197c,0x2197c,0x21980,0x21980,0x21983,0x21983,0x21988,0x21988,0x21996,0x21996,0x219db,0x219db,0x219f3,0x219f3,0x21a2d,0x21a2d,0x21a34,0x21a34,0x21a45,0x21a45,0x21a4b,0x21a4b,0x21a63,0x21a63,0x21b44,0x21b44,0x21bc1,0x21bc2,0x21c2a,0x21c2a,0x21c70,0x21c70,0x21ca2,0x21ca2,0x21ca5,0x21ca5,0x21cac,0x21cac,0x21d46,0x21d46,0x21d53,0x21d53,0x21d5e,0x21d5e,0x21d90,0x21d90,0x21db6,0x21db6,0x21dba,0x21dba,0x21dca,0x21dca,0x21dd1,0x21dd1,0x21deb,0x21deb,0x21df9,0x21df9,0x21e1c,0x21e1c,0x21e23,0x21e23,0x21e37,0x21e37,0x21e3d,0x21e3d,0x21e89,0x21e89,0x21ea4,0x21ea4,0x21ea8,0x21ea8,0x21ec8,0x21ec8,0x21ed5,0x21ed5,0x21f0f,0x21f0f,0x21f15,0x21f15,0x21f6a,0x21f6a,0x21f9e,0x21f9e,0x21fa1,0x21fa1,0x21fe8,0x21fe8,0x22045,0x22045,0x22049,0x22049,0x2207e,0x2207e,0x2209a,0x2209a,0x220c7,0x220c7,0x220fc,0x220fc,0x2212a,0x2212a,0x2215b,0x2215b,0x22173,0x22173,0x2217a,0x2217a,0x221a1,0x221a1,0x221c1,0x221c1,0x221c3,0x221c3,0x22208,0x22208,0x2227c,0x2227c,0x22321,0x22321,0x22325,0x22325,0x223bd,0x223bd,0x223d0,0x223d0,0x223d7,0x223d7,0x223fa,0x223fa,0x22465,0x22465,0x22471,0x22471,0x2248b,0x2248b,0x22491,0x22491,0x224b0,0x224b0,0x224bc,0x224bc,0x224c1,0x224c1,0x224c9,0x224c9,0x224cc,0x224cc,0x224ed,0x224ed,0x22513,0x22513,0x2251b,0x2251b,0x22530,0x22530,0x22554,0x22554,0x2258d,0x2258d,0x225af,0x225af,0x225be,0x225be,0x2261b,0x2261c,0x2262b,0x2262b,0x22668,0x22668,0x2267a,0x2267a,0x22696,0x22696,0x22698,0x22698,0x226f4,0x226f6,0x22712,0x22712,0x22714,0x22714,0x2271b,0x2271b,0x2271f,0x2271f,0x2272a,0x2272a,0x22775,0x22775,0x22781,0x22781,0x22796,0x22796,0x227b4,0x227b5,0x227cd,0x227cd,0x22803,0x22803,0x2285f,0x22860,0x22871,0x22871,0x228ad,0x228ad,0x228c1,0x228c1,0x228f7,0x228f7,0x22926,0x22926,0x22939,0x22939,0x2294f,0x2294f,0x22967,0x22967,0x2296b,0x2296b,0x22980,0x22980,0x22993,0x22993,0x22a66,0x22a66,0x22acf,0x22acf,0x22ad5,0x22ad5,0x22ae6,0x22ae6,0x22ae8,0x22ae8,0x22b0e,0x22b0e,0x22b22,0x22b22,0x22b3f,0x22b3f,0x22b43,0x22b43,0x22b6a,0x22b6a,0x22bca,0x22bca,0x22bce,0x22bce,0x22c26,0x22c27,0x22c38,0x22c38,0x22c4c,0x22c4c,0x22c51,0x22c51,0x22c55,0x22c55,0x22c62,0x22c62,0x22c88,0x22c88,0x22c9b,0x22c9b,0x22ca1,0x22ca1,0x22ca9,0x22ca9,0x22cb2,0x22cb2,0x22cb7,0x22cb7,0x22cc2,0x22cc2,0x22cc6,0x22cc6,0x22cc9,0x22cc9,0x22d07,0x22d08,0x22d12,0x22d12,0x22d44,0x22d44,0x22d4c,0x22d4c,0x22d67,0x22d67,0x22d8d,0x22d8d,0x22d95,0x22d95,0x22da0,0x22da0,0x22da3,0x22da4,0x22db7,0x22db7,0x22dee,0x22dee,0x22e0d,0x22e0d,0x22e36,0x22e36,0x22e42,0x22e42,0x22e78,0x22e78,0x22e8b,0x22e8b,0x22eb3,0x22eb3,0x22eef,0x22eef,0x22f74,0x22f74,0x22fcc,0x22fcc,0x22fe3,0x22fe3,0x23033,0x23033,0x23044,0x23044,0x2304b,0x2304b,0x23066,0x23066,0x2307d,0x2307e,0x2308e,0x2308e,0x230b7,0x230b7,0x230bc,0x230bc,0x230da,0x230da,0x23103,0x23103,0x2313d,0x2313d,0x2317d,0x2317d,0x23182,0x23182,0x231a4,0x231a5,0x231b3,0x231b3,0x231c8,0x231c9,0x231ea,0x231ea,0x231f7,0x231f9,0x2320f,0x2320f,0x23225,0x23225,0x2322f,0x2322f,0x23231,0x23234,0x23256,0x23256,0x2325e,0x2325e,0x23262,0x23262,0x23281,0x23281,0x23289,0x2328a,0x232ab,0x232ad,0x232d2,0x232d2,0x232e0,0x232e1,0x23300,0x23300,0x2330a,0x2330a,0x2331f,0x2331f,0x233b4,0x233b4,0x233cc,0x233cc,0x233de,0x233de,0x233e6,0x233e6,0x233f4,0x233f5,0x233f9,0x233fa,0x233fe,0x233fe,0x23400,0x23400,0x2343f,0x2343f,0x23450,0x23450,0x2346f,0x2346f,0x23472,0x23472,0x234e5,0x234e5,0x23519,0x23519,0x23530,0x23530,0x23551,0x23551,0x2355a,0x2355a,0x23567,0x23567,0x23595,0x23595,0x23599,0x23599,0x2359c,0x2359c,0x235bb,0x235bb,0x235cd,0x235cf,0x235f3,0x235f3,0x23600,0x23600,0x23617,0x23617,0x2361a,0x2361a,0x2363c,0x2363c,0x23640,0x23640,0x23659,0x23659,0x2365f,0x2365f,0x23677,0x23677,0x2368e,0x2368e,0x2369e,0x2369e,0x236a6,0x236a6,0x236ad,0x236ad,0x236ba,0x236ba,0x236df,0x236df,0x236ee,0x236ee,0x23703,0x23703,0x23716,0x23716,0x23720,0x23720,0x2372d,0x2372d,0x2372f,0x2372f,0x2373f,0x2373f,0x23766,0x23766,0x23781,0x23781,0x237a2,0x237a2,0x237bc,0x237bc,0x237c2,0x237c2,0x237d5,0x237d7,0x2383a,0x2383a,0x239c2,0x239c2,0x23aa7,0x23aa7,0x23adb,0x23adb,0x23aee,0x23aee,0x23afa,0x23afa,0x23b1a,0x23b1a,0x23b5a,0x23b5a,0x23c63,0x23c63,0x23c99,0x23c9b,0x23cb5,0x23cb5,0x23cb7,0x23cb7,0x23cc7,0x23cc9,0x23cfc,0x23cff,0x23d40,0x23d40,0x23d5b,0x23d5b,0x23d7e,0x23d7e,0x23d8f,0x23d8f,0x23db6,0x23dbd,0x23de3,0x23de3,0x23df8,0x23df8,0x23e06,0x23e06,0x23e11,0x23e11,0x23e2c,0x23e31,0x23e39,0x23e39,0x23e88,0x23e8b,0x23eb9,0x23eb9,0x23ebf,0x23ebf,0x23ed7,0x23ed7,0x23ef7,0x23efc,0x23f35,0x23f35,0x23f41,0x23f41,0x23f4a,0x23f4a,0x23f61,0x23f61,0x23f7f,0x23f82,0x23f8f,0x23f8f,0x23fb4,0x23fb4,0x23fb7,0x23fb7,0x23fc0,0x23fc0,0x23fc5,0x23fc5,0x23feb,0x23ff0,0x24011,0x24011,0x24039,0x2403d,0x24057,0x24057,0x24085,0x24085,0x2408b,0x2408d,0x24091,0x24091,0x240c9,0x240c9,0x240e1,0x240e1,0x240ec,0x240ec,0x24104,0x24104,0x2410f,0x2410f,0x24119,0x24119,0x2413f,0x24140,0x24144,0x24144,0x2414e,0x2414e,0x24155,0x24157,0x2415c,0x2415c,0x2415f,0x2415f,0x24161,0x24161,0x24177,0x24177,0x2417a,0x2417a,0x241a3,0x241a5,0x241ac,0x241ac,0x241b5,0x241b5,0x241cd,0x241cd,0x241e2,0x241e2,0x241fc,0x241fc,0x2421b,0x2421b,0x2424b,0x2424b,0x24256,0x24256,0x24259,0x24259,0x24276,0x24278,0x24284,0x24284,0x24293,0x24293,0x24295,0x24295,0x242a5,0x242a5,0x242bf,0x242bf,0x242c1,0x242c1,0x242c9,0x242ca,0x242ee,0x242ee,0x242fa,0x242fa,0x2430d,0x2430d,0x2431a,0x2431a,0x24334,0x24334,0x24348,0x24348,0x24362,0x24365,0x2438c,0x2438c,0x24396,0x24396,0x2439c,0x2439c,0x243bd,0x243bd,0x243c1,0x243c1,0x243e9,0x243ea,0x243f2,0x243f2,0x243f8,0x243f8,0x24404,0x24404,0x24435,0x24436,0x2445a,0x2445b,0x24473,0x24473,0x24487,0x24488,0x244b9,0x244b9,0x244bc,0x244bc,0x244ce,0x244ce,0x244d3,0x244d3,0x244d6,0x244d6,0x24505,0x24505,0x24521,0x24521,0x24578,0x24578,0x245c8,0x245c8,0x24618,0x24618,0x2462a,0x2462a,0x24665,0x24665,0x24674,0x24674,0x24697,0x24697,0x246d4,0x246d4,0x24706,0x24706,0x24725,0x24725,0x2472f,0x2472f,0x2478f,0x2478f,0x247e0,0x247e0,0x24812,0x24812,0x24823,0x24823,0x24882,0x24882,0x248e9,0x248e9,0x248f0,0x248f3,0x248fb,0x248fb,0x248ff,0x24901,0x2490c,0x2490c,0x24916,0x24917,0x24919,0x24919,0x2492f,0x2492f,0x24933,0x24934,0x2493e,0x24943,0x24962,0x24963,0x24974,0x24976,0x2497b,0x2497b,0x2497f,0x2497f,0x24982,0x24982,0x24988,0x2498f,0x24994,0x24994,0x249a4,0x249a4,0x249a7,0x249a7,0x249a9,0x249a9,0x249ab,0x249ad,0x249b7,0x249bb,0x249c5,0x249c5,0x249d0,0x249d0,0x249da,0x249da,0x249de,0x249df,0x249e3,0x249e3,0x249e5,0x249e5,0x249ec,0x249ed,0x249f6,0x249f9,0x249fb,0x249fb,0x24a0e,0x24a0e,0x24a12,0x24a13,0x24a15,0x24a15,0x24a21,0x24a2a,0x24a3e,0x24a3e,0x24a42,0x24a42,0x24a45,0x24a45,0x24a4a,0x24a4a,0x24a4e,0x24a51,0x24a5d,0x24a5d,0x24a65,0x24a67,0x24a71,0x24a71,0x24a77,0x24a7a,0x24a8c,0x24a8c,0x24a93,0x24a96,0x24aa4,0x24aa7,0x24ab1,0x24ab3,0x24aba,0x24abc,0x24ac0,0x24ac0,0x24ac7,0x24ac7,0x24aca,0x24aca,0x24ad1,0x24ad1,0x24adf,0x24adf,0x24ae2,0x24ae2,0x24ae9,0x24ae9,0x24b0f,0x24b0f,0x24b6e,0x24b6e,0x24bf5,0x24bf5,0x24c09,0x24c09,0x24c9e,0x24c9f,0x24cc9,0x24cc9,0x24cd9,0x24cd9,0x24d06,0x24d06,0x24d13,0x24d13,0x24db8,0x24db8,0x24dea,0x24deb,0x24e3b,0x24e3b,0x24e50,0x24e50,0x24ea5,0x24ea5,0x24ea7,0x24ea7,0x24f0e,0x24f0e,0x24f5c,0x24f5c,0x24f82,0x24f82,0x24f86,0x24f86,0x24f97,0x24f97,0x24f9a,0x24f9a,0x24fa9,0x24fa9,0x24fb8,0x24fb8,0x24fc2,0x24fc2,0x2502c,0x2502c,0x25052,0x25052,0x2509d,0x2509d,0x2512b,0x2512b,0x25148,0x25148,0x2517d,0x2517e,0x251cd,0x251cd,0x251e3,0x251e3,0x251e6,0x251e7,0x25220,0x25221,0x25250,0x25250,0x25299,0x25299,0x252c7,0x252c7,0x252d8,0x252d8,0x2530e,0x2530e,0x25311,0x25311,0x25313,0x25313,0x25419,0x25419,0x25425,0x25425,0x2542f,0x25430,0x25446,0x25446,0x2546c,0x2546c,0x2546e,0x2546e,0x2549a,0x2549a,0x25531,0x25531,0x25535,0x25535,0x2553f,0x2553f,0x2555b,0x2555e,0x25562,0x25562,0x25565,0x25566,0x25581,0x25581,0x25584,0x25584,0x2558f,0x2558f,0x255b9,0x255b9,0x255d5,0x255d5,0x255db,0x255db,0x255e0,0x255e0,0x25605,0x25605,0x25635,0x25635,0x25651,0x25651,0x25683,0x25683,0x25695,0x25695,0x256e3,0x256e3,0x256f6,0x256f6,0x25706,0x25706,0x2571d,0x2571d,0x25725,0x25725,0x2573d,0x2573d,0x25772,0x25772,0x257c7,0x257c7,0x257df,0x257e1,0x25857,0x25857,0x2585d,0x2585d,0x25872,0x25872,0x258c8,0x258c8,0x258de,0x258de,0x258e1,0x258e1,0x25903,0x25903,0x25946,0x25946,0x25956,0x25956,0x259ac,0x259ac,0x259cc,0x259cc,0x25a54,0x25a54,0x25a95,0x25a95,0x25a9c,0x25a9c,0x25aae,0x25aaf,0x25ad7,0x25ad7,0x25ae9,0x25ae9,0x25b74,0x25b74,0x25b89,0x25b89,0x25bb3,0x25bb4,0x25bc6,0x25bc6,0x25be4,0x25be4,0x25be8,0x25be8,0x25c01,0x25c01,0x25c06,0x25c06,0x25c21,0x25c21,0x25c4a,0x25c4a,0x25c65,0x25c65,0x25c91,0x25c91,0x25ca4,0x25ca4,0x25cc0,0x25cc1,0x25cfe,0x25cfe,0x25d20,0x25d20,0x25d30,0x25d30,0x25d43,0x25d43,0x25d99,0x25d99,0x25db9,0x25db9,0x25e0e,0x25e0e,0x25e49,0x25e49,0x25e81,0x25e83,0x25ea6,0x25ea6,0x25ebc,0x25ebc,0x25ed7,0x25ed8,0x25f1a,0x25f1a,0x25f4b,0x25f4b,0x25fe1,0x25fe2,0x26021,0x26021,0x26029,0x26029,0x26048,0x26048,0x26064,0x26064,0x26083,0x26083,0x26097,0x26097,0x260a4,0x260a5,0x26102,0x26102,0x26121,0x26121,0x26159,0x2615c,0x261ad,0x261ae,0x261b2,0x261b2,0x261dd,0x261dd,0x26258,0x26258,0x26261,0x26261,0x2626a,0x2626b,0x262d0,0x262d0,0x26335,0x26335,0x2634b,0x2634c,0x26351,0x26351,0x263be,0x263be,0x263f5,0x263f5,0x263f8,0x263f8,0x26402,0x26402,0x26410,0x26412,0x2644a,0x2644a,0x26469,0x26469,0x26484,0x26484,0x26488,0x26489,0x2648d,0x2648d,0x26498,0x26498,0x26512,0x26512,0x26572,0x26572,0x265a0,0x265a0,0x265ad,0x265ad,0x265bf,0x265bf,0x26612,0x26612,0x26626,0x26626,0x266af,0x266af,0x266b1,0x266b1,0x266b5,0x266b5,0x266da,0x266da,0x266e8,0x266e8,0x266fc,0x266fc,0x26716,0x26716,0x26741,0x26741,0x26799,0x26799,0x267b3,0x267b4,0x267cc,0x267cc,0x2681c,0x2681c,0x26846,0x26846,0x2685e,0x2685e,0x2686e,0x2686e,0x26888,0x26888,0x2688a,0x2688a,0x26893,0x26893,0x268c7,0x268c7,0x2690e,0x2690e,0x26911,0x26911,0x26926,0x26926,0x26939,0x26939,0x26951,0x26951,0x269a8,0x269a8,0x269b5,0x269b5,0x269f2,0x269f2,0x269fa,0x269fa,0x26a2d,0x26a2e,0x26a34,0x26a34,0x26a42,0x26a42,0x26a51,0x26a52,0x26b05,0x26b05,0x26b0a,0x26b0a,0x26b13,0x26b13,0x26b15,0x26b15,0x26b23,0x26b23,0x26b28,0x26b28,0x26b50,0x26b53,0x26b5b,0x26b5b,0x26b75,0x26b75,0x26b82,0x26b82,0x26b96,0x26b97,0x26b9d,0x26b9d,0x26bb3,0x26bb3,0x26bc0,0x26bc0,0x26bf7,0x26bf7,0x26c21,0x26c21,0x26c40,0x26c41,0x26c46,0x26c46,0x26c7e,0x26c82,0x26ca4,0x26ca4,0x26cb7,0x26cb8,0x26cbd,0x26cbd,0x26cc0,0x26cc0,0x26cc3,0x26cc3,0x26cd1,0x26cd1,0x26d22,0x26d2a,0x26d51,0x26d51,0x26d74,0x26d74,0x26da0,0x26da7,0x26dae,0x26dae,0x26ddc,0x26ddc,0x26dea,0x26deb,0x26df0,0x26df0,0x26e00,0x26e00,0x26e05,0x26e05,0x26e07,0x26e07,0x26e12,0x26e12,0x26e42,0x26e45,0x26e6e,0x26e6e,0x26e72,0x26e72,0x26e77,0x26e77,0x26e84,0x26e84,0x26e88,0x26e88,0x26e8b,0x26e8b,0x26e99,0x26e99,0x26ed0,0x26ed7,0x26f26,0x26f26,0x26f73,0x26f74,0x26f9f,0x26f9f,0x26fa1,0x26fa1,0x26fbe,0x26fbe,0x26fde,0x26fdf,0x2700e,0x2700e,0x2704b,0x2704b,0x27052,0x27053,0x27088,0x27088,0x270ad,0x270af,0x270cd,0x270cd,0x270d2,0x270d2,0x270f0,0x270f0,0x270f8,0x270f8,0x27109,0x27109,0x2710c,0x2710d,0x27126,0x27127,0x27164,0x27165,0x27175,0x27175,0x271cd,0x271cd,0x2721b,0x2721b,0x27267,0x27267,0x27280,0x27280,0x27285,0x27285,0x2728b,0x2728b,0x272b2,0x272b2,0x272b6,0x272b6,0x272e6,0x272e6,0x27352,0x27352,0x2739a,0x2739a,0x273ff,0x273ff,0x27422,0x27422,0x27450,0x27450,0x27484,0x27484,0x27486,0x27486,0x27574,0x27574,0x275a3,0x275a3,0x275e0,0x275e0,0x275e4,0x275e4,0x275fd,0x275fe,0x27607,0x27607,0x2760c,0x2760c,0x27632,0x27632,0x27639,0x27639,0x27655,0x27657,0x27694,0x27694,0x2770f,0x2770f,0x27735,0x27736,0x27741,0x27741,0x2775e,0x2775e,0x27784,0x27785,0x277cc,0x277cc,0x27858,0x27858,0x27870,0x27870,0x2789d,0x2789d,0x278b2,0x278b2,0x278c8,0x278c8,0x27924,0x27924,0x27967,0x27967,0x2797a,0x2797a,0x279a0,0x279a0,0x279dd,0x279dd,0x279fd,0x279fd,0x27a0a,0x27a0a,0x27a0e,0x27a0e,0x27a3e,0x27a3e,0x27a53,0x27a53,0x27a59,0x27a59,0x27a79,0x27a79,0x27a84,0x27a84,0x27abd,0x27abe,0x27af4,0x27af4,0x27b06,0x27b06,0x27b0b,0x27b0b,0x27b18,0x27b18,0x27b38,0x27b3a,0x27b48,0x27b48,0x27b65,0x27b65,0x27bef,0x27bef,0x27bf4,0x27bf4,0x27c12,0x27c12,0x27c6c,0x27c6c,0x27cb1,0x27cb1,0x27cc5,0x27cc5,0x27d2f,0x27d2f,0x27d53,0x27d54,0x27d66,0x27d66,0x27d73,0x27d73,0x27d84,0x27d84,0x27d8f,0x27d8f,0x27d98,0x27d98,0x27dbd,0x27dbd,0x27ddc,0x27ddc,0x27e4d,0x27e4d,0x27e4f,0x27e4f,0x27f2e,0x27f2e,0x27fb7,0x27fb7,0x27ff9,0x27ff9,0x28002,0x28002,0x28009,0x28009,0x2801e,0x2801e,0x28023,0x28024,0x28048,0x28048,0x28083,0x28083,0x28090,0x28090,0x280bd,0x280be,0x280e8,0x280e9,0x280f4,0x280f4,0x2812e,0x2812e,0x2814f,0x2814f,0x2815d,0x2815d,0x2816f,0x2816f,0x28189,0x28189,0x281af,0x281af,0x281bc,0x281bc,0x28207,0x28207,0x28218,0x28218,0x2821a,0x2821a,0x28256,0x28256,0x2827c,0x2827c,0x2829b,0x2829b,0x282cd,0x282cd,0x282e2,0x282e2,0x28306,0x28306,0x28318,0x28318,0x2832f,0x2832f,0x2833a,0x2833a,0x28365,0x28365,0x2836d,0x2836d,0x2837d,0x2837d,0x2838a,0x2838a,0x28412,0x28412,0x28468,0x28468,0x2846c,0x2846c,0x28473,0x28473,0x28482,0x28482,0x28501,0x28501,0x2853c,0x2853d,0x2856c,0x2856c,0x285e8,0x285e8,0x285f4,0x285f4,0x28600,0x28600,0x2860b,0x2860b,0x28625,0x28625,0x2863b,0x2863b,0x286aa,0x286ab,0x286b2,0x286b2,0x286bc,0x286bc,0x286d8,0x286d8,0x286e6,0x286e6,0x2870f,0x2870f,0x28713,0x28713,0x28804,0x28804,0x2882b,0x2882b,0x2890d,0x2890d,0x28933,0x28933,0x28948,0x28949,0x28956,0x28956,0x28964,0x28964,0x28968,0x28968,0x2896c,0x2896d,0x2897e,0x2897e,0x28989,0x28989,0x289a8,0x289a8,0x289aa,0x289ab,0x289b8,0x289b8,0x289bc,0x289bc,0x289c0,0x289c0,0x289dc,0x289dc,0x289de,0x289de,0x289e1,0x289e1,0x289e3,0x289e4,0x289e7,0x289e8,0x289f9,0x289fc,0x28a0f,0x28a0f,0x28a16,0x28a16,0x28a25,0x28a25,0x28a29,0x28a29,0x28a32,0x28a32,0x28a36,0x28a36,0x28a44,0x28a4b,0x28a59,0x28a5a,0x28a81,0x28a83,0x28a9a,0x28a9c,0x28ac0,0x28ac0,0x28ac6,0x28ac6,0x28acb,0x28acc,0x28ace,0x28ace,0x28ade,0x28ae3,0x28ae5,0x28ae5,0x28aea,0x28aea,0x28afc,0x28afc,0x28b0c,0x28b0c,0x28b13,0x28b13,0x28b21,0x28b22,0x28b2b,0x28b2d,0x28b2f,0x28b2f,0x28b46,0x28b46,0x28b4c,0x28b4c,0x28b4e,0x28b4e,0x28b50,0x28b50,0x28b63,0x28b66,0x28b6c,0x28b6c,0x28b8f,0x28b8f,0x28b99,0x28b99,0x28b9c,0x28b9d,0x28bb9,0x28bb9,0x28bc2,0x28bc2,0x28bc5,0x28bc5,0x28bd4,0x28bd4,0x28bd7,0x28bd7,0x28bd9,0x28bda,0x28be7,0x28bec,0x28bf5,0x28bf5,0x28bff,0x28bff,0x28c03,0x28c03,0x28c09,0x28c09,0x28c1c,0x28c1d,0x28c23,0x28c23,0x28c26,0x28c26,0x28c2b,0x28c2b,0x28c30,0x28c30,0x28c39,0x28c39,0x28c3b,0x28c3b,0x28cca,0x28cca,0x28ccd,0x28ccd,0x28cd2,0x28cd2,0x28d34,0x28d34,0x28d99,0x28d99,0x28db9,0x28db9,0x28e0f,0x28e0f,0x28e36,0x28e36,0x28e39,0x28e39,0x28e65,0x28e66,0x28e97,0x28e97,0x28eac,0x28eac,0x28eb2,0x28eb3,0x28ed9,0x28ed9,0x28ee7,0x28ee7,0x28fc5,0x28fc5,0x29079,0x29079,0x29088,0x29088,0x2908b,0x2908b,0x29093,0x29093,0x290af,0x290b1,0x290c0,0x290c0,0x290e4,0x290e5,0x290ec,0x290ed,0x2910d,0x2910d,0x29110,0x29110,0x2913c,0x2913c,0x2914d,0x2914d,0x2915b,0x2915b,0x2915e,0x2915e,0x29170,0x29170,0x2919c,0x2919c,0x291a8,0x291a8,0x291d5,0x291d5,0x291eb,0x291eb,0x2941d,0x2941d,0x29420,0x29420,0x29433,0x29433,0x2943f,0x2943f,0x29448,0x29448,0x294d0,0x294d0,0x294d9,0x294da,0x294e5,0x294e5,0x294e7,0x294e7,0x2959e,0x2959e,0x295b0,0x295b0,0x295b8,0x295b8,0x295d7,0x295d7,0x295e9,0x295e9,0x295f4,0x295f4,0x2967f,0x2967f,0x29720,0x29720,0x29732,0x29732,0x297d4,0x297d4,0x29810,0x29810,0x29857,0x29857,0x298a4,0x298a4,0x298d1,0x298d1,0x298ea,0x298ea,0x298f1,0x298f1,0x298fa,0x298fa,0x29903,0x29903,0x29905,0x29905,0x2992f,0x2992f,0x29945,0x29945,0x29947,0x29949,0x2995d,0x2995d,0x2996a,0x2996a,0x2999d,0x2999d,0x299c3,0x299c3,0x299c9,0x299c9,0x29a28,0x29a28,0x29a4d,0x29a4d,0x29b05,0x29b05,0x29b0e,0x29b0e,0x29bd5,0x29bd5,0x29c73,0x29c73,0x29cad,0x29cad,0x29d3e,0x29d3e,0x29d5a,0x29d5a,0x29d7c,0x29d7c,0x29d98,0x29d98,0x29d9b,0x29d9b,0x29df6,0x29df6,0x29e06,0x29e06,0x29e2d,0x29e2d,0x29e68,0x29e68,0x29eac,0x29eac,0x29eb0,0x29eb0,0x29ec3,0x29ec3,0x29ef8,0x29ef8,0x29f23,0x29f23,0x29f30,0x29f30,0x29fb7,0x29fb7,0x29fde,0x29fde,0x2a014,0x2a014,0x2a087,0x2a087,0x2a0b9,0x2a0b9,0x2a0e1,0x2a0e1,0x2a0ed,0x2a0ed,0x2a0f3,0x2a0f3,0x2a0f8,0x2a0f8,0x2a0fe,0x2a0fe,0x2a107,0x2a107,0x2a123,0x2a123,0x2a133,0x2a134,0x2a150,0x2a150,0x2a192,0x2a193,0x2a1ab,0x2a1ab,0x2a1b4,0x2a1b5,0x2a1df,0x2a1df,0x2a1f5,0x2a1f5,0x2a220,0x2a220,0x2a233,0x2a233,0x2a293,0x2a293,0x2a29f,0x2a29f,0x2a2b2,0x2a2b2,0x2a2b4,0x2a2b4,0x2a2b6,0x2a2b6,0x2a2ba,0x2a2ba,0x2a2bd,0x2a2bd,0x2a2df,0x2a2df,0x2a2ff,0x2a2ff,0x2a351,0x2a351,0x2a3a9,0x2a3a9,0x2a3ed,0x2a3ed,0x2a434,0x2a434,0x2a45b,0x2a45b,0x2a5c6,0x2a5c6,0x2a5cb,0x2a5cb,0x2a601,0x2a601,0x2a632,0x2a632,0x2a64a,0x2a64a,0x2a65b,0x2a65b,0x2a6a9,0x2a6a9,0x2adff,0x2adff,0x2d544,0x2d544,0x2f825,0x2f825,0x2f83b,0x2f83b,0x2f840,0x2f840,0x2f878,0x2f878,0x2f894,0x2f894,0x2f8a6,0x2f8a6,0x2f8cd,0x2f8cd,0x2f8db,0x2f8db,0x2f994,0x2f994,0x2f9b2,0x2f9b2,0x2f9bc,0x2f9bc,0x2f9d4,0x2f9d4,0x30ede,0x30ede,0x3106c,0x3106c,]),
-  NotoFont.fromFlatRanges('Noto Sans Hanunoo', 'https://fonts.gstatic.com/s/notosanshanunoo/v15/f0Xs0fCv8dxkDWlZSoXOj6CphMloFsEsEpgL_ix2.ttf', <int>[0x20,0x20,0xa0,0xa0,0x1720,0x1736,0x200b,0x200d,0x25cc,0x25cc,]),
-  NotoFont.fromFlatRanges('Noto Sans Hatran', 'https://fonts.gstatic.com/s/notosanshatran/v15/A2BBn4Ne0RgnVF3Lnko-0sOBIfL_mM83r1nwzDs.ttf', <int>[0x20,0x20,0xa0,0xa0,0x200c,0x200c,0x108e0,0x108f2,0x108f4,0x108f5,0x108fb,0x108ff,]),
-  NotoFont.fromFlatRanges('Noto Sans Hebrew', 'https://fonts.gstatic.com/s/notosanshebrew/v38/or3HQ7v33eiDljA1IufXTtVf7V6RvEEdhQlk0LlGxCyaeNKYZC0sqk3xXGiXd4qtoiJltutR2g.ttf', <int>[0x20,0x7e,0xa0,0xa3,0xa5,0xa5,0xa7,0xab,0xae,0xb0,0xb4,0xb4,0xb6,0xb8,0xba,0xbb,0xbf,0x107,0x10a,0x113,0x116,0x11b,0x11e,0x123,0x126,0x127,0x12a,0x12b,0x12e,0x133,0x136,0x137,0x139,0x13e,0x141,0x148,0x14a,0x14d,0x150,0x15b,0x15e,0x161,0x164,0x165,0x16a,0x17e,0x1cd,0x1ce,0x218,0x21b,0x237,0x237,0x2c6,0x2c7,0x2c9,0x2c9,0x2d8,0x2dd,0x300,0x304,0x306,0x308,0x30a,0x30c,0x312,0x312,0x326,0x328,0x34f,0x34f,0x591,0x5c7,0x5d0,0x5ea,0x5f0,0x5f4,0x1e80,0x1e85,0x1e9e,0x1e9e,0x1ef2,0x1ef3,0x200c,0x2010,0x2013,0x2014,0x2018,0x201a,0x201c,0x201e,0x2022,0x2022,0x2026,0x2026,0x2039,0x203a,0x20aa,0x20aa,0x20ac,0x20ac,0x2122,0x2122,0x2212,0x2212,0x25cc,0x25cc,0xfb1d,0xfb36,0xfb38,0xfb3c,0xfb3e,0xfb3e,0xfb40,0xfb41,0xfb43,0xfb44,0xfb46,0xfb4f,]),
-  NotoFont.fromFlatRanges('Noto Sans Imperial Aramaic', 'https://fonts.gstatic.com/s/notosansimperialaramaic/v15/a8IMNpjwKmHXpgXbMIsbTc_kvks91LlLetBr5itQrtdml3YfPNno.ttf', <int>[0x20,0x20,0xa0,0xa0,0x10840,0x10855,0x10857,0x1085f,]),
-  NotoFont.fromFlatRanges('Noto Sans Indic Siyaq Numbers', 'https://fonts.gstatic.com/s/notosansindicsiyaqnumbers/v15/6xK5dTJFKcWIu4bpRBjRZRpsIYHabOeZ8UZLubTzpXNHKx2WPOpVd5Iu.ttf', <int>[0x20,0x20,0xa0,0xa0,0x627,0x627,0x660,0x669,0x6f0,0x6f9,0x1ec71,0x1ecb4,]),
-  NotoFont.fromFlatRanges('Noto Sans Inscriptional Pahlavi', 'https://fonts.gstatic.com/s/notosansinscriptionalpahlavi/v15/ll8UK3GaVDuxR-TEqFPIbsR79Xxz9WEKbwsjpz7VklYlC7FCVtqVOAYK0QA.ttf', <int>[0x20,0x20,0xa0,0xa0,0x10b60,0x10b72,0x10b78,0x10b7f,]),
-  NotoFont.fromFlatRanges('Noto Sans Inscriptional Parthian', 'https://fonts.gstatic.com/s/notosansinscriptionalparthian/v15/k3k7o-IMPvpLmixcA63oYi-yStDkgXuXncL7dzfW3P4TAJ2yklBJ2jNkLlLr.ttf', <int>[0x20,0x20,0xa0,0xa0,0x10b40,0x10b55,0x10b58,0x10b5f,]),
-  NotoFont.fromFlatRanges('Noto Sans JP', 'https://fonts.gstatic.com/s/notosansjp/v42/-F62fjtqLzI2JPCgQBnw7HFowAIO2lZ9hg.otf', <int>[0x20,0x7e,0xa0,0x103,0x110,0x113,0x11a,0x11b,0x128,0x12b,0x143,0x144,0x147,0x148,0x14c,0x14f,0x152,0x153,0x168,0x16d,0x192,0x192,0x1a0,0x1a1,0x1af,0x1b0,0x1cd,0x1dc,0x1f8,0x1f9,0x251,0x251,0x261,0x261,0x2bb,0x2bb,0x2c7,0x2c7,0x2c9,0x2cb,0x2d9,0x2d9,0x2ea,0x2eb,0x300,0x301,0x304,0x304,0x307,0x307,0x30c,0x30c,0x391,0x3a1,0x3a3,0x3a9,0x3b1,0x3c9,0x401,0x401,0x410,0x44f,0x451,0x451,0x1e3e,0x1e3f,0x1ea0,0x1ef9,0x2002,0x2003,0x2010,0x2016,0x2018,0x201a,0x201c,0x201e,0x2020,0x2022,0x2025,0x2027,0x2030,0x2030,0x2032,0x2033,0x2035,0x2035,0x2039,0x203c,0x2042,0x2042,0x2047,0x2049,0x2051,0x2051,0x2074,0x2074,0x20a9,0x20a9,0x20ab,0x20ac,0x20dd,0x20de,0x2100,0x2100,0x2103,0x2103,0x2105,0x2105,0x2109,0x210a,0x210f,0x210f,0x2113,0x2113,0x2116,0x2116,0x2121,0x2122,0x2126,0x2127,0x212b,0x212b,0x212e,0x212e,0x2135,0x2135,0x213b,0x213b,0x2160,0x216b,0x2170,0x217b,0x2190,0x2199,0x21b8,0x21b9,0x21c4,0x21c6,0x21cb,0x21cc,0x21d0,0x21d0,0x21d2,0x21d2,0x21d4,0x21d4,0x21e6,0x21e9,0x21f5,0x21f5,0x2200,0x2200,0x2202,0x2203,0x2205,0x220b,0x220f,0x220f,0x2211,0x2213,0x2215,0x2215,0x221a,0x221a,0x221d,0x2220,0x2223,0x2223,0x2225,0x222e,0x2234,0x2237,0x223d,0x223d,0x2243,0x2243,0x2245,0x2245,0x2248,0x2248,0x224c,0x224c,0x2252,0x2252,0x2260,0x2262,0x2264,0x2267,0x226a,0x226b,0x226e,0x226f,0x2272,0x2273,0x2276,0x2277,0x2282,0x2287,0x228a,0x228b,0x2295,0x2299,0x22a0,0x22a0,0x22a5,0x22a5,0x22bf,0x22bf,0x22da,0x22db,0x22ef,0x22ef,0x2305,0x2307,0x2312,0x2312,0x2318,0x2318,0x2329,0x232a,0x23b0,0x23b1,0x23be,0x23cc,0x23ce,0x23ce,0x23da,0x23db,0x2423,0x2423,0x2460,0x25ab,0x25b1,0x25b3,0x25b6,0x25b7,0x25bc,0x25bd,0x25c0,0x25c1,0x25c6,0x25cc,0x25ce,0x25d3,0x25e2,0x25e6,0x25ef,0x25ef,0x2600,0x2603,0x2605,0x2606,0x2609,0x2609,0x260e,0x260f,0x2616,0x2617,0x261c,0x261f,0x262f,0x262f,0x2640,0x2642,0x2660,0x266f,0x2672,0x267d,0x26a0,0x26a0,0x26bd,0x26be,0x2702,0x2702,0x2713,0x2713,0x271a,0x271a,0x273d,0x273d,0x273f,0x2740,0x2756,0x2756,0x2776,0x2793,0x27a1,0x27a1,0x2934,0x2935,0x29bf,0x29bf,0x29fa,0x29fb,0x2b05,0x2b07,0x2b1a,0x2b1a,0x2b95,0x2b95,0x2e3a,0x2e3b,0x2e80,0x2e99,0x2e9b,0x2ef3,0x2f00,0x2fd5,0x2ff0,0x2ffb,0x3000,0x303f,0x3041,0x3096,0x3099,0x30ff,0x3105,0x312f,0x3131,0x3163,0x3165,0x318e,0x3190,0x31bb,0x31c0,0x31e3,0x31f0,0x321e,0x3220,0x332b,0x332d,0x33ff,0x3402,0x3402,0x3405,0x3406,0x3427,0x3427,0x342c,0x342c,0x342e,0x342e,0x3468,0x3468,0x346a,0x346a,0x3488,0x3488,0x3492,0x3492,0x34b5,0x34b5,0x34bc,0x34bc,0x34c1,0x34c1,0x34c7,0x34c7,0x34db,0x34db,0x351f,0x351f,0x353e,0x353e,0x355d,0x355e,0x3563,0x3563,0x356e,0x356e,0x35a6,0x35a6,0x35a8,0x35a8,0x35c5,0x35c5,0x35da,0x35da,0x35de,0x35de,0x35f4,0x35f4,0x3605,0x3605,0x3614,0x3614,0x364a,0x364a,0x3691,0x3691,0x3696,0x3696,0x3699,0x3699,0x36cf,0x36cf,0x3761,0x3762,0x376b,0x376c,0x3775,0x3775,0x378d,0x378d,0x37c1,0x37c1,0x37e2,0x37e2,0x37e8,0x37e8,0x37f4,0x37f4,0x37fd,0x37fd,0x3800,0x3800,0x382f,0x382f,0x3836,0x3836,0x3840,0x3840,0x385c,0x385c,0x3861,0x3861,0x38a1,0x38a1,0x38ad,0x38ad,0x38fa,0x38fa,0x3917,0x3917,0x391a,0x391a,0x396f,0x396f,0x39a4,0x39a4,0x39b8,0x39b8,0x3a5c,0x3a5c,0x3a6e,0x3a6e,0x3a73,0x3a73,0x3a85,0x3a85,0x3ac4,0x3ac4,0x3acb,0x3acb,0x3ad6,0x3ad7,0x3aea,0x3aea,0x3af3,0x3af3,0x3b0e,0x3b0e,0x3b1a,0x3b1a,0x3b1c,0x3b1c,0x3b22,0x3b22,0x3b35,0x3b35,0x3b6d,0x3b6d,0x3b77,0x3b77,0x3b87,0x3b88,0x3b8d,0x3b8d,0x3ba4,0x3ba4,0x3bb6,0x3bb6,0x3bc3,0x3bc3,0x3bcd,0x3bcd,0x3bf0,0x3bf0,0x3bf3,0x3bf3,0x3c0f,0x3c0f,0x3c26,0x3c26,0x3cc3,0x3cc3,0x3cd2,0x3cd2,0x3d11,0x3d11,0x3d1e,0x3d1e,0x3d31,0x3d31,0x3d4e,0x3d4e,0x3d64,0x3d64,0x3d9a,0x3d9a,0x3dc0,0x3dc0,0x3dcc,0x3dcc,0x3dd4,0x3dd4,0x3e05,0x3e05,0x3e3f,0x3e40,0x3e60,0x3e60,0x3e66,0x3e66,0x3e68,0x3e68,0x3e83,0x3e83,0x3e8a,0x3e8a,0x3e94,0x3e94,0x3eda,0x3eda,0x3f57,0x3f57,0x3f72,0x3f72,0x3f75,0x3f75,0x3f77,0x3f77,0x3fae,0x3fae,0x3fb1,0x3fb1,0x3fc9,0x3fc9,0x3fd7,0x3fd7,0x3fdc,0x3fdc,0x4039,0x4039,0x4058,0x4058,0x4093,0x4093,0x4103,0x4103,0x4105,0x4105,0x4148,0x4148,0x414f,0x414f,0x4163,0x4163,0x41b4,0x41b4,0x41bf,0x41bf,0x41e6,0x41e6,0x41ee,0x41ee,0x41f3,0x41f3,0x4207,0x4207,0x420e,0x420e,0x4264,0x4264,0x4293,0x4293,0x42c6,0x42c6,0x42d6,0x42d6,0x42dd,0x42dd,0x4302,0x4302,0x432b,0x432b,0x4343,0x4343,0x43ee,0x43ee,0x43f0,0x43f0,0x4408,0x4408,0x440c,0x440c,0x4417,0x4417,0x441c,0x441c,0x4422,0x4422,0x4453,0x4453,0x445b,0x445b,0x4476,0x4476,0x447a,0x447a,0x4491,0x4491,0x44b3,0x44b3,0x44be,0x44be,0x44d4,0x44d4,0x4508,0x4508,0x450d,0x450d,0x4525,0x4525,0x4543,0x4543,0x457a,0x457a,0x459d,0x459d,0x45b8,0x45b8,0x45be,0x45be,0x45e5,0x45e5,0x45ea,0x45ea,0x460f,0x4610,0x4641,0x4641,0x4665,0x4665,0x46a1,0x46a1,0x46ae,0x46af,0x470c,0x470c,0x471f,0x471f,0x4764,0x4764,0x47e6,0x47e6,0x47fd,0x47fd,0x4816,0x4816,0x481e,0x481e,0x4844,0x4844,0x484e,0x484e,0x48b5,0x48b5,0x49b0,0x49b0,0x49e7,0x49e7,0x49fa,0x49fa,0x4a04,0x4a04,0x4a29,0x4a29,0x4abc,0x4abc,0x4b38,0x4b38,0x4b3b,0x4b3b,0x4b7e,0x4b7e,0x4bc2,0x4bc2,0x4bca,0x4bca,0x4bd2,0x4bd2,0x4be8,0x4be8,0x4c17,0x4c17,0x4c20,0x4c20,0x4c38,0x4c38,0x4cc4,0x4cc4,0x4cd1,0x4cd1,0x4ce1,0x4ce1,0x4d07,0x4d07,0x4d77,0x4d77,0x4e00,0x4e05,0x4e07,0x4e12,0x4e14,0x4e19,0x4e1e,0x4e1f,0x4e21,0x4e21,0x4e23,0x4e24,0x4e26,0x4e26,0x4e28,0x4e32,0x4e35,0x4e39,0x4e3b,0x4e3c,0x4e3f,0x4e45,0x4e47,0x4e48,0x4e4b,0x4e4b,0x4e4d,0x4e4f,0x4e51,0x4e51,0x4e55,0x4e5f,0x4e62,0x4e63,0x4e68,0x4e69,0x4e71,0x4e71,0x4e73,0x4e75,0x4e79,0x4e79,0x4e7e,0x4e80,0x4e82,0x4e82,0x4e85,0x4e86,0x4e88,0x4e8e,0x4e91,0x4e92,0x4e94,0x4e99,0x4e9b,0x4ea2,0x4ea4,0x4ea6,0x4ea8,0x4ea8,0x4eab,0x4eb0,0x4eb3,0x4eb3,0x4eb6,0x4eb6,0x4eb9,0x4ebc,0x4ec0,0x4ec4,0x4ec6,0x4ec8,0x4eca,0x4ecb,0x4ecd,0x4ed0,0x4ed4,0x4edb,0x4edd,0x4ee5,0x4ee8,0x4ee8,0x4eeb,0x4eeb,0x4eed,0x4ef3,0x4ef5,0x4ef7,0x4efb,0x4f03,0x4f08,0x4f12,0x4f15,0x4f17,0x4f19,0x4f1a,0x4f1c,0x4f1d,0x4f2b,0x4f2b,0x4f2e,0x4f31,0x4f33,0x4f3e,0x4f40,0x4f40,0x4f42,0x4f43,0x4f46,0x4f49,0x4f4b,0x4f60,0x4f63,0x4f64,0x4f69,0x4f6a,0x4f6c,0x4f6c,0x4f6e,0x4f71,0x4f73,0x4f73,0x4f75,0x4f7f,0x4f81,0x4f86,0x4f88,0x4f94,0x4f96,0x4f9b,0x4f9d,0x4fa1,0x4fab,0x4fab,0x4fad,0x4faf,0x4fb2,0x4fb2,0x4fb5,0x4fb7,0x4fb9,0x4fb9,0x4fbb,0x4fc6,0x4fc8,0x4fd4,0x4fd7,0x4fd8,0x4fda,0x4fdd,0x4fdf,0x4fe6,0x4fee,0x4ff3,0x4ff5,0x4ff6,0x4ff8,0x4ff8,0x4ffa,0x4ffa,0x4ffc,0x5002,0x5004,0x5007,0x5009,0x5014,0x5016,0x501f,0x5021,0x502e,0x5030,0x5030,0x5032,0x5033,0x5035,0x5036,0x5039,0x5039,0x503b,0x503b,0x5040,0x5043,0x5045,0x504a,0x504c,0x504c,0x504e,0x5053,0x5055,0x5057,0x5059,0x505a,0x505c,0x505c,0x505f,0x5060,0x5062,0x5063,0x5065,0x5067,0x506a,0x506a,0x506c,0x506d,0x5070,0x5072,0x5074,0x5078,0x507d,0x507d,0x5080,0x5081,0x5083,0x5086,0x5088,0x5088,0x508a,0x508a,0x508d,0x5096,0x5098,0x509c,0x509e,0x50a3,0x50aa,0x50aa,0x50ac,0x50ad,0x50af,0x50b5,0x50b7,0x50b7,0x50b9,0x50bb,0x50bd,0x50be,0x50c0,0x50c0,0x50c2,0x50c5,0x50c7,0x50c7,0x50c9,0x50ca,0x50cc,0x50d1,0x50d3,0x50d6,0x50d8,0x50da,0x50dc,0x50df,0x50e1,0x50e9,0x50ed,0x50f6,0x50f9,0x50fb,0x50fe,0x50fe,0x5100,0x5104,0x5106,0x5109,0x510b,0x510e,0x5110,0x5110,0x5112,0x5112,0x5114,0x511f,0x5121,0x5121,0x5123,0x5123,0x5127,0x5128,0x512a,0x512a,0x512c,0x512d,0x512f,0x512f,0x5131,0x5135,0x5137,0x513c,0x513f,0x5150,0x5152,0x5155,0x5157,0x5158,0x515a,0x515a,0x515c,0x515c,0x515f,0x5160,0x5162,0x5162,0x5164,0x516e,0x5171,0x5171,0x5173,0x5179,0x517b,0x517c,0x517e,0x517e,0x5180,0x5180,0x5182,0x5186,0x5189,0x5193,0x5195,0x5199,0x519d,0x519d,0x51a0,0x51a6,0x51a8,0x51ad,0x51b0,0x51b8,0x51ba,0x51ba,0x51bc,0x51bf,0x51c2,0x51c6,0x51c8,0x51cd,0x51cf,0x51cf,0x51d1,0x51d6,0x51d8,0x51d8,0x51db,0x51e2,0x51e5,0x51e7,0x51e9,0x51ea,0x51ec,0x51ee,0x51f0,0x51fa,0x51fd,0x51fe,0x5200,0x5208,0x520a,0x520b,0x520e,0x520e,0x5211,0x5218,0x521d,0x521d,0x5222,0x5222,0x5224,0x522b,0x522e,0x522e,0x5230,0x5233,0x5235,0x523c,0x5243,0x5245,0x5247,0x5247,0x5249,0x524d,0x524f,0x524f,0x5254,0x5258,0x525a,0x5261,0x5263,0x5266,0x5269,0x526a,0x526c,0x526c,0x526e,0x5275,0x5277,0x5279,0x527d,0x527d,0x527f,0x5280,0x5282,0x5285,0x5287,0x528a,0x528c,0x528d,0x5291,0x5298,0x529a,0x529c,0x529f,0x52a0,0x52a3,0x52a7,0x52a9,0x52ad,0x52af,0x52b1,0x52b4,0x52be,0x52c0,0x52c1,0x52c3,0x52ca,0x52cc,0x52cd,0x52cf,0x52d2,0x52d4,0x52d9,0x52db,0x52ea,0x52ec,0x52ec,0x52f0,0x52fb,0x52fe,0x5303,0x5305,0x5308,0x530a,0x530d,0x530f,0x5311,0x5313,0x5313,0x5315,0x5321,0x5323,0x5325,0x5327,0x532d,0x532f,0x5333,0x5335,0x5335,0x5338,0x5343,0x5345,0x534d,0x5351,0x5354,0x5357,0x535c,0x535e,0x535e,0x5360,0x5361,0x5363,0x5367,0x5369,0x5369,0x536c,0x5375,0x5377,0x537b,0x537d,0x537f,0x5382,0x5384,0x5387,0x5389,0x538e,0x538e,0x5393,0x5394,0x5396,0x5396,0x5398,0x539a,0x539d,0x539d,0x539f,0x53a1,0x53a4,0x53a6,0x53a8,0x53ab,0x53ad,0x53b0,0x53b2,0x53b8,0x53ba,0x53bb,0x53bd,0x53bd,0x53c0,0x53c5,0x53c8,0x53cf,0x53d2,0x53d7,0x53d9,0x53db,0x53dd,0x53f8,0x53fa,0x53fa,0x5401,0x5404,0x5408,0x5413,0x541a,0x541b,0x541d,0x5421,0x5424,0x5424,0x5426,0x542f,0x5431,0x5431,0x5433,0x5436,0x5438,0x5439,0x543b,0x5440,0x5442,0x5444,0x5446,0x544a,0x544c,0x544f,0x5451,0x5451,0x5455,0x5455,0x545e,0x545f,0x5462,0x5462,0x5464,0x5464,0x5466,0x546e,0x5470,0x5471,0x5473,0x5477,0x547b,0x547d,0x547f,0x5481,0x5483,0x5486,0x5488,0x5492,0x5495,0x5496,0x549c,0x549c,0x549f,0x54a2,0x54a4,0x54af,0x54b1,0x54b3,0x54b7,0x54c4,0x54c6,0x54ca,0x54cd,0x54ce,0x54d8,0x54d8,0x54e0,0x54e2,0x54e5,0x54e6,0x54e8,0x54ea,0x54ec,0x54ef,0x54f1,0x54f3,0x54f6,0x54f6,0x54fa,0x54fa,0x54fc,0x5501,0x5504,0x5509,0x550c,0x5510,0x5514,0x5516,0x5527,0x5527,0x552a,0x552b,0x552e,0x552f,0x5531,0x5533,0x5535,0x5536,0x5538,0x5539,0x553b,0x553e,0x5540,0x5541,0x5544,0x5547,0x5549,0x554a,0x554c,0x554d,0x554f,0x5551,0x5553,0x5553,0x5556,0x5558,0x555a,0x555e,0x5560,0x5561,0x5563,0x5564,0x5566,0x5566,0x557b,0x5584,0x5586,0x558b,0x558e,0x558f,0x5591,0x5594,0x5597,0x559a,0x559c,0x559f,0x55a3,0x55a4,0x55a7,0x55ae,0x55b0,0x55b0,0x55b2,0x55b2,0x55b6,0x55b6,0x55bf,0x55bf,0x55c1,0x55c1,0x55c3,0x55c7,0x55c9,0x55c9,0x55cb,0x55cc,0x55ce,0x55ce,0x55d1,0x55d4,0x55d7,0x55d8,0x55da,0x55df,0x55e2,0x55e4,0x55e9,0x55e9,0x55ec,0x55ec,0x55ee,0x55ee,0x55f1,0x55f1,0x55f6,0x55f9,0x55fd,0x55ff,0x5605,0x560a,0x560d,0x5612,0x5614,0x5614,0x5616,0x5619,0x561b,0x561b,0x5620,0x5620,0x5628,0x5629,0x562c,0x562c,0x562f,0x5639,0x563b,0x563d,0x563f,0x5644,0x5646,0x5647,0x5649,0x5649,0x564b,0x5650,0x5653,0x5654,0x565b,0x565b,0x565e,0x565e,0x5660,0x5664,0x5666,0x5666,0x5668,0x566d,0x566f,0x566f,0x5671,0x5672,0x5674,0x5676,0x5678,0x5678,0x567a,0x567a,0x5680,0x5680,0x5684,0x5688,0x568a,0x568c,0x568f,0x568f,0x5694,0x5695,0x5699,0x569a,0x569d,0x56a0,0x56a2,0x56a2,0x56a5,0x56a9,0x56ab,0x56ae,0x56b1,0x56b4,0x56b6,0x56b7,0x56bc,0x56bc,0x56be,0x56be,0x56c0,0x56c3,0x56c5,0x56c5,0x56c8,0x56d1,0x56d3,0x56d3,0x56d7,0x56e1,0x56e3,0x56e8,0x56eb,0x56eb,0x56ed,0x56ee,0x56f0,0x56f3,0x56f6,0x56f7,0x56f9,0x56fa,0x56fd,0x56fd,0x56ff,0x5704,0x5707,0x570d,0x570f,0x570f,0x5711,0x5713,0x5715,0x5716,0x5718,0x5718,0x571a,0x571d,0x571f,0x572a,0x572c,0x5730,0x5733,0x5734,0x5737,0x5738,0x573b,0x573b,0x573d,0x5740,0x5742,0x5742,0x5745,0x5747,0x574a,0x574a,0x574c,0x5752,0x5759,0x5759,0x575f,0x575f,0x5761,0x5762,0x5764,0x576b,0x576d,0x5771,0x5773,0x5775,0x5777,0x5777,0x5779,0x577c,0x577e,0x577f,0x5781,0x5783,0x5788,0x5789,0x578b,0x578c,0x5793,0x5795,0x5797,0x5797,0x5799,0x579a,0x579c,0x57a4,0x57a7,0x57aa,0x57ac,0x57ac,0x57ae,0x57ae,0x57b0,0x57b0,0x57b3,0x57b3,0x57b8,0x57b8,0x57bd,0x57bd,0x57c0,0x57c0,0x57c3,0x57c3,0x57c6,0x57c8,0x57cb,0x57cc,0x57ce,0x57cf,0x57d2,0x57d7,0x57dc,0x57e1,0x57e3,0x57e4,0x57e6,0x57e7,0x57e9,0x57e9,0x57ed,0x57ed,0x57f0,0x57f0,0x57f4,0x5800,0x5802,0x5806,0x5808,0x580d,0x5815,0x5815,0x5819,0x5819,0x581b,0x581b,0x581d,0x5821,0x5824,0x5824,0x5826,0x5827,0x582a,0x582a,0x582d,0x582d,0x582f,0x5832,0x5834,0x5835,0x5839,0x583a,0x583d,0x583d,0x583f,0x5841,0x5849,0x584d,0x584f,0x5852,0x5854,0x5855,0x5857,0x585a,0x585e,0x585f,0x5861,0x5862,0x5864,0x5864,0x5867,0x5869,0x586b,0x586b,0x586d,0x586d,0x5870,0x5870,0x5872,0x5872,0x5875,0x5875,0x5878,0x5879,0x587c,0x587c,0x587e,0x5881,0x5883,0x5883,0x5885,0x5885,0x5887,0x588d,0x588f,0x5890,0x5893,0x5894,0x5896,0x5898,0x589c,0x58a2,0x58a6,0x58a6,0x58a8,0x58ab,0x58ae,0x58ae,0x58b1,0x58b3,0x58b8,0x58bc,0x58be,0x58be,0x58c1,0x58c5,0x58c7,0x58c8,0x58ca,0x58ca,0x58cc,0x58ce,0x58d0,0x58da,0x58dc,0x58e2,0x58e4,0x58e5,0x58e9,0x58e9,0x58eb,0x58ec,0x58ee,0x58f4,0x58f7,0x58f7,0x58f9,0x58fd,0x5902,0x5902,0x5905,0x5906,0x5909,0x590d,0x590f,0x5910,0x5912,0x5916,0x5918,0x591d,0x591f,0x591f,0x5921,0x5925,0x5927,0x5933,0x5935,0x5939,0x593d,0x593f,0x5943,0x5944,0x5946,0x5949,0x594e,0x5955,0x5957,0x595b,0x595d,0x5963,0x5965,0x5965,0x5967,0x596f,0x5972,0x5976,0x5978,0x5979,0x597b,0x597d,0x5981,0x5984,0x598a,0x598e,0x5992,0x5993,0x5995,0x5997,0x5999,0x5999,0x599b,0x599b,0x599d,0x599d,0x599f,0x599f,0x59a3,0x59a5,0x59a7,0x59a8,0x59ac,0x59b0,0x59b2,0x59b3,0x59b7,0x59b7,0x59b9,0x59bc,0x59be,0x59be,0x59c1,0x59c1,0x59c3,0x59c4,0x59c6,0x59c6,0x59c8,0x59cb,0x59cd,0x59cd,0x59d0,0x59d4,0x59d9,0x59da,0x59dc,0x59df,0x59e3,0x59e8,0x59ea,0x59ec,0x59ee,0x59ef,0x59f1,0x59f2,0x59f4,0x59f4,0x59f6,0x59f8,0x59fb,0x59fb,0x59ff,0x5a01,0x5a03,0x5a04,0x5a09,0x5a09,0x5a0c,0x5a0e,0x5a11,0x5a13,0x5a17,0x5a18,0x5a1a,0x5a1c,0x5a1e,0x5a20,0x5a23,0x5a25,0x5a27,0x5a2a,0x5a2d,0x5a2d,0x5a2f,0x5a30,0x5a35,0x5a36,0x5a3c,0x5a3c,0x5a40,0x5a41,0x5a44,0x5a49,0x5a4c,0x5a4c,0x5a50,0x5a50,0x5a55,0x5a55,0x5a5a,0x5a5a,0x5a5e,0x5a5e,0x5a62,0x5a63,0x5a65,0x5a67,0x5a6a,0x5a6a,0x5a6c,0x5a6d,0x5a77,0x5a77,0x5a7a,0x5a7b,0x5a7e,0x5a7f,0x5a84,0x5a84,0x5a8b,0x5a8b,0x5a90,0x5a90,0x5a92,0x5a93,0x5a96,0x5a96,0x5a99,0x5a9c,0x5a9e,0x5aa0,0x5aa2,0x5aa2,0x5aa7,0x5aa7,0x5aac,0x5aac,0x5ab1,0x5ab3,0x5ab5,0x5ab5,0x5ab8,0x5ab8,0x5aba,0x5abf,0x5ac1,0x5ac2,0x5ac4,0x5ac4,0x5ac6,0x5ac6,0x5ac8,0x5ac9,0x5acb,0x5acc,0x5acf,0x5ad0,0x5ad6,0x5ad7,0x5ada,0x5ada,0x5adc,0x5adc,0x5ae0,0x5ae1,0x5ae3,0x5ae3,0x5ae5,0x5ae6,0x5ae9,0x5aea,0x5aee,0x5aee,0x5af0,0x5af0,0x5af5,0x5af6,0x5afa,0x5afb,0x5afd,0x5afd,0x5b00,0x5b01,0x5b08,0x5b09,0x5b0b,0x5b0c,0x5b16,0x5b17,0x5b19,0x5b19,0x5b1b,0x5b1b,0x5b1d,0x5b1d,0x5b21,0x5b22,0x5b25,0x5b25,0x5b2a,0x5b2a,0x5b2c,0x5b2d,0x5b30,0x5b30,0x5b32,0x5b32,0x5b34,0x5b34,0x5b36,0x5b36,0x5b38,0x5b38,0x5b3e,0x5b3e,0x5b40,0x5b41,0x5b43,0x5b43,0x5b45,0x5b45,0x5b4b,0x5b4c,0x5b50,0x5b52,0x5b54,0x5b58,0x5b5a,0x5b5f,0x5b63,0x5b66,0x5b68,0x5b69,0x5b6b,0x5b6b,0x5b6e,0x5b71,0x5b73,0x5b73,0x5b75,0x5b76,0x5b78,0x5b78,0x5b7a,0x5b7a,0x5b7c,0x5b91,0x5b93,0x5b9d,0x5b9f,0x5b9f,0x5ba2,0x5ba6,0x5ba8,0x5ba9,0x5bac,0x5bba,0x5bbc,0x5bbc,0x5bbf,0x5bc7,0x5bc9,0x5bc9,0x5bcc,0x5bd0,0x5bd2,0x5bd4,0x5bd6,0x5bdb,0x5bdd,0x5be2,0x5be4,0x5be9,0x5beb,0x5bec,0x5bee,0x5bf1,0x5bf3,0x5bf6,0x5bf8,0x5bf8,0x5bfa,0x5bfa,0x5bfd,0x5bff,0x5c01,0x5c0f,0x5c11,0x5c14,0x5c16,0x5c17,0x5c19,0x5c1a,0x5c1e,0x5c20,0x5c22,0x5c24,0x5c26,0x5c26,0x5c28,0x5c2e,0x5c30,0x5c32,0x5c35,0x5c36,0x5c38,0x5c41,0x5c45,0x5c46,0x5c48,0x5c48,0x5c4a,0x5c4b,0x5c4d,0x5c51,0x5c53,0x5c53,0x5c55,0x5c55,0x5c59,0x5c5c,0x5c5e,0x5c65,0x5c67,0x5c69,0x5c6c,0x5c71,0x5c74,0x5c76,0x5c79,0x5c7d,0x5c87,0x5c88,0x5c8a,0x5c8a,0x5c8c,0x5c8c,0x5c8f,0x5c92,0x5c94,0x5c94,0x5c9d,0x5c9d,0x5c9f,0x5ca3,0x5ca6,0x5cad,0x5cb1,0x5cb8,0x5cba,0x5cbc,0x5cbe,0x5cbe,0x5cc5,0x5cc5,0x5cc7,0x5cc7,0x5cc9,0x5cc9,0x5ccb,0x5ccb,0x5cd0,0x5cd0,0x5cd2,0x5cd2,0x5cd7,0x5cd7,0x5cd9,0x5cd9,0x5cdd,0x5cdd,0x5ce0,0x5ce1,0x5ce6,0x5ce6,0x5ce8,0x5cea,0x5ced,0x5cf2,0x5cf4,0x5cf6,0x5cfa,0x5cfb,0x5cfd,0x5cfd,0x5d01,0x5d01,0x5d06,0x5d07,0x5d0b,0x5d0b,0x5d0d,0x5d0e,0x5d10,0x5d12,0x5d14,0x5d1b,0x5d1d,0x5d1d,0x5d1f,0x5d20,0x5d22,0x5d24,0x5d26,0x5d27,0x5d29,0x5d29,0x5d2b,0x5d2b,0x5d31,0x5d31,0x5d34,0x5d34,0x5d39,0x5d39,0x5d3d,0x5d3d,0x5d3f,0x5d3f,0x5d42,0x5d43,0x5d46,0x5d48,0x5d4a,0x5d4c,0x5d4e,0x5d4e,0x5d50,0x5d53,0x5d55,0x5d55,0x5d59,0x5d59,0x5d5c,0x5d5c,0x5d5f,0x5d62,0x5d64,0x5d64,0x5d69,0x5d6a,0x5d6c,0x5d6d,0x5d6f,0x5d70,0x5d73,0x5d73,0x5d76,0x5d76,0x5d79,0x5d7a,0x5d7e,0x5d7f,0x5d81,0x5d84,0x5d87,0x5d88,0x5d8a,0x5d8c,0x5d90,0x5d90,0x5d92,0x5d95,0x5d97,0x5d97,0x5d99,0x5d99,0x5d9b,0x5d9b,0x5d9d,0x5d9d,0x5d9f,0x5da0,0x5da2,0x5da2,0x5da4,0x5da4,0x5da7,0x5da7,0x5dab,0x5dac,0x5dae,0x5dae,0x5db0,0x5db0,0x5db2,0x5db2,0x5db4,0x5db4,0x5db7,0x5dba,0x5dbc,0x5dbd,0x5dc3,0x5dc3,0x5dc7,0x5dc7,0x5dc9,0x5dc9,0x5dcb,0x5dce,0x5dd0,0x5dd3,0x5dd6,0x5dd9,0x5ddb,0x5ddb,0x5ddd,0x5dde,0x5de0,0x5de9,0x5deb,0x5deb,0x5dee,0x5dee,0x5df1,0x5df5,0x5df7,0x5df9,0x5dfb,0x5dfb,0x5dfd,0x5e00,0x5e02,0x5e03,0x5e06,0x5e07,0x5e0b,0x5e0d,0x5e11,0x5e12,0x5e14,0x5e16,0x5e18,0x5e1b,0x5e1d,0x5e1d,0x5e1f,0x5e20,0x5e25,0x5e25,0x5e28,0x5e28,0x5e2b,0x5e2b,0x5e2d,0x5e30,0x5e32,0x5e33,0x5e35,0x5e38,0x5e3d,0x5e3e,0x5e40,0x5e40,0x5e43,0x5e45,0x5e47,0x5e47,0x5e49,0x5e49,0x5e4b,0x5e4c,0x5e4e,0x5e4e,0x5e50,0x5e51,0x5e54,0x5e58,0x5e5b,0x5e5c,0x5e5e,0x5e5f,0x5e61,0x5e64,0x5e68,0x5e68,0x5e6a,0x5e6e,0x5e70,0x5e70,0x5e72,0x5e81,0x5e83,0x5e84,0x5e87,0x5e87,0x5e8a,0x5e8b,0x5e8e,0x5e8f,0x5e95,0x5e97,0x5e99,0x5e9a,0x5e9c,0x5e9c,0x5ea0,0x5ea0,0x5ea2,0x5ea2,0x5ea4,0x5ea8,0x5eaa,0x5ead,0x5eb1,0x5eb1,0x5eb3,0x5eb3,0x5eb5,0x5eb9,0x5ebd,0x5ebf,0x5ec1,0x5ec3,0x5ec6,0x5ec6,0x5ec8,0x5ecc,0x5ece,0x5ed6,0x5ed9,0x5ee3,0x5ee5,0x5ee5,0x5ee8,0x5ee9,0x5eeb,0x5eec,0x5ef0,0x5ef1,0x5ef3,0x5ef4,0x5ef6,0x5f04,0x5f06,0x5f11,0x5f13,0x5f19,0x5f1b,0x5f1f,0x5f21,0x5f29,0x5f2b,0x5f31,0x5f34,0x5f38,0x5f3a,0x5f41,0x5f44,0x5f45,0x5f47,0x5f48,0x5f4a,0x5f4a,0x5f4c,0x5f4e,0x5f50,0x5f51,0x5f53,0x5f54,0x5f56,0x5f59,0x5f5b,0x5f5d,0x5f60,0x5f67,0x5f69,0x5f6d,0x5f6f,0x5f75,0x5f77,0x5f7a,0x5f7c,0x5f85,0x5f87,0x5f8d,0x5f8f,0x5f93,0x5f96,0x5f99,0x5f9c,0x5f9e,0x5fa0,0x5fa2,0x5fa4,0x5fa4,0x5fa7,0x5fb1,0x5fb3,0x5fb5,0x5fb7,0x5fb9,0x5fbc,0x5fbd,0x5fc3,0x5fc5,0x5fc7,0x5fc9,0x5fcb,0x5fcd,0x5fd0,0x5fd4,0x5fd6,0x5fd9,0x5fdc,0x5fde,0x5fe0,0x5fe2,0x5fe4,0x5fe4,0x5fe8,0x5ff3,0x5ff5,0x5ff6,0x5ff8,0x5ff8,0x5ffa,0x5ffd,0x5fff,0x5fff,0x6007,0x6007,0x600a,0x600a,0x600d,0x6010,0x6012,0x601d,0x601f,0x6022,0x6024,0x602b,0x602d,0x602d,0x602f,0x602f,0x6031,0x6031,0x6033,0x6033,0x6035,0x6035,0x603a,0x603a,0x6040,0x6043,0x6046,0x604d,0x6050,0x6052,0x6054,0x6057,0x6059,0x605a,0x605d,0x605d,0x605f,0x6065,0x6067,0x606d,0x606f,0x6071,0x6075,0x6075,0x6077,0x6077,0x607e,0x607f,0x6081,0x6086,0x6088,0x608e,0x6091,0x6098,0x609a,0x609b,0x609d,0x60a0,0x60a2,0x60aa,0x60b0,0x60b8,0x60bb,0x60be,0x60c2,0x60c2,0x60c4,0x60cb,0x60ce,0x60cf,0x60d1,0x60d1,0x60d3,0x60d5,0x60d8,0x60e3,0x60e5,0x60e5,0x60e7,0x60e8,0x60ee,0x60ee,0x60f0,0x60fd,0x6100,0x6103,0x6106,0x610a,0x610c,0x6117,0x6119,0x611c,0x611e,0x6122,0x6127,0x6128,0x612a,0x612c,0x6130,0x6131,0x6134,0x6137,0x6139,0x613a,0x613c,0x613f,0x6141,0x6142,0x6144,0x614e,0x6153,0x6153,0x6155,0x6155,0x6158,0x615a,0x615d,0x6160,0x6162,0x6165,0x6167,0x6168,0x616b,0x616c,0x616e,0x6178,0x617b,0x6184,0x6187,0x6187,0x618a,0x618b,0x618d,0x618e,0x6190,0x6194,0x6196,0x619a,0x619c,0x619d,0x619f,0x61a0,0x61a4,0x61a5,0x61a7,0x61ae,0x61b2,0x61b2,0x61b6,0x61b6,0x61b8,0x61ba,0x61bc,0x61bc,0x61be,0x61be,0x61c0,0x61c3,0x61c6,0x61d0,0x61d5,0x61d5,0x61dc,0x61df,0x61e1,0x61e3,0x61e5,0x61e9,0x61ec,0x61ed,0x61ef,0x61ef,0x61f2,0x61f2,0x61f4,0x61f8,0x61fa,0x61fa,0x61fc,0x6201,0x6203,0x6204,0x6207,0x620a,0x620c,0x620e,0x6210,0x6216,0x621a,0x6223,0x6226,0x6227,0x6229,0x622b,0x622e,0x6234,0x6236,0x6236,0x6238,0x6239,0x623b,0x623b,0x623d,0x6244,0x6246,0x6249,0x624b,0x624e,0x6250,0x6256,0x6258,0x6258,0x625a,0x625c,0x625e,0x625e,0x6260,0x6261,0x6263,0x6264,0x6268,0x6268,0x626d,0x626f,0x6271,0x6271,0x6273,0x6273,0x6276,0x6276,0x6279,0x6280,0x6282,0x6285,0x6289,0x628a,0x628d,0x6299,0x629b,0x629c,0x629e,0x629e,0x62a6,0x62a6,0x62a8,0x62a8,0x62ab,0x62ac,0x62b1,0x62b1,0x62b3,0x62b3,0x62b5,0x62b7,0x62b9,0x62bf,0x62c2,0x62c2,0x62c4,0x62ca,0x62cc,0x62dd,0x62e0,0x62e1,0x62ea,0x62ea,0x62ec,0x62ef,0x62f1,0x62f7,0x62fc,0x62ff,0x6301,0x6304,0x6307,0x630d,0x6310,0x6311,0x6313,0x6313,0x6316,0x6316,0x6318,0x6319,0x631b,0x631b,0x631f,0x631f,0x6327,0x632b,0x632d,0x632d,0x632f,0x632f,0x6332,0x6332,0x6335,0x6336,0x6339,0x633f,0x6341,0x6344,0x6346,0x6346,0x6349,0x6350,0x6352,0x6355,0x6357,0x6359,0x635b,0x635c,0x6365,0x6369,0x636b,0x636e,0x6371,0x6372,0x6374,0x6378,0x637a,0x637d,0x637f,0x6380,0x6382,0x6384,0x6387,0x638a,0x638c,0x638c,0x638e,0x6390,0x6392,0x6392,0x6394,0x6396,0x6398,0x639b,0x639e,0x63af,0x63b2,0x63b2,0x63b4,0x63b5,0x63bb,0x63bb,0x63bd,0x63be,0x63c0,0x63c1,0x63c3,0x63c6,0x63c8,0x63c9,0x63ce,0x63d6,0x63da,0x63dc,0x63e0,0x63e1,0x63e3,0x63e3,0x63e5,0x63e5,0x63e9,0x63ee,0x63f2,0x63fa,0x6406,0x6406,0x6409,0x640a,0x640d,0x640d,0x640f,0x6410,0x6412,0x6414,0x6416,0x6418,0x641c,0x641c,0x641e,0x641e,0x6420,0x6420,0x6422,0x6422,0x6424,0x6426,0x6428,0x642a,0x642c,0x642d,0x642f,0x6430,0x6434,0x6436,0x643a,0x643a,0x643d,0x643f,0x6442,0x6442,0x644b,0x644b,0x644e,0x644f,0x6451,0x6454,0x6458,0x6458,0x645a,0x645d,0x645f,0x6461,0x6463,0x6463,0x6467,0x6467,0x6469,0x6469,0x646d,0x646d,0x646f,0x646f,0x6473,0x6474,0x6476,0x6476,0x6478,0x647b,0x647d,0x647d,0x6483,0x6483,0x6485,0x6485,0x6487,0x6488,0x648f,0x6493,0x6495,0x6495,0x6498,0x649b,0x649d,0x649f,0x64a1,0x64a1,0x64a3,0x64a6,0x64a8,0x64a9,0x64ab,0x64ae,0x64b0,0x64b0,0x64b2,0x64b3,0x64b9,0x64b9,0x64bb,0x64bf,0x64c1,0x64c2,0x64c4,0x64c5,0x64c7,0x64c7,0x64c9,0x64ce,0x64d0,0x64d2,0x64d4,0x64d5,0x64d7,0x64d8,0x64da,0x64da,0x64e0,0x64e7,0x64e9,0x64ea,0x64ec,0x64ed,0x64ef,0x64f2,0x64f4,0x64f7,0x64fa,0x64fb,0x64fd,0x6501,0x6504,0x6505,0x6508,0x650a,0x650f,0x650f,0x6513,0x6514,0x6516,0x6516,0x6518,0x6519,0x651b,0x651f,0x6522,0x6524,0x6526,0x6526,0x6529,0x652c,0x652e,0x652f,0x6531,0x6532,0x6534,0x653f,0x6543,0x6545,0x6547,0x6549,0x654d,0x6552,0x6554,0x6559,0x655d,0x6560,0x6562,0x6563,0x6566,0x6567,0x656b,0x656c,0x6570,0x6570,0x6572,0x6572,0x6574,0x6575,0x6577,0x6578,0x657a,0x657a,0x657d,0x657d,0x6581,0x6585,0x6587,0x658a,0x658c,0x658c,0x658e,0x658e,0x6590,0x6592,0x6595,0x6595,0x6597,0x6599,0x659b,0x659d,0x659f,0x65a1,0x65a3,0x65a7,0x65ab,0x65b0,0x65b2,0x65b5,0x65b7,0x65b9,0x65bc,0x65bf,0x65c1,0x65c6,0x65c8,0x65c9,0x65cb,0x65cc,0x65ce,0x65d0,0x65d2,0x65d2,0x65d4,0x65d4,0x65d6,0x65d9,0x65db,0x65db,0x65df,0x65e3,0x65e5,0x65e9,0x65ec,0x65ed,0x65f0,0x65f2,0x65f4,0x65f5,0x65f9,0x65fc,0x65fe,0x6600,0x6602,0x6604,0x6606,0x660a,0x660c,0x660f,0x6611,0x6616,0x661c,0x6631,0x6633,0x6637,0x6639,0x663c,0x663f,0x6646,0x6648,0x664c,0x664e,0x664f,0x6651,0x6652,0x6657,0x6670,0x6673,0x667c,0x667e,0x6681,0x6683,0x6684,0x6687,0x6689,0x668b,0x668e,0x6690,0x6692,0x6696,0x669d,0x669f,0x66a0,0x66a2,0x66a2,0x66a4,0x66a4,0x66a6,0x66a6,0x66ab,0x66ab,0x66ad,0x66ae,0x66b1,0x66b5,0x66b8,0x66b9,0x66bb,0x66bc,0x66be,0x66c4,0x66c6,0x66c9,0x66cc,0x66cc,0x66ce,0x66cf,0x66d4,0x66d4,0x66d6,0x66d6,0x66d9,0x66dd,0x66df,0x66e0,0x66e6,0x66e6,0x66e8,0x66e9,0x66eb,0x66ec,0x66ee,0x66ee,0x66f0,0x66f0,0x66f2,0x66f5,0x66f7,0x6701,0x6703,0x6703,0x6705,0x6705,0x6707,0x6709,0x670b,0x6710,0x6712,0x6717,0x6719,0x6719,0x671b,0x6720,0x6722,0x6722,0x6725,0x6728,0x672a,0x672e,0x6731,0x6731,0x6733,0x6738,0x673a,0x673a,0x673d,0x673f,0x6741,0x6741,0x6743,0x6743,0x6745,0x6749,0x674c,0x6751,0x6753,0x6756,0x6759,0x6759,0x675c,0x6766,0x676a,0x676a,0x676c,0x6777,0x677b,0x677c,0x677e,0x6781,0x6784,0x6785,0x6787,0x6787,0x6789,0x6789,0x678b,0x678c,0x678e,0x6793,0x6795,0x679d,0x67a0,0x67a2,0x67a4,0x67a4,0x67a6,0x67a6,0x67a9,0x67a9,0x67af,0x67b9,0x67bb,0x67be,0x67c0,0x67c6,0x67c8,0x67ca,0x67ce,0x67d4,0x67d7,0x67de,0x67e1,0x67e2,0x67e4,0x67e4,0x67e6,0x67e7,0x67e9,0x67e9,0x67ec,0x67ec,0x67ee,0x67f7,0x67f9,0x67fc,0x67fe,0x67ff,0x6801,0x6805,0x6810,0x6810,0x6813,0x6814,0x6816,0x6819,0x681d,0x681f,0x6821,0x6822,0x6827,0x682d,0x682f,0x6834,0x6838,0x6839,0x683b,0x6846,0x6848,0x684a,0x684c,0x684e,0x6850,0x6855,0x6857,0x6859,0x685b,0x685d,0x685f,0x685f,0x6863,0x6863,0x6867,0x6867,0x686b,0x686b,0x686e,0x6872,0x6874,0x6877,0x6879,0x687c,0x687e,0x687f,0x6881,0x6886,0x6888,0x6888,0x688d,0x6890,0x6893,0x6894,0x6896,0x689d,0x689f,0x68a3,0x68a5,0x68ab,0x68ad,0x68b6,0x68b9,0x68bc,0x68c3,0x68c6,0x68c8,0x68cd,0x68cf,0x68da,0x68dc,0x68dd,0x68df,0x68e1,0x68e3,0x68e5,0x68e7,0x68e8,0x68ea,0x68f2,0x68f5,0x68f7,0x68f9,0x68fd,0x6900,0x6901,0x6903,0x6913,0x6916,0x6917,0x6919,0x691c,0x6921,0x6923,0x6925,0x6926,0x6928,0x6928,0x692a,0x692a,0x6930,0x6931,0x6933,0x6936,0x6938,0x6939,0x693b,0x693b,0x693d,0x693d,0x693f,0x693f,0x6942,0x6942,0x6945,0x6946,0x6949,0x694a,0x694e,0x694e,0x6953,0x6955,0x6957,0x6957,0x6959,0x695e,0x6960,0x6966,0x6968,0x6975,0x6977,0x6982,0x6986,0x6986,0x698a,0x698a,0x698d,0x698e,0x6991,0x6992,0x6994,0x6996,0x6998,0x6998,0x699b,0x699c,0x69a0,0x69a1,0x69a5,0x69a8,0x69ab,0x69ab,0x69ad,0x69b2,0x69b4,0x69b4,0x69b7,0x69b8,0x69ba,0x69bc,0x69be,0x69c1,0x69c3,0x69c3,0x69c5,0x69c5,0x69c7,0x69c8,0x69ca,0x69d1,0x69d3,0x69d3,0x69d6,0x69d9,0x69dd,0x69de,0x69e2,0x69e3,0x69e5,0x69e5,0x69e7,0x69eb,0x69ed,0x69ef,0x69f1,0x69f6,0x69f9,0x69f9,0x69fb,0x69fb,0x69fd,0x6a03,0x6a05,0x6a05,0x6a0a,0x6a0c,0x6a0f,0x6a0f,0x6a11,0x6a15,0x6a17,0x6a17,0x6a19,0x6a1b,0x6a1d,0x6a24,0x6a28,0x6a2b,0x6a2e,0x6a2e,0x6a30,0x6a30,0x6a32,0x6a3b,0x6a3d,0x6a3f,0x6a44,0x6a4b,0x6a4e,0x6a4e,0x6a50,0x6a52,0x6a54,0x6a56,0x6a58,0x6a59,0x6a5b,0x6a5b,0x6a5f,0x6a5f,0x6a61,0x6a62,0x6a64,0x6a64,0x6a66,0x6a67,0x6a6a,0x6a6b,0x6a71,0x6a73,0x6a78,0x6a78,0x6a7a,0x6a7a,0x6a7e,0x6a81,0x6a83,0x6a84,0x6a86,0x6a87,0x6a89,0x6a89,0x6a8b,0x6a8b,0x6a8d,0x6a8e,0x6a90,0x6a91,0x6a94,0x6a94,0x6a97,0x6a97,0x6a9b,0x6aa3,0x6aa5,0x6aa5,0x6aaa,0x6aac,0x6aae,0x6ab1,0x6ab3,0x6ab4,0x6ab8,0x6ab8,0x6abb,0x6abb,0x6abd,0x6abf,0x6ac1,0x6ac3,0x6ac6,0x6ac6,0x6ac8,0x6ac9,0x6acc,0x6acc,0x6ad0,0x6ad1,0x6ad3,0x6ad6,0x6ada,0x6adf,0x6ae2,0x6ae2,0x6ae4,0x6ae4,0x6ae7,0x6ae8,0x6aea,0x6aea,0x6aec,0x6aec,0x6af0,0x6af3,0x6af8,0x6af8,0x6afa,0x6afd,0x6b02,0x6b07,0x6b09,0x6b0b,0x6b0f,0x6b12,0x6b16,0x6b17,0x6b1b,0x6b1b,0x6b1d,0x6b21,0x6b23,0x6b24,0x6b27,0x6b28,0x6b2b,0x6b2c,0x6b2f,0x6b2f,0x6b32,0x6b32,0x6b35,0x6b3b,0x6b3d,0x6b3f,0x6b43,0x6b43,0x6b46,0x6b47,0x6b49,0x6b4a,0x6b4c,0x6b4e,0x6b50,0x6b50,0x6b52,0x6b54,0x6b56,0x6b56,0x6b58,0x6b59,0x6b5b,0x6b5b,0x6b5d,0x6b5d,0x6b5f,0x6b67,0x6b69,0x6b6c,0x6b6e,0x6b70,0x6b72,0x6b75,0x6b77,0x6b7b,0x6b7d,0x6b86,0x6b89,0x6b8b,0x6b8d,0x6b8d,0x6b95,0x6b98,0x6b9b,0x6b9b,0x6b9e,0x6ba0,0x6ba2,0x6ba4,0x6ba8,0x6bb5,0x6bb7,0x6bc0,0x6bc3,0x6bc9,0x6bcb,0x6bcf,0x6bd2,0x6bd4,0x6bd6,0x6bd8,0x6bda,0x6bdb,0x6bdf,0x6bdf,0x6be1,0x6be1,0x6be3,0x6be3,0x6be6,0x6be7,0x6beb,0x6bec,0x6bee,0x6bef,0x6bf1,0x6bf1,0x6bf3,0x6bf3,0x6bf7,0x6bf7,0x6bf9,0x6bf9,0x6bff,0x6bff,0x6c02,0x6c02,0x6c04,0x6c05,0x6c08,0x6c0a,0x6c0d,0x6c14,0x6c17,0x6c17,0x6c19,0x6c19,0x6c1b,0x6c1b,0x6c1f,0x6c1f,0x6c23,0x6c24,0x6c26,0x6c28,0x6c2c,0x6c2c,0x6c2e,0x6c2e,0x6c33,0x6c38,0x6c3a,0x6c3b,0x6c3e,0x6c42,0x6c4a,0x6c4b,0x6c4d,0x6c50,0x6c52,0x6c52,0x6c54,0x6c55,0x6c57,0x6c57,0x6c59,0x6c60,0x6c62,0x6c62,0x6c67,0x6c68,0x6c6a,0x6c6b,0x6c6d,0x6c6d,0x6c6f,0x6c70,0x6c72,0x6c74,0x6c76,0x6c76,0x6c78,0x6c7b,0x6c7d,0x6c7e,0x6c81,0x6c89,0x6c8c,0x6c8d,0x6c90,0x6c90,0x6c92,0x6c9c,0x6c9f,0x6c9f,0x6ca1,0x6ca2,0x6caa,0x6cae,0x6cb0,0x6cb4,0x6cb8,0x6cbf,0x6cc1,0x6cc2,0x6cc4,0x6cc6,0x6cc9,0x6cca,0x6ccc,0x6ccd,0x6ccf,0x6cd7,0x6cd9,0x6cdd,0x6ce0,0x6ce3,0x6ce5,0x6ce5,0x6ce7,0x6cf4,0x6cfb,0x6cfb,0x6d00,0x6d01,0x6d04,0x6d04,0x6d07,0x6d07,0x6d0a,0x6d0c,0x6d0e,0x6d0f,0x6d11,0x6d13,0x6d17,0x6d17,0x6d19,0x6d1b,0x6d1e,0x6d1f,0x6d24,0x6d2b,0x6d2e,0x6d2f,0x6d31,0x6d36,0x6d38,0x6d39,0x6d3b,0x6d3f,0x6d41,0x6d41,0x6d44,0x6d45,0x6d57,0x6d5c,0x6d5e,0x6d61,0x6d63,0x6d67,0x6d69,0x6d6a,0x6d6c,0x6d6c,0x6d6e,0x6d70,0x6d74,0x6d74,0x6d77,0x6d79,0x6d7c,0x6d7c,0x6d80,0x6d82,0x6d85,0x6d85,0x6d87,0x6d8a,0x6d8c,0x6d8e,0x6d91,0x6d99,0x6d9b,0x6d9c,0x6daa,0x6dac,0x6dae,0x6daf,0x6db2,0x6db2,0x6db4,0x6db5,0x6db7,0x6db9,0x6dbc,0x6dbd,0x6dbf,0x6dc0,0x6dc2,0x6dc2,0x6dc4,0x6dc8,0x6dca,0x6dcc,0x6dce,0x6dd2,0x6dd5,0x6dd6,0x6dd8,0x6ddb,0x6ddd,0x6de2,0x6de4,0x6de6,0x6de8,0x6dec,0x6dee,0x6dfc,0x6e00,0x6e00,0x6e04,0x6e05,0x6e07,0x6e0b,0x6e13,0x6e13,0x6e15,0x6e15,0x6e17,0x6e17,0x6e19,0x6e1b,0x6e1d,0x6e27,0x6e29,0x6e29,0x6e2b,0x6e2f,0x6e32,0x6e32,0x6e34,0x6e34,0x6e36,0x6e36,0x6e38,0x6e3c,0x6e3e,0x6e3e,0x6e42,0x6e45,0x6e48,0x6e4f,0x6e51,0x6e54,0x6e56,0x6e58,0x6e5b,0x6e5f,0x6e62,0x6e63,0x6e67,0x6e68,0x6e6b,0x6e6b,0x6e6e,0x6e6f,0x6e72,0x6e73,0x6e76,0x6e76,0x6e7b,0x6e7b,0x6e7d,0x6e80,0x6e82,0x6e82,0x6e89,0x6e89,0x6e8c,0x6e8d,0x6e8f,0x6e90,0x6e93,0x6e93,0x6e96,0x6e96,0x6e98,0x6e99,0x6e9c,0x6e9d,0x6e9f,0x6ea0,0x6ea2,0x6ea2,0x6ea5,0x6ea5,0x6ea7,0x6ea7,0x6eaa,0x6eab,0x6ead,0x6eaf,0x6eb1,0x6eb4,0x6eb6,0x6eb7,0x6eba,0x6ebd,0x6ebf,0x6ec5,0x6ec7,0x6ecf,0x6ed1,0x6ed1,0x6ed3,0x6ed5,0x6ed9,0x6edb,0x6edd,0x6ede,0x6ee6,0x6ee6,0x6eeb,0x6eef,0x6ef2,0x6ef2,0x6ef4,0x6ef4,0x6ef7,0x6ef9,0x6efb,0x6efb,0x6efd,0x6eff,0x6f01,0x6f02,0x6f04,0x6f04,0x6f06,0x6f06,0x6f08,0x6f0a,0x6f0c,0x6f0d,0x6f0f,0x6f11,0x6f13,0x6f16,0x6f18,0x6f18,0x6f1a,0x6f1b,0x6f20,0x6f20,0x6f22,0x6f23,0x6f25,0x6f26,0x6f29,0x6f2d,0x6f2f,0x6f33,0x6f35,0x6f36,0x6f38,0x6f38,0x6f3b,0x6f3c,0x6f3e,0x6f3f,0x6f41,0x6f41,0x6f45,0x6f45,0x6f4f,0x6f4f,0x6f51,0x6f54,0x6f57,0x6f62,0x6f64,0x6f64,0x6f66,0x6f66,0x6f68,0x6f68,0x6f6c,0x6f70,0x6f74,0x6f74,0x6f78,0x6f78,0x6f7a,0x6f7a,0x6f7c,0x6f7e,0x6f80,0x6f84,0x6f86,0x6f88,0x6f8b,0x6f8e,0x6f90,0x6f94,0x6f96,0x6f98,0x6f9a,0x6f9a,0x6f9d,0x6f9d,0x6f9f,0x6fa1,0x6fa3,0x6fa8,0x6faa,0x6faa,0x6fae,0x6fb1,0x6fb3,0x6fb3,0x6fb5,0x6fb7,0x6fb9,0x6fb9,0x6fbc,0x6fbc,0x6fbe,0x6fbe,0x6fc0,0x6fc3,0x6fc5,0x6fca,0x6fd4,0x6fd5,0x6fd8,0x6fd8,0x6fda,0x6fdb,0x6fde,0x6fe1,0x6fe4,0x6fe4,0x6fe8,0x6fe9,0x6feb,0x6fec,0x6fee,0x6ff1,0x6ff3,0x6ff3,0x6ff5,0x6ff6,0x6ff9,0x6ffa,0x6ffc,0x6ffe,0x7000,0x7001,0x7005,0x7007,0x7009,0x700b,0x700d,0x700d,0x700f,0x700f,0x7011,0x7011,0x7015,0x7015,0x7017,0x7018,0x701a,0x701b,0x701d,0x7020,0x7023,0x7023,0x7026,0x7028,0x702c,0x702c,0x702f,0x7030,0x7032,0x7032,0x7034,0x7034,0x7037,0x7037,0x7039,0x703a,0x703c,0x703c,0x703e,0x703e,0x7043,0x7044,0x7047,0x704c,0x704e,0x704e,0x7051,0x7051,0x7054,0x7055,0x7058,0x7058,0x705d,0x705e,0x7063,0x7065,0x7069,0x7069,0x706b,0x706c,0x706e,0x7070,0x7075,0x7076,0x7078,0x7078,0x707c,0x707e,0x7081,0x7081,0x7085,0x7086,0x7089,0x708a,0x708e,0x708e,0x7092,0x7092,0x7094,0x7099,0x709b,0x709b,0x709f,0x709f,0x70a4,0x70a4,0x70ab,0x70b1,0x70b3,0x70b4,0x70b7,0x70bb,0x70c8,0x70c8,0x70ca,0x70cb,0x70cf,0x70cf,0x70d1,0x70d1,0x70d3,0x70d6,0x70d8,0x70d9,0x70dc,0x70dd,0x70df,0x70df,0x70e4,0x70e4,0x70ec,0x70ec,0x70f1,0x70f1,0x70f9,0x70fa,0x70fd,0x70fd,0x7103,0x7109,0x710b,0x710c,0x710f,0x710f,0x7114,0x7114,0x7119,0x711a,0x711c,0x711c,0x711e,0x711e,0x7120,0x7121,0x7126,0x7126,0x712b,0x712b,0x712d,0x7131,0x7136,0x7136,0x7138,0x7138,0x713c,0x713c,0x7141,0x7141,0x7145,0x7147,0x7149,0x714c,0x714e,0x714e,0x7150,0x7153,0x7155,0x7157,0x7159,0x715a,0x715c,0x715c,0x715e,0x715e,0x7160,0x7160,0x7162,0x7162,0x7164,0x7169,0x716c,0x716c,0x716e,0x716e,0x7179,0x7179,0x717d,0x717d,0x7180,0x7180,0x7184,0x7185,0x7187,0x7188,0x718a,0x718a,0x718c,0x718c,0x718f,0x718f,0x7192,0x7192,0x7194,0x7196,0x7199,0x719b,0x719f,0x71a0,0x71a2,0x71a2,0x71a8,0x71a8,0x71ac,0x71ac,0x71ae,0x71b3,0x71b9,0x71ba,0x71be,0x71c1,0x71c3,0x71c4,0x71c8,0x71c9,0x71cb,0x71cc,0x71ce,0x71ce,0x71d0,0x71d0,0x71d2,0x71d7,0x71d9,0x71da,0x71dc,0x71dc,0x71df,0x71e0,0x71e5,0x71e7,0x71ec,0x71ee,0x71f4,0x71f5,0x71f8,0x71f9,0x71fb,0x71fc,0x71fe,0x7200,0x7206,0x7209,0x720d,0x720d,0x7210,0x7210,0x7213,0x7213,0x7215,0x7215,0x7217,0x7217,0x721a,0x721b,0x721d,0x721d,0x721f,0x721f,0x7224,0x7224,0x7228,0x7228,0x722a,0x722d,0x722f,0x7230,0x7232,0x7232,0x7234,0x7236,0x7238,0x7243,0x7245,0x7248,0x724b,0x724c,0x724e,0x7250,0x7252,0x7253,0x7255,0x7263,0x7267,0x7269,0x726b,0x726b,0x726e,0x726f,0x7271,0x7272,0x7274,0x7274,0x7277,0x7279,0x727b,0x7282,0x7284,0x7284,0x7287,0x7287,0x7289,0x7289,0x728d,0x728e,0x7292,0x7293,0x7296,0x7296,0x729b,0x729b,0x72a0,0x72a0,0x72a2,0x72a2,0x72a7,0x72a8,0x72ac,0x72b2,0x72b4,0x72b4,0x72b6,0x72b6,0x72b9,0x72b9,0x72be,0x72be,0x72c0,0x72c4,0x72c6,0x72c7,0x72c9,0x72c9,0x72cc,0x72cc,0x72ce,0x72ce,0x72d0,0x72d0,0x72d2,0x72d2,0x72d5,0x72d9,0x72db,0x72db,0x72df,0x72e2,0x72e5,0x72e5,0x72e9,0x72e9,0x72ec,0x72ed,0x72f3,0x72f4,0x72f7,0x72fe,0x7302,0x7302,0x7304,0x7305,0x7307,0x7307,0x730a,0x730b,0x730d,0x730d,0x7312,0x7313,0x7316,0x7319,0x731b,0x731f,0x7322,0x7322,0x7324,0x7325,0x7327,0x732c,0x732e,0x732f,0x7331,0x7337,0x7339,0x733b,0x733d,0x733f,0x7343,0x7345,0x734d,0x7350,0x7352,0x7352,0x7356,0x7358,0x735d,0x7360,0x7363,0x7363,0x7366,0x736c,0x736e,0x7372,0x7375,0x7375,0x7377,0x737c,0x7380,0x7381,0x7383,0x7387,0x7389,0x738b,0x738e,0x738e,0x7390,0x7390,0x7393,0x7398,0x739c,0x739c,0x739e,0x73a0,0x73a2,0x73a2,0x73a5,0x73a6,0x73a8,0x73ab,0x73ad,0x73ad,0x73b2,0x73b3,0x73b5,0x73b5,0x73b7,0x73b7,0x73b9,0x73bd,0x73bf,0x73c0,0x73c2,0x73c2,0x73c5,0x73c6,0x73c8,0x73cf,0x73d2,0x73d3,0x73d6,0x73d6,0x73d9,0x73d9,0x73dd,0x73de,0x73e0,0x73e1,0x73e3,0x73e7,0x73e9,0x73ea,0x73ed,0x73ee,0x73f1,0x73f1,0x73f4,0x73f5,0x73f7,0x73fb,0x73fd,0x7401,0x7403,0x7407,0x7409,0x740a,0x7411,0x7411,0x7413,0x7413,0x741a,0x741b,0x7421,0x7422,0x7424,0x7426,0x7428,0x7436,0x7439,0x743a,0x743f,0x7441,0x7443,0x7444,0x7446,0x7447,0x744b,0x744b,0x744d,0x744d,0x7451,0x7453,0x7455,0x7455,0x7457,0x7457,0x7459,0x7460,0x7462,0x7464,0x7466,0x746b,0x746d,0x7473,0x7476,0x7476,0x747e,0x747e,0x7480,0x7481,0x7483,0x7483,0x7485,0x7489,0x748b,0x748b,0x748f,0x7492,0x7497,0x749a,0x749c,0x749c,0x749e,0x74a3,0x74a5,0x74ab,0x74ae,0x74b2,0x74b5,0x74b5,0x74b9,0x74bb,0x74bd,0x74bd,0x74bf,0x74bf,0x74c8,0x74ca,0x74cc,0x74cc,0x74cf,0x74d0,0x74d3,0x74d4,0x74d6,0x74d6,0x74d8,0x74d8,0x74da,0x74dc,0x74de,0x74e0,0x74e2,0x74e4,0x74e6,0x74eb,0x74ee,0x74f2,0x74f4,0x74f4,0x74f6,0x74f8,0x74fa,0x74fc,0x74ff,0x74ff,0x7501,0x7501,0x7503,0x7506,0x750c,0x750e,0x7511,0x7513,0x7515,0x7518,0x751a,0x751a,0x751c,0x751c,0x751e,0x752c,0x752f,0x7533,0x7536,0x7540,0x7543,0x7544,0x7546,0x7552,0x7554,0x7554,0x7557,0x7557,0x7559,0x7562,0x7564,0x7567,0x7569,0x756d,0x756f,0x757f,0x7581,0x7582,0x7585,0x7587,0x7589,0x758c,0x758e,0x7595,0x7599,0x759a,0x759c,0x759d,0x75a2,0x75a5,0x75ab,0x75ab,0x75b0,0x75b5,0x75b7,0x75ba,0x75bc,0x75c7,0x75ca,0x75ca,0x75cc,0x75cf,0x75d2,0x75d5,0x75d7,0x75d9,0x75db,0x75e4,0x75e7,0x75e7,0x75e9,0x75e9,0x75ec,0x75ec,0x75ee,0x75f4,0x75f9,0x75fa,0x75fc,0x75fc,0x75fe,0x7604,0x7607,0x760d,0x760f,0x760f,0x7612,0x7613,0x7615,0x7616,0x7618,0x7619,0x761b,0x7629,0x762d,0x762d,0x7630,0x7630,0x7632,0x7635,0x7638,0x763c,0x7640,0x764c,0x764e,0x764e,0x7652,0x7652,0x7655,0x7656,0x7658,0x7659,0x765c,0x765c,0x765f,0x765f,0x7661,0x7662,0x7664,0x7665,0x7667,0x766a,0x766c,0x7672,0x7674,0x7674,0x7676,0x7676,0x7678,0x7678,0x767a,0x767e,0x7680,0x7688,0x768b,0x768e,0x7690,0x7690,0x7693,0x7693,0x7695,0x7696,0x7699,0x76a8,0x76aa,0x76aa,0x76ad,0x76b0,0x76b4,0x76b4,0x76b6,0x76ba,0x76bd,0x76bd,0x76bf,0x76bf,0x76c1,0x76c3,0x76c5,0x76c6,0x76c8,0x76ce,0x76d2,0x76d2,0x76d4,0x76d4,0x76d6,0x76d7,0x76d9,0x76d9,0x76db,0x76dc,0x76de,0x76e1,0x76e3,0x76e8,0x76ea,0x76ec,0x76ee,0x76ee,0x76f0,0x76f2,0x76f4,0x76f4,0x76f6,0x76f6,0x76f8,0x76f9,0x76fb,0x76fc,0x76fe,0x76fe,0x7700,0x7701,0x7704,0x7704,0x7706,0x770c,0x770e,0x770e,0x7712,0x7712,0x7714,0x7715,0x7717,0x7717,0x7719,0x771c,0x771e,0x7720,0x7722,0x7722,0x7724,0x7726,0x7728,0x7729,0x772d,0x772f,0x7734,0x773a,0x773c,0x773e,0x7740,0x7740,0x7742,0x7742,0x7745,0x7747,0x774a,0x774a,0x774d,0x774f,0x7752,0x7752,0x7756,0x7758,0x775a,0x775c,0x775e,0x7768,0x776a,0x776c,0x7770,0x7770,0x7772,0x7774,0x7779,0x777a,0x777c,0x7780,0x7784,0x7784,0x778b,0x778e,0x7791,0x7791,0x7794,0x7796,0x779a,0x779a,0x779e,0x77a0,0x77a2,0x77a2,0x77a4,0x77a5,0x77a7,0x77a7,0x77a9,0x77aa,0x77ac,0x77b1,0x77b3,0x77b3,0x77b5,0x77b7,0x77b9,0x77b9,0x77bb,0x77bf,0x77c3,0x77c3,0x77c7,0x77c7,0x77c9,0x77c9,0x77cd,0x77cd,0x77d1,0x77d2,0x77d5,0x77d5,0x77d7,0x77d7,0x77d9,0x77dc,0x77de,0x77e0,0x77e2,0x77e7,0x77e9,0x77ea,0x77ec,0x77f1,0x77f3,0x77f4,0x77f8,0x77f8,0x77fb,0x77fc,0x7802,0x7802,0x7805,0x7806,0x7809,0x7809,0x780c,0x780e,0x7811,0x7812,0x7814,0x7815,0x7819,0x7819,0x781d,0x781d,0x7820,0x7823,0x7825,0x7827,0x782c,0x782e,0x7830,0x7830,0x7832,0x7832,0x7834,0x7835,0x7837,0x7837,0x783a,0x783a,0x783f,0x783f,0x7843,0x7845,0x7847,0x7848,0x784c,0x784c,0x784e,0x784f,0x7851,0x7852,0x785c,0x785e,0x7860,0x7861,0x7863,0x7864,0x7868,0x7868,0x786a,0x786c,0x786e,0x786f,0x7872,0x7872,0x7874,0x7874,0x787a,0x787a,0x787c,0x787c,0x787e,0x787e,0x7881,0x7881,0x7886,0x7887,0x788a,0x788a,0x788c,0x788f,0x7891,0x7891,0x7893,0x7895,0x7897,0x7898,0x789a,0x789a,0x789d,0x789f,0x78a1,0x78a1,0x78a3,0x78a4,0x78a7,0x78aa,0x78ac,0x78ad,0x78af,0x78b3,0x78b5,0x78b5,0x78ba,0x78bf,0x78c1,0x78c1,0x78c5,0x78cc,0x78ce,0x78ce,0x78d0,0x78d6,0x78da,0x78db,0x78df,0x78e1,0x78e4,0x78e4,0x78e6,0x78e8,0x78ea,0x78ea,0x78ec,0x78ec,0x78ef,0x78ef,0x78f2,0x78f4,0x78f6,0x78f7,0x78f9,0x78fb,0x78fd,0x7901,0x7906,0x7907,0x790c,0x790c,0x790e,0x790e,0x7910,0x7912,0x7919,0x791c,0x791e,0x7920,0x7925,0x792e,0x7930,0x7931,0x7934,0x7935,0x793a,0x7942,0x7944,0x794b,0x794f,0x7951,0x7953,0x7958,0x795a,0x7960,0x7962,0x7962,0x7965,0x7965,0x7967,0x7969,0x796b,0x796b,0x796d,0x796d,0x7972,0x7972,0x7977,0x7977,0x7979,0x797c,0x797e,0x7981,0x7984,0x7985,0x798a,0x798f,0x7991,0x7991,0x7993,0x7996,0x7998,0x7998,0x799b,0x799d,0x79a1,0x79a1,0x79a6,0x79ab,0x79ae,0x79b1,0x79b3,0x79b4,0x79b8,0x79bb,0x79bd,0x79c2,0x79c4,0x79c4,0x79c7,0x79cd,0x79cf,0x79cf,0x79d1,0x79d2,0x79d4,0x79d6,0x79d8,0x79d8,0x79da,0x79da,0x79dd,0x79e7,0x79e9,0x79ed,0x79f0,0x79f1,0x79f8,0x79f8,0x79fb,0x79fc,0x7a00,0x7a00,0x7a02,0x7a03,0x7a05,0x7a05,0x7a07,0x7a0e,0x7a11,0x7a11,0x7a14,0x7a15,0x7a17,0x7a1c,0x7a1e,0x7a21,0x7a27,0x7a27,0x7a2b,0x7a2b,0x7a2d,0x7a32,0x7a34,0x7a35,0x7a37,0x7a40,0x7a42,0x7a49,0x7a4c,0x7a50,0x7a55,0x7a57,0x7a59,0x7a59,0x7a5c,0x7a5d,0x7a5f,0x7a63,0x7a65,0x7a65,0x7a67,0x7a67,0x7a69,0x7a6b,0x7a6d,0x7a6d,0x7a70,0x7a70,0x7a74,0x7a76,0x7a78,0x7a7a,0x7a7d,0x7a86,0x7a88,0x7a88,0x7a8a,0x7a8b,0x7a90,0x7a98,0x7a9e,0x7aa0,0x7aa3,0x7aa3,0x7aa9,0x7aaa,0x7aac,0x7aac,0x7aae,0x7ab0,0x7ab3,0x7ab3,0x7ab5,0x7ab6,0x7ab9,0x7abf,0x7ac3,0x7acf,0x7ad1,0x7ad3,0x7ad5,0x7ad5,0x7ad9,0x7add,0x7adf,0x7ae3,0x7ae5,0x7aed,0x7aef,0x7af1,0x7af4,0x7af4,0x7af6,0x7af6,0x7af8,0x7afb,0x7afd,0x7aff,0x7b02,0x7b02,0x7b04,0x7b04,0x7b06,0x7b08,0x7b0a,0x7b0b,0x7b0f,0x7b0f,0x7b11,0x7b12,0x7b14,0x7b14,0x7b18,0x7b19,0x7b1b,0x7b1b,0x7b1e,0x7b20,0x7b23,0x7b23,0x7b25,0x7b31,0x7b33,0x7b36,0x7b39,0x7b39,0x7b3b,0x7b3b,0x7b3d,0x7b3d,0x7b3f,0x7b41,0x7b45,0x7b49,0x7b4b,0x7b56,0x7b5d,0x7b5d,0x7b60,0x7b60,0x7b64,0x7b67,0x7b69,0x7b6a,0x7b6c,0x7b75,0x7b77,0x7b77,0x7b79,0x7b7a,0x7b7f,0x7b7f,0x7b84,0x7b84,0x7b86,0x7b87,0x7b89,0x7b89,0x7b8b,0x7b8b,0x7b8d,0x7b92,0x7b94,0x7ba1,0x7ba5,0x7ba5,0x7baa,0x7baa,0x7bac,0x7bad,0x7baf,0x7bb2,0x7bb4,0x7bb6,0x7bb8,0x7bb8,0x7bba,0x7bbd,0x7bc0,0x7bc2,0x7bc4,0x7bcc,0x7bcf,0x7bcf,0x7bd4,0x7bd4,0x7bd6,0x7bd7,0x7bd9,0x7bdb,0x7bdd,0x7bdd,0x7be0,0x7be0,0x7be4,0x7be6,0x7be8,0x7bea,0x7bed,0x7bed,0x7bf0,0x7bf0,0x7bf2,0x7bfa,0x7bfc,0x7bfc,0x7bfe,0x7bfe,0x7c00,0x7c04,0x7c06,0x7c07,0x7c09,0x7c09,0x7c0b,0x7c0f,0x7c11,0x7c14,0x7c17,0x7c17,0x7c19,0x7c19,0x7c1b,0x7c1b,0x7c1e,0x7c21,0x7c23,0x7c23,0x7c25,0x7c28,0x7c2a,0x7c2c,0x7c2f,0x7c2f,0x7c31,0x7c31,0x7c33,0x7c34,0x7c36,0x7c3a,0x7c3d,0x7c40,0x7c42,0x7c43,0x7c45,0x7c46,0x7c4a,0x7c4a,0x7c4c,0x7c4d,0x7c4f,0x7c61,0x7c63,0x7c65,0x7c67,0x7c67,0x7c69,0x7c69,0x7c6c,0x7c70,0x7c72,0x7c73,0x7c75,0x7c75,0x7c79,0x7c79,0x7c7b,0x7c7e,0x7c81,0x7c83,0x7c86,0x7c87,0x7c89,0x7c89,0x7c8b,0x7c8b,0x7c8d,0x7c8d,0x7c8f,0x7c90,0x7c92,0x7c92,0x7c94,0x7c95,0x7c97,0x7c98,0x7c9b,0x7c9b,0x7c9e,0x7ca2,0x7ca4,0x7ca8,0x7cab,0x7cab,0x7cad,0x7cae,0x7cb0,0x7cb3,0x7cb6,0x7cb7,0x7cb9,0x7cc0,0x7cc2,0x7cc2,0x7cc4,0x7cc5,0x7cc7,0x7cca,0x7ccd,0x7ccf,0x7cd2,0x7cda,0x7cdc,0x7ce0,0x7ce2,0x7ce2,0x7ce6,0x7ce7,0x7ce9,0x7ce9,0x7ceb,0x7ceb,0x7cef,0x7cef,0x7cf2,0x7cf2,0x7cf4,0x7cf6,0x7cf8,0x7cfb,0x7cfe,0x7cfe,0x7d00,0x7d00,0x7d02,0x7d0b,0x7d0d,0x7d0d,0x7d0f,0x7d1e,0x7d20,0x7d23,0x7d26,0x7d26,0x7d2a,0x7d33,0x7d35,0x7d35,0x7d39,0x7d3a,0x7d3c,0x7d48,0x7d4b,0x7d51,0x7d53,0x7d53,0x7d55,0x7d57,0x7d59,0x7d5e,0x7d61,0x7d63,0x7d65,0x7d68,0x7d6a,0x7d6a,0x7d6e,0x7d6e,0x7d70,0x7d73,0x7d75,0x7d76,0x7d78,0x7d7b,0x7d7d,0x7d7d,0x7d7f,0x7d7f,0x7d81,0x7d83,0x7d85,0x7d86,0x7d88,0x7d89,0x7d8b,0x7d8d,0x7d8f,0x7d8f,0x7d91,0x7d91,0x7d93,0x7d93,0x7d96,0x7d97,0x7d99,0x7da0,0x7da2,0x7da3,0x7da6,0x7da7,0x7daa,0x7dbb,0x7dbd,0x7dc0,0x7dc2,0x7dc7,0x7dca,0x7dd2,0x7dd5,0x7dda,0x7ddc,0x7dde,0x7de0,0x7de6,0x7de8,0x7ded,0x7def,0x7def,0x7df1,0x7df2,0x7df4,0x7df6,0x7df9,0x7dfb,0x7e00,0x7e01,0x7e04,0x7e05,0x7e08,0x7e0b,0x7e10,0x7e12,0x7e15,0x7e15,0x7e17,0x7e17,0x7e1b,0x7e23,0x7e26,0x7e28,0x7e2b,0x7e2f,0x7e31,0x7e33,0x7e35,0x7e37,0x7e39,0x7e3b,0x7e3d,0x7e3f,0x7e41,0x7e41,0x7e43,0x7e48,0x7e4a,0x7e4b,0x7e4d,0x7e4e,0x7e50,0x7e50,0x7e52,0x7e52,0x7e54,0x7e56,0x7e58,0x7e5a,0x7e5d,0x7e5f,0x7e61,0x7e62,0x7e65,0x7e67,0x7e69,0x7e6b,0x7e6d,0x7e70,0x7e73,0x7e73,0x7e75,0x7e75,0x7e78,0x7e79,0x7e7b,0x7e7f,0x7e81,0x7e83,0x7e86,0x7e8a,0x7e8c,0x7e96,0x7e98,0x7e98,0x7e9a,0x7e9f,0x7f36,0x7f36,0x7f38,0x7f38,0x7f3a,0x7f3f,0x7f43,0x7f45,0x7f47,0x7f47,0x7f4c,0x7f55,0x7f58,0x7f58,0x7f5b,0x7f5d,0x7f5f,0x7f61,0x7f63,0x7f6b,0x7f6d,0x7f6e,0x7f70,0x7f72,0x7f75,0x7f75,0x7f77,0x7f79,0x7f7d,0x7f80,0x7f82,0x7f83,0x7f85,0x7f88,0x7f8a,0x7f91,0x7f94,0x7f94,0x7f96,0x7f97,0x7f9a,0x7f9a,0x7f9c,0x7f9e,0x7fa1,0x7fa4,0x7fa6,0x7fa6,0x7fa8,0x7faa,0x7fad,0x7faf,0x7fb2,0x7fb2,0x7fb4,0x7fb4,0x7fb6,0x7fb6,0x7fb8,0x7fb9,0x7fbc,0x7fbd,0x7fbf,0x7fc1,0x7fc3,0x7fc3,0x7fc5,0x7fc6,0x7fc8,0x7fc8,0x7fca,0x7fca,0x7fcc,0x7fcc,0x7fce,0x7fcf,0x7fd2,0x7fd2,0x7fd4,0x7fd5,0x7fdb,0x7fdb,0x7fdf,0x7fe1,0x7fe3,0x7fe3,0x7fe5,0x7fe6,0x7fe8,0x7fe9,0x7feb,0x7fec,0x7fee,0x7ff0,0x7ff2,0x7ff3,0x7ff9,0x8008,0x800a,0x8019,0x801c,0x8021,0x8024,0x8024,0x8026,0x8026,0x8028,0x8028,0x802c,0x802c,0x802e,0x802e,0x8030,0x8030,0x8033,0x8037,0x8039,0x8040,0x8043,0x8044,0x8046,0x8046,0x804a,0x804a,0x8052,0x8052,0x8056,0x8056,0x8058,0x8058,0x805a,0x805a,0x805e,0x8062,0x8064,0x8064,0x8066,0x8066,0x8068,0x8068,0x806d,0x806d,0x806f,0x8077,0x8079,0x8079,0x807b,0x807b,0x807d,0x8081,0x8084,0x8089,0x808b,0x808c,0x808e,0x808e,0x8093,0x8093,0x8096,0x8096,0x8098,0x809e,0x80a1,0x80a2,0x80a4,0x80a7,0x80a9,0x80ad,0x80af,0x80af,0x80b1,0x80b2,0x80b4,0x80b4,0x80b8,0x80ba,0x80c3,0x80c6,0x80c8,0x80c8,0x80ca,0x80ca,0x80cc,0x80cf,0x80d2,0x80d2,0x80d4,0x80db,0x80dd,0x80de,0x80e0,0x80e1,0x80e4,0x80e6,0x80ed,0x80fe,0x8101,0x8103,0x8105,0x810b,0x810d,0x810d,0x8116,0x8118,0x811a,0x811c,0x811e,0x811e,0x8120,0x8120,0x8123,0x8124,0x8127,0x8127,0x8129,0x8129,0x812b,0x812c,0x812f,0x8131,0x8133,0x8133,0x8135,0x8135,0x8139,0x813a,0x813c,0x813e,0x8141,0x8141,0x8145,0x8147,0x814a,0x814c,0x814e,0x814e,0x8150,0x8155,0x8157,0x8157,0x815f,0x8161,0x8165,0x8169,0x816b,0x816b,0x816d,0x8171,0x8173,0x8174,0x8177,0x817a,0x817f,0x8186,0x8188,0x8188,0x818a,0x818b,0x818e,0x8190,0x8193,0x8193,0x8195,0x8196,0x8198,0x8198,0x819a,0x819e,0x81a0,0x81a0,0x81a2,0x81a4,0x81a8,0x81a9,0x81ae,0x81ae,0x81b0,0x81b0,0x81b2,0x81b5,0x81b8,0x81b8,0x81ba,0x81bb,0x81bd,0x81c3,0x81c5,0x81c6,0x81c8,0x81cb,0x81cd,0x81cf,0x81d1,0x81d1,0x81d3,0x81d3,0x81d5,0x81db,0x81dd,0x81e1,0x81e3,0x81e5,0x81e7,0x81e8,0x81ea,0x81ed,0x81ef,0x81f6,0x81f8,0x8205,0x8207,0x8210,0x8212,0x8214,0x8216,0x821f,0x8221,0x8222,0x8228,0x822c,0x822e,0x822e,0x8232,0x823a,0x823c,0x823c,0x8240,0x8240,0x8243,0x8247,0x8249,0x8249,0x824b,0x824b,0x824e,0x824f,0x8251,0x8251,0x8256,0x825a,0x825c,0x825d,0x825f,0x8260,0x8262,0x8264,0x8266,0x8268,0x826a,0x826b,0x826d,0x826f,0x8271,0x8272,0x8274,0x8274,0x8276,0x8279,0x827b,0x827b,0x827d,0x8281,0x8283,0x8284,0x8287,0x8287,0x8289,0x828b,0x828d,0x828e,0x8291,0x8294,0x8296,0x8296,0x8298,0x829b,0x829d,0x829d,0x829f,0x82a1,0x82a3,0x82b4,0x82b7,0x82bf,0x82c5,0x82c6,0x82d0,0x82d5,0x82d7,0x82d7,0x82d9,0x82dc,0x82de,0x82e8,0x82ea,0x82eb,0x82ed,0x82ed,0x82ef,0x82ef,0x82f1,0x82f1,0x82f3,0x82f4,0x82f6,0x82f7,0x82f9,0x82fb,0x82fd,0x82fe,0x8300,0x830c,0x830e,0x830e,0x8316,0x8318,0x831b,0x831f,0x8321,0x8323,0x8328,0x8328,0x832b,0x833a,0x833c,0x833d,0x8340,0x8340,0x8342,0x8347,0x8349,0x834a,0x834d,0x8358,0x835a,0x835a,0x8362,0x8363,0x8370,0x8370,0x8373,0x8373,0x8375,0x8375,0x8377,0x8378,0x837b,0x837d,0x837f,0x8380,0x8382,0x8382,0x8384,0x8387,0x8389,0x838a,0x838d,0x838e,0x8392,0x8396,0x8398,0x83a0,0x83a2,0x83a2,0x83a6,0x83ad,0x83b1,0x83b1,0x83b5,0x83b5,0x83bd,0x83c1,0x83c5,0x83c5,0x83c7,0x83c7,0x83c9,0x83ca,0x83cc,0x83cc,0x83ce,0x83d1,0x83d3,0x83d4,0x83d6,0x83d6,0x83d8,0x83d8,0x83dc,0x83dd,0x83df,0x83e1,0x83e5,0x83e5,0x83e8,0x83eb,0x83ef,0x83f2,0x83f4,0x83f4,0x83f6,0x83f9,0x83fb,0x83fd,0x8401,0x8401,0x8403,0x8404,0x8406,0x8407,0x840a,0x840f,0x8411,0x8411,0x8413,0x8413,0x8415,0x8415,0x8417,0x8417,0x8419,0x8419,0x8420,0x8420,0x8422,0x8422,0x8429,0x842a,0x842c,0x842c,0x842f,0x842f,0x8431,0x8431,0x8435,0x8435,0x8438,0x8439,0x843c,0x843d,0x8445,0x844a,0x844d,0x844f,0x8451,0x8452,0x8456,0x845c,0x845f,0x8467,0x8469,0x8471,0x8473,0x847a,0x847c,0x847d,0x8481,0x8482,0x8484,0x8485,0x848b,0x848b,0x8490,0x8490,0x8492,0x8495,0x8497,0x8497,0x8499,0x8499,0x849c,0x849c,0x849e,0x849f,0x84a1,0x84a1,0x84a6,0x84a6,0x84a8,0x84aa,0x84ad,0x84ad,0x84af,0x84af,0x84b1,0x84b2,0x84b4,0x84b4,0x84b8,0x84c2,0x84c4,0x84c4,0x84c6,0x84d1,0x84d3,0x84d3,0x84d6,0x84d6,0x84d9,0x84da,0x84dc,0x84dc,0x84e7,0x84e7,0x84ea,0x84ea,0x84ec,0x84ec,0x84ee,0x84f2,0x84f4,0x84f4,0x84f7,0x84f7,0x84fa,0x84fd,0x84ff,0x8500,0x8502,0x8503,0x8506,0x8507,0x850c,0x850c,0x850e,0x850e,0x8510,0x8511,0x8513,0x8515,0x8517,0x8518,0x851a,0x851c,0x851e,0x851f,0x8521,0x8527,0x852a,0x852d,0x852f,0x852f,0x8532,0x8536,0x853d,0x8541,0x8543,0x8543,0x8546,0x8546,0x8548,0x854b,0x854e,0x8553,0x8555,0x855a,0x855c,0x8564,0x8568,0x856b,0x856d,0x856d,0x856f,0x856f,0x8577,0x8577,0x8579,0x857b,0x857d,0x8581,0x8584,0x858c,0x858f,0x8591,0x8593,0x8594,0x8597,0x8599,0x859b,0x859d,0x859f,0x85a0,0x85a2,0x85a2,0x85a4,0x85b0,0x85b4,0x85b4,0x85b6,0x85ba,0x85bc,0x85bf,0x85c1,0x85c2,0x85c7,0x85c7,0x85c9,0x85cb,0x85cd,0x85d0,0x85d5,0x85d5,0x85d8,0x85da,0x85dc,0x85dd,0x85df,0x85e1,0x85e4,0x85e6,0x85e8,0x85ea,0x85ed,0x85ed,0x85f3,0x85f4,0x85f6,0x85f7,0x85f9,0x85fc,0x85fe,0x8600,0x8602,0x8602,0x8604,0x8607,0x860a,0x860b,0x860d,0x860e,0x8610,0x8613,0x8616,0x861b,0x861e,0x861e,0x8621,0x8622,0x8624,0x8624,0x8627,0x8627,0x8629,0x8629,0x862d,0x862d,0x862f,0x8630,0x8636,0x8636,0x8638,0x863a,0x863c,0x863d,0x863f,0x8642,0x8646,0x8646,0x864d,0x864e,0x8650,0x8650,0x8652,0x8664,0x8667,0x8667,0x8669,0x8669,0x866b,0x866c,0x866f,0x866f,0x8671,0x8671,0x8675,0x8677,0x8679,0x867b,0x867d,0x867d,0x8687,0x868d,0x8691,0x8691,0x8693,0x8693,0x8695,0x8696,0x8698,0x8698,0x869a,0x869a,0x869c,0x869d,0x86a1,0x86a1,0x86a3,0x86a4,0x86a6,0x86ab,0x86ad,0x86ad,0x86af,0x86b1,0x86b3,0x86b9,0x86bf,0x86c1,0x86c3,0x86c7,0x86c9,0x86c9,0x86cb,0x86cb,0x86cd,0x86ce,0x86d1,0x86d2,0x86d4,0x86d5,0x86d7,0x86d7,0x86d9,0x86dc,0x86de,0x86e0,0x86e3,0x86e7,0x86e9,0x86e9,0x86ec,0x86ef,0x86f8,0x86fe,0x8700,0x8700,0x8702,0x870b,0x870d,0x8714,0x8718,0x871a,0x871c,0x871c,0x871e,0x871f,0x8721,0x8723,0x8725,0x8725,0x8728,0x8729,0x872e,0x872f,0x8731,0x8732,0x8734,0x8734,0x8737,0x8737,0x8739,0x8740,0x8743,0x8743,0x8745,0x8745,0x8749,0x8749,0x874b,0x874e,0x8751,0x8751,0x8753,0x8753,0x8755,0x8755,0x8757,0x8759,0x875d,0x875d,0x875f,0x8761,0x8763,0x8766,0x8768,0x8768,0x876a,0x876a,0x876e,0x876f,0x8771,0x8772,0x8774,0x8774,0x8776,0x8776,0x8778,0x8778,0x877b,0x877c,0x877f,0x877f,0x8782,0x8789,0x878b,0x878e,0x8790,0x8790,0x8793,0x8793,0x8795,0x8795,0x8797,0x8799,0x879e,0x87a0,0x87a2,0x87a3,0x87a7,0x87a7,0x87ab,0x87af,0x87b1,0x87b1,0x87b3,0x87b3,0x87b5,0x87b5,0x87ba,0x87bb,0x87bd,0x87c1,0x87c4,0x87c4,0x87c6,0x87cb,0x87ce,0x87ce,0x87d0,0x87d0,0x87d2,0x87d2,0x87d5,0x87d6,0x87d9,0x87da,0x87dc,0x87dc,0x87df,0x87e0,0x87e2,0x87e6,0x87ea,0x87ed,0x87ef,0x87ef,0x87f1,0x87f3,0x87f5,0x87fb,0x87fe,0x87ff,0x8801,0x8801,0x8803,0x8803,0x8805,0x8807,0x8809,0x880b,0x880d,0x8816,0x8818,0x881c,0x881e,0x881f,0x8821,0x8823,0x8827,0x8828,0x882d,0x882e,0x8830,0x8832,0x8835,0x8836,0x8839,0x883c,0x8840,0x8846,0x8848,0x884e,0x8851,0x8853,0x8855,0x8864,0x8868,0x8869,0x886b,0x886b,0x886e,0x8872,0x8875,0x8875,0x8877,0x8877,0x8879,0x8879,0x887b,0x887b,0x887d,0x8882,0x8888,0x8888,0x888b,0x888b,0x888d,0x888d,0x8892,0x8892,0x8896,0x889c,0x889e,0x88a0,0x88a2,0x88a2,0x88a4,0x88a4,0x88a8,0x88a8,0x88aa,0x88ab,0x88ae,0x88ae,0x88b0,0x88b1,0x88b4,0x88b5,0x88b7,0x88b7,0x88ba,0x88ba,0x88bc,0x88c6,0x88ca,0x88cf,0x88d1,0x88d5,0x88d8,0x88d9,0x88db,0x88e1,0x88e7,0x88e8,0x88ef,0x88f5,0x88f7,0x88f9,0x88fc,0x88fe,0x8901,0x8902,0x8904,0x8904,0x8906,0x8907,0x890a,0x890a,0x890c,0x8910,0x8912,0x8913,0x8915,0x8916,0x8918,0x891a,0x891c,0x891e,0x8920,0x8920,0x8925,0x8928,0x892a,0x892b,0x8930,0x8932,0x8935,0x893b,0x893e,0x893e,0x8940,0x8946,0x8949,0x8949,0x894c,0x894d,0x894f,0x894f,0x8952,0x8952,0x8956,0x8957,0x895a,0x895c,0x895e,0x8964,0x8966,0x8966,0x896a,0x896b,0x896d,0x8970,0x8972,0x8975,0x8977,0x8977,0x897a,0x8981,0x8983,0x8983,0x8986,0x898b,0x898d,0x898d,0x898f,0x8990,0x8993,0x8998,0x899a,0x899c,0x899f,0x89a1,0x89a5,0x89a7,0x89a9,0x89aa,0x89ac,0x89ac,0x89af,0x89b0,0x89b2,0x89b7,0x89ba,0x89ba,0x89bc,0x89bd,0x89bf,0x89c1,0x89d2,0x89d2,0x89d4,0x89d8,0x89da,0x89da,0x89dc,0x89dd,0x89e3,0x89e3,0x89e5,0x89e7,0x89e9,0x89e9,0x89eb,0x89eb,0x89ed,0x89ed,0x89f1,0x89f1,0x89f3,0x89f4,0x89f6,0x89f6,0x89f8,0x89f9,0x89fd,0x89fd,0x89ff,0x8a05,0x8a07,0x8a08,0x8a0a,0x8a0a,0x8a0c,0x8a0c,0x8a0e,0x8a18,0x8a1b,0x8a1b,0x8a1d,0x8a26,0x8a2a,0x8a2d,0x8a2f,0x8a2f,0x8a31,0x8a31,0x8a33,0x8a37,0x8a3a,0x8a3e,0x8a40,0x8a41,0x8a43,0x8a43,0x8a45,0x8a49,0x8a4d,0x8a4e,0x8a50,0x8a58,0x8a5b,0x8a5e,0x8a60,0x8a63,0x8a65,0x8a67,0x8a69,0x8a69,0x8a6b,0x8a6e,0x8a70,0x8a73,0x8a75,0x8a77,0x8a79,0x8a7c,0x8a7e,0x8a80,0x8a82,0x8a87,0x8a89,0x8a89,0x8a8b,0x8a8d,0x8a8f,0x8a93,0x8a95,0x8a9a,0x8a9e,0x8aa1,0x8aa3,0x8aaa,0x8aac,0x8ab0,0x8ab2,0x8ab3,0x8ab6,0x8ab7,0x8ab9,0x8ab9,0x8abb,0x8abc,0x8abe,0x8abf,0x8ac2,0x8ac4,0x8ac6,0x8acd,0x8acf,0x8ad7,0x8ada,0x8ae2,0x8ae4,0x8ae4,0x8ae6,0x8ae7,0x8aeb,0x8aee,0x8af0,0x8af1,0x8af3,0x8af8,0x8afa,0x8afa,0x8afc,0x8afc,0x8afe,0x8b02,0x8b04,0x8b07,0x8b0a,0x8b11,0x8b14,0x8b14,0x8b16,0x8b17,0x8b19,0x8b21,0x8b26,0x8b26,0x8b28,0x8b28,0x8b2b,0x8b2d,0x8b30,0x8b30,0x8b33,0x8b33,0x8b37,0x8b37,0x8b39,0x8b39,0x8b3c,0x8b3c,0x8b3e,0x8b3e,0x8b41,0x8b46,0x8b48,0x8b49,0x8b4c,0x8b4f,0x8b51,0x8b54,0x8b56,0x8b56,0x8b58,0x8b5c,0x8b5e,0x8b5f,0x8b63,0x8b63,0x8b66,0x8b66,0x8b69,0x8b69,0x8b6b,0x8b6d,0x8b6f,0x8b72,0x8b74,0x8b74,0x8b76,0x8b79,0x8b7c,0x8b81,0x8b83,0x8b85,0x8b8a,0x8b90,0x8b92,0x8b96,0x8b99,0x8b9a,0x8b9c,0x8ba0,0x8c37,0x8c3a,0x8c3d,0x8c3f,0x8c41,0x8c41,0x8c45,0x8c4c,0x8c4e,0x8c51,0x8c53,0x8c55,0x8c57,0x8c5b,0x8c5d,0x8c5d,0x8c61,0x8c64,0x8c66,0x8c66,0x8c68,0x8c6d,0x8c73,0x8c73,0x8c75,0x8c76,0x8c78,0x8c7c,0x8c7e,0x8c7e,0x8c82,0x8c82,0x8c85,0x8c87,0x8c89,0x8c8e,0x8c90,0x8c90,0x8c92,0x8c94,0x8c98,0x8c99,0x8c9b,0x8ca2,0x8ca4,0x8ca4,0x8ca7,0x8cb0,0x8cb2,0x8cb4,0x8cb6,0x8cbd,0x8cbf,0x8ccb,0x8ccd,0x8ccf,0x8cd1,0x8cd3,0x8cd5,0x8cd6,0x8cd9,0x8cde,0x8ce0,0x8ce4,0x8ce6,0x8ce6,0x8ce8,0x8ce8,0x8cea,0x8cea,0x8cec,0x8ced,0x8cef,0x8cf2,0x8cf4,0x8cf5,0x8cf7,0x8cf8,0x8cfa,0x8cff,0x8d01,0x8d01,0x8d03,0x8d05,0x8d07,0x8d0b,0x8d0d,0x8d10,0x8d12,0x8d14,0x8d16,0x8d17,0x8d1b,0x8d1d,0x8d64,0x8d67,0x8d69,0x8d69,0x8d6b,0x8d6e,0x8d70,0x8d71,0x8d73,0x8d74,0x8d76,0x8d77,0x8d7f,0x8d7f,0x8d81,0x8d82,0x8d84,0x8d85,0x8d88,0x8d88,0x8d8a,0x8d8a,0x8d8d,0x8d8d,0x8d90,0x8d91,0x8d95,0x8d95,0x8d99,0x8d99,0x8d9e,0x8da0,0x8da3,0x8da3,0x8da6,0x8da6,0x8da8,0x8da8,0x8dab,0x8dac,0x8daf,0x8daf,0x8db2,0x8db3,0x8db5,0x8db5,0x8db7,0x8db7,0x8db9,0x8dbc,0x8dbe,0x8dbe,0x8dc0,0x8dc0,0x8dc2,0x8dc2,0x8dc5,0x8dc8,0x8dca,0x8dcc,0x8dce,0x8dcf,0x8dd1,0x8dd1,0x8dd4,0x8dd7,0x8dd9,0x8ddb,0x8ddd,0x8ddd,0x8ddf,0x8ddf,0x8de1,0x8de1,0x8de3,0x8de5,0x8de7,0x8de8,0x8dea,0x8dec,0x8def,0x8df5,0x8dfc,0x8dfd,0x8dff,0x8dff,0x8e01,0x8e01,0x8e04,0x8e06,0x8e08,0x8e0c,0x8e0f,0x8e11,0x8e14,0x8e14,0x8e16,0x8e16,0x8e1d,0x8e23,0x8e26,0x8e27,0x8e2a,0x8e2a,0x8e30,0x8e31,0x8e33,0x8e39,0x8e3d,0x8e3d,0x8e40,0x8e42,0x8e44,0x8e44,0x8e47,0x8e50,0x8e54,0x8e55,0x8e59,0x8e59,0x8e5b,0x8e64,0x8e69,0x8e69,0x8e6c,0x8e6d,0x8e6f,0x8e72,0x8e74,0x8e77,0x8e79,0x8e7c,0x8e81,0x8e85,0x8e87,0x8e87,0x8e89,0x8e8b,0x8e8d,0x8e8d,0x8e90,0x8e95,0x8e98,0x8e9b,0x8e9d,0x8e9e,0x8ea1,0x8ea2,0x8ea7,0x8ea7,0x8ea9,0x8eb1,0x8eb3,0x8eb3,0x8eb5,0x8eb6,0x8eba,0x8ebb,0x8ebe,0x8ebe,0x8ec0,0x8ec1,0x8ec3,0x8ec8,0x8eca,0x8ecd,0x8ecf,0x8ecf,0x8ed1,0x8ed2,0x8ed4,0x8ed4,0x8edb,0x8edc,0x8edf,0x8edf,0x8ee2,0x8ee3,0x8ee8,0x8ee8,0x8eeb,0x8eeb,0x8eed,0x8eee,0x8ef0,0x8ef1,0x8ef7,0x8efe,0x8f00,0x8f00,0x8f02,0x8f03,0x8f05,0x8f05,0x8f07,0x8f0a,0x8f0c,0x8f0c,0x8f0f,0x8f10,0x8f12,0x8f19,0x8f1b,0x8f21,0x8f23,0x8f23,0x8f25,0x8f2f,0x8f33,0x8f3b,0x8f3e,0x8f47,0x8f49,0x8f4a,0x8f4c,0x8f4f,0x8f51,0x8f55,0x8f57,0x8f58,0x8f5c,0x8f5f,0x8f61,0x8f66,0x8f9b,0x8fa8,0x8fad,0x8fb2,0x8fb4,0x8fb8,0x8fba,0x8fbc,0x8fbe,0x8fc2,0x8fc4,0x8fc6,0x8fc8,0x8fc8,0x8fca,0x8fcb,0x8fcd,0x8fce,0x8fd0,0x8fd5,0x8fda,0x8fda,0x8fe0,0x8fe0,0x8fe2,0x8fe6,0x8fe8,0x8feb,0x8fed,0x8ff1,0x8ff4,0x8ffb,0x8ffd,0x8ffe,0x9000,0x9006,0x9008,0x9008,0x900b,0x9011,0x9013,0x901b,0x901d,0x9023,0x9027,0x902a,0x902c,0x902f,0x9031,0x9039,0x903c,0x903c,0x903e,0x903f,0x9041,0x9045,0x9047,0x9047,0x9049,0x9056,0x9058,0x9059,0x905b,0x905e,0x9060,0x9063,0x9065,0x9069,0x906c,0x9070,0x9072,0x9072,0x9074,0x907a,0x907c,0x907d,0x907f,0x9085,0x9087,0x908c,0x908e,0x9091,0x9095,0x9095,0x9097,0x9099,0x909b,0x909b,0x90a0,0x90a3,0x90a5,0x90a6,0x90a8,0x90a8,0x90aa,0x90aa,0x90af,0x90b6,0x90b8,0x90b8,0x90bd,0x90be,0x90c1,0x90c1,0x90c3,0x90c5,0x90c7,0x90ca,0x90cc,0x90cc,0x90ce,0x90ce,0x90d2,0x90d2,0x90d5,0x90d5,0x90d7,0x90d9,0x90db,0x90df,0x90e1,0x90e2,0x90e4,0x90e5,0x90e8,0x90e8,0x90eb,0x90eb,0x90ed,0x90ed,0x90ef,0x90f0,0x90f2,0x90f2,0x90f4,0x90f7,0x90fd,0x9100,0x9102,0x9102,0x9104,0x9106,0x9108,0x9108,0x910d,0x910d,0x9110,0x9110,0x9112,0x9112,0x9114,0x911a,0x911c,0x911c,0x911e,0x911e,0x9120,0x9120,0x9122,0x9123,0x9125,0x9125,0x9127,0x9127,0x9129,0x9129,0x912d,0x9132,0x9134,0x9134,0x9136,0x9137,0x9139,0x913a,0x913c,0x913d,0x9143,0x9143,0x9146,0x914f,0x9152,0x9154,0x9156,0x915b,0x9161,0x9165,0x9167,0x9167,0x9169,0x916a,0x916c,0x916d,0x9172,0x9175,0x9177,0x917b,0x9181,0x9183,0x9185,0x9187,0x9189,0x918b,0x918d,0x918e,0x9190,0x9195,0x9197,0x9198,0x919c,0x919c,0x919e,0x919e,0x91a1,0x91a2,0x91a4,0x91a4,0x91a6,0x91a6,0x91a8,0x91a8,0x91aa,0x91b6,0x91b8,0x91b8,0x91ba,0x91bd,0x91bf,0x91c9,0x91cb,0x91d1,0x91d3,0x91d4,0x91d6,0x91df,0x91e1,0x91e1,0x91e3,0x91e7,0x91e9,0x91ea,0x91ec,0x91f1,0x91f5,0x91f7,0x91f9,0x91f9,0x91fb,0x91fd,0x91ff,0x9201,0x9204,0x9207,0x9209,0x920a,0x920c,0x920e,0x9210,0x9218,0x921c,0x921e,0x9223,0x9226,0x9228,0x9229,0x922c,0x922c,0x922e,0x9230,0x9233,0x923a,0x923c,0x923c,0x923e,0x9240,0x9242,0x924b,0x924d,0x9251,0x9256,0x925e,0x9260,0x9262,0x9264,0x9269,0x926e,0x9271,0x9275,0x9279,0x927b,0x9280,0x9283,0x9283,0x9285,0x9285,0x9288,0x928a,0x928d,0x928e,0x9291,0x9293,0x9295,0x929c,0x929f,0x92a0,0x92a4,0x92a5,0x92a7,0x92a8,0x92ab,0x92ab,0x92ad,0x92ad,0x92af,0x92af,0x92b2,0x92b3,0x92b6,0x92bd,0x92bf,0x92c3,0x92c5,0x92c8,0x92cb,0x92d0,0x92d2,0x92d3,0x92d5,0x92d5,0x92d7,0x92d9,0x92dc,0x92dd,0x92df,0x92e1,0x92e3,0x92e5,0x92e7,0x92ea,0x92ec,0x92ee,0x92f0,0x92f0,0x92f2,0x92f3,0x92f7,0x92fc,0x92ff,0x9300,0x9302,0x9302,0x9304,0x9304,0x9306,0x9306,0x9308,0x9308,0x930d,0x930d,0x930f,0x9311,0x9314,0x9315,0x9318,0x931a,0x931c,0x932c,0x932e,0x932f,0x9332,0x9337,0x933a,0x933b,0x9344,0x9344,0x9347,0x934b,0x934d,0x934d,0x9350,0x9352,0x9354,0x9358,0x935a,0x935c,0x935e,0x935e,0x9360,0x9360,0x9364,0x9365,0x9367,0x9367,0x9369,0x9371,0x9373,0x9376,0x937a,0x937a,0x937c,0x9382,0x9388,0x9388,0x938a,0x938d,0x938f,0x938f,0x9392,0x9392,0x9394,0x9398,0x939a,0x939b,0x939e,0x939e,0x93a1,0x93a1,0x93a3,0x93a4,0x93a6,0x93a9,0x93ab,0x93ae,0x93b0,0x93b0,0x93b4,0x93b6,0x93b9,0x93bb,0x93c1,0x93c1,0x93c3,0x93cd,0x93d0,0x93d1,0x93d3,0x93d3,0x93d6,0x93d9,0x93dc,0x93df,0x93e1,0x93e2,0x93e4,0x93e8,0x93f1,0x93f1,0x93f5,0x93f5,0x93f7,0x93fb,0x93fd,0x93fd,0x9401,0x9404,0x9407,0x9409,0x940d,0x9410,0x9413,0x941a,0x941f,0x941f,0x9421,0x9421,0x942b,0x942b,0x942e,0x942f,0x9431,0x9436,0x9438,0x9438,0x943a,0x943b,0x943d,0x943d,0x943f,0x943f,0x9441,0x9441,0x9443,0x9445,0x9448,0x9448,0x944a,0x944a,0x944c,0x944c,0x9451,0x9453,0x9455,0x9455,0x9459,0x945c,0x945e,0x9463,0x9468,0x9468,0x946a,0x946b,0x946d,0x9472,0x9475,0x9475,0x9477,0x9477,0x947c,0x947f,0x9481,0x9481,0x9483,0x9485,0x9577,0x9579,0x957e,0x9580,0x9582,0x9584,0x9586,0x958f,0x9591,0x9594,0x9596,0x9596,0x9598,0x9599,0x959d,0x95a9,0x95ab,0x95ad,0x95b1,0x95b2,0x95b4,0x95b4,0x95b6,0x95b6,0x95b9,0x95bf,0x95c3,0x95c3,0x95c6,0x95cd,0x95d0,0x95d6,0x95d8,0x95da,0x95dc,0x95e2,0x95e4,0x95e6,0x95e8,0x95e8,0x961c,0x961e,0x9621,0x9622,0x9624,0x9626,0x9628,0x9628,0x962a,0x962a,0x962c,0x962c,0x962e,0x962f,0x9631,0x9634,0x9637,0x963d,0x963f,0x9642,0x9644,0x9644,0x964b,0x964d,0x964f,0x9650,0x9652,0x9652,0x9654,0x9654,0x9656,0x9658,0x965b,0x965f,0x9661,0x9666,0x966a,0x966a,0x966c,0x966c,0x966e,0x966e,0x9670,0x9670,0x9672,0x9678,0x967a,0x967f,0x9681,0x9686,0x9688,0x968b,0x968d,0x968f,0x9691,0x9691,0x9694,0x969d,0x969f,0x96a0,0x96a3,0x96aa,0x96ae,0x96b4,0x96b6,0x96bd,0x96c0,0x96c1,0x96c4,0x96c7,0x96c9,0x96ce,0x96d1,0x96d2,0x96d5,0x96d6,0x96d8,0x96df,0x96e2,0x96e3,0x96e8,0x96eb,0x96ef,0x96f2,0x96f6,0x96f7,0x96f9,0x96fb,0x9700,0x9700,0x9702,0x970a,0x970d,0x970f,0x9711,0x9711,0x9713,0x9714,0x9716,0x9716,0x9719,0x971e,0x9721,0x9724,0x9727,0x9728,0x972a,0x972a,0x9730,0x9733,0x9736,0x9736,0x9738,0x9739,0x973b,0x973b,0x973d,0x973e,0x9741,0x9744,0x9746,0x974a,0x974d,0x974f,0x9751,0x9752,0x9755,0x975c,0x975e,0x975e,0x9760,0x9764,0x9766,0x976b,0x976d,0x976e,0x9771,0x9771,0x9773,0x9774,0x9776,0x977d,0x977f,0x9781,0x9784,0x9786,0x9789,0x9789,0x978b,0x978b,0x978d,0x978d,0x978f,0x9790,0x9795,0x979a,0x979c,0x979c,0x979e,0x97a0,0x97a2,0x97a3,0x97a6,0x97a6,0x97a8,0x97a8,0x97ab,0x97ae,0x97b1,0x97b6,0x97b8,0x97ba,0x97bc,0x97bc,0x97be,0x97bf,0x97c1,0x97c1,0x97c3,0x97ce,0x97d0,0x97d1,0x97d3,0x97d4,0x97d7,0x97d9,0x97db,0x97de,0x97e0,0x97e1,0x97e4,0x97e4,0x97e6,0x97e6,0x97ed,0x97ef,0x97f1,0x97f8,0x97fa,0x97fb,0x97ff,0x97ff,0x9801,0x9808,0x980a,0x980a,0x980c,0x9814,0x9816,0x981a,0x981c,0x981c,0x981e,0x981e,0x9820,0x9821,0x9823,0x9826,0x982b,0x9830,0x9832,0x9835,0x9837,0x9839,0x983b,0x983e,0x9844,0x9844,0x9846,0x9847,0x984a,0x984f,0x9851,0x985b,0x985e,0x985e,0x9862,0x9863,0x9865,0x9867,0x986a,0x986c,0x986f,0x9871,0x9873,0x9875,0x98a8,0x98a8,0x98aa,0x98ab,0x98ad,0x98b1,0x98b4,0x98b4,0x98b6,0x98b8,0x98ba,0x98bc,0x98bf,0x98bf,0x98c2,0x98c8,0x98cb,0x98cc,0x98ce,0x98ce,0x98db,0x98dc,0x98de,0x98e3,0x98e5,0x98e7,0x98e9,0x98eb,0x98ed,0x98f4,0x98f6,0x98f6,0x98fc,0x98fe,0x9902,0x9903,0x9905,0x9905,0x9907,0x990a,0x990c,0x990c,0x9910,0x9918,0x991a,0x9922,0x9924,0x9924,0x9926,0x9928,0x992b,0x992c,0x992e,0x992e,0x9931,0x9935,0x9939,0x993e,0x9940,0x9942,0x9945,0x9949,0x994b,0x994e,0x9950,0x9952,0x9954,0x9955,0x9957,0x9959,0x995b,0x995c,0x995e,0x9960,0x9963,0x9963,0x9996,0x9999,0x999b,0x999b,0x999d,0x999f,0x99a3,0x99a3,0x99a5,0x99a6,0x99a8,0x99a8,0x99ac,0x99ae,0x99b0,0x99b5,0x99b9,0x99ba,0x99bc,0x99bd,0x99bf,0x99bf,0x99c1,0x99c1,0x99c3,0x99c6,0x99c8,0x99c9,0x99d0,0x99d5,0x99d8,0x99df,0x99e1,0x99e2,0x99e7,0x99e7,0x99ea,0x99ee,0x99f0,0x99f2,0x99f4,0x99f5,0x99f8,0x99f9,0x99fb,0x99ff,0x9a01,0x9a05,0x9a08,0x9a08,0x9a0a,0x9a0c,0x9a0e,0x9a13,0x9a16,0x9a16,0x9a19,0x9a1a,0x9a1e,0x9a1e,0x9a20,0x9a20,0x9a22,0x9a24,0x9a27,0x9a28,0x9a2b,0x9a2b,0x9a2d,0x9a2e,0x9a30,0x9a31,0x9a33,0x9a33,0x9a35,0x9a38,0x9a3e,0x9a3e,0x9a40,0x9a45,0x9a47,0x9a47,0x9a4a,0x9a4e,0x9a51,0x9a52,0x9a54,0x9a58,0x9a5a,0x9a5b,0x9a5d,0x9a5d,0x9a5f,0x9a5f,0x9a62,0x9a62,0x9a64,0x9a65,0x9a69,0x9a6c,0x9aa8,0x9aa8,0x9aaa,0x9aaa,0x9aac,0x9ab0,0x9ab2,0x9ab2,0x9ab4,0x9ab9,0x9abb,0x9ac1,0x9ac3,0x9ac4,0x9ac6,0x9ac6,0x9ac8,0x9ac8,0x9ace,0x9ad9,0x9adb,0x9adc,0x9ade,0x9ae0,0x9ae2,0x9ae7,0x9ae9,0x9aef,0x9af1,0x9af5,0x9af7,0x9af7,0x9af9,0x9afb,0x9afd,0x9afd,0x9aff,0x9b06,0x9b08,0x9b09,0x9b0b,0x9b0e,0x9b10,0x9b10,0x9b12,0x9b12,0x9b16,0x9b16,0x9b18,0x9b1d,0x9b1f,0x9b20,0x9b22,0x9b23,0x9b25,0x9b2f,0x9b31,0x9b35,0x9b37,0x9b37,0x9b39,0x9b3d,0x9b41,0x9b45,0x9b48,0x9b48,0x9b4b,0x9b4f,0x9b51,0x9b51,0x9b54,0x9b58,0x9b5a,0x9b5b,0x9b5e,0x9b5e,0x9b61,0x9b61,0x9b63,0x9b63,0x9b65,0x9b66,0x9b68,0x9b68,0x9b6a,0x9b6f,0x9b72,0x9b79,0x9b7f,0x9b80,0x9b83,0x9b87,0x9b89,0x9b8b,0x9b8d,0x9b94,0x9b96,0x9b97,0x9b9a,0x9b9a,0x9b9d,0x9ba0,0x9ba6,0x9bae,0x9bb0,0x9bb2,0x9bb4,0x9bb4,0x9bb7,0x9bb9,0x9bbb,0x9bbc,0x9bbe,0x9bc1,0x9bc6,0x9bca,0x9bce,0x9bd2,0x9bd4,0x9bd4,0x9bd6,0x9bd8,0x9bdb,0x9bdb,0x9bdd,0x9bdd,0x9bdf,0x9bdf,0x9be1,0x9be5,0x9be7,0x9be8,0x9bea,0x9beb,0x9bee,0x9bf3,0x9bf5,0x9bf5,0x9bf7,0x9bfa,0x9bfd,0x9bfd,0x9bff,0x9c00,0x9c02,0x9c02,0x9c04,0x9c04,0x9c06,0x9c06,0x9c08,0x9c0d,0x9c0f,0x9c16,0x9c18,0x9c1e,0x9c21,0x9c2a,0x9c2d,0x9c32,0x9c35,0x9c37,0x9c39,0x9c3b,0x9c3d,0x9c3e,0x9c41,0x9c41,0x9c43,0x9c4a,0x9c4e,0x9c50,0x9c52,0x9c54,0x9c56,0x9c58,0x9c5a,0x9c61,0x9c63,0x9c63,0x9c65,0x9c65,0x9c67,0x9c6b,0x9c6d,0x9c6e,0x9c70,0x9c70,0x9c72,0x9c72,0x9c75,0x9c78,0x9c7a,0x9c7c,0x9ce5,0x9ce7,0x9ce9,0x9ce9,0x9ceb,0x9cec,0x9cf0,0x9cf0,0x9cf2,0x9cf4,0x9cf6,0x9cf7,0x9cf9,0x9cf9,0x9d02,0x9d03,0x9d06,0x9d09,0x9d0b,0x9d0b,0x9d0e,0x9d0e,0x9d11,0x9d12,0x9d15,0x9d15,0x9d17,0x9d18,0x9d1b,0x9d1f,0x9d23,0x9d23,0x9d26,0x9d26,0x9d28,0x9d28,0x9d2a,0x9d2c,0x9d2f,0x9d30,0x9d32,0x9d34,0x9d3a,0x9d3f,0x9d41,0x9d48,0x9d4a,0x9d4a,0x9d50,0x9d54,0x9d59,0x9d59,0x9d5c,0x9d65,0x9d69,0x9d6c,0x9d6f,0x9d70,0x9d72,0x9d73,0x9d76,0x9d77,0x9d7a,0x9d7c,0x9d7e,0x9d7e,0x9d83,0x9d84,0x9d86,0x9d87,0x9d89,0x9d8a,0x9d8d,0x9d8f,0x9d92,0x9d93,0x9d95,0x9d9a,0x9da1,0x9da1,0x9da4,0x9da4,0x9da9,0x9dac,0x9dae,0x9daf,0x9db1,0x9db2,0x9db4,0x9db5,0x9db8,0x9dbd,0x9dbf,0x9dc4,0x9dc6,0x9dc7,0x9dc9,0x9dca,0x9dcf,0x9dcf,0x9dd3,0x9dd7,0x9dd9,0x9dda,0x9dde,0x9de0,0x9de3,0x9de3,0x9de5,0x9de7,0x9de9,0x9de9,0x9deb,0x9deb,0x9ded,0x9df0,0x9df2,0x9df4,0x9df8,0x9dfa,0x9dfd,0x9dfe,0x9e02,0x9e02,0x9e07,0x9e07,0x9e0a,0x9e0a,0x9e0d,0x9e0e,0x9e10,0x9e12,0x9e15,0x9e16,0x9e19,0x9e1f,0x9e75,0x9e75,0x9e78,0x9e7d,0x9e7f,0x9e85,0x9e87,0x9e88,0x9e8b,0x9e8c,0x9e8e,0x9e8f,0x9e91,0x9e93,0x9e95,0x9e98,0x9e9b,0x9e9b,0x9e9d,0x9e9f,0x9ea4,0x9ea6,0x9ea8,0x9eaa,0x9eac,0x9eb0,0x9eb3,0x9eb5,0x9eb8,0x9ebf,0x9ec3,0x9ec4,0x9ec6,0x9ec6,0x9ec8,0x9ec8,0x9ecb,0x9ed2,0x9ed4,0x9ed5,0x9ed8,0x9ed9,0x9edb,0x9ee0,0x9ee4,0x9ee5,0x9ee7,0x9ee8,0x9eec,0x9ef2,0x9ef4,0x9ef9,0x9efb,0x9eff,0x9f02,0x9f03,0x9f07,0x9f09,0x9f0e,0x9f17,0x9f19,0x9f1b,0x9f1f,0x9f22,0x9f26,0x9f26,0x9f2a,0x9f2c,0x9f2f,0x9f2f,0x9f31,0x9f32,0x9f34,0x9f34,0x9f37,0x9f37,0x9f39,0x9f3f,0x9f41,0x9f41,0x9f43,0x9f47,0x9f4a,0x9f4b,0x9f4e,0x9f50,0x9f52,0x9f58,0x9f5a,0x9f5a,0x9f5d,0x9f63,0x9f66,0x9f6a,0x9f6c,0x9f73,0x9f75,0x9f77,0x9f7a,0x9f7a,0x9f7d,0x9f7d,0x9f7f,0x9f7f,0x9f8d,0x9f8d,0x9f8f,0x9f92,0x9f94,0x9f97,0x9f99,0x9f99,0x9f9c,0x9fa3,0x9fa5,0x9fa5,0x9fb4,0x9fb4,0x9fbc,0x9fc2,0x9fc4,0x9fc4,0x9fc6,0x9fc6,0x9fcc,0x9fcc,0xf900,0xf959,0xf95b,0xf9f2,0xf9f4,0xfa0b,0xfa0e,0xfa6d,0xfb00,0xfb04,0xfe10,0xfe19,0xfe30,0xfe52,0xfe54,0xfe66,0xfe68,0xfe6b,0xff01,0xff9f,0xffa1,0xffbe,0xffc2,0xffc7,0xffca,0xffcf,0xffd2,0xffd7,0xffda,0xffdc,0xffe0,0xffe6,0xffe8,0xffee,0x1f100,0x1f10c,0x1f110,0x1f16c,0x1f170,0x1f1ac,0x1f200,0x1f202,0x1f210,0x1f23b,0x1f240,0x1f248,0x1f250,0x1f251,0x2000b,0x2000b,0x20089,0x2008a,0x200a2,0x200a2,0x200a4,0x200a4,0x200b0,0x200b0,0x200f5,0x200f5,0x20158,0x20158,0x201a2,0x201a2,0x20213,0x20213,0x2032b,0x2032b,0x20371,0x20371,0x20381,0x20381,0x203f9,0x203f9,0x2044a,0x2044a,0x20509,0x20509,0x2053f,0x2053f,0x205b1,0x205b1,0x205d6,0x205d6,0x20611,0x20611,0x20628,0x20628,0x206ec,0x206ec,0x2074f,0x2074f,0x207c8,0x207c8,0x20807,0x20807,0x2083a,0x2083a,0x208b9,0x208b9,0x2090e,0x2090e,0x2097c,0x2097c,0x20984,0x20984,0x2099d,0x2099d,0x20a64,0x20a64,0x20ad3,0x20ad3,0x20b1d,0x20b1d,0x20b9f,0x20b9f,0x20bb7,0x20bb7,0x20d45,0x20d45,0x20d58,0x20d58,0x20de1,0x20de1,0x20e64,0x20e64,0x20e6d,0x20e6d,0x20e95,0x20e95,0x20f5f,0x20f5f,0x21201,0x21201,0x2123d,0x2123d,0x21255,0x21255,0x21274,0x21274,0x2127b,0x2127b,0x212d7,0x212d7,0x212e4,0x212e4,0x212fd,0x212fd,0x2131b,0x2131b,0x21336,0x21336,0x21344,0x21344,0x213c4,0x213c4,0x2146d,0x2146e,0x215d7,0x215d7,0x21647,0x21647,0x216b4,0x216b4,0x21706,0x21706,0x21742,0x21742,0x218bd,0x218bd,0x219c3,0x219c3,0x21a1a,0x21a1a,0x21c56,0x21c56,0x21d2d,0x21d2d,0x21d45,0x21d45,0x21d62,0x21d62,0x21d78,0x21d78,0x21d92,0x21d92,0x21d9c,0x21d9c,0x21da1,0x21da1,0x21db7,0x21db7,0x21de0,0x21de0,0x21e33,0x21e34,0x21f1e,0x21f1e,0x21f76,0x21f76,0x21ffa,0x21ffa,0x2217b,0x2217b,0x22218,0x22218,0x2231e,0x2231e,0x223ad,0x223ad,0x22609,0x22609,0x226f3,0x226f3,0x2285b,0x2285b,0x228ab,0x228ab,0x2298f,0x2298f,0x22ab8,0x22ab8,0x22b46,0x22b46,0x22b4f,0x22b50,0x22ba6,0x22ba6,0x22c1d,0x22c1d,0x22c24,0x22c24,0x22de1,0x22de1,0x22e42,0x22e42,0x22feb,0x22feb,0x231b6,0x231b6,0x231c3,0x231c4,0x231f5,0x231f5,0x23372,0x23372,0x233cc,0x233cc,0x233d0,0x233d0,0x233d2,0x233d3,0x233d5,0x233d5,0x233da,0x233da,0x233df,0x233df,0x233e4,0x233e4,0x233fe,0x233fe,0x2344a,0x2344b,0x23451,0x23451,0x23465,0x23465,0x234e4,0x234e4,0x2355a,0x2355a,0x23594,0x23594,0x235c4,0x235c4,0x23638,0x2363a,0x23647,0x23647,0x2370c,0x2370c,0x2371c,0x2371c,0x2373f,0x2373f,0x23763,0x23764,0x237e7,0x237e7,0x237f1,0x237f1,0x237ff,0x237ff,0x23824,0x23824,0x2383d,0x2383d,0x23a98,0x23a98,0x23c7f,0x23c7f,0x23cbe,0x23cbe,0x23cfe,0x23cfe,0x23d00,0x23d00,0x23d0e,0x23d0e,0x23d40,0x23d40,0x23dd3,0x23dd3,0x23df9,0x23dfa,0x23f7e,0x23f7e,0x2404b,0x2404b,0x24096,0x24096,0x24103,0x24103,0x241c6,0x241c6,0x241fe,0x241fe,0x242ee,0x242ee,0x243bc,0x243bc,0x243d0,0x243d0,0x24629,0x24629,0x246a5,0x246a5,0x247f1,0x247f1,0x24896,0x24896,0x248e9,0x248e9,0x24a4d,0x24a4d,0x24b56,0x24b56,0x24b6f,0x24b6f,0x24c16,0x24c16,0x24d14,0x24d14,0x24e04,0x24e04,0x24e0e,0x24e0e,0x24e37,0x24e37,0x24e6a,0x24e6a,0x24e8b,0x24e8b,0x24ff2,0x24ff2,0x2504a,0x2504a,0x25055,0x25055,0x25122,0x25122,0x251a9,0x251a9,0x251cd,0x251cd,0x251e5,0x251e5,0x2521e,0x2521e,0x2524c,0x2524c,0x2542e,0x2542e,0x2548e,0x2548e,0x254d9,0x254d9,0x2550e,0x2550e,0x255a7,0x255a7,0x2567f,0x2567f,0x25771,0x25771,0x257a9,0x257a9,0x257b4,0x257b4,0x25874,0x25874,0x259c4,0x259c4,0x259cc,0x259cc,0x259d4,0x259d4,0x25ad7,0x25ad7,0x25ae3,0x25ae4,0x25af1,0x25af1,0x25bb2,0x25bb2,0x25c4b,0x25c4b,0x25c64,0x25c64,0x25da1,0x25da1,0x25e2e,0x25e2e,0x25e56,0x25e56,0x25e62,0x25e62,0x25e65,0x25e65,0x25ec2,0x25ec2,0x25ed8,0x25ed8,0x25ee8,0x25ee8,0x25f23,0x25f23,0x25f5c,0x25f5c,0x25fd4,0x25fd4,0x25fe0,0x25fe0,0x25ffb,0x25ffb,0x2600c,0x2600c,0x26017,0x26017,0x26060,0x26060,0x260ed,0x260ed,0x26222,0x26222,0x2626a,0x2626a,0x26270,0x26270,0x26286,0x26286,0x2634c,0x2634c,0x26402,0x26402,0x2667e,0x2667e,0x266b0,0x266b0,0x2671d,0x2671d,0x268dd,0x268dd,0x268ea,0x268ea,0x26951,0x26951,0x2696f,0x2696f,0x26999,0x26999,0x269dd,0x269dd,0x26a1e,0x26a1e,0x26a58,0x26a58,0x26a8c,0x26a8c,0x26ab7,0x26ab7,0x26aff,0x26aff,0x26c29,0x26c29,0x26c73,0x26c73,0x26c9e,0x26c9e,0x26cdd,0x26cdd,0x26e40,0x26e40,0x26e65,0x26e65,0x26f94,0x26f94,0x26ff6,0x26ff8,0x270f4,0x270f4,0x2710d,0x2710d,0x27139,0x27139,0x273da,0x273db,0x273fe,0x273fe,0x27410,0x27410,0x27449,0x27449,0x27614,0x27615,0x27631,0x27631,0x27684,0x27684,0x27693,0x27693,0x2770e,0x2770e,0x27723,0x27723,0x27752,0x27752,0x278b2,0x278b2,0x27985,0x27985,0x279b4,0x279b4,0x27a84,0x27a84,0x27bb3,0x27bb3,0x27bbe,0x27bbe,0x27bc7,0x27bc7,0x27c3c,0x27c3c,0x27cb8,0x27cb8,0x27d73,0x27d73,0x27da0,0x27da0,0x27e10,0x27e10,0x27eaf,0x27eaf,0x27fb7,0x27fb7,0x2808a,0x2808a,0x280bb,0x280bb,0x28277,0x28277,0x28282,0x28282,0x282f3,0x282f3,0x283cd,0x283cd,0x2840c,0x2840c,0x28455,0x28455,0x284dc,0x284dc,0x2856b,0x2856b,0x285c8,0x285c9,0x286d7,0x286d7,0x286fa,0x286fa,0x28946,0x28946,0x28949,0x28949,0x2896b,0x2896b,0x28987,0x28988,0x289ba,0x289bb,0x28a1e,0x28a1e,0x28a29,0x28a29,0x28a43,0x28a43,0x28a71,0x28a71,0x28a99,0x28a99,0x28acd,0x28acd,0x28add,0x28add,0x28ae4,0x28ae4,0x28bc1,0x28bc1,0x28bef,0x28bef,0x28cdd,0x28cdd,0x28d10,0x28d10,0x28d71,0x28d71,0x28dfb,0x28dfb,0x28e0f,0x28e0f,0x28e17,0x28e17,0x28e1f,0x28e1f,0x28e36,0x28e36,0x28e89,0x28e89,0x28eeb,0x28eeb,0x28ef6,0x28ef6,0x28f32,0x28f32,0x28ff8,0x28ff8,0x292a0,0x292a0,0x292b1,0x292b1,0x29490,0x29490,0x295cf,0x295cf,0x2967f,0x2967f,0x296f0,0x296f0,0x29719,0x29719,0x29750,0x29750,0x29810,0x29810,0x298c6,0x298c6,0x29a72,0x29a72,0x29d4b,0x29d4b,0x29ddb,0x29ddb,0x29e15,0x29e15,0x29e3d,0x29e3d,0x29e49,0x29e49,0x29e8a,0x29e8a,0x29ec4,0x29ec4,0x29edb,0x29edb,0x29ee9,0x29ee9,0x29fce,0x29fce,0x29fd7,0x29fd7,0x2a01a,0x2a01a,0x2a02f,0x2a02f,0x2a082,0x2a082,0x2a0f9,0x2a0f9,0x2a190,0x2a190,0x2a2b2,0x2a2b2,0x2a38c,0x2a38c,0x2a437,0x2a437,0x2a5f1,0x2a5f1,0x2a602,0x2a602,0x2a61a,0x2a61a,0x2a6b2,0x2a6b2,0x2a9e6,0x2a9e6,0x2b746,0x2b746,0x2b751,0x2b751,0x2b753,0x2b753,0x2b75a,0x2b75a,0x2b75c,0x2b75c,0x2b765,0x2b765,0x2b776,0x2b777,0x2b77c,0x2b77c,0x2b782,0x2b782,0x2b789,0x2b789,0x2b78b,0x2b78b,0x2b78e,0x2b78e,0x2b794,0x2b794,0x2b7ac,0x2b7ac,0x2b7af,0x2b7af,0x2b7bd,0x2b7bd,0x2b7c9,0x2b7c9,0x2b7cf,0x2b7cf,0x2b7d2,0x2b7d2,0x2b7d8,0x2b7d8,0x2b7f0,0x2b7f0,0x2b80d,0x2b80d,0x2b817,0x2b817,0x2b81a,0x2b81a,0x2d544,0x2d544,0x2e278,0x2e278,0x2e569,0x2e569,0x2e6ea,0x2e6ea,0x2f804,0x2f804,0x2f80f,0x2f80f,0x2f815,0x2f815,0x2f818,0x2f818,0x2f81a,0x2f81a,0x2f822,0x2f822,0x2f828,0x2f828,0x2f82c,0x2f82c,0x2f833,0x2f833,0x2f83f,0x2f83f,0x2f846,0x2f846,0x2f852,0x2f852,0x2f862,0x2f862,0x2f86d,0x2f86d,0x2f873,0x2f873,0x2f877,0x2f877,0x2f884,0x2f884,0x2f899,0x2f89a,0x2f8a6,0x2f8a6,0x2f8ac,0x2f8ac,0x2f8b2,0x2f8b2,0x2f8b6,0x2f8b6,0x2f8d3,0x2f8d3,0x2f8db,0x2f8dc,0x2f8e1,0x2f8e1,0x2f8e5,0x2f8e5,0x2f8ea,0x2f8ea,0x2f8ed,0x2f8ed,0x2f8fc,0x2f8fc,0x2f903,0x2f903,0x2f90b,0x2f90b,0x2f90f,0x2f90f,0x2f91a,0x2f91a,0x2f920,0x2f921,0x2f945,0x2f945,0x2f947,0x2f947,0x2f96c,0x2f96c,0x2f995,0x2f995,0x2f9d0,0x2f9d0,0x2f9de,0x2f9df,0x2f9f4,0x2f9f4,0x30ede,0x30ede,0x3106c,0x3106c,]),
-  NotoFont.fromFlatRanges('Noto Sans Javanese', 'https://fonts.gstatic.com/s/notosansjavanese/v15/2V0AKJkDAIA6Hp4zoSScDjV0Y-eoHAHJ8r88Rp29eA.ttf', <int>[0x20,0x20,0xa0,0xa0,0x200b,0x200d,0x25cc,0x25cc,0xa980,0xa9cd,0xa9cf,0xa9d9,0xa9de,0xa9df,]),
-  NotoFont.fromFlatRanges('Noto Sans KR', 'https://fonts.gstatic.com/s/notosanskr/v27/PbykFmXiEBPT4ITbgNA5Cgm20HTs4JMMuA.otf', <int>[0x20,0x7e,0xa0,0x103,0x110,0x113,0x11a,0x11b,0x128,0x12b,0x143,0x144,0x147,0x148,0x14c,0x14f,0x152,0x153,0x168,0x16d,0x192,0x192,0x1a0,0x1a1,0x1af,0x1b0,0x1cd,0x1dc,0x1f8,0x1f9,0x251,0x251,0x261,0x261,0x2bb,0x2bb,0x2c7,0x2c7,0x2c9,0x2cb,0x2d9,0x2d9,0x2ea,0x2eb,0x300,0x301,0x304,0x304,0x307,0x307,0x30c,0x30c,0x391,0x3a1,0x3a3,0x3a9,0x3b1,0x3c9,0x401,0x401,0x410,0x44f,0x451,0x451,0x1100,0x11ff,0x1e3e,0x1e3f,0x1ea0,0x1ef9,0x2002,0x2003,0x2010,0x2016,0x2018,0x201a,0x201c,0x201e,0x2020,0x2022,0x2025,0x2027,0x2030,0x2030,0x2032,0x2033,0x2035,0x2035,0x2039,0x203c,0x2042,0x2042,0x2047,0x2049,0x2051,0x2051,0x2074,0x2074,0x20a9,0x20a9,0x20ab,0x20ac,0x20dd,0x20de,0x2100,0x2100,0x2103,0x2103,0x2105,0x2105,0x2109,0x210a,0x210f,0x210f,0x2113,0x2113,0x2116,0x2116,0x2121,0x2122,0x2126,0x2127,0x212b,0x212b,0x212e,0x212e,0x2135,0x2135,0x213b,0x213b,0x2160,0x216b,0x2170,0x217b,0x2190,0x2199,0x21b8,0x21b9,0x21c4,0x21c6,0x21cb,0x21cc,0x21d0,0x21d0,0x21d2,0x21d2,0x21d4,0x21d4,0x21e6,0x21e9,0x21f5,0x21f5,0x2200,0x2200,0x2202,0x2203,0x2205,0x220b,0x220f,0x220f,0x2211,0x2213,0x2215,0x2215,0x221a,0x221a,0x221d,0x2220,0x2223,0x2223,0x2225,0x222e,0x2234,0x2237,0x223d,0x223d,0x2243,0x2243,0x2245,0x2245,0x2248,0x2248,0x224c,0x224c,0x2252,0x2252,0x2260,0x2262,0x2264,0x2267,0x226a,0x226b,0x226e,0x226f,0x2272,0x2273,0x2276,0x2277,0x2282,0x2287,0x228a,0x228b,0x2295,0x2299,0x22a0,0x22a0,0x22a5,0x22a5,0x22bf,0x22bf,0x22da,0x22db,0x22ef,0x22ef,0x2305,0x2307,0x2312,0x2312,0x2318,0x2318,0x2329,0x232a,0x23b0,0x23b1,0x23be,0x23cc,0x23ce,0x23ce,0x23da,0x23db,0x2423,0x2423,0x2460,0x25ab,0x25b1,0x25b3,0x25b6,0x25b7,0x25bc,0x25bd,0x25c0,0x25c1,0x25c6,0x25cc,0x25ce,0x25d3,0x25e2,0x25e6,0x25ef,0x25ef,0x2600,0x2603,0x2605,0x2606,0x2609,0x2609,0x260e,0x260f,0x2616,0x2617,0x261c,0x261f,0x262f,0x262f,0x2640,0x2642,0x2660,0x266f,0x2672,0x267d,0x26a0,0x26a0,0x26bd,0x26be,0x2702,0x2702,0x2713,0x2713,0x271a,0x271a,0x273d,0x273d,0x273f,0x2740,0x2756,0x2756,0x2776,0x2793,0x27a1,0x27a1,0x2934,0x2935,0x29bf,0x29bf,0x29fa,0x29fb,0x2b05,0x2b07,0x2b1a,0x2b1a,0x2b95,0x2b95,0x2e3a,0x2e3b,0x2e80,0x2e99,0x2e9b,0x2ef3,0x2f00,0x2fd5,0x2ff0,0x2ffb,0x3000,0x303f,0x3041,0x3096,0x3099,0x30ff,0x3105,0x312f,0x3131,0x318e,0x3190,0x31bb,0x31c0,0x31e3,0x31f0,0x321e,0x3220,0x332b,0x332d,0x33ff,0x349a,0x349a,0x34d7,0x34d7,0x3515,0x3515,0x3521,0x3521,0x353e,0x353e,0x35ff,0x35ff,0x366f,0x366f,0x36c3,0x36c5,0x36e6,0x36e6,0x3723,0x3723,0x372f,0x372f,0x373a,0x373a,0x37bc,0x37bc,0x380c,0x380c,0x3818,0x3818,0x3883,0x3883,0x38ba,0x38ba,0x38e7,0x38e7,0x38fd,0x38fd,0x3960,0x3960,0x3965,0x3965,0x3983,0x3983,0x3990,0x3990,0x39a5,0x39a5,0x39b6,0x39b6,0x3a39,0x3a39,0x3aa4,0x3aa4,0x3adc,0x3adc,0x3af6,0x3af6,0x3b03,0x3b03,0x3b23,0x3b23,0x3b79,0x3b79,0x3bf3,0x3bf3,0x3c14,0x3c14,0x3c24,0x3c24,0x3c2d,0x3c2d,0x3cbd,0x3cbe,0x3cfc,0x3cfc,0x3d17,0x3d17,0x3d5f,0x3d5f,0x3dbc,0x3dbc,0x3dc2,0x3dc2,0x3ec4,0x3ec4,0x3eed,0x3eed,0x3efd,0x3efd,0x3f04,0x3f04,0x402f,0x402f,0x4034,0x4034,0x4062,0x4062,0x40a9,0x40a9,0x40c9,0x40c9,0x4137,0x4137,0x41ac,0x41ac,0x4259,0x4259,0x43bb,0x43bb,0x43c7,0x43c7,0x43e7,0x43e7,0x43ea,0x43ea,0x4450,0x4450,0x4512,0x4512,0x45f2,0x45f2,0x4618,0x4618,0x46b7,0x46b7,0x46be,0x46be,0x46d4,0x46d4,0x46d8,0x46d8,0x46dd,0x46dd,0x472d,0x472d,0x476c,0x476c,0x477d,0x477d,0x479f,0x479f,0x4863,0x4863,0x4883,0x4883,0x4896,0x4896,0x48a6,0x48a6,0x4925,0x4925,0x499e,0x499e,0x49a5,0x49a5,0x49cb,0x49cb,0x4a12,0x4a12,0x4a2d,0x4a2d,0x4ab8,0x4ab8,0x4adf,0x4adf,0x4ae8,0x4ae8,0x4afb,0x4afb,0x4b53,0x4b53,0x4b71,0x4b71,0x4cdf,0x4ce0,0x4d1b,0x4d1b,0x4e00,0x4e01,0x4e03,0x4e03,0x4e07,0x4e0b,0x4e0d,0x4e0e,0x4e11,0x4e11,0x4e14,0x4e16,0x4e18,0x4e19,0x4e1e,0x4e1f,0x4e24,0x4e24,0x4e26,0x4e26,0x4e28,0x4e28,0x4e2b,0x4e2d,0x4e30,0x4e32,0x4e36,0x4e36,0x4e38,0x4e39,0x4e3b,0x4e3b,0x4e3f,0x4e3f,0x4e42,0x4e43,0x4e45,0x4e45,0x4e4b,0x4e4b,0x4e4d,0x4e4f,0x4e56,0x4e5b,0x4e5d,0x4e5f,0x4e67,0x4e67,0x4e6b,0x4e6d,0x4e71,0x4e71,0x4e73,0x4e73,0x4e76,0x4e77,0x4e7a,0x4e7c,0x4e7e,0x4e7e,0x4e80,0x4e80,0x4e82,0x4e82,0x4e85,0x4e86,0x4e88,0x4e89,0x4e8b,0x4e8c,0x4e8e,0x4e92,0x4e94,0x4e95,0x4e98,0x4e99,0x4e9b,0x4e9c,0x4e9e,0x4ea2,0x4ea4,0x4ea6,0x4ea8,0x4ea8,0x4eab,0x4eae,0x4eb0,0x4eb0,0x4eb3,0x4eb4,0x4eb6,0x4eb6,0x4eb9,0x4ebb,0x4ec0,0x4ec1,0x4ec4,0x4ec4,0x4ec6,0x4ec7,0x4eca,0x4ecb,0x4ecd,0x4ecd,0x4ed4,0x4ed9,0x4edd,0x4edf,0x4ee1,0x4ee1,0x4ee3,0x4ee5,0x4eee,0x4eee,0x4ef0,0x4ef0,0x4ef2,0x4ef3,0x4ef5,0x4ef7,0x4efb,0x4efb,0x4efd,0x4efd,0x4eff,0x4f01,0x4f09,0x4f0b,0x4f0d,0x4f11,0x4f1a,0x4f1a,0x4f1d,0x4f1d,0x4f2f,0x4f30,0x4f34,0x4f34,0x4f36,0x4f36,0x4f38,0x4f38,0x4f3a,0x4f3a,0x4f3c,0x4f3e,0x4f42,0x4f43,0x4f46,0x4f49,0x4f4b,0x4f4b,0x4f4d,0x4f51,0x4f53,0x4f57,0x4f59,0x4f5f,0x4f69,0x4f6a,0x4f6f,0x4f70,0x4f73,0x4f74,0x4f76,0x4f76,0x4f78,0x4f81,0x4f83,0x4f84,0x4f86,0x4f86,0x4f88,0x4f8b,0x4f8d,0x4f92,0x4f94,0x4f94,0x4f96,0x4f98,0x4f9a,0x4f9d,0x4fae,0x4faf,0x4fb2,0x4fb2,0x4fb5,0x4fb6,0x4fb9,0x4fb9,0x4fbb,0x4fbb,0x4fbf,0x4fbf,0x4fc1,0x4fc5,0x4fc9,0x4fca,0x4fcc,0x4fd4,0x4fd7,0x4fdb,0x4fdd,0x4fe1,0x4fe3,0x4fe3,0x4fee,0x4ff1,0x4ff3,0x4ff6,0x4ff8,0x4ff8,0x4ffa,0x4ffa,0x4ffe,0x4ffe,0x5000,0x5000,0x5002,0x5002,0x5005,0x5007,0x5009,0x5009,0x500b,0x500b,0x500d,0x500d,0x500f,0x500f,0x5011,0x5014,0x5016,0x5016,0x5018,0x501a,0x501c,0x501c,0x501e,0x501f,0x5021,0x502e,0x5030,0x5030,0x503b,0x503b,0x5043,0x5044,0x5047,0x504a,0x504e,0x504f,0x5053,0x5053,0x5055,0x5056,0x5058,0x505a,0x505c,0x505c,0x5060,0x5060,0x5062,0x5062,0x5065,0x5066,0x506a,0x506a,0x5070,0x5070,0x5072,0x5072,0x5074,0x5076,0x5078,0x5078,0x5080,0x5080,0x5083,0x5083,0x5085,0x5085,0x508b,0x508b,0x508d,0x508d,0x5091,0x5092,0x5094,0x5094,0x5096,0x5096,0x5098,0x509b,0x509d,0x509e,0x50a2,0x50a2,0x50ac,0x50ae,0x50b2,0x50b5,0x50b7,0x50b7,0x50bd,0x50bf,0x50c2,0x50c2,0x50c4,0x50c5,0x50c9,0x50ca,0x50cf,0x50cf,0x50d1,0x50d1,0x50d4,0x50d6,0x50da,0x50db,0x50de,0x50de,0x50e2,0x50e2,0x50e5,0x50e7,0x50e9,0x50e9,0x50ec,0x50ee,0x50f5,0x50f5,0x50f9,0x50f9,0x50fb,0x50fb,0x50fe,0x5104,0x5106,0x5107,0x5109,0x5109,0x510b,0x510c,0x5110,0x5110,0x5112,0x5115,0x5117,0x5118,0x511a,0x511c,0x511f,0x511f,0x5121,0x5122,0x5124,0x5125,0x5127,0x5127,0x512a,0x512b,0x5131,0x5133,0x5135,0x5135,0x5137,0x513c,0x513f,0x5141,0x5143,0x5149,0x514b,0x514e,0x5150,0x5150,0x5152,0x5152,0x5154,0x5157,0x515a,0x515a,0x515c,0x515c,0x5162,0x5162,0x5165,0x5165,0x5167,0x516e,0x5171,0x5171,0x5175,0x5178,0x517c,0x517c,0x5180,0x5180,0x5182,0x5182,0x5186,0x5186,0x5189,0x518a,0x518c,0x518d,0x518f,0x518f,0x5191,0x5193,0x5195,0x5199,0x519e,0x519e,0x51a0,0x51a0,0x51a2,0x51a5,0x51aa,0x51ac,0x51b0,0x51b2,0x51b6,0x51b7,0x51bd,0x51be,0x51c4,0x51c6,0x51c9,0x51cd,0x51d2,0x51d2,0x51d4,0x51d4,0x51d6,0x51d6,0x51db,0x51de,0x51e0,0x51e1,0x51e9,0x51e9,0x51ed,0x51ed,0x51f0,0x51f1,0x51f3,0x51f6,0x51f8,0x51fa,0x51fd,0x51fd,0x5200,0x5203,0x5206,0x5208,0x520a,0x520a,0x520e,0x520e,0x5211,0x5211,0x5213,0x5213,0x5216,0x5217,0x521d,0x521d,0x5224,0x5227,0x5229,0x522a,0x522e,0x522e,0x5230,0x5233,0x5236,0x523b,0x5243,0x5244,0x5246,0x5247,0x5249,0x524d,0x5254,0x5257,0x525a,0x525b,0x525d,0x525f,0x5261,0x5261,0x5269,0x526a,0x526f,0x526f,0x5272,0x5272,0x5274,0x5275,0x5277,0x5277,0x527a,0x527a,0x527d,0x527d,0x527f,0x527f,0x5282,0x5283,0x5287,0x5289,0x528d,0x528d,0x5291,0x5293,0x5297,0x5298,0x529b,0x529b,0x529f,0x52a0,0x52a3,0x52a4,0x52a7,0x52a7,0x52a9,0x52ae,0x52b9,0x52b9,0x52be,0x52be,0x52c1,0x52c1,0x52c3,0x52c3,0x52c5,0x52c5,0x52c7,0x52c7,0x52c9,0x52c9,0x52cc,0x52cd,0x52d2,0x52d2,0x52d5,0x52d6,0x52d8,0x52d9,0x52db,0x52db,0x52dd,0x52e4,0x52e6,0x52e6,0x52ed,0x52ed,0x52f2,0x52f3,0x52f5,0x52f5,0x52f8,0x52fb,0x52fe,0x5303,0x5305,0x5305,0x5308,0x5308,0x530a,0x530a,0x530c,0x530d,0x530f,0x5310,0x5315,0x5317,0x5319,0x531a,0x5320,0x5321,0x5323,0x5323,0x5327,0x5327,0x532a,0x532a,0x532f,0x532f,0x5331,0x5331,0x5336,0x5336,0x5338,0x533b,0x533d,0x5341,0x5343,0x5345,0x5347,0x534a,0x534d,0x534d,0x5351,0x5354,0x5357,0x5357,0x535a,0x535a,0x535c,0x535c,0x535e,0x535e,0x5360,0x5361,0x5364,0x5364,0x5366,0x5366,0x5368,0x5369,0x536c,0x536c,0x536e,0x5375,0x5377,0x537b,0x537d,0x537f,0x5382,0x5382,0x5384,0x5384,0x538e,0x538e,0x5393,0x5393,0x5396,0x5396,0x5398,0x5398,0x539a,0x539a,0x539d,0x539d,0x539f,0x53a0,0x53a5,0x53a6,0x53aa,0x53aa,0x53ad,0x53ae,0x53b2,0x53b3,0x53b6,0x53b6,0x53b9,0x53b9,0x53bb,0x53bb,0x53c2,0x53c3,0x53c5,0x53c5,0x53c8,0x53cd,0x53d4,0x53d4,0x53d6,0x53d7,0x53d9,0x53d9,0x53db,0x53db,0x53df,0x53df,0x53e1,0x53e6,0x53e8,0x53f8,0x5401,0x5401,0x5403,0x5404,0x5408,0x5411,0x541b,0x541b,0x541d,0x541d,0x541f,0x5420,0x5426,0x5426,0x5429,0x5429,0x542b,0x542c,0x542e,0x542e,0x5431,0x5431,0x5433,0x5433,0x5436,0x5436,0x5438,0x5439,0x543b,0x543e,0x5440,0x5440,0x5442,0x5442,0x5446,0x5446,0x5448,0x5448,0x544a,0x544a,0x544e,0x544e,0x5451,0x5451,0x545d,0x545d,0x545f,0x545f,0x5462,0x5462,0x5464,0x5464,0x5466,0x5466,0x5468,0x5468,0x546a,0x546b,0x5470,0x5471,0x5473,0x5473,0x5475,0x5476,0x547b,0x547d,0x547f,0x5480,0x5484,0x5484,0x5486,0x5487,0x548b,0x5490,0x5496,0x5496,0x54a0,0x54a0,0x54a2,0x54a2,0x54a4,0x54a5,0x54a8,0x54a8,0x54ab,0x54ac,0x54af,0x54af,0x54b2,0x54b3,0x54b8,0x54b8,0x54bb,0x54bd,0x54bf,0x54c4,0x54c6,0x54c9,0x54e1,0x54e1,0x54e5,0x54e6,0x54e8,0x54e9,0x54ed,0x54ee,0x54f1,0x54f2,0x54fa,0x54fa,0x54fd,0x54fd,0x54ff,0x54ff,0x5504,0x5504,0x5506,0x5507,0x5509,0x5509,0x550e,0x5510,0x5514,0x5514,0x551c,0x551c,0x552b,0x552b,0x552e,0x552f,0x5531,0x5531,0x5533,0x5533,0x5535,0x5535,0x5539,0x5539,0x553c,0x553c,0x553e,0x553e,0x5540,0x5540,0x5542,0x5542,0x5544,0x5544,0x5546,0x5546,0x554a,0x554a,0x554f,0x554f,0x5553,0x5553,0x5556,0x5557,0x555c,0x555c,0x555e,0x555e,0x5563,0x5563,0x557b,0x5581,0x5583,0x5584,0x5586,0x5587,0x5589,0x558b,0x5591,0x5591,0x5593,0x5594,0x5598,0x559a,0x559c,0x559f,0x55a3,0x55a4,0x55a7,0x55ac,0x55ae,0x55ae,0x55b0,0x55b0,0x55c3,0x55c3,0x55c5,0x55c5,0x55c7,0x55c7,0x55c9,0x55c9,0x55d1,0x55d1,0x55d4,0x55d4,0x55da,0x55dc,0x55df,0x55e0,0x55e2,0x55e4,0x55f7,0x55f7,0x55fd,0x55ff,0x5604,0x5604,0x5606,0x5606,0x5608,0x5609,0x560c,0x5610,0x5612,0x5612,0x5614,0x5614,0x5616,0x5617,0x5629,0x5629,0x562c,0x562c,0x562f,0x562f,0x5632,0x5632,0x5634,0x5634,0x5636,0x5639,0x563b,0x563b,0x563f,0x563f,0x5641,0x5642,0x5649,0x5649,0x564b,0x564b,0x564d,0x564f,0x5653,0x5653,0x5664,0x5665,0x5668,0x566d,0x566f,0x566f,0x5672,0x5672,0x5674,0x5674,0x5676,0x5676,0x5678,0x5678,0x567a,0x567a,0x5680,0x5680,0x5684,0x5684,0x5686,0x5687,0x568f,0x568f,0x5699,0x569a,0x56a5,0x56a5,0x56a7,0x56a7,0x56ac,0x56ac,0x56ae,0x56ae,0x56b3,0x56b4,0x56b6,0x56b6,0x56bc,0x56bc,0x56c0,0x56c3,0x56c8,0x56ca,0x56cd,0x56cd,0x56d1,0x56d1,0x56d7,0x56d7,0x56da,0x56db,0x56de,0x56e0,0x56e3,0x56e3,0x56e6,0x56e7,0x56eb,0x56eb,0x56ed,0x56ee,0x56f0,0x56f0,0x56f3,0x56f3,0x56f7,0x56f7,0x56f9,0x56fa,0x56fd,0x56fd,0x56ff,0x56ff,0x5701,0x5704,0x5707,0x570b,0x570d,0x570d,0x5712,0x5713,0x5716,0x5716,0x5718,0x5718,0x571c,0x571c,0x571f,0x571f,0x5725,0x5725,0x5728,0x572a,0x572c,0x572e,0x5730,0x5730,0x573b,0x573b,0x573e,0x573e,0x5740,0x5742,0x5747,0x5747,0x574a,0x574a,0x574c,0x5751,0x5761,0x5761,0x5764,0x5764,0x5766,0x576a,0x576e,0x5771,0x5773,0x5773,0x5775,0x5775,0x5777,0x5778,0x577b,0x577c,0x5782,0x5782,0x5788,0x5788,0x578b,0x578c,0x5793,0x5793,0x5795,0x5795,0x579e,0x579e,0x57a0,0x57a0,0x57a2,0x57a4,0x57b8,0x57b8,0x57bd,0x57bd,0x57c3,0x57c3,0x57c6,0x57c9,0x57cb,0x57cb,0x57ce,0x57cf,0x57d1,0x57d2,0x57dc,0x57dc,0x57df,0x57e0,0x57e4,0x57e4,0x57e9,0x57e9,0x57ed,0x57ee,0x57f0,0x57f0,0x57f3,0x57f4,0x57f6,0x57f7,0x57f9,0x57fd,0x5800,0x5800,0x5802,0x5806,0x5808,0x580b,0x5817,0x5817,0x5819,0x5819,0x581d,0x581e,0x5820,0x5821,0x5823,0x5824,0x5826,0x5827,0x582a,0x582a,0x582d,0x582d,0x582f,0x5831,0x5834,0x5835,0x583a,0x583a,0x5840,0x5840,0x5849,0x584d,0x584f,0x5852,0x5854,0x5854,0x5857,0x585a,0x585e,0x585e,0x5861,0x5862,0x5864,0x5864,0x5869,0x5869,0x5875,0x5875,0x5879,0x5879,0x587c,0x587e,0x5880,0x5881,0x5883,0x5883,0x5885,0x5885,0x5889,0x588a,0x588c,0x588d,0x5890,0x5890,0x5893,0x5893,0x589c,0x589f,0x58a1,0x58a1,0x58a3,0x58a3,0x58a8,0x58a9,0x58ab,0x58ab,0x58ae,0x58ae,0x58b0,0x58b1,0x58b3,0x58b3,0x58ba,0x58bb,0x58be,0x58be,0x58c1,0x58c1,0x58c3,0x58c3,0x58c5,0x58c5,0x58c7,0x58c7,0x58ce,0x58ce,0x58d1,0x58d1,0x58d3,0x58d5,0x58d8,0x58da,0x58dc,0x58df,0x58e1,0x58e1,0x58e4,0x58e4,0x58eb,0x58ec,0x58ee,0x58f0,0x58f2,0x58f2,0x58f9,0x58fb,0x58fd,0x58fd,0x5902,0x5902,0x5906,0x5906,0x5908,0x5908,0x590a,0x590a,0x590f,0x5910,0x5914,0x5916,0x5919,0x591c,0x5922,0x5922,0x5924,0x5925,0x5927,0x5927,0x5929,0x592f,0x5931,0x5932,0x5937,0x5938,0x593d,0x593e,0x5944,0x5944,0x5947,0x5949,0x594c,0x594c,0x594e,0x5951,0x5953,0x5955,0x5957,0x5958,0x595a,0x595a,0x595c,0x595c,0x5960,0x5960,0x5962,0x5962,0x5967,0x5967,0x5969,0x596e,0x5972,0x5974,0x5976,0x5976,0x5978,0x5978,0x597d,0x597d,0x5982,0x5984,0x598a,0x598a,0x598c,0x598d,0x5991,0x5993,0x5996,0x5997,0x5999,0x5999,0x599d,0x599d,0x59a3,0x59a5,0x59a7,0x59a8,0x59ac,0x59ac,0x59af,0x59af,0x59b2,0x59b2,0x59b5,0x59b6,0x59b8,0x59b9,0x59bb,0x59bb,0x59be,0x59bf,0x59c1,0x59c1,0x59c3,0x59c3,0x59c6,0x59c6,0x59c8,0x59cb,0x59cd,0x59cd,0x59d0,0x59d4,0x59d9,0x59da,0x59dc,0x59de,0x59e2,0x59e6,0x59e8,0x59e8,0x59ea,0x59ec,0x59ee,0x59ee,0x59f0,0x59f0,0x59f2,0x59f2,0x59f7,0x59fc,0x59ff,0x59ff,0x5a01,0x5a01,0x5a03,0x5a03,0x5a09,0x5a0a,0x5a0d,0x5a0d,0x5a11,0x5a11,0x5a13,0x5a13,0x5a18,0x5a19,0x5a1b,0x5a1c,0x5a1f,0x5a20,0x5a23,0x5a23,0x5a25,0x5a25,0x5a27,0x5a27,0x5a29,0x5a29,0x5a2b,0x5a2b,0x5a2d,0x5a2d,0x5a35,0x5a36,0x5a3c,0x5a3c,0x5a3f,0x5a41,0x5a46,0x5a47,0x5a49,0x5a49,0x5a4b,0x5a4c,0x5a50,0x5a51,0x5a5a,0x5a5a,0x5a60,0x5a60,0x5a62,0x5a63,0x5a66,0x5a67,0x5a69,0x5a6a,0x5a6d,0x5a6d,0x5a72,0x5a72,0x5a77,0x5a77,0x5a7f,0x5a7f,0x5a84,0x5a84,0x5a8d,0x5a8d,0x5a90,0x5a90,0x5a92,0x5a93,0x5a95,0x5a95,0x5a9a,0x5a9b,0x5a9e,0x5a9f,0x5aa2,0x5aa2,0x5aa4,0x5aa4,0x5aa7,0x5aa7,0x5aaa,0x5aaa,0x5ab3,0x5ab3,0x5ab5,0x5ab5,0x5aba,0x5abf,0x5ac1,0x5ac2,0x5ac4,0x5ac4,0x5ac8,0x5ac9,0x5acb,0x5acc,0x5ad5,0x5ad7,0x5ad9,0x5adb,0x5add,0x5add,0x5ae0,0x5ae6,0x5ae9,0x5ae9,0x5aeb,0x5aeb,0x5aed,0x5aef,0x5af6,0x5af6,0x5afa,0x5afb,0x5afd,0x5afd,0x5b00,0x5b00,0x5b05,0x5b05,0x5b08,0x5b09,0x5b0b,0x5b0c,0x5b16,0x5b16,0x5b19,0x5b19,0x5b1b,0x5b1b,0x5b25,0x5b25,0x5b28,0x5b28,0x5b2a,0x5b2a,0x5b2d,0x5b2d,0x5b30,0x5b30,0x5b32,0x5b32,0x5b34,0x5b34,0x5b3e,0x5b40,0x5b43,0x5b43,0x5b45,0x5b45,0x5b4c,0x5b4c,0x5b50,0x5b51,0x5b54,0x5b58,0x5b5a,0x5b5d,0x5b5f,0x5b5f,0x5b61,0x5b61,0x5b63,0x5b66,0x5b69,0x5b69,0x5b6b,0x5b6b,0x5b70,0x5b71,0x5b75,0x5b76,0x5b78,0x5b78,0x5b7a,0x5b7a,0x5b7c,0x5b7c,0x5b7f,0x5b82,0x5b85,0x5b85,0x5b87,0x5b8c,0x5b8f,0x5b8f,0x5b93,0x5b93,0x5b95,0x5b9d,0x5b9f,0x5b9f,0x5ba2,0x5ba6,0x5bac,0x5bac,0x5bae,0x5bae,0x5bb0,0x5bb0,0x5bb3,0x5bb6,0x5bb8,0x5bb9,0x5bbf,0x5bc0,0x5bc2,0x5bc7,0x5bcc,0x5bcc,0x5bd0,0x5bd0,0x5bd2,0x5bd4,0x5bd6,0x5bd8,0x5bdb,0x5bdb,0x5bde,0x5bdf,0x5be1,0x5be2,0x5be4,0x5be9,0x5beb,0x5bf0,0x5bf5,0x5bf6,0x5bf8,0x5bfa,0x5bff,0x5bff,0x5c01,0x5c01,0x5c04,0x5c0f,0x5c11,0x5c11,0x5c14,0x5c14,0x5c16,0x5c16,0x5c19,0x5c19,0x5c1f,0x5c20,0x5c22,0x5c24,0x5c28,0x5c28,0x5c2b,0x5c2b,0x5c31,0x5c31,0x5c38,0x5c41,0x5c45,0x5c48,0x5c4b,0x5c4b,0x5c4d,0x5c4e,0x5c50,0x5c51,0x5c55,0x5c55,0x5c5b,0x5c5b,0x5c60,0x5c60,0x5c62,0x5c62,0x5c64,0x5c65,0x5c68,0x5c68,0x5c6c,0x5c6c,0x5c6f,0x5c6f,0x5c71,0x5c71,0x5c73,0x5c73,0x5c79,0x5c7a,0x5c88,0x5c88,0x5c8a,0x5c8a,0x5c8c,0x5c8c,0x5c8f,0x5c92,0x5c94,0x5c94,0x5c9d,0x5c9d,0x5ca1,0x5ca1,0x5ca3,0x5ca3,0x5ca5,0x5cad,0x5cb1,0x5cb1,0x5cb3,0x5cb3,0x5cb5,0x5cb5,0x5cb7,0x5cb8,0x5cba,0x5cba,0x5cbe,0x5cbe,0x5cc0,0x5cc0,0x5ccb,0x5ccb,0x5cd2,0x5cd2,0x5cd9,0x5cd9,0x5ce0,0x5ce0,0x5ce8,0x5ce9,0x5ced,0x5ced,0x5cef,0x5cf1,0x5cf4,0x5cf4,0x5cf6,0x5cf6,0x5cfb,0x5cfb,0x5cfd,0x5cfd,0x5d06,0x5d07,0x5d0d,0x5d0e,0x5d10,0x5d11,0x5d14,0x5d19,0x5d1b,0x5d1b,0x5d1f,0x5d1f,0x5d22,0x5d22,0x5d24,0x5d24,0x5d26,0x5d27,0x5d29,0x5d29,0x5d34,0x5d34,0x5d3d,0x5d3d,0x5d41,0x5d42,0x5d44,0x5d44,0x5d4b,0x5d4c,0x5d4e,0x5d4e,0x5d50,0x5d50,0x5d53,0x5d54,0x5d69,0x5d69,0x5d6c,0x5d6c,0x5d6f,0x5d6f,0x5d71,0x5d71,0x5d81,0x5d82,0x5d84,0x5d84,0x5d86,0x5d87,0x5d8b,0x5d8b,0x5d92,0x5d92,0x5d94,0x5d95,0x5d99,0x5d99,0x5d9d,0x5d9d,0x5da0,0x5da0,0x5da2,0x5da2,0x5da7,0x5da7,0x5daa,0x5dab,0x5dae,0x5dae,0x5db0,0x5db0,0x5db7,0x5db8,0x5dba,0x5dba,0x5dbc,0x5dbe,0x5dc9,0x5dc9,0x5dcb,0x5dcb,0x5dcd,0x5dcd,0x5dd1,0x5dd3,0x5dd6,0x5dd6,0x5dda,0x5ddb,0x5ddd,0x5dde,0x5de0,0x5de2,0x5de5,0x5de8,0x5deb,0x5deb,0x5dee,0x5dee,0x5df1,0x5df5,0x5df7,0x5df9,0x5dfb,0x5dfb,0x5dfd,0x5dfe,0x5e02,0x5e03,0x5e06,0x5e06,0x5e09,0x5e09,0x5e0c,0x5e0c,0x5e11,0x5e11,0x5e15,0x5e16,0x5e19,0x5e1b,0x5e1d,0x5e1d,0x5e20,0x5e20,0x5e25,0x5e25,0x5e28,0x5e28,0x5e2b,0x5e2b,0x5e2d,0x5e2d,0x5e33,0x5e33,0x5e36,0x5e38,0x5e3d,0x5e3d,0x5e3f,0x5e40,0x5e43,0x5e45,0x5e47,0x5e47,0x5e4c,0x5e4c,0x5e4e,0x5e4e,0x5e54,0x5e55,0x5e58,0x5e58,0x5e5e,0x5e5f,0x5e61,0x5e63,0x5e68,0x5e68,0x5e6a,0x5e6c,0x5e70,0x5e74,0x5e76,0x5e80,0x5e83,0x5e84,0x5e87,0x5e87,0x5e8a,0x5e8b,0x5e8f,0x5e8f,0x5e95,0x5e97,0x5e9a,0x5e9a,0x5e9c,0x5e9c,0x5ea0,0x5ea0,0x5ea5,0x5ea8,0x5eab,0x5eab,0x5ead,0x5ead,0x5eb3,0x5eb3,0x5eb5,0x5eb8,0x5ebd,0x5ebe,0x5ec1,0x5ec2,0x5ec8,0x5ecb,0x5ecf,0x5ed1,0x5ed3,0x5ed3,0x5ed5,0x5ed6,0x5ed9,0x5edb,0x5edd,0x5ee3,0x5ee5,0x5ee5,0x5ee7,0x5ee9,0x5eec,0x5eec,0x5ef1,0x5ef1,0x5ef3,0x5ef4,0x5ef6,0x5ef7,0x5efa,0x5efb,0x5efe,0x5eff,0x5f01,0x5f01,0x5f03,0x5f04,0x5f07,0x5f08,0x5f0a,0x5f0b,0x5f0f,0x5f0f,0x5f11,0x5f15,0x5f17,0x5f18,0x5f1b,0x5f1b,0x5f1f,0x5f1f,0x5f22,0x5f22,0x5f25,0x5f27,0x5f29,0x5f29,0x5f2d,0x5f2d,0x5f31,0x5f31,0x5f34,0x5f35,0x5f37,0x5f37,0x5f3a,0x5f3a,0x5f3c,0x5f3c,0x5f3e,0x5f3e,0x5f40,0x5f40,0x5f46,0x5f46,0x5f48,0x5f48,0x5f4a,0x5f4a,0x5f4c,0x5f4c,0x5f4e,0x5f4e,0x5f50,0x5f51,0x5f53,0x5f54,0x5f56,0x5f59,0x5f5b,0x5f5b,0x5f5d,0x5f5d,0x5f61,0x5f62,0x5f64,0x5f67,0x5f69,0x5f6d,0x5f70,0x5f71,0x5f73,0x5f73,0x5f77,0x5f77,0x5f79,0x5f79,0x5f7c,0x5f7c,0x5f7f,0x5f82,0x5f85,0x5f85,0x5f87,0x5f8c,0x5f90,0x5f92,0x5f97,0x5f99,0x5f9c,0x5f9c,0x5f9e,0x5f9e,0x5fa0,0x5fa1,0x5fa3,0x5fa3,0x5fa7,0x5faa,0x5fac,0x5faf,0x5fb3,0x5fb3,0x5fb5,0x5fb5,0x5fb7,0x5fb7,0x5fb9,0x5fb9,0x5fbc,0x5fbd,0x5fc3,0x5fc5,0x5fc8,0x5fc9,0x5fcc,0x5fce,0x5fd0,0x5fd0,0x5fd2,0x5fd3,0x5fd5,0x5fd9,0x5fdc,0x5fe1,0x5fe4,0x5fe4,0x5fe8,0x5fe8,0x5feb,0x5feb,0x5fed,0x5fef,0x5ff1,0x5ff1,0x5ff5,0x5ff5,0x5ff8,0x5ff8,0x5ffb,0x5ffd,0x5fff,0x5fff,0x600a,0x600a,0x600d,0x600d,0x600f,0x600f,0x6012,0x6012,0x6014,0x6017,0x6019,0x6019,0x601b,0x601d,0x6020,0x6021,0x6025,0x602a,0x602f,0x6030,0x6033,0x6033,0x6041,0x6043,0x6046,0x6048,0x604a,0x604b,0x604d,0x604d,0x6050,0x6050,0x6052,0x6052,0x6055,0x6055,0x6059,0x605a,0x605d,0x605d,0x605f,0x6060,0x6062,0x6065,0x6068,0x606d,0x606f,0x6070,0x6075,0x6075,0x6081,0x6081,0x6083,0x6086,0x6089,0x608d,0x608f,0x608f,0x6092,0x6092,0x6094,0x6097,0x609a,0x609b,0x609f,0x60a0,0x60a2,0x60a4,0x60a7,0x60a7,0x60aa,0x60aa,0x60b0,0x60b6,0x60b8,0x60b8,0x60bb,0x60be,0x60c4,0x60c7,0x60c9,0x60c9,0x60cb,0x60cb,0x60cf,0x60cf,0x60d1,0x60d1,0x60d3,0x60d3,0x60d5,0x60d5,0x60d7,0x60e2,0x60f0,0x60f4,0x60f6,0x60fc,0x6100,0x6101,0x6103,0x6103,0x6106,0x6106,0x6108,0x6109,0x610d,0x610f,0x6114,0x6115,0x611a,0x611c,0x611e,0x611f,0x6122,0x6122,0x6127,0x6128,0x612b,0x612d,0x6130,0x6130,0x6134,0x6134,0x6137,0x6137,0x613c,0x613c,0x613e,0x613f,0x6142,0x6142,0x6144,0x6144,0x6146,0x6148,0x614a,0x614d,0x614f,0x614f,0x6152,0x6155,0x6158,0x615a,0x615c,0x615d,0x615f,0x6164,0x6167,0x6168,0x616a,0x616b,0x616e,0x616e,0x6170,0x6171,0x6173,0x6177,0x617a,0x617a,0x617c,0x617e,0x6181,0x6183,0x618a,0x618a,0x618d,0x618e,0x6190,0x6194,0x6196,0x6196,0x6198,0x619a,0x61a4,0x61a4,0x61a7,0x61a9,0x61ab,0x61ac,0x61ae,0x61af,0x61b2,0x61b2,0x61b6,0x61b6,0x61b8,0x61b8,0x61ba,0x61be,0x61c3,0x61c3,0x61c6,0x61cc,0x61cf,0x61cf,0x61d5,0x61d5,0x61d7,0x61d7,0x61de,0x61df,0x61e3,0x61e3,0x61e6,0x61e6,0x61f2,0x61f2,0x61f6,0x61f8,0x61fa,0x61fa,0x61fc,0x6200,0x6207,0x6208,0x620a,0x620a,0x620c,0x620e,0x6210,0x6212,0x6214,0x6216,0x6218,0x6218,0x621a,0x621a,0x621e,0x621f,0x6221,0x6222,0x6226,0x6227,0x6229,0x622a,0x622d,0x622e,0x6230,0x6236,0x6239,0x6239,0x623e,0x6241,0x6243,0x6243,0x6247,0x624e,0x6251,0x6253,0x6257,0x6258,0x625b,0x625c,0x625e,0x625e,0x6263,0x6263,0x6268,0x6268,0x626e,0x626e,0x6271,0x6271,0x6273,0x6273,0x6276,0x6276,0x6279,0x627a,0x627c,0x627c,0x627e,0x6280,0x6283,0x6284,0x6286,0x6286,0x6289,0x628a,0x628f,0x628f,0x6291,0x6292,0x6294,0x6298,0x629b,0x629b,0x62a6,0x62a6,0x62a8,0x62a8,0x62ab,0x62ac,0x62ae,0x62ae,0x62b1,0x62b2,0x62b5,0x62b5,0x62b9,0x62b9,0x62bc,0x62bd,0x62c2,0x62c2,0x62c4,0x62cd,0x62cf,0x62d9,0x62db,0x62dc,0x62e1,0x62e1,0x62ec,0x62ef,0x62f1,0x62f1,0x62f3,0x62f3,0x62f5,0x62f7,0x62fd,0x62ff,0x6301,0x6302,0x6307,0x6307,0x6309,0x6309,0x630c,0x630c,0x6310,0x6312,0x6328,0x6328,0x632a,0x632b,0x632f,0x632f,0x6339,0x633b,0x633d,0x633e,0x6342,0x6344,0x6346,0x6346,0x6349,0x6349,0x634c,0x6350,0x6353,0x6353,0x6355,0x6355,0x6357,0x6357,0x635a,0x635a,0x6367,0x6369,0x636b,0x636b,0x636e,0x636e,0x6371,0x6372,0x6376,0x6377,0x637a,0x637b,0x637f,0x6380,0x6383,0x6384,0x6387,0x638a,0x638c,0x638c,0x638e,0x638f,0x6392,0x6392,0x6396,0x6396,0x6398,0x6398,0x639b,0x639c,0x639f,0x63a2,0x63a5,0x63a5,0x63a7,0x63aa,0x63ac,0x63ac,0x63be,0x63be,0x63c0,0x63c0,0x63c3,0x63c4,0x63c6,0x63c6,0x63c9,0x63c9,0x63cf,0x63d0,0x63d2,0x63d2,0x63d6,0x63d6,0x63da,0x63db,0x63df,0x63e1,0x63e3,0x63e3,0x63e9,0x63e9,0x63eb,0x63eb,0x63ed,0x63ee,0x63f2,0x63f2,0x63f4,0x63f7,0x6406,0x6406,0x6409,0x6409,0x640d,0x640d,0x640f,0x640f,0x6412,0x6412,0x6414,0x6414,0x6416,0x6418,0x641c,0x641c,0x6420,0x6420,0x6422,0x6422,0x6424,0x6425,0x6428,0x6428,0x642a,0x642d,0x642f,0x6430,0x6434,0x6434,0x6436,0x6436,0x643a,0x643a,0x643e,0x643e,0x6458,0x6458,0x645b,0x645b,0x645e,0x645e,0x6460,0x6460,0x6467,0x6467,0x6469,0x6469,0x646d,0x646d,0x646f,0x646f,0x6473,0x6473,0x6478,0x647b,0x647d,0x647d,0x6485,0x6485,0x6488,0x6488,0x6490,0x6493,0x6495,0x6495,0x6499,0x649b,0x649d,0x649f,0x64a4,0x64a5,0x64a9,0x64a9,0x64ab,0x64ab,0x64ad,0x64ae,0x64b0,0x64b0,0x64b2,0x64b2,0x64bb,0x64bc,0x64be,0x64bf,0x64c1,0x64c1,0x64c4,0x64c5,0x64c7,0x64c7,0x64c9,0x64ca,0x64cd,0x64ce,0x64d0,0x64d0,0x64d2,0x64d2,0x64d4,0x64d5,0x64d7,0x64d8,0x64da,0x64da,0x64e0,0x64e3,0x64e5,0x64e7,0x64ec,0x64ed,0x64ef,0x64ef,0x64f1,0x64f2,0x64f4,0x64f4,0x64fa,0x64fa,0x64fe,0x64fe,0x6500,0x6500,0x6502,0x6502,0x6504,0x6504,0x6507,0x6507,0x650a,0x650a,0x650f,0x650f,0x6514,0x6514,0x6518,0x6519,0x651d,0x651d,0x6522,0x6524,0x652a,0x652c,0x652f,0x652f,0x6532,0x6532,0x6534,0x6539,0x653b,0x653b,0x653d,0x653f,0x6543,0x6543,0x6545,0x6545,0x6548,0x6549,0x654d,0x654f,0x6551,0x6552,0x6554,0x6559,0x655d,0x655e,0x6562,0x6563,0x6566,0x6566,0x656c,0x656d,0x6572,0x6572,0x6574,0x6575,0x6577,0x6578,0x657e,0x657e,0x6581,0x6583,0x6585,0x6585,0x6587,0x6587,0x6589,0x6589,0x658c,0x658c,0x6590,0x6591,0x6597,0x6597,0x6599,0x6599,0x659b,0x659d,0x659f,0x659f,0x65a1,0x65a1,0x65a4,0x65a5,0x65a7,0x65a7,0x65ab,0x65ad,0x65af,0x65b2,0x65b7,0x65b7,0x65b9,0x65b9,0x65bc,0x65bd,0x65bf,0x65bf,0x65c1,0x65c6,0x65ca,0x65cc,0x65cf,0x65cf,0x65d2,0x65d2,0x65d7,0x65d7,0x65e0,0x65e1,0x65e3,0x65e3,0x65e5,0x65e6,0x65e8,0x65e9,0x65ec,0x65ed,0x65f1,0x65f2,0x65f4,0x65f4,0x65fa,0x65fd,0x65ff,0x6600,0x6602,0x6603,0x6606,0x6607,0x6609,0x660a,0x660c,0x6611,0x6613,0x6615,0x661b,0x661c,0x661e,0x6621,0x6623,0x6625,0x6627,0x6628,0x662b,0x662b,0x662d,0x662d,0x662f,0x6631,0x6634,0x6637,0x663a,0x663b,0x6641,0x6644,0x6648,0x6649,0x664b,0x664c,0x664e,0x6651,0x6659,0x665b,0x665d,0x6662,0x6664,0x6669,0x666b,0x6670,0x6673,0x6674,0x6676,0x667b,0x667d,0x667d,0x667f,0x667f,0x6684,0x6684,0x6687,0x6689,0x668b,0x668c,0x668e,0x668e,0x6690,0x6691,0x6696,0x6698,0x669a,0x669a,0x669d,0x669e,0x66a0,0x66a0,0x66a2,0x66a3,0x66ab,0x66ac,0x66ae,0x66ae,0x66b1,0x66b5,0x66b8,0x66bb,0x66be,0x66c1,0x66c4,0x66c9,0x66d3,0x66d4,0x66d6,0x66d6,0x66d8,0x66de,0x66e0,0x66e0,0x66e3,0x66e3,0x66e6,0x66e6,0x66e8,0x66ea,0x66ec,0x66ec,0x66ee,0x66f0,0x66f2,0x66f4,0x66f7,0x66fa,0x66fc,0x66fc,0x66fe,0x6700,0x6703,0x6705,0x6708,0x670d,0x6710,0x6710,0x6714,0x6715,0x6717,0x6717,0x671b,0x671b,0x671d,0x6720,0x6722,0x6723,0x6726,0x6728,0x672a,0x672e,0x6731,0x6731,0x6733,0x6734,0x6736,0x6736,0x673a,0x673a,0x673d,0x673e,0x6745,0x6746,0x6749,0x6749,0x674b,0x674c,0x674e,0x6751,0x6753,0x6753,0x6756,0x6756,0x675c,0x6760,0x6765,0x6765,0x676a,0x676a,0x676c,0x676d,0x676f,0x6773,0x6775,0x6775,0x6777,0x6777,0x677b,0x677c,0x677e,0x677f,0x6783,0x6783,0x6787,0x6787,0x6789,0x6789,0x678b,0x678c,0x678f,0x6790,0x6792,0x6793,0x6795,0x6795,0x6797,0x679a,0x679c,0x679d,0x67af,0x67b0,0x67b2,0x67b3,0x67b6,0x67b8,0x67be,0x67be,0x67c1,0x67c1,0x67c4,0x67c5,0x67ca,0x67ca,0x67cf,0x67d4,0x67d6,0x67da,0x67dd,0x67df,0x67e2,0x67e2,0x67e9,0x67e9,0x67ec,0x67ec,0x67ef,0x67f1,0x67f3,0x67f6,0x67f9,0x67f9,0x67fb,0x67fb,0x67fe,0x67ff,0x6803,0x6804,0x6810,0x6810,0x6812,0x6813,0x6816,0x6817,0x681d,0x681e,0x6821,0x6822,0x682a,0x682a,0x682e,0x682f,0x6831,0x6832,0x6834,0x6834,0x6838,0x6839,0x683b,0x683d,0x6840,0x6844,0x6846,0x6846,0x6848,0x6849,0x684e,0x684e,0x6850,0x6851,0x6853,0x6854,0x686d,0x686d,0x686f,0x686f,0x6874,0x6874,0x6876,0x6877,0x687e,0x687f,0x6881,0x6881,0x6883,0x6883,0x6885,0x6886,0x688f,0x688f,0x6893,0x6894,0x6897,0x6897,0x689b,0x689b,0x689d,0x689d,0x689f,0x68a3,0x68a7,0x68a8,0x68ad,0x68ad,0x68af,0x68b1,0x68b3,0x68b3,0x68b5,0x68b6,0x68c4,0x68c5,0x68c9,0x68cd,0x68d0,0x68d0,0x68d2,0x68d2,0x68d5,0x68d8,0x68da,0x68da,0x68df,0x68e0,0x68e3,0x68e3,0x68e7,0x68e8,0x68ec,0x68ec,0x68ee,0x68ee,0x68f2,0x68f2,0x68f9,0x68fd,0x6900,0x6901,0x6904,0x6906,0x690b,0x690b,0x690d,0x690f,0x6911,0x6912,0x6919,0x6919,0x691c,0x691c,0x6927,0x6927,0x6930,0x6930,0x6934,0x6934,0x6936,0x6936,0x6939,0x6939,0x693d,0x693d,0x693f,0x693f,0x6942,0x6942,0x694a,0x694a,0x694f,0x694f,0x6953,0x6955,0x6957,0x6957,0x6959,0x695a,0x695d,0x695e,0x6960,0x6963,0x6965,0x6965,0x6968,0x6968,0x696a,0x696f,0x6973,0x6973,0x6975,0x6975,0x6977,0x6979,0x697b,0x697b,0x697d,0x697d,0x698e,0x698e,0x6991,0x6991,0x6994,0x6995,0x6998,0x6998,0x699b,0x699c,0x699f,0x699f,0x69a4,0x69a7,0x69ad,0x69ae,0x69b0,0x69b2,0x69b4,0x69b4,0x69b7,0x69b7,0x69ba,0x69bc,0x69be,0x69c1,0x69c3,0x69c3,0x69c7,0x69c7,0x69ca,0x69d0,0x69d3,0x69d3,0x69d6,0x69d6,0x69e2,0x69e2,0x69e5,0x69ea,0x69ed,0x69ed,0x69f2,0x69f2,0x69f9,0x69f9,0x69fb,0x69fb,0x69fd,0x69fd,0x69ff,0x6a00,0x6a02,0x6a02,0x6a05,0x6a05,0x6a0a,0x6a0b,0x6a11,0x6a14,0x6a17,0x6a17,0x6a19,0x6a19,0x6a1b,0x6a1b,0x6a1e,0x6a1f,0x6a21,0x6a21,0x6a23,0x6a23,0x6a29,0x6a29,0x6a2b,0x6a2b,0x6a35,0x6a35,0x6a38,0x6a3b,0x6a3d,0x6a3d,0x6a43,0x6a45,0x6a47,0x6a4d,0x6a50,0x6a50,0x6a52,0x6a53,0x6a58,0x6a5a,0x6a5f,0x6a5f,0x6a61,0x6a62,0x6a64,0x6a64,0x6a66,0x6a66,0x6a6b,0x6a6b,0x6a72,0x6a72,0x6a75,0x6a75,0x6a7f,0x6a80,0x6a83,0x6a84,0x6a89,0x6a89,0x6a8d,0x6a8e,0x6a90,0x6a90,0x6a94,0x6a94,0x6a97,0x6a97,0x6a9c,0x6a9d,0x6a9f,0x6aa0,0x6aa2,0x6aa3,0x6aae,0x6aae,0x6ab3,0x6ab3,0x6ab6,0x6ab6,0x6abb,0x6abc,0x6abf,0x6abf,0x6ac2,0x6ac3,0x6ad3,0x6ad3,0x6ada,0x6adf,0x6ae8,0x6ae8,0x6aea,0x6aea,0x6aec,0x6aec,0x6af6,0x6af6,0x6afb,0x6afc,0x6b02,0x6b04,0x6b0a,0x6b0a,0x6b0c,0x6b0c,0x6b11,0x6b12,0x6b16,0x6b16,0x6b1e,0x6b1e,0x6b20,0x6b21,0x6b23,0x6b23,0x6b2c,0x6b2c,0x6b32,0x6b32,0x6b37,0x6b3b,0x6b3d,0x6b3f,0x6b43,0x6b43,0x6b46,0x6b47,0x6b49,0x6b4a,0x6b4c,0x6b4c,0x6b4e,0x6b4e,0x6b50,0x6b50,0x6b54,0x6b54,0x6b59,0x6b5b,0x6b5f,0x6b67,0x6b69,0x6b6a,0x6b6f,0x6b6f,0x6b72,0x6b72,0x6b77,0x6b7b,0x6b7f,0x6b80,0x6b82,0x6b84,0x6b86,0x6b86,0x6b89,0x6b8a,0x6b8d,0x6b8d,0x6b91,0x6b91,0x6b96,0x6b96,0x6b98,0x6b98,0x6b9e,0x6b9e,0x6ba2,0x6ba2,0x6ba4,0x6ba4,0x6bab,0x6bab,0x6bad,0x6baf,0x6bb2,0x6bb3,0x6bb5,0x6bb5,0x6bb7,0x6bb7,0x6bba,0x6bba,0x6bbc,0x6bbd,0x6bbf,0x6bc1,0x6bc4,0x6bc6,0x6bcb,0x6bcb,0x6bcd,0x6bcd,0x6bcf,0x6bcf,0x6bd2,0x6bd4,0x6bd6,0x6bd8,0x6bda,0x6bdb,0x6beb,0x6bec,0x6bef,0x6bef,0x6bf3,0x6bf3,0x6bf8,0x6bf8,0x6bff,0x6bff,0x6c05,0x6c05,0x6c08,0x6c08,0x6c0f,0x6c11,0x6c13,0x6c14,0x6c17,0x6c17,0x6c1b,0x6c1b,0x6c23,0x6c24,0x6c33,0x6c38,0x6c3e,0x6c43,0x6c4b,0x6c4b,0x6c4e,0x6c50,0x6c52,0x6c55,0x6c57,0x6c57,0x6c59,0x6c60,0x6c66,0x6c66,0x6c68,0x6c6a,0x6c6d,0x6c6d,0x6c70,0x6c70,0x6c72,0x6c72,0x6c74,0x6c74,0x6c76,0x6c76,0x6c7a,0x6c7a,0x6c7d,0x6c7e,0x6c81,0x6c89,0x6c8c,0x6c8d,0x6c90,0x6c90,0x6c92,0x6c96,0x6c98,0x6c9b,0x6ca2,0x6ca2,0x6cab,0x6cac,0x6cae,0x6cae,0x6cb0,0x6cb1,0x6cb3,0x6cb3,0x6cb6,0x6cb6,0x6cb8,0x6cb9,0x6cbb,0x6cbf,0x6cc1,0x6cc2,0x6cc4,0x6cc6,0x6cc9,0x6cca,0x6ccc,0x6ccc,0x6cd0,0x6cd1,0x6cd3,0x6cd5,0x6cd7,0x6cd7,0x6cd9,0x6cdd,0x6ce0,0x6ce3,0x6ce5,0x6ce5,0x6ce8,0x6ce8,0x6ceb,0x6ceb,0x6cee,0x6cf1,0x6cf3,0x6cf3,0x6cff,0x6cff,0x6d04,0x6d04,0x6d07,0x6d07,0x6d0a,0x6d0c,0x6d11,0x6d12,0x6d14,0x6d14,0x6d17,0x6d17,0x6d19,0x6d19,0x6d1b,0x6d1b,0x6d1e,0x6d1f,0x6d23,0x6d23,0x6d25,0x6d25,0x6d27,0x6d2c,0x6d2e,0x6d2e,0x6d32,0x6d32,0x6d35,0x6d36,0x6d38,0x6d3e,0x6d41,0x6d41,0x6d59,0x6d5a,0x6d5c,0x6d5c,0x6d61,0x6d61,0x6d63,0x6d67,0x6d69,0x6d6a,0x6d6c,0x6d6c,0x6d6e,0x6d6f,0x6d72,0x6d72,0x6d74,0x6d74,0x6d77,0x6d79,0x6d7f,0x6d7f,0x6d82,0x6d82,0x6d85,0x6d85,0x6d87,0x6d89,0x6d8c,0x6d8f,0x6d91,0x6d91,0x6d93,0x6d97,0x6daa,0x6dac,0x6daf,0x6daf,0x6db2,0x6db2,0x6db4,0x6db5,0x6db7,0x6db8,0x6dbc,0x6dbc,0x6dbf,0x6dc0,0x6dc3,0x6dc8,0x6dcb,0x6dcc,0x6dcf,0x6dd2,0x6dd6,0x6dd6,0x6dd8,0x6dda,0x6ddd,0x6dde,0x6de0,0x6de6,0x6de8,0x6de8,0x6dea,0x6dec,0x6dee,0x6dee,0x6df1,0x6df1,0x6df3,0x6df3,0x6df5,0x6dfc,0x6e05,0x6e05,0x6e08,0x6e08,0x6e0a,0x6e0a,0x6e17,0x6e17,0x6e19,0x6e1b,0x6e1d,0x6e1d,0x6e1f,0x6e26,0x6e28,0x6e28,0x6e2b,0x6e2d,0x6e2f,0x6e2f,0x6e32,0x6e32,0x6e34,0x6e34,0x6e36,0x6e38,0x6e3a,0x6e3a,0x6e3c,0x6e3e,0x6e40,0x6e40,0x6e43,0x6e45,0x6e4a,0x6e4a,0x6e4d,0x6e4e,0x6e51,0x6e51,0x6e53,0x6e56,0x6e58,0x6e58,0x6e5b,0x6e5c,0x6e5e,0x6e5f,0x6e63,0x6e63,0x6e67,0x6e67,0x6e6b,0x6e6b,0x6e6e,0x6e6f,0x6e72,0x6e73,0x6e75,0x6e75,0x6e7a,0x6e7a,0x6e8f,0x6e90,0x6e95,0x6e96,0x6e98,0x6e98,0x6e9c,0x6e9d,0x6e9f,0x6e9f,0x6ea2,0x6ea2,0x6ea5,0x6ea5,0x6ea7,0x6ea8,0x6eaa,0x6eab,0x6eaf,0x6eaf,0x6eb1,0x6eb2,0x6eb5,0x6eb7,0x6eba,0x6eba,0x6ebd,0x6ebd,0x6ec2,0x6ec5,0x6ec8,0x6ec9,0x6ecb,0x6ecc,0x6ece,0x6ece,0x6ed1,0x6ed1,0x6ed3,0x6ed5,0x6ed9,0x6ed9,0x6eec,0x6eed,0x6eef,0x6eef,0x6ef2,0x6ef2,0x6ef4,0x6ef5,0x6ef7,0x6ef8,0x6efc,0x6efc,0x6efe,0x6eff,0x6f01,0x6f02,0x6f04,0x6f04,0x6f06,0x6f06,0x6f09,0x6f09,0x6f0c,0x6f0c,0x6f0f,0x6f0f,0x6f11,0x6f11,0x6f13,0x6f15,0x6f19,0x6f1a,0x6f20,0x6f20,0x6f22,0x6f24,0x6f26,0x6f28,0x6f2a,0x6f2d,0x6f30,0x6f33,0x6f38,0x6f38,0x6f3c,0x6f3c,0x6f3e,0x6f3f,0x6f41,0x6f41,0x6f4f,0x6f4f,0x6f51,0x6f52,0x6f54,0x6f54,0x6f57,0x6f5f,0x6f61,0x6f64,0x6f66,0x6f66,0x6f6d,0x6f71,0x6f74,0x6f74,0x6f78,0x6f78,0x6f7a,0x6f7a,0x6f7c,0x6f7e,0x6f81,0x6f82,0x6f84,0x6f84,0x6f86,0x6f89,0x6f8b,0x6f8e,0x6f90,0x6f90,0x6f92,0x6f92,0x6f94,0x6f98,0x6f9f,0x6f9f,0x6fa1,0x6fa1,0x6fa3,0x6fa5,0x6fa7,0x6fa8,0x6faa,0x6faa,0x6fae,0x6faf,0x6fb1,0x6fb1,0x6fb3,0x6fb3,0x6fb6,0x6fb6,0x6fb9,0x6fb9,0x6fbe,0x6fbe,0x6fc0,0x6fc3,0x6fc6,0x6fc7,0x6fc9,0x6fca,0x6fd4,0x6fd5,0x6fd8,0x6fd8,0x6fda,0x6fdb,0x6fde,0x6fe1,0x6fe4,0x6fe6,0x6fe9,0x6fe9,0x6feb,0x6fec,0x6fee,0x6fef,0x6ff1,0x6ff1,0x6ff3,0x6ff4,0x6ff6,0x6ff6,0x6ffa,0x6ffa,0x6ffe,0x6ffe,0x7001,0x7001,0x7005,0x7007,0x7009,0x7009,0x700b,0x700b,0x700f,0x700f,0x7011,0x7013,0x7015,0x7015,0x7018,0x7018,0x701a,0x701f,0x7023,0x7023,0x7026,0x7028,0x702f,0x7030,0x7032,0x7032,0x7037,0x7038,0x703c,0x703c,0x703e,0x703e,0x7044,0x7044,0x7046,0x7046,0x704c,0x704c,0x704e,0x704e,0x7050,0x7051,0x7053,0x7053,0x7058,0x7058,0x705d,0x705e,0x7063,0x7063,0x7066,0x7066,0x7069,0x7069,0x706b,0x706c,0x706f,0x7070,0x7078,0x7078,0x707c,0x707e,0x7081,0x7081,0x7085,0x7086,0x708a,0x708a,0x708e,0x708e,0x7092,0x7092,0x7095,0x7095,0x7098,0x709b,0x70a1,0x70a1,0x70a4,0x70a4,0x70a6,0x70a6,0x70ab,0x70b0,0x70b3,0x70b3,0x70b7,0x70ba,0x70c8,0x70c8,0x70ca,0x70cb,0x70cf,0x70cf,0x70d3,0x70d4,0x70d8,0x70d9,0x70dc,0x70dd,0x70df,0x70df,0x70ef,0x70ef,0x70f1,0x70f1,0x70f9,0x70fa,0x70fd,0x70fd,0x7103,0x7104,0x7106,0x7106,0x7109,0x7109,0x710c,0x710c,0x7119,0x711a,0x711c,0x711c,0x711e,0x711e,0x7120,0x7121,0x7126,0x7126,0x712d,0x7131,0x7136,0x7136,0x7143,0x7143,0x7146,0x7147,0x7149,0x714a,0x714c,0x714c,0x714e,0x714e,0x7150,0x7150,0x7152,0x7153,0x7155,0x7157,0x7159,0x7159,0x715c,0x715e,0x7162,0x7162,0x7164,0x7169,0x716c,0x716c,0x716e,0x716e,0x717d,0x717d,0x7180,0x7180,0x7184,0x7185,0x7187,0x718a,0x718f,0x718f,0x7192,0x7192,0x7194,0x7194,0x7199,0x7199,0x719b,0x719b,0x719f,0x71a2,0x71a4,0x71a4,0x71a8,0x71a9,0x71ac,0x71ac,0x71af,0x71af,0x71b1,0x71b2,0x71b9,0x71ba,0x71be,0x71be,0x71c1,0x71c1,0x71c3,0x71c3,0x71c8,0x71c9,0x71cb,0x71cb,0x71ce,0x71d0,0x71d2,0x71d2,0x71d4,0x71d6,0x71d9,0x71d9,0x71db,0x71db,0x71df,0x71e0,0x71e5,0x71e7,0x71ec,0x71ee,0x71f9,0x71f9,0x71fb,0x7201,0x7206,0x7207,0x720b,0x720d,0x7210,0x7210,0x7214,0x7214,0x7217,0x7217,0x721a,0x721b,0x721f,0x721f,0x7225,0x7225,0x7228,0x7228,0x722a,0x722a,0x722c,0x722d,0x7230,0x7230,0x7232,0x7232,0x7235,0x7236,0x7238,0x723b,0x723d,0x7240,0x7242,0x7242,0x7246,0x7248,0x724b,0x724c,0x7252,0x7254,0x7256,0x7256,0x7258,0x725b,0x725d,0x725d,0x725f,0x725f,0x7261,0x7263,0x7267,0x7267,0x7269,0x7269,0x726f,0x726f,0x7272,0x7272,0x7274,0x7274,0x7278,0x7279,0x727d,0x727d,0x7280,0x7282,0x7287,0x7287,0x728d,0x728d,0x7292,0x7292,0x7296,0x7296,0x72a2,0x72a2,0x72a7,0x72a7,0x72ac,0x72ad,0x72af,0x72af,0x72b3,0x72b5,0x72c0,0x72c0,0x72c2,0x72c2,0x72c4,0x72c4,0x72c9,0x72c9,0x72ce,0x72ce,0x72d0,0x72d0,0x72d2,0x72d2,0x72d7,0x72d7,0x72d9,0x72d9,0x72e1,0x72e2,0x72e5,0x72e5,0x72e8,0x72e9,0x72ec,0x72ec,0x72f4,0x72f4,0x72f7,0x72fd,0x7309,0x730a,0x7313,0x7313,0x7316,0x7319,0x731b,0x731d,0x7322,0x7322,0x7325,0x7325,0x7327,0x732b,0x7331,0x7331,0x7334,0x7334,0x7336,0x7337,0x733e,0x733f,0x7343,0x7345,0x734e,0x734e,0x7350,0x7350,0x7352,0x7352,0x7357,0x7358,0x735c,0x735c,0x7360,0x7360,0x7368,0x736c,0x736f,0x7370,0x7372,0x7372,0x7375,0x7375,0x7377,0x7378,0x737a,0x737c,0x7381,0x7381,0x7384,0x7384,0x7386,0x7389,0x738b,0x738b,0x738e,0x738e,0x7392,0x7392,0x7394,0x7398,0x739e,0x73a0,0x73a6,0x73a7,0x73a9,0x73ab,0x73ad,0x73ad,0x73b2,0x73b4,0x73b7,0x73b7,0x73b9,0x73b9,0x73bb,0x73bd,0x73bf,0x73c0,0x73c2,0x73c2,0x73c6,0x73c6,0x73c8,0x73ca,0x73cc,0x73cd,0x73cf,0x73cf,0x73d2,0x73d2,0x73d6,0x73d9,0x73dd,0x73de,0x73e0,0x73e0,0x73e2,0x73e6,0x73e9,0x73eb,0x73ed,0x73ee,0x73f5,0x73f5,0x73f7,0x73f9,0x73fd,0x73fe,0x7401,0x7401,0x7403,0x7407,0x7409,0x7409,0x7413,0x7413,0x7417,0x7418,0x741b,0x741b,0x741d,0x741d,0x741f,0x7422,0x7424,0x7426,0x7428,0x7428,0x742a,0x742c,0x742e,0x7436,0x7438,0x7438,0x743a,0x743a,0x743f,0x7446,0x7448,0x7449,0x744b,0x744c,0x744e,0x744e,0x7455,0x7455,0x7457,0x7457,0x7459,0x7460,0x7462,0x7465,0x7468,0x746a,0x746d,0x7473,0x747d,0x747e,0x7480,0x7480,0x7482,0x7487,0x7489,0x748c,0x7490,0x7490,0x7498,0x7498,0x749c,0x749f,0x74a1,0x74a1,0x74a3,0x74a3,0x74a5,0x74a5,0x74a7,0x74a8,0x74aa,0x74ab,0x74b0,0x74b2,0x74b5,0x74b6,0x74b8,0x74b9,0x74bc,0x74bd,0x74bf,0x74c0,0x74c6,0x74c6,0x74ca,0x74ca,0x74cd,0x74cd,0x74cf,0x74d0,0x74d3,0x74d4,0x74d8,0x74d8,0x74da,0x74dc,0x74e0,0x74e0,0x74e2,0x74e3,0x74e6,0x74e6,0x74e9,0x74e9,0x74ee,0x74ee,0x74f2,0x74f3,0x74f7,0x74f7,0x7501,0x7501,0x7503,0x7504,0x750c,0x750e,0x7511,0x7511,0x7513,0x7513,0x7515,0x7515,0x7518,0x7518,0x751a,0x751c,0x751e,0x751f,0x7522,0x7526,0x7528,0x7528,0x752b,0x752c,0x7530,0x7533,0x7537,0x7538,0x753a,0x753b,0x753f,0x753f,0x7543,0x7543,0x7547,0x7547,0x754a,0x754c,0x754e,0x754f,0x7551,0x7551,0x7553,0x7554,0x7559,0x755d,0x7560,0x7560,0x7562,0x7562,0x7564,0x7567,0x756a,0x756b,0x756f,0x7570,0x7575,0x7576,0x7578,0x7578,0x757a,0x757a,0x757f,0x757f,0x7586,0x7588,0x758a,0x758b,0x758e,0x758f,0x7591,0x7592,0x7594,0x7594,0x7599,0x759a,0x759d,0x759d,0x75a3,0x75a3,0x75a5,0x75a5,0x75a9,0x75a9,0x75ab,0x75ab,0x75b1,0x75b5,0x75b8,0x75b9,0x75bc,0x75be,0x75c0,0x75c0,0x75c2,0x75c3,0x75c5,0x75c5,0x75c7,0x75c7,0x75ca,0x75ca,0x75cd,0x75ce,0x75d2,0x75d5,0x75d8,0x75d9,0x75db,0x75db,0x75de,0x75de,0x75e2,0x75e4,0x75e7,0x75e7,0x75f0,0x75f0,0x75f2,0x75f4,0x75f9,0x75fa,0x75fc,0x75fc,0x75ff,0x7601,0x7607,0x7609,0x760b,0x760b,0x760d,0x760d,0x7610,0x7610,0x7615,0x7615,0x7619,0x7619,0x761f,0x7622,0x7624,0x7624,0x7626,0x7627,0x762f,0x7631,0x7633,0x7634,0x763b,0x763b,0x7642,0x7643,0x7646,0x7649,0x764c,0x764c,0x764e,0x764e,0x7652,0x7652,0x7655,0x7656,0x7658,0x7658,0x765c,0x765c,0x7661,0x7662,0x7664,0x7665,0x7667,0x7669,0x766c,0x7672,0x7676,0x7676,0x7678,0x7678,0x767a,0x767e,0x7680,0x7681,0x7683,0x7684,0x7686,0x7687,0x768b,0x768b,0x768e,0x768e,0x7690,0x7690,0x7692,0x7693,0x7696,0x7697,0x769a,0x769c,0x769e,0x769e,0x76a4,0x76a4,0x76ac,0x76ac,0x76ae,0x76ae,0x76b4,0x76b4,0x76b6,0x76b6,0x76b8,0x76b8,0x76ba,0x76ba,0x76bf,0x76bf,0x76c2,0x76c3,0x76c6,0x76c6,0x76c8,0x76c8,0x76ca,0x76ca,0x76cc,0x76ce,0x76d2,0x76d4,0x76d6,0x76d6,0x76d9,0x76d9,0x76db,0x76dc,0x76de,0x76df,0x76e1,0x76e1,0x76e3,0x76e5,0x76e7,0x76e7,0x76ea,0x76ea,0x76ec,0x76ec,0x76ee,0x76ee,0x76f1,0x76f2,0x76f4,0x76f4,0x76f8,0x76f9,0x76fb,0x76fc,0x76fe,0x7702,0x7704,0x7704,0x7707,0x770c,0x7710,0x7710,0x771a,0x771b,0x771e,0x7720,0x7725,0x7726,0x7728,0x7729,0x7734,0x7734,0x7737,0x773c,0x773e,0x773e,0x7740,0x7740,0x7743,0x7743,0x7746,0x7747,0x774d,0x774d,0x7752,0x7752,0x775a,0x775b,0x775f,0x7763,0x7765,0x7766,0x7768,0x7768,0x776b,0x776c,0x7777,0x7777,0x7779,0x7779,0x777d,0x777f,0x778b,0x778b,0x778d,0x778e,0x7791,0x7791,0x7796,0x7796,0x7799,0x7799,0x779e,0x779e,0x77a0,0x77a0,0x77a2,0x77a2,0x77a5,0x77a5,0x77aa,0x77aa,0x77ac,0x77ae,0x77b0,0x77b0,0x77b3,0x77b3,0x77b9,0x77b9,0x77bb,0x77bd,0x77bf,0x77bf,0x77c7,0x77c7,0x77c9,0x77c9,0x77cd,0x77cd,0x77d7,0x77d7,0x77d9,0x77dc,0x77de,0x77de,0x77e1,0x77e3,0x77e5,0x77e5,0x77e7,0x77e7,0x77e9,0x77e9,0x77ed,0x77f0,0x77f3,0x77f3,0x77f8,0x77f8,0x77fa,0x77fd,0x7802,0x7802,0x7807,0x7807,0x780c,0x780c,0x780f,0x780f,0x7811,0x7812,0x7814,0x7814,0x7822,0x7822,0x7825,0x7827,0x782c,0x782d,0x7830,0x7830,0x7832,0x7832,0x7834,0x7834,0x7843,0x7843,0x7845,0x7845,0x784f,0x784f,0x785c,0x785d,0x7860,0x7860,0x7867,0x7868,0x786a,0x786c,0x786e,0x786f,0x787c,0x787c,0x7881,0x7881,0x7884,0x7884,0x7887,0x7887,0x788c,0x788f,0x7891,0x7891,0x7893,0x7893,0x7897,0x7897,0x789f,0x789f,0x78a3,0x78a4,0x78a7,0x78a9,0x78ac,0x78ad,0x78ba,0x78bc,0x78be,0x78be,0x78c1,0x78c1,0x78c5,0x78c5,0x78c8,0x78c8,0x78ca,0x78cb,0x78ce,0x78d1,0x78d4,0x78d5,0x78da,0x78da,0x78e0,0x78e0,0x78e7,0x78e8,0x78ea,0x78ea,0x78ec,0x78ec,0x78ef,0x78ef,0x78f4,0x78f5,0x78f7,0x78f7,0x78fa,0x78fd,0x7901,0x7901,0x790c,0x790c,0x790e,0x790f,0x7911,0x7912,0x7916,0x7916,0x7919,0x7919,0x7927,0x7927,0x792a,0x792d,0x7931,0x7931,0x793a,0x793c,0x793e,0x793e,0x7940,0x7941,0x7944,0x794a,0x7950,0x7950,0x7953,0x7958,0x795a,0x7960,0x7962,0x7962,0x7965,0x7965,0x7967,0x7968,0x796d,0x796d,0x7979,0x797a,0x797c,0x797c,0x797f,0x7981,0x798a,0x798b,0x798d,0x798f,0x7991,0x7991,0x7994,0x7994,0x799b,0x799b,0x799d,0x799d,0x79a6,0x79a8,0x79aa,0x79ab,0x79ae,0x79ae,0x79b0,0x79b1,0x79b3,0x79b4,0x79b8,0x79c1,0x79c4,0x79c4,0x79c6,0x79c6,0x79c9,0x79cb,0x79d1,0x79d2,0x79d5,0x79d5,0x79d8,0x79d8,0x79de,0x79df,0x79e2,0x79e4,0x79e6,0x79e7,0x79e9,0x79ec,0x79f5,0x79f5,0x79f8,0x79f8,0x79fb,0x79fb,0x7a00,0x7a02,0x7a05,0x7a05,0x7a08,0x7a08,0x7a0a,0x7a0d,0x7a14,0x7a14,0x7a17,0x7a1a,0x7a1c,0x7a1c,0x7a1e,0x7a20,0x7a22,0x7a22,0x7a27,0x7a27,0x7a2e,0x7a2e,0x7a30,0x7a31,0x7a33,0x7a33,0x7a36,0x7a37,0x7a39,0x7a39,0x7a3b,0x7a3d,0x7a3f,0x7a40,0x7a42,0x7a42,0x7a45,0x7a46,0x7a49,0x7a49,0x7a4c,0x7a4e,0x7a57,0x7a57,0x7a60,0x7a62,0x7a66,0x7a66,0x7a69,0x7a69,0x7a6b,0x7a6b,0x7a70,0x7a70,0x7a74,0x7a76,0x7a79,0x7a7a,0x7a7d,0x7a86,0x7a88,0x7a88,0x7a8a,0x7a8a,0x7a92,0x7a93,0x7a95,0x7a99,0x7a9b,0x7a9b,0x7a9f,0x7aa0,0x7aa3,0x7aa3,0x7aa9,0x7aaa,0x7aac,0x7aac,0x7aae,0x7aaf,0x7ab3,0x7ab3,0x7ab6,0x7ab6,0x7ab9,0x7abb,0x7abe,0x7abf,0x7ac4,0x7ac5,0x7ac7,0x7ac8,0x7aca,0x7acb,0x7ad7,0x7ad7,0x7ad9,0x7ad9,0x7adc,0x7add,0x7adf,0x7ae0,0x7ae2,0x7ae3,0x7ae5,0x7ae6,0x7aea,0x7aea,0x7aed,0x7aed,0x7aef,0x7aef,0x7af4,0x7af4,0x7af6,0x7af6,0x7af8,0x7afa,0x7afd,0x7afd,0x7aff,0x7aff,0x7b06,0x7b06,0x7b08,0x7b08,0x7b0a,0x7b0a,0x7b0c,0x7b0c,0x7b0e,0x7b0f,0x7b11,0x7b12,0x7b18,0x7b19,0x7b1b,0x7b1b,0x7b1e,0x7b1e,0x7b20,0x7b20,0x7b25,0x7b28,0x7b2c,0x7b2d,0x7b2f,0x7b2f,0x7b33,0x7b33,0x7b35,0x7b35,0x7b39,0x7b39,0x7b45,0x7b46,0x7b48,0x7b49,0x7b4b,0x7b4d,0x7b4f,0x7b54,0x7b56,0x7b56,0x7b5f,0x7b60,0x7b65,0x7b67,0x7b69,0x7b69,0x7b6c,0x7b6c,0x7b6e,0x7b6e,0x7b71,0x7b71,0x7b73,0x7b73,0x7b75,0x7b75,0x7b7d,0x7b7d,0x7b87,0x7b87,0x7b8b,0x7b8b,0x7b8d,0x7b8f,0x7b92,0x7b92,0x7b94,0x7b95,0x7b97,0x7b97,0x7b99,0x7b9a,0x7b9c,0x7b9d,0x7ba0,0x7ba1,0x7bad,0x7bad,0x7bb1,0x7bb1,0x7bb4,0x7bb4,0x7bb8,0x7bb8,0x7bbe,0x7bbe,0x7bc0,0x7bc1,0x7bc4,0x7bc4,0x7bc6,0x7bc7,0x7bc9,0x7bcc,0x7bd2,0x7bd2,0x7bd4,0x7bd4,0x7bd9,0x7bd9,0x7bdb,0x7bdb,0x7bdd,0x7bdd,0x7be0,0x7be1,0x7be4,0x7be4,0x7be6,0x7be6,0x7be9,0x7bea,0x7bf3,0x7bf3,0x7bf7,0x7bf7,0x7bfe,0x7bfe,0x7c00,0x7c00,0x7c07,0x7c07,0x7c09,0x7c09,0x7c0b,0x7c0b,0x7c0f,0x7c0f,0x7c12,0x7c12,0x7c1e,0x7c21,0x7c27,0x7c27,0x7c2a,0x7c2b,0x7c37,0x7c38,0x7c3d,0x7c3f,0x7c43,0x7c43,0x7c4c,0x7c4d,0x7c50,0x7c50,0x7c52,0x7c52,0x7c54,0x7c54,0x7c5b,0x7c5c,0x7c5f,0x7c60,0x7c64,0x7c65,0x7c67,0x7c67,0x7c69,0x7c69,0x7c6c,0x7c6c,0x7c72,0x7c73,0x7c7e,0x7c7e,0x7c81,0x7c81,0x7c83,0x7c83,0x7c89,0x7c89,0x7c8d,0x7c8d,0x7c92,0x7c92,0x7c95,0x7c95,0x7c97,0x7c98,0x7c9f,0x7c9f,0x7ca2,0x7ca2,0x7ca4,0x7ca8,0x7cae,0x7cae,0x7cb1,0x7cb3,0x7cb9,0x7cb9,0x7cbc,0x7cbe,0x7cc5,0x7cc6,0x7cca,0x7cca,0x7cd5,0x7cd7,0x7cd9,0x7cda,0x7cdc,0x7ce0,0x7ce2,0x7ce2,0x7ce5,0x7ce5,0x7ce7,0x7ce7,0x7cef,0x7cef,0x7cf1,0x7cf2,0x7cf4,0x7cf6,0x7cf8,0x7cfb,0x7cfe,0x7cfe,0x7d00,0x7d00,0x7d02,0x7d08,0x7d0a,0x7d0b,0x7d0d,0x7d0d,0x7d10,0x7d10,0x7d13,0x7d15,0x7d17,0x7d1c,0x7d20,0x7d22,0x7d2b,0x7d2c,0x7d2e,0x7d33,0x7d35,0x7d35,0x7d38,0x7d3a,0x7d41,0x7d46,0x7d49,0x7d49,0x7d4c,0x7d4d,0x7d50,0x7d51,0x7d55,0x7d56,0x7d59,0x7d59,0x7d5b,0x7d5c,0x7d5e,0x7d5e,0x7d61,0x7d63,0x7d66,0x7d66,0x7d68,0x7d6a,0x7d6e,0x7d6e,0x7d70,0x7d73,0x7d75,0x7d76,0x7d79,0x7d7a,0x7d7f,0x7d7f,0x7d83,0x7d83,0x7d86,0x7d86,0x7d8e,0x7d8f,0x7d93,0x7d93,0x7d98,0x7d98,0x7d9a,0x7d9a,0x7d9c,0x7d9c,0x7da0,0x7da0,0x7da2,0x7da3,0x7da5,0x7da7,0x7da9,0x7da9,0x7dab,0x7dae,0x7db0,0x7db2,0x7db4,0x7db5,0x7db8,0x7db8,0x7dba,0x7dbb,0x7dbd,0x7dbf,0x7dc4,0x7dc4,0x7dc7,0x7dc7,0x7dca,0x7dcd,0x7dcf,0x7dcf,0x7dd6,0x7dd8,0x7dda,0x7dda,0x7ddc,0x7dde,0x7de0,0x7de1,0x7de3,0x7de3,0x7de6,0x7de6,0x7de8,0x7de9,0x7dec,0x7dec,0x7def,0x7def,0x7df4,0x7df4,0x7df6,0x7df6,0x7df9,0x7df9,0x7dfb,0x7dfb,0x7e03,0x7e03,0x7e08,0x7e0b,0x7e10,0x7e11,0x7e15,0x7e15,0x7e17,0x7e18,0x7e1b,0x7e1b,0x7e1d,0x7e23,0x7e2b,0x7e2b,0x7e2e,0x7e2f,0x7e31,0x7e33,0x7e35,0x7e35,0x7e37,0x7e37,0x7e39,0x7e39,0x7e3b,0x7e3b,0x7e3d,0x7e3e,0x7e41,0x7e41,0x7e43,0x7e48,0x7e50,0x7e50,0x7e52,0x7e52,0x7e54,0x7e57,0x7e59,0x7e5a,0x7e5e,0x7e5e,0x7e61,0x7e62,0x7e69,0x7e6b,0x7e6d,0x7e6d,0x7e6f,0x7e70,0x7e76,0x7e76,0x7e79,0x7e79,0x7e7c,0x7e7e,0x7e81,0x7e82,0x7e87,0x7e88,0x7e8a,0x7e8a,0x7e8c,0x7e8d,0x7e8f,0x7e8f,0x7e93,0x7e94,0x7e96,0x7e96,0x7e98,0x7e98,0x7e9b,0x7e9c,0x7e9f,0x7e9f,0x7f36,0x7f38,0x7f3a,0x7f3a,0x7f3e,0x7f3f,0x7f43,0x7f45,0x7f47,0x7f47,0x7f4b,0x7f4e,0x7f50,0x7f55,0x7f58,0x7f58,0x7f5d,0x7f5d,0x7f5f,0x7f61,0x7f63,0x7f63,0x7f66,0x7f66,0x7f68,0x7f68,0x7f6a,0x7f6b,0x7f6e,0x7f6e,0x7f70,0x7f70,0x7f72,0x7f72,0x7f75,0x7f75,0x7f77,0x7f79,0x7f7c,0x7f7e,0x7f82,0x7f82,0x7f85,0x7f88,0x7f8a,0x7f8a,0x7f8c,0x7f8c,0x7f8e,0x7f8e,0x7f94,0x7f94,0x7f96,0x7f98,0x7f9a,0x7f9a,0x7f9d,0x7f9e,0x7fa1,0x7fa1,0x7fa4,0x7fa4,0x7fa8,0x7fa9,0x7fab,0x7fab,0x7faf,0x7faf,0x7fb2,0x7fb2,0x7fb6,0x7fb6,0x7fb8,0x7fb9,0x7fbd,0x7fbd,0x7fbf,0x7fbf,0x7fc1,0x7fc1,0x7fc5,0x7fc5,0x7fca,0x7fca,0x7fcc,0x7fcc,0x7fce,0x7fce,0x7fd2,0x7fd2,0x7fd4,0x7fd6,0x7fdb,0x7fdb,0x7fdf,0x7fe1,0x7fe3,0x7fe4,0x7fe6,0x7fe6,0x7fe9,0x7fe9,0x7feb,0x7fec,0x7fee,0x7fee,0x7ff0,0x7ff0,0x7ff3,0x7ff3,0x7ff9,0x7ffc,0x7ffe,0x7ffe,0x8000,0x8009,0x800c,0x800c,0x8010,0x8012,0x8014,0x8019,0x801e,0x801e,0x8021,0x8021,0x8026,0x8026,0x8028,0x8028,0x802c,0x802d,0x8030,0x8030,0x8033,0x8033,0x8036,0x8036,0x803d,0x803d,0x803f,0x803f,0x8043,0x8043,0x8046,0x8046,0x8048,0x8048,0x804a,0x804a,0x8052,0x8052,0x8055,0x8056,0x8058,0x8058,0x805a,0x805a,0x805e,0x805e,0x8061,0x8061,0x806f,0x8073,0x8075,0x8077,0x807d,0x8080,0x8084,0x8087,0x8089,0x8089,0x808b,0x808c,0x8093,0x8093,0x8096,0x8096,0x8098,0x8098,0x809a,0x809b,0x809d,0x809d,0x80a1,0x80a2,0x80a5,0x80a6,0x80a9,0x80ab,0x80ad,0x80ad,0x80af,0x80af,0x80b1,0x80b2,0x80b4,0x80b5,0x80ba,0x80ba,0x80c3,0x80c4,0x80c6,0x80c6,0x80ca,0x80ca,0x80cc,0x80cc,0x80ce,0x80ce,0x80d5,0x80d6,0x80d9,0x80dc,0x80de,0x80de,0x80e0,0x80e1,0x80e4,0x80e5,0x80ef,0x80ef,0x80f1,0x80f1,0x80f4,0x80f4,0x80f7,0x80f8,0x80fd,0x80fe,0x8102,0x8102,0x8105,0x810a,0x8116,0x8118,0x811a,0x811b,0x8123,0x8124,0x8127,0x8127,0x8129,0x8129,0x812b,0x812b,0x812f,0x8130,0x8139,0x813a,0x813e,0x813e,0x8141,0x8141,0x8146,0x8146,0x814a,0x814b,0x814e,0x814e,0x8150,0x8155,0x8160,0x8160,0x8164,0x8166,0x816b,0x816b,0x816d,0x816d,0x8170,0x8171,0x8174,0x8174,0x8176,0x817a,0x817f,0x8180,0x8182,0x8184,0x8186,0x8186,0x8188,0x8188,0x818a,0x818b,0x818f,0x818f,0x819a,0x819a,0x819c,0x819e,0x81a0,0x81a0,0x81a3,0x81a3,0x81a8,0x81a9,0x81b0,0x81b0,0x81b3,0x81b5,0x81b8,0x81ba,0x81bd,0x81c0,0x81c2,0x81c2,0x81c6,0x81c6,0x81ca,0x81ca,0x81cd,0x81cd,0x81cf,0x81cf,0x81d1,0x81d1,0x81d8,0x81da,0x81dd,0x81dd,0x81df,0x81e0,0x81e3,0x81e3,0x81e5,0x81e5,0x81e7,0x81e8,0x81ea,0x81ea,0x81ec,0x81ed,0x81f3,0x81f4,0x81f6,0x81f6,0x81fa,0x81fc,0x81fe,0x81fe,0x8201,0x8203,0x8205,0x8205,0x8207,0x8208,0x820a,0x820a,0x820c,0x820d,0x8210,0x8210,0x8212,0x8212,0x8216,0x8216,0x8218,0x8218,0x821b,0x821c,0x821e,0x821f,0x8221,0x8221,0x822a,0x822c,0x8233,0x8233,0x8235,0x8239,0x823d,0x823d,0x8240,0x8240,0x8245,0x8245,0x8247,0x8247,0x8251,0x8251,0x8258,0x825a,0x825f,0x825f,0x8264,0x8264,0x8266,0x8266,0x8268,0x8268,0x826a,0x826b,0x826e,0x826f,0x8271,0x8272,0x8274,0x8274,0x8276,0x8279,0x827d,0x827e,0x8283,0x8283,0x828a,0x828b,0x828d,0x828e,0x8290,0x8290,0x8292,0x8292,0x8294,0x8294,0x8298,0x829a,0x829d,0x829d,0x829f,0x829f,0x82a1,0x82a3,0x82a5,0x82b1,0x82b3,0x82b3,0x82b7,0x82b9,0x82bb,0x82bf,0x82c5,0x82c5,0x82d1,0x82d5,0x82d7,0x82d7,0x82db,0x82dc,0x82de,0x82e1,0x82e3,0x82e3,0x82e5,0x82e7,0x82e9,0x82e9,0x82eb,0x82eb,0x82f1,0x82f1,0x82f3,0x82f4,0x82f9,0x82fb,0x82fd,0x8305,0x8308,0x8309,0x8317,0x8317,0x831b,0x831d,0x8323,0x8325,0x8328,0x8328,0x832a,0x832b,0x832f,0x832f,0x8331,0x8336,0x8338,0x8339,0x833c,0x833c,0x8340,0x8340,0x8343,0x8343,0x8347,0x8347,0x8349,0x834a,0x834f,0x8352,0x8363,0x8363,0x8373,0x8373,0x8377,0x8377,0x837a,0x837b,0x8382,0x8382,0x8385,0x8385,0x8389,0x838a,0x838e,0x838e,0x8392,0x8393,0x8396,0x8396,0x8398,0x8398,0x839a,0x839b,0x839d,0x83a0,0x83a2,0x83a2,0x83a8,0x83ab,0x83bd,0x83c2,0x83c5,0x83c5,0x83c9,0x83ca,0x83cc,0x83cc,0x83d1,0x83d1,0x83d3,0x83d4,0x83d6,0x83d6,0x83d8,0x83d8,0x83dc,0x83dc,0x83df,0x83e1,0x83e9,0x83e9,0x83eb,0x83eb,0x83ef,0x83f2,0x83f4,0x83f4,0x83f6,0x83f6,0x83f9,0x83f9,0x83fb,0x83fb,0x83fd,0x83fd,0x8403,0x8404,0x8406,0x8407,0x840a,0x840e,0x8429,0x8429,0x842c,0x842c,0x8431,0x8431,0x8435,0x8435,0x8438,0x8439,0x843c,0x843d,0x8446,0x8446,0x8449,0x844a,0x8451,0x8451,0x8457,0x8457,0x845a,0x845b,0x8461,0x8461,0x8463,0x8463,0x8466,0x8466,0x8469,0x846d,0x846f,0x8471,0x8473,0x8473,0x8475,0x8475,0x8477,0x8477,0x847a,0x847a,0x8482,0x8482,0x8490,0x8491,0x8494,0x8494,0x8499,0x8499,0x849c,0x849c,0x849f,0x849f,0x84a1,0x84a1,0x84a8,0x84a8,0x84ad,0x84ad,0x84af,0x84af,0x84b2,0x84b2,0x84b4,0x84b4,0x84b8,0x84bd,0x84bf,0x84c2,0x84c4,0x84c4,0x84c6,0x84c6,0x84c9,0x84cb,0x84cd,0x84cd,0x84cf,0x84d1,0x84d3,0x84d3,0x84d6,0x84d6,0x84da,0x84da,0x84ec,0x84ef,0x84f1,0x84f1,0x84f4,0x84f4,0x84fa,0x84fa,0x84fc,0x84fd,0x8500,0x8500,0x8506,0x8506,0x850e,0x850e,0x8511,0x8511,0x8513,0x8515,0x8517,0x8518,0x851a,0x851a,0x851e,0x851f,0x8521,0x8521,0x8523,0x8523,0x8525,0x8526,0x852a,0x852a,0x852c,0x852d,0x852f,0x8530,0x853d,0x853d,0x853f,0x853f,0x8541,0x8541,0x8543,0x8543,0x8546,0x8546,0x8549,0x854b,0x854e,0x854e,0x8553,0x8553,0x8555,0x8559,0x855e,0x855e,0x8561,0x8561,0x8563,0x8564,0x8568,0x856b,0x856d,0x856d,0x8578,0x8578,0x857a,0x857a,0x857e,0x857e,0x8580,0x8580,0x8584,0x8584,0x8586,0x8587,0x8589,0x858a,0x858c,0x858c,0x858f,0x858f,0x8591,0x8591,0x8594,0x8594,0x8597,0x8597,0x8599,0x8599,0x859b,0x859b,0x859d,0x859d,0x85a4,0x85a6,0x85a8,0x85ab,0x85af,0x85b0,0x85ba,0x85ba,0x85c1,0x85c1,0x85c7,0x85c7,0x85c9,0x85c9,0x85cd,0x85d0,0x85d5,0x85d5,0x85dc,0x85dd,0x85e4,0x85e5,0x85e9,0x85ea,0x85f7,0x85f7,0x85f9,0x85fb,0x85fd,0x85fd,0x85ff,0x8600,0x8602,0x8602,0x8604,0x8604,0x8606,0x8607,0x860a,0x860b,0x8616,0x8618,0x861a,0x861a,0x861f,0x861f,0x8622,0x8622,0x8627,0x8627,0x8629,0x862a,0x862d,0x862d,0x862f,0x862f,0x863c,0x863c,0x863f,0x863f,0x8641,0x8641,0x864d,0x864e,0x8650,0x8650,0x8653,0x8655,0x865b,0x865c,0x865e,0x865f,0x8667,0x8667,0x866b,0x866c,0x866f,0x866f,0x8671,0x8671,0x8678,0x867b,0x868a,0x868d,0x8693,0x8693,0x8695,0x8695,0x86a3,0x86a4,0x86a8,0x86aa,0x86af,0x86b1,0x86b4,0x86b4,0x86c0,0x86c0,0x86c5,0x86c7,0x86c9,0x86c9,0x86cb,0x86cb,0x86d4,0x86d4,0x86d9,0x86d9,0x86db,0x86db,0x86de,0x86df,0x86e3,0x86e4,0x86e9,0x86e9,0x86ec,0x86ed,0x86f8,0x86f9,0x86fb,0x86fb,0x86fe,0x86fe,0x8700,0x8700,0x8702,0x8703,0x8706,0x8706,0x8708,0x870b,0x8711,0x8711,0x8718,0x8718,0x871a,0x871a,0x871c,0x871d,0x8721,0x8721,0x8725,0x8725,0x8728,0x8729,0x8734,0x8735,0x8737,0x8737,0x873a,0x873b,0x873f,0x8740,0x874c,0x874c,0x874e,0x874e,0x8755,0x8755,0x8757,0x8757,0x8759,0x8759,0x875f,0x8760,0x8764,0x8766,0x8768,0x8768,0x876e,0x876e,0x8774,0x8774,0x8776,0x8776,0x8778,0x8778,0x8782,0x8783,0x878c,0x878d,0x8798,0x8798,0x879e,0x879f,0x87a2,0x87a3,0x87ad,0x87ad,0x87b3,0x87b4,0x87ba,0x87bb,0x87bd,0x87bd,0x87c0,0x87c0,0x87c4,0x87c4,0x87c7,0x87c7,0x87ca,0x87cb,0x87d2,0x87d2,0x87da,0x87db,0x87e0,0x87e0,0x87e3,0x87e3,0x87ec,0x87ec,0x87ef,0x87ef,0x87f2,0x87f2,0x87f7,0x87f7,0x87f9,0x87f9,0x87fb,0x87fb,0x87fe,0x87fe,0x8805,0x8805,0x880d,0x880d,0x8811,0x8811,0x8815,0x8815,0x881f,0x881f,0x8821,0x8823,0x8831,0x8832,0x8836,0x8836,0x8839,0x8839,0x883b,0x883b,0x8840,0x8840,0x8844,0x8844,0x8846,0x8846,0x884a,0x884a,0x884c,0x884e,0x8852,0x8853,0x8857,0x8857,0x8859,0x8859,0x885b,0x885b,0x885d,0x885e,0x8861,0x8864,0x8868,0x8868,0x886b,0x886b,0x886e,0x886e,0x8870,0x8870,0x8872,0x8872,0x8877,0x8877,0x887d,0x887f,0x8881,0x8882,0x8888,0x8888,0x888b,0x888b,0x888d,0x888d,0x8892,0x8892,0x8896,0x8897,0x889b,0x889b,0x889d,0x889e,0x88a2,0x88a2,0x88aa,0x88ab,0x88b4,0x88b4,0x88c0,0x88c2,0x88c5,0x88c5,0x88ca,0x88ca,0x88cd,0x88cd,0x88cf,0x88cf,0x88d2,0x88d2,0x88d4,0x88d5,0x88d8,0x88d9,0x88dc,0x88dd,0x88df,0x88df,0x88e1,0x88e1,0x88e8,0x88e8,0x88ef,0x88ef,0x88f1,0x88f1,0x88f3,0x88f5,0x88f8,0x88f9,0x88fd,0x88fe,0x8904,0x8904,0x8907,0x8907,0x890a,0x890a,0x890c,0x890c,0x8910,0x8913,0x8915,0x8915,0x8918,0x891a,0x8925,0x8925,0x8927,0x8927,0x892a,0x892b,0x892f,0x8930,0x8936,0x8936,0x8938,0x8938,0x893a,0x893b,0x8941,0x8941,0x8944,0x8944,0x894d,0x894d,0x8952,0x8952,0x8956,0x8956,0x8958,0x8958,0x895c,0x895c,0x895e,0x8960,0x8964,0x8964,0x896a,0x896a,0x896d,0x896d,0x896f,0x896f,0x8972,0x8972,0x8974,0x8974,0x897e,0x8981,0x8983,0x8983,0x8986,0x8989,0x898b,0x898b,0x898f,0x898f,0x8993,0x8993,0x8996,0x8998,0x899a,0x899a,0x89a0,0x89a1,0x89a8,0x89aa,0x89ac,0x89ac,0x89af,0x89af,0x89b2,0x89b3,0x89b6,0x89b7,0x89ba,0x89ba,0x89bd,0x89bd,0x89bf,0x89c1,0x89d2,0x89d2,0x89d4,0x89d4,0x89d6,0x89d7,0x89da,0x89da,0x89dc,0x89dd,0x89e3,0x89e3,0x89e5,0x89e7,0x89f0,0x89f1,0x89f3,0x89f4,0x89f6,0x89f6,0x89f8,0x89f8,0x8a00,0x8a00,0x8a02,0x8a03,0x8a07,0x8a0a,0x8a0c,0x8a0c,0x8a0e,0x8a0e,0x8a10,0x8a18,0x8a1b,0x8a1b,0x8a1d,0x8a1d,0x8a1f,0x8a1f,0x8a22,0x8a23,0x8a25,0x8a25,0x8a2a,0x8a2a,0x8a2d,0x8a2d,0x8a31,0x8a31,0x8a33,0x8a34,0x8a36,0x8a36,0x8a3a,0x8a3c,0x8a3e,0x8a3e,0x8a41,0x8a41,0x8a46,0x8a46,0x8a4b,0x8a4b,0x8a50,0x8a51,0x8a54,0x8a58,0x8a5b,0x8a5b,0x8a5e,0x8a5e,0x8a60,0x8a63,0x8a66,0x8a66,0x8a69,0x8a69,0x8a6b,0x8a6e,0x8a70,0x8a73,0x8a75,0x8a75,0x8a79,0x8a79,0x8a7c,0x8a7c,0x8a7f,0x8a7f,0x8a82,0x8a82,0x8a84,0x8a87,0x8a8c,0x8a8d,0x8a91,0x8a91,0x8a93,0x8a93,0x8a95,0x8a95,0x8a98,0x8a98,0x8a9a,0x8a9a,0x8a9e,0x8a9e,0x8aa0,0x8aa8,0x8aaa,0x8aaa,0x8ab0,0x8ab0,0x8ab2,0x8ab2,0x8ab9,0x8ab9,0x8abc,0x8abc,0x8abe,0x8abf,0x8ac2,0x8ac2,0x8ac4,0x8ac4,0x8ac7,0x8ac7,0x8ac9,0x8ac9,0x8acb,0x8acb,0x8acd,0x8acd,0x8acf,0x8acf,0x8ad2,0x8ad2,0x8ad6,0x8ad7,0x8adb,0x8ae1,0x8ae4,0x8ae4,0x8ae6,0x8ae7,0x8aea,0x8aeb,0x8aed,0x8aee,0x8af0,0x8af4,0x8af6,0x8af8,0x8afa,0x8afa,0x8afc,0x8afc,0x8afe,0x8afe,0x8b00,0x8b02,0x8b04,0x8b04,0x8b07,0x8b07,0x8b0c,0x8b0c,0x8b0e,0x8b0e,0x8b10,0x8b11,0x8b14,0x8b14,0x8b16,0x8b17,0x8b19,0x8b1d,0x8b20,0x8b20,0x8b23,0x8b23,0x8b26,0x8b26,0x8b28,0x8b28,0x8b2b,0x8b2c,0x8b33,0x8b33,0x8b37,0x8b37,0x8b39,0x8b39,0x8b3c,0x8b3c,0x8b3e,0x8b3e,0x8b41,0x8b41,0x8b43,0x8b43,0x8b46,0x8b46,0x8b49,0x8b49,0x8b4c,0x8b4c,0x8b4e,0x8b4f,0x8b53,0x8b54,0x8b56,0x8b56,0x8b58,0x8b5a,0x8b5c,0x8b5c,0x8b5e,0x8b5f,0x8b66,0x8b66,0x8b6b,0x8b6c,0x8b6f,0x8b71,0x8b74,0x8b74,0x8b77,0x8b77,0x8b7d,0x8b7d,0x8b7f,0x8b80,0x8b83,0x8b83,0x8b89,0x8b8a,0x8b8c,0x8b8c,0x8b8e,0x8b8e,0x8b90,0x8b90,0x8b92,0x8b93,0x8b96,0x8b96,0x8b9a,0x8b9a,0x8b9c,0x8b9c,0x8b9e,0x8b9e,0x8ba0,0x8ba0,0x8c37,0x8c37,0x8c3f,0x8c3f,0x8c41,0x8c41,0x8c46,0x8c4a,0x8c4c,0x8c4c,0x8c4e,0x8c4e,0x8c50,0x8c50,0x8c55,0x8c56,0x8c5a,0x8c5a,0x8c61,0x8c62,0x8c68,0x8c68,0x8c6a,0x8c6c,0x8c73,0x8c73,0x8c78,0x8c7a,0x8c82,0x8c83,0x8c8a,0x8c8a,0x8c8c,0x8c8d,0x8c93,0x8c94,0x8c98,0x8c98,0x8c9d,0x8ca2,0x8ca7,0x8cac,0x8caf,0x8cb0,0x8cb2,0x8cb4,0x8cb6,0x8cbd,0x8cbf,0x8cc4,0x8cc6,0x8cc8,0x8cca,0x8cca,0x8cd1,0x8cd1,0x8cd3,0x8cd3,0x8cd9,0x8cdc,0x8cde,0x8cde,0x8ce0,0x8ce6,0x8cea,0x8cea,0x8cec,0x8ced,0x8cf0,0x8cf1,0x8cf3,0x8cf4,0x8cfb,0x8cfd,0x8d04,0x8d05,0x8d07,0x8d08,0x8d0a,0x8d0b,0x8d0d,0x8d0d,0x8d0f,0x8d10,0x8d13,0x8d14,0x8d16,0x8d16,0x8d1b,0x8d1b,0x8d1d,0x8d1d,0x8d64,0x8d64,0x8d66,0x8d67,0x8d6b,0x8d6b,0x8d6d,0x8d6e,0x8d70,0x8d70,0x8d73,0x8d74,0x8d76,0x8d77,0x8d81,0x8d81,0x8d85,0x8d85,0x8d8a,0x8d8a,0x8d8e,0x8d8e,0x8d90,0x8d90,0x8d99,0x8d99,0x8da0,0x8da0,0x8da3,0x8da3,0x8da8,0x8da8,0x8dab,0x8dab,0x8db2,0x8db3,0x8dba,0x8dba,0x8dbe,0x8dbe,0x8dc2,0x8dc2,0x8dc6,0x8dc6,0x8dcb,0x8dcc,0x8dce,0x8dcf,0x8dd5,0x8dd7,0x8ddb,0x8ddb,0x8ddd,0x8ddd,0x8ddf,0x8ddf,0x8de1,0x8de1,0x8de3,0x8de3,0x8de8,0x8de8,0x8dea,0x8ded,0x8def,0x8def,0x8df1,0x8df1,0x8df3,0x8df3,0x8dfc,0x8dfc,0x8e06,0x8e06,0x8e08,0x8e0a,0x8e0f,0x8e10,0x8e14,0x8e14,0x8e1d,0x8e1f,0x8e2a,0x8e2a,0x8e30,0x8e30,0x8e34,0x8e36,0x8e3a,0x8e3a,0x8e3d,0x8e3d,0x8e40,0x8e40,0x8e42,0x8e42,0x8e44,0x8e44,0x8e47,0x8e4a,0x8e4c,0x8e4c,0x8e4f,0x8e4f,0x8e55,0x8e55,0x8e59,0x8e59,0x8e5c,0x8e5c,0x8e5f,0x8e60,0x8e63,0x8e64,0x8e72,0x8e72,0x8e74,0x8e74,0x8e76,0x8e76,0x8e7b,0x8e7b,0x8e81,0x8e81,0x8e85,0x8e85,0x8e87,0x8e87,0x8e89,0x8e8b,0x8e8d,0x8e8d,0x8e90,0x8e91,0x8e93,0x8e94,0x8e99,0x8e99,0x8e9e,0x8e9e,0x8ea1,0x8ea1,0x8ea9,0x8eac,0x8eb1,0x8eb1,0x8eb3,0x8eb3,0x8ebe,0x8ebe,0x8ec0,0x8ec0,0x8ec6,0x8ec6,0x8eca,0x8ecd,0x8ed2,0x8ed2,0x8ede,0x8edf,0x8ee2,0x8ee2,0x8ee8,0x8ee8,0x8eeb,0x8eeb,0x8ef8,0x8efc,0x8efe,0x8efe,0x8f03,0x8f03,0x8f05,0x8f05,0x8f07,0x8f09,0x8f12,0x8f15,0x8f1b,0x8f1f,0x8f26,0x8f2a,0x8f2d,0x8f2d,0x8f2f,0x8f30,0x8f33,0x8f33,0x8f38,0x8f39,0x8f3b,0x8f3b,0x8f3e,0x8f40,0x8f42,0x8f42,0x8f44,0x8f46,0x8f49,0x8f49,0x8f4d,0x8f4e,0x8f52,0x8f52,0x8f54,0x8f54,0x8f57,0x8f58,0x8f5d,0x8f5f,0x8f61,0x8f64,0x8f66,0x8f66,0x8f9b,0x8f9c,0x8f9f,0x8f9f,0x8fa2,0x8fa3,0x8fa6,0x8fa6,0x8fa8,0x8fa8,0x8fad,0x8fb2,0x8fb5,0x8fb6,0x8fbb,0x8fbb,0x8fbf,0x8fc0,0x8fc2,0x8fc5,0x8fcd,0x8fce,0x8fd0,0x8fd1,0x8fd3,0x8fd5,0x8fe2,0x8fe2,0x8fe4,0x8fe6,0x8fe8,0x8fe8,0x8fea,0x8fed,0x8ff0,0x8ff0,0x8ff2,0x8ff2,0x8ff4,0x8ff4,0x8ff7,0x8ffa,0x8ffc,0x8ffd,0x8fff,0x9003,0x9005,0x9006,0x9008,0x9008,0x900b,0x9011,0x9014,0x9017,0x9019,0x901a,0x901d,0x9023,0x902e,0x902e,0x9031,0x9032,0x9034,0x9036,0x9038,0x9038,0x903c,0x903c,0x903e,0x903e,0x9041,0x9042,0x9047,0x9047,0x9049,0x904b,0x904d,0x9055,0x9058,0x9059,0x905b,0x905e,0x9060,0x9061,0x9063,0x9063,0x9068,0x9069,0x906c,0x906f,0x9072,0x9072,0x9075,0x9078,0x907a,0x907a,0x907c,0x9085,0x9087,0x9088,0x908a,0x908a,0x908c,0x908d,0x908f,0x9091,0x9095,0x9095,0x9097,0x9099,0x90a0,0x90a0,0x90a2,0x90a3,0x90a6,0x90a6,0x90a8,0x90a8,0x90aa,0x90aa,0x90af,0x90b1,0x90b3,0x90b3,0x90b5,0x90b5,0x90b8,0x90b8,0x90bd,0x90be,0x90c1,0x90c1,0x90c3,0x90c5,0x90ca,0x90ca,0x90ce,0x90ce,0x90dc,0x90de,0x90e1,0x90e2,0x90e8,0x90e8,0x90ea,0x90eb,0x90ed,0x90ed,0x90ef,0x90ef,0x90f3,0x90f5,0x90fd,0x90fd,0x9102,0x9102,0x9112,0x9112,0x9115,0x9117,0x9119,0x9119,0x911e,0x911e,0x9122,0x9123,0x9127,0x9127,0x912d,0x912d,0x9130,0x9132,0x9134,0x9134,0x913d,0x913d,0x9148,0x914e,0x9152,0x9152,0x9156,0x9157,0x9162,0x9165,0x9169,0x916a,0x916c,0x916c,0x9172,0x9172,0x9174,0x9179,0x9183,0x9183,0x9187,0x9187,0x9189,0x9189,0x918b,0x918b,0x918d,0x918d,0x9190,0x9190,0x9192,0x9192,0x919c,0x919c,0x919e,0x919e,0x91a2,0x91a2,0x91aa,0x91ac,0x91ae,0x91af,0x91b1,0x91b2,0x91b4,0x91b5,0x91bc,0x91bc,0x91c0,0x91c1,0x91c3,0x91c3,0x91c5,0x91c7,0x91c9,0x91c9,0x91cb,0x91d1,0x91d7,0x91d8,0x91dc,0x91dd,0x91e3,0x91e7,0x91e9,0x91ea,0x91ed,0x91ed,0x91f5,0x91f5,0x91ff,0x91ff,0x9207,0x9207,0x920d,0x920d,0x9210,0x9212,0x9214,0x9215,0x9217,0x9217,0x921c,0x921c,0x921e,0x921f,0x9226,0x9226,0x9231,0x9231,0x9234,0x9235,0x9237,0x9238,0x923a,0x923a,0x923f,0x9241,0x9244,0x9245,0x9249,0x9249,0x924b,0x924b,0x924d,0x9252,0x9257,0x9257,0x925b,0x925b,0x925e,0x925e,0x9262,0x9262,0x9264,0x9266,0x9277,0x9278,0x927c,0x927c,0x927e,0x927e,0x9280,0x9280,0x9283,0x9283,0x9285,0x9285,0x928b,0x928b,0x9291,0x9291,0x9293,0x9293,0x9295,0x9296,0x9298,0x929c,0x92b3,0x92b4,0x92b6,0x92b7,0x92b9,0x92b9,0x92c6,0x92c6,0x92cc,0x92cc,0x92cf,0x92cf,0x92d1,0x92d2,0x92d5,0x92d5,0x92d7,0x92d7,0x92df,0x92df,0x92e4,0x92e5,0x92ea,0x92ea,0x92f2,0x92f2,0x92f8,0x92fa,0x92fc,0x92fe,0x9300,0x9300,0x9304,0x9304,0x9306,0x9306,0x930f,0x9310,0x9315,0x9315,0x9318,0x931a,0x931e,0x9324,0x9326,0x9328,0x932a,0x932c,0x932e,0x932f,0x9348,0x934b,0x934d,0x934d,0x9351,0x9351,0x9354,0x9354,0x9357,0x9357,0x935b,0x935d,0x9364,0x9365,0x936b,0x936c,0x936e,0x936e,0x9370,0x9370,0x9372,0x9372,0x9375,0x9375,0x937c,0x937c,0x937e,0x937e,0x938a,0x938a,0x938c,0x938c,0x9394,0x9394,0x9396,0x9397,0x939a,0x939b,0x939f,0x93a1,0x93a3,0x93a4,0x93a7,0x93a7,0x93ac,0x93ad,0x93b0,0x93b0,0x93bb,0x93bb,0x93c3,0x93c3,0x93c7,0x93c8,0x93ca,0x93cc,0x93d1,0x93d1,0x93d6,0x93d8,0x93dc,0x93df,0x93e1,0x93e2,0x93e4,0x93e4,0x93e6,0x93e6,0x93e8,0x93e8,0x93f6,0x93f6,0x93f8,0x93f9,0x93fb,0x93fb,0x9403,0x9404,0x940f,0x9410,0x9413,0x9414,0x9418,0x9419,0x9425,0x9425,0x942a,0x942b,0x9435,0x9436,0x9438,0x9438,0x943a,0x943a,0x9442,0x9442,0x9444,0x9444,0x944a,0x944a,0x944c,0x944c,0x9451,0x9452,0x9455,0x9455,0x945b,0x945b,0x945e,0x945e,0x9460,0x9460,0x9462,0x9463,0x946a,0x946b,0x9470,0x9472,0x9475,0x9475,0x9477,0x9477,0x947c,0x947f,0x9485,0x9485,0x9577,0x9578,0x957f,0x9580,0x9583,0x9583,0x9588,0x958b,0x958e,0x958f,0x9591,0x9594,0x9598,0x9598,0x959c,0x959c,0x959f,0x95a0,0x95a2,0x95a5,0x95a8,0x95a9,0x95ab,0x95ad,0x95b1,0x95b1,0x95b6,0x95b6,0x95b9,0x95b9,0x95bb,0x95be,0x95c3,0x95c3,0x95c7,0x95c8,0x95ca,0x95cd,0x95d3,0x95d6,0x95da,0x95da,0x95dc,0x95dc,0x95de,0x95de,0x95e0,0x95e2,0x95e5,0x95e5,0x95e8,0x95e8,0x961c,0x961d,0x9621,0x9621,0x9624,0x9624,0x9627,0x962a,0x962d,0x962f,0x9632,0x9632,0x963b,0x963b,0x963f,0x9640,0x9642,0x9642,0x9644,0x9644,0x964b,0x964d,0x9650,0x9650,0x9654,0x9654,0x9656,0x9656,0x9658,0x9658,0x965b,0x965f,0x9661,0x9664,0x966a,0x966a,0x966c,0x966c,0x9670,0x9670,0x9672,0x9679,0x967c,0x967d,0x9684,0x9686,0x968a,0x968b,0x968d,0x968f,0x9691,0x9691,0x9694,0x9695,0x9697,0x9698,0x969b,0x969c,0x96a3,0x96a4,0x96a7,0x96aa,0x96b0,0x96b1,0x96b3,0x96b4,0x96b6,0x96b9,0x96bb,0x96bc,0x96c0,0x96c1,0x96c4,0x96c7,0x96c9,0x96c9,0x96cb,0x96ce,0x96d5,0x96d6,0x96d9,0x96de,0x96e2,0x96e3,0x96e8,0x96ea,0x96ef,0x96f0,0x96f2,0x96f2,0x96f6,0x96f7,0x96f9,0x96fb,0x9700,0x9700,0x9704,0x9709,0x970c,0x970f,0x9711,0x9711,0x9713,0x9714,0x9716,0x9716,0x9719,0x9719,0x971c,0x971c,0x971e,0x971e,0x9723,0x9723,0x9726,0x9727,0x972a,0x972a,0x9730,0x9730,0x9732,0x9732,0x9738,0x9739,0x973d,0x973d,0x9742,0x9742,0x9744,0x9744,0x9746,0x9746,0x9748,0x9749,0x974c,0x974c,0x9751,0x9752,0x9755,0x9756,0x9758,0x975e,0x9760,0x9762,0x9766,0x9766,0x9768,0x9769,0x976d,0x976d,0x9773,0x9775,0x9777,0x9777,0x977a,0x977a,0x977c,0x977c,0x9780,0x9781,0x9784,0x9785,0x978b,0x978b,0x978d,0x978d,0x978f,0x978f,0x9798,0x9798,0x97a0,0x97a0,0x97a3,0x97a3,0x97a6,0x97a6,0x97a8,0x97a8,0x97ab,0x97ad,0x97b1,0x97b1,0x97b4,0x97b4,0x97b8,0x97b9,0x97c1,0x97c1,0x97c3,0x97c3,0x97c6,0x97c6,0x97cb,0x97cd,0x97d0,0x97d0,0x97d3,0x97d3,0x97d9,0x97d9,0x97dc,0x97de,0x97e0,0x97e1,0x97e6,0x97e6,0x97ed,0x97ee,0x97f1,0x97f3,0x97f5,0x97f6,0x97fa,0x97fb,0x97fe,0x9803,0x9805,0x9806,0x9808,0x9808,0x980a,0x980a,0x980c,0x9813,0x9816,0x9818,0x981e,0x981e,0x9821,0x9821,0x9823,0x9824,0x9826,0x9826,0x982b,0x982b,0x982d,0x982e,0x9830,0x9830,0x9832,0x9832,0x9837,0x9839,0x983b,0x983c,0x983f,0x983f,0x9842,0x9842,0x9846,0x9848,0x984b,0x984e,0x9852,0x9855,0x9858,0x985a,0x985c,0x985c,0x985e,0x985e,0x9865,0x9867,0x986b,0x986b,0x986f,0x9871,0x9873,0x9875,0x98a8,0x98a8,0x98ad,0x98ad,0x98af,0x98af,0x98b1,0x98b2,0x98b6,0x98b6,0x98ba,0x98ba,0x98bc,0x98bc,0x98bf,0x98bf,0x98c2,0x98c2,0x98c4,0x98c4,0x98c6,0x98c7,0x98c9,0x98c9,0x98cb,0x98cb,0x98ce,0x98ce,0x98db,0x98dc,0x98de,0x98e2,0x98e6,0x98e7,0x98ea,0x98eb,0x98ed,0x98ef,0x98f1,0x98f1,0x98f4,0x98f4,0x98fb,0x98fe,0x9903,0x9903,0x9909,0x990a,0x990c,0x990c,0x9910,0x9910,0x9912,0x9915,0x9918,0x9918,0x991a,0x991a,0x991e,0x991e,0x9920,0x9920,0x9926,0x9928,0x992a,0x992a,0x992c,0x992c,0x992e,0x992e,0x9930,0x9931,0x9933,0x9933,0x9939,0x9939,0x993c,0x993d,0x9942,0x9942,0x9945,0x9945,0x9948,0x9949,0x994b,0x994d,0x9950,0x9952,0x9954,0x9955,0x9957,0x9957,0x995c,0x995c,0x995e,0x995e,0x9963,0x9963,0x9996,0x9999,0x999c,0x999d,0x999f,0x999f,0x99a1,0x99a1,0x99a3,0x99a3,0x99a5,0x99a5,0x99a7,0x99a8,0x99aa,0x99aa,0x99ac,0x99ae,0x99b0,0x99b1,0x99b3,0x99b4,0x99b6,0x99b6,0x99b9,0x99b9,0x99c1,0x99c1,0x99c4,0x99c5,0x99c8,0x99c9,0x99cf,0x99d2,0x99d5,0x99d5,0x99d8,0x99d9,0x99db,0x99df,0x99e2,0x99e2,0x99e8,0x99e8,0x99ea,0x99ea,0x99ed,0x99ee,0x99f1,0x99f1,0x99f8,0x99f8,0x99fa,0x99fb,0x99fd,0x99fd,0x99ff,0x99ff,0x9a01,0x9a05,0x9a08,0x9a08,0x9a0b,0x9a0b,0x9a0d,0x9a0f,0x9a11,0x9a11,0x9a16,0x9a16,0x9a18,0x9a19,0x9a1b,0x9a1b,0x9a2b,0x9a2b,0x9a2d,0x9a2d,0x9a30,0x9a30,0x9a35,0x9a38,0x9a3e,0x9a3e,0x9a40,0x9a45,0x9a4a,0x9a4a,0x9a4c,0x9a4f,0x9a52,0x9a52,0x9a55,0x9a55,0x9a57,0x9a58,0x9a5a,0x9a5b,0x9a5f,0x9a5f,0x9a62,0x9a62,0x9a64,0x9a65,0x9a69,0x9a6a,0x9a6c,0x9a6c,0x9aa8,0x9aa8,0x9aaa,0x9aaa,0x9ab0,0x9ab0,0x9ab8,0x9ab9,0x9abc,0x9abc,0x9abf,0x9ac0,0x9ac6,0x9ac6,0x9acf,0x9acf,0x9ad1,0x9ad1,0x9ad3,0x9ad4,0x9ad6,0x9ad8,0x9adf,0x9adf,0x9ae1,0x9ae1,0x9ae3,0x9ae3,0x9ae5,0x9ae6,0x9aeb,0x9aeb,0x9aed,0x9aee,0x9af0,0x9af0,0x9af2,0x9af2,0x9af4,0x9af4,0x9af9,0x9afb,0x9afd,0x9afd,0x9b02,0x9b02,0x9b05,0x9b06,0x9b0a,0x9b0b,0x9b0d,0x9b0d,0x9b10,0x9b10,0x9b12,0x9b12,0x9b16,0x9b16,0x9b18,0x9b1a,0x9b1f,0x9b1f,0x9b22,0x9b23,0x9b25,0x9b25,0x9b27,0x9b2a,0x9b2e,0x9b2f,0x9b31,0x9b32,0x9b3a,0x9b3a,0x9b3c,0x9b3c,0x9b41,0x9b45,0x9b48,0x9b48,0x9b4b,0x9b4b,0x9b4d,0x9b4f,0x9b51,0x9b51,0x9b54,0x9b54,0x9b58,0x9b58,0x9b5a,0x9b5a,0x9b66,0x9b66,0x9b6f,0x9b6f,0x9b74,0x9b74,0x9b80,0x9b80,0x9b83,0x9b83,0x9b8e,0x9b8e,0x9b90,0x9b93,0x9b97,0x9b97,0x9b9f,0x9b9f,0x9ba7,0x9ba8,0x9baa,0x9bab,0x9bad,0x9bae,0x9bb9,0x9bb9,0x9bc1,0x9bc1,0x9bc6,0x9bc6,0x9bc9,0x9bca,0x9bd4,0x9bd4,0x9bd6,0x9bd6,0x9bdb,0x9bdb,0x9be2,0x9be2,0x9be4,0x9be4,0x9be8,0x9be8,0x9bf7,0x9bf7,0x9c08,0x9c08,0x9c0a,0x9c0a,0x9c0c,0x9c0d,0x9c10,0x9c10,0x9c12,0x9c13,0x9c15,0x9c15,0x9c24,0x9c25,0x9c2d,0x9c2f,0x9c31,0x9c32,0x9c35,0x9c35,0x9c39,0x9c3b,0x9c3e,0x9c3e,0x9c47,0x9c47,0x9c49,0x9c49,0x9c4f,0x9c4f,0x9c52,0x9c53,0x9c57,0x9c57,0x9c60,0x9c60,0x9c63,0x9c63,0x9c67,0x9c67,0x9c78,0x9c78,0x9c7b,0x9c7c,0x9ce5,0x9ce7,0x9ce9,0x9ce9,0x9cf3,0x9cf4,0x9cf6,0x9cf6,0x9d03,0x9d03,0x9d06,0x9d09,0x9d0c,0x9d0c,0x9d12,0x9d12,0x9d15,0x9d15,0x9d18,0x9d19,0x9d1b,0x9d1b,0x9d1e,0x9d1f,0x9d23,0x9d23,0x9d25,0x9d26,0x9d28,0x9d28,0x9d2f,0x9d30,0x9d36,0x9d36,0x9d3b,0x9d3b,0x9d41,0x9d42,0x9d44,0x9d44,0x9d51,0x9d51,0x9d53,0x9d54,0x9d5d,0x9d5e,0x9d60,0x9d61,0x9d66,0x9d66,0x9d69,0x9d69,0x9d6c,0x9d6c,0x9d6f,0x9d70,0x9d72,0x9d72,0x9d77,0x9d77,0x9d7b,0x9d7b,0x9d7e,0x9d7e,0x9d84,0x9d84,0x9d89,0x9d8a,0x9d96,0x9d96,0x9d9a,0x9d9a,0x9da1,0x9da1,0x9da4,0x9da4,0x9da9,0x9da9,0x9dac,0x9dac,0x9daf,0x9daf,0x9db4,0x9db5,0x9db8,0x9db9,0x9dbb,0x9dbb,0x9dbf,0x9dbf,0x9dc1,0x9dc2,0x9dc4,0x9dc4,0x9dc7,0x9dc7,0x9dd3,0x9dd3,0x9dd6,0x9dd7,0x9dd9,0x9dd9,0x9de6,0x9de6,0x9de9,0x9deb,0x9df0,0x9df3,0x9df8,0x9dfa,0x9dfd,0x9dfd,0x9dff,0x9dff,0x9e07,0x9e07,0x9e0f,0x9e0f,0x9e15,0x9e15,0x9e1a,0x9e1f,0x9e75,0x9e75,0x9e77,0x9e77,0x9e79,0x9e7b,0x9e7d,0x9e7d,0x9e7f,0x9e80,0x9e82,0x9e82,0x9e84,0x9e84,0x9e8b,0x9e8c,0x9e8f,0x9e8f,0x9e91,0x9e93,0x9e97,0x9e98,0x9e9d,0x9e9f,0x9ea4,0x9ea6,0x9ea9,0x9eaa,0x9eaf,0x9eaf,0x9eb4,0x9eb5,0x9ebb,0x9ebb,0x9ebd,0x9ebf,0x9ec3,0x9ec5,0x9ecc,0x9ed1,0x9ed4,0x9ed4,0x9ed6,0x9ed6,0x9ed8,0x9ed8,0x9eda,0x9ede,0x9ee0,0x9ee0,0x9ee5,0x9ee5,0x9ee8,0x9ee8,0x9eee,0x9eef,0x9ef2,0x9ef2,0x9ef4,0x9ef7,0x9ef9,0x9f00,0x9f02,0x9f02,0x9f04,0x9f04,0x9f07,0x9f0a,0x9f0e,0x9f0e,0x9f10,0x9f10,0x9f13,0x9f14,0x9f17,0x9f17,0x9f19,0x9f19,0x9f20,0x9f20,0x9f22,0x9f22,0x9f2b,0x9f2c,0x9f2f,0x9f2f,0x9f34,0x9f34,0x9f38,0x9f39,0x9f3b,0x9f3b,0x9f3e,0x9f3e,0x9f4a,0x9f4b,0x9f4e,0x9f4e,0x9f50,0x9f50,0x9f52,0x9f52,0x9f54,0x9f55,0x9f57,0x9f57,0x9f5f,0x9f61,0x9f66,0x9f67,0x9f69,0x9f6c,0x9f72,0x9f72,0x9f76,0x9f77,0x9f7f,0x9f7f,0x9f8d,0x9f8e,0x9f90,0x9f92,0x9f94,0x9f95,0x9f99,0x9f99,0x9f9c,0x9f9d,0x9f9f,0x9fa0,0x9fa2,0x9fa2,0x9fa5,0x9fa5,0xa960,0xa97c,0xac00,0xd7a3,0xd7b0,0xd7c6,0xd7cb,0xd7fb,0xf900,0xf95e,0xf960,0xf9a9,0xf9ab,0xfa0b,0xfa12,0xfa12,0xfa15,0xfa17,0xfa19,0xfa1e,0xfa22,0xfa22,0xfa26,0xfa26,0xfa2a,0xfa2c,0xfa2e,0xfa31,0xfa33,0xfa3d,0xfa3f,0xfa3f,0xfa41,0xfa41,0xfa43,0xfa55,0xfa57,0xfa57,0xfa59,0xfa68,0xfa6a,0xfa6a,0xfb00,0xfb04,0xfe10,0xfe19,0xfe30,0xfe52,0xfe54,0xfe66,0xfe68,0xfe6b,0xff01,0xffbe,0xffc2,0xffc7,0xffca,0xffcf,0xffd2,0xffd7,0xffda,0xffdc,0xffe0,0xffe6,0xffe8,0xffee,0x1f100,0x1f10c,0x1f110,0x1f16c,0x1f170,0x1f1ac,0x1f200,0x1f202,0x1f210,0x1f23b,0x1f240,0x1f248,0x1f250,0x1f251,0x200d7,0x200d7,0x2012c,0x2012c,0x205ca,0x205ca,0x20628,0x20628,0x20984,0x20984,0x21155,0x21155,0x2128d,0x2128d,0x21594,0x21594,0x21727,0x21727,0x21f5c,0x21f5c,0x224b0,0x224b0,0x224ed,0x224ed,0x2294f,0x2294f,0x22c6f,0x22c6f,0x22ee0,0x22ee0,0x230fd,0x230fd,0x23343,0x23343,0x2363b,0x2363b,0x23ad9,0x23ad9,0x242f1,0x242f1,0x2439d,0x2439d,0x248e9,0x248e9,0x248f0,0x248f0,0x24a01,0x24a01,0x24a12,0x24a12,0x25055,0x25055,0x2533e,0x2533e,0x253b5,0x253b5,0x253fe,0x253fe,0x25832,0x25832,0x2583a,0x2583a,0x25874,0x25874,0x25978,0x25978,0x25ad7,0x25ad7,0x25b97,0x25b97,0x25e44,0x25e44,0x26057,0x26057,0x265a4,0x265a4,0x267d8,0x267d8,0x26951,0x26951,0x27144,0x27144,0x275ff,0x275ff,0x27625,0x27625,0x278b2,0x278b2,0x27a51,0x27a51,0x27b02,0x27b02,0x27cef,0x27cef,0x27e7d,0x27e7d,0x27f1b,0x27f1b,0x27fb7,0x27fb7,0x283f6,0x283f6,0x284dc,0x284dc,0x28d8a,0x28d8a,0x28da1,0x28da1,0x28e0f,0x28e0f,0x291d5,0x291d5,0x291e3,0x291e3,0x294de,0x294de,0x29509,0x29509,0x2967f,0x2967f,0x29810,0x29810,0x2983b,0x2983b,0x2a2ad,0x2a2ad,0x2a4d0,0x2a4d0,0x2a664,0x2a664,0x2c115,0x2c115,0x2c7d3,0x2c7d3,0x2d544,0x2d544,0x2e569,0x2e569,0x2f815,0x2f815,0x2f818,0x2f818,0x2f81a,0x2f81a,0x2f82c,0x2f82c,0x2f833,0x2f833,0x2f852,0x2f852,0x2f862,0x2f862,0x2f877,0x2f877,0x2f884,0x2f884,0x2f8b2,0x2f8b2,0x2f8ed,0x2f8ed,0x2f8fc,0x2f8fc,0x2f920,0x2f920,0x2f96c,0x2f96c,0x2f9d0,0x2f9d0,0x2f9df,0x2f9df,0x30729,0x30729,0x30ede,0x30ede,]),
-  NotoFont.fromFlatRanges('Noto Sans Kaithi', 'https://fonts.gstatic.com/s/notosanskaithi/v15/buEtppS9f8_vkXadMBJJu0tWjLwjQi0KdoZIKlo.ttf', <int>[0x20,0x20,0x2d,0x2d,0xa0,0xa0,0x966,0x96f,0x200b,0x200d,0x2010,0x2010,0x25cc,0x25cc,0xa830,0xa839,0x11080,0x110c1,0x110cd,0x110cd,]),
-  NotoFont.fromFlatRanges('Noto Sans Kannada', 'https://fonts.gstatic.com/s/notosanskannada/v21/8vIs7xs32H97qzQKnzfeXycxXZyUmySvZWItmf1fe6TVmgop9ndpS-BqHEyGrDvNzSIMLsPKrkY.ttf', <int>[0x20,0x7e,0xa0,0xa3,0xa5,0xa5,0xa7,0xab,0xad,0xb0,0xb4,0xb4,0xb6,0xb8,0xba,0xbb,0xbf,0x107,0x10a,0x113,0x116,0x11b,0x11e,0x123,0x126,0x127,0x12a,0x12b,0x12e,0x133,0x136,0x137,0x139,0x13e,0x141,0x148,0x14a,0x14d,0x150,0x15b,0x15e,0x161,0x164,0x165,0x16a,0x17e,0x1cd,0x1ce,0x218,0x21b,0x237,0x237,0x2c6,0x2c7,0x2c9,0x2c9,0x2d8,0x2dd,0x300,0x304,0x306,0x308,0x30a,0x30c,0x312,0x312,0x326,0x328,0x951,0x952,0x964,0x965,0xc80,0xc8c,0xc8e,0xc90,0xc92,0xca8,0xcaa,0xcb3,0xcb5,0xcb9,0xcbc,0xcc4,0xcc6,0xcc8,0xcca,0xccd,0xcd5,0xcd6,0xcde,0xcde,0xce0,0xce3,0xce6,0xcef,0xcf1,0xcf2,0x1cd0,0x1cd0,0x1cd2,0x1cd2,0x1cda,0x1cda,0x1cf2,0x1cf2,0x1cf4,0x1cf5,0x1e80,0x1e85,0x1e9e,0x1e9e,0x1ef2,0x1ef3,0x200b,0x200d,0x2010,0x2010,0x2013,0x2014,0x2018,0x201a,0x201c,0x201e,0x2022,0x2022,0x2026,0x2026,0x2039,0x203a,0x20ac,0x20ac,0x20b9,0x20b9,0x2122,0x2122,0x2212,0x2212,0x25cc,0x25cc,0xa830,0xa835,]),
-  NotoFont.fromFlatRanges('Noto Sans Kayah Li', 'https://fonts.gstatic.com/s/notosanskayahli/v18/B50nF61OpWTRcGrhOVJJwOMXdca6Yecki3E06x2jVTX3WCc3CZH4EXLuKVM.ttf', <int>[0x20,0x20,0x2d,0x2d,0xa0,0xa0,0x200c,0x200d,0x2010,0x2010,0x25cc,0x25cc,0xa900,0xa92f,]),
-  NotoFont.fromFlatRanges('Noto Sans Kharoshthi', 'https://fonts.gstatic.com/s/notosanskharoshthi/v15/Fh4qPiLjKS30-P4-pGMMXCCfvkc5Vd7KE5z4rFyx5mR1.ttf', <int>[0x20,0x20,0x2d,0x2d,0xa0,0xa0,0x200b,0x200d,0x2010,0x2010,0x25cc,0x25cc,0x10a00,0x10a03,0x10a05,0x10a06,0x10a0c,0x10a13,0x10a15,0x10a17,0x10a19,0x10a35,0x10a38,0x10a3a,0x10a3f,0x10a48,0x10a50,0x10a58,]),
-  NotoFont.fromFlatRanges('Noto Sans Khmer', 'https://fonts.gstatic.com/s/notosanskhmer/v18/ijw3s5roRME5LLRxjsRb-gssOenAyendxrgV2c-Zw-9vbVUti_Z_dWgtWYuNAJz4kAbrddiA.ttf', <int>[0x20,0x7e,0xa0,0xa3,0xa5,0xa5,0xa7,0xab,0xad,0xb0,0xb4,0xb4,0xb6,0xb8,0xba,0xbb,0xbf,0x107,0x10a,0x113,0x116,0x11b,0x11e,0x123,0x126,0x127,0x12a,0x12b,0x12e,0x133,0x136,0x137,0x139,0x13e,0x141,0x148,0x14a,0x14d,0x150,0x15b,0x15e,0x161,0x164,0x165,0x16a,0x17e,0x1cd,0x1ce,0x218,0x21b,0x237,0x237,0x2c6,0x2c7,0x2c9,0x2c9,0x2d8,0x2dd,0x300,0x304,0x306,0x308,0x30a,0x30c,0x312,0x312,0x326,0x328,0x1780,0x17dd,0x17e0,0x17e9,0x17f0,0x17f9,0x19e0,0x19ff,0x1e80,0x1e85,0x1e9e,0x1e9e,0x1ef2,0x1ef3,0x200b,0x200d,0x2010,0x2010,0x2013,0x2014,0x2018,0x201a,0x201c,0x201e,0x2022,0x2022,0x2026,0x2026,0x2039,0x203a,0x20ac,0x20ac,0x2122,0x2122,0x2212,0x2212,0x25cc,0x25cc,]),
-  NotoFont.fromFlatRanges('Noto Sans Khojki', 'https://fonts.gstatic.com/s/notosanskhojki/v15/-nFnOHM29Oofr2wohFbTuPPKVWpmK_d709jy92k.ttf', <int>[0x20,0x20,0xa0,0xa0,0xae6,0xaef,0x200c,0x200d,0x25cc,0x25cc,0xa830,0xa839,0x11200,0x11211,0x11213,0x1123e,]),
-  NotoFont.fromFlatRanges('Noto Sans Khudawadi', 'https://fonts.gstatic.com/s/notosanskhudawadi/v15/fdNi9t6ZsWBZ2k5ltHN73zZ5hc8HANlHIjRnVVXz9MY.ttf', <int>[0x20,0x20,0xa0,0xa0,0x964,0x965,0x200c,0x200d,0x2013,0x2014,0x25cc,0x25cc,0xa830,0xa839,0x112b0,0x112ea,0x112f0,0x112f9,]),
-  NotoFont.fromFlatRanges('Noto Sans Lao', 'https://fonts.gstatic.com/s/notosanslao/v24/bx6lNx2Ol_ixgdYWLm9BwxM3NW6BOkuf763Clj73CiQ_J1Djx9pidOt4ccbdf5MK3riB2w.ttf', <int>[0x20,0x7e,0xa0,0xa3,0xa5,0xa5,0xa7,0xab,0xae,0xb0,0xb4,0xb4,0xb6,0xb8,0xba,0xbb,0xbf,0x107,0x10a,0x113,0x116,0x11b,0x11e,0x123,0x126,0x127,0x12a,0x12b,0x12e,0x133,0x136,0x137,0x139,0x13e,0x141,0x148,0x14a,0x14d,0x150,0x15b,0x15e,0x161,0x164,0x165,0x16a,0x17e,0x1cd,0x1ce,0x218,0x21b,0x237,0x237,0x2c6,0x2c7,0x2c9,0x2c9,0x2d8,0x2dd,0x300,0x304,0x306,0x308,0x30a,0x30c,0x312,0x312,0x326,0x328,0xe81,0xe82,0xe84,0xe84,0xe87,0xe88,0xe8a,0xe8a,0xe8d,0xe8d,0xe94,0xe97,0xe99,0xe9f,0xea1,0xea3,0xea5,0xea5,0xea7,0xea7,0xeaa,0xeab,0xead,0xeb9,0xebb,0xebd,0xec0,0xec4,0xec6,0xec6,0xec8,0xecd,0xed0,0xed9,0xedc,0xedf,0x1e80,0x1e85,0x1e9e,0x1e9e,0x1ef2,0x1ef3,0x200b,0x200d,0x2013,0x2014,0x2018,0x201a,0x201c,0x201e,0x2022,0x2022,0x2026,0x2026,0x2039,0x203a,0x20ac,0x20ad,0x2122,0x2122,0x2212,0x2212,0x25cc,0x25cc,]),
-  NotoFont.fromFlatRanges('Noto Sans Lepcha', 'https://fonts.gstatic.com/s/notosanslepcha/v15/0QI7MWlB_JWgA166SKhu05TekNS32AJstqBXgd4.ttf', <int>[0x20,0x20,0xa0,0xa0,0x1c00,0x1c37,0x1c3b,0x1c49,0x1c4d,0x1c4f,0x200b,0x200d,0x25cc,0x25cc,]),
-  NotoFont.fromFlatRanges('Noto Sans Limbu', 'https://fonts.gstatic.com/s/notosanslimbu/v15/3JnlSDv90Gmq2mrzckOBBRRoNJVj0MF3OHRDnA.ttf', <int>[0x20,0x20,0xa0,0xa0,0x965,0x965,0x1900,0x191e,0x1920,0x192b,0x1930,0x193b,0x1940,0x1940,0x1944,0x194f,0x200b,0x200d,0x25cc,0x25cc,]),
-  NotoFont.fromFlatRanges('Noto Sans Linear A', 'https://fonts.gstatic.com/s/notosanslineara/v16/oPWS_l16kP4jCuhpgEGmwJOiA18FZj22zmHQAGQicw.ttf', <int>[0x20,0x20,0xa0,0xa0,0x10600,0x10736,0x10740,0x10755,0x10760,0x10767,]),
-  NotoFont.fromFlatRanges('Noto Sans Linear B', 'https://fonts.gstatic.com/s/notosanslinearb/v15/HhyJU4wt9vSgfHoORYOiXOckKNB737IV3BkFTq4EPw.ttf', <int>[0x20,0x20,0xa0,0xa0,0x10000,0x1000b,0x1000d,0x10026,0x10028,0x1003a,0x1003c,0x1003d,0x1003f,0x1004d,0x10050,0x1005d,0x10080,0x100fa,0x10100,0x10102,0x10107,0x10133,0x10137,0x1013f,]),
-  NotoFont.fromFlatRanges('Noto Sans Lisu', 'https://fonts.gstatic.com/s/notosanslisu/v21/uk-3EGO3o6EruUbnwovcYhz6kh57_nqbcTdjJnHP2Vwt29IlxkVdig.ttf', <int>[0x20,0x7e,0xa0,0xa3,0xa5,0xa5,0xa7,0xab,0xae,0xb0,0xb4,0xb4,0xb6,0xb8,0xba,0xbb,0xbf,0x107,0x10a,0x113,0x116,0x11b,0x11e,0x123,0x126,0x127,0x12a,0x12b,0x12e,0x133,0x136,0x137,0x139,0x13e,0x141,0x148,0x14a,0x14d,0x150,0x15b,0x15e,0x161,0x164,0x165,0x16a,0x17e,0x1cd,0x1ce,0x218,0x21b,0x237,0x237,0x2bc,0x2bc,0x2c6,0x2c7,0x2c9,0x2c9,0x2cd,0x2cd,0x2d8,0x2dd,0x300,0x304,0x306,0x308,0x30a,0x30c,0x312,0x312,0x326,0x328,0x1e80,0x1e85,0x1e9e,0x1e9e,0x1ef2,0x1ef3,0x2010,0x2010,0x2013,0x2014,0x2018,0x201a,0x201c,0x201e,0x2022,0x2022,0x2026,0x2026,0x2039,0x203a,0x20ac,0x20ac,0x2122,0x2122,0x2212,0x2212,0x25cc,0x25cc,0x300a,0x300b,0xa4d0,0xa4ff,0x11fb0,0x11fb0,]),
-  NotoFont.fromFlatRanges('Noto Sans Lycian', 'https://fonts.gstatic.com/s/notosanslycian/v15/QldVNSNMqAsHtsJ7UmqxBQA9r8wA5_naCJwn00E.ttf', <int>[0x20,0x20,0xa0,0xa0,0x10280,0x1029c,]),
-  NotoFont.fromFlatRanges('Noto Sans Lydian', 'https://fonts.gstatic.com/s/notosanslydian/v15/c4m71mVzGN7s8FmIukZJ1v4ZlcPReUPXMoIjEQI.ttf', <int>[0x20,0x20,0xa0,0xa0,0x10920,0x10939,0x1093f,0x1093f,]),
-  NotoFont.fromFlatRanges('Noto Sans Mahajani', 'https://fonts.gstatic.com/s/notosansmahajani/v15/-F6sfiVqLzI2JPCgQBnw60Agp0JrvD5Fh8ARHNh4zg.ttf', <int>[0x20,0x20,0xa0,0xa0,0x964,0x96f,0x200c,0x200d,0x25cc,0x25cc,0xa830,0xa839,0x11150,0x11176,]),
-  NotoFont.fromFlatRanges('Noto Sans Malayalam', 'https://fonts.gstatic.com/s/notosansmalayalam/v21/sJoi3K5XjsSdcnzn071rL37lpAOsUThnDZIfPdbeSNzVakglNM-Qw8EaeB8Nss-_RuD9BFzEr6HxEA.ttf', <int>[0x20,0x7e,0xa0,0xa3,0xa5,0xa5,0xa7,0xab,0xad,0xb0,0xb4,0xb4,0xb6,0xb8,0xba,0xbb,0xbf,0x107,0x10a,0x113,0x116,0x11b,0x11e,0x123,0x126,0x127,0x12a,0x12b,0x12e,0x133,0x136,0x137,0x139,0x13e,0x141,0x148,0x14a,0x14d,0x150,0x15b,0x15e,0x161,0x164,0x165,0x16a,0x17e,0x1cd,0x1ce,0x218,0x21b,0x237,0x237,0x2c6,0x2c7,0x2c9,0x2c9,0x2d8,0x2dd,0x300,0x304,0x306,0x308,0x30a,0x30c,0x312,0x312,0x323,0x323,0x326,0x328,0x951,0x952,0x964,0x965,0xd00,0xd0c,0xd0e,0xd10,0xd12,0xd44,0xd46,0xd48,0xd4a,0xd4f,0xd54,0xd63,0xd66,0xd7f,0x1cda,0x1cda,0x1e80,0x1e85,0x1e9e,0x1e9e,0x1ef2,0x1ef3,0x200b,0x200d,0x2010,0x2010,0x2013,0x2014,0x2018,0x201a,0x201c,0x201e,0x2022,0x2022,0x2026,0x2026,0x2039,0x203a,0x20ac,0x20ac,0x20b9,0x20b9,0x2122,0x2122,0x2212,0x2212,0x25cc,0x25cc,0xa830,0xa832,]),
-  NotoFont.fromFlatRanges('Noto Sans Mandaic', 'https://fonts.gstatic.com/s/notosansmandaic/v15/cIfnMbdWt1w_HgCcilqhKQBo_OsMI5_A_gMk0izH.ttf', <int>[0x20,0x20,0xa0,0xa0,0x640,0x640,0x840,0x85b,0x85e,0x85e,0x200c,0x200d,0x25cc,0x25cc,]),
-  NotoFont.fromFlatRanges('Noto Sans Manichaean', 'https://fonts.gstatic.com/s/notosansmanichaean/v15/taiVGntiC4--qtsfi4Jp9-_GkPZZCcrfekqCNTtFCtdX.ttf', <int>[0x20,0x20,0xa0,0xa0,0x640,0x640,0x200c,0x200d,0x25cc,0x25cc,0xfe00,0xfe00,0x10ac0,0x10ae6,0x10aeb,0x10af6,]),
-  NotoFont.fromFlatRanges('Noto Sans Marchen', 'https://fonts.gstatic.com/s/notosansmarchen/v15/aFTO7OZ_Y282EP-WyG6QTOX_C8WZMHhPk652ZaHk.ttf', <int>[0x20,0x20,0xa0,0xa0,0x25cc,0x25cc,0x11c70,0x11c8f,0x11c92,0x11ca7,0x11ca9,0x11cb6,]),
-  NotoFont.fromFlatRanges('Noto Sans Masaram Gondi', 'https://fonts.gstatic.com/s/notosansmasaramgondi/v15/6xK_dThFKcWIu4bpRBjRYRV7KZCbUq6n_1kPnuGe7RI9WSWX.ttf', <int>[0x20,0x22,0x25,0x25,0x27,0x2f,0x3a,0x3f,0xa0,0xa0,0xd7,0xd7,0xf7,0xf7,0x964,0x965,0x2018,0x2019,0x201c,0x201d,0x2026,0x2026,0x2212,0x2212,0x25cc,0x25cc,0x11d00,0x11d06,0x11d08,0x11d09,0x11d0b,0x11d36,0x11d3a,0x11d3a,0x11d3c,0x11d3d,0x11d3f,0x11d47,0x11d50,0x11d59,]),
-  NotoFont.fromFlatRanges('Noto Sans Math', 'https://fonts.gstatic.com/s/notosansmath/v15/7Aump_cpkSecTWaHRlH2hyV5UHkG-V048PW0.ttf', <int>[0x20,0x7e,0xa0,0xa0,0xa7,0xa7,0xac,0xac,0xb1,0xb1,0xd7,0xd7,0xf7,0xf7,0x302,0x303,0x305,0x305,0x307,0x308,0x330,0x330,0x391,0x3a1,0x3a3,0x3a9,0x3b1,0x3c9,0x3d1,0x3d1,0x3d5,0x3d6,0x3f0,0x3f1,0x3f4,0x3f5,0x2032,0x2037,0x2057,0x2057,0x20d0,0x20dc,0x20e1,0x20e1,0x20e5,0x20ef,0x2102,0x2102,0x210a,0x210e,0x2110,0x2112,0x2115,0x2115,0x2119,0x211d,0x2124,0x2124,0x2128,0x2128,0x212c,0x212d,0x212f,0x2131,0x2133,0x2138,0x213c,0x2140,0x2145,0x2149,0x2190,0x21ae,0x21b0,0x21e5,0x21f1,0x21f2,0x21f4,0x22ff,0x2308,0x230b,0x2310,0x2310,0x2319,0x2319,0x231c,0x2321,0x2336,0x237a,0x237c,0x237c,0x2395,0x2395,0x239b,0x23b6,0x23d0,0x23d0,0x23dc,0x23e1,0x2474,0x2475,0x25af,0x25af,0x25b3,0x25b3,0x25b7,0x25b7,0x25bd,0x25bd,0x25c1,0x25c1,0x25ca,0x25ca,0x25cc,0x25cc,0x25fb,0x25fb,0x266d,0x266f,0x27c0,0x27ff,0x2900,0x2aff,0x2b0e,0x2b11,0x2b30,0x2b4c,0x2bfe,0x2bfe,0xff5b,0xff5b,0xff5d,0xff5d,0x1d400,0x1d454,0x1d456,0x1d49c,0x1d49e,0x1d49f,0x1d4a2,0x1d4a2,0x1d4a5,0x1d4a6,0x1d4a9,0x1d4ac,0x1d4ae,0x1d4b9,0x1d4bb,0x1d4bb,0x1d4bd,0x1d4c3,0x1d4c5,0x1d505,0x1d507,0x1d50a,0x1d50d,0x1d514,0x1d516,0x1d51c,0x1d51e,0x1d539,0x1d53b,0x1d53e,0x1d540,0x1d544,0x1d546,0x1d546,0x1d54a,0x1d550,0x1d552,0x1d6a5,0x1d6a8,0x1d7cb,0x1d7ce,0x1d7ff,0x1ee00,0x1ee03,0x1ee05,0x1ee1f,0x1ee21,0x1ee22,0x1ee24,0x1ee24,0x1ee27,0x1ee27,0x1ee29,0x1ee32,0x1ee34,0x1ee37,0x1ee39,0x1ee39,0x1ee3b,0x1ee3b,0x1ee42,0x1ee42,0x1ee47,0x1ee47,0x1ee49,0x1ee49,0x1ee4b,0x1ee4b,0x1ee4d,0x1ee4f,0x1ee51,0x1ee52,0x1ee54,0x1ee54,0x1ee57,0x1ee57,0x1ee59,0x1ee59,0x1ee5b,0x1ee5b,0x1ee5d,0x1ee5d,0x1ee5f,0x1ee5f,0x1ee61,0x1ee62,0x1ee64,0x1ee64,0x1ee67,0x1ee6a,0x1ee6c,0x1ee72,0x1ee74,0x1ee77,0x1ee79,0x1ee7c,0x1ee7e,0x1ee7e,0x1ee80,0x1ee89,0x1ee8b,0x1ee9b,0x1eea1,0x1eea3,0x1eea5,0x1eea9,0x1eeab,0x1eebb,0x1eef0,0x1eef1,]),
-  NotoFont.fromFlatRanges('Noto Sans Mayan Numerals', 'https://fonts.gstatic.com/s/notosansmayannumerals/v15/PlIuFk25O6RzLfvNNVSivR09_KqYMwvvDKYjfIiE68oo6eepYQ.ttf', <int>[0x20,0x20,0xa0,0xa0,0x1d2e0,0x1d2f3,]),
-  NotoFont.fromFlatRanges('Noto Sans Medefaidrin', 'https://fonts.gstatic.com/s/notosansmedefaidrin/v19/WwkzxOq6Dk-wranENynkfeVsNbRZtbOIdLb1exeM4ZeuabBfmErWlT318e5A3rw.ttf', <int>[0x20,0x20,0xa0,0xa0,0x16e40,0x16e9a,]),
-  NotoFont.fromFlatRanges('Noto Sans Meetei Mayek', 'https://fonts.gstatic.com/s/notosansmeeteimayek/v10/HTxAL3QyKieByqY9eZPFweO0be7M21uSphSdhqILnmrRfJ8t_1TJ_vTW5PgeFYVa.ttf', <int>[0x20,0x20,0xa0,0xa0,0x200b,0x200d,0x25cc,0x25cc,0xaae0,0xaaf6,0xabc0,0xabed,0xabf0,0xabf9,]),
-  NotoFont.fromFlatRanges('Noto Sans Meroitic', 'https://fonts.gstatic.com/s/notosansmeroitic/v16/IFS5HfRJndhE3P4b5jnZ3ITPvC6i00UDgDhTiKY9KQ.ttf', <int>[0x20,0x20,0x3a,0x3a,0xa0,0xa0,0x2026,0x2026,0x205d,0x205d,0x10980,0x109b7,0x109bc,0x109cf,0x109d2,0x109ff,]),
-  NotoFont.fromFlatRanges('Noto Sans Miao', 'https://fonts.gstatic.com/s/notosansmiao/v15/Dxxz8jmXMW75w3OmoDXVV4zyZUjgUYVslLhx.ttf', <int>[0x20,0x20,0xa0,0xa0,0x25cc,0x25cc,0x16f00,0x16f4a,0x16f4f,0x16f87,0x16f8f,0x16f9f,]),
-  NotoFont.fromFlatRanges('Noto Sans Modi', 'https://fonts.gstatic.com/s/notosansmodi/v15/pe03MIySN5pO62Z5YkFyT7jeav5qWVAgVol-.ttf', <int>[0x20,0x20,0xa0,0xa0,0x200c,0x200d,0x25cc,0x25cc,0xa830,0xa839,0x11600,0x11644,0x11650,0x11659,]),
-  NotoFont.fromFlatRanges('Noto Sans Mongolian', 'https://fonts.gstatic.com/s/notosansmongolian/v15/VdGCAYADGIwE0EopZx8xQfHlgEAMsrToxLsg6-av1x0.ttf', <int>[0x20,0x22,0x28,0x29,0x2d,0x2d,0x3f,0x3f,0xa0,0xa0,0x1800,0x180e,0x1810,0x1819,0x1820,0x1878,0x1880,0x18aa,0x200c,0x200d,0x2013,0x2014,0x201c,0x201d,0x202f,0x202f,0x2048,0x2049,0x2460,0x2473,0x25cc,0x25cc,0x3001,0x3002,0x300a,0x300f,0xfe3d,0xfe3e,0xfe41,0xfe44,0x11660,0x1166c,]),
-  NotoFont.fromFlatRanges('Noto Sans Mro', 'https://fonts.gstatic.com/s/notosansmro/v15/qWcsB6--pZv9TqnUQMhe9b39WDzRtjkho4M.ttf', <int>[0x20,0x20,0xa0,0xa0,0x16a40,0x16a5e,0x16a60,0x16a69,0x16a6e,0x16a6f,]),
-  NotoFont.fromFlatRanges('Noto Sans Multani', 'https://fonts.gstatic.com/s/notosansmultani/v15/9Bty3ClF38_RfOpe1gCaZ8p30BOFO1A0pfCs5Kos.ttf', <int>[0x20,0x20,0xa0,0xa0,0xa66,0xa6f,0x11280,0x11286,0x11288,0x11288,0x1128a,0x1128d,0x1128f,0x1129d,0x1129f,0x112a9,]),
-  NotoFont.fromFlatRanges('Noto Sans Myanmar', 'https://fonts.gstatic.com/s/notosansmyanmar/v19/AlZq_y1ZtY3ymOryg38hOCSdOnFq0En23OU4o1AC.ttf', <int>[0x20,0x20,0x3f,0x3f,0xa0,0xa0,0x1000,0x109f,0x200b,0x200d,0x2018,0x2019,0x201c,0x201d,0x2026,0x2026,0x25cc,0x25cc,0xa92e,0xa92e,0xa9e0,0xa9fe,0xaa60,0xaa7f,0xfe00,0xfe00,]),
-  NotoFont.fromFlatRanges('Noto Sans N Ko', 'https://fonts.gstatic.com/s/notosansnko/v17/6NUP8FqDKBaKKjnr6P8v-sxPpvVBVNmme3gf.ttf', <int>[0x20,0x20,0xa0,0xa0,0x60c,0x60c,0x61b,0x61b,0x61f,0x61f,0x66a,0x66a,0x7c0,0x7fa,0x7fd,0x7ff,0x200c,0x200f,0x25cc,0x25cc,0x2e1c,0x2e1d,0xfd3e,0xfd3f,]),
-  NotoFont.fromFlatRanges('Noto Sans Nabataean', 'https://fonts.gstatic.com/s/notosansnabataean/v15/IFS4HfVJndhE3P4b5jnZ34DfsjO330dNoBJ9hK8kMK4.ttf', <int>[0x20,0x20,0xa0,0xa0,0x10880,0x1089e,0x108a7,0x108af,]),
-  NotoFont.fromFlatRanges('Noto Sans New Tai Lue', 'https://fonts.gstatic.com/s/notosansnewtailue/v15/H4c5BW-Pl9DZ0Xe_nHUapt7PovLXAhAnY7wwY55O4AS32A.ttf', <int>[0x20,0x20,0xa0,0xa0,0x1980,0x19ab,0x19b0,0x19c9,0x19d0,0x19da,0x19de,0x19df,0x200c,0x200d,0x25cc,0x25cc,]),
-  NotoFont.fromFlatRanges('Noto Sans Newa', 'https://fonts.gstatic.com/s/notosansnewa/v15/7r3fqXp6utEsO9pI4f8ok8sWg8n_qN4R5lNU.ttf', <int>[0x20,0x20,0xa0,0xa0,0xb7,0xb7,0x1dfb,0x1dfb,0x200c,0x200d,0x25cc,0x25cc,0x11400,0x1145b,0x1145d,0x11461,]),
-  NotoFont.fromFlatRanges('Noto Sans Nushu', 'https://fonts.gstatic.com/s/notosansnushu/v18/rnCw-xRQ3B7652emAbAe_Ai1IYaFWFAMArZKqQ.ttf', <int>[0x20,0x20,0xa0,0xa0,0x16fe1,0x16fe1,0x1b170,0x1b2fb,]),
-  NotoFont.fromFlatRanges('Noto Sans Ogham', 'https://fonts.gstatic.com/s/notosansogham/v15/kmKlZqk1GBDGN0mY6k5lmEmww4hrt5laQxcoCA.ttf', <int>[0x20,0x20,0xa0,0xa0,0x1680,0x169c,]),
-  NotoFont.fromFlatRanges('Noto Sans Ol Chiki', 'https://fonts.gstatic.com/s/notosansolchiki/v17/N0b92TJNOPt-eHmFZCdQbrL32r-4CvhzDzRwlxOQYuVALWk267I6gVrz5gQ.ttf', <int>[0x20,0x20,0xa0,0xa0,0x1c50,0x1c7f,0x20b9,0x20b9,]),
-  NotoFont.fromFlatRanges('Noto Sans Old Hungarian', 'https://fonts.gstatic.com/s/notosansoldhungarian/v15/E213_cD6hP3GwCJPEUssHEM0KqLaHJXg2PiIgRfjbg5nCYXt.ttf', <int>[0x20,0x20,0xa0,0xa0,0x200d,0x200d,0x10c80,0x10cb2,0x10cc0,0x10cf2,0x10cfa,0x10cff,]),
-  NotoFont.fromFlatRanges('Noto Sans Old Italic', 'https://fonts.gstatic.com/s/notosansolditalic/v15/TuGOUUFzXI5FBtUq5a8bh68BJxxEVam7tWlRdRhtCC4d.ttf', <int>[0x20,0x20,0xa0,0xa0,0x10300,0x10323,0x1032d,0x1032f,]),
-  NotoFont.fromFlatRanges('Noto Sans Old North Arabian', 'https://fonts.gstatic.com/s/notosansoldnortharabian/v15/esDF30BdNv-KYGGJpKGk2tNiMt7Jar6olZDyNdr81zBQmUo_xw4ABw.ttf', <int>[0x20,0x20,0xa0,0xa0,0x10a80,0x10a9f,]),
-  NotoFont.fromFlatRanges('Noto Sans Old Permic', 'https://fonts.gstatic.com/s/notosansoldpermic/v16/snf1s1q1-dF8pli1TesqcbUY4Mr-ElrwKLdXgv_dKYB5.ttf', <int>[0x20,0x20,0xa0,0xa0,0x300,0x300,0x306,0x308,0x313,0x313,0x483,0x483,0x20db,0x20db,0x25cc,0x25cc,0x10350,0x1037a,]),
-  NotoFont.fromFlatRanges('Noto Sans Old Persian', 'https://fonts.gstatic.com/s/notosansoldpersian/v15/wEOjEAbNnc5caQTFG18FHrZr9Bp6-8CmIJ_tqOlQfx9CjA.ttf', <int>[0x20,0x20,0xa0,0xa0,0x103a0,0x103c3,0x103c8,0x103d5,]),
-  NotoFont.fromFlatRanges('Noto Sans Old Sogdian', 'https://fonts.gstatic.com/s/notosansoldsogdian/v15/3JnjSCH90Gmq2mrzckOBBhFhdrMst48aURt7neIqM-9uyg.ttf', <int>[0x20,0x20,0xa0,0xa0,0x10f00,0x10f27,]),
-  NotoFont.fromFlatRanges('Noto Sans Old South Arabian', 'https://fonts.gstatic.com/s/notosansoldsoutharabian/v15/3qT5oiOhnSyU8TNFIdhZTice3hB_HWKsEnF--0XCHiKx1OtDT9HwTA.ttf', <int>[0x20,0x20,0xa0,0xa0,0x10a60,0x10a7f,]),
-  NotoFont.fromFlatRanges('Noto Sans Old Turkic', 'https://fonts.gstatic.com/s/notosansoldturkic/v15/yMJNMJVya43H0SUF_WmcGEQVqoEMKDKbsE2RjEw-Vyws.ttf', <int>[0x20,0x20,0xa0,0xa0,0x10c00,0x10c48,]),
-  NotoFont.fromFlatRanges('Noto Sans Oriya', 'https://fonts.gstatic.com/s/notosansoriya/v16/AYCTpXfzfccDCstK_hrjDyADv5en5K3DZq1hIg.ttf', <int>[0x20,0x23,0x25,0x25,0x27,0x2c,0x2e,0x3f,0x5b,0x5f,0x7b,0x7e,0xa0,0xa0,0xad,0xad,0xd7,0xd7,0xf7,0xf7,0x964,0x965,0xb01,0xb03,0xb05,0xb0c,0xb0f,0xb10,0xb13,0xb28,0xb2a,0xb30,0xb32,0xb33,0xb35,0xb39,0xb3c,0xb44,0xb47,0xb48,0xb4b,0xb4d,0xb56,0xb57,0xb5c,0xb5d,0xb5f,0xb63,0xb66,0xb77,0x200b,0x200d,0x2010,0x2010,0x2013,0x2014,0x2018,0x2019,0x201c,0x201d,0x2026,0x2026,0x20b9,0x20b9,0x2212,0x2212,0x25cc,0x25cc,]),
-  NotoFont.fromFlatRanges('Noto Sans Osage', 'https://fonts.gstatic.com/s/notosansosage/v15/oPWX_kB6kP4jCuhpgEGmw4mtAVtXRlaSxkrMCQ.ttf', <int>[0x20,0x20,0xa0,0xa0,0x301,0x301,0x304,0x304,0x30b,0x30b,0x358,0x358,0x25cc,0x25cc,0x104b0,0x104d3,0x104d8,0x104fb,]),
-  NotoFont.fromFlatRanges('Noto Sans Osmanya', 'https://fonts.gstatic.com/s/notosansosmanya/v15/8vIS7xs32H97qzQKnzfeWzUyUpOJmz6kR47NCV5Z.ttf', <int>[0x20,0x20,0xa0,0xa0,0x10480,0x1049d,0x104a0,0x104a9,]),
-  NotoFont.fromFlatRanges('Noto Sans Pahawh Hmong', 'https://fonts.gstatic.com/s/notosanspahawhhmong/v15/bWtp7e_KfBziStx7lIzKKaMUOBEA3UPQDW7krzc_c48aMpM.ttf', <int>[0x20,0x20,0xa0,0xa0,0x200c,0x200d,0x25cc,0x25cc,0x16b00,0x16b45,0x16b50,0x16b59,0x16b5b,0x16b61,0x16b63,0x16b77,0x16b7d,0x16b8f,]),
-  NotoFont.fromFlatRanges('Noto Sans Palmyrene', 'https://fonts.gstatic.com/s/notosanspalmyrene/v15/ZgNPjOdKPa7CHqq0h37c_ASCWvH93SFCPnK5ZpdNtcA.ttf', <int>[0x20,0x20,0xa0,0xa0,0x10860,0x1087f,]),
-  NotoFont.fromFlatRanges('Noto Sans Pau Cin Hau', 'https://fonts.gstatic.com/s/notosanspaucinhau/v16/x3d-cl3IZKmUqiMg_9wBLLtzl22EayN7ehIdjEWqKMxsKw.ttf', <int>[0x20,0x20,0xa0,0xa0,0x11ac0,0x11af8,]),
-  NotoFont.fromFlatRanges('Noto Sans Phags Pa', 'https://fonts.gstatic.com/s/notosansphagspa/v15/pxiZyoo6v8ZYyWh5WuPeJzMkd4SrGChkqkSsrvNXiA.ttf', <int>[0x20,0x20,0xa0,0xa0,0x1801,0x1803,0x1805,0x1805,0x200b,0x200f,0x2025,0x2026,0x25cc,0x25cc,0x3001,0x3002,0x3007,0x3011,0x3014,0x301b,0xa840,0xa877,0xfe00,0xfe00,]),
-  NotoFont.fromFlatRanges('Noto Sans Phoenician', 'https://fonts.gstatic.com/s/notosansphoenician/v15/jizFRF9Ksm4Bt9PvcTaEkIHiTVtxmFtS5X7Jot-p5561.ttf', <int>[0x20,0x20,0xa0,0xa0,0x10900,0x1091b,0x1091f,0x1091f,]),
-  NotoFont.fromFlatRanges('Noto Sans Psalter Pahlavi', 'https://fonts.gstatic.com/s/notosanspsalterpahlavi/v15/rP2Vp3K65FkAtHfwd-eISGznYihzggmsicPfud3w1G3KsUQBct4.ttf', <int>[0x20,0x20,0xa0,0xa0,0x640,0x640,0x200c,0x200d,0x25cc,0x25cc,0x10b80,0x10b91,0x10b99,0x10b9c,0x10ba9,0x10baf,]),
-  NotoFont.fromFlatRanges('Noto Sans Rejang', 'https://fonts.gstatic.com/s/notosansrejang/v15/Ktk2AKuMeZjqPnXgyqrib7DIogqwN4O3WYZB_sU.ttf', <int>[0x20,0x20,0xa0,0xa0,0x200b,0x200d,0x25cc,0x25cc,0xa930,0xa953,0xa95f,0xa95f,]),
-  NotoFont.fromFlatRanges('Noto Sans Runic', 'https://fonts.gstatic.com/s/notosansrunic/v15/H4c_BXWPl9DZ0Xe_nHUaus7W68WWaxpvHtgIYg.ttf', <int>[0x20,0x20,0xa0,0xa0,0x16a0,0x16f8,]),
-  NotoFont.fromFlatRanges('Noto Sans SC', 'https://fonts.gstatic.com/s/notosanssc/v26/k3kXo84MPvpLmixcA63oeALhL4iJ-Q7m8w.otf', <int>[0x20,0x7e,0xa0,0x103,0x110,0x113,0x11a,0x11b,0x128,0x12b,0x143,0x144,0x147,0x148,0x14c,0x14f,0x152,0x153,0x168,0x16d,0x192,0x192,0x1a0,0x1a1,0x1af,0x1b0,0x1cd,0x1dc,0x1f8,0x1f9,0x251,0x251,0x261,0x261,0x2bb,0x2bb,0x2c7,0x2c7,0x2c9,0x2cb,0x2d9,0x2d9,0x2ea,0x2eb,0x300,0x301,0x304,0x304,0x307,0x307,0x30c,0x30c,0x391,0x3a1,0x3a3,0x3a9,0x3b1,0x3c9,0x401,0x401,0x410,0x44f,0x451,0x451,0x1e3e,0x1e3f,0x1ea0,0x1ef9,0x2002,0x2003,0x2010,0x2016,0x2018,0x201a,0x201c,0x201e,0x2020,0x2022,0x2025,0x2027,0x2030,0x2030,0x2032,0x2033,0x2035,0x2035,0x2039,0x203c,0x2042,0x2042,0x2047,0x2049,0x2051,0x2051,0x2074,0x2074,0x20a9,0x20a9,0x20ab,0x20ac,0x20dd,0x20de,0x2100,0x2100,0x2103,0x2103,0x2105,0x2105,0x2109,0x210a,0x210f,0x210f,0x2113,0x2113,0x2116,0x2116,0x2121,0x2122,0x2126,0x2127,0x212b,0x212b,0x212e,0x212e,0x2135,0x2135,0x213b,0x213b,0x2160,0x216b,0x2170,0x217b,0x2190,0x2199,0x21b8,0x21b9,0x21c4,0x21c6,0x21cb,0x21cc,0x21d0,0x21d0,0x21d2,0x21d2,0x21d4,0x21d4,0x21e6,0x21e9,0x21f5,0x21f5,0x2200,0x2200,0x2202,0x2203,0x2205,0x220b,0x220f,0x220f,0x2211,0x2213,0x2215,0x2215,0x221a,0x221a,0x221d,0x2220,0x2223,0x2223,0x2225,0x222e,0x2234,0x2237,0x223d,0x223d,0x2243,0x2243,0x2245,0x2245,0x2248,0x2248,0x224c,0x224c,0x2252,0x2252,0x2260,0x2262,0x2264,0x2267,0x226a,0x226b,0x226e,0x226f,0x2272,0x2273,0x2276,0x2277,0x2282,0x2287,0x228a,0x228b,0x2295,0x2299,0x22a0,0x22a0,0x22a5,0x22a5,0x22bf,0x22bf,0x22da,0x22db,0x22ef,0x22ef,0x2305,0x2307,0x2312,0x2312,0x2318,0x2318,0x2329,0x232a,0x23b0,0x23b1,0x23be,0x23cc,0x23ce,0x23ce,0x23da,0x23db,0x2423,0x2423,0x2460,0x25ab,0x25b1,0x25b3,0x25b6,0x25b7,0x25bc,0x25bd,0x25c0,0x25c1,0x25c6,0x25cc,0x25ce,0x25d3,0x25e2,0x25e6,0x25ef,0x25ef,0x2600,0x2603,0x2605,0x2606,0x2609,0x2609,0x260e,0x260f,0x2616,0x2617,0x261c,0x261f,0x262f,0x262f,0x2640,0x2642,0x2660,0x266f,0x2672,0x267d,0x26a0,0x26a0,0x26bd,0x26be,0x2702,0x2702,0x2713,0x2713,0x271a,0x271a,0x273d,0x273d,0x273f,0x2740,0x2756,0x2756,0x2776,0x2793,0x27a1,0x27a1,0x2934,0x2935,0x29bf,0x29bf,0x29fa,0x29fb,0x2b05,0x2b07,0x2b1a,0x2b1a,0x2b95,0x2b95,0x2e3a,0x2e3b,0x2e80,0x2e99,0x2e9b,0x2ef3,0x2f00,0x2fd5,0x2ff0,0x2ffb,0x3000,0x303f,0x3041,0x3096,0x3099,0x30ff,0x3105,0x312f,0x3131,0x3163,0x3165,0x318e,0x3190,0x31bb,0x31c0,0x31e3,0x31f0,0x321e,0x3220,0x332b,0x332d,0x4db5,0x4e00,0x9fef,0xf900,0xf903,0xf905,0xf906,0xf90b,0xf90c,0xf915,0xf915,0xf917,0xf91a,0xf921,0xf921,0xf92c,0xf92d,0xf92f,0xf92f,0xf931,0xf935,0xf937,0xf93a,0xf943,0xf943,0xf947,0xf94a,0xf94e,0xf94e,0xf952,0xf953,0xf95e,0xf95e,0xf962,0xf967,0xf96e,0xf96e,0xf972,0xf972,0xf974,0xf974,0xf976,0xf976,0xf979,0xf97b,0xf97e,0xf980,0xf984,0xf985,0xf98a,0xf98c,0xf98e,0xf98e,0xf993,0xf993,0xf995,0xf995,0xf998,0xf998,0xf9ae,0xf9ae,0xf9b3,0xf9b3,0xf9b7,0xf9b7,0xf9bb,0xf9bb,0xf9bd,0xf9be,0xf9c0,0xf9c0,0xf9c5,0xf9c6,0xf9d0,0xf9d0,0xf9d8,0xf9d9,0xf9dc,0xf9e0,0xf9e2,0xf9e4,0xf9e7,0xf9e7,0xf9e9,0xf9e9,0xf9f1,0xf9f1,0xf9f4,0xf9f5,0xf9fa,0xf9fa,0xf9fd,0xf9fd,0xf9ff,0xf9ff,0xfa02,0xfa02,0xfa05,0xfa08,0xfa0a,0xfa0a,0xfa0c,0xfa0f,0xfa11,0xfa11,0xfa13,0xfa14,0xfa18,0xfa18,0xfa1f,0xfa21,0xfa23,0xfa24,0xfa27,0xfa29,0xfa2f,0xfa2f,0xfa33,0xfa35,0xfa37,0xfa38,0xfa3a,0xfa3a,0xfa47,0xfa47,0xfa49,0xfa49,0xfa4b,0xfa4b,0xfa5d,0xfa5e,0xfb00,0xfb04,0xfe10,0xfe19,0xfe30,0xfe52,0xfe54,0xfe66,0xfe68,0xfe6b,0xff01,0xff9f,0xffa1,0xffbe,0xffc2,0xffc7,0xffca,0xffcf,0xffd2,0xffd7,0xffda,0xffdc,0xffe0,0xffe6,0xffe8,0xffee,0x1f100,0x1f10c,0x1f110,0x1f16c,0x1f170,0x1f1ac,0x1f200,0x1f202,0x1f210,0x1f23b,0x1f240,0x1f248,0x1f250,0x1f251,0x20087,0x20087,0x20089,0x20089,0x200cc,0x200cc,0x20164,0x20164,0x20628,0x20628,0x20676,0x20676,0x20cd0,0x20cd0,0x2139a,0x2139a,0x21413,0x21413,0x215d7,0x215d7,0x2298f,0x2298f,0x235cb,0x235cb,0x23c97,0x23c98,0x23e23,0x23e23,0x241fe,0x241fe,0x2420e,0x2420e,0x248e9,0x248e9,0x249db,0x249db,0x24a01,0x24a01,0x24a7d,0x24a7d,0x24ac9,0x24ac9,0x25532,0x25532,0x25562,0x25562,0x255a8,0x255a8,0x25ad7,0x25ad7,0x25ed7,0x25ed7,0x26221,0x26221,0x2648d,0x2648d,0x26676,0x26676,0x2677c,0x2677c,0x26951,0x26951,0x26b5c,0x26b5c,0x26c21,0x26c21,0x278b2,0x278b2,0x27eaf,0x27eaf,0x27fb7,0x27fb7,0x27ff9,0x27ff9,0x28408,0x28408,0x28678,0x28678,0x28695,0x28695,0x287e0,0x287e0,0x28b49,0x28b49,0x28c47,0x28c47,0x28c4f,0x28c4f,0x28c51,0x28c51,0x28c54,0x28c54,0x28e0f,0x28e0f,0x28e99,0x28e99,0x2967f,0x2967f,0x29810,0x29810,0x29f7e,0x29f7e,0x29f83,0x29f83,0x29f8c,0x29f8c,0x2a7dd,0x2a7dd,0x2a8fb,0x2a8fb,0x2a917,0x2a917,0x2aa30,0x2aa30,0x2aa36,0x2aa36,0x2aa58,0x2aa58,0x2afa2,0x2afa2,0x2b127,0x2b128,0x2b137,0x2b138,0x2b1ed,0x2b1ed,0x2b300,0x2b300,0x2b363,0x2b363,0x2b36f,0x2b36f,0x2b372,0x2b372,0x2b37d,0x2b37d,0x2b404,0x2b404,0x2b410,0x2b410,0x2b413,0x2b413,0x2b461,0x2b461,0x2b4e7,0x2b4e7,0x2b4ef,0x2b4ef,0x2b4f6,0x2b4f6,0x2b4f9,0x2b4f9,0x2b50d,0x2b50e,0x2b536,0x2b536,0x2b5ae,0x2b5af,0x2b5b3,0x2b5b3,0x2b5e7,0x2b5e7,0x2b5f4,0x2b5f4,0x2b61c,0x2b61d,0x2b626,0x2b628,0x2b62a,0x2b62a,0x2b62c,0x2b62c,0x2b695,0x2b696,0x2b6ad,0x2b6ad,0x2b6ed,0x2b6ed,0x2b7a9,0x2b7a9,0x2b7c5,0x2b7c5,0x2b7e6,0x2b7e6,0x2b7f9,0x2b7f9,0x2b7fc,0x2b7fc,0x2b806,0x2b806,0x2b80a,0x2b80a,0x2b81c,0x2b81c,0x2b8b8,0x2b8b8,0x2bac7,0x2bac7,0x2bb5f,0x2bb5f,0x2bb62,0x2bb62,0x2bb7c,0x2bb7c,0x2bb83,0x2bb83,0x2bc1b,0x2bc1b,0x2bd77,0x2bd77,0x2bd87,0x2bd87,0x2bdf7,0x2bdf7,0x2be29,0x2be29,0x2c029,0x2c02a,0x2c0a9,0x2c0a9,0x2c0ca,0x2c0ca,0x2c1d5,0x2c1d5,0x2c1d9,0x2c1d9,0x2c1f9,0x2c1f9,0x2c27c,0x2c27c,0x2c288,0x2c288,0x2c2a4,0x2c2a4,0x2c317,0x2c317,0x2c35b,0x2c35b,0x2c361,0x2c361,0x2c364,0x2c364,0x2c488,0x2c488,0x2c494,0x2c494,0x2c497,0x2c497,0x2c542,0x2c542,0x2c613,0x2c613,0x2c618,0x2c618,0x2c621,0x2c621,0x2c629,0x2c629,0x2c62b,0x2c62d,0x2c62f,0x2c62f,0x2c642,0x2c642,0x2c64a,0x2c64b,0x2c72c,0x2c72c,0x2c72f,0x2c72f,0x2c79f,0x2c79f,0x2c7c1,0x2c7c1,0x2c7fd,0x2c7fd,0x2c8d9,0x2c8d9,0x2c8de,0x2c8de,0x2c8e1,0x2c8e1,0x2c8f3,0x2c8f3,0x2c907,0x2c907,0x2c90a,0x2c90a,0x2c91d,0x2c91d,0x2ca02,0x2ca02,0x2ca0e,0x2ca0e,0x2ca7d,0x2ca7d,0x2caa9,0x2caa9,0x2cb29,0x2cb29,0x2cb2d,0x2cb2e,0x2cb31,0x2cb31,0x2cb38,0x2cb39,0x2cb3b,0x2cb3b,0x2cb3f,0x2cb3f,0x2cb41,0x2cb41,0x2cb4a,0x2cb4a,0x2cb4e,0x2cb4e,0x2cb5a,0x2cb5b,0x2cb64,0x2cb64,0x2cb69,0x2cb69,0x2cb6c,0x2cb6c,0x2cb6f,0x2cb6f,0x2cb73,0x2cb73,0x2cb76,0x2cb76,0x2cb78,0x2cb78,0x2cb7c,0x2cb7c,0x2cbb1,0x2cbb1,0x2cbbf,0x2cbc0,0x2cbce,0x2cbce,0x2cc56,0x2cc56,0x2cc5f,0x2cc5f,0x2ccf5,0x2ccf6,0x2ccfd,0x2ccfd,0x2ccff,0x2ccff,0x2cd02,0x2cd03,0x2cd0a,0x2cd0a,0x2cd8b,0x2cd8b,0x2cd8d,0x2cd8d,0x2cd8f,0x2cd90,0x2cd9f,0x2cda0,0x2cda8,0x2cda8,0x2cdad,0x2cdae,0x2cdd5,0x2cdd5,0x2ce18,0x2ce18,0x2ce1a,0x2ce1a,0x2ce23,0x2ce23,0x2ce26,0x2ce26,0x2ce2a,0x2ce2a,0x2ce7c,0x2ce7c,0x2ce88,0x2ce88,0x2ce93,0x2ce93,0x2d544,0x2d544,0x2f884,0x2f884,0x2f8b6,0x2f8b6,0x30edd,0x30ede,0x3106c,0x3106c,]),
-  NotoFont.fromFlatRanges('Noto Sans Saurashtra', 'https://fonts.gstatic.com/s/notosanssaurashtra/v15/ea8GacQ0Wfz_XKWXe6OtoA8w8zvmYwTef9ndjhPTSIx9.ttf', <int>[0x20,0x20,0xa0,0xa0,0x200b,0x200d,0x25cc,0x25cc,0xa880,0xa8c5,0xa8ce,0xa8d9,]),
-  NotoFont.fromFlatRanges('Noto Sans Sharada', 'https://fonts.gstatic.com/s/notosanssharada/v15/gok0H7rwAEdtF9N8-mdTGALG6p0kwoXLPOwr4H8a.ttf', <int>[0x20,0x20,0xa0,0xa0,0x951,0x951,0x1cd7,0x1cd7,0x1cd9,0x1cd9,0x1cdc,0x1cdd,0x1ce0,0x1ce0,0x200c,0x200d,0x25cc,0x25cc,0x11180,0x111df,]),
-  NotoFont.fromFlatRanges('Noto Sans Shavian', 'https://fonts.gstatic.com/s/notosansshavian/v15/CHy5V_HZE0jxJBQlqAeCKjJvQBNF4EFQSplv2Cwg.ttf', <int>[0x20,0x20,0xa0,0xa0,0x10450,0x1047f,]),
-  NotoFont.fromFlatRanges('Noto Sans Siddham', 'https://fonts.gstatic.com/s/notosanssiddham/v15/OZpZg-FwqiNLe9PELUikxTWDoCCeGqndk3Ic92ZH.ttf', <int>[0x20,0x20,0xa0,0xa0,0x200c,0x200d,0x25cc,0x25cc,0x11580,0x115b5,0x115b8,0x115dd,]),
-  NotoFont.fromFlatRanges('Noto Sans Sinhala', 'https://fonts.gstatic.com/s/notosanssinhala/v25/yMJ2MJBya43H0SUF_WmcBEEf4rQVO2P524V5N_MxQzQtb-tf5dJbC30Fu9zUwg2a5lgLpJwbQRM.ttf', <int>[0x20,0x23,0x25,0x25,0x27,0x3f,0x5b,0x5f,0x7b,0x7e,0xa0,0xa0,0xad,0xad,0xd7,0xd7,0xf7,0xf7,0x964,0x965,0xd81,0xd83,0xd85,0xd96,0xd9a,0xdb1,0xdb3,0xdbb,0xdbd,0xdbd,0xdc0,0xdc6,0xdca,0xdca,0xdcf,0xdd4,0xdd6,0xdd6,0xdd8,0xddf,0xde6,0xdef,0xdf2,0xdf4,0x200b,0x200d,0x2013,0x2014,0x2018,0x2019,0x201c,0x201d,0x2026,0x2026,0x2212,0x2212,0x25cc,0x25cc,0x111e1,0x111f4,]),
-  NotoFont.fromFlatRanges('Noto Sans Sogdian', 'https://fonts.gstatic.com/s/notosanssogdian/v15/taiQGn5iC4--qtsfi4Jp6eHPnfxQBo--Pm6KHidM.ttf', <int>[0x20,0x20,0xa0,0xa0,0x640,0x640,0x200c,0x200c,0x25cc,0x25cc,0x10f30,0x10f59,]),
-  NotoFont.fromFlatRanges('Noto Sans Sora Sompeng', 'https://fonts.gstatic.com/s/notosanssorasompeng/v17/PlIRFkO5O6RzLfvNNVSioxM2_OTrEhPyDLolKvCsHzCxWuGkYHR818DpZXJQd4Mu.ttf', <int>[0x20,0x20,0x2d,0x2d,0xa0,0xa0,0x2010,0x2010,0x110d0,0x110e8,0x110f0,0x110f9,]),
-  NotoFont.fromFlatRanges('Noto Sans Soyombo', 'https://fonts.gstatic.com/s/notosanssoyombo/v15/RWmSoL-Y6-8q5LTtXs6MF6q7xsxgY0FrIFOcK25W.ttf', <int>[0x20,0x20,0xa0,0xa0,0x25cc,0x25cc,0x11a50,0x11aa2,]),
-  NotoFont.fromFlatRanges('Noto Sans Sundanese', 'https://fonts.gstatic.com/s/notosanssundanese/v17/FwZw7_84xUkosG2xJo2gm7nFwSLQkdymq2mkz3Gz1_b6ctxpNNHCizv7fQES.ttf', <int>[0x20,0x20,0x2d,0x2d,0xa0,0xa0,0x1b80,0x1bbf,0x1cc0,0x1cc7,0x200b,0x200d,0x2010,0x2010,0x25cc,0x25cc,]),
-  NotoFont.fromFlatRanges('Noto Sans Syloti Nagri', 'https://fonts.gstatic.com/s/notosanssylotinagri/v15/uU9eCAQZ75uhfF9UoWDRiY3q7Sf_VFV3m4dGFVfxN87gsj0.ttf', <int>[0x20,0x20,0xa0,0xa0,0x964,0x965,0x9e6,0x9ef,0x200b,0x200d,0x2010,0x2011,0x2055,0x2055,0x25cc,0x25cc,0xa800,0xa82c,]),
-  NotoFont.fromFlatRanges('Noto Sans Syriac', 'https://fonts.gstatic.com/s/notosanssyriac/v15/Ktk2AKuMeZjqPnXgyqribqzQqgW0N4O3WYZB_sU.ttf', <int>[0x20,0x21,0x28,0x2b,0x2d,0x2f,0x3a,0x3a,0x3d,0x3d,0x5b,0x5d,0xa0,0xa0,0xab,0xab,0xb0,0xb0,0xbb,0xbb,0x303,0x304,0x307,0x308,0x30a,0x30a,0x320,0x320,0x323,0x325,0x32d,0x32e,0x330,0x331,0x60c,0x60c,0x61b,0x61b,0x61f,0x61f,0x621,0x621,0x640,0x640,0x64b,0x655,0x660,0x66c,0x670,0x670,0x700,0x70d,0x70f,0x74a,0x74d,0x74f,0x200c,0x200f,0x2026,0x2026,0x2044,0x2044,0x2212,0x2212,0x25cc,0x25cc,0x2670,0x2671,]),
-  NotoFont.fromFlatRanges('Noto Sans TC', 'https://fonts.gstatic.com/s/notosanstc/v26/-nF7OG829Oofr2wohFbTp9iFOSsLA_ZJ1g.otf', <int>[0x20,0x7e,0xa0,0x103,0x110,0x113,0x11a,0x11b,0x128,0x12b,0x143,0x144,0x147,0x148,0x14c,0x14f,0x152,0x153,0x168,0x16d,0x192,0x192,0x1a0,0x1a1,0x1af,0x1b0,0x1cd,0x1dc,0x1f8,0x1f9,0x251,0x251,0x261,0x261,0x2bb,0x2bb,0x2c7,0x2c7,0x2c9,0x2cb,0x2d9,0x2d9,0x2ea,0x2eb,0x300,0x301,0x304,0x304,0x307,0x307,0x30c,0x30c,0x391,0x3a1,0x3a3,0x3a9,0x3b1,0x3c9,0x401,0x401,0x410,0x44f,0x451,0x451,0x1e3e,0x1e3f,0x1ea0,0x1ef9,0x2002,0x2003,0x2010,0x2016,0x2018,0x201a,0x201c,0x201e,0x2020,0x2022,0x2025,0x2027,0x2030,0x2030,0x2032,0x2033,0x2035,0x2035,0x2039,0x203c,0x2042,0x2042,0x2047,0x2049,0x2051,0x2051,0x2074,0x2074,0x20a9,0x20a9,0x20ab,0x20ac,0x20dd,0x20de,0x2100,0x2100,0x2103,0x2103,0x2105,0x2105,0x2109,0x210a,0x210f,0x210f,0x2113,0x2113,0x2116,0x2116,0x2121,0x2122,0x2126,0x2127,0x212b,0x212b,0x212e,0x212e,0x2135,0x2135,0x213b,0x213b,0x2160,0x216b,0x2170,0x217b,0x2190,0x2199,0x21b8,0x21b9,0x21c4,0x21c6,0x21cb,0x21cc,0x21d0,0x21d0,0x21d2,0x21d2,0x21d4,0x21d4,0x21e6,0x21e9,0x21f5,0x21f5,0x2200,0x2200,0x2202,0x2203,0x2205,0x220b,0x220f,0x220f,0x2211,0x2213,0x2215,0x2215,0x221a,0x221a,0x221d,0x2220,0x2223,0x2223,0x2225,0x222e,0x2234,0x2237,0x223d,0x223d,0x2243,0x2243,0x2245,0x2245,0x2248,0x2248,0x224c,0x224c,0x2252,0x2252,0x2260,0x2262,0x2264,0x2267,0x226a,0x226b,0x226e,0x226f,0x2272,0x2273,0x2276,0x2277,0x2282,0x2287,0x228a,0x228b,0x2295,0x2299,0x22a0,0x22a0,0x22a5,0x22a5,0x22bf,0x22bf,0x22da,0x22db,0x22ef,0x22ef,0x2305,0x2307,0x2312,0x2312,0x2318,0x2318,0x2329,0x232a,0x23b0,0x23b1,0x23be,0x23cc,0x23ce,0x23ce,0x23da,0x23db,0x2423,0x2423,0x2460,0x25ab,0x25b1,0x25b3,0x25b6,0x25b7,0x25bc,0x25bd,0x25c0,0x25c1,0x25c6,0x25cc,0x25ce,0x25d3,0x25e2,0x25e6,0x25ef,0x25ef,0x2600,0x2603,0x2605,0x2606,0x2609,0x2609,0x260e,0x260f,0x2616,0x2617,0x261c,0x261f,0x262f,0x262f,0x2640,0x2642,0x2660,0x266f,0x2672,0x267d,0x26a0,0x26a0,0x26bd,0x26be,0x2702,0x2702,0x2713,0x2713,0x271a,0x271a,0x273d,0x273d,0x273f,0x2740,0x2756,0x2756,0x2776,0x2793,0x27a1,0x27a1,0x2934,0x2935,0x29bf,0x29bf,0x29fa,0x29fb,0x2b05,0x2b07,0x2b1a,0x2b1a,0x2b95,0x2b95,0x2e3a,0x2e3b,0x2e80,0x2e99,0x2e9b,0x2ef3,0x2f00,0x2fd5,0x2ff0,0x2ffb,0x3000,0x303f,0x3041,0x3096,0x3099,0x30ff,0x3105,0x312f,0x3131,0x3163,0x3165,0x318e,0x3190,0x31bb,0x31c0,0x31e3,0x31f0,0x321e,0x3220,0x332b,0x332d,0x33ff,0x3435,0x3435,0x3440,0x3440,0x344a,0x344a,0x344c,0x344c,0x3464,0x3464,0x3473,0x3473,0x347a,0x347a,0x347d,0x347e,0x3493,0x3493,0x3496,0x3496,0x34a5,0x34a5,0x34af,0x34af,0x34bc,0x34bc,0x34c1,0x34c1,0x34c8,0x34c8,0x34df,0x34df,0x34e4,0x34e4,0x34e6,0x34e6,0x34fb,0x34fb,0x3506,0x3506,0x353e,0x353e,0x3551,0x3551,0x3553,0x3553,0x3559,0x3559,0x3561,0x3561,0x356d,0x356d,0x3570,0x3570,0x3572,0x3572,0x3577,0x3578,0x3584,0x3584,0x3597,0x3598,0x35a1,0x35a1,0x35a5,0x35a5,0x35ad,0x35ad,0x35bf,0x35bf,0x35c1,0x35c1,0x35c5,0x35c5,0x35c7,0x35c7,0x35ca,0x35ca,0x35ce,0x35ce,0x35d2,0x35d2,0x35d6,0x35d6,0x35db,0x35db,0x35dd,0x35dd,0x35f1,0x35f3,0x35fb,0x35fb,0x35fe,0x35fe,0x3609,0x3609,0x3618,0x3618,0x361a,0x361a,0x3623,0x3623,0x3625,0x3625,0x362d,0x362d,0x3635,0x3635,0x3639,0x3639,0x363e,0x363e,0x3647,0x3649,0x364e,0x364e,0x365f,0x365f,0x3661,0x3661,0x367a,0x367a,0x3681,0x3681,0x369a,0x369a,0x36a5,0x36a5,0x36aa,0x36aa,0x36ac,0x36ac,0x36b0,0x36b1,0x36b5,0x36b5,0x36b9,0x36b9,0x36bc,0x36bc,0x36c1,0x36c1,0x36c3,0x36c5,0x36c7,0x36c8,0x36d3,0x36d4,0x36d6,0x36d6,0x36dd,0x36dd,0x36e1,0x36e2,0x36e5,0x36e6,0x36f5,0x36f5,0x3701,0x3701,0x3703,0x3703,0x3708,0x3708,0x370a,0x370a,0x370d,0x370d,0x371c,0x371c,0x3722,0x3723,0x3725,0x3725,0x372c,0x372d,0x3730,0x3730,0x3732,0x3733,0x373a,0x373a,0x3740,0x3740,0x3743,0x3743,0x3762,0x3762,0x376f,0x376f,0x3797,0x3797,0x37a0,0x37a0,0x37b9,0x37b9,0x37be,0x37be,0x37d6,0x37d6,0x37f2,0x37f2,0x37f8,0x37f8,0x37fb,0x37fb,0x380f,0x380f,0x3819,0x3819,0x3820,0x3820,0x382d,0x382d,0x3836,0x3836,0x3838,0x3838,0x3863,0x3863,0x3875,0x3875,0x38a0,0x38a0,0x38c3,0x38c3,0x38cc,0x38cc,0x38d1,0x38d1,0x38d4,0x38d4,0x38fa,0x38fa,0x3908,0x3908,0x3914,0x3914,0x3927,0x3927,0x3932,0x3932,0x393f,0x393f,0x394d,0x394d,0x3963,0x3963,0x3978,0x3978,0x3980,0x3980,0x3989,0x398a,0x3992,0x3992,0x3999,0x3999,0x399b,0x399b,0x39a1,0x39a1,0x39a4,0x39a4,0x39b8,0x39b8,0x39dc,0x39dc,0x39e2,0x39e2,0x39e5,0x39e5,0x39ec,0x39ec,0x39f8,0x39f8,0x39fb,0x39fb,0x39fe,0x39fe,0x3a01,0x3a01,0x3a03,0x3a03,0x3a06,0x3a06,0x3a17,0x3a18,0x3a29,0x3a2a,0x3a34,0x3a34,0x3a4b,0x3a4b,0x3a52,0x3a52,0x3a57,0x3a57,0x3a5c,0x3a5c,0x3a5e,0x3a5e,0x3a66,0x3a67,0x3a97,0x3a97,0x3aab,0x3aab,0x3abd,0x3abd,0x3ada,0x3ada,0x3ade,0x3ade,0x3ae0,0x3ae0,0x3af0,0x3af0,0x3af2,0x3af2,0x3af5,0x3af5,0x3afb,0x3afb,0x3b0e,0x3b0e,0x3b19,0x3b19,0x3b22,0x3b22,0x3b2b,0x3b2b,0x3b39,0x3b39,0x3b42,0x3b42,0x3b58,0x3b58,0x3b60,0x3b60,0x3b71,0x3b72,0x3b7b,0x3b7c,0x3b80,0x3b80,0x3b95,0x3b96,0x3b99,0x3b99,0x3ba1,0x3ba1,0x3bbc,0x3bbc,0x3bbe,0x3bbe,0x3bc2,0x3bc2,0x3bc4,0x3bc4,0x3bd7,0x3bd7,0x3bdd,0x3bdd,0x3bec,0x3bec,0x3bf2,0x3bf4,0x3c0d,0x3c0d,0x3c11,0x3c11,0x3c15,0x3c15,0x3c18,0x3c18,0x3c54,0x3c54,0x3c8b,0x3c8b,0x3ccb,0x3ccb,0x3ccd,0x3ccd,0x3cd1,0x3cd1,0x3cd6,0x3cd6,0x3cdc,0x3cdc,0x3ceb,0x3ceb,0x3cef,0x3cef,0x3d12,0x3d13,0x3d1d,0x3d1d,0x3d32,0x3d32,0x3d3b,0x3d3b,0x3d46,0x3d46,0x3d4c,0x3d4c,0x3d4e,0x3d4e,0x3d51,0x3d51,0x3d5f,0x3d5f,0x3d62,0x3d62,0x3d69,0x3d6a,0x3d6f,0x3d6f,0x3d75,0x3d75,0x3d7d,0x3d7d,0x3d85,0x3d85,0x3d88,0x3d88,0x3d8a,0x3d8a,0x3d8f,0x3d8f,0x3d91,0x3d91,0x3da5,0x3da5,0x3dad,0x3dad,0x3db4,0x3db4,0x3dbf,0x3dbf,0x3dc6,0x3dc7,0x3dc9,0x3dc9,0x3dcc,0x3dcd,0x3dd3,0x3dd3,0x3ddb,0x3ddb,0x3de7,0x3de8,0x3deb,0x3deb,0x3df3,0x3df4,0x3df7,0x3df7,0x3dfc,0x3dfd,0x3e06,0x3e06,0x3e40,0x3e40,0x3e43,0x3e43,0x3e48,0x3e48,0x3e55,0x3e55,0x3e74,0x3e74,0x3ea8,0x3eaa,0x3ead,0x3ead,0x3eb1,0x3eb1,0x3eb8,0x3eb8,0x3ebf,0x3ebf,0x3ec2,0x3ec2,0x3ec7,0x3ec7,0x3eca,0x3eca,0x3ecc,0x3ecc,0x3ed0,0x3ed1,0x3ed6,0x3ed7,0x3eda,0x3edb,0x3ede,0x3ede,0x3ee1,0x3ee2,0x3ee7,0x3ee7,0x3ee9,0x3ee9,0x3eeb,0x3eec,0x3ef0,0x3ef0,0x3ef3,0x3ef4,0x3efa,0x3efa,0x3efc,0x3efc,0x3eff,0x3f00,0x3f04,0x3f04,0x3f06,0x3f07,0x3f0e,0x3f0e,0x3f53,0x3f53,0x3f58,0x3f59,0x3f63,0x3f63,0x3f7c,0x3f7c,0x3f93,0x3f93,0x3fc0,0x3fc0,0x3fc8,0x3fc8,0x3fd7,0x3fd7,0x3fdc,0x3fdc,0x3fe5,0x3fe5,0x3fed,0x3fed,0x3ff9,0x3ffa,0x4004,0x4004,0x4009,0x4009,0x401d,0x401d,0x4039,0x4039,0x4045,0x4045,0x4053,0x4053,0x4057,0x4057,0x4062,0x4062,0x4065,0x4065,0x406a,0x406a,0x406f,0x406f,0x4071,0x4071,0x40a8,0x40a8,0x40b4,0x40b4,0x40bb,0x40bb,0x40bf,0x40bf,0x40c8,0x40c8,0x40d8,0x40d8,0x40df,0x40df,0x40f8,0x40f8,0x40fa,0x40fa,0x4102,0x4104,0x4109,0x4109,0x410e,0x410e,0x4131,0x4132,0x4167,0x4167,0x416c,0x416c,0x416e,0x416e,0x417c,0x417c,0x417f,0x417f,0x4181,0x4181,0x4190,0x4190,0x41b2,0x41b2,0x41c4,0x41c4,0x41ca,0x41ca,0x41cf,0x41cf,0x41db,0x41db,0x41ed,0x41ed,0x41ef,0x41ef,0x41f9,0x41f9,0x4211,0x4211,0x4223,0x4223,0x4240,0x4240,0x4260,0x4260,0x426a,0x426a,0x4276,0x4276,0x427a,0x427a,0x428c,0x428c,0x4294,0x4294,0x42a2,0x42a2,0x42b5,0x42b5,0x42b9,0x42b9,0x42bc,0x42bc,0x42f4,0x42f4,0x42fb,0x42fc,0x430a,0x430a,0x432b,0x432b,0x436e,0x436e,0x4397,0x4397,0x439a,0x439a,0x43ba,0x43ba,0x43c1,0x43c1,0x43d9,0x43d9,0x43df,0x43df,0x43ed,0x43ed,0x43f0,0x43f0,0x43f2,0x43f2,0x4401,0x4402,0x4413,0x4413,0x4425,0x4425,0x442d,0x442d,0x447a,0x447a,0x448f,0x448f,0x4491,0x4491,0x449f,0x44a0,0x44a2,0x44a2,0x44b0,0x44b0,0x44b7,0x44b7,0x44bd,0x44bd,0x44c0,0x44c0,0x44c3,0x44c3,0x44c5,0x44c5,0x44ce,0x44ce,0x44dd,0x44df,0x44e1,0x44e1,0x44e4,0x44e4,0x44e9,0x44ec,0x44f4,0x44f4,0x4503,0x4504,0x4509,0x4509,0x450b,0x450b,0x4516,0x4516,0x451b,0x451b,0x451d,0x451d,0x4527,0x4527,0x452e,0x452e,0x4533,0x4533,0x4536,0x4536,0x453b,0x453b,0x453d,0x453d,0x453f,0x453f,0x4543,0x4543,0x4551,0x4552,0x4555,0x4555,0x4558,0x4558,0x455c,0x455c,0x4561,0x4562,0x456a,0x456a,0x456d,0x456d,0x4577,0x4578,0x4585,0x4585,0x45a6,0x45a6,0x45b3,0x45b3,0x45da,0x45da,0x45e9,0x45ea,0x4603,0x4603,0x4606,0x4606,0x460f,0x460f,0x4615,0x4615,0x4617,0x4617,0x465b,0x465b,0x467a,0x467a,0x4680,0x4680,0x46a1,0x46a1,0x46ae,0x46ae,0x46bb,0x46bb,0x46cf,0x46d0,0x46f5,0x46f5,0x46f7,0x46f7,0x4713,0x4713,0x4718,0x4718,0x4736,0x4736,0x4744,0x4744,0x474e,0x474f,0x477c,0x477c,0x4798,0x4798,0x47a6,0x47a6,0x47d5,0x47d5,0x47ed,0x47ed,0x47f4,0x47f4,0x4800,0x4800,0x480b,0x480b,0x4837,0x4837,0x485d,0x485d,0x4871,0x4871,0x489b,0x489b,0x48ad,0x48ae,0x48d0,0x48d0,0x48dd,0x48dd,0x48ed,0x48ed,0x48f3,0x48f3,0x48fa,0x48fa,0x4906,0x4906,0x4911,0x4911,0x491e,0x491e,0x4925,0x4925,0x492a,0x492a,0x492d,0x492d,0x492f,0x4930,0x4935,0x4935,0x493c,0x493c,0x493e,0x493e,0x4945,0x4945,0x4951,0x4951,0x4953,0x4953,0x4965,0x4965,0x496a,0x496a,0x4972,0x4972,0x4989,0x4989,0x49a1,0x49a1,0x49a7,0x49a7,0x49df,0x49df,0x49e5,0x49e5,0x49e7,0x49e7,0x4a0f,0x4a0f,0x4a1d,0x4a1d,0x4a24,0x4a24,0x4a35,0x4a35,0x4a96,0x4a96,0x4aa4,0x4aa4,0x4ab4,0x4ab4,0x4ab8,0x4ab8,0x4ad1,0x4ad1,0x4ae4,0x4ae4,0x4aff,0x4aff,0x4b10,0x4b10,0x4b19,0x4b19,0x4b20,0x4b20,0x4b2c,0x4b2c,0x4b37,0x4b37,0x4b6f,0x4b70,0x4b72,0x4b72,0x4b7b,0x4b7b,0x4b7e,0x4b7e,0x4b8e,0x4b8e,0x4b90,0x4b90,0x4b93,0x4b93,0x4b96,0x4b97,0x4b9d,0x4b9d,0x4bbd,0x4bbe,0x4bc0,0x4bc0,0x4c04,0x4c04,0x4c07,0x4c07,0x4c0e,0x4c0e,0x4c32,0x4c32,0x4c3b,0x4c3b,0x4c3e,0x4c3e,0x4c40,0x4c40,0x4c47,0x4c47,0x4c57,0x4c57,0x4c5b,0x4c5b,0x4c6d,0x4c6d,0x4c77,0x4c77,0x4c7b,0x4c7b,0x4c7d,0x4c7d,0x4c81,0x4c81,0x4c85,0x4c85,0x4ca4,0x4ca4,0x4cae,0x4cae,0x4cb0,0x4cb0,0x4cb7,0x4cb7,0x4ccd,0x4ccd,0x4ce1,0x4ce2,0x4ced,0x4ced,0x4d07,0x4d07,0x4d09,0x4d09,0x4d10,0x4d10,0x4d34,0x4d34,0x4d76,0x4d77,0x4d89,0x4d89,0x4d91,0x4d91,0x4d9c,0x4d9c,0x4e00,0x4e01,0x4e03,0x4e04,0x4e07,0x4e11,0x4e14,0x4e16,0x4e18,0x4e1a,0x4e1c,0x4e1c,0x4e1e,0x4e1f,0x4e21,0x4e22,0x4e24,0x4e24,0x4e26,0x4e26,0x4e28,0x4e28,0x4e2a,0x4e33,0x4e36,0x4e39,0x4e3b,0x4e3d,0x4e3f,0x4e3f,0x4e42,0x4e43,0x4e45,0x4e45,0x4e47,0x4e49,0x4e4b,0x4e4b,0x4e4d,0x4e4f,0x4e52,0x4e53,0x4e56,0x4e56,0x4e58,0x4e5f,0x4e69,0x4e6a,0x4e73,0x4e73,0x4e78,0x4e78,0x4e7e,0x4e89,0x4e8b,0x4e8e,0x4e91,0x4e95,0x4e98,0x4e9b,0x4e9e,0x4ea6,0x4ea8,0x4ea8,0x4eab,0x4eae,0x4eb3,0x4eb3,0x4eb6,0x4eb7,0x4eb9,0x4ebc,0x4ebf,0x4ec4,0x4ec6,0x4ecb,0x4ecd,0x4ece,0x4ed4,0x4eda,0x4edc,0x4edf,0x4ee1,0x4ee1,0x4ee3,0x4ee5,0x4ee8,0x4eeb,0x4eee,0x4eee,0x4ef0,0x4ef8,0x4efb,0x4efb,0x4efd,0x4efd,0x4eff,0x4f05,0x4f08,0x4f0b,0x4f0d,0x4f15,0x4f17,0x4f1a,0x4f1d,0x4f1d,0x4f22,0x4f22,0x4f28,0x4f29,0x4f2c,0x4f2d,0x4f2f,0x4f30,0x4f32,0x4f34,0x4f36,0x4f3f,0x4f41,0x4f43,0x4f45,0x4f49,0x4f4b,0x4f64,0x4f67,0x4f67,0x4f69,0x4f6c,0x4f6e,0x4f70,0x4f72,0x4f8b,0x4f8d,0x4f8d,0x4f8f,0x4f92,0x4f94,0x4f98,0x4f9a,0x4f9e,0x4fa2,0x4fa2,0x4fa8,0x4fa8,0x4fab,0x4fab,0x4fae,0x4fb0,0x4fb2,0x4fb7,0x4fb9,0x4fbb,0x4fbd,0x4fbd,0x4fbf,0x4fc5,0x4fc7,0x4fd1,0x4fd3,0x4fd4,0x4fd6,0x4fe1,0x4fe4,0x4fe5,0x4fec,0x4fec,0x4fee,0x4ffa,0x4ffd,0x4ffe,0x5000,0x5000,0x5003,0x5003,0x5005,0x5009,0x500b,0x500f,0x5011,0x501c,0x501e,0x5023,0x5025,0x5031,0x5033,0x5035,0x5037,0x5037,0x503b,0x503c,0x5040,0x5041,0x5043,0x5043,0x5045,0x504f,0x5051,0x5051,0x5053,0x5053,0x5055,0x5058,0x505a,0x5066,0x5068,0x5070,0x5072,0x5077,0x507a,0x507a,0x507d,0x507d,0x5080,0x5083,0x5085,0x5085,0x5087,0x5088,0x508b,0x508e,0x5090,0x5092,0x5094,0x5096,0x5098,0x509e,0x50a2,0x50a3,0x50a6,0x50a6,0x50ac,0x50b8,0x50ba,0x50bf,0x50c1,0x50c2,0x50c4,0x50cb,0x50cd,0x50d1,0x50d3,0x50d7,0x50d9,0x50db,0x50dd,0x50dd,0x50df,0x50e1,0x50e3,0x50ea,0x50ec,0x50f1,0x50f3,0x50f6,0x50f8,0x50f9,0x50fb,0x510e,0x5110,0x5115,0x5117,0x5118,0x511a,0x511a,0x511c,0x511c,0x511f,0x5122,0x5124,0x5126,0x5129,0x512b,0x512d,0x512e,0x5130,0x5135,0x5137,0x513d,0x513f,0x5141,0x5143,0x5149,0x514b,0x514d,0x5151,0x5152,0x5154,0x5157,0x5159,0x5163,0x5165,0x5165,0x5167,0x516e,0x5171,0x5171,0x5174,0x5179,0x517c,0x517c,0x5180,0x5180,0x5182,0x5182,0x5186,0x518a,0x518d,0x518d,0x518f,0x518f,0x5191,0x5198,0x519a,0x519a,0x519c,0x519c,0x519e,0x519e,0x51a0,0x51a0,0x51a2,0x51a2,0x51a4,0x51a5,0x51a7,0x51a8,0x51aa,0x51ac,0x51ae,0x51ae,0x51b0,0x51b9,0x51bc,0x51be,0x51c3,0x51d4,0x51d7,0x51d8,0x51db,0x51e2,0x51e4,0x51e4,0x51ed,0x51ed,0x51f0,0x51f1,0x51f3,0x51f6,0x51f8,0x51fa,0x51fc,0x51fe,0x5200,0x5203,0x5205,0x520c,0x520e,0x520e,0x5210,0x5213,0x5216,0x5217,0x521c,0x5221,0x5224,0x522a,0x522e,0x522e,0x5230,0x5238,0x523a,0x523c,0x5241,0x5241,0x5243,0x5244,0x5246,0x5247,0x5249,0x524f,0x5252,0x5252,0x5254,0x5257,0x5259,0x5262,0x5268,0x526f,0x5272,0x5275,0x5277,0x527d,0x527f,0x5284,0x5287,0x528d,0x528f,0x5291,0x5293,0x5294,0x5296,0x529b,0x529f,0x52a1,0x52a3,0x52a4,0x52a6,0x52a6,0x52a8,0x52ae,0x52b5,0x52b5,0x52b9,0x52b9,0x52bb,0x52bc,0x52be,0x52be,0x52c0,0x52c3,0x52c5,0x52c5,0x52c7,0x52c7,0x52c9,0x52c9,0x52cc,0x52cd,0x52d0,0x52d3,0x52d5,0x52d9,0x52db,0x52db,0x52dd,0x52e4,0x52e6,0x52e6,0x52e9,0x52e9,0x52eb,0x52eb,0x52ef,0x52f1,0x52f3,0x52f5,0x52f7,0x52fc,0x52fe,0x52ff,0x5301,0x5301,0x5305,0x5306,0x5308,0x530b,0x530d,0x5312,0x5315,0x5317,0x5319,0x531a,0x531c,0x531d,0x531f,0x5324,0x5327,0x5327,0x532a,0x532a,0x532c,0x532d,0x532f,0x5334,0x5337,0x5339,0x533b,0x5345,0x5347,0x534a,0x534c,0x534e,0x5351,0x5354,0x5357,0x5357,0x535a,0x535a,0x535c,0x5361,0x5363,0x5364,0x5366,0x5367,0x5369,0x5369,0x536c,0x5375,0x5377,0x5379,0x537b,0x537f,0x5382,0x5382,0x5384,0x5384,0x538a,0x538a,0x538e,0x538f,0x5392,0x5394,0x5396,0x539a,0x539c,0x53a0,0x53a2,0x53a2,0x53a4,0x53ae,0x53b0,0x53b0,0x53b2,0x53b2,0x53b4,0x53b4,0x53b6,0x53b6,0x53b9,0x53b9,0x53bb,0x53bb,0x53c1,0x53c3,0x53c5,0x53c5,0x53c8,0x53cd,0x53d0,0x53d2,0x53d4,0x53d4,0x53d6,0x53db,0x53df,0x53e6,0x53e8,0x53f3,0x53f5,0x53f8,0x53fb,0x53fc,0x53fe,0x53fe,0x5401,0x5401,0x5403,0x5404,0x5406,0x5414,0x5416,0x5416,0x5418,0x5421,0x5423,0x5439,0x543b,0x5443,0x5445,0x5448,0x544a,0x544f,0x5454,0x5454,0x5460,0x546d,0x546f,0x5478,0x547a,0x5482,0x5484,0x5488,0x548b,0x5498,0x549a,0x549a,0x549c,0x549c,0x549e,0x549e,0x54a0,0x54b4,0x54b6,0x54c9,0x54cb,0x54d0,0x54d6,0x54d6,0x54da,0x54da,0x54de,0x54de,0x54e0,0x54eb,0x54ed,0x54ef,0x54f1,0x54f3,0x54f7,0x54f8,0x54fa,0x54fd,0x54ff,0x54ff,0x5501,0x5514,0x5517,0x5518,0x551a,0x551a,0x551e,0x551e,0x5523,0x5523,0x5525,0x5528,0x552a,0x5539,0x553b,0x553c,0x553e,0x5541,0x5543,0x554b,0x554d,0x5553,0x5555,0x5557,0x555c,0x555f,0x5561,0x5566,0x5569,0x556b,0x5571,0x5573,0x5575,0x5577,0x5579,0x5579,0x557b,0x5584,0x5586,0x5595,0x5598,0x559a,0x559c,0x559d,0x559f,0x559f,0x55a1,0x55ae,0x55b0,0x55b5,0x55b9,0x55bc,0x55bf,0x55df,0x55e1,0x55ea,0x55ec,0x55ec,0x55ee,0x55f2,0x55f5,0x55f7,0x55f9,0x5602,0x5604,0x5606,0x5608,0x5609,0x560c,0x5617,0x561b,0x5623,0x5625,0x5625,0x5627,0x5627,0x5629,0x562a,0x562c,0x5630,0x5632,0x563b,0x563d,0x5643,0x5645,0x5646,0x5648,0x564a,0x564c,0x5650,0x5652,0x5654,0x5657,0x565a,0x565d,0x565e,0x5660,0x5666,0x5668,0x5674,0x5676,0x567c,0x567e,0x5687,0x5689,0x5690,0x5692,0x5693,0x5695,0x5695,0x5697,0x569a,0x569c,0x569f,0x56a1,0x56a1,0x56a4,0x56a8,0x56aa,0x56af,0x56b1,0x56b7,0x56b9,0x56b9,0x56bc,0x56c3,0x56c5,0x56c6,0x56c8,0x56cd,0x56d1,0x56d1,0x56d3,0x56d4,0x56d6,0x56d7,0x56da,0x56db,0x56dd,0x56e2,0x56e4,0x56e5,0x56e7,0x56e7,0x56ea,0x56eb,0x56ed,0x56f1,0x56f7,0x56f7,0x56f9,0x56fb,0x56fd,0x56fd,0x56ff,0x5704,0x5707,0x570d,0x5712,0x5716,0x5718,0x5718,0x571a,0x5720,0x5722,0x5723,0x5728,0x572a,0x572c,0x5730,0x5732,0x5734,0x573b,0x573b,0x573d,0x5743,0x5745,0x5747,0x5749,0x5752,0x5754,0x5754,0x5757,0x5757,0x575b,0x575b,0x575f,0x575f,0x5761,0x5762,0x5764,0x5764,0x5766,0x576b,0x576d,0x576d,0x576f,0x5777,0x577a,0x5780,0x5782,0x5783,0x5788,0x5788,0x578a,0x578d,0x578f,0x5790,0x5793,0x5795,0x5797,0x57a5,0x57a7,0x57a7,0x57aa,0x57aa,0x57ae,0x57ae,0x57b3,0x57b6,0x57b8,0x57bf,0x57c1,0x57c4,0x57c6,0x57c8,0x57cb,0x57cc,0x57ce,0x57d0,0x57d2,0x57d2,0x57d4,0x57d5,0x57d7,0x57d7,0x57dc,0x57e7,0x57e9,0x57e9,0x57ec,0x57fe,0x5800,0x580e,0x5810,0x5810,0x5812,0x5812,0x5814,0x5814,0x5818,0x5819,0x581b,0x581e,0x5820,0x582a,0x582c,0x583b,0x583d,0x583d,0x583f,0x5840,0x5844,0x5844,0x5847,0x584f,0x5851,0x5855,0x5857,0x585f,0x5862,0x5865,0x5868,0x5869,0x586b,0x586d,0x586f,0x586f,0x5871,0x5876,0x5879,0x5883,0x5885,0x588b,0x588e,0x5894,0x5896,0x5896,0x5898,0x589a,0x589c,0x58a1,0x58a3,0x58a3,0x58a5,0x58ac,0x58ae,0x58b1,0x58b3,0x58b3,0x58b5,0x58b6,0x58ba,0x58bf,0x58c1,0x58c2,0x58c5,0x58c9,0x58cb,0x58cb,0x58ce,0x58d6,0x58d8,0x58e0,0x58e2,0x58e4,0x58e7,0x58e9,0x58eb,0x58ec,0x58ef,0x58f0,0x58f2,0x58f4,0x58f9,0x58ff,0x5902,0x5907,0x590a,0x590a,0x590c,0x590f,0x5911,0x5912,0x5914,0x5917,0x5919,0x591a,0x591c,0x591d,0x591f,0x5920,0x5922,0x5922,0x5924,0x5925,0x5927,0x5927,0x5929,0x592f,0x5931,0x5932,0x5934,0x5934,0x5937,0x5938,0x593c,0x593c,0x593e,0x593e,0x5940,0x5940,0x5944,0x5945,0x5947,0x594a,0x594e,0x5951,0x5953,0x5955,0x5957,0x5958,0x595a,0x595a,0x595c,0x595c,0x5960,0x5962,0x5965,0x5965,0x5967,0x5967,0x5969,0x596e,0x5970,0x5979,0x597b,0x5985,0x5989,0x598a,0x598d,0x5990,0x5992,0x5994,0x5996,0x599a,0x599d,0x59a8,0x59ac,0x59ac,0x59ae,0x59c1,0x59c3,0x59d4,0x59d6,0x59d6,0x59d8,0x59de,0x59e0,0x59e1,0x59e3,0x59e6,0x59e8,0x5a03,0x5a09,0x5a0d,0x5a0f,0x5a0f,0x5a11,0x5a13,0x5a15,0x5a1c,0x5a1e,0x5a21,0x5a23,0x5a25,0x5a27,0x5a27,0x5a29,0x5a2e,0x5a33,0x5a33,0x5a35,0x5a39,0x5a3c,0x5a3e,0x5a40,0x5a4a,0x5a4c,0x5a4d,0x5a50,0x5a6e,0x5a70,0x5a71,0x5a77,0x5a7f,0x5a81,0x5a84,0x5a86,0x5a86,0x5a88,0x5a88,0x5a8a,0x5a8c,0x5a8e,0x5a97,0x5a99,0x5aa2,0x5aa4,0x5aa7,0x5aa9,0x5aac,0x5aae,0x5ac4,0x5ac6,0x5acf,0x5ad1,0x5ad1,0x5ad3,0x5ad3,0x5ad5,0x5ae6,0x5ae8,0x5aee,0x5af0,0x5af0,0x5af2,0x5afb,0x5afd,0x5aff,0x5b01,0x5b03,0x5b05,0x5b05,0x5b07,0x5b09,0x5b0b,0x5b0d,0x5b0f,0x5b11,0x5b13,0x5b17,0x5b19,0x5b1b,0x5b1d,0x5b21,0x5b23,0x5b28,0x5b2a,0x5b30,0x5b32,0x5b32,0x5b34,0x5b34,0x5b38,0x5b38,0x5b3c,0x5b41,0x5b43,0x5b48,0x5b4a,0x5b51,0x5b53,0x5b58,0x5b5a,0x5b5d,0x5b5f,0x5b5f,0x5b62,0x5b66,0x5b68,0x5b69,0x5b6b,0x5b6e,0x5b70,0x5b78,0x5b7a,0x5b7d,0x5b7f,0x5b85,0x5b87,0x5b89,0x5b8b,0x5b8c,0x5b8e,0x5b90,0x5b92,0x5b93,0x5b95,0x5b9f,0x5ba2,0x5ba8,0x5baa,0x5baa,0x5bac,0x5bae,0x5bb0,0x5bb0,0x5bb3,0x5bb9,0x5bbf,0x5bc7,0x5bca,0x5bce,0x5bd0,0x5bd9,0x5bdb,0x5bdb,0x5bde,0x5bec,0x5bee,0x5bf3,0x5bf5,0x5bf6,0x5bf8,0x5bf8,0x5bfa,0x5bfa,0x5bff,0x5bff,0x5c01,0x5c01,0x5c03,0x5c05,0x5c07,0x5c16,0x5c1a,0x5c1a,0x5c1c,0x5c1c,0x5c1e,0x5c20,0x5c22,0x5c25,0x5c28,0x5c28,0x5c2a,0x5c2a,0x5c2c,0x5c2c,0x5c30,0x5c31,0x5c33,0x5c33,0x5c37,0x5c3c,0x5c3e,0x5c41,0x5c44,0x5c51,0x5c53,0x5c56,0x5c58,0x5c59,0x5c5c,0x5c5e,0x5c60,0x5c60,0x5c62,0x5c65,0x5c67,0x5c6a,0x5c6c,0x5c6f,0x5c71,0x5c71,0x5c73,0x5c74,0x5c78,0x5c7c,0x5c7e,0x5c7e,0x5c85,0x5c86,0x5c88,0x5c8d,0x5c8f,0x5c95,0x5c99,0x5c9a,0x5c9c,0x5cb1,0x5cb3,0x5cb3,0x5cb5,0x5cb8,0x5cba,0x5cba,0x5cc1,0x5cc2,0x5cc6,0x5ccc,0x5cce,0x5cdb,0x5cde,0x5cdf,0x5ce5,0x5ce5,0x5ce8,0x5cea,0x5cec,0x5cf1,0x5cf4,0x5cf9,0x5cfb,0x5cfd,0x5cff,0x5d01,0x5d06,0x5d07,0x5d0b,0x5d12,0x5d14,0x5d1b,0x5d1d,0x5d20,0x5d22,0x5d29,0x5d2c,0x5d2c,0x5d2e,0x5d3a,0x5d3c,0x5d43,0x5d45,0x5d4c,0x5d4e,0x5d4e,0x5d50,0x5d52,0x5d55,0x5d57,0x5d59,0x5d59,0x5d5b,0x5d5b,0x5d5e,0x5d5e,0x5d62,0x5d63,0x5d65,0x5d65,0x5d67,0x5d69,0x5d6b,0x5d6c,0x5d6f,0x5d72,0x5d74,0x5d74,0x5d77,0x5d82,0x5d84,0x5d8b,0x5d8d,0x5d8e,0x5d92,0x5d95,0x5d97,0x5d97,0x5d99,0x5d9a,0x5d9c,0x5da2,0x5da4,0x5da4,0x5da7,0x5db2,0x5db4,0x5dba,0x5dbc,0x5dbd,0x5dc0,0x5dc3,0x5dc6,0x5dc7,0x5dc9,0x5dc9,0x5dcb,0x5dcb,0x5dcd,0x5dcd,0x5dcf,0x5dcf,0x5dd1,0x5dd2,0x5dd4,0x5dd8,0x5ddb,0x5ddb,0x5ddd,0x5de2,0x5de5,0x5de8,0x5deb,0x5deb,0x5dee,0x5dee,0x5df0,0x5df5,0x5df7,0x5df7,0x5df9,0x5df9,0x5dfd,0x5dff,0x5e02,0x5e04,0x5e06,0x5e06,0x5e09,0x5e0c,0x5e0e,0x5e0e,0x5e11,0x5e12,0x5e14,0x5e1b,0x5e1d,0x5e1d,0x5e1f,0x5e25,0x5e28,0x5e29,0x5e2b,0x5e2b,0x5e2d,0x5e2e,0x5e33,0x5e34,0x5e36,0x5e38,0x5e3d,0x5e3e,0x5e40,0x5e45,0x5e48,0x5e48,0x5e4a,0x5e4f,0x5e53,0x5e55,0x5e57,0x5e59,0x5e5b,0x5e63,0x5e66,0x5e70,0x5e72,0x5e76,0x5e78,0x5e80,0x5e82,0x5e84,0x5e86,0x5e8d,0x5e8f,0x5e8f,0x5e92,0x5e92,0x5e95,0x5e97,0x5e99,0x5e9c,0x5ea0,0x5ea0,0x5ea2,0x5ea8,0x5eaa,0x5eae,0x5eb0,0x5eb9,0x5ebd,0x5ebe,0x5ec1,0x5ec2,0x5ec4,0x5ece,0x5ed0,0x5ee3,0x5ee5,0x5ee9,0x5eec,0x5eec,0x5eee,0x5eef,0x5ef1,0x5ef4,0x5ef6,0x5efc,0x5efe,0x5eff,0x5f01,0x5f02,0x5f04,0x5f05,0x5f07,0x5f08,0x5f0a,0x5f0f,0x5f12,0x5f15,0x5f17,0x5f18,0x5f1a,0x5f1b,0x5f1d,0x5f1d,0x5f1f,0x5f1f,0x5f22,0x5f29,0x5f2d,0x5f2e,0x5f30,0x5f31,0x5f33,0x5f33,0x5f35,0x5f38,0x5f3a,0x5f3c,0x5f40,0x5f40,0x5f43,0x5f46,0x5f48,0x5f51,0x5f54,0x5f54,0x5f56,0x5f59,0x5f5c,0x5f5e,0x5f61,0x5f65,0x5f67,0x5f67,0x5f69,0x5f6d,0x5f6f,0x5f74,0x5f76,0x5f79,0x5f7b,0x5f83,0x5f85,0x5f8c,0x5f90,0x5f92,0x5f96,0x5f99,0x5f9b,0x5f9c,0x5f9e,0x5fa1,0x5fa4,0x5faf,0x5fb1,0x5fb2,0x5fb5,0x5fb7,0x5fb9,0x5fc5,0x5fc9,0x5fc9,0x5fcc,0x5fcd,0x5fcf,0x5fd2,0x5fd4,0x5fd9,0x5fdb,0x5fdb,0x5fdd,0x5fe1,0x5fe3,0x5fe5,0x5fe8,0x5fe8,0x5fea,0x5feb,0x5fed,0x5fef,0x5ff1,0x5ff1,0x5ff3,0x5ff5,0x5ff7,0x5ff8,0x5ffa,0x5ffb,0x5ffd,0x5ffd,0x5fff,0x6000,0x6009,0x6017,0x6019,0x601e,0x6020,0x602f,0x6031,0x6035,0x6037,0x6037,0x6039,0x6039,0x603b,0x603b,0x6040,0x6047,0x6049,0x604d,0x6050,0x6050,0x6052,0x6055,0x6058,0x605b,0x605d,0x605f,0x6062,0x6070,0x6072,0x6072,0x6075,0x6075,0x6077,0x6077,0x607e,0x6081,0x6083,0x608a,0x608c,0x608e,0x6090,0x6090,0x6092,0x6092,0x6094,0x6097,0x609a,0x60a0,0x60a2,0x60a4,0x60a6,0x60a8,0x60b0,0x60c1,0x60c3,0x60cf,0x60d1,0x60d1,0x60d3,0x60d5,0x60d7,0x60e4,0x60e6,0x60e9,0x60f0,0x6101,0x6103,0x6110,0x6112,0x6116,0x6118,0x611d,0x611f,0x6120,0x6122,0x6123,0x6127,0x6129,0x612b,0x612c,0x612e,0x6130,0x6132,0x6132,0x6134,0x6134,0x6136,0x6137,0x613b,0x613b,0x613d,0x6142,0x6144,0x6150,0x6152,0x6156,0x6158,0x6168,0x616a,0x616c,0x616e,0x6177,0x6179,0x617a,0x617c,0x617e,0x6180,0x6183,0x6187,0x6187,0x6189,0x618e,0x6190,0x6196,0x6198,0x619d,0x619f,0x619f,0x61a1,0x61a2,0x61a4,0x61a4,0x61a7,0x61ba,0x61bc,0x61bc,0x61be,0x61c3,0x61c5,0x61cd,0x61cf,0x61d0,0x61d3,0x61d3,0x61d6,0x61d6,0x61d8,0x61d8,0x61da,0x61da,0x61de,0x61e0,0x61e2,0x61eb,0x61ed,0x61ee,0x61f0,0x61f2,0x61f5,0x6201,0x6203,0x6204,0x6207,0x620a,0x620c,0x620e,0x6210,0x6212,0x6214,0x6216,0x6219,0x621b,0x621f,0x6225,0x6227,0x6227,0x6229,0x622e,0x6230,0x6230,0x6232,0x6234,0x6236,0x6237,0x6239,0x623a,0x623d,0x6243,0x6246,0x624e,0x6250,0x6254,0x6258,0x625c,0x625e,0x625e,0x6260,0x6266,0x6268,0x6268,0x626d,0x6274,0x6276,0x6277,0x6279,0x628a,0x628c,0x628c,0x628e,0x6298,0x629d,0x629d,0x62a4,0x62a4,0x62a6,0x62a6,0x62a8,0x62b1,0x62b3,0x62b6,0x62b8,0x62b9,0x62bb,0x62bf,0x62c1,0x62dc,0x62df,0x62df,0x62e5,0x62e5,0x62eb,0x6303,0x6307,0x6309,0x630b,0x6311,0x6313,0x6316,0x6318,0x6318,0x6328,0x632f,0x6331,0x633e,0x6340,0x6351,0x6354,0x635a,0x635d,0x635d,0x6364,0x6365,0x6367,0x6369,0x636b,0x6372,0x6375,0x637d,0x637f,0x6385,0x6387,0x6392,0x6394,0x6394,0x6396,0x6399,0x639b,0x63a5,0x63a7,0x63b1,0x63b9,0x63b9,0x63bd,0x63be,0x63c0,0x63d3,0x63d5,0x63eb,0x63ed,0x63f6,0x63f8,0x63f9,0x63fb,0x63fc,0x63fe,0x63fe,0x6406,0x6407,0x6409,0x6410,0x6412,0x6418,0x641a,0x641c,0x641e,0x6428,0x642a,0x6430,0x6432,0x643b,0x643d,0x6441,0x6443,0x6443,0x644b,0x644b,0x644d,0x644e,0x6450,0x6454,0x6458,0x6461,0x6465,0x6469,0x646b,0x647d,0x647f,0x647f,0x6482,0x6482,0x6485,0x6485,0x6487,0x648d,0x648f,0x6493,0x6495,0x649a,0x649c,0x64a0,0x64a2,0x64a6,0x64a9,0x64a9,0x64ab,0x64b4,0x64b6,0x64b6,0x64bb,0x64c5,0x64c7,0x64c7,0x64c9,0x64cb,0x64cd,0x64d0,0x64d2,0x64d4,0x64d6,0x64db,0x64dd,0x64dd,0x64e0,0x64ed,0x64ef,0x64f4,0x64f7,0x64f8,0x64fa,0x6501,0x6503,0x6504,0x6506,0x6507,0x6509,0x650a,0x650c,0x6511,0x6513,0x6519,0x651b,0x6526,0x6529,0x6530,0x6532,0x6539,0x653b,0x653b,0x653d,0x653f,0x6541,0x6541,0x6543,0x6543,0x6545,0x6546,0x6548,0x654a,0x654d,0x654d,0x654f,0x654f,0x6551,0x6551,0x6553,0x655a,0x655c,0x655f,0x6562,0x6568,0x656a,0x656d,0x656f,0x656f,0x6572,0x657c,0x657f,0x6589,0x658b,0x658c,0x6590,0x6592,0x6594,0x6597,0x6599,0x6599,0x659b,0x65a2,0x65a4,0x65a5,0x65a7,0x65a8,0x65aa,0x65ac,0x65ae,0x65b0,0x65b2,0x65b3,0x65b5,0x65b9,0x65bb,0x65bf,0x65c1,0x65c6,0x65cb,0x65d4,0x65d6,0x65d7,0x65da,0x65db,0x65dd,0x65e3,0x65e5,0x65e6,0x65e8,0x65e9,0x65ec,0x65f5,0x65fa,0x65fd,0x65ff,0x6600,0x6602,0x6615,0x6618,0x6618,0x661c,0x6628,0x662b,0x662b,0x662d,0x6636,0x6639,0x663a,0x6641,0x6645,0x6647,0x664d,0x664f,0x664f,0x6651,0x6653,0x6657,0x6657,0x6659,0x6668,0x666a,0x666c,0x666e,0x6674,0x6676,0x667e,0x6680,0x6680,0x6684,0x668e,0x6690,0x6692,0x6694,0x669a,0x669d,0x669d,0x669f,0x66a2,0x66a4,0x66a4,0x66a8,0x66ab,0x66ad,0x66bb,0x66bd,0x66c0,0x66c4,0x66c4,0x66c6,0x66cf,0x66d2,0x66d2,0x66d6,0x66d6,0x66d8,0x66de,0x66e0,0x66e0,0x66e3,0x66e4,0x66e6,0x66e9,0x66eb,0x66ee,0x66f0,0x66f4,0x66f6,0x66f9,0x66fc,0x66fc,0x66fe,0x6705,0x6708,0x6710,0x6712,0x6719,0x671b,0x671b,0x671d,0x6723,0x6725,0x6728,0x672a,0x672e,0x6731,0x6731,0x6733,0x6736,0x6738,0x673f,0x6744,0x6749,0x674b,0x6751,0x6753,0x6753,0x6755,0x6757,0x6759,0x675a,0x675c,0x6762,0x6767,0x6767,0x676a,0x677f,0x6781,0x6787,0x6789,0x6789,0x678b,0x6795,0x6797,0x679a,0x679c,0x679d,0x679f,0x67a0,0x67a4,0x67a4,0x67ac,0x67ac,0x67ae,0x67bb,0x67bf,0x67c6,0x67c8,0x67d4,0x67d6,0x67df,0x67e2,0x67e7,0x67e9,0x67fa,0x67fc,0x67fc,0x67fe,0x6804,0x680d,0x680d,0x6810,0x6810,0x6812,0x6814,0x6816,0x6818,0x681a,0x6822,0x6825,0x6826,0x6828,0x682b,0x682d,0x682f,0x6831,0x683e,0x6840,0x6851,0x6853,0x6856,0x685d,0x685d,0x6865,0x6865,0x686b,0x686b,0x686d,0x686f,0x6871,0x6872,0x6874,0x6879,0x687b,0x688c,0x688f,0x6894,0x6896,0x6898,0x689b,0x689d,0x689f,0x68a4,0x68a6,0x68b6,0x68b9,0x68b9,0x68bd,0x68bd,0x68c1,0x68c1,0x68c3,0x68ce,0x68d0,0x68d8,0x68da,0x68da,0x68dc,0x68e1,0x68e3,0x68e4,0x68e6,0x68ec,0x68ee,0x68fd,0x6900,0x6915,0x6917,0x691b,0x6925,0x6925,0x692a,0x692a,0x692c,0x692c,0x692f,0x6930,0x6932,0x6939,0x693b,0x6946,0x6948,0x694c,0x694e,0x694f,0x6951,0x697b,0x6980,0x6980,0x6982,0x6983,0x6985,0x6986,0x698a,0x698a,0x698d,0x698e,0x6990,0x6991,0x6993,0x699c,0x699e,0x69b7,0x69b9,0x69b9,0x69bb,0x69c4,0x69c6,0x69c6,0x69c9,0x69d1,0x69d3,0x69d6,0x69d9,0x69d9,0x69e1,0x69e2,0x69e4,0x69e9,0x69eb,0x69ee,0x69f1,0x69f4,0x69f6,0x6a0d,0x6a0f,0x6a0f,0x6a11,0x6a11,0x6a13,0x6a21,0x6a23,0x6a23,0x6a25,0x6a29,0x6a2b,0x6a2d,0x6a32,0x6a35,0x6a38,0x6a41,0x6a43,0x6a49,0x6a4b,0x6a5b,0x6a5d,0x6a6b,0x6a6d,0x6a6d,0x6a6f,0x6a6f,0x6a71,0x6a71,0x6a74,0x6a74,0x6a76,0x6a76,0x6a7a,0x6a7a,0x6a7e,0x6a85,0x6a87,0x6a87,0x6a89,0x6a8a,0x6a8c,0x6a97,0x6a99,0x6aa8,0x6aab,0x6aaf,0x6ab1,0x6abb,0x6abd,0x6abe,0x6ac2,0x6ac3,0x6ac5,0x6acd,0x6acf,0x6ad1,0x6ad3,0x6ad4,0x6ad8,0x6ae1,0x6ae5,0x6ae5,0x6ae7,0x6ae8,0x6aea,0x6aec,0x6aee,0x6af1,0x6af3,0x6af3,0x6af6,0x6af6,0x6af8,0x6afc,0x6b00,0x6b00,0x6b02,0x6b05,0x6b08,0x6b0b,0x6b0f,0x6b13,0x6b16,0x6b1a,0x6b1d,0x6b1e,0x6b20,0x6b21,0x6b23,0x6b23,0x6b25,0x6b25,0x6b28,0x6b28,0x6b2c,0x6b2d,0x6b2f,0x6b2f,0x6b31,0x6b3f,0x6b41,0x6b43,0x6b45,0x6b4e,0x6b50,0x6b52,0x6b54,0x6b57,0x6b59,0x6b59,0x6b5b,0x6b5c,0x6b5e,0x6b67,0x6b6a,0x6b6a,0x6b6d,0x6b6d,0x6b6f,0x6b6f,0x6b72,0x6b72,0x6b74,0x6b74,0x6b76,0x6b7b,0x6b7e,0x6b84,0x6b86,0x6b86,0x6b88,0x6b8a,0x6b8c,0x6b8f,0x6b91,0x6b91,0x6b94,0x6b99,0x6b9b,0x6b9b,0x6b9e,0x6ba0,0x6ba2,0x6ba7,0x6baa,0x6bab,0x6bad,0x6bb0,0x6bb2,0x6bb3,0x6bb5,0x6bb7,0x6bba,0x6bba,0x6bbc,0x6bbd,0x6bbf,0x6bc1,0x6bc3,0x6bcd,0x6bcf,0x6bd0,0x6bd2,0x6bd4,0x6bd6,0x6bd8,0x6bda,0x6bdc,0x6bde,0x6bde,0x6be0,0x6be4,0x6be6,0x6be8,0x6bea,0x6bec,0x6bef,0x6bf0,0x6bf2,0x6bf3,0x6bf7,0x6c06,0x6c08,0x6c09,0x6c0b,0x6c0d,0x6c0f,0x6c11,0x6c13,0x6c16,0x6c18,0x6c1d,0x6c1f,0x6c21,0x6c23,0x6c28,0x6c2a,0x6c2c,0x6c2e,0x6c3b,0x6c3d,0x6c43,0x6c46,0x6c46,0x6c49,0x6c50,0x6c52,0x6c52,0x6c54,0x6c55,0x6c57,0x6c61,0x6c65,0x6c6b,0x6c6d,0x6c76,0x6c78,0x6c7b,0x6c7d,0x6c90,0x6c92,0x6c96,0x6c98,0x6c9d,0x6c9f,0x6c9f,0x6ca2,0x6ca2,0x6caa,0x6cb4,0x6cb6,0x6cc7,0x6cc9,0x6cd7,0x6cd9,0x6ce3,0x6ce5,0x6ce5,0x6ce7,0x6cf3,0x6cf5,0x6cf5,0x6cf9,0x6cf9,0x6cff,0x6d12,0x6d16,0x6d1b,0x6d1d,0x6d20,0x6d22,0x6d22,0x6d24,0x6d42,0x6d4e,0x6d4e,0x6d57,0x6d5c,0x6d5e,0x6d6a,0x6d6c,0x6d72,0x6d74,0x6d98,0x6d9a,0x6d9a,0x6da4,0x6da5,0x6daa,0x6dac,0x6dae,0x6daf,0x6db1,0x6db5,0x6db7,0x6dc0,0x6dc2,0x6dc2,0x6dc4,0x6dcd,0x6dcf,0x6de6,0x6de8,0x6df7,0x6df9,0x6dfe,0x6e00,0x6e00,0x6e02,0x6e05,0x6e0a,0x6e0a,0x6e0f,0x6e0f,0x6e15,0x6e15,0x6e18,0x6e1d,0x6e1f,0x6e36,0x6e38,0x6e41,0x6e43,0x6e47,0x6e49,0x6e4b,0x6e4d,0x6e69,0x6e6b,0x6e6b,0x6e6e,0x6e6f,0x6e71,0x6e74,0x6e76,0x6e79,0x6e7c,0x6e7c,0x6e86,0x6e86,0x6e88,0x6e89,0x6e8b,0x6e8b,0x6e8d,0x6e90,0x6e92,0x6e94,0x6e96,0x6ea7,0x6eaa,0x6eab,0x6eae,0x6ed6,0x6ed8,0x6edd,0x6ee2,0x6ee2,0x6ee8,0x6ee9,0x6eeb,0x6eef,0x6ef1,0x6ef2,0x6ef4,0x6f0f,0x6f12,0x6f1a,0x6f1c,0x6f1c,0x6f1e,0x6f27,0x6f29,0x6f41,0x6f43,0x6f44,0x6f4e,0x6f58,0x6f5a,0x6f64,0x6f66,0x6f67,0x6f69,0x6f70,0x6f72,0x6f74,0x6f76,0x6f82,0x6f84,0x6f8e,0x6f90,0x6f90,0x6f92,0x6f97,0x6f9d,0x6fb6,0x6fb8,0x6fc4,0x6fc6,0x6fcf,0x6fd3,0x6fd5,0x6fd8,0x6fe4,0x6fe6,0x6fe9,0x6feb,0x6ff2,0x6ff4,0x6ff4,0x6ff6,0x6ff8,0x6ffa,0x6ffc,0x6ffe,0x7001,0x7003,0x7007,0x7009,0x700f,0x7011,0x7011,0x7014,0x7024,0x7026,0x702c,0x702f,0x7035,0x7037,0x703c,0x703e,0x7046,0x7048,0x704d,0x7050,0x7052,0x7054,0x7058,0x705a,0x706c,0x706e,0x7071,0x7074,0x707a,0x707c,0x707f,0x7081,0x7086,0x7089,0x708b,0x708e,0x708f,0x7091,0x7096,0x7098,0x709a,0x709f,0x70a1,0x70a3,0x70a7,0x70a9,0x70a9,0x70ab,0x70b1,0x70b3,0x70b5,0x70b7,0x70be,0x70c0,0x70c0,0x70c4,0x70c8,0x70ca,0x70da,0x70dc,0x70e2,0x70e4,0x70e4,0x70ef,0x70f1,0x70f3,0x7100,0x7102,0x7102,0x7104,0x7106,0x7109,0x710e,0x7110,0x7110,0x7113,0x7113,0x7117,0x7117,0x7119,0x7123,0x7125,0x7126,0x7128,0x7129,0x712b,0x712c,0x712e,0x7136,0x713a,0x713b,0x713e,0x713e,0x7140,0x7147,0x7149,0x7154,0x7156,0x715a,0x715c,0x716c,0x716e,0x716e,0x7170,0x7178,0x717a,0x717e,0x7180,0x7182,0x7184,0x718a,0x718c,0x718c,0x718e,0x7192,0x7194,0x7194,0x7196,0x71a5,0x71a7,0x71aa,0x71ac,0x71ad,0x71af,0x71b5,0x71b7,0x71ba,0x71bc,0x71cb,0x71ce,0x71d2,0x71d4,0x71d6,0x71d8,0x71dd,0x71df,0x71e2,0x71e4,0x71e8,0x71eb,0x71ee,0x71f0,0x71f2,0x71f4,0x71f6,0x71f8,0x71f9,0x71fb,0x7203,0x7205,0x7207,0x7209,0x720a,0x720c,0x7210,0x7213,0x7217,0x7219,0x721b,0x721d,0x721f,0x7222,0x722e,0x7230,0x7230,0x7235,0x7236,0x7238,0x723b,0x723d,0x7242,0x7244,0x7244,0x7246,0x724c,0x724f,0x7250,0x7252,0x7253,0x7255,0x7263,0x7266,0x7267,0x7269,0x726a,0x726c,0x726c,0x726e,0x7270,0x7272,0x7274,0x7276,0x7279,0x727b,0x7282,0x7284,0x7289,0x728b,0x7298,0x729a,0x729b,0x729d,0x729f,0x72a1,0x72aa,0x72ac,0x72b0,0x72b2,0x72b2,0x72b4,0x72b5,0x72ba,0x72ba,0x72bd,0x72bd,0x72bf,0x72c6,0x72c9,0x72ce,0x72d0,0x72d2,0x72d4,0x72d4,0x72d6,0x72da,0x72dc,0x72dc,0x72df,0x72e4,0x72e6,0x72e6,0x72e8,0x72eb,0x72f3,0x72f4,0x72f6,0x7302,0x7304,0x7304,0x7307,0x7308,0x730a,0x730c,0x730f,0x7313,0x7316,0x7319,0x731b,0x731e,0x7322,0x7323,0x7325,0x732e,0x7330,0x733c,0x733e,0x7345,0x7348,0x734a,0x734c,0x7352,0x7357,0x735b,0x735d,0x7362,0x7365,0x736c,0x736e,0x7378,0x737a,0x738c,0x738e,0x738f,0x7392,0x7398,0x739c,0x73a2,0x73a4,0x73ad,0x73b2,0x73bc,0x73be,0x73c0,0x73c2,0x73d0,0x73d2,0x73de,0x73e0,0x73eb,0x73ed,0x73ef,0x73f3,0x740d,0x7411,0x7412,0x7414,0x7417,0x7419,0x7426,0x7428,0x743a,0x743c,0x743c,0x743f,0x7457,0x7459,0x7465,0x7467,0x7476,0x7479,0x747a,0x747c,0x7483,0x7485,0x748d,0x7490,0x7490,0x7492,0x7492,0x7494,0x7495,0x7497,0x74a1,0x74a3,0x74ab,0x74ad,0x74ad,0x74af,0x74b2,0x74b4,0x74bb,0x74bd,0x74c3,0x74c5,0x74c6,0x74c8,0x74c8,0x74ca,0x74cc,0x74cf,0x74d0,0x74d3,0x74e9,0x74ec,0x74ec,0x74ee,0x74ee,0x74f0,0x74f2,0x74f4,0x74f8,0x74fb,0x74fb,0x74fd,0x7500,0x7502,0x7505,0x7507,0x7508,0x750b,0x751a,0x751c,0x751f,0x7521,0x7522,0x7525,0x7526,0x7528,0x7535,0x7537,0x753b,0x753d,0x7540,0x7542,0x7542,0x7546,0x7548,0x754a,0x754f,0x7551,0x7551,0x7553,0x7555,0x7559,0x755d,0x755f,0x7560,0x7562,0x7567,0x756a,0x7570,0x7572,0x7572,0x7576,0x757a,0x757d,0x7580,0x7583,0x7584,0x7586,0x7587,0x758a,0x7592,0x7594,0x7595,0x7598,0x759a,0x759d,0x759e,0x75a2,0x75a5,0x75a7,0x75a7,0x75aa,0x75ab,0x75b0,0x75b6,0x75b8,0x75c5,0x75c7,0x75c8,0x75ca,0x75d2,0x75d4,0x75d5,0x75d7,0x75e4,0x75e6,0x75e7,0x75ed,0x75ed,0x75ef,0x7603,0x7607,0x760d,0x760f,0x7611,0x7613,0x7616,0x7619,0x7629,0x762c,0x762d,0x762f,0x7635,0x7638,0x7638,0x763a,0x763d,0x7640,0x7640,0x7642,0x7643,0x7646,0x7649,0x764c,0x7654,0x7656,0x765a,0x765c,0x765c,0x765f,0x7662,0x7664,0x7667,0x7669,0x766a,0x766c,0x7676,0x7678,0x767f,0x7681,0x7682,0x7684,0x7684,0x7686,0x768b,0x768e,0x7690,0x7692,0x7693,0x7695,0x7696,0x7699,0x769e,0x76a1,0x76a1,0x76a4,0x76a6,0x76aa,0x76ab,0x76ad,0x76b0,0x76b4,0x76b5,0x76b7,0x76b8,0x76ba,0x76bb,0x76bd,0x76bf,0x76c2,0x76c6,0x76c8,0x76ca,0x76cc,0x76ce,0x76d2,0x76d4,0x76d6,0x76d6,0x76d9,0x76df,0x76e1,0x76e1,0x76e3,0x76e7,0x76e9,0x76ea,0x76ec,0x76f5,0x76f7,0x76fc,0x76fe,0x76fe,0x7701,0x7701,0x7703,0x7705,0x7707,0x770c,0x770e,0x7713,0x7715,0x7715,0x7719,0x771b,0x771d,0x7720,0x7722,0x7729,0x772b,0x772b,0x772d,0x772d,0x772f,0x772f,0x7731,0x773e,0x7740,0x7740,0x7743,0x7747,0x774a,0x774f,0x7752,0x7752,0x7754,0x7756,0x7758,0x775c,0x775e,0x7763,0x7765,0x776f,0x7772,0x7772,0x7777,0x7785,0x7787,0x7789,0x778b,0x778f,0x7791,0x7791,0x7793,0x7793,0x7795,0x7795,0x7797,0x77a3,0x77a5,0x77a5,0x77a7,0x77a8,0x77aa,0x77ad,0x77af,0x77b7,0x77b9,0x77bf,0x77c2,0x77c5,0x77c7,0x77c7,0x77c9,0x77d0,0x77d3,0x77d5,0x77d7,0x77de,0x77e0,0x77e0,0x77e2,0x77e3,0x77e5,0x77e9,0x77ec,0x77f4,0x77f7,0x77fe,0x7802,0x7803,0x7805,0x7806,0x7808,0x7809,0x780c,0x7814,0x7818,0x7818,0x781c,0x7823,0x7825,0x7835,0x7837,0x7839,0x783c,0x783d,0x7842,0x7845,0x7847,0x784e,0x7850,0x7854,0x785c,0x785e,0x7860,0x7860,0x7862,0x7862,0x7864,0x7866,0x7868,0x7871,0x7879,0x787c,0x787e,0x7881,0x7883,0x7889,0x788c,0x788f,0x7891,0x7891,0x7893,0x789a,0x789e,0x78a5,0x78a7,0x78ad,0x78af,0x78b4,0x78b6,0x78b6,0x78b8,0x78bc,0x78be,0x78be,0x78c1,0x78c1,0x78c3,0x78c5,0x78c7,0x78d5,0x78d7,0x78d8,0x78da,0x78db,0x78dd,0x78e5,0x78e7,0x78ea,0x78ec,0x78f5,0x78f7,0x78f7,0x78f9,0x78ff,0x7901,0x7902,0x7904,0x7906,0x7909,0x7909,0x790c,0x790c,0x790e,0x790e,0x7910,0x7914,0x7917,0x7917,0x7919,0x7919,0x791b,0x791e,0x7921,0x7921,0x7923,0x792f,0x7931,0x7936,0x7938,0x7942,0x7944,0x794c,0x794f,0x7965,0x7967,0x796b,0x796d,0x796d,0x7970,0x7974,0x7979,0x797a,0x797c,0x7983,0x7986,0x7988,0x798a,0x798b,0x798d,0x799d,0x799f,0x79a2,0x79a4,0x79ae,0x79b0,0x79b4,0x79b6,0x79bb,0x79bd,0x79c1,0x79c4,0x79c6,0x79c8,0x79d2,0x79d4,0x79d6,0x79d8,0x79d8,0x79dc,0x79e0,0x79e2,0x79e4,0x79e6,0x79e7,0x79e9,0x79ee,0x79f1,0x79f1,0x79f4,0x79f4,0x79f6,0x79f8,0x79fa,0x79fb,0x7a00,0x7a00,0x7a02,0x7a06,0x7a08,0x7a08,0x7a0a,0x7a0e,0x7a10,0x7a15,0x7a17,0x7a1c,0x7a1e,0x7a20,0x7a22,0x7a22,0x7a26,0x7a26,0x7a28,0x7a28,0x7a2a,0x7a32,0x7a37,0x7a37,0x7a39,0x7a40,0x7a43,0x7a4e,0x7a54,0x7a54,0x7a56,0x7a58,0x7a5a,0x7a5c,0x7a5f,0x7a62,0x7a65,0x7a65,0x7a67,0x7a69,0x7a6b,0x7a6e,0x7a70,0x7a72,0x7a74,0x7a76,0x7a78,0x7a7b,0x7a7d,0x7a81,0x7a83,0x7a8c,0x7a8f,0x7a99,0x7a9e,0x7aa0,0x7aa2,0x7aa3,0x7aa8,0x7aac,0x7aae,0x7ab8,0x7aba,0x7abc,0x7abe,0x7ac5,0x7ac7,0x7acb,0x7acf,0x7acf,0x7ad1,0x7ad1,0x7ad3,0x7ad3,0x7ad8,0x7add,0x7adf,0x7ae0,0x7ae2,0x7ae7,0x7ae9,0x7aeb,0x7aed,0x7aef,0x7af6,0x7af7,0x7af9,0x7b01,0x7b04,0x7b06,0x7b08,0x7b0c,0x7b0e,0x7b14,0x7b18,0x7b1b,0x7b1d,0x7b20,0x7b22,0x7b35,0x7b38,0x7b39,0x7b3b,0x7b3b,0x7b40,0x7b40,0x7b42,0x7b52,0x7b54,0x7b56,0x7b58,0x7b58,0x7b60,0x7b67,0x7b69,0x7b69,0x7b6c,0x7b78,0x7b7b,0x7b7b,0x7b82,0x7b82,0x7b84,0x7b85,0x7b87,0x7b88,0x7b8a,0x7b92,0x7b94,0x7b9d,0x7ba0,0x7ba4,0x7bac,0x7baf,0x7bb1,0x7bb2,0x7bb4,0x7bb5,0x7bb7,0x7bb9,0x7bbe,0x7bbe,0x7bc0,0x7bc1,0x7bc4,0x7bc7,0x7bc9,0x7bcc,0x7bce,0x7bd0,0x7bd4,0x7bd5,0x7bd8,0x7bec,0x7bf0,0x7bf4,0x7bf7,0x7c03,0x7c05,0x7c07,0x7c09,0x7c12,0x7c15,0x7c15,0x7c19,0x7c19,0x7c1b,0x7c23,0x7c25,0x7c2d,0x7c30,0x7c30,0x7c33,0x7c33,0x7c35,0x7c35,0x7c37,0x7c39,0x7c3b,0x7c40,0x7c42,0x7c45,0x7c47,0x7c4a,0x7c4c,0x7c4d,0x7c50,0x7c51,0x7c53,0x7c54,0x7c56,0x7c57,0x7c59,0x7c5d,0x7c5f,0x7c60,0x7c63,0x7c67,0x7c69,0x7c70,0x7c72,0x7c75,0x7c78,0x7c81,0x7c83,0x7c86,0x7c88,0x7c8a,0x7c8c,0x7c8e,0x7c91,0x7c92,0x7c94,0x7c98,0x7c9c,0x7c9c,0x7c9e,0x7c9f,0x7ca1,0x7ca3,0x7ca5,0x7ca8,0x7cac,0x7cac,0x7cae,0x7caf,0x7cb1,0x7cb5,0x7cb8,0x7cbf,0x7cc2,0x7cc3,0x7cc5,0x7cc5,0x7cc7,0x7cce,0x7cd0,0x7cd7,0x7cd9,0x7cda,0x7cdc,0x7ce0,0x7ce2,0x7ce2,0x7ce6,0x7ce8,0x7cea,0x7cea,0x7cec,0x7cf9,0x7cfb,0x7cfe,0x7d00,0x7d22,0x7d25,0x7d25,0x7d28,0x7d29,0x7d2b,0x7d2c,0x7d2e,0x7d33,0x7d35,0x7d36,0x7d38,0x7d47,0x7d4a,0x7d4a,0x7d4d,0x7d56,0x7d58,0x7d58,0x7d5a,0x7d5f,0x7d61,0x7d63,0x7d66,0x7d6b,0x7d6d,0x7d73,0x7d79,0x7d7d,0x7d7f,0x7d81,0x7d83,0x7d86,0x7d88,0x7d89,0x7d8b,0x7d8f,0x7d91,0x7d97,0x7d9c,0x7da4,0x7da6,0x7db5,0x7db7,0x7dc2,0x7dc4,0x7dc7,0x7dc9,0x7dd0,0x7dd2,0x7dd4,0x7dd7,0x7de1,0x7de3,0x7dea,0x7dec,0x7dec,0x7dee,0x7df7,0x7df9,0x7dfe,0x7e03,0x7e03,0x7e07,0x7e17,0x7e1a,0x7e25,0x7e27,0x7e27,0x7e29,0x7e2b,0x7e2d,0x7e49,0x7e4c,0x7e4c,0x7e50,0x7e5c,0x7e5e,0x7e63,0x7e65,0x7e65,0x7e67,0x7e70,0x7e72,0x7e82,0x7e86,0x7e88,0x7e8a,0x7e8f,0x7e91,0x7e9c,0x7e9f,0x7e9f,0x7ea4,0x7ea4,0x7eac,0x7eac,0x7eba,0x7eba,0x7ec7,0x7ec7,0x7ecf,0x7ecf,0x7edf,0x7edf,0x7f06,0x7f06,0x7f36,0x7f3a,0x7f3d,0x7f41,0x7f43,0x7f45,0x7f47,0x7f55,0x7f58,0x7f58,0x7f5b,0x7f61,0x7f63,0x7f63,0x7f65,0x7f6e,0x7f70,0x7f73,0x7f75,0x7f7f,0x7f83,0x7f83,0x7f85,0x7f8f,0x7f91,0x7f97,0x7f9a,0x7f9e,0x7fa0,0x7fa9,0x7fac,0x7fc3,0x7fc5,0x7fc5,0x7fc7,0x7fc7,0x7fc9,0x7fd2,0x7fd4,0x7fd5,0x7fd7,0x7fd7,0x7fdb,0x7fe3,0x7fe5,0x7ff5,0x7ff7,0x8008,0x800b,0x8012,0x8014,0x8019,0x801b,0x8021,0x8024,0x8026,0x8028,0x802a,0x802c,0x802c,0x802e,0x8031,0x8033,0x8037,0x8039,0x8039,0x803b,0x803f,0x8043,0x8043,0x8046,0x8048,0x804a,0x804a,0x804f,0x8052,0x8054,0x8054,0x8056,0x8056,0x8058,0x8058,0x805a,0x805e,0x8061,0x8064,0x8066,0x8067,0x806c,0x806c,0x806f,0x8073,0x8075,0x8079,0x807d,0x8080,0x8082,0x8082,0x8084,0x8087,0x8089,0x808c,0x808f,0x8090,0x8092,0x8093,0x8095,0x8096,0x8098,0x809d,0x809f,0x809f,0x80a1,0x80a3,0x80a5,0x80a5,0x80a7,0x80a7,0x80a9,0x80ab,0x80ad,0x80af,0x80b1,0x80b2,0x80b4,0x80b8,0x80ba,0x80ba,0x80bc,0x80bd,0x80c2,0x80ca,0x80cc,0x80d1,0x80d4,0x80de,0x80e0,0x80e1,0x80e3,0x80e6,0x80e9,0x80e9,0x80ec,0x80ed,0x80ef,0x80f6,0x80f8,0x80fe,0x8100,0x8103,0x8105,0x810a,0x810c,0x810c,0x810e,0x810e,0x8112,0x8112,0x8114,0x811b,0x811d,0x811f,0x8121,0x8125,0x8127,0x8127,0x8129,0x812d,0x812f,0x8132,0x8134,0x8134,0x8137,0x8137,0x8139,0x813a,0x813d,0x813e,0x8142,0x8144,0x8146,0x8148,0x814a,0x8156,0x8159,0x815c,0x815e,0x815e,0x8160,0x8162,0x8164,0x8167,0x8169,0x8169,0x816b,0x8174,0x8176,0x817a,0x817c,0x817d,0x817f,0x8180,0x8182,0x8184,0x8186,0x818d,0x818f,0x818f,0x8193,0x8193,0x8195,0x8195,0x8197,0x81a0,0x81a2,0x81a3,0x81a5,0x81ac,0x81ae,0x81ae,0x81b0,0x81b7,0x81b9,0x81ca,0x81cc,0x81cd,0x81cf,0x81d2,0x81d5,0x81d5,0x81d7,0x81db,0x81dd,0x81ea,0x81ec,0x81ef,0x81f2,0x81f4,0x81f6,0x81fc,0x81fe,0x8202,0x8204,0x8205,0x8207,0x820d,0x8210,0x8212,0x8214,0x8216,0x8218,0x8218,0x821a,0x8222,0x8225,0x8226,0x8228,0x822d,0x822f,0x822f,0x8232,0x823a,0x823c,0x8240,0x8242,0x8242,0x8244,0x8245,0x8247,0x8247,0x8249,0x8249,0x824b,0x824b,0x824e,0x825c,0x825e,0x825f,0x8261,0x8266,0x8268,0x8269,0x826b,0x826f,0x8271,0x8272,0x8274,0x8280,0x8283,0x8285,0x8287,0x8287,0x828a,0x828b,0x828d,0x8294,0x8298,0x829b,0x829d,0x82b1,0x82b3,0x82c0,0x82c2,0x82c4,0x82ca,0x82ca,0x82cf,0x82d9,0x82db,0x82dc,0x82de,0x82e8,0x82ea,0x8309,0x830b,0x830d,0x8316,0x831e,0x8320,0x8320,0x8322,0x8322,0x8324,0x832d,0x832f,0x832f,0x8331,0x833d,0x833f,0x8345,0x8347,0x8354,0x8356,0x8357,0x8362,0x8363,0x8366,0x8366,0x836f,0x836f,0x8373,0x8378,0x837a,0x837f,0x8381,0x8381,0x8383,0x8383,0x8385,0x839e,0x83a0,0x83a0,0x83a2,0x83ac,0x83ae,0x83b0,0x83b9,0x83b9,0x83bd,0x83cf,0x83d1,0x83d1,0x83d3,0x83d9,0x83db,0x83e5,0x83e7,0x83f6,0x83f8,0x83ff,0x8401,0x8401,0x8403,0x8407,0x8409,0x8414,0x8416,0x8416,0x8418,0x8418,0x841b,0x841c,0x8420,0x8421,0x8423,0x8424,0x8426,0x8426,0x8429,0x8429,0x842b,0x8440,0x8442,0x844e,0x8450,0x8469,0x846b,0x847a,0x847d,0x8480,0x8482,0x8482,0x8484,0x8484,0x8486,0x8486,0x8488,0x8488,0x848d,0x8494,0x8496,0x84a4,0x84a7,0x84b2,0x84b4,0x84b4,0x84b6,0x84b6,0x84b8,0x84c2,0x84c4,0x84c7,0x84c9,0x84d4,0x84d6,0x84d7,0x84da,0x84db,0x84de,0x84de,0x84e1,0x84e2,0x84e4,0x84e5,0x84e7,0x84ec,0x84ee,0x84f4,0x84f6,0x8500,0x8502,0x851a,0x851c,0x8521,0x8523,0x8531,0x8533,0x8534,0x8538,0x8538,0x853b,0x853b,0x853d,0x853e,0x8540,0x854e,0x8551,0x855b,0x855d,0x8571,0x8573,0x8573,0x8575,0x857c,0x857e,0x857e,0x8580,0x8591,0x8593,0x85a4,0x85a6,0x85aa,0x85af,0x85b1,0x85b3,0x85ba,0x85bd,0x85c9,0x85cb,0x85cb,0x85cd,0x85d2,0x85d5,0x85da,0x85dc,0x85e6,0x85e8,0x85f2,0x85f4,0x85f4,0x85f6,0x8602,0x8604,0x8607,0x8609,0x860d,0x860f,0x8611,0x8613,0x8614,0x8616,0x861c,0x861e,0x862a,0x862c,0x862f,0x8631,0x8636,0x8638,0x863c,0x863e,0x8640,0x8642,0x8643,0x8645,0x8648,0x864b,0x864e,0x8650,0x8650,0x8652,0x8656,0x8659,0x8659,0x865b,0x865c,0x865e,0x865f,0x8661,0x8665,0x8667,0x8674,0x8677,0x8677,0x8679,0x867c,0x867e,0x867e,0x8685,0x8687,0x868a,0x868e,0x8690,0x869a,0x869c,0x869e,0x86a0,0x86a5,0x86a7,0x86aa,0x86ad,0x86ad,0x86af,0x86c9,0x86cb,0x86cc,0x86d0,0x86d1,0x86d3,0x86d4,0x86d6,0x86df,0x86e2,0x86e4,0x86e6,0x86e6,0x86e8,0x86ed,0x86ef,0x86ef,0x86f5,0x86fb,0x86fe,0x86fe,0x8700,0x870e,0x8711,0x8713,0x8715,0x8715,0x8718,0x871c,0x871e,0x871e,0x8720,0x872a,0x872c,0x872e,0x8730,0x8735,0x8737,0x8738,0x873a,0x873c,0x873e,0x8743,0x8746,0x8746,0x874c,0x8771,0x8773,0x877b,0x877d,0x877d,0x8781,0x8789,0x878b,0x878d,0x878f,0x8794,0x8796,0x8798,0x879a,0x879f,0x87a2,0x87a5,0x87a9,0x87c6,0x87c8,0x87cc,0x87ce,0x87ce,0x87d1,0x87d4,0x87d6,0x87e8,0x87ea,0x87ef,0x87f2,0x87f7,0x87f9,0x87fc,0x87fe,0x8806,0x8808,0x880d,0x880f,0x8811,0x8813,0x8819,0x881b,0x881d,0x881f,0x8833,0x8835,0x8839,0x883b,0x8846,0x8848,0x8848,0x884a,0x884f,0x8852,0x8853,0x8855,0x8857,0x8859,0x885b,0x885d,0x885e,0x8860,0x8865,0x8867,0x886b,0x886d,0x8872,0x8874,0x8877,0x8879,0x8879,0x887c,0x8884,0x8887,0x8889,0x888b,0x8893,0x8895,0x88a2,0x88a4,0x88a4,0x88a7,0x88a8,0x88aa,0x88ac,0x88ae,0x88ae,0x88b1,0x88b2,0x88b4,0x88ba,0x88bc,0x88c2,0x88c5,0x88c5,0x88c7,0x88c7,0x88c9,0x88d0,0x88d2,0x88d2,0x88d4,0x88df,0x88e1,0x88e1,0x88e6,0x88e8,0x88eb,0x88ec,0x88ee,0x8902,0x8905,0x8907,0x8909,0x890c,0x890e,0x890e,0x8910,0x891a,0x891e,0x891f,0x8921,0x8927,0x8929,0x8933,0x8935,0x8938,0x893b,0x893e,0x8941,0x8944,0x8946,0x8947,0x8949,0x8949,0x894b,0x894d,0x894f,0x8954,0x8956,0x8966,0x8969,0x896f,0x8971,0x8974,0x8976,0x8977,0x8979,0x897c,0x897e,0x8983,0x8985,0x898b,0x898f,0x898f,0x8991,0x8991,0x8993,0x8998,0x899b,0x899f,0x89a1,0x89a7,0x89a9,0x89aa,0x89ac,0x89af,0x89b2,0x89b2,0x89b6,0x89b7,0x89b9,0x89ba,0x89bc,0x89c1,0x89c6,0x89c6,0x89d2,0x89d6,0x89d9,0x89dd,0x89df,0x89e9,0x89eb,0x89ed,0x89f0,0x89f4,0x89f6,0x89f8,0x89fa,0x89fc,0x89fe,0x8a00,0x8a02,0x8a04,0x8a07,0x8a08,0x8a0a,0x8a0a,0x8a0c,0x8a0c,0x8a0e,0x8a13,0x8a15,0x8a18,0x8a1b,0x8a1f,0x8a22,0x8a23,0x8a25,0x8a25,0x8a27,0x8a27,0x8a29,0x8a2d,0x8a30,0x8a31,0x8a34,0x8a34,0x8a36,0x8a36,0x8a38,0x8a41,0x8a44,0x8a46,0x8a48,0x8a4a,0x8a4c,0x8a52,0x8a54,0x8a59,0x8a5b,0x8a5b,0x8a5e,0x8a5e,0x8a60,0x8a63,0x8a66,0x8a69,0x8a6b,0x8a6e,0x8a70,0x8a77,0x8a79,0x8a7c,0x8a7e,0x8a7f,0x8a81,0x8a87,0x8a8b,0x8a8d,0x8a8f,0x8a96,0x8a98,0x8a9a,0x8a9c,0x8a9c,0x8a9e,0x8a9e,0x8aa0,0x8aa1,0x8aa3,0x8aac,0x8aaf,0x8ab0,0x8ab2,0x8ab2,0x8ab4,0x8ab4,0x8ab6,0x8ab6,0x8ab8,0x8ac0,0x8ac2,0x8ac9,0x8acb,0x8acd,0x8acf,0x8acf,0x8ad1,0x8ae2,0x8ae4,0x8ae4,0x8ae6,0x8ae8,0x8aea,0x8aeb,0x8aed,0x8afc,0x8afe,0x8b02,0x8b04,0x8b08,0x8b0a,0x8b20,0x8b22,0x8b28,0x8b2a,0x8b31,0x8b33,0x8b33,0x8b35,0x8b37,0x8b39,0x8b43,0x8b45,0x8b5a,0x8b5c,0x8b60,0x8b62,0x8b63,0x8b65,0x8b6d,0x8b6f,0x8b70,0x8b74,0x8b74,0x8b77,0x8b7b,0x8b7d,0x8b86,0x8b88,0x8b88,0x8b8a,0x8b8c,0x8b8e,0x8b90,0x8b92,0x8b96,0x8b98,0x8b9c,0x8b9e,0x8ba0,0x8bbe,0x8bbe,0x8be2,0x8be2,0x8c37,0x8c37,0x8c39,0x8c39,0x8c3b,0x8c3f,0x8c41,0x8c43,0x8c45,0x8c51,0x8c54,0x8c57,0x8c5a,0x8c5a,0x8c5c,0x8c5d,0x8c5f,0x8c5f,0x8c61,0x8c62,0x8c64,0x8c66,0x8c68,0x8c6d,0x8c6f,0x8c73,0x8c75,0x8c7b,0x8c7d,0x8c7d,0x8c80,0x8c82,0x8c84,0x8c86,0x8c89,0x8c8a,0x8c8c,0x8c8d,0x8c8f,0x8c95,0x8c97,0x8ca5,0x8ca7,0x8cad,0x8caf,0x8cb0,0x8cb2,0x8cc5,0x8cc7,0x8cc8,0x8cca,0x8cca,0x8ccc,0x8ccd,0x8ccf,0x8ccf,0x8cd1,0x8cd7,0x8cd9,0x8cee,0x8cf0,0x8cf5,0x8cf7,0x8cfe,0x8d00,0x8d00,0x8d02,0x8d0d,0x8d0f,0x8d19,0x8d1b,0x8d1d,0x8d64,0x8d64,0x8d66,0x8d69,0x8d6b,0x8d70,0x8d72,0x8d74,0x8d76,0x8d7b,0x8d7d,0x8d7d,0x8d80,0x8d82,0x8d84,0x8d85,0x8d89,0x8d8a,0x8d8c,0x8d96,0x8d99,0x8d99,0x8d9b,0x8d9c,0x8d9f,0x8da1,0x8da3,0x8da3,0x8da5,0x8daf,0x8db2,0x8db7,0x8db9,0x8dba,0x8dbc,0x8dbc,0x8dbe,0x8dc3,0x8dc5,0x8dc8,0x8dcb,0x8dd1,0x8dd3,0x8ddd,0x8ddf,0x8de4,0x8de6,0x8dec,0x8dee,0x8df4,0x8dfa,0x8dfa,0x8dfc,0x8e07,0x8e09,0x8e0a,0x8e0d,0x8e2b,0x8e2d,0x8e2e,0x8e30,0x8e31,0x8e33,0x8e36,0x8e38,0x8e3a,0x8e3c,0x8e42,0x8e44,0x8e50,0x8e53,0x8e57,0x8e59,0x8e6a,0x8e6c,0x8e6d,0x8e6f,0x8e6f,0x8e71,0x8e78,0x8e7a,0x8e7c,0x8e7e,0x8e7e,0x8e80,0x8e82,0x8e84,0x8e8e,0x8e90,0x8e98,0x8e9a,0x8e9a,0x8e9d,0x8ea1,0x8ea3,0x8ead,0x8eb0,0x8eb0,0x8eb2,0x8eb2,0x8eb6,0x8eb6,0x8eb9,0x8eba,0x8ebc,0x8ebd,0x8ec0,0x8ec0,0x8ec2,0x8ec3,0x8ec9,0x8ecf,0x8ed1,0x8ed4,0x8ed7,0x8ed8,0x8eda,0x8ee2,0x8ee4,0x8ee9,0x8eeb,0x8eef,0x8ef1,0x8ef2,0x8ef4,0x8efc,0x8efe,0x8f03,0x8f05,0x8f0b,0x8f0d,0x8f0e,0x8f10,0x8f20,0x8f23,0x8f26,0x8f29,0x8f2a,0x8f2c,0x8f30,0x8f32,0x8f39,0x8f3b,0x8f3c,0x8f3e,0x8f4b,0x8f4d,0x8f64,0x8f66,0x8f67,0x8f6e,0x8f6e,0x8f93,0x8f93,0x8f9b,0x8f9c,0x8f9f,0x8fa0,0x8fa3,0x8fa3,0x8fa5,0x8fa8,0x8fad,0x8fbc,0x8fbe,0x8fbf,0x8fc1,0x8fc2,0x8fc4,0x8fc6,0x8fc9,0x8fd7,0x8fda,0x8fda,0x8fe0,0x8fe6,0x8fe8,0x8fe8,0x8fea,0x8feb,0x8fed,0x8fee,0x8ff0,0x8ff0,0x8ff4,0x9006,0x9008,0x9008,0x900b,0x900d,0x900f,0x9012,0x9014,0x9017,0x9019,0x9024,0x902d,0x902f,0x9031,0x9038,0x903c,0x903f,0x9041,0x9042,0x9044,0x9044,0x9046,0x9047,0x9049,0x9056,0x9058,0x9059,0x905b,0x905e,0x9060,0x9064,0x9067,0x9069,0x906b,0x9070,0x9072,0x9088,0x908a,0x908b,0x908d,0x908d,0x908f,0x9091,0x9094,0x9095,0x9097,0x9099,0x909b,0x909b,0x909e,0x90a3,0x90a5,0x90a8,0x90aa,0x90aa,0x90ae,0x90b6,0x90b8,0x90b8,0x90bb,0x90bb,0x90bd,0x90bf,0x90c1,0x90c1,0x90c3,0x90c5,0x90c7,0x90c8,0x90ca,0x90cb,0x90ce,0x90ce,0x90d4,0x90dd,0x90df,0x90e5,0x90e8,0x90ed,0x90ef,0x90f5,0x90f9,0x9109,0x910b,0x910b,0x910d,0x9112,0x9114,0x9114,0x9116,0x9124,0x9126,0x9136,0x9138,0x913b,0x913e,0x9141,0x9143,0x9153,0x9155,0x915a,0x915c,0x915c,0x915e,0x9165,0x9167,0x916a,0x916c,0x916c,0x916e,0x9170,0x9172,0x917a,0x917c,0x917c,0x9180,0x9187,0x9189,0x9193,0x9196,0x9196,0x9199,0x91a3,0x91a5,0x91a5,0x91a7,0x91b7,0x91b9,0x91be,0x91c0,0x91c7,0x91c9,0x91c9,0x91cb,0x91d1,0x91d3,0x91da,0x91dc,0x91dd,0x91df,0x91df,0x91e2,0x91ee,0x91f1,0x91f1,0x91f3,0x91fa,0x91fd,0x920a,0x920c,0x921a,0x921c,0x921c,0x921e,0x921e,0x9221,0x9221,0x9223,0x9228,0x922a,0x922b,0x922d,0x922e,0x9230,0x923a,0x923c,0x9241,0x9244,0x9246,0x9248,0x9258,0x925a,0x925b,0x925d,0x9267,0x926b,0x9270,0x9272,0x9272,0x9276,0x928f,0x9291,0x9291,0x9293,0x929d,0x92a0,0x92ac,0x92ae,0x92ae,0x92b1,0x92b7,0x92b9,0x92bc,0x92be,0x92d5,0x92d7,0x92d9,0x92db,0x92db,0x92dd,0x92e1,0x92e3,0x92f4,0x92f6,0x9304,0x9306,0x9309,0x930b,0x9310,0x9312,0x9316,0x9318,0x931b,0x931d,0x9331,0x9333,0x9336,0x9338,0x9339,0x933c,0x933c,0x9340,0x9352,0x9354,0x935c,0x935e,0x936e,0x9370,0x9371,0x9373,0x937e,0x9380,0x938a,0x938c,0x9392,0x9394,0x93aa,0x93ac,0x93b5,0x93b7,0x93b8,0x93bb,0x93bb,0x93bd,0x93bd,0x93bf,0x93c0,0x93c2,0x93c4,0x93c6,0x93c8,0x93ca,0x93e4,0x93e6,0x93e8,0x93ec,0x93ec,0x93ee,0x93ee,0x93f0,0x93f1,0x93f3,0x9401,0x9403,0x9404,0x9406,0x9419,0x941b,0x941b,0x941d,0x941d,0x9420,0x9420,0x9424,0x9433,0x9435,0x9440,0x9442,0x944d,0x944f,0x9452,0x9454,0x9455,0x9457,0x9458,0x945b,0x945b,0x945d,0x945e,0x9460,0x9460,0x9462,0x9465,0x9467,0x9479,0x947b,0x9483,0x9485,0x9485,0x949f,0x949f,0x94a2,0x94a2,0x94c1,0x94c1,0x94c3,0x94c3,0x94dc,0x94dc,0x94f6,0x94f6,0x952d,0x952d,0x9547,0x9547,0x9577,0x9578,0x957a,0x957d,0x957f,0x9580,0x9582,0x9583,0x9585,0x9586,0x9588,0x9589,0x958b,0x9594,0x9596,0x9599,0x959b,0x959c,0x959e,0x95ae,0x95b0,0x95b2,0x95b5,0x95b7,0x95b9,0x95c0,0x95c3,0x95c3,0x95c5,0x95cd,0x95d0,0x95d6,0x95da,0x95dc,0x95de,0x95e5,0x95e8,0x95e8,0x95f4,0x95f4,0x961c,0x961e,0x9620,0x9624,0x9628,0x9628,0x962a,0x962a,0x962c,0x9633,0x9638,0x963d,0x963f,0x9645,0x964a,0x9651,0x9653,0x9654,0x9656,0x9656,0x9658,0x9658,0x965b,0x965f,0x9661,0x9664,0x9669,0x966d,0x966f,0x9678,0x967b,0x967e,0x9680,0x9681,0x9683,0x968b,0x968d,0x968f,0x9691,0x9699,0x969b,0x969c,0x969e,0x969e,0x96a1,0x96a5,0x96a7,0x96aa,0x96ac,0x96ac,0x96ae,0x96ae,0x96b0,0x96b1,0x96b3,0x96b4,0x96b6,0x96b6,0x96b8,0x96b9,0x96bb,0x96bd,0x96bf,0x96ce,0x96d2,0x96df,0x96e1,0x96e3,0x96e5,0x96e5,0x96e8,0x96ea,0x96ef,0x96f2,0x96f4,0x96fb,0x96fd,0x96fd,0x96ff,0x9700,0x9702,0x9709,0x970b,0x970b,0x970d,0x9713,0x9716,0x9716,0x9718,0x9719,0x971b,0x972c,0x972e,0x9732,0x9734,0x9736,0x9738,0x973a,0x973d,0x9744,0x9746,0x974b,0x9751,0x9752,0x9755,0x9758,0x975a,0x9762,0x9766,0x9766,0x9768,0x976a,0x976c,0x976e,0x9770,0x9774,0x9776,0x9778,0x977a,0x9785,0x9787,0x978b,0x978d,0x978f,0x9794,0x9794,0x9797,0x97a6,0x97a8,0x97a8,0x97aa,0x97ae,0x97b1,0x97b4,0x97b6,0x97bb,0x97bd,0x97c9,0x97cb,0x97d0,0x97d2,0x97d9,0x97dc,0x97e1,0x97e3,0x97e3,0x97e5,0x97e6,0x97ed,0x97ee,0x97f0,0x97f3,0x97f5,0x97f6,0x97f8,0x97fb,0x97fd,0x9808,0x980a,0x980a,0x980c,0x9818,0x981b,0x9821,0x9823,0x9824,0x9826,0x9829,0x982b,0x982b,0x982d,0x9830,0x9832,0x9835,0x9837,0x9839,0x983b,0x983b,0x9841,0x9841,0x9843,0x9853,0x9856,0x9859,0x985b,0x9860,0x9862,0x986c,0x986f,0x9875,0x98a8,0x98a9,0x98ac,0x98af,0x98b1,0x98b4,0x98b6,0x98c4,0x98c6,0x98cc,0x98ce,0x98ce,0x98db,0x98dc,0x98de,0x98e3,0x98e5,0x98e7,0x98e9,0x98ed,0x98ef,0x98ef,0x98f1,0x98f2,0x98f4,0x98f6,0x98f9,0x98fa,0x98fc,0x98fe,0x9900,0x9900,0x9902,0x9903,0x9905,0x9905,0x9907,0x990a,0x990c,0x990c,0x990e,0x990e,0x9910,0x991c,0x991e,0x991f,0x9921,0x9921,0x9924,0x9925,0x9927,0x9933,0x9935,0x9935,0x9937,0x9943,0x9945,0x9945,0x9947,0x994e,0x9950,0x9959,0x995b,0x995f,0x9961,0x9963,0x9996,0x9999,0x999b,0x999e,0x99a1,0x99a1,0x99a3,0x99a8,0x99aa,0x99b5,0x99b8,0x99bd,0x99c1,0x99c5,0x99c7,0x99c7,0x99c9,0x99c9,0x99cb,0x99dd,0x99df,0x99e7,0x99e9,0x99ea,0x99ec,0x99ee,0x99f0,0x99f1,0x99f4,0x99ff,0x9a01,0x9a07,0x9a09,0x9a11,0x9a14,0x9a16,0x9a19,0x9a27,0x9a29,0x9a32,0x9a34,0x9a46,0x9a48,0x9a4a,0x9a4c,0x9a50,0x9a52,0x9a5c,0x9a5e,0x9a60,0x9a62,0x9a6c,0x9a8f,0x9a8f,0x9aa8,0x9aa8,0x9aab,0x9aab,0x9aad,0x9aad,0x9aaf,0x9ab4,0x9ab6,0x9ac2,0x9ac6,0x9ac7,0x9aca,0x9aca,0x9acd,0x9acd,0x9acf,0x9ad8,0x9adc,0x9adc,0x9adf,0x9ae3,0x9ae6,0x9ae7,0x9aeb,0x9aef,0x9af1,0x9af4,0x9af6,0x9af7,0x9af9,0x9aff,0x9b01,0x9b06,0x9b08,0x9b12,0x9b14,0x9b1a,0x9b1e,0x9b20,0x9b22,0x9b25,0x9b27,0x9b2b,0x9b2d,0x9b2f,0x9b31,0x9b35,0x9b37,0x9b37,0x9b39,0x9b3c,0x9b3e,0x9b46,0x9b48,0x9b48,0x9b4a,0x9b52,0x9b54,0x9b56,0x9b58,0x9b5b,0x9b5f,0x9b61,0x9b64,0x9b64,0x9b66,0x9b69,0x9b6c,0x9b6c,0x9b6f,0x9b71,0x9b74,0x9b77,0x9b7a,0x9b83,0x9b85,0x9b88,0x9b8b,0x9b8b,0x9b8d,0x9b93,0x9b95,0x9b95,0x9b97,0x9b97,0x9b9a,0x9b9b,0x9b9d,0x9ba2,0x9ba4,0x9ba6,0x9ba8,0x9ba8,0x9baa,0x9bab,0x9bad,0x9bb0,0x9bb5,0x9bb6,0x9bb8,0x9bb9,0x9bbd,0x9bbd,0x9bbf,0x9bc1,0x9bc3,0x9bc4,0x9bc6,0x9bca,0x9bcf,0x9bcf,0x9bd3,0x9bd7,0x9bd9,0x9bde,0x9be0,0x9be2,0x9be4,0x9bed,0x9bf0,0x9bf1,0x9bf4,0x9bf4,0x9bf7,0x9bf8,0x9bfd,0x9bfd,0x9bff,0x9bff,0x9c02,0x9c02,0x9c05,0x9c0e,0x9c10,0x9c10,0x9c12,0x9c15,0x9c17,0x9c17,0x9c1b,0x9c1d,0x9c1f,0x9c21,0x9c23,0x9c26,0x9c28,0x9c29,0x9c2b,0x9c2d,0x9c2f,0x9c2f,0x9c31,0x9c37,0x9c39,0x9c41,0x9c44,0x9c50,0x9c52,0x9c59,0x9c5d,0x9c60,0x9c62,0x9c63,0x9c66,0x9c68,0x9c6d,0x9c6e,0x9c71,0x9c75,0x9c77,0x9c7c,0x9ce5,0x9ce7,0x9ce9,0x9cea,0x9ced,0x9ced,0x9cf1,0x9cf7,0x9cf9,0x9cfd,0x9cff,0x9d00,0x9d02,0x9d09,0x9d0c,0x9d0c,0x9d10,0x9d10,0x9d12,0x9d12,0x9d14,0x9d19,0x9d1b,0x9d1b,0x9d1d,0x9d23,0x9d25,0x9d26,0x9d28,0x9d29,0x9d2d,0x9d31,0x9d33,0x9d34,0x9d36,0x9d39,0x9d3b,0x9d3b,0x9d3d,0x9d45,0x9d49,0x9d4c,0x9d4e,0x9d54,0x9d56,0x9d61,0x9d67,0x9d75,0x9d77,0x9d79,0x9d7b,0x9d8c,0x9d90,0x9d90,0x9d92,0x9d94,0x9d96,0x9dad,0x9daf,0x9daf,0x9db1,0x9dc5,0x9dc7,0x9ddf,0x9de1,0x9de6,0x9de8,0x9de9,0x9deb,0x9df0,0x9df2,0x9e07,0x9e09,0x9e15,0x9e17,0x9e1f,0x9e75,0x9e75,0x9e79,0x9e7d,0x9e7f,0x9e8e,0x9e90,0x9ea2,0x9ea4,0x9eb1,0x9eb4,0x9eb7,0x9ebb,0x9ec4,0x9ec6,0x9ec8,0x9ecc,0x9ed1,0x9ed3,0x9ed6,0x9ed8,0x9ed8,0x9eda,0x9ee0,0x9ee2,0x9ee2,0x9ee4,0x9ee8,0x9eeb,0x9eeb,0x9eed,0x9f02,0x9f06,0x9f0a,0x9f0e,0x9f10,0x9f12,0x9f13,0x9f15,0x9f1c,0x9f1e,0x9f1e,0x9f20,0x9f20,0x9f22,0x9f39,0x9f3b,0x9f3b,0x9f3d,0x9f3e,0x9f40,0x9f50,0x9f52,0x9f67,0x9f69,0x9f6c,0x9f6e,0x9f72,0x9f74,0x9f7b,0x9f7e,0x9f7f,0x9f8d,0x9f8e,0x9f90,0x9f92,0x9f94,0x9f99,0x9f9c,0x9f9c,0x9f9f,0x9fa0,0x9fa2,0x9fa2,0x9fa4,0x9fb3,0x9fc7,0x9fcb,0x9fd0,0x9fd0,0xf900,0xf903,0xf905,0xf907,0xf90b,0xf90b,0xf90d,0xf90d,0xf915,0xf915,0xf917,0xf917,0xf91a,0xf91a,0xf922,0xf922,0xf92d,0xf92d,0xf931,0xf931,0xf937,0xf937,0xf939,0xf93a,0xf943,0xf943,0xf947,0xf948,0xf94a,0xf94a,0xf952,0xf952,0xf95e,0xf95e,0xf962,0xf962,0xf965,0xf965,0xf967,0xf967,0xf972,0xf972,0xf976,0xf976,0xf978,0xf979,0xf97e,0xf97e,0xf980,0xf980,0xf986,0xf986,0xf98a,0xf98a,0xf98e,0xf98e,0xf995,0xf995,0xf99c,0xf99c,0xf99f,0xf99f,0xf9b5,0xf9b5,0xf9bb,0xf9bb,0xf9bd,0xf9bd,0xf9c5,0xf9c6,0xf9c8,0xf9c8,0xf9d8,0xf9d8,0xf9dc,0xf9de,0xf9e0,0xf9e0,0xf9e4,0xf9e4,0xf9e7,0xf9e7,0xf9e9,0xf9e9,0xf9f4,0xf9f5,0xf9fa,0xf9fa,0xf9fd,0xf9fd,0xf9ff,0xf9ff,0xfa02,0xfa02,0xfa05,0xfa08,0xfa0a,0xfa0a,0xfa0c,0xfa0d,0xfa33,0xfa35,0xfa3a,0xfa3a,0xfa49,0xfa49,0xfa4b,0xfa4b,0xfa5d,0xfa5e,0xfb00,0xfb04,0xfe10,0xfe19,0xfe30,0xfe52,0xfe54,0xfe66,0xfe68,0xfe6b,0xff01,0xff9f,0xffa1,0xffbe,0xffc2,0xffc7,0xffca,0xffcf,0xffd2,0xffd7,0xffda,0xffdc,0xffe0,0xffe6,0xffe8,0xffee,0x1f100,0x1f10c,0x1f110,0x1f16c,0x1f170,0x1f1ac,0x1f200,0x1f202,0x1f210,0x1f23b,0x1f240,0x1f248,0x1f250,0x1f251,0x20021,0x20021,0x2003e,0x2003e,0x20046,0x20046,0x2004e,0x2004e,0x20068,0x20068,0x20086,0x20087,0x2008a,0x2008a,0x20094,0x20094,0x200ca,0x200cd,0x200d1,0x200d1,0x200ee,0x200ee,0x2010c,0x2010c,0x2010e,0x2010e,0x20118,0x20118,0x201a4,0x201a4,0x201a9,0x201a9,0x201ab,0x201ab,0x201c1,0x201c1,0x201d4,0x201d4,0x201f2,0x201f2,0x20204,0x20204,0x2020c,0x2020c,0x20214,0x20214,0x20239,0x20239,0x2025b,0x2025b,0x20274,0x20275,0x20299,0x20299,0x2029e,0x2029e,0x202a0,0x202a0,0x202b7,0x202b7,0x202bf,0x202c0,0x202e5,0x202e5,0x2030a,0x2030a,0x20325,0x20325,0x20341,0x20341,0x20345,0x20347,0x2037e,0x20380,0x203a0,0x203a0,0x203a7,0x203a7,0x203b5,0x203b5,0x203c9,0x203c9,0x203cb,0x203cb,0x203f5,0x203f5,0x203fc,0x203fc,0x20413,0x20414,0x2041f,0x2041f,0x20465,0x20465,0x20487,0x20487,0x2048e,0x2048e,0x20491,0x20492,0x204a3,0x204a3,0x204d7,0x204d7,0x204fc,0x204fc,0x204fe,0x204fe,0x20547,0x20547,0x2058e,0x2058e,0x205a5,0x205a5,0x205b3,0x205b3,0x205c3,0x205c3,0x205ca,0x205ca,0x205d0,0x205d0,0x205d5,0x205d5,0x205df,0x205e0,0x205eb,0x205eb,0x20611,0x20611,0x20615,0x20615,0x20619,0x2061a,0x20628,0x20628,0x20630,0x20630,0x20656,0x20656,0x20676,0x20676,0x2070e,0x2070e,0x20731,0x20731,0x20779,0x20779,0x2082c,0x2082c,0x20873,0x20873,0x208d5,0x208d5,0x20916,0x20916,0x20923,0x20923,0x20954,0x20954,0x20979,0x20979,0x209e7,0x209e7,0x20a11,0x20a11,0x20a50,0x20a50,0x20a6f,0x20a6f,0x20a8a,0x20a8a,0x20ab4,0x20ab4,0x20ac2,0x20ac2,0x20acd,0x20acd,0x20b0d,0x20b0d,0x20b8f,0x20b8f,0x20b9f,0x20b9f,0x20ba8,0x20ba9,0x20bbf,0x20bbf,0x20bc6,0x20bc6,0x20bcb,0x20bcb,0x20be2,0x20be2,0x20beb,0x20beb,0x20bfb,0x20bfb,0x20bff,0x20bff,0x20c0b,0x20c0b,0x20c0d,0x20c0d,0x20c20,0x20c20,0x20c34,0x20c34,0x20c3a,0x20c3b,0x20c41,0x20c43,0x20c53,0x20c53,0x20c65,0x20c65,0x20c77,0x20c78,0x20c7c,0x20c7c,0x20c8d,0x20c8d,0x20c96,0x20c96,0x20c9c,0x20c9c,0x20cb5,0x20cb5,0x20cb8,0x20cb8,0x20ccf,0x20ccf,0x20cd3,0x20cd6,0x20cdd,0x20cdd,0x20ced,0x20ced,0x20cff,0x20cff,0x20d15,0x20d15,0x20d28,0x20d28,0x20d31,0x20d32,0x20d46,0x20d49,0x20d4c,0x20d4e,0x20d6f,0x20d6f,0x20d71,0x20d71,0x20d74,0x20d74,0x20d7c,0x20d7c,0x20d7e,0x20d7f,0x20d96,0x20d96,0x20d9c,0x20d9c,0x20da7,0x20da7,0x20db2,0x20db2,0x20dc8,0x20dc8,0x20e04,0x20e04,0x20e09,0x20e0a,0x20e0d,0x20e11,0x20e16,0x20e16,0x20e1d,0x20e1d,0x20e4c,0x20e4c,0x20e6d,0x20e6d,0x20e73,0x20e73,0x20e75,0x20e7b,0x20e8c,0x20e8c,0x20e96,0x20e96,0x20e98,0x20e98,0x20e9d,0x20e9d,0x20ea2,0x20ea2,0x20eaa,0x20eac,0x20eb6,0x20eb6,0x20ed7,0x20ed8,0x20edd,0x20edd,0x20ef8,0x20efb,0x20f1d,0x20f1d,0x20f26,0x20f26,0x20f2d,0x20f2e,0x20f30,0x20f31,0x20f3b,0x20f3b,0x20f4c,0x20f4c,0x20f64,0x20f64,0x20f8d,0x20f8d,0x20f90,0x20f90,0x20fad,0x20fad,0x20fb4,0x20fb6,0x20fbc,0x20fbc,0x20fdf,0x20fdf,0x20fea,0x20fed,0x21014,0x21014,0x2101d,0x2101e,0x2104f,0x2104f,0x2105c,0x2105c,0x2106f,0x2106f,0x21075,0x21078,0x2107b,0x2107b,0x21088,0x21088,0x21096,0x21096,0x2109d,0x2109d,0x210b4,0x210b4,0x210bf,0x210c1,0x210c7,0x210c9,0x210cf,0x210cf,0x210d3,0x210d3,0x210e4,0x210e4,0x210f4,0x210f6,0x2112f,0x2112f,0x2113b,0x2113b,0x2113d,0x2113d,0x21145,0x21145,0x21148,0x21148,0x2114f,0x2114f,0x21180,0x21180,0x21187,0x21187,0x211d9,0x211d9,0x2123c,0x2123c,0x2124f,0x2124f,0x2127c,0x2127c,0x212a8,0x212a9,0x212b0,0x212b0,0x212e3,0x212e3,0x212fe,0x212fe,0x21302,0x21305,0x21336,0x21336,0x2133a,0x2133a,0x21375,0x21376,0x2138e,0x2138e,0x21398,0x21398,0x2139c,0x2139c,0x213c5,0x213c6,0x213ed,0x213ed,0x213fe,0x213fe,0x21413,0x21413,0x21416,0x21416,0x21424,0x21424,0x2143f,0x2143f,0x21452,0x21452,0x21454,0x21455,0x2148a,0x2148a,0x21497,0x21497,0x214b6,0x214b6,0x214e8,0x214e8,0x214fd,0x214fd,0x21577,0x21577,0x21582,0x21582,0x21596,0x21596,0x2160a,0x2160a,0x21613,0x21613,0x21619,0x21619,0x2163e,0x2163e,0x21661,0x21661,0x21692,0x21692,0x216b8,0x216b8,0x216ba,0x216ba,0x216c0,0x216c2,0x216d3,0x216d3,0x216d5,0x216d5,0x216df,0x216df,0x216e6,0x216e8,0x216fa,0x216fc,0x216fe,0x216fe,0x2170d,0x2170d,0x21710,0x21710,0x21726,0x21726,0x2173a,0x2173c,0x21757,0x21757,0x2176c,0x21771,0x21773,0x21774,0x217ab,0x217ab,0x217b0,0x217b5,0x217c3,0x217c3,0x217c7,0x217c7,0x217d9,0x217dc,0x217df,0x217df,0x217ef,0x217ef,0x217f5,0x217f6,0x217f8,0x217fc,0x21820,0x21820,0x21828,0x2182a,0x2182d,0x2182d,0x21839,0x2183b,0x21840,0x21840,0x21845,0x21845,0x21852,0x21852,0x2185e,0x2185e,0x21861,0x21864,0x21877,0x21877,0x2187b,0x2187b,0x21883,0x21885,0x2189e,0x218a2,0x218be,0x218bf,0x218d1,0x218d1,0x218d6,0x218d9,0x218fa,0x218fa,0x21903,0x21905,0x21910,0x21912,0x21915,0x21915,0x2191c,0x2191c,0x21922,0x21922,0x21927,0x21927,0x2193b,0x2193b,0x21944,0x21944,0x21958,0x21958,0x2196a,0x2196a,0x2197c,0x2197c,0x21980,0x21980,0x21983,0x21983,0x21988,0x21988,0x21996,0x21996,0x219db,0x219db,0x219f3,0x219f3,0x21a2d,0x21a2d,0x21a34,0x21a34,0x21a45,0x21a45,0x21a4b,0x21a4b,0x21a63,0x21a63,0x21b44,0x21b44,0x21bc1,0x21bc2,0x21c2a,0x21c2a,0x21c70,0x21c70,0x21ca2,0x21ca2,0x21ca5,0x21ca5,0x21cac,0x21cac,0x21d46,0x21d46,0x21d53,0x21d53,0x21d5e,0x21d5e,0x21d90,0x21d90,0x21db6,0x21db6,0x21dba,0x21dba,0x21dca,0x21dca,0x21dd1,0x21dd1,0x21deb,0x21deb,0x21df9,0x21df9,0x21e1c,0x21e1c,0x21e23,0x21e23,0x21e37,0x21e37,0x21e3d,0x21e3d,0x21e89,0x21e89,0x21ea4,0x21ea4,0x21ea8,0x21ea8,0x21ec8,0x21ec8,0x21ed5,0x21ed5,0x21f0f,0x21f0f,0x21f15,0x21f15,0x21f6a,0x21f6a,0x21f9e,0x21f9e,0x21fa1,0x21fa1,0x21fe8,0x21fe8,0x22045,0x22045,0x22049,0x22049,0x2207e,0x2207e,0x2209a,0x2209a,0x220c7,0x220c7,0x220fc,0x220fc,0x2212a,0x2212a,0x2215b,0x2215b,0x22173,0x22173,0x2217a,0x2217a,0x221a1,0x221a1,0x221c1,0x221c1,0x221c3,0x221c3,0x22208,0x22208,0x2227c,0x2227c,0x22321,0x22321,0x22325,0x22325,0x223bd,0x223bd,0x223d0,0x223d0,0x223d7,0x223d7,0x223fa,0x223fa,0x22465,0x22465,0x22471,0x22471,0x2248b,0x2248b,0x22491,0x22491,0x224b0,0x224b0,0x224bc,0x224bc,0x224c1,0x224c1,0x224c9,0x224c9,0x224cc,0x224cc,0x224ed,0x224ed,0x22513,0x22513,0x2251b,0x2251b,0x22530,0x22530,0x22554,0x22554,0x2258d,0x2258d,0x225af,0x225af,0x225be,0x225be,0x2261b,0x2261c,0x2262b,0x2262b,0x22668,0x22668,0x2267a,0x2267a,0x22696,0x22696,0x22698,0x22698,0x226f4,0x226f6,0x22712,0x22712,0x22714,0x22714,0x2271b,0x2271b,0x2271f,0x2271f,0x2272a,0x2272a,0x22775,0x22775,0x22781,0x22781,0x22796,0x22796,0x227b4,0x227b5,0x227cd,0x227cd,0x22803,0x22803,0x2285f,0x22860,0x22871,0x22871,0x228ad,0x228ad,0x228c1,0x228c1,0x228f7,0x228f7,0x22926,0x22926,0x22939,0x22939,0x2294f,0x2294f,0x22967,0x22967,0x2296b,0x2296b,0x22980,0x22980,0x22993,0x22993,0x22a66,0x22a66,0x22acf,0x22acf,0x22ad5,0x22ad5,0x22ae6,0x22ae6,0x22ae8,0x22ae8,0x22b0e,0x22b0e,0x22b22,0x22b22,0x22b3f,0x22b3f,0x22b43,0x22b43,0x22b6a,0x22b6a,0x22bca,0x22bca,0x22bce,0x22bce,0x22c26,0x22c27,0x22c38,0x22c38,0x22c4c,0x22c4c,0x22c51,0x22c51,0x22c55,0x22c55,0x22c62,0x22c62,0x22c88,0x22c88,0x22c9b,0x22c9b,0x22ca1,0x22ca1,0x22ca9,0x22ca9,0x22cb2,0x22cb2,0x22cb7,0x22cb7,0x22cc2,0x22cc2,0x22cc6,0x22cc6,0x22cc9,0x22cc9,0x22d07,0x22d08,0x22d12,0x22d12,0x22d44,0x22d44,0x22d4c,0x22d4c,0x22d67,0x22d67,0x22d8d,0x22d8d,0x22d95,0x22d95,0x22da0,0x22da0,0x22da3,0x22da4,0x22db7,0x22db7,0x22dee,0x22dee,0x22e0d,0x22e0d,0x22e36,0x22e36,0x22e42,0x22e42,0x22e78,0x22e78,0x22e8b,0x22e8b,0x22eb3,0x22eb3,0x22eef,0x22eef,0x22f74,0x22f74,0x22fcc,0x22fcc,0x22fe3,0x22fe3,0x23033,0x23033,0x23044,0x23044,0x2304b,0x2304b,0x23066,0x23066,0x2307d,0x2307e,0x2308e,0x2308e,0x230b7,0x230b7,0x230bc,0x230bc,0x230da,0x230da,0x23103,0x23103,0x2313d,0x2313d,0x2317d,0x2317d,0x23182,0x23182,0x231a4,0x231a5,0x231b3,0x231b3,0x231c8,0x231c9,0x231ea,0x231ea,0x231f7,0x231f9,0x2320f,0x2320f,0x23225,0x23225,0x2322f,0x2322f,0x23231,0x23234,0x23256,0x23256,0x2325e,0x2325e,0x23262,0x23262,0x23281,0x23281,0x23289,0x2328a,0x232ab,0x232ad,0x232d2,0x232d2,0x232e0,0x232e1,0x23300,0x23300,0x2330a,0x2330a,0x2331f,0x2331f,0x233b4,0x233b4,0x233cc,0x233cc,0x233de,0x233de,0x233e6,0x233e6,0x233f4,0x233f5,0x233f9,0x233fa,0x233fe,0x233fe,0x23400,0x23400,0x2343f,0x2343f,0x23450,0x23450,0x2346f,0x2346f,0x23472,0x23472,0x234e5,0x234e5,0x23519,0x23519,0x23530,0x23530,0x23551,0x23551,0x2355a,0x2355a,0x23567,0x23567,0x23595,0x23595,0x23599,0x23599,0x2359c,0x2359c,0x235bb,0x235bb,0x235cd,0x235cf,0x235f3,0x235f3,0x23600,0x23600,0x23617,0x23617,0x2361a,0x2361a,0x2363c,0x2363c,0x23640,0x23640,0x23659,0x23659,0x2365f,0x2365f,0x23677,0x23677,0x2368e,0x2368e,0x2369e,0x2369e,0x236a6,0x236a6,0x236ad,0x236ad,0x236ba,0x236ba,0x236df,0x236df,0x236ee,0x236ee,0x23703,0x23703,0x23716,0x23716,0x23720,0x23720,0x2372d,0x2372d,0x2372f,0x2372f,0x2373f,0x2373f,0x23766,0x23766,0x23781,0x23781,0x237a2,0x237a2,0x237bc,0x237bc,0x237c2,0x237c2,0x237d5,0x237d7,0x2383a,0x2383a,0x239c2,0x239c2,0x23aa7,0x23aa7,0x23adb,0x23adb,0x23aee,0x23aee,0x23afa,0x23afa,0x23b1a,0x23b1a,0x23b5a,0x23b5a,0x23c63,0x23c63,0x23c99,0x23c9b,0x23cb5,0x23cb5,0x23cb7,0x23cb7,0x23cc7,0x23cc9,0x23cfc,0x23cff,0x23d40,0x23d40,0x23d5b,0x23d5b,0x23d7e,0x23d7e,0x23d8f,0x23d8f,0x23db6,0x23dbd,0x23de3,0x23de3,0x23df8,0x23df8,0x23e06,0x23e06,0x23e11,0x23e11,0x23e2c,0x23e31,0x23e39,0x23e39,0x23e88,0x23e8b,0x23eb9,0x23eb9,0x23ebf,0x23ebf,0x23ed7,0x23ed7,0x23ef7,0x23efc,0x23f35,0x23f35,0x23f41,0x23f41,0x23f4a,0x23f4a,0x23f61,0x23f61,0x23f7f,0x23f82,0x23f8f,0x23f8f,0x23fb4,0x23fb4,0x23fb7,0x23fb7,0x23fc0,0x23fc0,0x23fc5,0x23fc5,0x23feb,0x23ff0,0x24011,0x24011,0x24039,0x2403d,0x24057,0x24057,0x24085,0x24085,0x2408b,0x2408d,0x24091,0x24091,0x240c9,0x240c9,0x240e1,0x240e1,0x240ec,0x240ec,0x24104,0x24104,0x2410f,0x2410f,0x24119,0x24119,0x2413f,0x24140,0x24144,0x24144,0x2414e,0x2414e,0x24155,0x24157,0x2415c,0x2415c,0x2415f,0x2415f,0x24161,0x24161,0x24177,0x24177,0x2417a,0x2417a,0x241a3,0x241a5,0x241ac,0x241ac,0x241b5,0x241b5,0x241cd,0x241cd,0x241e2,0x241e2,0x241fc,0x241fc,0x2421b,0x2421b,0x2424b,0x2424b,0x24256,0x24256,0x24259,0x24259,0x24276,0x24278,0x24284,0x24284,0x24293,0x24293,0x24295,0x24295,0x242a5,0x242a5,0x242bf,0x242bf,0x242c1,0x242c1,0x242c9,0x242ca,0x242ee,0x242ee,0x242fa,0x242fa,0x2430d,0x2430d,0x2431a,0x2431a,0x24334,0x24334,0x24348,0x24348,0x24362,0x24365,0x2438c,0x2438c,0x24396,0x24396,0x2439c,0x2439c,0x243bd,0x243bd,0x243c1,0x243c1,0x243e9,0x243ea,0x243f2,0x243f2,0x243f8,0x243f8,0x24404,0x24404,0x24435,0x24436,0x2445a,0x2445b,0x24473,0x24473,0x24487,0x24488,0x244b9,0x244b9,0x244bc,0x244bc,0x244ce,0x244ce,0x244d3,0x244d3,0x244d6,0x244d6,0x24505,0x24505,0x24521,0x24521,0x24578,0x24578,0x245c8,0x245c8,0x24618,0x24618,0x2462a,0x2462a,0x24665,0x24665,0x24674,0x24674,0x24697,0x24697,0x246d4,0x246d4,0x24706,0x24706,0x24725,0x24725,0x2472f,0x2472f,0x2478f,0x2478f,0x247e0,0x247e0,0x24812,0x24812,0x24823,0x24823,0x24882,0x24882,0x248e9,0x248e9,0x248f0,0x248f3,0x248fb,0x248fb,0x248ff,0x24901,0x2490c,0x2490c,0x24916,0x24917,0x24919,0x24919,0x2492f,0x2492f,0x24933,0x24934,0x2493e,0x24943,0x24962,0x24963,0x24974,0x24976,0x2497b,0x2497b,0x2497f,0x2497f,0x24982,0x24982,0x24988,0x2498f,0x24994,0x24994,0x249a4,0x249a4,0x249a7,0x249a7,0x249a9,0x249a9,0x249ab,0x249ad,0x249b7,0x249bb,0x249c5,0x249c5,0x249d0,0x249d0,0x249da,0x249da,0x249de,0x249df,0x249e3,0x249e3,0x249e5,0x249e5,0x249ec,0x249ed,0x249f6,0x249f9,0x249fb,0x249fb,0x24a0e,0x24a0e,0x24a12,0x24a13,0x24a15,0x24a15,0x24a21,0x24a2a,0x24a3e,0x24a3e,0x24a42,0x24a42,0x24a45,0x24a45,0x24a4a,0x24a4a,0x24a4e,0x24a51,0x24a5d,0x24a5d,0x24a65,0x24a67,0x24a71,0x24a71,0x24a77,0x24a7a,0x24a8c,0x24a8c,0x24a93,0x24a96,0x24aa4,0x24aa7,0x24ab1,0x24ab3,0x24aba,0x24abc,0x24ac0,0x24ac0,0x24ac7,0x24ac7,0x24aca,0x24aca,0x24ad1,0x24ad1,0x24adf,0x24adf,0x24ae2,0x24ae2,0x24ae9,0x24ae9,0x24b0f,0x24b0f,0x24b6e,0x24b6e,0x24bf5,0x24bf5,0x24c09,0x24c09,0x24c9e,0x24c9f,0x24cc9,0x24cc9,0x24cd9,0x24cd9,0x24d06,0x24d06,0x24d13,0x24d13,0x24db8,0x24db8,0x24dea,0x24deb,0x24e3b,0x24e3b,0x24e50,0x24e50,0x24ea5,0x24ea5,0x24ea7,0x24ea7,0x24f0e,0x24f0e,0x24f5c,0x24f5c,0x24f82,0x24f82,0x24f86,0x24f86,0x24f97,0x24f97,0x24f9a,0x24f9a,0x24fa9,0x24fa9,0x24fb8,0x24fb8,0x24fc2,0x24fc2,0x2502c,0x2502c,0x25052,0x25052,0x2509d,0x2509d,0x2512b,0x2512b,0x25148,0x25148,0x2517d,0x2517e,0x251cd,0x251cd,0x251e3,0x251e3,0x251e6,0x251e7,0x25220,0x25221,0x25250,0x25250,0x25299,0x25299,0x252c7,0x252c7,0x252d8,0x252d8,0x2530e,0x2530e,0x25311,0x25311,0x25313,0x25313,0x25419,0x25419,0x25425,0x25425,0x2542f,0x25430,0x25446,0x25446,0x2546c,0x2546c,0x2546e,0x2546e,0x2549a,0x2549a,0x25531,0x25531,0x25535,0x25535,0x2553f,0x2553f,0x2555b,0x2555e,0x25562,0x25562,0x25565,0x25566,0x25581,0x25581,0x25584,0x25584,0x2558f,0x2558f,0x255b9,0x255b9,0x255d5,0x255d5,0x255db,0x255db,0x255e0,0x255e0,0x25605,0x25605,0x25635,0x25635,0x25651,0x25651,0x25683,0x25683,0x25695,0x25695,0x256e3,0x256e3,0x256f6,0x256f6,0x25706,0x25706,0x2571d,0x2571d,0x25725,0x25725,0x2573d,0x2573d,0x25772,0x25772,0x257c7,0x257c7,0x257df,0x257e1,0x25857,0x25857,0x2585d,0x2585d,0x25872,0x25872,0x258c8,0x258c8,0x258de,0x258de,0x258e1,0x258e1,0x25903,0x25903,0x25946,0x25946,0x25956,0x25956,0x259ac,0x259ac,0x259cc,0x259cc,0x25a54,0x25a54,0x25a95,0x25a95,0x25a9c,0x25a9c,0x25aae,0x25aaf,0x25ad7,0x25ad7,0x25ae9,0x25ae9,0x25b74,0x25b74,0x25b89,0x25b89,0x25bb3,0x25bb4,0x25bc6,0x25bc6,0x25be4,0x25be4,0x25be8,0x25be8,0x25c01,0x25c01,0x25c06,0x25c06,0x25c21,0x25c21,0x25c4a,0x25c4a,0x25c65,0x25c65,0x25c91,0x25c91,0x25ca4,0x25ca4,0x25cc0,0x25cc1,0x25cfe,0x25cfe,0x25d20,0x25d20,0x25d30,0x25d30,0x25d43,0x25d43,0x25d99,0x25d99,0x25db9,0x25db9,0x25e0e,0x25e0e,0x25e49,0x25e49,0x25e81,0x25e83,0x25ea6,0x25ea6,0x25ebc,0x25ebc,0x25ed7,0x25ed8,0x25f1a,0x25f1a,0x25f4b,0x25f4b,0x25fe1,0x25fe2,0x26021,0x26021,0x26029,0x26029,0x26048,0x26048,0x26064,0x26064,0x26083,0x26083,0x26097,0x26097,0x260a4,0x260a5,0x26102,0x26102,0x26121,0x26121,0x26159,0x2615c,0x261ad,0x261ae,0x261b2,0x261b2,0x261dd,0x261dd,0x26258,0x26258,0x26261,0x26261,0x2626a,0x2626b,0x262d0,0x262d0,0x26335,0x26335,0x2634b,0x2634c,0x26351,0x26351,0x263be,0x263be,0x263f5,0x263f5,0x263f8,0x263f8,0x26402,0x26402,0x26410,0x26412,0x2644a,0x2644a,0x26469,0x26469,0x26484,0x26484,0x26488,0x26489,0x2648d,0x2648d,0x26498,0x26498,0x26512,0x26512,0x26572,0x26572,0x265a0,0x265a0,0x265ad,0x265ad,0x265bf,0x265bf,0x26612,0x26612,0x26626,0x26626,0x266af,0x266af,0x266b1,0x266b1,0x266b5,0x266b5,0x266da,0x266da,0x266e8,0x266e8,0x266fc,0x266fc,0x26716,0x26716,0x26741,0x26741,0x26799,0x26799,0x267b3,0x267b4,0x267cc,0x267cc,0x2681c,0x2681c,0x26846,0x26846,0x2685e,0x2685e,0x2686e,0x2686e,0x26888,0x26888,0x2688a,0x2688a,0x26893,0x26893,0x268c7,0x268c7,0x2690e,0x2690e,0x26911,0x26911,0x26926,0x26926,0x26939,0x26939,0x26951,0x26951,0x269a8,0x269a8,0x269b5,0x269b5,0x269f2,0x269f2,0x269fa,0x269fa,0x26a2d,0x26a2e,0x26a34,0x26a34,0x26a42,0x26a42,0x26a51,0x26a52,0x26b05,0x26b05,0x26b0a,0x26b0a,0x26b13,0x26b13,0x26b15,0x26b15,0x26b23,0x26b23,0x26b28,0x26b28,0x26b50,0x26b53,0x26b5b,0x26b5b,0x26b75,0x26b75,0x26b82,0x26b82,0x26b96,0x26b97,0x26b9d,0x26b9d,0x26bb3,0x26bb3,0x26bc0,0x26bc0,0x26bf7,0x26bf7,0x26c21,0x26c21,0x26c40,0x26c41,0x26c46,0x26c46,0x26c7e,0x26c82,0x26ca4,0x26ca4,0x26cb7,0x26cb8,0x26cbd,0x26cbd,0x26cc0,0x26cc0,0x26cc3,0x26cc3,0x26cd1,0x26cd1,0x26d22,0x26d2a,0x26d51,0x26d51,0x26d74,0x26d74,0x26da0,0x26da7,0x26dae,0x26dae,0x26ddc,0x26ddc,0x26dea,0x26deb,0x26df0,0x26df0,0x26e00,0x26e00,0x26e05,0x26e05,0x26e07,0x26e07,0x26e12,0x26e12,0x26e42,0x26e45,0x26e6e,0x26e6e,0x26e72,0x26e72,0x26e77,0x26e77,0x26e84,0x26e84,0x26e88,0x26e88,0x26e8b,0x26e8b,0x26e99,0x26e99,0x26ed0,0x26ed7,0x26f26,0x26f26,0x26f73,0x26f74,0x26f9f,0x26f9f,0x26fa1,0x26fa1,0x26fbe,0x26fbe,0x26fde,0x26fdf,0x2700e,0x2700e,0x2704b,0x2704b,0x27052,0x27053,0x27088,0x27088,0x270ad,0x270af,0x270cd,0x270cd,0x270d2,0x270d2,0x270f0,0x270f0,0x270f8,0x270f8,0x27109,0x27109,0x2710c,0x2710d,0x27126,0x27127,0x27164,0x27165,0x27175,0x27175,0x271cd,0x271cd,0x2721b,0x2721b,0x27267,0x27267,0x27280,0x27280,0x27285,0x27285,0x2728b,0x2728b,0x272b2,0x272b2,0x272b6,0x272b6,0x272e6,0x272e6,0x27352,0x27352,0x2739a,0x2739a,0x273ff,0x273ff,0x27422,0x27422,0x27450,0x27450,0x27484,0x27484,0x27486,0x27486,0x27574,0x27574,0x275a3,0x275a3,0x275e0,0x275e0,0x275e4,0x275e4,0x275fd,0x275fe,0x27607,0x27607,0x2760c,0x2760c,0x27632,0x27632,0x27639,0x27639,0x27655,0x27657,0x27694,0x27694,0x2770f,0x2770f,0x27735,0x27736,0x27741,0x27741,0x2775e,0x2775e,0x27784,0x27785,0x277cc,0x277cc,0x27858,0x27858,0x27870,0x27870,0x2789d,0x2789d,0x278b2,0x278b2,0x278c8,0x278c8,0x27924,0x27924,0x27967,0x27967,0x2797a,0x2797a,0x279a0,0x279a0,0x279dd,0x279dd,0x279fd,0x279fd,0x27a0a,0x27a0a,0x27a0e,0x27a0e,0x27a3e,0x27a3e,0x27a53,0x27a53,0x27a59,0x27a59,0x27a79,0x27a79,0x27a84,0x27a84,0x27abd,0x27abe,0x27af4,0x27af4,0x27b06,0x27b06,0x27b0b,0x27b0b,0x27b18,0x27b18,0x27b38,0x27b3a,0x27b48,0x27b48,0x27b65,0x27b65,0x27bef,0x27bef,0x27bf4,0x27bf4,0x27c12,0x27c12,0x27c6c,0x27c6c,0x27cb1,0x27cb1,0x27cc5,0x27cc5,0x27d2f,0x27d2f,0x27d53,0x27d54,0x27d66,0x27d66,0x27d73,0x27d73,0x27d84,0x27d84,0x27d8f,0x27d8f,0x27d98,0x27d98,0x27dbd,0x27dbd,0x27ddc,0x27ddc,0x27e4d,0x27e4d,0x27e4f,0x27e4f,0x27f2e,0x27f2e,0x27fb7,0x27fb7,0x27ff9,0x27ff9,0x28002,0x28002,0x28009,0x28009,0x2801e,0x2801e,0x28023,0x28024,0x28048,0x28048,0x28083,0x28083,0x28090,0x28090,0x280bd,0x280be,0x280e8,0x280e9,0x280f4,0x280f4,0x2812e,0x2812e,0x2814f,0x2814f,0x2815d,0x2815d,0x2816f,0x2816f,0x28189,0x28189,0x281af,0x281af,0x281bc,0x281bc,0x28207,0x28207,0x28218,0x28218,0x2821a,0x2821a,0x28256,0x28256,0x2827c,0x2827c,0x2829b,0x2829b,0x282cd,0x282cd,0x282e2,0x282e2,0x28306,0x28306,0x28318,0x28318,0x2832f,0x2832f,0x2833a,0x2833a,0x28365,0x28365,0x2836d,0x2836d,0x2837d,0x2837d,0x2838a,0x2838a,0x28412,0x28412,0x28468,0x28468,0x2846c,0x2846c,0x28473,0x28473,0x28482,0x28482,0x28501,0x28501,0x2853c,0x2853d,0x2856c,0x2856c,0x285e8,0x285e8,0x285f4,0x285f4,0x28600,0x28600,0x2860b,0x2860b,0x28625,0x28625,0x2863b,0x2863b,0x286aa,0x286ab,0x286b2,0x286b2,0x286bc,0x286bc,0x286d8,0x286d8,0x286e6,0x286e6,0x2870f,0x2870f,0x28713,0x28713,0x28804,0x28804,0x2882b,0x2882b,0x2890d,0x2890d,0x28933,0x28933,0x28948,0x28949,0x28956,0x28956,0x28964,0x28964,0x28968,0x28968,0x2896c,0x2896d,0x2897e,0x2897e,0x28989,0x28989,0x289a8,0x289a8,0x289aa,0x289ab,0x289b8,0x289b8,0x289bc,0x289bc,0x289c0,0x289c0,0x289dc,0x289dc,0x289de,0x289de,0x289e1,0x289e1,0x289e3,0x289e4,0x289e7,0x289e8,0x289f9,0x289fc,0x28a0f,0x28a0f,0x28a16,0x28a16,0x28a25,0x28a25,0x28a29,0x28a29,0x28a32,0x28a32,0x28a36,0x28a36,0x28a44,0x28a4b,0x28a59,0x28a5a,0x28a81,0x28a83,0x28a9a,0x28a9c,0x28ac0,0x28ac0,0x28ac6,0x28ac6,0x28acb,0x28acc,0x28ace,0x28ace,0x28ade,0x28ae3,0x28ae5,0x28ae5,0x28aea,0x28aea,0x28afc,0x28afc,0x28b0c,0x28b0c,0x28b13,0x28b13,0x28b21,0x28b22,0x28b2b,0x28b2d,0x28b2f,0x28b2f,0x28b46,0x28b46,0x28b4c,0x28b4c,0x28b4e,0x28b4e,0x28b50,0x28b50,0x28b63,0x28b66,0x28b6c,0x28b6c,0x28b8f,0x28b8f,0x28b99,0x28b99,0x28b9c,0x28b9d,0x28bb9,0x28bb9,0x28bc2,0x28bc2,0x28bc5,0x28bc5,0x28bd4,0x28bd4,0x28bd7,0x28bd7,0x28bd9,0x28bda,0x28be7,0x28bec,0x28bf5,0x28bf5,0x28bff,0x28bff,0x28c03,0x28c03,0x28c09,0x28c09,0x28c1c,0x28c1d,0x28c23,0x28c23,0x28c26,0x28c26,0x28c2b,0x28c2b,0x28c30,0x28c30,0x28c39,0x28c39,0x28c3b,0x28c3b,0x28cca,0x28cca,0x28ccd,0x28ccd,0x28cd2,0x28cd2,0x28d34,0x28d34,0x28d99,0x28d99,0x28db9,0x28db9,0x28e0f,0x28e0f,0x28e36,0x28e36,0x28e39,0x28e39,0x28e65,0x28e66,0x28e97,0x28e97,0x28eac,0x28eac,0x28eb2,0x28eb3,0x28ed9,0x28ed9,0x28ee7,0x28ee7,0x28fc5,0x28fc5,0x29079,0x29079,0x29088,0x29088,0x2908b,0x2908b,0x29093,0x29093,0x290af,0x290b1,0x290c0,0x290c0,0x290e4,0x290e5,0x290ec,0x290ed,0x2910d,0x2910d,0x29110,0x29110,0x2913c,0x2913c,0x2914d,0x2914d,0x2915b,0x2915b,0x2915e,0x2915e,0x29170,0x29170,0x2919c,0x2919c,0x291a8,0x291a8,0x291d5,0x291d5,0x291eb,0x291eb,0x2941d,0x2941d,0x29420,0x29420,0x29433,0x29433,0x2943f,0x2943f,0x29448,0x29448,0x294d0,0x294d0,0x294d9,0x294da,0x294e5,0x294e5,0x294e7,0x294e7,0x2959e,0x2959e,0x295b0,0x295b0,0x295b8,0x295b8,0x295d7,0x295d7,0x295e9,0x295e9,0x295f4,0x295f4,0x2967f,0x2967f,0x29720,0x29720,0x29732,0x29732,0x297d4,0x297d4,0x29810,0x29810,0x29857,0x29857,0x298a4,0x298a4,0x298d1,0x298d1,0x298ea,0x298ea,0x298f1,0x298f1,0x298fa,0x298fa,0x29903,0x29903,0x29905,0x29905,0x2992f,0x2992f,0x29945,0x29945,0x29947,0x29949,0x2995d,0x2995d,0x2996a,0x2996a,0x2999d,0x2999d,0x299c3,0x299c3,0x299c9,0x299c9,0x29a28,0x29a28,0x29a4d,0x29a4d,0x29b05,0x29b05,0x29b0e,0x29b0e,0x29bd5,0x29bd5,0x29c73,0x29c73,0x29cad,0x29cad,0x29d3e,0x29d3e,0x29d5a,0x29d5a,0x29d7c,0x29d7c,0x29d98,0x29d98,0x29d9b,0x29d9b,0x29df6,0x29df6,0x29e06,0x29e06,0x29e2d,0x29e2d,0x29e68,0x29e68,0x29eac,0x29eac,0x29eb0,0x29eb0,0x29ec3,0x29ec3,0x29ef8,0x29ef8,0x29f23,0x29f23,0x29f30,0x29f30,0x29fb7,0x29fb7,0x29fde,0x29fde,0x2a014,0x2a014,0x2a087,0x2a087,0x2a0b9,0x2a0b9,0x2a0e1,0x2a0e1,0x2a0ed,0x2a0ed,0x2a0f3,0x2a0f3,0x2a0f8,0x2a0f8,0x2a0fe,0x2a0fe,0x2a107,0x2a107,0x2a123,0x2a123,0x2a133,0x2a134,0x2a150,0x2a150,0x2a192,0x2a193,0x2a1ab,0x2a1ab,0x2a1b4,0x2a1b5,0x2a1df,0x2a1df,0x2a1f5,0x2a1f5,0x2a220,0x2a220,0x2a233,0x2a233,0x2a293,0x2a293,0x2a29f,0x2a29f,0x2a2b2,0x2a2b2,0x2a2b4,0x2a2b4,0x2a2b6,0x2a2b6,0x2a2ba,0x2a2ba,0x2a2bd,0x2a2bd,0x2a2df,0x2a2df,0x2a2ff,0x2a2ff,0x2a351,0x2a351,0x2a3a9,0x2a3a9,0x2a3ed,0x2a3ed,0x2a434,0x2a434,0x2a45b,0x2a45b,0x2a5c6,0x2a5c6,0x2a5cb,0x2a5cb,0x2a601,0x2a601,0x2a632,0x2a632,0x2a64a,0x2a64a,0x2a65b,0x2a65b,0x2a6a9,0x2a6a9,0x2adff,0x2adff,0x2d544,0x2d544,0x2f825,0x2f825,0x2f83b,0x2f83b,0x2f840,0x2f840,0x2f878,0x2f878,0x2f894,0x2f894,0x2f8a6,0x2f8a6,0x2f8cd,0x2f8cd,0x2f8db,0x2f8db,0x2f994,0x2f994,0x2f9b2,0x2f9b2,0x2f9bc,0x2f9bc,0x2f9d4,0x2f9d4,0x30edd,0x30ede,0x3106c,0x3106c,]),
-  NotoFont.fromFlatRanges('Noto Sans Tagalog', 'https://fonts.gstatic.com/s/notosanstagalog/v15/J7aFnoNzCnFcV9ZI-sUYuvote1R0wwEAA8jHexnL.ttf', <int>[0x20,0x20,0xa0,0xa0,0x1700,0x170c,0x170e,0x1714,0x1735,0x1736,0x200b,0x200d,0x25cc,0x25cc,]),
-  NotoFont.fromFlatRanges('Noto Sans Tagbanwa', 'https://fonts.gstatic.com/s/notosanstagbanwa/v15/Y4GWYbB8VTEp4t3MKJSMmQdIKjRtt_nZRjQEaYpGoQ.ttf', <int>[0x20,0x20,0xa0,0xa0,0x1735,0x1736,0x1760,0x176c,0x176e,0x1770,0x1772,0x1773,0x200b,0x200d,0x25cc,0x25cc,]),
-  NotoFont.fromFlatRanges('Noto Sans Tai Le', 'https://fonts.gstatic.com/s/notosanstaile/v15/vEFK2-VODB8RrNDvZSUmVxEATwR58tK1W77HtMo.ttf', <int>[0x20,0x20,0xa0,0xa0,0x300,0x301,0x307,0x308,0x30c,0x30c,0x1040,0x1049,0x1950,0x196d,0x1970,0x1974,0x200b,0x200d,0x25cc,0x25cc,0x3001,0x3002,0x3008,0x300b,]),
-  NotoFont.fromFlatRanges('Noto Sans Tai Tham', 'https://fonts.gstatic.com/s/notosanstaitham/v17/kJEbBv0U4hgtwxDUw2x9q7tbjLIfbPGHBoaVSAZ3MdLJBCUbPgquyaRGKMw.ttf', <int>[0x20,0x20,0xa0,0xa0,0x1a20,0x1a5e,0x1a60,0x1a7c,0x1a7f,0x1a89,0x1a90,0x1a99,0x1aa0,0x1aad,0x200b,0x200d,0x2219,0x2219,]),
-  NotoFont.fromFlatRanges('Noto Sans Tai Viet', 'https://fonts.gstatic.com/s/notosanstaiviet/v15/8QIUdj3HhN_lv4jf9vsE-9GMOLsaSPZr644fWsRO9w.ttf', <int>[0x20,0x20,0xa0,0xa0,0x200b,0x200d,0x25cc,0x25cc,0xa78b,0xa78c,0xaa80,0xaac2,0xaadb,0xaadf,]),
-  NotoFont.fromFlatRanges('Noto Sans Takri', 'https://fonts.gstatic.com/s/notosanstakri/v15/TuGJUVpzXI5FBtUq5a8bnKIOdTwQNO_W3khJXg.ttf', <int>[0x20,0x20,0xa0,0xa0,0x964,0x965,0x200c,0x200d,0x25cc,0x25cc,0xa830,0xa839,0x11680,0x116b8,0x116c0,0x116c9,]),
-  NotoFont.fromFlatRanges('Noto Sans Tamil', 'https://fonts.gstatic.com/s/notosanstamil/v21/ieVc2YdFI3GCY6SyQy1KfStzYKZgzN1z4LKDbeZce-0429tBManUktuex7vGo70RqKDt_EvT.ttf', <int>[0x20,0x7e,0xa0,0xa3,0xa5,0xa5,0xa7,0xab,0xad,0xb0,0xb2,0xb4,0xb6,0xb8,0xba,0xbb,0xbf,0x107,0x10a,0x113,0x116,0x11b,0x11e,0x123,0x126,0x127,0x12a,0x12b,0x12e,0x133,0x136,0x137,0x139,0x13e,0x141,0x148,0x14a,0x14d,0x150,0x15b,0x15e,0x161,0x164,0x165,0x16a,0x17e,0x1cd,0x1ce,0x218,0x21b,0x237,0x237,0x2c6,0x2c7,0x2c9,0x2c9,0x2d8,0x2dd,0x300,0x304,0x306,0x308,0x30a,0x30c,0x312,0x312,0x326,0x328,0x951,0x952,0x964,0x965,0xb82,0xb83,0xb85,0xb8a,0xb8e,0xb90,0xb92,0xb95,0xb99,0xb9a,0xb9c,0xb9c,0xb9e,0xb9f,0xba3,0xba4,0xba8,0xbaa,0xbae,0xbb9,0xbbe,0xbc2,0xbc6,0xbc8,0xbca,0xbcd,0xbd0,0xbd0,0xbd7,0xbd7,0xbe6,0xbfa,0x1cda,0x1cda,0x1e80,0x1e85,0x1e9e,0x1e9e,0x1ef2,0x1ef3,0x200b,0x200d,0x2010,0x2010,0x2013,0x2014,0x2018,0x201a,0x201c,0x201e,0x2022,0x2022,0x2026,0x2026,0x2039,0x203a,0x2074,0x2074,0x2082,0x2084,0x20ac,0x20ac,0x20b9,0x20b9,0x2122,0x2122,0x2212,0x2212,0x25cc,0x25cc,0xa8f3,0xa8f3,0x11301,0x11301,0x11303,0x11303,0x1133b,0x1133c,]),
-  NotoFont.fromFlatRanges('Noto Sans Tamil Supplement', 'https://fonts.gstatic.com/s/notosanstamilsupplement/v19/DdTz78kEtnooLS5rXF1DaruiCd_bFp_Ph4sGcn7ax_vsAeMkeq1x.ttf', <int>[0x11fc0,0x11ff1,0x11fff,0x11fff,]),
-  NotoFont.fromFlatRanges('Noto Sans Telugu', 'https://fonts.gstatic.com/s/notosanstelugu/v19/0FlxVOGZlE2Rrtr-HmgkMWJNjJ5_RyT8o8c7fHkeg-esVC5dzHkHIJQqrEntezbqQUbf-3v37w.ttf', <int>[0x20,0x7e,0xa0,0xa3,0xa5,0xa5,0xa7,0xab,0xad,0xb0,0xb4,0xb4,0xb6,0xb8,0xba,0xbb,0xbf,0x107,0x10a,0x113,0x116,0x11b,0x11e,0x123,0x126,0x127,0x12a,0x12b,0x12e,0x133,0x136,0x137,0x139,0x13e,0x141,0x148,0x14a,0x14d,0x150,0x15b,0x15e,0x161,0x164,0x165,0x16a,0x17e,0x1cd,0x1ce,0x218,0x21b,0x237,0x237,0x2c6,0x2c7,0x2c9,0x2c9,0x2d8,0x2dd,0x300,0x304,0x306,0x308,0x30a,0x30c,0x312,0x312,0x326,0x328,0x951,0x952,0x964,0x965,0xc00,0xc0c,0xc0e,0xc10,0xc12,0xc28,0xc2a,0xc39,0xc3d,0xc44,0xc46,0xc48,0xc4a,0xc4d,0xc55,0xc56,0xc58,0xc5a,0xc60,0xc63,0xc66,0xc6f,0xc77,0xc7f,0x1cda,0x1cda,0x1cf2,0x1cf2,0x1e80,0x1e85,0x1e9e,0x1e9e,0x1ef2,0x1ef3,0x200b,0x200d,0x2010,0x2010,0x2013,0x2014,0x2018,0x201a,0x201c,0x201e,0x2022,0x2022,0x2026,0x2026,0x2039,0x203a,0x20ac,0x20ac,0x20b9,0x20b9,0x2122,0x2122,0x2212,0x2212,0x25cc,0x25cc,]),
-  NotoFont.fromFlatRanges('Noto Sans Thaana', 'https://fonts.gstatic.com/s/notosansthaana/v16/C8c14dM-vnz-s-3jaEsxlxHkBH-WZOETXfoQrfQ9Y4XrbhLhnu4-tbNu.ttf', <int>[0x20,0x21,0x28,0x29,0x2c,0x2c,0x2e,0x2e,0x3a,0x3b,0xa0,0xa0,0x60c,0x60c,0x61b,0x61b,0x61f,0x61f,0x660,0x66c,0x780,0x7b1,0x200b,0x200f,0x2018,0x2019,0x201c,0x201d,0x25cc,0x25cc,0xfdf2,0xfdf2,0xfdfd,0xfdfd,]),
-  NotoFont.fromFlatRanges('Noto Sans Thai', 'https://fonts.gstatic.com/s/notosansthai/v20/iJWnBXeUZi_OHPqn4wq6hQ2_hbJ1xyN9wd43SofNWcd1MKVQt_So_9CdU5RtpzF-QRvzzXg.ttf', <int>[0x20,0x7e,0xa0,0xa3,0xa5,0xa5,0xa7,0xab,0xae,0xb0,0xb4,0xb4,0xb6,0xb8,0xba,0xbb,0xbf,0x107,0x10a,0x113,0x116,0x11b,0x11e,0x123,0x126,0x127,0x12a,0x12b,0x12e,0x133,0x136,0x137,0x139,0x13e,0x141,0x148,0x14a,0x14d,0x150,0x15b,0x15e,0x161,0x164,0x165,0x16a,0x17e,0x1cd,0x1ce,0x218,0x21b,0x237,0x237,0x2bc,0x2bc,0x2c6,0x2c7,0x2c9,0x2c9,0x2d7,0x2dd,0x300,0x304,0x306,0x308,0x30a,0x30c,0x312,0x312,0x326,0x328,0x331,0x331,0xe01,0xe3a,0xe3f,0xe5b,0x1e80,0x1e85,0x1e9e,0x1e9e,0x1ef2,0x1ef3,0x200b,0x200d,0x2010,0x2010,0x2013,0x2014,0x2018,0x201a,0x201c,0x201e,0x2022,0x2022,0x2026,0x2026,0x2039,0x203a,0x20ac,0x20ac,0x2122,0x2122,0x2212,0x2212,0x25cc,0x25cc,]),
-  NotoFont.fromFlatRanges('Noto Sans Tifinagh', 'https://fonts.gstatic.com/s/notosanstifinagh/v15/I_uzMoCduATTei9eI8dawkHIwvmhCvbn6rnEcXfs4Q.ttf', <int>[0x20,0x20,0xa0,0xa0,0x2c7,0x2c7,0x301,0x302,0x304,0x304,0x306,0x307,0x309,0x309,0x323,0x323,0x331,0x331,0x200c,0x200d,0x202e,0x202e,0x25cc,0x25cc,0x2d30,0x2d67,0x2d6f,0x2d70,0x2d7f,0x2d7f,]),
-  NotoFont.fromFlatRanges('Noto Sans Tirhuta', 'https://fonts.gstatic.com/s/notosanstirhuta/v15/t5t6IQYRNJ6TWjahPR6X-M-apUyby7uGUBsTrn5P.ttf', <int>[0x20,0x20,0xa0,0xa0,0x951,0x952,0x964,0x965,0x9f4,0x9f7,0x1cf2,0x1cf2,0x200c,0x200d,0x25cc,0x25cc,0xa830,0xa839,0x11480,0x114c7,0x114d0,0x114d9,]),
-  NotoFont.fromFlatRanges('Noto Sans Ugaritic', 'https://fonts.gstatic.com/s/notosansugaritic/v15/3qTwoiqhnSyU8TNFIdhZVCwbjCpkAXXkMhoIkiazfg.ttf', <int>[0x20,0x20,0xa0,0xa0,0x10380,0x1039d,0x1039f,0x1039f,]),
-  NotoFont.fromFlatRanges('Noto Sans Vai', 'https://fonts.gstatic.com/s/notosansvai/v15/NaPecZTSBuhTirw6IaFn_UrURMTsDIRSfr0.ttf', <int>[0x20,0x20,0xa0,0xa0,0xa500,0xa62b,]),
-  NotoFont.fromFlatRanges('Noto Sans Wancho', 'https://fonts.gstatic.com/s/notosanswancho/v15/zrf-0GXXyfn6Fs0lH9P4cUubP0GBqAPopiRfKp8.ttf', <int>[0x20,0x20,0x22,0x22,0x27,0x29,0x2c,0x2f,0x5b,0x5d,0x7b,0x7b,0x7d,0x7d,0xa0,0xa0,0x201c,0x201d,0x25cc,0x25cc,0x1e2c0,0x1e2f9,0x1e2ff,0x1e2ff,]),
-  NotoFont.fromFlatRanges('Noto Sans Warang Citi', 'https://fonts.gstatic.com/s/notosanswarangciti/v15/EYqtmb9SzL1YtsZSScyKDXIeOv3w-zgsNvKRpeVCCXzdgA.ttf', <int>[0x20,0x20,0x27,0x27,0xa0,0xa0,0x200c,0x200d,0x118a0,0x118f2,0x118ff,0x118ff,]),
-  NotoFont.fromFlatRanges('Noto Sans Yi', 'https://fonts.gstatic.com/s/notosansyi/v15/sJoD3LFXjsSdcnzn071rO3apxVDJNVgSNg.ttf', <int>[0x20,0x20,0xa0,0xa0,0x3001,0x3002,0x3008,0x3011,0x3014,0x301b,0x30fb,0x30fb,0xa000,0xa48c,0xa490,0xa4c6,0xff61,0xff65,]),
-  NotoFont.fromFlatRanges('Noto Sans Zanabazar Square', 'https://fonts.gstatic.com/s/notosanszanabazarsquare/v15/Cn-jJsuGWQxOjaGwMQ6fOicyxLBEMRfDtkzl4uagQtJxOCEgN0Gc.ttf', <int>[0x20,0x20,0xa0,0xa0,0x25cc,0x25cc,0x11a00,0x11a47,]),
-];
diff --git a/lib/web_ui/lib/src/engine/canvaskit/font_fallbacks.dart b/lib/web_ui/lib/src/engine/canvaskit/font_fallbacks.dart
deleted file mode 100644
index 3491a432612081c57827cf9d4984f2d7194165b3..0000000000000000000000000000000000000000
--- a/lib/web_ui/lib/src/engine/canvaskit/font_fallbacks.dart
+++ /dev/null
@@ -1,525 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'dart:async';
-import 'dart:typed_data';
-
-import 'package:ui/src/engine/canvaskit/renderer.dart';
-
-import '../dom.dart';
-import '../font_change_util.dart';
-import '../initialization.dart';
-import '../renderer.dart';
-import '../util.dart';
-import 'canvaskit_api.dart';
-import 'font_fallback_data.dart';
-import 'fonts.dart';
-import 'interval_tree.dart';
-import 'noto_font.dart';
-
-/// Global static font fallback data.
-class FontFallbackData {
-  static FontFallbackData get instance => _instance;
-  static FontFallbackData _instance = FontFallbackData();
-
-  /// Resets the fallback font data.
-  ///
-  /// After calling this method fallback fonts will be loaded from scratch.
-  ///
-  /// Used for tests.
-  static void debugReset() {
-    _instance = FontFallbackData();
-    notoDownloadQueue = FallbackFontDownloadQueue();
-  }
-
-  /// Code units that no known font has a glyph for.
-  final Set<int> codeUnitsWithNoKnownFont = <int>{};
-
-  /// Code units which are known to be covered by at least one fallback font.
-  final Set<int> knownCoveredCodeUnits = <int>{};
-
-  /// Index of all font families by code unit range.
-  final IntervalTree<NotoFont> notoTree = createNotoFontTree();
-
-  static IntervalTree<NotoFont> createNotoFontTree() {
-    final Map<NotoFont, List<CodeunitRange>> ranges =
-        <NotoFont, List<CodeunitRange>>{};
-
-    for (final NotoFont font in fallbackFonts) {
-      // ignore: prefer_foreach
-      for (final CodeunitRange range in font.computeUnicodeRanges()) {
-        ranges.putIfAbsent(font, () => <CodeunitRange>[]).add(range);
-      }
-    }
-
-    return IntervalTree<NotoFont>.createFromRanges(ranges);
-  }
-
-  /// Fallback fonts which have been registered and loaded.
-  final List<RegisteredFont> registeredFallbackFonts = <RegisteredFont>[];
-
-  final List<String> globalFontFallbacks = <String>['Roboto'];
-
-  /// A list of code units to check against the global fallback fonts.
-  final Set<int> _codeUnitsToCheckAgainstFallbackFonts = <int>{};
-
-  /// This is [true] if we have scheduled a check for missing code units.
-  ///
-  /// We only do this once a frame, since checking if a font supports certain
-  /// code units is very expensive.
-  bool _scheduledCodeUnitCheck = false;
-
-  /// Determines if the given [text] contains any code points which are not
-  /// supported by the current set of fonts.
-  void ensureFontsSupportText(String text, List<String> fontFamilies) {
-    // TODO(hterkelsen): Make this faster for the common case where the text
-    // is supported by the given fonts.
-    if (debugDisableFontFallbacks) {
-      return;
-    }
-
-    // If the text is ASCII, then skip this check.
-    bool isAscii = true;
-    for (int i = 0; i < text.length; i++) {
-      if (text.codeUnitAt(i) >= 160) {
-        isAscii = false;
-        break;
-      }
-    }
-    if (isAscii) {
-      return;
-    }
-
-    // We have a cache of code units which are known to be covered by at least
-    // one of our fallback fonts, and a cache of code units which are known not
-    // to be covered by any fallback font. From the given text, construct a set
-    // of code units which need to be checked.
-    final Set<int> runesToCheck = <int>{};
-    for (final int rune in text.runes) {
-      // Filter out code units which ASCII, known to be covered, or known not
-      // to be covered.
-      if (!(rune < 160 ||
-          knownCoveredCodeUnits.contains(rune) ||
-          codeUnitsWithNoKnownFont.contains(rune))) {
-        runesToCheck.add(rune);
-      }
-    }
-    if (runesToCheck.isEmpty) {
-      return;
-    }
-
-    final List<int> codeUnits = runesToCheck.toList();
-
-    final List<SkFont> fonts = <SkFont>[];
-    for (final String font in fontFamilies) {
-      final List<SkFont>? typefacesForFamily =
-        CanvasKitRenderer.instance.fontCollection.familyToFontMap[font];
-      if (typefacesForFamily != null) {
-        fonts.addAll(typefacesForFamily);
-      }
-    }
-    final List<bool> codeUnitsSupported =
-        List<bool>.filled(codeUnits.length, false);
-    final String testString = String.fromCharCodes(codeUnits);
-    for (final SkFont font in fonts) {
-      final Uint16List glyphs = font.getGlyphIDs(testString);
-      assert(glyphs.length == codeUnitsSupported.length);
-      for (int i = 0; i < glyphs.length; i++) {
-        codeUnitsSupported[i] |= glyphs[i] != 0 || _isControlCode(codeUnits[i]);
-      }
-    }
-
-    if (codeUnitsSupported.any((bool x) => !x)) {
-      final List<int> missingCodeUnits = <int>[];
-      for (int i = 0; i < codeUnitsSupported.length; i++) {
-        if (!codeUnitsSupported[i]) {
-          missingCodeUnits.add(codeUnits[i]);
-        }
-      }
-      _codeUnitsToCheckAgainstFallbackFonts.addAll(missingCodeUnits);
-      if (!_scheduledCodeUnitCheck) {
-        _scheduledCodeUnitCheck = true;
-        CanvasKitRenderer.instance.rasterizer.addPostFrameCallback(_ensureFallbackFonts);
-      }
-    }
-  }
-
-  /// Returns [true] if [codepoint] is a Unicode control code.
-  bool _isControlCode(int codepoint) {
-    return codepoint < 32 || (codepoint > 127 && codepoint < 160);
-  }
-
-  /// Checks the missing code units against the current set of fallback fonts
-  /// and starts downloading new fallback fonts if the current set can't cover
-  /// the code units.
-  void _ensureFallbackFonts() {
-    _scheduledCodeUnitCheck = false;
-    // We don't know if the remaining code units are covered by our fallback
-    // fonts. Check them and update the cache.
-    if (_codeUnitsToCheckAgainstFallbackFonts.isEmpty) {
-      return;
-    }
-    final List<int> codeUnits = _codeUnitsToCheckAgainstFallbackFonts.toList();
-    _codeUnitsToCheckAgainstFallbackFonts.clear();
-    final List<bool> codeUnitsSupported =
-        List<bool>.filled(codeUnits.length, false);
-    final String testString = String.fromCharCodes(codeUnits);
-
-    for (final String font in globalFontFallbacks) {
-      final List<SkFont>? fontsForFamily =
-          CanvasKitRenderer.instance.fontCollection.familyToFontMap[font];
-      if (fontsForFamily == null) {
-        printWarning('A fallback font was registered but we '
-            'cannot retrieve the typeface for it.');
-        continue;
-      }
-      for (final SkFont font in fontsForFamily) {
-        final Uint16List glyphs = font.getGlyphIDs(testString);
-        assert(glyphs.length == codeUnitsSupported.length);
-        for (int i = 0; i < glyphs.length; i++) {
-          final bool codeUnitSupported = glyphs[i] != 0;
-          if (codeUnitSupported) {
-            knownCoveredCodeUnits.add(codeUnits[i]);
-          }
-          codeUnitsSupported[i] |=
-              codeUnitSupported || _isControlCode(codeUnits[i]);
-        }
-      }
-
-      // Once we've checked every typeface for this family, check to see if
-      // every code unit has been covered in order to avoid unnecessary checks.
-      bool keepGoing = false;
-      for (final bool supported in codeUnitsSupported) {
-        if (!supported) {
-          keepGoing = true;
-          break;
-        }
-      }
-
-      if (!keepGoing) {
-        return;
-      }
-    }
-
-    // If we reached here, then there are some code units which aren't covered
-    // by the global fallback fonts. Remove the ones which were covered and
-    // try to find fallback fonts which cover them.
-    for (int i = codeUnits.length - 1; i >= 0; i--) {
-      if (codeUnitsSupported[i]) {
-        codeUnits.removeAt(i);
-      }
-    }
-    findFontsForMissingCodeunits(codeUnits);
-  }
-
-  void registerFallbackFont(String family, Uint8List bytes) {
-    final SkTypeface? typeface =
-        canvasKit.Typeface.MakeFreeTypeFaceFromData(bytes.buffer);
-    if (typeface == null) {
-      printWarning('Failed to parse fallback font $family as a font.');
-      return;
-    }
-    // Insert emoji font before all other fallback fonts so we use the emoji
-    // whenever it's available.
-    registeredFallbackFonts.add(RegisteredFont(bytes, family, typeface));
-    // Insert emoji font before all other fallback fonts so we use the emoji
-    // whenever it's available.
-    if (family == 'Noto Emoji') {
-      if (globalFontFallbacks.first == 'Roboto') {
-        globalFontFallbacks.insert(1, family);
-      } else {
-        globalFontFallbacks.insert(0, family);
-      }
-    } else {
-      globalFontFallbacks.add(family);
-    }
-  }
-}
-
-Future<void> findFontsForMissingCodeunits(List<int> codeUnits) async {
-  final FontFallbackData data = FontFallbackData.instance;
-
-  Set<NotoFont> fonts = <NotoFont>{};
-  final Set<int> coveredCodeUnits = <int>{};
-  final Set<int> missingCodeUnits = <int>{};
-  for (final int codeUnit in codeUnits) {
-    final List<NotoFont> fontsForUnit = data.notoTree.intersections(codeUnit);
-    fonts.addAll(fontsForUnit);
-    if (fontsForUnit.isNotEmpty) {
-      coveredCodeUnits.add(codeUnit);
-    } else {
-      missingCodeUnits.add(codeUnit);
-    }
-  }
-
-  // The call to `findMinimumFontsForCodeUnits` will remove all code units that
-  // were matched by `fonts` from `unmatchedCodeUnits`.
-  final Set<int> unmatchedCodeUnits = Set<int>.from(coveredCodeUnits);
-  fonts = findMinimumFontsForCodeUnits(unmatchedCodeUnits, fonts);
-
-  fonts.forEach(notoDownloadQueue.add);
-
-  // We looked through the Noto font tree and didn't find any font families
-  // covering some code units.
-  if (missingCodeUnits.isNotEmpty || unmatchedCodeUnits.isNotEmpty) {
-    if (!notoDownloadQueue.isPending) {
-      printWarning('Could not find a set of Noto fonts to display all missing '
-          'characters. Please add a font asset for the missing characters.'
-          ' See: https://flutter.dev/docs/cookbook/design/fonts');
-      data.codeUnitsWithNoKnownFont.addAll(missingCodeUnits);
-    }
-  }
-}
-
-/// Finds the minimum set of fonts which covers all of the [codeUnits].
-///
-/// Removes all code units covered by [fonts] from [codeUnits]. The code
-/// units remaining in the [codeUnits] set after calling this function do not
-/// have a font that covers them and can be omitted next time to avoid
-/// searching for fonts unnecessarily.
-///
-/// Since set cover is NP-complete, we approximate using a greedy algorithm
-/// which finds the font which covers the most code units. If multiple CJK
-/// fonts match the same number of code units, we choose one based on the user's
-/// locale.
-Set<NotoFont> findMinimumFontsForCodeUnits(
-    Set<int> codeUnits, Set<NotoFont> fonts) {
-  assert(fonts.isNotEmpty || codeUnits.isEmpty);
-  final Set<NotoFont> minimumFonts = <NotoFont>{};
-  final List<NotoFont> bestFonts = <NotoFont>[];
-
-  final String language = domWindow.navigator.language;
-
-  while (codeUnits.isNotEmpty) {
-    int maxCodeUnitsCovered = 0;
-    bestFonts.clear();
-    for (final NotoFont font in fonts) {
-      int codeUnitsCovered = 0;
-      for (final int codeUnit in codeUnits) {
-        if (font.contains(codeUnit)) {
-          codeUnitsCovered++;
-        }
-      }
-      if (codeUnitsCovered > maxCodeUnitsCovered) {
-        bestFonts.clear();
-        bestFonts.add(font);
-        maxCodeUnitsCovered = codeUnitsCovered;
-      } else if (codeUnitsCovered == maxCodeUnitsCovered) {
-        bestFonts.add(font);
-      }
-    }
-    if (maxCodeUnitsCovered == 0) {
-      // Fonts cannot cover remaining unmatched characters.
-      break;
-    }
-    // If the list of best fonts are all CJK fonts, choose the best one based
-    // on locale. Otherwise just choose the first font.
-    NotoFont bestFont = bestFonts.first;
-    if (bestFonts.length > 1) {
-      if (bestFonts.every((NotoFont font) => _cjkFonts.contains(font))) {
-        if (language == 'zh-Hans' ||
-            language == 'zh-CN' ||
-            language == 'zh-SG' ||
-            language == 'zh-MY') {
-          if (bestFonts.contains(_notoSansSC)) {
-            bestFont = _notoSansSC;
-          }
-        } else if (language == 'zh-Hant' ||
-            language == 'zh-TW' ||
-            language == 'zh-MO') {
-          if (bestFonts.contains(_notoSansTC)) {
-            bestFont = _notoSansTC;
-          }
-        } else if (language == 'zh-HK') {
-          if (bestFonts.contains(_notoSansHK)) {
-            bestFont = _notoSansHK;
-          }
-        } else if (language == 'ja') {
-          if (bestFonts.contains(_notoSansJP)) {
-            bestFont = _notoSansJP;
-          }
-        } else if (language == 'ko') {
-          if (bestFonts.contains(_notoSansKR)) {
-            bestFont = _notoSansKR;
-          }
-        } else if (bestFonts.contains(_notoSansSC)) {
-          bestFont = _notoSansSC;
-        }
-      } else {
-        // To be predictable, if there is a tie for best font, choose a font
-        // from this list first, then just choose the first font.
-        if (bestFonts.contains(_notoSymbols)) {
-          bestFont = _notoSymbols;
-        } else if (bestFonts.contains(_notoSansSC)) {
-          bestFont = _notoSansSC;
-        }
-      }
-    }
-    codeUnits.removeWhere((int codeUnit) {
-      return bestFont.contains(codeUnit);
-    });
-    minimumFonts.add(bestFont);
-  }
-  return minimumFonts;
-}
-
-NotoFont _notoSansSC = fallbackFonts.singleWhere((NotoFont font) => font.name == 'Noto Sans SC');
-NotoFont _notoSansTC = fallbackFonts.singleWhere((NotoFont font) => font.name == 'Noto Sans TC');
-NotoFont _notoSansHK = fallbackFonts.singleWhere((NotoFont font) => font.name == 'Noto Sans HK');
-NotoFont _notoSansJP = fallbackFonts.singleWhere((NotoFont font) => font.name == 'Noto Sans JP');
-NotoFont _notoSansKR = fallbackFonts.singleWhere((NotoFont font) => font.name == 'Noto Sans KR');
-List<NotoFont> _cjkFonts = <NotoFont>[_notoSansSC, _notoSansTC, _notoSansHK, _notoSansJP, _notoSansKR];
-
-NotoFont _notoSymbols = fallbackFonts.singleWhere((NotoFont font) => font.name == 'Noto Sans Symbols');
-
-class FallbackFontDownloadQueue {
-  NotoDownloader downloader = NotoDownloader();
-
-  final Set<NotoFont> downloadedFonts = <NotoFont>{};
-  final Map<String, NotoFont> pendingFonts = <String, NotoFont>{};
-
-  bool get isPending => pendingFonts.isNotEmpty || _fontsLoading != null;
-
-  Future<void>? _fontsLoading;
-  bool get debugIsLoadingFonts => _fontsLoading != null;
-
-  Future<void> debugWhenIdle() async {
-    if (assertionsEnabled) {
-      await Future<void>.delayed(Duration.zero);
-      while (isPending) {
-        if (_fontsLoading != null) {
-          await _fontsLoading;
-        }
-        if (pendingFonts.isNotEmpty) {
-          await Future<void>.delayed(const Duration(milliseconds: 100));
-          if (pendingFonts.isEmpty) {
-            await Future<void>.delayed(const Duration(milliseconds: 100));
-          }
-        }
-      }
-    } else {
-      throw UnimplementedError();
-    }
-  }
-
-  void add(NotoFont font) {
-    if (downloadedFonts.contains(font) ||
-        pendingFonts.containsKey(font.url)) {
-      return;
-    }
-    final bool firstInBatch = pendingFonts.isEmpty;
-    pendingFonts[font.url] = font;
-    if (firstInBatch) {
-      Timer.run(startDownloads);
-    }
-  }
-
-  Future<void> startDownloads() async {
-    final Map<String, Future<void>> downloads = <String, Future<void>>{};
-    final Map<String, Uint8List> downloadedData = <String, Uint8List>{};
-    for (final NotoFont font in pendingFonts.values) {
-      downloads[font.url] = Future<void>(() async {
-        ByteBuffer buffer;
-        try {
-          buffer = await downloader.downloadAsBytes(font.url,
-              debugDescription: font.name);
-        } catch (e) {
-          pendingFonts.remove(font.url);
-          printWarning('Failed to load font ${font.name} at ${font.url}');
-          printWarning(e.toString());
-          return;
-        }
-        downloadedFonts.add(font);
-        downloadedData[font.url] = buffer.asUint8List();
-      });
-    }
-
-    await Future.wait<void>(downloads.values);
-
-    // Register fallback fonts in a predictable order. Otherwise, the fonts
-    // change their precedence depending on the download order causing
-    // visual differences between app reloads.
-    final List<String> downloadOrder =
-        (downloadedData.keys.toList()..sort()).reversed.toList();
-    for (final String url in downloadOrder) {
-      final NotoFont font = pendingFonts.remove(url)!;
-      final Uint8List bytes = downloadedData[url]!;
-      FontFallbackData.instance.registerFallbackFont(font.name, bytes);
-      if (pendingFonts.isEmpty) {
-        renderer.fontCollection.registerDownloadedFonts();
-        sendFontChangeMessage();
-      }
-    }
-
-    if (pendingFonts.isNotEmpty) {
-      await startDownloads();
-    }
-  }
-}
-
-class NotoDownloader {
-  int get debugActiveDownloadCount => _debugActiveDownloadCount;
-  int _debugActiveDownloadCount = 0;
-
-  /// Returns a future that resolves when there are no pending downloads.
-  ///
-  /// Useful in tests to make sure that fonts are loaded before working with
-  /// text.
-  Future<void> debugWhenIdle() async {
-    if (assertionsEnabled) {
-      // Some downloads begin asynchronously in a microtask or in a Timer.run.
-      // Let those run before waiting for downloads to finish.
-      await Future<void>.delayed(Duration.zero);
-      while (_debugActiveDownloadCount > 0) {
-        await Future<void>.delayed(const Duration(milliseconds: 100));
-        // If we started with a non-zero count and hit zero while waiting, wait a
-        // little more to make sure another download doesn't get chained after
-        // the last one (e.g. font file download after font CSS download).
-        if (_debugActiveDownloadCount == 0) {
-          await Future<void>.delayed(const Duration(milliseconds: 100));
-        }
-      }
-    } else {
-      throw UnimplementedError();
-    }
-  }
-
-  /// Downloads the [url] and returns it as a [ByteBuffer].
-  ///
-  /// Override this for testing.
-  Future<ByteBuffer> downloadAsBytes(String url, {String? debugDescription}) {
-    if (assertionsEnabled) {
-      _debugActiveDownloadCount += 1;
-    }
-    final Future<ByteBuffer> result = httpFetch(url).then(
-        (DomResponse fetchResult) => fetchResult
-            .arrayBuffer()
-            .then<ByteBuffer>((dynamic x) => x as ByteBuffer));
-    if (assertionsEnabled) {
-      result.whenComplete(() {
-        _debugActiveDownloadCount -= 1;
-      });
-    }
-    return result;
-  }
-
-  /// Downloads the [url] and returns is as a [String].
-  ///
-  /// Override this for testing.
-  Future<String> downloadAsString(String url, {String? debugDescription}) {
-    if (assertionsEnabled) {
-      _debugActiveDownloadCount += 1;
-    }
-    final Future<String> result = httpFetch(url).then((DomResponse response) =>
-        response.text().then<String>((dynamic x) => x as String));
-    if (assertionsEnabled) {
-      result.whenComplete(() {
-        _debugActiveDownloadCount -= 1;
-      });
-    }
-    return result;
-  }
-}
-
-FallbackFontDownloadQueue notoDownloadQueue = FallbackFontDownloadQueue();
diff --git a/lib/web_ui/lib/src/engine/canvaskit/fonts.dart b/lib/web_ui/lib/src/engine/canvaskit/fonts.dart
index 694a015168e87c19928a4d04eb260610607338f8..57b88acb878a6a85e0de0994f167bfd55bd8ea7f 100644
--- a/lib/web_ui/lib/src/engine/canvaskit/fonts.dart
+++ b/lib/web_ui/lib/src/engine/canvaskit/fonts.dart
@@ -3,28 +3,27 @@
 // found in the LICENSE file.
 
 import 'dart:async';
-import 'dart:convert';
 import 'dart:typed_data';
 
-import '../assets.dart';
-import '../dom.dart';
-import '../fonts.dart';
-import '../util.dart';
-import 'canvaskit_api.dart';
-import 'font_fallbacks.dart';
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
 // This URL was found by using the Google Fonts Developer API to find the URL
 // for Roboto. The API warns that this URL is not stable. In order to update
 // this, list out all of the fonts and find the URL for the regular
 // Roboto font. The API reference is here:
 // https://developers.google.com/fonts/docs/developer_api
-const String _robotoUrl =
-    'https://fonts.gstatic.com/s/roboto/v20/KFOmCnqEu92Fr1Me5WZLCzYlKw.ttf';
+String _robotoUrl =
+    '${configuration.fontFallbackBaseUrl}roboto/v20/KFOmCnqEu92Fr1Me5WZLCzYlKw.ttf';
 
 /// Manages the fonts used in the Skia-based backend.
-class SkiaFontCollection implements FontCollection {
+class SkiaFontCollection implements FlutterFontCollection {
   final Set<String> _downloadedFontFamilies = <String>{};
 
+  @override
+  late FontFallbackManager fontFallbackManager =
+    FontFallbackManager(SkiaFallbackRegistry(this));
+
   /// Fonts that started the download process, but are not yet registered.
   ///
   /// /// Once downloaded successfully, this map is cleared and the resulting
@@ -32,37 +31,44 @@ class SkiaFontCollection implements FontCollection {
   final List<UnregisteredFont> _unregisteredFonts = <UnregisteredFont>[];
 
   final List<RegisteredFont> _registeredFonts = <RegisteredFont>[];
+  final List<RegisteredFont> registeredFallbackFonts = <RegisteredFont>[];
 
   /// Returns fonts that have been downloaded, registered, and parsed.
   ///
   /// This should only be used in tests.
   List<RegisteredFont>? get debugRegisteredFonts {
-    if (!assertionsEnabled) {
-      return null;
-    }
-    return _registeredFonts;
+    List<RegisteredFont>? result;
+    assert(() {
+      result = _registeredFonts;
+      return true;
+    }());
+    return result;
   }
 
   final Map<String, List<SkFont>> familyToFontMap = <String, List<SkFont>>{};
 
   void _registerWithFontProvider() {
-    if (fontProvider != null) {
-      fontProvider!.delete();
-      fontProvider = null;
+    if (_fontProvider != null) {
+      _fontProvider!.delete();
+      _fontProvider = null;
+      skFontCollection?.delete();
+      skFontCollection = null;
     }
-    fontProvider = canvasKit.TypefaceFontProvider.Make();
+    _fontProvider = canvasKit.TypefaceFontProvider.Make();
+    skFontCollection = canvasKit.FontCollection.Make();
+    skFontCollection!.enableFontFallback();
+    skFontCollection!.setDefaultFontManager(_fontProvider);
     familyToFontMap.clear();
 
     for (final RegisteredFont font in _registeredFonts) {
-      fontProvider!.registerFont(font.bytes, font.family);
+      _fontProvider!.registerFont(font.bytes, font.family);
       familyToFontMap
           .putIfAbsent(font.family, () => <SkFont>[])
           .add(SkFont(font.typeface));
     }
 
-    for (final RegisteredFont font
-        in FontFallbackData.instance.registeredFallbackFonts) {
-      fontProvider!.registerFont(font.bytes, font.family);
+    for (final RegisteredFont font in registeredFallbackFonts) {
+      _fontProvider!.registerFont(font.bytes, font.family);
       familyToFontMap
           .putIfAbsent(font.family, () => <SkFont>[])
           .add(SkFont(font.typeface));
@@ -70,15 +76,18 @@ class SkiaFontCollection implements FontCollection {
   }
 
   @override
-  Future<void> loadFontFromList(Uint8List list, {String? fontFamily}) async {
+  Future<bool> loadFontFromList(Uint8List list, {String? fontFamily}) async {
     if (fontFamily == null) {
       fontFamily = _readActualFamilyName(list);
       if (fontFamily == null) {
         printWarning('Failed to read font family name. Aborting font load.');
-        return;
+        return false;
       }
     }
 
+    // Make sure CanvasKit is actually loaded
+    await renderer.initialize();
+
     final SkTypeface? typeface =
         canvasKit.Typeface.MakeFreeTypeFaceFromData(list.buffer);
     if (typeface != null) {
@@ -86,59 +95,65 @@ class SkiaFontCollection implements FontCollection {
       _registerWithFontProvider();
     } else {
       printWarning('Failed to parse font family "$fontFamily"');
-      return;
+      return false;
     }
+    return true;
   }
 
   /// Loads fonts from `FontManifest.json`.
   @override
-  Future<void> downloadAssetFonts(AssetManager assetManager) async {
-    ByteData byteData;
-
-    try {
-      byteData = await assetManager.load('FontManifest.json');
-    } on AssetManagerException catch (e) {
-      if (e.httpStatus == 404) {
-        printWarning('Font manifest does not exist at `${e.url}` – ignoring.');
-        return;
-      } else {
-        rethrow;
+  Future<AssetFontsResult> loadAssetFonts(FontManifest manifest) async {
+    final List<Future<FontDownloadResult>> pendingDownloads = <Future<FontDownloadResult>>[];
+    bool loadedRoboto = false;
+    for (final FontFamily family in manifest.families) {
+      if (family.name == 'Roboto') {
+        loadedRoboto = true;
+      }
+      for (final FontAsset fontAsset in family.fontAssets) {
+        final String url = ui_web.assetManager.getAssetUrl(fontAsset.asset);
+        pendingDownloads.add(_downloadFont(fontAsset.asset, url, family.name));
       }
     }
 
-    final List<dynamic>? fontManifest =
-        json.decode(utf8.decode(byteData.buffer.asUint8List())) as List<dynamic>?;
-    if (fontManifest == null) {
-      throw AssertionError(
-          'There was a problem trying to load FontManifest.json');
+    /// We need a default fallback font for CanvasKit, in order to avoid
+    /// crashing while laying out text with an unregistered font. We chose
+    /// Roboto to match Android.
+    if (!loadedRoboto) {
+      // Download Roboto and add it to the font buffers.
+      pendingDownloads.add(_downloadFont('Roboto', _robotoUrl, 'Roboto'));
     }
 
-    final List<Future<UnregisteredFont?>> pendingFonts = <Future<UnregisteredFont?>>[];
-
-    for (final Map<String, dynamic> fontFamily
-        in fontManifest.cast<Map<String, dynamic>>()) {
-      final String family = fontFamily.readString('family');
-      final List<dynamic> fontAssets = fontFamily.readList('fonts');
-      for (final dynamic fontAssetItem in fontAssets) {
-        final Map<String, dynamic> fontAsset = fontAssetItem as Map<String, dynamic>;
-        final String asset = fontAsset.readString('asset');
-        _downloadFont(pendingFonts, assetManager.getAssetUrl(asset), family);
+    final Map<String, FontLoadError> fontFailures = <String, FontLoadError>{};
+    final List<(String, UnregisteredFont)> downloadedFonts = <(String, UnregisteredFont)>[];
+    for (final FontDownloadResult result in await Future.wait(pendingDownloads)) {
+      if (result.font != null) {
+        downloadedFonts.add((result.assetName, result.font!));
+      } else {
+        fontFailures[result.assetName] = result.error!;
       }
     }
 
-    /// We need a default fallback font for CanvasKit, in order to
-    /// avoid crashing while laying out text with an unregistered font. We chose
-    /// Roboto to match Android.
-    if (!_isFontFamilyDownloaded('Roboto')) {
-      // Download Roboto and add it to the font buffers.
-      _downloadFont(pendingFonts, _robotoUrl, 'Roboto');
-    }
+    // Make sure CanvasKit is actually loaded
+    await renderer.initialize();
 
-    final List<UnregisteredFont?> completedPendingFonts = await Future.wait(pendingFonts);
-    _unregisteredFonts.addAll(completedPendingFonts.whereType<UnregisteredFont>());
+    final List<String> loadedFonts = <String>[];
+    for (final (String assetName, UnregisteredFont unregisteredFont) in downloadedFonts) {
+      final Uint8List bytes = unregisteredFont.bytes.asUint8List();
+      final SkTypeface? typeface =
+          canvasKit.Typeface.MakeFreeTypeFaceFromData(bytes.buffer);
+      if (typeface != null) {
+        loadedFonts.add(assetName);
+        _registeredFonts.add(RegisteredFont(bytes, unregisteredFont.family, typeface));
+      } else {
+        printWarning('Failed to load font ${unregisteredFont.family} at ${unregisteredFont.url}');
+        printWarning('Verify that ${unregisteredFont.url} contains a valid font.');
+        fontFailures[assetName] = FontInvalidDataError(unregisteredFont.url);
+      }
+    }
+    registerDownloadedFonts();
+    return AssetFontsResult(loadedFonts, fontFailures);
   }
 
-  @override
   void registerDownloadedFonts() {
     RegisteredFont? makeRegisterFont(ByteBuffer buffer, String url, String family) {
       final Uint8List bytes = buffer.asUint8List();
@@ -168,57 +183,30 @@ class SkiaFontCollection implements FontCollection {
     _registerWithFontProvider();
   }
 
-  /// Whether the [fontFamily] was registered and/or loaded.
-  bool _isFontFamilyDownloaded(String fontFamily) {
-    return _downloadedFontFamilies.contains(fontFamily);
-  }
-
-  /// Loads the Ahem font, unless it's already been loaded using
-  /// `FontManifest.json` (see [downloadAssetFonts]).
-  ///
-  /// `FontManifest.json` has higher priority than the default test font URLs.
-  /// This allows customizing test environments where fonts are loaded from
-  /// different URLs.
-  @override
-  Future<void> debugDownloadTestFonts() async {
-    final List<Future<UnregisteredFont?>> pendingFonts = <Future<UnregisteredFont?>>[];
-    if (!_isFontFamilyDownloaded(ahemFontFamily)) {
-      _downloadFont(pendingFonts, ahemFontUrl, ahemFontFamily);
-    }
-    if (!_isFontFamilyDownloaded(robotoFontFamily)) {
-      _downloadFont(pendingFonts, robotoTestFontUrl, robotoFontFamily);
-    }
-    if (!_isFontFamilyDownloaded(robotoVariableFontFamily)) {
-      _downloadFont(pendingFonts, robotoVariableTestFontUrl, robotoVariableFontFamily);
-    }
-
-    final List<UnregisteredFont?> completedPendingFonts = await Future.wait(pendingFonts);
-    _unregisteredFonts.addAll(completedPendingFonts.whereType<UnregisteredFont>());
-
-    // Ahem must be added to font fallbacks list regardless of where it was
-    // downloaded from.
-    FontFallbackData.instance.globalFontFallbacks.add(ahemFontFamily);
-  }
-
-  void _downloadFont(
-    List<Future<UnregisteredFont?>> waitUnregisteredFonts,
+  Future<FontDownloadResult> _downloadFont(
+    String assetName,
     String url,
-    String family
-  ) {
-    Future<UnregisteredFont?> downloadFont() async {
-      ByteBuffer buffer;
-      try {
-        buffer = await httpFetch(url).then(_getArrayBuffer);
-        return UnregisteredFont(buffer, url, family);
-      } catch (e) {
-        printWarning('Failed to load font $family at $url');
-        printWarning(e.toString());
-        return null;
+    String fontFamily
+  ) async {
+    final ByteBuffer fontData;
+
+    // Try to get the font leniently. Do not crash the app when failing to
+    // fetch the font in the spirit of "gradual degradation of functionality".
+    try {
+      final HttpFetchResponse response = await httpFetch(url);
+      if (!response.hasPayload) {
+        printWarning('Font family $fontFamily not found (404) at $url');
+        return FontDownloadResult.fromError(assetName, FontNotFoundError(url));
       }
-    }
 
-    _downloadedFontFamilies.add(family);
-    waitUnregisteredFonts.add(downloadFont());
+      fontData = await response.asByteBuffer();
+    } catch (e) {
+      printWarning('Failed to load font $fontFamily at $url');
+      printWarning(e.toString());
+      return FontDownloadResult.fromError(assetName, FontDownloadError(url, e));
+    }
+    _downloadedFontFamilies.add(fontFamily);
+    return FontDownloadResult.fromFont(assetName, UnregisteredFont(fontData, url, fontFamily));
   }
 
 
@@ -230,16 +218,17 @@ class SkiaFontCollection implements FontCollection {
     return actualFamily;
   }
 
-  Future<ByteBuffer> _getArrayBuffer(DomResponse fetchResult) {
-    return fetchResult
-        .arrayBuffer()
-        .then<ByteBuffer>((dynamic x) => x as ByteBuffer);
-  }
-
-  TypefaceFontProvider? fontProvider;
+  TypefaceFontProvider? _fontProvider;
+  SkFontCollection? skFontCollection;
 
   @override
   void clear() {}
+
+  @override
+  void debugResetFallbackFonts() {
+    fontFallbackManager = FontFallbackManager(SkiaFallbackRegistry(this));
+    registeredFallbackFonts.clear();
+  }
 }
 
 /// Represents a font that has been registered.
@@ -269,3 +258,66 @@ class UnregisteredFont {
   final String url;
   final String family;
 }
+
+class FontDownloadResult {
+  FontDownloadResult.fromFont(this.assetName, UnregisteredFont this.font) : error = null;
+  FontDownloadResult.fromError(this.assetName, FontLoadError this.error) : font = null;
+
+  final String assetName;
+  final UnregisteredFont? font;
+  final FontLoadError? error;
+}
+
+class SkiaFallbackRegistry implements FallbackFontRegistry {
+  SkiaFallbackRegistry(this.fontCollection);
+
+  SkiaFontCollection fontCollection;
+
+  @override
+  List<int> getMissingCodePoints(List<int> codeUnits, List<String> fontFamilies) {
+    final List<SkFont> fonts = <SkFont>[];
+    for (final String font in fontFamilies) {
+      final List<SkFont>? typefacesForFamily = fontCollection.familyToFontMap[font];
+      if (typefacesForFamily != null) {
+        fonts.addAll(typefacesForFamily);
+      }
+    }
+    final List<bool> codePointsSupported =
+        List<bool>.filled(codeUnits.length, false);
+    final String testString = String.fromCharCodes(codeUnits);
+    for (final SkFont font in fonts) {
+      final Uint16List glyphs = font.getGlyphIDs(testString);
+      assert(glyphs.length == codePointsSupported.length);
+      for (int i = 0; i < glyphs.length; i++) {
+        codePointsSupported[i] |= glyphs[i] != 0;
+      }
+    }
+
+    final List<int> missingCodeUnits = <int>[];
+    for (int i = 0; i < codePointsSupported.length; i++) {
+      if (!codePointsSupported[i]) {
+        missingCodeUnits.add(codeUnits[i]);
+      }
+    }
+    return missingCodeUnits;
+  }
+
+  @override
+  Future<void> loadFallbackFont(String familyName, String url) async {
+    final ByteBuffer buffer = await httpFetchByteBuffer(url);
+    final SkTypeface? typeface =
+        canvasKit.Typeface.MakeFreeTypeFaceFromData(buffer);
+    if (typeface == null) {
+      printWarning('Failed to parse fallback font $familyName as a font.');
+      return;
+    }
+    fontCollection.registeredFallbackFonts.add(
+      RegisteredFont(buffer.asUint8List(), familyName, typeface)
+    );
+  }
+
+  @override
+  void updateFallbackFontFamilies(List<String> families) {
+    fontCollection.registerDownloadedFonts();
+  }
+}
diff --git a/lib/web_ui/lib/src/engine/canvaskit/image.dart b/lib/web_ui/lib/src/engine/canvaskit/image.dart
index ad570e4110326c2a28ec1d6d6b7e8705f1fffe45..23c585f7f8a48ed7a2181f4d5f7bfdf2af4269e4 100644
--- a/lib/web_ui/lib/src/engine/canvaskit/image.dart
+++ b/lib/web_ui/lib/src/engine/canvaskit/image.dart
@@ -3,37 +3,27 @@
 // found in the LICENSE file.
 
 import 'dart:async';
+import 'dart:js_interop';
 import 'dart:typed_data';
 
+import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
-
-import '../dom.dart';
-import '../html_image_codec.dart';
-import '../safe_browser_api.dart';
-import '../util.dart';
-import 'canvaskit_api.dart';
-import 'image_wasm_codecs.dart';
-import 'image_web_codecs.dart';
-import 'skia_object_cache.dart';
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
 /// Instantiates a [ui.Codec] backed by an `SkAnimatedImage` from Skia.
-// TODO(yjbanov): Implement targetWidth and targetHeight support.
-//                https://github.com/flutter/flutter/issues/34075
 FutureOr<ui.Codec> skiaInstantiateImageCodec(Uint8List list,
     [int? targetWidth, int? targetHeight]) {
-  if (browserSupportsImageDecoder) {
+  // If we have either a target width or target height, use canvaskit to decode.
+  if (browserSupportsImageDecoder && (targetWidth == null && targetHeight == null)) {
     return CkBrowserImageDecoder.create(
       data: list,
       debugSource: 'encoded image bytes',
-      targetWidth: targetWidth,
-      targetHeight: targetHeight,
     );
   } else {
-    return CkAnimatedImage.decodeFromBytes(list, 'encoded image bytes');
+    return CkAnimatedImage.decodeFromBytes(list, 'encoded image bytes', targetWidth: targetWidth, targetHeight: targetHeight);
   }
 }
 
-// TODO(yjbanov): add support for targetWidth/targetHeight (https://github.com/flutter/flutter/issues/34075)
 void skiaDecodeImageFromPixels(
   Uint8List pixels,
   int width,
@@ -45,19 +35,26 @@ void skiaDecodeImageFromPixels(
   int? targetHeight,
   bool allowUpscaling = true,
 }) {
+  if (targetWidth != null) {
+    assert(allowUpscaling || targetWidth <= width);
+  }
+  if (targetHeight != null) {
+    assert(allowUpscaling || targetHeight <= height);
+  }
+
   // Run in a timer to avoid janking the current frame by moving the decoding
   // work outside the frame event.
   Timer.run(() {
     final SkImage? skImage = canvasKit.MakeImage(
       SkImageInfo(
-        width: width,
-        height: height,
+        width: width.toDouble(),
+        height: height.toDouble(),
         colorType: format == ui.PixelFormat.rgba8888 ? canvasKit.ColorType.RGBA_8888 : canvasKit.ColorType.BGRA_8888,
         alphaType: canvasKit.AlphaType.Premul,
         colorSpace: SkColorSpaceSRGB,
       ),
       pixels,
-      rowBytes ?? 4 * width,
+      (rowBytes ?? 4 * width).toDouble(),
     );
 
     if (skImage == null) {
@@ -65,10 +62,86 @@ void skiaDecodeImageFromPixels(
       return;
     }
 
+    if (targetWidth != null || targetHeight != null) {
+      if (validUpscale(allowUpscaling, targetWidth, targetHeight, width, height)) {
+        return callback(scaleImage(skImage, targetWidth, targetHeight));
+      }
+    }
     return callback(CkImage(skImage));
   });
 }
 
+// An invalid upscale happens when allowUpscaling is false AND either the given
+// targetWidth is larger than the originalWidth OR the targetHeight is larger than originalHeight.
+bool validUpscale(bool allowUpscaling, int? targetWidth, int? targetHeight, int originalWidth, int originalHeight) {
+  if (allowUpscaling) {
+    return true;
+  }
+  final bool targetWidthFits;
+  final bool targetHeightFits;
+  if (targetWidth != null) {
+    targetWidthFits = targetWidth <= originalWidth;
+  } else {
+    targetWidthFits = true;
+  }
+
+  if (targetHeight != null) {
+    targetHeightFits = targetHeight <= originalHeight;
+  } else {
+    targetHeightFits = true;
+  }
+  return targetWidthFits && targetHeightFits;
+}
+
+/// Creates a scaled [CkImage] from an [SkImage] by drawing the [SkImage] to a canvas.
+///
+/// This function will only be called if either a targetWidth or targetHeight is not null
+///
+/// If only one of targetWidth or  targetHeight are specified, the other
+/// dimension will be scaled according to the aspect ratio of the supplied
+/// dimension.
+///
+/// If either targetWidth or targetHeight is less than or equal to zero, it
+/// will be treated as if it is null.
+CkImage scaleImage(SkImage image, int? targetWidth, int? targetHeight) {
+    assert(targetWidth != null || targetHeight != null);
+    if (targetWidth != null && targetWidth <= 0) {
+      targetWidth = null;
+    }
+    if (targetHeight != null && targetHeight <= 0) {
+      targetHeight = null;
+    }
+    if (targetWidth == null && targetHeight != null) {
+      targetWidth = (targetHeight * (image.width() / image.height())).round();
+    } else if (targetHeight == null && targetWidth != null) {
+      targetHeight = targetWidth ~/ (image.width() / image.height());
+    }
+
+    assert(targetWidth != null);
+    assert(targetHeight != null);
+
+    final CkPictureRecorder recorder = CkPictureRecorder();
+    final CkCanvas canvas = recorder.beginRecording(ui.Rect.largest);
+
+    final CkPaint paint = CkPaint();
+    canvas.drawImageRect(
+      CkImage(image),
+      ui.Rect.fromLTWH(0, 0, image.width(), image.height()),
+      ui.Rect.fromLTWH(0, 0, targetWidth!.toDouble(), targetHeight!.toDouble()),
+      paint,
+    );
+    paint.dispose();
+
+    final CkPicture picture = recorder.endRecording();
+    final ui.Image finalImage = picture.toImageSync(
+      targetWidth,
+      targetHeight
+    );
+
+    final CkImage ckImage = finalImage as CkImage;
+    return ckImage;
+}
+
 /// Thrown when the web engine fails to decode an image, either due to a
 /// network issue, corrupted image contents, or missing codec.
 class ImageCodecException implements Exception {
@@ -82,16 +155,10 @@ class ImageCodecException implements Exception {
 
 const String _kNetworkImageMessage = 'Failed to load network image.';
 
-typedef HttpRequestFactory = DomXMLHttpRequest Function();
-HttpRequestFactory httpRequestFactory = () => createDomXMLHttpRequest();
-void debugRestoreHttpRequestFactory() {
-  httpRequestFactory = () => createDomXMLHttpRequest();
-}
-
 /// Instantiates a [ui.Codec] backed by an `SkAnimatedImage` from Skia after
 /// requesting from URI.
 Future<ui.Codec> skiaInstantiateWebImageCodec(
-    String url, WebOnlyImageCodecChunkCallback? chunkCallback) async {
+    String url, ui_web.ImageCodecChunkCallback? chunkCallback) async {
   final Uint8List list = await fetchImage(url, chunkCallback);
   if (browserSupportsImageDecoder) {
     return CkBrowserImageDecoder.create(data: list, debugSource: url);
@@ -101,100 +168,55 @@ Future<ui.Codec> skiaInstantiateWebImageCodec(
 }
 
 /// Sends a request to fetch image data.
-Future<Uint8List> fetchImage(
-    String url, WebOnlyImageCodecChunkCallback? chunkCallback) {
-  final Completer<Uint8List> completer = Completer<Uint8List>();
-
-  final DomXMLHttpRequest request = httpRequestFactory();
-  request.open('GET', url, true);
-  request.responseType = 'arraybuffer';
-  if (chunkCallback != null) {
-    request.addEventListener('progress', allowInterop((DomEvent event)  {
-      event = event as DomProgressEvent;
-      chunkCallback.call(event.loaded!.toInt(), event.total!.toInt());
-    }));
-  }
-
-  request.addEventListener('error', allowInterop((DomEvent event) {
-    completer.completeError(ImageCodecException('$_kNetworkImageMessage\n'
+Future<Uint8List> fetchImage(String url, ui_web.ImageCodecChunkCallback? chunkCallback) async {
+  try {
+    final HttpFetchResponse response = await httpFetch(url);
+    final int? contentLength = response.contentLength;
+
+    if (!response.hasPayload) {
+      throw ImageCodecException(
+        '$_kNetworkImageMessage\n'
         'Image URL: $url\n'
-        'Trying to load an image from another domain? Find answers at:\n'
-        'https://flutter.dev/docs/development/platform-integration/web-images'));
-  }));
-
-  request.addEventListener('load', allowInterop((DomEvent event) {
-    final int status = request.status!.toInt();
-    final bool accepted = status >= 200 && status < 300;
-    final bool fileUri = status == 0; // file:// URIs have status of 0.
-    final bool notModified = status == 304;
-    final bool unknownRedirect = status > 307 && status < 400;
-    final bool success = accepted || fileUri || notModified || unknownRedirect;
-
-    if (!success) {
-      completer.completeError(
-        ImageCodecException('$_kNetworkImageMessage\n'
-            'Image URL: $url\n'
-            'Server response code: $status'),
+        'Server response code: ${response.status}',
       );
-      return;
     }
 
-    completer.complete(Uint8List.view(request.response as ByteBuffer));
-  }));
+    if (chunkCallback != null && contentLength != null) {
+      return readChunked(response.payload, contentLength, chunkCallback);
+    } else {
+      return await response.asUint8List();
+    }
+  } on HttpFetchError catch (_) {
+    throw ImageCodecException(
+      '$_kNetworkImageMessage\n'
+      'Image URL: $url\n'
+      'Trying to load an image from another domain? Find answers at:\n'
+      'https://flutter.dev/docs/development/platform-integration/web-images',
+    );
+  }
+}
 
-  request.send();
-  return completer.future;
+/// Reads the [payload] in chunks using the browser's Streams API
+///
+/// See: https://developer.mozilla.org/en-US/docs/Web/API/Streams_API
+Future<Uint8List> readChunked(HttpFetchPayload payload, int contentLength, ui_web.ImageCodecChunkCallback chunkCallback) async {
+  final JSUint8Array result = createUint8ArrayFromLength(contentLength);
+  int position = 0;
+  int cumulativeBytesLoaded = 0;
+  await payload.read<JSUint8Array>((JSUint8Array chunk) {
+    cumulativeBytesLoaded += chunk.length.toDartInt;
+    chunkCallback(cumulativeBytesLoaded, contentLength);
+    result.set(chunk, position.toJS);
+    position += chunk.length.toDartInt;
+  });
+  return result.toDart;
 }
 
 /// A [ui.Image] backed by an `SkImage` from Skia.
 class CkImage implements ui.Image, StackTraceDebugger {
   CkImage(SkImage skImage, { this.videoFrame }) {
+    box = CountedRef<CkImage, SkImage>(skImage, this, 'SkImage');
     _init();
-    if (browserSupportsFinalizationRegistry) {
-      box = SkiaObjectBox<CkImage, SkImage>(this, skImage);
-    } else {
-      // If finalizers are not supported we need to be able to resurrect the
-      // image if it was temporarily deleted. To do that, we keep the original
-      // pixels and ask the SkiaObjectBox to make an image from them when
-      // resurrecting.
-      //
-      // IMPORTANT: the alphaType, colorType, and colorSpace passed to
-      // _encodeImage and to canvasKit.MakeImage must be the same. Otherwise
-      // Skia will misinterpret the pixels and corrupt the image.
-      final ByteData? originalBytes = _encodeImage(
-        skImage: skImage,
-        format: ui.ImageByteFormat.rawRgba,
-        alphaType: canvasKit.AlphaType.Premul,
-        colorType: canvasKit.ColorType.RGBA_8888,
-        colorSpace: SkColorSpaceSRGB,
-      );
-      if (originalBytes == null) {
-        printWarning('Unable to encode image to bytes. We will not '
-            'be able to resurrect it once it has been garbage collected.');
-        return;
-      }
-      final int originalWidth = skImage.width().toInt();
-      final int originalHeight = skImage.height().toInt();
-      box = SkiaObjectBox<CkImage, SkImage>.resurrectable(this, skImage, () {
-        final SkImage? skImage = canvasKit.MakeImage(
-          SkImageInfo(
-            alphaType: canvasKit.AlphaType.Premul,
-            colorType: canvasKit.ColorType.RGBA_8888,
-            colorSpace: SkColorSpaceSRGB,
-            width: originalWidth,
-            height: originalHeight,
-          ),
-          originalBytes.buffer.asUint8List(),
-          4 * originalWidth,
-        );
-        if (skImage == null) {
-          throw ImageCodecException(
-            'Failed to resurrect image from pixels.'
-          );
-        }
-        return skImage;
-      });
-    }
   }
 
   CkImage.cloneOf(this.box, {this.videoFrame}) {
@@ -203,9 +225,10 @@ class CkImage implements ui.Image, StackTraceDebugger {
   }
 
   void _init() {
-    if (assertionsEnabled) {
+    assert(() {
       _debugStackTrace = StackTrace.current;
-    }
+      return true;
+    }());
     ui.Image.onCreate?.call(this);
   }
 
@@ -213,9 +236,9 @@ class CkImage implements ui.Image, StackTraceDebugger {
   StackTrace get debugStackTrace => _debugStackTrace;
   late StackTrace _debugStackTrace;
 
-  // Use a box because `SkImage` may be deleted either due to this object
+  // Use ref counting because `SkImage` may be deleted either due to this object
   // being garbage-collected, or by an explicit call to [delete].
-  late final SkiaObjectBox<CkImage, SkImage> box;
+  late final CountedRef<CkImage, SkImage> box;
 
   /// For browsers that support `ImageDecoder` this field holds the video frame
   /// from which this image was created.
@@ -227,9 +250,9 @@ class CkImage implements ui.Image, StackTraceDebugger {
 
   /// The underlying Skia image object.
   ///
-  /// Do not store the returned value. It is memory-managed by [SkiaObjectBox].
+  /// Do not store the returned value. It is memory-managed by [CountedRef].
   /// Storing it may result in use-after-free bugs.
-  SkImage get skImage => box.skiaObject;
+  SkImage get skImage => box.nativeObject;
 
   bool _disposed = false;
 
@@ -251,9 +274,16 @@ class CkImage implements ui.Image, StackTraceDebugger {
 
   @override
   bool get debugDisposed {
-    if (assertionsEnabled) {
-      return _disposed;
+    bool? result;
+    assert(() {
+      result = _disposed;
+      return true;
+    }());
+
+    if (result != null) {
+      return result!;
     }
+
     throw StateError(
         'Image.debugDisposed is only available when asserts are enabled.');
   }
@@ -291,13 +321,18 @@ class CkImage implements ui.Image, StackTraceDebugger {
     ui.ImageByteFormat format = ui.ImageByteFormat.rawRgba,
   }) {
     assert(_debugCheckIsNotDisposed());
-    if (videoFrame != null) {
+    // readPixelsFromVideoFrame currently does not convert I420, I444, I422
+    // videoFrame formats to RGBA
+    if (videoFrame != null && videoFrame!.format != 'I420' && videoFrame!.format != 'I444' && videoFrame!.format != 'I422') {
       return readPixelsFromVideoFrame(videoFrame!, format);
     } else {
       return _readPixelsFromSkImage(format);
     }
   }
 
+  @override
+  ui.ColorSpace get colorSpace => ui.ColorSpace.sRGB;
+
   Future<ByteData> _readPixelsFromSkImage(ui.ImageByteFormat format) {
     final SkAlphaType alphaType = format == ui.ImageByteFormat.rawStraightRgba ? canvasKit.AlphaType.Unpremul : canvasKit.AlphaType.Premul;
     final ByteData? data = _encodeImage(
@@ -328,8 +363,8 @@ class CkImage implements ui.Image, StackTraceDebugger {
         alphaType: alphaType,
         colorType: colorType,
         colorSpace: colorSpace,
-        width: skImage.width().toInt(),
-        height: skImage.height().toInt(),
+        width: skImage.width(),
+        height: skImage.height(),
       );
       bytes = skImage.readPixels(0, 0, imageInfo);
     } else {
@@ -345,17 +380,3 @@ class CkImage implements ui.Image, StackTraceDebugger {
     return '[$width\u00D7$height]';
   }
 }
-
-/// Data for a single frame of an animated image.
-class AnimatedImageFrameInfo implements ui.FrameInfo {
-  AnimatedImageFrameInfo(this._duration, this._image);
-
-  final Duration _duration;
-  final CkImage _image;
-
-  @override
-  Duration get duration => _duration;
-
-  @override
-  ui.Image get image => _image;
-}
diff --git a/lib/web_ui/lib/src/engine/canvaskit/image_filter.dart b/lib/web_ui/lib/src/engine/canvaskit/image_filter.dart
index 63caf9d6ed6f73f25b5d6e679ac9e94892f6a69e..19b89061144a75f0c1abe372830effca9568fff3 100644
--- a/lib/web_ui/lib/src/engine/canvaskit/image_filter.dart
+++ b/lib/web_ui/lib/src/engine/canvaskit/image_filter.dart
@@ -10,7 +10,9 @@ import 'package:ui/ui.dart' as ui;
 import '../util.dart';
 import 'canvaskit_api.dart';
 import 'color_filter.dart';
-import 'skia_object_cache.dart';
+import 'native_memory.dart';
+
+typedef SkImageFilterBorrow = void Function(SkImageFilter);
 
 /// An [ImageFilter] that can create a managed skia [SkImageFilter] object.
 ///
@@ -20,14 +22,15 @@ import 'skia_object_cache.dart';
 ///
 /// Currently implemented by [CkImageFilter] and [CkColorFilter].
 abstract class CkManagedSkImageFilterConvertible implements ui.ImageFilter {
-  ManagedSkiaObject<SkImageFilter> get imageFilter;
+  void imageFilter(SkImageFilterBorrow borrow);
+
+  Matrix4 get transform;
 }
 
 /// The CanvasKit implementation of [ui.ImageFilter].
 ///
 /// Currently only supports `blur`, `matrix`, and ColorFilters.
-abstract class CkImageFilter extends ManagedSkiaObject<SkImageFilter>
-    implements CkManagedSkImageFilterConvertible {
+abstract class CkImageFilter implements CkManagedSkImageFilterConvertible {
   factory CkImageFilter.blur(
       {required double sigmaX,
       required double sigmaY,
@@ -37,33 +40,34 @@ abstract class CkImageFilter extends ManagedSkiaObject<SkImageFilter>
   factory CkImageFilter.matrix(
       {required Float64List matrix,
       required ui.FilterQuality filterQuality}) = _CkMatrixImageFilter;
+  factory CkImageFilter.compose(
+      {required CkImageFilter outer,
+      required CkImageFilter inner}) = _CkComposeImageFilter;
 
   CkImageFilter._();
 
   @override
-  ManagedSkiaObject<SkImageFilter> get imageFilter => this;
-
-  SkImageFilter _initSkiaObject();
-
-  @override
-  SkImageFilter createDefault() => _initSkiaObject();
-
-  @override
-  SkImageFilter resurrect() => _initSkiaObject();
-
-  @override
-  void delete() {
-    rawSkiaObject?.delete();
-  }
+  Matrix4 get transform => Matrix4.identity();
 }
 
 class CkColorFilterImageFilter extends CkImageFilter {
-  CkColorFilterImageFilter({required this.colorFilter}) : super._();
+  CkColorFilterImageFilter({required this.colorFilter}) : super._() {
+    final SkImageFilter skImageFilter = colorFilter.initRawImageFilter();
+    _ref = UniqueRef<SkImageFilter>(this, skImageFilter, 'ImageFilter.color');
+  }
 
   final CkColorFilter colorFilter;
 
+  late final UniqueRef<SkImageFilter> _ref;
+
   @override
-  SkImageFilter _initSkiaObject() => colorFilter.initRawImageFilter();
+  void imageFilter(SkImageFilterBorrow borrow) {
+    borrow(_ref.nativeObject);
+  }
+
+  void dispose() {
+    _ref.dispose();
+  }
 
   @override
   int get hashCode => colorFilter.hashCode;
@@ -84,42 +88,36 @@ class CkColorFilterImageFilter extends CkImageFilter {
 class _CkBlurImageFilter extends CkImageFilter {
   _CkBlurImageFilter(
       {required this.sigmaX, required this.sigmaY, required this.tileMode})
-      : super._();
-
-  final double sigmaX;
-  final double sigmaY;
-  final ui.TileMode tileMode;
-
-  String get _modeString {
-    switch (tileMode) {
-      case ui.TileMode.clamp:
-        return 'clamp';
-      case ui.TileMode.mirror:
-        return 'mirror';
-      case ui.TileMode.repeated:
-        return 'repeated';
-      case ui.TileMode.decal:
-        return 'decal';
-    }
-  }
-
-  @override
-  SkImageFilter _initSkiaObject() {
+      : super._() {
     /// Return the identity matrix when both sigmaX and sigmaY are 0. Replicates
     /// effect of applying no filter
+    final SkImageFilter skImageFilter;
     if (sigmaX == 0 && sigmaY == 0) {
-      return canvasKit.ImageFilter.MakeMatrixTransform(
+      skImageFilter = canvasKit.ImageFilter.MakeMatrixTransform(
         toSkMatrixFromFloat32(Matrix4.identity().storage),
         toSkFilterOptions(ui.FilterQuality.none),
         null
       );
+    } else {
+      skImageFilter = canvasKit.ImageFilter.MakeBlur(
+        sigmaX,
+        sigmaY,
+        toSkTileMode(tileMode),
+        null,
+      );
     }
-    return canvasKit.ImageFilter.MakeBlur(
-      sigmaX,
-      sigmaY,
-      toSkTileMode(tileMode),
-      null,
-    );
+    _ref = UniqueRef<SkImageFilter>(this, skImageFilter, 'ImageFilter.blur');
+  }
+
+  final double sigmaX;
+  final double sigmaY;
+  final ui.TileMode tileMode;
+
+  late final UniqueRef<SkImageFilter> _ref;
+
+  @override
+  void imageFilter(SkImageFilterBorrow borrow) {
+    borrow(_ref.nativeObject);
   }
 
   @override
@@ -138,7 +136,7 @@ class _CkBlurImageFilter extends CkImageFilter {
 
   @override
   String toString() {
-    return 'ImageFilter.blur($sigmaX, $sigmaY, $_modeString)';
+    return 'ImageFilter.blur($sigmaX, $sigmaY, ${tileModeString(tileMode)})';
   }
 }
 
@@ -146,18 +144,25 @@ class _CkMatrixImageFilter extends CkImageFilter {
   _CkMatrixImageFilter(
       {required Float64List matrix, required this.filterQuality})
       : matrix = Float64List.fromList(matrix),
-        super._();
+        _transform = Matrix4.fromFloat32List(toMatrix32(matrix)),
+        super._() {
+    final SkImageFilter skImageFilter = canvasKit.ImageFilter.MakeMatrixTransform(
+      toSkMatrixFromFloat64(matrix),
+      toSkFilterOptions(filterQuality),
+      null,
+    );
+    _ref = UniqueRef<SkImageFilter>(this, skImageFilter, 'ImageFilter.matrix');
+  }
 
   final Float64List matrix;
   final ui.FilterQuality filterQuality;
+  final Matrix4 _transform;
+
+  late final UniqueRef<SkImageFilter> _ref;
 
   @override
-  SkImageFilter _initSkiaObject() {
-    return canvasKit.ImageFilter.MakeMatrixTransform(
-      toSkMatrixFromFloat64(matrix),
-      toSkFilterOptions(filterQuality),
-      null,
-    );
+  void imageFilter(SkImageFilterBorrow borrow) {
+    borrow(_ref.nativeObject);
   }
 
   @override
@@ -175,4 +180,51 @@ class _CkMatrixImageFilter extends CkImageFilter {
 
   @override
   String toString() => 'ImageFilter.matrix($matrix, $filterQuality)';
+
+  @override
+  Matrix4 get transform => _transform;
+}
+
+class _CkComposeImageFilter extends CkImageFilter {
+  _CkComposeImageFilter({required this.outer, required this.inner})
+      : super._() {
+    outer.imageFilter((SkImageFilter outerFilter) {
+      inner.imageFilter((SkImageFilter innerFilter) {
+        final SkImageFilter skImageFilter = canvasKit.ImageFilter.MakeCompose(
+          outerFilter,
+          innerFilter,
+        );
+        _ref = UniqueRef<SkImageFilter>(
+            this, skImageFilter, 'ImageFilter.compose');
+      });
+    });
+  }
+
+  final CkImageFilter outer;
+  final CkImageFilter inner;
+
+  late final UniqueRef<SkImageFilter> _ref;
+
+  @override
+  void imageFilter(SkImageFilterBorrow borrow) {
+    borrow(_ref.nativeObject);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    if (runtimeType != other.runtimeType) {
+      return false;
+    }
+    return other is _CkComposeImageFilter &&
+        other.outer == outer &&
+        other.inner == inner;
+  }
+
+  @override
+  int get hashCode => Object.hash(outer, inner);
+
+  @override
+  String toString() {
+    return 'ImageFilter.compose($outer, $inner)';
+  }
 }
diff --git a/lib/web_ui/lib/src/engine/canvaskit/image_wasm_codecs.dart b/lib/web_ui/lib/src/engine/canvaskit/image_wasm_codecs.dart
index e7772d7a10cb87f759d24b7123adeb96d2c615b0..337eac8679fdff2c31186079bfef38213b30a4a1 100644
--- a/lib/web_ui/lib/src/engine/canvaskit/image_wasm_codecs.dart
+++ b/lib/web_ui/lib/src/engine/canvaskit/image_wasm_codecs.dart
@@ -12,31 +12,30 @@ library image_wasm_codecs;
 import 'dart:async';
 import 'dart:typed_data';
 
+import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
 
-import 'canvaskit_api.dart';
-import 'image.dart';
-import 'skia_object_cache.dart';
-
 /// The CanvasKit implementation of [ui.Codec].
 ///
 /// Wraps `SkAnimatedImage`.
-class CkAnimatedImage extends ManagedSkiaObject<SkAnimatedImage>
-    implements ui.Codec {
+class CkAnimatedImage implements ui.Codec {
   /// Decodes an image from a list of encoded bytes.
-  CkAnimatedImage.decodeFromBytes(this._bytes, this.src);
+  CkAnimatedImage.decodeFromBytes(this._bytes, this.src, {this.targetWidth, this.targetHeight}) {
+    final SkAnimatedImage skAnimatedImage = createSkAnimatedImage();
+    _ref = UniqueRef<SkAnimatedImage>(this, skAnimatedImage, 'Codec');
+  }
 
+  late final UniqueRef<SkAnimatedImage> _ref;
   final String src;
   final Uint8List _bytes;
   int _frameCount = 0;
   int _repetitionCount = -1;
 
-  /// Current frame index.
-  int _currentFrameIndex = 0;
+  final int? targetWidth;
+  final int? targetHeight;
 
-  @override
-  SkAnimatedImage createDefault() {
-    final SkAnimatedImage? animatedImage =
+  SkAnimatedImage createSkAnimatedImage() {
+    SkAnimatedImage? animatedImage =
         canvasKit.MakeAnimatedImageFromEncoded(_bytes);
     if (animatedImage == null) {
       throw ImageCodecException(
@@ -45,31 +44,37 @@ class CkAnimatedImage extends ManagedSkiaObject<SkAnimatedImage>
       );
     }
 
+    if (targetWidth != null || targetHeight != null) {
+      if (animatedImage.getFrameCount() > 1) {
+        printWarning('targetWidth and targetHeight for multi-frame images not supported');
+      } else {
+        animatedImage = _resizeAnimatedImage(animatedImage, targetWidth, targetHeight);
+        if (animatedImage == null) {
+          throw ImageCodecException(
+            'Failed to decode re-sized image data.\n'
+            'Image source: $src',
+          );
+        }
+      }
+    }
+
     _frameCount = animatedImage.getFrameCount().toInt();
     _repetitionCount = animatedImage.getRepetitionCount().toInt();
 
-    // Normally CanvasKit initializes `SkAnimatedImage` to point to the first
-    // frame in the animation. However, if the Skia object has been deleted then
-    // resurrected, the framework/app may already have advanced to one of the
-    // subsequent frames. When that happens the value of _currentFrameIndex will
-    // be something other than zero, and we need to tell the decoder to skip
-    // over the previous frames to point to the current one.
-    for (int i = 0; i < _currentFrameIndex; i++) {
-      animatedImage.decodeNextFrame();
-    }
-
     return animatedImage;
   }
 
-  @override
-  SkAnimatedImage resurrect() => createDefault();
+  SkAnimatedImage? _resizeAnimatedImage(SkAnimatedImage animatedImage, int? targetWidth, int? targetHeight) {
+    final SkImage image = animatedImage.makeImageAtCurrentFrame();
+    final CkImage ckImage = scaleImage(image, targetWidth, targetHeight);
+    final Uint8List? resizedBytes = ckImage.skImage.encodeToBytes();
 
-  @override
-  bool get isResurrectionExpensive => true;
+    if (resizedBytes == null) {
+      throw ImageCodecException('Failed to re-size image');
+    }
 
-  @override
-  void delete() {
-    rawSkiaObject?.delete();
+    final SkAnimatedImage? resizedAnimatedImage = canvasKit.MakeAnimatedImageFromEncoded(resizedBytes);
+    return resizedAnimatedImage;
   }
 
   bool _disposed = false;
@@ -87,7 +92,7 @@ class CkAnimatedImage extends ManagedSkiaObject<SkAnimatedImage>
       'Cannot dispose a codec that has already been disposed.',
     );
     _disposed = true;
-    delete();
+    _ref.dispose();
   }
 
   @override
@@ -105,7 +110,7 @@ class CkAnimatedImage extends ManagedSkiaObject<SkAnimatedImage>
   @override
   Future<ui.FrameInfo> getNextFrame() {
     assert(_debugCheckIsNotDisposed());
-    final SkAnimatedImage animatedImage = skiaObject;
+    final SkAnimatedImage animatedImage = _ref.nativeObject;
 
     // SkAnimatedImage comes pre-initialized to point to the current frame (by
     // default the first frame, and, with some special resurrection logic in
@@ -121,7 +126,6 @@ class CkAnimatedImage extends ManagedSkiaObject<SkAnimatedImage>
     );
 
     animatedImage.decodeNextFrame();
-    _currentFrameIndex = (_currentFrameIndex + 1) % _frameCount;
     return Future<ui.FrameInfo>.value(currentFrame);
   }
 }
diff --git a/lib/web_ui/lib/src/engine/canvaskit/image_web_codecs.dart b/lib/web_ui/lib/src/engine/canvaskit/image_web_codecs.dart
index a1e348e47f34218c295c46fe30171e82891ade22..054e7640ef9bf238a4a66d61f8b74b236e1dbd34 100644
--- a/lib/web_ui/lib/src/engine/canvaskit/image_web_codecs.dart
+++ b/lib/web_ui/lib/src/engine/canvaskit/image_web_codecs.dart
@@ -2,59 +2,32 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-/// Uses the `ImageDecoder` class supplied by the browser.
-///
-/// See also:
-///
-///  * `image_wasm_codecs.dart`, which uses codecs supplied by the CanvasKit WASM bundle.
+// Uses the `ImageDecoder` class supplied by the browser.
+//
+// See also:
+//
+//  * `image_wasm_codecs.dart`, which uses codecs supplied by the CanvasKit WASM bundle.
 
 import 'dart:async';
 import 'dart:convert' show base64;
+import 'dart:js_interop';
 import 'dart:math' as math;
 import 'dart:typed_data';
 
-import 'package:meta/meta.dart';
+import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
 
-import '../alarm_clock.dart';
-import '../dom.dart';
-import '../safe_browser_api.dart';
-import '../util.dart';
-import 'canvaskit_api.dart';
-import 'image.dart';
-
-Duration _kDefaultWebDecoderExpireDuration = const Duration(seconds: 3);
-Duration _kWebDecoderExpireDuration = _kDefaultWebDecoderExpireDuration;
-
-/// Overrides the inactivity duration after which the web decoder is closed.
-///
-/// This should only be used in tests.
-void debugOverrideWebDecoderExpireDuration(Duration override) {
-  _kWebDecoderExpireDuration = override;
-}
-
-/// Restores the web decoder inactivity expiry duration to its original value.
-///
-/// This should only be used in tests.
-void debugRestoreWebDecoderExpireDuration() {
-  _kWebDecoderExpireDuration = _kDefaultWebDecoderExpireDuration;
-}
-
 /// Image decoder backed by the browser's `ImageDecoder`.
-class CkBrowserImageDecoder implements ui.Codec {
+class CkBrowserImageDecoder extends BrowserImageDecoder {
   CkBrowserImageDecoder._({
-    required this.contentType,
-    required this.targetWidth,
-    required this.targetHeight,
-    required this.data,
-    required this.debugSource,
+    required super.contentType,
+    required super.dataSource,
+    required super.debugSource,
   });
 
   static Future<CkBrowserImageDecoder> create({
     required Uint8List data,
     required String debugSource,
-    int? targetWidth,
-    int? targetHeight,
   }) async {
     // ImageDecoder does not detect image type automatically. It requires us to
     // tell it what the image type is.
@@ -76,321 +49,35 @@ class CkBrowserImageDecoder implements ui.Codec {
 
     final CkBrowserImageDecoder decoder = CkBrowserImageDecoder._(
       contentType: contentType,
-      targetWidth: targetWidth,
-      targetHeight: targetHeight,
-      data: data,
+      dataSource: data.toJS,
       debugSource: debugSource,
     );
 
     // Call once to initialize the decoder and populate late fields.
-    await decoder._getOrCreateWebDecoder();
+    await decoder.initialize();
     return decoder;
   }
 
-  final String contentType;
-  final int? targetWidth;
-  final int? targetHeight;
-  final Uint8List data;
-  final String debugSource;
-
-  @override
-  late int frameCount;
-
   @override
-  late int repetitionCount;
-
-  /// Whether this decoder has been disposed of.
-  ///
-  /// Once this turns true it stays true forever, and this decoder becomes
-  /// unusable.
-  bool _isDisposed = false;
-
-  @override
-  void dispose() {
-    _isDisposed = true;
-
-    // This releases all resources, including any currently running decoding work.
-    _cachedWebDecoder?.close();
-    _cachedWebDecoder = null;
-  }
-
-  void _debugCheckNotDisposed() {
-    assert(
-      !_isDisposed,
-      'Cannot use this image decoder. It has been disposed of.'
-    );
-  }
-
-  /// The index of the frame that will be decoded on the next call of [getNextFrame];
-  int _nextFrameIndex = 0;
-
-  /// Creating a new decoder is expensive, so we cache the decoder for reuse.
-  ///
-  /// This decoder is closed and the field is nulled out after some time of
-  /// inactivity.
-  ImageDecoder? _cachedWebDecoder;
-
-  /// The underlying image decoder used to decode images.
-  ///
-  /// This value is volatile. It may be closed or become null any time.
-  ///
-  ///
-  /// This is only meant to be used in tests.
-  @visibleForTesting
-  ImageDecoder? get debugCachedWebDecoder => _cachedWebDecoder;
-
-  final AlarmClock _cacheExpirationClock = AlarmClock(() => DateTime.now());
-
-  Future<ImageDecoder> _getOrCreateWebDecoder() async {
-    if (_cachedWebDecoder != null) {
-      // Give the cached value some time for reuse, e.g. if the image is
-      // currently animating.
-      _cacheExpirationClock.datetime = DateTime.now().add(_kWebDecoderExpireDuration);
-      return _cachedWebDecoder!;
-    }
-
-    // Null out the callback so the clock doesn't try to expire the decoder
-    // while it's initializing. There's no way to tell how long the
-    // initialization will take place. We just let it proceed at its own pace.
-    _cacheExpirationClock.callback = null;
-    try {
-      final ImageDecoder webDecoder = ImageDecoder(ImageDecoderOptions(
-        type: contentType,
-        data: data,
-
-        // Flutter always uses premultiplied alpha when decoding.
-        premultiplyAlpha: 'premultiply',
-        desiredWidth: targetWidth,
-        desiredHeight: targetHeight,
-
-        // "default" gives the browser the liberty to convert to display-appropriate
-        // color space, typically SRGB, which is what we want.
-        colorSpaceConversion: 'default',
-
-        // Flutter doesn't give the developer a way to customize this, so if this
-        // is an animated image we should prefer the animated track.
-        preferAnimation: true,
-      ));
-
-      await promiseToFuture<void>(webDecoder.tracks.ready);
-
-      // Flutter doesn't have an API for progressive loading of images, so we
-      // wait until the image is fully decoded.
-      // package:js bindings don't work with getters that return a Promise, which
-      // is why js_util is used instead.
-      await promiseToFuture<void>(getJsProperty(webDecoder, 'completed'));
-      frameCount = webDecoder.tracks.selectedTrack!.frameCount.toInt();
-
-      // We coerce the DOM's `repetitionCount` into an int by explicitly
-      // handling `infinity`. Note: This will still throw if the DOM returns a
-      // `NaN.
-      final double rawRepetitionCount = webDecoder.tracks.selectedTrack!.repetitionCount;
-      repetitionCount = rawRepetitionCount == double.infinity ? -1 :
-          rawRepetitionCount.toInt();
-      _cachedWebDecoder = webDecoder;
-
-      // Expire the decoder if it's not used for several seconds. If the image is
-      // not animated, it could mean that the framework has cached the frame and
-      // therefore doesn't need the decoder any more, or it could mean that the
-      // widget is gone and it's time to collect resources associated with it.
-      // If it's an animated image it means the animation has stopped, otherwise
-      // we'd see calls to [getNextFrame] which would update the expiry date on
-      // the decoder. If the animation is stopped for long enough, it's better
-      // to collect resources. If and when the animation resumes, a new decoder
-      // will be instantiated.
-      _cacheExpirationClock.callback = () {
-        _cachedWebDecoder?.close();
-        _cachedWebDecoder = null;
-        _cacheExpirationClock.callback = null;
-      };
-      _cacheExpirationClock.datetime = DateTime.now().add(_kWebDecoderExpireDuration);
-
-      return webDecoder;
-    } catch (error) {
-      if (domInstanceOfString(error, 'DOMException')) {
-        if ((error as DomException).name == DomException.notSupported) {
-          throw ImageCodecException(
-            "Image file format ($contentType) is not supported by this browser's ImageDecoder API.\n"
-            'Image source: $debugSource',
-          );
-        }
-      }
-      throw ImageCodecException(
-        "Failed to decode image using the browser's ImageDecoder API.\n"
-        'Image source: $debugSource\n'
-        'Original browser error: $error'
-      );
-    }
-  }
-
-  @override
-  Future<ui.FrameInfo> getNextFrame() async {
-    _debugCheckNotDisposed();
-    final ImageDecoder webDecoder = await _getOrCreateWebDecoder();
-    final DecodeResult result = await promiseToFuture<DecodeResult>(
-      webDecoder.decode(DecodeOptions(frameIndex: _nextFrameIndex)),
-    );
-    final VideoFrame frame = result.image;
-    _nextFrameIndex = (_nextFrameIndex + 1) % frameCount;
-
-    final SkImage? skImage = canvasKit.MakeLazyImageFromTextureSource(
+  ui.Image generateImageFromVideoFrame(VideoFrame frame) {
+    final SkImage? skImage = canvasKit.MakeLazyImageFromTextureSourceWithInfo(
       frame,
       SkPartialImageInfo(
         alphaType: canvasKit.AlphaType.Premul,
         colorType: canvasKit.ColorType.RGBA_8888,
         colorSpace: SkColorSpaceSRGB,
-        width: frame.displayWidth.toInt(),
-        height: frame.displayHeight.toInt(),
+        width: frame.displayWidth,
+        height: frame.displayHeight,
       ),
     );
-
-    // Duration can be null if the image is not animated. However, Flutter
-    // requires a non-null value. 0 indicates that the frame is meant to be
-    // displayed indefinitely, which is fine for a static image.
-    final Duration duration = Duration(microseconds: frame.duration?.toInt() ?? 0);
-
     if (skImage == null) {
       throw ImageCodecException(
         "Failed to create image from pixel data decoded using the browser's ImageDecoder.",
       );
     }
 
-    final CkImage image = CkImage(skImage, videoFrame: frame);
-    return Future<ui.FrameInfo>.value(AnimatedImageFrameInfo(duration, image));
-  }
-}
-
-/// Represents an image file format, such as PNG or JPEG.
-class ImageFileFormat {
-  const ImageFileFormat(this.header, this.contentType);
-
-  /// First few bytes in the file that uniquely identify the image file format.
-  ///
-  /// Null elements are treated as wildcard values and are not checked. This is
-  /// used to detect formats whose header is split up into multiple disjoint
-  /// parts, such that the first part is not unique enough to identify the
-  /// format. For example, without this, WebP may be confused with .ani
-  /// (animated cursor), .cda, and other formats that start with "RIFF".
-  final List<int?> header;
-
-  /// The value that's passed as [_ImageDecoderOptions.type].
-  ///
-  /// The server typically also uses this value as the "Content-Type" header,
-  /// but servers are not required to correctly detect the type. This value
-  /// is also known as MIME type.
-  final String contentType;
-
-  /// All image file formats known to the Flutter Web engine.
-  ///
-  /// This list may need to be changed as browsers adopt new formats, and drop
-  /// support for obsolete ones.
-  ///
-  /// This list is checked linearly from top to bottom when detecting an image
-  /// type. It should therefore contain the most popular file formats at the
-  /// top, and less popular towards the bottom.
-  static const List<ImageFileFormat> values = <ImageFileFormat>[
-    // ICO is not supported in Chrome. It is deemed too simple and too specific. See also:
-    //   https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/renderer/modules/webcodecs/image_decoder_external.cc;l=38;drc=fd8802b593110ea18a97ef044f8a40dd24a622ec
-
-    // PNG
-    ImageFileFormat(<int?>[0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A], 'image/png'),
-
-    // GIF87a
-    ImageFileFormat(<int?>[0x47, 0x49, 0x46, 0x38, 0x37, 0x61], 'image/gif'),
-
-    // GIF89a
-    ImageFileFormat(<int?>[0x47, 0x49, 0x46, 0x38, 0x39, 0x61], 'image/gif'),
-
-    // JPEG
-    ImageFileFormat(<int?>[0xFF, 0xD8, 0xFF], 'image/jpeg'),
-
-    // WebP
-    ImageFileFormat(<int?>[0x52, 0x49, 0x46, 0x46, null, null, null, null, 0x57, 0x45, 0x42, 0x50], 'image/webp'),
-
-    // BMP
-    ImageFileFormat(<int?>[0x42, 0x4D], 'image/bmp'),
-  ];
-}
-
-/// Function signature of [debugContentTypeDetector], which is the same as the
-/// signature of [detectContentType].
-typedef DebugContentTypeDetector = String? Function(Uint8List);
-
-/// If not null, replaced the functionality of [detectContentType] with its own.
-///
-/// This is useful in tests, for example, to test unsupported content types.
-DebugContentTypeDetector? debugContentTypeDetector;
-
-/// Detects the image file format and returns the corresponding "Content-Type"
-/// value (a.k.a. MIME type).
-///
-/// The returned value can be passed to `ImageDecoder` when decoding an image.
-///
-/// Returns null if [data] cannot be mapped to a known content type.
-String? detectContentType(Uint8List data) {
-  if (debugContentTypeDetector != null) {
-    return debugContentTypeDetector!.call(data);
-  }
-
-  formatLoop: for (final ImageFileFormat format in ImageFileFormat.values) {
-    if (data.length < format.header.length) {
-      continue;
-    }
-
-    for (int i = 0; i < format.header.length; i++) {
-      final int? magicByte = format.header[i];
-      if (magicByte == null) {
-        // Wildcard, accepts everything.
-        continue;
-      }
-
-      final int headerByte = data[i];
-      if (headerByte != magicByte) {
-        continue formatLoop;
-      }
-    }
-
-    return format.contentType;
-  }
-
-  if (isAvif(data)) {
-    return 'image/avif';
-  }
-
-  return null;
-}
-
-/// A string of bytes that every AVIF image contains somehwere in its first 16
-/// bytes.
-///
-/// This signature is necessary but not sufficient, which may lead to false
-/// positives. For example, the file may be HEIC or a video. This is OK,
-/// because in the worst case, the image decoder fails to decode the file.
-/// This is something we must anticipate regardless of this detection logic.
-/// The codec must already protect itself from downloaded files lying about
-/// their contents.
-///
-/// The alternative would be to implement a more precise detection, which would
-/// add complexity and code size. This is how Chromium does it:
-///
-/// https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/renderer/platform/image-decoders/avif/avif_image_decoder.cc;l=504;drc=fd8802b593110ea18a97ef044f8a40dd24a622ec
-final List<int> _avifSignature = 'ftyp'.codeUnits;
-
-/// Optimistically detects whether [data] is an AVIF image file.
-bool isAvif(Uint8List data) {
-  firstByteLoop: for (int i = 0; i < 16; i += 1) {
-    for (int j = 0; j < _avifSignature.length; j += 1) {
-      if (i + j >= data.length) {
-        // Reached EOF without finding the signature.
-        return false;
-      }
-      if (data[i + j] != _avifSignature[j]) {
-        continue firstByteLoop;
-      }
-    }
-    return true;
+    return CkImage(skImage, videoFrame: frame);
   }
-  return false;
 }
 
 Future<ByteData> readPixelsFromVideoFrame(VideoFrame videoFrame, ui.ImageByteFormat format) async {
@@ -451,10 +138,16 @@ bool _shouldReadPixelsUnmodified(VideoFrame videoFrame, ui.ImageByteFormat forma
 
 Future<ByteBuffer> readVideoFramePixelsUnmodified(VideoFrame videoFrame) async {
   final int size = videoFrame.allocationSize().toInt();
-  final Uint8List destination = Uint8List(size);
-  final JsPromise copyPromise = videoFrame.copyTo(destination);
+
+  // In dart2wasm, Uint8List is not the same as a JS Uint8Array. So we
+  // explicitly construct the JS object here.
+  final JSUint8Array destination = createUint8ArrayFromLength(size);
+  final JSPromise<JSAny?> copyPromise = videoFrame.copyTo(destination);
   await promiseToFuture<void>(copyPromise);
-  return destination.buffer;
+
+  // In dart2wasm, `toDart` incurs a copy here. On JS backends, this is a
+  // no-op.
+  return destination.toDart.buffer;
 }
 
 Future<Uint8List> encodeVideoFrameAsPng(VideoFrame videoFrame) async {
diff --git a/lib/web_ui/lib/src/engine/canvaskit/interval_tree.dart b/lib/web_ui/lib/src/engine/canvaskit/interval_tree.dart
deleted file mode 100644
index 7f10373c515274fe4094e9a3b9977bdd3b7d596e..0000000000000000000000000000000000000000
--- a/lib/web_ui/lib/src/engine/canvaskit/interval_tree.dart
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'dart:math' as math;
-
-import 'noto_font.dart' show CodeunitRange;
-
-/// A tree which stores a set of intervals that can be queried for intersection.
-class IntervalTree<T> {
-  IntervalTree._(this.root);
-
-  /// Creates an interval tree from a mapping of [T] values to a list of ranges.
-  ///
-  /// When the interval tree is queried, it will return a list of [T]s which
-  /// have a range which contains the point.
-  factory IntervalTree.createFromRanges(Map<T, List<CodeunitRange>> rangesMap) {
-    assert(rangesMap.isNotEmpty);
-    // Get a list of all the ranges ordered by start index.
-    final List<IntervalTreeNode<T>> intervals = <IntervalTreeNode<T>>[];
-    rangesMap.forEach((T key, List<CodeunitRange> rangeList) {
-      for (final CodeunitRange range in rangeList) {
-        intervals.add(IntervalTreeNode<T>(key, range.start, range.end));
-      }
-    });
-    assert(intervals.isNotEmpty);
-
-    intervals
-        .sort((IntervalTreeNode<T> a, IntervalTreeNode<T> b) => a.low - b.low);
-
-    // Make a balanced binary search tree from the nodes sorted by low value.
-    IntervalTreeNode<T>? makeBalancedTree(List<IntervalTreeNode<T>> nodes) {
-      if (nodes.isEmpty) {
-        return null;
-      }
-      if (nodes.length == 1) {
-        return nodes.single;
-      }
-      final int mid = nodes.length ~/ 2;
-      final IntervalTreeNode<T> root = nodes[mid];
-      root.left = makeBalancedTree(nodes.sublist(0, mid));
-      root.right = makeBalancedTree(nodes.sublist(mid + 1));
-      return root;
-    }
-
-    // Given a node, computes the highest `high` point of all of the subnodes.
-    //
-    // As a side effect, this also computes the high point of all subnodes.
-    void computeHigh(IntervalTreeNode<T> root) {
-      if (root.left == null && root.right == null) {
-        root.computedHigh = root.high;
-      } else if (root.left == null) {
-        computeHigh(root.right!);
-        root.computedHigh = math.max(root.high, root.right!.computedHigh);
-      } else if (root.right == null) {
-        computeHigh(root.left!);
-        root.computedHigh = math.max(root.high, root.left!.computedHigh);
-      } else {
-        computeHigh(root.right!);
-        computeHigh(root.left!);
-        root.computedHigh = math.max(
-            root.high,
-            math.max(
-              root.left!.computedHigh,
-              root.right!.computedHigh,
-            ));
-      }
-    }
-
-    final IntervalTreeNode<T> root = makeBalancedTree(intervals)!;
-    computeHigh(root);
-
-    return IntervalTree<T>._(root);
-  }
-
-  /// The root node of the interval tree.
-  final IntervalTreeNode<T> root;
-
-  /// Returns the list of objects which have been associated with intervals that
-  /// intersect with [x].
-  List<T> intersections(int x) {
-    final List<T> results = <T>[];
-    root.searchForPoint(x, results);
-    return results;
-  }
-
-  /// Whether this tree contains at least one interval that includes [x].
-  bool containsDeep(int x) {
-    return root.containsDeep(x);
-  }
-}
-
-class IntervalTreeNode<T> {
-  IntervalTreeNode(this.value, this.low, this.high) : computedHigh = high;
-
-  final T value;
-  final int low;
-  final int high;
-  int computedHigh;
-
-  IntervalTreeNode<T>? left;
-  IntervalTreeNode<T>? right;
-
-  Iterable<T> enumerateAllElements() sync* {
-    if (left != null) {
-      yield* left!.enumerateAllElements();
-    }
-    yield value;
-    if (right != null) {
-      yield* right!.enumerateAllElements();
-    }
-  }
-
-  /// Whether this node contains [x].
-  ///
-  /// Does not recursively check whether child nodes contain [x].
-  bool containsShallow(int x) {
-    return low <= x && x <= high;
-  }
-
-  /// Whether this sub-tree contains [x].
-  ///
-  /// Recursively checks whether child nodes contain [x].
-  bool containsDeep(int x) {
-    if (x > computedHigh) {
-      // x is above the highest possible value stored in this subtree.
-      // Don't bother checking intervals.
-      return false;
-    }
-    if (containsShallow(x)) {
-      return true;
-    }
-    if (left?.containsDeep(x) ?? false) {
-      return true;
-    }
-    if (x < low) {
-      // The right tree can't possible contain x. Don't bother checking.
-      return false;
-    }
-    return right?.containsDeep(x) ?? false;
-  }
-
-  // Searches the tree rooted at this node for all T containing [x].
-  void searchForPoint(int x, List<T> result) {
-    if (x > computedHigh) {
-      return;
-    }
-    left?.searchForPoint(x, result);
-    if (containsShallow(x)) {
-      result.add(value);
-    }
-    if (x < low) {
-      return;
-    }
-    right?.searchForPoint(x, result);
-  }
-}
diff --git a/lib/web_ui/lib/src/engine/canvaskit/layer.dart b/lib/web_ui/lib/src/engine/canvaskit/layer.dart
index 3f09e27e0bff8eccfcae17348c0c1905728f1ff8..143ff865840a15ef4bc827e17ef9e8a50774623d 100644
--- a/lib/web_ui/lib/src/engine/canvaskit/layer.dart
+++ b/lib/web_ui/lib/src/engine/canvaskit/layer.dart
@@ -4,16 +4,16 @@
 
 import 'package:ui/ui.dart' as ui;
 
-import '../util.dart';
 import '../vector_math.dart';
 import 'canvas.dart';
+import 'canvaskit_api.dart';
 import 'embedded_views.dart';
+import 'image_filter.dart';
 import 'n_way_canvas.dart';
 import 'painting.dart';
 import 'path.dart';
 import 'picture.dart';
 import 'raster_cache.dart';
-import 'util.dart';
 
 /// A layer to be composed into a scene.
 ///
@@ -64,13 +64,10 @@ class PrerollContext {
       switch (m.type) {
         case MutatorType.clipRect:
           clipRect = m.rect!;
-          break;
         case MutatorType.clipRRect:
           clipRect = m.rrect!.outerRect;
-          break;
         case MutatorType.clipPath:
           clipRect = m.path!.getBounds();
-          break;
         default:
           continue;
       }
@@ -181,10 +178,16 @@ class BackdropFilterEngineLayer extends ContainerLayer
   @override
   void paint(PaintContext paintContext) {
     final CkPaint paint = CkPaint()..blendMode = _blendMode;
-    paintContext.internalNodesCanvas
-        .saveLayerWithFilter(paintBounds, _filter, paint);
+
+    // Only apply the backdrop filter to the current canvas. If we apply the
+    // backdrop filter to every canvas (i.e. by applying it to the
+    // [internalNodesCanvas]), then later when we compose the canvases into a
+    // single canvas, the backdrop filter will be applied multiple times.
+    final CkCanvas currentCanvas = paintContext.leafNodesCanvas!;
+    currentCanvas.saveLayerWithFilter(paintBounds, _filter, paint);
+    paint.dispose();
     paintChildren(paintContext);
-    paintContext.internalNodesCanvas.restore();
+    currentCanvas.restore();
   }
 
   // TODO(dnfield): dispose of the _filter
@@ -344,6 +347,7 @@ class OpacityEngineLayer extends ContainerLayer
     final ui.Rect saveLayerBounds = paintBounds.shift(-_offset);
 
     paintContext.internalNodesCanvas.saveLayer(saveLayerBounds, paint);
+    paint.dispose();
     paintChildren(paintContext);
     // Restore twice: once for the translate and once for the saveLayer.
     paintContext.internalNodesCanvas.restore();
@@ -365,7 +369,7 @@ class TransformEngineLayer extends ContainerLayer
     prerollContext.mutatorsStack.pushTransform(_transform);
     final ui.Rect childPaintBounds =
         prerollChildren(prerollContext, childMatrix);
-    paintBounds = transformRect(_transform, childPaintBounds);
+    paintBounds = _transform.transformRect(childPaintBounds);
     prerollContext.mutatorsStack.pop();
   }
 
@@ -399,6 +403,22 @@ class ImageFilterEngineLayer extends ContainerLayer
   final ui.Offset _offset;
   final ui.ImageFilter _filter;
 
+  @override
+  void preroll(PrerollContext prerollContext, Matrix4 matrix) {
+    final Matrix4 childMatrix = Matrix4.copy(matrix);
+    childMatrix.translate(_offset.dx, _offset.dy);
+    prerollContext.mutatorsStack
+        .pushTransform(Matrix4.translationValues(_offset.dx, _offset.dy, 0.0));
+    final ui.Rect childPaintBounds =
+        prerollChildren(prerollContext, childMatrix);
+    (_filter as CkManagedSkImageFilterConvertible)
+        .imageFilter((SkImageFilter filter) {
+      paintBounds =
+          rectFromSkIRect(filter.getOutputBounds(toSkRect(childPaintBounds)));
+    });
+    prerollContext.mutatorsStack.pop();
+  }
+
   @override
   void paint(PaintContext paintContext) {
     assert(needsPainting);
@@ -407,6 +427,7 @@ class ImageFilterEngineLayer extends ContainerLayer
     final CkPaint paint = CkPaint();
     paint.imageFilter = _filter;
     paintContext.internalNodesCanvas.saveLayer(paintBounds, paint);
+    paint.dispose();
     paintChildren(paintContext);
     paintContext.internalNodesCanvas.restore();
     paintContext.internalNodesCanvas.restore();
@@ -443,6 +464,7 @@ class ShaderMaskEngineLayer extends ContainerLayer
 
     paintContext.leafNodesCanvas!.drawRect(
         ui.Rect.fromLTWH(0, 0, maskRect.width, maskRect.height), paint);
+    paint.dispose();
     paintContext.leafNodesCanvas!.restore();
 
     paintContext.internalNodesCanvas.restore();
@@ -467,12 +489,11 @@ class PictureLayer extends Layer {
 
   @override
   void preroll(PrerollContext prerollContext, Matrix4 matrix) {
-    paintBounds = picture.cullRect!.shift(offset);
+    paintBounds = picture.cullRect.shift(offset);
   }
 
   @override
   void paint(PaintContext paintContext) {
-    assert(picture != null);
     assert(needsPainting);
 
     paintContext.leafNodesCanvas!.save();
@@ -483,86 +504,6 @@ class PictureLayer extends Layer {
   }
 }
 
-/// A layer representing a physical shape.
-///
-/// The shape clips its children to a given [Path], and casts a shadow based
-/// on the given elevation.
-class PhysicalShapeEngineLayer extends ContainerLayer
-    implements ui.PhysicalShapeEngineLayer {
-  PhysicalShapeEngineLayer(
-    this._elevation,
-    this._color,
-    this._shadowColor,
-    this._path,
-    this._clipBehavior,
-  );
-
-  final double _elevation;
-  final ui.Color _color;
-  final ui.Color? _shadowColor; // ignore: use_late_for_private_fields_and_variables
-  final CkPath _path;
-  final ui.Clip _clipBehavior;
-
-  @override
-  void preroll(PrerollContext prerollContext, Matrix4 matrix) {
-    prerollChildren(prerollContext, matrix);
-    paintBounds = computeSkShadowBounds(
-        _path, _elevation, ui.window.devicePixelRatio, matrix);
-  }
-
-  @override
-  void paint(PaintContext paintContext) {
-    assert(needsPainting);
-
-    if (_elevation != 0) {
-      drawShadow(paintContext.leafNodesCanvas!, _path, _shadowColor!,
-          _elevation, _color.alpha != 0xff);
-    }
-
-    final CkPaint paint = CkPaint()..color = _color;
-    if (_clipBehavior != ui.Clip.antiAliasWithSaveLayer) {
-      paintContext.leafNodesCanvas!.drawPath(_path, paint);
-    }
-
-    final int saveCount = paintContext.internalNodesCanvas.save();
-    switch (_clipBehavior) {
-      case ui.Clip.hardEdge:
-        paintContext.internalNodesCanvas.clipPath(_path, false);
-        break;
-      case ui.Clip.antiAlias:
-        paintContext.internalNodesCanvas.clipPath(_path, true);
-        break;
-      case ui.Clip.antiAliasWithSaveLayer:
-        paintContext.internalNodesCanvas.clipPath(_path, true);
-        paintContext.internalNodesCanvas.saveLayer(paintBounds, null);
-        break;
-      case ui.Clip.none:
-        break;
-    }
-
-    if (_clipBehavior == ui.Clip.antiAliasWithSaveLayer) {
-      // If we want to avoid the bleeding edge artifact
-      // (https://github.com/flutter/flutter/issues/18057#issue-328003931)
-      // using saveLayer, we have to call drawPaint instead of drawPath as
-      // anti-aliased drawPath will always have such artifacts.
-      paintContext.leafNodesCanvas!.drawPaint(paint);
-    }
-
-    paintChildren(paintContext);
-
-    paintContext.internalNodesCanvas.restoreToCount(saveCount);
-  }
-
-  /// Draws a shadow on the given [canvas] for the given [path].
-  ///
-  /// The blur of the shadow is decided by the [elevation], and the
-  /// shadow is painted with the given [color].
-  static void drawShadow(CkCanvas canvas, CkPath path, ui.Color color,
-      double elevation, bool transparentOccluder) {
-    canvas.drawShadow(path, color, elevation, transparentOccluder);
-  }
-}
-
 /// A layer which contains a [ui.ColorFilter].
 class ColorFilterEngineLayer extends ContainerLayer
     implements ui.ColorFilterEngineLayer {
@@ -578,6 +519,7 @@ class ColorFilterEngineLayer extends ContainerLayer
     paint.colorFilter = filter;
 
     paintContext.internalNodesCanvas.saveLayer(paintBounds, paint);
+    paint.dispose();
     paintChildren(paintContext);
     paintContext.internalNodesCanvas.restore();
   }
diff --git a/lib/web_ui/lib/src/engine/canvaskit/layer_scene_builder.dart b/lib/web_ui/lib/src/engine/canvaskit/layer_scene_builder.dart
index addd3aa5b992b602da67f7124545d58a51d43e62..a75148f82d80a688394944e72358d24a02dd48b5 100644
--- a/lib/web_ui/lib/src/engine/canvaskit/layer_scene_builder.dart
+++ b/lib/web_ui/lib/src/engine/canvaskit/layer_scene_builder.dart
@@ -22,13 +22,19 @@ class LayerScene implements ui.Scene {
 
   @override
   Future<ui.Image> toImage(int width, int height) {
-    final ui.Picture picture = layerTree.flatten();
+    final ui.Picture picture = layerTree.flatten(ui.Size(
+      width.toDouble(),
+      height.toDouble(),
+    ));
     return picture.toImage(width, height);
   }
 
   @override
   ui.Image toImageSync(int width, int height) {
-    final ui.Picture picture = layerTree.flatten();
+    final ui.Picture picture = layerTree.flatten(ui.Size(
+      width.toDouble(),
+      height.toDouble(),
+    ));
     return picture.toImageSync(width, height);
   }
 }
@@ -81,7 +87,6 @@ class LayerSceneBuilder implements ui.SceneBuilder {
     ui.Offset offset = ui.Offset.zero,
     double width = 0.0,
     double height = 0.0,
-    Object? webOnlyPaintedBy,
   }) {
     currentLayer.add(PlatformViewLayer(viewId, offset, width, height));
   }
@@ -147,7 +152,6 @@ class LayerSceneBuilder implements ui.SceneBuilder {
     ui.ColorFilter filter, {
     ui.ColorFilterEngineLayer? oldLayer,
   }) {
-    assert(filter != null);
     return pushLayer<ColorFilterEngineLayer>(ColorFilterEngineLayer(filter));
   }
 
@@ -157,7 +161,6 @@ class LayerSceneBuilder implements ui.SceneBuilder {
     ui.ImageFilterEngineLayer? oldLayer,
     ui.Offset offset = ui.Offset.zero,
   }) {
-    assert(filter != null);
     return pushLayer<ImageFilterEngineLayer>(ImageFilterEngineLayer(filter, offset));
   }
 
@@ -179,24 +182,6 @@ class LayerSceneBuilder implements ui.SceneBuilder {
     return pushLayer<OpacityEngineLayer>(OpacityEngineLayer(alpha, offset));
   }
 
-  @override
-  PhysicalShapeEngineLayer pushPhysicalShape({
-    required ui.Path path,
-    required double elevation,
-    required ui.Color color,
-    ui.Color? shadowColor,
-    ui.Clip clipBehavior = ui.Clip.none,
-    ui.EngineLayer? oldLayer,
-  }) {
-    return pushLayer<PhysicalShapeEngineLayer>(PhysicalShapeEngineLayer(
-      elevation,
-      color,
-      shadowColor,
-      path as CkPath,
-      clipBehavior,
-    ));
-  }
-
   @override
   ShaderMaskEngineLayer pushShaderMask(
     ui.Shader shader,
diff --git a/lib/web_ui/lib/src/engine/canvaskit/layer_tree.dart b/lib/web_ui/lib/src/engine/canvaskit/layer_tree.dart
index 576e1b2533221191811656b5ec39a0c8b7d22d9b..2aca00f35dd3ce6edb6a38100b36215e41c92426 100644
--- a/lib/web_ui/lib/src/engine/canvaskit/layer_tree.dart
+++ b/lib/web_ui/lib/src/engine/canvaskit/layer_tree.dart
@@ -21,9 +21,6 @@ class LayerTree {
   /// The root of the layer tree.
   final RootLayer rootLayer;
 
-  /// The size (in physical pixels) of the frame to paint this layer tree into.
-  final ui.Size frameSize = ui.window.physicalSize;
-
   /// The devicePixelRatio of the frame to paint this layer tree into.
   double? devicePixelRatio;
 
@@ -51,8 +48,6 @@ class LayerTree {
     final Iterable<CkCanvas> overlayCanvases =
         frame.viewEmbedder!.getOverlayCanvases();
     overlayCanvases.forEach(internalNodesCanvas.addCanvas);
-    // Clear the canvases before painting
-    internalNodesCanvas.clear(const ui.Color(0x00000000));
     final PaintContext context = PaintContext(
       internalNodesCanvas,
       frame.canvas,
@@ -67,9 +62,9 @@ class LayerTree {
   /// Flattens the tree into a single [ui.Picture].
   ///
   /// This picture does not contain any platform views.
-  ui.Picture flatten() {
+  ui.Picture flatten(ui.Size size) {
     final CkPictureRecorder recorder = CkPictureRecorder();
-    final CkCanvas canvas = recorder.beginRecording(ui.Rect.largest);
+    final CkCanvas canvas = recorder.beginRecording(ui.Offset.zero & size);
     final PrerollContext prerollContext = PrerollContext(null, null);
     rootLayer.preroll(prerollContext, Matrix4.identity());
 
diff --git a/lib/web_ui/lib/src/engine/canvaskit/mask_filter.dart b/lib/web_ui/lib/src/engine/canvaskit/mask_filter.dart
index be67b48b35ccbb9f4432bc5183d08ca24a41e409..331960ba484116884cbe485ab20f0c841a5414ea 100644
--- a/lib/web_ui/lib/src/engine/canvaskit/mask_filter.dart
+++ b/lib/web_ui/lib/src/engine/canvaskit/mask_filter.dart
@@ -5,33 +5,25 @@
 import 'package:ui/ui.dart' as ui;
 
 import 'canvaskit_api.dart';
-import 'skia_object_cache.dart';
+import 'native_memory.dart';
 
 /// The CanvasKit implementation of [ui.MaskFilter].
-class CkMaskFilter extends ManagedSkiaObject<SkMaskFilter> {
+class CkMaskFilter {
   CkMaskFilter.blur(ui.BlurStyle blurStyle, double sigma)
       : _blurStyle = blurStyle,
-        _sigma = sigma;
-
-  final ui.BlurStyle _blurStyle;
-  final double _sigma;
-
-  @override
-  SkMaskFilter createDefault() => _initSkiaObject();
-
-  @override
-  SkMaskFilter resurrect() => _initSkiaObject();
-
-  SkMaskFilter _initSkiaObject() {
-    return canvasKit.MaskFilter.MakeBlur(
+        _sigma = sigma {
+    final SkMaskFilter skMaskFilter = canvasKit.MaskFilter.MakeBlur(
       toSkBlurStyle(_blurStyle),
       _sigma,
       true,
     )!;
+    _ref = UniqueRef<SkMaskFilter>(this, skMaskFilter, 'MaskFilter');
   }
 
-  @override
-  void delete() {
-    rawSkiaObject?.delete();
-  }
+  final ui.BlurStyle _blurStyle;
+  final double _sigma;
+
+  late final UniqueRef<SkMaskFilter> _ref;
+
+  SkMaskFilter get skiaObject => _ref.nativeObject;
 }
diff --git a/lib/web_ui/lib/src/engine/canvaskit/multi_surface_rasterizer.dart b/lib/web_ui/lib/src/engine/canvaskit/multi_surface_rasterizer.dart
new file mode 100644
index 0000000000000000000000000000000000000000..f3b2d78405bf109e964efa2aa2d1e208a4095d25
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/canvaskit/multi_surface_rasterizer.dart
@@ -0,0 +1,71 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui;
+
+/// A Rasterizer which uses one or many on-screen WebGL contexts to display the
+/// scene. This way of rendering is prone to bugs because there is a limit to
+/// how many WebGL contexts can be live at one time as well as bugs in sharing
+/// GL resources between the contexts. However, using [createImageBitmap] is
+/// currently very slow on Firefox and Safari browsers, so directly rendering
+/// to several [Surface]s is how we can achieve 60 fps on these browsers.
+class MultiSurfaceRasterizer extends Rasterizer {
+  @override
+  MultiSurfaceViewRasterizer createViewRasterizer(EngineFlutterView view) {
+    return _viewRasterizers.putIfAbsent(
+        view, () => MultiSurfaceViewRasterizer(view, this));
+  }
+
+  final Map<EngineFlutterView, MultiSurfaceViewRasterizer> _viewRasterizers =
+      <EngineFlutterView, MultiSurfaceViewRasterizer>{};
+
+  @override
+  void dispose() {
+    for (final MultiSurfaceViewRasterizer viewRasterizer
+        in _viewRasterizers.values) {
+      viewRasterizer.dispose();
+    }
+    _viewRasterizers.clear();
+  }
+
+  @override
+  void setResourceCacheMaxBytes(int bytes) {
+    for (final MultiSurfaceViewRasterizer viewRasterizer
+        in _viewRasterizers.values) {
+      viewRasterizer.displayFactory.forEachCanvas((Surface surface) {
+        surface.setSkiaResourceCacheMaxBytes(bytes);
+      });
+    }
+  }
+}
+
+class MultiSurfaceViewRasterizer extends ViewRasterizer {
+  MultiSurfaceViewRasterizer(super.view, this.rasterizer);
+
+  final MultiSurfaceRasterizer rasterizer;
+
+  @override
+  final DisplayCanvasFactory<Surface> displayFactory =
+      DisplayCanvasFactory<Surface>(
+          createCanvas: () => Surface(isDisplayCanvas: true));
+
+  @override
+  void prepareToDraw() {
+    displayFactory.baseCanvas.createOrUpdateSurface(currentFrameSize);
+  }
+
+  @override
+  Future<void> rasterizeToCanvas(
+      DisplayCanvas canvas, List<CkPicture> pictures) {
+    final Surface surface = canvas as Surface;
+    surface.createOrUpdateSurface(currentFrameSize);
+    surface.positionToShowFrame(currentFrameSize);
+    final CkCanvas skCanvas = surface.getCanvas();
+    skCanvas.clear(const ui.Color(0x00000000));
+    pictures.forEach(skCanvas.drawPicture);
+    surface.flush();
+    return Future<void>.value();
+  }
+}
diff --git a/lib/web_ui/lib/src/engine/canvaskit/native_memory.dart b/lib/web_ui/lib/src/engine/canvaskit/native_memory.dart
new file mode 100644
index 0000000000000000000000000000000000000000..c1e592d242921435fb9024f7665d3a8165bd251d
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/canvaskit/native_memory.dart
@@ -0,0 +1,236 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:js_interop';
+import 'package:meta/meta.dart';
+import 'package:ui/src/engine.dart';
+
+/// Collects native objects that weren't explicitly disposed of using
+/// [UniqueRef.dispose] or [CountedRef.unref].
+///
+/// We use this to delete Skia objects when their "Ck" wrapper is garbage
+/// collected.
+///
+/// Example sequence of events:
+///
+/// 1. A (CkPaint, SkPaint) pair created.
+/// 2. The paint is used to paint some picture.
+/// 3. CkPaint is dropped by the app.
+/// 4. GC decides to perform a GC cycle and collects CkPaint.
+/// 5. The finalizer function is called with the SkPaint as the sole argument.
+/// 6. We call `delete` on SkPaint.
+DomFinalizationRegistry _finalizationRegistry = DomFinalizationRegistry(
+  (JSAny boxedUniq) {
+    final UniqueRef<Object> uniq = boxedUniq.fromJSWrapper as UniqueRef<Object>;
+    uniq.collect();
+  }.toJS
+);
+
+NativeMemoryFinalizationRegistry nativeMemoryFinalizationRegistry = NativeMemoryFinalizationRegistry();
+
+/// An indirection to [DomFinalizationRegistry] to enable tests provide a
+/// mock implementation of a finalization registry.
+class NativeMemoryFinalizationRegistry {
+  void register(Object owner, UniqueRef<Object> ref) {
+    if (browserSupportsFinalizationRegistry) {
+      _finalizationRegistry.register(owner.toJSWrapper, ref.toJSWrapper);
+    }
+  }
+}
+
+/// Manages the lifecycle of a C++ object referenced by a single Dart object.
+///
+/// It is expected that when the C++ object is no longer needed [dispose] is
+/// called.
+///
+/// To prevent memory leaks, the underlying C++ object is deleted by the GC if
+/// it wasn't previously disposed of explicitly.
+class UniqueRef<T extends Object> {
+  UniqueRef(Object owner, T nativeObject, this._debugOwnerLabel) {
+    _nativeObject = nativeObject;
+    if (Instrumentation.enabled) {
+      Instrumentation.instance.incrementCounter('$_debugOwnerLabel Created');
+    }
+    nativeMemoryFinalizationRegistry.register(owner, this);
+  }
+
+  T? _nativeObject;
+  final String _debugOwnerLabel;
+
+  /// Returns the underlying native object reference, if it has not been
+  /// disposed of yet.
+  ///
+  /// The returned reference must not be stored. I should only be borrowed
+  /// temporarily. Storing this reference may result in dangling pointer errors.
+  T get nativeObject {
+    assert(!isDisposed, 'The native object of $_debugOwnerLabel was disposed.');
+    return _nativeObject!;
+  }
+
+  /// Returns whether the underlying native object has been disposed and
+  /// therefore can no longer be used.
+  bool get isDisposed => _nativeObject == null;
+
+  /// Disposes the underlying native object.
+  ///
+  /// The underlying object may be deleted or its ref count may be bumped down.
+  /// The exact action taken depends on the sharing model of that particular
+  /// object. For example, an [SkImage] may not be immediately deleted if a
+  /// [SkPicture] exists that still references it. On the other hand, [SkPaint]
+  /// is deleted eagerly.
+  void dispose() {
+    assert(!isDisposed, 'A native object reference cannot be disposed more than once.');
+    if (Instrumentation.enabled) {
+      Instrumentation.instance.incrementCounter('$_debugOwnerLabel Deleted');
+    }
+    final SkDeletable object = nativeObject as SkDeletable;
+    if (!object.isDeleted()) {
+      object.delete();
+    }
+    _nativeObject = null;
+  }
+
+  /// Called by the garbage [Collector] when the owner of this handle is
+  /// collected.
+  ///
+  /// Garbage collection is used as a back-up for the cases when the handle
+  /// isn't disposed of explicitly by calling [dispose]. It most likely
+  /// indicates a memory leak or inefficiency in the framework or application
+  /// code.
+  @visibleForTesting
+  void collect() {
+    if (!isDisposed) {
+      if (Instrumentation.enabled) {
+        Instrumentation.instance.incrementCounter('$_debugOwnerLabel Leaked');
+      }
+      dispose();
+    }
+  }
+}
+
+/// Interface that classes wrapping [UniqueRef] must implement.
+///
+/// Used to collect stack traces in debug mode.
+abstract class StackTraceDebugger {
+  /// The stack trace pointing to code location that created or upreffed a
+  /// [CountedRef].
+  StackTrace get debugStackTrace;
+}
+
+/// Manages the lifecycle of a C++ object referenced by multiple Dart objects.
+///
+/// Uses reference counting to manage the lifecycle of the C++ object.
+///
+/// If the C++ object has a unique owner, use [UniqueRef] instead.
+///
+/// The [ref] method can be used to increment the refcount to tell this box to
+/// keep the underlying C++ object alive.
+///
+/// The [unref] method can be used to decrement the refcount indicating that a
+/// referring object no longer needs it. When the refcount drops to zero the
+/// underlying C++ object is deleted.
+///
+/// In addition to ref counting, this object is also managed by GC. When this
+/// reference is garbage collected, the underlying C++ object is automatically
+/// deleted. This is mostly done to prevent memory leaks in production. Well
+/// behaving framework and app code are expected to rely on [ref] and [unref]
+/// for timely collection of resources.
+class CountedRef<R extends StackTraceDebugger, T extends Object> {
+  /// Creates a counted reference.
+  CountedRef(T nativeObject, R debugReferrer, String debugLabel) {
+    _ref = UniqueRef<T>(this, nativeObject, debugLabel);
+    assert(() {
+      debugReferrers.add(debugReferrer);
+      return true;
+    }());
+    assert(refCount == debugReferrers.length);
+  }
+
+  /// The native object reference whose lifecycle is being managed by this ref
+  /// count.
+  ///
+  /// Do not store this value outside this class.
+  late final UniqueRef<T> _ref;
+
+  /// Returns the underlying native object reference, if it has not been
+  /// disposed of yet.
+  ///
+  /// The returned reference must not be stored. I should only be borrowed
+  /// temporarily. Storing this reference may result in dangling pointer errors.
+  T get nativeObject => _ref.nativeObject;
+
+  /// The number of objects sharing references to this box.
+  ///
+  /// When this count reaches zero, the underlying [nativeObject] is scheduled
+  /// for deletion.
+  int get refCount => _refCount;
+  int _refCount = 1;
+
+  /// Whether the underlying [nativeObject] has been disposed and is no longer
+  /// accessible.
+  bool get isDisposed => _ref.isDisposed;
+
+  /// When assertions are enabled, stores all objects that share this box.
+  ///
+  /// The length of this list is always identical to [refCount].
+  ///
+  /// This list can be used for debugging ref counting issues.
+  final Set<R> debugReferrers = <R>{};
+
+  /// If asserts are enabled, the [StackTrace]s representing when a reference
+  /// was created.
+  List<StackTrace> debugGetStackTraces() {
+    List<StackTrace>? result;
+    assert(() {
+      result = debugReferrers
+          .map<StackTrace>((R referrer) => referrer.debugStackTrace)
+          .toList();
+      return true;
+    }());
+
+    if (result != null) {
+      return result!;
+    }
+
+    throw UnsupportedError('');
+  }
+
+  /// Increases the reference count of this box because a new object began
+  /// sharing ownership of the underlying [nativeObject].
+  void ref(R debugReferrer) {
+    assert(
+      !_ref.isDisposed,
+      'Cannot increment ref count on a deleted handle.',
+    );
+    assert(_refCount > 0);
+    assert(
+      debugReferrers.add(debugReferrer),
+      'Attempted to increment ref count by the same referrer more than once.',
+    );
+    _refCount += 1;
+    assert(refCount == debugReferrers.length);
+  }
+
+  /// Decrements the reference count for the [nativeObject].
+  ///
+  /// Does nothing if the object has already been deleted.
+  ///
+  /// If this causes the reference count to drop to zero, deletes the
+  /// [nativeObject].
+  void unref(R debugReferrer) {
+    assert(
+      !_ref.isDisposed,
+      'Attempted to unref an already deleted native object.',
+    );
+    assert(
+      debugReferrers.remove(debugReferrer),
+      'Attempted to decrement ref count by the same referrer more than once.',
+    );
+    _refCount -= 1;
+    assert(refCount == debugReferrers.length);
+    if (_refCount == 0) {
+      _ref.dispose();
+    }
+  }
+}
diff --git a/lib/web_ui/lib/src/engine/canvaskit/noto_font.dart b/lib/web_ui/lib/src/engine/canvaskit/noto_font.dart
deleted file mode 100644
index ad5b43e92a2caa972c65bb8a17fcb5b36053c363..0000000000000000000000000000000000000000
--- a/lib/web_ui/lib/src/engine/canvaskit/noto_font.dart
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-class NotoFont {
-  const NotoFont(this.name, this.url, this._rangeStarts, this._rangeEnds);
-
-  factory NotoFont.fromFlatRanges(String name, String url, List<int> flatRanges) {
-    final List<int> starts = <int>[];
-    final List<int> ends = <int>[];
-    for (int i = 0; i < flatRanges.length; i += 2) {
-      starts.add(flatRanges[i]);
-      ends.add(flatRanges[i+1]);
-    }
-    return NotoFont(name, url, starts, ends);
-  }
-
-  final String name;
-  final String url;
-  // A sorted list of Unicode range start points.
-  final List<int> _rangeStarts;
-
-  // A sorted list of Unicode range end points.
-  final List<int> _rangeEnds;
-
-  List<CodeunitRange> computeUnicodeRanges() {
-    final List<CodeunitRange> result = <CodeunitRange>[];
-    for (int i = 0; i < _rangeStarts.length; i++) {
-      result.add(CodeunitRange(_rangeStarts[i], _rangeEnds[i]));
-    }
-    return result;
-  }
-
-  // Returns `true` if this font has a glyph for the given [codeunit].
-  bool contains(int codeUnit) {
-    // Binary search through the starts and ends to see if there
-    // is a range that contains the codeunit.
-    int min = 0;
-    int max = _rangeStarts.length - 1;
-    while (min <= max) {
-      final int mid = (min + max) ~/ 2;
-      if (_rangeStarts[mid] > codeUnit) {
-        max = mid - 1;
-      } else {
-        // _rangeStarts[mid] <= codeUnit
-        if (_rangeEnds[mid] >= codeUnit) {
-          return true;
-        }
-        min = mid + 1;
-      }
-    }
-    return false;
-  }
-}
-
-class CodeunitRange {
-  const CodeunitRange(this.start, this.end);
-
-  final int start;
-  final int end;
-
-
-  bool contains(int codeUnit) {
-    return start <= codeUnit && codeUnit <= end;
-  }
-
-  @override
-  bool operator ==(dynamic other) {
-    if (other is! CodeunitRange) {
-      return false;
-    }
-    final CodeunitRange range = other;
-    return range.start == start && range.end == end;
-  }
-
-  @override
-  int get hashCode => Object.hash(start, end);
-
-  @override
-  String toString() => '[$start, $end]';
-}
diff --git a/lib/web_ui/lib/src/engine/canvaskit/offscreen_canvas_rasterizer.dart b/lib/web_ui/lib/src/engine/canvaskit/offscreen_canvas_rasterizer.dart
new file mode 100644
index 0000000000000000000000000000000000000000..585575391a1cb037bde5b69d2a1c1bdd424a80bc
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/canvaskit/offscreen_canvas_rasterizer.dart
@@ -0,0 +1,63 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:ui/src/engine.dart';
+
+/// A [Rasterizer] that uses a single GL context in an OffscreenCanvas to do
+/// all the rendering. It transfers bitmaps created in the OffscreenCanvas to
+/// one or many on-screen <canvas> elements to actually display the scene.
+class OffscreenCanvasRasterizer extends Rasterizer {
+  /// This is an SkSurface backed by an OffScreenCanvas. This single Surface is
+  /// used to render to many RenderCanvases to produce the rendered scene.
+  final Surface offscreenSurface = Surface();
+
+  @override
+  OffscreenCanvasViewRasterizer createViewRasterizer(EngineFlutterView view) {
+    return _viewRasterizers.putIfAbsent(
+        view, () => OffscreenCanvasViewRasterizer(view, this));
+  }
+
+  final Map<EngineFlutterView, OffscreenCanvasViewRasterizer> _viewRasterizers =
+      <EngineFlutterView, OffscreenCanvasViewRasterizer>{};
+
+  @override
+  void setResourceCacheMaxBytes(int bytes) {
+    offscreenSurface.setSkiaResourceCacheMaxBytes(bytes);
+  }
+
+  @override
+  void dispose() {
+    offscreenSurface.dispose();
+    for (final OffscreenCanvasViewRasterizer viewRasterizer
+        in _viewRasterizers.values) {
+      viewRasterizer.dispose();
+    }
+  }
+}
+
+class OffscreenCanvasViewRasterizer extends ViewRasterizer {
+  OffscreenCanvasViewRasterizer(super.view, this.rasterizer);
+
+  final OffscreenCanvasRasterizer rasterizer;
+
+  @override
+  final DisplayCanvasFactory<RenderCanvas> displayFactory =
+      DisplayCanvasFactory<RenderCanvas>(createCanvas: () => RenderCanvas());
+
+  /// Render the given [pictures] so it is displayed by the given [canvas].
+  @override
+  Future<void> rasterizeToCanvas(
+      DisplayCanvas canvas, List<CkPicture> pictures) async {
+    await rasterizer.offscreenSurface.rasterizeToCanvas(
+      currentFrameSize,
+      canvas as RenderCanvas,
+      pictures,
+    );
+  }
+
+  @override
+  void prepareToDraw() {
+    rasterizer.offscreenSurface.createOrUpdateSurface(currentFrameSize);
+  }
+}
diff --git a/lib/web_ui/lib/src/engine/canvaskit/overlay_scene_optimizer.dart b/lib/web_ui/lib/src/engine/canvaskit/overlay_scene_optimizer.dart
new file mode 100644
index 0000000000000000000000000000000000000000..15c010c34cd9e23c7ee481f9698bcbac8e16d70f
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/canvaskit/overlay_scene_optimizer.dart
@@ -0,0 +1,210 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:meta/meta.dart';
+import 'package:ui/src/engine/util.dart';
+import 'package:ui/ui.dart' as ui;
+
+import '../../engine.dart' show PlatformViewManager;
+import '../vector_math.dart';
+import 'embedded_views.dart';
+import 'picture.dart';
+import 'rasterizer.dart';
+
+/// If `true`, draws the computed bounds for platform views and pictures to
+/// help debug issues with the overlay optimization.
+bool debugOverlayOptimizationBounds = false;
+
+/// A [Rendering] is a concrete description of how a Flutter scene will be
+/// rendered in a web browser.
+///
+/// A [Rendering] is a sequence containing two types of entities:
+///   * Render canvases: which contain rasterized CkPictures, and
+///   * Platform views: being HTML content that is to be composited along with
+///     the Flutter content.
+class Rendering {
+  final List<RenderingEntity> entities = <RenderingEntity>[];
+
+  void add(RenderingEntity entity) {
+    entities.add(entity);
+  }
+
+  /// Returns [true] if this is equibalent to [other] for use in rendering.
+  bool equalsForRendering(Rendering other) {
+    if (other.entities.length != entities.length) {
+      return false;
+    }
+    for (int i = 0; i < entities.length; i++) {
+      if (!entities[i].equalsForRendering(other.entities[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  /// A list of just the canvases in the rendering.
+  List<RenderingRenderCanvas> get canvases =>
+      entities.whereType<RenderingRenderCanvas>().toList();
+
+  @override
+  String toString() => entities.toString();
+}
+
+/// An element of a [Rendering]. Either a render canvas or a platform view.
+sealed class RenderingEntity {
+  /// Returns [true] if this entity is equal to [other] for use in a rendering.
+  ///
+  /// For example, all [RenderingRenderCanvas] objects are equal to each other
+  /// for purposes of rendering since any canvas in that place in the rendering
+  /// will be equivalent. Platform views are only equal if they are for the same
+  /// view id.
+  bool equalsForRendering(RenderingEntity other);
+}
+
+class RenderingRenderCanvas extends RenderingEntity {
+  RenderingRenderCanvas();
+
+  /// The [pictures] which should be rendered in this canvas.
+  final List<CkPicture> pictures = <CkPicture>[];
+
+  /// The [DisplayCanvas] that will be used to display [pictures].
+  ///
+  /// This is set by the view embedder.
+  DisplayCanvas? displayCanvas;
+
+  /// Adds the [picture] to the pictures that should be rendered in this canvas.
+  void add(CkPicture picture) {
+    pictures.add(picture);
+  }
+
+  @override
+  bool equalsForRendering(RenderingEntity other) {
+    return other is RenderingRenderCanvas;
+  }
+
+  @override
+  String toString() {
+    return '$RenderingRenderCanvas(${pictures.length} pictures)';
+  }
+}
+
+/// A platform view to be rendered.
+class RenderingPlatformView extends RenderingEntity {
+  RenderingPlatformView(this.viewId);
+
+  /// The [viewId] of the platform view to render.
+  final int viewId;
+
+  @override
+  bool equalsForRendering(RenderingEntity other) {
+    return other is RenderingPlatformView && other.viewId == viewId;
+  }
+
+  @override
+  String toString() {
+    return '$RenderingPlatformView($viewId)';
+  }
+
+  /// The bounds that were computed for this platform view when creating the
+  /// optimized rendering. This is only set in debug mode.
+  ui.Rect? debugComputedBounds;
+}
+
+// Computes the bounds of the platform view from its associated parameters.
+@visibleForTesting
+ui.Rect computePlatformViewBounds(EmbeddedViewParams params) {
+  ui.Rect currentClipBounds = ui.Rect.largest;
+
+  Matrix4 currentTransform = Matrix4.identity();
+  for (final Mutator mutator in params.mutators.reversed) {
+    switch (mutator.type) {
+      case MutatorType.clipRect:
+        final ui.Rect transformedClipBounds =
+            transformRectWithMatrix(currentTransform, mutator.rect!);
+        currentClipBounds = currentClipBounds.intersect(transformedClipBounds);
+      case MutatorType.clipRRect:
+        final ui.Rect transformedClipBounds =
+            transformRectWithMatrix(currentTransform, mutator.rrect!.outerRect);
+        currentClipBounds = currentClipBounds.intersect(transformedClipBounds);
+      case MutatorType.clipPath:
+        final ui.Rect transformedClipBounds = transformRectWithMatrix(
+            currentTransform, mutator.path!.getBounds());
+        currentClipBounds.intersect(transformedClipBounds);
+      case MutatorType.transform:
+        currentTransform = currentTransform.multiplied(mutator.matrix!);
+      case MutatorType.opacity:
+        // Doesn't effect bounds.
+        continue;
+    }
+  }
+
+  // The width and height are in physical pixels already, so apply the inverse
+  // scale since the transform already applied the scaling.
+  final ui.Rect rawBounds = ui.Rect.fromLTWH(
+    params.offset.dx,
+    params.offset.dy,
+    params.size.width,
+    params.size.height,
+  );
+  final ui.Rect transformedBounds =
+      transformRectWithMatrix(currentTransform, rawBounds);
+  return transformedBounds.intersect(currentClipBounds);
+}
+
+/// Returns the optimized [Rendering] for a sequence of [pictures] and
+/// [platformViews].
+///
+/// [paramsForViews] is required to compute the bounds of the platform views.
+Rendering createOptimizedRendering(
+  List<CkPicture> pictures,
+  List<int> platformViews,
+  Map<int, EmbeddedViewParams> paramsForViews,
+) {
+  assert(pictures.length == platformViews.length + 1);
+
+  final Rendering result = Rendering();
+
+  // The first render canvas is required due to the pseudo-platform view "V_0"
+  // which is defined as a platform view that comes before all Flutter drawing
+  // commands and intersects with everything.
+  RenderingRenderCanvas currentRenderCanvas = RenderingRenderCanvas();
+
+  // This line essentially unwinds the first iteration of the following loop.
+  // Since "V_0" intersects with all subsequent pictures, then the first picture
+  // it intersects with is "P_0", so we create a new render canvas and add "P_0"
+  // to it.
+  if (!pictures[0].cullRect.isEmpty) {
+    currentRenderCanvas.add(pictures[0]);
+  }
+  for (int i = 0; i < platformViews.length; i++) {
+    final RenderingPlatformView platformView =
+        RenderingPlatformView(platformViews[i]);
+    if (PlatformViewManager.instance.isVisible(platformViews[i])) {
+      final ui.Rect platformViewBounds =
+          computePlatformViewBounds(paramsForViews[platformViews[i]]!);
+      if (debugOverlayOptimizationBounds) {
+        platformView.debugComputedBounds = platformViewBounds;
+      }
+      bool intersectsWithCurrentPictures = false;
+      for (final CkPicture picture in currentRenderCanvas.pictures) {
+        if (picture.cullRect.overlaps(platformViewBounds)) {
+          intersectsWithCurrentPictures = true;
+          break;
+        }
+      }
+      if (intersectsWithCurrentPictures) {
+        result.add(currentRenderCanvas);
+        currentRenderCanvas = RenderingRenderCanvas();
+      }
+    }
+    result.add(platformView);
+    if (!pictures[i + 1].cullRect.isEmpty) {
+      currentRenderCanvas.add(pictures[i + 1]);
+    }
+  }
+  if (currentRenderCanvas.pictures.isNotEmpty) {
+    result.add(currentRenderCanvas);
+  }
+  return result;
+}
diff --git a/lib/web_ui/lib/src/engine/canvaskit/painting.dart b/lib/web_ui/lib/src/engine/canvaskit/painting.dart
index 8cd9fc1ab817c8d32426d366422ca0576a0a58e9..00bead7240fb64b748592cb21311b185d65d9c69 100644
--- a/lib/web_ui/lib/src/engine/canvaskit/painting.dart
+++ b/lib/web_ui/lib/src/engine/canvaskit/painting.dart
@@ -2,29 +2,44 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:convert';
 import 'dart:typed_data';
 
+import 'package:meta/meta.dart';
 import 'package:ui/ui.dart' as ui;
 
 import '../color_filter.dart';
+import '../shader_data.dart';
 import '../vector_math.dart';
 import 'canvaskit_api.dart';
 import 'color_filter.dart';
 import 'image_filter.dart';
 import 'mask_filter.dart';
+import 'native_memory.dart';
 import 'shader.dart';
-import 'skia_object_cache.dart';
 
 /// The implementation of [ui.Paint] used by the CanvasKit backend.
 ///
 /// This class is backed by a Skia object that must be explicitly
 /// deleted to avoid a memory leak. This is done by extending [SkiaObject].
-class CkPaint extends ManagedSkiaObject<SkPaint> implements ui.Paint {
-  CkPaint();
+class CkPaint implements ui.Paint {
+  CkPaint() : skiaObject = SkPaint() {
+    skiaObject.setAntiAlias(_isAntiAlias);
+    skiaObject.setColorInt(_defaultPaintColor.toDouble());
+    _ref = UniqueRef<SkPaint>(this, skiaObject, 'Paint');
+  }
+
+  final SkPaint skiaObject;
+  late final UniqueRef<SkPaint> _ref;
+  CkManagedSkImageFilterConvertible? _imageFilter;
 
   static const int _defaultPaintColor = 0xFF000000;
 
+  /// Returns the native reference to the underlying [SkPaint] object.
+  ///
+  /// This should only be used in tests.
+  @visibleForTesting
+  UniqueRef<SkPaint> get debugRef => _ref;
+
   @override
   ui.BlendMode get blendMode => _blendMode;
   @override
@@ -112,7 +127,7 @@ class CkPaint extends ManagedSkiaObject<SkPaint> implements ui.Paint {
       return;
     }
     _color = value.value;
-    skiaObject.setColorInt(value.value);
+    skiaObject.setColorInt(value.value.toDouble());
   }
 
   int _color = _defaultPaintColor;
@@ -154,12 +169,8 @@ class CkPaint extends ManagedSkiaObject<SkPaint> implements ui.Paint {
     if (_shader == value) {
       return;
     }
-    if (value is CkFragmentShader) {
-      _shader = value.createShader();
-    } else {
-      _shader = value as CkShader?;
-    }
-    skiaObject.setShader(_shader?.withQuality(_filterQuality));
+    _shader = value as CkShader?;
+    skiaObject.setShader(_shader?.getSkShader(_filterQuality));
   }
 
   CkShader? _shader;
@@ -200,7 +211,7 @@ class CkPaint extends ManagedSkiaObject<SkPaint> implements ui.Paint {
       return;
     }
     _filterQuality = value;
-    skiaObject.setShader(_shader?.withQuality(value));
+    skiaObject.setShader(_shader?.getSkShader(value));
   }
 
   ui.FilterQuality _filterQuality = ui.FilterQuality.none;
@@ -262,50 +273,107 @@ class CkPaint extends ManagedSkiaObject<SkPaint> implements ui.Paint {
     if (_imageFilter == value) {
       return;
     }
+    final CkManagedSkImageFilterConvertible? filter;
     if (value is ui.ColorFilter) {
-      _imageFilter = createCkColorFilter(value as EngineColorFilter);
+      filter = createCkColorFilter(value as EngineColorFilter);
     }
     else {
-      _imageFilter = value as CkManagedSkImageFilterConvertible?;
+      filter = value as CkManagedSkImageFilterConvertible?;
     }
-    _managedImageFilter = _imageFilter?.imageFilter;
-    skiaObject.setImageFilter(_managedImageFilter?.skiaObject);
-  }
 
-  CkManagedSkImageFilterConvertible? _imageFilter;
-  ManagedSkiaObject<SkImageFilter>? _managedImageFilter;
+    if (filter != null) {
+      filter.imageFilter((SkImageFilter skImageFilter) {
+        skiaObject.setImageFilter(skImageFilter);
+      });
+    }
 
-  @override
-  SkPaint createDefault() {
-    final SkPaint paint = SkPaint();
-    paint.setAntiAlias(_isAntiAlias);
-    paint.setColorInt(_color);
-    return paint;
+    _imageFilter = filter;
   }
 
-  @override
-  SkPaint resurrect() {
-    final SkPaint paint = SkPaint();
-    // No need to do anything for `invertColors`. If it was set, then it
-    // updated `_managedColorFilter`.
-    paint.setBlendMode(toSkBlendMode(_blendMode));
-    paint.setStyle(toSkPaintStyle(_style));
-    paint.setStrokeWidth(_strokeWidth);
-    paint.setAntiAlias(_isAntiAlias);
-    paint.setColorInt(_color);
-    paint.setShader(_shader?.withQuality(_filterQuality));
-    paint.setMaskFilter(_ckMaskFilter?.skiaObject);
-    paint.setColorFilter(_effectiveColorFilter?.skiaObject);
-    paint.setImageFilter(_managedImageFilter?.skiaObject);
-    paint.setStrokeCap(toSkStrokeCap(_strokeCap));
-    paint.setStrokeJoin(toSkStrokeJoin(_strokeJoin));
-    paint.setStrokeMiter(_strokeMiterLimit);
-    return paint;
+  /// Disposes of this paint object.
+  ///
+  /// This object cannot be used again after calling this method.
+  void dispose() {
+    _ref.dispose();
   }
 
+  // Must be kept in sync with the default in paint.cc.
+  static const double _kStrokeMiterLimitDefault = 4.0;
+
+  // Must be kept in sync with the default in paint.cc.
+  static const int _kColorDefault = 0xFF000000;
+
+  // Must be kept in sync with the default in paint.cc.
+  static final int _kBlendModeDefault = ui.BlendMode.srcOver.index;
+
   @override
-  void delete() {
-    rawSkiaObject?.delete();
+  String toString() {
+    String resultString = 'Paint()';
+
+    assert(() {
+      final StringBuffer result = StringBuffer();
+      String semicolon = '';
+      result.write('Paint(');
+      if (style == ui.PaintingStyle.stroke) {
+        result.write('$style');
+        if (strokeWidth != 0.0) {
+          result.write(' ${strokeWidth.toStringAsFixed(1)}');
+        } else {
+          result.write(' hairline');
+        }
+        if (strokeCap != ui.StrokeCap.butt) {
+          result.write(' $strokeCap');
+        }
+        if (strokeJoin == ui.StrokeJoin.miter) {
+          if (strokeMiterLimit != _kStrokeMiterLimitDefault) {
+            result.write(' $strokeJoin up to ${strokeMiterLimit.toStringAsFixed(1)}');
+          }
+        } else {
+          result.write(' $strokeJoin');
+        }
+        semicolon = '; ';
+      }
+      if (!isAntiAlias) {
+        result.write('${semicolon}antialias off');
+        semicolon = '; ';
+      }
+      if (color != const ui.Color(_kColorDefault)) {
+        result.write('$semicolon$color');
+        semicolon = '; ';
+      }
+      if (blendMode.index != _kBlendModeDefault) {
+        result.write('$semicolon$blendMode');
+        semicolon = '; ';
+      }
+      if (colorFilter != null) {
+        result.write('${semicolon}colorFilter: $colorFilter');
+        semicolon = '; ';
+      }
+      if (maskFilter != null) {
+        result.write('${semicolon}maskFilter: $maskFilter');
+        semicolon = '; ';
+      }
+      if (filterQuality != ui.FilterQuality.none) {
+        result.write('${semicolon}filterQuality: $filterQuality');
+        semicolon = '; ';
+      }
+      if (shader != null) {
+        result.write('${semicolon}shader: $shader');
+        semicolon = '; ';
+      }
+      if (imageFilter != null) {
+        result.write('${semicolon}imageFilter: $imageFilter');
+        semicolon = '; ';
+      }
+      if (invertColors) {
+        result.write('${semicolon}invert: $invertColors');
+      }
+      result.write(')');
+      resultString = result.toString();
+      return true;
+    }());
+
+    return resultString;
   }
 }
 
@@ -318,129 +386,23 @@ final Float32List _invertColorMatrix = Float32List.fromList(const <double>[
 
 final ManagedSkColorFilter _invertColorFilter = ManagedSkColorFilter(CkMatrixColorFilter(_invertColorMatrix));
 
-class UniformData {
-  const UniformData({
-    required this.name,
-    required this.location,
-    required this.type,
-  });
-
-  final String name;
-  final UniformType type;
-  final int location;
-
-  static const UniformData empty =
-      UniformData(name: '', location: -1, type: UniformType.Float);
-}
-
-enum UniformType {
-  Boolean,
-  SByte,
-  UByte,
-  Short,
-  UShort,
-  Int,
-  Uint,
-  Int64,
-  Uint64,
-  Half,
-  Float,
-  Double,
-  SampledImage,
-}
-
-UniformType? uniformTypeFromJson(int value) {
-  switch (value) {
-    case 0:
-      return UniformType.Boolean;
-    case 1:
-      return UniformType.SByte;
-    case 2:
-      return UniformType.UByte;
-    case 3:
-      return UniformType.Short;
-    case 4:
-      return UniformType.UShort;
-    case 5:
-      return UniformType.Int;
-    case 6:
-      return UniformType.Uint;
-    case 7:
-      return UniformType.Int64;
-    case 8:
-      return UniformType.Uint64;
-    case 9:
-      return UniformType.Half;
-    case 10:
-      return UniformType.Float;
-    case 11:
-      return UniformType.Double;
-    case 12:
-      return UniformType.SampledImage;
-  }
-  return null;
-}
-
 class CkFragmentProgram implements ui.FragmentProgram {
   CkFragmentProgram(this.name, this.effect, this.uniforms, this.floatCount,
       this.textureCount);
 
-  static Future<CkFragmentProgram> fromBytes(String name, Uint8List data) async {
-    final String contents = utf8.decode(data);
-    final Object? rawShaderData = json.decode(contents);
-    if (rawShaderData is! Map<String, Object?>) {
-      throw const FormatException('Invalid Shader Data');
-    }
-    final Object? source = rawShaderData['sksl'];
-    final Object? rawUniforms = rawShaderData['uniforms'];
-    if (source is! String || rawUniforms is! List<Object?>) {
-      throw const FormatException('Invalid Shader Data');
-    }
-    final SkRuntimeEffect? effect = MakeRuntimeEffect(source);
+  factory CkFragmentProgram.fromBytes(String name, Uint8List data) {
+    final ShaderData shaderData = ShaderData.fromBytes(data);
+    final SkRuntimeEffect? effect = MakeRuntimeEffect(shaderData.source);
     if (effect == null) {
-      throw const FormatException('Invalid Shader Data');
+      throw const FormatException('Invalid Shader Source');
     }
 
-    final List<UniformData> uniforms = List<UniformData>.filled(rawUniforms.length, UniformData.empty);
-
-    int textureCount = 0;
-    int floatCount = 0;
-    for (int i = 0; i < rawUniforms.length; i += 1) {
-      final Object? rawUniformData = rawUniforms[i];
-      if (rawUniformData is! Map<String, Object?>) {
-        throw const FormatException('Invalid Shader Data');
-      }
-      final Object? name = rawUniformData['name'];
-      final Object? location = rawUniformData['location'];
-      final Object? rawType = rawUniformData['type'];
-      if (name is! String || location is! int || rawType is! int) {
-        throw const FormatException('Invalid Shader Data');
-      }
-      final UniformType? type = uniformTypeFromJson(rawType);
-      if (type == null) {
-        throw const FormatException('Invalid Shader Data');
-      }
-      if (type == UniformType.SampledImage) {
-        textureCount += 1;
-      } else {
-        final Object? bitWidth = rawUniformData['bit_width'];
-        if (bitWidth is! int) {
-          throw const FormatException('Invalid Shader Data');
-        }
-        floatCount += bitWidth ~/ 32;
-      }
-      uniforms[location] = UniformData(
-        name: name,
-        location: location,
-        type: type,
-      );
-    }
     return CkFragmentProgram(
       name,
       effect,
-      uniforms,
-      floatCount,
-      textureCount,
+      shaderData.uniforms,
+      shaderData.floatCount,
+      shaderData.textureCount,
     );
   }
 
@@ -456,7 +418,7 @@ class CkFragmentProgram implements ui.FragmentProgram {
   }
 }
 
-class CkFragmentShader implements ui.FragmentShader {
+class CkFragmentShader implements ui.FragmentShader, CkShader {
   CkFragmentShader(this.name, this.effect, int floatCount, int textureCount)
       : floats = List<double>.filled(floatCount + textureCount * 2, 0),
         samplers = List<SkShader?>.filled(textureCount, null),
@@ -468,30 +430,52 @@ class CkFragmentShader implements ui.FragmentShader {
   final List<double> floats;
   final List<SkShader?> samplers;
 
-  CkShader createShader() {
-    return CkFragmentInstance(name, effect, floats, samplers);
+  @visibleForTesting
+  UniqueRef<SkShader>? ref;
+
+  @override
+  SkShader getSkShader(ui.FilterQuality contextualQuality) {
+    assert(!_debugDisposed, 'FragmentShader has been disposed of.');
+    ref?.dispose();
+
+    final SkShader? result = samplers.isEmpty
+        ? effect.makeShader(floats)
+        : effect.makeShaderWithChildren(floats, samplers);
+    if (result == null) {
+      throw Exception('Invalid uniform data for shader $name:'
+          '  floatUniforms: $floats \n'
+          '  samplerUniforms: $samplers \n');
+    }
+
+    ref = UniqueRef<SkShader>(this, result, 'FragmentShader');
+    return result;
   }
 
   @override
   void setFloat(int index, double value) {
+    assert(!_debugDisposed, 'FragmentShader has been disposed of.');
     floats[index] = value;
   }
 
   @override
   void setImageSampler(int index, ui.Image image) {
+    assert(!_debugDisposed, 'FragmentShader has been disposed of.');
     final ui.ImageShader sampler = ui.ImageShader(image, ui.TileMode.clamp,
         ui.TileMode.clamp, toMatrix64(Matrix4.identity().storage));
-    samplers[index] = (sampler as CkShader).skiaObject;
+    samplers[index] = (sampler as CkShader).getSkShader(ui.FilterQuality.none);
     setFloat(lastFloatIndex + 2 * index, (sampler as CkImageShader).imageWidth.toDouble());
     setFloat(lastFloatIndex + 2 * index + 1, sampler.imageHeight.toDouble());
   }
 
   @override
   void dispose() {
+    assert(!_debugDisposed, 'Cannot dispose FragmentShader more than once.');
     assert(() {
       _debugDisposed = true;
       return true;
     }());
+    ref?.dispose();
+    ref = null;
   }
 
   bool _debugDisposed = false;
@@ -499,38 +483,3 @@ class CkFragmentShader implements ui.FragmentShader {
   @override
   bool get debugDisposed => _debugDisposed;
 }
-
-class CkFragmentInstance extends CkShader {
-  CkFragmentInstance(this.name, this.effect, this.floats, this.shaders);
-
-  final String name;
-  final SkRuntimeEffect effect;
-  final List<double> floats;
-  final List<SkShader?> shaders;
-
-  @override
-  SkShader createDefault() {
-    final SkShader? result = shaders.isEmpty
-        ? effect.makeShader(floats)
-        : effect.makeShaderWithChildren(floats, shaders);
-    if (result == null) {
-      throw Exception('Invalid uniform data for shader $name:'
-          '  floatUniforms: $floats \n'
-          '  samplerUniforms: $shaders \n');
-    }
-    return result;
-  }
-
-  @override
-  SkShader resurrect() {
-    final SkShader? result = shaders.isEmpty
-        ? effect.makeShader(floats)
-        : effect.makeShaderWithChildren(floats, shaders);
-    if (result == null) {
-      throw Exception('Invalid uniform data for shader $name:'
-          '  floatUniforms: $floats \n'
-          '  samplerUniforms: $shaders \n');
-    }
-    return result;
-  }
-}
diff --git a/lib/web_ui/lib/src/engine/canvaskit/path.dart b/lib/web_ui/lib/src/engine/canvaskit/path.dart
index 3bbf4f90cb8b4ff641a6eb3d1c1c56acf7025a3a..d7bf7d088d4bf4a8bf9003b1673632376f5e88de 100644
--- a/lib/web_ui/lib/src/engine/canvaskit/path.dart
+++ b/lib/web_ui/lib/src/engine/canvaskit/path.dart
@@ -9,25 +9,38 @@ import 'package:ui/ui.dart' as ui;
 
 import '../vector_math.dart';
 import 'canvaskit_api.dart';
+import 'native_memory.dart';
 import 'path_metrics.dart';
-import 'skia_object_cache.dart';
 
 /// An implementation of [ui.Path] which is backed by an `SkPath`.
 ///
 /// The `SkPath` is required for `CkCanvas` methods which take a path.
-class CkPath extends ManagedSkiaObject<SkPath> implements ui.Path {
-  CkPath() : _fillType = ui.PathFillType.nonZero;
+class CkPath implements ui.Path {
+  factory CkPath() {
+    final SkPath skPath = SkPath();
+    skPath.setFillType(toSkFillType(ui.PathFillType.nonZero));
+    return CkPath._(skPath, ui.PathFillType.nonZero);
+  }
+
+  factory CkPath.from(CkPath other) {
+    final SkPath skPath = other.skiaObject.copy();
+    skPath.setFillType(toSkFillType(other._fillType));
+    return CkPath._(skPath, other._fillType);
+  }
 
-  CkPath.from(CkPath other)
-      : _fillType = other.fillType,
-        super(other.skiaObject.copy()) {
-    skiaObject.setFillType(toSkFillType(_fillType));
+  factory CkPath.fromSkPath(SkPath skPath, ui.PathFillType fillType) {
+    skPath.setFillType(toSkFillType(fillType));
+    return CkPath._(skPath, fillType);
   }
 
-  CkPath.fromSkPath(SkPath super.skPath, this._fillType) {
-    skiaObject.setFillType(toSkFillType(_fillType));
+  CkPath._(SkPath nativeObject, this._fillType) {
+    _ref = UniqueRef<SkPath>(this, nativeObject, 'Path');
   }
 
+  late final UniqueRef<SkPath> _ref;
+
+  SkPath get skiaObject => _ref.nativeObject;
+
   ui.PathFillType _fillType;
 
   @override
@@ -86,10 +99,9 @@ class CkPath extends ManagedSkiaObject<SkPath> implements ui.Path {
 
   @override
   void addPolygon(List<ui.Offset> points, bool close) {
-    assert(points != null);
     final SkFloat32List encodedPoints = toMallocedSkPoints(points);
     skiaObject.addPoly(encodedPoints.toTypedArray(), close);
-    freeFloat32List(encodedPoints);
+    free(encodedPoints);
   }
 
   @override
@@ -310,29 +322,4 @@ class CkPath extends ManagedSkiaObject<SkPath> implements ui.Path {
   bool get isEmpty {
     return skiaObject.isEmpty();
   }
-
-  @override
-  bool get isResurrectionExpensive => true;
-
-  @override
-  SkPath createDefault() {
-    final SkPath path = SkPath();
-    path.setFillType(toSkFillType(_fillType));
-    return path;
-  }
-
-  late List<dynamic> _cachedCommands;
-
-  @override
-  void delete() {
-    _cachedCommands = skiaObject.toCmds();
-    rawSkiaObject?.delete();
-  }
-
-  @override
-  SkPath resurrect() {
-    final SkPath path = canvasKit.Path.MakeFromCmds(_cachedCommands);
-    path.setFillType(toSkFillType(_fillType));
-    return path;
-  }
 }
diff --git a/lib/web_ui/lib/src/engine/canvaskit/path_metrics.dart b/lib/web_ui/lib/src/engine/canvaskit/path_metrics.dart
index f47d08d400c2925631845e9a7fd157f2c5954e97..344fabad329ff357911daead141a905a8c95dd19 100644
--- a/lib/web_ui/lib/src/engine/canvaskit/path_metrics.dart
+++ b/lib/web_ui/lib/src/engine/canvaskit/path_metrics.dart
@@ -8,11 +8,10 @@ import 'dart:typed_data';
 import 'package:ui/ui.dart' as ui;
 
 import 'canvaskit_api.dart';
+import 'native_memory.dart';
 import 'path.dart';
-import 'skia_object_cache.dart';
 
-class CkPathMetrics extends IterableBase<ui.PathMetric>
-    implements ui.PathMetrics {
+class CkPathMetrics extends IterableBase<ui.PathMetric> implements ui.PathMetrics {
   CkPathMetrics(this._path, this._forceClosed);
 
   final CkPath _path;
@@ -23,18 +22,21 @@ class CkPathMetrics extends IterableBase<ui.PathMetric>
   late final Iterator<ui.PathMetric> iterator = _path.isEmpty
       ? const CkPathMetricIteratorEmpty._()
       : CkContourMeasureIter(this);
-
-  /// A fresh [CkContourMeasureIter] which is only used for resurrecting a
-  /// [CkContourMeasure]. We can't use [iterator] here because [iterator] is
-  /// memoized.
-  CkContourMeasureIter _iteratorForResurrection() => CkContourMeasureIter(this);
 }
 
-class CkContourMeasureIter extends ManagedSkiaObject<SkContourMeasureIter>
-    implements Iterator<ui.PathMetric> {
-  CkContourMeasureIter(this._metrics);
+class CkContourMeasureIter implements Iterator<ui.PathMetric> {
+  CkContourMeasureIter(this._metrics) {
+    _ref = UniqueRef<SkContourMeasureIter>(this, SkContourMeasureIter(
+      _metrics._path.skiaObject,
+      _metrics._forceClosed,
+      1.0,
+    ), 'Iterator<PathMetric>');
+  }
 
   final CkPathMetrics _metrics;
+  late final UniqueRef<SkContourMeasureIter> _ref;
+
+  SkContourMeasureIter get skiaObject => _ref.nativeObject;
 
   /// A monotonically increasing counter used to generate [ui.PathMetric.contourIndex].
   ///
@@ -68,45 +70,22 @@ class CkContourMeasureIter extends ManagedSkiaObject<SkContourMeasureIter>
     _contourIndexCounter += 1;
     return true;
   }
-
-  @override
-  SkContourMeasureIter createDefault() {
-    return SkContourMeasureIter(
-      _metrics._path.skiaObject,
-      _metrics._forceClosed,
-      1.0,
-    );
-  }
-
-  @override
-  SkContourMeasureIter resurrect() {
-    final SkContourMeasureIter iterator = createDefault();
-
-    // When resurrecting we must advance the iterator to the last known
-    // position.
-    for (int i = 0; i < _contourIndexCounter; i++) {
-      iterator.next();
-    }
-
-    return iterator;
-  }
-
-  @override
-  void delete() {
-    rawSkiaObject?.delete();
-  }
 }
 
-class CkContourMeasure extends ManagedSkiaObject<SkContourMeasure>
-    implements ui.PathMetric {
-  CkContourMeasure(this._metrics, SkContourMeasure jsObject, this.contourIndex)
-      : super(jsObject);
+class CkContourMeasure implements ui.PathMetric {
+  CkContourMeasure(this._metrics, SkContourMeasure skiaObject, this.contourIndex) {
+    _ref = UniqueRef<SkContourMeasure>(this, skiaObject, 'PathMetric');
+  }
 
   /// The path metrics used to create this measure.
   ///
   /// This is used to resurrect the object if it is deleted prematurely.
   final CkPathMetrics _metrics;
 
+  late final UniqueRef<SkContourMeasure> _ref;
+
+  SkContourMeasure get skiaObject => _ref.nativeObject;
+
   @override
   final int contourIndex;
 
@@ -134,39 +113,6 @@ class CkContourMeasure extends ManagedSkiaObject<SkContourMeasure>
   double get length {
     return skiaObject.length();
   }
-
-  @override
-  SkContourMeasure createDefault() {
-    // This method must never be called. The default instance comes from the
-    // iterator's [SkContourMeasureIter.next] method initialized by the
-    // constructor.
-    throw StateError('Unreachable code');
-  }
-
-  @override
-  SkContourMeasure resurrect() {
-    final CkContourMeasureIter iterator = _metrics._iteratorForResurrection();
-    final SkContourMeasureIter skIterator = iterator.skiaObject;
-
-    // When resurrecting we must advance the iterator to the last known
-    // position.
-    for (int i = 0; i < contourIndex; i++) {
-      skIterator.next();
-    }
-
-    final SkContourMeasure? result = skIterator.next();
-
-    if (result == null) {
-      throw StateError('Failed to resurrect SkContourMeasure');
-    }
-
-    return result;
-  }
-
-  @override
-  void delete() {
-    rawSkiaObject?.delete();
-  }
 }
 
 class CkPathMetricIteratorEmpty implements Iterator<ui.PathMetric> {
diff --git a/lib/web_ui/lib/src/engine/canvaskit/picture.dart b/lib/web_ui/lib/src/engine/canvaskit/picture.dart
index 87a94db734c978c0a6aeeaba406655fa0eeb5756..242118a27b784981382873178ef7a45ade90612c 100644
--- a/lib/web_ui/lib/src/engine/canvaskit/picture.dart
+++ b/lib/web_ui/lib/src/engine/canvaskit/picture.dart
@@ -6,48 +6,51 @@ import 'dart:typed_data';
 
 import 'package:ui/ui.dart' as ui;
 
-import '../profiler.dart';
-import '../util.dart';
+import '../scene_painting.dart';
 import 'canvas.dart';
 import 'canvaskit_api.dart';
 import 'image.dart';
-import 'skia_object_cache.dart';
+import 'native_memory.dart';
+import 'renderer.dart';
 import 'surface.dart';
-import 'surface_factory.dart';
 
 /// Implements [ui.Picture] on top of [SkPicture].
-///
-/// Unlike most other [ManagedSkiaObject] implementations, instances of this
-/// class may have their Skia counterparts deleted before finalization registry
-/// or [SkiaObjectCache] decide to delete it.
-class CkPicture extends ManagedSkiaObject<SkPicture> implements ui.Picture {
-  CkPicture(SkPicture super.picture, this.cullRect, this._snapshot) :
-    assert(
-      browserSupportsFinalizationRegistry && _snapshot == null ||
-          _snapshot != null,
-      'If the browser does not support FinalizationRegistry (WeakRef), then we must have a picture snapshot to be able to resurrect it.',
-    );
+class CkPicture implements ScenePicture {
+  CkPicture(SkPicture skPicture) {
+    _ref = UniqueRef<SkPicture>(this, skPicture, 'Picture');
+  }
 
-  final ui.Rect? cullRect;
-  final CkPictureSnapshot? _snapshot;
+  late final UniqueRef<SkPicture> _ref;
+
+  SkPicture get skiaObject => _ref.nativeObject;
 
   @override
-  int get approximateBytesUsed => 0;
+  ui.Rect get cullRect => fromSkRect(skiaObject.cullRect());
+
+  @override
+  int get approximateBytesUsed => skiaObject.approximateBytesUsed();
 
   @override
   bool get debugDisposed {
-    if (assertionsEnabled) {
-      return _isDisposed;
+    bool? result;
+    assert(() {
+      result = _isDisposed;
+      return true;
+    }());
+
+    if (result != null) {
+      return result!;
     }
-    throw StateError('Picture.debugDisposed is only available when asserts are enabled.');
+
+    throw StateError(
+        'Picture.debugDisposed is only available when asserts are enabled.');
   }
 
   /// This is set to true when [dispose] is called and is never reset back to
   /// false.
   ///
   /// This extra flag is necessary on top of [rawSkiaObject] because
-  /// [rawSkiaObject] being null does not indicate permanent deletion. See
-  /// similar flag [SkiaObjectBox.isDeletedPermanently].
+  /// [rawSkiaObject] being null does not indicate permanent deletion.
   bool _isDisposed = false;
 
   /// The stack trace taken when [dispose] was called.
@@ -83,15 +86,8 @@ class CkPicture extends ManagedSkiaObject<SkPicture> implements ui.Picture {
       return true;
     }());
     ui.Picture.onDispose?.call(this);
-    if (Instrumentation.enabled) {
-      Instrumentation.instance.incrementCounter('Picture disposed');
-    }
     _isDisposed = true;
-    _snapshot?.dispose();
-
-    // Emulate what SkiaObjectCache does.
-    rawSkiaObject?.delete();
-    rawSkiaObject = null;
+    _ref.dispose();
   }
 
   @override
@@ -100,11 +96,12 @@ class CkPicture extends ManagedSkiaObject<SkPicture> implements ui.Picture {
   }
 
   @override
-  ui.Image toImageSync(int width, int height) {
+  CkImage toImageSync(int width, int height) {
     assert(debugCheckNotDisposed('Cannot convert picture to image.'));
-    final Surface surface = SurfaceFactory.instance.pictureToImageSurface;
-    final CkSurface ckSurface =
-      surface.createOrUpdateSurface(ui.Size(width.toDouble(), height.toDouble()));
+
+    final Surface surface = CanvasKitRenderer.instance.pictureToImageSurface;
+    final CkSurface ckSurface = surface
+        .createOrUpdateSurface(ui.Size(width.toDouble(), height.toDouble()));
     final CkCanvas ckCanvas = ckSurface.getCanvas();
     ckCanvas.clear(const ui.Color(0x00000000));
     ckCanvas.drawPicture(this);
@@ -113,41 +110,15 @@ class CkPicture extends ManagedSkiaObject<SkPicture> implements ui.Picture {
       alphaType: canvasKit.AlphaType.Premul,
       colorType: canvasKit.ColorType.RGBA_8888,
       colorSpace: SkColorSpaceSRGB,
-      width: width,
-      height: height,
+      width: width.toDouble(),
+      height: height.toDouble(),
     );
     final Uint8List pixels = skImage.readPixels(0, 0, imageInfo);
-    final SkImage? rasterImage = canvasKit.MakeImage(imageInfo, pixels, 4 * width);
+    final SkImage? rasterImage =
+        canvasKit.MakeImage(imageInfo, pixels, (4 * width).toDouble());
     if (rasterImage == null) {
       throw StateError('Unable to convert image pixels into SkImage.');
     }
     return CkImage(rasterImage);
   }
-
-  @override
-  bool get isResurrectionExpensive => true;
-
-  @override
-  SkPicture createDefault() {
-    // The default object is supplied in the constructor.
-    throw StateError('Unreachable code');
-  }
-
-  @override
-  SkPicture resurrect() {
-    // If a picture has been explicitly disposed of, it can no longer be
-    // resurrected. An attempt to resurrect after the framework told the
-    // engine to dispose of the picture likely indicates a bug in the engine.
-    assert(debugCheckNotDisposed('Cannot resurrect picture.'));
-    return _snapshot!.toPicture();
-  }
-
-  @override
-  void delete() {
-    // This method may be called after [dispose], in which case there's nothing
-    // left to do. The Skia object is deleted permanently.
-    if (!_isDisposed) {
-      rawSkiaObject?.delete();
-    }
-  }
 }
diff --git a/lib/web_ui/lib/src/engine/canvaskit/picture_recorder.dart b/lib/web_ui/lib/src/engine/canvaskit/picture_recorder.dart
index 7a0d11e4335487ed32df3c6fbd60c3eaccab5343..7930d067b24040ef9094b4eb77984788b4bf0fd6 100644
--- a/lib/web_ui/lib/src/engine/canvaskit/picture_recorder.dart
+++ b/lib/web_ui/lib/src/engine/canvaskit/picture_recorder.dart
@@ -11,18 +11,14 @@ import 'canvaskit_api.dart';
 import 'picture.dart';
 
 class CkPictureRecorder implements ui.PictureRecorder {
-  ui.Rect? _cullRect;
   SkPictureRecorder? _skRecorder;
   CkCanvas? _recordingCanvas;
 
   CkCanvas beginRecording(ui.Rect bounds) {
-    _cullRect = bounds;
     final SkPictureRecorder recorder = _skRecorder = SkPictureRecorder();
     final Float32List skRect = toSkRect(bounds);
     final SkCanvas skCanvas = recorder.beginRecording(skRect);
-    return _recordingCanvas = browserSupportsFinalizationRegistry
-        ? CkCanvas(skCanvas)
-        : RecordingCkCanvas(skCanvas, bounds);
+    return _recordingCanvas = CkCanvas(skCanvas);
   }
 
   CkCanvas? get recordingCanvas => _recordingCanvas;
@@ -38,8 +34,7 @@ class CkPictureRecorder implements ui.PictureRecorder {
     final SkPicture skPicture = recorder.finishRecordingAsPicture();
     recorder.delete();
     _skRecorder = null;
-    final CkPicture result =
-      CkPicture(skPicture, _cullRect, _recordingCanvas!.pictureSnapshot);
+    final CkPicture result = CkPicture(skPicture);
     // We invoke the handler here, not in the picture constructor, because we want
     // [result.approximateBytesUsed] to be available for the handler.
     ui.Picture.onCreate?.call(result);
diff --git a/lib/web_ui/lib/src/engine/canvaskit/rasterizer.dart b/lib/web_ui/lib/src/engine/canvaskit/rasterizer.dart
index b8b420bb829a66177561b2d517c495b1fd3da59a..92dd83e89e1deb6e26efcbf7c24ae2773b963937 100644
--- a/lib/web_ui/lib/src/engine/canvaskit/rasterizer.dart
+++ b/lib/web_ui/lib/src/engine/canvaskit/rasterizer.dart
@@ -1,68 +1,146 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+import 'dart:async';
 
-import 'package:meta/meta.dart';
+import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
 
-import '../frame_reference.dart';
-import 'canvas.dart';
-import 'embedded_views.dart';
-import 'layer_tree.dart';
-import 'surface.dart';
-import 'surface_factory.dart';
+abstract class Rasterizer {
+  /// Creates a [ViewRasterizer] for a given [view].
+  ViewRasterizer createViewRasterizer(EngineFlutterView view);
 
-/// A class that can rasterize [LayerTree]s into a given [Surface].
-class Rasterizer {
+  /// Sets the maximum size of the resource cache to [bytes].
+  void setResourceCacheMaxBytes(int bytes);
+
+  /// Disposes this rasterizer and all [ViewRasterizer]s that it created.
+  void dispose();
+}
+
+abstract class ViewRasterizer {
+  ViewRasterizer(this.view);
+
+  /// The view this rasterizer renders into.
+  final EngineFlutterView view;
+
+  /// The queue of render requests for this view.
+  final RenderQueue queue = RenderQueue();
+
+  /// The size of the current frame being rasterized.
+  ui.Size currentFrameSize = ui.Size.zero;
+
+  /// The context which is persisted between frames.
   final CompositorContext context = CompositorContext();
-  final List<ui.VoidCallback> _postFrameCallbacks = <ui.VoidCallback>[];
-
-  void setSkiaResourceCacheMaxBytes(int bytes) =>
-      SurfaceFactory.instance.baseSurface.setSkiaResourceCacheMaxBytes(bytes);
-
-  /// Creates a new frame from this rasterizer's surface, draws the given
-  /// [LayerTree] into it, and then submits the frame.
-  void draw(LayerTree layerTree) {
-    try {
-      if (layerTree.frameSize.isEmpty) {
-        // Available drawing area is empty. Skip drawing.
-        return;
-      }
-
-      final SurfaceFrame frame =
-          SurfaceFactory.instance.baseSurface.acquireFrame(layerTree.frameSize);
-      HtmlViewEmbedder.instance.frameSize = layerTree.frameSize;
-      final CkCanvas canvas = frame.skiaCanvas;
-      final Frame compositorFrame =
-          context.acquireFrame(canvas, HtmlViewEmbedder.instance);
-
-      compositorFrame.raster(layerTree, ignoreRasterCache: true);
-      SurfaceFactory.instance.baseSurface.addToScene();
-      frame.submit();
-      HtmlViewEmbedder.instance.submitFrame();
-    } finally {
-      _runPostFrameCallbacks();
+
+  /// The platform view embedder.
+  late final HtmlViewEmbedder viewEmbedder = HtmlViewEmbedder(sceneHost, this);
+
+  /// A factory for creating overlays.
+  DisplayCanvasFactory<DisplayCanvas> get displayFactory;
+
+  /// The scene host which this rasterizer should raster into.
+  DomElement get sceneHost => view.dom.sceneHost;
+
+  /// Draws the [layerTree] to the screen for the view associated with this
+  /// rasterizer.
+  Future<void> draw(LayerTree layerTree) async {
+    final ui.Size frameSize = view.physicalSize;
+    if (frameSize.isEmpty) {
+      // Available drawing area is empty. Skip drawing.
+      return;
     }
+
+    currentFrameSize = frameSize;
+    prepareToDraw();
+    viewEmbedder.frameSize = currentFrameSize;
+    final CkPictureRecorder pictureRecorder = CkPictureRecorder();
+    pictureRecorder.beginRecording(ui.Offset.zero & currentFrameSize);
+    final Frame compositorFrame =
+        context.acquireFrame(pictureRecorder.recordingCanvas!, viewEmbedder);
+
+    compositorFrame.raster(layerTree, ignoreRasterCache: true);
+
+    await viewEmbedder.submitFrame(pictureRecorder.endRecording());
   }
 
-  void addPostFrameCallback(ui.VoidCallback callback) {
-    _postFrameCallbacks.add(callback);
+  /// Do some initialization to prepare to draw a frame.
+  ///
+  /// For example, in the [OffscreenCanvasRasterizer], this ensures the backing
+  /// [OffscreenCanvas] is the correct size to draw the frame.
+  void prepareToDraw();
+
+  /// Rasterize the [pictures] to the given [canvas].
+  Future<void> rasterizeToCanvas(
+      DisplayCanvas canvas, List<CkPicture> pictures);
+
+  /// Get a [DisplayCanvas] to use as an overlay.
+  DisplayCanvas getOverlay() {
+    return displayFactory.getCanvas();
   }
 
-  void _runPostFrameCallbacks() {
-    for (int i = 0; i < _postFrameCallbacks.length; i++) {
-      final ui.VoidCallback callback = _postFrameCallbacks[i];
-      callback();
-    }
-    for (int i = 0; i < frameReferences.length; i++) {
-      frameReferences[i].value = null;
-    }
-    frameReferences.clear();
+  /// Release the given [overlay] so it may be reused.
+  void releaseOverlay(DisplayCanvas overlay) {
+    displayFactory.releaseCanvas(overlay);
+  }
+
+  /// Release all overlays.
+  void releaseOverlays() {
+    displayFactory.releaseCanvases();
+  }
+
+  /// Remove all overlays that have been created from the DOM.
+  void removeOverlaysFromDom() {
+    displayFactory.removeCanvasesFromDom();
+  }
+
+  /// Disposes this rasterizer.
+  void dispose() {
+    viewEmbedder.dispose();
+    displayFactory.dispose();
   }
 
-  /// Forces the post-frame callbacks to run. Useful in tests.
-  @visibleForTesting
-  void debugRunPostFrameCallbacks() {
-    _runPostFrameCallbacks();
+  /// Clears the state. Used in tests.
+  void debugClear() {
+    viewEmbedder.debugClear();
   }
 }
+
+/// A [DisplayCanvas] is an abstraction for a canvas element which displays
+/// Skia-drawn pictures to the screen. They are also sometimes called "overlays"
+/// because they can be overlaid on top of platform views, which are HTML
+/// content that isn't rendered by Skia.
+///
+/// [DisplayCanvas]es are drawn into with [ViewRasterizer.rasterizeToCanvas].
+abstract class DisplayCanvas {
+  /// The DOM element which, when appended to the scene host, will display the
+  /// Skia-rendered content to the screen.
+  DomElement get hostElement;
+
+  /// Whether or not this overlay canvas is attached to the DOM.
+  bool get isConnected;
+
+  /// Initialize the overlay.
+  void initialize();
+
+  /// Disposes this overlay.
+  void dispose();
+}
+
+/// Encapsulates a request to render a [ui.Scene]. Contains the scene to render
+/// and a [Completer] which completes when the scene has been rendered.
+typedef RenderRequest = ({
+  ui.Scene scene,
+  Completer<void> completer,
+  FrameTimingRecorder? recorder,
+});
+
+/// A per-view queue of render requests. Only contains the current render
+/// request and the next render request. If a new render request is made before
+/// the current request is complete, then the next render request is replaced
+/// with the most recently requested render and the other one is dropped.
+class RenderQueue {
+  RenderQueue();
+
+  RenderRequest? current;
+  RenderRequest? next;
+}
diff --git a/lib/web_ui/lib/src/engine/canvaskit/render_canvas.dart b/lib/web_ui/lib/src/engine/canvaskit/render_canvas.dart
new file mode 100644
index 0000000000000000000000000000000000000000..8f5f1fc40086aaec9e578491f6e99eea9a140c89
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/canvaskit/render_canvas.dart
@@ -0,0 +1,149 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:js_interop';
+
+import 'package:ui/ui.dart' as ui;
+
+import '../display.dart';
+import '../dom.dart';
+import 'rasterizer.dart';
+
+/// A visible (on-screen) canvas that can display bitmaps produced by CanvasKit
+/// in the (off-screen) SkSurface which is backed by an OffscreenCanvas.
+///
+/// In a typical frame, the content will be rendered via CanvasKit in an
+/// OffscreenCanvas, and then the contents will be transferred to the
+/// RenderCanvas via `transferFromImageBitmap()`.
+///
+/// If we need more RenderCanvases, for example in the case where there are
+/// platform views and we need overlays to render the frame correctly, then
+/// we will create multiple RenderCanvases, but crucially still only have
+/// one OffscreenCanvas which transfers bitmaps to all of the RenderCanvases.
+///
+/// To render into the OffscreenCanvas with CanvasKit we need to create a
+/// WebGL context, which is not only expensive, but the browser has a limit
+/// on the maximum amount of WebGL contexts which can be live at once. Using
+/// a single OffscreenCanvas and multiple RenderCanvases allows us to only
+/// create a single WebGL context.
+class RenderCanvas extends DisplayCanvas {
+  RenderCanvas() {
+    canvasElement.setAttribute('aria-hidden', 'true');
+    canvasElement.style.position = 'absolute';
+    _updateLogicalHtmlCanvasSize();
+    hostElement.append(canvasElement);
+  }
+
+  /// The root HTML element for this canvas.
+  ///
+  /// This element contains the canvas used to draw the UI. Unlike the canvas,
+  /// this element is permanent. It is never replaced or deleted, until this
+  /// canvas is disposed of via [dispose].
+  ///
+  /// Conversely, the canvas that lives inside this element can be swapped, for
+  /// example, when the screen size changes, or when the WebGL context is lost
+  /// due to the browser tab becoming dormant.
+  @override
+  final DomElement hostElement = createDomElement('flt-canvas-container');
+
+  /// The underlying `<canvas>` element used to display the pixels.
+  final DomCanvasElement canvasElement = createDomCanvasElement();
+  int _pixelWidth = 0;
+  int _pixelHeight = 0;
+
+  late final DomCanvasRenderingContextBitmapRenderer renderContext =
+      canvasElement.contextBitmapRenderer;
+
+  late final DomCanvasRenderingContext2D renderContext2d =
+      canvasElement.context2D;
+
+  double _currentDevicePixelRatio = -1;
+
+  /// Sets the CSS size of the canvas so that canvas pixels are 1:1 with device
+  /// pixels.
+  ///
+  /// The logical size of the canvas is not based on the size of the window
+  /// but on the size of the canvas, which, due to `ceil()` above, may not be
+  /// the same as the window. We do not round/floor/ceil the logical size as
+  /// CSS pixels can contain more than one physical pixel and therefore to
+  /// match the size of the window precisely we use the most precise floating
+  /// point value we can get.
+  void _updateLogicalHtmlCanvasSize() {
+    final double devicePixelRatio =
+        EngineFlutterDisplay.instance.devicePixelRatio;
+    final double logicalWidth = _pixelWidth / devicePixelRatio;
+    final double logicalHeight = _pixelHeight / devicePixelRatio;
+    final DomCSSStyleDeclaration style = canvasElement.style;
+    style.width = '${logicalWidth}px';
+    style.height = '${logicalHeight}px';
+    _currentDevicePixelRatio = devicePixelRatio;
+  }
+
+  /// Render the given [bitmap] with this [RenderCanvas].
+  ///
+  /// The canvas will be resized to accomodate the bitmap immediately before
+  /// rendering it.
+  void render(DomImageBitmap bitmap) {
+    _ensureSize(ui.Size(bitmap.width.toDartDouble, bitmap.height.toDartDouble));
+    renderContext.transferFromImageBitmap(bitmap);
+  }
+
+  void renderWithNoBitmapSupport(
+    DomCanvasImageSource imageSource,
+    int sourceHeight,
+    ui.Size size,
+  ) {
+    _ensureSize(size);
+    renderContext2d.drawImage(
+      imageSource,
+      0,
+      sourceHeight - size.height,
+      size.width,
+      size.height,
+      0,
+      0,
+      size.width,
+      size.height,
+    );
+  }
+
+  /// Ensures that this canvas can draw a frame of the given [size].
+  void _ensureSize(ui.Size size) {
+    // Check if the frame is the same size as before, and if so, we don't need
+    // to resize the canvas.
+    if (size.width.ceil() == _pixelWidth &&
+        size.height.ceil() == _pixelHeight) {
+      // The existing canvas doesn't need to be resized (unless the device pixel
+      // ratio changed).
+      if (EngineFlutterDisplay.instance.devicePixelRatio !=
+          _currentDevicePixelRatio) {
+        _updateLogicalHtmlCanvasSize();
+      }
+      return;
+    }
+
+    // If the canvas is too large or too small, resize it to the exact size of
+    // the frame. We cannot allow the canvas to be larger than the screen
+    // because then when we call `transferFromImageBitmap()` the bitmap will
+    // be scaled to cover the entire canvas.
+    _pixelWidth = size.width.ceil();
+    _pixelHeight = size.height.ceil();
+    canvasElement.width = _pixelWidth.toDouble();
+    canvasElement.height = _pixelHeight.toDouble();
+    _updateLogicalHtmlCanvasSize();
+  }
+
+  @override
+  bool get isConnected => canvasElement.isConnected!;
+
+  @override
+  void initialize() {
+    // No extra initialization needed.
+  }
+
+  @override
+  void dispose() {
+    hostElement.remove();
+  }
+}
diff --git a/lib/web_ui/lib/src/engine/canvaskit/renderer.dart b/lib/web_ui/lib/src/engine/canvaskit/renderer.dart
index 0dba09e70e588c3c804bd93f2ece2d21957cc8e7..ff73d6a9358fa0e17b57676ccc7813a5f6b9371e 100644
--- a/lib/web_ui/lib/src/engine/canvaskit/renderer.dart
+++ b/lib/web_ui/lib/src/engine/canvaskit/renderer.dart
@@ -6,32 +6,32 @@ import 'dart:async';
 import 'dart:math' as math;
 import 'dart:typed_data';
 
+import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
-
-import '../dom.dart';
-import '../embedder.dart';
-import '../html_image_codec.dart';
-import '../initialization.dart';
-import '../profiler.dart';
-import '../renderer.dart';
-import 'canvaskit_api.dart';
-import 'canvaskit_canvas.dart';
-import 'fonts.dart';
-import 'image.dart';
-import 'image_filter.dart';
-import 'layer_scene_builder.dart';
-import 'painting.dart';
-import 'path.dart';
-import 'picture_recorder.dart';
-import 'rasterizer.dart';
-import 'shader.dart';
-import 'text.dart';
-import 'vertices.dart';
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
+
+enum CanvasKitVariant {
+  /// The appropriate variant is chosen based on the browser.
+  ///
+  /// This is the default variant.
+  auto,
+
+  /// The full variant that can be used in any browser.
+  full,
+
+  /// The variant that is optimized for Chromium browsers.
+  ///
+  /// WARNING: In most cases, you should use [auto] instead of this variant. Using
+  /// this variant in a non-Chromium browser will result in a broken app.
+  chromium,
+}
 
 class CanvasKitRenderer implements Renderer {
   static CanvasKitRenderer get instance => _instance;
   static late CanvasKitRenderer _instance;
 
+  Future<void>? _initialized;
+
   @override
   String get rendererTag => 'canvaskit';
 
@@ -44,29 +44,62 @@ class CanvasKitRenderer implements Renderer {
   DomElement? _sceneHost;
   DomElement? get sceneHost => _sceneHost;
 
-  late Rasterizer rasterizer = Rasterizer();
-
-  set resourceCacheMaxBytes(int bytes) => rasterizer.setSkiaResourceCacheMaxBytes(bytes);
+  Rasterizer _rasterizer = _createRasterizer();
 
-  @override
-  Future<void> initialize() async {
-    if (windowFlutterCanvasKit != null) {
-      canvasKit = windowFlutterCanvasKit!;
-    } else {
-      canvasKit = await downloadCanvasKit();
-      windowFlutterCanvasKit = canvasKit;
+  static Rasterizer _createRasterizer() {
+    if (isSafari || isFirefox) {
+      return MultiSurfaceRasterizer();
     }
+    return OffscreenCanvasRasterizer();
+  }
 
-    _instance = this;
+  /// Override the rasterizer with the given [_rasterizer]. Used in tests.
+  void debugOverrideRasterizer(Rasterizer testRasterizer) {
+    _rasterizer = testRasterizer;
   }
 
+  set resourceCacheMaxBytes(int bytes) =>
+      _rasterizer.setResourceCacheMaxBytes(bytes);
+
+  /// A surface used specifically for `Picture.toImage` when software rendering
+  /// is supported.
+  final Surface pictureToImageSurface = Surface();
+
+  // Listens for view creation events from the view manager.
+  StreamSubscription<int>? _onViewCreatedListener;
+  // Listens for view disposal events from the view manager.
+  StreamSubscription<int>? _onViewDisposedListener;
+
   @override
-  void reset(FlutterViewEmbedder embedder) {
-    // CanvasKit uses a static scene element that never gets replaced, so it's
-    // added eagerly during initialization here and never touched, unless the
-    // system is reset due to hot restart or in a test.
-    _sceneHost = createDomElement('flt-scene');
-    embedder.addSceneToSceneHost(_sceneHost);
+  Future<void> initialize() async {
+    _initialized ??= () async {
+      if (windowFlutterCanvasKit != null) {
+        canvasKit = windowFlutterCanvasKit!;
+      } else if (windowFlutterCanvasKitLoaded != null) {
+        // CanvasKit is being preloaded by flutter.js. Wait for it to complete.
+        canvasKit =
+            await promiseToFuture<CanvasKit>(windowFlutterCanvasKitLoaded!);
+      } else {
+        canvasKit = await downloadCanvasKit();
+        windowFlutterCanvasKit = canvasKit;
+      }
+      // Views may have been registered before this renderer was initialized.
+      // Create rasterizers for them and then start listening for new view
+      // creation/disposal events.
+      final FlutterViewManager viewManager =
+          EnginePlatformDispatcher.instance.viewManager;
+      if (_onViewCreatedListener == null) {
+        for (final EngineFlutterView view in viewManager.views) {
+          _onViewCreated(view.viewId);
+        }
+      }
+      _onViewCreatedListener ??=
+          viewManager.onViewCreated.listen(_onViewCreated);
+      _onViewDisposedListener ??=
+          viewManager.onViewDisposed.listen(_onViewDisposed);
+      _instance = this;
+    }();
+    return _initialized;
   }
 
   @override
@@ -79,12 +112,11 @@ class CanvasKitRenderer implements Renderer {
     List<ui.Offset>? textureCoordinates,
     List<ui.Color>? colors,
     List<int>? indices,
-  }) => CkVertices(
-    mode,
-    positions,
-    textureCoordinates: textureCoordinates,
-    colors: colors,
-    indices: indices);
+  }) =>
+      CkVertices(mode, positions,
+          textureCoordinates: textureCoordinates,
+          colors: colors,
+          indices: indices);
 
   @override
   ui.Vertices createVerticesRaw(
@@ -93,26 +125,23 @@ class CanvasKitRenderer implements Renderer {
     Float32List? textureCoordinates,
     Int32List? colors,
     Uint16List? indices,
-  }) => CkVertices.raw(
-    mode,
-    positions,
-    textureCoordinates: textureCoordinates,
-    colors: colors,
-    indices: indices);
+  }) =>
+      CkVertices.raw(mode, positions,
+          textureCoordinates: textureCoordinates,
+          colors: colors,
+          indices: indices);
 
   @override
   ui.Canvas createCanvas(ui.PictureRecorder recorder, [ui.Rect? cullRect]) =>
-    CanvasKitCanvas(recorder, cullRect);
+      CanvasKitCanvas(recorder, cullRect);
 
   @override
   ui.Gradient createLinearGradient(
-    ui.Offset from,
-    ui.Offset to,
-    List<ui.Color> colors, [
-    List<double>? colorStops,
-    ui.TileMode tileMode = ui.TileMode.clamp,
-    Float32List? matrix4
-  ]) => CkGradientLinear(from, to, colors, colorStops, tileMode, matrix4);
+          ui.Offset from, ui.Offset to, List<ui.Color> colors,
+          [List<double>? colorStops,
+          ui.TileMode tileMode = ui.TileMode.clamp,
+          Float32List? matrix4]) =>
+      CkGradientLinear(from, to, colors, colorStops, tileMode, matrix4);
 
   @override
   ui.Gradient createRadialGradient(
@@ -122,40 +151,27 @@ class CanvasKitRenderer implements Renderer {
     List<double>? colorStops,
     ui.TileMode tileMode = ui.TileMode.clamp,
     Float32List? matrix4,
-    ui.Offset? focal,
-    double focalRadius = 0.0,
-  ]) => CkGradientRadial(center, radius, colors, colorStops, tileMode, matrix4);
+  ]) =>
+      CkGradientRadial(center, radius, colors, colorStops, tileMode, matrix4);
 
   @override
-  ui.Gradient createConicalGradient(
-    ui.Offset focal,
-    double focalRadius,
-    ui.Offset center,
-    double radius,
-    List<ui.Color> colors,
-    [List<double>? colorStops,
-    ui.TileMode tileMode = ui.TileMode.clamp,
-    Float32List? matrix]
-  ) => CkGradientConical(
-    focal,
-    focalRadius,
-    center,
-    radius,
-    colors,
-    colorStops,
-    tileMode,
-    matrix);
-
-  @override
-  ui.Gradient createSweepGradient(
-    ui.Offset center,
-    List<ui.Color> colors, [
-    List<double>? colorStops,
-    ui.TileMode tileMode = ui.TileMode.clamp,
-    double startAngle = 0.0,
-    double endAngle = math.pi * 2,
-    Float32List? matrix4
-  ]) => CkGradientSweep(center, colors, colorStops, tileMode, startAngle, endAngle, matrix4);
+  ui.Gradient createConicalGradient(ui.Offset focal, double focalRadius,
+          ui.Offset center, double radius, List<ui.Color> colors,
+          [List<double>? colorStops,
+          ui.TileMode tileMode = ui.TileMode.clamp,
+          Float32List? matrix]) =>
+      CkGradientConical(focal, focalRadius, center, radius, colors, colorStops,
+          tileMode, matrix);
+
+  @override
+  ui.Gradient createSweepGradient(ui.Offset center, List<ui.Color> colors,
+          [List<double>? colorStops,
+          ui.TileMode tileMode = ui.TileMode.clamp,
+          double startAngle = 0.0,
+          double endAngle = math.pi * 2,
+          Float32List? matrix4]) =>
+      CkGradientSweep(
+          center, colors, colorStops, tileMode, startAngle, endAngle, matrix4);
 
   @override
   ui.PictureRecorder createPictureRecorder() => CkPictureRecorder();
@@ -164,84 +180,91 @@ class CanvasKitRenderer implements Renderer {
   ui.SceneBuilder createSceneBuilder() => LayerSceneBuilder();
 
   @override
-  ui.ImageFilter createBlurImageFilter({
-    double sigmaX = 0.0,
-    double sigmaY = 0.0,
-    ui.TileMode tileMode = ui.TileMode.clamp
-  }) => CkImageFilter.blur(sigmaX: sigmaX, sigmaY: sigmaY, tileMode: tileMode);
+  ui.ImageFilter createBlurImageFilter(
+          {double sigmaX = 0.0,
+          double sigmaY = 0.0,
+          ui.TileMode tileMode = ui.TileMode.clamp}) =>
+      CkImageFilter.blur(sigmaX: sigmaX, sigmaY: sigmaY, tileMode: tileMode);
 
   @override
-  ui.ImageFilter createDilateImageFilter({double radiusX = 0.0, double radiusY = 0.0}) {
+  ui.ImageFilter createDilateImageFilter(
+      {double radiusX = 0.0, double radiusY = 0.0}) {
     // TODO(fzyzcjy): implement dilate. https://github.com/flutter/flutter/issues/101085
-    throw UnimplementedError('ImageFilter.dilate not implemented for CanvasKit.');
+    throw UnimplementedError(
+        'ImageFilter.dilate not implemented for CanvasKit.');
   }
 
   @override
-  ui.ImageFilter createErodeImageFilter({double radiusX = 0.0, double radiusY = 0.0}) {
+  ui.ImageFilter createErodeImageFilter(
+      {double radiusX = 0.0, double radiusY = 0.0}) {
     // TODO(fzyzcjy): implement erode. https://github.com/flutter/flutter/issues/101085
-    throw UnimplementedError('ImageFilter.erode not implemented for CanvasKit.');
+    throw UnimplementedError(
+        'ImageFilter.erode not implemented for CanvasKit.');
   }
 
   @override
-  ui.ImageFilter createMatrixImageFilter(
-    Float64List matrix4, {
-    ui.FilterQuality filterQuality = ui.FilterQuality.low
-  }) => CkImageFilter.matrix(matrix: matrix4, filterQuality: filterQuality);
+  ui.ImageFilter createMatrixImageFilter(Float64List matrix4,
+          {ui.FilterQuality filterQuality = ui.FilterQuality.low}) =>
+      CkImageFilter.matrix(matrix: matrix4, filterQuality: filterQuality);
 
   @override
-  ui.ImageFilter composeImageFilters({required ui.ImageFilter outer, required ui.ImageFilter inner}) {
-  // TODO(ferhat): add implementation
-    throw UnimplementedError('ImageFilter.compose not implemented for CanvasKit.');
+  ui.ImageFilter composeImageFilters(
+      {required ui.ImageFilter outer, required ui.ImageFilter inner}) {
+    if (outer is EngineColorFilter) {
+      final CkColorFilter colorFilter = createCkColorFilter(outer)!;
+      outer = CkColorFilterImageFilter(colorFilter: colorFilter);
+    }
+    if (inner is EngineColorFilter) {
+      final CkColorFilter colorFilter = createCkColorFilter(inner)!;
+      inner = CkColorFilterImageFilter(colorFilter: colorFilter);
+    }
+    return CkImageFilter.compose(
+        outer: outer as CkImageFilter, inner: inner as CkImageFilter);
   }
 
   @override
-  Future<ui.Codec> instantiateImageCodec(
-    Uint8List list, {
-    int? targetWidth,
-    int? targetHeight,
-    bool allowUpscaling = true
-  }) async => skiaInstantiateImageCodec(
-    list,
-    targetWidth,
-    targetHeight);
-
-  @override
-  Future<ui.Codec> instantiateImageCodecFromUrl(
-    Uri uri, {
-    WebOnlyImageCodecChunkCallback? chunkCallback
-  }) => skiaInstantiateWebImageCodec(uri.toString(), chunkCallback);
-
-  @override
-  void decodeImageFromPixels(
-    Uint8List pixels,
-    int width,
-    int height,
-    ui.PixelFormat format,
-    ui.ImageDecoderCallback callback, {
-    int? rowBytes,
-    int? targetWidth,
-    int? targetHeight,
-    bool allowUpscaling = true
-  }) => skiaDecodeImageFromPixels(
-    pixels,
-    width,
-    height,
-    format,
-    callback,
-    rowBytes: rowBytes,
-    targetWidth: targetWidth,
-    targetHeight: targetHeight,
-    allowUpscaling: allowUpscaling
-  );
+  Future<ui.Codec> instantiateImageCodec(Uint8List list,
+          {int? targetWidth,
+          int? targetHeight,
+          bool allowUpscaling = true}) async =>
+      skiaInstantiateImageCodec(list, targetWidth, targetHeight);
+
+  @override
+  Future<ui.Codec> instantiateImageCodecFromUrl(Uri uri,
+          {ui_web.ImageCodecChunkCallback? chunkCallback}) =>
+      skiaInstantiateWebImageCodec(uri.toString(), chunkCallback);
+
+  @override
+  ui.Image createImageFromImageBitmap(DomImageBitmap imageBitmap) {
+    final SkImage? skImage =
+        canvasKit.MakeLazyImageFromImageBitmap(imageBitmap, true);
+    if (skImage == null) {
+      throw Exception('Failed to convert image bitmap to an SkImage.');
+    }
+    return CkImage(skImage);
+  }
+
+  @override
+  void decodeImageFromPixels(Uint8List pixels, int width, int height,
+          ui.PixelFormat format, ui.ImageDecoderCallback callback,
+          {int? rowBytes,
+          int? targetWidth,
+          int? targetHeight,
+          bool allowUpscaling = true}) =>
+      skiaDecodeImageFromPixels(pixels, width, height, format, callback,
+          rowBytes: rowBytes,
+          targetWidth: targetWidth,
+          targetHeight: targetHeight,
+          allowUpscaling: allowUpscaling);
 
   @override
   ui.ImageShader createImageShader(
-    ui.Image image,
-    ui.TileMode tmx,
-    ui.TileMode tmy,
-    Float64List matrix4,
-    ui.FilterQuality? filterQuality
-  ) => CkImageShader(image, tmx, tmy, matrix4, filterQuality);
+          ui.Image image,
+          ui.TileMode tmx,
+          ui.TileMode tmy,
+          Float64List matrix4,
+          ui.FilterQuality? filterQuality) =>
+      CkImageShader(image, tmx, tmy, matrix4, filterQuality);
 
   @override
   ui.Path createPath() => CkPath();
@@ -251,113 +274,157 @@ class CanvasKitRenderer implements Renderer {
 
   @override
   ui.Path combinePaths(ui.PathOperation op, ui.Path path1, ui.Path path2) =>
-    CkPath.combine(op, path1, path2);
-
-  @override
-  ui.TextStyle createTextStyle({
-    ui.Color? color,
-    ui.TextDecoration? decoration,
-    ui.Color? decorationColor,
-    ui.TextDecorationStyle? decorationStyle,
-    double? decorationThickness,
-    ui.FontWeight? fontWeight,
-    ui.FontStyle? fontStyle,
-    ui.TextBaseline? textBaseline,
-    String? fontFamily,
-    List<String>? fontFamilyFallback,
-    double? fontSize,
-    double? letterSpacing,
-    double? wordSpacing,
-    double? height,
-    ui.TextLeadingDistribution? leadingDistribution,
-    ui.Locale? locale,
-    ui.Paint? background,
-    ui.Paint? foreground,
-    List<ui.Shadow>? shadows,
-    List<ui.FontFeature>? fontFeatures,
-    List<ui.FontVariation>? fontVariations
-  }) => CkTextStyle(
-    color: color,
-    decoration: decoration,
-    decorationColor: decorationColor,
-    decorationStyle: decorationStyle,
-    decorationThickness: decorationThickness,
-    fontWeight: fontWeight,
-    fontStyle: fontStyle,
-    textBaseline: textBaseline,
-    fontFamily: fontFamily,
-    fontFamilyFallback: fontFamilyFallback,
-    fontSize: fontSize,
-    letterSpacing: letterSpacing,
-    wordSpacing: wordSpacing,
-    height: height,
-    leadingDistribution: leadingDistribution,
-    locale: locale,
-    background: background as CkPaint?,
-    foreground: foreground as CkPaint?,
-    shadows: shadows,
-    fontFeatures: fontFeatures,
-    fontVariations: fontVariations,
-  );
-
-  @override
-  ui.ParagraphStyle createParagraphStyle({
-    ui.TextAlign? textAlign,
-    ui.TextDirection? textDirection,
-    int? maxLines,
-    String? fontFamily,
-    double? fontSize,
-    double? height,
-    ui.TextHeightBehavior? textHeightBehavior,
-    ui.FontWeight? fontWeight,
-    ui.FontStyle? fontStyle,
-    ui.StrutStyle? strutStyle,
-    String? ellipsis,
-    ui.Locale? locale
-  }) => CkParagraphStyle(
-    textAlign: textAlign,
-    textDirection: textDirection,
-    maxLines: maxLines,
-    fontFamily: fontFamily,
-    fontSize: fontSize,
-    height: height,
-    textHeightBehavior: textHeightBehavior,
-    fontWeight: fontWeight,
-    fontStyle: fontStyle,
-    strutStyle: strutStyle,
-    ellipsis: ellipsis,
-    locale: locale,
-  );
-
-  @override
-  ui.StrutStyle createStrutStyle({
-    String? fontFamily,
-    List<String>? fontFamilyFallback,
-    double? fontSize,
-    double? height,
-    ui.TextLeadingDistribution? leadingDistribution,
-    double? leading,
-    ui.FontWeight? fontWeight,
-    ui.FontStyle? fontStyle,
-    bool? forceStrutHeight
-  }) => CkStrutStyle(
-    fontFamily: fontFamily,
-    fontFamilyFallback: fontFamilyFallback,
-    fontSize: fontSize,
-    height: height,
-    leadingDistribution: leadingDistribution,
-    leading: leading,
-    fontWeight: fontWeight,
-    fontStyle: fontStyle,
-    forceStrutHeight: forceStrutHeight,
-  );
+      CkPath.combine(op, path1, path2);
+
+  @override
+  ui.TextStyle createTextStyle(
+          {ui.Color? color,
+          ui.TextDecoration? decoration,
+          ui.Color? decorationColor,
+          ui.TextDecorationStyle? decorationStyle,
+          double? decorationThickness,
+          ui.FontWeight? fontWeight,
+          ui.FontStyle? fontStyle,
+          ui.TextBaseline? textBaseline,
+          String? fontFamily,
+          List<String>? fontFamilyFallback,
+          double? fontSize,
+          double? letterSpacing,
+          double? wordSpacing,
+          double? height,
+          ui.TextLeadingDistribution? leadingDistribution,
+          ui.Locale? locale,
+          ui.Paint? background,
+          ui.Paint? foreground,
+          List<ui.Shadow>? shadows,
+          List<ui.FontFeature>? fontFeatures,
+          List<ui.FontVariation>? fontVariations}) =>
+      CkTextStyle(
+        color: color,
+        decoration: decoration,
+        decorationColor: decorationColor,
+        decorationStyle: decorationStyle,
+        decorationThickness: decorationThickness,
+        fontWeight: fontWeight,
+        fontStyle: fontStyle,
+        textBaseline: textBaseline,
+        fontFamily: fontFamily,
+        fontFamilyFallback: fontFamilyFallback,
+        fontSize: fontSize,
+        letterSpacing: letterSpacing,
+        wordSpacing: wordSpacing,
+        height: height,
+        leadingDistribution: leadingDistribution,
+        locale: locale,
+        background: background as CkPaint?,
+        foreground: foreground as CkPaint?,
+        shadows: shadows,
+        fontFeatures: fontFeatures,
+        fontVariations: fontVariations,
+      );
+
+  @override
+  ui.ParagraphStyle createParagraphStyle(
+          {ui.TextAlign? textAlign,
+          ui.TextDirection? textDirection,
+          int? maxLines,
+          String? fontFamily,
+          double? fontSize,
+          double? height,
+          ui.TextHeightBehavior? textHeightBehavior,
+          ui.FontWeight? fontWeight,
+          ui.FontStyle? fontStyle,
+          ui.StrutStyle? strutStyle,
+          String? ellipsis,
+          ui.Locale? locale}) =>
+      CkParagraphStyle(
+        textAlign: textAlign,
+        textDirection: textDirection,
+        maxLines: maxLines,
+        fontFamily: fontFamily,
+        fontSize: fontSize,
+        height: height,
+        textHeightBehavior: textHeightBehavior,
+        fontWeight: fontWeight,
+        fontStyle: fontStyle,
+        strutStyle: strutStyle,
+        ellipsis: ellipsis,
+        locale: locale,
+      );
+
+  @override
+  ui.StrutStyle createStrutStyle(
+          {String? fontFamily,
+          List<String>? fontFamilyFallback,
+          double? fontSize,
+          double? height,
+          ui.TextLeadingDistribution? leadingDistribution,
+          double? leading,
+          ui.FontWeight? fontWeight,
+          ui.FontStyle? fontStyle,
+          bool? forceStrutHeight}) =>
+      CkStrutStyle(
+        fontFamily: fontFamily,
+        fontFamilyFallback: fontFamilyFallback,
+        fontSize: fontSize,
+        height: height,
+        leadingDistribution: leadingDistribution,
+        leading: leading,
+        fontWeight: fontWeight,
+        fontStyle: fontStyle,
+        forceStrutHeight: forceStrutHeight,
+      );
 
   @override
   ui.ParagraphBuilder createParagraphBuilder(ui.ParagraphStyle style) =>
-    CkParagraphBuilder(style);
+      CkParagraphBuilder(style);
+
+  // TODO(harryterkelsen): Merge this logic with the async logic in
+  // [EngineScene], https://github.com/flutter/flutter/issues/142072.
+  @override
+  Future<void> renderScene(ui.Scene scene, ui.FlutterView view) async {
+    assert(_rasterizers.containsKey(view.viewId),
+        "Unable to render to a view which hasn't been registered");
+    final ViewRasterizer rasterizer = _rasterizers[view.viewId]!;
+    final RenderQueue renderQueue = rasterizer.queue;
+    final FrameTimingRecorder? recorder =
+        FrameTimingRecorder.frameTimingsEnabled ? FrameTimingRecorder() : null;
+    if (renderQueue.current != null) {
+      // If a scene is already queued up, drop it and queue this one up instead
+      // so that the scene view always displays the most recently requested scene.
+      renderQueue.next?.completer.complete();
+      final Completer<void> completer = Completer<void>();
+      renderQueue.next =
+          (scene: scene, completer: completer, recorder: recorder);
+      return completer.future;
+    }
+    final Completer<void> completer = Completer<void>();
+    renderQueue.current =
+        (scene: scene, completer: completer, recorder: recorder);
+    unawaited(_kickRenderLoop(rasterizer));
+    return completer.future;
+  }
 
-  @override
-  void renderScene(ui.Scene scene) {
+  Future<void> _kickRenderLoop(ViewRasterizer rasterizer) async {
+    final RenderQueue renderQueue = rasterizer.queue;
+    final RenderRequest current = renderQueue.current!;
+    try {
+      await _renderScene(current.scene, rasterizer, current.recorder);
+      current.completer.complete();
+    } catch (error, stackTrace) {
+      current.completer.completeError(error, stackTrace);
+    }
+    renderQueue.current = renderQueue.next;
+    renderQueue.next = null;
+    if (renderQueue.current == null) {
+      return;
+    } else {
+      return _kickRenderLoop(rasterizer);
+    }
+  }
+
+  Future<void> _renderScene(ui.Scene scene, ViewRasterizer rasterizer,
+      FrameTimingRecorder? recorder) async {
     // "Build finish" and "raster start" happen back-to-back because we
     // render on the same thread, so there's no overhead from hopping to
     // another thread.
@@ -365,11 +432,51 @@ class CanvasKitRenderer implements Renderer {
     // CanvasKit works differently from the HTML renderer in that in HTML
     // we update the DOM in SceneBuilder.build, which is these function calls
     // here are CanvasKit-only.
-    frameTimingsOnBuildFinish();
-    frameTimingsOnRasterStart();
+    recorder?.recordBuildFinish();
+    recorder?.recordRasterStart();
+
+    await rasterizer.draw((scene as LayerScene).layerTree);
+    recorder?.recordRasterFinish();
+    recorder?.submitTimings();
+  }
+
+  // Map from view id to the associated Rasterizer for that view.
+  final Map<int, ViewRasterizer> _rasterizers = <int, ViewRasterizer>{};
 
-    rasterizer.draw((scene as LayerScene).layerTree);
-    frameTimingsOnRasterFinish();
+  void _onViewCreated(int viewId) {
+    final EngineFlutterView view =
+        EnginePlatformDispatcher.instance.viewManager[viewId]!;
+    _rasterizers[view.viewId] = _rasterizer.createViewRasterizer(view);
+  }
+
+  void _onViewDisposed(int viewId) {
+    // The view has already been disposed.
+    if (!_rasterizers.containsKey(viewId)) {
+      return;
+    }
+    final ViewRasterizer rasterizer = _rasterizers.remove(viewId)!;
+    rasterizer.dispose();
+  }
+
+  ViewRasterizer? debugGetRasterizerForView(EngineFlutterView view) {
+    return _rasterizers[view.viewId];
+  }
+
+  /// Disposes this renderer.
+  void dispose() {
+    _onViewCreatedListener?.cancel();
+    _onViewDisposedListener?.cancel();
+    for (final ViewRasterizer rasterizer in _rasterizers.values) {
+      rasterizer.dispose();
+    }
+    _rasterizers.clear();
+  }
+
+  /// Clears the state of this renderer. Used in tests.
+  void debugClear() {
+    for (final ViewRasterizer rasterizer in _rasterizers.values) {
+      rasterizer.debugClear();
+    }
   }
 
   @override
@@ -377,18 +484,39 @@ class CanvasKitRenderer implements Renderer {
     _programs.clear();
   }
 
-  static final Map<String, Future<ui.FragmentProgram>> _programs = <String, Future<ui.FragmentProgram>>{};
+  static final Map<String, Future<ui.FragmentProgram>> _programs =
+      <String, Future<ui.FragmentProgram>>{};
 
   @override
   Future<ui.FragmentProgram> createFragmentProgram(String assetKey) {
     if (_programs.containsKey(assetKey)) {
       return _programs[assetKey]!;
     }
-    if (!isRuntimeEffectAvailable) {
-      throw Exception('FragmentProgram is not supported.');
-    }
-    return _programs[assetKey] = assetManager.load(assetKey).then((ByteData data) {
+    return _programs[assetKey] =
+        ui_web.assetManager.load(assetKey).then((ByteData data) {
       return CkFragmentProgram.fromBytes(assetKey, data.buffer.asUint8List());
     });
   }
+
+  @override
+  ui.LineMetrics createLineMetrics(
+          {required bool hardBreak,
+          required double ascent,
+          required double descent,
+          required double unscaledAscent,
+          required double height,
+          required double width,
+          required double left,
+          required double baseline,
+          required int lineNumber}) =>
+      EngineLineMetrics(
+          hardBreak: hardBreak,
+          ascent: ascent,
+          descent: descent,
+          unscaledAscent: unscaledAscent,
+          height: height,
+          width: width,
+          left: left,
+          baseline: baseline,
+          lineNumber: lineNumber);
 }
diff --git a/lib/web_ui/lib/src/engine/canvaskit/shader.dart b/lib/web_ui/lib/src/engine/canvaskit/shader.dart
index 86888480aa3db450c4b41861946797a009309fba..5c83adc4e32b7fd37b005986d52cf78e08a335ae 100644
--- a/lib/web_ui/lib/src/engine/canvaskit/shader.dart
+++ b/lib/web_ui/lib/src/engine/canvaskit/shader.dart
@@ -5,57 +5,72 @@
 import 'dart:math' as math;
 import 'dart:typed_data';
 
+import 'package:meta/meta.dart';
 import 'package:ui/ui.dart' as ui;
 
-import '../util.dart';
 import '../validators.dart';
 import 'canvaskit_api.dart';
 import 'image.dart';
-import 'skia_object_cache.dart';
+import 'native_memory.dart';
+
+/// Refines the generic [ui.Shader] interface with CanvasKit-specific features.
+abstract class CkShader implements ui.Shader {
+  /// Returns a Skia shader at requested filter quality, if that shader supports
+  /// altering its filter quality.
+  ///
+  /// If the implementation supports changing filter quality, and the value of
+  /// [contextualQuality] is the same as a previously passed value, the
+  /// implementation may return the same object as before. If a new Skia object
+  /// is created, the previous object is released and cannot be used again. For
+  /// this reason, do not store the returned value long-term to prevent dangling
+  /// pointer errors.
+  SkShader getSkShader(ui.FilterQuality contextualQuality);
+}
+
+/// Base class for shader implementations with a simple memory model that do not
+/// support contextual filter quality.
+///
+/// Provides common memory mangement logic for shaders that map one-to-one to a
+/// [SkShader] object. The lifetime of this shader is hard-linked to the
+/// lifetime of the [SkShader]. [getSkShader] always returns the one and only
+/// [SkShader] object, ignoring contextual filter quality.
+abstract class SimpleCkShader implements CkShader {
+  SimpleCkShader() {
+    _ref = UniqueRef<SkShader>(this, createSkiaObject(), debugOwnerLabel);
+  }
 
-abstract class CkShader extends ManagedSkiaObject<SkShader>
-    implements ui.Shader {
-  SkShader withQuality(ui.FilterQuality contextualQuality) => skiaObject;
+  late final UniqueRef<SkShader> _ref;
 
   @override
-  void delete() {
-    rawSkiaObject?.delete();
-  }
+  SkShader getSkShader(ui.FilterQuality contextualQuality) => _ref.nativeObject;
 
-  bool _disposed = false;
+  String get debugOwnerLabel;
+  SkShader createSkiaObject();
 
   @override
-  bool get debugDisposed {
-    late bool disposed;
-    assert(() {
-      disposed = _disposed;
-      return true;
-    }());
-    return disposed;
-  }
+  bool get debugDisposed => _ref.isDisposed;
 
   @override
   void dispose() {
-    assert(() {
-      _disposed = true;
-      return true;
-    }());
+    _ref.dispose();
   }
+
+  @override
+  String toString() => 'Gradient()';
 }
 
-class CkGradientSweep extends CkShader implements ui.Gradient {
+class CkGradientSweep extends SimpleCkShader implements ui.Gradient {
   CkGradientSweep(this.center, this.colors, this.colorStops, this.tileMode,
       this.startAngle, this.endAngle, this.matrix4)
       : assert(offsetIsValid(center)),
-        assert(colors != null),
-        assert(tileMode != null),
-        assert(startAngle != null),
-        assert(endAngle != null),
         assert(startAngle < endAngle),
         assert(matrix4 == null || matrix4IsValid(matrix4)) {
     validateColorStops(colors, colorStops);
   }
 
+  @override
+  String get debugOwnerLabel => 'Gradient.sweep';
+
   final ui.Offset center;
   final List<ui.Color> colors;
   final List<double>? colorStops;
@@ -65,7 +80,7 @@ class CkGradientSweep extends CkShader implements ui.Gradient {
   final Float32List? matrix4;
 
   @override
-  SkShader createDefault() {
+  SkShader createSkiaObject() {
     const double toDegrees = 180.0 / math.pi;
     return canvasKit.Shader.MakeSweepGradient(
       center.dx,
@@ -79,14 +94,9 @@ class CkGradientSweep extends CkShader implements ui.Gradient {
       toDegrees * endAngle,
     );
   }
-
-  @override
-  SkShader resurrect() {
-    return createDefault();
-  }
 }
 
-class CkGradientLinear extends CkShader implements ui.Gradient {
+class CkGradientLinear extends SimpleCkShader implements ui.Gradient {
   CkGradientLinear(
     this.from,
     this.to,
@@ -96,13 +106,13 @@ class CkGradientLinear extends CkShader implements ui.Gradient {
     Float32List? matrix,
   )   : assert(offsetIsValid(from)),
         assert(offsetIsValid(to)),
-        assert(colors != null),
-        assert(tileMode != null),
         matrix4 = matrix {
-    if (assertionsEnabled) {
-      assert(matrix4 == null || matrix4IsValid(matrix4!));
+    assert(matrix4 == null || matrix4IsValid(matrix4!));
+    // ignore: prefer_asserts_in_initializer_lists
+    assert(() {
       validateColorStops(colors, colorStops);
-    }
+      return true;
+    }());
   }
 
   final ui.Offset from;
@@ -113,7 +123,10 @@ class CkGradientLinear extends CkShader implements ui.Gradient {
   final Float32List? matrix4;
 
   @override
-  SkShader createDefault() {
+  String get debugOwnerLabel => 'Gradient.linear';
+
+  @override
+  SkShader createSkiaObject() {
     return canvasKit.Shader.MakeLinearGradient(
       toSkPoint(from),
       toSkPoint(to),
@@ -125,10 +138,10 @@ class CkGradientLinear extends CkShader implements ui.Gradient {
   }
 
   @override
-  SkShader resurrect() => createDefault();
+  String toString() => 'Gradient()';
 }
 
-class CkGradientRadial extends CkShader implements ui.Gradient {
+class CkGradientRadial extends SimpleCkShader implements ui.Gradient {
   CkGradientRadial(this.center, this.radius, this.colors, this.colorStops,
       this.tileMode, this.matrix4);
 
@@ -140,7 +153,10 @@ class CkGradientRadial extends CkShader implements ui.Gradient {
   final Float32List? matrix4;
 
   @override
-  SkShader createDefault() {
+  String get debugOwnerLabel => 'Gradient.radial';
+
+  @override
+  SkShader createSkiaObject() {
     return canvasKit.Shader.MakeRadialGradient(
       toSkPoint(center),
       radius,
@@ -153,10 +169,10 @@ class CkGradientRadial extends CkShader implements ui.Gradient {
   }
 
   @override
-  SkShader resurrect() => createDefault();
+  String toString() => 'Gradient()';
 }
 
-class CkGradientConical extends CkShader implements ui.Gradient {
+class CkGradientConical extends SimpleCkShader implements ui.Gradient {
   CkGradientConical(this.focal, this.focalRadius, this.center, this.radius,
       this.colors, this.colorStops, this.tileMode, this.matrix4);
 
@@ -170,7 +186,10 @@ class CkGradientConical extends CkShader implements ui.Gradient {
   final Float32List? matrix4;
 
   @override
-  SkShader createDefault() {
+  String get debugOwnerLabel => 'Gradient.radial(conical)';
+
+  @override
+  SkShader createSkiaObject() {
     return canvasKit.Shader.MakeTwoPointConicalGradient(
       toSkPoint(focal),
       focalRadius,
@@ -183,15 +202,25 @@ class CkGradientConical extends CkShader implements ui.Gradient {
       0,
     );
   }
-
-  @override
-  SkShader resurrect() => createDefault();
 }
 
-class CkImageShader extends CkShader implements ui.ImageShader {
+/// Implements [ui.ImageShader] for CanvasKit.
+///
+/// The memory management model is different from other shaders (backed by
+/// [SimpleCkShader]) in that this object is not one-to-one to its Skia
+/// counterpart [SkShader]. During initialization a default [SkShader] is
+/// created based on the [filterQuality] specified in the constructor. However,
+/// when [withQuality] is called with a different [ui.FilterQuality] value the
+/// previous [SkShader] is discarded and a new [SkShader] is created. Therefore,
+/// over the lifetime of this object, multiple [SkShader] instances may be
+/// generated depending on the _usage_ of this object in [ui.Paint] and other
+/// scenarios that want a shader at different filter quality levels.
+class CkImageShader implements ui.ImageShader, CkShader {
   CkImageShader(ui.Image image, this.tileModeX, this.tileModeY, this.matrix4,
       this.filterQuality)
-      : _image = image as CkImage;
+      : _image = image as CkImage {
+    _initializeSkImageShader(filterQuality ?? ui.FilterQuality.none);
+  }
 
   final ui.TileMode tileModeX;
   final ui.TileMode tileModeY;
@@ -199,53 +228,67 @@ class CkImageShader extends CkShader implements ui.ImageShader {
   final ui.FilterQuality? filterQuality;
   final CkImage _image;
 
+  /// Owns the reference to the currently [SkShader].
+  ///
+  /// This reference changes when [withQuality] is called with different filter
+  /// quality levels.
+  @visibleForTesting
+  UniqueRef<SkShader>? ref;
+
+  /// The filter quality at which the latest [SkShader] was initialized.
+  @visibleForTesting
+  late ui.FilterQuality currentQuality;
+
   int get imageWidth => _image.width;
 
   int get imageHeight => _image.height;
 
-  ui.FilterQuality? _cachedQuality;
   @override
-  SkShader withQuality(ui.FilterQuality contextualQuality) {
+  SkShader getSkShader(ui.FilterQuality contextualQuality) {
+    assert(!debugDisposed, 'Cannot make a copy of a disposed ImageShader.');
     final ui.FilterQuality quality = filterQuality ?? contextualQuality;
-    SkShader? shader = rawSkiaObject;
-    if (_cachedQuality != quality || shader == null) {
-      if (quality == ui.FilterQuality.high) {
-        shader = _image.skImage.makeShaderCubic(
-          toSkTileMode(tileModeX),
-          toSkTileMode(tileModeY),
-          1.0 / 3.0,
-          1.0 / 3.0,
-          toSkMatrixFromFloat64(matrix4),
-        );
-      } else {
-        shader = _image.skImage.makeShaderOptions(
-          toSkTileMode(tileModeX),
-          toSkTileMode(tileModeY),
-          toSkFilterMode(quality),
-          toSkMipmapMode(quality),
-          toSkMatrixFromFloat64(matrix4),
-        );
-      }
-      _cachedQuality = quality;
-      rawSkiaObject = shader;
+    if (currentQuality != quality) {
+      _initializeSkImageShader(quality);
     }
-    return shader;
+    return ref!.nativeObject;
   }
 
-  @override
-  SkShader createDefault() => withQuality(ui.FilterQuality.none);
+  void _initializeSkImageShader(ui.FilterQuality quality) {
+    final SkShader skShader;
+    if (quality == ui.FilterQuality.high) {
+      skShader = _image.skImage.makeShaderCubic(
+        toSkTileMode(tileModeX),
+        toSkTileMode(tileModeY),
+        1.0 / 3.0,
+        1.0 / 3.0,
+        toSkMatrixFromFloat64(matrix4),
+      );
+    } else {
+      skShader = _image.skImage.makeShaderOptions(
+        toSkTileMode(tileModeX),
+        toSkTileMode(tileModeY),
+        toSkFilterMode(quality),
+        toSkMipmapMode(quality),
+        toSkMatrixFromFloat64(matrix4),
+      );
+    }
 
-  @override
-  SkShader resurrect() => withQuality(_cachedQuality ?? ui.FilterQuality.none);
+    currentQuality = quality;
+    ref?.dispose();
+    ref = UniqueRef<SkShader>(this, skShader, 'ImageShader');
+  }
+
+  bool _isDisposed = false;
 
   @override
-  void delete() {
-    rawSkiaObject?.delete();
-  }
+  bool get debugDisposed => _isDisposed;
 
   @override
   void dispose() {
-    super.dispose();
+    assert(!_isDisposed, 'Cannot dispose ImageShader more than once.');
+    _isDisposed = true;
     _image.dispose();
+    ref?.dispose();
+    ref = null;
   }
 }
diff --git a/lib/web_ui/lib/src/engine/canvaskit/skia_object_cache.dart b/lib/web_ui/lib/src/engine/canvaskit/skia_object_cache.dart
deleted file mode 100644
index 21debea93cfb903c45cf97224608406b0832a5c1..0000000000000000000000000000000000000000
--- a/lib/web_ui/lib/src/engine/canvaskit/skia_object_cache.dart
+++ /dev/null
@@ -1,586 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'dart:collection';
-
-import 'package:meta/meta.dart';
-
-import '../../engine.dart' show Instrumentation;
-import '../util.dart';
-import 'canvaskit_api.dart';
-import 'renderer.dart';
-
-/// A cache of Skia objects whose memory Flutter manages.
-///
-/// When using Skia, Flutter creates Skia objects which are allocated in
-/// WASM memory and which must be explicitly deleted. In the case of Flutter
-/// mobile, the Skia objects are wrapped by a C++ class which is destroyed
-/// when the associated Dart object is garbage collected.
-///
-/// On the web, we cannot tell when a Dart object is garbage collected, so
-/// we must use other strategies to know when to delete a Skia object. Some
-/// objects, like [ui.Paint], can safely delete their associated Skia object
-/// because they can always recreate the Skia object from data stored in the
-/// Dart object. Other objects, like [ui.Picture], can be serialized to a
-/// JS-managed data structure when they are deleted so that when the associated
-/// object is garbage collected, so is the serialized data.
-class SkiaObjectCache {
-  SkiaObjectCache(this.maximumSize)
-      : _itemQueue = DoubleLinkedQueue<SkiaObject<Object>>(),
-        _itemMap = <SkiaObject<Object>, DoubleLinkedQueueEntry<SkiaObject<Object>>>{};
-
-  final int maximumSize;
-
-  /// A doubly linked list of the objects in the cache.
-  ///
-  /// This makes it fast to move a recently used object to the front.
-  final DoubleLinkedQueue<SkiaObject<Object>> _itemQueue;
-
-  /// A map of objects to their associated node in the [_itemQueue].
-  ///
-  /// This makes it fast to find the node in the queue when we need to
-  /// move the object to the front of the queue.
-  final Map<SkiaObject<Object>, DoubleLinkedQueueEntry<SkiaObject<Object>>> _itemMap;
-
-  /// The number of objects in the cache.
-  int get length => _itemQueue.length;
-
-  /// Whether or not [object] is in the cache.
-  ///
-  /// This is only for testing.
-  @visibleForTesting
-  bool debugContains(SkiaObject<Object> object) {
-    return _itemMap.containsKey(object);
-  }
-
-  /// Adds [object] to the cache.
-  ///
-  /// If adding [object] causes the total size of the cache to exceed
-  /// [maximumSize], then the least recently used half of the cache
-  /// will be deleted.
-  void add(SkiaObject<Object> object) {
-    _itemQueue.addFirst(object);
-    _itemMap[object] = _itemQueue.firstEntry()!;
-
-    if (_itemQueue.length > maximumSize) {
-      SkiaObjects.markCacheForResize(this);
-    }
-  }
-
-  /// Records that [object] was used in the most recent frame.
-  void markUsed(SkiaObject<Object> object) {
-    final DoubleLinkedQueueEntry<SkiaObject<Object>> item = _itemMap[object]!;
-    item.remove();
-    _itemQueue.addFirst(object);
-    _itemMap[object] = _itemQueue.firstEntry()!;
-  }
-
-  /// Deletes the least recently used half of this cache.
-  void resize() {
-    final int itemsToDelete = maximumSize ~/ 2;
-    for (int i = 0; i < itemsToDelete; i++) {
-      final SkiaObject<Object> oldObject = _itemQueue.removeLast();
-      _itemMap.remove(oldObject);
-      oldObject.delete();
-      oldObject.didDelete();
-    }
-  }
-}
-
-/// Like [SkiaObjectCache] but enforces the [maximumSize] of the cache
-/// synchronously instead of waiting until a post-frame callback.
-class SynchronousSkiaObjectCache {
-  SynchronousSkiaObjectCache(this.maximumSize)
-      : _itemQueue = DoubleLinkedQueue<SkiaObject<Object>>(),
-        _itemMap = <SkiaObject<Object>, DoubleLinkedQueueEntry<SkiaObject<Object>>>{};
-
-  /// This cache will never exceed this limit, even temporarily.
-  final int maximumSize;
-
-  /// A doubly linked list of the objects in the cache.
-  ///
-  /// This makes it fast to move a recently used object to the front.
-  final DoubleLinkedQueue<SkiaObject<Object>> _itemQueue;
-
-  /// A map of objects to their associated node in the [_itemQueue].
-  ///
-  /// This makes it fast to find the node in the queue when we need to
-  /// move the object to the front of the queue.
-  final Map<SkiaObject<Object>, DoubleLinkedQueueEntry<SkiaObject<Object>>> _itemMap;
-
-  /// The number of objects in the cache.
-  int get length => _itemQueue.length;
-
-  /// Whether or not [object] is in the cache.
-  ///
-  /// This is only for testing.
-  @visibleForTesting
-  bool debugContains(SkiaObject<Object> object) {
-    return _itemMap.containsKey(object);
-  }
-
-  /// Adds [object] to the cache.
-  ///
-  /// If adding [object] causes the total size of the cache to exceed
-  /// [maximumSize], then the least recently used objects are evicted and
-  /// deleted.
-  void add(SkiaObject<Object> object) {
-    assert(
-      !_itemMap.containsKey(object),
-      'Cannot add object. Object is already in the cache: $object',
-    );
-    _itemQueue.addFirst(object);
-    _itemMap[object] = _itemQueue.firstEntry()!;
-    _enforceCacheLimit();
-  }
-
-  /// Marks the [object] as most recently used.
-  ///
-  /// If [object] is in the cache returns true. If the object is not in
-  /// the cache, for example, because it was never added or because it was
-  /// evicted as a result of the app reaching the cache limit, returns false.
-  bool markUsed(SkiaObject<Object> object) {
-    final DoubleLinkedQueueEntry<SkiaObject<Object>>? item = _itemMap[object];
-
-    if (item == null) {
-      return false;
-    }
-
-    item.remove();
-    _itemQueue.addFirst(object);
-    _itemMap[object] = _itemQueue.firstEntry()!;
-    return true;
-  }
-
-  /// Ensures the cache does not exceed [maximumSize], evicting objects if
-  /// necessary.
-  ///
-  /// Calls `delete` and `didDelete` on objects evicted from the cache.
-  void _enforceCacheLimit() {
-    while (_itemQueue.length > maximumSize) {
-      final SkiaObject<Object> oldObject = _itemQueue.removeLast();
-      _itemMap.remove(oldObject);
-      oldObject.delete();
-      oldObject.didDelete();
-    }
-  }
-}
-
-/// An object backed by a JavaScript object mapped onto a Skia C++ object in the
-/// WebAssembly heap.
-///
-/// These objects are automatically deleted when no longer used.
-abstract class SkiaObject<T extends Object> {
-  /// The JavaScript object that's mapped onto a Skia C++ object in the WebAssembly heap.
-  T get skiaObject;
-
-  /// Deletes the associated C++ object from the WebAssembly heap.
-  void delete();
-
-  /// Lifecycle method called immediately after calling [delete].
-  ///
-  /// This method is used to
-  void didDelete();
-}
-
-/// A [SkiaObject] that manages the lifecycle of its C++ counterpart.
-///
-/// In browsers that support weak references we use feedback from the garbage
-/// collector to determine when it is safe to release the C++ object.
-///
-/// In browsers that do not support weak references we pessimistically delete
-/// the underlying C++ object before the Dart object is garbage-collected.
-///
-/// If [isResurrectionExpensive] is false the object is deleted at the end of
-/// the frame. If a deleted object is reused in a subsequent frame it is
-/// resurrected by calling [resurrect]. This allows reusing the C++ objects
-/// within the frame.
-///
-/// If [isResurrectionExpensive] is true the object is put in a LRU cache.
-/// Objects that are used least frequently are deleted from the cache when
-/// the cache limit is reached.
-///
-/// The lifecycle of a resurrectable C++ object is as follows:
-///
-/// - Create: a managed object is created using a default instance that's
-///   either supplied as a constructor argument, or obtained by calling
-///   [createDefault]. The data in the new object is expected to contain
-///   data matching Flutter's defaults (sometimes Skia defaults need to be
-///   adjusted).
-/// - Zero or more cycles of delete + resurrect: when a Dart object is reused
-///   after its C++ object is deleted we create a new C++ object populated with
-///   data from the current state of the Dart object. This is done using the
-///   [resurrect] method.
-/// - Final delete: if a Dart object is never reused, it is GC'd after its
-///   underlying C++ object is deleted. This is implemented by [SkiaObjects].
-abstract class ManagedSkiaObject<T extends Object> extends SkiaObject<T> {
-  /// Creates a managed Skia object.
-  ///
-  /// If `instance` is null calls [createDefault] to create a Skia object to
-  /// manage. Otherwise, uses the provided instance.
-  ///
-  /// The provided instance must not be managed by another [ManagedSkiaObject],
-  /// as it may lead to undefined behavior.
-  ManagedSkiaObject([T? instance]) {
-    final T defaultObject = instance ?? createDefault();
-    rawSkiaObject = defaultObject;
-    if (browserSupportsFinalizationRegistry) {
-      // If FinalizationRegistry is supported we will only ever need the
-      // default object, as we know precisely when to delete it.
-      Collector.instance.register(this, defaultObject as SkDeletable);
-    } else {
-      // If FinalizationRegistry is _not_ supported we may need to delete
-      // and resurrect the object multiple times before deleting it forever.
-      if (Instrumentation.enabled) {
-        Instrumentation.instance.incrementCounter(
-          '${(defaultObject as SkDeletable).constructor.name} created',
-        );
-      }
-      if (isResurrectionExpensive) {
-        SkiaObjects.manageExpensive(this);
-      } else {
-        SkiaObjects.manageResurrectable(this);
-      }
-    }
-  }
-
-  @override
-  T get skiaObject => rawSkiaObject ?? _doResurrect();
-
-  T _doResurrect() {
-    assert(!browserSupportsFinalizationRegistry);
-    final T skiaObject = resurrect();
-    if (Instrumentation.enabled) {
-      Instrumentation.instance.incrementCounter(
-        '${(skiaObject as SkDeletable).constructor.name} resurrected',
-      );
-    }
-    rawSkiaObject = skiaObject;
-    if (isResurrectionExpensive) {
-      SkiaObjects.manageExpensive(this);
-    } else {
-      SkiaObjects.manageResurrectable(this);
-    }
-    return skiaObject;
-  }
-
-  @override
-  void didDelete() {
-    assert(!browserSupportsFinalizationRegistry);
-
-    // Null indicates that the object has been manually disposed of. This
-    // happens for objects with manual lifecycles, such as Picture.
-    if (rawSkiaObject == null) {
-      return;
-    }
-
-    if (Instrumentation.enabled) {
-      Instrumentation.instance.incrementCounter(
-        '${(rawSkiaObject! as SkDeletable).constructor.name} deleted',
-      );
-    }
-    rawSkiaObject = null;
-  }
-
-  /// Returns the current skia object as is without attempting to
-  /// resurrect it.
-  ///
-  /// If the returned value is `null`, the corresponding C++ object has
-  /// been deleted.
-  ///
-  /// Use this field instead of the [skiaObject] getter when implementing
-  /// the [delete] method.
-  T? rawSkiaObject;
-
-  /// Instantiates a new Skia-backed JavaScript object containing default
-  /// values.
-  ///
-  /// The object is expected to represent Flutter's defaults. If Skia uses
-  /// different defaults from those used by Flutter, this method is expected
-  /// initialize the object to Flutter's defaults.
-  T createDefault();
-
-  /// Creates a new Skia-backed JavaScript object containing data representing
-  /// the current state of the Dart object.
-  T resurrect();
-
-  /// Whether or not it is expensive to resurrect this object.
-  ///
-  /// Defaults to false.
-  bool get isResurrectionExpensive => false;
-}
-
-/// Interface that classes wrapping [SkiaObjectBox] must implement.
-///
-/// Used to collect stack traces in debug mode.
-abstract class StackTraceDebugger {
-  /// The stack trace pointing to code location that created or upreffed a
-  /// [SkiaObjectBox].
-  StackTrace get debugStackTrace;
-}
-
-/// A function that restores a Skia object that was temporarily deleted.
-typedef Resurrector<T> = T Function();
-
-/// Uses reference counting to manage the lifecycle of a Skia object owned by a
-/// wrapper object.
-///
-/// The [ref] method can be used to increment the refcount to tell this box to
-/// keep the underlying Skia object alive.
-///
-/// The [unref] method can be used to decrement the refcount to tell this box
-/// that a wrapper object no longer needs it. When the refcount drops to zero
-/// the underlying Skia object is deleted permanently (see [isDeletedPermanently]).
-///
-/// In addition to ref counting, this object is also managed by GC. In browsers
-/// that support [SkFinalizationRegistry] the underlying Skia object is deleted
-/// permanently when no JavaScript objects have references to this box. In
-/// browsers that do not support [SkFinalizationRegistry] the underlying Skia
-/// object may undergo several cycles of temporary deletions and resurrections
-/// prior to being deleted permanently. A temporary deletion may effectively
-/// be permanent if this object is garbage collected. This is safe because a
-/// temporarily deleted object has no C++ resources to collect.
-class SkiaObjectBox<R extends StackTraceDebugger, T extends Object>
-    extends SkiaObject<T> {
-  /// Creates an object box that's memory-managed using [SkFinalizationRegistry].
-  ///
-  /// This constructor must only be used if [browserSupportsFinalizationRegistry] is true.
-  SkiaObjectBox(R debugReferrer, T initialValue) :
-        assert(browserSupportsFinalizationRegistry), _resurrector = null {
-    _initialize(debugReferrer, initialValue);
-    Collector.instance.register(this, _skDeletable!);
-  }
-
-  /// Creates an object box that's memory-managed using a [Resurrector].
-  ///
-  /// This constructor must only be used if [browserSupportsFinalizationRegistry] is false.
-  SkiaObjectBox.resurrectable(
-      R debugReferrer, T initialValue, this._resurrector) :
-        assert(!browserSupportsFinalizationRegistry) {
-    _initialize(debugReferrer, initialValue);
-    if (Instrumentation.enabled) {
-      Instrumentation.instance.incrementCounter(
-        '${_skDeletable?.constructor.name} created',
-      );
-    }
-    SkiaObjects.manageExpensive(this);
-  }
-
-  void _initialize(R debugReferrer, T initialValue) {
-    _update(initialValue);
-    if (assertionsEnabled) {
-      debugReferrers.add(debugReferrer);
-    }
-    assert(refCount == debugReferrers.length);
-  }
-
-  /// The number of objects sharing references to this box.
-  ///
-  /// When this count reaches zero, the underlying [skiaObject] is scheduled
-  /// for deletion.
-  int get refCount => _refCount;
-  int _refCount = 1;
-
-  /// When assertions are enabled, stores all objects that share this box.
-  ///
-  /// The length of this list is always identical to [refCount].
-  ///
-  /// This list can be used for debugging ref counting issues.
-  final Set<R> debugReferrers = <R>{};
-
-  /// If asserts are enabled, the [StackTrace]s representing when a reference
-  /// was created.
-  List<StackTrace> debugGetStackTraces() {
-    if (assertionsEnabled) {
-      return debugReferrers
-          .map<StackTrace>((R referrer) => referrer.debugStackTrace)
-          .toList();
-    }
-    throw UnsupportedError('');
-  }
-
-  /// The Skia object whose lifecycle is being managed.
-  ///
-  /// Do not store this value outside this box. It is memory-managed by
-  /// [SkiaObjectBox]. Storing it may result in use-after-free bugs.
-  T? rawSkiaObject;
-  SkDeletable? _skDeletable;
-  Resurrector<T>? _resurrector;
-
-  void _update(T? newSkiaObject) {
-    rawSkiaObject = newSkiaObject;
-    _skDeletable = newSkiaObject as SkDeletable?;
-  }
-
-  @override
-  T get skiaObject => rawSkiaObject ?? _doResurrect();
-
-  T _doResurrect() {
-    assert(!browserSupportsFinalizationRegistry);
-    assert(_resurrector != null);
-    assert(!_isDeletedPermanently, 'Cannot use deleted object.');
-    _update(_resurrector!());
-    if (Instrumentation.enabled) {
-      Instrumentation.instance.incrementCounter(
-        '${_skDeletable?.constructor.name} resurrected',
-      );
-    }
-    SkiaObjects.manageExpensive(this);
-    return skiaObject;
-  }
-
-  @override
-  void delete() {
-    _skDeletable?.delete();
-  }
-
-  @override
-  void didDelete() {
-    if (Instrumentation.enabled) {
-      Instrumentation.instance.incrementCounter(
-        '${_skDeletable?.constructor.name} deleted',
-      );
-    }
-    assert(!browserSupportsFinalizationRegistry);
-    _update(null);
-  }
-
-  /// Whether this object has been deleted permanently.
-  ///
-  /// If this is true it will remain true forever, and the Skia object is no
-  /// longer resurrectable.
-  ///
-  /// See also [isDeletedTemporarily].
-  bool get isDeletedPermanently => _isDeletedPermanently;
-  bool _isDeletedPermanently = false;
-
-  /// Whether the underlying [rawSkiaObject] has been deleted, but it may still
-  /// be resurrected (see [SkiaObjectBox.resurrectable]).
-  bool get isDeletedTemporarily =>
-      rawSkiaObject == null && !_isDeletedPermanently;
-
-  /// Increases the reference count of this box because a new object began
-  /// sharing ownership of the underlying [skiaObject].
-  ///
-  /// Clones must be [dispose]d when finished.
-  void ref(R debugReferrer) {
-    assert(!_isDeletedPermanently,
-        'Cannot increment ref count on a deleted handle.');
-    assert(_refCount > 0);
-    assert(
-      debugReferrers.add(debugReferrer),
-      'Attempted to increment ref count by the same referrer more than once.',
-    );
-    _refCount += 1;
-    assert(refCount == debugReferrers.length);
-  }
-
-  /// Decrements the reference count for the [skObject].
-  ///
-  /// Does nothing if the object has already been deleted.
-  ///
-  /// If this causes the reference count to drop to zero, deletes the
-  /// [skObject].
-  void unref(R debugReferrer) {
-    assert(!_isDeletedPermanently,
-        'Attempted to unref an already deleted Skia object.');
-    assert(
-      debugReferrers.remove(debugReferrer),
-      'Attempted to decrement ref count by the same referrer more than once.',
-    );
-    _refCount -= 1;
-    assert(refCount == debugReferrers.length);
-    if (_refCount == 0) {
-      // The object may be null because it was deleted temporarily, i.e. it was
-      // expecting the possibility of resurrection.
-      if (_skDeletable != null) {
-        if (browserSupportsFinalizationRegistry) {
-          Collector.instance.collect(_skDeletable!);
-        } else {
-          delete();
-          didDelete();
-        }
-      }
-      rawSkiaObject = null;
-      _skDeletable = null;
-      _resurrector = null;
-      _isDeletedPermanently = true;
-    }
-  }
-}
-
-// ignore: avoid_classes_with_only_static_members
-/// Singleton that manages the lifecycles of [SkiaObject] instances.
-class SkiaObjects {
-  @visibleForTesting
-  static final List<ManagedSkiaObject<Object>> resurrectableObjects =
-      <ManagedSkiaObject<Object>>[];
-
-  @visibleForTesting
-  static int maximumCacheSize = 1024;
-
-  @visibleForTesting
-  static final SkiaObjectCache expensiveCache =
-      SkiaObjectCache(maximumCacheSize);
-
-  @visibleForTesting
-  static final List<SkiaObjectCache> cachesToResize = <SkiaObjectCache>[];
-
-  static bool _addedCleanupCallback = false;
-
-  @visibleForTesting
-  static void registerCleanupCallback() {
-    if (_addedCleanupCallback) {
-      return;
-    }
-    CanvasKitRenderer.instance.rasterizer.addPostFrameCallback(postFrameCleanUp);
-    _addedCleanupCallback = true;
-  }
-
-  /// Starts managing the lifecycle of resurrectable [object].
-  ///
-  /// These can safely be deleted at any time.
-  static void manageResurrectable(ManagedSkiaObject<Object> object) {
-    registerCleanupCallback();
-    resurrectableObjects.add(object);
-  }
-
-  /// Starts managing the lifecycle of a resurrectable object that is expensive.
-  ///
-  /// Since it's expensive to resurrect, we shouldn't just delete it after every
-  /// frame. Instead, add it to a cache and only delete it when the cache fills.
-  static void manageExpensive(SkiaObject<Object> object) {
-    registerCleanupCallback();
-    expensiveCache.add(object);
-  }
-
-  /// Marks that [cache] has overflown its maximum size and show be resized.
-  static void markCacheForResize(SkiaObjectCache cache) {
-    registerCleanupCallback();
-    if (cachesToResize.contains(cache)) {
-      return;
-    }
-    cachesToResize.add(cache);
-  }
-
-  /// Cleans up managed Skia memory.
-  static void postFrameCleanUp() {
-    if (resurrectableObjects.isEmpty && cachesToResize.isEmpty) {
-      return;
-    }
-
-    for (int i = 0; i < resurrectableObjects.length; i++) {
-      final SkiaObject<Object> object = resurrectableObjects[i];
-      object.delete();
-      object.didDelete();
-    }
-    resurrectableObjects.clear();
-
-    for (int i = 0; i < cachesToResize.length; i++) {
-      final SkiaObjectCache cache = cachesToResize[i];
-      cache.resize();
-    }
-    cachesToResize.clear();
-  }
-}
diff --git a/lib/web_ui/lib/src/engine/canvaskit/surface.dart b/lib/web_ui/lib/src/engine/canvaskit/surface.dart
index d0fc7a3ee4bfedb1af95abb075b2dbc4736e343d..a6cff70ea730b1ef0fe7ecafb9d824953d88a1fb 100644
--- a/lib/web_ui/lib/src/engine/canvaskit/surface.dart
+++ b/lib/web_ui/lib/src/engine/canvaskit/surface.dart
@@ -2,34 +2,32 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:js_interop';
+
 import 'package:ui/ui.dart' as ui;
 
 import '../browser_detection.dart';
 import '../configuration.dart';
+import '../display.dart';
 import '../dom.dart';
 import '../platform_dispatcher.dart';
-import '../safe_browser_api.dart';
 import '../util.dart';
-import '../window.dart';
 import 'canvas.dart';
 import 'canvaskit_api.dart';
-import 'renderer.dart';
-import 'surface_factory.dart';
+import 'picture.dart';
+import 'rasterizer.dart';
+import 'render_canvas.dart';
 import 'util.dart';
 
 // Only supported in profile/release mode. Allows Flutter to use MSAA but
 // removes the ability for disabling AA on Paint objects.
-const bool _kUsingMSAA =
-    bool.fromEnvironment('flutter.canvaskit.msaa');
+const bool _kUsingMSAA = bool.fromEnvironment('flutter.canvaskit.msaa');
 
 typedef SubmitCallback = bool Function(SurfaceFrame, CkCanvas);
 
 /// A frame which contains a canvas to be drawn into.
 class SurfaceFrame {
-  SurfaceFrame(this.skiaSurface, this.submitCallback)
-      : _submitted = false,
-        assert(skiaSurface != null),
-        assert(submitCallback != null);
+  SurfaceFrame(this.skiaSurface, this.submitCallback) : _submitted = false;
 
   final CkSurface skiaSurface;
   final SubmitCallback submitCallback;
@@ -51,11 +49,19 @@ class SurfaceFrame {
 /// The underlying representation is a [CkSurface], which can be reused by
 /// successive frames if they are the same size. Otherwise, a new [CkSurface] is
 /// created.
-class Surface {
-  Surface();
+class Surface extends DisplayCanvas {
+  Surface({this.isDisplayCanvas = false})
+      : useOffscreenCanvas =
+            Surface.offscreenCanvasSupported && !isDisplayCanvas;
 
   CkSurface? _surface;
 
+  /// Whether or not to use an `OffscreenCanvas` to back this [Surface].
+  final bool useOffscreenCanvas;
+
+  /// If `true`, this [Surface] is used as a [DisplayCanvas].
+  final bool isDisplayCanvas;
+
   /// If true, forces a new WebGL context to be created, even if the window
   /// size is the same. This is used to restore the UI after the browser tab
   /// goes dormant and loses the GL context.
@@ -70,7 +76,7 @@ class Surface {
   /// We must cache this function because each time we access the tear-off it
   /// creates a new object, meaning we won't be able to remove this listener
   /// later.
-  void Function(DomEvent)? _cachedContextLostListener;
+  DomEventListener? _cachedContextLostListener;
 
   /// A cached copy of the most recently created `webglcontextrestored`
   /// listener.
@@ -78,27 +84,32 @@ class Surface {
   /// We must cache this function because each time we access the tear-off it
   /// creates a new object, meaning we won't be able to remove this listener
   /// later.
-  void Function(DomEvent)? _cachedContextRestoredListener;
+  DomEventListener? _cachedContextRestoredListener;
 
   SkGrContext? _grContext;
   int? _glContext;
   int? _skiaCacheBytes;
 
-  /// The root HTML element for this surface.
-  ///
-  /// This element contains the canvas used to draw the UI. Unlike the canvas,
-  /// this element is permanent. It is never replaced or deleted, until this
-  /// surface is disposed of via [dispose].
-  ///
-  /// Conversely, the canvas that lives inside this element can be swapped, for
-  /// example, when the screen size changes, or when the WebGL context is lost
-  /// due to the browser tab becoming dormant.
-  final DomElement htmlElement = createDomElement('flt-canvas-container');
+  /// The underlying OffscreenCanvas element used for this surface.
+  DomOffscreenCanvas? _offscreenCanvas;
+
+  /// Returns the underlying OffscreenCanvas. Should only be used in tests.
+  DomOffscreenCanvas? get debugOffscreenCanvas => _offscreenCanvas;
+
+  /// The <canvas> backing this Surface in the case that OffscreenCanvas isn't
+  /// supported.
+  DomCanvasElement? _canvasElement;
+
+  /// Note, if this getter is called, then this Surface is being used as an
+  /// overlay and must be backed by an onscreen <canvas> element.
+  @override
+  final DomElement hostElement = createDomElement('flt-canvas-container');
 
-  /// The underlying `<canvas>` element used for this surface.
-  DomCanvasElement? htmlCanvas;
   int _pixelWidth = -1;
   int _pixelHeight = -1;
+  double _currentDevicePixelRatio = -1;
+  int _sampleCount = -1;
+  int _stencilBits = -1;
 
   /// Specify the GPU resource cache limits.
   void setSkiaResourceCacheMaxBytes(int bytes) {
@@ -108,11 +119,52 @@ class Surface {
 
   void _syncCacheBytes() {
     if (_skiaCacheBytes != null) {
-      _grContext?.setResourceCacheLimitBytes(_skiaCacheBytes!);
+      _grContext?.setResourceCacheLimitBytes(_skiaCacheBytes!.toDouble());
     }
   }
 
-  bool _addedToScene = false;
+  /// The CanvasKit canvas associated with this surface.
+  CkCanvas getCanvas() {
+    return _surface!.getCanvas();
+  }
+
+  void flush() {
+    _surface!.flush();
+  }
+
+  Future<void> rasterizeToCanvas(
+      ui.Size frameSize, RenderCanvas canvas, List<CkPicture> pictures) async {
+    final CkCanvas skCanvas = getCanvas();
+    skCanvas.clear(const ui.Color(0x00000000));
+    pictures.forEach(skCanvas.drawPicture);
+    flush();
+
+    if (browserSupportsCreateImageBitmap) {
+      JSObject bitmapSource;
+      if (useOffscreenCanvas) {
+        bitmapSource = _offscreenCanvas! as JSObject;
+      } else {
+        bitmapSource = _canvasElement! as JSObject;
+      }
+      final DomImageBitmap bitmap = await createImageBitmap(bitmapSource, (
+        x: 0,
+        y: _pixelHeight - frameSize.height.toInt(),
+        width: frameSize.width.toInt(),
+        height: frameSize.height.toInt(),
+      ));
+      canvas.render(bitmap);
+    } else {
+      // If the browser doesn't support `createImageBitmap` (e.g. Safari 14)
+      // then render using `drawImage` instead.
+      DomCanvasImageSource imageSource;
+      if (useOffscreenCanvas) {
+        imageSource = _offscreenCanvas! as DomCanvasImageSource;
+      } else {
+        imageSource = _canvasElement! as DomCanvasImageSource;
+      }
+      canvas.renderWithNoBitmapSupport(imageSource, _pixelHeight, frameSize);
+    }
+  }
 
   /// Acquire a frame of the given [size] containing a drawable canvas.
   ///
@@ -129,16 +181,72 @@ class Surface {
     return SurfaceFrame(surface, submitCallback);
   }
 
-  void addToScene() {
-    if (!_addedToScene) {
-      CanvasKitRenderer.instance.sceneHost!.prepend(htmlElement);
-    }
-    _addedToScene = true;
-  }
-
   ui.Size? _currentCanvasPhysicalSize;
   ui.Size? _currentSurfaceSize;
-  double _currentDevicePixelRatio = -1;
+
+  /// Sets the CSS size of the canvas so that canvas pixels are 1:1 with device
+  /// pixels.
+  ///
+  /// The logical size of the canvas is not based on the size of the window
+  /// but on the size of the canvas, which, due to `ceil()` above, may not be
+  /// the same as the window. We do not round/floor/ceil the logical size as
+  /// CSS pixels can contain more than one physical pixel and therefore to
+  /// match the size of the window precisely we use the most precise floating
+  /// point value we can get.
+  void _updateLogicalHtmlCanvasSize() {
+    final double devicePixelRatio =
+        EngineFlutterDisplay.instance.devicePixelRatio;
+    final double logicalWidth = _pixelWidth / devicePixelRatio;
+    final double logicalHeight = _pixelHeight / devicePixelRatio;
+    final DomCSSStyleDeclaration style = _canvasElement!.style;
+    style.width = '${logicalWidth}px';
+    style.height = '${logicalHeight}px';
+    _currentDevicePixelRatio = devicePixelRatio;
+  }
+
+  /// The <canvas> element backing this surface may be larger than the screen.
+  /// The Surface will draw the frame to the bottom left of the <canvas>, but
+  /// the <canvas> is, by default, positioned so that the top left corner is in
+  /// the top left of the window. We need to shift the canvas down so that the
+  /// bottom left of the <canvas> is the the bottom left corner of the window.
+  void positionToShowFrame(ui.Size frameSize) {
+    assert(isDisplayCanvas,
+        'Should not position Surface if not used as a render canvas');
+    final double devicePixelRatio =
+        EngineFlutterDisplay.instance.devicePixelRatio;
+    final double logicalHeight = _pixelHeight / devicePixelRatio;
+    final double logicalFrameHeight = frameSize.height / devicePixelRatio;
+
+    // Shift the canvas up so the bottom left is in the window.
+    _canvasElement!.style.transform =
+        'translate(0px, ${logicalFrameHeight - logicalHeight}px)';
+  }
+
+  /// This is only valid after the first frame or if [ensureSurface] has been
+  /// called
+  bool get usingSoftwareBackend =>
+      _glContext == null ||
+      _grContext == null ||
+      webGLVersion == -1 ||
+      configuration.canvasKitForceCpuOnly;
+
+  /// Ensure that the initial surface exists and has a size of at least [size].
+  ///
+  /// If not provided, [size] defaults to 1x1.
+  ///
+  /// This also ensures that the gl/grcontext have been populated so
+  /// that software rendering can be detected.
+  void ensureSurface([ui.Size size = const ui.Size(1, 1)]) {
+    // If the GrContext hasn't been setup yet then we need to force initialization
+    // of the canvas and initial surface.
+    if (_surface != null) {
+      return;
+    }
+    // TODO(jonahwilliams): this is somewhat wasteful. We should probably
+    // eagerly setup this surface instead of delaying until the first frame?
+    // Or at least cache the estimated window sizeThis is the first frame we have rendered with this canvas.
+    createOrUpdateSurface(size);
+  }
 
   /// Creates a <canvas> and SkSurface for the given [size].
   CkSurface createOrUpdateSurface(ui.Size size) {
@@ -146,88 +254,66 @@ class Surface {
       throw CanvasKitError('Cannot create surfaces of empty size.');
     }
 
-    // Check if the window is the same size as before, and if so, don't allocate
-    // a new canvas as the previous canvas is big enough to fit everything.
-    final ui.Size? previousSurfaceSize = _currentSurfaceSize;
-    if (!_forceNewContext &&
-        previousSurfaceSize != null &&
-        size.width == previousSurfaceSize.width &&
-        size.height == previousSurfaceSize.height) {
-      // The existing surface is still reusable.
-      if (window.devicePixelRatio != _currentDevicePixelRatio) {
-        _updateLogicalHtmlCanvasSize();
-        _translateCanvas();
+    if (!_forceNewContext) {
+      // Check if the window is the same size as before, and if so, don't allocate
+      // a new canvas as the previous canvas is big enough to fit everything.
+      final ui.Size? previousSurfaceSize = _currentSurfaceSize;
+      if (previousSurfaceSize != null &&
+          size.width == previousSurfaceSize.width &&
+          size.height == previousSurfaceSize.height) {
+        final double devicePixelRatio =
+            EngineFlutterDisplay.instance.devicePixelRatio;
+        if (isDisplayCanvas && devicePixelRatio != _currentDevicePixelRatio) {
+          _updateLogicalHtmlCanvasSize();
+        }
+        return _surface!;
       }
-      return _surface!;
-    }
 
-    // If the current canvas size is smaller than the requested size then create
-    // a new, larger, canvas. Then update the GR context so we can create a new
-    // SkSurface.
-    final ui.Size? previousCanvasSize = _currentCanvasPhysicalSize;
-    if (_forceNewContext ||
-        previousCanvasSize == null ||
-        size.width > previousCanvasSize.width ||
-        size.height > previousCanvasSize.height) {
+      final ui.Size? previousCanvasSize = _currentCanvasPhysicalSize;
       // Initialize a new, larger, canvas. If the size is growing, then make the
       // new canvas larger than required to avoid many canvas creations.
-      final ui.Size newSize = previousCanvasSize == null ? size : size * 1.4;
+      if (previousCanvasSize != null &&
+          (size.width > previousCanvasSize.width ||
+              size.height > previousCanvasSize.height)) {
+        final ui.Size newSize = size * 1.4;
+        _surface?.dispose();
+        _surface = null;
+        _pixelWidth = newSize.width.ceil();
+        _pixelHeight = newSize.height.ceil();
+        if (useOffscreenCanvas) {
+          _offscreenCanvas!.width = _pixelWidth.toDouble();
+          _offscreenCanvas!.height = _pixelHeight.toDouble();
+        } else {
+          _canvasElement!.width = _pixelWidth.toDouble();
+          _canvasElement!.height = _pixelHeight.toDouble();
+        }
+        _currentCanvasPhysicalSize =
+            ui.Size(_pixelWidth.toDouble(), _pixelHeight.toDouble());
+        if (isDisplayCanvas) {
+          _updateLogicalHtmlCanvasSize();
+        }
+      }
+    }
 
-      // If we have a surface, send a dummy command to its canvas to make its context
-      // current or else disposing the context could fail below.
-      _surface?.getCanvas().clear(const ui.Color(0x00000000));
+    // Either a new context is being forced or we've never had one.
+    if (_forceNewContext || _currentCanvasPhysicalSize == null) {
       _surface?.dispose();
       _surface = null;
-      _addedToScene = false;
       _grContext?.releaseResourcesAndAbandonContext();
       _grContext?.delete();
       _grContext = null;
 
-      _createNewCanvas(newSize);
-      _currentCanvasPhysicalSize = newSize;
-    } else if (window.devicePixelRatio != _currentDevicePixelRatio) {
-      _updateLogicalHtmlCanvasSize();
+      _createNewCanvas(size);
+      _currentCanvasPhysicalSize = size;
     }
 
-    _currentDevicePixelRatio = window.devicePixelRatio;
     _currentSurfaceSize = size;
-    _translateCanvas();
-    return _surface = _createNewSurface(size);
-  }
-
-  /// Sets the CSS size of the canvas so that canvas pixels are 1:1 with device
-  /// pixels.
-  ///
-  /// The logical size of the canvas is not based on the size of the window
-  /// but on the size of the canvas, which, due to `ceil()` above, may not be
-  /// the same as the window. We do not round/floor/ceil the logical size as
-  /// CSS pixels can contain more than one physical pixel and therefore to
-  /// match the size of the window precisely we use the most precise floating
-  /// point value we can get.
-  void _updateLogicalHtmlCanvasSize() {
-    final double logicalWidth = _pixelWidth / window.devicePixelRatio;
-    final double logicalHeight = _pixelHeight / window.devicePixelRatio;
-    final DomCSSStyleDeclaration style = htmlCanvas!.style;
-    style.width = '${logicalWidth}px';
-    style.height = '${logicalHeight}px';
-  }
-
-  /// Translate the canvas so the surface covers the visible portion of the
-  /// screen.
-  ///
-  /// The <canvas> may be larger than the visible screen, but the SkSurface is
-  /// exactly the size of the visible screen. Unfortunately, the SkSurface is
-  /// drawn in the lower left corner of the <canvas>, and without translation,
-  /// only the top left of the <canvas> is visible. So we shift the canvas up so
-  /// the bottom left corner is visible.
-  void _translateCanvas() {
-    final int surfaceHeight = _currentSurfaceSize!.height.ceil();
-    final double offset =
-        (_pixelHeight - surfaceHeight) / window.devicePixelRatio;
-    htmlCanvas!.style.transform = 'translate(0, -${offset}px)';
+    _surface?.dispose();
+    _surface = _createNewSurface(size);
+    return _surface!;
   }
 
-  void _contextRestoredListener(DomEvent event) {
+  JSVoid _contextRestoredListener(DomEvent event) {
     assert(
         _contextLost,
         'Received "webglcontextrestored" event but never received '
@@ -239,17 +325,12 @@ class Surface {
     event.preventDefault();
   }
 
-  void _contextLostListener(DomEvent event) {
-    assert(event.target == htmlCanvas,
+  JSVoid _contextLostListener(DomEvent event) {
+    assert(event.target == _offscreenCanvas || event.target == _canvasElement,
         'Received a context lost event for a disposed canvas');
-    final SurfaceFactory factory = SurfaceFactory.instance;
     _contextLost = true;
-    if (factory.isLive(this)) {
-      _forceNewContext = true;
-      event.preventDefault();
-    } else {
-      dispose();
-    }
+    _forceNewContext = true;
+    event.preventDefault();
   }
 
   /// This function is expensive.
@@ -257,18 +338,33 @@ class Surface {
   /// It's better to reuse canvas if possible.
   void _createNewCanvas(ui.Size physicalSize) {
     // Clear the container, if it's not empty. We're going to create a new <canvas>.
-    if (this.htmlCanvas != null) {
-      this.htmlCanvas!.removeEventListener(
-            'webglcontextrestored',
-            _cachedContextRestoredListener,
-            false,
-          );
-      this.htmlCanvas!.removeEventListener(
-            'webglcontextlost',
-            _cachedContextLostListener,
-            false,
-          );
-      this.htmlCanvas!.remove();
+    if (_offscreenCanvas != null) {
+      _offscreenCanvas!.removeEventListener(
+        'webglcontextrestored',
+        _cachedContextRestoredListener,
+        false,
+      );
+      _offscreenCanvas!.removeEventListener(
+        'webglcontextlost',
+        _cachedContextLostListener,
+        false,
+      );
+      _offscreenCanvas = null;
+      _cachedContextRestoredListener = null;
+      _cachedContextLostListener = null;
+    } else if (_canvasElement != null) {
+      _canvasElement!.removeEventListener(
+        'webglcontextrestored',
+        _cachedContextRestoredListener,
+        false,
+      );
+      _canvasElement!.removeEventListener(
+        'webglcontextlost',
+        _cachedContextLostListener,
+        false,
+      );
+      _canvasElement!.remove();
+      _canvasElement = null;
       _cachedContextRestoredListener = null;
       _cachedContextLostListener = null;
     }
@@ -277,25 +373,28 @@ class Surface {
     // we ensure that the rendred picture covers the entire browser window.
     _pixelWidth = physicalSize.width.ceil();
     _pixelHeight = physicalSize.height.ceil();
-    final DomCanvasElement htmlCanvas = createDomCanvasElement(
-      width: _pixelWidth,
-      height: _pixelHeight,
-    );
-    this.htmlCanvas = htmlCanvas;
-
-    // The DOM elements used to render pictures are used purely to put pixels on
-    // the screen. They have no semantic information. If an assistive technology
-    // attempts to scan picture content it will look like garbage and confuse
-    // users. UI semantics are exported as a separate DOM tree rendered parallel
-    // to pictures.
-    //
-    // Why are layer and scene elements not hidden from ARIA? Because those
-    // elements may contain platform views, and platform views must be
-    // accessible.
-    htmlCanvas.setAttribute('aria-hidden', 'true');
-
-    htmlCanvas.style.position = 'absolute';
-    _updateLogicalHtmlCanvasSize();
+    DomEventTarget htmlCanvas;
+    if (useOffscreenCanvas) {
+      final DomOffscreenCanvas offscreenCanvas = createDomOffscreenCanvas(
+        _pixelWidth,
+        _pixelHeight,
+      );
+      htmlCanvas = offscreenCanvas;
+      _offscreenCanvas = offscreenCanvas;
+      _canvasElement = null;
+    } else {
+      final DomCanvasElement canvas =
+          createDomCanvasElement(width: _pixelWidth, height: _pixelHeight);
+      htmlCanvas = canvas;
+      _canvasElement = canvas;
+      _offscreenCanvas = null;
+      if (isDisplayCanvas) {
+        _canvasElement!.setAttribute('aria-hidden', 'true');
+        _canvasElement!.style.position = 'absolute';
+        hostElement.append(_canvasElement!);
+        _updateLogicalHtmlCanvasSize();
+      }
+    }
 
     // When the browser tab using WebGL goes dormant the browser and/or OS may
     // decide to clear GPU resources to let other tabs/programs use the GPU.
@@ -303,8 +402,9 @@ class Surface {
     // notification. When we receive this notification we force a new context.
     //
     // See also: https://www.khronos.org/webgl/wiki/HandlingContextLost
-    _cachedContextRestoredListener = allowInterop(_contextRestoredListener);
-    _cachedContextLostListener = allowInterop(_contextLostListener);
+    _cachedContextRestoredListener =
+        createDomEventListener(_contextRestoredListener);
+    _cachedContextLostListener = createDomEventListener(_contextLostListener);
     htmlCanvas.addEventListener(
       'webglcontextlost',
       _cachedContextLostListener,
@@ -319,55 +419,73 @@ class Surface {
     _contextLost = false;
 
     if (webGLVersion != -1 && !configuration.canvasKitForceCpuOnly) {
-      final int glContext = canvasKit.GetWebGLContext(
-        htmlCanvas,
-        SkWebGLContextOptions(
-          // Default to no anti-aliasing. Paint commands can be explicitly
-          // anti-aliased by setting their `Paint` object's `antialias` property.
-          antialias: _kUsingMSAA ? 1 : 0,
-          majorVersion: webGLVersion,
-        ),
-      ).toInt();
+      int glContext = 0;
+      final SkWebGLContextOptions options = SkWebGLContextOptions(
+        // Default to no anti-aliasing. Paint commands can be explicitly
+        // anti-aliased by setting their `Paint` object's `antialias` property.
+        antialias: _kUsingMSAA ? 1 : 0,
+        majorVersion: webGLVersion.toDouble(),
+      );
+      if (useOffscreenCanvas) {
+        glContext = canvasKit.GetOffscreenWebGLContext(
+          _offscreenCanvas!,
+          options,
+        ).toInt();
+      } else {
+        glContext = canvasKit.GetWebGLContext(
+          _canvasElement!,
+          options,
+        ).toInt();
+      }
 
       _glContext = glContext;
 
       if (_glContext != 0) {
-        _grContext = canvasKit.MakeGrContext(glContext);
+        _grContext = canvasKit.MakeGrContext(glContext.toDouble());
         if (_grContext == null) {
           throw CanvasKitError('Failed to initialize CanvasKit. '
               'CanvasKit.MakeGrContext returned null.');
         }
+        if (_sampleCount == -1 || _stencilBits == -1) {
+          _initWebglParams();
+        }
         // Set the cache byte limit for this grContext, if not specified it will
         // use CanvasKit's default.
         _syncCacheBytes();
       }
     }
+  }
 
-    htmlElement.append(htmlCanvas);
+  void _initWebglParams() {
+    WebGLContext gl;
+    if (useOffscreenCanvas) {
+      gl = _offscreenCanvas!.getGlContext(webGLVersion);
+    } else {
+      gl = _canvasElement!.getGlContext(webGLVersion);
+    }
+    _sampleCount = gl.getParameter(gl.samples);
+    _stencilBits = gl.getParameter(gl.stencilBits);
   }
 
   CkSurface _createNewSurface(ui.Size size) {
-    assert(htmlCanvas != null);
+    assert(_offscreenCanvas != null || _canvasElement != null);
     if (webGLVersion == -1) {
-      return _makeSoftwareCanvasSurface(
-          htmlCanvas!, 'WebGL support not detected');
+      return _makeSoftwareCanvasSurface('WebGL support not detected');
     } else if (configuration.canvasKitForceCpuOnly) {
-      return _makeSoftwareCanvasSurface(
-          htmlCanvas!, 'CPU rendering forced by application');
+      return _makeSoftwareCanvasSurface('CPU rendering forced by application');
     } else if (_glContext == 0) {
-      return _makeSoftwareCanvasSurface(
-          htmlCanvas!, 'Failed to initialize WebGL context');
+      return _makeSoftwareCanvasSurface('Failed to initialize WebGL context');
     } else {
       final SkSurface? skSurface = canvasKit.MakeOnScreenGLSurface(
-        _grContext!,
-        size.width.ceil(),
-        size.height.ceil(),
-        SkColorSpaceSRGB,
-      );
+          _grContext!,
+          size.width.ceilToDouble(),
+          size.height.ceilToDouble(),
+          SkColorSpaceSRGB,
+          _sampleCount,
+          _stencilBits);
 
       if (skSurface == null) {
-        return _makeSoftwareCanvasSurface(
-            htmlCanvas!, 'Failed to initialize WebGL surface');
+        return _makeSoftwareCanvasSurface('Failed to initialize WebGL surface');
       }
 
       return CkSurface(skSurface, _glContext);
@@ -376,14 +494,20 @@ class Surface {
 
   static bool _didWarnAboutWebGlInitializationFailure = false;
 
-  CkSurface _makeSoftwareCanvasSurface(
-      DomCanvasElement htmlCanvas, String reason) {
+  CkSurface _makeSoftwareCanvasSurface(String reason) {
     if (!_didWarnAboutWebGlInitializationFailure) {
       printWarning('WARNING: Falling back to CPU-only rendering. $reason.');
       _didWarnAboutWebGlInitializationFailure = true;
     }
+
+    SkSurface surface;
+    if (useOffscreenCanvas) {
+      surface = canvasKit.MakeOffscreenSWCanvasSurface(_offscreenCanvas!);
+    } else {
+      surface = canvasKit.MakeSWCanvasSurface(_canvasElement!);
+    }
     return CkSurface(
-      canvasKit.MakeSWCanvasSurface(htmlCanvas),
+      surface,
       null,
     );
   }
@@ -393,16 +517,29 @@ class Surface {
     return true;
   }
 
+  @override
+  bool get isConnected => _canvasElement!.isConnected!;
+
+  @override
+  void initialize() {
+    ensureSurface();
+  }
+
+  @override
   void dispose() {
-    htmlCanvas?.removeEventListener(
+    _offscreenCanvas?.removeEventListener(
         'webglcontextlost', _cachedContextLostListener, false);
-    htmlCanvas?.removeEventListener(
+    _offscreenCanvas?.removeEventListener(
         'webglcontextrestored', _cachedContextRestoredListener, false);
     _cachedContextLostListener = null;
     _cachedContextRestoredListener = null;
-    htmlElement.remove();
     _surface?.dispose();
   }
+
+  /// Safari 15 doesn't support OffscreenCanvas at all. Safari 16 supports
+  /// OffscreenCanvas, but only with the context2d API, not WebGL.
+  static bool get offscreenCanvasSupported =>
+      browserSupportsOffscreenCanvas && !isSafari;
 }
 
 /// A Dart wrapper around Skia's CkSurface.
@@ -429,8 +566,8 @@ class CkSurface {
 
   int? get context => _glContext;
 
-  int width() => surface.width().toInt();
-  int height() => surface.height().toInt();
+  int width() => surface.width().ceil();
+  int height() => surface.height().ceil();
 
   void dispose() {
     if (_isDisposed) {
diff --git a/lib/web_ui/lib/src/engine/canvaskit/surface_factory.dart b/lib/web_ui/lib/src/engine/canvaskit/surface_factory.dart
deleted file mode 100644
index c0a1b4f3c511908de152f1347776148c8c61e663..0000000000000000000000000000000000000000
--- a/lib/web_ui/lib/src/engine/canvaskit/surface_factory.dart
+++ /dev/null
@@ -1,166 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-import 'dart:math' as math show max;
-
-import 'package:meta/meta.dart';
-
-import '../../engine.dart';
-
-/// Caches surfaces used to overlay platform views.
-class SurfaceFactory {
-  SurfaceFactory(int maximumSurfaces)
-      : maximumSurfaces = math.max(maximumSurfaces, 1) {
-    if (assertionsEnabled) {
-      if (maximumSurfaces < 1) {
-        printWarning('Attempted to create a $SurfaceFactory with '
-            '$maximumSurfaces maximum surfaces. At least 1 surface is required '
-            'for rendering.');
-      }
-      registerHotRestartListener(debugClear);
-    }
-  }
-
-  /// The lazy-initialized singleton surface factory.
-  ///
-  /// [debugClear] causes this singleton to be reinitialized.
-  static SurfaceFactory get instance =>
-      _instance ??= SurfaceFactory(configuration.canvasKitMaximumSurfaces);
-
-  /// Returns the raw (potentially uninitialized) value of the singleton.
-  ///
-  /// Useful in tests for checking the lifecycle of this class.
-  static SurfaceFactory? get debugUninitializedInstance => _instance;
-
-  // Override the current instance with a new one.
-  //
-  // This should only be used in tests.
-  static void debugSetInstance(SurfaceFactory newInstance) {
-    _instance = newInstance;
-  }
-
-  static SurfaceFactory? _instance;
-
-  /// The base surface to paint on. This is the default surface which will be
-  /// painted to. If there are no platform views, then this surface will receive
-  /// all painting commands.
-  final Surface baseSurface = Surface();
-
-  /// A surface used specifically for `Picture.toImage` calls, which can be
-  /// reused in order to avoid creating too many WebGL contexts.
-  late final Surface pictureToImageSurface = Surface();
-
-  /// The maximum number of surfaces which can be live at once.
-  final int maximumSurfaces;
-
-  /// The maximum number of assignable overlays.
-  ///
-  /// This is just `maximumSurfaces - 1` (the maximum number of surfaces minus
-  /// the required base surface).
-  int get maximumOverlays => maximumSurfaces - 1;
-
-  /// Surfaces created by this factory which are currently in use.
-  final List<Surface> _liveSurfaces = <Surface>[];
-
-  /// Surfaces created by this factory which are no longer in use. These can be
-  /// reused.
-  final List<Surface> _cache = <Surface>[];
-
-  /// The number of surfaces which have been created by this factory.
-  int get _surfaceCount => _liveSurfaces.length + _cache.length + 1;
-
-  /// The number of available overlay surfaces.
-  ///
-  /// This does not include the base surface.
-  int get numAvailableOverlays => maximumOverlays - _liveSurfaces.length;
-
-  /// The number of surfaces created by this factory. Used for testing.
-  @visibleForTesting
-  int get debugSurfaceCount => _surfaceCount;
-
-  /// Returns the number of cached surfaces.
-  ///
-  /// Useful in tests.
-  int get debugCacheSize => _cache.length;
-
-  /// Gets an overlay surface from the cache or creates a new one if it wouldn't
-  /// exceed the maximum. If there are no available surfaces, returns `null`.
-  Surface? getSurface() {
-    if (_cache.isNotEmpty) {
-      final Surface surface = _cache.removeLast();
-      _liveSurfaces.add(surface);
-      return surface;
-    } else if (debugSurfaceCount < maximumSurfaces) {
-      final Surface surface = Surface();
-      _liveSurfaces.add(surface);
-      return surface;
-    } else {
-      return null;
-    }
-  }
-
-  /// Releases all surfaces so they can be reused in the next frame.
-  ///
-  /// If a released surface is in the DOM, it is not removed. This allows the
-  /// engine to release the surfaces at the end of the frame so they are ready
-  /// to be used in the next frame, but still used for painting in the current
-  /// frame.
-  void releaseSurfaces() {
-    _cache.addAll(_liveSurfaces);
-    _liveSurfaces.clear();
-  }
-
-  /// Removes all surfaces except the base surface from the DOM.
-  ///
-  /// This is called at the beginning of the frame to prepare for painting into
-  /// the new surfaces.
-  void removeSurfacesFromDom() {
-    _cache.forEach(_removeFromDom);
-  }
-
-  // Removes [surface] from the DOM.
-  void _removeFromDom(Surface surface) {
-    surface.htmlElement.remove();
-  }
-
-  /// Signals that a surface is no longer being used. It can be reused.
-  void releaseSurface(Surface surface) {
-    assert(surface != baseSurface, 'Attempting to release the base surface');
-    assert(
-        _liveSurfaces.contains(surface),
-        'Attempting to release a Surface which '
-        'was not created by this factory');
-    surface.htmlElement.remove();
-    _liveSurfaces.remove(surface);
-    _cache.add(surface);
-  }
-
-  /// Returns [true] if [surface] is currently being used to paint content.
-  ///
-  /// The base surface always counts as live.
-  ///
-  /// If a surface is not live, then it must be in the cache and ready to be
-  /// reused.
-  bool isLive(Surface surface) {
-    if (surface == baseSurface ||
-        _liveSurfaces.contains(surface)) {
-      return true;
-    }
-    assert(_cache.contains(surface));
-    return false;
-  }
-
-  /// Dispose all surfaces created by this factory. Used in tests.
-  void debugClear() {
-    for (final Surface surface in _cache) {
-      surface.dispose();
-    }
-    for (final Surface surface in _liveSurfaces) {
-      surface.dispose();
-    }
-    baseSurface.dispose();
-    _liveSurfaces.clear();
-    _cache.clear();
-    _instance = null;
-  }
-}
diff --git a/lib/web_ui/lib/src/engine/canvaskit/text.dart b/lib/web_ui/lib/src/engine/canvaskit/text.dart
index 0828763cdb531966d2bd7e723ad4844e9328779f..4a928cb3092fbea07f9370e5fbc273088adbfd31 100644
--- a/lib/web_ui/lib/src/engine/canvaskit/text.dart
+++ b/lib/web_ui/lib/src/engine/canvaskit/text.dart
@@ -5,16 +5,18 @@
 import 'dart:typed_data';
 
 import 'package:meta/meta.dart';
+import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
-import '../safe_browser_api.dart';
-import '../util.dart';
-import 'canvaskit_api.dart';
-import 'font_fallbacks.dart';
-import 'painting.dart';
-import 'renderer.dart';
-import 'skia_object_cache.dart';
-import 'util.dart';
+final bool _ckRequiresClientICU = canvasKit.ParagraphBuilder.RequiresClientICU();
+
+final List<String> _testFonts = <String>['FlutterTest', 'Ahem'];
+String? _computeEffectiveFontFamily(String? fontFamily) {
+  return ui_web.debugEmulateFlutterTesterEnvironment && !_testFonts.contains(fontFamily)
+    ? _testFonts.first
+    : fontFamily;
+}
 
 @immutable
 class CkParagraphStyle implements ui.ParagraphStyle {
@@ -35,7 +37,7 @@ class CkParagraphStyle implements ui.ParagraphStyle {
           textAlign,
           textDirection,
           maxLines,
-          ui.debugEmulateFlutterTesterEnvironment ? 'Ahem' : fontFamily,
+          _computeEffectiveFontFamily(fontFamily),
           fontSize,
           height,
           textHeightBehavior,
@@ -45,20 +47,36 @@ class CkParagraphStyle implements ui.ParagraphStyle {
           ellipsis,
           locale,
         ),
-        _fontFamily = ui.debugEmulateFlutterTesterEnvironment ? 'Ahem' : fontFamily,
+        _textAlign = textAlign,
+        _textDirection = textDirection,
+        _fontWeight = fontWeight,
+        _fontStyle = fontStyle,
+        _maxLines = maxLines,
+        _originalFontFamily = fontFamily,
+        _effectiveFontFamily = _computeEffectiveFontFamily(fontFamily),
         _fontSize = fontSize,
         _height = height,
-        _leadingDistribution = textHeightBehavior?.leadingDistribution,
-        _fontWeight = fontWeight,
-        _fontStyle = fontStyle;
+        _textHeightBehavior = textHeightBehavior,
+        _strutStyle = strutStyle,
+        _ellipsis = ellipsis,
+        _locale = locale;
+
 
   final SkParagraphStyle skParagraphStyle;
-  final String? _fontFamily;
-  final double? _fontSize;
-  final double? _height;
+
+  final ui.TextAlign? _textAlign;
+  final ui.TextDirection? _textDirection;
   final ui.FontWeight? _fontWeight;
   final ui.FontStyle? _fontStyle;
-  final ui.TextLeadingDistribution? _leadingDistribution;
+  final int? _maxLines;
+  final String? _originalFontFamily;
+  final String? _effectiveFontFamily;
+  final double? _fontSize;
+  final double? _height;
+  final ui.TextHeightBehavior? _textHeightBehavior;
+  final ui.StrutStyle? _strutStyle;
+  final String? _ellipsis;
+  final ui.Locale? _locale;
 
   static SkTextStyleProperties toSkTextStyleProperties(
     String? fontFamily,
@@ -80,7 +98,7 @@ class CkParagraphStyle implements ui.ParagraphStyle {
       skTextStyle.heightMultiplier = height;
     }
 
-    skTextStyle.fontFamilies = _getEffectiveFontFamilies(fontFamily);
+    skTextStyle.fontFamilies = _computeCombinedFontFamilies(fontFamily);
 
     return skTextStyle;
   }
@@ -90,7 +108,7 @@ class CkParagraphStyle implements ui.ParagraphStyle {
     final CkStrutStyle style = value as CkStrutStyle;
     final SkStrutStyleProperties skStrutStyle = SkStrutStyleProperties();
     skStrutStyle.fontFamilies =
-        _getEffectiveFontFamilies(style._fontFamily, style._fontFamilyFallback);
+        _computeCombinedFontFamilies(style._fontFamily, style._fontFamilyFallback);
 
     if (style._fontSize != null) {
       skStrutStyle.fontSize = style._fontSize;
@@ -108,10 +126,8 @@ class CkParagraphStyle implements ui.ParagraphStyle {
         break;
       case ui.TextLeadingDistribution.even:
         skStrutStyle.halfLeading = true;
-        break;
       case ui.TextLeadingDistribution.proportional:
         skStrutStyle.halfLeading = false;
-        break;
     }
 
     if (style._leading != null) {
@@ -181,20 +197,108 @@ class CkParagraphStyle implements ui.ParagraphStyle {
     properties.replaceTabCharacters = true;
     properties.textStyle = toSkTextStyleProperties(
         fontFamily, fontSize, height, fontWeight, fontStyle);
+    properties.applyRoundingHack = false;
 
     return canvasKit.ParagraphStyle(properties);
   }
 
   CkTextStyle getTextStyle() {
-    return CkTextStyle(
-      fontFamily: _fontFamily,
+    return CkTextStyle._(
+      originalFontFamily: _originalFontFamily,
+      effectiveFontFamily: _effectiveFontFamily,
       fontSize: _fontSize,
       height: _height,
-      leadingDistribution: _leadingDistribution,
+      leadingDistribution: _textHeightBehavior?.leadingDistribution,
       fontWeight: _fontWeight,
       fontStyle: _fontStyle,
+
+      // Use defaults for everything else.
+      color: null,
+      decoration: null,
+      decorationColor: null,
+      decorationStyle: null,
+      decorationThickness: null,
+      textBaseline: null,
+      originalFontFamilyFallback: null,
+      effectiveFontFamilyFallback: null,
+      letterSpacing: null,
+      wordSpacing: null,
+      locale: null,
+      background: null,
+      foreground: null,
+      shadows: null,
+      fontFeatures: null,
+      fontVariations: null,
+    );
+  }
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) {
+      return true;
+    }
+    if (other.runtimeType != runtimeType) {
+      return false;
+    }
+    return other is CkParagraphStyle &&
+        other._textAlign == _textAlign &&
+        other._textDirection == _textDirection &&
+        other._fontWeight == _fontWeight &&
+        other._fontStyle == _fontStyle &&
+        other._maxLines == _maxLines &&
+        other._originalFontFamily == _originalFontFamily &&
+        // effectiveFontFamily is not compared as it's a computed value.
+        other._fontSize == _fontSize &&
+        other._height == _height &&
+        other._textHeightBehavior == _textHeightBehavior &&
+        other._strutStyle == _strutStyle &&
+        other._ellipsis == _ellipsis &&
+        other._locale == _locale;
+  }
+
+  @override
+  int get hashCode {
+    return Object.hash(
+      _textAlign,
+      _textDirection,
+      _fontWeight,
+      _fontStyle,
+      _maxLines,
+      _originalFontFamily,
+      // effectiveFontFamily is not included as it's a computed value.
+      _fontSize,
+      _height,
+      _textHeightBehavior,
+      _strutStyle,
+      _ellipsis,
+      _locale,
     );
   }
+
+  @override
+  String toString() {
+    String result = super.toString();
+    assert(() {
+      final double? fontSize = _fontSize;
+      final double? height = _height;
+      result = 'ParagraphStyle('
+          'textAlign: ${_textAlign ?? "unspecified"}, '
+          'textDirection: ${_textDirection ?? "unspecified"}, '
+          'fontWeight: ${_fontWeight ?? "unspecified"}, '
+          'fontStyle: ${_fontStyle ?? "unspecified"}, '
+          'maxLines: ${_maxLines ?? "unspecified"}, '
+          'textHeightBehavior: ${_textHeightBehavior ?? "unspecified"}, '
+          'fontFamily: ${_originalFontFamily ?? "unspecified"}, '
+          'fontSize: ${fontSize != null ? fontSize.toStringAsFixed(1) : "unspecified"}, '
+          'height: ${height != null ? "${height.toStringAsFixed(1)}x" : "unspecified"}, '
+          'strutStyle: ${_strutStyle ?? "unspecified"}, '
+          'ellipsis: ${_ellipsis != null ? '"$_ellipsis"' : "unspecified"}, '
+          'locale: ${_locale ?? "unspecified"}'
+          ')';
+      return true;
+    }());
+    return result;
+  }
 }
 
 @immutable
@@ -222,54 +326,63 @@ class CkTextStyle implements ui.TextStyle {
     List<ui.FontFeature>? fontFeatures,
     List<ui.FontVariation>? fontVariations,
   }) {
+    assert(
+      color == null || foreground == null,
+      'Cannot provide both a color and a foreground\n'
+      'The color argument is just a shorthand for "foreground: Paint()..color = color".',
+    );
     return CkTextStyle._(
-      color,
-      decoration,
-      decorationColor,
-      decorationStyle,
-      decorationThickness,
-      fontWeight,
-      fontStyle,
-      textBaseline,
-      ui.debugEmulateFlutterTesterEnvironment ? 'Ahem' : fontFamily,
-      ui.debugEmulateFlutterTesterEnvironment ? null : fontFamilyFallback,
-      fontSize,
-      letterSpacing,
-      wordSpacing,
-      height,
-      leadingDistribution,
-      locale,
-      background,
-      foreground,
-      shadows,
-      fontFeatures,
-      fontVariations,
+      color: color,
+      decoration: decoration,
+      decorationColor: decorationColor,
+      decorationStyle: decorationStyle,
+      decorationThickness: decorationThickness,
+      fontWeight: fontWeight,
+      fontStyle: fontStyle,
+      textBaseline: textBaseline,
+      originalFontFamily: fontFamily,
+      effectiveFontFamily: _computeEffectiveFontFamily(fontFamily),
+      originalFontFamilyFallback: fontFamilyFallback,
+      effectiveFontFamilyFallback: ui_web.debugEmulateFlutterTesterEnvironment ? null : fontFamilyFallback,
+      fontSize: fontSize,
+      letterSpacing: letterSpacing,
+      wordSpacing: wordSpacing,
+      height: height,
+      leadingDistribution: leadingDistribution,
+      locale: locale,
+      background: background,
+      foreground: foreground,
+      shadows: shadows,
+      fontFeatures: fontFeatures,
+      fontVariations: fontVariations,
     );
   }
 
-  CkTextStyle._(
-    this.color,
-    this.decoration,
-    this.decorationColor,
-    this.decorationStyle,
-    this.decorationThickness,
-    this.fontWeight,
-    this.fontStyle,
-    this.textBaseline,
-    this.fontFamily,
-    this.fontFamilyFallback,
-    this.fontSize,
-    this.letterSpacing,
-    this.wordSpacing,
-    this.height,
-    this.leadingDistribution,
-    this.locale,
-    this.background,
-    this.foreground,
-    this.shadows,
-    this.fontFeatures,
-    this.fontVariations,
-  );
+  CkTextStyle._({
+    required this.color,
+    required this.decoration,
+    required this.decorationColor,
+    required this.decorationStyle,
+    required this.decorationThickness,
+    required this.fontWeight,
+    required this.fontStyle,
+    required this.textBaseline,
+    required this.originalFontFamily,
+    required this.effectiveFontFamily,
+    required this.originalFontFamilyFallback,
+    required this.effectiveFontFamilyFallback,
+    required this.fontSize,
+    required this.letterSpacing,
+    required this.wordSpacing,
+    required this.height,
+    required this.leadingDistribution,
+    required this.locale,
+    required this.background,
+    required this.foreground,
+    required this.shadows,
+    required this.fontFeatures,
+    required this.fontVariations,
+  });
 
   final ui.Color? color;
   final ui.TextDecoration? decoration;
@@ -279,8 +392,10 @@ class CkTextStyle implements ui.TextStyle {
   final ui.FontWeight? fontWeight;
   final ui.FontStyle? fontStyle;
   final ui.TextBaseline? textBaseline;
-  final String? fontFamily;
-  final List<String>? fontFamilyFallback;
+  final String? originalFontFamily;
+  final String? effectiveFontFamily;
+  final List<String>? originalFontFamilyFallback;
+  final List<String>? effectiveFontFamilyFallback;
   final double? fontSize;
   final double? letterSpacing;
   final double? wordSpacing;
@@ -298,7 +413,7 @@ class CkTextStyle implements ui.TextStyle {
   /// The values in this text style are used unless [other] specifically
   /// overrides it.
   CkTextStyle mergeWith(CkTextStyle other) {
-    return CkTextStyle(
+    return CkTextStyle._(
       color: other.color ?? color,
       decoration: other.decoration ?? decoration,
       decorationColor: other.decorationColor ?? decorationColor,
@@ -307,8 +422,10 @@ class CkTextStyle implements ui.TextStyle {
       fontWeight: other.fontWeight ?? fontWeight,
       fontStyle: other.fontStyle ?? fontStyle,
       textBaseline: other.textBaseline ?? textBaseline,
-      fontFamily: other.fontFamily ?? fontFamily,
-      fontFamilyFallback: other.fontFamilyFallback ?? fontFamilyFallback,
+      originalFontFamily: other.originalFontFamily ?? originalFontFamily,
+      effectiveFontFamily: other.effectiveFontFamily ?? effectiveFontFamily,
+      originalFontFamilyFallback: other.originalFontFamilyFallback ?? originalFontFamilyFallback,
+      effectiveFontFamilyFallback: other.effectiveFontFamilyFallback ?? effectiveFontFamilyFallback,
       fontSize: other.fontSize ?? fontSize,
       letterSpacing: other.letterSpacing ?? letterSpacing,
       wordSpacing: other.wordSpacing ?? wordSpacing,
@@ -323,9 +440,9 @@ class CkTextStyle implements ui.TextStyle {
     );
   }
 
-  /// Lazy-initialized list of font families sent to Skia.
-  late final List<String> effectiveFontFamilies =
-      _getEffectiveFontFamilies(fontFamily, fontFamilyFallback);
+  /// Lazy-initialized combination of font family and font family fallback sent to Skia.
+  late final List<String> combinedFontFamilies =
+      _computeCombinedFontFamilies(effectiveFontFamily, effectiveFontFamilyFallback);
 
   /// Lazy-initialized Skia style used to pass the style to Skia.
   ///
@@ -413,17 +530,15 @@ class CkTextStyle implements ui.TextStyle {
         break;
       case ui.TextLeadingDistribution.even:
         properties.halfLeading = true;
-        break;
       case ui.TextLeadingDistribution.proportional:
         properties.halfLeading = false;
-        break;
     }
 
     if (locale != null) {
       properties.locale = locale.toLanguageTag();
     }
 
-    properties.fontFamilies = effectiveFontFamilies;
+    properties.fontFamilies = combinedFontFamilies;
 
     if (fontWeight != null || fontStyle != null) {
       properties.fontStyle = toSkFontStyle(fontWeight, fontStyle);
@@ -469,6 +584,104 @@ class CkTextStyle implements ui.TextStyle {
 
     return canvasKit.TextStyle(properties);
   }();
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) {
+      return true;
+    }
+    return other is CkTextStyle
+        && other.color == color
+        && other.decoration == decoration
+        && other.decorationColor == decorationColor
+        && other.decorationStyle == decorationStyle
+        && other.fontWeight == fontWeight
+        && other.fontStyle == fontStyle
+        && other.textBaseline == textBaseline
+        && other.leadingDistribution == leadingDistribution
+        && other.originalFontFamily == originalFontFamily
+        && other.fontSize == fontSize
+        && other.letterSpacing == letterSpacing
+        && other.wordSpacing == wordSpacing
+        && other.height == height
+        && other.decorationThickness == decorationThickness
+        && other.locale == locale
+        && other.background == background
+        && other.foreground == foreground
+        && listEquals<ui.Shadow>(other.shadows, shadows)
+        && listEquals<String>(other.originalFontFamilyFallback, originalFontFamilyFallback)
+        && listEquals<ui.FontFeature>(other.fontFeatures, fontFeatures)
+        && listEquals<ui.FontVariation>(other.fontVariations, fontVariations);
+  }
+
+  @override
+  int get hashCode {
+    final List<ui.Shadow>? shadows = this.shadows;
+    final List<ui.FontFeature>? fontFeatures = this.fontFeatures;
+    final List<ui.FontVariation>? fontVariations = this.fontVariations;
+    final List<String>? fontFamilyFallback = originalFontFamilyFallback;
+    return Object.hash(
+      color,
+      decoration,
+      decorationColor,
+      decorationStyle,
+      fontWeight,
+      fontStyle,
+      textBaseline,
+      leadingDistribution,
+      originalFontFamily,
+      fontFamilyFallback == null ? null : Object.hashAll(fontFamilyFallback),
+      fontSize,
+      letterSpacing,
+      wordSpacing,
+      height,
+      locale,
+      background,
+      foreground,
+      shadows == null ? null : Object.hashAll(shadows),
+      decorationThickness,
+      // Object.hash goes up to 20 arguments, but we have 21
+      Object.hash(
+        fontFeatures == null ? null : Object.hashAll(fontFeatures),
+        fontVariations == null ? null : Object.hashAll(fontVariations),
+      )
+    );
+  }
+
+  @override
+  String toString() {
+    String result = super.toString();
+    assert(() {
+      final List<String>? fontFamilyFallback = originalFontFamilyFallback;
+      final double? fontSize = this.fontSize;
+      final double? height = this.height;
+      result = 'TextStyle('
+          'color: ${color ?? "unspecified"}, '
+          'decoration: ${decoration ?? "unspecified"}, '
+          'decorationColor: ${decorationColor ?? "unspecified"}, '
+          'decorationStyle: ${decorationStyle ?? "unspecified"}, '
+          'decorationThickness: ${decorationThickness ?? "unspecified"}, '
+          'fontWeight: ${fontWeight ?? "unspecified"}, '
+          'fontStyle: ${fontStyle ?? "unspecified"}, '
+          'textBaseline: ${textBaseline ?? "unspecified"}, '
+          'fontFamily: ${originalFontFamily ?? "unspecified"}, '
+          'fontFamilyFallback: ${fontFamilyFallback != null && fontFamilyFallback.isNotEmpty ? fontFamilyFallback : "unspecified"}, '
+          'fontSize: ${fontSize != null ? fontSize.toStringAsFixed(1) : "unspecified"}, '
+          'letterSpacing: ${letterSpacing != null ? "${letterSpacing}x" : "unspecified"}, '
+          'wordSpacing: ${wordSpacing != null ? "${wordSpacing}x" : "unspecified"}, '
+          'height: ${height != null ? "${height.toStringAsFixed(1)}x" : "unspecified"}, '
+          'leadingDistribution: ${leadingDistribution ?? "unspecified"}, '
+          'locale: ${locale ?? "unspecified"}, '
+          'background: ${background ?? "unspecified"}, '
+          'foreground: ${foreground ?? "unspecified"}, '
+          'shadows: ${shadows ?? "unspecified"}, '
+          'fontFeatures: ${fontFeatures ?? "unspecified"}, '
+          'fontVariations: ${fontVariations ?? "unspecified"}'
+          ')';
+      return true;
+    }());
+    return result;
+  }
 }
 
 class CkStrutStyle implements ui.StrutStyle {
@@ -483,8 +696,8 @@ class CkStrutStyle implements ui.StrutStyle {
     ui.FontWeight? fontWeight,
     ui.FontStyle? fontStyle,
     bool? forceStrutHeight,
-  })  : _fontFamily = ui.debugEmulateFlutterTesterEnvironment ? 'Ahem' : fontFamily,
-        _fontFamilyFallback = ui.debugEmulateFlutterTesterEnvironment ? null : fontFamilyFallback,
+  })  : _fontFamily = _computeEffectiveFontFamily(fontFamily),
+        _fontFamilyFallback = ui_web.debugEmulateFlutterTesterEnvironment ? null : fontFamilyFallback,
         _fontSize = fontSize,
         _height = height,
         _leadingDistribution = leadingDistribution,
@@ -521,9 +734,11 @@ class CkStrutStyle implements ui.StrutStyle {
   }
 
   @override
-  int get hashCode => Object.hash(
+  int get hashCode {
+    final List<String>? fontFamilyFallback = _fontFamilyFallback;
+    return Object.hash(
         _fontFamily,
-        _fontFamilyFallback,
+        fontFamilyFallback != null ? Object.hashAll(fontFamilyFallback) : null,
         _fontSize,
         _height,
         _leading,
@@ -532,6 +747,7 @@ class CkStrutStyle implements ui.StrutStyle {
         _fontStyle,
         _forceStrutHeight,
       );
+  }
 }
 
 SkFontStyle toSkFontStyle(ui.FontWeight? fontWeight, ui.FontStyle? fontStyle) {
@@ -546,143 +762,27 @@ SkFontStyle toSkFontStyle(ui.FontWeight? fontWeight, ui.FontStyle? fontStyle) {
 }
 
 /// The CanvasKit implementation of [ui.Paragraph].
-///
-/// This class does not use [ManagedSkiaObject] because it requires that its
-/// memory is reclaimed synchronously. This protects our memory usage from
-/// blowing up if within a single frame the framework needs to layout a lot of
-/// paragraphs. One common use-case is `ListView.builder`, which needs to layout
-/// more of its content than it actually renders to compute the scroll position.
-/// More generally, this protects from the pattern of laying out a lot of text
-/// while painting a small subset of it. To achieve this a
-/// [SynchronousSkiaObjectCache] is used that limits the number of live laid out
-/// paragraphs at any point in time within or outside the frame.
-class CkParagraph extends SkiaObject<SkParagraph> implements ui.Paragraph {
-  CkParagraph(this._skParagraph, this._paragraphStyle, this._paragraphCommands);
-
-  /// The result of calling `build()` on the JS CkParagraphBuilder.
-  ///
-  /// This may be invalidated later.
-  SkParagraph? _skParagraph;
+class CkParagraph implements ui.Paragraph {
+  CkParagraph(SkParagraph skParagraph, this._paragraphStyle) {
+    _ref = UniqueRef<SkParagraph>(this, skParagraph, 'Paragraph');
+  }
 
-  /// The paragraph style used to build this paragraph.
-  ///
-  /// This is used to resurrect the paragraph if the initial paragraph
-  /// is deleted.
-  final CkParagraphStyle _paragraphStyle;
+  late final UniqueRef<SkParagraph> _ref;
 
-  /// The paragraph builder commands used to build this paragraph.
-  ///
-  /// This is used to resurrect the paragraph if the initial paragraph
-  /// is deleted.
-  final List<_ParagraphCommand> _paragraphCommands;
+  SkParagraph get skiaObject => _ref.nativeObject;
 
   /// The constraints from the last time we laid the paragraph out.
   ///
   /// This is used to resurrect the paragraph if the initial paragraph
   /// is deleted.
-  ui.ParagraphConstraints? _lastLayoutConstraints;
-
-  @override
-  SkParagraph get skiaObject => _ensureInitialized(_lastLayoutConstraints!);
-
-  SkParagraph _ensureInitialized(ui.ParagraphConstraints constraints) {
-    SkParagraph? paragraph = _skParagraph;
-
-    // Paragraph objects are immutable. It's OK to skip initialization and reuse
-    // existing object.
-    bool didRebuildSkiaObject = false;
-    if (paragraph == null) {
-      final CkParagraphBuilder builder = CkParagraphBuilder(_paragraphStyle);
-      for (final _ParagraphCommand command in _paragraphCommands) {
-        switch (command.type) {
-          case _ParagraphCommandType.addText:
-            builder.addText(command.text!);
-            break;
-          case _ParagraphCommandType.pop:
-            builder.pop();
-            break;
-          case _ParagraphCommandType.pushStyle:
-            builder.pushStyle(command.style!);
-            break;
-          case _ParagraphCommandType.addPlaceholder:
-            builder._addPlaceholder(command.placeholderStyle!);
-            break;
-        }
-      }
-      paragraph = builder._buildSkParagraph();
-      _skParagraph = paragraph;
-      didRebuildSkiaObject = true;
-    }
-
-    final bool constraintsChanged = _lastLayoutConstraints != constraints;
-    if (didRebuildSkiaObject || constraintsChanged) {
-      _lastLayoutConstraints = constraints;
-      // TODO(het): CanvasKit throws an exception when laid out with
-      // a font that wasn't registered.
-      try {
-        paragraph.layout(constraints.width);
-        _alphabeticBaseline = paragraph.getAlphabeticBaseline();
-        _didExceedMaxLines = paragraph.didExceedMaxLines();
-        _height = paragraph.getHeight();
-        _ideographicBaseline = paragraph.getIdeographicBaseline();
-        _longestLine = paragraph.getLongestLine();
-        _maxIntrinsicWidth = paragraph.getMaxIntrinsicWidth();
-        _minIntrinsicWidth = paragraph.getMinIntrinsicWidth();
-        _width = paragraph.getMaxWidth();
-        _boxesForPlaceholders =
-            skRectsToTextBoxes(
-                paragraph.getRectsForPlaceholders().cast<Float32List>());
-      } catch (e) {
-        printWarning('CanvasKit threw an exception while laying '
-            'out the paragraph. The font was "${_paragraphStyle._fontFamily}". '
-            'Exception:\n$e');
-        rethrow;
-      }
-    }
-
-    return paragraph;
-  }
+  double _lastLayoutConstraints = double.negativeInfinity;
 
-  // Caches laid out paragraphs and synchronously reclaims memory if there's
-  // memory pressure.
-  //
-  // On May 26, 2021, 500 seemed like a reasonable number to pick for the cache
-  // size. At the time a single laid out SkParagraph used 100KB of memory. So,
-  // 500 items in the cache is roughly 50MB of memory, which is not too high,
-  // while at the same time enough for most use-cases.
-  //
-  // TODO(yjbanov): this strategy is not sufficient for the use-case where a
-  //                lot of paragraphs are laid out _and_ rendered. To support
-  //                this use-case without blowing up memory usage we need this:
-  //                https://github.com/flutter/flutter/issues/81224
-  static final SynchronousSkiaObjectCache _paragraphCache =
-      SynchronousSkiaObjectCache(500);
-
-  /// Marks this paragraph as having been used this frame.
+  /// The paragraph style used to build this paragraph.
   ///
-  /// Puts this paragraph in a [SynchronousSkiaObjectCache], which will delete it
-  /// if there's memory pressure to do so. This protects our memory usage from
-  /// blowing up if within a single frame the framework needs to layout a lot of
-  /// paragraphs. One common use-case is `ListView.builder`, which needs to layout
-  /// more of its content than it actually renders to compute the scroll position.
-  void markUsed() {
-    // If the paragraph is already in the cache, just mark it as most recently
-    // used. Otherwise, add to cache.
-    if (!_paragraphCache.markUsed(this)) {
-      _paragraphCache.add(this);
-    }
-  }
-
-  @override
-  void delete() {
-    _skParagraph?.delete();
-    _skParagraph = null;
-  }
+  /// This is used to resurrect the paragraph if the initial paragraph
+  /// is deleted.
+  final CkParagraphStyle _paragraphStyle;
 
-  @override
-  void didDelete() {
-    _skParagraph = null;
-  }
 
   @override
   double get alphabeticBaseline => _alphabeticBaseline;
@@ -727,28 +827,29 @@ class CkParagraph extends SkiaObject<SkParagraph> implements ui.Paragraph {
     ui.BoxHeightStyle boxHeightStyle = ui.BoxHeightStyle.tight,
     ui.BoxWidthStyle boxWidthStyle = ui.BoxWidthStyle.tight,
   }) {
+    assert(!_disposed, 'Paragraph has been disposed.');
     if (start < 0 || end < 0) {
       return const <ui.TextBox>[];
     }
 
-    final SkParagraph paragraph = _ensureInitialized(_lastLayoutConstraints!);
-    final List<Float32List> skRects = paragraph.getRectsForRange(
-      start,
-      end,
+    final List<SkRectWithDirection> skRects = skiaObject.getRectsForRange(
+      start.toDouble(),
+      end.toDouble(),
       toSkRectHeightStyle(boxHeightStyle),
       toSkRectWidthStyle(boxWidthStyle),
-    ).cast<Float32List>();
+    );
 
     return skRectsToTextBoxes(skRects);
   }
 
-  List<ui.TextBox> skRectsToTextBoxes(List<Float32List> skRects) {
+  List<ui.TextBox> skRectsToTextBoxes(List<SkRectWithDirection> skRects) {
+    assert(!_disposed, 'Paragraph has been disposed.');
     final List<ui.TextBox> result = <ui.TextBox>[];
 
     for (int i = 0; i < skRects.length; i++) {
-      final Float32List rect = skRects[i];
-      final int skTextDirection =
-          getJsProperty(getJsProperty(rect, 'direction'), 'value');
+      final SkRectWithDirection skRect = skRects[i];
+      final Float32List rect = skRect.rect;
+      final int skTextDirection = skRect.dir.value.toInt();
       result.add(ui.TextBox.fromLTRBD(
         rect[0],
         rect[1],
@@ -763,48 +864,78 @@ class CkParagraph extends SkiaObject<SkParagraph> implements ui.Paragraph {
 
   @override
   ui.TextPosition getPositionForOffset(ui.Offset offset) {
-    final SkParagraph paragraph = _ensureInitialized(_lastLayoutConstraints!);
-    final SkTextPosition positionWithAffinity =
-        paragraph.getGlyphPositionAtCoordinate(
+    assert(!_disposed, 'Paragraph has been disposed.');
+    final SkTextPosition positionWithAffinity = skiaObject.getGlyphPositionAtCoordinate(
       offset.dx,
       offset.dy,
     );
     return fromPositionWithAffinity(positionWithAffinity);
   }
 
+  @override
+  ui.GlyphInfo? getClosestGlyphInfoForOffset(ui.Offset offset) {
+    assert(!_disposed, 'Paragraph has been disposed.');
+    return skiaObject.getClosestGlyphInfoAt(offset.dx, offset.dy);
+  }
+
+  @override
+  ui.GlyphInfo? getGlyphInfoAt(int codeUnitOffset) {
+    assert(!_disposed, 'Paragraph has been disposed.');
+    return skiaObject.getGlyphInfoAt(codeUnitOffset.toDouble());
+  }
+
   @override
   ui.TextRange getWordBoundary(ui.TextPosition position) {
-    final SkParagraph paragraph = _ensureInitialized(_lastLayoutConstraints!);
+    assert(!_disposed, 'Paragraph has been disposed.');
     final int characterPosition;
     switch (position.affinity) {
       case ui.TextAffinity.upstream:
         characterPosition = position.offset - 1;
-        break;
       case ui.TextAffinity.downstream:
         characterPosition = position.offset;
-        break;
     }
-    final SkTextRange skRange = paragraph.getWordBoundary(characterPosition);
+    final SkTextRange skRange = skiaObject.getWordBoundary(characterPosition.toDouble());
     return ui.TextRange(start: skRange.start.toInt(), end: skRange.end.toInt());
   }
 
   @override
   void layout(ui.ParagraphConstraints constraints) {
-    if (_lastLayoutConstraints == constraints) {
+    assert(!_disposed, 'Paragraph has been disposed.');
+    if (_lastLayoutConstraints == constraints.width) {
       return;
     }
-    _ensureInitialized(constraints);
 
-    // See class-level and _paragraphCache doc comments for why we're releasing
-    // the paragraph immediately after layout.
-    markUsed();
+    _lastLayoutConstraints = constraints.width;
+
+    // TODO(het): CanvasKit throws an exception when laid out with
+    // a font that wasn't registered.
+    try {
+      final SkParagraph paragraph = skiaObject;
+      paragraph.layout(constraints.width);
+      _alphabeticBaseline = paragraph.getAlphabeticBaseline();
+      _didExceedMaxLines = paragraph.didExceedMaxLines();
+      _height = paragraph.getHeight();
+      _ideographicBaseline = paragraph.getIdeographicBaseline();
+      _longestLine = paragraph.getLongestLine();
+      _maxIntrinsicWidth = paragraph.getMaxIntrinsicWidth();
+      _minIntrinsicWidth = paragraph.getMinIntrinsicWidth();
+      _width = paragraph.getMaxWidth();
+      _boxesForPlaceholders =
+          skRectsToTextBoxes(paragraph.getRectsForPlaceholders());
+    } catch (e) {
+      printWarning(
+        'CanvasKit threw an exception while laying '
+        'out the paragraph. The font was "${_paragraphStyle._originalFontFamily}". '
+        'Exception:\n$e',
+      );
+      rethrow;
+    }
   }
 
   @override
   ui.TextRange getLineBoundary(ui.TextPosition position) {
-    final SkParagraph paragraph = _ensureInitialized(_lastLayoutConstraints!);
-    final List<SkLineMetrics> metrics =
-        paragraph.getLineMetrics().cast<SkLineMetrics>();
+    assert(!_disposed, 'Paragraph has been disposed.');
+    final List<SkLineMetrics> metrics = skiaObject.getLineMetrics();
     final int offset = position.offset;
     for (final SkLineMetrics metric in metrics) {
       if (offset >= metric.startIndex && offset <= metric.endIndex) {
@@ -816,9 +947,8 @@ class CkParagraph extends SkiaObject<SkParagraph> implements ui.Paragraph {
 
   @override
   List<ui.LineMetrics> computeLineMetrics() {
-    final SkParagraph paragraph = _ensureInitialized(_lastLayoutConstraints!);
-    final List<SkLineMetrics> skLineMetrics =
-        paragraph.getLineMetrics().cast<SkLineMetrics>();
+    assert(!_disposed, 'Paragraph has been disposed.');
+    final List<SkLineMetrics> skLineMetrics = skiaObject.getLineMetrics();
     final List<ui.LineMetrics> result = <ui.LineMetrics>[];
     for (final SkLineMetrics metric in skLineMetrics) {
       result.add(CkLineMetrics._(metric));
@@ -826,20 +956,47 @@ class CkParagraph extends SkiaObject<SkParagraph> implements ui.Paragraph {
     return result;
   }
 
+  @override
+  ui.LineMetrics? getLineMetricsAt(int lineNumber) {
+    assert(!_disposed, 'Paragraph has been disposed.');
+    final SkLineMetrics? metrics = skiaObject.getLineMetricsAt(lineNumber.toDouble());
+    return metrics == null ? null : CkLineMetrics._(metrics);
+  }
+
+  @override
+  int get numberOfLines {
+    assert(!_disposed, 'Paragraph has been disposed.');
+    return skiaObject.getNumberOfLines().toInt();
+  }
+
+  @override
+  int? getLineNumberAt(int codeUnitOffset) {
+    assert(!_disposed, 'Paragraph has been disposed.');
+    final int lineNumber = skiaObject.getLineNumberAt(codeUnitOffset.toDouble()).toInt();
+    return lineNumber >= 0 ? lineNumber : null;
+  }
+
   bool _disposed = false;
 
   @override
   void dispose() {
-    delete();
-    didDelete();
+    assert(!_disposed, 'Paragraph has been disposed.');
+    _ref.dispose();
     _disposed = true;
   }
 
   @override
   bool get debugDisposed {
-    if (assertionsEnabled) {
-      return _disposed;
+    bool? result;
+    assert(() {
+      result = _disposed;
+      return true;
+    }());
+
+    if (result != null) {
+      return result!;
     }
+
     throw StateError('Paragraph.debugDisposed is only available when asserts are enabled.');
   }
 }
@@ -881,21 +1038,19 @@ class CkLineMetrics implements ui.LineMetrics {
 
 class CkParagraphBuilder implements ui.ParagraphBuilder {
   CkParagraphBuilder(ui.ParagraphStyle style)
-      : _commands = <_ParagraphCommand>[],
-        _style = style as CkParagraphStyle,
+      : _style = style as CkParagraphStyle,
         _placeholderCount = 0,
         _placeholderScales = <double>[],
         _styleStack = <CkTextStyle>[],
-        _paragraphBuilder = canvasKit.ParagraphBuilder.MakeFromFontProvider(
+        _paragraphBuilder = canvasKit.ParagraphBuilder.MakeFromFontCollection(
           style.skParagraphStyle,
-          CanvasKitRenderer.instance.fontCollection.fontProvider,
+          CanvasKitRenderer.instance.fontCollection.skFontCollection,
         ) {
     _styleStack.add(_style.getTextStyle());
   }
 
   final SkParagraphBuilder _paragraphBuilder;
   final CkParagraphStyle _style;
-  final List<_ParagraphCommand> _commands;
   int _placeholderCount;
   final List<double> _placeholderScales;
   final List<CkTextStyle> _styleStack;
@@ -927,7 +1082,6 @@ class CkParagraphBuilder implements ui.ParagraphBuilder {
   }
 
   void _addPlaceholder(_CkParagraphPlaceholder placeholderStyle) {
-    _commands.add(_ParagraphCommand.addPlaceholder(placeholderStyle));
     _paragraphBuilder.addPlaceholder(
       placeholderStyle.width,
       placeholderStyle.height,
@@ -958,25 +1112,27 @@ class CkParagraphBuilder implements ui.ParagraphBuilder {
   void addText(String text) {
     final List<String> fontFamilies = <String>[];
     final CkTextStyle style = _peekStyle();
-    if (style.fontFamily != null) {
-      fontFamilies.add(style.fontFamily!);
+    if (style.effectiveFontFamily != null) {
+      fontFamilies.add(style.effectiveFontFamily!);
     }
-    if (style.fontFamilyFallback != null) {
-      fontFamilies.addAll(style.fontFamilyFallback!);
+    if (style.effectiveFontFamilyFallback != null) {
+      fontFamilies.addAll(style.effectiveFontFamilyFallback!);
     }
-    FontFallbackData.instance.ensureFontsSupportText(text, fontFamilies);
-    _commands.add(_ParagraphCommand.addText(text));
+    renderer.fontCollection.fontFallbackManager!.ensureFontsSupportText(text, fontFamilies);
     _paragraphBuilder.addText(text);
   }
 
   @override
   CkParagraph build() {
     final SkParagraph builtParagraph = _buildSkParagraph();
-    return CkParagraph(builtParagraph, _style, _commands);
+    return CkParagraph(builtParagraph, _style);
   }
 
   /// Builds the CkParagraph with the builder and deletes the builder.
   SkParagraph _buildSkParagraph() {
+    if (_ckRequiresClientICU) {
+      injectClientICU(_paragraphBuilder);
+    }
     final SkParagraph result = _paragraphBuilder.build();
     _paragraphBuilder.delete();
     return result;
@@ -992,15 +1148,15 @@ class CkParagraphBuilder implements ui.ParagraphBuilder {
   void pop() {
     if (_styleStack.length <= 1) {
       // The top-level text style is paragraph-level. We don't pop it off.
-      if (assertionsEnabled) {
+      assert(() {
         printWarning(
           'Cannot pop text style in ParagraphBuilder. '
           'Already popped all text styles from the style stack.',
         );
-      }
+        return true;
+      }());
       return;
     }
-    _commands.add(const _ParagraphCommand.pop());
     _styleStack.removeLast();
     _paragraphBuilder.pop();
   }
@@ -1027,12 +1183,11 @@ class CkParagraphBuilder implements ui.ParagraphBuilder {
     final CkTextStyle ckStyle = style as CkTextStyle;
     final CkTextStyle skStyle = baseStyle.mergeWith(ckStyle);
     _styleStack.add(skStyle);
-    _commands.add(_ParagraphCommand.pushStyle(ckStyle));
     if (skStyle.foreground != null || skStyle.background != null) {
       SkPaint? foreground = skStyle.foreground?.skiaObject;
       if (foreground == null) {
         _defaultTextForeground.setColorInt(
-          skStyle.color?.value ?? 0xFF000000,
+          (skStyle.color?.value ?? 0xFF000000).toDouble(),
         );
         foreground = _defaultTextForeground;
       }
@@ -1063,42 +1218,7 @@ class _CkParagraphPlaceholder {
   final double offset;
 }
 
-class _ParagraphCommand {
-  const _ParagraphCommand._(
-    this.type,
-    this.text,
-    this.style,
-    this.placeholderStyle,
-  );
-
-  const _ParagraphCommand.addText(String text)
-      : this._(_ParagraphCommandType.addText, text, null, null);
-
-  const _ParagraphCommand.pop()
-      : this._(_ParagraphCommandType.pop, null, null, null);
-
-  const _ParagraphCommand.pushStyle(CkTextStyle style)
-      : this._(_ParagraphCommandType.pushStyle, null, style, null);
-
-  const _ParagraphCommand.addPlaceholder(
-      _CkParagraphPlaceholder placeholderStyle)
-      : this._(
-            _ParagraphCommandType.addPlaceholder, null, null, placeholderStyle);
-
-  final _ParagraphCommandType type;
-  final String? text;
-  final CkTextStyle? style;
-  final _CkParagraphPlaceholder? placeholderStyle;
-}
-
-enum _ParagraphCommandType {
-  addText,
-  pop,
-  pushStyle,
-  addPlaceholder,
-}
-
-List<String> _getEffectiveFontFamilies(String? fontFamily,
+List<String> _computeCombinedFontFamilies(String? fontFamily,
     [List<String>? fontFamilyFallback]) {
   final List<String> fontFamilies = <String>[];
   if (fontFamily != null) {
@@ -1108,6 +1228,8 @@ List<String> _getEffectiveFontFamilies(String? fontFamily,
       !fontFamilyFallback.every((String font) => fontFamily == font)) {
     fontFamilies.addAll(fontFamilyFallback);
   }
-  fontFamilies.addAll(FontFallbackData.instance.globalFontFallbacks);
+  fontFamilies.addAll(
+    renderer.fontCollection.fontFallbackManager!.globalFontFallbacks
+  );
   return fontFamilies;
 }
diff --git a/lib/web_ui/lib/src/engine/canvaskit/text_fragmenter.dart b/lib/web_ui/lib/src/engine/canvaskit/text_fragmenter.dart
new file mode 100644
index 0000000000000000000000000000000000000000..a762d769cc61b580cd59703e89455c1b7508c12f
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/canvaskit/text_fragmenter.dart
@@ -0,0 +1,175 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:js_interop';
+import 'dart:typed_data';
+
+import '../dom.dart';
+import '../text/line_breaker.dart';
+import '../util.dart';
+import 'canvaskit_api.dart';
+
+typedef SegmentationResult = ({
+  Uint32List words,
+  Uint32List graphemes,
+  Uint32List breaks,
+});
+
+// The cache numbers below were picked based on the following logic.
+//
+// Most paragraphs in an app are small (e.g. icons, button labels, etc). These
+// paragraphs are also cheap to cache. So we cache a lot of them. 100,000 of
+// them amounts to a worst case of 5MB (10-character long text + words uint list
+// + graphemes uint list + breaks uint list).
+//
+// Large paragraphs are less common (a handful per page), but are expensive to
+// cache. So we cache fewer of them. 20 of them at a length of 50,000 characters
+// amount to a memory usage of 5MB (50,000-character long text + words uint list
+// + graphemes uint list + breaks uint list).
+//
+// Medium paragraphs are somewhere in between. 10,000 of them amount to a worst
+// case of 5MB (100-character long text + words uint list + graphemes uint list
+// + breaks uint list).
+
+typedef SegmentationCacheSpec = ({int cacheSize, int maxTextLength});
+
+const SegmentationCacheSpec kSmallParagraphCacheSpec = (cacheSize: 100000, maxTextLength: 10);
+const SegmentationCacheSpec kMediumParagraphCacheSpec = (cacheSize: 10000, maxTextLength: 100);
+const SegmentationCacheSpec kLargeParagraphCacheSpec = (cacheSize: 20, maxTextLength: 50000);
+
+typedef SegmentationCache = ({
+  LruCache<String, SegmentationResult> small,
+  LruCache<String, SegmentationResult> medium,
+  LruCache<String, SegmentationResult> large,
+});
+
+/// Caches segmentation results for small, medium and large paragraphts.
+///
+/// Paragraphs are frequently re-created because of style or font changes, while
+/// their text contents remain the same. This cache is effective at
+/// short-circuiting the segmentation of such paragraphs.
+final SegmentationCache segmentationCache = (
+  small: LruCache<String, SegmentationResult>(kSmallParagraphCacheSpec.cacheSize),
+  medium: LruCache<String, SegmentationResult>(kMediumParagraphCacheSpec.cacheSize),
+  large: LruCache<String, SegmentationResult>(kLargeParagraphCacheSpec.cacheSize),
+);
+
+extension SegmentationCacheExtensions on SegmentationCache {
+  /// Gets the appropriate cache for the given [text].
+  LruCache<String, SegmentationResult>? getCacheForText(String text) {
+    if (text.length <= kSmallParagraphCacheSpec.maxTextLength) {
+      return small;
+    }
+    if (text.length <= kMediumParagraphCacheSpec.maxTextLength) {
+      return medium;
+    }
+    if (text.length <= kLargeParagraphCacheSpec.maxTextLength) {
+      return large;
+    }
+    return null;
+  }
+
+  /// Clears all the caches.
+  void clear() {
+    small.clear();
+    medium.clear();
+    large.clear();
+  }
+}
+
+/// Injects required ICU data into the [builder].
+///
+/// This should only be used with the CanvasKit Chromium variant that's compiled
+/// without ICU data.
+void injectClientICU(SkParagraphBuilder builder) {
+  assert(
+    canvasKit.ParagraphBuilder.RequiresClientICU(),
+    'This method should only be used with the CanvasKit Chromium variant.',
+  );
+
+  final SegmentationResult result = segmentText(builder.getText());
+  builder.setWordsUtf16(result.words);
+  builder.setGraphemeBreaksUtf16(result.graphemes);
+  builder.setLineBreaksUtf16(result.breaks);
+}
+
+/// Segments the [text] into words, graphemes and line breaks.
+///
+/// Caches results in [segmentationCache].
+SegmentationResult segmentText(String text) {
+  final LruCache<String, SegmentationResult>? cache = segmentationCache.getCacheForText(text);
+  final SegmentationResult? cachedResult = cache?[text];
+
+  final SegmentationResult result;
+  if (cachedResult != null) {
+    result = cachedResult;
+  } else {
+    result = (
+      words: fragmentUsingIntlSegmenter(text, IntlSegmenterGranularity.word),
+      graphemes: fragmentUsingIntlSegmenter(text, IntlSegmenterGranularity.grapheme),
+      breaks: fragmentUsingV8LineBreaker(text),
+    );
+  }
+
+  // Save or promote to most recently used.
+  cache?.cache(text, result);
+  return result;
+}
+
+/// The granularity at which to segment text.
+///
+/// To find all supported granularities, see:
+/// - https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/Segmenter/Segmenter
+enum IntlSegmenterGranularity {
+  grapheme,
+  word,
+}
+
+final Map<IntlSegmenterGranularity, DomSegmenter> _intlSegmenters = <IntlSegmenterGranularity, DomSegmenter>{
+  IntlSegmenterGranularity.grapheme: createIntlSegmenter(granularity: 'grapheme'),
+  IntlSegmenterGranularity.word: createIntlSegmenter(granularity: 'word'),
+};
+
+Uint32List fragmentUsingIntlSegmenter(
+  String text,
+  IntlSegmenterGranularity granularity,
+) {
+  final DomSegmenter segmenter = _intlSegmenters[granularity]!;
+  final DomIteratorWrapper<DomSegment> iterator = segmenter.segment(text).iterator();
+
+  final List<int> breaks = <int>[];
+  while (iterator.moveNext()) {
+    breaks.add(iterator.current.index);
+  }
+  breaks.add(text.length);
+  return Uint32List.fromList(breaks);
+}
+
+// These are the soft/hard line break values expected by Skia's SkParagraph.
+const int _kSoftLineBreak = 0;
+const int _kHardLineBreak = 1;
+
+final DomV8BreakIterator _v8LineBreaker = createV8BreakIterator();
+
+Uint32List fragmentUsingV8LineBreaker(String text) {
+  final List<LineBreakFragment> fragments =
+      breakLinesUsingV8BreakIterator(text, text.toJS, _v8LineBreaker);
+
+  final int size = (fragments.length + 1) * 2;
+  final Uint32List typedArray = Uint32List(size);
+
+  typedArray[0] = 0; // start index
+  typedArray[1] = _kSoftLineBreak; // break type
+
+  for (int i = 0; i < fragments.length; i++) {
+    final LineBreakFragment fragment = fragments[i];
+    final int uint32Index = 2 + i * 2;
+    typedArray[uint32Index] = fragment.end;
+    typedArray[uint32Index + 1] = fragment.type == LineBreakType.mandatory
+        ? _kHardLineBreak
+        : _kSoftLineBreak;
+  }
+
+  return typedArray;
+}
diff --git a/lib/web_ui/lib/src/engine/canvaskit/util.dart b/lib/web_ui/lib/src/engine/canvaskit/util.dart
index b1906dac741e9a10c1032d5141308a47cabc8933..2b2e646dd117b63f34ea4c25f49f84314c7b3dfb 100644
--- a/lib/web_ui/lib/src/engine/canvaskit/util.dart
+++ b/lib/web_ui/lib/src/engine/canvaskit/util.dart
@@ -7,7 +7,6 @@ import 'dart:typed_data';
 
 import 'package:ui/ui.dart' as ui;
 
-import '../util.dart';
 import '../vector_math.dart';
 import 'canvaskit_api.dart';
 import 'path.dart';
@@ -74,10 +73,10 @@ class SkiaShadowFlags {
 // material spec.
 const double ckShadowAmbientAlpha = 0.039;
 const double ckShadowSpotAlpha = 0.25;
-const double ckShadowLightRadius = 1.1;
-const double ckShadowLightHeight = 600.0;
 const double ckShadowLightXOffset = 0;
 const double ckShadowLightYOffset = -450;
+const double ckShadowLightHeight = 600;
+const double ckShadowLightRadius = 800;
 const double ckShadowLightXTangent = ckShadowLightXOffset / ckShadowLightHeight;
 const double ckShadowLightYTangent = ckShadowLightYOffset / ckShadowLightHeight;
 
@@ -109,7 +108,7 @@ ui.Rect computeSkShadowBounds(
   // one matrix inverse.
   final bool isComplex = !matrix.isIdentityOrTranslation();
   if (isComplex) {
-    pathBounds = transformRect(matrix, pathBounds);
+    pathBounds = matrix.transformRect(pathBounds);
   }
 
   double left = pathBounds.left;
@@ -135,7 +134,7 @@ ui.Rect computeSkShadowBounds(
     final Matrix4 inverse = Matrix4.zero();
     // The inverse only makes sense if the determinat is non-zero.
     if (inverse.copyInverse(matrix) != 0.0) {
-      return transformRect(inverse, shadowBounds);
+      return inverse.transformRect(shadowBounds);
     } else {
       return shadowBounds;
     }
@@ -162,13 +161,15 @@ void drawSkShadow(
   bool transparentOccluder,
   double devicePixelRatio,
 ) {
-  final int flags = transparentOccluder
+  int flags = transparentOccluder
       ? SkiaShadowFlags.kTransparentOccluderShadowFlags
       : SkiaShadowFlags.kDefaultShadowFlags;
+  flags |= SkiaShadowFlags.kDirectionalLight_ShadowFlag;
 
   final ui.Color inAmbient =
       color.withAlpha((color.alpha * ckShadowAmbientAlpha).round());
-  final ui.Color inSpot = color.withAlpha((color.alpha * ckShadowSpotAlpha).round());
+  final ui.Color inSpot =
+      color.withAlpha((color.alpha * ckShadowSpotAlpha).round());
 
   final SkTonalColors inTonalColors = SkTonalColors(
     ambient: makeFreshSkColor(inAmbient),
@@ -181,12 +182,12 @@ void drawSkShadow(
     path.skiaObject,
     Float32List(3)..[2] = devicePixelRatio * elevation,
     Float32List(3)
-      ..[0] = ckShadowLightXOffset
-      ..[1] = ckShadowLightYOffset
-      ..[2] = devicePixelRatio * ckShadowLightHeight,
-    devicePixelRatio * ckShadowLightRadius,
+      ..[0] = 0
+      ..[1] = -1
+      ..[2] = 1,
+    ckShadowLightRadius / ckShadowLightHeight,
     tonalColors.ambient,
     tonalColors.spot,
-    flags,
+    flags.toDouble(),
   );
 }
diff --git a/lib/web_ui/lib/src/engine/canvaskit/vertices.dart b/lib/web_ui/lib/src/engine/canvaskit/vertices.dart
index 4d34d34dfd243ad1beb8a3d3bb415bf929086451..8c53334e37d0975980fcab61adb93b1824a163bc 100644
--- a/lib/web_ui/lib/src/engine/canvaskit/vertices.dart
+++ b/lib/web_ui/lib/src/engine/canvaskit/vertices.dart
@@ -6,11 +6,10 @@ import 'dart:typed_data';
 
 import 'package:ui/ui.dart' as ui;
 
-import '../util.dart';
 import 'canvaskit_api.dart';
-import 'skia_object_cache.dart';
+import 'native_memory.dart';
 
-class CkVertices extends ManagedSkiaObject<SkVertices> implements ui.Vertices {
+class CkVertices implements ui.Vertices {
   factory CkVertices(
     ui.VertexMode mode,
     List<ui.Offset> positions, {
@@ -18,8 +17,6 @@ class CkVertices extends ManagedSkiaObject<SkVertices> implements ui.Vertices {
     List<ui.Color>? colors,
     List<int>? indices,
   }) {
-    assert(mode != null);
-    assert(positions != null);
     if (textureCoordinates != null &&
         textureCoordinates.length != positions.length) {
       throw ArgumentError(
@@ -50,8 +47,6 @@ class CkVertices extends ManagedSkiaObject<SkVertices> implements ui.Vertices {
     Int32List? colors,
     Uint16List? indices,
   }) {
-    assert(mode != null);
-    assert(positions != null);
     if (textureCoordinates != null &&
         textureCoordinates.length != positions.length) {
       throw ArgumentError(
@@ -66,11 +61,16 @@ class CkVertices extends ManagedSkiaObject<SkVertices> implements ui.Vertices {
           '"indices" values must be valid indices in the positions list.');
     }
 
+    Uint32List? unsignedColors;
+    if (colors != null) {
+      unsignedColors = colors.buffer.asUint32List(colors.offsetInBytes, colors.length);
+    }
+
     return CkVertices._(
       toSkVertexMode(mode),
       positions,
       textureCoordinates,
-      colors?.buffer.asUint32List(),
+      unsignedColors,
       indices,
     );
   }
@@ -81,48 +81,31 @@ class CkVertices extends ManagedSkiaObject<SkVertices> implements ui.Vertices {
     this._textureCoordinates,
     this._colors,
     this._indices,
-  );
-
-  final SkVertexMode _mode;
-  final Float32List _positions;
-  final Float32List? _textureCoordinates;
-  final Uint32List? _colors;
-  final Uint16List? _indices;
-
-  @override
-  SkVertices createDefault() {
-    return canvasKit.MakeVertices(
+  ) {
+    final SkVertices skVertices = canvasKit.MakeVertices(
       _mode,
       _positions,
       _textureCoordinates,
       _colors,
       _indices,
     );
+    _ref = UniqueRef<SkVertices>(this, skVertices, 'Vertices');
   }
 
-  @override
-  SkVertices resurrect() {
-    return createDefault();
-  }
-
-  @override
-  void delete() {
-    rawSkiaObject?.delete();
-  }
+  final SkVertexMode _mode;
+  final Float32List _positions;
+  final Float32List? _textureCoordinates;
+  final Uint32List? _colors;
+  final Uint16List? _indices;
+  late final UniqueRef<SkVertices> _ref;
 
-  bool _disposed = false;
+  SkVertices get skiaObject => _ref.nativeObject;
 
   @override
   void dispose() {
-    delete();
-    _disposed = true;
+    _ref.dispose();
   }
 
   @override
-  bool get debugDisposed {
-    if (assertionsEnabled) {
-      return _disposed;
-    }
-    throw StateError('Vertices.debugDisposed is only avialalbe when asserts are enabled.');
-  }
+  bool get debugDisposed => _ref.isDisposed;
 }
diff --git a/lib/web_ui/lib/src/engine/canvaskit/viewport_metrics.dart b/lib/web_ui/lib/src/engine/canvaskit/viewport_metrics.dart
deleted file mode 100644
index 255ab30bf0f8212ebe3bf1baddb1491f959f1fe3..0000000000000000000000000000000000000000
--- a/lib/web_ui/lib/src/engine/canvaskit/viewport_metrics.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-class ViewportMetrics {
-  const ViewportMetrics(
-    this.devicePixelRatio,
-    this.physicalWidth,
-    this.physicalHeight,
-  );
-
-  final double devicePixelRatio;
-  final double physicalWidth;
-  final double physicalHeight;
-}
diff --git a/lib/web_ui/lib/src/engine/clipboard.dart b/lib/web_ui/lib/src/engine/clipboard.dart
index 22fff343c9452368ba229567f29fc215780cc561..8486197a4067995a27e2d0e3e9dc314320ebd1f5 100644
--- a/lib/web_ui/lib/src/engine/clipboard.dart
+++ b/lib/web_ui/lib/src/engine/clipboard.dart
@@ -65,6 +65,31 @@ class ClipboardMessageHandler {
     });
   }
 
+  /// Handles the platform message which asks if the clipboard contains
+  /// pasteable strings.
+  void hasStringsMethodCall(ui.PlatformMessageResponseCallback? callback) {
+    const MethodCodec codec = JSONMethodCodec();
+    _pasteFromClipboardStrategy.getData().then((String data) {
+      final Map<String, dynamic> map = <String, dynamic>{'value': data.isNotEmpty};
+      callback!(codec.encodeSuccessEnvelope(map));
+    }).catchError((dynamic error) {
+      if (error is UnimplementedError) {
+        // Clipboard.hasStrings not supported.
+        // Passing [null] to [callback] indicates that the platform message isn't
+        // implemented. Look at [MethodChannel.invokeMethod] to see how [null] is
+        // handled.
+        Future<void>.delayed(Duration.zero).then((_) {
+          if (callback != null) {
+            callback(null);
+          }
+        });
+        return;
+      }
+      final Map<String, dynamic> map = <String, dynamic>{'value': false};
+      callback!(codec.encodeSuccessEnvelope(map));
+    });
+  }
+
   void _reportGetDataFailure(ui.PlatformMessageResponseCallback? callback,
       MethodCodec codec, dynamic error) {
     print('Could not get text from clipboard: $error');
diff --git a/lib/web_ui/lib/src/engine/color_filter.dart b/lib/web_ui/lib/src/engine/color_filter.dart
index 0fc408ea3e51969d82daebc36d245f9f4535ad1f..850df881b12c2ceed2b1c3e84338b3e00669f03f 100644
--- a/lib/web_ui/lib/src/engine/color_filter.dart
+++ b/lib/web_ui/lib/src/engine/color_filter.dart
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
 
 enum ColorFilterType {
@@ -19,7 +20,7 @@ enum ColorFilterType {
 ///
 /// Instances of this class are used with [Paint.colorFilter] on [Paint]
 /// objects.
-class EngineColorFilter implements ui.ColorFilter {
+class EngineColorFilter implements SceneImageFilter, ui.ColorFilter {
   /// Creates a color filter that applies the blend mode given as the second
   /// argument. The source color is the one given as the first argument, and the
   /// destination color is the one from the layer being composited.
@@ -34,14 +35,14 @@ class EngineColorFilter implements ui.ColorFilter {
   /// Construct a color filter that transforms a color by a 5x5 matrix, where
   /// the fifth row is implicitly added in an identity configuration.
   ///
-  /// Every pixel's color value, repsented as an `[R, G, B, A]`, is matrix
+  /// Every pixel's color value, represented as an `[R, G, B, A]`, is matrix
   /// multiplied to create a new color:
   ///
   /// ```text
   /// | R' |   | a00 a01 a02 a03 a04 |   | R |
-  /// | G' |   | a10 a11 a22 a33 a44 |   | G |
-  /// | B' | = | a20 a21 a22 a33 a44 | * | B |
-  /// | A' |   | a30 a31 a22 a33 a44 |   | A |
+  /// | G' |   | a10 a11 a12 a13 a14 |   | G |
+  /// | B' | = | a20 a21 a22 a23 a24 | * | B |
+  /// | A' |   | a30 a31 a32 a33 a34 |   | A |
   /// | 1  |   |  0   0   0   0   1  |   | 1 |
   /// ```
   ///
@@ -116,4 +117,22 @@ class EngineColorFilter implements ui.ColorFilter {
   final ui.BlendMode? blendMode;
   final List<double>? matrix;
   final ColorFilterType type;
+
+  /// Color filters don't affect the image bounds
+  @override
+  ui.Rect filterBounds(ui.Rect inputBounds) => inputBounds;
+
+  @override
+  String toString() {
+    switch (type) {
+      case ColorFilterType.mode:
+        return 'ColorFilter.mode($color, $blendMode)';
+      case ColorFilterType.matrix:
+        return 'ColorFilter.matrix($matrix)';
+      case ColorFilterType.linearToSrgbGamma:
+        return 'ColorFilter.linearToSrgbGamma()';
+      case ColorFilterType.srgbToLinearGamma:
+        return 'ColorFilter.srgbToLinearGamma()';
+    }
+  }
 }
diff --git a/lib/web_ui/lib/src/engine/configuration.dart b/lib/web_ui/lib/src/engine/configuration.dart
index 1e89528992962ce1a479dde27d689611716ac0e8..5591598795f641a28dda370fc97b349200a34ee9 100644
--- a/lib/web_ui/lib/src/engine/configuration.dart
+++ b/lib/web_ui/lib/src/engine/configuration.dart
@@ -44,28 +44,49 @@
 @JS()
 library configuration;
 
-import 'package:js/js.dart';
+import 'dart:js_interop';
+
 import 'package:meta/meta.dart';
+import 'canvaskit/renderer.dart';
 import 'dom.dart';
 
-/// The version of CanvasKit used by the web engine by default.
-// DO NOT EDIT THE NEXT LINE OF CODE MANUALLY
-// See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
-const String _canvaskitVersion = '0.37.1';
-
 /// The Web Engine configuration for the current application.
-FlutterConfiguration get configuration =>
-  _configuration ??= FlutterConfiguration.legacy(_jsConfiguration);
+FlutterConfiguration get configuration {
+  if (_debugConfiguration != null) {
+    return _debugConfiguration!;
+  }
+  return _configuration ??= FlutterConfiguration.legacy(_jsConfiguration);
+}
+
 FlutterConfiguration? _configuration;
 
-/// Sets the given configuration as the current one.
+FlutterConfiguration? _debugConfiguration;
+
+/// Overrides the initial test configuration with new values coming from `newConfig`.
+///
+/// The initial test configuration (AKA `_jsConfiguration`) is set in the
+/// `test_platform.dart` file. See: `window.flutterConfiguration` in `_testBootstrapHandler`.
+///
+/// The result of calling this method each time is:
+///
+///     [configuration] = _jsConfiguration + newConfig
+///
+/// Subsequent calls to this method don't *add* more to an already overridden
+/// configuration; this method always starts from an original `_jsConfiguration`,
+/// and adds `newConfig` to it.
+///
+/// If `newConfig` is null, [configuration] resets to the initial `_jsConfiguration`.
 ///
 /// This must be called before the engine is initialized. Calling it after the
 /// engine is initialized will result in some of the properties not taking
 /// effect because they are consumed during initialization.
 @visibleForTesting
-void debugSetConfiguration(FlutterConfiguration configuration) {
-  _configuration = configuration;
+void debugOverrideJsConfiguration(JsFlutterConfiguration? newConfig) {
+  if (newConfig != null) {
+    _debugConfiguration = configuration.withOverrides(newConfig);
+  } else {
+    _debugConfiguration = null;
+  }
 }
 
 /// Supplies Web Engine configuration properties.
@@ -86,19 +107,31 @@ class FlutterConfiguration {
     // Warn the user of the deprecated behavior.
     assert(() {
       if (config != null) {
-        domWindow.console.warn('window.flutterConfiguration is now deprecated.\n'
-          'Use engineInitializer.initializeEngine(config) instead.\n'
-          'See: https://docs.flutter.dev/development/platform-integration/web/initialization');
+        domWindow.console.warn(
+            'window.flutterConfiguration is now deprecated.\n'
+            'Use engineInitializer.initializeEngine(config) instead.\n'
+            'See: https://docs.flutter.dev/development/platform-integration/web/initialization');
       }
       if (_requestedRendererType != null) {
         domWindow.console.warn('window.flutterWebRenderer is now deprecated.\n'
-          'Use engineInitializer.initializeEngine(config) instead.\n'
-          'See: https://docs.flutter.dev/development/platform-integration/web/initialization');
+            'Use engineInitializer.initializeEngine(config) instead.\n'
+            'See: https://docs.flutter.dev/development/platform-integration/web/initialization');
       }
       return true;
     }());
   }
 
+  FlutterConfiguration withOverrides(JsFlutterConfiguration? overrides) {
+    final JsFlutterConfiguration newJsConfig = objectConstructor.assign(
+      <String, Object>{}.jsify(),
+      _configuration.jsify(),
+      overrides.jsify(),
+    ) as JsFlutterConfiguration;
+    final FlutterConfiguration newConfig = FlutterConfiguration();
+    newConfig._configuration = newJsConfig;
+    return newConfig;
+  }
+
   bool _usedLegacyConfigStyle = false;
   JsFlutterConfiguration? _configuration;
 
@@ -112,14 +145,16 @@ class FlutterConfiguration {
   /// constructor.
   void setUserConfiguration(JsFlutterConfiguration? configuration) {
     if (configuration != null) {
-      assert(!_usedLegacyConfigStyle,
-        'Use engineInitializer.initializeEngine(config) only. '
-        'Using the (deprecated) window.flutterConfiguration and initializeEngine '
-        'configuration simultaneously is not supported.');
-      assert(_requestedRendererType == null || configuration.renderer == null,
-        'Use engineInitializer.initializeEngine(config) only. '
-        'Using the (deprecated) window.flutterWebRenderer and initializeEngine '
-        'configuration simultaneously is not supported.');
+      assert(
+          !_usedLegacyConfigStyle,
+          'Use engineInitializer.initializeEngine(config) only. '
+          'Using the (deprecated) window.flutterConfiguration and initializeEngine '
+          'configuration simultaneously is not supported.');
+      assert(
+          _requestedRendererType == null || configuration.renderer == null,
+          'Use engineInitializer.initializeEngine(config) only. '
+          'Using the (deprecated) window.flutterWebRenderer and initializeEngine '
+          'configuration simultaneously is not supported.');
       _configuration = configuration;
     }
   }
@@ -146,9 +181,7 @@ class FlutterConfiguration {
   /// true.
   ///
   /// Using flutter tools option "--web-render=html" would set the value to false.
-  static const bool useSkia =
-      bool.fromEnvironment('FLUTTER_WEB_USE_SKIA');
-
+  static const bool useSkia = bool.fromEnvironment('FLUTTER_WEB_USE_SKIA');
 
   // Runtime parameters.
   //
@@ -156,14 +189,39 @@ class FlutterConfiguration {
   // runtime. Runtime-supplied values take precedence over environment
   // variables.
 
-  /// The URL to use when downloading the CanvasKit script and associated wasm.
+  /// The absolute base URL of the location of the `assets` directory of the app.
+  ///
+  /// This value is useful when Flutter web assets are deployed to a separate
+  /// domain (or subdirectory) from which the index.html is served, for example:
+  ///
+  /// * Application: https://www.my-app.com/
+  /// * Flutter Assets: https://cdn.example.com/my-app/build-hash/assets/
+  ///
+  /// The `assetBase` value would be set to:
+  ///
+  /// * `'https://cdn.example.com/my-app/build-hash/'`
+  ///
+  /// It is also useful in the case that a Flutter web application is embedded
+  /// into another web app, in a way that the `<base>` tag of the index.html
+  /// cannot be set (because it'd break the host app), for example:
+  ///
+  /// * Application: https://www.my-app.com/
+  /// * Flutter Assets: https://www.my-app.com/static/companion/flutter/assets/
+  ///
+  /// The `assetBase` would be set to:
+  ///
+  /// * `'/static/companion/flutter/'`
+  ///
+  /// Do not confuse this configuration value with [canvasKitBaseUrl].
+  String? get assetBase => _configuration?.assetBase;
+
+  /// The base URL to use when downloading the CanvasKit script and associated
+  /// wasm.
   ///
   /// The expected directory structure nested under this URL is as follows:
   ///
-  ///     /canvaskit.js              - the release build of CanvasKit JS API bindings
-  ///     /canvaskit.wasm            - the release build of CanvasKit WASM module
-  ///     /profiling/canvaskit.js    - the profile build of CanvasKit JS API bindings
-  ///     /profiling/canvaskit.wasm  - the profile build of CanvasKit WASM module
+  ///     /canvaskit.js              - the build of CanvasKit JS API bindings
+  ///     /canvaskit.wasm            - the build of CanvasKit WASM module
   ///
   /// The base URL can be overridden using the `FLUTTER_WEB_CANVASKIT_URL`
   /// environment variable or using the configuration API for JavaScript.
@@ -179,38 +237,40 @@ class FlutterConfiguration {
   ///   --web-renderer=canvaskit \
   ///   --dart-define=FLUTTER_WEB_CANVASKIT_URL=https://example.com/custom-canvaskit-build/
   /// ```
-  String get canvasKitBaseUrl => _configuration?.canvasKitBaseUrl ?? _defaultCanvasKitBaseUrl;
+  String get canvasKitBaseUrl =>
+      _configuration?.canvasKitBaseUrl ?? _defaultCanvasKitBaseUrl;
   static const String _defaultCanvasKitBaseUrl = String.fromEnvironment(
     'FLUTTER_WEB_CANVASKIT_URL',
-    defaultValue: 'https://unpkg.com/canvaskit-wasm@$_canvaskitVersion/bin/',
+    defaultValue: 'canvaskit/',
   );
 
+  /// The variant of CanvasKit to download.
+  ///
+  /// Available values are:
+  ///
+  /// * `auto` - the default value. The engine will automatically detect the
+  /// best variant to use based on the browser.
+  ///
+  /// * `full` - the full variant of CanvasKit that can be used in any browser.
+  ///
+  /// * `chromium` - the lite variant of CanvasKit that can be used in
+  /// Chromium-based browsers.
+  CanvasKitVariant get canvasKitVariant {
+    final String variant = _configuration?.canvasKitVariant ?? 'auto';
+    return CanvasKitVariant.values.byName(variant);
+  }
+
   /// If set to true, forces CPU-only rendering in CanvasKit (i.e. the engine
   /// won't use WebGL).
   ///
   /// This is mainly used for testing or for apps that want to ensure they
   /// run on devices which don't support WebGL.
-  bool get canvasKitForceCpuOnly => _configuration?.canvasKitForceCpuOnly ?? _defaultCanvasKitForceCpuOnly;
+  bool get canvasKitForceCpuOnly =>
+      _configuration?.canvasKitForceCpuOnly ?? _defaultCanvasKitForceCpuOnly;
   static const bool _defaultCanvasKitForceCpuOnly = bool.fromEnvironment(
     'FLUTTER_WEB_CANVASKIT_FORCE_CPU_ONLY',
   );
 
-  /// The maximum number of overlay surfaces that the CanvasKit renderer will use.
-  ///
-  /// Overlay surfaces are extra WebGL `<canvas>` elements used to paint on top
-  /// of platform views. Too many platform views can cause the browser to run
-  /// out of resources (memory, CPU, GPU) to handle the content efficiently.
-  /// The number of overlay surfaces is therefore limited.
-  ///
-  /// This value can be specified using either the `FLUTTER_WEB_MAXIMUM_SURFACES`
-  /// environment variable, or using the runtime configuration.
-  int get canvasKitMaximumSurfaces =>
-      _configuration?.canvasKitMaximumSurfaces?.toInt() ?? _defaultCanvasKitMaximumSurfaces;
-  static const int _defaultCanvasKitMaximumSurfaces = int.fromEnvironment(
-    'FLUTTER_WEB_MAXIMUM_SURFACES',
-    defaultValue: 8,
-  );
-
   /// Set this flag to `true` to cause the engine to visualize the semantics tree
   /// on the screen for debugging.
   ///
@@ -222,7 +282,9 @@ class FlutterConfiguration {
   /// ```
   /// flutter run -d chrome --profile --dart-define=FLUTTER_WEB_DEBUG_SHOW_SEMANTICS=true
   /// ```
-  bool get debugShowSemanticsNodes => _configuration?.debugShowSemanticsNodes ?? _defaultDebugShowSemanticsNodes;
+  bool get debugShowSemanticsNodes =>
+      _configuration?.debugShowSemanticsNodes ??
+      _defaultDebugShowSemanticsNodes;
   static const bool _defaultDebugShowSemanticsNodes = bool.fromEnvironment(
     'FLUTTER_WEB_DEBUG_SHOW_SEMANTICS',
   );
@@ -231,6 +293,21 @@ class FlutterConfiguration {
   /// to render, or `null` if the user hasn't specified anything.
   DomElement? get hostElement => _configuration?.hostElement;
 
+  /// Sets Flutter Web in "multi-view" mode.
+  ///
+  /// Multi-view mode allows apps to:
+  ///
+  ///  * Start without a `hostElement`.
+  ///  * Add/remove views (`hostElements`) from JS while the application is running.
+  ///  * ...
+  ///  * PROFIT?
+  bool get multiViewEnabled => _configuration?.multiViewEnabled ?? false;
+
+  /// Returns a `nonce` to allowlist the inline styles that Flutter web needs.
+  ///
+  /// See: https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/nonce
+  String? get nonce => _configuration?.nonce;
+
   /// Returns the [requestedRendererType] to be used with the current Flutter
   /// application, normally 'canvaskit' or 'auto'.
   ///
@@ -238,7 +315,22 @@ class FlutterConfiguration {
   /// `window.flutterWebRenderer`.
   ///
   /// This is used by the Renderer class to decide how to initialize the engine.
-  String? get requestedRendererType => _configuration?.renderer ?? _requestedRendererType;
+  String? get requestedRendererType =>
+      _configuration?.renderer ?? _requestedRendererType;
+
+  /// Returns the base URL to load fallback fonts from. Fallback fonts are
+  /// downloaded automatically when there is no font bundled with the app that
+  /// can show a glyph that is being rendered.
+  ///
+  /// Defaults to 'https://fonts.gstatic.com/s/'.
+  String get fontFallbackBaseUrl =>
+      _configuration?.fontFallbackBaseUrl ?? 'https://fonts.gstatic.com/s/';
+
+  /// Whether to use color emojis or not.
+  ///
+  /// The font used to render color emojis is large (~24MB). This configuration
+  /// gives developers the ability to decide for their app.
+  bool get useColorEmoji => _configuration?.useColorEmoji ?? false;
 }
 
 @JS('window.flutterConfiguration')
@@ -246,19 +338,58 @@ external JsFlutterConfiguration? get _jsConfiguration;
 
 /// The JS bindings for the object that's set as `window.flutterConfiguration`.
 @JS()
+@anonymous
 @staticInterop
-class JsFlutterConfiguration {}
+class JsFlutterConfiguration {
+  external factory JsFlutterConfiguration();
+}
 
 extension JsFlutterConfigurationExtension on JsFlutterConfiguration {
-  external String? get canvasKitBaseUrl;
-  external bool? get canvasKitForceCpuOnly;
-  external double? get canvasKitMaximumSurfaces;
-  external bool? get debugShowSemanticsNodes;
+  @JS('assetBase')
+  external JSString? get _assetBase;
+  String? get assetBase => _assetBase?.toDart;
+
+  @JS('canvasKitBaseUrl')
+  external JSString? get _canvasKitBaseUrl;
+  String? get canvasKitBaseUrl => _canvasKitBaseUrl?.toDart;
+
+  @JS('canvasKitVariant')
+  external JSString? get _canvasKitVariant;
+  String? get canvasKitVariant => _canvasKitVariant?.toDart;
+
+  @JS('canvasKitForceCpuOnly')
+  external JSBoolean? get _canvasKitForceCpuOnly;
+  bool? get canvasKitForceCpuOnly => _canvasKitForceCpuOnly?.toDart;
+
+  @JS('debugShowSemanticsNodes')
+  external JSBoolean? get _debugShowSemanticsNodes;
+  bool? get debugShowSemanticsNodes => _debugShowSemanticsNodes?.toDart;
+
   external DomElement? get hostElement;
-  external String? get renderer;
+
+  @JS('multiViewEnabled')
+  external JSBoolean? get _multiViewEnabled;
+  bool? get multiViewEnabled => _multiViewEnabled?.toDart;
+
+  @JS('nonce')
+  external JSString? get _nonce;
+  String? get nonce => _nonce?.toDart;
+
+  @JS('renderer')
+  external JSString? get _renderer;
+  String? get renderer => _renderer?.toDart;
+
+  @JS('fontFallbackBaseUrl')
+  external JSString? get _fontFallbackBaseUrl;
+  String? get fontFallbackBaseUrl => _fontFallbackBaseUrl?.toDart;
+
+  @JS('useColorEmoji')
+  external JSBoolean? get _useColorEmoji;
+  bool? get useColorEmoji => _useColorEmoji?.toDart;
 }
 
 /// A JavaScript entrypoint that allows developer to set rendering backend
 /// at runtime before launching the application.
 @JS('window.flutterWebRenderer')
-external String? get _requestedRendererType;
+external JSString? get __requestedRendererType;
+String? get _requestedRendererType => __requestedRendererType?.toDart;
diff --git a/lib/web_ui/lib/src/engine/display.dart b/lib/web_ui/lib/src/engine/display.dart
new file mode 100644
index 0000000000000000000000000000000000000000..1264b49865b099cc7bc634a201ee660230d4e572
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/display.dart
@@ -0,0 +1,136 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:ui/ui.dart' as ui;
+
+import '../engine.dart';
+
+class EngineFlutterDisplay extends ui.Display {
+  EngineFlutterDisplay({
+    required this.id,
+    required this.size,
+    required this.refreshRate,
+  });
+
+  /// The single [EngineFlutterDisplay] that the web page is rendered on.
+  static EngineFlutterDisplay get instance => _instance;
+  static final EngineFlutterDisplay _instance = EngineFlutterDisplay(
+    id: 0,
+    size: ui.Size(domWindow.screen?.width ?? 0, domWindow.screen?.height ?? 0),
+    refreshRate: 60,
+  );
+
+  @override
+  final int id;
+
+  // TODO(mdebbar): https://github.com/flutter/flutter/issues/133562
+  // `size` and `refreshRate` should be kept up-to-date with the
+  // browser. E.g. the window could be resized or moved to another display with
+  // a different refresh rate.
+
+  @override
+  final ui.Size size;
+
+  @override
+  final double refreshRate;
+
+  @override
+  double get devicePixelRatio =>
+      _debugDevicePixelRatioOverride ?? browserDevicePixelRatio;
+
+  /// The real device pixel ratio of the browser.
+  ///
+  /// This value cannot be overriden by tests, for example.
+  double get browserDevicePixelRatio {
+    final double ratio = domWindow.devicePixelRatio;
+    // Guard against WebOS returning 0.
+    return (ratio == 0.0) ? 1.0 : ratio;
+  }
+
+  /// Overrides the default device pixel ratio.
+  ///
+  /// This is useful in tests to emulate screens of different dimensions.
+  ///
+  /// Passing `null` resets the device pixel ratio to the browser's default.
+  void debugOverrideDevicePixelRatio(double? value) {
+    _debugDevicePixelRatioOverride = value;
+  }
+
+  double? _debugDevicePixelRatioOverride;
+}
+
+/// Controls the screen orientation using the browser's screen orientation API.
+class ScreenOrientation {
+  const ScreenOrientation();
+
+  static ScreenOrientation get instance => _instance;
+  static const ScreenOrientation _instance = ScreenOrientation();
+
+  static const String lockTypeAny = 'any';
+  static const String lockTypeNatural = 'natural';
+  static const String lockTypeLandscape = 'landscape';
+  static const String lockTypePortrait = 'portrait';
+  static const String lockTypePortraitPrimary = 'portrait-primary';
+  static const String lockTypePortraitSecondary = 'portrait-secondary';
+  static const String lockTypeLandscapePrimary = 'landscape-primary';
+  static const String lockTypeLandscapeSecondary = 'landscape-secondary';
+
+  /// Sets preferred screen orientation.
+  ///
+  /// Specifies the set of orientations the application interface can be
+  /// displayed in.
+  ///
+  /// The [orientations] argument is a list of DeviceOrientation values.
+  /// The empty list uses Screen unlock api and causes the application to
+  /// defer to the operating system default.
+  ///
+  /// See w3c screen api: https://www.w3.org/TR/screen-orientation/
+  Future<bool> setPreferredOrientation(List<dynamic> orientations) async {
+    final DomScreen? screen = domWindow.screen;
+    if (screen != null) {
+      final DomScreenOrientation? screenOrientation = screen.orientation;
+      if (screenOrientation != null) {
+        if (orientations.isEmpty) {
+          screenOrientation.unlock();
+          return true;
+        } else {
+          final String? lockType =
+              _deviceOrientationToLockType(orientations.first as String?);
+          if (lockType != null) {
+            try {
+              await screenOrientation.lock(lockType);
+              return true;
+            } catch (_) {
+              // On Chrome desktop an error with 'not supported on this device
+              // error' is fired.
+              return Future<bool>.value(false);
+            }
+          }
+        }
+      }
+    }
+    // API is not supported on this browser return false.
+    return false;
+  }
+
+  // Converts device orientation to w3c OrientationLockType enum.
+  //
+  // See also: https://developer.mozilla.org/en-US/docs/Web/API/ScreenOrientation/lock
+  static String? _deviceOrientationToLockType(String? deviceOrientation) {
+    switch (deviceOrientation) {
+      case 'DeviceOrientation.portraitUp':
+        return lockTypePortraitPrimary;
+      case 'DeviceOrientation.portraitDown':
+        return lockTypePortraitSecondary;
+      case 'DeviceOrientation.landscapeLeft':
+        return lockTypeLandscapePrimary;
+      case 'DeviceOrientation.landscapeRight':
+        return lockTypeLandscapeSecondary;
+      default:
+        return null;
+    }
+  }
+}
diff --git a/lib/web_ui/lib/src/engine/dom.dart b/lib/web_ui/lib/src/engine/dom.dart
index 1cb4a75d565f68cda514e51acd5c53e3d32ceed2..8dfa57b2a94209d525ec93fb6d713aa19e5a2e66 100644
--- a/lib/web_ui/lib/src/engine/dom.dart
+++ b/lib/web_ui/lib/src/engine/dom.dart
@@ -3,11 +3,15 @@
 // found in the LICENSE file.
 
 import 'dart:async';
+import 'dart:js_interop';
 import 'dart:math' as math;
 import 'dart:typed_data';
 
-import 'package:js/js.dart';
 import 'package:js/js_util.dart' as js_util;
+import 'package:meta/meta.dart';
+import 'package:ui/src/engine/skwasm/skwasm_stub.dart' if (dart.library.ffi) 'package:ui/src/engine/skwasm/skwasm_impl.dart';
+
+import 'browser_detection.dart';
 
 /// This file contains static interop classes for interacting with the DOM and
 /// some helpers. All of the classes in this file are named after their
@@ -15,12 +19,77 @@ import 'package:js/js_util.dart' as js_util;
 /// external method to the appropriate class's extension. To add a new class,
 /// simply name the class after it's counterpart in the DOM and prefix the
 /// class name with `Dom`.
-/// NOTE: After the new static interop DOM API is released in the Dart SDK,
-/// these classes will be replaced by typedefs.
 /// NOTE: Currently, optional parameters do not behave as expected.
 /// For the time being, avoid passing optional parameters directly to JS.
-/// NOTE: Please avoid typing external JS functions with `int`, as passing ints
-/// to and from JS is not supported on all web backends.
+
+// TODO(joshualitt): To make it clearer to users of this shim that this is where
+// the boundary between Dart and JS interop exists, we should expose JS types
+// directly to the engine.
+
+/// Conversions methods to facilitate migrating to JS types.
+///
+/// The existing behavior across the JS interop boundary involves many implicit
+/// conversions. For efficiency reasons, on JS backends we still want those
+/// implicit conversions, but on Wasm backends we need to 'shallowly' convert
+/// these types.
+///
+/// Note: Due to discrepancies between how `null`, `JSNull`, and `JSUndefined`
+/// are currently represented across web backends, these extensions should be
+/// used carefully and only on types that are known to not contains `JSNull` and
+/// `JSUndefined`.
+extension ObjectToJSAnyExtension on Object {
+  // Once `Object.toJSBox` is faster (see
+  // https://github.com/dart-lang/sdk/issues/55183) we can remove this
+  // backend-specific workaround.
+  @pragma('wasm:prefer-inline')
+  @pragma('dart2js:tryInline')
+  JSAny get toJSWrapper => dartToJsWrapper(this);
+
+  @pragma('wasm:prefer-inline')
+  @pragma('dart2js:tryInline')
+  JSAny get toJSAnyShallow {
+    if (isWasm) {
+      return toJSAnyDeep;
+    } else {
+      return this as JSAny;
+    }
+  }
+
+  @pragma('wasm:prefer-inline')
+  @pragma('dart2js:tryInline')
+  JSAny get toJSAnyDeep => js_util.jsify(this) as JSAny;
+}
+
+extension JSAnyToObjectExtension on JSAny {
+  @pragma('wasm:prefer-inline')
+  @pragma('dart2js:tryInline')
+  Object get fromJSWrapper => jsWrapperToDart(this);
+
+  @pragma('wasm:prefer-inline')
+  @pragma('dart2js:tryInline')
+  Object get toObjectShallow {
+    if (isWasm) {
+      return toObjectDeep;
+    } else {
+      return this;
+    }
+  }
+
+  @pragma('wasm:prefer-inline')
+  @pragma('dart2js:tryInline')
+  Object get toObjectDeep => js_util.dartify(this)!;
+}
+
+@JS('Object')
+external DomObjectConstructor get objectConstructor;
+
+@JS()
+@staticInterop
+class DomObjectConstructor {}
+
+extension DomObjectConstructorExtension on DomObjectConstructor {
+  external JSObject assign(JSAny? target, JSAny? source1, JSAny? source2);
+}
 
 @JS()
 @staticInterop
@@ -28,73 +97,183 @@ class DomWindow extends DomEventTarget {}
 
 extension DomWindowExtension on DomWindow {
   external DomConsole get console;
-  external double get devicePixelRatio;
+
+  @JS('devicePixelRatio')
+  external JSNumber get _devicePixelRatio;
+  double get devicePixelRatio => _devicePixelRatio.toDartDouble;
+
   external DomDocument get document;
   external DomHistory get history;
-  external double? get innerHeight;
-  external double? get innerWidth;
+
+  @JS('innerHeight')
+  external JSNumber? get _innerHeight;
+  double? get innerHeight => _innerHeight?.toDartDouble;
+
+  @JS('innerWidth')
+  external JSNumber? get _innerWidth;
+  double? get innerWidth => _innerWidth?.toDartDouble;
+
   external DomLocation get location;
   external DomNavigator get navigator;
   external DomVisualViewport? get visualViewport;
   external DomPerformance get performance;
-  Future<Object?> fetch(String url) =>
-      js_util.promiseToFuture(js_util.callMethod(this, 'fetch', <String>[url]));
+
+  @visibleForTesting
+  Future<Object?> fetch(String url) {
+    // To make sure we have a consistent approach for handling and reporting
+    // network errors, all code related to making HTTP calls is consolidated
+    // into the `httpFetch` function, and a few convenience wrappers.
+    throw UnsupportedError(
+      'Do not use window.fetch directly. '
+      'Use httpFetch* family of functions instead.',
+    );
+  }
+
+  @JS('fetch')
+  external JSPromise<JSAny?> _fetch1(JSString url);
+  @JS('fetch')
+  external JSPromise<JSAny?> _fetch2(JSString url, JSAny headers);
+
   // ignore: non_constant_identifier_names
   external DomURL get URL;
-  external bool dispatchEvent(DomEvent event);
-  external DomMediaQueryList matchMedia(String? query);
-  DomCSSStyleDeclaration getComputedStyle(DomElement elt,
-          [String? pseudoElt]) =>
-      js_util.callMethod(this, 'getComputedStyle', <Object>[
-        elt,
-        if (pseudoElt != null) pseudoElt
-      ]) as DomCSSStyleDeclaration;
+
+  @JS('dispatchEvent')
+  external JSBoolean _dispatchEvent(DomEvent event);
+  bool dispatchEvent(DomEvent event) => _dispatchEvent(event).toDart;
+
+  @JS('matchMedia')
+  external DomMediaQueryList _matchMedia(JSString? query);
+  DomMediaQueryList matchMedia(String? query) => _matchMedia(query?.toJS);
+
+  @JS('getComputedStyle')
+  external DomCSSStyleDeclaration _getComputedStyle1(DomElement elt);
+  @JS('getComputedStyle')
+  external DomCSSStyleDeclaration _getComputedStyle2(
+      DomElement elt, JSString pseudoElt);
+  DomCSSStyleDeclaration getComputedStyle(DomElement elt, [String? pseudoElt]) {
+    if (pseudoElt == null) {
+      return _getComputedStyle1(elt);
+    } else {
+      return _getComputedStyle2(elt, pseudoElt.toJS);
+    }
+  }
+
   external DomScreen? get screen;
-  external double requestAnimationFrame(DomRequestAnimationFrameCallback callback);
+
+  @JS('requestAnimationFrame')
+  external JSNumber _requestAnimationFrame(JSFunction callback);
+  double requestAnimationFrame(DomRequestAnimationFrameCallback callback) =>
+      _requestAnimationFrame(callback.toJS).toDartDouble;
+
+  @JS('postMessage')
+  external JSVoid _postMessage1(JSAny message, JSString targetOrigin);
+  @JS('postMessage')
+  external JSVoid _postMessage2(
+      JSAny message, JSString targetOrigin, JSArray<JSAny?> messagePorts);
   void postMessage(Object message, String targetOrigin,
-          [List<DomMessagePort>? messagePorts]) =>
-      js_util.callMethod(this, 'postMessage', <Object?>[
-        message,
-        targetOrigin,
-        if (messagePorts != null) js_util.jsify(messagePorts)
-      ]);
+      [List<DomMessagePort>? messagePorts]) {
+    if (messagePorts == null) {
+      _postMessage1(message.toJSAnyShallow, targetOrigin.toJS);
+    } else {
+      _postMessage2(
+          message.toJSAnyShallow,
+          targetOrigin.toJS,
+          // Cast is necessary so we can call `.toJS` on the right extension.
+          // ignore: unnecessary_cast
+          (messagePorts as List<JSAny>).toJS);
+    }
+  }
 
   /// The Trusted Types API (when available).
   /// See: https://developer.mozilla.org/en-US/docs/Web/API/Trusted_Types_API
   external DomTrustedTypePolicyFactory? get trustedTypes;
-
-  // ignore: non_constant_identifier_names
-  external DomIntl get Intl;
 }
 
-typedef DomRequestAnimationFrameCallback = void Function(num highResTime);
+typedef DomRequestAnimationFrameCallback = void Function(JSNumber highResTime);
 
 @JS()
 @staticInterop
 class DomConsole {}
 
 extension DomConsoleExtension on DomConsole {
-  external void warn(Object? arg);
-  external void error(Object? arg);
-  external void debug(Object? arg);
+  @JS('warn')
+  external JSVoid _warn(JSString? arg);
+  void warn(Object? arg) => _warn(arg.toString().toJS);
+
+  @JS('error')
+  external JSVoid _error(JSString? arg);
+  void error(Object? arg) => _error(arg.toString().toJS);
+
+  @JS('debug')
+  external JSVoid _debug(JSString? arg);
+  void debug(Object? arg) => _debug(arg.toString().toJS);
 }
 
 @JS('window')
 external DomWindow get domWindow;
 
+@JS('Intl')
+external DomIntl get domIntl;
+
+@JS('Symbol')
+external DomSymbol get domSymbol;
+
+@JS('createImageBitmap')
+external JSPromise<JSAny?> _createImageBitmap1(
+  JSAny source,
+);
+@JS('createImageBitmap')
+external JSPromise<JSAny?> _createImageBitmap2(
+  JSAny source,
+  JSNumber x,
+  JSNumber y,
+  JSNumber width,
+  JSNumber height,
+);
+Future<DomImageBitmap> createImageBitmap(JSAny source,
+    [({int x, int y, int width, int height})? bounds]) {
+  JSPromise<JSAny?> jsPromise;
+  if (bounds != null) {
+    jsPromise = _createImageBitmap2(source, bounds.x.toJS, bounds.y.toJS,
+        bounds.width.toJS, bounds.height.toJS);
+  } else {
+    jsPromise = _createImageBitmap1(source);
+  }
+  return js_util.promiseToFuture<DomImageBitmap>(jsPromise);
+}
+
 @JS()
 @staticInterop
 class DomNavigator {}
 
 extension DomNavigatorExtension on DomNavigator {
   external DomClipboard? get clipboard;
-  external double? get maxTouchPoints;
-  external String get vendor;
-  external String get language;
-  external String? get platform;
-  external String get userAgent;
-  List<String>? get languages =>
-      js_util.getProperty<List<Object?>?>(this, 'languages')?.cast<String>();
+
+  @JS('maxTouchPoints')
+  external JSNumber? get _maxTouchPoints;
+  double? get maxTouchPoints => _maxTouchPoints?.toDartDouble;
+
+  @JS('vendor')
+  external JSString get _vendor;
+  String get vendor => _vendor.toDart;
+
+  @JS('language')
+  external JSString get _language;
+  String get language => _language.toDart;
+
+  @JS('platform')
+  external JSString? get _platform;
+  String? get platform => _platform?.toDart;
+
+  @JS('userAgent')
+  external JSString get _userAgent;
+  String get userAgent => _userAgent.toDart;
+
+  @JS('languages')
+  external JSArray<JSAny?>? get _languages;
+  List<String>? get languages => _languages?.toDart
+      .map<String>((JSAny? any) => (any! as JSString).toDart)
+      .toList();
 }
 
 @JS()
@@ -103,23 +282,54 @@ class DomDocument extends DomNode {}
 
 extension DomDocumentExtension on DomDocument {
   external DomElement? get documentElement;
-  external DomElement? querySelector(String selectors);
+
+  @JS('querySelector')
+  external DomElement? _querySelector(JSString selectors);
+  DomElement? querySelector(String selectors) => _querySelector(selectors.toJS);
+
+  @JS('querySelectorAll')
+  external _DomList _querySelectorAll(JSString selectors);
   Iterable<DomElement> querySelectorAll(String selectors) =>
-      createDomListWrapper<DomElement>(js_util
-          .callMethod<_DomList>(this, 'querySelectorAll', <Object>[selectors]));
-  DomElement createElement(String name, [Object? options]) =>
-      js_util.callMethod(this, 'createElement',
-          <Object>[name, if (options != null) options]) as DomElement;
-  external bool execCommand(String commandId);
+      createDomListWrapper<DomElement>(_querySelectorAll(selectors.toJS));
+
+  @JS('createElement')
+  external DomElement _createElement1(JSString name);
+  @JS('createElement')
+  external DomElement _createElement2(JSString name, JSAny? options);
+  DomElement createElement(String name, [Object? options]) {
+    if (options == null) {
+      return _createElement1(name.toJS);
+    } else {
+      return _createElement2(name.toJS, options.toJSAnyDeep);
+    }
+  }
+
+  @JS('execCommand')
+  external JSBoolean _execCommand(JSString commandId);
+  bool execCommand(String commandId) => _execCommand(commandId.toJS).toDart;
+
   external DomHTMLScriptElement? get currentScript;
-  external DomElement createElementNS(
-      String namespaceURI, String qualifiedName);
-  external DomText createTextNode(String data);
-  external DomEvent createEvent(String eventType);
+
+  @JS('createElementNS')
+  external DomElement _createElementNS(
+      JSString namespaceURI, JSString qualifiedName);
+  DomElement createElementNS(String namespaceURI, String qualifiedName) =>
+      _createElementNS(namespaceURI.toJS, qualifiedName.toJS);
+
+  @JS('createTextNode')
+  external DomText _createTextNode(JSString data);
+  DomText createTextNode(String data) => _createTextNode(data.toJS);
+
+  @JS('createEvent')
+  external DomEvent _createEvent(JSString eventType);
+  DomEvent createEvent(String eventType) => _createEvent(eventType.toJS);
+
   external DomElement? get activeElement;
+
+  @JS('elementFromPoint')
+  external DomElement? _elementFromPoint(JSNumber x, JSNumber y);
   DomElement? elementFromPoint(int x, int y) =>
-      js_util.callMethod<DomElement?>(this, 'elementFromPoint',
-          <Object>[x.toDouble(), y.toDouble()]);
+      _elementFromPoint(x.toJS, y.toJS);
 }
 
 @JS()
@@ -130,13 +340,29 @@ extension DomHTMLDocumentExtension on DomHTMLDocument {
   external DomFontFaceSet? get fonts;
   external DomHTMLHeadElement? get head;
   external DomHTMLBodyElement? get body;
-  external set title(String? value);
-  external String? get title;
+
+  @JS('title')
+  external set _title(JSString? value);
+  set title(String? value) => _title = value?.toJS;
+
+  @JS('title')
+  external JSString? get _title;
+  String? get title => _title?.toDart;
+
+  @JS('getElementsByTagName')
+  external _DomList _getElementsByTagName(JSString tag);
   Iterable<DomElement> getElementsByTagName(String tag) =>
-      createDomListWrapper<DomElement>(js_util
-          .callMethod<_DomList>(this, 'getElementsByTagName', <Object>[tag]));
+      createDomListWrapper<DomElement>(_getElementsByTagName(tag.toJS));
+
   external DomElement? get activeElement;
-  external DomElement? getElementById(String id);
+
+  @JS('getElementById')
+  external DomElement? _getElementById(JSString id);
+  DomElement? getElementById(String id) => _getElementById(id.toJS);
+
+  @JS('visibilityState')
+  external JSString get _visibilityState;
+  String get visibilityState => _visibilityState.toDart;
 }
 
 @JS('document')
@@ -147,26 +373,59 @@ external DomHTMLDocument get domDocument;
 class DomEventTarget {}
 
 extension DomEventTargetExtension on DomEventTarget {
+  @JS('addEventListener')
+  external JSVoid _addEventListener1(JSString type, DomEventListener listener);
+  @JS('addEventListener')
+  external JSVoid _addEventListener2(
+      JSString type, DomEventListener listener, JSBoolean useCapture);
   void addEventListener(String type, DomEventListener? listener,
       [bool? useCapture]) {
     if (listener != null) {
-      js_util.callMethod(this, 'addEventListener',
-          <Object>[type, listener, if (useCapture != null) useCapture]);
+      if (useCapture == null) {
+        _addEventListener1(type.toJS, listener);
+      } else {
+        _addEventListener2(type.toJS, listener, useCapture.toJS);
+      }
     }
   }
 
+  @JS('addEventListener')
+  external JSVoid _addEventListener3(
+      JSString type, DomEventListener listener, JSAny options);
+  void addEventListenerWithOptions(String type, DomEventListener listener,
+          Map<String, Object> options) =>
+      _addEventListener3(type.toJS, listener, options.toJSAnyDeep);
+
+  @JS('removeEventListener')
+  external JSVoid _removeEventListener1(
+      JSString type, DomEventListener listener);
+  @JS('removeEventListener')
+  external JSVoid _removeEventListener2(
+      JSString type, DomEventListener listener, JSBoolean useCapture);
   void removeEventListener(String type, DomEventListener? listener,
       [bool? useCapture]) {
     if (listener != null) {
-      js_util.callMethod(this, 'removeEventListener',
-          <Object>[type, listener, if (useCapture != null) useCapture]);
+      if (useCapture == null) {
+        _removeEventListener1(type.toJS, listener);
+      } else {
+        _removeEventListener2(type.toJS, listener, useCapture.toJS);
+      }
     }
   }
 
-  external bool dispatchEvent(DomEvent event);
+  @JS('dispatchEvent')
+  external JSBoolean _dispatchEvent(DomEvent event);
+  bool dispatchEvent(DomEvent event) => _dispatchEvent(event).toDart;
 }
 
-typedef DomEventListener = void Function(DomEvent event);
+typedef DartDomEventListener = JSVoid Function(DomEvent event);
+
+@JS()
+@staticInterop
+class DomEventListener {}
+
+DomEventListener createDomEventListener(DartDomEventListener listener) =>
+    listener.toJS as DomEventListener;
 
 @JS()
 @staticInterop
@@ -174,17 +433,39 @@ class DomEvent {}
 
 extension DomEventExtension on DomEvent {
   external DomEventTarget? get target;
-  external double? get timeStamp;
-  external String get type;
-  external void preventDefault();
-  external void stopPropagation();
-  void initEvent(String type, [bool? bubbles, bool? cancelable]) =>
-      js_util.callMethod(this, 'initEvent', <Object>[
-        type,
-        if (bubbles != null) bubbles,
-        if (cancelable != null) cancelable
-      ]);
-  external bool get defaultPrevented;
+  external DomEventTarget? get currentTarget;
+
+  @JS('timeStamp')
+  external JSNumber? get _timeStamp;
+  double? get timeStamp => _timeStamp?.toDartDouble;
+
+  @JS('type')
+  external JSString get _type;
+  String get type => _type.toDart;
+
+  external JSVoid preventDefault();
+  external JSVoid stopPropagation();
+
+  @JS('initEvent')
+  external JSVoid _initEvent1(JSString type);
+  @JS('initEvent')
+  external JSVoid _initEvent2(JSString type, JSBoolean bubbles);
+  @JS('initEvent')
+  external JSVoid _initEvent3(
+      JSString type, JSBoolean bubbles, JSBoolean cancelable);
+  void initEvent(String type, [bool? bubbles, bool? cancelable]) {
+    if (bubbles == null) {
+      _initEvent1(type.toJS);
+    } else if (cancelable == null) {
+      _initEvent2(type.toJS, bubbles.toJS);
+    } else {
+      _initEvent3(type.toJS, bubbles.toJS, cancelable.toJS);
+    }
+  }
+
+  @JS('defaultPrevented')
+  external JSBoolean get _defaultPrevented;
+  bool get defaultPrevented => _defaultPrevented.toDart;
 }
 
 DomEvent createDomEvent(String type, String name) {
@@ -196,12 +477,18 @@ DomEvent createDomEvent(String type, String name) {
 @JS('ProgressEvent')
 @staticInterop
 class DomProgressEvent extends DomEvent {
-  external factory DomProgressEvent(String type);
+  factory DomProgressEvent(String type) => DomProgressEvent._(type.toJS);
+  external factory DomProgressEvent._(JSString type);
 }
 
 extension DomProgressEventExtension on DomProgressEvent {
-  external double? get loaded;
-  external double? get total;
+  @JS('loaded')
+  external JSNumber? get _loaded;
+  double? get loaded => _loaded?.toDartDouble;
+
+  @JS('total')
+  external JSNumber? get _total;
+  double? get total => _total?.toDartDouble;
 }
 
 @JS()
@@ -209,13 +496,31 @@ extension DomProgressEventExtension on DomProgressEvent {
 class DomNode extends DomEventTarget {}
 
 extension DomNodeExtension on DomNode {
-  external String? get baseUri;
+  @JS('baseURI')
+  external JSString? get _baseUri;
+  String? get baseUri => _baseUri?.toDart;
+
   external DomNode? get firstChild;
-  external String get innerText;
+
+  @JS('innerText')
+  external JSString get _innerText;
+  String get innerText => _innerText.toDart;
+
+  @JS('innerText')
+  external set _innerText(JSString text);
+  set innerText(String text) => _innerText = text.toJS;
+
   external DomNode? get lastChild;
   external DomNode appendChild(DomNode node);
-  DomElement? get parent => js_util.getProperty(this, 'parentElement');
-  String? get text => js_util.getProperty(this, 'textContent');
+
+  @JS('parentElement')
+  external DomElement? get parentElement;
+  DomElement? get parent => parentElement;
+
+  @JS('textContent')
+  external JSString? get _textContent;
+  String? get text => _textContent?.toDart;
+
   external DomNode? get parentNode;
   external DomNode? get nextSibling;
   external DomNode insertBefore(DomNode newNode, DomNode? referenceNode);
@@ -227,14 +532,30 @@ extension DomNodeExtension on DomNode {
   }
 
   external DomNode removeChild(DomNode child);
-  external bool? get isConnected;
-  set text(String? value) =>
-      js_util.setProperty<String?>(this, 'textContent', value);
-  external DomNode cloneNode(bool? deep);
-  external bool contains(DomNode? other);
-  external void append(DomNode node);
-  Iterable<DomNode> get childNodes => createDomListWrapper<DomElement>(
-      js_util.getProperty<_DomList>(this, 'childNodes'));
+
+  @JS('isConnected')
+  external JSBoolean? get _isConnected;
+  bool? get isConnected => _isConnected?.toDart;
+
+  @JS('textContent')
+  external set _textContent(JSString? value);
+  set text(String? value) => _textContent = value?.toJS;
+
+  @JS('cloneNode')
+  external DomNode _cloneNode(JSBoolean? deep);
+  DomNode cloneNode(bool? deep) => _cloneNode(deep?.toJS);
+
+  @JS('contains')
+  external JSBoolean _contains(DomNode? other);
+  bool contains(DomNode? other) => _contains(other).toDart;
+
+  external JSVoid append(DomNode node);
+
+  @JS('childNodes')
+  external _DomList get _childNodes;
+  Iterable<DomNode> get childNodes =>
+      createDomListWrapper<DomElement>(_childNodes);
+
   external DomDocument? get ownerDocument;
   void clearChildren() {
     while (firstChild != null) {
@@ -250,53 +571,153 @@ class DomElement extends DomNode {}
 DomElement createDomElement(String tag) => domDocument.createElement(tag);
 
 extension DomElementExtension on DomElement {
-  Iterable<DomElement> get children => createDomListWrapper<DomElement>(
-      js_util.getProperty<_DomList>(this, 'children'));
-  external double get clientHeight;
-  external double get clientWidth;
-  external String get id;
-  external set id(String id);
-  external set innerHtml(String? html);
-  external String? get outerHTML;
-  external set spellcheck(bool? value);
-  external String get tagName;
+  @JS('children')
+  external _DomList get _children;
+  Iterable<DomElement> get children =>
+      createDomListWrapper<DomElement>(_children);
+
+  external DomElement? get firstElementChild;
+  external DomElement? get lastElementChild;
+
+  external DomElement? get nextElementSibling;
+
+  @JS('clientHeight')
+  external JSNumber get _clientHeight;
+  double get clientHeight => _clientHeight.toDartDouble;
+
+  @JS('clientWidth')
+  external JSNumber get _clientWidth;
+  double get clientWidth => _clientWidth.toDartDouble;
+
+  @JS('id')
+  external JSString get _id;
+  String get id => _id.toDart;
+
+  @JS('id')
+  external set _id(JSString id);
+  set id(String id) => _id = id.toJS;
+
+  @JS('innerHtml')
+  external set _innerHtml(JSString? html);
+  set innerHtml(String? html) => _innerHtml = html?.toJS;
+
+  @JS('outerHTML')
+  external JSString? get _outerHTML;
+  String? get outerHTML => _outerHTML?.toDart;
+
+  @JS('spellcheck')
+  external set _spellcheck(JSBoolean? value);
+  set spellcheck(bool? value) => _spellcheck = value?.toJS;
+
+  @JS('tagName')
+  external JSString get _tagName;
+  String get tagName => _tagName.toDart;
+
   external DomCSSStyleDeclaration get style;
-  external void append(DomNode node);
-  external String? getAttribute(String attributeName);
+  external JSVoid append(DomNode node);
+
+  @JS('getAttribute')
+  external JSString? _getAttribute(JSString attributeName);
+  String? getAttribute(String attributeName) =>
+      _getAttribute(attributeName.toJS)?.toDart;
+
   external DomRect getBoundingClientRect();
-  external void prepend(DomNode node);
-  external DomElement? querySelector(String selectors);
+  external JSVoid prepend(DomNode node);
+
+  @JS('querySelector')
+  external DomElement? _querySelector(JSString selectors);
+  DomElement? querySelector(String selectors) => _querySelector(selectors.toJS);
+
+  @JS('closest')
+  external DomElement? _closest(JSString selectors);
+  DomElement? closest(String selectors) => _closest(selectors.toJS);
+
+  @JS('matches')
+  external JSBoolean _matches(JSString selectors);
+  bool matches(String selectors) => _matches(selectors.toJS).toDart;
+
+  @JS('querySelectorAll')
+  external _DomList _querySelectorAll(JSString selectors);
   Iterable<DomElement> querySelectorAll(String selectors) =>
-      createDomListWrapper<DomElement>(js_util
-          .callMethod<_DomList>(this, 'querySelectorAll', <Object>[selectors]));
-  external void remove();
-  external void setAttribute(String name, Object value);
+      createDomListWrapper<DomElement>(_querySelectorAll(selectors.toJS));
+
+  external JSVoid remove();
+
+  @JS('setAttribute')
+  external JSVoid _setAttribute(JSString name, JSAny value);
+  JSVoid setAttribute(String name, Object value) =>
+      _setAttribute(name.toJS, value.toJSAnyDeep);
+
   void appendText(String text) => append(createDomText(text));
-  external void removeAttribute(String name);
-  external set tabIndex(double? value);
-  external double? get tabIndex;
-  external void focus();
-  external double get scrollTop;
-  external set scrollTop(double value);
-  external double get scrollLeft;
-  external set scrollLeft(double value);
+
+  @JS('removeAttribute')
+  external JSVoid _removeAttribute(JSString name);
+  void removeAttribute(String name) => _removeAttribute(name.toJS);
+
+  @JS('tabIndex')
+  external set _tabIndex(JSNumber? value);
+  set tabIndex(double? value) => _tabIndex = value?.toJS;
+
+  @JS('tabIndex')
+  external JSNumber? get _tabIndex;
+  double? get tabIndex => _tabIndex?.toDartDouble;
+
+  external JSVoid focus();
+
+  @JS('scrollTop')
+  external JSNumber get _scrollTop;
+  double get scrollTop => _scrollTop.toDartDouble;
+
+  @JS('scrollTop')
+  external set _scrollTop(JSNumber value);
+  set scrollTop(double value) => _scrollTop = value.toJS;
+
+  @JS('scrollLeft')
+  external JSNumber get _scrollLeft;
+  double get scrollLeft => _scrollLeft.toDartDouble;
+
+  @JS('scrollLeft')
+  external set _scrollLeft(JSNumber value);
+  set scrollLeft(double value) => _scrollLeft = value.toJS;
+
   external DomTokenList get classList;
-  external set className(String value);
-  external String get className;
-  external void blur();
-  List<DomNode> getElementsByTagName(String tag) =>
-      js_util.callMethod<List<Object?>>(
-          this, 'getElementsByTagName', <Object>[tag]).cast<DomNode>();
-  List<DomNode> getElementsByClassName(String className) =>
-      js_util.callMethod<List<Object?>>(
-          this, 'getElementsByClassName', <Object>[className]).cast<DomNode>();
-  external void click();
-  external bool hasAttribute(String name);
-  Iterable<DomNode> get childNodes => createDomListWrapper<DomElement>(
-      js_util.getProperty<_DomList>(this, 'childNodes'));
-  DomShadowRoot attachShadow(Map<Object?, Object?> initDict) => js_util
-          .callMethod(this, 'attachShadow', <Object?>[js_util.jsify(initDict)])
-      as DomShadowRoot;
+
+  @JS('className')
+  external set _className(JSString value);
+  set className(String value) => _className = value.toJS;
+
+  @JS('className')
+  external JSString get _className;
+  String get className => _className.toDart;
+
+  external JSVoid blur();
+
+  @JS('getElementsByTagName')
+  external _DomList _getElementsByTagName(JSString tag);
+  Iterable<DomNode> getElementsByTagName(String tag) =>
+      createDomListWrapper(_getElementsByTagName(tag.toJS));
+
+  @JS('getElementsByClassName')
+  external _DomList _getElementsByClassName(JSString className);
+  Iterable<DomNode> getElementsByClassName(String className) =>
+      createDomListWrapper(_getElementsByClassName(className.toJS));
+
+  external JSVoid click();
+
+  @JS('hasAttribute')
+  external JSBoolean _hasAttribute(JSString name);
+  bool hasAttribute(String name) => _hasAttribute(name.toJS).toDart;
+
+  @JS('childNodes')
+  external _DomList get _childNodes;
+  Iterable<DomNode> get childNodes =>
+      createDomListWrapper<DomElement>(_childNodes);
+
+  @JS('attachShadow')
+  external DomShadowRoot _attachShadow(JSAny initDict);
+  DomShadowRoot attachShadow(Map<Object?, Object?> initDict) =>
+      _attachShadow(initDict.toJSAnyDeep);
+
   external DomShadowRoot? get shadowRoot;
   void clearChildren() {
     while (firstChild != null) {
@@ -379,6 +800,7 @@ extension DomCSSStyleDeclarationExtension on DomCSSStyleDeclaration {
   set alignContent(String value) => setProperty('align-content', value);
   set textAlign(String value) => setProperty('text-align', value);
   set font(String value) => setProperty('font', value);
+  set cursor(String value) => setProperty('cursor', value);
   String get width => getPropertyValue('width');
   String get height => getPropertyValue('height');
   String get position => getPropertyValue('position');
@@ -443,15 +865,25 @@ extension DomCSSStyleDeclarationExtension on DomCSSStyleDeclaration {
   String get alignContent => getPropertyValue('align-content');
   String get textAlign => getPropertyValue('text-align');
   String get font => getPropertyValue('font');
+  String get cursor => getPropertyValue('cursor');
+
+  @JS('getPropertyValue')
+  external JSString _getPropertyValue(JSString property);
+  String getPropertyValue(String property) =>
+      _getPropertyValue(property.toJS).toDart;
 
-  external String getPropertyValue(String property);
+  @JS('setProperty')
+  external JSVoid _setProperty(
+      JSString propertyName, JSString value, JSString priority);
   void setProperty(String propertyName, String value, [String? priority]) {
     priority ??= '';
-    js_util.callMethod(
-        this, 'setProperty', <Object>[propertyName, value, priority]);
+    _setProperty(propertyName.toJS, value.toJS, priority.toJS);
   }
 
-  external String removeProperty(String property);
+  @JS('removeProperty')
+  external JSString _removeProperty(JSString property);
+  String removeProperty(String property) =>
+      _removeProperty(property.toJS).toDart;
 }
 
 @JS()
@@ -459,7 +891,19 @@ extension DomCSSStyleDeclarationExtension on DomCSSStyleDeclaration {
 class DomHTMLElement extends DomElement {}
 
 extension DomHTMLElementExtension on DomHTMLElement {
-  external double get offsetWidth;
+  @JS('offsetWidth')
+  external JSNumber get _offsetWidth;
+  double get offsetWidth => _offsetWidth.toDartDouble;
+
+  @JS('offsetLeft')
+  external JSNumber get _offsetLeft;
+  double get offsetLeft => _offsetLeft.toDartDouble;
+
+  @JS('offsetTop')
+  external JSNumber get _offsetTop;
+  double get offsetTop => _offsetTop.toDartDouble;
+
+  external DomHTMLElement? get offsetParent;
 }
 
 @JS()
@@ -467,10 +911,21 @@ extension DomHTMLElementExtension on DomHTMLElement {
 class DomHTMLMetaElement extends DomHTMLElement {}
 
 extension DomHTMLMetaElementExtension on DomHTMLMetaElement {
-  external String get name;
-  external set name(String value);
-  external String get content;
-  external set content(String value);
+  @JS('name')
+  external JSString get _name;
+  String get name => _name.toDart;
+
+  @JS('name')
+  external set _name(JSString value);
+  set name(String value) => _name = value.toJS;
+
+  @JS('content')
+  external JSString get _content;
+  String get content => _content.toDart;
+
+  @JS('content')
+  external set _content(JSString value);
+  set content(String value) => _content = value.toJS;
 }
 
 DomHTMLMetaElement createDomHTMLMetaElement() =>
@@ -493,16 +948,41 @@ DomHTMLImageElement createDomHTMLImageElement() =>
     domDocument.createElement('img') as DomHTMLImageElement;
 
 extension DomHTMLImageElementExtension on DomHTMLImageElement {
-  external String? get alt;
-  external set alt(String? value);
-  external String? get src;
-  external set src(String? value);
-  external double get naturalWidth;
-  external double get naturalHeight;
-  external set width(double? value);
-  external set height(double? value);
-  Future<dynamic> decode() =>
-      js_util.promiseToFuture(js_util.callMethod(this, 'decode', <Object>[]));
+  @JS('alt')
+  external JSString? get _alt;
+  String? get alt => _alt?.toDart;
+
+  @JS('alt')
+  external set _alt(JSString? value);
+  set alt(String? value) => _alt = value?.toJS;
+
+  @JS('src')
+  external JSString? get _src;
+  String? get src => _src?.toDart;
+
+  @JS('src')
+  external set _src(JSString? value);
+  set src(String? value) => _src = value?.toJS;
+
+  @JS('naturalWidth')
+  external JSNumber get _naturalWidth;
+  double get naturalWidth => _naturalWidth.toDartDouble;
+
+  @JS('naturalHeight')
+  external JSNumber get _naturalHeight;
+  double get naturalHeight => _naturalHeight.toDartDouble;
+
+  @JS('width')
+  external set _width(JSNumber? value);
+  set width(double? value) => _width = value?.toJS;
+
+  @JS('height')
+  external set _height(JSNumber? value);
+  set height(double? value) => _height = value?.toJS;
+
+  @JS('decode')
+  external JSPromise<JSAny?> _decode();
+  Future<Object?> decode() => js_util.promiseToFuture<Object?>(_decode());
 }
 
 @JS()
@@ -510,11 +990,24 @@ extension DomHTMLImageElementExtension on DomHTMLImageElement {
 class DomHTMLScriptElement extends DomHTMLElement {}
 
 extension DomHTMLScriptElementExtension on DomHTMLScriptElement {
-  external set src(Object /* String|TrustedScriptURL */ value);
+  @JS('src')
+  external set _src(JSAny value);
+  set src(Object /* String|TrustedScriptURL */ value) =>
+      _src = value.toJSAnyShallow;
+
+  @JS('nonce')
+  external set _nonce(JSString? value);
+  set nonce(String? value) => _nonce = value?.toJS;
 }
 
-DomHTMLScriptElement createDomHTMLScriptElement() =>
-    domDocument.createElement('script') as DomHTMLScriptElement;
+DomHTMLScriptElement createDomHTMLScriptElement(String? nonce) {
+  final DomHTMLScriptElement script =
+      domDocument.createElement('script') as DomHTMLScriptElement;
+  if (nonce != null) {
+    script.nonce = nonce;
+  }
+  return script;
+}
 
 @JS()
 @staticInterop
@@ -549,22 +1042,49 @@ DomHTMLParagraphElement createDomHTMLParagraphElement() =>
 class DomHTMLStyleElement extends DomHTMLElement {}
 
 extension DomHTMLStyleElementExtension on DomHTMLStyleElement {
-  external set type(String? value);
+  @JS('type')
+  external set _type(JSString? value);
+  set type(String? value) => _type = value?.toJS;
+
+  @JS('nonce')
+  external set _nonce(JSString? value);
+  set nonce(String? value) => _nonce = value?.toJS;
+
+  @JS('nonce')
+  external JSString? get _nonce;
+  String? get nonce => _nonce?.toDart;
+
   external DomStyleSheet? get sheet;
 }
 
-DomHTMLStyleElement createDomHTMLStyleElement() =>
-    domDocument.createElement('style') as DomHTMLStyleElement;
+DomHTMLStyleElement createDomHTMLStyleElement(String? nonce) {
+  final DomHTMLStyleElement style =
+      domDocument.createElement('style') as DomHTMLStyleElement;
+  if (nonce != null) {
+    style.nonce = nonce;
+  }
+  return style;
+}
 
 @JS()
 @staticInterop
 class DomPerformance extends DomEventTarget {}
 
 extension DomPerformanceExtension on DomPerformance {
-  external DomPerformanceEntry? mark(String markName);
-  external DomPerformanceMeasure? measure(
-      String measureName, String? startMark, String? endMark);
-  external double now();
+  @JS('mark')
+  external DomPerformanceEntry? _mark(JSString markName);
+  DomPerformanceEntry? mark(String markName) => _mark(markName.toJS);
+
+  @JS('measure')
+  external DomPerformanceMeasure? _measure(
+      JSString measureName, JSString? startMark, JSString? endMark);
+  DomPerformanceMeasure? measure(
+          String measureName, String? startMark, String? endMark) =>
+      _measure(measureName.toJS, startMark?.toJS, endMark?.toJS);
+
+  @JS('now')
+  external JSNumber _now();
+  double now() => _now().toDartDouble;
 }
 
 @JS()
@@ -579,7 +1099,16 @@ class DomPerformanceMeasure extends DomPerformanceEntry {}
 @staticInterop
 class DomCanvasElement extends DomHTMLElement {}
 
+@visibleForTesting
+int debugCanvasCount = 0;
+
+@visibleForTesting
+void debugResetCanvasCount() {
+  debugCanvasCount = 0;
+}
+
 DomCanvasElement createDomCanvasElement({int? width, int? height}) {
+  debugCanvasCount++;
   final DomCanvasElement canvas =
       domWindow.document.createElement('canvas') as DomCanvasElement;
   if (width != null) {
@@ -592,23 +1121,72 @@ DomCanvasElement createDomCanvasElement({int? width, int? height}) {
 }
 
 extension DomCanvasElementExtension on DomCanvasElement {
-  external double? get width;
-  external set width(double? value);
-  external double? get height;
-  external set height(double? value);
-  external bool? get isConnected;
-  String toDataURL([String type = 'image/png']) =>
-      js_util.callMethod(this, 'toDataURL', <Object>[type]);
-
+  @JS('width')
+  external JSNumber? get _width;
+  double? get width => _width?.toDartDouble;
+
+  @JS('width')
+  external set _width(JSNumber? value);
+  set width(double? value) => _width = value?.toJS;
+
+  @JS('height')
+  external JSNumber? get _height;
+  double? get height => _height?.toDartDouble;
+
+  @JS('height')
+  external set _height(JSNumber? value);
+  set height(double? value) => _height = value?.toJS;
+
+  @JS('isConnected')
+  external JSBoolean? get _isConnected;
+  bool? get isConnected => _isConnected?.toDart;
+
+  @JS('toDataURL')
+  external JSString _toDataURL(JSString type);
+  String toDataURL([String type = 'image/png']) => _toDataURL(type.toJS).toDart;
+
+  @JS('getContext')
+  external JSAny? _getContext1(JSString contextType);
+  @JS('getContext')
+  external JSAny? _getContext2(JSString contextType, JSAny attributes);
   Object? getContext(String contextType, [Map<dynamic, dynamic>? attributes]) {
-    return js_util.callMethod(this, 'getContext', <Object?>[
-      contextType,
-      if (attributes != null) js_util.jsify(attributes)
-    ]);
+    if (attributes == null) {
+      return _getContext1(contextType.toJS);
+    } else {
+      return _getContext2(contextType.toJS, attributes.toJSAnyDeep);
+    }
   }
 
   DomCanvasRenderingContext2D get context2D =>
       getContext('2d')! as DomCanvasRenderingContext2D;
+
+  WebGLContext getGlContext(int majorVersion) {
+    if (majorVersion == 1) {
+      return getContext('webgl')! as WebGLContext;
+    }
+    return getContext('webgl2')! as WebGLContext;
+  }
+
+  DomCanvasRenderingContextBitmapRenderer get contextBitmapRenderer =>
+      getContext('bitmaprenderer')! as DomCanvasRenderingContextBitmapRenderer;
+}
+
+@JS()
+@staticInterop
+class WebGLContext {}
+
+extension WebGLContextExtension on WebGLContext {
+  @JS('getParameter')
+  external JSNumber _getParameter(JSNumber value);
+  int getParameter(int value) => _getParameter(value.toJS).toDartDouble.toInt();
+
+  @JS('SAMPLES')
+  external JSNumber get _samples;
+  int get samples => _samples.toDartDouble.toInt();
+
+  @JS('STENCIL_BITS')
+  external JSNumber get _stencilBits;
+  int get stencilBits => _stencilBits.toDartDouble.toInt();
 }
 
 @JS()
@@ -620,87 +1198,344 @@ abstract class DomCanvasImageSource {}
 class DomCanvasRenderingContext2D {}
 
 extension DomCanvasRenderingContext2DExtension on DomCanvasRenderingContext2D {
-  external Object? get fillStyle;
-  external set fillStyle(Object? style);
-  external String get font;
-  external set font(String value);
-  external String get direction;
-  external set direction(String value);
-  external set lineWidth(num? value);
-  external set strokeStyle(Object? value);
-  external Object? get strokeStyle;
-  external void beginPath();
-  external void closePath();
-  external DomCanvasGradient createLinearGradient(
-      num x0, num y0, num x1, num y1);
-  external DomCanvasPattern? createPattern(Object image, String reptitionType);
-  external DomCanvasGradient createRadialGradient(
-      num x0, num y0, num r0, num x1, num y1, num r1);
-  external void drawImage(DomCanvasImageSource source, num destX, num destY);
-  void fill([Object? pathOrWinding]) => js_util.callMethod(
-      this, 'fill', <Object?>[if (pathOrWinding != null) pathOrWinding]);
-  external void fillRect(num x, num y, num width, num height);
-  void fillText(String text, num x, num y, [num? maxWidth]) =>
-      js_util.callMethod(this, 'fillText',
-          <Object>[text, x, y, if (maxWidth != null) maxWidth]);
+  external DomCanvasElement? get canvas;
+
+  @JS('fillStyle')
+  external JSAny? get _fillStyle;
+  Object? get fillStyle => _fillStyle?.toObjectShallow;
+
+  @JS('fillStyle')
+  external set _fillStyle(JSAny? style);
+  set fillStyle(Object? style) => _fillStyle = style?.toJSAnyShallow;
+
+  @JS('font')
+  external JSString get _font;
+  String get font => _font.toDart;
+
+  @JS('font')
+  external set _font(JSString value);
+  set font(String value) => _font = value.toJS;
+
+  @JS('direction')
+  external JSString get _direction;
+  String get direction => _direction.toDart;
+
+  @JS('direction')
+  external set _direction(JSString value);
+  set direction(String value) => _direction = value.toJS;
+
+  @JS('lineWidth')
+  external set _lineWidth(JSNumber? value);
+  set lineWidth(num? value) => _lineWidth = value?.toJS;
+
+  @JS('strokeStyle')
+  external set _strokeStyle(JSAny? value);
+  set strokeStyle(Object? value) => _strokeStyle = value?.toJSAnyShallow;
+
+  @JS('strokeStyle')
+  external JSAny? get _strokeStyle;
+  Object? get strokeStyle => _strokeStyle?.toObjectShallow;
+
+  external JSVoid beginPath();
+  external JSVoid closePath();
+
+  @JS('createLinearGradient')
+  external DomCanvasGradient _createLinearGradient(
+      JSNumber x0, JSNumber y0, JSNumber x1, JSNumber y1);
+  DomCanvasGradient createLinearGradient(num x0, num y0, num x1, num y1) =>
+      _createLinearGradient(x0.toJS, y0.toJS, x1.toJS, y1.toJS);
+
+  @JS('createPattern')
+  external DomCanvasPattern? _createPattern(
+      JSAny image, JSString reptitionType);
+  DomCanvasPattern? createPattern(Object image, String reptitionType) =>
+      _createPattern(image.toJSAnyShallow, reptitionType.toJS);
+
+  @JS('createRadialGradient')
+  external DomCanvasGradient _createRadialGradient(JSNumber x0, JSNumber y0,
+      JSNumber r0, JSNumber x1, JSNumber y1, JSNumber r1);
+  DomCanvasGradient createRadialGradient(
+          num x0, num y0, num r0, num x1, num y1, num r1) =>
+      _createRadialGradient(
+          x0.toJS, y0.toJS, r0.toJS, x1.toJS, y1.toJS, r1.toJS);
+
+  @JS('drawImage')
+  external JSVoid _drawImage1(
+      DomCanvasImageSource source, JSNumber dx, JSNumber dy);
+  @JS('drawImage')
+  external JSVoid _drawImage2(
+    DomCanvasImageSource source,
+    JSNumber sx,
+    JSNumber sy,
+    JSNumber sWidth,
+    JSNumber sHeight,
+    JSNumber dx,
+    JSNumber dy,
+    JSNumber dWidth,
+    JSNumber dHeight,
+  );
+  void drawImage(
+    DomCanvasImageSource source,
+    num srcxOrDstX,
+    num srcyOrDstY, [
+    num? srcWidth,
+    num? srcHeight,
+    num? dstX,
+    num? dstY,
+    num? dstWidth,
+    num? dstHeight,
+  ]) {
+    if (srcWidth == null) {
+      // In this case the numbers provided are the destination x and y offset.
+      return _drawImage1(source, srcxOrDstX.toJS, srcyOrDstY.toJS);
+    } else {
+      assert(srcHeight != null &&
+          dstX != null &&
+          dstY != null &&
+          dstWidth != null &&
+          dstHeight != null);
+      return _drawImage2(
+        source,
+        srcxOrDstX.toJS,
+        srcyOrDstY.toJS,
+        srcWidth.toJS,
+        srcHeight!.toJS,
+        dstX!.toJS,
+        dstY!.toJS,
+        dstWidth!.toJS,
+        dstHeight!.toJS,
+      );
+    }
+  }
+
+  @JS('fill')
+  external JSVoid _fill1();
+  @JS('fill')
+  external JSVoid _fill2(JSAny pathOrWinding);
+  void fill([Object? pathOrWinding]) {
+    if (pathOrWinding == null) {
+      _fill1();
+    } else {
+      _fill2(pathOrWinding.toJSAnyShallow);
+    }
+  }
+
+  @JS('fillRect')
+  external JSVoid _fillRect(
+      JSNumber x, JSNumber y, JSNumber width, JSNumber height);
+  void fillRect(num x, num y, num width, num height) =>
+      _fillRect(x.toJS, y.toJS, width.toJS, height.toJS);
+
+  @JS('fillText')
+  external JSVoid _fillText1(JSString text, JSNumber x, JSNumber y);
+  @JS('fillText')
+  external JSVoid _fillText2(
+      JSString text, JSNumber x, JSNumber y, JSNumber maxWidth);
+  void fillText(String text, num x, num y, [num? maxWidth]) {
+    if (maxWidth == null) {
+      _fillText1(text.toJS, x.toJS, y.toJS);
+    } else {
+      _fillText2(text.toJS, x.toJS, y.toJS, maxWidth.toJS);
+    }
+  }
+
+  @JS('getImageData')
+  external DomImageData _getImageData(
+      JSNumber x, JSNumber y, JSNumber sw, JSNumber sh);
   DomImageData getImageData(int x, int y, int sw, int sh) =>
-      js_util.callMethod(this, 'getImageData',
-          <Object>[x.toDouble(), y.toDouble(), sw.toDouble(), sh.toDouble()]);
-  external void lineTo(num x, num y);
-  external DomTextMetrics measureText(String text);
-  external void moveTo(num x, num y);
-  external void save();
-  external void stroke();
-  external void rect(num x, num y, num width, num height);
-  external void resetTransform();
-  external void restore();
-  external void setTransform(num a, num b, num c, num d, num e, num f);
-  external void transform(num a, num b, num c, num d, num e, num f);
-  void clip([Object? pathOrWinding]) => js_util.callMethod(
-      this, 'clip', <Object?>[if (pathOrWinding != null) pathOrWinding]);
-  external void scale(num x, num y);
-  external void clearRect(num x, num y, num width, num height);
-  external void translate(num x, num y);
-  external void rotate(num angle);
-  external void bezierCurveTo(
-      num cp1x, num cp1y, num numcp2x, num cp2y, num x, num y);
-  external void quadraticCurveTo(num cpx, num cpy, num x, num y);
-  external set globalCompositeOperation(String value);
-  external set lineCap(String value);
-  external set lineJoin(String value);
-  external set shadowBlur(num value);
+      _getImageData(x.toJS, y.toJS, sw.toJS, sh.toJS);
+
+  @JS('lineTo')
+  external JSVoid _lineTo(JSNumber x, JSNumber y);
+  void lineTo(num x, num y) => _lineTo(x.toJS, y.toJS);
+
+  @JS('measureText')
+  external DomTextMetrics _measureText(JSString text);
+  DomTextMetrics measureText(String text) => _measureText(text.toJS);
+
+  @JS('moveTo')
+  external JSVoid _moveTo(JSNumber x, JSNumber y);
+  void moveTo(num x, num y) => _moveTo(x.toJS, y.toJS);
+
+  external JSVoid save();
+  external JSVoid stroke();
+
+  @JS('rect')
+  external JSVoid _rect(
+      JSNumber x, JSNumber y, JSNumber width, JSNumber height);
+  void rect(num x, num y, num width, num height) =>
+      _rect(x.toJS, y.toJS, width.toJS, height.toJS);
+
+  external JSVoid resetTransform();
+  external JSVoid restore();
+
+  @JS('setTransform')
+  external JSVoid _setTransform(
+      JSNumber a, JSNumber b, JSNumber c, JSNumber d, JSNumber e, JSNumber f);
+  void setTransform(num a, num b, num c, num d, num e, num f) =>
+      _setTransform(a.toJS, b.toJS, c.toJS, d.toJS, e.toJS, f.toJS);
+
+  @JS('transform')
+  external JSVoid _transform(
+      JSNumber a, JSNumber b, JSNumber c, JSNumber d, JSNumber e, JSNumber f);
+  void transform(num a, num b, num c, num d, num e, num f) =>
+      _transform(a.toJS, b.toJS, c.toJS, d.toJS, e.toJS, f.toJS);
+
+  @JS('clip')
+  external JSVoid _clip1();
+  @JS('clip')
+  external JSVoid _clip2(JSAny pathOrWinding);
+  void clip([Object? pathOrWinding]) {
+    if (pathOrWinding == null) {
+      _clip1();
+    } else {
+      _clip2(pathOrWinding.toJSAnyShallow);
+    }
+  }
+
+  @JS('scale')
+  external JSVoid _scale(JSNumber x, JSNumber y);
+  void scale(num x, num y) => _scale(x.toJS, y.toJS);
+
+  @JS('clearRect')
+  external JSVoid _clearRect(
+      JSNumber x, JSNumber y, JSNumber width, JSNumber height);
+  void clearRect(num x, num y, num width, num height) =>
+      _clearRect(x.toJS, y.toJS, width.toJS, height.toJS);
+
+  @JS('translate')
+  external JSVoid _translate(JSNumber x, JSNumber y);
+  void translate(num x, num y) => _translate(x.toJS, y.toJS);
+
+  @JS('rotate')
+  external JSVoid _rotate(JSNumber angle);
+  void rotate(num angle) => _rotate(angle.toJS);
+
+  @JS('bezierCurveTo')
+  external JSVoid _bezierCurveTo(JSNumber cp1x, JSNumber cp1y, JSNumber cp2x,
+      JSNumber cp2y, JSNumber x, JSNumber y);
+  void bezierCurveTo(num cp1x, num cp1y, num cp2x, num cp2y, num x, num y) =>
+      _bezierCurveTo(
+          cp1x.toJS, cp1y.toJS, cp2x.toJS, cp2y.toJS, x.toJS, y.toJS);
+
+  @JS('quadraticCurveTo')
+  external JSVoid _quadraticCurveTo(
+      JSNumber cpx, JSNumber cpy, JSNumber x, JSNumber y);
+  void quadraticCurveTo(num cpx, num cpy, num x, num y) =>
+      _quadraticCurveTo(cpx.toJS, cpy.toJS, x.toJS, y.toJS);
+
+  @JS('globalCompositeOperation')
+  external set _globalCompositeOperation(JSString value);
+  set globalCompositeOperation(String value) =>
+      _globalCompositeOperation = value.toJS;
+
+  @JS('lineCap')
+  external set _lineCap(JSString value);
+  set lineCap(String value) => _lineCap = value.toJS;
+
+  @JS('lineJoin')
+  external set _lineJoin(JSString value);
+  set lineJoin(String value) => _lineJoin = value.toJS;
+
+  @JS('shadowBlur')
+  external set _shadowBlur(JSNumber value);
+  set shadowBlur(num value) => _shadowBlur = value.toJS;
+
+  @JS('arc')
+  external JSVoid _arc(JSNumber x, JSNumber y, JSNumber radius,
+      JSNumber startAngle, JSNumber endAngle, JSBoolean antiClockwise);
   void arc(num x, num y, num radius, num startAngle, num endAngle,
           [bool antiClockwise = false]) =>
-      js_util.callMethod(this, 'arc',
-          <Object>[x, y, radius, startAngle, endAngle, antiClockwise]);
-  external set filter(String? value);
-  external set shadowOffsetX(num? x);
-  external set shadowOffsetY(num? y);
-  external set shadowColor(String? value);
-  external void ellipse(num x, num y, num radiusX, num radiusY, num rotation,
-      num startAngle, num endAngle, bool? antiClockwise);
-  external void strokeText(String text, num x, num y);
-  external set globalAlpha(num? value);
+      _arc(x.toJS, y.toJS, radius.toJS, startAngle.toJS, endAngle.toJS,
+          antiClockwise.toJS);
+
+  @JS('filter')
+  external set _filter(JSString? value);
+  set filter(String? value) => _filter = value?.toJS;
+
+  @JS('shadowOffsetX')
+  external set _shadowOffsetX(JSNumber? x);
+  set shadowOffsetX(num? x) => _shadowOffsetX = x?.toJS;
+
+  @JS('shadowOffsetY')
+  external set _shadowOffsetY(JSNumber? y);
+  set shadowOffsetY(num? y) => _shadowOffsetY = y?.toJS;
+
+  @JS('shadowColor')
+  external set _shadowColor(JSString? value);
+  set shadowColor(String? value) => _shadowColor = value?.toJS;
+
+  @JS('ellipse')
+  external JSVoid _ellipse(
+      JSNumber x,
+      JSNumber y,
+      JSNumber radiusX,
+      JSNumber radiusY,
+      JSNumber rotation,
+      JSNumber startAngle,
+      JSNumber endAngle,
+      JSBoolean? antiClockwise);
+  void ellipse(num x, num y, num radiusX, num radiusY, num rotation,
+          num startAngle, num endAngle, bool? antiClockwise) =>
+      _ellipse(x.toJS, y.toJS, radiusX.toJS, radiusY.toJS, rotation.toJS,
+          startAngle.toJS, endAngle.toJS, antiClockwise?.toJS);
+
+  @JS('strokeText')
+  external JSVoid _strokeText(JSString text, JSNumber x, JSNumber y);
+  void strokeText(String text, num x, num y) =>
+      _strokeText(text.toJS, x.toJS, y.toJS);
+
+  @JS('globalAlpha')
+  external set _globalAlpha(JSNumber? value);
+  set globalAlpha(num? value) => _globalAlpha = value?.toJS;
 }
 
 @JS()
 @staticInterop
 class DomCanvasRenderingContextWebGl {}
 
-extension DomCanvasRenderingContextWebGlExtension on DomCanvasRenderingContextWebGl {
-  external bool isContextLost();
+extension DomCanvasRenderingContextWebGlExtension
+    on DomCanvasRenderingContextWebGl {
+  @JS('isContextLost')
+  external JSBoolean _isContextLost();
+  bool isContextLost() => _isContextLost().toDart;
 }
 
 @JS()
 @staticInterop
-class DomImageData {}
+class DomCanvasRenderingContextBitmapRenderer {}
+
+extension DomCanvasRenderingContextBitmapRendererExtension
+    on DomCanvasRenderingContextBitmapRenderer {
+  external void transferFromImageBitmap(DomImageBitmap? bitmap);
+}
+
+@JS('ImageData')
+@staticInterop
+class DomImageData {
+  external factory DomImageData._(JSAny? data, JSNumber sw, JSNumber sh);
+  external factory DomImageData._empty(JSNumber sw, JSNumber sh);
+}
 
-DomImageData createDomImageData(Object? data, int sw, int sh) => js_util
-    .callConstructor(domGetConstructor('ImageData')!, <Object?>[data,
-        sw.toDouble(), sh.toDouble()]);
+DomImageData createDomImageData(Object data, int sw, int sh) =>
+    DomImageData._(data.toJSAnyShallow, sw.toJS, sh.toJS);
+DomImageData createBlankDomImageData(int sw, int sh) =>
+    DomImageData._empty(sw.toJS, sh.toJS);
 
 extension DomImageDataExtension on DomImageData {
-  external Uint8ClampedList get data;
+  @JS('data')
+  external JSUint8ClampedArray get _data;
+  Uint8ClampedList get data => _data.toDart;
+}
+
+@JS('ImageBitmap')
+@staticInterop
+class DomImageBitmap {}
+
+extension DomImageBitmapExtension on DomImageBitmap {
+  external JSNumber get width;
+  external JSNumber get height;
+  external void close();
 }
 
 @JS()
@@ -712,90 +1547,463 @@ class DomCanvasPattern {}
 class DomCanvasGradient {}
 
 extension DomCanvasGradientExtension on DomCanvasGradient {
-  external void addColorStop(num offset, String color);
+  @JS('addColorStop')
+  external JSVoid _addColorStop(JSNumber offset, JSString color);
+  void addColorStop(num offset, String color) =>
+      _addColorStop(offset.toJS, color.toJS);
 }
 
 @JS()
 @staticInterop
 class DomXMLHttpRequestEventTarget extends DomEventTarget {}
 
-@JS()
-@staticInterop
-class DomXMLHttpRequest extends DomXMLHttpRequestEventTarget {}
+Future<DomResponse> rawHttpGet(String url) =>
+    js_util.promiseToFuture<DomResponse>(domWindow._fetch1(url.toJS));
 
-DomXMLHttpRequest createDomXMLHttpRequest() =>
-    domCallConstructorString('XMLHttpRequest', <Object?>[])!
-        as DomXMLHttpRequest;
+typedef MockHttpFetchResponseFactory = Future<MockHttpFetchResponse?> Function(
+    String url);
 
-extension DomXMLHttpRequestExtension on DomXMLHttpRequest {
-  external dynamic get response;
-  external String? get responseText;
-  external String get responseType;
-  external double? get status;
-  external set responseType(String value);
-  void open(String method, String url, [bool? async]) => js_util.callMethod(
-      this, 'open', <Object>[method, url, if (async != null) async]);
-  void send([Object? bodyOrData]) => js_util
-      .callMethod(this, 'send', <Object>[if (bodyOrData != null) bodyOrData]);
-}
+MockHttpFetchResponseFactory? mockHttpFetchResponseFactory;
 
-Future<DomXMLHttpRequest> domHttpRequest(String url,
-    {String? responseType, String method = 'GET', dynamic sendData}) {
-  final Completer<DomXMLHttpRequest> completer = Completer<DomXMLHttpRequest>();
-  final DomXMLHttpRequest xhr = createDomXMLHttpRequest();
-  xhr.open(method, url, /* async */ true);
-  if (responseType != null) {
-    xhr.responseType = responseType;
+/// Makes an HTTP GET request to the given [url] and returns the response.
+///
+/// If the request fails, throws [HttpFetchError]. HTTP error statuses, such as
+/// 404 and 500 are not treated as request failures. In those cases the HTTP
+/// part did succeed and correctly passed the HTTP status down from the server
+/// to the client. Those statuses represent application-level errors that need
+/// extra interpretation to decide if they are "failures" or not. See
+/// [HttpFetchResponse.hasPayload] and [HttpFetchResponse.payload].
+///
+/// This function is designed to handle the most general cases. If the default
+/// payload handling, including error checking, is sufficient, consider using
+/// convenience functions [httpFetchByteBuffer], [httpFetchJson], or
+/// [httpFetchText] instead.
+Future<HttpFetchResponse> httpFetch(String url) async {
+  if (mockHttpFetchResponseFactory != null) {
+    final MockHttpFetchResponse? response =
+        await mockHttpFetchResponseFactory!(url);
+    if (response != null) {
+      return response;
+    }
   }
+  try {
+    final DomResponse domResponse = await rawHttpGet(url);
+    return HttpFetchResponseImpl._(url, domResponse);
+  } catch (requestError) {
+    throw HttpFetchError(url, requestError: requestError);
+  }
+}
 
-  xhr.addEventListener('load', allowInterop((DomEvent e) {
-    final int status = xhr.status!.toInt();
-    final bool accepted = status >= 200 && status < 300;
-    final bool fileUri = status == 0;
-    final bool notModified = status == 304;
-    final bool unknownRedirect = status > 307 && status < 400;
-    if (accepted || fileUri || notModified || unknownRedirect) {
-      completer.complete(xhr);
-    } else {
-      completer.completeError(e);
-    }
-  }));
+Future<DomResponse> _rawHttpPost(String url, String data) =>
+    js_util.promiseToFuture<DomResponse>(domWindow._fetch2(
+        url.toJS,
+        <String, Object?>{
+          'method': 'POST',
+          'headers': <String, Object?>{
+            'Content-Type': 'text/plain',
+          },
+          'body': data,
+        }.toJSAnyDeep));
 
-  xhr.addEventListener('error', allowInterop((DomEvent event) => completer.completeError(event)));
-  xhr.send(sendData);
-  return completer.future;
+/// Sends a [data] string as HTTP POST request to [url].
+///
+/// The web engine does not make POST requests in production code because it is
+/// designed to be able to run web apps served from plain file servers, so this
+/// is meant for tests only.
+@visibleForTesting
+Future<HttpFetchResponse> testOnlyHttpPost(String url, String data) async {
+  try {
+    final DomResponse domResponse = await _rawHttpPost(url, data);
+    return HttpFetchResponseImpl._(url, domResponse);
+  } catch (requestError) {
+    throw HttpFetchError(url, requestError: requestError);
+  }
 }
 
-@JS()
-@staticInterop
-class DomResponse {}
+/// Convenience function for making a fetch request and getting the data as a
+/// [ByteBuffer], when the default error handling mechanism is sufficient.
+Future<ByteBuffer> httpFetchByteBuffer(String url) async {
+  final HttpFetchResponse response = await httpFetch(url);
+  return response.asByteBuffer();
+}
 
-@JS()
-@staticInterop
-class DomCharacterData extends DomNode {}
+/// Convenience function for making a fetch request and getting the data as a
+/// JSON object, when the default error handling mechanism is sufficient.
+Future<Object?> httpFetchJson(String url) async {
+  final HttpFetchResponse response = await httpFetch(url);
+  return response.json();
+}
 
-@JS()
-@staticInterop
-class DomText extends DomCharacterData {}
+/// Convenience function for making a fetch request and getting the data as a
+/// [String], when the default error handling mechanism is sufficient.
+Future<String> httpFetchText(String url) async {
+  final HttpFetchResponse response = await httpFetch(url);
+  return response.text();
+}
 
-DomText createDomText(String data) => domDocument.createTextNode(data);
+/// Successful result of [httpFetch].
+abstract class HttpFetchResponse {
+  /// The URL passed to [httpFetch] that returns this response.
+  String get url;
 
-@JS()
-@staticInterop
-class DomTextMetrics {}
+  /// The HTTP response status, such as 200 or 404.
+  int get status;
 
-extension DomTextMetricsExtension on DomTextMetrics {
-  external double? get width;
-}
+  /// The payload length of this response parsed from the "Content-Length" HTTP
+  /// header.
+  ///
+  /// Returns null if "Content-Length" is missing.
+  int? get contentLength;
 
-@JS()
-@staticInterop
-class DomException {
-  static const String notSupported = 'NotSupportedError';
+  /// Return true if this response has a [payload].
+  ///
+  /// Returns false if this response does not have a payload and therefore it is
+  /// unsafe to call the [payload] getter.
+  bool get hasPayload;
+
+  /// Returns the payload of this response.
+  ///
+  /// It is only safe to call this getter if [hasPayload] is true. If
+  /// [hasPayload] is false, throws [HttpFetchNoPayloadError].
+  HttpFetchPayload get payload;
+}
+
+/// Convenience methods for simple cases when the default error checking
+/// mechanisms are sufficient.
+extension HttpFetchResponseExtension on HttpFetchResponse {
+  /// Reads the payload a chunk at a time.
+  ///
+  /// Combined with [HttpFetchResponse.contentLength], this can be used to
+  /// implement various "progress bar" functionality.
+  Future<void> read<T>(HttpFetchReader<T> reader) {
+    return payload.read(reader);
+  }
+
+  /// Returns the data as a [ByteBuffer].
+  Future<ByteBuffer> asByteBuffer() {
+    return payload.asByteBuffer();
+  }
+
+  /// Returns the data as a [Uint8List].
+  Future<Uint8List> asUint8List() async {
+    return (await payload.asByteBuffer()).asUint8List();
+  }
+
+  /// Returns the data parsed as JSON.
+  Future<dynamic> json() {
+    return payload.json();
+  }
+
+  /// Return the data as a string.
+  Future<String> text() {
+    return payload.text();
+  }
+}
+
+class HttpFetchResponseImpl implements HttpFetchResponse {
+  HttpFetchResponseImpl._(this.url, this._domResponse);
+
+  @override
+  final String url;
+
+  final DomResponse _domResponse;
+
+  @override
+  int get status => _domResponse.status;
+
+  @override
+  int? get contentLength {
+    final String? header = _domResponse.headers.get('Content-Length');
+    if (header == null) {
+      return null;
+    }
+    return int.tryParse(header);
+  }
+
+  @override
+  bool get hasPayload {
+    final bool accepted = status >= 200 && status < 300;
+    final bool fileUri = status == 0;
+    final bool notModified = status == 304;
+    final bool unknownRedirect = status > 307 && status < 400;
+    return accepted || fileUri || notModified || unknownRedirect;
+  }
+
+  @override
+  HttpFetchPayload get payload {
+    if (!hasPayload) {
+      throw HttpFetchNoPayloadError(url, status: status);
+    }
+    return HttpFetchPayloadImpl._(_domResponse);
+  }
+}
+
+/// A fake implementation of [HttpFetchResponse] for testing.
+class MockHttpFetchResponse implements HttpFetchResponse {
+  MockHttpFetchResponse({
+    required this.url,
+    required this.status,
+    this.contentLength,
+    HttpFetchPayload? payload,
+  }) : _payload = payload;
+
+  final HttpFetchPayload? _payload;
+
+  @override
+  final String url;
+
+  @override
+  final int status;
+
+  @override
+  final int? contentLength;
+
+  @override
+  bool get hasPayload => _payload != null;
+
+  @override
+  HttpFetchPayload get payload => _payload!;
+}
+
+typedef HttpFetchReader<T> = void Function(T chunk);
+
+/// Data returned with a [HttpFetchResponse].
+abstract class HttpFetchPayload {
+  /// Reads the payload a chunk at a time.
+  ///
+  /// Combined with [HttpFetchResponse.contentLength], this can be used to
+  /// implement various "progress bar" functionality.
+  Future<void> read<T>(HttpFetchReader<T> reader);
+
+  /// Returns the data as a [ByteBuffer].
+  Future<ByteBuffer> asByteBuffer();
+
+  /// Returns the data parsed as JSON.
+  Future<dynamic> json();
+
+  /// Return the data as a string.
+  Future<String> text();
+}
+
+class HttpFetchPayloadImpl implements HttpFetchPayload {
+  HttpFetchPayloadImpl._(this._domResponse);
+
+  final DomResponse _domResponse;
+
+  @override
+  Future<void> read<T>(HttpFetchReader<T> callback) async {
+    final _DomReadableStream stream = _domResponse.body;
+    final _DomStreamReader reader = stream.getReader();
+
+    while (true) {
+      final _DomStreamChunk chunk = await reader.read();
+      if (chunk.done) {
+        break;
+      }
+      callback(chunk.value as T);
+    }
+  }
+
+  /// Returns the data as a [ByteBuffer].
+  @override
+  Future<ByteBuffer> asByteBuffer() async {
+    return (await _domResponse.arrayBuffer())! as ByteBuffer;
+  }
+
+  /// Returns the data parsed as JSON.
+  @override
+  Future<dynamic> json() => _domResponse.json();
+
+  /// Return the data as a string.
+  @override
+  Future<String> text() => _domResponse.text();
+}
+
+typedef MockOnRead = Future<void> Function<T>(HttpFetchReader<T> callback);
+
+class MockHttpFetchPayload implements HttpFetchPayload {
+  MockHttpFetchPayload({
+    required ByteBuffer byteBuffer,
+    int? chunkSize,
+  })  : _byteBuffer = byteBuffer,
+        _chunkSize = chunkSize ?? 64;
+
+  final ByteBuffer _byteBuffer;
+  final int _chunkSize;
+
+  @override
+  Future<void> read<T>(HttpFetchReader<T> callback) async {
+    final int totalLength = _byteBuffer.lengthInBytes;
+    int currentIndex = 0;
+    while (currentIndex < totalLength) {
+      final int chunkSize = math.min(_chunkSize, totalLength - currentIndex);
+      final Uint8List chunk = Uint8List.sublistView(
+          _byteBuffer.asByteData(), currentIndex, currentIndex + chunkSize);
+      callback(chunk.toJS as T);
+      currentIndex += chunkSize;
+    }
+  }
+
+  @override
+  Future<ByteBuffer> asByteBuffer() async => _byteBuffer;
+
+  @override
+  Future<dynamic> json() async =>
+      throw AssertionError('json not supported by mock');
+
+  @override
+  Future<String> text() async =>
+      throw AssertionError('text not supported by mock');
+}
+
+/// Indicates a missing HTTP payload when one was expected, such as when
+/// [HttpFetchResponse.payload] was called.
+///
+/// Unlike [HttpFetchError], this error happens when the HTTP request/response
+/// succeeded, but the response type is not the kind that provides useful
+/// payload, such as 404, or 500.
+class HttpFetchNoPayloadError implements Exception {
+  /// Creates an exception from a successful HTTP request, but an unsuccessful
+  /// HTTP response code, such as 404 or 500.
+  HttpFetchNoPayloadError(this.url, {required this.status});
+
+  /// HTTP request URL for asset.
+  final String url;
+
+  /// If the HTTP request succeeded, the HTTP response status.
+  ///
+  /// Null if the HTTP request failed.
+  final int status;
+
+  @override
+  String toString() {
+    return 'Flutter Web engine failed to fetch "$url". HTTP request succeeded, '
+        'but the server responded with HTTP status $status.';
+  }
+}
+
+/// Indicates a failure trying to fetch a [url].
+///
+/// Unlike [HttpFetchNoPayloadError] this error indicates that there was no HTTP
+/// response and the roundtrip what interrupted by something else, like a loss
+/// of network connectivity, or request being interrupted by the OS, a browser
+/// CORS policy, etc. In particular, there's not even a HTTP status code to
+/// report, such as 200, 404, or 500.
+class HttpFetchError implements Exception {
+  /// Creates an exception from a failed HTTP request.
+  HttpFetchError(this.url, {required this.requestError});
+
+  /// HTTP request URL for asset.
+  final String url;
+
+  /// The underlying network error that prevented [httpFetch] from succeeding.
+  final Object requestError;
+
+  @override
+  String toString() {
+    return 'Flutter Web engine failed to complete HTTP request to fetch '
+        '"$url": $requestError';
+  }
+}
+
+@JS()
+@staticInterop
+class DomResponse {}
+
+extension DomResponseExtension on DomResponse {
+  @JS('status')
+  external JSNumber get _status;
+  int get status => _status.toDartInt;
+
+  external DomHeaders get headers;
+
+  external _DomReadableStream get body;
+
+  @JS('arrayBuffer')
+  external JSPromise<JSAny?> _arrayBuffer();
+  Future<Object?> arrayBuffer() =>
+      js_util.promiseToFuture<Object?>(_arrayBuffer());
+
+  @JS('json')
+  external JSPromise<JSAny?> _json();
+  Future<Object?> json() => js_util.promiseToFuture<Object?>(_json());
+
+  @JS('text')
+  external JSPromise<JSAny?> _text();
+  Future<String> text() => js_util.promiseToFuture<String>(_text());
+}
+
+@JS()
+@staticInterop
+class DomHeaders {}
+
+extension DomHeadersExtension on DomHeaders {
+  @JS('get')
+  external JSString? _get(JSString? headerName);
+  String? get(String? headerName) => _get(headerName?.toJS)?.toDart;
+}
+
+@JS()
+@staticInterop
+class _DomReadableStream {}
+
+extension _DomReadableStreamExtension on _DomReadableStream {
+  external _DomStreamReader getReader();
+}
+
+@JS()
+@staticInterop
+class _DomStreamReader {}
+
+extension _DomStreamReaderExtension on _DomStreamReader {
+  @JS('read')
+  external JSPromise<JSAny?> _read();
+  Future<_DomStreamChunk> read() =>
+      js_util.promiseToFuture<_DomStreamChunk>(_read());
+}
+
+@JS()
+@staticInterop
+class _DomStreamChunk {}
+
+extension _DomStreamChunkExtension on _DomStreamChunk {
+  external JSAny? get value;
+
+  @JS('done')
+  external JSBoolean get _done;
+  bool get done => _done.toDart;
+}
+
+@JS()
+@staticInterop
+class DomCharacterData extends DomNode {}
+
+@JS()
+@staticInterop
+class DomText extends DomCharacterData {}
+
+DomText createDomText(String data) => domDocument.createTextNode(data);
+
+@JS()
+@staticInterop
+class DomTextMetrics {}
+
+extension DomTextMetricsExtension on DomTextMetrics {
+  @JS('width')
+  external JSNumber? get _width;
+  double? get width => _width?.toDartDouble;
+}
+
+@JS()
+@staticInterop
+class DomException {
+  static const String notSupported = 'NotSupportedError';
 }
 
 extension DomExceptionExtension on DomException {
-  external String get name;
+  @JS('name')
+  external JSString get _name;
+  String get name => _name.toDart;
 }
 
 @JS()
@@ -803,14 +2011,37 @@ extension DomExceptionExtension on DomException {
 class DomRectReadOnly {}
 
 extension DomRectReadOnlyExtension on DomRectReadOnly {
-  external double get x;
-  external double get y;
-  external double get width;
-  external double get height;
-  external double get top;
-  external double get right;
-  external double get bottom;
-  external double get left;
+  @JS('x')
+  external JSNumber get _x;
+  double get x => _x.toDartDouble;
+
+  @JS('y')
+  external JSNumber get _y;
+  double get y => _y.toDartDouble;
+
+  @JS('width')
+  external JSNumber get _width;
+  double get width => _width.toDartDouble;
+
+  @JS('height')
+  external JSNumber get _height;
+  double get height => _height.toDartDouble;
+
+  @JS('top')
+  external JSNumber get _top;
+  double get top => _top.toDartDouble;
+
+  @JS('right')
+  external JSNumber get _right;
+  double get right => _right.toDartDouble;
+
+  @JS('bottom')
+  external JSNumber get _bottom;
+  double get bottom => _bottom.toDartDouble;
+
+  @JS('left')
+  external JSNumber get _left;
+  double get left => _left.toDartDouble;
 }
 
 DomRect createDomRectFromPoints(DomPoint a, DomPoint b) {
@@ -818,30 +2049,50 @@ DomRect createDomRectFromPoints(DomPoint a, DomPoint b) {
   final num width = math.max(a.x, b.x) - left;
   final num top = math.min(a.y, b.y);
   final num height = math.max(a.y, b.y) - top;
-  return domCallConstructorString(
-      'DOMRect', <Object>[left, top, width, height])! as DomRect;
+  return DomRect(left.toJS, top.toJS, width.toJS, height.toJS);
 }
 
-@JS()
+@JS('DOMRect')
 @staticInterop
-class DomRect extends DomRectReadOnly {}
+class DomRect extends DomRectReadOnly {
+  external factory DomRect(
+      JSNumber left, JSNumber top, JSNumber width, JSNumber height);
+}
 
-@JS()
+@JS('FontFace')
 @staticInterop
-class DomFontFace {}
+class DomFontFace {
+  external factory DomFontFace._args2(JSString family, JSAny source);
+  external factory DomFontFace._args3(
+      JSString family, JSAny source, JSAny descriptors);
+}
 
 DomFontFace createDomFontFace(String family, Object source,
-        [Map<Object?, Object?>? descriptors]) =>
-    domCallConstructorString('FontFace', <Object?>[
-      family,
-      source,
-      if (descriptors != null) js_util.jsify(descriptors)
-    ])! as DomFontFace;
+    [Map<Object?, Object?>? descriptors]) {
+  if (descriptors == null) {
+    return DomFontFace._args2(family.toJS, source.toJSAnyShallow);
+  } else {
+    return DomFontFace._args3(
+        family.toJS, source.toJSAnyShallow, descriptors.toJSAnyDeep);
+  }
+}
 
 extension DomFontFaceExtension on DomFontFace {
-  Future<DomFontFace> load() =>
-      js_util.promiseToFuture(js_util.callMethod(this, 'load', <Object>[]));
-  external String? get family;
+  @JS('load')
+  external JSPromise<JSAny?> _load();
+  Future<DomFontFace> load() => js_util.promiseToFuture(_load());
+
+  @JS('family')
+  external JSString? get _family;
+  String? get family => _family?.toDart;
+
+  @JS('weight')
+  external JSString? get _weight;
+  String? get weight => _weight?.toDart;
+
+  @JS('status')
+  external JSString? get _status;
+  String? get status => _status?.toDart;
 }
 
 @JS()
@@ -850,8 +2101,12 @@ class DomFontFaceSet extends DomEventTarget {}
 
 extension DomFontFaceSetExtension on DomFontFaceSet {
   external DomFontFaceSet? add(DomFontFace font);
-  external void clear();
-  external void forEach(DomFontFaceSetForEachCallback callback);
+  external JSVoid clear();
+
+  @JS('forEach')
+  external JSVoid _forEach(JSFunction callback);
+  void forEach(DomFontFaceSetForEachCallback callback) =>
+      _forEach(callback.toJS);
 }
 
 typedef DomFontFaceSetForEachCallback = void Function(
@@ -862,8 +2117,13 @@ typedef DomFontFaceSetForEachCallback = void Function(
 class DomVisualViewport extends DomEventTarget {}
 
 extension DomVisualViewportExtension on DomVisualViewport {
-  external double? get height;
-  external double? get width;
+  @JS('height')
+  external JSNumber? get _height;
+  double? get height => _height?.toDartDouble;
+
+  @JS('width')
+  external JSNumber? get _width;
+  double? get width => _width?.toDartDouble;
 }
 
 @JS()
@@ -874,21 +2134,64 @@ DomHTMLTextAreaElement createDomHTMLTextAreaElement() =>
     domDocument.createElement('textarea') as DomHTMLTextAreaElement;
 
 extension DomHTMLTextAreaElementExtension on DomHTMLTextAreaElement {
-  external set value(String? value);
-  external void select();
-  external set placeholder(String? value);
-  external set name(String value);
-  external double? get selectionStart;
-  external double? get selectionEnd;
-  external set selectionStart(double? value);
-  external set selectionEnd(double? value);
-  external String? get value;
-  void setSelectionRange(int start, int end, [String? direction]) =>
-      js_util.callMethod(this, 'setSelectionRange',
-          <Object>[start.toDouble(), end.toDouble(),
-                   if (direction != null) direction]);
-  external String get name;
-  external String get placeholder;
+  @JS('value')
+  external set _value(JSString? value);
+  set value(String? value) => _value = value?.toJS;
+
+  external JSVoid select();
+
+  @JS('placeholder')
+  external set _placeholder(JSString? value);
+  set placeholder(String? value) => _placeholder = value?.toJS;
+
+  @JS('name')
+  external set _name(JSString value);
+  set name(String value) => _name = value.toJS;
+
+  @JS('selectionDirection')
+  external JSString? get _selectionDirection;
+  String? get selectionDirection => _selectionDirection?.toDart;
+
+  @JS('selectionStart')
+  external JSNumber? get _selectionStart;
+  double? get selectionStart => _selectionStart?.toDartDouble;
+
+  @JS('selectionEnd')
+  external JSNumber? get _selectionEnd;
+  double? get selectionEnd => _selectionEnd?.toDartDouble;
+
+  @JS('selectionStart')
+  external set _selectionStart(JSNumber? value);
+  set selectionStart(double? value) => _selectionStart = value?.toJS;
+
+  @JS('selectionEnd')
+  external set _selectionEnd(JSNumber? value);
+  set selectionEnd(double? value) => _selectionEnd = value?.toJS;
+
+  @JS('value')
+  external JSString? get _value;
+  String? get value => _value?.toDart;
+
+  @JS('setSelectionRange')
+  external JSVoid _setSelectionRange1(JSNumber start, JSNumber end);
+  @JS('setSelectionRange')
+  external JSVoid _setSelectionRange2(
+      JSNumber start, JSNumber end, JSString direction);
+  void setSelectionRange(int start, int end, [String? direction]) {
+    if (direction == null) {
+      _setSelectionRange1(start.toJS, end.toJS);
+    } else {
+      _setSelectionRange2(start.toJS, end.toJS, direction.toJS);
+    }
+  }
+
+  @JS('name')
+  external JSString get _name;
+  String get name => _name.toDart;
+
+  @JS('placeholder')
+  external JSString get _placeholder;
+  String get placeholder => _placeholder.toDart;
 }
 
 @JS()
@@ -896,44 +2199,80 @@ extension DomHTMLTextAreaElementExtension on DomHTMLTextAreaElement {
 class DomClipboard extends DomEventTarget {}
 
 extension DomClipboardExtension on DomClipboard {
-  Future<String> readText() => js_util.promiseToFuture<String>(
-      js_util.callMethod(this, 'readText', <Object>[]));
+  @JS('readText')
+  external JSPromise<JSAny?> _readText();
+  Future<String> readText() => js_util.promiseToFuture<String>(_readText());
 
-  Future<dynamic> writeText(String data) => js_util
-      .promiseToFuture(js_util.callMethod(this, 'writeText', <Object>[data]));
-}
-
-extension DomResponseExtension on DomResponse {
-  Future<dynamic> arrayBuffer() => js_util
-      .promiseToFuture(js_util.callMethod(this, 'arrayBuffer', <Object>[]));
-
-  Future<dynamic> json() =>
-      js_util.promiseToFuture(js_util.callMethod(this, 'json', <Object>[]));
-
-  Future<String> text() =>
-      js_util.promiseToFuture(js_util.callMethod(this, 'text', <Object>[]));
+  @JS('writeText')
+  external JSPromise<JSAny?> _writeText(JSString data);
+  Future<dynamic> writeText(String data) =>
+      js_util.promiseToFuture(_writeText(data.toJS));
 }
 
 @JS()
 @staticInterop
 class DomUIEvent extends DomEvent {}
 
-@JS()
+@JS('KeyboardEvent')
 @staticInterop
-class DomKeyboardEvent extends DomUIEvent {}
+class DomKeyboardEvent extends DomUIEvent {
+  external factory DomKeyboardEvent.arg1(JSString type);
+  external factory DomKeyboardEvent.arg2(JSString type, JSAny initDict);
+}
 
 extension DomKeyboardEventExtension on DomKeyboardEvent {
-  external bool get altKey;
-  external String? get code;
-  external bool get ctrlKey;
-  external String? get key;
-  external double get keyCode;
-  external double get location;
-  external bool get metaKey;
-  external bool? get repeat;
-  external bool get shiftKey;
-  external bool get isComposing;
-  external bool getModifierState(String keyArg);
+  @JS('altKey')
+  external JSBoolean get _altKey;
+  bool get altKey => _altKey.toDart;
+
+  @JS('code')
+  external JSString? get _code;
+  String? get code => _code?.toDart;
+
+  @JS('ctrlKey')
+  external JSBoolean get _ctrlKey;
+  bool get ctrlKey => _ctrlKey.toDart;
+
+  @JS('key')
+  external JSString? get _key;
+  String? get key => _key?.toDart;
+
+  @JS('keyCode')
+  external JSNumber get _keyCode;
+  double get keyCode => _keyCode.toDartDouble;
+
+  @JS('location')
+  external JSNumber get _location;
+  double get location => _location.toDartDouble;
+
+  @JS('metaKey')
+  external JSBoolean get _metaKey;
+  bool get metaKey => _metaKey.toDart;
+
+  @JS('repeat')
+  external JSBoolean? get _repeat;
+  bool? get repeat => _repeat?.toDart;
+
+  @JS('shiftKey')
+  external JSBoolean get _shiftKey;
+  bool get shiftKey => _shiftKey.toDart;
+
+  @JS('isComposing')
+  external JSBoolean get _isComposing;
+  bool get isComposing => _isComposing.toDart;
+
+  @JS('getModifierState')
+  external JSBoolean _getModifierState(JSString keyArg);
+  bool getModifierState(String keyArg) => _getModifierState(keyArg.toJS).toDart;
+}
+
+DomKeyboardEvent createDomKeyboardEvent(String type,
+    [Map<dynamic, dynamic>? init]) {
+  if (init == null) {
+    return DomKeyboardEvent.arg1(type.toJS);
+  } else {
+    return DomKeyboardEvent.arg2(type.toJS, init.toJSAnyDeep);
+  }
 }
 
 @JS()
@@ -941,22 +2280,31 @@ extension DomKeyboardEventExtension on DomKeyboardEvent {
 class DomHistory {}
 
 extension DomHistoryExtension on DomHistory {
-  dynamic get state => js_util.dartify(js_util.getProperty(this, 'state'));
-  void go([int? delta]) =>
-      js_util.callMethod(this, 'go',
-          <Object>[if (delta != null) delta.toDouble()]);
-  void pushState(dynamic data, String title, String? url) =>
-      js_util.callMethod(this, 'pushState', <Object?>[
-        if (data is Map || data is Iterable) js_util.jsify(data as Object) else data,
-        title,
-        url
-      ]);
-  void replaceState(dynamic data, String title, String? url) =>
-      js_util.callMethod(this, 'replaceState', <Object?>[
-        if (data is Map || data is Iterable) js_util.jsify(data as Object) else data,
-        title,
-        url
-      ]);
+  @JS('state')
+  external JSAny? get _state;
+  dynamic get state => _state?.toObjectDeep;
+
+  @JS('go')
+  external JSVoid _go1();
+  @JS('go')
+  external JSVoid _go2(JSNumber delta);
+  void go([int? delta]) {
+    if (delta == null) {
+      _go1();
+    } else {
+      _go2(delta.toJS);
+    }
+  }
+
+  @JS('pushState')
+  external JSVoid _pushState(JSAny? data, JSString title, JSString? url);
+  void pushState(Object? data, String title, String? url) =>
+      _pushState(data?.toJSAnyDeep, title.toJS, url?.toJS);
+
+  @JS('replaceState')
+  external JSVoid _replaceState(JSAny? data, JSString title, JSString? url);
+  void replaceState(Object? data, String title, String? url) =>
+      _replaceState(data?.toJSAnyDeep, title.toJS, url?.toJS);
 }
 
 @JS()
@@ -964,27 +2312,48 @@ extension DomHistoryExtension on DomHistory {
 class DomLocation {}
 
 extension DomLocationExtension on DomLocation {
-  external String? get pathname;
-  external String? get search;
+  @JS('pathname')
+  external JSString? get _pathname;
+  String? get pathname => _pathname?.toDart;
+
+  @JS('search')
+  external JSString? get _search;
+  String? get search => _search?.toDart;
+
+  @JS('hash')
+  external JSString get _hash;
   // We have to change the name here because 'hash' is inherited from [Object].
-  String get locationHash => js_util.getProperty(this, 'hash');
-  external String get origin;
-  external String get href;
+  String get locationHash => _hash.toDart;
+
+  @JS('origin')
+  external JSString get _origin;
+  String get origin => _origin.toDart;
+
+  @JS('href')
+  external JSString get _href;
+  String get href => _href.toDart;
 }
 
-@JS()
+@JS('PopStateEvent')
 @staticInterop
-class DomPopStateEvent extends DomEvent {}
+class DomPopStateEvent extends DomEvent {
+  external factory DomPopStateEvent.arg1(JSString type);
+  external factory DomPopStateEvent.arg2(JSString type, JSAny initDict);
+}
 
 DomPopStateEvent createDomPopStateEvent(
-        String type, Map<Object?, Object?>? eventInitDict) =>
-    domCallConstructorString('PopStateEvent', <Object?>[
-      type,
-      if (eventInitDict != null) js_util.jsify(eventInitDict)
-    ])! as DomPopStateEvent;
+    String type, Map<Object?, Object?>? eventInitDict) {
+  if (eventInitDict == null) {
+    return DomPopStateEvent.arg1(type.toJS);
+  } else {
+    return DomPopStateEvent.arg2(type.toJS, eventInitDict.toJSAnyDeep);
+  }
+}
 
 extension DomPopStateEventExtension on DomPopStateEvent {
-  dynamic get state => js_util.dartify(js_util.getProperty(this, 'state'));
+  @JS('state')
+  external JSAny? get _state;
+  dynamic get state => _state?.toObjectDeep;
 }
 
 @JS()
@@ -992,30 +2361,54 @@ extension DomPopStateEventExtension on DomPopStateEvent {
 class DomURL {}
 
 extension DomURLExtension on DomURL {
-  external String createObjectURL(Object object);
-  external void revokeObjectURL(String url);
+  @JS('createObjectURL')
+  external JSString _createObjectURL(JSAny object);
+  String createObjectURL(Object object) =>
+      _createObjectURL(object.toJSAnyShallow).toDart;
+
+  @JS('revokeObjectURL')
+  external JSVoid _revokeObjectURL(JSString url);
+  void revokeObjectURL(String url) => _revokeObjectURL(url.toJS);
 }
 
-@JS()
+@JS('Blob')
 @staticInterop
-class DomBlob {}
+class DomBlob {
+  external factory DomBlob(JSArray<JSAny?> parts);
+
+  external factory DomBlob.withOptions(JSArray<JSAny?> parts, JSAny options);
+}
+
+extension DomBlobExtension on DomBlob {
+  external JSPromise<JSAny?> arrayBuffer();
+}
 
-DomBlob createDomBlob(List<Object?> parts) =>
-    domCallConstructorString('Blob', <Object>[parts])! as DomBlob;
+DomBlob createDomBlob(List<Object?> parts, [Map<String, dynamic>? options]) {
+  if (options == null) {
+    return DomBlob(parts.toJSAnyShallow as JSArray<JSAny?>);
+  } else {
+    return DomBlob.withOptions(
+        parts.toJSAnyShallow as JSArray<JSAny?>, options.toJSAnyDeep);
+  }
+}
 
 typedef DomMutationCallback = void Function(
-    List<dynamic> mutation, DomMutationObserver observer);
+    JSArray<JSAny?> mutation, DomMutationObserver observer);
 
-@JS()
+@JS('MutationObserver')
 @staticInterop
-class DomMutationObserver {}
+class DomMutationObserver {
+  external factory DomMutationObserver(JSFunction callback);
+}
 
 DomMutationObserver createDomMutationObserver(DomMutationCallback callback) =>
-    domCallConstructorString('MutationObserver', <Object>[callback])!
-        as DomMutationObserver;
+    DomMutationObserver(callback.toJS);
 
 extension DomMutationObserverExtension on DomMutationObserver {
-  external void disconnect();
+  external JSVoid disconnect();
+
+  @JS('observe')
+  external JSVoid _observe(DomNode target, JSAny options);
   void observe(DomNode target,
       {bool? childList, bool? attributes, List<String>? attributeFilter}) {
     final Map<String, dynamic> options = <String, dynamic>{
@@ -1023,8 +2416,7 @@ extension DomMutationObserverExtension on DomMutationObserver {
       if (attributes != null) 'attributes': attributes,
       if (attributeFilter != null) 'attributeFilter': attributeFilter
     };
-    return js_util
-        .callMethod(this, 'observe', <Object?>[target, js_util.jsify(options)]);
+    return _observe(target, options.toJSAnyDeep);
   }
 }
 
@@ -1033,24 +2425,33 @@ extension DomMutationObserverExtension on DomMutationObserver {
 class DomMutationRecord {}
 
 extension DomMutationRecordExtension on DomMutationRecord {
+  @JS('addedNodes')
+  external _DomList? get _addedNodes;
   Iterable<DomNode>? get addedNodes {
-    final _DomList? list = js_util.getProperty<_DomList?>(this, 'addedNodes');
+    final _DomList? list = _addedNodes;
     if (list == null) {
       return null;
     }
     return createDomListWrapper<DomNode>(list);
   }
 
+  @JS('removedNodes')
+  external _DomList? get _removedNodes;
   Iterable<DomNode>? get removedNodes {
-    final _DomList? list = js_util.getProperty<_DomList?>(this, 'removedNodes');
+    final _DomList? list = _removedNodes;
     if (list == null) {
       return null;
     }
     return createDomListWrapper<DomNode>(list);
   }
 
-  external String? get attributeName;
-  external String? get type;
+  @JS('attributeName')
+  external JSString? get _attributeName;
+  String? get attributeName => _attributeName?.toDart;
+
+  @JS('type')
+  external JSString? get _type;
+  String? get type => _type?.toDart;
 }
 
 @JS()
@@ -1058,9 +2459,15 @@ extension DomMutationRecordExtension on DomMutationRecord {
 class DomMediaQueryList extends DomEventTarget {}
 
 extension DomMediaQueryListExtension on DomMediaQueryList {
-  external bool get matches;
-  external void addListener(DomEventListener? listener);
-  external void removeListener(DomEventListener? listener);
+  @JS('matches')
+  external JSBoolean get _matches;
+  bool get matches => _matches.toDart;
+
+  @JS('addListener')
+  external JSVoid addListener(DomEventListener? listener);
+
+  @JS('removeListener')
+  external JSVoid removeListener(DomEventListener? listener);
 }
 
 @JS()
@@ -1068,140 +2475,365 @@ extension DomMediaQueryListExtension on DomMediaQueryList {
 class DomMediaQueryListEvent extends DomEvent {}
 
 extension DomMediaQueryListEventExtension on DomMediaQueryListEvent {
-  external bool? get matches;
+  @JS('matches')
+  external JSBoolean? get _matches;
+  bool? get matches => _matches?.toDart;
 }
 
-@JS()
+@JS('Path2D')
 @staticInterop
-class DomPath2D {}
+class DomPath2D {
+  external factory DomPath2D.arg1();
+  external factory DomPath2D.arg2(JSAny path);
+}
+
+DomPath2D createDomPath2D([Object? path]) {
+  if (path == null) {
+    return DomPath2D.arg1();
+  } else {
+    return DomPath2D.arg2(path.toJSAnyShallow);
+  }
+}
 
-DomPath2D createDomPath2D([Object? path]) =>
-    domCallConstructorString('Path2D', <Object>[if (path != null) path])!
-        as DomPath2D;
+@JS('InputEvent')
+@staticInterop
+class DomInputEvent extends DomUIEvent {
+  external factory DomInputEvent.arg1(JSString type);
+  external factory DomInputEvent.arg2(JSString type, JSAny initDict);
+}
 
-@JS()
+@JS('FocusEvent')
 @staticInterop
-class DomMouseEvent extends DomUIEvent {}
+class DomFocusEvent extends DomUIEvent {}
+
+extension DomFocusEventExtension on DomFocusEvent {
+  external DomEventTarget? get relatedTarget;
+}
+
+@JS('MouseEvent')
+@staticInterop
+class DomMouseEvent extends DomUIEvent {
+  external factory DomMouseEvent.arg1(JSString type);
+  external factory DomMouseEvent.arg2(JSString type, JSAny initDict);
+}
 
 extension DomMouseEventExtension on DomMouseEvent {
-  external double get clientX;
-  external double get clientY;
-  external double get offsetX;
-  external double get offsetY;
+  @JS('clientX')
+  external JSNumber get _clientX;
+  double get clientX => _clientX.toDartDouble;
+
+  @JS('clientY')
+  external JSNumber get _clientY;
+  double get clientY => _clientY.toDartDouble;
+
+  @JS('offsetX')
+  external JSNumber get _offsetX;
+  double get offsetX => _offsetX.toDartDouble;
+
+  @JS('offsetY')
+  external JSNumber get _offsetY;
+  double get offsetY => _offsetY.toDartDouble;
+
+  @JS('pageX')
+  external JSNumber get _pageX;
+  double get pageX => _pageX.toDartDouble;
+
+  @JS('pageY')
+  external JSNumber get _pageY;
+  double get pageY => _pageY.toDartDouble;
+
   DomPoint get client => DomPoint(clientX, clientY);
   DomPoint get offset => DomPoint(offsetX, offsetY);
-  external double get button;
-  external double? get buttons;
-  external bool getModifierState(String keyArg);
+
+  @JS('button')
+  external JSNumber get _button;
+  double get button => _button.toDartDouble;
+
+  @JS('buttons')
+  external JSNumber? get _buttons;
+  double? get buttons => _buttons?.toDartDouble;
+
+  @JS('ctrlKey')
+  external JSBoolean get _ctrlKey;
+  bool get ctrlKey => _ctrlKey.toDart;
+
+  @JS('getModifierState')
+  external JSBoolean _getModifierState(JSString keyArg);
+  bool getModifierState(String keyArg) => _getModifierState(keyArg.toJS).toDart;
 }
 
-DomMouseEvent createDomMouseEvent(String type, [Map<dynamic, dynamic>? init]) =>
-    js_util.callConstructor(domGetConstructor('MouseEvent')!,
-        <Object?>[type, if (init != null) js_util.jsify(init)]);
+DomMouseEvent createDomMouseEvent(String type, [Map<dynamic, dynamic>? init]) {
+  if (init == null) {
+    return DomMouseEvent.arg1(type.toJS);
+  } else {
+    return DomMouseEvent.arg2(type.toJS, init.toJSAnyDeep);
+  }
+}
 
-@JS()
+DomInputEvent createDomInputEvent(String type, [Map<dynamic, dynamic>? init]) {
+  if (init == null) {
+    return DomInputEvent.arg1(type.toJS);
+  } else {
+    return DomInputEvent.arg2(type.toJS, init.toJSAnyDeep);
+  }
+}
+
+@JS('PointerEvent')
 @staticInterop
-class DomPointerEvent extends DomMouseEvent {}
+class DomPointerEvent extends DomMouseEvent {
+  external factory DomPointerEvent.arg1(JSString type);
+  external factory DomPointerEvent.arg2(JSString type, JSAny initDict);
+}
 
 extension DomPointerEventExtension on DomPointerEvent {
-  external double? get pointerId;
-  external String? get pointerType;
-  external double? get pressure;
-  external double? get tiltX;
-  external double? get tiltY;
+  @JS('pointerId')
+  external JSNumber? get _pointerId;
+  double? get pointerId => _pointerId?.toDartDouble;
+
+  @JS('pointerType')
+  external JSString? get _pointerType;
+  String? get pointerType => _pointerType?.toDart;
+
+  @JS('pressure')
+  external JSNumber? get _pressure;
+  double? get pressure => _pressure?.toDartDouble;
+
+  @JS('tiltX')
+  external JSNumber? get _tiltX;
+  double? get tiltX => _tiltX?.toDartDouble;
+
+  @JS('tiltY')
+  external JSNumber? get _tiltY;
+  double? get tiltY => _tiltY?.toDartDouble;
+
+  @JS('getCoalescedEvents')
+  external JSArray<JSAny?> _getCoalescedEvents();
   List<DomPointerEvent> getCoalescedEvents() =>
-      js_util.callMethod<List<Object?>>(
-          this, 'getCoalescedEvents', <Object>[]).cast<DomPointerEvent>();
+      _getCoalescedEvents().toDart.cast<DomPointerEvent>();
 }
 
 DomPointerEvent createDomPointerEvent(String type,
-        [Map<dynamic, dynamic>? init]) =>
-    js_util.callConstructor(domGetConstructor('PointerEvent')!,
-        <Object?>[type, if (init != null) js_util.jsify(init)]);
+    [Map<dynamic, dynamic>? init]) {
+  if (init == null) {
+    return DomPointerEvent.arg1(type.toJS);
+  } else {
+    return DomPointerEvent.arg2(type.toJS, init.toJSAnyDeep);
+  }
+}
 
-@JS()
+@JS('WheelEvent')
 @staticInterop
-class DomWheelEvent extends DomMouseEvent {}
+class DomWheelEvent extends DomMouseEvent {
+  external factory DomWheelEvent.arg1(JSString type);
+  external factory DomWheelEvent.arg2(JSString type, JSAny initDict);
+}
 
 extension DomWheelEventExtension on DomWheelEvent {
-  external double get deltaX;
-  external double get deltaY;
-  external double get deltaMode;
+  @JS('deltaX')
+  external JSNumber get _deltaX;
+  double get deltaX => _deltaX.toDartDouble;
+
+  @JS('deltaY')
+  external JSNumber get _deltaY;
+  double get deltaY => _deltaY.toDartDouble;
+
+  @JS('wheelDeltaX')
+  external JSNumber? get _wheelDeltaX;
+  double? get wheelDeltaX => _wheelDeltaX?.toDartDouble;
+
+  @JS('wheelDeltaY')
+  external JSNumber? get _wheelDeltaY;
+  double? get wheelDeltaY => _wheelDeltaY?.toDartDouble;
+
+  @JS('deltaMode')
+  external JSNumber get _deltaMode;
+  double get deltaMode => _deltaMode.toDartDouble;
 }
 
-@JS()
+DomWheelEvent createDomWheelEvent(String type, [Map<dynamic, dynamic>? init]) {
+  if (init == null) {
+    return DomWheelEvent.arg1(type.toJS);
+  } else {
+    return DomWheelEvent.arg2(type.toJS, init.toJSAnyDeep);
+  }
+}
+
+@JS('TouchEvent')
 @staticInterop
-class DomTouchEvent extends DomUIEvent {}
+class DomTouchEvent extends DomUIEvent {
+  external factory DomTouchEvent.arg1(JSString type);
+  external factory DomTouchEvent.arg2(JSString type, JSAny initDict);
+}
 
 extension DomTouchEventExtension on DomTouchEvent {
-  external bool get altKey;
-  external bool get ctrlKey;
-  external bool get metaKey;
-  external bool get shiftKey;
-  List<DomTouch>? get changedTouches => js_util
-      .getProperty<List<Object?>?>(this, 'changedTouches')
-      ?.cast<DomTouch>();
+  @JS('altKey')
+  external JSBoolean get _altKey;
+  bool get altKey => _altKey.toDart;
+
+  @JS('ctrlKey')
+  external JSBoolean get _ctrlKey;
+  bool get ctrlKey => _ctrlKey.toDart;
+
+  @JS('metaKey')
+  external JSBoolean get _metaKey;
+  bool get metaKey => _metaKey.toDart;
+
+  @JS('shiftKey')
+  external JSBoolean get _shiftKey;
+  bool get shiftKey => _shiftKey.toDart;
+
+  @JS('changedTouches')
+  external _DomTouchList get _changedTouches;
+  Iterable<DomTouch> get changedTouches =>
+      createDomTouchListWrapper<DomTouch>(_changedTouches);
 }
 
-@JS()
+@JS('Touch')
 @staticInterop
-class DomTouch {}
+class DomTouch {
+  external factory DomTouch.arg1();
+  external factory DomTouch.arg2(JSAny initDict);
+}
 
 extension DomTouchExtension on DomTouch {
-  external double? get identifier;
-  external double get clientX;
-  external double get clientY;
+  @JS('identifier')
+  external JSNumber? get _identifier;
+  double? get identifier => _identifier?.toDartDouble;
+
+  @JS('clientX')
+  external JSNumber get _clientX;
+  double get clientX => _clientX.toDartDouble;
+
+  @JS('clientY')
+  external JSNumber get _clientY;
+  double get clientY => _clientY.toDartDouble;
+
   DomPoint get client => DomPoint(clientX, clientY);
 }
 
-DomTouch createDomTouch([Map<dynamic, dynamic>? init]) =>
-    js_util.callConstructor(domGetConstructor('Touch')!,
-        <Object?>[if (init != null) js_util.jsify(init)]) as DomTouch;
-
-DomTouchEvent createDomTouchEvent(String type, [Map<dynamic, dynamic>? init]) =>
-    js_util.callConstructor(domGetConstructor('TouchEvent')!,
-        <Object?>[type, if (init != null) js_util.jsify(init)]);
+DomTouch createDomTouch([Map<dynamic, dynamic>? init]) {
+  if (init == null) {
+    return DomTouch.arg1();
+  } else {
+    return DomTouch.arg2(init.toJSAnyDeep);
+  }
+}
 
-@JS()
+@JS('CompositionEvent')
 @staticInterop
-class DomCompositionEvent extends DomUIEvent {}
+class DomCompositionEvent extends DomUIEvent {
+  external factory DomCompositionEvent.arg1(JSString type);
+  external factory DomCompositionEvent.arg2(JSString type, JSAny initDict);
+}
 
 extension DomCompositionEventExtension on DomCompositionEvent {
-  external String? get data;
+  @JS('data')
+  external JSString? get _data;
+  String? get data => _data?.toDart;
 }
 
 DomCompositionEvent createDomCompositionEvent(String type,
-        [Map<dynamic, dynamic>? options]) =>
-    js_util.callConstructor(domGetConstructor('CompositionEvent')!,
-        <Object?>[type, if (options != null) js_util.jsify(options)]);
+    [Map<dynamic, dynamic>? options]) {
+  if (options == null) {
+    return DomCompositionEvent.arg1(type.toJS);
+  } else {
+    return DomCompositionEvent.arg2(type.toJS, options.toJSAnyDeep);
+  }
+}
 
 @JS()
 @staticInterop
 class DomHTMLInputElement extends DomHTMLElement {}
 
 extension DomHTMLInputElementExtension on DomHTMLInputElement {
-  external set type(String? value);
-  external set max(String? value);
-  external set min(String value);
-  external set value(String? value);
-  external String? get value;
-  external bool? get disabled;
-  external set disabled(bool? value);
-  external set placeholder(String? value);
-  external set name(String? value);
-  external set autocomplete(String value);
-  external double? get selectionStart;
-  external double? get selectionEnd;
-  external set selectionStart(double? value);
-  external set selectionEnd(double? value);
-  void setSelectionRange(int start, int end, [String? direction]) =>
-      js_util.callMethod(this, 'setSelectionRange',
-          <Object>[start.toDouble(), end.toDouble(),
-                   if (direction != null) direction]);
-  external String get autocomplete;
-  external String? get name;
-  external String? get type;
-  external String get placeholder;
+  @JS('type')
+  external set _type(JSString? value);
+  set type(String? value) => _type = value?.toJS;
+
+  @JS('max')
+  external set _max(JSString? value);
+  set max(String? value) => _max = value?.toJS;
+
+  @JS('min')
+  external set _min(JSString value);
+  set min(String value) => _min = value.toJS;
+
+  @JS('value')
+  external set _value(JSString? value);
+  set value(String? v) => _value = v?.toJS;
+
+  @JS('value')
+  external JSString? get _value;
+  String? get value => _value?.toDart;
+
+  @JS('disabled')
+  external JSBoolean? get _disabled;
+  bool? get disabled => _disabled?.toDart;
+
+  @JS('disabled')
+  external set _disabled(JSBoolean? value);
+  set disabled(bool? value) => _disabled = value?.toJS;
+
+  @JS('placeholder')
+  external set _placeholder(JSString? value);
+  set placeholder(String? value) => _placeholder = value?.toJS;
+
+  @JS('name')
+  external set _name(JSString? value);
+  set name(String? value) => _name = value?.toJS;
+
+  @JS('autocomplete')
+  external set _autocomplete(JSString value);
+  set autocomplete(String value) => _autocomplete = value.toJS;
+
+  @JS('selectionDirection')
+  external JSString? get _selectionDirection;
+  String? get selectionDirection => _selectionDirection?.toDart;
+
+  @JS('selectionStart')
+  external JSNumber? get _selectionStart;
+  double? get selectionStart => _selectionStart?.toDartDouble;
+
+  @JS('selectionEnd')
+  external JSNumber? get _selectionEnd;
+  double? get selectionEnd => _selectionEnd?.toDartDouble;
+
+  @JS('selectionStart')
+  external set _selectionStart(JSNumber? value);
+  set selectionStart(double? value) => _selectionStart = value?.toJS;
+
+  @JS('selectionEnd')
+  external set _selectionEnd(JSNumber? value);
+  set selectionEnd(double? value) => _selectionEnd = value?.toJS;
+
+  @JS('setSelectionRange')
+  external JSVoid _setSelectionRange1(JSNumber start, JSNumber end);
+  @JS('setSelectionRange')
+  external JSVoid _setSelectionRange2(
+      JSNumber start, JSNumber end, JSString direction);
+  void setSelectionRange(int start, int end, [String? direction]) {
+    if (direction == null) {
+      _setSelectionRange1(start.toJS, end.toJS);
+    } else {
+      _setSelectionRange2(start.toJS, end.toJS, direction.toJS);
+    }
+  }
+
+  @JS('autocomplete')
+  external JSString get _autocomplete;
+  String get autocomplete => _autocomplete.toDart;
+
+  @JS('name')
+  external JSString? get _name;
+  String? get name => _name?.toDart;
+
+  @JS('type')
+  external JSString? get _type;
+  String? get type => _type?.toDart;
+
+  @JS('placeholder')
+  external JSString get _placeholder;
+  String get placeholder => _placeholder.toDart;
 }
 
 DomHTMLInputElement createDomHTMLInputElement() =>
@@ -1212,9 +2844,17 @@ DomHTMLInputElement createDomHTMLInputElement() =>
 class DomTokenList {}
 
 extension DomTokenListExtension on DomTokenList {
-  external void add(String value);
-  external void remove(String value);
-  external bool contains(String token);
+  @JS('add')
+  external JSVoid _add(JSString value);
+  void add(String value) => _add(value.toJS);
+
+  @JS('remove')
+  external JSVoid _remove(JSString value);
+  void remove(String value) => _remove(value.toJS);
+
+  @JS('contains')
+  external JSBoolean _contains(JSString token);
+  bool contains(String token) => _contains(token.toJS).toDart;
 }
 
 @JS()
@@ -1222,9 +2862,17 @@ extension DomTokenListExtension on DomTokenList {
 class DomHTMLFormElement extends DomHTMLElement {}
 
 extension DomHTMLFormElementExtension on DomHTMLFormElement {
-  external set noValidate(bool? value);
-  external set method(String? value);
-  external set action(String? value);
+  @JS('noValidate')
+  external set _noValidate(JSBoolean? value);
+  set noValidate(bool? value) => _noValidate = value?.toJS;
+
+  @JS('method')
+  external set _method(JSString? value);
+  set method(String? value) => _method = value?.toJS;
+
+  @JS('action')
+  external set _action(JSString? value);
+  set action(String? value) => _action = value?.toJS;
 }
 
 DomHTMLFormElement createDomHTMLFormElement() =>
@@ -1237,53 +2885,101 @@ class DomHTMLLabelElement extends DomHTMLElement {}
 DomHTMLLabelElement createDomHTMLLabelElement() =>
     domDocument.createElement('label') as DomHTMLLabelElement;
 
-@JS()
+@JS('OffscreenCanvas')
 @staticInterop
-class DomOffscreenCanvas extends DomEventTarget {}
+class DomOffscreenCanvas extends DomEventTarget {
+  external factory DomOffscreenCanvas(JSNumber width, JSNumber height);
+}
 
 extension DomOffscreenCanvasExtension on DomOffscreenCanvas {
-  external double? get height;
-  external double? get width;
-  external set height(double? value);
-  external set width(double? value);
+  @JS('height')
+  external JSNumber? get _height;
+  double? get height => _height?.toDartDouble;
+
+  @JS('width')
+  external JSNumber? get _width;
+  double? get width => _width?.toDartDouble;
+
+  @JS('height')
+  external set _height(JSNumber? value);
+  set height(double? value) => _height = value?.toJS;
+
+  @JS('width')
+  external set _width(JSNumber? value);
+  set width(double? value) => _width = value?.toJS;
+
+  @JS('getContext')
+  external JSAny? _getContext1(JSString contextType);
+  @JS('getContext')
+  external JSAny? _getContext2(JSString contextType, JSAny attributes);
   Object? getContext(String contextType, [Map<dynamic, dynamic>? attributes]) {
-    return js_util.callMethod(this, 'getContext', <Object?>[
-      contextType,
-      if (attributes != null) js_util.jsify(attributes)
-    ]);
+    if (attributes == null) {
+      return _getContext1(contextType.toJS);
+    } else {
+      return _getContext2(contextType.toJS, attributes.toJSAnyDeep);
+    }
+  }
+
+  WebGLContext getGlContext(int majorVersion) {
+    if (majorVersion == 1) {
+      return getContext('webgl')! as WebGLContext;
+    }
+    return getContext('webgl2')! as WebGLContext;
+  }
+
+  @JS('convertToBlob')
+  external JSPromise<JSAny?> _convertToBlob1();
+  @JS('convertToBlob')
+  external JSPromise<JSAny?> _convertToBlob2(JSAny options);
+  Future<DomBlob> convertToBlob([Map<Object?, Object?>? options]) {
+    final JSPromise<JSAny?> blob;
+    if (options == null) {
+      blob = _convertToBlob1();
+    } else {
+      blob = _convertToBlob2(options.toJSAnyDeep);
+    }
+    return js_util.promiseToFuture(blob);
   }
 
-  Future<DomBlob> convertToBlob([Map<Object?, Object?>? options]) =>
-      js_util.promiseToFuture(js_util.callMethod(this, 'convertToBlob',
-          <Object?>[if (options != null) js_util.jsify(options)]));
+  @JS('transferToImageBitmap')
+  external JSAny? _transferToImageBitmap();
+  DomImageBitmap transferToImageBitmap() =>
+      _transferToImageBitmap()! as DomImageBitmap;
 }
 
 DomOffscreenCanvas createDomOffscreenCanvas(int width, int height) =>
-    js_util.callConstructor(
-        domGetConstructor('OffscreenCanvas')!,
-        <Object>[width.toDouble(), height.toDouble()]);
+    DomOffscreenCanvas(width.toJS, height.toJS);
 
-@JS()
+@JS('FileReader')
 @staticInterop
-class DomFileReader extends DomEventTarget {}
+class DomFileReader extends DomEventTarget {
+  external factory DomFileReader();
+}
 
 extension DomFileReaderExtension on DomFileReader {
-  external void readAsDataURL(DomBlob blob);
+  external JSVoid readAsDataURL(DomBlob blob);
 }
 
-DomFileReader createDomFileReader() =>
-    js_util.callConstructor(domGetConstructor('FileReader')!, <Object>[])
-        as DomFileReader;
+DomFileReader createDomFileReader() => DomFileReader();
 
 @JS()
 @staticInterop
 class DomDocumentFragment extends DomNode {}
 
 extension DomDocumentFragmentExtension on DomDocumentFragment {
-  external DomElement? querySelector(String selectors);
+  external DomElement? get firstElementChild;
+  external DomElement? get lastElementChild;
+
+  external JSVoid prepend(DomNode node);
+
+  @JS('querySelector')
+  external DomElement? _querySelector(JSString selectors);
+  DomElement? querySelector(String selectors) => _querySelector(selectors.toJS);
+
+  @JS('querySelectorAll')
+  external _DomList _querySelectorAll(JSString selectors);
   Iterable<DomElement> querySelectorAll(String selectors) =>
-      createDomListWrapper<DomElement>(js_util
-          .callMethod<_DomList>(this, 'querySelectorAll', <Object>[selectors]));
+      createDomListWrapper<DomElement>(_querySelectorAll(selectors.toJS));
 }
 
 @JS()
@@ -1293,11 +2989,19 @@ class DomShadowRoot extends DomDocumentFragment {}
 extension DomShadowRootExtension on DomShadowRoot {
   external DomElement? get activeElement;
   external DomElement? get host;
-  external String? get mode;
-  external bool? get delegatesFocus;
+
+  @JS('mode')
+  external JSString? get _mode;
+  String? get mode => _mode?.toDart;
+
+  @JS('delegatesFocus')
+  external JSBoolean? get _delegatesFocus;
+  bool? get delegatesFocus => _delegatesFocus?.toDart;
+
+  @JS('elementFromPoint')
+  external DomElement? _elementFromPoint(JSNumber x, JSNumber y);
   DomElement? elementFromPoint(int x, int y) =>
-      js_util.callMethod<DomElement?>(this, 'elementFromPoint',
-          <Object>[x.toDouble(), y.toDouble()]);
+      _elementFromPoint(x.toJS, y.toJS);
 }
 
 @JS()
@@ -1309,23 +3013,45 @@ class DomStyleSheet {}
 class DomCSSStyleSheet extends DomStyleSheet {}
 
 extension DomCSSStyleSheetExtension on DomCSSStyleSheet {
-  external DomCSSRuleList get cssRules;
-  double insertRule(String rule, [int? index]) => js_util
-      .callMethod<double>(
-          this, 'insertRule',
-          <Object>[rule, if (index != null) index.toDouble()]);
+  @JS('cssRules')
+  external _DomList get _cssRules;
+  Iterable<DomCSSRule> get cssRules =>
+      createDomListWrapper<DomCSSRule>(_cssRules);
+
+  @JS('insertRule')
+  external JSNumber _insertRule1(JSString rule);
+  @JS('insertRule')
+  external JSNumber _insertRule2(JSString rule, JSNumber index);
+  double insertRule(String rule, [int? index]) {
+    if (index == null) {
+      return _insertRule1(rule.toJS).toDartDouble;
+    } else {
+      return _insertRule2(rule.toJS, index.toJS).toDartDouble;
+    }
+  }
 }
 
 @JS()
 @staticInterop
 class DomCSSRule {}
 
+@JS()
+@staticInterop
+extension DomCSSRuleExtension on DomCSSRule {
+  @JS('cssText')
+  external JSString get _cssText;
+  String get cssText => _cssText.toDart;
+}
+
 @JS()
 @staticInterop
 class DomScreen {}
 
 extension DomScreenExtension on DomScreen {
   external DomScreenOrientation? get orientation;
+
+  external double get width;
+  external double get height;
 }
 
 @JS()
@@ -1333,27 +3059,30 @@ extension DomScreenExtension on DomScreen {
 class DomScreenOrientation extends DomEventTarget {}
 
 extension DomScreenOrientationExtension on DomScreenOrientation {
-  Future<dynamic> lock(String orientation) {
-    final Object jsResult = js_util.callMethod<Object>(this, 'lock', <String>[orientation]);
-    return js_util.promiseToFuture(jsResult);
-  }
-  external void unlock();
+  @JS('lock')
+  external JSPromise<JSAny?> _lock(JSString orientation);
+  Future<dynamic> lock(String orientation) =>
+      js_util.promiseToFuture(_lock(orientation.toJS));
+
+  external JSVoid unlock();
 }
 
 // A helper class for managing a subscription. On construction it will add an
 // event listener of the requested type to the target. Calling [cancel] will
-// remove the listener. Caller is still responsible for calling [allowInterop]
-// on the listener before creating the subscription.
+// remove the listener.
 class DomSubscription {
-  DomSubscription(this.target, this.type, this.listener) {
-    target.addEventListener(type, listener);
+  DomSubscription(
+      this.target, String typeString, DartDomEventListener dartListener)
+      : type = typeString.toJS,
+        listener = createDomEventListener(dartListener) {
+    target._addEventListener1(type, listener);
   }
 
-  final String type;
+  final JSString type;
   final DomEventTarget target;
   final DomEventListener listener;
 
-  void cancel() => target.removeEventListener(type, listener);
+  void cancel() => target._removeEventListener1(type, listener);
 }
 
 class DomPoint {
@@ -1363,24 +3092,57 @@ class DomPoint {
   final num y;
 }
 
-@JS()
+@JS('WebSocket')
 @staticInterop
-class DomWebSocket extends DomEventTarget {}
+class DomWebSocket extends DomEventTarget {
+  external factory DomWebSocket(JSString url);
+}
 
 extension DomWebSocketExtension on DomWebSocket {
-  external void send(Object? data);
+  @JS('send')
+  external JSVoid _send(JSAny? data);
+  void send(Object? data) => _send(data?.toJSAnyShallow);
 }
 
-DomWebSocket createDomWebSocket(String url) =>
-    domCallConstructorString('WebSocket', <Object>[url])! as DomWebSocket;
+DomWebSocket createDomWebSocket(String url) => DomWebSocket(url.toJS);
 
 @JS()
 @staticInterop
 class DomMessageEvent extends DomEvent {}
 
 extension DomMessageEventExtension on DomMessageEvent {
-  dynamic get data => js_util.dartify(js_util.getProperty(this, 'data'));
-  external String get origin;
+  @JS('data')
+  external JSAny? get _data;
+  dynamic get data => _data?.toObjectDeep;
+
+  @JS('origin')
+  external JSString get _origin;
+  String get origin => _origin.toDart;
+
+  /// The source may be a `WindowProxy`, a `MessagePort`, or a `ServiceWorker`.
+  ///
+  /// When a message is sent from an iframe through `window.parent.postMessage`
+  /// the source will be a `WindowProxy` which has the same methods as [Window].
+  DomMessageEventSource get source => js_util.getProperty(this, 'source');
+
+  List<DomMessagePort> get ports =>
+      js_util.getProperty<List<Object?>>(this, 'ports').cast<DomMessagePort>();
+}
+
+@JS()
+@staticInterop
+class DomMessageEventSource {}
+
+extension DomMEssageEventSourceExtension on DomMessageEventSource {
+  external DomMessageEventLocation? get location;
+}
+
+@JS()
+@staticInterop
+class DomMessageEventLocation {}
+
+extension DomMessageEventSourceExtension on DomMessageEventLocation {
+  external String? get href;
 }
 
 @JS()
@@ -1388,10 +3150,22 @@ extension DomMessageEventExtension on DomMessageEvent {
 class DomHTMLIFrameElement extends DomHTMLElement {}
 
 extension DomHTMLIFrameElementExtension on DomHTMLIFrameElement {
-  external set src(String? value);
-  external String? get src;
-  external set height(String? value);
-  external set width(String? value);
+  @JS('src')
+  external set _src(JSString? value);
+  set src(String? value) => _src = value?.toJS;
+
+  @JS('src')
+  external JSString? get _src;
+  String? get src => _src?.toDart;
+
+  @JS('height')
+  external set _height(JSString? value);
+  set height(String? value) => _height = value?.toJS;
+
+  @JS('width')
+  external set _width(JSString? value);
+  set width(String? value) => _width = value?.toJS;
+
   external DomWindow get contentWindow;
 }
 
@@ -1403,26 +3177,92 @@ DomHTMLIFrameElement createDomHTMLIFrameElement() =>
 class DomMessagePort extends DomEventTarget {}
 
 extension DomMessagePortExtension on DomMessagePort {
-  void postMessage(Object? message) => js_util.callMethod(this, 'postMessage',
-      <Object?>[if (message != null) js_util.jsify(message)]);
-  external void start();
+  @JS('postMessage')
+  external JSVoid _postMessage(JSAny? message);
+  void postMessage(Object? message) => _postMessage(message?.toJSAnyDeep);
+
+  external JSVoid start();
 }
 
-@JS()
+@JS('MessageChannel')
 @staticInterop
-class DomMessageChannel {}
+class DomMessageChannel {
+  external factory DomMessageChannel();
+}
 
 extension DomMessageChannelExtension on DomMessageChannel {
   external DomMessagePort get port1;
   external DomMessagePort get port2;
 }
 
+/// ResizeObserver JS binding.
+///
+/// See: https://developer.mozilla.org/en-US/docs/Web/API/ResizeObserver
+@JS('ResizeObserver')
+@staticInterop
+abstract class DomResizeObserver {
+  external factory DomResizeObserver(JSFunction observer);
+}
+
+/// Creates a DomResizeObserver with a callback.
+///
+/// Internally converts the `List<dynamic>` of entries into the expected
+/// `List<DomResizeObserverEntry>`
+DomResizeObserver? createDomResizeObserver(DomResizeObserverCallbackFn fn) =>
+    DomResizeObserver((JSArray<JSAny?> entries, DomResizeObserver observer) {
+      fn(entries.toDart.cast<DomResizeObserverEntry>(), observer);
+    }.toJS);
+
+/// ResizeObserver instance methods.
+///
+/// See: https://developer.mozilla.org/en-US/docs/Web/API/ResizeObserver#instance_methods
+extension DomResizeObserverExtension on DomResizeObserver {
+  external JSVoid disconnect();
+  external JSVoid observe(DomElement target,
+      [DomResizeObserverObserveOptions options]);
+  external JSVoid unobserve(DomElement target);
+}
+
+/// Options object passed to the `observe` method of a [DomResizeObserver].
+///
+/// See: https://developer.mozilla.org/en-US/docs/Web/API/ResizeObserver/observe#parameters
 @JS()
 @staticInterop
-class DomCSSRuleList {}
+@anonymous
+abstract class DomResizeObserverObserveOptions {
+  external factory DomResizeObserverObserveOptions({
+    JSString box,
+  });
+}
 
-extension DomCSSRuleListExtension on DomCSSRuleList {
-  external double get length;
+/// Type of the function used to create a Resize Observer.
+typedef DomResizeObserverCallbackFn = void Function(
+    List<DomResizeObserverEntry> entries, DomResizeObserver observer);
+
+/// The object passed to the [DomResizeObserverCallbackFn], which allows access to the new dimensions of the observed element.
+///
+/// See: https://developer.mozilla.org/en-US/docs/Web/API/ResizeObserverEntry
+@JS()
+@staticInterop
+abstract class DomResizeObserverEntry {}
+
+/// ResizeObserverEntry instance properties.
+///
+/// See: https://developer.mozilla.org/en-US/docs/Web/API/ResizeObserverEntry#instance_properties
+extension DomResizeObserverEntryExtension on DomResizeObserverEntry {
+  /// A DOMRectReadOnly object containing the new size of the observed element when the callback is run.
+  ///
+  /// Note that this is better supported than the above two properties, but it
+  /// is left over from an earlier implementation of the Resize Observer API, is
+  /// still included in the spec for web compat reasons, and may be deprecated
+  /// in future versions.
+  external DomRectReadOnly get contentRect;
+  external DomElement get target;
+  // Some more future getters:
+  //
+  // borderBoxSize
+  // contentBoxSize
+  // devicePixelContentBoxSize
 }
 
 /// A factory to create `TrustedTypePolicy` objects.
@@ -1436,7 +3276,7 @@ extension DomTrustedTypePolicyFactoryExtension on DomTrustedTypePolicyFactory {
   /// Creates a TrustedTypePolicy object named `policyName` that implements the
   /// rules passed as `policyOptions`.
   external DomTrustedTypePolicy createPolicy(
-    String policyName,
+    JSString policyName,
     DomTrustedTypePolicyOptions? policyOptions,
   );
 }
@@ -1455,11 +3295,8 @@ abstract class DomTrustedTypePolicyOptions {
   ///
   /// `createScriptURL` is a callback function that contains code to run when
   /// creating a TrustedScriptURL object.
-  ///
-  /// The following properties need to be manually wrapped in [allowInterop]
-  /// before being passed to this constructor: [createScriptURL].
   external factory DomTrustedTypePolicyOptions({
-    DomCreateScriptUrlOptionFn? createScriptURL,
+    JSFunction? createScriptURL,
   });
 }
 
@@ -1482,7 +3319,10 @@ extension DomTrustedTypePolicyExtension on DomTrustedTypePolicy {
   /// Creates a `TrustedScriptURL` for the given [input].
   ///
   /// `input` is a string containing the data to be _sanitized_ by the policy.
-  external DomTrustedScriptURL createScriptURL(String input);
+  @JS('createScriptURL')
+  external DomTrustedScriptURL _createScriptURL(JSString input);
+  DomTrustedScriptURL createScriptURL(String input) =>
+      _createScriptURL(input.toJS);
 }
 
 /// Represents a string that a developer can insert into an _injection sink_
@@ -1499,7 +3339,9 @@ abstract class DomTrustedScriptURL {}
 /// A subset of TrustedScriptURL methods.
 extension DomTrustedScriptUrlExtension on DomTrustedScriptURL {
   /// Exposes the `toString` JS method of TrustedScriptURL.
-  String get url => js_util.callMethod<String>(this, 'toString', <String>[]);
+  @JS('toString')
+  external JSString _toString();
+  String get url => _toString().toDart;
 }
 
 // The expected set of files that the flutter-engine TrustedType policy is going
@@ -1511,23 +3353,20 @@ const Set<String> _expectedFilesForTT = <String>{
 // The definition of the `flutter-engine` TrustedType policy.
 // Only accessible if the Trusted Types API is available.
 final DomTrustedTypePolicy _ttPolicy = domWindow.trustedTypes!.createPolicy(
-  'flutter-engine',
+  'flutter-engine'.toJS,
   DomTrustedTypePolicyOptions(
-    // Validates the given [url].
-    createScriptURL: allowInterop(
-      (String url) {
-        final Uri uri = Uri.parse(url);
-        if (_expectedFilesForTT.contains(uri.pathSegments.last)) {
-          return uri.toString();
-        }
-        domWindow.console
-            .error('URL rejected by TrustedTypes policy flutter-engine: $url'
-                '(download prevented)');
-
-        return null;
-      },
-    ),
-  ),
+      // Validates the given [url].
+      createScriptURL: (JSString url) {
+    final Uri uri = Uri.parse(url.toDart);
+    if (_expectedFilesForTT.contains(uri.pathSegments.last)) {
+      return uri.toString().toJS;
+    }
+    domWindow.console
+        .error('URL rejected by TrustedTypes policy flutter-engine: $url'
+            '(download prevented)');
+
+    return null;
+  }.toJS),
 );
 
 /// Converts a String `url` into a [DomTrustedScriptURL] object when the
@@ -1544,33 +3383,12 @@ Object createTrustedScriptUrl(String url) {
   return url;
 }
 
-DomMessageChannel createDomMessageChannel() =>
-    domCallConstructorString('MessageChannel', <Object>[])!
-        as DomMessageChannel;
-
-Object? domGetConstructor(String constructorName) =>
-    js_util.getProperty(domWindow, constructorName);
-
-Object? domCallConstructorString(String constructorName, List<Object?> args) {
-  final Object? constructor = domGetConstructor(constructorName);
-  if (constructor == null) {
-    return null;
-  }
-  return js_util.callConstructor(constructor, args);
-}
-
-String? domGetConstructorName(Object o) {
-  final Object? constructor = js_util.getProperty(o, 'constructor');
-  if (constructor == null) {
-    return '';
-  }
-  return js_util.getProperty(constructor, 'name')?.toString();
-}
+DomMessageChannel createDomMessageChannel() => DomMessageChannel();
 
 bool domInstanceOfString(Object? element, String objectType) =>
-    js_util.instanceof(element, domGetConstructor(objectType)!);
+    js_util.instanceOfString(element, objectType);
 
-/// [_DomElementList] is the shared interface for APIs that return either
+/// This is the shared interface for APIs that return either
 /// `NodeList` or `HTMLCollection`. Do *not* add any API to this class that
 /// isn't support by both JS objects. Furthermore, this is an internal class and
 /// should only be returned as a wrapped object to Dart.
@@ -1579,12 +3397,16 @@ bool domInstanceOfString(Object? element, String objectType) =>
 class _DomList {}
 
 extension DomListExtension on _DomList {
-  external double get length;
-  DomNode item(int index) =>
-      js_util.callMethod<DomNode>(this, 'item', <Object>[index.toDouble()]);
+  @JS('length')
+  external JSNumber get _length;
+  double get length => _length.toDartDouble;
+
+  @JS('item')
+  external DomNode _item(JSNumber index);
+  DomNode item(int index) => _item(index.toJS);
 }
 
-class _DomListIterator<T> extends Iterator<T> {
+class _DomListIterator<T> implements Iterator<T> {
   _DomListIterator(this.list);
 
   final _DomList list;
@@ -1621,41 +3443,272 @@ class _DomListWrapper<T> extends Iterable<T> {
 Iterable<T> createDomListWrapper<T>(_DomList list) =>
     _DomListWrapper<T>._(list).cast<T>();
 
+// https://developer.mozilla.org/en-US/docs/Web/API/TouchList
+@JS()
+@staticInterop
+class _DomTouchList {}
+
+extension DomTouchListExtension on _DomTouchList {
+  @JS('length')
+  external JSNumber get _length;
+  double get length => _length.toDartDouble;
+
+  @JS('item')
+  external DomNode _item(JSNumber index);
+  DomNode item(int index) => _item(index.toJS);
+}
+
+class _DomTouchListIterator<T> implements Iterator<T> {
+  _DomTouchListIterator(this.list);
+
+  final _DomTouchList list;
+  int index = -1;
+
+  @override
+  bool moveNext() {
+    index++;
+    if (index > list.length) {
+      throw StateError('Iterator out of bounds');
+    }
+    return index < list.length;
+  }
+
+  @override
+  T get current => list.item(index) as T;
+}
+
+class _DomTouchListWrapper<T> extends Iterable<T> {
+  _DomTouchListWrapper._(this.list);
+
+  final _DomTouchList list;
+
+  @override
+  Iterator<T> get iterator => _DomTouchListIterator<T>(list);
+
+  /// Override the length to avoid iterating through the whole collection.
+  @override
+  int get length => list.length.toInt();
+}
+
+Iterable<T> createDomTouchListWrapper<T>(_DomTouchList list) =>
+    _DomTouchListWrapper<T>._(list).cast<T>();
+
+@JS()
+@staticInterop
+class DomSymbol {}
+
+extension DomSymbolExtension on DomSymbol {
+  @JS('iterator')
+  external JSAny get iterator;
+}
+
 @JS()
 @staticInterop
 class DomIntl {}
 
 extension DomIntlExtension on DomIntl {
+  // ignore: non_constant_identifier_names
+  external JSAny? get Segmenter;
+
   /// This is a V8-only API for segmenting text.
   ///
   /// See: https://code.google.com/archive/p/v8-i18n/wikis/BreakIterator.wiki
-  external Object? get v8BreakIterator;
+  external JSAny? get v8BreakIterator;
+}
+
+@JS('Intl.Segmenter')
+@staticInterop
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/Segmenter
+class DomSegmenter {
+  // TODO(joshualitt): `locales` should really be typed as `JSAny?`, and we
+  // should pass `JSUndefined`.  Revisit this after we reify `JSUndefined` on
+  // Dart2Wasm.
+  external factory DomSegmenter(JSArray<JSAny?> locales, JSAny options);
+}
+
+extension DomSegmenterExtension on DomSegmenter {
+  @JS('segment')
+  external DomSegments segmentRaw(JSString text);
+  DomSegments segment(String text) => segmentRaw(text.toJS);
+}
+
+@JS()
+@staticInterop
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/Segmenter/segment/Segments
+class DomSegments {}
+
+extension DomSegmentsExtension on DomSegments {
+  DomIteratorWrapper<DomSegment> iterator() {
+    final DomIterator segmentIterator = js_util
+        .callMethod(this, domSymbol.iterator, const <Object?>[]) as DomIterator;
+    return DomIteratorWrapper<DomSegment>(segmentIterator);
+  }
 }
 
+@JS()
+@staticInterop
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols
+class DomIterator {}
+
+extension DomIteratorExtension on DomIterator {
+  external DomIteratorResult next();
+}
 
 @JS()
 @staticInterop
-class DomV8BreakIterator {}
+class DomIteratorResult {}
+
+extension DomIteratorResultExtension on DomIteratorResult {
+  @JS('done')
+  external JSBoolean get _done;
+  bool get done => _done.toDart;
+
+  external JSAny get value;
+}
+
+/// Wraps a native JS iterator to provide a Dart [Iterator].
+class DomIteratorWrapper<T> implements Iterator<T> {
+  DomIteratorWrapper(this._iterator);
+
+  final DomIterator _iterator;
+  late T _current;
+
+  @override
+  T get current => _current;
+
+  @override
+  bool moveNext() {
+    final DomIteratorResult result = _iterator.next();
+    if (result.done) {
+      return false;
+    }
+    _current = result.value as T;
+    return true;
+  }
+}
+
+@JS()
+@staticInterop
+class DomSegment {}
+
+extension DomSegmentExtension on DomSegment {
+  @JS('index')
+  external JSNumber get _index;
+  int get index => _index.toDartDouble.toInt();
+
+  @JS('isWordLike')
+  external JSBoolean get _isWordLike;
+  bool get isWordLike => _isWordLike.toDart;
+
+  @JS('segment')
+  external JSString get _segment;
+  String get segment => _segment.toDart;
+
+  @JS('breakType')
+  external JSString get _breakType;
+  String get breakType => _breakType.toDart;
+}
+
+DomSegmenter createIntlSegmenter({required String granularity}) {
+  if (domIntl.Segmenter == null) {
+    throw UnimplementedError('Intl.Segmenter() is not supported.');
+  }
+
+  return DomSegmenter(
+    <JSAny?>[].toJS,
+    <String, String>{'granularity': granularity}.toJSAnyDeep,
+  );
+}
+
+@JS('Intl.v8BreakIterator')
+@staticInterop
+class DomV8BreakIterator {
+  external factory DomV8BreakIterator(JSArray<JSAny?> locales, JSAny options);
+}
 
 extension DomV8BreakIteratorExtension on DomV8BreakIterator {
-  external void adoptText(String text);
-  external double first();
-  external double next();
-  external double current();
-  external String breakType();
+  @JS('adoptText')
+  external JSVoid adoptText(JSString text);
+
+  @JS('first')
+  external JSNumber _first();
+  double first() => _first().toDartDouble;
+
+  @JS('next')
+  external JSNumber _next();
+  double next() => _next().toDartDouble;
+
+  @JS('current')
+  external JSNumber _current();
+  double current() => _current().toDartDouble;
+
+  @JS('breakType')
+  external JSString _breakType();
+  String breakType() => _breakType().toDart;
 }
 
 DomV8BreakIterator createV8BreakIterator() {
-  final Object? v8BreakIterator = domWindow.Intl.v8BreakIterator;
-  if (v8BreakIterator == null) {
+  if (domIntl.v8BreakIterator == null) {
     throw UnimplementedError('v8BreakIterator is not supported.');
   }
 
-  return js_util.callConstructor<DomV8BreakIterator>(
-    v8BreakIterator,
-    <Object?>[
-      js_util.getProperty(domWindow, 'undefined'),
-      js_util.jsify(const <String, String>{'type': 'line'}),
-    ],
-  );
+  return DomV8BreakIterator(
+      <JSAny?>[].toJS, const <String, String>{'type': 'line'}.toJSAnyDeep);
+}
+
+@JS('TextDecoder')
+@staticInterop
+class DomTextDecoder {
+  external factory DomTextDecoder();
+}
+
+extension DomTextDecoderExtension on DomTextDecoder {
+  external JSString decode(JSTypedArray buffer);
+}
+
+@JS('window.FinalizationRegistry')
+@staticInterop
+class DomFinalizationRegistry {
+  external factory DomFinalizationRegistry(JSFunction cleanup);
+}
+
+extension DomFinalizationRegistryExtension on DomFinalizationRegistry {
+  @JS('register')
+  external JSVoid register(JSAny target, JSAny value);
+
+  @JS('register')
+  external JSVoid registerWithToken(JSAny target, JSAny value, JSAny token);
+
+  @JS('unregister')
+  external JSVoid unregister(JSAny token);
+}
+
+@JS('window.FinalizationRegistry')
+external JSAny? get _finalizationRegistryConstructor;
+
+/// Whether the current browser supports `FinalizationRegistry`.
+bool browserSupportsFinalizationRegistry =
+    _finalizationRegistryConstructor != null;
+
+@JS('window.OffscreenCanvas')
+external JSAny? get _offscreenCanvasConstructor;
+
+bool browserSupportsOffscreenCanvas = _offscreenCanvasConstructor != null;
+
+@JS('window.createImageBitmap')
+external JSAny? get _createImageBitmapFunction;
+
+/// Set to `true` to disable `createImageBitmap` support. Used in tests.
+bool debugDisableCreateImageBitmapSupport = false;
+
+bool get browserSupportsCreateImageBitmap =>
+    _createImageBitmapFunction != null &&
+    !isChrome110OrOlder &&
+    !debugDisableCreateImageBitmapSupport;
+
+@JS()
+@staticInterop
+extension JSArrayExtension on JSArray<JSAny?> {
+  external void push(JSAny value);
+  external JSNumber get length;
 }
diff --git a/lib/web_ui/lib/src/engine/embedder.dart b/lib/web_ui/lib/src/engine/embedder.dart
deleted file mode 100644
index 0c98a3d259d861524f51079a77a5e25ac4da2317..0000000000000000000000000000000000000000
--- a/lib/web_ui/lib/src/engine/embedder.dart
+++ /dev/null
@@ -1,674 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'dart:async';
-
-import 'package:ui/ui.dart' as ui;
-
-import '../engine.dart' show buildMode, registerHotRestartListener, renderer;
-import 'browser_detection.dart';
-import 'configuration.dart';
-import 'dom.dart';
-import 'host_node.dart';
-import 'keyboard_binding.dart';
-import 'platform_dispatcher.dart';
-import 'pointer_binding.dart';
-import 'safe_browser_api.dart';
-import 'semantics.dart';
-import 'text_editing/text_editing.dart';
-import 'util.dart';
-import 'window.dart';
-
-/// Controls the placement and lifecycle of a Flutter view on the web page.
-///
-/// Manages several top-level elements that host Flutter-generated content,
-/// including:
-///
-/// - [glassPaneElement], the root element of a Flutter view.
-/// - [glassPaneShadow], the shadow root used to isolate Flutter-rendered
-///   content from the surrounding page content, including from the platform
-///   views.
-/// - [sceneElement], the element that hosts Flutter layers and pictures, and
-///   projects platform views.
-/// - [sceneHostElement], the anchor that provides a stable location in the DOM
-///   tree for the [sceneElement].
-/// - [semanticsHostElement], hosts the ARIA-annotated semantics tree.
-class FlutterViewEmbedder {
-  FlutterViewEmbedder() {
-    assert(() {
-      _setupHotRestart();
-      return true;
-    }());
-    reset();
-    assert(() {
-      _registerHotRestartCleanUp();
-      return true;
-    }());
-  }
-
-  // The tag name for the root view of the flutter app (glass-pane)
-  static const String _glassPaneTagName = 'flt-glass-pane';
-
-  /// Listens to window resize events
-  DomSubscription? _resizeSubscription;
-
-  /// Listens to window locale events.
-  DomSubscription? _localeSubscription;
-
-  /// Contains Flutter-specific CSS rules, such as default margins and
-  /// paddings.
-  DomHTMLStyleElement? _styleElement;
-
-  /// Configures the screen, such as scaling.
-  DomHTMLMetaElement? _viewportMeta;
-
-  /// The element that contains the [sceneElement].
-  ///
-  /// This element is created and inserted in the HTML DOM once. It is never
-  /// removed or moved. However the [sceneElement] may be replaced inside it.
-  ///
-  /// This element is inserted after the [semanticsHostElement] so that
-  /// platform views take precedence in DOM event handling.
-  DomElement? get sceneHostElement => _sceneHostElement;
-  DomElement? _sceneHostElement;
-
-  /// A child element of body outside the shadowroot that hosts
-  /// global resources such svg filters and clip paths when using webkit.
-  DomElement? _resourcesHost;
-
-  /// The element that contains the semantics tree.
-  ///
-  /// This element is created and inserted in the HTML DOM once. It is never
-  /// removed or moved.
-  ///
-  /// Render semantics inside the glasspane for proper focus and event
-  /// handling. If semantics is behind the glasspane, the phone will disable
-  /// focusing by touch, only by tabbing around the UI. If semantics is in
-  /// front of glasspane, then DOM event won't bubble up to the glasspane so
-  /// it can forward events to the framework.
-  ///
-  /// This element is inserted before the [semanticsHostElement] so that
-  /// platform views take precedence in DOM event handling.
-  DomElement? get semanticsHostElement => _semanticsHostElement;
-  DomElement? _semanticsHostElement;
-
-  /// The last scene element rendered by the [render] method.
-  DomElement? get sceneElement => _sceneElement;
-  DomElement? _sceneElement;
-
-  /// This is state persistent across hot restarts that indicates what
-  /// to clear.  Delay removal of old visible state to make the
-  /// transition appear smooth.
-  static const String _staleHotRestartStore = '__flutter_state';
-  List<DomElement?>? _staleHotRestartState;
-
-  /// Creates a container for DOM elements that need to be cleaned up between
-  /// hot restarts.
-  ///
-  /// If a contains already exists, reuses the existing one.
-  void _setupHotRestart() {
-    // This persists across hot restarts to clear stale DOM.
-    _staleHotRestartState = getJsProperty<List<DomElement?>?>(domWindow, _staleHotRestartStore);
-    if (_staleHotRestartState == null) {
-      _staleHotRestartState = <DomElement?>[];
-      setJsProperty(
-          domWindow, _staleHotRestartStore, _staleHotRestartState);
-    }
-  }
-
-  /// Registers DOM elements that need to be cleaned up before hot restarting.
-  ///
-  /// [_setupHotRestart] must have been called prior to calling this method.
-  void _registerHotRestartCleanUp() {
-    registerHotRestartListener(() {
-      _resizeSubscription?.cancel();
-      _localeSubscription?.cancel();
-      _staleHotRestartState!.addAll(<DomElement?>[
-        _glassPaneElement,
-        _styleElement,
-        _viewportMeta,
-      ]);
-    });
-  }
-
-  void _clearOnHotRestart() {
-    if (_staleHotRestartState!.isNotEmpty) {
-      for (final DomElement? element in _staleHotRestartState!) {
-        element?.remove();
-      }
-      _staleHotRestartState!.clear();
-    }
-  }
-
-  /// Don't unnecessarily move DOM nodes around. If a DOM node is
-  /// already in the right place, skip DOM mutation. This is both faster and
-  /// more correct, because moving DOM nodes loses internal state, such as
-  /// text selection.
-  void addSceneToSceneHost(DomElement? sceneElement) {
-    if (sceneElement != _sceneElement) {
-      _sceneElement?.remove();
-      _sceneElement = sceneElement;
-      _sceneHostElement!.append(sceneElement!);
-    }
-    assert(() {
-      _clearOnHotRestart();
-      return true;
-    }());
-  }
-
-  /// The element that captures input events, such as pointer events.
-  ///
-  /// If semantics is enabled this element also contains the semantics DOM tree,
-  /// which captures semantics input events. The semantics DOM tree must be a
-  /// child of the glass pane element so that events bubble up to the glass pane
-  /// if they are not handled by semantics.
-  DomElement? get glassPaneElement => _glassPaneElement;
-  DomElement? _glassPaneElement;
-
-  /// The [HostNode] of the [glassPaneElement], which contains the whole Flutter app.
-  HostNode? get glassPaneShadow => _glassPaneShadow;
-  HostNode? _glassPaneShadow;
-
-  final DomElement rootElement = domDocument.body!;
-
-  static const String defaultFontStyle = 'normal';
-  static const String defaultFontWeight = 'normal';
-  static const double defaultFontSize = 14;
-  static const String defaultFontFamily = 'sans-serif';
-  static const String defaultCssFont =
-      '$defaultFontStyle $defaultFontWeight ${defaultFontSize}px $defaultFontFamily';
-
-  void reset() {
-    final bool isWebKit = browserEngine == BrowserEngine.webkit;
-
-    _styleElement?.remove();
-    _styleElement = createDomHTMLStyleElement();
-    _resourcesHost?.remove();
-    _resourcesHost = null;
-    domDocument.head!.append(_styleElement!);
-    final DomCSSStyleSheet sheet = _styleElement!.sheet! as DomCSSStyleSheet;
-    applyGlobalCssRulesToSheet(
-      sheet,
-      browserEngine: browserEngine,
-      hasAutofillOverlay: browserHasAutofillOverlay(),
-    );
-
-    final DomHTMLBodyElement bodyElement = domDocument.body!;
-
-    bodyElement.setAttribute(
-      'flt-renderer',
-      '${renderer.rendererTag} (${FlutterConfiguration.flutterWebAutoDetect ? 'auto-selected' : 'requested explicitly'})',
-    );
-    bodyElement.setAttribute('flt-build-mode', buildMode);
-
-    setElementStyle(bodyElement, 'position', 'fixed');
-    setElementStyle(bodyElement, 'top', '0');
-    setElementStyle(bodyElement, 'right', '0');
-    setElementStyle(bodyElement, 'bottom', '0');
-    setElementStyle(bodyElement, 'left', '0');
-    setElementStyle(bodyElement, 'overflow', 'hidden');
-    setElementStyle(bodyElement, 'padding', '0');
-    setElementStyle(bodyElement, 'margin', '0');
-
-    // TODO(yjbanov): fix this when KVM I/O support is added. Currently scroll
-    //                using drag, and text selection interferes.
-    setElementStyle(bodyElement, 'user-select', 'none');
-    setElementStyle(bodyElement, '-webkit-user-select', 'none');
-    setElementStyle(bodyElement, '-ms-user-select', 'none');
-    setElementStyle(bodyElement, '-moz-user-select', 'none');
-
-    // This is required to prevent the browser from doing any native touch
-    // handling. If this is not done, the browser doesn't report 'pointermove'
-    // events properly.
-    setElementStyle(bodyElement, 'touch-action', 'none');
-
-    // These are intentionally outrageous font parameters to make sure that the
-    // apps fully specify their text styles.
-    setElementStyle(bodyElement, 'font', defaultCssFont);
-    setElementStyle(bodyElement, 'color', 'red');
-
-    // TODO(mdebbar): Disable spellcheck until changes in the framework and
-    // engine are complete.
-    bodyElement.spellcheck = false;
-
-    for (final DomElement viewportMeta
-        in domDocument.head!.querySelectorAll('meta[name="viewport"]')) {
-      if (assertionsEnabled) {
-        // Filter out the meta tag that the engine placed on the page. This is
-        // to avoid UI flicker during hot restart. Hot restart will clean up the
-        // old meta tag synchronously with the first post-restart frame.
-        if (!viewportMeta.hasAttribute('flt-viewport')) {
-          print(
-            'WARNING: found an existing <meta name="viewport"> tag. Flutter '
-            'Web uses its own viewport configuration for better compatibility '
-            'with Flutter. This tag will be replaced.',
-          );
-        }
-      }
-      viewportMeta.remove();
-    }
-
-    // This removes a previously created meta tag. Note, however, that this does
-    // not remove the meta tag during hot restart. Hot restart resets all static
-    // variables, so this will be null upon hot restart. Instead, this tag is
-    // removed by _clearOnHotRestart.
-    _viewportMeta?.remove();
-    _viewportMeta = createDomHTMLMetaElement()
-      ..setAttribute('flt-viewport', '')
-      ..name = 'viewport'
-      ..content = 'width=device-width, initial-scale=1.0, '
-          'maximum-scale=1.0, user-scalable=no';
-    domDocument.head!.append(_viewportMeta!);
-
-    // IMPORTANT: the glass pane element must come after the scene element in the DOM node list so
-    //            it can intercept input events.
-    _glassPaneElement?.remove();
-    final DomElement glassPaneElement = domDocument.createElement(_glassPaneTagName);
-    _glassPaneElement = glassPaneElement;
-    glassPaneElement.style
-      ..position = 'absolute'
-      ..top = '0'
-      ..right = '0'
-      ..bottom = '0'
-      ..left = '0';
-
-    // This must be appended to the body, so the engine can create a host node
-    // properly.
-    bodyElement.append(glassPaneElement);
-
-    // Create a [HostNode] under the glass pane element, and attach everything
-    // there, instead of directly underneath the glass panel.
-    final HostNode glassPaneElementHostNode = _createHostNode(glassPaneElement);
-    _glassPaneShadow = glassPaneElementHostNode;
-
-    // Don't allow the scene to receive pointer events.
-    _sceneHostElement = domDocument.createElement('flt-scene-host')
-      ..style.pointerEvents = 'none';
-
-    renderer.reset(this);
-
-    final DomElement semanticsHostElement =
-        domDocument.createElement('flt-semantics-host');
-    semanticsHostElement.style
-      ..position = 'absolute'
-      ..transformOrigin = '0 0 0';
-    _semanticsHostElement = semanticsHostElement;
-    updateSemanticsScreenProperties();
-
-    final DomElement accessibilityPlaceholder = EngineSemanticsOwner
-        .instance.semanticsHelper
-        .prepareAccessibilityPlaceholder();
-
-    glassPaneElementHostNode.appendAll(<DomNode>[
-      accessibilityPlaceholder,
-      _sceneHostElement!,
-
-      // The semantic host goes last because hit-test order-wise it must be
-      // first. If semantics goes under the scene host, platform views will
-      // obscure semantic elements.
-      //
-      // You may be wondering: wouldn't semantics obscure platform views and
-      // make then not accessible? At least with some careful planning, that
-      // should not be the case. The semantics tree makes all of its non-leaf
-      // elements transparent. This way, if a platform view appears among other
-      // interactive Flutter widgets, as long as those widgets do not intersect
-      // with the platform view, the platform view will be reachable.
-      semanticsHostElement,
-    ]);
-
-    // When debugging semantics, make the scene semi-transparent so that the
-    // semantics tree is more prominent.
-    if (configuration.debugShowSemanticsNodes) {
-      _sceneHostElement!.style.opacity = '0.3';
-    }
-
-    KeyboardBinding.initInstance();
-    PointerBinding.initInstance(glassPaneElement, KeyboardBinding.instance!.converter);
-
-    if (domWindow.visualViewport == null && isWebKit) {
-      // Older Safari versions sometimes give us bogus innerWidth/innerHeight
-      // values when the page loads. When it changes the values to correct ones
-      // it does not notify of the change via `onResize`. As a workaround, we
-      // set up a temporary periodic timer that polls innerWidth and triggers
-      // the resizeListener so that the framework can react to the change.
-      //
-      // Safari 13 has implemented visualViewport API so it doesn't need this
-      // timer.
-      //
-      // VisualViewport API is not enabled in Firefox as well. On the other hand
-      // Firefox returns correct values for innerHeight, innerWidth.
-      // Firefox also triggers domWindow.onResize therefore this timer does
-      // not need to be set up for Firefox.
-      final int initialInnerWidth = domWindow.innerWidth!.toInt();
-      // Counts how many times screen size was checked. It is checked up to 5
-      // times.
-      int checkCount = 0;
-      Timer.periodic(const Duration(milliseconds: 100), (Timer t) {
-        checkCount += 1;
-        if (initialInnerWidth != domWindow.innerWidth) {
-          // Window size changed. Notify.
-          t.cancel();
-          _metricsDidChange(null);
-        } else if (checkCount > 5) {
-          // Checked enough times. Stop.
-          t.cancel();
-        }
-      });
-    }
-
-    if (domWindow.visualViewport != null) {
-      _resizeSubscription = DomSubscription(domWindow.visualViewport!, 'resize',
-          allowInterop(_metricsDidChange));
-    } else {
-      _resizeSubscription = DomSubscription(domWindow, 'resize',
-          allowInterop(_metricsDidChange));
-    }
-    _localeSubscription = DomSubscription(domWindow, 'languagechange',
-          allowInterop(_languageDidChange));
-    EnginePlatformDispatcher.instance.updateLocales();
-  }
-
-  // Creates a [HostNode] into a `root` [DomElement].
-  HostNode _createHostNode(DomElement root) {
-    if (getJsProperty<Object?>(root, 'attachShadow') != null) {
-      return ShadowDomHostNode(root);
-    } else {
-      // attachShadow not available, fall back to ElementHostNode.
-      return ElementHostNode(root);
-    }
-  }
-
-  /// The framework specifies semantics in physical pixels, but CSS uses
-  /// logical pixels. To compensate, an inverse scale is injected at the root
-  /// level.
-  void updateSemanticsScreenProperties() {
-    _semanticsHostElement!.style.setProperty('transform',
-        'scale(${1 / domWindow.devicePixelRatio})');
-  }
-
-  /// Called immediately after browser window metrics change.
-  ///
-  /// When there is a text editing going on in mobile devices, do not change
-  /// the physicalSize, change the [window.viewInsets]. See:
-  /// https://api.flutter.dev/flutter/dart-ui/FlutterView/viewInsets.html
-  /// https://api.flutter.dev/flutter/dart-ui/FlutterView/physicalSize.html
-  ///
-  /// Note: always check for rotations for a mobile device. Update the physical
-  /// size if the change is caused by a rotation.
-  void _metricsDidChange(DomEvent? event) {
-    updateSemanticsScreenProperties();
-    if (isMobile && !window.isRotation() && textEditing.isEditing) {
-      window.computeOnScreenKeyboardInsets(true);
-      EnginePlatformDispatcher.instance.invokeOnMetricsChanged();
-    } else {
-      window.computePhysicalSize();
-      // When physical size changes this value has to be recalculated.
-      window.computeOnScreenKeyboardInsets(false);
-      EnginePlatformDispatcher.instance.invokeOnMetricsChanged();
-    }
-  }
-
-  /// Called immediately after browser window language change.
-  void _languageDidChange(DomEvent event) {
-    EnginePlatformDispatcher.instance.updateLocales();
-    ui.window.onLocaleChanged?.call();
-  }
-
-  static const String orientationLockTypeAny = 'any';
-  static const String orientationLockTypeNatural = 'natural';
-  static const String orientationLockTypeLandscape = 'landscape';
-  static const String orientationLockTypePortrait = 'portrait';
-  static const String orientationLockTypePortraitPrimary = 'portrait-primary';
-  static const String orientationLockTypePortraitSecondary =
-      'portrait-secondary';
-  static const String orientationLockTypeLandscapePrimary = 'landscape-primary';
-  static const String orientationLockTypeLandscapeSecondary =
-      'landscape-secondary';
-
-  /// Sets preferred screen orientation.
-  ///
-  /// Specifies the set of orientations the application interface can be
-  /// displayed in.
-  ///
-  /// The [orientations] argument is a list of DeviceOrientation values.
-  /// The empty list uses Screen unlock api and causes the application to
-  /// defer to the operating system default.
-  ///
-  /// See w3c screen api: https://www.w3.org/TR/screen-orientation/
-  Future<bool> setPreferredOrientation(List<dynamic> orientations) {
-    final DomScreen? screen = domWindow.screen;
-    if (screen != null) {
-      final DomScreenOrientation? screenOrientation = screen.orientation;
-      if (screenOrientation != null) {
-        if (orientations.isEmpty) {
-          screenOrientation.unlock();
-          return Future<bool>.value(true);
-        } else {
-          final String? lockType =
-              _deviceOrientationToLockType(orientations.first as String?);
-          if (lockType != null) {
-            final Completer<bool> completer = Completer<bool>();
-            try {
-              screenOrientation.lock(lockType).then((dynamic _) {
-                completer.complete(true);
-              }).catchError((dynamic error) {
-                // On Chrome desktop an error with 'not supported on this device
-                // error' is fired.
-                completer.complete(false);
-              });
-            } catch (_) {
-              return Future<bool>.value(false);
-            }
-            return completer.future;
-          }
-        }
-      }
-    }
-    // API is not supported on this browser return false.
-    return Future<bool>.value(false);
-  }
-
-  // Converts device orientation to w3c OrientationLockType enum.
-  //
-  // See also: https://developer.mozilla.org/en-US/docs/Web/API/ScreenOrientation/lock
-  static String? _deviceOrientationToLockType(String? deviceOrientation) {
-    switch (deviceOrientation) {
-      case 'DeviceOrientation.portraitUp':
-        return orientationLockTypePortraitPrimary;
-      case 'DeviceOrientation.portraitDown':
-        return orientationLockTypePortraitSecondary;
-      case 'DeviceOrientation.landscapeLeft':
-        return orientationLockTypeLandscapePrimary;
-      case 'DeviceOrientation.landscapeRight':
-        return orientationLockTypeLandscapeSecondary;
-      default:
-        return null;
-    }
-  }
-
-  /// The element corresponding to the only child of the root surface.
-  DomElement? get _rootApplicationElement {
-    final DomElement lastElement = rootElement.children.last;
-    for (final DomElement child in lastElement.children) {
-      if (child.tagName == 'FLT-SCENE') {
-        return child;
-      }
-    }
-    return null;
-  }
-
-  /// Add an element as a global resource to be referenced by CSS.
-  ///
-  /// This call create a global resource host element on demand and either
-  /// place it as first element of body(webkit), or as a child of
-  /// glass pane element for other browsers to make sure url resolution
-  /// works correctly when content is inside a shadow root.
-  void addResource(DomElement element) {
-    final bool isWebKit = browserEngine == BrowserEngine.webkit;
-    if (_resourcesHost == null) {
-      _resourcesHost = createDomHTMLDivElement()
-        ..style.visibility = 'hidden';
-      if (isWebKit) {
-        final DomNode bodyNode = domDocument.body!;
-        bodyNode.insertBefore(_resourcesHost!, bodyNode.firstChild);
-      } else {
-        _glassPaneShadow!.node.insertBefore(
-            _resourcesHost!, _glassPaneShadow!.node.firstChild);
-      }
-    }
-    _resourcesHost!.append(element);
-  }
-
-  /// Removes a global resource element.
-  void removeResource(DomElement? element) {
-    if (element == null) {
-      return;
-    }
-    assert(element.parentNode == _resourcesHost);
-    element.remove();
-  }
-
-  String get currentHtml => _rootApplicationElement?.outerHTML ?? '';
-}
-
-// Applies the required global CSS to an incoming [DomCSSStyleSheet] `sheet`.
-void applyGlobalCssRulesToSheet(
-  DomCSSStyleSheet sheet, {
-  required BrowserEngine browserEngine,
-  required bool hasAutofillOverlay,
-  String glassPaneTagName = FlutterViewEmbedder._glassPaneTagName,
-}) {
-  final bool isWebKit = browserEngine == BrowserEngine.webkit;
-  final bool isFirefox = browserEngine == BrowserEngine.firefox;
-  // TODO(web): use more efficient CSS selectors; descendant selectors are slow.
-  // More info: https://csswizardry.com/2011/09/writing-efficient-css-selectors
-
-  if (isFirefox) {
-    // For firefox set line-height, otherwise textx at same font-size will
-    // measure differently in ruler.
-    //
-    // - See: https://github.com/flutter/flutter/issues/44803
-    sheet.insertRule(
-      'flt-paragraph, flt-span {line-height: 100%;}',
-      sheet.cssRules.length.toInt(),
-    );
-  }
-
-  // This undoes browser's default painting and layout attributes of range
-  // input, which is used in semantics.
-  sheet.insertRule(
-    '''
-    flt-semantics input[type=range] {
-      appearance: none;
-      -webkit-appearance: none;
-      width: 100%;
-      position: absolute;
-      border: none;
-      top: 0;
-      right: 0;
-      bottom: 0;
-      left: 0;
-    }
-    ''',
-    sheet.cssRules.length.toInt(),
-  );
-
-  if (isWebKit) {
-    sheet.insertRule(
-        'flt-semantics input[type=range]::-webkit-slider-thumb {'
-        '  -webkit-appearance: none;'
-        '}',
-        sheet.cssRules.length.toInt());
-  }
-
-  if (isFirefox) {
-    sheet.insertRule(
-        'input::-moz-selection {'
-        '  background-color: transparent;'
-        '}',
-        sheet.cssRules.length.toInt());
-    sheet.insertRule(
-        'textarea::-moz-selection {'
-        '  background-color: transparent;'
-        '}',
-        sheet.cssRules.length.toInt());
-  } else {
-    // On iOS, the invisible semantic text field has a visible cursor and
-    // selection highlight. The following 2 CSS rules force everything to be
-    // transparent.
-    sheet.insertRule(
-        'input::selection {'
-        '  background-color: transparent;'
-        '}',
-        sheet.cssRules.length.toInt());
-    sheet.insertRule(
-        'textarea::selection {'
-        '  background-color: transparent;'
-        '}',
-        sheet.cssRules.length.toInt());
-  }
-  sheet.insertRule('''
-    flt-semantics input,
-    flt-semantics textarea,
-    flt-semantics [contentEditable="true"] {
-    caret-color: transparent;
-  }
-  ''', sheet.cssRules.length.toInt());
-
-  // By default on iOS, Safari would highlight the element that's being tapped
-  // on using gray background. This CSS rule disables that.
-  if (isWebKit) {
-    sheet.insertRule('''
-      $glassPaneTagName * {
-      -webkit-tap-highlight-color: transparent;
-    }
-    ''', sheet.cssRules.length.toInt());
-  }
-
-  // Hide placeholder text
-  sheet.insertRule(
-    '''
-    .flt-text-editing::placeholder {
-      opacity: 0;
-    }
-    ''',
-    sheet.cssRules.length.toInt(),
-  );
-
-  // This css prevents an autofill overlay brought by the browser during
-  // text field autofill by delaying the transition effect.
-  // See: https://github.com/flutter/flutter/issues/61132.
-  if (browserHasAutofillOverlay()) {
-    sheet.insertRule('''
-      .transparentTextEditing:-webkit-autofill,
-      .transparentTextEditing:-webkit-autofill:hover,
-      .transparentTextEditing:-webkit-autofill:focus,
-      .transparentTextEditing:-webkit-autofill:active {
-        -webkit-transition-delay: 99999s;
-      }
-    ''', sheet.cssRules.length.toInt());
-  }
-}
-
-/// The embedder singleton.
-///
-/// [ensureFlutterViewEmbedderInitialized] must be called prior to calling this
-/// getter.
-FlutterViewEmbedder get flutterViewEmbedder {
-  final FlutterViewEmbedder? embedder = _flutterViewEmbedder;
-  assert(() {
-    if (embedder == null) {
-      throw StateError(
-        'FlutterViewEmbedder not initialized. Call `ensureFlutterViewEmbedderInitialized()` '
-        'prior to calling the `flutterViewEmbedder` getter.'
-      );
-    }
-    return true;
-  }());
-  return embedder!;
-}
-FlutterViewEmbedder? _flutterViewEmbedder;
-
-/// Initializes the [FlutterViewEmbedder], if it's not already initialized.
-FlutterViewEmbedder ensureFlutterViewEmbedderInitialized() => _flutterViewEmbedder ??= FlutterViewEmbedder();
diff --git a/lib/web_ui/lib/src/engine/engine_canvas.dart b/lib/web_ui/lib/src/engine/engine_canvas.dart
index 297319a0823715aaf0bc6bfcf47fb80413abb4c8..7819ba4da17ec0376cea67c70f6e0514f559319f 100644
--- a/lib/web_ui/lib/src/engine/engine_canvas.dart
+++ b/lib/web_ui/lib/src/engine/engine_canvas.dart
@@ -134,8 +134,6 @@ class SaveClipEntry {
 /// Provides save stack tracking functionality to implementations of
 /// [EngineCanvas].
 mixin SaveStackTracking on EngineCanvas {
-  static final Vector3 _unitZ = Vector3(0.0, 0.0, 1.0);
-
   final List<SaveStackEntry> _saveStack = <SaveStackEntry>[];
 
   /// The stack that maintains clipping operations used when text is painted
@@ -206,7 +204,7 @@ mixin SaveStackTracking on EngineCanvas {
   /// Classes that override this method must call `super.rotate()`.
   @override
   void rotate(double radians) {
-    _currentTransform.rotate(_unitZ, radians);
+    _currentTransform.rotate(kUnitZ, radians);
   }
 
   /// Skews the [currentTransform] matrix.
@@ -288,8 +286,6 @@ class _SaveElementStackEntry {
 /// Provides save stack tracking functionality to implementations of
 /// [EngineCanvas].
 mixin SaveElementStackTracking on EngineCanvas {
-  static final Vector3 _unitZ = Vector3(0.0, 0.0, 1.0);
-
   final List<_SaveElementStackEntry> _saveStack = <_SaveElementStackEntry>[];
 
   /// The element at the top of the element stack, or [rootElement] if the stack
@@ -373,7 +369,7 @@ mixin SaveElementStackTracking on EngineCanvas {
   /// Classes that override this method must call `super.rotate()`.
   @override
   void rotate(double radians) {
-    _currentTransform.rotate(_unitZ, radians);
+    _currentTransform.rotate(kUnitZ, radians);
   }
 
   /// Skews the [currentTransform] matrix.
diff --git a/lib/web_ui/lib/src/engine/font_change_util.dart b/lib/web_ui/lib/src/engine/font_change_util.dart
index c4b876741f9b6aac260a6841119185a4a7e84095..12cbe8f94c7173014a372ed34dba260251572786 100644
--- a/lib/web_ui/lib/src/engine/font_change_util.dart
+++ b/lib/web_ui/lib/src/engine/font_change_util.dart
@@ -7,7 +7,6 @@ import 'dart:typed_data';
 
 import 'dom.dart';
 import 'platform_dispatcher.dart';
-import 'safe_browser_api.dart';
 import 'services.dart';
 
 final ByteData? _fontChangeMessage =
@@ -23,13 +22,13 @@ FutureOr<void> sendFontChangeMessage() async {
   if (!_fontChangeScheduled) {
     _fontChangeScheduled = true;
     // Batch updates into next animationframe.
-    domWindow.requestAnimationFrame(allowInterop((num _) {
+    domWindow.requestAnimationFrame((_) {
       _fontChangeScheduled = false;
       EnginePlatformDispatcher.instance.invokeOnPlatformMessage(
         'flutter/system',
         _fontChangeMessage,
         (_) {},
       );
-    }));
+    });
   }
 }
diff --git a/lib/web_ui/lib/src/engine/font_fallback_data.dart b/lib/web_ui/lib/src/engine/font_fallback_data.dart
new file mode 100644
index 0000000000000000000000000000000000000000..ab4306885e5a3b13b520877ecdb4edef4372e090
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/font_fallback_data.dart
@@ -0,0 +1,22694 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// DO NOT EDIT! This file is generated. See:
+// dev/roll_fallback_fonts.dart
+import 'noto_font.dart';
+
+List<NotoFont> getFallbackFontList(bool useColorEmoji) => <NotoFont>[
+ NotoFont('Noto Sans', 'notosans/v32/o-0IIpQlx3QUlC5A4PNb4j5Ba_2c7A.ttf'),
+ NotoFont('Noto Color Emoji', enabled: useColorEmoji, 'notocoloremoji/v25/Yq6P-KqIXTD0t4D9z1ESnKM3-HpFab5s79iz64w.ttf'),
+ NotoFont('Noto Emoji', enabled: !useColorEmoji, 'notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0jwvS-FGJCMY.ttf'),
+ NotoFont('Noto Music', 'notomusic/v20/pe0rMIiSN5pO63htf1sxIteQB9Zra1U.ttf'),
+ NotoFont('Noto Sans Symbols', 'notosanssymbols/v41/rP2up3q65FkAtHfwd-eIS2brbDN6gxP34F9jRRCe4W3gfQ8gavVFRkzrbQ.ttf'),
+ NotoFont('Noto Sans Symbols 2', 'notosanssymbols2/v22/I_uyMoGduATTei9eI8daxVHDyfisHr71ypPqfX71-AI.ttf'),
+ NotoFont('Noto Sans Adlam', 'notosansadlam/v22/neIczCCpqp0s5pPusPamd81eMfjPonvqdbYxxpgufnv0TGnBZLwhuvk.ttf'),
+ NotoFont('Noto Sans Anatolian Hieroglyphs', 'notosansanatolianhieroglyphs/v16/ijw9s4roRME5LLRxjsRb8A0gKPSWq4BbDmHHu6j2pEtUJzZWXybIymc5QYo.ttf'),
+ NotoFont('Noto Sans Arabic', 'notosansarabic/v18/nwpxtLGrOAZMl5nJ_wfgRg3DrWFZWsnVBJ_sS6tlqHHFlhQ5l3sQWIHPqzCfyGyvu3CBFQLaig.ttf'),
+ NotoFont('Noto Sans Armenian', 'notosansarmenian/v42/ZgN0jOZKPa7CHqq0h37c7ReDUubm2SEdFXp7ig73qtTY5idb74R9UdM3y2nZLorxb60iYy6zF3Eg.ttf'),
+ NotoFont('Noto Sans Avestan', 'notosansavestan/v21/bWti7ejKfBziStx7lIzKOLQZKhIJkyu9SASLji8U.ttf'),
+ NotoFont('Noto Sans Balinese', 'notosansbalinese/v24/NaPwcYvSBuhTirw6IaFn6UrRDaqje-lpbbRtYf-Fwu2Ov7fdhE5Vd222PPY.ttf'),
+ NotoFont('Noto Sans Bamum', 'notosansbamum/v27/uk-0EGK3o6EruUbnwovcbBTkkklK_Ya_PBHfNGTPEddO-_gLykxEkxA.ttf'),
+ NotoFont('Noto Sans Bassa Vah', 'notosansbassavah/v17/PN_bRee-r3f7LnqsD5sax12gjZn7mBpL5YwUpA2MBdcFn4MaAc6p34gH-GD7.ttf'),
+ NotoFont('Noto Sans Batak', 'notosansbatak/v19/gok2H6TwAEdtF9N8-mdTCQvT-Zdgo4_PHuk74A.ttf'),
+ NotoFont('Noto Sans Bengali', 'notosansbengali/v20/Cn-SJsCGWQxOjaGwMQ6fIiMywrNJIky6nvd8BjzVMvJx2mcSPVFpVEqE-6KmsolLudCk8izI0lc.ttf'),
+ NotoFont('Noto Sans Bhaiksuki', 'notosansbhaiksuki/v17/UcC63EosKniBH4iELXATsSBWdvUHXxhj8rLUdU4wh9U.ttf'),
+ NotoFont('Noto Sans Brahmi', 'notosansbrahmi/v18/vEFK2-VODB8RrNDvZSUmQQIIByV18tK1W77HtMo.ttf'),
+ NotoFont('Noto Sans Buginese', 'notosansbuginese/v18/esDM30ldNv-KYGGJpKGk18phe_7Da6_gtfuEXLmNtw.ttf'),
+ NotoFont('Noto Sans Buhid', 'notosansbuhid/v22/Dxxy8jiXMW75w3OmoDXVWJD7YwzAe6tgnaFoGA.ttf'),
+ NotoFont('Noto Sans Canadian Aboriginal', 'notosanscanadianaboriginal/v22/4C_TLjTuEqPj-8J01CwaGkiZ9os0iGVkezM1mUT-j_Lmlzda6uH_nnX1bzigWLn_yAsg0q0uhQ.ttf'),
+ NotoFont('Noto Sans Carian', 'notosanscarian/v16/LDIpaoiONgYwA9Yc6f0gUILeMIOgs7ob9yGLmfI.ttf'),
+ NotoFont('Noto Sans Caucasian Albanian', 'notosanscaucasianalbanian/v16/nKKA-HM_FYFRJvXzVXaANsU0VzsAc46QGOkWytlTs-TXrYDmoVmRSZo.ttf'),
+ NotoFont('Noto Sans Chakma', 'notosanschakma/v17/Y4GQYbJ8VTEp4t3MKJSMjg5OIzhi4JjTQhYBeYo.ttf'),
+ NotoFont('Noto Sans Cham', 'notosanscham/v29/pe06MIySN5pO62Z5YkFyQb_bbuRhe6D4yip43qfcERwcv7GykboaLg.ttf'),
+ NotoFont('Noto Sans Cherokee', 'notosanscherokee/v20/KFOPCm6Yu8uF-29fiz9vQF9YWK6Z8O10cHNA0cSkZCHYWi5PDkm5rAffjl0.ttf'),
+ NotoFont('Noto Sans Coptic', 'notosanscoptic/v20/iJWfBWmUZi_OHPqn4wq6kgqumOEd78u_VG0xR4Y.ttf'),
+ NotoFont('Noto Sans Cuneiform', 'notosanscuneiform/v17/bMrrmTWK7YY-MF22aHGGd7H8PhJtvBDWgb9JlRQueeQ.ttf'),
+ NotoFont('Noto Sans Cypriot', 'notosanscypriot/v15/8AtzGta9PYqQDjyp79a6f8Cj-3a3cxIsK5MPpahF.ttf'),
+ NotoFont('Noto Sans Deseret', 'notosansdeseret/v17/MwQsbgPp1eKH6QsAVuFb9AZM6MMr2Vq9ZnJSZtQG.ttf'),
+ NotoFont('Noto Sans Devanagari', 'notosansdevanagari/v25/TuGoUUFzXI5FBtUq5a8bjKYTZjtRU6Sgv3NaV_SNmI0b8QQCQmHn6B2OHjbL_08AlXQly-AzoFoW4Ow.ttf'),
+ NotoFont('Noto Sans Duployan', 'notosansduployan/v17/gokzH7nwAEdtF9N8-mdTDx_X9JM5wsvrFsIn6WYDvA.ttf'),
+ NotoFont('Noto Sans Egyptian Hieroglyphs', 'notosansegyptianhieroglyphs/v28/vEF42-tODB8RrNDvZSUmRhcQHzx1s7y_F9-j3qSzEcbEYindSVK8xRg7iw.ttf'),
+ NotoFont('Noto Sans Elbasan', 'notosanselbasan/v16/-F6rfiZqLzI2JPCgQBnw400qp1trvHdlre4dFcFh.ttf'),
+ NotoFont('Noto Sans Elymaic', 'notosanselymaic/v15/UqyKK9YTJW5liNMhTMqe9vUFP65ZD4AjWOT0zi2V.ttf'),
+ NotoFont('Noto Sans Georgian', 'notosansgeorgian/v42/PlIaFke5O6RzLfvNNVSitxkr76PRHBC4Ytyq-Gof7PUs4S7zWn-8YDB09HFNdpvnzFj-f5WK0OQV.ttf'),
+ NotoFont('Noto Sans Glagolitic', 'notosansglagolitic/v17/1q2ZY4-BBFBst88SU_tOj4J-4yuNF_HI4ERK4Amu7nM1.ttf'),
+ NotoFont('Noto Sans Gothic', 'notosansgothic/v16/TuGKUUVzXI5FBtUq5a8bj6wRbzxTFMX40kFQRx0.ttf'),
+ NotoFont('Noto Sans Grantha', 'notosansgrantha/v17/3y976akwcCjmsU8NDyrKo3IQfQ4o-r8cFeulHc6N.ttf'),
+ NotoFont('Noto Sans Gujarati', 'notosansgujarati/v23/wlpWgx_HC1ti5ViekvcxnhMlCVo3f5pv17ivlzsUB14gg1TMR2Gw4VceEl7MA_ypFwPM_OdiEH0s.ttf'),
+ NotoFont('Noto Sans Gunjala Gondi', 'notosansgunjalagondi/v19/bWtX7e7KfBziStx7lIzKPrcSMwcEnCv6DW7n5g0ef3PLtymzNxYL4YDE4J4vCTxEJQ.ttf'),
+ NotoFont('Noto Sans Gurmukhi', 'notosansgurmukhi/v26/w8g9H3EvQP81sInb43inmyN9zZ7hb7ATbSWo4q8dJ74a3cVrYFQ_bogT0-gPeG1OenbxZ_trdp7h.ttf'),
+ NotoFont('Noto Sans HK', 'notosanshk/v31/nKKF-GM_FYFRJvXzVXaAPe97P1KHynJFP716qHB--oWTiYjNvVA.ttf'),
+ NotoFont('Noto Sans Hanunoo', 'notosanshanunoo/v20/f0Xs0fCv8dxkDWlZSoXOj6CphMloFsEsEpgL_ix2.ttf'),
+ NotoFont('Noto Sans Hatran', 'notosanshatran/v16/A2BBn4Ne0RgnVF3Lnko-0sOBIfL_mM83r1nwzDs.ttf'),
+ NotoFont('Noto Sans Hebrew', 'notosanshebrew/v43/or3HQ7v33eiDljA1IufXTtVf7V6RvEEdhQlk0LlGxCyaeNKYZC0sqk3xXGiXd4qtoiJltutR2g.ttf'),
+ NotoFont('Noto Sans Imperial Aramaic', 'notosansimperialaramaic/v16/a8IMNpjwKmHXpgXbMIsbTc_kvks91LlLetBr5itQrtdml3YfPNno.ttf'),
+ NotoFont('Noto Sans Indic Siyaq Numbers', 'notosansindicsiyaqnumbers/v16/6xK5dTJFKcWIu4bpRBjRZRpsIYHabOeZ8UZLubTzpXNHKx2WPOpVd5Iu.ttf'),
+ NotoFont('Noto Sans Inscriptional Pahlavi', 'notosansinscriptionalpahlavi/v16/ll8UK3GaVDuxR-TEqFPIbsR79Xxz9WEKbwsjpz7VklYlC7FCVtqVOAYK0QA.ttf'),
+ NotoFont('Noto Sans Inscriptional Parthian', 'notosansinscriptionalparthian/v16/k3k7o-IMPvpLmixcA63oYi-yStDkgXuXncL7dzfW3P4TAJ2yklBJ2jNkLlLr.ttf'),
+ NotoFont('Noto Sans JP', 'notosansjp/v52/-F6jfjtqLzI2JPCgQBnw7HFyzSD-AsregP8VFBEj75vY0rw-oME.ttf'),
+ NotoFont('Noto Sans Javanese', 'notosansjavanese/v23/2V01KJkDAIA6Hp4zoSScDjV0Y-eoHAHT-Z3MngEefiidxJnkFFliZYWj4O8.ttf'),
+ NotoFont('Noto Sans KR', 'notosanskr/v36/PbyxFmXiEBPT4ITbgNA5Cgms3VYcOA-vvnIzzuoyeLTq8H4hfeE.ttf'),
+ NotoFont('Noto Sans Kaithi', 'notosanskaithi/v20/buEtppS9f8_vkXadMBJJu0tWjLwjQi0KdoZIKlo.ttf'),
+ NotoFont('Noto Sans Kannada', 'notosanskannada/v26/8vIs7xs32H97qzQKnzfeXycxXZyUmySvZWItmf1fe6TVmgop9ndpS-BqHEyGrDvNzSIMLsPKrkY.ttf'),
+ NotoFont('Noto Sans Kayah Li', 'notosanskayahli/v21/B50nF61OpWTRcGrhOVJJwOMXdca6Yecki3E06x2jVTX3WCc3CZH4EXLuKVM.ttf'),
+ NotoFont('Noto Sans Kharoshthi', 'notosanskharoshthi/v16/Fh4qPiLjKS30-P4-pGMMXCCfvkc5Vd7KE5z4rFyx5mR1.ttf'),
+ NotoFont('Noto Sans Khmer', 'notosanskhmer/v23/ijw3s5roRME5LLRxjsRb-gssOenAyendxrgV2c-Zw-9vbVUti_Z_dWgtWYuNAJz4kAbrddiA.ttf'),
+ NotoFont('Noto Sans Khojki', 'notosanskhojki/v18/-nFnOHM29Oofr2wohFbTuPPKVWpmK_d709jy92k.ttf'),
+ NotoFont('Noto Sans Khudawadi', 'notosanskhudawadi/v21/fdNi9t6ZsWBZ2k5ltHN73zZ5hc8HANlHIjRnVVXz9MY.ttf'),
+ NotoFont('Noto Sans Lao', 'notosanslao/v30/bx6lNx2Ol_ixgdYWLm9BwxM3NW6BOkuf763Clj73CiQ_J1Djx9pidOt4ccbdf5MK3riB2w.ttf'),
+ NotoFont('Noto Sans Lepcha', 'notosanslepcha/v19/0QI7MWlB_JWgA166SKhu05TekNS32AJstqBXgd4.ttf'),
+ NotoFont('Noto Sans Limbu', 'notosanslimbu/v22/3JnlSDv90Gmq2mrzckOBBRRoNJVj0MF3OHRDnA.ttf'),
+ NotoFont('Noto Sans Linear A', 'notosanslineara/v18/oPWS_l16kP4jCuhpgEGmwJOiA18FZj22zmHQAGQicw.ttf'),
+ NotoFont('Noto Sans Linear B', 'notosanslinearb/v17/HhyJU4wt9vSgfHoORYOiXOckKNB737IV3BkFTq4EPw.ttf'),
+ NotoFont('Noto Sans Lisu', 'notosanslisu/v25/uk-3EGO3o6EruUbnwovcYhz6kh57_nqbcTdjJnHP2Vwt29IlxkVdig.ttf'),
+ NotoFont('Noto Sans Lycian', 'notosanslycian/v15/QldVNSNMqAsHtsJ7UmqxBQA9r8wA5_naCJwn00E.ttf'),
+ NotoFont('Noto Sans Lydian', 'notosanslydian/v17/c4m71mVzGN7s8FmIukZJ1v4ZlcPReUPXMoIjEQI.ttf'),
+ NotoFont('Noto Sans Mahajani', 'notosansmahajani/v19/-F6sfiVqLzI2JPCgQBnw60Agp0JrvD5Fh8ARHNh4zg.ttf'),
+ NotoFont('Noto Sans Malayalam', 'notosansmalayalam/v26/sJoi3K5XjsSdcnzn071rL37lpAOsUThnDZIfPdbeSNzVakglNM-Qw8EaeB8Nss-_RuD9BFzEr6HxEA.ttf'),
+ NotoFont('Noto Sans Mandaic', 'notosansmandaic/v16/cIfnMbdWt1w_HgCcilqhKQBo_OsMI5_A_gMk0izH.ttf'),
+ NotoFont('Noto Sans Manichaean', 'notosansmanichaean/v17/taiVGntiC4--qtsfi4Jp9-_GkPZZCcrfekqCNTtFCtdX.ttf'),
+ NotoFont('Noto Sans Marchen', 'notosansmarchen/v19/aFTO7OZ_Y282EP-WyG6QTOX_C8WZMHhPk652ZaHk.ttf'),
+ NotoFont('Noto Sans Masaram Gondi', 'notosansmasaramgondi/v17/6xK_dThFKcWIu4bpRBjRYRV7KZCbUq6n_1kPnuGe7RI9WSWX.ttf'),
+ NotoFont('Noto Sans Math', 'notosansmath/v15/7Aump_cpkSecTWaHRlH2hyV5UHkG-V048PW0.ttf'),
+ NotoFont('Noto Sans Mayan Numerals', 'notosansmayannumerals/v16/PlIuFk25O6RzLfvNNVSivR09_KqYMwvvDKYjfIiE68oo6eepYQ.ttf'),
+ NotoFont('Noto Sans Medefaidrin', 'notosansmedefaidrin/v23/WwkzxOq6Dk-wranENynkfeVsNbRZtbOIdLb1exeM4ZeuabBfmErWlT318e5A3rw.ttf'),
+ NotoFont('Noto Sans Meetei Mayek', 'notosansmeeteimayek/v15/HTxAL3QyKieByqY9eZPFweO0be7M21uSphSdhqILnmrRfJ8t_1TJ_vTW5PgeFYVa.ttf'),
+ NotoFont('Noto Sans Meroitic', 'notosansmeroitic/v17/IFS5HfRJndhE3P4b5jnZ3ITPvC6i00UDgDhTiKY9KQ.ttf'),
+ NotoFont('Noto Sans Miao', 'notosansmiao/v17/Dxxz8jmXMW75w3OmoDXVV4zyZUjgUYVslLhx.ttf'),
+ NotoFont('Noto Sans Modi', 'notosansmodi/v23/pe03MIySN5pO62Z5YkFyT7jeav5qWVAgVol-.ttf'),
+ NotoFont('Noto Sans Mongolian', 'notosansmongolian/v17/VdGCAYADGIwE0EopZx8xQfHlgEAMsrToxLsg6-av1x0.ttf'),
+ NotoFont('Noto Sans Mro', 'notosansmro/v18/qWcsB6--pZv9TqnUQMhe9b39WDzRtjkho4M.ttf'),
+ NotoFont('Noto Sans Multani', 'notosansmultani/v20/9Bty3ClF38_RfOpe1gCaZ8p30BOFO1A0pfCs5Kos.ttf'),
+ NotoFont('Noto Sans Myanmar', 'notosansmyanmar/v20/AlZq_y1ZtY3ymOryg38hOCSdOnFq0En23OU4o1AC.ttf'),
+ NotoFont('Noto Sans NKo', 'notosansnko/v6/esDX31ZdNv-KYGGJpKGk2_RpMpCMHMLBrdA.ttf'),
+ NotoFont('Noto Sans Nabataean', 'notosansnabataean/v16/IFS4HfVJndhE3P4b5jnZ34DfsjO330dNoBJ9hK8kMK4.ttf'),
+ NotoFont('Noto Sans New Tai Lue', 'notosansnewtailue/v22/H4cKBW-Pl9DZ0Xe_nHUapt7PovLXAhAnY7wqaLy-OJgU3p_pdeXAYUbghFPKzeY.ttf'),
+ NotoFont('Noto Sans Newa', 'notosansnewa/v16/7r3fqXp6utEsO9pI4f8ok8sWg8n_qN4R5lNU.ttf'),
+ NotoFont('Noto Sans Nushu', 'notosansnushu/v19/rnCw-xRQ3B7652emAbAe_Ai1IYaFWFAMArZKqQ.ttf'),
+ NotoFont('Noto Sans Ogham', 'notosansogham/v17/kmKlZqk1GBDGN0mY6k5lmEmww4hrt5laQxcoCA.ttf'),
+ NotoFont('Noto Sans Ol Chiki', 'notosansolchiki/v29/N0b92TJNOPt-eHmFZCdQbrL32r-4CvhzDzRwlxOQYuVALWk267I6gVrz5gQ.ttf'),
+ NotoFont('Noto Sans Old Hungarian', 'notosansoldhungarian/v18/E213_cD6hP3GwCJPEUssHEM0KqLaHJXg2PiIgRfjbg5nCYXt.ttf'),
+ NotoFont('Noto Sans Old Italic', 'notosansolditalic/v16/TuGOUUFzXI5FBtUq5a8bh68BJxxEVam7tWlRdRhtCC4d.ttf'),
+ NotoFont('Noto Sans Old North Arabian', 'notosansoldnortharabian/v16/esDF30BdNv-KYGGJpKGk2tNiMt7Jar6olZDyNdr81zBQmUo_xw4ABw.ttf'),
+ NotoFont('Noto Sans Old Permic', 'notosansoldpermic/v17/snf1s1q1-dF8pli1TesqcbUY4Mr-ElrwKLdXgv_dKYB5.ttf'),
+ NotoFont('Noto Sans Old Persian', 'notosansoldpersian/v16/wEOjEAbNnc5caQTFG18FHrZr9Bp6-8CmIJ_tqOlQfx9CjA.ttf'),
+ NotoFont('Noto Sans Old Sogdian', 'notosansoldsogdian/v16/3JnjSCH90Gmq2mrzckOBBhFhdrMst48aURt7neIqM-9uyg.ttf'),
+ NotoFont('Noto Sans Old South Arabian', 'notosansoldsoutharabian/v16/3qT5oiOhnSyU8TNFIdhZTice3hB_HWKsEnF--0XCHiKx1OtDT9HwTA.ttf'),
+ NotoFont('Noto Sans Old Turkic', 'notosansoldturkic/v17/yMJNMJVya43H0SUF_WmcGEQVqoEMKDKbsE2RjEw-Vyws.ttf'),
+ NotoFont('Noto Sans Oriya', 'notosansoriya/v27/AYCppXfzfccDCstK_hrjDyADv5e9748vhj3CJBLHIARtgD6TJQS0dJT5Ivj0f6_c6LhHBRe-.ttf'),
+ NotoFont('Noto Sans Osage', 'notosansosage/v18/oPWX_kB6kP4jCuhpgEGmw4mtAVtXRlaSxkrMCQ.ttf'),
+ NotoFont('Noto Sans Osmanya', 'notosansosmanya/v18/8vIS7xs32H97qzQKnzfeWzUyUpOJmz6kR47NCV5Z.ttf'),
+ NotoFont('Noto Sans Pahawh Hmong', 'notosanspahawhhmong/v18/bWtp7e_KfBziStx7lIzKKaMUOBEA3UPQDW7krzc_c48aMpM.ttf'),
+ NotoFont('Noto Sans Palmyrene', 'notosanspalmyrene/v16/ZgNPjOdKPa7CHqq0h37c_ASCWvH93SFCPnK5ZpdNtcA.ttf'),
+ NotoFont('Noto Sans Pau Cin Hau', 'notosanspaucinhau/v20/x3d-cl3IZKmUqiMg_9wBLLtzl22EayN7ehIdjEWqKMxsKw.ttf'),
+ NotoFont('Noto Sans Phags Pa', 'notosansphagspa/v15/pxiZyoo6v8ZYyWh5WuPeJzMkd4SrGChkqkSsrvNXiA.ttf'),
+ NotoFont('Noto Sans Phoenician', 'notosansphoenician/v17/jizFRF9Ksm4Bt9PvcTaEkIHiTVtxmFtS5X7Jot-p5561.ttf'),
+ NotoFont('Noto Sans Psalter Pahlavi', 'notosanspsalterpahlavi/v16/rP2Vp3K65FkAtHfwd-eISGznYihzggmsicPfud3w1G3KsUQBct4.ttf'),
+ NotoFont('Noto Sans Rejang', 'notosansrejang/v21/Ktk2AKuMeZjqPnXgyqrib7DIogqwN4O3WYZB_sU.ttf'),
+ NotoFont('Noto Sans Runic', 'notosansrunic/v17/H4c_BXWPl9DZ0Xe_nHUaus7W68WWaxpvHtgIYg.ttf'),
+ NotoFont('Noto Sans SC', 'notosanssc/v36/k3kCo84MPvpLmixcA63oeAL7Iqp5IZJF9bmaG9_FnYxNbPzS5HE.ttf'),
+ NotoFont('Noto Sans Saurashtra', 'notosanssaurashtra/v23/ea8GacQ0Wfz_XKWXe6OtoA8w8zvmYwTef9ndjhPTSIx9.ttf'),
+ NotoFont('Noto Sans Sharada', 'notosanssharada/v16/gok0H7rwAEdtF9N8-mdTGALG6p0kwoXLPOwr4H8a.ttf'),
+ NotoFont('Noto Sans Shavian', 'notosansshavian/v17/CHy5V_HZE0jxJBQlqAeCKjJvQBNF4EFQSplv2Cwg.ttf'),
+ NotoFont('Noto Sans Siddham', 'notosanssiddham/v20/OZpZg-FwqiNLe9PELUikxTWDoCCeGqndk3Ic92ZH.ttf'),
+ NotoFont('Noto Sans Sinhala', 'notosanssinhala/v26/yMJ2MJBya43H0SUF_WmcBEEf4rQVO2P524V5N_MxQzQtb-tf5dJbC30Fu9zUwg2a5lgLpJwbQRM.ttf'),
+ NotoFont('Noto Sans Sogdian', 'notosanssogdian/v16/taiQGn5iC4--qtsfi4Jp6eHPnfxQBo--Pm6KHidM.ttf'),
+ NotoFont('Noto Sans Sora Sompeng', 'notosanssorasompeng/v24/PlIRFkO5O6RzLfvNNVSioxM2_OTrEhPyDLolKvCsHzCxWuGkYHR818DpZXJQd4Mu.ttf'),
+ NotoFont('Noto Sans Soyombo', 'notosanssoyombo/v17/RWmSoL-Y6-8q5LTtXs6MF6q7xsxgY0FrIFOcK25W.ttf'),
+ NotoFont('Noto Sans Sundanese', 'notosanssundanese/v24/FwZw7_84xUkosG2xJo2gm7nFwSLQkdymq2mkz3Gz1_b6ctxpNNHCizv7fQES.ttf'),
+ NotoFont('Noto Sans Syloti Nagri', 'notosanssylotinagri/v20/uU9eCAQZ75uhfF9UoWDRiY3q7Sf_VFV3m4dGFVfxN87gsj0.ttf'),
+ NotoFont('Noto Sans Syriac', 'notosanssyriac/v16/Ktk7AKuMeZjqPnXgyqribqzQqgW0LYiVqV7dXcP0C-VD9MaJyZfUL_FC.ttf'),
+ NotoFont('Noto Sans TC', 'notosanstc/v35/-nFuOG829Oofr2wohFbTp9ifNAn722rq0MXz76Cy_CpOtma3uNQ.ttf'),
+ NotoFont('Noto Sans Tagalog', 'notosanstagalog/v22/J7aFnoNzCnFcV9ZI-sUYuvote1R0wwEAA8jHexnL.ttf'),
+ NotoFont('Noto Sans Tagbanwa', 'notosanstagbanwa/v18/Y4GWYbB8VTEp4t3MKJSMmQdIKjRtt_nZRjQEaYpGoQ.ttf'),
+ NotoFont('Noto Sans Tai Le', 'notosanstaile/v17/vEFK2-VODB8RrNDvZSUmVxEATwR58tK1W77HtMo.ttf'),
+ NotoFont('Noto Sans Tai Tham', 'notosanstaitham/v20/kJEbBv0U4hgtwxDUw2x9q7tbjLIfbPGHBoaVSAZ3MdLJBCUbPgquyaRGKMw.ttf'),
+ NotoFont('Noto Sans Tai Viet', 'notosanstaiviet/v19/8QIUdj3HhN_lv4jf9vsE-9GMOLsaSPZr644fWsRO9w.ttf'),
+ NotoFont('Noto Sans Takri', 'notosanstakri/v23/TuGJUVpzXI5FBtUq5a8bnKIOdTwQNO_W3khJXg.ttf'),
+ NotoFont('Noto Sans Tamil', 'notosanstamil/v27/ieVc2YdFI3GCY6SyQy1KfStzYKZgzN1z4LKDbeZce-0429tBManUktuex7vGo70RqKDt_EvT.ttf'),
+ NotoFont('Noto Sans Tamil Supplement', 'notosanstamilsupplement/v21/DdTz78kEtnooLS5rXF1DaruiCd_bFp_Ph4sGcn7ax_vsAeMkeq1x.ttf'),
+ NotoFont('Noto Sans Telugu', 'notosanstelugu/v25/0FlxVOGZlE2Rrtr-HmgkMWJNjJ5_RyT8o8c7fHkeg-esVC5dzHkHIJQqrEntezbqQUbf-3v37w.ttf'),
+ NotoFont('Noto Sans Thaana', 'notosansthaana/v23/C8c14dM-vnz-s-3jaEsxlxHkBH-WZOETXfoQrfQ9Y4XrbhLhnu4-tbNu.ttf'),
+ NotoFont('Noto Sans Thai', 'notosansthai/v20/iJWnBXeUZi_OHPqn4wq6hQ2_hbJ1xyN9wd43SofNWcd1MKVQt_So_9CdU5RtpzF-QRvzzXg.ttf'),
+ NotoFont('Noto Sans Tifinagh', 'notosanstifinagh/v20/I_uzMoCduATTei9eI8dawkHIwvmhCvbn6rnEcXfs4Q.ttf'),
+ NotoFont('Noto Sans Tirhuta', 'notosanstirhuta/v16/t5t6IQYRNJ6TWjahPR6X-M-apUyby7uGUBsTrn5P.ttf'),
+ NotoFont('Noto Sans Ugaritic', 'notosansugaritic/v16/3qTwoiqhnSyU8TNFIdhZVCwbjCpkAXXkMhoIkiazfg.ttf'),
+ NotoFont('Noto Sans Vai', 'notosansvai/v17/NaPecZTSBuhTirw6IaFn_UrURMTsDIRSfr0.ttf'),
+ NotoFont('Noto Sans Wancho', 'notosanswancho/v17/zrf-0GXXyfn6Fs0lH9P4cUubP0GBqAPopiRfKp8.ttf'),
+ NotoFont('Noto Sans Warang Citi', 'notosanswarangciti/v17/EYqtmb9SzL1YtsZSScyKDXIeOv3w-zgsNvKRpeVCCXzdgA.ttf'),
+ NotoFont('Noto Sans Yi', 'notosansyi/v19/sJoD3LFXjsSdcnzn071rO3apxVDJNVgSNg.ttf'),
+ NotoFont('Noto Sans Zanabazar Square', 'notosanszanabazarsquare/v19/Cn-jJsuGWQxOjaGwMQ6fOicyxLBEMRfDtkzl4uagQtJxOCEgN0Gc.ttf'),
+];
+
+// 315 unique sets of fonts containing 3642 font references encoded in 4273 characters
+const String encodedFontSets =
+    // #0: 5 fonts: HK₄₂, JP₅₀, KR₅₂, SC₁₁₁, TC₁₂₃.
+    '1qhb2gl,'
+    // #1: 3 fonts: HK₄₂, SC₁₁₁, TC₁₂₃.
+    '1q2ql,'
+    // #2: 4 fonts: HK₄₂, JP₅₀, SC₁₁₁, TC₁₂₃.
+    '1qh2il,'
+    // #3: 1 font: SC₁₁₁.
+    '4h,'
+    // #4: 0 fonts.
+    ','
+    // #5: 2 fonts: JP₅₀, SC₁₁₁.
+    '1y2i,'
+    // #6: 2 fonts: HK₄₂, TC₁₂₃.
+    '1q3c,'
+    // #7: 1 font: JP₅₀.
+    '1y,'
+    // #8: 4 fonts: HK₄₂, KR₅₂, SC₁₁₁, TC₁₂₃.
+    '1qj2gl,'
+    // #9: 3 fonts: JP₅₀, KR₅₂, SC₁₁₁.
+    '1yb2g,'
+    // #10: 2 fonts: KR₅₂, SC₁₁₁.
+    '2a2g,'
+    // #11: 1 font: Noto Sans₀.
+    'a,'
+    // #12: 1 font: Symbols 2₅.
+    'f,'
+    // #13: 3 fonts: Noto Color Emoji₁, Noto Emoji₂, Symbols 2₅.
+    'bac,'
+    // #14: 1 font: Math₇₄.
+    '2w,'
+    // #15: 2 fonts: Noto Color Emoji₁, Noto Emoji₂.
+    'ba,'
+    // #16: 2 fonts: JP₅₀, KR₅₂.
+    '1yb,'
+    // #17: 1 font: KR₅₂.
+    '2a,'
+    // #18: 6 fonts: Noto Sans₀, HK₄₂, JP₅₀, KR₅₂, SC₁₁₁, TC₁₂₃.
+    'a1phb2gl,'
+    // #19: 1 font: Symbols₄.
+    'e,'
+    // #20: 6 fonts: HK₄₂, JP₅₀, KR₅₂, Math₇₄, SC₁₁₁, TC₁₂₃.
+    '1qhbv1kl,'
+    // #21: 133 fonts: Noto Sans₀, Noto Music₃, Symbols₄, Symbols 2₅, Adlam₆, Anatolian Hieroglyphs₇, Armenian₉, Avestan₁₀, Balinese₁₁, Bamum₁₂, Bassa Vah₁₃, Batak₁₄, Bengali₁₅, Bhaiksuki₁₆, Brahmi₁₇, Buginese₁₈, Buhid₁₉, Canadian Aboriginal₂₀, Carian₂₁, Chakma₂₃, Cham₂₄, Cherokee₂₅, Coptic₂₆, Cuneiform₂₇, Deseret₂₉, Devanagari₃₀, Duployan₃₁, Egyptian Hieroglyphs₃₂, Elbasan₃₃, Georgian₃₅, Glagolitic₃₆, Gothic₃₇, Grantha₃₈, Gujarati₃₉, Gunjala Gondi₄₀, Gurmukhi₄₁, HK₄₂, Hanunoo₄₃, Hatran₄₄, Hebrew₄₅, Imperial Aramaic₄₆, Indic Siyaq Numbers₄₇, Inscriptional Pahlavi₄₈, Inscriptional Parthian₄₉, JP₅₀, Javanese₅₁, KR₅₂, Kaithi₅₃, Kannada₅₄, Kayah Li₅₅, Kharoshthi₅₆, Khmer₅₇, Khojki₅₈, Khudawadi₅₉, Lao₆₀, Lepcha₆₁, Limbu₆₂, Linear A₆₃, Linear B₆₄, Lisu₆₅, Lydian₆₇, Mahajani₆₈, Malayalam₆₉, Mandaic₇₀, Manichaean₇₁, Marchen₇₂, Masaram Gondi₇₃, Mayan Numerals₇₅, Medefaidrin₇₆, Meetei Mayek₇₇, Meroitic₇₈, Miao₇₉, Modi₈₀, Mongolian₈₁, Mro₈₂, Multani₈₃, NKo₈₅, Nabataean₈₆, New Tai Lue₈₇, Newa₈₈, Nushu₈₉, Ogham₉₀, Ol Chiki₉₁, Old Hungarian₉₂, Old Italic₉₃, Old North Arabian₉₄, Old Permic₉₅, Old Persian₉₆, Old Sogdian₉₇, Old South Arabian₉₈, Old Turkic₉₉, Oriya₁₀₀, Osage₁₀₁, Osmanya₁₀₂, Pahawh Hmong₁₀₃, Palmyrene₁₀₄, Pau Cin Hau₁₀₅, Phoenician₁₀₇, Psalter Pahlavi₁₀₈, Rejang₁₀₉, Runic₁₁₀, SC₁₁₁, Saurashtra₁₁₂, Sharada₁₁₃, Shavian₁₁₄, Siddham₁₁₅, Sinhala₁₁₆, Sogdian₁₁₇, Sora Sompeng₁₁₈, Soyombo₁₁₉, Sundanese₁₂₀, Syloti Nagri₁₂₁, Syriac₁₂₂, TC₁₂₃, Tagalog₁₂₄, Tagbanwa₁₂₅, Tai Le₁₂₆, Tai Tham₁₂₇, Tai Viet₁₂₈, Takri₁₂₉, Tamil₁₃₀, Tamil Supplement₁₃₁, Telugu₁₃₂, Thaana₁₃₃, Thai₁₃₄, Tifinagh₁₃₅, Tirhuta₁₃₆, Ugaritic₁₃₇, Vai₁₃₈, Wancho₁₃₉, Warang Citi₁₄₀, Yi₁₄₁, Zanabazar Square₁₄₂.
+    'acaaaabaaaaaaaaaaaabaaaabaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaabaaaaaaaabaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,'
+    // #22: 6 fonts: Symbols 2₅, HK₄₂, JP₅₀, KR₅₂, SC₁₁₁, TC₁₂₃.
+    'f1khb2gl,'
+    // #23: 3 fonts: HK₄₂, JP₅₀, TC₁₂₃.
+    '1qh2u,'
+    // #24: 128 fonts: Noto Sans₀, Noto Music₃, Symbols₄, Symbols 2₅, Adlam₆, Anatolian Hieroglyphs₇, Armenian₉, Avestan₁₀, Balinese₁₁, Bamum₁₂, Bassa Vah₁₃, Batak₁₄, Bengali₁₅, Bhaiksuki₁₆, Brahmi₁₇, Buginese₁₈, Buhid₁₉, Canadian Aboriginal₂₀, Carian₂₁, Chakma₂₃, Cham₂₄, Cherokee₂₅, Coptic₂₆, Cuneiform₂₇, Deseret₂₉, Devanagari₃₀, Duployan₃₁, Egyptian Hieroglyphs₃₂, Elbasan₃₃, Georgian₃₅, Glagolitic₃₆, Gothic₃₇, Grantha₃₈, Gujarati₃₉, Gunjala Gondi₄₀, Gurmukhi₄₁, Hanunoo₄₃, Hatran₄₄, Hebrew₄₅, Imperial Aramaic₄₆, Indic Siyaq Numbers₄₇, Inscriptional Pahlavi₄₈, Inscriptional Parthian₄₉, Javanese₅₁, Kaithi₅₃, Kannada₅₄, Kayah Li₅₅, Kharoshthi₅₆, Khmer₅₇, Khojki₅₈, Khudawadi₅₉, Lao₆₀, Lepcha₆₁, Limbu₆₂, Linear A₆₃, Linear B₆₄, Lisu₆₅, Lydian₆₇, Mahajani₆₈, Malayalam₆₉, Mandaic₇₀, Manichaean₇₁, Marchen₇₂, Masaram Gondi₇₃, Mayan Numerals₇₅, Medefaidrin₇₆, Meetei Mayek₇₇, Meroitic₇₈, Miao₇₉, Modi₈₀, Mongolian₈₁, Mro₈₂, Multani₈₃, NKo₈₅, Nabataean₈₆, New Tai Lue₈₇, Newa₈₈, Nushu₈₉, Ogham₉₀, Ol Chiki₉₁, Old Hungarian₉₂, Old Italic₉₃, Old North Arabian₉₄, Old Permic₉₅, Old Persian₉₆, Old Sogdian₉₇, Old South Arabian₉₈, Old Turkic₉₉, Oriya₁₀₀, Osage₁₀₁, Osmanya₁₀₂, Pahawh Hmong₁₀₃, Palmyrene₁₀₄, Pau Cin Hau₁₀₅, Phoenician₁₀₇, Psalter Pahlavi₁₀₈, Rejang₁₀₉, Runic₁₁₀, Saurashtra₁₁₂, Sharada₁₁₃, Shavian₁₁₄, Siddham₁₁₅, Sinhala₁₁₆, Sogdian₁₁₇, Sora Sompeng₁₁₈, Soyombo₁₁₉, Sundanese₁₂₀, Syloti Nagri₁₂₁, Syriac₁₂₂, Tagalog₁₂₄, Tagbanwa₁₂₅, Tai Le₁₂₆, Tai Tham₁₂₇, Tai Viet₁₂₈, Takri₁₂₉, Tamil₁₃₀, Tamil Supplement₁₃₁, Telugu₁₃₂, Thaana₁₃₃, Thai₁₃₄, Tifinagh₁₃₅, Tirhuta₁₃₆, Ugaritic₁₃₇, Vai₁₃₈, Wancho₁₃₉, Warang Citi₁₄₀, Yi₁₄₁, Zanabazar Square₁₄₂.
+    'acaaaabaaaaaaaaaaaabaaaabaaaabaaaaaabaaaaaabbaaaaaaaaaaaabaaaaaabaaaaaaaabaaaaaaaaaaaaaaaaaaaabaaabaaaaaaaaaabaaaaaaaaaaaaaaaaaa,'
+    // #25: 1 font: Arabic₈.
+    'i,'
+    // #26: 2 fonts: Noto Sans₀, Math₇₄.
+    'a2v,'
+    // #27: 6 fonts: Symbols₄, HK₄₂, JP₅₀, KR₅₂, SC₁₁₁, TC₁₂₃.
+    'e1lhb2gl,'
+    // #28: 3 fonts: Noto Color Emoji₁, Noto Emoji₂, Symbols₄.
+    'bab,'
+    // #29: 1 font: Tamil₁₃₀.
+    '5a,'
+    // #30: 1 font: Bengali₁₅.
+    'p,'
+    // #31: 1 font: Grantha₃₈.
+    '1m,'
+    // #32: 1 font: Gurmukhi₄₁.
+    '1p,'
+    // #33: 134 fonts: Noto Sans₀, Noto Music₃, Symbols₄, Symbols 2₅, Adlam₆, Anatolian Hieroglyphs₇, Armenian₉, Avestan₁₀, Balinese₁₁, Bamum₁₂, Bassa Vah₁₃, Batak₁₄, Bengali₁₅, Bhaiksuki₁₆, Brahmi₁₇, Buginese₁₈, Buhid₁₉, Canadian Aboriginal₂₀, Carian₂₁, Chakma₂₃, Cham₂₄, Cherokee₂₅, Coptic₂₆, Cuneiform₂₇, Deseret₂₉, Devanagari₃₀, Duployan₃₁, Egyptian Hieroglyphs₃₂, Elbasan₃₃, Georgian₃₅, Glagolitic₃₆, Gothic₃₇, Grantha₃₈, Gujarati₃₉, Gunjala Gondi₄₀, Gurmukhi₄₁, HK₄₂, Hanunoo₄₃, Hatran₄₄, Hebrew₄₅, Imperial Aramaic₄₆, Indic Siyaq Numbers₄₇, Inscriptional Pahlavi₄₈, Inscriptional Parthian₄₉, JP₅₀, Javanese₅₁, KR₅₂, Kaithi₅₃, Kannada₅₄, Kayah Li₅₅, Kharoshthi₅₆, Khmer₅₇, Khojki₅₈, Khudawadi₅₉, Lao₆₀, Lepcha₆₁, Limbu₆₂, Linear A₆₃, Linear B₆₄, Lisu₆₅, Lydian₆₇, Mahajani₆₈, Malayalam₆₉, Mandaic₇₀, Manichaean₇₁, Marchen₇₂, Masaram Gondi₇₃, Math₇₄, Mayan Numerals₇₅, Medefaidrin₇₆, Meetei Mayek₇₇, Meroitic₇₈, Miao₇₉, Modi₈₀, Mongolian₈₁, Mro₈₂, Multani₈₃, NKo₈₅, Nabataean₈₆, New Tai Lue₈₇, Newa₈₈, Nushu₈₉, Ogham₉₀, Ol Chiki₉₁, Old Hungarian₉₂, Old Italic₉₃, Old North Arabian₉₄, Old Permic₉₅, Old Persian₉₆, Old Sogdian₉₇, Old South Arabian₉₈, Old Turkic₉₉, Oriya₁₀₀, Osage₁₀₁, Osmanya₁₀₂, Pahawh Hmong₁₀₃, Palmyrene₁₀₄, Pau Cin Hau₁₀₅, Phoenician₁₀₇, Psalter Pahlavi₁₀₈, Rejang₁₀₉, Runic₁₁₀, SC₁₁₁, Saurashtra₁₁₂, Sharada₁₁₃, Shavian₁₁₄, Siddham₁₁₅, Sinhala₁₁₆, Sogdian₁₁₇, Sora Sompeng₁₁₈, Soyombo₁₁₉, Sundanese₁₂₀, Syloti Nagri₁₂₁, Syriac₁₂₂, TC₁₂₃, Tagalog₁₂₄, Tagbanwa₁₂₅, Tai Le₁₂₆, Tai Tham₁₂₇, Tai Viet₁₂₈, Takri₁₂₉, Tamil₁₃₀, Tamil Supplement₁₃₁, Telugu₁₃₂, Thaana₁₃₃, Thai₁₃₄, Tifinagh₁₃₅, Tirhuta₁₃₆, Ugaritic₁₃₇, Vai₁₃₈, Wancho₁₃₉, Warang Citi₁₄₀, Yi₁₄₁, Zanabazar Square₁₄₂.
+    'acaaaabaaaaaaaaaaaabaaaabaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,'
+    // #34: 8 fonts: Noto Color Emoji₁, Noto Emoji₂, Symbols 2₅, HK₄₂, JP₅₀, KR₅₂, SC₁₁₁, TC₁₂₃.
+    'bac1khb2gl,'
+    // #35: 2 fonts: Noto Sans₀, Devanagari₃₀.
+    'a1d,'
+    // #36: 1 font: Gujarati₃₉.
+    '1n,'
+    // #37: 1 font: Oriya₁₀₀.
+    '3w,'
+    // #38: 1 font: Kannada₅₄.
+    '2c,'
+    // #39: 1 font: Sinhala₁₁₆.
+    '4m,'
+    // #40: 2 fonts: Noto Sans₀, Coptic₂₆.
+    'az,'
+    // #41: 1 font: Telugu₁₃₂.
+    '5c,'
+    // #42: 1 font: Lao₆₀.
+    '2i,'
+    // #43: 7 fonts: Noto Color Emoji₁, Noto Emoji₂, HK₄₂, JP₅₀, KR₅₂, SC₁₁₁, TC₁₂₃.
+    'ba1nhb2gl,'
+    // #44: 1 font: Georgian₃₅.
+    '1j,'
+    // #45: 4 fonts: HK₄₂, JP₅₀, KR₅₂, TC₁₂₃.
+    '1qhb2s,'
+    // #46: 1 font: Hebrew₄₅.
+    '1t,'
+    // #47: 7 fonts: Noto Sans₀, HK₄₂, JP₅₀, KR₅₂, Math₇₄, SC₁₁₁, TC₁₂₃.
+    'a1phbv1kl,'
+    // #48: 8 fonts: Noto Color Emoji₁, Noto Emoji₂, Symbols₄, HK₄₂, JP₅₀, KR₅₂, SC₁₁₁, TC₁₂₃.
+    'bab1lhb2gl,'
+    // #49: 4 fonts: HK₄₂, JP₅₀, KR₅₂, SC₁₁₁.
+    '1qhb2g,'
+    // #50: 1 font: Kharoshthi₅₆.
+    '2e,'
+    // #51: 1 font: Linear B₆₄.
+    '2m,'
+    // #52: 3 fonts: Noto Sans₀, Bengali₁₅, Devanagari₃₀.
+    'aoo,'
+    // #53: 7 fonts: Symbols 2₅, HK₄₂, JP₅₀, KR₅₂, Math₇₄, SC₁₁₁, TC₁₂₃.
+    'f1khbv1kl,'
+    // #54: 1 font: Glagolitic₃₆.
+    '1k,'
+    // #55: 3 fonts: HK₄₂, KR₅₂, TC₁₂₃.
+    '1qj2s,'
+    // #56: 1 font: Malayalam₆₉.
+    '2r,'
+    // #57: 1 font: Masaram Gondi₇₃.
+    '2v,'
+    // #58: 1 font: Mongolian₈₁.
+    '3d,'
+    // #59: 2 fonts: Symbols₄, Math₇₄.
+    'e2r,'
+    // #60: 1 font: Cypriot₂₈.
+    '1c,'
+    // #61: 2 fonts: Grantha₃₈, Tamil₁₃₀.
+    '1m3n,'
+    // #62: 1 font: Gunjala Gondi₄₀.
+    '1o,'
+    // #63: 7 fonts: HK₄₂, JP₅₀, KR₅₂, New Tai Lue₈₇, SC₁₁₁, TC₁₂₃, Yi₁₄₁.
+    '1qhb1ixlr,'
+    // #64: 2 fonts: Noto Sans₀, Duployan₃₁.
+    'a1e,'
+    // #65: 2 fonts: Symbols 2₅, Math₇₄.
+    'f2q,'
+    // #66: 1 font: Armenian₉.
+    'j,'
+    // #67: 1 font: Duployan₃₁.
+    '1f,'
+    // #68: 1 font: Limbu₆₂.
+    '2k,'
+    // #69: 1 font: Multani₈₃.
+    '3f,'
+    // #70: 1 font: Pahawh Hmong₁₀₃.
+    '3z,'
+    // #71: 1 font: Tai Tham₁₂₇.
+    '4x,'
+    // #72: 135 fonts: Noto Sans₀, Noto Music₃, Symbols₄, Symbols 2₅, Adlam₆, Anatolian Hieroglyphs₇, Arabic₈, Armenian₉, Avestan₁₀, Balinese₁₁, Bamum₁₂, Bassa Vah₁₃, Batak₁₄, Bengali₁₅, Bhaiksuki₁₆, Brahmi₁₇, Buginese₁₈, Buhid₁₉, Canadian Aboriginal₂₀, Carian₂₁, Chakma₂₃, Cham₂₄, Cherokee₂₅, Coptic₂₆, Cuneiform₂₇, Deseret₂₉, Devanagari₃₀, Duployan₃₁, Egyptian Hieroglyphs₃₂, Elbasan₃₃, Georgian₃₅, Glagolitic₃₆, Gothic₃₇, Grantha₃₈, Gujarati₃₉, Gunjala Gondi₄₀, Gurmukhi₄₁, HK₄₂, Hanunoo₄₃, Hatran₄₄, Hebrew₄₅, Imperial Aramaic₄₆, Indic Siyaq Numbers₄₇, Inscriptional Pahlavi₄₈, Inscriptional Parthian₄₉, JP₅₀, Javanese₅₁, KR₅₂, Kaithi₅₃, Kannada₅₄, Kayah Li₅₅, Kharoshthi₅₆, Khmer₅₇, Khojki₅₈, Khudawadi₅₉, Lao₆₀, Lepcha₆₁, Limbu₆₂, Linear A₆₃, Linear B₆₄, Lisu₆₅, Lydian₆₇, Mahajani₆₈, Malayalam₆₉, Mandaic₇₀, Manichaean₇₁, Marchen₇₂, Masaram Gondi₇₃, Math₇₄, Mayan Numerals₇₅, Medefaidrin₇₆, Meetei Mayek₇₇, Meroitic₇₈, Miao₇₉, Modi₈₀, Mongolian₈₁, Mro₈₂, Multani₈₃, NKo₈₅, Nabataean₈₆, New Tai Lue₈₇, Newa₈₈, Nushu₈₉, Ogham₉₀, Ol Chiki₉₁, Old Hungarian₉₂, Old Italic₉₃, Old North Arabian₉₄, Old Permic₉₅, Old Persian₉₆, Old Sogdian₉₇, Old South Arabian₉₈, Old Turkic₉₉, Oriya₁₀₀, Osage₁₀₁, Osmanya₁₀₂, Pahawh Hmong₁₀₃, Palmyrene₁₀₄, Pau Cin Hau₁₀₅, Phoenician₁₀₇, Psalter Pahlavi₁₀₈, Rejang₁₀₉, Runic₁₁₀, SC₁₁₁, Saurashtra₁₁₂, Sharada₁₁₃, Shavian₁₁₄, Siddham₁₁₅, Sinhala₁₁₆, Sogdian₁₁₇, Sora Sompeng₁₁₈, Soyombo₁₁₉, Sundanese₁₂₀, Syloti Nagri₁₂₁, Syriac₁₂₂, TC₁₂₃, Tagalog₁₂₄, Tagbanwa₁₂₅, Tai Le₁₂₆, Tai Tham₁₂₇, Tai Viet₁₂₈, Takri₁₂₉, Tamil₁₃₀, Tamil Supplement₁₃₁, Telugu₁₃₂, Thaana₁₃₃, Thai₁₃₄, Tifinagh₁₃₅, Tirhuta₁₃₆, Ugaritic₁₃₇, Vai₁₃₈, Wancho₁₃₉, Warang Citi₁₄₀, Yi₁₄₁, Zanabazar Square₁₄₂.
+    'acaaaaaaaaaaaaaaaaaabaaaabaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,'
+    // #73: 133 fonts: Noto Sans₀, Noto Music₃, Symbols₄, Symbols 2₅, Adlam₆, Anatolian Hieroglyphs₇, Armenian₉, Avestan₁₀, Balinese₁₁, Bamum₁₂, Bassa Vah₁₃, Batak₁₄, Bengali₁₅, Bhaiksuki₁₆, Brahmi₁₇, Buginese₁₈, Buhid₁₉, Canadian Aboriginal₂₀, Carian₂₁, Chakma₂₃, Cham₂₄, Cherokee₂₅, Coptic₂₆, Cuneiform₂₇, Deseret₂₉, Devanagari₃₀, Duployan₃₁, Egyptian Hieroglyphs₃₂, Elbasan₃₃, Georgian₃₅, Glagolitic₃₆, Gothic₃₇, Grantha₃₈, Gujarati₃₉, Gunjala Gondi₄₀, Gurmukhi₄₁, HK₄₂, Hanunoo₄₃, Hatran₄₄, Hebrew₄₅, Imperial Aramaic₄₆, Indic Siyaq Numbers₄₇, Inscriptional Pahlavi₄₈, Inscriptional Parthian₄₉, JP₅₀, Javanese₅₁, KR₅₂, Kaithi₅₃, Kannada₅₄, Kayah Li₅₅, Kharoshthi₅₆, Khmer₅₇, Khojki₅₈, Khudawadi₅₉, Lao₆₀, Lepcha₆₁, Limbu₆₂, Linear A₆₃, Linear B₆₄, Lisu₆₅, Lydian₆₇, Mahajani₆₈, Malayalam₆₉, Mandaic₇₀, Manichaean₇₁, Marchen₇₂, Masaram Gondi₇₃, Math₇₄, Mayan Numerals₇₅, Medefaidrin₇₆, Meetei Mayek₇₇, Meroitic₇₈, Miao₇₉, Modi₈₀, Mongolian₈₁, Mro₈₂, Multani₈₃, NKo₈₅, Nabataean₈₆, New Tai Lue₈₇, Newa₈₈, Nushu₈₉, Ogham₉₀, Ol Chiki₉₁, Old Hungarian₉₂, Old Italic₉₃, Old North Arabian₉₄, Old Permic₉₅, Old Persian₉₆, Old Sogdian₉₇, Old South Arabian₉₈, Old Turkic₉₉, Oriya₁₀₀, Osage₁₀₁, Osmanya₁₀₂, Pahawh Hmong₁₀₃, Palmyrene₁₀₄, Pau Cin Hau₁₀₅, Phoenician₁₀₇, Psalter Pahlavi₁₀₈, Rejang₁₀₉, Runic₁₁₀, SC₁₁₁, Saurashtra₁₁₂, Shavian₁₁₄, Siddham₁₁₅, Sinhala₁₁₆, Sogdian₁₁₇, Sora Sompeng₁₁₈, Soyombo₁₁₉, Sundanese₁₂₀, Syloti Nagri₁₂₁, Syriac₁₂₂, TC₁₂₃, Tagalog₁₂₄, Tagbanwa₁₂₅, Tai Le₁₂₆, Tai Tham₁₂₇, Tai Viet₁₂₈, Takri₁₂₉, Tamil₁₃₀, Tamil Supplement₁₃₁, Telugu₁₃₂, Thaana₁₃₃, Thai₁₃₄, Tifinagh₁₃₅, Tirhuta₁₃₆, Ugaritic₁₃₇, Vai₁₃₈, Wancho₁₃₉, Warang Citi₁₄₀, Yi₁₄₁, Zanabazar Square₁₄₂.
+    'acaaaabaaaaaaaaaaaabaaaabaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaabaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaa,'
+    // #74: 3 fonts: Noto Sans₀, Devanagari₃₀, Grantha₃₈.
+    'a1dh,'
+    // #75: 3 fonts: Noto Sans₀, Devanagari₃₀, Sharada₁₁₃.
+    'a1d3e,'
+    // #76: 2 fonts: Noto Sans₀, Elbasan₃₃.
+    'a1g,'
+    // #77: 1 font: Noto Music₃.
+    'd,'
+    // #78: 1 font: Bhaiksuki₁₆.
+    'q,'
+    // #79: 1 font: Cham₂₄.
+    'y,'
+    // #80: 1 font: Cuneiform₂₇.
+    '1b,'
+    // #81: 3 fonts: HK₄₂, JP₅₀, KR₅₂.
+    '1qhb,'
+    // #82: 1 font: Khmer₅₇.
+    '2f,'
+    // #83: 1 font: Myanmar₈₄.
+    '3g,'
+    // #84: 1 font: New Tai Lue₈₇.
+    '3j,'
+    // #85: 135 fonts: Noto Sans₀, Noto Color Emoji₁, Noto Emoji₂, Noto Music₃, Symbols₄, Symbols 2₅, Adlam₆, Anatolian Hieroglyphs₇, Armenian₉, Avestan₁₀, Balinese₁₁, Bamum₁₂, Bassa Vah₁₃, Batak₁₄, Bengali₁₅, Bhaiksuki₁₆, Brahmi₁₇, Buginese₁₈, Buhid₁₉, Canadian Aboriginal₂₀, Carian₂₁, Chakma₂₃, Cham₂₄, Cherokee₂₅, Coptic₂₆, Cuneiform₂₇, Deseret₂₉, Devanagari₃₀, Duployan₃₁, Egyptian Hieroglyphs₃₂, Elbasan₃₃, Georgian₃₅, Glagolitic₃₆, Gothic₃₇, Grantha₃₈, Gujarati₃₉, Gunjala Gondi₄₀, Gurmukhi₄₁, HK₄₂, Hanunoo₄₃, Hatran₄₄, Hebrew₄₅, Imperial Aramaic₄₆, Indic Siyaq Numbers₄₇, Inscriptional Pahlavi₄₈, Inscriptional Parthian₄₉, JP₅₀, Javanese₅₁, KR₅₂, Kaithi₅₃, Kannada₅₄, Kayah Li₅₅, Kharoshthi₅₆, Khmer₅₇, Khojki₅₈, Khudawadi₅₉, Lao₆₀, Lepcha₆₁, Limbu₆₂, Linear A₆₃, Linear B₆₄, Lisu₆₅, Lydian₆₇, Mahajani₆₈, Malayalam₆₉, Mandaic₇₀, Manichaean₇₁, Marchen₇₂, Masaram Gondi₇₃, Mayan Numerals₇₅, Medefaidrin₇₆, Meetei Mayek₇₇, Meroitic₇₈, Miao₇₉, Modi₈₀, Mongolian₈₁, Mro₈₂, Multani₈₃, NKo₈₅, Nabataean₈₆, New Tai Lue₈₇, Newa₈₈, Nushu₈₉, Ogham₉₀, Ol Chiki₉₁, Old Hungarian₉₂, Old Italic₉₃, Old North Arabian₉₄, Old Permic₉₅, Old Persian₉₆, Old Sogdian₉₇, Old South Arabian₉₈, Old Turkic₉₉, Oriya₁₀₀, Osage₁₀₁, Osmanya₁₀₂, Pahawh Hmong₁₀₃, Palmyrene₁₀₄, Pau Cin Hau₁₀₅, Phoenician₁₀₇, Psalter Pahlavi₁₀₈, Rejang₁₀₉, Runic₁₁₀, SC₁₁₁, Saurashtra₁₁₂, Sharada₁₁₃, Shavian₁₁₄, Siddham₁₁₅, Sinhala₁₁₆, Sogdian₁₁₇, Sora Sompeng₁₁₈, Soyombo₁₁₉, Sundanese₁₂₀, Syloti Nagri₁₂₁, Syriac₁₂₂, TC₁₂₃, Tagalog₁₂₄, Tagbanwa₁₂₅, Tai Le₁₂₆, Tai Tham₁₂₇, Tai Viet₁₂₈, Takri₁₂₉, Tamil₁₃₀, Tamil Supplement₁₃₁, Telugu₁₃₂, Thaana₁₃₃, Thai₁₃₄, Tifinagh₁₃₅, Tirhuta₁₃₆, Ugaritic₁₃₇, Vai₁₃₈, Wancho₁₃₉, Warang Citi₁₄₀, Yi₁₄₁, Zanabazar Square₁₄₂.
+    'aaaaaaaabaaaaaaaaaaaabaaaabaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaabaaaaaaaabaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,'
+    // #86: 7 fonts: Noto Sans₀, Adlam₆, HK₄₂, JP₅₀, KR₅₂, SC₁₁₁, TC₁₂₃.
+    'af1jhb2gl,'
+    // #87: 2 fonts: Noto Sans₀, Glagolitic₃₆.
+    'a1j,'
+    // #88: 2 fonts: Noto Sans₀, Syriac₁₂₂.
+    'a4r,'
+    // #89: 1 font: Adlam₆.
+    'g,'
+    // #90: 4 fonts: Arabic₈, NKo₈₅, Syriac₁₂₂, Thaana₁₃₃.
+    'i2y1kk,'
+    // #91: 2 fonts: Arabic₈, Syriac₁₂₂.
+    'i4j,'
+    // #92: 1 font: Brahmi₁₇.
+    'r,'
+    // #93: 1 font: Canadian Aboriginal₂₀.
+    'u,'
+    // #94: 1 font: Cherokee₂₅.
+    'z,'
+    // #95: 1 font: Coptic₂₆.
+    '1a,'
+    // #96: 6 fonts: HK₄₂, JP₅₀, KR₅₂, New Tai Lue₈₇, SC₁₁₁, TC₁₂₃.
+    '1qhb1ixl,'
+    // #97: 6 fonts: HK₄₂, JP₅₀, KR₅₂, SC₁₁₁, TC₁₂₃, Yi₁₄₁.
+    '1qhb2glr,'
+    // #98: 1 font: Hatran₄₄.
+    '1s,'
+    // #99: 1 font: Javanese₅₁.
+    '1z,'
+    // #100: 1 font: Lepcha₆₁.
+    '2j,'
+    // #101: 1 font: Linear A₆₃.
+    '2l,'
+    // #102: 1 font: Marchen₇₂.
+    '2u,'
+    // #103: 1 font: Meetei Mayek₇₇.
+    '2z,'
+    // #104: 1 font: Meroitic₇₈.
+    '3a,'
+    // #105: 1 font: Miao₇₉.
+    '3b,'
+    // #106: 1 font: Mro₈₂.
+    '3e,'
+    // #107: 1 font: Old Hungarian₉₂.
+    '3o,'
+    // #108: 1 font: Psalter Pahlavi₁₀₈.
+    '4e,'
+    // #109: 1 font: Syriac₁₂₂.
+    '4s,'
+    // #110: 1 font: Tagbanwa₁₂₅.
+    '4v,'
+    // #111: 1 font: Tifinagh₁₃₅.
+    '5f,'
+    // #112: 136 fonts: Noto Sans₀, Noto Color Emoji₁, Noto Emoji₂, Noto Music₃, Symbols₄, Symbols 2₅, Adlam₆, Anatolian Hieroglyphs₇, Armenian₉, Avestan₁₀, Balinese₁₁, Bamum₁₂, Bassa Vah₁₃, Batak₁₄, Bengali₁₅, Bhaiksuki₁₆, Brahmi₁₇, Buginese₁₈, Buhid₁₉, Canadian Aboriginal₂₀, Carian₂₁, Chakma₂₃, Cham₂₄, Cherokee₂₅, Coptic₂₆, Cuneiform₂₇, Deseret₂₉, Devanagari₃₀, Duployan₃₁, Egyptian Hieroglyphs₃₂, Elbasan₃₃, Georgian₃₅, Glagolitic₃₆, Gothic₃₇, Grantha₃₈, Gujarati₃₉, Gunjala Gondi₄₀, Gurmukhi₄₁, HK₄₂, Hanunoo₄₃, Hatran₄₄, Hebrew₄₅, Imperial Aramaic₄₆, Indic Siyaq Numbers₄₇, Inscriptional Pahlavi₄₈, Inscriptional Parthian₄₉, JP₅₀, Javanese₅₁, KR₅₂, Kaithi₅₃, Kannada₅₄, Kayah Li₅₅, Kharoshthi₅₆, Khmer₅₇, Khojki₅₈, Khudawadi₅₉, Lao₆₀, Lepcha₆₁, Limbu₆₂, Linear A₆₃, Linear B₆₄, Lisu₆₅, Lydian₆₇, Mahajani₆₈, Malayalam₆₉, Mandaic₇₀, Manichaean₇₁, Marchen₇₂, Masaram Gondi₇₃, Math₇₄, Mayan Numerals₇₅, Medefaidrin₇₆, Meetei Mayek₇₇, Meroitic₇₈, Miao₇₉, Modi₈₀, Mongolian₈₁, Mro₈₂, Multani₈₃, NKo₈₅, Nabataean₈₆, New Tai Lue₈₇, Newa₈₈, Nushu₈₉, Ogham₉₀, Ol Chiki₉₁, Old Hungarian₉₂, Old Italic₉₃, Old North Arabian₉₄, Old Permic₉₅, Old Persian₉₆, Old Sogdian₉₇, Old South Arabian₉₈, Old Turkic₉₉, Oriya₁₀₀, Osage₁₀₁, Osmanya₁₀₂, Pahawh Hmong₁₀₃, Palmyrene₁₀₄, Pau Cin Hau₁₀₅, Phoenician₁₀₇, Psalter Pahlavi₁₀₈, Rejang₁₀₉, Runic₁₁₀, SC₁₁₁, Saurashtra₁₁₂, Sharada₁₁₃, Shavian₁₁₄, Siddham₁₁₅, Sinhala₁₁₆, Sogdian₁₁₇, Sora Sompeng₁₁₈, Soyombo₁₁₉, Sundanese₁₂₀, Syloti Nagri₁₂₁, Syriac₁₂₂, TC₁₂₃, Tagalog₁₂₄, Tagbanwa₁₂₅, Tai Le₁₂₆, Tai Tham₁₂₇, Tai Viet₁₂₈, Takri₁₂₉, Tamil₁₃₀, Tamil Supplement₁₃₁, Telugu₁₃₂, Thaana₁₃₃, Thai₁₃₄, Tifinagh₁₃₅, Tirhuta₁₃₆, Ugaritic₁₃₇, Vai₁₃₈, Wancho₁₃₉, Warang Citi₁₄₀, Yi₁₄₁, Zanabazar Square₁₄₂.
+    'aaaaaaaabaaaaaaaaaaaabaaaabaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,'
+    // #113: 134 fonts: Noto Sans₀, Noto Music₃, Symbols₄, Symbols 2₅, Adlam₆, Anatolian Hieroglyphs₇, Arabic₈, Armenian₉, Avestan₁₀, Balinese₁₁, Bamum₁₂, Bassa Vah₁₃, Batak₁₄, Bengali₁₅, Bhaiksuki₁₆, Brahmi₁₇, Buginese₁₈, Buhid₁₉, Canadian Aboriginal₂₀, Carian₂₁, Chakma₂₃, Cham₂₄, Cherokee₂₅, Coptic₂₆, Cuneiform₂₇, Deseret₂₉, Devanagari₃₀, Duployan₃₁, Egyptian Hieroglyphs₃₂, Elbasan₃₃, Georgian₃₅, Glagolitic₃₆, Gothic₃₇, Grantha₃₈, Gujarati₃₉, Gunjala Gondi₄₀, Gurmukhi₄₁, HK₄₂, Hanunoo₄₃, Hatran₄₄, Hebrew₄₅, Imperial Aramaic₄₆, Indic Siyaq Numbers₄₇, Inscriptional Pahlavi₄₈, Inscriptional Parthian₄₉, JP₅₀, Javanese₅₁, KR₅₂, Kaithi₅₃, Kannada₅₄, Kayah Li₅₅, Kharoshthi₅₆, Khmer₅₇, Khojki₅₈, Khudawadi₅₉, Lao₆₀, Lepcha₆₁, Limbu₆₂, Linear A₆₃, Linear B₆₄, Lisu₆₅, Lydian₆₇, Mahajani₆₈, Malayalam₆₉, Mandaic₇₀, Manichaean₇₁, Marchen₇₂, Masaram Gondi₇₃, Mayan Numerals₇₅, Medefaidrin₇₆, Meetei Mayek₇₇, Meroitic₇₈, Miao₇₉, Modi₈₀, Mongolian₈₁, Mro₈₂, Multani₈₃, NKo₈₅, Nabataean₈₆, New Tai Lue₈₇, Newa₈₈, Nushu₈₉, Ogham₉₀, Ol Chiki₉₁, Old Hungarian₉₂, Old Italic₉₃, Old North Arabian₉₄, Old Permic₉₅, Old Persian₉₆, Old Sogdian₉₇, Old South Arabian₉₈, Old Turkic₉₉, Oriya₁₀₀, Osage₁₀₁, Osmanya₁₀₂, Pahawh Hmong₁₀₃, Palmyrene₁₀₄, Pau Cin Hau₁₀₅, Phoenician₁₀₇, Psalter Pahlavi₁₀₈, Rejang₁₀₉, Runic₁₁₀, SC₁₁₁, Saurashtra₁₁₂, Sharada₁₁₃, Shavian₁₁₄, Siddham₁₁₅, Sinhala₁₁₆, Sogdian₁₁₇, Sora Sompeng₁₁₈, Soyombo₁₁₉, Sundanese₁₂₀, Syloti Nagri₁₂₁, Syriac₁₂₂, TC₁₂₃, Tagalog₁₂₄, Tagbanwa₁₂₅, Tai Le₁₂₆, Tai Tham₁₂₇, Tai Viet₁₂₈, Takri₁₂₉, Tamil₁₃₀, Tamil Supplement₁₃₁, Telugu₁₃₂, Thaana₁₃₃, Thai₁₃₄, Tifinagh₁₃₅, Tirhuta₁₃₆, Ugaritic₁₃₇, Vai₁₃₈, Wancho₁₃₉, Warang Citi₁₄₀, Yi₁₄₁, Zanabazar Square₁₄₂.
+    'acaaaaaaaaaaaaaaaaaabaaaabaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaabaaaaaaaabaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,'
+    // #114: 134 fonts: Noto Sans₀, Noto Music₃, Symbols₄, Symbols 2₅, Adlam₆, Anatolian Hieroglyphs₇, Armenian₉, Avestan₁₀, Balinese₁₁, Bamum₁₂, Bassa Vah₁₃, Batak₁₄, Bengali₁₅, Bhaiksuki₁₆, Brahmi₁₇, Buginese₁₈, Buhid₁₉, Canadian Aboriginal₂₀, Carian₂₁, Chakma₂₃, Cham₂₄, Cherokee₂₅, Coptic₂₆, Cuneiform₂₇, Deseret₂₉, Devanagari₃₀, Duployan₃₁, Egyptian Hieroglyphs₃₂, Elbasan₃₃, Georgian₃₅, Glagolitic₃₆, Gothic₃₇, Grantha₃₈, Gujarati₃₉, Gunjala Gondi₄₀, Gurmukhi₄₁, HK₄₂, Hanunoo₄₃, Hatran₄₄, Hebrew₄₅, Imperial Aramaic₄₆, Indic Siyaq Numbers₄₇, Inscriptional Pahlavi₄₈, Inscriptional Parthian₄₉, JP₅₀, Javanese₅₁, KR₅₂, Kaithi₅₃, Kannada₅₄, Kayah Li₅₅, Kharoshthi₅₆, Khmer₅₇, Khojki₅₈, Khudawadi₅₉, Lao₆₀, Lepcha₆₁, Limbu₆₂, Linear A₆₃, Linear B₆₄, Lisu₆₅, Lydian₆₇, Mahajani₆₈, Malayalam₆₉, Mandaic₇₀, Manichaean₇₁, Marchen₇₂, Masaram Gondi₇₃, Mayan Numerals₇₅, Medefaidrin₇₆, Meetei Mayek₇₇, Meroitic₇₈, Miao₇₉, Modi₈₀, Mongolian₈₁, Mro₈₂, Multani₈₃, Myanmar₈₄, NKo₈₅, Nabataean₈₆, New Tai Lue₈₇, Newa₈₈, Nushu₈₉, Ogham₉₀, Ol Chiki₉₁, Old Hungarian₉₂, Old Italic₉₃, Old North Arabian₉₄, Old Permic₉₅, Old Persian₉₆, Old Sogdian₉₇, Old South Arabian₉₈, Old Turkic₉₉, Oriya₁₀₀, Osage₁₀₁, Osmanya₁₀₂, Pahawh Hmong₁₀₃, Palmyrene₁₀₄, Pau Cin Hau₁₀₅, Phoenician₁₀₇, Psalter Pahlavi₁₀₈, Rejang₁₀₉, Runic₁₁₀, SC₁₁₁, Saurashtra₁₁₂, Sharada₁₁₃, Shavian₁₁₄, Siddham₁₁₅, Sinhala₁₁₆, Sogdian₁₁₇, Sora Sompeng₁₁₈, Soyombo₁₁₉, Sundanese₁₂₀, Syloti Nagri₁₂₁, Syriac₁₂₂, TC₁₂₃, Tagalog₁₂₄, Tagbanwa₁₂₅, Tai Le₁₂₆, Tai Tham₁₂₇, Tai Viet₁₂₈, Takri₁₂₉, Tamil₁₃₀, Tamil Supplement₁₃₁, Telugu₁₃₂, Thaana₁₃₃, Thai₁₃₄, Tifinagh₁₃₅, Tirhuta₁₃₆, Ugaritic₁₃₇, Vai₁₃₈, Wancho₁₃₉, Warang Citi₁₄₀, Yi₁₄₁, Zanabazar Square₁₄₂.
+    'acaaaabaaaaaaaaaaaabaaaabaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,'
+    // #115: 129 fonts: Noto Sans₀, Noto Music₃, Symbols₄, Symbols 2₅, Adlam₆, Anatolian Hieroglyphs₇, Armenian₉, Avestan₁₀, Balinese₁₁, Bamum₁₂, Bassa Vah₁₃, Batak₁₄, Bengali₁₅, Bhaiksuki₁₆, Brahmi₁₇, Buginese₁₈, Buhid₁₉, Canadian Aboriginal₂₀, Carian₂₁, Chakma₂₃, Cham₂₄, Cherokee₂₅, Coptic₂₆, Cuneiform₂₇, Deseret₂₉, Devanagari₃₀, Duployan₃₁, Egyptian Hieroglyphs₃₂, Elbasan₃₃, Georgian₃₅, Glagolitic₃₆, Gothic₃₇, Grantha₃₈, Gujarati₃₉, Gunjala Gondi₄₀, Gurmukhi₄₁, Hanunoo₄₃, Hatran₄₄, Hebrew₄₅, Imperial Aramaic₄₆, Indic Siyaq Numbers₄₇, Inscriptional Pahlavi₄₈, Inscriptional Parthian₄₉, Javanese₅₁, Kaithi₅₃, Kannada₅₄, Kayah Li₅₅, Kharoshthi₅₆, Khmer₅₇, Khojki₅₈, Khudawadi₅₉, Lao₆₀, Lepcha₆₁, Limbu₆₂, Linear A₆₃, Linear B₆₄, Lisu₆₅, Lydian₆₇, Mahajani₆₈, Malayalam₆₉, Mandaic₇₀, Manichaean₇₁, Marchen₇₂, Masaram Gondi₇₃, Math₇₄, Mayan Numerals₇₅, Medefaidrin₇₆, Meetei Mayek₇₇, Meroitic₇₈, Miao₇₉, Modi₈₀, Mongolian₈₁, Mro₈₂, Multani₈₃, NKo₈₅, Nabataean₈₆, New Tai Lue₈₇, Newa₈₈, Nushu₈₉, Ogham₉₀, Ol Chiki₉₁, Old Hungarian₉₂, Old Italic₉₃, Old North Arabian₉₄, Old Permic₉₅, Old Persian₉₆, Old Sogdian₉₇, Old South Arabian₉₈, Old Turkic₉₉, Oriya₁₀₀, Osage₁₀₁, Osmanya₁₀₂, Pahawh Hmong₁₀₃, Palmyrene₁₀₄, Pau Cin Hau₁₀₅, Phoenician₁₀₇, Psalter Pahlavi₁₀₈, Rejang₁₀₉, Runic₁₁₀, Saurashtra₁₁₂, Sharada₁₁₃, Shavian₁₁₄, Siddham₁₁₅, Sinhala₁₁₆, Sogdian₁₁₇, Sora Sompeng₁₁₈, Soyombo₁₁₉, Sundanese₁₂₀, Syloti Nagri₁₂₁, Syriac₁₂₂, Tagalog₁₂₄, Tagbanwa₁₂₅, Tai Le₁₂₆, Tai Tham₁₂₇, Tai Viet₁₂₈, Takri₁₂₉, Tamil₁₃₀, Tamil Supplement₁₃₁, Telugu₁₃₂, Thaana₁₃₃, Thai₁₃₄, Tifinagh₁₃₅, Tirhuta₁₃₆, Ugaritic₁₃₇, Vai₁₃₈, Wancho₁₃₉, Warang Citi₁₄₀, Yi₁₄₁, Zanabazar Square₁₄₂.
+    'acaaaabaaaaaaaaaaaabaaaabaaaabaaaaaabaaaaaabbaaaaaaaaaaaabaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaabaaabaaaaaaaaaabaaaaaaaaaaaaaaaaaa,'
+    // #116: 2 fonts: Noto Sans₀, Adlam₆.
+    'af,'
+    // #117: 3 fonts: Noto Sans₀, Adlam₆, Arabic₈.
+    'afb,'
+    // #118: 5 fonts: Noto Sans₀, Bengali₁₅, Devanagari₃₀, Grantha₃₈, Kannada₅₄.
+    'aoohp,'
+    // #119: 2 fonts: Noto Sans₀, Caucasian Albanian₂₂.
+    'av,'
+    // #120: 8 fonts: Noto Sans₀, Elbasan₃₃, HK₄₂, JP₅₀, KR₅₂, Math₇₄, SC₁₁₁, TC₁₂₃.
+    'a1gihbv1kl,'
+    // #121: 7 fonts: Noto Sans₀, HK₄₂, JP₅₀, KR₅₂, SC₁₁₁, TC₁₂₃, Tamil₁₃₀.
+    'a1phb2glg,'
+    // #122: 2 fonts: Noto Sans₀, Tifinagh₁₃₅.
+    'a5e,'
+    // #123: 2 fonts: Symbols₄, Symbols 2₅.
+    'ea,'
+    // #124: 7 fonts: Symbols₄, HK₄₂, JP₅₀, KR₅₂, Math₇₄, SC₁₁₁, TC₁₂₃.
+    'e1lhbv1kl,'
+    // #125: 2 fonts: Arabic₈, Indic Siyaq Numbers₄₇.
+    'i1m,'
+    // #126: 2 fonts: Arabic₈, Thaana₁₃₃.
+    'i4u,'
+    // #127: 1 font: Avestan₁₀.
+    'k,'
+    // #128: 1 font: Balinese₁₁.
+    'l,'
+    // #129: 1 font: Bamum₁₂.
+    'm,'
+    // #130: 1 font: Bassa Vah₁₃.
+    'n,'
+    // #131: 1 font: Batak₁₄.
+    'o,'
+    // #132: 1 font: Buginese₁₈.
+    's,'
+    // #133: 1 font: Caucasian Albanian₂₂.
+    'w,'
+    // #134: 1 font: Chakma₂₃.
+    'x,'
+    // #135: 6 fonts: HK₄₂, JP₅₀, KR₅₂, Mongolian₈₁, SC₁₁₁, TC₁₂₃.
+    '1qhb1c1dl,'
+    // #136: 7 fonts: HK₄₂, JP₅₀, KR₅₂, Phags Pa₁₀₆, SC₁₁₁, TC₁₂₃, Yi₁₄₁.
+    '1qhb2belr,'
+    // #137: 1 font: Imperial Aramaic₄₆.
+    '1u,'
+    // #138: 1 font: Inscriptional Pahlavi₄₈.
+    '1w,'
+    // #139: 1 font: Inscriptional Parthian₄₉.
+    '1x,'
+    // #140: 4 fonts: JP₅₀, KR₅₂, SC₁₁₁, TC₁₂₃.
+    '1yb2gl,'
+    // #141: 1 font: Kaithi₅₃.
+    '2b,'
+    // #142: 1 font: Kayah Li₅₅.
+    '2d,'
+    // #143: 1 font: Khojki₅₈.
+    '2g,'
+    // #144: 1 font: Khudawadi₅₉.
+    '2h,'
+    // #145: 2 fonts: Linear A₆₃, Linear B₆₄.
+    '2la,'
+    // #146: 1 font: Lisu₆₅.
+    '2n,'
+    // #147: 1 font: Lydian₆₇.
+    '2p,'
+    // #148: 1 font: Mandaic₇₀.
+    '2s,'
+    // #149: 1 font: Manichaean₇₁.
+    '2t,'
+    // #150: 1 font: Modi₈₀.
+    '3c,'
+    // #151: 2 fonts: Mongolian₈₁, Phags Pa₁₀₆.
+    '3dy,'
+    // #152: 1 font: NKo₈₅.
+    '3h,'
+    // #153: 1 font: Nabataean₈₆.
+    '3i,'
+    // #154: 1 font: Newa₈₈.
+    '3k,'
+    // #155: 1 font: Nushu₈₉.
+    '3l,'
+    // #156: 1 font: Old Italic₉₃.
+    '3p,'
+    // #157: 1 font: Old Persian₉₆.
+    '3s,'
+    // #158: 1 font: Osage₁₀₁.
+    '3x,'
+    // #159: 1 font: Osmanya₁₀₂.
+    '3y,'
+    // #160: 1 font: Phoenician₁₀₇.
+    '4d,'
+    // #161: 1 font: Rejang₁₀₉.
+    '4f,'
+    // #162: 2 fonts: SC₁₁₁, TC₁₂₃.
+    '4hl,'
+    // #163: 1 font: Saurashtra₁₁₂.
+    '4i,'
+    // #164: 1 font: Siddham₁₁₅.
+    '4l,'
+    // #165: 1 font: Sora Sompeng₁₁₈.
+    '4o,'
+    // #166: 1 font: Sundanese₁₂₀.
+    '4q,'
+    // #167: 1 font: Tagalog₁₂₄.
+    '4u,'
+    // #168: 1 font: Tai Le₁₂₆.
+    '4w,'
+    // #169: 1 font: Tai Viet₁₂₈.
+    '4y,'
+    // #170: 1 font: Takri₁₂₉.
+    '4z,'
+    // #171: 1 font: Tamil Supplement₁₃₁.
+    '5b,'
+    // #172: 1 font: Thai₁₃₄.
+    '5e,'
+    // #173: 1 font: Tirhuta₁₃₆.
+    '5g,'
+    // #174: 1 font: Ugaritic₁₃₇.
+    '5h,'
+    // #175: 1 font: Wancho₁₃₉.
+    '5j,'
+    // #176: 1 font: Warang Citi₁₄₀.
+    '5k,'
+    // #177: 1 font: Yi₁₄₁.
+    '5l,'
+    // #178: 3 fonts: Noto Sans₀, Noto Color Emoji₁, Noto Emoji₂.
+    'aaa,'
+    // #179: 143 fonts: Noto Sans₀, Noto Color Emoji₁, Noto Emoji₂, Noto Music₃, Symbols₄, Symbols 2₅, Adlam₆, Anatolian Hieroglyphs₇, Arabic₈, Armenian₉, Avestan₁₀, Balinese₁₁, Bamum₁₂, Bassa Vah₁₃, Batak₁₄, Bengali₁₅, Bhaiksuki₁₆, Brahmi₁₇, Buginese₁₈, Buhid₁₉, Canadian Aboriginal₂₀, Carian₂₁, Caucasian Albanian₂₂, Chakma₂₃, Cham₂₄, Cherokee₂₅, Coptic₂₆, Cuneiform₂₇, Cypriot₂₈, Deseret₂₉, Devanagari₃₀, Duployan₃₁, Egyptian Hieroglyphs₃₂, Elbasan₃₃, Elymaic₃₄, Georgian₃₅, Glagolitic₃₆, Gothic₃₇, Grantha₃₈, Gujarati₃₉, Gunjala Gondi₄₀, Gurmukhi₄₁, HK₄₂, Hanunoo₄₃, Hatran₄₄, Hebrew₄₅, Imperial Aramaic₄₆, Indic Siyaq Numbers₄₇, Inscriptional Pahlavi₄₈, Inscriptional Parthian₄₉, JP₅₀, Javanese₅₁, KR₅₂, Kaithi₅₃, Kannada₅₄, Kayah Li₅₅, Kharoshthi₅₆, Khmer₅₇, Khojki₅₈, Khudawadi₅₉, Lao₆₀, Lepcha₆₁, Limbu₆₂, Linear A₆₃, Linear B₆₄, Lisu₆₅, Lycian₆₆, Lydian₆₇, Mahajani₆₈, Malayalam₆₉, Mandaic₇₀, Manichaean₇₁, Marchen₇₂, Masaram Gondi₇₃, Math₇₄, Mayan Numerals₇₅, Medefaidrin₇₆, Meetei Mayek₇₇, Meroitic₇₈, Miao₇₉, Modi₈₀, Mongolian₈₁, Mro₈₂, Multani₈₃, Myanmar₈₄, NKo₈₅, Nabataean₈₆, New Tai Lue₈₇, Newa₈₈, Nushu₈₉, Ogham₉₀, Ol Chiki₉₁, Old Hungarian₉₂, Old Italic₉₃, Old North Arabian₉₄, Old Permic₉₅, Old Persian₉₆, Old Sogdian₉₇, Old South Arabian₉₈, Old Turkic₉₉, Oriya₁₀₀, Osage₁₀₁, Osmanya₁₀₂, Pahawh Hmong₁₀₃, Palmyrene₁₀₄, Pau Cin Hau₁₀₅, Phags Pa₁₀₆, Phoenician₁₀₇, Psalter Pahlavi₁₀₈, Rejang₁₀₉, Runic₁₁₀, SC₁₁₁, Saurashtra₁₁₂, Sharada₁₁₃, Shavian₁₁₄, Siddham₁₁₅, Sinhala₁₁₆, Sogdian₁₁₇, Sora Sompeng₁₁₈, Soyombo₁₁₉, Sundanese₁₂₀, Syloti Nagri₁₂₁, Syriac₁₂₂, TC₁₂₃, Tagalog₁₂₄, Tagbanwa₁₂₅, Tai Le₁₂₆, Tai Tham₁₂₇, Tai Viet₁₂₈, Takri₁₂₉, Tamil₁₃₀, Tamil Supplement₁₃₁, Telugu₁₃₂, Thaana₁₃₃, Thai₁₃₄, Tifinagh₁₃₅, Tirhuta₁₃₆, Ugaritic₁₃₇, Vai₁₃₈, Wancho₁₃₉, Warang Citi₁₄₀, Yi₁₄₁, Zanabazar Square₁₄₂.
+    'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,'
+    // #180: 137 fonts: Noto Sans₀, Noto Color Emoji₁, Noto Emoji₂, Noto Music₃, Symbols₄, Symbols 2₅, Adlam₆, Anatolian Hieroglyphs₇, Arabic₈, Armenian₉, Avestan₁₀, Balinese₁₁, Bamum₁₂, Bassa Vah₁₃, Batak₁₄, Bengali₁₅, Bhaiksuki₁₆, Brahmi₁₇, Buginese₁₈, Buhid₁₉, Canadian Aboriginal₂₀, Carian₂₁, Chakma₂₃, Cham₂₄, Cherokee₂₅, Coptic₂₆, Cuneiform₂₇, Deseret₂₉, Devanagari₃₀, Duployan₃₁, Egyptian Hieroglyphs₃₂, Elbasan₃₃, Georgian₃₅, Glagolitic₃₆, Gothic₃₇, Grantha₃₈, Gujarati₃₉, Gunjala Gondi₄₀, Gurmukhi₄₁, HK₄₂, Hanunoo₄₃, Hatran₄₄, Hebrew₄₅, Imperial Aramaic₄₆, Indic Siyaq Numbers₄₇, Inscriptional Pahlavi₄₈, Inscriptional Parthian₄₉, JP₅₀, Javanese₅₁, KR₅₂, Kaithi₅₃, Kannada₅₄, Kayah Li₅₅, Kharoshthi₅₆, Khmer₅₇, Khojki₅₈, Khudawadi₅₉, Lao₆₀, Lepcha₆₁, Limbu₆₂, Linear A₆₃, Linear B₆₄, Lisu₆₅, Lydian₆₇, Mahajani₆₈, Malayalam₆₉, Mandaic₇₀, Manichaean₇₁, Marchen₇₂, Masaram Gondi₇₃, Math₇₄, Mayan Numerals₇₅, Medefaidrin₇₆, Meetei Mayek₇₇, Meroitic₇₈, Miao₇₉, Modi₈₀, Mongolian₈₁, Mro₈₂, Multani₈₃, NKo₈₅, Nabataean₈₆, New Tai Lue₈₇, Newa₈₈, Nushu₈₉, Ogham₉₀, Ol Chiki₉₁, Old Hungarian₉₂, Old Italic₉₃, Old North Arabian₉₄, Old Permic₉₅, Old Persian₉₆, Old Sogdian₉₇, Old South Arabian₉₈, Old Turkic₉₉, Oriya₁₀₀, Osage₁₀₁, Osmanya₁₀₂, Pahawh Hmong₁₀₃, Palmyrene₁₀₄, Pau Cin Hau₁₀₅, Phoenician₁₀₇, Psalter Pahlavi₁₀₈, Rejang₁₀₉, Runic₁₁₀, SC₁₁₁, Saurashtra₁₁₂, Sharada₁₁₃, Shavian₁₁₄, Siddham₁₁₅, Sinhala₁₁₆, Sogdian₁₁₇, Sora Sompeng₁₁₈, Soyombo₁₁₉, Sundanese₁₂₀, Syloti Nagri₁₂₁, Syriac₁₂₂, TC₁₂₃, Tagalog₁₂₄, Tagbanwa₁₂₅, Tai Le₁₂₆, Tai Tham₁₂₇, Tai Viet₁₂₈, Takri₁₂₉, Tamil₁₃₀, Tamil Supplement₁₃₁, Telugu₁₃₂, Thaana₁₃₃, Thai₁₃₄, Tifinagh₁₃₅, Tirhuta₁₃₆, Ugaritic₁₃₇, Vai₁₃₈, Wancho₁₃₉, Warang Citi₁₄₀, Yi₁₄₁, Zanabazar Square₁₄₂.
+    'aaaaaaaaaaaaaaaaaaaaaabaaaabaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,'
+    // #181: 70 fonts: Noto Sans₀, Noto Color Emoji₁, Noto Emoji₂, Arabic₈, Avestan₁₀, Balinese₁₁, Batak₁₄, Bengali₁₅, Brahmi₁₇, Buginese₁₈, Buhid₁₉, Chakma₂₃, Cham₂₄, Devanagari₃₀, Egyptian Hieroglyphs₃₂, Grantha₃₈, Gujarati₃₉, Gunjala Gondi₄₀, Gurmukhi₄₁, Hanunoo₄₃, Hebrew₄₅, Javanese₅₁, Kaithi₅₃, Kannada₅₄, Kayah Li₅₅, Kharoshthi₅₆, Khmer₅₇, Khojki₅₈, Khudawadi₅₉, Lao₆₀, Lepcha₆₁, Limbu₆₂, Mahajani₆₈, Malayalam₆₉, Mandaic₇₀, Manichaean₇₁, Meetei Mayek₇₇, Modi₈₀, Mongolian₈₁, Myanmar₈₄, NKo₈₅, New Tai Lue₈₇, Newa₈₈, Old Hungarian₉₂, Old Turkic₉₉, Oriya₁₀₀, Pahawh Hmong₁₀₃, Phags Pa₁₀₆, Psalter Pahlavi₁₀₈, Rejang₁₀₉, Saurashtra₁₁₂, Sharada₁₁₃, Siddham₁₁₅, Sinhala₁₁₆, Sundanese₁₂₀, Syloti Nagri₁₂₁, Syriac₁₂₂, Tagalog₁₂₄, Tagbanwa₁₂₅, Tai Le₁₂₆, Tai Tham₁₂₇, Tai Viet₁₂₈, Takri₁₂₉, Tamil₁₃₀, Telugu₁₃₂, Thaana₁₃₃, Thai₁₃₄, Tifinagh₁₃₅, Tirhuta₁₃₆, Warang Citi₁₄₀.
+    'aaafbacabaadafbfaaabbfbaaaaaaaaafaaafcacabadgaccbacabadaabaaaaaabaaaad,'
+    // #182: 9 fonts: Noto Sans₀, Noto Color Emoji₁, Noto Emoji₂, HK₄₂, JP₅₀, KR₅₂, Mongolian₈₁, SC₁₁₁, TC₁₂₃.
+    'aaa1nhb1c1dl,'
+    // #183: 8 fonts: Noto Sans₀, Noto Color Emoji₁, Noto Emoji₂, HK₄₂, JP₅₀, KR₅₂, SC₁₁₁, TC₁₂₃.
+    'aaa1nhb2gl,'
+    // #184: 141 fonts: Noto Sans₀, Noto Music₃, Symbols₄, Symbols 2₅, Adlam₆, Anatolian Hieroglyphs₇, Arabic₈, Armenian₉, Avestan₁₀, Balinese₁₁, Bamum₁₂, Bassa Vah₁₃, Batak₁₄, Bengali₁₅, Bhaiksuki₁₆, Brahmi₁₇, Buginese₁₈, Buhid₁₉, Canadian Aboriginal₂₀, Carian₂₁, Caucasian Albanian₂₂, Chakma₂₃, Cham₂₄, Cherokee₂₅, Coptic₂₆, Cuneiform₂₇, Cypriot₂₈, Deseret₂₉, Devanagari₃₀, Duployan₃₁, Egyptian Hieroglyphs₃₂, Elbasan₃₃, Elymaic₃₄, Georgian₃₅, Glagolitic₃₆, Gothic₃₇, Grantha₃₈, Gujarati₃₉, Gunjala Gondi₄₀, Gurmukhi₄₁, HK₄₂, Hanunoo₄₃, Hatran₄₄, Hebrew₄₅, Imperial Aramaic₄₆, Indic Siyaq Numbers₄₇, Inscriptional Pahlavi₄₈, Inscriptional Parthian₄₉, JP₅₀, Javanese₅₁, KR₅₂, Kaithi₅₃, Kannada₅₄, Kayah Li₅₅, Kharoshthi₅₆, Khmer₅₇, Khojki₅₈, Khudawadi₅₉, Lao₆₀, Lepcha₆₁, Limbu₆₂, Linear A₆₃, Linear B₆₄, Lisu₆₅, Lycian₆₆, Lydian₆₇, Mahajani₆₈, Malayalam₆₉, Mandaic₇₀, Manichaean₇₁, Marchen₇₂, Masaram Gondi₇₃, Math₇₄, Mayan Numerals₇₅, Medefaidrin₇₆, Meetei Mayek₇₇, Meroitic₇₈, Miao₇₉, Modi₈₀, Mongolian₈₁, Mro₈₂, Multani₈₃, Myanmar₈₄, NKo₈₅, Nabataean₈₆, New Tai Lue₈₇, Newa₈₈, Nushu₈₉, Ogham₉₀, Ol Chiki₉₁, Old Hungarian₉₂, Old Italic₉₃, Old North Arabian₉₄, Old Permic₉₅, Old Persian₉₆, Old Sogdian₉₇, Old South Arabian₉₈, Old Turkic₉₉, Oriya₁₀₀, Osage₁₀₁, Osmanya₁₀₂, Pahawh Hmong₁₀₃, Palmyrene₁₀₄, Pau Cin Hau₁₀₅, Phags Pa₁₀₆, Phoenician₁₀₇, Psalter Pahlavi₁₀₈, Rejang₁₀₉, Runic₁₁₀, SC₁₁₁, Saurashtra₁₁₂, Sharada₁₁₃, Shavian₁₁₄, Siddham₁₁₅, Sinhala₁₁₆, Sogdian₁₁₇, Sora Sompeng₁₁₈, Soyombo₁₁₉, Sundanese₁₂₀, Syloti Nagri₁₂₁, Syriac₁₂₂, TC₁₂₃, Tagalog₁₂₄, Tagbanwa₁₂₅, Tai Le₁₂₆, Tai Tham₁₂₇, Tai Viet₁₂₈, Takri₁₂₉, Tamil₁₃₀, Tamil Supplement₁₃₁, Telugu₁₃₂, Thaana₁₃₃, Thai₁₃₄, Tifinagh₁₃₅, Tirhuta₁₃₆, Ugaritic₁₃₇, Vai₁₃₈, Wancho₁₃₉, Warang Citi₁₄₀, Yi₁₄₁, Zanabazar Square₁₄₂.
+    'acaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,'
+    // #185: 134 fonts: Noto Sans₀, Noto Music₃, Symbols₄, Symbols 2₅, Adlam₆, Anatolian Hieroglyphs₇, Arabic₈, Armenian₉, Avestan₁₀, Balinese₁₁, Bamum₁₂, Bassa Vah₁₃, Batak₁₄, Bengali₁₅, Bhaiksuki₁₆, Brahmi₁₇, Buginese₁₈, Buhid₁₉, Canadian Aboriginal₂₀, Carian₂₁, Chakma₂₃, Cham₂₄, Cherokee₂₅, Coptic₂₆, Cuneiform₂₇, Deseret₂₉, Devanagari₃₀, Duployan₃₁, Egyptian Hieroglyphs₃₂, Elbasan₃₃, Georgian₃₅, Glagolitic₃₆, Gothic₃₇, Grantha₃₈, Gujarati₃₉, Gunjala Gondi₄₀, Gurmukhi₄₁, HK₄₂, Hanunoo₄₃, Hatran₄₄, Hebrew₄₅, Imperial Aramaic₄₆, Indic Siyaq Numbers₄₇, Inscriptional Pahlavi₄₈, Inscriptional Parthian₄₉, JP₅₀, Javanese₅₁, KR₅₂, Kaithi₅₃, Kannada₅₄, Kayah Li₅₅, Kharoshthi₅₆, Khmer₅₇, Khojki₅₈, Khudawadi₅₉, Lao₆₀, Lepcha₆₁, Limbu₆₂, Linear A₆₃, Linear B₆₄, Lisu₆₅, Lydian₆₇, Mahajani₆₈, Malayalam₆₉, Mandaic₇₀, Manichaean₇₁, Marchen₇₂, Masaram Gondi₇₃, Math₇₄, Mayan Numerals₇₅, Medefaidrin₇₆, Meetei Mayek₇₇, Meroitic₇₈, Miao₇₉, Modi₈₀, Mongolian₈₁, Mro₈₂, Multani₈₃, NKo₈₅, Nabataean₈₆, New Tai Lue₈₇, Newa₈₈, Nushu₈₉, Ogham₉₀, Ol Chiki₉₁, Old Hungarian₉₂, Old Italic₉₃, Old North Arabian₉₄, Old Permic₉₅, Old Persian₉₆, Old Sogdian₉₇, Old South Arabian₉₈, Old Turkic₉₉, Osage₁₀₁, Osmanya₁₀₂, Pahawh Hmong₁₀₃, Palmyrene₁₀₄, Pau Cin Hau₁₀₅, Phoenician₁₀₇, Psalter Pahlavi₁₀₈, Rejang₁₀₉, Runic₁₁₀, SC₁₁₁, Saurashtra₁₁₂, Sharada₁₁₃, Shavian₁₁₄, Siddham₁₁₅, Sinhala₁₁₆, Sogdian₁₁₇, Sora Sompeng₁₁₈, Soyombo₁₁₉, Sundanese₁₂₀, Syloti Nagri₁₂₁, Syriac₁₂₂, TC₁₂₃, Tagalog₁₂₄, Tagbanwa₁₂₅, Tai Le₁₂₆, Tai Tham₁₂₇, Tai Viet₁₂₈, Takri₁₂₉, Tamil₁₃₀, Tamil Supplement₁₃₁, Telugu₁₃₂, Thaana₁₃₃, Thai₁₃₄, Tifinagh₁₃₅, Tirhuta₁₃₆, Ugaritic₁₃₇, Vai₁₃₈, Wancho₁₃₉, Warang Citi₁₄₀, Yi₁₄₁, Zanabazar Square₁₄₂.
+    'acaaaaaaaaaaaaaaaaaabaaaabaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaabaaaaaaaaaaaaaabaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,'
+    // #186: 134 fonts: Noto Sans₀, Noto Music₃, Symbols₄, Symbols 2₅, Adlam₆, Anatolian Hieroglyphs₇, Armenian₉, Avestan₁₀, Balinese₁₁, Bamum₁₂, Bassa Vah₁₃, Batak₁₄, Bengali₁₅, Bhaiksuki₁₆, Brahmi₁₇, Buginese₁₈, Buhid₁₉, Canadian Aboriginal₂₀, Carian₂₁, Caucasian Albanian₂₂, Chakma₂₃, Cham₂₄, Cherokee₂₅, Coptic₂₆, Cuneiform₂₇, Deseret₂₉, Devanagari₃₀, Duployan₃₁, Egyptian Hieroglyphs₃₂, Elbasan₃₃, Georgian₃₅, Glagolitic₃₆, Gothic₃₇, Grantha₃₈, Gujarati₃₉, Gunjala Gondi₄₀, Gurmukhi₄₁, HK₄₂, Hanunoo₄₃, Hatran₄₄, Hebrew₄₅, Imperial Aramaic₄₆, Indic Siyaq Numbers₄₇, Inscriptional Pahlavi₄₈, Inscriptional Parthian₄₉, JP₅₀, Javanese₅₁, KR₅₂, Kaithi₅₃, Kannada₅₄, Kayah Li₅₅, Kharoshthi₅₆, Khmer₅₇, Khojki₅₈, Khudawadi₅₉, Lao₆₀, Lepcha₆₁, Limbu₆₂, Linear A₆₃, Linear B₆₄, Lisu₆₅, Lydian₆₇, Mahajani₆₈, Malayalam₆₉, Mandaic₇₀, Manichaean₇₁, Marchen₇₂, Masaram Gondi₇₃, Mayan Numerals₇₅, Medefaidrin₇₆, Meetei Mayek₇₇, Meroitic₇₈, Miao₇₉, Modi₈₀, Mongolian₈₁, Mro₈₂, Multani₈₃, NKo₈₅, Nabataean₈₆, New Tai Lue₈₇, Newa₈₈, Nushu₈₉, Ogham₉₀, Ol Chiki₉₁, Old Hungarian₉₂, Old Italic₉₃, Old North Arabian₉₄, Old Permic₉₅, Old Persian₉₆, Old Sogdian₉₇, Old South Arabian₉₈, Old Turkic₉₉, Oriya₁₀₀, Osage₁₀₁, Osmanya₁₀₂, Pahawh Hmong₁₀₃, Palmyrene₁₀₄, Pau Cin Hau₁₀₅, Phoenician₁₀₇, Psalter Pahlavi₁₀₈, Rejang₁₀₉, Runic₁₁₀, SC₁₁₁, Saurashtra₁₁₂, Sharada₁₁₃, Shavian₁₁₄, Siddham₁₁₅, Sinhala₁₁₆, Sogdian₁₁₇, Sora Sompeng₁₁₈, Soyombo₁₁₉, Sundanese₁₂₀, Syloti Nagri₁₂₁, Syriac₁₂₂, TC₁₂₃, Tagalog₁₂₄, Tagbanwa₁₂₅, Tai Le₁₂₆, Tai Tham₁₂₇, Tai Viet₁₂₈, Takri₁₂₉, Tamil₁₃₀, Tamil Supplement₁₃₁, Telugu₁₃₂, Thaana₁₃₃, Thai₁₃₄, Tifinagh₁₃₅, Tirhuta₁₃₆, Ugaritic₁₃₇, Vai₁₃₈, Wancho₁₃₉, Warang Citi₁₄₀, Yi₁₄₁, Zanabazar Square₁₄₂.
+    'acaaaabaaaaaaaaaaaaaaaaaabaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaabaaaaaaaabaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,'
+    // #187: 135 fonts: Noto Sans₀, Noto Music₃, Symbols₄, Symbols 2₅, Adlam₆, Anatolian Hieroglyphs₇, Armenian₉, Avestan₁₀, Balinese₁₁, Bamum₁₂, Bassa Vah₁₃, Batak₁₄, Bengali₁₅, Bhaiksuki₁₆, Brahmi₁₇, Buginese₁₈, Buhid₁₉, Canadian Aboriginal₂₀, Carian₂₁, Chakma₂₃, Cham₂₄, Cherokee₂₅, Coptic₂₆, Cuneiform₂₇, Deseret₂₉, Devanagari₃₀, Duployan₃₁, Egyptian Hieroglyphs₃₂, Elbasan₃₃, Georgian₃₅, Glagolitic₃₆, Gothic₃₇, Grantha₃₈, Gujarati₃₉, Gunjala Gondi₄₀, Gurmukhi₄₁, HK₄₂, Hanunoo₄₃, Hatran₄₄, Hebrew₄₅, Imperial Aramaic₄₆, Indic Siyaq Numbers₄₇, Inscriptional Pahlavi₄₈, Inscriptional Parthian₄₉, JP₅₀, Javanese₅₁, KR₅₂, Kaithi₅₃, Kannada₅₄, Kayah Li₅₅, Kharoshthi₅₆, Khmer₅₇, Khojki₅₈, Khudawadi₅₉, Lao₆₀, Lepcha₆₁, Limbu₆₂, Linear A₆₃, Linear B₆₄, Lisu₆₅, Lydian₆₇, Mahajani₆₈, Malayalam₆₉, Mandaic₇₀, Manichaean₇₁, Marchen₇₂, Masaram Gondi₇₃, Math₇₄, Mayan Numerals₇₅, Medefaidrin₇₆, Meetei Mayek₇₇, Meroitic₇₈, Miao₇₉, Modi₈₀, Mongolian₈₁, Mro₈₂, Multani₈₃, Myanmar₈₄, NKo₈₅, Nabataean₈₆, New Tai Lue₈₇, Newa₈₈, Nushu₈₉, Ogham₉₀, Ol Chiki₉₁, Old Hungarian₉₂, Old Italic₉₃, Old North Arabian₉₄, Old Permic₉₅, Old Persian₉₆, Old Sogdian₉₇, Old South Arabian₉₈, Old Turkic₉₉, Oriya₁₀₀, Osage₁₀₁, Osmanya₁₀₂, Pahawh Hmong₁₀₃, Palmyrene₁₀₄, Pau Cin Hau₁₀₅, Phoenician₁₀₇, Psalter Pahlavi₁₀₈, Rejang₁₀₉, Runic₁₁₀, SC₁₁₁, Saurashtra₁₁₂, Sharada₁₁₃, Shavian₁₁₄, Siddham₁₁₅, Sinhala₁₁₆, Sogdian₁₁₇, Sora Sompeng₁₁₈, Soyombo₁₁₉, Sundanese₁₂₀, Syloti Nagri₁₂₁, Syriac₁₂₂, TC₁₂₃, Tagalog₁₂₄, Tagbanwa₁₂₅, Tai Le₁₂₆, Tai Tham₁₂₇, Tai Viet₁₂₈, Takri₁₂₉, Tamil₁₃₀, Tamil Supplement₁₃₁, Telugu₁₃₂, Thaana₁₃₃, Thai₁₃₄, Tifinagh₁₃₅, Tirhuta₁₃₆, Ugaritic₁₃₇, Vai₁₃₈, Wancho₁₃₉, Warang Citi₁₄₀, Yi₁₄₁, Zanabazar Square₁₄₂.
+    'acaaaabaaaaaaaaaaaabaaaabaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,'
+    // #188: 135 fonts: Noto Sans₀, Noto Music₃, Symbols₄, Symbols 2₅, Adlam₆, Anatolian Hieroglyphs₇, Armenian₉, Avestan₁₀, Balinese₁₁, Bamum₁₂, Bassa Vah₁₃, Batak₁₄, Bengali₁₅, Bhaiksuki₁₆, Brahmi₁₇, Buginese₁₈, Buhid₁₉, Canadian Aboriginal₂₀, Carian₂₁, Chakma₂₃, Cham₂₄, Cherokee₂₅, Coptic₂₆, Cuneiform₂₇, Deseret₂₉, Devanagari₃₀, Duployan₃₁, Egyptian Hieroglyphs₃₂, Elbasan₃₃, Georgian₃₅, Glagolitic₃₆, Gothic₃₇, Grantha₃₈, Gujarati₃₉, Gunjala Gondi₄₀, Gurmukhi₄₁, HK₄₂, Hanunoo₄₃, Hatran₄₄, Hebrew₄₅, Imperial Aramaic₄₆, Indic Siyaq Numbers₄₇, Inscriptional Pahlavi₄₈, Inscriptional Parthian₄₉, JP₅₀, Javanese₅₁, KR₅₂, Kaithi₅₃, Kannada₅₄, Kayah Li₅₅, Kharoshthi₅₆, Khmer₅₇, Khojki₅₈, Khudawadi₅₉, Lao₆₀, Lepcha₆₁, Limbu₆₂, Linear A₆₃, Linear B₆₄, Lisu₆₅, Lydian₆₇, Mahajani₆₈, Malayalam₆₉, Mandaic₇₀, Manichaean₇₁, Marchen₇₂, Masaram Gondi₇₃, Mayan Numerals₇₅, Medefaidrin₇₆, Meetei Mayek₇₇, Meroitic₇₈, Miao₇₉, Modi₈₀, Mongolian₈₁, Mro₈₂, Multani₈₃, Myanmar₈₄, NKo₈₅, Nabataean₈₆, New Tai Lue₈₇, Newa₈₈, Nushu₈₉, Ogham₉₀, Ol Chiki₉₁, Old Hungarian₉₂, Old Italic₉₃, Old North Arabian₉₄, Old Permic₉₅, Old Persian₉₆, Old Sogdian₉₇, Old South Arabian₉₈, Old Turkic₉₉, Oriya₁₀₀, Osage₁₀₁, Osmanya₁₀₂, Pahawh Hmong₁₀₃, Palmyrene₁₀₄, Pau Cin Hau₁₀₅, Phags Pa₁₀₆, Phoenician₁₀₇, Psalter Pahlavi₁₀₈, Rejang₁₀₉, Runic₁₁₀, SC₁₁₁, Saurashtra₁₁₂, Sharada₁₁₃, Shavian₁₁₄, Siddham₁₁₅, Sinhala₁₁₆, Sogdian₁₁₇, Sora Sompeng₁₁₈, Soyombo₁₁₉, Sundanese₁₂₀, Syloti Nagri₁₂₁, Syriac₁₂₂, TC₁₂₃, Tagalog₁₂₄, Tagbanwa₁₂₅, Tai Le₁₂₆, Tai Tham₁₂₇, Tai Viet₁₂₈, Takri₁₂₉, Tamil₁₃₀, Tamil Supplement₁₃₁, Telugu₁₃₂, Thaana₁₃₃, Thai₁₃₄, Tifinagh₁₃₅, Tirhuta₁₃₆, Ugaritic₁₃₇, Vai₁₃₈, Wancho₁₃₉, Warang Citi₁₄₀, Yi₁₄₁, Zanabazar Square₁₄₂.
+    'acaaaabaaaaaaaaaaaabaaaabaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,'
+    // #189: 132 fonts: Noto Sans₀, Noto Music₃, Symbols₄, Symbols 2₅, Adlam₆, Anatolian Hieroglyphs₇, Armenian₉, Avestan₁₀, Balinese₁₁, Bamum₁₂, Bassa Vah₁₃, Batak₁₄, Bengali₁₅, Bhaiksuki₁₆, Brahmi₁₇, Buginese₁₈, Buhid₁₉, Canadian Aboriginal₂₀, Carian₂₁, Chakma₂₃, Cham₂₄, Cherokee₂₅, Coptic₂₆, Cuneiform₂₇, Deseret₂₉, Devanagari₃₀, Egyptian Hieroglyphs₃₂, Elbasan₃₃, Georgian₃₅, Glagolitic₃₆, Gothic₃₇, Grantha₃₈, Gujarati₃₉, Gunjala Gondi₄₀, Gurmukhi₄₁, HK₄₂, Hanunoo₄₃, Hatran₄₄, Hebrew₄₅, Imperial Aramaic₄₆, Indic Siyaq Numbers₄₇, Inscriptional Pahlavi₄₈, Inscriptional Parthian₄₉, JP₅₀, Javanese₅₁, KR₅₂, Kaithi₅₃, Kannada₅₄, Kayah Li₅₅, Kharoshthi₅₆, Khmer₅₇, Khojki₅₈, Khudawadi₅₉, Lao₆₀, Lepcha₆₁, Limbu₆₂, Linear A₆₃, Linear B₆₄, Lisu₆₅, Lydian₆₇, Mahajani₆₈, Malayalam₆₉, Mandaic₇₀, Manichaean₇₁, Marchen₇₂, Masaram Gondi₇₃, Mayan Numerals₇₅, Medefaidrin₇₆, Meetei Mayek₇₇, Meroitic₇₈, Miao₇₉, Modi₈₀, Mongolian₈₁, Mro₈₂, Multani₈₃, NKo₈₅, Nabataean₈₆, New Tai Lue₈₇, Newa₈₈, Nushu₈₉, Ogham₉₀, Ol Chiki₉₁, Old Hungarian₉₂, Old Italic₉₃, Old North Arabian₉₄, Old Permic₉₅, Old Persian₉₆, Old Sogdian₉₇, Old South Arabian₉₈, Old Turkic₉₉, Oriya₁₀₀, Osage₁₀₁, Osmanya₁₀₂, Pahawh Hmong₁₀₃, Palmyrene₁₀₄, Pau Cin Hau₁₀₅, Phoenician₁₀₇, Psalter Pahlavi₁₀₈, Rejang₁₀₉, Runic₁₁₀, SC₁₁₁, Saurashtra₁₁₂, Sharada₁₁₃, Shavian₁₁₄, Siddham₁₁₅, Sinhala₁₁₆, Sogdian₁₁₇, Sora Sompeng₁₁₈, Soyombo₁₁₉, Sundanese₁₂₀, Syloti Nagri₁₂₁, Syriac₁₂₂, TC₁₂₃, Tagalog₁₂₄, Tagbanwa₁₂₅, Tai Le₁₂₆, Tai Tham₁₂₇, Tai Viet₁₂₈, Takri₁₂₉, Tamil₁₃₀, Tamil Supplement₁₃₁, Telugu₁₃₂, Thaana₁₃₃, Thai₁₃₄, Tifinagh₁₃₅, Tirhuta₁₃₆, Ugaritic₁₃₇, Vai₁₃₈, Wancho₁₃₉, Warang Citi₁₄₀, Yi₁₄₁, Zanabazar Square₁₄₂.
+    'acaaaabaaaaaaaaaaaabaaaabababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaabaaaaaaaabaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,'
+    // #190: 95 fonts: Noto Sans₀, Noto Music₃, Symbols₄, Symbols 2₅, Adlam₆, Arabic₈, Armenian₉, Balinese₁₁, Bamum₁₂, Bassa Vah₁₃, Batak₁₄, Bengali₁₅, Bhaiksuki₁₆, Brahmi₁₇, Buginese₁₈, Buhid₁₉, Canadian Aboriginal₂₀, Caucasian Albanian₂₂, Chakma₂₃, Cham₂₄, Coptic₂₆, Devanagari₃₀, Duployan₃₁, Egyptian Hieroglyphs₃₂, Elbasan₃₃, Gothic₃₇, Grantha₃₈, Gujarati₃₉, Gunjala Gondi₄₀, Gurmukhi₄₁, HK₄₂, Hanunoo₄₃, Hebrew₄₅, JP₅₀, Javanese₅₁, KR₅₂, Kaithi₅₃, Kannada₅₄, Kayah Li₅₅, Kharoshthi₅₆, Khmer₅₇, Khojki₅₈, Khudawadi₅₉, Lao₆₀, Lepcha₆₁, Limbu₆₂, Lisu₆₅, Mahajani₆₈, Malayalam₆₉, Mandaic₇₀, Manichaean₇₁, Marchen₇₂, Masaram Gondi₇₃, Math₇₄, Meetei Mayek₇₇, Miao₇₉, Modi₈₀, Mongolian₈₁, Myanmar₈₄, NKo₈₅, New Tai Lue₈₇, Newa₈₈, Old Permic₉₅, Old Sogdian₉₇, Oriya₁₀₀, Osage₁₀₁, Pahawh Hmong₁₀₃, Phags Pa₁₀₆, Psalter Pahlavi₁₀₈, Rejang₁₀₉, Runic₁₁₀, SC₁₁₁, Saurashtra₁₁₂, Sharada₁₁₃, Siddham₁₁₅, Sinhala₁₁₆, Sogdian₁₁₇, Soyombo₁₁₉, Sundanese₁₂₀, Syloti Nagri₁₂₁, Syriac₁₂₂, TC₁₂₃, Tagalog₁₂₄, Tagbanwa₁₂₅, Tai Le₁₂₆, Tai Viet₁₂₈, Takri₁₂₉, Tamil₁₃₀, Telugu₁₃₂, Thaana₁₃₃, Thai₁₃₄, Tifinagh₁₃₅, Tirhuta₁₃₆, Wancho₁₃₉, Zanabazar Square₁₄₂.
+    'acaaababaaaaaaaaabaabdaaadaaaaaabeaaaaaaaaaaaaccaaaaaacbaacabagbcabcbaaaaabaabaaaaaaabaabaaaacc,'
+    // #191: 89 fonts: Noto Sans₀, Adlam₆, Anatolian Hieroglyphs₇, Armenian₉, Balinese₁₁, Bassa Vah₁₃, Batak₁₄, Bengali₁₅, Bhaiksuki₁₆, Brahmi₁₇, Buginese₁₈, Buhid₁₉, Canadian Aboriginal₂₀, Chakma₂₃, Cherokee₂₅, Cuneiform₂₇, Deseret₂₉, Egyptian Hieroglyphs₃₂, Georgian₃₅, Glagolitic₃₆, Gothic₃₇, Grantha₃₈, HK₄₂, Hanunoo₄₃, Hatran₄₄, Hebrew₄₅, Imperial Aramaic₄₆, Indic Siyaq Numbers₄₇, Inscriptional Pahlavi₄₈, JP₅₀, KR₅₂, Kaithi₅₃, Kayah Li₅₅, Khmer₅₇, Khudawadi₅₉, Limbu₆₂, Linear B₆₄, Lisu₆₅, Lydian₆₇, Mahajani₆₈, Mandaic₇₀, Manichaean₇₁, Marchen₇₂, Masaram Gondi₇₃, Mayan Numerals₇₅, Medefaidrin₇₆, Meetei Mayek₇₇, Meroitic₇₈, Miao₇₉, Mongolian₈₁, Mro₈₂, Multani₈₃, Nabataean₈₆, Ogham₉₀, Ol Chiki₉₁, Old Italic₉₃, Old North Arabian₉₄, Old Permic₉₅, Old Persian₉₆, Old Sogdian₉₇, Old South Arabian₉₈, Oriya₁₀₀, Osage₁₀₁, Osmanya₁₀₂, Pahawh Hmong₁₀₃, Palmyrene₁₀₄, Pau Cin Hau₁₀₅, Phoenician₁₀₇, Psalter Pahlavi₁₀₈, Runic₁₁₀, SC₁₁₁, Shavian₁₁₄, Sinhala₁₁₆, Sogdian₁₁₇, Sora Sompeng₁₁₈, Soyombo₁₁₉, Syloti Nagri₁₂₁, TC₁₂₃, Tagbanwa₁₂₅, Tai Le₁₂₆, Tai Tham₁₂₇, Thaana₁₃₃, Thai₁₃₄, Tirhuta₁₃₆, Ugaritic₁₃₇, Vai₁₃₈, Wancho₁₃₉, Warang Citi₁₄₀, Yi₁₄₁.
+    'afabbbaaaaaaacbbbccaaadaaaaaabbabbbcbababaaabaaaabaacdabaaaaabaaaaababacbaaabbbaafabaaaaa,'
+    // #192: 4 fonts: Noto Sans₀, Adlam₆, Duployan₃₁, Syriac₁₂₂.
+    'afy3m,'
+    // #193: 41 fonts: Noto Sans₀, Anatolian Hieroglyphs₇, Arabic₈, Balinese₁₁, Batak₁₄, Bengali₁₅, Bhaiksuki₁₆, Brahmi₁₇, Buginese₁₈, Buhid₁₉, Devanagari₃₀, Gujarati₃₉, Gurmukhi₄₁, Hanunoo₄₃, Javanese₅₁, Kaithi₅₃, Kannada₅₄, Kharoshthi₅₆, Khmer₅₇, Lao₆₀, Lepcha₆₁, Limbu₆₂, Malayalam₆₉, Meetei Mayek₇₇, Myanmar₈₄, Oriya₁₀₀, Phags Pa₁₀₆, Rejang₁₀₉, Saurashtra₁₁₂, Sinhala₁₁₆, Sundanese₁₂₀, Syloti Nagri₁₂₁, Tagalog₁₂₄, Tagbanwa₁₂₅, Tai Le₁₂₆, Tai Tham₁₂₇, Tai Viet₁₂₈, Tamil₁₃₀, Telugu₁₃₂, Thaana₁₃₃, Thai₁₃₄.
+    'agaccaaaaakibbhbabacaaghgpfccddacaaaabbaa,'
+    // #194: 29 fonts: Noto Sans₀, Arabic₈, Armenian₉, Bengali₁₅, Coptic₂₆, Devanagari₃₀, Georgian₃₅, Gujarati₃₉, Gurmukhi₄₁, HK₄₂, Hebrew₄₅, JP₅₀, KR₅₂, Kaithi₅₃, Kannada₅₄, Kayah Li₅₅, Kharoshthi₅₆, Khmer₅₇, Lisu₆₅, Malayalam₆₉, Oriya₁₀₀, SC₁₁₁, Sora Sompeng₁₁₈, Sundanese₁₂₀, Syloti Nagri₁₂₁, TC₁₂₃, Tamil₁₃₀, Telugu₁₃₂, Thai₁₃₄.
+    'ahafkdedbacebaaaaahd1ekgbabgbb,'
+    // #195: 69 fonts: Noto Sans₀, Arabic₈, Avestan₁₀, Balinese₁₁, Batak₁₄, Bengali₁₅, Brahmi₁₇, Buginese₁₈, Buhid₁₉, Chakma₂₃, Cham₂₄, Devanagari₃₀, Duployan₃₁, Egyptian Hieroglyphs₃₂, Grantha₃₈, Gujarati₃₉, Gunjala Gondi₄₀, Gurmukhi₄₁, Hanunoo₄₃, Hatran₄₄, Hebrew₄₅, Javanese₅₁, Kaithi₅₃, Kannada₅₄, Kayah Li₅₅, Kharoshthi₅₆, Khmer₅₇, Khojki₅₈, Khudawadi₅₉, Lao₆₀, Lepcha₆₁, Limbu₆₂, Mahajani₆₈, Malayalam₆₉, Mandaic₇₀, Manichaean₇₁, Meetei Mayek₇₇, Modi₈₀, Mongolian₈₁, Myanmar₈₄, NKo₈₅, New Tai Lue₈₇, Newa₈₈, Oriya₁₀₀, Pahawh Hmong₁₀₃, Phags Pa₁₀₆, Psalter Pahlavi₁₀₈, Rejang₁₀₉, Saurashtra₁₁₂, Sharada₁₁₃, Siddham₁₁₅, Sinhala₁₁₆, Sogdian₁₁₇, Sundanese₁₂₀, Syloti Nagri₁₂₁, Syriac₁₂₂, Tagalog₁₂₄, Tagbanwa₁₂₅, Tai Le₁₂₆, Tai Tham₁₂₇, Tai Viet₁₂₈, Takri₁₂₉, Tamil₁₃₀, Telugu₁₃₂, Thaana₁₃₃, Thai₁₃₄, Tifinagh₁₃₅, Tirhuta₁₃₆, Warang Citi₁₄₀.
+    'ahbacabaadafaafaaabaafbaaaaaaaaafaaafcacabalccbacabaacaabaaaaaabaaaad,'
+    // #196: 8 fonts: Noto Sans₀, Arabic₈, HK₄₂, JP₅₀, KR₅₂, SC₁₁₁, Syloti Nagri₁₂₁, TC₁₂₃.
+    'ah1hhb2gjb,'
+    // #197: 3 fonts: Noto Sans₀, Arabic₈, Hebrew₄₅.
+    'ah1k,'
+    // #198: 7 fonts: Noto Sans₀, Arabic₈, Hebrew₄₅, NKo₈₅, Phags Pa₁₀₆, Syriac₁₂₂, Thaana₁₃₃.
+    'ah1k1nupk,'
+    // #199: 2 fonts: Noto Sans₀, Armenian₉.
+    'ai,'
+    // #200: 2 fonts: Noto Sans₀, Avestan₁₀.
+    'aj,'
+    // #201: 20 fonts: Noto Sans₀, Bengali₁₅, Devanagari₃₀, Grantha₃₈, Gujarati₃₉, Gurmukhi₄₁, Kannada₅₄, Khudawadi₅₉, Limbu₆₂, Mahajani₆₈, Malayalam₆₉, Masaram Gondi₇₃, Multani₈₃, Oriya₁₀₀, Sinhala₁₁₆, Syloti Nagri₁₂₁, Takri₁₂₉, Tamil₁₃₀, Telugu₁₃₂, Tirhuta₁₃₆.
+    'aoohabmecfadjqpehabd,'
+    // #202: 12 fonts: Noto Sans₀, Bengali₁₅, Devanagari₃₀, Grantha₃₈, Gujarati₃₉, Gurmukhi₄₁, Kannada₅₄, Malayalam₆₉, Sharada₁₁₃, Tamil₁₃₀, Telugu₁₃₂, Tirhuta₁₃₆.
+    'aoohabmo1rqbd,'
+    // #203: 7 fonts: Noto Sans₀, Bengali₁₅, Devanagari₃₀, Grantha₃₈, Kannada₅₄, Telugu₁₃₂, Tirhuta₁₃₆.
+    'aoohp2zd,'
+    // #204: 12 fonts: Noto Sans₀, Bengali₁₅, Devanagari₃₀, Gujarati₃₉, Gurmukhi₄₁, Kannada₅₄, Malayalam₆₉, Meetei Mayek₇₇, Ol Chiki₉₁, Oriya₁₀₀, Tamil₁₃₀, Telugu₁₃₂.
+    'aooibmohni1db,'
+    // #205: 7 fonts: Noto Sans₀, Bengali₁₅, Devanagari₃₀, Gurmukhi₄₁, Lisu₆₅, Oriya₁₀₀, Thai₁₃₄.
+    'aookx1i1h,'
+    // #206: 4 fonts: Noto Sans₀, Bengali₁₅, Devanagari₃₀, Kannada₅₄.
+    'aoox,'
+    // #207: 16 fonts: Noto Sans₀, Bengali₁₅, Gujarati₃₉, Gurmukhi₄₁, HK₄₂, JP₅₀, KR₅₂, Kannada₅₄, Khmer₅₇, Malayalam₆₉, Oriya₁₀₀, SC₁₁₁, Sinhala₁₁₆, TC₁₂₃, Tamil₁₃₀, Telugu₁₃₂.
+    'aoxbahbbcl1ekeggb,'
+    // #208: 8 fonts: Noto Sans₀, Caucasian Albanian₂₂, Cherokee₂₅, Duployan₃₁, Gothic₃₇, Syriac₁₂₂, Thai₁₃₄, Tifinagh₁₃₅.
+    'avcff3gla,'
+    // #209: 4 fonts: Noto Sans₀, Caucasian Albanian₂₂, Coptic₂₆, Glagolitic₃₆.
+    'avdj,'
+    // #210: 3 fonts: Noto Sans₀, Caucasian Albanian₂₂, Glagolitic₃₆.
+    'avn,'
+    // #211: 9 fonts: Noto Sans₀, Cherokee₂₅, Coptic₂₆, Duployan₃₁, Lydian₆₇, Malayalam₆₉, Runic₁₁₀, Syriac₁₂₂, Tifinagh₁₃₅.
+    'ayae1jb1olm,'
+    // #212: 4 fonts: Noto Sans₀, Cherokee₂₅, Duployan₃₁, Syriac₁₂₂.
+    'ayf3m,'
+    // #213: 4 fonts: Noto Sans₀, Cherokee₂₅, Math₇₄, Syriac₁₂₂.
+    'ay1w1v,'
+    // #214: 6 fonts: Noto Sans₀, Coptic₂₆, Elbasan₃₃, Glagolitic₃₆, Gothic₃₇, Math₇₄.
+    'azgca1k,'
+    // #215: 4 fonts: Noto Sans₀, Devanagari₃₀, Grantha₃₈, Kannada₅₄.
+    'a1dhp,'
+    // #216: 13 fonts: Noto Sans₀, Devanagari₃₀, Gujarati₃₉, Gurmukhi₄₁, Kaithi₅₃, Kannada₅₄, Khojki₅₈, Khudawadi₅₉, Mahajani₆₈, Malayalam₆₉, Modi₈₀, Takri₁₂₉, Tirhuta₁₃₆.
+    'a1dibladaiak1wg,'
+    // #217: 12 fonts: Noto Sans₀, Devanagari₃₀, Gujarati₃₉, Gurmukhi₄₁, Kaithi₅₃, Kannada₅₄, Khojki₅₈, Khudawadi₅₉, Mahajani₆₈, Modi₈₀, Takri₁₂₉, Tirhuta₁₃₆.
+    'a1dibladail1wg,'
+    // #218: 11 fonts: Noto Sans₀, Devanagari₃₀, Gujarati₃₉, Gurmukhi₄₁, Kaithi₅₃, Khojki₅₈, Khudawadi₅₉, Mahajani₆₈, Modi₈₀, Takri₁₂₉, Tirhuta₁₃₆.
+    'a1dibleail1wg,'
+    // #219: 4 fonts: Noto Sans₀, Devanagari₃₀, Kaithi₅₃, Mahajani₆₈.
+    'a1dwo,'
+    // #220: 6 fonts: Noto Sans₀, Devanagari₃₀, Kannada₅₄, Malayalam₆₉, Tamil₁₃₀, Telugu₁₃₂.
+    'a1dxo2ib,'
+    // #221: 3 fonts: Noto Sans₀, Devanagari₃₀, Modi₈₀.
+    'a1d1x,'
+    // #222: 3 fonts: Noto Sans₀, Devanagari₃₀, Tamil₁₃₀.
+    'a1d3v,'
+    // #223: 7 fonts: Noto Sans₀, Duployan₃₁, HK₄₂, JP₅₀, KR₅₂, SC₁₁₁, TC₁₂₃.
+    'a1ekhb2gl,'
+    // #224: 2 fonts: Noto Sans₀, Georgian₃₅.
+    'a1i,'
+    // #225: 3 fonts: Noto Sans₀, Glagolitic₃₆, Old Permic₉₅.
+    'a1j2g,'
+    // #226: 7 fonts: Noto Sans₀, HK₄₂, JP₅₀, KR₅₂, Mongolian₈₁, SC₁₁₁, TC₁₂₃.
+    'a1phb1c1dl,'
+    // #227: 7 fonts: Noto Sans₀, HK₄₂, JP₅₀, KR₅₂, Phags Pa₁₀₆, SC₁₁₁, TC₁₂₃.
+    'a1phb2bel,'
+    // #228: 2 fonts: Noto Sans₀, Hebrew₄₅.
+    'a1s,'
+    // #229: 3 fonts: Noto Sans₀, Kayah Li₅₅, Myanmar₈₄.
+    'a2c1c,'
+    // #230: 2 fonts: Noto Sans₀, Lao₆₀.
+    'a2h,'
+    // #231: 2 fonts: Noto Sans₀, Lisu₆₅.
+    'a2m,'
+    // #232: 4 fonts: Noto Sans₀, Manichaean₇₁, Myanmar₈₄, Phags Pa₁₀₆.
+    'a2smv,'
+    // #233: 3 fonts: Noto Sans₀, Meroitic₇₈, Old Hungarian₉₂.
+    'a2zn,'
+    // #234: 2 fonts: Noto Sans₀, Mongolian₈₁.
+    'a3c,'
+    // #235: 2 fonts: Noto Sans₀, NKo₈₅.
+    'a3g,'
+    // #236: 2 fonts: Noto Sans₀, Newa₈₈.
+    'a3j,'
+    // #237: 2 fonts: Noto Sans₀, Old Hungarian₉₂.
+    'a3n,'
+    // #238: 3 fonts: Noto Sans₀, Old Hungarian₉₂, Old Turkic₉₉.
+    'a3ng,'
+    // #239: 2 fonts: Noto Sans₀, Old Permic₉₅.
+    'a3q,'
+    // #240: 2 fonts: Noto Sans₀, Oriya₁₀₀.
+    'a3v,'
+    // #241: 2 fonts: Noto Sans₀, Osage₁₀₁.
+    'a3w,'
+    // #242: 2 fonts: Noto Sans₀, Syloti Nagri₁₂₁.
+    'a4q,'
+    // #243: 2 fonts: Noto Sans₀, Tamil₁₃₀.
+    'a4z,'
+    // #244: 2 fonts: Noto Sans₀, Thai₁₃₄.
+    'a5d,'
+    // #245: 4 fonts: Noto Color Emoji₁, Noto Emoji₂, Symbols₄, Symbols 2₅.
+    'baba,'
+    // #246: 4 fonts: Noto Color Emoji₁, Noto Emoji₂, Symbols₄, Duployan₃₁.
+    'bab1a,'
+    // #247: 9 fonts: Noto Color Emoji₁, Noto Emoji₂, Symbols₄, HK₄₂, JP₅₀, KR₅₂, Math₇₄, SC₁₁₁, TC₁₂₃.
+    'bab1lhbv1kl,'
+    // #248: 4 fonts: Noto Color Emoji₁, Noto Emoji₂, Symbols 2₅, Duployan₃₁.
+    'bacz,'
+    // #249: 4 fonts: Noto Color Emoji₁, Noto Emoji₂, Symbols 2₅, Math₇₄.
+    'bac2q,'
+    // #250: 8 fonts: Noto Color Emoji₁, Noto Emoji₂, HK₄₂, JP₅₀, KR₅₂, Math₇₄, SC₁₁₁, TC₁₂₃.
+    'ba1nhbv1kl,'
+    // #251: 3 fonts: Noto Color Emoji₁, Noto Emoji₂, Math₇₄.
+    'ba2t,'
+    // #252: 1 font: Noto Emoji₂.
+    'c,'
+    // #253: 8 fonts: Noto Music₃, Symbols₄, HK₄₂, JP₅₀, KR₅₂, Math₇₄, SC₁₁₁, TC₁₂₃.
+    'da1lhbv1kl,'
+    // #254: 7 fonts: Noto Music₃, Symbols₄, HK₄₂, JP₅₀, KR₅₂, SC₁₁₁, TC₁₂₃.
+    'da1lhb2gl,'
+    // #255: 7 fonts: Symbols₄, Duployan₃₁, HK₄₂, JP₅₀, KR₅₂, SC₁₁₁, TC₁₂₃.
+    'e1akhb2gl,'
+    // #256: 2 fonts: Symbols₄, Gurmukhi₄₁.
+    'e1k,'
+    // #257: 7 fonts: Symbols₄, HK₄₂, JP₅₀, KR₅₂, Mongolian₈₁, SC₁₁₁, TC₁₂₃.
+    'e1lhb1c1dl,'
+    // #258: 2 fonts: Symbols₄, Syriac₁₂₂.
+    'e4n,'
+    // #259: 2 fonts: Symbols 2₅, Coptic₂₆.
+    'fu,'
+    // #260: 3 fonts: Symbols 2₅, Math₇₄, Tai Tham₁₂₇.
+    'f2q2a,'
+    // #261: 2 fonts: Symbols 2₅, Mayan Numerals₇₅.
+    'f2r,'
+    // #262: 7 fonts: Adlam₆, Arabic₈, Mandaic₇₀, Manichaean₇₁, Psalter Pahlavi₁₀₈, Sogdian₁₁₇, Syriac₁₂₂.
+    'gb2ja1kie,'
+    // #263: 5 fonts: Adlam₆, Arabic₈, NKo₈₅, Syriac₁₂₂, Thaana₁₃₃.
+    'gb2y1kk,'
+    // #264: 1 font: Anatolian Hieroglyphs₇.
+    'h,'
+    // #265: 2 fonts: Arabic₈, Coptic₂₆.
+    'ir,'
+    // #266: 4 fonts: Arabic₈, Indic Siyaq Numbers₄₇, Syriac₁₂₂, Thaana₁₃₃.
+    'i1m2wk,'
+    // #267: 2 fonts: Arabic₈, NKo₈₅.
+    'i2y,'
+    // #268: 3 fonts: Arabic₈, Syriac₁₂₂, Thaana₁₃₃.
+    'i4jk,'
+    // #269: 2 fonts: Armenian₉, Georgian₃₅.
+    'jz,'
+    // #270: 3 fonts: Bengali₁₅, Chakma₂₃, Syloti Nagri₁₂₁.
+    'ph3t,'
+    // #271: 2 fonts: Bengali₁₅, Tirhuta₁₃₆.
+    'p4q,'
+    // #272: 2 fonts: Buginese₁₈, Javanese₅₁.
+    's1g,'
+    // #273: 1 font: Buhid₁₉.
+    't,'
+    // #274: 4 fonts: Buhid₁₉, Hanunoo₄₃, Tagalog₁₂₄, Tagbanwa₁₂₅.
+    'tx3ca,'
+    // #275: 1 font: Carian₂₁.
+    'v,'
+    // #276: 3 fonts: Chakma₂₃, Myanmar₈₄, Tai Le₁₂₆.
+    'x2i1p,'
+    // #277: 1 font: Deseret₂₉.
+    '1d,'
+    // #278: 1 font: Egyptian Hieroglyphs₃₂.
+    '1g,'
+    // #279: 1 font: Elbasan₃₃.
+    '1h,'
+    // #280: 1 font: Elymaic₃₄.
+    '1i,'
+    // #281: 1 font: Gothic₃₇.
+    '1l,'
+    // #282: 2 fonts: Gujarati₃₉, Khojki₅₈.
+    '1ns,'
+    // #283: 2 fonts: Gurmukhi₄₁, Multani₈₃.
+    '1p1p,'
+    // #284: 11 fonts: HK₄₂, JP₅₀, KR₅₂, Lisu₆₅, Mongolian₈₁, New Tai Lue₈₇, Phags Pa₁₀₆, SC₁₁₁, TC₁₂₃, Tai Le₁₂₆, Yi₁₄₁.
+    '1qhbmpfselco,'
+    // #285: 10 fonts: HK₄₂, JP₅₀, KR₅₂, Mongolian₈₁, New Tai Lue₈₇, Phags Pa₁₀₆, SC₁₁₁, TC₁₂₃, Tai Le₁₂₆, Yi₁₄₁.
+    '1qhb1cfselco,'
+    // #286: 8 fonts: HK₄₂, JP₅₀, KR₅₂, Mongolian₈₁, Phags Pa₁₀₆, SC₁₁₁, TC₁₂₃, Yi₁₄₁.
+    '1qhb1cyelr,'
+    // #287: 9 fonts: HK₄₂, JP₅₀, KR₅₂, New Tai Lue₈₇, Phags Pa₁₀₆, SC₁₁₁, TC₁₂₃, Tai Le₁₂₆, Yi₁₄₁.
+    '1qhb1iselco,'
+    // #288: 6 fonts: HK₄₂, JP₅₀, KR₅₂, Phags Pa₁₀₆, SC₁₁₁, TC₁₂₃.
+    '1qhb2bel,'
+    // #289: 2 fonts: HK₄₂, SC₁₁₁.
+    '1q2q,'
+    // #290: 1 font: Hanunoo₄₃.
+    '1r,'
+    // #291: 1 font: Indic Siyaq Numbers₄₇.
+    '1v,'
+    // #292: 1 font: Lycian₆₆.
+    '2o,'
+    // #293: 1 font: Mahajani₆₈.
+    '2q,'
+    // #294: 2 fonts: Math₇₄, Old Permic₉₅.
+    '2wu,'
+    // #295: 1 font: Medefaidrin₇₆.
+    '2y,'
+    // #296: 1 font: Ogham₉₀.
+    '3m,'
+    // #297: 1 font: Ol Chiki₉₁.
+    '3n,'
+    // #298: 1 font: Old North Arabian₉₄.
+    '3q,'
+    // #299: 1 font: Old Permic₉₅.
+    '3r,'
+    // #300: 1 font: Old Sogdian₉₇.
+    '3t,'
+    // #301: 1 font: Old South Arabian₉₈.
+    '3u,'
+    // #302: 1 font: Old Turkic₉₉.
+    '3v,'
+    // #303: 1 font: Palmyrene₁₀₄.
+    '4a,'
+    // #304: 1 font: Pau Cin Hau₁₀₅.
+    '4b,'
+    // #305: 1 font: Phags Pa₁₀₆.
+    '4c,'
+    // #306: 1 font: Runic₁₁₀.
+    '4g,'
+    // #307: 1 font: Sharada₁₁₃.
+    '4j,'
+    // #308: 1 font: Shavian₁₁₄.
+    '4k,'
+    // #309: 1 font: Sogdian₁₁₇.
+    '4n,'
+    // #310: 1 font: Soyombo₁₁₉.
+    '4p,'
+    // #311: 1 font: Syloti Nagri₁₂₁.
+    '4r,'
+    // #312: 1 font: Thaana₁₃₃.
+    '5d,'
+    // #313: 1 font: Vai₁₃₈.
+    '5i,'
+    // #314: 1 font: Zanabazar Square₁₄₂.
+    '5m'
+    ;
+
+// 21903 ranges encoded in 31599 characters
+const String encodedFontSetRanges =
+    '1eE'      // 0-1f
+    '6X'       // 20           #179
+    '2U'       // 21           #72
+    '1H'       // 22           #33
+    '4I'       // 23           #112
+    'e1H'      // 24-29        #33
+    '4I'       // 2a           #112
+    '1H'       // 2b           #33
+    '2U'       // 2c           #72
+    '7D'       // 2d           #185
+    '2U'       // 2e           #72
+    '1H'       // 2f           #33
+    'i6Y'      // 30-39        #180
+    '2U'       // 3a           #72
+    'c1H'      // 3b-3e        #33
+    '7F'       // 3f           #187
+    'd1H'      // 40-44        #33
+    '2V'       // 45           #73
+    'b1H'      // 46-48        #33
+    '2V'       // 49           #73
+    'd1H'      // 4a-4e        #33
+    '2V'       // 4f           #73
+    'd1H'      // 50-54        #33
+    '2V'       // 55           #73
+    '1n1H'     // 56-7e        #33
+    'M'        // 7f           #12
+    '1eE'      // 80-9f
+    '7C'       // a0           #184
+    'bV'       // a1-a3        #21
+    'S'        // a4           #18
+    'V'        // a5           #21
+    'S'        // a6           #18
+    '1H'       // a7           #33
+    'V'        // a8           #21
+    '3H'       // a9           #85
+    'V'        // aa           #21
+    '4J'       // ab           #113
+    '1V'       // ac           #47
+    '7Z'       // ad           #207
+    '3H'       // ae           #85
+    'aV'       // af-b0        #21
+    '1V'       // b1           #47
+    'a4R'      // b2-b3        #121
+    'V'        // b4           #21
+    'S'        // b5           #18
+    'bV'       // b6-b8        #21
+    'S'        // b9           #18
+    'V'        // ba           #21
+    '4J'       // bb           #113
+    'bS'       // bc-be        #18
+    'wV'       // bf-d6        #21
+    '1H'       // d7           #33
+    '1dV'      // d8-f6        #21
+    '1H'       // f7           #33
+    'kV'       // f8-103       #21
+    'cY'       // 104-107      #24
+    'aL'       // 108-109      #11
+    'eY'       // 10a-10f      #24
+    'cV'       // 110-113      #21
+    'aL'       // 114-115      #11
+    'cY'       // 116-119      #24
+    'aV'       // 11a-11b      #21
+    'aL'       // 11c-11d      #11
+    'eY'       // 11e-123      #24
+    'aL'       // 124-125      #11
+    'aY'       // 126-127      #24
+    'aS'       // 128-129      #18
+    'aV'       // 12a-12b      #21
+    'aL'       // 12c-12d      #11
+    'eY'       // 12e-133      #24
+    'aL'       // 134-135      #11
+    'aY'       // 136-137      #24
+    'L'        // 138          #11
+    'eY'       // 139-13e      #24
+    'aL'       // 13f-140      #11
+    'aY'       // 141-142      #24
+    'aV'       // 143-144      #21
+    'aY'       // 145-146      #24
+    'aV'       // 147-148      #21
+    'L'        // 149          #11
+    'aY'       // 14a-14b      #24
+    'aV'       // 14c-14d      #21
+    'aS'       // 14e-14f      #18
+    'aY'       // 150-151      #24
+    'aV'       // 152-153      #21
+    'gY'       // 154-15b      #24
+    'aL'       // 15c-15d      #11
+    'cY'       // 15e-161      #24
+    'aL'       // 162-163      #11
+    'aY'       // 164-165      #24
+    'aL'       // 166-167      #11
+    'aS'       // 168-169      #18
+    'cV'       // 16a-16d      #21
+    'pY'       // 16e-17e      #24
+    'rL'       // 17f-191      #11
+    'S'        // 192          #18
+    'lL'       // 193-19f      #11
+    'aS'       // 1a0-1a1      #18
+    'lL'       // 1a2-1ae      #11
+    'aS'       // 1af-1b0      #18
+    '1aL'      // 1b1-1cc      #11
+    'a7J'      // 1cd-1ce      #191
+    'mS'       // 1cf-1dc      #18
+    'zL'       // 1dd-1f7      #11
+    'aS'       // 1f8-1f9      #18
+    '1cL'      // 1fa-217      #11
+    'cY'       // 218-21b      #24
+    'zL'       // 21c-236      #11
+    'Y'        // 237          #24
+    'xL'       // 238-250      #11
+    'S'        // 251          #18
+    'nL'       // 252-260      #11
+    'S'        // 261          #18
+    '3hL'      // 262-2b8      #11
+    '1O'       // 2b9          #40
+    'L'        // 2ba          #11
+    'S'        // 2bb          #18
+    '7X'       // 2bc          #205
+    'hL'       // 2bd-2c5      #11
+    'Y'        // 2c6          #24
+    'V'        // 2c7          #21
+    'L'        // 2c8          #11
+    '7H'       // 2c9          #189
+    'aS'       // 2ca-2cb      #18
+    'L'        // 2cc          #11
+    '8X'       // 2cd          #231
+    'hL'       // 2ce-2d6      #11
+    '9K'       // 2d7          #244
+    'Y'        // 2d8          #24
+    'V'        // 2d9          #21
+    'cY'       // 2da-2dd      #24
+    'kL'       // 2de-2e9      #11
+    'aS'       // 2ea-2eb      #18
+    'sL'       // 2ec-2ff      #11
+    'aV'       // 300-301      #21
+    'a4L'      // 302-303      #115
+    '7E'       // 304          #186
+    '8G'       // 305          #214
+    'Y'        // 306          #24
+    '1H'       // 307          #33
+    '4L'       // 308          #115
+    '4S'       // 309          #122
+    'aY'       // 30a-30b      #24
+    'V'        // 30c          #21
+    'cL'       // 30d-310      #11
+    '1O'       // 311          #40
+    'Y'        // 312          #24
+    '9F'       // 313          #239
+    'aL'       // 314-315      #11
+    'a2M'      // 316-317      #64
+    'gL'       // 318-31f      #11
+    '3K'       // 320          #88
+    'aL'       // 321-322      #11
+    '8D'       // 323          #211
+    '8E'       // 324          #212
+    '3K'       // 325          #88
+    'bY'       // 326-328      #24
+    'cL'       // 329-32c      #11
+    'a3K'      // 32d-32e      #88
+    '2M'       // 32f          #64
+    '8F'       // 330          #213
+    '8A'       // 331          #208
+    'lL'       // 332-33e      #11
+    '1O'       // 33f          #40
+    'nL'       // 340-34e      #11
+    '7P'       // 34f          #197
+    'gL'       // 350-357      #11
+    '9H'       // 358          #241
+    'L'        // 359          #11
+    '9G'       // 35a          #240
+    'bL'       // 35b-35d      #11
+    '1O'       // 35e          #40
+    'aL'       // 35f-360      #11
+    '1O'       // 361          #40
+    'qL'       // 362-373      #11
+    'a1O'      // 374-375      #40
+    'aL'       // 376-377      #11
+    'aE'       // 378-379
+    'eL'       // 37a-37f      #11
+    'cE'       // 380-383
+    'fL'       // 384-38a      #11
+    'E'        // 38b
+    'L'        // 38c          #11
+    'E'        // 38d
+    'bL'       // 38e-390      #11
+    'p4Q'      // 391-3a1      #120
+    'E'        // 3a2
+    'f4Q'      // 3a3-3a9      #120
+    'fL'       // 3aa-3b0      #11
+    'x1V'      // 3b1-3c9      #47
+    'fL'       // 3ca-3d0      #11
+    '1A'       // 3d1          #26
+    'bL'       // 3d2-3d4      #11
+    'a1A'      // 3d5-3d6      #26
+    'bL'       // 3d7-3d9      #11
+    '2Y'       // 3da          #76
+    'L'        // 3db          #11
+    '2Y'       // 3dc          #76
+    'L'        // 3dd          #11
+    '2Y'       // 3de          #76
+    'L'        // 3df          #11
+    '2Y'       // 3e0          #76
+    'L'        // 3e1          #11
+    'm3R'      // 3e2-3ef      #95
+    'a1A'      // 3f0-3f1      #26
+    'aL'       // 3f2-3f3      #11
+    'a1A'      // 3f4-3f5      #26
+    'jL'       // 3f6-400      #11
+    'S'        // 401          #18
+    'mL'       // 402-40f      #11
+    '2kS'      // 410-44f      #18
+    'L'        // 450          #11
+    'S'        // 451          #18
+    '1vL'      // 452-482      #11
+    '8R'       // 483          #225
+    '3J'       // 484          #87
+    'aL'       // 485-486      #11
+    '3J'       // 487          #87
+    '6kL'      // 488-52f      #11
+    'E'        // 530
+    '1k2O'     // 531-556      #66
+    'aE'       // 557-558
+    '1u2O'     // 559-588      #66
+    '10J'      // 589          #269
+    '2O'       // 58a          #66
+    'aE'       // 58b-58c
+    'b2O'      // 58d-58f      #66
+    'E'        // 590
+    '2b1U'     // 591-5c7      #46
+    'gE'       // 5c8-5cf
+    'z1U'      // 5d0-5ea      #46
+    'dE'       // 5eb-5ef
+    'd1U'      // 5f0-5f4      #46
+    'jE'       // 5f5-5ff
+    'dZ'       // 600-604      #25
+    '10F'      // 605          #265
+    'eZ'       // 606-60b      #25
+    '3M'       // 60c          #90
+    'mZ'       // 60d-61a      #25
+    '3M'       // 61b          #90
+    'Z'        // 61c          #25
+    'E'        // 61d
+    'Z'        // 61e          #25
+    '10D'      // 61f          #263
+    'Z'        // 620          #25
+    '3N'       // 621          #91
+    'dZ'       // 622-626      #25
+    '4V'       // 627          #125
+    'wZ'       // 628-63f      #25
+    '10C'      // 640          #262
+    'iZ'       // 641-64a      #25
+    'j3N'      // 64b-655      #91
+    'iZ'       // 656-65f      #25
+    'i10G'     // 660-669      #266
+    '3M'       // 66a          #90
+    'a10I'     // 66b-66c      #268
+    'bZ'       // 66d-66f      #25
+    '3N'       // 670          #91
+    '4vZ'      // 671-6ef      #25
+    'i4V'      // 6f0-6f9      #125
+    'eZ'       // 6fa-6ff      #25
+    'm4F'      // 700-70d      #109
+    'E'        // 70e
+    '2g4F'     // 70f-74a      #109
+    'aE'       // 74b-74c
+    'b4F'      // 74d-74f      #109
+    '1uZ'      // 750-77f      #25
+    '1w12A'    // 780-7b1      #312
+    'mE'       // 7b2-7bf
+    '2f5W'     // 7c0-7fa      #152
+    'aE'       // 7fb-7fc
+    'b5W'      // 7fd-7ff      #152
+    '2kE'      // 800-83f
+    '1a5S'     // 840-85b      #148
+    'aE'       // 85c-85d
+    '5S'       // 85e          #148
+    '2lE'      // 85f-89f
+    'tZ'       // 8a0-8b4      #25
+    'E'        // 8b5
+    'hZ'       // 8b6-8be      #25
+    'sE'       // 8bf-8d2
+    '1rZ'      // 8d3-8ff      #25
+    '2h1J'     // 900-93c      #35
+    '8N'       // 93d          #221
+    'r1J'      // 93e-950      #35
+    'a7U'      // 951-952      #202
+    'p1J'      // 953-963      #35
+    'a7T'      // 964-965      #201
+    'i8L'      // 966-96f      #219
+    'o1J'      // 970-97f      #35
+    'c1E'      // 980-983      #30
+    'E'        // 984
+    'g1E'      // 985-98c      #30
+    'aE'       // 98d-98e
+    'a1E'      // 98f-990      #30
+    'aE'       // 991-992
+    'u1E'      // 993-9a8      #30
+    'E'        // 9a9
+    'f1E'      // 9aa-9b0      #30
+    'E'        // 9b1
+    '1E'       // 9b2          #30
+    'bE'       // 9b3-9b5
+    'c1E'      // 9b6-9b9      #30
+    'aE'       // 9ba-9bb
+    'h1E'      // 9bc-9c4      #30
+    'aE'       // 9c5-9c6
+    'a1E'      // 9c7-9c8      #30
+    'aE'       // 9c9-9ca
+    'c1E'      // 9cb-9ce      #30
+    'gE'       // 9cf-9d6
+    '1E'       // 9d7          #30
+    'cE'       // 9d8-9db
+    'a1E'      // 9dc-9dd      #30
+    'E'        // 9de
+    'd1E'      // 9df-9e3      #30
+    'aE'       // 9e4-9e5
+    'i10K'     // 9e6-9ef      #270
+    'c1E'      // 9f0-9f3      #30
+    'c10L'     // 9f4-9f7      #271
+    'f1E'      // 9f8-9fe      #30
+    'aE'       // 9ff-a00
+    'b1G'      // a01-a03      #32
+    'E'        // a04
+    'e1G'      // a05-a0a      #32
+    'cE'       // a0b-a0e
+    'a1G'      // a0f-a10      #32
+    'aE'       // a11-a12
+    'u1G'      // a13-a28      #32
+    'E'        // a29
+    'f1G'      // a2a-a30      #32
+    'E'        // a31
+    'a1G'      // a32-a33      #32
+    'E'        // a34
+    'a1G'      // a35-a36      #32
+    'E'        // a37
+    'a1G'      // a38-a39      #32
+    'aE'       // a3a-a3b
+    '1G'       // a3c          #32
+    'E'        // a3d
+    'd1G'      // a3e-a42      #32
+    'cE'       // a43-a46
+    'a1G'      // a47-a48      #32
+    'aE'       // a49-a4a
+    'b1G'      // a4b-a4d      #32
+    'bE'       // a4e-a50
+    '1G'       // a51          #32
+    'fE'       // a52-a58
+    'c1G'      // a59-a5c      #32
+    'E'        // a5d
+    '1G'       // a5e          #32
+    'fE'       // a5f-a65
+    'i10X'     // a66-a6f      #283
+    'f1G'      // a70-a76      #32
+    'iE'       // a77-a80
+    'b1K'      // a81-a83      #36
+    'E'        // a84
+    'h1K'      // a85-a8d      #36
+    'E'        // a8e
+    'b1K'      // a8f-a91      #36
+    'E'        // a92
+    'u1K'      // a93-aa8      #36
+    'E'        // aa9
+    'f1K'      // aaa-ab0      #36
+    'E'        // ab1
+    'a1K'      // ab2-ab3      #36
+    'E'        // ab4
+    'd1K'      // ab5-ab9      #36
+    'aE'       // aba-abb
+    'i1K'      // abc-ac5      #36
+    'E'        // ac6
+    'b1K'      // ac7-ac9      #36
+    'E'        // aca
+    'b1K'      // acb-acd      #36
+    'aE'       // ace-acf
+    '1K'       // ad0          #36
+    'nE'       // ad1-adf
+    'c1K'      // ae0-ae3      #36
+    'aE'       // ae4-ae5
+    'i10W'     // ae6-aef      #282
+    'a1K'      // af0-af1      #36
+    'fE'       // af2-af8
+    'f1K'      // af9-aff      #36
+    'E'        // b00
+    'b1L'      // b01-b03      #37
+    'E'        // b04
+    'g1L'      // b05-b0c      #37
+    'aE'       // b0d-b0e
+    'a1L'      // b0f-b10      #37
+    'aE'       // b11-b12
+    'u1L'      // b13-b28      #37
+    'E'        // b29
+    'f1L'      // b2a-b30      #37
+    'E'        // b31
+    'a1L'      // b32-b33      #37
+    'E'        // b34
+    'd1L'      // b35-b39      #37
+    'aE'       // b3a-b3b
+    'h1L'      // b3c-b44      #37
+    'aE'       // b45-b46
+    'a1L'      // b47-b48      #37
+    'aE'       // b49-b4a
+    'b1L'      // b4b-b4d      #37
+    'gE'       // b4e-b55
+    'a1L'      // b56-b57      #37
+    'cE'       // b58-b5b
+    'a1L'      // b5c-b5d      #37
+    'E'        // b5e
+    'd1L'      // b5f-b63      #37
+    'aE'       // b64-b65
+    'q1L'      // b66-b77      #37
+    'iE'       // b78-b81
+    'a1D'      // b82-b83      #29
+    'E'        // b84
+    'e1D'      // b85-b8a      #29
+    'bE'       // b8b-b8d
+    'b1D'      // b8e-b90      #29
+    'E'        // b91
+    'c1D'      // b92-b95      #29
+    'bE'       // b96-b98
+    'a1D'      // b99-b9a      #29
+    'E'        // b9b
+    '1D'       // b9c          #29
+    'E'        // b9d
+    'a1D'      // b9e-b9f      #29
+    'bE'       // ba0-ba2
+    'a1D'      // ba3-ba4      #29
+    'bE'       // ba5-ba7
+    'a1D'      // ba8-ba9      #29
+    '2J'       // baa          #61
+    'bE'       // bab-bad
+    'f1D'      // bae-bb4      #29
+    '2J'       // bb5          #61
+    'c1D'      // bb6-bb9      #29
+    'cE'       // bba-bbd
+    'd1D'      // bbe-bc2      #29
+    'bE'       // bc3-bc5
+    'b1D'      // bc6-bc8      #29
+    'E'        // bc9
+    'c1D'      // bca-bcd      #29
+    'aE'       // bce-bcf
+    '1D'       // bd0          #29
+    'eE'       // bd1-bd6
+    '1D'       // bd7          #29
+    'mE'       // bd8-be5
+    'l2J'      // be6-bf2      #61
+    'g1D'      // bf3-bfa      #29
+    'dE'       // bfb-bff
+    'l1P'      // c00-c0c      #41
+    'E'        // c0d
+    'b1P'      // c0e-c10      #41
+    'E'        // c11
+    'v1P'      // c12-c28      #41
+    'E'        // c29
+    'o1P'      // c2a-c39      #41
+    'bE'       // c3a-c3c
+    'g1P'      // c3d-c44      #41
+    'E'        // c45
+    'b1P'      // c46-c48      #41
+    'E'        // c49
+    'c1P'      // c4a-c4d      #41
+    'fE'       // c4e-c54
+    'a1P'      // c55-c56      #41
+    'E'        // c57
+    'b1P'      // c58-c5a      #41
+    'dE'       // c5b-c5f
+    'c1P'      // c60-c63      #41
+    'aE'       // c64-c65
+    'i1P'      // c66-c6f      #41
+    'fE'       // c70-c76
+    'h1P'      // c77-c7f      #41
+    'l1M'      // c80-c8c      #38
+    'E'        // c8d
+    'b1M'      // c8e-c90      #38
+    'E'        // c91
+    'v1M'      // c92-ca8      #38
+    'E'        // ca9
+    'i1M'      // caa-cb3      #38
+    'E'        // cb4
+    'd1M'      // cb5-cb9      #38
+    'aE'       // cba-cbb
+    'h1M'      // cbc-cc4      #38
+    'E'        // cc5
+    'b1M'      // cc6-cc8      #38
+    'E'        // cc9
+    'c1M'      // cca-ccd      #38
+    'fE'       // cce-cd4
+    'a1M'      // cd5-cd6      #38
+    'fE'       // cd7-cdd
+    '1M'       // cde          #38
+    'E'        // cdf
+    'c1M'      // ce0-ce3      #38
+    'aE'       // ce4-ce5
+    'i1M'      // ce6-cef      #38
+    'E'        // cf0
+    'a1M'      // cf1-cf2      #38
+    'lE'       // cf3-cff
+    'l2E'      // d00-d0c      #56
+    'E'        // d0d
+    'b2E'      // d0e-d10      #56
+    'E'        // d11
+    '1x2E'     // d12-d44      #56
+    'E'        // d45
+    'b2E'      // d46-d48      #56
+    'E'        // d49
+    'e2E'      // d4a-d4f      #56
+    'cE'       // d50-d53
+    'o2E'      // d54-d63      #56
+    'aE'       // d64-d65
+    'y2E'      // d66-d7f      #56
+    'E'        // d80
+    'b1N'      // d81-d83      #39
+    'E'        // d84
+    'q1N'      // d85-d96      #39
+    'bE'       // d97-d99
+    'w1N'      // d9a-db1      #39
+    'E'        // db2
+    'h1N'      // db3-dbb      #39
+    'E'        // dbc
+    '1N'       // dbd          #39
+    'aE'       // dbe-dbf
+    'f1N'      // dc0-dc6      #39
+    'bE'       // dc7-dc9
+    '1N'       // dca          #39
+    'cE'       // dcb-dce
+    'e1N'      // dcf-dd4      #39
+    'E'        // dd5
+    '1N'       // dd6          #39
+    'E'        // dd7
+    'g1N'      // dd8-ddf      #39
+    'eE'       // de0-de5
+    'i1N'      // de6-def      #39
+    'aE'       // df0-df1
+    'b1N'      // df2-df4      #39
+    'kE'       // df5-e00
+    '2e6Q'     // e01-e3a      #172
+    'cE'       // e3b-e3e
+    '1b6Q'     // e3f-e5b      #172
+    '1jE'      // e5c-e80
+    'a1Q'      // e81-e82      #42
+    'E'        // e83
+    '1Q'       // e84          #42
+    'E'        // e85
+    'd1Q'      // e86-e8a      #42
+    'E'        // e8b
+    'w1Q'      // e8c-ea3      #42
+    'E'        // ea4
+    '1Q'       // ea5          #42
+    'E'        // ea6
+    'v1Q'      // ea7-ebd      #42
+    'aE'       // ebe-ebf
+    'd1Q'      // ec0-ec4      #42
+    'E'        // ec5
+    '1Q'       // ec6          #42
+    'E'        // ec7
+    'f1Q'      // ec8-ece      #42
+    'E'        // ecf
+    'i1Q'      // ed0-ed9      #42
+    'aE'       // eda-edb
+    'c1Q'      // edc-edf      #42
+    '11aE'     // ee0-fff
+    '2k3F'     // 1000-103f    #83
+    'i10Q'     // 1040-1049    #276
+    '3g3F'     // 104a-109f    #83
+    '1k1S'     // 10a0-10c5    #44
+    'E'        // 10c6
+    '1S'       // 10c7         #44
+    'dE'       // 10c8-10cc
+    '1S'       // 10cd         #44
+    'aE'       // 10ce-10cf
+    '1u1S'     // 10d0-10ff    #44
+    '9uR'      // 1100-11ff    #17
+    '15yE'     // 1200-139f
+    '3g3Q'     // 13a0-13f5    #94
+    'aE'       // 13f6-13f7
+    'e3Q'      // 13f8-13fd    #94
+    'aE'       // 13fe-13ff
+    '24o3P'    // 1400-167f    #93
+    '1b11K'    // 1680-169c    #296
+    'bE'       // 169d-169f
+    '3j11U'    // 16a0-16f8    #306
+    'fE'       // 16f9-16ff
+    'u6L'      // 1700-1715    #167
+    'hE'       // 1716-171e
+    '6L'       // 171f         #167
+    't11E'     // 1720-1734    #290
+    'a10O'     // 1735-1736    #274
+    'hE'       // 1737-173f
+    's10N'     // 1740-1753    #273
+    'kE'       // 1754-175f
+    'l4G'      // 1760-176c    #110
+    'E'        // 176d
+    'b4G'      // 176e-1770    #110
+    'E'        // 1771
+    'a4G'      // 1772-1773    #110
+    'kE'       // 1774-177f
+    '3o3E'     // 1780-17dd    #82
+    'aE'       // 17de-17df
+    'i3E'      // 17e0-17e9    #82
+    'eE'       // 17ea-17ef
+    'i3E'      // 17f0-17f9    #82
+    'eE'       // 17fa-17ff
+    '2G'       // 1800         #58
+    'b5V'      // 1801-1803    #151
+    '2G'       // 1804         #58
+    '5V'       // 1805         #151
+    'h2G'      // 1806-180e    #58
+    'E'        // 180f
+    'i2G'      // 1810-1819    #58
+    'eE'       // 181a-181f
+    '3j2G'     // 1820-1878    #58
+    'fE'       // 1879-187f
+    '1p2G'     // 1880-18aa    #58
+    'dE'       // 18ab-18af
+    '2q3P'     // 18b0-18f5    #93
+    'iE'       // 18f6-18ff
+    '1d2Q'     // 1900-191e    #68
+    'E'        // 191f
+    'k2Q'      // 1920-192b    #68
+    'cE'       // 192c-192f
+    'k2Q'      // 1930-193b    #68
+    'cE'       // 193c-193f
+    '2Q'       // 1940         #68
+    'bE'       // 1941-1943
+    'k2Q'      // 1944-194f    #68
+    '1c6M'     // 1950-196d    #168
+    'aE'       // 196e-196f
+    'd6M'      // 1970-1974    #168
+    'jE'       // 1975-197f
+    '1q3G'     // 1980-19ab    #84
+    'cE'       // 19ac-19af
+    'y3G'      // 19b0-19c9    #84
+    'eE'       // 19ca-19cf
+    'j3G'      // 19d0-19da    #84
+    'bE'       // 19db-19dd
+    'a3G'      // 19de-19df    #84
+    '1e3E'     // 19e0-19ff    #82
+    '1a5C'     // 1a00-1a1b    #132
+    'aE'       // 1a1c-1a1d
+    'a5C'      // 1a1e-1a1f    #132
+    '2j2T'     // 1a20-1a5e    #71
+    'E'        // 1a5f
+    '1b2T'     // 1a60-1a7c    #71
+    'aE'       // 1a7d-1a7e
+    'j2T'      // 1a7f-1a89    #71
+    'eE'       // 1a8a-1a8f
+    'i2T'      // 1a90-1a99    #71
+    'eE'       // 1a9a-1a9f
+    'm2T'      // 1aa0-1aad    #71
+    'aE'       // 1aae-1aaf
+    'pL'       // 1ab0-1ac0    #11
+    '2jE'      // 1ac1-1aff
+    '2w4Y'     // 1b00-1b4b    #128
+    'cE'       // 1b4c-1b4f
+    '1r4Y'     // 1b50-1b7c    #128
+    'bE'       // 1b7d-1b7f
+    '2k6K'     // 1b80-1bbf    #166
+    '1y5B'     // 1bc0-1bf3    #131
+    'gE'       // 1bf4-1bfb
+    'c5B'      // 1bfc-1bff    #131
+    '2c3W'     // 1c00-1c37    #100
+    'bE'       // 1c38-1c3a
+    'n3W'      // 1c3b-1c49    #100
+    'bE'       // 1c4a-1c4c
+    'b3W'      // 1c4d-1c4f    #100
+    '1u11L'    // 1c50-1c7f    #297
+    'hL'       // 1c80-1c88    #11
+    'fE'       // 1c89-1c8f
+    '1p1S'     // 1c90-1cba    #44
+    'aE'       // 1cbb-1cbc
+    'b1S'      // 1cbd-1cbf    #44
+    'g6K'      // 1cc0-1cc7    #166
+    'gE'       // 1cc8-1ccf
+    '4O'       // 1cd0         #118
+    '1J'       // 1cd1         #35
+    '4O'       // 1cd2         #118
+    '2W'       // 1cd3         #74
+    '1J'       // 1cd4         #35
+    'a2A'      // 1cd5-1cd6    #52
+    '2X'       // 1cd7         #75
+    '2A'       // 1cd8         #52
+    '2X'       // 1cd9         #75
+    '8M'       // 1cda         #220
+    '1J'       // 1cdb         #35
+    'a2X'      // 1cdc-1cdd    #75
+    'a1J'      // 1cde-1cdf    #35
+    '2X'       // 1ce0         #75
+    '2A'       // 1ce1         #52
+    'g1J'      // 1ce2-1ce9    #35
+    '2A'       // 1cea         #52
+    'a1J'      // 1ceb-1cec    #35
+    '2A'       // 1ced         #52
+    'c1J'      // 1cee-1cf1    #35
+    '7V'       // 1cf2         #203
+    '2W'       // 1cf3         #74
+    '8H'       // 1cf4         #215
+    '7Y'       // 1cf5         #206
+    '2A'       // 1cf6         #52
+    '1E'       // 1cf7         #30
+    'a2W'      // 1cf8-1cf9    #74
+    'eE'       // 1cfa-1cff
+    '7vL'      // 1d00-1dcc    #11
+    '1O'       // 1dcd         #40
+    '1qL'      // 1dce-1df9    #11
+    'E'        // 1dfa
+    '9C'       // 1dfb         #236
+    '2mL'      // 1dfc-1e3d    #11
+    'aS'       // 1e3e-1e3f    #18
+    '2kL'      // 1e40-1e7f    #11
+    'eY'       // 1e80-1e85    #24
+    'wL'       // 1e86-1e9d    #11
+    'Y'        // 1e9e         #24
+    'L'        // 1e9f         #11
+    '3cS'      // 1ea0-1ef1    #18
+    'aV'       // 1ef2-1ef3    #21
+    'eS'       // 1ef4-1ef9    #18
+    '1aL'      // 1efa-1f15    #11
+    'aE'       // 1f16-1f17
+    'eL'       // 1f18-1f1d    #11
+    'aE'       // 1f1e-1f1f
+    '1kL'      // 1f20-1f45    #11
+    'aE'       // 1f46-1f47
+    'eL'       // 1f48-1f4d    #11
+    'aE'       // 1f4e-1f4f
+    'gL'       // 1f50-1f57    #11
+    'E'        // 1f58
+    'L'        // 1f59         #11
+    'E'        // 1f5a
+    'L'        // 1f5b         #11
+    'E'        // 1f5c
+    'L'        // 1f5d         #11
+    'E'        // 1f5e
+    '1dL'      // 1f5f-1f7d    #11
+    'aE'       // 1f7e-1f7f
+    '1zL'      // 1f80-1fb4    #11
+    'E'        // 1fb5
+    'nL'       // 1fb6-1fc4    #11
+    'E'        // 1fc5
+    'mL'       // 1fc6-1fd3    #11
+    'aE'       // 1fd4-1fd5
+    'eL'       // 1fd6-1fdb    #11
+    'E'        // 1fdc
+    'rL'       // 1fdd-1fef    #11
+    'aE'       // 1ff0-1ff1
+    'bL'       // 1ff2-1ff4    #11
+    'E'        // 1ff5
+    'hL'       // 1ff6-1ffe    #11
+    'E'        // 1fff
+    'L'        // 2000         #11
+    '2M'       // 2001         #64
+    'S'        // 2002         #18
+    '8P'       // 2003         #223
+    'fL'       // 2004-200a    #11
+    '7L'       // 200b         #193
+    '7N'       // 200c         #195
+    '6Z'       // 200d         #181
+    'a7Q'      // 200e-200f    #198
+    '7M'       // 2010         #194
+    '7O'       // 2011         #196
+    'S'        // 2012         #18
+    'aV'       // 2013-2014    #21
+    '3I'       // 2015         #86
+    'S'        // 2016         #18
+    'L'        // 2017         #11
+    'a4K'      // 2018-2019    #114
+    'V'        // 201a         #21
+    '4M'       // 201b         #116
+    'a4K'      // 201c-201d    #114
+    'V'        // 201e         #21
+    'L'        // 201f         #11
+    'a3I'      // 2020-2021    #86
+    'V'        // 2022         #21
+    'L'        // 2023         #11
+    '7R'       // 2024         #199
+    '8T'       // 2025         #227
+    '7G'       // 2026         #188
+    'S'        // 2027         #18
+    'eL'       // 2028-202d    #11
+    '4S'       // 202e         #122
+    '9A'       // 202f         #234
+    '3I'       // 2030         #86
+    'L'        // 2031         #11
+    'a1V'      // 2032-2033    #47
+    '1A'       // 2034         #26
+    '1V'       // 2035         #47
+    'a1A'      // 2036-2037    #26
+    'L'        // 2038         #11
+    'aV'       // 2039-203a    #21
+    'S'        // 203b         #18
+    '7B'       // 203c         #183
+    'dL'       // 203d-2041    #11
+    'S'        // 2042         #18
+    'L'        // 2043         #11
+    '7K'       // 2044         #192
+    'aL'       // 2045-2046    #11
+    'S'        // 2047         #18
+    '8S'       // 2048         #226
+    '7A'       // 2049         #182
+    'dL'       // 204a-204e    #11
+    '4N'       // 204f         #117
+    'L'        // 2050         #11
+    'S'        // 2051         #18
+    'L'        // 2052         #11
+    '1O'       // 2053         #40
+    'L'        // 2054         #11
+    '9I'       // 2055         #242
+    '1O'       // 2056         #40
+    '1A'       // 2057         #26
+    'a1O'      // 2058-2059    #40
+    '9E'       // 205a         #238
+    'aL'       // 205b-205c    #11
+    '8Z'       // 205d         #233
+    '9D'       // 205e         #237
+    'eL'       // 205f-2064    #11
+    'E'        // 2065
+    'kL'       // 2066-2071    #11
+    'aE'       // 2072-2073
+    '4R'       // 2074         #121
+    'lL'       // 2075-2081    #11
+    'b9J'      // 2082-2084    #243
+    'iL'       // 2085-208e    #11
+    'E'        // 208f
+    'lL'       // 2090-209c    #11
+    'bE'       // 209d-209f
+    'hL'       // 20a0-20a8    #11
+    'S'        // 20a9         #18
+    '8U'       // 20aa         #228
+    'S'        // 20ab         #18
+    'V'        // 20ac         #21
+    '8W'       // 20ad         #230
+    'jL'       // 20ae-20b8    #11
+    '7W'       // 20b9         #204
+    'cL'       // 20ba-20bd    #11
+    '8Q'       // 20be         #224
+    'L'        // 20bf         #11
+    'oE'       // 20c0-20cf
+    'jO'       // 20d0-20da    #14
+    '11I'      // 20db         #294
+    'O'        // 20dc         #14
+    '9V'       // 20dd         #255
+    '1B'       // 20de         #27
+    'aT'       // 20df-20e0    #19
+    'O'        // 20e1         #14
+    '4T'       // 20e2         #123
+    '9L'       // 20e3         #245
+    'T'        // 20e4         #19
+    'jO'       // 20e5-20ef    #14
+    '2W'       // 20f0         #74
+    'nE'       // 20f1-20ff
+    'S'        // 2100         #18
+    'L'        // 2101         #11
+    '1A'       // 2102         #26
+    'S'        // 2103         #18
+    'L'        // 2104         #11
+    'S'        // 2105         #18
+    'bL'       // 2106-2108    #11
+    'S'        // 2109         #18
+    '1V'       // 210a         #47
+    'c1A'      // 210b-210e    #26
+    'S'        // 210f         #18
+    'b1A'      // 2110-2112    #26
+    'S'        // 2113         #18
+    'L'        // 2114         #11
+    '1A'       // 2115         #26
+    'S'        // 2116         #18
+    'aL'       // 2117-2118    #11
+    'd1A'      // 2119-211d    #26
+    'bL'       // 211e-2120    #11
+    'S'        // 2121         #18
+    '3H'       // 2122         #85
+    'L'        // 2123         #11
+    '1A'       // 2124         #26
+    'L'        // 2125         #11
+    'aS'       // 2126-2127    #18
+    '1A'       // 2128         #26
+    'aL'       // 2129-212a    #11
+    'S'        // 212b         #18
+    'a1A'      // 212c-212d    #26
+    'S'        // 212e         #18
+    'b1A'      // 212f-2131    #26
+    'L'        // 2132         #11
+    'a1A'      // 2133-2134    #26
+    '1V'       // 2135         #47
+    'b1A'      // 2136-2138    #26
+    '6W'       // 2139         #178
+    'L'        // 213a         #11
+    'S'        // 213b         #18
+    'd1A'      // 213c-2140    #26
+    'cL'       // 2141-2144    #11
+    'd1A'      // 2145-2149    #26
+    'uL'       // 214a-215f    #11
+    'k1B'      // 2160-216b    #27
+    'cT'       // 216c-216f    #19
+    'k1B'      // 2170-217b    #27
+    'gT'       // 217c-2183    #19
+    'L'        // 2184         #11
+    'cT'       // 2185-2188    #19
+    'L'        // 2189         #11
+    'aT'       // 218a-218b    #19
+    'cE'       // 218c-218f
+    'c4U'      // 2190-2193    #124
+    'e9N'      // 2194-2199    #247
+    'nO'       // 219a-21a8    #14
+    'a9R'      // 21a9-21aa    #251
+    'cO'       // 21ab-21ae    #14
+    'M'        // 21af         #12
+    'gO'       // 21b0-21b7    #14
+    'aU'       // 21b8-21b9    #20
+    'iO'       // 21ba-21c3    #14
+    'bU'       // 21c4-21c6    #20
+    'cO'       // 21c7-21ca    #14
+    'aU'       // 21cb-21cc    #20
+    'bO'       // 21cd-21cf    #14
+    'U'        // 21d0         #20
+    'O'        // 21d1         #14
+    'U'        // 21d2         #20
+    'O'        // 21d3         #14
+    'U'        // 21d4         #20
+    'pO'       // 21d5-21e5    #14
+    'cW'       // 21e6-21e9    #22
+    'fM'       // 21ea-21f0    #12
+    'aO'       // 21f1-21f2    #14
+    'M'        // 21f3         #12
+    'O'        // 21f4         #14
+    'U'        // 21f5         #20
+    'iO'       // 21f6-21ff    #14
+    'U'        // 2200         #20
+    'O'        // 2201         #14
+    'aU'       // 2202-2203    #20
+    'O'        // 2204         #14
+    'fU'       // 2205-220b    #20
+    'bO'       // 220c-220e    #14
+    'U'        // 220f         #20
+    'O'        // 2210         #14
+    'U'        // 2211         #20
+    '1H'       // 2212         #33
+    'U'        // 2213         #20
+    'O'        // 2214         #14
+    '1V'       // 2215         #47
+    'aO'       // 2216-2217    #14
+    '2N'       // 2218         #65
+    '10A'      // 2219         #260
+    'U'        // 221a         #20
+    'aO'       // 221b-221c    #14
+    'cU'       // 221d-2220    #20
+    'aO'       // 2221-2222    #14
+    'U'        // 2223         #20
+    'O'        // 2224         #14
+    'iU'       // 2225-222e    #20
+    'dO'       // 222f-2233    #14
+    'cU'       // 2234-2237    #20
+    'dO'       // 2238-223c    #14
+    'U'        // 223d         #20
+    'dO'       // 223e-2242    #14
+    'U'        // 2243         #20
+    'O'        // 2244         #14
+    'U'        // 2245         #20
+    'aO'       // 2246-2247    #14
+    'U'        // 2248         #20
+    'bO'       // 2249-224b    #14
+    'U'        // 224c         #20
+    'rO'       // 224d-225f    #14
+    'bU'       // 2260-2262    #20
+    'O'        // 2263         #14
+    'cU'       // 2264-2267    #20
+    'aO'       // 2268-2269    #14
+    'aU'       // 226a-226b    #20
+    'aO'       // 226c-226d    #14
+    'aU'       // 226e-226f    #20
+    'aO'       // 2270-2271    #14
+    'aU'       // 2272-2273    #20
+    'aO'       // 2274-2275    #14
+    'aU'       // 2276-2277    #20
+    'iO'       // 2278-2281    #14
+    'eU'       // 2282-2287    #20
+    'aO'       // 2288-2289    #14
+    'aU'       // 228a-228b    #20
+    'hO'       // 228c-2294    #14
+    'cU'       // 2295-2298    #20
+    '2B'       // 2299         #53
+    'eO'       // 229a-229f    #14
+    'U'        // 22a0         #20
+    'cO'       // 22a1-22a4    #14
+    'U'        // 22a5         #20
+    'xO'       // 22a6-22be    #14
+    'U'        // 22bf         #20
+    'cO'       // 22c0-22c3    #14
+    'b2N'      // 22c4-22c6    #65
+    'rO'       // 22c7-22d9    #14
+    'aU'       // 22da-22db    #20
+    'rO'       // 22dc-22ee    #14
+    'U'        // 22ef         #20
+    'oO'       // 22f0-22ff    #14
+    'dT'       // 2300-2304    #19
+    'b1B'      // 2305-2307    #27
+    'c2H'      // 2308-230b    #59
+    'cT'       // 230c-230f    #19
+    'O'        // 2310         #14
+    'T'        // 2311         #19
+    '1B'       // 2312         #27
+    'bT'       // 2313-2315    #19
+    'M'        // 2316         #12
+    'T'        // 2317         #19
+    'W'        // 2318         #22
+    'O'        // 2319         #14
+    'aN'       // 231a-231b    #13
+    'c2H'      // 231c-231f    #59
+    'aO'       // 2320-2321    #14
+    'aT'       // 2322-2323    #19
+    'cM'       // 2324-2327    #12
+    'N'        // 2328         #13
+    'a1B'      // 2329-232a    #27
+    'M'        // 232b         #12
+    'iT'       // 232c-2335    #19
+    '2pO'      // 2336-237a    #14
+    'M'        // 237b         #12
+    '2H'       // 237c         #59
+    'bM'       // 237d-237f    #12
+    'sT'       // 2380-2393    #19
+    '4T'       // 2394         #123
+    'O'        // 2395         #14
+    'dT'       // 2396-239a    #19
+    'sO'       // 239b-23ae    #14
+    '2H'       // 23af         #59
+    'aU'       // 23b0-23b1    #20
+    'dO'       // 23b2-23b6    #14
+    'fE'       // 23b7-23bd
+    'n1B'      // 23be-23cc    #27
+    'T'        // 23cd         #19
+    'W'        // 23ce         #22
+    'N'        // 23cf         #13
+    '2H'       // 23d0         #59
+    'hT'       // 23d1-23d9    #19
+    'a1B'      // 23da-23db    #27
+    'eO'       // 23dc-23e1    #14
+    'fT'       // 23e2-23e8    #19
+    'aN'       // 23e9-23ea    #13
+    'aP'       // 23eb-23ec    #15
+    'bN'       // 23ed-23ef    #13
+    'P'        // 23f0         #15
+    'bN'       // 23f1-23f3    #13
+    'cM'       // 23f4-23f7    #12
+    'bN'       // 23f8-23fa    #13
+    '1mM'      // 23fb-2422    #12
+    'W'        // 2423         #22
+    'bM'       // 2424-2426    #12
+    'xE'       // 2427-243f
+    'jM'       // 2440-244a    #12
+    'tE'       // 244b-245f
+    's9X'      // 2460-2473    #257
+    'a4U'      // 2474-2475    #124
+    '2w1B'     // 2476-24c1    #27
+    '1W'       // 24c2         #48
+    '2h1B'     // 24c3-24ff    #27
+    '6cA'      // 2500-259f    #0
+    'iW'       // 25a0-25a9    #22
+    'a1I'      // 25aa-25ab    #34
+    'bM'       // 25ac-25ae    #12
+    '2N'       // 25af         #65
+    'M'        // 25b0         #12
+    'aW'       // 25b1-25b2    #22
+    '2B'       // 25b3         #53
+    'aM'       // 25b4-25b5    #12
+    '1I'       // 25b6         #34
+    '2B'       // 25b7         #53
+    'cM'       // 25b8-25bb    #12
+    'W'        // 25bc         #22
+    '2B'       // 25bd         #53
+    'aM'       // 25be-25bf    #12
+    '1I'       // 25c0         #34
+    '2B'       // 25c1         #53
+    'cM'       // 25c2-25c5    #12
+    'aW'       // 25c6-25c7    #22
+    'M'        // 25c8         #12
+    'W'        // 25c9         #22
+    '2B'       // 25ca         #53
+    'W'        // 25cb         #22
+    '7I'       // 25cc         #190
+    'M'        // 25cd         #12
+    'eW'       // 25ce-25d3    #22
+    'mM'       // 25d4-25e1    #12
+    'dW'       // 25e2-25e6    #22
+    'gM'       // 25e7-25ee    #12
+    'W'        // 25ef         #22
+    'jM'       // 25f0-25fa    #12
+    '9P'       // 25fb         #249
+    'bN'       // 25fc-25fe    #13
+    'M'        // 25ff         #12
+    'c1I'      // 2600-2603    #34
+    'N'        // 2604         #13
+    'aW'       // 2605-2606    #22
+    'aM'       // 2607-2608    #12
+    'W'        // 2609         #22
+    'cT'       // 260a-260d    #19
+    '1I'       // 260e         #34
+    'W'        // 260f         #22
+    'M'        // 2610         #12
+    'N'        // 2611         #13
+    'M'        // 2612         #12
+    'T'        // 2613         #19
+    'aN'       // 2614-2615    #13
+    'aW'       // 2616-2617    #22
+    'N'        // 2618         #13
+    'bM'       // 2619-261b    #12
+    'W'        // 261c         #22
+    '1I'       // 261d         #34
+    'aW'       // 261e-261f    #22
+    '9O'       // 2620         #248
+    'M'        // 2621         #12
+    'aN'       // 2622-2623    #13
+    'aT'       // 2624-2625    #19
+    '1C'       // 2626         #28
+    'bT'       // 2627-2629    #19
+    '1C'       // 262a         #28
+    'T'        // 262b         #19
+    '9W'       // 262c         #256
+    'T'        // 262d         #19
+    '1C'       // 262e         #28
+    '1W'       // 262f         #48
+    'gM'       // 2630-2637    #12
+    'b1C'      // 2638-263a    #28
+    'T'        // 263b         #19
+    'M'        // 263c         #12
+    'bT'       // 263d-263f    #19
+    '1W'       // 2640         #48
+    '1B'       // 2641         #27
+    '1W'       // 2642         #48
+    'dT'       // 2643-2647    #19
+    'k1C'      // 2648-2653    #28
+    'jM'       // 2654-265e    #12
+    'N'        // 265f         #13
+    '1I'       // 2660         #34
+    'aW'       // 2661-2662    #22
+    '1I'       // 2663         #34
+    'W'        // 2664         #22
+    'a1I'      // 2665-2666    #34
+    'W'        // 2667         #22
+    '1I'       // 2668         #34
+    'c9U'      // 2669-266c    #254
+    'b9T'      // 266d-266f    #253
+    'a9Y'      // 2670-2671    #258
+    'h1B'      // 2672-267a    #27
+    '1W'       // 267b         #48
+    'a1B'      // 267c-267d    #27
+    '1C'       // 267e         #28
+    'N'        // 267f         #13
+    'oM'       // 2680-268f    #12
+    'aT'       // 2690-2691    #19
+    'e1C'      // 2692-2697    #28
+    'T'        // 2698         #19
+    '1C'       // 2699         #28
+    'T'        // 269a         #19
+    'a1C'      // 269b-269c    #28
+    'T'        // 269d         #19
+    'aM'       // 269e-269f    #12
+    '1I'       // 26a0         #34
+    'N'        // 26a1         #13
+    'dT'       // 26a2-26a6    #19
+    '1C'       // 26a7         #28
+    'aT'       // 26a8-26a9    #19
+    'aN'       // 26aa-26ab    #13
+    'M'        // 26ac         #12
+    'bT'       // 26ad-26af    #19
+    'a1C'      // 26b0-26b1    #28
+    'jT'       // 26b2-26bc    #19
+    'a1I'      // 26bd-26be    #34
+    'dM'       // 26bf-26c3    #12
+    'aN'       // 26c4-26c5    #13
+    'aM'       // 26c6-26c7    #12
+    'N'        // 26c8         #13
+    'dM'       // 26c9-26cd    #12
+    '1C'       // 26ce         #28
+    'N'        // 26cf         #13
+    'M'        // 26d0         #12
+    'N'        // 26d1         #13
+    'M'        // 26d2         #12
+    'aN'       // 26d3-26d4    #13
+    'lM'       // 26d5-26e1    #12
+    'fT'       // 26e2-26e8    #19
+    'a1C'      // 26e9-26ea    #28
+    'dT'       // 26eb-26ef    #19
+    'e1C'      // 26f0-26f5    #28
+    'T'        // 26f6         #19
+    'c1C'      // 26f7-26fa    #28
+    'aT'       // 26fb-26fc    #19
+    '1C'       // 26fd         #28
+    'aT'       // 26fe-26ff    #19
+    'aM'       // 2700-2701    #12
+    '1I'       // 2702         #34
+    'aM'       // 2703-2704    #12
+    'P'        // 2705         #15
+    'aM'       // 2706-2707    #12
+    'aN'       // 2708-2709    #13
+    'P'        // 270a         #15
+    'bN'       // 270b-270d    #13
+    'M'        // 270e         #12
+    'N'        // 270f         #13
+    'aM'       // 2710-2711    #12
+    'N'        // 2712         #13
+    'W'        // 2713         #22
+    'N'        // 2714         #13
+    'M'        // 2715         #12
+    'N'        // 2716         #13
+    'bM'       // 2717-2719    #12
+    'W'        // 271a         #22
+    'aM'       // 271b-271c    #12
+    '9M'       // 271d         #246
+    'bT'       // 271e-2720    #19
+    '1C'       // 2721         #28
+    'eM'       // 2722-2727    #12
+    'P'        // 2728         #15
+    'iM'       // 2729-2732    #12
+    'aN'       // 2733-2734    #13
+    'gM'       // 2735-273c    #12
+    'W'        // 273d         #22
+    'M'        // 273e         #12
+    'aW'       // 273f-2740    #22
+    'bM'       // 2741-2743    #12
+    'N'        // 2744         #13
+    'aM'       // 2745-2746    #12
+    'N'        // 2747         #13
+    'cM'       // 2748-274b    #12
+    'P'        // 274c         #15
+    'M'        // 274d         #12
+    'P'        // 274e         #15
+    'cM'       // 274f-2752    #12
+    'N'        // 2753         #13
+    'aP'       // 2754-2755    #15
+    'W'        // 2756         #22
+    'N'        // 2757         #13
+    'jM'       // 2758-2762    #12
+    'aN'       // 2763-2764    #13
+    'pM'       // 2765-2775    #12
+    '1c1B'     // 2776-2793    #27
+    'M'        // 2794         #12
+    'bP'       // 2795-2797    #15
+    'hM'       // 2798-27a0    #12
+    '1I'       // 27a1         #34
+    'mM'       // 27a2-27af    #12
+    'P'        // 27b0         #15
+    'mM'       // 27b1-27be    #12
+    'P'        // 27bf         #15
+    '2kO'      // 27c0-27ff    #14
+    '9uM'      // 2800-28ff    #12
+    '1fO'      // 2900-2920    #14
+    'a2H'      // 2921-2922    #59
+    'pO'       // 2923-2933    #14
+    'a9Q'      // 2934-2935    #250
+    '2vO'      // 2936-2980    #14
+    '2N'       // 2981         #65
+    '2hO'      // 2982-29be    #14
+    '2B'       // 29bf         #53
+    '1pO'      // 29c0-29ea    #14
+    '2N'       // 29eb         #65
+    'mO'       // 29ec-29f9    #14
+    'aU'       // 29fa-29fb    #20
+    '9yO'      // 29fc-2aff    #14
+    'dM'       // 2b00-2b04    #12
+    'b1I'      // 2b05-2b07    #34
+    'eM'       // 2b08-2b0d    #12
+    'cO'       // 2b0e-2b11    #14
+    'gM'       // 2b12-2b19    #12
+    'W'        // 2b1a         #22
+    'aN'       // 2b1b-2b1c    #13
+    'rM'       // 2b1d-2b2f    #12
+    '1bO'      // 2b30-2b4c    #14
+    'bM'       // 2b4d-2b4f    #12
+    'N'        // 2b50         #13
+    'cM'       // 2b51-2b54    #12
+    'N'        // 2b55         #13
+    '1cM'      // 2b56-2b73    #12
+    'aE'       // 2b74-2b75
+    '1dM'      // 2b76-2b94    #12
+    'W'        // 2b95         #22
+    'E'        // 2b96
+    '3xM'      // 2b97-2bfd    #12
+    'O'        // 2bfe         #14
+    'M'        // 2bff         #12
+    '1t2C'     // 2c00-2c2e    #54
+    'E'        // 2c2f
+    '1t2C'     // 2c30-2c5e    #54
+    'E'        // 2c5f
+    '1eL'      // 2c60-2c7f    #11
+    '4k3R'     // 2c80-2cf3    #95
+    'dE'       // 2cf4-2cf8
+    'f3R'      // 2cf9-2cff    #95
+    '1k1S'     // 2d00-2d25    #44
+    'E'        // 2d26
+    '1S'       // 2d27         #44
+    'dE'       // 2d28-2d2c
+    '1S'       // 2d2d         #44
+    'aE'       // 2d2e-2d2f
+    '2c4H'     // 2d30-2d67    #111
+    'fE'       // 2d68-2d6e
+    'a4H'      // 2d6f-2d70    #111
+    'mE'       // 2d71-2d7e
+    '4H'       // 2d7f         #111
+    '3qE'      // 2d80-2ddf
+    '2bL'      // 2de0-2e16    #11
+    '1O'       // 2e17         #40
+    'cL'       // 2e18-2e1b    #11
+    'a9B'      // 2e1c-2e1d    #235
+    'iL'       // 2e1e-2e27    #11
+    'a4M'      // 2e28-2e29    #116
+    'eL'       // 2e2a-2e2f    #11
+    'a7S'      // 2e30-2e31    #200
+    'L'        // 2e32         #11
+    'a1O'      // 2e33-2e34    #40
+    'dL'       // 2e35-2e39    #11
+    'aS'       // 2e3a-2e3b    #18
+    '2M'       // 2e3c         #64
+    'bL'       // 2e3d-2e3f    #11
+    '2M'       // 2e40         #64
+    '4N'       // 2e41         #117
+    'pL'       // 2e42-2e52    #11
+    '1rE'      // 2e53-2e7f
+    'yA'       // 2e80-2e99    #0
+    'E'        // 2e9a
+    '3jA'      // 2e9b-2ef3    #0
+    'kE'       // 2ef4-2eff
+    '8eA'      // 2f00-2fd5    #0
+    'yE'       // 2fd6-2fef
+    'kA'       // 2ff0-2ffb    #0
+    'cE'       // 2ffc-2fff
+    '3S'       // 3000         #96
+    'a10Z'     // 3001-3002    #285
+    'cA'       // 3003-3006    #0
+    '11C'      // 3007         #288
+    'a11B'     // 3008-3009    #287
+    'a10Y'     // 300a-300b    #284
+    'c11A'     // 300c-300f    #286
+    'a5G'      // 3010-3011    #136
+    'aA'       // 3012-3013    #0
+    'g5G'      // 3014-301b    #136
+    'sA'       // 301c-302f    #0
+    '1R'       // 3030         #43
+    'kA'       // 3031-303c    #0
+    '1R'       // 303d         #43
+    'aA'       // 303e-303f    #0
+    'E'        // 3040
+    '3gA'      // 3041-3096    #0
+    'aE'       // 3097-3098
+    '3sA'      // 3099-30fa    #0
+    '3T'       // 30fb         #97
+    'cA'       // 30fc-30ff    #0
+    'dE'       // 3100-3104
+    '1pA'      // 3105-312f    #0
+    'E'        // 3130
+    '1xA'      // 3131-3163    #0
+    'R'        // 3164         #17
+    '1oA'      // 3165-318e    #0
+    'E'        // 318f
+    '1qA'      // 3190-31bb    #0
+    'cE'       // 31bc-31bf
+    '1iA'      // 31c0-31e3    #0
+    'kE'       // 31e4-31ef
+    '1tA'      // 31f0-321e    #0
+    'E'        // 321f
+    '4nA'      // 3220-3296    #0
+    '1R'       // 3297         #43
+    'A'        // 3298         #0
+    '1R'       // 3299         #43
+    '5oA'      // 329a-332b    #0
+    'E'        // 332c
+    '8bA'      // 332d-33ff    #0
+    'aD'       // 3400-3401    #3
+    'F'        // 3402         #5
+    'aD'       // 3403-3404    #3
+    'aF'       // 3405-3406    #5
+    '1eD'      // 3407-3426    #3
+    'F'        // 3427         #5
+    'cD'       // 3428-342b    #3
+    'F'        // 342c         #5
+    'D'        // 342d         #3
+    'F'        // 342e         #5
+    'eD'       // 342f-3434    #3
+    'B'        // 3435         #1
+    'iD'       // 3436-343f    #3
+    'B'        // 3440         #1
+    'hD'       // 3441-3449    #3
+    'B'        // 344a         #1
+    'D'        // 344b         #3
+    'B'        // 344c         #1
+    'vD'       // 344d-3463    #3
+    'B'        // 3464         #1
+    'bD'       // 3465-3467    #3
+    'F'        // 3468         #5
+    'D'        // 3469         #3
+    'F'        // 346a         #5
+    'gD'       // 346b-3472    #3
+    'B'        // 3473         #1
+    'eD'       // 3474-3479    #3
+    'B'        // 347a         #1
+    'aD'       // 347b-347c    #3
+    'aB'       // 347d-347e    #1
+    'hD'       // 347f-3487    #3
+    'F'        // 3488         #5
+    'hD'       // 3489-3491    #3
+    'F'        // 3492         #5
+    'B'        // 3493         #1
+    'aD'       // 3494-3495    #3
+    'B'        // 3496         #1
+    'bD'       // 3497-3499    #3
+    'K'        // 349a         #10
+    'iD'       // 349b-34a4    #3
+    'B'        // 34a5         #1
+    'hD'       // 34a6-34ae    #3
+    'B'        // 34af         #1
+    'dD'       // 34b0-34b4    #3
+    'F'        // 34b5         #5
+    'eD'       // 34b6-34bb    #3
+    'C'        // 34bc         #2
+    'cD'       // 34bd-34c0    #3
+    'C'        // 34c1         #2
+    'dD'       // 34c2-34c6    #3
+    'F'        // 34c7         #5
+    'B'        // 34c8         #1
+    'mD'       // 34c9-34d6    #3
+    'K'        // 34d7         #10
+    'bD'       // 34d8-34da    #3
+    'F'        // 34db         #5
+    'bD'       // 34dc-34de    #3
+    'B'        // 34df         #1
+    'cD'       // 34e0-34e3    #3
+    'B'        // 34e4         #1
+    'D'        // 34e5         #3
+    'B'        // 34e6         #1
+    'sD'       // 34e7-34fa    #3
+    'B'        // 34fb         #1
+    'iD'       // 34fc-3505    #3
+    'B'        // 3506         #1
+    'mD'       // 3507-3514    #3
+    'K'        // 3515         #10
+    'hD'       // 3516-351e    #3
+    'F'        // 351f         #5
+    'D'        // 3520         #3
+    'K'        // 3521         #10
+    '1aD'      // 3522-353d    #3
+    'A'        // 353e         #0
+    'qD'       // 353f-3550    #3
+    'B'        // 3551         #1
+    'D'        // 3552         #3
+    'B'        // 3553         #1
+    'dD'       // 3554-3558    #3
+    'B'        // 3559         #1
+    'bD'       // 355a-355c    #3
+    'aF'       // 355d-355e    #5
+    'aD'       // 355f-3560    #3
+    'B'        // 3561         #1
+    'D'        // 3562         #3
+    'F'        // 3563         #5
+    'hD'       // 3564-356c    #3
+    'B'        // 356d         #1
+    'F'        // 356e         #5
+    'D'        // 356f         #3
+    'B'        // 3570         #1
+    'D'        // 3571         #3
+    'B'        // 3572         #1
+    'cD'       // 3573-3576    #3
+    'aB'       // 3577-3578    #1
+    'jD'       // 3579-3583    #3
+    'B'        // 3584         #1
+    'qD'       // 3585-3596    #3
+    'aB'       // 3597-3598    #1
+    'gD'       // 3599-35a0    #3
+    'B'        // 35a1         #1
+    'bD'       // 35a2-35a4    #3
+    'B'        // 35a5         #1
+    'F'        // 35a6         #5
+    'D'        // 35a7         #3
+    'F'        // 35a8         #5
+    'cD'       // 35a9-35ac    #3
+    'B'        // 35ad         #1
+    'pD'       // 35ae-35be    #3
+    'B'        // 35bf         #1
+    'D'        // 35c0         #3
+    'B'        // 35c1         #1
+    'bD'       // 35c2-35c4    #3
+    'C'        // 35c5         #2
+    'D'        // 35c6         #3
+    'B'        // 35c7         #1
+    'aD'       // 35c8-35c9    #3
+    'B'        // 35ca         #1
+    'bD'       // 35cb-35cd    #3
+    'B'        // 35ce         #1
+    'bD'       // 35cf-35d1    #3
+    'B'        // 35d2         #1
+    'bD'       // 35d3-35d5    #3
+    'B'        // 35d6         #1
+    'bD'       // 35d7-35d9    #3
+    'F'        // 35da         #5
+    'B'        // 35db         #1
+    'D'        // 35dc         #3
+    'B'        // 35dd         #1
+    'F'        // 35de         #5
+    'qD'       // 35df-35f0    #3
+    'bB'       // 35f1-35f3    #1
+    'F'        // 35f4         #5
+    'eD'       // 35f5-35fa    #3
+    'B'        // 35fb         #1
+    'aD'       // 35fc-35fd    #3
+    'B'        // 35fe         #1
+    'K'        // 35ff         #10
+    'dD'       // 3600-3604    #3
+    'F'        // 3605         #5
+    'bD'       // 3606-3608    #3
+    'B'        // 3609         #1
+    'iD'       // 360a-3613    #3
+    'F'        // 3614         #5
+    'bD'       // 3615-3617    #3
+    'B'        // 3618         #1
+    'D'        // 3619         #3
+    'B'        // 361a         #1
+    'gD'       // 361b-3622    #3
+    'B'        // 3623         #1
+    'D'        // 3624         #3
+    'B'        // 3625         #1
+    'fD'       // 3626-362c    #3
+    'B'        // 362d         #1
+    'fD'       // 362e-3634    #3
+    'B'        // 3635         #1
+    'bD'       // 3636-3638    #3
+    'B'        // 3639         #1
+    'cD'       // 363a-363d    #3
+    'B'        // 363e         #1
+    'gD'       // 363f-3646    #3
+    'bB'       // 3647-3649    #1
+    'F'        // 364a         #5
+    'bD'       // 364b-364d    #3
+    'B'        // 364e         #1
+    'oD'       // 364f-365e    #3
+    'B'        // 365f         #1
+    'D'        // 3660         #3
+    'B'        // 3661         #1
+    'lD'       // 3662-366e    #3
+    'K'        // 366f         #10
+    'iD'       // 3670-3679    #3
+    'B'        // 367a         #1
+    'eD'       // 367b-3680    #3
+    'B'        // 3681         #1
+    'nD'       // 3682-3690    #3
+    'F'        // 3691         #5
+    'cD'       // 3692-3695    #3
+    'F'        // 3696         #5
+    'aD'       // 3697-3698    #3
+    'F'        // 3699         #5
+    'B'        // 369a         #1
+    'iD'       // 369b-36a4    #3
+    'B'        // 36a5         #1
+    'cD'       // 36a6-36a9    #3
+    'B'        // 36aa         #1
+    'D'        // 36ab         #3
+    'B'        // 36ac         #1
+    'bD'       // 36ad-36af    #3
+    'aB'       // 36b0-36b1    #1
+    'bD'       // 36b2-36b4    #3
+    'B'        // 36b5         #1
+    'bD'       // 36b6-36b8    #3
+    'B'        // 36b9         #1
+    'aD'       // 36ba-36bb    #3
+    'B'        // 36bc         #1
+    'cD'       // 36bd-36c0    #3
+    'B'        // 36c1         #1
+    'D'        // 36c2         #3
+    'bI'       // 36c3-36c5    #8
+    'D'        // 36c6         #3
+    'aB'       // 36c7-36c8    #1
+    'eD'       // 36c9-36ce    #3
+    'F'        // 36cf         #5
+    'bD'       // 36d0-36d2    #3
+    'aB'       // 36d3-36d4    #1
+    'D'        // 36d5         #3
+    'B'        // 36d6         #1
+    'eD'       // 36d7-36dc    #3
+    'B'        // 36dd         #1
+    'bD'       // 36de-36e0    #3
+    'aB'       // 36e1-36e2    #1
+    'aD'       // 36e3-36e4    #3
+    'B'        // 36e5         #1
+    'I'        // 36e6         #8
+    'mD'       // 36e7-36f4    #3
+    'B'        // 36f5         #1
+    'jD'       // 36f6-3700    #3
+    'B'        // 3701         #1
+    'D'        // 3702         #3
+    'B'        // 3703         #1
+    'cD'       // 3704-3707    #3
+    'B'        // 3708         #1
+    'D'        // 3709         #3
+    'B'        // 370a         #1
+    'aD'       // 370b-370c    #3
+    'B'        // 370d         #1
+    'mD'       // 370e-371b    #3
+    'B'        // 371c         #1
+    'dD'       // 371d-3721    #3
+    'B'        // 3722         #1
+    'I'        // 3723         #8
+    'D'        // 3724         #3
+    'B'        // 3725         #1
+    'eD'       // 3726-372b    #3
+    'aB'       // 372c-372d    #1
+    'D'        // 372e         #3
+    'K'        // 372f         #10
+    'B'        // 3730         #1
+    'D'        // 3731         #3
+    'aB'       // 3732-3733    #1
+    'eD'       // 3734-3739    #3
+    'I'        // 373a         #8
+    'dD'       // 373b-373f    #3
+    'B'        // 3740         #1
+    'aD'       // 3741-3742    #3
+    'B'        // 3743         #1
+    '1bD'      // 3744-3760    #3
+    'F'        // 3761         #5
+    'C'        // 3762         #2
+    'gD'       // 3763-376a    #3
+    'aF'       // 376b-376c    #5
+    'aD'       // 376d-376e    #3
+    'B'        // 376f         #1
+    'dD'       // 3770-3774    #3
+    'F'        // 3775         #5
+    'vD'       // 3776-378c    #3
+    'F'        // 378d         #5
+    'hD'       // 378e-3796    #3
+    'B'        // 3797         #1
+    'gD'       // 3798-379f    #3
+    'B'        // 37a0         #1
+    'wD'       // 37a1-37b8    #3
+    'B'        // 37b9         #1
+    'aD'       // 37ba-37bb    #3
+    'K'        // 37bc         #10
+    'D'        // 37bd         #3
+    'B'        // 37be         #1
+    'aD'       // 37bf-37c0    #3
+    'F'        // 37c1         #5
+    'sD'       // 37c2-37d5    #3
+    'B'        // 37d6         #1
+    'jD'       // 37d7-37e1    #3
+    'F'        // 37e2         #5
+    'dD'       // 37e3-37e7    #3
+    'F'        // 37e8         #5
+    'hD'       // 37e9-37f1    #3
+    'B'        // 37f2         #1
+    'D'        // 37f3         #3
+    'F'        // 37f4         #5
+    'bD'       // 37f5-37f7    #3
+    'B'        // 37f8         #1
+    'aD'       // 37f9-37fa    #3
+    'B'        // 37fb         #1
+    'D'        // 37fc         #3
+    'F'        // 37fd         #5
+    'aD'       // 37fe-37ff    #3
+    'F'        // 3800         #5
+    'jD'       // 3801-380b    #3
+    'K'        // 380c         #10
+    'aD'       // 380d-380e    #3
+    'B'        // 380f         #1
+    'gD'       // 3810-3817    #3
+    'K'        // 3818         #10
+    'B'        // 3819         #1
+    'eD'       // 381a-381f    #3
+    'B'        // 3820         #1
+    'kD'       // 3821-382c    #3
+    'B'        // 382d         #1
+    'D'        // 382e         #3
+    'F'        // 382f         #5
+    'eD'       // 3830-3835    #3
+    'C'        // 3836         #2
+    'D'        // 3837         #3
+    'B'        // 3838         #1
+    'fD'       // 3839-383f    #3
+    'F'        // 3840         #5
+    'zD'       // 3841-385b    #3
+    'F'        // 385c         #5
+    'cD'       // 385d-3860    #3
+    'F'        // 3861         #5
+    'D'        // 3862         #3
+    'B'        // 3863         #1
+    'pD'       // 3864-3874    #3
+    'B'        // 3875         #1
+    'lD'       // 3876-3882    #3
+    'K'        // 3883         #10
+    '1aD'      // 3884-389f    #3
+    'B'        // 38a0         #1
+    'F'        // 38a1         #5
+    'jD'       // 38a2-38ac    #3
+    'F'        // 38ad         #5
+    'kD'       // 38ae-38b9    #3
+    'K'        // 38ba         #10
+    'gD'       // 38bb-38c2    #3
+    'B'        // 38c3         #1
+    'gD'       // 38c4-38cb    #3
+    'B'        // 38cc         #1
+    'cD'       // 38cd-38d0    #3
+    'B'        // 38d1         #1
+    'aD'       // 38d2-38d3    #3
+    'B'        // 38d4         #1
+    'qD'       // 38d5-38e6    #3
+    'K'        // 38e7         #10
+    'qD'       // 38e8-38f9    #3
+    'C'        // 38fa         #2
+    'aD'       // 38fb-38fc    #3
+    'K'        // 38fd         #10
+    'iD'       // 38fe-3907    #3
+    'B'        // 3908         #1
+    'jD'       // 3909-3913    #3
+    'B'        // 3914         #1
+    'aD'       // 3915-3916    #3
+    'F'        // 3917         #5
+    'aD'       // 3918-3919    #3
+    'F'        // 391a         #5
+    'kD'       // 391b-3926    #3
+    'B'        // 3927         #1
+    'iD'       // 3928-3931    #3
+    'B'        // 3932         #1
+    'kD'       // 3933-393e    #3
+    'B'        // 393f         #1
+    'lD'       // 3940-394c    #3
+    'B'        // 394d         #1
+    'qD'       // 394e-395f    #3
+    'K'        // 3960         #10
+    'aD'       // 3961-3962    #3
+    'B'        // 3963         #1
+    'D'        // 3964         #3
+    'K'        // 3965         #10
+    'hD'       // 3966-396e    #3
+    'F'        // 396f         #5
+    'gD'       // 3970-3977    #3
+    'B'        // 3978         #1
+    'fD'       // 3979-397f    #3
+    'B'        // 3980         #1
+    'aD'       // 3981-3982    #3
+    'K'        // 3983         #10
+    'dD'       // 3984-3988    #3
+    'aB'       // 3989-398a    #1
+    'dD'       // 398b-398f    #3
+    'K'        // 3990         #10
+    'D'        // 3991         #3
+    'B'        // 3992         #1
+    'eD'       // 3993-3998    #3
+    'B'        // 3999         #1
+    'D'        // 399a         #3
+    'B'        // 399b         #1
+    'dD'       // 399c-39a0    #3
+    'B'        // 39a1         #1
+    'aD'       // 39a2-39a3    #3
+    'C'        // 39a4         #2
+    'K'        // 39a5         #10
+    'oD'       // 39a6-39b5    #3
+    'K'        // 39b6         #10
+    'D'        // 39b7         #3
+    'C'        // 39b8         #2
+    '1hD'      // 39b9-39db    #3
+    'B'        // 39dc         #1
+    'dD'       // 39dd-39e1    #3
+    'B'        // 39e2         #1
+    'aD'       // 39e3-39e4    #3
+    'B'        // 39e5         #1
+    'eD'       // 39e6-39eb    #3
+    'B'        // 39ec         #1
+    'jD'       // 39ed-39f7    #3
+    'B'        // 39f8         #1
+    'aD'       // 39f9-39fa    #3
+    'B'        // 39fb         #1
+    'aD'       // 39fc-39fd    #3
+    'B'        // 39fe         #1
+    'aD'       // 39ff-3a00    #3
+    'B'        // 3a01         #1
+    'D'        // 3a02         #3
+    'B'        // 3a03         #1
+    'aD'       // 3a04-3a05    #3
+    'B'        // 3a06         #1
+    'oD'       // 3a07-3a16    #3
+    'aB'       // 3a17-3a18    #1
+    'oD'       // 3a19-3a28    #3
+    'aB'       // 3a29-3a2a    #1
+    'hD'       // 3a2b-3a33    #3
+    'B'        // 3a34         #1
+    'cD'       // 3a35-3a38    #3
+    'K'        // 3a39         #10
+    'pD'       // 3a3a-3a4a    #3
+    'B'        // 3a4b         #1
+    'eD'       // 3a4c-3a51    #3
+    'B'        // 3a52         #1
+    'cD'       // 3a53-3a56    #3
+    'B'        // 3a57         #1
+    'cD'       // 3a58-3a5b    #3
+    'C'        // 3a5c         #2
+    'D'        // 3a5d         #3
+    'B'        // 3a5e         #1
+    'fD'       // 3a5f-3a65    #3
+    'aB'       // 3a66-3a67    #1
+    'eD'       // 3a68-3a6d    #3
+    'F'        // 3a6e         #5
+    'cD'       // 3a6f-3a72    #3
+    'F'        // 3a73         #5
+    'pD'       // 3a74-3a84    #3
+    'F'        // 3a85         #5
+    'pD'       // 3a86-3a96    #3
+    'B'        // 3a97         #1
+    'kD'       // 3a98-3aa3    #3
+    'K'        // 3aa4         #10
+    'eD'       // 3aa5-3aaa    #3
+    'B'        // 3aab         #1
+    'pD'       // 3aac-3abc    #3
+    'B'        // 3abd         #1
+    'eD'       // 3abe-3ac3    #3
+    'F'        // 3ac4         #5
+    'eD'       // 3ac5-3aca    #3
+    'F'        // 3acb         #5
+    'iD'       // 3acc-3ad5    #3
+    'aF'       // 3ad6-3ad7    #5
+    'aD'       // 3ad8-3ad9    #3
+    '6G'       // 3ada         #162
+    'D'        // 3adb         #3
+    'K'        // 3adc         #10
+    'D'        // 3add         #3
+    'B'        // 3ade         #1
+    'D'        // 3adf         #3
+    'B'        // 3ae0         #1
+    'hD'       // 3ae1-3ae9    #3
+    'F'        // 3aea         #5
+    'dD'       // 3aeb-3aef    #3
+    'B'        // 3af0         #1
+    'D'        // 3af1         #3
+    'B'        // 3af2         #1
+    'F'        // 3af3         #5
+    'D'        // 3af4         #3
+    'B'        // 3af5         #1
+    'K'        // 3af6         #10
+    'cD'       // 3af7-3afa    #3
+    'B'        // 3afb         #1
+    'fD'       // 3afc-3b02    #3
+    'K'        // 3b03         #10
+    'iD'       // 3b04-3b0d    #3
+    'C'        // 3b0e         #2
+    'iD'       // 3b0f-3b18    #3
+    'B'        // 3b19         #1
+    'F'        // 3b1a         #5
+    'D'        // 3b1b         #3
+    'F'        // 3b1c         #5
+    'dD'       // 3b1d-3b21    #3
+    'C'        // 3b22         #2
+    'K'        // 3b23         #10
+    'fD'       // 3b24-3b2a    #3
+    'B'        // 3b2b         #1
+    'hD'       // 3b2c-3b34    #3
+    'F'        // 3b35         #5
+    'bD'       // 3b36-3b38    #3
+    'B'        // 3b39         #1
+    'gD'       // 3b3a-3b41    #3
+    'B'        // 3b42         #1
+    'tD'       // 3b43-3b57    #3
+    'B'        // 3b58         #1
+    'fD'       // 3b59-3b5f    #3
+    'B'        // 3b60         #1
+    'kD'       // 3b61-3b6c    #3
+    'F'        // 3b6d         #5
+    'bD'       // 3b6e-3b70    #3
+    'aB'       // 3b71-3b72    #1
+    'cD'       // 3b73-3b76    #3
+    'F'        // 3b77         #5
+    'D'        // 3b78         #3
+    'K'        // 3b79         #10
+    'D'        // 3b7a         #3
+    'aB'       // 3b7b-3b7c    #1
+    'bD'       // 3b7d-3b7f    #3
+    'B'        // 3b80         #1
+    'eD'       // 3b81-3b86    #3
+    'aF'       // 3b87-3b88    #5
+    'cD'       // 3b89-3b8c    #3
+    'F'        // 3b8d         #5
+    'fD'       // 3b8e-3b94    #3
+    'aB'       // 3b95-3b96    #1
+    'aD'       // 3b97-3b98    #3
+    'B'        // 3b99         #1
+    'fD'       // 3b9a-3ba0    #3
+    'B'        // 3ba1         #1
+    'aD'       // 3ba2-3ba3    #3
+    'F'        // 3ba4         #5
+    'pD'       // 3ba5-3bb5    #3
+    'F'        // 3bb6         #5
+    'dD'       // 3bb7-3bbb    #3
+    'B'        // 3bbc         #1
+    'D'        // 3bbd         #3
+    'B'        // 3bbe         #1
+    'bD'       // 3bbf-3bc1    #3
+    'B'        // 3bc2         #1
+    'F'        // 3bc3         #5
+    'B'        // 3bc4         #1
+    'gD'       // 3bc5-3bcc    #3
+    'F'        // 3bcd         #5
+    'hD'       // 3bce-3bd6    #3
+    'B'        // 3bd7         #1
+    'dD'       // 3bd8-3bdc    #3
+    'B'        // 3bdd         #1
+    'mD'       // 3bde-3beb    #3
+    'B'        // 3bec         #1
+    'bD'       // 3bed-3bef    #3
+    'F'        // 3bf0         #5
+    'D'        // 3bf1         #3
+    'B'        // 3bf2         #1
+    'A'        // 3bf3         #0
+    'B'        // 3bf4         #1
+    'wD'       // 3bf5-3c0c    #3
+    'B'        // 3c0d         #1
+    'D'        // 3c0e         #3
+    'F'        // 3c0f         #5
+    'D'        // 3c10         #3
+    'B'        // 3c11         #1
+    'aD'       // 3c12-3c13    #3
+    'K'        // 3c14         #10
+    'B'        // 3c15         #1
+    'aD'       // 3c16-3c17    #3
+    'B'        // 3c18         #1
+    'jD'       // 3c19-3c23    #3
+    'K'        // 3c24         #10
+    'D'        // 3c25         #3
+    'F'        // 3c26         #5
+    'eD'       // 3c27-3c2c    #3
+    'K'        // 3c2d         #10
+    '1kD'      // 3c2e-3c53    #3
+    'B'        // 3c54         #1
+    '2aD'      // 3c55-3c8a    #3
+    'B'        // 3c8b         #1
+    '1vD'      // 3c8c-3cbc    #3
+    'aK'       // 3cbd-3cbe    #10
+    'cD'       // 3cbf-3cc2    #3
+    'F'        // 3cc3         #5
+    'fD'       // 3cc4-3cca    #3
+    'B'        // 3ccb         #1
+    'D'        // 3ccc         #3
+    'B'        // 3ccd         #1
+    'bD'       // 3cce-3cd0    #3
+    'B'        // 3cd1         #1
+    'F'        // 3cd2         #5
+    'bD'       // 3cd3-3cd5    #3
+    'B'        // 3cd6         #1
+    'dD'       // 3cd7-3cdb    #3
+    'B'        // 3cdc         #1
+    'mD'       // 3cdd-3cea    #3
+    'B'        // 3ceb         #1
+    'bD'       // 3cec-3cee    #3
+    'B'        // 3cef         #1
+    'kD'       // 3cf0-3cfb    #3
+    'K'        // 3cfc         #10
+    'sD'       // 3cfd-3d10    #3
+    'F'        // 3d11         #5
+    'aB'       // 3d12-3d13    #1
+    'bD'       // 3d14-3d16    #3
+    'K'        // 3d17         #10
+    'dD'       // 3d18-3d1c    #3
+    'B'        // 3d1d         #1
+    'F'        // 3d1e         #5
+    'qD'       // 3d1f-3d30    #3
+    'F'        // 3d31         #5
+    'B'        // 3d32         #1
+    'gD'       // 3d33-3d3a    #3
+    'B'        // 3d3b         #1
+    'iD'       // 3d3c-3d45    #3
+    'B'        // 3d46         #1
+    'dD'       // 3d47-3d4b    #3
+    'B'        // 3d4c         #1
+    'D'        // 3d4d         #3
+    'C'        // 3d4e         #2
+    'aD'       // 3d4f-3d50    #3
+    'B'        // 3d51         #1
+    'lD'       // 3d52-3d5e    #3
+    'I'        // 3d5f         #8
+    'aD'       // 3d60-3d61    #3
+    'B'        // 3d62         #1
+    'D'        // 3d63         #3
+    'F'        // 3d64         #5
+    'cD'       // 3d65-3d68    #3
+    'aB'       // 3d69-3d6a    #1
+    'cD'       // 3d6b-3d6e    #3
+    'B'        // 3d6f         #1
+    'dD'       // 3d70-3d74    #3
+    'B'        // 3d75         #1
+    'fD'       // 3d76-3d7c    #3
+    'B'        // 3d7d         #1
+    'fD'       // 3d7e-3d84    #3
+    'B'        // 3d85         #1
+    'aD'       // 3d86-3d87    #3
+    'B'        // 3d88         #1
+    'D'        // 3d89         #3
+    'B'        // 3d8a         #1
+    'cD'       // 3d8b-3d8e    #3
+    'B'        // 3d8f         #1
+    'D'        // 3d90         #3
+    'B'        // 3d91         #1
+    'gD'       // 3d92-3d99    #3
+    'F'        // 3d9a         #5
+    'iD'       // 3d9b-3da4    #3
+    'B'        // 3da5         #1
+    'fD'       // 3da6-3dac    #3
+    'B'        // 3dad         #1
+    'eD'       // 3dae-3db3    #3
+    'B'        // 3db4         #1
+    'fD'       // 3db5-3dbb    #3
+    'K'        // 3dbc         #10
+    'aD'       // 3dbd-3dbe    #3
+    'B'        // 3dbf         #1
+    'F'        // 3dc0         #5
+    'D'        // 3dc1         #3
+    'K'        // 3dc2         #10
+    'bD'       // 3dc3-3dc5    #3
+    'aB'       // 3dc6-3dc7    #1
+    'D'        // 3dc8         #3
+    'B'        // 3dc9         #1
+    'aD'       // 3dca-3dcb    #3
+    'C'        // 3dcc         #2
+    'B'        // 3dcd         #1
+    'dD'       // 3dce-3dd2    #3
+    'B'        // 3dd3         #1
+    'F'        // 3dd4         #5
+    'eD'       // 3dd5-3dda    #3
+    'B'        // 3ddb         #1
+    'jD'       // 3ddc-3de6    #3
+    'aB'       // 3de7-3de8    #1
+    'aD'       // 3de9-3dea    #3
+    'B'        // 3deb         #1
+    'fD'       // 3dec-3df2    #3
+    'aB'       // 3df3-3df4    #1
+    'aD'       // 3df5-3df6    #3
+    'B'        // 3df7         #1
+    'cD'       // 3df8-3dfb    #3
+    'aB'       // 3dfc-3dfd    #1
+    'fD'       // 3dfe-3e04    #3
+    'F'        // 3e05         #5
+    'B'        // 3e06         #1
+    '2cD'      // 3e07-3e3e    #3
+    'F'        // 3e3f         #5
+    'C'        // 3e40         #2
+    'aD'       // 3e41-3e42    #3
+    'B'        // 3e43         #1
+    'cD'       // 3e44-3e47    #3
+    'B'        // 3e48         #1
+    'kD'       // 3e49-3e54    #3
+    'B'        // 3e55         #1
+    'iD'       // 3e56-3e5f    #3
+    'F'        // 3e60         #5
+    'dD'       // 3e61-3e65    #3
+    'F'        // 3e66         #5
+    'D'        // 3e67         #3
+    'F'        // 3e68         #5
+    'jD'       // 3e69-3e73    #3
+    'B'        // 3e74         #1
+    'mD'       // 3e75-3e82    #3
+    'F'        // 3e83         #5
+    'eD'       // 3e84-3e89    #3
+    'F'        // 3e8a         #5
+    'hD'       // 3e8b-3e93    #3
+    'F'        // 3e94         #5
+    'rD'       // 3e95-3ea7    #3
+    'bB'       // 3ea8-3eaa    #1
+    'aD'       // 3eab-3eac    #3
+    'B'        // 3ead         #1
+    'bD'       // 3eae-3eb0    #3
+    'B'        // 3eb1         #1
+    'eD'       // 3eb2-3eb7    #3
+    'B'        // 3eb8         #1
+    'eD'       // 3eb9-3ebe    #3
+    'B'        // 3ebf         #1
+    'aD'       // 3ec0-3ec1    #3
+    'B'        // 3ec2         #1
+    'D'        // 3ec3         #3
+    'K'        // 3ec4         #10
+    'aD'       // 3ec5-3ec6    #3
+    'B'        // 3ec7         #1
+    'aD'       // 3ec8-3ec9    #3
+    'B'        // 3eca         #1
+    'D'        // 3ecb         #3
+    'B'        // 3ecc         #1
+    'bD'       // 3ecd-3ecf    #3
+    'aB'       // 3ed0-3ed1    #1
+    'cD'       // 3ed2-3ed5    #3
+    'aB'       // 3ed6-3ed7    #1
+    'aD'       // 3ed8-3ed9    #3
+    'C'        // 3eda         #2
+    'B'        // 3edb         #1
+    'aD'       // 3edc-3edd    #3
+    'B'        // 3ede         #1
+    'aD'       // 3edf-3ee0    #3
+    'aB'       // 3ee1-3ee2    #1
+    'cD'       // 3ee3-3ee6    #3
+    'B'        // 3ee7         #1
+    'D'        // 3ee8         #3
+    'B'        // 3ee9         #1
+    'D'        // 3eea         #3
+    'aB'       // 3eeb-3eec    #1
+    'K'        // 3eed         #10
+    'aD'       // 3eee-3eef    #3
+    'B'        // 3ef0         #1
+    'aD'       // 3ef1-3ef2    #3
+    'aB'       // 3ef3-3ef4    #1
+    'dD'       // 3ef5-3ef9    #3
+    'B'        // 3efa         #1
+    'D'        // 3efb         #3
+    'B'        // 3efc         #1
+    'K'        // 3efd         #10
+    'D'        // 3efe         #3
+    'aB'       // 3eff-3f00    #1
+    'bD'       // 3f01-3f03    #3
+    'I'        // 3f04         #8
+    'D'        // 3f05         #3
+    'aB'       // 3f06-3f07    #1
+    'eD'       // 3f08-3f0d    #3
+    'B'        // 3f0e         #1
+    '2oD'      // 3f0f-3f52    #3
+    'B'        // 3f53         #1
+    'bD'       // 3f54-3f56    #3
+    'F'        // 3f57         #5
+    'aB'       // 3f58-3f59    #1
+    'hD'       // 3f5a-3f62    #3
+    'B'        // 3f63         #1
+    'mD'       // 3f64-3f71    #3
+    'F'        // 3f72         #5
+    'aD'       // 3f73-3f74    #3
+    'F'        // 3f75         #5
+    'D'        // 3f76         #3
+    'F'        // 3f77         #5
+    'cD'       // 3f78-3f7b    #3
+    'B'        // 3f7c         #1
+    'uD'       // 3f7d-3f92    #3
+    'B'        // 3f93         #1
+    'yD'       // 3f94-3fad    #3
+    'F'        // 3fae         #5
+    'aD'       // 3faf-3fb0    #3
+    'F'        // 3fb1         #5
+    'mD'       // 3fb2-3fbf    #3
+    'B'        // 3fc0         #1
+    'fD'       // 3fc1-3fc7    #3
+    'B'        // 3fc8         #1
+    'F'        // 3fc9         #5
+    'lD'       // 3fca-3fd6    #3
+    'C'        // 3fd7         #2
+    'cD'       // 3fd8-3fdb    #3
+    'C'        // 3fdc         #2
+    'gD'       // 3fdd-3fe4    #3
+    'B'        // 3fe5         #1
+    'fD'       // 3fe6-3fec    #3
+    'B'        // 3fed         #1
+    'jD'       // 3fee-3ff8    #3
+    'aB'       // 3ff9-3ffa    #1
+    'hD'       // 3ffb-4003    #3
+    'B'        // 4004         #1
+    'cD'       // 4005-4008    #3
+    'B'        // 4009         #1
+    'rD'       // 400a-401c    #3
+    'B'        // 401d         #1
+    'pD'       // 401e-402e    #3
+    'K'        // 402f         #10
+    'cD'       // 4030-4033    #3
+    'K'        // 4034         #10
+    'cD'       // 4035-4038    #3
+    'C'        // 4039         #2
+    'jD'       // 403a-4044    #3
+    'B'        // 4045         #1
+    'lD'       // 4046-4052    #3
+    'B'        // 4053         #1
+    'bD'       // 4054-4056    #3
+    'B'        // 4057         #1
+    'F'        // 4058         #5
+    'hD'       // 4059-4061    #3
+    'I'        // 4062         #8
+    'aD'       // 4063-4064    #3
+    'B'        // 4065         #1
+    'cD'       // 4066-4069    #3
+    'B'        // 406a         #1
+    'cD'       // 406b-406e    #3
+    'B'        // 406f         #1
+    'D'        // 4070         #3
+    'B'        // 4071         #1
+    '1fD'      // 4072-4092    #3
+    'F'        // 4093         #5
+    'sD'       // 4094-40a7    #3
+    'B'        // 40a8         #1
+    'K'        // 40a9         #10
+    'iD'       // 40aa-40b3    #3
+    'B'        // 40b4         #1
+    'eD'       // 40b5-40ba    #3
+    'B'        // 40bb         #1
+    'bD'       // 40bc-40be    #3
+    'B'        // 40bf         #1
+    'gD'       // 40c0-40c7    #3
+    'B'        // 40c8         #1
+    'K'        // 40c9         #10
+    'mD'       // 40ca-40d7    #3
+    'B'        // 40d8         #1
+    'eD'       // 40d9-40de    #3
+    'B'        // 40df         #1
+    'wD'       // 40e0-40f7    #3
+    'B'        // 40f8         #1
+    'D'        // 40f9         #3
+    'B'        // 40fa         #1
+    'fD'       // 40fb-4101    #3
+    'B'        // 4102         #1
+    'C'        // 4103         #2
+    'B'        // 4104         #1
+    'F'        // 4105         #5
+    'bD'       // 4106-4108    #3
+    'B'        // 4109         #1
+    'cD'       // 410a-410d    #3
+    'B'        // 410e         #1
+    '1gD'      // 410f-4130    #3
+    'aB'       // 4131-4132    #1
+    'cD'       // 4133-4136    #3
+    'K'        // 4137         #10
+    'oD'       // 4138-4147    #3
+    'F'        // 4148         #5
+    'eD'       // 4149-414e    #3
+    'F'        // 414f         #5
+    'rD'       // 4150-4162    #3
+    'F'        // 4163         #5
+    'bD'       // 4164-4166    #3
+    'B'        // 4167         #1
+    'cD'       // 4168-416b    #3
+    'B'        // 416c         #1
+    'D'        // 416d         #3
+    'B'        // 416e         #1
+    'lD'       // 416f-417b    #3
+    'B'        // 417c         #1
+    'aD'       // 417d-417e    #3
+    'B'        // 417f         #1
+    'D'        // 4180         #3
+    'B'        // 4181         #1
+    'mD'       // 4182-418f    #3
+    'B'        // 4190         #1
+    'zD'       // 4191-41ab    #3
+    'K'        // 41ac         #10
+    'dD'       // 41ad-41b1    #3
+    'B'        // 41b2         #1
+    'D'        // 41b3         #3
+    'F'        // 41b4         #5
+    'iD'       // 41b5-41be    #3
+    'F'        // 41bf         #5
+    'cD'       // 41c0-41c3    #3
+    'B'        // 41c4         #1
+    'dD'       // 41c5-41c9    #3
+    'B'        // 41ca         #1
+    'cD'       // 41cb-41ce    #3
+    'B'        // 41cf         #1
+    'jD'       // 41d0-41da    #3
+    'B'        // 41db         #1
+    'iD'       // 41dc-41e5    #3
+    'F'        // 41e6         #5
+    'eD'       // 41e7-41ec    #3
+    'B'        // 41ed         #1
+    'F'        // 41ee         #5
+    'B'        // 41ef         #1
+    'bD'       // 41f0-41f2    #3
+    'F'        // 41f3         #5
+    'dD'       // 41f4-41f8    #3
+    'B'        // 41f9         #1
+    'lD'       // 41fa-4206    #3
+    'F'        // 4207         #5
+    'eD'       // 4208-420d    #3
+    'F'        // 420e         #5
+    'aD'       // 420f-4210    #3
+    'B'        // 4211         #1
+    'pD'       // 4212-4222    #3
+    'B'        // 4223         #1
+    '1aD'      // 4224-423f    #3
+    'B'        // 4240         #1
+    'wD'       // 4241-4258    #3
+    'K'        // 4259         #10
+    'eD'       // 425a-425f    #3
+    'B'        // 4260         #1
+    'bD'       // 4261-4263    #3
+    'F'        // 4264         #5
+    'dD'       // 4265-4269    #3
+    'B'        // 426a         #1
+    'jD'       // 426b-4275    #3
+    'B'        // 4276         #1
+    'bD'       // 4277-4279    #3
+    'B'        // 427a         #1
+    'pD'       // 427b-428b    #3
+    'B'        // 428c         #1
+    'eD'       // 428d-4292    #3
+    'F'        // 4293         #5
+    'B'        // 4294         #1
+    'lD'       // 4295-42a1    #3
+    'B'        // 42a2         #1
+    'qD'       // 42a3-42b4    #3
+    'B'        // 42b5         #1
+    'bD'       // 42b6-42b8    #3
+    'B'        // 42b9         #1
+    'aD'       // 42ba-42bb    #3
+    'B'        // 42bc         #1
+    'hD'       // 42bd-42c5    #3
+    'F'        // 42c6         #5
+    'nD'       // 42c7-42d5    #3
+    'F'        // 42d6         #5
+    'eD'       // 42d7-42dc    #3
+    'F'        // 42dd         #5
+    'uD'       // 42de-42f3    #3
+    'B'        // 42f4         #1
+    'eD'       // 42f5-42fa    #3
+    'aB'       // 42fb-42fc    #1
+    'dD'       // 42fd-4301    #3
+    'F'        // 4302         #5
+    'fD'       // 4303-4309    #3
+    'B'        // 430a         #1
+    '1eD'      // 430b-432a    #3
+    'C'        // 432b         #2
+    'vD'       // 432c-4342    #3
+    'F'        // 4343         #5
+    '1oD'      // 4344-436d    #3
+    'B'        // 436e         #1
+    '1mD'      // 436f-4396    #3
+    'B'        // 4397         #1
+    'aD'       // 4398-4399    #3
+    'B'        // 439a         #1
+    '1dD'      // 439b-43b9    #3
+    'B'        // 43ba         #1
+    'K'        // 43bb         #10
+    'dD'       // 43bc-43c0    #3
+    'B'        // 43c1         #1
+    'dD'       // 43c2-43c6    #3
+    'K'        // 43c7         #10
+    'pD'       // 43c8-43d8    #3
+    'B'        // 43d9         #1
+    'dD'       // 43da-43de    #3
+    'B'        // 43df         #1
+    'fD'       // 43e0-43e6    #3
+    'K'        // 43e7         #10
+    'aD'       // 43e8-43e9    #3
+    'K'        // 43ea         #10
+    'aD'       // 43eb-43ec    #3
+    'B'        // 43ed         #1
+    'F'        // 43ee         #5
+    'D'        // 43ef         #3
+    'C'        // 43f0         #2
+    'D'        // 43f1         #3
+    'B'        // 43f2         #1
+    'mD'       // 43f3-4400    #3
+    'aB'       // 4401-4402    #1
+    'dD'       // 4403-4407    #3
+    'F'        // 4408         #5
+    'bD'       // 4409-440b    #3
+    'F'        // 440c         #5
+    'eD'       // 440d-4412    #3
+    'B'        // 4413         #1
+    'bD'       // 4414-4416    #3
+    'F'        // 4417         #5
+    'cD'       // 4418-441b    #3
+    'F'        // 441c         #5
+    'dD'       // 441d-4421    #3
+    'F'        // 4422         #5
+    'aD'       // 4423-4424    #3
+    'B'        // 4425         #1
+    'fD'       // 4426-442c    #3
+    'B'        // 442d         #1
+    '1gD'      // 442e-444f    #3
+    'K'        // 4450         #10
+    'aD'       // 4451-4452    #3
+    'F'        // 4453         #5
+    'fD'       // 4454-445a    #3
+    'F'        // 445b         #5
+    'yD'       // 445c-4475    #3
+    'F'        // 4476         #5
+    'bD'       // 4477-4479    #3
+    'C'        // 447a         #2
+    'sD'       // 447b-448e    #3
+    'B'        // 448f         #1
+    'D'        // 4490         #3
+    'C'        // 4491         #2
+    'lD'       // 4492-449e    #3
+    'aB'       // 449f-44a0    #1
+    'D'        // 44a1         #3
+    'B'        // 44a2         #1
+    'lD'       // 44a3-44af    #3
+    'B'        // 44b0         #1
+    'aD'       // 44b1-44b2    #3
+    'F'        // 44b3         #5
+    'bD'       // 44b4-44b6    #3
+    'B'        // 44b7         #1
+    'dD'       // 44b8-44bc    #3
+    'B'        // 44bd         #1
+    'F'        // 44be         #5
+    'D'        // 44bf         #3
+    'B'        // 44c0         #1
+    'aD'       // 44c1-44c2    #3
+    'B'        // 44c3         #1
+    'D'        // 44c4         #3
+    'B'        // 44c5         #1
+    'gD'       // 44c6-44cd    #3
+    'B'        // 44ce         #1
+    'dD'       // 44cf-44d3    #3
+    'F'        // 44d4         #5
+    'gD'       // 44d5-44dc    #3
+    'bB'       // 44dd-44df    #1
+    'D'        // 44e0         #3
+    'B'        // 44e1         #1
+    'aD'       // 44e2-44e3    #3
+    'B'        // 44e4         #1
+    'cD'       // 44e5-44e8    #3
+    'cB'       // 44e9-44ec    #1
+    'fD'       // 44ed-44f3    #3
+    'B'        // 44f4         #1
+    'mD'       // 44f5-4502    #3
+    'aB'       // 4503-4504    #1
+    'bD'       // 4505-4507    #3
+    'F'        // 4508         #5
+    'B'        // 4509         #1
+    'D'        // 450a         #3
+    'B'        // 450b         #1
+    'D'        // 450c         #3
+    'F'        // 450d         #5
+    'cD'       // 450e-4511    #3
+    'K'        // 4512         #10
+    'bD'       // 4513-4515    #3
+    'B'        // 4516         #1
+    'cD'       // 4517-451a    #3
+    'B'        // 451b         #1
+    'D'        // 451c         #3
+    'B'        // 451d         #1
+    'fD'       // 451e-4524    #3
+    'F'        // 4525         #5
+    'D'        // 4526         #3
+    'B'        // 4527         #1
+    'eD'       // 4528-452d    #3
+    'B'        // 452e         #1
+    'cD'       // 452f-4532    #3
+    'B'        // 4533         #1
+    'aD'       // 4534-4535    #3
+    'B'        // 4536         #1
+    'cD'       // 4537-453a    #3
+    'B'        // 453b         #1
+    'D'        // 453c         #3
+    'B'        // 453d         #1
+    'D'        // 453e         #3
+    'B'        // 453f         #1
+    'bD'       // 4540-4542    #3
+    'C'        // 4543         #2
+    'lD'       // 4544-4550    #3
+    'aB'       // 4551-4552    #1
+    'aD'       // 4553-4554    #3
+    'B'        // 4555         #1
+    'aD'       // 4556-4557    #3
+    'B'        // 4558         #1
+    'bD'       // 4559-455b    #3
+    'B'        // 455c         #1
+    'cD'       // 455d-4560    #3
+    'aB'       // 4561-4562    #1
+    'fD'       // 4563-4569    #3
+    'B'        // 456a         #1
+    'aD'       // 456b-456c    #3
+    'B'        // 456d         #1
+    'hD'       // 456e-4576    #3
+    'aB'       // 4577-4578    #1
+    'D'        // 4579         #3
+    'F'        // 457a         #5
+    'iD'       // 457b-4584    #3
+    'B'        // 4585         #1
+    'vD'       // 4586-459c    #3
+    'F'        // 459d         #5
+    'gD'       // 459e-45a5    #3
+    'B'        // 45a6         #1
+    'kD'       // 45a7-45b2    #3
+    'B'        // 45b3         #1
+    'cD'       // 45b4-45b7    #3
+    'F'        // 45b8         #5
+    'dD'       // 45b9-45bd    #3
+    'F'        // 45be         #5
+    'zD'       // 45bf-45d9    #3
+    'B'        // 45da         #1
+    'iD'       // 45db-45e4    #3
+    'F'        // 45e5         #5
+    'bD'       // 45e6-45e8    #3
+    'B'        // 45e9         #1
+    'C'        // 45ea         #2
+    'fD'       // 45eb-45f1    #3
+    'K'        // 45f2         #10
+    'oD'       // 45f3-4602    #3
+    'B'        // 4603         #1
+    'aD'       // 4604-4605    #3
+    'B'        // 4606         #1
+    'gD'       // 4607-460e    #3
+    'C'        // 460f         #2
+    'F'        // 4610         #5
+    'cD'       // 4611-4614    #3
+    'B'        // 4615         #1
+    'D'        // 4616         #3
+    'B'        // 4617         #1
+    'K'        // 4618         #10
+    '1mD'      // 4619-4640    #3
+    'F'        // 4641         #5
+    'xD'       // 4642-465a    #3
+    'B'        // 465b         #1
+    'hD'       // 465c-4664    #3
+    'F'        // 4665         #5
+    'sD'       // 4666-4679    #3
+    'B'        // 467a         #1
+    'dD'       // 467b-467f    #3
+    'B'        // 4680         #1
+    '1eD'      // 4681-46a0    #3
+    'C'        // 46a1         #2
+    'kD'       // 46a2-46ad    #3
+    'C'        // 46ae         #2
+    'F'        // 46af         #5
+    'fD'       // 46b0-46b6    #3
+    'K'        // 46b7         #10
+    'bD'       // 46b8-46ba    #3
+    'B'        // 46bb         #1
+    'aD'       // 46bc-46bd    #3
+    'K'        // 46be         #10
+    'oD'       // 46bf-46ce    #3
+    'aB'       // 46cf-46d0    #1
+    'bD'       // 46d1-46d3    #3
+    'K'        // 46d4         #10
+    'bD'       // 46d5-46d7    #3
+    'K'        // 46d8         #10
+    'cD'       // 46d9-46dc    #3
+    'K'        // 46dd         #10
+    'vD'       // 46de-46f4    #3
+    'B'        // 46f5         #1
+    'D'        // 46f6         #3
+    'B'        // 46f7         #1
+    'sD'       // 46f8-470b    #3
+    'F'        // 470c         #5
+    'eD'       // 470d-4712    #3
+    'B'        // 4713         #1
+    'cD'       // 4714-4717    #3
+    'B'        // 4718         #1
+    'eD'       // 4719-471e    #3
+    'F'        // 471f         #5
+    'lD'       // 4720-472c    #3
+    'K'        // 472d         #10
+    'gD'       // 472e-4735    #3
+    'B'        // 4736         #1
+    'lD'       // 4737-4743    #3
+    'B'        // 4744         #1
+    'hD'       // 4745-474d    #3
+    'aB'       // 474e-474f    #1
+    'sD'       // 4750-4763    #3
+    'F'        // 4764         #5
+    'fD'       // 4765-476b    #3
+    'K'        // 476c         #10
+    'nD'       // 476d-477b    #3
+    'B'        // 477c         #1
+    'K'        // 477d         #10
+    'yD'       // 477e-4797    #3
+    'B'        // 4798         #1
+    'eD'       // 4799-479e    #3
+    'K'        // 479f         #10
+    'eD'       // 47a0-47a5    #3
+    'B'        // 47a6         #1
+    '1sD'      // 47a7-47d4    #3
+    'B'        // 47d5         #1
+    'oD'       // 47d6-47e5    #3
+    'F'        // 47e6         #5
+    'eD'       // 47e7-47ec    #3
+    'B'        // 47ed         #1
+    'eD'       // 47ee-47f3    #3
+    'B'        // 47f4         #1
+    'gD'       // 47f5-47fc    #3
+    'F'        // 47fd         #5
+    'aD'       // 47fe-47ff    #3
+    'B'        // 4800         #1
+    'iD'       // 4801-480a    #3
+    'B'        // 480b         #1
+    'iD'       // 480c-4815    #3
+    'F'        // 4816         #5
+    'fD'       // 4817-481d    #3
+    'F'        // 481e         #5
+    'wD'       // 481f-4836    #3
+    'B'        // 4837         #1
+    'kD'       // 4838-4843    #3
+    'F'        // 4844         #5
+    'hD'       // 4845-484d    #3
+    'F'        // 484e         #5
+    'mD'       // 484f-485c    #3
+    'B'        // 485d         #1
+    'dD'       // 485e-4862    #3
+    'K'        // 4863         #10
+    'lD'       // 4864-4870    #3
+    'B'        // 4871         #1
+    'pD'       // 4872-4882    #3
+    'K'        // 4883         #10
+    'qD'       // 4884-4895    #3
+    'K'        // 4896         #10
+    'cD'       // 4897-489a    #3
+    'B'        // 489b         #1
+    'iD'       // 489c-48a5    #3
+    'K'        // 48a6         #10
+    'eD'       // 48a7-48ac    #3
+    'aB'       // 48ad-48ae    #1
+    'eD'       // 48af-48b4    #3
+    'F'        // 48b5         #5
+    'yD'       // 48b6-48cf    #3
+    'B'        // 48d0         #1
+    'kD'       // 48d1-48dc    #3
+    'B'        // 48dd         #1
+    'nD'       // 48de-48ec    #3
+    'B'        // 48ed         #1
+    'dD'       // 48ee-48f2    #3
+    'B'        // 48f3         #1
+    'eD'       // 48f4-48f9    #3
+    'B'        // 48fa         #1
+    'jD'       // 48fb-4905    #3
+    'B'        // 4906         #1
+    'iD'       // 4907-4910    #3
+    'B'        // 4911         #1
+    'kD'       // 4912-491d    #3
+    'B'        // 491e         #1
+    'eD'       // 491f-4924    #3
+    'I'        // 4925         #8
+    'cD'       // 4926-4929    #3
+    'B'        // 492a         #1
+    'aD'       // 492b-492c    #3
+    'B'        // 492d         #1
+    'D'        // 492e         #3
+    'aB'       // 492f-4930    #1
+    'cD'       // 4931-4934    #3
+    'B'        // 4935         #1
+    'eD'       // 4936-493b    #3
+    'B'        // 493c         #1
+    'D'        // 493d         #3
+    'B'        // 493e         #1
+    'eD'       // 493f-4944    #3
+    'B'        // 4945         #1
+    'jD'       // 4946-4950    #3
+    'B'        // 4951         #1
+    'D'        // 4952         #3
+    'B'        // 4953         #1
+    'pD'       // 4954-4964    #3
+    'B'        // 4965         #1
+    'cD'       // 4966-4969    #3
+    'B'        // 496a         #1
+    'fD'       // 496b-4971    #3
+    'B'        // 4972         #1
+    'uD'       // 4973-4988    #3
+    'B'        // 4989         #1
+    'sD'       // 498a-499d    #3
+    'K'        // 499e         #10
+    'aD'       // 499f-49a0    #3
+    'B'        // 49a1         #1
+    'bD'       // 49a2-49a4    #3
+    'K'        // 49a5         #10
+    'D'        // 49a6         #3
+    'B'        // 49a7         #1
+    'gD'       // 49a8-49af    #3
+    'F'        // 49b0         #5
+    'yD'       // 49b1-49ca    #3
+    'K'        // 49cb         #10
+    'rD'       // 49cc-49de    #3
+    'B'        // 49df         #1
+    'dD'       // 49e0-49e4    #3
+    'B'        // 49e5         #1
+    'D'        // 49e6         #3
+    'C'        // 49e7         #2
+    'qD'       // 49e8-49f9    #3
+    'F'        // 49fa         #5
+    'hD'       // 49fb-4a03    #3
+    'F'        // 4a04         #5
+    'iD'       // 4a05-4a0e    #3
+    'B'        // 4a0f         #1
+    'aD'       // 4a10-4a11    #3
+    'K'        // 4a12         #10
+    'iD'       // 4a13-4a1c    #3
+    'B'        // 4a1d         #1
+    'eD'       // 4a1e-4a23    #3
+    'B'        // 4a24         #1
+    'cD'       // 4a25-4a28    #3
+    'F'        // 4a29         #5
+    'bD'       // 4a2a-4a2c    #3
+    'K'        // 4a2d         #10
+    'fD'       // 4a2e-4a34    #3
+    'B'        // 4a35         #1
+    '3qD'      // 4a36-4a95    #3
+    'B'        // 4a96         #1
+    'lD'       // 4a97-4aa3    #3
+    'B'        // 4aa4         #1
+    'nD'       // 4aa5-4ab3    #3
+    'B'        // 4ab4         #1
+    'bD'       // 4ab5-4ab7    #3
+    'I'        // 4ab8         #8
+    'bD'       // 4ab9-4abb    #3
+    'F'        // 4abc         #5
+    'sD'       // 4abd-4ad0    #3
+    'B'        // 4ad1         #1
+    'lD'       // 4ad2-4ade    #3
+    'K'        // 4adf         #10
+    'cD'       // 4ae0-4ae3    #3
+    'B'        // 4ae4         #1
+    'bD'       // 4ae5-4ae7    #3
+    'K'        // 4ae8         #10
+    'qD'       // 4ae9-4afa    #3
+    'K'        // 4afb         #10
+    'bD'       // 4afc-4afe    #3
+    'B'        // 4aff         #1
+    'oD'       // 4b00-4b0f    #3
+    'B'        // 4b10         #1
+    'gD'       // 4b11-4b18    #3
+    'B'        // 4b19         #1
+    'eD'       // 4b1a-4b1f    #3
+    'B'        // 4b20         #1
+    'jD'       // 4b21-4b2b    #3
+    'B'        // 4b2c         #1
+    'iD'       // 4b2d-4b36    #3
+    'B'        // 4b37         #1
+    'F'        // 4b38         #5
+    'aD'       // 4b39-4b3a    #3
+    'F'        // 4b3b         #5
+    'vD'       // 4b3c-4b52    #3
+    'K'        // 4b53         #10
+    'zD'       // 4b54-4b6e    #3
+    'aB'       // 4b6f-4b70    #1
+    'K'        // 4b71         #10
+    'B'        // 4b72         #1
+    'gD'       // 4b73-4b7a    #3
+    'B'        // 4b7b         #1
+    'aD'       // 4b7c-4b7d    #3
+    'C'        // 4b7e         #2
+    'nD'       // 4b7f-4b8d    #3
+    'B'        // 4b8e         #1
+    'D'        // 4b8f         #3
+    'B'        // 4b90         #1
+    'aD'       // 4b91-4b92    #3
+    'B'        // 4b93         #1
+    'aD'       // 4b94-4b95    #3
+    'aB'       // 4b96-4b97    #1
+    'dD'       // 4b98-4b9c    #3
+    'B'        // 4b9d         #1
+    '1dD'      // 4b9e-4bbc    #3
+    'aB'       // 4bbd-4bbe    #1
+    'D'        // 4bbf         #3
+    'B'        // 4bc0         #1
+    'D'        // 4bc1         #3
+    'F'        // 4bc2         #5
+    'fD'       // 4bc3-4bc9    #3
+    'F'        // 4bca         #5
+    'fD'       // 4bcb-4bd1    #3
+    'F'        // 4bd2         #5
+    'tD'       // 4bd3-4be7    #3
+    'F'        // 4be8         #5
+    'zD'       // 4be9-4c03    #3
+    'B'        // 4c04         #1
+    'aD'       // 4c05-4c06    #3
+    'B'        // 4c07         #1
+    'eD'       // 4c08-4c0d    #3
+    'B'        // 4c0e         #1
+    'gD'       // 4c0f-4c16    #3
+    'F'        // 4c17         #5
+    'gD'       // 4c18-4c1f    #3
+    'F'        // 4c20         #5
+    'pD'       // 4c21-4c31    #3
+    'B'        // 4c32         #1
+    'dD'       // 4c33-4c37    #3
+    'F'        // 4c38         #5
+    'aD'       // 4c39-4c3a    #3
+    'B'        // 4c3b         #1
+    'aD'       // 4c3c-4c3d    #3
+    'B'        // 4c3e         #1
+    'D'        // 4c3f         #3
+    'B'        // 4c40         #1
+    'eD'       // 4c41-4c46    #3
+    'B'        // 4c47         #1
+    'nD'       // 4c48-4c56    #3
+    'B'        // 4c57         #1
+    'bD'       // 4c58-4c5a    #3
+    'B'        // 4c5b         #1
+    'pD'       // 4c5c-4c6c    #3
+    'B'        // 4c6d         #1
+    'hD'       // 4c6e-4c76    #3
+    'B'        // 4c77         #1
+    'bD'       // 4c78-4c7a    #3
+    'B'        // 4c7b         #1
+    'D'        // 4c7c         #3
+    'B'        // 4c7d         #1
+    'bD'       // 4c7e-4c80    #3
+    'B'        // 4c81         #1
+    'bD'       // 4c82-4c84    #3
+    'B'        // 4c85         #1
+    '1cD'      // 4c86-4ca3    #3
+    'B'        // 4ca4         #1
+    'hD'       // 4ca5-4cad    #3
+    'B'        // 4cae         #1
+    'D'        // 4caf         #3
+    'B'        // 4cb0         #1
+    'eD'       // 4cb1-4cb6    #3
+    'B'        // 4cb7         #1
+    'kD'       // 4cb8-4cc3    #3
+    'F'        // 4cc4         #5
+    'gD'       // 4cc5-4ccc    #3
+    'B'        // 4ccd         #1
+    'bD'       // 4cce-4cd0    #3
+    'F'        // 4cd1         #5
+    'lD'       // 4cd2-4cde    #3
+    'aK'       // 4cdf-4ce0    #10
+    'C'        // 4ce1         #2
+    'B'        // 4ce2         #1
+    'iD'       // 4ce3-4cec    #3
+    'B'        // 4ced         #1
+    'xD'       // 4cee-4d06    #3
+    'C'        // 4d07         #2
+    'D'        // 4d08         #3
+    'B'        // 4d09         #1
+    'eD'       // 4d0a-4d0f    #3
+    'B'        // 4d10         #1
+    'iD'       // 4d11-4d1a    #3
+    'K'        // 4d1b         #10
+    'wD'       // 4d1c-4d33    #3
+    'B'        // 4d34         #1
+    '2lD'      // 4d35-4d75    #3
+    'B'        // 4d76         #1
+    'C'        // 4d77         #2
+    'pD'       // 4d78-4d88    #3
+    'B'        // 4d89         #1
+    'fD'       // 4d8a-4d90    #3
+    'B'        // 4d91         #1
+    'iD'       // 4d92-4d9b    #3
+    'B'        // 4d9c         #1
+    'xD'       // 4d9d-4db5    #3
+    'iE'       // 4db6-4dbf
+    '2kM'      // 4dc0-4dff    #12
+    'aA'       // 4e00-4e01    #0
+    'F'        // 4e02         #5
+    'A'        // 4e03         #0
+    'C'        // 4e04         #2
+    'F'        // 4e05         #5
+    'D'        // 4e06         #3
+    'dA'       // 4e07-4e0b    #0
+    'C'        // 4e0c         #2
+    'aA'       // 4e0d-4e0e    #0
+    'aC'       // 4e0f-4e10    #2
+    'A'        // 4e11         #0
+    'F'        // 4e12         #5
+    'D'        // 4e13         #3
+    'bA'       // 4e14-4e16    #0
+    'F'        // 4e17         #5
+    'aA'       // 4e18-4e19    #0
+    'B'        // 4e1a         #1
+    'D'        // 4e1b         #3
+    'B'        // 4e1c         #1
+    'D'        // 4e1d         #3
+    'aA'       // 4e1e-4e1f    #0
+    'D'        // 4e20         #3
+    'C'        // 4e21         #2
+    'B'        // 4e22         #1
+    'F'        // 4e23         #5
+    'A'        // 4e24         #0
+    'D'        // 4e25         #3
+    'A'        // 4e26         #0
+    'D'        // 4e27         #3
+    'A'        // 4e28         #0
+    'F'        // 4e29         #5
+    'C'        // 4e2a         #2
+    'bA'       // 4e2b-4e2d    #0
+    'aC'       // 4e2e-4e2f    #2
+    'bA'       // 4e30-4e32    #0
+    'B'        // 4e33         #1
+    'D'        // 4e34         #3
+    'F'        // 4e35         #5
+    'A'        // 4e36         #0
+    'C'        // 4e37         #2
+    'aA'       // 4e38-4e39    #0
+    'D'        // 4e3a         #3
+    'A'        // 4e3b         #0
+    'C'        // 4e3c         #2
+    'B'        // 4e3d         #1
+    'D'        // 4e3e         #3
+    'A'        // 4e3f         #0
+    'aF'       // 4e40-4e41    #5
+    'aA'       // 4e42-4e43    #0
+    'F'        // 4e44         #5
+    'A'        // 4e45         #0
+    'D'        // 4e46         #3
+    'aC'       // 4e47-4e48    #2
+    'B'        // 4e49         #1
+    'D'        // 4e4a         #3
+    'A'        // 4e4b         #0
+    'D'        // 4e4c         #3
+    'bA'       // 4e4d-4e4f    #0
+    'D'        // 4e50         #3
+    'F'        // 4e51         #5
+    'aB'       // 4e52-4e53    #1
+    'D'        // 4e54         #3
+    'F'        // 4e55         #5
+    'A'        // 4e56         #0
+    'J'        // 4e57         #9
+    'cA'       // 4e58-4e5b    #0
+    'C'        // 4e5c         #2
+    'bA'       // 4e5d-4e5f    #0
+    'aD'       // 4e60-4e61    #3
+    'aF'       // 4e62-4e63    #5
+    'bD'       // 4e64-4e66    #3
+    'K'        // 4e67         #10
+    'F'        // 4e68         #5
+    'C'        // 4e69         #2
+    'B'        // 4e6a         #1
+    'bK'       // 4e6b-4e6d    #10
+    'bD'       // 4e6e-4e70    #3
+    'J'        // 4e71         #9
+    'D'        // 4e72         #3
+    'A'        // 4e73         #0
+    'aF'       // 4e74-4e75    #5
+    'aK'       // 4e76-4e77    #10
+    'B'        // 4e78         #1
+    'F'        // 4e79         #5
+    'bK'       // 4e7a-4e7c    #10
+    'D'        // 4e7d         #3
+    'A'        // 4e7e         #0
+    'C'        // 4e7f         #2
+    'A'        // 4e80         #0
+    'B'        // 4e81         #1
+    'A'        // 4e82         #0
+    'aB'       // 4e83-4e84    #1
+    'aA'       // 4e85-4e86    #0
+    'B'        // 4e87         #1
+    'aA'       // 4e88-4e89    #0
+    'F'        // 4e8a         #5
+    'aA'       // 4e8b-4e8c    #0
+    'C'        // 4e8d         #2
+    'A'        // 4e8e         #0
+    'aK'       // 4e8f-4e90    #10
+    'aA'       // 4e91-4e92    #0
+    'B'        // 4e93         #1
+    'aA'       // 4e94-4e95    #0
+    'aF'       // 4e96-4e97    #5
+    'aA'       // 4e98-4e99    #0
+    'B'        // 4e9a         #1
+    'A'        // 4e9b         #0
+    'J'        // 4e9c         #9
+    'F'        // 4e9d         #5
+    'dA'       // 4e9e-4ea2    #0
+    'B'        // 4ea3         #1
+    'bA'       // 4ea4-4ea6    #0
+    'D'        // 4ea7         #3
+    'A'        // 4ea8         #0
+    'aD'       // 4ea9-4eaa    #3
+    'cA'       // 4eab-4eae    #0
+    'F'        // 4eaf         #5
+    'J'        // 4eb0         #9
+    'aD'       // 4eb1-4eb2    #3
+    'A'        // 4eb3         #0
+    'K'        // 4eb4         #10
+    'D'        // 4eb5         #3
+    'A'        // 4eb6         #0
+    'B'        // 4eb7         #1
+    'D'        // 4eb8         #3
+    'bA'       // 4eb9-4ebb    #0
+    'C'        // 4ebc         #2
+    'aD'       // 4ebd-4ebe    #3
+    'B'        // 4ebf         #1
+    'aA'       // 4ec0-4ec1    #0
+    'aC'       // 4ec2-4ec3    #2
+    'A'        // 4ec4         #0
+    'D'        // 4ec5         #3
+    'aA'       // 4ec6-4ec7    #0
+    'C'        // 4ec8         #2
+    'B'        // 4ec9         #1
+    'aA'       // 4eca-4ecb    #0
+    'D'        // 4ecc         #3
+    'A'        // 4ecd         #0
+    'C'        // 4ece         #2
+    'aF'       // 4ecf-4ed0    #5
+    'bD'       // 4ed1-4ed3    #3
+    'eA'       // 4ed4-4ed9    #0
+    'C'        // 4eda         #2
+    'F'        // 4edb         #5
+    'B'        // 4edc         #1
+    'bA'       // 4edd-4edf    #0
+    'F'        // 4ee0         #5
+    'A'        // 4ee1         #0
+    'F'        // 4ee2         #5
+    'bA'       // 4ee3-4ee5    #0
+    'aD'       // 4ee6-4ee7    #3
+    'C'        // 4ee8         #2
+    'aB'       // 4ee9-4eea    #1
+    'C'        // 4eeb         #2
+    'D'        // 4eec         #3
+    'F'        // 4eed         #5
+    'A'        // 4eee         #0
+    'F'        // 4eef         #5
+    'A'        // 4ef0         #0
+    'C'        // 4ef1         #2
+    'aA'       // 4ef2-4ef3    #0
+    'B'        // 4ef4         #1
+    'bA'       // 4ef5-4ef7    #0
+    'B'        // 4ef8         #1
+    'aD'       // 4ef9-4efa    #3
+    'A'        // 4efb         #0
+    'F'        // 4efc         #5
+    'A'        // 4efd         #0
+    'F'        // 4efe         #5
+    'bA'       // 4eff-4f01    #0
+    'aC'       // 4f02-4f03    #2
+    'aB'       // 4f04-4f05    #1
+    'aD'       // 4f06-4f07    #3
+    'C'        // 4f08         #2
+    'bA'       // 4f09-4f0b    #0
+    'F'        // 4f0c         #5
+    'dA'       // 4f0d-4f11    #0
+    'C'        // 4f12         #2
+    'aB'       // 4f13-4f14    #1
+    'C'        // 4f15         #2
+    'F'        // 4f16         #5
+    'C'        // 4f17         #2
+    'B'        // 4f18         #1
+    'C'        // 4f19         #2
+    'A'        // 4f1a         #0
+    'D'        // 4f1b         #3
+    'F'        // 4f1c         #5
+    'A'        // 4f1d         #0
+    'cD'       // 4f1e-4f21    #3
+    'B'        // 4f22         #1
+    'dD'       // 4f23-4f27    #3
+    'aB'       // 4f28-4f29    #1
+    'D'        // 4f2a         #3
+    'F'        // 4f2b         #5
+    'aB'       // 4f2c-4f2d    #1
+    'F'        // 4f2e         #5
+    'aA'       // 4f2f-4f30    #0
+    'F'        // 4f31         #5
+    'B'        // 4f32         #1
+    'C'        // 4f33         #2
+    'A'        // 4f34         #0
+    'F'        // 4f35         #5
+    'A'        // 4f36         #0
+    'C'        // 4f37         #2
+    'A'        // 4f38         #0
+    'C'        // 4f39         #2
+    'A'        // 4f3a         #0
+    'C'        // 4f3b         #2
+    'bA'       // 4f3c-4f3e    #0
+    'B'        // 4f3f         #1
+    'F'        // 4f40         #5
+    'B'        // 4f41         #1
+    'aA'       // 4f42-4f43    #0
+    'D'        // 4f44         #3
+    'B'        // 4f45         #1
+    'cA'       // 4f46-4f49    #0
+    'D'        // 4f4a         #3
+    'A'        // 4f4b         #0
+    'C'        // 4f4c         #2
+    'dA'       // 4f4d-4f51    #0
+    'C'        // 4f52         #2
+    'dA'       // 4f53-4f57    #0
+    'C'        // 4f58         #2
+    'fA'       // 4f59-4f5f    #0
+    'C'        // 4f60         #2
+    'aB'       // 4f61-4f62    #1
+    'aC'       // 4f63-4f64    #2
+    'aD'       // 4f65-4f66    #3
+    'B'        // 4f67         #1
+    'D'        // 4f68         #3
+    'aA'       // 4f69-4f6a    #0
+    'B'        // 4f6b         #1
+    'C'        // 4f6c         #2
+    'D'        // 4f6d         #3
+    'C'        // 4f6e         #2
+    'aA'       // 4f6f-4f70    #0
+    'F'        // 4f71         #5
+    'B'        // 4f72         #1
+    'A'        // 4f73         #0
+    'I'        // 4f74         #8
+    'C'        // 4f75         #2
+    'A'        // 4f76         #0
+    'C'        // 4f77         #2
+    'gA'       // 4f78-4f7f    #0
+    'I'        // 4f80         #8
+    'A'        // 4f81         #0
+    'C'        // 4f82         #2
+    'aA'       // 4f83-4f84    #0
+    'C'        // 4f85         #2
+    'A'        // 4f86         #0
+    'B'        // 4f87         #1
+    'cA'       // 4f88-4f8b    #0
+    'F'        // 4f8c         #5
+    'A'        // 4f8d         #0
+    'J'        // 4f8e         #9
+    'cA'       // 4f8f-4f92    #0
+    'F'        // 4f93         #5
+    'A'        // 4f94         #0
+    'B'        // 4f95         #1
+    'bA'       // 4f96-4f98    #0
+    'F'        // 4f99         #5
+    'aA'       // 4f9a-4f9b    #0
+    'I'        // 4f9c         #8
+    'A'        // 4f9d         #0
+    'C'        // 4f9e         #2
+    'bF'       // 4f9f-4fa1    #5
+    'B'        // 4fa2         #1
+    'dD'       // 4fa3-4fa7    #3
+    'B'        // 4fa8         #1
+    'aD'       // 4fa9-4faa    #3
+    'C'        // 4fab         #2
+    'D'        // 4fac         #3
+    'F'        // 4fad         #5
+    'aA'       // 4fae-4faf    #0
+    'B'        // 4fb0         #1
+    'D'        // 4fb1         #3
+    'A'        // 4fb2         #0
+    'aB'       // 4fb3-4fb4    #1
+    'aA'       // 4fb5-4fb6    #0
+    'C'        // 4fb7         #2
+    'D'        // 4fb8         #3
+    'A'        // 4fb9         #0
+    'B'        // 4fba         #1
+    'A'        // 4fbb         #0
+    'F'        // 4fbc         #5
+    'C'        // 4fbd         #2
+    'F'        // 4fbe         #5
+    'A'        // 4fbf         #0
+    'C'        // 4fc0         #2
+    'dA'       // 4fc1-4fc5    #0
+    'F'        // 4fc6         #5
+    'B'        // 4fc7         #1
+    'C'        // 4fc8         #2
+    'aA'       // 4fc9-4fca    #0
+    'C'        // 4fcb         #2
+    'eA'       // 4fcc-4fd1    #0
+    'J'        // 4fd2         #9
+    'aA'       // 4fd3-4fd4    #0
+    'D'        // 4fd5         #3
+    'B'        // 4fd6         #1
+    'aA'       // 4fd7-4fd8    #0
+    'I'        // 4fd9         #8
+    'aA'       // 4fda-4fdb    #0
+    'C'        // 4fdc         #2
+    'A'        // 4fdd         #0
+    'I'        // 4fde         #8
+    'bA'       // 4fdf-4fe1    #0
+    'F'        // 4fe2         #5
+    'J'        // 4fe3         #9
+    'aC'       // 4fe4-4fe5    #2
+    'F'        // 4fe6         #5
+    'dD'       // 4fe7-4feb    #3
+    'B'        // 4fec         #1
+    'D'        // 4fed         #3
+    'cA'       // 4fee-4ff1    #0
+    'C'        // 4ff2         #2
+    'A'        // 4ff3         #0
+    'I'        // 4ff4         #8
+    'aA'       // 4ff5-4ff6    #0
+    'B'        // 4ff7         #1
+    'A'        // 4ff8         #0
+    'B'        // 4ff9         #1
+    'A'        // 4ffa         #0
+    'D'        // 4ffb         #3
+    'F'        // 4ffc         #5
+    'C'        // 4ffd         #2
+    'A'        // 4ffe         #0
+    'F'        // 4fff         #5
+    'A'        // 5000         #0
+    'F'        // 5001         #5
+    'J'        // 5002         #9
+    'B'        // 5003         #1
+    'F'        // 5004         #5
+    'bA'       // 5005-5007    #0
+    'B'        // 5008         #1
+    'A'        // 5009         #0
+    'F'        // 500a         #5
+    'A'        // 500b         #0
+    'C'        // 500c         #2
+    'A'        // 500d         #0
+    'C'        // 500e         #2
+    'A'        // 500f         #0
+    'F'        // 5010         #5
+    'cA'       // 5011-5014    #0
+    'B'        // 5015         #1
+    'A'        // 5016         #0
+    'C'        // 5017         #2
+    'bA'       // 5018-501a    #0
+    'C'        // 501b         #2
+    'A'        // 501c         #0
+    'F'        // 501d         #5
+    'aA'       // 501e-501f    #0
+    'B'        // 5020         #1
+    'bA'       // 5021-5023    #0
+    'J'        // 5024         #9
+    'iA'       // 5025-502e    #0
+    'B'        // 502f         #1
+    'A'        // 5030         #0
+    'B'        // 5031         #1
+    'F'        // 5032         #5
+    'C'        // 5033         #2
+    'B'        // 5034         #1
+    'C'        // 5035         #2
+    'F'        // 5036         #5
+    'B'        // 5037         #1
+    'D'        // 5038         #3
+    'F'        // 5039         #5
+    'D'        // 503a         #3
+    'A'        // 503b         #0
+    'B'        // 503c         #1
+    'bD'       // 503d-503f    #3
+    'aC'       // 5040-5041    #2
+    'F'        // 5042         #5
+    'A'        // 5043         #0
+    'K'        // 5044         #10
+    'aC'       // 5045-5046    #2
+    'cA'       // 5047-504a    #0
+    'B'        // 504b         #1
+    'C'        // 504c         #2
+    'B'        // 504d         #1
+    'aA'       // 504e-504f    #0
+    'F'        // 5050         #5
+    'C'        // 5051         #2
+    'F'        // 5052         #5
+    'A'        // 5053         #0
+    'D'        // 5054         #3
+    'aA'       // 5055-5056    #0
+    'C'        // 5057         #2
+    'I'        // 5058         #8
+    'J'        // 5059         #9
+    'A'        // 505a         #0
+    'B'        // 505b         #1
+    'A'        // 505c         #0
+    'aB'       // 505d-505e    #1
+    'C'        // 505f         #2
+    'A'        // 5060         #0
+    'B'        // 5061         #1
+    'A'        // 5062         #0
+    'C'        // 5063         #2
+    'B'        // 5064         #1
+    'aA'       // 5065-5066    #0
+    'F'        // 5067         #5
+    'aB'       // 5068-5069    #1
+    'A'        // 506a         #0
+    'B'        // 506b         #1
+    'aC'       // 506c-506d    #2
+    'aB'       // 506e-506f    #1
+    'A'        // 5070         #0
+    'F'        // 5071         #5
+    'A'        // 5072         #0
+    'B'        // 5073         #1
+    'bA'       // 5074-5076    #0
+    'C'        // 5077         #2
+    'J'        // 5078         #9
+    'D'        // 5079         #3
+    'B'        // 507a         #1
+    'aD'       // 507b-507c    #3
+    'C'        // 507d         #2
+    'aD'       // 507e-507f    #3
+    'A'        // 5080         #0
+    'C'        // 5081         #2
+    'B'        // 5082         #1
+    'A'        // 5083         #0
+    'F'        // 5084         #5
+    'A'        // 5085         #0
+    'F'        // 5086         #5
+    'B'        // 5087         #1
+    'C'        // 5088         #2
+    'D'        // 5089         #3
+    'F'        // 508a         #5
+    'I'        // 508b         #8
+    'B'        // 508c         #1
+    'A'        // 508d         #0
+    'C'        // 508e         #2
+    'F'        // 508f         #5
+    'C'        // 5090         #2
+    'aA'       // 5091-5092    #0
+    'F'        // 5093         #5
+    'A'        // 5094         #0
+    'C'        // 5095         #2
+    'A'        // 5096         #0
+    'D'        // 5097         #3
+    'cA'       // 5098-509b    #0
+    'C'        // 509c         #2
+    'I'        // 509d         #8
+    'A'        // 509e         #0
+    'bF'       // 509f-50a1    #5
+    'A'        // 50a2         #0
+    'C'        // 50a3         #2
+    'aD'       // 50a4-50a5    #3
+    'B'        // 50a6         #1
+    'bD'       // 50a7-50a9    #3
+    'F'        // 50aa         #5
+    'D'        // 50ab         #3
+    'aA'       // 50ac-50ad    #0
+    'I'        // 50ae         #8
+    'bC'       // 50af-50b1    #2
+    'cA'       // 50b2-50b5    #0
+    'B'        // 50b6         #1
+    'A'        // 50b7         #0
+    'B'        // 50b8         #1
+    'F'        // 50b9         #5
+    'aC'       // 50ba-50bb    #2
+    'B'        // 50bc         #1
+    'aA'       // 50bd-50be    #0
+    'I'        // 50bf         #8
+    'F'        // 50c0         #5
+    'B'        // 50c1         #1
+    'A'        // 50c2         #0
+    'F'        // 50c3         #5
+    'aA'       // 50c4-50c5    #0
+    'B'        // 50c6         #1
+    'C'        // 50c7         #2
+    'B'        // 50c8         #1
+    'aA'       // 50c9-50ca    #0
+    'B'        // 50cb         #1
+    'F'        // 50cc         #5
+    'aC'       // 50cd-50ce    #2
+    'A'        // 50cf         #0
+    'C'        // 50d0         #2
+    'A'        // 50d1         #0
+    'D'        // 50d2         #3
+    'C'        // 50d3         #2
+    'bA'       // 50d4-50d6    #0
+    'B'        // 50d7         #1
+    'F'        // 50d8         #5
+    'C'        // 50d9         #2
+    'A'        // 50da         #0
+    'I'        // 50db         #8
+    'F'        // 50dc         #5
+    'C'        // 50dd         #2
+    'J'        // 50de         #9
+    'C'        // 50df         #2
+    'B'        // 50e0         #1
+    'C'        // 50e1         #2
+    'J'        // 50e2         #9
+    'aC'       // 50e3-50e4    #2
+    'bA'       // 50e5-50e7    #0
+    'C'        // 50e8         #2
+    'A'        // 50e9         #0
+    'B'        // 50ea         #1
+    'D'        // 50eb         #3
+    'I'        // 50ec         #8
+    'aA'       // 50ed-50ee    #0
+    'bC'       // 50ef-50f1    #2
+    'F'        // 50f2         #5
+    'aC'       // 50f3-50f4    #2
+    'A'        // 50f5         #0
+    'C'        // 50f6         #2
+    'D'        // 50f7         #3
+    'B'        // 50f8         #1
+    'A'        // 50f9         #0
+    'F'        // 50fa         #5
+    'A'        // 50fb         #0
+    'aB'       // 50fc-50fd    #1
+    'A'        // 50fe         #0
+    'I'        // 50ff         #8
+    'dA'       // 5100-5104    #0
+    'B'        // 5105         #1
+    'aA'       // 5106-5107    #0
+    'C'        // 5108         #2
+    'A'        // 5109         #0
+    'B'        // 510a         #1
+    'aA'       // 510b-510c    #0
+    'aC'       // 510d-510e    #2
+    'D'        // 510f         #3
+    'A'        // 5110         #0
+    'B'        // 5111         #1
+    'A'        // 5112         #0
+    'I'        // 5113         #8
+    'aA'       // 5114-5115    #0
+    'F'        // 5116         #5
+    'aA'       // 5117-5118    #0
+    'F'        // 5119         #5
+    'A'        // 511a         #0
+    'J'        // 511b         #9
+    'A'        // 511c         #0
+    'aF'       // 511d-511e    #5
+    'A'        // 511f         #0
+    'B'        // 5120         #1
+    'A'        // 5121         #0
+    'I'        // 5122         #8
+    'F'        // 5123         #5
+    'aI'       // 5124-5125    #8
+    'B'        // 5126         #1
+    'J'        // 5127         #9
+    'F'        // 5128         #5
+    'B'        // 5129         #1
+    'A'        // 512a         #0
+    'I'        // 512b         #8
+    'F'        // 512c         #5
+    'C'        // 512d         #2
+    'B'        // 512e         #1
+    'F'        // 512f         #5
+    'B'        // 5130         #1
+    'bA'       // 5131-5133    #0
+    'C'        // 5134         #2
+    'A'        // 5135         #0
+    'D'        // 5136         #3
+    'eA'       // 5137-513c    #0
+    'B'        // 513d         #1
+    'D'        // 513e         #3
+    'bA'       // 513f-5141    #0
+    'F'        // 5142         #5
+    'fA'       // 5143-5149    #0
+    'F'        // 514a         #5
+    'bA'       // 514b-514d    #0
+    'J'        // 514e         #9
+    'F'        // 514f         #5
+    'J'        // 5150         #9
+    'B'        // 5151         #1
+    'A'        // 5152         #0
+    'F'        // 5153         #5
+    'aA'       // 5154-5155    #0
+    'I'        // 5156         #8
+    'A'        // 5157         #0
+    'F'        // 5158         #5
+    'B'        // 5159         #1
+    'A'        // 515a         #0
+    'B'        // 515b         #1
+    'A'        // 515c         #0
+    'aB'       // 515d-515e    #1
+    'aC'       // 515f-5160    #2
+    'B'        // 5161         #1
+    'A'        // 5162         #0
+    'B'        // 5163         #1
+    'F'        // 5164         #5
+    'A'        // 5165         #0
+    'F'        // 5166         #5
+    'gA'       // 5167-516e    #0
+    'aD'       // 516f-5170    #3
+    'A'        // 5171         #0
+    'D'        // 5172         #3
+    'F'        // 5173         #5
+    'C'        // 5174         #2
+    'cA'       // 5175-5178    #0
+    'C'        // 5179         #2
+    'D'        // 517a         #3
+    'F'        // 517b         #5
+    'A'        // 517c         #0
+    'D'        // 517d         #3
+    'F'        // 517e         #5
+    'D'        // 517f         #3
+    'A'        // 5180         #0
+    'D'        // 5181         #3
+    'A'        // 5182         #0
+    'bF'       // 5183-5185    #5
+    'A'        // 5186         #0
+    'aB'       // 5187-5188    #1
+    'aA'       // 5189-518a    #0
+    'F'        // 518b         #5
+    'J'        // 518c         #9
+    'A'        // 518d         #0
+    'F'        // 518e         #5
+    'A'        // 518f         #0
+    'F'        // 5190         #5
+    'bA'       // 5191-5193    #0
+    'B'        // 5194         #1
+    'cA'       // 5195-5198    #0
+    'J'        // 5199         #9
+    'B'        // 519a         #1
+    'D'        // 519b         #3
+    'B'        // 519c         #1
+    'F'        // 519d         #5
+    'I'        // 519e         #8
+    'D'        // 519f         #3
+    'A'        // 51a0         #0
+    'F'        // 51a1         #5
+    'A'        // 51a2         #0
+    'J'        // 51a3         #9
+    'aA'       // 51a4-51a5    #0
+    'F'        // 51a6         #5
+    'B'        // 51a7         #1
+    'C'        // 51a8         #2
+    'F'        // 51a9         #5
+    'bA'       // 51aa-51ac    #0
+    'F'        // 51ad         #5
+    'B'        // 51ae         #1
+    'D'        // 51af         #3
+    'bA'       // 51b0-51b2    #0
+    'bC'       // 51b3-51b5    #2
+    'aA'       // 51b6-51b7    #0
+    'C'        // 51b8         #2
+    'B'        // 51b9         #1
+    'F'        // 51ba         #5
+    'D'        // 51bb         #3
+    'C'        // 51bc         #2
+    'aA'       // 51bd-51be    #0
+    'F'        // 51bf         #5
+    'aD'       // 51c0-51c1    #3
+    'F'        // 51c2         #5
+    'C'        // 51c3         #2
+    'bA'       // 51c4-51c6    #0
+    'B'        // 51c7         #1
+    'C'        // 51c8         #2
+    'dA'       // 51c9-51cd    #0
+    'B'        // 51ce         #1
+    'C'        // 51cf         #2
+    'B'        // 51d0         #1
+    'C'        // 51d1         #2
+    'A'        // 51d2         #0
+    'C'        // 51d3         #2
+    'A'        // 51d4         #0
+    'F'        // 51d5         #5
+    'J'        // 51d6         #9
+    'B'        // 51d7         #1
+    'C'        // 51d8         #2
+    'aD'       // 51d9-51da    #3
+    'cA'       // 51db-51de    #0
+    'C'        // 51df         #2
+    'aA'       // 51e0-51e1    #0
+    'C'        // 51e2         #2
+    'D'        // 51e3         #3
+    'B'        // 51e4         #1
+    'bF'       // 51e5-51e7    #5
+    'D'        // 51e8         #3
+    'J'        // 51e9         #9
+    'F'        // 51ea         #5
+    'D'        // 51eb         #3
+    'F'        // 51ec         #5
+    'A'        // 51ed         #0
+    'F'        // 51ee         #5
+    'D'        // 51ef         #3
+    'aA'       // 51f0-51f1    #0
+    'F'        // 51f2         #5
+    'cA'       // 51f3-51f6    #0
+    'F'        // 51f7         #5
+    'bA'       // 51f8-51fa    #0
+    'D'        // 51fb         #3
+    'B'        // 51fc         #1
+    'A'        // 51fd         #0
+    'C'        // 51fe         #2
+    'D'        // 51ff         #3
+    'cA'       // 5200-5203    #0
+    'F'        // 5204         #5
+    'C'        // 5205         #2
+    'bA'       // 5206-5208    #0
+    'B'        // 5209         #1
+    'A'        // 520a         #0
+    'C'        // 520b         #2
+    'B'        // 520c         #1
+    'D'        // 520d         #3
+    'A'        // 520e         #0
+    'D'        // 520f         #3
+    'B'        // 5210         #1
+    'A'        // 5211         #0
+    'C'        // 5212         #2
+    'A'        // 5213         #0
+    'aF'       // 5214-5215    #5
+    'aA'       // 5216-5217    #0
+    'F'        // 5218         #5
+    'bD'       // 5219-521b    #3
+    'B'        // 521c         #1
+    'A'        // 521d         #0
+    'cB'       // 521e-5221    #1
+    'F'        // 5222         #5
+    'D'        // 5223         #3
+    'cA'       // 5224-5227    #0
+    'C'        // 5228         #2
+    'aA'       // 5229-522a    #0
+    'F'        // 522b         #5
+    'aD'       // 522c-522d    #3
+    'A'        // 522e         #0
+    'D'        // 522f         #3
+    'cA'       // 5230-5233    #0
+    'B'        // 5234         #1
+    'C'        // 5235         #2
+    'bA'       // 5236-5238    #0
+    'J'        // 5239         #9
+    'aA'       // 523a-523b    #0
+    'C'        // 523c         #2
+    'cD'       // 523d-5240    #3
+    'B'        // 5241         #1
+    'D'        // 5242         #3
+    'aA'       // 5243-5244    #0
+    'F'        // 5245         #5
+    'I'        // 5246         #8
+    'A'        // 5247         #0
+    'D'        // 5248         #3
+    'dA'       // 5249-524d    #0
+    'B'        // 524e         #1
+    'C'        // 524f         #2
+    'aD'       // 5250-5251    #3
+    'B'        // 5252         #1
+    'D'        // 5253         #3
+    'cA'       // 5254-5257    #0
+    'F'        // 5258         #5
+    'B'        // 5259         #1
+    'aA'       // 525a-525b    #0
+    'C'        // 525c         #2
+    'bA'       // 525d-525f    #0
+    'C'        // 5260         #2
+    'A'        // 5261         #0
+    'B'        // 5262         #1
+    'cF'       // 5263-5266    #5
+    'D'        // 5267         #3
+    'B'        // 5268         #1
+    'aA'       // 5269-526a    #0
+    'B'        // 526b         #1
+    'C'        // 526c         #2
+    'B'        // 526d         #1
+    'C'        // 526e         #2
+    'A'        // 526f         #0
+    'aF'       // 5270-5271    #5
+    'A'        // 5272         #0
+    'C'        // 5273         #2
+    'aA'       // 5274-5275    #0
+    'D'        // 5276         #3
+    'A'        // 5277         #0
+    'aC'       // 5278-5279    #2
+    'I'        // 527a         #8
+    'aB'       // 527b-527c    #1
+    'A'        // 527d         #0
+    'D'        // 527e         #3
+    'A'        // 527f         #0
+    'C'        // 5280         #2
+    'B'        // 5281         #1
+    'aA'       // 5282-5283    #0
+    'C'        // 5284         #2
+    'F'        // 5285         #5
+    'D'        // 5286         #3
+    'bA'       // 5287-5289    #0
+    'C'        // 528a         #2
+    'B'        // 528b         #1
+    'C'        // 528c         #2
+    'A'        // 528d         #0
+    'D'        // 528e         #3
+    'aB'       // 528f-5290    #1
+    'A'        // 5291         #0
+    'J'        // 5292         #9
+    'A'        // 5293         #0
+    'C'        // 5294         #2
+    'F'        // 5295         #5
+    'C'        // 5296         #2
+    'aA'       // 5297-5298    #0
+    'B'        // 5299         #1
+    'C'        // 529a         #2
+    'A'        // 529b         #0
+    'F'        // 529c         #5
+    'aD'       // 529d-529e    #3
+    'aA'       // 529f-52a0    #0
+    'B'        // 52a1         #1
+    'D'        // 52a2         #3
+    'aA'       // 52a3-52a4    #0
+    'F'        // 52a5         #5
+    'C'        // 52a6         #2
+    'J'        // 52a7         #9
+    'B'        // 52a8         #1
+    'dA'       // 52a9-52ad    #0
+    'I'        // 52ae         #8
+    'bF'       // 52af-52b1    #5
+    'aD'       // 52b2-52b3    #3
+    'F'        // 52b4         #5
+    'C'        // 52b5         #2
+    'bF'       // 52b6-52b8    #5
+    'A'        // 52b9         #0
+    'F'        // 52ba         #5
+    'aC'       // 52bb-52bc    #2
+    'F'        // 52bd         #5
+    'A'        // 52be         #0
+    'D'        // 52bf         #3
+    'C'        // 52c0         #2
+    'A'        // 52c1         #0
+    'B'        // 52c2         #1
+    'A'        // 52c3         #0
+    'F'        // 52c4         #5
+    'A'        // 52c5         #0
+    'F'        // 52c6         #5
+    'A'        // 52c7         #0
+    'F'        // 52c8         #5
+    'A'        // 52c9         #0
+    'F'        // 52ca         #5
+    'D'        // 52cb         #3
+    'aA'       // 52cc-52cd    #0
+    'D'        // 52ce         #3
+    'F'        // 52cf         #5
+    'aC'       // 52d0-52d1    #2
+    'A'        // 52d2         #0
+    'B'        // 52d3         #1
+    'F'        // 52d4         #5
+    'aA'       // 52d5-52d6    #0
+    'C'        // 52d7         #2
+    'aA'       // 52d8-52d9    #0
+    'D'        // 52da         #3
+    'A'        // 52db         #0
+    'F'        // 52dc         #5
+    'gA'       // 52dd-52e4    #0
+    'F'        // 52e5         #5
+    'A'        // 52e6         #0
+    'aF'       // 52e7-52e8    #5
+    'C'        // 52e9         #2
+    'F'        // 52ea         #5
+    'B'        // 52eb         #1
+    'F'        // 52ec         #5
+    'K'        // 52ed         #10
+    'D'        // 52ee         #3
+    'B'        // 52ef         #1
+    'aC'       // 52f0-52f1    #2
+    'J'        // 52f2         #9
+    'A'        // 52f3         #0
+    'C'        // 52f4         #2
+    'A'        // 52f5         #0
+    'F'        // 52f6         #5
+    'C'        // 52f7         #2
+    'cA'       // 52f8-52fb    #0
+    'B'        // 52fc         #1
+    'D'        // 52fd         #3
+    'aA'       // 52fe-52ff    #0
+    'J'        // 5300         #9
+    'A'        // 5301         #0
+    'aJ'       // 5302-5303    #9
+    'D'        // 5304         #3
+    'A'        // 5305         #0
+    'C'        // 5306         #2
+    'F'        // 5307         #5
+    'A'        // 5308         #0
+    'B'        // 5309         #1
+    'A'        // 530a         #0
+    'C'        // 530b         #2
+    'J'        // 530c         #9
+    'A'        // 530d         #0
+    'B'        // 530e         #1
+    'aA'       // 530f-5310    #0
+    'C'        // 5311         #2
+    'B'        // 5312         #1
+    'F'        // 5313         #5
+    'D'        // 5314         #3
+    'bA'       // 5315-5317    #0
+    'F'        // 5318         #5
+    'aA'       // 5319-531a    #0
+    'F'        // 531b         #5
+    'aC'       // 531c-531d    #2
+    'F'        // 531e         #5
+    'C'        // 531f         #2
+    'aA'       // 5320-5321    #0
+    'B'        // 5322         #1
+    'A'        // 5323         #0
+    'C'        // 5324         #2
+    'F'        // 5325         #5
+    'D'        // 5326         #3
+    'A'        // 5327         #0
+    'aF'       // 5328-5329    #5
+    'A'        // 532a         #0
+    'F'        // 532b         #5
+    'aC'       // 532c-532d    #2
+    'D'        // 532e         #3
+    'A'        // 532f         #0
+    'C'        // 5330         #2
+    'A'        // 5331         #0
+    'aC'       // 5332-5333    #2
+    'B'        // 5334         #1
+    'F'        // 5335         #5
+    'K'        // 5336         #10
+    'B'        // 5337         #1
+    'aA'       // 5338-5339    #0
+    'J'        // 533a         #9
+    'A'        // 533b         #0
+    'C'        // 533c         #2
+    'dA'       // 533d-5341    #0
+    'C'        // 5342         #2
+    'A'        // 5343         #0
+    'I'        // 5344         #8
+    'A'        // 5345         #0
+    'F'        // 5346         #5
+    'cA'       // 5347-534a    #0
+    'F'        // 534b         #5
+    'C'        // 534c         #2
+    'A'        // 534d         #0
+    'B'        // 534e         #1
+    'aD'       // 534f-5350    #3
+    'cA'       // 5351-5354    #0
+    'aD'       // 5355-5356    #3
+    'A'        // 5357         #0
+    'aF'       // 5358-5359    #5
+    'A'        // 535a         #0
+    'F'        // 535b         #5
+    'A'        // 535c         #0
+    'B'        // 535d         #1
+    'A'        // 535e         #0
+    'B'        // 535f         #1
+    'aA'       // 5360-5361    #0
+    'D'        // 5362         #3
+    'C'        // 5363         #2
+    'A'        // 5364         #0
+    'F'        // 5365         #5
+    'A'        // 5366         #0
+    'C'        // 5367         #2
+    'K'        // 5368         #10
+    'A'        // 5369         #0
+    'aD'       // 536a-536b    #3
+    'A'        // 536c         #0
+    'C'        // 536d         #2
+    'gA'       // 536e-5375    #0
+    'D'        // 5376         #3
+    'bA'       // 5377-5379    #0
+    'J'        // 537a         #9
+    'A'        // 537b         #0
+    'B'        // 537c         #1
+    'bA'       // 537d-537f    #0
+    'aD'       // 5380-5381    #3
+    'A'        // 5382         #0
+    'F'        // 5383         #5
+    'A'        // 5384         #0
+    'aD'       // 5385-5386    #3
+    'bF'       // 5387-5389    #5
+    'B'        // 538a         #1
+    'bD'       // 538b-538d    #3
+    'A'        // 538e         #0
+    'B'        // 538f         #1
+    'aD'       // 5390-5391    #3
+    'B'        // 5392         #1
+    'A'        // 5393         #0
+    'C'        // 5394         #2
+    'D'        // 5395         #3
+    'A'        // 5396         #0
+    'B'        // 5397         #1
+    'A'        // 5398         #0
+    'C'        // 5399         #2
+    'A'        // 539a         #0
+    'D'        // 539b         #3
+    'B'        // 539c         #1
+    'A'        // 539d         #0
+    'B'        // 539e         #1
+    'aA'       // 539f-53a0    #0
+    'F'        // 53a1         #5
+    'B'        // 53a2         #1
+    'D'        // 53a3         #3
+    'C'        // 53a4         #2
+    'aA'       // 53a5-53a6    #0
+    'B'        // 53a7         #1
+    'aC'       // 53a8-53a9    #2
+    'A'        // 53aa         #0
+    'C'        // 53ab         #2
+    'B'        // 53ac         #1
+    'aA'       // 53ad-53ae    #0
+    'F'        // 53af         #5
+    'C'        // 53b0         #2
+    'D'        // 53b1         #3
+    'A'        // 53b2         #0
+    'J'        // 53b3         #9
+    'C'        // 53b4         #2
+    'F'        // 53b5         #5
+    'A'        // 53b6         #0
+    'aF'       // 53b7-53b8    #5
+    'I'        // 53b9         #8
+    'F'        // 53ba         #5
+    'A'        // 53bb         #0
+    'D'        // 53bc         #3
+    'F'        // 53bd         #5
+    'aD'       // 53be-53bf    #3
+    'F'        // 53c0         #5
+    'C'        // 53c1         #2
+    'aA'       // 53c2-53c3    #0
+    'F'        // 53c4         #5
+    'A'        // 53c5         #0
+    'aD'       // 53c6-53c7    #3
+    'eA'       // 53c8-53cd    #0
+    'aF'       // 53ce-53cf    #5
+    'aB'       // 53d0-53d1    #1
+    'C'        // 53d2         #2
+    'F'        // 53d3         #5
+    'A'        // 53d4         #0
+    'F'        // 53d5         #5
+    'aA'       // 53d6-53d7    #0
+    'B'        // 53d8         #1
+    'A'        // 53d9         #0
+    'C'        // 53da         #2
+    'A'        // 53db         #0
+    'D'        // 53dc         #3
+    'aF'       // 53dd-53de    #5
+    'A'        // 53df         #0
+    'C'        // 53e0         #2
+    'eA'       // 53e1-53e6    #0
+    'F'        // 53e7         #5
+    'kA'       // 53e8-53f3    #0
+    'J'        // 53f4         #9
+    'cA'       // 53f5-53f8    #0
+    'D'        // 53f9         #3
+    'F'        // 53fa         #5
+    'aB'       // 53fb-53fc    #1
+    'D'        // 53fd         #3
+    'B'        // 53fe         #1
+    'aD'       // 53ff-5400    #3
+    'A'        // 5401         #0
+    'F'        // 5402         #5
+    'aA'       // 5403-5404    #0
+    'D'        // 5405         #3
+    'aB'       // 5406-5407    #1
+    'iA'       // 5408-5411    #0
+    'aC'       // 5412-5413    #2
+    'B'        // 5414         #1
+    'D'        // 5415         #3
+    'B'        // 5416         #1
+    'D'        // 5417         #3
+    'aB'       // 5418-5419    #1
+    'C'        // 541a         #2
+    'A'        // 541b         #0
+    'B'        // 541c         #1
+    'A'        // 541d         #0
+    'C'        // 541e         #2
+    'aA'       // 541f-5420    #0
+    'C'        // 5421         #2
+    'D'        // 5422         #3
+    'B'        // 5423         #1
+    'C'        // 5424         #2
+    'B'        // 5425         #1
+    'A'        // 5426         #0
+    'aC'       // 5427-5428    #2
+    'A'        // 5429         #0
+    'C'        // 542a         #2
+    'aA'       // 542b-542c    #0
+    'C'        // 542d         #2
+    'A'        // 542e         #0
+    'C'        // 542f         #2
+    'B'        // 5430         #1
+    'A'        // 5431         #0
+    'B'        // 5432         #1
+    'A'        // 5433         #0
+    'aC'       // 5434-5435    #2
+    'A'        // 5436         #0
+    'B'        // 5437         #1
+    'aA'       // 5438-5439    #0
+    'D'        // 543a         #3
+    'cA'       // 543b-543e    #0
+    'C'        // 543f         #2
+    'A'        // 5440         #0
+    'B'        // 5441         #1
+    'A'        // 5442         #0
+    'C'        // 5443         #2
+    'F'        // 5444         #5
+    'B'        // 5445         #1
+    'A'        // 5446         #0
+    'C'        // 5447         #2
+    'A'        // 5448         #0
+    'F'        // 5449         #5
+    'A'        // 544a         #0
+    'B'        // 544b         #1
+    'aC'       // 544c-544d    #2
+    'A'        // 544e         #0
+    'C'        // 544f         #2
+    'D'        // 5450         #3
+    'J'        // 5451         #9
+    'aD'       // 5452-5453    #3
+    'B'        // 5454         #1
+    'F'        // 5455         #5
+    'fD'       // 5456-545c    #3
+    'K'        // 545d         #10
+    'F'        // 545e         #5
+    'J'        // 545f         #9
+    'aB'       // 5460-5461    #1
+    'A'        // 5462         #0
+    'B'        // 5463         #1
+    'A'        // 5464         #0
+    'B'        // 5465         #1
+    'A'        // 5466         #0
+    'C'        // 5467         #2
+    'A'        // 5468         #0
+    'C'        // 5469         #2
+    'aA'       // 546a-546b    #0
+    'aC'       // 546c-546d    #2
+    'F'        // 546e         #5
+    'B'        // 546f         #1
+    'aA'       // 5470-5471    #0
+    'B'        // 5472         #1
+    'A'        // 5473         #0
+    'C'        // 5474         #2
+    'aA'       // 5475-5476    #0
+    'C'        // 5477         #2
+    'B'        // 5478         #1
+    'D'        // 5479         #3
+    'B'        // 547a         #1
+    'bA'       // 547b-547d    #0
+    'B'        // 547e         #1
+    'aA'       // 547f-5480    #0
+    'C'        // 5481         #2
+    'B'        // 5482         #1
+    'F'        // 5483         #5
+    'A'        // 5484         #0
+    'C'        // 5485         #2
+    'A'        // 5486         #0
+    'I'        // 5487         #8
+    'C'        // 5488         #2
+    'aF'       // 5489-548a    #5
+    'eA'       // 548b-5490    #0
+    'aC'       // 5491-5492    #2
+    'aB'       // 5493-5494    #1
+    'C'        // 5495         #2
+    'A'        // 5496         #0
+    'aB'       // 5497-5498    #1
+    'D'        // 5499         #3
+    'B'        // 549a         #1
+    'D'        // 549b         #3
+    'C'        // 549c         #2
+    'D'        // 549d         #3
+    'B'        // 549e         #1
+    'F'        // 549f         #5
+    'A'        // 54a0         #0
+    'C'        // 54a1         #2
+    'A'        // 54a2         #0
+    'B'        // 54a3         #1
+    'aA'       // 54a4-54a5    #0
+    'aC'       // 54a6-54a7    #2
+    'A'        // 54a8         #0
+    'aC'       // 54a9-54aa    #2
+    'aA'       // 54ab-54ac    #0
+    'aC'       // 54ad-54ae    #2
+    'A'        // 54af         #0
+    'B'        // 54b0         #1
+    'C'        // 54b1         #2
+    'aA'       // 54b2-54b3    #0
+    'B'        // 54b4         #1
+    'D'        // 54b5         #3
+    'B'        // 54b6         #1
+    'C'        // 54b7         #2
+    'A'        // 54b8         #0
+    'aC'       // 54b9-54ba    #2
+    'bA'       // 54bb-54bd    #0
+    'C'        // 54be         #2
+    'eA'       // 54bf-54c4    #0
+    'B'        // 54c5         #1
+    'cA'       // 54c6-54c9    #0
+    'F'        // 54ca         #5
+    'aB'       // 54cb-54cc    #1
+    'aC'       // 54cd-54ce    #2
+    'aB'       // 54cf-54d0    #1
+    'dD'       // 54d1-54d5    #3
+    'B'        // 54d6         #1
+    'D'        // 54d7         #3
+    'F'        // 54d8         #5
+    'D'        // 54d9         #3
+    'B'        // 54da         #1
+    'bD'       // 54db-54dd    #3
+    'B'        // 54de         #1
+    'D'        // 54df         #3
+    'C'        // 54e0         #2
+    'A'        // 54e1         #0
+    'C'        // 54e2         #2
+    'aB'       // 54e3-54e4    #1
+    'aA'       // 54e5-54e6    #0
+    'B'        // 54e7         #1
+    'aA'       // 54e8-54e9    #0
+    'C'        // 54ea         #2
+    'B'        // 54eb         #1
+    'F'        // 54ec         #5
+    'aA'       // 54ed-54ee    #0
+    'C'        // 54ef         #2
+    'D'        // 54f0         #3
+    'aA'       // 54f1-54f2    #0
+    'C'        // 54f3         #2
+    'aD'       // 54f4-54f5    #3
+    'F'        // 54f6         #5
+    'aB'       // 54f7-54f8    #1
+    'D'        // 54f9         #3
+    'A'        // 54fa         #0
+    'B'        // 54fb         #1
+    'C'        // 54fc         #2
+    'A'        // 54fd         #0
+    'F'        // 54fe         #5
+    'A'        // 54ff         #0
+    'F'        // 5500         #5
+    'C'        // 5501         #2
+    'aB'       // 5502-5503    #1
+    'A'        // 5504         #0
+    'C'        // 5505         #2
+    'aA'       // 5506-5507    #0
+    'C'        // 5508         #2
+    'A'        // 5509         #0
+    'aB'       // 550a-550b    #1
+    'aC'       // 550c-550d    #2
+    'bA'       // 550e-5510    #0
+    'bB'       // 5511-5513    #1
+    'A'        // 5514         #0
+    'aF'       // 5515-5516    #5
+    'aB'       // 5517-5518    #1
+    'D'        // 5519         #3
+    'B'        // 551a         #1
+    'D'        // 551b         #3
+    'K'        // 551c         #10
+    'D'        // 551d         #3
+    'B'        // 551e         #1
+    'cD'       // 551f-5522    #3
+    'B'        // 5523         #1
+    'D'        // 5524         #3
+    'aB'       // 5525-5526    #1
+    'C'        // 5527         #2
+    'B'        // 5528         #1
+    'D'        // 5529         #3
+    'C'        // 552a         #2
+    'A'        // 552b         #0
+    'aB'       // 552c-552d    #1
+    'aA'       // 552e-552f    #0
+    'B'        // 5530         #1
+    'A'        // 5531         #0
+    'C'        // 5532         #2
+    'A'        // 5533         #0
+    'B'        // 5534         #1
+    'A'        // 5535         #0
+    'C'        // 5536         #2
+    'B'        // 5537         #1
+    'C'        // 5538         #2
+    'A'        // 5539         #0
+    'D'        // 553a         #3
+    'C'        // 553b         #2
+    'A'        // 553c         #0
+    'F'        // 553d         #5
+    'A'        // 553e         #0
+    'B'        // 553f         #1
+    'A'        // 5540         #0
+    'C'        // 5541         #2
+    'K'        // 5542         #10
+    'B'        // 5543         #1
+    'A'        // 5544         #0
+    'C'        // 5545         #2
+    'A'        // 5546         #0
+    'C'        // 5547         #2
+    'B'        // 5548         #1
+    'C'        // 5549         #2
+    'A'        // 554a         #0
+    'B'        // 554b         #1
+    'F'        // 554c         #5
+    'C'        // 554d         #2
+    'B'        // 554e         #1
+    'A'        // 554f         #0
+    'aC'       // 5550-5551    #2
+    'B'        // 5552         #1
+    'A'        // 5553         #0
+    'D'        // 5554         #3
+    'B'        // 5555         #1
+    'aA'       // 5556-5557    #0
+    'F'        // 5558         #5
+    'D'        // 5559         #3
+    'aF'       // 555a-555b    #5
+    'A'        // 555c         #0
+    'C'        // 555d         #2
+    'A'        // 555e         #0
+    'B'        // 555f         #1
+    'F'        // 5560         #5
+    'C'        // 5561         #2
+    'B'        // 5562         #1
+    'A'        // 5563         #0
+    'C'        // 5564         #2
+    'B'        // 5565         #1
+    'C'        // 5566         #2
+    'aD'       // 5567-5568    #3
+    'bB'       // 5569-556b    #1
+    'dD'       // 556c-5570    #3
+    'bB'       // 5571-5573    #1
+    'D'        // 5574         #3
+    'bB'       // 5575-5577    #1
+    'D'        // 5578         #3
+    'B'        // 5579         #1
+    'D'        // 557a         #3
+    'fA'       // 557b-5581    #0
+    'C'        // 5582         #2
+    'aA'       // 5583-5584    #0
+    'D'        // 5585         #3
+    'aA'       // 5586-5587    #0
+    'C'        // 5588         #2
+    'bA'       // 5589-558b    #0
+    'aB'       // 558c-558d    #1
+    'aC'       // 558e-558f    #2
+    'B'        // 5590         #1
+    'A'        // 5591         #0
+    'C'        // 5592         #2
+    'aA'       // 5593-5594    #0
+    'B'        // 5595         #1
+    'D'        // 5596         #3
+    'F'        // 5597         #5
+    'bA'       // 5598-559a    #0
+    'D'        // 559b         #3
+    'aA'       // 559c-559d    #0
+    'J'        // 559e         #9
+    'A'        // 559f         #0
+    'D'        // 55a0         #3
+    'aB'       // 55a1-55a2    #1
+    'aA'       // 55a3-55a4    #0
+    'aB'       // 55a5-55a6    #1
+    'eA'       // 55a7-55ac    #0
+    'C'        // 55ad         #2
+    'A'        // 55ae         #0
+    'D'        // 55af         #3
+    'A'        // 55b0         #0
+    'B'        // 55b1         #1
+    'C'        // 55b2         #2
+    'bB'       // 55b3-55b5    #1
+    'F'        // 55b6         #5
+    'aD'       // 55b7-55b8    #3
+    'cB'       // 55b9-55bc    #1
+    'aD'       // 55bd-55be    #3
+    'C'        // 55bf         #2
+    'B'        // 55c0         #1
+    'C'        // 55c1         #2
+    'B'        // 55c2         #1
+    'A'        // 55c3         #0
+    'C'        // 55c4         #2
+    'A'        // 55c5         #0
+    'C'        // 55c6         #2
+    'A'        // 55c7         #0
+    'B'        // 55c8         #1
+    'A'        // 55c9         #0
+    'B'        // 55ca         #1
+    'aC'       // 55cb-55cc    #2
+    'B'        // 55cd         #1
+    'C'        // 55ce         #2
+    'aB'       // 55cf-55d0    #1
+    'A'        // 55d1         #0
+    'aC'       // 55d2-55d3    #2
+    'A'        // 55d4         #0
+    'aB'       // 55d5-55d6    #1
+    'aC'       // 55d7-55d8    #2
+    'B'        // 55d9         #1
+    'bA'       // 55da-55dc    #0
+    'aC'       // 55dd-55de    #2
+    'A'        // 55df         #0
+    'K'        // 55e0         #10
+    'B'        // 55e1         #1
+    'bA'       // 55e2-55e4    #0
+    'cB'       // 55e5-55e8    #1
+    'C'        // 55e9         #2
+    'B'        // 55ea         #1
+    'D'        // 55eb         #3
+    'C'        // 55ec         #2
+    'D'        // 55ed         #3
+    'C'        // 55ee         #2
+    'aB'       // 55ef-55f0    #1
+    'C'        // 55f1         #2
+    'B'        // 55f2         #1
+    'aD'       // 55f3-55f4    #3
+    'B'        // 55f5         #1
+    'C'        // 55f6         #2
+    'A'        // 55f7         #0
+    'F'        // 55f8         #5
+    'C'        // 55f9         #2
+    'bB'       // 55fa-55fc    #1
+    'bA'       // 55fd-55ff    #0
+    'bB'       // 5600-5602    #1
+    'D'        // 5603         #3
+    'I'        // 5604         #8
+    'C'        // 5605         #2
+    'A'        // 5606         #0
+    'F'        // 5607         #5
+    'aA'       // 5608-5609    #0
+    'F'        // 560a         #5
+    'D'        // 560b         #3
+    'I'        // 560c         #8
+    'cA'       // 560d-5610    #0
+    'C'        // 5611         #2
+    'A'        // 5612         #0
+    'B'        // 5613         #1
+    'A'        // 5614         #0
+    'B'        // 5615         #1
+    'aA'       // 5616-5617    #0
+    'aF'       // 5618-5619    #5
+    'D'        // 561a         #3
+    'C'        // 561b         #2
+    'cB'       // 561c-561f    #1
+    'C'        // 5620         #2
+    'bB'       // 5621-5623    #1
+    'D'        // 5624         #3
+    'B'        // 5625         #1
+    'D'        // 5626         #3
+    'B'        // 5627         #1
+    'F'        // 5628         #5
+    'A'        // 5629         #0
+    'B'        // 562a         #1
+    'D'        // 562b         #3
+    'A'        // 562c         #0
+    'aB'       // 562d-562e    #1
+    'A'        // 562f         #0
+    'C'        // 5630         #2
+    'F'        // 5631         #5
+    'A'        // 5632         #0
+    'C'        // 5633         #2
+    'A'        // 5634         #0
+    'C'        // 5635         #2
+    'cA'       // 5636-5639    #0
+    'B'        // 563a         #1
+    'A'        // 563b         #0
+    'F'        // 563c         #5
+    'C'        // 563d         #2
+    'B'        // 563e         #1
+    'A'        // 563f         #0
+    'C'        // 5640         #2
+    'aA'       // 5641-5642    #0
+    'C'        // 5643         #2
+    'F'        // 5644         #5
+    'B'        // 5645         #1
+    'C'        // 5646         #2
+    'F'        // 5647         #5
+    'B'        // 5648         #1
+    'A'        // 5649         #0
+    'B'        // 564a         #1
+    'J'        // 564b         #9
+    'C'        // 564c         #2
+    'bA'       // 564d-564f    #0
+    'C'        // 5650         #2
+    'D'        // 5651         #3
+    'B'        // 5652         #1
+    'A'        // 5653         #0
+    'C'        // 5654         #2
+    'aD'       // 5655-5656    #3
+    'cB'       // 5657-565a    #1
+    'F'        // 565b         #5
+    'D'        // 565c         #3
+    'B'        // 565d         #1
+    'C'        // 565e         #2
+    'D'        // 565f         #3
+    'cC'       // 5660-5663    #2
+    'A'        // 5664         #0
+    'I'        // 5665         #8
+    'C'        // 5666         #2
+    'D'        // 5667         #3
+    'eA'       // 5668-566d    #0
+    'B'        // 566e         #1
+    'A'        // 566f         #0
+    'B'        // 5670         #1
+    'C'        // 5671         #2
+    'A'        // 5672         #0
+    'B'        // 5673         #1
+    'A'        // 5674         #0
+    'F'        // 5675         #5
+    'A'        // 5676         #0
+    'B'        // 5677         #1
+    'A'        // 5678         #0
+    'B'        // 5679         #1
+    'A'        // 567a         #0
+    'aB'       // 567b-567c    #1
+    'D'        // 567d         #3
+    'aB'       // 567e-567f    #1
+    'A'        // 5680         #0
+    'bB'       // 5681-5683    #1
+    'A'        // 5684         #0
+    'C'        // 5685         #2
+    'aA'       // 5686-5687    #0
+    'F'        // 5688         #5
+    'B'        // 5689         #1
+    'bC'       // 568a-568c    #2
+    'aB'       // 568d-568e    #1
+    'A'        // 568f         #0
+    'B'        // 5690         #1
+    'D'        // 5691         #3
+    'aB'       // 5692-5693    #1
+    'F'        // 5694         #5
+    'C'        // 5695         #2
+    'D'        // 5696         #3
+    'aB'       // 5697-5698    #1
+    'aA'       // 5699-569a    #0
+    'D'        // 569b         #3
+    'B'        // 569c         #1
+    'bC'       // 569d-569f    #2
+    'F'        // 56a0         #5
+    'B'        // 56a1         #1
+    'F'        // 56a2         #5
+    'D'        // 56a3         #3
+    'B'        // 56a4         #1
+    'A'        // 56a5         #0
+    'C'        // 56a6         #2
+    'A'        // 56a7         #0
+    'C'        // 56a8         #2
+    'F'        // 56a9         #5
+    'B'        // 56aa         #1
+    'C'        // 56ab         #2
+    'A'        // 56ac         #0
+    'C'        // 56ad         #2
+    'A'        // 56ae         #0
+    'B'        // 56af         #1
+    'D'        // 56b0         #3
+    'aC'       // 56b1-56b2    #2
+    'aA'       // 56b3-56b4    #0
+    'B'        // 56b5         #1
+    'A'        // 56b6         #0
+    'C'        // 56b7         #2
+    'D'        // 56b8         #3
+    'B'        // 56b9         #1
+    'aD'       // 56ba-56bb    #3
+    'A'        // 56bc         #0
+    'B'        // 56bd         #1
+    'C'        // 56be         #2
+    'B'        // 56bf         #1
+    'cA'       // 56c0-56c3    #0
+    'D'        // 56c4         #3
+    'C'        // 56c5         #2
+    'B'        // 56c6         #1
+    'D'        // 56c7         #3
+    'bA'       // 56c8-56ca    #0
+    'aC'       // 56cb-56cc    #2
+    'A'        // 56cd         #0
+    'bF'       // 56ce-56d0    #5
+    'A'        // 56d1         #0
+    'D'        // 56d2         #3
+    'C'        // 56d3         #2
+    'B'        // 56d4         #1
+    'D'        // 56d5         #3
+    'B'        // 56d6         #1
+    'A'        // 56d7         #0
+    'aF'       // 56d8-56d9    #5
+    'aA'       // 56da-56db    #0
+    'F'        // 56dc         #5
+    'C'        // 56dd         #2
+    'bA'       // 56de-56e0    #0
+    'C'        // 56e1         #2
+    'B'        // 56e2         #1
+    'J'        // 56e3         #9
+    'aC'       // 56e4-56e5    #2
+    'J'        // 56e6         #9
+    'A'        // 56e7         #0
+    'F'        // 56e8         #5
+    'D'        // 56e9         #3
+    'B'        // 56ea         #1
+    'A'        // 56eb         #0
+    'D'        // 56ec         #3
+    'aA'       // 56ed-56ee    #0
+    'B'        // 56ef         #1
+    'A'        // 56f0         #0
+    'C'        // 56f1         #2
+    'F'        // 56f2         #5
+    'J'        // 56f3         #9
+    'aD'       // 56f4-56f5    #3
+    'F'        // 56f6         #5
+    'A'        // 56f7         #0
+    'D'        // 56f8         #3
+    'aA'       // 56f9-56fa    #0
+    'B'        // 56fb         #1
+    'D'        // 56fc         #3
+    'A'        // 56fd         #0
+    'D'        // 56fe         #3
+    'A'        // 56ff         #0
+    'C'        // 5700         #2
+    'cA'       // 5701-5704    #0
+    'aD'       // 5705-5706    #3
+    'dA'       // 5707-570b    #0
+    'C'        // 570c         #2
+    'A'        // 570d         #0
+    'D'        // 570e         #3
+    'F'        // 570f         #5
+    'D'        // 5710         #3
+    'F'        // 5711         #5
+    'aA'       // 5712-5713    #0
+    'B'        // 5714         #1
+    'C'        // 5715         #2
+    'A'        // 5716         #0
+    'D'        // 5717         #3
+    'A'        // 5718         #0
+    'D'        // 5719         #3
+    'aC'       // 571a-571b    #2
+    'A'        // 571c         #0
+    'C'        // 571d         #2
+    'B'        // 571e         #1
+    'A'        // 571f         #0
+    'C'        // 5720         #2
+    'F'        // 5721         #5
+    'aC'       // 5722-5723    #2
+    'F'        // 5724         #5
+    'J'        // 5725         #9
+    'aF'       // 5726-5727    #5
+    'bA'       // 5728-572a    #0
+    'D'        // 572b         #3
+    'bA'       // 572c-572e    #0
+    'C'        // 572f         #2
+    'A'        // 5730         #0
+    'D'        // 5731         #3
+    'B'        // 5732         #1
+    'aC'       // 5733-5734    #2
+    'aD'       // 5735-5736    #3
+    'aF'       // 5737-5738    #5
+    'aD'       // 5739-573a    #3
+    'A'        // 573b         #0
+    'D'        // 573c         #3
+    'C'        // 573d         #2
+    'A'        // 573e         #0
+    'C'        // 573f         #2
+    'A'        // 5740         #0
+    'I'        // 5741         #8
+    'A'        // 5742         #0
+    'B'        // 5743         #1
+    'D'        // 5744         #3
+    'aC'       // 5745-5746    #2
+    'A'        // 5747         #0
+    'D'        // 5748         #3
+    'B'        // 5749         #1
+    'A'        // 574a         #0
+    'B'        // 574b         #1
+    'eA'       // 574c-5751    #0
+    'C'        // 5752         #2
+    'D'        // 5753         #3
+    'B'        // 5754         #1
+    'aD'       // 5755-5756    #3
+    'B'        // 5757         #1
+    'D'        // 5758         #3
+    'F'        // 5759         #5
+    'D'        // 575a         #3
+    'B'        // 575b         #1
+    'bD'       // 575c-575e    #3
+    'C'        // 575f         #2
+    'D'        // 5760         #3
+    'A'        // 5761         #0
+    'C'        // 5762         #2
+    'D'        // 5763         #3
+    'A'        // 5764         #0
+    'F'        // 5765         #5
+    'dA'       // 5766-576a    #0
+    'C'        // 576b         #2
+    'D'        // 576c         #3
+    'C'        // 576d         #2
+    'J'        // 576e         #9
+    'bA'       // 576f-5771    #0
+    'B'        // 5772         #1
+    'A'        // 5773         #0
+    'C'        // 5774         #2
+    'A'        // 5775         #0
+    'B'        // 5776         #1
+    'A'        // 5777         #0
+    'K'        // 5778         #10
+    'F'        // 5779         #5
+    'C'        // 577a         #2
+    'aA'       // 577b-577c    #0
+    'B'        // 577d         #1
+    'aC'       // 577e-577f    #2
+    'B'        // 5780         #1
+    'F'        // 5781         #5
+    'A'        // 5782         #0
+    'C'        // 5783         #2
+    'cD'       // 5784-5787    #3
+    'A'        // 5788         #0
+    'F'        // 5789         #5
+    'B'        // 578a         #1
+    'aA'       // 578b-578c    #0
+    'B'        // 578d         #1
+    'D'        // 578e         #3
+    'aB'       // 578f-5790    #1
+    'aD'       // 5791-5792    #3
+    'A'        // 5793         #0
+    'C'        // 5794         #2
+    'A'        // 5795         #0
+    'D'        // 5796         #3
+    'C'        // 5797         #2
+    'B'        // 5798         #1
+    'aC'       // 5799-579a    #2
+    'B'        // 579b         #1
+    'aC'       // 579c-579d    #2
+    'A'        // 579e         #0
+    'C'        // 579f         #2
+    'A'        // 57a0         #0
+    'C'        // 57a1         #2
+    'bA'       // 57a2-57a4    #0
+    'B'        // 57a5         #1
+    'D'        // 57a6         #3
+    'C'        // 57a7         #2
+    'aF'       // 57a8-57a9    #5
+    'C'        // 57aa         #2
+    'D'        // 57ab         #3
+    'F'        // 57ac         #5
+    'D'        // 57ad         #3
+    'C'        // 57ae         #2
+    'D'        // 57af         #3
+    'F'        // 57b0         #5
+    'aD'       // 57b1-57b2    #3
+    'C'        // 57b3         #2
+    'bB'       // 57b4-57b6    #1
+    'D'        // 57b7         #3
+    'A'        // 57b8         #0
+    'cB'       // 57b9-57bc    #1
+    'A'        // 57bd         #0
+    'aB'       // 57be-57bf    #1
+    'F'        // 57c0         #5
+    'aB'       // 57c1-57c2    #1
+    'A'        // 57c3         #0
+    'B'        // 57c4         #1
+    'D'        // 57c5         #3
+    'bA'       // 57c6-57c8    #0
+    'K'        // 57c9         #10
+    'D'        // 57ca         #3
+    'A'        // 57cb         #0
+    'C'        // 57cc         #2
+    'D'        // 57cd         #3
+    'aA'       // 57ce-57cf    #0
+    'B'        // 57d0         #1
+    'K'        // 57d1         #10
+    'A'        // 57d2         #0
+    'F'        // 57d3         #5
+    'aC'       // 57d4-57d5    #2
+    'F'        // 57d6         #5
+    'C'        // 57d7         #2
+    'cD'       // 57d8-57db    #3
+    'A'        // 57dc         #0
+    'aC'       // 57dd-57de    #2
+    'aA'       // 57df-57e0    #0
+    'C'        // 57e1         #2
+    'B'        // 57e2         #1
+    'C'        // 57e3         #2
+    'A'        // 57e4         #0
+    'B'        // 57e5         #1
+    'aC'       // 57e6-57e7    #2
+    'D'        // 57e8         #3
+    'A'        // 57e9         #0
+    'aD'       // 57ea-57eb    #3
+    'B'        // 57ec         #1
+    'A'        // 57ed         #0
+    'I'        // 57ee         #8
+    'B'        // 57ef         #1
+    'A'        // 57f0         #0
+    'aB'       // 57f1-57f2    #1
+    'I'        // 57f3         #8
+    'A'        // 57f4         #0
+    'C'        // 57f5         #2
+    'aA'       // 57f6-57f7    #0
+    'C'        // 57f8         #2
+    'dA'       // 57f9-57fd    #0
+    'C'        // 57fe         #2
+    'F'        // 57ff         #5
+    'A'        // 5800         #0
+    'B'        // 5801         #1
+    'dA'       // 5802-5806    #0
+    'B'        // 5807         #1
+    'cA'       // 5808-580b    #0
+    'aC'       // 580c-580d    #2
+    'B'        // 580e         #1
+    'D'        // 580f         #3
+    'B'        // 5810         #1
+    'D'        // 5811         #3
+    'B'        // 5812         #1
+    'D'        // 5813         #3
+    'B'        // 5814         #1
+    'F'        // 5815         #5
+    'D'        // 5816         #3
+    'K'        // 5817         #10
+    'B'        // 5818         #1
+    'A'        // 5819         #0
+    'D'        // 581a         #3
+    'C'        // 581b         #2
+    'B'        // 581c         #1
+    'aA'       // 581d-581e    #0
+    'F'        // 581f         #5
+    'aA'       // 5820-5821    #0
+    'B'        // 5822         #1
+    'I'        // 5823         #8
+    'A'        // 5824         #0
+    'B'        // 5825         #1
+    'aA'       // 5826-5827    #0
+    'aB'       // 5828-5829    #1
+    'A'        // 582a         #0
+    'D'        // 582b         #3
+    'B'        // 582c         #1
+    'A'        // 582d         #0
+    'B'        // 582e         #1
+    'bA'       // 582f-5831    #0
+    'C'        // 5832         #2
+    'B'        // 5833         #1
+    'aA'       // 5834-5835    #0
+    'bB'       // 5836-5838    #1
+    'C'        // 5839         #2
+    'A'        // 583a         #0
+    'B'        // 583b         #1
+    'D'        // 583c         #3
+    'C'        // 583d         #2
+    'D'        // 583e         #3
+    'C'        // 583f         #2
+    'A'        // 5840         #0
+    'F'        // 5841         #5
+    'aD'       // 5842-5843    #3
+    'B'        // 5844         #1
+    'aD'       // 5845-5846    #3
+    'aB'       // 5847-5848    #1
+    'dA'       // 5849-584d    #0
+    'B'        // 584e         #1
+    'A'        // 584f         #0
+    'J'        // 5850         #9
+    'aA'       // 5851-5852    #0
+    'B'        // 5853         #1
+    'A'        // 5854         #0
+    'C'        // 5855         #2
+    'D'        // 5856         #3
+    'cA'       // 5857-585a    #0
+    'bB'       // 585b-585d    #1
+    'A'        // 585e         #0
+    'C'        // 585f         #2
+    'D'        // 5860         #3
+    'J'        // 5861         #9
+    'A'        // 5862         #0
+    'B'        // 5863         #1
+    'A'        // 5864         #0
+    'B'        // 5865         #1
+    'D'        // 5866         #3
+    'F'        // 5867         #5
+    'C'        // 5868         #2
+    'A'        // 5869         #0
+    'D'        // 586a         #3
+    'C'        // 586b         #2
+    'B'        // 586c         #1
+    'C'        // 586d         #2
+    'D'        // 586e         #3
+    'B'        // 586f         #1
+    'F'        // 5870         #5
+    'B'        // 5871         #1
+    'C'        // 5872         #2
+    'aB'       // 5873-5874    #1
+    'A'        // 5875         #0
+    'B'        // 5876         #1
+    'D'        // 5877         #3
+    'F'        // 5878         #5
+    'A'        // 5879         #0
+    'aB'       // 587a-587b    #1
+    'A'        // 587c         #0
+    'I'        // 587d         #8
+    'A'        // 587e         #0
+    'C'        // 587f         #2
+    'aA'       // 5880-5881    #0
+    'B'        // 5882         #1
+    'A'        // 5883         #0
+    'D'        // 5884         #3
+    'A'        // 5885         #0
+    'B'        // 5886         #1
+    'aC'       // 5887-5888    #2
+    'aA'       // 5889-588a    #0
+    'C'        // 588b         #2
+    'aJ'       // 588c-588d    #9
+    'B'        // 588e         #1
+    'C'        // 588f         #2
+    'A'        // 5890         #0
+    'aB'       // 5891-5892    #1
+    'A'        // 5893         #0
+    'C'        // 5894         #2
+    'D'        // 5895         #3
+    'C'        // 5896         #2
+    'F'        // 5897         #5
+    'C'        // 5898         #2
+    'aB'       // 5899-589a    #1
+    'D'        // 589b         #3
+    'cA'       // 589c-589f    #0
+    'C'        // 58a0         #2
+    'A'        // 58a1         #0
+    'F'        // 58a2         #5
+    'I'        // 58a3         #8
+    'D'        // 58a4         #3
+    'B'        // 58a5         #1
+    'C'        // 58a6         #2
+    'B'        // 58a7         #1
+    'aA'       // 58a8-58a9    #0
+    'C'        // 58aa         #2
+    'A'        // 58ab         #0
+    'B'        // 58ac         #1
+    'D'        // 58ad         #3
+    'A'        // 58ae         #0
+    'B'        // 58af         #1
+    'I'        // 58b0         #8
+    'A'        // 58b1         #0
+    'F'        // 58b2         #5
+    'A'        // 58b3         #0
+    'D'        // 58b4         #3
+    'aB'       // 58b5-58b6    #1
+    'D'        // 58b7         #3
+    'aF'       // 58b8-58b9    #5
+    'aA'       // 58ba-58bb    #0
+    'C'        // 58bc         #2
+    'B'        // 58bd         #1
+    'A'        // 58be         #0
+    'B'        // 58bf         #1
+    'D'        // 58c0         #3
+    'A'        // 58c1         #0
+    'C'        // 58c2         #2
+    'J'        // 58c3         #9
+    'F'        // 58c4         #5
+    'A'        // 58c5         #0
+    'B'        // 58c6         #1
+    'A'        // 58c7         #0
+    'C'        // 58c8         #2
+    'B'        // 58c9         #1
+    'F'        // 58ca         #5
+    'B'        // 58cb         #1
+    'aF'       // 58cc-58cd    #5
+    'A'        // 58ce         #0
+    'B'        // 58cf         #1
+    'C'        // 58d0         #2
+    'A'        // 58d1         #0
+    'C'        // 58d2         #2
+    'bA'       // 58d3-58d5    #0
+    'C'        // 58d6         #2
+    'F'        // 58d7         #5
+    'bA'       // 58d8-58da    #0
+    'B'        // 58db         #1
+    'cA'       // 58dc-58df    #0
+    'C'        // 58e0         #2
+    'J'        // 58e1         #9
+    'C'        // 58e2         #2
+    'B'        // 58e3         #1
+    'A'        // 58e4         #0
+    'F'        // 58e5         #5
+    'D'        // 58e6         #3
+    'aB'       // 58e7-58e8    #1
+    'C'        // 58e9         #2
+    'D'        // 58ea         #3
+    'aA'       // 58eb-58ec    #0
+    'D'        // 58ed         #3
+    'J'        // 58ee         #9
+    'aA'       // 58ef-58f0    #0
+    'F'        // 58f1         #5
+    'A'        // 58f2         #0
+    'aC'       // 58f3-58f4    #2
+    'aD'       // 58f5-58f6    #3
+    'F'        // 58f7         #5
+    'D'        // 58f8         #3
+    'bA'       // 58f9-58fb    #0
+    'C'        // 58fc         #2
+    'A'        // 58fd         #0
+    'aB'       // 58fe-58ff    #1
+    'aD'       // 5900-5901    #3
+    'A'        // 5902         #0
+    'aB'       // 5903-5904    #1
+    'C'        // 5905         #2
+    'A'        // 5906         #0
+    'B'        // 5907         #1
+    'K'        // 5908         #10
+    'F'        // 5909         #5
+    'A'        // 590a         #0
+    'F'        // 590b         #5
+    'aC'       // 590c-590d    #2
+    'B'        // 590e         #1
+    'A'        // 590f         #0
+    'J'        // 5910         #9
+    'B'        // 5911         #1
+    'C'        // 5912         #2
+    'F'        // 5913         #5
+    'bA'       // 5914-5916    #0
+    'B'        // 5917         #1
+    'F'        // 5918         #5
+    'aA'       // 5919-591a    #0
+    'J'        // 591b         #9
+    'A'        // 591c         #0
+    'C'        // 591d         #2
+    'D'        // 591e         #3
+    'C'        // 591f         #2
+    'B'        // 5920         #1
+    'F'        // 5921         #5
+    'A'        // 5922         #0
+    'F'        // 5923         #5
+    'aA'       // 5924-5925    #0
+    'D'        // 5926         #3
+    'A'        // 5927         #0
+    'F'        // 5928         #5
+    'fA'       // 5929-592f    #0
+    'F'        // 5930         #5
+    'aA'       // 5931-5932    #0
+    'F'        // 5933         #5
+    'B'        // 5934         #1
+    'aF'       // 5935-5936    #5
+    'aA'       // 5937-5938    #0
+    'F'        // 5939         #5
+    'aD'       // 593a-593b    #3
+    'B'        // 593c         #1
+    'J'        // 593d         #9
+    'A'        // 593e         #0
+    'F'        // 593f         #5
+    'B'        // 5940         #1
+    'aD'       // 5941-5942    #3
+    'F'        // 5943         #5
+    'A'        // 5944         #0
+    'B'        // 5945         #1
+    'F'        // 5946         #5
+    'bA'       // 5947-5949    #0
+    'B'        // 594a         #1
+    'D'        // 594b         #3
+    'K'        // 594c         #10
+    'D'        // 594d         #3
+    'cA'       // 594e-5951    #0
+    'F'        // 5952         #5
+    'bA'       // 5953-5955    #0
+    'D'        // 5956         #3
+    'aA'       // 5957-5958    #0
+    'F'        // 5959         #5
+    'A'        // 595a         #0
+    'F'        // 595b         #5
+    'I'        // 595c         #8
+    'bF'       // 595d-595f    #5
+    'A'        // 5960         #0
+    'C'        // 5961         #2
+    'A'        // 5962         #0
+    'F'        // 5963         #5
+    'D'        // 5964         #3
+    'C'        // 5965         #2
+    'D'        // 5966         #3
+    'A'        // 5967         #0
+    'F'        // 5968         #5
+    'eA'       // 5969-596e    #0
+    'F'        // 596f         #5
+    'aB'       // 5970-5971    #1
+    'bA'       // 5972-5974    #0
+    'C'        // 5975         #2
+    'A'        // 5976         #0
+    'B'        // 5977         #1
+    'A'        // 5978         #0
+    'C'        // 5979         #2
+    'D'        // 597a         #3
+    'aC'       // 597b-597c    #2
+    'A'        // 597d         #0
+    'bB'       // 597e-5980    #1
+    'C'        // 5981         #2
+    'bA'       // 5982-5984    #0
+    'B'        // 5985         #1
+    'bD'       // 5986-5988    #3
+    'B'        // 5989         #1
+    'A'        // 598a         #0
+    'F'        // 598b         #5
+    'J'        // 598c         #9
+    'A'        // 598d         #0
+    'C'        // 598e         #2
+    'aB'       // 598f-5990    #1
+    'K'        // 5991         #10
+    'aA'       // 5992-5993    #0
+    'B'        // 5994         #1
+    'F'        // 5995         #5
+    'aA'       // 5996-5997    #0
+    'B'        // 5998         #1
+    'A'        // 5999         #0
+    'B'        // 599a         #1
+    'F'        // 599b         #5
+    'D'        // 599c         #3
+    'A'        // 599d         #0
+    'B'        // 599e         #1
+    'C'        // 599f         #2
+    'bB'       // 59a0-59a2    #1
+    'bA'       // 59a3-59a5    #0
+    'B'        // 59a6         #1
+    'aA'       // 59a7-59a8    #0
+    'bD'       // 59a9-59ab    #3
+    'A'        // 59ac         #0
+    'F'        // 59ad         #5
+    'C'        // 59ae         #2
+    'A'        // 59af         #0
+    'C'        // 59b0         #2
+    'B'        // 59b1         #1
+    'A'        // 59b2         #0
+    'C'        // 59b3         #2
+    'B'        // 59b4         #1
+    'aI'       // 59b5-59b6    #8
+    'C'        // 59b7         #2
+    'I'        // 59b8         #8
+    'A'        // 59b9         #0
+    'C'        // 59ba         #2
+    'A'        // 59bb         #0
+    'C'        // 59bc         #2
+    'B'        // 59bd         #1
+    'A'        // 59be         #0
+    'I'        // 59bf         #8
+    'B'        // 59c0         #1
+    'A'        // 59c1         #0
+    'D'        // 59c2         #3
+    'A'        // 59c3         #0
+    'C'        // 59c4         #2
+    'B'        // 59c5         #1
+    'A'        // 59c6         #0
+    'B'        // 59c7         #1
+    'cA'       // 59c8-59cb    #0
+    'B'        // 59cc         #1
+    'A'        // 59cd         #0
+    'aB'       // 59ce-59cf    #1
+    'dA'       // 59d0-59d4    #0
+    'D'        // 59d5         #3
+    'B'        // 59d6         #1
+    'D'        // 59d7         #3
+    'B'        // 59d8         #1
+    'aA'       // 59d9-59da    #0
+    'B'        // 59db         #1
+    'bA'       // 59dc-59de    #0
+    'F'        // 59df         #5
+    'aB'       // 59e0-59e1    #1
+    'K'        // 59e2         #10
+    'cA'       // 59e3-59e6    #0
+    'F'        // 59e7         #5
+    'A'        // 59e8         #0
+    'B'        // 59e9         #1
+    'bA'       // 59ea-59ec    #0
+    'B'        // 59ed         #1
+    'A'        // 59ee         #0
+    'C'        // 59ef         #2
+    'I'        // 59f0         #8
+    'C'        // 59f1         #2
+    'A'        // 59f2         #0
+    'B'        // 59f3         #1
+    'C'        // 59f4         #2
+    'B'        // 59f5         #1
+    'C'        // 59f6         #2
+    'aA'       // 59f7-59f8    #0
+    'aI'       // 59f9-59fa    #8
+    'A'        // 59fb         #0
+    'I'        // 59fc         #8
+    'aB'       // 59fd-59fe    #1
+    'A'        // 59ff         #0
+    'C'        // 5a00         #2
+    'A'        // 5a01         #0
+    'B'        // 5a02         #1
+    'A'        // 5a03         #0
+    'F'        // 5a04         #5
+    'cD'       // 5a05-5a08    #3
+    'A'        // 5a09         #0
+    'I'        // 5a0a         #8
+    'B'        // 5a0b         #1
+    'C'        // 5a0c         #2
+    'A'        // 5a0d         #0
+    'F'        // 5a0e         #5
+    'B'        // 5a0f         #1
+    'D'        // 5a10         #3
+    'A'        // 5a11         #0
+    'C'        // 5a12         #2
+    'A'        // 5a13         #0
+    'D'        // 5a14         #3
+    'aB'       // 5a15-5a16    #1
+    'C'        // 5a17         #2
+    'A'        // 5a18         #0
+    'I'        // 5a19         #8
+    'C'        // 5a1a         #2
+    'aA'       // 5a1b-5a1c    #0
+    'D'        // 5a1d         #3
+    'C'        // 5a1e         #2
+    'aA'       // 5a1f-5a20    #0
+    'B'        // 5a21         #1
+    'D'        // 5a22         #3
+    'A'        // 5a23         #0
+    'C'        // 5a24         #2
+    'A'        // 5a25         #0
+    'D'        // 5a26         #3
+    'A'        // 5a27         #0
+    'F'        // 5a28         #5
+    'A'        // 5a29         #0
+    'C'        // 5a2a         #2
+    'I'        // 5a2b         #8
+    'B'        // 5a2c         #1
+    'A'        // 5a2d         #0
+    'B'        // 5a2e         #1
+    'aF'       // 5a2f-5a30    #5
+    'aD'       // 5a31-5a32    #3
+    'B'        // 5a33         #1
+    'D'        // 5a34         #3
+    'aA'       // 5a35-5a36    #0
+    'bB'       // 5a37-5a39    #1
+    'aD'       // 5a3a-5a3b    #3
+    'A'        // 5a3c         #0
+    'aB'       // 5a3d-5a3e    #1
+    'K'        // 5a3f         #10
+    'aA'       // 5a40-5a41    #0
+    'aB'       // 5a42-5a43    #1
+    'aC'       // 5a44-5a45    #2
+    'aA'       // 5a46-5a47    #0
+    'C'        // 5a48         #2
+    'A'        // 5a49         #0
+    'B'        // 5a4a         #1
+    'K'        // 5a4b         #10
+    'A'        // 5a4c         #0
+    'B'        // 5a4d         #1
+    'aD'       // 5a4e-5a4f    #3
+    'A'        // 5a50         #0
+    'I'        // 5a51         #8
+    'bB'       // 5a52-5a54    #1
+    'C'        // 5a55         #2
+    'cB'       // 5a56-5a59    #1
+    'A'        // 5a5a         #0
+    'bB'       // 5a5b-5a5d    #1
+    'C'        // 5a5e         #2
+    'B'        // 5a5f         #1
+    'I'        // 5a60         #8
+    'B'        // 5a61         #1
+    'aA'       // 5a62-5a63    #0
+    'B'        // 5a64         #1
+    'C'        // 5a65         #2
+    'aA'       // 5a66-5a67    #0
+    'B'        // 5a68         #1
+    'I'        // 5a69         #8
+    'A'        // 5a6a         #0
+    'B'        // 5a6b         #1
+    'C'        // 5a6c         #2
+    'A'        // 5a6d         #0
+    'B'        // 5a6e         #1
+    'D'        // 5a6f         #3
+    'aB'       // 5a70-5a71    #1
+    'K'        // 5a72         #10
+    'cD'       // 5a73-5a76    #3
+    'A'        // 5a77         #0
+    'aB'       // 5a78-5a79    #1
+    'aC'       // 5a7a-5a7b    #2
+    'aB'       // 5a7c-5a7d    #1
+    'C'        // 5a7e         #2
+    'A'        // 5a7f         #0
+    'D'        // 5a80         #3
+    'bB'       // 5a81-5a83    #1
+    'A'        // 5a84         #0
+    'D'        // 5a85         #3
+    'B'        // 5a86         #1
+    'D'        // 5a87         #3
+    'B'        // 5a88         #1
+    'D'        // 5a89         #3
+    'B'        // 5a8a         #1
+    'C'        // 5a8b         #2
+    'B'        // 5a8c         #1
+    'K'        // 5a8d         #10
+    'aB'       // 5a8e-5a8f    #1
+    'A'        // 5a90         #0
+    'B'        // 5a91         #1
+    'aA'       // 5a92-5a93    #0
+    'B'        // 5a94         #1
+    'I'        // 5a95         #8
+    'C'        // 5a96         #2
+    'B'        // 5a97         #1
+    'D'        // 5a98         #3
+    'C'        // 5a99         #2
+    'aA'       // 5a9a-5a9b    #0
+    'C'        // 5a9c         #2
+    'B'        // 5a9d         #1
+    'aA'       // 5a9e-5a9f    #0
+    'C'        // 5aa0         #2
+    'B'        // 5aa1         #1
+    'A'        // 5aa2         #0
+    'D'        // 5aa3         #3
+    'I'        // 5aa4         #8
+    'aB'       // 5aa5-5aa6    #1
+    'A'        // 5aa7         #0
+    'D'        // 5aa8         #3
+    'B'        // 5aa9         #1
+    'I'        // 5aaa         #8
+    'B'        // 5aab         #1
+    'C'        // 5aac         #2
+    'D'        // 5aad         #3
+    'bB'       // 5aae-5ab0    #1
+    'aC'       // 5ab1-5ab2    #2
+    'A'        // 5ab3         #0
+    'B'        // 5ab4         #1
+    'A'        // 5ab5         #0
+    'aB'       // 5ab6-5ab7    #1
+    'C'        // 5ab8         #2
+    'B'        // 5ab9         #1
+    'eA'       // 5aba-5abf    #0
+    'B'        // 5ac0         #1
+    'aA'       // 5ac1-5ac2    #0
+    'B'        // 5ac3         #1
+    'A'        // 5ac4         #0
+    'D'        // 5ac5         #3
+    'C'        // 5ac6         #2
+    'B'        // 5ac7         #1
+    'aA'       // 5ac8-5ac9    #0
+    'B'        // 5aca         #1
+    'aA'       // 5acb-5acc    #0
+    'aB'       // 5acd-5ace    #1
+    'C'        // 5acf         #2
+    'F'        // 5ad0         #5
+    'B'        // 5ad1         #1
+    'D'        // 5ad2         #3
+    'B'        // 5ad3         #1
+    'D'        // 5ad4         #3
+    'I'        // 5ad5         #8
+    'aA'       // 5ad6-5ad7    #0
+    'B'        // 5ad8         #1
+    'I'        // 5ad9         #8
+    'A'        // 5ada         #0
+    'I'        // 5adb         #8
+    'C'        // 5adc         #2
+    'I'        // 5add         #8
+    'aB'       // 5ade-5adf    #1
+    'aA'       // 5ae0-5ae1    #0
+    'I'        // 5ae2         #8
+    'A'        // 5ae3         #0
+    'I'        // 5ae4         #8
+    'aA'       // 5ae5-5ae6    #0
+    'D'        // 5ae7         #3
+    'B'        // 5ae8         #1
+    'A'        // 5ae9         #0
+    'C'        // 5aea         #2
+    'I'        // 5aeb         #8
+    'B'        // 5aec         #1
+    'I'        // 5aed         #8
+    'A'        // 5aee         #0
+    'K'        // 5aef         #10
+    'C'        // 5af0         #2
+    'D'        // 5af1         #3
+    'bB'       // 5af2-5af4    #1
+    'C'        // 5af5         #2
+    'A'        // 5af6         #0
+    'bB'       // 5af7-5af9    #1
+    'aA'       // 5afa-5afb    #0
+    'D'        // 5afc         #3
+    'A'        // 5afd         #0
+    'aB'       // 5afe-5aff    #1
+    'J'        // 5b00         #9
+    'C'        // 5b01         #2
+    'aB'       // 5b02-5b03    #1
+    'D'        // 5b04         #3
+    'I'        // 5b05         #8
+    'D'        // 5b06         #3
+    'B'        // 5b07         #1
+    'aA'       // 5b08-5b09    #0
+    'D'        // 5b0a         #3
+    'aA'       // 5b0b-5b0c    #0
+    'B'        // 5b0d         #1
+    'D'        // 5b0e         #3
+    'bB'       // 5b0f-5b11    #1
+    'D'        // 5b12         #3
+    'bB'       // 5b13-5b15    #1
+    'A'        // 5b16         #0
+    'C'        // 5b17         #2
+    'D'        // 5b18         #3
+    'A'        // 5b19         #0
+    'B'        // 5b1a         #1
+    'A'        // 5b1b         #0
+    'D'        // 5b1c         #3
+    'C'        // 5b1d         #2
+    'bB'       // 5b1e-5b20    #1
+    'C'        // 5b21         #2
+    'F'        // 5b22         #5
+    'aB'       // 5b23-5b24    #1
+    'A'        // 5b25         #0
+    'aB'       // 5b26-5b27    #1
+    'I'        // 5b28         #8
+    'D'        // 5b29         #3
+    'A'        // 5b2a         #0
+    'B'        // 5b2b         #1
+    'C'        // 5b2c         #2
+    'A'        // 5b2d         #0
+    'aB'       // 5b2e-5b2f    #1
+    'A'        // 5b30         #0
+    'D'        // 5b31         #3
+    'A'        // 5b32         #0
+    'D'        // 5b33         #3
+    'A'        // 5b34         #0
+    'D'        // 5b35         #3
+    'F'        // 5b36         #5
+    'D'        // 5b37         #3
+    'C'        // 5b38         #2
+    'bD'       // 5b39-5b3b    #3
+    'aB'       // 5b3c-5b3d    #1
+    'A'        // 5b3e         #0
+    'I'        // 5b3f         #8
+    'A'        // 5b40         #0
+    'C'        // 5b41         #2
+    'D'        // 5b42         #3
+    'A'        // 5b43         #0
+    'B'        // 5b44         #1
+    'A'        // 5b45         #0
+    'bB'       // 5b46-5b48    #1
+    'D'        // 5b49         #3
+    'B'        // 5b4a         #1
+    'C'        // 5b4b         #2
+    'A'        // 5b4c         #0
+    'bB'       // 5b4d-5b4f    #1
+    'aA'       // 5b50-5b51    #0
+    'F'        // 5b52         #5
+    'B'        // 5b53         #1
+    'dA'       // 5b54-5b58    #0
+    'D'        // 5b59         #3
+    'cA'       // 5b5a-5b5d    #0
+    'F'        // 5b5e         #5
+    'A'        // 5b5f         #0
+    'D'        // 5b60         #3
+    'K'        // 5b61         #10
+    'B'        // 5b62         #1
+    'cA'       // 5b63-5b66    #0
+    'D'        // 5b67         #3
+    'C'        // 5b68         #2
+    'A'        // 5b69         #0
+    'D'        // 5b6a         #3
+    'A'        // 5b6b         #0
+    'aB'       // 5b6c-5b6d    #1
+    'C'        // 5b6e         #2
+    'F'        // 5b6f         #5
+    'aA'       // 5b70-5b71    #0
+    'B'        // 5b72         #1
+    'C'        // 5b73         #2
+    'B'        // 5b74         #1
+    'aA'       // 5b75-5b76    #0
+    'B'        // 5b77         #1
+    'A'        // 5b78         #0
+    'D'        // 5b79         #3
+    'A'        // 5b7a         #0
+    'B'        // 5b7b         #1
+    'A'        // 5b7c         #0
+    'C'        // 5b7d         #2
+    'F'        // 5b7e         #5
+    'cA'       // 5b7f-5b82    #0
+    'aC'       // 5b83-5b84    #2
+    'A'        // 5b85         #0
+    'F'        // 5b86         #5
+    'bA'       // 5b87-5b89    #0
+    'J'        // 5b8a         #9
+    'aA'       // 5b8b-5b8c    #0
+    'F'        // 5b8d         #5
+    'C'        // 5b8e         #2
+    'A'        // 5b8f         #0
+    'C'        // 5b90         #2
+    'F'        // 5b91         #5
+    'B'        // 5b92         #1
+    'A'        // 5b93         #0
+    'F'        // 5b94         #5
+    'hA'       // 5b95-5b9d    #0
+    'B'        // 5b9e         #1
+    'A'        // 5b9f         #0
+    'aD'       // 5ba0-5ba1    #3
+    'dA'       // 5ba2-5ba6    #0
+    'B'        // 5ba7         #1
+    'C'        // 5ba8         #2
+    'F'        // 5ba9         #5
+    'B'        // 5baa         #1
+    'D'        // 5bab         #3
+    'A'        // 5bac         #0
+    'C'        // 5bad         #2
+    'A'        // 5bae         #0
+    'F'        // 5baf         #5
+    'A'        // 5bb0         #0
+    'aF'       // 5bb1-5bb2    #5
+    'cA'       // 5bb3-5bb6    #0
+    'C'        // 5bb7         #2
+    'aA'       // 5bb8-5bb9    #0
+    'F'        // 5bba         #5
+    'D'        // 5bbb         #3
+    'F'        // 5bbc         #5
+    'aD'       // 5bbd-5bbe    #3
+    'aA'       // 5bbf-5bc0    #0
+    'C'        // 5bc1         #2
+    'eA'       // 5bc2-5bc7    #0
+    'D'        // 5bc8         #3
+    'F'        // 5bc9         #5
+    'aB'       // 5bca-5bcb    #1
+    'A'        // 5bcc         #0
+    'aC'       // 5bcd-5bce    #2
+    'F'        // 5bcf         #5
+    'A'        // 5bd0         #0
+    'B'        // 5bd1         #1
+    'bA'       // 5bd2-5bd4    #0
+    'B'        // 5bd5         #1
+    'bA'       // 5bd6-5bd8    #0
+    'C'        // 5bd9         #2
+    'F'        // 5bda         #5
+    'A'        // 5bdb         #0
+    'D'        // 5bdc         #3
+    'F'        // 5bdd         #5
+    'aA'       // 5bde-5bdf    #0
+    'C'        // 5be0         #2
+    'aA'       // 5be1-5be2    #0
+    'B'        // 5be3         #1
+    'eA'       // 5be4-5be9    #0
+    'B'        // 5bea         #1
+    'aA'       // 5beb-5bec    #0
+    'K'        // 5bed         #10
+    'bA'       // 5bee-5bf0    #0
+    'C'        // 5bf1         #2
+    'B'        // 5bf2         #1
+    'C'        // 5bf3         #2
+    'F'        // 5bf4         #5
+    'aA'       // 5bf5-5bf6    #0
+    'D'        // 5bf7         #3
+    'A'        // 5bf8         #0
+    'K'        // 5bf9         #10
+    'A'        // 5bfa         #0
+    'aD'       // 5bfb-5bfc    #3
+    'aF'       // 5bfd-5bfe    #5
+    'A'        // 5bff         #0
+    'D'        // 5c00         #3
+    'A'        // 5c01         #0
+    'F'        // 5c02         #5
+    'C'        // 5c03         #2
+    'aA'       // 5c04-5c05    #0
+    'J'        // 5c06         #9
+    'hA'       // 5c07-5c0f    #0
+    'B'        // 5c10         #1
+    'A'        // 5c11         #0
+    'aC'       // 5c12-5c13    #2
+    'A'        // 5c14         #0
+    'B'        // 5c15         #1
+    'A'        // 5c16         #0
+    'F'        // 5c17         #5
+    'D'        // 5c18         #3
+    'J'        // 5c19         #9
+    'C'        // 5c1a         #2
+    'D'        // 5c1b         #3
+    'B'        // 5c1c         #1
+    'D'        // 5c1d         #3
+    'C'        // 5c1e         #2
+    'aA'       // 5c1f-5c20    #0
+    'D'        // 5c21         #3
+    'bA'       // 5c22-5c24    #0
+    'B'        // 5c25         #1
+    'F'        // 5c26         #5
+    'D'        // 5c27         #3
+    'A'        // 5c28         #0
+    'F'        // 5c29         #5
+    'C'        // 5c2a         #2
+    'J'        // 5c2b         #9
+    'C'        // 5c2c         #2
+    'aF'       // 5c2d-5c2e    #5
+    'D'        // 5c2f         #3
+    'C'        // 5c30         #2
+    'A'        // 5c31         #0
+    'F'        // 5c32         #5
+    'B'        // 5c33         #1
+    'D'        // 5c34         #3
+    'aF'       // 5c35-5c36    #5
+    'B'        // 5c37         #1
+    'dA'       // 5c38-5c3c    #0
+    'J'        // 5c3d         #9
+    'cA'       // 5c3e-5c41    #0
+    'aD'       // 5c42-5c43    #3
+    'B'        // 5c44         #1
+    'aA'       // 5c45-5c46    #0
+    'I'        // 5c47         #8
+    'A'        // 5c48         #0
+    'B'        // 5c49         #1
+    'C'        // 5c4a         #2
+    'A'        // 5c4b         #0
+    'B'        // 5c4c         #1
+    'aA'       // 5c4d-5c4e    #0
+    'C'        // 5c4f         #2
+    'aA'       // 5c50-5c51    #0
+    'D'        // 5c52         #3
+    'C'        // 5c53         #2
+    'B'        // 5c54         #1
+    'A'        // 5c55         #0
+    'B'        // 5c56         #1
+    'D'        // 5c57         #3
+    'B'        // 5c58         #1
+    'C'        // 5c59         #2
+    'F'        // 5c5a         #5
+    'J'        // 5c5b         #9
+    'C'        // 5c5c         #2
+    'B'        // 5c5d         #1
+    'C'        // 5c5e         #2
+    'F'        // 5c5f         #5
+    'A'        // 5c60         #0
+    'F'        // 5c61         #5
+    'A'        // 5c62         #0
+    'C'        // 5c63         #2
+    'aA'       // 5c64-5c65    #0
+    'D'        // 5c66         #3
+    'C'        // 5c67         #2
+    'A'        // 5c68         #0
+    'C'        // 5c69         #2
+    'B'        // 5c6a         #1
+    'D'        // 5c6b         #3
+    'A'        // 5c6c         #0
+    'aC'       // 5c6d-5c6e    #2
+    'A'        // 5c6f         #0
+    'F'        // 5c70         #5
+    'A'        // 5c71         #0
+    'D'        // 5c72         #3
+    'I'        // 5c73         #8
+    'C'        // 5c74         #2
+    'aF'       // 5c75-5c76    #5
+    'D'        // 5c77         #3
+    'B'        // 5c78         #1
+    'aA'       // 5c79-5c7a    #0
+    'aC'       // 5c7b-5c7c    #2
+    'F'        // 5c7d         #5
+    'B'        // 5c7e         #1
+    'cD'       // 5c7f-5c82    #3
+    '11D'      // 5c83         #289
+    'D'        // 5c84         #3
+    'aB'       // 5c85-5c86    #1
+    'F'        // 5c87         #5
+    'A'        // 5c88         #0
+    'B'        // 5c89         #1
+    'A'        // 5c8a         #0
+    'B'        // 5c8b         #1
+    'A'        // 5c8c         #0
+    'B'        // 5c8d         #1
+    'D'        // 5c8e         #3
+    'cA'       // 5c8f-5c92    #0
+    'B'        // 5c93         #1
+    'A'        // 5c94         #0
+    'B'        // 5c95         #1
+    'bD'       // 5c96-5c98    #3
+    'aB'       // 5c99-5c9a    #1
+    'D'        // 5c9b         #3
+    'B'        // 5c9c         #1
+    'A'        // 5c9d         #0
+    'B'        // 5c9e         #1
+    'aC'       // 5c9f-5ca0    #2
+    'A'        // 5ca1         #0
+    'C'        // 5ca2         #2
+    'A'        // 5ca3         #0
+    'B'        // 5ca4         #1
+    'I'        // 5ca5         #8
+    'gA'       // 5ca6-5cad    #0
+    'bB'       // 5cae-5cb0    #1
+    'A'        // 5cb1         #0
+    'F'        // 5cb2         #5
+    'A'        // 5cb3         #0
+    'F'        // 5cb4         #5
+    'A'        // 5cb5         #0
+    'C'        // 5cb6         #2
+    'aA'       // 5cb7-5cb8    #0
+    'D'        // 5cb9         #3
+    'A'        // 5cba         #0
+    'aF'       // 5cbb-5cbc    #5
+    'D'        // 5cbd         #3
+    'J'        // 5cbe         #9
+    'D'        // 5cbf         #3
+    'K'        // 5cc0         #10
+    'aB'       // 5cc1-5cc2    #1
+    'aD'       // 5cc3-5cc4    #3
+    'F'        // 5cc5         #5
+    'B'        // 5cc6         #1
+    'C'        // 5cc7         #2
+    'B'        // 5cc8         #1
+    'C'        // 5cc9         #2
+    'B'        // 5cca         #1
+    'A'        // 5ccb         #0
+    'B'        // 5ccc         #1
+    'D'        // 5ccd         #3
+    'aB'       // 5cce-5ccf    #1
+    'C'        // 5cd0         #2
+    'B'        // 5cd1         #1
+    'A'        // 5cd2         #0
+    'cB'       // 5cd3-5cd6    #1
+    'C'        // 5cd7         #2
+    'B'        // 5cd8         #1
+    'A'        // 5cd9         #0
+    'aB'       // 5cda-5cdb    #1
+    'D'        // 5cdc         #3
+    'F'        // 5cdd         #5
+    'aB'       // 5cde-5cdf    #1
+    'J'        // 5ce0         #9
+    'F'        // 5ce1         #5
+    'bD'       // 5ce2-5ce4    #3
+    'B'        // 5ce5         #1
+    'F'        // 5ce6         #5
+    'D'        // 5ce7         #3
+    'aA'       // 5ce8-5ce9    #0
+    'C'        // 5cea         #2
+    'D'        // 5ceb         #3
+    'B'        // 5cec         #1
+    'A'        // 5ced         #0
+    'C'        // 5cee         #2
+    'bA'       // 5cef-5cf1    #0
+    'F'        // 5cf2         #5
+    'D'        // 5cf3         #3
+    'A'        // 5cf4         #0
+    'C'        // 5cf5         #2
+    'A'        // 5cf6         #0
+    'bB'       // 5cf7-5cf9    #1
+    'F'        // 5cfa         #5
+    'A'        // 5cfb         #0
+    'B'        // 5cfc         #1
+    'A'        // 5cfd         #0
+    'D'        // 5cfe         #3
+    'aB'       // 5cff-5d00    #1
+    'C'        // 5d01         #2
+    'cD'       // 5d02-5d05    #3
+    'aA'       // 5d06-5d07    #0
+    'bD'       // 5d08-5d0a    #3
+    'C'        // 5d0b         #2
+    'B'        // 5d0c         #1
+    'aA'       // 5d0d-5d0e    #0
+    'B'        // 5d0f         #1
+    'aA'       // 5d10-5d11    #0
+    'C'        // 5d12         #2
+    'D'        // 5d13         #3
+    'eA'       // 5d14-5d19    #0
+    'C'        // 5d1a         #2
+    'A'        // 5d1b         #0
+    'D'        // 5d1c         #3
+    'C'        // 5d1d         #2
+    'B'        // 5d1e         #1
+    'A'        // 5d1f         #0
+    'C'        // 5d20         #2
+    'D'        // 5d21         #3
+    'A'        // 5d22         #0
+    'C'        // 5d23         #2
+    'A'        // 5d24         #0
+    'B'        // 5d25         #1
+    'aA'       // 5d26-5d27    #0
+    'B'        // 5d28         #1
+    'A'        // 5d29         #0
+    'D'        // 5d2a         #3
+    'F'        // 5d2b         #5
+    'B'        // 5d2c         #1
+    'D'        // 5d2d         #3
+    'bB'       // 5d2e-5d30    #1
+    'C'        // 5d31         #2
+    'aB'       // 5d32-5d33    #1
+    'A'        // 5d34         #0
+    'cB'       // 5d35-5d38    #1
+    'C'        // 5d39         #2
+    'B'        // 5d3a         #1
+    'D'        // 5d3b         #3
+    'B'        // 5d3c         #1
+    'A'        // 5d3d         #0
+    'B'        // 5d3e         #1
+    'C'        // 5d3f         #2
+    'B'        // 5d40         #1
+    'I'        // 5d41         #8
+    'A'        // 5d42         #0
+    'C'        // 5d43         #2
+    'K'        // 5d44         #10
+    'B'        // 5d45         #1
+    'bC'       // 5d46-5d48    #2
+    'B'        // 5d49         #1
+    'C'        // 5d4a         #2
+    'aA'       // 5d4b-5d4c    #0
+    'D'        // 5d4d         #3
+    'A'        // 5d4e         #0
+    'D'        // 5d4f         #3
+    'A'        // 5d50         #0
+    'aC'       // 5d51-5d52    #2
+    'J'        // 5d53         #9
+    'K'        // 5d54         #10
+    'C'        // 5d55         #2
+    'aB'       // 5d56-5d57    #1
+    'D'        // 5d58         #3
+    'C'        // 5d59         #2
+    'D'        // 5d5a         #3
+    'B'        // 5d5b         #1
+    'F'        // 5d5c         #5
+    'D'        // 5d5d         #3
+    'B'        // 5d5e         #1
+    'bF'       // 5d5f-5d61    #5
+    'C'        // 5d62         #2
+    'B'        // 5d63         #1
+    'F'        // 5d64         #5
+    'B'        // 5d65         #1
+    'D'        // 5d66         #3
+    'aB'       // 5d67-5d68    #1
+    'A'        // 5d69         #0
+    'F'        // 5d6a         #5
+    'B'        // 5d6b         #1
+    'A'        // 5d6c         #0
+    'F'        // 5d6d         #5
+    'D'        // 5d6e         #3
+    'A'        // 5d6f         #0
+    'C'        // 5d70         #2
+    'I'        // 5d71         #8
+    'B'        // 5d72         #1
+    'F'        // 5d73         #5
+    'B'        // 5d74         #1
+    'D'        // 5d75         #3
+    'F'        // 5d76         #5
+    'aB'       // 5d77-5d78    #1
+    'aC'       // 5d79-5d7a    #2
+    'bB'       // 5d7b-5d7d    #1
+    'aC'       // 5d7e-5d7f    #2
+    'B'        // 5d80         #1
+    'aA'       // 5d81-5d82    #0
+    'F'        // 5d83         #5
+    'A'        // 5d84         #0
+    'B'        // 5d85         #1
+    'I'        // 5d86         #8
+    'A'        // 5d87         #0
+    'C'        // 5d88         #2
+    'B'        // 5d89         #1
+    'C'        // 5d8a         #2
+    'A'        // 5d8b         #0
+    'F'        // 5d8c         #5
+    'aB'       // 5d8d-5d8e    #1
+    'D'        // 5d8f         #3
+    'F'        // 5d90         #5
+    'D'        // 5d91         #3
+    'A'        // 5d92         #0
+    'C'        // 5d93         #2
+    'aA'       // 5d94-5d95    #0
+    'D'        // 5d96         #3
+    'C'        // 5d97         #2
+    'D'        // 5d98         #3
+    'A'        // 5d99         #0
+    'B'        // 5d9a         #1
+    'F'        // 5d9b         #5
+    'B'        // 5d9c         #1
+    'A'        // 5d9d         #0
+    'B'        // 5d9e         #1
+    'C'        // 5d9f         #2
+    'A'        // 5da0         #0
+    'B'        // 5da1         #1
+    'A'        // 5da2         #0
+    'D'        // 5da3         #3
+    'C'        // 5da4         #2
+    'aD'       // 5da5-5da6    #3
+    'A'        // 5da7         #0
+    'aB'       // 5da8-5da9    #1
+    'I'        // 5daa         #8
+    'A'        // 5dab         #0
+    'C'        // 5dac         #2
+    'B'        // 5dad         #1
+    'A'        // 5dae         #0
+    'B'        // 5daf         #1
+    'A'        // 5db0         #0
+    'B'        // 5db1         #1
+    'C'        // 5db2         #2
+    'D'        // 5db3         #3
+    'C'        // 5db4         #2
+    'aB'       // 5db5-5db6    #1
+    'aA'       // 5db7-5db8    #0
+    'C'        // 5db9         #2
+    'A'        // 5dba         #0
+    'D'        // 5dbb         #3
+    'aA'       // 5dbc-5dbd    #0
+    'K'        // 5dbe         #10
+    'D'        // 5dbf         #3
+    'bB'       // 5dc0-5dc2    #1
+    'C'        // 5dc3         #2
+    'aD'       // 5dc4-5dc5    #3
+    'B'        // 5dc6         #1
+    'C'        // 5dc7         #2
+    'D'        // 5dc8         #3
+    'A'        // 5dc9         #0
+    'D'        // 5dca         #3
+    'A'        // 5dcb         #0
+    'F'        // 5dcc         #5
+    'A'        // 5dcd         #0
+    'F'        // 5dce         #5
+    'B'        // 5dcf         #1
+    'F'        // 5dd0         #5
+    'aA'       // 5dd1-5dd2    #0
+    'J'        // 5dd3         #9
+    'aB'       // 5dd4-5dd5    #1
+    'A'        // 5dd6         #0
+    'aC'       // 5dd7-5dd8    #2
+    'F'        // 5dd9         #5
+    'K'        // 5dda         #10
+    'A'        // 5ddb         #0
+    'D'        // 5ddc         #3
+    'aA'       // 5ddd-5dde    #0
+    'B'        // 5ddf         #1
+    'bA'       // 5de0-5de2    #0
+    'aF'       // 5de3-5de4    #5
+    'cA'       // 5de5-5de8    #0
+    'F'        // 5de9         #5
+    'D'        // 5dea         #3
+    'A'        // 5deb         #0
+    'aD'       // 5dec-5ded    #3
+    'A'        // 5dee         #0
+    'D'        // 5def         #3
+    'B'        // 5df0         #1
+    'dA'       // 5df1-5df5    #0
+    'D'        // 5df6         #3
+    'A'        // 5df7         #0
+    'J'        // 5df8         #9
+    'A'        // 5df9         #0
+    'D'        // 5dfa         #3
+    'J'        // 5dfb         #9
+    'D'        // 5dfc         #3
+    'aA'       // 5dfd-5dfe    #0
+    'C'        // 5dff         #2
+    'F'        // 5e00         #5
+    'D'        // 5e01         #3
+    'aA'       // 5e02-5e03    #0
+    'B'        // 5e04         #1
+    'D'        // 5e05         #3
+    'A'        // 5e06         #0
+    'F'        // 5e07         #5
+    'D'        // 5e08         #3
+    'I'        // 5e09         #8
+    'B'        // 5e0a         #1
+    'C'        // 5e0b         #2
+    'A'        // 5e0c         #0
+    'F'        // 5e0d         #5
+    'B'        // 5e0e         #1
+    'aD'       // 5e0f-5e10    #3
+    'A'        // 5e11         #0
+    'C'        // 5e12         #2
+    'D'        // 5e13         #3
+    'C'        // 5e14         #2
+    'aA'       // 5e15-5e16    #0
+    'B'        // 5e17         #1
+    'C'        // 5e18         #2
+    'bA'       // 5e19-5e1b    #0
+    'D'        // 5e1c         #3
+    'A'        // 5e1d         #0
+    'D'        // 5e1e         #3
+    'C'        // 5e1f         #2
+    'A'        // 5e20         #0
+    'cB'       // 5e21-5e24    #1
+    'A'        // 5e25         #0
+    'aD'       // 5e26-5e27    #3
+    'A'        // 5e28         #0
+    'B'        // 5e29         #1
+    'D'        // 5e2a         #3
+    'A'        // 5e2b         #0
+    'D'        // 5e2c         #3
+    'A'        // 5e2d         #0
+    'C'        // 5e2e         #2
+    'aF'       // 5e2f-5e30    #5
+    'D'        // 5e31         #3
+    'F'        // 5e32         #5
+    'A'        // 5e33         #0
+    'B'        // 5e34         #1
+    'F'        // 5e35         #5
+    'bA'       // 5e36-5e38    #0
+    'cD'       // 5e39-5e3c    #3
+    'A'        // 5e3d         #0
+    'C'        // 5e3e         #2
+    'K'        // 5e3f         #10
+    'A'        // 5e40         #0
+    'aB'       // 5e41-5e42    #1
+    'bA'       // 5e43-5e45    #0
+    'D'        // 5e46         #3
+    'J'        // 5e47         #9
+    'B'        // 5e48         #1
+    'F'        // 5e49         #5
+    'B'        // 5e4a         #1
+    'C'        // 5e4b         #2
+    'A'        // 5e4c         #0
+    'B'        // 5e4d         #1
+    'A'        // 5e4e         #0
+    'B'        // 5e4f         #1
+    'aF'       // 5e50-5e51    #5
+    'D'        // 5e52         #3
+    'B'        // 5e53         #1
+    'aA'       // 5e54-5e55    #0
+    'F'        // 5e56         #5
+    'C'        // 5e57         #2
+    'A'        // 5e58         #0
+    'B'        // 5e59         #1
+    'D'        // 5e5a         #3
+    'aC'       // 5e5b-5e5c    #2
+    'B'        // 5e5d         #1
+    'aA'       // 5e5e-5e5f    #0
+    'B'        // 5e60         #1
+    'bA'       // 5e61-5e63    #0
+    'F'        // 5e64         #5
+    'D'        // 5e65         #3
+    'aB'       // 5e66-5e67    #1
+    'A'        // 5e68         #0
+    'B'        // 5e69         #1
+    'bA'       // 5e6a-5e6c    #0
+    'aC'       // 5e6d-5e6e    #2
+    'B'        // 5e6f         #1
+    'A'        // 5e70         #0
+    'K'        // 5e71         #10
+    'bA'       // 5e72-5e74    #0
+    'C'        // 5e75         #2
+    'A'        // 5e76         #0
+    'J'        // 5e77         #9
+    'hA'       // 5e78-5e80    #0
+    'F'        // 5e81         #5
+    'B'        // 5e82         #1
+    'aA'       // 5e83-5e84    #0
+    'D'        // 5e85         #3
+    'B'        // 5e86         #1
+    'A'        // 5e87         #0
+    'aB'       // 5e88-5e89    #1
+    'aA'       // 5e8a-5e8b    #0
+    'aB'       // 5e8c-5e8d    #1
+    'F'        // 5e8e         #5
+    'A'        // 5e8f         #0
+    'aD'       // 5e90-5e91    #3
+    'B'        // 5e92         #1
+    'aD'       // 5e93-5e94    #3
+    'bA'       // 5e95-5e97    #0
+    'D'        // 5e98         #3
+    'C'        // 5e99         #2
+    'A'        // 5e9a         #0
+    'B'        // 5e9b         #1
+    'A'        // 5e9c         #0
+    'bD'       // 5e9d-5e9f    #3
+    'A'        // 5ea0         #0
+    'D'        // 5ea1         #3
+    'C'        // 5ea2         #2
+    'B'        // 5ea3         #1
+    'C'        // 5ea4         #2
+    'cA'       // 5ea5-5ea8    #0
+    'D'        // 5ea9         #3
+    'C'        // 5eaa         #2
+    'A'        // 5eab         #0
+    'C'        // 5eac         #2
+    'A'        // 5ead         #0
+    'B'        // 5eae         #1
+    'D'        // 5eaf         #3
+    'B'        // 5eb0         #1
+    'C'        // 5eb1         #2
+    'B'        // 5eb2         #1
+    'A'        // 5eb3         #0
+    'B'        // 5eb4         #1
+    'cA'       // 5eb5-5eb8    #0
+    'C'        // 5eb9         #2
+    'bD'       // 5eba-5ebc    #3
+    'aA'       // 5ebd-5ebe    #0
+    'F'        // 5ebf         #5
+    'D'        // 5ec0         #3
+    'aA'       // 5ec1-5ec2    #0
+    'F'        // 5ec3         #5
+    'aB'       // 5ec4-5ec5    #1
+    'C'        // 5ec6         #2
+    'B'        // 5ec7         #1
+    'cA'       // 5ec8-5ecb    #0
+    'C'        // 5ecc         #2
+    'B'        // 5ecd         #1
+    'C'        // 5ece         #2
+    'J'        // 5ecf         #9
+    'aA'       // 5ed0-5ed1    #0
+    'C'        // 5ed2         #2
+    'A'        // 5ed3         #0
+    'C'        // 5ed4         #2
+    'aA'       // 5ed5-5ed6    #0
+    'aB'       // 5ed7-5ed8    #1
+    'bA'       // 5ed9-5edb    #0
+    'C'        // 5edc         #2
+    'fA'       // 5edd-5ee3    #0
+    'D'        // 5ee4         #3
+    'A'        // 5ee5         #0
+    'B'        // 5ee6         #1
+    'I'        // 5ee7         #8
+    'aA'       // 5ee8-5ee9    #0
+    'D'        // 5eea         #3
+    'F'        // 5eeb         #5
+    'A'        // 5eec         #0
+    'D'        // 5eed         #3
+    'aB'       // 5eee-5eef    #1
+    'F'        // 5ef0         #5
+    'A'        // 5ef1         #0
+    'B'        // 5ef2         #1
+    'aA'       // 5ef3-5ef4    #0
+    'D'        // 5ef5         #3
+    'aA'       // 5ef6-5ef7    #0
+    'aC'       // 5ef8-5ef9    #2
+    'aA'       // 5efa-5efb    #0
+    'C'        // 5efc         #2
+    'F'        // 5efd         #5
+    'aA'       // 5efe-5eff    #0
+    'F'        // 5f00         #5
+    'A'        // 5f01         #0
+    'C'        // 5f02         #2
+    'J'        // 5f03         #9
+    'A'        // 5f04         #0
+    'B'        // 5f05         #1
+    'F'        // 5f06         #5
+    'aA'       // 5f07-5f08    #0
+    'F'        // 5f09         #5
+    'aA'       // 5f0a-5f0b    #0
+    'bC'       // 5f0c-5f0e    #2
+    'A'        // 5f0f         #0
+    'F'        // 5f10         #5
+    'J'        // 5f11         #9
+    'I'        // 5f12         #8
+    'bA'       // 5f13-5f15    #0
+    'F'        // 5f16         #5
+    'aA'       // 5f17-5f18    #0
+    'F'        // 5f19         #5
+    'B'        // 5f1a         #1
+    'A'        // 5f1b         #0
+    'F'        // 5f1c         #5
+    'C'        // 5f1d         #2
+    'F'        // 5f1e         #5
+    'A'        // 5f1f         #0
+    'D'        // 5f20         #3
+    'F'        // 5f21         #5
+    'A'        // 5f22         #0
+    'aC'       // 5f23-5f24    #2
+    'bA'       // 5f25-5f27    #0
+    'C'        // 5f28         #2
+    'A'        // 5f29         #0
+    'D'        // 5f2a         #3
+    'aF'       // 5f2b-5f2c    #5
+    'A'        // 5f2d         #0
+    'C'        // 5f2e         #2
+    'F'        // 5f2f         #5
+    'C'        // 5f30         #2
+    'A'        // 5f31         #0
+    'D'        // 5f32         #3
+    'B'        // 5f33         #1
+    'J'        // 5f34         #9
+    'A'        // 5f35         #0
+    'C'        // 5f36         #2
+    'A'        // 5f37         #0
+    'C'        // 5f38         #2
+    'D'        // 5f39         #3
+    'A'        // 5f3a         #0
+    'C'        // 5f3b         #2
+    'A'        // 5f3c         #0
+    'F'        // 5f3d         #5
+    'J'        // 5f3e         #9
+    'F'        // 5f3f         #5
+    'A'        // 5f40         #0
+    'F'        // 5f41         #5
+    'D'        // 5f42         #3
+    'B'        // 5f43         #1
+    'aC'       // 5f44-5f45    #2
+    'I'        // 5f46         #8
+    'F'        // 5f47         #5
+    'A'        // 5f48         #0
+    'B'        // 5f49         #1
+    'A'        // 5f4a         #0
+    'B'        // 5f4b         #1
+    'A'        // 5f4c         #0
+    'C'        // 5f4d         #2
+    'A'        // 5f4e         #0
+    'B'        // 5f4f         #1
+    'aA'       // 5f50-5f51    #0
+    'D'        // 5f52         #3
+    'J'        // 5f53         #9
+    'A'        // 5f54         #0
+    'D'        // 5f55         #3
+    'cA'       // 5f56-5f59    #0
+    'D'        // 5f5a         #3
+    'J'        // 5f5b         #9
+    'C'        // 5f5c         #2
+    'A'        // 5f5d         #0
+    'B'        // 5f5e         #1
+    'D'        // 5f5f         #3
+    'F'        // 5f60         #5
+    'aA'       // 5f61-5f62    #0
+    'C'        // 5f63         #2
+    'aA'       // 5f64-5f65    #0
+    'J'        // 5f66         #9
+    'A'        // 5f67         #0
+    'D'        // 5f68         #3
+    'dA'       // 5f69-5f6d    #0
+    'D'        // 5f6e         #3
+    'C'        // 5f6f         #2
+    'aA'       // 5f70-5f71    #0
+    'C'        // 5f72         #2
+    'A'        // 5f73         #0
+    'C'        // 5f74         #2
+    'F'        // 5f75         #5
+    'B'        // 5f76         #1
+    'A'        // 5f77         #0
+    'C'        // 5f78         #2
+    'A'        // 5f79         #0
+    'F'        // 5f7a         #5
+    'B'        // 5f7b         #1
+    'A'        // 5f7c         #0
+    'aC'       // 5f7d-5f7e    #2
+    'cA'       // 5f7f-5f82    #0
+    'C'        // 5f83         #2
+    'F'        // 5f84         #5
+    'A'        // 5f85         #0
+    'B'        // 5f86         #1
+    'eA'       // 5f87-5f8c    #0
+    'F'        // 5f8d         #5
+    'D'        // 5f8e         #3
+    'F'        // 5f8f         #5
+    'bA'       // 5f90-5f92    #0
+    'F'        // 5f93         #5
+    'aD'       // 5f94-5f95    #3
+    'C'        // 5f96         #2
+    'bA'       // 5f97-5f99    #0
+    'D'        // 5f9a         #3
+    'B'        // 5f9b         #1
+    'A'        // 5f9c         #0
+    'F'        // 5f9d         #5
+    'A'        // 5f9e         #0
+    'B'        // 5f9f         #1
+    'aA'       // 5fa0-5fa1    #0
+    'F'        // 5fa2         #5
+    'K'        // 5fa3         #10
+    'C'        // 5fa4         #2
+    'aB'       // 5fa5-5fa6    #1
+    'cA'       // 5fa7-5faa    #0
+    'C'        // 5fab         #2
+    'cA'       // 5fac-5faf    #0
+    'F'        // 5fb0         #5
+    'C'        // 5fb1         #2
+    'B'        // 5fb2         #1
+    'J'        // 5fb3         #9
+    'F'        // 5fb4         #5
+    'A'        // 5fb5         #0
+    'B'        // 5fb6         #1
+    'A'        // 5fb7         #0
+    'F'        // 5fb8         #5
+    'A'        // 5fb9         #0
+    'aB'       // 5fba-5fbb    #1
+    'aA'       // 5fbc-5fbd    #0
+    'dB'       // 5fbe-5fc2    #1
+    'bA'       // 5fc3-5fc5    #0
+    'D'        // 5fc6         #3
+    'F'        // 5fc7         #5
+    'J'        // 5fc8         #9
+    'A'        // 5fc9         #0
+    'D'        // 5fca         #3
+    'F'        // 5fcb         #5
+    'aA'       // 5fcc-5fcd    #0
+    'K'        // 5fce         #10
+    'B'        // 5fcf         #1
+    'A'        // 5fd0         #0
+    'C'        // 5fd1         #2
+    'A'        // 5fd2         #0
+    'J'        // 5fd3         #9
+    'C'        // 5fd4         #2
+    'I'        // 5fd5         #8
+    'cA'       // 5fd6-5fd9    #0
+    'D'        // 5fda         #3
+    'B'        // 5fdb         #1
+    'J'        // 5fdc         #9
+    'aA'       // 5fdd-5fde    #0
+    'I'        // 5fdf         #8
+    'aA'       // 5fe0-5fe1    #0
+    'F'        // 5fe2         #5
+    'B'        // 5fe3         #1
+    'A'        // 5fe4         #0
+    'B'        // 5fe5         #1
+    'aD'       // 5fe6-5fe7    #3
+    'A'        // 5fe8         #0
+    'F'        // 5fe9         #5
+    'C'        // 5fea         #2
+    'A'        // 5feb         #0
+    'F'        // 5fec         #5
+    'bA'       // 5fed-5fef    #0
+    'F'        // 5ff0         #5
+    'A'        // 5ff1         #0
+    'F'        // 5ff2         #5
+    'C'        // 5ff3         #2
+    'B'        // 5ff4         #1
+    'A'        // 5ff5         #0
+    'F'        // 5ff6         #5
+    'B'        // 5ff7         #1
+    'A'        // 5ff8         #0
+    'D'        // 5ff9         #3
+    'C'        // 5ffa         #2
+    'A'        // 5ffb         #0
+    'J'        // 5ffc         #9
+    'A'        // 5ffd         #0
+    'D'        // 5ffe         #3
+    'A'        // 5fff         #0
+    'B'        // 6000         #1
+    'eD'       // 6001-6006    #3
+    'F'        // 6007         #5
+    'D'        // 6008         #3
+    'B'        // 6009         #1
+    'A'        // 600a         #0
+    'aB'       // 600b-600c    #1
+    'A'        // 600d         #0
+    'C'        // 600e         #2
+    'A'        // 600f         #0
+    'C'        // 6010         #2
+    'B'        // 6011         #1
+    'A'        // 6012         #0
+    'C'        // 6013         #2
+    'cA'       // 6014-6017    #0
+    'F'        // 6018         #5
+    'A'        // 6019         #0
+    'C'        // 601a         #2
+    'bA'       // 601b-601d    #0
+    'B'        // 601e         #1
+    'F'        // 601f         #5
+    'aA'       // 6020-6021    #0
+    'C'        // 6022         #2
+    'B'        // 6023         #1
+    'C'        // 6024         #2
+    'eA'       // 6025-602a    #0
+    'C'        // 602b         #2
+    'B'        // 602c         #1
+    'C'        // 602d         #2
+    'B'        // 602e         #1
+    'A'        // 602f         #0
+    'K'        // 6030         #10
+    'C'        // 6031         #2
+    'B'        // 6032         #1
+    'A'        // 6033         #0
+    'B'        // 6034         #1
+    'C'        // 6035         #2
+    'D'        // 6036         #3
+    'B'        // 6037         #1
+    'D'        // 6038         #3
+    'B'        // 6039         #1
+    'F'        // 603a         #5
+    'B'        // 603b         #1
+    'cD'       // 603c-603f    #3
+    'C'        // 6040         #2
+    'bA'       // 6041-6043    #0
+    'aB'       // 6044-6045    #1
+    'aA'       // 6046-6047    #0
+    'J'        // 6048         #9
+    'C'        // 6049         #2
+    'aA'       // 604a-604b    #0
+    'C'        // 604c         #2
+    'A'        // 604d         #0
+    'aD'       // 604e-604f    #3
+    'A'        // 6050         #0
+    'F'        // 6051         #5
+    'A'        // 6052         #0
+    'B'        // 6053         #1
+    'C'        // 6054         #2
+    'A'        // 6055         #0
+    'aF'       // 6056-6057    #5
+    'B'        // 6058         #1
+    'aA'       // 6059-605a    #0
+    'B'        // 605b         #1
+    'D'        // 605c         #3
+    'A'        // 605d         #0
+    'B'        // 605e         #1
+    'A'        // 605f         #0
+    'J'        // 6060         #9
+    'F'        // 6061         #5
+    'cA'       // 6062-6065    #0
+    'B'        // 6066         #1
+    'C'        // 6067         #2
+    'eA'       // 6068-606d    #0
+    'B'        // 606e         #1
+    'aA'       // 606f-6070    #0
+    'F'        // 6071         #5
+    'B'        // 6072         #1
+    'aD'       // 6073-6074    #3
+    'A'        // 6075         #0
+    'D'        // 6076         #3
+    'C'        // 6077         #2
+    'eD'       // 6078-607d    #3
+    'aC'       // 607e-607f    #2
+    'B'        // 6080         #1
+    'A'        // 6081         #0
+    'F'        // 6082         #5
+    'cA'       // 6083-6086    #0
+    'B'        // 6087         #1
+    'C'        // 6088         #2
+    'aA'       // 6089-608a    #0
+    'J'        // 608b         #9
+    'aA'       // 608c-608d    #0
+    'C'        // 608e         #2
+    'K'        // 608f         #10
+    'B'        // 6090         #1
+    'F'        // 6091         #5
+    'A'        // 6092         #0
+    'F'        // 6093         #5
+    'cA'       // 6094-6097    #0
+    'F'        // 6098         #5
+    'D'        // 6099         #3
+    'aA'       // 609a-609b    #0
+    'B'        // 609c         #1
+    'aC'       // 609d-609e    #2
+    'aA'       // 609f-60a0    #0
+    'D'        // 60a1         #3
+    'bA'       // 60a2-60a4    #0
+    'F'        // 60a5         #5
+    'C'        // 60a6         #2
+    'A'        // 60a7         #0
+    'C'        // 60a8         #2
+    'F'        // 60a9         #5
+    'J'        // 60aa         #9
+    'dD'       // 60ab-60af    #3
+    'fA'       // 60b0-60b6    #0
+    'C'        // 60b7         #2
+    'A'        // 60b8         #0
+    'aB'       // 60b9-60ba    #1
+    'cA'       // 60bb-60be    #0
+    'bB'       // 60bf-60c1    #1
+    'F'        // 60c2         #5
+    'B'        // 60c3         #1
+    'cA'       // 60c4-60c7    #0
+    'C'        // 60c8         #2
+    'A'        // 60c9         #0
+    'C'        // 60ca         #2
+    'A'        // 60cb         #0
+    'aB'       // 60cc-60cd    #1
+    'C'        // 60ce         #2
+    'A'        // 60cf         #0
+    'D'        // 60d0         #3
+    'A'        // 60d1         #0
+    'D'        // 60d2         #3
+    'A'        // 60d3         #0
+    'C'        // 60d4         #2
+    'A'        // 60d5         #0
+    'D'        // 60d6         #3
+    'I'        // 60d7         #8
+    'jA'       // 60d8-60e2    #0
+    'C'        // 60e3         #2
+    'B'        // 60e4         #1
+    'F'        // 60e5         #5
+    'B'        // 60e6         #1
+    'aC'       // 60e7-60e8    #2
+    'B'        // 60e9         #1
+    'cD'       // 60ea-60ed    #3
+    'F'        // 60ee         #5
+    'D'        // 60ef         #3
+    'dA'       // 60f0-60f4    #0
+    'C'        // 60f5         #2
+    'fA'       // 60f6-60fc    #0
+    'C'        // 60fd         #2
+    'aB'       // 60fe-60ff    #1
+    'aA'       // 6100-6101    #0
+    'F'        // 6102         #5
+    'A'        // 6103         #0
+    'aB'       // 6104-6105    #1
+    'A'        // 6106         #0
+    'C'        // 6107         #2
+    'aA'       // 6108-6109    #0
+    'C'        // 610a         #2
+    'B'        // 610b         #1
+    'C'        // 610c         #2
+    'bA'       // 610d-610f    #0
+    'C'        // 6110         #2
+    'F'        // 6111         #5
+    'aC'       // 6112-6113    #2
+    'aA'       // 6114-6115    #0
+    'C'        // 6116         #2
+    'F'        // 6117         #5
+    'B'        // 6118         #1
+    'C'        // 6119         #2
+    'bA'       // 611a-611c    #0
+    'B'        // 611d         #1
+    'J'        // 611e         #9
+    'A'        // 611f         #0
+    'C'        // 6120         #2
+    'F'        // 6121         #5
+    'A'        // 6122         #0
+    'B'        // 6123         #1
+    'bD'       // 6124-6126    #3
+    'aA'       // 6127-6128    #0
+    'B'        // 6129         #1
+    'F'        // 612a         #5
+    'aA'       // 612b-612c    #0
+    'K'        // 612d         #10
+    'aB'       // 612e-612f    #1
+    'A'        // 6130         #0
+    'F'        // 6131         #5
+    'B'        // 6132         #1
+    'D'        // 6133         #3
+    'A'        // 6134         #0
+    'F'        // 6135         #5
+    'C'        // 6136         #2
+    'A'        // 6137         #0
+    'D'        // 6138         #3
+    'aF'       // 6139-613a    #5
+    'B'        // 613b         #1
+    'J'        // 613c         #9
+    'C'        // 613d         #2
+    'aA'       // 613e-613f    #0
+    'B'        // 6140         #1
+    'C'        // 6141         #2
+    'A'        // 6142         #0
+    'D'        // 6143         #3
+    'A'        // 6144         #0
+    'C'        // 6145         #2
+    'bA'       // 6146-6148    #0
+    'C'        // 6149         #2
+    'cA'       // 614a-614d    #0
+    'C'        // 614e         #2
+    'I'        // 614f         #8
+    'B'        // 6150         #1
+    'D'        // 6151         #3
+    'I'        // 6152         #8
+    'A'        // 6153         #0
+    'I'        // 6154         #8
+    'A'        // 6155         #0
+    'B'        // 6156         #1
+    'D'        // 6157         #3
+    'bA'       // 6158-615a    #0
+    'B'        // 615b         #1
+    'I'        // 615c         #8
+    'A'        // 615d         #0
+    'C'        // 615e         #2
+    'aA'       // 615f-6160    #0
+    'I'        // 6161         #8
+    'bA'       // 6162-6164    #0
+    'C'        // 6165         #2
+    'B'        // 6166         #1
+    'aA'       // 6167-6168    #0
+    'D'        // 6169         #3
+    'I'        // 616a         #8
+    'A'        // 616b         #0
+    'C'        // 616c         #2
+    'D'        // 616d         #3
+    'A'        // 616e         #0
+    'C'        // 616f         #2
+    'aA'       // 6170-6171    #0
+    'C'        // 6172         #2
+    'dA'       // 6173-6177    #0
+    'F'        // 6178         #5
+    'B'        // 6179         #1
+    'I'        // 617a         #8
+    'F'        // 617b         #5
+    'bA'       // 617c-617e    #0
+    'F'        // 617f         #5
+    'C'        // 6180         #2
+    'bA'       // 6181-6183    #0
+    'F'        // 6184         #5
+    'aD'       // 6185-6186    #3
+    'C'        // 6187         #2
+    'D'        // 6188         #3
+    'B'        // 6189         #1
+    'A'        // 618a         #0
+    'C'        // 618b         #2
+    'B'        // 618c         #1
+    'aA'       // 618d-618e    #0
+    'D'        // 618f         #3
+    'dA'       // 6190-6194    #0
+    'B'        // 6195         #1
+    'A'        // 6196         #0
+    'F'        // 6197         #5
+    'bA'       // 6198-619a    #0
+    'B'        // 619b         #1
+    'aC'       // 619c-619d    #2
+    'D'        // 619e         #3
+    'C'        // 619f         #2
+    'F'        // 61a0         #5
+    'aB'       // 61a1-61a2    #1
+    'D'        // 61a3         #3
+    'A'        // 61a4         #0
+    'F'        // 61a5         #5
+    'D'        // 61a6         #3
+    'bA'       // 61a7-61a9    #0
+    'C'        // 61aa         #2
+    'aA'       // 61ab-61ac    #0
+    'C'        // 61ad         #2
+    'A'        // 61ae         #0
+    'I'        // 61af         #8
+    'aB'       // 61b0-61b1    #1
+    'A'        // 61b2         #0
+    'bB'       // 61b3-61b5    #1
+    'A'        // 61b6         #0
+    'B'        // 61b7         #1
+    'A'        // 61b8         #0
+    'C'        // 61b9         #2
+    'A'        // 61ba         #0
+    'K'        // 61bb         #10
+    'A'        // 61bc         #0
+    'K'        // 61bd         #10
+    'A'        // 61be         #0
+    'B'        // 61bf         #1
+    'bC'       // 61c0-61c2    #2
+    'A'        // 61c3         #0
+    'D'        // 61c4         #3
+    'B'        // 61c5         #1
+    'fA'       // 61c6-61cc    #0
+    'C'        // 61cd         #2
+    'F'        // 61ce         #5
+    'A'        // 61cf         #0
+    'C'        // 61d0         #2
+    'aD'       // 61d1-61d2    #3
+    'B'        // 61d3         #1
+    'D'        // 61d4         #3
+    'J'        // 61d5         #9
+    'B'        // 61d6         #1
+    'K'        // 61d7         #10
+    'B'        // 61d8         #1
+    'D'        // 61d9         #3
+    'B'        // 61da         #1
+    'D'        // 61db         #3
+    'aF'       // 61dc-61dd    #5
+    'aA'       // 61de-61df    #0
+    'B'        // 61e0         #1
+    'F'        // 61e1         #5
+    'C'        // 61e2         #2
+    'A'        // 61e3         #0
+    'B'        // 61e4         #1
+    'C'        // 61e5         #2
+    'A'        // 61e6         #0
+    'bC'       // 61e7-61e9    #2
+    'aB'       // 61ea-61eb    #1
+    'F'        // 61ec         #5
+    'C'        // 61ed         #2
+    'B'        // 61ee         #1
+    'F'        // 61ef         #5
+    'aB'       // 61f0-61f1    #1
+    'A'        // 61f2         #0
+    'D'        // 61f3         #3
+    'F'        // 61f4         #5
+    'C'        // 61f5         #2
+    'bA'       // 61f6-61f8    #0
+    'B'        // 61f9         #1
+    'A'        // 61fa         #0
+    'B'        // 61fb         #1
+    'dA'       // 61fc-6200    #0
+    'C'        // 6201         #2
+    'D'        // 6202         #3
+    'aC'       // 6203-6204    #2
+    'aD'       // 6205-6206    #3
+    'aA'       // 6207-6208    #0
+    'C'        // 6209         #2
+    'A'        // 620a         #0
+    'D'        // 620b         #3
+    'bA'       // 620c-620e    #0
+    'D'        // 620f         #3
+    'bA'       // 6210-6212    #0
+    'F'        // 6213         #5
+    'bA'       // 6214-6216    #0
+    'D'        // 6217         #3
+    'K'        // 6218         #10
+    'B'        // 6219         #1
+    'A'        // 621a         #0
+    'C'        // 621b         #2
+    'aF'       // 621c-621d    #5
+    'J'        // 621e         #9
+    'A'        // 621f         #0
+    'C'        // 6220         #2
+    'aA'       // 6221-6222    #0
+    'C'        // 6223         #2
+    'aB'       // 6224-6225    #1
+    'J'        // 6226         #9
+    'A'        // 6227         #0
+    'D'        // 6228         #3
+    'aA'       // 6229-622a    #0
+    'C'        // 622b         #2
+    'B'        // 622c         #1
+    'I'        // 622d         #8
+    'A'        // 622e         #0
+    'F'        // 622f         #5
+    'A'        // 6230         #0
+    'J'        // 6231         #9
+    'bA'       // 6232-6234    #0
+    'K'        // 6235         #10
+    'A'        // 6236         #0
+    'B'        // 6237         #1
+    'F'        // 6238         #5
+    'A'        // 6239         #0
+    'B'        // 623a         #1
+    'F'        // 623b         #5
+    'D'        // 623c         #3
+    'C'        // 623d         #2
+    'cA'       // 623e-6241    #0
+    'C'        // 6242         #2
+    'A'        // 6243         #0
+    'F'        // 6244         #5
+    'D'        // 6245         #3
+    'C'        // 6246         #2
+    'bA'       // 6247-6249    #0
+    'I'        // 624a         #8
+    'cA'       // 624b-624e    #0
+    'D'        // 624f         #3
+    'C'        // 6250         #2
+    'bA'       // 6251-6253    #0
+    'C'        // 6254         #2
+    'aF'       // 6255-6256    #5
+    'K'        // 6257         #10
+    'A'        // 6258         #0
+    'B'        // 6259         #1
+    'C'        // 625a         #2
+    'aA'       // 625b-625c    #0
+    'D'        // 625d         #3
+    'A'        // 625e         #0
+    'D'        // 625f         #3
+    'aC'       // 6260-6261    #2
+    'B'        // 6262         #1
+    'A'        // 6263         #0
+    'C'        // 6264         #2
+    'aB'       // 6265-6266    #1
+    'D'        // 6267         #3
+    'A'        // 6268         #0
+    'cD'       // 6269-626c    #3
+    'C'        // 626d         #2
+    'A'        // 626e         #0
+    'C'        // 626f         #2
+    'B'        // 6270         #1
+    'A'        // 6271         #0
+    'B'        // 6272         #1
+    'A'        // 6273         #0
+    'B'        // 6274         #1
+    'D'        // 6275         #3
+    'A'        // 6276         #0
+    'B'        // 6277         #1
+    'D'        // 6278         #3
+    'aA'       // 6279-627a    #0
+    'C'        // 627b         #2
+    'A'        // 627c         #0
+    'C'        // 627d         #2
+    'bA'       // 627e-6280    #0
+    'B'        // 6281         #1
+    'C'        // 6282         #2
+    'aA'       // 6283-6284    #0
+    'C'        // 6285         #2
+    'I'        // 6286         #8
+    'aB'       // 6287-6288    #1
+    'aA'       // 6289-628a    #0
+    'D'        // 628b         #3
+    'B'        // 628c         #1
+    'F'        // 628d         #5
+    'C'        // 628e         #2
+    'A'        // 628f         #0
+    'C'        // 6290         #2
+    'aA'       // 6291-6292    #0
+    'C'        // 6293         #2
+    'dA'       // 6294-6298    #0
+    'F'        // 6299         #5
+    'D'        // 629a         #3
+    'J'        // 629b         #9
+    'F'        // 629c         #5
+    'B'        // 629d         #1
+    'F'        // 629e         #5
+    'dD'       // 629f-62a3    #3
+    'B'        // 62a4         #1
+    'D'        // 62a5         #3
+    'A'        // 62a6         #0
+    'D'        // 62a7         #3
+    'A'        // 62a8         #0
+    'aB'       // 62a9-62aa    #1
+    'aA'       // 62ab-62ac    #0
+    'B'        // 62ad         #1
+    'I'        // 62ae         #8
+    'aB'       // 62af-62b0    #1
+    'A'        // 62b1         #0
+    'K'        // 62b2         #10
+    'C'        // 62b3         #2
+    'B'        // 62b4         #1
+    'A'        // 62b5         #0
+    'C'        // 62b6         #2
+    'F'        // 62b7         #5
+    'B'        // 62b8         #1
+    'A'        // 62b9         #0
+    'F'        // 62ba         #5
+    'C'        // 62bb         #2
+    'aA'       // 62bc-62bd    #0
+    'aC'       // 62be-62bf    #2
+    'D'        // 62c0         #3
+    'B'        // 62c1         #1
+    'A'        // 62c2         #0
+    'B'        // 62c3         #1
+    'fA'       // 62c4-62ca    #0
+    'I'        // 62cb         #8
+    'aA'       // 62cc-62cd    #0
+    'C'        // 62ce         #2
+    'jA'       // 62cf-62d9    #0
+    'C'        // 62da         #2
+    'aA'       // 62db-62dc    #0
+    'F'        // 62dd         #5
+    'D'        // 62de         #3
+    'B'        // 62df         #1
+    'F'        // 62e0         #5
+    'J'        // 62e1         #9
+    'bD'       // 62e2-62e4    #3
+    'B'        // 62e5         #1
+    'cD'       // 62e6-62e9    #3
+    'F'        // 62ea         #5
+    'B'        // 62eb         #1
+    'cA'       // 62ec-62ef    #0
+    'B'        // 62f0         #1
+    'A'        // 62f1         #0
+    'C'        // 62f2         #2
+    'A'        // 62f3         #0
+    'C'        // 62f4         #2
+    'bA'       // 62f5-62f7    #0
+    'cB'       // 62f8-62fb    #1
+    'C'        // 62fc         #2
+    'bA'       // 62fd-62ff    #0
+    'B'        // 6300         #1
+    'aA'       // 6301-6302    #0
+    'C'        // 6303         #2
+    'F'        // 6304         #5
+    'aD'       // 6305-6306    #3
+    'A'        // 6307         #0
+    'C'        // 6308         #2
+    'A'        // 6309         #0
+    'F'        // 630a         #5
+    'C'        // 630b         #2
+    'A'        // 630c         #0
+    'C'        // 630d         #2
+    'aB'       // 630e-630f    #1
+    'aA'       // 6310-6311    #0
+    'K'        // 6312         #10
+    'C'        // 6313         #2
+    'aB'       // 6314-6315    #1
+    'C'        // 6316         #2
+    'D'        // 6317         #3
+    'C'        // 6318         #2
+    'F'        // 6319         #5
+    'D'        // 631a         #3
+    'F'        // 631b         #5
+    'bD'       // 631c-631e    #3
+    'F'        // 631f         #5
+    'fD'       // 6320-6326    #3
+    'F'        // 6327         #5
+    'A'        // 6328         #0
+    'C'        // 6329         #2
+    'aA'       // 632a-632b    #0
+    'B'        // 632c         #1
+    'C'        // 632d         #2
+    'B'        // 632e         #1
+    'A'        // 632f         #0
+    'D'        // 6330         #3
+    'B'        // 6331         #1
+    'C'        // 6332         #2
+    'aB'       // 6333-6334    #1
+    'aC'       // 6335-6336    #2
+    'aB'       // 6337-6338    #1
+    'bA'       // 6339-633b    #0
+    'C'        // 633c         #2
+    'aA'       // 633d-633e    #0
+    'F'        // 633f         #5
+    'B'        // 6340         #1
+    'C'        // 6341         #2
+    'bA'       // 6342-6344    #0
+    'B'        // 6345         #1
+    'A'        // 6346         #0
+    'aB'       // 6347-6348    #1
+    'A'        // 6349         #0
+    'aC'       // 634a-634b    #2
+    'dA'       // 634c-6350    #0
+    'B'        // 6351         #1
+    'F'        // 6352         #5
+    'J'        // 6353         #9
+    'C'        // 6354         #2
+    'A'        // 6355         #0
+    'B'        // 6356         #1
+    'A'        // 6357         #0
+    'aC'       // 6358-6359    #2
+    'I'        // 635a         #8
+    'aF'       // 635b-635c    #5
+    'B'        // 635d         #1
+    'eD'       // 635e-6363    #3
+    'B'        // 6364         #1
+    'C'        // 6365         #2
+    'F'        // 6366         #5
+    'bA'       // 6367-6369    #0
+    'D'        // 636a         #3
+    'A'        // 636b         #0
+    'aC'       // 636c-636d    #2
+    'A'        // 636e         #0
+    'aB'       // 636f-6370    #1
+    'aA'       // 6371-6372    #0
+    'D'        // 6373         #3
+    'F'        // 6374         #5
+    'C'        // 6375         #2
+    'aA'       // 6376-6377    #0
+    'C'        // 6378         #2
+    'B'        // 6379         #1
+    'aA'       // 637a-637b    #0
+    'aC'       // 637c-637d    #2
+    'D'        // 637e         #3
+    'aA'       // 637f-6380    #0
+    'B'        // 6381         #1
+    'C'        // 6382         #2
+    'aA'       // 6383-6384    #0
+    'B'        // 6385         #1
+    'D'        // 6386         #3
+    'cA'       // 6387-638a    #0
+    'B'        // 638b         #1
+    'A'        // 638c         #0
+    'B'        // 638d         #1
+    'aA'       // 638e-638f    #0
+    'C'        // 6390         #2
+    'B'        // 6391         #1
+    'A'        // 6392         #0
+    'D'        // 6393         #3
+    'C'        // 6394         #2
+    'F'        // 6395         #5
+    'A'        // 6396         #0
+    'B'        // 6397         #1
+    'A'        // 6398         #0
+    'C'        // 6399         #2
+    'F'        // 639a         #5
+    'A'        // 639b         #0
+    'I'        // 639c         #8
+    'B'        // 639d         #1
+    'C'        // 639e         #2
+    'cA'       // 639f-63a2    #0
+    'aC'       // 63a3-63a4    #2
+    'A'        // 63a5         #0
+    'F'        // 63a6         #5
+    'cA'       // 63a7-63aa    #0
+    'C'        // 63ab         #2
+    'A'        // 63ac         #0
+    'bC'       // 63ad-63af    #2
+    'aB'       // 63b0-63b1    #1
+    'F'        // 63b2         #5
+    'D'        // 63b3         #3
+    'aF'       // 63b4-63b5    #5
+    'bD'       // 63b6-63b8    #3
+    'B'        // 63b9         #1
+    'D'        // 63ba         #3
+    'F'        // 63bb         #5
+    'D'        // 63bc         #3
+    'C'        // 63bd         #2
+    'A'        // 63be         #0
+    'D'        // 63bf         #3
+    'A'        // 63c0         #0
+    'C'        // 63c1         #2
+    'B'        // 63c2         #1
+    'aA'       // 63c3-63c4    #0
+    'C'        // 63c5         #2
+    'A'        // 63c6         #0
+    'B'        // 63c7         #1
+    'C'        // 63c8         #2
+    'A'        // 63c9         #0
+    'cB'       // 63ca-63cd    #1
+    'C'        // 63ce         #2
+    'aA'       // 63cf-63d0    #0
+    'C'        // 63d1         #2
+    'A'        // 63d2         #0
+    'C'        // 63d3         #2
+    'F'        // 63d4         #5
+    'C'        // 63d5         #2
+    'A'        // 63d6         #0
+    'bB'       // 63d7-63d9    #1
+    'aA'       // 63da-63db    #0
+    'C'        // 63dc         #2
+    'aB'       // 63dd-63de    #1
+    'I'        // 63df         #8
+    'aA'       // 63e0-63e1    #0
+    'B'        // 63e2         #1
+    'A'        // 63e3         #0
+    'B'        // 63e4         #1
+    'C'        // 63e5         #2
+    'bB'       // 63e6-63e8    #1
+    'A'        // 63e9         #0
+    'C'        // 63ea         #2
+    'A'        // 63eb         #0
+    'F'        // 63ec         #5
+    'aA'       // 63ed-63ee    #0
+    'bB'       // 63ef-63f1    #1
+    'A'        // 63f2         #0
+    'C'        // 63f3         #2
+    'bA'       // 63f4-63f6    #0
+    'J'        // 63f7         #9
+    'aC'       // 63f8-63f9    #2
+    'F'        // 63fa         #5
+    'aB'       // 63fb-63fc    #1
+    'D'        // 63fd         #3
+    'B'        // 63fe         #1
+    'fD'       // 63ff-6405    #3
+    'A'        // 6406         #0
+    'B'        // 6407         #1
+    'D'        // 6408         #3
+    'A'        // 6409         #0
+    'C'        // 640a         #2
+    'aB'       // 640b-640c    #1
+    'A'        // 640d         #0
+    'B'        // 640e         #1
+    'A'        // 640f         #0
+    'C'        // 6410         #2
+    'D'        // 6411         #3
+    'A'        // 6412         #0
+    'C'        // 6413         #2
+    'A'        // 6414         #0
+    'B'        // 6415         #1
+    'bA'       // 6416-6418    #0
+    'D'        // 6419         #3
+    'aB'       // 641a-641b    #1
+    'A'        // 641c         #0
+    'D'        // 641d         #3
+    'C'        // 641e         #2
+    'B'        // 641f         #1
+    'A'        // 6420         #0
+    'B'        // 6421         #1
+    'A'        // 6422         #0
+    'B'        // 6423         #1
+    'aA'       // 6424-6425    #0
+    'C'        // 6426         #2
+    'B'        // 6427         #1
+    'A'        // 6428         #0
+    'F'        // 6429         #5
+    'A'        // 642a         #0
+    'I'        // 642b         #8
+    'aA'       // 642c-642d    #0
+    'B'        // 642e         #1
+    'aA'       // 642f-6430    #0
+    'D'        // 6431         #3
+    'aB'       // 6432-6433    #1
+    'A'        // 6434         #0
+    'C'        // 6435         #2
+    'A'        // 6436         #0
+    'bB'       // 6437-6439    #1
+    'A'        // 643a         #0
+    'B'        // 643b         #1
+    'D'        // 643c         #3
+    'C'        // 643d         #2
+    'A'        // 643e         #0
+    'C'        // 643f         #2
+    'aB'       // 6440-6441    #1
+    'F'        // 6442         #5
+    'B'        // 6443         #1
+    'fD'       // 6444-644a    #3
+    'C'        // 644b         #2
+    'D'        // 644c         #3
+    'B'        // 644d         #1
+    'C'        // 644e         #2
+    'F'        // 644f         #5
+    'B'        // 6450         #1
+    'cC'       // 6451-6454    #2
+    'bD'       // 6455-6457    #3
+    'A'        // 6458         #0
+    'B'        // 6459         #1
+    'C'        // 645a         #2
+    'A'        // 645b         #0
+    'aC'       // 645c-645d    #2
+    'I'        // 645e         #8
+    'C'        // 645f         #2
+    'A'        // 6460         #0
+    'C'        // 6461         #2
+    'D'        // 6462         #3
+    'F'        // 6463         #5
+    'D'        // 6464         #3
+    'aB'       // 6465-6466    #1
+    'A'        // 6467         #0
+    'B'        // 6468         #1
+    'A'        // 6469         #0
+    'D'        // 646a         #3
+    'aB'       // 646b-646c    #1
+    'A'        // 646d         #0
+    'B'        // 646e         #1
+    'A'        // 646f         #0
+    'bB'       // 6470-6472    #1
+    'A'        // 6473         #0
+    'C'        // 6474         #2
+    'B'        // 6475         #1
+    'C'        // 6476         #2
+    'B'        // 6477         #1
+    'cA'       // 6478-647b    #0
+    'B'        // 647c         #1
+    'A'        // 647d         #0
+    'D'        // 647e         #3
+    'B'        // 647f         #1
+    'aD'       // 6480-6481    #3
+    'B'        // 6482         #1
+    'F'        // 6483         #5
+    'D'        // 6484         #3
+    'A'        // 6485         #0
+    'D'        // 6486         #3
+    'C'        // 6487         #2
+    'A'        // 6488         #0
+    'dB'       // 6489-648d    #1
+    'D'        // 648e         #3
+    'C'        // 648f         #2
+    'cA'       // 6490-6493    #0
+    'D'        // 6494         #3
+    'A'        // 6495         #0
+    'aB'       // 6496-6497    #1
+    'C'        // 6498         #2
+    'aA'       // 6499-649a    #0
+    'J'        // 649b         #9
+    'B'        // 649c         #1
+    'bA'       // 649d-649f    #0
+    'B'        // 64a0         #1
+    'F'        // 64a1         #5
+    'B'        // 64a2         #1
+    'C'        // 64a3         #2
+    'aA'       // 64a4-64a5    #0
+    'C'        // 64a6         #2
+    'D'        // 64a7         #3
+    'F'        // 64a8         #5
+    'A'        // 64a9         #0
+    'D'        // 64aa         #3
+    'A'        // 64ab         #0
+    'C'        // 64ac         #2
+    'aA'       // 64ad-64ae    #0
+    'B'        // 64af         #1
+    'A'        // 64b0         #0
+    'B'        // 64b1         #1
+    'A'        // 64b2         #0
+    'C'        // 64b3         #2
+    'B'        // 64b4         #1
+    'D'        // 64b5         #3
+    'B'        // 64b6         #1
+    'aD'       // 64b7-64b8    #3
+    'F'        // 64b9         #5
+    'D'        // 64ba         #3
+    'aA'       // 64bb-64bc    #0
+    'C'        // 64bd         #2
+    'aA'       // 64be-64bf    #0
+    'B'        // 64c0         #1
+    'A'        // 64c1         #0
+    'C'        // 64c2         #2
+    'B'        // 64c3         #1
+    'aA'       // 64c4-64c5    #0
+    'D'        // 64c6         #3
+    'A'        // 64c7         #0
+    'D'        // 64c8         #3
+    'aA'       // 64c9-64ca    #0
+    'C'        // 64cb         #2
+    'F'        // 64cc         #5
+    'aA'       // 64cd-64ce    #0
+    'B'        // 64cf         #1
+    'A'        // 64d0         #0
+    'F'        // 64d1         #5
+    'A'        // 64d2         #0
+    'B'        // 64d3         #1
+    'A'        // 64d4         #0
+    'J'        // 64d5         #9
+    'B'        // 64d6         #1
+    'aA'       // 64d7-64d8    #0
+    'B'        // 64d9         #1
+    'A'        // 64da         #0
+    'B'        // 64db         #1
+    'D'        // 64dc         #3
+    'B'        // 64dd         #1
+    'aD'       // 64de-64df    #3
+    'cA'       // 64e0-64e3    #0
+    'C'        // 64e4         #2
+    'bA'       // 64e5-64e7    #0
+    'B'        // 64e8         #1
+    'aC'       // 64e9-64ea    #2
+    'B'        // 64eb         #1
+    'aA'       // 64ec-64ed    #0
+    'D'        // 64ee         #3
+    'A'        // 64ef         #0
+    'C'        // 64f0         #2
+    'aA'       // 64f1-64f2    #0
+    'B'        // 64f3         #1
+    'A'        // 64f4         #0
+    'aF'       // 64f5-64f6    #5
+    'C'        // 64f7         #2
+    'B'        // 64f8         #1
+    'D'        // 64f9         #3
+    'A'        // 64fa         #0
+    'C'        // 64fb         #2
+    'B'        // 64fc         #1
+    'C'        // 64fd         #2
+    'A'        // 64fe         #0
+    'C'        // 64ff         #2
+    'A'        // 6500         #0
+    'C'        // 6501         #2
+    'K'        // 6502         #10
+    'B'        // 6503         #1
+    'A'        // 6504         #0
+    'F'        // 6505         #5
+    'B'        // 6506         #1
+    'I'        // 6507         #8
+    'F'        // 6508         #5
+    'C'        // 6509         #2
+    'A'        // 650a         #0
+    'D'        // 650b         #3
+    'bB'       // 650c-650e    #1
+    'A'        // 650f         #0
+    'aB'       // 6510-6511    #1
+    'D'        // 6512         #3
+    'C'        // 6513         #2
+    'A'        // 6514         #0
+    'B'        // 6515         #1
+    'C'        // 6516         #2
+    'B'        // 6517         #1
+    'aA'       // 6518-6519    #0
+    'D'        // 651a         #3
+    'aC'       // 651b-651c    #2
+    'A'        // 651d         #0
+    'aC'       // 651e-651f    #2
+    'aB'       // 6520-6521    #1
+    'bA'       // 6522-6524    #0
+    'B'        // 6525         #1
+    'C'        // 6526         #2
+    'aD'       // 6527-6528    #3
+    'C'        // 6529         #2
+    'bA'       // 652a-652c    #0
+    'B'        // 652d         #1
+    'C'        // 652e         #2
+    'A'        // 652f         #0
+    'B'        // 6530         #1
+    'F'        // 6531         #5
+    'A'        // 6532         #0
+    'B'        // 6533         #1
+    'eA'       // 6534-6539    #0
+    'F'        // 653a         #5
+    'A'        // 653b         #0
+    'F'        // 653c         #5
+    'bA'       // 653d-653f    #0
+    'D'        // 6540         #3
+    'B'        // 6541         #1
+    'D'        // 6542         #3
+    'A'        // 6543         #0
+    'F'        // 6544         #5
+    'A'        // 6545         #0
+    'B'        // 6546         #1
+    'F'        // 6547         #5
+    'aA'       // 6548-6549    #0
+    'B'        // 654a         #1
+    'aD'       // 654b-654c    #3
+    'A'        // 654d         #0
+    'J'        // 654e         #9
+    'A'        // 654f         #0
+    'F'        // 6550         #5
+    'A'        // 6551         #0
+    'J'        // 6552         #9
+    'B'        // 6553         #1
+    'eA'       // 6554-6559    #0
+    'B'        // 655a         #1
+    'D'        // 655b         #3
+    'B'        // 655c         #1
+    'aA'       // 655d-655e    #0
+    'C'        // 655f         #2
+    'F'        // 6560         #5
+    'D'        // 6561         #3
+    'aA'       // 6562-6563    #0
+    'aB'       // 6564-6565    #1
+    'A'        // 6566         #0
+    'C'        // 6567         #2
+    'B'        // 6568         #1
+    'D'        // 6569         #3
+    'B'        // 656a         #1
+    'C'        // 656b         #2
+    'A'        // 656c         #0
+    'I'        // 656d         #8
+    'D'        // 656e         #3
+    'B'        // 656f         #1
+    'F'        // 6570         #5
+    'D'        // 6571         #3
+    'A'        // 6572         #0
+    'B'        // 6573         #1
+    'aA'       // 6574-6575    #0
+    'B'        // 6576         #1
+    'aA'       // 6577-6578    #0
+    'B'        // 6579         #1
+    'C'        // 657a         #2
+    'aB'       // 657b-657c    #1
+    'F'        // 657d         #5
+    'K'        // 657e         #10
+    'aB'       // 657f-6580    #1
+    'bA'       // 6581-6583    #0
+    'C'        // 6584         #2
+    'A'        // 6585         #0
+    'B'        // 6586         #1
+    'A'        // 6587         #0
+    'C'        // 6588         #2
+    'A'        // 6589         #0
+    'F'        // 658a         #5
+    'B'        // 658b         #1
+    'A'        // 658c         #0
+    'D'        // 658d         #3
+    'F'        // 658e         #5
+    'D'        // 658f         #3
+    'aA'       // 6590-6591    #0
+    'C'        // 6592         #2
+    'D'        // 6593         #3
+    'B'        // 6594         #1
+    'C'        // 6595         #2
+    'B'        // 6596         #1
+    'A'        // 6597         #0
+    'F'        // 6598         #5
+    'A'        // 6599         #0
+    'D'        // 659a         #3
+    'bA'       // 659b-659d    #0
+    'B'        // 659e         #1
+    'A'        // 659f         #0
+    'C'        // 65a0         #2
+    'A'        // 65a1         #0
+    'B'        // 65a2         #1
+    'F'        // 65a3         #5
+    'aA'       // 65a4-65a5    #0
+    'F'        // 65a6         #5
+    'A'        // 65a7         #0
+    'B'        // 65a8         #1
+    'D'        // 65a9         #3
+    'B'        // 65aa         #1
+    'aA'       // 65ab-65ac    #0
+    'J'        // 65ad         #9
+    'C'        // 65ae         #2
+    'aA'       // 65af-65b0    #0
+    'K'        // 65b1         #10
+    'A'        // 65b2         #0
+    'C'        // 65b3         #2
+    'F'        // 65b4         #5
+    'C'        // 65b5         #2
+    'B'        // 65b6         #1
+    'A'        // 65b7         #0
+    'C'        // 65b8         #2
+    'A'        // 65b9         #0
+    'D'        // 65ba         #3
+    'B'        // 65bb         #1
+    'aA'       // 65bc-65bd    #0
+    'C'        // 65be         #2
+    'A'        // 65bf         #0
+    'D'        // 65c0         #3
+    'eA'       // 65c1-65c6    #0
+    'D'        // 65c7         #3
+    'aF'       // 65c8-65c9    #5
+    'K'        // 65ca         #10
+    'aA'       // 65cb-65cc    #0
+    'B'        // 65cd         #1
+    'C'        // 65ce         #2
+    'A'        // 65cf         #0
+    'C'        // 65d0         #2
+    'B'        // 65d1         #1
+    'A'        // 65d2         #0
+    'B'        // 65d3         #1
+    'C'        // 65d4         #2
+    'D'        // 65d5         #3
+    'C'        // 65d6         #2
+    'A'        // 65d7         #0
+    'aF'       // 65d8-65d9    #5
+    'B'        // 65da         #1
+    'C'        // 65db         #2
+    'D'        // 65dc         #3
+    'aB'       // 65dd-65de    #1
+    'C'        // 65df         #2
+    'aA'       // 65e0-65e1    #0
+    'C'        // 65e2         #2
+    'A'        // 65e3         #0
+    'D'        // 65e4         #3
+    'aA'       // 65e5-65e6    #0
+    'F'        // 65e7         #5
+    'aA'       // 65e8-65e9    #0
+    'aD'       // 65ea-65eb    #3
+    'aA'       // 65ec-65ed    #0
+    'aB'       // 65ee-65ef    #1
+    'C'        // 65f0         #2
+    'aA'       // 65f1-65f2    #0
+    'B'        // 65f3         #1
+    'A'        // 65f4         #0
+    'C'        // 65f5         #2
+    'bD'       // 65f6-65f8    #3
+    'F'        // 65f9         #5
+    'bA'       // 65fa-65fc    #0
+    'I'        // 65fd         #8
+    'F'        // 65fe         #5
+    'aA'       // 65ff-6600    #0
+    'D'        // 6601         #3
+    'aA'       // 6602-6603    #0
+    'C'        // 6604         #2
+    'B'        // 6605         #1
+    'aA'       // 6606-6607    #0
+    'C'        // 6608         #2
+    'aA'       // 6609-660a    #0
+    'B'        // 660b         #1
+    'cA'       // 660c-660f    #0
+    'I'        // 6610         #8
+    'A'        // 6611         #0
+    'C'        // 6612         #2
+    'bA'       // 6613-6615    #0
+    'F'        // 6616         #5
+    'D'        // 6617         #3
+    'B'        // 6618         #1
+    'aD'       // 6619-661a    #3
+    'K'        // 661b         #10
+    'A'        // 661c         #0
+    'C'        // 661d         #2
+    'cA'       // 661e-6621    #0
+    'C'        // 6622         #2
+    'bA'       // 6623-6625    #0
+    'C'        // 6626         #2
+    'aA'       // 6627-6628    #0
+    'aF'       // 6629-662a    #5
+    'A'        // 662b         #0
+    'F'        // 662c         #5
+    'A'        // 662d         #0
+    'C'        // 662e         #2
+    'bA'       // 662f-6631    #0
+    'B'        // 6632         #1
+    'C'        // 6633         #2
+    'bA'       // 6634-6636    #0
+    'J'        // 6637         #9
+    'D'        // 6638         #3
+    'C'        // 6639         #2
+    'A'        // 663a         #0
+    'J'        // 663b         #9
+    'F'        // 663c         #5
+    'aD'       // 663d-663e    #3
+    'aF'       // 663f-6640    #5
+    'cA'       // 6641-6644    #0
+    'C'        // 6645         #2
+    'F'        // 6646         #5
+    'B'        // 6647         #1
+    'aA'       // 6648-6649    #0
+    'C'        // 664a         #2
+    'aA'       // 664b-664c    #0
+    'B'        // 664d         #1
+    'J'        // 664e         #9
+    'A'        // 664f         #0
+    'K'        // 6650         #10
+    'A'        // 6651         #0
+    'C'        // 6652         #2
+    'B'        // 6653         #1
+    'bD'       // 6654-6656    #3
+    'C'        // 6657         #2
+    'F'        // 6658         #5
+    'bA'       // 6659-665b    #0
+    'C'        // 665c         #2
+    'eA'       // 665d-6662    #0
+    'C'        // 6663         #2
+    'dA'       // 6664-6668    #0
+    'J'        // 6669         #9
+    'C'        // 666a         #2
+    'aA'       // 666b-666c    #0
+    'J'        // 666d         #9
+    'bA'       // 666e-6670    #0
+    'aB'       // 6671-6672    #1
+    'aA'       // 6673-6674    #0
+    'F'        // 6675         #5
+    'eA'       // 6676-667b    #0
+    'C'        // 667c         #2
+    'I'        // 667d         #8
+    'C'        // 667e         #2
+    'J'        // 667f         #9
+    'C'        // 6680         #2
+    'F'        // 6681         #5
+    'D'        // 6682         #3
+    'F'        // 6683         #5
+    'A'        // 6684         #0
+    'aB'       // 6685-6686    #1
+    'bA'       // 6687-6689    #0
+    'B'        // 668a         #1
+    'aA'       // 668b-668c    #0
+    'C'        // 668d         #2
+    'A'        // 668e         #0
+    'D'        // 668f         #3
+    'aA'       // 6690-6691    #0
+    'C'        // 6692         #2
+    'D'        // 6693         #3
+    'aB'       // 6694-6695    #1
+    'bA'       // 6696-6698    #0
+    'C'        // 6699         #2
+    'A'        // 669a         #0
+    'aF'       // 669b-669c    #5
+    'A'        // 669d         #0
+    'K'        // 669e         #10
+    'C'        // 669f         #2
+    'A'        // 66a0         #0
+    'B'        // 66a1         #1
+    'A'        // 66a2         #0
+    'K'        // 66a3         #10
+    'C'        // 66a4         #2
+    'D'        // 66a5         #3
+    'F'        // 66a6         #5
+    'D'        // 66a7         #3
+    'bB'       // 66a8-66aa    #1
+    'A'        // 66ab         #0
+    'K'        // 66ac         #10
+    'C'        // 66ad         #2
+    'A'        // 66ae         #0
+    'aB'       // 66af-66b0    #1
+    'dA'       // 66b1-66b5    #0
+    'aB'       // 66b6-66b7    #1
+    'aA'       // 66b8-66b9    #0
+    'I'        // 66ba         #8
+    'A'        // 66bb         #0
+    'F'        // 66bc         #5
+    'B'        // 66bd         #1
+    'bA'       // 66be-66c0    #0
+    'J'        // 66c1         #9
+    'aF'       // 66c2-66c3    #5
+    'A'        // 66c4         #0
+    'K'        // 66c5         #10
+    'cA'       // 66c6-66c9    #0
+    'aB'       // 66ca-66cb    #1
+    'C'        // 66cc         #2
+    'B'        // 66cd         #1
+    'aC'       // 66ce-66cf    #2
+    'aD'       // 66d0-66d1    #3
+    'B'        // 66d2         #1
+    'K'        // 66d3         #10
+    'J'        // 66d4         #9
+    'D'        // 66d5         #3
+    'A'        // 66d6         #0
+    'D'        // 66d7         #3
+    'I'        // 66d8         #8
+    'dA'       // 66d9-66dd    #0
+    'I'        // 66de         #8
+    'F'        // 66df         #5
+    'A'        // 66e0         #0
+    'aD'       // 66e1-66e2    #3
+    'I'        // 66e3         #8
+    'B'        // 66e4         #1
+    'D'        // 66e5         #3
+    'A'        // 66e6         #0
+    'B'        // 66e7         #1
+    'aA'       // 66e8-66e9    #0
+    'K'        // 66ea         #10
+    'C'        // 66eb         #2
+    'A'        // 66ec         #0
+    'B'        // 66ed         #1
+    'A'        // 66ee         #0
+    'K'        // 66ef         #10
+    'A'        // 66f0         #0
+    'B'        // 66f1         #1
+    'bA'       // 66f2-66f4    #0
+    'F'        // 66f5         #5
+    'B'        // 66f6         #1
+    'bA'       // 66f7-66f9    #0
+    'J'        // 66fa         #9
+    'F'        // 66fb         #5
+    'A'        // 66fc         #0
+    'F'        // 66fd         #5
+    'bA'       // 66fe-6700    #0
+    'C'        // 6701         #2
+    'B'        // 6702         #1
+    'A'        // 6703         #0
+    'I'        // 6704         #8
+    'A'        // 6705         #0
+    'D'        // 6706         #3
+    'F'        // 6707         #5
+    'aA'       // 6708-6709    #0
+    'I'        // 670a         #8
+    'bA'       // 670b-670d    #0
+    'aC'       // 670e-670f    #2
+    'A'        // 6710         #0
+    'D'        // 6711         #3
+    'aC'       // 6712-6713    #2
+    'aA'       // 6714-6715    #0
+    'C'        // 6716         #2
+    'A'        // 6717         #0
+    'B'        // 6718         #1
+    'C'        // 6719         #2
+    'D'        // 671a         #3
+    'A'        // 671b         #0
+    'F'        // 671c         #5
+    'cA'       // 671d-6720    #0
+    'B'        // 6721         #1
+    'A'        // 6722         #0
+    'I'        // 6723         #8
+    'D'        // 6724         #3
+    'C'        // 6725         #2
+    'bA'       // 6726-6728    #0
+    'D'        // 6729         #3
+    'dA'       // 672a-672e    #0
+    'aD'       // 672f-6730    #3
+    'A'        // 6731         #0
+    'D'        // 6732         #3
+    'aA'       // 6733-6734    #0
+    'C'        // 6735         #2
+    'A'        // 6736         #0
+    'F'        // 6737         #5
+    'C'        // 6738         #2
+    'B'        // 6739         #1
+    'A'        // 673a         #0
+    'aB'       // 673b-673c    #1
+    'aA'       // 673d-673e    #0
+    'C'        // 673f         #2
+    'D'        // 6740         #3
+    'F'        // 6741         #5
+    'D'        // 6742         #3
+    'F'        // 6743         #5
+    'B'        // 6744         #1
+    'aA'       // 6745-6746    #0
+    'aC'       // 6747-6748    #2
+    'A'        // 6749         #0
+    'D'        // 674a         #3
+    'I'        // 674b         #8
+    'A'        // 674c         #0
+    'C'        // 674d         #2
+    'cA'       // 674e-6751    #0
+    'D'        // 6752         #3
+    'A'        // 6753         #0
+    'F'        // 6754         #5
+    'C'        // 6755         #2
+    'A'        // 6756         #0
+    'B'        // 6757         #1
+    'D'        // 6758         #3
+    'C'        // 6759         #2
+    'B'        // 675a         #1
+    'D'        // 675b         #3
+    'dA'       // 675c-6760    #0
+    'aC'       // 6761-6762    #2
+    'aF'       // 6763-6764    #5
+    'J'        // 6765         #9
+    'F'        // 6766         #5
+    'B'        // 6767         #1
+    'aD'       // 6768-6769    #3
+    'A'        // 676a         #0
+    'B'        // 676b         #1
+    'aA'       // 676c-676d    #0
+    'C'        // 676e         #2
+    'dA'       // 676f-6773    #0
+    'C'        // 6774         #2
+    'A'        // 6775         #0
+    'C'        // 6776         #2
+    'A'        // 6777         #0
+    'bB'       // 6778-677a    #1
+    'aA'       // 677b-677c    #0
+    'B'        // 677d         #1
+    'aA'       // 677e-677f    #0
+    'F'        // 6780         #5
+    'C'        // 6781         #2
+    'B'        // 6782         #1
+    'I'        // 6783         #8
+    'aC'       // 6784-6785    #2
+    'B'        // 6786         #1
+    'A'        // 6787         #0
+    'D'        // 6788         #3
+    'A'        // 6789         #0
+    'D'        // 678a         #3
+    'aA'       // 678b-678c    #0
+    'B'        // 678d         #1
+    'C'        // 678e         #2
+    'aA'       // 678f-6790    #0
+    'C'        // 6791         #2
+    'aA'       // 6792-6793    #0
+    'B'        // 6794         #1
+    'A'        // 6795         #0
+    'F'        // 6796         #5
+    'cA'       // 6797-679a    #0
+    'F'        // 679b         #5
+    'aA'       // 679c-679d    #0
+    'D'        // 679e         #3
+    'B'        // 679f         #1
+    'C'        // 67a0         #2
+    'aF'       // 67a1-67a2    #5
+    'D'        // 67a3         #3
+    'C'        // 67a4         #2
+    'D'        // 67a5         #3
+    'F'        // 67a6         #5
+    'aD'       // 67a7-67a8    #3
+    'F'        // 67a9         #5
+    'aD'       // 67aa-67ab    #3
+    'B'        // 67ac         #1
+    'D'        // 67ad         #3
+    'B'        // 67ae         #1
+    'aA'       // 67af-67b0    #0
+    'C'        // 67b1         #2
+    'aA'       // 67b2-67b3    #0
+    'aC'       // 67b4-67b5    #2
+    'bA'       // 67b6-67b8    #0
+    'C'        // 67b9         #2
+    'B'        // 67ba         #1
+    'C'        // 67bb         #2
+    'aF'       // 67bc-67bd    #5
+    'J'        // 67be         #9
+    'B'        // 67bf         #1
+    'C'        // 67c0         #2
+    'A'        // 67c1         #0
+    'aC'       // 67c2-67c3    #2
+    'aA'       // 67c4-67c5    #0
+    'C'        // 67c6         #2
+    'D'        // 67c7         #3
+    'aC'       // 67c8-67c9    #2
+    'A'        // 67ca         #0
+    'bB'       // 67cb-67cd    #1
+    'C'        // 67ce         #2
+    'eA'       // 67cf-67d4    #0
+    'D'        // 67d5         #3
+    'I'        // 67d6         #8
+    'cA'       // 67d7-67da    #0
+    'aC'       // 67db-67dc    #2
+    'aA'       // 67dd-67de    #0
+    'I'        // 67df         #8
+    'D'        // 67e0         #3
+    'F'        // 67e1         #5
+    'A'        // 67e2         #0
+    'B'        // 67e3         #1
+    'C'        // 67e4         #2
+    'B'        // 67e5         #1
+    'aC'       // 67e6-67e7    #2
+    'D'        // 67e8         #3
+    'A'        // 67e9         #0
+    'aB'       // 67ea-67eb    #1
+    'A'        // 67ec         #0
+    'B'        // 67ed         #1
+    'C'        // 67ee         #2
+    'bA'       // 67ef-67f1    #0
+    'C'        // 67f2         #2
+    'cA'       // 67f3-67f6    #0
+    'C'        // 67f7         #2
+    'B'        // 67f8         #1
+    'A'        // 67f9         #0
+    'C'        // 67fa         #2
+    'J'        // 67fb         #9
+    'C'        // 67fc         #2
+    'D'        // 67fd         #3
+    'aA'       // 67fe-67ff    #0
+    'B'        // 6800         #1
+    'aC'       // 6801-6802    #2
+    'aA'       // 6803-6804    #0
+    'F'        // 6805         #5
+    'fD'       // 6806-680c    #3
+    'B'        // 680d         #1
+    'aD'       // 680e-680f    #3
+    'A'        // 6810         #0
+    'D'        // 6811         #3
+    'I'        // 6812         #8
+    'A'        // 6813         #0
+    'C'        // 6814         #2
+    'D'        // 6815         #3
+    'aA'       // 6816-6817    #0
+    'C'        // 6818         #2
+    'F'        // 6819         #5
+    'bB'       // 681a-681c    #1
+    'aA'       // 681d-681e    #0
+    'C'        // 681f         #2
+    'B'        // 6820         #1
+    'aA'       // 6821-6822    #0
+    'aD'       // 6823-6824    #3
+    'aB'       // 6825-6826    #1
+    'F'        // 6827         #5
+    'aC'       // 6828-6829    #2
+    'A'        // 682a         #0
+    'C'        // 682b         #2
+    'F'        // 682c         #5
+    'C'        // 682d         #2
+    'I'        // 682e         #8
+    'A'        // 682f         #0
+    'F'        // 6830         #5
+    'aA'       // 6831-6832    #0
+    'C'        // 6833         #2
+    'A'        // 6834         #0
+    'bB'       // 6835-6837    #1
+    'aA'       // 6838-6839    #0
+    'B'        // 683a         #1
+    'bA'       // 683b-683d    #0
+    'C'        // 683e         #2
+    'F'        // 683f         #5
+    'dA'       // 6840-6844    #0
+    'C'        // 6845         #2
+    'A'        // 6846         #0
+    'B'        // 6847         #1
+    'aA'       // 6848-6849    #0
+    'C'        // 684a         #2
+    'B'        // 684b         #1
+    'aC'       // 684c-684d    #2
+    'A'        // 684e         #0
+    'B'        // 684f         #1
+    'aA'       // 6850-6851    #0
+    'F'        // 6852         #5
+    'aA'       // 6853-6854    #0
+    'C'        // 6855         #2
+    'B'        // 6856         #1
+    'bF'       // 6857-6859    #5
+    'D'        // 685a         #3
+    'aF'       // 685b-685c    #5
+    'C'        // 685d         #2
+    'D'        // 685e         #3
+    'F'        // 685f         #5
+    'bD'       // 6860-6862    #3
+    'F'        // 6863         #5
+    'D'        // 6864         #3
+    'B'        // 6865         #1
+    'D'        // 6866         #3
+    'F'        // 6867         #5
+    'bD'       // 6868-686a    #3
+    'C'        // 686b         #2
+    'D'        // 686c         #3
+    'I'        // 686d         #8
+    'C'        // 686e         #2
+    'A'        // 686f         #0
+    'F'        // 6870         #5
+    'aC'       // 6871-6872    #2
+    'D'        // 6873         #3
+    'A'        // 6874         #0
+    'C'        // 6875         #2
+    'aA'       // 6876-6877    #0
+    'B'        // 6878         #1
+    'C'        // 6879         #2
+    'F'        // 687a         #5
+    'aC'       // 687b-687c    #2
+    'B'        // 687d         #1
+    'aA'       // 687e-687f    #0
+    'B'        // 6880         #1
+    'A'        // 6881         #0
+    'C'        // 6882         #2
+    'A'        // 6883         #0
+    'C'        // 6884         #2
+    'aA'       // 6885-6886    #0
+    'B'        // 6887         #1
+    'C'        // 6888         #2
+    'cB'       // 6889-688c    #1
+    'aF'       // 688d-688e    #5
+    'A'        // 688f         #0
+    'C'        // 6890         #2
+    'aB'       // 6891-6892    #1
+    'aA'       // 6893-6894    #0
+    'D'        // 6895         #3
+    'C'        // 6896         #2
+    'A'        // 6897         #0
+    'C'        // 6898         #2
+    'aF'       // 6899-689a    #5
+    'A'        // 689b         #0
+    'C'        // 689c         #2
+    'A'        // 689d         #0
+    'D'        // 689e         #3
+    'dA'       // 689f-68a3    #0
+    'B'        // 68a4         #1
+    'F'        // 68a5         #5
+    'C'        // 68a6         #2
+    'aA'       // 68a7-68a8    #0
+    'bC'       // 68a9-68ab    #2
+    'B'        // 68ac         #1
+    'A'        // 68ad         #0
+    'C'        // 68ae         #2
+    'bA'       // 68af-68b1    #0
+    'C'        // 68b2         #2
+    'A'        // 68b3         #0
+    'C'        // 68b4         #2
+    'aA'       // 68b5-68b6    #0
+    'aD'       // 68b7-68b8    #3
+    'C'        // 68b9         #2
+    'bF'       // 68ba-68bc    #5
+    'B'        // 68bd         #1
+    'bD'       // 68be-68c0    #3
+    'B'        // 68c1         #1
+    'D'        // 68c2         #3
+    'C'        // 68c3         #2
+    'aA'       // 68c4-68c5    #0
+    'C'        // 68c6         #2
+    'B'        // 68c7         #1
+    'C'        // 68c8         #2
+    'dA'       // 68c9-68cd    #0
+    'B'        // 68ce         #1
+    'F'        // 68cf         #5
+    'A'        // 68d0         #0
+    'C'        // 68d1         #2
+    'A'        // 68d2         #0
+    'aC'       // 68d3-68d4    #2
+    'cA'       // 68d5-68d8    #0
+    'F'        // 68d9         #5
+    'A'        // 68da         #0
+    'D'        // 68db         #3
+    'aC'       // 68dc-68dd    #2
+    'B'        // 68de         #1
+    'aA'       // 68df-68e0    #0
+    'C'        // 68e1         #2
+    'D'        // 68e2         #3
+    'A'        // 68e3         #0
+    'C'        // 68e4         #2
+    'F'        // 68e5         #5
+    'B'        // 68e6         #1
+    'aA'       // 68e7-68e8    #0
+    'B'        // 68e9         #1
+    'aC'       // 68ea-68eb    #2
+    'A'        // 68ec         #0
+    'F'        // 68ed         #5
+    'A'        // 68ee         #0
+    'bC'       // 68ef-68f1    #2
+    'A'        // 68f2         #0
+    'aB'       // 68f3-68f4    #1
+    'bC'       // 68f5-68f7    #2
+    'B'        // 68f8         #1
+    'dA'       // 68f9-68fd    #0
+    'aD'       // 68fe-68ff    #3
+    'aA'       // 6900-6901    #0
+    'B'        // 6902         #1
+    'C'        // 6903         #2
+    'bA'       // 6904-6906    #0
+    'cC'       // 6907-690a    #2
+    'A'        // 690b         #0
+    'C'        // 690c         #2
+    'bA'       // 690d-690f    #0
+    'C'        // 6910         #2
+    'aA'       // 6911-6912    #0
+    'C'        // 6913         #2
+    'aB'       // 6914-6915    #1
+    'F'        // 6916         #5
+    'C'        // 6917         #2
+    'B'        // 6918         #1
+    'A'        // 6919         #0
+    'aC'       // 691a-691b    #2
+    'J'        // 691c         #9
+    'cD'       // 691d-6920    #3
+    'bF'       // 6921-6923    #5
+    'D'        // 6924         #3
+    'C'        // 6925         #2
+    'F'        // 6926         #5
+    'K'        // 6927         #10
+    'F'        // 6928         #5
+    'D'        // 6929         #3
+    'C'        // 692a         #2
+    'D'        // 692b         #3
+    'B'        // 692c         #1
+    'aD'       // 692d-692e    #3
+    'B'        // 692f         #1
+    'A'        // 6930         #0
+    'F'        // 6931         #5
+    'B'        // 6932         #1
+    'C'        // 6933         #2
+    'A'        // 6934         #0
+    'C'        // 6935         #2
+    'A'        // 6936         #0
+    'B'        // 6937         #1
+    'C'        // 6938         #2
+    'A'        // 6939         #0
+    'D'        // 693a         #3
+    'C'        // 693b         #2
+    'B'        // 693c         #1
+    'A'        // 693d         #0
+    'B'        // 693e         #1
+    'A'        // 693f         #0
+    'aB'       // 6940-6941    #1
+    'A'        // 6942         #0
+    'aB'       // 6943-6944    #1
+    'aC'       // 6945-6946    #2
+    'D'        // 6947         #3
+    'B'        // 6948         #1
+    'C'        // 6949         #2
+    'A'        // 694a         #0
+    'aB'       // 694b-694c    #1
+    'D'        // 694d         #3
+    'C'        // 694e         #2
+    'I'        // 694f         #8
+    'D'        // 6950         #3
+    'aB'       // 6951-6952    #1
+    'bA'       // 6953-6955    #0
+    'B'        // 6956         #1
+    'A'        // 6957         #0
+    'B'        // 6958         #1
+    'aA'       // 6959-695a    #0
+    'aC'       // 695b-695c    #2
+    'aA'       // 695d-695e    #0
+    'B'        // 695f         #1
+    'cA'       // 6960-6963    #0
+    'C'        // 6964         #2
+    'A'        // 6965         #0
+    'C'        // 6966         #2
+    'B'        // 6967         #1
+    'A'        // 6968         #0
+    'C'        // 6969         #2
+    'eA'       // 696a-696f    #0
+    'bC'       // 6970-6972    #2
+    'A'        // 6973         #0
+    'C'        // 6974         #2
+    'A'        // 6975         #0
+    'B'        // 6976         #1
+    'bA'       // 6977-6979    #0
+    'C'        // 697a         #2
+    'A'        // 697b         #0
+    'F'        // 697c         #5
+    'J'        // 697d         #9
+    'aF'       // 697e-697f    #5
+    'C'        // 6980         #2
+    'F'        // 6981         #5
+    'C'        // 6982         #2
+    'B'        // 6983         #1
+    'D'        // 6984         #3
+    'B'        // 6985         #1
+    'C'        // 6986         #2
+    'bD'       // 6987-6989    #3
+    'C'        // 698a         #2
+    'aD'       // 698b-698c    #3
+    'C'        // 698d         #2
+    'A'        // 698e         #0
+    'D'        // 698f         #3
+    'B'        // 6990         #1
+    'A'        // 6991         #0
+    'F'        // 6992         #5
+    'B'        // 6993         #1
+    'aA'       // 6994-6995    #0
+    'C'        // 6996         #2
+    'B'        // 6997         #1
+    'A'        // 6998         #0
+    'aB'       // 6999-699a    #1
+    'aA'       // 699b-699c    #0
+    'D'        // 699d         #3
+    'B'        // 699e         #1
+    'I'        // 699f         #8
+    'aC'       // 69a0-69a1    #2
+    'aB'       // 69a2-69a3    #1
+    'I'        // 69a4         #8
+    'bA'       // 69a5-69a7    #0
+    'C'        // 69a8         #2
+    'aB'       // 69a9-69aa    #1
+    'C'        // 69ab         #2
+    'B'        // 69ac         #1
+    'aA'       // 69ad-69ae    #0
+    'C'        // 69af         #2
+    'bA'       // 69b0-69b2    #0
+    'B'        // 69b3         #1
+    'A'        // 69b4         #0
+    'aB'       // 69b5-69b6    #1
+    'A'        // 69b7         #0
+    'F'        // 69b8         #5
+    'B'        // 69b9         #1
+    'J'        // 69ba         #9
+    'aA'       // 69bb-69bc    #0
+    'B'        // 69bd         #1
+    'cA'       // 69be-69c1    #0
+    'B'        // 69c2         #1
+    'A'        // 69c3         #0
+    'B'        // 69c4         #1
+    'F'        // 69c5         #5
+    'B'        // 69c6         #1
+    'J'        // 69c7         #9
+    'F'        // 69c8         #5
+    'B'        // 69c9         #1
+    'fA'       // 69ca-69d0    #0
+    'C'        // 69d1         #2
+    'D'        // 69d2         #3
+    'A'        // 69d3         #0
+    'aB'       // 69d4-69d5    #1
+    'A'        // 69d6         #0
+    'aF'       // 69d7-69d8    #5
+    'C'        // 69d9         #2
+    'bD'       // 69da-69dc    #3
+    'aF'       // 69dd-69de    #5
+    'aD'       // 69df-69e0    #3
+    'B'        // 69e1         #1
+    'A'        // 69e2         #0
+    'F'        // 69e3         #5
+    'B'        // 69e4         #1
+    'A'        // 69e5         #0
+    'I'        // 69e6         #8
+    'bA'       // 69e7-69e9    #0
+    'J'        // 69ea         #9
+    'C'        // 69eb         #2
+    'B'        // 69ec         #1
+    'A'        // 69ed         #0
+    'C'        // 69ee         #2
+    'F'        // 69ef         #5
+    'D'        // 69f0         #3
+    'C'        // 69f1         #2
+    'A'        // 69f2         #0
+    'aC'       // 69f3-69f4    #2
+    'F'        // 69f5         #5
+    'C'        // 69f6         #2
+    'aB'       // 69f7-69f8    #1
+    'A'        // 69f9         #0
+    'B'        // 69fa         #1
+    'A'        // 69fb         #0
+    'B'        // 69fc         #1
+    'A'        // 69fd         #0
+    'C'        // 69fe         #2
+    'aA'       // 69ff-6a00    #0
+    'C'        // 6a01         #2
+    'A'        // 6a02         #0
+    'C'        // 6a03         #2
+    'B'        // 6a04         #1
+    'A'        // 6a05         #0
+    'cB'       // 6a06-6a09    #1
+    'aA'       // 6a0a-6a0b    #0
+    'C'        // 6a0c         #2
+    'B'        // 6a0d         #1
+    'D'        // 6a0e         #3
+    'C'        // 6a0f         #2
+    'D'        // 6a10         #3
+    'A'        // 6a11         #0
+    'J'        // 6a12         #9
+    'aA'       // 6a13-6a14    #0
+    'C'        // 6a15         #2
+    'B'        // 6a16         #1
+    'A'        // 6a17         #0
+    'B'        // 6a18         #1
+    'A'        // 6a19         #0
+    'C'        // 6a1a         #2
+    'A'        // 6a1b         #0
+    'B'        // 6a1c         #1
+    'C'        // 6a1d         #2
+    'aA'       // 6a1e-6a1f    #0
+    'C'        // 6a20         #2
+    'A'        // 6a21         #0
+    'F'        // 6a22         #5
+    'A'        // 6a23         #0
+    'F'        // 6a24         #5
+    'bB'       // 6a25-6a27    #1
+    'C'        // 6a28         #2
+    'A'        // 6a29         #0
+    'F'        // 6a2a         #5
+    'A'        // 6a2b         #0
+    'aB'       // 6a2c-6a2d    #1
+    'F'        // 6a2e         #5
+    'D'        // 6a2f         #3
+    'F'        // 6a30         #5
+    'D'        // 6a31         #3
+    'bC'       // 6a32-6a34    #2
+    'A'        // 6a35         #0
+    'aF'       // 6a36-6a37    #5
+    'cA'       // 6a38-6a3b    #0
+    'B'        // 6a3c         #1
+    'A'        // 6a3d         #0
+    'aC'       // 6a3e-6a3f    #2
+    'aB'       // 6a40-6a41    #1
+    'D'        // 6a42         #3
+    'I'        // 6a43         #8
+    'aA'       // 6a44-6a45    #0
+    'C'        // 6a46         #2
+    'bA'       // 6a47-6a49    #0
+    'J'        // 6a4a         #9
+    'A'        // 6a4b         #0
+    'aI'       // 6a4c-6a4d    #8
+    'C'        // 6a4e         #2
+    'B'        // 6a4f         #1
+    'A'        // 6a50         #0
+    'C'        // 6a51         #2
+    'A'        // 6a52         #0
+    'I'        // 6a53         #8
+    'bC'       // 6a54-6a56    #2
+    'B'        // 6a57         #1
+    'aA'       // 6a58-6a59    #0
+    'I'        // 6a5a         #8
+    'C'        // 6a5b         #2
+    'D'        // 6a5c         #3
+    'aB'       // 6a5d-6a5e    #1
+    'A'        // 6a5f         #0
+    'B'        // 6a60         #1
+    'aA'       // 6a61-6a62    #0
+    'B'        // 6a63         #1
+    'A'        // 6a64         #0
+    'B'        // 6a65         #1
+    'A'        // 6a66         #0
+    'C'        // 6a67         #2
+    'aB'       // 6a68-6a69    #1
+    'C'        // 6a6a         #2
+    'A'        // 6a6b         #0
+    'D'        // 6a6c         #3
+    'B'        // 6a6d         #1
+    'D'        // 6a6e         #3
+    'B'        // 6a6f         #1
+    'D'        // 6a70         #3
+    'C'        // 6a71         #2
+    'J'        // 6a72         #9
+    'F'        // 6a73         #5
+    'B'        // 6a74         #1
+    'K'        // 6a75         #10
+    'B'        // 6a76         #1
+    'D'        // 6a77         #3
+    'F'        // 6a78         #5
+    'D'        // 6a79         #3
+    'C'        // 6a7a         #2
+    'bD'       // 6a7b-6a7d    #3
+    'C'        // 6a7e         #2
+    'aA'       // 6a7f-6a80    #0
+    'C'        // 6a81         #2
+    'B'        // 6a82         #1
+    'aA'       // 6a83-6a84    #0
+    'B'        // 6a85         #1
+    'F'        // 6a86         #5
+    'C'        // 6a87         #2
+    'D'        // 6a88         #3
+    'A'        // 6a89         #0
+    'B'        // 6a8a         #1
+    'F'        // 6a8b         #5
+    'B'        // 6a8c         #1
+    'aA'       // 6a8d-6a8e    #0
+    'B'        // 6a8f         #1
+    'A'        // 6a90         #0
+    'C'        // 6a91         #2
+    'aB'       // 6a92-6a93    #1
+    'A'        // 6a94         #0
+    'aB'       // 6a95-6a96    #1
+    'A'        // 6a97         #0
+    'D'        // 6a98         #3
+    'aB'       // 6a99-6a9a    #1
+    'C'        // 6a9b         #2
+    'aA'       // 6a9c-6a9d    #0
+    'C'        // 6a9e         #2
+    'aA'       // 6a9f-6aa0    #0
+    'C'        // 6aa1         #2
+    'aA'       // 6aa2-6aa3    #0
+    'B'        // 6aa4         #1
+    'C'        // 6aa5         #2
+    'bB'       // 6aa6-6aa8    #1
+    'D'        // 6aa9         #3
+    'F'        // 6aaa         #5
+    'aC'       // 6aab-6aac    #2
+    'B'        // 6aad         #1
+    'A'        // 6aae         #0
+    'C'        // 6aaf         #2
+    'F'        // 6ab0         #5
+    'C'        // 6ab1         #2
+    'B'        // 6ab2         #1
+    'A'        // 6ab3         #0
+    'C'        // 6ab4         #2
+    'B'        // 6ab5         #1
+    'I'        // 6ab6         #8
+    'B'        // 6ab7         #1
+    'C'        // 6ab8         #2
+    'aB'       // 6ab9-6aba    #1
+    'A'        // 6abb         #0
+    'K'        // 6abc         #10
+    'aC'       // 6abd-6abe    #2
+    'J'        // 6abf         #9
+    'D'        // 6ac0         #3
+    'F'        // 6ac1         #5
+    'aA'       // 6ac2-6ac3    #0
+    'D'        // 6ac4         #3
+    'B'        // 6ac5         #1
+    'C'        // 6ac6         #2
+    'B'        // 6ac7         #1
+    'aC'       // 6ac8-6ac9    #2
+    'aB'       // 6aca-6acb    #1
+    'C'        // 6acc         #2
+    'B'        // 6acd         #1
+    'D'        // 6ace         #3
+    'B'        // 6acf         #1
+    'aC'       // 6ad0-6ad1    #2
+    'D'        // 6ad2         #3
+    'A'        // 6ad3         #0
+    'C'        // 6ad4         #2
+    'aF'       // 6ad5-6ad6    #5
+    'D'        // 6ad7         #3
+    'aB'       // 6ad8-6ad9    #1
+    'eA'       // 6ada-6adf    #0
+    'aB'       // 6ae0-6ae1    #1
+    'F'        // 6ae2         #5
+    'D'        // 6ae3         #3
+    'F'        // 6ae4         #5
+    'B'        // 6ae5         #1
+    'D'        // 6ae6         #3
+    'C'        // 6ae7         #2
+    'A'        // 6ae8         #0
+    'D'        // 6ae9         #3
+    'A'        // 6aea         #0
+    'B'        // 6aeb         #1
+    'A'        // 6aec         #0
+    'D'        // 6aed         #3
+    'aB'       // 6aee-6aef    #1
+    'aC'       // 6af0-6af1    #2
+    'F'        // 6af2         #5
+    'C'        // 6af3         #2
+    'aD'       // 6af4-6af5    #3
+    'I'        // 6af6         #8
+    'D'        // 6af7         #3
+    'C'        // 6af8         #2
+    'B'        // 6af9         #1
+    'C'        // 6afa         #2
+    'aA'       // 6afb-6afc    #0
+    'F'        // 6afd         #5
+    'aD'       // 6afe-6aff    #3
+    'B'        // 6b00         #1
+    'D'        // 6b01         #3
+    'bA'       // 6b02-6b04    #0
+    'C'        // 6b05         #2
+    'aF'       // 6b06-6b07    #5
+    'B'        // 6b08         #1
+    'C'        // 6b09         #2
+    'A'        // 6b0a         #0
+    'C'        // 6b0b         #2
+    'K'        // 6b0c         #10
+    'aD'       // 6b0d-6b0e    #3
+    'aC'       // 6b0f-6b10    #2
+    'aA'       // 6b11-6b12    #0
+    'B'        // 6b13         #1
+    'aD'       // 6b14-6b15    #3
+    'A'        // 6b16         #0
+    'C'        // 6b17         #2
+    'bB'       // 6b18-6b1a    #1
+    'F'        // 6b1b         #5
+    'D'        // 6b1c         #3
+    'C'        // 6b1d         #2
+    'A'        // 6b1e         #0
+    'F'        // 6b1f         #5
+    'aA'       // 6b20-6b21    #0
+    'D'        // 6b22         #3
+    'A'        // 6b23         #0
+    'F'        // 6b24         #5
+    'B'        // 6b25         #1
+    'D'        // 6b26         #3
+    'F'        // 6b27         #5
+    'C'        // 6b28         #2
+    'aD'       // 6b29-6b2a    #3
+    'F'        // 6b2b         #5
+    'A'        // 6b2c         #0
+    'B'        // 6b2d         #1
+    'D'        // 6b2e         #3
+    'C'        // 6b2f         #2
+    'D'        // 6b30         #3
+    'B'        // 6b31         #1
+    'A'        // 6b32         #0
+    'aB'       // 6b33-6b34    #1
+    'aC'       // 6b35-6b36    #2
+    'dA'       // 6b37-6b3b    #0
+    'B'        // 6b3c         #1
+    'bA'       // 6b3d-6b3f    #0
+    'D'        // 6b40         #3
+    'aB'       // 6b41-6b42    #1
+    'A'        // 6b43         #0
+    'D'        // 6b44         #3
+    'B'        // 6b45         #1
+    'aA'       // 6b46-6b47    #0
+    'B'        // 6b48         #1
+    'aA'       // 6b49-6b4a    #0
+    'B'        // 6b4b         #1
+    'A'        // 6b4c         #0
+    'C'        // 6b4d         #2
+    'A'        // 6b4e         #0
+    'D'        // 6b4f         #3
+    'A'        // 6b50         #0
+    'B'        // 6b51         #1
+    'C'        // 6b52         #2
+    'F'        // 6b53         #5
+    'A'        // 6b54         #0
+    'B'        // 6b55         #1
+    'C'        // 6b56         #2
+    'B'        // 6b57         #1
+    'F'        // 6b58         #5
+    'A'        // 6b59         #0
+    'K'        // 6b5a         #10
+    'A'        // 6b5b         #0
+    'B'        // 6b5c         #1
+    'F'        // 6b5d         #5
+    'B'        // 6b5e         #1
+    'hA'       // 6b5f-6b67    #0
+    'D'        // 6b68         #3
+    'J'        // 6b69         #9
+    'A'        // 6b6a         #0
+    'aF'       // 6b6b-6b6c    #5
+    'B'        // 6b6d         #1
+    'F'        // 6b6e         #5
+    'A'        // 6b6f         #0
+    'F'        // 6b70         #5
+    'D'        // 6b71         #3
+    'A'        // 6b72         #0
+    'F'        // 6b73         #5
+    'C'        // 6b74         #2
+    'F'        // 6b75         #5
+    'B'        // 6b76         #1
+    'dA'       // 6b77-6b7b    #0
+    'D'        // 6b7c         #3
+    'F'        // 6b7d         #5
+    'C'        // 6b7e         #2
+    'aA'       // 6b7f-6b80    #0
+    'C'        // 6b81         #2
+    'bA'       // 6b82-6b84    #0
+    'F'        // 6b85         #5
+    'A'        // 6b86         #0
+    'D'        // 6b87         #3
+    'B'        // 6b88         #1
+    'aA'       // 6b89-6b8a    #0
+    'F'        // 6b8b         #5
+    'B'        // 6b8c         #1
+    'A'        // 6b8d         #0
+    'aB'       // 6b8e-6b8f    #1
+    'D'        // 6b90         #3
+    'I'        // 6b91         #8
+    'aD'       // 6b92-6b93    #3
+    'B'        // 6b94         #1
+    'C'        // 6b95         #2
+    'A'        // 6b96         #0
+    'C'        // 6b97         #2
+    'A'        // 6b98         #0
+    'B'        // 6b99         #1
+    'D'        // 6b9a         #3
+    'C'        // 6b9b         #2
+    'aD'       // 6b9c-6b9d    #3
+    'A'        // 6b9e         #0
+    'aC'       // 6b9f-6ba0    #2
+    'D'        // 6ba1         #3
+    'A'        // 6ba2         #0
+    'C'        // 6ba3         #2
+    'A'        // 6ba4         #0
+    'bB'       // 6ba5-6ba7    #1
+    'aF'       // 6ba8-6ba9    #5
+    'C'        // 6baa         #2
+    'A'        // 6bab         #0
+    'F'        // 6bac         #5
+    'bA'       // 6bad-6baf    #0
+    'C'        // 6bb0         #2
+    'F'        // 6bb1         #5
+    'aA'       // 6bb2-6bb3    #0
+    'F'        // 6bb4         #5
+    'A'        // 6bb5         #0
+    'B'        // 6bb6         #1
+    'A'        // 6bb7         #0
+    'aF'       // 6bb8-6bb9    #5
+    'A'        // 6bba         #0
+    'F'        // 6bbb         #5
+    'aA'       // 6bbc-6bbd    #0
+    'F'        // 6bbe         #5
+    'aA'       // 6bbf-6bc0    #0
+    'I'        // 6bc1         #8
+    'D'        // 6bc2         #3
+    'C'        // 6bc3         #2
+    'bA'       // 6bc4-6bc6    #0
+    'bC'       // 6bc7-6bc9    #2
+    'B'        // 6bca         #1
+    'A'        // 6bcb         #0
+    'C'        // 6bcc         #2
+    'A'        // 6bcd         #0
+    'F'        // 6bce         #5
+    'A'        // 6bcf         #0
+    'B'        // 6bd0         #1
+    'D'        // 6bd1         #3
+    'bA'       // 6bd2-6bd4    #0
+    'D'        // 6bd5         #3
+    'bA'       // 6bd6-6bd8    #0
+    'D'        // 6bd9         #3
+    'aA'       // 6bda-6bdb    #0
+    'B'        // 6bdc         #1
+    'D'        // 6bdd         #3
+    'B'        // 6bde         #1
+    'F'        // 6bdf         #5
+    'B'        // 6be0         #1
+    'C'        // 6be1         #2
+    'B'        // 6be2         #1
+    'C'        // 6be3         #2
+    'B'        // 6be4         #1
+    'D'        // 6be5         #3
+    'aC'       // 6be6-6be7    #2
+    'B'        // 6be8         #1
+    'D'        // 6be9         #3
+    'B'        // 6bea         #1
+    'aA'       // 6beb-6bec    #0
+    'D'        // 6bed         #3
+    'F'        // 6bee         #5
+    'A'        // 6bef         #0
+    'B'        // 6bf0         #1
+    'F'        // 6bf1         #5
+    'B'        // 6bf2         #1
+    'A'        // 6bf3         #0
+    'bD'       // 6bf4-6bf6    #3
+    'C'        // 6bf7         #2
+    'I'        // 6bf8         #8
+    'C'        // 6bf9         #2
+    'dB'       // 6bfa-6bfe    #1
+    'A'        // 6bff         #0
+    'aB'       // 6c00-6c01    #1
+    'C'        // 6c02         #2
+    'B'        // 6c03         #1
+    'C'        // 6c04         #2
+    'A'        // 6c05         #0
+    'B'        // 6c06         #1
+    'D'        // 6c07         #3
+    'A'        // 6c08         #0
+    'C'        // 6c09         #2
+    'F'        // 6c0a         #5
+    'aB'       // 6c0b-6c0c    #1
+    'C'        // 6c0d         #2
+    'F'        // 6c0e         #5
+    'bA'       // 6c0f-6c11    #0
+    'F'        // 6c12         #5
+    'aA'       // 6c13-6c14    #0
+    'aB'       // 6c15-6c16    #1
+    'J'        // 6c17         #9
+    'B'        // 6c18         #1
+    'C'        // 6c19         #2
+    'B'        // 6c1a         #1
+    'A'        // 6c1b         #0
+    'aB'       // 6c1c-6c1d    #1
+    'D'        // 6c1e         #3
+    'C'        // 6c1f         #2
+    'aB'       // 6c20-6c21    #1
+    'D'        // 6c22         #3
+    'aA'       // 6c23-6c24    #0
+    'B'        // 6c25         #1
+    'bC'       // 6c26-6c28    #2
+    'D'        // 6c29         #3
+    'aB'       // 6c2a-6c2b    #1
+    'C'        // 6c2c         #2
+    'D'        // 6c2d         #3
+    'C'        // 6c2e         #2
+    'cB'       // 6c2f-6c32    #1
+    'eA'       // 6c33-6c38    #0
+    'B'        // 6c39         #1
+    'aC'       // 6c3a-6c3b    #2
+    'D'        // 6c3c         #3
+    'B'        // 6c3d         #1
+    'dA'       // 6c3e-6c42    #0
+    'I'        // 6c43         #8
+    'aD'       // 6c44-6c45    #3
+    'B'        // 6c46         #1
+    'aD'       // 6c47-6c48    #3
+    'B'        // 6c49         #1
+    'C'        // 6c4a         #2
+    'A'        // 6c4b         #0
+    'B'        // 6c4c         #1
+    'C'        // 6c4d         #2
+    'bA'       // 6c4e-6c50    #0
+    'D'        // 6c51         #3
+    'A'        // 6c52         #0
+    'K'        // 6c53         #10
+    'aA'       // 6c54-6c55    #0
+    'D'        // 6c56         #3
+    'A'        // 6c57         #0
+    'B'        // 6c58         #1
+    'gA'       // 6c59-6c60    #0
+    'B'        // 6c61         #1
+    'F'        // 6c62         #5
+    'aD'       // 6c63-6c64    #3
+    'B'        // 6c65         #1
+    'I'        // 6c66         #8
+    'C'        // 6c67         #2
+    'A'        // 6c68         #0
+    'I'        // 6c69         #8
+    'A'        // 6c6a         #0
+    'C'        // 6c6b         #2
+    'D'        // 6c6c         #3
+    'A'        // 6c6d         #0
+    'B'        // 6c6e         #1
+    'C'        // 6c6f         #2
+    'A'        // 6c70         #0
+    'B'        // 6c71         #1
+    'A'        // 6c72         #0
+    'C'        // 6c73         #2
+    'A'        // 6c74         #0
+    'B'        // 6c75         #1
+    'A'        // 6c76         #0
+    'D'        // 6c77         #3
+    'aC'       // 6c78-6c79    #2
+    'A'        // 6c7a         #0
+    'C'        // 6c7b         #2
+    'D'        // 6c7c         #3
+    'aA'       // 6c7d-6c7e    #0
+    'aB'       // 6c7f-6c80    #1
+    'hA'       // 6c81-6c89    #0
+    'aB'       // 6c8a-6c8b    #1
+    'aA'       // 6c8c-6c8d    #0
+    'aB'       // 6c8e-6c8f    #1
+    'A'        // 6c90         #0
+    'D'        // 6c91         #3
+    'dA'       // 6c92-6c96    #0
+    'F'        // 6c97         #5
+    'cA'       // 6c98-6c9b    #0
+    'C'        // 6c9c         #2
+    'B'        // 6c9d         #1
+    'D'        // 6c9e         #3
+    'C'        // 6c9f         #2
+    'D'        // 6ca0         #3
+    'F'        // 6ca1         #5
+    'A'        // 6ca2         #0
+    'fD'       // 6ca3-6ca9    #3
+    'C'        // 6caa         #2
+    'aA'       // 6cab-6cac    #0
+    'C'        // 6cad         #2
+    'A'        // 6cae         #0
+    'B'        // 6caf         #1
+    'aA'       // 6cb0-6cb1    #0
+    'C'        // 6cb2         #2
+    'A'        // 6cb3         #0
+    'C'        // 6cb4         #2
+    'D'        // 6cb5         #3
+    'I'        // 6cb6         #8
+    'B'        // 6cb7         #1
+    'aA'       // 6cb8-6cb9    #0
+    'C'        // 6cba         #2
+    'dA'       // 6cbb-6cbf    #0
+    'B'        // 6cc0         #1
+    'aA'       // 6cc1-6cc2    #0
+    'B'        // 6cc3         #1
+    'bA'       // 6cc4-6cc6    #0
+    'B'        // 6cc7         #1
+    'D'        // 6cc8         #3
+    'aA'       // 6cc9-6cca    #0
+    'B'        // 6ccb         #1
+    'A'        // 6ccc         #0
+    'C'        // 6ccd         #2
+    'B'        // 6cce         #1
+    'C'        // 6ccf         #2
+    'aA'       // 6cd0-6cd1    #0
+    'C'        // 6cd2         #2
+    'bA'       // 6cd3-6cd5    #0
+    'C'        // 6cd6         #2
+    'A'        // 6cd7         #0
+    'D'        // 6cd8         #3
+    'dA'       // 6cd9-6cdd    #0
+    'aB'       // 6cde-6cdf    #1
+    'cA'       // 6ce0-6ce3    #0
+    'D'        // 6ce4         #3
+    'A'        // 6ce5         #0
+    'D'        // 6ce6         #3
+    'C'        // 6ce7         #2
+    'A'        // 6ce8         #0
+    'aC'       // 6ce9-6cea    #2
+    'A'        // 6ceb         #0
+    'aC'       // 6cec-6ced    #2
+    'cA'       // 6cee-6cf1    #0
+    'C'        // 6cf2         #2
+    'A'        // 6cf3         #0
+    'F'        // 6cf4         #5
+    'B'        // 6cf5         #1
+    'bD'       // 6cf6-6cf8    #3
+    'B'        // 6cf9         #1
+    'D'        // 6cfa         #3
+    'F'        // 6cfb         #5
+    'bD'       // 6cfc-6cfe    #3
+    'I'        // 6cff         #8
+    'aC'       // 6d00-6d01    #2
+    'aB'       // 6d02-6d03    #1
+    'A'        // 6d04         #0
+    'aB'       // 6d05-6d06    #1
+    'A'        // 6d07         #0
+    'aB'       // 6d08-6d09    #1
+    'bA'       // 6d0a-6d0c    #0
+    'B'        // 6d0d         #1
+    'aC'       // 6d0e-6d0f    #2
+    'B'        // 6d10         #1
+    'aA'       // 6d11-6d12    #0
+    'F'        // 6d13         #5
+    'K'        // 6d14         #10
+    'D'        // 6d15         #3
+    'B'        // 6d16         #1
+    'A'        // 6d17         #0
+    'B'        // 6d18         #1
+    'A'        // 6d19         #0
+    'C'        // 6d1a         #2
+    'A'        // 6d1b         #0
+    'D'        // 6d1c         #3
+    'B'        // 6d1d         #1
+    'aA'       // 6d1e-6d1f    #0
+    'B'        // 6d20         #1
+    'D'        // 6d21         #3
+    'B'        // 6d22         #1
+    'K'        // 6d23         #10
+    'C'        // 6d24         #2
+    'A'        // 6d25         #0
+    'C'        // 6d26         #2
+    'dA'       // 6d27-6d2b    #0
+    'I'        // 6d2c         #8
+    'B'        // 6d2d         #1
+    'A'        // 6d2e         #0
+    'C'        // 6d2f         #2
+    'B'        // 6d30         #1
+    'C'        // 6d31         #2
+    'A'        // 6d32         #0
+    'aC'       // 6d33-6d34    #2
+    'aA'       // 6d35-6d36    #0
+    'B'        // 6d37         #1
+    'aA'       // 6d38-6d39    #0
+    'I'        // 6d3a         #8
+    'cA'       // 6d3b-6d3e    #0
+    'C'        // 6d3f         #2
+    'B'        // 6d40         #1
+    'A'        // 6d41         #0
+    'B'        // 6d42         #1
+    'D'        // 6d43         #3
+    'aF'       // 6d44-6d45    #5
+    'gD'       // 6d46-6d4d    #3
+    'B'        // 6d4e         #1
+    'gD'       // 6d4f-6d56    #3
+    'aC'       // 6d57-6d58    #2
+    'aA'       // 6d59-6d5a    #0
+    'C'        // 6d5b         #2
+    'A'        // 6d5c         #0
+    'D'        // 6d5d         #3
+    'bC'       // 6d5e-6d60    #2
+    'A'        // 6d61         #0
+    'B'        // 6d62         #1
+    'dA'       // 6d63-6d67    #0
+    'B'        // 6d68         #1
+    'aA'       // 6d69-6d6a    #0
+    'D'        // 6d6b         #3
+    'A'        // 6d6c         #0
+    'B'        // 6d6d         #1
+    'aA'       // 6d6e-6d6f    #0
+    'C'        // 6d70         #2
+    'B'        // 6d71         #1
+    'I'        // 6d72         #8
+    'D'        // 6d73         #3
+    'A'        // 6d74         #0
+    'aB'       // 6d75-6d76    #1
+    'bA'       // 6d77-6d79    #0
+    'aB'       // 6d7a-6d7b    #1
+    'C'        // 6d7c         #2
+    'aB'       // 6d7d-6d7e    #1
+    'I'        // 6d7f         #8
+    'aC'       // 6d80-6d81    #2
+    'A'        // 6d82         #0
+    'aB'       // 6d83-6d84    #1
+    'A'        // 6d85         #0
+    'B'        // 6d86         #1
+    'bA'       // 6d87-6d89    #0
+    'C'        // 6d8a         #2
+    'B'        // 6d8b         #1
+    'bA'       // 6d8c-6d8e    #0
+    'I'        // 6d8f         #8
+    'B'        // 6d90         #1
+    'A'        // 6d91         #0
+    'C'        // 6d92         #2
+    'dA'       // 6d93-6d97    #0
+    'C'        // 6d98         #2
+    'F'        // 6d99         #5
+    'B'        // 6d9a         #1
+    'aF'       // 6d9b-6d9c    #5
+    'fD'       // 6d9d-6da3    #3
+    'aB'       // 6da4-6da5    #1
+    'cD'       // 6da6-6da9    #3
+    'bA'       // 6daa-6dac    #0
+    'D'        // 6dad         #3
+    'C'        // 6dae         #2
+    'A'        // 6daf         #0
+    'D'        // 6db0         #3
+    'B'        // 6db1         #1
+    'A'        // 6db2         #0
+    'B'        // 6db3         #1
+    'aA'       // 6db4-6db5    #0
+    'D'        // 6db6         #3
+    'aA'       // 6db7-6db8    #0
+    'C'        // 6db9         #2
+    'aB'       // 6dba-6dbb    #1
+    'A'        // 6dbc         #0
+    'C'        // 6dbd         #2
+    'B'        // 6dbe         #1
+    'aA'       // 6dbf-6dc0    #0
+    'D'        // 6dc1         #3
+    'C'        // 6dc2         #2
+    'K'        // 6dc3         #10
+    'dA'       // 6dc4-6dc8    #0
+    'B'        // 6dc9         #1
+    'C'        // 6dca         #2
+    'aA'       // 6dcb-6dcc    #0
+    'B'        // 6dcd         #1
+    'F'        // 6dce         #5
+    'cA'       // 6dcf-6dd2    #0
+    'aB'       // 6dd3-6dd4    #1
+    'C'        // 6dd5         #2
+    'A'        // 6dd6         #0
+    'B'        // 6dd7         #1
+    'bA'       // 6dd8-6dda    #0
+    'C'        // 6ddb         #2
+    'B'        // 6ddc         #1
+    'aA'       // 6ddd-6dde    #0
+    'C'        // 6ddf         #2
+    'bA'       // 6de0-6de2    #0
+    'I'        // 6de3         #8
+    'bA'       // 6de4-6de6    #0
+    'D'        // 6de7         #3
+    'A'        // 6de8         #0
+    'C'        // 6de9         #2
+    'bA'       // 6dea-6dec    #0
+    'B'        // 6ded         #1
+    'A'        // 6dee         #0
+    'aC'       // 6def-6df0    #2
+    'A'        // 6df1         #0
+    'C'        // 6df2         #2
+    'A'        // 6df3         #0
+    'C'        // 6df4         #2
+    'bA'       // 6df5-6df7    #0
+    'J'        // 6df8         #9
+    'cA'       // 6df9-6dfc    #0
+    'aB'       // 6dfd-6dfe    #1
+    'D'        // 6dff         #3
+    'C'        // 6e00         #2
+    'D'        // 6e01         #3
+    'aB'       // 6e02-6e03    #1
+    'C'        // 6e04         #2
+    'A'        // 6e05         #0
+    'D'        // 6e06         #3
+    'F'        // 6e07         #5
+    'J'        // 6e08         #9
+    'F'        // 6e09         #5
+    'A'        // 6e0a         #0
+    'F'        // 6e0b         #5
+    'bD'       // 6e0c-6e0e    #3
+    'B'        // 6e0f         #1
+    'bD'       // 6e10-6e12    #3
+    'F'        // 6e13         #5
+    'D'        // 6e14         #3
+    'C'        // 6e15         #2
+    'D'        // 6e16         #3
+    'J'        // 6e17         #9
+    'B'        // 6e18         #1
+    'bA'       // 6e19-6e1b    #0
+    'B'        // 6e1c         #1
+    'A'        // 6e1d         #0
+    'F'        // 6e1e         #5
+    'gA'       // 6e1f-6e26    #0
+    'C'        // 6e27         #2
+    'I'        // 6e28         #8
+    'C'        // 6e29         #2
+    'B'        // 6e2a         #1
+    'bA'       // 6e2b-6e2d    #0
+    'C'        // 6e2e         #2
+    'A'        // 6e2f         #0
+    'aB'       // 6e30-6e31    #1
+    'A'        // 6e32         #0
+    'B'        // 6e33         #1
+    'A'        // 6e34         #0
+    'B'        // 6e35         #1
+    'A'        // 6e36         #0
+    'K'        // 6e37         #10
+    'A'        // 6e38         #0
+    'C'        // 6e39         #2
+    'A'        // 6e3a         #0
+    'C'        // 6e3b         #2
+    'A'        // 6e3c         #0
+    'I'        // 6e3d         #8
+    'A'        // 6e3e         #0
+    'B'        // 6e3f         #1
+    'I'        // 6e40         #8
+    'B'        // 6e41         #1
+    'F'        // 6e42         #5
+    'bA'       // 6e43-6e45    #0
+    'aB'       // 6e46-6e47    #1
+    'F'        // 6e48         #5
+    'C'        // 6e49         #2
+    'A'        // 6e4a         #0
+    'C'        // 6e4b         #2
+    'F'        // 6e4c         #5
+    'aA'       // 6e4d-6e4e    #0
+    'C'        // 6e4f         #2
+    'B'        // 6e50         #1
+    'A'        // 6e51         #0
+    'C'        // 6e52         #2
+    'aA'       // 6e53-6e54    #0
+    'I'        // 6e55         #8
+    'A'        // 6e56         #0
+    'C'        // 6e57         #2
+    'A'        // 6e58         #0
+    'aB'       // 6e59-6e5a    #1
+    'aA'       // 6e5b-6e5c    #0
+    'C'        // 6e5d         #2
+    'aA'       // 6e5e-6e5f    #0
+    'aB'       // 6e60-6e61    #1
+    'C'        // 6e62         #2
+    'A'        // 6e63         #0
+    'bB'       // 6e64-6e66    #1
+    'A'        // 6e67         #0
+    'C'        // 6e68         #2
+    'B'        // 6e69         #1
+    'D'        // 6e6a         #3
+    'A'        // 6e6b         #0
+    'aD'       // 6e6c-6e6d    #3
+    'aA'       // 6e6e-6e6f    #0
+    'D'        // 6e70         #3
+    'B'        // 6e71         #1
+    'aA'       // 6e72-6e73    #0
+    'B'        // 6e74         #1
+    'K'        // 6e75         #10
+    'C'        // 6e76         #2
+    'bB'       // 6e77-6e79    #1
+    'K'        // 6e7a         #10
+    'F'        // 6e7b         #5
+    'B'        // 6e7c         #1
+    'cF'       // 6e7d-6e80    #5
+    'D'        // 6e81         #3
+    'F'        // 6e82         #5
+    'bD'       // 6e83-6e85    #3
+    'B'        // 6e86         #1
+    'D'        // 6e87         #3
+    'B'        // 6e88         #1
+    'C'        // 6e89         #2
+    'D'        // 6e8a         #3
+    'B'        // 6e8b         #1
+    'F'        // 6e8c         #5
+    'C'        // 6e8d         #2
+    'B'        // 6e8e         #1
+    'aA'       // 6e8f-6e90    #0
+    'D'        // 6e91         #3
+    'B'        // 6e92         #1
+    'C'        // 6e93         #2
+    'B'        // 6e94         #1
+    'K'        // 6e95         #10
+    'A'        // 6e96         #0
+    'B'        // 6e97         #1
+    'A'        // 6e98         #0
+    'C'        // 6e99         #2
+    'aB'       // 6e9a-6e9b    #1
+    'aA'       // 6e9c-6e9d    #0
+    'B'        // 6e9e         #1
+    'A'        // 6e9f         #0
+    'C'        // 6ea0         #2
+    'B'        // 6ea1         #1
+    'A'        // 6ea2         #0
+    'aB'       // 6ea3-6ea4    #1
+    'A'        // 6ea5         #0
+    'B'        // 6ea6         #1
+    'A'        // 6ea7         #0
+    'K'        // 6ea8         #10
+    'D'        // 6ea9         #3
+    'aA'       // 6eaa-6eab    #0
+    'D'        // 6eac         #3
+    'F'        // 6ead         #5
+    'C'        // 6eae         #2
+    'A'        // 6eaf         #0
+    'B'        // 6eb0         #1
+    'aA'       // 6eb1-6eb2    #0
+    'aC'       // 6eb3-6eb4    #2
+    'I'        // 6eb5         #8
+    'aA'       // 6eb6-6eb7    #0
+    'aB'       // 6eb8-6eb9    #1
+    'A'        // 6eba         #0
+    'aC'       // 6ebb-6ebc    #2
+    'A'        // 6ebd         #0
+    'B'        // 6ebe         #1
+    'bC'       // 6ebf-6ec1    #2
+    'cA'       // 6ec2-6ec5    #0
+    'B'        // 6ec6         #1
+    'C'        // 6ec7         #2
+    'aA'       // 6ec8-6ec9    #0
+    'C'        // 6eca         #2
+    'aA'       // 6ecb-6ecc    #0
+    'C'        // 6ecd         #2
+    'A'        // 6ece         #0
+    'C'        // 6ecf         #2
+    'B'        // 6ed0         #1
+    'A'        // 6ed1         #0
+    'B'        // 6ed2         #1
+    'bA'       // 6ed3-6ed5    #0
+    'B'        // 6ed6         #1
+    'D'        // 6ed7         #3
+    'B'        // 6ed8         #1
+    'A'        // 6ed9         #0
+    'aC'       // 6eda-6edb    #2
+    'B'        // 6edc         #1
+    'C'        // 6edd         #2
+    'F'        // 6ede         #5
+    'bD'       // 6edf-6ee1    #3
+    'B'        // 6ee2         #1
+    'bD'       // 6ee3-6ee5    #3
+    'F'        // 6ee6         #5
+    'D'        // 6ee7         #3
+    'aB'       // 6ee8-6ee9    #1
+    'D'        // 6eea         #3
+    'C'        // 6eeb         #2
+    'aA'       // 6eec-6eed    #0
+    'C'        // 6eee         #2
+    'A'        // 6eef         #0
+    'D'        // 6ef0         #3
+    'B'        // 6ef1         #1
+    'A'        // 6ef2         #0
+    'D'        // 6ef3         #3
+    'A'        // 6ef4         #0
+    'I'        // 6ef5         #8
+    'B'        // 6ef6         #1
+    'aA'       // 6ef7-6ef8    #0
+    'C'        // 6ef9         #2
+    'B'        // 6efa         #1
+    'C'        // 6efb         #2
+    'I'        // 6efc         #8
+    'C'        // 6efd         #2
+    'aA'       // 6efe-6eff    #0
+    'B'        // 6f00         #1
+    'aA'       // 6f01-6f02    #0
+    'B'        // 6f03         #1
+    'A'        // 6f04         #0
+    'B'        // 6f05         #1
+    'A'        // 6f06         #0
+    'B'        // 6f07         #1
+    'C'        // 6f08         #2
+    'A'        // 6f09         #0
+    'C'        // 6f0a         #2
+    'B'        // 6f0b         #1
+    'A'        // 6f0c         #0
+    'C'        // 6f0d         #2
+    'B'        // 6f0e         #1
+    'A'        // 6f0f         #0
+    'F'        // 6f10         #5
+    'J'        // 6f11         #9
+    'B'        // 6f12         #1
+    'bA'       // 6f13-6f15    #0
+    'C'        // 6f16         #2
+    'B'        // 6f17         #1
+    'C'        // 6f18         #2
+    'I'        // 6f19         #8
+    'A'        // 6f1a         #0
+    'F'        // 6f1b         #5
+    'B'        // 6f1c         #1
+    'D'        // 6f1d         #3
+    'aB'       // 6f1e-6f1f    #1
+    'A'        // 6f20         #0
+    'B'        // 6f21         #1
+    'aA'       // 6f22-6f23    #0
+    'I'        // 6f24         #8
+    'C'        // 6f25         #2
+    'A'        // 6f26         #0
+    'I'        // 6f27         #8
+    'K'        // 6f28         #10
+    'C'        // 6f29         #2
+    'cA'       // 6f2a-6f2d    #0
+    'B'        // 6f2e         #1
+    'C'        // 6f2f         #2
+    'cA'       // 6f30-6f33    #0
+    'B'        // 6f34         #1
+    'aC'       // 6f35-6f36    #2
+    'B'        // 6f37         #1
+    'A'        // 6f38         #0
+    'aB'       // 6f39-6f3a    #1
+    'C'        // 6f3b         #2
+    'A'        // 6f3c         #0
+    'B'        // 6f3d         #1
+    'aA'       // 6f3e-6f3f    #0
+    'B'        // 6f40         #1
+    'A'        // 6f41         #0
+    'D'        // 6f42         #3
+    'aB'       // 6f43-6f44    #1
+    'F'        // 6f45         #5
+    'gD'       // 6f46-6f4d    #3
+    'B'        // 6f4e         #1
+    'A'        // 6f4f         #0
+    'B'        // 6f50         #1
+    'aA'       // 6f51-6f52    #0
+    'C'        // 6f53         #2
+    'A'        // 6f54         #0
+    'aB'       // 6f55-6f56    #1
+    'aA'       // 6f57-6f58    #0
+    'J'        // 6f59         #9
+    'eA'       // 6f5a-6f5f    #0
+    'C'        // 6f60         #2
+    'aA'       // 6f61-6f62    #0
+    'I'        // 6f63         #8
+    'A'        // 6f64         #0
+    'D'        // 6f65         #3
+    'A'        // 6f66         #0
+    'B'        // 6f67         #1
+    'F'        // 6f68         #5
+    'bB'       // 6f69-6f6b    #1
+    'C'        // 6f6c         #2
+    'cA'       // 6f6d-6f70    #0
+    'K'        // 6f71         #10
+    'aB'       // 6f72-6f73    #1
+    'A'        // 6f74         #0
+    'D'        // 6f75         #3
+    'aB'       // 6f76-6f77    #1
+    'A'        // 6f78         #0
+    'B'        // 6f79         #1
+    'A'        // 6f7a         #0
+    'B'        // 6f7b         #1
+    'bA'       // 6f7c-6f7e    #0
+    'B'        // 6f7f         #1
+    'C'        // 6f80         #2
+    'aA'       // 6f81-6f82    #0
+    'F'        // 6f83         #5
+    'A'        // 6f84         #0
+    'B'        // 6f85         #1
+    'bA'       // 6f86-6f88    #0
+    'I'        // 6f89         #8
+    'B'        // 6f8a         #1
+    'cA'       // 6f8b-6f8e    #0
+    'D'        // 6f8f         #3
+    'A'        // 6f90         #0
+    'F'        // 6f91         #5
+    'A'        // 6f92         #0
+    'C'        // 6f93         #2
+    'A'        // 6f94         #0
+    'I'        // 6f95         #8
+    'aA'       // 6f96-6f97    #0
+    'J'        // 6f98         #9
+    'D'        // 6f99         #3
+    'F'        // 6f9a         #5
+    'aD'       // 6f9b-6f9c    #3
+    'C'        // 6f9d         #2
+    'B'        // 6f9e         #1
+    'A'        // 6f9f         #0
+    'C'        // 6fa0         #2
+    'A'        // 6fa1         #0
+    'B'        // 6fa2         #1
+    'bA'       // 6fa3-6fa5    #0
+    'C'        // 6fa6         #2
+    'aA'       // 6fa7-6fa8    #0
+    'B'        // 6fa9         #1
+    'A'        // 6faa         #0
+    'bB'       // 6fab-6fad    #1
+    'aA'       // 6fae-6faf    #0
+    'C'        // 6fb0         #2
+    'A'        // 6fb1         #0
+    'B'        // 6fb2         #1
+    'A'        // 6fb3         #0
+    'B'        // 6fb4         #1
+    'C'        // 6fb5         #2
+    'A'        // 6fb6         #0
+    'F'        // 6fb7         #5
+    'B'        // 6fb8         #1
+    'A'        // 6fb9         #0
+    'aB'       // 6fba-6fbb    #1
+    'C'        // 6fbc         #2
+    'B'        // 6fbd         #1
+    'A'        // 6fbe         #0
+    'B'        // 6fbf         #1
+    'cA'       // 6fc0-6fc3    #0
+    'B'        // 6fc4         #1
+    'F'        // 6fc5         #5
+    'aA'       // 6fc6-6fc7    #0
+    'C'        // 6fc8         #2
+    'aA'       // 6fc9-6fca    #0
+    'dB'       // 6fcb-6fcf    #1
+    'bD'       // 6fd0-6fd2    #3
+    'B'        // 6fd3         #1
+    'aA'       // 6fd4-6fd5    #0
+    'aD'       // 6fd6-6fd7    #3
+    'A'        // 6fd8         #0
+    'B'        // 6fd9         #1
+    'aA'       // 6fda-6fdb    #0
+    'aB'       // 6fdc-6fdd    #1
+    'cA'       // 6fde-6fe1    #0
+    'aB'       // 6fe2-6fe3    #1
+    'A'        // 6fe4         #0
+    'K'        // 6fe5         #10
+    'I'        // 6fe6         #8
+    'B'        // 6fe7         #1
+    'C'        // 6fe8         #2
+    'A'        // 6fe9         #0
+    'D'        // 6fea         #3
+    'aA'       // 6feb-6fec    #0
+    'B'        // 6fed         #1
+    'aA'       // 6fee-6fef    #0
+    'C'        // 6ff0         #2
+    'A'        // 6ff1         #0
+    'B'        // 6ff2         #1
+    'J'        // 6ff3         #9
+    'I'        // 6ff4         #8
+    'F'        // 6ff5         #5
+    'A'        // 6ff6         #0
+    'aB'       // 6ff7-6ff8    #1
+    'F'        // 6ff9         #5
+    'A'        // 6ffa         #0
+    'B'        // 6ffb         #1
+    'C'        // 6ffc         #2
+    'F'        // 6ffd         #5
+    'A'        // 6ffe         #0
+    'B'        // 6fff         #1
+    'C'        // 7000         #2
+    'A'        // 7001         #0
+    'D'        // 7002         #3
+    'aB'       // 7003-7004    #1
+    'bA'       // 7005-7007    #0
+    'D'        // 7008         #3
+    'A'        // 7009         #0
+    'C'        // 700a         #2
+    'A'        // 700b         #0
+    'B'        // 700c         #1
+    'C'        // 700d         #2
+    'B'        // 700e         #1
+    'A'        // 700f         #0
+    'D'        // 7010         #3
+    'A'        // 7011         #0
+    'aK'       // 7012-7013    #10
+    'B'        // 7014         #1
+    'A'        // 7015         #0
+    'B'        // 7016         #1
+    'C'        // 7017         #2
+    'A'        // 7018         #0
+    'B'        // 7019         #1
+    'aA'       // 701a-701b    #0
+    'I'        // 701c         #8
+    'bA'       // 701d-701f    #0
+    'C'        // 7020         #2
+    'aB'       // 7021-7022    #1
+    'A'        // 7023         #0
+    'B'        // 7024         #1
+    'D'        // 7025         #3
+    'bA'       // 7026-7028    #0
+    'bB'       // 7029-702b    #1
+    'C'        // 702c         #2
+    'aD'       // 702d-702e    #3
+    'aA'       // 702f-7030    #0
+    'B'        // 7031         #1
+    'A'        // 7032         #0
+    'B'        // 7033         #1
+    'C'        // 7034         #2
+    'B'        // 7035         #1
+    'D'        // 7036         #3
+    'A'        // 7037         #0
+    'I'        // 7038         #8
+    'aC'       // 7039-703a    #2
+    'B'        // 703b         #1
+    'A'        // 703c         #0
+    'D'        // 703d         #3
+    'A'        // 703e         #0
+    'cB'       // 703f-7042    #1
+    'C'        // 7043         #2
+    'A'        // 7044         #0
+    'B'        // 7045         #1
+    'I'        // 7046         #8
+    'F'        // 7047         #5
+    'cC'       // 7048-704b    #2
+    'A'        // 704c         #0
+    'B'        // 704d         #1
+    'J'        // 704e         #9
+    'D'        // 704f         #3
+    'I'        // 7050         #8
+    'A'        // 7051         #0
+    'B'        // 7052         #1
+    'K'        // 7053         #10
+    'aC'       // 7054-7055    #2
+    'aB'       // 7056-7057    #1
+    'A'        // 7058         #0
+    'D'        // 7059         #3
+    'bB'       // 705a-705c    #1
+    'aA'       // 705d-705e    #0
+    'cB'       // 705f-7062    #1
+    'A'        // 7063         #0
+    'aC'       // 7064-7065    #2
+    'I'        // 7066         #8
+    'aB'       // 7067-7068    #1
+    'A'        // 7069         #0
+    'B'        // 706a         #1
+    'aA'       // 706b-706c    #0
+    'D'        // 706d         #3
+    'C'        // 706e         #2
+    'aA'       // 706f-7070    #0
+    'B'        // 7071         #1
+    'aD'       // 7072-7073    #3
+    'B'        // 7074         #1
+    'aC'       // 7075-7076    #2
+    'B'        // 7077         #1
+    'A'        // 7078         #0
+    'aB'       // 7079-707a    #1
+    'D'        // 707b         #3
+    'bA'       // 707c-707e    #0
+    'B'        // 707f         #1
+    'D'        // 7080         #3
+    'A'        // 7081         #0
+    'bB'       // 7082-7084    #1
+    'aA'       // 7085-7086    #0
+    'aD'       // 7087-7088    #3
+    'C'        // 7089         #2
+    'A'        // 708a         #0
+    'B'        // 708b         #1
+    'aD'       // 708c-708d    #3
+    'A'        // 708e         #0
+    'B'        // 708f         #1
+    'D'        // 7090         #3
+    'B'        // 7091         #1
+    'A'        // 7092         #0
+    'B'        // 7093         #1
+    'C'        // 7094         #2
+    'A'        // 7095         #0
+    'C'        // 7096         #2
+    'F'        // 7097         #5
+    'aA'       // 7098-7099    #0
+    'I'        // 709a         #8
+    'J'        // 709b         #9
+    'bD'       // 709c-709e    #3
+    'C'        // 709f         #2
+    'B'        // 70a0         #1
+    'I'        // 70a1         #8
+    'D'        // 70a2         #3
+    'B'        // 70a3         #1
+    'A'        // 70a4         #0
+    'B'        // 70a5         #1
+    'I'        // 70a6         #8
+    'B'        // 70a7         #1
+    'D'        // 70a8         #3
+    'B'        // 70a9         #1
+    'D'        // 70aa         #3
+    'eA'       // 70ab-70b0    #0
+    'C'        // 70b1         #2
+    'D'        // 70b2         #3
+    'A'        // 70b3         #0
+    'C'        // 70b4         #2
+    'B'        // 70b5         #1
+    'D'        // 70b6         #3
+    'cA'       // 70b7-70ba    #0
+    'C'        // 70bb         #2
+    'bB'       // 70bc-70be    #1
+    'D'        // 70bf         #3
+    'B'        // 70c0         #1
+    'bD'       // 70c1-70c3    #3
+    'cB'       // 70c4-70c7    #1
+    'A'        // 70c8         #0
+    'D'        // 70c9         #3
+    'aA'       // 70ca-70cb    #0
+    'bB'       // 70cc-70ce    #1
+    'A'        // 70cf         #0
+    'B'        // 70d0         #1
+    'C'        // 70d1         #2
+    'B'        // 70d2         #1
+    'aA'       // 70d3-70d4    #0
+    'aC'       // 70d5-70d6    #2
+    'B'        // 70d7         #1
+    'aA'       // 70d8-70d9    #0
+    'B'        // 70da         #1
+    'D'        // 70db         #3
+    'aA'       // 70dc-70dd    #0
+    'B'        // 70de         #1
+    'A'        // 70df         #0
+    'bB'       // 70e0-70e2    #1
+    'D'        // 70e3         #3
+    'C'        // 70e4         #2
+    'fD'       // 70e5-70eb    #3
+    'F'        // 70ec         #5
+    'aD'       // 70ed-70ee    #3
+    'I'        // 70ef         #8
+    'B'        // 70f0         #1
+    'A'        // 70f1         #0
+    'D'        // 70f2         #3
+    'eB'       // 70f3-70f8    #1
+    'aA'       // 70f9-70fa    #0
+    'aB'       // 70fb-70fc    #1
+    'A'        // 70fd         #0
+    'bB'       // 70fe-7100    #1
+    'D'        // 7101         #3
+    'B'        // 7102         #1
+    'J'        // 7103         #9
+    'A'        // 7104         #0
+    'C'        // 7105         #2
+    'A'        // 7106         #0
+    'aF'       // 7107-7108    #5
+    'A'        // 7109         #0
+    'B'        // 710a         #1
+    'C'        // 710b         #2
+    'A'        // 710c         #0
+    'aB'       // 710d-710e    #1
+    'F'        // 710f         #5
+    'B'        // 7110         #1
+    'aD'       // 7111-7112    #3
+    'B'        // 7113         #1
+    'F'        // 7114         #5
+    'aD'       // 7115-7116    #3
+    'B'        // 7117         #1
+    'D'        // 7118         #3
+    'aA'       // 7119-711a    #0
+    'B'        // 711b         #1
+    'A'        // 711c         #0
+    'B'        // 711d         #1
+    'A'        // 711e         #0
+    'B'        // 711f         #1
+    'aA'       // 7120-7121    #0
+    'aB'       // 7122-7123    #1
+    'D'        // 7124         #3
+    'B'        // 7125         #1
+    'A'        // 7126         #0
+    'D'        // 7127         #3
+    'aB'       // 7128-7129    #1
+    'D'        // 712a         #3
+    'C'        // 712b         #2
+    'B'        // 712c         #1
+    'J'        // 712d         #9
+    'cA'       // 712e-7131    #0
+    'cB'       // 7132-7135    #1
+    'A'        // 7136         #0
+    'D'        // 7137         #3
+    'F'        // 7138         #5
+    'D'        // 7139         #3
+    'aB'       // 713a-713b    #1
+    'F'        // 713c         #5
+    'D'        // 713d         #3
+    'B'        // 713e         #1
+    'D'        // 713f         #3
+    'B'        // 7140         #1
+    'C'        // 7141         #2
+    'B'        // 7142         #1
+    'I'        // 7143         #8
+    'B'        // 7144         #1
+    'C'        // 7145         #2
+    'aA'       // 7146-7147    #0
+    'D'        // 7148         #3
+    'aA'       // 7149-714a    #0
+    'C'        // 714b         #2
+    'A'        // 714c         #0
+    'B'        // 714d         #1
+    'A'        // 714e         #0
+    'B'        // 714f         #1
+    'A'        // 7150         #0
+    'C'        // 7151         #2
+    'aA'       // 7152-7153    #0
+    'B'        // 7154         #1
+    'J'        // 7155         #9
+    'aA'       // 7156-7157    #0
+    'B'        // 7158         #1
+    'A'        // 7159         #0
+    'C'        // 715a         #2
+    'D'        // 715b         #3
+    'A'        // 715c         #0
+    'I'        // 715d         #8
+    'A'        // 715e         #0
+    'B'        // 715f         #1
+    'C'        // 7160         #2
+    'B'        // 7161         #1
+    'A'        // 7162         #0
+    'B'        // 7163         #1
+    'eA'       // 7164-7169    #0
+    'aB'       // 716a-716b    #1
+    'A'        // 716c         #0
+    'D'        // 716d         #3
+    'A'        // 716e         #0
+    'D'        // 716f         #3
+    'hB'       // 7170-7178    #1
+    'F'        // 7179         #5
+    'bB'       // 717a-717c    #1
+    'A'        // 717d         #0
+    'B'        // 717e         #1
+    'D'        // 717f         #3
+    'A'        // 7180         #0
+    'aB'       // 7181-7182    #1
+    'D'        // 7183         #3
+    'aA'       // 7184-7185    #0
+    'B'        // 7186         #1
+    'aA'       // 7187-7188    #0
+    'I'        // 7189         #8
+    'A'        // 718a         #0
+    'D'        // 718b         #3
+    'C'        // 718c         #2
+    'D'        // 718d         #3
+    'B'        // 718e         #1
+    'A'        // 718f         #0
+    'aB'       // 7190-7191    #1
+    'A'        // 7192         #0
+    'D'        // 7193         #3
+    'A'        // 7194         #0
+    'F'        // 7195         #5
+    'C'        // 7196         #2
+    'aB'       // 7197-7198    #1
+    'A'        // 7199         #0
+    'C'        // 719a         #2
+    'A'        // 719b         #0
+    'bB'       // 719c-719e    #1
+    'aA'       // 719f-71a0    #0
+    'I'        // 71a1         #8
+    'A'        // 71a2         #0
+    'B'        // 71a3         #1
+    'I'        // 71a4         #8
+    'B'        // 71a5         #1
+    'D'        // 71a6         #3
+    'B'        // 71a7         #1
+    'A'        // 71a8         #0
+    'I'        // 71a9         #8
+    'B'        // 71aa         #1
+    'D'        // 71ab         #3
+    'A'        // 71ac         #0
+    'B'        // 71ad         #1
+    'F'        // 71ae         #5
+    'A'        // 71af         #0
+    'C'        // 71b0         #2
+    'aA'       // 71b1-71b2    #0
+    'C'        // 71b3         #2
+    'aB'       // 71b4-71b5    #1
+    'D'        // 71b6         #3
+    'aB'       // 71b7-71b8    #1
+    'aA'       // 71b9-71ba    #0
+    'D'        // 71bb         #3
+    'aB'       // 71bc-71bd    #1
+    'A'        // 71be         #0
+    'aC'       // 71bf-71c0    #2
+    'A'        // 71c1         #0
+    'B'        // 71c2         #1
+    'A'        // 71c3         #0
+    'C'        // 71c4         #2
+    'bB'       // 71c5-71c7    #1
+    'aA'       // 71c8-71c9    #0
+    'B'        // 71ca         #1
+    'A'        // 71cb         #0
+    'F'        // 71cc         #5
+    'D'        // 71cd         #3
+    'A'        // 71ce         #0
+    'I'        // 71cf         #8
+    'A'        // 71d0         #0
+    'B'        // 71d1         #1
+    'A'        // 71d2         #0
+    'F'        // 71d3         #5
+    'bA'       // 71d4-71d6    #0
+    'F'        // 71d7         #5
+    'B'        // 71d8         #1
+    'A'        // 71d9         #0
+    'C'        // 71da         #2
+    'I'        // 71db         #8
+    'C'        // 71dc         #2
+    'B'        // 71dd         #1
+    'D'        // 71de         #3
+    'aA'       // 71df-71e0    #0
+    'aB'       // 71e1-71e2    #1
+    'D'        // 71e3         #3
+    'B'        // 71e4         #1
+    'bA'       // 71e5-71e7    #0
+    'B'        // 71e8         #1
+    'aD'       // 71e9-71ea    #3
+    'B'        // 71eb         #1
+    'bA'       // 71ec-71ee    #0
+    'D'        // 71ef         #3
+    'bB'       // 71f0-71f2    #1
+    'D'        // 71f3         #3
+    'aC'       // 71f4-71f5    #2
+    'B'        // 71f6         #1
+    'D'        // 71f7         #3
+    'C'        // 71f8         #2
+    'A'        // 71f9         #0
+    'D'        // 71fa         #3
+    'aA'       // 71fb-71fc    #0
+    'I'        // 71fd         #8
+    'bA'       // 71fe-7200    #0
+    'I'        // 7201         #8
+    'aB'       // 7202-7203    #1
+    'D'        // 7204         #3
+    'B'        // 7205         #1
+    'aA'       // 7206-7207    #0
+    'F'        // 7208         #5
+    'C'        // 7209         #2
+    'B'        // 720a         #1
+    'K'        // 720b         #10
+    'I'        // 720c         #8
+    'A'        // 720d         #0
+    'aB'       // 720e-720f    #1
+    'A'        // 7210         #0
+    'aD'       // 7211-7212    #3
+    'C'        // 7213         #2
+    'I'        // 7214         #8
+    'C'        // 7215         #2
+    'B'        // 7216         #1
+    'A'        // 7217         #0
+    'D'        // 7218         #3
+    'B'        // 7219         #1
+    'aA'       // 721a-721b    #0
+    'D'        // 721c         #3
+    'C'        // 721d         #2
+    'B'        // 721e         #1
+    'A'        // 721f         #0
+    'aD'       // 7220-7221    #3
+    'aB'       // 7222-7223    #1
+    'C'        // 7224         #2
+    'I'        // 7225         #8
+    'aB'       // 7226-7227    #1
+    'A'        // 7228         #0
+    'B'        // 7229         #1
+    'A'        // 722a         #0
+    'C'        // 722b         #2
+    'aA'       // 722c-722d    #0
+    'B'        // 722e         #1
+    'F'        // 722f         #5
+    'A'        // 7230         #0
+    'D'        // 7231         #3
+    'J'        // 7232         #9
+    'D'        // 7233         #3
+    'F'        // 7234         #5
+    'aA'       // 7235-7236    #0
+    'D'        // 7237         #3
+    'cA'       // 7238-723b    #0
+    'F'        // 723c         #5
+    'cA'       // 723d-7240    #0
+    'C'        // 7241         #2
+    'A'        // 7242         #0
+    'F'        // 7243         #5
+    'B'        // 7244         #1
+    'F'        // 7245         #5
+    'bA'       // 7246-7248    #0
+    'aB'       // 7249-724a    #1
+    'aA'       // 724b-724c    #0
+    'D'        // 724d         #3
+    'F'        // 724e         #5
+    'aC'       // 724f-7250    #2
+    'D'        // 7251         #3
+    'aA'       // 7252-7253    #0
+    'K'        // 7254         #10
+    'C'        // 7255         #2
+    'A'        // 7256         #0
+    'C'        // 7257         #2
+    'cA'       // 7258-725b    #0
+    'C'        // 725c         #2
+    'A'        // 725d         #0
+    'C'        // 725e         #2
+    'A'        // 725f         #0
+    'C'        // 7260         #2
+    'bA'       // 7261-7263    #0
+    'aD'       // 7264-7265    #3
+    'B'        // 7266         #1
+    'A'        // 7267         #0
+    'F'        // 7268         #5
+    'A'        // 7269         #0
+    'B'        // 726a         #1
+    'F'        // 726b         #5
+    'B'        // 726c         #1
+    'D'        // 726d         #3
+    'C'        // 726e         #2
+    'A'        // 726f         #0
+    'B'        // 7270         #1
+    'F'        // 7271         #5
+    'A'        // 7272         #0
+    'B'        // 7273         #1
+    'A'        // 7274         #0
+    'D'        // 7275         #3
+    'B'        // 7276         #1
+    'C'        // 7277         #2
+    'aA'       // 7278-7279    #0
+    'D'        // 727a         #3
+    'aC'       // 727b-727c    #2
+    'A'        // 727d         #0
+    'aC'       // 727e-727f    #2
+    'bA'       // 7280-7282    #0
+    'D'        // 7283         #3
+    'C'        // 7284         #2
+    'aB'       // 7285-7286    #1
+    'A'        // 7287         #0
+    'B'        // 7288         #1
+    'C'        // 7289         #2
+    'D'        // 728a         #3
+    'aB'       // 728b-728c    #1
+    'A'        // 728d         #0
+    'C'        // 728e         #2
+    'bB'       // 728f-7291    #1
+    'A'        // 7292         #0
+    'C'        // 7293         #2
+    'aB'       // 7294-7295    #1
+    'A'        // 7296         #0
+    'aB'       // 7297-7298    #1
+    'D'        // 7299         #3
+    'B'        // 729a         #1
+    'C'        // 729b         #2
+    'D'        // 729c         #3
+    'bB'       // 729d-729f    #1
+    'F'        // 72a0         #5
+    'B'        // 72a1         #1
+    'A'        // 72a2         #0
+    'cB'       // 72a3-72a6    #1
+    'A'        // 72a7         #0
+    'C'        // 72a8         #2
+    'aB'       // 72a9-72aa    #1
+    'D'        // 72ab         #3
+    'aA'       // 72ac-72ad    #0
+    'C'        // 72ae         #2
+    'A'        // 72af         #0
+    'C'        // 72b0         #2
+    'F'        // 72b1         #5
+    'C'        // 72b2         #2
+    'K'        // 72b3         #10
+    'A'        // 72b4         #0
+    'I'        // 72b5         #8
+    'F'        // 72b6         #5
+    'aD'       // 72b7-72b8    #3
+    'F'        // 72b9         #5
+    'B'        // 72ba         #1
+    'aD'       // 72bb-72bc    #3
+    'B'        // 72bd         #1
+    'F'        // 72be         #5
+    'B'        // 72bf         #1
+    'A'        // 72c0         #0
+    'C'        // 72c1         #2
+    'A'        // 72c2         #0
+    'C'        // 72c3         #2
+    'A'        // 72c4         #0
+    'B'        // 72c5         #1
+    'C'        // 72c6         #2
+    'F'        // 72c7         #5
+    'D'        // 72c8         #3
+    'A'        // 72c9         #0
+    'aB'       // 72ca-72cb    #1
+    'C'        // 72cc         #2
+    'B'        // 72cd         #1
+    'A'        // 72ce         #0
+    'D'        // 72cf         #3
+    'A'        // 72d0         #0
+    'B'        // 72d1         #1
+    'A'        // 72d2         #0
+    'D'        // 72d3         #3
+    'B'        // 72d4         #1
+    'F'        // 72d5         #5
+    'C'        // 72d6         #2
+    'A'        // 72d7         #0
+    'C'        // 72d8         #2
+    'A'        // 72d9         #0
+    'B'        // 72da         #1
+    'F'        // 72db         #5
+    'B'        // 72dc         #1
+    'aD'       // 72dd-72de    #3
+    'aC'       // 72df-72e0    #2
+    'aA'       // 72e1-72e2    #0
+    'aB'       // 72e3-72e4    #1
+    'J'        // 72e5         #9
+    'B'        // 72e6         #1
+    'D'        // 72e7         #3
+    'I'        // 72e8         #8
+    'A'        // 72e9         #0
+    'aB'       // 72ea-72eb    #1
+    'J'        // 72ec         #9
+    'F'        // 72ed         #5
+    'dD'       // 72ee-72f2    #3
+    'C'        // 72f3         #2
+    'A'        // 72f4         #0
+    'D'        // 72f5         #3
+    'B'        // 72f6         #1
+    'fA'       // 72f7-72fd    #0
+    'C'        // 72fe         #2
+    'bB'       // 72ff-7301    #1
+    'C'        // 7302         #2
+    'D'        // 7303         #3
+    'C'        // 7304         #2
+    'F'        // 7305         #5
+    'D'        // 7306         #3
+    'C'        // 7307         #2
+    'B'        // 7308         #1
+    'K'        // 7309         #10
+    'A'        // 730a         #0
+    'C'        // 730b         #2
+    'B'        // 730c         #1
+    'F'        // 730d         #5
+    'D'        // 730e         #3
+    'bB'       // 730f-7311    #1
+    'C'        // 7312         #2
+    'A'        // 7313         #0
+    'aD'       // 7314-7315    #3
+    'cA'       // 7316-7319    #0
+    'D'        // 731a         #3
+    'bA'       // 731b-731d    #0
+    'C'        // 731e         #2
+    'F'        // 731f         #5
+    'aD'       // 7320-7321    #3
+    'A'        // 7322         #0
+    'B'        // 7323         #1
+    'F'        // 7324         #5
+    'A'        // 7325         #0
+    'B'        // 7326         #1
+    'dA'       // 7327-732b    #0
+    'C'        // 732c         #2
+    'B'        // 732d         #1
+    'C'        // 732e         #2
+    'F'        // 732f         #5
+    'B'        // 7330         #1
+    'A'        // 7331         #0
+    'aC'       // 7332-7333    #2
+    'A'        // 7334         #0
+    'C'        // 7335         #2
+    'aA'       // 7336-7337    #0
+    'B'        // 7338         #1
+    'bC'       // 7339-733b    #2
+    'B'        // 733c         #1
+    'F'        // 733d         #5
+    'aA'       // 733e-733f    #0
+    'bB'       // 7340-7342    #1
+    'bA'       // 7343-7345    #0
+    'aD'       // 7346-7347    #3
+    'bB'       // 7348-734a    #1
+    'D'        // 734b         #3
+    'B'        // 734c         #1
+    'C'        // 734d         #2
+    'A'        // 734e         #0
+    'C'        // 734f         #2
+    'A'        // 7350         #0
+    'B'        // 7351         #1
+    'A'        // 7352         #0
+    'bD'       // 7353-7355    #3
+    'F'        // 7356         #5
+    'aA'       // 7357-7358    #0
+    'bB'       // 7359-735b    #1
+    'K'        // 735c         #10
+    'bC'       // 735d-735f    #2
+    'A'        // 7360         #0
+    'aB'       // 7361-7362    #1
+    'F'        // 7363         #5
+    'D'        // 7364         #3
+    'B'        // 7365         #1
+    'aC'       // 7366-7367    #2
+    'dA'       // 7368-736c    #0
+    'D'        // 736d         #3
+    'C'        // 736e         #2
+    'aA'       // 736f-7370    #0
+    'C'        // 7371         #2
+    'A'        // 7372         #0
+    'aB'       // 7373-7374    #1
+    'A'        // 7375         #0
+    'B'        // 7376         #1
+    'aA'       // 7377-7378    #0
+    'F'        // 7379         #5
+    'bA'       // 737a-737c    #0
+    'bB'       // 737d-737f    #1
+    'C'        // 7380         #2
+    'A'        // 7381         #0
+    'B'        // 7382         #1
+    'C'        // 7383         #2
+    'A'        // 7384         #0
+    'C'        // 7385         #2
+    'aA'       // 7386-7387    #0
+    'I'        // 7388         #8
+    'A'        // 7389         #0
+    'C'        // 738a         #2
+    'A'        // 738b         #0
+    'B'        // 738c         #1
+    'D'        // 738d         #3
+    'A'        // 738e         #0
+    'B'        // 738f         #1
+    'F'        // 7390         #5
+    'D'        // 7391         #3
+    'I'        // 7392         #8
+    'C'        // 7393         #2
+    'dA'       // 7394-7398    #0
+    'bD'       // 7399-739b    #3
+    'C'        // 739c         #2
+    'B'        // 739d         #1
+    'bA'       // 739e-73a0    #0
+    'B'        // 73a1         #1
+    'C'        // 73a2         #2
+    'D'        // 73a3         #3
+    'B'        // 73a4         #1
+    'C'        // 73a5         #2
+    'A'        // 73a6         #0
+    'I'        // 73a7         #8
+    'C'        // 73a8         #2
+    'bA'       // 73a9-73ab    #0
+    'B'        // 73ac         #1
+    'A'        // 73ad         #0
+    'cD'       // 73ae-73b1    #3
+    'aA'       // 73b2-73b3    #0
+    'I'        // 73b4         #8
+    'C'        // 73b5         #2
+    'B'        // 73b6         #1
+    'A'        // 73b7         #0
+    'B'        // 73b8         #1
+    'A'        // 73b9         #0
+    'C'        // 73ba         #2
+    'aA'       // 73bb-73bc    #0
+    'J'        // 73bd         #9
+    'B'        // 73be         #1
+    'aA'       // 73bf-73c0    #0
+    'D'        // 73c1         #3
+    'A'        // 73c2         #0
+    'aB'       // 73c3-73c4    #1
+    'C'        // 73c5         #2
+    'A'        // 73c6         #0
+    'B'        // 73c7         #1
+    'bA'       // 73c8-73ca    #0
+    'C'        // 73cb         #2
+    'aA'       // 73cc-73cd    #0
+    'C'        // 73ce         #2
+    'A'        // 73cf         #0
+    'B'        // 73d0         #1
+    'D'        // 73d1         #3
+    'A'        // 73d2         #0
+    'C'        // 73d3         #2
+    'aB'       // 73d4-73d5    #1
+    'A'        // 73d6         #0
+    'aI'       // 73d7-73d8    #8
+    'A'        // 73d9         #0
+    'bB'       // 73da-73dc    #1
+    'aA'       // 73dd-73de    #0
+    'D'        // 73df         #3
+    'A'        // 73e0         #0
+    'C'        // 73e1         #2
+    'I'        // 73e2         #8
+    'cA'       // 73e3-73e6    #0
+    'C'        // 73e7         #2
+    'B'        // 73e8         #1
+    'aA'       // 73e9-73ea    #0
+    'I'        // 73eb         #8
+    'D'        // 73ec         #3
+    'aA'       // 73ed-73ee    #0
+    'B'        // 73ef         #1
+    'D'        // 73f0         #3
+    'F'        // 73f1         #5
+    'D'        // 73f2         #3
+    'B'        // 73f3         #1
+    'C'        // 73f4         #2
+    'A'        // 73f5         #0
+    'B'        // 73f6         #1
+    'bA'       // 73f7-73f9    #0
+    'aC'       // 73fa-73fb    #2
+    'B'        // 73fc         #1
+    'aA'       // 73fd-73fe    #0
+    'aC'       // 73ff-7400    #2
+    'A'        // 7401         #0
+    'B'        // 7402         #1
+    'dA'       // 7403-7407    #0
+    'B'        // 7408         #1
+    'A'        // 7409         #0
+    'C'        // 740a         #2
+    'bB'       // 740b-740d    #1
+    'bD'       // 740e-7410    #3
+    'C'        // 7411         #2
+    'B'        // 7412         #1
+    'J'        // 7413         #9
+    'bB'       // 7414-7416    #1
+    'I'        // 7417         #8
+    'K'        // 7418         #10
+    'B'        // 7419         #1
+    'C'        // 741a         #2
+    'A'        // 741b         #0
+    'B'        // 741c         #1
+    'I'        // 741d         #8
+    'B'        // 741e         #1
+    'aI'       // 741f-7420    #8
+    'aA'       // 7421-7422    #0
+    'B'        // 7423         #1
+    'bA'       // 7424-7426    #0
+    'D'        // 7427         #3
+    'A'        // 7428         #0
+    'C'        // 7429         #2
+    'bA'       // 742a-742c    #0
+    'C'        // 742d         #2
+    'hA'       // 742e-7436    #0
+    'B'        // 7437         #1
+    'I'        // 7438         #8
+    'C'        // 7439         #2
+    'A'        // 743a         #0
+    'D'        // 743b         #3
+    'B'        // 743c         #1
+    'aD'       // 743d-743e    #3
+    'bA'       // 743f-7441    #0
+    'I'        // 7442         #8
+    'aA'       // 7443-7444    #0
+    'I'        // 7445         #8
+    'A'        // 7446         #0
+    'C'        // 7447         #2
+    'aI'       // 7448-7449    #8
+    'B'        // 744a         #1
+    'A'        // 744b         #0
+    'I'        // 744c         #8
+    'C'        // 744d         #2
+    'I'        // 744e         #8
+    'aB'       // 744f-7450    #1
+    'bC'       // 7451-7453    #2
+    'B'        // 7454         #1
+    'A'        // 7455         #0
+    'B'        // 7456         #1
+    'A'        // 7457         #0
+    'D'        // 7458         #3
+    'gA'       // 7459-7460    #0
+    'B'        // 7461         #1
+    'bA'       // 7462-7464    #0
+    'I'        // 7465         #8
+    'F'        // 7466         #5
+    'C'        // 7467         #2
+    'bA'       // 7468-746a    #0
+    'C'        // 746b         #2
+    'B'        // 746c         #1
+    'fA'       // 746d-7473    #0
+    'aB'       // 7474-7475    #1
+    'C'        // 7476         #2
+    'aD'       // 7477-7478    #3
+    'aB'       // 7479-747a    #1
+    'D'        // 747b         #3
+    'B'        // 747c         #1
+    'I'        // 747d         #8
+    'A'        // 747e         #0
+    'B'        // 747f         #1
+    'A'        // 7480         #0
+    'C'        // 7481         #2
+    'I'        // 7482         #8
+    'A'        // 7483         #0
+    'K'        // 7484         #10
+    'bA'       // 7485-7487    #0
+    'C'        // 7488         #2
+    'A'        // 7489         #0
+    'I'        // 748a         #8
+    'A'        // 748b         #0
+    'I'        // 748c         #8
+    'B'        // 748d         #1
+    'D'        // 748e         #3
+    'F'        // 748f         #5
+    'A'        // 7490         #0
+    'F'        // 7491         #5
+    'C'        // 7492         #2
+    'D'        // 7493         #3
+    'aB'       // 7494-7495    #1
+    'D'        // 7496         #3
+    'C'        // 7497         #2
+    'A'        // 7498         #0
+    'aC'       // 7499-749a    #2
+    'B'        // 749b         #1
+    'A'        // 749c         #0
+    'I'        // 749d         #8
+    'aA'       // 749e-749f    #0
+    'C'        // 74a0         #2
+    'A'        // 74a1         #0
+    'F'        // 74a2         #5
+    'A'        // 74a3         #0
+    'B'        // 74a4         #1
+    'A'        // 74a5         #0
+    'C'        // 74a6         #2
+    'aA'       // 74a7-74a8    #0
+    'C'        // 74a9         #2
+    'aA'       // 74aa-74ab    #0
+    'D'        // 74ac         #3
+    'B'        // 74ad         #1
+    'F'        // 74ae         #5
+    'C'        // 74af         #2
+    'bA'       // 74b0-74b2    #0
+    'D'        // 74b3         #3
+    'B'        // 74b4         #1
+    'A'        // 74b5         #0
+    'I'        // 74b6         #8
+    'B'        // 74b7         #1
+    'I'        // 74b8         #8
+    'A'        // 74b9         #0
+    'aC'       // 74ba-74bb    #2
+    'K'        // 74bc         #10
+    'A'        // 74bd         #0
+    'B'        // 74be         #1
+    'A'        // 74bf         #0
+    'I'        // 74c0         #8
+    'bB'       // 74c1-74c3    #1
+    'D'        // 74c4         #3
+    'B'        // 74c5         #1
+    'I'        // 74c6         #8
+    'D'        // 74c7         #3
+    'C'        // 74c8         #2
+    'F'        // 74c9         #5
+    'A'        // 74ca         #0
+    'B'        // 74cb         #1
+    'C'        // 74cc         #2
+    'K'        // 74cd         #10
+    'D'        // 74ce         #3
+    'aA'       // 74cf-74d0    #0
+    'aD'       // 74d1-74d2    #3
+    'aA'       // 74d3-74d4    #0
+    'B'        // 74d5         #1
+    'C'        // 74d6         #2
+    'B'        // 74d7         #1
+    'A'        // 74d8         #0
+    'B'        // 74d9         #1
+    'bA'       // 74da-74dc    #0
+    'B'        // 74dd         #1
+    'aC'       // 74de-74df    #2
+    'A'        // 74e0         #0
+    'B'        // 74e1         #1
+    'aA'       // 74e2-74e3    #0
+    'C'        // 74e4         #2
+    'B'        // 74e5         #1
+    'A'        // 74e6         #0
+    'aC'       // 74e7-74e8    #2
+    'A'        // 74e9         #0
+    'aF'       // 74ea-74eb    #5
+    'B'        // 74ec         #1
+    'D'        // 74ed         #3
+    'A'        // 74ee         #0
+    'F'        // 74ef         #5
+    'aC'       // 74f0-74f1    #2
+    'A'        // 74f2         #0
+    'K'        // 74f3         #10
+    'C'        // 74f4         #2
+    'B'        // 74f5         #1
+    'C'        // 74f6         #2
+    'A'        // 74f7         #0
+    'C'        // 74f8         #2
+    'D'        // 74f9         #3
+    'F'        // 74fa         #5
+    'C'        // 74fb         #2
+    'F'        // 74fc         #5
+    'aB'       // 74fd-74fe    #1
+    'C'        // 74ff         #2
+    'B'        // 7500         #1
+    'J'        // 7501         #9
+    'B'        // 7502         #1
+    'aA'       // 7503-7504    #0
+    'C'        // 7505         #2
+    'F'        // 7506         #5
+    'aB'       // 7507-7508    #1
+    'aD'       // 7509-750a    #3
+    'B'        // 750b         #1
+    'bA'       // 750c-750e    #0
+    'aB'       // 750f-7510    #1
+    'A'        // 7511         #0
+    'C'        // 7512         #2
+    'A'        // 7513         #0
+    'B'        // 7514         #1
+    'A'        // 7515         #0
+    'aC'       // 7516-7517    #2
+    'A'        // 7518         #0
+    'B'        // 7519         #1
+    'A'        // 751a         #0
+    'K'        // 751b         #10
+    'A'        // 751c         #0
+    'B'        // 751d         #1
+    'aA'       // 751e-751f    #0
+    'F'        // 7520         #5
+    'C'        // 7521         #2
+    'A'        // 7522         #0
+    'aJ'       // 7523-7524    #9
+    'aA'       // 7525-7526    #0
+    'F'        // 7527         #5
+    'A'        // 7528         #0
+    'aC'       // 7529-752a    #2
+    'aA'       // 752b-752c    #0
+    'aB'       // 752d-752e    #1
+    'C'        // 752f         #2
+    'cA'       // 7530-7533    #0
+    'aB'       // 7534-7535    #1
+    'F'        // 7536         #5
+    'aA'       // 7537-7538    #0
+    'C'        // 7539         #2
+    'aA'       // 753a-753b    #0
+    'F'        // 753c         #5
+    'aC'       // 753d-753e    #2
+    'A'        // 753f         #0
+    'C'        // 7540         #2
+    'D'        // 7541         #3
+    'B'        // 7542         #1
+    'J'        // 7543         #9
+    'F'        // 7544         #5
+    'D'        // 7545         #3
+    'C'        // 7546         #2
+    'A'        // 7547         #0
+    'C'        // 7548         #2
+    'F'        // 7549         #5
+    'bA'       // 754a-754c    #0
+    'C'        // 754d         #2
+    'aA'       // 754e-754f    #0
+    'F'        // 7550         #5
+    'A'        // 7551         #0
+    'F'        // 7552         #5
+    'I'        // 7553         #8
+    'A'        // 7554         #0
+    'B'        // 7555         #1
+    'D'        // 7556         #3
+    'F'        // 7557         #5
+    'D'        // 7558         #3
+    'dA'       // 7559-755d    #0
+    'F'        // 755e         #5
+    'C'        // 755f         #2
+    'A'        // 7560         #0
+    'F'        // 7561         #5
+    'A'        // 7562         #0
+    'B'        // 7563         #1
+    'cA'       // 7564-7567    #0
+    'D'        // 7568         #3
+    'F'        // 7569         #5
+    'aA'       // 756a-756b    #0
+    'aC'       // 756c-756d    #2
+    'B'        // 756e         #1
+    'aA'       // 756f-7570    #0
+    'F'        // 7571         #5
+    'C'        // 7572         #2
+    'aF'       // 7573-7574    #5
+    'J'        // 7575         #9
+    'A'        // 7576         #0
+    'C'        // 7577         #2
+    'A'        // 7578         #0
+    'C'        // 7579         #2
+    'A'        // 757a         #0
+    'aF'       // 757b-757c    #5
+    'aC'       // 757d-757e    #2
+    'A'        // 757f         #0
+    'B'        // 7580         #1
+    'aF'       // 7581-7582    #5
+    'aB'       // 7583-7584    #1
+    'F'        // 7585         #5
+    'aA'       // 7586-7587    #0
+    'K'        // 7588         #10
+    'F'        // 7589         #5
+    'aA'       // 758a-758b    #0
+    'C'        // 758c         #2
+    'B'        // 758d         #1
+    'aA'       // 758e-758f    #0
+    'C'        // 7590         #2
+    'aA'       // 7591-7592    #0
+    'F'        // 7593         #5
+    'A'        // 7594         #0
+    'C'        // 7595         #2
+    'aD'       // 7596-7597    #3
+    'B'        // 7598         #1
+    'aA'       // 7599-759a    #0
+    'D'        // 759b         #3
+    'F'        // 759c         #5
+    'A'        // 759d         #0
+    'B'        // 759e         #1
+    'bD'       // 759f-75a1    #3
+    'C'        // 75a2         #2
+    'A'        // 75a3         #0
+    'C'        // 75a4         #2
+    'A'        // 75a5         #0
+    'D'        // 75a6         #3
+    'B'        // 75a7         #1
+    'D'        // 75a8         #3
+    'K'        // 75a9         #10
+    'B'        // 75aa         #1
+    'A'        // 75ab         #0
+    'cD'       // 75ac-75af    #3
+    'C'        // 75b0         #2
+    'dA'       // 75b1-75b5    #0
+    'B'        // 75b6         #1
+    'F'        // 75b7         #5
+    'aA'       // 75b8-75b9    #0
+    'C'        // 75ba         #2
+    'B'        // 75bb         #1
+    'bA'       // 75bc-75be    #0
+    'C'        // 75bf         #2
+    'A'        // 75c0         #0
+    'C'        // 75c1         #2
+    'aA'       // 75c2-75c3    #0
+    'C'        // 75c4         #2
+    'A'        // 75c5         #0
+    'F'        // 75c6         #5
+    'A'        // 75c7         #0
+    'B'        // 75c8         #1
+    'D'        // 75c9         #3
+    'A'        // 75ca         #0
+    'B'        // 75cb         #1
+    'C'        // 75cc         #2
+    'aA'       // 75cd-75ce    #0
+    'C'        // 75cf         #2
+    'aB'       // 75d0-75d1    #1
+    'A'        // 75d2         #0
+    'J'        // 75d3         #9
+    'aA'       // 75d4-75d5    #0
+    'D'        // 75d6         #3
+    'C'        // 75d7         #2
+    'aA'       // 75d8-75d9    #0
+    'B'        // 75da         #1
+    'A'        // 75db         #0
+    'aC'       // 75dc-75dd    #2
+    'A'        // 75de         #0
+    'bC'       // 75df-75e1    #2
+    'bA'       // 75e2-75e4    #0
+    'D'        // 75e5         #3
+    'B'        // 75e6         #1
+    'A'        // 75e7         #0
+    'D'        // 75e8         #3
+    'F'        // 75e9         #5
+    'aD'       // 75ea-75eb    #3
+    'F'        // 75ec         #5
+    'B'        // 75ed         #1
+    'F'        // 75ee         #5
+    'C'        // 75ef         #2
+    'A'        // 75f0         #0
+    'C'        // 75f1         #2
+    'bA'       // 75f2-75f4    #0
+    'cB'       // 75f5-75f8    #1
+    'aA'       // 75f9-75fa    #0
+    'B'        // 75fb         #1
+    'A'        // 75fc         #0
+    'B'        // 75fd         #1
+    'C'        // 75fe         #2
+    'bA'       // 75ff-7601    #0
+    'aC'       // 7602-7603    #2
+    'F'        // 7604         #5
+    'aD'       // 7605-7606    #3
+    'bA'       // 7607-7609    #0
+    'C'        // 760a         #2
+    'A'        // 760b         #0
+    'C'        // 760c         #2
+    'A'        // 760d         #0
+    'D'        // 760e         #3
+    'C'        // 760f         #2
+    'I'        // 7610         #8
+    'B'        // 7611         #1
+    'F'        // 7612         #5
+    'C'        // 7613         #2
+    'B'        // 7614         #1
+    'A'        // 7615         #0
+    'C'        // 7616         #2
+    'D'        // 7617         #3
+    'F'        // 7618         #5
+    'A'        // 7619         #0
+    'B'        // 761a         #1
+    'cC'       // 761b-761e    #2
+    'cA'       // 761f-7622    #0
+    'C'        // 7623         #2
+    'A'        // 7624         #0
+    'C'        // 7625         #2
+    'aA'       // 7626-7627    #0
+    'aC'       // 7628-7629    #2
+    'aD'       // 762a-762b    #3
+    'B'        // 762c         #1
+    'C'        // 762d         #2
+    'D'        // 762e         #3
+    'I'        // 762f         #8
+    'A'        // 7630         #0
+    'I'        // 7631         #8
+    'C'        // 7632         #2
+    'aA'       // 7633-7634    #0
+    'C'        // 7635         #2
+    'aD'       // 7636-7637    #3
+    'C'        // 7638         #2
+    'F'        // 7639         #5
+    'C'        // 763a         #2
+    'A'        // 763b         #0
+    'C'        // 763c         #2
+    'B'        // 763d         #1
+    'aD'       // 763e-763f    #3
+    'C'        // 7640         #2
+    'F'        // 7641         #5
+    'aA'       // 7642-7643    #0
+    'aF'       // 7644-7645    #5
+    'cA'       // 7646-7649    #0
+    'aF'       // 764a-764b    #5
+    'A'        // 764c         #0
+    'B'        // 764d         #1
+    'A'        // 764e         #0
+    'bB'       // 764f-7651    #1
+    'A'        // 7652         #0
+    'aB'       // 7653-7654    #1
+    'J'        // 7655         #9
+    'A'        // 7656         #0
+    'B'        // 7657         #1
+    'A'        // 7658         #0
+    'C'        // 7659         #2
+    'B'        // 765a         #1
+    'D'        // 765b         #3
+    'A'        // 765c         #0
+    'aD'       // 765d-765e    #3
+    'C'        // 765f         #2
+    'B'        // 7660         #1
+    'aA'       // 7661-7662    #0
+    'D'        // 7663         #3
+    'aA'       // 7664-7665    #0
+    'B'        // 7666         #1
+    'A'        // 7667         #0
+    'J'        // 7668         #9
+    'A'        // 7669         #0
+    'C'        // 766a         #2
+    'D'        // 766b         #3
+    'fA'       // 766c-7672    #0
+    'B'        // 7673         #1
+    'C'        // 7674         #2
+    'B'        // 7675         #1
+    'A'        // 7676         #0
+    'D'        // 7677         #3
+    'A'        // 7678         #0
+    'B'        // 7679         #1
+    'dA'       // 767a-767e    #0
+    'B'        // 767f         #1
+    'J'        // 7680         #9
+    'A'        // 7681         #0
+    'C'        // 7682         #2
+    'J'        // 7683         #9
+    'A'        // 7684         #0
+    'F'        // 7685         #5
+    'aA'       // 7686-7687    #0
+    'C'        // 7688         #2
+    'aB'       // 7689-768a    #1
+    'A'        // 768b         #0
+    'aF'       // 768c-768d    #5
+    'A'        // 768e         #0
+    'B'        // 768f         #1
+    'A'        // 7690         #0
+    'D'        // 7691         #3
+    'I'        // 7692         #8
+    'A'        // 7693         #0
+    'D'        // 7694         #3
+    'C'        // 7695         #2
+    'A'        // 7696         #0
+    'K'        // 7697         #10
+    'D'        // 7698         #3
+    'C'        // 7699         #2
+    'bA'       // 769a-769c    #0
+    'C'        // 769d         #2
+    'A'        // 769e         #0
+    'aF'       // 769f-76a0    #5
+    'C'        // 76a1         #2
+    'aF'       // 76a2-76a3    #5
+    'A'        // 76a4         #0
+    'aC'       // 76a5-76a6    #2
+    'aF'       // 76a7-76a8    #5
+    'D'        // 76a9         #3
+    'C'        // 76aa         #2
+    'B'        // 76ab         #1
+    'K'        // 76ac         #10
+    'C'        // 76ad         #2
+    'A'        // 76ae         #0
+    'aC'       // 76af-76b0    #2
+    'bD'       // 76b1-76b3    #3
+    'A'        // 76b4         #0
+    'B'        // 76b5         #1
+    'J'        // 76b6         #9
+    'C'        // 76b7         #2
+    'A'        // 76b8         #0
+    'F'        // 76b9         #5
+    'A'        // 76ba         #0
+    'B'        // 76bb         #1
+    'D'        // 76bc         #3
+    'C'        // 76bd         #2
+    'B'        // 76be         #1
+    'A'        // 76bf         #0
+    'D'        // 76c0         #3
+    'F'        // 76c1         #5
+    'aA'       // 76c2-76c3    #0
+    'B'        // 76c4         #1
+    'C'        // 76c5         #2
+    'A'        // 76c6         #0
+    'D'        // 76c7         #3
+    'A'        // 76c8         #0
+    'C'        // 76c9         #2
+    'A'        // 76ca         #0
+    'F'        // 76cb         #5
+    'bA'       // 76cc-76ce    #0
+    'bD'       // 76cf-76d1    #3
+    'A'        // 76d2         #0
+    'I'        // 76d3         #8
+    'A'        // 76d4         #0
+    'D'        // 76d5         #3
+    'A'        // 76d6         #0
+    'F'        // 76d7         #5
+    'D'        // 76d8         #3
+    'A'        // 76d9         #0
+    'B'        // 76da         #1
+    'aA'       // 76db-76dc    #0
+    'B'        // 76dd         #1
+    'aA'       // 76de-76df    #0
+    'F'        // 76e0         #5
+    'A'        // 76e1         #0
+    'D'        // 76e2         #3
+    'bA'       // 76e3-76e5    #0
+    'C'        // 76e6         #2
+    'A'        // 76e7         #0
+    'F'        // 76e8         #5
+    'B'        // 76e9         #1
+    'A'        // 76ea         #0
+    'F'        // 76eb         #5
+    'A'        // 76ec         #0
+    'B'        // 76ed         #1
+    'A'        // 76ee         #0
+    'B'        // 76ef         #1
+    'C'        // 76f0         #2
+    'aA'       // 76f1-76f2    #0
+    'B'        // 76f3         #1
+    'A'        // 76f4         #0
+    'B'        // 76f5         #1
+    'F'        // 76f6         #5
+    'B'        // 76f7         #1
+    'aA'       // 76f8-76f9    #0
+    'B'        // 76fa         #1
+    'aA'       // 76fb-76fc    #0
+    'D'        // 76fd         #3
+    'A'        // 76fe         #0
+    'K'        // 76ff         #10
+    'J'        // 7700         #9
+    'A'        // 7701         #0
+    'K'        // 7702         #10
+    'B'        // 7703         #1
+    'A'        // 7704         #0
+    'B'        // 7705         #1
+    'F'        // 7706         #5
+    'eA'       // 7707-770c    #0
+    'D'        // 770d         #3
+    'C'        // 770e         #2
+    'B'        // 770f         #1
+    'I'        // 7710         #8
+    'B'        // 7711         #1
+    'C'        // 7712         #2
+    'B'        // 7713         #1
+    'F'        // 7714         #5
+    'C'        // 7715         #2
+    'D'        // 7716         #3
+    'F'        // 7717         #5
+    'D'        // 7718         #3
+    'C'        // 7719         #2
+    'aA'       // 771a-771b    #0
+    'F'        // 771c         #5
+    'B'        // 771d         #1
+    'bA'       // 771e-7720    #0
+    'D'        // 7721         #3
+    'C'        // 7722         #2
+    'B'        // 7723         #1
+    'C'        // 7724         #2
+    'aA'       // 7725-7726    #0
+    'B'        // 7727         #1
+    'aA'       // 7728-7729    #0
+    'D'        // 772a         #3
+    'B'        // 772b         #1
+    'D'        // 772c         #3
+    'C'        // 772d         #2
+    'F'        // 772e         #5
+    'C'        // 772f         #2
+    'D'        // 7730         #3
+    'bB'       // 7731-7733    #1
+    'A'        // 7734         #0
+    'aC'       // 7735-7736    #2
+    'cA'       // 7737-773a    #0
+    'I'        // 773b         #8
+    'A'        // 773c         #0
+    'C'        // 773d         #2
+    'A'        // 773e         #0
+    'D'        // 773f         #3
+    'A'        // 7740         #0
+    'D'        // 7741         #3
+    'F'        // 7742         #5
+    'I'        // 7743         #8
+    'B'        // 7744         #1
+    'C'        // 7745         #2
+    'aA'       // 7746-7747    #0
+    'aD'       // 7748-7749    #3
+    'C'        // 774a         #2
+    'aB'       // 774b-774c    #1
+    'A'        // 774d         #0
+    'aC'       // 774e-774f    #2
+    'aD'       // 7750-7751    #3
+    'A'        // 7752         #0
+    'D'        // 7753         #3
+    'aB'       // 7754-7755    #1
+    'C'        // 7756         #2
+    'F'        // 7757         #5
+    'C'        // 7758         #2
+    'B'        // 7759         #1
+    'aA'       // 775a-775b    #0
+    'C'        // 775c         #2
+    'D'        // 775d         #3
+    'C'        // 775e         #2
+    'dA'       // 775f-7763    #0
+    'F'        // 7764         #5
+    'aA'       // 7765-7766    #0
+    'C'        // 7767         #2
+    'A'        // 7768         #0
+    'B'        // 7769         #1
+    'C'        // 776a         #2
+    'aA'       // 776b-776c    #0
+    'bB'       // 776d-776f    #1
+    'F'        // 7770         #5
+    'D'        // 7771         #3
+    'C'        // 7772         #2
+    'aF'       // 7773-7774    #5
+    'aD'       // 7775-7776    #3
+    'I'        // 7777         #8
+    'B'        // 7778         #1
+    'A'        // 7779         #0
+    'C'        // 777a         #2
+    'B'        // 777b         #1
+    'C'        // 777c         #2
+    'bA'       // 777d-777f    #0
+    'C'        // 7780         #2
+    'bB'       // 7781-7783    #1
+    'C'        // 7784         #2
+    'B'        // 7785         #1
+    'D'        // 7786         #3
+    'bB'       // 7787-7789    #1
+    'D'        // 778a         #3
+    'A'        // 778b         #0
+    'C'        // 778c         #2
+    'aA'       // 778d-778e    #0
+    'B'        // 778f         #1
+    'D'        // 7790         #3
+    'A'        // 7791         #0
+    'D'        // 7792         #3
+    'B'        // 7793         #1
+    'F'        // 7794         #5
+    'C'        // 7795         #2
+    'J'        // 7796         #9
+    'aB'       // 7797-7798    #1
+    'I'        // 7799         #8
+    'C'        // 779a         #2
+    'bB'       // 779b-779d    #1
+    'A'        // 779e         #0
+    'C'        // 779f         #2
+    'A'        // 77a0         #0
+    'B'        // 77a1         #1
+    'A'        // 77a2         #0
+    'B'        // 77a3         #1
+    'F'        // 77a4         #5
+    'A'        // 77a5         #0
+    'D'        // 77a6         #3
+    'C'        // 77a7         #2
+    'B'        // 77a8         #1
+    'F'        // 77a9         #5
+    'A'        // 77aa         #0
+    'B'        // 77ab         #1
+    'aA'       // 77ac-77ad    #0
+    'J'        // 77ae         #9
+    'C'        // 77af         #2
+    'A'        // 77b0         #0
+    'C'        // 77b1         #2
+    'B'        // 77b2         #1
+    'A'        // 77b3         #0
+    'B'        // 77b4         #1
+    'bC'       // 77b5-77b7    #2
+    'D'        // 77b8         #3
+    'A'        // 77b9         #0
+    'B'        // 77ba         #1
+    'bA'       // 77bb-77bd    #0
+    'C'        // 77be         #2
+    'A'        // 77bf         #0
+    'aD'       // 77c0-77c1    #3
+    'B'        // 77c2         #1
+    'C'        // 77c3         #2
+    'aB'       // 77c4-77c5    #1
+    'D'        // 77c6         #3
+    'A'        // 77c7         #0
+    'D'        // 77c8         #3
+    'A'        // 77c9         #0
+    'bB'       // 77ca-77cc    #1
+    'A'        // 77cd         #0
+    'bB'       // 77ce-77d0    #1
+    'aF'       // 77d1-77d2    #5
+    'aB'       // 77d3-77d4    #1
+    'C'        // 77d5         #2
+    'D'        // 77d6         #3
+    'A'        // 77d7         #0
+    'B'        // 77d8         #1
+    'cA'       // 77d9-77dc    #0
+    'B'        // 77dd         #1
+    'A'        // 77de         #0
+    'F'        // 77df         #5
+    'C'        // 77e0         #2
+    'K'        // 77e1         #10
+    'aA'       // 77e2-77e3    #0
+    'F'        // 77e4         #5
+    'A'        // 77e5         #0
+    'C'        // 77e6         #2
+    'A'        // 77e7         #0
+    'B'        // 77e8         #1
+    'A'        // 77e9         #0
+    'F'        // 77ea         #5
+    'D'        // 77eb         #3
+    'C'        // 77ec         #2
+    'cA'       // 77ed-77f0    #0
+    'C'        // 77f1         #2
+    'B'        // 77f2         #1
+    'A'        // 77f3         #0
+    'C'        // 77f4         #2
+    'aD'       // 77f5-77f6    #3
+    'B'        // 77f7         #1
+    'A'        // 77f8         #0
+    'B'        // 77f9         #1
+    'I'        // 77fa         #8
+    'aA'       // 77fb-77fc    #0
+    'I'        // 77fd         #8
+    'B'        // 77fe         #1
+    'bD'       // 77ff-7801    #3
+    'A'        // 7802         #0
+    'B'        // 7803         #1
+    'D'        // 7804         #3
+    'aC'       // 7805-7806    #2
+    'K'        // 7807         #10
+    'B'        // 7808         #1
+    'C'        // 7809         #2
+    'aD'       // 780a-780b    #3
+    'A'        // 780c         #0
+    'aC'       // 780d-780e    #2
+    'I'        // 780f         #8
+    'B'        // 7810         #1
+    'aA'       // 7811-7812    #0
+    'B'        // 7813         #1
+    'A'        // 7814         #0
+    'F'        // 7815         #5
+    'aD'       // 7816-7817    #3
+    'B'        // 7818         #1
+    'F'        // 7819         #5
+    'aD'       // 781a-781b    #3
+    'B'        // 781c         #1
+    'C'        // 781d         #2
+    'aB'       // 781e-781f    #1
+    'aC'       // 7820-7821    #2
+    'A'        // 7822         #0
+    'C'        // 7823         #2
+    'D'        // 7824         #3
+    'bA'       // 7825-7827    #0
+    'cB'       // 7828-782b    #1
+    'aA'       // 782c-782d    #0
+    'C'        // 782e         #2
+    'B'        // 782f         #1
+    'A'        // 7830         #0
+    'B'        // 7831         #1
+    'A'        // 7832         #0
+    'B'        // 7833         #1
+    'A'        // 7834         #0
+    'C'        // 7835         #2
+    'D'        // 7836         #3
+    'C'        // 7837         #2
+    'aB'       // 7838-7839    #1
+    'F'        // 783a         #5
+    'D'        // 783b         #3
+    'aB'       // 783c-783d    #1
+    'D'        // 783e         #3
+    'F'        // 783f         #5
+    'aD'       // 7840-7841    #3
+    'B'        // 7842         #1
+    'A'        // 7843         #0
+    'C'        // 7844         #2
+    'A'        // 7845         #0
+    'D'        // 7846         #3
+    'aC'       // 7847-7848    #2
+    'bB'       // 7849-784b    #1
+    'C'        // 784c         #2
+    'B'        // 784d         #1
+    'C'        // 784e         #2
+    'J'        // 784f         #9
+    'B'        // 7850         #1
+    'aC'       // 7851-7852    #2
+    'aB'       // 7853-7854    #1
+    'fD'       // 7855-785b    #3
+    'aA'       // 785c-785d    #0
+    'C'        // 785e         #2
+    'D'        // 785f         #3
+    'A'        // 7860         #0
+    'F'        // 7861         #5
+    'B'        // 7862         #1
+    'F'        // 7863         #5
+    'C'        // 7864         #2
+    'aB'       // 7865-7866    #1
+    'K'        // 7867         #10
+    'A'        // 7868         #0
+    'B'        // 7869         #1
+    'bA'       // 786a-786c    #0
+    'B'        // 786d         #1
+    'aA'       // 786e-786f    #0
+    'aB'       // 7870-7871    #1
+    'F'        // 7872         #5
+    'D'        // 7873         #3
+    'F'        // 7874         #5
+    'cD'       // 7875-7878    #3
+    'B'        // 7879         #1
+    'C'        // 787a         #2
+    'B'        // 787b         #1
+    'A'        // 787c         #0
+    'D'        // 787d         #3
+    'C'        // 787e         #2
+    'aB'       // 787f-7880    #1
+    'A'        // 7881         #0
+    'D'        // 7882         #3
+    'B'        // 7883         #1
+    'I'        // 7884         #8
+    'B'        // 7885         #1
+    'C'        // 7886         #2
+    'A'        // 7887         #0
+    'aB'       // 7888-7889    #1
+    'F'        // 788a         #5
+    'D'        // 788b         #3
+    'cA'       // 788c-788f    #0
+    'D'        // 7890         #3
+    'A'        // 7891         #0
+    'D'        // 7892         #3
+    'A'        // 7893         #0
+    'aC'       // 7894-7895    #2
+    'B'        // 7896         #1
+    'A'        // 7897         #0
+    'C'        // 7898         #2
+    'B'        // 7899         #1
+    'C'        // 789a         #2
+    'aD'       // 789b-789c    #3
+    'F'        // 789d         #5
+    'C'        // 789e         #2
+    'A'        // 789f         #0
+    'B'        // 78a0         #1
+    'C'        // 78a1         #2
+    'B'        // 78a2         #1
+    'aA'       // 78a3-78a4    #0
+    'B'        // 78a5         #1
+    'D'        // 78a6         #3
+    'bA'       // 78a7-78a9    #0
+    'C'        // 78aa         #2
+    'B'        // 78ab         #1
+    'aA'       // 78ac-78ad    #0
+    'D'        // 78ae         #3
+    'dC'       // 78af-78b3    #2
+    'B'        // 78b4         #1
+    'F'        // 78b5         #5
+    'B'        // 78b6         #1
+    'D'        // 78b7         #3
+    'aB'       // 78b8-78b9    #1
+    'bA'       // 78ba-78bc    #0
+    'F'        // 78bd         #5
+    'A'        // 78be         #0
+    'F'        // 78bf         #5
+    'D'        // 78c0         #3
+    'A'        // 78c1         #0
+    'D'        // 78c2         #3
+    'aB'       // 78c3-78c4    #1
+    'A'        // 78c5         #0
+    'F'        // 78c6         #5
+    'C'        // 78c7         #2
+    'A'        // 78c8         #0
+    'C'        // 78c9         #2
+    'aA'       // 78ca-78cb    #0
+    'C'        // 78cc         #2
+    'B'        // 78cd         #1
+    'A'        // 78ce         #0
+    'I'        // 78cf         #8
+    'aA'       // 78d0-78d1    #0
+    'aC'       // 78d2-78d3    #2
+    'aA'       // 78d4-78d5    #0
+    'F'        // 78d6         #5
+    'aB'       // 78d7-78d8    #1
+    'D'        // 78d9         #3
+    'A'        // 78da         #0
+    'C'        // 78db         #2
+    'D'        // 78dc         #3
+    'aB'       // 78dd-78de    #1
+    'C'        // 78df         #2
+    'A'        // 78e0         #0
+    'C'        // 78e1         #2
+    'aB'       // 78e2-78e3    #1
+    'C'        // 78e4         #2
+    'B'        // 78e5         #1
+    'F'        // 78e6         #5
+    'aA'       // 78e7-78e8    #0
+    'B'        // 78e9         #1
+    'A'        // 78ea         #0
+    'D'        // 78eb         #3
+    'A'        // 78ec         #0
+    'aB'       // 78ed-78ee    #1
+    'A'        // 78ef         #0
+    'aB'       // 78f0-78f1    #1
+    'aC'       // 78f2-78f3    #2
+    'A'        // 78f4         #0
+    'I'        // 78f5         #8
+    'F'        // 78f6         #5
+    'A'        // 78f7         #0
+    'D'        // 78f8         #3
+    'C'        // 78f9         #2
+    'aA'       // 78fa-78fb    #0
+    'I'        // 78fc         #8
+    'A'        // 78fd         #0
+    'aC'       // 78fe-78ff    #2
+    'F'        // 7900         #5
+    'A'        // 7901         #0
+    'B'        // 7902         #1
+    'D'        // 7903         #3
+    'aB'       // 7904-7905    #1
+    'C'        // 7906         #2
+    'F'        // 7907         #5
+    'D'        // 7908         #3
+    'B'        // 7909         #1
+    'aD'       // 790a-790b    #3
+    'A'        // 790c         #0
+    'D'        // 790d         #3
+    'A'        // 790e         #0
+    'K'        // 790f         #10
+    'C'        // 7910         #2
+    'aA'       // 7911-7912    #0
+    'aB'       // 7913-7914    #1
+    'D'        // 7915         #3
+    'K'        // 7916         #10
+    'B'        // 7917         #1
+    'D'        // 7918         #3
+    'A'        // 7919         #0
+    'F'        // 791a         #5
+    'aC'       // 791b-791c    #2
+    'B'        // 791d         #1
+    'C'        // 791e         #2
+    'aF'       // 791f-7920    #5
+    'B'        // 7921         #1
+    'D'        // 7922         #3
+    'aB'       // 7923-7924    #1
+    'aC'       // 7925-7926    #2
+    'A'        // 7927         #0
+    'aC'       // 7928-7929    #2
+    'cA'       // 792a-792d    #0
+    'C'        // 792e         #2
+    'B'        // 792f         #1
+    'F'        // 7930         #5
+    'A'        // 7931         #0
+    'aB'       // 7932-7933    #1
+    'aC'       // 7934-7935    #2
+    'B'        // 7936         #1
+    'D'        // 7937         #3
+    'aB'       // 7938-7939    #1
+    'bA'       // 793a-793c    #0
+    'C'        // 793d         #2
+    'A'        // 793e         #0
+    'C'        // 793f         #2
+    'aA'       // 7940-7941    #0
+    'C'        // 7942         #2
+    'D'        // 7943         #3
+    'fA'       // 7944-794a    #0
+    'C'        // 794b         #2
+    'B'        // 794c         #1
+    'aD'       // 794d-794e    #3
+    'C'        // 794f         #2
+    'A'        // 7950         #0
+    'C'        // 7951         #2
+    'B'        // 7952         #1
+    'eA'       // 7953-7958    #0
+    'B'        // 7959         #1
+    'fA'       // 795a-7960    #0
+    'B'        // 7961         #1
+    'A'        // 7962         #0
+    'aB'       // 7963-7964    #1
+    'A'        // 7965         #0
+    'D'        // 7966         #3
+    'aA'       // 7967-7968    #0
+    'C'        // 7969         #2
+    'B'        // 796a         #1
+    'C'        // 796b         #2
+    'D'        // 796c         #3
+    'A'        // 796d         #0
+    'aD'       // 796e-796f    #3
+    'aB'       // 7970-7971    #1
+    'C'        // 7972         #2
+    'aB'       // 7973-7974    #1
+    'aD'       // 7975-7976    #3
+    'F'        // 7977         #5
+    'D'        // 7978         #3
+    'aA'       // 7979-797a    #0
+    'F'        // 797b         #5
+    'A'        // 797c         #0
+    'B'        // 797d         #1
+    'C'        // 797e         #2
+    'bA'       // 797f-7981    #0
+    'aB'       // 7982-7983    #1
+    'aF'       // 7984-7985    #5
+    'bB'       // 7986-7988    #1
+    'D'        // 7989         #3
+    'aA'       // 798a-798b    #0
+    'F'        // 798c         #5
+    'bA'       // 798d-798f    #0
+    'B'        // 7990         #1
+    'A'        // 7991         #0
+    'B'        // 7992         #1
+    'C'        // 7993         #2
+    'A'        // 7994         #0
+    'aC'       // 7995-7996    #2
+    'B'        // 7997         #1
+    'C'        // 7998         #2
+    'aB'       // 7999-799a    #1
+    'A'        // 799b         #0
+    'C'        // 799c         #2
+    'A'        // 799d         #0
+    'D'        // 799e         #3
+    'aB'       // 799f-79a0    #1
+    'C'        // 79a1         #2
+    'B'        // 79a2         #1
+    'D'        // 79a3         #3
+    'aB'       // 79a4-79a5    #1
+    'bA'       // 79a6-79a8    #0
+    'C'        // 79a9         #2
+    'aA'       // 79aa-79ab    #0
+    'aB'       // 79ac-79ad    #1
+    'A'        // 79ae         #0
+    'F'        // 79af         #5
+    'aA'       // 79b0-79b1    #0
+    'B'        // 79b2         #1
+    'aA'       // 79b3-79b4    #0
+    'D'        // 79b5         #3
+    'aB'       // 79b6-79b7    #1
+    'cA'       // 79b8-79bb    #0
+    'K'        // 79bc         #10
+    'dA'       // 79bd-79c1    #0
+    'F'        // 79c2         #5
+    'D'        // 79c3         #3
+    'A'        // 79c4         #0
+    'B'        // 79c5         #1
+    'I'        // 79c6         #8
+    'F'        // 79c7         #5
+    'C'        // 79c8         #2
+    'bA'       // 79c9-79cb    #0
+    'aC'       // 79cc-79cd    #2
+    'B'        // 79ce         #1
+    'C'        // 79cf         #2
+    'B'        // 79d0         #1
+    'aA'       // 79d1-79d2    #0
+    'D'        // 79d3         #3
+    'C'        // 79d4         #2
+    'A'        // 79d5         #0
+    'C'        // 79d6         #2
+    'D'        // 79d7         #3
+    'A'        // 79d8         #0
+    'D'        // 79d9         #3
+    'F'        // 79da         #5
+    'D'        // 79db         #3
+    'B'        // 79dc         #1
+    'C'        // 79dd         #2
+    'aA'       // 79de-79df    #0
+    'C'        // 79e0         #2
+    'F'        // 79e1         #5
+    'bA'       // 79e2-79e4    #0
+    'F'        // 79e5         #5
+    'aA'       // 79e6-79e7    #0
+    'D'        // 79e8         #3
+    'cA'       // 79e9-79ec    #0
+    'C'        // 79ed         #2
+    'B'        // 79ee         #1
+    'D'        // 79ef         #3
+    'F'        // 79f0         #5
+    'C'        // 79f1         #2
+    'aD'       // 79f2-79f3    #3
+    'B'        // 79f4         #1
+    'K'        // 79f5         #10
+    'aB'       // 79f6-79f7    #1
+    'A'        // 79f8         #0
+    'D'        // 79f9         #3
+    'B'        // 79fa         #1
+    'A'        // 79fb         #0
+    'F'        // 79fc         #5
+    'bD'       // 79fd-79ff    #3
+    'A'        // 7a00         #0
+    'K'        // 7a01         #10
+    'A'        // 7a02         #0
+    'C'        // 7a03         #2
+    'B'        // 7a04         #1
+    'A'        // 7a05         #0
+    'B'        // 7a06         #1
+    'F'        // 7a07         #5
+    'A'        // 7a08         #0
+    'F'        // 7a09         #5
+    'cA'       // 7a0a-7a0d    #0
+    'C'        // 7a0e         #2
+    'D'        // 7a0f         #3
+    'B'        // 7a10         #1
+    'C'        // 7a11         #2
+    'aB'       // 7a12-7a13    #1
+    'A'        // 7a14         #0
+    'C'        // 7a15         #2
+    'D'        // 7a16         #3
+    'cA'       // 7a17-7a1a    #0
+    'C'        // 7a1b         #2
+    'A'        // 7a1c         #0
+    'D'        // 7a1d         #3
+    'bA'       // 7a1e-7a20    #0
+    'F'        // 7a21         #5
+    'I'        // 7a22         #8
+    'bD'       // 7a23-7a25    #3
+    'B'        // 7a26         #1
+    'J'        // 7a27         #9
+    'B'        // 7a28         #1
+    'D'        // 7a29         #3
+    'B'        // 7a2a         #1
+    'C'        // 7a2b         #2
+    'B'        // 7a2c         #1
+    'C'        // 7a2d         #2
+    'A'        // 7a2e         #0
+    'C'        // 7a2f         #2
+    'aA'       // 7a30-7a31    #0
+    'C'        // 7a32         #2
+    'K'        // 7a33         #10
+    'aF'       // 7a34-7a35    #5
+    'K'        // 7a36         #10
+    'A'        // 7a37         #0
+    'F'        // 7a38         #5
+    'A'        // 7a39         #0
+    'C'        // 7a3a         #2
+    'bA'       // 7a3b-7a3d    #0
+    'C'        // 7a3e         #2
+    'aA'       // 7a3f-7a40    #0
+    'D'        // 7a41         #3
+    'J'        // 7a42         #9
+    'aC'       // 7a43-7a44    #2
+    'aA'       // 7a45-7a46    #0
+    'aC'       // 7a47-7a48    #2
+    'A'        // 7a49         #0
+    'aB'       // 7a4a-7a4b    #1
+    'bA'       // 7a4c-7a4e    #0
+    'aF'       // 7a4f-7a50    #5
+    'bD'       // 7a51-7a53    #3
+    'B'        // 7a54         #1
+    'F'        // 7a55         #5
+    'C'        // 7a56         #2
+    'A'        // 7a57         #0
+    'B'        // 7a58         #1
+    'F'        // 7a59         #5
+    'aB'       // 7a5a-7a5b    #1
+    'C'        // 7a5c         #2
+    'F'        // 7a5d         #5
+    'D'        // 7a5e         #3
+    'C'        // 7a5f         #2
+    'bA'       // 7a60-7a62    #0
+    'F'        // 7a63         #5
+    'D'        // 7a64         #3
+    'C'        // 7a65         #2
+    'K'        // 7a66         #10
+    'C'        // 7a67         #2
+    'B'        // 7a68         #1
+    'A'        // 7a69         #0
+    'F'        // 7a6a         #5
+    'A'        // 7a6b         #0
+    'B'        // 7a6c         #1
+    'C'        // 7a6d         #2
+    'B'        // 7a6e         #1
+    'D'        // 7a6f         #3
+    'A'        // 7a70         #0
+    'aB'       // 7a71-7a72    #1
+    'D'        // 7a73         #3
+    'bA'       // 7a74-7a76    #0
+    'D'        // 7a77         #3
+    'C'        // 7a78         #2
+    'aA'       // 7a79-7a7a    #0
+    'B'        // 7a7b         #1
+    'D'        // 7a7c         #3
+    'dA'       // 7a7d-7a81    #0
+    'J'        // 7a82         #9
+    'cA'       // 7a83-7a86    #0
+    'B'        // 7a87         #1
+    'A'        // 7a88         #0
+    'B'        // 7a89         #1
+    'A'        // 7a8a         #0
+    'C'        // 7a8b         #2
+    'B'        // 7a8c         #1
+    'aD'       // 7a8d-7a8e    #3
+    'B'        // 7a8f         #1
+    'aC'       // 7a90-7a91    #2
+    'aA'       // 7a92-7a93    #0
+    'C'        // 7a94         #2
+    'cA'       // 7a95-7a98    #0
+    'I'        // 7a99         #8
+    'D'        // 7a9a         #3
+    'K'        // 7a9b         #10
+    'aD'       // 7a9c-7a9d    #3
+    'C'        // 7a9e         #2
+    'aA'       // 7a9f-7aa0    #0
+    'D'        // 7aa1         #3
+    'B'        // 7aa2         #1
+    'A'        // 7aa3         #0
+    'cD'       // 7aa4-7aa7    #3
+    'B'        // 7aa8         #1
+    'aA'       // 7aa9-7aaa    #0
+    'B'        // 7aab         #1
+    'A'        // 7aac         #0
+    'D'        // 7aad         #3
+    'aA'       // 7aae-7aaf    #0
+    'C'        // 7ab0         #2
+    'aB'       // 7ab1-7ab2    #1
+    'A'        // 7ab3         #0
+    'B'        // 7ab4         #1
+    'C'        // 7ab5         #2
+    'A'        // 7ab6         #0
+    'aB'       // 7ab7-7ab8    #1
+    'J'        // 7ab9         #9
+    'aA'       // 7aba-7abb    #0
+    'C'        // 7abc         #2
+    'F'        // 7abd         #5
+    'aA'       // 7abe-7abf    #0
+    'bB'       // 7ac0-7ac2    #1
+    'C'        // 7ac3         #2
+    'aA'       // 7ac4-7ac5    #0
+    'F'        // 7ac6         #5
+    'aA'       // 7ac7-7ac8    #0
+    'C'        // 7ac9         #2
+    'aA'       // 7aca-7acb    #0
+    'bF'       // 7acc-7ace    #5
+    'C'        // 7acf         #2
+    'D'        // 7ad0         #3
+    'C'        // 7ad1         #2
+    'F'        // 7ad2         #5
+    'C'        // 7ad3         #2
+    'D'        // 7ad4         #3
+    'F'        // 7ad5         #5
+    'D'        // 7ad6         #3
+    'K'        // 7ad7         #10
+    'B'        // 7ad8         #1
+    'A'        // 7ad9         #0
+    'aC'       // 7ada-7adb    #2
+    'aA'       // 7adc-7add    #0
+    'D'        // 7ade         #3
+    'aA'       // 7adf-7ae0    #0
+    'F'        // 7ae1         #5
+    'aA'       // 7ae2-7ae3    #0
+    'B'        // 7ae4         #1
+    'aA'       // 7ae5-7ae6    #0
+    'C'        // 7ae7         #2
+    'F'        // 7ae8         #5
+    'C'        // 7ae9         #2
+    'A'        // 7aea         #0
+    'C'        // 7aeb         #2
+    'F'        // 7aec         #5
+    'A'        // 7aed         #0
+    'B'        // 7aee         #1
+    'A'        // 7aef         #0
+    'aF'       // 7af0-7af1    #5
+    'aD'       // 7af2-7af3    #3
+    'J'        // 7af4         #9
+    'D'        // 7af5         #3
+    'A'        // 7af6         #0
+    'B'        // 7af7         #1
+    'J'        // 7af8         #9
+    'aA'       // 7af9-7afa    #0
+    'C'        // 7afb         #2
+    'B'        // 7afc         #1
+    'A'        // 7afd         #0
+    'C'        // 7afe         #2
+    'A'        // 7aff         #0
+    'aB'       // 7b00-7b01    #1
+    'F'        // 7b02         #5
+    'D'        // 7b03         #3
+    'C'        // 7b04         #2
+    'B'        // 7b05         #1
+    'A'        // 7b06         #0
+    'F'        // 7b07         #5
+    'A'        // 7b08         #0
+    'B'        // 7b09         #1
+    'A'        // 7b0a         #0
+    'C'        // 7b0b         #2
+    'I'        // 7b0c         #8
+    'D'        // 7b0d         #3
+    'I'        // 7b0e         #8
+    'A'        // 7b0f         #0
+    'B'        // 7b10         #1
+    'aA'       // 7b11-7b12    #0
+    'B'        // 7b13         #1
+    'C'        // 7b14         #2
+    'bD'       // 7b15-7b17    #3
+    'aA'       // 7b18-7b19    #0
+    'B'        // 7b1a         #1
+    'A'        // 7b1b         #0
+    'D'        // 7b1c         #3
+    'B'        // 7b1d         #1
+    'A'        // 7b1e         #0
+    'C'        // 7b1f         #2
+    'A'        // 7b20         #0
+    'D'        // 7b21         #3
+    'B'        // 7b22         #1
+    'C'        // 7b23         #2
+    'B'        // 7b24         #1
+    'cA'       // 7b25-7b28    #0
+    'bC'       // 7b29-7b2b    #2
+    'aA'       // 7b2c-7b2d    #0
+    'C'        // 7b2e         #2
+    'A'        // 7b2f         #0
+    'aC'       // 7b30-7b31    #2
+    'B'        // 7b32         #1
+    'A'        // 7b33         #0
+    'C'        // 7b34         #2
+    'A'        // 7b35         #0
+    'F'        // 7b36         #5
+    'D'        // 7b37         #3
+    'B'        // 7b38         #1
+    'A'        // 7b39         #0
+    'D'        // 7b3a         #3
+    'C'        // 7b3b         #2
+    'D'        // 7b3c         #3
+    'F'        // 7b3d         #5
+    'D'        // 7b3e         #3
+    'F'        // 7b3f         #5
+    'C'        // 7b40         #2
+    'F'        // 7b41         #5
+    'bB'       // 7b42-7b44    #1
+    'aA'       // 7b45-7b46    #0
+    'C'        // 7b47         #2
+    'aA'       // 7b48-7b49    #0
+    'B'        // 7b4a         #1
+    'bA'       // 7b4b-7b4d    #0
+    'C'        // 7b4e         #2
+    'cA'       // 7b4f-7b52    #0
+    'J'        // 7b53         #9
+    'A'        // 7b54         #0
+    'C'        // 7b55         #2
+    'A'        // 7b56         #0
+    'D'        // 7b57         #3
+    'B'        // 7b58         #1
+    'cD'       // 7b59-7b5c    #3
+    'F'        // 7b5d         #5
+    'D'        // 7b5e         #3
+    'K'        // 7b5f         #10
+    'A'        // 7b60         #0
+    'bB'       // 7b61-7b63    #1
+    'C'        // 7b64         #2
+    'bA'       // 7b65-7b67    #0
+    'D'        // 7b68         #3
+    'A'        // 7b69         #0
+    'F'        // 7b6a         #5
+    'D'        // 7b6b         #3
+    'A'        // 7b6c         #0
+    'C'        // 7b6d         #2
+    'A'        // 7b6e         #0
+    'aC'       // 7b6f-7b70    #2
+    'A'        // 7b71         #0
+    'C'        // 7b72         #2
+    'A'        // 7b73         #0
+    'C'        // 7b74         #2
+    'A'        // 7b75         #0
+    'B'        // 7b76         #1
+    'C'        // 7b77         #2
+    'B'        // 7b78         #1
+    'aF'       // 7b79-7b7a    #5
+    'B'        // 7b7b         #1
+    'D'        // 7b7c         #3
+    'K'        // 7b7d         #10
+    'D'        // 7b7e         #3
+    'F'        // 7b7f         #5
+    'aD'       // 7b80-7b81    #3
+    'B'        // 7b82         #1
+    'D'        // 7b83         #3
+    'C'        // 7b84         #2
+    'B'        // 7b85         #1
+    'F'        // 7b86         #5
+    'A'        // 7b87         #0
+    'B'        // 7b88         #1
+    'F'        // 7b89         #5
+    'B'        // 7b8a         #1
+    'A'        // 7b8b         #0
+    'B'        // 7b8c         #1
+    'bA'       // 7b8d-7b8f    #0
+    'aC'       // 7b90-7b91    #2
+    'A'        // 7b92         #0
+    'D'        // 7b93         #3
+    'aA'       // 7b94-7b95    #0
+    'C'        // 7b96         #2
+    'A'        // 7b97         #0
+    'C'        // 7b98         #2
+    'aA'       // 7b99-7b9a    #0
+    'C'        // 7b9b         #2
+    'aA'       // 7b9c-7b9d    #0
+    'aF'       // 7b9e-7b9f    #5
+    'aA'       // 7ba0-7ba1    #0
+    'bB'       // 7ba2-7ba4    #1
+    'F'        // 7ba5         #5
+    'cD'       // 7ba6-7ba9    #3
+    'F'        // 7baa         #5
+    'D'        // 7bab         #3
+    'C'        // 7bac         #2
+    'A'        // 7bad         #0
+    'B'        // 7bae         #1
+    'C'        // 7baf         #2
+    'F'        // 7bb0         #5
+    'A'        // 7bb1         #0
+    'C'        // 7bb2         #2
+    'D'        // 7bb3         #3
+    'A'        // 7bb4         #0
+    'C'        // 7bb5         #2
+    'F'        // 7bb6         #5
+    'B'        // 7bb7         #1
+    'A'        // 7bb8         #0
+    'B'        // 7bb9         #1
+    'cF'       // 7bba-7bbd    #5
+    'I'        // 7bbe         #8
+    'D'        // 7bbf         #3
+    'aA'       // 7bc0-7bc1    #0
+    'F'        // 7bc2         #5
+    'D'        // 7bc3         #3
+    'A'        // 7bc4         #0
+    'C'        // 7bc5         #2
+    'aA'       // 7bc6-7bc7    #0
+    'F'        // 7bc8         #5
+    'cA'       // 7bc9-7bcc    #0
+    'D'        // 7bcd         #3
+    'B'        // 7bce         #1
+    'C'        // 7bcf         #2
+    'B'        // 7bd0         #1
+    'D'        // 7bd1         #3
+    'K'        // 7bd2         #10
+    'D'        // 7bd3         #3
+    'A'        // 7bd4         #0
+    'B'        // 7bd5         #1
+    'aF'       // 7bd6-7bd7    #5
+    'B'        // 7bd8         #1
+    'A'        // 7bd9         #0
+    'C'        // 7bda         #2
+    'A'        // 7bdb         #0
+    'B'        // 7bdc         #1
+    'A'        // 7bdd         #0
+    'aB'       // 7bde-7bdf    #1
+    'A'        // 7be0         #0
+    'I'        // 7be1         #8
+    'aB'       // 7be2-7be3    #1
+    'A'        // 7be4         #0
+    'C'        // 7be5         #2
+    'A'        // 7be6         #0
+    'B'        // 7be7         #1
+    'C'        // 7be8         #2
+    'aA'       // 7be9-7bea    #0
+    'aB'       // 7beb-7bec    #1
+    'F'        // 7bed         #5
+    'aD'       // 7bee-7bef    #3
+    'C'        // 7bf0         #2
+    'B'        // 7bf1         #1
+    'C'        // 7bf2         #2
+    'A'        // 7bf3         #0
+    'C'        // 7bf4         #2
+    'aF'       // 7bf5-7bf6    #5
+    'A'        // 7bf7         #0
+    'bC'       // 7bf8-7bfa    #2
+    'B'        // 7bfb         #1
+    'C'        // 7bfc         #2
+    'B'        // 7bfd         #1
+    'A'        // 7bfe         #0
+    'B'        // 7bff         #1
+    'A'        // 7c00         #0
+    'bC'       // 7c01-7c03    #2
+    'F'        // 7c04         #5
+    'B'        // 7c05         #1
+    'C'        // 7c06         #2
+    'A'        // 7c07         #0
+    'D'        // 7c08         #3
+    'A'        // 7c09         #0
+    'B'        // 7c0a         #1
+    'A'        // 7c0b         #0
+    'bC'       // 7c0c-7c0e    #2
+    'A'        // 7c0f         #0
+    'B'        // 7c10         #1
+    'C'        // 7c11         #2
+    'A'        // 7c12         #0
+    'aF'       // 7c13-7c14    #5
+    'B'        // 7c15         #1
+    'D'        // 7c16         #3
+    'F'        // 7c17         #5
+    'D'        // 7c18         #3
+    'C'        // 7c19         #2
+    'D'        // 7c1a         #3
+    'C'        // 7c1b         #2
+    'aB'       // 7c1c-7c1d    #1
+    'cA'       // 7c1e-7c21    #0
+    'B'        // 7c22         #1
+    'C'        // 7c23         #2
+    'D'        // 7c24         #3
+    'aC'       // 7c25-7c26    #2
+    'A'        // 7c27         #0
+    'C'        // 7c28         #2
+    'B'        // 7c29         #1
+    'aA'       // 7c2a-7c2b    #0
+    'C'        // 7c2c         #2
+    'B'        // 7c2d         #1
+    'D'        // 7c2e         #3
+    'F'        // 7c2f         #5
+    'B'        // 7c30         #1
+    'F'        // 7c31         #5
+    'D'        // 7c32         #3
+    'C'        // 7c33         #2
+    'F'        // 7c34         #5
+    'B'        // 7c35         #1
+    'F'        // 7c36         #5
+    'aA'       // 7c37-7c38    #0
+    'C'        // 7c39         #2
+    'F'        // 7c3a         #5
+    'aB'       // 7c3b-7c3c    #1
+    'bA'       // 7c3d-7c3f    #0
+    'C'        // 7c40         #2
+    'D'        // 7c41         #3
+    'C'        // 7c42         #2
+    'A'        // 7c43         #0
+    'B'        // 7c44         #1
+    'C'        // 7c45         #2
+    'F'        // 7c46         #5
+    'bB'       // 7c47-7c49    #1
+    'C'        // 7c4a         #2
+    'D'        // 7c4b         #3
+    'aA'       // 7c4c-7c4d    #0
+    'D'        // 7c4e         #3
+    'F'        // 7c4f         #5
+    'A'        // 7c50         #0
+    'C'        // 7c51         #2
+    'J'        // 7c52         #9
+    'C'        // 7c53         #2
+    'A'        // 7c54         #0
+    'F'        // 7c55         #5
+    'aC'       // 7c56-7c57    #2
+    'F'        // 7c58         #5
+    'aC'       // 7c59-7c5a    #2
+    'aA'       // 7c5b-7c5c    #0
+    'C'        // 7c5d         #2
+    'F'        // 7c5e         #5
+    'aA'       // 7c5f-7c60    #0
+    'F'        // 7c61         #5
+    'D'        // 7c62         #3
+    'C'        // 7c63         #2
+    'aA'       // 7c64-7c65    #0
+    'B'        // 7c66         #1
+    'A'        // 7c67         #0
+    'D'        // 7c68         #3
+    'A'        // 7c69         #0
+    'aB'       // 7c6a-7c6b    #1
+    'A'        // 7c6c         #0
+    'cC'       // 7c6d-7c70    #2
+    'D'        // 7c71         #3
+    'aA'       // 7c72-7c73    #0
+    'B'        // 7c74         #1
+    'C'        // 7c75         #2
+    'aD'       // 7c76-7c77    #3
+    'B'        // 7c78         #1
+    'C'        // 7c79         #2
+    'B'        // 7c7a         #1
+    'bC'       // 7c7b-7c7d    #2
+    'A'        // 7c7e         #0
+    'aB'       // 7c7f-7c80    #1
+    'A'        // 7c81         #0
+    'F'        // 7c82         #5
+    'A'        // 7c83         #0
+    'aB'       // 7c84-7c85    #1
+    'C'        // 7c86         #2
+    'F'        // 7c87         #5
+    'B'        // 7c88         #1
+    'A'        // 7c89         #0
+    'B'        // 7c8a         #1
+    'F'        // 7c8b         #5
+    'B'        // 7c8c         #1
+    'A'        // 7c8d         #0
+    'B'        // 7c8e         #1
+    'aF'       // 7c8f-7c90    #5
+    'B'        // 7c91         #1
+    'A'        // 7c92         #0
+    'D'        // 7c93         #3
+    'C'        // 7c94         #2
+    'A'        // 7c95         #0
+    'B'        // 7c96         #1
+    'aA'       // 7c97-7c98    #0
+    'aD'       // 7c99-7c9a    #3
+    'F'        // 7c9b         #5
+    'B'        // 7c9c         #1
+    'D'        // 7c9d         #3
+    'C'        // 7c9e         #2
+    'A'        // 7c9f         #0
+    'F'        // 7ca0         #5
+    'C'        // 7ca1         #2
+    'A'        // 7ca2         #0
+    'B'        // 7ca3         #1
+    'J'        // 7ca4         #9
+    'cA'       // 7ca5-7ca8    #0
+    'aD'       // 7ca9-7caa    #3
+    'F'        // 7cab         #5
+    'B'        // 7cac         #1
+    'F'        // 7cad         #5
+    'A'        // 7cae         #0
+    'B'        // 7caf         #1
+    'F'        // 7cb0         #5
+    'bA'       // 7cb1-7cb3    #0
+    'aB'       // 7cb4-7cb5    #1
+    'aF'       // 7cb6-7cb7    #5
+    'B'        // 7cb8         #1
+    'A'        // 7cb9         #0
+    'aC'       // 7cba-7cbb    #2
+    'bA'       // 7cbc-7cbe    #0
+    'C'        // 7cbf         #2
+    'F'        // 7cc0         #5
+    'D'        // 7cc1         #3
+    'C'        // 7cc2         #2
+    'B'        // 7cc3         #1
+    'F'        // 7cc4         #5
+    'A'        // 7cc5         #0
+    'K'        // 7cc6         #10
+    'bC'       // 7cc7-7cc9    #2
+    'A'        // 7cca         #0
+    'aB'       // 7ccb-7ccc    #1
+    'aC'       // 7ccd-7cce    #2
+    'F'        // 7ccf         #5
+    'aB'       // 7cd0-7cd1    #1
+    'bC'       // 7cd2-7cd4    #2
+    'bA'       // 7cd5-7cd7    #0
+    'F'        // 7cd8         #5
+    'aA'       // 7cd9-7cda    #0
+    'D'        // 7cdb         #3
+    'dA'       // 7cdc-7ce0    #0
+    'D'        // 7ce1         #3
+    'A'        // 7ce2         #0
+    'aD'       // 7ce3-7ce4    #3
+    'K'        // 7ce5         #10
+    'C'        // 7ce6         #2
+    'A'        // 7ce7         #0
+    'B'        // 7ce8         #1
+    'F'        // 7ce9         #5
+    'B'        // 7cea         #1
+    'F'        // 7ceb         #5
+    'bB'       // 7cec-7cee    #1
+    'A'        // 7cef         #0
+    'B'        // 7cf0         #1
+    'I'        // 7cf1         #8
+    'A'        // 7cf2         #0
+    'B'        // 7cf3         #1
+    'bA'       // 7cf4-7cf6    #0
+    'B'        // 7cf7         #1
+    'aA'       // 7cf8-7cf9    #0
+    'J'        // 7cfa         #9
+    'A'        // 7cfb         #0
+    'aB'       // 7cfc-7cfd    #1
+    'A'        // 7cfe         #0
+    'D'        // 7cff         #3
+    'A'        // 7d00         #0
+    'B'        // 7d01         #1
+    'fA'       // 7d02-7d08    #0
+    'C'        // 7d09         #2
+    'aA'       // 7d0a-7d0b    #0
+    'B'        // 7d0c         #1
+    'A'        // 7d0d         #0
+    'B'        // 7d0e         #1
+    'C'        // 7d0f         #2
+    'A'        // 7d10         #0
+    'aC'       // 7d11-7d12    #2
+    'bA'       // 7d13-7d15    #0
+    'C'        // 7d16         #2
+    'eA'       // 7d17-7d1c    #0
+    'aC'       // 7d1d-7d1e    #2
+    'B'        // 7d1f         #1
+    'bA'       // 7d20-7d22    #0
+    'F'        // 7d23         #5
+    'D'        // 7d24         #3
+    'B'        // 7d25         #1
+    'F'        // 7d26         #5
+    'D'        // 7d27         #3
+    'aB'       // 7d28-7d29    #1
+    'F'        // 7d2a         #5
+    'aA'       // 7d2b-7d2c    #0
+    'F'        // 7d2d         #5
+    'eA'       // 7d2e-7d33    #0
+    'D'        // 7d34         #3
+    'A'        // 7d35         #0
+    'B'        // 7d36         #1
+    'D'        // 7d37         #3
+    'I'        // 7d38         #8
+    'aA'       // 7d39-7d3a    #0
+    'B'        // 7d3b         #1
+    'dC'       // 7d3c-7d40    #2
+    'eA'       // 7d41-7d46    #0
+    'C'        // 7d47         #2
+    'F'        // 7d48         #5
+    'K'        // 7d49         #10
+    'B'        // 7d4a         #1
+    'F'        // 7d4b         #5
+    'J'        // 7d4c         #9
+    'A'        // 7d4d         #0
+    'aC'       // 7d4e-7d4f    #2
+    'aA'       // 7d50-7d51    #0
+    'B'        // 7d52         #1
+    'C'        // 7d53         #2
+    'B'        // 7d54         #1
+    'aA'       // 7d55-7d56    #0
+    'F'        // 7d57         #5
+    'B'        // 7d58         #1
+    'J'        // 7d59         #9
+    'C'        // 7d5a         #2
+    'aA'       // 7d5b-7d5c    #0
+    'C'        // 7d5d         #2
+    'A'        // 7d5e         #0
+    'B'        // 7d5f         #1
+    'D'        // 7d60         #3
+    'bA'       // 7d61-7d63    #0
+    'D'        // 7d64         #3
+    'F'        // 7d65         #5
+    'A'        // 7d66         #0
+    'C'        // 7d67         #2
+    'A'        // 7d68         #0
+    'I'        // 7d69         #8
+    'A'        // 7d6a         #0
+    'B'        // 7d6b         #1
+    'D'        // 7d6c         #3
+    'B'        // 7d6d         #1
+    'A'        // 7d6e         #0
+    'B'        // 7d6f         #1
+    'cA'       // 7d70-7d73    #0
+    'D'        // 7d74         #3
+    'aJ'       // 7d75-7d76    #9
+    'D'        // 7d77         #3
+    'F'        // 7d78         #5
+    'aA'       // 7d79-7d7a    #0
+    'C'        // 7d7b         #2
+    'B'        // 7d7c         #1
+    'C'        // 7d7d         #2
+    'D'        // 7d7e         #3
+    'A'        // 7d7f         #0
+    'B'        // 7d80         #1
+    'C'        // 7d81         #2
+    'F'        // 7d82         #5
+    'A'        // 7d83         #0
+    'B'        // 7d84         #1
+    'C'        // 7d85         #2
+    'A'        // 7d86         #0
+    'D'        // 7d87         #3
+    'aC'       // 7d88-7d89    #2
+    'D'        // 7d8a         #3
+    'bC'       // 7d8b-7d8d    #2
+    'I'        // 7d8e         #8
+    'A'        // 7d8f         #0
+    'D'        // 7d90         #3
+    'C'        // 7d91         #2
+    'B'        // 7d92         #1
+    'A'        // 7d93         #0
+    'aB'       // 7d94-7d95    #1
+    'aC'       // 7d96-7d97    #2
+    'K'        // 7d98         #10
+    'F'        // 7d99         #5
+    'J'        // 7d9a         #9
+    'F'        // 7d9b         #5
+    'A'        // 7d9c         #0
+    'bC'       // 7d9d-7d9f    #2
+    'A'        // 7da0         #0
+    'B'        // 7da1         #1
+    'aA'       // 7da2-7da3    #0
+    'B'        // 7da4         #1
+    'K'        // 7da5         #10
+    'aA'       // 7da6-7da7    #0
+    'B'        // 7da8         #1
+    'I'        // 7da9         #8
+    'C'        // 7daa         #2
+    'cA'       // 7dab-7dae    #0
+    'C'        // 7daf         #2
+    'bA'       // 7db0-7db2    #0
+    'C'        // 7db3         #2
+    'aA'       // 7db4-7db5    #0
+    'F'        // 7db6         #5
+    'C'        // 7db7         #2
+    'A'        // 7db8         #0
+    'C'        // 7db9         #2
+    'aA'       // 7dba-7dbb    #0
+    'B'        // 7dbc         #1
+    'bA'       // 7dbd-7dbf    #0
+    'C'        // 7dc0         #2
+    'B'        // 7dc1         #1
+    'C'        // 7dc2         #2
+    'F'        // 7dc3         #5
+    'A'        // 7dc4         #0
+    'aC'       // 7dc5-7dc6    #2
+    'A'        // 7dc7         #0
+    'D'        // 7dc8         #3
+    'B'        // 7dc9         #1
+    'cA'       // 7dca-7dcd    #0
+    'C'        // 7dce         #2
+    'A'        // 7dcf         #0
+    'C'        // 7dd0         #2
+    'F'        // 7dd1         #5
+    'C'        // 7dd2         #2
+    'aB'       // 7dd3-7dd4    #1
+    'F'        // 7dd5         #5
+    'J'        // 7dd6         #9
+    'aA'       // 7dd7-7dd8    #0
+    'C'        // 7dd9         #2
+    'A'        // 7dda         #0
+    'B'        // 7ddb         #1
+    'bA'       // 7ddc-7dde    #0
+    'B'        // 7ddf         #1
+    'aA'       // 7de0-7de1    #0
+    'F'        // 7de2         #5
+    'A'        // 7de3         #0
+    'aC'       // 7de4-7de5    #2
+    'A'        // 7de6         #0
+    'B'        // 7de7         #1
+    'aA'       // 7de8-7de9    #0
+    'C'        // 7dea         #2
+    'F'        // 7deb         #5
+    'A'        // 7dec         #0
+    'F'        // 7ded         #5
+    'B'        // 7dee         #1
+    'A'        // 7def         #0
+    'B'        // 7df0         #1
+    'aC'       // 7df1-7df2    #2
+    'B'        // 7df3         #1
+    'A'        // 7df4         #0
+    'C'        // 7df5         #2
+    'A'        // 7df6         #0
+    'B'        // 7df7         #1
+    'D'        // 7df8         #3
+    'A'        // 7df9         #0
+    'C'        // 7dfa         #2
+    'A'        // 7dfb         #0
+    'bB'       // 7dfc-7dfe    #1
+    'D'        // 7dff         #3
+    'aF'       // 7e00-7e01    #5
+    'D'        // 7e02         #3
+    'I'        // 7e03         #8
+    'aF'       // 7e04-7e05    #5
+    'D'        // 7e06         #3
+    'B'        // 7e07         #1
+    'cA'       // 7e08-7e0b    #0
+    'cB'       // 7e0c-7e0f    #1
+    'aA'       // 7e10-7e11    #0
+    'C'        // 7e12         #2
+    'aB'       // 7e13-7e14    #1
+    'A'        // 7e15         #0
+    'B'        // 7e16         #1
+    'A'        // 7e17         #0
+    'K'        // 7e18         #10
+    'D'        // 7e19         #3
+    'B'        // 7e1a         #1
+    'A'        // 7e1b         #0
+    'C'        // 7e1c         #2
+    'fA'       // 7e1d-7e23    #0
+    'aB'       // 7e24-7e25    #1
+    'F'        // 7e26         #5
+    'C'        // 7e27         #2
+    'F'        // 7e28         #5
+    'aB'       // 7e29-7e2a    #1
+    'A'        // 7e2b         #0
+    'F'        // 7e2c         #5
+    'C'        // 7e2d         #2
+    'aA'       // 7e2e-7e2f    #0
+    'B'        // 7e30         #1
+    'bA'       // 7e31-7e33    #0
+    'B'        // 7e34         #1
+    'A'        // 7e35         #0
+    'C'        // 7e36         #2
+    'A'        // 7e37         #0
+    'B'        // 7e38         #1
+    'A'        // 7e39         #0
+    'C'        // 7e3a         #2
+    'A'        // 7e3b         #0
+    'B'        // 7e3c         #1
+    'aA'       // 7e3d-7e3e    #0
+    'C'        // 7e3f         #2
+    'B'        // 7e40         #1
+    'A'        // 7e41         #0
+    'B'        // 7e42         #1
+    'eA'       // 7e43-7e48    #0
+    'B'        // 7e49         #1
+    'aF'       // 7e4a-7e4b    #5
+    'B'        // 7e4c         #1
+    'aF'       // 7e4d-7e4e    #5
+    'D'        // 7e4f         #3
+    'A'        // 7e50         #0
+    'B'        // 7e51         #1
+    'A'        // 7e52         #0
+    'B'        // 7e53         #1
+    'bA'       // 7e54-7e56    #0
+    'I'        // 7e57         #8
+    'C'        // 7e58         #2
+    'aA'       // 7e59-7e5a    #0
+    'aB'       // 7e5b-7e5c    #1
+    'F'        // 7e5d         #5
+    'A'        // 7e5e         #0
+    'C'        // 7e5f         #2
+    'B'        // 7e60         #1
+    'aA'       // 7e61-7e62    #0
+    'B'        // 7e63         #1
+    'D'        // 7e64         #3
+    'C'        // 7e65         #2
+    'F'        // 7e66         #5
+    'C'        // 7e67         #2
+    'B'        // 7e68         #1
+    'bA'       // 7e69-7e6b    #0
+    'B'        // 7e6c         #1
+    'A'        // 7e6d         #0
+    'C'        // 7e6e         #2
+    'aA'       // 7e6f-7e70    #0
+    'D'        // 7e71         #3
+    'B'        // 7e72         #1
+    'C'        // 7e73         #2
+    'B'        // 7e74         #1
+    'C'        // 7e75         #2
+    'I'        // 7e76         #8
+    'B'        // 7e77         #1
+    'C'        // 7e78         #2
+    'A'        // 7e79         #0
+    'B'        // 7e7a         #1
+    'C'        // 7e7b         #2
+    'bA'       // 7e7c-7e7e    #0
+    'C'        // 7e7f         #2
+    'B'        // 7e80         #1
+    'aA'       // 7e81-7e82    #0
+    'F'        // 7e83         #5
+    'aD'       // 7e84-7e85    #3
+    'C'        // 7e86         #2
+    'aA'       // 7e87-7e88    #0
+    'F'        // 7e89         #5
+    'A'        // 7e8a         #0
+    'B'        // 7e8b         #1
+    'aA'       // 7e8c-7e8d    #0
+    'C'        // 7e8e         #2
+    'A'        // 7e8f         #0
+    'F'        // 7e90         #5
+    'aC'       // 7e91-7e92    #2
+    'aA'       // 7e93-7e94    #0
+    'C'        // 7e95         #2
+    'A'        // 7e96         #0
+    'B'        // 7e97         #1
+    'A'        // 7e98         #0
+    'B'        // 7e99         #1
+    'C'        // 7e9a         #2
+    'aA'       // 7e9b-7e9c    #0
+    'aF'       // 7e9d-7e9e    #5
+    'A'        // 7e9f         #0
+    'cD'       // 7ea0-7ea3    #3
+    'B'        // 7ea4         #1
+    'fD'       // 7ea5-7eab    #3
+    'B'        // 7eac         #1
+    'lD'       // 7ead-7eb9    #3
+    'B'        // 7eba         #1
+    'kD'       // 7ebb-7ec6    #3
+    'B'        // 7ec7         #1
+    'fD'       // 7ec8-7ece    #3
+    'B'        // 7ecf         #1
+    'nD'       // 7ed0-7ede    #3
+    'B'        // 7edf         #1
+    '1kD'      // 7ee0-7f05    #3
+    'B'        // 7f06         #1
+    '1tD'      // 7f07-7f35    #3
+    'A'        // 7f36         #0
+    'I'        // 7f37         #8
+    'A'        // 7f38         #0
+    'B'        // 7f39         #1
+    'A'        // 7f3a         #0
+    'aF'       // 7f3b-7f3c    #5
+    'C'        // 7f3d         #2
+    'aA'       // 7f3e-7f3f    #0
+    'aB'       // 7f40-7f41    #1
+    'D'        // 7f42         #3
+    'bA'       // 7f43-7f45    #0
+    'D'        // 7f46         #3
+    'A'        // 7f47         #0
+    'bB'       // 7f48-7f4a    #1
+    'I'        // 7f4b         #8
+    'bA'       // 7f4c-7f4e    #0
+    'C'        // 7f4f         #2
+    'eA'       // 7f50-7f55    #0
+    'aD'       // 7f56-7f57    #3
+    'A'        // 7f58         #0
+    'aD'       // 7f59-7f5a    #3
+    'aC'       // 7f5b-7f5c    #2
+    'A'        // 7f5d         #0
+    'B'        // 7f5e         #1
+    'bA'       // 7f5f-7f61    #0
+    'D'        // 7f62         #3
+    'A'        // 7f63         #0
+    'F'        // 7f64         #5
+    'C'        // 7f65         #2
+    'A'        // 7f66         #0
+    'C'        // 7f67         #2
+    'A'        // 7f68         #0
+    'C'        // 7f69         #2
+    'aA'       // 7f6a-7f6b    #0
+    'B'        // 7f6c         #1
+    'C'        // 7f6d         #2
+    'A'        // 7f6e         #0
+    'D'        // 7f6f         #3
+    'A'        // 7f70         #0
+    'C'        // 7f71         #2
+    'A'        // 7f72         #0
+    'B'        // 7f73         #1
+    'D'        // 7f74         #3
+    'A'        // 7f75         #0
+    'B'        // 7f76         #1
+    'bA'       // 7f77-7f79    #0
+    'aB'       // 7f7a-7f7b    #1
+    'I'        // 7f7c         #8
+    'aA'       // 7f7d-7f7e    #0
+    'C'        // 7f7f         #2
+    'F'        // 7f80         #5
+    'D'        // 7f81         #3
+    'J'        // 7f82         #9
+    'C'        // 7f83         #2
+    'D'        // 7f84         #3
+    'cA'       // 7f85-7f88    #0
+    'B'        // 7f89         #1
+    'A'        // 7f8a         #0
+    'C'        // 7f8b         #2
+    'A'        // 7f8c         #0
+    'C'        // 7f8d         #2
+    'A'        // 7f8e         #0
+    'C'        // 7f8f         #2
+    'F'        // 7f90         #5
+    'C'        // 7f91         #2
+    'aB'       // 7f92-7f93    #1
+    'A'        // 7f94         #0
+    'B'        // 7f95         #1
+    'aA'       // 7f96-7f97    #0
+    'K'        // 7f98         #10
+    'D'        // 7f99         #3
+    'A'        // 7f9a         #0
+    'B'        // 7f9b         #1
+    'C'        // 7f9c         #2
+    'aA'       // 7f9d-7f9e    #0
+    'D'        // 7f9f         #3
+    'B'        // 7fa0         #1
+    'A'        // 7fa1         #0
+    'aC'       // 7fa2-7fa3    #2
+    'A'        // 7fa4         #0
+    'B'        // 7fa5         #1
+    'C'        // 7fa6         #2
+    'B'        // 7fa7         #1
+    'aA'       // 7fa8-7fa9    #0
+    'F'        // 7faa         #5
+    'K'        // 7fab         #10
+    'B'        // 7fac         #1
+    'aC'       // 7fad-7fae    #2
+    'A'        // 7faf         #0
+    'aB'       // 7fb0-7fb1    #1
+    'A'        // 7fb2         #0
+    'B'        // 7fb3         #1
+    'C'        // 7fb4         #2
+    'B'        // 7fb5         #1
+    'A'        // 7fb6         #0
+    'B'        // 7fb7         #1
+    'aA'       // 7fb8-7fb9    #0
+    'aB'       // 7fba-7fbb    #1
+    'C'        // 7fbc         #2
+    'A'        // 7fbd         #0
+    'B'        // 7fbe         #1
+    'A'        // 7fbf         #0
+    'C'        // 7fc0         #2
+    'A'        // 7fc1         #0
+    'B'        // 7fc2         #1
+    'C'        // 7fc3         #2
+    'D'        // 7fc4         #3
+    'A'        // 7fc5         #0
+    'F'        // 7fc6         #5
+    'B'        // 7fc7         #1
+    'F'        // 7fc8         #5
+    'B'        // 7fc9         #1
+    'A'        // 7fca         #0
+    'B'        // 7fcb         #1
+    'A'        // 7fcc         #0
+    'B'        // 7fcd         #1
+    'A'        // 7fce         #0
+    'C'        // 7fcf         #2
+    'aB'       // 7fd0-7fd1    #1
+    'A'        // 7fd2         #0
+    'D'        // 7fd3         #3
+    'aA'       // 7fd4-7fd5    #0
+    'K'        // 7fd6         #10
+    'B'        // 7fd7         #1
+    'bD'       // 7fd8-7fda    #3
+    'A'        // 7fdb         #0
+    'bB'       // 7fdc-7fde    #1
+    'bA'       // 7fdf-7fe1    #0
+    'B'        // 7fe2         #1
+    'A'        // 7fe3         #0
+    'K'        // 7fe4         #10
+    'C'        // 7fe5         #2
+    'A'        // 7fe6         #0
+    'B'        // 7fe7         #1
+    'C'        // 7fe8         #2
+    'A'        // 7fe9         #0
+    'B'        // 7fea         #1
+    'aA'       // 7feb-7fec    #0
+    'B'        // 7fed         #1
+    'A'        // 7fee         #0
+    'C'        // 7fef         #2
+    'A'        // 7ff0         #0
+    'B'        // 7ff1         #1
+    'C'        // 7ff2         #2
+    'A'        // 7ff3         #0
+    'aB'       // 7ff4-7ff5    #1
+    'D'        // 7ff6         #3
+    'aB'       // 7ff7-7ff8    #1
+    'cA'       // 7ff9-7ffc    #0
+    'C'        // 7ffd         #2
+    'A'        // 7ffe         #0
+    'C'        // 7fff         #2
+    'hA'       // 8000-8008    #0
+    'K'        // 8009         #10
+    'F'        // 800a         #5
+    'C'        // 800b         #2
+    'A'        // 800c         #0
+    'bC'       // 800d-800f    #2
+    'bA'       // 8010-8012    #0
+    'F'        // 8013         #5
+    'eA'       // 8014-8019    #0
+    'D'        // 801a         #3
+    'B'        // 801b         #1
+    'aC'       // 801c-801d    #2
+    'A'        // 801e         #0
+    'aC'       // 801f-8020    #2
+    'A'        // 8021         #0
+    'aD'       // 8022-8023    #3
+    'C'        // 8024         #2
+    'B'        // 8025         #1
+    'A'        // 8026         #0
+    'D'        // 8027         #3
+    'A'        // 8028         #0
+    'aB'       // 8029-802a    #1
+    'D'        // 802b         #3
+    'A'        // 802c         #0
+    'K'        // 802d         #10
+    'C'        // 802e         #2
+    'B'        // 802f         #1
+    'A'        // 8030         #0
+    'B'        // 8031         #1
+    'D'        // 8032         #3
+    'A'        // 8033         #0
+    'aC'       // 8034-8035    #2
+    'A'        // 8036         #0
+    'C'        // 8037         #2
+    'D'        // 8038         #3
+    'C'        // 8039         #2
+    'F'        // 803a         #5
+    'aC'       // 803b-803c    #2
+    'A'        // 803d         #0
+    'C'        // 803e         #2
+    'A'        // 803f         #0
+    'F'        // 8040         #5
+    'aD'       // 8041-8042    #3
+    'A'        // 8043         #0
+    'F'        // 8044         #5
+    'D'        // 8045         #3
+    'A'        // 8046         #0
+    'B'        // 8047         #1
+    'I'        // 8048         #8
+    'D'        // 8049         #3
+    'A'        // 804a         #0
+    'cD'       // 804b-804e    #3
+    'bB'       // 804f-8051    #1
+    'A'        // 8052         #0
+    'D'        // 8053         #3
+    'B'        // 8054         #1
+    'K'        // 8055         #10
+    'A'        // 8056         #0
+    'D'        // 8057         #3
+    'A'        // 8058         #0
+    'D'        // 8059         #3
+    'A'        // 805a         #0
+    'bB'       // 805b-805d    #1
+    'A'        // 805e         #0
+    'aF'       // 805f-8060    #5
+    'A'        // 8061         #0
+    'C'        // 8062         #2
+    'B'        // 8063         #1
+    'C'        // 8064         #2
+    'D'        // 8065         #3
+    'C'        // 8066         #2
+    'B'        // 8067         #1
+    'F'        // 8068         #5
+    'bD'       // 8069-806b    #3
+    'B'        // 806c         #1
+    'F'        // 806d         #5
+    'D'        // 806e         #3
+    'dA'       // 806f-8073    #0
+    'F'        // 8074         #5
+    'bA'       // 8075-8077    #0
+    'B'        // 8078         #1
+    'C'        // 8079         #2
+    'D'        // 807a         #3
+    'F'        // 807b         #5
+    'D'        // 807c         #3
+    'cA'       // 807d-8080    #0
+    'F'        // 8081         #5
+    'B'        // 8082         #1
+    'D'        // 8083         #3
+    'cA'       // 8084-8087    #0
+    'F'        // 8088         #5
+    'A'        // 8089         #0
+    'B'        // 808a         #1
+    'aA'       // 808b-808c    #0
+    'D'        // 808d         #3
+    'F'        // 808e         #5
+    'aB'       // 808f-8090    #1
+    'D'        // 8091         #3
+    'B'        // 8092         #1
+    'A'        // 8093         #0
+    'D'        // 8094         #3
+    'B'        // 8095         #1
+    'A'        // 8096         #0
+    'D'        // 8097         #3
+    'A'        // 8098         #0
+    'C'        // 8099         #2
+    'aA'       // 809a-809b    #0
+    'C'        // 809c         #2
+    'A'        // 809d         #0
+    'F'        // 809e         #5
+    'B'        // 809f         #1
+    'D'        // 80a0         #3
+    'aA'       // 80a1-80a2    #0
+    'B'        // 80a3         #1
+    'F'        // 80a4         #5
+    'A'        // 80a5         #0
+    'J'        // 80a6         #9
+    'C'        // 80a7         #2
+    'D'        // 80a8         #3
+    'bA'       // 80a9-80ab    #0
+    'F'        // 80ac         #5
+    'A'        // 80ad         #0
+    'B'        // 80ae         #1
+    'A'        // 80af         #0
+    'D'        // 80b0         #3
+    'aA'       // 80b1-80b2    #0
+    'D'        // 80b3         #3
+    'A'        // 80b4         #0
+    'I'        // 80b5         #8
+    'aB'       // 80b6-80b7    #1
+    'C'        // 80b8         #2
+    'F'        // 80b9         #5
+    'A'        // 80ba         #0
+    'D'        // 80bb         #3
+    'aB'       // 80bc-80bd    #1
+    'cD'       // 80be-80c1    #3
+    'B'        // 80c2         #1
+    'aA'       // 80c3-80c4    #0
+    'C'        // 80c5         #2
+    'A'        // 80c6         #0
+    'B'        // 80c7         #1
+    'C'        // 80c8         #2
+    'B'        // 80c9         #1
+    'A'        // 80ca         #0
+    'D'        // 80cb         #3
+    'A'        // 80cc         #0
+    'C'        // 80cd         #2
+    'A'        // 80ce         #0
+    'C'        // 80cf         #2
+    'aB'       // 80d0-80d1    #1
+    'F'        // 80d2         #5
+    'D'        // 80d3         #3
+    'C'        // 80d4         #2
+    'aA'       // 80d5-80d6    #0
+    'aC'       // 80d7-80d8    #2
+    'bA'       // 80d9-80db    #0
+    'I'        // 80dc         #8
+    'C'        // 80dd         #2
+    'A'        // 80de         #0
+    'D'        // 80df         #3
+    'aA'       // 80e0-80e1    #0
+    'D'        // 80e2         #3
+    'B'        // 80e3         #1
+    'aA'       // 80e4-80e5    #0
+    'C'        // 80e6         #2
+    'aD'       // 80e7-80e8    #3
+    'B'        // 80e9         #1
+    'aD'       // 80ea-80eb    #3
+    'B'        // 80ec         #1
+    'C'        // 80ed         #2
+    'F'        // 80ee         #5
+    'A'        // 80ef         #0
+    'C'        // 80f0         #2
+    'A'        // 80f1         #0
+    'aC'       // 80f2-80f3    #2
+    'A'        // 80f4         #0
+    'aC'       // 80f5-80f6    #2
+    'J'        // 80f7         #9
+    'A'        // 80f8         #0
+    'cC'       // 80f9-80fc    #2
+    'aA'       // 80fd-80fe    #0
+    'D'        // 80ff         #3
+    'B'        // 8100         #1
+    'C'        // 8101         #2
+    'A'        // 8102         #0
+    'C'        // 8103         #2
+    'D'        // 8104         #3
+    'eA'       // 8105-810a    #0
+    'F'        // 810b         #5
+    'B'        // 810c         #1
+    'F'        // 810d         #5
+    'B'        // 810e         #1
+    'bD'       // 810f-8111    #3
+    'B'        // 8112         #1
+    'D'        // 8113         #3
+    'aB'       // 8114-8115    #1
+    'bA'       // 8116-8118    #0
+    'B'        // 8119         #1
+    'aA'       // 811a-811b    #0
+    'F'        // 811c         #5
+    'B'        // 811d         #1
+    'C'        // 811e         #2
+    'B'        // 811f         #1
+    'F'        // 8120         #5
+    'aB'       // 8121-8122    #1
+    'aA'       // 8123-8124    #0
+    'B'        // 8125         #1
+    'D'        // 8126         #3
+    'A'        // 8127         #0
+    'D'        // 8128         #3
+    'A'        // 8129         #0
+    'B'        // 812a         #1
+    'A'        // 812b         #0
+    'C'        // 812c         #2
+    'B'        // 812d         #1
+    'D'        // 812e         #3
+    'aA'       // 812f-8130    #0
+    'C'        // 8131         #2
+    'B'        // 8132         #1
+    'F'        // 8133         #5
+    'B'        // 8134         #1
+    'F'        // 8135         #5
+    'D'        // 8136         #3
+    'B'        // 8137         #1
+    'D'        // 8138         #3
+    'aA'       // 8139-813a    #0
+    'D'        // 813b         #3
+    'F'        // 813c         #5
+    'C'        // 813d         #2
+    'A'        // 813e         #0
+    'aD'       // 813f-8140    #3
+    'J'        // 8141         #9
+    'bB'       // 8142-8144    #1
+    'F'        // 8145         #5
+    'A'        // 8146         #0
+    'C'        // 8147         #2
+    'B'        // 8148         #1
+    'D'        // 8149         #3
+    'aA'       // 814a-814b    #0
+    'C'        // 814c         #2
+    'B'        // 814d         #1
+    'A'        // 814e         #0
+    'B'        // 814f         #1
+    'eA'       // 8150-8155    #0
+    'B'        // 8156         #1
+    'F'        // 8157         #5
+    'D'        // 8158         #3
+    'cB'       // 8159-815c    #1
+    'D'        // 815d         #3
+    'B'        // 815e         #1
+    'F'        // 815f         #5
+    'A'        // 8160         #0
+    'C'        // 8161         #2
+    'B'        // 8162         #1
+    'D'        // 8163         #3
+    'I'        // 8164         #8
+    'aA'       // 8165-8166    #0
+    'C'        // 8167         #2
+    'F'        // 8168         #5
+    'C'        // 8169         #2
+    'D'        // 816a         #3
+    'A'        // 816b         #0
+    'B'        // 816c         #1
+    'A'        // 816d         #0
+    'aC'       // 816e-816f    #2
+    'aA'       // 8170-8171    #0
+    'B'        // 8172         #1
+    'C'        // 8173         #2
+    'A'        // 8174         #0
+    'D'        // 8175         #3
+    'I'        // 8176         #8
+    'cA'       // 8177-817a    #0
+    'D'        // 817b         #3
+    'aB'       // 817c-817d    #1
+    'D'        // 817e         #3
+    'aA'       // 817f-8180    #0
+    'F'        // 8181         #5
+    'bA'       // 8182-8184    #0
+    'F'        // 8185         #5
+    'A'        // 8186         #0
+    'B'        // 8187         #1
+    'A'        // 8188         #0
+    'B'        // 8189         #1
+    'aA'       // 818a-818b    #0
+    'aB'       // 818c-818d    #1
+    'F'        // 818e         #5
+    'A'        // 818f         #0
+    'F'        // 8190         #5
+    'aD'       // 8191-8192    #3
+    'C'        // 8193         #2
+    'D'        // 8194         #3
+    'C'        // 8195         #2
+    'F'        // 8196         #5
+    'B'        // 8197         #1
+    'C'        // 8198         #2
+    'B'        // 8199         #1
+    'A'        // 819a         #0
+    'C'        // 819b         #2
+    'bA'       // 819c-819e    #0
+    'B'        // 819f         #1
+    'A'        // 81a0         #0
+    'D'        // 81a1         #3
+    'C'        // 81a2         #2
+    'A'        // 81a3         #0
+    'F'        // 81a4         #5
+    'bB'       // 81a5-81a7    #1
+    'aA'       // 81a8-81a9    #0
+    'bB'       // 81aa-81ac    #1
+    'D'        // 81ad         #3
+    'C'        // 81ae         #2
+    'D'        // 81af         #3
+    'A'        // 81b0         #0
+    'B'        // 81b1         #1
+    'C'        // 81b2         #2
+    'bA'       // 81b3-81b5    #0
+    'aB'       // 81b6-81b7    #1
+    'J'        // 81b8         #9
+    'I'        // 81b9         #8
+    'A'        // 81ba         #0
+    'C'        // 81bb         #2
+    'B'        // 81bc         #1
+    'cA'       // 81bd-81c0    #0
+    'C'        // 81c1         #2
+    'A'        // 81c2         #0
+    'C'        // 81c3         #2
+    'B'        // 81c4         #1
+    'C'        // 81c5         #2
+    'A'        // 81c6         #0
+    'B'        // 81c7         #1
+    'aC'       // 81c8-81c9    #2
+    'A'        // 81ca         #0
+    'F'        // 81cb         #5
+    'B'        // 81cc         #1
+    'A'        // 81cd         #0
+    'F'        // 81ce         #5
+    'A'        // 81cf         #0
+    'B'        // 81d0         #1
+    'A'        // 81d1         #0
+    'B'        // 81d2         #1
+    'F'        // 81d3         #5
+    'D'        // 81d4         #3
+    'C'        // 81d5         #2
+    'F'        // 81d6         #5
+    'C'        // 81d7         #2
+    'bA'       // 81d8-81da    #0
+    'C'        // 81db         #2
+    'D'        // 81dc         #3
+    'A'        // 81dd         #0
+    'C'        // 81de         #2
+    'aA'       // 81df-81e0    #0
+    'C'        // 81e1         #2
+    'B'        // 81e2         #1
+    'A'        // 81e3         #0
+    'C'        // 81e4         #2
+    'A'        // 81e5         #0
+    'B'        // 81e6         #1
+    'aA'       // 81e7-81e8    #0
+    'B'        // 81e9         #1
+    'A'        // 81ea         #0
+    'F'        // 81eb         #5
+    'aA'       // 81ec-81ed    #0
+    'B'        // 81ee         #1
+    'C'        // 81ef         #2
+    'aF'       // 81f0-81f1    #5
+    'C'        // 81f2         #2
+    'aA'       // 81f3-81f4    #0
+    'F'        // 81f5         #5
+    'A'        // 81f6         #0
+    'B'        // 81f7         #1
+    'aC'       // 81f8-81f9    #2
+    'bA'       // 81fa-81fc    #0
+    'F'        // 81fd         #5
+    'A'        // 81fe         #0
+    'aC'       // 81ff-8200    #2
+    'aA'       // 8201-8202    #0
+    'J'        // 8203         #9
+    'C'        // 8204         #2
+    'A'        // 8205         #0
+    'D'        // 8206         #3
+    'aA'       // 8207-8208    #0
+    'C'        // 8209         #2
+    'A'        // 820a         #0
+    'C'        // 820b         #2
+    'aA'       // 820c-820d    #0
+    'aF'       // 820e-820f    #5
+    'A'        // 8210         #0
+    'B'        // 8211         #1
+    'A'        // 8212         #0
+    'F'        // 8213         #5
+    'C'        // 8214         #2
+    'B'        // 8215         #1
+    'A'        // 8216         #0
+    'F'        // 8217         #5
+    'A'        // 8218         #0
+    'F'        // 8219         #5
+    'C'        // 821a         #2
+    'aA'       // 821b-821c    #0
+    'C'        // 821d         #2
+    'aA'       // 821e-821f    #0
+    'B'        // 8220         #1
+    'A'        // 8221         #0
+    'C'        // 8222         #2
+    'aD'       // 8223-8224    #3
+    'aB'       // 8225-8226    #1
+    'D'        // 8227         #3
+    'aC'       // 8228-8229    #2
+    'bA'       // 822a-822c    #0
+    'B'        // 822d         #1
+    'F'        // 822e         #5
+    'B'        // 822f         #1
+    'aD'       // 8230-8231    #3
+    'C'        // 8232         #2
+    'A'        // 8233         #0
+    'C'        // 8234         #2
+    'dA'       // 8235-8239    #0
+    'C'        // 823a         #2
+    'D'        // 823b         #3
+    'C'        // 823c         #2
+    'I'        // 823d         #8
+    'aB'       // 823e-823f    #1
+    'A'        // 8240         #0
+    'D'        // 8241         #3
+    'B'        // 8242         #1
+    'F'        // 8243         #5
+    'C'        // 8244         #2
+    'A'        // 8245         #0
+    'F'        // 8246         #5
+    'A'        // 8247         #0
+    'D'        // 8248         #3
+    'C'        // 8249         #2
+    'D'        // 824a         #3
+    'C'        // 824b         #2
+    'aD'       // 824c-824d    #3
+    'aC'       // 824e-824f    #2
+    'B'        // 8250         #1
+    'A'        // 8251         #0
+    'cB'       // 8252-8255    #1
+    'aC'       // 8256-8257    #2
+    'bA'       // 8258-825a    #0
+    'B'        // 825b         #1
+    'C'        // 825c         #2
+    'F'        // 825d         #5
+    'B'        // 825e         #1
+    'A'        // 825f         #0
+    'F'        // 8260         #5
+    'B'        // 8261         #1
+    'aC'       // 8262-8263    #2
+    'A'        // 8264         #0
+    'B'        // 8265         #1
+    'A'        // 8266         #0
+    'F'        // 8267         #5
+    'A'        // 8268         #0
+    'B'        // 8269         #1
+    'J'        // 826a         #9
+    'A'        // 826b         #0
+    'B'        // 826c         #1
+    'C'        // 826d         #2
+    'aA'       // 826e-826f    #0
+    'D'        // 8270         #3
+    'aA'       // 8271-8272    #0
+    'D'        // 8273         #3
+    'A'        // 8274         #0
+    'B'        // 8275         #1
+    'cA'       // 8276-8279    #0
+    'B'        // 827a         #1
+    'C'        // 827b         #2
+    'B'        // 827c         #1
+    'aA'       // 827d-827e    #0
+    'aC'       // 827f-8280    #2
+    'F'        // 8281         #5
+    'D'        // 8282         #3
+    'A'        // 8283         #0
+    'C'        // 8284         #2
+    'B'        // 8285         #1
+    'D'        // 8286         #3
+    'C'        // 8287         #2
+    'D'        // 8288         #3
+    'F'        // 8289         #5
+    'aA'       // 828a-828b    #0
+    'D'        // 828c         #3
+    'aA'       // 828d-828e    #0
+    'B'        // 828f         #1
+    'I'        // 8290         #8
+    'C'        // 8291         #2
+    'A'        // 8292         #0
+    'C'        // 8293         #2
+    'A'        // 8294         #0
+    'D'        // 8295         #3
+    'F'        // 8296         #5
+    'D'        // 8297         #3
+    'bA'       // 8298-829a    #0
+    'C'        // 829b         #2
+    'D'        // 829c         #3
+    'A'        // 829d         #0
+    'B'        // 829e         #1
+    'A'        // 829f         #0
+    'C'        // 82a0         #2
+    'A'        // 82a1         #0
+    'I'        // 82a2         #8
+    'A'        // 82a3         #0
+    'C'        // 82a4         #2
+    'lA'       // 82a5-82b1    #0
+    'F'        // 82b2         #5
+    'A'        // 82b3         #0
+    'C'        // 82b4         #2
+    'aB'       // 82b5-82b6    #1
+    'bA'       // 82b7-82b9    #0
+    'C'        // 82ba         #2
+    'dA'       // 82bb-82bf    #0
+    'B'        // 82c0         #1
+    'D'        // 82c1         #3
+    'bB'       // 82c2-82c4    #1
+    'J'        // 82c5         #9
+    'F'        // 82c6         #5
+    'bD'       // 82c7-82c9    #3
+    'B'        // 82ca         #1
+    'cD'       // 82cb-82ce    #3
+    'B'        // 82cf         #1
+    'C'        // 82d0         #2
+    'dA'       // 82d1-82d5    #0
+    'B'        // 82d6         #1
+    'A'        // 82d7         #0
+    'B'        // 82d8         #1
+    'C'        // 82d9         #2
+    'F'        // 82da         #5
+    'aA'       // 82db-82dc    #0
+    'D'        // 82dd         #3
+    'cA'       // 82de-82e1    #0
+    'C'        // 82e2         #2
+    'A'        // 82e3         #0
+    'C'        // 82e4         #2
+    'bA'       // 82e5-82e7    #0
+    'C'        // 82e8         #2
+    'K'        // 82e9         #10
+    'C'        // 82ea         #2
+    'A'        // 82eb         #0
+    'B'        // 82ec         #1
+    'C'        // 82ed         #2
+    'B'        // 82ee         #1
+    'C'        // 82ef         #2
+    'B'        // 82f0         #1
+    'A'        // 82f1         #0
+    'B'        // 82f2         #1
+    'aA'       // 82f3-82f4    #0
+    'B'        // 82f5         #1
+    'aC'       // 82f6-82f7    #2
+    'B'        // 82f8         #1
+    'bA'       // 82f9-82fb    #0
+    'B'        // 82fc         #1
+    'aA'       // 82fd-82fe    #0
+    'I'        // 82ff         #8
+    'eA'       // 8300-8305    #0
+    'aC'       // 8306-8307    #2
+    'aA'       // 8308-8309    #0
+    'F'        // 830a         #5
+    'aC'       // 830b-830c    #2
+    'B'        // 830d         #1
+    'F'        // 830e         #5
+    'fD'       // 830f-8315    #3
+    'C'        // 8316         #2
+    'A'        // 8317         #0
+    'C'        // 8318         #2
+    'aB'       // 8319-831a    #1
+    'bA'       // 831b-831d    #0
+    'C'        // 831e         #2
+    'F'        // 831f         #5
+    'B'        // 8320         #1
+    'F'        // 8321         #5
+    'C'        // 8322         #2
+    'J'        // 8323         #9
+    'aI'       // 8324-8325    #8
+    'aB'       // 8326-8327    #1
+    'A'        // 8328         #0
+    'B'        // 8329         #1
+    'I'        // 832a         #8
+    'A'        // 832b         #0
+    'aC'       // 832c-832d    #2
+    'F'        // 832e         #5
+    'A'        // 832f         #0
+    'F'        // 8330         #5
+    'eA'       // 8331-8336    #0
+    'C'        // 8337         #2
+    'aA'       // 8338-8339    #0
+    'C'        // 833a         #2
+    'B'        // 833b         #1
+    'A'        // 833c         #0
+    'C'        // 833d         #2
+    'D'        // 833e         #3
+    'B'        // 833f         #1
+    'A'        // 8340         #0
+    'B'        // 8341         #1
+    'C'        // 8342         #2
+    'A'        // 8343         #0
+    'aC'       // 8344-8345    #2
+    'F'        // 8346         #5
+    'A'        // 8347         #0
+    'B'        // 8348         #1
+    'aA'       // 8349-834a    #0
+    'aB'       // 834b-834c    #1
+    'aC'       // 834d-834e    #2
+    'cA'       // 834f-8352    #0
+    'aC'       // 8353-8354    #2
+    'F'        // 8355         #5
+    'aC'       // 8356-8357    #2
+    'F'        // 8358         #5
+    'D'        // 8359         #3
+    'F'        // 835a         #5
+    'fD'       // 835b-8361    #3
+    'C'        // 8362         #2
+    'A'        // 8363         #0
+    'aD'       // 8364-8365    #3
+    'B'        // 8366         #1
+    'gD'       // 8367-836e    #3
+    'B'        // 836f         #1
+    'F'        // 8370         #5
+    'aD'       // 8371-8372    #3
+    'A'        // 8373         #0
+    'B'        // 8374         #1
+    'C'        // 8375         #2
+    'B'        // 8376         #1
+    'A'        // 8377         #0
+    'C'        // 8378         #2
+    'D'        // 8379         #3
+    'I'        // 837a         #8
+    'A'        // 837b         #0
+    'aC'       // 837c-837d    #2
+    'B'        // 837e         #1
+    'C'        // 837f         #2
+    'F'        // 8380         #5
+    'B'        // 8381         #1
+    'J'        // 8382         #9
+    'B'        // 8383         #1
+    'F'        // 8384         #5
+    'A'        // 8385         #0
+    'aC'       // 8386-8387    #2
+    'B'        // 8388         #1
+    'aA'       // 8389-838a    #0
+    'aB'       // 838b-838c    #1
+    'C'        // 838d         #2
+    'A'        // 838e         #0
+    'bB'       // 838f-8391    #1
+    'aA'       // 8392-8393    #0
+    'aC'       // 8394-8395    #2
+    'A'        // 8396         #0
+    'B'        // 8397         #1
+    'A'        // 8398         #0
+    'C'        // 8399         #2
+    'aA'       // 839a-839b    #0
+    'C'        // 839c         #2
+    'aA'       // 839d-839e    #0
+    'J'        // 839f         #9
+    'A'        // 83a0         #0
+    'D'        // 83a1         #3
+    'A'        // 83a2         #0
+    'bB'       // 83a3-83a5    #1
+    'aC'       // 83a6-83a7    #2
+    'cA'       // 83a8-83ab    #0
+    'C'        // 83ac         #2
+    'F'        // 83ad         #5
+    'bB'       // 83ae-83b0    #1
+    'F'        // 83b1         #5
+    'bD'       // 83b2-83b4    #3
+    'F'        // 83b5         #5
+    'bD'       // 83b6-83b8    #3
+    'B'        // 83b9         #1
+    'bD'       // 83ba-83bc    #3
+    'dA'       // 83bd-83c1    #0
+    'I'        // 83c2         #8
+    'aB'       // 83c3-83c4    #1
+    'A'        // 83c5         #0
+    'B'        // 83c6         #1
+    'C'        // 83c7         #2
+    'B'        // 83c8         #1
+    'aA'       // 83c9-83ca    #0
+    'B'        // 83cb         #1
+    'A'        // 83cc         #0
+    'B'        // 83cd         #1
+    'aC'       // 83ce-83cf    #2
+    'F'        // 83d0         #5
+    'A'        // 83d1         #0
+    'D'        // 83d2         #3
+    'aA'       // 83d3-83d4    #0
+    'B'        // 83d5         #1
+    'A'        // 83d6         #0
+    'B'        // 83d7         #1
+    'A'        // 83d8         #0
+    'B'        // 83d9         #1
+    'D'        // 83da         #3
+    'B'        // 83db         #1
+    'A'        // 83dc         #0
+    'C'        // 83dd         #2
+    'B'        // 83de         #1
+    'bA'       // 83df-83e1    #0
+    'bB'       // 83e2-83e4    #1
+    'C'        // 83e5         #2
+    'D'        // 83e6         #3
+    'B'        // 83e7         #1
+    'C'        // 83e8         #2
+    'A'        // 83e9         #0
+    'C'        // 83ea         #2
+    'A'        // 83eb         #0
+    'bB'       // 83ec-83ee    #1
+    'cA'       // 83ef-83f2    #0
+    'B'        // 83f3         #1
+    'A'        // 83f4         #0
+    'B'        // 83f5         #1
+    'A'        // 83f6         #0
+    'F'        // 83f7         #5
+    'C'        // 83f8         #2
+    'A'        // 83f9         #0
+    'B'        // 83fa         #1
+    'A'        // 83fb         #0
+    'C'        // 83fc         #2
+    'A'        // 83fd         #0
+    'aB'       // 83fe-83ff    #1
+    'D'        // 8400         #3
+    'C'        // 8401         #2
+    'D'        // 8402         #3
+    'aA'       // 8403-8404    #0
+    'B'        // 8405         #1
+    'aA'       // 8406-8407    #0
+    'D'        // 8408         #3
+    'B'        // 8409         #1
+    'dA'       // 840a-840e    #0
+    'C'        // 840f         #2
+    'B'        // 8410         #1
+    'C'        // 8411         #2
+    'B'        // 8412         #1
+    'C'        // 8413         #2
+    'B'        // 8414         #1
+    'F'        // 8415         #5
+    'B'        // 8416         #1
+    'F'        // 8417         #5
+    'B'        // 8418         #1
+    'F'        // 8419         #5
+    'D'        // 841a         #3
+    'aB'       // 841b-841c    #1
+    'bD'       // 841d-841f    #3
+    'C'        // 8420         #2
+    'B'        // 8421         #1
+    'F'        // 8422         #5
+    'aB'       // 8423-8424    #1
+    'D'        // 8425         #3
+    'B'        // 8426         #1
+    'aD'       // 8427-8428    #3
+    'A'        // 8429         #0
+    'F'        // 842a         #5
+    'B'        // 842b         #1
+    'A'        // 842c         #0
+    'aB'       // 842d-842e    #1
+    'C'        // 842f         #2
+    'B'        // 8430         #1
+    'A'        // 8431         #0
+    'bB'       // 8432-8434    #1
+    'A'        // 8435         #0
+    'aB'       // 8436-8437    #1
+    'aA'       // 8438-8439    #0
+    'aB'       // 843a-843b    #1
+    'aA'       // 843c-843d    #0
+    'bB'       // 843e-8440    #1
+    'D'        // 8441         #3
+    'bB'       // 8442-8444    #1
+    'C'        // 8445         #2
+    'A'        // 8446         #0
+    'aC'       // 8447-8448    #2
+    'aA'       // 8449-844a    #0
+    'aB'       // 844b-844c    #1
+    'aC'       // 844d-844e    #2
+    'F'        // 844f         #5
+    'B'        // 8450         #1
+    'A'        // 8451         #0
+    'C'        // 8452         #2
+    'bB'       // 8453-8455    #1
+    'C'        // 8456         #2
+    'A'        // 8457         #0
+    'aC'       // 8458-8459    #2
+    'aA'       // 845a-845b    #0
+    'C'        // 845c         #2
+    'aB'       // 845d-845e    #1
+    'aC'       // 845f-8460    #2
+    'A'        // 8461         #0
+    'C'        // 8462         #2
+    'A'        // 8463         #0
+    'aC'       // 8464-8465    #2
+    'A'        // 8466         #0
+    'C'        // 8467         #2
+    'B'        // 8468         #1
+    'A'        // 8469         #0
+    'J'        // 846a         #9
+    'bA'       // 846b-846d    #0
+    'C'        // 846e         #2
+    'bA'       // 846f-8471    #0
+    'B'        // 8472         #1
+    'A'        // 8473         #0
+    'C'        // 8474         #2
+    'A'        // 8475         #0
+    'C'        // 8476         #2
+    'A'        // 8477         #0
+    'aC'       // 8478-8479    #2
+    'A'        // 847a         #0
+    'D'        // 847b         #3
+    'F'        // 847c         #5
+    'C'        // 847d         #2
+    'bB'       // 847e-8480    #1
+    'F'        // 8481         #5
+    'A'        // 8482         #0
+    'D'        // 8483         #3
+    'C'        // 8484         #2
+    'F'        // 8485         #5
+    'B'        // 8486         #1
+    'D'        // 8487         #3
+    'B'        // 8488         #1
+    'aD'       // 8489-848a    #3
+    'F'        // 848b         #5
+    'D'        // 848c         #3
+    'bB'       // 848d-848f    #1
+    'A'        // 8490         #0
+    'I'        // 8491         #8
+    'aC'       // 8492-8493    #2
+    'A'        // 8494         #0
+    'F'        // 8495         #5
+    'B'        // 8496         #1
+    'C'        // 8497         #2
+    'B'        // 8498         #1
+    'A'        // 8499         #0
+    'aB'       // 849a-849b    #1
+    'A'        // 849c         #0
+    'B'        // 849d         #1
+    'C'        // 849e         #2
+    'A'        // 849f         #0
+    'B'        // 84a0         #1
+    'A'        // 84a1         #0
+    'bB'       // 84a2-84a4    #1
+    'D'        // 84a5         #3
+    'F'        // 84a6         #5
+    'B'        // 84a7         #1
+    'A'        // 84a8         #0
+    'aC'       // 84a9-84aa    #2
+    'aB'       // 84ab-84ac    #1
+    'A'        // 84ad         #0
+    'B'        // 84ae         #1
+    'A'        // 84af         #0
+    'B'        // 84b0         #1
+    'C'        // 84b1         #2
+    'A'        // 84b2         #0
+    'D'        // 84b3         #3
+    'A'        // 84b4         #0
+    'D'        // 84b5         #3
+    'B'        // 84b6         #1
+    'D'        // 84b7         #3
+    'eA'       // 84b8-84bd    #0
+    'C'        // 84be         #2
+    'cA'       // 84bf-84c2    #0
+    'D'        // 84c3         #3
+    'A'        // 84c4         #0
+    'B'        // 84c5         #1
+    'A'        // 84c6         #0
+    'C'        // 84c7         #2
+    'F'        // 84c8         #5
+    'bA'       // 84c9-84cb    #0
+    'C'        // 84cc         #2
+    'A'        // 84cd         #0
+    'C'        // 84ce         #2
+    'bA'       // 84cf-84d1    #0
+    'B'        // 84d2         #1
+    'A'        // 84d3         #0
+    'B'        // 84d4         #1
+    'D'        // 84d5         #3
+    'A'        // 84d6         #0
+    'B'        // 84d7         #1
+    'D'        // 84d8         #3
+    'F'        // 84d9         #5
+    'A'        // 84da         #0
+    'B'        // 84db         #1
+    'F'        // 84dc         #5
+    'D'        // 84dd         #3
+    'B'        // 84de         #1
+    'aD'       // 84df-84e0    #3
+    'aB'       // 84e1-84e2    #1
+    'D'        // 84e3         #3
+    'aB'       // 84e4-84e5    #1
+    'D'        // 84e6         #3
+    'C'        // 84e7         #2
+    'aB'       // 84e8-84e9    #1
+    'C'        // 84ea         #2
+    'B'        // 84eb         #1
+    'A'        // 84ec         #0
+    'K'        // 84ed         #10
+    'aA'       // 84ee-84ef    #0
+    'C'        // 84f0         #2
+    'A'        // 84f1         #0
+    'C'        // 84f2         #2
+    'B'        // 84f3         #1
+    'A'        // 84f4         #0
+    'D'        // 84f5         #3
+    'B'        // 84f6         #1
+    'C'        // 84f7         #2
+    'aB'       // 84f8-84f9    #1
+    'A'        // 84fa         #0
+    'C'        // 84fb         #2
+    'aA'       // 84fc-84fd    #0
+    'B'        // 84fe         #1
+    'C'        // 84ff         #2
+    'A'        // 8500         #0
+    'D'        // 8501         #3
+    'aC'       // 8502-8503    #2
+    'aB'       // 8504-8505    #1
+    'A'        // 8506         #0
+    'C'        // 8507         #2
+    'cB'       // 8508-850b    #1
+    'C'        // 850c         #2
+    'B'        // 850d         #1
+    'A'        // 850e         #0
+    'B'        // 850f         #1
+    'C'        // 8510         #2
+    'A'        // 8511         #0
+    'B'        // 8512         #1
+    'bA'       // 8513-8515    #0
+    'B'        // 8516         #1
+    'aA'       // 8517-8518    #0
+    'B'        // 8519         #1
+    'A'        // 851a         #0
+    'F'        // 851b         #5
+    'C'        // 851c         #2
+    'B'        // 851d         #1
+    'aA'       // 851e-851f    #0
+    'B'        // 8520         #1
+    'A'        // 8521         #0
+    'F'        // 8522         #5
+    'A'        // 8523         #0
+    'C'        // 8524         #2
+    'aA'       // 8525-8526    #0
+    'C'        // 8527         #2
+    'aB'       // 8528-8529    #1
+    'A'        // 852a         #0
+    'C'        // 852b         #2
+    'aA'       // 852c-852d    #0
+    'B'        // 852e         #1
+    'A'        // 852f         #0
+    'I'        // 8530         #8
+    'B'        // 8531         #1
+    'F'        // 8532         #5
+    'aC'       // 8533-8534    #2
+    'aF'       // 8535-8536    #5
+    'D'        // 8537         #3
+    'B'        // 8538         #1
+    'aD'       // 8539-853a    #3
+    'B'        // 853b         #1
+    'D'        // 853c         #3
+    'A'        // 853d         #0
+    'C'        // 853e         #2
+    'J'        // 853f         #9
+    'C'        // 8540         #2
+    'A'        // 8541         #0
+    'B'        // 8542         #1
+    'A'        // 8543         #0
+    'aB'       // 8544-8545    #1
+    'A'        // 8546         #0
+    'B'        // 8547         #1
+    'C'        // 8548         #2
+    'bA'       // 8549-854b    #0
+    'aB'       // 854c-854d    #1
+    'A'        // 854e         #0
+    'aF'       // 854f-8550    #5
+    'aC'       // 8551-8552    #2
+    'A'        // 8553         #0
+    'B'        // 8554         #1
+    'dA'       // 8555-8559    #0
+    'C'        // 855a         #2
+    'B'        // 855b         #1
+    'F'        // 855c         #5
+    'C'        // 855d         #2
+    'A'        // 855e         #0
+    'aC'       // 855f-8560    #2
+    'A'        // 8561         #0
+    'C'        // 8562         #2
+    'aA'       // 8563-8564    #0
+    'bB'       // 8565-8567    #1
+    'cA'       // 8568-856b    #0
+    'B'        // 856c         #1
+    'A'        // 856d         #0
+    'B'        // 856e         #1
+    'C'        // 856f         #2
+    'aB'       // 8570-8571    #1
+    'D'        // 8572         #3
+    'B'        // 8573         #1
+    'D'        // 8574         #3
+    'aB'       // 8575-8576    #1
+    'C'        // 8577         #2
+    'I'        // 8578         #8
+    'C'        // 8579         #2
+    'A'        // 857a         #0
+    'C'        // 857b         #2
+    'B'        // 857c         #1
+    'F'        // 857d         #5
+    'A'        // 857e         #0
+    'F'        // 857f         #5
+    'A'        // 8580         #0
+    'C'        // 8581         #2
+    'aB'       // 8582-8583    #1
+    'A'        // 8584         #0
+    'C'        // 8585         #2
+    'aA'       // 8586-8587    #0
+    'C'        // 8588         #2
+    'aA'       // 8589-858a    #0
+    'C'        // 858b         #2
+    'A'        // 858c         #0
+    'aB'       // 858d-858e    #1
+    'A'        // 858f         #0
+    'C'        // 8590         #2
+    'A'        // 8591         #0
+    'D'        // 8592         #3
+    'C'        // 8593         #2
+    'A'        // 8594         #0
+    'aB'       // 8595-8596    #1
+    'A'        // 8597         #0
+    'C'        // 8598         #2
+    'A'        // 8599         #0
+    'B'        // 859a         #1
+    'A'        // 859b         #0
+    'C'        // 859c         #2
+    'A'        // 859d         #0
+    'B'        // 859e         #1
+    'aC'       // 859f-85a0    #2
+    'B'        // 85a1         #1
+    'C'        // 85a2         #2
+    'B'        // 85a3         #1
+    'A'        // 85a4         #0
+    'J'        // 85a5         #9
+    'A'        // 85a6         #0
+    'C'        // 85a7         #2
+    'bA'       // 85a8-85aa    #0
+    'J'        // 85ab         #9
+    'bF'       // 85ac-85ae    #5
+    'aA'       // 85af-85b0    #0
+    'B'        // 85b1         #1
+    'D'        // 85b2         #3
+    'B'        // 85b3         #1
+    'C'        // 85b4         #2
+    'B'        // 85b5         #1
+    'cC'       // 85b6-85b9    #2
+    'A'        // 85ba         #0
+    'D'        // 85bb         #3
+    'F'        // 85bc         #5
+    'bC'       // 85bd-85bf    #2
+    'B'        // 85c0         #1
+    'A'        // 85c1         #0
+    'C'        // 85c2         #2
+    'cB'       // 85c3-85c6    #1
+    'A'        // 85c7         #0
+    'B'        // 85c8         #1
+    'A'        // 85c9         #0
+    'F'        // 85ca         #5
+    'C'        // 85cb         #2
+    'D'        // 85cc         #3
+    'cA'       // 85cd-85d0    #0
+    'aB'       // 85d1-85d2    #1
+    'aD'       // 85d3-85d4    #3
+    'A'        // 85d5         #0
+    'aB'       // 85d6-85d7    #1
+    'bC'       // 85d8-85da    #2
+    'D'        // 85db         #3
+    'aA'       // 85dc-85dd    #0
+    'B'        // 85de         #1
+    'bC'       // 85df-85e1    #2
+    'aB'       // 85e2-85e3    #1
+    'aA'       // 85e4-85e5    #0
+    'C'        // 85e6         #2
+    'D'        // 85e7         #3
+    'C'        // 85e8         #2
+    'aA'       // 85e9-85ea    #0
+    'aB'       // 85eb-85ec    #1
+    'C'        // 85ed         #2
+    'dB'       // 85ee-85f2    #1
+    'F'        // 85f3         #5
+    'C'        // 85f4         #2
+    'D'        // 85f5         #3
+    'C'        // 85f6         #2
+    'A'        // 85f7         #0
+    'B'        // 85f8         #1
+    'bA'       // 85f9-85fb    #0
+    'C'        // 85fc         #2
+    'I'        // 85fd         #8
+    'C'        // 85fe         #2
+    'aA'       // 85ff-8600    #0
+    'B'        // 8601         #1
+    'A'        // 8602         #0
+    'D'        // 8603         #3
+    'A'        // 8604         #0
+    'C'        // 8605         #2
+    'aA'       // 8606-8607    #0
+    'D'        // 8608         #3
+    'B'        // 8609         #1
+    'aA'       // 860a-860b    #0
+    'B'        // 860c         #1
+    'C'        // 860d         #2
+    'F'        // 860e         #5
+    'B'        // 860f         #1
+    'aC'       // 8610-8611    #2
+    'F'        // 8612         #5
+    'C'        // 8613         #2
+    'B'        // 8614         #1
+    'D'        // 8615         #3
+    'bA'       // 8616-8618    #0
+    'C'        // 8619         #2
+    'A'        // 861a         #0
+    'C'        // 861b         #2
+    'B'        // 861c         #1
+    'D'        // 861d         #3
+    'C'        // 861e         #2
+    'I'        // 861f         #8
+    'B'        // 8620         #1
+    'C'        // 8621         #2
+    'A'        // 8622         #0
+    'B'        // 8623         #1
+    'C'        // 8624         #2
+    'aB'       // 8625-8626    #1
+    'A'        // 8627         #0
+    'B'        // 8628         #1
+    'A'        // 8629         #0
+    'I'        // 862a         #8
+    'D'        // 862b         #3
+    'B'        // 862c         #1
+    'A'        // 862d         #0
+    'B'        // 862e         #1
+    'A'        // 862f         #0
+    'F'        // 8630         #5
+    'dB'       // 8631-8635    #1
+    'C'        // 8636         #2
+    'D'        // 8637         #3
+    'bC'       // 8638-863a    #2
+    'B'        // 863b         #1
+    'A'        // 863c         #0
+    'F'        // 863d         #5
+    'B'        // 863e         #1
+    'A'        // 863f         #0
+    'C'        // 8640         #2
+    'J'        // 8641         #9
+    'C'        // 8642         #2
+    'B'        // 8643         #1
+    'D'        // 8644         #3
+    'B'        // 8645         #1
+    'C'        // 8646         #2
+    'aB'       // 8647-8648    #1
+    'aD'       // 8649-864a    #3
+    'aB'       // 864b-864c    #1
+    'aA'       // 864d-864e    #0
+    'D'        // 864f         #3
+    'A'        // 8650         #0
+    'D'        // 8651         #3
+    'C'        // 8652         #2
+    'bA'       // 8653-8655    #0
+    'C'        // 8656         #2
+    'aF'       // 8657-8658    #5
+    'C'        // 8659         #2
+    'F'        // 865a         #5
+    'aA'       // 865b-865c    #0
+    'F'        // 865d         #5
+    'aA'       // 865e-865f    #0
+    'F'        // 8660         #5
+    'cC'       // 8661-8664    #2
+    'B'        // 8665         #1
+    'D'        // 8666         #3
+    'A'        // 8667         #0
+    'B'        // 8668         #1
+    'C'        // 8669         #2
+    'B'        // 866a         #1
+    'aA'       // 866b-866c    #0
+    'aB'       // 866d-866e    #1
+    'A'        // 866f         #0
+    'B'        // 8670         #1
+    'A'        // 8671         #0
+    'bB'       // 8672-8674    #1
+    'aF'       // 8675-8676    #5
+    'C'        // 8677         #2
+    'K'        // 8678         #10
+    'bA'       // 8679-867b    #0
+    'B'        // 867c         #1
+    'F'        // 867d         #5
+    'B'        // 867e         #1
+    'eD'       // 867f-8684    #3
+    'aB'       // 8685-8686    #1
+    'C'        // 8687         #2
+    'aF'       // 8688-8689    #5
+    'cA'       // 868a-868d    #0
+    'B'        // 868e         #1
+    'D'        // 868f         #3
+    'B'        // 8690         #1
+    'C'        // 8691         #2
+    'B'        // 8692         #1
+    'A'        // 8693         #0
+    'B'        // 8694         #1
+    'A'        // 8695         #0
+    'C'        // 8696         #2
+    'B'        // 8697         #1
+    'C'        // 8698         #2
+    'B'        // 8699         #1
+    'C'        // 869a         #2
+    'D'        // 869b         #3
+    'aC'       // 869c-869d    #2
+    'B'        // 869e         #1
+    'D'        // 869f         #3
+    'B'        // 86a0         #1
+    'C'        // 86a1         #2
+    'B'        // 86a2         #1
+    'aA'       // 86a3-86a4    #0
+    'B'        // 86a5         #1
+    'F'        // 86a6         #5
+    'C'        // 86a7         #2
+    'bA'       // 86a8-86aa    #0
+    'F'        // 86ab         #5
+    'D'        // 86ac         #3
+    'C'        // 86ad         #2
+    'D'        // 86ae         #3
+    'bA'       // 86af-86b1    #0
+    'B'        // 86b2         #1
+    'C'        // 86b3         #2
+    'A'        // 86b4         #0
+    'dC'       // 86b5-86b9    #2
+    'dB'       // 86ba-86be    #1
+    'C'        // 86bf         #2
+    'A'        // 86c0         #0
+    'C'        // 86c1         #2
+    'B'        // 86c2         #1
+    'aC'       // 86c3-86c4    #2
+    'bA'       // 86c5-86c7    #0
+    'B'        // 86c8         #1
+    'A'        // 86c9         #0
+    'D'        // 86ca         #3
+    'A'        // 86cb         #0
+    'B'        // 86cc         #1
+    'aF'       // 86cd-86ce    #5
+    'D'        // 86cf         #3
+    'B'        // 86d0         #1
+    'C'        // 86d1         #2
+    'F'        // 86d2         #5
+    'B'        // 86d3         #1
+    'A'        // 86d4         #0
+    'F'        // 86d5         #5
+    'B'        // 86d6         #1
+    'C'        // 86d7         #2
+    'B'        // 86d8         #1
+    'A'        // 86d9         #0
+    'C'        // 86da         #2
+    'A'        // 86db         #0
+    'C'        // 86dc         #2
+    'B'        // 86dd         #1
+    'aA'       // 86de-86df    #0
+    'F'        // 86e0         #5
+    'D'        // 86e1         #3
+    'B'        // 86e2         #1
+    'aA'       // 86e3-86e4    #0
+    'F'        // 86e5         #5
+    'C'        // 86e6         #2
+    'F'        // 86e7         #5
+    'B'        // 86e8         #1
+    'A'        // 86e9         #0
+    'aB'       // 86ea-86eb    #1
+    'aA'       // 86ec-86ed    #0
+    'F'        // 86ee         #5
+    'C'        // 86ef         #2
+    'dD'       // 86f0-86f4    #3
+    'bB'       // 86f5-86f7    #1
+    'aA'       // 86f8-86f9    #0
+    'C'        // 86fa         #2
+    'A'        // 86fb         #0
+    'aF'       // 86fc-86fd    #5
+    'A'        // 86fe         #0
+    'D'        // 86ff         #3
+    'A'        // 8700         #0
+    'B'        // 8701         #1
+    'aA'       // 8702-8703    #0
+    'aC'       // 8704-8705    #2
+    'A'        // 8706         #0
+    'C'        // 8707         #2
+    'cA'       // 8708-870b    #0
+    'B'        // 870c         #1
+    'aC'       // 870d-870e    #2
+    'aF'       // 870f-8710    #5
+    'A'        // 8711         #0
+    'aC'       // 8712-8713    #2
+    'F'        // 8714         #5
+    'B'        // 8715         #1
+    'aD'       // 8716-8717    #3
+    'A'        // 8718         #0
+    'C'        // 8719         #2
+    'A'        // 871a         #0
+    'B'        // 871b         #1
+    'A'        // 871c         #0
+    'K'        // 871d         #10
+    'C'        // 871e         #2
+    'F'        // 871f         #5
+    'B'        // 8720         #1
+    'A'        // 8721         #0
+    'aC'       // 8722-8723    #2
+    'B'        // 8724         #1
+    'A'        // 8725         #0
+    'aB'       // 8726-8727    #1
+    'aA'       // 8728-8729    #0
+    'B'        // 872a         #1
+    'D'        // 872b         #3
+    'aB'       // 872c-872d    #1
+    'C'        // 872e         #2
+    'F'        // 872f         #5
+    'B'        // 8730         #1
+    'aC'       // 8731-8732    #2
+    'B'        // 8733         #1
+    'A'        // 8734         #0
+    'I'        // 8735         #8
+    'D'        // 8736         #3
+    'A'        // 8737         #0
+    'B'        // 8738         #1
+    'F'        // 8739         #5
+    'aA'       // 873a-873b    #0
+    'C'        // 873c         #2
+    'F'        // 873d         #5
+    'C'        // 873e         #2
+    'aA'       // 873f-8740    #0
+    'aB'       // 8741-8742    #1
+    'C'        // 8743         #2
+    'D'        // 8744         #3
+    'F'        // 8745         #5
+    'B'        // 8746         #1
+    'aD'       // 8747-8748    #3
+    'F'        // 8749         #5
+    'D'        // 874a         #3
+    'F'        // 874b         #5
+    'A'        // 874c         #0
+    'C'        // 874d         #2
+    'A'        // 874e         #0
+    'aB'       // 874f-8750    #1
+    'C'        // 8751         #2
+    'B'        // 8752         #1
+    'C'        // 8753         #2
+    'B'        // 8754         #1
+    'A'        // 8755         #0
+    'B'        // 8756         #1
+    'A'        // 8757         #0
+    'C'        // 8758         #2
+    'A'        // 8759         #0
+    'bB'       // 875a-875c    #1
+    'C'        // 875d         #2
+    'B'        // 875e         #1
+    'aA'       // 875f-8760    #0
+    'C'        // 8761         #2
+    'B'        // 8762         #1
+    'C'        // 8763         #2
+    'bA'       // 8764-8766    #0
+    'B'        // 8767         #1
+    'A'        // 8768         #0
+    'B'        // 8769         #1
+    'C'        // 876a         #2
+    'bB'       // 876b-876d    #1
+    'A'        // 876e         #0
+    'C'        // 876f         #2
+    'B'        // 8770         #1
+    'C'        // 8771         #2
+    'F'        // 8772         #5
+    'B'        // 8773         #1
+    'A'        // 8774         #0
+    'B'        // 8775         #1
+    'A'        // 8776         #0
+    'B'        // 8777         #1
+    'A'        // 8778         #0
+    'aB'       // 8779-877a    #1
+    'C'        // 877b         #2
+    'F'        // 877c         #5
+    'B'        // 877d         #1
+    'D'        // 877e         #3
+    'F'        // 877f         #5
+    'D'        // 8780         #3
+    'B'        // 8781         #1
+    'aA'       // 8782-8783    #0
+    'eC'       // 8784-8789    #2
+    'D'        // 878a         #3
+    'C'        // 878b         #2
+    'aA'       // 878c-878d    #0
+    'F'        // 878e         #5
+    'B'        // 878f         #1
+    'C'        // 8790         #2
+    'aB'       // 8791-8792    #1
+    'C'        // 8793         #2
+    'B'        // 8794         #1
+    'F'        // 8795         #5
+    'B'        // 8796         #1
+    'C'        // 8797         #2
+    'A'        // 8798         #0
+    'F'        // 8799         #5
+    'cB'       // 879a-879d    #1
+    'aA'       // 879e-879f    #0
+    'F'        // 87a0         #5
+    'D'        // 87a1         #3
+    'aA'       // 87a2-87a3    #0
+    'aB'       // 87a4-87a5    #1
+    'D'        // 87a6         #3
+    'F'        // 87a7         #5
+    'D'        // 87a8         #3
+    'aB'       // 87a9-87aa    #1
+    'aC'       // 87ab-87ac    #2
+    'A'        // 87ad         #0
+    'aC'       // 87ae-87af    #2
+    'B'        // 87b0         #1
+    'C'        // 87b1         #2
+    'B'        // 87b2         #1
+    'A'        // 87b3         #0
+    'I'        // 87b4         #8
+    'C'        // 87b5         #2
+    'cB'       // 87b6-87b9    #1
+    'aA'       // 87ba-87bb    #0
+    'B'        // 87bc         #1
+    'A'        // 87bd         #0
+    'aC'       // 87be-87bf    #2
+    'A'        // 87c0         #0
+    'C'        // 87c1         #2
+    'aB'       // 87c2-87c3    #1
+    'A'        // 87c4         #0
+    'B'        // 87c5         #1
+    'C'        // 87c6         #2
+    'J'        // 87c7         #9
+    'aC'       // 87c8-87c9    #2
+    'aA'       // 87ca-87cb    #0
+    'B'        // 87cc         #1
+    'D'        // 87cd         #3
+    'C'        // 87ce         #2
+    'D'        // 87cf         #3
+    'F'        // 87d0         #5
+    'B'        // 87d1         #1
+    'A'        // 87d2         #0
+    'aB'       // 87d3-87d4    #1
+    'F'        // 87d5         #5
+    'C'        // 87d6         #2
+    'aB'       // 87d7-87d8    #1
+    'C'        // 87d9         #2
+    'A'        // 87da         #0
+    'I'        // 87db         #8
+    'C'        // 87dc         #2
+    'aB'       // 87dd-87de    #1
+    'C'        // 87df         #2
+    'A'        // 87e0         #0
+    'B'        // 87e1         #1
+    'C'        // 87e2         #2
+    'A'        // 87e3         #0
+    'bC'       // 87e4-87e6    #2
+    'aB'       // 87e7-87e8    #1
+    'D'        // 87e9         #3
+    'aC'       // 87ea-87eb    #2
+    'A'        // 87ec         #0
+    'C'        // 87ed         #2
+    'B'        // 87ee         #1
+    'A'        // 87ef         #0
+    'D'        // 87f0         #3
+    'F'        // 87f1         #5
+    'A'        // 87f2         #0
+    'C'        // 87f3         #2
+    'B'        // 87f4         #1
+    'aC'       // 87f5-87f6    #2
+    'A'        // 87f7         #0
+    'F'        // 87f8         #5
+    'A'        // 87f9         #0
+    'C'        // 87fa         #2
+    'A'        // 87fb         #0
+    'B'        // 87fc         #1
+    'D'        // 87fd         #3
+    'A'        // 87fe         #0
+    'C'        // 87ff         #2
+    'B'        // 8800         #1
+    'C'        // 8801         #2
+    'B'        // 8802         #1
+    'C'        // 8803         #2
+    'B'        // 8804         #1
+    'A'        // 8805         #0
+    'C'        // 8806         #2
+    'F'        // 8807         #5
+    'B'        // 8808         #1
+    'bC'       // 8809-880b    #2
+    'B'        // 880c         #1
+    'A'        // 880d         #0
+    'F'        // 880e         #5
+    'aC'       // 880f-8810    #2
+    'A'        // 8811         #0
+    'F'        // 8812         #5
+    'aC'       // 8813-8814    #2
+    'A'        // 8815         #0
+    'C'        // 8816         #2
+    'B'        // 8817         #1
+    'aC'       // 8818-8819    #2
+    'F'        // 881a         #5
+    'aC'       // 881b-881c    #2
+    'B'        // 881d         #1
+    'F'        // 881e         #5
+    'A'        // 881f         #0
+    'B'        // 8820         #1
+    'bA'       // 8821-8823    #0
+    'bB'       // 8824-8826    #1
+    'aC'       // 8827-8828    #2
+    'cB'       // 8829-882c    #1
+    'aC'       // 882d-882e    #2
+    'B'        // 882f         #1
+    'C'        // 8830         #2
+    'aA'       // 8831-8832    #0
+    'B'        // 8833         #1
+    'D'        // 8834         #3
+    'C'        // 8835         #2
+    'A'        // 8836         #0
+    'aB'       // 8837-8838    #1
+    'A'        // 8839         #0
+    'F'        // 883a         #5
+    'A'        // 883b         #0
+    'C'        // 883c         #2
+    'bB'       // 883d-883f    #1
+    'A'        // 8840         #0
+    'bC'       // 8841-8843    #2
+    'A'        // 8844         #0
+    'C'        // 8845         #2
+    'A'        // 8846         #0
+    'D'        // 8847         #3
+    'C'        // 8848         #2
+    'F'        // 8849         #5
+    'A'        // 884a         #0
+    'C'        // 884b         #2
+    'bA'       // 884c-884e    #0
+    'B'        // 884f         #1
+    'D'        // 8850         #3
+    'F'        // 8851         #5
+    'aA'       // 8852-8853    #0
+    'D'        // 8854         #3
+    'aC'       // 8855-8856    #2
+    'A'        // 8857         #0
+    'F'        // 8858         #5
+    'A'        // 8859         #0
+    'C'        // 885a         #2
+    'A'        // 885b         #0
+    'F'        // 885c         #5
+    'aA'       // 885d-885e    #0
+    'F'        // 885f         #5
+    'C'        // 8860         #2
+    'cA'       // 8861-8864    #0
+    'B'        // 8865         #1
+    'D'        // 8866         #3
+    'B'        // 8867         #1
+    'A'        // 8868         #0
+    'C'        // 8869         #2
+    'B'        // 886a         #1
+    'A'        // 886b         #0
+    'D'        // 886c         #3
+    'B'        // 886d         #1
+    'A'        // 886e         #0
+    'C'        // 886f         #2
+    'A'        // 8870         #0
+    'C'        // 8871         #2
+    'A'        // 8872         #0
+    'D'        // 8873         #3
+    'B'        // 8874         #1
+    'C'        // 8875         #2
+    'B'        // 8876         #1
+    'A'        // 8877         #0
+    'D'        // 8878         #3
+    'C'        // 8879         #2
+    'D'        // 887a         #3
+    'F'        // 887b         #5
+    'B'        // 887c         #1
+    'bA'       // 887d-887f    #0
+    'C'        // 8880         #2
+    'aA'       // 8881-8882    #0
+    'aB'       // 8883-8884    #1
+    'aD'       // 8885-8886    #3
+    'B'        // 8887         #1
+    'A'        // 8888         #0
+    'B'        // 8889         #1
+    'D'        // 888a         #3
+    'A'        // 888b         #0
+    'B'        // 888c         #1
+    'A'        // 888d         #0
+    'cB'       // 888e-8891    #1
+    'A'        // 8892         #0
+    'B'        // 8893         #1
+    'D'        // 8894         #3
+    'B'        // 8895         #1
+    'aA'       // 8896-8897    #0
+    'bC'       // 8898-889a    #2
+    'A'        // 889b         #0
+    'C'        // 889c         #2
+    'I'        // 889d         #8
+    'A'        // 889e         #0
+    'aC'       // 889f-88a0    #2
+    'B'        // 88a1         #1
+    'A'        // 88a2         #0
+    'D'        // 88a3         #3
+    'C'        // 88a4         #2
+    'aD'       // 88a5-88a6    #3
+    'B'        // 88a7         #1
+    'C'        // 88a8         #2
+    'D'        // 88a9         #3
+    'aA'       // 88aa-88ab    #0
+    'B'        // 88ac         #1
+    'D'        // 88ad         #3
+    'C'        // 88ae         #2
+    'D'        // 88af         #3
+    'F'        // 88b0         #5
+    'C'        // 88b1         #2
+    'B'        // 88b2         #1
+    'D'        // 88b3         #3
+    'A'        // 88b4         #0
+    'C'        // 88b5         #2
+    'B'        // 88b6         #1
+    'C'        // 88b7         #2
+    'aB'       // 88b8-88b9    #1
+    'C'        // 88ba         #2
+    'D'        // 88bb         #3
+    'cC'       // 88bc-88bf    #2
+    'bA'       // 88c0-88c2    #0
+    'aF'       // 88c3-88c4    #5
+    'A'        // 88c5         #0
+    'F'        // 88c6         #5
+    'B'        // 88c7         #1
+    'D'        // 88c8         #3
+    'B'        // 88c9         #1
+    'A'        // 88ca         #0
+    'aC'       // 88cb-88cc    #2
+    'A'        // 88cd         #0
+    'C'        // 88ce         #2
+    'A'        // 88cf         #0
+    'B'        // 88d0         #1
+    'F'        // 88d1         #5
+    'A'        // 88d2         #0
+    'F'        // 88d3         #5
+    'aA'       // 88d4-88d5    #0
+    'aB'       // 88d6-88d7    #1
+    'aA'       // 88d8-88d9    #0
+    'B'        // 88da         #1
+    'C'        // 88db         #2
+    'aA'       // 88dc-88dd    #0
+    'C'        // 88de         #2
+    'A'        // 88df         #0
+    'F'        // 88e0         #5
+    'A'        // 88e1         #0
+    'cD'       // 88e2-88e5    #3
+    'B'        // 88e6         #1
+    'C'        // 88e7         #2
+    'A'        // 88e8         #0
+    'aD'       // 88e9-88ea    #3
+    'aB'       // 88eb-88ec    #1
+    'D'        // 88ed         #3
+    'B'        // 88ee         #1
+    'A'        // 88ef         #0
+    'C'        // 88f0         #2
+    'A'        // 88f1         #0
+    'C'        // 88f2         #2
+    'bA'       // 88f3-88f5    #0
+    'B'        // 88f6         #1
+    'C'        // 88f7         #2
+    'aA'       // 88f8-88f9    #0
+    'aB'       // 88fa-88fb    #1
+    'C'        // 88fc         #2
+    'aA'       // 88fd-88fe    #0
+    'aB'       // 88ff-8900    #1
+    'aC'       // 8901-8902    #2
+    'D'        // 8903         #3
+    'J'        // 8904         #9
+    'B'        // 8905         #1
+    'C'        // 8906         #2
+    'A'        // 8907         #0
+    'D'        // 8908         #3
+    'B'        // 8909         #1
+    'A'        // 890a         #0
+    'B'        // 890b         #1
+    'A'        // 890c         #0
+    'F'        // 890d         #5
+    'C'        // 890e         #2
+    'F'        // 890f         #5
+    'A'        // 8910         #0
+    'I'        // 8911         #8
+    'aA'       // 8912-8913    #0
+    'B'        // 8914         #1
+    'A'        // 8915         #0
+    'C'        // 8916         #2
+    'B'        // 8917         #1
+    'bA'       // 8918-891a    #0
+    'D'        // 891b         #3
+    'aF'       // 891c-891d    #5
+    'C'        // 891e         #2
+    'B'        // 891f         #1
+    'F'        // 8920         #5
+    'cB'       // 8921-8924    #1
+    'A'        // 8925         #0
+    'C'        // 8926         #2
+    'A'        // 8927         #0
+    'F'        // 8928         #5
+    'B'        // 8929         #1
+    'aA'       // 892a-892b    #0
+    'bB'       // 892c-892e    #1
+    'I'        // 892f         #8
+    'A'        // 8930         #0
+    'aC'       // 8931-8932    #2
+    'B'        // 8933         #1
+    'D'        // 8934         #3
+    'C'        // 8935         #2
+    'A'        // 8936         #0
+    'C'        // 8937         #2
+    'A'        // 8938         #0
+    'F'        // 8939         #5
+    'J'        // 893a         #9
+    'A'        // 893b         #0
+    'aB'       // 893c-893d    #1
+    'C'        // 893e         #2
+    'D'        // 893f         #3
+    'F'        // 8940         #5
+    'A'        // 8941         #0
+    'aC'       // 8942-8943    #2
+    'A'        // 8944         #0
+    'F'        // 8945         #5
+    'C'        // 8946         #2
+    'B'        // 8947         #1
+    'D'        // 8948         #3
+    'C'        // 8949         #2
+    'D'        // 894a         #3
+    'B'        // 894b         #1
+    'C'        // 894c         #2
+    'A'        // 894d         #0
+    'D'        // 894e         #3
+    'C'        // 894f         #2
+    'aB'       // 8950-8951    #1
+    'A'        // 8952         #0
+    'aB'       // 8953-8954    #1
+    'D'        // 8955         #3
+    'A'        // 8956         #0
+    'C'        // 8957         #2
+    'I'        // 8958         #8
+    'B'        // 8959         #1
+    'aC'       // 895a-895b    #2
+    'A'        // 895c         #0
+    'B'        // 895d         #1
+    'bA'       // 895e-8960    #0
+    'bC'       // 8961-8963    #2
+    'A'        // 8964         #0
+    'B'        // 8965         #1
+    'C'        // 8966         #2
+    'aD'       // 8967-8968    #3
+    'B'        // 8969         #1
+    'A'        // 896a         #0
+    'C'        // 896b         #2
+    'B'        // 896c         #1
+    'A'        // 896d         #0
+    'C'        // 896e         #2
+    'A'        // 896f         #0
+    'F'        // 8970         #5
+    'B'        // 8971         #1
+    'A'        // 8972         #0
+    'C'        // 8973         #2
+    'A'        // 8974         #0
+    'F'        // 8975         #5
+    'B'        // 8976         #1
+    'C'        // 8977         #2
+    'D'        // 8978         #3
+    'B'        // 8979         #1
+    'bC'       // 897a-897c    #2
+    'F'        // 897d         #5
+    'cA'       // 897e-8981    #0
+    'B'        // 8982         #1
+    'A'        // 8983         #0
+    'D'        // 8984         #3
+    'B'        // 8985         #1
+    'cA'       // 8986-8989    #0
+    'C'        // 898a         #2
+    'A'        // 898b         #0
+    'D'        // 898c         #3
+    'F'        // 898d         #5
+    'D'        // 898e         #3
+    'A'        // 898f         #0
+    'F'        // 8990         #5
+    'B'        // 8991         #1
+    'D'        // 8992         #3
+    'A'        // 8993         #0
+    'aC'       // 8994-8995    #2
+    'bA'       // 8996-8998    #0
+    'D'        // 8999         #3
+    'J'        // 899a         #9
+    'aC'       // 899b-899c    #2
+    'aB'       // 899d-899e    #1
+    'C'        // 899f         #2
+    'J'        // 89a0         #9
+    'A'        // 89a1         #0
+    'bB'       // 89a2-89a4    #1
+    'bC'       // 89a5-89a7    #2
+    'K'        // 89a8         #10
+    'aA'       // 89a9-89aa    #0
+    'D'        // 89ab         #3
+    'A'        // 89ac         #0
+    'aB'       // 89ad-89ae    #1
+    'A'        // 89af         #0
+    'F'        // 89b0         #5
+    'D'        // 89b1         #3
+    'A'        // 89b2         #0
+    'J'        // 89b3         #9
+    'aF'       // 89b4-89b5    #5
+    'aA'       // 89b6-89b7    #0
+    'D'        // 89b8         #3
+    'B'        // 89b9         #1
+    'A'        // 89ba         #0
+    'D'        // 89bb         #3
+    'C'        // 89bc         #2
+    'A'        // 89bd         #0
+    'B'        // 89be         #1
+    'bA'       // 89bf-89c1    #0
+    'cD'       // 89c2-89c5    #3
+    'B'        // 89c6         #1
+    'jD'       // 89c7-89d1    #3
+    'A'        // 89d2         #0
+    'B'        // 89d3         #1
+    'A'        // 89d4         #0
+    'C'        // 89d5         #2
+    'A'        // 89d6         #0
+    'J'        // 89d7         #9
+    'F'        // 89d8         #5
+    'B'        // 89d9         #1
+    'A'        // 89da         #0
+    'B'        // 89db         #1
+    'aA'       // 89dc-89dd    #0
+    'D'        // 89de         #3
+    'cB'       // 89df-89e2    #1
+    'A'        // 89e3         #0
+    'B'        // 89e4         #1
+    'bA'       // 89e5-89e7    #0
+    'B'        // 89e8         #1
+    'C'        // 89e9         #2
+    'D'        // 89ea         #3
+    'C'        // 89eb         #2
+    'B'        // 89ec         #1
+    'C'        // 89ed         #2
+    'aD'       // 89ee-89ef    #3
+    'I'        // 89f0         #8
+    'A'        // 89f1         #0
+    'B'        // 89f2         #1
+    'aA'       // 89f3-89f4    #0
+    'D'        // 89f5         #3
+    'A'        // 89f6         #0
+    'B'        // 89f7         #1
+    'A'        // 89f8         #0
+    'F'        // 89f9         #5
+    'bB'       // 89fa-89fc    #1
+    'F'        // 89fd         #5
+    'B'        // 89fe         #1
+    'C'        // 89ff         #2
+    'A'        // 8a00         #0
+    'F'        // 8a01         #5
+    'aA'       // 8a02-8a03    #0
+    'C'        // 8a04         #2
+    'F'        // 8a05         #5
+    'D'        // 8a06         #3
+    'aA'       // 8a07-8a08    #0
+    'K'        // 8a09         #10
+    'A'        // 8a0a         #0
+    'D'        // 8a0b         #3
+    'A'        // 8a0c         #0
+    'D'        // 8a0d         #3
+    'A'        // 8a0e         #0
+    'C'        // 8a0f         #2
+    'cA'       // 8a10-8a13    #0
+    'J'        // 8a14         #9
+    'cA'       // 8a15-8a18    #0
+    'aD'       // 8a19-8a1a    #3
+    'A'        // 8a1b         #0
+    'B'        // 8a1c         #1
+    'A'        // 8a1d         #0
+    'C'        // 8a1e         #2
+    'A'        // 8a1f         #0
+    'aF'       // 8a20-8a21    #5
+    'aA'       // 8a22-8a23    #0
+    'F'        // 8a24         #5
+    'A'        // 8a25         #0
+    'F'        // 8a26         #5
+    'B'        // 8a27         #1
+    'D'        // 8a28         #3
+    'B'        // 8a29         #1
+    'A'        // 8a2a         #0
+    'aC'       // 8a2b-8a2c    #2
+    'A'        // 8a2d         #0
+    'D'        // 8a2e         #3
+    'F'        // 8a2f         #5
+    'B'        // 8a30         #1
+    'A'        // 8a31         #0
+    'D'        // 8a32         #3
+    'J'        // 8a33         #9
+    'A'        // 8a34         #0
+    'F'        // 8a35         #5
+    'A'        // 8a36         #0
+    'F'        // 8a37         #5
+    'aB'       // 8a38-8a39    #1
+    'bA'       // 8a3a-8a3c    #0
+    'C'        // 8a3d         #2
+    'A'        // 8a3e         #0
+    'B'        // 8a3f         #1
+    'C'        // 8a40         #2
+    'A'        // 8a41         #0
+    'D'        // 8a42         #3
+    'F'        // 8a43         #5
+    'B'        // 8a44         #1
+    'C'        // 8a45         #2
+    'A'        // 8a46         #0
+    'F'        // 8a47         #5
+    'aC'       // 8a48-8a49    #2
+    'B'        // 8a4a         #1
+    'K'        // 8a4b         #10
+    'B'        // 8a4c         #1
+    'aC'       // 8a4d-8a4e    #2
+    'B'        // 8a4f         #1
+    'aA'       // 8a50-8a51    #0
+    'C'        // 8a52         #2
+    'F'        // 8a53         #5
+    'dA'       // 8a54-8a58    #0
+    'B'        // 8a59         #1
+    'D'        // 8a5a         #3
+    'A'        // 8a5b         #0
+    'aF'       // 8a5c-8a5d    #5
+    'A'        // 8a5e         #0
+    'D'        // 8a5f         #3
+    'cA'       // 8a60-8a63    #0
+    'D'        // 8a64         #3
+    'F'        // 8a65         #5
+    'A'        // 8a66         #0
+    'C'        // 8a67         #2
+    'B'        // 8a68         #1
+    'A'        // 8a69         #0
+    'D'        // 8a6a         #3
+    'cA'       // 8a6b-8a6e    #0
+    'D'        // 8a6f         #3
+    'cA'       // 8a70-8a73    #0
+    'B'        // 8a74         #1
+    'A'        // 8a75         #0
+    'aC'       // 8a76-8a77    #2
+    'D'        // 8a78         #3
+    'A'        // 8a79         #0
+    'aC'       // 8a7a-8a7b    #2
+    'A'        // 8a7c         #0
+    'D'        // 8a7d         #3
+    'C'        // 8a7e         #2
+    'A'        // 8a7f         #0
+    'F'        // 8a80         #5
+    'B'        // 8a81         #1
+    'A'        // 8a82         #0
+    'C'        // 8a83         #2
+    'cA'       // 8a84-8a87    #0
+    'D'        // 8a88         #3
+    'F'        // 8a89         #5
+    'D'        // 8a8a         #3
+    'C'        // 8a8b         #2
+    'aA'       // 8a8c-8a8d    #0
+    'D'        // 8a8e         #3
+    'aC'       // 8a8f-8a90    #2
+    'A'        // 8a91         #0
+    'C'        // 8a92         #2
+    'A'        // 8a93         #0
+    'B'        // 8a94         #1
+    'A'        // 8a95         #0
+    'C'        // 8a96         #2
+    'F'        // 8a97         #5
+    'A'        // 8a98         #0
+    'C'        // 8a99         #2
+    'A'        // 8a9a         #0
+    'D'        // 8a9b         #3
+    'B'        // 8a9c         #1
+    'D'        // 8a9d         #3
+    'A'        // 8a9e         #0
+    'F'        // 8a9f         #5
+    'aA'       // 8aa0-8aa1    #0
+    'K'        // 8aa2         #10
+    'eA'       // 8aa3-8aa8    #0
+    'C'        // 8aa9         #2
+    'A'        // 8aaa         #0
+    'B'        // 8aab         #1
+    'C'        // 8aac         #2
+    'aF'       // 8aad-8aae    #5
+    'C'        // 8aaf         #2
+    'A'        // 8ab0         #0
+    'D'        // 8ab1         #3
+    'A'        // 8ab2         #0
+    'F'        // 8ab3         #5
+    'B'        // 8ab4         #1
+    'D'        // 8ab5         #3
+    'C'        // 8ab6         #2
+    'F'        // 8ab7         #5
+    'B'        // 8ab8         #1
+    'A'        // 8ab9         #0
+    'B'        // 8aba         #1
+    'C'        // 8abb         #2
+    'A'        // 8abc         #0
+    'B'        // 8abd         #1
+    'aA'       // 8abe-8abf    #0
+    'B'        // 8ac0         #1
+    'D'        // 8ac1         #3
+    'A'        // 8ac2         #0
+    'C'        // 8ac3         #2
+    'A'        // 8ac4         #0
+    'B'        // 8ac5         #1
+    'C'        // 8ac6         #2
+    'A'        // 8ac7         #0
+    'C'        // 8ac8         #2
+    'A'        // 8ac9         #0
+    'F'        // 8aca         #5
+    'A'        // 8acb         #0
+    'C'        // 8acc         #2
+    'A'        // 8acd         #0
+    'D'        // 8ace         #3
+    'A'        // 8acf         #0
+    'F'        // 8ad0         #5
+    'C'        // 8ad1         #2
+    'A'        // 8ad2         #0
+    'bC'       // 8ad3-8ad5    #2
+    'aA'       // 8ad6-8ad7    #0
+    'aB'       // 8ad8-8ad9    #1
+    'C'        // 8ada         #2
+    'fA'       // 8adb-8ae1    #0
+    'C'        // 8ae2         #2
+    'D'        // 8ae3         #3
+    'A'        // 8ae4         #0
+    'D'        // 8ae5         #3
+    'aA'       // 8ae6-8ae7    #0
+    'B'        // 8ae8         #1
+    'D'        // 8ae9         #3
+    'I'        // 8aea         #8
+    'A'        // 8aeb         #0
+    'F'        // 8aec         #5
+    'aA'       // 8aed-8aee    #0
+    'B'        // 8aef         #1
+    'aA'       // 8af0-8af1    #0
+    'I'        // 8af2         #8
+    'aA'       // 8af3-8af4    #0
+    'C'        // 8af5         #2
+    'bA'       // 8af6-8af8    #0
+    'B'        // 8af9         #1
+    'A'        // 8afa         #0
+    'B'        // 8afb         #1
+    'A'        // 8afc         #0
+    'D'        // 8afd         #3
+    'A'        // 8afe         #0
+    'C'        // 8aff         #2
+    'bA'       // 8b00-8b02    #0
+    'D'        // 8b03         #3
+    'A'        // 8b04         #0
+    'aC'       // 8b05-8b06    #2
+    'A'        // 8b07         #0
+    'B'        // 8b08         #1
+    'D'        // 8b09         #3
+    'aC'       // 8b0a-8b0b    #2
+    'A'        // 8b0c         #0
+    'C'        // 8b0d         #2
+    'A'        // 8b0e         #0
+    'C'        // 8b0f         #2
+    'aA'       // 8b10-8b11    #0
+    'aB'       // 8b12-8b13    #1
+    'A'        // 8b14         #0
+    'B'        // 8b15         #1
+    'aA'       // 8b16-8b17    #0
+    'B'        // 8b18         #1
+    'dA'       // 8b19-8b1d    #0
+    'aC'       // 8b1e-8b1f    #2
+    'A'        // 8b20         #0
+    'F'        // 8b21         #5
+    'B'        // 8b22         #1
+    'I'        // 8b23         #8
+    'aB'       // 8b24-8b25    #1
+    'A'        // 8b26         #0
+    'B'        // 8b27         #1
+    'A'        // 8b28         #0
+    'D'        // 8b29         #3
+    'B'        // 8b2a         #1
+    'aA'       // 8b2b-8b2c    #0
+    'C'        // 8b2d         #2
+    'aB'       // 8b2e-8b2f    #1
+    'C'        // 8b30         #2
+    'B'        // 8b31         #1
+    'D'        // 8b32         #3
+    'A'        // 8b33         #0
+    'D'        // 8b34         #3
+    'aB'       // 8b35-8b36    #1
+    'A'        // 8b37         #0
+    'D'        // 8b38         #3
+    'A'        // 8b39         #0
+    'aB'       // 8b3a-8b3b    #1
+    'A'        // 8b3c         #0
+    'B'        // 8b3d         #1
+    'A'        // 8b3e         #0
+    'aB'       // 8b3f-8b40    #1
+    'A'        // 8b41         #0
+    'C'        // 8b42         #2
+    'A'        // 8b43         #0
+    'F'        // 8b44         #5
+    'C'        // 8b45         #2
+    'A'        // 8b46         #0
+    'B'        // 8b47         #1
+    'C'        // 8b48         #2
+    'A'        // 8b49         #0
+    'aB'       // 8b4a-8b4b    #1
+    'A'        // 8b4c         #0
+    'C'        // 8b4d         #2
+    'aA'       // 8b4e-8b4f    #0
+    'B'        // 8b50         #1
+    'aC'       // 8b51-8b52    #2
+    'aA'       // 8b53-8b54    #0
+    'B'        // 8b55         #1
+    'A'        // 8b56         #0
+    'B'        // 8b57         #1
+    'bA'       // 8b58-8b5a    #0
+    'F'        // 8b5b         #5
+    'A'        // 8b5c         #0
+    'B'        // 8b5d         #1
+    'aA'       // 8b5e-8b5f    #0
+    'B'        // 8b60         #1
+    'D'        // 8b61         #3
+    'B'        // 8b62         #1
+    'C'        // 8b63         #2
+    'D'        // 8b64         #3
+    'B'        // 8b65         #1
+    'A'        // 8b66         #0
+    'aB'       // 8b67-8b68    #1
+    'C'        // 8b69         #2
+    'B'        // 8b6a         #1
+    'aA'       // 8b6b-8b6c    #0
+    'C'        // 8b6d         #2
+    'D'        // 8b6e         #3
+    'aA'       // 8b6f-8b70    #0
+    'J'        // 8b71         #9
+    'F'        // 8b72         #5
+    'D'        // 8b73         #3
+    'A'        // 8b74         #0
+    'D'        // 8b75         #3
+    'F'        // 8b76         #5
+    'A'        // 8b77         #0
+    'aC'       // 8b78-8b79    #2
+    'aB'       // 8b7a-8b7b    #1
+    'F'        // 8b7c         #5
+    'A'        // 8b7d         #0
+    'C'        // 8b7e         #2
+    'aA'       // 8b7f-8b80    #0
+    'C'        // 8b81         #2
+    'B'        // 8b82         #1
+    'A'        // 8b83         #0
+    'aC'       // 8b84-8b85    #2
+    'B'        // 8b86         #1
+    'D'        // 8b87         #3
+    'B'        // 8b88         #1
+    'K'        // 8b89         #10
+    'A'        // 8b8a         #0
+    'C'        // 8b8b         #2
+    'A'        // 8b8c         #0
+    'F'        // 8b8d         #5
+    'A'        // 8b8e         #0
+    'C'        // 8b8f         #2
+    'A'        // 8b90         #0
+    'D'        // 8b91         #3
+    'aA'       // 8b92-8b93    #0
+    'aC'       // 8b94-8b95    #2
+    'A'        // 8b96         #0
+    'D'        // 8b97         #3
+    'B'        // 8b98         #1
+    'C'        // 8b99         #2
+    'A'        // 8b9a         #0
+    'B'        // 8b9b         #1
+    'A'        // 8b9c         #0
+    'F'        // 8b9d         #5
+    'A'        // 8b9e         #0
+    'C'        // 8b9f         #2
+    'A'        // 8ba0         #0
+    '1bD'      // 8ba1-8bbd    #3
+    'B'        // 8bbe         #1
+    '1hD'      // 8bbf-8be1    #3
+    'B'        // 8be2         #1
+    '3eD'      // 8be3-8c36    #3
+    'A'        // 8c37         #0
+    'F'        // 8c38         #5
+    'C'        // 8c39         #2
+    'F'        // 8c3a         #5
+    'aB'       // 8c3b-8c3c    #1
+    'aC'       // 8c3d-8c3e    #2
+    'A'        // 8c3f         #0
+    'D'        // 8c40         #3
+    'A'        // 8c41         #0
+    'aB'       // 8c42-8c43    #1
+    'D'        // 8c44         #3
+    'C'        // 8c45         #2
+    'dA'       // 8c46-8c4a    #0
+    'C'        // 8c4b         #2
+    'A'        // 8c4c         #0
+    'B'        // 8c4d         #1
+    'A'        // 8c4e         #0
+    'C'        // 8c4f         #2
+    'A'        // 8c50         #0
+    'C'        // 8c51         #2
+    'D'        // 8c52         #3
+    'F'        // 8c53         #5
+    'C'        // 8c54         #2
+    'A'        // 8c55         #0
+    'I'        // 8c56         #8
+    'C'        // 8c57         #2
+    'aF'       // 8c58-8c59    #5
+    'A'        // 8c5a         #0
+    'F'        // 8c5b         #5
+    'B'        // 8c5c         #1
+    'C'        // 8c5d         #2
+    'D'        // 8c5e         #3
+    'B'        // 8c5f         #1
+    'D'        // 8c60         #3
+    'aA'       // 8c61-8c62    #0
+    'F'        // 8c63         #5
+    'C'        // 8c64         #2
+    'B'        // 8c65         #1
+    'C'        // 8c66         #2
+    'D'        // 8c67         #3
+    'A'        // 8c68         #0
+    'C'        // 8c69         #2
+    'bA'       // 8c6a-8c6c    #0
+    'C'        // 8c6d         #2
+    'D'        // 8c6e         #3
+    'cB'       // 8c6f-8c72    #1
+    'A'        // 8c73         #0
+    'D'        // 8c74         #3
+    'aC'       // 8c75-8c76    #2
+    'B'        // 8c77         #1
+    'bA'       // 8c78-8c7a    #0
+    'C'        // 8c7b         #2
+    'F'        // 8c7c         #5
+    'B'        // 8c7d         #1
+    'F'        // 8c7e         #5
+    'D'        // 8c7f         #3
+    'aB'       // 8c80-8c81    #1
+    'A'        // 8c82         #0
+    'K'        // 8c83         #10
+    'B'        // 8c84         #1
+    'aC'       // 8c85-8c86    #2
+    'F'        // 8c87         #5
+    'D'        // 8c88         #3
+    'C'        // 8c89         #2
+    'A'        // 8c8a         #0
+    'F'        // 8c8b         #5
+    'aA'       // 8c8c-8c8d    #0
+    'F'        // 8c8e         #5
+    'B'        // 8c8f         #1
+    'C'        // 8c90         #2
+    'B'        // 8c91         #1
+    'C'        // 8c92         #2
+    'aA'       // 8c93-8c94    #0
+    'B'        // 8c95         #1
+    'D'        // 8c96         #3
+    'B'        // 8c97         #1
+    'A'        // 8c98         #0
+    'C'        // 8c99         #2
+    'B'        // 8c9a         #1
+    'aC'       // 8c9b-8c9c    #2
+    'eA'       // 8c9d-8ca2    #0
+    'B'        // 8ca3         #1
+    'C'        // 8ca4         #2
+    'B'        // 8ca5         #1
+    'D'        // 8ca6         #3
+    'eA'       // 8ca7-8cac    #0
+    'C'        // 8cad         #2
+    'F'        // 8cae         #5
+    'aA'       // 8caf-8cb0    #0
+    'D'        // 8cb1         #3
+    'bA'       // 8cb2-8cb4    #0
+    'B'        // 8cb5         #1
+    'gA'       // 8cb6-8cbd    #0
+    'B'        // 8cbe         #1
+    'eA'       // 8cbf-8cc4    #0
+    'C'        // 8cc5         #2
+    'J'        // 8cc6         #9
+    'aA'       // 8cc7-8cc8    #0
+    'F'        // 8cc9         #5
+    'A'        // 8cca         #0
+    'F'        // 8ccb         #5
+    'B'        // 8ccc         #1
+    'C'        // 8ccd         #2
+    'F'        // 8cce         #5
+    'C'        // 8ccf         #2
+    'D'        // 8cd0         #3
+    'A'        // 8cd1         #0
+    'C'        // 8cd2         #2
+    'A'        // 8cd3         #0
+    'B'        // 8cd4         #1
+    'aC'       // 8cd5-8cd6    #2
+    'B'        // 8cd7         #1
+    'D'        // 8cd8         #3
+    'cA'       // 8cd9-8cdc    #0
+    'C'        // 8cdd         #2
+    'A'        // 8cde         #0
+    'B'        // 8cdf         #1
+    'dA'       // 8ce0-8ce4    #0
+    'I'        // 8ce5         #8
+    'A'        // 8ce6         #0
+    'B'        // 8ce7         #1
+    'C'        // 8ce8         #2
+    'B'        // 8ce9         #1
+    'A'        // 8cea         #0
+    'B'        // 8ceb         #1
+    'aA'       // 8cec-8ced    #0
+    'B'        // 8cee         #1
+    'F'        // 8cef         #5
+    'aA'       // 8cf0-8cf1    #0
+    'C'        // 8cf2         #2
+    'I'        // 8cf3         #8
+    'A'        // 8cf4         #0
+    'C'        // 8cf5         #2
+    'D'        // 8cf6         #3
+    'aC'       // 8cf7-8cf8    #2
+    'B'        // 8cf9         #1
+    'C'        // 8cfa         #2
+    'bA'       // 8cfb-8cfd    #0
+    'C'        // 8cfe         #2
+    'F'        // 8cff         #5
+    'B'        // 8d00         #1
+    'F'        // 8d01         #5
+    'B'        // 8d02         #1
+    'C'        // 8d03         #2
+    'aA'       // 8d04-8d05    #0
+    'B'        // 8d06         #1
+    'aA'       // 8d07-8d08    #0
+    'C'        // 8d09         #2
+    'aA'       // 8d0a-8d0b    #0
+    'B'        // 8d0c         #1
+    'A'        // 8d0d         #0
+    'F'        // 8d0e         #5
+    'aA'       // 8d0f-8d10    #0
+    'B'        // 8d11         #1
+    'C'        // 8d12         #2
+    'aA'       // 8d13-8d14    #0
+    'B'        // 8d15         #1
+    'A'        // 8d16         #0
+    'C'        // 8d17         #2
+    'aB'       // 8d18-8d19    #1
+    'D'        // 8d1a         #3
+    'A'        // 8d1b         #0
+    'C'        // 8d1c         #2
+    'A'        // 8d1d         #0
+    '2qD'      // 8d1e-8d63    #3
+    'A'        // 8d64         #0
+    'F'        // 8d65         #5
+    'aA'       // 8d66-8d67    #0
+    'B'        // 8d68         #1
+    'C'        // 8d69         #2
+    'D'        // 8d6a         #3
+    'A'        // 8d6b         #0
+    'C'        // 8d6c         #2
+    'aA'       // 8d6d-8d6e    #0
+    'B'        // 8d6f         #1
+    'A'        // 8d70         #0
+    'F'        // 8d71         #5
+    'B'        // 8d72         #1
+    'aA'       // 8d73-8d74    #0
+    'D'        // 8d75         #3
+    'aA'       // 8d76-8d77    #0
+    'cB'       // 8d78-8d7b    #1
+    'D'        // 8d7c         #3
+    'B'        // 8d7d         #1
+    'D'        // 8d7e         #3
+    'F'        // 8d7f         #5
+    'B'        // 8d80         #1
+    'A'        // 8d81         #0
+    'C'        // 8d82         #2
+    'D'        // 8d83         #3
+    'C'        // 8d84         #2
+    'A'        // 8d85         #0
+    'aD'       // 8d86-8d87    #3
+    'F'        // 8d88         #5
+    'B'        // 8d89         #1
+    'A'        // 8d8a         #0
+    'D'        // 8d8b         #3
+    'B'        // 8d8c         #1
+    'C'        // 8d8d         #2
+    'I'        // 8d8e         #8
+    'B'        // 8d8f         #1
+    'A'        // 8d90         #0
+    'C'        // 8d91         #2
+    'bB'       // 8d92-8d94    #1
+    'C'        // 8d95         #2
+    'B'        // 8d96         #1
+    'aD'       // 8d97-8d98    #3
+    'A'        // 8d99         #0
+    'D'        // 8d9a         #3
+    'aB'       // 8d9b-8d9c    #1
+    'D'        // 8d9d         #3
+    'F'        // 8d9e         #5
+    'C'        // 8d9f         #2
+    'A'        // 8da0         #0
+    'B'        // 8da1         #1
+    'D'        // 8da2         #3
+    'A'        // 8da3         #0
+    'D'        // 8da4         #3
+    'B'        // 8da5         #1
+    'C'        // 8da6         #2
+    'B'        // 8da7         #1
+    'A'        // 8da8         #0
+    'aB'       // 8da9-8daa    #1
+    'A'        // 8dab         #0
+    'C'        // 8dac         #2
+    'aB'       // 8dad-8dae    #1
+    'C'        // 8daf         #2
+    'aD'       // 8db0-8db1    #3
+    'aA'       // 8db2-8db3    #0
+    'B'        // 8db4         #1
+    'C'        // 8db5         #2
+    'B'        // 8db6         #1
+    'C'        // 8db7         #2
+    'D'        // 8db8         #3
+    'C'        // 8db9         #2
+    'A'        // 8dba         #0
+    'F'        // 8dbb         #5
+    'C'        // 8dbc         #2
+    'D'        // 8dbd         #3
+    'A'        // 8dbe         #0
+    'B'        // 8dbf         #1
+    'C'        // 8dc0         #2
+    'B'        // 8dc1         #1
+    'A'        // 8dc2         #0
+    'B'        // 8dc3         #1
+    'D'        // 8dc4         #3
+    'C'        // 8dc5         #2
+    'A'        // 8dc6         #0
+    'aC'       // 8dc7-8dc8    #2
+    'D'        // 8dc9         #3
+    'F'        // 8dca         #5
+    'aA'       // 8dcb-8dcc    #0
+    'B'        // 8dcd         #1
+    'aA'       // 8dce-8dcf    #0
+    'B'        // 8dd0         #1
+    'C'        // 8dd1         #2
+    'D'        // 8dd2         #3
+    'B'        // 8dd3         #1
+    'C'        // 8dd4         #2
+    'bA'       // 8dd5-8dd7    #0
+    'B'        // 8dd8         #1
+    'aC'       // 8dd9-8dda    #2
+    'A'        // 8ddb         #0
+    'B'        // 8ddc         #1
+    'A'        // 8ddd         #0
+    'D'        // 8dde         #3
+    'A'        // 8ddf         #0
+    'B'        // 8de0         #1
+    'A'        // 8de1         #0
+    'B'        // 8de2         #1
+    'A'        // 8de3         #0
+    'C'        // 8de4         #2
+    'F'        // 8de5         #5
+    'B'        // 8de6         #1
+    'C'        // 8de7         #2
+    'A'        // 8de8         #0
+    'B'        // 8de9         #1
+    'bA'       // 8dea-8dec    #0
+    'K'        // 8ded         #10
+    'B'        // 8dee         #1
+    'A'        // 8def         #0
+    'C'        // 8df0         #2
+    'A'        // 8df1         #0
+    'C'        // 8df2         #2
+    'A'        // 8df3         #0
+    'C'        // 8df4         #2
+    'F'        // 8df5         #5
+    'cD'       // 8df6-8df9    #3
+    'B'        // 8dfa         #1
+    'D'        // 8dfb         #3
+    'A'        // 8dfc         #0
+    'C'        // 8dfd         #2
+    'B'        // 8dfe         #1
+    'C'        // 8dff         #2
+    'B'        // 8e00         #1
+    'C'        // 8e01         #2
+    'aB'       // 8e02-8e03    #1
+    'aC'       // 8e04-8e05    #2
+    'A'        // 8e06         #0
+    'B'        // 8e07         #1
+    'J'        // 8e08         #9
+    'aA'       // 8e09-8e0a    #0
+    'aF'       // 8e0b-8e0c    #5
+    'aB'       // 8e0d-8e0e    #1
+    'aA'       // 8e0f-8e10    #0
+    'C'        // 8e11         #2
+    'aB'       // 8e12-8e13    #1
+    'A'        // 8e14         #0
+    'B'        // 8e15         #1
+    'C'        // 8e16         #2
+    'eB'       // 8e17-8e1c    #1
+    'bA'       // 8e1d-8e1f    #0
+    'cC'       // 8e20-8e23    #2
+    'aB'       // 8e24-8e25    #1
+    'aC'       // 8e26-8e27    #2
+    'aB'       // 8e28-8e29    #1
+    'A'        // 8e2a         #0
+    'B'        // 8e2b         #1
+    'D'        // 8e2c         #3
+    'aB'       // 8e2d-8e2e    #1
+    'D'        // 8e2f         #3
+    'A'        // 8e30         #0
+    'C'        // 8e31         #2
+    'D'        // 8e32         #3
+    'C'        // 8e33         #2
+    'bA'       // 8e34-8e36    #0
+    'F'        // 8e37         #5
+    'aC'       // 8e38-8e39    #2
+    'I'        // 8e3a         #8
+    'D'        // 8e3b         #3
+    'B'        // 8e3c         #1
+    'A'        // 8e3d         #0
+    'aB'       // 8e3e-8e3f    #1
+    'A'        // 8e40         #0
+    'C'        // 8e41         #2
+    'A'        // 8e42         #0
+    'D'        // 8e43         #3
+    'A'        // 8e44         #0
+    'aB'       // 8e45-8e46    #1
+    'cA'       // 8e47-8e4a    #0
+    'C'        // 8e4b         #2
+    'A'        // 8e4c         #0
+    'aC'       // 8e4d-8e4e    #2
+    'A'        // 8e4f         #0
+    'C'        // 8e50         #2
+    'aD'       // 8e51-8e52    #3
+    'B'        // 8e53         #1
+    'C'        // 8e54         #2
+    'A'        // 8e55         #0
+    'aB'       // 8e56-8e57    #1
+    'D'        // 8e58         #3
+    'A'        // 8e59         #0
+    'B'        // 8e5a         #1
+    'C'        // 8e5b         #2
+    'A'        // 8e5c         #0
+    'aC'       // 8e5d-8e5e    #2
+    'aA'       // 8e5f-8e60    #0
+    'aC'       // 8e61-8e62    #2
+    'aA'       // 8e63-8e64    #0
+    'cB'       // 8e65-8e68    #1
+    'C'        // 8e69         #2
+    'B'        // 8e6a         #1
+    'D'        // 8e6b         #3
+    'aC'       // 8e6c-8e6d    #2
+    'D'        // 8e6e         #3
+    'C'        // 8e6f         #2
+    'F'        // 8e70         #5
+    'C'        // 8e71         #2
+    'A'        // 8e72         #0
+    'B'        // 8e73         #1
+    'A'        // 8e74         #0
+    'C'        // 8e75         #2
+    'A'        // 8e76         #0
+    'C'        // 8e77         #2
+    'B'        // 8e78         #1
+    'F'        // 8e79         #5
+    'C'        // 8e7a         #2
+    'A'        // 8e7b         #0
+    'C'        // 8e7c         #2
+    'D'        // 8e7d         #3
+    'B'        // 8e7e         #1
+    'D'        // 8e7f         #3
+    'B'        // 8e80         #1
+    'A'        // 8e81         #0
+    'C'        // 8e82         #2
+    'F'        // 8e83         #5
+    'C'        // 8e84         #2
+    'A'        // 8e85         #0
+    'B'        // 8e86         #1
+    'A'        // 8e87         #0
+    'B'        // 8e88         #1
+    'bA'       // 8e89-8e8b    #0
+    'B'        // 8e8c         #1
+    'A'        // 8e8d         #0
+    'B'        // 8e8e         #1
+    'D'        // 8e8f         #3
+    'aA'       // 8e90-8e91    #0
+    'C'        // 8e92         #2
+    'aA'       // 8e93-8e94    #0
+    'C'        // 8e95         #2
+    'aB'       // 8e96-8e97    #1
+    'C'        // 8e98         #2
+    'J'        // 8e99         #9
+    'C'        // 8e9a         #2
+    'F'        // 8e9b         #5
+    'D'        // 8e9c         #3
+    'C'        // 8e9d         #2
+    'A'        // 8e9e         #0
+    'aB'       // 8e9f-8ea0    #1
+    'A'        // 8ea1         #0
+    'F'        // 8ea2         #5
+    'cB'       // 8ea3-8ea6    #1
+    'C'        // 8ea7         #2
+    'B'        // 8ea8         #1
+    'cA'       // 8ea9-8eac    #0
+    'C'        // 8ead         #2
+    'aF'       // 8eae-8eaf    #5
+    'C'        // 8eb0         #2
+    'J'        // 8eb1         #9
+    'B'        // 8eb2         #1
+    'J'        // 8eb3         #9
+    'D'        // 8eb4         #3
+    'F'        // 8eb5         #5
+    'C'        // 8eb6         #2
+    'aD'       // 8eb7-8eb8    #3
+    'B'        // 8eb9         #1
+    'C'        // 8eba         #2
+    'F'        // 8ebb         #5
+    'aB'       // 8ebc-8ebd    #1
+    'J'        // 8ebe         #9
+    'D'        // 8ebf         #3
+    'A'        // 8ec0         #0
+    'F'        // 8ec1         #5
+    'B'        // 8ec2         #1
+    'C'        // 8ec3         #2
+    'aF'       // 8ec4-8ec5    #5
+    'J'        // 8ec6         #9
+    'aF'       // 8ec7-8ec8    #5
+    'B'        // 8ec9         #1
+    'cA'       // 8eca-8ecd    #0
+    'B'        // 8ece         #1
+    'C'        // 8ecf         #2
+    'D'        // 8ed0         #3
+    'C'        // 8ed1         #2
+    'A'        // 8ed2         #0
+    'B'        // 8ed3         #1
+    'C'        // 8ed4         #2
+    'aD'       // 8ed5-8ed6    #3
+    'aB'       // 8ed7-8ed8    #1
+    'D'        // 8ed9         #3
+    'B'        // 8eda         #1
+    'aC'       // 8edb-8edc    #2
+    'B'        // 8edd         #1
+    'I'        // 8ede         #8
+    'A'        // 8edf         #0
+    'aB'       // 8ee0-8ee1    #1
+    'A'        // 8ee2         #0
+    'F'        // 8ee3         #5
+    'cB'       // 8ee4-8ee7    #1
+    'A'        // 8ee8         #0
+    'B'        // 8ee9         #1
+    'D'        // 8eea         #3
+    'A'        // 8eeb         #0
+    'B'        // 8eec         #1
+    'aC'       // 8eed-8eee    #2
+    'B'        // 8eef         #1
+    'F'        // 8ef0         #5
+    'C'        // 8ef1         #2
+    'B'        // 8ef2         #1
+    'D'        // 8ef3         #3
+    'bB'       // 8ef4-8ef6    #1
+    'C'        // 8ef7         #2
+    'dA'       // 8ef8-8efc    #0
+    'F'        // 8efd         #5
+    'A'        // 8efe         #0
+    'B'        // 8eff         #1
+    'C'        // 8f00         #2
+    'B'        // 8f01         #1
+    'C'        // 8f02         #2
+    'A'        // 8f03         #0
+    'D'        // 8f04         #3
+    'A'        // 8f05         #0
+    'B'        // 8f06         #1
+    'bA'       // 8f07-8f09    #0
+    'C'        // 8f0a         #2
+    'B'        // 8f0b         #1
+    'F'        // 8f0c         #5
+    'aB'       // 8f0d-8f0e    #1
+    'F'        // 8f0f         #5
+    'C'        // 8f10         #2
+    'B'        // 8f11         #1
+    'cA'       // 8f12-8f15    #0
+    'cC'       // 8f16-8f19    #2
+    'B'        // 8f1a         #1
+    'dA'       // 8f1b-8f1f    #0
+    'C'        // 8f20         #2
+    'F'        // 8f21         #5
+    'D'        // 8f22         #3
+    'C'        // 8f23         #2
+    'B'        // 8f24         #1
+    'C'        // 8f25         #2
+    'A'        // 8f26         #0
+    'aJ'       // 8f27-8f28    #9
+    'aA'       // 8f29-8f2a    #0
+    'F'        // 8f2b         #5
+    'C'        // 8f2c         #2
+    'A'        // 8f2d         #0
+    'C'        // 8f2e         #2
+    'A'        // 8f2f         #0
+    'I'        // 8f30         #8
+    'D'        // 8f31         #3
+    'B'        // 8f32         #1
+    'A'        // 8f33         #0
+    'cC'       // 8f34-8f37    #2
+    'aA'       // 8f38-8f39    #0
+    'F'        // 8f3a         #5
+    'A'        // 8f3b         #0
+    'B'        // 8f3c         #1
+    'D'        // 8f3d         #3
+    'bA'       // 8f3e-8f40    #0
+    'C'        // 8f41         #2
+    'A'        // 8f42         #0
+    'C'        // 8f43         #2
+    'bA'       // 8f44-8f46    #0
+    'C'        // 8f47         #2
+    'B'        // 8f48         #1
+    'A'        // 8f49         #0
+    'C'        // 8f4a         #2
+    'B'        // 8f4b         #1
+    'F'        // 8f4c         #5
+    'aA'       // 8f4d-8f4e    #0
+    'C'        // 8f4f         #2
+    'B'        // 8f50         #1
+    'C'        // 8f51         #2
+    'A'        // 8f52         #0
+    'C'        // 8f53         #2
+    'A'        // 8f54         #0
+    'C'        // 8f55         #2
+    'B'        // 8f56         #1
+    'aA'       // 8f57-8f58    #0
+    'bB'       // 8f59-8f5b    #1
+    'C'        // 8f5c         #2
+    'bA'       // 8f5d-8f5f    #0
+    'B'        // 8f60         #1
+    'cA'       // 8f61-8f64    #0
+    'F'        // 8f65         #5
+    'A'        // 8f66         #0
+    'B'        // 8f67         #1
+    'eD'       // 8f68-8f6d    #3
+    'B'        // 8f6e         #1
+    '1iD'      // 8f6f-8f92    #3
+    'B'        // 8f93         #1
+    'fD'       // 8f94-8f9a    #3
+    'aA'       // 8f9b-8f9c    #0
+    'aF'       // 8f9d-8f9e    #5
+    'A'        // 8f9f         #0
+    'C'        // 8fa0         #2
+    'F'        // 8fa1         #5
+    'J'        // 8fa2         #9
+    'A'        // 8fa3         #0
+    'F'        // 8fa4         #5
+    'C'        // 8fa5         #2
+    'A'        // 8fa6         #0
+    'C'        // 8fa7         #2
+    'A'        // 8fa8         #0
+    'cD'       // 8fa9-8fac    #3
+    'eA'       // 8fad-8fb2    #0
+    'B'        // 8fb3         #1
+    'C'        // 8fb4         #2
+    'aA'       // 8fb5-8fb6    #0
+    'aC'       // 8fb7-8fb8    #2
+    'B'        // 8fb9         #1
+    'C'        // 8fba         #2
+    'A'        // 8fbb         #0
+    'C'        // 8fbc         #2
+    'D'        // 8fbd         #3
+    'C'        // 8fbe         #2
+    'A'        // 8fbf         #0
+    'J'        // 8fc0         #9
+    'C'        // 8fc1         #2
+    'A'        // 8fc2         #0
+    'K'        // 8fc3         #10
+    'aA'       // 8fc4-8fc5    #0
+    'C'        // 8fc6         #2
+    'D'        // 8fc7         #3
+    'F'        // 8fc8         #5
+    'B'        // 8fc9         #1
+    'aC'       // 8fca-8fcb    #2
+    'B'        // 8fcc         #1
+    'aA'       // 8fcd-8fce    #0
+    'B'        // 8fcf         #1
+    'aA'       // 8fd0-8fd1    #0
+    'C'        // 8fd2         #2
+    'bA'       // 8fd3-8fd5    #0
+    'aB'       // 8fd6-8fd7    #1
+    'aD'       // 8fd8-8fd9    #3
+    'C'        // 8fda         #2
+    'dD'       // 8fdb-8fdf    #3
+    'C'        // 8fe0         #2
+    'B'        // 8fe1         #1
+    'A'        // 8fe2         #0
+    'C'        // 8fe3         #2
+    'bA'       // 8fe4-8fe6    #0
+    'D'        // 8fe7         #3
+    'A'        // 8fe8         #0
+    'F'        // 8fe9         #5
+    'aA'       // 8fea-8feb    #0
+    'K'        // 8fec         #10
+    'A'        // 8fed         #0
+    'C'        // 8fee         #2
+    'F'        // 8fef         #5
+    'A'        // 8ff0         #0
+    'F'        // 8ff1         #5
+    'K'        // 8ff2         #10
+    'D'        // 8ff3         #3
+    'A'        // 8ff4         #0
+    'aC'       // 8ff5-8ff6    #2
+    'cA'       // 8ff7-8ffa    #0
+    'C'        // 8ffb         #2
+    'I'        // 8ffc         #8
+    'A'        // 8ffd         #0
+    'C'        // 8ffe         #2
+    'I'        // 8fff         #8
+    'cA'       // 9000-9003    #0
+    'C'        // 9004         #2
+    'aA'       // 9005-9006    #0
+    'D'        // 9007         #3
+    'A'        // 9008         #0
+    'aD'       // 9009-900a    #3
+    'bA'       // 900b-900d    #0
+    'J'        // 900e         #9
+    'bA'       // 900f-9011    #0
+    'B'        // 9012         #1
+    'F'        // 9013         #5
+    'cA'       // 9014-9017    #0
+    'F'        // 9018         #5
+    'aA'       // 9019-901a    #0
+    'C'        // 901b         #2
+    'B'        // 901c         #1
+    'fA'       // 901d-9023    #0
+    'B'        // 9024         #1
+    'aD'       // 9025-9026    #3
+    'cF'       // 9027-902a    #5
+    'D'        // 902b         #3
+    'F'        // 902c         #5
+    'C'        // 902d         #2
+    'A'        // 902e         #0
+    'C'        // 902f         #2
+    'D'        // 9030         #3
+    'aA'       // 9031-9032    #0
+    'C'        // 9033         #2
+    'bA'       // 9034-9036    #0
+    'C'        // 9037         #2
+    'A'        // 9038         #0
+    'F'        // 9039         #5
+    'aD'       // 903a-903b    #3
+    'A'        // 903c         #0
+    'B'        // 903d         #1
+    'A'        // 903e         #0
+    'C'        // 903f         #2
+    'D'        // 9040         #3
+    'aA'       // 9041-9042    #0
+    'F'        // 9043         #5
+    'C'        // 9044         #2
+    'F'        // 9045         #5
+    'B'        // 9046         #1
+    'A'        // 9047         #0
+    'D'        // 9048         #3
+    'bA'       // 9049-904b    #0
+    'C'        // 904c         #2
+    'hA'       // 904d-9055    #0
+    'C'        // 9056         #2
+    'D'        // 9057         #3
+    'aA'       // 9058-9059    #0
+    'D'        // 905a         #3
+    'cA'       // 905b-905e    #0
+    'D'        // 905f         #3
+    'aA'       // 9060-9061    #0
+    'C'        // 9062         #2
+    'A'        // 9063         #0
+    'B'        // 9064         #1
+    'aF'       // 9065-9066    #5
+    'C'        // 9067         #2
+    'aA'       // 9068-9069    #0
+    'D'        // 906a         #3
+    'B'        // 906b         #1
+    'cA'       // 906c-906f    #0
+    'C'        // 9070         #2
+    'D'        // 9071         #3
+    'A'        // 9072         #0
+    'B'        // 9073         #1
+    'C'        // 9074         #2
+    'cA'       // 9075-9078    #0
+    'C'        // 9079         #2
+    'A'        // 907a         #0
+    'B'        // 907b         #1
+    'aA'       // 907c-907d    #0
+    'I'        // 907e         #8
+    'fA'       // 907f-9085    #0
+    'B'        // 9086         #1
+    'aA'       // 9087-9088    #0
+    'F'        // 9089         #5
+    'A'        // 908a         #0
+    'C'        // 908b         #2
+    'J'        // 908c         #9
+    'I'        // 908d         #8
+    'F'        // 908e         #5
+    'bA'       // 908f-9091    #0
+    'aD'       // 9092-9093    #3
+    'B'        // 9094         #1
+    'A'        // 9095         #0
+    'D'        // 9096         #3
+    'bA'       // 9097-9099    #0
+    'D'        // 909a         #3
+    'C'        // 909b         #2
+    'aD'       // 909c-909d    #3
+    'aB'       // 909e-909f    #1
+    'A'        // 90a0         #0
+    'C'        // 90a1         #2
+    'aA'       // 90a2-90a3    #0
+    'D'        // 90a4         #3
+    'C'        // 90a5         #2
+    'A'        // 90a6         #0
+    'B'        // 90a7         #1
+    'A'        // 90a8         #0
+    'D'        // 90a9         #3
+    'A'        // 90aa         #0
+    'bD'       // 90ab-90ad    #3
+    'B'        // 90ae         #1
+    'bA'       // 90af-90b1    #0
+    'C'        // 90b2         #2
+    'A'        // 90b3         #0
+    'C'        // 90b4         #2
+    'A'        // 90b5         #0
+    'C'        // 90b6         #2
+    'D'        // 90b7         #3
+    'A'        // 90b8         #0
+    'aD'       // 90b9-90ba    #3
+    'B'        // 90bb         #1
+    'D'        // 90bc         #3
+    'aA'       // 90bd-90be    #0
+    'B'        // 90bf         #1
+    'D'        // 90c0         #3
+    'A'        // 90c1         #0
+    'D'        // 90c2         #3
+    'bA'       // 90c3-90c5    #0
+    'D'        // 90c6         #3
+    'aC'       // 90c7-90c8    #2
+    'F'        // 90c9         #5
+    'A'        // 90ca         #0
+    'B'        // 90cb         #1
+    'F'        // 90cc         #5
+    'D'        // 90cd         #3
+    'A'        // 90ce         #0
+    'bD'       // 90cf-90d1    #3
+    'F'        // 90d2         #5
+    'D'        // 90d3         #3
+    'B'        // 90d4         #1
+    'C'        // 90d5         #2
+    'B'        // 90d6         #1
+    'bC'       // 90d7-90d9    #2
+    'B'        // 90da         #1
+    'C'        // 90db         #2
+    'aA'       // 90dc-90dd    #0
+    'J'        // 90de         #9
+    'C'        // 90df         #2
+    'B'        // 90e0         #1
+    'aA'       // 90e1-90e2    #0
+    'B'        // 90e3         #1
+    'aC'       // 90e4-90e5    #2
+    'aD'       // 90e6-90e7    #3
+    'A'        // 90e8         #0
+    'B'        // 90e9         #1
+    'I'        // 90ea         #8
+    'A'        // 90eb         #0
+    'B'        // 90ec         #1
+    'A'        // 90ed         #0
+    'D'        // 90ee         #3
+    'A'        // 90ef         #0
+    'C'        // 90f0         #2
+    'B'        // 90f1         #1
+    'C'        // 90f2         #2
+    'I'        // 90f3         #8
+    'aA'       // 90f4-90f5    #0
+    'aF'       // 90f6-90f7    #5
+    'D'        // 90f8         #3
+    'cB'       // 90f9-90fc    #1
+    'A'        // 90fd         #0
+    'bC'       // 90fe-9100    #2
+    'B'        // 9101         #1
+    'A'        // 9102         #0
+    'B'        // 9103         #1
+    'bC'       // 9104-9106    #2
+    'B'        // 9107         #1
+    'C'        // 9108         #2
+    'B'        // 9109         #1
+    'D'        // 910a         #3
+    'B'        // 910b         #1
+    'D'        // 910c         #3
+    'C'        // 910d         #2
+    'aB'       // 910e-910f    #1
+    'C'        // 9110         #2
+    'B'        // 9111         #1
+    'A'        // 9112         #0
+    'D'        // 9113         #3
+    'C'        // 9114         #2
+    'J'        // 9115         #9
+    'aA'       // 9116-9117    #0
+    'C'        // 9118         #2
+    'A'        // 9119         #0
+    'C'        // 911a         #2
+    'B'        // 911b         #1
+    'C'        // 911c         #2
+    'B'        // 911d         #1
+    'A'        // 911e         #0
+    'B'        // 911f         #1
+    'C'        // 9120         #2
+    'B'        // 9121         #1
+    'aA'       // 9122-9123    #0
+    'B'        // 9124         #1
+    'F'        // 9125         #5
+    'B'        // 9126         #1
+    'A'        // 9127         #0
+    'B'        // 9128         #1
+    'C'        // 9129         #2
+    'bB'       // 912a-912c    #1
+    'A'        // 912d         #0
+    'aC'       // 912e-912f    #2
+    'bA'       // 9130-9132    #0
+    'B'        // 9133         #1
+    'A'        // 9134         #0
+    'B'        // 9135         #1
+    'C'        // 9136         #2
+    'F'        // 9137         #5
+    'B'        // 9138         #1
+    'aC'       // 9139-913a    #2
+    'B'        // 913b         #1
+    'F'        // 913c         #5
+    'J'        // 913d         #9
+    'cB'       // 913e-9141    #1
+    'D'        // 9142         #3
+    'C'        // 9143         #2
+    'aB'       // 9144-9145    #1
+    'aC'       // 9146-9147    #2
+    'fA'       // 9148-914e    #0
+    'C'        // 914f         #2
+    'aB'       // 9150-9151    #1
+    'A'        // 9152         #0
+    'C'        // 9153         #2
+    'F'        // 9154         #5
+    'B'        // 9155         #1
+    'aA'       // 9156-9157    #0
+    'bC'       // 9158-915a    #2
+    'F'        // 915b         #5
+    'B'        // 915c         #1
+    'D'        // 915d         #3
+    'bB'       // 915e-9160    #1
+    'C'        // 9161         #2
+    'cA'       // 9162-9165    #0
+    'D'        // 9166         #3
+    'C'        // 9167         #2
+    'B'        // 9168         #1
+    'aA'       // 9169-916a    #0
+    'D'        // 916b         #3
+    'A'        // 916c         #0
+    'F'        // 916d         #5
+    'bB'       // 916e-9170    #1
+    'D'        // 9171         #3
+    'A'        // 9172         #0
+    'C'        // 9173         #2
+    'aA'       // 9174-9175    #0
+    'I'        // 9176         #8
+    'bA'       // 9177-9179    #0
+    'C'        // 917a         #2
+    'F'        // 917b         #5
+    'B'        // 917c         #1
+    'bD'       // 917d-917f    #3
+    'B'        // 9180         #1
+    'aC'       // 9181-9182    #2
+    'A'        // 9183         #0
+    'B'        // 9184         #1
+    'aC'       // 9185-9186    #2
+    'A'        // 9187         #0
+    'D'        // 9188         #3
+    'A'        // 9189         #0
+    'C'        // 918a         #2
+    'A'        // 918b         #0
+    'B'        // 918c         #1
+    'A'        // 918d         #0
+    'C'        // 918e         #2
+    'B'        // 918f         #1
+    'A'        // 9190         #0
+    'C'        // 9191         #2
+    'A'        // 9192         #0
+    'C'        // 9193         #2
+    'aF'       // 9194-9195    #5
+    'B'        // 9196         #1
+    'aF'       // 9197-9198    #5
+    'bB'       // 9199-919b    #1
+    'A'        // 919c         #0
+    'B'        // 919d         #1
+    'A'        // 919e         #0
+    'aB'       // 919f-91a0    #1
+    'C'        // 91a1         #2
+    'A'        // 91a2         #0
+    'B'        // 91a3         #1
+    'F'        // 91a4         #5
+    'B'        // 91a5         #1
+    'F'        // 91a6         #5
+    'B'        // 91a7         #1
+    'C'        // 91a8         #2
+    'B'        // 91a9         #1
+    'bA'       // 91aa-91ac    #0
+    'C'        // 91ad         #2
+    'aA'       // 91ae-91af    #0
+    'C'        // 91b0         #2
+    'aA'       // 91b1-91b2    #0
+    'C'        // 91b3         #2
+    'aA'       // 91b4-91b5    #0
+    'C'        // 91b6         #2
+    'B'        // 91b7         #1
+    'F'        // 91b8         #5
+    'B'        // 91b9         #1
+    'aC'       // 91ba-91bb    #2
+    'A'        // 91bc         #0
+    'C'        // 91bd         #2
+    'B'        // 91be         #1
+    'F'        // 91bf         #5
+    'aA'       // 91c0-91c1    #0
+    'C'        // 91c2         #2
+    'A'        // 91c3         #0
+    'C'        // 91c4         #2
+    'bA'       // 91c5-91c7    #0
+    'F'        // 91c8         #5
+    'A'        // 91c9         #0
+    'D'        // 91ca         #3
+    'fA'       // 91cb-91d1    #0
+    'D'        // 91d2         #3
+    'aC'       // 91d3-91d4    #2
+    'B'        // 91d5         #1
+    'C'        // 91d6         #2
+    'aA'       // 91d7-91d8    #0
+    'aC'       // 91d9-91da    #2
+    'F'        // 91db         #5
+    'aA'       // 91dc-91dd    #0
+    'F'        // 91de         #5
+    'C'        // 91df         #2
+    'D'        // 91e0         #3
+    'F'        // 91e1         #5
+    'B'        // 91e2         #1
+    'dA'       // 91e3-91e7    #0
+    'B'        // 91e8         #1
+    'aA'       // 91e9-91ea    #0
+    'B'        // 91eb         #1
+    'C'        // 91ec         #2
+    'A'        // 91ed         #0
+    'C'        // 91ee         #2
+    'aF'       // 91ef-91f0    #5
+    'C'        // 91f1         #2
+    'D'        // 91f2         #3
+    'aB'       // 91f3-91f4    #1
+    'A'        // 91f5         #0
+    'aC'       // 91f6-91f7    #2
+    'B'        // 91f8         #1
+    'C'        // 91f9         #2
+    'B'        // 91fa         #1
+    'aF'       // 91fb-91fc    #5
+    'C'        // 91fd         #2
+    'B'        // 91fe         #1
+    'A'        // 91ff         #0
+    'aC'       // 9200-9201    #2
+    'aB'       // 9202-9203    #1
+    'bC'       // 9204-9206    #2
+    'A'        // 9207         #0
+    'B'        // 9208         #1
+    'aC'       // 9209-920a    #2
+    'D'        // 920b         #3
+    'C'        // 920c         #2
+    'A'        // 920d         #0
+    'C'        // 920e         #2
+    'B'        // 920f         #1
+    'bA'       // 9210-9212    #0
+    'C'        // 9213         #2
+    'aA'       // 9214-9215    #0
+    'C'        // 9216         #2
+    'A'        // 9217         #0
+    'C'        // 9218         #2
+    'aB'       // 9219-921a    #1
+    'D'        // 921b         #3
+    'A'        // 921c         #0
+    'F'        // 921d         #5
+    'A'        // 921e         #0
+    'K'        // 921f         #10
+    'D'        // 9220         #3
+    'B'        // 9221         #1
+    'D'        // 9222         #3
+    'bC'       // 9223-9225    #2
+    'A'        // 9226         #0
+    'B'        // 9227         #1
+    'C'        // 9228         #2
+    'F'        // 9229         #5
+    'aB'       // 922a-922b    #1
+    'F'        // 922c         #5
+    'B'        // 922d         #1
+    'C'        // 922e         #2
+    'F'        // 922f         #5
+    'C'        // 9230         #2
+    'I'        // 9231         #8
+    'B'        // 9232         #1
+    'C'        // 9233         #2
+    'aA'       // 9234-9235    #0
+    'C'        // 9236         #2
+    'aA'       // 9237-9238    #0
+    'C'        // 9239         #2
+    'A'        // 923a         #0
+    'D'        // 923b         #3
+    'C'        // 923c         #2
+    'B'        // 923d         #1
+    'C'        // 923e         #2
+    'aA'       // 923f-9240    #0
+    'I'        // 9241         #8
+    'aF'       // 9242-9243    #5
+    'aA'       // 9244-9245    #0
+    'C'        // 9246         #2
+    'F'        // 9247         #5
+    'C'        // 9248         #2
+    'A'        // 9249         #0
+    'C'        // 924a         #2
+    'A'        // 924b         #0
+    'B'        // 924c         #1
+    'dA'       // 924d-9251    #0
+    'I'        // 9252         #8
+    'bB'       // 9253-9255    #1
+    'C'        // 9256         #2
+    'A'        // 9257         #0
+    'C'        // 9258         #2
+    'F'        // 9259         #5
+    'C'        // 925a         #2
+    'A'        // 925b         #0
+    'F'        // 925c         #5
+    'C'        // 925d         #2
+    'A'        // 925e         #0
+    'B'        // 925f         #1
+    'aC'       // 9260-9261    #2
+    'A'        // 9262         #0
+    'B'        // 9263         #1
+    'bA'       // 9264-9266    #0
+    'C'        // 9267         #2
+    'aF'       // 9268-9269    #5
+    'D'        // 926a         #3
+    'bB'       // 926b-926d    #1
+    'bC'       // 926e-9270    #2
+    'F'        // 9271         #5
+    'B'        // 9272         #1
+    'aD'       // 9273-9274    #3
+    'F'        // 9275         #5
+    'C'        // 9276         #2
+    'aA'       // 9277-9278    #0
+    'C'        // 9279         #2
+    'B'        // 927a         #1
+    'C'        // 927b         #2
+    'A'        // 927c         #0
+    'C'        // 927d         #2
+    'A'        // 927e         #0
+    'C'        // 927f         #2
+    'A'        // 9280         #0
+    'aB'       // 9281-9282    #1
+    'A'        // 9283         #0
+    'B'        // 9284         #1
+    'A'        // 9285         #0
+    'aB'       // 9286-9287    #1
+    'bC'       // 9288-928a    #2
+    'I'        // 928b         #8
+    'B'        // 928c         #1
+    'aC'       // 928d-928e    #2
+    'B'        // 928f         #1
+    'D'        // 9290         #3
+    'A'        // 9291         #0
+    'F'        // 9292         #5
+    'A'        // 9293         #0
+    'B'        // 9294         #1
+    'aA'       // 9295-9296    #0
+    'C'        // 9297         #2
+    'dA'       // 9298-929c    #0
+    'B'        // 929d         #1
+    'D'        // 929e         #3
+    'F'        // 929f         #5
+    'C'        // 92a0         #2
+    'bB'       // 92a1-92a3    #1
+    'aC'       // 92a4-92a5    #2
+    'B'        // 92a6         #1
+    'aC'       // 92a7-92a8    #2
+    'aB'       // 92a9-92aa    #1
+    'C'        // 92ab         #2
+    'B'        // 92ac         #1
+    'F'        // 92ad         #5
+    'B'        // 92ae         #1
+    'F'        // 92af         #5
+    'D'        // 92b0         #3
+    'B'        // 92b1         #1
+    'C'        // 92b2         #2
+    'A'        // 92b3         #0
+    'I'        // 92b4         #8
+    'B'        // 92b5         #1
+    'aA'       // 92b6-92b7    #0
+    'F'        // 92b8         #5
+    'A'        // 92b9         #0
+    'bC'       // 92ba-92bc    #2
+    'F'        // 92bd         #5
+    'B'        // 92be         #1
+    'dC'       // 92bf-92c3    #2
+    'B'        // 92c4         #1
+    'C'        // 92c5         #2
+    'A'        // 92c6         #0
+    'aC'       // 92c7-92c8    #2
+    'aB'       // 92c9-92ca    #1
+    'C'        // 92cb         #2
+    'A'        // 92cc         #0
+    'aC'       // 92cd-92ce    #2
+    'A'        // 92cf         #0
+    'C'        // 92d0         #2
+    'I'        // 92d1         #8
+    'A'        // 92d2         #0
+    'C'        // 92d3         #2
+    'B'        // 92d4         #1
+    'A'        // 92d5         #0
+    'D'        // 92d6         #3
+    'A'        // 92d7         #0
+    'aC'       // 92d8-92d9    #2
+    'D'        // 92da         #3
+    'B'        // 92db         #1
+    'F'        // 92dc         #5
+    'C'        // 92dd         #2
+    'B'        // 92de         #1
+    'A'        // 92df         #0
+    'aC'       // 92e0-92e1    #2
+    'D'        // 92e2         #3
+    'C'        // 92e3         #2
+    'aA'       // 92e4-92e5    #0
+    'B'        // 92e6         #1
+    'bC'       // 92e7-92e9    #2
+    'A'        // 92ea         #0
+    'B'        // 92eb         #1
+    'bC'       // 92ec-92ee    #2
+    'B'        // 92ef         #1
+    'C'        // 92f0         #2
+    'B'        // 92f1         #1
+    'A'        // 92f2         #0
+    'C'        // 92f3         #2
+    'B'        // 92f4         #1
+    'D'        // 92f5         #3
+    'B'        // 92f6         #1
+    'C'        // 92f7         #2
+    'bA'       // 92f8-92fa    #0
+    'C'        // 92fb         #2
+    'A'        // 92fc         #0
+    'aI'       // 92fd-92fe    #8
+    'C'        // 92ff         #2
+    'A'        // 9300         #0
+    'B'        // 9301         #1
+    'C'        // 9302         #2
+    'B'        // 9303         #1
+    'A'        // 9304         #0
+    'D'        // 9305         #3
+    'A'        // 9306         #0
+    'B'        // 9307         #1
+    'C'        // 9308         #2
+    'B'        // 9309         #1
+    'D'        // 930a         #3
+    'aB'       // 930b-930c    #1
+    'C'        // 930d         #2
+    'B'        // 930e         #1
+    'aA'       // 930f-9310    #0
+    'F'        // 9311         #5
+    'aB'       // 9312-9313    #1
+    'C'        // 9314         #2
+    'A'        // 9315         #0
+    'B'        // 9316         #1
+    'D'        // 9317         #3
+    'bA'       // 9318-931a    #0
+    'B'        // 931b         #1
+    'F'        // 931c         #5
+    'C'        // 931d         #2
+    'fA'       // 931e-9324    #0
+    'C'        // 9325         #2
+    'bA'       // 9326-9328    #0
+    'C'        // 9329         #2
+    'bA'       // 932a-932c    #0
+    'B'        // 932d         #1
+    'aA'       // 932e-932f    #0
+    'aB'       // 9330-9331    #1
+    'F'        // 9332         #5
+    'cC'       // 9333-9336    #2
+    'F'        // 9337         #5
+    'aB'       // 9338-9339    #1
+    'aF'       // 933a-933b    #5
+    'B'        // 933c         #1
+    'bD'       // 933d-933f    #3
+    'cB'       // 9340-9343    #1
+    'C'        // 9344         #2
+    'aB'       // 9345-9346    #1
+    'C'        // 9347         #2
+    'cA'       // 9348-934b    #0
+    'B'        // 934c         #1
+    'A'        // 934d         #0
+    'aB'       // 934e-934f    #1
+    'C'        // 9350         #2
+    'A'        // 9351         #0
+    'C'        // 9352         #2
+    'D'        // 9353         #3
+    'A'        // 9354         #0
+    'aC'       // 9355-9356    #2
+    'A'        // 9357         #0
+    'C'        // 9358         #2
+    'B'        // 9359         #1
+    'C'        // 935a         #2
+    'aA'       // 935b-935c    #0
+    'K'        // 935d         #10
+    'C'        // 935e         #2
+    'B'        // 935f         #1
+    'C'        // 9360         #2
+    'bB'       // 9361-9363    #1
+    'aA'       // 9364-9365    #0
+    'B'        // 9366         #1
+    'C'        // 9367         #2
+    'B'        // 9368         #1
+    'aC'       // 9369-936a    #2
+    'aA'       // 936b-936c    #0
+    'C'        // 936d         #2
+    'A'        // 936e         #0
+    'F'        // 936f         #5
+    'A'        // 9370         #0
+    'C'        // 9371         #2
+    'K'        // 9372         #10
+    'aC'       // 9373-9374    #2
+    'A'        // 9375         #0
+    'C'        // 9376         #2
+    'bB'       // 9377-9379    #1
+    'C'        // 937a         #2
+    'B'        // 937b         #1
+    'A'        // 937c         #0
+    'C'        // 937d         #2
+    'A'        // 937e         #0
+    'F'        // 937f         #5
+    'bC'       // 9380-9382    #2
+    'dB'       // 9383-9387    #1
+    'C'        // 9388         #2
+    'B'        // 9389         #1
+    'A'        // 938a         #0
+    'F'        // 938b         #5
+    'A'        // 938c         #0
+    'C'        // 938d         #2
+    'B'        // 938e         #1
+    'C'        // 938f         #2
+    'aB'       // 9390-9391    #1
+    'C'        // 9392         #2
+    'D'        // 9393         #3
+    'A'        // 9394         #0
+    'C'        // 9395         #2
+    'aA'       // 9396-9397    #0
+    'C'        // 9398         #2
+    'B'        // 9399         #1
+    'aA'       // 939a-939b    #0
+    'aB'       // 939c-939d    #1
+    'C'        // 939e         #2
+    'aI'       // 939f-93a0    #8
+    'A'        // 93a1         #0
+    'B'        // 93a2         #1
+    'aA'       // 93a3-93a4    #0
+    'B'        // 93a5         #1
+    'C'        // 93a6         #2
+    'A'        // 93a7         #0
+    'aC'       // 93a8-93a9    #2
+    'B'        // 93aa         #1
+    'F'        // 93ab         #5
+    'aA'       // 93ac-93ad    #0
+    'C'        // 93ae         #2
+    'B'        // 93af         #1
+    'A'        // 93b0         #0
+    'bB'       // 93b1-93b3    #1
+    'aC'       // 93b4-93b5    #2
+    'F'        // 93b6         #5
+    'aB'       // 93b7-93b8    #1
+    'aF'       // 93b9-93ba    #5
+    'A'        // 93bb         #0
+    'D'        // 93bc         #3
+    'B'        // 93bd         #1
+    'D'        // 93be         #3
+    'aB'       // 93bf-93c0    #1
+    'F'        // 93c1         #5
+    'B'        // 93c2         #1
+    'A'        // 93c3         #0
+    'C'        // 93c4         #2
+    'F'        // 93c5         #5
+    'C'        // 93c6         #2
+    'aA'       // 93c7-93c8    #0
+    'F'        // 93c9         #5
+    'bA'       // 93ca-93cc    #0
+    'C'        // 93cd         #2
+    'aB'       // 93ce-93cf    #1
+    'C'        // 93d0         #2
+    'A'        // 93d1         #0
+    'B'        // 93d2         #1
+    'C'        // 93d3         #2
+    'aB'       // 93d4-93d5    #1
+    'bA'       // 93d6-93d8    #0
+    'C'        // 93d9         #2
+    'aB'       // 93da-93db    #1
+    'cA'       // 93dc-93df    #0
+    'B'        // 93e0         #1
+    'aA'       // 93e1-93e2    #0
+    'B'        // 93e3         #1
+    'A'        // 93e4         #0
+    'F'        // 93e5         #5
+    'A'        // 93e6         #0
+    'C'        // 93e7         #2
+    'A'        // 93e8         #0
+    'bD'       // 93e9-93eb    #3
+    'B'        // 93ec         #1
+    'D'        // 93ed         #3
+    'B'        // 93ee         #1
+    'D'        // 93ef         #3
+    'B'        // 93f0         #1
+    'C'        // 93f1         #2
+    'D'        // 93f2         #3
+    'aB'       // 93f3-93f4    #1
+    'C'        // 93f5         #2
+    'I'        // 93f6         #8
+    'C'        // 93f7         #2
+    'aA'       // 93f8-93f9    #0
+    'C'        // 93fa         #2
+    'A'        // 93fb         #0
+    'B'        // 93fc         #1
+    'C'        // 93fd         #2
+    'bB'       // 93fe-9400    #1
+    'C'        // 9401         #2
+    'F'        // 9402         #5
+    'aA'       // 9403-9404    #0
+    'D'        // 9405         #3
+    'B'        // 9406         #1
+    'bC'       // 9407-9409    #2
+    'bB'       // 940a-940c    #1
+    'aC'       // 940d-940e    #2
+    'aA'       // 940f-9410    #0
+    'aB'       // 9411-9412    #1
+    'aA'       // 9413-9414    #0
+    'bC'       // 9415-9417    #2
+    'aA'       // 9418-9419    #0
+    'F'        // 941a         #5
+    'B'        // 941b         #1
+    'D'        // 941c         #3
+    'B'        // 941d         #1
+    'D'        // 941e         #3
+    'F'        // 941f         #5
+    'B'        // 9420         #1
+    'F'        // 9421         #5
+    'aD'       // 9422-9423    #3
+    'B'        // 9424         #1
+    'I'        // 9425         #8
+    'cB'       // 9426-9429    #1
+    'I'        // 942a         #8
+    'A'        // 942b         #0
+    'aB'       // 942c-942d    #1
+    'aC'       // 942e-942f    #2
+    'B'        // 9430         #1
+    'bC'       // 9431-9433    #2
+    'F'        // 9434         #5
+    'aA'       // 9435-9436    #0
+    'B'        // 9437         #1
+    'A'        // 9438         #0
+    'B'        // 9439         #1
+    'A'        // 943a         #0
+    'C'        // 943b         #2
+    'B'        // 943c         #1
+    'C'        // 943d         #2
+    'B'        // 943e         #1
+    'C'        // 943f         #2
+    'B'        // 9440         #1
+    'F'        // 9441         #5
+    'I'        // 9442         #8
+    'C'        // 9443         #2
+    'A'        // 9444         #0
+    'C'        // 9445         #2
+    'aB'       // 9446-9447    #1
+    'C'        // 9448         #2
+    'B'        // 9449         #1
+    'A'        // 944a         #0
+    'B'        // 944b         #1
+    'A'        // 944c         #0
+    'B'        // 944d         #1
+    'D'        // 944e         #3
+    'aB'       // 944f-9450    #1
+    'aA'       // 9451-9452    #0
+    'F'        // 9453         #5
+    'B'        // 9454         #1
+    'A'        // 9455         #0
+    'D'        // 9456         #3
+    'aB'       // 9457-9458    #1
+    'aF'       // 9459-945a    #5
+    'A'        // 945b         #0
+    'F'        // 945c         #5
+    'B'        // 945d         #1
+    'A'        // 945e         #0
+    'F'        // 945f         #5
+    'A'        // 9460         #0
+    'F'        // 9461         #5
+    'aA'       // 9462-9463    #0
+    'aB'       // 9464-9465    #1
+    'D'        // 9466         #3
+    'B'        // 9467         #1
+    'C'        // 9468         #2
+    'B'        // 9469         #1
+    'aA'       // 946a-946b    #0
+    'B'        // 946c         #1
+    'bC'       // 946d-946f    #2
+    'bA'       // 9470-9472    #0
+    'aB'       // 9473-9474    #1
+    'A'        // 9475         #0
+    'B'        // 9476         #1
+    'A'        // 9477         #0
+    'aB'       // 9478-9479    #1
+    'D'        // 947a         #3
+    'B'        // 947b         #1
+    'cA'       // 947c-947f    #0
+    'B'        // 9480         #1
+    'C'        // 9481         #2
+    'B'        // 9482         #1
+    'C'        // 9483         #2
+    'F'        // 9484         #5
+    'A'        // 9485         #0
+    'xD'       // 9486-949e    #3
+    'B'        // 949f         #1
+    'aD'       // 94a0-94a1    #3
+    'B'        // 94a2         #1
+    '1cD'      // 94a3-94c0    #3
+    'B'        // 94c1         #1
+    'D'        // 94c2         #3
+    'B'        // 94c3         #1
+    'wD'       // 94c4-94db    #3
+    'B'        // 94dc         #1
+    'xD'       // 94dd-94f5    #3
+    'B'        // 94f6         #1
+    '2aD'      // 94f7-952c    #3
+    'B'        // 952d         #1
+    'xD'       // 952e-9546    #3
+    'B'        // 9547         #1
+    '1tD'      // 9548-9576    #3
+    'aA'       // 9577-9578    #0
+    'F'        // 9579         #5
+    'cB'       // 957a-957d    #1
+    'F'        // 957e         #5
+    'aA'       // 957f-9580    #0
+    'D'        // 9581         #3
+    'C'        // 9582         #2
+    'A'        // 9583         #0
+    'F'        // 9584         #5
+    'B'        // 9585         #1
+    'C'        // 9586         #2
+    'F'        // 9587         #5
+    'aA'       // 9588-9589    #0
+    'J'        // 958a         #9
+    'A'        // 958b         #0
+    'aC'       // 958c-958d    #2
+    'aA'       // 958e-958f    #0
+    'B'        // 9590         #1
+    'cA'       // 9591-9594    #0
+    'D'        // 9595         #3
+    'C'        // 9596         #2
+    'B'        // 9597         #1
+    'A'        // 9598         #0
+    'C'        // 9599         #2
+    'D'        // 959a         #3
+    'B'        // 959b         #1
+    'I'        // 959c         #8
+    'F'        // 959d         #5
+    'C'        // 959e         #2
+    'aA'       // 959f-95a0    #0
+    'C'        // 95a1         #2
+    'cA'       // 95a2-95a5    #0
+    'aC'       // 95a6-95a7    #2
+    'aA'       // 95a8-95a9    #0
+    'B'        // 95aa         #1
+    'bA'       // 95ab-95ad    #0
+    'B'        // 95ae         #1
+    'D'        // 95af         #3
+    'B'        // 95b0         #1
+    'A'        // 95b1         #0
+    'C'        // 95b2         #2
+    'D'        // 95b3         #3
+    'F'        // 95b4         #5
+    'B'        // 95b5         #1
+    'A'        // 95b6         #0
+    'B'        // 95b7         #1
+    'D'        // 95b8         #3
+    'A'        // 95b9         #0
+    'C'        // 95ba         #2
+    'cA'       // 95bb-95be    #0
+    'C'        // 95bf         #2
+    'B'        // 95c0         #1
+    'aD'       // 95c1-95c2    #3
+    'A'        // 95c3         #0
+    'D'        // 95c4         #3
+    'B'        // 95c5         #1
+    'C'        // 95c6         #2
+    'aA'       // 95c7-95c8    #0
+    'C'        // 95c9         #2
+    'cA'       // 95ca-95cd    #0
+    'aD'       // 95ce-95cf    #3
+    'bC'       // 95d0-95d2    #2
+    'cA'       // 95d3-95d6    #0
+    'D'        // 95d7         #3
+    'aF'       // 95d8-95d9    #5
+    'A'        // 95da         #0
+    'B'        // 95db         #1
+    'A'        // 95dc         #0
+    'F'        // 95dd         #5
+    'A'        // 95de         #0
+    'C'        // 95df         #2
+    'bA'       // 95e0-95e2    #0
+    'B'        // 95e3         #1
+    'C'        // 95e4         #2
+    'A'        // 95e5         #0
+    'F'        // 95e6         #5
+    'D'        // 95e7         #3
+    'A'        // 95e8         #0
+    'jD'       // 95e9-95f3    #3
+    'B'        // 95f4         #1
+    '1lD'      // 95f5-961b    #3
+    'aA'       // 961c-961d    #0
+    'C'        // 961e         #2
+    'D'        // 961f         #3
+    'B'        // 9620         #1
+    'A'        // 9621         #0
+    'C'        // 9622         #2
+    'B'        // 9623         #1
+    'A'        // 9624         #0
+    'aF'       // 9625-9626    #5
+    'K'        // 9627         #10
+    'A'        // 9628         #0
+    'K'        // 9629         #10
+    'A'        // 962a         #0
+    'D'        // 962b         #3
+    'C'        // 962c         #2
+    'I'        // 962d         #8
+    'aA'       // 962e-962f    #0
+    'B'        // 9630         #1
+    'C'        // 9631         #2
+    'A'        // 9632         #0
+    'C'        // 9633         #2
+    'F'        // 9634         #5
+    'aD'       // 9635-9636    #3
+    'F'        // 9637         #5
+    'bC'       // 9638-963a    #2
+    'A'        // 963b         #0
+    'aC'       // 963c-963d    #2
+    'D'        // 963e         #3
+    'aA'       // 963f-9640    #0
+    'C'        // 9641         #2
+    'A'        // 9642         #0
+    'B'        // 9643         #1
+    'A'        // 9644         #0
+    'B'        // 9645         #1
+    'cD'       // 9646-9649    #3
+    'B'        // 964a         #1
+    'bA'       // 964b-964d    #0
+    'B'        // 964e         #1
+    'C'        // 964f         #2
+    'A'        // 9650         #0
+    'B'        // 9651         #1
+    'F'        // 9652         #5
+    'B'        // 9653         #1
+    'A'        // 9654         #0
+    'D'        // 9655         #3
+    'A'        // 9656         #0
+    'F'        // 9657         #5
+    'A'        // 9658         #0
+    'aD'       // 9659-965a    #3
+    'dA'       // 965b-965f    #0
+    'D'        // 9660         #3
+    'cA'       // 9661-9664    #0
+    'aF'       // 9665-9666    #5
+    'aD'       // 9667-9668    #3
+    'B'        // 9669         #1
+    'A'        // 966a         #0
+    'B'        // 966b         #1
+    'A'        // 966c         #0
+    'B'        // 966d         #1
+    'F'        // 966e         #5
+    'B'        // 966f         #1
+    'A'        // 9670         #0
+    'B'        // 9671         #1
+    'fA'       // 9672-9678    #0
+    'K'        // 9679         #10
+    'F'        // 967a         #5
+    'C'        // 967b         #2
+    'aA'       // 967c-967d    #0
+    'C'        // 967e         #2
+    'F'        // 967f         #5
+    'B'        // 9680         #1
+    'C'        // 9681         #2
+    'F'        // 9682         #5
+    'C'        // 9683         #2
+    'bA'       // 9684-9686    #0
+    'B'        // 9687         #1
+    'aC'       // 9688-9689    #2
+    'aA'       // 968a-968b    #0
+    'D'        // 968c         #3
+    'bA'       // 968d-968f    #0
+    'D'        // 9690         #3
+    'A'        // 9691         #0
+    'aB'       // 9692-9693    #1
+    'aA'       // 9694-9695    #0
+    'C'        // 9696         #2
+    'aA'       // 9697-9698    #0
+    'C'        // 9699         #2
+    'F'        // 969a         #5
+    'aA'       // 969b-969c    #0
+    'F'        // 969d         #5
+    'B'        // 969e         #1
+    'aF'       // 969f-96a0    #5
+    'aB'       // 96a1-96a2    #1
+    'aA'       // 96a3-96a4    #0
+    'C'        // 96a5         #2
+    'F'        // 96a6         #5
+    'cA'       // 96a7-96aa    #0
+    'D'        // 96ab         #3
+    'B'        // 96ac         #1
+    'D'        // 96ad         #3
+    'C'        // 96ae         #2
+    'F'        // 96af         #5
+    'aA'       // 96b0-96b1    #0
+    'F'        // 96b2         #5
+    'aA'       // 96b3-96b4    #0
+    'D'        // 96b5         #3
+    'A'        // 96b6         #0
+    'J'        // 96b7         #9
+    'aA'       // 96b8-96b9    #0
+    'F'        // 96ba         #5
+    'aA'       // 96bb-96bc    #0
+    'C'        // 96bd         #2
+    'D'        // 96be         #3
+    'B'        // 96bf         #1
+    'aA'       // 96c0-96c1    #0
+    'aB'       // 96c2-96c3    #1
+    'cA'       // 96c4-96c7    #0
+    'B'        // 96c8         #1
+    'A'        // 96c9         #0
+    'C'        // 96ca         #2
+    'cA'       // 96cb-96ce    #0
+    'aD'       // 96cf-96d0    #3
+    'F'        // 96d1         #5
+    'C'        // 96d2         #2
+    'aB'       // 96d3-96d4    #1
+    'aA'       // 96d5-96d6    #0
+    'B'        // 96d7         #1
+    'C'        // 96d8         #2
+    'eA'       // 96d9-96de    #0
+    'C'        // 96df         #2
+    'D'        // 96e0         #3
+    'B'        // 96e1         #1
+    'aA'       // 96e2-96e3    #0
+    'D'        // 96e4         #3
+    'B'        // 96e5         #1
+    'aD'       // 96e6-96e7    #3
+    'bA'       // 96e8-96ea    #0
+    'F'        // 96eb         #5
+    'bD'       // 96ec-96ee    #3
+    'aA'       // 96ef-96f0    #0
+    'C'        // 96f1         #2
+    'A'        // 96f2         #0
+    'D'        // 96f3         #3
+    'aB'       // 96f4-96f5    #1
+    'aA'       // 96f6-96f7    #0
+    'B'        // 96f8         #1
+    'bA'       // 96f9-96fb    #0
+    'D'        // 96fc         #3
+    'B'        // 96fd         #1
+    'D'        // 96fe         #3
+    'B'        // 96ff         #1
+    'A'        // 9700         #0
+    'D'        // 9701         #3
+    'aC'       // 9702-9703    #2
+    'eA'       // 9704-9709    #0
+    'F'        // 970a         #5
+    'B'        // 970b         #1
+    'K'        // 970c         #10
+    'bA'       // 970d-970f    #0
+    'B'        // 9710         #1
+    'A'        // 9711         #0
+    'B'        // 9712         #1
+    'A'        // 9713         #0
+    'J'        // 9714         #9
+    'D'        // 9715         #3
+    'A'        // 9716         #0
+    'D'        // 9717         #3
+    'B'        // 9718         #1
+    'A'        // 9719         #0
+    'F'        // 971a         #5
+    'C'        // 971b         #2
+    'A'        // 971c         #0
+    'C'        // 971d         #2
+    'A'        // 971e         #0
+    'aB'       // 971f-9720    #1
+    'aC'       // 9721-9722    #2
+    'A'        // 9723         #0
+    'C'        // 9724         #2
+    'B'        // 9725         #1
+    'I'        // 9726         #8
+    'A'        // 9727         #0
+    'C'        // 9728         #2
+    'B'        // 9729         #1
+    'A'        // 972a         #0
+    'aB'       // 972b-972c    #1
+    'D'        // 972d         #3
+    'aB'       // 972e-972f    #1
+    'A'        // 9730         #0
+    'C'        // 9731         #2
+    'A'        // 9732         #0
+    'F'        // 9733         #5
+    'aB'       // 9734-9735    #1
+    'C'        // 9736         #2
+    'D'        // 9737         #3
+    'aA'       // 9738-9739    #0
+    'B'        // 973a         #1
+    'F'        // 973b         #5
+    'D'        // 973c         #3
+    'A'        // 973d         #0
+    'C'        // 973e         #2
+    'aB'       // 973f-9740    #1
+    'C'        // 9741         #2
+    'A'        // 9742         #0
+    'C'        // 9743         #2
+    'A'        // 9744         #0
+    'D'        // 9745         #3
+    'A'        // 9746         #0
+    'C'        // 9747         #2
+    'aA'       // 9748-9749    #0
+    'C'        // 974a         #2
+    'B'        // 974b         #1
+    'K'        // 974c         #10
+    'bF'       // 974d-974f    #5
+    'D'        // 9750         #3
+    'aA'       // 9751-9752    #0
+    'aD'       // 9753-9754    #3
+    'aA'       // 9755-9756    #0
+    'C'        // 9757         #2
+    'A'        // 9758         #0
+    'J'        // 9759         #9
+    'bA'       // 975a-975c    #0
+    'I'        // 975d         #8
+    'A'        // 975e         #0
+    'B'        // 975f         #1
+    'bA'       // 9760-9762    #0
+    'aF'       // 9763-9764    #5
+    'D'        // 9765         #3
+    'A'        // 9766         #0
+    'F'        // 9767         #5
+    'aA'       // 9768-9769    #0
+    'C'        // 976a         #2
+    'F'        // 976b         #5
+    'B'        // 976c         #1
+    'A'        // 976d         #0
+    'C'        // 976e         #2
+    'D'        // 976f         #3
+    'B'        // 9770         #1
+    'C'        // 9771         #2
+    'B'        // 9772         #1
+    'aA'       // 9773-9774    #0
+    'K'        // 9775         #10
+    'C'        // 9776         #2
+    'A'        // 9777         #0
+    'C'        // 9778         #2
+    'F'        // 9779         #5
+    'A'        // 977a         #0
+    'C'        // 977b         #2
+    'A'        // 977c         #0
+    'C'        // 977d         #2
+    'B'        // 977e         #1
+    'C'        // 977f         #2
+    'aA'       // 9780-9781    #0
+    'aB'       // 9782-9783    #1
+    'aA'       // 9784-9785    #0
+    'F'        // 9786         #5
+    'aB'       // 9787-9788    #1
+    'C'        // 9789         #2
+    'B'        // 978a         #1
+    'A'        // 978b         #0
+    'D'        // 978c         #3
+    'A'        // 978d         #0
+    'B'        // 978e         #1
+    'A'        // 978f         #0
+    'F'        // 9790         #5
+    'bD'       // 9791-9793    #3
+    'B'        // 9794         #1
+    'aF'       // 9795-9796    #5
+    'C'        // 9797         #2
+    'A'        // 9798         #0
+    'aC'       // 9799-979a    #2
+    'B'        // 979b         #1
+    'C'        // 979c         #2
+    'B'        // 979d         #1
+    'aC'       // 979e-979f    #2
+    'A'        // 97a0         #0
+    'B'        // 97a1         #1
+    'C'        // 97a2         #2
+    'A'        // 97a3         #0
+    'aB'       // 97a4-97a5    #1
+    'A'        // 97a6         #0
+    'D'        // 97a7         #3
+    'A'        // 97a8         #0
+    'D'        // 97a9         #3
+    'B'        // 97aa         #1
+    'bA'       // 97ab-97ad    #0
+    'C'        // 97ae         #2
+    'aD'       // 97af-97b0    #3
+    'A'        // 97b1         #0
+    'aC'       // 97b2-97b3    #2
+    'A'        // 97b4         #0
+    'F'        // 97b5         #5
+    'C'        // 97b6         #2
+    'B'        // 97b7         #1
+    'aA'       // 97b8-97b9    #0
+    'C'        // 97ba         #2
+    'B'        // 97bb         #1
+    'F'        // 97bc         #5
+    'B'        // 97bd         #1
+    'aC'       // 97be-97bf    #2
+    'B'        // 97c0         #1
+    'A'        // 97c1         #0
+    'B'        // 97c2         #1
+    'A'        // 97c3         #0
+    'aC'       // 97c4-97c5    #2
+    'A'        // 97c6         #0
+    'bC'       // 97c7-97c9    #2
+    'F'        // 97ca         #5
+    'bA'       // 97cb-97cd    #0
+    'C'        // 97ce         #2
+    'B'        // 97cf         #1
+    'A'        // 97d0         #0
+    'F'        // 97d1         #5
+    'B'        // 97d2         #1
+    'A'        // 97d3         #0
+    'C'        // 97d4         #2
+    'aB'       // 97d5-97d6    #1
+    'aC'       // 97d7-97d8    #2
+    'A'        // 97d9         #0
+    'D'        // 97da         #3
+    'F'        // 97db         #5
+    'bA'       // 97dc-97de    #0
+    'B'        // 97df         #1
+    'aA'       // 97e0-97e1    #0
+    'D'        // 97e2         #3
+    'B'        // 97e3         #1
+    'F'        // 97e4         #5
+    'B'        // 97e5         #1
+    'A'        // 97e6         #0
+    'eD'       // 97e7-97ec    #3
+    'aA'       // 97ed-97ee    #0
+    'F'        // 97ef         #5
+    'B'        // 97f0         #1
+    'bA'       // 97f1-97f3    #0
+    'F'        // 97f4         #5
+    'aA'       // 97f5-97f6    #0
+    'F'        // 97f7         #5
+    'C'        // 97f8         #2
+    'B'        // 97f9         #1
+    'aA'       // 97fa-97fb    #0
+    'D'        // 97fc         #3
+    'B'        // 97fd         #1
+    'I'        // 97fe         #8
+    'A'        // 97ff         #0
+    'I'        // 9800         #8
+    'bA'       // 9801-9803    #0
+    'C'        // 9804         #2
+    'aA'       // 9805-9806    #0
+    'C'        // 9807         #2
+    'A'        // 9808         #0
+    'D'        // 9809         #3
+    'A'        // 980a         #0
+    'D'        // 980b         #3
+    'gA'       // 980c-9813    #0
+    'C'        // 9814         #2
+    'B'        // 9815         #1
+    'bA'       // 9816-9818    #0
+    'aF'       // 9819-981a    #5
+    'B'        // 981b         #1
+    'C'        // 981c         #2
+    'B'        // 981d         #1
+    'A'        // 981e         #0
+    'B'        // 981f         #1
+    'C'        // 9820         #2
+    'A'        // 9821         #0
+    'D'        // 9822         #3
+    'aA'       // 9823-9824    #0
+    'F'        // 9825         #5
+    'A'        // 9826         #0
+    'bB'       // 9827-9829    #1
+    'D'        // 982a         #3
+    'A'        // 982b         #0
+    'F'        // 982c         #5
+    'aA'       // 982d-982e    #0
+    'C'        // 982f         #2
+    'A'        // 9830         #0
+    'D'        // 9831         #3
+    'A'        // 9832         #0
+    'bC'       // 9833-9835    #2
+    'D'        // 9836         #3
+    'bA'       // 9837-9839    #0
+    'D'        // 983a         #3
+    'A'        // 983b         #0
+    'J'        // 983c         #9
+    'aF'       // 983d-983e    #5
+    'K'        // 983f         #10
+    'D'        // 9840         #3
+    'B'        // 9841         #1
+    'K'        // 9842         #10
+    'B'        // 9843         #1
+    'C'        // 9844         #2
+    'B'        // 9845         #1
+    'aA'       // 9846-9847    #0
+    'I'        // 9848         #8
+    'B'        // 9849         #1
+    'C'        // 984a         #2
+    'cA'       // 984b-984e    #0
+    'C'        // 984f         #2
+    'B'        // 9850         #1
+    'C'        // 9851         #2
+    'aA'       // 9852-9853    #0
+    'aJ'       // 9854-9855    #9
+    'aC'       // 9856-9857    #2
+    'aA'       // 9858-9859    #0
+    'J'        // 985a         #9
+    'C'        // 985b         #2
+    'I'        // 985c         #8
+    'B'        // 985d         #1
+    'A'        // 985e         #0
+    'aB'       // 985f-9860    #1
+    'D'        // 9861         #3
+    'aC'       // 9862-9863    #2
+    'B'        // 9864         #1
+    'bA'       // 9865-9867    #0
+    'aB'       // 9868-9869    #1
+    'C'        // 986a         #2
+    'A'        // 986b         #0
+    'C'        // 986c         #2
+    'aD'       // 986d-986e    #3
+    'bA'       // 986f-9871    #0
+    'B'        // 9872         #1
+    'bA'       // 9873-9875    #0
+    '1wD'      // 9876-98a7    #3
+    'A'        // 98a8         #0
+    'B'        // 98a9         #1
+    'aF'       // 98aa-98ab    #5
+    'B'        // 98ac         #1
+    'A'        // 98ad         #0
+    'C'        // 98ae         #2
+    'A'        // 98af         #0
+    'F'        // 98b0         #5
+    'A'        // 98b1         #0
+    'I'        // 98b2         #8
+    'B'        // 98b3         #1
+    'C'        // 98b4         #2
+    'D'        // 98b5         #3
+    'A'        // 98b6         #0
+    'aC'       // 98b7-98b8    #2
+    'B'        // 98b9         #1
+    'A'        // 98ba         #0
+    'C'        // 98bb         #2
+    'A'        // 98bc         #0
+    'aB'       // 98bd-98be    #1
+    'A'        // 98bf         #0
+    'aB'       // 98c0-98c1    #1
+    'A'        // 98c2         #0
+    'C'        // 98c3         #2
+    'A'        // 98c4         #0
+    'F'        // 98c5         #5
+    'aA'       // 98c6-98c7    #0
+    'C'        // 98c8         #2
+    'I'        // 98c9         #8
+    'B'        // 98ca         #1
+    'A'        // 98cb         #0
+    'C'        // 98cc         #2
+    'D'        // 98cd         #3
+    'A'        // 98ce         #0
+    'kD'       // 98cf-98da    #3
+    'aA'       // 98db-98dc    #0
+    'D'        // 98dd         #3
+    'dA'       // 98de-98e2    #0
+    'C'        // 98e3         #2
+    'D'        // 98e4         #3
+    'C'        // 98e5         #2
+    'aA'       // 98e6-98e7    #0
+    'D'        // 98e8         #3
+    'C'        // 98e9         #2
+    'aA'       // 98ea-98eb    #0
+    'B'        // 98ec         #1
+    'A'        // 98ed         #0
+    'J'        // 98ee         #9
+    'A'        // 98ef         #0
+    'F'        // 98f0         #5
+    'A'        // 98f1         #0
+    'C'        // 98f2         #2
+    'F'        // 98f3         #5
+    'A'        // 98f4         #0
+    'B'        // 98f5         #1
+    'C'        // 98f6         #2
+    'aD'       // 98f7-98f8    #3
+    'aB'       // 98f9-98fa    #1
+    'K'        // 98fb         #10
+    'bA'       // 98fc-98fe    #0
+    'D'        // 98ff         #3
+    'B'        // 9900         #1
+    'D'        // 9901         #3
+    'C'        // 9902         #2
+    'A'        // 9903         #0
+    'D'        // 9904         #3
+    'C'        // 9905         #2
+    'D'        // 9906         #3
+    'aC'       // 9907-9908    #2
+    'aA'       // 9909-990a    #0
+    'D'        // 990b         #3
+    'A'        // 990c         #0
+    'D'        // 990d         #3
+    'B'        // 990e         #1
+    'D'        // 990f         #3
+    'A'        // 9910         #0
+    'C'        // 9911         #2
+    'cA'       // 9912-9915    #0
+    'aC'       // 9916-9917    #2
+    'A'        // 9918         #0
+    'B'        // 9919         #1
+    'A'        // 991a         #0
+    'aC'       // 991b-991c    #2
+    'F'        // 991d         #5
+    'A'        // 991e         #0
+    'C'        // 991f         #2
+    'J'        // 9920         #9
+    'C'        // 9921         #2
+    'F'        // 9922         #5
+    'D'        // 9923         #3
+    'C'        // 9924         #2
+    'B'        // 9925         #1
+    'J'        // 9926         #9
+    'aA'       // 9927-9928    #0
+    'B'        // 9929         #1
+    'I'        // 992a         #8
+    'C'        // 992b         #2
+    'A'        // 992c         #0
+    'B'        // 992d         #1
+    'A'        // 992e         #0
+    'B'        // 992f         #1
+    'I'        // 9930         #8
+    'A'        // 9931         #0
+    'C'        // 9932         #2
+    'A'        // 9933         #0
+    'F'        // 9934         #5
+    'C'        // 9935         #2
+    'D'        // 9936         #3
+    'aB'       // 9937-9938    #1
+    'A'        // 9939         #0
+    'aC'       // 993a-993b    #2
+    'aA'       // 993c-993d    #0
+    'C'        // 993e         #2
+    'B'        // 993f         #1
+    'aC'       // 9940-9941    #2
+    'A'        // 9942         #0
+    'B'        // 9943         #1
+    'D'        // 9944         #3
+    'A'        // 9945         #0
+    'F'        // 9946         #5
+    'C'        // 9947         #2
+    'aA'       // 9948-9949    #0
+    'B'        // 994a         #1
+    'bA'       // 994b-994d    #0
+    'C'        // 994e         #2
+    'D'        // 994f         #3
+    'bA'       // 9950-9952    #0
+    'B'        // 9953         #1
+    'aA'       // 9954-9955    #0
+    'B'        // 9956         #1
+    'A'        // 9957         #0
+    'aC'       // 9958-9959    #2
+    'D'        // 995a         #3
+    'C'        // 995b         #2
+    'A'        // 995c         #0
+    'B'        // 995d         #1
+    'A'        // 995e         #0
+    'C'        // 995f         #2
+    'F'        // 9960         #5
+    'aB'       // 9961-9962    #1
+    'A'        // 9963         #0
+    '1wD'      // 9964-9995    #3
+    'cA'       // 9996-9999    #0
+    'D'        // 999a         #3
+    'C'        // 999b         #2
+    'I'        // 999c         #8
+    'A'        // 999d         #0
+    'C'        // 999e         #2
+    'J'        // 999f         #9
+    'D'        // 99a0         #3
+    'I'        // 99a1         #8
+    'D'        // 99a2         #3
+    'A'        // 99a3         #0
+    'B'        // 99a4         #1
+    'A'        // 99a5         #0
+    'C'        // 99a6         #2
+    'I'        // 99a7         #8
+    'A'        // 99a8         #0
+    'D'        // 99a9         #3
+    'I'        // 99aa         #8
+    'B'        // 99ab         #1
+    'bA'       // 99ac-99ae    #0
+    'B'        // 99af         #1
+    'aA'       // 99b0-99b1    #0
+    'C'        // 99b2         #2
+    'aA'       // 99b3-99b4    #0
+    'C'        // 99b5         #2
+    'K'        // 99b6         #10
+    'D'        // 99b7         #3
+    'B'        // 99b8         #1
+    'A'        // 99b9         #0
+    'C'        // 99ba         #2
+    'B'        // 99bb         #1
+    'aC'       // 99bc-99bd    #2
+    'D'        // 99be         #3
+    'F'        // 99bf         #5
+    'D'        // 99c0         #3
+    'A'        // 99c1         #0
+    'B'        // 99c2         #1
+    'C'        // 99c3         #2
+    'aA'       // 99c4-99c5    #0
+    'F'        // 99c6         #5
+    'B'        // 99c7         #1
+    'J'        // 99c8         #9
+    'A'        // 99c9         #0
+    'D'        // 99ca         #3
+    'cB'       // 99cb-99ce    #1
+    'I'        // 99cf         #8
+    'bA'       // 99d0-99d2    #0
+    'aC'       // 99d3-99d4    #2
+    'A'        // 99d5         #0
+    'aB'       // 99d6-99d7    #1
+    'aA'       // 99d8-99d9    #0
+    'C'        // 99da         #2
+    'bA'       // 99db-99dd    #0
+    'J'        // 99de         #9
+    'A'        // 99df         #0
+    'B'        // 99e0         #1
+    'C'        // 99e1         #2
+    'A'        // 99e2         #0
+    'cB'       // 99e3-99e6    #1
+    'C'        // 99e7         #2
+    'K'        // 99e8         #10
+    'B'        // 99e9         #1
+    'A'        // 99ea         #0
+    'F'        // 99eb         #5
+    'C'        // 99ec         #2
+    'aA'       // 99ed-99ee    #0
+    'D'        // 99ef         #3
+    'C'        // 99f0         #2
+    'A'        // 99f1         #0
+    'F'        // 99f2         #5
+    'D'        // 99f3         #3
+    'aC'       // 99f4-99f5    #2
+    'aB'       // 99f6-99f7    #1
+    'A'        // 99f8         #0
+    'C'        // 99f9         #2
+    'I'        // 99fa         #8
+    'A'        // 99fb         #0
+    'C'        // 99fc         #2
+    'A'        // 99fd         #0
+    'C'        // 99fe         #2
+    'A'        // 99ff         #0
+    'D'        // 9a00         #3
+    'dA'       // 9a01-9a05    #0
+    'aB'       // 9a06-9a07    #1
+    'J'        // 9a08         #9
+    'B'        // 9a09         #1
+    'C'        // 9a0a         #2
+    'A'        // 9a0b         #0
+    'C'        // 9a0c         #2
+    'I'        // 9a0d         #8
+    'aA'       // 9a0e-9a0f    #0
+    'C'        // 9a10         #2
+    'A'        // 9a11         #0
+    'aF'       // 9a12-9a13    #5
+    'aB'       // 9a14-9a15    #1
+    'A'        // 9a16         #0
+    'D'        // 9a17         #3
+    'K'        // 9a18         #10
+    'A'        // 9a19         #0
+    'C'        // 9a1a         #2
+    'I'        // 9a1b         #8
+    'aB'       // 9a1c-9a1d    #1
+    'C'        // 9a1e         #2
+    'B'        // 9a1f         #1
+    'C'        // 9a20         #2
+    'B'        // 9a21         #1
+    'bC'       // 9a22-9a24    #2
+    'aB'       // 9a25-9a26    #1
+    'C'        // 9a27         #2
+    'F'        // 9a28         #5
+    'aB'       // 9a29-9a2a    #1
+    'A'        // 9a2b         #0
+    'B'        // 9a2c         #1
+    'A'        // 9a2d         #0
+    'C'        // 9a2e         #2
+    'B'        // 9a2f         #1
+    'A'        // 9a30         #0
+    'C'        // 9a31         #2
+    'B'        // 9a32         #1
+    'F'        // 9a33         #5
+    'B'        // 9a34         #1
+    'cA'       // 9a35-9a38    #0
+    'dB'       // 9a39-9a3d    #1
+    'A'        // 9a3e         #0
+    'B'        // 9a3f         #1
+    'eA'       // 9a40-9a45    #0
+    'B'        // 9a46         #1
+    'F'        // 9a47         #5
+    'aB'       // 9a48-9a49    #1
+    'A'        // 9a4a         #0
+    'F'        // 9a4b         #5
+    'bA'       // 9a4c-9a4e    #0
+    'I'        // 9a4f         #8
+    'B'        // 9a50         #1
+    'F'        // 9a51         #5
+    'A'        // 9a52         #0
+    'B'        // 9a53         #1
+    'C'        // 9a54         #2
+    'A'        // 9a55         #0
+    'C'        // 9a56         #2
+    'aA'       // 9a57-9a58    #0
+    'B'        // 9a59         #1
+    'aA'       // 9a5a-9a5b    #0
+    'B'        // 9a5c         #1
+    'F'        // 9a5d         #5
+    'B'        // 9a5e         #1
+    'A'        // 9a5f         #0
+    'B'        // 9a60         #1
+    'D'        // 9a61         #3
+    'A'        // 9a62         #0
+    'B'        // 9a63         #1
+    'aA'       // 9a64-9a65    #0
+    'bB'       // 9a66-9a68    #1
+    'aA'       // 9a69-9a6a    #0
+    'C'        // 9a6b         #2
+    'A'        // 9a6c         #0
+    '1gD'      // 9a6d-9a8e    #3
+    'B'        // 9a8f         #1
+    'wD'       // 9a90-9aa7    #3
+    'A'        // 9aa8         #0
+    'D'        // 9aa9         #3
+    'J'        // 9aaa         #9
+    'B'        // 9aab         #1
+    'F'        // 9aac         #5
+    'C'        // 9aad         #2
+    'F'        // 9aae         #5
+    'C'        // 9aaf         #2
+    'A'        // 9ab0         #0
+    'B'        // 9ab1         #1
+    'C'        // 9ab2         #2
+    'B'        // 9ab3         #1
+    'C'        // 9ab4         #2
+    'F'        // 9ab5         #5
+    'aC'       // 9ab6-9ab7    #2
+    'aA'       // 9ab8-9ab9    #0
+    'B'        // 9aba         #1
+    'C'        // 9abb         #2
+    'A'        // 9abc         #0
+    'aC'       // 9abd-9abe    #2
+    'aA'       // 9abf-9ac0    #0
+    'C'        // 9ac1         #2
+    'B'        // 9ac2         #1
+    'aF'       // 9ac3-9ac4    #5
+    'D'        // 9ac5         #3
+    'A'        // 9ac6         #0
+    'B'        // 9ac7         #1
+    'F'        // 9ac8         #5
+    'D'        // 9ac9         #3
+    'B'        // 9aca         #1
+    'aD'       // 9acb-9acc    #3
+    'B'        // 9acd         #1
+    'F'        // 9ace         #5
+    'A'        // 9acf         #0
+    'C'        // 9ad0         #2
+    'A'        // 9ad1         #0
+    'C'        // 9ad2         #2
+    'aA'       // 9ad3-9ad4    #0
+    'C'        // 9ad5         #2
+    'bA'       // 9ad6-9ad8    #0
+    'F'        // 9ad9         #5
+    'D'        // 9ada         #3
+    'F'        // 9adb         #5
+    'C'        // 9adc         #2
+    'D'        // 9add         #3
+    'F'        // 9ade         #5
+    'A'        // 9adf         #0
+    'C'        // 9ae0         #2
+    'I'        // 9ae1         #8
+    'C'        // 9ae2         #2
+    'A'        // 9ae3         #0
+    'F'        // 9ae4         #5
+    'J'        // 9ae5         #9
+    'A'        // 9ae6         #0
+    'C'        // 9ae7         #2
+    'D'        // 9ae8         #3
+    'aF'       // 9ae9-9aea    #5
+    'A'        // 9aeb         #0
+    'C'        // 9aec         #2
+    'aA'       // 9aed-9aee    #0
+    'C'        // 9aef         #2
+    'K'        // 9af0         #10
+    'C'        // 9af1         #2
+    'A'        // 9af2         #0
+    'C'        // 9af3         #2
+    'A'        // 9af4         #0
+    'F'        // 9af5         #5
+    'B'        // 9af6         #1
+    'C'        // 9af7         #2
+    'D'        // 9af8         #3
+    'bA'       // 9af9-9afb    #0
+    'B'        // 9afc         #1
+    'A'        // 9afd         #0
+    'B'        // 9afe         #1
+    'C'        // 9aff         #2
+    'F'        // 9b00         #5
+    'C'        // 9b01         #2
+    'A'        // 9b02         #0
+    'aC'       // 9b03-9b04    #2
+    'aA'       // 9b05-9b06    #0
+    'D'        // 9b07         #3
+    'aC'       // 9b08-9b09    #2
+    'I'        // 9b0a         #8
+    'A'        // 9b0b         #0
+    'C'        // 9b0c         #2
+    'A'        // 9b0d         #0
+    'C'        // 9b0e         #2
+    'B'        // 9b0f         #1
+    'A'        // 9b10         #0
+    'B'        // 9b11         #1
+    'A'        // 9b12         #0
+    'D'        // 9b13         #3
+    'aB'       // 9b14-9b15    #1
+    'A'        // 9b16         #0
+    'B'        // 9b17         #1
+    'bA'       // 9b18-9b1a    #0
+    'bF'       // 9b1b-9b1d    #5
+    'B'        // 9b1e         #1
+    'A'        // 9b1f         #0
+    'C'        // 9b20         #2
+    'D'        // 9b21         #3
+    'aA'       // 9b22-9b23    #0
+    'B'        // 9b24         #1
+    'A'        // 9b25         #0
+    'F'        // 9b26         #5
+    'cA'       // 9b27-9b2a    #0
+    'C'        // 9b2b         #2
+    'F'        // 9b2c         #5
+    'C'        // 9b2d         #2
+    'aA'       // 9b2e-9b2f    #0
+    'D'        // 9b30         #3
+    'aA'       // 9b31-9b32    #0
+    'bC'       // 9b33-9b35    #2
+    'D'        // 9b36         #3
+    'C'        // 9b37         #2
+    'D'        // 9b38         #3
+    'C'        // 9b39         #2
+    'A'        // 9b3a         #0
+    'C'        // 9b3b         #2
+    'A'        // 9b3c         #0
+    'F'        // 9b3d         #5
+    'bB'       // 9b3e-9b40    #1
+    'dA'       // 9b41-9b45    #0
+    'B'        // 9b46         #1
+    'D'        // 9b47         #3
+    'A'        // 9b48         #0
+    'D'        // 9b49         #3
+    'B'        // 9b4a         #1
+    'A'        // 9b4b         #0
+    'C'        // 9b4c         #2
+    'bA'       // 9b4d-9b4f    #0
+    'B'        // 9b50         #1
+    'A'        // 9b51         #0
+    'B'        // 9b52         #1
+    'D'        // 9b53         #3
+    'A'        // 9b54         #0
+    'aC'       // 9b55-9b56    #2
+    'F'        // 9b57         #5
+    'A'        // 9b58         #0
+    'B'        // 9b59         #1
+    'A'        // 9b5a         #0
+    'C'        // 9b5b         #2
+    'aD'       // 9b5c-9b5d    #3
+    'F'        // 9b5e         #5
+    'aB'       // 9b5f-9b60    #1
+    'C'        // 9b61         #2
+    'D'        // 9b62         #3
+    'F'        // 9b63         #5
+    'B'        // 9b64         #1
+    'F'        // 9b65         #5
+    'A'        // 9b66         #0
+    'B'        // 9b67         #1
+    'C'        // 9b68         #2
+    'B'        // 9b69         #1
+    'aF'       // 9b6a-9b6b    #5
+    'C'        // 9b6c         #2
+    'aF'       // 9b6d-9b6e    #5
+    'A'        // 9b6f         #0
+    'aB'       // 9b70-9b71    #1
+    'aF'       // 9b72-9b73    #5
+    'A'        // 9b74         #0
+    'bC'       // 9b75-9b77    #2
+    'aF'       // 9b78-9b79    #5
+    'dB'       // 9b7a-9b7e    #1
+    'C'        // 9b7f         #2
+    'A'        // 9b80         #0
+    'aB'       // 9b81-9b82    #1
+    'A'        // 9b83         #0
+    'F'        // 9b84         #5
+    'bC'       // 9b85-9b87    #2
+    'B'        // 9b88         #1
+    'aF'       // 9b89-9b8a    #5
+    'C'        // 9b8b         #2
+    'D'        // 9b8c         #3
+    'C'        // 9b8d         #2
+    'A'        // 9b8e         #0
+    'C'        // 9b8f         #2
+    'cA'       // 9b90-9b93    #0
+    'F'        // 9b94         #5
+    'B'        // 9b95         #1
+    'F'        // 9b96         #5
+    'A'        // 9b97         #0
+    'aD'       // 9b98-9b99    #3
+    'C'        // 9b9a         #2
+    'B'        // 9b9b         #1
+    'D'        // 9b9c         #3
+    'aC'       // 9b9d-9b9e    #2
+    'A'        // 9b9f         #0
+    'C'        // 9ba0         #2
+    'aB'       // 9ba1-9ba2    #1
+    'D'        // 9ba3         #3
+    'aB'       // 9ba4-9ba5    #1
+    'C'        // 9ba6         #2
+    'J'        // 9ba7         #9
+    'A'        // 9ba8         #0
+    'F'        // 9ba9         #5
+    'aA'       // 9baa-9bab    #0
+    'F'        // 9bac         #5
+    'aA'       // 9bad-9bae    #0
+    'B'        // 9baf         #1
+    'C'        // 9bb0         #2
+    'aF'       // 9bb1-9bb2    #5
+    'D'        // 9bb3         #3
+    'F'        // 9bb4         #5
+    'aB'       // 9bb5-9bb6    #1
+    'F'        // 9bb7         #5
+    'C'        // 9bb8         #2
+    'A'        // 9bb9         #0
+    'D'        // 9bba         #3
+    'aF'       // 9bbb-9bbc    #5
+    'B'        // 9bbd         #1
+    'F'        // 9bbe         #5
+    'aC'       // 9bbf-9bc0    #2
+    'A'        // 9bc1         #0
+    'D'        // 9bc2         #3
+    'aB'       // 9bc3-9bc4    #1
+    'D'        // 9bc5         #3
+    'A'        // 9bc6         #0
+    'aC'       // 9bc7-9bc8    #2
+    'aA'       // 9bc9-9bca    #0
+    'bD'       // 9bcb-9bcd    #3
+    'F'        // 9bce         #5
+    'C'        // 9bcf         #2
+    'bF'       // 9bd0-9bd2    #5
+    'B'        // 9bd3         #1
+    'A'        // 9bd4         #0
+    'B'        // 9bd5         #1
+    'A'        // 9bd6         #0
+    'C'        // 9bd7         #2
+    'F'        // 9bd8         #5
+    'aB'       // 9bd9-9bda    #1
+    'A'        // 9bdb         #0
+    'B'        // 9bdc         #1
+    'C'        // 9bdd         #2
+    'B'        // 9bde         #1
+    'F'        // 9bdf         #5
+    'B'        // 9be0         #1
+    'C'        // 9be1         #2
+    'A'        // 9be2         #0
+    'F'        // 9be3         #5
+    'A'        // 9be4         #0
+    'C'        // 9be5         #2
+    'B'        // 9be6         #1
+    'C'        // 9be7         #2
+    'A'        // 9be8         #0
+    'B'        // 9be9         #1
+    'aC'       // 9bea-9beb    #2
+    'aB'       // 9bec-9bed    #1
+    'aF'       // 9bee-9bef    #5
+    'aC'       // 9bf0-9bf1    #2
+    'aF'       // 9bf2-9bf3    #5
+    'B'        // 9bf4         #1
+    'F'        // 9bf5         #5
+    'D'        // 9bf6         #3
+    'A'        // 9bf7         #0
+    'C'        // 9bf8         #2
+    'aF'       // 9bf9-9bfa    #5
+    'aD'       // 9bfb-9bfc    #3
+    'C'        // 9bfd         #2
+    'D'        // 9bfe         #3
+    'C'        // 9bff         #2
+    'F'        // 9c00         #5
+    'D'        // 9c01         #3
+    'C'        // 9c02         #2
+    'D'        // 9c03         #3
+    'F'        // 9c04         #5
+    'B'        // 9c05         #1
+    'C'        // 9c06         #2
+    'B'        // 9c07         #1
+    'A'        // 9c08         #0
+    'C'        // 9c09         #2
+    'A'        // 9c0a         #0
+    'C'        // 9c0b         #2
+    'aA'       // 9c0c-9c0d    #0
+    'B'        // 9c0e         #1
+    'F'        // 9c0f         #5
+    'A'        // 9c10         #0
+    'F'        // 9c11         #5
+    'aA'       // 9c12-9c13    #0
+    'C'        // 9c14         #2
+    'A'        // 9c15         #0
+    'F'        // 9c16         #5
+    'B'        // 9c17         #1
+    'bF'       // 9c18-9c1a    #5
+    'bC'       // 9c1b-9c1d    #2
+    'F'        // 9c1e         #5
+    'aB'       // 9c1f-9c20    #1
+    'C'        // 9c21         #2
+    'F'        // 9c22         #5
+    'C'        // 9c23         #2
+    'aA'       // 9c24-9c25    #0
+    'C'        // 9c26         #2
+    'F'        // 9c27         #5
+    'aC'       // 9c28-9c29    #2
+    'F'        // 9c2a         #5
+    'aB'       // 9c2b-9c2c    #1
+    'A'        // 9c2d         #0
+    'J'        // 9c2e         #9
+    'A'        // 9c2f         #0
+    'F'        // 9c30         #5
+    'aA'       // 9c31-9c32    #0
+    'aB'       // 9c33-9c34    #1
+    'A'        // 9c35         #0
+    'aC'       // 9c36-9c37    #2
+    'D'        // 9c38         #3
+    'bA'       // 9c39-9c3b    #0
+    'B'        // 9c3c         #1
+    'C'        // 9c3d         #2
+    'A'        // 9c3e         #0
+    'aB'       // 9c3f-9c40    #1
+    'C'        // 9c41         #2
+    'D'        // 9c42         #3
+    'F'        // 9c43         #5
+    'bC'       // 9c44-9c46    #2
+    'A'        // 9c47         #0
+    'C'        // 9c48         #2
+    'A'        // 9c49         #0
+    'C'        // 9c4a         #2
+    'bB'       // 9c4b-9c4d    #1
+    'C'        // 9c4e         #2
+    'A'        // 9c4f         #0
+    'C'        // 9c50         #2
+    'D'        // 9c51         #3
+    'aA'       // 9c52-9c53    #0
+    'C'        // 9c54         #2
+    'B'        // 9c55         #1
+    'C'        // 9c56         #2
+    'A'        // 9c57         #0
+    'C'        // 9c58         #2
+    'B'        // 9c59         #1
+    'bF'       // 9c5a-9c5c    #5
+    'bC'       // 9c5d-9c5f    #2
+    'A'        // 9c60         #0
+    'F'        // 9c61         #5
+    'B'        // 9c62         #1
+    'A'        // 9c63         #0
+    'D'        // 9c64         #3
+    'F'        // 9c65         #5
+    'B'        // 9c66         #1
+    'A'        // 9c67         #0
+    'C'        // 9c68         #2
+    'bF'       // 9c69-9c6b    #5
+    'D'        // 9c6c         #3
+    'aC'       // 9c6d-9c6e    #2
+    'D'        // 9c6f         #3
+    'F'        // 9c70         #5
+    'B'        // 9c71         #1
+    'C'        // 9c72         #2
+    'aB'       // 9c73-9c74    #1
+    'C'        // 9c75         #2
+    'F'        // 9c76         #5
+    'C'        // 9c77         #2
+    'A'        // 9c78         #0
+    'B'        // 9c79         #1
+    'C'        // 9c7a         #2
+    'aA'       // 9c7b-9c7c    #0
+    '3yD'      // 9c7d-9ce4    #3
+    'bA'       // 9ce5-9ce7    #0
+    'D'        // 9ce8         #3
+    'A'        // 9ce9         #0
+    'B'        // 9cea         #1
+    'aF'       // 9ceb-9cec    #5
+    'B'        // 9ced         #1
+    'aD'       // 9cee-9cef    #3
+    'F'        // 9cf0         #5
+    'B'        // 9cf1         #1
+    'C'        // 9cf2         #2
+    'aA'       // 9cf3-9cf4    #0
+    'B'        // 9cf5         #1
+    'A'        // 9cf6         #0
+    'C'        // 9cf7         #2
+    'D'        // 9cf8         #3
+    'C'        // 9cf9         #2
+    'cB'       // 9cfa-9cfd    #1
+    'D'        // 9cfe         #3
+    'aB'       // 9cff-9d00    #1
+    'D'        // 9d01         #3
+    'C'        // 9d02         #2
+    'A'        // 9d03         #0
+    'aB'       // 9d04-9d05    #1
+    'cA'       // 9d06-9d09    #0
+    'D'        // 9d0a         #3
+    'F'        // 9d0b         #5
+    'I'        // 9d0c         #8
+    'D'        // 9d0d         #3
+    'F'        // 9d0e         #5
+    'D'        // 9d0f         #3
+    'B'        // 9d10         #1
+    'F'        // 9d11         #5
+    'A'        // 9d12         #0
+    'D'        // 9d13         #3
+    'B'        // 9d14         #1
+    'A'        // 9d15         #0
+    'B'        // 9d16         #1
+    'C'        // 9d17         #2
+    'A'        // 9d18         #0
+    'I'        // 9d19         #8
+    'D'        // 9d1a         #3
+    'A'        // 9d1b         #0
+    'F'        // 9d1c         #5
+    'C'        // 9d1d         #2
+    'aA'       // 9d1e-9d1f    #0
+    'bB'       // 9d20-9d22    #1
+    'A'        // 9d23         #0
+    'D'        // 9d24         #3
+    'I'        // 9d25         #8
+    'A'        // 9d26         #0
+    'D'        // 9d27         #3
+    'A'        // 9d28         #0
+    'B'        // 9d29         #1
+    'bF'       // 9d2a-9d2c    #5
+    'aB'       // 9d2d-9d2e    #1
+    'aA'       // 9d2f-9d30    #0
+    'B'        // 9d31         #1
+    'F'        // 9d32         #5
+    'aC'       // 9d33-9d34    #2
+    'D'        // 9d35         #3
+    'I'        // 9d36         #8
+    'bB'       // 9d37-9d39    #1
+    'F'        // 9d3a         #5
+    'A'        // 9d3b         #0
+    'F'        // 9d3c         #5
+    'bC'       // 9d3d-9d3f    #2
+    'B'        // 9d40         #1
+    'aA'       // 9d41-9d42    #0
+    'C'        // 9d43         #2
+    'A'        // 9d44         #0
+    'C'        // 9d45         #2
+    'bF'       // 9d46-9d48    #5
+    'B'        // 9d49         #1
+    'C'        // 9d4a         #2
+    'aB'       // 9d4b-9d4c    #1
+    'D'        // 9d4d         #3
+    'aB'       // 9d4e-9d4f    #1
+    'C'        // 9d50         #2
+    'A'        // 9d51         #0
+    'C'        // 9d52         #2
+    'aA'       // 9d53-9d54    #0
+    'D'        // 9d55         #3
+    'bB'       // 9d56-9d58    #1
+    'C'        // 9d59         #2
+    'aB'       // 9d5a-9d5b    #1
+    'C'        // 9d5c         #2
+    'aA'       // 9d5d-9d5e    #0
+    'C'        // 9d5f         #2
+    'aA'       // 9d60-9d61    #0
+    'cF'       // 9d62-9d65    #5
+    'K'        // 9d66         #10
+    'aB'       // 9d67-9d68    #1
+    'A'        // 9d69         #0
+    'aC'       // 9d6a-9d6b    #2
+    'A'        // 9d6c         #0
+    'aB'       // 9d6d-9d6e    #1
+    'aA'       // 9d6f-9d70    #0
+    'B'        // 9d71         #1
+    'A'        // 9d72         #0
+    'C'        // 9d73         #2
+    'aB'       // 9d74-9d75    #1
+    'F'        // 9d76         #5
+    'A'        // 9d77         #0
+    'aB'       // 9d78-9d79    #1
+    'F'        // 9d7a         #5
+    'A'        // 9d7b         #0
+    'C'        // 9d7c         #2
+    'B'        // 9d7d         #1
+    'A'        // 9d7e         #0
+    'cB'       // 9d7f-9d82    #1
+    'C'        // 9d83         #2
+    'A'        // 9d84         #0
+    'B'        // 9d85         #1
+    'aC'       // 9d86-9d87    #2
+    'B'        // 9d88         #1
+    'aA'       // 9d89-9d8a    #0
+    'aB'       // 9d8b-9d8c    #1
+    'bF'       // 9d8d-9d8f    #5
+    'B'        // 9d90         #1
+    'D'        // 9d91         #3
+    'aC'       // 9d92-9d93    #2
+    'B'        // 9d94         #1
+    'F'        // 9d95         #5
+    'A'        // 9d96         #0
+    'bC'       // 9d97-9d99    #2
+    'A'        // 9d9a         #0
+    'eB'       // 9d9b-9da0    #1
+    'A'        // 9da1         #0
+    'aB'       // 9da2-9da3    #1
+    'A'        // 9da4         #0
+    'cB'       // 9da5-9da8    #1
+    'A'        // 9da9         #0
+    'aC'       // 9daa-9dab    #2
+    'A'        // 9dac         #0
+    'B'        // 9dad         #1
+    'F'        // 9dae         #5
+    'A'        // 9daf         #0
+    'D'        // 9db0         #3
+    'aC'       // 9db1-9db2    #2
+    'B'        // 9db3         #1
+    'aA'       // 9db4-9db5    #0
+    'aB'       // 9db6-9db7    #1
+    'aA'       // 9db8-9db9    #0
+    'C'        // 9dba         #2
+    'A'        // 9dbb         #0
+    'aC'       // 9dbc-9dbd    #2
+    'B'        // 9dbe         #1
+    'A'        // 9dbf         #0
+    'C'        // 9dc0         #2
+    'aA'       // 9dc1-9dc2    #0
+    'C'        // 9dc3         #2
+    'A'        // 9dc4         #0
+    'B'        // 9dc5         #1
+    'F'        // 9dc6         #5
+    'A'        // 9dc7         #0
+    'B'        // 9dc8         #1
+    'aC'       // 9dc9-9dca    #2
+    'cB'       // 9dcb-9dce    #1
+    'C'        // 9dcf         #2
+    'bB'       // 9dd0-9dd2    #1
+    'A'        // 9dd3         #0
+    'aC'       // 9dd4-9dd5    #2
+    'aA'       // 9dd6-9dd7    #0
+    'B'        // 9dd8         #1
+    'A'        // 9dd9         #0
+    'C'        // 9dda         #2
+    'bB'       // 9ddb-9ddd    #1
+    'aC'       // 9dde-9ddf    #2
+    'F'        // 9de0         #5
+    'aB'       // 9de1-9de2    #1
+    'C'        // 9de3         #2
+    'B'        // 9de4         #1
+    'C'        // 9de5         #2
+    'A'        // 9de6         #0
+    'F'        // 9de7         #5
+    'B'        // 9de8         #1
+    'A'        // 9de9         #0
+    'K'        // 9dea         #10
+    'A'        // 9deb         #0
+    'B'        // 9dec         #1
+    'bC'       // 9ded-9def    #2
+    'A'        // 9df0         #0
+    'K'        // 9df1         #10
+    'aA'       // 9df2-9df3    #0
+    'C'        // 9df4         #2
+    'bB'       // 9df5-9df7    #1
+    'bA'       // 9df8-9dfa    #0
+    'aB'       // 9dfb-9dfc    #1
+    'A'        // 9dfd         #0
+    'C'        // 9dfe         #2
+    'I'        // 9dff         #8
+    'aB'       // 9e00-9e01    #1
+    'C'        // 9e02         #2
+    'cB'       // 9e03-9e06    #1
+    'A'        // 9e07         #0
+    'D'        // 9e08         #3
+    'B'        // 9e09         #1
+    'C'        // 9e0a         #2
+    'aB'       // 9e0b-9e0c    #1
+    'aC'       // 9e0d-9e0e    #2
+    'I'        // 9e0f         #8
+    'bC'       // 9e10-9e12    #2
+    'aB'       // 9e13-9e14    #1
+    'A'        // 9e15         #0
+    'F'        // 9e16         #5
+    'aB'       // 9e17-9e18    #1
+    'C'        // 9e19         #2
+    'eA'       // 9e1a-9e1f    #0
+    '3fD'      // 9e20-9e74    #3
+    'A'        // 9e75         #0
+    'D'        // 9e76         #3
+    'K'        // 9e77         #10
+    'F'        // 9e78         #5
+    'bA'       // 9e79-9e7b    #0
+    'C'        // 9e7c         #2
+    'A'        // 9e7d         #0
+    'D'        // 9e7e         #3
+    'aA'       // 9e7f-9e80    #0
+    'C'        // 9e81         #2
+    'A'        // 9e82         #0
+    'C'        // 9e83         #2
+    'A'        // 9e84         #0
+    'C'        // 9e85         #2
+    'B'        // 9e86         #1
+    'aC'       // 9e87-9e88    #2
+    'aB'       // 9e89-9e8a    #1
+    'aA'       // 9e8b-9e8c    #0
+    'B'        // 9e8d         #1
+    'C'        // 9e8e         #2
+    'J'        // 9e8f         #9
+    'B'        // 9e90         #1
+    'bA'       // 9e91-9e93    #0
+    'B'        // 9e94         #1
+    'aC'       // 9e95-9e96    #2
+    'aA'       // 9e97-9e98    #0
+    'aB'       // 9e99-9e9a    #1
+    'C'        // 9e9b         #2
+    'B'        // 9e9c         #1
+    'bA'       // 9e9d-9e9f    #0
+    'bB'       // 9ea0-9ea2    #1
+    'D'        // 9ea3         #3
+    'bA'       // 9ea4-9ea6    #0
+    'B'        // 9ea7         #1
+    'C'        // 9ea8         #2
+    'aA'       // 9ea9-9eaa    #0
+    'B'        // 9eab         #1
+    'bC'       // 9eac-9eae    #2
+    'A'        // 9eaf         #0
+    'C'        // 9eb0         #2
+    'B'        // 9eb1         #1
+    'D'        // 9eb2         #3
+    'F'        // 9eb3         #5
+    'aA'       // 9eb4-9eb5    #0
+    'aB'       // 9eb6-9eb7    #1
+    'bF'       // 9eb8-9eba    #5
+    'A'        // 9ebb         #0
+    'C'        // 9ebc         #2
+    'bA'       // 9ebd-9ebf    #0
+    'bB'       // 9ec0-9ec2    #1
+    'aA'       // 9ec3-9ec4    #0
+    'K'        // 9ec5         #10
+    'C'        // 9ec6         #2
+    'B'        // 9ec7         #1
+    'C'        // 9ec8         #2
+    'aD'       // 9ec9-9eca    #3
+    'F'        // 9ecb         #5
+    'eA'       // 9ecc-9ed1    #0
+    'F'        // 9ed2         #5
+    'B'        // 9ed3         #1
+    'A'        // 9ed4         #0
+    'C'        // 9ed5         #2
+    'I'        // 9ed6         #8
+    'D'        // 9ed7         #3
+    'A'        // 9ed8         #0
+    'F'        // 9ed9         #5
+    'I'        // 9eda         #8
+    'cA'       // 9edb-9ede    #0
+    'C'        // 9edf         #2
+    'A'        // 9ee0         #0
+    'D'        // 9ee1         #3
+    'B'        // 9ee2         #1
+    'D'        // 9ee3         #3
+    'C'        // 9ee4         #2
+    'A'        // 9ee5         #0
+    'B'        // 9ee6         #1
+    'C'        // 9ee7         #2
+    'A'        // 9ee8         #0
+    'aD'       // 9ee9-9eea    #3
+    'B'        // 9eeb         #1
+    'F'        // 9eec         #5
+    'C'        // 9eed         #2
+    'aA'       // 9eee-9eef    #0
+    'aC'       // 9ef0-9ef1    #2
+    'A'        // 9ef2         #0
+    'B'        // 9ef3         #1
+    'cA'       // 9ef4-9ef7    #0
+    'C'        // 9ef8         #2
+    'A'        // 9ef9         #0
+    'I'        // 9efa         #8
+    'dA'       // 9efb-9eff    #0
+    'I'        // 9f00         #8
+    'B'        // 9f01         #1
+    'A'        // 9f02         #0
+    'F'        // 9f03         #5
+    'K'        // 9f04         #10
+    'D'        // 9f05         #3
+    'B'        // 9f06         #1
+    'bA'       // 9f07-9f09    #0
+    'I'        // 9f0a         #8
+    'bD'       // 9f0b-9f0d    #3
+    'A'        // 9f0e         #0
+    'C'        // 9f0f         #2
+    'A'        // 9f10         #0
+    'F'        // 9f11         #5
+    'C'        // 9f12         #2
+    'A'        // 9f13         #0
+    'J'        // 9f14         #9
+    'aC'       // 9f15-9f16    #2
+    'A'        // 9f17         #0
+    'B'        // 9f18         #1
+    'A'        // 9f19         #0
+    'aC'       // 9f1a-9f1b    #2
+    'B'        // 9f1c         #1
+    'D'        // 9f1d         #3
+    'B'        // 9f1e         #1
+    'F'        // 9f1f         #5
+    'A'        // 9f20         #0
+    'F'        // 9f21         #5
+    'A'        // 9f22         #0
+    'bB'       // 9f23-9f25    #1
+    'C'        // 9f26         #2
+    'bB'       // 9f27-9f29    #1
+    'C'        // 9f2a         #2
+    'aA'       // 9f2b-9f2c    #0
+    'aB'       // 9f2d-9f2e    #1
+    'A'        // 9f2f         #0
+    'B'        // 9f30         #1
+    'aC'       // 9f31-9f32    #2
+    'B'        // 9f33         #1
+    'A'        // 9f34         #0
+    'aB'       // 9f35-9f36    #1
+    'C'        // 9f37         #2
+    'I'        // 9f38         #8
+    'A'        // 9f39         #0
+    'F'        // 9f3a         #5
+    'A'        // 9f3b         #0
+    'F'        // 9f3c         #5
+    'C'        // 9f3d         #2
+    'A'        // 9f3e         #0
+    'F'        // 9f3f         #5
+    'B'        // 9f40         #1
+    'C'        // 9f41         #2
+    'B'        // 9f42         #1
+    'dC'       // 9f43-9f47    #2
+    'aB'       // 9f48-9f49    #1
+    'aA'       // 9f4a-9f4b    #0
+    'aB'       // 9f4c-9f4d    #1
+    'A'        // 9f4e         #0
+    'C'        // 9f4f         #2
+    'A'        // 9f50         #0
+    'D'        // 9f51         #3
+    'A'        // 9f52         #0
+    'C'        // 9f53         #2
+    'aA'       // 9f54-9f55    #0
+    'C'        // 9f56         #2
+    'A'        // 9f57         #0
+    'C'        // 9f58         #2
+    'B'        // 9f59         #1
+    'C'        // 9f5a         #2
+    'aB'       // 9f5b-9f5c    #1
+    'aC'       // 9f5d-9f5e    #2
+    'bA'       // 9f5f-9f61    #0
+    'aC'       // 9f62-9f63    #2
+    'aB'       // 9f64-9f65    #1
+    'aA'       // 9f66-9f67    #0
+    'F'        // 9f68         #5
+    'aA'       // 9f69-9f6a    #0
+    'I'        // 9f6b         #8
+    'A'        // 9f6c         #0
+    'F'        // 9f6d         #5
+    'cC'       // 9f6e-9f71    #2
+    'A'        // 9f72         #0
+    'F'        // 9f73         #5
+    'B'        // 9f74         #1
+    'C'        // 9f75         #2
+    'aA'       // 9f76-9f77    #0
+    'aB'       // 9f78-9f79    #1
+    'C'        // 9f7a         #2
+    'B'        // 9f7b         #1
+    'D'        // 9f7c         #3
+    'F'        // 9f7d         #5
+    'B'        // 9f7e         #1
+    'A'        // 9f7f         #0
+    'lD'       // 9f80-9f8c    #3
+    'A'        // 9f8d         #0
+    'I'        // 9f8e         #8
+    'F'        // 9f8f         #5
+    'bA'       // 9f90-9f92    #0
+    'D'        // 9f93         #3
+    'aA'       // 9f94-9f95    #0
+    'aC'       // 9f96-9f97    #2
+    'B'        // 9f98         #1
+    'A'        // 9f99         #0
+    'aD'       // 9f9a-9f9b    #3
+    'A'        // 9f9c         #0
+    'J'        // 9f9d         #9
+    'F'        // 9f9e         #5
+    'aA'       // 9f9f-9fa0    #0
+    'F'        // 9fa1         #5
+    'A'        // 9fa2         #0
+    'F'        // 9fa3         #5
+    'B'        // 9fa4         #1
+    'A'        // 9fa5         #0
+    'mB'       // 9fa6-9fb3    #1
+    'F'        // 9fb4         #5
+    'fD'       // 9fb5-9fbb    #3
+    'fF'       // 9fbc-9fc2    #5
+    'D'        // 9fc3         #3
+    'F'        // 9fc4         #5
+    'D'        // 9fc5         #3
+    'F'        // 9fc6         #5
+    'dB'       // 9fc7-9fcb    #1
+    'F'        // 9fcc         #5
+    'bD'       // 9fcd-9fcf    #3
+    'B'        // 9fd0         #1
+    '1dD'      // 9fd1-9fef    #3
+    'oE'       // 9ff0-9fff
+    '44t6V'    // a000-a48c    #177
+    'bE'       // a48d-a48f
+    '2b6V'     // a490-a4c6    #177
+    'hE'       // a4c7-a4cf
+    '1u5Q'     // a4d0-a4ff    #146
+    '11m12B'   // a500-a62b    #313
+    'sE'       // a62c-a63f
+    '1tL'      // a640-a66e    #11
+    '3J'       // a66f         #87
+    '1uL'      // a670-a69f    #11
+    '3i4Z'     // a6a0-a6f7    #129
+    'gE'       // a6f8-a6ff
+    '7iL'      // a700-a7bf    #11
+    'aE'       // a7c0-a7c1
+    'hL'       // a7c2-a7ca    #11
+    '1oE'      // a7cb-a7f4
+    'jL'       // a7f5-a7ff    #11
+    '1r11Z'    // a800-a82c    #311
+    'bE'       // a82d-a82f
+    'b8I'      // a830-a832    #216
+    'b8J'      // a833-a835    #217
+    'c8K'      // a836-a839    #218
+    'eE'       // a83a-a83f
+    '2c11T'    // a840-a877    #305
+    'gE'       // a878-a87f
+    '2q6H'     // a880-a8c5    #163
+    'gE'       // a8c6-a8cd
+    'k6H'      // a8ce-a8d9    #163
+    'eE'       // a8da-a8df
+    'p1J'      // a8e0-a8f0    #35
+    '2A'       // a8f1         #52
+    '1J'       // a8f2         #35
+    '8O'       // a8f3         #222
+    'k1J'      // a8f4-a8ff    #35
+    '1s5M'     // a900-a92d    #142
+    '8V'       // a92e         #229
+    '5M'       // a92f         #142
+    '1i6F'     // a930-a953    #161
+    'jE'       // a954-a95e
+    '6F'       // a95f         #161
+    '1bR'      // a960-a97c    #17
+    'bE'       // a97d-a97f
+    '2y3V'     // a980-a9cd    #99
+    'E'        // a9ce
+    '10M'      // a9cf         #272
+    'i3V'      // a9d0-a9d9    #99
+    'cE'       // a9da-a9dd
+    'a3V'      // a9de-a9df    #99
+    '1d3F'     // a9e0-a9fe    #83
+    'E'        // a9ff
+    '2b3B'     // aa00-aa36    #79
+    'hE'       // aa37-aa3f
+    'm3B'      // aa40-aa4d    #79
+    'aE'       // aa4e-aa4f
+    'i3B'      // aa50-aa59    #79
+    'aE'       // aa5a-aa5b
+    'c3B'      // aa5c-aa5f    #79
+    '1e3F'     // aa60-aa7f    #83
+    '2n6N'     // aa80-aac2    #169
+    'wE'       // aac3-aada
+    'd6N'      // aadb-aadf    #169
+    'v3Z'      // aae0-aaf6    #103
+    '2dE'      // aaf7-ab2f
+    '2gL'      // ab30-ab6b    #11
+    'cE'       // ab6c-ab6f
+    '3a3Q'     // ab70-abbf    #94
+    '1s3Z'     // abc0-abed    #103
+    'aE'       // abee-abef
+    'i3Z'      // abf0-abf9    #103
+    'eE'       // abfa-abff
+    '429qR'    // ac00-d7a3    #17
+    'kE'       // d7a4-d7af
+    'vR'       // d7b0-d7c6    #17
+    'cE'       // d7c7-d7ca
+    '1vR'      // d7cb-d7fb    #17
+    '325aE'    // d7fc-f8ff
+    'cA'       // f900-f903    #0
+    '3D'       // f904         #81
+    'aA'       // f905-f906    #0
+    '1T'       // f907         #45
+    '3D'       // f908         #81
+    'aQ'       // f909-f90a    #16
+    'A'        // f90b         #0
+    '1X'       // f90c         #49
+    '1T'       // f90d         #45
+    'fQ'       // f90e-f914    #16
+    'A'        // f915         #0
+    'Q'        // f916         #16
+    'A'        // f917         #0
+    'aJ'       // f918-f919    #9
+    'A'        // f91a         #0
+    'eQ'       // f91b-f920    #16
+    'J'        // f921         #9
+    '1T'       // f922         #45
+    'hQ'       // f923-f92b    #16
+    'J'        // f92c         #9
+    'A'        // f92d         #0
+    'Q'        // f92e         #16
+    'J'        // f92f         #9
+    'Q'        // f930         #16
+    '5K'       // f931         #140
+    'aJ'       // f932-f933    #9
+    '1X'       // f934         #49
+    'J'        // f935         #9
+    'Q'        // f936         #16
+    'A'        // f937         #0
+    'J'        // f938         #9
+    '5K'       // f939         #140
+    'A'        // f93a         #0
+    'gQ'       // f93b-f942    #16
+    'A'        // f943         #0
+    'bQ'       // f944-f946    #16
+    'aA'       // f947-f948    #0
+    'J'        // f949         #9
+    'A'        // f94a         #0
+    'bQ'       // f94b-f94d    #16
+    'J'        // f94e         #9
+    'bQ'       // f94f-f951    #16
+    'A'        // f952         #0
+    'J'        // f953         #9
+    'eQ'       // f954-f959    #16
+    'R'        // f95a         #17
+    'bQ'       // f95b-f95d    #16
+    'A'        // f95e         #0
+    'H'        // f95f         #7
+    'aQ'       // f960-f961    #16
+    'A'        // f962         #0
+    'aJ'       // f963-f964    #9
+    'A'        // f965         #0
+    'J'        // f966         #9
+    'A'        // f967         #0
+    'dQ'       // f968-f96c    #16
+    '3D'       // f96d         #81
+    'J'        // f96e         #9
+    'bQ'       // f96f-f971    #16
+    'A'        // f972         #0
+    'Q'        // f973         #16
+    'J'        // f974         #9
+    'Q'        // f975         #16
+    'A'        // f976         #0
+    'Q'        // f977         #16
+    '1T'       // f978         #45
+    'A'        // f979         #0
+    'J'        // f97a         #9
+    '1X'       // f97b         #49
+    'aQ'       // f97c-f97d    #16
+    'A'        // f97e         #0
+    'J'        // f97f         #9
+    'A'        // f980         #0
+    'bQ'       // f981-f983    #16
+    'aJ'       // f984-f985    #9
+    '1T'       // f986         #45
+    'bQ'       // f987-f989    #16
+    'A'        // f98a         #0
+    'aJ'       // f98b-f98c    #9
+    'Q'        // f98d         #16
+    'A'        // f98e         #0
+    'cQ'       // f98f-f992    #16
+    'J'        // f993         #9
+    'Q'        // f994         #16
+    'A'        // f995         #0
+    'aQ'       // f996-f997    #16
+    'J'        // f998         #9
+    'bQ'       // f999-f99b    #16
+    '1T'       // f99c         #45
+    '3D'       // f99d         #81
+    'Q'        // f99e         #16
+    '1T'       // f99f         #45
+    'iQ'       // f9a0-f9a9    #16
+    'H'        // f9aa         #7
+    'bQ'       // f9ab-f9ad    #16
+    'J'        // f9ae         #9
+    'cQ'       // f9af-f9b2    #16
+    'J'        // f9b3         #9
+    'Q'        // f9b4         #16
+    '1T'       // f9b5         #45
+    'Q'        // f9b6         #16
+    'J'        // f9b7         #9
+    'bQ'       // f9b8-f9ba    #16
+    'A'        // f9bb         #0
+    'Q'        // f9bc         #16
+    'A'        // f9bd         #0
+    '1X'       // f9be         #49
+    'Q'        // f9bf         #16
+    'J'        // f9c0         #9
+    'cQ'       // f9c1-f9c4    #16
+    'aA'       // f9c5-f9c6    #0
+    'Q'        // f9c7         #16
+    '1T'       // f9c8         #45
+    'fQ'       // f9c9-f9cf    #16
+    '1X'       // f9d0         #49
+    'fQ'       // f9d1-f9d7    #16
+    'A'        // f9d8         #0
+    '1X'       // f9d9         #49
+    'aQ'       // f9da-f9db    #16
+    'bA'       // f9dc-f9de    #0
+    'J'        // f9df         #9
+    'A'        // f9e0         #0
+    'Q'        // f9e1         #16
+    'a1X'      // f9e2-f9e3    #49
+    'A'        // f9e4         #0
+    'aQ'       // f9e5-f9e6    #16
+    'A'        // f9e7         #0
+    'Q'        // f9e8         #16
+    'A'        // f9e9         #0
+    'fQ'       // f9ea-f9f0    #16
+    'J'        // f9f1         #9
+    'Q'        // f9f2         #16
+    'R'        // f9f3         #17
+    'aA'       // f9f4-f9f5    #0
+    'cQ'       // f9f6-f9f9    #16
+    'A'        // f9fa         #0
+    'aQ'       // f9fb-f9fc    #16
+    'A'        // f9fd         #0
+    'Q'        // f9fe         #16
+    'A'        // f9ff         #0
+    'aQ'       // fa00-fa01    #16
+    'A'        // fa02         #0
+    'aQ'       // fa03-fa04    #16
+    'cA'       // fa05-fa08    #0
+    'Q'        // fa09         #16
+    'A'        // fa0a         #0
+    'Q'        // fa0b         #16
+    'aB'       // fa0c-fa0d    #1
+    'aF'       // fa0e-fa0f    #5
+    'H'        // fa10         #7
+    'F'        // fa11         #5
+    'Q'        // fa12         #16
+    'aF'       // fa13-fa14    #5
+    'bQ'       // fa15-fa17    #16
+    'F'        // fa18         #5
+    'eQ'       // fa19-fa1e    #16
+    'bF'       // fa1f-fa21    #5
+    'Q'        // fa22         #16
+    'aF'       // fa23-fa24    #5
+    'H'        // fa25         #7
+    'Q'        // fa26         #16
+    'bF'       // fa27-fa29    #5
+    'bQ'       // fa2a-fa2c    #16
+    'H'        // fa2d         #7
+    'Q'        // fa2e         #16
+    'J'        // fa2f         #9
+    'aQ'       // fa30-fa31    #16
+    'H'        // fa32         #7
+    'bA'       // fa33-fa35    #0
+    'Q'        // fa36         #16
+    'aJ'       // fa37-fa38    #9
+    'Q'        // fa39         #16
+    'A'        // fa3a         #0
+    'bQ'       // fa3b-fa3d    #16
+    'H'        // fa3e         #7
+    'Q'        // fa3f         #16
+    'H'        // fa40         #7
+    'Q'        // fa41         #16
+    'H'        // fa42         #7
+    'cQ'       // fa43-fa46    #16
+    'J'        // fa47         #9
+    'Q'        // fa48         #16
+    'A'        // fa49         #0
+    'Q'        // fa4a         #16
+    'A'        // fa4b         #0
+    'iQ'       // fa4c-fa55    #16
+    'H'        // fa56         #7
+    'Q'        // fa57         #16
+    'H'        // fa58         #7
+    'cQ'       // fa59-fa5c    #16
+    'aA'       // fa5d-fa5e    #0
+    'iQ'       // fa5f-fa68    #16
+    'H'        // fa69         #7
+    'Q'        // fa6a         #16
+    'bH'       // fa6b-fa6d    #7
+    '5oE'      // fa6e-faff
+    'dS'       // fb00-fb04    #18
+    'aL'       // fb05-fb06    #11
+    'kE'       // fb07-fb12
+    'd2O'      // fb13-fb17    #66
+    'dE'       // fb18-fb1c
+    'y1U'      // fb1d-fb36    #46
+    'E'        // fb37
+    'd1U'      // fb38-fb3c    #46
+    'E'        // fb3d
+    '1U'       // fb3e         #46
+    'E'        // fb3f
+    'a1U'      // fb40-fb41    #46
+    'E'        // fb42
+    'a1U'      // fb43-fb44    #46
+    'E'        // fb45
+    'i1U'      // fb46-fb4f    #46
+    '4iZ'      // fb50-fbc1    #25
+    'pE'       // fbc2-fbd2
+    '13xZ'     // fbd3-fd3d    #25
+    'a10H'     // fd3e-fd3f    #267
+    'oE'       // fd40-fd4f
+    '2kZ'      // fd50-fd8f    #25
+    'aE'       // fd90-fd91
+    '2aZ'      // fd92-fdc7    #25
+    '1mE'      // fdc8-fdef
+    'aZ'       // fdf0-fdf1    #25
+    '4W'       // fdf2         #126
+    'iZ'       // fdf3-fdfc    #25
+    '4W'       // fdfd         #126
+    'aE'       // fdfe-fdff
+    '8Y'       // fe00         #232
+    'lE'       // fe01-fe0d
+    'a9S'      // fe0e-fe0f    #252
+    'iA'       // fe10-fe19    #0
+    'eE'       // fe1a-fe1f
+    'c4P'      // fe20-fe23    #119
+    'b8B'      // fe24-fe26    #209
+    'f4P'      // fe27-fe2d    #119
+    'a8C'      // fe2e-fe2f    #210
+    'lA'       // fe30-fe3c    #0
+    'a5F'      // fe3d-fe3e    #135
+    'aA'       // fe3f-fe40    #0
+    'c5F'      // fe41-fe44    #135
+    'mA'       // fe45-fe52    #0
+    'E'        // fe53
+    'rA'       // fe54-fe66    #0
+    'E'        // fe67
+    'cA'       // fe68-fe6b    #0
+    'cE'       // fe6c-fe6f
+    'dZ'       // fe70-fe74    #25
+    'E'        // fe75
+    '5dZ'      // fe76-fefc    #25
+    'aE'       // fefd-fefe
+    'L'        // feff         #11
+    'E'        // ff00
+    '2L'       // ff01         #63
+    'eA'       // ff02-ff07    #0
+    'a3S'      // ff08-ff09    #96
+    'aA'       // ff0a-ff0b    #0
+    '2L'       // ff0c         #63
+    'A'        // ff0d         #0
+    '3S'       // ff0e         #96
+    'jA'       // ff0f-ff19    #0
+    'a2L'      // ff1a-ff1b    #63
+    'bA'       // ff1c-ff1e    #0
+    '2L'       // ff1f         #63
+    '2fA'      // ff20-ff5a    #0
+    'U'        // ff5b         #20
+    'A'        // ff5c         #0
+    'U'        // ff5d         #20
+    'bA'       // ff5e-ff60    #0
+    '2L'       // ff61         #63
+    'a3T'      // ff62-ff63    #97
+    '2L'       // ff64         #63
+    '3T'       // ff65         #97
+    '2eA'      // ff66-ff9f    #0
+    'R'        // ffa0         #17
+    '1cA'      // ffa1-ffbe    #0
+    'bE'       // ffbf-ffc1
+    'eA'       // ffc2-ffc7    #0
+    'aE'       // ffc8-ffc9
+    'eA'       // ffca-ffcf    #0
+    'aE'       // ffd0-ffd1
+    'eA'       // ffd2-ffd7    #0
+    'aE'       // ffd8-ffd9
+    'bA'       // ffda-ffdc    #0
+    'bE'       // ffdd-ffdf
+    'fA'       // ffe0-ffe6    #0
+    'E'        // ffe7
+    'fA'       // ffe8-ffee    #0
+    'iE'       // ffef-fff8
+    'bM'       // fff9-fffb    #12
+    'aL'       // fffc-fffd    #11
+    'aE'       // fffe-ffff
+    'k1Z'      // 10000-1000b  #51
+    'E'        // 1000c
+    'y1Z'      // 1000d-10026  #51
+    'E'        // 10027
+    'r1Z'      // 10028-1003a  #51
+    'E'        // 1003b
+    'a1Z'      // 1003c-1003d  #51
+    'E'        // 1003e
+    'n1Z'      // 1003f-1004d  #51
+    'aE'       // 1004e-1004f
+    'm1Z'      // 10050-1005d  #51
+    '1gE'      // 1005e-1007f
+    '4r1Z'     // 10080-100fa  #51
+    'dE'       // 100fb-100ff
+    'b5P'      // 10100-10102  #145
+    'cE'       // 10103-10106
+    '1r5P'     // 10107-10133  #145
+    'bE'       // 10134-10136
+    'h1Z'      // 10137-1013f  #51
+    '2zM'      // 10140-1018e  #12
+    'E'        // 1018f
+    'lM'       // 10190-1019c  #12
+    'bE'       // 1019d-1019f
+    'M'        // 101a0        #12
+    '1tE'      // 101a1-101cf
+    '1sM'      // 101d0-101fd  #12
+    '4yE'      // 101fe-1027f
+    '1b11G'    // 10280-1029c  #292
+    'bE'       // 1029d-1029f
+    '1v10P'    // 102a0-102d0  #275
+    'nE'       // 102d1-102df
+    '1a9Z'     // 102e0-102fb  #259
+    'cE'       // 102fc-102ff
+    '1i6A'     // 10300-10323  #156
+    'hE'       // 10324-1032c
+    'b6A'      // 1032d-1032f  #156
+    'z10V'     // 10330-1034a  #281
+    'dE'       // 1034b-1034f
+    '1p11N'    // 10350-1037a  #299
+    'dE'       // 1037b-1037f
+    '1c6S'     // 10380-1039d  #174
+    'E'        // 1039e
+    '6S'       // 1039f        #174
+    '1i6B'     // 103a0-103c3  #157
+    'cE'       // 103c4-103c7
+    'm6B'      // 103c8-103d5  #157
+    '1oE'      // 103d6-103ff
+    '3a10R'    // 10400-1044f  #277
+    '1u11W'    // 10450-1047f  #308
+    '1c6D'     // 10480-1049d  #159
+    'aE'       // 1049e-1049f
+    'i6D'      // 104a0-104a9  #159
+    'eE'       // 104aa-104af
+    '1i6C'     // 104b0-104d3  #158
+    'cE'       // 104d4-104d7
+    '1i6C'     // 104d8-104fb  #158
+    'cE'       // 104fc-104ff
+    '1m10T'    // 10500-10527  #279
+    'gE'       // 10528-1052f
+    '1y5D'     // 10530-10563  #133
+    'jE'       // 10564-1056e
+    '5D'       // 1056f        #133
+    '5mE'      // 10570-105ff
+    '11x3X'    // 10600-10736  #101
+    'hE'       // 10737-1073f
+    'u3X'      // 10740-10755  #101
+    'iE'       // 10756-1075f
+    'g3X'      // 10760-10767  #101
+    '5uE'      // 10768-107ff
+    'e2I'      // 10800-10805  #60
+    'aE'       // 10806-10807
+    '2I'       // 10808        #60
+    'E'        // 10809
+    '1q2I'     // 1080a-10835  #60
+    'E'        // 10836
+    'a2I'      // 10837-10838  #60
+    'bE'       // 10839-1083b
+    '2I'       // 1083c        #60
+    'aE'       // 1083d-1083e
+    '2I'       // 1083f        #60
+    'u5H'      // 10840-10855  #137
+    'E'        // 10856
+    'h5H'      // 10857-1085f  #137
+    '1e11R'    // 10860-1087f  #303
+    '1d5X'     // 10880-1089e  #153
+    'gE'       // 1089f-108a6
+    'h5X'      // 108a7-108af  #153
+    '1uE'      // 108b0-108df
+    'r3U'      // 108e0-108f2  #98
+    'E'        // 108f3
+    'a3U'      // 108f4-108f5  #98
+    'dE'       // 108f6-108fa
+    'd3U'      // 108fb-108ff  #98
+    '1a6E'     // 10900-1091b  #160
+    'bE'       // 1091c-1091e
+    '6E'       // 1091f        #160
+    'y5R'      // 10920-10939  #147
+    'dE'       // 1093a-1093e
+    '5R'       // 1093f        #147
+    '2kE'      // 10940-1097f
+    '2c4A'     // 10980-109b7  #104
+    'cE'       // 109b8-109bb
+    's4A'      // 109bc-109cf  #104
+    'aE'       // 109d0-109d1
+    '1s4A'     // 109d2-109ff  #104
+    'c1Y'      // 10a00-10a03  #50
+    'E'        // 10a04
+    'a1Y'      // 10a05-10a06  #50
+    'dE'       // 10a07-10a0b
+    'g1Y'      // 10a0c-10a13  #50
+    'E'        // 10a14
+    'b1Y'      // 10a15-10a17  #50
+    'E'        // 10a18
+    '1b1Y'     // 10a19-10a35  #50
+    'aE'       // 10a36-10a37
+    'b1Y'      // 10a38-10a3a  #50
+    'cE'       // 10a3b-10a3e
+    'i1Y'      // 10a3f-10a48  #50
+    'fE'       // 10a49-10a4f
+    'h1Y'      // 10a50-10a58  #50
+    'fE'       // 10a59-10a5f
+    '1e11P'    // 10a60-10a7f  #301
+    '1e11M'    // 10a80-10a9f  #298
+    '1eE'      // 10aa0-10abf
+    '1l5T'     // 10ac0-10ae6  #149
+    'cE'       // 10ae7-10aea
+    'k5T'      // 10aeb-10af6  #149
+    'hE'       // 10af7-10aff
+    '2a4X'     // 10b00-10b35  #127
+    'bE'       // 10b36-10b38
+    'f4X'      // 10b39-10b3f  #127
+    'u5J'      // 10b40-10b55  #139
+    'aE'       // 10b56-10b57
+    'g5J'      // 10b58-10b5f  #139
+    'r5I'      // 10b60-10b72  #138
+    'dE'       // 10b73-10b77
+    'g5I'      // 10b78-10b7f  #138
+    'q4E'      // 10b80-10b91  #108
+    'fE'       // 10b92-10b98
+    'c4E'      // 10b99-10b9c  #108
+    'kE'       // 10b9d-10ba8
+    'f4E'      // 10ba9-10baf  #108
+    '3aE'      // 10bb0-10bff
+    '2t11Q'    // 10c00-10c48  #302
+    '2bE'      // 10c49-10c7f
+    '1x4D'     // 10c80-10cb2  #107
+    'lE'       // 10cb3-10cbf
+    '1x4D'     // 10cc0-10cf2  #107
+    'fE'       // 10cf3-10cf9
+    'e4D'      // 10cfa-10cff  #107
+    '13mE'     // 10d00-10e5f
+    '1dM'      // 10e60-10e7e  #12
+    '4xE'      // 10e7f-10eff
+    '1m11O'    // 10f00-10f27  #300
+    'gE'       // 10f28-10f2f
+    '1o11X'    // 10f30-10f59  #309
+    '5cE'      // 10f5a-10fdf
+    'v10U'     // 10fe0-10ff6  #280
+    'hE'       // 10ff7-10fff
+    '2y3O'     // 11000-1104d  #92
+    'cE'       // 1104e-11051
+    '1c3O'     // 11052-1106f  #92
+    'nE'       // 11070-1107e
+    '3O'       // 1107f        #92
+    '2m5L'     // 11080-110c1  #141
+    'jE'       // 110c2-110cc
+    '5L'       // 110cd        #141
+    'aE'       // 110ce-110cf
+    'x6J'      // 110d0-110e8  #165
+    'fE'       // 110e9-110ef
+    'i6J'      // 110f0-110f9  #165
+    'eE'       // 110fa-110ff
+    '1z5E'     // 11100-11134  #134
+    'E'        // 11135
+    'q5E'      // 11136-11147  #134
+    'gE'       // 11148-1114f
+    '1l11H'    // 11150-11176  #293
+    'hE'       // 11177-1117f
+    '3q11V'    // 11180-111df  #307
+    'E'        // 111e0
+    's1N'      // 111e1-111f4  #39
+    'jE'       // 111f5-111ff
+    'q5N'      // 11200-11211  #143
+    'E'        // 11212
+    '1q5N'     // 11213-1123e  #143
+    '2lE'      // 1123f-1127f
+    'f2R'      // 11280-11286  #69
+    'E'        // 11287
+    '2R'       // 11288        #69
+    'E'        // 11289
+    'c2R'      // 1128a-1128d  #69
+    'E'        // 1128e
+    'n2R'      // 1128f-1129d  #69
+    'E'        // 1129e
+    'j2R'      // 1129f-112a9  #69
+    'eE'       // 112aa-112af
+    '2f5O'     // 112b0-112ea  #144
+    'dE'       // 112eb-112ef
+    'i5O'      // 112f0-112f9  #144
+    'eE'       // 112fa-112ff
+    '1F'       // 11300        #31
+    '2J'       // 11301        #61
+    '1F'       // 11302        #31
+    '2J'       // 11303        #61
+    'E'        // 11304
+    'g1F'      // 11305-1130c  #31
+    'aE'       // 1130d-1130e
+    'a1F'      // 1130f-11310  #31
+    'aE'       // 11311-11312
+    'u1F'      // 11313-11328  #31
+    'E'        // 11329
+    'f1F'      // 1132a-11330  #31
+    'E'        // 11331
+    'a1F'      // 11332-11333  #31
+    'E'        // 11334
+    'd1F'      // 11335-11339  #31
+    'E'        // 1133a
+    'a2J'      // 1133b-1133c  #61
+    'g1F'      // 1133d-11344  #31
+    'aE'       // 11345-11346
+    'a1F'      // 11347-11348  #31
+    'aE'       // 11349-1134a
+    'b1F'      // 1134b-1134d  #31
+    'aE'       // 1134e-1134f
+    '1F'       // 11350        #31
+    'eE'       // 11351-11356
+    '1F'       // 11357        #31
+    'dE'       // 11358-1135c
+    'f1F'      // 1135d-11363  #31
+    'aE'       // 11364-11365
+    'f1F'      // 11366-1136c  #31
+    'bE'       // 1136d-1136f
+    'd1F'      // 11370-11374  #31
+    '5hE'      // 11375-113ff
+    '3m5Y'     // 11400-1145b  #154
+    'E'        // 1145c
+    'd5Y'      // 1145d-11461  #154
+    '1cE'      // 11462-1147f
+    '2s6R'     // 11480-114c7  #173
+    'gE'       // 114c8-114cf
+    'i6R'      // 114d0-114d9  #173
+    '6iE'      // 114da-1157f
+    '2a6I'     // 11580-115b5  #164
+    'aE'       // 115b6-115b7
+    '1k6I'     // 115b8-115dd  #164
+    '1gE'      // 115de-115ff
+    '2p5U'     // 11600-11644  #150
+    'jE'       // 11645-1164f
+    'i5U'      // 11650-11659  #150
+    'eE'       // 1165a-1165f
+    'l2G'      // 11660-1166c  #58
+    'rE'       // 1166d-1167f
+    '2e6O'     // 11680-116b9  #170
+    'eE'       // 116ba-116bf
+    'i6O'      // 116c0-116c9  #170
+    '18aE'     // 116ca-1189f
+    '3d6U'     // 118a0-118f2  #176
+    'kE'       // 118f3-118fe
+    '6U'       // 118ff        #176
+    '9uE'      // 11900-119ff
+    '2s12C'    // 11a00-11a47  #314
+    'gE'       // 11a48-11a4f
+    '3d11Y'    // 11a50-11aa2  #310
+    'lE'       // 11aa3-11aaf
+    'o3P'      // 11ab0-11abf  #93
+    '2d11S'    // 11ac0-11af8  #304
+    '10bE'     // 11af9-11bff
+    'h3A'      // 11c00-11c08  #78
+    'E'        // 11c09
+    '1r3A'     // 11c0a-11c36  #78
+    'E'        // 11c37
+    'm3A'      // 11c38-11c45  #78
+    'iE'       // 11c46-11c4f
+    '1b3A'     // 11c50-11c6c  #78
+    'bE'       // 11c6d-11c6f
+    '1e3Y'     // 11c70-11c8f  #102
+    'aE'       // 11c90-11c91
+    'u3Y'      // 11c92-11ca7  #102
+    'E'        // 11ca8
+    'm3Y'      // 11ca9-11cb6  #102
+    '2tE'      // 11cb7-11cff
+    'f2F'      // 11d00-11d06  #57
+    'E'        // 11d07
+    'a2F'      // 11d08-11d09  #57
+    'E'        // 11d0a
+    '1q2F'     // 11d0b-11d36  #57
+    'bE'       // 11d37-11d39
+    '2F'       // 11d3a        #57
+    'E'        // 11d3b
+    'a2F'      // 11d3c-11d3d  #57
+    'E'        // 11d3e
+    'h2F'      // 11d3f-11d47  #57
+    'gE'       // 11d48-11d4f
+    'i2F'      // 11d50-11d59  #57
+    'eE'       // 11d5a-11d5f
+    'e2K'      // 11d60-11d65  #62
+    'E'        // 11d66
+    'a2K'      // 11d67-11d68  #62
+    'E'        // 11d69
+    '1j2K'     // 11d6a-11d8e  #62
+    'E'        // 11d8f
+    'a2K'      // 11d90-11d91  #62
+    'E'        // 11d92
+    'e2K'      // 11d93-11d98  #62
+    'fE'       // 11d99-11d9f
+    'i2K'      // 11da0-11da9  #62
+    '19wE'     // 11daa-11faf
+    '5Q'       // 11fb0        #146
+    'nE'       // 11fb1-11fbf
+    '1w6P'     // 11fc0-11ff1  #171
+    'lE'       // 11ff2-11ffe
+    '6P'       // 11fff        #171
+    '35k3C'    // 12000-12399  #80
+    '3wE'      // 1239a-123ff
+    '4f3C'     // 12400-1246e  #80
+    'E'        // 1246f
+    'd3C'      // 12470-12474  #80
+    'jE'       // 12475-1247f
+    '7m3C'     // 12480-12543  #80
+    '105qE'    // 12544-12fff
+    '41d10S'   // 13000-1342e  #278
+    '155rE'    // 1342f-143ff
+    '22j10E'   // 14400-14646  #264
+    '331zE'    // 14647-167ff
+    '21v4Z'    // 16800-16a38  #129
+    'fE'       // 16a39-16a3f
+    '1d4C'     // 16a40-16a5e  #106
+    'E'        // 16a5f
+    'i4C'      // 16a60-16a69  #106
+    'cE'       // 16a6a-16a6d
+    'a4C'      // 16a6e-16a6f  #106
+    '3qE'      // 16a70-16acf
+    '1c5A'     // 16ad0-16aed  #130
+    'aE'       // 16aee-16aef
+    'e5A'      // 16af0-16af5  #130
+    'iE'       // 16af6-16aff
+    '2q2S'     // 16b00-16b45  #70
+    'iE'       // 16b46-16b4f
+    'i2S'      // 16b50-16b59  #70
+    'E'        // 16b5a
+    'f2S'      // 16b5b-16b61  #70
+    'E'        // 16b62
+    't2S'      // 16b63-16b77  #70
+    'dE'       // 16b78-16b7c
+    'r2S'      // 16b7d-16b8f  #70
+    '26kE'     // 16b90-16e3f
+    '3l11J'    // 16e40-16e9a  #295
+    '3vE'      // 16e9b-16eff
+    '2v4B'     // 16f00-16f4a  #105
+    'cE'       // 16f4b-16f4e
+    '2d4B'     // 16f4f-16f87  #105
+    'fE'       // 16f88-16f8e
+    'p4B'      // 16f8f-16f9f  #105
+    '2lE'      // 16fa0-16fe0
+    '5Z'       // 16fe1        #155
+    '645kE'    // 16fe2-1b16f
+    '15e5Z'    // 1b170-1b2fb  #155
+    '88sE'     // 1b2fc-1bbff
+    '4b2P'     // 1bc00-1bc6a  #67
+    'dE'       // 1bc6b-1bc6f
+    'l2P'      // 1bc70-1bc7c  #67
+    'bE'       // 1bc7d-1bc7f
+    'h2P'      // 1bc80-1bc88  #67
+    'fE'       // 1bc89-1bc8f
+    'i2P'      // 1bc90-1bc99  #67
+    'aE'       // 1bc9a-1bc9b
+    'g2P'      // 1bc9c-1bca3  #67
+    '190oE'    // 1bca4-1cfff
+    '9k2Z'     // 1d000-1d0f5  #77
+    'iE'       // 1d0f6-1d0ff
+    '1l2Z'     // 1d100-1d126  #77
+    'aE'       // 1d127-1d128
+    '7k2Z'     // 1d129-1d1ea  #77
+    'tE'       // 1d1eb-1d1ff
+    '2q2Z'     // 1d200-1d245  #77
+    '4qE'      // 1d246-1d2bf
+    'sM'       // 1d2c0-1d2d3  #12
+    'kE'       // 1d2d4-1d2df
+    's10B'     // 1d2e0-1d2f3  #261
+    'kE'       // 1d2f4-1d2ff
+    '3hM'      // 1d300-1d356  #12
+    'hE'       // 1d357-1d35f
+    'xM'       // 1d360-1d378  #12
+    '5dE'      // 1d379-1d3ff
+    '3fO'      // 1d400-1d454  #14
+    'E'        // 1d455
+    '2rO'      // 1d456-1d49c  #14
+    'E'        // 1d49d
+    'aO'       // 1d49e-1d49f  #14
+    'aE'       // 1d4a0-1d4a1
+    'O'        // 1d4a2        #14
+    'aE'       // 1d4a3-1d4a4
+    'aO'       // 1d4a5-1d4a6  #14
+    'aE'       // 1d4a7-1d4a8
+    'cO'       // 1d4a9-1d4ac  #14
+    'E'        // 1d4ad
+    'kO'       // 1d4ae-1d4b9  #14
+    'E'        // 1d4ba
+    'O'        // 1d4bb        #14
+    'E'        // 1d4bc
+    'fO'       // 1d4bd-1d4c3  #14
+    'E'        // 1d4c4
+    '2lO'      // 1d4c5-1d505  #14
+    'E'        // 1d506
+    'cO'       // 1d507-1d50a  #14
+    'aE'       // 1d50b-1d50c
+    'gO'       // 1d50d-1d514  #14
+    'E'        // 1d515
+    'fO'       // 1d516-1d51c  #14
+    'E'        // 1d51d
+    '1aO'      // 1d51e-1d539  #14
+    'E'        // 1d53a
+    'cO'       // 1d53b-1d53e  #14
+    'E'        // 1d53f
+    'dO'       // 1d540-1d544  #14
+    'E'        // 1d545
+    'O'        // 1d546        #14
+    'bE'       // 1d547-1d549
+    'fO'       // 1d54a-1d550  #14
+    'E'        // 1d551
+    '13aO'     // 1d552-1d6a5  #14
+    'aE'       // 1d6a6-1d6a7
+    '11eO'     // 1d6a8-1d7cb  #14
+    'aE'       // 1d7cc-1d7cd
+    '1wO'      // 1d7ce-1d7ff  #14
+    '78sE'     // 1d800-1dfff
+    'f2C'      // 1e000-1e006  #54
+    'E'        // 1e007
+    'p2C'      // 1e008-1e018  #54
+    'aE'       // 1e019-1e01a
+    'f2C'      // 1e01b-1e021  #54
+    'E'        // 1e022
+    'a2C'      // 1e023-1e024  #54
+    'E'        // 1e025
+    'd2C'      // 1e026-1e02a  #54
+    '25jE'     // 1e02b-1e2bf
+    '2e6T'     // 1e2c0-1e2f9  #175
+    'dE'       // 1e2fa-1e2fe
+    '6T'       // 1e2ff        #175
+    '59aE'     // 1e300-1e8ff
+    '2w3L'     // 1e900-1e94b  #89
+    'cE'       // 1e94c-1e94f
+    'i3L'      // 1e950-1e959  #89
+    'cE'       // 1e95a-1e95d
+    'a3L'      // 1e95e-1e95f  #89
+    '30dE'     // 1e960-1ec70
+    '2o11F'    // 1ec71-1ecb4  #291
+    '12rE'     // 1ecb5-1edff
+    'cO'       // 1ee00-1ee03  #14
+    'E'        // 1ee04
+    'zO'       // 1ee05-1ee1f  #14
+    'E'        // 1ee20
+    'aO'       // 1ee21-1ee22  #14
+    'E'        // 1ee23
+    'O'        // 1ee24        #14
+    'aE'       // 1ee25-1ee26
+    'O'        // 1ee27        #14
+    'E'        // 1ee28
+    'iO'       // 1ee29-1ee32  #14
+    'E'        // 1ee33
+    'cO'       // 1ee34-1ee37  #14
+    'E'        // 1ee38
+    'O'        // 1ee39        #14
+    'E'        // 1ee3a
+    'O'        // 1ee3b        #14
+    'eE'       // 1ee3c-1ee41
+    'O'        // 1ee42        #14
+    'cE'       // 1ee43-1ee46
+    'O'        // 1ee47        #14
+    'E'        // 1ee48
+    'O'        // 1ee49        #14
+    'E'        // 1ee4a
+    'O'        // 1ee4b        #14
+    'E'        // 1ee4c
+    'bO'       // 1ee4d-1ee4f  #14
+    'E'        // 1ee50
+    'aO'       // 1ee51-1ee52  #14
+    'E'        // 1ee53
+    'O'        // 1ee54        #14
+    'aE'       // 1ee55-1ee56
+    'O'        // 1ee57        #14
+    'E'        // 1ee58
+    'O'        // 1ee59        #14
+    'E'        // 1ee5a
+    'O'        // 1ee5b        #14
+    'E'        // 1ee5c
+    'O'        // 1ee5d        #14
+    'E'        // 1ee5e
+    'O'        // 1ee5f        #14
+    'E'        // 1ee60
+    'aO'       // 1ee61-1ee62  #14
+    'E'        // 1ee63
+    'O'        // 1ee64        #14
+    'aE'       // 1ee65-1ee66
+    'cO'       // 1ee67-1ee6a  #14
+    'E'        // 1ee6b
+    'fO'       // 1ee6c-1ee72  #14
+    'E'        // 1ee73
+    'cO'       // 1ee74-1ee77  #14
+    'E'        // 1ee78
+    'cO'       // 1ee79-1ee7c  #14
+    'E'        // 1ee7d
+    'O'        // 1ee7e        #14
+    'E'        // 1ee7f
+    'iO'       // 1ee80-1ee89  #14
+    'E'        // 1ee8a
+    'pO'       // 1ee8b-1ee9b  #14
+    'dE'       // 1ee9c-1eea0
+    'bO'       // 1eea1-1eea3  #14
+    'E'        // 1eea4
+    'dO'       // 1eea5-1eea9  #14
+    'E'        // 1eeaa
+    'pO'       // 1eeab-1eebb  #14
+    '1yE'      // 1eebc-1eeef
+    'aO'       // 1eef0-1eef1  #14
+    '10iE'     // 1eef2-1efff
+    'cM'       // 1f000-1f003  #12
+    'N'        // 1f004        #13
+    '1lM'      // 1f005-1f02b  #12
+    'cE'       // 1f02c-1f02f
+    '3uM'      // 1f030-1f093  #12
+    'kE'       // 1f094-1f09f
+    'nM'       // 1f0a0-1f0ae  #12
+    'aE'       // 1f0af-1f0b0
+    'nM'       // 1f0b1-1f0bf  #12
+    'E'        // 1f0c0
+    'mM'       // 1f0c1-1f0ce  #12
+    'N'        // 1f0cf        #13
+    'E'        // 1f0d0
+    '1jM'      // 1f0d1-1f0f5  #12
+    'iE'       // 1f0f6-1f0ff
+    'l1B'      // 1f100-1f10c  #27
+    'bE'       // 1f10d-1f10f
+    '3n1B'     // 1f110-1f16c  #27
+    'bE'       // 1f16d-1f16f
+    'a1W'      // 1f170-1f171  #48
+    'k1B'      // 1f172-1f17d  #27
+    'a1W'      // 1f17e-1f17f  #48
+    'm1B'      // 1f180-1f18d  #27
+    '1W'       // 1f18e        #48
+    'a1B'      // 1f18f-1f190  #27
+    'i1R'      // 1f191-1f19a  #43
+    'q1B'      // 1f19b-1f1ac  #27
+    '2dE'      // 1f1ad-1f1e5
+    'yP'       // 1f1e6-1f1ff  #15
+    'A'        // 1f200        #0
+    'a1R'      // 1f201-1f202  #43
+    'lE'       // 1f203-1f20f
+    'iA'       // 1f210-1f219  #0
+    '1R'       // 1f21a        #43
+    'sA'       // 1f21b-1f22e  #0
+    '1R'       // 1f22f        #43
+    'aA'       // 1f230-1f231  #0
+    'h1R'      // 1f232-1f23a  #43
+    'A'        // 1f23b        #0
+    'cE'       // 1f23c-1f23f
+    'hA'       // 1f240-1f248  #0
+    'fE'       // 1f249-1f24f
+    'a1R'      // 1f250-1f251  #43
+    '6qE'      // 1f252-1f2ff
+    'lP'       // 1f300-1f30c  #15
+    'bN'       // 1f30d-1f30f  #13
+    'dP'       // 1f310-1f314  #15
+    'N'        // 1f315        #13
+    'eP'       // 1f316-1f31b  #15
+    'N'        // 1f31c        #13
+    'cP'       // 1f31d-1f320  #15
+    'N'        // 1f321        #13
+    'aM'       // 1f322-1f323  #12
+    'hN'       // 1f324-1f32c  #13
+    'hP'       // 1f32d-1f335  #15
+    'N'        // 1f336        #13
+    '2lP'      // 1f337-1f377  #15
+    'N'        // 1f378        #13
+    'cP'       // 1f379-1f37c  #15
+    'N'        // 1f37d        #13
+    'tP'       // 1f37e-1f392  #15
+    'N'        // 1f393        #13
+    'aM'       // 1f394-1f395  #12
+    'aN'       // 1f396-1f397  #13
+    'M'        // 1f398        #12
+    'bN'       // 1f399-1f39b  #13
+    'aM'       // 1f39c-1f39d  #12
+    'aN'       // 1f39e-1f39f  #13
+    'fP'       // 1f3a0-1f3a6  #15
+    'N'        // 1f3a7        #13
+    'cP'       // 1f3a8-1f3ab  #15
+    'bN'       // 1f3ac-1f3ae  #13
+    'rP'       // 1f3af-1f3c1  #15
+    'N'        // 1f3c2        #13
+    'P'        // 1f3c3        #15
+    'N'        // 1f3c4        #13
+    'P'        // 1f3c5        #15
+    'N'        // 1f3c6        #13
+    'bP'       // 1f3c7-1f3c9  #15
+    'dN'       // 1f3ca-1f3ce  #13
+    'dP'       // 1f3cf-1f3d3  #15
+    'lN'       // 1f3d4-1f3e0  #13
+    'kP'       // 1f3e1-1f3ec  #15
+    'N'        // 1f3ed        #13
+    'bP'       // 1f3ee-1f3f0  #15
+    'aM'       // 1f3f1-1f3f2  #12
+    'N'        // 1f3f3        #13
+    'P'        // 1f3f4        #15
+    'N'        // 1f3f5        #13
+    'M'        // 1f3f6        #12
+    'N'        // 1f3f7        #13
+    'oP'       // 1f3f8-1f407  #15
+    'N'        // 1f408        #13
+    'kP'       // 1f409-1f414  #15
+    'N'        // 1f415        #13
+    'hP'       // 1f416-1f41e  #15
+    'N'        // 1f41f        #13
+    'eP'       // 1f420-1f425  #15
+    'N'        // 1f426        #13
+    'wP'       // 1f427-1f43e  #15
+    'N'        // 1f43f        #13
+    'P'        // 1f440        #15
+    'aN'       // 1f441-1f442  #13
+    'bP'       // 1f443-1f445  #15
+    'cN'       // 1f446-1f449  #13
+    'aP'       // 1f44a-1f44b  #15
+    'bN'       // 1f44c-1f44e  #13
+    'cP'       // 1f44f-1f452  #15
+    'N'        // 1f453        #13
+    'uP'       // 1f454-1f469  #15
+    'N'        // 1f46a        #13
+    'qP'       // 1f46b-1f47c  #15
+    'N'        // 1f47d        #13
+    '1jP'      // 1f47e-1f4a2  #15
+    'N'        // 1f4a3        #13
+    'kP'       // 1f4a4-1f4af  #15
+    'N'        // 1f4b0        #13
+    'aP'       // 1f4b1-1f4b2  #15
+    'N'        // 1f4b3        #13
+    'dP'       // 1f4b4-1f4b8  #15
+    'N'        // 1f4b9        #13
+    'P'        // 1f4ba        #15
+    'N'        // 1f4bb        #13
+    'bP'       // 1f4bc-1f4be  #15
+    'N'        // 1f4bf        #13
+    'gP'       // 1f4c0-1f4c7  #15
+    'cN'       // 1f4c8-1f4cb  #13
+    'mP'       // 1f4cc-1f4d9  #15
+    'N'        // 1f4da        #13
+    'cP'       // 1f4db-1f4de  #15
+    'N'        // 1f4df        #13
+    'cP'       // 1f4e0-1f4e3  #15
+    'bN'       // 1f4e4-1f4e6  #13
+    'bP'       // 1f4e7-1f4e9  #15
+    'cN'       // 1f4ea-1f4ed  #13
+    'hP'       // 1f4ee-1f4f6  #15
+    'N'        // 1f4f7        #13
+    'P'        // 1f4f8        #15
+    'bN'       // 1f4f9-1f4fb  #13
+    'P'        // 1f4fc        #15
+    'N'        // 1f4fd        #13
+    'M'        // 1f4fe        #12
+    'cP'       // 1f4ff-1f502  #15
+    'N'        // 1f503        #13
+    'bP'       // 1f504-1f506  #15
+    'cN'       // 1f507-1f50a  #13
+    'aP'       // 1f50b-1f50c  #15
+    'N'        // 1f50d        #13
+    'cP'       // 1f50e-1f511  #15
+    'aN'       // 1f512-1f513  #13
+    '1oP'      // 1f514-1f53d  #15
+    'gM'       // 1f53e-1f545  #12
+    'bT'       // 1f546-1f548  #19
+    '1C'       // 1f549        #28
+    'N'        // 1f54a        #13
+    'cP'       // 1f54b-1f54e  #15
+    'T'        // 1f54f        #19
+    'wN'       // 1f550-1f567  #13
+    'fM'       // 1f568-1f56e  #12
+    'aN'       // 1f56f-1f570  #13
+    'aM'       // 1f571-1f572  #12
+    'fN'       // 1f573-1f579  #13
+    'P'        // 1f57a        #15
+    'kM'       // 1f57b-1f586  #12
+    'N'        // 1f587        #13
+    'aM'       // 1f588-1f589  #12
+    'cN'       // 1f58a-1f58d  #13
+    'aM'       // 1f58e-1f58f  #12
+    'N'        // 1f590        #13
+    'cM'       // 1f591-1f594  #12
+    'aP'       // 1f595-1f596  #15
+    'lM'       // 1f597-1f5a3  #12
+    'P'        // 1f5a4        #15
+    'N'        // 1f5a5        #13
+    'aM'       // 1f5a6-1f5a7  #12
+    'N'        // 1f5a8        #13
+    'gM'       // 1f5a9-1f5b0  #12
+    'aN'       // 1f5b1-1f5b2  #13
+    'hM'       // 1f5b3-1f5bb  #12
+    'N'        // 1f5bc        #13
+    'dM'       // 1f5bd-1f5c1  #12
+    'bN'       // 1f5c2-1f5c4  #13
+    'kM'       // 1f5c5-1f5d0  #12
+    'bN'       // 1f5d1-1f5d3  #13
+    'gM'       // 1f5d4-1f5db  #12
+    'bN'       // 1f5dc-1f5de  #13
+    'aM'       // 1f5df-1f5e0  #12
+    'N'        // 1f5e1        #13
+    'M'        // 1f5e2        #12
+    'N'        // 1f5e3        #13
+    'cM'       // 1f5e4-1f5e7  #12
+    'N'        // 1f5e8        #13
+    'eM'       // 1f5e9-1f5ee  #12
+    'N'        // 1f5ef        #13
+    'bM'       // 1f5f0-1f5f2  #12
+    'N'        // 1f5f3        #13
+    'eM'       // 1f5f4-1f5f9  #12
+    'N'        // 1f5fa        #13
+    'tP'       // 1f5fb-1f60f  #15
+    '1C'       // 1f610        #28
+    '2jP'      // 1f611-1f64f  #15
+    '1uM'      // 1f650-1f67f  #12
+    'fP'       // 1f680-1f686  #15
+    'N'        // 1f687        #13
+    'dP'       // 1f688-1f68c  #15
+    'N'        // 1f68d        #13
+    'bP'       // 1f68e-1f690  #15
+    'N'        // 1f691        #13
+    'aP'       // 1f692-1f693  #15
+    'N'        // 1f694        #13
+    'bP'       // 1f695-1f697  #15
+    'N'        // 1f698        #13
+    'sP'       // 1f699-1f6ac  #15
+    'N'        // 1f6ad        #13
+    'cP'       // 1f6ae-1f6b1  #15
+    'N'        // 1f6b2        #13
+    'eP'       // 1f6b3-1f6b8  #15
+    'aN'       // 1f6b9-1f6ba  #13
+    'P'        // 1f6bb        #15
+    'N'        // 1f6bc        #13
+    'hP'       // 1f6bd-1f6c5  #15
+    'dM'       // 1f6c6-1f6ca  #12
+    'N'        // 1f6cb        #13
+    'P'        // 1f6cc        #15
+    'bN'       // 1f6cd-1f6cf  #13
+    'bP'       // 1f6d0-1f6d2  #15
+    'aM'       // 1f6d3-1f6d4  #12
+    'bN'       // 1f6d5-1f6d7  #13
+    'cE'       // 1f6d8-1f6db
+    'cP'       // 1f6dc-1f6df  #15
+    'eN'       // 1f6e0-1f6e5  #13
+    'bM'       // 1f6e6-1f6e8  #12
+    'N'        // 1f6e9        #13
+    'M'        // 1f6ea        #12
+    'aP'       // 1f6eb-1f6ec  #15
+    'bE'       // 1f6ed-1f6ef
+    'N'        // 1f6f0        #13
+    'aM'       // 1f6f1-1f6f2  #12
+    'N'        // 1f6f3        #13
+    'bP'       // 1f6f4-1f6f6  #15
+    'eN'       // 1f6f7-1f6fc  #13
+    'bE'       // 1f6fd-1f6ff
+    '4kT'      // 1f700-1f773  #19
+    'kE'       // 1f774-1f77f
+    '3kM'      // 1f780-1f7d9  #12
+    'eE'       // 1f7da-1f7df
+    'kN'       // 1f7e0-1f7eb  #13
+    'cE'       // 1f7ec-1f7ef
+    'P'        // 1f7f0        #15
+    'nE'       // 1f7f1-1f7ff
+    'kM'       // 1f800-1f80b  #12
+    'cE'       // 1f80c-1f80f
+    '2cM'      // 1f810-1f847  #12
+    'gE'       // 1f848-1f84f
+    'iM'       // 1f850-1f859  #12
+    'eE'       // 1f85a-1f85f
+    '1mM'      // 1f860-1f887  #12
+    'gE'       // 1f888-1f88f
+    '1cM'      // 1f890-1f8ad  #12
+    'aE'       // 1f8ae-1f8af
+    'aM'       // 1f8b0-1f8b1  #12
+    '3kE'      // 1f8b2-1f90b
+    '1tP'      // 1f90c-1f93a  #15
+    'M'        // 1f93b        #12
+    'iP'       // 1f93c-1f945  #15
+    'M'        // 1f946        #12
+    '7bP'      // 1f947-1f9ff  #15
+    '3eM'      // 1fa00-1fa53  #12
+    'kE'       // 1fa54-1fa5f
+    'mM'       // 1fa60-1fa6d  #12
+    'aE'       // 1fa6e-1fa6f
+    'dN'       // 1fa70-1fa74  #13
+    'bP'       // 1fa75-1fa77  #15
+    'bN'       // 1fa78-1fa7a  #13
+    'aP'       // 1fa7b-1fa7c  #15
+    'bE'       // 1fa7d-1fa7f
+    'fN'       // 1fa80-1fa86  #13
+    'aP'       // 1fa87-1fa88  #15
+    'fE'       // 1fa89-1fa8f
+    'xN'       // 1fa90-1faa8  #13
+    'fP'       // 1faa9-1faaf  #15
+    'fN'       // 1fab0-1fab6  #13
+    'fP'       // 1fab7-1fabd  #15
+    'E'        // 1fabe
+    'P'        // 1fabf        #15
+    'bN'       // 1fac0-1fac2  #13
+    'bP'       // 1fac3-1fac5  #15
+    'gE'       // 1fac6-1facd
+    'aP'       // 1face-1facf  #15
+    'fN'       // 1fad0-1fad6  #13
+    'dP'       // 1fad7-1fadb  #15
+    'cE'       // 1fadc-1fadf
+    'hP'       // 1fae0-1fae8  #15
+    'fE'       // 1fae9-1faef
+    'hP'       // 1faf0-1faf8  #15
+    'fE'       // 1faf9-1faff
+    '5pM'      // 1fb00-1fb92  #12
+    'E'        // 1fb93
+    '2bM'      // 1fb94-1fbca  #12
+    '1jE'      // 1fbcb-1fbef
+    'iM'       // 1fbf0-1fbf9  #12
+    '39zE'     // 1fbfa-2000a
+    'H'        // 2000b        #7
+    'tE'       // 2000c-20020
+    'G'        // 20021        #6
+    '1aE'      // 20022-2003d
+    'G'        // 2003e        #6
+    'fE'       // 2003f-20045
+    'G'        // 20046        #6
+    'fE'       // 20047-2004d
+    'G'        // 2004e        #6
+    'xE'       // 2004f-20067
+    'G'        // 20068        #6
+    '1bE'      // 20069-20085
+    'G'        // 20086        #6
+    'B'        // 20087        #1
+    'E'        // 20088
+    'F'        // 20089        #5
+    'X'        // 2008a        #23
+    'hE'       // 2008b-20093
+    'G'        // 20094        #6
+    'lE'       // 20095-200a1
+    'H'        // 200a2        #7
+    'E'        // 200a3
+    'H'        // 200a4        #7
+    'jE'       // 200a5-200af
+    'H'        // 200b0        #7
+    'xE'       // 200b1-200c9
+    'aG'       // 200ca-200cb  #6
+    'B'        // 200cc        #1
+    'G'        // 200cd        #6
+    'bE'       // 200ce-200d0
+    'G'        // 200d1        #6
+    'dE'       // 200d2-200d6
+    'R'        // 200d7        #17
+    'uE'       // 200d8-200ed
+    'G'        // 200ee        #6
+    'eE'       // 200ef-200f4
+    'H'        // 200f5        #7
+    'uE'       // 200f6-2010b
+    'G'        // 2010c        #6
+    'E'        // 2010d
+    'G'        // 2010e        #6
+    'hE'       // 2010f-20117
+    'G'        // 20118        #6
+    'rE'       // 20119-2012b
+    'R'        // 2012c        #17
+    '1pE'      // 2012d-20157
+    'H'        // 20158        #7
+    'jE'       // 20159-20163
+    'D'        // 20164        #3
+    '2hE'      // 20165-201a1
+    'H'        // 201a2        #7
+    'E'        // 201a3
+    'G'        // 201a4        #6
+    'cE'       // 201a5-201a8
+    'G'        // 201a9        #6
+    'E'        // 201aa
+    'G'        // 201ab        #6
+    'tE'       // 201ac-201c0
+    'G'        // 201c1        #6
+    'qE'       // 201c2-201d3
+    'G'        // 201d4        #6
+    '1bE'      // 201d5-201f1
+    'G'        // 201f2        #6
+    'pE'       // 201f3-20203
+    'G'        // 20204        #6
+    'fE'       // 20205-2020b
+    'G'        // 2020c        #6
+    'eE'       // 2020d-20212
+    'H'        // 20213        #7
+    'G'        // 20214        #6
+    '1iE'      // 20215-20238
+    'G'        // 20239        #6
+    '1fE'      // 2023a-2025a
+    'G'        // 2025b        #6
+    'wE'       // 2025c-20273
+    'aG'       // 20274-20275  #6
+    '1hE'      // 20276-20298
+    'G'        // 20299        #6
+    'cE'       // 2029a-2029d
+    'G'        // 2029e        #6
+    'E'        // 2029f
+    'G'        // 202a0        #6
+    'uE'       // 202a1-202b6
+    'G'        // 202b7        #6
+    'fE'       // 202b8-202be
+    'aG'       // 202bf-202c0  #6
+    '1iE'      // 202c1-202e4
+    'G'        // 202e5        #6
+    '1iE'      // 202e6-20309
+    'G'        // 2030a        #6
+    'yE'       // 2030b-20324
+    'G'        // 20325        #6
+    'dE'       // 20326-2032a
+    'H'        // 2032b        #7
+    'tE'       // 2032c-20340
+    'G'        // 20341        #6
+    'bE'       // 20342-20344
+    'bG'       // 20345-20347  #6
+    '1nE'      // 20348-20370
+    'H'        // 20371        #7
+    'kE'       // 20372-2037d
+    'bG'       // 2037e-20380  #6
+    'H'        // 20381        #7
+    '1cE'      // 20382-2039f
+    'G'        // 203a0        #6
+    'eE'       // 203a1-203a6
+    'G'        // 203a7        #6
+    'lE'       // 203a8-203b4
+    'G'        // 203b5        #6
+    'rE'       // 203b6-203c8
+    'G'        // 203c9        #6
+    'E'        // 203ca
+    'G'        // 203cb        #6
+    '1nE'      // 203cc-203f4
+    'G'        // 203f5        #6
+    'bE'       // 203f6-203f8
+    'H'        // 203f9        #7
+    'aE'       // 203fa-203fb
+    'G'        // 203fc        #6
+    'uE'       // 203fd-20412
+    'aG'       // 20413-20414  #6
+    'iE'       // 20415-2041e
+    'G'        // 2041f        #6
+    '1oE'      // 20420-20449
+    'H'        // 2044a        #7
+    'yE'       // 2044b-20464
+    'G'        // 20465        #6
+    '1fE'      // 20466-20486
+    'G'        // 20487        #6
+    'eE'       // 20488-2048d
+    'G'        // 2048e        #6
+    'aE'       // 2048f-20490
+    'aG'       // 20491-20492  #6
+    'oE'       // 20493-204a2
+    'G'        // 204a3        #6
+    '1xE'      // 204a4-204d6
+    'G'        // 204d7        #6
+    '1iE'      // 204d8-204fb
+    'G'        // 204fc        #6
+    'E'        // 204fd
+    'G'        // 204fe        #6
+    'iE'       // 204ff-20508
+    'H'        // 20509        #7
+    '1zE'      // 2050a-2053e
+    'H'        // 2053f        #7
+    'fE'       // 20540-20546
+    'G'        // 20547        #6
+    '2qE'      // 20548-2058d
+    'G'        // 2058e        #6
+    'uE'       // 2058f-205a4
+    'G'        // 205a5        #6
+    'jE'       // 205a6-205b0
+    'H'        // 205b1        #7
+    'E'        // 205b2
+    'G'        // 205b3        #6
+    'nE'       // 205b4-205c2
+    'G'        // 205c3        #6
+    'eE'       // 205c4-205c9
+    '2D'       // 205ca        #55
+    'dE'       // 205cb-205cf
+    'G'        // 205d0        #6
+    'cE'       // 205d1-205d4
+    'G'        // 205d5        #6
+    'H'        // 205d6        #7
+    'gE'       // 205d7-205de
+    'aG'       // 205df-205e0  #6
+    'iE'       // 205e1-205ea
+    'G'        // 205eb        #6
+    '1jE'      // 205ec-20610
+    'X'        // 20611        #23
+    'bE'       // 20612-20614
+    'G'        // 20615        #6
+    'bE'       // 20616-20618
+    'aG'       // 20619-2061a  #6
+    'lE'       // 2061b-20627
+    'A'        // 20628        #0
+    'fE'       // 20629-2062f
+    'G'        // 20630        #6
+    '1jE'      // 20631-20655
+    'G'        // 20656        #6
+    '1dE'      // 20657-20675
+    'B'        // 20676        #1
+    '4lE'      // 20677-206eb
+    'H'        // 206ec        #7
+    '1fE'      // 206ed-2070d
+    'G'        // 2070e        #6
+    '1gE'      // 2070f-20730
+    'G'        // 20731        #6
+    '1bE'      // 20732-2074e
+    'H'        // 2074f        #7
+    '1nE'      // 20750-20778
+    'G'        // 20779        #6
+    '2yE'      // 2077a-207c7
+    'H'        // 207c8        #7
+    '2iE'      // 207c9-20806
+    'H'        // 20807        #7
+    '1iE'      // 20808-2082b
+    'G'        // 2082c        #6
+    'lE'       // 2082d-20839
+    'H'        // 2083a        #7
+    '2cE'      // 2083b-20872
+    'G'        // 20873        #6
+    '2pE'      // 20874-208b8
+    'H'        // 208b9        #7
+    'zE'       // 208ba-208d4
+    'G'        // 208d5        #6
+    '2cE'      // 208d6-2090d
+    'H'        // 2090e        #7
+    'fE'       // 2090f-20915
+    'G'        // 20916        #6
+    'kE'       // 20917-20922
+    'G'        // 20923        #6
+    '1uE'      // 20924-20953
+    'G'        // 20954        #6
+    '1iE'      // 20955-20978
+    'G'        // 20979        #6
+    'aE'       // 2097a-2097b
+    'H'        // 2097c        #7
+    'fE'       // 2097d-20983
+    'Q'        // 20984        #16
+    'wE'       // 20985-2099c
+    'H'        // 2099d        #7
+    '2tE'      // 2099e-209e6
+    'G'        // 209e7        #6
+    '1nE'      // 209e8-20a10
+    'G'        // 20a11        #6
+    '2iE'      // 20a12-20a4f
+    'G'        // 20a50        #6
+    'rE'       // 20a51-20a63
+    'H'        // 20a64        #7
+    'iE'       // 20a65-20a6e
+    'G'        // 20a6f        #6
+    'yE'       // 20a70-20a89
+    'G'        // 20a8a        #6
+    '1nE'      // 20a8b-20ab3
+    'G'        // 20ab4        #6
+    'lE'       // 20ab5-20ac1
+    'G'        // 20ac2        #6
+    'iE'       // 20ac3-20acc
+    'G'        // 20acd        #6
+    'dE'       // 20ace-20ad2
+    'H'        // 20ad3        #7
+    '2dE'      // 20ad4-20b0c
+    'G'        // 20b0d        #6
+    'nE'       // 20b0e-20b1c
+    'H'        // 20b1d        #7
+    '4hE'      // 20b1e-20b8e
+    'G'        // 20b8f        #6
+    'nE'       // 20b90-20b9e
+    'X'        // 20b9f        #23
+    'gE'       // 20ba0-20ba7
+    'aG'       // 20ba8-20ba9  #6
+    'lE'       // 20baa-20bb6
+    'H'        // 20bb7        #7
+    'fE'       // 20bb8-20bbe
+    'G'        // 20bbf        #6
+    'eE'       // 20bc0-20bc5
+    'G'        // 20bc6        #6
+    'cE'       // 20bc7-20bca
+    'G'        // 20bcb        #6
+    'uE'       // 20bcc-20be1
+    'G'        // 20be2        #6
+    'gE'       // 20be3-20bea
+    'G'        // 20beb        #6
+    'nE'       // 20bec-20bfa
+    'G'        // 20bfb        #6
+    'bE'       // 20bfc-20bfe
+    'G'        // 20bff        #6
+    'jE'       // 20c00-20c0a
+    'G'        // 20c0b        #6
+    'E'        // 20c0c
+    'G'        // 20c0d        #6
+    'qE'       // 20c0e-20c1f
+    'G'        // 20c20        #6
+    'rE'       // 20c21-20c33
+    'G'        // 20c34        #6
+    'dE'       // 20c35-20c39
+    'aG'       // 20c3a-20c3b  #6
+    'dE'       // 20c3c-20c40
+    'bG'       // 20c41-20c43  #6
+    'nE'       // 20c44-20c52
+    'G'        // 20c53        #6
+    'pE'       // 20c54-20c64
+    'G'        // 20c65        #6
+    'pE'       // 20c66-20c76
+    'aG'       // 20c77-20c78  #6
+    'bE'       // 20c79-20c7b
+    'G'        // 20c7c        #6
+    'oE'       // 20c7d-20c8c
+    'G'        // 20c8d        #6
+    'gE'       // 20c8e-20c95
+    'G'        // 20c96        #6
+    'dE'       // 20c97-20c9b
+    'G'        // 20c9c        #6
+    'wE'       // 20c9d-20cb4
+    'G'        // 20cb5        #6
+    'aE'       // 20cb6-20cb7
+    'G'        // 20cb8        #6
+    'uE'       // 20cb9-20cce
+    'G'        // 20ccf        #6
+    'D'        // 20cd0        #3
+    'aE'       // 20cd1-20cd2
+    'cG'       // 20cd3-20cd6  #6
+    'eE'       // 20cd7-20cdc
+    'G'        // 20cdd        #6
+    'nE'       // 20cde-20cec
+    'G'        // 20ced        #6
+    'pE'       // 20cee-20cfe
+    'G'        // 20cff        #6
+    'tE'       // 20d00-20d14
+    'G'        // 20d15        #6
+    'qE'       // 20d16-20d27
+    'G'        // 20d28        #6
+    'gE'       // 20d29-20d30
+    'aG'       // 20d31-20d32  #6
+    'qE'       // 20d33-20d44
+    'H'        // 20d45        #7
+    'cG'       // 20d46-20d49  #6
+    'aE'       // 20d4a-20d4b
+    'bG'       // 20d4c-20d4e  #6
+    'hE'       // 20d4f-20d57
+    'H'        // 20d58        #7
+    'uE'       // 20d59-20d6e
+    'G'        // 20d6f        #6
+    'E'        // 20d70
+    'G'        // 20d71        #6
+    'aE'       // 20d72-20d73
+    'G'        // 20d74        #6
+    'fE'       // 20d75-20d7b
+    'G'        // 20d7c        #6
+    'E'        // 20d7d
+    'aG'       // 20d7e-20d7f  #6
+    'uE'       // 20d80-20d95
+    'G'        // 20d96        #6
+    'dE'       // 20d97-20d9b
+    'G'        // 20d9c        #6
+    'iE'       // 20d9d-20da6
+    'G'        // 20da7        #6
+    'iE'       // 20da8-20db1
+    'G'        // 20db2        #6
+    'tE'       // 20db3-20dc7
+    'G'        // 20dc8        #6
+    'wE'       // 20dc9-20de0
+    'H'        // 20de1        #7
+    '1gE'      // 20de2-20e03
+    'G'        // 20e04        #6
+    'cE'       // 20e05-20e08
+    'aG'       // 20e09-20e0a  #6
+    'aE'       // 20e0b-20e0c
+    'dG'       // 20e0d-20e11  #6
+    'cE'       // 20e12-20e15
+    'G'        // 20e16        #6
+    'eE'       // 20e17-20e1c
+    'G'        // 20e1d        #6
+    '1sE'      // 20e1e-20e4b
+    'G'        // 20e4c        #6
+    'vE'       // 20e4d-20e63
+    'H'        // 20e64        #7
+    'gE'       // 20e65-20e6c
+    'X'        // 20e6d        #23
+    'dE'       // 20e6e-20e72
+    'G'        // 20e73        #6
+    'E'        // 20e74
+    'fG'       // 20e75-20e7b  #6
+    'oE'       // 20e7c-20e8b
+    'G'        // 20e8c        #6
+    'gE'       // 20e8d-20e94
+    'H'        // 20e95        #7
+    'G'        // 20e96        #6
+    'E'        // 20e97
+    'G'        // 20e98        #6
+    'cE'       // 20e99-20e9c
+    'G'        // 20e9d        #6
+    'cE'       // 20e9e-20ea1
+    'G'        // 20ea2        #6
+    'fE'       // 20ea3-20ea9
+    'bG'       // 20eaa-20eac  #6
+    'hE'       // 20ead-20eb5
+    'G'        // 20eb6        #6
+    '1eE'      // 20eb7-20ed6
+    'aG'       // 20ed7-20ed8  #6
+    'cE'       // 20ed9-20edc
+    'G'        // 20edd        #6
+    'yE'       // 20ede-20ef7
+    'cG'       // 20ef8-20efb  #6
+    '1fE'      // 20efc-20f1c
+    'G'        // 20f1d        #6
+    'gE'       // 20f1e-20f25
+    'G'        // 20f26        #6
+    'eE'       // 20f27-20f2c
+    'aG'       // 20f2d-20f2e  #6
+    'E'        // 20f2f
+    'aG'       // 20f30-20f31  #6
+    'hE'       // 20f32-20f3a
+    'G'        // 20f3b        #6
+    'oE'       // 20f3c-20f4b
+    'G'        // 20f4c        #6
+    'qE'       // 20f4d-20f5e
+    'H'        // 20f5f        #7
+    'cE'       // 20f60-20f63
+    'G'        // 20f64        #6
+    '1mE'      // 20f65-20f8c
+    'G'        // 20f8d        #6
+    'aE'       // 20f8e-20f8f
+    'G'        // 20f90        #6
+    '1aE'      // 20f91-20fac
+    'G'        // 20fad        #6
+    'eE'       // 20fae-20fb3
+    'bG'       // 20fb4-20fb6  #6
+    'dE'       // 20fb7-20fbb
+    'G'        // 20fbc        #6
+    '1gE'      // 20fbd-20fde
+    'G'        // 20fdf        #6
+    'iE'       // 20fe0-20fe9
+    'cG'       // 20fea-20fed  #6
+    '1kE'      // 20fee-21013
+    'G'        // 21014        #6
+    'gE'       // 21015-2101c
+    'aG'       // 2101d-2101e  #6
+    '1uE'      // 2101f-2104e
+    'G'        // 2104f        #6
+    'kE'       // 21050-2105b
+    'G'        // 2105c        #6
+    'qE'       // 2105d-2106e
+    'G'        // 2106f        #6
+    'dE'       // 21070-21074
+    'cG'       // 21075-21078  #6
+    'aE'       // 21079-2107a
+    'G'        // 2107b        #6
+    'kE'       // 2107c-21087
+    'G'        // 21088        #6
+    'lE'       // 21089-21095
+    'G'        // 21096        #6
+    'eE'       // 21097-2109c
+    'G'        // 2109d        #6
+    'uE'       // 2109e-210b3
+    'G'        // 210b4        #6
+    'iE'       // 210b5-210be
+    'bG'       // 210bf-210c1  #6
+    'dE'       // 210c2-210c6
+    'bG'       // 210c7-210c9  #6
+    'dE'       // 210ca-210ce
+    'G'        // 210cf        #6
+    'bE'       // 210d0-210d2
+    'G'        // 210d3        #6
+    'oE'       // 210d4-210e3
+    'G'        // 210e4        #6
+    'nE'       // 210e5-210f3
+    'bG'       // 210f4-210f6  #6
+    '2cE'      // 210f7-2112e
+    'G'        // 2112f        #6
+    'jE'       // 21130-2113a
+    'G'        // 2113b        #6
+    'E'        // 2113c
+    'G'        // 2113d        #6
+    'fE'       // 2113e-21144
+    'G'        // 21145        #6
+    'aE'       // 21146-21147
+    'G'        // 21148        #6
+    'eE'       // 21149-2114e
+    'G'        // 2114f        #6
+    'dE'       // 21150-21154
+    'R'        // 21155        #17
+    '1oE'      // 21156-2117f
+    'G'        // 21180        #6
+    'eE'       // 21181-21186
+    'G'        // 21187        #6
+    '3bE'      // 21188-211d8
+    'G'        // 211d9        #6
+    '1lE'      // 211da-21200
+    'H'        // 21201        #7
+    '2eE'      // 21202-2123b
+    'G'        // 2123c        #6
+    'H'        // 2123d        #7
+    'pE'       // 2123e-2124e
+    'G'        // 2124f        #6
+    'dE'       // 21250-21254
+    'H'        // 21255        #7
+    '1cE'      // 21256-21273
+    'H'        // 21274        #7
+    'eE'       // 21275-2127a
+    'H'        // 2127b        #7
+    'G'        // 2127c        #6
+    'oE'       // 2127d-2128c
+    'R'        // 2128d        #17
+    'yE'       // 2128e-212a7
+    'aG'       // 212a8-212a9  #6
+    'eE'       // 212aa-212af
+    'G'        // 212b0        #6
+    '1kE'      // 212b1-212d6
+    'H'        // 212d7        #7
+    'jE'       // 212d8-212e2
+    'G'        // 212e3        #6
+    'H'        // 212e4        #7
+    'wE'       // 212e5-212fc
+    'H'        // 212fd        #7
+    'G'        // 212fe        #6
+    'bE'       // 212ff-21301
+    'cG'       // 21302-21305  #6
+    'tE'       // 21306-2131a
+    'H'        // 2131b        #7
+    'yE'       // 2131c-21335
+    'X'        // 21336        #23
+    'bE'       // 21337-21339
+    'G'        // 2133a        #6
+    'hE'       // 2133b-21343
+    'H'        // 21344        #7
+    '1uE'      // 21345-21374
+    'aG'       // 21375-21376  #6
+    'vE'       // 21377-2138d
+    'G'        // 2138e        #6
+    'hE'       // 2138f-21397
+    'G'        // 21398        #6
+    'E'        // 21399
+    'D'        // 2139a        #3
+    'E'        // 2139b
+    'G'        // 2139c        #6
+    '1lE'      // 2139d-213c3
+    'H'        // 213c4        #7
+    'aG'       // 213c5-213c6  #6
+    '1kE'      // 213c7-213ec
+    'G'        // 213ed        #6
+    'oE'       // 213ee-213fd
+    'G'        // 213fe        #6
+    'sE'       // 213ff-21412
+    'B'        // 21413        #1
+    'aE'       // 21414-21415
+    'G'        // 21416        #6
+    'lE'       // 21417-21423
+    'G'        // 21424        #6
+    'yE'       // 21425-2143e
+    'G'        // 2143f        #6
+    'qE'       // 21440-21451
+    'G'        // 21452        #6
+    'E'        // 21453
+    'aG'       // 21454-21455  #6
+    'vE'       // 21456-2146c
+    'aH'       // 2146d-2146e  #7
+    'zE'       // 2146f-21489
+    'G'        // 2148a        #6
+    'kE'       // 2148b-21496
+    'G'        // 21497        #6
+    '1cE'      // 21498-214b5
+    'G'        // 214b6        #6
+    '1vE'      // 214b7-214e7
+    'G'        // 214e8        #6
+    'sE'       // 214e9-214fc
+    'G'        // 214fd        #6
+    '4pE'      // 214fe-21576
+    'G'        // 21577        #6
+    'iE'       // 21578-21581
+    'G'        // 21582        #6
+    'pE'       // 21583-21593
+    'R'        // 21594        #17
+    'E'        // 21595
+    'G'        // 21596        #6
+    '2kE'      // 21597-215d6
+    'F'        // 215d7        #5
+    '1wE'      // 215d8-21609
+    'G'        // 2160a        #6
+    'gE'       // 2160b-21612
+    'G'        // 21613        #6
+    'dE'       // 21614-21618
+    'G'        // 21619        #6
+    '1iE'      // 2161a-2163d
+    'G'        // 2163e        #6
+    'gE'       // 2163f-21646
+    'H'        // 21647        #7
+    'xE'       // 21648-21660
+    'G'        // 21661        #6
+    '1uE'      // 21662-21691
+    'G'        // 21692        #6
+    '1fE'      // 21693-216b3
+    'H'        // 216b4        #7
+    'bE'       // 216b5-216b7
+    'G'        // 216b8        #6
+    'E'        // 216b9
+    'G'        // 216ba        #6
+    'dE'       // 216bb-216bf
+    'bG'       // 216c0-216c2  #6
+    'oE'       // 216c3-216d2
+    'G'        // 216d3        #6
+    'E'        // 216d4
+    'G'        // 216d5        #6
+    'hE'       // 216d6-216de
+    'G'        // 216df        #6
+    'eE'       // 216e0-216e5
+    'bG'       // 216e6-216e8  #6
+    'pE'       // 216e9-216f9
+    'bG'       // 216fa-216fc  #6
+    'E'        // 216fd
+    'G'        // 216fe        #6
+    'fE'       // 216ff-21705
+    'H'        // 21706        #7
+    'eE'       // 21707-2170c
+    'G'        // 2170d        #6
+    'aE'       // 2170e-2170f
+    'G'        // 21710        #6
+    'tE'       // 21711-21725
+    'G'        // 21726        #6
+    'R'        // 21727        #17
+    'qE'       // 21728-21739
+    'bG'       // 2173a-2173c  #6
+    'dE'       // 2173d-21741
+    'H'        // 21742        #7
+    'sE'       // 21743-21756
+    'G'        // 21757        #6
+    'sE'       // 21758-2176b
+    'eG'       // 2176c-21771  #6
+    'E'        // 21772
+    'aG'       // 21773-21774  #6
+    '2aE'      // 21775-217aa
+    'G'        // 217ab        #6
+    'cE'       // 217ac-217af
+    'eG'       // 217b0-217b5  #6
+    'lE'       // 217b6-217c2
+    'G'        // 217c3        #6
+    'bE'       // 217c4-217c6
+    'G'        // 217c7        #6
+    'pE'       // 217c8-217d8
+    'cG'       // 217d9-217dc  #6
+    'aE'       // 217dd-217de
+    'G'        // 217df        #6
+    'nE'       // 217e0-217ee
+    'G'        // 217ef        #6
+    'dE'       // 217f0-217f4
+    'aG'       // 217f5-217f6  #6
+    'E'        // 217f7
+    'dG'       // 217f8-217fc  #6
+    '1hE'      // 217fd-2181f
+    'G'        // 21820        #6
+    'fE'       // 21821-21827
+    'bG'       // 21828-2182a  #6
+    'aE'       // 2182b-2182c
+    'G'        // 2182d        #6
+    'jE'       // 2182e-21838
+    'bG'       // 21839-2183b  #6
+    'cE'       // 2183c-2183f
+    'G'        // 21840        #6
+    'cE'       // 21841-21844
+    'G'        // 21845        #6
+    'kE'       // 21846-21851
+    'G'        // 21852        #6
+    'jE'       // 21853-2185d
+    'G'        // 2185e        #6
+    'aE'       // 2185f-21860
+    'cG'       // 21861-21864  #6
+    'qE'       // 21865-21876
+    'G'        // 21877        #6
+    'bE'       // 21878-2187a
+    'G'        // 2187b        #6
+    'fE'       // 2187c-21882
+    'bG'       // 21883-21885  #6
+    'wE'       // 21886-2189d
+    'dG'       // 2189e-218a2  #6
+    'yE'       // 218a3-218bc
+    'H'        // 218bd        #7
+    'aG'       // 218be-218bf  #6
+    'pE'       // 218c0-218d0
+    'G'        // 218d1        #6
+    'cE'       // 218d2-218d5
+    'cG'       // 218d6-218d9  #6
+    '1eE'      // 218da-218f9
+    'G'        // 218fa        #6
+    'gE'       // 218fb-21902
+    'bG'       // 21903-21905  #6
+    'iE'       // 21906-2190f
+    'bG'       // 21910-21912  #6
+    'aE'       // 21913-21914
+    'G'        // 21915        #6
+    'eE'       // 21916-2191b
+    'G'        // 2191c        #6
+    'dE'       // 2191d-21921
+    'G'        // 21922        #6
+    'cE'       // 21923-21926
+    'G'        // 21927        #6
+    'rE'       // 21928-2193a
+    'G'        // 2193b        #6
+    'gE'       // 2193c-21943
+    'G'        // 21944        #6
+    'rE'       // 21945-21957
+    'G'        // 21958        #6
+    'pE'       // 21959-21969
+    'G'        // 2196a        #6
+    'pE'       // 2196b-2197b
+    'G'        // 2197c        #6
+    'bE'       // 2197d-2197f
+    'G'        // 21980        #6
+    'aE'       // 21981-21982
+    'G'        // 21983        #6
+    'cE'       // 21984-21987
+    'G'        // 21988        #6
+    'lE'       // 21989-21995
+    'G'        // 21996        #6
+    '1qE'      // 21997-219c2
+    'H'        // 219c3        #7
+    'vE'       // 219c4-219da
+    'G'        // 219db        #6
+    'vE'       // 219dc-219f2
+    'G'        // 219f3        #6
+    '1kE'      // 219f4-21a19
+    'H'        // 21a1a        #7
+    'qE'       // 21a1b-21a2c
+    'G'        // 21a2d        #6
+    'eE'       // 21a2e-21a33
+    'G'        // 21a34        #6
+    'oE'       // 21a35-21a44
+    'G'        // 21a45        #6
+    'dE'       // 21a46-21a4a
+    'G'        // 21a4b        #6
+    'vE'       // 21a4c-21a62
+    'G'        // 21a63        #6
+    '8oE'      // 21a64-21b43
+    'G'        // 21b44        #6
+    '4sE'      // 21b45-21bc0
+    'aG'       // 21bc1-21bc2  #6
+    '3xE'      // 21bc3-21c29
+    'G'        // 21c2a        #6
+    '1pE'      // 21c2b-21c55
+    'H'        // 21c56        #7
+    'xE'       // 21c57-21c6f
+    'G'        // 21c70        #6
+    '1vE'      // 21c71-21ca1
+    'G'        // 21ca2        #6
+    'aE'       // 21ca3-21ca4
+    'G'        // 21ca5        #6
+    'eE'       // 21ca6-21cab
+    'G'        // 21cac        #6
+    '4wE'      // 21cad-21d2c
+    'H'        // 21d2d        #7
+    'vE'       // 21d2e-21d44
+    'H'        // 21d45        #7
+    'G'        // 21d46        #6
+    'kE'       // 21d47-21d52
+    'G'        // 21d53        #6
+    'iE'       // 21d54-21d5d
+    'G'        // 21d5e        #6
+    'bE'       // 21d5f-21d61
+    'H'        // 21d62        #7
+    'tE'       // 21d63-21d77
+    'H'        // 21d78        #7
+    'vE'       // 21d79-21d8f
+    'G'        // 21d90        #6
+    'E'        // 21d91
+    'H'        // 21d92        #7
+    'hE'       // 21d93-21d9b
+    'H'        // 21d9c        #7
+    'cE'       // 21d9d-21da0
+    'H'        // 21da1        #7
+    'sE'       // 21da2-21db5
+    'G'        // 21db6        #6
+    'H'        // 21db7        #7
+    'aE'       // 21db8-21db9
+    'G'        // 21dba        #6
+    'nE'       // 21dbb-21dc9
+    'G'        // 21dca        #6
+    'eE'       // 21dcb-21dd0
+    'G'        // 21dd1        #6
+    'mE'       // 21dd2-21ddf
+    'H'        // 21de0        #7
+    'iE'       // 21de1-21dea
+    'G'        // 21deb        #6
+    'lE'       // 21dec-21df8
+    'G'        // 21df9        #6
+    '1gE'      // 21dfa-21e1b
+    'G'        // 21e1c        #6
+    'eE'       // 21e1d-21e22
+    'G'        // 21e23        #6
+    'nE'       // 21e24-21e32
+    'aH'       // 21e33-21e34  #7
+    'aE'       // 21e35-21e36
+    'G'        // 21e37        #6
+    'dE'       // 21e38-21e3c
+    'G'        // 21e3d        #6
+    '2vE'      // 21e3e-21e88
+    'G'        // 21e89        #6
+    'yE'       // 21e8a-21ea3
+    'G'        // 21ea4        #6
+    'bE'       // 21ea5-21ea7
+    'G'        // 21ea8        #6
+    '1dE'      // 21ea9-21ec7
+    'G'        // 21ec8        #6
+    'kE'       // 21ec9-21ed4
+    'G'        // 21ed5        #6
+    '2dE'      // 21ed6-21f0e
+    'G'        // 21f0f        #6
+    'dE'       // 21f10-21f14
+    'G'        // 21f15        #6
+    'gE'       // 21f16-21f1d
+    'H'        // 21f1e        #7
+    '2hE'      // 21f1f-21f5b
+    'R'        // 21f5c        #17
+    'lE'       // 21f5d-21f69
+    'G'        // 21f6a        #6
+    'jE'       // 21f6b-21f75
+    'H'        // 21f76        #7
+    '1lE'      // 21f77-21f9d
+    'G'        // 21f9e        #6
+    'aE'       // 21f9f-21fa0
+    'G'        // 21fa1        #6
+    '2qE'      // 21fa2-21fe7
+    'G'        // 21fe8        #6
+    'pE'       // 21fe9-21ff9
+    'H'        // 21ffa        #7
+    '2uE'      // 21ffb-22044
+    'G'        // 22045        #6
+    'bE'       // 22046-22048
+    'G'        // 22049        #6
+    '1yE'      // 2204a-2207d
+    'G'        // 2207e        #6
+    'zE'       // 2207f-22099
+    'G'        // 2209a        #6
+    '1qE'      // 2209b-220c6
+    'G'        // 220c7        #6
+    '1yE'      // 220c8-220fb
+    'G'        // 220fc        #6
+    '1rE'      // 220fd-22129
+    'G'        // 2212a        #6
+    '1uE'      // 2212b-2215a
+    'G'        // 2215b        #6
+    'vE'       // 2215c-22172
+    'G'        // 22173        #6
+    'eE'       // 22174-22179
+    'G'        // 2217a        #6
+    'H'        // 2217b        #7
+    '1jE'      // 2217c-221a0
+    'G'        // 221a1        #6
+    '1dE'      // 221a2-221c0
+    'G'        // 221c1        #6
+    'E'        // 221c2
+    'G'        // 221c3        #6
+    '2oE'      // 221c4-22207
+    'G'        // 22208        #6
+    'nE'       // 22209-22217
+    'H'        // 22218        #7
+    '3tE'      // 22219-2227b
+    'G'        // 2227c        #6
+    '6dE'      // 2227d-2231d
+    'H'        // 2231e        #7
+    'aE'       // 2231f-22320
+    'G'        // 22321        #6
+    'bE'       // 22322-22324
+    'G'        // 22325        #6
+    '5dE'      // 22326-223ac
+    'H'        // 223ad        #7
+    'nE'       // 223ae-223bc
+    'G'        // 223bd        #6
+    'qE'       // 223be-223cf
+    'G'        // 223d0        #6
+    'eE'       // 223d1-223d6
+    'G'        // 223d7        #6
+    '1gE'      // 223d8-223f9
+    'G'        // 223fa        #6
+    '4aE'      // 223fb-22464
+    'G'        // 22465        #6
+    'jE'       // 22466-22470
+    'G'        // 22471        #6
+    'xE'       // 22472-2248a
+    'G'        // 2248b        #6
+    'dE'       // 2248c-22490
+    'G'        // 22491        #6
+    '1cE'      // 22492-224af
+    '2D'       // 224b0        #55
+    'jE'       // 224b1-224bb
+    'G'        // 224bc        #6
+    'cE'       // 224bd-224c0
+    'G'        // 224c1        #6
+    'fE'       // 224c2-224c8
+    'G'        // 224c9        #6
+    'aE'       // 224ca-224cb
+    'G'        // 224cc        #6
+    '1eE'      // 224cd-224ec
+    '2D'       // 224ed        #55
+    '1jE'      // 224ee-22512
+    'G'        // 22513        #6
+    'fE'       // 22514-2251a
+    'G'        // 2251b        #6
+    'sE'       // 2251c-2252f
+    'G'        // 22530        #6
+    '1hE'      // 22531-22553
+    'G'        // 22554        #6
+    '2cE'      // 22555-2258c
+    'G'        // 2258d        #6
+    '1fE'      // 2258e-225ae
+    'G'        // 225af        #6
+    'mE'       // 225b0-225bd
+    'G'        // 225be        #6
+    '2uE'      // 225bf-22608
+    'H'        // 22609        #7
+    'pE'       // 2260a-2261a
+    'aG'       // 2261b-2261c  #6
+    'mE'       // 2261d-2262a
+    'G'        // 2262b        #6
+    '2gE'      // 2262c-22667
+    'G'        // 22668        #6
+    'pE'       // 22669-22679
+    'G'        // 2267a        #6
+    'zE'       // 2267b-22695
+    'G'        // 22696        #6
+    'E'        // 22697
+    'G'        // 22698        #6
+    '3kE'      // 22699-226f2
+    'H'        // 226f3        #7
+    'bG'       // 226f4-226f6  #6
+    'zE'       // 226f7-22711
+    'G'        // 22712        #6
+    'E'        // 22713
+    'G'        // 22714        #6
+    'eE'       // 22715-2271a
+    'G'        // 2271b        #6
+    'bE'       // 2271c-2271e
+    'G'        // 2271f        #6
+    'iE'       // 22720-22729
+    'G'        // 2272a        #6
+    '2uE'      // 2272b-22774
+    'G'        // 22775        #6
+    'jE'       // 22776-22780
+    'G'        // 22781        #6
+    'sE'       // 22782-22795
+    'G'        // 22796        #6
+    '1bE'      // 22797-227b3
+    'aG'       // 227b4-227b5  #6
+    'vE'       // 227b6-227cc
+    'G'        // 227cd        #6
+    '1zE'      // 227ce-22802
+    'G'        // 22803        #6
+    '3hE'      // 22804-2285a
+    'H'        // 2285b        #7
+    'bE'       // 2285c-2285e
+    'aG'       // 2285f-22860  #6
+    'oE'       // 22861-22870
+    'G'        // 22871        #6
+    '2dE'      // 22872-228aa
+    'H'        // 228ab        #7
+    'E'        // 228ac
+    'G'        // 228ad        #6
+    'rE'       // 228ae-228c0
+    'G'        // 228c1        #6
+    '1zE'      // 228c2-228f6
+    'G'        // 228f7        #6
+    '1sE'      // 228f8-22925
+    'G'        // 22926        #6
+    'qE'       // 22927-22938
+    'G'        // 22939        #6
+    'tE'       // 2293a-2294e
+    '2D'       // 2294f        #55
+    'vE'       // 22950-22966
+    'G'        // 22967        #6
+    'bE'       // 22968-2296a
+    'G'        // 2296b        #6
+    'sE'       // 2296c-2297f
+    'G'        // 22980        #6
+    'mE'       // 22981-2298e
+    'F'        // 2298f        #5
+    'bE'       // 22990-22992
+    'G'        // 22993        #6
+    '8aE'      // 22994-22a65
+    'G'        // 22a66        #6
+    '3bE'      // 22a67-22ab7
+    'H'        // 22ab8        #7
+    'uE'       // 22ab9-22ace
+    'G'        // 22acf        #6
+    'dE'       // 22ad0-22ad4
+    'G'        // 22ad5        #6
+    'oE'       // 22ad6-22ae5
+    'G'        // 22ae6        #6
+    'E'        // 22ae7
+    'G'        // 22ae8        #6
+    '1jE'      // 22ae9-22b0d
+    'G'        // 22b0e        #6
+    'rE'       // 22b0f-22b21
+    'G'        // 22b22        #6
+    '1aE'      // 22b23-22b3e
+    'G'        // 22b3f        #6
+    'bE'       // 22b40-22b42
+    'G'        // 22b43        #6
+    'aE'       // 22b44-22b45
+    'H'        // 22b46        #7
+    'gE'       // 22b47-22b4e
+    'aH'       // 22b4f-22b50  #7
+    'xE'       // 22b51-22b69
+    'G'        // 22b6a        #6
+    '2fE'      // 22b6b-22ba5
+    'H'        // 22ba6        #7
+    '1hE'      // 22ba7-22bc9
+    'G'        // 22bca        #6
+    'bE'       // 22bcb-22bcd
+    'G'        // 22bce        #6
+    '2yE'      // 22bcf-22c1c
+    'H'        // 22c1d        #7
+    'eE'       // 22c1e-22c23
+    'H'        // 22c24        #7
+    'E'        // 22c25
+    'aG'       // 22c26-22c27  #6
+    'oE'       // 22c28-22c37
+    'G'        // 22c38        #6
+    'rE'       // 22c39-22c4b
+    'G'        // 22c4c        #6
+    'cE'       // 22c4d-22c50
+    'G'        // 22c51        #6
+    'bE'       // 22c52-22c54
+    'G'        // 22c55        #6
+    'kE'       // 22c56-22c61
+    'G'        // 22c62        #6
+    'kE'       // 22c63-22c6e
+    'R'        // 22c6f        #17
+    'wE'       // 22c70-22c87
+    'G'        // 22c88        #6
+    'qE'       // 22c89-22c9a
+    'G'        // 22c9b        #6
+    'dE'       // 22c9c-22ca0
+    'G'        // 22ca1        #6
+    'fE'       // 22ca2-22ca8
+    'G'        // 22ca9        #6
+    'gE'       // 22caa-22cb1
+    'G'        // 22cb2        #6
+    'cE'       // 22cb3-22cb6
+    'G'        // 22cb7        #6
+    'iE'       // 22cb8-22cc1
+    'G'        // 22cc2        #6
+    'bE'       // 22cc3-22cc5
+    'G'        // 22cc6        #6
+    'aE'       // 22cc7-22cc8
+    'G'        // 22cc9        #6
+    '2hE'      // 22cca-22d06
+    'aG'       // 22d07-22d08  #6
+    'hE'       // 22d09-22d11
+    'G'        // 22d12        #6
+    '1vE'      // 22d13-22d43
+    'G'        // 22d44        #6
+    'fE'       // 22d45-22d4b
+    'G'        // 22d4c        #6
+    'yE'       // 22d4d-22d66
+    'G'        // 22d67        #6
+    '1jE'      // 22d68-22d8c
+    'G'        // 22d8d        #6
+    'fE'       // 22d8e-22d94
+    'G'        // 22d95        #6
+    'iE'       // 22d96-22d9f
+    'G'        // 22da0        #6
+    'aE'       // 22da1-22da2
+    'aG'       // 22da3-22da4  #6
+    'qE'       // 22da5-22db6
+    'G'        // 22db7        #6
+    '1nE'      // 22db8-22de0
+    'H'        // 22de1        #7
+    'kE'       // 22de2-22ded
+    'G'        // 22dee        #6
+    '1cE'      // 22def-22e0c
+    'G'        // 22e0d        #6
+    '1mE'      // 22e0e-22e35
+    'G'        // 22e36        #6
+    'jE'       // 22e37-22e41
+    'X'        // 22e42        #23
+    '1zE'      // 22e43-22e77
+    'G'        // 22e78        #6
+    'qE'       // 22e79-22e8a
+    'G'        // 22e8b        #6
+    '1lE'      // 22e8c-22eb2
+    'G'        // 22eb3        #6
+    '1qE'      // 22eb4-22edf
+    'R'        // 22ee0        #17
+    'mE'       // 22ee1-22eee
+    'G'        // 22eef        #6
+    '5aE'      // 22ef0-22f73
+    'G'        // 22f74        #6
+    '3hE'      // 22f75-22fcb
+    'G'        // 22fcc        #6
+    'uE'       // 22fcd-22fe2
+    'G'        // 22fe3        #6
+    'fE'       // 22fe4-22fea
+    'H'        // 22feb        #7
+    '2rE'      // 22fec-23032
+    'G'        // 23033        #6
+    'oE'       // 23034-23043
+    'G'        // 23044        #6
+    'eE'       // 23045-2304a
+    'G'        // 2304b        #6
+    'yE'       // 2304c-23065
+    'G'        // 23066        #6
+    'uE'       // 23067-2307c
+    'aG'       // 2307d-2307e  #6
+    'nE'       // 2307f-2308d
+    'G'        // 2308e        #6
+    '1mE'      // 2308f-230b6
+    'G'        // 230b7        #6
+    'cE'       // 230b8-230bb
+    'G'        // 230bc        #6
+    '1bE'      // 230bd-230d9
+    'G'        // 230da        #6
+    '1gE'      // 230db-230fc
+    'R'        // 230fd        #17
+    'dE'       // 230fe-23102
+    'G'        // 23103        #6
+    '2dE'      // 23104-2313c
+    'G'        // 2313d        #6
+    '2jE'      // 2313e-2317c
+    'G'        // 2317d        #6
+    'cE'       // 2317e-23181
+    'G'        // 23182        #6
+    '1fE'      // 23183-231a3
+    'aG'       // 231a4-231a5  #6
+    'lE'       // 231a6-231b2
+    'G'        // 231b3        #6
+    'aE'       // 231b4-231b5
+    'H'        // 231b6        #7
+    'kE'       // 231b7-231c2
+    'aH'       // 231c3-231c4  #7
+    'bE'       // 231c5-231c7
+    'aG'       // 231c8-231c9  #6
+    '1eE'      // 231ca-231e9
+    'G'        // 231ea        #6
+    'iE'       // 231eb-231f4
+    'H'        // 231f5        #7
+    'E'        // 231f6
+    'bG'       // 231f7-231f9  #6
+    'tE'       // 231fa-2320e
+    'G'        // 2320f        #6
+    'tE'       // 23210-23224
+    'G'        // 23225        #6
+    'hE'       // 23226-2322e
+    'G'        // 2322f        #6
+    'E'        // 23230
+    'cG'       // 23231-23234  #6
+    '1fE'      // 23235-23255
+    'G'        // 23256        #6
+    'fE'       // 23257-2325d
+    'G'        // 2325e        #6
+    'bE'       // 2325f-23261
+    'G'        // 23262        #6
+    '1cE'      // 23263-23280
+    'G'        // 23281        #6
+    'fE'       // 23282-23288
+    'aG'       // 23289-2328a  #6
+    '1eE'      // 2328b-232aa
+    'bG'       // 232ab-232ad  #6
+    '1iE'      // 232ae-232d1
+    'G'        // 232d2        #6
+    'lE'       // 232d3-232df
+    'aG'       // 232e0-232e1  #6
+    '1cE'      // 232e2-232ff
+    'G'        // 23300        #6
+    'hE'       // 23301-23309
+    'G'        // 2330a        #6
+    'sE'       // 2330b-2331e
+    'G'        // 2331f        #6
+    '1hE'      // 23320-23342
+    'R'        // 23343        #17
+    '1sE'      // 23344-23371
+    'H'        // 23372        #7
+    '2lE'      // 23373-233b3
+    'G'        // 233b4        #6
+    'vE'       // 233b5-233cb
+    'X'        // 233cc        #23
+    'bE'       // 233cd-233cf
+    'H'        // 233d0        #7
+    'E'        // 233d1
+    'aH'       // 233d2-233d3  #7
+    'E'        // 233d4
+    'H'        // 233d5        #7
+    'cE'       // 233d6-233d9
+    'H'        // 233da        #7
+    'bE'       // 233db-233dd
+    'G'        // 233de        #6
+    'H'        // 233df        #7
+    'cE'       // 233e0-233e3
+    'H'        // 233e4        #7
+    'E'        // 233e5
+    'G'        // 233e6        #6
+    'lE'       // 233e7-233f3
+    'aG'       // 233f4-233f5  #6
+    'bE'       // 233f6-233f8
+    'aG'       // 233f9-233fa  #6
+    'bE'       // 233fb-233fd
+    'X'        // 233fe        #23
+    'E'        // 233ff
+    'G'        // 23400        #6
+    '2iE'      // 23401-2343e
+    'G'        // 2343f        #6
+    'iE'       // 23440-23449
+    'aH'       // 2344a-2344b  #7
+    'cE'       // 2344c-2344f
+    'G'        // 23450        #6
+    'H'        // 23451        #7
+    'rE'       // 23452-23464
+    'H'        // 23465        #7
+    'hE'       // 23466-2346e
+    'G'        // 2346f        #6
+    'aE'       // 23470-23471
+    'G'        // 23472        #6
+    '4hE'      // 23473-234e3
+    'H'        // 234e4        #7
+    'G'        // 234e5        #6
+    '1xE'      // 234e6-23518
+    'G'        // 23519        #6
+    'uE'       // 2351a-2352f
+    'G'        // 23530        #6
+    '1eE'      // 23531-23550
+    'G'        // 23551        #6
+    'gE'       // 23552-23559
+    'X'        // 2355a        #23
+    'kE'       // 2355b-23566
+    'G'        // 23567        #6
+    '1qE'      // 23568-23593
+    'H'        // 23594        #7
+    'G'        // 23595        #6
+    'bE'       // 23596-23598
+    'G'        // 23599        #6
+    'aE'       // 2359a-2359b
+    'G'        // 2359c        #6
+    '1cE'      // 2359d-235ba
+    'G'        // 235bb        #6
+    'gE'       // 235bc-235c3
+    'H'        // 235c4        #7
+    'eE'       // 235c5-235ca
+    'D'        // 235cb        #3
+    'E'        // 235cc
+    'bG'       // 235cd-235cf  #6
+    '1hE'      // 235d0-235f2
+    'G'        // 235f3        #6
+    'kE'       // 235f4-235ff
+    'G'        // 23600        #6
+    'uE'       // 23601-23616
+    'G'        // 23617        #6
+    'aE'       // 23618-23619
+    'G'        // 2361a        #6
+    '1bE'      // 2361b-23637
+    'bH'       // 23638-2363a  #7
+    'R'        // 2363b        #17
+    'G'        // 2363c        #6
+    'bE'       // 2363d-2363f
+    'G'        // 23640        #6
+    'eE'       // 23641-23646
+    'H'        // 23647        #7
+    'pE'       // 23648-23658
+    'G'        // 23659        #6
+    'dE'       // 2365a-2365e
+    'G'        // 2365f        #6
+    'vE'       // 23660-23676
+    'G'        // 23677        #6
+    'uE'       // 23678-2368d
+    'G'        // 2368e        #6
+    'nE'       // 2368f-2369d
+    'G'        // 2369e        #6
+    'fE'       // 2369f-236a5
+    'G'        // 236a6        #6
+    'eE'       // 236a7-236ac
+    'G'        // 236ad        #6
+    'kE'       // 236ae-236b9
+    'G'        // 236ba        #6
+    '1iE'      // 236bb-236de
+    'G'        // 236df        #6
+    'mE'       // 236e0-236ed
+    'G'        // 236ee        #6
+    'sE'       // 236ef-23702
+    'G'        // 23703        #6
+    'gE'       // 23704-2370b
+    'H'        // 2370c        #7
+    'hE'       // 2370d-23715
+    'G'        // 23716        #6
+    'dE'       // 23717-2371b
+    'H'        // 2371c        #7
+    'bE'       // 2371d-2371f
+    'G'        // 23720        #6
+    'kE'       // 23721-2372c
+    'G'        // 2372d        #6
+    'E'        // 2372e
+    'G'        // 2372f        #6
+    'nE'       // 23730-2373e
+    'X'        // 2373f        #23
+    '1hE'      // 23740-23762
+    'aH'       // 23763-23764  #7
+    'E'        // 23765
+    'G'        // 23766        #6
+    'yE'       // 23767-23780
+    'G'        // 23781        #6
+    '1eE'      // 23782-237a1
+    'G'        // 237a2        #6
+    'xE'       // 237a3-237bb
+    'G'        // 237bc        #6
+    'dE'       // 237bd-237c1
+    'G'        // 237c2        #6
+    'qE'       // 237c3-237d4
+    'bG'       // 237d5-237d7  #6
+    'nE'       // 237d8-237e6
+    'H'        // 237e7        #7
+    'hE'       // 237e8-237f0
+    'H'        // 237f1        #7
+    'lE'       // 237f2-237fe
+    'H'        // 237ff        #7
+    '1iE'      // 23800-23823
+    'H'        // 23824        #7
+    'tE'       // 23825-23839
+    'G'        // 2383a        #6
+    'aE'       // 2383b-2383c
+    'H'        // 2383d        #7
+    '14wE'     // 2383e-239c1
+    'G'        // 239c2        #6
+    '8dE'      // 239c3-23a97
+    'H'        // 23a98        #7
+    'mE'       // 23a99-23aa6
+    'G'        // 23aa7        #6
+    '1vE'      // 23aa8-23ad8
+    'R'        // 23ad9        #17
+    'E'        // 23ada
+    'G'        // 23adb        #6
+    'qE'       // 23adc-23aed
+    'G'        // 23aee        #6
+    'jE'       // 23aef-23af9
+    'G'        // 23afa        #6
+    '1dE'      // 23afb-23b19
+    'G'        // 23b1a        #6
+    '2jE'      // 23b1b-23b59
+    'G'        // 23b5a        #6
+    '10cE'     // 23b5b-23c62
+    'G'        // 23c63        #6
+    'zE'       // 23c64-23c7e
+    'H'        // 23c7f        #7
+    'vE'       // 23c80-23c96
+    'aD'       // 23c97-23c98  #3
+    'bG'       // 23c99-23c9b  #6
+    'xE'       // 23c9c-23cb4
+    'G'        // 23cb5        #6
+    'E'        // 23cb6
+    'G'        // 23cb7        #6
+    'eE'       // 23cb8-23cbd
+    'H'        // 23cbe        #7
+    'gE'       // 23cbf-23cc6
+    'bG'       // 23cc7-23cc9  #6
+    '1wE'      // 23cca-23cfb
+    'aG'       // 23cfc-23cfd  #6
+    'X'        // 23cfe        #23
+    'G'        // 23cff        #6
+    'H'        // 23d00        #7
+    'lE'       // 23d01-23d0d
+    'H'        // 23d0e        #7
+    '1vE'      // 23d0f-23d3f
+    'X'        // 23d40        #23
+    'yE'       // 23d41-23d5a
+    'G'        // 23d5b        #6
+    '1gE'      // 23d5c-23d7d
+    'G'        // 23d7e        #6
+    'oE'       // 23d7f-23d8e
+    'G'        // 23d8f        #6
+    '1kE'      // 23d90-23db5
+    'gG'       // 23db6-23dbd  #6
+    'tE'       // 23dbe-23dd2
+    'H'        // 23dd3        #7
+    'nE'       // 23dd4-23de2
+    'G'        // 23de3        #6
+    'sE'       // 23de4-23df7
+    'G'        // 23df8        #6
+    'aH'       // 23df9-23dfa  #7
+    'jE'       // 23dfb-23e05
+    'G'        // 23e06        #6
+    'iE'       // 23e07-23e10
+    'G'        // 23e11        #6
+    'pE'       // 23e12-23e22
+    'D'        // 23e23        #3
+    'gE'       // 23e24-23e2b
+    'eG'       // 23e2c-23e31  #6
+    'fE'       // 23e32-23e38
+    'G'        // 23e39        #6
+    '2yE'      // 23e3a-23e87
+    'cG'       // 23e88-23e8b  #6
+    '1rE'      // 23e8c-23eb8
+    'G'        // 23eb9        #6
+    'dE'       // 23eba-23ebe
+    'G'        // 23ebf        #6
+    'vE'       // 23ec0-23ed6
+    'G'        // 23ed7        #6
+    '1dE'      // 23ed8-23ef6
+    'eG'       // 23ef7-23efc  #6
+    '2cE'      // 23efd-23f34
+    'G'        // 23f35        #6
+    'jE'       // 23f36-23f40
+    'G'        // 23f41        #6
+    'gE'       // 23f42-23f49
+    'G'        // 23f4a        #6
+    'uE'       // 23f4b-23f60
+    'G'        // 23f61        #6
+    '1aE'      // 23f62-23f7d
+    'H'        // 23f7e        #7
+    'cG'       // 23f7f-23f82  #6
+    'kE'       // 23f83-23f8e
+    'G'        // 23f8f        #6
+    '1iE'      // 23f90-23fb3
+    'G'        // 23fb4        #6
+    'aE'       // 23fb5-23fb6
+    'G'        // 23fb7        #6
+    'gE'       // 23fb8-23fbf
+    'G'        // 23fc0        #6
+    'cE'       // 23fc1-23fc4
+    'G'        // 23fc5        #6
+    '1jE'      // 23fc6-23fea
+    'eG'       // 23feb-23ff0  #6
+    '1eE'      // 23ff1-24010
+    'G'        // 24011        #6
+    '1lE'      // 24012-24038
+    'dG'       // 24039-2403d  #6
+    'lE'       // 2403e-2404a
+    'H'        // 2404b        #7
+    'jE'       // 2404c-24056
+    'G'        // 24057        #6
+    '1rE'      // 24058-24084
+    'G'        // 24085        #6
+    'dE'       // 24086-2408a
+    'bG'       // 2408b-2408d  #6
+    'bE'       // 2408e-24090
+    'G'        // 24091        #6
+    'cE'       // 24092-24095
+    'H'        // 24096        #7
+    '1wE'      // 24097-240c8
+    'G'        // 240c9        #6
+    'vE'       // 240ca-240e0
+    'G'        // 240e1        #6
+    'iE'       // 240e2-240eb
+    'G'        // 240ec        #6
+    'uE'       // 240ed-24102
+    'H'        // 24103        #7
+    'G'        // 24104        #6
+    'iE'       // 24105-2410e
+    'G'        // 2410f        #6
+    'hE'       // 24110-24118
+    'G'        // 24119        #6
+    '1jE'      // 2411a-2413e
+    'aG'       // 2413f-24140  #6
+    'bE'       // 24141-24143
+    'G'        // 24144        #6
+    'hE'       // 24145-2414d
+    'G'        // 2414e        #6
+    'eE'       // 2414f-24154
+    'bG'       // 24155-24157  #6
+    'cE'       // 24158-2415b
+    'G'        // 2415c        #6
+    'aE'       // 2415d-2415e
+    'G'        // 2415f        #6
+    'E'        // 24160
+    'G'        // 24161        #6
+    'tE'       // 24162-24176
+    'G'        // 24177        #6
+    'aE'       // 24178-24179
+    'G'        // 2417a        #6
+    '1mE'      // 2417b-241a2
+    'bG'       // 241a3-241a5  #6
+    'eE'       // 241a6-241ab
+    'G'        // 241ac        #6
+    'gE'       // 241ad-241b4
+    'G'        // 241b5        #6
+    'oE'       // 241b6-241c5
+    'H'        // 241c6        #7
+    'eE'       // 241c7-241cc
+    'G'        // 241cd        #6
+    'sE'       // 241ce-241e1
+    'G'        // 241e2        #6
+    'xE'       // 241e3-241fb
+    'G'        // 241fc        #6
+    'E'        // 241fd
+    'F'        // 241fe        #5
+    'nE'       // 241ff-2420d
+    'D'        // 2420e        #3
+    'kE'       // 2420f-2421a
+    'G'        // 2421b        #6
+    '1tE'      // 2421c-2424a
+    'G'        // 2424b        #6
+    'iE'       // 2424c-24255
+    'G'        // 24256        #6
+    'aE'       // 24257-24258
+    'G'        // 24259        #6
+    '1aE'      // 2425a-24275
+    'bG'       // 24276-24278  #6
+    'jE'       // 24279-24283
+    'G'        // 24284        #6
+    'mE'       // 24285-24292
+    'G'        // 24293        #6
+    'E'        // 24294
+    'G'        // 24295        #6
+    'nE'       // 24296-242a4
+    'G'        // 242a5        #6
+    'xE'       // 242a6-242be
+    'G'        // 242bf        #6
+    'E'        // 242c0
+    'G'        // 242c1        #6
+    'fE'       // 242c2-242c8
+    'aG'       // 242c9-242ca  #6
+    '1hE'      // 242cb-242ed
+    'X'        // 242ee        #23
+    'aE'       // 242ef-242f0
+    'R'        // 242f1        #17
+    'gE'       // 242f2-242f9
+    'G'        // 242fa        #6
+    'qE'       // 242fb-2430c
+    'G'        // 2430d        #6
+    'kE'       // 2430e-24319
+    'G'        // 2431a        #6
+    'xE'       // 2431b-24333
+    'G'        // 24334        #6
+    'rE'       // 24335-24347
+    'G'        // 24348        #6
+    'xE'       // 24349-24361
+    'cG'       // 24362-24365  #6
+    '1kE'      // 24366-2438b
+    'G'        // 2438c        #6
+    'hE'       // 2438d-24395
+    'G'        // 24396        #6
+    'dE'       // 24397-2439b
+    'G'        // 2439c        #6
+    'R'        // 2439d        #17
+    '1cE'      // 2439e-243bb
+    'H'        // 243bc        #7
+    'G'        // 243bd        #6
+    'bE'       // 243be-243c0
+    'G'        // 243c1        #6
+    'mE'       // 243c2-243cf
+    'H'        // 243d0        #7
+    'wE'       // 243d1-243e8
+    'aG'       // 243e9-243ea  #6
+    'fE'       // 243eb-243f1
+    'G'        // 243f2        #6
+    'dE'       // 243f3-243f7
+    'G'        // 243f8        #6
+    'jE'       // 243f9-24403
+    'G'        // 24404        #6
+    '1uE'      // 24405-24434
+    'aG'       // 24435-24436  #6
+    '1hE'      // 24437-24459
+    'aG'       // 2445a-2445b  #6
+    'vE'       // 2445c-24472
+    'G'        // 24473        #6
+    'rE'       // 24474-24486
+    'aG'       // 24487-24488  #6
+    '1uE'      // 24489-244b8
+    'G'        // 244b9        #6
+    'aE'       // 244ba-244bb
+    'G'        // 244bc        #6
+    'pE'       // 244bd-244cd
+    'G'        // 244ce        #6
+    'cE'       // 244cf-244d2
+    'G'        // 244d3        #6
+    'aE'       // 244d4-244d5
+    'G'        // 244d6        #6
+    '1sE'      // 244d7-24504
+    'G'        // 24505        #6
+    'zE'       // 24506-24520
+    'G'        // 24521        #6
+    '3gE'      // 24522-24577
+    'G'        // 24578        #6
+    '2zE'      // 24579-245c7
+    'G'        // 245c8        #6
+    '2zE'      // 245c9-24617
+    'G'        // 24618        #6
+    'oE'       // 24619-24628
+    'H'        // 24629        #7
+    'G'        // 2462a        #6
+    '2eE'      // 2462b-24664
+    'G'        // 24665        #6
+    'mE'       // 24666-24673
+    'G'        // 24674        #6
+    '1gE'      // 24675-24696
+    'G'        // 24697        #6
+    'lE'       // 24698-246a4
+    'H'        // 246a5        #7
+    '1sE'      // 246a6-246d3
+    'G'        // 246d4        #6
+    '1vE'      // 246d5-24705
+    'G'        // 24706        #6
+    '1cE'      // 24707-24724
+    'G'        // 24725        #6
+    'hE'       // 24726-2472e
+    'G'        // 2472f        #6
+    '3pE'      // 24730-2478e
+    'G'        // 2478f        #6
+    '3aE'      // 24790-247df
+    'G'        // 247e0        #6
+    'oE'       // 247e1-247f0
+    'H'        // 247f1        #7
+    '1eE'      // 247f2-24811
+    'G'        // 24812        #6
+    'oE'       // 24813-24822
+    'G'        // 24823        #6
+    '3oE'      // 24824-24881
+    'G'        // 24882        #6
+    'rE'       // 24883-24895
+    'H'        // 24896        #7
+    '3cE'      // 24897-248e8
+    'A'        // 248e9        #0
+    'eE'       // 248ea-248ef
+    '2D'       // 248f0        #55
+    'bG'       // 248f1-248f3  #6
+    'fE'       // 248f4-248fa
+    'G'        // 248fb        #6
+    'bE'       // 248fc-248fe
+    'bG'       // 248ff-24901  #6
+    'iE'       // 24902-2490b
+    'G'        // 2490c        #6
+    'hE'       // 2490d-24915
+    'aG'       // 24916-24917  #6
+    'E'        // 24918
+    'G'        // 24919        #6
+    'tE'       // 2491a-2492e
+    'G'        // 2492f        #6
+    'bE'       // 24930-24932
+    'aG'       // 24933-24934  #6
+    'hE'       // 24935-2493d
+    'eG'       // 2493e-24943  #6
+    '1cE'      // 24944-24961
+    'aG'       // 24962-24963  #6
+    'oE'       // 24964-24973
+    'bG'       // 24974-24976  #6
+    'cE'       // 24977-2497a
+    'G'        // 2497b        #6
+    'bE'       // 2497c-2497e
+    'G'        // 2497f        #6
+    'aE'       // 24980-24981
+    'G'        // 24982        #6
+    'dE'       // 24983-24987
+    'gG'       // 24988-2498f  #6
+    'cE'       // 24990-24993
+    'G'        // 24994        #6
+    'nE'       // 24995-249a3
+    'G'        // 249a4        #6
+    'aE'       // 249a5-249a6
+    'G'        // 249a7        #6
+    'E'        // 249a8
+    'G'        // 249a9        #6
+    'E'        // 249aa
+    'bG'       // 249ab-249ad  #6
+    'hE'       // 249ae-249b6
+    'dG'       // 249b7-249bb  #6
+    'hE'       // 249bc-249c4
+    'G'        // 249c5        #6
+    'iE'       // 249c6-249cf
+    'G'        // 249d0        #6
+    'hE'       // 249d1-249d9
+    'G'        // 249da        #6
+    'D'        // 249db        #3
+    'aE'       // 249dc-249dd
+    'aG'       // 249de-249df  #6
+    'bE'       // 249e0-249e2
+    'G'        // 249e3        #6
+    'E'        // 249e4
+    'G'        // 249e5        #6
+    'eE'       // 249e6-249eb
+    'aG'       // 249ec-249ed  #6
+    'gE'       // 249ee-249f5
+    'cG'       // 249f6-249f9  #6
+    'E'        // 249fa
+    'G'        // 249fb        #6
+    'dE'       // 249fc-24a00
+    'K'        // 24a01        #10
+    'kE'       // 24a02-24a0d
+    'G'        // 24a0e        #6
+    'bE'       // 24a0f-24a11
+    '2D'       // 24a12        #55
+    'G'        // 24a13        #6
+    'E'        // 24a14
+    'G'        // 24a15        #6
+    'jE'       // 24a16-24a20
+    'iG'       // 24a21-24a2a  #6
+    'rE'       // 24a2b-24a3d
+    'G'        // 24a3e        #6
+    'bE'       // 24a3f-24a41
+    'G'        // 24a42        #6
+    'aE'       // 24a43-24a44
+    'G'        // 24a45        #6
+    'cE'       // 24a46-24a49
+    'G'        // 24a4a        #6
+    'aE'       // 24a4b-24a4c
+    'H'        // 24a4d        #7
+    'cG'       // 24a4e-24a51  #6
+    'jE'       // 24a52-24a5c
+    'G'        // 24a5d        #6
+    'fE'       // 24a5e-24a64
+    'bG'       // 24a65-24a67  #6
+    'hE'       // 24a68-24a70
+    'G'        // 24a71        #6
+    'dE'       // 24a72-24a76
+    'cG'       // 24a77-24a7a  #6
+    'aE'       // 24a7b-24a7c
+    'D'        // 24a7d        #3
+    'mE'       // 24a7e-24a8b
+    'G'        // 24a8c        #6
+    'eE'       // 24a8d-24a92
+    'cG'       // 24a93-24a96  #6
+    'lE'       // 24a97-24aa3
+    'cG'       // 24aa4-24aa7  #6
+    'hE'       // 24aa8-24ab0
+    'bG'       // 24ab1-24ab3  #6
+    'eE'       // 24ab4-24ab9
+    'bG'       // 24aba-24abc  #6
+    'bE'       // 24abd-24abf
+    'G'        // 24ac0        #6
+    'eE'       // 24ac1-24ac6
+    'G'        // 24ac7        #6
+    'E'        // 24ac8
+    'D'        // 24ac9        #3
+    'G'        // 24aca        #6
+    'eE'       // 24acb-24ad0
+    'G'        // 24ad1        #6
+    'lE'       // 24ad2-24ade
+    'G'        // 24adf        #6
+    'aE'       // 24ae0-24ae1
+    'G'        // 24ae2        #6
+    'eE'       // 24ae3-24ae8
+    'G'        // 24ae9        #6
+    '1jE'      // 24aea-24b0e
+    'G'        // 24b0f        #6
+    '2qE'      // 24b10-24b55
+    'H'        // 24b56        #7
+    'vE'       // 24b57-24b6d
+    'G'        // 24b6e        #6
+    'H'        // 24b6f        #7
+    '5bE'      // 24b70-24bf4
+    'G'        // 24bf5        #6
+    'rE'       // 24bf6-24c08
+    'G'        // 24c09        #6
+    'kE'       // 24c0a-24c15
+    'H'        // 24c16        #7
+    '5dE'      // 24c17-24c9d
+    'aG'       // 24c9e-24c9f  #6
+    '1nE'      // 24ca0-24cc8
+    'G'        // 24cc9        #6
+    'nE'       // 24cca-24cd8
+    'G'        // 24cd9        #6
+    '1qE'      // 24cda-24d05
+    'G'        // 24d06        #6
+    'kE'       // 24d07-24d12
+    'G'        // 24d13        #6
+    'H'        // 24d14        #7
+    '6fE'      // 24d15-24db7
+    'G'        // 24db8        #6
+    '1vE'      // 24db9-24de9
+    'aG'       // 24dea-24deb  #6
+    'wE'       // 24dec-24e03
+    'H'        // 24e04        #7
+    'hE'       // 24e05-24e0d
+    'H'        // 24e0e        #7
+    '1mE'      // 24e0f-24e36
+    'H'        // 24e37        #7
+    'bE'       // 24e38-24e3a
+    'G'        // 24e3b        #6
+    'sE'       // 24e3c-24e4f
+    'G'        // 24e50        #6
+    'xE'       // 24e51-24e69
+    'H'        // 24e6a        #7
+    '1eE'      // 24e6b-24e8a
+    'H'        // 24e8b        #7
+    'xE'       // 24e8c-24ea4
+    'G'        // 24ea5        #6
+    'E'        // 24ea6
+    'G'        // 24ea7        #6
+    '3wE'      // 24ea8-24f0d
+    'G'        // 24f0e        #6
+    '2xE'      // 24f0f-24f5b
+    'G'        // 24f5c        #6
+    '1jE'      // 24f5d-24f81
+    'G'        // 24f82        #6
+    'bE'       // 24f83-24f85
+    'G'        // 24f86        #6
+    'oE'       // 24f87-24f96
+    'G'        // 24f97        #6
+    'aE'       // 24f98-24f99
+    'G'        // 24f9a        #6
+    'mE'       // 24f9b-24fa8
+    'G'        // 24fa9        #6
+    'mE'       // 24faa-24fb7
+    'G'        // 24fb8        #6
+    'hE'       // 24fb9-24fc1
+    'G'        // 24fc2        #6
+    '1tE'      // 24fc3-24ff1
+    'H'        // 24ff2        #7
+    '2dE'      // 24ff3-2502b
+    'G'        // 2502c        #6
+    '1bE'      // 2502d-25049
+    'H'        // 2504a        #7
+    'fE'       // 2504b-25051
+    'G'        // 25052        #6
+    'aE'       // 25053-25054
+    'Q'        // 25055        #16
+    '2rE'      // 25056-2509c
+    'G'        // 2509d        #6
+    '5aE'      // 2509e-25121
+    'H'        // 25122        #7
+    'gE'       // 25123-2512a
+    'G'        // 2512b        #6
+    '1aE'      // 2512c-25147
+    'G'        // 25148        #6
+    '1yE'      // 25149-2517c
+    'aG'       // 2517d-2517e  #6
+    '1oE'      // 2517f-251a8
+    'H'        // 251a9        #7
+    '1hE'      // 251aa-251cc
+    'X'        // 251cd        #23
+    'tE'       // 251ce-251e2
+    'G'        // 251e3        #6
+    'E'        // 251e4
+    'H'        // 251e5        #7
+    'aG'       // 251e6-251e7  #6
+    '2aE'      // 251e8-2521d
+    'H'        // 2521e        #7
+    'E'        // 2521f
+    'aG'       // 25220-25221  #6
+    '1oE'      // 25222-2524b
+    'H'        // 2524c        #7
+    'bE'       // 2524d-2524f
+    'G'        // 25250        #6
+    '2sE'      // 25251-25298
+    'G'        // 25299        #6
+    '1rE'      // 2529a-252c6
+    'G'        // 252c7        #6
+    'oE'       // 252c8-252d7
+    'G'        // 252d8        #6
+    '1zE'      // 252d9-2530d
+    'G'        // 2530e        #6
+    'aE'       // 2530f-25310
+    'G'        // 25311        #6
+    'E'        // 25312
+    'G'        // 25313        #6
+    '1oE'      // 25314-2533d
+    'R'        // 2533e        #17
+    '4mE'      // 2533f-253b4
+    'R'        // 253b5        #17
+    '2sE'      // 253b6-253fd
+    'R'        // 253fe        #17
+    'yE'       // 253ff-25418
+    'G'        // 25419        #6
+    'jE'       // 2541a-25424
+    'G'        // 25425        #6
+    'gE'       // 25426-2542d
+    'H'        // 2542e        #7
+    'aG'       // 2542f-25430  #6
+    'tE'       // 25431-25445
+    'G'        // 25446        #6
+    '1jE'      // 25447-2546b
+    'G'        // 2546c        #6
+    'E'        // 2546d
+    'G'        // 2546e        #6
+    '1dE'      // 2546f-2548d
+    'H'        // 2548e        #7
+    'jE'       // 2548f-25499
+    'G'        // 2549a        #6
+    '2iE'      // 2549b-254d8
+    'H'        // 254d9        #7
+    '1yE'      // 254da-2550d
+    'H'        // 2550e        #7
+    '1gE'      // 2550f-25530
+    'G'        // 25531        #6
+    'D'        // 25532        #3
+    'aE'       // 25533-25534
+    'G'        // 25535        #6
+    'hE'       // 25536-2553e
+    'G'        // 2553f        #6
+    'zE'       // 25540-2555a
+    'cG'       // 2555b-2555e  #6
+    'bE'       // 2555f-25561
+    'B'        // 25562        #1
+    'aE'       // 25563-25564
+    'aG'       // 25565-25566  #6
+    'yE'       // 25567-25580
+    'G'        // 25581        #6
+    'aE'       // 25582-25583
+    'G'        // 25584        #6
+    'iE'       // 25585-2558e
+    'G'        // 2558f        #6
+    'vE'       // 25590-255a6
+    'H'        // 255a7        #7
+    'D'        // 255a8        #3
+    'oE'       // 255a9-255b8
+    'G'        // 255b9        #6
+    'zE'       // 255ba-255d4
+    'G'        // 255d5        #6
+    'dE'       // 255d6-255da
+    'G'        // 255db        #6
+    'cE'       // 255dc-255df
+    'G'        // 255e0        #6
+    '1iE'      // 255e1-25604
+    'G'        // 25605        #6
+    '1tE'      // 25606-25634
+    'G'        // 25635        #6
+    'zE'       // 25636-25650
+    'G'        // 25651        #6
+    '1rE'      // 25652-2567e
+    'H'        // 2567f        #7
+    'bE'       // 25680-25682
+    'G'        // 25683        #6
+    'pE'       // 25684-25694
+    'G'        // 25695        #6
+    '2xE'      // 25696-256e2
+    'G'        // 256e3        #6
+    'qE'       // 256e4-256f5
+    'G'        // 256f6        #6
+    'nE'       // 256f7-25705
+    'G'        // 25706        #6
+    'uE'       // 25707-2571c
+    'G'        // 2571d        #6
+    'fE'       // 2571e-25724
+    'G'        // 25725        #6
+    'vE'       // 25726-2573c
+    'G'        // 2573d        #6
+    '1xE'      // 2573e-25770
+    'H'        // 25771        #7
+    'G'        // 25772        #6
+    '2aE'      // 25773-257a8
+    'H'        // 257a9        #7
+    'iE'       // 257aa-257b3
+    'H'        // 257b4        #7
+    'qE'       // 257b5-257c6
+    'G'        // 257c7        #6
+    'vE'       // 257c8-257de
+    'bG'       // 257df-257e1  #6
+    '3aE'      // 257e2-25831
+    'R'        // 25832        #17
+    'fE'       // 25833-25839
+    'R'        // 2583a        #17
+    '1aE'      // 2583b-25856
+    'G'        // 25857        #6
+    'dE'       // 25858-2585c
+    'G'        // 2585d        #6
+    'sE'       // 2585e-25871
+    'G'        // 25872        #6
+    'E'        // 25873
+    'Q'        // 25874        #16
+    '3dE'      // 25875-258c7
+    'G'        // 258c8        #6
+    'tE'       // 258c9-258dd
+    'G'        // 258de        #6
+    'aE'       // 258df-258e0
+    'G'        // 258e1        #6
+    '1fE'      // 258e2-25902
+    'G'        // 25903        #6
+    '2mE'      // 25904-25945
+    'G'        // 25946        #6
+    'nE'       // 25947-25955
+    'G'        // 25956        #6
+    '1fE'      // 25957-25977
+    'R'        // 25978        #17
+    '1xE'      // 25979-259ab
+    'G'        // 259ac        #6
+    'vE'       // 259ad-259c3
+    'H'        // 259c4        #7
+    'fE'       // 259c5-259cb
+    'X'        // 259cc        #23
+    'fE'       // 259cd-259d3
+    'H'        // 259d4        #7
+    '4vE'      // 259d5-25a53
+    'G'        // 25a54        #6
+    '2kE'      // 25a55-25a94
+    'G'        // 25a95        #6
+    'eE'       // 25a96-25a9b
+    'G'        // 25a9c        #6
+    'pE'       // 25a9d-25aad
+    'aG'       // 25aae-25aaf  #6
+    '1lE'      // 25ab0-25ad6
+    'A'        // 25ad7        #0
+    'jE'       // 25ad8-25ae2
+    'aH'       // 25ae3-25ae4  #7
+    'cE'       // 25ae5-25ae8
+    'G'        // 25ae9        #6
+    'fE'       // 25aea-25af0
+    'H'        // 25af1        #7
+    '4yE'      // 25af2-25b73
+    'G'        // 25b74        #6
+    'sE'       // 25b75-25b88
+    'G'        // 25b89        #6
+    'lE'       // 25b8a-25b96
+    'R'        // 25b97        #17
+    'yE'       // 25b98-25bb1
+    'H'        // 25bb2        #7
+    'aG'       // 25bb3-25bb4  #6
+    'pE'       // 25bb5-25bc5
+    'G'        // 25bc6        #6
+    '1bE'      // 25bc7-25be3
+    'G'        // 25be4        #6
+    'bE'       // 25be5-25be7
+    'G'        // 25be8        #6
+    'wE'       // 25be9-25c00
+    'G'        // 25c01        #6
+    'cE'       // 25c02-25c05
+    'G'        // 25c06        #6
+    'yE'       // 25c07-25c20
+    'G'        // 25c21        #6
+    '1mE'      // 25c22-25c49
+    'G'        // 25c4a        #6
+    'H'        // 25c4b        #7
+    'wE'       // 25c4c-25c63
+    'H'        // 25c64        #7
+    'G'        // 25c65        #6
+    '1pE'      // 25c66-25c90
+    'G'        // 25c91        #6
+    'qE'       // 25c92-25ca3
+    'G'        // 25ca4        #6
+    'zE'       // 25ca5-25cbf
+    'aG'       // 25cc0-25cc1  #6
+    '2gE'      // 25cc2-25cfd
+    'G'        // 25cfe        #6
+    '1fE'      // 25cff-25d1f
+    'G'        // 25d20        #6
+    'nE'       // 25d21-25d2f
+    'G'        // 25d30        #6
+    'qE'       // 25d31-25d42
+    'G'        // 25d43        #6
+    '3fE'      // 25d44-25d98
+    'G'        // 25d99        #6
+    'fE'       // 25d9a-25da0
+    'H'        // 25da1        #7
+    'vE'       // 25da2-25db8
+    'G'        // 25db9        #6
+    '3eE'      // 25dba-25e0d
+    'G'        // 25e0e        #6
+    '1dE'      // 25e0f-25e2d
+    'H'        // 25e2e        #7
+    'tE'       // 25e2f-25e43
+    'R'        // 25e44        #17
+    'cE'       // 25e45-25e48
+    'G'        // 25e49        #6
+    'kE'       // 25e4a-25e55
+    'H'        // 25e56        #7
+    'jE'       // 25e57-25e61
+    'H'        // 25e62        #7
+    'aE'       // 25e63-25e64
+    'H'        // 25e65        #7
+    'zE'       // 25e66-25e80
+    'bG'       // 25e81-25e83  #6
+    '1gE'      // 25e84-25ea5
+    'G'        // 25ea6        #6
+    'tE'       // 25ea7-25ebb
+    'G'        // 25ebc        #6
+    'dE'       // 25ebd-25ec1
+    'H'        // 25ec2        #7
+    'sE'       // 25ec3-25ed6
+    'B'        // 25ed7        #1
+    'X'        // 25ed8        #23
+    'nE'       // 25ed9-25ee7
+    'H'        // 25ee8        #7
+    '1vE'      // 25ee9-25f19
+    'G'        // 25f1a        #6
+    'gE'       // 25f1b-25f22
+    'H'        // 25f23        #7
+    '1lE'      // 25f24-25f4a
+    'G'        // 25f4b        #6
+    'oE'       // 25f4c-25f5b
+    'H'        // 25f5c        #7
+    '4nE'      // 25f5d-25fd3
+    'H'        // 25fd4        #7
+    'jE'       // 25fd5-25fdf
+    'H'        // 25fe0        #7
+    'aG'       // 25fe1-25fe2  #6
+    'wE'       // 25fe3-25ffa
+    'H'        // 25ffb        #7
+    'oE'       // 25ffc-2600b
+    'H'        // 2600c        #7
+    'iE'       // 2600d-26016
+    'H'        // 26017        #7
+    'hE'       // 26018-26020
+    'G'        // 26021        #6
+    'fE'       // 26022-26028
+    'G'        // 26029        #6
+    '1cE'      // 2602a-26047
+    'G'        // 26048        #6
+    'mE'       // 26049-26056
+    'R'        // 26057        #17
+    'gE'       // 26058-2605f
+    'H'        // 26060        #7
+    'bE'       // 26061-26063
+    'G'        // 26064        #6
+    '1cE'      // 26065-26082
+    'G'        // 26083        #6
+    'rE'       // 26084-26096
+    'G'        // 26097        #6
+    'kE'       // 26098-260a3
+    'aG'       // 260a4-260a5  #6
+    '2rE'      // 260a6-260ec
+    'H'        // 260ed        #7
+    'sE'       // 260ee-26101
+    'G'        // 26102        #6
+    '1cE'      // 26103-26120
+    'G'        // 26121        #6
+    '2bE'      // 26122-26158
+    'cG'       // 26159-2615c  #6
+    '3aE'      // 2615d-261ac
+    'aG'       // 261ad-261ae  #6
+    'bE'       // 261af-261b1
+    'G'        // 261b2        #6
+    '1oE'      // 261b3-261dc
+    'G'        // 261dd        #6
+    '2nE'      // 261de-26220
+    'D'        // 26221        #3
+    'H'        // 26222        #7
+    '1zE'      // 26223-26257
+    'G'        // 26258        #6
+    'gE'       // 26259-26260
+    'G'        // 26261        #6
+    'gE'       // 26262-26269
+    'X'        // 2626a        #23
+    'G'        // 2626b        #6
+    'cE'       // 2626c-2626f
+    'H'        // 26270        #7
+    'tE'       // 26271-26285
+    'H'        // 26286        #7
+    '2tE'      // 26287-262cf
+    'G'        // 262d0        #6
+    '3uE'      // 262d1-26334
+    'G'        // 26335        #6
+    'tE'       // 26336-2634a
+    'G'        // 2634b        #6
+    'X'        // 2634c        #23
+    'cE'       // 2634d-26350
+    'G'        // 26351        #6
+    '4cE'      // 26352-263bd
+    'G'        // 263be        #6
+    '2aE'      // 263bf-263f4
+    'G'        // 263f5        #6
+    'aE'       // 263f6-263f7
+    'G'        // 263f8        #6
+    'hE'       // 263f9-26401
+    'X'        // 26402        #23
+    'lE'       // 26403-2640f
+    'bG'       // 26410-26412  #6
+    '2bE'      // 26413-26449
+    'G'        // 2644a        #6
+    '1cE'      // 2644b-26468
+    'G'        // 26469        #6
+    'yE'       // 2646a-26483
+    'G'        // 26484        #6
+    'bE'       // 26485-26487
+    'aG'       // 26488-26489  #6
+    'bE'       // 2648a-2648c
+    'B'        // 2648d        #1
+    'iE'       // 2648e-26497
+    'G'        // 26498        #6
+    '4pE'      // 26499-26511
+    'G'        // 26512        #6
+    '3pE'      // 26513-26571
+    'G'        // 26572        #6
+    '1rE'      // 26573-2659f
+    'G'        // 265a0        #6
+    'bE'       // 265a1-265a3
+    'R'        // 265a4        #17
+    'gE'       // 265a5-265ac
+    'G'        // 265ad        #6
+    'pE'       // 265ae-265be
+    'G'        // 265bf        #6
+    '3cE'      // 265c0-26611
+    'G'        // 26612        #6
+    'rE'       // 26613-26625
+    'G'        // 26626        #6
+    '2zE'      // 26627-26675
+    'D'        // 26676        #3
+    'fE'       // 26677-2667d
+    'H'        // 2667e        #7
+    '1uE'      // 2667f-266ae
+    'G'        // 266af        #6
+    'H'        // 266b0        #7
+    'G'        // 266b1        #6
+    'bE'       // 266b2-266b4
+    'G'        // 266b5        #6
+    '1iE'      // 266b6-266d9
+    'G'        // 266da        #6
+    'lE'       // 266db-266e7
+    'G'        // 266e8        #6
+    'rE'       // 266e9-266fb
+    'G'        // 266fc        #6
+    'xE'       // 266fd-26715
+    'G'        // 26716        #6
+    'eE'       // 26717-2671c
+    'H'        // 2671d        #7
+    '1hE'      // 2671e-26740
+    'G'        // 26741        #6
+    '2eE'      // 26742-2677b
+    'D'        // 2677c        #3
+    '1aE'      // 2677d-26798
+    'G'        // 26799        #6
+    'xE'       // 2679a-267b2
+    'aG'       // 267b3-267b4  #6
+    'vE'       // 267b5-267cb
+    'G'        // 267cc        #6
+    'jE'       // 267cd-267d7
+    'R'        // 267d8        #17
+    '2nE'      // 267d9-2681b
+    'G'        // 2681c        #6
+    '1nE'      // 2681d-26845
+    'G'        // 26846        #6
+    'vE'       // 26847-2685d
+    'G'        // 2685e        #6
+    'nE'       // 2685f-2686d
+    'G'        // 2686e        #6
+    'xE'       // 2686f-26887
+    'G'        // 26888        #6
+    'E'        // 26889
+    'G'        // 2688a        #6
+    'gE'       // 2688b-26892
+    'G'        // 26893        #6
+    '1xE'      // 26894-268c6
+    'G'        // 268c7        #6
+    'tE'       // 268c8-268dc
+    'H'        // 268dd        #7
+    'kE'       // 268de-268e9
+    'H'        // 268ea        #7
+    '1hE'      // 268eb-2690d
+    'G'        // 2690e        #6
+    'aE'       // 2690f-26910
+    'G'        // 26911        #6
+    'sE'       // 26912-26925
+    'G'        // 26926        #6
+    'qE'       // 26927-26938
+    'G'        // 26939        #6
+    'vE'       // 2693a-26950
+    'A'        // 26951        #0
+    '1bE'      // 26952-2696e
+    'H'        // 2696f        #7
+    '1nE'      // 26970-26998
+    'H'        // 26999        #7
+    'mE'       // 2699a-269a7
+    'G'        // 269a8        #6
+    'kE'       // 269a9-269b4
+    'G'        // 269b5        #6
+    '1lE'      // 269b6-269dc
+    'H'        // 269dd        #7
+    'sE'       // 269de-269f1
+    'G'        // 269f2        #6
+    'fE'       // 269f3-269f9
+    'G'        // 269fa        #6
+    '1hE'      // 269fb-26a1d
+    'H'        // 26a1e        #7
+    'mE'       // 26a1f-26a2c
+    'aG'       // 26a2d-26a2e  #6
+    'dE'       // 26a2f-26a33
+    'G'        // 26a34        #6
+    'lE'       // 26a35-26a41
+    'G'        // 26a42        #6
+    'mE'       // 26a43-26a50
+    'aG'       // 26a51-26a52  #6
+    'dE'       // 26a53-26a57
+    'H'        // 26a58        #7
+    '1xE'      // 26a59-26a8b
+    'H'        // 26a8c        #7
+    '1oE'      // 26a8d-26ab6
+    'H'        // 26ab7        #7
+    '2rE'      // 26ab8-26afe
+    'H'        // 26aff        #7
+    'dE'       // 26b00-26b04
+    'G'        // 26b05        #6
+    'cE'       // 26b06-26b09
+    'G'        // 26b0a        #6
+    'gE'       // 26b0b-26b12
+    'G'        // 26b13        #6
+    'E'        // 26b14
+    'G'        // 26b15        #6
+    'lE'       // 26b16-26b22
+    'G'        // 26b23        #6
+    'cE'       // 26b24-26b27
+    'G'        // 26b28        #6
+    '1lE'      // 26b29-26b4f
+    'cG'       // 26b50-26b53  #6
+    'fE'       // 26b54-26b5a
+    'G'        // 26b5b        #6
+    'D'        // 26b5c        #3
+    'wE'       // 26b5d-26b74
+    'G'        // 26b75        #6
+    'kE'       // 26b76-26b81
+    'G'        // 26b82        #6
+    'rE'       // 26b83-26b95
+    'aG'       // 26b96-26b97  #6
+    'dE'       // 26b98-26b9c
+    'G'        // 26b9d        #6
+    'tE'       // 26b9e-26bb2
+    'G'        // 26bb3        #6
+    'kE'       // 26bb4-26bbf
+    'G'        // 26bc0        #6
+    '2aE'      // 26bc1-26bf6
+    'G'        // 26bf7        #6
+    '1nE'      // 26bf8-26c20
+    'B'        // 26c21        #1
+    'fE'       // 26c22-26c28
+    'H'        // 26c29        #7
+    'uE'       // 26c2a-26c3f
+    'aG'       // 26c40-26c41  #6
+    'cE'       // 26c42-26c45
+    'G'        // 26c46        #6
+    '1qE'      // 26c47-26c72
+    'H'        // 26c73        #7
+    'iE'       // 26c74-26c7d
+    'dG'       // 26c7e-26c82  #6
+    'zE'       // 26c83-26c9d
+    'H'        // 26c9e        #7
+    'dE'       // 26c9f-26ca3
+    'G'        // 26ca4        #6
+    'qE'       // 26ca5-26cb6
+    'aG'       // 26cb7-26cb8  #6
+    'cE'       // 26cb9-26cbc
+    'G'        // 26cbd        #6
+    'aE'       // 26cbe-26cbf
+    'G'        // 26cc0        #6
+    'aE'       // 26cc1-26cc2
+    'G'        // 26cc3        #6
+    'lE'       // 26cc4-26cd0
+    'G'        // 26cd1        #6
+    'jE'       // 26cd2-26cdc
+    'H'        // 26cdd        #7
+    '2oE'      // 26cde-26d21
+    'hG'       // 26d22-26d2a  #6
+    '1kE'      // 26d2b-26d50
+    'G'        // 26d51        #6
+    '1gE'      // 26d52-26d73
+    'G'        // 26d74        #6
+    '1pE'      // 26d75-26d9f
+    'gG'       // 26da0-26da7  #6
+    'eE'       // 26da8-26dad
+    'G'        // 26dae        #6
+    '1rE'      // 26daf-26ddb
+    'G'        // 26ddc        #6
+    'lE'       // 26ddd-26de9
+    'aG'       // 26dea-26deb  #6
+    'cE'       // 26dec-26def
+    'G'        // 26df0        #6
+    'nE'       // 26df1-26dff
+    'G'        // 26e00        #6
+    'cE'       // 26e01-26e04
+    'G'        // 26e05        #6
+    'E'        // 26e06
+    'G'        // 26e07        #6
+    'iE'       // 26e08-26e11
+    'G'        // 26e12        #6
+    '1rE'      // 26e13-26e3f
+    'H'        // 26e40        #7
+    'E'        // 26e41
+    'cG'       // 26e42-26e45  #6
+    '1dE'      // 26e46-26e64
+    'H'        // 26e65        #7
+    'gE'       // 26e66-26e6d
+    'G'        // 26e6e        #6
+    'bE'       // 26e6f-26e71
+    'G'        // 26e72        #6
+    'cE'       // 26e73-26e76
+    'G'        // 26e77        #6
+    'kE'       // 26e78-26e83
+    'G'        // 26e84        #6
+    'bE'       // 26e85-26e87
+    'G'        // 26e88        #6
+    'aE'       // 26e89-26e8a
+    'G'        // 26e8b        #6
+    'lE'       // 26e8c-26e98
+    'G'        // 26e99        #6
+    '2aE'      // 26e9a-26ecf
+    'gG'       // 26ed0-26ed7  #6
+    '2yE'      // 26ed8-26f25
+    'G'        // 26f26        #6
+    '2wE'      // 26f27-26f72
+    'aG'       // 26f73-26f74  #6
+    '1dE'      // 26f75-26f93
+    'H'        // 26f94        #7
+    'iE'       // 26f95-26f9e
+    'G'        // 26f9f        #6
+    'E'        // 26fa0
+    'G'        // 26fa1        #6
+    '1aE'      // 26fa2-26fbd
+    'G'        // 26fbe        #6
+    '1dE'      // 26fbf-26fdd
+    'aG'       // 26fde-26fdf  #6
+    'uE'       // 26fe0-26ff5
+    'bH'       // 26ff6-26ff8  #7
+    'tE'       // 26ff9-2700d
+    'G'        // 2700e        #6
+    '2gE'      // 2700f-2704a
+    'G'        // 2704b        #6
+    'eE'       // 2704c-27051
+    'aG'       // 27052-27053  #6
+    '1yE'      // 27054-27087
+    'G'        // 27088        #6
+    '1iE'      // 27089-270ac
+    'bG'       // 270ad-270af  #6
+    '1bE'      // 270b0-270cc
+    'G'        // 270cd        #6
+    'cE'       // 270ce-270d1
+    'G'        // 270d2        #6
+    '1bE'      // 270d3-270ef
+    'G'        // 270f0        #6
+    'bE'       // 270f1-270f3
+    'H'        // 270f4        #7
+    'bE'       // 270f5-270f7
+    'G'        // 270f8        #6
+    'oE'       // 270f9-27108
+    'G'        // 27109        #6
+    'aE'       // 2710a-2710b
+    'G'        // 2710c        #6
+    'X'        // 2710d        #23
+    'wE'       // 2710e-27125
+    'aG'       // 27126-27127  #6
+    'pE'       // 27128-27138
+    'H'        // 27139        #7
+    'iE'       // 2713a-27143
+    'R'        // 27144        #17
+    '1dE'      // 27145-27163
+    'aG'       // 27164-27165  #6
+    'nE'       // 27166-27174
+    'G'        // 27175        #6
+    '3hE'      // 27176-271cc
+    'G'        // 271cd        #6
+    '2xE'      // 271ce-2721a
+    'G'        // 2721b        #6
+    '2vE'      // 2721c-27266
+    'G'        // 27267        #6
+    'wE'       // 27268-2727f
+    'G'        // 27280        #6
+    'cE'       // 27281-27284
+    'G'        // 27285        #6
+    'dE'       // 27286-2728a
+    'G'        // 2728b        #6
+    '1kE'      // 2728c-272b1
+    'G'        // 272b2        #6
+    'bE'       // 272b3-272b5
+    'G'        // 272b6        #6
+    '1tE'      // 272b7-272e5
+    'G'        // 272e6        #6
+    '4bE'      // 272e7-27351
+    'G'        // 27352        #6
+    '2rE'      // 27353-27399
+    'G'        // 2739a        #6
+    '2jE'      // 2739b-273d9
+    'aH'       // 273da-273db  #7
+    '1gE'      // 273dc-273fd
+    'H'        // 273fe        #7
+    'G'        // 273ff        #6
+    'oE'       // 27400-2740f
+    'H'        // 27410        #7
+    'pE'       // 27411-27421
+    'G'        // 27422        #6
+    '1kE'      // 27423-27448
+    'H'        // 27449        #7
+    'eE'       // 2744a-2744f
+    'G'        // 27450        #6
+    '1xE'      // 27451-27483
+    'G'        // 27484        #6
+    'E'        // 27485
+    'G'        // 27486        #6
+    '9bE'      // 27487-27573
+    'G'        // 27574        #6
+    '1sE'      // 27575-275a2
+    'G'        // 275a3        #6
+    '2gE'      // 275a4-275df
+    'G'        // 275e0        #6
+    'bE'       // 275e1-275e3
+    'G'        // 275e4        #6
+    'wE'       // 275e5-275fc
+    'aG'       // 275fd-275fe  #6
+    'R'        // 275ff        #17
+    'fE'       // 27600-27606
+    'G'        // 27607        #6
+    'cE'       // 27608-2760b
+    'G'        // 2760c        #6
+    'fE'       // 2760d-27613
+    'aH'       // 27614-27615  #7
+    'nE'       // 27616-27624
+    'R'        // 27625        #17
+    'jE'       // 27626-27630
+    'H'        // 27631        #7
+    'G'        // 27632        #6
+    'eE'       // 27633-27638
+    'G'        // 27639        #6
+    'zE'       // 2763a-27654
+    'bG'       // 27655-27657  #6
+    '1qE'      // 27658-27683
+    'H'        // 27684        #7
+    'mE'       // 27685-27692
+    'H'        // 27693        #7
+    'G'        // 27694        #6
+    '4pE'      // 27695-2770d
+    'H'        // 2770e        #7
+    'G'        // 2770f        #6
+    'rE'       // 27710-27722
+    'H'        // 27723        #7
+    'pE'       // 27724-27734
+    'aG'       // 27735-27736  #6
+    'iE'       // 27737-27740
+    'G'        // 27741        #6
+    'oE'       // 27742-27751
+    'H'        // 27752        #7
+    'jE'       // 27753-2775d
+    'G'        // 2775e        #6
+    '1jE'      // 2775f-27783
+    'aG'       // 27784-27785  #6
+    '2qE'      // 27786-277cb
+    'G'        // 277cc        #6
+    '5hE'      // 277cd-27857
+    'G'        // 27858        #6
+    'vE'       // 27859-2786f
+    'G'        // 27870        #6
+    '1qE'      // 27871-2789c
+    'G'        // 2789d        #6
+    'sE'       // 2789e-278b1
+    'A'        // 278b2        #0
+    'tE'       // 278b3-278c7
+    'G'        // 278c8        #6
+    '3lE'      // 278c9-27923
+    'G'        // 27924        #6
+    '2mE'      // 27925-27966
+    'G'        // 27967        #6
+    'qE'       // 27968-27979
+    'G'        // 2797a        #6
+    'iE'       // 2797b-27984
+    'H'        // 27985        #7
+    'yE'       // 27986-2799f
+    'G'        // 279a0        #6
+    'rE'       // 279a1-279b3
+    'H'        // 279b4        #7
+    '1mE'      // 279b5-279dc
+    'G'        // 279dd        #6
+    '1dE'      // 279de-279fc
+    'G'        // 279fd        #6
+    'kE'       // 279fe-27a09
+    'G'        // 27a0a        #6
+    'bE'       // 27a0b-27a0d
+    'G'        // 27a0e        #6
+    '1tE'      // 27a0f-27a3d
+    'G'        // 27a3e        #6
+    'qE'       // 27a3f-27a50
+    'R'        // 27a51        #17
+    'E'        // 27a52
+    'G'        // 27a53        #6
+    'dE'       // 27a54-27a58
+    'G'        // 27a59        #6
+    '1dE'      // 27a5a-27a78
+    'G'        // 27a79        #6
+    'iE'       // 27a7a-27a83
+    'X'        // 27a84        #23
+    '2cE'      // 27a85-27abc
+    'aG'       // 27abd-27abe  #6
+    '1zE'      // 27abf-27af3
+    'G'        // 27af4        #6
+    'lE'       // 27af5-27b01
+    'R'        // 27b02        #17
+    'bE'       // 27b03-27b05
+    'G'        // 27b06        #6
+    'cE'       // 27b07-27b0a
+    'G'        // 27b0b        #6
+    'kE'       // 27b0c-27b17
+    'G'        // 27b18        #6
+    '1dE'      // 27b19-27b37
+    'bG'       // 27b38-27b3a  #6
+    'lE'       // 27b3b-27b47
+    'G'        // 27b48        #6
+    '1aE'      // 27b49-27b64
+    'G'        // 27b65        #6
+    '2xE'      // 27b66-27bb2
+    'H'        // 27bb3        #7
+    'iE'       // 27bb4-27bbd
+    'H'        // 27bbe        #7
+    'gE'       // 27bbf-27bc6
+    'H'        // 27bc7        #7
+    '1lE'      // 27bc8-27bee
+    'G'        // 27bef        #6
+    'cE'       // 27bf0-27bf3
+    'G'        // 27bf4        #6
+    '1bE'      // 27bf5-27c11
+    'G'        // 27c12        #6
+    '1nE'      // 27c13-27c3b
+    'H'        // 27c3c        #7
+    '1tE'      // 27c3d-27c6b
+    'G'        // 27c6c        #6
+    '2oE'      // 27c6d-27cb0
+    'G'        // 27cb1        #6
+    'eE'       // 27cb2-27cb7
+    'H'        // 27cb8        #7
+    'kE'       // 27cb9-27cc4
+    'G'        // 27cc5        #6
+    '1nE'      // 27cc6-27cee
+    'R'        // 27cef        #17
+    '2jE'      // 27cf0-27d2e
+    'G'        // 27d2f        #6
+    '1hE'      // 27d30-27d52
+    'aG'       // 27d53-27d54  #6
+    'pE'       // 27d55-27d65
+    'G'        // 27d66        #6
+    'kE'       // 27d67-27d72
+    'X'        // 27d73        #23
+    'oE'       // 27d74-27d83
+    'G'        // 27d84        #6
+    'iE'       // 27d85-27d8e
+    'G'        // 27d8f        #6
+    'gE'       // 27d90-27d97
+    'G'        // 27d98        #6
+    'fE'       // 27d99-27d9f
+    'H'        // 27da0        #7
+    '1aE'      // 27da1-27dbc
+    'G'        // 27dbd        #6
+    '1cE'      // 27dbe-27ddb
+    'G'        // 27ddc        #6
+    '1xE'      // 27ddd-27e0f
+    'H'        // 27e10        #7
+    '2gE'      // 27e11-27e4c
+    'G'        // 27e4d        #6
+    'E'        // 27e4e
+    'G'        // 27e4f        #6
+    '1rE'      // 27e50-27e7c
+    'R'        // 27e7d        #17
+    '1vE'      // 27e7e-27eae
+    'F'        // 27eaf        #5
+    '4bE'      // 27eb0-27f1a
+    'R'        // 27f1b        #17
+    'qE'       // 27f1c-27f2d
+    'G'        // 27f2e        #6
+    '5eE'      // 27f2f-27fb6
+    'A'        // 27fb7        #0
+    '2lE'      // 27fb8-27ff8
+    'B'        // 27ff9        #1
+    'gE'       // 27ffa-28001
+    'G'        // 28002        #6
+    'eE'       // 28003-28008
+    'G'        // 28009        #6
+    'sE'       // 2800a-2801d
+    'G'        // 2801e        #6
+    'cE'       // 2801f-28022
+    'aG'       // 28023-28024  #6
+    '1hE'      // 28025-28047
+    'G'        // 28048        #6
+    '2eE'      // 28049-28082
+    'G'        // 28083        #6
+    'eE'       // 28084-28089
+    'H'        // 2808a        #7
+    'dE'       // 2808b-2808f
+    'G'        // 28090        #6
+    '1oE'      // 28091-280ba
+    'H'        // 280bb        #7
+    'E'        // 280bc
+    'aG'       // 280bd-280be  #6
+    '1nE'      // 280bf-280e7
+    'aG'       // 280e8-280e9  #6
+    'iE'       // 280ea-280f3
+    'G'        // 280f4        #6
+    '2dE'      // 280f5-2812d
+    'G'        // 2812e        #6
+    '1eE'      // 2812f-2814e
+    'G'        // 2814f        #6
+    'lE'       // 28150-2815c
+    'G'        // 2815d        #6
+    'pE'       // 2815e-2816e
+    'G'        // 2816f        #6
+    'xE'       // 28170-28188
+    'G'        // 28189        #6
+    '1jE'      // 2818a-281ae
+    'G'        // 281af        #6
+    'kE'       // 281b0-281bb
+    'G'        // 281bc        #6
+    '2uE'      // 281bd-28206
+    'G'        // 28207        #6
+    'oE'       // 28208-28217
+    'G'        // 28218        #6
+    'E'        // 28219
+    'G'        // 2821a        #6
+    '2fE'      // 2821b-28255
+    'G'        // 28256        #6
+    '1eE'      // 28257-28276
+    'H'        // 28277        #7
+    'cE'       // 28278-2827b
+    'G'        // 2827c        #6
+    'dE'       // 2827d-28281
+    'H'        // 28282        #7
+    'wE'       // 28283-2829a
+    'G'        // 2829b        #6
+    '1vE'      // 2829c-282cc
+    'G'        // 282cd        #6
+    'sE'       // 282ce-282e1
+    'G'        // 282e2        #6
+    'oE'       // 282e3-282f2
+    'H'        // 282f3        #7
+    'qE'       // 282f4-28305
+    'G'        // 28306        #6
+    'pE'       // 28307-28317
+    'G'        // 28318        #6
+    'uE'       // 28319-2832e
+    'G'        // 2832f        #6
+    'iE'       // 28330-28339
+    'G'        // 2833a        #6
+    '1oE'      // 2833b-28364
+    'G'        // 28365        #6
+    'fE'       // 28366-2836c
+    'G'        // 2836d        #6
+    'nE'       // 2836e-2837c
+    'G'        // 2837d        #6
+    'kE'       // 2837e-28389
+    'G'        // 2838a        #6
+    '2mE'      // 2838b-283cc
+    'H'        // 283cd        #7
+    '1mE'      // 283ce-283f5
+    'R'        // 283f6        #17
+    'pE'       // 283f7-28407
+    'D'        // 28408        #3
+    'bE'       // 28409-2840b
+    'H'        // 2840c        #7
+    'dE'       // 2840d-28411
+    'G'        // 28412        #6
+    '2mE'      // 28413-28454
+    'H'        // 28455        #7
+    'qE'       // 28456-28467
+    'G'        // 28468        #6
+    'bE'       // 28469-2846b
+    'G'        // 2846c        #6
+    'eE'       // 2846d-28472
+    'G'        // 28473        #6
+    'mE'       // 28474-28481
+    'G'        // 28482        #6
+    '3jE'      // 28483-284db
+    'Q'        // 284dc        #16
+    '1iE'      // 284dd-28500
+    'G'        // 28501        #6
+    '2eE'      // 28502-2853b
+    'aG'       // 2853c-2853d  #6
+    '1rE'      // 2853e-2856a
+    'H'        // 2856b        #7
+    'G'        // 2856c        #6
+    '3lE'      // 2856d-285c7
+    'aH'       // 285c8-285c9  #7
+    '1cE'      // 285ca-285e7
+    'G'        // 285e8        #6
+    'jE'       // 285e9-285f3
+    'G'        // 285f4        #6
+    'jE'       // 285f5-285ff
+    'G'        // 28600        #6
+    'iE'       // 28601-2860a
+    'G'        // 2860b        #6
+    'xE'       // 2860c-28624
+    'G'        // 28625        #6
+    'tE'       // 28626-2863a
+    'G'        // 2863b        #6
+    '2gE'      // 2863c-28677
+    'D'        // 28678        #3
+    '1aE'      // 28679-28694
+    'D'        // 28695        #3
+    'sE'       // 28696-286a9
+    'aG'       // 286aa-286ab  #6
+    'eE'       // 286ac-286b1
+    'G'        // 286b2        #6
+    'hE'       // 286b3-286bb
+    'G'        // 286bc        #6
+    'yE'       // 286bd-286d6
+    'H'        // 286d7        #7
+    'G'        // 286d8        #6
+    'lE'       // 286d9-286e5
+    'G'        // 286e6        #6
+    'rE'       // 286e7-286f9
+    'H'        // 286fa        #7
+    'sE'       // 286fb-2870e
+    'G'        // 2870f        #6
+    'bE'       // 28710-28712
+    'G'        // 28713        #6
+    '7uE'      // 28714-287df
+    'D'        // 287e0        #3
+    '1hE'      // 287e1-28803
+    'G'        // 28804        #6
+    '1kE'      // 28805-2882a
+    'G'        // 2882b        #6
+    '8pE'      // 2882c-2890c
+    'G'        // 2890d        #6
+    '1jE'      // 2890e-28932
+    'G'        // 28933        #6
+    'qE'       // 28934-28945
+    'H'        // 28946        #7
+    'E'        // 28947
+    'G'        // 28948        #6
+    'X'        // 28949        #23
+    'kE'       // 2894a-28955
+    'G'        // 28956        #6
+    'lE'       // 28957-28963
+    'G'        // 28964        #6
+    'bE'       // 28965-28967
+    'G'        // 28968        #6
+    'aE'       // 28969-2896a
+    'H'        // 2896b        #7
+    'aG'       // 2896c-2896d  #6
+    'oE'       // 2896e-2897d
+    'G'        // 2897e        #6
+    'gE'       // 2897f-28986
+    'aH'       // 28987-28988  #7
+    'G'        // 28989        #6
+    '1cE'      // 2898a-289a7
+    'G'        // 289a8        #6
+    'E'        // 289a9
+    'aG'       // 289aa-289ab  #6
+    'kE'       // 289ac-289b7
+    'G'        // 289b8        #6
+    'E'        // 289b9
+    'aH'       // 289ba-289bb  #7
+    'G'        // 289bc        #6
+    'bE'       // 289bd-289bf
+    'G'        // 289c0        #6
+    'zE'       // 289c1-289db
+    'G'        // 289dc        #6
+    'E'        // 289dd
+    'G'        // 289de        #6
+    'aE'       // 289df-289e0
+    'G'        // 289e1        #6
+    'E'        // 289e2
+    'aG'       // 289e3-289e4  #6
+    'aE'       // 289e5-289e6
+    'aG'       // 289e7-289e8  #6
+    'oE'       // 289e9-289f8
+    'cG'       // 289f9-289fc  #6
+    'qE'       // 289fd-28a0e
+    'G'        // 28a0f        #6
+    'eE'       // 28a10-28a15
+    'G'        // 28a16        #6
+    'fE'       // 28a17-28a1d
+    'H'        // 28a1e        #7
+    'eE'       // 28a1f-28a24
+    'G'        // 28a25        #6
+    'bE'       // 28a26-28a28
+    'X'        // 28a29        #23
+    'gE'       // 28a2a-28a31
+    'G'        // 28a32        #6
+    'bE'       // 28a33-28a35
+    'G'        // 28a36        #6
+    'kE'       // 28a37-28a42
+    'H'        // 28a43        #7
+    'gG'       // 28a44-28a4b  #6
+    'lE'       // 28a4c-28a58
+    'aG'       // 28a59-28a5a  #6
+    'uE'       // 28a5b-28a70
+    'H'        // 28a71        #7
+    'nE'       // 28a72-28a80
+    'bG'       // 28a81-28a83  #6
+    'tE'       // 28a84-28a98
+    'H'        // 28a99        #7
+    'bG'       // 28a9a-28a9c  #6
+    '1hE'      // 28a9d-28abf
+    'G'        // 28ac0        #6
+    'dE'       // 28ac1-28ac5
+    'G'        // 28ac6        #6
+    'cE'       // 28ac7-28aca
+    'aG'       // 28acb-28acc  #6
+    'H'        // 28acd        #7
+    'G'        // 28ace        #6
+    'mE'       // 28acf-28adc
+    'H'        // 28add        #7
+    'eG'       // 28ade-28ae3  #6
+    'H'        // 28ae4        #7
+    'G'        // 28ae5        #6
+    'cE'       // 28ae6-28ae9
+    'G'        // 28aea        #6
+    'pE'       // 28aeb-28afb
+    'G'        // 28afc        #6
+    'nE'       // 28afd-28b0b
+    'G'        // 28b0c        #6
+    'eE'       // 28b0d-28b12
+    'G'        // 28b13        #6
+    'lE'       // 28b14-28b20
+    'aG'       // 28b21-28b22  #6
+    'gE'       // 28b23-28b2a
+    'bG'       // 28b2b-28b2d  #6
+    'E'        // 28b2e
+    'G'        // 28b2f        #6
+    'uE'       // 28b30-28b45
+    'G'        // 28b46        #6
+    'aE'       // 28b47-28b48
+    'D'        // 28b49        #3
+    'aE'       // 28b4a-28b4b
+    'G'        // 28b4c        #6
+    'E'        // 28b4d
+    'G'        // 28b4e        #6
+    'E'        // 28b4f
+    'G'        // 28b50        #6
+    'qE'       // 28b51-28b62
+    'cG'       // 28b63-28b66  #6
+    'dE'       // 28b67-28b6b
+    'G'        // 28b6c        #6
+    '1gE'      // 28b6d-28b8e
+    'G'        // 28b8f        #6
+    'hE'       // 28b90-28b98
+    'G'        // 28b99        #6
+    'aE'       // 28b9a-28b9b
+    'aG'       // 28b9c-28b9d  #6
+    'zE'       // 28b9e-28bb8
+    'G'        // 28bb9        #6
+    'fE'       // 28bba-28bc0
+    'H'        // 28bc1        #7
+    'G'        // 28bc2        #6
+    'aE'       // 28bc3-28bc4
+    'G'        // 28bc5        #6
+    'mE'       // 28bc6-28bd3
+    'G'        // 28bd4        #6
+    'aE'       // 28bd5-28bd6
+    'G'        // 28bd7        #6
+    'E'        // 28bd8
+    'aG'       // 28bd9-28bda  #6
+    'kE'       // 28bdb-28be6
+    'eG'       // 28be7-28bec  #6
+    'aE'       // 28bed-28bee
+    'H'        // 28bef        #7
+    'dE'       // 28bf0-28bf4
+    'G'        // 28bf5        #6
+    'hE'       // 28bf6-28bfe
+    'G'        // 28bff        #6
+    'bE'       // 28c00-28c02
+    'G'        // 28c03        #6
+    'dE'       // 28c04-28c08
+    'G'        // 28c09        #6
+    'qE'       // 28c0a-28c1b
+    'aG'       // 28c1c-28c1d  #6
+    'dE'       // 28c1e-28c22
+    'G'        // 28c23        #6
+    'aE'       // 28c24-28c25
+    'G'        // 28c26        #6
+    'cE'       // 28c27-28c2a
+    'G'        // 28c2b        #6
+    'cE'       // 28c2c-28c2f
+    'G'        // 28c30        #6
+    'gE'       // 28c31-28c38
+    'G'        // 28c39        #6
+    'E'        // 28c3a
+    'G'        // 28c3b        #6
+    'jE'       // 28c3c-28c46
+    'D'        // 28c47        #3
+    'fE'       // 28c48-28c4e
+    'D'        // 28c4f        #3
+    'E'        // 28c50
+    'D'        // 28c51        #3
+    'aE'       // 28c52-28c53
+    'D'        // 28c54        #3
+    '4lE'      // 28c55-28cc9
+    'G'        // 28cca        #6
+    'aE'       // 28ccb-28ccc
+    'G'        // 28ccd        #6
+    'cE'       // 28cce-28cd1
+    'G'        // 28cd2        #6
+    'iE'       // 28cd3-28cdc
+    'H'        // 28cdd        #7
+    '1wE'      // 28cde-28d0f
+    'H'        // 28d10        #7
+    '1hE'      // 28d11-28d33
+    'G'        // 28d34        #6
+    '2gE'      // 28d35-28d70
+    'H'        // 28d71        #7
+    'wE'       // 28d72-28d89
+    'R'        // 28d8a        #17
+    'mE'       // 28d8b-28d98
+    'G'        // 28d99        #6
+    'fE'       // 28d9a-28da0
+    'R'        // 28da1        #17
+    'vE'       // 28da2-28db8
+    'G'        // 28db9        #6
+    '2lE'      // 28dba-28dfa
+    'H'        // 28dfb        #7
+    'rE'       // 28dfc-28e0e
+    'A'        // 28e0f        #0
+    'fE'       // 28e10-28e16
+    'H'        // 28e17        #7
+    'fE'       // 28e18-28e1e
+    'H'        // 28e1f        #7
+    'uE'       // 28e20-28e35
+    'X'        // 28e36        #23
+    'aE'       // 28e37-28e38
+    'G'        // 28e39        #6
+    '1pE'      // 28e3a-28e64
+    'aG'       // 28e65-28e66  #6
+    '1gE'      // 28e67-28e88
+    'H'        // 28e89        #7
+    'lE'       // 28e8a-28e96
+    'G'        // 28e97        #6
+    'E'        // 28e98
+    'D'        // 28e99        #3
+    'qE'       // 28e9a-28eab
+    'G'        // 28eac        #6
+    'dE'       // 28ead-28eb1
+    'aG'       // 28eb2-28eb3  #6
+    '1jE'      // 28eb4-28ed8
+    'G'        // 28ed9        #6
+    'lE'       // 28eda-28ee6
+    'G'        // 28ee7        #6
+    'bE'       // 28ee8-28eea
+    'H'        // 28eeb        #7
+    'iE'       // 28eec-28ef5
+    'H'        // 28ef6        #7
+    '2fE'      // 28ef7-28f31
+    'H'        // 28f32        #7
+    '5oE'      // 28f33-28fc4
+    'G'        // 28fc5        #6
+    '1wE'      // 28fc6-28ff7
+    'H'        // 28ff8        #7
+    '4wE'      // 28ff9-29078
+    'G'        // 29079        #6
+    'mE'       // 2907a-29087
+    'G'        // 29088        #6
+    'aE'       // 29089-2908a
+    'G'        // 2908b        #6
+    'fE'       // 2908c-29092
+    'G'        // 29093        #6
+    'zE'       // 29094-290ae
+    'bG'       // 290af-290b1  #6
+    'mE'       // 290b2-290bf
+    'G'        // 290c0        #6
+    '1hE'      // 290c1-290e3
+    'aG'       // 290e4-290e5  #6
+    'eE'       // 290e6-290eb
+    'aG'       // 290ec-290ed  #6
+    '1dE'      // 290ee-2910c
+    'G'        // 2910d        #6
+    'aE'       // 2910e-2910f
+    'G'        // 29110        #6
+    '1pE'      // 29111-2913b
+    'G'        // 2913c        #6
+    'oE'       // 2913d-2914c
+    'G'        // 2914d        #6
+    'lE'       // 2914e-2915a
+    'G'        // 2915b        #6
+    'aE'       // 2915c-2915d
+    'G'        // 2915e        #6
+    'pE'       // 2915f-2916f
+    'G'        // 29170        #6
+    '1pE'      // 29171-2919b
+    'G'        // 2919c        #6
+    'jE'       // 2919d-291a7
+    'G'        // 291a8        #6
+    '1qE'      // 291a9-291d4
+    '2D'       // 291d5        #55
+    'lE'       // 291d6-291e2
+    'R'        // 291e3        #17
+    'fE'       // 291e4-291ea
+    'G'        // 291eb        #6
+    '6wE'      // 291ec-2929f
+    'H'        // 292a0        #7
+    'oE'       // 292a1-292b0
+    'H'        // 292b1        #7
+    '13xE'     // 292b2-2941c
+    'G'        // 2941d        #6
+    'aE'       // 2941e-2941f
+    'G'        // 29420        #6
+    'qE'       // 29421-29432
+    'G'        // 29433        #6
+    'jE'       // 29434-2943e
+    'G'        // 2943f        #6
+    'gE'       // 29440-29447
+    'G'        // 29448        #6
+    '2rE'      // 29449-2948f
+    'H'        // 29490        #7
+    '2jE'      // 29491-294cf
+    'G'        // 294d0        #6
+    'gE'       // 294d1-294d8
+    'aG'       // 294d9-294da  #6
+    'bE'       // 294db-294dd
+    'R'        // 294de        #17
+    'eE'       // 294df-294e4
+    'G'        // 294e5        #6
+    'E'        // 294e6
+    'G'        // 294e7        #6
+    '1fE'      // 294e8-29508
+    'R'        // 29509        #17
+    '5qE'      // 2950a-2959d
+    'G'        // 2959e        #6
+    'pE'       // 2959f-295af
+    'G'        // 295b0        #6
+    'fE'       // 295b1-295b7
+    'G'        // 295b8        #6
+    'uE'       // 295b9-295ce
+    'H'        // 295cf        #7
+    'fE'       // 295d0-295d6
+    'G'        // 295d7        #6
+    'pE'       // 295d8-295e8
+    'G'        // 295e9        #6
+    'iE'       // 295ea-295f3
+    'G'        // 295f4        #6
+    '5gE'      // 295f5-2967e
+    'A'        // 2967f        #0
+    '4gE'      // 29680-296ef
+    'H'        // 296f0        #7
+    '1mE'      // 296f1-29718
+    'H'        // 29719        #7
+    'eE'       // 2971a-2971f
+    'G'        // 29720        #6
+    'pE'       // 29721-29731
+    'G'        // 29732        #6
+    '1bE'      // 29733-2974f
+    'H'        // 29750        #7
+    '4zE'      // 29751-297d3
+    'G'        // 297d4        #6
+    '2fE'      // 297d5-2980f
+    'A'        // 29810        #0
+    '1oE'      // 29811-2983a
+    'R'        // 2983b        #17
+    'zE'       // 2983c-29856
+    'G'        // 29857        #6
+    '2wE'      // 29858-298a3
+    'G'        // 298a4        #6
+    '1fE'      // 298a5-298c5
+    'H'        // 298c6        #7
+    'iE'       // 298c7-298d0
+    'G'        // 298d1        #6
+    'wE'       // 298d2-298e9
+    'G'        // 298ea        #6
+    'eE'       // 298eb-298f0
+    'G'        // 298f1        #6
+    'gE'       // 298f2-298f9
+    'G'        // 298fa        #6
+    'gE'       // 298fb-29902
+    'G'        // 29903        #6
+    'E'        // 29904
+    'G'        // 29905        #6
+    '1nE'      // 29906-2992e
+    'G'        // 2992f        #6
+    'tE'       // 29930-29944
+    'G'        // 29945        #6
+    'E'        // 29946
+    'bG'       // 29947-29949  #6
+    'rE'       // 2994a-2995c
+    'G'        // 2995d        #6
+    'kE'       // 2995e-29969
+    'G'        // 2996a        #6
+    '1wE'      // 2996b-2999c
+    'G'        // 2999d        #6
+    '1jE'      // 2999e-299c2
+    'G'        // 299c3        #6
+    'dE'       // 299c4-299c8
+    'G'        // 299c9        #6
+    '3oE'      // 299ca-29a27
+    'G'        // 29a28        #6
+    '1iE'      // 29a29-29a4c
+    'G'        // 29a4d        #6
+    '1iE'      // 29a4e-29a71
+    'H'        // 29a72        #7
+    '5oE'      // 29a73-29b04
+    'G'        // 29b05        #6
+    'gE'       // 29b06-29b0d
+    'G'        // 29b0e        #6
+    '7oE'      // 29b0f-29bd4
+    'G'        // 29bd5        #6
+    '5zE'      // 29bd6-29c72
+    'G'        // 29c73        #6
+    '2dE'      // 29c74-29cac
+    'G'        // 29cad        #6
+    '5mE'      // 29cae-29d3d
+    'G'        // 29d3e        #6
+    'kE'       // 29d3f-29d4a
+    'H'        // 29d4b        #7
+    'mE'       // 29d4c-29d59
+    'G'        // 29d5a        #6
+    '1fE'      // 29d5b-29d7b
+    'G'        // 29d7c        #6
+    'zE'       // 29d7d-29d97
+    'G'        // 29d98        #6
+    'aE'       // 29d99-29d9a
+    'G'        // 29d9b        #6
+    '2jE'      // 29d9c-29dda
+    'H'        // 29ddb        #7
+    'yE'       // 29ddc-29df5
+    'G'        // 29df6        #6
+    'nE'       // 29df7-29e05
+    'G'        // 29e06        #6
+    'mE'       // 29e07-29e14
+    'H'        // 29e15        #7
+    'vE'       // 29e16-29e2c
+    'G'        // 29e2d        #6
+    'nE'       // 29e2e-29e3c
+    'H'        // 29e3d        #7
+    'jE'       // 29e3e-29e48
+    'H'        // 29e49        #7
+    '1cE'      // 29e4a-29e67
+    'G'        // 29e68        #6
+    '1fE'      // 29e69-29e89
+    'H'        // 29e8a        #7
+    '1fE'      // 29e8b-29eab
+    'G'        // 29eac        #6
+    'bE'       // 29ead-29eaf
+    'G'        // 29eb0        #6
+    'qE'       // 29eb1-29ec2
+    'G'        // 29ec3        #6
+    'H'        // 29ec4        #7
+    'uE'       // 29ec5-29eda
+    'H'        // 29edb        #7
+    'lE'       // 29edc-29ee8
+    'H'        // 29ee9        #7
+    'mE'       // 29eea-29ef7
+    'G'        // 29ef8        #6
+    '1oE'      // 29ef9-29f22
+    'G'        // 29f23        #6
+    'kE'       // 29f24-29f2f
+    'G'        // 29f30        #6
+    '2xE'      // 29f31-29f7d
+    'D'        // 29f7e        #3
+    'cE'       // 29f7f-29f82
+    'D'        // 29f83        #3
+    'gE'       // 29f84-29f8b
+    'D'        // 29f8c        #3
+    '1oE'      // 29f8d-29fb6
+    'G'        // 29fb7        #6
+    'uE'       // 29fb8-29fcd
+    'H'        // 29fce        #7
+    'gE'       // 29fcf-29fd6
+    'H'        // 29fd7        #7
+    'eE'       // 29fd8-29fdd
+    'G'        // 29fde        #6
+    '1zE'      // 29fdf-2a013
+    'G'        // 2a014        #6
+    'dE'       // 2a015-2a019
+    'H'        // 2a01a        #7
+    'sE'       // 2a01b-2a02e
+    'H'        // 2a02f        #7
+    '3cE'      // 2a030-2a081
+    'H'        // 2a082        #7
+    'cE'       // 2a083-2a086
+    'G'        // 2a087        #6
+    '1vE'      // 2a088-2a0b8
+    'G'        // 2a0b9        #6
+    '1lE'      // 2a0ba-2a0e0
+    'G'        // 2a0e1        #6
+    'jE'       // 2a0e2-2a0ec
+    'G'        // 2a0ed        #6
+    'dE'       // 2a0ee-2a0f2
+    'G'        // 2a0f3        #6
+    'cE'       // 2a0f4-2a0f7
+    'G'        // 2a0f8        #6
+    'H'        // 2a0f9        #7
+    'cE'       // 2a0fa-2a0fd
+    'G'        // 2a0fe        #6
+    'gE'       // 2a0ff-2a106
+    'G'        // 2a107        #6
+    'zE'       // 2a108-2a122
+    'G'        // 2a123        #6
+    'nE'       // 2a124-2a132
+    'aG'       // 2a133-2a134  #6
+    'zE'       // 2a135-2a14f
+    'G'        // 2a150        #6
+    '2jE'      // 2a151-2a18f
+    'H'        // 2a190        #7
+    'E'        // 2a191
+    'aG'       // 2a192-2a193  #6
+    'vE'       // 2a194-2a1aa
+    'G'        // 2a1ab        #6
+    'gE'       // 2a1ac-2a1b3
+    'aG'       // 2a1b4-2a1b5  #6
+    '1nE'      // 2a1b6-2a1de
+    'G'        // 2a1df        #6
+    'tE'       // 2a1e0-2a1f4
+    'G'        // 2a1f5        #6
+    '1oE'      // 2a1f6-2a21f
+    'G'        // 2a220        #6
+    'qE'       // 2a221-2a232
+    'G'        // 2a233        #6
+    '3pE'      // 2a234-2a292
+    'G'        // 2a293        #6
+    'jE'       // 2a294-2a29e
+    'G'        // 2a29f        #6
+    'lE'       // 2a2a0-2a2ac
+    'R'        // 2a2ad        #17
+    'cE'       // 2a2ae-2a2b1
+    'X'        // 2a2b2        #23
+    'E'        // 2a2b3
+    'G'        // 2a2b4        #6
+    'E'        // 2a2b5
+    'G'        // 2a2b6        #6
+    'bE'       // 2a2b7-2a2b9
+    'G'        // 2a2ba        #6
+    'aE'       // 2a2bb-2a2bc
+    'G'        // 2a2bd        #6
+    '1fE'      // 2a2be-2a2de
+    'G'        // 2a2df        #6
+    '1dE'      // 2a2e0-2a2fe
+    'G'        // 2a2ff        #6
+    '3bE'      // 2a300-2a350
+    'G'        // 2a351        #6
+    '2eE'      // 2a352-2a38b
+    'H'        // 2a38c        #7
+    '1aE'      // 2a38d-2a3a8
+    'G'        // 2a3a9        #6
+    '2nE'      // 2a3aa-2a3ec
+    'G'        // 2a3ed        #6
+    '2qE'      // 2a3ee-2a433
+    'G'        // 2a434        #6
+    'aE'       // 2a435-2a436
+    'H'        // 2a437        #7
+    '1hE'      // 2a438-2a45a
+    'G'        // 2a45b        #6
+    '4kE'      // 2a45c-2a4cf
+    'R'        // 2a4d0        #17
+    '9jE'      // 2a4d1-2a5c5
+    'G'        // 2a5c6        #6
+    'cE'       // 2a5c7-2a5ca
+    'G'        // 2a5cb        #6
+    '1jE'      // 2a5cc-2a5f0
+    'H'        // 2a5f1        #7
+    'nE'       // 2a5f2-2a600
+    'G'        // 2a601        #6
+    'H'        // 2a602        #7
+    'vE'       // 2a603-2a619
+    'H'        // 2a61a        #7
+    'vE'       // 2a61b-2a631
+    'G'        // 2a632        #6
+    'vE'       // 2a633-2a649
+    'G'        // 2a64a        #6
+    'oE'       // 2a64b-2a65a
+    'G'        // 2a65b        #6
+    'gE'       // 2a65c-2a663
+    'R'        // 2a664        #17
+    '2oE'      // 2a665-2a6a8
+    'G'        // 2a6a9        #6
+    'gE'       // 2a6aa-2a6b1
+    'H'        // 2a6b2        #7
+    '11kE'     // 2a6b3-2a7dc
+    'D'        // 2a7dd        #3
+    '10xE'     // 2a7de-2a8fa
+    'D'        // 2a8fb        #3
+    'zE'       // 2a8fc-2a916
+    'D'        // 2a917        #3
+    '7wE'      // 2a918-2a9e5
+    'H'        // 2a9e6        #7
+    '2tE'      // 2a9e7-2aa2f
+    'D'        // 2aa30        #3
+    'dE'       // 2aa31-2aa35
+    'D'        // 2aa36        #3
+    '1fE'      // 2aa37-2aa57
+    'D'        // 2aa58        #3
+    '35wE'     // 2aa59-2adfe
+    'G'        // 2adff        #6
+    '16aE'     // 2ae00-2afa1
+    'D'        // 2afa2        #3
+    '14wE'     // 2afa3-2b126
+    'aD'       // 2b127-2b128  #3
+    'mE'       // 2b129-2b136
+    'aD'       // 2b137-2b138  #3
+    '6wE'      // 2b139-2b1ec
+    'D'        // 2b1ed        #3
+    '10mE'     // 2b1ee-2b2ff
+    'D'        // 2b300        #3
+    '3sE'      // 2b301-2b362
+    'D'        // 2b363        #3
+    'jE'       // 2b364-2b36e
+    'D'        // 2b36f        #3
+    'aE'       // 2b370-2b371
+    'D'        // 2b372        #3
+    'iE'       // 2b373-2b37c
+    'D'        // 2b37d        #3
+    '5cE'      // 2b37e-2b403
+    'D'        // 2b404        #3
+    'jE'       // 2b405-2b40f
+    'D'        // 2b410        #3
+    'aE'       // 2b411-2b412
+    'D'        // 2b413        #3
+    '2xE'      // 2b414-2b460
+    'D'        // 2b461        #3
+    '5bE'      // 2b462-2b4e6
+    'D'        // 2b4e7        #3
+    'fE'       // 2b4e8-2b4ee
+    'D'        // 2b4ef        #3
+    'eE'       // 2b4f0-2b4f5
+    'D'        // 2b4f6        #3
+    'aE'       // 2b4f7-2b4f8
+    'D'        // 2b4f9        #3
+    'rE'       // 2b4fa-2b50c
+    'aD'       // 2b50d-2b50e  #3
+    '1lE'      // 2b50f-2b535
+    'D'        // 2b536        #3
+    '4nE'      // 2b537-2b5ad
+    'aD'       // 2b5ae-2b5af  #3
+    'bE'       // 2b5b0-2b5b2
+    'D'        // 2b5b3        #3
+    '1xE'      // 2b5b4-2b5e6
+    'D'        // 2b5e7        #3
+    'kE'       // 2b5e8-2b5f3
+    'D'        // 2b5f4        #3
+    '1lE'      // 2b5f5-2b61b
+    'aD'       // 2b61c-2b61d  #3
+    'gE'       // 2b61e-2b625
+    'bD'       // 2b626-2b628  #3
+    'E'        // 2b629
+    'D'        // 2b62a        #3
+    'E'        // 2b62b
+    'D'        // 2b62c        #3
+    '3yE'      // 2b62d-2b694
+    'aD'       // 2b695-2b696  #3
+    'uE'       // 2b697-2b6ac
+    'D'        // 2b6ad        #3
+    '2jE'      // 2b6ae-2b6ec
+    'D'        // 2b6ed        #3
+    '3iE'      // 2b6ee-2b745
+    'H'        // 2b746        #7
+    'iE'       // 2b747-2b750
+    'H'        // 2b751        #7
+    'E'        // 2b752
+    'H'        // 2b753        #7
+    'eE'       // 2b754-2b759
+    'H'        // 2b75a        #7
+    'E'        // 2b75b
+    'H'        // 2b75c        #7
+    'gE'       // 2b75d-2b764
+    'H'        // 2b765        #7
+    'oE'       // 2b766-2b775
+    'aH'       // 2b776-2b777  #7
+    'cE'       // 2b778-2b77b
+    'H'        // 2b77c        #7
+    'dE'       // 2b77d-2b781
+    'H'        // 2b782        #7
+    'eE'       // 2b783-2b788
+    'H'        // 2b789        #7
+    'E'        // 2b78a
+    'H'        // 2b78b        #7
+    'aE'       // 2b78c-2b78d
+    'H'        // 2b78e        #7
+    'dE'       // 2b78f-2b793
+    'H'        // 2b794        #7
+    'sE'       // 2b795-2b7a8
+    'D'        // 2b7a9        #3
+    'aE'       // 2b7aa-2b7ab
+    'H'        // 2b7ac        #7
+    'aE'       // 2b7ad-2b7ae
+    'H'        // 2b7af        #7
+    'lE'       // 2b7b0-2b7bc
+    'H'        // 2b7bd        #7
+    'fE'       // 2b7be-2b7c4
+    'D'        // 2b7c5        #3
+    'bE'       // 2b7c6-2b7c8
+    'H'        // 2b7c9        #7
+    'dE'       // 2b7ca-2b7ce
+    'H'        // 2b7cf        #7
+    'aE'       // 2b7d0-2b7d1
+    'H'        // 2b7d2        #7
+    'dE'       // 2b7d3-2b7d7
+    'H'        // 2b7d8        #7
+    'lE'       // 2b7d9-2b7e5
+    'D'        // 2b7e6        #3
+    'hE'       // 2b7e7-2b7ef
+    'H'        // 2b7f0        #7
+    'gE'       // 2b7f1-2b7f8
+    'D'        // 2b7f9        #3
+    'aE'       // 2b7fa-2b7fb
+    'D'        // 2b7fc        #3
+    'hE'       // 2b7fd-2b805
+    'D'        // 2b806        #3
+    'bE'       // 2b807-2b809
+    'D'        // 2b80a        #3
+    'aE'       // 2b80b-2b80c
+    'H'        // 2b80d        #7
+    'hE'       // 2b80e-2b816
+    'H'        // 2b817        #7
+    'aE'       // 2b818-2b819
+    'H'        // 2b81a        #7
+    'E'        // 2b81b
+    'D'        // 2b81c        #3
+    '5xE'      // 2b81d-2b8b7
+    'D'        // 2b8b8        #3
+    '20eE'     // 2b8b9-2bac6
+    'D'        // 2bac7        #3
+    '5tE'      // 2bac8-2bb5e
+    'D'        // 2bb5f        #3
+    'aE'       // 2bb60-2bb61
+    'D'        // 2bb62        #3
+    'xE'       // 2bb63-2bb7b
+    'D'        // 2bb7c        #3
+    'eE'       // 2bb7d-2bb82
+    'D'        // 2bb83        #3
+    '5tE'      // 2bb84-2bc1a
+    'D'        // 2bc1b        #3
+    '13hE'     // 2bc1c-2bd76
+    'D'        // 2bd77        #3
+    'nE'       // 2bd78-2bd86
+    'D'        // 2bd87        #3
+    '4fE'      // 2bd88-2bdf6
+    'D'        // 2bdf7        #3
+    '1vE'      // 2bdf8-2be28
+    'D'        // 2be29        #3
+    '19pE'     // 2be2a-2c028
+    'aD'       // 2c029-2c02a  #3
+    '4uE'      // 2c02b-2c0a8
+    'D'        // 2c0a9        #3
+    '1eE'      // 2c0aa-2c0c9
+    'D'        // 2c0ca        #3
+    '2uE'      // 2c0cb-2c114
+    'R'        // 2c115        #17
+    '7hE'      // 2c116-2c1d4
+    'D'        // 2c1d5        #3
+    'bE'       // 2c1d6-2c1d8
+    'D'        // 2c1d9        #3
+    '1dE'      // 2c1da-2c1f8
+    'D'        // 2c1f9        #3
+    '4yE'      // 2c1fa-2c27b
+    'D'        // 2c27c        #3
+    'jE'       // 2c27d-2c287
+    'D'        // 2c288        #3
+    'zE'       // 2c289-2c2a3
+    'D'        // 2c2a4        #3
+    '4iE'      // 2c2a5-2c316
+    'D'        // 2c317        #3
+    '2nE'      // 2c318-2c35a
+    'D'        // 2c35b        #3
+    'dE'       // 2c35c-2c360
+    'D'        // 2c361        #3
+    'aE'       // 2c362-2c363
+    'D'        // 2c364        #3
+    '11dE'     // 2c365-2c487
+    'D'        // 2c488        #3
+    'jE'       // 2c489-2c493
+    'D'        // 2c494        #3
+    'aE'       // 2c495-2c496
+    'D'        // 2c497        #3
+    '6mE'      // 2c498-2c541
+    'D'        // 2c542        #3
+    '7yE'      // 2c543-2c612
+    'D'        // 2c613        #3
+    'cE'       // 2c614-2c617
+    'D'        // 2c618        #3
+    'gE'       // 2c619-2c620
+    'D'        // 2c621        #3
+    'fE'       // 2c622-2c628
+    'D'        // 2c629        #3
+    'E'        // 2c62a
+    'bD'       // 2c62b-2c62d  #3
+    'E'        // 2c62e
+    'D'        // 2c62f        #3
+    'qE'       // 2c630-2c641
+    'D'        // 2c642        #3
+    'fE'       // 2c643-2c649
+    'aD'       // 2c64a-2c64b  #3
+    '8oE'      // 2c64c-2c72b
+    'D'        // 2c72c        #3
+    'aE'       // 2c72d-2c72e
+    'D'        // 2c72f        #3
+    '4fE'      // 2c730-2c79e
+    'D'        // 2c79f        #3
+    '1fE'      // 2c7a0-2c7c0
+    'D'        // 2c7c1        #3
+    'pE'       // 2c7c2-2c7d2
+    'R'        // 2c7d3        #17
+    '1nE'      // 2c7d4-2c7fc
+    'D'        // 2c7fd        #3
+    '8jE'      // 2c7fe-2c8d8
+    'D'        // 2c8d9        #3
+    'cE'       // 2c8da-2c8dd
+    'D'        // 2c8de        #3
+    'aE'       // 2c8df-2c8e0
+    'D'        // 2c8e1        #3
+    'pE'       // 2c8e2-2c8f2
+    'D'        // 2c8f3        #3
+    'rE'       // 2c8f4-2c906
+    'D'        // 2c907        #3
+    'aE'       // 2c908-2c909
+    'D'        // 2c90a        #3
+    'qE'       // 2c90b-2c91c
+    'D'        // 2c91d        #3
+    '8sE'      // 2c91e-2ca01
+    'D'        // 2ca02        #3
+    'jE'       // 2ca03-2ca0d
+    'D'        // 2ca0e        #3
+    '4eE'      // 2ca0f-2ca7c
+    'D'        // 2ca7d        #3
+    '1pE'      // 2ca7e-2caa8
+    'D'        // 2caa9        #3
+    '4vE'      // 2caaa-2cb28
+    'D'        // 2cb29        #3
+    'bE'       // 2cb2a-2cb2c
+    'aD'       // 2cb2d-2cb2e  #3
+    'aE'       // 2cb2f-2cb30
+    'D'        // 2cb31        #3
+    'eE'       // 2cb32-2cb37
+    'aD'       // 2cb38-2cb39  #3
+    'E'        // 2cb3a
+    'D'        // 2cb3b        #3
+    'bE'       // 2cb3c-2cb3e
+    'D'        // 2cb3f        #3
+    'E'        // 2cb40
+    'D'        // 2cb41        #3
+    'gE'       // 2cb42-2cb49
+    'D'        // 2cb4a        #3
+    'bE'       // 2cb4b-2cb4d
+    'D'        // 2cb4e        #3
+    'jE'       // 2cb4f-2cb59
+    'aD'       // 2cb5a-2cb5b  #3
+    'gE'       // 2cb5c-2cb63
+    'D'        // 2cb64        #3
+    'cE'       // 2cb65-2cb68
+    'D'        // 2cb69        #3
+    'aE'       // 2cb6a-2cb6b
+    'D'        // 2cb6c        #3
+    'aE'       // 2cb6d-2cb6e
+    'D'        // 2cb6f        #3
+    'bE'       // 2cb70-2cb72
+    'D'        // 2cb73        #3
+    'aE'       // 2cb74-2cb75
+    'D'        // 2cb76        #3
+    'E'        // 2cb77
+    'D'        // 2cb78        #3
+    'bE'       // 2cb79-2cb7b
+    'D'        // 2cb7c        #3
+    '1yE'      // 2cb7d-2cbb0
+    'D'        // 2cbb1        #3
+    'lE'       // 2cbb2-2cbbe
+    'aD'       // 2cbbf-2cbc0  #3
+    'lE'       // 2cbc1-2cbcd
+    'D'        // 2cbce        #3
+    '5dE'      // 2cbcf-2cc55
+    'D'        // 2cc56        #3
+    'gE'       // 2cc57-2cc5e
+    'D'        // 2cc5f        #3
+    '5rE'      // 2cc60-2ccf4
+    'aD'       // 2ccf5-2ccf6  #3
+    'eE'       // 2ccf7-2ccfc
+    'D'        // 2ccfd        #3
+    'E'        // 2ccfe
+    'D'        // 2ccff        #3
+    'aE'       // 2cd00-2cd01
+    'aD'       // 2cd02-2cd03  #3
+    'eE'       // 2cd04-2cd09
+    'D'        // 2cd0a        #3
+    '4wE'      // 2cd0b-2cd8a
+    'D'        // 2cd8b        #3
+    'E'        // 2cd8c
+    'D'        // 2cd8d        #3
+    'E'        // 2cd8e
+    'aD'       // 2cd8f-2cd90  #3
+    'mE'       // 2cd91-2cd9e
+    'aD'       // 2cd9f-2cda0  #3
+    'fE'       // 2cda1-2cda7
+    'D'        // 2cda8        #3
+    'cE'       // 2cda9-2cdac
+    'aD'       // 2cdad-2cdae  #3
+    '1kE'      // 2cdaf-2cdd4
+    'D'        // 2cdd5        #3
+    '2mE'      // 2cdd6-2ce17
+    'D'        // 2ce18        #3
+    'E'        // 2ce19
+    'D'        // 2ce1a        #3
+    'gE'       // 2ce1b-2ce22
+    'D'        // 2ce23        #3
+    'aE'       // 2ce24-2ce25
+    'D'        // 2ce26        #3
+    'bE'       // 2ce27-2ce29
+    'D'        // 2ce2a        #3
+    '3bE'      // 2ce2b-2ce7b
+    'D'        // 2ce7c        #3
+    'jE'       // 2ce7d-2ce87
+    'D'        // 2ce88        #3
+    'iE'       // 2ce89-2ce92
+    'D'        // 2ce93        #3
+    '65uE'     // 2ce94-2d543
+    'A'        // 2d544        #0
+    '129xE'    // 2d545-2e277
+    'H'        // 2e278        #7
+    '28wE'     // 2e279-2e568
+    'Q'        // 2e569        #16
+    '14sE'     // 2e56a-2e6e9
+    'H'        // 2e6ea        #7
+    '168hE'    // 2e6eb-2f803
+    'H'        // 2f804        #7
+    'iE'       // 2f805-2f80e
+    'H'        // 2f80f        #7
+    'dE'       // 2f810-2f814
+    'Q'        // 2f815        #16
+    'aE'       // 2f816-2f817
+    'Q'        // 2f818        #16
+    'E'        // 2f819
+    'Q'        // 2f81a        #16
+    'fE'       // 2f81b-2f821
+    'H'        // 2f822        #7
+    'aE'       // 2f823-2f824
+    'G'        // 2f825        #6
+    'aE'       // 2f826-2f827
+    'H'        // 2f828        #7
+    'bE'       // 2f829-2f82b
+    'Q'        // 2f82c        #16
+    'eE'       // 2f82d-2f832
+    'Q'        // 2f833        #16
+    'fE'       // 2f834-2f83a
+    'G'        // 2f83b        #6
+    'bE'       // 2f83c-2f83e
+    'H'        // 2f83f        #7
+    'G'        // 2f840        #6
+    'dE'       // 2f841-2f845
+    'H'        // 2f846        #7
+    'jE'       // 2f847-2f851
+    'Q'        // 2f852        #16
+    'nE'       // 2f853-2f861
+    'Q'        // 2f862        #16
+    'iE'       // 2f863-2f86c
+    'H'        // 2f86d        #7
+    'dE'       // 2f86e-2f872
+    'H'        // 2f873        #7
+    'bE'       // 2f874-2f876
+    'Q'        // 2f877        #16
+    'G'        // 2f878        #6
+    'jE'       // 2f879-2f883
+    'J'        // 2f884        #9
+    'nE'       // 2f885-2f893
+    'G'        // 2f894        #6
+    'cE'       // 2f895-2f898
+    'aH'       // 2f899-2f89a  #7
+    'jE'       // 2f89b-2f8a5
+    'X'        // 2f8a6        #23
+    'dE'       // 2f8a7-2f8ab
+    'H'        // 2f8ac        #7
+    'dE'       // 2f8ad-2f8b1
+    'Q'        // 2f8b2        #16
+    'bE'       // 2f8b3-2f8b5
+    'F'        // 2f8b6        #5
+    'uE'       // 2f8b7-2f8cc
+    'G'        // 2f8cd        #6
+    'dE'       // 2f8ce-2f8d2
+    'H'        // 2f8d3        #7
+    'fE'       // 2f8d4-2f8da
+    'X'        // 2f8db        #23
+    'H'        // 2f8dc        #7
+    'cE'       // 2f8dd-2f8e0
+    'H'        // 2f8e1        #7
+    'bE'       // 2f8e2-2f8e4
+    'H'        // 2f8e5        #7
+    'cE'       // 2f8e6-2f8e9
+    'H'        // 2f8ea        #7
+    'aE'       // 2f8eb-2f8ec
+    'Q'        // 2f8ed        #16
+    'mE'       // 2f8ee-2f8fb
+    'Q'        // 2f8fc        #16
+    'eE'       // 2f8fd-2f902
+    'H'        // 2f903        #7
+    'fE'       // 2f904-2f90a
+    'H'        // 2f90b        #7
+    'bE'       // 2f90c-2f90e
+    'H'        // 2f90f        #7
+    'iE'       // 2f910-2f919
+    'H'        // 2f91a        #7
+    'dE'       // 2f91b-2f91f
+    'Q'        // 2f920        #16
+    'H'        // 2f921        #7
+    '1hE'      // 2f922-2f944
+    'H'        // 2f945        #7
+    'E'        // 2f946
+    'H'        // 2f947        #7
+    '1iE'      // 2f948-2f96b
+    'Q'        // 2f96c        #16
+    '1lE'      // 2f96d-2f993
+    'G'        // 2f994        #6
+    'H'        // 2f995        #7
+    '1aE'      // 2f996-2f9b1
+    'G'        // 2f9b2        #6
+    'hE'       // 2f9b3-2f9bb
+    'G'        // 2f9bc        #6
+    'rE'       // 2f9bd-2f9cf
+    'Q'        // 2f9d0        #16
+    'bE'       // 2f9d1-2f9d3
+    'G'        // 2f9d4        #6
+    'hE'       // 2f9d5-2f9dd
+    'H'        // 2f9de        #7
+    'Q'        // 2f9df        #16
+    'sE'       // 2f9e0-2f9f3
+    'H'        // 2f9f4        #7
+    '129yE'    // 2f9f5-30728
+    'R'        // 30729        #17
+    '75tE'     // 3072a-30edc
+    '6G'       // 30edd        #162
+    '1X'       // 30ede        #49
+    '15fE'     // 30edf-3106b
+    'C'        // 3106c        #2
+    '27566vE'  // 3106d-e002f
+    'iP'       // e0030-e0039  #15
+    '1lE'      // e003a-e0060
+    'yP'       // e0061-e007a  #15
+    'cE'       // e007b-e007e
+    'P'        // e007f        #15
+    '4769jE'   // e0080-fe4e4
+    'iP'       // fe4e5-fe4ee  #15
+    '31vE'     // fe4ef-fe82b
+    'P'        // fe82c        #15
+    'E'        // fe82d
+    'iP'       // fe82e-fe837  #15
+    '2754sE'   // fe838-10ffff
+    ;
diff --git a/lib/web_ui/lib/src/engine/font_fallbacks.dart b/lib/web_ui/lib/src/engine/font_fallbacks.dart
new file mode 100644
index 0000000000000000000000000000000000000000..9773acb952e4332877efe9a19f0824b266168665
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/font_fallbacks.dart
@@ -0,0 +1,527 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:ui/src/engine.dart';
+
+abstract class FallbackFontRegistry {
+  List<int> getMissingCodePoints(List<int> codePoints, List<String> fontFamilies);
+  Future<void> loadFallbackFont(String familyName, String string);
+  void updateFallbackFontFamilies(List<String> families);
+}
+
+/// Global static font fallback data.
+class FontFallbackManager {
+  factory FontFallbackManager(FallbackFontRegistry registry) =>
+    FontFallbackManager._(
+      registry,
+      getFallbackFontList(configuration.useColorEmoji)
+    );
+
+  FontFallbackManager._(this.registry, this.fallbackFonts) :
+    _notoSansSC = fallbackFonts.singleWhere((NotoFont font) => font.name == 'Noto Sans SC'),
+    _notoSansTC = fallbackFonts.singleWhere((NotoFont font) => font.name == 'Noto Sans TC'),
+    _notoSansHK = fallbackFonts.singleWhere((NotoFont font) => font.name == 'Noto Sans HK'),
+    _notoSansJP = fallbackFonts.singleWhere((NotoFont font) => font.name == 'Noto Sans JP'),
+    _notoSansKR = fallbackFonts.singleWhere((NotoFont font) => font.name == 'Noto Sans KR'),
+    _notoSymbols = fallbackFonts.singleWhere((NotoFont font) => font.name == 'Noto Sans Symbols') {
+      downloadQueue = FallbackFontDownloadQueue(this);
+  }
+
+  final FallbackFontRegistry registry;
+
+  late final FallbackFontDownloadQueue downloadQueue;
+
+  /// Code points that no known font has a glyph for.
+  final Set<int> codePointsWithNoKnownFont = <int>{};
+
+  /// Code points which are known to be covered by at least one fallback font.
+  final Set<int> knownCoveredCodePoints = <int>{};
+
+  final List<NotoFont> fallbackFonts;
+
+  final NotoFont _notoSansSC;
+  final NotoFont _notoSansTC;
+  final NotoFont _notoSansHK;
+  final NotoFont _notoSansJP;
+  final NotoFont _notoSansKR;
+
+  final NotoFont _notoSymbols;
+
+  Future<void> _idleFuture = Future<void>.value();
+
+  final List<String> globalFontFallbacks = <String>['Roboto'];
+
+  /// A list of code points to check against the global fallback fonts.
+  final Set<int> _codePointsToCheckAgainstFallbackFonts = <int>{};
+
+  /// This is [true] if we have scheduled a check for missing code points.
+  ///
+  /// We only do this once a frame, since checking if a font supports certain
+  /// code points is very expensive.
+  bool _scheduledCodePointCheck = false;
+
+  Future<void> debugWhenIdle() {
+    Future<void>? result;
+    assert(() {
+      result = _idleFuture;
+      return true;
+    }());
+
+    if (result != null) {
+      return result!;
+    }
+
+    throw UnimplementedError();
+  }
+
+  /// Determines if the given [text] contains any code points which are not
+  /// supported by the current set of fonts.
+  void ensureFontsSupportText(String text, List<String> fontFamilies) {
+    // TODO(hterkelsen): Make this faster for the common case where the text
+    // is supported by the given fonts.
+    if (debugDisableFontFallbacks) {
+      return;
+    }
+
+    // We have a cache of code points which are known to be covered by at least
+    // one of our fallback fonts, and a cache of code points which are known not
+    // to be covered by any fallback font. From the given text, construct a set
+    // of code points which need to be checked.
+    final Set<int> runesToCheck = <int>{};
+    for (final int rune in text.runes) {
+      // Filter out code points that don't need checking.
+      if (!(rune < 160 || // ASCII and Unicode control points.
+          knownCoveredCodePoints.contains(rune) || // Points we've already covered
+          codePointsWithNoKnownFont.contains(rune)) // Points that don't have a fallback font
+      ) {
+        runesToCheck.add(rune);
+      }
+    }
+    if (runesToCheck.isEmpty) {
+      return;
+    }
+
+    final List<int> codePoints = runesToCheck.toList();
+    final List<int> missingCodePoints =
+      registry.getMissingCodePoints(codePoints, fontFamilies);
+
+    if (missingCodePoints.isNotEmpty) {
+      addMissingCodePoints(codePoints);
+    }
+  }
+
+  void addMissingCodePoints(List<int> codePoints) {
+    _codePointsToCheckAgainstFallbackFonts.addAll(codePoints);
+    if (!_scheduledCodePointCheck) {
+      _scheduledCodePointCheck = true;
+      _idleFuture = Future<void>.delayed(Duration.zero, () async {
+        _ensureFallbackFonts();
+        _scheduledCodePointCheck = false;
+        await downloadQueue.waitForIdle();
+      });
+    }
+  }
+
+  /// Checks the missing code points against the current set of fallback fonts
+  /// and starts downloading new fallback fonts if the current set can't cover
+  /// the code points.
+  void _ensureFallbackFonts() {
+    _scheduledCodePointCheck = false;
+    // We don't know if the remaining code points are covered by our fallback
+    // fonts. Check them and update the cache.
+    if (_codePointsToCheckAgainstFallbackFonts.isEmpty) {
+      return;
+    }
+    final List<int> codePoints = _codePointsToCheckAgainstFallbackFonts.toList();
+    _codePointsToCheckAgainstFallbackFonts.clear();
+    findFontsForMissingCodePoints(codePoints);
+  }
+
+  void registerFallbackFont(String family) {
+    // Insert emoji font before all other fallback fonts so we use the emoji
+    // whenever it's available.
+    if (family == 'Noto Color Emoji' || family == 'Noto Emoji') {
+      if (globalFontFallbacks.first == 'Roboto') {
+        globalFontFallbacks.insert(1, family);
+      } else {
+        globalFontFallbacks.insert(0, family);
+      }
+    } else {
+      globalFontFallbacks.add(family);
+    }
+  }
+
+  /// Finds the minimum set of fonts which covers all of the [codePoints].
+  ///
+  /// Since set cover is NP-complete, we approximate using a greedy algorithm
+  /// which finds the font which covers the most code points. If multiple CJK
+  /// fonts match the same number of code points, we choose one based on the
+  /// user's locale.
+  ///
+  /// If a code point is not covered by any font, it is added to
+  /// [codePointsWithNoKnownFont] so it can be omitted next time to avoid
+  /// searching for fonts unnecessarily.
+  void findFontsForMissingCodePoints(List<int> codePoints) {
+    final List<int> missingCodePoints = <int>[];
+
+    final List<FallbackFontComponent> requiredComponents =
+        <FallbackFontComponent>[];
+    final List<NotoFont> candidateFonts = <NotoFont>[];
+
+    // Collect the components that cover the code points.
+    for (final int codePoint in codePoints) {
+      final FallbackFontComponent component =
+          codePointToComponents.lookup(codePoint);
+      if (component.fonts.isEmpty) {
+        missingCodePoints.add(codePoint);
+      } else {
+        // A zero cover count means we have not yet seen this component.
+        if (component.coverCount == 0) {
+          requiredComponents.add(component);
+        }
+        component.coverCount++;
+      }
+    }
+
+    // Aggregate the component cover counts to the fonts that use the component.
+    for (final FallbackFontComponent component in requiredComponents) {
+      for (final NotoFont font in component.fonts) {
+        // A zero cover cover count means we have not yet seen this font.
+        if (font.coverCount == 0) {
+          candidateFonts.add(font);
+        }
+        font.coverCount += component.coverCount;
+        font.coverComponents.add(component);
+      }
+    }
+
+    final List<NotoFont> selectedFonts = <NotoFont>[];
+
+    while (candidateFonts.isNotEmpty) {
+      final NotoFont selectedFont = _selectFont(candidateFonts);
+      selectedFonts.add(selectedFont);
+
+      // All the code points in the selected font are now covered. Zero out each
+      // component that is used by the font and adjust the counts of other fonts
+      // that use the same components.
+      for (final FallbackFontComponent component in <FallbackFontComponent>[
+        ...selectedFont.coverComponents
+      ]) {
+        for (final NotoFont font in component.fonts) {
+          font.coverCount -= component.coverCount;
+          font.coverComponents.remove(component);
+        }
+        component.coverCount = 0;
+      }
+      assert(selectedFont.coverCount == 0);
+      assert(selectedFont.coverComponents.isEmpty);
+      // The selected font will have a zero cover count, but other fonts may
+      // too. Remove these from further consideration.
+      candidateFonts.removeWhere((NotoFont font) => font.coverCount == 0);
+    }
+
+    selectedFonts.forEach(downloadQueue.add);
+
+    // Report code points not covered by any fallback font and ensure we don't
+    // process those code points again.
+    if (missingCodePoints.isNotEmpty) {
+      if (!downloadQueue.isPending) {
+        printWarning(
+            'Could not find a set of Noto fonts to display all missing '
+            'characters. Please add a font asset for the missing characters.'
+            ' See: https://flutter.dev/docs/cookbook/design/fonts');
+        codePointsWithNoKnownFont.addAll(missingCodePoints);
+      }
+    }
+  }
+
+  NotoFont _selectFont(List<NotoFont> fonts) {
+    int maxCodePointsCovered = -1;
+    final List<NotoFont> bestFonts = <NotoFont>[];
+    NotoFont? bestFont;
+
+    for (final NotoFont font in fonts) {
+      if (font.coverCount > maxCodePointsCovered) {
+        bestFonts.clear();
+        bestFonts.add(font);
+        bestFont = font;
+        maxCodePointsCovered = font.coverCount;
+      } else if (font.coverCount == maxCodePointsCovered) {
+        bestFonts.add(font);
+        // Tie-break with the lowest index which corresponds to a font name
+        // being earlier in the list of fonts in the font fallback data
+        // generator.
+        if (font.index < bestFont!.index) {
+          bestFont = font;
+        }
+      }
+    }
+
+    // If the list of best fonts are all CJK fonts, choose the best one based
+    // on locale. Otherwise just choose the first font.
+    if (bestFonts.length > 1) {
+      if (bestFonts.every((NotoFont font) =>
+          font == _notoSansSC ||
+          font == _notoSansTC ||
+          font == _notoSansHK ||
+          font == _notoSansJP ||
+          font == _notoSansKR)) {
+        final String language = domWindow.navigator.language;
+
+        if (language == 'zh-Hans' ||
+            language == 'zh-CN' ||
+            language == 'zh-SG' ||
+            language == 'zh-MY') {
+          if (bestFonts.contains(_notoSansSC)) {
+            bestFont = _notoSansSC;
+          }
+        } else if (language == 'zh-Hant' ||
+            language == 'zh-TW' ||
+            language == 'zh-MO') {
+          if (bestFonts.contains(_notoSansTC)) {
+            bestFont = _notoSansTC;
+          }
+        } else if (language == 'zh-HK') {
+          if (bestFonts.contains(_notoSansHK)) {
+            bestFont = _notoSansHK;
+          }
+        } else if (language == 'ja') {
+          if (bestFonts.contains(_notoSansJP)) {
+            bestFont = _notoSansJP;
+          }
+        } else if (language == 'ko') {
+          if (bestFonts.contains(_notoSansKR)) {
+            bestFont = _notoSansKR;
+          }
+        } else if (bestFonts.contains(_notoSansSC)) {
+          bestFont = _notoSansSC;
+        }
+      } else {
+        // To be predictable, if there is a tie for best font, choose a font
+        // from this list first, then just choose the first font.
+        if (bestFonts.contains(_notoSymbols)) {
+          bestFont = _notoSymbols;
+        } else if (bestFonts.contains(_notoSansSC)) {
+          bestFont = _notoSansSC;
+        }
+      }
+    }
+    return bestFont!;
+  }
+
+  late final List<FallbackFontComponent> fontComponents =
+      _decodeFontComponents(encodedFontSets);
+
+  late final _UnicodePropertyLookup<FallbackFontComponent> codePointToComponents =
+      _UnicodePropertyLookup<FallbackFontComponent>.fromPackedData(
+          encodedFontSetRanges, fontComponents);
+
+  List<FallbackFontComponent> _decodeFontComponents(String data) {
+    return <FallbackFontComponent>[
+      for (final String componentData in data.split(','))
+        FallbackFontComponent(_decodeFontSet(componentData))
+    ];
+  }
+
+  List<NotoFont> _decodeFontSet(String data) {
+    final List<NotoFont> result = <NotoFont>[];
+    int previousIndex = -1;
+    int prefix = 0;
+    for (int i = 0; i < data.length; i++) {
+      final int code = data.codeUnitAt(i);
+
+      if (kFontIndexDigit0 <= code &&
+          code < kFontIndexDigit0 + kFontIndexRadix) {
+        final int delta = prefix * kFontIndexRadix + (code - kFontIndexDigit0);
+        final int index = previousIndex + delta + 1;
+        result.add(fallbackFonts[index]);
+        previousIndex = index;
+        prefix = 0;
+      } else if (kPrefixDigit0 <= code && code < kPrefixDigit0 + kPrefixRadix) {
+        prefix = prefix * kPrefixRadix + (code - kPrefixDigit0);
+      } else {
+        throw StateError('Unreachable');
+      }
+    }
+    return result;
+  }
+}
+
+/// A lookup structure from code point to a property type [P].
+class _UnicodePropertyLookup<P> {
+  _UnicodePropertyLookup._(this._boundaries, this._values);
+
+  factory _UnicodePropertyLookup.fromPackedData(
+    String packedData,
+    List<P> propertyEnumValues,
+  ) {
+    final List<int> boundaries = <int>[];
+    final List<P> values = <P>[];
+
+    int start = 0;
+    int prefix = 0;
+    int size = 1;
+
+    for (int i = 0; i < packedData.length; i++) {
+      final int code = packedData.codeUnitAt(i);
+      if (kRangeValueDigit0 <= code &&
+          code < kRangeValueDigit0 + kRangeValueRadix) {
+        final int index =
+            prefix * kRangeValueRadix + (code - kRangeValueDigit0);
+        final P value = propertyEnumValues[index];
+        start += size;
+        boundaries.add(start);
+        values.add(value);
+        prefix = 0;
+        size = 1;
+      } else if (kRangeSizeDigit0 <= code &&
+          code < kRangeSizeDigit0 + kRangeSizeRadix) {
+        size = prefix * kRangeSizeRadix + (code - kRangeSizeDigit0) + 2;
+        prefix = 0;
+      } else if (kPrefixDigit0 <= code && code < kPrefixDigit0 + kPrefixRadix) {
+        prefix = prefix * kPrefixRadix + (code - kPrefixDigit0);
+      } else {
+        throw StateError('Unreachable');
+      }
+    }
+    if (start != kMaxCodePoint + 1) {
+      throw StateError('Bad map size: $start');
+    }
+
+    return _UnicodePropertyLookup<P>._(boundaries, values);
+  }
+
+  /// There are two parallel lists - one of boundaries between adjacent unicode
+  /// ranges and second of the values for the ranges.
+  ///
+  /// `_boundaries[i]` is the open-interval end of the `i`th range and the start
+  /// of the `i+1`th range. The implicit start of the 0th range is zero.
+  ///
+  /// `_values[i]` is the value for the range [`_boundaries[i-1]`, `_boundaries[i]`).
+  /// Default values are stored as explicit ranges.
+  ///
+  /// Example: the unicode range properies `[10-50]=>A`, `[100]=>B`, with
+  /// default value `X` would be represented as:
+  ///
+  ///     boundaries:  [10, 51, 100, 101, 1114112]
+  ///     values:      [ X,  A,   X,   B,       X]
+  ///
+  final List<int> _boundaries;
+  final List<P> _values;
+
+  int get length => _boundaries.length;
+
+  P lookup(int value) {
+    assert(0 <= value && value <= kMaxCodePoint);
+    assert(_boundaries.last == kMaxCodePoint + 1);
+    int start = 0, end = _boundaries.length;
+    while (true) {
+      if (start == end) {
+        return _values[start];
+      }
+      final int mid = start + (end - start) ~/ 2;
+      if (value >= _boundaries[mid]) {
+        start = mid + 1;
+      } else {
+        end = mid;
+      }
+    }
+  }
+
+  /// Iterate over the ranges, calling [action] with the start and end
+  /// (inclusive) code points and value.
+  void forEachRange(void Function(int start, int end, P value) action) {
+    int start = 0;
+    for (int i = 0; i < _boundaries.length; i++) {
+      final int end = _boundaries[i];
+      final P value = _values[i];
+      action(start, end - 1, value);
+      start = end;
+    }
+  }
+}
+
+class FallbackFontDownloadQueue {
+  FallbackFontDownloadQueue(this.fallbackManager);
+
+  final FontFallbackManager fallbackManager;
+
+  String get fallbackFontUrlPrefix => configuration.fontFallbackBaseUrl;
+
+  final Set<NotoFont> downloadedFonts = <NotoFont>{};
+  final Map<String, NotoFont> pendingFonts = <String, NotoFont>{};
+
+  bool get isPending => pendingFonts.isNotEmpty;
+
+  void Function(String family)? debugOnLoadFontFamily;
+
+  Completer<void>? _idleCompleter;
+
+  Future<void> waitForIdle() {
+    if (_idleCompleter == null) {
+      // We're already idle
+      return Future<void>.value();
+    } else {
+      return _idleCompleter!.future;
+    }
+  }
+
+  void add(NotoFont font) {
+    if (downloadedFonts.contains(font) || pendingFonts.containsKey(font.url)) {
+      return;
+    }
+    final bool firstInBatch = pendingFonts.isEmpty;
+    pendingFonts[font.url] = font;
+    _idleCompleter ??= Completer<void>();
+    if (firstInBatch) {
+      Timer.run(startDownloads);
+    }
+  }
+
+  Future<void> startDownloads() async {
+    final Map<String, Future<void>> downloads = <String, Future<void>>{};
+    final List<String> downloadedFontFamilies = <String>[];
+    for (final NotoFont font in pendingFonts.values) {
+      downloads[font.url] = Future<void>(() async {
+        try {
+          final String url = '$fallbackFontUrlPrefix${font.url}';
+          debugOnLoadFontFamily?.call(font.name);
+          await fallbackManager.registry.loadFallbackFont(font.name, url);
+          downloadedFontFamilies.add(font.url);
+        } catch (e) {
+          pendingFonts.remove(font.url);
+          printWarning('Failed to load font ${font.name} at '
+              '$fallbackFontUrlPrefix${font.url}');
+          printWarning(e.toString());
+          return;
+        }
+        downloadedFonts.add(font);
+      });
+    }
+
+    await Future.wait<void>(downloads.values);
+
+    // Register fallback fonts in a predictable order. Otherwise, the fonts
+    // change their precedence depending on the download order causing
+    // visual differences between app reloads.
+    downloadedFontFamilies.sort();
+    for (final String url in downloadedFontFamilies) {
+      final NotoFont font = pendingFonts.remove(url)!;
+      fallbackManager.registerFallbackFont(font.name);
+    }
+
+    if (pendingFonts.isEmpty) {
+      fallbackManager.registry
+          .updateFallbackFontFamilies(fallbackManager.globalFontFallbacks);
+      sendFontChangeMessage();
+      final Completer<void> idleCompleter = _idleCompleter!;
+      _idleCompleter = null;
+      idleCompleter.complete();
+    } else {
+      await startDownloads();
+    }
+  }
+}
diff --git a/lib/web_ui/lib/src/engine/fonts.dart b/lib/web_ui/lib/src/engine/fonts.dart
index f124e88f94a4778d09e5d504ebd492ea9e0ffde1..3d51de4fb33a60ed276463f36e7f509c2cf9be91 100644
--- a/lib/web_ui/lib/src/engine/fonts.dart
+++ b/lib/web_ui/lib/src/engine/fonts.dart
@@ -3,32 +3,136 @@
 // found in the LICENSE file.
 
 import 'dart:async';
+import 'dart:convert';
+import 'dart:js_interop';
 import 'dart:typed_data';
 
-import 'assets.dart';
-
-abstract class FontCollection {
-
-  /// Fonts loaded with [loadFontFromList] do not need to be registered
-  /// with [registerDownloadedFonts]. Fonts are both downloaded and registered
-  /// with [loadFontFromList] calls.
-  Future<void> loadFontFromList(Uint8List list, {String? fontFamily});
-
-  /// Completes when fonts from FontManifest.json have been downloaded.
-  Future<void> downloadAssetFonts(AssetManager assetManager);
-
-  /// Registers both downloaded fonts and fallback fonts with the TypefaceFontProvider.
-  ///
-  /// Downloading of fonts happens separately from registering of fonts so that
-  /// the download step can happen concurrently with the initalization of the renderer.
-  ///
-  /// The correct order of calls to register downloaded fonts:
-  /// 1) [downloadAssetFonts]
-  /// 2) [registerDownloadedFonts]
-  ///
-  /// For fallbackFonts, call registerFallbackFont (see font_fallbacks.dart)
-  /// for each fallback font before calling [registerDownloadedFonts]
-  void registerDownloadedFonts();
-  FutureOr<void> debugDownloadTestFonts();
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
+
+class FontAsset {
+  FontAsset(this.asset, this.descriptors);
+
+  final String asset;
+  final Map<String, String> descriptors;
+}
+
+class FontFamily {
+  FontFamily(this.name, this.fontAssets);
+
+  final String name;
+  final List<FontAsset> fontAssets;
+}
+
+class FontManifest {
+  FontManifest(this.families);
+
+  final List<FontFamily> families;
+}
+
+Future<FontManifest> fetchFontManifest(ui_web.AssetManager assetManager) async {
+  final HttpFetchResponse response = await assetManager.loadAsset('FontManifest.json') as HttpFetchResponse;
+  if (!response.hasPayload) {
+    printWarning('Font manifest does not exist at `${response.url}` - ignoring.');
+    return FontManifest(<FontFamily>[]);
+  }
+
+  final Converter<List<int>, Object?> decoder = const Utf8Decoder().fuse(const JsonDecoder());
+  Object? fontManifestJson;
+  final Sink<List<int>> inputSink = decoder.startChunkedConversion(
+    ChunkedConversionSink<Object?>.withCallback(
+      (List<Object?> accumulated) {
+        if (accumulated.length != 1) {
+          throw AssertionError('There was a problem trying to load FontManifest.json');
+        }
+        fontManifestJson = accumulated.first;
+      }
+  ));
+  await response.read((JSUint8Array chunk) => inputSink.add(chunk.toDart));
+  inputSink.close();
+  if (fontManifestJson == null) {
+    throw AssertionError('There was a problem trying to load FontManifest.json');
+  }
+  final List<FontFamily> families = (fontManifestJson! as List<dynamic>).map(
+    (dynamic fontFamilyJson) {
+      final Map<String, dynamic> fontFamily = fontFamilyJson as Map<String, dynamic>;
+      final String familyName = fontFamily.readString('family');
+      final List<dynamic> fontAssets = fontFamily.readList('fonts');
+      return FontFamily(familyName, fontAssets.map((dynamic fontAssetJson) {
+        String? asset;
+        final Map<String, String> descriptors = <String, String>{};
+        for (final MapEntry<String, dynamic> descriptor in (fontAssetJson as Map<String, dynamic>).entries) {
+          if (descriptor.key == 'asset') {
+            asset = descriptor.value as String;
+          } else {
+            // Sometimes these descriptors are strings, and sometimes numbers, so we stringify them here.
+            descriptors[descriptor.key] = '${descriptor.value}';
+          }
+        }
+        if (asset == null) {
+          throw AssertionError("Invalid Font manifest, missing 'asset' key on font.");
+        }
+        return FontAsset(asset, descriptors);
+      }).toList());
+    }).toList();
+  return FontManifest(families);
+}
+
+abstract class FontLoadError extends Error {
+  FontLoadError(this.url);
+
+  String url;
+  String get message;
+}
+
+class FontNotFoundError extends FontLoadError {
+  FontNotFoundError(super.url);
+
+  @override
+  String get message => 'Font asset not found at url $url.';
+}
+
+class FontDownloadError extends FontLoadError {
+  FontDownloadError(super.url, this.error);
+
+  dynamic error;
+
+  @override
+  String get message => 'Failed to download font asset at url $url with error: $error.';
+}
+
+class FontInvalidDataError extends FontLoadError {
+  FontInvalidDataError(super.url);
+
+  @override
+  String get message => 'Invalid data for font asset at url $url.';
+}
+
+class AssetFontsResult {
+  AssetFontsResult(this.loadedFonts, this.fontFailures);
+
+  /// A list of asset keys for fonts that were successfully loaded.
+  final List<String> loadedFonts;
+
+  /// A map of the asset keys to failures for fonts that failed to load.
+  final Map<String, FontLoadError> fontFailures;
+}
+
+abstract class FlutterFontCollection {
+  /// Loads a font directly from font data.
+  Future<bool> loadFontFromList(Uint8List list, {String? fontFamily});
+
+  /// Completes when fonts from FontManifest.json have been loaded.
+  Future<AssetFontsResult> loadAssetFonts(FontManifest manifest);
+
+  // The font fallback manager for this font collection. HTML renderer doesn't
+  // have a font fallback manager and just relies on the browser to fall back
+  // properly.
+  FontFallbackManager? get fontFallbackManager;
+
+  // Reset the state of font fallbacks. Only to be used in testing.
+  void debugResetFallbackFonts();
+
+  // Unregisters all fonts.
   void clear();
 }
diff --git a/lib/web_ui/lib/src/engine/frame_timing_recorder.dart b/lib/web_ui/lib/src/engine/frame_timing_recorder.dart
new file mode 100644
index 0000000000000000000000000000000000000000..ec2944bb41327f2c1f4817982795d6e1f3df3d4e
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/frame_timing_recorder.dart
@@ -0,0 +1,100 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui;
+
+class FrameTimingRecorder {
+  final int _vsyncStartMicros = _currentFrameVsyncStart;
+  final int _buildStartMicros = _currentFrameBuildStart;
+
+  int? _buildFinishMicros;
+  int? _rasterStartMicros;
+  int? _rasterFinishMicros;
+
+  /// Collects frame timings from frames.
+  ///
+  /// This list is periodically reported to the framework (see [_kFrameTimingsSubmitInterval]).
+  static List<ui.FrameTiming> _frameTimings = <ui.FrameTiming>[];
+
+  /// These two metrics are collected early in the process, before the respective
+  /// scene builders are created. These are instead treated as global state, which
+  /// are used to initialize any recorders that are created by the scene builders.
+  static int _currentFrameVsyncStart = 0;
+  static int _currentFrameBuildStart = 0;
+
+  static void recordCurrentFrameVsync() {
+    if (frameTimingsEnabled) {
+      _currentFrameVsyncStart = _nowMicros();
+    }
+  }
+
+  static void recordCurrentFrameBuildStart() {
+    if (frameTimingsEnabled) {
+      _currentFrameBuildStart = _nowMicros();
+    }
+  }
+
+  /// The last time (in microseconds) we submitted frame timings.
+  static int _frameTimingsLastSubmitTime = _nowMicros();
+  /// The amount of time in microseconds we wait between submitting
+  /// frame timings.
+  static const int _kFrameTimingsSubmitInterval = 100000; // 100 milliseconds
+
+  /// Whether we are collecting [ui.FrameTiming]s.
+  static bool get frameTimingsEnabled {
+    return EnginePlatformDispatcher.instance.onReportTimings != null;
+  }
+
+  /// Current timestamp in microseconds taken from the high-precision
+  /// monotonically increasing timer.
+  ///
+  /// See also:
+  ///
+  /// * https://developer.mozilla.org/en-US/docs/Web/API/Performance/now,
+  ///   particularly notes about Firefox rounding to 1ms for security reasons,
+  ///   which can be bypassed in tests by setting certain browser options.
+  static int _nowMicros() {
+    return (domWindow.performance.now() * 1000).toInt();
+  }
+
+  void recordBuildFinish([int? buildFinish]) {
+    assert(_buildFinishMicros == null, "can't record build finish more than once");
+    _buildFinishMicros = buildFinish ?? _nowMicros();
+  }
+
+  void recordRasterStart([int? rasterStart]) {
+    assert(_rasterStartMicros == null, "can't record raster start more than once");
+    _rasterStartMicros = rasterStart ?? _nowMicros();
+  }
+
+  void recordRasterFinish([int? rasterFinish]) {
+    assert(_rasterFinishMicros == null, "can't record raster finish more than once");
+    _rasterFinishMicros = rasterFinish ?? _nowMicros();
+  }
+
+  void submitTimings() {
+    assert(
+      _buildFinishMicros != null &&
+      _rasterStartMicros != null &&
+      _rasterFinishMicros != null,
+      'Attempted to submit an incomplete timings.'
+    );
+    final ui.FrameTiming timing = ui.FrameTiming(
+      vsyncStart: _vsyncStartMicros,
+      buildStart: _buildStartMicros,
+      buildFinish: _buildFinishMicros!,
+      rasterStart: _rasterStartMicros!,
+      rasterFinish: _rasterFinishMicros!,
+      rasterFinishWallTime: _rasterFinishMicros!,
+    );
+    _frameTimings.add(timing);
+    final int now = _nowMicros();
+    if (now - _frameTimingsLastSubmitTime > _kFrameTimingsSubmitInterval) {
+      _frameTimingsLastSubmitTime = now;
+      EnginePlatformDispatcher.instance.invokeOnReportTimings(_frameTimings);
+      _frameTimings = <ui.FrameTiming>[];
+    }
+  }
+}
diff --git a/lib/web_ui/lib/src/engine/host_node.dart b/lib/web_ui/lib/src/engine/host_node.dart
deleted file mode 100644
index 59a91e697fabf6769fa6dff6985bf5d8816c94af..0000000000000000000000000000000000000000
--- a/lib/web_ui/lib/src/engine/host_node.dart
+++ /dev/null
@@ -1,189 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'browser_detection.dart';
-import 'dom.dart';
-import 'embedder.dart';
-import 'text_editing/text_editing.dart';
-
-/// The interface required to host a flutter app in the DOM, and its tests.
-///
-/// Consider this as the intersection in functionality between [DomShadowRoot]
-/// (preferred Flutter rendering method) and [DomDocument] (fallback).
-///
-/// Not to be confused with [DomDocumentOrShadowRoot].
-abstract class HostNode {
-  /// Retrieves the [DomElement] that currently has focus.
-  ///
-  /// See:
-  /// * [Document.activeElement](https://developer.mozilla.org/en-US/docs/Web/API/Document/activeElement)
-  DomElement? get activeElement;
-
-  /// Adds a node to the end of the child [nodes] list of this node.
-  ///
-  /// If the node already exists in this document, it will be removed from its
-  /// current parent node, then added to this node.
-  ///
-  /// This method is more efficient than `nodes.add`, and is the preferred
-  /// way of appending a child node.
-  ///
-  /// See:
-  /// * [Node.appendChild](https://developer.mozilla.org/en-US/docs/Web/API/Node/appendChild)
-  DomNode append(DomNode node);
-
-  /// Appends all of an [Iterable<DomNode>] to this [HostNode].
-  void appendAll(Iterable<DomNode> nodes);
-
-  /// Returns true if this node contains the specified node.
-  /// See:
-  /// * [Node.contains](https://developer.mozilla.org/en-US/docs/Web/API/Node.contains)
-  bool contains(DomNode? other);
-
-  /// Returns the currently wrapped [DomNode].
-  DomNode get node;
-
-  /// Finds the first descendant element of this document that matches the
-  /// specified group of selectors.
-  ///
-  /// [selectors] should be a string using CSS selector syntax.
-  ///
-  /// ```dart
-  /// var element1 = document.querySelector('.className');
-  /// var element2 = document.querySelector('#id');
-  /// ```
-  ///
-  /// For details about CSS selector syntax, see the
-  /// [CSS selector specification](http://www.w3.org/TR/css3-selectors/).
-  ///
-  /// See:
-  /// * [Document.querySelector](https://developer.mozilla.org/en-US/docs/Web/API/Document/querySelector)
-  DomElement? querySelector(String selectors);
-
-  /// Finds all descendant elements of this document that match the specified
-  /// group of selectors.
-  ///
-  /// [selectors] should be a string using CSS selector syntax.
-  ///
-  /// ```dart
-  /// var items = document.querySelectorAll('.itemClassName');
-  /// ```
-  ///
-  /// For details about CSS selector syntax, see the
-  /// [CSS selector specification](http://www.w3.org/TR/css3-selectors/).
-  ///
-  /// See:
-  /// * [Document.querySelectorAll](https://developer.mozilla.org/en-US/docs/Web/API/Document/querySelectorAll)
-  Iterable<DomElement> querySelectorAll(String selectors);
-}
-
-/// A [HostNode] implementation, backed by a [DomShadowRoot].
-///
-/// This is the preferred flutter implementation, but it might not be supported
-/// by all browsers yet.
-///
-/// The constructor might throw when calling `attachShadow`, if ShadowDOM is not
-/// supported in the current environment. In this case, a fallback [ElementHostNode]
-/// should be created instead.
-class ShadowDomHostNode implements HostNode {
-  /// Build a HostNode by attaching a [DomShadowRoot] to the `root` element.
-  ///
-  /// This also calls [applyGlobalCssRulesToSheet], defined in dom_renderer.
-  ShadowDomHostNode(DomElement root) :
-    assert(
-    root.isConnected ?? true,
-    'The `root` of a ShadowDomHostNode must be connected to the Document object or a ShadowRoot.',
-    ) {
-    _shadow = root.attachShadow(<String, dynamic>{
-      'mode': 'open',
-      // This needs to stay false to prevent issues like this:
-      // - https://github.com/flutter/flutter/issues/85759
-      'delegatesFocus': false,
-    });
-
-    final DomHTMLStyleElement shadowRootStyleElement = createDomHTMLStyleElement();
-    // The shadowRootStyleElement must be appended to the DOM, or its `sheet` will be null later.
-    _shadow.appendChild(shadowRootStyleElement);
-
-    // TODO(dit): Apply only rules for the shadow root
-    applyGlobalCssRulesToSheet(
-      shadowRootStyleElement.sheet! as DomCSSStyleSheet,
-      browserEngine: browserEngine,
-      hasAutofillOverlay: browserHasAutofillOverlay(),
-    );
-  }
-
-  late DomShadowRoot _shadow;
-
-  @override
-  DomElement? get activeElement => _shadow.activeElement;
-
-  @override
-  DomElement? querySelector(String selectors) {
-    return _shadow.querySelector(selectors);
-  }
-
-  @override
-  Iterable<DomElement> querySelectorAll(String selectors) {
-    return _shadow.querySelectorAll(selectors);
-  }
-
-  @override
-  DomNode append(DomNode node) {
-    return _shadow.appendChild(node);
-  }
-
-  @override
-  bool contains(DomNode? other) {
-    return _shadow.contains(other);
-  }
-
-  @override
-  DomNode get node => _shadow;
-
-  @override
-  void appendAll(Iterable<DomNode> nodes) => nodes.forEach(append);
-}
-
-/// A [HostNode] implementation, backed by a [DomElement].
-///
-/// This is a fallback implementation, in case [ShadowDomHostNode] fails when
-/// being constructed.
-class ElementHostNode implements HostNode {
-  /// Build a HostNode by attaching a child [DomElement] to the `root` element.
-  ElementHostNode(DomElement root) {
-    _element = domDocument.createElement('flt-element-host-node');
-    root.appendChild(_element);
-  }
-
-  late DomElement _element;
-
-  @override
-  DomElement? get activeElement => _element.ownerDocument?.activeElement;
-
-  @override
-  DomElement? querySelector(String selectors) {
-    return _element.querySelector(selectors);
-  }
-
-  @override
-  Iterable<DomElement> querySelectorAll(String selectors) {
-    return _element.querySelectorAll(selectors);
-  }
-
-  @override
-  DomNode append(DomNode node) {
-    return _element.appendChild(node);
-  }
-
-  @override
-  bool contains(DomNode? other) {
-    return _element.contains(other);
-  }
-
-  @override
-  DomNode get node => _element;
-
-  @override
-  void appendAll(Iterable<DomNode> nodes) => nodes.forEach(append);
-}
diff --git a/lib/web_ui/lib/src/engine/html/backdrop_filter.dart b/lib/web_ui/lib/src/engine/html/backdrop_filter.dart
index e2ab21e19731c5cda64ec87bbb5c5f7fb9d19f91..8c2e2b669e6b1d7510d7644eade01235fadded60 100644
--- a/lib/web_ui/lib/src/engine/html/backdrop_filter.dart
+++ b/lib/web_ui/lib/src/engine/html/backdrop_filter.dart
@@ -7,9 +7,9 @@ import 'package:ui/ui.dart' as ui;
 import '../browser_detection.dart';
 import '../color_filter.dart';
 import '../dom.dart';
-import '../embedder.dart';
 import '../util.dart';
 import '../vector_math.dart';
+import 'resource_manager.dart';
 import 'shaders/shader.dart';
 import 'surface.dart';
 import 'surface_stats.dart';
@@ -66,7 +66,7 @@ class PersistedBackdropFilter extends PersistedContainerSurface
     // Do not detach the child container from the root. It is permanently
     // attached. The elements are reused together and are detached from the DOM
     // together.
-    flutterViewEmbedder.removeResource(_svgFilter);
+    ResourceManager.instance.removeResource(_svgFilter);
     _svgFilter = null;
     _childContainer = null;
     _filterElement = null;
@@ -80,7 +80,7 @@ class PersistedBackdropFilter extends PersistedContainerSurface
     } else {
       backendFilter = filter as EngineImageFilter;
     }
-    flutterViewEmbedder.removeResource(_svgFilter);
+    ResourceManager.instance.removeResource(_svgFilter);
     _svgFilter = null;
     if (_previousTransform != transform) {
       _invertedTransform = Matrix4.inverted(transform!);
@@ -95,7 +95,7 @@ class PersistedBackdropFilter extends PersistedContainerSurface
     // Therefore we need to use parent clip element bounds for
     // backdrop boundary.
     final double dpr = ui.window.devicePixelRatio;
-    final ui.Rect rect = transformRect(_invertedTransform, ui.Rect.fromLTRB(0, 0,
+    final ui.Rect rect = _invertedTransform.transformRect(ui.Rect.fromLTRB(0, 0,
         ui.window.physicalSize.width * dpr,
         ui.window.physicalSize.height * dpr));
     double left = rect.left;
diff --git a/lib/web_ui/lib/src/engine/html/bitmap_canvas.dart b/lib/web_ui/lib/src/engine/html/bitmap_canvas.dart
index 5468b0bb066ea30394f6807802aae5d7494544c7..66cdc1aad284815c0e760dd83ea4c86337ec7bc4 100644
--- a/lib/web_ui/lib/src/engine/html/bitmap_canvas.dart
+++ b/lib/web_ui/lib/src/engine/html/bitmap_canvas.dart
@@ -9,15 +9,14 @@ import 'package:ui/ui.dart' as ui;
 
 import '../browser_detection.dart';
 import '../canvas_pool.dart';
+import '../display.dart';
 import '../dom.dart';
 import '../engine_canvas.dart';
 import '../frame_reference.dart';
 import '../html_image_codec.dart';
-import '../platform_dispatcher.dart';
 import '../text/canvas_paragraph.dart';
 import '../util.dart';
 import '../vector_math.dart';
-import '../window.dart';
 import 'clip.dart';
 import 'color_filter.dart';
 import 'dom_canvas.dart';
@@ -38,8 +37,7 @@ class BitmapCanvas extends EngineCanvas {
   /// initialize this canvas.
   BitmapCanvas(this._bounds, RenderStrategy renderStrategy,
       {double density = 1.0})
-      : assert(_bounds != null),
-        _density = density,
+      : _density = density,
         _renderStrategy = renderStrategy,
         widthInBitmapPixels = widthToPhysical(_bounds.width),
         heightInBitmapPixels = heightToPhysical(_bounds.height),
@@ -69,7 +67,6 @@ class BitmapCanvas extends EngineCanvas {
   /// Painting outside these bounds will result in cropping.
   ui.Rect get bounds => _bounds;
   set bounds(ui.Rect newValue) {
-    assert(newValue != null);
     _bounds = newValue;
     final int newCanvasPositionX = _bounds.left.floor() - kPaddingPixels;
     final int newCanvasPositionY = _bounds.top.floor() - kPaddingPixels;
@@ -128,7 +125,7 @@ class BitmapCanvas extends EngineCanvas {
   /// Keeps track of what device pixel ratio was used when this [BitmapCanvas]
   /// was created.
   final double _devicePixelRatio =
-      EnginePlatformDispatcher.browserDevicePixelRatio;
+      EngineFlutterDisplay.instance.browserDevicePixelRatio;
 
   // Compensation for [_initializeViewport] snapping canvas position to 1 pixel.
   int? _canvasPositionX, _canvasPositionY;
@@ -203,21 +200,20 @@ class BitmapCanvas extends EngineCanvas {
 
   static int widthToPhysical(double width) {
     final double boundsWidth = width + 1;
-    return (boundsWidth * EnginePlatformDispatcher.browserDevicePixelRatio)
+    return (boundsWidth * EngineFlutterDisplay.instance.browserDevicePixelRatio)
             .ceil() +
         2 * kPaddingPixels;
   }
 
   static int heightToPhysical(double height) {
     final double boundsHeight = height + 1;
-    return (boundsHeight * EnginePlatformDispatcher.browserDevicePixelRatio)
+    return (boundsHeight * EngineFlutterDisplay.instance.browserDevicePixelRatio)
             .ceil() +
         2 * kPaddingPixels;
   }
 
   // Used by picture to assess if canvas is large enough to reuse as is.
   bool doesFitBounds(ui.Rect newBounds, double newDensity) {
-    assert(newBounds != null);
     return widthInBitmapPixels >= widthToPhysical(newBounds.width) &&
         heightInBitmapPixels >= heightToPhysical(newBounds.height) &&
         _density == newDensity;
@@ -256,8 +252,7 @@ class BitmapCanvas extends EngineCanvas {
   /// * [PersistedPicture._recycleCanvas] which also uses this method
   ///   for the same reason.
   bool isReusable() {
-    return _devicePixelRatio ==
-        EnginePlatformDispatcher.browserDevicePixelRatio;
+    return _devicePixelRatio == EngineFlutterDisplay.instance.browserDevicePixelRatio;
   }
 
   /// Returns a "data://" URI containing a representation of the image in this
@@ -538,20 +533,6 @@ class BitmapCanvas extends EngineCanvas {
     if (_useDomForRenderingFill(paint)) {
       final Matrix4 transform = _canvasPool.currentTransform;
       final SurfacePath surfacePath = path as SurfacePath;
-      final ui.Rect? pathAsLine = surfacePath.toStraightLine();
-      if (pathAsLine != null) {
-        ui.Rect rect = (pathAsLine.top == pathAsLine.bottom)
-            ? ui.Rect.fromLTWH(
-                pathAsLine.left, pathAsLine.top, pathAsLine.width, 1)
-            : ui.Rect.fromLTWH(
-                pathAsLine.left, pathAsLine.top, 1, pathAsLine.height);
-
-        rect = adjustRectForDom(rect, paint);
-        final DomHTMLElement element = buildDrawRectElement(
-            rect, paint, 'draw-rect', _canvasPool.currentTransform);
-        _drawElement(element, rect.topLeft, paint);
-        return;
-      }
 
       final ui.Rect? pathAsRect = surfacePath.toRect();
       if (pathAsRect != null) {
@@ -563,9 +544,7 @@ class BitmapCanvas extends EngineCanvas {
         drawRRect(pathAsRRect, paint);
         return;
       }
-      final ui.Rect pathBounds = surfacePath.getBounds();
-      final DomElement svgElm = pathToSvgElement(
-          surfacePath, paint, '${pathBounds.right}', '${pathBounds.bottom}');
+      final DomElement svgElm = pathToSvgElement(surfacePath, paint);
       if (!_canvasPool.isClipped) {
         final DomCSSStyleDeclaration style = svgElm.style;
         style.position = 'absolute';
@@ -591,7 +570,7 @@ class BitmapCanvas extends EngineCanvas {
   void _applyFilter(DomElement element, SurfacePaintData paint) {
     if (paint.maskFilter != null) {
       final bool isStroke = paint.style == ui.PaintingStyle.stroke;
-      final String cssColor = colorValueToCssString(paint.color)!;
+      final String cssColor = colorValueToCssString(paint.color);
       final double sigma = paint.maskFilter!.webOnlySigma;
       if (browserEngine == BrowserEngine.webkit && !isStroke) {
         // A bug in webkit leaves artifacts when this element is animated
@@ -823,26 +802,23 @@ class BitmapCanvas extends EngineCanvas {
       case ui.BlendMode.clear:
       case ui.BlendMode.dstOut:
         style.position = 'absolute';
-        break;
       case ui.BlendMode.src:
       case ui.BlendMode.srcOver:
         style
           ..position = 'absolute'
-          ..backgroundColor = colorToCssString(filterColor)!;
-        break;
+          ..backgroundColor = filterColor!.toCssString();
       case ui.BlendMode.dst:
       case ui.BlendMode.dstIn:
         style
           ..position = 'absolute'
           ..backgroundImage = "url('${image.imgElement.src}')";
-        break;
       default:
         style
           ..position = 'absolute'
           ..backgroundImage = "url('${image.imgElement.src}')"
           ..backgroundBlendMode =
               blendModeToCssMixBlendMode(colorFilterBlendMode) ?? ''
-          ..backgroundColor = colorToCssString(filterColor)!;
+          ..backgroundColor = filterColor!.toCssString();
         break;
     }
     return imgElement;
@@ -861,7 +837,7 @@ class BitmapCanvas extends EngineCanvas {
     final DomHTMLElement imgElement = _reuseOrCreateImage(image);
     imgElement.style.filter = 'url(#${svgFilter.id})';
     if (colorFilterBlendMode == ui.BlendMode.saturation) {
-      imgElement.style.backgroundColor = colorToCssString(filterColor)!;
+      imgElement.style.backgroundColor = filterColor!.toCssString();
     }
     return imgElement;
   }
@@ -922,7 +898,7 @@ class BitmapCanvas extends EngineCanvas {
     if (shadows != null) {
       ctx.save();
       for (final ui.Shadow shadow in shadows) {
-        ctx.shadowColor = colorToCssString(shadow.color);
+        ctx.shadowColor = shadow.color.toCssString();
         ctx.shadowBlur = shadow.blurRadius;
         ctx.shadowOffsetX = shadow.offset.dx;
         ctx.shadowOffsetY = shadow.offset.dy;
@@ -1031,7 +1007,7 @@ class BitmapCanvas extends EngineCanvas {
       final ui.Color color = ui.Color(paint.color);
       _canvasPool.contextHandle
         ..fillStyle = null
-        ..strokeStyle = colorToCssString(color);
+        ..strokeStyle = color.toCssString();
       glRenderer!.drawHairline(ctx, positions);
       restore();
       return;
@@ -1059,7 +1035,7 @@ class BitmapCanvas extends EngineCanvas {
     _drawPointsPaint.color = paint.color;
     _drawPointsPaint.maskFilter = paint.maskFilter;
 
-    final double dpr = ui.window.devicePixelRatio;
+    final double dpr = EngineFlutterDisplay.instance.devicePixelRatio;
     // Use hairline (device pixel when strokeWidth is not specified).
     final double strokeWidth =
         paint.strokeWidth == null ? 1.0 / dpr : paint.strokeWidth!;
@@ -1100,14 +1076,14 @@ class BitmapCanvas extends EngineCanvas {
   /// viewport.
   ui.Rect _computeScreenBounds(Matrix4 targetTransform) {
     final Matrix4 inverted = targetTransform.clone()..invert();
-    final double dpr = ui.window.devicePixelRatio;
+    final double dpr = EngineFlutterDisplay.instance.devicePixelRatio;
     final double width = ui.window.physicalSize.width * dpr;
     final double height = ui.window.physicalSize.height * dpr;
-    final Vector3 topLeft = inverted.perspectiveTransform(Vector3(0, 0, 0));
-    final Vector3 topRight = inverted.perspectiveTransform(Vector3(width, 0, 0));
+    final Vector3 topLeft = inverted.perspectiveTransform(x: 0, y: 0, z: 0);
+    final Vector3 topRight = inverted.perspectiveTransform(x: width, y: 0, z: 0);
     final Vector3 bottomRight =
-        inverted.perspectiveTransform(Vector3(width, height, 0));
-    final Vector3 bottomLeft = inverted.perspectiveTransform(Vector3(0, height, 0));
+        inverted.perspectiveTransform(x: width, y: height, z: 0);
+    final Vector3 bottomLeft = inverted.perspectiveTransform(x: 0, y: height, z: 0);
     return ui.Rect.fromLTRB(
       math.min(topLeft.x,
           math.min(topRight.x, math.min(bottomRight.x, bottomLeft.x))),
@@ -1350,7 +1326,6 @@ String? stringForStrokeCap(ui.StrokeCap? strokeCap) {
 }
 
 String stringForStrokeJoin(ui.StrokeJoin strokeJoin) {
-  assert(strokeJoin != null);
   switch (strokeJoin) {
     case ui.StrokeJoin.round:
       return 'round';
@@ -1481,7 +1456,7 @@ String maskFilterToCanvasFilter(ui.MaskFilter? maskFilter) {
   if (maskFilter != null) {
     // Multiply by device-pixel ratio because the canvas' pixel width and height
     // are larger than its CSS width and height by device-pixel ratio.
-    return 'blur(${maskFilter.webOnlySigma * window.devicePixelRatio}px)';
+    return 'blur(${maskFilter.webOnlySigma * EngineFlutterDisplay.instance.devicePixelRatio}px)';
   } else {
     return 'none';
   }
diff --git a/lib/web_ui/lib/src/engine/html/canvas.dart b/lib/web_ui/lib/src/engine/html/canvas.dart
index b40df52a28ffad76ea2fcd97de8e5d5f4cf02bdd..c086a832e4f66fd79d997a7c433d5bbef9eae05c 100644
--- a/lib/web_ui/lib/src/engine/html/canvas.dart
+++ b/lib/web_ui/lib/src/engine/html/canvas.dart
@@ -36,7 +36,6 @@ class SurfaceCanvas implements ui.Canvas {
 
   @override
   void saveLayer(ui.Rect? bounds, ui.Paint paint) {
-    assert(paint != null);
     if (bounds == null) {
       _saveLayerWithoutBounds(paint);
     } else {
@@ -90,7 +89,6 @@ class SurfaceCanvas implements ui.Canvas {
 
   @override
   void transform(Float64List matrix4) {
-    assert(matrix4 != null);
     if (matrix4.length != 16) {
       throw ArgumentError('"matrix4" must have 16 entries.');
     }
@@ -110,8 +108,6 @@ class SurfaceCanvas implements ui.Canvas {
   void clipRect(ui.Rect rect,
       {ui.ClipOp clipOp = ui.ClipOp.intersect, bool doAntiAlias = true}) {
     assert(rectIsValid(rect));
-    assert(clipOp != null);
-    assert(doAntiAlias != null);
     _clipRect(rect, clipOp, doAntiAlias);
   }
 
@@ -122,7 +118,6 @@ class SurfaceCanvas implements ui.Canvas {
   @override
   void clipRRect(ui.RRect rrect, {bool doAntiAlias = true}) {
     assert(rrectIsValid(rrect));
-    assert(doAntiAlias != null);
     _clipRRect(rrect, doAntiAlias);
   }
 
@@ -132,8 +127,6 @@ class SurfaceCanvas implements ui.Canvas {
 
   @override
   void clipPath(ui.Path path, {bool doAntiAlias = true}) {
-    assert(path != null); // path is checked on the engine side
-    assert(doAntiAlias != null);
     _clipPath(path, doAntiAlias);
   }
 
@@ -166,13 +159,11 @@ class SurfaceCanvas implements ui.Canvas {
       // non-invertible transforms collapse space to a line or point
       return ui.Rect.zero;
     }
-    return transformRect(transform, _roundOut(destBounds));
+    return transform.transformRect(_roundOut(destBounds));
   }
 
   @override
   void drawColor(ui.Color color, ui.BlendMode blendMode) {
-    assert(color != null);
-    assert(blendMode != null);
     _drawColor(color, blendMode);
   }
 
@@ -184,7 +175,6 @@ class SurfaceCanvas implements ui.Canvas {
   void drawLine(ui.Offset p1, ui.Offset p2, ui.Paint paint) {
     assert(offsetIsValid(p1));
     assert(offsetIsValid(p2));
-    assert(paint != null);
     _drawLine(p1, p2, paint);
   }
 
@@ -194,7 +184,6 @@ class SurfaceCanvas implements ui.Canvas {
 
   @override
   void drawPaint(ui.Paint paint) {
-    assert(paint != null);
     _drawPaint(paint);
   }
 
@@ -205,7 +194,6 @@ class SurfaceCanvas implements ui.Canvas {
   @override
   void drawRect(ui.Rect rect, ui.Paint paint) {
     assert(rectIsValid(rect));
-    assert(paint != null);
     _drawRect(rect, paint);
   }
 
@@ -216,7 +204,6 @@ class SurfaceCanvas implements ui.Canvas {
   @override
   void drawRRect(ui.RRect rrect, ui.Paint paint) {
     assert(rrectIsValid(rrect));
-    assert(paint != null);
     _drawRRect(rrect, paint);
   }
 
@@ -228,7 +215,6 @@ class SurfaceCanvas implements ui.Canvas {
   void drawDRRect(ui.RRect outer, ui.RRect inner, ui.Paint paint) {
     assert(rrectIsValid(outer));
     assert(rrectIsValid(inner));
-    assert(paint != null);
     _drawDRRect(outer, inner, paint);
   }
 
@@ -239,7 +225,6 @@ class SurfaceCanvas implements ui.Canvas {
   @override
   void drawOval(ui.Rect rect, ui.Paint paint) {
     assert(rectIsValid(rect));
-    assert(paint != null);
     _drawOval(rect, paint);
   }
 
@@ -250,7 +235,6 @@ class SurfaceCanvas implements ui.Canvas {
   @override
   void drawCircle(ui.Offset c, double radius, ui.Paint paint) {
     assert(offsetIsValid(c));
-    assert(paint != null);
     _drawCircle(c, radius, paint);
   }
 
@@ -262,7 +246,6 @@ class SurfaceCanvas implements ui.Canvas {
   void drawArc(ui.Rect rect, double startAngle, double sweepAngle,
       bool useCenter, ui.Paint paint) {
     assert(rectIsValid(rect));
-    assert(paint != null);
     const double pi = math.pi;
     const double pi2 = 2.0 * pi;
 
@@ -297,8 +280,6 @@ class SurfaceCanvas implements ui.Canvas {
 
   @override
   void drawPath(ui.Path path, ui.Paint paint) {
-    assert(path != null); // path is checked on the engine side
-    assert(paint != null);
     _drawPath(path, paint);
   }
 
@@ -308,9 +289,7 @@ class SurfaceCanvas implements ui.Canvas {
 
   @override
   void drawImage(ui.Image image, ui.Offset offset, ui.Paint paint) {
-    assert(image != null); // image is checked on the engine side
     assert(offsetIsValid(offset));
-    assert(paint != null);
     _drawImage(image, offset, paint);
   }
 
@@ -320,10 +299,8 @@ class SurfaceCanvas implements ui.Canvas {
 
   @override
   void drawImageRect(ui.Image image, ui.Rect src, ui.Rect dst, ui.Paint paint) {
-    assert(image != null); // image is checked on the engine side
     assert(rectIsValid(src));
     assert(rectIsValid(dst));
-    assert(paint != null);
     _drawImageRect(image, src, dst, paint);
   }
 
@@ -376,10 +353,8 @@ class SurfaceCanvas implements ui.Canvas {
   @override
   void drawImageNine(
       ui.Image image, ui.Rect center, ui.Rect dst, ui.Paint paint) {
-    assert(image != null); // image is checked on the engine side
     assert(rectIsValid(center));
     assert(rectIsValid(dst));
-    assert(paint != null);
 
     if (dst.isEmpty) {
       return;
@@ -424,13 +399,11 @@ class SurfaceCanvas implements ui.Canvas {
 
   @override
   void drawPicture(ui.Picture picture) {
-    assert(picture != null); // picture is checked on the engine side
     _canvas.drawPicture(picture);
   }
 
   @override
   void drawParagraph(ui.Paragraph paragraph, ui.Offset offset) {
-    assert(paragraph != null);
     assert(offsetIsValid(offset));
     _drawParagraph(paragraph, offset);
   }
@@ -442,9 +415,6 @@ class SurfaceCanvas implements ui.Canvas {
   @override
   void drawPoints(
       ui.PointMode pointMode, List<ui.Offset> points, ui.Paint paint) {
-    assert(pointMode != null);
-    assert(points != null);
-    assert(paint != null);
     final Float32List pointList = offsetListToFloat32List(points);
     drawRawPoints(pointMode, pointList, paint);
   }
@@ -452,9 +422,6 @@ class SurfaceCanvas implements ui.Canvas {
   @override
   void drawRawPoints(
       ui.PointMode pointMode, Float32List points, ui.Paint paint) {
-    assert(pointMode != null);
-    assert(points != null);
-    assert(paint != null);
     if (points.length % 2 != 0) {
       throw ArgumentError('"points" must have an even number of values.');
     }
@@ -464,9 +431,6 @@ class SurfaceCanvas implements ui.Canvas {
   @override
   void drawVertices(
       ui.Vertices vertices, ui.BlendMode blendMode, ui.Paint paint) {
-    //assert(vertices != null); // vertices is checked on the engine side
-    assert(paint != null);
-    assert(blendMode != null);
     _canvas.drawVertices(
         vertices as SurfaceVertices, blendMode, paint as SurfacePaint);
   }
@@ -481,11 +445,7 @@ class SurfaceCanvas implements ui.Canvas {
     ui.Rect? cullRect,
     ui.Paint paint,
   ) {
-    assert(atlas != null); // atlas is checked on the engine side
-    assert(transforms != null);
-    assert(rects != null);
     assert(colors == null || colors.isEmpty || blendMode != null);
-    assert(paint != null);
 
     final int rectCount = rects.length;
     if (transforms.length != rectCount) {
@@ -510,11 +470,7 @@ class SurfaceCanvas implements ui.Canvas {
     ui.Rect? cullRect,
     ui.Paint paint,
   ) {
-    assert(atlas != null); // atlas is checked on the engine side
-    assert(rstTransforms != null);
-    assert(rects != null);
     assert(colors == null || blendMode != null);
-    assert(paint != null);
 
     final int rectCount = rects.length;
     if (rstTransforms.length != rectCount) {
@@ -540,9 +496,6 @@ class SurfaceCanvas implements ui.Canvas {
     double elevation,
     bool transparentOccluder,
   ) {
-    assert(path != null); // path is checked on the engine side
-    assert(color != null);
-    assert(transparentOccluder != null);
     _canvas.drawShadow(path, color, elevation, transparentOccluder);
   }
 }
diff --git a/lib/web_ui/lib/src/engine/html/clip.dart b/lib/web_ui/lib/src/engine/html/clip.dart
index 892bc88403825039c32e812e8654a4e8da577fc1..d713a48f86d896caf21f4ed7ac8878294449ed86 100644
--- a/lib/web_ui/lib/src/engine/html/clip.dart
+++ b/lib/web_ui/lib/src/engine/html/clip.dart
@@ -5,12 +5,8 @@
 import 'package:ui/ui.dart' as ui;
 
 import '../dom.dart';
-import '../shadow.dart';
 import '../svg.dart';
 import '../util.dart';
-import 'dom_canvas.dart';
-import 'painting.dart';
-import 'path/path.dart';
 import 'path_to_svg_clip.dart';
 import 'surface.dart';
 import 'surface_stats.dart';
@@ -190,266 +186,6 @@ class PersistedClipRRect extends PersistedContainerSurface
   bool get isClipping => true;
 }
 
-class PersistedPhysicalShape extends PersistedContainerSurface
-    with _DomClip
-    implements ui.PhysicalShapeEngineLayer {
-  PersistedPhysicalShape(PersistedPhysicalShape? super.oldLayer, this.path,
-      this.elevation, int color, int shadowColor, this.clipBehavior)
-      : color = ui.Color(color),
-        shadowColor = ui.Color(shadowColor),
-        pathBounds = path.getBounds();
-
-  final SurfacePath path;
-  final ui.Rect pathBounds;
-  final double elevation;
-  final ui.Color color;
-  final ui.Color shadowColor;
-  final ui.Clip clipBehavior;
-  DomElement? _clipElement;
-  DomElement? _svgElement;
-
-  @override
-  void recomputeTransformAndClip() {
-    transform = parent!.transform;
-
-    if (clipBehavior != ui.Clip.none) {
-      final ui.RRect? roundRect = path.toRoundedRect();
-      if (roundRect != null) {
-        localClipBounds = roundRect.outerRect;
-      } else {
-        final ui.Rect? rect = path.toRect();
-        if (rect != null) {
-          localClipBounds = rect;
-        } else {
-          localClipBounds = null;
-        }
-      }
-    } else {
-      localClipBounds = null;
-    }
-    projectedClip = null;
-  }
-
-  void _applyColor() {
-    rootElement!.style.backgroundColor = colorToCssString(color)!;
-  }
-
-  @override
-  DomElement createElement() {
-    return super.createElement()..setAttribute('clip-type', 'physical-shape');
-  }
-
-  @override
-  void discard() {
-    super.discard();
-    _clipElement?.remove();
-    _clipElement = null;
-    _svgElement?.remove();
-    _svgElement = null;
-  }
-
-  @override
-  void apply() {
-    _applyShape();
-  }
-
-  void _applyShape() {
-    _applyColor();
-    // Handle special case of round rect physical shape mapping to
-    // rounded div.
-    final ui.RRect? roundRect = path.toRoundedRect();
-    if (roundRect != null) {
-      final String borderRadius =
-          '${roundRect.tlRadiusX}px ${roundRect.trRadiusX}px '
-          '${roundRect.brRadiusX}px ${roundRect.blRadiusX}px';
-      final DomCSSStyleDeclaration style = rootElement!.style;
-      style
-        ..left = '${roundRect.left}px'
-        ..top = '${roundRect.top}px'
-        ..width = '${roundRect.width}px'
-        ..height = '${roundRect.height}px'
-        ..borderRadius = borderRadius;
-      childContainer!.style
-        ..left = '${-roundRect.left}px'
-        ..top = '${-roundRect.top}px';
-      if (clipBehavior != ui.Clip.none) {
-        style.overflow = 'hidden';
-      }
-      applyCssShadow(rootElement, pathBounds, elevation, shadowColor);
-      return;
-    } else {
-      final ui.Rect? rect = path.toRect();
-      if (rect != null) {
-        final DomCSSStyleDeclaration style = rootElement!.style;
-        style
-          ..left = '${rect.left}px'
-          ..top = '${rect.top}px'
-          ..width = '${rect.width}px'
-          ..height = '${rect.height}px'
-          ..borderRadius = '';
-        childContainer!.style
-          ..left = '${-rect.left}px'
-          ..top = '${-rect.top}px';
-        if (clipBehavior != ui.Clip.none) {
-          style.overflow = 'hidden';
-        }
-        applyCssShadow(rootElement, pathBounds, elevation, shadowColor);
-        return;
-      } else {
-        final ui.Rect? ovalRect = path.toCircle();
-        if (ovalRect != null) {
-          final double rx = ovalRect.width / 2.0;
-          final double ry = ovalRect.height / 2.0;
-          final String borderRadius =
-              rx == ry ? '${rx}px ' : '${rx}px ${ry}px ';
-          final DomCSSStyleDeclaration style = rootElement!.style;
-          final double left = ovalRect.left;
-          final double top = ovalRect.top;
-          style
-            ..left = '${left}px'
-            ..top = '${top}px'
-            ..width = '${rx * 2}px'
-            ..height = '${ry * 2}px'
-            ..borderRadius = borderRadius;
-          childContainer!.style
-            ..left = '${-left}px'
-            ..top = '${-top}px';
-          if (clipBehavior != ui.Clip.none) {
-            style.overflow = 'hidden';
-          }
-          applyCssShadow(rootElement, pathBounds, elevation, shadowColor);
-          return;
-        }
-      }
-    }
-
-    /// If code reaches this point, we have a path we want to clip against and
-    /// potentially have a shadow due to material surface elevation.
-    ///
-    /// When there is no shadow we can simply clip a div with a background
-    /// color using a svg clip path.
-    ///
-    /// Otherwise we need to paint svg element for the path and clip
-    /// contents against same path for shadow to work since box-shadow doesn't
-    /// take clip-path into account.
-    ///
-    /// Webkit has a bug when applying clip-path on an element that has
-    /// position: absolute and transform
-    /// (https://bugs.webkit.org/show_bug.cgi?id=141731).
-    /// To place clipping rectangle correctly
-    /// we size the inner container to cover full pathBounds instead of sizing
-    /// to clipping rect bounds (which is the case for elevation == 0.0 where
-    /// we shift outer/inner clip area instead to position clip-path).
-    final SVGSVGElement svgClipPath = elevation == 0.0
-        ? pathToSvgClipPath(path,
-            offsetX: -pathBounds.left,
-            offsetY: -pathBounds.top,
-            scaleX: 1.0 / pathBounds.width,
-            scaleY: 1.0 / pathBounds.height)
-        : pathToSvgClipPath(path,
-            scaleX: 1.0 / pathBounds.right,
-            scaleY: 1.0 / pathBounds.bottom);
-
-    /// If apply is called multiple times (without update), remove prior
-    /// svg clip and render elements.
-    _clipElement?.remove();
-    _svgElement?.remove();
-    _clipElement = svgClipPath;
-    rootElement!.append(_clipElement!);
-    if (elevation == 0.0) {
-      setClipPath(rootElement!, createSvgClipUrl());
-      final DomCSSStyleDeclaration rootElementStyle = rootElement!.style;
-      rootElementStyle
-        ..overflow = ''
-        ..left = '${pathBounds.left}px'
-        ..top = '${pathBounds.top}px'
-        ..width = '${pathBounds.width}px'
-        ..height = '${pathBounds.height}px'
-        ..borderRadius = '';
-      childContainer!.style
-        ..left = '-${pathBounds.left}px'
-        ..top = '-${pathBounds.top}px';
-      return;
-    }
-
-    setClipPath(childContainer!, createSvgClipUrl());
-    final DomCSSStyleDeclaration rootElementStyle = rootElement!.style;
-    rootElementStyle
-      ..overflow = ''
-      ..left = '${pathBounds.left}px'
-      ..top = '${pathBounds.top}px'
-      ..width = '${pathBounds.width}px'
-      ..height = '${pathBounds.height}px'
-      ..borderRadius = '';
-    childContainer!.style
-      ..left = '-${pathBounds.left}px'
-      ..top = '-${pathBounds.top}px'
-      ..width = '${pathBounds.right}px'
-      ..height = '${pathBounds.bottom}px';
-
-    final ui.Rect pathBounds2 = path.getBounds();
-    _svgElement = pathToSvgElement(
-        path,
-        SurfacePaintData()
-          ..style = ui.PaintingStyle.fill
-          ..color = color.value,
-        '${pathBounds2.right}',
-        '${pathBounds2.bottom}');
-
-    /// Render element behind the clipped content.
-    rootElement!.insertBefore(_svgElement!, childContainer);
-
-    final SurfaceShadowData shadow = computeShadow(pathBounds, elevation)!;
-    final ui.Color boxShadowColor = toShadowColor(shadowColor);
-    _svgElement!.style
-      ..filter = 'drop-shadow(${shadow.offset.dx}px ${shadow.offset.dy}px '
-          '${shadow.blurWidth}px '
-          'rgba(${boxShadowColor.red}, ${boxShadowColor.green}, '
-          '${boxShadowColor.blue}, ${boxShadowColor.alpha / 255}))'
-      ..transform = 'translate(-${pathBounds2.left}px, -${pathBounds2.top}px)';
-
-    rootElement!.style.backgroundColor = '';
-  }
-
-  @override
-  void update(PersistedPhysicalShape oldSurface) {
-    super.update(oldSurface);
-    final bool pathChanged = oldSurface.path != path;
-    if (pathChanged) {
-      localClipBounds = null;
-    }
-    if (pathChanged ||
-        oldSurface.elevation != elevation ||
-        oldSurface.shadowColor != shadowColor ||
-        oldSurface.color != color) {
-      oldSurface._clipElement?.remove();
-      oldSurface._clipElement = null;
-      oldSurface._svgElement?.remove();
-      oldSurface._svgElement = null;
-      _clipElement?.remove();
-      _clipElement = null;
-      _svgElement?.remove();
-      _svgElement = null;
-      // Reset style on prior element since we may have switched between
-      // rect/rrect and arbitrary path.
-      setClipPath(rootElement!, '');
-      _applyShape();
-    } else {
-      // Reuse clipElement from prior surface.
-      _clipElement = oldSurface._clipElement;
-      if (_clipElement != null) {
-        rootElement!.append(_clipElement!);
-      }
-      oldSurface._clipElement = null;
-      _svgElement = oldSurface._svgElement;
-      if (_svgElement != null) {
-        rootElement!.insertBefore(_svgElement!, childContainer);
-      }
-      oldSurface._svgElement = null;
-    }
-  }
-}
-
 /// A surface that clips it's children.
 class PersistedClipPath extends PersistedContainerSurface
     implements ui.ClipPathEngineLayer {
diff --git a/lib/web_ui/lib/src/engine/html/color_filter.dart b/lib/web_ui/lib/src/engine/html/color_filter.dart
index 4961d7c8dec6d26637e5185c8dbe88b54d27d49a..b1638e22afd6f1c49b2fde2b864877dd9078b11a 100644
--- a/lib/web_ui/lib/src/engine/html/color_filter.dart
+++ b/lib/web_ui/lib/src/engine/html/color_filter.dart
@@ -7,11 +7,11 @@ import 'package:ui/ui.dart' as ui;
 import '../../engine/color_filter.dart';
 import '../browser_detection.dart';
 import '../dom.dart';
-import '../embedder.dart';
 import '../svg.dart';
 import '../util.dart';
 import 'bitmap_canvas.dart';
 import 'path_to_svg_clip.dart';
+import 'resource_manager.dart';
 import 'shaders/shader.dart';
 import 'surface.dart';
 
@@ -51,7 +51,7 @@ class PersistedColorFilter extends PersistedContainerSurface
   @override
   void discard() {
     super.discard();
-    flutterViewEmbedder.removeResource(_filterElement);
+    ResourceManager.instance.removeResource(_filterElement);
     _filterElement = null;
     // Do not detach the child container from the root. It is permanently
     // attached. The elements are reused together and are detached from the DOM
@@ -71,7 +71,7 @@ class PersistedColorFilter extends PersistedContainerSurface
 
   @override
   void apply() {
-    flutterViewEmbedder.removeResource(_filterElement);
+    ResourceManager.instance.removeResource(_filterElement);
     _filterElement = null;
     final EngineHtmlColorFilter? engineValue = createHtmlColorFilter(filter as EngineColorFilter);
     if (engineValue == null) {
@@ -121,24 +121,18 @@ SvgFilter svgFilterFromBlendMode(
     case ui.BlendMode.srcIn:
     case ui.BlendMode.srcATop:
       svgFilter = _srcInColorFilterToSvg(filterColor);
-      break;
     case ui.BlendMode.srcOut:
       svgFilter = _srcOutColorFilterToSvg(filterColor);
-      break;
     case ui.BlendMode.dstATop:
       svgFilter = _dstATopColorFilterToSvg(filterColor);
-      break;
     case ui.BlendMode.xor:
       svgFilter = _xorColorFilterToSvg(filterColor);
-      break;
     case ui.BlendMode.plus:
       // Porter duff source + destination.
       svgFilter = _compositeColorFilterToSvg(filterColor, 0, 1, 1, 0);
-      break;
     case ui.BlendMode.modulate:
       // Porter duff source * destination but preserves alpha.
       svgFilter = _modulateColorFilterToSvg(filterColor!);
-      break;
     case ui.BlendMode.overlay:
       // Since overlay is the same as hard-light by swapping layers,
       // pass hard-light blend function.
@@ -147,7 +141,6 @@ SvgFilter svgFilterFromBlendMode(
         blendModeToSvgEnum(ui.BlendMode.hardLight)!,
         swapLayers: true,
       );
-      break;
     // Several of the filters below (although supported) do not render the
     // same (close but not exact) as native flutter when used as blend mode
     // for a background-image with a background color. They only look
@@ -175,7 +168,6 @@ SvgFilter svgFilterFromBlendMode(
     case ui.BlendMode.exclusion:
       svgFilter = _blendColorFilterToSvg(
           filterColor, blendModeToSvgEnum(colorFilterBlendMode)!);
-      break;
     case ui.BlendMode.src:
     case ui.BlendMode.dst:
     case ui.BlendMode.dstIn:
@@ -360,7 +352,7 @@ SvgFilter _srcInColorFilterToSvg(ui.Color? color) {
     result: 'destalpha',
   );
   builder.setFeFlood(
-    floodColor: colorToCssString(color) ?? '',
+    floodColor: color?.toCssString() ?? '',
     floodOpacity: '1',
     result: 'flood',
   );
@@ -382,7 +374,7 @@ SvgFilter _srcInColorFilterToSvg(ui.Color? color) {
 SvgFilter _dstATopColorFilterToSvg(ui.Color? color) {
   final SvgFilterBuilder builder = SvgFilterBuilder();
   builder.setFeFlood(
-    floodColor: colorToCssString(color) ?? '',
+    floodColor: color?.toCssString() ?? '',
     floodOpacity: '1',
     result: 'flood',
   );
@@ -398,7 +390,7 @@ SvgFilter _dstATopColorFilterToSvg(ui.Color? color) {
 SvgFilter _srcOutColorFilterToSvg(ui.Color? color) {
   final SvgFilterBuilder builder = SvgFilterBuilder();
   builder.setFeFlood(
-    floodColor: colorToCssString(color) ?? '',
+    floodColor: color?.toCssString() ?? '',
     floodOpacity: '1',
     result: 'flood',
   );
@@ -414,7 +406,7 @@ SvgFilter _srcOutColorFilterToSvg(ui.Color? color) {
 SvgFilter _xorColorFilterToSvg(ui.Color? color) {
   final SvgFilterBuilder builder = SvgFilterBuilder();
   builder.setFeFlood(
-    floodColor: colorToCssString(color) ?? '',
+    floodColor: color?.toCssString() ?? '',
     floodOpacity: '1',
     result: 'flood',
   );
@@ -433,7 +425,7 @@ SvgFilter _compositeColorFilterToSvg(
     ui.Color? color, double k1, double k2, double k3, double k4) {
   final SvgFilterBuilder builder = SvgFilterBuilder();
   builder.setFeFlood(
-    floodColor: colorToCssString(color) ?? '',
+    floodColor: color?.toCssString() ?? '',
     floodOpacity: '1',
     result: 'flood',
   );
@@ -486,7 +478,7 @@ SvgFilter _blendColorFilterToSvg(ui.Color? color, SvgBlendMode svgBlendMode,
     {bool swapLayers = false}) {
   final SvgFilterBuilder builder = SvgFilterBuilder();
   builder.setFeFlood(
-    floodColor: colorToCssString(color) ?? '',
+    floodColor: color?.toCssString() ?? '',
     floodOpacity: '1',
     result: 'flood',
   );
diff --git a/lib/web_ui/lib/src/engine/html/debug_canvas_reuse_overlay.dart b/lib/web_ui/lib/src/engine/html/debug_canvas_reuse_overlay.dart
index 644a53aa57f5b7d3480818ebde24015433215d05..87f2b8b798e72ee953c9238005f6112817c176a7 100644
--- a/lib/web_ui/lib/src/engine/html/debug_canvas_reuse_overlay.dart
+++ b/lib/web_ui/lib/src/engine/html/debug_canvas_reuse_overlay.dart
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 import '../dom.dart';
-import '../util.dart';
 
 DomHTMLElement _createContainer() {
   final DomHTMLElement container = createDomHTMLDivElement();
@@ -65,7 +64,8 @@ class DebugCanvasReuseOverlay {
             ..append(
               createDomHTMLButtonElement()
                 ..text = 'Reset'
-                ..addEventListener('click', (_) => _reset()),
+                ..addEventListener('click',
+                    createDomEventListener((_) => _reset())),
             ),
         ),
     );
@@ -76,9 +76,10 @@ class DebugCanvasReuseOverlay {
     if (_instance == null) {
       // Only call the constructor when assertions are enabled to guard against
       // mistakingly including this class in a release build.
-      if (assertionsEnabled) {
+      assert(() {
         _instance = DebugCanvasReuseOverlay._();
-      }
+        return true;
+      }());
     }
     return _instance!;
   }
diff --git a/lib/web_ui/lib/src/engine/html/dom_canvas.dart b/lib/web_ui/lib/src/engine/html/dom_canvas.dart
index 3e63a0b99ff033a9ba3bce363c8bba99bf204003..b56f952f2b5f217c01d194ff13b6c5c5263acdbc 100644
--- a/lib/web_ui/lib/src/engine/html/dom_canvas.dart
+++ b/lib/web_ui/lib/src/engine/html/dom_canvas.dart
@@ -14,6 +14,7 @@ import '../svg.dart';
 import '../text/canvas_paragraph.dart';
 import '../util.dart';
 import '../vector_math.dart';
+import 'bitmap_canvas.dart';
 import 'painting.dart';
 import 'path/path.dart';
 import 'path/path_to_svg.dart';
@@ -59,7 +60,7 @@ class DomCanvas extends EngineCanvas with SaveElementStackTracking {
       ..right = '0'
       ..bottom = '0'
       ..left = '0'
-      ..backgroundColor = colorToCssString(color)!;
+      ..backgroundColor = color.toCssString();
     currentElement.append(box);
   }
 
@@ -256,8 +257,7 @@ DomHTMLElement buildDrawRectElement(
     ..transformOrigin = '0 0 0'
     ..transform = effectiveTransform;
 
-  String cssColor =
-      paint.color == null ? '#000000' : colorValueToCssString(paint.color)!;
+  String cssColor = colorValueToCssString(paint.color);
 
   if (paint.maskFilter != null) {
     final double sigma = paint.maskFilter!.webOnlySigma;
@@ -265,7 +265,7 @@ DomHTMLElement buildDrawRectElement(
       // A bug in webkit leaves artifacts when this element is animated
       // with filter: blur, we use boxShadow instead.
       style.boxShadow = '0px 0px ${sigma * 2.0}px $cssColor';
-      cssColor = colorToCssString(blurColor(ui.Color(paint.color), sigma))!;
+      cssColor = blurColor(ui.Color(paint.color), sigma).toCssString();
     } else {
       style.filter = 'blur(${sigma}px)';
     }
@@ -333,14 +333,11 @@ String _borderStrokeToCssUnit(double value) {
   return '${value.toStringAsFixed(3)}px';
 }
 
-SVGSVGElement pathToSvgElement(
-    SurfacePath path, SurfacePaintData paint, String width, String height) {
+SVGSVGElement pathToSvgElement(SurfacePath path, SurfacePaintData paint) {
   // In Firefox some SVG typed attributes are returned as null without a
   // setter. So we use strings here.
   final SVGSVGElement root = createSVGSVGElement()
-    ..setAttribute('width', '${width}px')
-    ..setAttribute('height', '${height}px')
-    ..setAttribute('viewBox', '0 0 $width $height');
+    ..setAttribute('overflow', 'visible');
 
   final SVGPathElement svgPath = createSVGPathElement();
   root.append(svgPath);
@@ -348,13 +345,14 @@ SVGSVGElement pathToSvgElement(
       (paint.style != ui.PaintingStyle.fill &&
           paint.strokeWidth != 0 &&
           paint.strokeWidth != null)) {
-    svgPath.setAttribute('stroke', colorValueToCssString(paint.color)!);
+    svgPath.setAttribute('stroke', colorValueToCssString(paint.color));
     svgPath.setAttribute('stroke-width', '${paint.strokeWidth ?? 1.0}');
+    if (paint.strokeCap != null) {
+      svgPath.setAttribute('stroke-linecap', '${stringForStrokeCap(paint.strokeCap)}');
+    }
     svgPath.setAttribute('fill', 'none');
-  } else if (paint.color != null) {
-    svgPath.setAttribute('fill', colorValueToCssString(paint.color)!);
   } else {
-    svgPath.setAttribute('fill', '#000000');
+    svgPath.setAttribute('fill', colorValueToCssString(paint.color));
   }
   if (path.fillType == ui.PathFillType.evenOdd) {
     svgPath.setAttribute('fill-rule', 'evenodd');
diff --git a/lib/web_ui/lib/src/engine/html/image_filter.dart b/lib/web_ui/lib/src/engine/html/image_filter.dart
index 13de22ab993a00b30fa1abca481b45396939a362..c6d70bab159913a7c408b266bf6944b8c3a33568 100644
--- a/lib/web_ui/lib/src/engine/html/image_filter.dart
+++ b/lib/web_ui/lib/src/engine/html/image_filter.dart
@@ -6,9 +6,9 @@ import 'package:ui/ui.dart' as ui;
 
 import '../color_filter.dart';
 import '../dom.dart';
-import '../embedder.dart';
 import '../util.dart';
 import '../vector_math.dart';
+import 'resource_manager.dart';
 import 'shaders/shader.dart';
 import 'surface.dart';
 import 'surface_stats.dart';
@@ -60,7 +60,7 @@ class PersistedImageFilter extends PersistedContainerSurface
   @override
   void discard() {
     super.discard();
-    flutterViewEmbedder.removeResource(_svgFilter);
+    ResourceManager.instance.removeResource(_svgFilter);
     _svgFilter = null;
     _childContainer = null;
   }
@@ -92,7 +92,7 @@ class PersistedImageFilter extends PersistedContainerSurface
     } else {
       backendFilter = filter as EngineImageFilter;
     }
-    flutterViewEmbedder.removeResource(_svgFilter);
+    ResourceManager.instance.removeResource(_svgFilter);
     _svgFilter = null;
     if (backendFilter is ModeHtmlColorFilter) {
       _svgFilter = backendFilter.makeSvgFilter(rootElement);
diff --git a/lib/web_ui/lib/src/engine/html/painting.dart b/lib/web_ui/lib/src/engine/html/painting.dart
index bdd8aa4fd8251c3f4715d43634c603eb3da8ba99..dcf14e7d39600abb5f696787fa43765b8876345f 100644
--- a/lib/web_ui/lib/src/engine/html/painting.dart
+++ b/lib/web_ui/lib/src/engine/html/painting.dart
@@ -96,14 +96,7 @@ class SurfacePaint implements ui.Paint {
   }
 
   @override
-  bool get invertColors {
-    return false;
-  }
-
-  @override
-  set invertColors(bool value) {}
-
-  static const int _defaultPaintColor = 0xFF000000;
+  bool invertColors = false;
 
   @override
   ui.Shader? get shader => _paintData.shader;
@@ -155,25 +148,11 @@ class SurfacePaint implements ui.Paint {
 
   // TODO(ferhat): see https://github.com/flutter/flutter/issues/33605
   @override
-  double get strokeMiterLimit {
-    throw UnsupportedError('SurfacePaint.strokeMiterLimit');
-  }
+  double strokeMiterLimit = 0;
 
+  // TODO(ferhat): Implement ImageFilter, flutter/flutter#35156.
   @override
-  set strokeMiterLimit(double value) {
-    assert(value != null);
-  }
-
-  @override
-  ui.ImageFilter? get imageFilter {
-    // TODO(ferhat): Implement ImageFilter, flutter/flutter#35156.
-    return null;
-  }
-
-  @override
-  set imageFilter(ui.ImageFilter? value) {
-    // TODO(ferhat): Implement ImageFilter, flutter/flutter#35156
-  }
+  ui.ImageFilter? imageFilter;
 
   // True if Paint instance has used in RecordingCanvas.
   bool _frozen = false;
@@ -186,33 +165,83 @@ class SurfacePaint implements ui.Paint {
     return _paintData;
   }
 
+  // Must be kept in sync with the default in paint.cc.
+  static const double _kStrokeMiterLimitDefault = 4.0;
+
+  // Must be kept in sync with the default in paint.cc.
+  static const int _kColorDefault = 0xFF000000;
+
+  // Must be kept in sync with the default in paint.cc.
+  static final int _kBlendModeDefault = ui.BlendMode.srcOver.index;
+
   @override
   String toString() {
-    final StringBuffer result = StringBuffer();
-    String semicolon = '';
-    result.write('Paint(');
-    if (style == ui.PaintingStyle.stroke) {
-      result.write('$style');
-      if (strokeWidth != 0.0) {
-        result.write(' $strokeWidth');
-      } else {
-        result.write(' hairline');
+    String resultString = 'Paint()';
+
+    assert(() {
+      final StringBuffer result = StringBuffer();
+      String semicolon = '';
+      result.write('Paint(');
+      if (style == ui.PaintingStyle.stroke) {
+        result.write('$style');
+        if (strokeWidth != 0.0) {
+          result.write(' ${strokeWidth.toStringAsFixed(1)}');
+        } else {
+          result.write(' hairline');
+        }
+        if (strokeCap != ui.StrokeCap.butt) {
+          result.write(' $strokeCap');
+        }
+        if (strokeJoin == ui.StrokeJoin.miter) {
+          if (strokeMiterLimit != _kStrokeMiterLimitDefault) {
+            result.write(' $strokeJoin up to ${strokeMiterLimit.toStringAsFixed(1)}');
+          }
+        } else {
+          result.write(' $strokeJoin');
+        }
+        semicolon = '; ';
       }
-      if (strokeCap != ui.StrokeCap.butt) {
-        result.write(' $strokeCap');
+      if (!isAntiAlias) {
+        result.write('${semicolon}antialias off');
+        semicolon = '; ';
       }
-      semicolon = '; ';
-    }
-    if (isAntiAlias != true) {
-      result.write('${semicolon}antialias off');
-      semicolon = '; ';
-    }
-    if (color.value != _defaultPaintColor) {
-      result.write('$semicolon$color');
-      semicolon = '; ';
-    }
-    result.write(')');
-    return result.toString();
+      if (color != const ui.Color(_kColorDefault)) {
+        result.write('$semicolon$color');
+        semicolon = '; ';
+      }
+      if (blendMode.index != _kBlendModeDefault) {
+        result.write('$semicolon$blendMode');
+        semicolon = '; ';
+      }
+      if (colorFilter != null) {
+        result.write('${semicolon}colorFilter: $colorFilter');
+        semicolon = '; ';
+      }
+      if (maskFilter != null) {
+        result.write('${semicolon}maskFilter: $maskFilter');
+        semicolon = '; ';
+      }
+      if (filterQuality != ui.FilterQuality.none) {
+        result.write('${semicolon}filterQuality: $filterQuality');
+        semicolon = '; ';
+      }
+      if (shader != null) {
+        result.write('${semicolon}shader: $shader');
+        semicolon = '; ';
+      }
+      if (imageFilter != null) {
+        result.write('${semicolon}imageFilter: $imageFilter');
+        semicolon = '; ';
+      }
+      if (invertColors) {
+        result.write('${semicolon}invert: $invertColors');
+      }
+      result.write(')');
+      resultString = result.toString();
+      return true;
+    }());
+
+    return resultString;
   }
 }
 
@@ -249,9 +278,8 @@ class SurfacePaintData {
 
   @override
   String toString() {
-    if (!assertionsEnabled) {
-      return super.toString();
-    } else {
+    String result = super.toString();
+    assert(() {
       final StringBuffer buffer = StringBuffer('SurfacePaintData(');
       if (blendMode != null) {
         buffer.write('blendMode = $blendMode; ');
@@ -268,9 +296,7 @@ class SurfacePaintData {
       if (strokeJoin != null) {
         buffer.write('strokeJoin = $strokeJoin; ');
       }
-      if (color != null) {
-        buffer.write('color = ${colorToCssString(ui.Color(color))}; ');
-      }
+      buffer.write('color = ${ui.Color(color).toCssString()}; ');
       if (shader != null) {
         buffer.write('shader = $shader; ');
       }
@@ -284,8 +310,12 @@ class SurfacePaintData {
         buffer.write('colorFilter = $colorFilter; ');
       }
       buffer.write('isAntiAlias = $isAntiAlias)');
-      return buffer.toString();
-    }
+      result = buffer.toString();
+
+      return true;
+    }());
+
+    return result;
   }
 }
 
diff --git a/lib/web_ui/lib/src/engine/html/path/cubic.dart b/lib/web_ui/lib/src/engine/html/path/cubic.dart
index 5c06ce71283ce6d10a99ead8caeee625c3776864..81b5dda6fe0eed2dfb5d6cf99a5ff798fea1839a 100644
--- a/lib/web_ui/lib/src/engine/html/path/cubic.dart
+++ b/lib/web_ui/lib/src/engine/html/path/cubic.dart
@@ -5,7 +5,6 @@
 import 'dart:math' as math;
 import 'dart:typed_data';
 
-import '../../util.dart';
 import 'path_utils.dart';
 
 /// Chops cubic at Y extrema points and writes result to [dest].
@@ -45,7 +44,7 @@ QuadRoots _findCubicExtrema(double a, double b, double c, double d) {
 /// Subdivides cubic curve for a list of t values.
 void _chopCubicAt(
     List<double> tValues, Float32List points, Float32List outPts) {
-  if (assertionsEnabled) {
+  assert(() {
     for (int i = 0; i < tValues.length - 1; i++) {
       final double tValue = tValues[i];
       assert(tValue > 0 && tValue < 1,
@@ -57,7 +56,8 @@ void _chopCubicAt(
       assert(
           nextTValue > tValue, 'Expecting t value to monotonically increase');
     }
-  }
+    return true;
+  }());
   final int rootCount = tValues.length;
   if (0 == rootCount) {
     for (int i = 0; i < 8; i++) {
diff --git a/lib/web_ui/lib/src/engine/html/path/path.dart b/lib/web_ui/lib/src/engine/html/path/path.dart
index 066836901f7e682c8ca86bd7df2a75d215fb34cf..3d2d926fb91ac9cf74b5508fa18ac86b95ff1a7f 100644
--- a/lib/web_ui/lib/src/engine/html/path/path.dart
+++ b/lib/web_ui/lib/src/engine/html/path/path.dart
@@ -7,7 +7,6 @@ import 'dart:typed_data';
 
 import 'package:ui/ui.dart' as ui;
 
-import '../../util.dart';
 import '../../validators.dart';
 import '../../vector_math.dart';
 import 'conic.dart';
@@ -658,7 +657,7 @@ class SurfacePath implements ui.Path {
   /// `clockwise` and `largeArc` in such a way that the sweep angle
   /// is always less than 360 degrees.
   ///
-  /// A simple line is appended if either either radii are zero or the last
+  /// A simple line is appended if either radii are zero or the last
   /// point in the path is `arcEnd`. The radii are scaled to fit the last path
   /// point if both are greater than zero but too small to describe an arc.
   ///
@@ -851,7 +850,7 @@ class SurfacePath implements ui.Path {
   /// path in a direction determined by `clockwise` and `largeArc`
   /// in such a way that the sweep angle is always less than 360 degrees.
   ///
-  /// A simple line is appended if either either radii are zero, or, both
+  /// A simple line is appended if either radii are zero, or, both
   /// `arcEndDelta.dx` and `arcEndDelta.dy` are zero. The radii are scaled to
   /// fit the last path point if both are greater than zero but too small to
   /// describe an arc.
@@ -1135,24 +1134,18 @@ class SurfacePath implements ui.Path {
             } else {
               moveTo(outPts[0], outPts[1]);
             }
-            break;
           case SPath.kLineVerb:
             lineTo(outPts[2], outPts[3]);
-            break;
           case SPath.kQuadVerb:
             _quadTo(outPts[2], outPts[3], outPts[4], outPts[5]);
-            break;
           case SPath.kConicVerb:
             conicTo(
                 outPts[2], outPts[3], outPts[4], outPts[5], iter.conicWeight);
-            break;
           case SPath.kCubicVerb:
             cubicTo(outPts[2], outPts[3], outPts[4], outPts[5], outPts[6],
                 outPts[7]);
-            break;
           case SPath.kCloseVerb:
             close();
-            break;
         }
         firstVerb = false;
       }
@@ -1248,19 +1241,14 @@ class SurfacePath implements ui.Path {
           break;
         case SPath.kLineVerb:
           tangentLine(buffer, x, y, tangents);
-          break;
         case SPath.kQuadVerb:
           tangentQuad(buffer, x, y, tangents);
-          break;
         case SPath.kConicVerb:
           tangentConic(buffer, x, y, iter.conicWeight, tangents);
-          break;
         case SPath.kCubicVerb:
           tangentCubic(buffer, x, y, tangents);
-          break;
         case SPath.kDoneVerb:
           done = true;
-          break;
       }
       if (tangents.length > oldCount) {
         final int last = tangents.length - 1;
@@ -1392,19 +1380,14 @@ class SurfacePath implements ui.Path {
           }
           state.setMovePt(pts[0], pts[1]);
           count = 0;
-          break;
         case SPath.kLineVerb:
           count = 1;
-          break;
         case SPath.kQuadVerb:
           count = 2;
-          break;
         case SPath.kConicVerb:
           count = 2;
-          break;
         case SPath.kCubicVerb:
           count = 3;
-          break;
         case SPath.kCloseVerb:
           if (!state.close()) {
             if (!state.isFinite) {
@@ -1413,7 +1396,6 @@ class SurfacePath implements ui.Path {
             return _setComputedConvexity(SPathConvexityType.kConcave);
           }
           count = 0;
-          break;
         default:
           return _setComputedConvexity(SPathConvexityType.kConcave);
       }
@@ -1479,11 +1461,9 @@ class SurfacePath implements ui.Path {
         case SPath.kMoveVerb:
           minX = maxX = points[pIndex];
           minY = maxY = points[pIndex + 1];
-          break;
         case SPath.kLineVerb:
           minX = maxX = points[pIndex + 2];
           minY = maxY = points[pIndex + 3];
-          break;
         case SPath.kQuadVerb:
           quadBounds ??= QuadBounds();
           quadBounds.calculateBounds(points, pIndex);
@@ -1491,7 +1471,6 @@ class SurfacePath implements ui.Path {
           minY = quadBounds.minY;
           maxX = quadBounds.maxX;
           maxY = quadBounds.maxY;
-          break;
         case SPath.kConicVerb:
           conicBounds ??= ConicBounds();
           conicBounds.calculateBounds(points, iter.conicWeight, pIndex);
@@ -1499,7 +1478,6 @@ class SurfacePath implements ui.Path {
           minY = conicBounds.minY;
           maxX = conicBounds.maxX;
           maxY = conicBounds.maxY;
-          break;
         case SPath.kCubicVerb:
           cubicBounds ??= CubicBounds();
           cubicBounds.calculateBounds(points, pIndex);
@@ -1507,7 +1485,6 @@ class SurfacePath implements ui.Path {
           minY = cubicBounds.minY;
           maxX = cubicBounds.maxX;
           maxY = cubicBounds.maxY;
-          break;
       }
       if (!ltrbInitialized) {
         left = minX;
@@ -1580,7 +1557,8 @@ class SurfacePath implements ui.Path {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
+    String result = super.toString();
+    assert(() {
       final StringBuffer sb = StringBuffer();
       sb.write('Path(');
       final PathRefIterator iter = PathRefIterator(pathRef);
@@ -1591,36 +1569,30 @@ class SurfacePath implements ui.Path {
         switch (verb) {
           case SPath.kMoveVerb:
             sb.write('MoveTo(${points[pIndex]}, ${points[pIndex + 1]})');
-            break;
           case SPath.kLineVerb:
             sb.write('LineTo(${points[pIndex + 2]}, ${points[pIndex + 3]})');
-            break;
           case SPath.kQuadVerb:
             sb.write('Quad(${points[pIndex + 2]}, ${points[pIndex + 3]},'
                 ' ${points[pIndex + 3]}, ${points[pIndex + 4]})');
-            break;
           case SPath.kConicVerb:
             sb.write('Conic(${points[pIndex + 2]}, ${points[pIndex + 3]},'
                 ' ${points[pIndex + 3]}, ${points[pIndex + 4]}, w = ${iter.conicWeight})');
-            break;
           case SPath.kCubicVerb:
             sb.write('Cubic(${points[pIndex + 2]}, ${points[pIndex + 3]},'
                 ' ${points[pIndex + 3]}, ${points[pIndex + 4]}, '
                 ' ${points[pIndex + 5]}, ${points[pIndex + 6]})');
-            break;
           case SPath.kCloseVerb:
             sb.write('Close()');
-            break;
         }
         if (iter.peek() != SPath.kDoneVerb) {
           sb.write(' ');
         }
       }
       sb.write(')');
-      return sb.toString();
-    } else {
-      return super.toString();
-    }
+      result = sb.toString();
+      return true;
+    }());
+    return result;
   }
 }
 
diff --git a/lib/web_ui/lib/src/engine/html/path/path_iterator.dart b/lib/web_ui/lib/src/engine/html/path/path_iterator.dart
index 90793a95004f066bfdd8bf79dadbeabf91f63bfb..5f09e134ffba299982a8f806055978830c2d898f 100644
--- a/lib/web_ui/lib/src/engine/html/path/path_iterator.dart
+++ b/lib/web_ui/lib/src/engine/html/path/path_iterator.dart
@@ -153,7 +153,6 @@ class PathIterator {
         _lastPointX = _moveToX;
         _lastPointY = _moveToY;
         _needClose = _forceClose;
-        break;
       case SPath.kLineVerb:
         final ui.Offset start = _constructMoveTo();
         final double offsetX = pathRef.points[_pointIndex++];
@@ -164,7 +163,6 @@ class PathIterator {
         outPts[3] = offsetY;
         _lastPointX = offsetX;
         _lastPointY = offsetY;
-        break;
       case SPath.kConicVerb:
         _conicWeightIndex++;
         final ui.Offset start = _constructMoveTo();
@@ -174,7 +172,6 @@ class PathIterator {
         outPts[3] = pathRef.points[_pointIndex++];
         _lastPointX = outPts[4] = pathRef.points[_pointIndex++];
         _lastPointY = outPts[5] = pathRef.points[_pointIndex++];
-        break;
       case SPath.kQuadVerb:
         final ui.Offset start = _constructMoveTo();
         outPts[0] = start.dx;
@@ -183,7 +180,6 @@ class PathIterator {
         outPts[3] = pathRef.points[_pointIndex++];
         _lastPointX = outPts[4] = pathRef.points[_pointIndex++];
         _lastPointY = outPts[5] = pathRef.points[_pointIndex++];
-        break;
       case SPath.kCubicVerb:
         final ui.Offset start = _constructMoveTo();
         outPts[0] = start.dx;
@@ -194,7 +190,6 @@ class PathIterator {
         outPts[5] = pathRef.points[_pointIndex++];
         _lastPointX = outPts[6] = pathRef.points[_pointIndex++];
         _lastPointY = outPts[7] = pathRef.points[_pointIndex++];
-        break;
       case SPath.kCloseVerb:
         verb = _autoClose(outPts);
         if (verb == SPath.kLineVerb) {
@@ -206,10 +201,8 @@ class PathIterator {
         }
         _lastPointX = _moveToX;
         _lastPointY = _moveToY;
-        break;
       case SPath.kDoneVerb:
         assert(_verbIndex == pathRef.countVerbs());
-        break;
       default:
         throw FormatException('Unsupport Path verb $verb');
     }
diff --git a/lib/web_ui/lib/src/engine/html/path/path_metrics.dart b/lib/web_ui/lib/src/engine/html/path/path_metrics.dart
index 7dad8f3e4f0d29dd2d460428bb29ada46ba0d40c..5170b20416263d2c5c58f9ac6b46cec626ff4f07 100644
--- a/lib/web_ui/lib/src/engine/html/path/path_metrics.dart
+++ b/lib/web_ui/lib/src/engine/html/path/path_metrics.dart
@@ -258,16 +258,13 @@ class _PathContourMeasure {
         final double toX = (points[2] * stopT) + (points[0] * (1.0 - stopT));
         final double toY = (points[3] * stopT) + (points[1] * (1.0 - stopT));
         path.lineTo(toX, toY);
-        break;
       case SPath.kCubicVerb:
         chopCubicBetweenT(points, startT, stopT, _buffer);
         path.cubicTo(_buffer[2], _buffer[3], _buffer[4], _buffer[5], _buffer[6],
             _buffer[7]);
-        break;
       case SPath.kQuadVerb:
         _chopQuadBetweenT(points, startT, stopT, _buffer);
         path.quadraticBezierTo(_buffer[2], _buffer[3], _buffer[4], _buffer[5]);
-        break;
       case SPath.kConicVerb:
         // Implement this once we start writing out conic segments.
         throw UnimplementedError();
@@ -309,11 +306,9 @@ class _PathContourMeasure {
       switch (verb) {
         case SPath.kMoveVerb:
           haveSeenMoveTo = true;
-          break;
         case SPath.kLineVerb:
           assert(haveSeenMoveTo);
           lineToHandler(points[0], points[1], points[2], points[3]);
-          break;
         case SPath.kCubicVerb:
           assert(haveSeenMoveTo);
           // Compute cubic curve distance.
@@ -330,7 +325,6 @@ class _PathContourMeasure {
               0,
               _kMaxTValue,
               _segments);
-          break;
         case SPath.kConicVerb:
           assert(haveSeenMoveTo);
           final double w = iter.conicWeight;
@@ -350,13 +344,11 @@ class _PathContourMeasure {
             startX = p2x;
             startY = p2y;
           }
-          break;
         case SPath.kQuadVerb:
           assert(haveSeenMoveTo);
           // Compute quad curve distance.
           distance = _computeQuadSegments(points[0], points[1], points[2],
               points[3], points[4], points[5], distance, 0, _kMaxTValue);
-          break;
         case SPath.kCloseVerb:
           _contourLength = distance;
           return iter.pathVerbIndex;
diff --git a/lib/web_ui/lib/src/engine/html/path/path_ref.dart b/lib/web_ui/lib/src/engine/html/path/path_ref.dart
index b54d09d28f1ea7817950b4d728ab02322978e8fb..c1dde261551e2c2806154bc5b21a41394f59744e 100644
--- a/lib/web_ui/lib/src/engine/html/path/path_ref.dart
+++ b/lib/web_ui/lib/src/engine/html/path/path_ref.dart
@@ -7,7 +7,6 @@ import 'dart:typed_data';
 
 import 'package:ui/ui.dart' as ui;
 
-import '../../util.dart';
 import 'path_utils.dart';
 
 /// Stores the path verbs, points and conic weights.
@@ -304,7 +303,7 @@ class PathRef {
           dx = vector1_0x.abs();
           dy = vector1_0y.abs();
         }
-        if (assertionsEnabled) {
+        assert(() {
           final int checkCornerIndex = SPath.nearlyEqual(controlPx, bounds.left)
               ? (SPath.nearlyEqual(controlPy, bounds.top)
                   ? _Corner.kUpperLeft
@@ -312,12 +311,12 @@ class PathRef {
               : (SPath.nearlyEqual(controlPy, bounds.top)
                   ? _Corner.kUpperRight
                   : _Corner.kLowerRight);
-          assert(checkCornerIndex == cornerIndex);
-        }
+          return checkCornerIndex == cornerIndex;
+        }());
         radii.add(ui.Radius.elliptical(dx, dy));
         ++cornerIndex;
       } else {
-        if (assertionsEnabled) {
+        assert(() {
           if (verb == SPath.kLineVerb) {
             final bool isVerticalOrHorizontal =
               SPath.nearlyEqual(pts[2], pts[0]) ||
@@ -329,7 +328,8 @@ class PathRef {
           } else {
             assert(verb == SPath.kCloseVerb);
           }
-        }
+          return true;
+        }());
       }
     }
     return ui.RRect.fromRectAndCorners(bounds,
@@ -532,16 +532,12 @@ class PathRef {
       switch (verbs[i]) {
         case SPath.kLineVerb:
           mask |= SPath.kLineSegmentMask;
-          break;
         case SPath.kQuadVerb:
           mask |= SPath.kQuadSegmentMask;
-          break;
         case SPath.kConicVerb:
           mask |= SPath.kConicSegmentMask;
-          break;
         case SPath.kCubicVerb:
           mask |= SPath.kCubicSegmentMask;
-          break;
         default:
           break;
       }
@@ -638,41 +634,40 @@ class PathRef {
     debugValidate();
     int pCnt;
     int mask = 0;
+    String? throwError;
     switch (verb) {
       case SPath.kMoveVerb:
         pCnt = 1;
-        break;
       case SPath.kLineVerb:
         mask = SPath.kLineSegmentMask;
         pCnt = 1;
-        break;
       case SPath.kQuadVerb:
         mask = SPath.kQuadSegmentMask;
         pCnt = 2;
-        break;
       case SPath.kConicVerb:
         mask = SPath.kConicSegmentMask;
         pCnt = 2;
-        break;
       case SPath.kCubicVerb:
         mask = SPath.kCubicSegmentMask;
         pCnt = 3;
-        break;
       case SPath.kCloseVerb:
         pCnt = 0;
-        break;
       case SPath.kDoneVerb:
-        if (assertionsEnabled) {
-          throw Exception('growForVerb called for kDone');
-        }
+        assert(() {
+          throwError = 'growForVerb called for kDone';
+          return true;
+        }());
         pCnt = 0;
-        break;
       default:
-        if (assertionsEnabled) {
-          throw Exception('default is not reached');
-        }
+        assert(() {
+          throwError = 'growForVerb called for unknown verb';
+          return true;
+        }());
         pCnt = 0;
-        break;
+    }
+
+    if (throwError != null) {
+      throw Exception(throwError);
     }
 
     fSegmentMask |= mask;
@@ -705,41 +700,40 @@ class PathRef {
     startEdit();
     int pCnt;
     int mask = 0;
+    String? throwError;
     switch (verb) {
       case SPath.kMoveVerb:
         pCnt = numVbs;
-        break;
       case SPath.kLineVerb:
         mask = SPath.kLineSegmentMask;
         pCnt = numVbs;
-        break;
       case SPath.kQuadVerb:
         mask = SPath.kQuadSegmentMask;
         pCnt = 2 * numVbs;
-        break;
       case SPath.kConicVerb:
         mask = SPath.kConicSegmentMask;
         pCnt = 2 * numVbs;
-        break;
       case SPath.kCubicVerb:
         mask = SPath.kCubicSegmentMask;
         pCnt = 3 * numVbs;
-        break;
       case SPath.kCloseVerb:
         pCnt = 0;
-        break;
       case SPath.kDoneVerb:
-        if (assertionsEnabled) {
-          throw Exception('growForVerb called for kDone');
-        }
+        assert(() {
+          throwError = 'growForVerb called for kDone';
+          return true;
+        }());
         pCnt = 0;
-        break;
       default:
-        if (assertionsEnabled) {
-          throw Exception('default is not reached');
-        }
+        assert(() {
+          throwError = 'growForVerb called for unknown verb';
+          return true;
+        }());
         pCnt = 0;
-        break;
+    }
+
+    if (throwError != null) {
+      throw Exception(throwError);
     }
 
     fSegmentMask |= mask;
@@ -999,29 +993,23 @@ class PathRefIterator {
       case SPath.kMoveVerb:
         iterIndex = _pointIndex;
         _pointIndex += 2;
-        break;
       case SPath.kLineVerb:
         iterIndex = _pointIndex - 2;
         _pointIndex += 2;
-        break;
       case SPath.kConicVerb:
         _conicWeightIndex++;
         iterIndex = _pointIndex - 2;
         _pointIndex += 4;
-        break;
       case SPath.kQuadVerb:
         iterIndex = _pointIndex - 2;
         _pointIndex += 4;
-        break;
       case SPath.kCubicVerb:
         iterIndex = _pointIndex - 2;
         _pointIndex += 6;
-        break;
       case SPath.kCloseVerb:
         break;
       case SPath.kDoneVerb:
         assert(_verbIndex == pathRef.countVerbs());
-        break;
       default:
         throw FormatException('Unsupport Path verb $verb');
     }
@@ -1040,13 +1028,11 @@ class PathRefIterator {
       case SPath.kMoveVerb:
         outPts[0] = points[pointIndex++];
         outPts[1] = points[pointIndex++];
-        break;
       case SPath.kLineVerb:
         outPts[0] = points[pointIndex - 2];
         outPts[1] = points[pointIndex - 1];
         outPts[2] = points[pointIndex++];
         outPts[3] = points[pointIndex++];
-        break;
       case SPath.kConicVerb:
         _conicWeightIndex++;
         outPts[0] = points[pointIndex - 2];
@@ -1055,7 +1041,6 @@ class PathRefIterator {
         outPts[3] = points[pointIndex++];
         outPts[4] = points[pointIndex++];
         outPts[5] = points[pointIndex++];
-        break;
       case SPath.kQuadVerb:
         outPts[0] = points[pointIndex - 2];
         outPts[1] = points[pointIndex - 1];
@@ -1063,7 +1048,6 @@ class PathRefIterator {
         outPts[3] = points[pointIndex++];
         outPts[4] = points[pointIndex++];
         outPts[5] = points[pointIndex++];
-        break;
       case SPath.kCubicVerb:
         outPts[0] = points[pointIndex - 2];
         outPts[1] = points[pointIndex - 1];
@@ -1073,12 +1057,10 @@ class PathRefIterator {
         outPts[5] = points[pointIndex++];
         outPts[6] = points[pointIndex++];
         outPts[7] = points[pointIndex++];
-        break;
       case SPath.kCloseVerb:
         break;
       case SPath.kDoneVerb:
         assert(_verbIndex == pathRef.countVerbs());
-        break;
       default:
         throw FormatException('Unsupport Path verb $verb');
     }
diff --git a/lib/web_ui/lib/src/engine/html/path/path_to_svg.dart b/lib/web_ui/lib/src/engine/html/path/path_to_svg.dart
index df36bf78bf482b1c3122dacebb8b217148ea8d06..ae08d0d53d2c6e5ec3a3d4778318e12ede602a8d 100644
--- a/lib/web_ui/lib/src/engine/html/path/path_to_svg.dart
+++ b/lib/web_ui/lib/src/engine/html/path/path_to_svg.dart
@@ -21,18 +21,14 @@ String pathToSvg(PathRef pathRef, {double offsetX = 0, double offsetY = 0}) {
     switch (verb) {
       case SPath.kMoveVerb:
         buffer.write('M ${outPts[0] + offsetX} ${outPts[1] + offsetY}');
-        break;
       case SPath.kLineVerb:
         buffer.write('L ${outPts[2] + offsetX} ${outPts[3] + offsetY}');
-        break;
       case SPath.kCubicVerb:
         buffer.write('C ${outPts[2] + offsetX} ${outPts[3] + offsetY} '
             '${outPts[4] + offsetX} ${outPts[5] + offsetY} ${outPts[6] + offsetX} ${outPts[7] + offsetY}');
-        break;
       case SPath.kQuadVerb:
         buffer.write('Q ${outPts[2] + offsetX} ${outPts[3] + offsetY} '
             '${outPts[4] + offsetX} ${outPts[5] + offsetY}');
-        break;
       case SPath.kConicVerb:
         final double w = iter.conicWeight;
         final Conic conic = Conic(outPts[0], outPts[1], outPts[2], outPts[3],
@@ -47,10 +43,8 @@ String pathToSvg(PathRef pathRef, {double offsetX = 0, double offsetY = 0}) {
           buffer.write('Q ${p1x + offsetX} ${p1y + offsetY} '
               '${p2x + offsetX} ${p2y + offsetY}');
         }
-        break;
       case SPath.kCloseVerb:
         buffer.write('Z');
-        break;
       default:
         throw UnimplementedError('Unknown path verb $verb');
     }
diff --git a/lib/web_ui/lib/src/engine/html/path/path_utils.dart b/lib/web_ui/lib/src/engine/html/path/path_utils.dart
index 0f7dacda7c715fe97035f15e8a7fbd39d53e03c7..8c77c3e4ef1f0852fe1bdbe07905e7ef752e34c0 100644
--- a/lib/web_ui/lib/src/engine/html/path/path_utils.dart
+++ b/lib/web_ui/lib/src/engine/html/path/path_utils.dart
@@ -26,11 +26,7 @@ class SPathVerb {
   static const int kClose = 5; // 0 points
 }
 
-abstract class SPath {
-  // This class is not meant to be instantiated or extended; this constructor
-  // prevents instantiation and extension.
-  SPath._();
-
+abstract final class SPath {
   static const int kMoveVerb = SPathVerb.kMove;
   static const int kLineVerb = SPathVerb.kLine;
   static const int kQuadVerb = SPathVerb.kQuad;
diff --git a/lib/web_ui/lib/src/engine/html/path/path_windings.dart b/lib/web_ui/lib/src/engine/html/path/path_windings.dart
index ac877a264d9858114432a929e7766924d97afbd6..24779051d8732ad3ec87e430563ea11cf723f4be 100644
--- a/lib/web_ui/lib/src/engine/html/path/path_windings.dart
+++ b/lib/web_ui/lib/src/engine/html/path/path_windings.dart
@@ -41,16 +41,12 @@ class PathWinding {
           break;
         case SPath.kLineVerb:
           _computeLineWinding();
-          break;
         case SPath.kQuadVerb:
           _computeQuadWinding();
-          break;
         case SPath.kConicVerb:
           _computeConicWinding(pathRef.conicWeights![iter.conicWeightIndex]);
-          break;
         case SPath.kCubicVerb:
           _computeCubicWinding();
-          break;
       }
     }
   }
diff --git a/lib/web_ui/lib/src/engine/html/path_to_svg_clip.dart b/lib/web_ui/lib/src/engine/html/path_to_svg_clip.dart
index 24f5fe5eb044e083deaa15e2f385581859413b47..4bc0bff9c33bb387378aa19bf82ab76be5b60385 100644
--- a/lib/web_ui/lib/src/engine/html/path_to_svg_clip.dart
+++ b/lib/web_ui/lib/src/engine/html/path_to_svg_clip.dart
@@ -51,7 +51,11 @@ SVGSVGElement pathToSvgClipPath(ui.Path path,
     clipPath.setAttribute('clipPathUnits', 'objectBoundingBox');
     svgPath.setAttribute('transform', 'scale($scaleX, $scaleY)');
   }
-
+  if (path.fillType == ui.PathFillType.evenOdd) {
+    svgPath.setAttribute('clip-rule', 'evenodd');
+  } else {
+    svgPath.setAttribute('clip-rule', 'nonzero');
+  }
   svgPath.setAttribute('d', pathToSvg((path as SurfacePath).pathRef, offsetX: offsetX, offsetY: offsetY));
   return root;
 }
diff --git a/lib/web_ui/lib/src/engine/html/picture.dart b/lib/web_ui/lib/src/engine/html/picture.dart
index da6f988ba8df7373391d859caaff9d7575f767ed..eb47c407f91a4bc67864d0c73452eff962350c0d 100644
--- a/lib/web_ui/lib/src/engine/html/picture.dart
+++ b/lib/web_ui/lib/src/engine/html/picture.dart
@@ -54,8 +54,7 @@ class PaintRequest {
   PaintRequest({
     required this.canvasSize,
     required this.paintCallback,
-  })  : assert(canvasSize != null),
-        assert(paintCallback != null);
+  });
 
   final ui.Size canvasSize;
   final ui.VoidCallback paintCallback;
@@ -206,10 +205,10 @@ class PersistedPicture extends PersistedLeafSurface {
         final ui.Rect? localClipBounds = parentSurface.localClipBounds;
         if (localClipBounds != null) {
           if (bounds == null) {
-            bounds = transformRect(clipTransform, localClipBounds);
+            bounds = clipTransform.transformRect(localClipBounds);
           } else {
             bounds =
-                bounds.intersect(transformRect(clipTransform, localClipBounds));
+                bounds.intersect(clipTransform.transformRect(localClipBounds));
           }
         }
         final Matrix4? localInverse = parentSurface.localTransformInverse;
@@ -237,7 +236,7 @@ class PersistedPicture extends PersistedLeafSurface {
       _exactGlobalCullRect = ui.Rect.zero;
     } else {
       assert(() {
-        _exactGlobalCullRect = transformRect(transform!, _exactLocalCullRect!);
+        _exactGlobalCullRect = transform!.transformRect(_exactLocalCullRect!);
         return true;
       }());
     }
diff --git a/lib/web_ui/lib/src/engine/html/platform_view.dart b/lib/web_ui/lib/src/engine/html/platform_view.dart
index d35ec979952079d765e44122b796ee18fe2a0ada..4143c329f964d54da00770a47ef88f2b51632ea9 100644
--- a/lib/web_ui/lib/src/engine/html/platform_view.dart
+++ b/lib/web_ui/lib/src/engine/html/platform_view.dart
@@ -3,14 +3,21 @@
 // found in the LICENSE file.
 
 import '../dom.dart';
+import '../platform_dispatcher.dart';
 import '../platform_views/slots.dart';
+import '../window.dart';
 import 'surface.dart';
 
 /// A surface containing a platform view, which is an HTML element.
 class PersistedPlatformView extends PersistedLeafSurface {
-  PersistedPlatformView(this.viewId, this.dx, this.dy, this.width, this.height);
+  PersistedPlatformView(this.platformViewId, this.dx, this.dy, this.width, this.height) {
+    // Ensure platform view with `viewId` is injected into the `implicitView`
+    // before rendering its shadow DOM `slot`.
+    final EngineFlutterView implicitView = EnginePlatformDispatcher.instance.implicitView!;
+    implicitView.dom.injectPlatformView(platformViewId);
+  }
 
-  final int viewId;
+  final int platformViewId;
   final double dx;
   final double dy;
   final double width;
@@ -18,7 +25,7 @@ class PersistedPlatformView extends PersistedLeafSurface {
 
   @override
   DomElement createElement() {
-    return createPlatformViewSlot(viewId);
+    return createPlatformViewSlot(platformViewId);
   }
 
   @override
@@ -36,21 +43,21 @@ class PersistedPlatformView extends PersistedLeafSurface {
   bool canUpdateAsMatch(PersistedSurface oldSurface) {
     if (super.canUpdateAsMatch(oldSurface)) {
       // super checks the runtimeType of the surface, so we can just cast...
-      return viewId == ((oldSurface as PersistedPlatformView).viewId);
+      return platformViewId == ((oldSurface as PersistedPlatformView).platformViewId);
     }
     return false;
   }
 
   @override
   double matchForUpdate(PersistedPlatformView existingSurface) {
-    return existingSurface.viewId == viewId ? 0.0 : 1.0;
+    return existingSurface.platformViewId == platformViewId ? 0.0 : 1.0;
   }
 
   @override
   void update(PersistedPlatformView oldSurface) {
     assert(
-      viewId == oldSurface.viewId,
-      'PersistedPlatformView with different viewId should never be updated. Check the canUpdateAsMatch method.',
+      platformViewId == oldSurface.platformViewId,
+      'PersistedPlatformView with different platformViewId should never be updated. Check the canUpdateAsMatch method.',
     );
     super.update(oldSurface);
     // Only update if the view has been resized
diff --git a/lib/web_ui/lib/src/engine/html/recording_canvas.dart b/lib/web_ui/lib/src/engine/html/recording_canvas.dart
index 280ebbdc45bbab9ee78e30c0e515fa68b1c377f8..1494cf333d08528175afece31000e18ec0be04c0 100644
--- a/lib/web_ui/lib/src/engine/html/recording_canvas.dart
+++ b/lib/web_ui/lib/src/engine/html/recording_canvas.dart
@@ -55,9 +55,16 @@ class RecordingCanvas {
 
   /// In debug mode returns the list of recorded paint commands for testing.
   List<PaintCommand> get debugPaintCommands {
-    if (assertionsEnabled) {
-      return _commands;
+    List<PaintCommand>? result;
+    assert(() {
+      result = _commands;
+      return true;
+    }());
+
+    if (result != null) {
+      return result!;
     }
+
     throw UnsupportedError('For debugging only.');
   }
 
@@ -184,15 +191,17 @@ class RecordingCanvas {
 
   /// Prints recorded commands.
   String? debugPrintCommands() {
-    if (assertionsEnabled) {
+    String? result;
+    assert(() {
       final StringBuffer debugBuf = StringBuffer();
       for (int i = 0; i < _commands.length; i++) {
         final PaintCommand command = _commands[i];
         debugBuf.writeln('ctx.$command;');
       }
-      return debugBuf.toString();
-    }
-    return null;
+      result = debugBuf.toString();
+      return true;
+    }());
+    return result;
   }
 
   void save() {
@@ -281,7 +290,6 @@ class RecordingCanvas {
     switch (clipOp) {
       case ui.ClipOp.intersect:
         _paintBounds.clipRect(rect, command);
-        break;
       case ui.ClipOp.difference:
         // Since this refers to inverse, can't shrink paintBounds.
         break;
@@ -545,7 +553,7 @@ class RecordingCanvas {
       return;
     }
     final RecordingCanvas pictureRecording = enginePicture.recordingCanvas!;
-    if (pictureRecording._didDraw == true) {
+    if (pictureRecording._didDraw) {
       _didDraw = true;
     }
     renderStrategy.merge(pictureRecording.renderStrategy);
@@ -730,11 +738,12 @@ class PaintSave extends PaintCommand {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return 'save()';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = 'save()';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -748,11 +757,12 @@ class PaintRestore extends PaintCommand {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return 'restore()';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = 'restore()';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -769,11 +779,12 @@ class PaintTranslate extends PaintCommand {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return 'translate($dx, $dy)';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = 'translate($dx, $dy)';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -790,11 +801,12 @@ class PaintScale extends PaintCommand {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return 'scale($sx, $sy)';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = 'scale($sx, $sy)';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -810,11 +822,12 @@ class PaintRotate extends PaintCommand {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return 'rotate($radians)';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = 'rotate($radians)';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -830,11 +843,12 @@ class PaintTransform extends PaintCommand {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return 'transform(Matrix4.fromFloat32List(Float32List.fromList(<double>[${matrix4.join(', ')}])))';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = 'transform(Matrix4.fromFloat32List(Float32List.fromList(<double>[${matrix4.join(', ')}])))';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -851,11 +865,12 @@ class PaintSkew extends PaintCommand {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return 'skew($sx, $sy)';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = 'skew($sx, $sy)';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -872,11 +887,12 @@ class PaintClipRect extends DrawCommand {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return 'clipRect($rect)';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = 'clipRect($rect)';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -892,11 +908,12 @@ class PaintClipRRect extends DrawCommand {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return 'clipRRect($rrect)';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = 'clipRRect($rrect)';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -912,11 +929,12 @@ class PaintClipPath extends DrawCommand {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return 'clipPath($path)';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = 'clipPath($path)';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -933,11 +951,12 @@ class PaintDrawColor extends DrawCommand {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return 'drawColor($color, $blendMode)';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = 'drawColor($color, $blendMode)';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -955,11 +974,12 @@ class PaintDrawLine extends DrawCommand {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return 'drawLine($p1, $p2, $paint)';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = 'drawLine($p1, $p2, $paint)';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -975,11 +995,12 @@ class PaintDrawPaint extends DrawCommand {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return 'drawPaint($paint)';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = 'drawPaint($paint)';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -997,11 +1018,12 @@ class PaintDrawVertices extends DrawCommand {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return 'drawVertices($vertices, $blendMode, $paint)';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = 'drawVertices($vertices, $blendMode, $paint)';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -1019,11 +1041,12 @@ class PaintDrawPoints extends DrawCommand {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return 'drawPoints($pointMode, $points, $paint)';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = 'drawPoints($pointMode, $points, $paint)';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -1040,11 +1063,12 @@ class PaintDrawRect extends DrawCommand {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return 'drawRect($rect, $paint)';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = 'drawRect($rect, $paint)';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -1061,11 +1085,12 @@ class PaintDrawRRect extends DrawCommand {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return 'drawRRect($rrect, $paint)';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = 'drawRRect($rrect, $paint)';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -1091,11 +1116,12 @@ class PaintDrawDRRect extends DrawCommand {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return 'drawDRRect($outer, $inner, $paint)';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = 'drawDRRect($outer, $inner, $paint)';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -1112,11 +1138,12 @@ class PaintDrawOval extends DrawCommand {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return 'drawOval($rect, $paint)';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = 'drawOval($rect, $paint)';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -1134,11 +1161,12 @@ class PaintDrawCircle extends DrawCommand {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return 'drawCircle($c, $radius, $paint)';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = 'drawCircle($c, $radius, $paint)';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -1155,11 +1183,12 @@ class PaintDrawPath extends DrawCommand {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return 'drawPath($path, $paint)';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = 'drawPath($path, $paint)';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -1179,11 +1208,12 @@ class PaintDrawShadow extends DrawCommand {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return 'drawShadow($path, $color, $elevation, $transparentOccluder)';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = 'drawShadow($path, $color, $elevation, $transparentOccluder)';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -1201,11 +1231,12 @@ class PaintDrawImage extends DrawCommand {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return 'drawImage($image, $offset, $paint)';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = 'drawImage($image, $offset, $paint)';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -1224,11 +1255,12 @@ class PaintDrawImageRect extends DrawCommand {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return 'drawImageRect($image, $src, $dst, $paint)';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = 'drawImageRect($image, $src, $dst, $paint)';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -1245,11 +1277,12 @@ class PaintDrawParagraph extends DrawCommand {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return 'DrawParagraph(${paragraph.plainText}, $offset)';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = 'DrawParagraph(${paragraph.plainText}, $offset)';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -1277,11 +1310,12 @@ class Subpath {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return 'Subpath(${commands.join(', ')})';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = 'Subpath(${commands.join(', ')})';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -1318,11 +1352,12 @@ class MoveTo extends PathCommand {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return 'MoveTo($x, $y)';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = 'MoveTo($x, $y)';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -1345,11 +1380,12 @@ class LineTo extends PathCommand {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return 'LineTo($x, $y)';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = 'LineTo($x, $y)';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -1477,11 +1513,12 @@ class Ellipse extends PathCommand {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return 'Ellipse($x, $y, $radiusX, $radiusY)';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = 'Ellipse($x, $y, $radiusX, $radiusY)';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -1517,11 +1554,12 @@ class QuadraticCurveTo extends PathCommand {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return 'QuadraticCurveTo($x1, $y1, $x2, $y2)';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = 'QuadraticCurveTo($x1, $y1, $x2, $y2)';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -1561,11 +1599,12 @@ class BezierCurveTo extends PathCommand {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return 'BezierCurveTo($x1, $y1, $x2, $y2, $x3, $y3)';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = 'BezierCurveTo($x1, $y1, $x2, $y2, $x3, $y3)';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -1618,11 +1657,12 @@ class RectCommand extends PathCommand {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return 'Rect($x, $y, $width, $height)';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = 'Rect($x, $y, $width, $height)';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -1645,11 +1685,12 @@ class RRectCommand extends PathCommand {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return '$rrect';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = '$rrect';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -1666,11 +1707,12 @@ class CloseCommand extends PathCommand {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return 'Close()';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = 'Close()';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -1998,12 +2040,13 @@ class _PaintBounds {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
+    String result = super.toString();
+    assert(() {
       final ui.Rect bounds = computeBounds();
-      return '_PaintBounds($bounds of size ${bounds.size})';
-    } else {
-      return super.toString();
-    }
+      result = '_PaintBounds($bounds of size ${bounds.size})';
+      return true;
+    }());
+    return result;
   }
 }
 
diff --git a/lib/web_ui/lib/src/engine/html/render_vertices.dart b/lib/web_ui/lib/src/engine/html/render_vertices.dart
index 2b062f8f5f607f0e9da15456df20da15e6bca149..ca5d2acacf450dc83a069348bf816a0c4636331f 100644
--- a/lib/web_ui/lib/src/engine/html/render_vertices.dart
+++ b/lib/web_ui/lib/src/engine/html/render_vertices.dart
@@ -26,9 +26,7 @@ class SurfaceVertices implements ui.Vertices {
     List<ui.Offset> positions, {
     List<ui.Color>? colors,
     List<int>? indices,
-  })  : assert(mode != null),
-        assert(positions != null),
-        colors = colors != null ? _int32ListFromColors(colors) : null,
+  })  : colors = colors != null ? _int32ListFromColors(colors) : null,
         indices = indices != null ? Uint16List.fromList(indices) : null,
         positions = offsetListToFloat32List(positions) {
     initWebGl();
@@ -39,8 +37,7 @@ class SurfaceVertices implements ui.Vertices {
     this.positions, {
     this.colors,
     this.indices,
-  })  : assert(mode != null),
-        assert(positions != null) {
+  }) {
     initWebGl();
   }
 
@@ -67,10 +64,17 @@ class SurfaceVertices implements ui.Vertices {
 
   @override
   bool get debugDisposed {
-    if (assertionsEnabled) {
-      return _disposed;
+    bool? result;
+    assert(() {
+      result = _disposed;
+      return true;
+    }());
+
+    if (result != null) {
+      return result!;
     }
-    throw StateError('Vertices.debugDisposed is only avialalbe when asserts are enabled.');
+
+    throw StateError('Vertices.debugDisposed is only available when asserts are enabled.');
   }
 }
 
@@ -192,7 +196,6 @@ class _WebGlRenderer implements GlRenderer {
     //
     // Create buffer for vertex coordinates.
     final Object positionsBuffer = gl.createBuffer()!;
-    assert(positionsBuffer != null);
 
     Object? vao;
     if (imageShader != null) {
@@ -383,7 +386,6 @@ class _WebGlRenderer implements GlRenderer {
 
     // Setup geometry.
     final Object positionsBuffer = gl.createBuffer()!;
-    assert(positionsBuffer != null);
     gl.bindArrayBuffer(positionsBuffer);
     gl.bufferData(vertices, gl.kStaticDraw);
     // Point an attribute to the currently bound vertex buffer object.
@@ -458,7 +460,6 @@ class _WebGlRenderer implements GlRenderer {
   @override
   void drawHairline(
       DomCanvasRenderingContext2D? ctx, Float32List positions) {
-    assert(positions != null);
     final int pointCount = positions.length ~/ 2;
     ctx!.lineWidth = 1.0;
     ctx.beginPath();
@@ -472,10 +473,8 @@ class _WebGlRenderer implements GlRenderer {
         switch (triangleVertexIndex) {
           case 0:
             ctx.moveTo(dx, dy);
-            break;
           case 1:
             ctx.lineTo(dx, dy);
-            break;
           case 2:
             ctx.lineTo(dx, dy);
             ctx.closePath();
diff --git a/lib/web_ui/lib/src/engine/html/renderer.dart b/lib/web_ui/lib/src/engine/html/renderer.dart
index dd155f2fc0efbf3777f2c7a5a75d9574736996b4..b41fac37392342870f530216c02db90d9a477613 100644
--- a/lib/web_ui/lib/src/engine/html/renderer.dart
+++ b/lib/web_ui/lib/src/engine/html/renderer.dart
@@ -3,11 +3,13 @@
 // found in the LICENSE file.
 
 import 'dart:async';
+import 'dart:js_interop';
 import 'dart:math' as math;
 import 'dart:typed_data';
 
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
 class HtmlRenderer implements Renderer {
   static HtmlRenderer get instance => _instance;
@@ -18,8 +20,6 @@ class HtmlRenderer implements Renderer {
 
   late final HtmlFontCollection _fontCollection = HtmlFontCollection();
 
-  late FlutterViewEmbedder _viewEmbedder;
-
   @override
   HtmlFontCollection get fontCollection => _fontCollection;
 
@@ -35,11 +35,6 @@ class HtmlRenderer implements Renderer {
     _instance = this;
   }
 
-  @override
-  void reset(FlutterViewEmbedder embedder) {
-    _viewEmbedder = embedder;
-  }
-
   @override
   ui.Paint createPaint() => SurfacePaint();
 
@@ -91,8 +86,6 @@ class HtmlRenderer implements Renderer {
     List<double>? colorStops,
     ui.TileMode tileMode = ui.TileMode.clamp,
     Float32List? matrix4,
-    ui.Offset? focal,
-    double focalRadius = 0.0,
   ]) => GradientRadial(center, radius, colors, colorStops, tileMode, matrix4);
 
   @override
@@ -178,11 +171,9 @@ class HtmlRenderer implements Renderer {
   @override
   Future<ui.Codec> instantiateImageCodecFromUrl(
     Uri uri, {
-    WebOnlyImageCodecChunkCallback? chunkCallback}) {
-      return futurize<ui.Codec>((Callback<ui.Codec> callback) {
-        callback(HtmlCodec(uri.toString(), chunkCallback: chunkCallback));
-        return null;
-      });
+    ui_web.ImageCodecChunkCallback? chunkCallback,
+  }) async {
+    return HtmlCodec(uri.toString(), chunkCallback: chunkCallback);
   }
 
   @override
@@ -264,6 +255,7 @@ class HtmlRenderer implements Renderer {
     letterSpacing: letterSpacing,
     wordSpacing: wordSpacing,
     height: height,
+    leadingDistribution: leadingDistribution,
     locale: locale,
     background: background,
     foreground: foreground,
@@ -329,9 +321,13 @@ class HtmlRenderer implements Renderer {
     CanvasParagraphBuilder(style as EngineParagraphStyle);
 
   @override
-  void renderScene(ui.Scene scene) {
-    _viewEmbedder.addSceneToSceneHost((scene as SurfaceScene).webOnlyRootElement);
-    frameTimingsOnRasterFinish();
+  Future<void> renderScene(ui.Scene scene, ui.FlutterView view) async {
+    final EngineFlutterView implicitView = EnginePlatformDispatcher.instance.implicitView!;
+    scene as SurfaceScene;
+    implicitView.dom.setScene(scene.webOnlyRootElement!);
+    final FrameTimingRecorder? recorder = scene.timingRecorder;
+    recorder?.recordRasterFinish();
+    recorder?.submitTimings();
   }
 
   @override
@@ -341,4 +337,54 @@ class HtmlRenderer implements Renderer {
   Future<ui.FragmentProgram> createFragmentProgram(String assetKey) {
     return Future<HtmlFragmentProgram>.value(HtmlFragmentProgram());
   }
+
+  @override
+  ui.LineMetrics createLineMetrics({
+    required bool hardBreak,
+    required double ascent,
+    required double descent,
+    required double unscaledAscent,
+    required double height,
+    required double width,
+    required double left,
+    required double baseline,
+    required int lineNumber
+  }) => EngineLineMetrics(
+    hardBreak: hardBreak,
+    ascent: ascent,
+    descent: descent,
+    unscaledAscent: unscaledAscent,
+    height: height,
+    width: width,
+    left: left,
+    baseline: baseline,
+    lineNumber: lineNumber
+  );
+
+  @override
+  Future<ui.Image> createImageFromImageBitmap(DomImageBitmap imageSource) async {
+    final int width = imageSource.width.toDartInt;
+    final int height = imageSource.height.toDartInt;
+    final OffScreenCanvas canvas = OffScreenCanvas(width, height);
+    final DomCanvasRenderingContextBitmapRenderer context = canvas.getBitmapRendererContext()!;
+    context.transferFromImageBitmap(imageSource);
+    final DomHTMLImageElement imageElement = createDomHTMLImageElement();
+    late final DomEventListener loadListener;
+    late final DomEventListener errorListener;
+    final Completer<HtmlImage> completer = Completer<HtmlImage>();
+    loadListener = createDomEventListener((DomEvent event) {
+      completer.complete(HtmlImage(imageElement, width, height));
+      imageElement.removeEventListener('load', loadListener);
+      imageElement.removeEventListener('error', errorListener);
+    });
+    errorListener = createDomEventListener((DomEvent event) {
+      completer.completeError(Exception('Failed to create image from image bitmap.'));
+      imageElement.removeEventListener('load', loadListener);
+      imageElement.removeEventListener('error', errorListener);
+    });
+    imageElement.addEventListener('load', loadListener);
+    imageElement.addEventListener('error', errorListener);
+    imageElement.src = await canvas.toDataUrl();
+    return completer.future;
+  }
 }
diff --git a/lib/web_ui/lib/src/engine/html/resource_manager.dart b/lib/web_ui/lib/src/engine/html/resource_manager.dart
new file mode 100644
index 0000000000000000000000000000000000000000..879e8aadc2c665bcdf49150c47469e398a82795b
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/html/resource_manager.dart
@@ -0,0 +1,78 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import '../browser_detection.dart';
+import '../dom.dart';
+import '../view_embedder/dom_manager.dart';
+import '../window.dart';
+
+/// Manages global resources for the singleton Flutter Window in the HTML
+/// renderer.
+///
+/// It's used for resources that are referenced by CSS, such as svg filters.
+class ResourceManager {
+  ResourceManager(this._domManager);
+
+  final DomManager _domManager;
+
+  static const String resourcesHostTagName = 'flt-svg-filters';
+
+  static ResourceManager? _instance;
+  static ResourceManager get instance {
+    assert(_instance != null, 'ResourceManager has not been initialized.');
+    return _instance!;
+  }
+
+  /// A child element of body outside the shadowroot that hosts
+  /// global resources such svg filters and clip paths when using webkit.
+  DomElement? _resourcesHost;
+
+  /// Add an element as a global resource to be referenced by CSS.
+  ///
+  /// Creates a global resource host element on demand and either places it as
+  /// first element of body(webkit), or as a child of the implicit view element
+  /// for other browsers to make sure url resolution works correctly when
+  /// content is inside a shadow root.
+  void addResource(DomElement element) {
+    _getOrCreateResourcesHost().append(element);
+  }
+
+  DomElement _getOrCreateResourcesHost() {
+    if (_resourcesHost != null) {
+      return _resourcesHost!;
+    }
+
+    final DomElement resourcesHost = domDocument.createElement(resourcesHostTagName);
+    resourcesHost.style.visibility = 'hidden';
+    _resourcesHost = resourcesHost;
+
+    if (browserEngine == BrowserEngine.webkit) {
+      final DomElement rootElement = _domManager.rootElement;
+      // The resourcesHost *must* be a sibling of the rootElement.
+      rootElement.parent!.prepend(resourcesHost);
+    } else {
+      final DomShadowRoot renderingHost = _domManager.renderingHost;
+      renderingHost.prepend(resourcesHost);
+    }
+    return resourcesHost;
+  }
+
+  /// Removes a global resource element.
+  void removeResource(DomElement? element) {
+    if (element == null) {
+      return;
+    }
+    assert(element.parentNode == _resourcesHost);
+    element.remove();
+  }
+}
+
+/// Initializes the [ResourceManager.instance] singleton if it hasn't been
+/// initialized yet.
+void ensureResourceManagerInitialized(EngineFlutterWindow implicitView) {
+  if (ResourceManager._instance != null) {
+    return;
+  }
+  ResourceManager._instance = ResourceManager(implicitView.dom);
+}
diff --git a/lib/web_ui/lib/src/engine/html/scene.dart b/lib/web_ui/lib/src/engine/html/scene.dart
index 9beba6a4a65370ef897c895076c3b29eb566245b..b4deb9a6dac694e63da8e82f9a9579da1432e259 100644
--- a/lib/web_ui/lib/src/engine/html/scene.dart
+++ b/lib/web_ui/lib/src/engine/html/scene.dart
@@ -2,20 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
 
-import '../dom.dart';
-import '../vector_math.dart';
-import 'surface.dart';
-
 class SurfaceScene implements ui.Scene {
   /// This class is created by the engine, and should not be instantiated
   /// or extended directly.
   ///
   /// To create a Scene object, use a [SceneBuilder].
-  SurfaceScene(this.webOnlyRootElement);
+  SurfaceScene(this.webOnlyRootElement, {
+    required this.timingRecorder,
+  });
 
   final DomElement? webOnlyRootElement;
+  final FrameTimingRecorder? timingRecorder;
 
   /// Creates a raster image representation of the current state of the scene.
   /// This is a slow operation that is performed on a background thread.
@@ -44,13 +44,18 @@ class PersistedScene extends PersistedContainerSurface {
 
   @override
   void recomputeTransformAndClip() {
-    // The scene clip is the size of the entire window.
-    // TODO(yjbanov): in the add2app scenario where we might be hosted inside
-    //                a custom element, this will be different. We will need to
-    //                update this code when we add add2app support.
-    final double screenWidth = domWindow.innerWidth!;
-    final double screenHeight = domWindow.innerHeight!;
-    localClipBounds = ui.Rect.fromLTRB(0, 0, screenWidth, screenHeight);
+    // Must be the true DPR from the browser, nothing overridable.
+    // See: https://github.com/flutter/flutter/issues/143124
+    final double browserDpr = EngineFlutterDisplay.instance.browserDevicePixelRatio;
+    // The scene clip is the size of the entire window **in Logical pixels**.
+    //
+    // Even though the majority of the engine uses `physicalSize`, there are some
+    // bits (like the HTML renderer, or dynamic view sizing) that are implemented
+    // using CSS, and CSS operates in logical pixels.
+    //
+    // See also: [EngineFlutterView.resize].
+    final ui.Size bounds = window.physicalSize / browserDpr;
+    localClipBounds = ui.Rect.fromLTRB(0, 0, bounds.width, bounds.height);
     projectedClip = null;
   }
 
diff --git a/lib/web_ui/lib/src/engine/html/scene_builder.dart b/lib/web_ui/lib/src/engine/html/scene_builder.dart
index bd84aeaf9a992ba8bf0b6639eb0e55d891a9ee7d..701bb11ef92ad312943f73f53076410dd6e5541d 100644
--- a/lib/web_ui/lib/src/engine/html/scene_builder.dart
+++ b/lib/web_ui/lib/src/engine/html/scene_builder.dart
@@ -5,21 +5,21 @@
 import 'dart:typed_data';
 
 import 'package:ui/ui.dart' as ui;
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
-import '../../engine.dart' show kProfileApplyFrame, kProfilePrerollFrame;
+import '../../engine.dart' show FrameTimingRecorder, kProfileApplyFrame, kProfilePrerollFrame;
+import '../display.dart';
 import '../dom.dart';
 import '../picture.dart';
 import '../profiler.dart';
 import '../util.dart';
 import '../vector_math.dart';
-import '../window.dart';
 import 'backdrop_filter.dart';
 import 'clip.dart';
 import 'color_filter.dart';
 import 'image_filter.dart';
 import 'offset.dart';
 import 'opacity.dart';
-import 'path/path.dart';
 import 'path_to_svg_clip.dart';
 import 'picture.dart';
 import 'platform_view.dart';
@@ -64,9 +64,10 @@ class SurfaceSceneBuilder implements ui.SceneBuilder {
   ///
   /// This is used by tests.
   void debugAddSurface(PersistedSurface surface) {
-    if (assertionsEnabled) {
+    assert(() {
       _addSurface(surface);
-    }
+      return true;
+    }());
   }
 
   void _addSurface(PersistedSurface surface) {
@@ -106,15 +107,14 @@ class SurfaceSceneBuilder implements ui.SceneBuilder {
       throw ArgumentError('"matrix4" must have 16 entries.');
     }
 
-    // TODO(yjbanov): make this final after NNBD ships definite assignment.
-    /*final*/ Float32List? matrix;
+    final Float32List matrix;
     if (_surfaceStack.length == 1) {
       // Top level transform contains view configuration to scale
       // scene to devicepixelratio. Use identity instead since CSS uses
       // logical device pixels.
-      if (!ui.debugEmulateFlutterTesterEnvironment) {
-        assert(matrix4[0] == window.devicePixelRatio &&
-            matrix4[5] == window.devicePixelRatio);
+      if (!ui_web.debugEmulateFlutterTesterEnvironment) {
+        assert(matrix4[0] == EngineFlutterDisplay.instance.devicePixelRatio &&
+            matrix4[5] == EngineFlutterDisplay.instance.devicePixelRatio);
       }
       matrix = Matrix4.identity().storage;
     } else {
@@ -136,7 +136,6 @@ class SurfaceSceneBuilder implements ui.SceneBuilder {
     ui.Clip clipBehavior = ui.Clip.antiAlias,
     ui.ClipRectEngineLayer? oldLayer,
   }) {
-    assert(clipBehavior != null);
     return _pushSurface<PersistedClipRect>(
         PersistedClipRect(oldLayer as PersistedClipRect?, rect, clipBehavior));
   }
@@ -167,7 +166,6 @@ class SurfaceSceneBuilder implements ui.SceneBuilder {
     ui.Clip clipBehavior = ui.Clip.antiAlias,
     ui.ClipPathEngineLayer? oldLayer,
   }) {
-    assert(clipBehavior != null);
     return _pushSurface<PersistedClipPath>(
         PersistedClipPath(oldLayer as PersistedClipPath?, path, clipBehavior));
   }
@@ -205,7 +203,6 @@ class SurfaceSceneBuilder implements ui.SceneBuilder {
     ui.ColorFilter filter, {
     ui.ColorFilterEngineLayer? oldLayer,
   }) {
-    assert(filter != null);
     return _pushSurface<PersistedColorFilter>(
         PersistedColorFilter(oldLayer as PersistedColorFilter?, filter));
   }
@@ -226,7 +223,6 @@ class SurfaceSceneBuilder implements ui.SceneBuilder {
     ui.Offset offset = ui.Offset.zero,
     ui.ImageFilterEngineLayer? oldLayer,
   }) {
-    assert(filter != null);
     return _pushSurface<PersistedImageFilter>(
         PersistedImageFilter(oldLayer as PersistedImageFilter?, filter, offset));
   }
@@ -264,43 +260,11 @@ class SurfaceSceneBuilder implements ui.SceneBuilder {
     ui.ShaderMaskEngineLayer? oldLayer,
     ui.FilterQuality filterQuality = ui.FilterQuality.low,
   }) {
-    assert(blendMode != null);
     return _pushSurface<PersistedShaderMask>(PersistedShaderMask(
         oldLayer as PersistedShaderMask?,
         shader, maskRect, blendMode, filterQuality));
   }
 
-  /// Pushes a physical layer operation for an arbitrary shape onto the
-  /// operation stack.
-  ///
-  /// By default, the layer's content will not be clipped (clip = [Clip.none]).
-  /// If clip equals [Clip.hardEdge], [Clip.antiAlias], or [Clip.antiAliasWithSaveLayer],
-  /// then the content is clipped to the given shape defined by [path].
-  ///
-  /// If [elevation] is greater than 0.0, then a shadow is drawn around the layer.
-  /// [shadowColor] defines the color of the shadow if present and [color] defines the
-  /// color of the layer background.
-  ///
-  /// See [pop] for details about the operation stack, and [Clip] for different clip modes.
-  @override
-  ui.PhysicalShapeEngineLayer pushPhysicalShape({
-    required ui.Path path,
-    required double elevation,
-    required ui.Color color,
-    ui.Color? shadowColor,
-    ui.Clip clipBehavior = ui.Clip.none,
-    ui.PhysicalShapeEngineLayer? oldLayer,
-  }) {
-    return _pushSurface<PersistedPhysicalShape>(PersistedPhysicalShape(
-      oldLayer as PersistedPhysicalShape?,
-      path as SurfacePath,
-      elevation,
-      color.value,
-      shadowColor?.value ?? 0xFF000000,
-      clipBehavior,
-    ));
-  }
-
   /// Add a retained engine layer subtree from previous frames.
   ///
   /// All the engine layers that are in the subtree of the retained layer will
@@ -313,10 +277,10 @@ class SurfaceSceneBuilder implements ui.SceneBuilder {
   void addRetained(ui.EngineLayer retainedLayer) {
     final PersistedContainerSurface retainedSurface =
         retainedLayer as PersistedContainerSurface;
-    if (assertionsEnabled) {
-      assert(debugAssertSurfaceState(retainedSurface,
-          PersistedSurfaceState.active, PersistedSurfaceState.released));
-    }
+    assert(debugAssertSurfaceState(retainedSurface,
+      PersistedSurfaceState.active,
+      PersistedSurfaceState.released,
+    ));
     retainedSurface.tryRetain();
     _adoptSurface(retainedSurface);
   }
@@ -365,7 +329,7 @@ class SurfaceSceneBuilder implements ui.SceneBuilder {
   /// overlay or not.
   ///
   /// We use this to avoid spamming the console with redundant warning messages.
-  static bool _webOnlyDidWarnAboutPerformanceOverlay = false;
+  static bool _didWarnAboutPerformanceOverlay = false;
 
   void _addPerformanceOverlay(
     int enabledOptions,
@@ -374,8 +338,8 @@ class SurfaceSceneBuilder implements ui.SceneBuilder {
     double top,
     double bottom,
   ) {
-    if (!_webOnlyDidWarnAboutPerformanceOverlay) {
-      _webOnlyDidWarnAboutPerformanceOverlay = true;
+    if (!_didWarnAboutPerformanceOverlay) {
+      _didWarnAboutPerformanceOverlay = true;
       printWarning("The performance overlay isn't supported on the web");
     }
   }
@@ -420,7 +384,7 @@ class SurfaceSceneBuilder implements ui.SceneBuilder {
   void _addTexture(double dx, double dy, double width, double height,
       int textureId, ui.FilterQuality filterQuality) {
     // In test mode, allow this to be a no-op.
-    if (!ui.debugEmulateFlutterTesterEnvironment) {
+    if (!ui_web.debugEmulateFlutterTesterEnvironment) {
       throw UnimplementedError('Textures are not supported in Flutter Web');
     }
   }
@@ -547,8 +511,9 @@ class SurfaceSceneBuilder implements ui.SceneBuilder {
     // In the HTML renderer we time the beginning of the rasterization phase
     // (counter-intuitively) in SceneBuilder.build because DOM updates happen
     // here. This is different from CanvasKit.
-    frameTimingsOnBuildFinish();
-    frameTimingsOnRasterStart();
+    final FrameTimingRecorder? recorder = FrameTimingRecorder.frameTimingsEnabled ? FrameTimingRecorder() : null;
+    recorder?.recordBuildFinish();
+    recorder?.recordRasterStart();
     timeAction<void>(kProfilePrerollFrame, () {
       while (_surfaceStack.length > 1) {
         // Auto-pop layers that were pushed without a corresponding pop.
@@ -564,7 +529,7 @@ class SurfaceSceneBuilder implements ui.SceneBuilder {
       }
       commitScene(_persistedScene);
       _lastFrameScene = _persistedScene;
-      return SurfaceScene(_persistedScene.rootElement);
+      return SurfaceScene(_persistedScene.rootElement, timingRecorder: recorder);
     });
   }
 
diff --git a/lib/web_ui/lib/src/engine/html/shader_mask.dart b/lib/web_ui/lib/src/engine/html/shader_mask.dart
index 83988c294df09f8f3cc444218c2f35f0f4e1d152..743e2b82e2dab1d86d8e969eb9337b3dcc8a6007 100644
--- a/lib/web_ui/lib/src/engine/html/shader_mask.dart
+++ b/lib/web_ui/lib/src/engine/html/shader_mask.dart
@@ -6,9 +6,9 @@ import 'package:ui/ui.dart' as ui;
 
 import '../browser_detection.dart';
 import '../dom.dart';
-import '../embedder.dart';
 import 'bitmap_canvas.dart';
 import 'color_filter.dart';
+import 'resource_manager.dart';
 import 'shaders/shader.dart';
 import 'surface.dart';
 
@@ -56,7 +56,7 @@ class PersistedShaderMask extends PersistedContainerSurface
   @override
   void discard() {
     super.discard();
-    flutterViewEmbedder.removeResource(_shaderElement);
+    ResourceManager.instance.removeResource(_shaderElement);
     _shaderElement = null;
     // Do not detach the child container from the root. It is permanently
     // attached. The elements are reused together and are detached from the DOM
@@ -83,7 +83,7 @@ class PersistedShaderMask extends PersistedContainerSurface
 
   @override
   void apply() {
-    flutterViewEmbedder.removeResource(_shaderElement);
+    ResourceManager.instance.removeResource(_shaderElement);
     _shaderElement = null;
     if (shader is ui.Gradient) {
       rootElement!.style
@@ -132,7 +132,6 @@ class PersistedShaderMask extends PersistedContainerSurface
           // Since we don't have a size, we can't use background color.
           // Use svg filter srcIn instead.
           blendModeTemp = ui.BlendMode.srcIn;
-          break;
         case ui.BlendMode.src:
         case ui.BlendMode.dstOver:
         case ui.BlendMode.srcIn:
@@ -167,7 +166,7 @@ class PersistedShaderMask extends PersistedContainerSurface
       } else {
         rootElement!.style.filter = 'url(#${svgFilter.id})';
       }
-      flutterViewEmbedder.addResource(_shaderElement!);
+      ResourceManager.instance.addResource(_shaderElement!);
     }
   }
 
@@ -188,25 +187,19 @@ SvgFilter svgMaskFilterFromImageAndBlendMode(
   switch (blendMode) {
     case ui.BlendMode.src:
       svgFilter = _srcImageToSvg(imageUrl, width, height);
-      break;
     case ui.BlendMode.srcIn:
     case ui.BlendMode.srcATop:
       svgFilter = _srcInImageToSvg(imageUrl, width, height);
-      break;
     case ui.BlendMode.srcOut:
       svgFilter = _srcOutImageToSvg(imageUrl, width, height);
-      break;
     case ui.BlendMode.xor:
       svgFilter = _xorImageToSvg(imageUrl, width, height);
-      break;
     case ui.BlendMode.plus:
       // Porter duff source + destination.
       svgFilter = _compositeImageToSvg(imageUrl, 0, 1, 1, 0, width, height);
-      break;
     case ui.BlendMode.modulate:
       // Porter duff source * destination but preserves alpha.
       svgFilter = _modulateImageToSvg(imageUrl, width, height);
-      break;
     case ui.BlendMode.overlay:
       // Since overlay is the same as hard-light by swapping layers,
       // pass hard-light blend function.
@@ -217,7 +210,6 @@ SvgFilter svgMaskFilterFromImageAndBlendMode(
         height,
         swapLayers: true,
       );
-      break;
     // Several of the filters below (although supported) do not render the
     // same (close but not exact) as native flutter when used as blend mode
     // for a background-image with a background color. They only look
@@ -245,7 +237,6 @@ SvgFilter svgMaskFilterFromImageAndBlendMode(
     case ui.BlendMode.exclusion:
       svgFilter = _blendImageToSvg(
           imageUrl, blendModeToSvgEnum(blendMode)!, width, height);
-      break;
     case ui.BlendMode.dst:
     case ui.BlendMode.dstATop:
     case ui.BlendMode.dstIn:
diff --git a/lib/web_ui/lib/src/engine/html/shaders/image_shader.dart b/lib/web_ui/lib/src/engine/html/shaders/image_shader.dart
index 0caede789b3e7eb9f712b684e42fd3755793240c..59801155ad9a56e42007128f1433e753df7710aa 100644
--- a/lib/web_ui/lib/src/engine/html/shaders/image_shader.dart
+++ b/lib/web_ui/lib/src/engine/html/shaders/image_shader.dart
@@ -187,7 +187,6 @@ class EngineImageShader implements ui.ImageShader {
     ///
     /// Create buffer for vertex coordinates.
     final Object positionsBuffer = gl.createBuffer()!;
-    assert(positionsBuffer != null);
 
     Object? vao;
     if (isWebGl2) {
diff --git a/lib/web_ui/lib/src/engine/html/shaders/shader.dart b/lib/web_ui/lib/src/engine/html/shaders/shader.dart
index e438165383486ace2b98d8376a1756bfb2a0666f..826d3cace3cb01851db956dcb6c057e2e6d0decc 100644
--- a/lib/web_ui/lib/src/engine/html/shaders/shader.dart
+++ b/lib/web_ui/lib/src/engine/html/shaders/shader.dart
@@ -10,7 +10,6 @@ import 'package:ui/ui.dart' as ui;
 import '../../browser_detection.dart';
 import '../../color_filter.dart';
 import '../../dom.dart';
-import '../../embedder.dart';
 import '../../safe_browser_api.dart';
 import '../../util.dart';
 import '../../validators.dart';
@@ -18,6 +17,7 @@ import '../../vector_math.dart';
 import '../color_filter.dart';
 import '../path/path_utils.dart';
 import '../render_vertices.dart';
+import '../resource_manager.dart';
 import 'normalized_gradient.dart';
 import 'shader_builder.dart';
 import 'vertex_shaders.dart';
@@ -63,17 +63,15 @@ abstract class EngineGradient implements ui.Gradient {
 
   @override
   void dispose() {}
+
+  @override
+  String toString() => 'Gradient()';
 }
 
 class GradientSweep extends EngineGradient {
   GradientSweep(this.center, this.colors, this.colorStops, this.tileMode,
       this.startAngle, this.endAngle, this.matrix4)
       : assert(offsetIsValid(center)),
-        assert(colors != null),
-        assert(tileMode != null),
-        assert(startAngle != null),
-        assert(endAngle != null),
-        assert(startAngle < endAngle),
         super._() {
     validateColorStops(colors, colorStops);
   }
@@ -103,13 +101,23 @@ class GradientSweep extends EngineGradient {
     final double centerX = (center.dx - shaderBounds.left) / (shaderBounds.width);
     final double centerY = (center.dy - shaderBounds.top) / (shaderBounds.height);
     gl.setUniform2f(tileOffset, 2 * (shaderBounds.width * (centerX - 0.5)),
-        2 * (shaderBounds.height * (centerY - 0.5)));
+        2 * (shaderBounds.height * (0.5 - centerY)));
     final Object angleRange = gl.getUniformLocation(glProgram.program, 'angle_range');
     gl.setUniform2f(angleRange, startAngle, endAngle);
     normalizedGradient.setupUniforms(gl, glProgram);
+
     final Object gradientMatrix =
           gl.getUniformLocation(glProgram.program, 'm_gradient');
-    gl.setUniformMatrix4fv(gradientMatrix, false, matrix4 ?? Matrix4.identity().storage);
+    final Matrix4 gradientTransform = Matrix4.identity();
+    if (matrix4 != null) {
+      final Matrix4 m4 = Matrix4.zero()
+        ..copyInverse(Matrix4.fromFloat32List(matrix4!));
+      gradientTransform.translate(-center.dx, -center.dy);
+      gradientTransform.multiply(m4);
+      gradientTransform.translate(center.dx, center.dy);
+    }
+    gl.setUniformMatrix4fv(gradientMatrix, false, gradientTransform.storage);
+
     final Object result = () {
       if (createDataUrl) {
         return glRenderer!.drawRectToImageUrl(
@@ -154,7 +162,7 @@ class GradientSweep extends EngineGradient {
     // Sweep gradient
     method.addStatement('vec2 center = 0.5 * (u_resolution + u_tile_offset);');
     method.addStatement(
-        'vec4 localCoord = vec4(gl_FragCoord.x - center.x, center.y - gl_FragCoord.y, 0, 1) * m_gradient;');
+        'vec4 localCoord = m_gradient * vec4(gl_FragCoord.x - center.x, center.y - gl_FragCoord.y, 0, 1);');
     method.addStatement(
         'float angle = atan(-localCoord.y, -localCoord.x) + ${math.pi};');
     method.addStatement('float sweep = angle_range.y - angle_range.x;');
@@ -189,13 +197,13 @@ class GradientLinear extends EngineGradient {
     Float32List? matrix,
   )   : assert(offsetIsValid(from)),
         assert(offsetIsValid(to)),
-        assert(colors != null),
-        assert(tileMode != null),
         matrix4 = matrix == null ? null : FastMatrix32(matrix),
         super._() {
-    if (assertionsEnabled) {
+    // ignore: prefer_asserts_in_initializer_lists
+    assert(() {
       validateColorStops(colors, colorStops);
-    }
+      return true;
+    }());
   }
 
   final ui.Offset from;
@@ -322,14 +330,12 @@ class GradientLinear extends EngineGradient {
       // with flipped y axis.
       // We flip y axis, translate to center, multiply matrix and translate
       // and flip back so it is applied correctly.
-      final Matrix4 m4 = Matrix4.fromFloat32List(matrix4!.matrix);
-      gradientTransform.scale(1, -1);
-      gradientTransform.translate(
-          -shaderBounds.center.dx, -shaderBounds.center.dy);
+      final Matrix4 m4 = Matrix4.zero()
+        ..copyInverse(Matrix4.fromFloat32List(matrix4!.matrix));
+      final ui.Offset center = shaderBounds.center;
+      gradientTransform.translate(-center.dx, -center.dy);
       gradientTransform.multiply(m4);
-      gradientTransform.translate(
-          shaderBounds.center.dx, shaderBounds.center.dy);
-      gradientTransform.scale(1, -1);
+      gradientTransform.translate(center.dx, center.dy);
     }
 
     gradientTransform.multiply(rotationZ);
@@ -414,13 +420,13 @@ void _addColorStopsToCanvasGradient(DomCanvasGradient gradient,
   }
   if (colorStops == null) {
     assert(colors.length == 2);
-    gradient.addColorStop(offset, colorToCssString(colors[0])!);
-    gradient.addColorStop(1 - offset, colorToCssString(colors[1])!);
+    gradient.addColorStop(offset, colors[0].toCssString());
+    gradient.addColorStop(1 - offset, colors[1].toCssString());
   } else {
     for (int i = 0; i < colors.length; i++) {
       final double colorStop = colorStops[i].clamp(0.0, 1.0);
       gradient.addColorStop(
-          colorStop * scale + offset, colorToCssString(colors[i])!);
+          colorStop * scale + offset, colors[i].toCssString());
     }
   }
   if (isDecal) {
@@ -451,7 +457,6 @@ String _writeSharedGradientShader(ShaderBuilder builder, ShaderMethod method,
     case ui.TileMode.clamp:
       method.addStatement('float tiled_st = clamp(st, 0.0, 1.0);');
       probeName = 'tiled_st';
-      break;
     case ui.TileMode.decal:
       break;
     case ui.TileMode.repeated:
@@ -460,19 +465,23 @@ String _writeSharedGradientShader(ShaderBuilder builder, ShaderMethod method,
       // pattern center is at origin.
       method.addStatement('float tiled_st = fract(st);');
       probeName = 'tiled_st';
-      break;
     case ui.TileMode.mirror:
       method.addStatement('float t_1 = (st - 1.0);');
       method.addStatement(
           'float tiled_st = abs((t_1 - 2.0 * floor(t_1 * 0.5)) - 1.0);');
       probeName = 'tiled_st';
-      break;
   }
   writeUnrolledBinarySearch(method, 0, gradient.thresholdCount - 1,
       probe: probeName,
       sourcePrefix: 'threshold',
       biasName: 'bias',
       scaleName: 'scale');
+  if (tileMode == ui.TileMode.decal) {
+    method.addStatement('if (st < 0.0 || st > 1.0) {');
+    method.addStatement('  ${builder.fragmentColor.name} = vec4(0, 0, 0, 0);');
+    method.addStatement('  return;');
+    method.addStatement('}');
+  }
   return probeName;
 }
 
@@ -491,7 +500,7 @@ class GradientRadial extends EngineGradient {
   @override
   Object createPaintStyle(DomCanvasRenderingContext2D? ctx,
       ui.Rect? shaderBounds, double density) {
-    if (tileMode == ui.TileMode.clamp || tileMode == ui.TileMode.decal) {
+    if (matrix4 == null && (tileMode == ui.TileMode.clamp || tileMode == ui.TileMode.decal)) {
       return _createCanvasGradient(ctx, shaderBounds, density);
     } else {
       return _createGlGradient(ctx, shaderBounds, density);
@@ -541,15 +550,24 @@ class GradientRadial extends EngineGradient {
     final double centerX = (center.dx - shaderBounds.left) / (shaderBounds.width);
     final double centerY = (center.dy - shaderBounds.top) / (shaderBounds.height);
     gl.setUniform2f(tileOffset, 2 * (shaderBounds.width * (centerX - 0.5)),
-        2 * (shaderBounds.height * (centerY - 0.5)));
+        2 * (shaderBounds.height * (0.5 - centerY)));
     final Object radiusUniform = gl.getUniformLocation(glProgram.program, 'u_radius');
     gl.setUniform1f(radiusUniform, radius);
     normalizedGradient.setupUniforms(gl, glProgram);
 
     final Object gradientMatrix =
         gl.getUniformLocation(glProgram.program, 'm_gradient');
-    gl.setUniformMatrix4fv(gradientMatrix, false,
-        matrix4 == null ? Matrix4.identity().storage : matrix4!);
+
+    final Matrix4 gradientTransform = Matrix4.identity();
+
+    if (matrix4 != null) {
+      final Matrix4 m4 = Matrix4.zero()
+        ..copyInverse(Matrix4.fromFloat32List(matrix4!));
+      gradientTransform.translate(-center.dx, -center.dy);
+      gradientTransform.multiply(m4);
+      gradientTransform.translate(center.dx, center.dy);
+    }
+    gl.setUniformMatrix4fv(gradientMatrix, false, gradientTransform.storage);
 
     final Object result = () {
       if (createDataUrl) {
@@ -595,7 +613,7 @@ class GradientRadial extends EngineGradient {
     // Sweep gradient
     method.addStatement('vec2 center = 0.5 * (u_resolution + u_tile_offset);');
     method.addStatement(
-        'vec4 localCoord = vec4(gl_FragCoord.x - center.x, center.y - gl_FragCoord.y, 0, 1) * m_gradient;');
+        'vec4 localCoord = m_gradient * vec4(gl_FragCoord.x - center.x, center.y - gl_FragCoord.y, 0, 1);');
     method.addStatement('float dist = length(localCoord);');
     method.addStatement(
         'float st = abs(dist / u_radius);');
@@ -674,7 +692,7 @@ class GradientConical extends GradientRadial {
     // Sweep gradient
     method.addStatement('vec2 center = 0.5 * (u_resolution + u_tile_offset);');
     method.addStatement(
-        'vec4 localCoord = vec4(gl_FragCoord.x - center.x, center.y - gl_FragCoord.y, 0, 1) * m_gradient;');
+        'vec4 localCoord = m_gradient * vec4(gl_FragCoord.x - center.x, center.y - gl_FragCoord.y, 0, 1);');
     method.addStatement('float dist = length(localCoord);');
     final String f = (focalRadius /
             (math.min(shaderBounds.width, shaderBounds.height) / 2.0))
@@ -740,7 +758,7 @@ class _BlurEngineImageFilter extends EngineImageFilter {
 
   @override
   String toString() {
-    return 'ImageFilter.blur($sigmaX, $sigmaY, $tileMode)';
+    return 'ImageFilter.blur($sigmaX, $sigmaY, ${tileModeString(tileMode)})';
   }
 }
 
@@ -789,7 +807,7 @@ abstract class EngineHtmlColorFilter implements EngineImageFilter {
   @override
   String get transformAttribute => '';
 
-  /// Make an [SvgFilter] and add it as a globabl resource using [flutterViewEmbedder]
+  /// Make an [SvgFilter] and add it as a globabl resource using [ResourceManager]
   /// The [DomElement] from the made [SvgFilter] is returned so it can be managed
   /// by the surface calling it.
   DomElement? makeSvgFilter(DomElement? filterElement);
@@ -819,7 +837,6 @@ class ModeHtmlColorFilter extends EngineHtmlColorFilter {
         // Since we don't have a size, we can't use background color.
         // Use svg filter srcIn instead.
         blendMode = ui.BlendMode.srcIn;
-        break;
       case ui.BlendMode.dstOver:
       case ui.BlendMode.srcIn:
       case ui.BlendMode.srcATop:
@@ -846,13 +863,13 @@ class ModeHtmlColorFilter extends EngineHtmlColorFilter {
     }
 
     final SvgFilter svgFilter = svgFilterFromBlendMode(color, blendMode);
-    flutterViewEmbedder.addResource(svgFilter.element);
+    ResourceManager.instance.addResource(svgFilter.element);
     filterId = svgFilter.id;
 
     if (blendMode == ui.BlendMode.saturation ||
         blendMode == ui.BlendMode.multiply ||
         blendMode == ui.BlendMode.modulate) {
-          filterElement!.style.backgroundColor = colorToCssString(color)!;
+          filterElement!.style.backgroundColor = color.toCssString();
     }
     return svgFilter.element;
   }
@@ -866,7 +883,7 @@ class MatrixHtmlColorFilter extends EngineHtmlColorFilter {
   @override
   DomElement? makeSvgFilter(DomNode? filterElement) {
     final SvgFilter svgFilter = svgFilterFromColorMatrix(matrix);
-    flutterViewEmbedder.addResource(svgFilter.element);
+    ResourceManager.instance.addResource(svgFilter.element);
     filterId = svgFilter.id;
     return svgFilter.element;
   }
diff --git a/lib/web_ui/lib/src/engine/html/shaders/shader_builder.dart b/lib/web_ui/lib/src/engine/html/shaders/shader_builder.dart
index a1e49359a4f5a1bb2aaca67f27b97c2f4eb72ea9..6c971c0832449b44a0818c1cc1f24d0d630f5246 100644
--- a/lib/web_ui/lib/src/engine/html/shaders/shader_builder.dart
+++ b/lib/web_ui/lib/src/engine/html/shaders/shader_builder.dart
@@ -5,7 +5,6 @@
 import 'package:ui/ui.dart' as ui;
 
 import '../../browser_detection.dart';
-import '../../util.dart';
 
 /// Creates shader program for target webgl version.
 ///
@@ -132,17 +131,13 @@ class ShaderBuilder {
     switch (variable.storage) {
       case ShaderStorageQualifier.kConst:
         _buffer.write('const ');
-        break;
       case ShaderStorageQualifier.kAttribute:
         _buffer.write(isWebGl2 ? 'in '
             : _isFragmentShader ? 'varying ' : 'attribute ');
-        break;
       case ShaderStorageQualifier.kUniform:
         _buffer.write('uniform ');
-        break;
       case ShaderStorageQualifier.kVarying:
         _buffer.write(isWebGl2 ? 'out ' : 'varying ');
-        break;
     }
     _buffer.write('${typeToString(variable.dataType)} ${variable.name}');
     if (variable.storage == ShaderStorageQualifier.kConst) {
@@ -254,11 +249,12 @@ class ShaderMethod {
   }
 
   void addStatement(String statement) {
-    if (assertionsEnabled) {
-      _statements.add('  ' * _indentLevel + statement);
-    } else {
-      _statements.add(statement);
-    }
+    String itemToAdd = statement;
+    assert(() {
+      itemToAdd = '  ' * _indentLevel + statement;
+      return true;
+    }());
+    _statements.add(itemToAdd);
   }
 
   /// Adds statements to compute tiling in 0..1 coordinate space.
@@ -277,17 +273,14 @@ class ShaderMethod {
     switch(tileMode) {
       case ui.TileMode.repeated:
         addStatement('float $destination = fract($source);');
-        break;
       case ui.TileMode.mirror:
         addStatement('float $destination = ($source - 1.0);');
         addStatement(
             '$destination = '
             'abs(($destination - 2.0 * floor($destination * 0.5)) - 1.0);');
-        break;
       case ui.TileMode.clamp:
       case ui.TileMode.decal:
         addStatement('float $destination = $source;');
-        break;
     }
   }
 
diff --git a/lib/web_ui/lib/src/engine/html/shaders/vertex_shaders.dart b/lib/web_ui/lib/src/engine/html/shaders/vertex_shaders.dart
index b2dd353abcf8d47f2739b4e0fead26b6cb851948..bd9a5d78b6a8aee176a6786baef155f6af608ab4 100644
--- a/lib/web_ui/lib/src/engine/html/shaders/vertex_shaders.dart
+++ b/lib/web_ui/lib/src/engine/html/shaders/vertex_shaders.dart
@@ -10,11 +10,7 @@ import '../../browser_detection.dart';
 import 'shader_builder.dart';
 
 /// Provides common shaders used for gradients and drawVertices APIs.
-abstract class VertexShaders {
-  // This class is not meant to be instantiated or extended; this constructor
-  // prevents instantiation and extension.
-  VertexShaders._();
-
+abstract final class VertexShaders {
   static final Uint16List vertexIndicesForRect =
       Uint16List.fromList(<int>[0, 1, 2, 2, 3, 0]);
 
@@ -73,11 +69,7 @@ abstract class VertexShaders {
   }
 }
 
-abstract class FragmentShaders {
-  // This class is not meant to be instantiated or extended; this constructor
-  // prevents instantiation and extension.
-  FragmentShaders._();
-
+abstract final class FragmentShaders {
   static String writeTextureFragmentShader(
       bool isWebGl2, ui.TileMode? tileModeX, ui.TileMode? tileModeY) {
     final ShaderBuilder builder = ShaderBuilder.fragment(webGLVersion);
diff --git a/lib/web_ui/lib/src/engine/html/surface.dart b/lib/web_ui/lib/src/engine/html/surface.dart
index 15cc063c14597a8b834d1572fd50cc5ea663a3c0..cd76aff0c7d30d3ccd8326fafffa8764822c8cfc 100644
--- a/lib/web_ui/lib/src/engine/html/surface.dart
+++ b/lib/web_ui/lib/src/engine/html/surface.dart
@@ -166,10 +166,12 @@ class PersistedSurfaceException implements Exception {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return '${surface.runtimeType}: $message';
-    }
-    return super.toString();
+    String result = super.toString();
+    assert(() {
+      result = '${surface.runtimeType}: $message';
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -223,7 +225,6 @@ abstract class PersistedSurface implements ui.EngineLayer {
   /// surface.
   PersistedSurfaceState get state => _state;
   set state(PersistedSurfaceState newState) {
-    assert(newState != null);
     assert(newState != _state,
         'Attempted to set state that the surface is already in. This likely indicates a bug in the compositor.');
     assert(_debugValidateStateTransition(newState));
@@ -357,7 +358,7 @@ abstract class PersistedSurface implements ui.EngineLayer {
   /// such as on the very first frame.
   @mustCallSuper
   void build() {
-    if (assertionsEnabled) {
+    assert(() {
       final DomElement? existingElement = rootElement;
       if (existingElement != null) {
         throw PersistedSurfaceException(
@@ -366,7 +367,8 @@ abstract class PersistedSurface implements ui.EngineLayer {
           'element ${existingElement.tagName}.',
         );
       }
-    }
+      return true;
+    }());
     assert(debugAssertSurfaceState(this, PersistedSurfaceState.created));
     rootElement = createElement();
     assert(rootElement != null);
@@ -414,7 +416,6 @@ abstract class PersistedSurface implements ui.EngineLayer {
   /// creates a new element by calling [build].
   @mustCallSuper
   void update(covariant PersistedSurface oldSurface) {
-    assert(oldSurface != null);
     assert(!identical(oldSurface, this));
     assert(debugAssertSurfaceState(this, PersistedSurfaceState.created));
     assert(debugAssertSurfaceState(oldSurface, PersistedSurfaceState.active,
@@ -422,9 +423,10 @@ abstract class PersistedSurface implements ui.EngineLayer {
 
     adoptElements(oldSurface);
 
-    if (assertionsEnabled) {
+    assert(() {
       rootElement!.setAttribute('flt-layer-state', 'updated');
-    }
+      return true;
+    }());
     state = PersistedSurfaceState.active;
     assert(rootElement != null);
   }
@@ -446,9 +448,10 @@ abstract class PersistedSurface implements ui.EngineLayer {
       // this surface's DOM elements.
       retainedSurfaces.add(this);
     }
-    if (assertionsEnabled) {
+    assert(() {
       rootElement!.setAttribute('flt-layer-state', 'retained');
-    }
+      return true;
+    }());
     if (debugExplainSurfaceStats) {
       surfaceStatsFor(this).retainSurfaceCount++;
     }
@@ -505,9 +508,10 @@ abstract class PersistedSurface implements ui.EngineLayer {
   DomElement defaultCreateElement(String tagName) {
     final DomElement element = createDomElement(tagName);
     element.style.position = 'absolute';
-    if (assertionsEnabled) {
+    assert(() {
       element.setAttribute('flt-layer-state', 'new');
-    }
+      return true;
+    }());
     return element;
   }
 
@@ -597,13 +601,14 @@ abstract class PersistedSurface implements ui.EngineLayer {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
+    String result = super.toString();
+    assert(() {
       final StringBuffer log = StringBuffer();
       debugPrint(log, 0);
-      return log.toString();
-    } else {
-      return super.toString();
-    }
+      result = log.toString();
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -722,9 +727,10 @@ abstract class PersistedContainerSurface extends PersistedSurface {
       _updateManyToMany(oldSurface);
     }
 
-    if (assertionsEnabled) {
+    assert(() {
       _debugValidateContainerUpdate(oldSurface);
-    }
+      return true;
+    }());
   }
 
   // Children should override if they are performing clipping.
@@ -1049,7 +1055,6 @@ abstract class PersistedContainerSurface extends PersistedSurface {
       final PersistedSurface child = _children[i];
       final DomHTMLElement childElement =
           child.rootElement! as DomHTMLElement;
-      assert(childElement != null);
       if (!isStationary) {
         if (refNode == null) {
           containerElement!.append(childElement);
@@ -1215,11 +1220,12 @@ class _PersistedSurfaceMatch {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return '_PersistedSurfaceMatch(${newChild!.runtimeType}#${newChild!.hashCode}: $oldChildIndex, quality: $matchQuality)';
-    } else {
-      return super.toString();
-    }
+    String result = super.toString();
+    assert(() {
+      result = '_PersistedSurfaceMatch(${newChild!.runtimeType}#${newChild!.hashCode}: $oldChildIndex, quality: $matchQuality)';
+      return true;
+    }());
+    return result;
   }
 }
 
diff --git a/lib/web_ui/lib/src/engine/html/surface_stats.dart b/lib/web_ui/lib/src/engine/html/surface_stats.dart
index 841c318c441ed0671e684273215cdcede18d7a0c..62c284f67c4cf55cd752a0d73bf05e9ea54c1f2f 100644
--- a/lib/web_ui/lib/src/engine/html/surface_stats.dart
+++ b/lib/web_ui/lib/src/engine/html/surface_stats.dart
@@ -4,8 +4,8 @@
 
 import 'dart:async';
 
+import '../display.dart';
 import '../dom.dart';
-import '../platform_dispatcher.dart';
 import 'bitmap_canvas.dart';
 import 'dom_canvas.dart';
 import 'picture.dart';
@@ -131,9 +131,9 @@ void debugRepaintSurfaceStatsOverlay(PersistedScene scene) {
     ..fill();
 
   final double physicalScreenWidth =
-      domWindow.innerWidth! * EnginePlatformDispatcher.browserDevicePixelRatio;
+      domWindow.innerWidth! * EngineFlutterDisplay.instance.browserDevicePixelRatio;
   final double physicalScreenHeight =
-      domWindow.innerHeight! * EnginePlatformDispatcher.browserDevicePixelRatio;
+      domWindow.innerHeight! * EngineFlutterDisplay.instance.browserDevicePixelRatio;
   final double physicsScreenPixelCount =
       physicalScreenWidth * physicalScreenHeight;
 
@@ -237,7 +237,6 @@ void debugPrintSurfaceStats(PersistedScene scene, int frameNumber) {
 
   void countReusesRecursively(PersistedSurface surface) {
     final DebugSurfaceStats stats = surfaceStatsFor(surface);
-    assert(stats != null);
 
     surfaceRetainCount += stats.retainSurfaceCount;
     elementReuseCount += stats.reuseElementCount;
@@ -301,9 +300,9 @@ void debugPrintSurfaceStats(PersistedScene scene, int frameNumber) {
       return pixels;
     }).fold(0, (int total, int pixels) => total + pixels);
     final double physicalScreenWidth =
-        domWindow.innerWidth! * EnginePlatformDispatcher.browserDevicePixelRatio;
+        domWindow.innerWidth! * EngineFlutterDisplay.instance.browserDevicePixelRatio;
     final double physicalScreenHeight =
-        domWindow.innerHeight! * EnginePlatformDispatcher.browserDevicePixelRatio;
+        domWindow.innerHeight! * EngineFlutterDisplay.instance.browserDevicePixelRatio;
     final double physicsScreenPixelCount =
         physicalScreenWidth * physicalScreenHeight;
     final double screenPixelRatio = pixelCount / physicsScreenPixelCount;
diff --git a/lib/web_ui/lib/src/engine/html_image_codec.dart b/lib/web_ui/lib/src/engine/html_image_codec.dart
index d5db33fcbffc1625671e9cb2736f0cf296231e5c..e5cdad6b7b30965c05417cfa6e5bd7aaa43a38bd 100644
--- a/lib/web_ui/lib/src/engine/html_image_codec.dart
+++ b/lib/web_ui/lib/src/engine/html_image_codec.dart
@@ -6,11 +6,11 @@ import 'dart:async';
 import 'dart:typed_data';
 
 import 'package:ui/ui.dart' as ui;
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
 import 'browser_detection.dart';
 import 'dom.dart';
 import 'safe_browser_api.dart';
-import 'util.dart';
 
 Object? get _jsImageDecodeFunction => getJsProperty<Object?>(
   getJsProperty<Object>(
@@ -21,14 +21,15 @@ Object? get _jsImageDecodeFunction => getJsProperty<Object?>(
 );
 final bool _supportsDecode = _jsImageDecodeFunction != null;
 
-typedef WebOnlyImageCodecChunkCallback = void Function(
-    int cumulativeBytesLoaded, int expectedTotalBytes);
+// TODO(mdebbar): Deprecate this and remove it.
+// https://github.com/flutter/flutter/issues/127395
+typedef WebOnlyImageCodecChunkCallback = ui_web.ImageCodecChunkCallback;
 
 class HtmlCodec implements ui.Codec {
   HtmlCodec(this.src, {this.chunkCallback});
 
   final String src;
-  final WebOnlyImageCodecChunkCallback? chunkCallback;
+  final ui_web.ImageCodecChunkCallback? chunkCallback;
 
   @override
   int get frameCount => 1;
@@ -87,7 +88,7 @@ class HtmlCodec implements ui.Codec {
     // on the main thread, and may cause dropped framed.
     late DomEventListener errorListener;
     DomEventListener? loadListener;
-    errorListener = allowInterop((DomEvent event) {
+    errorListener = createDomEventListener((DomEvent event) {
       if (loadListener != null) {
         imgElement.removeEventListener('load', loadListener);
       }
@@ -95,7 +96,7 @@ class HtmlCodec implements ui.Codec {
       completer.completeError(event);
     });
     imgElement.addEventListener('error', errorListener);
-    loadListener = allowInterop((DomEvent event) {
+    loadListener = createDomEventListener((DomEvent event) {
       if (chunkCallback != null) {
         chunkCallback!(100, 100);
       }
@@ -151,17 +152,25 @@ class HtmlImage implements ui.Image {
     ui.Image.onDispose?.call(this);
     // Do nothing. The codec that owns this image should take care of
     // releasing the object url.
-    if (assertionsEnabled) {
+    assert(() {
       _disposed = true;
-    }
+      return true;
+    }());
   }
 
   @override
   bool get debugDisposed {
-    if (assertionsEnabled) {
-      return _disposed;
+    bool? result;
+    assert(() {
+      result = _disposed;
+      return true;
+    }());
+
+    if (result != null) {
+      return result!;
     }
-    return throw StateError('Image.debugDisposed is only available when asserts are enabled.');
+
+    throw StateError('Image.debugDisposed is only available when asserts are enabled.');
   }
 
 
@@ -204,6 +213,9 @@ class HtmlImage implements ui.Image {
     }
   }
 
+  @override
+  ui.ColorSpace get colorSpace => ui.ColorSpace.sRGB;
+
   DomHTMLImageElement cloneImageElement() {
     if (!_didClone) {
       _didClone = true;
diff --git a/lib/web_ui/lib/src/engine/image_decoder.dart b/lib/web_ui/lib/src/engine/image_decoder.dart
new file mode 100644
index 0000000000000000000000000000000000000000..a6e3bbd5246810b6daf6c93695b9b0c57eaf6d5e
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/image_decoder.dart
@@ -0,0 +1,442 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:js_interop';
+import 'dart:typed_data';
+
+import 'package:meta/meta.dart';
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui;
+
+Duration _kDefaultWebDecoderExpireDuration = const Duration(seconds: 3);
+Duration _kWebDecoderExpireDuration = _kDefaultWebDecoderExpireDuration;
+
+/// Overrides the inactivity duration after which the web decoder is closed.
+///
+/// This should only be used in tests.
+void debugOverrideWebDecoderExpireDuration(Duration override) {
+  _kWebDecoderExpireDuration = override;
+}
+
+/// Restores the web decoder inactivity expiry duration to its original value.
+///
+/// This should only be used in tests.
+void debugRestoreWebDecoderExpireDuration() {
+  _kWebDecoderExpireDuration = _kDefaultWebDecoderExpireDuration;
+}
+
+/// Image decoder backed by the browser's `ImageDecoder`.
+abstract class BrowserImageDecoder implements ui.Codec {
+  BrowserImageDecoder({
+    required this.contentType,
+    required this.dataSource,
+    required this.debugSource,
+  });
+
+  final String contentType;
+  final JSAny dataSource;
+  final String debugSource;
+
+  @override
+  late int frameCount;
+
+  @override
+  late int repetitionCount;
+
+  /// Whether this decoder has been disposed of.
+  ///
+  /// Once this turns true it stays true forever, and this decoder becomes
+  /// unusable.
+  bool _isDisposed = false;
+
+  @override
+  void dispose() {
+    _isDisposed = true;
+
+    // This releases all resources, including any currently running decoding work.
+    _cachedWebDecoder?.close();
+    _cachedWebDecoder = null;
+  }
+
+  void _debugCheckNotDisposed() {
+    assert(
+      !_isDisposed,
+      'Cannot use this image decoder. It has been disposed of.'
+    );
+  }
+
+  /// The index of the frame that will be decoded on the next call of [getNextFrame];
+  int _nextFrameIndex = 0;
+
+  /// Creating a new decoder is expensive, so we cache the decoder for reuse.
+  ///
+  /// This decoder is closed and the field is nulled out after some time of
+  /// inactivity.
+  ///
+  // TODO(jacksongardner): Evaluate whether this complexity is necessary.
+  // See https://github.com/flutter/flutter/issues/127548
+  ImageDecoder? _cachedWebDecoder;
+
+  /// The underlying image decoder used to decode images.
+  ///
+  /// This value is volatile. It may be closed or become null any time.
+  ///
+  ///
+  /// This is only meant to be used in tests.
+  @visibleForTesting
+  ImageDecoder? get debugCachedWebDecoder => _cachedWebDecoder;
+
+  final AlarmClock _cacheExpirationClock = AlarmClock(() => DateTime.now());
+
+  Future<void> initialize() => _getOrCreateWebDecoder();
+
+  Future<ImageDecoder> _getOrCreateWebDecoder() async {
+    if (_cachedWebDecoder != null) {
+      // Give the cached value some time for reuse, e.g. if the image is
+      // currently animating.
+      _cacheExpirationClock.datetime = DateTime.now().add(_kWebDecoderExpireDuration);
+      return _cachedWebDecoder!;
+    }
+
+    // Null out the callback so the clock doesn't try to expire the decoder
+    // while it's initializing. There's no way to tell how long the
+    // initialization will take place. We just let it proceed at its own pace.
+    _cacheExpirationClock.callback = null;
+    try {
+      final ImageDecoder webDecoder = ImageDecoder(ImageDecoderOptions(
+        type: contentType.toJS,
+        data: dataSource,
+
+        // Flutter always uses premultiplied alpha when decoding.
+        premultiplyAlpha: 'premultiply'.toJS,
+        // "default" gives the browser the liberty to convert to display-appropriate
+        // color space, typically SRGB, which is what we want.
+        colorSpaceConversion: 'default'.toJS,
+
+        // Flutter doesn't give the developer a way to customize this, so if this
+        // is an animated image we should prefer the animated track.
+        preferAnimation: true.toJS,
+      ));
+
+      await promiseToFuture<void>(webDecoder.tracks.ready);
+
+      // Flutter doesn't have an API for progressive loading of images, so we
+      // wait until the image is fully decoded.
+      // package:js bindings don't work with getters that return a Promise, which
+      // is why js_util is used instead.
+      await promiseToFuture<void>(getJsProperty(webDecoder, 'completed'));
+      frameCount = webDecoder.tracks.selectedTrack!.frameCount.toInt();
+
+      // We coerce the DOM's `repetitionCount` into an int by explicitly
+      // handling `infinity`. Note: This will still throw if the DOM returns a
+      // `NaN`.
+      final double rawRepetitionCount = webDecoder.tracks.selectedTrack!.repetitionCount;
+      repetitionCount = rawRepetitionCount == double.infinity ? -1 :
+          rawRepetitionCount.toInt();
+      _cachedWebDecoder = webDecoder;
+
+      // Expire the decoder if it's not used for several seconds. If the image is
+      // not animated, it could mean that the framework has cached the frame and
+      // therefore doesn't need the decoder any more, or it could mean that the
+      // widget is gone and it's time to collect resources associated with it.
+      // If it's an animated image it means the animation has stopped, otherwise
+      // we'd see calls to [getNextFrame] which would update the expiry date on
+      // the decoder. If the animation is stopped for long enough, it's better
+      // to collect resources. If and when the animation resumes, a new decoder
+      // will be instantiated.
+      _cacheExpirationClock.callback = () {
+        _cachedWebDecoder?.close();
+        _cachedWebDecoder = null;
+        _cacheExpirationClock.callback = null;
+      };
+      _cacheExpirationClock.datetime = DateTime.now().add(_kWebDecoderExpireDuration);
+
+      return webDecoder;
+    } catch (error) {
+      if (domInstanceOfString(error, 'DOMException')) {
+        if ((error as DomException).name == DomException.notSupported) {
+          throw ImageCodecException(
+            "Image file format ($contentType) is not supported by this browser's ImageDecoder API.\n"
+            'Image source: $debugSource',
+          );
+        }
+      }
+      throw ImageCodecException(
+        "Failed to decode image using the browser's ImageDecoder API.\n"
+        'Image source: $debugSource\n'
+        'Original browser error: $error'
+      );
+    }
+  }
+
+  @override
+  Future<ui.FrameInfo> getNextFrame() async {
+    _debugCheckNotDisposed();
+    final ImageDecoder webDecoder = await _getOrCreateWebDecoder();
+    final DecodeResult result = await promiseToFuture<DecodeResult>(
+      webDecoder.decode(DecodeOptions(frameIndex: _nextFrameIndex.toJS)),
+    );
+    final VideoFrame frame = result.image;
+    _nextFrameIndex = (_nextFrameIndex + 1) % frameCount;
+
+    // Duration can be null if the image is not animated. However, Flutter
+    // requires a non-null value. 0 indicates that the frame is meant to be
+    // displayed indefinitely, which is fine for a static image.
+    final Duration duration = Duration(microseconds: frame.duration?.toInt() ?? 0);
+    final ui.Image image = generateImageFromVideoFrame(frame);
+    return AnimatedImageFrameInfo(duration, image);
+  }
+
+  ui.Image generateImageFromVideoFrame(VideoFrame frame);
+}
+
+/// Data for a single frame of an animated image.
+class AnimatedImageFrameInfo implements ui.FrameInfo {
+  AnimatedImageFrameInfo(this.duration, this.image);
+
+  @override
+  final Duration duration;
+
+  @override
+  final ui.Image image;
+}
+
+/// Detects the image file format and returns the corresponding "Content-Type"
+/// value (a.k.a. MIME type).
+///
+/// The returned value can be passed to `ImageDecoder` when decoding an image.
+///
+/// Returns null if [data] cannot be mapped to a known content type.
+String? detectContentType(Uint8List data) {
+  if (debugContentTypeDetector != null) {
+    return debugContentTypeDetector!.call(data);
+  }
+
+  formatLoop: for (final ImageFileFormat format in ImageFileFormat.values) {
+    if (data.length < format.header.length) {
+      continue;
+    }
+
+    for (int i = 0; i < format.header.length; i++) {
+      final int? magicByte = format.header[i];
+      if (magicByte == null) {
+        // Wildcard, accepts everything.
+        continue;
+      }
+
+      final int headerByte = data[i];
+      if (headerByte != magicByte) {
+        continue formatLoop;
+      }
+    }
+
+    return format.contentType;
+  }
+
+  if (isAvif(data)) {
+    return 'image/avif';
+  }
+
+  return null;
+}
+
+/// Represents an image file format, such as PNG or JPEG.
+class ImageFileFormat {
+  const ImageFileFormat(this.header, this.contentType);
+
+  /// First few bytes in the file that uniquely identify the image file format.
+  ///
+  /// Null elements are treated as wildcard values and are not checked. This is
+  /// used to detect formats whose header is split up into multiple disjoint
+  /// parts, such that the first part is not unique enough to identify the
+  /// format. For example, without this, WebP may be confused with .ani
+  /// (animated cursor), .cda, and other formats that start with "RIFF".
+  final List<int?> header;
+
+  /// The value that's passed as [_ImageDecoderOptions.type].
+  ///
+  /// The server typically also uses this value as the "Content-Type" header,
+  /// but servers are not required to correctly detect the type. This value
+  /// is also known as MIME type.
+  final String contentType;
+
+  /// All image file formats known to the Flutter Web engine.
+  ///
+  /// This list may need to be changed as browsers adopt new formats, and drop
+  /// support for obsolete ones.
+  ///
+  /// This list is checked linearly from top to bottom when detecting an image
+  /// type. It should therefore contain the most popular file formats at the
+  /// top, and less popular towards the bottom.
+  static const List<ImageFileFormat> values = <ImageFileFormat>[
+    // ICO is not supported in Chrome. It is deemed too simple and too specific. See also:
+    //   https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/renderer/modules/webcodecs/image_decoder_external.cc;l=38;drc=fd8802b593110ea18a97ef044f8a40dd24a622ec
+
+    // PNG
+    ImageFileFormat(<int?>[0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A], 'image/png'),
+
+    // GIF87a
+    ImageFileFormat(<int?>[0x47, 0x49, 0x46, 0x38, 0x37, 0x61], 'image/gif'),
+
+    // GIF89a
+    ImageFileFormat(<int?>[0x47, 0x49, 0x46, 0x38, 0x39, 0x61], 'image/gif'),
+
+    // JPEG
+    ImageFileFormat(<int?>[0xFF, 0xD8, 0xFF], 'image/jpeg'),
+
+    // WebP
+    ImageFileFormat(<int?>[0x52, 0x49, 0x46, 0x46, null, null, null, null, 0x57, 0x45, 0x42, 0x50], 'image/webp'),
+
+    // BMP
+    ImageFileFormat(<int?>[0x42, 0x4D], 'image/bmp'),
+  ];
+}
+
+/// Function signature of [debugContentTypeDetector], which is the same as the
+/// signature of [detectContentType].
+typedef DebugContentTypeDetector = String? Function(Uint8List);
+
+/// If not null, replaces the functionality of [detectContentType] with its own.
+///
+/// This is useful in tests, for example, to test unsupported content types.
+DebugContentTypeDetector? debugContentTypeDetector;
+
+/// A string of bytes that every AVIF image contains somehwere in its first 16
+/// bytes.
+///
+/// This signature is necessary but not sufficient, which may lead to false
+/// positives. For example, the file may be HEIC or a video. This is OK,
+/// because in the worst case, the image decoder fails to decode the file.
+/// This is something we must anticipate regardless of this detection logic.
+/// The codec must already protect itself from downloaded files lying about
+/// their contents.
+///
+/// The alternative would be to implement a more precise detection, which would
+/// add complexity and code size. This is how Chromium does it:
+///
+/// https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/renderer/platform/image-decoders/avif/avif_image_decoder.cc;l=504;drc=fd8802b593110ea18a97ef044f8a40dd24a622ec
+final List<int> _avifSignature = 'ftyp'.codeUnits;
+
+/// Optimistically detects whether [data] is an AVIF image file.
+bool isAvif(Uint8List data) {
+  firstByteLoop: for (int i = 0; i < 16; i += 1) {
+    for (int j = 0; j < _avifSignature.length; j += 1) {
+      if (i + j >= data.length) {
+        // Reached EOF without finding the signature.
+        return false;
+      }
+      if (data[i + j] != _avifSignature[j]) {
+        continue firstByteLoop;
+      }
+    }
+    return true;
+  }
+  return false;
+}
+
+// Wraps another codec and resizes each output image.
+class ResizingCodec implements ui.Codec {
+  ResizingCodec(
+    this.delegate, {
+    this.targetWidth,
+    this.targetHeight,
+    this.allowUpscaling = true,
+  });
+
+  final ui.Codec delegate;
+  final int? targetWidth;
+  final int? targetHeight;
+  final bool allowUpscaling;
+
+  @override
+  void dispose() => delegate.dispose();
+
+  @override
+  int get frameCount => delegate.frameCount;
+
+  @override
+  Future<ui.FrameInfo> getNextFrame() async {
+    final ui.FrameInfo frameInfo = await delegate.getNextFrame();
+    return AnimatedImageFrameInfo(
+      frameInfo.duration,
+      scaleImageIfNeeded(
+        frameInfo.image,
+        targetWidth: targetWidth,
+        targetHeight: targetHeight,
+        allowUpscaling: allowUpscaling
+      ),
+    );
+  }
+
+  @override
+  int get repetitionCount => delegate.frameCount;
+}
+
+ui.Size? _scaledSize(
+  int width,
+  int height,
+  int? targetWidth,
+  int? targetHeight,
+) {
+  if (targetWidth == width && targetHeight == height) {
+    // Not scaled
+    return null;
+  }
+  if (targetWidth == null) {
+    if (targetHeight == null || targetHeight == height) {
+      // Not scaled.
+      return null;
+    }
+    targetWidth = (width * targetHeight / height).round();
+  } else if (targetHeight == null) {
+    if (targetWidth == targetWidth) {
+      // Not scaled.
+      return null;
+    }
+    targetHeight = (height * targetWidth / width).round();
+  }
+  return ui.Size(targetWidth.toDouble(), targetHeight.toDouble());
+}
+
+ui.Image scaleImageIfNeeded(
+  ui.Image image, {
+  int? targetWidth,
+  int? targetHeight,
+  bool allowUpscaling = true,
+}) {
+  final int width = image.width;
+  final int height = image.height;
+  final ui.Size? scaledSize = _scaledSize(
+    width,
+    height,
+    targetWidth,
+    targetHeight
+  );
+  if (scaledSize == null) {
+    return image;
+  }
+  if (!allowUpscaling &&
+    (scaledSize.width > width || scaledSize.height > height)) {
+      return image;
+  }
+
+  final ui.Rect outputRect = ui.Rect.fromLTWH(0, 0, scaledSize.width, scaledSize.height);
+  final ui.PictureRecorder recorder = ui.PictureRecorder();
+  final ui.Canvas canvas = ui.Canvas(recorder, outputRect);
+
+  canvas.drawImageRect(
+    image,
+    ui.Rect.fromLTWH(0, 0, width.toDouble(), height.toDouble()),
+    outputRect,
+    ui.Paint(),
+  );
+  final ui.Picture picture = recorder.endRecording();
+  final ui.Image finalImage = picture.toImageSync(
+    scaledSize.width.round(),
+    scaledSize.height.round()
+  );
+  picture.dispose();
+  image.dispose();
+  return finalImage;
+}
diff --git a/lib/web_ui/lib/src/engine/initialization.dart b/lib/web_ui/lib/src/engine/initialization.dart
index d332523896cb9ae557769065973c76d9641732a3..745f8b2e84cf7d86152bcdf187d2994235a414c2 100644
--- a/lib/web_ui/lib/src/engine/initialization.dart
+++ b/lib/web_ui/lib/src/engine/initialization.dart
@@ -4,23 +4,12 @@
 
 import 'dart:async';
 import 'dart:developer' as developer;
+import 'dart:js_interop';
 
-import 'package:ui/src/engine/assets.dart';
-import 'package:ui/src/engine/browser_detection.dart';
-import 'package:ui/src/engine/configuration.dart';
-import 'package:ui/src/engine/embedder.dart';
-import 'package:ui/src/engine/mouse_cursor.dart';
-import 'package:ui/src/engine/navigation.dart';
-import 'package:ui/src/engine/platform_dispatcher.dart';
-import 'package:ui/src/engine/platform_views/content_manager.dart';
-import 'package:ui/src/engine/profiler.dart';
-import 'package:ui/src/engine/raw_keyboard.dart';
-import 'package:ui/src/engine/renderer.dart';
-import 'package:ui/src/engine/safe_browser_api.dart';
-import 'package:ui/src/engine/window.dart';
+import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
-
-import 'dom.dart';
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
+import 'package:web_test_fonts/web_test_fonts.dart';
 
 /// The mode the app is running in.
 /// Keep these in sync with the same constants on the framework-side under foundation/constants.dart.
@@ -61,19 +50,18 @@ void registerHotRestartListener(ui.VoidCallback listener) {
 /// such as removing static DOM listeners, prior to allowing the Dart runtime
 /// to re-initialize the program.
 void debugEmulateHotRestart() {
-  for (final ui.VoidCallback listener in _hotRestartListeners) {
-    listener();
+  // While hot restart listeners are executing, more listeners may be added. To
+  // avoid concurrent modification, the listeners are copies and emptied. If new
+  // listeners are added in the process, the loop will pick them up.
+  while (_hotRestartListeners.isNotEmpty) {
+    final List<ui.VoidCallback> copyOfListeners = _hotRestartListeners.toList();
+    _hotRestartListeners.clear();
+    for (final ui.VoidCallback listener in copyOfListeners) {
+      listener();
+    }
   }
 }
 
-/// Fully initializes the engine, including services and UI.
-Future<void> initializeEngine({
-  AssetManager? assetManager,
-}) async {
-  await initializeEngineServices(assetManager: assetManager);
-  await initializeEngineUi();
-}
-
 /// How far along the initialization process the engine is currently is.
 ///
 /// The initialization process starts with [none] and proceeds in increasing
@@ -126,7 +114,7 @@ void debugResetEngineInitializationState() {
 ///  * [initializeEngineUi], which is typically called after this function, and
 ///    puts UI elements on the page.
 Future<void> initializeEngineServices({
-  AssetManager? assetManager,
+  ui_web.AssetManager? assetManager,
   JsFlutterConfiguration? jsConfiguration
 }) async {
   if (_initializationState != DebugEngineInitializationState.uninitialized) {
@@ -144,10 +132,6 @@ Future<void> initializeEngineServices({
   // Store `jsConfiguration` so user settings are available to the engine.
   configuration.setUserConfiguration(jsConfiguration);
 
-  // Setup the hook that allows users to customize URL strategy before running
-  // the app.
-  _addUrlStrategyListener();
-
   // Called by the Web runtime just before hot restarting the app.
   //
   // This extension cleans up resources that are registered with browser's
@@ -173,8 +157,16 @@ Future<void> initializeEngineServices({
     // fires.
     if (!waitingForAnimation) {
       waitingForAnimation = true;
-      domWindow.requestAnimationFrame(allowInterop((num highResTime) {
-        frameTimingsOnVsync();
+      domWindow.requestAnimationFrame((JSNumber highResTime) {
+        FrameTimingRecorder.recordCurrentFrameVsync();
+
+        // In Flutter terminology "building a frame" consists of "beginning
+        // frame" and "drawing frame".
+        //
+        // We do not call `recordBuildFinish` from here because
+        // part of the rasterization process, particularly in the HTML
+        // renderer, takes place in the `SceneBuilder.build()`.
+        FrameTimingRecorder.recordCurrentFrameBuildStart();
 
         // Reset immediately, because `frameHandler` can schedule more frames.
         waitingForAnimation = false;
@@ -184,15 +176,9 @@ Future<void> initializeEngineServices({
         // milliseconds as a double value, with sub-millisecond information
         // hidden in the fraction. So we first multiply it by 1000 to uncover
         // microsecond precision, and only then convert to `int`.
-        final int highResTimeMicroseconds = (1000 * highResTime).toInt();
+        final int highResTimeMicroseconds =
+            (1000 * highResTime.toDartDouble).toInt();
 
-        // In Flutter terminology "building a frame" consists of "beginning
-        // frame" and "drawing frame".
-        //
-        // We do not call `frameTimingsOnBuildFinish` from here because
-        // part of the rasterization process, particularly in the HTML
-        // renderer, takes place in the `SceneBuilder.build()`.
-        frameTimingsOnBuildStart();
         if (EnginePlatformDispatcher.instance.onBeginFrame != null) {
           EnginePlatformDispatcher.instance.invokeOnBeginFrame(
               Duration(microseconds: highResTimeMicroseconds));
@@ -202,19 +188,19 @@ Future<void> initializeEngineServices({
           // TODO(yjbanov): technically Flutter flushes microtasks between
           //                onBeginFrame and onDrawFrame. We don't, which hasn't
           //                been an issue yet, but eventually we'll have to
-          //                implement it properly.
+          //                implement it properly. (Also see the to-do in
+          //                `EnginePlatformDispatcher.scheduleWarmUpFrame`).
           EnginePlatformDispatcher.instance.invokeOnDrawFrame();
         }
-      }));
+      });
     }
   };
 
-  assetManager ??= const AssetManager();
+  assetManager ??= ui_web.AssetManager(assetBase: configuration.assetBase);
   _setAssetManager(assetManager);
 
   Future<void> initializeRendererCallback () async => renderer.initialize();
   await Future.wait<void>(<Future<void>>[initializeRendererCallback(), _downloadAssetFonts()]);
-  renderer.fontCollection.registerDownloadedFonts();
   _initializationState = DebugEngineInitializationState.initializedServices;
 }
 
@@ -241,16 +227,25 @@ Future<void> initializeEngineUi() async {
   _initializationState = DebugEngineInitializationState.initializingUi;
 
   RawKeyboard.initialize(onMacOs: operatingSystem == OperatingSystem.macOs);
-  MouseCursor.initialize();
-  ensureFlutterViewEmbedderInitialized();
+  KeyboardBinding.initInstance();
+
+  if (!configuration.multiViewEnabled) {
+    final EngineFlutterWindow implicitView =
+        ensureImplicitViewInitialized(hostElement: configuration.hostElement);
+    if (renderer is HtmlRenderer) {
+      ensureResourceManagerInitialized(implicitView);
+    }
+  }
   _initializationState = DebugEngineInitializationState.initialized;
 }
 
-AssetManager get assetManager => _assetManager!;
-AssetManager? _assetManager;
+ui_web.AssetManager get engineAssetManager => _debugAssetManager ?? _assetManager!;
+ui_web.AssetManager? _assetManager;
+ui_web.AssetManager? _debugAssetManager;
 
-void _setAssetManager(AssetManager assetManager) {
-  assert(assetManager != null, 'Cannot set assetManager to null');
+set debugOnlyAssetManager(ui_web.AssetManager? manager) => _debugAssetManager = manager;
+
+void _setAssetManager(ui_web.AssetManager assetManager) {
   if (assetManager == _assetManager) {
     return;
   }
@@ -261,25 +256,20 @@ void _setAssetManager(AssetManager assetManager) {
 Future<void> _downloadAssetFonts() async {
   renderer.fontCollection.clear();
 
-  if (_assetManager != null) {
-    await renderer.fontCollection.downloadAssetFonts(_assetManager!);
+  if (ui_web.debugEmulateFlutterTesterEnvironment) {
+    // Load the embedded test font before loading fonts from the assets so that
+    // the embedded test font is the default (first) font.
+    await renderer.fontCollection.loadFontFromList(
+      EmbeddedTestFont.flutterTest.data,
+      fontFamily: EmbeddedTestFont.flutterTest.fontFamily
+    );
   }
 
-  if (ui.debugEmulateFlutterTesterEnvironment) {
-    await renderer.fontCollection.debugDownloadTestFonts();
+  if (_debugAssetManager != null || _assetManager != null) {
+    await renderer.fontCollection.loadAssetFonts(await fetchFontManifest(ui_web.assetManager));
   }
 }
 
-void _addUrlStrategyListener() {
-  jsSetUrlStrategy = allowInterop((JsUrlStrategy? jsStrategy) {
-    customUrlStrategy =
-        jsStrategy == null ? null : CustomUrlStrategy.fromJs(jsStrategy);
-  });
-  registerHotRestartListener(() {
-    jsSetUrlStrategy = null;
-  });
-}
-
 /// Whether to disable the font fallback system.
 ///
 /// We need to disable font fallbacks for some framework tests because
@@ -292,8 +282,3 @@ set debugDisableFontFallbacks(bool value) {
   _debugDisableFontFallbacks = value;
 }
 bool _debugDisableFontFallbacks = false;
-
-/// The shared instance of PlatformViewManager shared across the engine to handle
-/// rendering of PlatformViews into the web app.
-// TODO(dit): How to make this overridable from tests?
-final PlatformViewManager platformViewManager = PlatformViewManager();
diff --git a/lib/web_ui/lib/src/engine/js_interop/js_app.dart b/lib/web_ui/lib/src/engine/js_interop/js_app.dart
new file mode 100644
index 0000000000000000000000000000000000000000..959abb059624df5429762c9d37535bc3805bce4f
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/js_interop/js_app.dart
@@ -0,0 +1,87 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+@JS()
+library js_app;
+
+import 'dart:js_interop';
+import 'package:ui/src/engine.dart';
+
+/// The JS bindings for the configuration object passed to [FlutterApp.addView].
+@JS()
+@anonymous
+@staticInterop
+class JsFlutterViewOptions {
+  external factory JsFlutterViewOptions();
+}
+
+/// The attributes of the [JsFlutterViewOptions] object.
+extension JsFlutterViewOptionsExtension on JsFlutterViewOptions {
+  @JS('hostElement')
+  external DomElement? get _hostElement;
+  DomElement get hostElement {
+    assert (_hostElement != null, '`hostElement` passed to addView cannot be null.');
+    return _hostElement!;
+  }
+
+  @JS('viewConstraints')
+  external JsViewConstraints? get _viewConstraints;
+  JsViewConstraints? get viewConstraints {
+    return _viewConstraints;
+  }
+
+  external JSAny? get initialData;
+}
+
+/// The JS bindings for a [ViewConstraints] object.
+@JS()
+@anonymous
+@staticInterop
+class JsViewConstraints {
+  external factory JsViewConstraints({
+    double? minWidth,
+    double? maxWidth,
+    double? minHeight,
+    double? maxHeight,
+  });
+}
+
+/// The attributes of a [JsViewConstraints] object.
+///
+/// These attributes are expressed in *logical* pixels.
+extension JsViewConstraintsExtension on JsViewConstraints {
+  external double? get maxHeight;
+  external double? get maxWidth;
+  external double? get minHeight;
+  external double? get minWidth;
+}
+
+/// The public JS API of a running Flutter Web App.
+@JS()
+@anonymous
+@staticInterop
+abstract class FlutterApp {
+  factory FlutterApp({
+    required AddFlutterViewFn addView,
+    required RemoveFlutterViewFn removeView,
+  }) =>
+      FlutterApp._(
+        addView: addView.toJS,
+        removeView: ((JSNumber id) => removeView(id.toDartInt)).toJS,
+      );
+  external factory FlutterApp._({
+    required JSFunction addView,
+    required JSFunction removeView,
+  });
+}
+
+/// Typedef for the function that adds a new view to the app.
+///
+/// Returns the ID of the newly created view.
+typedef AddFlutterViewFn = int Function(JsFlutterViewOptions);
+
+/// Typedef for the function that removes a view from the app.
+///
+/// Returns the configuration used to create the view.
+typedef RemoveFlutterViewFn = JsFlutterViewOptions? Function(int);
diff --git a/lib/web_ui/lib/src/engine/js_interop/js_loader.dart b/lib/web_ui/lib/src/engine/js_interop/js_loader.dart
index e03a5af4ca3e3222f5bf43cc54a91a32011e02c2..4f5df1f5130f06f150a636032ecdaadc60ee4c31 100644
--- a/lib/web_ui/lib/src/engine/js_interop/js_loader.dart
+++ b/lib/web_ui/lib/src/engine/js_interop/js_loader.dart
@@ -5,26 +5,43 @@
 @JS()
 library js_loader;
 
-import 'package:js/js.dart';
+import 'dart:js_interop';
 
-import '../configuration.dart';
-import 'js_promise.dart';
+import 'package:js/js_util.dart' as js_util;
+import 'package:ui/src/engine.dart';
 
-/// Typedef for the function that notifies JS that the main entrypoint is up and running.
-/// As a parameter, a [FlutterEngineInitializer] instance is passed to JS, so the
-/// programmer can control the initialization sequence.
-typedef DidCreateEngineInitializerFn = void Function(FlutterEngineInitializer);
+@JS()
+@staticInterop
+class FlutterJS {}
+
+extension FlutterJSExtension on FlutterJS {
+  external FlutterLoader? get loader;
+}
 
 // Both `flutter`, `loader`(_flutter.loader), must be checked for null before
 // `didCreateEngineInitializer` can be safely accessed.
 @JS('_flutter')
-external Object? get flutter;
+external FlutterJS? get flutter;
+
+@JS()
+@staticInterop
+class FlutterLoader {}
+
+extension FlutterLoaderExtension on FlutterLoader {
+  external void didCreateEngineInitializer(FlutterEngineInitializer initializer);
+  bool get isAutoStart => !js_util.hasProperty(this, 'didCreateEngineInitializer');
+}
 
-@JS('_flutter.loader')
-external Object? get loader;
+/// Typedef for the function that initializes the flutter engine.
+/// ///
+/// [JsFlutterConfiguration] comes from `../configuration.dart`. It is the same
+/// object that can be used to configure flutter "inline", through the
+/// (to be deprecated) `window.flutterConfiguration` object.
+typedef InitializeEngineFn = Future<FlutterAppRunner> Function([JsFlutterConfiguration?]);
 
-@JS('_flutter.loader.didCreateEngineInitializer')
-external DidCreateEngineInitializerFn? get didCreateEngineInitializer;
+/// Typedef for the `autoStart` function that can be called straight from an engine initializer instance.
+/// (Similar to [RunAppFn], but taking no specific "runApp" parameters).
+typedef ImmediateRunAppFn = Future<FlutterApp> Function();
 
 // FlutterEngineInitializer
 
@@ -36,23 +53,19 @@ external DidCreateEngineInitializerFn? get didCreateEngineInitializer;
 @anonymous
 @staticInterop
 abstract class FlutterEngineInitializer{
-  external factory FlutterEngineInitializer({
+  factory FlutterEngineInitializer({
     required InitializeEngineFn initializeEngine,
     required ImmediateRunAppFn autoStart,
+  }) => FlutterEngineInitializer._(
+      initializeEngine: (([JsFlutterConfiguration? config]) => futureToPromise(initializeEngine(config) as Future<JSObject>)).toJS,
+      autoStart: (() => futureToPromise(autoStart() as Future<JSObject>)).toJS,
+    );
+  external factory FlutterEngineInitializer._({
+    required JSFunction initializeEngine,
+    required JSFunction autoStart,
   });
 }
 
-/// Typedef for the function that initializes the flutter engine.
-///
-/// [JsFlutterConfiguration] comes from `../configuration.dart`. It is the same
-/// object that can be used to configure flutter "inline", through the
-/// (to be deprecated) `window.flutterConfiguration` object.
-typedef InitializeEngineFn = Promise<FlutterAppRunner?> Function([JsFlutterConfiguration?]);
-
-/// Typedef for the `autoStart` function that can be called straight from an engine initializer instance.
-/// (Similar to [RunAppFn], but taking no specific "runApp" parameters).
-typedef ImmediateRunAppFn = Promise<FlutterApp> Function();
-
 // FlutterAppRunner
 
 /// A class that exposes a function that runs the Flutter app,
@@ -61,9 +74,13 @@ typedef ImmediateRunAppFn = Promise<FlutterApp> Function();
 @anonymous
 @staticInterop
 abstract class FlutterAppRunner {
+  factory FlutterAppRunner({required RunAppFn runApp,}) => FlutterAppRunner._(
+    runApp: (([RunAppFnParameters? args]) => futureToPromise(runApp(args) as Future<JSObject>)).toJS
+  );
+
   /// Runs a flutter app
-  external factory FlutterAppRunner({
-    required RunAppFn runApp, // Returns an App
+  external factory FlutterAppRunner._({
+    required JSFunction runApp, // Returns an App
   });
 }
 
@@ -76,15 +93,4 @@ abstract class RunAppFnParameters {
 }
 
 /// Typedef for the function that runs the flutter app main entrypoint.
-typedef RunAppFn = Promise<FlutterApp> Function([RunAppFnParameters?]);
-
-// FlutterApp
-
-/// A class that exposes the public API of a running Flutter Web App running.
-@JS()
-@anonymous
-@staticInterop
-abstract class FlutterApp {
-  /// Cleans a Flutter app
-  external factory FlutterApp();
-}
+typedef RunAppFn = Future<FlutterApp> Function([RunAppFnParameters?]);
diff --git a/lib/web_ui/lib/src/engine/js_interop/js_promise.dart b/lib/web_ui/lib/src/engine/js_interop/js_promise.dart
index 13327158aeea816f72ff0b54dd64a7f7f4b2a18c..b535cf94368cbecaec7f175303a9302ce5abaa60 100644
--- a/lib/web_ui/lib/src/engine/js_interop/js_promise.dart
+++ b/lib/web_ui/lib/src/engine/js_interop/js_promise.dart
@@ -5,18 +5,33 @@
 @JS()
 library js_promise;
 
-import 'package:js/js.dart';
+import 'dart:js_interop';
 
-/// Type-safe JS Promises
-@JS('Promise')
-abstract class Promise<T> {
-  /// A constructor for a JS promise
-  external factory Promise(PromiseExecutor<T> executor);
+import 'package:js/js_util.dart' as js_util;
+
+import '../util.dart';
+
+extension CallExtension on JSFunction {
+  external void call(JSAny? this_, JSAny? object);
 }
 
-/// The type of function that is used to create a Promise<T>
-typedef PromiseExecutor<T> = void Function(PromiseResolver<T> resolve, PromiseRejecter reject);
-/// The type of function used to resolve a Promise<T>
-typedef PromiseResolver<T> = void Function(T result);
-/// The type of function used to reject a Promise (of any <T>)
-typedef PromiseRejecter = void Function(Object? error);
+@JS('Promise')
+external JSAny get _promiseConstructor;
+
+JSPromise<JSAny?> createPromise(JSFunction executor) =>
+  js_util.callConstructor(
+    _promiseConstructor,
+    <Object>[executor],
+  );
+
+
+JSPromise<JSAny?> futureToPromise<T extends JSAny?>(Future<T> future) {
+  return createPromise((JSFunction resolver, JSFunction rejecter) {
+    future.then(
+      (T value) => resolver.call(null, value),
+      onError: (Object? error) {
+        printWarning('Rejecting promise with error: $error');
+        rejecter.call(null, null);
+      });
+  }.toJS);
+}
diff --git a/lib/web_ui/lib/src/engine/js_interop/js_typed_data.dart b/lib/web_ui/lib/src/engine/js_interop/js_typed_data.dart
new file mode 100644
index 0000000000000000000000000000000000000000..f82ce73af0998851cfff770ee49c8259382cbc87
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/js_interop/js_typed_data.dart
@@ -0,0 +1,37 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:js_interop';
+
+// Some APIs we need on typed arrays that are not exposed by the dart sdk yet
+extension TypedArrayExtension on JSTypedArray {
+  external JSTypedArray slice(JSNumber start, JSNumber end);
+  external void set(JSTypedArray source, JSNumber start);
+  external JSNumber get length;
+}
+
+// These are constructors on `Uint8Array` that we need that aren't exposed in
+// the dart sdk yet
+@JS('Uint8Array')
+@staticInterop
+class JSUint8Array1 {
+  external factory JSUint8Array1._create1(JSAny bufferOrLength);
+  external factory JSUint8Array1._create3(
+    JSArrayBuffer buffer,
+    JSNumber start,
+    JSNumber length,
+  );
+}
+
+JSUint8Array createUint8ArrayFromBuffer(JSArrayBuffer buffer)
+  => JSUint8Array1._create1(buffer) as JSUint8Array;
+
+JSUint8Array createUint8ArrayFromSubBuffer(
+  JSArrayBuffer buffer,
+  int start,
+  int length,
+) => JSUint8Array1._create3(buffer, start.toJS, length.toJS) as JSUint8Array;
+
+JSUint8Array createUint8ArrayFromLength(int length)
+  => JSUint8Array1._create1(length.toJS) as JSUint8Array;
diff --git a/lib/web_ui/lib/src/engine/keyboard_binding.dart b/lib/web_ui/lib/src/engine/keyboard_binding.dart
index 97b1a9dcbf0e600cf444390df8f9b500dc50909d..4567f414fb63c8e1bb265b96b85c16687cb2533d 100644
--- a/lib/web_ui/lib/src/engine/keyboard_binding.dart
+++ b/lib/web_ui/lib/src/engine/keyboard_binding.dart
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:js_interop';
+
 import 'package:meta/meta.dart';
 import 'package:ui/ui.dart' as ui;
 import 'package:web_locale_keymap/web_locale_keymap.dart' as locale_keymap;
@@ -11,7 +13,7 @@ import 'browser_detection.dart';
 import 'dom.dart';
 import 'key_map.g.dart';
 import 'platform_dispatcher.dart';
-import 'safe_browser_api.dart';
+import 'raw_keyboard.dart';
 import 'semantics.dart';
 
 typedef _VoidCallback = void Function();
@@ -35,8 +37,8 @@ final int _kLogicalMetaRight = kWebLogicalLocationMap['Meta']![_kLocationRight]!
 
 final int _kPhysicalAltLeft = kWebToPhysicalKey['AltLeft']!;
 final int _kPhysicalAltRight = kWebToPhysicalKey['AltRight']!;
-final int _kPhysicalControlLeft = kWebToPhysicalKey['ControlLeft']!;
-final int _kPhysicalControlRight = kWebToPhysicalKey['ControlRight']!;
+final int kPhysicalControlLeft = kWebToPhysicalKey['ControlLeft']!;
+final int kPhysicalControlRight = kWebToPhysicalKey['ControlRight']!;
 final int _kPhysicalShiftLeft = kWebToPhysicalKey['ShiftLeft']!;
 final int _kPhysicalShiftRight = kWebToPhysicalKey['ShiftRight']!;
 final int _kPhysicalMetaLeft = kWebToPhysicalKey['MetaLeft']!;
@@ -100,13 +102,16 @@ ValueGetter<T> _cached<T>(ValueGetter<T> body) {
 
 class KeyboardBinding {
   KeyboardBinding._() {
-    _addEventListener('keydown', allowInterop((DomEvent domEvent) {
+    _addEventListener('keydown', (DomEvent domEvent) {
+      final FlutterHtmlKeyboardEvent event = FlutterHtmlKeyboardEvent(domEvent as DomKeyboardEvent);
+      _converter.handleEvent(event);
+      RawKeyboard.instance?.handleHtmlEvent(domEvent);
+    });
+    _addEventListener('keyup', (DomEvent domEvent) {
       final FlutterHtmlKeyboardEvent event = FlutterHtmlKeyboardEvent(domEvent as DomKeyboardEvent);
-      return _converter.handleEvent(event);
-    }));
-    _addEventListener('keyup', allowInterop((DomEvent event) {
-      return _converter.handleEvent(FlutterHtmlKeyboardEvent(event as DomKeyboardEvent));
-    }));
+      _converter.handleEvent(event);
+      RawKeyboard.instance?.handleHtmlEvent(domEvent);
+    });
   }
 
   /// The singleton instance of this object.
@@ -138,18 +143,17 @@ class KeyboardBinding {
   );
   final Map<String, DomEventListener> _listeners = <String, DomEventListener>{};
 
-  void _addEventListener(String eventName, DomEventListener handler) {
-    dynamic loggedHandler(DomEvent event) {
+  void _addEventListener(String eventName, DartDomEventListener handler) {
+    JSVoid loggedHandler(DomEvent event) {
       if (_debugLogKeyEvents) {
         print(event.type);
       }
-      if (EngineSemanticsOwner.instance.receiveGlobalEvent(event)) {
-        return handler(event);
+      if (EngineSemantics.instance.receiveGlobalEvent(event)) {
+        handler(event);
       }
-      return null;
     }
 
-    final DomEventListener wrappedHandler = allowInterop(loggedHandler);
+    final DomEventListener wrappedHandler = createDomEventListener(loggedHandler);
     assert(!_listeners.containsKey(eventName));
     _listeners[eventName] = wrappedHandler;
     domWindow.addEventListener(eventName, wrappedHandler, true);
@@ -209,6 +213,7 @@ class FlutterHtmlKeyboardEvent {
 
   bool getModifierState(String key) => _event.getModifierState(key);
   void preventDefault() => _event.preventDefault();
+  void stopPropagation() => _event.stopPropagation();
   bool get defaultPrevented => _event.defaultPrevented;
 }
 
@@ -253,6 +258,7 @@ class KeyboardConverter {
   bool _disposed = false;
   void dispose() {
     _disposed = true;
+    clearPressedKeys();
   }
 
   // On macOS, CapsLock behaves differently in that, a keydown event occurs when
@@ -286,6 +292,9 @@ class KeyboardConverter {
   static const Duration _kKeydownCancelDurationMac = Duration(milliseconds: 2000);
 
   static int _getPhysicalCode(String code) {
+    if (code.isEmpty) {
+      return _kWebKeyIdPlane;
+    }
     return kWebToPhysicalKey[code] ?? (code.hashCode + _kWebKeyIdPlane);
   }
 
@@ -366,7 +375,7 @@ class KeyboardConverter {
     _keyGuards.remove(physicalKey)?.call();
     _keyGuards[physicalKey] = cancelingCallback;
   }
-  // Call this method on an up event event of a non-modifier key.
+  // Call this method on an up event of a non-modifier key.
   void _stopGuardingKey(int physicalKey) {
     _keyGuards.remove(physicalKey)?.call();
   }
@@ -463,7 +472,7 @@ class KeyboardConverter {
             timeStamp: timeStamp,
             type: ui.KeyEventType.up,
             physical: physicalKey,
-            logical: logicalKey(),
+            logical: _pressingRecords[physicalKey]!,
             character: null,
             synthesized: true,
           ));
@@ -497,15 +506,12 @@ class KeyboardConverter {
       case ui.KeyEventType.down:
         assert(lastLogicalRecord == null);
         nextLogicalRecord = logicalKey();
-        break;
       case ui.KeyEventType.up:
         assert(lastLogicalRecord != null);
         nextLogicalRecord = null;
-        break;
       case ui.KeyEventType.repeat:
         assert(lastLogicalRecord != null);
         nextLogicalRecord = lastLogicalRecord;
-        break;
     }
     if (nextLogicalRecord == null) {
       _pressingRecords.remove(physicalKey);
@@ -580,6 +586,11 @@ class KeyboardConverter {
   //  * Some key data might be synthesized to update states after the main key
   //    data. They are always scheduled asynchronously with results discarded.
   void handleEvent(FlutterHtmlKeyboardEvent event) {
+    // Autofill on Chrome sends keyboard events whose key and code are null.
+    if (event.key == null || event.code == null) {
+      return;
+    }
+
     assert(_dispatchKeyData == null);
     bool sentAnyEvents = false;
     _dispatchKeyData = (ui.KeyData data) {
@@ -612,8 +623,8 @@ class KeyboardConverter {
       eventTimestamp,
     );
     _synthesizeModifierIfNeeded(
-      _kPhysicalControlLeft,
-      _kPhysicalControlRight,
+      kPhysicalControlLeft,
+      kPhysicalControlRight,
       _kLogicalControlLeft,
       controlPressed ? ui.KeyEventType.down : ui.KeyEventType.up,
       eventTimestamp,
@@ -691,8 +702,11 @@ class KeyboardConverter {
     _pressingRecords.remove(physical);
   }
 
-  @visibleForTesting
-  bool debugKeyIsPressed(int physical) {
+  bool keyIsPressed(int physical) {
     return _pressingRecords.containsKey(physical);
   }
+
+  void clearPressedKeys() {
+    _pressingRecords.clear();
+  }
 }
diff --git a/lib/web_ui/lib/src/engine/layers.dart b/lib/web_ui/lib/src/engine/layers.dart
new file mode 100644
index 0000000000000000000000000000000000000000..7d6940be76be5ead9dd1baf5e599a859c51c7c20
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/layers.dart
@@ -0,0 +1,751 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:typed_data';
+
+import 'package:meta/meta.dart';
+import 'package:ui/src/engine/scene_painting.dart';
+import 'package:ui/src/engine/vector_math.dart';
+import 'package:ui/ui.dart' as ui;
+
+class EngineRootLayer with PictureEngineLayer {}
+
+class BackdropFilterLayer
+  with PictureEngineLayer
+  implements ui.BackdropFilterEngineLayer {}
+class BackdropFilterOperation implements LayerOperation {
+  BackdropFilterOperation(this.filter, this.mode);
+
+  final ui.ImageFilter filter;
+  final ui.BlendMode mode;
+
+  @override
+  ui.Rect cullRect(ui.Rect contentRect) => contentRect;
+
+  @override
+  ui.Rect inverseMapRect(ui.Rect rect) => rect;
+
+  @override
+  void pre(SceneCanvas canvas, ui.Rect contentRect) {
+    canvas.saveLayerWithFilter(contentRect, ui.Paint()..blendMode = mode, filter);
+  }
+
+  @override
+  void post(SceneCanvas canvas, ui.Rect contentRect) {
+    canvas.restore();
+  }
+
+  @override
+  PlatformViewStyling createPlatformViewStyling() => const PlatformViewStyling();
+}
+
+class ClipPathLayer
+  with PictureEngineLayer
+  implements ui.ClipPathEngineLayer {}
+class ClipPathOperation implements LayerOperation {
+  ClipPathOperation(this.path, this.clip);
+
+  final ui.Path path;
+  final ui.Clip clip;
+
+  @override
+  ui.Rect cullRect(ui.Rect contentRect) => contentRect.intersect(path.getBounds());
+
+  @override
+  ui.Rect inverseMapRect(ui.Rect rect) => rect;
+
+  @override
+  void pre(SceneCanvas canvas, ui.Rect contentRect) {
+    canvas.save();
+    canvas.clipPath(path, doAntiAlias: clip != ui.Clip.hardEdge);
+    if (clip == ui.Clip.antiAliasWithSaveLayer) {
+      canvas.saveLayer(path.getBounds(), ui.Paint());
+    }
+  }
+
+  @override
+  void post(SceneCanvas canvas, ui.Rect contentRect) {
+    if (clip == ui.Clip.antiAliasWithSaveLayer) {
+      canvas.restore();
+    }
+    canvas.restore();
+  }
+
+  @override
+  PlatformViewStyling createPlatformViewStyling() {
+    // TODO(jacksongardner): implement clip styling for platform views
+    return const PlatformViewStyling();
+  }
+}
+
+class ClipRectLayer
+  with PictureEngineLayer
+  implements ui.ClipRectEngineLayer {}
+class ClipRectOperation implements LayerOperation {
+  const ClipRectOperation(this.rect, this.clip);
+
+  final ui.Rect rect;
+  final ui.Clip clip;
+
+  @override
+  ui.Rect cullRect(ui.Rect contentRect) => contentRect.intersect(rect);
+
+  @override
+  ui.Rect inverseMapRect(ui.Rect rect) => rect;
+
+  @override
+  void pre(SceneCanvas canvas, ui.Rect contentRect) {
+    canvas.save();
+    canvas.clipRect(rect, doAntiAlias: clip != ui.Clip.hardEdge);
+    if (clip == ui.Clip.antiAliasWithSaveLayer) {
+      canvas.saveLayer(rect, ui.Paint());
+    }
+  }
+
+  @override
+  void post(SceneCanvas canvas, ui.Rect contentRect) {
+    if (clip == ui.Clip.antiAliasWithSaveLayer) {
+      canvas.restore();
+    }
+    canvas.restore();
+  }
+
+  @override
+  PlatformViewStyling createPlatformViewStyling() {
+    // TODO(jacksongardner): implement clip styling for platform views
+    return const PlatformViewStyling();
+  }
+}
+
+class ClipRRectLayer
+  with PictureEngineLayer
+  implements ui.ClipRRectEngineLayer {}
+class ClipRRectOperation implements LayerOperation {
+  const ClipRRectOperation(this.rrect, this.clip);
+
+  final ui.RRect rrect;
+  final ui.Clip clip;
+
+  @override
+  ui.Rect cullRect(ui.Rect contentRect) => contentRect.intersect(rrect.outerRect);
+
+  @override
+  ui.Rect inverseMapRect(ui.Rect rect) => rect;
+
+  @override
+  void pre(SceneCanvas canvas, ui.Rect contentRect) {
+    canvas.save();
+    canvas.clipRRect(rrect, doAntiAlias: clip != ui.Clip.hardEdge);
+    if (clip == ui.Clip.antiAliasWithSaveLayer) {
+      canvas.saveLayer(rrect.outerRect, ui.Paint());
+    }
+  }
+
+  @override
+  void post(SceneCanvas canvas, ui.Rect contentRect) {
+    if (clip == ui.Clip.antiAliasWithSaveLayer) {
+      canvas.restore();
+    }
+    canvas.restore();
+  }
+
+  @override
+  PlatformViewStyling createPlatformViewStyling() {
+    // TODO(jacksongardner): implement clip styling for platform views
+    return const PlatformViewStyling();
+  }
+}
+
+class ColorFilterLayer
+  with PictureEngineLayer
+  implements ui.ColorFilterEngineLayer {}
+class ColorFilterOperation implements LayerOperation {
+  ColorFilterOperation(this.filter);
+
+  final ui.ColorFilter filter;
+
+  @override
+  ui.Rect cullRect(ui.Rect contentRect) => contentRect;
+
+  @override
+  ui.Rect inverseMapRect(ui.Rect rect) => rect;
+
+  @override
+  void pre(SceneCanvas canvas, ui.Rect contentRect) {
+    canvas.saveLayer(contentRect, ui.Paint()..colorFilter = filter);
+  }
+
+  @override
+  void post(SceneCanvas canvas, ui.Rect contentRect) {
+    canvas.restore();
+  }
+
+  @override
+  PlatformViewStyling createPlatformViewStyling() => const PlatformViewStyling();
+}
+
+class ImageFilterLayer
+  with PictureEngineLayer
+  implements ui.ImageFilterEngineLayer {}
+class ImageFilterOperation implements LayerOperation {
+  ImageFilterOperation(this.filter, this.offset);
+
+  final ui.ImageFilter filter;
+  final ui.Offset offset;
+
+  @override
+  ui.Rect cullRect(ui.Rect contentRect) => (filter as SceneImageFilter).filterBounds(contentRect);
+
+  @override
+  ui.Rect inverseMapRect(ui.Rect rect) => rect;
+
+  @override
+  void pre(SceneCanvas canvas, ui.Rect contentRect) {
+    if (offset != ui.Offset.zero) {
+      canvas.save();
+      canvas.translate(offset.dx, offset.dy);
+    }
+    final ui.Rect adjustedContentRect =
+      (filter as SceneImageFilter).filterBounds(contentRect);
+    canvas.saveLayer(adjustedContentRect, ui.Paint()..imageFilter = filter);
+  }
+
+  @override
+  void post(SceneCanvas canvas, ui.Rect contentRect) {
+    if (offset != ui.Offset.zero) {
+      canvas.restore();
+    }
+    canvas.restore();
+  }
+
+  @override
+  PlatformViewStyling createPlatformViewStyling() {
+    if (offset != ui.Offset.zero) {
+      return PlatformViewStyling(
+        position: PlatformViewPosition.offset(offset)
+      );
+    } else {
+      return const PlatformViewStyling();
+    }
+  }
+}
+
+class OffsetLayer
+  with PictureEngineLayer
+  implements ui.OffsetEngineLayer {}
+class OffsetOperation implements LayerOperation {
+  OffsetOperation(this.dx, this.dy);
+
+  final double dx;
+  final double dy;
+
+  @override
+  ui.Rect cullRect(ui.Rect contentRect) => contentRect.shift(ui.Offset(dx, dy));
+
+  @override
+  ui.Rect inverseMapRect(ui.Rect rect) => rect.shift(ui.Offset(-dx, -dy));
+
+  @override
+  void pre(SceneCanvas canvas, ui.Rect cullRect) {
+    canvas.save();
+    canvas.translate(dx, dy);
+  }
+
+  @override
+  void post(SceneCanvas canvas, ui.Rect contentRect) {
+    canvas.restore();
+  }
+
+  @override
+  PlatformViewStyling createPlatformViewStyling() => PlatformViewStyling(
+    position: PlatformViewPosition.offset(ui.Offset(dx, dy))
+  );
+}
+
+class OpacityLayer
+  with PictureEngineLayer
+  implements ui.OpacityEngineLayer {}
+class OpacityOperation implements LayerOperation {
+  OpacityOperation(this.alpha, this.offset);
+
+  final int alpha;
+  final ui.Offset offset;
+
+  @override
+  ui.Rect cullRect(ui.Rect contentRect) => contentRect.shift(offset);
+
+  @override
+  ui.Rect inverseMapRect(ui.Rect rect) => rect;
+
+  @override
+  void pre(SceneCanvas canvas, ui.Rect cullRect) {
+    if (offset != ui.Offset.zero) {
+      canvas.save();
+      canvas.translate(offset.dx, offset.dy);
+      cullRect = cullRect.shift(-offset);
+    }
+    canvas.saveLayer(
+      cullRect,
+      ui.Paint()..color = ui.Color.fromARGB(alpha, 0, 0, 0)
+    );
+  }
+
+  @override
+  void post(SceneCanvas canvas, ui.Rect contentRect) {
+    canvas.restore();
+    if (offset != ui.Offset.zero) {
+      canvas.restore();
+    }
+  }
+
+  @override
+  PlatformViewStyling createPlatformViewStyling() => PlatformViewStyling(
+    position: offset != ui.Offset.zero ? PlatformViewPosition.offset(offset) : const PlatformViewPosition.zero(),
+    opacity: alpha.toDouble() / 255.0,
+  );
+}
+
+class TransformLayer
+  with PictureEngineLayer
+  implements ui.TransformEngineLayer {}
+class TransformOperation implements LayerOperation {
+  TransformOperation(this.transform);
+
+  final Float64List transform;
+
+  Matrix4 getMatrix() => Matrix4.fromFloat32List(toMatrix32(transform));
+
+  @override
+  ui.Rect cullRect(ui.Rect contentRect) => getMatrix().transformRect(contentRect);
+
+  @override
+  ui.Rect inverseMapRect(ui.Rect rect) {
+    final Matrix4 matrix = getMatrix()..invert();
+    return matrix.transformRect(rect);
+  }
+
+  @override
+  void pre(SceneCanvas canvas, ui.Rect cullRect) {
+    canvas.save();
+    canvas.transform(transform);
+  }
+
+  @override
+  void post(SceneCanvas canvas, ui.Rect contentRect) {
+    canvas.restore();
+  }
+
+  @override
+  PlatformViewStyling createPlatformViewStyling() => PlatformViewStyling(
+    position: PlatformViewPosition.transform(getMatrix()),
+  );
+}
+
+class ShaderMaskLayer
+  with PictureEngineLayer
+  implements ui.ShaderMaskEngineLayer {}
+class ShaderMaskOperation implements LayerOperation {
+  ShaderMaskOperation(this.shader, this.maskRect, this.blendMode);
+
+  final ui.Shader shader;
+  final ui.Rect maskRect;
+  final ui.BlendMode blendMode;
+
+  @override
+  ui.Rect cullRect(ui.Rect contentRect) => contentRect;
+
+  @override
+  ui.Rect inverseMapRect(ui.Rect rect) => rect;
+
+  @override
+  void pre(SceneCanvas canvas, ui.Rect contentRect) {
+    canvas.saveLayer(
+      contentRect,
+      ui.Paint(),
+    );
+  }
+
+  @override
+  void post(SceneCanvas canvas, ui.Rect contentRect) {
+    canvas.save();
+    canvas.translate(maskRect.left, maskRect.top);
+    canvas.drawRect(
+      ui.Rect.fromLTWH(0, 0, maskRect.width, maskRect.height),
+      ui.Paint()
+        ..blendMode = blendMode
+        ..shader = shader
+    );
+    canvas.restore();
+    canvas.restore();
+  }
+
+  @override
+  PlatformViewStyling createPlatformViewStyling() => const PlatformViewStyling();
+}
+
+class PlatformView {
+  PlatformView(this.viewId, this.size, this.styling);
+
+  int viewId;
+
+  // The bounds of this platform view, in the layer's local coordinate space.
+  ui.Size size;
+
+  PlatformViewStyling styling;
+}
+
+sealed class LayerSlice {
+  void dispose();
+}
+
+// A slice that contains one or more platform views to be rendered.
+class PlatformViewSlice implements LayerSlice {
+  PlatformViewSlice(this.views, this.occlusionRect);
+
+  List<PlatformView> views;
+
+  // A conservative estimate of what area platform views in this slice may cover.
+  // This is expressed in the coordinate space of the parent.
+  ui.Rect? occlusionRect;
+
+  @override
+  void dispose() {}
+}
+
+// A slice that contains flutter content to be rendered int he form of a single
+// ScenePicture.
+class PictureSlice implements LayerSlice {
+  PictureSlice(this.picture);
+
+  ScenePicture picture;
+
+  @override
+  void dispose() => picture.dispose();
+}
+
+mixin PictureEngineLayer implements ui.EngineLayer {
+  // Each layer is represented as a series of "slices" which contain either
+  // flutter content or platform views. Slices in this list are ordered from
+  // bottom to top.
+  List<LayerSlice> slices = <LayerSlice>[];
+
+  @override
+  void dispose() {
+    for (final LayerSlice slice in slices) {
+      slice.dispose();
+    }
+  }
+}
+
+abstract class LayerOperation {
+  const LayerOperation();
+
+  // Given an input content rectangle, this returns a conservative estimate of
+  // the covering rectangle of the content after it has been processed by the
+  // layer operation.
+  ui.Rect cullRect(ui.Rect contentRect);
+
+  // Takes a rectangle in the layer's coordinate space and maps it to the parent
+  // coordinate space.
+  ui.Rect inverseMapRect(ui.Rect rect);
+  void pre(SceneCanvas canvas, ui.Rect contentRect);
+  void post(SceneCanvas canvas, ui.Rect contentRect);
+
+  PlatformViewStyling createPlatformViewStyling();
+}
+
+class PictureDrawCommand {
+  PictureDrawCommand(this.offset, this.picture);
+
+  ui.Offset offset;
+  ui.Picture picture;
+}
+
+// Represents how a platform view should be positioned in the scene.
+// This object is immutable, so it can be reused across different platform
+// views that have the same positioning.
+class PlatformViewPosition {
+  // No transformation at all. We leave both fields null.
+  const PlatformViewPosition.zero() : offset = null, transform = null;
+
+  // A simple offset is the most common scenario. In those cases, we only
+  // store the offset and leave the transform as null
+  const PlatformViewPosition.offset(this.offset) : transform = null;
+
+  // In more complex cases, we store the transform. In those cases, the offset
+  // is left as null.
+  const PlatformViewPosition.transform(this.transform) : offset = null;
+
+  bool get isZero => (offset == null) && (transform == null);
+
+  final ui.Offset? offset;
+  final Matrix4? transform;
+
+  static PlatformViewPosition combine(PlatformViewPosition outer, PlatformViewPosition inner) {
+    // We try to reuse existing objects if possible, if they are immutable.
+    if (outer.isZero) {
+      return inner;
+    }
+    if (inner.isZero) {
+      return outer;
+    }
+    final ui.Offset? outerOffset = outer.offset;
+    final ui.Offset? innerOffset = inner.offset;
+    if (outerOffset != null && innerOffset != null) {
+      // Both positions are simple offsets, so they can be combined cheaply
+      // into another offset.
+      return PlatformViewPosition.offset(outerOffset + innerOffset);
+    }
+
+    // Otherwise, at least one of the positions involves a matrix transform.
+    final Matrix4 newTransform;
+    if (outerOffset != null) {
+      newTransform = Matrix4.translationValues(outerOffset.dx, outerOffset.dy, 0);
+    } else {
+      newTransform = outer.transform!.clone();
+    }
+    if (innerOffset != null) {
+      newTransform.translate(innerOffset.dx, innerOffset.dy);
+    } else {
+      newTransform.multiply(inner.transform!);
+    }
+    return PlatformViewPosition.transform(newTransform);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) {
+      return true;
+    }
+    if (other is! PlatformViewPosition) {
+      return false;
+    }
+    return (offset == other.offset) && (transform == other.transform);
+  }
+
+  @override
+  int get hashCode {
+    return Object.hash(offset, transform);
+  }
+}
+
+// Represents the styling to be performed on a platform view when it is
+// composited. This object is immutable so that it can be reused with different
+// platform views that have the same styling.
+class PlatformViewStyling {
+  const PlatformViewStyling({
+    this.position = const PlatformViewPosition.zero(),
+    this.opacity = 1.0
+  });
+
+  bool get isDefault => position.isZero && (opacity == 1.0);
+
+  final PlatformViewPosition position;
+  final double opacity;
+
+  static PlatformViewStyling combine(PlatformViewStyling outer, PlatformViewStyling inner) {
+    // Attempt to reuse one of the existing immutable objects.
+    if (outer.isDefault) {
+      return inner;
+    }
+    if (inner.isDefault) {
+      return outer;
+    }
+    return PlatformViewStyling(
+      position: PlatformViewPosition.combine(outer.position, inner.position),
+      opacity: outer.opacity * inner.opacity,
+    );
+  }
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) {
+      return true;
+    }
+    if (other is! PlatformViewStyling) {
+      return false;
+    }
+    return (position == other.position) && (opacity == other.opacity);
+  }
+
+  @override
+  int get hashCode {
+    return Object.hash(position, opacity);
+  }
+}
+
+class LayerBuilder {
+  factory LayerBuilder.rootLayer() {
+    return LayerBuilder._(null, EngineRootLayer(), null);
+  }
+
+  factory LayerBuilder.childLayer({
+    required LayerBuilder parent,
+    required PictureEngineLayer layer,
+    required LayerOperation operation
+  }) {
+    return LayerBuilder._(parent, layer, operation);
+  }
+
+  LayerBuilder._(
+    this.parent,
+    this.layer,
+    this.operation);
+
+  @visibleForTesting
+  static (ui.PictureRecorder, SceneCanvas) Function(ui.Rect)? debugRecorderFactory;
+
+  final LayerBuilder? parent;
+  final PictureEngineLayer layer;
+  final LayerOperation? operation;
+  final List<PictureDrawCommand> pendingPictures = <PictureDrawCommand>[];
+  List<PlatformView> pendingPlatformViews = <PlatformView>[];
+  ui.Rect? picturesRect;
+  ui.Rect? platformViewRect;
+
+  PlatformViewStyling? _memoizedPlatformViewStyling;
+
+  PlatformViewStyling _createPlatformViewStyling() {
+    final PlatformViewStyling? innerStyling = operation?.createPlatformViewStyling();
+    final PlatformViewStyling? outerStyling = parent?.platformViewStyling;
+    if (innerStyling == null) {
+      return outerStyling ?? const PlatformViewStyling();
+    }
+    if (outerStyling == null) {
+      return innerStyling;
+    }
+    return PlatformViewStyling.combine(outerStyling, innerStyling);
+  }
+
+  PlatformViewStyling get platformViewStyling {
+    return _memoizedPlatformViewStyling ??= _createPlatformViewStyling();
+  }
+
+  (ui.PictureRecorder, SceneCanvas) _createRecorder(ui.Rect rect) {
+    if (debugRecorderFactory != null) {
+      return debugRecorderFactory!(rect);
+    }
+    final ui.PictureRecorder recorder = ui.PictureRecorder();
+    final SceneCanvas canvas = ui.Canvas(recorder, rect) as SceneCanvas;
+    return (recorder, canvas);
+  }
+
+  void flushSlices() {
+    if (pendingPictures.isNotEmpty) {
+      // Merge the existing draw commands into a single picture and add a slice
+      // with that picture to the slice list.
+      final ui.Rect drawnRect = picturesRect ?? ui.Rect.zero;
+      final ui.Rect rect = operation?.cullRect(drawnRect) ?? drawnRect;
+      final (ui.PictureRecorder recorder, SceneCanvas canvas) = _createRecorder(rect);
+
+      operation?.pre(canvas, rect);
+      for (final PictureDrawCommand command in pendingPictures) {
+        if (command.offset != ui.Offset.zero) {
+          canvas.save();
+          canvas.translate(command.offset.dx, command.offset.dy);
+          canvas.drawPicture(command.picture);
+          canvas.restore();
+        } else {
+          canvas.drawPicture(command.picture);
+        }
+      }
+      operation?.post(canvas, rect);
+      final ui.Picture picture = recorder.endRecording();
+      layer.slices.add(PictureSlice(picture as ScenePicture));
+    }
+
+    if (pendingPlatformViews.isNotEmpty) {
+      // Take any pending platform views and lower them into a platform view
+      // slice.
+      ui.Rect? occlusionRect = platformViewRect;
+      if (occlusionRect != null && operation != null) {
+        occlusionRect = operation!.inverseMapRect(occlusionRect);
+      }
+      layer.slices.add(PlatformViewSlice(pendingPlatformViews, occlusionRect));
+    }
+
+    pendingPictures.clear();
+    pendingPlatformViews = <PlatformView>[];
+
+    // All the pictures and platform views have been lowered into slices. Clear
+    // our occlusion rectangles.
+    picturesRect = null;
+    platformViewRect = null;
+  }
+
+  void addPicture(
+    ui.Offset offset,
+    ui.Picture picture, {
+    bool isComplexHint = false,
+    bool willChangeHint = false
+  }) {
+    final ui.Rect cullRect = (picture as ScenePicture).cullRect;
+    final ui.Rect shiftedRect = cullRect.shift(offset);
+
+    final ui.Rect? currentPlatformViewRect = platformViewRect;
+    if (currentPlatformViewRect != null) {
+      // Whenever we add a picture to our layer, we try to see if the picture
+      // will overlap with any platform views that are currently on top of our
+      // drawing surface. If they don't overlap with the platform views, they
+      // can be grouped with the existing pending pictures.
+      if (pendingPictures.isEmpty || currentPlatformViewRect.overlaps(shiftedRect)) {
+        // If they do overlap with the platform views, however, we should flush
+        // all the current content into slices and start anew with a fresh
+        // group of pictures and platform views that will be rendered on top of
+        // the previous content. Note that we also flush if we have no pending
+        // pictures to group with. This is the case when platform views are
+        // the first thing in our stack of objects to composite, and it doesn't
+        // make sense to try to put a picture slice below the first platform
+        // view slice, even if the picture doesn't overlap.
+        flushSlices();
+      }
+    }
+    pendingPictures.add(PictureDrawCommand(offset, picture));
+    picturesRect = picturesRect?.expandToInclude(shiftedRect) ?? shiftedRect;
+  }
+
+  void addPlatformView(
+    int viewId, {
+    ui.Offset offset = ui.Offset.zero,
+    double width = 0.0,
+    double height = 0.0
+  }) {
+    final ui.Rect bounds = ui.Rect.fromLTWH(offset.dx, offset.dy, width, height);
+    platformViewRect = platformViewRect?.expandToInclude(bounds) ?? bounds;
+    final PlatformViewStyling layerStyling = platformViewStyling;
+    final PlatformViewStyling viewStyling = offset == ui.Offset.zero
+      ? layerStyling
+      : PlatformViewStyling.combine(
+        layerStyling,
+        PlatformViewStyling(
+          position: PlatformViewPosition.offset(offset),
+        ),
+      );
+    pendingPlatformViews.add(PlatformView(viewId, ui.Size(width, height), viewStyling));
+  }
+
+  void mergeLayer(PictureEngineLayer layer) {
+    // When we merge layers, we attempt to merge slices as much as possible as
+    // well, based on ordering of pictures and platform views and reusing the
+    // occlusion logic for determining where we can lower each picture.
+    for (final LayerSlice slice in layer.slices) {
+      switch (slice) {
+        case PictureSlice():
+          addPicture(ui.Offset.zero, slice.picture);
+        case PlatformViewSlice():
+          final ui.Rect? occlusionRect = slice.occlusionRect;
+          if (occlusionRect != null) {
+            platformViewRect = platformViewRect?.expandToInclude(occlusionRect) ?? occlusionRect;
+          }
+          pendingPlatformViews.addAll(slice.views);
+      }
+    }
+  }
+
+  PictureEngineLayer build() {
+    // Lower any pending pictures or platform views to their respective slices.
+    flushSlices();
+    return layer;
+  }
+}
diff --git a/lib/web_ui/lib/src/engine/mouse/context_menu.dart b/lib/web_ui/lib/src/engine/mouse/context_menu.dart
new file mode 100644
index 0000000000000000000000000000000000000000..b34e3d64abe72a13e448663178963dfe9b0f1a2b
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/mouse/context_menu.dart
@@ -0,0 +1,42 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import '../dom.dart';
+import 'prevent_default.dart';
+
+/// Controls the browser's context menu in the given [element].
+class ContextMenu {
+  ContextMenu(this.element);
+
+  final DomElement element;
+
+  /// False when the context menu has been disabled, otherwise true.
+  bool _enabled = true;
+
+  /// Disables the browser's context menu for this [element].
+  ///
+  /// By default, when a Flutter web app starts, the context menu is enabled.
+  ///
+  /// Can be re-enabled by calling [enable].
+  void disable() {
+    if (!_enabled) {
+      return;
+    }
+    _enabled = false;
+    element.addEventListener('contextmenu', preventDefaultListener);
+  }
+
+  /// Enables the browser's context menu for this [element].
+  ///
+  /// By default, when a Flutter web app starts, the context menu is already
+  /// enabled. Typically, this method would be used after calling
+  /// [disable] to first disable it.
+  void enable() {
+    if (_enabled) {
+      return;
+    }
+    _enabled = true;
+    element.removeEventListener('contextmenu', preventDefaultListener);
+  }
+}
diff --git a/lib/web_ui/lib/src/engine/mouse_cursor.dart b/lib/web_ui/lib/src/engine/mouse/cursor.dart
similarity index 68%
rename from lib/web_ui/lib/src/engine/mouse_cursor.dart
rename to lib/web_ui/lib/src/engine/mouse/cursor.dart
index 009ca0f2110edc1254a64099f972137979504c82..434418c6184ebed52bf9b38e3955b640c2b4cc8c 100644
--- a/lib/web_ui/lib/src/engine/mouse_cursor.dart
+++ b/lib/web_ui/lib/src/engine/mouse/cursor.dart
@@ -2,23 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'embedder.dart';
-import 'util.dart';
+import '../dom.dart';
 
-/// Provides mouse cursor bindings, such as the `flutter/mousecursor` channel.
-class MouseCursor {
-  MouseCursor._();
+const String _kDefaultCursor = 'default';
 
-  /// Initializes the [MouseCursor] singleton.
-  ///
-  /// Use the [instance] getter to get the singleton after calling this method.
-  static void initialize() {
-    _instance ??= MouseCursor._();
-  }
+/// Controls the mouse cursor in the given [element].
+class MouseCursor {
+  MouseCursor(this.element);
 
-  /// The [MouseCursor] singleton.
-  static MouseCursor? get instance => _instance;
-  static MouseCursor? _instance;
+  final DomElement element;
 
   // Map from Flutter's kind values to CSS's cursor values.
   //
@@ -27,7 +19,7 @@ class MouseCursor {
   static const Map<String, String> _kindToCssValueMap = <String, String>{
     'alias': 'alias',
     'allScroll': 'all-scroll',
-    'basic': 'default',
+    'basic': _kDefaultCursor,
     'cell': 'cell',
     'click': 'pointer',
     'contextMenu': 'context-menu',
@@ -61,15 +53,20 @@ class MouseCursor {
     'zoomIn': 'zoom-in',
     'zoomOut': 'zoom-out',
   };
+
   static String _mapKindToCssValue(String? kind) {
-    return _kindToCssValueMap[kind] ?? 'default';
+    return _kindToCssValueMap[kind] ?? _kDefaultCursor;
   }
 
   void activateSystemCursor(String? kind) {
-    setElementStyle(
-      flutterViewEmbedder.glassPaneElement!,
-      'cursor',
-      _mapKindToCssValue(kind),
-    );
+    final String cssValue = _mapKindToCssValue(kind);
+    // TODO(mdebbar): This should be set on the element, not the body. In order
+    //                to do that, we need the framework to send us the view ID.
+    //                https://github.com/flutter/flutter/issues/140226
+    if (cssValue == _kDefaultCursor) {
+      domDocument.body!.style.removeProperty('cursor');
+    } else {
+      domDocument.body!.style.cursor = cssValue;
+    }
   }
 }
diff --git a/lib/web_ui/lib/src/engine/mouse/prevent_default.dart b/lib/web_ui/lib/src/engine/mouse/prevent_default.dart
new file mode 100644
index 0000000000000000000000000000000000000000..2371deae140016de1c0f5004bf26951fb0e9b96d
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/mouse/prevent_default.dart
@@ -0,0 +1,10 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import '../dom.dart';
+
+/// Listener for DOM events that prevents the default browser behavior.
+final DomEventListener preventDefaultListener = createDomEventListener((DomEvent event) {
+  event.preventDefault();
+});
diff --git a/lib/web_ui/lib/src/engine/navigation.dart b/lib/web_ui/lib/src/engine/navigation.dart
deleted file mode 100644
index e3746d1dc91ec4dae472b0f9e2c481fd56db60f0..0000000000000000000000000000000000000000
--- a/lib/web_ui/lib/src/engine/navigation.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-export 'navigation/history.dart';
-export 'navigation/js_url_strategy.dart';
-export 'navigation/url_strategy.dart';
diff --git a/lib/web_ui/lib/src/engine/navigation/history.dart b/lib/web_ui/lib/src/engine/navigation/history.dart
index bbee4c807bb589fb6cd58a3c1b42bc18530eeaf9..ef90ad9c9f282e29dce3924eb8b6759b85699cea 100644
--- a/lib/web_ui/lib/src/engine/navigation/history.dart
+++ b/lib/web_ui/lib/src/engine/navigation/history.dart
@@ -4,18 +4,18 @@
 
 import 'package:meta/meta.dart';
 import 'package:ui/ui.dart' as ui;
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
 import '../dom.dart';
 import '../platform_dispatcher.dart';
 import '../services/message_codec.dart';
 import '../services/message_codecs.dart';
-import 'url_strategy.dart';
 
 /// Infers the history mode from the existing browser history state, then
 /// creates the appropriate instance of [BrowserHistory] for it.
 ///
 /// If it can't infer, it creates a [MultiEntriesBrowserHistory] by default.
-BrowserHistory createHistoryForExistingState(UrlStrategy? urlStrategy) {
+BrowserHistory createHistoryForExistingState(ui_web.UrlStrategy? urlStrategy) {
   if (urlStrategy != null) {
     final Object? state = urlStrategy.getState();
     if (SingleEntryBrowserHistory._isOriginEntry(state) || SingleEntryBrowserHistory._isFlutterEntry(state)) {
@@ -32,7 +32,7 @@ BrowserHistory createHistoryForExistingState(UrlStrategy? urlStrategy) {
 /// interact with the html browser history and should come up with their own
 /// ways to manage the states in the browser history.
 ///
-/// There should only be one global instance among all all subclasses.
+/// There should only be one global instance among all subclasses.
 ///
 /// See also:
 ///
@@ -45,13 +45,13 @@ abstract class BrowserHistory {
   late ui.VoidCallback _unsubscribe;
 
   /// The strategy to interact with html browser history.
-  UrlStrategy? get urlStrategy;
+  ui_web.UrlStrategy? get urlStrategy;
 
   bool _isTornDown = false;
   bool _isDisposed = false;
 
-  void _setupStrategy(UrlStrategy strategy) {
-    _unsubscribe = strategy.addPopStateListener(onPopState as DomEventListener);
+  void _setupStrategy(ui_web.UrlStrategy strategy) {
+    _unsubscribe = strategy.addPopStateListener(onPopState);
   }
 
   /// Release any resources held by this [BrowserHistory] instance.
@@ -100,7 +100,7 @@ abstract class BrowserHistory {
   ///
   /// Subclasses should send appropriate system messages to update the flutter
   /// applications accordingly.
-  void onPopState(covariant DomPopStateEvent event);
+  void onPopState(Object? state);
 
   /// Restore any modifications to the html browser history during the lifetime
   /// of this class.
@@ -123,7 +123,7 @@ abstract class BrowserHistory {
 ///   a Router for routing.
 class MultiEntriesBrowserHistory extends BrowserHistory {
   MultiEntriesBrowserHistory({required this.urlStrategy}) {
-    final UrlStrategy? strategy = urlStrategy;
+    final ui_web.UrlStrategy? strategy = urlStrategy;
     if (strategy == null) {
       return;
     }
@@ -138,21 +138,21 @@ class MultiEntriesBrowserHistory extends BrowserHistory {
   }
 
   @override
-  final UrlStrategy? urlStrategy;
+  final ui_web.UrlStrategy? urlStrategy;
 
   late int _lastSeenSerialCount;
   int get _currentSerialCount {
     if (_hasSerialCount(currentState)) {
       final Map<dynamic, dynamic> stateMap =
           currentState! as Map<dynamic, dynamic>;
-      return stateMap['serialCount'] as int;
+      return (stateMap['serialCount'] as double).toInt();
     }
     return 0;
   }
 
   Object _tagWithSerialCount(Object? originialState, int count) {
     return <dynamic, dynamic>{
-      'serialCount': count,
+      'serialCount': count.toDouble(),
       'state': originialState,
     };
   }
@@ -183,15 +183,15 @@ class MultiEntriesBrowserHistory extends BrowserHistory {
   }
 
   @override
-  void onPopState(covariant DomPopStateEvent event) {
+  void onPopState(Object? state) {
     assert(urlStrategy != null);
     // May be a result of direct url access while the flutter application is
     // already running.
-    if (!_hasSerialCount(event.state)) {
+    if (!_hasSerialCount(state)) {
       // In this case we assume this will be the next history entry from the
       // last seen entry.
       urlStrategy!.replaceState(
-          _tagWithSerialCount(event.state, _lastSeenSerialCount + 1),
+          _tagWithSerialCount(state, _lastSeenSerialCount + 1),
           'flutter',
           currentPath);
     }
@@ -201,7 +201,7 @@ class MultiEntriesBrowserHistory extends BrowserHistory {
       const JSONMethodCodec().encodeMethodCall(
           MethodCall('pushRouteInformation', <dynamic, dynamic>{
         'location': currentPath,
-        'state': event.state?['state'],
+        'state': (state as Map<dynamic, dynamic>?)?['state'],
       })),
       (_) {},
     );
@@ -217,7 +217,12 @@ class MultiEntriesBrowserHistory extends BrowserHistory {
     _isTornDown = true;
 
     // Restores the html browser history.
-    assert(_hasSerialCount(currentState));
+    assert(
+      _hasSerialCount(currentState),
+      currentState == null
+          ? 'unexpected null history state'
+          : "history state is missing field 'serialCount'",
+    );
     final int backCount = _currentSerialCount;
     if (backCount > 0) {
       await urlStrategy!.go(-backCount);
@@ -252,7 +257,7 @@ class MultiEntriesBrowserHistory extends BrowserHistory {
 ///    Router for routing.
 class SingleEntryBrowserHistory extends BrowserHistory {
   SingleEntryBrowserHistory({required this.urlStrategy}) {
-    final UrlStrategy? strategy = urlStrategy;
+    final ui_web.UrlStrategy? strategy = urlStrategy;
     if (strategy == null) {
       return;
     }
@@ -271,7 +276,7 @@ class SingleEntryBrowserHistory extends BrowserHistory {
   }
 
   @override
-  final UrlStrategy? urlStrategy;
+  final ui_web.UrlStrategy? urlStrategy;
 
   static const MethodCall _popRouteMethodCall = MethodCall('popRoute');
   static const String _kFlutterTag = 'flutter';
@@ -311,8 +316,8 @@ class SingleEntryBrowserHistory extends BrowserHistory {
 
   String? _userProvidedRouteName;
   @override
-  void onPopState(covariant DomPopStateEvent event) {
-    if (_isOriginEntry(event.state)) {
+  void onPopState(Object? state) {
+    if (_isOriginEntry(state)) {
       _setupFlutterEntry(urlStrategy!);
 
       // 2. Send a 'popRoute' platform message so the app can handle it accordingly.
@@ -321,7 +326,7 @@ class SingleEntryBrowserHistory extends BrowserHistory {
         const JSONMethodCodec().encodeMethodCall(_popRouteMethodCall),
         (_) {},
       );
-    } else if (_isFlutterEntry(event.state)) {
+    } else if (_isFlutterEntry(state)) {
       // We get into this scenario when the user changes the url manually. It
       // causes a new entry to be pushed on top of our "flutter" one. When this
       // happens it first goes to the "else" section below where we capture the
@@ -358,19 +363,17 @@ class SingleEntryBrowserHistory extends BrowserHistory {
   /// This method should be called when the Origin Entry is active. It just
   /// replaces the state of the entry so that we can recognize it later using
   /// [_isOriginEntry] inside [_popStateListener].
-  void _setupOriginEntry(UrlStrategy strategy) {
-    assert(strategy != null);
+  void _setupOriginEntry(ui_web.UrlStrategy strategy) {
     strategy.replaceState(_wrapOriginState(currentState), 'origin', '');
   }
 
   /// This method is used manipulate the Flutter Entry which is always the
   /// active entry while the Flutter app is running.
   void _setupFlutterEntry(
-    UrlStrategy strategy, {
+    ui_web.UrlStrategy strategy, {
     bool replace = false,
     String? path,
   }) {
-    assert(strategy != null);
     path ??= currentPath;
     if (replace) {
       strategy.replaceState(_flutterState, 'flutter', path);
diff --git a/lib/web_ui/lib/src/engine/navigation/js_url_strategy.dart b/lib/web_ui/lib/src/engine/navigation/js_url_strategy.dart
deleted file mode 100644
index 9fbf52ed103fa3307a4e71238574a8893a87d356..0000000000000000000000000000000000000000
--- a/lib/web_ui/lib/src/engine/navigation/js_url_strategy.dart
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-@JS()
-library js_url_strategy;
-
-import 'package:js/js.dart';
-import 'package:ui/ui.dart' as ui;
-
-import '../dom.dart';
-
-typedef _PathGetter = String Function();
-
-typedef _StateGetter = Object? Function();
-
-typedef _AddPopStateListener = ui.VoidCallback Function(DomEventListener);
-
-typedef _StringToString = String Function(String);
-
-typedef _StateOperation = void Function(
-    Object? state, String title, String url);
-
-typedef _HistoryMove = Future<void> Function(int count);
-
-/// The JavaScript representation of a URL strategy.
-///
-/// This is used to pass URL strategy implementations across a JS-interop
-/// bridge from the app to the engine.
-@JS()
-@anonymous
-@staticInterop
-abstract class JsUrlStrategy {
-  /// Creates an instance of [JsUrlStrategy] from a bag of URL strategy
-  /// functions.
-  external factory JsUrlStrategy({
-    required _PathGetter getPath,
-    required _StateGetter getState,
-    required _AddPopStateListener addPopStateListener,
-    required _StringToString prepareExternalUrl,
-    required _StateOperation pushState,
-    required _StateOperation replaceState,
-    required _HistoryMove go,
-  });
-}
-
-extension JsUrlStrategyExtension on JsUrlStrategy {
-  /// Adds a listener to the `popstate` event and returns a function that, when
-  /// invoked, removes the listener.
-  external ui.VoidCallback addPopStateListener(DomEventListener fn);
-
-  /// Returns the active path in the browser.
-  external String getPath();
-
-  /// Returns the history state in the browser.
-  ///
-  /// See: https://developer.mozilla.org/en-US/docs/Web/API/History/state
-  external Object? getState();
-
-  /// Given a path that's internal to the app, create the external url that
-  /// will be used in the browser.
-  external String prepareExternalUrl(String internalUrl);
-
-  /// Push a new history entry.
-  ///
-  /// See: https://developer.mozilla.org/en-US/docs/Web/API/History/pushState
-  external void pushState(Object? state, String title, String url);
-
-  /// Replace the currently active history entry.
-  ///
-  /// See: https://developer.mozilla.org/en-US/docs/Web/API/History/replaceState
-  external void replaceState(Object? state, String title, String url);
-
-  /// Moves forwards or backwards through the history stack.
-  ///
-  /// A negative [count] value causes a backward move in the history stack. And
-  /// a positive [count] value causs a forward move.
-  ///
-  /// Examples:
-  ///
-  /// * `go(-2)` moves back 2 steps in history.
-  /// * `go(3)` moves forward 3 steps in hisotry.
-  ///
-  /// See: https://developer.mozilla.org/en-US/docs/Web/API/History/go
-  external Future<void> go(int count);
-}
diff --git a/lib/web_ui/lib/src/engine/noto_font.dart b/lib/web_ui/lib/src/engine/noto_font.dart
new file mode 100644
index 0000000000000000000000000000000000000000..e7438f003c340a17406ed688260ba8b28b5349bb
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/noto_font.dart
@@ -0,0 +1,48 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+class NotoFont {
+  NotoFont(this.name, this.url, {this.enabled = true});
+
+  final String name;
+  final String url;
+
+  /// `true` if this font is to be considered as a fallback font. Almost all
+  /// fonts are enabled, but [enabled] may be `false` to exclude a font. This is
+  /// used to choose between color and monochrome emoji fonts - only one of them
+  /// is enabled.
+  final bool enabled;
+
+  final int index = _index++;
+  static int _index = 0;
+
+  /// During fallback font selection this is the number of missing code points
+  /// that are covered by (i.e. in) this font.
+  int coverCount = 0;
+
+  /// During fallback font selection this is a list of [FallbackFontComponent]s
+  /// from this font that are required to cover some of the missing code
+  /// points. The cover count for the font is the sum of the cover counts for
+  /// the components that make up the font.
+  final List<FallbackFontComponent> coverComponents = <FallbackFontComponent>[];
+}
+
+/// A component is a set of code points common to some fonts. Each code point is
+/// in a single component. Each font can be represented as a disjoint union of
+/// components. We store the inverse of this relationship, the fonts that use
+/// this component. The font fallback selection algorithm does not need the code
+/// points in a component or a font, so this is not stored, but can be recovered
+/// via the map from code-point to component.
+class FallbackFontComponent {
+  FallbackFontComponent(this._allFonts);
+  final List<NotoFont> _allFonts;
+  late final List<NotoFont> _activeFonts = List<NotoFont>.unmodifiable(
+      _allFonts.where((NotoFont font) => font.enabled));
+
+  List<NotoFont> get fonts => _activeFonts;
+
+  /// During fallback font selection this is the number of missing code points
+  /// that are covered by this component.
+  int coverCount = 0;
+}
diff --git a/lib/web_ui/lib/src/engine/noto_font_encoding.dart b/lib/web_ui/lib/src/engine/noto_font_encoding.dart
new file mode 100644
index 0000000000000000000000000000000000000000..28d7bcdf8f61b26c10fbeb05d2867cc7a2a6d4ca
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/noto_font_encoding.dart
@@ -0,0 +1,17 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+const int kMaxCodePoint = 0x10ffff;
+
+const int kPrefixDigit0 = 48;
+const int kPrefixRadix = 10;
+
+const int kFontIndexDigit0 = 65 + 32; // 'a'..'z'
+const int kFontIndexRadix = 26;
+
+const int kRangeSizeDigit0 = 65 + 32; // 'a'..'z'
+const int kRangeSizeRadix = 26;
+
+const int kRangeValueDigit0 = 65; // 'A'..'Z'
+const int kRangeValueRadix = 26;
diff --git a/lib/web_ui/lib/src/engine/picture.dart b/lib/web_ui/lib/src/engine/picture.dart
index 3b9083ff042315f4e7096cf2379177f4eb390de3..db469b7ccc65e0a69a9d4c07bd2454fa518e03cf 100644
--- a/lib/web_ui/lib/src/engine/picture.dart
+++ b/lib/web_ui/lib/src/engine/picture.dart
@@ -10,8 +10,6 @@ import 'dom.dart';
 import 'html/bitmap_canvas.dart';
 import 'html/recording_canvas.dart';
 import 'html_image_codec.dart';
-import 'safe_browser_api.dart';
-import 'util.dart';
 
 /// An implementation of [ui.PictureRecorder] backed by a [RecordingCanvas].
 class EnginePictureRecorder implements ui.PictureRecorder {
@@ -74,13 +72,13 @@ class EnginePicture implements ui.Picture {
     // Ignoring the returned futures from onError and onLoad because we're
     // communicating through the `onImageLoaded` completer.
     late final DomEventListener errorListener;
-    errorListener = allowInterop((DomEvent event) {
+    errorListener = createDomEventListener((DomEvent event) {
       onImageLoaded.completeError(event);
       imageElement.removeEventListener('error', errorListener);
     });
     imageElement.addEventListener('error', errorListener);
     late final DomEventListener loadListener;
-    loadListener = allowInterop((DomEvent event) {
+    loadListener = createDomEventListener((DomEvent event) {
       onImageLoaded.complete(HtmlImage(
         imageElement,
         width,
@@ -107,9 +105,16 @@ class EnginePicture implements ui.Picture {
 
   @override
   bool get debugDisposed {
-    if (assertionsEnabled) {
-      return _disposed;
+    bool? result;
+    assert(() {
+      result = _disposed;
+      return true;
+    }());
+
+    if (result != null) {
+      return result!;
     }
+
     throw StateError('Picture.debugDisposed is only available when asserts are enabled.');
   }
 
diff --git a/lib/web_ui/lib/src/engine/platform_dispatcher.dart b/lib/web_ui/lib/src/engine/platform_dispatcher.dart
index e7d6f80b7f355ef3a13d79d686b96e97d0284273..868ceab4c8dcd5fc0afc0d46b326374bf0163c13 100644
--- a/lib/web_ui/lib/src/engine/platform_dispatcher.dart
+++ b/lib/web_ui/lib/src/engine/platform_dispatcher.dart
@@ -4,25 +4,14 @@
 
 import 'dart:async';
 import 'dart:convert';
+import 'dart:js_interop';
 import 'dart:typed_data';
 
-import 'package:ui/src/engine/canvaskit/renderer.dart';
-import 'package:ui/src/engine/renderer.dart';
+import 'package:meta/meta.dart';
 import 'package:ui/ui.dart' as ui;
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
-import '../engine.dart'  show platformViewManager, registerHotRestartListener;
-import 'clipboard.dart';
-import 'dom.dart';
-import 'embedder.dart';
-import 'mouse_cursor.dart';
-import 'platform_views/message_handler.dart';
-import 'plugins.dart';
-import 'safe_browser_api.dart';
-import 'semantics.dart';
-import 'services.dart';
-import 'text_editing/text_editing.dart';
-import 'util.dart';
-import 'window.dart';
+import '../engine.dart';
 
 /// Requests that the browser schedule a frame.
 ///
@@ -33,6 +22,8 @@ ui.VoidCallback? scheduleFrameCallback;
 typedef HighContrastListener = void Function(bool enabled);
 typedef _KeyDataResponseCallback = void Function(bool handled);
 
+const StandardMethodCodec standardCodec = StandardMethodCodec();
+const JSONMethodCodec jsonCodec = JSONMethodCodec();
 
 /// Determines if high contrast is enabled using media query 'forced-colors: active' for Windows
 class HighContrastSupport {
@@ -42,9 +33,10 @@ class HighContrastSupport {
   final List<HighContrastListener> _listeners = <HighContrastListener>[];
 
   /// Reference to css media query that indicates whether high contrast is on.
-  final DomMediaQueryList _highContrastMediaQuery = domWindow.matchMedia(_highContrastMediaQueryString);
+  final DomMediaQueryList _highContrastMediaQuery =
+      domWindow.matchMedia(_highContrastMediaQueryString);
   late final DomEventListener _onHighContrastChangeListener =
-      allowInterop(_onHighContrastChange);
+      createDomEventListener(_onHighContrastChange);
 
   bool get isHighContrastEnabled => _highContrastMediaQuery.matches;
 
@@ -64,7 +56,7 @@ class HighContrastSupport {
     }
   }
 
-  void _onHighContrastChange(DomEvent event) {
+  JSVoid _onHighContrastChange(DomEvent event) {
     final DomMediaQueryListEvent mqEvent = event as DomMediaQueryListEvent;
     final bool isHighContrastEnabled = mqEvent.matches!;
     for (final HighContrastListener listener in _listeners) {
@@ -84,16 +76,32 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
     _addBrightnessMediaQueryListener();
     HighContrastSupport.instance.addListener(_updateHighContrast);
     _addFontSizeObserver();
+    _addLocaleChangedListener();
     registerHotRestartListener(dispose);
+    AppLifecycleState.instance.addListener(_setAppLifecycleState);
+    _viewFocusBinding.init();
+    domDocument.body?.prepend(accessibilityPlaceholder);
+    _onViewDisposedListener = viewManager.onViewDisposed.listen((_) {
+      // Send a metrics changed event to the framework when a view is disposed.
+      // View creation/resize is handled by the `_didResize` handler in the
+      // EngineFlutterView itself.
+      invokeOnMetricsChanged();
+    });
   }
 
+  late StreamSubscription<int> _onViewDisposedListener;
+
   /// The [EnginePlatformDispatcher] singleton.
   static EnginePlatformDispatcher get instance => _instance;
   static final EnginePlatformDispatcher _instance = EnginePlatformDispatcher();
 
-  /// The current platform configuration.
-  @override
-  ui.PlatformConfiguration configuration = ui.PlatformConfiguration(
+  @visibleForTesting
+  final DomElement accessibilityPlaceholder = EngineSemantics
+    .instance
+    .semanticsHelper
+    .prepareAccessibilityPlaceholder();
+
+  PlatformConfiguration configuration = PlatformConfiguration(
     locales: parseBrowserLanguages(),
     textScaleFactor: findBrowserTextScaleFactor(),
     accessibilityFeatures: computeAccessibilityFeatures(),
@@ -112,7 +120,13 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
   void dispose() {
     _removeBrightnessMediaQueryListener();
     _disconnectFontSizeObserver();
+    _removeLocaleChangedListener();
     HighContrastSupport.instance.removeListener(_updateHighContrast);
+    AppLifecycleState.instance.removeListener(_setAppLifecycleState);
+    _viewFocusBinding.dispose();
+    accessibilityPlaceholder.remove();
+    _onViewDisposedListener.cancel();
+    viewManager.dispose();
   }
 
   /// Receives all events related to platform configuration changes.
@@ -134,19 +148,50 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
         _onPlatformConfigurationChanged, _onPlatformConfigurationChangedZone);
   }
 
-  /// The current list of windows,
   @override
-  Iterable<ui.FlutterView> get views => _windows.values;
-  Map<Object, ui.FlutterWindow> get windows => _windows;
-  final Map<Object, ui.FlutterWindow> _windows = <Object, ui.FlutterWindow>{};
+  Iterable<EngineFlutterDisplay> displays = <EngineFlutterDisplay>[
+    EngineFlutterDisplay.instance,
+  ];
+
+  late final FlutterViewManager viewManager = FlutterViewManager(this);
+
+  /// The current list of windows.
+  @override
+  Iterable<EngineFlutterView> get views => viewManager.views;
+
+  /// Returns the [EngineFlutterView] with the provided ID if one exists, or null
+  /// otherwise.
+  @override
+  EngineFlutterView? view({required int id}) => viewManager[id];
 
-  /// A map of opaque platform window identifiers to window configurations.
+  /// The [FlutterView] provided by the engine if the platform is unable to
+  /// create windows, or, for backwards compatibility.
+  ///
+  /// If the platform provides an implicit view, it can be used to bootstrap
+  /// the framework. This is common for platforms designed for single-view
+  /// applications like mobile devices with a single display.
+  ///
+  /// Applications and libraries must not rely on this property being set
+  /// as it may be null depending on the engine's configuration. Instead,
+  /// consider using [View.of] to lookup the [FlutterView] the current
+  /// [BuildContext] is drawing into.
+  ///
+  /// While the properties on the referenced [FlutterView] may change,
+  /// the reference itself is guaranteed to never change over the lifetime
+  /// of the application: if this property is null at startup, it will remain
+  /// so throughout the entire lifetime of the application. If it points to a
+  /// specific [FlutterView], it will continue to point to the same view until
+  /// the application is shut down (although the engine may replace or remove
+  /// the underlying backing surface of the view at its discretion).
   ///
-  /// This should be considered a protected member, only to be used by
-  /// [PlatformDispatcher] subclasses.
-  Map<Object, ui.ViewConfiguration> get windowConfigurations => _windowConfigurations;
-  final Map<Object, ui.ViewConfiguration> _windowConfigurations =
-      <Object, ui.ViewConfiguration>{};
+  /// See also:
+  ///
+  /// * [View.of], for accessing the current view.
+  /// * [PlatformDisptacher.views] for a list of all [FlutterView]s provided
+  ///   by the platform.
+  @override
+  EngineFlutterWindow? get implicitView =>
+      viewManager[kImplicitViewId] as EngineFlutterWindow?;
 
   /// A callback that is invoked whenever the platform's [devicePixelRatio],
   /// [physicalSize], [padding], [viewInsets], or [systemGestureInsets]
@@ -183,13 +228,42 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
     }
   }
 
-  /// Returns device pixel ratio returned by browser.
-  static double get browserDevicePixelRatio {
-    final double ratio = domWindow.devicePixelRatio;
-    // Guard against WebOS returning 0.
-    return (ratio == 0.0) ? 1.0 : ratio;
+  late final ViewFocusBinding _viewFocusBinding =
+    ViewFocusBinding(viewManager, invokeOnViewFocusChange);
+
+  @override
+  ui.ViewFocusChangeCallback? get onViewFocusChange => _onViewFocusChange;
+  ui.ViewFocusChangeCallback? _onViewFocusChange;
+  Zone? _onViewFocusChangeZone;
+  @override
+  set onViewFocusChange(ui.ViewFocusChangeCallback? callback) {
+    _onViewFocusChange = callback;
+    _onViewFocusChangeZone = Zone.current;
+  }
+
+  // Engine code should use this method instead of the callback directly.
+  // Otherwise zones won't work properly.
+  void invokeOnViewFocusChange(ui.ViewFocusEvent viewFocusEvent) {
+    invoke1<ui.ViewFocusEvent>(
+      _onViewFocusChange,
+      _onViewFocusChangeZone,
+      viewFocusEvent,
+    );
   }
 
+  @override
+  void requestViewFocusChange({
+    required int viewId,
+    required ui.ViewFocusState state,
+    required ui.ViewFocusDirection direction,
+  }) {
+    _viewFocusBinding.changeViewFocus(viewId, state);
+  }
+
+  /// A set of views which have rendered in the current `onBeginFrame` or
+  /// `onDrawFrame` scope.
+  Set<ui.FlutterView>? _viewsRenderedInCurrentFrame;
+
   /// A callback invoked when any window begins a frame.
   ///
   /// A callback that is invoked to notify the application that it is an
@@ -212,7 +286,9 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
   /// Engine code should use this method instead of the callback directly.
   /// Otherwise zones won't work properly.
   void invokeOnBeginFrame(Duration duration) {
+    _viewsRenderedInCurrentFrame = <ui.FlutterView>{};
     invoke1<Duration>(_onBeginFrame, _onBeginFrameZone, duration);
+    _viewsRenderedInCurrentFrame = null;
   }
 
   /// A callback that is invoked for each frame after [onBeginFrame] has
@@ -233,7 +309,9 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
   /// Engine code should use this method instead of the callback directly.
   /// Otherwise zones won't work properly.
   void invokeOnDrawFrame() {
+    _viewsRenderedInCurrentFrame = <ui.FlutterView>{};
     invoke(_onDrawFrame, _onDrawFrameZone);
+    _viewsRenderedInCurrentFrame = null;
   }
 
   /// A callback that is invoked when pointer data is available.
@@ -414,15 +492,21 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
     };
   }
 
-  PlatformViewMessageHandler? _platformViewMessageHandler;
-
   void _sendPlatformMessage(
     String name,
     ByteData? data,
     ui.PlatformMessageResponseCallback? callback,
   ) {
     // In widget tests we want to bypass processing of platform messages.
-    if (assertionsEnabled && ui.debugEmulateFlutterTesterEnvironment) {
+    bool returnImmediately = false;
+    assert(() {
+      if (ui_web.debugEmulateFlutterTesterEnvironment) {
+        returnImmediately = true;
+      }
+      return true;
+    }());
+
+    if (returnImmediately) {
       return;
     }
 
@@ -430,18 +514,22 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
       print('Sent platform message on channel: "$name"');
     }
 
-    if (assertionsEnabled && name == 'flutter/debug-echo') {
+    bool allowDebugEcho = false;
+    assert(() {
+      allowDebugEcho = true;
+      return true;
+    }());
+
+    if (allowDebugEcho && name == 'flutter/debug-echo') {
       // Echoes back the data unchanged. Used for testing purposes.
       replyToPlatformMessage(callback, data);
       return;
     }
 
     switch (name) {
-
       /// This should be in sync with shell/common/shell.cc
       case 'flutter/skia':
-        const MethodCodec codec = JSONMethodCodec();
-        final MethodCall decoded = codec.decodeMethodCall(data);
+        final MethodCall decoded = jsonCodec.decodeMethodCall(data);
         switch (decoded.method) {
           case 'Skia.setResourceCacheMaxBytes':
             if (renderer is CanvasKitRenderer) {
@@ -450,67 +538,86 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
                 'Argument to Skia.setResourceCacheMaxBytes must be an int, but was ${decoded.arguments.runtimeType}',
               );
               final int cacheSizeInBytes = decoded.arguments as int;
-              CanvasKitRenderer.instance.resourceCacheMaxBytes = cacheSizeInBytes;
+              CanvasKitRenderer.instance.resourceCacheMaxBytes =
+                  cacheSizeInBytes;
             }
 
             // Also respond in HTML mode. Otherwise, apps would have to detect
             // CanvasKit vs HTML before invoking this method.
             replyToPlatformMessage(
-                callback, codec.encodeSuccessEnvelope(<bool>[true]));
-            break;
+                callback, jsonCodec.encodeSuccessEnvelope(<bool>[true]));
         }
         return;
 
       case 'flutter/assets':
         final String url = utf8.decode(data!.buffer.asUint8List());
-        ui.webOnlyAssetManager.load(url).then((ByteData assetData) {
-          replyToPlatformMessage(callback, assetData);
-        }, onError: (dynamic error) {
-          printWarning('Error while trying to load an asset: $error');
-          replyToPlatformMessage(callback, null);
-        });
+        _handleFlutterAssetsMessage(url, callback);
         return;
 
       case 'flutter/platform':
-        const MethodCodec codec = JSONMethodCodec();
-        final MethodCall decoded = codec.decodeMethodCall(data);
+        final MethodCall decoded = jsonCodec.decodeMethodCall(data);
         switch (decoded.method) {
           case 'SystemNavigator.pop':
-            // TODO(gspencergoog): As multi-window support expands, the pop call
-            // will need to include the window ID. Right now only one window is
+            // TODO(a-wallen): As multi-window support expands, the pop call
+            // will need to include the view ID. Right now only one view is
             // supported.
-            (_windows[0]! as EngineFlutterWindow)
-                .browserHistory
-                .exit()
-                .then((_) {
+            //
+            // TODO(mdebbar): What should we do in multi-view mode?
+            //                https://github.com/flutter/flutter/issues/139174
+            if (implicitView != null) {
+              implicitView!.browserHistory.exit().then((_) {
+                replyToPlatformMessage(
+                  callback,
+                  jsonCodec.encodeSuccessEnvelope(true),
+                );
+              });
+            } else {
               replyToPlatformMessage(
-                  callback, codec.encodeSuccessEnvelope(true));
-            });
+                callback,
+                jsonCodec.encodeSuccessEnvelope(true),
+              );
+            }
             return;
           case 'HapticFeedback.vibrate':
             final String? type = decoded.arguments as String?;
             vibrate(_getHapticFeedbackDuration(type));
-            replyToPlatformMessage(callback, codec.encodeSuccessEnvelope(true));
+            replyToPlatformMessage(
+                callback, jsonCodec.encodeSuccessEnvelope(true));
             return;
           case 'SystemChrome.setApplicationSwitcherDescription':
-            final Map<String, dynamic> arguments = decoded.arguments as Map<String, dynamic>;
-            // TODO(ferhat): Find more appropriate defaults? Or noop when values are null?
+            final Map<String, Object?> arguments =
+                decoded.arguments as Map<String, Object?>;
             final String label = arguments['label'] as String? ?? '';
-            final int primaryColor = arguments['primaryColor'] as int? ?? 0xFF000000;
+            // TODO(web): Stop setting the color from here, https://github.com/flutter/flutter/issues/123365
+            final int primaryColor =
+                arguments['primaryColor'] as int? ?? 0xFF000000;
             domDocument.title = label;
             setThemeColor(ui.Color(primaryColor));
-            replyToPlatformMessage(callback, codec.encodeSuccessEnvelope(true));
+            replyToPlatformMessage(
+                callback, jsonCodec.encodeSuccessEnvelope(true));
+            return;
+          case 'SystemChrome.setSystemUIOverlayStyle':
+            final Map<String, Object?> arguments =
+                decoded.arguments as Map<String, Object?>;
+            final int? statusBarColor = arguments['statusBarColor'] as int?;
+            setThemeColor(
+                statusBarColor == null ? null : ui.Color(statusBarColor));
+            replyToPlatformMessage(
+                callback, jsonCodec.encodeSuccessEnvelope(true));
             return;
           case 'SystemChrome.setPreferredOrientations':
             final List<dynamic> arguments = decoded.arguments as List<dynamic>;
-            flutterViewEmbedder.setPreferredOrientation(arguments).then((bool success) {
+            ScreenOrientation.instance
+                .setPreferredOrientation(arguments)
+                .then((bool success) {
               replyToPlatformMessage(
-                  callback, codec.encodeSuccessEnvelope(success));
+                  callback, jsonCodec.encodeSuccessEnvelope(success));
             });
             return;
           case 'SystemSound.play':
             // There are no default system sounds on web.
-            replyToPlatformMessage(callback, codec.encodeSuccessEnvelope(true));
+            replyToPlatformMessage(
+                callback, jsonCodec.encodeSuccessEnvelope(true));
             return;
           case 'Clipboard.setData':
             ClipboardMessageHandler().setDataMethodCall(decoded, callback);
@@ -518,8 +625,10 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
           case 'Clipboard.getData':
             ClipboardMessageHandler().getDataMethodCall(callback);
             return;
+          case 'Clipboard.hasStrings':
+            ClipboardMessageHandler().hasStringsMethodCall(callback);
+            return;
         }
-        break;
 
       // Dispatched by the bindings to delay service worker initialization.
       case 'flutter/service_worker':
@@ -530,55 +639,82 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
         textEditing.channel.handleTextInput(data, callback);
         return;
 
+      case 'flutter/contextmenu':
+        final MethodCall decoded = jsonCodec.decodeMethodCall(data);
+        switch (decoded.method) {
+          case 'enableContextMenu':
+            implicitView!.contextMenu.enable();
+            replyToPlatformMessage(
+                callback, jsonCodec.encodeSuccessEnvelope(true));
+            return;
+          case 'disableContextMenu':
+            implicitView!.contextMenu.disable();
+            replyToPlatformMessage(
+                callback, jsonCodec.encodeSuccessEnvelope(true));
+            return;
+        }
+        return;
+
       case 'flutter/mousecursor':
-        const MethodCodec codec = StandardMethodCodec();
-        final MethodCall decoded = codec.decodeMethodCall(data);
-        final Map<dynamic, dynamic> arguments = decoded.arguments as Map<dynamic, dynamic>;
+        final MethodCall decoded = standardCodec.decodeMethodCall(data);
+        final Map<dynamic, dynamic> arguments =
+            decoded.arguments as Map<dynamic, dynamic>;
         switch (decoded.method) {
           case 'activateSystemCursor':
-            MouseCursor.instance!.activateSystemCursor(arguments.tryString('kind'));
+            // TODO(mdebbar): Once the framework starts sending us a viewId, we
+            //                should use it to grab the correct view.
+            //                https://github.com/flutter/flutter/issues/140226
+            views.firstOrNull?.mouseCursor
+                .activateSystemCursor(arguments.tryString('kind'));
         }
         return;
 
       case 'flutter/web_test_e2e':
-        const MethodCodec codec = JSONMethodCodec();
         replyToPlatformMessage(
             callback,
-            codec.encodeSuccessEnvelope(
-                _handleWebTestEnd2EndMessage(codec, data)));
+            jsonCodec.encodeSuccessEnvelope(
+                _handleWebTestEnd2EndMessage(jsonCodec, data)));
         return;
 
-      case 'flutter/platform_views':
-        _platformViewMessageHandler ??= PlatformViewMessageHandler(
-          contentManager: platformViewManager,
-          contentHandler: (DomElement content) {
-            flutterViewEmbedder.glassPaneElement!.append(content);
-          },
-        );
-        _platformViewMessageHandler!.handlePlatformViewCall(data, callback!);
+      case PlatformViewMessageHandler.channelName:
+        // `arguments` can be a Map<String, Object> for `create`,
+        // but an `int` for `dispose`, hence why `dynamic` everywhere.
+        final MethodCall(:String method, :dynamic arguments) =
+            standardCodec.decodeMethodCall(data);
+        PlatformViewMessageHandler.instance
+            .handlePlatformViewCall(method, arguments, callback!);
         return;
 
       case 'flutter/accessibility':
         // In widget tests we want to bypass processing of platform messages.
         const StandardMessageCodec codec = StandardMessageCodec();
-        accessibilityAnnouncements.handleMessage(codec, data);
+        // TODO(yjbanov): Dispatch the announcement to the correct view?
+        //                https://github.com/flutter/flutter/issues/137445
+        implicitView?.accessibilityAnnouncements.handleMessage(codec, data);
         replyToPlatformMessage(callback, codec.encodeMessage(true));
         return;
 
       case 'flutter/navigation':
-        // TODO(gspencergoog): As multi-window support expands, the navigation call
-        // will need to include the window ID. Right now only one window is
+        // TODO(a-wallen): As multi-window support expands, the navigation call
+        // will need to include the view ID. Right now only one view is
         // supported.
-        (_windows[0]! as EngineFlutterWindow)
-            .handleNavigationMessage(data)
-            .then((bool handled) {
-          if (handled) {
-            const MethodCodec codec = JSONMethodCodec();
-            replyToPlatformMessage(callback, codec.encodeSuccessEnvelope(true));
-          } else {
-            callback?.call(null);
-          }
-        });
+        //
+        // TODO(mdebbar): What should we do in multi-view mode?
+        //                https://github.com/flutter/flutter/issues/139174
+        if (implicitView != null) {
+          implicitView!.handleNavigationMessage(data).then((bool handled) {
+            if (handled) {
+              replyToPlatformMessage(
+                callback,
+                jsonCodec.encodeSuccessEnvelope(true),
+              );
+            } else {
+              callback?.call(null);
+            }
+          });
+        } else {
+          callback?.call(null);
+        }
 
         // As soon as Flutter starts taking control of the app navigation, we
         // should reset _defaultRouteName to "/" so it doesn't have any
@@ -598,6 +734,19 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
     replyToPlatformMessage(callback, null);
   }
 
+  Future<void> _handleFlutterAssetsMessage(
+      String url, ui.PlatformMessageResponseCallback? callback) async {
+    try {
+      final HttpFetchResponse response =
+          await ui_web.assetManager.loadAsset(url) as HttpFetchResponse;
+      final ByteBuffer assetData = await response.asByteBuffer();
+      replyToPlatformMessage(callback, assetData.asByteData());
+    } catch (error) {
+      printWarning('Error while trying to load an asset: $error');
+      replyToPlatformMessage(callback, null);
+    }
+  }
+
   int _getHapticFeedbackDuration(String? type) {
     const int vibrateLongPress = 50;
     const int vibrateLightImpact = 10;
@@ -634,6 +783,19 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
     scheduleFrameCallback!();
   }
 
+  @override
+  void scheduleWarmUpFrame({required ui.VoidCallback beginFrame, required ui.VoidCallback drawFrame}) {
+    Timer.run(beginFrame);
+    // We use timers here to ensure that microtasks flush in between.
+    //
+    // TODO(dkwingsmt): This logic was moved from the framework and is different
+    // from how Web renders a regular frame, which doesn't flush microtasks
+    // between the callbacks at all (see `initializeEngineServices`). We might
+    // want to change this. See the to-do in `initializeEngineServices` and
+    // https://github.com/flutter/engine/pull/50570#discussion_r1496671676
+    Timer.run(drawFrame);
+  }
+
   /// Updates the application's rendering on the GPU with the newly provided
   /// [Scene]. This function must be called within the scope of the
   /// [onBeginFrame] or [onDrawFrame] callbacks being invoked. If this function
@@ -658,9 +820,26 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
   ///    scheduling of frames.
   ///  * [RendererBinding], the Flutter framework class which manages layout and
   ///    painting.
-  @override
-  void render(ui.Scene scene, [ui.FlutterView? view]) {
-    renderer.renderScene(scene);
+  Future<void> render(ui.Scene scene, [ui.FlutterView? view]) async {
+    final EngineFlutterView? target = (view ?? implicitView) as EngineFlutterView?;
+    assert(target != null, 'Calling render without a FlutterView');
+    if (target == null) {
+      // If there is no view to render into, then this is a no-op.
+      return;
+    }
+
+    // Only render in an `onDrawFrame` or `onBeginFrame` scope. This is checked
+    // by checking if the `_viewsRenderedInCurrentFrame` is non-null and this
+    // view hasn't been rendered already in this scope.
+    final bool shouldRender =
+        _viewsRenderedInCurrentFrame?.add(target) ?? false;
+    // TODO(harryterkelsen): HTML renderer needs to violate the render rule in
+    // order to perform golden tests in Flutter framework because on the HTML
+    // renderer, golden tests render to DOM and then take a browser screenshot,
+    // https://github.com/flutter/flutter/issues/137073.
+    if (shouldRender || renderer.rendererTag == 'html') {
+      await renderer.renderScene(scene, target);
+    }
   }
 
   /// Additional accessibility features that may be enabled by the platform.
@@ -707,7 +886,7 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
     call `updateSemantics`.
   ''')
   void updateSemantics(ui.SemanticsUpdate update) {
-    EngineSemanticsOwner.instance.updateSemantics(update);
+    implicitView?.semantics.updateSemantics(update);
   }
 
   /// This is equivalent to `locales.first`, except that it will provide an
@@ -743,6 +922,29 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
   @override
   List<ui.Locale> get locales => configuration.locales;
 
+  // A subscription to the 'languagechange' event of 'window'.
+  DomSubscription? _onLocaleChangedSubscription;
+
+  /// Configures the [_onLocaleChangedSubscription].
+  void _addLocaleChangedListener() {
+    if (_onLocaleChangedSubscription != null) {
+      return;
+    }
+    updateLocales(); // First time, for good measure.
+    _onLocaleChangedSubscription =
+        DomSubscription(domWindow, 'languagechange', (DomEvent _) {
+      // Update internal config, then propagate the changes.
+      updateLocales();
+      invokeOnLocaleChanged();
+    });
+  }
+
+  /// Removes the [_onLocaleChangedSubscription].
+  void _removeLocaleChangedListener() {
+    _onLocaleChangedSubscription?.cancel();
+    _onLocaleChangedSubscription = null;
+  }
+
   /// Performs the platform-native locale resolution.
   ///
   /// Each platform may return different results.
@@ -787,7 +989,7 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
     configuration = configuration.copyWith(locales: const <ui.Locale>[]);
   }
 
-  // Called by FlutterViewEmbedder when browser languages change.
+  // Called by `_onLocaleChangedSubscription` when browser languages change.
   void updateLocales() {
     configuration = configuration.copyWith(locales: parseBrowserLanguages());
   }
@@ -864,17 +1066,17 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
   void _addFontSizeObserver() {
     const String styleAttribute = 'style';
 
-    _fontSizeObserver = createDomMutationObserver(allowInterop(
-        (List<dynamic> mutations, DomMutationObserver _) {
-      for (final dynamic mutation in mutations) {
-        final DomMutationRecord record = mutation as DomMutationRecord;
+    _fontSizeObserver = createDomMutationObserver(
+        (JSArray<JSAny?> mutations, DomMutationObserver _) {
+      for (final JSAny? mutation in mutations.toDart) {
+        final DomMutationRecord record = mutation! as DomMutationRecord;
         if (record.type == 'attributes' &&
             record.attributeName == styleAttribute) {
           final double newTextScaleFactor = findBrowserTextScaleFactor();
           _updateTextScaleFactor(newTextScaleFactor);
         }
       }
-    }));
+    });
     _fontSizeObserver!.observe(
       domDocument.documentElement!,
       attributes: true,
@@ -888,6 +1090,14 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
     _fontSizeObserver = null;
   }
 
+  void _setAppLifecycleState(ui.AppLifecycleState state) {
+    invokeOnPlatformMessage(
+      'flutter/lifecycle',
+      const StringCodec().encodeMessage(state.toString()),
+      (_) {},
+    );
+  }
+
   /// A callback that is invoked whenever [textScaleFactor] changes value.
   ///
   /// The framework invokes this callback in the same zone in which the
@@ -915,7 +1125,8 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
 
   void updateSemanticsEnabled(bool semanticsEnabled) {
     if (semanticsEnabled != this.semanticsEnabled) {
-      configuration = configuration.copyWith(semanticsEnabled: semanticsEnabled);
+      configuration =
+          configuration.copyWith(semanticsEnabled: semanticsEnabled);
       if (_onSemanticsEnabledChanged != null) {
         invokeOnSemanticsEnabledChanged();
       }
@@ -968,9 +1179,8 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
         ? ui.Brightness.dark
         : ui.Brightness.light);
 
-    _brightnessMediaQueryListener = allowInterop((DomEvent event) {
-      final DomMediaQueryListEvent mqEvent =
-          event as DomMediaQueryListEvent;
+    _brightnessMediaQueryListener = createDomEventListener((DomEvent event) {
+      final DomMediaQueryListEvent mqEvent = event as DomMediaQueryListEvent;
       _updatePlatformBrightness(
           mqEvent.matches! ? ui.Brightness.dark : ui.Brightness.light);
     });
@@ -1019,8 +1229,7 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
   ///  * [WidgetsBindingObserver], for a mechanism at the widgets layer to
   ///    observe when this callback is invoked.
   @override
-  ui.VoidCallback? get onSystemFontFamilyChanged =>
-      _onSystemFontFamilyChanged;
+  ui.VoidCallback? get onSystemFontFamilyChanged => _onSystemFontFamilyChanged;
   ui.VoidCallback? _onSystemFontFamilyChanged;
   Zone? _onSystemFontFamilyChangedZone;
   @override
@@ -1064,29 +1273,38 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
   }
 
   /// A callback that is invoked whenever the user requests an action to be
-  /// performed.
+  /// performed on a semantics node.
   ///
   /// This callback is used when the user expresses the action they wish to
-  /// perform based on the semantics supplied by [updateSemantics].
+  /// perform based on the semantics node supplied by updateSemantics.
   ///
   /// The framework invokes this callback in the same zone in which the
   /// callback was set.
   @override
-  ui.SemanticsActionCallback? get onSemanticsAction => _onSemanticsAction;
-  ui.SemanticsActionCallback? _onSemanticsAction;
-  Zone? _onSemanticsActionZone;
+  ui.SemanticsActionEventCallback? get onSemanticsActionEvent =>
+      _onSemanticsActionEvent;
+  ui.SemanticsActionEventCallback? _onSemanticsActionEvent;
+  Zone _onSemanticsActionEventZone = Zone.root;
   @override
-  set onSemanticsAction(ui.SemanticsActionCallback? callback) {
-    _onSemanticsAction = callback;
-    _onSemanticsActionZone = Zone.current;
+  set onSemanticsActionEvent(ui.SemanticsActionEventCallback? callback) {
+    _onSemanticsActionEvent = callback;
+    _onSemanticsActionEventZone = Zone.current;
   }
 
   /// Engine code should use this method instead of the callback directly.
   /// Otherwise zones won't work properly.
   void invokeOnSemanticsAction(
-      int id, ui.SemanticsAction action, ByteData? args) {
-    invoke3<int, ui.SemanticsAction, ByteData?>(
-        _onSemanticsAction, _onSemanticsActionZone, id, action, args);
+      int nodeId, ui.SemanticsAction action, ByteData? args) {
+    invoke1<ui.SemanticsActionEvent>(
+      _onSemanticsActionEvent,
+      _onSemanticsActionEventZone,
+      ui.SemanticsActionEvent(
+        type: action,
+        nodeId: nodeId,
+        viewId: 0, // TODO(goderbauer): Wire up the real view ID.
+        arguments: args,
+      ),
+    );
   }
 
   // TODO(dnfield): make this work on web.
@@ -1121,7 +1339,7 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
   /// ## iOS
   ///
   /// On iOS, calling
-  /// [`FlutterViewController.setInitialRoute`](/objcdoc/Classes/FlutterViewController.html#/c:objc%28cs%29FlutterViewController%28im%29setInitialRoute:)
+  /// [`FlutterViewController.setInitialRoute`](/ios-embedder/interface_flutter_view_controller.html#a7f269c2da73312f856d42611cc12a33f)
   /// will set this value. The value must be set sufficiently early, i.e. before
   /// the [runApp] call is executed in Dart, for this to have any effect on the
   /// framework. The `application:didFinishLaunchingWithOptions:` method is a
@@ -1134,8 +1352,10 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
   ///    requests from the embedder.
   @override
   String get defaultRouteName {
+    // TODO(mdebbar): What should we do in multi-view mode?
+    //                https://github.com/flutter/flutter/issues/139174
     return _defaultRouteName ??=
-        (_windows[0]! as EngineFlutterWindow).browserHistory.currentPath;
+        implicitView?.browserHistory.currentPath ?? '/';
   }
 
   /// Lazily initialized when the `defaultRouteName` getter is invoked.
@@ -1160,6 +1380,10 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
 
   @override
   ui.FrameData get frameData => const ui.FrameData.webOnly();
+
+  @override
+  double scaleFontSize(double unscaledFontSize) =>
+      unscaledFontSize * textScaleFactor;
 }
 
 bool _handleWebTestEnd2EndMessage(MethodCodec codec, ByteData? data) {
@@ -1167,7 +1391,7 @@ bool _handleWebTestEnd2EndMessage(MethodCodec codec, ByteData? data) {
   final double ratio = double.parse(decoded.arguments as String);
   switch (decoded.method) {
     case 'setDevicePixelRatio':
-      window.debugOverrideDevicePixelRatio(ratio);
+      EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(ratio);
       EnginePlatformDispatcher.instance.onMetricsChanged!();
       return true;
   }
@@ -1245,6 +1469,106 @@ const double _defaultRootFontSize = 16.0;
 /// Finds the text scale factor of the browser by looking at the computed style
 /// of the browser's <html> element.
 double findBrowserTextScaleFactor() {
-  final num fontSize = parseFontSize(domDocument.documentElement!) ?? _defaultRootFontSize;
+  final num fontSize =
+      parseFontSize(domDocument.documentElement!) ?? _defaultRootFontSize;
   return fontSize / _defaultRootFontSize;
 }
+
+class ViewConfiguration {
+  const ViewConfiguration({
+    this.view,
+    this.devicePixelRatio = 1.0,
+    this.visible = false,
+    this.viewInsets = ui.ViewPadding.zero as ViewPadding,
+    this.viewPadding = ui.ViewPadding.zero as ViewPadding,
+    this.systemGestureInsets = ui.ViewPadding.zero as ViewPadding,
+    this.padding = ui.ViewPadding.zero as ViewPadding,
+    this.gestureSettings = const ui.GestureSettings(),
+    this.displayFeatures = const <ui.DisplayFeature>[],
+  });
+
+  ViewConfiguration copyWith({
+    EngineFlutterView? view,
+    double? devicePixelRatio,
+    bool? visible,
+    ViewPadding? viewInsets,
+    ViewPadding? viewPadding,
+    ViewPadding? systemGestureInsets,
+    ViewPadding? padding,
+    ui.GestureSettings? gestureSettings,
+    List<ui.DisplayFeature>? displayFeatures,
+  }) {
+    return ViewConfiguration(
+      view: view ?? this.view,
+      devicePixelRatio: devicePixelRatio ?? this.devicePixelRatio,
+      visible: visible ?? this.visible,
+      viewInsets: viewInsets ?? this.viewInsets,
+      viewPadding: viewPadding ?? this.viewPadding,
+      systemGestureInsets: systemGestureInsets ?? this.systemGestureInsets,
+      padding: padding ?? this.padding,
+      gestureSettings: gestureSettings ?? this.gestureSettings,
+      displayFeatures: displayFeatures ?? this.displayFeatures,
+    );
+  }
+
+  final EngineFlutterView? view;
+  final double devicePixelRatio;
+  final bool visible;
+  final ViewPadding viewInsets;
+  final ViewPadding viewPadding;
+  final ViewPadding systemGestureInsets;
+  final ViewPadding padding;
+  final ui.GestureSettings gestureSettings;
+  final List<ui.DisplayFeature> displayFeatures;
+
+  @override
+  String toString() {
+    return '$runtimeType[view: $view]';
+  }
+}
+
+class PlatformConfiguration {
+  const PlatformConfiguration({
+    this.accessibilityFeatures = const EngineAccessibilityFeatures(0),
+    this.alwaysUse24HourFormat = false,
+    this.semanticsEnabled = false,
+    this.platformBrightness = ui.Brightness.light,
+    this.textScaleFactor = 1.0,
+    this.locales = const <ui.Locale>[],
+    this.defaultRouteName = '/',
+    this.systemFontFamily,
+  });
+
+  PlatformConfiguration copyWith({
+    ui.AccessibilityFeatures? accessibilityFeatures,
+    bool? alwaysUse24HourFormat,
+    bool? semanticsEnabled,
+    ui.Brightness? platformBrightness,
+    double? textScaleFactor,
+    List<ui.Locale>? locales,
+    String? defaultRouteName,
+    String? systemFontFamily,
+  }) {
+    return PlatformConfiguration(
+      accessibilityFeatures:
+          accessibilityFeatures ?? this.accessibilityFeatures,
+      alwaysUse24HourFormat:
+          alwaysUse24HourFormat ?? this.alwaysUse24HourFormat,
+      semanticsEnabled: semanticsEnabled ?? this.semanticsEnabled,
+      platformBrightness: platformBrightness ?? this.platformBrightness,
+      textScaleFactor: textScaleFactor ?? this.textScaleFactor,
+      locales: locales ?? this.locales,
+      defaultRouteName: defaultRouteName ?? this.defaultRouteName,
+      systemFontFamily: systemFontFamily ?? this.systemFontFamily,
+    );
+  }
+
+  final ui.AccessibilityFeatures accessibilityFeatures;
+  final bool alwaysUse24HourFormat;
+  final bool semanticsEnabled;
+  final ui.Brightness platformBrightness;
+  final double textScaleFactor;
+  final List<ui.Locale> locales;
+  final String defaultRouteName;
+  final String? systemFontFamily;
+}
diff --git a/lib/web_ui/lib/src/engine/platform_dispatcher/app_lifecycle_state.dart b/lib/web_ui/lib/src/engine/platform_dispatcher/app_lifecycle_state.dart
new file mode 100644
index 0000000000000000000000000000000000000000..138fcccab4dbfb7c74f6a1e549ef2be9e299b2ab
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/platform_dispatcher/app_lifecycle_state.dart
@@ -0,0 +1,106 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:meta/meta.dart';
+import 'package:ui/ui.dart' as ui;
+
+import '../../engine.dart';
+
+/// Signature of functions added as a listener to [ui.AppLifecycleState] changes
+typedef AppLifecycleStateListener = void Function(ui.AppLifecycleState state);
+
+/// Determines the [ui.AppLifecycleState].
+abstract class AppLifecycleState {
+  static final AppLifecycleState instance = _BrowserAppLifecycleState();
+
+  ui.AppLifecycleState get appLifecycleState => _appLifecycleState;
+  ui.AppLifecycleState _appLifecycleState = ui.AppLifecycleState.resumed;
+
+  final List<AppLifecycleStateListener> _listeners =
+      <AppLifecycleStateListener>[];
+
+  void addListener(AppLifecycleStateListener listener) {
+    if (_listeners.isEmpty) {
+      activate();
+    }
+    _listeners.add(listener);
+    listener(_appLifecycleState);
+  }
+
+  void removeListener(AppLifecycleStateListener listener) {
+    _listeners.remove(listener);
+    if (_listeners.isEmpty) {
+      deactivate();
+    }
+  }
+
+  @protected
+  void activate();
+
+  @protected
+  void deactivate();
+
+  @visibleForTesting
+  void onAppLifecycleStateChange(ui.AppLifecycleState newState) {
+    if (newState != _appLifecycleState) {
+      _appLifecycleState = newState;
+      for (final AppLifecycleStateListener listener in _listeners) {
+        listener(newState);
+      }
+    }
+  }
+}
+
+/// Manages [ui.AppLifecycleState] within a web context by monitoring specific
+/// browser events.
+///
+/// This class listens to:
+/// - 'beforeunload' on [DomWindow] to detect detachment,
+/// - 'visibilitychange' on [DomHTMLDocument] to observe visibility changes,
+/// - 'focus' and 'blur' on [DomWindow] to track application focus shifts.
+class _BrowserAppLifecycleState extends AppLifecycleState {
+  @override
+  void activate() {
+    domWindow.addEventListener('focus', _focusListener);
+    domWindow.addEventListener('blur', _blurListener);
+    // TODO(web): Register 'beforeunload' only if lifecycle listeners exist, to improve efficiency: https://developer.mozilla.org/en-US/docs/Web/API/Window/beforeunload_event#usage_notes
+    domWindow.addEventListener('beforeunload', _beforeUnloadListener);
+    domDocument.addEventListener('visibilitychange', _visibilityChangeListener);
+  }
+
+  @override
+  void deactivate() {
+    domWindow.removeEventListener('focus', _focusListener);
+    domWindow.removeEventListener('blur', _blurListener);
+    domWindow.removeEventListener('beforeunload', _beforeUnloadListener);
+    domDocument.removeEventListener(
+      'visibilitychange',
+      _visibilityChangeListener,
+    );
+  }
+
+  late final DomEventListener _focusListener =
+      createDomEventListener((DomEvent event) {
+    onAppLifecycleStateChange(ui.AppLifecycleState.resumed);
+  });
+
+  late final DomEventListener _blurListener =
+      createDomEventListener((DomEvent event) {
+    onAppLifecycleStateChange(ui.AppLifecycleState.inactive);
+  });
+
+  late final DomEventListener _beforeUnloadListener =
+      createDomEventListener((DomEvent event) {
+    onAppLifecycleStateChange(ui.AppLifecycleState.detached);
+  });
+
+  late final DomEventListener _visibilityChangeListener =
+      createDomEventListener((DomEvent event) {
+    if (domDocument.visibilityState == 'visible') {
+      onAppLifecycleStateChange(ui.AppLifecycleState.resumed);
+    } else if (domDocument.visibilityState == 'hidden') {
+      onAppLifecycleStateChange(ui.AppLifecycleState.hidden);
+    }
+  });
+}
diff --git a/lib/web_ui/lib/src/engine/platform_dispatcher/view_focus_binding.dart b/lib/web_ui/lib/src/engine/platform_dispatcher/view_focus_binding.dart
new file mode 100644
index 0000000000000000000000000000000000000000..1dc10b9fef84662464b6892df67167d254464d82
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/platform_dispatcher/view_focus_binding.dart
@@ -0,0 +1,135 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui;
+
+/// Tracks the [FlutterView]s focus changes.
+final class ViewFocusBinding {
+  ViewFocusBinding(this._viewManager, this._onViewFocusChange);
+
+  final FlutterViewManager _viewManager;
+  final ui.ViewFocusChangeCallback _onViewFocusChange;
+
+  int? _lastViewId;
+  ui.ViewFocusDirection _viewFocusDirection = ui.ViewFocusDirection.forward;
+
+  StreamSubscription<int>? _onViewCreatedListener;
+
+  void init() {
+    domDocument.body?.addEventListener(_keyDown, _handleKeyDown);
+    domDocument.body?.addEventListener(_keyUp, _handleKeyUp);
+    domDocument.body?.addEventListener(_focusin, _handleFocusin);
+    domDocument.body?.addEventListener(_focusout, _handleFocusout);
+    _onViewCreatedListener = _viewManager.onViewCreated.listen(_handleViewCreated);
+  }
+
+  void dispose() {
+    domDocument.body?.removeEventListener(_keyDown, _handleKeyDown);
+    domDocument.body?.removeEventListener(_keyUp, _handleKeyUp);
+    domDocument.body?.removeEventListener(_focusin, _handleFocusin);
+    domDocument.body?.removeEventListener(_focusout, _handleFocusout);
+    _onViewCreatedListener?.cancel();
+  }
+
+  void changeViewFocus(int viewId, ui.ViewFocusState state) {
+    final DomElement? viewElement = _viewManager[viewId]?.dom.rootElement;
+
+    if (state == ui.ViewFocusState.focused) {
+      // Only move the focus to the flutter view if nothing inside it is focused already.
+      if (viewId != _viewId(domDocument.activeElement)) {
+        viewElement?.focus();
+      }
+    } else {
+      viewElement?.blur();
+    }
+  }
+
+  late final DomEventListener _handleFocusin = createDomEventListener((DomEvent event) {
+    event as DomFocusEvent;
+    _handleFocusChange(event.target as DomElement?);
+  });
+
+  late final DomEventListener _handleFocusout = createDomEventListener((DomEvent event) {
+    event as DomFocusEvent;
+    _handleFocusChange(event.relatedTarget as DomElement?);
+  });
+
+  late final DomEventListener _handleKeyDown = createDomEventListener((DomEvent event) {
+    event as DomKeyboardEvent;
+    if (event.shiftKey) {
+      _viewFocusDirection = ui.ViewFocusDirection.backward;
+    }
+  });
+
+  late final DomEventListener _handleKeyUp = createDomEventListener((DomEvent event) {
+    _viewFocusDirection = ui.ViewFocusDirection.forward;
+  });
+
+  void _handleFocusChange(DomElement? focusedElement) {
+    final int? viewId = _viewId(focusedElement);
+    if (viewId == _lastViewId) {
+      return;
+    }
+
+    final ui.ViewFocusEvent event;
+    if (viewId == null) {
+      event = ui.ViewFocusEvent(
+        viewId: _lastViewId!,
+        state: ui.ViewFocusState.unfocused,
+        direction: ui.ViewFocusDirection.undefined,
+      );
+    } else {
+      event = ui.ViewFocusEvent(
+        viewId: viewId,
+        state: ui.ViewFocusState.focused,
+        direction: _viewFocusDirection,
+      );
+    }
+    _maybeMarkViewAsFocusable(_lastViewId, reachableByKeyboard: true);
+    _maybeMarkViewAsFocusable(viewId, reachableByKeyboard: false);
+    _lastViewId = viewId;
+    _onViewFocusChange(event);
+  }
+
+  int? _viewId(DomElement? element) {
+    final DomElement? rootElement = element?.closest(DomManager.flutterViewTagName);
+    if (rootElement == null) {
+      return null;
+    }
+    return _viewManager.viewIdForRootElement(rootElement);
+  }
+
+  void _handleViewCreated(int viewId) {
+    _maybeMarkViewAsFocusable(viewId, reachableByKeyboard: true);
+  }
+
+  void _maybeMarkViewAsFocusable(
+    int? viewId, {
+    required bool reachableByKeyboard,
+  }) {
+    if (viewId == null) {
+      return;
+    }
+
+    final DomElement? rootElement = _viewManager[viewId]?.dom.rootElement;
+    if (EngineSemantics.instance.semanticsEnabled) {
+      rootElement?.removeAttribute('tabindex');
+    } else {
+      // A tabindex with value zero means the DOM element can be reached by using
+      // the keyboard (tab, shift + tab). When its value is -1 it is still focusable
+      // but can't be focused by the result of keyboard events This is specially
+      // important when the semantics tree is enabled as it puts DOM nodes inside
+      // the flutter view and having it with a zero tabindex messes the focus
+      // traversal order when pressing tab or shift tab.
+      rootElement?.setAttribute('tabindex', reachableByKeyboard ? 0 : -1);
+    }
+  }
+
+  static const String _focusin = 'focusin';
+  static const String _focusout = 'focusout';
+  static const String _keyDown = 'keydown';
+  static const String _keyUp = 'keyup';
+}
diff --git a/lib/web_ui/lib/src/engine/platform_views/content_manager.dart b/lib/web_ui/lib/src/engine/platform_views/content_manager.dart
index baa68a08cf839124317663a68a05b6ef619a968f..c09eefcc18972c23a54e39fd2813199fe24d06de 100644
--- a/lib/web_ui/lib/src/engine/platform_views/content_manager.dart
+++ b/lib/web_ui/lib/src/engine/platform_views/content_manager.dart
@@ -2,25 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import '../browser_detection.dart';
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
+
 import '../dom.dart';
-import '../embedder.dart';
 import '../util.dart';
 import 'slots.dart';
 
-/// A function which takes a unique `id` and some `params` and creates an HTML element.
-///
-/// This is made available to end-users through dart:ui in web.
-typedef ParameterizedPlatformViewFactory = DomElement Function(
-  int viewId, {
-  Object? params,
-});
-
-/// A function which takes a unique `id` and creates an HTML element.
-///
-/// This is made available to end-users through dart:ui in web.
-typedef PlatformViewFactory = DomElement Function(int viewId);
-
 /// This class handles the lifecycle of Platform Views in the DOM of a Flutter Web App.
 ///
 /// There are three important parts of Platform Views. This class manages two of
@@ -36,6 +23,23 @@ typedef PlatformViewFactory = DomElement Function(int viewId);
 /// This class keeps a registry of `factories`, `contents` so the framework can
 /// CRUD Platform Views as needed, regardless of the rendering backend.
 class PlatformViewManager {
+  PlatformViewManager() {
+    // Register some default factories.
+    registerFactory(
+      ui_web.PlatformViewRegistry.defaultVisibleViewType,
+      _defaultFactory,
+    );
+    registerFactory(
+      ui_web.PlatformViewRegistry.defaultInvisibleViewType,
+      _defaultFactory,
+      isVisible: false,
+    );
+  }
+
+  /// The shared instance of PlatformViewManager shared across the engine to handle
+  /// rendering of PlatformViews into the web app.
+  static PlatformViewManager instance = PlatformViewManager();
+
   // The factory functions, indexed by the viewType
   final Map<String, Function> _factories = <String, Function>{};
 
@@ -47,7 +51,7 @@ class PlatformViewManager {
 
   /// Returns `true` if the passed in `viewType` has been registered before.
   ///
-  /// See [registerViewFactory] to understand how factories are registered.
+  /// See [registerFactory] to understand how factories are registered.
   bool knowsViewType(String viewType) {
     return _factories.containsKey(viewType);
   }
@@ -60,6 +64,31 @@ class PlatformViewManager {
     return _contents.containsKey(viewId);
   }
 
+  /// Returns the cached contents of [viewId], to be injected into the DOM.
+  ///
+  /// This is only used by the active `Renderer` object when a platform view needs
+  /// to be injected in the DOM, through `FlutterView.DomManager.injectPlatformView`.
+  ///
+  /// This may return null, if [renderContent] was not called before this. The
+  /// framework seems to allow/need this for some tests, so it is allowed here
+  /// as well.
+  ///
+  /// App programmers should not access this directly, and instead use [getViewById].
+  DomElement? getSlottedContent(int viewId) {
+    return _contents[viewId];
+  }
+
+  /// Returns the HTML element created by a registered factory for [viewId].
+  ///
+  /// Throws an [AssertionError] if [viewId] hasn't been rendered before.
+  DomElement getViewById(int viewId) {
+    assert(knowsViewId(viewId), 'No view has been rendered for viewId: $viewId');
+    // `_contents[viewId]` is the <flt-platform-view> element created by us. The
+    // first (and only) child of that is the element created by the user-supplied
+    // factory function.
+    return _contents[viewId]!.firstElementChild!;
+  }
+
   /// Registers a `factoryFunction` that knows how to render a Platform View of `viewType`.
   ///
   /// `viewType` is selected by the programmer, but it can't be overridden once
@@ -68,8 +97,13 @@ class PlatformViewManager {
   /// `factoryFunction` needs to be a [PlatformViewFactory].
   bool registerFactory(String viewType, Function factoryFunction,
       {bool isVisible = true}) {
-    assert(factoryFunction is PlatformViewFactory ||
-        factoryFunction is ParameterizedPlatformViewFactory);
+    assert(
+      factoryFunction is ui_web.PlatformViewFactory ||
+          factoryFunction is ui_web.ParameterizedPlatformViewFactory,
+      'Factory signature is invalid. Expected either '
+      '{${ui_web.PlatformViewFactory}} or {${ui_web.ParameterizedPlatformViewFactory}} '
+      'but got: {${factoryFunction.runtimeType}}',
+    );
 
     if (_factories.containsKey(viewType)) {
       return false;
@@ -83,14 +117,13 @@ class PlatformViewManager {
 
   /// Creates the HTML markup for the `contents` of a Platform View.
   ///
-  /// The result of this call is cached in the `_contents` Map. This is only
-  /// cached so it can be disposed of later by [clearPlatformView]. _Note that
-  /// there's no `getContents` function in this class._
+  /// The result of this call is cached in the `_contents` Map, so the active
+  /// renderer can inject it as needed.
   ///
   /// The resulting DOM for the `contents` of a Platform View looks like this:
   ///
   /// ```html
-  /// <flt-platform-view slot="...">
+  /// <flt-platform-view id="flt-pv-VIEW_ID" slot="...">
   ///   <arbitrary-html-elements />
   /// </flt-platform-view-slot>
   /// ```
@@ -116,57 +149,33 @@ class PlatformViewManager {
     return _contents.putIfAbsent(viewId, () {
       final DomElement wrapper = domDocument
           .createElement('flt-platform-view')
+            ..id = getPlatformViewDomId(viewId)
             ..setAttribute('slot', slotName);
 
       final Function factoryFunction = _factories[viewType]!;
-      late DomElement content;
+      final DomElement content;
 
-      if (factoryFunction is ParameterizedPlatformViewFactory) {
-        content = factoryFunction(viewId, params: params);
+      if (factoryFunction is ui_web.ParameterizedPlatformViewFactory) {
+        content = factoryFunction(viewId, params: params) as DomElement;
       } else {
-        content = (factoryFunction as PlatformViewFactory).call(viewId);
+        factoryFunction as ui_web.PlatformViewFactory;
+        content = factoryFunction(viewId) as DomElement;
       }
 
       _ensureContentCorrectlySized(content, viewType);
+      wrapper.append(content);
 
-      return wrapper..append(content);
+      return wrapper;
     });
   }
 
   /// Removes a PlatformView by its `viewId` from the manager, and from the DOM.
   ///
-  /// Once a view has been cleared, calls [knowsViewId] will fail, as if it had
+  /// Once a view has been cleared, calls to [knowsViewId] will fail, as if it had
   /// never been rendered before.
   void clearPlatformView(int viewId) {
     // Remove from our cache, and then from the DOM...
-    final DomElement? element = _contents.remove(viewId);
-    _safelyRemoveSlottedElement(element);
-  }
-
-  // We need to remove slotted elements like this because of a Safari bug that
-  // gets triggered when a slotted element is removed in a JS event different
-  // than its slot (after the slot is removed).
-  //
-  // TODO(web): Cleanup https://github.com/flutter/flutter/issues/85816
-  void _safelyRemoveSlottedElement(DomElement? element) {
-    if (element == null) {
-      return;
-    }
-    if (browserEngine != BrowserEngine.webkit) {
-      element.remove();
-      return;
-    }
-    final String tombstoneName = "tombstone-${element.getAttribute('slot')}";
-    // Create and inject a new slot in the shadow root
-    final DomElement slot = domDocument.createElement('slot')
-      ..style.display = 'none'
-      ..setAttribute('name', tombstoneName);
-    flutterViewEmbedder.glassPaneShadow!.append(slot);
-    // Link the element to the new slot
-    element.setAttribute('slot', tombstoneName);
-    // Delete both the element, and the new slot
-    element.remove();
-    slot.remove();
+    _contents.remove(viewId)?.remove();
   }
 
   /// Attempt to ensure that the contents of the user-supplied DOM element will
@@ -204,15 +213,22 @@ class PlatformViewManager {
   bool isVisible(int viewId) => !isInvisible(viewId);
 
   /// Clears the state. Used in tests.
-  ///
-  /// Returns the set of know view ids, so they can be cleaned up.
-  Set<int> debugClear() {
-    final Set<int> result = _contents.keys.toSet();
-    result.forEach(clearPlatformView);
+  void debugClear() {
+    _contents.keys.toList().forEach(clearPlatformView);
     _factories.clear();
     _contents.clear();
     _invisibleViews.clear();
     _viewIdToType.clear();
-    return result;
   }
 }
+
+DomElement _defaultFactory(
+  int viewId, {
+  Object? params,
+}) {
+  params!;
+  params as Map<Object?, Object?>;
+  return domDocument.createElement(params.readString('tagName'))
+    ..style.width = '100%'
+    ..style.height = '100%';
+}
diff --git a/lib/web_ui/lib/src/engine/platform_views/message_handler.dart b/lib/web_ui/lib/src/engine/platform_views/message_handler.dart
index 30658e57f6c913eb90605bc407d43121d52bf392..86cd7a7e96991e2b6bedfe5481ac9f3b222198e0 100644
--- a/lib/web_ui/lib/src/engine/platform_views/message_handler.dart
+++ b/lib/web_ui/lib/src/engine/platform_views/message_handler.dart
@@ -5,9 +5,11 @@
 import 'dart:typed_data';
 
 import '../dom.dart';
+import '../platform_dispatcher.dart';
 import '../services.dart';
 import '../util.dart';
 import 'content_manager.dart';
+import 'slots.dart';
 
 /// The signature for a callback for a Platform Message. From the `ui` package.
 /// Copied here so there's no circular dependencies.
@@ -19,7 +21,7 @@ typedef PlatformViewContentHandler = void Function(DomElement);
 
 /// This class handles incoming framework messages to create/dispose Platform Views.
 ///
-/// (An instance of this class is connected to the `flutter/platform_views`
+/// (The instance of this class is connected to the `flutter/platform_views`
 /// Platform Channel in the [EnginePlatformDispatcher] class.)
 ///
 /// It uses a [PlatformViewManager] to handle the CRUD of the DOM of Platform Views.
@@ -27,87 +29,86 @@ typedef PlatformViewContentHandler = void Function(DomElement);
 /// all operations related to platform views (registration, rendering, etc...),
 /// regardless of the rendering backend.
 ///
-/// When the `contents` of a Platform View are created, a [PlatformViewContentHandler]
-/// function (passed from the outside) will decide where in the DOM to inject
-/// said content.
+/// Platform views are injected into the DOM when needed by the correct instance
+/// of the active renderer.
 ///
-/// The rendering/compositing of Platform Views can create the other "half" of a
+/// The rendering and compositing of Platform Views can create the other "half" of a
 /// Platform View: the `slot`, through the [createPlatformViewSlot] method.
 ///
 /// When a Platform View is disposed of, it is removed from the cache (and DOM)
 /// directly by the `contentManager`. The canvaskit rendering backend needs to do
 /// some extra cleanup of its internal state, but it can do it automatically. See
-/// [HtmlViewEmbedder.disposeViews]
+/// [HtmlViewEmbedder.disposeViews].
 class PlatformViewMessageHandler {
   PlatformViewMessageHandler({
     required PlatformViewManager contentManager,
-    PlatformViewContentHandler? contentHandler,
-  }) : _contentManager = contentManager,
-       _contentHandler = contentHandler;
+  }) : _contentManager = contentManager;
+
+  static const String channelName = 'flutter/platform_views';
+
+  /// The shared instance of PlatformViewMessageHandler.
+  ///
+  /// Unless configured differently, this connects to the shared instance of the
+  /// [PlatformViewManager].
+  static PlatformViewMessageHandler instance = PlatformViewMessageHandler(
+    contentManager: PlatformViewManager.instance,
+  );
 
   final MethodCodec _codec = const StandardMethodCodec();
   final PlatformViewManager _contentManager;
-  final PlatformViewContentHandler? _contentHandler;
 
   /// Handle a `create` Platform View message.
   ///
-  /// This will attempt to render the `contents` and of a Platform View, if its
+  /// This will attempt to render the `contents` of a Platform View, if its
   /// `viewType` has been registered previously.
   ///
-  /// (See [PlatformViewContentManager.registerFactory] for more details.)
-  ///
-  /// The `contents` are delegated to a [_contentHandler] function, so the
-  /// active rendering backend can inject them in the right place of the DOM.
+  /// (See [PlatformViewManager.registerFactory] for more details.)
   ///
   /// If all goes well, this function will `callback` with an empty success envelope.
   /// In case of error, this will `callback` with an error envelope describing the error.
+  ///
+  /// The `callback` signals when the contents of a given [platformViewId] have
+  /// been rendered. They're now accessible through `platformViewRegistry.getViewById`
+  /// from `dart:ui_web`. **(Not the DOM!)**
   void _createPlatformView(
-    MethodCall methodCall,
-    _PlatformMessageResponseCallback callback,
-  ) {
-    final Map<dynamic, dynamic> args = methodCall.arguments as Map<dynamic, dynamic>;
-    final int viewId = args.readInt('id');
-    final String viewType = args.readString('viewType');
-
-    if (!_contentManager.knowsViewType(viewType)) {
+    _PlatformMessageResponseCallback callback, {
+    required int platformViewId,
+    required String platformViewType,
+    required Object? params,
+  }) {
+    if (!_contentManager.knowsViewType(platformViewType)) {
       callback(_codec.encodeErrorEnvelope(
         code: 'unregistered_view_type',
         message: 'A HtmlElementView widget is trying to create a platform view '
-            'with an unregistered type: <$viewType>.',
+            'with an unregistered type: <$platformViewType>.',
         details: 'If you are the author of the PlatformView, make sure '
             '`registerViewFactory` is invoked.',
       ));
       return;
     }
 
-    if (_contentManager.knowsViewId(viewId)) {
+    if (_contentManager.knowsViewId(platformViewId)) {
       callback(_codec.encodeErrorEnvelope(
         code: 'recreating_view',
         message: 'trying to create an already created view',
-        details: 'view id: $viewId',
+        details: 'view id: $platformViewId',
       ));
       return;
     }
 
-    // TODO(hterkelsen): How can users add extra `args` from the HtmlElementView widget?
-    final DomElement content = _contentManager.renderContent(
-      viewType,
-      viewId,
-      args,
+    _contentManager.renderContent(
+      platformViewType,
+      platformViewId,
+      params,
     );
 
-    // For now, we don't need anything fancier. If needed, this can be converted
-    // to a PlatformViewStrategy class for each web-renderer backend?
-    if (_contentHandler != null) {
-      _contentHandler!(content);
-    }
     callback(_codec.encodeSuccessEnvelope(null));
   }
 
   /// Handle a `dispose` Platform View message.
   ///
   /// This will clear the cached information that the framework has about a given
-  /// `viewId`, through the [_contentManager].
+  /// `platformViewId`, through the [_contentManager].
   ///
   /// Once that's done, the dispose call is delegated to the [_disposeHandler]
   /// function, so the active rendering backend can dispose of whatever resources
@@ -115,34 +116,39 @@ class PlatformViewMessageHandler {
   ///
   /// This function should always `callback` with an empty success envelope.
   void _disposePlatformView(
-    MethodCall methodCall,
-    _PlatformMessageResponseCallback callback,
-  ) {
-    final int viewId = methodCall.arguments as int;
-
+    _PlatformMessageResponseCallback callback, {
+    required int platformViewId,
+  }) {
     // The contentManager removes the slot and the contents from its internal
     // cache, and the DOM.
-    _contentManager.clearPlatformView(viewId);
+    _contentManager.clearPlatformView(platformViewId);
 
     callback(_codec.encodeSuccessEnvelope(null));
   }
 
-  /// Handles a PlatformViewCall to the `flutter/platform_views` channel.
+  /// Handles legacy PlatformViewCalls that don't contain a Flutter View ID.
   ///
-  /// This method handles two possible messages:
-  /// * `create`: See [_createPlatformView]
-  /// * `dispose`: See [_disposePlatformView]
+  /// This is transitional code to support the old platform view channel. As
+  /// soon as the framework code is updated to send the Flutter View ID, this
+  /// method can be removed.
   void handlePlatformViewCall(
-    ByteData? data,
+    String method,
+    dynamic arguments,
     _PlatformMessageResponseCallback callback,
   ) {
-    final MethodCall decoded = _codec.decodeMethodCall(data);
-    switch (decoded.method) {
+    switch (method) {
       case 'create':
-        _createPlatformView(decoded, callback);
+        arguments as Map<dynamic, dynamic>;
+        _createPlatformView(
+          callback,
+          platformViewId: arguments.readInt('id'),
+          platformViewType: arguments.readString('viewType'),
+          params: arguments['params'],
+        );
         return;
+      // TODO(web): Send `arguments` as a Map for `dispose` too!
       case 'dispose':
-        _disposePlatformView(decoded, callback);
+        _disposePlatformView(callback, platformViewId: arguments as int);
         return;
     }
     callback(null);
diff --git a/lib/web_ui/lib/src/engine/platform_views/slots.dart b/lib/web_ui/lib/src/engine/platform_views/slots.dart
index 509ebcbf8ab960de6dc07a7f475dba33c4ed0289..b0305834cf9d389a9777b3fa64175986e582cbe3 100644
--- a/lib/web_ui/lib/src/engine/platform_views/slots.dart
+++ b/lib/web_ui/lib/src/engine/platform_views/slots.dart
@@ -13,6 +13,12 @@ String getPlatformViewSlotName(int viewId) {
   return 'flt-pv-slot-$viewId';
 }
 
+/// Returns the value of the HTML "id" attribute set on the wrapper element that
+/// hosts the platform view content.
+String getPlatformViewDomId(int viewId) {
+  return 'flt-pv-$viewId';
+}
+
 /// Creates the HTML markup for the `slot` of a Platform View.
 ///
 /// The resulting DOM for a `slot` looks like this:
diff --git a/lib/web_ui/lib/src/engine/plugins.dart b/lib/web_ui/lib/src/engine/plugins.dart
index 083816b1c29d34ac95d077dbc3a3386042c99863..151935f9fd4910195fc9d63ca42a9cf918ea6fd6 100644
--- a/lib/web_ui/lib/src/engine/plugins.dart
+++ b/lib/web_ui/lib/src/engine/plugins.dart
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:typed_data';
-
 import 'package:ui/ui.dart' as ui;
 
-Future<void> Function(String, ByteData?, ui.PlatformMessageResponseCallback?)? pluginMessageCallHandler;
+ui.PlatformMessageCallback? pluginMessageCallHandler;
diff --git a/lib/web_ui/lib/src/engine/pointer_binding.dart b/lib/web_ui/lib/src/engine/pointer_binding.dart
index 639814d3a9dfb64027d3dc980e8c62448bcb9099..3794a7bc25d5b7f18cea2c9a608c5ca459de0f68 100644
--- a/lib/web_ui/lib/src/engine/pointer_binding.dart
+++ b/lib/web_ui/lib/src/engine/pointer_binding.dart
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:async';
+import 'dart:js_interop';
 import 'dart:math' as math;
 
 import 'package:meta/meta.dart';
@@ -12,15 +14,20 @@ import '../engine.dart' show registerHotRestartListener;
 import 'browser_detection.dart';
 import 'dom.dart';
 import 'platform_dispatcher.dart';
+import 'pointer_binding/event_position_helper.dart';
 import 'pointer_converter.dart';
 import 'safe_browser_api.dart';
 import 'semantics.dart';
+import 'window.dart';
 
-/// Set this flag to true to see all the fired events in the console.
+/// Set this flag to true to log all the browser events.
 const bool _debugLogPointerEvents = false;
 
+/// Set this to true to log all the events sent to the Flutter framework.
+const bool _debugLogFlutterEvents = false;
+
 /// The signature of a callback that handles pointer events.
-typedef _PointerDataCallback = void Function(Iterable<ui.PointerData>);
+typedef _PointerDataCallback = void Function(DomEvent event, List<ui.PointerData>);
 
 // The mask for the bitfield of event buttons. Buttons not contained in this
 // mask are cut off.
@@ -29,8 +36,9 @@ typedef _PointerDataCallback = void Function(Iterable<ui.PointerData>);
 // here, we use an already very large number (30 bits).
 const int _kButtonsMask = 0x3FFFFFFF;
 
-// Intentionally set to -1 so it doesn't conflict with other device IDs.
+// Intentionally set to -1 or -2 so it doesn't conflict with other device IDs.
 const int _mouseDeviceId = -1;
+const int _trackpadDeviceId = -2;
 
 const int _kPrimaryMouseButton = 0x1;
 const int _kSecondaryMouseButton = 0x2;
@@ -66,116 +74,361 @@ int convertButtonToButtons(int button) {
 /// Wrapping the Safari iOS workaround that adds a dummy event listener
 /// More info about the issue and workaround: https://github.com/flutter/flutter/issues/70858
 class SafariPointerEventWorkaround {
-  static SafariPointerEventWorkaround instance = SafariPointerEventWorkaround();
+  SafariPointerEventWorkaround._();
+
+  DomEventListener? _listener;
 
   void workAroundMissingPointerEvents() {
-    domDocument.addEventListener('touchstart', allowInterop((DomEvent event) {}));
+    // We only need to attach the listener once.
+    if (_listener == null) {
+      _listener = createDomEventListener((_) {});
+      domDocument.addEventListener('touchstart', _listener);
+    }
+  }
+
+  void dispose() {
+    if (_listener != null) {
+      domDocument.removeEventListener('touchstart', _listener);
+      _listener = null;
+    }
   }
 }
 
 class PointerBinding {
-  PointerBinding(this.glassPaneElement, this._keyboardConverter)
-    : _pointerDataConverter = PointerDataConverter(),
-      _detector = const PointerSupportDetector() {
+  PointerBinding(
+    this.view, {
+    PointerSupportDetector detector = const PointerSupportDetector(),
+    SafariPointerEventWorkaround? safariWorkaround,
+  })  : _pointerDataConverter = PointerDataConverter(),
+        _detector = detector {
     if (isIosSafari) {
-      SafariPointerEventWorkaround.instance.workAroundMissingPointerEvents();
+      _safariWorkaround = safariWorkaround ?? _defaultSafariWorkaround;
+      _safariWorkaround!.workAroundMissingPointerEvents();
     }
     _adapter = _createAdapter();
+    assert(() {
+      registerHotRestartListener(dispose);
+      return true;
+    }());
   }
 
-  /// The singleton instance of this object.
-  static PointerBinding? get instance => _instance;
-  static PointerBinding? _instance;
-
-  static void initInstance(DomElement glassPaneElement, KeyboardConverter keyboardConverter) {
-    if (_instance == null) {
-      _instance = PointerBinding(glassPaneElement, keyboardConverter);
-      assert(() {
-        registerHotRestartListener(_instance!.dispose);
-        return true;
-      }());
-    }
+  static final SafariPointerEventWorkaround _defaultSafariWorkaround = SafariPointerEventWorkaround._();
+  static final ClickDebouncer clickDebouncer = ClickDebouncer();
+
+  /// Resets global pointer state that's not tied to any single [PointerBinding]
+  /// instance.
+  @visibleForTesting
+  static void debugResetGlobalState() {
+    clickDebouncer.reset();
+    PointerDataConverter.globalPointerState.reset();
   }
 
+  SafariPointerEventWorkaround? _safariWorkaround;
+
   /// Performs necessary clean up for PointerBinding including removing event listeners
   /// and clearing the existing pointer state
   void dispose() {
-    _adapter.clearListeners();
-    _pointerDataConverter.clearPointerState();
+    _adapter.dispose();
+    _safariWorkaround?.dispose();
   }
 
-  final DomElement glassPaneElement;
+  final EngineFlutterView view;
+  DomElement get rootElement => view.dom.rootElement;
 
-  PointerSupportDetector _detector;
+  final PointerSupportDetector _detector;
   final PointerDataConverter _pointerDataConverter;
-  KeyboardConverter _keyboardConverter;
+  KeyboardConverter? _keyboardConverter = KeyboardBinding.instance?.converter;
   late _BaseAdapter _adapter;
 
-  /// Should be used in tests to define custom detection of pointer support.
+  @visibleForTesting
+  void debugOverrideKeyboardConverter(KeyboardConverter? keyboardConverter) {
+    _keyboardConverter = keyboardConverter;
+  }
+
+  _BaseAdapter _createAdapter() {
+    if (_detector.hasPointerEvents) {
+      return _PointerAdapter(this);
+    }
+    throw UnsupportedError(
+      'This browser does not support pointer events which '
+      'are necessary to handle interactions with Flutter Web apps.',
+    );
+  }
+}
+
+@visibleForTesting
+typedef QueuedEvent = ({ DomEvent event, Duration timeStamp, List<ui.PointerData> data });
+
+@visibleForTesting
+typedef DebounceState = ({
+  DomElement target,
+  Timer timer,
+  List<QueuedEvent> queue,
+});
+
+/// Disambiguates taps and clicks that are produced both by the framework from
+/// `pointerdown`/`pointerup` events and those detected as DOM "click" events by
+/// the browser.
+///
+/// The implementation is waiting for a `pointerdown`, and as soon as it sees
+/// one stops forwarding pointer events to the framework, and instead queues
+/// them in a list. The queuing process stops as soon as one of the following
+/// two conditions happens first:
+///
+/// * 200ms passes after the `pointerdown` event. Most clicks, even slow ones,
+///   are typically done by then. Importantly, screen readers simulate clicks
+///   much faster than 200ms. So if the timer expires, it is likely the user is
+///   not interested in producing a click, so the debouncing process stops and
+///   all queued events are forwarded to the framework. If, for example, a
+///   tappable node is inside a scrollable viewport, the events can be
+///   intrepreted by the framework to initiate scrolling.
+/// * A `click` event arrives. If the event queue has not been flushed to the
+///   framework, the event is forwarded to the framework as a
+///   `SemanticsAction.tap`, and all the pointer events are dropped. If, by the
+///   time the click event arrives, the queue was flushed (but no more than 50ms
+///   ago), then the click event is dropped instead under the assumption that
+///   the flushed pointer events are interpreted by the framework as the desired
+///   gesture.
+///
+/// This mechanism is in place to deal with https://github.com/flutter/flutter/issues/130162.
+class ClickDebouncer {
+  ClickDebouncer() {
+    assert(() {
+      registerHotRestartListener(reset);
+      return true;
+    }());
+  }
+
+  DebounceState? _state;
+
+  @visibleForTesting
+  DebounceState? get debugState => _state;
+
+  // The timestamp of the last "pointerup" DOM event that was flushed.
+  //
+  // Not to be confused with the time when it was flushed. The two may be far
+  // apart because the flushing can happen after a delay due to timer, or events
+  // that happen after the said "pointerup".
+  Duration? _lastFlushedPointerUpTimeStamp;
+
+  /// Returns true if the debouncer has a non-empty queue of pointer events that
+  /// were withheld from the framework.
   ///
-  /// ```dart
-  /// // Forces PointerBinding to use mouse events.
-  /// class MyTestDetector extends PointerSupportDetector {
-  ///   @override
-  ///   final bool hasPointerEvents = false;
+  /// This value is normally false, and it flips to true when the first
+  /// pointerdown is observed that lands on a tappable semantics node, denoted
+  /// by the presence of the `flt-tappable` attribute.
+  bool get isDebouncing => _state != null;
+
+  /// Processes a pointer event.
   ///
-  ///   @override
-  ///   final bool hasTouchEvents = false;
+  /// If semantics are off, simply forwards the event to the framework.
   ///
-  ///   @override
-  ///   final bool hasMouseEvents = true;
-  /// }
+  /// If currently debouncing events (see [isDebouncing]), adds the event to
+  /// the debounce queue, unless the target of the event is different from the
+  /// target that initiated the debouncing process, in which case stops
+  /// debouncing and flushes pointer events to the framework.
   ///
-  /// PointerBinding.instance.debugOverrideDetector(MyTestDetector());
-  /// ```
-  void debugOverrideDetector(PointerSupportDetector? newDetector) {
-    newDetector ??= const PointerSupportDetector();
-    // When changing the detector, we need to swap the adapter.
-    if (newDetector != _detector) {
-      _detector = newDetector;
-      _adapter.clearListeners();
-      _adapter = _createAdapter();
-      _pointerDataConverter.clearPointerState();
+  /// If the event is a `pointerdown` and the target is `flt-tappable`, begins
+  /// debouncing events.
+  ///
+  /// In all other situations forwards the event to the framework.
+  void onPointerData(DomEvent event, List<ui.PointerData> data) {
+    if (!EnginePlatformDispatcher.instance.semanticsEnabled) {
+      _sendToFramework(event, data);
+      return;
+    }
+
+    if (isDebouncing) {
+      _debounce(event, data);
+    } else if (event.type == 'pointerdown') {
+      _startDebouncing(event, data);
+    } else {
+      _sendToFramework(event, data);
     }
   }
 
-  @visibleForTesting
-  void debugOverrideKeyboardConverter(KeyboardConverter keyboardConverter) {
-    _keyboardConverter = keyboardConverter;
-    _adapter.clearListeners();
-    _adapter = _createAdapter();
-    _pointerDataConverter.clearPointerState();
+  /// Notifies the debouncer of the browser-detected "click" DOM event.
+  ///
+  /// Forwards the event to the framework, unless it is deduplicated because
+  /// the corresponding pointer down/up events were recently flushed to the
+  /// framework already.
+  void onClick(DomEvent click, int semanticsNodeId, bool isListening) {
+    assert(click.type == 'click');
+
+    if (!isDebouncing) {
+      // There's no pending queue of pointer events that are being debounced. It
+      // is a standalone click event. Unless pointer down/up were flushed
+      // recently and if the node is currently listening to event, forward to
+      // the framework.
+      if (isListening && _shouldSendClickEventToFramework(click)) {
+        _sendSemanticsTapToFramework(click, semanticsNodeId);
+      }
+      return;
+    }
+
+    if (isListening) {
+      // There's a pending queue of pointer events. Prefer sending the tap action
+      // instead of pointer events, because the pointer events may not land on the
+      // combined semantic node and miss the click/tap.
+      final DebounceState state = _state!;
+      _state = null;
+      state.timer.cancel();
+      _sendSemanticsTapToFramework(click, semanticsNodeId);
+    } else {
+      // The semantic node is not listening to taps. Flush the pointer events
+      // for the framework to figure out what to do with them. It's possible
+      // the framework is interested in gestures other than taps.
+      _flush();
+    }
   }
 
-  _BaseAdapter _createAdapter() {
-    if (_detector.hasPointerEvents) {
-      return _PointerAdapter(_onPointerData, glassPaneElement, _pointerDataConverter, _keyboardConverter);
+  void _sendSemanticsTapToFramework(DomEvent click, int semanticsNodeId) {
+    // Tappable nodes can be nested inside other tappable nodes. If a click
+    // lands on an inner element and is allowed to propagate, it will also
+    // land on the ancestor tappable, leading to both the descendant and the
+    // ancestor sending SemanticsAction.tap to the framework, creating a double
+    // tap/click, which is wrong. More details:
+    //
+    // https://github.com/flutter/flutter/issues/134842
+    click.stopPropagation();
+
+    EnginePlatformDispatcher.instance.invokeOnSemanticsAction(
+        semanticsNodeId, ui.SemanticsAction.tap, null);
+  }
+
+  void _startDebouncing(DomEvent event, List<ui.PointerData> data) {
+    assert(
+      _state == null,
+      'Cannot start debouncing. Already debouncing.'
+    );
+    assert(
+      event.type == 'pointerdown',
+      'Click debouncing must begin with a pointerdown'
+    );
+
+    final DomEventTarget? target = event.target;
+    if (target is DomElement && target.hasAttribute('flt-tappable')) {
+      _state = (
+        target: target,
+        // The 200ms duration was chosen empirically by testing tapping, mouse
+        // clicking, trackpad tapping and clicking, as well as the following
+        // screen readers: TalkBack on Android, VoiceOver on macOS, Narrator/
+        // NVDA/JAWS on Windows. 200ms seemed to hit the sweet spot by
+        // satisfying the following:
+        //   * It was short enough that delaying the `pointerdown` still allowed
+        //     drag gestures to begin reasonably soon (e.g. scrolling).
+        //   * It was long enough to register taps and clicks.
+        //   * It was successful at detecting taps generated by all tested
+        //     screen readers.
+        timer: Timer(const Duration(milliseconds: 200), _onTimerExpired),
+        queue: <QueuedEvent>[(
+          event: event,
+          timeStamp: _BaseAdapter._eventTimeStampToDuration(event.timeStamp!),
+          data: data,
+        )],
+      );
+    } else {
+      // The event landed on an non-tappable target. Assume this won't lead to
+      // double clicks and forward the event to the framework.
+      _sendToFramework(event, data);
     }
-    if (_detector.hasTouchEvents) {
-      return _TouchAdapter(_onPointerData, glassPaneElement, _pointerDataConverter, _keyboardConverter);
+  }
+
+  void _debounce(DomEvent event, List<ui.PointerData> data) {
+    assert(
+      _state != null,
+      'Cannot debounce event. Debouncing state not established by _startDebouncing.'
+    );
+
+    final DebounceState state = _state!;
+    state.queue.add((
+      event: event,
+      timeStamp: _BaseAdapter._eventTimeStampToDuration(event.timeStamp!),
+      data: data,
+    ));
+
+    // It's only interesting to debounce clicks when both `pointerdown` and
+    // `pointerup` land on the same element.
+    if (event.type == 'pointerup') {
+      // TODO(yjbanov): this is a bit mouthful, but see https://github.com/dart-lang/sdk/issues/53070
+      final DomEventTarget? eventTarget = event.target;
+      final DomElement stateTarget = state.target;
+      final bool targetChanged = eventTarget != stateTarget;
+      if (targetChanged) {
+        _flush();
+      }
     }
-    if (_detector.hasMouseEvents) {
-      return _MouseAdapter(_onPointerData, glassPaneElement, _pointerDataConverter, _keyboardConverter);
+  }
+
+  void _onTimerExpired() {
+    if (!isDebouncing) {
+      return;
     }
-    throw UnsupportedError('This browser does not support pointer, touch, or mouse events.');
+    _flush();
+  }
+
+  // If the click event happens soon after the last `pointerup` event that was
+  // already flushed to the framework, the click event is dropped to avoid
+  // double click.
+  bool _shouldSendClickEventToFramework(DomEvent click) {
+    final Duration? lastFlushedPointerUpTimeStamp = _lastFlushedPointerUpTimeStamp;
+
+    if (lastFlushedPointerUpTimeStamp == null) {
+      // We haven't seen a pointerup. It's standalone click event. Let it through.
+      return true;
+    }
+
+    final Duration clickTimeStamp = _BaseAdapter._eventTimeStampToDuration(click.timeStamp!);
+    final Duration delta = clickTimeStamp - lastFlushedPointerUpTimeStamp;
+    return delta >= const Duration(milliseconds: 50);
   }
 
-  void _onPointerData(Iterable<ui.PointerData> data) {
+  void _flush() {
+    assert(_state != null);
+
+    final DebounceState state = _state!;
+    state.timer.cancel();
+
+    final List<ui.PointerData> aggregateData = <ui.PointerData>[];
+    for (final QueuedEvent queuedEvent in state.queue) {
+      if (queuedEvent.event.type == 'pointerup') {
+        _lastFlushedPointerUpTimeStamp = queuedEvent.timeStamp;
+      }
+      aggregateData.addAll(queuedEvent.data);
+    }
+
+    _sendToFramework(null, aggregateData);
+    _state = null;
+  }
+
+  void _sendToFramework(DomEvent? event, List<ui.PointerData> data) {
     final ui.PointerDataPacket packet = ui.PointerDataPacket(data: data.toList());
+    if (_debugLogFlutterEvents) {
+      for(final ui.PointerData datum in data) {
+        print('fw:${datum.change}    ${datum.physicalX},${datum.physicalY}');
+      }
+    }
     EnginePlatformDispatcher.instance.invokeOnPointerDataPacket(packet);
   }
+
+  /// Cancels any pending debounce process and forgets anything that happened so
+  /// far.
+  ///
+  /// This object can be used as if it was just initialized.
+  void reset() {
+    _state?.timer.cancel();
+    _state = null;
+    _lastFlushedPointerUpTimeStamp = null;
+  }
 }
 
 class PointerSupportDetector {
   const PointerSupportDetector();
 
   bool get hasPointerEvents => hasJsProperty(domWindow, 'PointerEvent');
-  bool get hasTouchEvents => hasJsProperty(domWindow, 'TouchEvent');
-  bool get hasMouseEvents => hasJsProperty(domWindow, 'MouseEvent');
 
   @override
-  String toString() =>
-      'pointers:$hasPointerEvents, touch:$hasTouchEvents, mouse:$hasMouseEvents';
+  String toString() => 'pointers:$hasPointerEvents';
 }
 
 class _Listener {
@@ -183,93 +436,78 @@ class _Listener {
     required this.event,
     required this.target,
     required this.handler,
-    required this.useCapture,
-    required this.isNative,
   });
 
-  /// Registers a listener for the given [event] on [target] using the Dart-to-JS API.
+  /// Registers a listener for the given `event` on a `target`.
+  ///
+  /// If `passive` is null uses the default behavior determined by the event
+  /// type. If `passive` is true, marks the handler as non-blocking for the
+  /// built-in browser behavior. This means the browser will not wait for the
+  /// handler to finish execution before performing the default action
+  /// associated with this event. If `passive` is false, the browser will wait
+  /// for the handler to finish execution before performing the respective
+  /// action.
   factory _Listener.register({
     required String event,
     required DomEventTarget target,
-    required DomEventListener handler,
-    bool capture = false,
+    required DartDomEventListener handler,
+    bool? passive,
   }) {
-    final DomEventListener jsHandler = allowInterop((DomEvent event) => handler(event));
-    final _Listener listener = _Listener._(
-      event: event,
-      target: target,
-      handler: jsHandler,
-      useCapture: capture,
-      isNative: false,
-    );
-    target.addEventListener(event, jsHandler, capture);
-    return listener;
-  }
+    final DomEventListener jsHandler = createDomEventListener(handler);
+
+    if (passive == null) {
+      target.addEventListener(event, jsHandler);
+    } else {
+      final Map<String, Object> eventOptions = <String, Object>{
+        'passive': passive,
+      };
+      target.addEventListenerWithOptions(event, jsHandler, eventOptions);
+    }
 
-  /// Registers a listener for the given [event] on [target] using the native JS API.
-  factory _Listener.registerNative({
-    required String event,
-    required DomEventTarget target,
-    required DomEventListener handler,
-    bool capture = false,
-    bool passive = false,
-  }) {
-    final Object eventOptions = createPlainJsObject(<String, Object?>{
-      'capture': capture,
-      'passive': passive,
-    });
-    final DomEventListener jsHandler = allowInterop((DomEvent event) => handler(event));
     final _Listener listener = _Listener._(
       event: event,
       target: target,
       handler: jsHandler,
-      useCapture: capture,
-      isNative: true,
     );
-    addJsEventListener(target, event, jsHandler, eventOptions);
+    target.addEventListener(event, jsHandler);
     return listener;
   }
 
   final String event;
-
   final DomEventTarget target;
   final DomEventListener handler;
 
-  final bool useCapture;
-  final bool isNative;
-
   void unregister() {
-    if (isNative) {
-      removeJsEventListener(target, event, handler, useCapture);
-    } else {
-      target.removeEventListener(event, handler, useCapture);
-    }
+    target.removeEventListener(event, handler);
   }
 }
 
 /// Common functionality that's shared among adapters.
 abstract class _BaseAdapter {
-  _BaseAdapter(
-    this._callback,
-    this.glassPaneElement,
-    this._pointerDataConverter,
-    this._keyboardConverter,
-  ) {
+  _BaseAdapter(this._owner) {
     setup();
   }
 
+  final PointerBinding _owner;
+
+  EngineFlutterView get _view => _owner.view;
+  _PointerDataCallback get _callback => PointerBinding.clickDebouncer.onPointerData;
+  PointerDataConverter get _pointerDataConverter => _owner._pointerDataConverter;
+  KeyboardConverter? get _keyboardConverter => _owner._keyboardConverter;
+
   final List<_Listener> _listeners = <_Listener>[];
-  final DomElement glassPaneElement;
-  final _PointerDataCallback _callback;
-  final PointerDataConverter _pointerDataConverter;
-  final KeyboardConverter _keyboardConverter;
+  DomWheelEvent? _lastWheelEvent;
+  bool _lastWheelEventWasTrackpad = false;
+
+  DomEventTarget get _viewTarget => _view.dom.rootElement;
+  DomEventTarget get _globalTarget => _view.embeddingStrategy.globalEventTarget;
 
   /// Each subclass is expected to override this method to attach its own event
   /// listeners and convert events into pointer events.
   void setup();
 
-  /// Remove all active event listeners.
-  void clearListeners() {
+  /// Cleans up all event listeners attached by this adapter.
+  void dispose() {
     for (final _Listener listener in _listeners) {
       listener.unregister();
     }
@@ -278,29 +516,23 @@ abstract class _BaseAdapter {
 
   /// Adds a listener for the given [eventName] to [target].
   ///
-  /// Generally speaking, down and leave events should use [glassPaneElement]
+  /// Generally speaking, down and leave events should use [_rootElement]
   /// as the [target], while move and up events should use [domWindow]
   /// instead, because the browser doesn't fire the latter two for DOM elements
   /// when the pointer is outside the window.
-  ///
-  /// If [useCapture] is set to false, the event will be handled in the
-  /// bubbling phase instead of the capture phase.
-  /// See [DOM Level 3 Events][events] for a detailed explanation.
-  ///
-  /// [events]: https://www.w3.org/TR/DOM-Level-3-Events/#event-flow
   void addEventListener(
     DomEventTarget target,
     String eventName,
-    DomEventListener handler, {
-    bool useCapture = true,
-  }) {
-    dynamic loggedHandler(DomEvent event) {
+    DartDomEventListener handler,
+  ) {
+    JSVoid loggedHandler(DomEvent event) {
       if (_debugLogPointerEvents) {
         if (domInstanceOfString(event, 'PointerEvent')) {
           final DomPointerEvent pointerEvent = event as DomPointerEvent;
+          final ui.Offset offset = computeEventOffsetToTarget(event, _view);
           print('${pointerEvent.type}    '
-              '${pointerEvent.clientX.toStringAsFixed(1)},'
-              '${pointerEvent.clientY.toStringAsFixed(1)}');
+              '${offset.dx.toStringAsFixed(1)},'
+              '${offset.dy.toStringAsFixed(1)}');
         } else {
           print(event.type);
         }
@@ -308,7 +540,7 @@ abstract class _BaseAdapter {
       // Report the event to semantics. This information is used to debounce
       // browser gestures. Semantics tells us whether it is safe to forward
       // the event to the framework.
-      if (EngineSemanticsOwner.instance.receiveGlobalEvent(event)) {
+      if (EngineSemantics.instance.receiveGlobalEvent(event)) {
         handler(event);
       }
     }
@@ -316,7 +548,6 @@ abstract class _BaseAdapter {
       event: eventName,
       target: target,
       handler: loggedHandler,
-      capture: useCapture,
     ));
   }
 
@@ -333,6 +564,71 @@ abstract class _BaseAdapter {
 mixin _WheelEventListenerMixin on _BaseAdapter {
   static double? _defaultScrollLineHeight;
 
+  bool _isAcceleratedMouseWheelDelta(num delta, num? wheelDelta) {
+    // On macOS, scrolling using a mouse wheel by default uses an acceleration
+    // curve, so delta values ramp up and are not at fixed multiples of 120.
+    // But in this case, the wheelDelta properties of the event still keep
+    // their original values.
+    // For all events without this acceleration curve applied, the wheelDelta
+    // values are by convention three times greater than the delta values and with
+    // the opposite sign.
+    if (wheelDelta == null) {
+      return false;
+    }
+    // Account for observed issues with integer truncation by allowing +-1px error.
+    return (wheelDelta - (-3 * delta)).abs() > 1;
+  }
+
+  bool _isTrackpadEvent(DomWheelEvent event) {
+    // This function relies on deprecated and non-standard implementation
+    // details. Useful reference material can be found below.
+    //
+    // https://source.chromium.org/chromium/chromium/src/+/main:ui/events/event.cc
+    // https://source.chromium.org/chromium/chromium/src/+/main:ui/events/cocoa/events_mac.mm
+    // https://github.com/WebKit/WebKit/blob/main/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm
+    // https://searchfox.org/mozilla-central/source/dom/events/WheelEvent.h
+    // https://learn.microsoft.com/en-us/windows/win32/inputdev/wm-mousewheel
+    if (browserEngine == BrowserEngine.firefox) {
+      // Firefox has restricted the wheelDelta properties, they do not provide
+      // enough information to accurately disambiguate trackpad events from mouse
+      // wheel events.
+      return false;
+    }
+    if (_isAcceleratedMouseWheelDelta(event.deltaX, event.wheelDeltaX) ||
+        _isAcceleratedMouseWheelDelta(event.deltaY, event.wheelDeltaY)) {
+      return false;
+    }
+    if (((event.deltaX % 120 == 0) && (event.deltaY % 120 == 0)) ||
+        (((event.wheelDeltaX ?? 1) % 120 == 0) && ((event.wheelDeltaY ?? 1) % 120) == 0)) {
+      // While not in any formal web standard, `blink` and `webkit` browsers use
+      // a delta of 120 to represent one mouse wheel turn. If both dimensions of
+      // the delta are divisible by 120, this event is probably from a mouse.
+      // Checking if wheelDeltaX and wheelDeltaY are both divisible by 120
+      // catches any macOS accelerated mouse wheel deltas which by random chance
+      // are not caught by _isAcceleratedMouseWheelDelta.
+      final num deltaXChange = (event.deltaX - (_lastWheelEvent?.deltaX ?? 0)).abs();
+      final num deltaYChange = (event.deltaY - (_lastWheelEvent?.deltaY ?? 0)).abs();
+      if ((_lastWheelEvent == null) ||
+          (deltaXChange == 0 && deltaYChange == 0) ||
+          !(deltaXChange < 20 && deltaYChange < 20)) {
+        // A trackpad event might by chance have a delta of exactly 120, so
+        // make sure this event does not have a similar delta to the previous
+        // one before calling it a mouse event.
+        if (event.timeStamp != null && _lastWheelEvent?.timeStamp != null) {
+          // If the event has a large delta to the previous event, check if
+          // it was preceded within 50 milliseconds by a trackpad event. This
+          // handles unlucky 120-delta trackpad events during rapid movement.
+          final num diffMs = event.timeStamp! - _lastWheelEvent!.timeStamp!;
+          if (diffMs < 50 && _lastWheelEventWasTrackpad) {
+            return true;
+          }
+        }
+        return false;
+      }
+    }
+    return true;
+  }
+
   List<ui.PointerData> _convertWheelEventToPointerData(
     DomWheelEvent event
   ) {
@@ -340,6 +636,13 @@ mixin _WheelEventListenerMixin on _BaseAdapter {
     const int domDeltaLine = 0x01;
     const int domDeltaPage = 0x02;
 
+    ui.PointerDeviceKind kind = ui.PointerDeviceKind.mouse;
+    int deviceId = _mouseDeviceId;
+    if (_isTrackpadEvent(event)) {
+      kind = ui.PointerDeviceKind.trackpad;
+      deviceId = _trackpadDeviceId;
+    }
+
     // Flutter only supports pixel scroll delta. Convert deltaMode values
     // to pixels.
     double deltaX = event.deltaX;
@@ -349,47 +652,72 @@ mixin _WheelEventListenerMixin on _BaseAdapter {
         _defaultScrollLineHeight ??= _computeDefaultScrollLineHeight();
         deltaX *= _defaultScrollLineHeight!;
         deltaY *= _defaultScrollLineHeight!;
-        break;
       case domDeltaPage:
-        deltaX *= ui.window.physicalSize.width;
-        deltaY *= ui.window.physicalSize.height;
-        break;
+        deltaX *= _view.physicalSize.width;
+        deltaY *= _view.physicalSize.height;
       case domDeltaPixel:
-        if (operatingSystem == OperatingSystem.macOs && (isSafari || isFirefox)) {
+        if (operatingSystem == OperatingSystem.macOs) {
           // Safari and Firefox seem to report delta in logical pixels while
           // Chrome uses physical pixels.
-          deltaX *= ui.window.devicePixelRatio;
-          deltaY *= ui.window.devicePixelRatio;
+          deltaX *= _view.devicePixelRatio;
+          deltaY *= _view.devicePixelRatio;
         }
-        break;
       default:
         break;
     }
 
     final List<ui.PointerData> data = <ui.PointerData>[];
-    _pointerDataConverter.convert(
-      data,
-      change: ui.PointerChange.hover,
-      timeStamp: _BaseAdapter._eventTimeStampToDuration(event.timeStamp!),
-      kind: ui.PointerDeviceKind.mouse,
-      signalKind: ui.PointerSignalKind.scroll,
-      device: _mouseDeviceId,
-      physicalX: event.clientX * ui.window.devicePixelRatio,
-      physicalY: event.clientY * ui.window.devicePixelRatio,
-      buttons: event.buttons!.toInt(),
-      pressure: 1.0,
-      pressureMax: 1.0,
-      scrollDeltaX: deltaX,
-      scrollDeltaY: deltaY,
-    );
+    final ui.Offset offset = computeEventOffsetToTarget(event, _view);
+    bool ignoreCtrlKey = false;
+    if (operatingSystem == OperatingSystem.macOs) {
+      ignoreCtrlKey = (_keyboardConverter?.keyIsPressed(kPhysicalControlLeft) ?? false) ||
+                      (_keyboardConverter?.keyIsPressed(kPhysicalControlRight) ?? false);
+    }
+    if (event.ctrlKey && !ignoreCtrlKey) {
+      _pointerDataConverter.convert(
+        data,
+        viewId: _view.viewId,
+        change: ui.PointerChange.hover,
+        timeStamp: _BaseAdapter._eventTimeStampToDuration(event.timeStamp!),
+        kind: kind,
+        signalKind: ui.PointerSignalKind.scale,
+        device: deviceId,
+        physicalX: offset.dx * _view.devicePixelRatio,
+        physicalY: offset.dy * _view.devicePixelRatio,
+        buttons: event.buttons!.toInt(),
+        pressure: 1.0,
+        pressureMax: 1.0,
+        scale: math.exp(-deltaY / 200),
+      );
+    } else {
+      _pointerDataConverter.convert(
+        data,
+        viewId: _view.viewId,
+        change: ui.PointerChange.hover,
+        timeStamp: _BaseAdapter._eventTimeStampToDuration(event.timeStamp!),
+        kind: kind,
+        signalKind: ui.PointerSignalKind.scroll,
+        device: deviceId,
+        physicalX: offset.dx * _view.devicePixelRatio,
+        physicalY: offset.dy * _view.devicePixelRatio,
+        buttons: event.buttons!.toInt(),
+        pressure: 1.0,
+        pressureMax: 1.0,
+        scrollDeltaX: deltaX,
+        scrollDeltaY: deltaY,
+      );
+    }
+    _lastWheelEvent = event;
+    _lastWheelEventWasTrackpad = kind == ui.PointerDeviceKind.trackpad;
     return data;
   }
 
-  void _addWheelEventListener(DomEventListener handler) {
-    _listeners.add(_Listener.registerNative(
+  void _addWheelEventListener(DartDomEventListener handler) {
+    _listeners.add(_Listener.register(
       event: 'wheel',
-      target: glassPaneElement,
-      handler: (DomEvent event) => handler(event),
+      target: _viewTarget,
+      handler: handler,
+      passive: false,
     ));
   }
 
@@ -399,15 +727,7 @@ mixin _WheelEventListenerMixin on _BaseAdapter {
     if (_debugLogPointerEvents) {
       print(event.type);
     }
-    _callback(_convertWheelEventToPointerData(event));
-    if (event.getModifierState('Control') &&
-        operatingSystem != OperatingSystem.macOs &&
-        operatingSystem != OperatingSystem.iOs) {
-      // Ignore Control+wheel events since the default handler
-      // will change browser zoom level instead of scrolling.
-      // The exception is MacOs where Control+wheel will still scroll and zoom.
-      return;
-    }
+    _callback(e, _convertWheelEventToPointerData(event));
     // Prevent default so mouse wheel event doesn't get converted to
     // a scroll event that semantic nodes would process.
     //
@@ -583,12 +903,7 @@ typedef _PointerEventListener = dynamic Function(DomPointerEvent event);
 ///
 /// For the difference between MouseEvent and PointerEvent, see _MouseAdapter.
 class _PointerAdapter extends _BaseAdapter with _WheelEventListenerMixin {
-  _PointerAdapter(
-    super.callback,
-    super.glassPaneElement,
-    super.pointerDataConverter,
-    super.keyboardConverter,
-  );
+  _PointerAdapter(super.owner);
 
   final Map<int, _ButtonSanitizer> _sanitizers = <int, _ButtonSanitizer>{};
 
@@ -618,7 +933,6 @@ class _PointerAdapter extends _BaseAdapter with _WheelEventListenerMixin {
     DomEventTarget target,
     String eventName,
     _PointerEventListener handler, {
-    bool useCapture = true,
     bool checkModifiers = true,
   }) {
     addEventListener(target, eventName, (DomEvent event) {
@@ -627,11 +941,11 @@ class _PointerAdapter extends _BaseAdapter with _WheelEventListenerMixin {
         _checkModifiersState(event);
       }
       handler(pointerEvent);
-    }, useCapture: useCapture);
+    });
   }
 
   void _checkModifiersState(DomPointerEvent event) {
-    _keyboardConverter.synthesizeModifiersIfNeeded(
+    _keyboardConverter?.synthesizeModifiersIfNeeded(
       event.getModifierState('Alt'),
       event.getModifierState('Control'),
       event.getModifierState('Meta'),
@@ -642,7 +956,7 @@ class _PointerAdapter extends _BaseAdapter with _WheelEventListenerMixin {
 
   @override
   void setup() {
-    _addPointerEventListener(glassPaneElement, 'pointerdown', (DomPointerEvent event) {
+    _addPointerEventListener(_viewTarget, 'pointerdown', (DomPointerEvent event) {
       final int device = _getPointerId(event);
       final List<ui.PointerData> pointerData = <ui.PointerData>[];
       final _ButtonSanitizer sanitizer = _ensureSanitizer(device);
@@ -657,10 +971,11 @@ class _PointerAdapter extends _BaseAdapter with _WheelEventListenerMixin {
           buttons: event.buttons!.toInt(),
         );
       _convertEventsToPointerData(data: pointerData, event: event, details: down);
-      _callback(pointerData);
+      _callback(event, pointerData);
     });
 
-    _addPointerEventListener(domWindow, 'pointermove', (DomPointerEvent event) {
+    // Why `domWindow` you ask? See this fiddle: https://jsfiddle.net/ditman/7towxaqp
+    _addPointerEventListener(_globalTarget, 'pointermove', (DomPointerEvent event) {
       final int device = _getPointerId(event);
       final _ButtonSanitizer sanitizer = _ensureSanitizer(device);
       final List<ui.PointerData> pointerData = <ui.PointerData>[];
@@ -673,21 +988,22 @@ class _PointerAdapter extends _BaseAdapter with _WheelEventListenerMixin {
         final _SanitizedDetails move = sanitizer.sanitizeMoveEvent(buttons: event.buttons!.toInt());
         _convertEventsToPointerData(data: pointerData, event: event, details: move);
       }
-      _callback(pointerData);
+      _callback(event, pointerData);
     });
 
-    _addPointerEventListener(glassPaneElement, 'pointerleave', (DomPointerEvent event) {
+    _addPointerEventListener(_viewTarget, 'pointerleave', (DomPointerEvent event) {
       final int device = _getPointerId(event);
       final _ButtonSanitizer sanitizer = _ensureSanitizer(device);
       final List<ui.PointerData> pointerData = <ui.PointerData>[];
       final _SanitizedDetails? details = sanitizer.sanitizeLeaveEvent(buttons: event.buttons!.toInt());
       if (details != null) {
         _convertEventsToPointerData(data: pointerData, event: event, details: details);
-        _callback(pointerData);
+        _callback(event, pointerData);
       }
-    }, useCapture: false, checkModifiers: false);
+    }, checkModifiers: false);
 
-    _addPointerEventListener(domWindow, 'pointerup', (DomPointerEvent event) {
+    // TODO(dit): This must happen in the flutterViewElement, https://github.com/flutter/flutter/issues/116561
+    _addPointerEventListener(_globalTarget, 'pointerup', (DomPointerEvent event) {
       final int device = _getPointerId(event);
       if (_hasSanitizer(device)) {
         final List<ui.PointerData> pointerData = <ui.PointerData>[];
@@ -695,21 +1011,23 @@ class _PointerAdapter extends _BaseAdapter with _WheelEventListenerMixin {
         _removePointerIfUnhoverable(event);
         if (details != null) {
           _convertEventsToPointerData(data: pointerData, event: event, details: details);
-          _callback(pointerData);
+          _callback(event, pointerData);
         }
       }
     });
 
+    // TODO(dit): Synthesize a "cancel" event when 'pointerup' happens outside of the flutterViewElement, https://github.com/flutter/flutter/issues/116561
+
     // A browser fires cancel event if it concludes the pointer will no longer
     // be able to generate events (example: device is deactivated)
-    _addPointerEventListener(glassPaneElement, 'pointercancel', (DomPointerEvent event) {
+    _addPointerEventListener(_viewTarget, 'pointercancel', (DomPointerEvent event) {
       final int device = _getPointerId(event);
       if (_hasSanitizer(device)) {
         final List<ui.PointerData> pointerData = <ui.PointerData>[];
         final _SanitizedDetails details = _getSanitizer(device).sanitizeCancelEvent();
         _removePointerIfUnhoverable(event);
         _convertEventsToPointerData(data: pointerData, event: event, details: details);
-        _callback(pointerData);
+        _callback(event, pointerData);
       }
     }, checkModifiers: false);
 
@@ -725,22 +1043,21 @@ class _PointerAdapter extends _BaseAdapter with _WheelEventListenerMixin {
     required DomPointerEvent event,
     required _SanitizedDetails details,
   }) {
-    assert(data != null);
-    assert(event != null);
-    assert(details != null);
     final ui.PointerDeviceKind kind = _pointerTypeToDeviceKind(event.pointerType!);
     final double tilt = _computeHighestTilt(event);
     final Duration timeStamp = _BaseAdapter._eventTimeStampToDuration(event.timeStamp!);
     final num? pressure = event.pressure;
+    final ui.Offset offset = computeEventOffsetToTarget(event, _view);
     _pointerDataConverter.convert(
       data,
+      viewId: _view.viewId,
       change: details.change,
       timeStamp: timeStamp,
       kind: kind,
       signalKind: ui.PointerSignalKind.none,
       device: _getPointerId(event),
-      physicalX: event.clientX * ui.window.devicePixelRatio,
-      physicalY: event.clientY * ui.window.devicePixelRatio,
+      physicalX: offset.dx * _view.devicePixelRatio,
+      physicalY: offset.dy * _view.devicePixelRatio,
       buttons: details.buttons,
       pressure:  pressure == null ? 0.0 : pressure.toDouble(),
       pressureMax: 1.0,
@@ -760,6 +1077,10 @@ class _PointerAdapter extends _BaseAdapter with _WheelEventListenerMixin {
         return coalescedEvents;
       }
     }
+    // Important: coalesced events lack the `eventTarget` property (because they're
+    // being handled in a deferred way).
+    //
+    // See the "Note" here: https://developer.mozilla.org/en-US/docs/Web/API/Event/currentTarget
     return <DomPointerEvent>[event];
   }
 
@@ -791,277 +1112,3 @@ class _PointerAdapter extends _BaseAdapter with _WheelEventListenerMixin {
       180.0 *
       math.pi;
 }
-
-typedef _TouchEventListener = dynamic Function(DomTouchEvent event);
-
-/// Adapter to be used with browsers that support touch events.
-class _TouchAdapter extends _BaseAdapter {
-  _TouchAdapter(
-    super.callback,
-    super.glassPaneElement,
-    super.pointerDataConverter,
-    super.keyboardConverter,
-  );
-
-  final Set<int> _pressedTouches = <int>{};
-  bool _isTouchPressed(int identifier) => _pressedTouches.contains(identifier);
-  void _pressTouch(int identifier) { _pressedTouches.add(identifier); }
-  void _unpressTouch(int identifier) { _pressedTouches.remove(identifier); }
-
-  void _addTouchEventListener(DomEventTarget target, String eventName, _TouchEventListener handler, {bool checkModifiers = true,}) {
-    addEventListener(target, eventName, (DomEvent event) {
-      final DomTouchEvent touchEvent = event as DomTouchEvent;
-      if (checkModifiers) {
-        _checkModifiersState(event);
-      }
-      handler(touchEvent);
-    });
-  }
-
-  void _checkModifiersState(DomTouchEvent event) {
-    _keyboardConverter.synthesizeModifiersIfNeeded(
-      event.altKey,
-      event.ctrlKey,
-      event.metaKey,
-      event.shiftKey,
-      event.timeStamp!,
-    );
-  }
-
-  @override
-  void setup() {
-    _addTouchEventListener(glassPaneElement, 'touchstart', (DomTouchEvent event) {
-      final Duration timeStamp = _BaseAdapter._eventTimeStampToDuration(event.timeStamp!);
-      final List<ui.PointerData> pointerData = <ui.PointerData>[];
-      for (final DomTouch touch in event.changedTouches!.cast<DomTouch>()) {
-        final bool nowPressed = _isTouchPressed(touch.identifier!.toInt());
-        if (!nowPressed) {
-          _pressTouch(touch.identifier!.toInt());
-          _convertEventToPointerData(
-            data: pointerData,
-            change: ui.PointerChange.down,
-            touch: touch,
-            pressed: true,
-            timeStamp: timeStamp,
-          );
-        }
-      }
-      _callback(pointerData);
-    });
-
-    _addTouchEventListener(glassPaneElement, 'touchmove', (DomTouchEvent event) {
-      event.preventDefault(); // Prevents standard overscroll on iOS/Webkit.
-      final Duration timeStamp = _BaseAdapter._eventTimeStampToDuration(event.timeStamp!);
-      final List<ui.PointerData> pointerData = <ui.PointerData>[];
-      for (final DomTouch touch in event.changedTouches!.cast<DomTouch>()) {
-        final bool nowPressed = _isTouchPressed(touch.identifier!.toInt());
-        if (nowPressed) {
-          _convertEventToPointerData(
-            data: pointerData,
-            change: ui.PointerChange.move,
-            touch: touch,
-            pressed: true,
-            timeStamp: timeStamp,
-          );
-        }
-      }
-      _callback(pointerData);
-    });
-
-    _addTouchEventListener(glassPaneElement, 'touchend', (DomTouchEvent event) {
-      // On Safari Mobile, the keyboard does not show unless this line is
-      // added.
-      event.preventDefault();
-      final Duration timeStamp = _BaseAdapter._eventTimeStampToDuration(event.timeStamp!);
-      final List<ui.PointerData> pointerData = <ui.PointerData>[];
-      for (final DomTouch touch in event.changedTouches!.cast<DomTouch>()) {
-        final bool nowPressed = _isTouchPressed(touch.identifier!.toInt());
-        if (nowPressed) {
-          _unpressTouch(touch.identifier!.toInt());
-          _convertEventToPointerData(
-            data: pointerData,
-            change: ui.PointerChange.up,
-            touch: touch,
-            pressed: false,
-            timeStamp: timeStamp,
-          );
-        }
-      }
-      _callback(pointerData);
-    });
-
-    _addTouchEventListener(glassPaneElement, 'touchcancel', (DomTouchEvent event) {
-      final Duration timeStamp = _BaseAdapter._eventTimeStampToDuration(event.timeStamp!);
-      final List<ui.PointerData> pointerData = <ui.PointerData>[];
-      for (final DomTouch touch in event.changedTouches!.cast<DomTouch>()) {
-        final bool nowPressed = _isTouchPressed(touch.identifier!.toInt());
-        if (nowPressed) {
-          _unpressTouch(touch.identifier!.toInt());
-          _convertEventToPointerData(
-            data: pointerData,
-            change: ui.PointerChange.cancel,
-            touch: touch,
-            pressed: false,
-            timeStamp: timeStamp,
-          );
-        }
-      }
-      _callback(pointerData);
-    });
-  }
-
-  void _convertEventToPointerData({
-    required List<ui.PointerData> data,
-    required ui.PointerChange change,
-    required DomTouch touch,
-    required bool pressed,
-    required Duration timeStamp,
-  }) {
-    _pointerDataConverter.convert(
-      data,
-      change: change,
-      timeStamp: timeStamp,
-      signalKind: ui.PointerSignalKind.none,
-      device: touch.identifier!.toInt(),
-      physicalX: touch.clientX * ui.window.devicePixelRatio,
-      physicalY: touch.clientY * ui.window.devicePixelRatio,
-      buttons: pressed ? _kPrimaryMouseButton : 0,
-      pressure: 1.0,
-      pressureMax: 1.0,
-    );
-  }
-}
-
-typedef _MouseEventListener = dynamic Function(DomMouseEvent event);
-
-/// Adapter to be used with browsers that support mouse events.
-///
-/// The difference between MouseEvent and PointerEvent can be illustrated using
-/// a scenario of changing buttons during a drag sequence: LMB down, RMB down,
-/// move, LMB up, RMB up, hover.
-///
-///                 LMB down    RMB down      move      LMB up      RMB up     hover
-/// PntEvt type | pointerdown pointermove pointermove pointermove pointerup pointermove
-///      button |      0           2           -1         0           2          -1
-///     buttons |     0x1         0x3         0x3        0x2         0x0        0x0
-/// MosEvt type |  mousedown   mousedown   mousemove   mouseup     mouseup   mousemove
-///      button |      0           2           0          0           2          0
-///     buttons |     0x1         0x3         0x3        0x2         0x0        0x0
-///
-/// The major differences are:
-///
-///  * The type of events for changing buttons during a drag sequence.
-///  * The `button` for dragging or hovering.
-class _MouseAdapter extends _BaseAdapter with _WheelEventListenerMixin {
-  _MouseAdapter(
-    super.callback,
-    super.glassPaneElement,
-    super.pointerDataConverter,
-    super.keyboardConverter,
-  );
-
-  final _ButtonSanitizer _sanitizer = _ButtonSanitizer();
-
-  void _addMouseEventListener(
-    DomEventTarget target,
-    String eventName,
-    _MouseEventListener handler, {
-    bool useCapture = true,
-    bool checkModifiers = true,
-  }) {
-    addEventListener(target, eventName, (DomEvent event) {
-      final DomMouseEvent mouseEvent = event as DomMouseEvent;
-      if (checkModifiers) {
-        _checkModifiersState(event);
-      }
-      handler(mouseEvent);
-    }, useCapture: useCapture);
-  }
-
-  void _checkModifiersState(DomMouseEvent event) {
-    _keyboardConverter.synthesizeModifiersIfNeeded(
-      event.getModifierState('Alt'),
-      event.getModifierState('Control'),
-      event.getModifierState('Meta'),
-      event.getModifierState('Shift'),
-      event.timeStamp!,
-    );
-  }
-
-  @override
-  void setup() {
-    _addMouseEventListener(glassPaneElement, 'mousedown', (DomMouseEvent event) {
-      final List<ui.PointerData> pointerData = <ui.PointerData>[];
-      final _SanitizedDetails? up =
-          _sanitizer.sanitizeMissingRightClickUp(buttons: event.buttons!.toInt());
-      if (up != null) {
-        _convertEventsToPointerData(data: pointerData, event: event, details: up);
-      }
-      final _SanitizedDetails sanitizedDetails =
-        _sanitizer.sanitizeDownEvent(
-          button: event.button.toInt(),
-          buttons: event.buttons!.toInt(),
-        );
-      _convertEventsToPointerData(data: pointerData, event: event, details: sanitizedDetails);
-      _callback(pointerData);
-    });
-
-    _addMouseEventListener(domWindow, 'mousemove', (DomMouseEvent event) {
-      final List<ui.PointerData> pointerData = <ui.PointerData>[];
-      final _SanitizedDetails? up = _sanitizer.sanitizeMissingRightClickUp(buttons: event.buttons!.toInt());
-      if (up != null) {
-        _convertEventsToPointerData(data: pointerData, event: event, details: up);
-      }
-      final _SanitizedDetails move = _sanitizer.sanitizeMoveEvent(buttons: event.buttons!.toInt());
-      _convertEventsToPointerData(data: pointerData, event: event, details: move);
-      _callback(pointerData);
-    });
-
-    _addMouseEventListener(glassPaneElement, 'mouseleave', (DomMouseEvent event) {
-      final List<ui.PointerData> pointerData = <ui.PointerData>[];
-      final _SanitizedDetails? details = _sanitizer.sanitizeLeaveEvent(buttons: event.buttons!.toInt());
-      if (details != null) {
-        _convertEventsToPointerData(data: pointerData, event: event, details: details);
-        _callback(pointerData);
-      }
-    }, useCapture: false);
-
-    _addMouseEventListener(domWindow, 'mouseup', (DomMouseEvent event) {
-      final List<ui.PointerData> pointerData = <ui.PointerData>[];
-      final _SanitizedDetails? sanitizedDetails = _sanitizer.sanitizeUpEvent(buttons: event.buttons?.toInt());
-      if (sanitizedDetails != null) {
-        _convertEventsToPointerData(data: pointerData, event: event, details: sanitizedDetails);
-        _callback(pointerData);
-      }
-    });
-
-    _addWheelEventListener((DomEvent event) {
-      _handleWheelEvent(event);
-    });
-  }
-
-  // For each event that is de-coalesced from `event` and described in
-  // `detailsList`, convert it to pointer data and store in `data`.
-  void _convertEventsToPointerData({
-    required List<ui.PointerData> data,
-    required DomMouseEvent event,
-    required _SanitizedDetails details,
-  }) {
-    assert(data != null);
-    assert(event != null);
-    assert(details != null);
-    _pointerDataConverter.convert(
-      data,
-      change: details.change,
-      timeStamp: _BaseAdapter._eventTimeStampToDuration(event.timeStamp!),
-      kind: ui.PointerDeviceKind.mouse,
-      signalKind: ui.PointerSignalKind.none,
-      device: _mouseDeviceId,
-      physicalX: event.clientX * ui.window.devicePixelRatio,
-      physicalY: event.clientY * ui.window.devicePixelRatio,
-      buttons: details.buttons,
-      pressure: 1.0,
-      pressureMax: 1.0,
-    );
-  }
-}
diff --git a/lib/web_ui/lib/src/engine/pointer_binding/event_position_helper.dart b/lib/web_ui/lib/src/engine/pointer_binding/event_position_helper.dart
new file mode 100644
index 0000000000000000000000000000000000000000..319a3620cd741051045a0607b608b67e0ff9423c
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/pointer_binding/event_position_helper.dart
@@ -0,0 +1,123 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:typed_data';
+
+import 'package:ui/ui.dart' as ui show Offset;
+
+import '../dom.dart';
+import '../semantics.dart' show EngineSemantics;
+import '../text_editing/text_editing.dart';
+import '../vector_math.dart';
+import '../window.dart';
+
+/// Returns an [ui.Offset] of the position of [event], relative to the position of [actualTarget].
+///
+/// The offset is *not* multiplied by DPR or anything else, it's the closest
+/// to what the DOM would return if we had currentTarget readily available.
+///
+/// This needs an `actualTarget`, because the `event.currentTarget` (which is what
+/// this would really need to use) gets lost when the `event` comes from a "coalesced"
+/// event.
+///
+/// It also takes into account semantics being enabled to fix the case where
+/// offsetX, offsetY == 0 (TalkBack events).
+ui.Offset computeEventOffsetToTarget(DomMouseEvent event, EngineFlutterView view) {
+  final DomElement actualTarget = view.dom.rootElement;
+  // On a TalkBack event
+  if (EngineSemantics.instance.semanticsEnabled && event.offsetX == 0 && event.offsetY == 0) {
+    return _computeOffsetForTalkbackEvent(event, actualTarget);
+  }
+
+  // On one of our text-editing nodes
+  final bool isInput = view.dom.textEditingHost.contains(event.target! as DomNode);
+  if (isInput) {
+    final EditableTextGeometry? inputGeometry = textEditing.strategy.geometry;
+    if (inputGeometry != null) {
+      return _computeOffsetForInputs(event, inputGeometry);
+    }
+  }
+
+  // On another DOM Element (normally a platform view)
+  final bool isTargetOutsideOfShadowDOM = event.target != actualTarget;
+  if (isTargetOutsideOfShadowDOM) {
+    final DomRect origin = actualTarget.getBoundingClientRect();
+    // event.clientX/Y and origin.x/y are relative **to the viewport**.
+    // (This doesn't work with 3D translations of the parent element.)
+    // TODO(dit): Make this understand 3D transforms, https://github.com/flutter/flutter/issues/117091
+    return ui.Offset(event.clientX - origin.x, event.clientY - origin.y);
+  }
+
+  // Return the offsetX/Y in the normal case.
+  // (This works with 3D translations of the parent element.)
+  return ui.Offset(event.offsetX, event.offsetY);
+}
+
+/// Computes the offsets for input nodes, which live outside of the shadowDOM.
+/// Since inputs can be transformed (scaled, translated, etc), we can't rely on
+/// `_computeOffsetRelativeToActualTarget` to calculate accurate coordinates, as
+/// it only handles the case where inputs are translated, but will have issues
+/// for scaled inputs (see: https://github.com/flutter/flutter/issues/125948).
+///
+/// We compute the offsets here by using the text input geometry data that is
+/// sent from the framework, which includes information on how to transform the
+/// underlying input element. We transform the `event.offset` points we receive
+/// using the values from the input's transform matrix.
+ui.Offset _computeOffsetForInputs(DomMouseEvent event, EditableTextGeometry inputGeometry) {
+  final DomElement targetElement = event.target! as DomHTMLElement;
+  final DomHTMLElement domElement = textEditing.strategy.activeDomElement;
+  assert(targetElement == domElement, 'The targeted input element must be the active input element');
+  final Float32List transformValues = inputGeometry.globalTransform;
+  assert(transformValues.length == 16);
+  final Matrix4 transform = Matrix4.fromFloat32List(transformValues);
+  final Vector3 transformedPoint = transform.perspectiveTransform(x: event.offsetX, y: event.offsetY, z: 0);
+
+  return ui.Offset(transformedPoint.x, transformedPoint.y);
+}
+
+/// Computes the event offset when TalkBack is firing the event.
+///
+/// In this case, we need to use the clientX/Y position of the event (which are
+/// relative to the absolute top-left corner of the page, including scroll), then
+/// deduct the offsetLeft/Top from every offsetParent of the `actualTarget`.
+///
+///  ×-Page----║-------------------------------+
+///  |         ║                               |
+///  | ×-------║--------offsetParent(s)-----+  |
+///  | |\                                   |  |
+///  | | offsetLeft, offsetTop              |  |
+///  | |                                    |  |
+///  | |                                    |  |
+///  | | ×-----║-------------actualTarget-+ |  |
+///  | | |                                | |  |
+///  ═════     × ─ (scrollLeft, scrollTop)═ ═  ═
+///  | | |                                | |  |
+///  | | |           ×                    | |  |
+///  | | |            \                   | |  |
+///  | | |             clientX, clientY   | |  |
+///  | | |   (Relative to Page + Scroll)  | |  |
+///  | | +-----║--------------------------+ |  |
+///  | +-------║----------------------------+  |
+///  +---------║-------------------------------+
+///
+/// Computing the offset of the event relative to the actualTarget requires to
+/// compute the clientX, clientY of the actualTarget. To do that, we iterate
+/// up the offsetParent elements of actualTarget adding their offset and scroll
+/// positions. Finally, we deduct that from clientX, clientY of the event.
+// TODO(dit): Make this understand 3D transforms, https://github.com/flutter/flutter/issues/117091
+ui.Offset _computeOffsetForTalkbackEvent(DomMouseEvent event, DomElement actualTarget) {
+  assert(EngineSemantics.instance.semanticsEnabled);
+  // Use clientX/clientY as the position of the event (this is relative to
+  // the top left of the page, including scroll)
+  double offsetX = event.clientX;
+  double offsetY = event.clientY;
+  // Compute the scroll offset of actualTarget
+  DomHTMLElement parent = actualTarget as DomHTMLElement;
+  while(parent.offsetParent != null){
+    offsetX -= parent.offsetLeft - parent.scrollLeft;
+    offsetY -= parent.offsetTop - parent.scrollTop;
+    parent = parent.offsetParent!;
+  }
+  return ui.Offset(offsetX, offsetY);
+}
diff --git a/lib/web_ui/lib/src/engine/pointer_converter.dart b/lib/web_ui/lib/src/engine/pointer_converter.dart
index 568577fe30bde0421f63da64e9dd2eb7a7779130..54fdef946b11f33aa27e36d8b1bfcc925a25ab3a 100644
--- a/lib/web_ui/lib/src/engine/pointer_converter.dart
+++ b/lib/web_ui/lib/src/engine/pointer_converter.dart
@@ -4,10 +4,13 @@
 
 import 'package:ui/ui.dart' as ui;
 
+import 'initialization.dart';
+
 const bool _debugLogPointerConverter = false;
 
-class _PointerState {
-  _PointerState(this.x, this.y);
+/// The state of the pointer of a specific device (e.g. finger, mouse).
+class _PointerDeviceState {
+  _PointerDeviceState(this.x, this.y);
 
   /// The identifier used in framework hit test.
   int? get pointer => _pointer;
@@ -22,6 +25,43 @@ class _PointerState {
   double y;
 }
 
+class _GlobalPointerState {
+  _GlobalPointerState() {
+    assert(() {
+      registerHotRestartListener(reset);
+      return true;
+    }());
+  }
+
+  // Map from browser pointer identifiers to PointerEvent pointer identifiers.
+  final Map<int, _PointerDeviceState> pointers = <int, _PointerDeviceState>{};
+
+  /// This field is used to keep track of button state.
+  ///
+  /// To normalize pointer events, when we receive pointer down followed by
+  /// pointer up, we synthesize a move event. To make sure that button state
+  /// is correct for move regardless of button state at the time of up event
+  /// we store it on down,hover and move events.
+  int activeButtons = 0;
+
+  _PointerDeviceState ensurePointerDeviceState(int device, double x, double y) {
+    return pointers.putIfAbsent(
+      device,
+      () => _PointerDeviceState(x, y),
+    );
+  }
+
+  /// Resets all pointer states.
+  ///
+  /// This method is invoked during hot reload to make sure we have a clean
+  /// converter after hot reload.
+  void reset() {
+    pointers.clear();
+    _PointerDeviceState._pointerCount = 0;
+    activeButtons = 0;
+  }
+}
+
 /// Converter to convert web pointer data into a form that framework can
 /// understand.
 ///
@@ -44,35 +84,14 @@ class _PointerState {
 class PointerDataConverter {
   PointerDataConverter();
 
-  // Map from browser pointer identifiers to PointerEvent pointer identifiers.
-  final Map<int, _PointerState> _pointers = <int, _PointerState>{};
-
-  /// This field is used to keep track of button state.
-  ///
-  /// To normalize pointer events, when we receive pointer down followed by
-  /// pointer up, we synthesize a move event. To make sure that button state
-  /// is correct for move regardless of button state at the time of up event
-  /// we store it on down,hover and move events.
-  int _activeButtons = 0;
-
-  /// Clears the existing pointer states.
-  ///
-  /// This method is invoked during hot reload to make sure we have a clean
-  /// converter after hot reload.
-  void clearPointerState() {
-    _pointers.clear();
-    _PointerState._pointerCount = 0;
-    _activeButtons = 0;
-  }
-
-  _PointerState _ensureStateForPointer(int device, double x, double y) {
-    return _pointers.putIfAbsent(
-      device,
-      () => _PointerState(x, y),
-    );
-  }
+  // This is made static because the state of pointer devices is global. This
+  // matches how the framework currently handles the state of pointer devices.
+  //
+  // See: https://github.com/flutter/flutter/blob/023e5addaa6e8e294a200cf754afaa1656f14aa6/packages/flutter/lib/src/rendering/binding.dart#L47-L47
+  static final _GlobalPointerState globalPointerState = _GlobalPointerState();
 
   ui.PointerData _generateCompletePointerData({
+    required int viewId,
     required Duration timeStamp,
     required ui.PointerChange change,
     required ui.PointerDeviceKind kind,
@@ -97,14 +116,16 @@ class PointerDataConverter {
     required int platformData,
     required double scrollDeltaX,
     required double scrollDeltaY,
+    required double scale,
   }) {
-    assert(_pointers.containsKey(device));
-    final _PointerState state = _pointers[device]!;
+    assert(globalPointerState.pointers.containsKey(device));
+    final _PointerDeviceState state = globalPointerState.pointers[device]!;
     final double deltaX = physicalX - state.x;
     final double deltaY = physicalY - state.y;
     state.x = physicalX;
     state.y = physicalY;
     return ui.PointerData(
+      viewId: viewId,
       timeStamp: timeStamp,
       change: change,
       kind: kind,
@@ -132,16 +153,18 @@ class PointerDataConverter {
       platformData: platformData,
       scrollDeltaX: scrollDeltaX,
       scrollDeltaY: scrollDeltaY,
+      scale: scale,
     );
   }
 
   bool _locationHasChanged(int device, double physicalX, double physicalY) {
-    assert(_pointers.containsKey(device));
-    final _PointerState state = _pointers[device]!;
+    assert(globalPointerState.pointers.containsKey(device));
+    final _PointerDeviceState state = globalPointerState.pointers[device]!;
     return state.x != physicalX || state.y != physicalY;
   }
 
   ui.PointerData _synthesizePointerData({
+    required int viewId,
     required Duration timeStamp,
     required ui.PointerChange change,
     required ui.PointerDeviceKind kind,
@@ -165,14 +188,16 @@ class PointerDataConverter {
     required int platformData,
     required double scrollDeltaX,
     required double scrollDeltaY,
+    required double scale,
   }) {
-    assert(_pointers.containsKey(device));
-    final _PointerState state = _pointers[device]!;
+    assert(globalPointerState.pointers.containsKey(device));
+    final _PointerDeviceState state = globalPointerState.pointers[device]!;
     final double deltaX = physicalX - state.x;
     final double deltaY = physicalY - state.y;
     state.x = physicalX;
     state.y = physicalY;
     return ui.PointerData(
+      viewId: viewId,
       timeStamp: timeStamp,
       change: change,
       kind: kind,
@@ -204,6 +229,7 @@ class PointerDataConverter {
       platformData: platformData,
       scrollDeltaX: scrollDeltaX,
       scrollDeltaY: scrollDeltaY,
+      scale: scale,
     );
   }
 
@@ -211,6 +237,7 @@ class PointerDataConverter {
   /// pointer data and stores it into [result]
   void convert(
     List<ui.PointerData> result, {
+    required int viewId,
     Duration timeStamp = Duration.zero,
     ui.PointerChange change = ui.PointerChange.cancel,
     ui.PointerDeviceKind kind = ui.PointerDeviceKind.touch,
@@ -235,21 +262,22 @@ class PointerDataConverter {
     int platformData = 0,
     double scrollDeltaX = 0.0,
     double scrollDeltaY = 0.0,
+    double scale = 1.0,
   }) {
     if (_debugLogPointerConverter) {
-      print('>> device=$device change=$change buttons=$buttons');
+      print('>> view=$viewId device=$device change=$change buttons=$buttons');
     }
     final bool isDown = buttons != 0;
-    assert(change != null);
     if (signalKind == null ||
       signalKind == ui.PointerSignalKind.none) {
       switch (change) {
         case ui.PointerChange.add:
-          assert(!_pointers.containsKey(device));
-          _ensureStateForPointer(device, physicalX, physicalY);
+          assert(!globalPointerState.pointers.containsKey(device));
+          globalPointerState.ensurePointerDeviceState(device, physicalX, physicalY);
           assert(!_locationHasChanged(device, physicalX, physicalY));
           result.add(
             _generateCompletePointerData(
+              viewId: viewId,
               timeStamp: timeStamp,
               change: change,
               kind: kind,
@@ -274,17 +302,18 @@ class PointerDataConverter {
               platformData: platformData,
               scrollDeltaX: scrollDeltaX,
               scrollDeltaY: scrollDeltaY,
+              scale: scale,
             )
           );
-          break;
         case ui.PointerChange.hover:
-          final bool alreadyAdded = _pointers.containsKey(device);
-          _ensureStateForPointer(device, physicalX, physicalY);
+          final bool alreadyAdded = globalPointerState.pointers.containsKey(device);
+          globalPointerState.ensurePointerDeviceState(device, physicalX, physicalY);
           assert(!isDown);
           if (!alreadyAdded) {
             // Synthesizes an add pointer data.
             result.add(
               _synthesizePointerData(
+                viewId: viewId,
                 timeStamp: timeStamp,
                 change: ui.PointerChange.add,
                 kind: kind,
@@ -308,11 +337,13 @@ class PointerDataConverter {
                 platformData: platformData,
                 scrollDeltaX: scrollDeltaX,
                 scrollDeltaY: scrollDeltaY,
+                scale: scale,
               )
             );
           }
           result.add(
             _generateCompletePointerData(
+              viewId: viewId,
               timeStamp: timeStamp,
               change: change,
               kind: kind,
@@ -337,20 +368,21 @@ class PointerDataConverter {
               platformData: platformData,
               scrollDeltaX: scrollDeltaX,
               scrollDeltaY: scrollDeltaY,
+              scale: scale,
             )
           );
-          _activeButtons = buttons;
-          break;
+          globalPointerState.activeButtons = buttons;
         case ui.PointerChange.down:
-          final bool alreadyAdded = _pointers.containsKey(device);
-          final _PointerState state = _ensureStateForPointer(
-            device, physicalX, physicalY);
+          final bool alreadyAdded = globalPointerState.pointers.containsKey(device);
+          final _PointerDeviceState state = globalPointerState.ensurePointerDeviceState(
+              device, physicalX, physicalY);
           assert(isDown);
           state.startNewPointer();
           if (!alreadyAdded) {
             // Synthesizes an add pointer data.
             result.add(
               _synthesizePointerData(
+                viewId: viewId,
                 timeStamp: timeStamp,
                 change: ui.PointerChange.add,
                 kind: kind,
@@ -374,6 +406,7 @@ class PointerDataConverter {
                 platformData: platformData,
                 scrollDeltaX: scrollDeltaX,
                 scrollDeltaY: scrollDeltaY,
+                scale: scale,
               )
             );
           }
@@ -383,6 +416,7 @@ class PointerDataConverter {
             // sending the down event, if necessary.
             result.add(
               _synthesizePointerData(
+                viewId: viewId,
                 timeStamp: timeStamp,
                 change: ui.PointerChange.hover,
                 kind: kind,
@@ -406,11 +440,13 @@ class PointerDataConverter {
                 platformData: platformData,
                 scrollDeltaX: scrollDeltaX,
                 scrollDeltaY: scrollDeltaY,
+                scale: scale,
               )
             );
           }
           result.add(
             _generateCompletePointerData(
+              viewId: viewId,
               timeStamp: timeStamp,
               change: change,
               kind: kind,
@@ -435,15 +471,16 @@ class PointerDataConverter {
               platformData: platformData,
               scrollDeltaX: scrollDeltaX,
               scrollDeltaY: scrollDeltaY,
+              scale: scale,
             )
           );
-          _activeButtons = buttons;
-          break;
+          globalPointerState.activeButtons = buttons;
         case ui.PointerChange.move:
-          assert(_pointers.containsKey(device));
+          assert(globalPointerState.pointers.containsKey(device));
           assert(isDown);
           result.add(
             _generateCompletePointerData(
+              viewId: viewId,
               timeStamp: timeStamp,
               change: change,
               kind: kind,
@@ -468,14 +505,14 @@ class PointerDataConverter {
               platformData: platformData,
               scrollDeltaX: scrollDeltaX,
               scrollDeltaY: scrollDeltaY,
+              scale: scale,
             )
           );
-          _activeButtons = buttons;
-          break;
+          globalPointerState.activeButtons = buttons;
         case ui.PointerChange.up:
         case ui.PointerChange.cancel:
-          assert(_pointers.containsKey(device));
-          final _PointerState state = _pointers[device]!;
+          assert(globalPointerState.pointers.containsKey(device));
+          final _PointerDeviceState state = globalPointerState.pointers[device]!;
           assert(!isDown);
           // Cancel events can have different coordinates due to various
           // reasons (window lost focus which is accompanied by window
@@ -491,13 +528,14 @@ class PointerDataConverter {
             // sending the up event, if necessary.
             result.add(
               _synthesizePointerData(
+                viewId: viewId,
                 timeStamp: timeStamp,
                 change: ui.PointerChange.move,
                 kind: kind,
                 device: device,
                 physicalX: physicalX,
                 physicalY: physicalY,
-                buttons: _activeButtons,
+                buttons: globalPointerState.activeButtons,
                 obscured: obscured,
                 pressure: pressure,
                 pressureMin: pressureMin,
@@ -514,11 +552,13 @@ class PointerDataConverter {
                 platformData: platformData,
                 scrollDeltaX: scrollDeltaX,
                 scrollDeltaY: scrollDeltaY,
+                scale: scale,
               )
             );
           }
           result.add(
             _generateCompletePointerData(
+              viewId: viewId,
               timeStamp: timeStamp,
               change: change,
               kind: kind,
@@ -543,6 +583,7 @@ class PointerDataConverter {
               platformData: platformData,
               scrollDeltaX: scrollDeltaX,
               scrollDeltaY: scrollDeltaY,
+              scale: scale,
             )
           );
           if (kind == ui.PointerDeviceKind.touch) {
@@ -551,6 +592,7 @@ class PointerDataConverter {
             // over (i.e. when "up" or "cancel" is received).
             result.add(
               _synthesizePointerData(
+                viewId: viewId,
                 timeStamp: timeStamp,
                 change: ui.PointerChange.remove,
                 kind: kind,
@@ -574,17 +616,18 @@ class PointerDataConverter {
                 platformData: platformData,
                 scrollDeltaX: scrollDeltaX,
                 scrollDeltaY: scrollDeltaY,
+                scale: scale,
               )
             );
-            _pointers.remove(device);
+            globalPointerState.pointers.remove(device);
           }
-          break;
         case ui.PointerChange.remove:
-          assert(_pointers.containsKey(device));
-          final _PointerState state = _pointers[device]!;
+          assert(globalPointerState.pointers.containsKey(device));
+          final _PointerDeviceState state = globalPointerState.pointers[device]!;
           assert(!isDown);
           result.add(
             _generateCompletePointerData(
+              viewId: viewId,
               timeStamp: timeStamp,
               change: change,
               kind: kind,
@@ -609,28 +652,28 @@ class PointerDataConverter {
               platformData: platformData,
               scrollDeltaX: scrollDeltaX,
               scrollDeltaY: scrollDeltaY,
+              scale: scale,
             )
           );
-          _pointers.remove(device);
-          break;
+          globalPointerState.pointers.remove(device);
         case ui.PointerChange.panZoomStart:
         case ui.PointerChange.panZoomUpdate:
         case ui.PointerChange.panZoomEnd:
           // Pointer pan/zoom events are not generated on web.
           assert(false);
-          break;
       }
     } else {
       switch (signalKind) {
         case ui.PointerSignalKind.scroll:
         case ui.PointerSignalKind.scrollInertiaCancel:
         case ui.PointerSignalKind.scale:
-          final bool alreadyAdded = _pointers.containsKey(device);
-          _ensureStateForPointer(device, physicalX, physicalY);
+          final bool alreadyAdded = globalPointerState.pointers.containsKey(device);
+          globalPointerState.ensurePointerDeviceState(device, physicalX, physicalY);
           if (!alreadyAdded) {
             // Synthesizes an add pointer data.
             result.add(
               _synthesizePointerData(
+                viewId: viewId,
                 timeStamp: timeStamp,
                 change: ui.PointerChange.add,
                 kind: kind,
@@ -654,6 +697,7 @@ class PointerDataConverter {
                 platformData: platformData,
                 scrollDeltaX: scrollDeltaX,
                 scrollDeltaY: scrollDeltaY,
+                scale: scale,
               )
             );
           }
@@ -665,6 +709,7 @@ class PointerDataConverter {
             if (isDown) {
               result.add(
                 _synthesizePointerData(
+                  viewId: viewId,
                   timeStamp: timeStamp,
                   change: ui.PointerChange.move,
                   kind: kind,
@@ -688,11 +733,13 @@ class PointerDataConverter {
                   platformData: platformData,
                   scrollDeltaX: scrollDeltaX,
                   scrollDeltaY: scrollDeltaY,
+                  scale: scale,
                 )
               );
             } else {
               result.add(
                 _synthesizePointerData(
+                  viewId: viewId,
                   timeStamp: timeStamp,
                   change: ui.PointerChange.hover,
                   kind: kind,
@@ -716,12 +763,14 @@ class PointerDataConverter {
                   platformData: platformData,
                   scrollDeltaX: scrollDeltaX,
                   scrollDeltaY: scrollDeltaY,
+                  scale: scale,
                 )
               );
             }
           }
           result.add(
             _generateCompletePointerData(
+              viewId: viewId,
               timeStamp: timeStamp,
               change: change,
               kind: kind,
@@ -746,12 +795,11 @@ class PointerDataConverter {
               platformData: platformData,
               scrollDeltaX: scrollDeltaX,
               scrollDeltaY: scrollDeltaY,
+              scale: scale,
             )
           );
-          break;
         case ui.PointerSignalKind.none:
           assert(false); // This branch should already have 'none' filtered out.
-          break;
         case ui.PointerSignalKind.unknown:
         // Ignore unknown signals.
           break;
diff --git a/lib/web_ui/lib/src/engine/profiler.dart b/lib/web_ui/lib/src/engine/profiler.dart
index 9601f1c0e429bc14ac1ab2bbfd0b9ade16395ee2..d5ef8b3fa831ba0f3a566af084c258a6423cf60e 100644
--- a/lib/web_ui/lib/src/engine/profiler.dart
+++ b/lib/web_ui/lib/src/engine/profiler.dart
@@ -3,12 +3,18 @@
 // found in the LICENSE file.
 
 import 'dart:async';
+import 'dart:js_interop';
 
-import 'package:ui/ui.dart' as ui;
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
-import 'dom.dart';
-import 'platform_dispatcher.dart';
-import 'safe_browser_api.dart';
+import 'util.dart';
+
+// TODO(mdebbar): Deprecate this and remove it.
+// https://github.com/flutter/flutter/issues/127395
+@JS('window._flutter_internal_on_benchmark')
+external JSExportedDartFunction? get jsBenchmarkValueCallback;
+
+ui_web.BenchmarkValueCallback? engineBenchmarkValueCallback;
 
 /// A function that computes a value of type [R].
 ///
@@ -101,131 +107,23 @@ class Profiler {
   void benchmark(String name, double value) {
     _checkBenchmarkMode();
 
-    // First get the value as `Object?` then use `as` cast to check the type.
-    // This is because the type cast in `getJsProperty<Object?>` is optimized
-    // out at certain optimization levels in dart2js, leading to obscure errors
-    // later on.
-    final Object? onBenchmark = getJsProperty<Object?>(
-      domWindow,
-      '_flutter_internal_on_benchmark',
-    );
-    onBenchmark as OnBenchmark?;
-    onBenchmark?.call(name, value);
-  }
-}
-
-/// Whether we are collecting [ui.FrameTiming]s.
-bool get _frameTimingsEnabled {
-  return EnginePlatformDispatcher.instance.onReportTimings != null;
-}
-
-/// Collects frame timings from frames.
-///
-/// This list is periodically reported to the framework (see
-/// [_kFrameTimingsSubmitInterval]).
-List<ui.FrameTiming> _frameTimings = <ui.FrameTiming>[];
-
-/// The amount of time in microseconds we wait between submitting
-/// frame timings.
-const int _kFrameTimingsSubmitInterval = 100000; // 100 milliseconds
-
-/// The last time (in microseconds) we submitted frame timings.
-int _frameTimingsLastSubmitTime = _nowMicros();
-
-// These variables store individual [ui.FrameTiming] properties.
-int _vsyncStartMicros = -1;
-int _buildStartMicros = -1;
-int _buildFinishMicros = -1;
-int _rasterStartMicros = -1;
-int _rasterFinishMicros = -1;
-
-/// Records the vsync timestamp for this frame.
-void frameTimingsOnVsync() {
-  if (!_frameTimingsEnabled) {
-    return;
-  }
-  _vsyncStartMicros = _nowMicros();
-}
-
-/// Records the time when the framework started building the frame.
-void frameTimingsOnBuildStart() {
-  if (!_frameTimingsEnabled) {
-    return;
-  }
-  _buildStartMicros = _nowMicros();
-}
-
-/// Records the time when the framework finished building the frame.
-void frameTimingsOnBuildFinish() {
-  if (!_frameTimingsEnabled) {
-    return;
-  }
-  _buildFinishMicros = _nowMicros();
-}
-
-/// Records the time when the framework started rasterizing the frame.
-///
-/// On the web, this value is almost always the same as [_buildFinishMicros]
-/// because it's single-threaded so there's no delay between building
-/// and rasterization.
-///
-/// This also means different things between HTML and CanvasKit renderers.
-///
-/// In HTML "rasterization" only captures DOM updates, but not the work that
-/// the browser performs after the DOM updates are committed. The browser
-/// does not report that information.
-///
-/// CanvasKit captures everything because we control the rasterization
-/// process, so we know exactly when rasterization starts and ends.
-void frameTimingsOnRasterStart() {
-  if (!_frameTimingsEnabled) {
-    return;
-  }
-  _rasterStartMicros = _nowMicros();
-}
+    final ui_web.BenchmarkValueCallback? callback =
+        jsBenchmarkValueCallback?.toDart as ui_web.BenchmarkValueCallback?;
+    if (callback != null) {
+      printWarning(
+        'The JavaScript benchmarking API (i.e. `window._flutter_internal_on_benchmark`) '
+        'is deprecated and will be removed in a future release. Please use '
+        '`benchmarkValueCallback` from `dart:ui_web` instead.',
+      );
+      callback(name, value);
+    }
 
-/// Records the time when the framework started rasterizing the frame.
-///
-/// See [_frameTimingsOnRasterStart] for more details on what rasterization
-/// timings mean on the web.
-void frameTimingsOnRasterFinish() {
-  if (!_frameTimingsEnabled) {
-    return;
-  }
-  final int now = _nowMicros();
-  _rasterFinishMicros = now;
-  _frameTimings.add(ui.FrameTiming(
-    vsyncStart: _vsyncStartMicros,
-    buildStart: _buildStartMicros,
-    buildFinish: _buildFinishMicros,
-    rasterStart: _rasterStartMicros,
-    rasterFinish: _rasterFinishMicros,
-    rasterFinishWallTime: _rasterFinishMicros,
-  ));
-  _vsyncStartMicros = -1;
-  _buildStartMicros = -1;
-  _buildFinishMicros = -1;
-  _rasterStartMicros = -1;
-  _rasterFinishMicros = -1;
-  if (now - _frameTimingsLastSubmitTime > _kFrameTimingsSubmitInterval) {
-    _frameTimingsLastSubmitTime = now;
-    EnginePlatformDispatcher.instance.invokeOnReportTimings(_frameTimings);
-    _frameTimings = <ui.FrameTiming>[];
+    if (engineBenchmarkValueCallback != null) {
+      engineBenchmarkValueCallback!(name, value);
+    }
   }
 }
 
-/// Current timestamp in microseconds taken from the high-precision
-/// monotonically increasing timer.
-///
-/// See also:
-///
-/// * https://developer.mozilla.org/en-US/docs/Web/API/Performance/now,
-///   particularly notes about Firefox rounding to 1ms for security reasons,
-///   which can be bypassed in tests by setting certain browser options.
-int _nowMicros() {
-  return (domWindow.performance.now() * 1000).toInt();
-}
-
 /// Counts various events that take place while the app is running.
 ///
 /// This class will slow down the app, and therefore should be disabled while
diff --git a/lib/web_ui/lib/src/engine/raw_keyboard.dart b/lib/web_ui/lib/src/engine/raw_keyboard.dart
index 6157bd7477c857844498d2707bf6c06651ae4b0c..54ba7ae93c04d74feff25f3c49ec19dea4edec17 100644
--- a/lib/web_ui/lib/src/engine/raw_keyboard.dart
+++ b/lib/web_ui/lib/src/engine/raw_keyboard.dart
@@ -6,24 +6,15 @@ import 'dart:async';
 import 'dart:typed_data';
 
 import '../engine.dart'  show registerHotRestartListener;
+import 'browser_detection.dart';
 import 'dom.dart';
 import 'keyboard_binding.dart';
 import 'platform_dispatcher.dart';
-import 'safe_browser_api.dart';
 import 'services.dart';
 
 /// Provides keyboard bindings, such as the `flutter/keyevent` channel.
 class RawKeyboard {
   RawKeyboard._(this._onMacOs) {
-    _keydownListener = allowInterop((DomEvent event) {
-      _handleHtmlEvent(event);
-    });
-    domWindow.addEventListener('keydown', _keydownListener);
-
-    _keyupListener = allowInterop((DomEvent event) {
-      _handleHtmlEvent(event);
-    });
-    domWindow.addEventListener('keyup', _keyupListener);
     registerHotRestartListener(() {
       dispose();
     });
@@ -34,6 +25,9 @@ class RawKeyboard {
   /// Use the [instance] getter to get the singleton after calling this method.
   static void initialize({bool onMacOs = false}) {
     _instance ??= RawKeyboard._(onMacOs);
+    // KeyboardBinding is responsible for forwarding the keyboard
+    // events to the RawKeyboard handler.
+    KeyboardBinding.initInstance();
   }
 
   /// The [RawKeyboard] singleton.
@@ -46,24 +40,16 @@ class RawKeyboard {
   /// if no repeat events were received.
   final Map<String, Timer> _keydownTimers = <String, Timer>{};
 
-  DomEventListener? _keydownListener;
-  DomEventListener? _keyupListener;
-
   /// Uninitializes the [RawKeyboard] singleton.
   ///
   /// After calling this method this object becomes unusable and [instance]
   /// becomes `null`. Call [initialize] again to initialize a new singleton.
   void dispose() {
-    domWindow.removeEventListener('keydown', _keydownListener);
-    domWindow.removeEventListener('keyup', _keyupListener);
-
     for (final String key in _keydownTimers.keys) {
       _keydownTimers[key]!.cancel();
     }
     _keydownTimers.clear();
 
-    _keydownListener = null;
-    _keyupListener = null;
     _instance = null;
   }
 
@@ -96,7 +82,7 @@ class RawKeyboard {
     return event.type == 'keydown' && event.key == 'Tab' && event.isComposing;
   }
 
-  void _handleHtmlEvent(DomEvent domEvent) {
+  void handleHtmlEvent(DomEvent domEvent) {
     if (!domInstanceOfString(domEvent, 'KeyboardEvent')) {
       return;
     }
@@ -134,6 +120,13 @@ class RawKeyboard {
         _lastMetaState |= modifierNumLock;
       } else if (event.key == 'ScrollLock') {
         _lastMetaState |= modifierScrollLock;
+      } else if (event.key == 'Meta' && operatingSystem == OperatingSystem.linux) {
+        // On Chrome Linux, metaState can be wrong when a Meta key is pressed.
+        _lastMetaState |= _modifierMeta;
+      } else if (event.code == 'MetaLeft' && event.key == 'Process') {
+        // When Meta key is pressed, browsers can emit an event whose key is 'Process'.
+        // See https://github.com/flutter/flutter/issues/141186.
+        _lastMetaState |= _modifierMeta;
       }
     }
     final Map<String, dynamic> eventData = <String, dynamic>{
@@ -155,6 +148,7 @@ class RawKeyboard {
         if (jsonResponse['handled'] as bool) {
           // If the framework handled it, then don't propagate it any further.
           event.preventDefault();
+          event.stopPropagation();
         }
       },
     );
diff --git a/lib/web_ui/lib/src/engine/renderer.dart b/lib/web_ui/lib/src/engine/renderer.dart
index cc715bb51038612a698094dbe456338a8e5b1d27..fd62aaac8b6bb614457e46eb3dca58e06e86700a 100644
--- a/lib/web_ui/lib/src/engine/renderer.dart
+++ b/lib/web_ui/lib/src/engine/renderer.dart
@@ -6,16 +6,10 @@ import 'dart:async';
 import 'dart:math' as math;
 import 'dart:typed_data';
 
+import 'package:ui/src/engine.dart';
+import 'package:ui/src/engine/skwasm/skwasm_stub.dart' if (dart.library.ffi) 'package:ui/src/engine/skwasm/skwasm_impl.dart';
 import 'package:ui/ui.dart' as ui;
-
-import 'browser_detection.dart';
-import 'canvaskit/renderer.dart';
-import 'configuration.dart';
-import 'embedder.dart';
-import 'fonts.dart';
-import 'html/renderer.dart';
-import 'html_image_codec.dart';
-import 'skwasm/skwasm_stub/renderer.dart' if (dart.library.ffi) 'skwasm/skwasm_impl/renderer.dart';
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
 final Renderer _renderer = Renderer._internal();
 Renderer get renderer => _renderer;
@@ -29,28 +23,28 @@ abstract class Renderer {
   factory Renderer._internal() {
     if (FlutterConfiguration.flutterWebUseSkwasm) {
       return SkwasmRenderer();
-    }
-    bool useCanvasKit;
-    if (FlutterConfiguration.flutterWebAutoDetect) {
-      if (configuration.requestedRendererType != null) {
-        useCanvasKit = configuration.requestedRendererType == 'canvaskit';
+    } else {
+      bool useCanvasKit;
+      if (FlutterConfiguration.flutterWebAutoDetect) {
+        if (configuration.requestedRendererType != null) {
+          useCanvasKit = configuration.requestedRendererType == 'canvaskit';
+        } else {
+          // If requestedRendererType is not specified, use CanvasKit for desktop and
+          // html for mobile.
+          useCanvasKit = isDesktop;
+        }
       } else {
-        // If requestedRendererType is not specified, use CanvasKit for desktop and
-        // html for mobile.
-        useCanvasKit = isDesktop;
+        useCanvasKit = FlutterConfiguration.useSkia;
       }
-    } else {
-      useCanvasKit = FlutterConfiguration.useSkia;
-    }
 
-    return useCanvasKit ? CanvasKitRenderer() : HtmlRenderer();
+      return useCanvasKit ? CanvasKitRenderer() : HtmlRenderer();
+    }
   }
 
   String get rendererTag;
-  FontCollection get fontCollection;
+  FlutterFontCollection get fontCollection;
 
   FutureOr<void> initialize();
-  void reset(FlutterViewEmbedder embedder);
 
   ui.Paint createPaint();
 
@@ -130,9 +124,11 @@ abstract class Renderer {
 
   Future<ui.Codec> instantiateImageCodecFromUrl(
     Uri uri, {
-    WebOnlyImageCodecChunkCallback? chunkCallback,
+    ui_web.ImageCodecChunkCallback? chunkCallback,
   });
 
+  FutureOr<ui.Image> createImageFromImageBitmap(DomImageBitmap imageSource);
+
   void decodeImageFromPixels(
     Uint8List pixels,
     int width,
@@ -160,6 +156,18 @@ abstract class Renderer {
   ui.Path copyPath(ui.Path src);
   ui.Path combinePaths(ui.PathOperation op, ui.Path path1, ui.Path path2);
 
+  ui.LineMetrics createLineMetrics({
+    required bool hardBreak,
+    required double ascent,
+    required double descent,
+    required double unscaledAscent,
+    required double height,
+    required double width,
+    required double left,
+    required double baseline,
+    required int lineNumber,
+  });
+
   ui.TextStyle createTextStyle({
     required ui.Color? color,
     required ui.TextDecoration? decoration,
@@ -213,5 +221,5 @@ abstract class Renderer {
 
   ui.ParagraphBuilder createParagraphBuilder(ui.ParagraphStyle style);
 
-  void renderScene(ui.Scene scene);
+  Future<void> renderScene(ui.Scene scene, ui.FlutterView view);
 }
diff --git a/lib/web_ui/lib/src/engine/safe_browser_api.dart b/lib/web_ui/lib/src/engine/safe_browser_api.dart
index 77c2c9f8960c8fad9e7b92110161a85f86d28028..242eaa2ae8ffbccb7bdce9dfc38f1a43a570484d 100644
--- a/lib/web_ui/lib/src/engine/safe_browser_api.dart
+++ b/lib/web_ui/lib/src/engine/safe_browser_api.dart
@@ -12,31 +12,18 @@
 library browser_api;
 
 import 'dart:async';
+import 'dart:js_interop';
 import 'dart:js_util' as js_util;
 import 'dart:math' as math;
 import 'dart:typed_data';
 
-import 'package:js/js.dart';
 import 'package:ui/ui.dart' as ui;
 
 import 'browser_detection.dart';
+import 'display.dart';
 import 'dom.dart';
-import 'platform_dispatcher.dart';
 import 'vector_math.dart';
 
-export 'package:js/js.dart' show allowInterop;
-
-/// Creates JavaScript object populated with [properties].
-///
-/// This is equivalent to writing `{}` in plain JavaScript.
-Object createPlainJsObject([Map<String, Object?>? properties]) {
-  if (properties != null) {
-    return js_util.jsify(properties) as Object;
-  } else {
-    return js_util.newObject<Object>();
-  }
-}
-
 /// Returns true if [object] has property [name], false otherwise.
 ///
 /// This is equivalent to writing `name in object` in plain JavaScript.
@@ -76,47 +63,6 @@ Future<T> promiseToFuture<T>(Object jsPromise) {
   return js_util.promiseToFuture<T>(jsPromise);
 }
 
-/// A function that receives a benchmark [value] labeleb by [name].
-typedef OnBenchmark = void Function(String name, double value);
-
-/// Adds an event [listener] of type [type] to the [target].
-///
-/// [eventOptions] supply additional configuration parameters.
-///
-/// This is different from [DomElement.addEventListener] in that the listener
-/// is added as a plain JavaScript function, as opposed to a Dart function.
-///
-/// To remove the listener, call [removeJsEventListener].
-void addJsEventListener(Object target, String type, Function listener, Object eventOptions) {
-  js_util.callMethod<void>(
-    target,
-    'addEventListener', <dynamic>[
-      type,
-      listener,
-      eventOptions,
-    ]
-  );
-}
-
-/// Removes an event listener that was added using [addJsEventListener].
-void removeJsEventListener(Object target, String type, Function listener, Object eventOptions) {
-  js_util.callMethod<void>(
-    target,
-    'removeEventListener', <dynamic>[
-      type,
-      listener,
-      eventOptions,
-    ]
-  );
-}
-
-/// The signature of the `parseFloat` JavaScript function.
-typedef _JsParseFloat = num? Function(String source);
-
-/// The JavaScript-side `parseFloat` function.
-@JS('parseFloat')
-external _JsParseFloat get _jsParseFloat;
-
 /// Parses a string [source] into a double.
 ///
 /// Uses the JavaScript `parseFloat` function instead of Dart's [double.parse]
@@ -126,7 +72,7 @@ external _JsParseFloat get _jsParseFloat;
 num? parseFloat(String source) {
   // Using JavaScript's `parseFloat` here because it can parse values
   // like "20px", while Dart's `double.tryParse` fails.
-  final num? result = _jsParseFloat(source);
+  final num? result = js_util.callMethod(domWindow, 'parseFloat', <Object>[source]);
 
   if (result == null || result.isNaN) {
     return null;
@@ -208,7 +154,9 @@ DomCanvasElement? tryCreateCanvasElement(int width, int height) {
 }
 
 @JS('window.ImageDecoder')
-external Object? get _imageDecoderConstructor;
+external JSAny? get __imageDecoderConstructor;
+Object? get _imageDecoderConstructor =>
+    __imageDecoderConstructor?.toObjectShallow;
 
 /// Environment variable that allows the developer to opt out of using browser's
 /// `ImageDecoder` API, and use the WASM codecs bundled with CanvasKit.
@@ -224,30 +172,26 @@ const bool _browserImageDecodingEnabled = bool.fromEnvironment(
 );
 
 /// Whether the current browser supports `ImageDecoder`.
-bool browserSupportsImageDecoder =
-  _browserImageDecodingEnabled &&
-  _imageDecoderConstructor != null &&
-  browserEngine == BrowserEngine.blink;
+bool browserSupportsImageDecoder = _defaultBrowserSupportsImageDecoder;
 
 /// Sets the value of [browserSupportsImageDecoder] to its default value.
 void debugResetBrowserSupportsImageDecoder() {
-  browserSupportsImageDecoder =
-      _imageDecoderConstructor != null;
+  browserSupportsImageDecoder = _defaultBrowserSupportsImageDecoder;
 }
 
-/// The signature of the function passed to the constructor of JavaScript `Promise`.
-typedef JsPromiseCallback = void Function(void Function(Object? value) resolve, void Function(Object? error) reject);
+bool get _defaultBrowserSupportsImageDecoder =>
+    _browserImageDecodingEnabled &&
+    _imageDecoderConstructor != null &&
+    _isBrowserImageDecoderStable;
 
-/// Corresponds to JavaScript's `Promise`.
-///
-/// This type doesn't need any members. Instead, it should be first converted
-/// to Dart's [Future] using [promiseToFuture] then interacted with through the
-/// [Future] API.
-@JS('window.Promise')
-@staticInterop
-class JsPromise {
-  external factory JsPromise(JsPromiseCallback callback);
-}
+// TODO(yjbanov): https://github.com/flutter/flutter/issues/122761
+// Frequently, when a browser launches an API that other browsers already
+// support, there are subtle incompatibilities that may cause apps to crash if,
+// we blindly adopt the new implementation. This variable prevents us from
+// picking up potentially incompatible implementations of ImagdeDecoder API.
+// Instead, when a new browser engine launches the API, we'll evaluate it and
+// enable it explicitly.
+bool get _isBrowserImageDecoderStable => browserEngine == BrowserEngine.blink;
 
 /// Corresponds to the browser's `ImageDecoder` type.
 ///
@@ -262,9 +206,13 @@ class ImageDecoder {
 
 extension ImageDecoderExtension on ImageDecoder {
   external ImageTrackList get tracks;
-  external bool get complete;
-  external JsPromise decode(DecodeOptions options);
-  external void close();
+
+  @JS('complete')
+  external JSBoolean get _complete;
+  bool get complete => _complete.toDart;
+
+  external JSPromise<JSAny?> decode(DecodeOptions options);
+  external JSVoid close();
 }
 
 /// Options passed to the `ImageDecoder` constructor.
@@ -277,13 +225,13 @@ extension ImageDecoderExtension on ImageDecoder {
 @staticInterop
 class ImageDecoderOptions {
   external factory ImageDecoderOptions({
-    required String type,
-    required Uint8List data,
-    required String premultiplyAlpha,
-    required int? desiredWidth,
-    required int? desiredHeight,
-    required String colorSpaceConversion,
-    required bool preferAnimation,
+    required JSString type,
+    required JSAny data,
+    required JSString premultiplyAlpha,
+    JSNumber? desiredWidth,
+    JSNumber? desiredHeight,
+    required JSString colorSpaceConversion,
+    required JSBoolean preferAnimation,
   });
 }
 
@@ -299,7 +247,10 @@ class DecodeResult {}
 
 extension DecodeResultExtension on DecodeResult {
   external VideoFrame get image;
-  external bool get complete;
+
+  @JS('complete')
+  external JSBoolean get _complete;
+  bool get complete => _complete.toDart;
 }
 
 /// Options passed to [ImageDecoder.decode].
@@ -312,7 +263,7 @@ extension DecodeResultExtension on DecodeResult {
 @staticInterop
 class DecodeOptions {
   external factory DecodeOptions({
-    required int frameIndex,
+    required JSNumber frameIndex,
   });
 }
 
@@ -329,16 +280,41 @@ class DecodeOptions {
 class VideoFrame implements DomCanvasImageSource {}
 
 extension VideoFrameExtension on VideoFrame {
-  external double allocationSize();
-  external JsPromise copyTo(Uint8List destination);
-  external String? get format;
-  external double get codedWidth;
-  external double get codedHeight;
-  external double get displayWidth;
-  external double get displayHeight;
-  external double? get duration;
+  @JS('allocationSize')
+  external JSNumber _allocationSize();
+  double allocationSize() => _allocationSize().toDartDouble;
+
+  @JS('copyTo')
+  external JSPromise<JSAny?> _copyTo(JSAny destination);
+  JSPromise<JSAny?> copyTo(Object destination) =>
+      _copyTo(destination.toJSAnyShallow);
+
+  @JS('format')
+  external JSString? get _format;
+  String? get format => _format?.toDart;
+
+  @JS('codedWidth')
+  external JSNumber get _codedWidth;
+  double get codedWidth => _codedWidth.toDartDouble;
+
+  @JS('codedHeight')
+  external JSNumber get _codedHeight;
+  double get codedHeight => _codedHeight.toDartDouble;
+
+  @JS('displayWidth')
+  external JSNumber get _displayWidth;
+  double get displayWidth => _displayWidth.toDartDouble;
+
+  @JS('displayHeight')
+  external JSNumber get _displayHeight;
+  double get displayHeight => _displayHeight.toDartDouble;
+
+  @JS('duration')
+  external JSNumber? get _duration;
+  double? get duration => _duration?.toDartDouble;
+
   external VideoFrame clone();
-  external void close();
+  external JSVoid close();
 }
 
 /// Corresponds to the browser's `ImageTrackList` type.
@@ -352,7 +328,7 @@ extension VideoFrameExtension on VideoFrame {
 class ImageTrackList {}
 
 extension ImageTrackListExtension on ImageTrackList {
-  external JsPromise get ready;
+  external JSPromise<JSAny?> get ready;
   external ImageTrack? get selectedTrack;
 }
 
@@ -367,8 +343,13 @@ extension ImageTrackListExtension on ImageTrackList {
 class ImageTrack {}
 
 extension ImageTrackExtension on ImageTrack {
-  external double get repetitionCount;
-  external double get frameCount;
+  @JS('repetitionCount')
+  external JSNumber get _repetitionCount;
+  double get repetitionCount => _repetitionCount.toDartDouble;
+
+  @JS('frameCount')
+  external JSNumber get _frameCount;
+  double get frameCount => _frameCount.toDartDouble;
 }
 
 void scaleCanvas2D(Object context2d, num x, num y) {
@@ -453,7 +434,7 @@ class GlContext {
   Object? _kRGBA;
   Object? _kLinear;
   Object? _kTextureMinFilter;
-  int? _kTexture0;
+  double? _kTexture0;
 
   Object? _canvas;
   int? _widthInPixels;
@@ -569,7 +550,7 @@ class GlContext {
     js_util.callMethod<void>(glContext, 'bindTexture', <dynamic>[target, buffer]);
   }
 
-  void activeTexture(int textureUnit) {
+  void activeTexture(double textureUnit) {
     js_util.callMethod<void>(glContext, 'activeTexture', <dynamic>[textureUnit]);
   }
 
@@ -710,8 +691,8 @@ class GlContext {
   Object? get kTexture2D =>
       _kTexture2D ??= js_util.getProperty(glContext, 'TEXTURE_2D');
 
-  int get kTexture0 =>
-      _kTexture0 ??= js_util.getProperty<int>(glContext, 'TEXTURE0');
+  double get kTexture0 =>
+      _kTexture0 ??= js_util.getProperty<double>(glContext, 'TEXTURE0');
 
   Object? get kTextureWrapS =>
       _kTextureWrapS ??= js_util.getProperty(glContext, 'TEXTURE_WRAP_S');
@@ -970,8 +951,8 @@ class OffScreenCanvas {
   static bool? _supported;
 
   void _updateCanvasCssSize(DomCanvasElement element) {
-    final double cssWidth = width / EnginePlatformDispatcher.browserDevicePixelRatio;
-    final double cssHeight = height / EnginePlatformDispatcher.browserDevicePixelRatio;
+    final double cssWidth = width / EngineFlutterDisplay.instance.browserDevicePixelRatio;
+    final double cssHeight = height / EngineFlutterDisplay.instance.browserDevicePixelRatio;
     element.style
       ..position = 'absolute'
       ..width = '${cssWidth}px'
@@ -1006,6 +987,12 @@ class OffScreenCanvas {
         : canvasElement!.getContext('2d');
   }
 
+  DomCanvasRenderingContextBitmapRenderer? getBitmapRendererContext() {
+    return (offScreenCanvas != null
+        ? offScreenCanvas!.getContext('bitmaprenderer')
+        : canvasElement!.getContext('bitmaprenderer')) as DomCanvasRenderingContextBitmapRenderer?;
+  }
+
   /// Feature detection for transferToImageBitmap on OffscreenCanvas.
   bool get transferToImageBitmapSupported =>
       js_util.hasProperty(offScreenCanvas!, 'transferToImageBitmap');
@@ -1034,7 +1021,7 @@ class OffScreenCanvas {
     if (offScreenCanvas != null) {
       offScreenCanvas!.convertToBlob().then((DomBlob value) {
         final DomFileReader fileReader = createDomFileReader();
-        fileReader.addEventListener('load', allowInterop((DomEvent event) {
+        fileReader.addEventListener('load', createDomEventListener((DomEvent event) {
           completer.complete(
             js_util.getProperty<String>(js_util.getProperty<Object>(event, 'target'), 'result'),
           );
@@ -1047,7 +1034,7 @@ class OffScreenCanvas {
     }
   }
 
-  /// Draws an image to canvas for both offscreen canvas canvas context2d.
+  /// Draws an image to canvas for both offscreen canvas context2d.
   void drawImage(Object image, int x, int y, int width, int height) {
     js_util.callMethod<void>(
         getContext2d()!, 'drawImage', <dynamic>[image, x, y, width, height]);
@@ -1055,5 +1042,8 @@ class OffScreenCanvas {
 
   /// Feature detects OffscreenCanvas.
   static bool get supported => _supported ??=
-      js_util.hasProperty(domWindow, 'OffscreenCanvas');
+      // Safari 16.4 implements OffscreenCanvas, but without WebGL support. So
+      // it's not really supported in a way that is useful to us.
+      !isSafari
+      && js_util.hasProperty(domWindow, 'OffscreenCanvas');
 }
diff --git a/lib/web_ui/lib/src/engine/scene_builder.dart b/lib/web_ui/lib/src/engine/scene_builder.dart
new file mode 100644
index 0000000000000000000000000000000000000000..2ec9f6bc7523d1b1c998e3cc10ec661b9d8dbfd4
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/scene_builder.dart
@@ -0,0 +1,286 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:typed_data';
+
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui;
+
+// This file implements a SceneBuilder and Scene that works with any renderer
+// implementation that provides:
+//   * A `ui.Canvas` that conforms to `SceneCanvas`
+//   * A `ui.Picture` that conforms to `ScenePicture`
+//   * A `ui.ImageFilter` that conforms to `SceneImageFilter`
+//
+// These contain a few augmentations to the normal `dart:ui` API that provide
+// additional sizing information that the scene builder uses to determine how
+// these object might occlude one another.
+
+
+class EngineScene implements ui.Scene {
+  EngineScene(this.rootLayer);
+
+  final EngineRootLayer rootLayer;
+
+  // We keep a refcount here because this can be asynchronously rendered, so we
+  // don't necessarily want to dispose immediately when the user calls dispose.
+  // Instead, we need to stay alive until we're done rendering.
+  int _refCount = 1;
+
+  void beginRender() {
+    assert(_refCount > 0);
+    _refCount++;
+  }
+
+  void endRender() {
+    _refCount--;
+    _disposeIfNeeded();
+  }
+
+  @override
+  void dispose() {
+    _refCount--;
+    _disposeIfNeeded();
+  }
+
+  void _disposeIfNeeded() {
+    assert(_refCount >= 0);
+    if (_refCount == 0) {
+      rootLayer.dispose();
+    }
+  }
+
+  @override
+  Future<ui.Image> toImage(int width, int height) async {
+    return toImageSync(width, height);
+  }
+
+  @override
+  ui.Image toImageSync(int width, int height) {
+    final ui.PictureRecorder recorder = ui.PictureRecorder();
+    final ui.Rect canvasRect = ui.Rect.fromLTWH(0, 0, width.toDouble(), height.toDouble());
+    final ui.Canvas canvas = ui.Canvas(recorder, canvasRect);
+
+    // Only rasterizes the picture slices.
+    for (final PictureSlice slice in rootLayer.slices.whereType<PictureSlice>()) {
+      canvas.drawPicture(slice.picture);
+    }
+    return recorder.endRecording().toImageSync(width, height);
+  }
+}
+
+class EngineSceneBuilder implements ui.SceneBuilder {
+  LayerBuilder currentBuilder = LayerBuilder.rootLayer();
+
+  @override
+  void addPerformanceOverlay(int enabledOptions, ui.Rect bounds) {
+    // We don't plan to implement this on the web.
+    throw UnimplementedError();
+  }
+
+  @override
+  void addPicture(
+    ui.Offset offset,
+    ui.Picture picture, {
+    bool isComplexHint = false,
+    bool willChangeHint = false
+  }) {
+    currentBuilder.addPicture(
+      offset,
+      picture,
+      isComplexHint:
+      isComplexHint,
+      willChangeHint: willChangeHint
+    );
+  }
+
+  @override
+  void addPlatformView(
+    int viewId, {
+    ui.Offset offset = ui.Offset.zero,
+    double width = 0.0,
+    double height = 0.0
+  }) {
+    currentBuilder.addPlatformView(
+      viewId,
+      offset: offset,
+      width: width,
+      height: height
+    );
+  }
+
+  @override
+  void addRetained(ui.EngineLayer retainedLayer) {
+    currentBuilder.mergeLayer(retainedLayer as PictureEngineLayer);
+  }
+
+  @override
+  void addTexture(
+    int textureId, {
+    ui.Offset offset = ui.Offset.zero,
+    double width = 0.0,
+    double height = 0.0,
+    bool freeze = false,
+    ui.FilterQuality filterQuality = ui.FilterQuality.low
+  }) {
+    // addTexture is not implemented on web.
+  }
+
+  @override
+  ui.BackdropFilterEngineLayer pushBackdropFilter(
+    ui.ImageFilter filter, {
+    ui.BlendMode blendMode = ui.BlendMode.srcOver,
+    ui.BackdropFilterEngineLayer? oldLayer
+  }) => pushLayer<BackdropFilterLayer>(
+      BackdropFilterLayer(),
+      BackdropFilterOperation(filter, blendMode),
+    );
+
+  @override
+  ui.ClipPathEngineLayer pushClipPath(
+    ui.Path path, {
+    ui.Clip clipBehavior = ui.Clip.antiAlias,
+    ui.ClipPathEngineLayer? oldLayer
+  }) => pushLayer<ClipPathLayer>(
+      ClipPathLayer(),
+      ClipPathOperation(path, clipBehavior),
+    );
+
+  @override
+  ui.ClipRRectEngineLayer pushClipRRect(
+    ui.RRect rrect, {
+    required ui.Clip clipBehavior,
+    ui.ClipRRectEngineLayer? oldLayer
+  }) => pushLayer<ClipRRectLayer>(
+      ClipRRectLayer(),
+      ClipRRectOperation(rrect, clipBehavior)
+    );
+
+  @override
+  ui.ClipRectEngineLayer pushClipRect(
+    ui.Rect rect, {
+    ui.Clip clipBehavior = ui.Clip.antiAlias,
+    ui.ClipRectEngineLayer? oldLayer
+  }) {
+    return pushLayer<ClipRectLayer>(
+      ClipRectLayer(),
+      ClipRectOperation(rect, clipBehavior)
+    );
+  }
+
+  @override
+  ui.ColorFilterEngineLayer pushColorFilter(
+    ui.ColorFilter filter, {
+    ui.ColorFilterEngineLayer? oldLayer
+  }) => pushLayer<ColorFilterLayer>(
+      ColorFilterLayer(),
+      ColorFilterOperation(filter),
+    );
+
+  @override
+  ui.ImageFilterEngineLayer pushImageFilter(
+    ui.ImageFilter filter, {
+    ui.Offset offset = ui.Offset.zero,
+    ui.ImageFilterEngineLayer? oldLayer
+  }) => pushLayer<ImageFilterLayer>(
+      ImageFilterLayer(),
+      ImageFilterOperation(filter, offset),
+    );
+
+  @override
+  ui.OffsetEngineLayer pushOffset(
+    double dx,
+    double dy, {
+    ui.OffsetEngineLayer? oldLayer
+  }) => pushLayer<OffsetLayer>(
+      OffsetLayer(),
+      OffsetOperation(dx, dy)
+    );
+
+  @override
+  ui.OpacityEngineLayer pushOpacity(int alpha, {
+    ui.Offset offset = ui.Offset.zero,
+    ui.OpacityEngineLayer? oldLayer
+  }) => pushLayer<OpacityLayer>(
+      OpacityLayer(),
+      OpacityOperation(alpha, offset),
+    );
+  @override
+  ui.ShaderMaskEngineLayer pushShaderMask(
+    ui.Shader shader,
+    ui.Rect maskRect,
+    ui.BlendMode blendMode, {
+    ui.ShaderMaskEngineLayer? oldLayer,
+    ui.FilterQuality filterQuality = ui.FilterQuality.low
+  }) => pushLayer<ShaderMaskLayer>(
+      ShaderMaskLayer(),
+      ShaderMaskOperation(shader, maskRect, blendMode)
+    );
+
+  @override
+  ui.TransformEngineLayer pushTransform(
+    Float64List matrix4, {
+    ui.TransformEngineLayer? oldLayer
+  }) => pushLayer<TransformLayer>(
+      TransformLayer(),
+      TransformOperation(matrix4),
+    );
+
+  @override
+  void setCheckerboardOffscreenLayers(bool checkerboard) {
+    // Not implemented on web
+  }
+
+  @override
+  void setCheckerboardRasterCacheImages(bool checkerboard) {
+    // Not implemented on web
+  }
+
+  @override
+  void setProperties(
+    double width,
+    double height,
+    double insetTop,
+    double insetRight,
+    double insetBottom,
+    double insetLeft,
+    bool focusable
+  ) {
+    // Not implemented on web
+  }
+
+  @override
+  void setRasterizerTracingThreshold(int frameInterval) {
+    // Not implemented on web
+  }
+
+  @override
+  ui.Scene build() {
+    while (currentBuilder.parent != null) {
+      pop();
+    }
+    final PictureEngineLayer rootLayer = currentBuilder.build();
+    return EngineScene(rootLayer as EngineRootLayer);
+  }
+
+  @override
+  void pop() {
+    final PictureEngineLayer layer = currentBuilder.build();
+    final LayerBuilder? parentBuilder = currentBuilder.parent;
+    if (parentBuilder == null) {
+      throw StateError('Popped too many times.');
+    }
+    currentBuilder = parentBuilder;
+    currentBuilder.mergeLayer(layer);
+  }
+
+  T pushLayer<T extends PictureEngineLayer>(T layer, LayerOperation operation) {
+    currentBuilder = LayerBuilder.childLayer(
+      parent: currentBuilder,
+      layer: layer,
+      operation: operation
+    );
+    return layer;
+  }
+}
diff --git a/lib/web_ui/lib/src/engine/scene_painting.dart b/lib/web_ui/lib/src/engine/scene_painting.dart
new file mode 100644
index 0000000000000000000000000000000000000000..e55e06fa8a6b9226e9c02a86ea2ceb8b289a681b
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/scene_painting.dart
@@ -0,0 +1,25 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:ui/ui.dart' as ui;
+
+// These are additional APIs that are not part of the `dart:ui` interface that
+// are needed internally to properly implement a `SceneBuilder` on top of the
+// generic Canvas/Picture api.
+abstract class SceneCanvas implements ui.Canvas {
+  // This is the same as a normal `saveLayer` call, but we can pass a backdrop image filter.
+  void saveLayerWithFilter(ui.Rect? bounds, ui.Paint paint, ui.ImageFilter backdropFilter);
+}
+
+abstract class ScenePicture implements ui.Picture {
+  // This is a conservative bounding box of all the drawing primitives in this picture.
+  ui.Rect get cullRect;
+}
+
+abstract class SceneImageFilter implements ui.ImageFilter {
+  // Since some image filters affect the actual drawing bounds of a given picture, this
+  // gives the maximum draw boundary for a picture with the given input bounds after it
+  // has been processed by the filter.
+  ui.Rect filterBounds(ui.Rect inputBounds);
+}
diff --git a/lib/web_ui/lib/src/engine/scene_view.dart b/lib/web_ui/lib/src/engine/scene_view.dart
new file mode 100644
index 0000000000000000000000000000000000000000..6f3031ae919df87836cab2604eba28dca8c81c83
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/scene_view.dart
@@ -0,0 +1,332 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui;
+
+const String kCanvasContainerTag = 'flt-canvas-container';
+
+typedef RenderResult = ({
+  List<DomImageBitmap> imageBitmaps,
+  int rasterStartMicros,
+  int rasterEndMicros,
+});
+
+// This is an interface that renders a `ScenePicture` as a `DomImageBitmap`.
+// It is optionally asynchronous. It is required for the `EngineSceneView` to
+// composite pictures into the canvases in the DOM tree it builds.
+abstract class PictureRenderer {
+  FutureOr<RenderResult> renderPictures(List<ScenePicture> picture);
+  ScenePicture clipPicture(ScenePicture picture, ui.Rect clip);
+}
+
+class _SceneRender {
+  _SceneRender(
+    this.scene,
+    this._completer, {
+    this.recorder,
+  }) {
+    scene.beginRender();
+  }
+
+  final EngineScene scene;
+  final Completer<void> _completer;
+  final FrameTimingRecorder? recorder;
+
+  void done() {
+    scene.endRender();
+    _completer.complete();
+  }
+}
+
+// This class builds a DOM tree that composites an `EngineScene`.
+class EngineSceneView {
+  factory EngineSceneView(PictureRenderer pictureRenderer, ui.FlutterView flutterView) {
+    final DomElement sceneElement = createDomElement('flt-scene');
+    return EngineSceneView._(pictureRenderer, flutterView, sceneElement);
+  }
+
+  EngineSceneView._(this.pictureRenderer, this.flutterView, this.sceneElement);
+
+  final PictureRenderer pictureRenderer;
+  final DomElement sceneElement;
+  final ui.FlutterView flutterView;
+
+  List<SliceContainer> containers = <SliceContainer>[];
+
+  _SceneRender? _currentRender;
+  _SceneRender? _nextRender;
+
+  Future<void> renderScene(EngineScene scene, FrameTimingRecorder? recorder) {
+    if (_currentRender != null) {
+      // If a scene is already queued up, drop it and queue this one up instead
+      // so that the scene view always displays the most recently requested scene.
+      _nextRender?.done();
+      final Completer<void> completer = Completer<void>();
+      _nextRender = _SceneRender(scene, completer, recorder: recorder);
+      return completer.future;
+    }
+    final Completer<void> completer = Completer<void>();
+    _currentRender = _SceneRender(scene, completer, recorder: recorder);
+    _kickRenderLoop();
+    return completer.future;
+  }
+
+  Future<void> _kickRenderLoop() async {
+    final _SceneRender current = _currentRender!;
+    await _renderScene(current.scene, current.recorder);
+    current.done();
+    _currentRender = _nextRender;
+    _nextRender = null;
+    if (_currentRender == null) {
+      return;
+    } else {
+      return _kickRenderLoop();
+    }
+  }
+
+  Future<void> _renderScene(EngineScene scene, FrameTimingRecorder? recorder) async {
+    final ui.Rect screenBounds = ui.Rect.fromLTWH(
+      0,
+      0,
+      flutterView.physicalSize.width,
+      flutterView.physicalSize.height,
+    );
+    final List<LayerSlice> slices = scene.rootLayer.slices;
+    final List<ScenePicture> picturesToRender = <ScenePicture>[];
+    final List<ScenePicture> originalPicturesToRender = <ScenePicture>[];
+    for (final LayerSlice slice in slices) {
+      if (slice is PictureSlice) {
+        final ui.Rect clippedRect = slice.picture.cullRect.intersect(screenBounds);
+        if (clippedRect.isEmpty) {
+          // This picture is completely offscreen, so don't render it at all
+          continue;
+        } else if (clippedRect == slice.picture.cullRect) {
+          // The picture doesn't need to be clipped, just render the original
+          originalPicturesToRender.add(slice.picture);
+          picturesToRender.add(slice.picture);
+        } else {
+          originalPicturesToRender.add(slice.picture);
+          picturesToRender.add(pictureRenderer.clipPicture(slice.picture, clippedRect));
+        }
+      }
+    }
+    final Map<ScenePicture, DomImageBitmap> renderMap;
+    if (picturesToRender.isNotEmpty) {
+      final RenderResult renderResult = await pictureRenderer.renderPictures(picturesToRender);
+      renderMap = <ScenePicture, DomImageBitmap>{
+        for (int i = 0; i < picturesToRender.length; i++)
+          originalPicturesToRender[i]: renderResult.imageBitmaps[i],
+      };
+      recorder?.recordRasterStart(renderResult.rasterStartMicros);
+      recorder?.recordRasterFinish(renderResult.rasterEndMicros);
+    } else {
+      renderMap = <ScenePicture, DomImageBitmap>{};
+      recorder?.recordRasterStart();
+      recorder?.recordRasterFinish();
+    }
+    recorder?.submitTimings();
+
+    final List<SliceContainer?> reusableContainers = List<SliceContainer?>.from(containers);
+    final List<SliceContainer> newContainers = <SliceContainer>[];
+    for (final LayerSlice slice in slices) {
+      switch (slice) {
+        case PictureSlice():
+          final DomImageBitmap? bitmap = renderMap[slice.picture];
+          if (bitmap == null) {
+            // We didn't render this slice because no part of it is visible.
+            continue;
+          }
+          PictureSliceContainer? container;
+          for (int j = 0; j < reusableContainers.length; j++) {
+            final SliceContainer? candidate = reusableContainers[j];
+            if (candidate is PictureSliceContainer) {
+              container = candidate;
+              reusableContainers[j] = null;
+              break;
+            }
+          }
+
+          final ui.Rect clippedBounds = slice.picture.cullRect.intersect(screenBounds);
+          if (container != null) {
+            container.bounds = clippedBounds;
+          } else {
+            container = PictureSliceContainer(clippedBounds);
+          }
+          container.updateContents();
+          container.renderBitmap(bitmap);
+          newContainers.add(container);
+
+        case PlatformViewSlice():
+          for (final PlatformView view in slice.views) {
+            // TODO(harryterkelsen): Inject the FlutterView instance from `renderScene`,
+            // instead of using `EnginePlatformDispatcher...implicitView` directly,
+            // or make the FlutterView "register" like in canvaskit.
+            // Ensure the platform view contents are injected in the DOM.
+            EnginePlatformDispatcher.instance.implicitView?.dom.injectPlatformView(view.viewId);
+
+            // Attempt to reuse a container for the existing view
+            PlatformViewContainer? container;
+            for (int j = 0; j < reusableContainers.length; j++) {
+              final SliceContainer? candidate = reusableContainers[j];
+              if (candidate is PlatformViewContainer && candidate.viewId == view.viewId) {
+                container = candidate;
+                reusableContainers[j] = null;
+                break;
+              }
+            }
+            container ??= PlatformViewContainer(view.viewId);
+            container.size = view.size;
+            container.styling = view.styling;
+            container.updateContents();
+            newContainers.add(container);
+          }
+      }
+    }
+
+    containers = newContainers;
+
+    DomElement? currentElement = sceneElement.firstElementChild;
+    for (final SliceContainer container in containers) {
+      if (currentElement == null) {
+        sceneElement.appendChild(container.container);
+      } else if (currentElement == container.container) {
+        currentElement = currentElement.nextElementSibling;
+      } else {
+        sceneElement.insertBefore(container.container, currentElement);
+      }
+    }
+
+    // Remove any other unused containers
+    while (currentElement != null) {
+      final DomElement? sibling = currentElement.nextElementSibling;
+      sceneElement.removeChild(currentElement);
+      currentElement = sibling;
+    }
+  }
+}
+
+sealed class SliceContainer {
+  DomElement get container;
+
+  void updateContents();
+}
+
+final class PictureSliceContainer extends SliceContainer {
+  factory PictureSliceContainer(ui.Rect bounds) {
+    final DomElement container = domDocument.createElement(kCanvasContainerTag);
+    final DomCanvasElement canvas = createDomCanvasElement(
+      width: bounds.width.toInt(),
+      height: bounds.height.toInt()
+    );
+    container.appendChild(canvas);
+    return PictureSliceContainer._(bounds, container, canvas);
+  }
+
+  PictureSliceContainer._(this._bounds, this.container, this.canvas);
+
+  ui.Rect _bounds;
+  bool _dirty = true;
+
+  ui.Rect get bounds => _bounds;
+  set bounds(ui.Rect bounds) {
+    if (_bounds != bounds) {
+      _bounds = bounds;
+      _dirty = true;
+    }
+  }
+
+  @override
+  void updateContents() {
+    if (_dirty) {
+      _dirty = false;
+
+      final ui.Rect roundedOutBounds = ui.Rect.fromLTRB(
+        bounds.left.floorToDouble(),
+        bounds.top.floorToDouble(),
+        bounds.right.ceilToDouble(),
+        bounds.bottom.ceilToDouble()
+      );
+      final DomCSSStyleDeclaration style = canvas.style;
+      final double devicePixelRatio = EngineFlutterDisplay.instance.devicePixelRatio;
+      final double logicalWidth = roundedOutBounds.width / devicePixelRatio;
+      final double logicalHeight = roundedOutBounds.height / devicePixelRatio;
+      final double logicalLeft = roundedOutBounds.left / devicePixelRatio;
+      final double logicalTop = roundedOutBounds.top / devicePixelRatio;
+      style.width = '${logicalWidth}px';
+      style.height = '${logicalHeight}px';
+      style.position = 'absolute';
+      style.left = '${logicalLeft}px';
+      style.top = '${logicalTop}px';
+      canvas.width = roundedOutBounds.width.ceilToDouble();
+      canvas.height = roundedOutBounds.height.ceilToDouble();
+    }
+  }
+
+  void renderBitmap(DomImageBitmap bitmap) {
+    final DomCanvasRenderingContextBitmapRenderer ctx = canvas.contextBitmapRenderer;
+    ctx.transferFromImageBitmap(bitmap);
+  }
+
+  @override
+  final DomElement container;
+  final DomCanvasElement canvas;
+}
+
+final class PlatformViewContainer extends SliceContainer {
+  PlatformViewContainer(this.viewId) : container = createPlatformViewSlot(viewId);
+
+  final int viewId;
+  PlatformViewStyling? _styling;
+  ui.Size? _size;
+  bool _dirty = false;
+
+  @override
+  final DomElement container;
+
+  set styling(PlatformViewStyling styling) {
+    if (_styling != styling) {
+      _styling = styling;
+      _dirty = true;
+    }
+  }
+
+  set size(ui.Size size) {
+    if (_size != size) {
+      _size = size;
+      _dirty = true;
+    }
+  }
+
+
+  @override
+  void updateContents() {
+    assert(_styling != null);
+    assert(_size != null);
+    if (_dirty) {
+      final DomCSSStyleDeclaration style = container.style;
+      final double devicePixelRatio = EngineFlutterDisplay.instance.devicePixelRatio;
+      final double logicalWidth = _size!.width / devicePixelRatio;
+      final double logicalHeight = _size!.height / devicePixelRatio;
+      style.width = '${logicalWidth}px';
+      style.height = '${logicalHeight}px';
+      style.position = 'absolute';
+
+      final ui.Offset? offset = _styling!.position.offset;
+      final double logicalLeft = (offset?.dx ?? 0) / devicePixelRatio;
+      final double logicalTop = (offset?.dy ?? 0) / devicePixelRatio;
+      style.left = '${logicalLeft}px';
+      style.top = '${logicalTop}px';
+
+      final Matrix4? transform = _styling!.position.transform;
+      style.transform = transform != null ? float64ListToCssTransform3d(transform.storage) : '';
+      style.opacity = _styling!.opacity != 1.0 ? '${_styling!.opacity}' : '';
+      // TODO(jacksongardner): Implement clip styling for platform views
+
+      _dirty = false;
+    }
+  }
+}
diff --git a/lib/web_ui/lib/src/engine/semantics.dart b/lib/web_ui/lib/src/engine/semantics.dart
index 224fd988cd5a0eee6ba4abaf22f97a516ac3f2f9..0ba3230ee96a127af874504cfca1e7943f43d2c8 100644
--- a/lib/web_ui/lib/src/engine/semantics.dart
+++ b/lib/web_ui/lib/src/engine/semantics.dart
@@ -4,10 +4,13 @@
 
 export 'semantics/accessibility.dart';
 export 'semantics/checkable.dart';
+export 'semantics/focusable.dart';
 export 'semantics/image.dart';
 export 'semantics/incrementable.dart';
 export 'semantics/label_and_value.dart';
+export 'semantics/link.dart';
 export 'semantics/live_region.dart';
+export 'semantics/platform_view.dart';
 export 'semantics/scrollable.dart';
 export 'semantics/semantics.dart';
 export 'semantics/semantics_helper.dart';
diff --git a/lib/web_ui/lib/src/engine/semantics/accessibility.dart b/lib/web_ui/lib/src/engine/semantics/accessibility.dart
index 22d93833b8ec8b4d46b086f04fc1783071c074d5..f0ba1d480a4be5c4631b59bcee6bba9f25ac7872 100644
--- a/lib/web_ui/lib/src/engine/semantics/accessibility.dart
+++ b/lib/web_ui/lib/src/engine/semantics/accessibility.dart
@@ -5,7 +5,6 @@
 import 'dart:async';
 import 'dart:typed_data';
 
-import '../../engine.dart' show registerHotRestartListener;
 import '../dom.dart';
 import '../services.dart';
 import '../util.dart';
@@ -20,85 +19,97 @@ enum Assertiveness {
   assertive,
 }
 
-/// Singleton for accessing accessibility announcements from the platform.
-final AccessibilityAnnouncements accessibilityAnnouncements =
-    AccessibilityAnnouncements.instance;
+/// Duration for which a live message will be present in the DOM for the screen
+/// reader to announce it.
+///
+/// This was determined by trial and error with some extra buffer added.
+Duration liveMessageDuration = const Duration(milliseconds: 300);
+
+/// Sets [liveMessageDuration] to reduce the delay in tests.
+void setLiveMessageDurationForTest(Duration duration) {
+  liveMessageDuration = duration;
+}
 
-/// Attaches accessibility announcements coming from the 'flutter/accessibility'
-/// channel as temporary elements to the DOM.
+/// Makes accessibility announcements using `aria-live` DOM elements.
 class AccessibilityAnnouncements {
-  AccessibilityAnnouncements._() {
-    registerHotRestartListener(() {
-      _removeElementTimer?.cancel();
-    });
+  /// Creates a new instance with its own DOM elements used for announcements.
+  factory AccessibilityAnnouncements({required DomElement hostElement}) {
+    final DomHTMLElement politeElement = _createElement(Assertiveness.polite);
+    final DomHTMLElement assertiveElement = _createElement(Assertiveness.assertive);
+    hostElement.append(politeElement);
+    hostElement.append(assertiveElement);
+    return AccessibilityAnnouncements._(politeElement, assertiveElement);
   }
 
-  /// Initializes the [AccessibilityAnnouncements] singleton if it is not
-  /// already initialized.
-  static AccessibilityAnnouncements get instance {
-    return _instance ??= AccessibilityAnnouncements._();
-  }
+  AccessibilityAnnouncements._(this._politeElement, this._assertiveElement);
 
-  static AccessibilityAnnouncements? _instance;
+  /// A live region element with `aria-live` set to "polite", used to announce
+  /// accouncements politely.
+  final DomHTMLElement _politeElement;
 
-  /// Timer that times when the accessibility element should be removed from the
-  /// DOM.
-  ///
-  /// The element is added to the DOM temporarily for announcing the
-  /// message to the assistive technology.
-  Timer? _removeElementTimer;
+  /// A live region element with `aria-live` set to "assertive", used to announce
+  /// accouncements assertively.
+  final DomHTMLElement _assertiveElement;
 
-  /// The duration the accessibility announcements stay on the DOM.
+  /// Whether to append a non-breaking space to the end of the message
+  /// before outputting it.
   ///
-  /// It is removed after this time expired.
-  Duration durationA11yMessageIsOnDom = const Duration(seconds: 5);
+  /// It's used to work around a VoiceOver bug where announcing the same message
+  /// repeatedly results in subsequent messages not being announced despite the
+  /// fact that the previous announcement was already removed from the DOM a
+  /// long while back. See https://github.com/flutter/flutter/issues/142250.
+  bool _appendSpace = false;
 
-  /// Element which is used to communicate the message from the
-  /// 'flutter/accessibility' to the assistive technologies.
-  ///
-  /// This element gets attached to the DOM temporarily. It gets removed
-  /// after a duration. See [durationA11yMessageIsOnDom].
-  ///
-  /// This element has aria-live attribute.
-  ///
-  /// It also has id 'accessibility-element' for testing purposes.
-  DomHTMLElement? _element;
-
-  DomHTMLElement get _domElement => _element ??= _createElement();
+  /// Looks up the element used to announce messages of the given [assertiveness].
+  DomHTMLElement ariaLiveElementFor(Assertiveness assertiveness) {
+    switch (assertiveness) {
+      case Assertiveness.polite: return _politeElement;
+      case Assertiveness.assertive: return _assertiveElement;
+    }
+  }
 
-  /// Decodes the message coming from the 'flutter/accessibility' channel.
+  /// Makes an accessibity announcement from a message sent by the framework
+  /// over the 'flutter/accessibility' channel.
+  ///
+  /// The encoded message is passed as [data], and will be decoded using [codec].
   void handleMessage(StandardMessageCodec codec, ByteData? data) {
-    final Map<dynamic, dynamic> inputMap =
-        codec.decodeMessage(data) as Map<dynamic, dynamic>;
+    final Map<dynamic, dynamic> inputMap = codec.decodeMessage(data) as Map<dynamic, dynamic>;
     final Map<dynamic, dynamic> dataMap = inputMap.readDynamicJson('data');
     final String? message = dataMap.tryString('message');
     if (message != null && message.isNotEmpty) {
-      /// The default value for politeness is `polite`.
-      final int ariaLivePolitenessIndex = dataMap.tryInt('assertiveness') ?? 0;
-      final Assertiveness ariaLivePoliteness = Assertiveness.values[ariaLivePolitenessIndex];
-      _initLiveRegion(message, ariaLivePoliteness);
-      _removeElementTimer = Timer(durationA11yMessageIsOnDom, () {
-        _element!.remove();
-      });
+      /// The default value for assertiveness is `polite`.
+      final int assertivenessIndex = dataMap.tryInt('assertiveness') ?? 0;
+      final Assertiveness assertiveness = Assertiveness.values[assertivenessIndex];
+      announce(message, assertiveness);
     }
   }
 
-  void _initLiveRegion(String message, Assertiveness ariaLivePoliteness) {
-    final String assertiveLevel = (ariaLivePoliteness == Assertiveness.assertive) ? 'assertive' : 'polite';
-    _domElement.setAttribute('aria-live', assertiveLevel);
-    _domElement.text = message;
-    domDocument.body!.append(_domElement);
+  /// Makes an accessibility announcement using an `aria-live` element.
+  ///
+  /// [message] is the text of the announcement.
+  ///
+  /// [assertiveness] controls how interruptive the announcement is.
+  void announce(String message, Assertiveness assertiveness) {
+    final DomHTMLElement ariaLiveElement = ariaLiveElementFor(assertiveness);
+
+    final DomHTMLDivElement messageElement = createDomHTMLDivElement();
+    // See the doc-comment for [_appendSpace] for the rationale.
+    messageElement.text = _appendSpace ? '$message\u00A0' : message;
+    _appendSpace = !_appendSpace;
+    ariaLiveElement.append(messageElement);
+    Timer(liveMessageDuration, () => messageElement.remove());
   }
 
-  DomHTMLLabelElement _createElement() {
-    final DomHTMLLabelElement liveRegion = createDomHTMLLabelElement();
-    liveRegion.setAttribute('id', 'accessibility-element');
+  static DomHTMLElement _createElement(Assertiveness assertiveness) {
+    final String ariaLiveValue = (assertiveness == Assertiveness.assertive) ? 'assertive' : 'polite';
+    final DomHTMLElement liveRegion = createDomElement('flt-announcement-$ariaLiveValue') as DomHTMLElement;
     liveRegion.style
       ..position = 'fixed'
       ..overflow = 'hidden'
       ..transform = 'translate(-99999px, -99999px)'
       ..width = '1px'
       ..height = '1px';
+    liveRegion.setAttribute('aria-live', ariaLiveValue);
     return liveRegion;
   }
 }
diff --git a/lib/web_ui/lib/src/engine/semantics/checkable.dart b/lib/web_ui/lib/src/engine/semantics/checkable.dart
index a4c7de151c6f67342b2094fda1f8faf711bdbb5d..cf37b2423b59c6dfbb59997ae32b19eb5d622b0a 100644
--- a/lib/web_ui/lib/src/engine/semantics/checkable.dart
+++ b/lib/web_ui/lib/src/engine/semantics/checkable.dart
@@ -13,7 +13,7 @@
 
 import 'package:ui/ui.dart' as ui;
 
-import '../dom.dart';
+import 'label_and_value.dart';
 import 'semantics.dart';
 
 /// The specific type of checkable control.
@@ -49,33 +49,38 @@ _CheckableKind _checkableKindFromSemanticsFlag(
 /// See also [ui.SemanticsFlag.hasCheckedState], [ui.SemanticsFlag.isChecked],
 /// [ui.SemanticsFlag.isInMutuallyExclusiveGroup], [ui.SemanticsFlag.isToggled],
 /// [ui.SemanticsFlag.hasToggledState]
-class Checkable extends RoleManager {
+class Checkable extends PrimaryRoleManager {
   Checkable(SemanticsObject semanticsObject)
       : _kind = _checkableKindFromSemanticsFlag(semanticsObject),
-        super(Role.checkable, semanticsObject);
+        super.withBasics(
+          PrimaryRole.checkable,
+          semanticsObject,
+          labelRepresentation: LeafLabelRepresentation.ariaLabel,
+        ) {
+    addTappable();
+  }
 
   final _CheckableKind _kind;
 
   @override
   void update() {
+    super.update();
+
     if (semanticsObject.isFlagsDirty) {
       switch (_kind) {
         case _CheckableKind.checkbox:
-          semanticsObject.setAriaRole('checkbox', true);
-          break;
+          setAriaRole('checkbox');
         case _CheckableKind.radio:
-          semanticsObject.setAriaRole('radio', true);
-          break;
+          setAriaRole('radio');
         case _CheckableKind.toggle:
-          semanticsObject.setAriaRole('switch', true);
-          break;
+          setAriaRole('switch');
       }
 
       /// Adding disabled and aria-disabled attribute to notify the assistive
       /// technologies of disabled elements.
       _updateDisabledAttribute();
 
-      semanticsObject.element.setAttribute(
+      setAttribute(
         'aria-checked',
         (semanticsObject.hasFlag(ui.SemanticsFlag.isChecked) ||
                 semanticsObject.hasFlag(ui.SemanticsFlag.isToggled))
@@ -87,33 +92,24 @@ class Checkable extends RoleManager {
 
   @override
   void dispose() {
-    switch (_kind) {
-      case _CheckableKind.checkbox:
-        semanticsObject.setAriaRole('checkbox', false);
-        break;
-      case _CheckableKind.radio:
-        semanticsObject.setAriaRole('radio', false);
-        break;
-      case _CheckableKind.toggle:
-        semanticsObject.setAriaRole('switch', false);
-        break;
-    }
+    super.dispose();
     _removeDisabledAttribute();
   }
 
   void _updateDisabledAttribute() {
     if (semanticsObject.enabledState() == EnabledState.disabled) {
-      final DomElement element = semanticsObject.element;
-      element
-        ..setAttribute('aria-disabled', 'true')
-        ..setAttribute('disabled', 'true');
+      setAttribute('aria-disabled', 'true');
+      setAttribute('disabled', 'true');
     } else {
       _removeDisabledAttribute();
     }
   }
 
   void _removeDisabledAttribute() {
-    final DomElement element = semanticsObject.element;
-    element..removeAttribute('aria-disabled')..removeAttribute('disabled');
+    removeAttribute('aria-disabled');
+    removeAttribute('disabled');
   }
+
+  @override
+  bool focusAsRouteDefault() => focusable?.focusAsRouteDefault() ?? false;
 }
diff --git a/lib/web_ui/lib/src/engine/semantics/dialog.dart b/lib/web_ui/lib/src/engine/semantics/dialog.dart
new file mode 100644
index 0000000000000000000000000000000000000000..0eab7758a1d930a555a846b1e9a4310cc53f33b1
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/semantics/dialog.dart
@@ -0,0 +1,153 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import '../dom.dart';
+import '../semantics.dart';
+import '../util.dart';
+
+/// Provides accessibility for dialogs.
+///
+/// See also [Role.dialog].
+class Dialog extends PrimaryRoleManager {
+  Dialog(SemanticsObject semanticsObject) : super.blank(PrimaryRole.dialog, semanticsObject) {
+    // The following secondary roles can coexist with dialog. Generic `RouteName`
+    // and `LabelAndValue` are not used by this role because when the dialog
+    // names its own route an `aria-label` is used instead of `aria-describedby`.
+    addFocusManagement();
+    addLiveRegion();
+
+    // When a route/dialog shows up it is expected that the screen reader will
+    // focus on something inside it. There could be two possibilities:
+    //
+    // 1. The framework explicitly marked a node inside the dialog as focused
+    //    via the `isFocusable` and `isFocused` flags. In this case, the node
+    //    will request focus directly and there's nothing to do on top of that.
+    // 2. No node inside the route takes focus explicitly. In this case, the
+    //    expectation is to look through all nodes in traversal order and focus
+    //    on the first one.
+    semanticsObject.owner.addOneTimePostUpdateCallback(() {
+      if (semanticsObject.owner.hasNodeRequestingFocus) {
+        // Case 1: a node requested explicit focus. Nothing extra to do.
+        return;
+      }
+
+      // Case 2: nothing requested explicit focus. Focus on the first descendant.
+      _setDefaultFocus();
+    });
+  }
+
+  void _setDefaultFocus() {
+    semanticsObject.visitDepthFirstInTraversalOrder((SemanticsObject node) {
+      final PrimaryRoleManager? roleManager = node.primaryRole;
+      if (roleManager == null) {
+        return true;
+      }
+
+      // If the node does not take focus (e.g. focusing on it does not make
+      // sense at all). Despair not. Keep looking.
+      final bool didTakeFocus = roleManager.focusAsRouteDefault();
+      return !didTakeFocus;
+    });
+  }
+
+  @override
+  void update() {
+    super.update();
+
+    // If semantic object corresponding to the dialog also provides the label
+    // for itself it is applied as `aria-label`. See also [describeBy].
+    if (semanticsObject.namesRoute) {
+      final String? label = semanticsObject.label;
+      assert(() {
+        if (label == null || label.trim().isEmpty) {
+          printWarning(
+            'Semantic node ${semanticsObject.id} had both scopesRoute and '
+            'namesRoute set, indicating a self-labelled dialog, but it is '
+            'missing the label. A dialog should be labelled either by setting '
+            'namesRoute on itself and providing a label, or by containing a '
+            'child node with namesRoute that can describe it with its content.'
+          );
+        }
+        return true;
+      }());
+      setAttribute('aria-label', label ?? '');
+      setAriaRole('dialog');
+    }
+  }
+
+  /// Sets the description of this dialog based on a [RouteName] descendant
+  /// node, unless the dialog provides its own label.
+  void describeBy(RouteName routeName) {
+    if (semanticsObject.namesRoute) {
+      // The dialog provides its own label, which takes precedence.
+      return;
+    }
+
+    setAriaRole('dialog');
+    setAttribute(
+      'aria-describedby',
+      routeName.semanticsObject.element.id,
+    );
+  }
+
+  @override
+  bool focusAsRouteDefault() {
+    // Dialogs are the ones that look inside themselves to find elements to
+    // focus on. It doesn't make sense to focus on the dialog itself.
+    return false;
+  }
+}
+
+/// Supplies a description for the nearest ancestor [Dialog].
+class RouteName extends RoleManager {
+  RouteName(
+    SemanticsObject semanticsObject,
+    PrimaryRoleManager owner,
+  ) : super(Role.routeName, semanticsObject, owner);
+
+  Dialog? _dialog;
+
+  @override
+  void update() {
+    // NOTE(yjbanov): this does not handle the case when the node structure
+    // changes such that this RouteName is no longer attached to the same
+    // dialog. While this is technically expressible using the semantics API,
+    // after discussing this case with customers I decided that this case is not
+    // interesting enough to support. A tree restructure like this is likely to
+    // confuse screen readers, and it would add complexity to the engine's
+    // semantics code. Since reparenting can be done with no update to either
+    // the Dialog or RouteName we'd have to scan intermediate nodes for
+    // structural changes.
+    if (!semanticsObject.namesRoute) {
+      return;
+    }
+
+    if (semanticsObject.isLabelDirty) {
+      final Dialog? dialog = _dialog;
+      if (dialog != null) {
+        // Already attached to a dialog, just update the description.
+        dialog.describeBy(this);
+      } else {
+        // Setting the label for the first time. Wait for the DOM tree to be
+        // established, then find the nearest dialog and update its label.
+        semanticsObject.owner.addOneTimePostUpdateCallback(() {
+          if (!isDisposed) {
+            _lookUpNearestAncestorDialog();
+            _dialog?.describeBy(this);
+          }
+        });
+      }
+    }
+  }
+
+  void _lookUpNearestAncestorDialog() {
+    SemanticsObject? parent = semanticsObject.parent;
+    while (parent != null && parent.primaryRole?.role != PrimaryRole.dialog) {
+      parent = parent.parent;
+    }
+    if (parent != null && parent.primaryRole?.role == PrimaryRole.dialog) {
+      _dialog = parent.primaryRole! as Dialog;
+    }
+  }
+}
diff --git a/lib/web_ui/lib/src/engine/semantics/focusable.dart b/lib/web_ui/lib/src/engine/semantics/focusable.dart
new file mode 100644
index 0000000000000000000000000000000000000000..35fff64a5015828fbafe6bc7bda8b0ba38218fb3
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/semantics/focusable.dart
@@ -0,0 +1,255 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:ui/ui.dart' as ui;
+
+import '../dom.dart';
+import '../platform_dispatcher.dart';
+import '../util.dart';
+import 'semantics.dart';
+
+/// Supplies generic accessibility focus features to semantics nodes that have
+/// [ui.SemanticsFlag.isFocusable] set.
+///
+/// Assumes that the element being focused on is [SemanticsObject.element]. Role
+/// managers with special needs can implement custom focus management and
+/// exclude this role manager.
+///
+/// `"tab-index=0"` is used because `<flt-semantics>` is not intrinsically
+/// focusable. Examples of intrinsically focusable elements include:
+///
+///   * <button>
+///   * <input> (of any type)
+///   * <a>
+///   * <textarea>
+///
+/// See also:
+///
+///   * https://developer.mozilla.org/en-US/docs/Web/Accessibility/Keyboard-navigable_JavaScript_widgets
+class Focusable extends RoleManager {
+  Focusable(SemanticsObject semanticsObject, PrimaryRoleManager owner)
+      : _focusManager = AccessibilityFocusManager(semanticsObject.owner),
+        super(Role.focusable, semanticsObject, owner);
+
+  final AccessibilityFocusManager _focusManager;
+
+  /// Requests focus as a result of a route (e.g. dialog) deciding that the node
+  /// managed by this class should be focused by default when nothing requests
+  /// focus explicitly.
+  ///
+  /// This method of taking focus is different from the regular method of using
+  /// the [SemanticsObject.hasFocus] flag, as in this case the framework did not
+  /// explicitly request focus. Instead, the DOM element is being focus directly
+  /// programmatically, simulating the screen reader choosing a default element
+  /// to focus on.
+  ///
+  /// Returns `true` if the role manager took the focus. Returns `false` if
+  /// this role manager did not take the focus. The return value can be used to
+  /// decide whether to stop searching for a node that should take focus.
+  bool focusAsRouteDefault() {
+    owner.element.focus();
+    return true;
+  }
+
+  @override
+  void update() {
+    if (semanticsObject.isFocusable) {
+      if (!_focusManager.isManaging) {
+        _focusManager.manage(semanticsObject.id, owner.element);
+      }
+      _focusManager.changeFocus(semanticsObject.hasFocus && (!semanticsObject.hasEnabledState || semanticsObject.isEnabled));
+    } else {
+      _focusManager.stopManaging();
+    }
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+    _focusManager.stopManaging();
+  }
+}
+
+/// Objects associated with the element whose focus is being managed.
+typedef _FocusTarget = ({
+  /// [SemanticsObject.id] of the semantics node being managed.
+  int semanticsNodeId,
+
+  /// The element whose focus is being managed.
+  DomElement element,
+
+  /// The listener for the "focus" DOM event.
+  DomEventListener domFocusListener,
+
+  /// The listener for the "blur" DOM event.
+  DomEventListener domBlurListener,
+});
+
+/// Implements accessibility focus management for arbitrary elements.
+///
+/// Unlike [Focusable], which implements focus features on [SemanticsObject]s
+/// whose [SemanticsObject.element] is directly focusable, this class can help
+/// implementing focus features on custom elements. For example, [Incrementable]
+/// uses a custom `<input>` tag internally while its root-level element is not
+/// focusable. However, it can still use this class to manage the focus of the
+/// internal element.
+class AccessibilityFocusManager {
+  /// Creates a focus manager tied to a specific [EngineSemanticsOwner].
+  AccessibilityFocusManager(this._owner);
+
+  final EngineSemanticsOwner _owner;
+
+  _FocusTarget? _target;
+
+  // The last focus value set by this focus manager, used to prevent requesting
+  // focus on the same element repeatedly. Requesting focus on DOM elements is
+  // not an idempotent operation. If the element is already focused and focus is
+  // requested the browser will scroll to that element. However, scrolling is
+  // not this class' concern and so this class should avoid doing anything that
+  // would affect scrolling.
+  bool? _lastSetValue;
+
+  /// Whether this focus manager is managing a focusable target.
+  bool get isManaging => _target != null;
+
+  /// Starts managing the focus of the given [element].
+  ///
+  /// The "focus" and "blur" DOM events are forwarded to the framework-side
+  /// semantics node with ID [semanticsNodeId] as [ui.SemanticsAction]s.
+  ///
+  /// If this manage was already managing a different element, stops managing
+  /// the old element and starts managing the new one.
+  ///
+  /// Calling this with the same element but a different [semanticsNodeId] will
+  /// cause any future focus/blur events to be forwarded to the new ID.
+  void manage(int semanticsNodeId, DomElement element) {
+    if (identical(element, _target?.element)) {
+      final _FocusTarget previousTarget = _target!;
+      if (semanticsNodeId == previousTarget.semanticsNodeId) {
+        return;
+      }
+
+      // No need to hook up new DOM listeners. The existing ones are good enough.
+      _target = (
+        semanticsNodeId: semanticsNodeId,
+        element: previousTarget.element,
+        domFocusListener: previousTarget.domFocusListener,
+        domBlurListener: previousTarget.domBlurListener,
+      );
+      return;
+    }
+
+    if (_target != null) {
+      // The element changed. Clear the old element before initializing the new one.
+      stopManaging();
+    }
+
+    final _FocusTarget newTarget = (
+      semanticsNodeId: semanticsNodeId,
+      element: element,
+      domFocusListener: createDomEventListener((_) => _setFocusFromDom(true)),
+      domBlurListener: createDomEventListener((_) => _setFocusFromDom(false)),
+    );
+    _target = newTarget;
+
+    element.tabIndex = 0;
+    element.addEventListener('focus', newTarget.domFocusListener);
+    element.addEventListener('blur', newTarget.domBlurListener);
+  }
+
+  /// Stops managing the focus of the current element, if any.
+  void stopManaging() {
+    final _FocusTarget? target = _target;
+    _target = null;
+    _lastSetValue = null;
+
+    if (target == null) {
+      /// Nothing is being managed. Just return.
+      return;
+    }
+
+    target.element.removeEventListener('focus', target.domFocusListener);
+    target.element.removeEventListener('blur', target.domBlurListener);
+  }
+
+  void _setFocusFromDom(bool acquireFocus) {
+    final _FocusTarget? target = _target;
+
+    if (target == null) {
+      // DOM events can be asynchronous. By the time the event reaches here, the
+      // focus manager may have been disposed of.
+      return;
+    }
+
+    EnginePlatformDispatcher.instance.invokeOnSemanticsAction(
+      target.semanticsNodeId,
+      acquireFocus
+        ? ui.SemanticsAction.didGainAccessibilityFocus
+        : ui.SemanticsAction.didLoseAccessibilityFocus,
+      null,
+    );
+  }
+
+  /// Requests focus or blur on the DOM element.
+  void changeFocus(bool value) {
+    final _FocusTarget? target = _target;
+
+    if (target == null) {
+      // If this branch is being executed, there's a bug somewhere already, but
+      // it doesn't hurt to clean up old values anyway.
+      _lastSetValue = null;
+
+      // Nothing is being managed right now.
+      assert(() {
+        printWarning(
+          'Cannot change focus to $value. No element is being managed by this '
+          'AccessibilityFocusManager.'
+        );
+        return true;
+      }());
+      return;
+    }
+
+    if (value == _lastSetValue) {
+      // The focus is being changed to a value that's already been requested in
+      // the past. Do nothing.
+      return;
+    }
+    _lastSetValue = value;
+
+    if (value) {
+      _owner.willRequestFocus();
+    } else {
+      // Do not blur elements. Instead let the element be blurred by requesting
+      // focus elsewhere. Blurring elements is a very error-prone thing to do,
+      // as it is subject to non-local effects. Let's say the framework decides
+      // that a semantics node is currently not focused. That would lead to
+      // changeFocus(false) to be called. However, what if this node is inside
+      // a dialog, and nothing else in the dialog is focused. The Flutter
+      // framework expects that the screen reader will focus on the first (in
+      // traversal order) focusable element inside the dialog and send a
+      // didGainAccessibilityFocus action. Screen readers on the web do not do
+      // that, and so the web engine has to implement this behavior directly. So
+      // the dialog will look for a focusable element and request focus on it,
+      // but now there may be a race between this method unsetting the focus and
+      // the dialog requesting focus on the same element.
+      return;
+    }
+
+    // Delay the focus request until the final DOM structure is established
+    // because the element may not yet be attached to the DOM, or it may be
+    // reparented and lose focus again.
+    _owner.addOneTimePostUpdateCallback(() {
+      if (_target != target) {
+        // The element may have been swapped or the manager may have been disposed
+        // of between the focus change request and the post update callback
+        // invocation. So check again that the element is still the same and is
+        // not null.
+        return;
+      }
+
+      target.element.focus();
+    });
+  }
+}
diff --git a/lib/web_ui/lib/src/engine/semantics/image.dart b/lib/web_ui/lib/src/engine/semantics/image.dart
index e1a4de392db44c111e31f4d241d801a5ed20f1eb..da36ad2a87b5d7bdbb244ca641111e426a513946 100644
--- a/lib/web_ui/lib/src/engine/semantics/image.dart
+++ b/lib/web_ui/lib/src/engine/semantics/image.dart
@@ -10,9 +10,21 @@ import 'semantics.dart';
 /// Uses aria img role to convey this semantic information to the element.
 ///
 /// Screen-readers takes advantage of "aria-label" to describe the visual.
-class ImageRoleManager extends RoleManager {
+class ImageRoleManager extends PrimaryRoleManager {
   ImageRoleManager(SemanticsObject semanticsObject)
-      : super(Role.image, semanticsObject);
+      : super.blank(PrimaryRole.image, semanticsObject) {
+    // The following secondary roles can coexist with images. `LabelAndValue` is
+    // not used because this role manager uses special auxiliary elements to
+    // supply ARIA labels.
+    // TODO(yjbanov): reevaluate usage of aux elements, https://github.com/flutter/flutter/issues/129317
+    addFocusManagement();
+    addLiveRegion();
+    addRouteName();
+    addTappable();
+  }
+
+  @override
+  bool focusAsRouteDefault() => focusable?.focusAsRouteDefault() ?? false;
 
   /// The element with role="img" and aria-label could block access to all
   /// children elements, therefore create an auxiliary element and  describe the
@@ -21,6 +33,8 @@ class ImageRoleManager extends RoleManager {
 
   @override
   void update() {
+    super.update();
+
     if (semanticsObject.isVisualOnly && semanticsObject.hasChildren) {
       if (_auxiliaryImageElement == null) {
         _auxiliaryImageElement = domDocument.createElement('flt-semantics-img');
@@ -38,14 +52,14 @@ class ImageRoleManager extends RoleManager {
             ..height = '${semanticsObject.rect!.height}px';
         }
         _auxiliaryImageElement!.style.fontSize = '6px';
-        semanticsObject.element.append(_auxiliaryImageElement!);
+        append(_auxiliaryImageElement!);
       }
 
       _auxiliaryImageElement!.setAttribute('role', 'img');
       _setLabel(_auxiliaryImageElement);
     } else if (semanticsObject.isVisualOnly) {
-      semanticsObject.setAriaRole('img', true);
-      _setLabel(semanticsObject.element);
+      setAriaRole('img');
+      _setLabel(element);
       _cleanUpAuxiliaryElement();
     } else {
       _cleanUpAuxiliaryElement();
@@ -67,12 +81,12 @@ class ImageRoleManager extends RoleManager {
   }
 
   void _cleanupElement() {
-    semanticsObject.setAriaRole('img', false);
-    semanticsObject.element.removeAttribute('aria-label');
+    removeAttribute('aria-label');
   }
 
   @override
   void dispose() {
+    super.dispose();
     _cleanUpAuxiliaryElement();
     _cleanupElement();
   }
diff --git a/lib/web_ui/lib/src/engine/semantics/incrementable.dart b/lib/web_ui/lib/src/engine/semantics/incrementable.dart
index 6cfeb6c37f80a1064515a0f0f5f0a79bc65ba1cf..5a4abbbfd041be246ecc7652add26e44b741419c 100644
--- a/lib/web_ui/lib/src/engine/semantics/incrementable.dart
+++ b/lib/web_ui/lib/src/engine/semantics/incrementable.dart
@@ -6,7 +6,8 @@ import 'package:ui/ui.dart' as ui;
 
 import '../dom.dart';
 import '../platform_dispatcher.dart';
-import '../safe_browser_api.dart';
+import 'focusable.dart';
+import 'label_and_value.dart';
 import 'semantics.dart';
 
 /// Adds increment/decrement event handling to a semantics object.
@@ -18,14 +19,22 @@ import 'semantics.dart';
 /// The input element is disabled whenever the gesture mode switches to pointer
 /// events. This is to prevent the browser from taking over drag gestures. Drag
 /// gestures must be interpreted by the Flutter framework.
-class Incrementable extends RoleManager {
+class Incrementable extends PrimaryRoleManager {
   Incrementable(SemanticsObject semanticsObject)
-      : super(Role.incrementable, semanticsObject) {
-    semanticsObject.element.append(_element);
+      : _focusManager = AccessibilityFocusManager(semanticsObject.owner),
+        super.blank(PrimaryRole.incrementable, semanticsObject) {
+    // The following generic roles can coexist with incrementables. Generic focus
+    // management is not used by this role because the root DOM element is not
+    // the one being focused on, but the internal `<input>` element.
+    addLiveRegion();
+    addRouteName();
+    addLabelAndValue(labelRepresentation: LeafLabelRepresentation.ariaLabel);
+
+    append(_element);
     _element.type = 'range';
     _element.setAttribute('role', 'slider');
 
-    _element.addEventListener('change', allowInterop((_) {
+    _element.addEventListener('change', createDomEventListener((_) {
       if (_element.disabled!) {
         return;
       }
@@ -47,12 +56,21 @@ class Incrementable extends RoleManager {
     _gestureModeListener = (GestureMode mode) {
       update();
     };
-    semanticsObject.owner.addGestureModeListener(_gestureModeListener);
+    EngineSemantics.instance.addGestureModeListener(_gestureModeListener);
+    _focusManager.manage(semanticsObject.id, _element);
+  }
+
+  @override
+  bool focusAsRouteDefault() {
+    _element.focus();
+    return true;
   }
 
   /// The HTML element used to render semantics to the browser.
   final DomHTMLInputElement _element = createDomHTMLInputElement();
 
+  final AccessibilityFocusManager _focusManager;
+
   /// The value used by the input element.
   ///
   /// Flutter values are strings, and are not necessarily numbers. In order to
@@ -65,7 +83,7 @@ class Incrementable extends RoleManager {
   /// Disables the input [_element] when the gesture mode switches to
   /// [GestureMode.pointerEvents], and enables it when the mode switches back to
   /// [GestureMode.browserGestures].
-  GestureModeCallback? _gestureModeListener;
+  late final GestureModeCallback _gestureModeListener;
 
   /// Whether we forwarded a semantics action to the framework and awaiting an
   /// update.
@@ -76,19 +94,20 @@ class Incrementable extends RoleManager {
 
   @override
   void update() {
-    switch (semanticsObject.owner.gestureMode) {
+    super.update();
+
+    switch (EngineSemantics.instance.gestureMode) {
       case GestureMode.browserGestures:
         _enableBrowserGestureHandling();
         _updateInputValues();
-        break;
       case GestureMode.pointerEvents:
         _disableBrowserGestureHandling();
-        break;
     }
+    _focusManager.changeFocus(semanticsObject.hasFocus);
   }
 
   void _enableBrowserGestureHandling() {
-    assert(semanticsObject.owner.gestureMode == GestureMode.browserGestures);
+    assert(EngineSemantics.instance.gestureMode == GestureMode.browserGestures);
     if (!_element.disabled!) {
       return;
     }
@@ -96,7 +115,7 @@ class Incrementable extends RoleManager {
   }
 
   void _updateInputValues() {
-    assert(semanticsObject.owner.gestureMode == GestureMode.browserGestures);
+    assert(EngineSemantics.instance.gestureMode == GestureMode.browserGestures);
 
     final bool updateNeeded = _pendingResync ||
         semanticsObject.isValueDirty ||
@@ -136,9 +155,9 @@ class Incrementable extends RoleManager {
 
   @override
   void dispose() {
-    assert(_gestureModeListener != null);
-    semanticsObject.owner.removeGestureModeListener(_gestureModeListener);
-    _gestureModeListener = null;
+    super.dispose();
+    _focusManager.stopManaging();
+    EngineSemantics.instance.removeGestureModeListener(_gestureModeListener);
     _disableBrowserGestureHandling();
     _element.remove();
   }
diff --git a/lib/web_ui/lib/src/engine/semantics/label_and_value.dart b/lib/web_ui/lib/src/engine/semantics/label_and_value.dart
index 748ec58f08759f0a7b1044d89ff907d7f198cf73..1d8045bf70a853b9dc62a9b34ec0046c6190e592 100644
--- a/lib/web_ui/lib/src/engine/semantics/label_and_value.dart
+++ b/lib/web_ui/lib/src/engine/semantics/label_and_value.dart
@@ -2,106 +2,140 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:ui/ui.dart' as ui;
-
 import '../dom.dart';
 import 'semantics.dart';
 
-/// Renders [SemanticsObject.label] and/or [SemanticsObject.value] to the semantics DOM.
+/// The method used to represend a label of a leaf node in the DOM.
 ///
-/// VoiceOver supports "aria-label" but only in conjunction with an ARIA role.
-/// Setting "aria-label" on an empty element without a role causes VoiceOver to
-/// treat element as if it does not exist. VoiceOver supports role "text", which
-/// is a proprietary role not supported by other browsers. Flutter Web still
-/// uses it because it provides the best user experience for plain text nodes.
+/// This is required by some screen readers and web crawlers.
 ///
-/// TalkBack supports standalone "aria-label" attribute, but does not support
-/// role "text". This leads to TalkBack reading "group" or "empty group" on
-/// plain text elements, but that's still better than other alternatives
-/// considered.
+/// Container nodes only use `aria-label`, even if [domText] is chosen. This is
+/// because screen readers treat container nodes as "groups" of other nodes, and
+/// respect the `aria-label` without a [DomText] node. Crawlers typically do not
+/// need this information, as they primarily scan visible text, which is
+/// communicated in semantics as leaf text and heading nodes.
+enum LeafLabelRepresentation {
+  /// Represents the label as an `aria-label` attribute.
+  ariaLabel,
+
+  /// Represents the label as a [DomText] node.
+  domText,
+}
+
+/// Renders [SemanticsObject.label] and/or [SemanticsObject.value] to the semantics DOM.
 ///
 /// The value is not always rendered. Some semantics nodes correspond to
-/// interactive controls, such as an `<input>` element. In such case the value
-/// is reported via that element's `value` attribute rather than rendering it
-/// separately.
-///
-/// This role manager does not manage images and text fields. See
-/// [ImageRoleManager] and [TextField].
+/// interactive controls. In such case the value is reported via that element's
+/// `value` attribute rather than rendering it separately.
 class LabelAndValue extends RoleManager {
-  LabelAndValue(SemanticsObject semanticsObject)
-      : super(Role.labelAndValue, semanticsObject);
+  LabelAndValue(SemanticsObject semanticsObject, PrimaryRoleManager owner, { required this.labelRepresentation })
+      : super(Role.labelAndValue, semanticsObject, owner);
+
+  /// Configures the representation of the label in the DOM.
+  final LeafLabelRepresentation labelRepresentation;
 
   @override
   void update() {
-    final bool hasValue = semanticsObject.hasValue;
-    final bool hasLabel = semanticsObject.hasLabel;
-    final bool hasTooltip = semanticsObject.hasTooltip;
-
-    // If the node is incrementable the value is reported to the browser via
-    // the respective role manager. We do not need to also render it again here.
-    final bool shouldDisplayValue = hasValue && !semanticsObject.isIncrementable;
+    final String? computedLabel = _computeLabel();
 
-    if (!hasLabel && !shouldDisplayValue && !hasTooltip) {
+    if (computedLabel == null) {
+      _oldLabel = null;
       _cleanUpDom();
       return;
     }
 
-    final StringBuffer combinedValue = StringBuffer();
-    if (hasTooltip) {
-      combinedValue.write(semanticsObject.tooltip);
-      if (hasLabel || shouldDisplayValue) {
-        combinedValue.write('\n');
-      }
-    }
-    if (hasLabel) {
-      combinedValue.write(semanticsObject.label);
-      if (shouldDisplayValue) {
-        combinedValue.write(' ');
-      }
-    }
+    _updateLabel(computedLabel);
+  }
 
-    if (shouldDisplayValue) {
-      combinedValue.write(semanticsObject.value);
+  DomText? _domText;
+  String? _oldLabel;
+
+  void _updateLabel(String label) {
+    if (label == _oldLabel) {
+      return;
     }
+    _oldLabel = label;
 
-    semanticsObject.element
-        .setAttribute('aria-label', combinedValue.toString());
-
-    // Assign one of three roles to the element: heading, group, text.
-    //
-    // - "group" is used when the node has children, irrespective of whether the
-    //   node is marked as a header or not. This is because marking a group
-    //   as a "heading" will prevent the AT from reaching its children.
-    // - "heading" is used when the framework explicitly marks the node as a
-    //   heading and the node does not have children.
-    // - "text" is used by default.
-    //
-    // As of October 24, 2022, "text" only has effect on Safari. Other browsers
-    // ignore it. Setting role="text" prevents Safari from treating the element
-    // as a "group" or "empty group". Other browsers still announce it as
-    // "group" or "empty group". However, other options considered produced even
-    // worse results, such as:
-    //
-    // - Ignore the size of the element and size the focus ring to the text
-    //   content, which is wrong. The HTML text size is irrelevant because
-    //   Flutter renders into canvas, so the focus ring looks wrong.
-    // - Read out the same label multiple times.
-    if (semanticsObject.hasChildren) {
-      semanticsObject.setAriaRole('group', true);
-    } else if (semanticsObject.hasFlag(ui.SemanticsFlag.isHeader)) {
-      semanticsObject.setAriaRole('heading', true);
+    final bool needsDomText = labelRepresentation == LeafLabelRepresentation.domText && !semanticsObject.hasChildren;
+
+    _domText?.remove();
+    if (needsDomText) {
+      owner.removeAttribute('aria-label');
+      final DomText domText = domDocument.createTextNode(label);
+      _domText = domText;
+      semanticsObject.element.appendChild(domText);
     } else {
-      semanticsObject.setAriaRole('text', true);
+      owner.setAttribute('aria-label', label);
+      _domText = null;
     }
   }
 
+  /// Computes the final label to be assigned to the node.
+  ///
+  /// The label is a concatenation of tooltip, label, hint, and value, whichever
+  /// combination is present.
+  String? _computeLabel() {
+    // If the node is incrementable the value is reported to the browser via
+    // the respective role manager. We do not need to also render it again here.
+    final bool shouldDisplayValue = !semanticsObject.isIncrementable && semanticsObject.hasValue;
+
+    return computeDomSemanticsLabel(
+      tooltip: semanticsObject.hasTooltip ? semanticsObject.tooltip : null,
+      label: semanticsObject.hasLabel ? semanticsObject.label : null,
+      hint: semanticsObject.hint,
+      value: shouldDisplayValue ? semanticsObject.value : null,
+    );
+  }
+
   void _cleanUpDom() {
-    semanticsObject.element.removeAttribute('aria-label');
-    semanticsObject.clearAriaRole();
+    owner.removeAttribute('aria-label');
+    _domText?.remove();
   }
 
   @override
   void dispose() {
+    super.dispose();
     _cleanUpDom();
   }
 }
+
+String? computeDomSemanticsLabel({
+  String? tooltip,
+  String? label,
+  String? hint,
+  String? value,
+}) {
+  final String? labelHintValue = _computeLabelHintValue(label: label, hint: hint, value: value);
+
+  if (tooltip == null && labelHintValue == null) {
+    return null;
+  }
+
+  final StringBuffer combinedValue = StringBuffer();
+  if (tooltip != null) {
+    combinedValue.write(tooltip);
+
+    // Separate the tooltip from the rest via a line-break (if the rest exists).
+    if (labelHintValue != null) {
+      combinedValue.writeln();
+    }
+  }
+
+  if (labelHintValue != null) {
+    combinedValue.write(labelHintValue);
+  }
+
+  return combinedValue.isNotEmpty ? combinedValue.toString() : null;
+}
+
+String? _computeLabelHintValue({
+  String? label,
+  String? hint,
+  String? value,
+}) {
+  final String combinedValue = <String?>[label, hint, value]
+    .whereType<String>() // poor man's null filter
+    .where((String element) => element.trim().isNotEmpty)
+    .join(' ');
+  return combinedValue.isNotEmpty ? combinedValue : null;
+}
diff --git a/lib/web_ui/lib/src/engine/semantics/link.dart b/lib/web_ui/lib/src/engine/semantics/link.dart
new file mode 100644
index 0000000000000000000000000000000000000000..d9f93078f005f66124f1e983fc2f37e76c98e537
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/semantics/link.dart
@@ -0,0 +1,30 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import '../dom.dart';
+import '../semantics.dart';
+
+/// Provides accessibility for links.
+class Link extends PrimaryRoleManager {
+  Link(SemanticsObject semanticsObject) : super.withBasics(
+    PrimaryRole.link,
+    semanticsObject,
+    labelRepresentation: LeafLabelRepresentation.domText,
+  ) {
+    addTappable();
+  }
+
+  @override
+  DomElement createElement() {
+    final DomElement element = domDocument.createElement('a');
+    // TODO(chunhtai): Fill in the real link once the framework sends entire uri.
+    // https://github.com/flutter/flutter/issues/102535.
+    element.setAttribute('href', '#');
+    element.style.display = 'block';
+    return element;
+  }
+
+  @override
+  bool focusAsRouteDefault() => focusable?.focusAsRouteDefault() ?? false;
+}
diff --git a/lib/web_ui/lib/src/engine/semantics/live_region.dart b/lib/web_ui/lib/src/engine/semantics/live_region.dart
index 6f51f6ce55290b5f7cbec3a40905b9052c84a6b5..cd0002f49b575c8615ecfbe9e763253cb263228d 100644
--- a/lib/web_ui/lib/src/engine/semantics/live_region.dart
+++ b/lib/web_ui/lib/src/engine/semantics/live_region.dart
@@ -2,41 +2,53 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import '../dom.dart';
+import 'package:meta/meta.dart';
+
+import '../platform_dispatcher.dart';
+import 'accessibility.dart';
+import 'label_and_value.dart';
 import 'semantics.dart';
 
 /// Manages semantics configurations that represent live regions.
 ///
-/// "aria-live" attribute is added to communicate the live region to the
-/// assistive technology.
-///
-/// The usage of "aria-live" is browser-dependent.
+/// Assistive technologies treat "aria-live" attribute differently. To keep
+/// the behavior consistent, [AccessibilityAnnouncements.announce] is used.
 ///
-/// VoiceOver only supports "aria-live" with "polite" politeness setting. When
-/// the inner html content is changed. It doesn't read the "aria-label".
-///
-/// When there is an aria-live attribute added, assistive technologies read the
+/// When there is an update to [LiveRegion], assistive technologies read the
 /// label of the element. See [LabelAndValue]. If there is no label provided
-/// no content will be read, therefore DOM is cleaned.
+/// no content will be read.
 class LiveRegion extends RoleManager {
-  LiveRegion(SemanticsObject semanticsObject)
-      : super(Role.labelAndValue, semanticsObject);
+  LiveRegion(SemanticsObject semanticsObject, PrimaryRoleManager owner)
+      : super(Role.liveRegion, semanticsObject, owner);
 
-  @override
-  void update() {
-    if (semanticsObject.hasLabel) {
-      semanticsObject.element.setAttribute('aria-live', 'polite');
-    } else {
-      _cleanupDom();
-    }
-  }
+  String? _lastAnnouncement;
 
-  void _cleanupDom() {
-    semanticsObject.element.removeAttribute('aria-live');
+  static AccessibilityAnnouncements? _accessibilityAnnouncementsOverride;
+
+  @visibleForTesting
+  static void debugOverrideAccessibilityAnnouncements(AccessibilityAnnouncements? value) {
+    _accessibilityAnnouncementsOverride = value;
   }
 
+  AccessibilityAnnouncements get _accessibilityAnnouncements =>
+      _accessibilityAnnouncementsOverride ??
+      EnginePlatformDispatcher.instance.implicitView!.accessibilityAnnouncements;
+
   @override
-  void dispose() {
-    _cleanupDom();
+  void update() {
+    if (!semanticsObject.isLiveRegion) {
+      return;
+    }
+
+    // Avoid announcing the same message over and over.
+    if (_lastAnnouncement != semanticsObject.label) {
+      _lastAnnouncement = semanticsObject.label;
+      if (semanticsObject.hasLabel) {
+        _accessibilityAnnouncements.announce(
+          _lastAnnouncement!,
+          Assertiveness.polite,
+        );
+      }
+    }
   }
 }
diff --git a/lib/web_ui/lib/src/engine/semantics/platform_view.dart b/lib/web_ui/lib/src/engine/semantics/platform_view.dart
new file mode 100644
index 0000000000000000000000000000000000000000..029a7dd71f63dbd64fbe47d7ab3387ed5ac57436
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/semantics/platform_view.dart
@@ -0,0 +1,55 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import '../platform_views/slots.dart';
+import 'label_and_value.dart';
+import 'semantics.dart';
+
+/// Manages the semantic element corresponding to a platform view.
+///
+/// The element in the semantics tree exists only to supply the ARIA traversal
+/// order. The actual content of the platform view is managed by
+/// [PlatformViewManager].
+///
+/// The traversal order is established using "aria-owns", by pointing to the
+/// element that hosts the view contents. As of this writing, Safari on macOS
+/// and on iOS does not support "aria-owns". All other browsers on all operating
+/// systems support it.
+///
+/// See also:
+///   * https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Attributes/aria-owns
+///   * https://bugs.webkit.org/show_bug.cgi?id=223798
+class PlatformViewRoleManager extends PrimaryRoleManager {
+  PlatformViewRoleManager(SemanticsObject semanticsObject)
+      : super.withBasics(
+          PrimaryRole.platformView,
+          semanticsObject,
+          labelRepresentation: LeafLabelRepresentation.ariaLabel,
+        );
+
+  @override
+  void update() {
+    super.update();
+
+    if (semanticsObject.isPlatformView) {
+      if (semanticsObject.isPlatformViewIdDirty) {
+        setAttribute(
+          'aria-owns',
+          getPlatformViewDomId(semanticsObject.platformViewId),
+        );
+      }
+    } else {
+      removeAttribute('aria-owns');
+    }
+  }
+
+  @override
+  bool focusAsRouteDefault() {
+    // It's unclear how it's possible to auto-focus on something inside a
+    // platform view without knowing what's in it. If the framework adds API for
+    // focusing on platform view internals, this method will be able to do more,
+    // but for now there's nothing to focus on.
+    return false;
+  }
+}
diff --git a/lib/web_ui/lib/src/engine/semantics/scrollable.dart b/lib/web_ui/lib/src/engine/semantics/scrollable.dart
index 06910c7baaa7643a6a750acd4c7f02fad8db77ce..bb42bbc822decf1b73306a1a731d15578b90fa44 100644
--- a/lib/web_ui/lib/src/engine/semantics/scrollable.dart
+++ b/lib/web_ui/lib/src/engine/semantics/scrollable.dart
@@ -22,15 +22,19 @@ import 'package:ui/ui.dart' as ui;
 /// contents is less than the size of the viewport the browser snaps
 /// "scrollTop" back to zero. If there is more content than available in the
 /// viewport "scrollTop" may take positive values.
-class Scrollable extends RoleManager {
+class Scrollable extends PrimaryRoleManager {
   Scrollable(SemanticsObject semanticsObject)
-      : super(Role.scrollable, semanticsObject) {
+      : super.withBasics(
+          PrimaryRole.scrollable,
+          semanticsObject,
+          labelRepresentation: LeafLabelRepresentation.ariaLabel,
+        ) {
     _scrollOverflowElement.style
       ..position = 'absolute'
       ..transformOrigin = '0 0 0'
       // Ignore pointer events since this is a dummy element.
       ..pointerEvents = 'none';
-    semanticsObject.element.append(_scrollOverflowElement);
+    append(_scrollOverflowElement);
   }
 
   /// Disables browser-driven scrolling in the presence of pointer events.
@@ -62,7 +66,7 @@ class Scrollable extends RoleManager {
   /// Responds to browser-detected "scroll" gestures.
   void _recomputeScrollPosition() {
     if (_domScrollPosition != _effectiveNeutralScrollPosition) {
-      if (!semanticsObject.owner.shouldAcceptBrowserGesture('scroll')) {
+      if (!EngineSemantics.instance.shouldAcceptBrowserGesture('scroll')) {
         return;
       }
       final bool doScrollForward =
@@ -95,6 +99,8 @@ class Scrollable extends RoleManager {
 
   @override
   void update() {
+    super.update();
+
     semanticsObject.owner.addOneTimePostUpdateCallback(() {
       _neutralizeDomScrollPosition();
       semanticsObject.recomputePositionAndSize();
@@ -110,7 +116,7 @@ class Scrollable extends RoleManager {
       // This is effective only in Chrome. Safari does not implement this
       // CSS property. In Safari the `PointerBinding` uses `preventDefault`
       // to prevent browser scrolling.
-      semanticsObject.element.style.touchAction = 'none';
+      element.style.touchAction = 'none';
       _gestureModeDidChange();
 
       // Memoize the tear-off because Dart does not guarantee that two
@@ -119,22 +125,22 @@ class Scrollable extends RoleManager {
       _gestureModeListener = (_) {
         _gestureModeDidChange();
       };
-      semanticsObject.owner.addGestureModeListener(_gestureModeListener);
+      EngineSemantics.instance.addGestureModeListener(_gestureModeListener!);
 
-      _scrollListener = allowInterop((_) {
+      _scrollListener = createDomEventListener((_) {
         _recomputeScrollPosition();
       });
-      semanticsObject.element.addEventListener('scroll', _scrollListener);
+      addEventListener('scroll', _scrollListener);
     }
   }
 
   /// The value of "scrollTop" or "scrollLeft", depending on the scroll axis.
   int get _domScrollPosition {
     if (semanticsObject.isVerticalScrollContainer) {
-      return semanticsObject.element.scrollTop.toInt();
+      return element.scrollTop.toInt();
     } else {
       assert(semanticsObject.isHorizontalScrollContainer);
-      return semanticsObject.element.scrollLeft.toInt();
+      return element.scrollLeft.toInt();
     }
   }
 
@@ -151,7 +157,6 @@ class Scrollable extends RoleManager {
   void _neutralizeDomScrollPosition() {
     // This value is arbitrary.
     const int canonicalNeutralScrollPosition = 10;
-    final DomElement element = semanticsObject.element;
     final ui.Rect? rect = semanticsObject.rect;
     if (rect == null) {
       printWarning('Warning! the rect attribute of semanticsObject is null');
@@ -195,8 +200,7 @@ class Scrollable extends RoleManager {
   }
 
   void _gestureModeDidChange() {
-    final DomElement element = semanticsObject.element;
-    switch (semanticsObject.owner.gestureMode) {
+    switch (EngineSemantics.instance.gestureMode) {
       case GestureMode.browserGestures:
         // overflow:scroll will cause the browser report "scroll" events when
         // the accessibility focus shifts outside the visible bounds.
@@ -209,7 +213,6 @@ class Scrollable extends RoleManager {
           assert(semanticsObject.isHorizontalScrollContainer);
           element.style.overflowX = 'scroll';
         }
-        break;
       case GestureMode.pointerEvents:
         // We use "hidden" instead of "scroll" so that the browser does
         // not "steal" pointer events. Flutter gesture recognizers need
@@ -220,21 +223,27 @@ class Scrollable extends RoleManager {
           assert(semanticsObject.isHorizontalScrollContainer);
           element.style.overflowX = 'hidden';
         }
-        break;
     }
   }
 
   @override
   void dispose() {
-    final DomCSSStyleDeclaration style = semanticsObject.element.style;
+    super.dispose();
+    final DomCSSStyleDeclaration style = element.style;
     assert(_gestureModeListener != null);
     style.removeProperty('overflowY');
     style.removeProperty('overflowX');
     style.removeProperty('touch-action');
     if (_scrollListener != null) {
-      semanticsObject.element.removeEventListener('scroll', _scrollListener);
+      removeEventListener('scroll', _scrollListener);
+      _scrollListener = null;
+    }
+    if (_gestureModeListener != null) {
+      EngineSemantics.instance.removeGestureModeListener(_gestureModeListener!);
+      _gestureModeListener = null;
     }
-    semanticsObject.owner.removeGestureModeListener(_gestureModeListener);
-    _gestureModeListener = null;
   }
+
+  @override
+  bool focusAsRouteDefault() => focusable?.focusAsRouteDefault() ?? false;
 }
diff --git a/lib/web_ui/lib/src/engine/semantics/semantics.dart b/lib/web_ui/lib/src/engine/semantics/semantics.dart
index 878a14882f6a869a81e06396dd78bdec5b246bd8..3d10056c20fa627a01012fe0976682f91977867e 100644
--- a/lib/web_ui/lib/src/engine/semantics/semantics.dart
+++ b/lib/web_ui/lib/src/engine/semantics/semantics.dart
@@ -5,22 +5,28 @@
 import 'dart:math' as math;
 import 'dart:typed_data';
 
+import 'package:meta/meta.dart';
 import 'package:ui/ui.dart' as ui;
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
 import '../../engine.dart'  show registerHotRestartListener;
 import '../alarm_clock.dart';
 import '../browser_detection.dart';
 import '../configuration.dart';
 import '../dom.dart';
-import '../embedder.dart';
 import '../platform_dispatcher.dart';
 import '../util.dart';
 import '../vector_math.dart';
+import '../window.dart';
 import 'checkable.dart';
+import 'dialog.dart';
+import 'focusable.dart';
 import 'image.dart';
 import 'incrementable.dart';
 import 'label_and_value.dart';
+import 'link.dart';
 import 'live_region.dart';
+import 'platform_view.dart';
 import 'scrollable.dart';
 import 'semantics_helper.dart';
 import 'tappable.dart';
@@ -206,6 +212,7 @@ class SemanticsNodeUpdate {
     required this.scrollExtentMax,
     required this.scrollExtentMin,
     required this.rect,
+    required this.identifier,
     required this.label,
     required this.labelAttributes,
     required this.hint,
@@ -268,6 +275,9 @@ class SemanticsNodeUpdate {
   /// See [ui.SemanticsUpdateBuilder.updateNode].
   final ui.Rect rect;
 
+  /// See [ui.SemanticsUpdateBuilder.updateNode].
+  final String identifier;
+
   /// See [ui.SemanticsUpdateBuilder.updateNode].
   final String label;
 
@@ -323,22 +333,19 @@ class SemanticsNodeUpdate {
   final double thickness;
 }
 
-/// Identifies one of the roles a [SemanticsObject] plays.
-enum Role {
+/// Identifies [PrimaryRoleManager] implementations.
+///
+/// Each value corresponds to the most specific role a semantics node plays in
+/// the semantics tree.
+enum PrimaryRole {
   /// Supports incrementing and/or decrementing its value.
   incrementable,
 
   /// Able to scroll its contents vertically or horizontally.
   scrollable,
 
-  /// Contains a label or a value.
-  ///
-  /// The two are combined into the same role because they interact with each
-  /// other.
-  labelAndValue,
-
   /// Accepts tap or click gestures.
-  tappable,
+  button,
 
   /// Contains editable text.
   textField,
@@ -349,6 +356,57 @@ enum Role {
   /// Visual only element.
   image,
 
+  /// Adds the "dialog" ARIA role to the node.
+  ///
+  /// This corresponds to a semantics node that has `scopesRoute` bit set. While
+  /// in Flutter a named route is not necessarily a dialog, this is the closest
+  /// analog on the web.
+  ///
+  /// There are 3 possible situations:
+  ///
+  /// * The node also has the `namesRoute` bit set. This means that the node's
+  ///   `label` describes the dialog, which can be expressed by adding the
+  ///   `aria-label` attribute.
+  /// * A descendant node has the `namesRoute` bit set. This means that the
+  ///   child's content describes the dialog. The child may simply be labelled,
+  ///   or it may be a subtree of nodes that describe the dialog together. The
+  ///   nearest HTML equivalent is `aria-describedby`. The child acquires the
+  ///   [routeName] role, which manages the relevant ARIA attributes.
+  /// * There is no `namesRoute` bit anywhere in the sub-tree rooted at the
+  ///   current node. In this case it's likely not a dialog at all, and the node
+  ///   should not get a label or the "dialog" role. It's just a group of
+  ///   children. For example, a modal barrier has `scopesRoute` set but marking
+  ///   it as a dialog would be wrong.
+  dialog,
+
+  /// The node's primary role is to host a platform view.
+  platformView,
+
+  /// A role used when a more specific role cannot be assigend to
+  /// a [SemanticsObject].
+  ///
+  /// Provides a label or a value.
+  generic,
+
+  /// Contains a link.
+  link,
+}
+
+/// Identifies one of the secondary [RoleManager]s of a [PrimaryRoleManager].
+enum Role {
+  /// Supplies generic accessibility focus features to semantics nodes that have
+  /// [ui.SemanticsFlag.isFocusable] set.
+  focusable,
+
+  /// Supplies generic tapping/clicking functionality.
+  tappable,
+
+  /// Provides an `aria-label` from `label`, `value`, and/or `tooltip` values.
+  ///
+  /// The two are combined into the same role because they interact with each
+  /// other.
+  labelAndValue,
+
   /// Contains a region whose changes will be announced to the screen reader
   /// without having to be in focus.
   ///
@@ -356,72 +414,71 @@ enum Role {
   /// with this role, they will be able to get the assistive technology's
   /// attention right away.
   liveRegion,
+
+  /// Provides a description for an ancestor dialog.
+  ///
+  /// This role is assigned to nodes that have `namesRoute` set but not
+  /// `scopesRoute`. When both flags are set the node only gets the dialog
+  /// role (see [dialog]).
+  ///
+  /// If the ancestor dialog is missing, this role does nothing useful.
+  routeName,
 }
 
-/// A function that creates a [RoleManager] for a [SemanticsObject].
-typedef RoleManagerFactory = RoleManager Function(SemanticsObject object);
-
-final Map<Role, RoleManagerFactory> _roleFactories = <Role, RoleManagerFactory>{
-  Role.incrementable: (SemanticsObject object) => Incrementable(object),
-  Role.scrollable: (SemanticsObject object) => Scrollable(object),
-  Role.labelAndValue: (SemanticsObject object) => LabelAndValue(object),
-  Role.tappable: (SemanticsObject object) => Tappable(object),
-  Role.textField: (SemanticsObject object) => TextField(object),
-  Role.checkable: (SemanticsObject object) => Checkable(object),
-  Role.image: (SemanticsObject object) => ImageRoleManager(object),
-  Role.liveRegion: (SemanticsObject object) => LiveRegion(object),
-};
-
-/// Provides the functionality associated with the role of the given
-/// [semanticsObject].
-///
-/// The role is determined by [ui.SemanticsFlag]s and [ui.SemanticsAction]s set
-/// on the object.
-abstract class RoleManager {
-  /// Initializes a role for [semanticsObject].
+/// Responsible for setting the `role` ARIA attribute and for attaching zero or
+/// more secondary [RoleManager]s to a [SemanticsObject].
+abstract class PrimaryRoleManager {
+  /// Initializes a role for a [semanticsObject] that includes basic
+  /// functionality for focus, labels, live regions, and route names.
   ///
-  /// A single role object manages exactly one [SemanticsObject].
-  RoleManager(this.role, this.semanticsObject)
-      : assert(semanticsObject != null);
+  /// If `labelRepresentation` is true, configures the [LabelAndValue] role with
+  /// [LabelAndValue.labelRepresentation] set to true.
+  PrimaryRoleManager.withBasics(this.role, this.semanticsObject, { required LeafLabelRepresentation labelRepresentation }) {
+    element = _initElement(createElement(), semanticsObject);
+    addFocusManagement();
+    addLiveRegion();
+    addRouteName();
+    addLabelAndValue(labelRepresentation: labelRepresentation);
+  }
 
-  /// Role identifier.
-  final Role role;
+  /// Initializes a blank role for a [semanticsObject].
+  ///
+  /// Use this constructor for highly specialized cases where
+  /// [RoleManager.withBasics] does not work, for example when the default focus
+  /// management intereferes with the widget's functionality.
+  PrimaryRoleManager.blank(this.role, this.semanticsObject) {
+    element = _initElement(createElement(), semanticsObject);
+  }
+
+  late final DomElement element;
+
+  /// The primary role identifier.
+  final PrimaryRole role;
 
   /// The semantics object managed by this role.
   final SemanticsObject semanticsObject;
 
-  /// Called immediately after the [semanticsObject] updates some of its fields.
-  ///
-  /// A concrete implementation of this method would typically use some of the
-  /// "is*Dirty" getters to find out exactly what's changed and apply the
-  /// minimum DOM updates.
-  void update();
+  /// Secondary role managers, if any.
+  List<RoleManager>? get secondaryRoleManagers => _secondaryRoleManagers;
+  List<RoleManager>? _secondaryRoleManagers;
 
-  /// Called when [semanticsObject] is removed, or when it changes its role such
-  /// that this role is no longer relevant.
+  /// Identifiers of secondary roles used by this primary role manager.
   ///
-  /// This method is expected to remove role-specific functionality from the
-  /// DOM. In particular, this method is the appropriate place to call
-  /// [EngineSemanticsOwner.removeGestureModeListener] if this role reponds to
-  /// gesture mode changes.
-  void dispose();
-}
+  /// This is only meant to be used in tests.
+  @visibleForTesting
+  List<Role> get debugSecondaryRoles => _secondaryRoleManagers?.map((RoleManager manager) => manager.role).toList() ?? const <Role>[];
 
-/// Instantiation of a framework-side semantics node in the DOM.
-///
-/// Instances of this class are retained from frame to frame. Each instance is
-/// permanently attached to an [id] and a DOM [element] used to convey semantics
-/// information to the browser.
-class SemanticsObject {
-  /// Creates a semantics tree node with the given [id] and [owner].
-  SemanticsObject(this.id, this.owner) {
+  @protected
+  DomElement createElement() => domDocument.createElement('flt-semantics');
+
+  static DomElement _initElement(DomElement element, SemanticsObject semanticsObject) {
     // DOM nodes created for semantics objects are positioned absolutely using
     // transforms.
     element.style.position = 'absolute';
-    element.setAttribute('id', 'flt-semantic-node-$id');
+    element.setAttribute('id', 'flt-semantic-node-${semanticsObject.id}');
 
     // The root node has some properties that other nodes do not.
-    if (id == 0 && !configuration.debugShowSemanticsNodes) {
+    if (semanticsObject.id == 0 && !configuration.debugShowSemanticsNodes) {
       // Make all semantics transparent. Use `filter` instead of `opacity`
       // attribute because `filter` is stronger. `opacity` does not apply to
       // some elements, particularly on iOS, such as the slider thumb and track.
@@ -441,7 +498,272 @@ class SemanticsObject {
     if (configuration.debugShowSemanticsNodes) {
       element.style.outline = '1px solid green';
     }
+    return element;
+  }
+
+  /// Sets the `role` ARIA attribute.
+  void setAriaRole(String ariaRoleName) {
+    setAttribute('role', ariaRoleName);
+  }
+
+  /// Sets the `role` ARIA attribute.
+  void setAttribute(String name, Object value) {
+    element.setAttribute(name, value);
+  }
+
+  void append(DomElement child) {
+    element.append(child);
+  }
+
+  void removeAttribute(String name) => element.removeAttribute(name);
+
+  void addEventListener(String type, DomEventListener? listener, [bool? useCapture]) => element.addEventListener(type, listener, useCapture);
+
+  void removeEventListener(String type, DomEventListener? listener, [bool? useCapture]) => element.removeEventListener(type, listener, useCapture);
+
+  /// Convenience getter for the [Focusable] role manager, if any.
+  Focusable? get focusable => _focusable;
+  Focusable? _focusable;
+
+  /// Adds generic focus management features.
+  void addFocusManagement() {
+    addSecondaryRole(_focusable = Focusable(semanticsObject, this));
+  }
+
+  /// Adds generic live region features.
+  void addLiveRegion() {
+    addSecondaryRole(LiveRegion(semanticsObject, this));
+  }
+
+  /// Adds generic route name features.
+  void addRouteName() {
+    addSecondaryRole(RouteName(semanticsObject, this));
+  }
+
+  /// Adds generic label features.
+  void addLabelAndValue({ required LeafLabelRepresentation labelRepresentation }) {
+    addSecondaryRole(LabelAndValue(semanticsObject, this, labelRepresentation: labelRepresentation));
+  }
+
+  /// Adds generic functionality for handling taps and clicks.
+  void addTappable() {
+    addSecondaryRole(Tappable(semanticsObject, this));
+  }
+
+  /// Adds a secondary role to this primary role manager.
+  ///
+  /// This method should be called by concrete implementations of
+  /// [PrimaryRoleManager] during initialization.
+  @protected
+  void addSecondaryRole(RoleManager secondaryRoleManager) {
+    assert(
+      _secondaryRoleManagers?.any((RoleManager manager) => manager.role == secondaryRoleManager.role) != true,
+      'Cannot add secondary role ${secondaryRoleManager.role}. This object already has this secondary role.',
+    );
+    _secondaryRoleManagers ??= <RoleManager>[];
+    _secondaryRoleManagers!.add(secondaryRoleManager);
+  }
+
+  /// Called immediately after the fields of the [semanticsObject] are updated
+  /// by a [SemanticsUpdate].
+  ///
+  /// A concrete implementation of this method would typically use some of the
+  /// "is*Dirty" getters to find out exactly what's changed and apply the
+  /// minimum DOM updates.
+  ///
+  /// The base implementation requests every secondary role manager to update
+  /// the object.
+  @mustCallSuper
+  void update() {
+    final List<RoleManager>? secondaryRoles = _secondaryRoleManagers;
+    if (secondaryRoles == null) {
+      return;
+    }
+    for (final RoleManager secondaryRole in secondaryRoles) {
+      secondaryRole.update();
+    }
+  }
+
+  /// Whether this role manager was disposed of.
+  bool get isDisposed => _isDisposed;
+  bool _isDisposed = false;
+
+  /// Called when [semanticsObject] is removed, or when it changes its role such
+  /// that this role is no longer relevant.
+  ///
+  /// This method is expected to remove role-specific functionality from the
+  /// DOM. In particular, this method is the appropriate place to call
+  /// [EngineSemanticsOwner.removeGestureModeListener] if this role reponds to
+  /// gesture mode changes.
+  @mustCallSuper
+  void dispose() {
+    removeAttribute('role');
+    _isDisposed = true;
+  }
+
+  /// Transfers the accessibility focus to the [element] managed by this role
+  /// manager as a result of this node taking focus by default.
+  ///
+  /// For example, when a dialog pops up it is expected that one of its child
+  /// nodes takes accessibility focus.
+  ///
+  /// Transferring accessibility focus is different from transferring input
+  /// focus. Not all elements that can take accessibility focus can also take
+  /// input focus. For example, a plain text node cannot take input focus, but
+  /// it can take accessibility focus.
+  ///
+  /// Returns `true` if the role manager took the focus. Returns `false` if
+  /// this role manager did not take the focus. The return value can be used to
+  /// decide whether to stop searching for a node that should take focus.
+  bool focusAsRouteDefault();
+}
+
+/// A role used when a more specific role couldn't be assigned to the node.
+final class GenericRole extends PrimaryRoleManager {
+  GenericRole(SemanticsObject semanticsObject) : super.withBasics(
+    PrimaryRole.generic,
+    semanticsObject,
+    labelRepresentation: LeafLabelRepresentation.domText,
+  ) {
+    // Typically a tappable widget would have a more specific role, such as
+    // "link", "button", "checkbox", etc. However, there are situations when a
+    // tappable is not a leaf node, but contains other nodes, which can also be
+    // tappable. For example, the dismiss barrier of a pop-up menu is a tappable
+    // ancestor of the menu itself, while the menu may contain tappable
+    // children.
+    if (semanticsObject.isTappable) {
+      addTappable();
+    }
+  }
+
+  @override
+  void update() {
+    super.update();
+
+    if (!semanticsObject.hasLabel) {
+      // The node didn't get a more specific role, and it has no label. It is
+      // likely that this node is simply there for positioning its children and
+      // has no other role for the screen reader to be aware of. In this case,
+      // the element does not need a `role` attribute at all.
+      return;
+    }
+
+    // Assign one of three roles to the element: heading, group, text.
+    //
+    // - "group" is used when the node has children, irrespective of whether the
+    //   node is marked as a header or not. This is because marking a group
+    //   as a "heading" will prevent the AT from reaching its children.
+    // - "heading" is used when the framework explicitly marks the node as a
+    //   heading and the node does not have children.
+    // - "text" is used by default.
+    //
+    // As of October 24, 2022, "text" only has effect on Safari. Other browsers
+    // ignore it. Setting role="text" prevents Safari from treating the element
+    // as a "group" or "empty group". Other browsers still announce it as
+    // "group" or "empty group". However, other options considered produced even
+    // worse results, such as:
+    //
+    // - Ignore the size of the element and size the focus ring to the text
+    //   content, which is wrong. The HTML text size is irrelevant because
+    //   Flutter renders into canvas, so the focus ring looks wrong.
+    // - Read out the same label multiple times.
+    if (semanticsObject.hasChildren) {
+      setAriaRole('group');
+    } else if (semanticsObject.hasFlag(ui.SemanticsFlag.isHeader)) {
+      setAriaRole('heading');
+    } else {
+      setAriaRole('text');
+    }
+  }
+
+  @override
+  bool focusAsRouteDefault() {
+    // Case 1: current node has input focus. Let the input focus system decide
+    // default focusability.
+    if (semanticsObject.isFocusable) {
+      final Focusable? focusable = this.focusable;
+      if (focusable != null) {
+        return focusable.focusAsRouteDefault();
+      }
+    }
+
+    // Case 2: current node is not focusable, but just a container of other
+    // nodes or lacks a label. Do not focus on it and let the search continue.
+    if (semanticsObject.hasChildren || !semanticsObject.hasLabel) {
+      return false;
+    }
+
+    // Case 3: current node is visual/informational. Move just the
+    // accessibility focus.
+
+    // Plain text nodes should not be focusable via keyboard or mouse. They are
+    // only focusable for the purposes of focusing the screen reader. To achieve
+    // this the -1 value is used.
+    //
+    // See also:
+    //
+    // https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/tabindex
+    element.tabIndex = -1;
+    element.focus();
+    return true;
+  }
+}
+
+/// Provides a piece of functionality to a [SemanticsObject].
+///
+/// A secondary role must not set the `role` ARIA attribute. That responsibility
+/// falls on the [PrimaryRoleManager]. One [SemanticsObject] may have more than
+/// one [RoleManager] but an element may only have one ARIA role, so setting the
+/// `role` attribute from a [RoleManager] would cause conflicts.
+///
+/// The [PrimaryRoleManager] decides the list of [RoleManager]s a given semantics
+/// node should use.
+abstract class RoleManager {
+  /// Initializes a secondary role for [semanticsObject].
+  ///
+  /// A single role object manages exactly one [SemanticsObject].
+  RoleManager(this.role, this.semanticsObject, this.owner);
+
+  /// Role identifier.
+  final Role role;
+
+  /// The semantics object managed by this role.
+  final SemanticsObject semanticsObject;
+
+  final PrimaryRoleManager owner;
+
+  /// Called immediately after the [semanticsObject] updates some of its fields.
+  ///
+  /// A concrete implementation of this method would typically use some of the
+  /// "is*Dirty" getters to find out exactly what's changed and apply the
+  /// minimum DOM updates.
+  void update();
+
+  /// Whether this role manager was disposed of.
+  bool get isDisposed => _isDisposed;
+  bool _isDisposed = false;
+
+  /// Called when [semanticsObject] is removed, or when it changes its role such
+  /// that this role is no longer relevant.
+  ///
+  /// This method is expected to remove role-specific functionality from the
+  /// DOM. In particular, this method is the appropriate place to call
+  /// [EngineSemanticsOwner.removeGestureModeListener] if this role reponds to
+  /// gesture mode changes.
+  @mustCallSuper
+  void dispose() {
+    _isDisposed = true;
   }
+}
+
+/// Instantiation of a framework-side semantics node in the DOM.
+///
+/// Instances of this class are retained from frame to frame. Each instance is
+/// permanently attached to an [id] and a DOM [element] used to convey semantics
+/// information to the browser.
+class SemanticsObject {
+  /// Creates a semantics tree node with the given [id] and [owner].
+  SemanticsObject(this.id, this.owner);
 
   /// See [ui.SemanticsUpdateBuilder.updateNode].
   int get flags => _flags;
@@ -755,6 +1077,9 @@ class SemanticsObject {
 
   static const int _platformViewIdIndex = 1 << 23;
 
+  /// Whether the [platformViewId] field has been updated but has not been
+  /// applied to the DOM yet.
+  bool get isPlatformViewIdDirty => _isDirty(_platformViewIdIndex);
   void _markPlatformViewIdDirty() {
     _dirtyFields |= _platformViewIdIndex;
   }
@@ -765,9 +1090,6 @@ class SemanticsObject {
   /// Controls the semantics tree that this node participates in.
   final EngineSemanticsOwner owner;
 
-  /// The DOM element used to convey semantics information to the browser.
-  final DomElement element = domDocument.createElement('flt-semantics');
-
   /// Bitfield showing which fields have been updated but have not yet been
   /// applied to the DOM.
   ///
@@ -780,6 +1102,9 @@ class SemanticsObject {
   /// Whether the field corresponding to the [fieldIndex] has been updated.
   bool _isDirty(int fieldIndex) => (_dirtyFields & fieldIndex) != 0;
 
+  /// The dom element of this semantics object.
+  DomElement get element => primaryRole!.element;
+
   /// Returns the HTML element that contains the HTML elements of direct
   /// children of this object.
   ///
@@ -808,6 +1133,15 @@ class SemanticsObject {
   DomElement? _childContainerElement;
 
   /// The parent of this semantics object.
+  ///
+  /// This value is not final until the tree is finalized. It is not safe to
+  /// rely on this value in the middle of a semantics tree update. It is safe to
+  /// use this value in post-update callback (see [SemanticsUpdatePhase] and
+  /// [EngineSemanticsOwner.addOneTimePostUpdateCallback]).
+  SemanticsObject? get parent {
+    assert(owner.phase == SemanticsUpdatePhase.postUpdate);
+    return _parent;
+  }
   SemanticsObject? _parent;
 
   /// Whether this node currently has a given [SemanticsFlag].
@@ -816,18 +1150,37 @@ class SemanticsObject {
   /// Whether [actions] contains the given action.
   bool hasAction(ui.SemanticsAction action) => (_actions! & action.index) != 0;
 
+  /// Whether this object represents a widget that can receive input focus.
+  bool get isFocusable => hasFlag(ui.SemanticsFlag.isFocusable);
+
+  /// Whether this object currently has input focus.
+  ///
+  /// This value only makes sense if [isFocusable] is true.
+  bool get hasFocus => hasFlag(ui.SemanticsFlag.isFocused);
+
+  /// Whether this object can be in one of "enabled" or "disabled" state.
+  ///
+  /// If this is true, [isEnabled] communicates the state.
+  bool get hasEnabledState => hasFlag(ui.SemanticsFlag.hasEnabledState);
+
+  /// Whether this object is enabled.
+  ///
+  /// This field is only meaningful if [hasEnabledState] is true.
+  bool get isEnabled => hasFlag(ui.SemanticsFlag.isEnabled);
+
   /// Whether this object represents a vertically scrollable area.
   bool get isVerticalScrollContainer =>
       hasAction(ui.SemanticsAction.scrollDown) ||
       hasAction(ui.SemanticsAction.scrollUp);
 
-  bool get hasFocus => hasFlag(ui.SemanticsFlag.isFocused);
-
-  /// Whether this object represents a hotizontally scrollable area.
+  /// Whether this object represents a horizontally scrollable area.
   bool get isHorizontalScrollContainer =>
       hasAction(ui.SemanticsAction.scrollLeft) ||
       hasAction(ui.SemanticsAction.scrollRight);
 
+  /// Whether this object represents a scrollable area in any direction.
+  bool get isScrollContainer => isVerticalScrollContainer || isHorizontalScrollContainer;
+
   /// Whether this object has a non-empty list of children.
   bool get hasChildren =>
       _childrenInTraversalOrder != null && _childrenInTraversalOrder!.isNotEmpty;
@@ -835,6 +1188,9 @@ class SemanticsObject {
   /// Whether this object represents an editable text field.
   bool get isTextField => hasFlag(ui.SemanticsFlag.isTextField);
 
+    /// Whether this object represents an editable text field.
+  bool get isLink => hasFlag(ui.SemanticsFlag.isLink);
+
   /// Whether this object needs screen readers attention right away.
   bool get isLiveRegion =>
       hasFlag(ui.SemanticsFlag.isLiveRegion) &&
@@ -843,8 +1199,18 @@ class SemanticsObject {
   /// Whether this object represents an image with no tappable functionality.
   bool get isVisualOnly =>
       hasFlag(ui.SemanticsFlag.isImage) &&
-      !hasAction(ui.SemanticsAction.tap) &&
-      !hasFlag(ui.SemanticsFlag.isButton);
+      !isTappable &&
+      !isButton;
+
+  /// Whether this node defines a scope for a route.
+  ///
+  /// See also [Role.dialog].
+  bool get scopesRoute => hasFlag(ui.SemanticsFlag.scopesRoute);
+
+  /// Whether this node describes a route.
+  ///
+  /// See also [Role.dialog].
+  bool get namesRoute => hasFlag(ui.SemanticsFlag.namesRoute);
 
   /// Whether this object carry enabled/disabled state (and if so whether it is
   /// enabled).
@@ -869,7 +1235,6 @@ class SemanticsObject {
   void updateSelf(SemanticsNodeUpdate update) {
     // Update all field values and their corresponding dirty flags before
     // applying the updates to the DOM.
-    assert(update.flags != null);
     if (_flags != update.flags) {
       _flags = update.flags;
       _markFlagsDirty();
@@ -1203,81 +1568,97 @@ class SemanticsObject {
     _currentChildrenInRenderOrder = childrenInRenderOrder;
   }
 
-  /// Populates the HTML "role" attribute based on a [condition].
-  ///
-  /// If [condition] is true, sets the value to [ariaRoleName].
+  /// The primary role of this node.
   ///
-  /// If [condition] is false, removes the HTML "role" attribute from [element]
-  /// if the current role is set to [ariaRoleName]. Otherwise, leaves the value
-  /// unchanged. This is done to gracefully handle multiple competing roles.
-  /// For example, if the role changes from "button" to "img" and tappable role
-  /// manager attempts to clean up after the image role manager applied the new
-  /// role, semantics avoids erasing the new role.
-  void setAriaRole(String ariaRoleName, bool condition) {
-    if (condition) {
-      element.setAttribute('role', ariaRoleName);
-    } else if (element.getAttribute('role') == ariaRoleName) {
-      element.removeAttribute('role');
+  /// The primary role is assigned by [updateSelf] based on the combination of
+  /// semantics flags and actions.
+  PrimaryRoleManager? primaryRole;
+
+  PrimaryRole _getPrimaryRoleIdentifier() {
+    // The most specific role should take precedence.
+    if (isPlatformView) {
+      return PrimaryRole.platformView;
+    } else if (isTextField) {
+      return PrimaryRole.textField;
+    } else if (isIncrementable) {
+      return PrimaryRole.incrementable;
+    } else if (isVisualOnly) {
+      return PrimaryRole.image;
+    } else if (isCheckable) {
+      return PrimaryRole.checkable;
+    } else if (isButton) {
+      return PrimaryRole.button;
+    } else if (isScrollContainer) {
+      return PrimaryRole.scrollable;
+    } else if (scopesRoute) {
+      return PrimaryRole.dialog;
+    } else if (isLink) {
+      return PrimaryRole.link;
+    } else {
+      return PrimaryRole.generic;
     }
   }
 
-  /// Removes the `role` HTML attribue, if any.
-  void clearAriaRole() {
-    element.removeAttribute('role');
+  PrimaryRoleManager _createPrimaryRole(PrimaryRole role) {
+    return switch (role) {
+      PrimaryRole.textField => TextField(this),
+      PrimaryRole.scrollable => Scrollable(this),
+      PrimaryRole.incrementable => Incrementable(this),
+      PrimaryRole.button => Button(this),
+      PrimaryRole.checkable => Checkable(this),
+      PrimaryRole.dialog => Dialog(this),
+      PrimaryRole.image => ImageRoleManager(this),
+      PrimaryRole.platformView => PlatformViewRoleManager(this),
+      PrimaryRole.link => Link(this),
+      PrimaryRole.generic => GenericRole(this),
+    };
   }
 
-  /// Role managers.
-  ///
-  /// The [_roleManagers] map needs to have a stable order for easier debugging
-  /// and testing. Dart's map literal guarantees the order as described in the
-  /// spec:
-  ///
-  /// > A map literal is ordered: iterating over the keys and/or values of the maps always happens in the order the keys appeared in the source code.
-  final Map<Role, RoleManager?> _roleManagers = <Role, RoleManager?>{};
+  /// Detects the roles that this semantics object corresponds to and asks the
+  /// respective role managers to update the DOM.
+  void _updateRoles() {
+    PrimaryRoleManager? currentPrimaryRole = primaryRole;
+    final PrimaryRole roleId = _getPrimaryRoleIdentifier();
+    final DomElement? previousElement = primaryRole?.element;
+
+    if (currentPrimaryRole != null) {
+      if (currentPrimaryRole.role == roleId) {
+        // Already has a primary role assigned and the role is the same as before,
+        // so simply perform an update.
+        currentPrimaryRole.update();
+        return;
+      } else {
+        // Role changed. This should be avoided as much as possible, but the
+        // web engine will attempt a best with the switch by cleaning old ARIA
+        // role data and start anew.
+        currentPrimaryRole.dispose();
+        currentPrimaryRole = null;
+        primaryRole = null;
+      }
+    }
 
-  /// Returns the role manager for the given [role].
-  ///
-  /// If a role manager does not exist for the given role, returns null.
-  RoleManager? debugRoleManagerFor(Role role) => _roleManagers[role];
+    // This handles two cases:
+    //  * The node was just created and needs a primary role manager.
+    //  * (Uncommon) the node changed its primary role, its previous primary
+    //    role manager was disposed of, and now it needs a new one.
+    if (currentPrimaryRole == null) {
+      currentPrimaryRole = _createPrimaryRole(roleId);
+      primaryRole = currentPrimaryRole;
+      currentPrimaryRole.update();
+    }
 
-  /// Detects the roles that this semantics object corresponds to and manages
-  /// the lifecycles of [SemanticsObjectRole] objects.
-  void _updateRoles() {
-    _updateRole(Role.labelAndValue, (hasLabel || hasValue || hasTooltip) && !isTextField && !isVisualOnly);
-    _updateRole(Role.textField, isTextField);
-
-    final bool shouldUseTappableRole =
-      (hasAction(ui.SemanticsAction.tap) || hasFlag(ui.SemanticsFlag.isButton)) &&
-      // Text fields manage their own focus/tap interactions. Tappable role
-      // manager is not needed. It only confuses AT.
-      !isTextField;
-
-    _updateRole(Role.tappable, shouldUseTappableRole);
-    _updateRole(Role.incrementable, isIncrementable);
-    _updateRole(Role.scrollable,
-        isVerticalScrollContainer || isHorizontalScrollContainer);
-    _updateRole(
-        Role.checkable,
-        hasFlag(ui.SemanticsFlag.hasCheckedState) ||
-            hasFlag(ui.SemanticsFlag.hasToggledState));
-    _updateRole(Role.image, isVisualOnly);
-    _updateRole(Role.liveRegion, isLiveRegion);
-  }
-
-  void _updateRole(Role role, bool enabled) {
-    RoleManager? manager = _roleManagers[role];
-    if (enabled) {
-      if (manager == null) {
-        manager = _roleFactories[role]!(this);
-        _roleManagers[role] = manager;
+    // Reparent element.
+    if (previousElement != element) {
+      final DomElement? container = _childContainerElement;
+      if (container != null) {
+        element.append(container);
+      }
+      final DomElement? parent = previousElement?.parent;
+      if (parent != null) {
+        parent.insertBefore(element, previousElement);
+        previousElement!.remove();
       }
-      manager.update();
-    } else if (manager != null) {
-      manager.dispose();
-      _roleManagers.remove(role);
     }
-    // Nothing to do in the "else case". There's no existing role manager to
-    // disable.
   }
 
   /// Whether the object represents an UI element with "increase" or "decrease"
@@ -1288,6 +1669,17 @@ class SemanticsObject {
       hasAction(ui.SemanticsAction.increase) ||
       hasAction(ui.SemanticsAction.decrease);
 
+  /// Whether the object represents a button.
+  bool get isButton => hasFlag(ui.SemanticsFlag.isButton);
+
+  /// Represents a tappable or clickable widget, such as button, icon button,
+  /// "hamburger" menu, etc.
+  bool get isTappable => hasAction(ui.SemanticsAction.tap);
+
+  bool get isCheckable =>
+      hasFlag(ui.SemanticsFlag.hasCheckedState) ||
+      hasFlag(ui.SemanticsFlag.hasToggledState);
+
   /// Role-specific adjustment of the vertical position of the child container.
   ///
   /// This is used, for example, by the [Scrollable] to compensate for the
@@ -1395,17 +1787,87 @@ class SemanticsObject {
     }
   }
 
+  /// Recursively visits the tree rooted at `this` node in depth-first fashion
+  /// in the order nodes were rendered into the DOM.
+  ///
+  /// Useful for debugging only.
+  ///
+  /// Calls the [callback] for `this` node, then for all of its descendants.
+  ///
+  /// Unlike [visitDepthFirstInTraversalOrder] this method can traverse
+  /// partially updated, incomplete, or inconsistent tree.
+  void _debugVisitRenderedSemanticNodesDepthFirst(void Function(SemanticsObject) callback) {
+    callback(this);
+    _currentChildrenInRenderOrder?.forEach((SemanticsObject child) {
+      child._debugVisitRenderedSemanticNodesDepthFirst(callback);
+    });
+  }
+
+  /// Recursively visits the tree rooted at `this` node in depth-first fashion
+  /// in traversal order.
+  ///
+  /// Calls the [callback] for `this` node, then for all of its descendants. If
+  /// the callback returns true, continues visiting descendants. Otherwise,
+  /// stops immediately after visiting the node that caused the callback to
+  /// return false.
+  void visitDepthFirstInTraversalOrder(bool Function(SemanticsObject) callback) {
+    _visitDepthFirstInTraversalOrder(callback);
+  }
+
+  bool _visitDepthFirstInTraversalOrder(bool Function(SemanticsObject) callback) {
+    final bool shouldContinueVisiting = callback(this);
+
+    if (!shouldContinueVisiting) {
+      return false;
+    }
+
+    final Int32List? childrenInTraversalOrder = _childrenInTraversalOrder;
+
+    if (childrenInTraversalOrder == null) {
+      return true;
+    }
+
+    for (final int childId in childrenInTraversalOrder) {
+      final SemanticsObject? child = owner._semanticsTree[childId];
+
+      assert(
+        child != null,
+        'visitDepthFirstInTraversalOrder must only be called after the node '
+        'tree has been established. However, child #$childId does not have its '
+        'SemanticsNode created at the time this method was called.',
+      );
+
+      if (!child!._visitDepthFirstInTraversalOrder(callback)) {
+        return false;
+      }
+    }
+
+    return true;
+  }
+
   @override
   String toString() {
-    if (assertionsEnabled) {
+    String result = super.toString();
+    assert(() {
       final String children = _childrenInTraversalOrder != null &&
               _childrenInTraversalOrder!.isNotEmpty
           ? '[${_childrenInTraversalOrder!.join(', ')}]'
           : '<empty>';
-      return '$runtimeType(#$id, children: $children)';
-    } else {
-      return super.toString();
-    }
+      result = '$runtimeType(#$id, children: $children)';
+      return true;
+    }());
+    return result;
+  }
+
+  bool _isDisposed = false;
+
+  void dispose() {
+    assert(!_isDisposed);
+    _isDisposed = true;
+    element.remove();
+    _parent = null;
+    primaryRole?.dispose();
+    primaryRole = null;
   }
 }
 
@@ -1438,20 +1900,43 @@ enum GestureMode {
   browserGestures,
 }
 
-/// The top-level service that manages everything semantics-related.
-class EngineSemanticsOwner {
-  EngineSemanticsOwner._() {
-    registerHotRestartListener(() {
-      _rootSemanticsElement?.remove();
-    });
-  }
+/// The current phase of the semantic update.
+enum SemanticsUpdatePhase {
+  /// No update is in progress.
+  ///
+  /// When the semantics owner receives an update, it enters the [updating]
+  /// phase from the idle phase.
+  idle,
+
+  /// Updating individual [SemanticsObject] nodes by calling
+  /// [RoleManager.update] and fixing parent-child relationships.
+  ///
+  /// After this phase is done, the owner enters the [postUpdate] phase.
+  updating,
+
+  /// Post-update callbacks are being called.
+  ///
+  /// At this point all nodes have been updated, the parent child hierarchy has
+  /// been established, the DOM tree is in sync with the semantics tree, and
+  /// [RoleManager.dispose] has been called on removed nodes.
+  ///
+  /// After this phase is done, the owner switches back to [idle].
+  postUpdate,
+}
+
+/// The semantics system of the Web Engine.
+///
+/// Maintains global properties and behaviors of semantics in the engine, such
+/// as whether semantics is currently enabled or disabled.
+class EngineSemantics {
+  EngineSemantics._();
 
   /// The singleton instance that manages semantics.
-  static EngineSemanticsOwner get instance {
-    return _instance ??= EngineSemanticsOwner._();
+  static EngineSemantics get instance {
+    return _instance ??= EngineSemantics._();
   }
 
-  static EngineSemanticsOwner? _instance;
+  static EngineSemantics? _instance;
 
   /// Disables semantics and uninitializes the singleton [instance].
   ///
@@ -1466,106 +1951,6 @@ class EngineSemanticsOwner {
     _instance = null;
   }
 
-  final Map<int, SemanticsObject> _semanticsTree = <int, SemanticsObject>{};
-
-  /// Map [SemanticsObject.id] to parent [SemanticsObject] it was attached to
-  /// this frame.
-  Map<int?, SemanticsObject> _attachments = <int?, SemanticsObject>{};
-
-  /// Declares that the [child] must be attached to the [parent].
-  ///
-  /// Attachments take precedence over detachments (see [_detachObject]). This
-  /// allows the same node to be detached from one parent in the tree and
-  /// reattached to another parent.
-  void _attachObject({required SemanticsObject parent, required SemanticsObject child}) {
-    assert(child != null);
-    assert(parent != null);
-    child._parent = parent;
-    _attachments[child.id] = parent;
-  }
-
-  /// List of objects that were detached this frame.
-  ///
-  /// The objects in this list will be detached permanently unless they are
-  /// reattached via the [_attachObject] method.
-  List<SemanticsObject?> _detachments = <SemanticsObject?>[];
-
-  /// Declares that the [SemanticsObject] with the given [id] was detached from
-  /// its current parent object.
-  ///
-  /// The object will be detached permanently unless it is reattached via the
-  /// [_attachObject] method.
-  void _detachObject(int? id) {
-    assert(_semanticsTree.containsKey(id));
-    final SemanticsObject? object = _semanticsTree[id];
-    _detachments.add(object);
-  }
-
-  /// Callbacks called after all objects in the tree have their properties
-  /// populated and their sizes and locations computed.
-  ///
-  /// This list is reset to empty after all callbacks are called.
-  List<ui.VoidCallback> _oneTimePostUpdateCallbacks = <ui.VoidCallback>[];
-
-  /// Schedules a one-time callback to be called after all objects in the tree
-  /// have their properties populated and their sizes and locations computed.
-  void addOneTimePostUpdateCallback(ui.VoidCallback callback) {
-    _oneTimePostUpdateCallbacks.add(callback);
-  }
-
-  /// Reconciles [_attachments] and [_detachments], and after that calls all
-  /// the one-time callbacks scheduled via the [addOneTimePostUpdateCallback]
-  /// method.
-  void _finalizeTree() {
-    for (final SemanticsObject? object in _detachments) {
-      final SemanticsObject? parent = _attachments[object!.id];
-      if (parent == null) {
-        // Was not reparented and is removed permanently from the tree.
-        _semanticsTree.remove(object.id);
-        object._parent = null;
-        object.element.remove();
-      } else {
-        assert(object._parent == parent);
-        assert(object.element.parentNode == parent._childContainerElement);
-      }
-    }
-    _detachments = <SemanticsObject?>[];
-    _attachments = <int?, SemanticsObject>{};
-
-    if (_oneTimePostUpdateCallbacks.isNotEmpty) {
-      for (final ui.VoidCallback callback in _oneTimePostUpdateCallbacks) {
-        callback();
-      }
-      _oneTimePostUpdateCallbacks = <ui.VoidCallback>[];
-    }
-  }
-
-  /// Returns the entire semantics tree for testing.
-  ///
-  /// Works only in debug mode.
-  Map<int, SemanticsObject>? get debugSemanticsTree {
-    Map<int, SemanticsObject>? result;
-    assert(() {
-      result = _semanticsTree;
-      return true;
-    }());
-    return result;
-  }
-
-  /// The top-level DOM element of the semantics DOM element tree.
-  DomElement? _rootSemanticsElement;
-  TimestampFunction _now = () => DateTime.now();
-
-  void debugOverrideTimestampFunction(TimestampFunction value) {
-    _now = value;
-  }
-
-  void debugResetTimestampFunction() {
-    _now = () => DateTime.now();
-  }
-
-  final SemanticsHelper semanticsHelper = SemanticsHelper();
-
   /// Whether the user has requested that [updateSemantics] be called when the
   /// semantic contents of window changes.
   ///
@@ -1583,7 +1968,7 @@ class EngineSemanticsOwner {
     final EngineAccessibilityFeatures original =
         EnginePlatformDispatcher.instance.configuration.accessibilityFeatures
         as EngineAccessibilityFeatures;
-    final ui.PlatformConfiguration newConfiguration =
+    final PlatformConfiguration newConfiguration =
         EnginePlatformDispatcher.instance.configuration.copyWith(
             accessibilityFeatures:
                 original.copyWith(accessibleNavigation: value));
@@ -1599,30 +1984,59 @@ class EngineSemanticsOwner {
         _gestureMode = GestureMode.pointerEvents;
         _notifyGestureModeListeners();
       }
-      final List<int?> keys = _semanticsTree.keys.toList();
-      final int len = keys.length;
-      for (int i = 0; i < len; i++) {
-        _detachObject(keys[i]);
+      for (final EngineFlutterView view in EnginePlatformDispatcher.instance.views) {
+        view.semantics.reset();
       }
-      _finalizeTree();
-      _rootSemanticsElement?.remove();
-      _rootSemanticsElement = null;
       _gestureModeClock?.datetime = null;
     }
     EnginePlatformDispatcher.instance.updateSemanticsEnabled(_semanticsEnabled);
   }
 
+  /// Prepares the semantics system for a semantic tree update.
+  ///
+  /// This method must be called prior to updating the semantics inside any
+  /// individual view.
+  ///
+  /// Automatically enables semantics in a production setting. In Flutter test
+  /// environment keeps engine semantics turned off due to tests frequently
+  /// sending inconsistent semantics updates.
+  ///
+  /// The caller is expected to check if [semanticsEnabled] is true prior to
+  /// actually updating the semantic DOM.
+  void didReceiveSemanticsUpdate() {
+    if (!_semanticsEnabled) {
+      if (ui_web.debugEmulateFlutterTesterEnvironment) {
+        // Running Flutter widget tests in a fake environment. Don't enable
+        // engine semantics. Test semantics trees violate invariants in ways
+        // production implementation isn't built to handle. For example, tests
+        // routinely reset semantics node IDs, which is messing up the update
+        // process.
+        return;
+      } else {
+        // Running a real app. Auto-enable engine semantics.
+        semanticsHelper.dispose(); // placeholder no longer needed
+        semanticsEnabled = true;
+      }
+    }
+  }
+
+  TimestampFunction _now = () => DateTime.now();
+
+  void debugOverrideTimestampFunction(TimestampFunction value) {
+    _now = value;
+  }
+
+  void debugResetTimestampFunction() {
+    _now = () => DateTime.now();
+  }
+
+  final SemanticsHelper semanticsHelper = SemanticsHelper();
+
   /// Controls how pointer events and browser-detected gestures are treated by
   /// the Web Engine.
   ///
   /// The default mode is [AccessibilityMode.unknown].
-  AccessibilityMode get mode => _mode;
-  set mode(AccessibilityMode value) {
-    assert(value != null);
-    _mode = value;
-  }
-
-  AccessibilityMode _mode = AccessibilityMode.unknown;
+  AccessibilityMode mode = AccessibilityMode.unknown;
 
   /// Currently used [GestureMode].
   ///
@@ -1664,8 +2078,9 @@ class EngineSemanticsOwner {
   }
 
   /// Receives DOM events from the pointer event system to correlate with the
-  /// semantics events; returns true if the event should be forwarded to the
-  /// framework.
+  /// semantics events.
+  ///
+  /// Returns true if the event should be forwarded to the framework.
   ///
   /// The browser sends us both raw pointer events and gestures from
   /// [SemanticsObject.element]s. There could be three possibilities:
@@ -1727,14 +2142,14 @@ class EngineSemanticsOwner {
   /// Callbacks are called synchronously. HTML DOM updates made in a callback
   /// take effect in the current animation frame and/or the current message loop
   /// event.
-  final List<GestureModeCallback?> _gestureModeListeners = <GestureModeCallback?>[];
+  final List<GestureModeCallback> _gestureModeListeners = <GestureModeCallback>[];
 
   /// Calls the [callback] every time the current [GestureMode] changes.
   ///
   /// The callback is called synchronously. HTML DOM updates made in the
   /// callback take effect in the current animation frame and/or the current
   /// message loop event.
-  void addGestureModeListener(GestureModeCallback? callback) {
+  void addGestureModeListener(GestureModeCallback callback) {
     _gestureModeListeners.add(callback);
   }
 
@@ -1742,14 +2157,14 @@ class EngineSemanticsOwner {
   ///
   /// The passed [callback] must be the exact same object as the one passed to
   /// [addGestureModeListener].
-  void removeGestureModeListener(GestureModeCallback? callback) {
+  void removeGestureModeListener(GestureModeCallback callback) {
     assert(_gestureModeListeners.contains(callback));
     _gestureModeListeners.remove(callback);
   }
 
   void _notifyGestureModeListeners() {
     for (int i = 0; i < _gestureModeListeners.length; i++) {
-      _gestureModeListeners[i]!(_gestureMode);
+      _gestureModeListeners[i](_gestureMode);
     }
   }
 
@@ -1764,7 +2179,7 @@ class EngineSemanticsOwner {
   /// not accompanied by pointer events. In the presence of pointer events,
   /// delegate to Flutter's gesture detection system to produce gestures.
   bool shouldAcceptBrowserGesture(String eventType) {
-    if (_mode == AccessibilityMode.known) {
+    if (mode == AccessibilityMode.known) {
       // Do not ignore accessibility gestures in known mode, unless semantics
       // is explicitly disabled.
       return semanticsEnabled;
@@ -1781,6 +2196,142 @@ class EngineSemanticsOwner {
 
     return false;
   }
+}
+
+/// The top-level service that manages everything semantics-related.
+class EngineSemanticsOwner {
+  EngineSemanticsOwner(this.semanticsHost) {
+    registerHotRestartListener(() {
+      _rootSemanticsElement?.remove();
+    });
+  }
+
+  /// The permanent element in the view's DOM structure that hosts the semantics
+  /// tree.
+  ///
+  /// The only child of this element is the [rootSemanticsElement]. Unlike the
+  /// root element, this element is never replaced. It is always part of the
+  /// DOM structure of the respective [FlutterView].
+  // TODO(yjbanov): rename to hostElement
+  final DomElement semanticsHost;
+
+  /// The DOM element corresponding to the root semantics node in the semantics
+  /// tree.
+  ///
+  /// This element is the direct child of the [semanticsHost] and it is
+  /// replaceable.
+  // TODO(yjbanov): rename to rootElement
+  DomElement? get rootSemanticsElement => _rootSemanticsElement;
+  DomElement? _rootSemanticsElement;
+
+  /// The current update phase of this semantics owner.
+  SemanticsUpdatePhase get phase => _phase;
+  SemanticsUpdatePhase _phase = SemanticsUpdatePhase.idle;
+
+  final Map<int, SemanticsObject> _semanticsTree = <int, SemanticsObject>{};
+
+  /// Map [SemanticsObject.id] to parent [SemanticsObject] it was attached to
+  /// this frame.
+  Map<int, SemanticsObject> _attachments = <int, SemanticsObject>{};
+
+  /// Declares that the [child] must be attached to the [parent].
+  ///
+  /// Attachments take precedence over detachments (see [_detachObject]). This
+  /// allows the same node to be detached from one parent in the tree and
+  /// reattached to another parent.
+  void _attachObject({required SemanticsObject parent, required SemanticsObject child}) {
+    child._parent = parent;
+    _attachments[child.id] = parent;
+  }
+
+  /// List of objects that were detached this frame.
+  ///
+  /// The objects in this list will be detached permanently unless they are
+  /// reattached via the [_attachObject] method.
+  List<SemanticsObject> _detachments = <SemanticsObject>[];
+
+  /// Declares that the [SemanticsObject] with the given [id] was detached from
+  /// its current parent object.
+  ///
+  /// The object will be detached permanently unless it is reattached via the
+  /// [_attachObject] method.
+  void _detachObject(int id) {
+    final SemanticsObject? object = _semanticsTree[id];
+    assert(object != null);
+    if (object != null) {
+      _detachments.add(object);
+    }
+  }
+
+  /// Callbacks called after all objects in the tree have their properties
+  /// populated and their sizes and locations computed.
+  ///
+  /// This list is reset to empty after all callbacks are called.
+  List<ui.VoidCallback> _oneTimePostUpdateCallbacks = <ui.VoidCallback>[];
+
+  /// Schedules a one-time callback to be called after all objects in the tree
+  /// have their properties populated and their sizes and locations computed.
+  void addOneTimePostUpdateCallback(ui.VoidCallback callback) {
+    _oneTimePostUpdateCallbacks.add(callback);
+  }
+
+  /// Reconciles [_attachments] and [_detachments], and after that calls all
+  /// the one-time callbacks scheduled via the [addOneTimePostUpdateCallback]
+  /// method.
+  void _finalizeTree() {
+    // Collect all nodes that need to be permanently removed, i.e. nodes that
+    // were detached from their parent, but not reattached to another parent.
+    final Set<SemanticsObject> removals = <SemanticsObject>{};
+    for (final SemanticsObject detachmentRoot in _detachments) {
+      // A detached node may or may not have some of its descendants reattached
+      // elsewhere. Walk the descendant tree and find all descendants that were
+      // reattached to a parent. Those descendants need to be removed.
+      detachmentRoot.visitDepthFirstInTraversalOrder((SemanticsObject node) {
+        final SemanticsObject? parent = _attachments[node.id];
+        if (parent == null) {
+          // Was not reparented and is removed permanently from the tree.
+          removals.add(node);
+        } else {
+          assert(node._parent == parent);
+          assert(node.element.parentNode == parent._childContainerElement);
+        }
+        return true;
+      });
+    }
+
+    for (final SemanticsObject removal in removals) {
+      _semanticsTree.remove(removal.id);
+      removal.dispose();
+    }
+
+    _detachments = <SemanticsObject>[];
+    _attachments = <int, SemanticsObject>{};
+
+    _phase = SemanticsUpdatePhase.postUpdate;
+    try {
+      if (_oneTimePostUpdateCallbacks.isNotEmpty) {
+        for (final ui.VoidCallback callback in _oneTimePostUpdateCallbacks) {
+          callback();
+        }
+        _oneTimePostUpdateCallbacks = <ui.VoidCallback>[];
+      }
+    } finally {
+      _phase = SemanticsUpdatePhase.idle;
+    }
+    _hasNodeRequestingFocus = false;
+  }
+
+  /// Returns the entire semantics tree for testing.
+  ///
+  /// Works only in debug mode.
+  Map<int, SemanticsObject>? get debugSemanticsTree {
+    Map<int, SemanticsObject>? result;
+    assert(() {
+      result = _semanticsTree;
+      return true;
+    }());
+    return result;
+  }
 
   /// Looks up a [SemanticsObject] in the semantics tree by ID, or creates a new
   /// instance if it does not exist.
@@ -1793,52 +2344,92 @@ class EngineSemanticsOwner {
     return object;
   }
 
+  // Checks the consistency of the semantics node tree against the {ID: node}
+  // map. The two must be in total agreement. Every node in the map must be
+  // somewhere in the tree.
+  (bool, String) _computeNodeMapConsistencyMessage() {
+    final Map<int, List<int>> liveIds = <int, List<int>>{};
+
+    final SemanticsObject? root = _semanticsTree[0];
+    if (root != null) {
+      root._debugVisitRenderedSemanticNodesDepthFirst((SemanticsObject child) {
+        liveIds[child.id] = child._childrenInTraversalOrder?.toList() ?? const <int>[];
+      });
+    }
+
+    final bool isConsistent = _semanticsTree.keys.every(liveIds.keys.contains);
+    final String heading = 'The semantics node map is ${isConsistent ? 'consistent' : 'inconsistent'}';
+    final StringBuffer message = StringBuffer('$heading:\n');
+    message.writeln('  Nodes in tree:');
+    for (final MapEntry<int, List<int>> entry in liveIds.entries) {
+      message.writeln('    ${entry.key}: ${entry.value}');
+    }
+    message.writeln('  Nodes in map: [${_semanticsTree.keys.join(', ')}]');
+
+    return (isConsistent, message.toString());
+  }
+
   /// Updates the semantics tree from data in the [uiUpdate].
   void updateSemantics(ui.SemanticsUpdate uiUpdate) {
-    if (!_semanticsEnabled) {
-      if (ui.debugEmulateFlutterTesterEnvironment) {
-        // Running Flutter widget tests in a fake environment. Don't enable
-        // engine semantics. Test semantics trees violate invariants in ways
-        // production implementation isn't built to handle. For example, tests
-        // routinely reset semantics node IDs, which is messing up the update
-        // process.
-        return;
-      } else {
-        // Running a real app. Auto-enable engine semantics.
-        semanticsHelper.dispose(); // placeholder no longer needed
-        semanticsEnabled = true;
-      }
+    EngineSemantics.instance.didReceiveSemanticsUpdate();
+
+    if (!EngineSemantics.instance.semanticsEnabled) {
+      return;
     }
 
+    (bool, String)? preUpdateNodeMapConsistency;
+    assert(() {
+      preUpdateNodeMapConsistency = _computeNodeMapConsistencyMessage();
+      return true;
+    }());
+
+    _phase = SemanticsUpdatePhase.updating;
     final SemanticsUpdate update = uiUpdate as SemanticsUpdate;
 
     // First, update each object's information about itself. This information is
     // later used to fix the parent-child and sibling relationships between
     // objects.
-    for (final SemanticsNodeUpdate nodeUpdate in update._nodeUpdates!) {
+    final List<SemanticsNodeUpdate> nodeUpdates = update._nodeUpdates!;
+    for (final SemanticsNodeUpdate nodeUpdate in nodeUpdates) {
       final SemanticsObject object = getOrCreateObject(nodeUpdate.id);
       object.updateSelf(nodeUpdate);
     }
 
     // Second, fix the tree structure. This is moved out into its own loop,
     // because each object's own information must be updated first.
-    for (final SemanticsNodeUpdate nodeUpdate in update._nodeUpdates!) {
+    for (final SemanticsNodeUpdate nodeUpdate in nodeUpdates) {
       final SemanticsObject object = _semanticsTree[nodeUpdate.id]!;
       object.updateChildren();
       object._dirtyFields = 0;
     }
 
+    final SemanticsObject root = _semanticsTree[0]!;
     if (_rootSemanticsElement == null) {
-      final SemanticsObject root = _semanticsTree[0]!;
       _rootSemanticsElement = root.element;
-      flutterViewEmbedder.semanticsHostElement!.append(root.element);
+      semanticsHost.append(root.element);
     }
 
     _finalizeTree();
 
-    assert(_semanticsTree.containsKey(0)); // must contain root node
     assert(() {
-      // Validate tree
+      // Validate that the node map only contains live elements, i.e. descendants
+      // of the root node. If a node is not reachable from the root, it should
+      // have been removed from the map.
+      final (bool isConsistent, String description) = _computeNodeMapConsistencyMessage();
+      if (!isConsistent) {
+        // Use StateError because AssertionError escapes line breaks, but this
+        // error message is very detailed and it needs line breaks for
+        // legibility.
+        throw StateError('''
+Semantics node map was inconsistent after update:
+
+BEFORE: ${preUpdateNodeMapConsistency?.$2}
+
+AFTER: $description
+''');
+      }
+
+      // Validate that each node in the final tree is self-consistent.
       _semanticsTree.forEach((int? id, SemanticsObject object) {
         assert(id == object.id);
 
@@ -1871,14 +2462,61 @@ class EngineSemanticsOwner {
       });
 
       // Validate that all updates were applied
-      for (final SemanticsNodeUpdate update in update._nodeUpdates!) {
+      for (final SemanticsNodeUpdate update in nodeUpdates) {
         // Node was added to the tree.
         assert(_semanticsTree.containsKey(update.id));
       }
 
+      // Verify that `update._nodeUpdates` has not changed.
+      assert(identical(update._nodeUpdates, nodeUpdates));
+
       return true;
     }());
   }
+
+  /// Removes the semantics tree for this view from the page and collects all
+  /// resources.
+  ///
+  /// The object remains usable after this operation, but because the previous
+  /// semantics tree is completely removed, partial udpates will not succeed as
+  /// they rely on the prior state of the tree. There is no distinction between
+  /// a full update and partial update, so the failure may be cryptic.
+  void reset() {
+    final List<int> keys = _semanticsTree.keys.toList();
+    final int len = keys.length;
+    for (int i = 0; i < len; i++) {
+      _detachObject(keys[i]);
+    }
+    _finalizeTree();
+    _rootSemanticsElement?.remove();
+    _rootSemanticsElement = null;
+    _semanticsTree.clear();
+    _attachments.clear();
+    _detachments.clear();
+    _phase = SemanticsUpdatePhase.idle;
+    _oneTimePostUpdateCallbacks.clear();
+  }
+
+  /// True, if any semantics node requested focus explicitly during the latest
+  /// semantics update.
+  ///
+  /// The default value is `false`, and it is reset back to `false` after the
+  /// semantics update at the end of [updateSemantics].
+  ///
+  /// Since focus can only be taken by no more than one element, the engine
+  /// should not request focus for multiple elements. This flag helps resolve
+  /// that.
+  bool get hasNodeRequestingFocus => _hasNodeRequestingFocus;
+  bool _hasNodeRequestingFocus = false;
+
+  /// Declares that a semantics node will explicitly request focus.
+  ///
+  /// This prevents others, [Dialog] in particular, from requesting autofocus,
+  /// as focus can only be taken by one element. Explicit focus has higher
+  /// precedence than autofocus.
+  void willRequestFocus() {
+    _hasNodeRequestingFocus = true;
+  }
 }
 
 /// Computes the [longest increasing subsequence](http://en.wikipedia.org/wiki/Longest_increasing_subsequence).
diff --git a/lib/web_ui/lib/src/engine/semantics/semantics_helper.dart b/lib/web_ui/lib/src/engine/semantics/semantics_helper.dart
index 7741a8384da315a0c60ba10de2da88f92afecaad..ae256fb225dc19cfd41a26be81dece834f893389 100644
--- a/lib/web_ui/lib/src/engine/semantics/semantics_helper.dart
+++ b/lib/web_ui/lib/src/engine/semantics/semantics_helper.dart
@@ -8,7 +8,6 @@ import 'package:meta/meta.dart';
 
 import '../browser_detection.dart';
 import '../dom.dart';
-import '../safe_browser_api.dart';
 import 'semantics.dart';
 
 /// The maximum [semanticsActivationAttempts] before we give up waiting for
@@ -139,7 +138,7 @@ class DesktopSemanticsEnabler extends SemanticsEnabler {
       return true;
     }
 
-    if (EngineSemanticsOwner.instance.semanticsEnabled) {
+    if (EngineSemantics.instance.semanticsEnabled) {
       // Semantics already enabled, forward to framework as normal.
       return true;
     }
@@ -168,7 +167,7 @@ class DesktopSemanticsEnabler extends SemanticsEnabler {
       return true;
     }
 
-    EngineSemanticsOwner.instance.semanticsEnabled = true;
+    EngineSemantics.instance.semanticsEnabled = true;
     dispose();
     return false;
   }
@@ -180,7 +179,7 @@ class DesktopSemanticsEnabler extends SemanticsEnabler {
 
     // Only listen to "click" because other kinds of events are reported via
     // PointerBinding.
-    placeholder.addEventListener('click', allowInterop((DomEvent event) {
+    placeholder.addEventListener('click', createDomEventListener((DomEvent event) {
       tryEnableSemantics(event);
     }), true);
 
@@ -268,7 +267,7 @@ class MobileSemanticsEnabler extends SemanticsEnabler {
       return true;
     }
 
-    if (EngineSemanticsOwner.instance.semanticsEnabled) {
+    if (EngineSemantics.instance.semanticsEnabled) {
       // Semantics already enabled, forward to framework as normal.
       return true;
     }
@@ -327,17 +326,14 @@ class MobileSemanticsEnabler extends SemanticsEnabler {
       case 'click':
         final DomMouseEvent click = event as DomMouseEvent;
         activationPoint = click.offset;
-        break;
       case 'touchstart':
       case 'touchend':
         final DomTouchEvent touchEvent = event as DomTouchEvent;
-        activationPoint = touchEvent.changedTouches!.first.client;
-        break;
+        activationPoint = touchEvent.changedTouches.first.client;
       case 'pointerdown':
       case 'pointerup':
         final DomPointerEvent touch = event as DomPointerEvent;
         activationPoint = touch.client;
-        break;
       default:
         // The event is not relevant, forward to framework as normal.
         return true;
@@ -361,7 +357,7 @@ class MobileSemanticsEnabler extends SemanticsEnabler {
       _schedulePlaceholderRemoval = true;
       semanticsActivationTimer = Timer(_periodToConsumeEvents, () {
         dispose();
-        EngineSemanticsOwner.instance.semanticsEnabled = true;
+        EngineSemantics.instance.semanticsEnabled = true;
       });
       return false;
     }
@@ -377,7 +373,7 @@ class MobileSemanticsEnabler extends SemanticsEnabler {
 
     // Only listen to "click" because other kinds of events are reported via
     // PointerBinding.
-    placeholder.addEventListener('click', allowInterop((DomEvent event) {
+    placeholder.addEventListener('click', createDomEventListener((DomEvent event) {
       tryEnableSemantics(event);
     }), true);
 
diff --git a/lib/web_ui/lib/src/engine/semantics/tappable.dart b/lib/web_ui/lib/src/engine/semantics/tappable.dart
index 2c8ad8a6012df568b6a4d90cefbec1ce10308a72..f99faab8f55cf8c27b4311ccd16acd30c520476c 100644
--- a/lib/web_ui/lib/src/engine/semantics/tappable.dart
+++ b/lib/web_ui/lib/src/engine/semantics/tappable.dart
@@ -2,12 +2,34 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
 
-import '../dom.dart';
-import '../platform_dispatcher.dart';
-import '../safe_browser_api.dart';
-import 'semantics.dart';
+/// Sets the "button" ARIA role.
+class Button extends PrimaryRoleManager {
+  Button(SemanticsObject semanticsObject) : super.withBasics(
+    PrimaryRole.button,
+    semanticsObject,
+    labelRepresentation: LeafLabelRepresentation.domText,
+  ) {
+    addTappable();
+    setAriaRole('button');
+  }
+
+  @override
+  bool focusAsRouteDefault() => focusable?.focusAsRouteDefault() ?? false;
+
+  @override
+  void update() {
+    super.update();
+
+    if (semanticsObject.enabledState() == EnabledState.disabled) {
+      setAttribute('aria-disabled', 'true');
+    } else {
+      removeAttribute('aria-disabled');
+    }
+  }
+}
 
 /// Listens to HTML "click" gestures detected by the browser.
 ///
@@ -16,67 +38,46 @@ import 'semantics.dart';
 /// the browser may not send us pointer events. In that mode we forward HTML
 /// click as [ui.SemanticsAction.tap].
 class Tappable extends RoleManager {
-  Tappable(SemanticsObject semanticsObject)
-      : super(Role.tappable, semanticsObject);
+  Tappable(SemanticsObject semanticsObject, PrimaryRoleManager owner)
+      : super(Role.tappable, semanticsObject, owner) {
+    _clickListener = createDomEventListener((DomEvent click) {
+      PointerBinding.clickDebouncer.onClick(
+        click,
+        semanticsObject.id,
+        _isListening,
+      );
+    });
+    owner.element.addEventListener('click', _clickListener);
+  }
 
   DomEventListener? _clickListener;
+  bool _isListening = false;
 
   @override
   void update() {
-    final DomElement element = semanticsObject.element;
-
-    // "tab-index=0" is used to allow keyboard traversal of non-form elements.
-    // See also: https://developer.mozilla.org/en-US/docs/Web/Accessibility/Keyboard-navigable_JavaScript_widgets
-    element.tabIndex = 0;
-
-    semanticsObject.setAriaRole(
-        'button', semanticsObject.hasFlag(ui.SemanticsFlag.isButton));
-
-    // Add `aria-disabled` for disabled buttons.
-    if (semanticsObject.enabledState() == EnabledState.disabled &&
-        semanticsObject.hasFlag(ui.SemanticsFlag.isButton)) {
-      semanticsObject.element.setAttribute('aria-disabled', 'true');
-      _stopListening();
-    } else {
-      semanticsObject.element.removeAttribute('aria-disabled');
-      // Excluding text fields because text fields have browser-specific logic
-      // for recognizing taps and activating the keyboard.
-      if (semanticsObject.hasAction(ui.SemanticsAction.tap) &&
-          !semanticsObject.hasFlag(ui.SemanticsFlag.isTextField)) {
-        if (_clickListener == null) {
-          _clickListener = allowInterop((_) {
-            if (semanticsObject.owner.gestureMode !=
-                GestureMode.browserGestures) {
-              return;
-            }
-            EnginePlatformDispatcher.instance.invokeOnSemanticsAction(
-                semanticsObject.id, ui.SemanticsAction.tap, null);
-          });
-          element.addEventListener('click', _clickListener);
-        }
-      } else {
-        _stopListening();
-      }
-    }
-
-    // Request focus so that the AT shifts a11y focus to this node.
-    if (semanticsObject.isFlagsDirty && semanticsObject.hasFocus) {
-      element.focus();
+    final bool wasListening = _isListening;
+    _isListening = semanticsObject.enabledState() != EnabledState.disabled && semanticsObject.isTappable;
+    if (wasListening != _isListening) {
+      _updateAttribute();
     }
   }
 
-  void _stopListening() {
-    if (_clickListener == null) {
-      return;
+  void _updateAttribute() {
+    // The `flt-tappable` attribute marks the element for the ClickDebouncer to
+    // to know that it should debounce click events on this element. The
+    // contract is that the element that has this attribute is also the element
+    // that receives pointer and "click" events.
+    if (_isListening) {
+      owner.element.setAttribute('flt-tappable', '');
+    } else {
+      owner.element.removeAttribute('flt-tappable');
     }
-
-    semanticsObject.element.removeEventListener('click', _clickListener);
-    _clickListener = null;
   }
 
   @override
   void dispose() {
-    _stopListening();
-    semanticsObject.setAriaRole('button', false);
+    owner.removeEventListener('click', _clickListener);
+    _clickListener = null;
+    super.dispose();
   }
 }
diff --git a/lib/web_ui/lib/src/engine/semantics/text_field.dart b/lib/web_ui/lib/src/engine/semantics/text_field.dart
index 3e36ffb0ad0bddd43c1b4f909e1c6b7c37c556d5..2fb1cbea37b32b1e3d6694e36459e836eea61c00 100644
--- a/lib/web_ui/lib/src/engine/semantics/text_field.dart
+++ b/lib/web_ui/lib/src/engine/semantics/text_field.dart
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:async';
 import 'package:ui/ui.dart' as ui;
 
 import '../browser_detection.dart';
 import '../dom.dart';
 import '../platform_dispatcher.dart';
-import '../safe_browser_api.dart';
 import '../text_editing/text_editing.dart';
 import 'semantics.dart';
 
@@ -29,9 +29,10 @@ class SemanticsTextEditingStrategy extends DefaultTextEditingStrategy {
   /// Initializes the [SemanticsTextEditingStrategy] singleton.
   ///
   /// This method must be called prior to accessing [instance].
-  static SemanticsTextEditingStrategy ensureInitialized(HybridTextEditing owner) {
-    if (_instance != null && instance.owner == owner) {
-      return instance;
+  static SemanticsTextEditingStrategy ensureInitialized(
+      HybridTextEditing owner) {
+    if (_instance != null && _instance?.owner == owner) {
+      return _instance!;
     }
     return _instance = SemanticsTextEditingStrategy(owner);
   }
@@ -136,13 +137,13 @@ class SemanticsTextEditingStrategy extends DefaultTextEditingStrategy {
 
     // Subscribe to text and selection changes.
     subscriptions.add(
-        DomSubscription(activeDomElement, 'input', allowInterop(handleChange)));
+        DomSubscription(activeDomElement, 'input', handleChange));
     subscriptions.add(
         DomSubscription(activeDomElement, 'keydown',
-            allowInterop(maybeSendAction)));
+            maybeSendAction));
     subscriptions.add(
         DomSubscription(domDocument, 'selectionchange',
-            allowInterop(handleChange)));
+            handleChange));
     preventDefaultForMouseEvents();
   }
 
@@ -151,8 +152,6 @@ class SemanticsTextEditingStrategy extends DefaultTextEditingStrategy {
       {OnChangeCallback? onChange, OnActionCallback? onAction}) {
     isEnabled = true;
     inputConfiguration = inputConfig;
-    onChange = onChange;
-    onAction = onAction;
     applyConfiguration(inputConfig);
   }
 
@@ -205,35 +204,71 @@ class SemanticsTextEditingStrategy extends DefaultTextEditingStrategy {
 /// This role is implemented via a content-editable HTML element. This role does
 /// not proactively switch modes depending on the current
 /// [EngineSemanticsOwner.gestureMode]. However, in Chrome on Android it ignores
-/// browser gestures when in pointer mode. In Safari on iOS touch events are
+/// browser gestures when in pointer mode. In Safari on iOS pointer events are
 /// used to detect text box invocation. This is because Safari issues touch
 /// events even when Voiceover is enabled.
-class TextField extends RoleManager {
-  TextField(SemanticsObject semanticsObject)
-      : super(Role.textField, semanticsObject) {
-    editableElement =
-        semanticsObject.hasFlag(ui.SemanticsFlag.isMultiline)
-            ? createDomHTMLTextAreaElement()
-            : createDomHTMLInputElement();
+class TextField extends PrimaryRoleManager {
+  TextField(SemanticsObject semanticsObject) : super.blank(PrimaryRole.textField, semanticsObject) {
     _setupDomElement();
   }
 
   /// The element used for editing, e.g. `<input>`, `<textarea>`.
-  late final DomHTMLElement editableElement;
+  DomHTMLElement? editableElement;
+
+  /// Same as [editableElement] but null-checked.
+  DomHTMLElement get activeEditableElement {
+    assert(
+      editableElement != null,
+      'The textField does not have an active editable element',
+    );
+    return editableElement!;
+  }
+
+  @override
+  bool focusAsRouteDefault() {
+    final DomHTMLElement? editableElement = this.editableElement;
+    if (editableElement == null) {
+      return false;
+    }
+    editableElement.focus();
+    return true;
+  }
+
+  /// Timer that times when to set the location of the input text.
+  ///
+  /// This is only used for iOS. In iOS, virtual keyboard shifts the screen.
+  /// There is no callback to know if the keyboard is up and how much the screen
+  /// has shifted. Therefore instead of listening to the shift and passing this
+  /// information to Flutter Framework, we are trying to stop the shift.
+  ///
+  /// In iOS, the virtual keyboard shifts the screen up if the focused input
+  /// element is under the keyboard or very close to the keyboard. Before the
+  /// focus is called we are positioning it offscreen. The location of the input
+  /// in iOS is set to correct place, 100ms after focus. We use this timer for
+  /// timing this delay.
+  Timer? _positionInputElementTimer;
+  static const Duration _delayBeforePlacement = Duration(milliseconds: 100);
+
+  void _initializeEditableElement() {
+    assert(editableElement == null,
+        'Editable element has already been initialized');
+
+    editableElement = semanticsObject.hasFlag(ui.SemanticsFlag.isMultiline)
+        ? createDomHTMLTextAreaElement()
+        : createDomHTMLInputElement();
 
-  void _setupDomElement() {
     // On iOS, even though the semantic text field is transparent, the cursor
     // and text highlighting are still visible. The cursor and text selection
-    // are made invisible by CSS in [FlutterViewEmbedder.reset].
+    // are made invisible by CSS in [StyleManager.attachGlobalStyles].
     // But there's one more case where iOS highlights text. That's when there's
     // and autocorrect suggestion. To disable that, we have to do the following:
-    editableElement
+    activeEditableElement
       ..spellcheck = false
       ..setAttribute('autocorrect', 'off')
       ..setAttribute('autocomplete', 'off')
       ..setAttribute('data-semantics-role', 'text-field');
 
-    editableElement.style
+    activeEditableElement.style
       ..position = 'absolute'
       // `top` and `left` are intentionally set to zero here.
       //
@@ -248,16 +283,16 @@ class TextField extends RoleManager {
       ..left = '0'
       ..width = '${semanticsObject.rect!.width}px'
       ..height = '${semanticsObject.rect!.height}px';
-    semanticsObject.element.append(editableElement);
+    append(activeEditableElement);
+  }
 
+  void _setupDomElement() {
     switch (browserEngine) {
       case BrowserEngine.blink:
       case BrowserEngine.firefox:
         _initializeForBlink();
-        break;
       case BrowserEngine.webkit:
         _initializeForWebkit();
-        break;
     }
   }
 
@@ -266,40 +301,65 @@ class TextField extends RoleManager {
   /// When in browser gesture mode, the focus is forwarded to the framework as
   /// a tap to initialize editing.
   void _initializeForBlink() {
-    editableElement.addEventListener(
-        'focus', allowInterop((DomEvent event) {
-          if (semanticsObject.owner.gestureMode != GestureMode.browserGestures) {
+    _initializeEditableElement();
+    activeEditableElement.addEventListener('focus',
+        createDomEventListener((DomEvent event) {
+          if (EngineSemantics.instance.gestureMode != GestureMode.browserGestures) {
             return;
           }
 
           EnginePlatformDispatcher.instance.invokeOnSemanticsAction(
-              semanticsObject.id, ui.SemanticsAction.tap, null);
+              semanticsObject.id, ui.SemanticsAction.didGainAccessibilityFocus, null);
+        }));
+    activeEditableElement.addEventListener('blur',
+        createDomEventListener((DomEvent event) {
+          if (EngineSemantics.instance.gestureMode != GestureMode.browserGestures) {
+            return;
+          }
+
+          EnginePlatformDispatcher.instance.invokeOnSemanticsAction(
+              semanticsObject.id, ui.SemanticsAction.didLoseAccessibilityFocus, null);
         }));
   }
 
-  /// Safari on iOS reports text field activation via touch events.
+  /// Safari on iOS reports text field activation via pointer events.
   ///
-  /// This emulates a tap recognizer to detect the activation. Because touch
+  /// This emulates a tap recognizer to detect the activation. Because pointer
   /// events are present regardless of whether accessibility is enabled or not,
   /// this mode is always enabled.
+  ///
+  /// In iOS, the virtual keyboard shifts the screen up if the focused input
+  /// element is under the keyboard or very close to the keyboard. To avoid the shift,
+  /// the creation of the editable element is delayed until a tap is detected.
+  ///
+  /// In the absence of an editable DOM element, role of 'textbox' is assigned to the
+  /// semanticsObject.element to communicate to the assistive technologies that
+  /// the user can start editing by tapping on the element. Once a tap is detected,
+  /// the editable element gets created and the role of textbox is removed from
+  /// semanicsObject.element to avoid confusing VoiceOver.
   void _initializeForWebkit() {
     // Safari for desktop is also initialized as the other browsers.
     if (operatingSystem == OperatingSystem.macOs) {
       _initializeForBlink();
       return;
     }
+
+    setAttribute('role', 'textbox');
+    setAttribute('contenteditable', 'false');
+    setAttribute('tabindex', '0');
+
     num? lastPointerDownOffsetX;
     num? lastPointerDownOffsetY;
 
-    editableElement.addEventListener('pointerdown',
-        allowInterop((DomEvent event) {
+    addEventListener('pointerdown',
+        createDomEventListener((DomEvent event) {
           final DomPointerEvent pointerEvent = event as DomPointerEvent;
           lastPointerDownOffsetX = pointerEvent.clientX;
           lastPointerDownOffsetY = pointerEvent.clientY;
         }), true);
 
-    editableElement.addEventListener(
-        'pointerup', allowInterop((DomEvent event) {
+    addEventListener('pointerup',
+        createDomEventListener((DomEvent event) {
       final DomPointerEvent pointerEvent = event as DomPointerEvent;
 
       if (lastPointerDownOffsetX != null) {
@@ -318,19 +378,7 @@ class TextField extends RoleManager {
           // Recognize it as a tap that requires a keyboard.
           EnginePlatformDispatcher.instance.invokeOnSemanticsAction(
               semanticsObject.id, ui.SemanticsAction.tap, null);
-
-          // We need to call focus for the following scenario:
-          // 1. The virtial keyboard in iOS gets dismissed by the 'Done' button
-          // located at the top right of the keyboard.
-          // 2. The user tries to focus on the input field again, either by
-          // VoiceOver or manually, but the keyboard does not show up.
-          //
-          // In this scenario, the Flutter framework does not send a semantic update,
-          // so we need to call focus after detecting a tap to make sure that the
-          // virtual keyboard will show.
-          if (semanticsObject.hasFocus) {
-            editableElement.focus();
-          }
+          _invokeIosWorkaround();
         }
       } else {
         assert(lastPointerDownOffsetY == null);
@@ -341,75 +389,91 @@ class TextField extends RoleManager {
     }), true);
   }
 
-  bool _hasFocused = false;
+  void _invokeIosWorkaround() {
+    if (editableElement != null) {
+      return;
+    }
+
+    _initializeEditableElement();
+    activeEditableElement.style.transform = 'translate(${offScreenOffset}px, ${offScreenOffset}px)';
+    _positionInputElementTimer?.cancel();
+    _positionInputElementTimer = Timer(_delayBeforePlacement, () {
+      editableElement?.style.transform = '';
+      _positionInputElementTimer = null;
+    });
+
+    // Can not have both activeEditableElement and semanticsObject.element
+    // represent the same text field. It will confuse VoiceOver, so `role` needs to
+    // be assigned and removed, based on whether or not editableElement exists.
+    activeEditableElement.focus();
+    removeAttribute('role');
+
+    activeEditableElement.addEventListener('blur',
+        createDomEventListener((DomEvent event) {
+      setAttribute('role', 'textbox');
+      activeEditableElement.remove();
+      SemanticsTextEditingStrategy._instance?.deactivate(this);
+
+      // Focus on semantics element before removing the editable element, so that
+      // the user can continue navigating the page with the assistive technology.
+      element.focus();
+      editableElement = null;
+    }));
+  }
 
   @override
   void update() {
-    // The user is editing the semantic text field directly, so there's no need
-    // to do any update here.
+    super.update();
+
+    // Ignore the update if editableElement has not been created yet.
+    // On iOS Safari, when the user dismisses the keyboard using the 'done' button,
+    // we recieve a `blur` event from the browswer and a semantic update with
+    // [hasFocus] set to true from the framework. In this case, we ignore the update
+    // and wait for a tap event before invoking the iOS workaround and creating
+    // the editable element.
+    if (editableElement != null) {
+      activeEditableElement.style
+        ..width = '${semanticsObject.rect!.width}px'
+        ..height = '${semanticsObject.rect!.height}px';
+
+      if (semanticsObject.hasFocus) {
+        if (domDocument.activeElement !=
+            activeEditableElement) {
+          semanticsObject.owner.addOneTimePostUpdateCallback(() {
+            activeEditableElement.focus();
+          });
+        }
+        SemanticsTextEditingStrategy._instance?.activate(this);
+      } else if (domDocument.activeElement ==
+          activeEditableElement) {
+        if (!isIosSafari) {
+          SemanticsTextEditingStrategy._instance?.deactivate(this);
+          // Only apply text, because this node is not focused.
+        }
+        activeEditableElement.blur();
+      }
+    }
+
+    final DomElement element = editableElement ?? this.element;
     if (semanticsObject.hasLabel) {
-      editableElement.setAttribute(
+      element.setAttribute(
         'aria-label',
         semanticsObject.label!,
       );
     } else {
-      editableElement.removeAttribute('aria-label');
-    }
-
-    editableElement.style
-      ..width = '${semanticsObject.rect!.width}px'
-      ..height = '${semanticsObject.rect!.height}px';
-
-    // Whether we should request that the browser shift focus to the editable
-    // element, so that both the framework and the browser agree on what's
-    // currently focused.
-    bool needsDomFocusRequest = false;
-    final EditingState editingState = EditingState(
-      text: semanticsObject.value,
-      baseOffset: semanticsObject.textSelectionBase,
-      extentOffset: semanticsObject.textSelectionExtent,
-    );
-    if (semanticsObject.hasFocus) {
-      if (!_hasFocused) {
-        _hasFocused = true;
-        SemanticsTextEditingStrategy.instance.activate(this);
-        needsDomFocusRequest = true;
-      }
-      if (domDocument.activeElement != editableElement) {
-        needsDomFocusRequest = true;
-      }
-      // Focused elements should have full text editing state applied.
-      SemanticsTextEditingStrategy.instance.setEditingState(editingState);
-    } else if (_hasFocused) {
-      SemanticsTextEditingStrategy.instance.deactivate(this);
-
-      // Only apply text, because this node is not focused.
-      editingState.applyTextToDomElement(editableElement);
-
-      if (_hasFocused && domDocument.activeElement == editableElement) {
-        // Unlike `editableElement.focus()` we don't need to schedule `blur`
-        // post-update because `document.activeElement` implies that the
-        // element is already attached to the DOM. If it's not, it can't
-        // possibly be focused and therefore there's no need to blur.
-        editableElement.blur();
-      }
-      _hasFocused = false;
-    }
-
-    if (needsDomFocusRequest) {
-      // Schedule focus post-update to make sure the element is attached to
-      // the document. Otherwise focus() has no effect.
-      semanticsObject.owner.addOneTimePostUpdateCallback(() {
-        if (domDocument.activeElement != editableElement) {
-          editableElement.focus();
-        }
-      });
+      element.removeAttribute('aria-label');
     }
   }
 
   @override
   void dispose() {
-    editableElement.remove();
-    SemanticsTextEditingStrategy.instance.deactivate(this);
+    super.dispose();
+    _positionInputElementTimer?.cancel();
+    _positionInputElementTimer = null;
+    // on iOS, the `blur` event listener callback will remove the element.
+    if (!isIosSafari) {
+      editableElement?.remove();
+    }
+    SemanticsTextEditingStrategy._instance?.deactivate(this);
   }
 }
diff --git a/lib/web_ui/lib/src/engine/services/buffers.dart b/lib/web_ui/lib/src/engine/services/buffers.dart
index 1112e868e252d5e04b3eb66729b0b9fb25daa9c7..fba3823a247445358e2948edbef0f96fca77bb54 100644
--- a/lib/web_ui/lib/src/engine/services/buffers.dart
+++ b/lib/web_ui/lib/src/engine/services/buffers.dart
@@ -212,8 +212,6 @@ abstract class _TypedDataBuffer<E> extends ListBase<E> {
 
   /// Like [insertAll], but with a guaranteed non-`null` [start] and [end].
   void _insertKnownLength(int index, Iterable<E> values, int start, int end) {
-    assert(values != null);
-    assert(end != null);
     if (start > values.length || end > values.length) {
       throw StateError('Too few elements');
     }
diff --git a/lib/web_ui/lib/src/engine/services/message_codec.dart b/lib/web_ui/lib/src/engine/services/message_codec.dart
index cb8c26b74647be70af59625e46ede74bfe532610..c8f9e7d8da80189a360b98e765461eb185874ecd 100644
--- a/lib/web_ui/lib/src/engine/services/message_codec.dart
+++ b/lib/web_ui/lib/src/engine/services/message_codec.dart
@@ -32,7 +32,7 @@ abstract class MessageCodec<T> {
 class MethodCall {
   /// Creates a [MethodCall] representing the invocation of [method] with the
   /// specified [arguments].
-  const MethodCall(this.method, [this.arguments]) : assert(method != null);
+  const MethodCall(this.method, [this.arguments]);
 
   /// The name of the method to be called.
   final String method;
@@ -101,7 +101,7 @@ class PlatformException implements Exception {
     required this.code,
     this.message,
     this.details,
-  }) : assert(code != null);
+  });
 
   /// An error code.
   final String code;
diff --git a/lib/web_ui/lib/src/engine/services/message_codecs.dart b/lib/web_ui/lib/src/engine/services/message_codecs.dart
index d084c9730cf259e835e0d267a92382d2e46af7d2..26c01c141e3d0d0bad2f1012222114d9f2ad4ebc 100644
--- a/lib/web_ui/lib/src/engine/services/message_codecs.dart
+++ b/lib/web_ui/lib/src/engine/services/message_codecs.dart
@@ -39,7 +39,7 @@ class StringCodec implements MessageCodec<String> {
 
   @override
   ByteData encodeMessage(String message) {
-    final Uint8List encoded = utf8.encoder.convert(message);
+    final Uint8List encoded = utf8.encode(message);
     return encoded.buffer.asByteData();
   }
 }
@@ -160,7 +160,6 @@ class JSONMethodCodec implements MethodCodec {
   @override
   ByteData? encodeErrorEnvelope(
       {required String code, String? message, dynamic details}) {
-    assert(code != null);
     return const JSONMessageCodec()
         .encodeMessage(<dynamic>[code, message, details]);
   }
@@ -321,7 +320,7 @@ class StandardMessageCodec implements MessageCodec<dynamic> {
       }
     } else if (value is String) {
       buffer.putUint8(_valueString);
-      final List<int> bytes = utf8.encoder.convert(value);
+      final List<int> bytes = utf8.encode(value);
       writeSize(buffer, bytes.length);
       buffer.putUint8List(bytes as Uint8List);
     } else if (value is Uint8List) {
@@ -379,19 +378,14 @@ class StandardMessageCodec implements MessageCodec<dynamic> {
     switch (type) {
       case _valueNull:
         result = null;
-        break;
       case _valueTrue:
         result = true;
-        break;
       case _valueFalse:
         result = false;
-        break;
       case _valueInt32:
         result = buffer.getInt32();
-        break;
       case _valueInt64:
         result = buffer.getInt64();
-        break;
       case _valueLargeInt:
         // Flutter Engine APIs to use large ints have been deprecated on
         // 2018-01-09 and will be made unavailable.
@@ -399,44 +393,35 @@ class StandardMessageCodec implements MessageCodec<dynamic> {
         final int length = readSize(buffer);
         final String hex = utf8.decoder.convert(buffer.getUint8List(length));
         result = int.parse(hex, radix: 16);
-        break;
       case _valueFloat64:
         result = buffer.getFloat64();
-        break;
       case _valueString:
         final int length = readSize(buffer);
         result = utf8.decoder.convert(buffer.getUint8List(length));
-        break;
       case _valueUint8List:
         final int length = readSize(buffer);
         result = buffer.getUint8List(length);
-        break;
       case _valueInt32List:
         final int length = readSize(buffer);
         result = buffer.getInt32List(length);
-        break;
       case _valueInt64List:
         final int length = readSize(buffer);
         result = buffer.getInt64List(length);
-        break;
       case _valueFloat64List:
         final int length = readSize(buffer);
         result = buffer.getFloat64List(length);
-        break;
       case _valueList:
         final int length = readSize(buffer);
         result = <dynamic>[];
         for (int i = 0; i < length; i++) {
           result.add(readValue(buffer));
         }
-        break;
       case _valueMap:
         final int length = readSize(buffer);
         result = <dynamic, dynamic>{};
         for (int i = 0; i < length; i++) {
           result[readValue(buffer)] = readValue(buffer);
         }
-        break;
       default:
         throw const FormatException('Message corrupted');
     }
diff --git a/lib/web_ui/lib/src/engine/services/serialization.dart b/lib/web_ui/lib/src/engine/services/serialization.dart
index 1188abcb4e18a7cb77591b2aa08d62338706ac04..e428e6a3f06c78f8908368c92e8d182ef3bd8b65 100644
--- a/lib/web_ui/lib/src/engine/services/serialization.dart
+++ b/lib/web_ui/lib/src/engine/services/serialization.dart
@@ -122,7 +122,7 @@ class WriteBuffer {
 /// The byte order used is [Endian.host] throughout.
 class ReadBuffer {
   /// Creates a [ReadBuffer] for reading from the specified [data].
-  ReadBuffer(this.data) : assert(data != null);
+  ReadBuffer(this.data);
 
   /// The underlying data being read.
   final ByteData data;
diff --git a/lib/web_ui/lib/src/engine/shader_data.dart b/lib/web_ui/lib/src/engine/shader_data.dart
new file mode 100644
index 0000000000000000000000000000000000000000..306472ec3515d62c5eba5bc0e6ff370ef1759740
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/shader_data.dart
@@ -0,0 +1,159 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:convert';
+import 'dart:typed_data';
+
+class ShaderData {
+  ShaderData({
+    required this.source,
+    required this.uniforms,
+    required this.floatCount,
+    required this.textureCount,
+  });
+
+  factory ShaderData.fromBytes(Uint8List data) {
+    final String contents = utf8.decode(data);
+    final Object? rawShaderData = json.decode(contents);
+    if (rawShaderData is! Map<String, Object?>) {
+      throw const FormatException('Invalid Shader Data');
+    }
+    final Object? root = rawShaderData['sksl'];
+    if (root is! Map<String, Object?>) {
+      throw const FormatException('Invalid Shader Data');
+    }
+
+    final Object? source = root['shader'];
+    final Object? rawUniforms = root['uniforms'];
+    if (source is! String || rawUniforms is! List<Object?>) {
+      throw const FormatException('Invalid Shader Data');
+    }
+
+    final List<UniformData> uniforms = List<UniformData>.filled(rawUniforms.length, UniformData.empty);
+
+    int textureCount = 0;
+    int floatCount = 0;
+    for (int i = 0; i < rawUniforms.length; i += 1) {
+      final Object? rawUniformData = rawUniforms[i];
+      if (rawUniformData is! Map<String, Object?>) {
+        throw const FormatException('Invalid Shader Data');
+      }
+      final Object? name = rawUniformData['name'];
+      final Object? location = rawUniformData['location'];
+      final Object? rawType = rawUniformData['type'];
+      if (name is! String || location is! int || rawType is! int) {
+        throw const FormatException('Invalid Shader Data');
+      }
+      final UniformType? type = uniformTypeFromJson(rawType);
+      if (type == null) {
+        throw const FormatException('Invalid Shader Data');
+      }
+      if (type == UniformType.SampledImage) {
+        textureCount += 1;
+      } else {
+        final Object? bitWidth = rawUniformData['bit_width'];
+
+        final Object? arrayElements = rawUniformData['array_elements'];
+        final Object? rows = rawUniformData['rows'];
+        final Object? columns = rawUniformData['columns'];
+
+        if (bitWidth is! int ||
+            rows is! int ||
+            arrayElements is! int ||
+            columns is! int) {
+          throw const FormatException('Invalid Shader Data');
+        }
+
+        final int units = rows * columns;
+
+        int value = (bitWidth ~/ 32) * units;
+
+        if (arrayElements > 1) {
+          value *= arrayElements;
+        }
+
+        floatCount += value;
+      }
+      uniforms[i] = UniformData(
+        name: name,
+        location: location,
+        type: type,
+      );
+    }
+    return ShaderData(
+      source: source,
+      uniforms: uniforms,
+      floatCount: floatCount,
+      textureCount: textureCount,
+    );
+  }
+
+  String source;
+  List<UniformData> uniforms;
+  int floatCount;
+  int textureCount;
+}
+
+class UniformData {
+  const UniformData({
+    required this.name,
+    required this.location,
+    required this.type,
+  });
+
+  final String name;
+  final UniformType type;
+  final int location;
+
+  static const UniformData empty =
+      UniformData(name: '', location: -1, type: UniformType.Float);
+}
+
+enum UniformType {
+  Boolean,
+  SByte,
+  UByte,
+  Short,
+  UShort,
+  Int,
+  Uint,
+  Int64,
+  Uint64,
+  Half,
+  Float,
+  Double,
+  SampledImage,
+}
+
+UniformType? uniformTypeFromJson(int value) {
+  switch (value) {
+    case 0:
+      return UniformType.Boolean;
+    case 1:
+      return UniformType.SByte;
+    case 2:
+      return UniformType.UByte;
+    case 3:
+      return UniformType.Short;
+    case 4:
+      return UniformType.UShort;
+    case 5:
+      return UniformType.Int;
+    case 6:
+      return UniformType.Uint;
+    case 7:
+      return UniformType.Int64;
+    case 8:
+      return UniformType.Uint64;
+    case 9:
+      return UniformType.Half;
+    case 10:
+      return UniformType.Float;
+    case 11:
+      return UniformType.Double;
+    case 12:
+      return UniformType.SampledImage;
+  }
+  return null;
+}
diff --git a/lib/web_ui/lib/src/engine/shadow.dart b/lib/web_ui/lib/src/engine/shadow.dart
index a4a79244ed95a9d57b72300c94d967d5cb7ab2d6..f083d0e962dbdd2251d8d5183b539789d2342c12 100644
--- a/lib/web_ui/lib/src/engine/shadow.dart
+++ b/lib/web_ui/lib/src/engine/shadow.dart
@@ -11,13 +11,13 @@ import 'dom.dart';
 
 /// How far is the light source from the surface of the UI.
 ///
-/// Must be kept in sync with `flow/layers/physical_shape_layer.cc`.
+/// Originally based on the constant in `flow/layers/physical_shape_layer.cc`.
 const double kLightHeight = 600.0;
 
 /// The radius of the light source. The positive radius creates a penumbra in
 /// the shadow, which we express using a blur effect.
 ///
-/// Must be kept in sync with `flow/layers/physical_shape_layer.cc`.
+/// Originally based on the constant in  `flow/layers/physical_shape_layer.cc`.
 const double kLightRadius = 800.0;
 
 /// The X offset of the list source relative to the center of the shape.
@@ -73,12 +73,19 @@ ui.Rect computePenumbraBounds(ui.Rect shape, double elevation) {
   final double dx = elevation * tx;
   final double dy = elevation * ty;
   final ui.Offset offset = computeShadowOffset(elevation);
-  return ui.Rect.fromLTRB(
+  final ui.Rect bounds = ui.Rect.fromLTRB(
     shape.left - dx,
     shape.top - dy,
     shape.right + dx,
     shape.bottom + dy,
   ).shift(offset);
+
+  // Expand the bounds rectangle to compensate for inaccuracy in the shadow
+  // calculation.  This is similar to a workaround that had previously been
+  // used in the Flutter framework to adjust the bounds for shadows drawn
+  // by Skia.
+  // (See https://github.com/flutter/flutter/pull/127052)
+  return bounds.inflate(20);
 }
 
 /// Information needed to render a shadow using CSS or canvas.
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl.dart
index 554302e24e8495bb6772b9e6d22bfc473d61860f..e36e4359c67bc7df821b1f08faeb66b8065d1f50 100644
--- a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl.dart
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl.dart
@@ -2,6 +2,48 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+@DefaultAsset('skwasm')
+// The web_sdk/sdk_rewriter.dart uses this directive.
+// ignore: unnecessary_library_directive
 library skwasm_impl;
 
+import 'dart:ffi';
+
+export 'skwasm_impl/canvas.dart';
+export 'skwasm_impl/codecs.dart';
+export 'skwasm_impl/dart_js_conversion.dart';
+export 'skwasm_impl/filters.dart';
+export 'skwasm_impl/font_collection.dart';
+export 'skwasm_impl/image.dart';
+export 'skwasm_impl/memory.dart';
+export 'skwasm_impl/paint.dart';
+export 'skwasm_impl/paragraph.dart';
+export 'skwasm_impl/path.dart';
+export 'skwasm_impl/path_metrics.dart';
+export 'skwasm_impl/picture.dart';
+export 'skwasm_impl/raw/raw_canvas.dart';
+export 'skwasm_impl/raw/raw_filters.dart';
+export 'skwasm_impl/raw/raw_fonts.dart';
+export 'skwasm_impl/raw/raw_geometry.dart';
+export 'skwasm_impl/raw/raw_image.dart';
+export 'skwasm_impl/raw/raw_memory.dart';
+export 'skwasm_impl/raw/raw_paint.dart';
+export 'skwasm_impl/raw/raw_path.dart';
+export 'skwasm_impl/raw/raw_path_metrics.dart';
+export 'skwasm_impl/raw/raw_picture.dart';
+export 'skwasm_impl/raw/raw_shaders.dart';
+export 'skwasm_impl/raw/raw_skdata.dart';
+export 'skwasm_impl/raw/raw_skstring.dart';
+export 'skwasm_impl/raw/raw_surface.dart';
+export 'skwasm_impl/raw/raw_vertices.dart';
+export 'skwasm_impl/raw/skwasm_module.dart';
+export 'skwasm_impl/raw/text/raw_line_metrics.dart';
+export 'skwasm_impl/raw/text/raw_paragraph.dart';
+export 'skwasm_impl/raw/text/raw_paragraph_builder.dart';
+export 'skwasm_impl/raw/text/raw_paragraph_style.dart';
+export 'skwasm_impl/raw/text/raw_strut_style.dart';
+export 'skwasm_impl/raw/text/raw_text_style.dart';
 export 'skwasm_impl/renderer.dart';
+export 'skwasm_impl/shaders.dart';
+export 'skwasm_impl/surface.dart';
+export 'skwasm_impl/vertices.dart';
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/canvas.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/canvas.dart
new file mode 100644
index 0000000000000000000000000000000000000000..e33a515d281b92738cf635a6a2c5fe91278873cb
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/canvas.dart
@@ -0,0 +1,411 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:ffi';
+import 'dart:typed_data';
+
+import 'package:ui/src/engine.dart';
+import 'package:ui/src/engine/skwasm/skwasm_impl.dart';
+import 'package:ui/ui.dart' as ui;
+
+class SkwasmCanvas implements SceneCanvas {
+  factory SkwasmCanvas(SkwasmPictureRecorder recorder, ui.Rect cullRect) =>
+      SkwasmCanvas.fromHandle(withStackScope((StackScope s) =>
+          pictureRecorderBeginRecording(
+              recorder.handle, s.convertRectToNative(cullRect))));
+
+  SkwasmCanvas.fromHandle(this._handle);
+  CanvasHandle _handle;
+
+  // Note that we do not need to deal with the finalizer registry here, because
+  // the underlying native skia object is tied directly to the lifetime of the
+  // associated SkPictureRecorder.
+
+  @override
+  void save() {
+    canvasSave(_handle);
+  }
+
+  @override
+  void saveLayer(ui.Rect? bounds, ui.Paint paint) {
+    paint as SkwasmPaint;
+    if (bounds != null) {
+      withStackScope((StackScope s) {
+        canvasSaveLayer(_handle, s.convertRectToNative(bounds), paint.handle, nullptr);
+      });
+    } else {
+      canvasSaveLayer(_handle, nullptr, paint.handle, nullptr);
+    }
+  }
+
+  @override
+  void saveLayerWithFilter(ui.Rect? bounds, ui.Paint paint, ui.ImageFilter imageFilter) {
+    final SkwasmImageFilter nativeFilter = SkwasmImageFilter.fromUiFilter(imageFilter);
+    paint as SkwasmPaint;
+    if (bounds != null) {
+      withStackScope((StackScope s) {
+        canvasSaveLayer(_handle, s.convertRectToNative(bounds), paint.handle, nativeFilter.handle);
+      });
+    } else {
+      canvasSaveLayer(_handle, nullptr, paint.handle, nativeFilter.handle);
+    }
+  }
+
+  @override
+  void restore() {
+    canvasRestore(_handle);
+  }
+
+  @override
+  void restoreToCount(int count) {
+    canvasRestoreToCount(_handle, count);
+  }
+
+  @override
+  int getSaveCount() => canvasGetSaveCount(_handle);
+
+  @override
+  void translate(double dx, double dy) => canvasTranslate(_handle, dx, dy);
+
+  @override
+  void scale(double sx, [double? sy]) => canvasScale(_handle, sx, sy ?? sx);
+
+  @override
+  void rotate(double radians) => canvasRotate(_handle, ui.toDegrees(radians));
+
+  @override
+  void skew(double sx, double sy) => canvasSkew(_handle, sx, sy);
+
+  @override
+  void transform(Float64List matrix4) {
+    withStackScope((StackScope s) {
+      canvasTransform(_handle, s.convertMatrix44toNative(matrix4));
+    });
+  }
+
+  @override
+  void clipRect(ui.Rect rect,
+      {ui.ClipOp clipOp = ui.ClipOp.intersect, bool doAntiAlias = true}) {
+    withStackScope((StackScope s) {
+      canvasClipRect(_handle, s.convertRectToNative(rect), clipOp.index, doAntiAlias);
+    });
+  }
+
+  @override
+  void clipRRect(ui.RRect rrect, {bool doAntiAlias = true}) {
+    withStackScope((StackScope s) {
+      canvasClipRRect(_handle, s.convertRRectToNative(rrect), doAntiAlias);
+    });
+  }
+
+  @override
+  void clipPath(ui.Path path, {bool doAntiAlias = true}) {
+    path as SkwasmPath;
+    canvasClipPath(_handle, path.handle, doAntiAlias);
+  }
+
+  @override
+  void drawColor(ui.Color color, ui.BlendMode blendMode) =>
+      canvasDrawColor(_handle, color.value, blendMode.index);
+
+  @override
+  void drawLine(ui.Offset p1, ui.Offset p2, ui.Paint paint) {
+    paint as SkwasmPaint;
+    canvasDrawLine(_handle, p1.dx, p1.dy, p2.dx, p2.dy, paint.handle);
+  }
+
+  @override
+  void drawPaint(ui.Paint paint) {
+    paint as SkwasmPaint;
+    canvasDrawPaint(_handle, paint.handle);
+  }
+
+  @override
+  void drawRect(ui.Rect rect, ui.Paint paint) {
+    paint as SkwasmPaint;
+    withStackScope((StackScope s) {
+      canvasDrawRect(
+        _handle,
+        s.convertRectToNative(rect),
+        paint.handle
+      );
+    });
+  }
+
+  @override
+  void drawRRect(ui.RRect rrect, ui.Paint paint) {
+    paint as SkwasmPaint;
+    withStackScope((StackScope s) {
+      canvasDrawRRect(
+        _handle,
+        s.convertRRectToNative(rrect),
+        paint.handle
+      );
+    });
+  }
+
+  @override
+  void drawDRRect(ui.RRect outer, ui.RRect inner, ui.Paint paint) {
+    paint as SkwasmPaint;
+    withStackScope((StackScope s) {
+      canvasDrawDRRect(
+        _handle,
+        s.convertRRectToNative(outer),
+        s.convertRRectToNative(inner),
+        paint.handle
+      );
+    });
+  }
+
+  @override
+  void drawOval(ui.Rect rect, ui.Paint paint) {
+    paint as SkwasmPaint;
+    withStackScope((StackScope s) {
+      canvasDrawOval(_handle, s.convertRectToNative(rect), paint.handle);
+    });
+  }
+
+  @override
+  void drawCircle(ui.Offset center, double radius, ui.Paint paint) {
+    paint as SkwasmPaint;
+    canvasDrawCircle(_handle, center.dx, center.dy, radius, paint.handle);
+  }
+
+  @override
+  void drawArc(ui.Rect rect, double startAngle, double sweepAngle,
+      bool useCenter, ui.Paint paint) {
+    paint as SkwasmPaint;
+    withStackScope((StackScope s) {
+      canvasDrawArc(
+        _handle,
+        s.convertRectToNative(rect),
+        ui.toDegrees(startAngle),
+        ui.toDegrees(sweepAngle),
+        useCenter,
+        paint.handle
+      );
+    });
+  }
+
+  @override
+  void drawPath(ui.Path path, ui.Paint paint) {
+    paint as SkwasmPaint;
+    path as SkwasmPath;
+    canvasDrawPath(_handle, path.handle, paint.handle);
+  }
+
+  @override
+  void drawImage(ui.Image image, ui.Offset offset, ui.Paint paint) =>
+    canvasDrawImage(
+      _handle,
+      (image as SkwasmImage).handle,
+      offset.dx,
+      offset.dy,
+      (paint as SkwasmPaint).handle,
+      paint.filterQuality.index,
+    );
+
+  @override
+  void drawImageRect(
+    ui.Image image,
+    ui.Rect src,
+    ui.Rect dst,
+    ui.Paint paint) => withStackScope((StackScope scope) {
+    final Pointer<Float> sourceRect = scope.convertRectToNative(src);
+    final Pointer<Float> destRect = scope.convertRectToNative(dst);
+    canvasDrawImageRect(
+      _handle,
+      (image as SkwasmImage).handle,
+      sourceRect,
+      destRect,
+      (paint as SkwasmPaint).handle,
+      paint.filterQuality.index,
+    );
+  });
+
+  @override
+  void drawImageNine(
+    ui.Image image,
+    ui.Rect center,
+    ui.Rect dst,
+    ui.Paint paint) => withStackScope((StackScope scope) {
+    final Pointer<Int32> centerRect = scope.convertIRectToNative(center);
+    final Pointer<Float> destRect = scope.convertRectToNative(dst);
+    canvasDrawImageNine(
+      _handle,
+      (image as SkwasmImage).handle,
+      centerRect,
+      destRect,
+      (paint as SkwasmPaint).handle,
+      paint.filterQuality.index,
+    );
+  });
+
+  @override
+  void drawPicture(ui.Picture picture) {
+    canvasDrawPicture(_handle, (picture as SkwasmPicture).handle);
+  }
+
+  @override
+  void drawParagraph(ui.Paragraph paragraph, ui.Offset offset) {
+    canvasDrawParagraph(
+      _handle,
+      (paragraph as SkwasmParagraph).handle,
+      offset.dx,
+      offset.dy,
+    );
+  }
+
+  @override
+  void drawPoints(
+    ui.PointMode pointMode,
+    List<ui.Offset> points,
+    ui.Paint paint
+  ) => withStackScope((StackScope scope) {
+    final RawPointArray rawPoints = scope.convertPointArrayToNative(points);
+    canvasDrawPoints(
+      _handle,
+      pointMode.index,
+      rawPoints,
+      points.length,
+      (paint as SkwasmPaint).handle,
+    );
+  });
+
+  @override
+  void drawRawPoints(
+    ui.PointMode pointMode,
+    Float32List points,
+    ui.Paint paint
+  ) => withStackScope((StackScope scope) {
+    final RawPointArray rawPoints = scope.convertDoublesToNative(points);
+    canvasDrawPoints(
+      _handle,
+      pointMode.index,
+      rawPoints,
+      points.length ~/ 2,
+      (paint as SkwasmPaint).handle,
+    );
+  });
+
+  @override
+  void drawVertices(
+    ui.Vertices vertices,
+    ui.BlendMode blendMode,
+    ui.Paint paint,
+  ) => canvasDrawVertices(
+    _handle,
+    (vertices as SkwasmVertices).handle,
+    blendMode.index,
+    (paint as SkwasmPaint).handle,
+  );
+
+  @override
+  void drawAtlas(
+    ui.Image atlas,
+    List<ui.RSTransform> transforms,
+    List<ui.Rect> rects,
+    List<ui.Color>? colors,
+    ui.BlendMode? blendMode,
+    ui.Rect? cullRect,
+    ui.Paint paint,
+  ) => withStackScope((StackScope scope) {
+    final RawRSTransformArray rawTransforms = scope.convertRSTransformsToNative(transforms);
+    final RawRect rawRects = scope.convertRectsToNative(rects);
+    final RawColorArray rawColors = colors != null
+      ? scope.convertColorArrayToNative(colors)
+      : nullptr;
+    final RawRect rawCullRect = cullRect != null
+      ? scope.convertRectToNative(cullRect)
+      : nullptr;
+    canvasDrawAtlas(
+      _handle,
+      (atlas as SkwasmImage).handle,
+      rawTransforms,
+      rawRects,
+      rawColors,
+      transforms.length,
+      (blendMode ?? ui.BlendMode.src).index,
+      rawCullRect,
+      (paint as SkwasmPaint).handle,
+    );
+  });
+
+  @override
+  void drawRawAtlas(
+    ui.Image atlas,
+    Float32List rstTransforms,
+    Float32List rects,
+    Int32List? colors,
+    ui.BlendMode? blendMode,
+    ui.Rect? cullRect,
+    ui.Paint paint,
+  ) => withStackScope((StackScope scope) {
+    final RawRSTransformArray rawTransforms = scope.convertDoublesToNative(rstTransforms);
+    final RawRect rawRects = scope.convertDoublesToNative(rects);
+    final RawColorArray rawColors = colors != null
+      ? scope.convertIntsToUint32Native(colors)
+      : nullptr;
+    final RawRect rawCullRect = cullRect != null
+      ? scope.convertRectToNative(cullRect)
+      : nullptr;
+    canvasDrawAtlas(
+      _handle,
+      (atlas as SkwasmImage).handle,
+      rawTransforms,
+      rawRects,
+      rawColors,
+      rstTransforms.length ~/ 4,
+      (blendMode ?? ui.BlendMode.src).index,
+      rawCullRect,
+      (paint as SkwasmPaint).handle,
+    );
+  });
+
+  @override
+  void drawShadow(
+    ui.Path path,
+    ui.Color color,
+    double elevation,
+    bool transparentOccluder,
+  ) {
+    path as SkwasmPath;
+    canvasDrawShadow(
+      _handle,
+      path.handle,
+      elevation,
+      EngineFlutterDisplay.instance.devicePixelRatio,
+      color.value,
+      transparentOccluder);
+  }
+
+  @override
+  ui.Rect getDestinationClipBounds() {
+    return withStackScope((StackScope scope) {
+      final Pointer<Int32> outRect = scope.allocInt32Array(4);
+      canvasGetDeviceClipBounds(_handle, outRect);
+      return scope.convertIRectFromNative(outRect);
+    });
+  }
+
+  @override
+  ui.Rect getLocalClipBounds() {
+    final Float64List transform = getTransform();
+    final Matrix4 matrix = Matrix4.fromFloat32List(Float32List.fromList(transform));
+    if (matrix.invert() == 0) {
+      // non-invertible transforms collapse space to a line or point
+      return ui.Rect.zero;
+    }
+    return matrix.transformRect(getDestinationClipBounds());
+  }
+
+  @override
+  Float64List getTransform() {
+    return withStackScope((StackScope scope) {
+      final Pointer<Float> outMatrix = scope.allocFloatArray(16);
+      canvasGetTransform(_handle, outMatrix);
+      return scope.convertMatrix44FromNative(outMatrix);
+    });
+  }
+}
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/codecs.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/codecs.dart
new file mode 100644
index 0000000000000000000000000000000000000000..52b1c0f9ec724e552bb612b8f576c324ec608fec
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/codecs.dart
@@ -0,0 +1,30 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:js_interop';
+
+import 'package:ui/src/engine.dart';
+import 'package:ui/src/engine/skwasm/skwasm_impl.dart';
+import 'package:ui/ui.dart' as ui;
+
+class SkwasmImageDecoder extends BrowserImageDecoder {
+  SkwasmImageDecoder({
+    required super.contentType,
+    required super.dataSource,
+    required super.debugSource,
+  });
+
+  @override
+  ui.Image generateImageFromVideoFrame(VideoFrame frame) {
+    final int width = frame.codedWidth.toInt();
+    final int height = frame.codedHeight.toInt();
+    final SkwasmSurface surface = (renderer as SkwasmRenderer).surface;
+    return SkwasmImage(imageCreateFromTextureSource(
+      frame as JSObject,
+      width,
+      height,
+      surface.handle,
+    ));
+  }
+}
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/dart_js_conversion.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/dart_js_conversion.dart
new file mode 100644
index 0000000000000000000000000000000000000000..dbde1bee5cd5d7b3a36e044d7169f44ccb8f084f
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/dart_js_conversion.dart
@@ -0,0 +1,16 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:_wasm';
+import 'dart:js_interop';
+
+@pragma('wasm:prefer-inline')
+@pragma('dart2js:tryInline')
+JSAny dartToJsWrapper(Object object) =>
+    WasmAnyRef.fromObject(object).externalize().toJS;
+
+@pragma('wasm:prefer-inline')
+@pragma('dart2js:tryInline')
+Object jsWrapperToDart(JSAny jsWrapper) =>
+    externRefForJSAny(jsWrapper).internalize()!.toObject();
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/filters.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/filters.dart
new file mode 100644
index 0000000000000000000000000000000000000000..adc8026ef1d5b671cbf38c5f5a17bda4b55105c2
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/filters.dart
@@ -0,0 +1,111 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:ffi';
+import 'dart:typed_data';
+
+import 'package:ui/src/engine.dart';
+import 'package:ui/src/engine/skwasm/skwasm_impl.dart';
+import 'package:ui/ui.dart' as ui;
+
+class SkwasmImageFilter extends SkwasmObjectWrapper<RawImageFilter> implements SceneImageFilter {
+  SkwasmImageFilter._(ImageFilterHandle handle) : super(handle, _registry);
+
+  factory SkwasmImageFilter.blur({
+    double sigmaX = 0.0,
+    double sigmaY = 0.0,
+    ui.TileMode tileMode = ui.TileMode.clamp,
+  }) => SkwasmImageFilter._(imageFilterCreateBlur(sigmaX, sigmaY, tileMode.index));
+
+  factory SkwasmImageFilter.dilate({
+    double radiusX = 0.0,
+    double radiusY = 0.0,
+  }) => SkwasmImageFilter._(imageFilterCreateDilate(radiusX, radiusY));
+
+  factory SkwasmImageFilter.erode({
+    double radiusX = 0.0,
+    double radiusY = 0.0,
+  }) => SkwasmImageFilter._(imageFilterCreateErode(radiusX, radiusY));
+
+  factory SkwasmImageFilter.matrix(
+    Float64List matrix4, {
+    ui.FilterQuality filterQuality = ui.FilterQuality.low
+  }) => withStackScope((StackScope scope) => SkwasmImageFilter._(imageFilterCreateMatrix(
+    scope.convertMatrix4toSkMatrix(matrix4),
+    filterQuality.index
+  )));
+
+  factory SkwasmImageFilter.fromColorFilter(SkwasmColorFilter filter) =>
+    SkwasmImageFilter._(imageFilterCreateFromColorFilter(filter.handle));
+
+  factory SkwasmImageFilter.fromUiFilter(ui.ImageFilter filter) {
+    if (filter is ui.ColorFilter) {
+      final SkwasmColorFilter colorFilter =
+        SkwasmColorFilter.fromEngineColorFilter(filter as EngineColorFilter);
+      final SkwasmImageFilter outputFilter = SkwasmImageFilter.fromColorFilter(colorFilter);
+      colorFilter.dispose();
+      return outputFilter;
+    } else {
+      return filter as SkwasmImageFilter;
+    }
+  }
+
+  factory SkwasmImageFilter.compose(
+    ui.ImageFilter outer,
+    ui.ImageFilter inner,
+  ) {
+    final SkwasmImageFilter nativeOuter = SkwasmImageFilter.fromUiFilter(outer);
+    final SkwasmImageFilter nativeInner = SkwasmImageFilter.fromUiFilter(inner);
+    return SkwasmImageFilter._(imageFilterCompose(nativeOuter.handle, nativeInner.handle));
+  }
+
+  static final SkwasmFinalizationRegistry<RawImageFilter> _registry =
+    SkwasmFinalizationRegistry<RawImageFilter>(imageFilterDispose);
+
+  @override
+  ui.Rect filterBounds(ui.Rect inputBounds) => withStackScope((StackScope scope) {
+    final RawIRect rawRect = scope.convertIRectToNative(inputBounds);
+    imageFilterGetFilterBounds(handle, rawRect);
+    return scope.convertIRectFromNative(rawRect);
+  });
+}
+
+class SkwasmColorFilter extends SkwasmObjectWrapper<RawColorFilter> {
+  SkwasmColorFilter._(ColorFilterHandle handle) : super(handle, _registry);
+
+  factory SkwasmColorFilter.fromEngineColorFilter(EngineColorFilter colorFilter) =>
+    switch (colorFilter.type) {
+      ColorFilterType.mode => SkwasmColorFilter._(colorFilterCreateMode(
+        colorFilter.color!.value,
+        colorFilter.blendMode!.index,
+      )),
+      ColorFilterType.linearToSrgbGamma => SkwasmColorFilter._(colorFilterCreateLinearToSRGBGamma()),
+      ColorFilterType.srgbToLinearGamma => SkwasmColorFilter._(colorFilterCreateSRGBToLinearGamma()),
+      ColorFilterType.matrix => withStackScope((StackScope scope) {
+        final Pointer<Float> nativeMatrix = scope.convertDoublesToNative(colorFilter.matrix!);
+        return SkwasmColorFilter._(colorFilterCreateMatrix(nativeMatrix));
+      }),
+    };
+
+  factory SkwasmColorFilter.composed(
+    SkwasmColorFilter outer,
+    SkwasmColorFilter inner,
+  ) => SkwasmColorFilter._(colorFilterCompose(outer.handle, inner.handle));
+
+  static final SkwasmFinalizationRegistry<RawColorFilter> _registry =
+    SkwasmFinalizationRegistry<RawColorFilter>(colorFilterDispose);
+}
+
+class SkwasmMaskFilter extends SkwasmObjectWrapper<RawMaskFilter> {
+  SkwasmMaskFilter._(MaskFilterHandle handle) : super(handle, _registry);
+
+  factory SkwasmMaskFilter.fromUiMaskFilter(ui.MaskFilter maskFilter) =>
+    SkwasmMaskFilter._(maskFilterCreateBlur(
+      maskFilter.webOnlyBlurStyle.index,
+      maskFilter.webOnlySigma
+    ));
+
+  static final SkwasmFinalizationRegistry<RawMaskFilter> _registry =
+    SkwasmFinalizationRegistry<RawMaskFilter>(maskFilterDispose);
+}
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/font_collection.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/font_collection.dart
new file mode 100644
index 0000000000000000000000000000000000000000..4f561e418373411fe1a06e6138f848c190670b9a
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/font_collection.dart
@@ -0,0 +1,232 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'dart:ffi';
+import 'dart:js_interop';
+
+import 'dart:typed_data';
+
+import 'package:ui/src/engine.dart';
+import 'package:ui/src/engine/skwasm/skwasm_impl.dart';
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
+
+// This URL was found by using the Google Fonts Developer API to find the URL
+// for Roboto. The API warns that this URL is not stable. In order to update
+// this, list out all of the fonts and find the URL for the regular
+// Roboto font. The API reference is here:
+// https://developers.google.com/fonts/docs/developer_api
+String _robotoUrl =
+    '${configuration.fontFallbackBaseUrl}roboto/v20/KFOmCnqEu92Fr1Me5WZLCzYlKw.ttf';
+
+class SkwasmTypeface extends SkwasmObjectWrapper<RawTypeface> {
+  SkwasmTypeface(SkDataHandle data) : super(typefaceCreate(data), _registry);
+
+  static final SkwasmFinalizationRegistry<RawTypeface> _registry =
+    SkwasmFinalizationRegistry<RawTypeface>(typefaceDispose);
+}
+
+class SkwasmFontCollection implements FlutterFontCollection {
+  SkwasmFontCollection() {
+    setDefaultFontFamilies(<String>['Roboto']);
+  }
+
+  // Most of the time, when an object deals with native handles to skwasm objects,
+  // we register it with a finalization registry so that it can clean up the handle
+  // when the dart side of object gets GC'd. However, this object is basically a
+  // singleton (the renderer creates one and just hangs onto it forever) so it's
+  // not really worth it to do the finalization dance here.
+  FontCollectionHandle handle = fontCollectionCreate();
+  SkwasmNativeTextStyle defaultTextStyle = SkwasmNativeTextStyle.defaultTextStyle();
+  final Map<String, List<SkwasmTypeface>> registeredTypefaces = <String, List<SkwasmTypeface>>{};
+
+  void setDefaultFontFamilies(List<String> families) => withStackScope((StackScope scope) {
+    final Pointer<SkStringHandle> familyPointers =
+      scope.allocPointerArray(families.length).cast<SkStringHandle>();
+    for (int i = 0; i < families.length; i++) {
+      familyPointers[i] = skStringFromDartString(families[i]);
+    }
+    textStyleClearFontFamilies(defaultTextStyle.handle);
+    textStyleAddFontFamilies(defaultTextStyle.handle, familyPointers, families.length);
+    for (int i = 0; i < families.length; i++) {
+      skStringFree(familyPointers[i]);
+    }
+  });
+
+  @override
+  late FontFallbackManager fontFallbackManager =
+    FontFallbackManager(SkwasmFallbackRegistry(this));
+
+  @override
+  void clear() {
+    fontCollectionDispose(handle);
+    handle = fontCollectionCreate();
+  }
+
+  @override
+  Future<AssetFontsResult> loadAssetFonts(FontManifest manifest) async {
+    final List<Future<void>> fontFutures = <Future<void>>[];
+    final Map<String, FontLoadError> fontFailures = <String, FontLoadError>{};
+
+    /// We need a default fallback font for Skwasm, in order to avoid crashing
+    /// while laying out text with an unregistered font. We chose Roboto to
+    /// match Android.
+    if (!manifest.families.any((FontFamily family) => family.name == 'Roboto')) {
+      manifest.families.add(
+        FontFamily('Roboto', <FontAsset>[FontAsset(_robotoUrl, <String, String>{})])
+      );
+    }
+
+    final List<String> loadedFonts = <String>[];
+    for (final FontFamily family in manifest.families) {
+      for (final FontAsset fontAsset in family.fontAssets) {
+        loadedFonts.add(fontAsset.asset);
+        fontFutures.add(() async {
+          final FontLoadError? error = await _downloadFontAsset(fontAsset, family.name);
+          if (error != null) {
+            fontFailures[fontAsset.asset] = error;
+          }
+        }());
+      }
+    }
+
+    await Future.wait(fontFutures);
+
+    loadedFonts.removeWhere((String assetName) => fontFailures.containsKey(assetName));
+    return AssetFontsResult(loadedFonts, fontFailures);
+  }
+
+  Future<FontLoadError?> _downloadFontAsset(FontAsset asset, String family) async {
+    final HttpFetchResponse response;
+    try {
+      response = await ui_web.assetManager.loadAsset(asset.asset) as HttpFetchResponse;
+    } catch (error) {
+      return FontDownloadError(ui_web.assetManager.getAssetUrl(asset.asset), error);
+    }
+    if (!response.hasPayload) {
+      return FontNotFoundError(ui_web.assetManager.getAssetUrl(asset.asset));
+    }
+    int length = 0;
+    final List<JSUint8Array> chunks = <JSUint8Array>[];
+    await response.read((JSUint8Array chunk) {
+      length += chunk.length.toDartInt;
+      chunks.add(chunk);
+    });
+    final SkDataHandle fontData = skDataCreate(length);
+    int dataAddress = skDataGetPointer(fontData).cast<Int8>().address;
+    final JSUint8Array wasmMemory = createUint8ArrayFromBuffer(skwasmInstance.wasmMemory.buffer);
+    for (final JSUint8Array chunk in chunks) {
+      wasmMemory.set(chunk, dataAddress.toJS);
+      dataAddress += chunk.length.toDartInt;
+    }
+    final SkwasmTypeface typeface = SkwasmTypeface(fontData);
+    skDataDispose(fontData);
+    if (typeface.handle != nullptr) {
+      final SkStringHandle familyNameHandle = skStringFromDartString(family);
+      fontCollectionRegisterTypeface(handle, typeface.handle, familyNameHandle);
+      registeredTypefaces.putIfAbsent(family, () => <SkwasmTypeface>[]).add(typeface);
+      skStringFree(familyNameHandle);
+      return null;
+    } else {
+      return FontInvalidDataError(ui_web.assetManager.getAssetUrl(asset.asset));
+    }
+  }
+
+  Future<bool> loadFontFromUrl(String familyName, String url) async {
+    final HttpFetchResponse response = await httpFetch(url);
+    int length = 0;
+    final List<JSUint8Array> chunks = <JSUint8Array>[];
+    await response.read((JSUint8Array chunk) {
+      length += chunk.length.toDartInt;
+      chunks.add(chunk);
+    });
+    final SkDataHandle fontData = skDataCreate(length);
+    int dataAddress = skDataGetPointer(fontData).cast<Int8>().address;
+    final JSUint8Array wasmMemory = createUint8ArrayFromBuffer(skwasmInstance.wasmMemory.buffer);
+    for (final JSUint8Array chunk in chunks) {
+      wasmMemory.set(chunk, dataAddress.toJS);
+      dataAddress += chunk.length.toDartInt;
+    }
+
+    final SkwasmTypeface typeface = SkwasmTypeface(fontData);
+    skDataDispose(fontData);
+    if (typeface.handle == nullptr) {
+      return false;
+    }
+    final SkStringHandle familyNameHandle = skStringFromDartString(familyName);
+    fontCollectionRegisterTypeface(handle, typeface.handle, familyNameHandle);
+    registeredTypefaces.putIfAbsent(familyName, () => <SkwasmTypeface>[]).add(typeface);
+    skStringFree(familyNameHandle);
+    return true;
+  }
+
+  @override
+  Future<bool> loadFontFromList(Uint8List list, {String? fontFamily}) async {
+    final SkDataHandle dataHandle = skDataCreate(list.length);
+    final Pointer<Int8> dataPointer = skDataGetPointer(dataHandle).cast<Int8>();
+    for (int i = 0; i < list.length; i++) {
+      dataPointer[i] = list[i];
+    }
+    final SkwasmTypeface typeface = SkwasmTypeface(dataHandle);
+    skDataDispose(dataHandle);
+    if (typeface.handle == nullptr) {
+      return false;
+    }
+
+    if (fontFamily != null) {
+      final SkStringHandle familyHandle = skStringFromDartString(fontFamily);
+      fontCollectionRegisterTypeface(handle, typeface.handle, familyHandle);
+      skStringFree(familyHandle);
+    } else {
+      fontCollectionRegisterTypeface(handle, typeface.handle, nullptr);
+    }
+    return true;
+  }
+
+  @override
+  void debugResetFallbackFonts() {
+    setDefaultFontFamilies(<String>['Roboto']);
+    fontFallbackManager = FontFallbackManager(SkwasmFallbackRegistry(this));
+    fontCollectionClearCaches(handle);
+  }
+}
+
+class SkwasmFallbackRegistry implements FallbackFontRegistry {
+  SkwasmFallbackRegistry(this.fontCollection);
+
+  final SkwasmFontCollection fontCollection;
+
+  @override
+  List<int> getMissingCodePoints(List<int> codePoints, List<String> fontFamilies)
+    => withStackScope((StackScope scope) {
+    final List<SkwasmTypeface> typefaces = fontFamilies
+      .map((String family) => fontCollection.registeredTypefaces[family])
+      .fold(const Iterable<SkwasmTypeface>.empty(),
+        (Iterable<SkwasmTypeface> accumulated, List<SkwasmTypeface>? typefaces) =>
+          typefaces == null ? accumulated : accumulated.followedBy(typefaces)).toList();
+    final Pointer<TypefaceHandle> typefaceBuffer = scope.allocPointerArray(typefaces.length).cast<TypefaceHandle>();
+    for (int i = 0; i < typefaces.length; i++) {
+      typefaceBuffer[i] = typefaces[i].handle;
+    }
+    final Pointer<Int32> codePointBuffer = scope.allocInt32Array(codePoints.length);
+    for (int i = 0; i < codePoints.length; i++) {
+      codePointBuffer[i] = codePoints[i];
+    }
+    final int missingCodePointCount = typefacesFilterCoveredCodePoints(
+      typefaceBuffer,
+      typefaces.length,
+      codePointBuffer,
+      codePoints.length
+    );
+    return List<int>.generate(missingCodePointCount, (int index) => codePointBuffer[index]);
+  });
+
+  @override
+  Future<void> loadFallbackFont(String familyName, String url) =>
+    fontCollection.loadFontFromUrl(familyName, url);
+
+  @override
+  void updateFallbackFontFamilies(List<String> families) =>
+    fontCollection.setDefaultFontFamilies(families);
+}
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/image.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/image.dart
new file mode 100644
index 0000000000000000000000000000000000000000..2b800ba2769644b63a5d5343d3e718f47af06b6a
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/image.dart
@@ -0,0 +1,102 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:ffi';
+import 'dart:js_interop';
+import 'dart:typed_data';
+
+import 'package:ui/src/engine.dart';
+import 'package:ui/src/engine/skwasm/skwasm_impl.dart';
+import 'package:ui/ui.dart' as ui;
+
+class SkwasmImage extends SkwasmObjectWrapper<RawImage> implements ui.Image {
+  SkwasmImage(ImageHandle handle) : super(handle, _registry)
+  {
+    ui.Image.onCreate?.call(this);
+  }
+
+  factory SkwasmImage.fromPixels(
+    Uint8List pixels,
+    int width,
+    int height,
+    ui.PixelFormat format, {
+    int? rowBytes,
+  }) {
+    final SkDataHandle dataHandle = skDataCreate(pixels.length);
+    final Pointer<Uint8> dataPointer = skDataGetPointer(dataHandle).cast<Uint8>();
+    for (int i = 0; i < pixels.length; i++) {
+      dataPointer[i] = pixels[i];
+    }
+    final ImageHandle imageHandle = imageCreateFromPixels(
+      dataHandle,
+      width,
+      height,
+      format.index,
+      rowBytes ?? 4 * width,
+    );
+    skDataDispose(dataHandle);
+    return SkwasmImage(imageHandle);
+  }
+
+  static final SkwasmFinalizationRegistry<RawImage> _registry =
+    SkwasmFinalizationRegistry<RawImage>(imageDispose);
+
+  @override
+  void dispose() {
+    super.dispose();
+    ui.Image.onDispose?.call(this);
+  }
+
+  @override
+  int get width => imageGetWidth(handle);
+
+  @override
+  int get height => imageGetHeight(handle);
+
+  @override
+  Future<ByteData?> toByteData(
+      {ui.ImageByteFormat format = ui.ImageByteFormat.rawRgba}) async {
+    if (format == ui.ImageByteFormat.png) {
+      final ui.PictureRecorder recorder = ui.PictureRecorder();
+      final ui.Canvas canvas = ui.Canvas(recorder);
+      canvas.drawImage(this, ui.Offset.zero, ui.Paint());
+      final DomImageBitmap bitmap =
+        (await (renderer as SkwasmRenderer).surface.renderPictures(
+          <SkwasmPicture>[recorder.endRecording() as SkwasmPicture],
+        )).imageBitmaps.single;
+      final DomOffscreenCanvas offscreenCanvas =
+        createDomOffscreenCanvas(bitmap.width.toDartInt, bitmap.height.toDartInt);
+      final DomCanvasRenderingContextBitmapRenderer context =
+        offscreenCanvas.getContext('bitmaprenderer')! as DomCanvasRenderingContextBitmapRenderer;
+      context.transferFromImageBitmap(bitmap);
+      final DomBlob blob = await offscreenCanvas.convertToBlob();
+      final JSArrayBuffer arrayBuffer = (await blob.arrayBuffer().toDart)! as JSArrayBuffer;
+
+      // Zero out the contents of the canvas so that resources can be reclaimed
+      // by the browser.
+      context.transferFromImageBitmap(null);
+      return ByteData.view(arrayBuffer.toDart);
+    } else {
+      return (renderer as SkwasmRenderer).surface.rasterizeImage(this, format);
+    }
+  }
+
+  @override
+  ui.ColorSpace get colorSpace => ui.ColorSpace.sRGB;
+
+  @override
+  SkwasmImage clone() {
+    imageRef(handle);
+    return SkwasmImage(handle);
+  }
+
+  @override
+  bool isCloneOf(ui.Image other) => other is SkwasmImage && handle == other.handle;
+
+  @override
+  List<StackTrace>? debugGetOpenHandleStackTraces() => null;
+
+  @override
+  String toString() => '[$width\u00D7$height]';
+}
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/memory.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/memory.dart
new file mode 100644
index 0000000000000000000000000000000000000000..c0f9a8470b3baa3ce365a80a93f78729450d8207
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/memory.dart
@@ -0,0 +1,49 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:ffi';
+import 'dart:js_interop';
+
+import 'package:ui/src/engine.dart';
+
+class SkwasmObjectWrapper<T extends NativeType> {
+  SkwasmObjectWrapper(this.handle, this.registry) {
+    registry.register(this);
+  }
+  final SkwasmFinalizationRegistry<T> registry;
+  final Pointer<T> handle;
+  bool _isDisposed = false;
+
+  void dispose() {
+    assert(!_isDisposed);
+    registry.evict(this);
+    _isDisposed = true;
+  }
+
+  bool get debugDisposed => _isDisposed;
+}
+
+typedef DisposeFunction<T extends NativeType> = void Function(Pointer<T>);
+
+class SkwasmFinalizationRegistry<T extends NativeType> {
+  SkwasmFinalizationRegistry(this.dispose)
+    : registry = DomFinalizationRegistry(((JSNumber address) =>
+      dispose(Pointer<T>.fromAddress(address.toDartDouble.toInt()))
+    ).toJS);
+
+  final DomFinalizationRegistry registry;
+  final DisposeFunction<T> dispose;
+
+  void register(SkwasmObjectWrapper<T> wrapper) {
+    final JSAny jsWrapper = wrapper.toJSWrapper;
+    registry.registerWithToken(
+        jsWrapper, wrapper.handle.address.toJS, jsWrapper);
+  }
+
+  void evict(SkwasmObjectWrapper<T> wrapper) {
+    final JSAny jsWrapper = wrapper.toJSWrapper;
+    registry.unregister(jsWrapper);
+    dispose(wrapper.handle);
+  }
+}
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/paint.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/paint.dart
new file mode 100644
index 0000000000000000000000000000000000000000..26e91164134df2dfe508a1d72d9093894b5c6776
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/paint.dart
@@ -0,0 +1,179 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:ffi';
+
+import 'package:ui/src/engine.dart';
+import 'package:ui/src/engine/skwasm/skwasm_impl.dart';
+import 'package:ui/ui.dart' as ui;
+
+class SkwasmPaint extends SkwasmObjectWrapper<RawPaint> implements ui.Paint {
+  SkwasmPaint() : super(paintCreate(), _registry);
+
+  static final SkwasmFinalizationRegistry<RawPaint> _registry =
+    SkwasmFinalizationRegistry<RawPaint>(paintDispose);
+
+  ui.BlendMode _cachedBlendMode = ui.BlendMode.srcOver;
+
+  SkwasmShader? _shader;
+  ui.ImageFilter? _imageFilter;
+
+  EngineColorFilter? _colorFilter;
+
+  ui.MaskFilter? _maskFilter;
+
+  bool _invertColors = false;
+
+  static final SkwasmColorFilter _invertColorFilter = SkwasmColorFilter.fromEngineColorFilter(
+    const EngineColorFilter.matrix(<double>[
+      -1.0, 0, 0, 1.0, 0, // row
+      0, -1.0, 0, 1.0, 0, // row
+      0, 0, -1.0, 1.0, 0, // row
+      1.0, 1.0, 1.0, 1.0, 0
+    ])
+  );
+
+  @override
+  ui.BlendMode get blendMode {
+    return _cachedBlendMode;
+  }
+
+  @override
+  set blendMode(ui.BlendMode blendMode) {
+    if (_cachedBlendMode != blendMode) {
+      _cachedBlendMode = blendMode;
+      paintSetBlendMode(handle, blendMode.index);
+    }
+  }
+
+  @override
+  ui.PaintingStyle get style => ui.PaintingStyle.values[paintGetStyle(handle)];
+
+  @override
+  set style(ui.PaintingStyle style) => paintSetStyle(handle, style.index);
+
+  @override
+  double get strokeWidth => paintGetStrokeWidth(handle);
+
+  @override
+  set strokeWidth(double width) => paintSetStrokeWidth(handle, width);
+
+  @override
+  ui.StrokeCap get strokeCap => ui.StrokeCap.values[paintGetStrokeCap(handle)];
+
+  @override
+  set strokeCap(ui.StrokeCap cap) => paintSetStrokeCap(handle, cap.index);
+
+  @override
+  ui.StrokeJoin get strokeJoin => ui.StrokeJoin.values[paintGetStrokeJoin(handle)];
+
+  @override
+  set strokeJoin(ui.StrokeJoin join) => paintSetStrokeJoin(handle, join.index);
+
+  @override
+  bool get isAntiAlias => paintGetAntiAlias(handle);
+
+  @override
+  set isAntiAlias(bool value) => paintSetAntiAlias(handle, value);
+
+  @override
+  ui.Color get color => ui.Color(paintGetColorInt(handle));
+
+  @override
+  set color(ui.Color color) => paintSetColorInt(handle, color.value);
+
+  @override
+  double get strokeMiterLimit => paintGetMiterLimit(handle);
+
+  @override
+  set strokeMiterLimit(double limit) => paintSetMiterLimit(handle, limit);
+
+  @override
+  ui.Shader? get shader => _shader;
+
+  @override
+  set shader(ui.Shader? uiShader) {
+    final SkwasmShader? skwasmShader = uiShader as SkwasmShader?;
+    _shader = skwasmShader;
+    final ShaderHandle shaderHandle =
+      skwasmShader != null ? skwasmShader.handle : nullptr;
+    paintSetShader(handle, shaderHandle);
+  }
+
+  @override
+  ui.FilterQuality filterQuality = ui.FilterQuality.none;
+
+  @override
+  ui.ImageFilter? get imageFilter => _imageFilter;
+
+  @override
+  set imageFilter(ui.ImageFilter? filter) {
+    _imageFilter = filter;
+
+    final SkwasmImageFilter? nativeImageFilter = filter != null
+      ? SkwasmImageFilter.fromUiFilter(filter)
+      : null;
+    paintSetImageFilter(handle, nativeImageFilter != null ? nativeImageFilter.handle : nullptr);
+  }
+
+  @override
+  ui.ColorFilter? get colorFilter => _colorFilter;
+
+  void _setEffectiveColorFilter() {
+    final SkwasmColorFilter? nativeFilter = _colorFilter != null
+      ? SkwasmColorFilter.fromEngineColorFilter(_colorFilter!) : null;
+    if (_invertColors) {
+      if (nativeFilter != null) {
+        final SkwasmColorFilter composedFilter = SkwasmColorFilter.composed(_invertColorFilter, nativeFilter);
+        nativeFilter.dispose();
+        paintSetColorFilter(handle, composedFilter.handle);
+        composedFilter.dispose();
+      } else {
+        paintSetColorFilter(handle, _invertColorFilter.handle);
+      }
+    } else if (nativeFilter != null) {
+      paintSetColorFilter(handle, nativeFilter.handle);
+      nativeFilter.dispose();
+    } else {
+      paintSetColorFilter(handle, nullptr);
+    }
+  }
+
+  @override
+  set colorFilter(ui.ColorFilter? filter) {
+    _colorFilter = filter as EngineColorFilter?;
+    _setEffectiveColorFilter();
+  }
+
+  @override
+  ui.MaskFilter? get maskFilter => _maskFilter;
+
+  @override
+  set maskFilter(ui.MaskFilter? filter) {
+    _maskFilter = filter;
+    if (filter == null) {
+      paintSetMaskFilter(handle, nullptr);
+    } else {
+      final SkwasmMaskFilter nativeFilter = SkwasmMaskFilter.fromUiMaskFilter(filter);
+      paintSetMaskFilter(handle, nativeFilter.handle);
+      nativeFilter.dispose();
+    }
+  }
+
+  @override
+  bool get invertColors => _invertColors;
+
+  @override
+  set invertColors(bool invertColors) {
+    if (_invertColors == invertColors) {
+      return;
+    }
+    _invertColors = invertColors;
+    _setEffectiveColorFilter();
+  }
+
+  // TODO(yjbanov): https://github.com/flutter/flutter/issues/141639
+  @override
+  String toString() => 'Paint()';
+}
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/paragraph.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/paragraph.dart
new file mode 100644
index 0000000000000000000000000000000000000000..b5d4f2c0328493123f5848435deef8473944ecf1
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/paragraph.dart
@@ -0,0 +1,1050 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:convert';
+import 'dart:ffi';
+import 'dart:js_interop';
+
+import 'package:ui/src/engine.dart';
+import 'package:ui/src/engine/skwasm/skwasm_impl.dart';
+import 'package:ui/ui.dart' as ui;
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
+
+const int _kSoftLineBreak = 0;
+const int _kHardLineBreak = 100;
+
+final List<String> _testFonts = <String>['FlutterTest', 'Ahem'];
+List<String> _computeEffectiveFontFamilies(List<String> fontFamilies) {
+  if (!ui_web.debugEmulateFlutterTesterEnvironment) {
+    return fontFamilies;
+  }
+  final Iterable<String> filteredFonts = fontFamilies.where(_testFonts.contains);
+  return filteredFonts.isEmpty ? _testFonts : filteredFonts.toList();
+}
+
+class SkwasmLineMetrics extends SkwasmObjectWrapper<RawLineMetrics> implements ui.LineMetrics {
+  factory SkwasmLineMetrics({
+    required bool hardBreak,
+    required double ascent,
+    required double descent,
+    required double unscaledAscent,
+    required double height,
+    required double width,
+    required double left,
+    required double baseline,
+    required int lineNumber,
+  }) => SkwasmLineMetrics._(lineMetricsCreate(
+    hardBreak,
+    ascent,
+    descent,
+    unscaledAscent,
+    height,
+    width,
+    left,
+    baseline,
+    lineNumber,
+  ));
+
+  SkwasmLineMetrics._(LineMetricsHandle handle) : super(handle, _registry);
+
+  static final SkwasmFinalizationRegistry<RawLineMetrics> _registry =
+    SkwasmFinalizationRegistry<RawLineMetrics>(lineMetricsDispose);
+
+  @override
+  bool get hardBreak => lineMetricsGetHardBreak(handle);
+
+  @override
+  double get ascent => lineMetricsGetAscent(handle);
+
+  @override
+  double get descent => lineMetricsGetDescent(handle);
+
+  @override
+  double get unscaledAscent => lineMetricsGetUnscaledAscent(handle);
+
+  @override
+  double get height => lineMetricsGetHeight(handle);
+
+  @override
+  double get width => lineMetricsGetWidth(handle);
+
+  @override
+  double get left => lineMetricsGetLeft(handle);
+
+  @override
+  double get baseline => lineMetricsGetBaseline(handle);
+
+  @override
+  int get lineNumber => lineMetricsGetLineNumber(handle);
+}
+
+class SkwasmParagraph extends SkwasmObjectWrapper<RawParagraph> implements ui.Paragraph {
+  SkwasmParagraph(ParagraphHandle handle) : super(handle, _registry);
+
+  static final SkwasmFinalizationRegistry<RawParagraph> _registry =
+    SkwasmFinalizationRegistry<RawParagraph>(paragraphDispose);
+
+  bool _hasCheckedForMissingCodePoints = false;
+
+  @override
+  double get width => paragraphGetWidth(handle);
+
+  @override
+  double get height => paragraphGetHeight(handle);
+
+  @override
+  double get longestLine => paragraphGetLongestLine(handle);
+
+  @override
+  double get minIntrinsicWidth => paragraphGetMinIntrinsicWidth(handle);
+
+  @override
+  double get maxIntrinsicWidth => paragraphGetMaxIntrinsicWidth(handle);
+
+  @override
+  double get alphabeticBaseline => paragraphGetAlphabeticBaseline(handle);
+
+  @override
+  double get ideographicBaseline => paragraphGetIdeographicBaseline(handle);
+
+  @override
+  bool get didExceedMaxLines => paragraphGetDidExceedMaxLines(handle);
+
+  @override
+  int get numberOfLines => paragraphGetLineCount(handle);
+
+  @override
+  int? getLineNumberAt(int codeUnitOffset) {
+    final int lineNumber = paragraphGetLineNumberAt(handle, codeUnitOffset);
+    return lineNumber >= 0 ? lineNumber : null;
+  }
+
+  @override
+  void layout(ui.ParagraphConstraints constraints) {
+    paragraphLayout(handle, constraints.width);
+    if (!debugDisableFontFallbacks && !_hasCheckedForMissingCodePoints) {
+      _hasCheckedForMissingCodePoints = true;
+      final int missingCodePointCount = paragraphGetUnresolvedCodePoints(handle, nullptr, 0);
+      if (missingCodePointCount > 0) {
+        withStackScope((StackScope scope) {
+          final Pointer<Uint32> codePointBuffer = scope.allocUint32Array(missingCodePointCount);
+          final int returnedCodePointCount = paragraphGetUnresolvedCodePoints(
+            handle,
+            codePointBuffer,
+            missingCodePointCount
+          );
+          assert(missingCodePointCount == returnedCodePointCount);
+          renderer.fontCollection.fontFallbackManager!.addMissingCodePoints(
+            List<int>.generate(
+              missingCodePointCount,
+              (int index) => codePointBuffer[index]
+            )
+          );
+        });
+      }
+    }
+  }
+
+  List<ui.TextBox> _convertTextBoxList(TextBoxListHandle listHandle) {
+    final int length = textBoxListGetLength(listHandle);
+    return withStackScope((StackScope scope) {
+      final RawRect tempRect = scope.allocFloatArray(4);
+      return List<ui.TextBox>.generate(length, (int index) {
+        final int textDirectionIndex =
+          textBoxListGetBoxAtIndex(listHandle, index, tempRect);
+        return ui.TextBox.fromLTRBD(
+          tempRect[0],
+          tempRect[1],
+          tempRect[2],
+          tempRect[3],
+          ui.TextDirection.values[textDirectionIndex],
+        );
+      });
+    });
+  }
+
+  @override
+  List<ui.TextBox> getBoxesForRange(
+    int start,
+    int end, {
+    ui.BoxHeightStyle boxHeightStyle = ui.BoxHeightStyle.tight,
+    ui.BoxWidthStyle boxWidthStyle = ui.BoxWidthStyle.tight
+  }) {
+    final TextBoxListHandle listHandle = paragraphGetBoxesForRange(
+      handle,
+      start,
+      end,
+      boxHeightStyle.index,
+      boxWidthStyle.index
+    );
+    final List<ui.TextBox> boxes = _convertTextBoxList(listHandle);
+    textBoxListDispose(listHandle);
+    return boxes;
+  }
+
+  @override
+  ui.TextPosition getPositionForOffset(ui.Offset offset) => withStackScope((StackScope scope) {
+    final Pointer<Int32> outAffinity = scope.allocInt32Array(1);
+    final int position = paragraphGetPositionForOffset(
+      handle,
+      offset.dx,
+      offset.dy,
+      outAffinity
+    );
+    return ui.TextPosition(
+      offset: position,
+      affinity: ui.TextAffinity.values[outAffinity[0]],
+    );
+  });
+
+  @override
+  ui.GlyphInfo? getGlyphInfoAt(int codeUnitOffset) {
+    return withStackScope((StackScope scope) {
+      final Pointer<Float> outRect = scope.allocFloatArray(4);
+      final Pointer<Uint32> outRange = scope.allocUint32Array(2);
+      final Pointer<Bool> outBooleanFlags = scope.allocBoolArray(1);
+      return paragraphGetGlyphInfoAt(handle, codeUnitOffset, outRect, outRange, outBooleanFlags)
+        ? ui.GlyphInfo(
+          scope.convertRectFromNative(outRect),
+          ui.TextRange(start: outRange[0], end: outRange[1]),
+          outBooleanFlags[0] ? ui.TextDirection.ltr : ui.TextDirection.rtl,
+        )
+        : null;
+    });
+  }
+
+  @override
+  ui.GlyphInfo? getClosestGlyphInfoForOffset(ui.Offset offset) {
+    return withStackScope((StackScope scope) {
+      final Pointer<Float> outRect = scope.allocFloatArray(4);
+      final Pointer<Uint32> outRange = scope.allocUint32Array(2);
+      final Pointer<Bool> outBooleanFlags = scope.allocBoolArray(1);
+      return paragraphGetClosestGlyphInfoAtCoordinate(handle, offset.dx, offset.dy, outRect, outRange, outBooleanFlags)
+        ? ui.GlyphInfo(
+          scope.convertRectFromNative(outRect),
+          ui.TextRange(start: outRange[0], end: outRange[1]),
+          outBooleanFlags[0] ? ui.TextDirection.ltr : ui.TextDirection.rtl,
+        )
+        : null;
+    });
+  }
+
+  @override
+  ui.TextRange getWordBoundary(ui.TextPosition position) => withStackScope((StackScope scope) {
+    final Pointer<Int32> outRange = scope.allocInt32Array(2);
+    final int characterPosition = switch (position.affinity) {
+      ui.TextAffinity.upstream => position.offset - 1,
+      ui.TextAffinity.downstream => position.offset,
+    };
+    paragraphGetWordBoundary(handle, characterPosition, outRange);
+    return ui.TextRange(start: outRange[0], end: outRange[1]);
+  });
+
+  @override
+  ui.TextRange getLineBoundary(ui.TextPosition position) {
+    final int lineNumber = paragraphGetLineNumberAt(handle, position.offset);
+    final LineMetricsHandle metricsHandle =
+      paragraphGetLineMetricsAtIndex(handle, lineNumber);
+    final ui.TextRange range = ui.TextRange(
+      start: lineMetricsGetStartIndex(metricsHandle),
+      end: lineMetricsGetEndIndex(metricsHandle),
+    );
+    lineMetricsDispose(metricsHandle);
+    return range;
+  }
+
+  @override
+  List<ui.TextBox> getBoxesForPlaceholders() {
+    final TextBoxListHandle listHandle = paragraphGetBoxesForPlaceholders(handle);
+    final List<ui.TextBox> boxes = _convertTextBoxList(listHandle);
+    textBoxListDispose(listHandle);
+    return boxes;
+  }
+
+  @override
+  List<SkwasmLineMetrics> computeLineMetrics() {
+    final int lineCount = paragraphGetLineCount(handle);
+    return List<SkwasmLineMetrics>.generate(lineCount,
+      (int index) => SkwasmLineMetrics._(paragraphGetLineMetricsAtIndex(handle, index))
+    );
+  }
+
+  @override
+  ui.LineMetrics? getLineMetricsAt(int index) {
+    final LineMetricsHandle lineMetrics = paragraphGetLineMetricsAtIndex(handle, index);
+    return lineMetrics != nullptr ? SkwasmLineMetrics._(lineMetrics) : null;
+  }
+}
+
+void withScopedFontList(
+    List<String> fontFamilies,
+  void Function(Pointer<SkStringHandle>, int) callback) {
+  withStackScope((StackScope scope) {
+    final Pointer<SkStringHandle> familiesPtr =
+      scope.allocPointerArray(fontFamilies.length).cast<SkStringHandle>();
+    int nativeIndex = 0;
+    for (int i = 0; i < fontFamilies.length; i++) {
+      familiesPtr[nativeIndex] = skStringFromDartString(fontFamilies[i]);
+      nativeIndex++;
+    }
+    callback(familiesPtr, fontFamilies.length);
+    for (int i = 0; i < fontFamilies.length; i++) {
+      skStringFree(familiesPtr[i]);
+    }
+  });
+}
+
+class SkwasmNativeTextStyle extends SkwasmObjectWrapper<RawTextStyle> {
+  SkwasmNativeTextStyle(TextStyleHandle handle) : super(handle, _registry);
+
+  factory SkwasmNativeTextStyle.defaultTextStyle() => SkwasmNativeTextStyle(textStyleCreate());
+
+  static final SkwasmFinalizationRegistry<RawTextStyle> _registry =
+    SkwasmFinalizationRegistry<RawTextStyle>(textStyleDispose);
+
+  SkwasmNativeTextStyle copy() {
+    return SkwasmNativeTextStyle(textStyleCopy(handle));
+  }
+}
+
+class SkwasmTextStyle implements ui.TextStyle {
+  SkwasmTextStyle({
+    this.color,
+    this.decoration,
+    this.decorationColor,
+    this.decorationStyle,
+    this.decorationThickness,
+    this.fontWeight,
+    this.fontStyle,
+    this.textBaseline,
+    this.fontFamily,
+    this.fontFamilyFallback,
+    this.fontSize,
+    this.letterSpacing,
+    this.wordSpacing,
+    this.height,
+    this.leadingDistribution,
+    this.locale,
+    this.background,
+    this.foreground,
+    this.shadows,
+    this.fontFeatures,
+    this.fontVariations,
+  }) : assert(
+        color == null || foreground == null,
+        'Cannot provide both a color and a foreground\n'
+        'The color argument is just a shorthand for "foreground: Paint()..color = color".',
+       );
+
+  void applyToNative(SkwasmNativeTextStyle style) {
+    final TextStyleHandle handle = style.handle;
+    if (color != null) {
+      textStyleSetColor(handle, color!.value);
+    }
+    if (decoration != null) {
+      textStyleSetDecoration(handle, decoration!.maskValue);
+    }
+    if (decorationColor != null) {
+      textStyleSetDecorationColor(handle, decorationColor!.value);
+    }
+    if (decorationStyle != null) {
+      textStyleSetDecorationStyle(handle, decorationStyle!.index);
+    }
+    if (decorationThickness != null) {
+      textStyleSetDecorationThickness(handle, decorationThickness!);
+    }
+    if (fontWeight != null || fontStyle != null) {
+      textStyleSetFontStyle(
+        handle,
+        (fontWeight ?? ui.FontWeight.normal).value,
+        (fontStyle ?? ui.FontStyle.normal).index
+      );
+    }
+    if (textBaseline != null) {
+      textStyleSetTextBaseline(handle, textBaseline!.index);
+    }
+
+    final List<String> effectiveFontFamilies = _computeEffectiveFontFamilies(fontFamilies);
+    if (effectiveFontFamilies.isNotEmpty) {
+      withScopedFontList(effectiveFontFamilies,
+        (Pointer<SkStringHandle> families, int count) =>
+          textStyleAddFontFamilies(handle, families, count));
+    }
+
+    if (fontSize != null) {
+      textStyleSetFontSize(handle, fontSize!);
+    }
+    if (letterSpacing != null) {
+      textStyleSetLetterSpacing(handle, letterSpacing!);
+    }
+    if (wordSpacing != null) {
+      textStyleSetWordSpacing(handle, wordSpacing!);
+    }
+    if (height != null) {
+      textStyleSetHeight(handle, height!);
+    }
+    if (leadingDistribution != null) {
+      textStyleSetHalfLeading(
+        handle,
+        leadingDistribution == ui.TextLeadingDistribution.even
+      );
+    }
+    if (locale != null) {
+      final SkStringHandle localeHandle =
+        skStringFromDartString(locale!.toLanguageTag());
+      textStyleSetLocale(handle, localeHandle);
+      skStringFree(localeHandle);
+    }
+    if (background != null) {
+      textStyleSetBackground(handle, (background! as SkwasmPaint).handle);
+    }
+    if (foreground != null) {
+      textStyleSetForeground(handle, (foreground! as SkwasmPaint).handle);
+    }
+    if (shadows != null) {
+      for (final ui.Shadow shadow in shadows!) {
+        textStyleAddShadow(
+          handle,
+          shadow.color.value,
+          shadow.offset.dx,
+          shadow.offset.dy,
+          shadow.blurSigma,
+        );
+      }
+    }
+    if (fontFeatures != null) {
+      for (final ui.FontFeature feature in fontFeatures!) {
+        final SkStringHandle featureName = skStringFromDartString(feature.feature);
+        textStyleAddFontFeature(handle, featureName, feature.value);
+        skStringFree(featureName);
+      }
+    }
+
+    if (fontVariations != null && fontVariations!.isNotEmpty) {
+      final int variationCount = fontVariations!.length;
+      withStackScope((StackScope scope) {
+        final Pointer<Uint32> axisBuffer = scope.allocUint32Array(variationCount);
+        final Pointer<Float> valueBuffer = scope.allocFloatArray(variationCount);
+        for (int i = 0; i < variationCount; i++) {
+          final ui.FontVariation variation = fontVariations![i];
+          final String axis = variation.axis;
+          assert(axis.length == 4); // 4 byte code
+          final int axisNumber =
+            axis.codeUnitAt(0) << 24 |
+            axis.codeUnitAt(1) << 16 |
+            axis.codeUnitAt(2) << 8 |
+            axis.codeUnitAt(3);
+          axisBuffer[i] = axisNumber;
+          valueBuffer[i] = variation.value;
+        }
+        textStyleSetFontVariations(handle, axisBuffer, valueBuffer, variationCount);
+      });
+    }
+  }
+
+  List<String> get fontFamilies => <String>[
+    if (fontFamily != null) fontFamily!,
+    if (fontFamilyFallback != null) ...fontFamilyFallback!,
+  ];
+
+  final ui.Color? color;
+  final ui.TextDecoration? decoration;
+  final ui.Color? decorationColor;
+  final ui.TextDecorationStyle? decorationStyle;
+  final double? decorationThickness;
+  final ui.FontWeight? fontWeight;
+  final ui.FontStyle? fontStyle;
+  final ui.TextBaseline? textBaseline;
+  final String? fontFamily;
+  final List<String>? fontFamilyFallback;
+  final double? fontSize;
+  final double? letterSpacing;
+  final double? wordSpacing;
+  final double? height;
+  final ui.TextLeadingDistribution? leadingDistribution;
+  final ui.Locale? locale;
+  final ui.Paint? background;
+  final ui.Paint? foreground;
+  final List<ui.Shadow>? shadows;
+  final List<ui.FontFeature>? fontFeatures;
+  final List<ui.FontVariation>? fontVariations;
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) {
+      return true;
+    }
+    return other is SkwasmTextStyle
+        && other.color == color
+        && other.decoration == decoration
+        && other.decorationColor == decorationColor
+        && other.decorationStyle == decorationStyle
+        && other.fontWeight == fontWeight
+        && other.fontStyle == fontStyle
+        && other.textBaseline == textBaseline
+        && other.leadingDistribution == leadingDistribution
+        && other.fontFamily == fontFamily
+        && other.fontSize == fontSize
+        && other.letterSpacing == letterSpacing
+        && other.wordSpacing == wordSpacing
+        && other.height == height
+        && other.decorationThickness == decorationThickness
+        && other.locale == locale
+        && other.background == background
+        && other.foreground == foreground
+        && listEquals<ui.Shadow>(other.shadows, shadows)
+        && listEquals<String>(other.fontFamilyFallback, fontFamilyFallback)
+        && listEquals<ui.FontFeature>(other.fontFeatures, fontFeatures)
+        && listEquals<ui.FontVariation>(other.fontVariations, fontVariations);
+  }
+
+  @override
+  int get hashCode {
+    final List<ui.Shadow>? shadows = this.shadows;
+    final List<ui.FontFeature>? fontFeatures = this.fontFeatures;
+    final List<ui.FontVariation>? fontVariations = this.fontVariations;
+    final List<String>? fontFamilyFallback = this.fontFamilyFallback;
+    return Object.hash(
+      color,
+      decoration,
+      decorationColor,
+      decorationStyle,
+      fontWeight,
+      fontStyle,
+      textBaseline,
+      leadingDistribution,
+      fontFamily,
+      fontFamilyFallback == null ? null : Object.hashAll(fontFamilyFallback),
+      fontSize,
+      letterSpacing,
+      wordSpacing,
+      height,
+      locale,
+      background,
+      foreground,
+      shadows == null ? null : Object.hashAll(shadows),
+      decorationThickness,
+      // Object.hash goes up to 20 arguments, but we have 21
+      Object.hash(
+        fontFeatures == null ? null : Object.hashAll(fontFeatures),
+        fontVariations == null ? null : Object.hashAll(fontVariations),
+      )
+    );
+  }
+
+  @override
+  String toString() {
+    String result = super.toString();
+    assert(() {
+      final List<String>? fontFamilyFallback = this.fontFamilyFallback;
+      final double? fontSize = this.fontSize;
+      final double? height = this.height;
+      result = 'TextStyle('
+          'color: ${color ?? "unspecified"}, '
+          'decoration: ${decoration ?? "unspecified"}, '
+          'decorationColor: ${decorationColor ?? "unspecified"}, '
+          'decorationStyle: ${decorationStyle ?? "unspecified"}, '
+          'decorationThickness: ${decorationThickness ?? "unspecified"}, '
+          'fontWeight: ${fontWeight ?? "unspecified"}, '
+          'fontStyle: ${fontStyle ?? "unspecified"}, '
+          'textBaseline: ${textBaseline ?? "unspecified"}, '
+          'fontFamily: ${fontFamily ?? "unspecified"}, '
+          'fontFamilyFallback: ${fontFamilyFallback != null && fontFamilyFallback.isNotEmpty ? fontFamilyFallback : "unspecified"}, '
+          'fontSize: ${fontSize != null ? fontSize.toStringAsFixed(1) : "unspecified"}, '
+          'letterSpacing: ${letterSpacing != null ? "${letterSpacing}x" : "unspecified"}, '
+          'wordSpacing: ${wordSpacing != null ? "${wordSpacing}x" : "unspecified"}, '
+          'height: ${height != null ? "${height.toStringAsFixed(1)}x" : "unspecified"}, '
+          'leadingDistribution: ${leadingDistribution ?? "unspecified"}, '
+          'locale: ${locale ?? "unspecified"}, '
+          'background: ${background ?? "unspecified"}, '
+          'foreground: ${foreground ?? "unspecified"}, '
+          'shadows: ${shadows ?? "unspecified"}, '
+          'fontFeatures: ${fontFeatures ?? "unspecified"}, '
+          'fontVariations: ${fontVariations ?? "unspecified"}'
+          ')';
+      return true;
+    }());
+    return result;
+  }
+}
+
+final class SkwasmStrutStyle extends SkwasmObjectWrapper<RawStrutStyle> implements ui.StrutStyle {
+  factory SkwasmStrutStyle({
+    String? fontFamily,
+    List<String>? fontFamilyFallback,
+    double? fontSize,
+    double? height,
+    double? leading,
+    ui.FontWeight? fontWeight,
+    ui.FontStyle? fontStyle,
+    bool? forceStrutHeight,
+    ui.TextLeadingDistribution? leadingDistribution,
+  }) {
+    final StrutStyleHandle handle = strutStyleCreate();
+    final List<String> effectiveFontFamilies = _computeEffectiveFontFamilies(<String>[
+      if (fontFamily != null) fontFamily,
+      if (fontFamilyFallback != null) ...fontFamilyFallback,
+    ]);
+    if (effectiveFontFamilies.isNotEmpty) {
+      withScopedFontList(effectiveFontFamilies, (Pointer<SkStringHandle> families, int count) =>
+          strutStyleSetFontFamilies(handle, families, count));
+    }
+    if (fontSize != null) {
+      strutStyleSetFontSize(handle, fontSize);
+    }
+    if (height != null) {
+      strutStyleSetHeight(handle, height);
+    }
+    if (leadingDistribution != null) {
+      strutStyleSetHalfLeading(
+        handle,
+        leadingDistribution == ui.TextLeadingDistribution.even);
+    }
+    if (leading != null) {
+      strutStyleSetLeading(handle, leading);
+    }
+    if (fontWeight != null || fontStyle != null) {
+      fontWeight ??= ui.FontWeight.normal;
+      fontStyle ??= ui.FontStyle.normal;
+      strutStyleSetFontStyle(handle, fontWeight.value, fontStyle.index);
+    }
+    if (forceStrutHeight != null) {
+      strutStyleSetForceStrutHeight(handle, forceStrutHeight);
+    }
+    return SkwasmStrutStyle._(
+      handle,
+      fontFamily,
+      fontFamilyFallback,
+      fontSize,
+      height,
+      leadingDistribution,
+      leading,
+      fontWeight,
+      fontStyle,
+      forceStrutHeight,
+    );
+  }
+
+  SkwasmStrutStyle._(
+    StrutStyleHandle handle,
+    this._fontFamily,
+    this._fontFamilyFallback,
+    this._fontSize,
+    this._height,
+    this._leadingDistribution,
+    this._leading,
+    this._fontWeight,
+    this._fontStyle,
+    this._forceStrutHeight,
+  ) : super(handle, _registry);
+
+  static final SkwasmFinalizationRegistry<RawStrutStyle> _registry =
+    SkwasmFinalizationRegistry<RawStrutStyle>(strutStyleDispose);
+
+  final String? _fontFamily;
+  final List<String>? _fontFamilyFallback;
+  final double? _fontSize;
+  final double? _height;
+  final double? _leading;
+  final ui.FontWeight? _fontWeight;
+  final ui.FontStyle? _fontStyle;
+  final bool? _forceStrutHeight;
+  final ui.TextLeadingDistribution? _leadingDistribution;
+
+  @override
+  bool operator ==(Object other) {
+    return other is SkwasmStrutStyle &&
+        other._fontFamily == _fontFamily &&
+        other._fontSize == _fontSize &&
+        other._height == _height &&
+        other._leading == _leading &&
+        other._leadingDistribution == _leadingDistribution &&
+        other._fontWeight == _fontWeight &&
+        other._fontStyle == _fontStyle &&
+        other._forceStrutHeight == _forceStrutHeight &&
+        listEquals<String>(other._fontFamilyFallback, _fontFamilyFallback);
+  }
+
+  @override
+  int get hashCode {
+    final List<String>? fontFamilyFallback = _fontFamilyFallback;
+    return Object.hash(
+      _fontFamily,
+      fontFamilyFallback != null ? Object.hashAll(fontFamilyFallback) : null,
+      _fontSize,
+      _height,
+      _leading,
+      _leadingDistribution,
+      _fontWeight,
+      _fontStyle,
+      _forceStrutHeight,
+    );
+  }
+}
+
+class SkwasmParagraphStyle extends SkwasmObjectWrapper<RawParagraphStyle> implements ui.ParagraphStyle {
+  factory SkwasmParagraphStyle({
+    ui.TextAlign? textAlign,
+    ui.TextDirection? textDirection,
+    int? maxLines,
+    String? fontFamily,
+    double? fontSize,
+    double? height,
+    ui.TextHeightBehavior? textHeightBehavior,
+    ui.FontWeight? fontWeight,
+    ui.FontStyle? fontStyle,
+    ui.StrutStyle? strutStyle,
+    String? ellipsis,
+    ui.Locale? locale,
+  }) {
+    final ParagraphStyleHandle handle = paragraphStyleCreate();
+    if (textAlign != null) {
+      paragraphStyleSetTextAlign(handle, textAlign.index);
+    }
+    if (textDirection != null) {
+      paragraphStyleSetTextDirection(handle, textDirection.index);
+    }
+    if (maxLines != null) {
+      paragraphStyleSetMaxLines(handle, maxLines);
+    }
+    if (height != null) {
+      paragraphStyleSetHeight(handle, height);
+    }
+    if (textHeightBehavior != null) {
+      paragraphStyleSetTextHeightBehavior(
+        handle,
+        textHeightBehavior.applyHeightToFirstAscent,
+        textHeightBehavior.applyHeightToLastDescent,
+      );
+    }
+    if (ellipsis != null) {
+      final SkStringHandle ellipsisHandle = skStringFromDartString(ellipsis);
+      paragraphStyleSetEllipsis(handle, ellipsisHandle);
+      skStringFree(ellipsisHandle);
+    }
+    if (strutStyle != null) {
+      strutStyle as SkwasmStrutStyle;
+      paragraphStyleSetStrutStyle(handle, strutStyle.handle);
+    }
+    final SkwasmNativeTextStyle textStyle =
+      (renderer.fontCollection as SkwasmFontCollection).defaultTextStyle.copy();
+    final TextStyleHandle textStyleHandle = textStyle.handle;
+
+    final List<String> effectiveFontFamilies = _computeEffectiveFontFamilies(<String>[
+      if (fontFamily != null) fontFamily
+    ]);
+    if (effectiveFontFamilies.isNotEmpty) {
+      withScopedFontList(effectiveFontFamilies, (Pointer<SkStringHandle> families, int count) =>
+          textStyleAddFontFamilies(textStyleHandle, families, count));
+    }
+    if (fontSize != null) {
+      textStyleSetFontSize(textStyleHandle, fontSize);
+    }
+    if (fontWeight != null || fontStyle != null) {
+      fontWeight ??= ui.FontWeight.normal;
+      fontStyle ??= ui.FontStyle.normal;
+      textStyleSetFontStyle(textStyleHandle, fontWeight.value, fontStyle.index);
+    }
+    if (textHeightBehavior != null) {
+      textStyleSetHalfLeading(
+        textStyleHandle,
+        textHeightBehavior.leadingDistribution == ui.TextLeadingDistribution.even,
+      );
+    }
+    if (locale != null) {
+      final SkStringHandle localeHandle =
+      skStringFromDartString(locale.toLanguageTag());
+      textStyleSetLocale(textStyleHandle, localeHandle);
+      skStringFree(localeHandle);
+    }
+    paragraphStyleSetTextStyle(handle, textStyleHandle);
+    paragraphStyleSetApplyRoundingHack(handle, false);
+
+    return SkwasmParagraphStyle._(
+      handle,
+      textStyle,
+      fontFamily,
+      textAlign,
+      textDirection,
+      fontWeight,
+      fontStyle,
+      maxLines,
+      fontFamily,
+      fontSize,
+      height,
+      textHeightBehavior,
+      strutStyle,
+      ellipsis,
+      locale,
+    );
+  }
+
+  SkwasmParagraphStyle._(
+    ParagraphStyleHandle handle,
+    this.textStyle,
+    this.defaultFontFamily,
+    this._textAlign,
+    this._textDirection,
+    this._fontWeight,
+    this._fontStyle,
+    this._maxLines,
+    this._fontFamily,
+    this._fontSize,
+    this._height,
+    this._textHeightBehavior,
+    this._strutStyle,
+    this._ellipsis,
+    this._locale,
+  ) : super(handle, _registry);
+
+  static final SkwasmFinalizationRegistry<RawParagraphStyle> _registry =
+    SkwasmFinalizationRegistry<RawParagraphStyle>(paragraphStyleDispose);
+
+  final SkwasmNativeTextStyle textStyle;
+  final String? defaultFontFamily;
+
+  final ui.TextAlign? _textAlign;
+  final ui.TextDirection? _textDirection;
+  final ui.FontWeight? _fontWeight;
+  final ui.FontStyle? _fontStyle;
+  final int? _maxLines;
+  final String? _fontFamily;
+  final double? _fontSize;
+  final double? _height;
+  final ui.TextHeightBehavior? _textHeightBehavior;
+  final ui.StrutStyle? _strutStyle;
+  final String? _ellipsis;
+  final ui.Locale? _locale;
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) {
+      return true;
+    }
+    if (other.runtimeType != runtimeType) {
+      return false;
+    }
+    return other is SkwasmParagraphStyle &&
+        other._textAlign == _textAlign &&
+        other._textDirection == _textDirection &&
+        other._fontWeight == _fontWeight &&
+        other._fontStyle == _fontStyle &&
+        other._maxLines == _maxLines &&
+        other._fontFamily == _fontFamily &&
+        other._fontSize == _fontSize &&
+        other._height == _height &&
+        other._textHeightBehavior == _textHeightBehavior &&
+        other._strutStyle == _strutStyle &&
+        other._ellipsis == _ellipsis &&
+        other._locale == _locale;
+  }
+
+  @override
+  int get hashCode {
+    return Object.hash(
+      _textAlign,
+      _textDirection,
+      _fontWeight,
+      _fontStyle,
+      _maxLines,
+      _fontFamily,
+      _fontSize,
+      _height,
+      _textHeightBehavior,
+      _strutStyle,
+      _ellipsis,
+      _locale,
+    );
+  }
+
+  @override
+  String toString() {
+    String result = super.toString();
+    assert(() {
+      final double? fontSize = _fontSize;
+      final double? height = _height;
+      result = 'ParagraphStyle('
+          'textAlign: ${_textAlign ?? "unspecified"}, '
+          'textDirection: ${_textDirection ?? "unspecified"}, '
+          'fontWeight: ${_fontWeight ?? "unspecified"}, '
+          'fontStyle: ${_fontStyle ?? "unspecified"}, '
+          'maxLines: ${_maxLines ?? "unspecified"}, '
+          'textHeightBehavior: ${_textHeightBehavior ?? "unspecified"}, '
+          'fontFamily: ${_fontFamily ?? "unspecified"}, '
+          'fontSize: ${fontSize != null ? fontSize.toStringAsFixed(1) : "unspecified"}, '
+          'height: ${height != null ? "${height.toStringAsFixed(1)}x" : "unspecified"}, '
+          'strutStyle: ${_strutStyle ?? "unspecified"}, '
+          'ellipsis: ${_ellipsis != null ? '"$_ellipsis"' : "unspecified"}, '
+          'locale: ${_locale ?? "unspecified"}'
+          ')';
+      return true;
+    }());
+    return result;
+  }
+}
+
+class SkwasmParagraphBuilder extends SkwasmObjectWrapper<RawParagraphBuilder> implements ui.ParagraphBuilder {
+  factory SkwasmParagraphBuilder(
+    SkwasmParagraphStyle style,
+    SkwasmFontCollection collection,
+  ) => SkwasmParagraphBuilder._(paragraphBuilderCreate(
+      style.handle,
+      collection.handle,
+    ), style);
+
+  SkwasmParagraphBuilder._(ParagraphBuilderHandle handle, this.style) : super(handle, _registry);
+
+  static final SkwasmFinalizationRegistry<RawParagraphBuilder> _registry =
+    SkwasmFinalizationRegistry<RawParagraphBuilder>(paragraphBuilderDispose);
+
+  final SkwasmParagraphStyle style;
+  final List<SkwasmNativeTextStyle> textStyleStack = <SkwasmNativeTextStyle>[];
+
+  @override
+  List<double> placeholderScales = <double>[];
+
+  @override
+  void addPlaceholder(
+    double width,
+    double height,
+    ui.PlaceholderAlignment alignment, {
+    double scale = 1.0,
+    double? baselineOffset,
+    ui.TextBaseline? baseline
+  }) {
+    paragraphBuilderAddPlaceholder(
+      handle,
+      width * scale,
+      height * scale,
+      alignment.index,
+      (baselineOffset ?? height) * scale,
+      (baseline ?? ui.TextBaseline.alphabetic).index,
+    );
+    placeholderScales.add(scale);
+  }
+
+  @override
+  void addText(String text) {
+    final SkString16Handle stringHandle = skString16FromDartString(text);
+    paragraphBuilderAddText(handle, stringHandle);
+    skString16Free(stringHandle);
+  }
+
+  static final DomV8BreakIterator _v8BreakIterator = createV8BreakIterator();
+  static final DomSegmenter _graphemeSegmenter = createIntlSegmenter(granularity: 'grapheme');
+  static final DomSegmenter _wordSegmenter = createIntlSegmenter(granularity: 'word');
+  static final DomTextDecoder _utf8Decoder = DomTextDecoder();
+
+  void _addSegmenterData() => withStackScope((StackScope scope) {
+    // Because some of the string processing is dealt with manually in dart,
+    // and some is handled by the browser, we actually need both a dart string
+    // and a JS string. Converting from linear memory to Dart strings or JS
+    // strings is more efficient than directly converting to each other, so we
+    // just create both up front here.
+    final Pointer<Uint32> outSize = scope.allocUint32Array(1);
+    final Pointer<Uint8> utf8Data = paragraphBuilderGetUtf8Text(handle, outSize);
+
+    final String text;
+    final JSString jsText;
+    if (utf8Data == nullptr) {
+      text = '';
+      jsText = ''.toJS;
+    } else {
+      final List<int> codeUnitList = List<int>.generate(
+        outSize.value,
+        (int index) => utf8Data[index]
+      );
+      text = utf8.decode(codeUnitList);
+      jsText = _utf8Decoder.decode(
+        // In an ideal world we would just use a subview of wasm memory rather
+        // than a slice, but the TextDecoder API doesn't work on shared buffer
+        // sources yet.
+        // See https://bugs.chromium.org/p/chromium/issues/detail?id=1012656
+        createUint8ArrayFromBuffer(skwasmInstance.wasmMemory.buffer).slice(
+          utf8Data.address.toJS,
+          (utf8Data.address + outSize.value).toJS
+        ));
+    }
+
+    _addGraphemeBreakData(text, jsText);
+    _addWordBreakData(text, jsText);
+    _addLineBreakData(text, jsText);
+  });
+
+  UnicodePositionBufferHandle _createBreakPositionBuffer(String text, JSString jsText, DomSegmenter segmenter) {
+    final DomIteratorWrapper<DomSegment> iterator = segmenter.segmentRaw(jsText).iterator();
+    final List<int> breaks = <int>[];
+    while (iterator.moveNext()) {
+      breaks.add(iterator.current.index);
+    }
+    breaks.add(text.length);
+
+    final UnicodePositionBufferHandle positionBuffer = unicodePositionBufferCreate(breaks.length);
+    final Pointer<Uint32> buffer = unicodePositionBufferGetDataPointer(positionBuffer);
+    for (int i = 0; i < breaks.length; i++) {
+      buffer[i] = breaks[i];
+    }
+    return positionBuffer;
+  }
+
+  void _addGraphemeBreakData(String text, JSString jsText) {
+    final UnicodePositionBufferHandle positionBuffer =
+      _createBreakPositionBuffer(text, jsText, _graphemeSegmenter);
+    paragraphBuilderSetGraphemeBreaksUtf16(handle, positionBuffer);
+    unicodePositionBufferFree(positionBuffer);
+  }
+
+  void _addWordBreakData(String text, JSString jsText) {
+    final UnicodePositionBufferHandle positionBuffer =
+      _createBreakPositionBuffer(text, jsText, _wordSegmenter);
+    paragraphBuilderSetWordBreaksUtf16(handle, positionBuffer);
+    unicodePositionBufferFree(positionBuffer);
+  }
+
+  void _addLineBreakData(String text, JSString jsText) {
+    final List<LineBreakFragment> lineBreaks = breakLinesUsingV8BreakIterator(text, jsText, _v8BreakIterator);
+    final LineBreakBufferHandle lineBreakBuffer = lineBreakBufferCreate(lineBreaks.length + 1);
+    final Pointer<LineBreak> lineBreakPointer = lineBreakBufferGetDataPointer(lineBreakBuffer);
+
+    // First line break is always zero. The buffer is zero initialized, so we can just
+    // skip the first one.
+    for (int i = 0; i < lineBreaks.length; i++) {
+      final LineBreakFragment fragment = lineBreaks[i];
+      lineBreakPointer[i + 1].position = fragment.end;
+      lineBreakPointer[i + 1].lineBreakType = fragment.type == LineBreakType.mandatory
+        ? _kHardLineBreak
+        : _kSoftLineBreak;
+    }
+    paragraphBuilderSetLineBreaksUtf16(handle, lineBreakBuffer);
+    lineBreakBufferFree(lineBreakBuffer);
+  }
+
+  @override
+  ui.Paragraph build() {
+    _addSegmenterData();
+    return SkwasmParagraph(paragraphBuilderBuild(handle));
+  }
+
+  @override
+  int get placeholderCount => placeholderScales.length;
+
+  @override
+  void pop() {
+    final SkwasmNativeTextStyle style = textStyleStack.removeLast();
+    style.dispose();
+    paragraphBuilderPop(handle);
+  }
+
+  @override
+  void pushStyle(ui.TextStyle textStyle) {
+    textStyle as SkwasmTextStyle;
+    final SkwasmNativeTextStyle baseStyle = textStyleStack.isNotEmpty
+      ? textStyleStack.last
+      : style.textStyle;
+    final SkwasmNativeTextStyle nativeStyle = baseStyle.copy();
+    textStyle.applyToNative(nativeStyle);
+    textStyleStack.add(nativeStyle);
+    paragraphBuilderPushStyle(handle, nativeStyle.handle);
+  }
+}
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/path.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/path.dart
new file mode 100644
index 0000000000000000000000000000000000000000..1a952196204237dfe5543680b8a99132b509274f
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/path.dart
@@ -0,0 +1,255 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:ffi';
+import 'dart:typed_data';
+
+import 'package:ui/src/engine.dart';
+import 'package:ui/src/engine/skwasm/skwasm_impl.dart';
+import 'package:ui/ui.dart' as ui;
+
+enum PathDirection {
+  clockwise,
+  counterClockwise,
+}
+
+enum PathArcSize {
+  small,
+  large,
+}
+
+class SkwasmPath extends SkwasmObjectWrapper<RawPath> implements ui.Path {
+  factory SkwasmPath() {
+    return SkwasmPath.fromHandle(pathCreate());
+  }
+
+  factory SkwasmPath.from(SkwasmPath source) {
+    return SkwasmPath.fromHandle(pathCopy(source.handle));
+  }
+
+  SkwasmPath.fromHandle(PathHandle handle) : super(handle, _registry);
+
+  static final SkwasmFinalizationRegistry<RawPath> _registry =
+    SkwasmFinalizationRegistry<RawPath>(pathDispose);
+
+  @override
+  ui.PathFillType get fillType => ui.PathFillType.values[pathGetFillType(handle)];
+
+  @override
+  set fillType(ui.PathFillType fillType) => pathSetFillType(handle, fillType.index);
+
+  @override
+  void moveTo(double x, double y) => pathMoveTo(handle, x, y);
+
+  @override
+  void relativeMoveTo(double x, double y) => pathRelativeMoveTo(handle, x, y);
+
+  @override
+  void lineTo(double x, double y) => pathLineTo(handle, x, y);
+
+  @override
+  void relativeLineTo(double x, double y) => pathRelativeMoveTo(handle, x, y);
+
+  @override
+  void quadraticBezierTo(double x1, double y1, double x2, double y2) =>
+    pathQuadraticBezierTo(handle, x1, y1, x2, y2);
+
+  @override
+  void relativeQuadraticBezierTo(double x1, double y1, double x2, double y2) =>
+    pathRelativeQuadraticBezierTo(handle, x1, y1, x2, y2);
+
+  @override
+  void cubicTo(
+    double x1,
+    double y1,
+    double x2,
+    double y2,
+    double x3,
+    double y3) =>
+    pathCubicTo(handle, x1, y1, x2, y2, x3, y3);
+
+  @override
+  void relativeCubicTo(
+      double x1,
+      double y1,
+      double x2,
+      double y2,
+      double x3,
+      double y3) =>
+    pathRelativeCubicTo(handle, x1, y1, x2, y2, x3, y3);
+
+  @override
+  void conicTo(double x1, double y1, double x2, double y2, double w) =>
+    pathConicTo(handle, x1, y1, x2, y2, w);
+
+  @override
+  void relativeConicTo(double x1, double y1, double x2, double y2, double w) =>
+    pathRelativeConicTo(handle, x1, y1, x2, y2, w);
+
+  @override
+  void arcTo(
+      ui.Rect rect, double startAngle, double sweepAngle, bool forceMoveTo) {
+    withStackScope((StackScope s) {
+      pathArcToOval(
+          handle,
+          s.convertRectToNative(rect),
+          ui.toDegrees(startAngle),
+          ui.toDegrees(sweepAngle),
+          forceMoveTo
+      );
+    });
+  }
+
+  @override
+  void arcToPoint(
+    ui.Offset arcEnd, {
+    ui.Radius radius = ui.Radius.zero,
+    double rotation = 0.0,
+    bool largeArc = false,
+    bool clockwise = true,
+  }) {
+    final PathArcSize arcSize =
+        largeArc ? PathArcSize.large : PathArcSize.small;
+    final PathDirection pathDirection =
+        clockwise ? PathDirection.clockwise : PathDirection.counterClockwise;
+    pathArcToRotated(
+        handle,
+        radius.x,
+        radius.y,
+        ui.toDegrees(rotation),
+        arcSize.index,
+        pathDirection.index,
+        arcEnd.dx,
+        arcEnd.dy
+    );
+  }
+
+  @override
+  void relativeArcToPoint(
+    ui.Offset arcEndDelta, {
+    ui.Radius radius = ui.Radius.zero,
+    double rotation = 0.0,
+    bool largeArc = false,
+    bool clockwise = true,
+  }) {
+    final PathArcSize arcSize =
+        largeArc ? PathArcSize.large : PathArcSize.small;
+    final PathDirection pathDirection =
+        clockwise ? PathDirection.clockwise : PathDirection.counterClockwise;
+    pathRelativeArcToRotated(
+        handle,
+        radius.x,
+        radius.y,
+        ui.toDegrees(rotation),
+        arcSize.index,
+        pathDirection.index,
+        arcEndDelta.dx,
+        arcEndDelta.dy
+    );
+  }
+
+  @override
+  void addRect(ui.Rect rect) {
+    withStackScope((StackScope s) {
+      pathAddRect(handle, s.convertRectToNative(rect));
+    });
+  }
+
+  @override
+  void addOval(ui.Rect rect) {
+    withStackScope((StackScope s) {
+      pathAddOval(handle, s.convertRectToNative(rect));
+    });
+  }
+
+  @override
+  void addArc(ui.Rect rect, double startAngle, double sweepAngle) {
+    withStackScope((StackScope s) {
+      pathAddArc(
+        handle,
+        s.convertRectToNative(rect),
+        ui.toDegrees(startAngle),
+        ui.toDegrees(sweepAngle)
+      );
+    });
+  }
+
+  @override
+  void addPolygon(List<ui.Offset> points, bool close) {
+    withStackScope((StackScope s) {
+      pathAddPolygon(handle, s.convertPointArrayToNative(points), points.length, close);
+    });
+  }
+
+  @override
+  void addRRect(ui.RRect rrect) {
+    withStackScope((StackScope s) {
+      pathAddRRect(handle, s.convertRRectToNative(rrect));
+    });
+  }
+
+  @override
+  void addPath(ui.Path path, ui.Offset offset, {Float64List? matrix4}) {
+    _addPath(path, offset, false, matrix4: matrix4);
+  }
+
+  @override
+  void extendWithPath(ui.Path path, ui.Offset offset, {Float64List? matrix4}) {
+    _addPath(path, offset, true, matrix4: matrix4);
+  }
+
+  void _addPath(ui.Path path, ui.Offset offset, bool extend, {Float64List? matrix4}) {
+    assert(path is SkwasmPath);
+    withStackScope((StackScope s) {
+      final Pointer<Float> convertedMatrix =
+          s.convertMatrix4toSkMatrix(matrix4 ?? Matrix4.identity().toFloat64());
+      convertedMatrix[2] += offset.dx;
+      convertedMatrix[5] += offset.dy;
+      pathAddPath(handle, (path as SkwasmPath).handle, convertedMatrix, extend);
+    });
+  }
+
+  @override
+  void close() => pathClose(handle);
+
+  @override
+  void reset() => pathReset(handle);
+
+  @override
+  bool contains(ui.Offset point) => pathContains(handle, point.dx, point.dy);
+
+  @override
+  ui.Path shift(ui.Offset offset) =>
+    transform(Matrix4.translationValues(offset.dx, offset.dy, 0.0).toFloat64());
+
+  @override
+  ui.Path transform(Float64List matrix4) {
+    return withStackScope((StackScope s) {
+      final PathHandle newPathHandle = pathCopy(handle);
+      pathTransform(newPathHandle, s.convertMatrix4toSkMatrix(matrix4));
+      return SkwasmPath.fromHandle(newPathHandle);
+    });
+  }
+
+  @override
+  ui.Rect getBounds() {
+    return withStackScope((StackScope s) {
+      final Pointer<Float> rectBuffer = s.allocFloatArray(4);
+      pathGetBounds(handle, rectBuffer);
+      return s.convertRectFromNative(rectBuffer);
+    });
+  }
+
+  static SkwasmPath combine(
+    ui.PathOperation operation,
+    SkwasmPath path1,
+    SkwasmPath path2) =>
+    SkwasmPath.fromHandle(pathCombine(
+        operation.index, path1.handle, path2.handle));
+
+  @override
+  ui.PathMetrics computeMetrics({bool forceClosed = false}) {
+    return SkwasmPathMetrics(path: this, forceClosed: forceClosed);
+  }
+}
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/path_metrics.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/path_metrics.dart
new file mode 100644
index 0000000000000000000000000000000000000000..d6b558b356191aeed5b43285b6241666cf377768
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/path_metrics.dart
@@ -0,0 +1,93 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:collection';
+import 'dart:ffi';
+
+import 'package:ui/src/engine/skwasm/skwasm_impl.dart';
+import 'package:ui/ui.dart' as ui;
+
+class SkwasmPathMetrics extends IterableBase<ui.PathMetric>
+    implements ui.PathMetrics {
+  SkwasmPathMetrics({required this.path, required this.forceClosed});
+
+  SkwasmPath path;
+  bool forceClosed;
+
+  @override
+  late Iterator<ui.PathMetric> iterator = SkwasmPathMetricIterator(path, forceClosed);
+}
+
+class SkwasmPathMetricIterator extends SkwasmObjectWrapper<RawContourMeasureIter> implements Iterator<ui.PathMetric> {
+  SkwasmPathMetricIterator(SkwasmPath path, bool forceClosed)
+      : super(contourMeasureIterCreate(path.handle, forceClosed, 1.0), _registry);
+
+  static final SkwasmFinalizationRegistry<RawContourMeasureIter> _registry =
+    SkwasmFinalizationRegistry<RawContourMeasureIter>(contourMeasureIterDispose);
+
+  SkwasmPathMetric? _current;
+  int _nextIndex = 0;
+
+  @override
+  ui.PathMetric get current {
+    if (_current == null) {
+      throw RangeError(
+        'PathMetricIterator is not pointing to a PathMetric. This can happen in two situations:\n'
+        '- The iteration has not started yet. If so, call "moveNext" to start iteration.\n'
+        '- The iterator ran out of elements. If so, check that "moveNext" returns true prior to calling "current".');
+    }
+    return _current!;
+  }
+
+  @override
+  bool moveNext() {
+    final ContourMeasureHandle measureHandle = contourMeasureIterNext(handle);
+    if (measureHandle == nullptr) {
+      _current = null;
+      return false;
+    } else {
+      _current = SkwasmPathMetric(measureHandle, _nextIndex);
+      _nextIndex++;
+      return true;
+    }
+  }
+}
+
+class SkwasmPathMetric extends SkwasmObjectWrapper<RawContourMeasure> implements ui.PathMetric {
+  SkwasmPathMetric(ContourMeasureHandle handle, this.contourIndex) : super(handle, _registry);
+
+  static final SkwasmFinalizationRegistry<RawContourMeasure> _registry =
+    SkwasmFinalizationRegistry<RawContourMeasure>(contourMeasureDispose);
+
+  @override
+  final int contourIndex;
+
+  @override
+  ui.Path extractPath(double start, double end, {bool startWithMoveTo = true}) {
+    return SkwasmPath.fromHandle(
+        contourMeasureGetSegment(handle, start, end, startWithMoveTo));
+  }
+
+  @override
+  ui.Tangent? getTangentForOffset(double distance) {
+    return withStackScope((StackScope scope) {
+      final Pointer<Float> outPosition = scope.allocFloatArray(4);
+      final Pointer<Float> outTangent =
+          Pointer<Float>.fromAddress(outPosition.address + sizeOf<Float>() * 2);
+      final bool result =
+          contourMeasureGetPosTan(handle, distance, outPosition, outTangent);
+      assert(result);
+      return ui.Tangent(
+        ui.Offset(outPosition[0], outPosition[1]),
+        ui.Offset(outTangent[0], outTangent[1])
+      );
+    });
+  }
+
+  @override
+  bool get isClosed => contourMeasureIsClosed(handle);
+
+  @override
+  double get length => contourMeasureLength(handle);
+}
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/picture.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/picture.dart
new file mode 100644
index 0000000000000000000000000000000000000000..887cbffc53f5c31db04bfb7f07d874fd025451c3
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/picture.dart
@@ -0,0 +1,60 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:ui/src/engine.dart';
+import 'package:ui/src/engine/skwasm/skwasm_impl.dart';
+import 'package:ui/ui.dart' as ui;
+
+class SkwasmPicture extends SkwasmObjectWrapper<RawPicture> implements ScenePicture {
+  SkwasmPicture.fromHandle(PictureHandle handle) : super(handle, _registry);
+
+  static final SkwasmFinalizationRegistry<RawPicture> _registry =
+    SkwasmFinalizationRegistry<RawPicture>(pictureDispose);
+
+  @override
+  Future<ui.Image> toImage(int width, int height) async => toImageSync(width, height);
+
+  @override
+  int get approximateBytesUsed => pictureApproximateBytesUsed(handle);
+
+  @override
+  void dispose() {
+    super.dispose();
+    ui.Picture.onDispose?.call(this);
+  }
+
+  @override
+  ui.Image toImageSync(int width, int height) =>
+    SkwasmImage(imageCreateFromPicture(handle, width, height));
+
+  @override
+  ui.Rect get cullRect {
+    return withStackScope((StackScope s) {
+      final RawRect rect = s.allocFloatArray(4);
+      pictureGetCullRect(handle, rect);
+      return s.convertRectFromNative(rect);
+    });
+  }
+}
+
+class SkwasmPictureRecorder extends SkwasmObjectWrapper<RawPictureRecorder> implements ui.PictureRecorder {
+  SkwasmPictureRecorder() : super(pictureRecorderCreate(), _registry);
+
+  static final SkwasmFinalizationRegistry<RawPictureRecorder> _registry =
+    SkwasmFinalizationRegistry<RawPictureRecorder>(pictureRecorderDispose);
+
+  @override
+  SkwasmPicture endRecording() {
+    isRecording = false;
+
+    final SkwasmPicture picture = SkwasmPicture.fromHandle(
+      pictureRecorderEndRecording(handle)
+    );
+    ui.Picture.onCreate?.call(picture);
+    return picture;
+  }
+
+  @override
+  bool isRecording = true;
+}
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_canvas.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_canvas.dart
new file mode 100644
index 0000000000000000000000000000000000000000..599085ea6c1467ca8a1300571f16e14e07f65b9b
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_canvas.dart
@@ -0,0 +1,270 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+@DefaultAsset('skwasm')
+library skwasm_impl;
+
+import 'dart:ffi';
+
+import 'package:ui/src/engine/skwasm/skwasm_impl.dart';
+
+final class RawCanvas extends Opaque {}
+
+typedef CanvasHandle = Pointer<RawCanvas>;
+
+@Native<Void Function(CanvasHandle)>(symbol: 'canvas_save', isLeaf: true)
+external void canvasSave(CanvasHandle canvas);
+
+@Native<Void Function(
+  CanvasHandle,
+  RawRect,
+  PaintHandle,
+  ImageFilterHandle,
+)>(symbol: 'canvas_saveLayer', isLeaf: true)
+external void canvasSaveLayer(
+  CanvasHandle canvas,
+  RawRect rect,
+  PaintHandle paint,
+  ImageFilterHandle handle,
+);
+
+@Native<Void Function(CanvasHandle)>(symbol: 'canvas_restore', isLeaf: true)
+external void canvasRestore(CanvasHandle canvas);
+
+@Native<Void Function(CanvasHandle, Int)>(
+    symbol: 'canvas_restoreToCount', isLeaf: true)
+external void canvasRestoreToCount(CanvasHandle canvas, int count);
+
+@Native<Int Function(CanvasHandle)>(symbol: 'canvas_getSaveCount', isLeaf: true)
+external int canvasGetSaveCount(CanvasHandle canvas);
+
+@Native<Void Function(CanvasHandle, Float, Float)>(
+    symbol: 'canvas_translate', isLeaf: true)
+external void canvasTranslate(CanvasHandle canvas, double dx, double dy);
+
+@Native<Void Function(CanvasHandle, Float, Float)>(
+    symbol: 'canvas_scale', isLeaf: true)
+external void canvasScale(CanvasHandle canvas, double sx, double sy);
+
+@Native<Void Function(CanvasHandle, Float)>(
+    symbol: 'canvas_rotate', isLeaf: true)
+external void canvasRotate(CanvasHandle canvas, double degrees);
+
+@Native<Void Function(CanvasHandle, Float, Float)>(
+    symbol: 'canvas_skew', isLeaf: true)
+external void canvasSkew(CanvasHandle canvas, double sx, double sy);
+
+@Native<Void Function(CanvasHandle, RawMatrix44)>(
+    symbol: 'canvas_transform', isLeaf: true)
+external void canvasTransform(CanvasHandle canvas, RawMatrix44 matrix);
+
+@Native<Void Function(CanvasHandle, RawRect, Int, Bool)>(
+    symbol: 'canvas_clipRect', isLeaf: true)
+external void canvasClipRect(
+    CanvasHandle canvas, RawRect rect, int op, bool antialias);
+
+@Native<Void Function(CanvasHandle, RawRRect, Bool)>(
+    symbol: 'canvas_clipRRect', isLeaf: true)
+external void canvasClipRRect(
+    CanvasHandle canvas, RawRRect rrect, bool antialias);
+
+@Native<Void Function(CanvasHandle, PathHandle, Bool)>(
+    symbol: 'canvas_clipPath', isLeaf: true)
+external void canvasClipPath(
+    CanvasHandle canvas, PathHandle path, bool antialias);
+
+@Native<Void Function(CanvasHandle, Int32, Int)>(
+    symbol: 'canvas_drawColor', isLeaf: true)
+external void canvasDrawColor(CanvasHandle canvas, int color, int blendMode);
+
+@Native<Void Function(CanvasHandle, Float, Float, Float, Float, PaintHandle)>(
+    symbol: 'canvas_drawLine', isLeaf: true)
+external void canvasDrawLine(CanvasHandle canvas, double x1, double y1,
+    double x2, double y2, PaintHandle paint);
+
+@Native<Void Function(CanvasHandle, PaintHandle)>(
+    symbol: 'canvas_drawPaint', isLeaf: true)
+external void canvasDrawPaint(CanvasHandle canvas, PaintHandle paint);
+
+@Native<Void Function(CanvasHandle, RawRect, PaintHandle)>(
+    symbol: 'canvas_drawRect', isLeaf: true)
+external void canvasDrawRect(
+    CanvasHandle canvas, RawRect rect, PaintHandle paint);
+
+@Native<Void Function(CanvasHandle, RawRRect, PaintHandle)>(
+    symbol: 'canvas_drawRRect', isLeaf: true)
+external void canvasDrawRRect(
+    CanvasHandle canvas, RawRRect rrect, PaintHandle paint);
+
+@Native<Void Function(CanvasHandle, RawRRect, RawRRect, PaintHandle)>(
+    symbol: 'canvas_drawDRRect', isLeaf: true)
+external void canvasDrawDRRect(
+    CanvasHandle canvas, RawRRect outer, RawRRect inner, PaintHandle paint);
+
+@Native<Void Function(CanvasHandle, RawRect, PaintHandle)>(
+    symbol: 'canvas_drawOval', isLeaf: true)
+external void canvasDrawOval(
+    CanvasHandle canvas, RawRect oval, PaintHandle paint);
+
+@Native<Void Function(CanvasHandle, Float, Float, Float, PaintHandle)>(
+    symbol: 'canvas_drawCircle', isLeaf: true)
+external void canvasDrawCircle(
+    CanvasHandle canvas, double x, double y, double radius, PaintHandle paint);
+
+@Native<Void Function(CanvasHandle, RawRect, Float, Float, Bool, PaintHandle)>(
+    symbol: 'canvas_drawArc', isLeaf: true)
+external void canvasDrawArc(
+    CanvasHandle canvas,
+    RawRect rect,
+    double startAngleDegrees,
+    double sweepAngleDegrees,
+    bool useCenter,
+    PaintHandle paint);
+
+@Native<Void Function(CanvasHandle, PathHandle, PaintHandle)>(
+    symbol: 'canvas_drawPath', isLeaf: true)
+external void canvasDrawPath(
+    CanvasHandle canvas, PathHandle path, PaintHandle paint);
+
+@Native<Void Function(CanvasHandle, PictureHandle)>(
+    symbol: 'canvas_drawPicture', isLeaf: true)
+external void canvasDrawPicture(CanvasHandle canvas, PictureHandle picture);
+
+@Native<Void Function(
+  CanvasHandle,
+  ImageHandle,
+  Float,
+  Float,
+  PaintHandle,
+  Int
+)>(symbol: 'canvas_drawImage', isLeaf: true)
+external void canvasDrawImage(
+  CanvasHandle handle,
+  ImageHandle image,
+  double offsetX,
+  double offsetY,
+  PaintHandle paint,
+  int filterQuality,
+);
+
+@Native<Void Function(
+  CanvasHandle,
+  ImageHandle,
+  Pointer<Float>,
+  Pointer<Float>,
+  PaintHandle,
+  Int,
+)>(symbol: 'canvas_drawImageRect', isLeaf: true)
+external void canvasDrawImageRect(
+  CanvasHandle handle,
+  ImageHandle image,
+  Pointer<Float> sourceRect,
+  Pointer<Float> destRect,
+  PaintHandle paint,
+  int filterQuality,
+);
+
+@Native<Void Function(
+  CanvasHandle,
+  ImageHandle,
+  Pointer<Int32>,
+  Pointer<Float>,
+  PaintHandle,
+  Int,
+)>(symbol: 'canvas_drawImageNine', isLeaf: true)
+external void canvasDrawImageNine(
+  CanvasHandle handle,
+  ImageHandle image,
+  Pointer<Int32> centerRect,
+  Pointer<Float> destRect,
+  PaintHandle paint,
+  int filterQuality,
+);
+
+@Native<Void Function(CanvasHandle, PathHandle, Float, Float, Int32, Bool)>(
+    symbol: 'canvas_drawShadow', isLeaf: true)
+external void canvasDrawShadow(
+  CanvasHandle canvas,
+  PathHandle path,
+  double elevation,
+  double devicePixelRatio,
+  int color,
+  bool transparentOccluder,
+);
+
+@Native<Void Function(
+  CanvasHandle,
+  ParagraphHandle,
+  Float,
+  Float,
+)>(symbol: 'canvas_drawParagraph', isLeaf: true)
+external void canvasDrawParagraph(
+  CanvasHandle handle,
+  ParagraphHandle paragraphHandle,
+  double x,
+  double y,
+);
+
+@Native<Void Function(
+  CanvasHandle,
+  VerticesHandle,
+  Int,
+  PaintHandle,
+)>(symbol: 'canvas_drawVertices', isLeaf: true)
+external void canvasDrawVertices(
+  CanvasHandle handle,
+  VerticesHandle vertices,
+  int blendMode,
+  PaintHandle paint,
+);
+
+@Native<Void Function(
+  CanvasHandle,
+  Int,
+  RawPointArray,
+  Int,
+  PaintHandle,
+)>(symbol: 'canvas_drawPoints', isLeaf: true)
+external void canvasDrawPoints(
+  CanvasHandle handle,
+  int pointMode,
+  RawPointArray points,
+  int pointCount,
+  PaintHandle paint,
+);
+
+@Native<Void Function(
+  CanvasHandle,
+  ImageHandle,
+  RawRSTransformArray,
+  RawRect,
+  RawColorArray,
+  Int,
+  Int,
+  RawRect,
+  PaintHandle,
+)>(symbol: 'canvas_drawAtlas', isLeaf: true)
+external void canvasDrawAtlas(
+  CanvasHandle handle,
+  ImageHandle atlas,
+  RawRSTransformArray transforms,
+  RawRect rects,
+  RawColorArray colors,
+  int spriteCount,
+  int blendMode,
+  RawRect cullRect,
+  PaintHandle paint,
+);
+
+@Native<Void Function(CanvasHandle, RawMatrix44)>(
+    symbol: 'canvas_getTransform', isLeaf: true)
+external void canvasGetTransform(CanvasHandle canvas, RawMatrix44 outMatrix);
+
+@Native<Void Function(CanvasHandle, RawRect)>(
+    symbol: 'canvas_getLocalClipBounds', isLeaf: true)
+external void canvasGetLocalClipBounds(CanvasHandle canvas, RawRect outRect);
+
+@Native<Void Function(CanvasHandle, RawIRect)>(
+    symbol: 'canvas_getDeviceClipBounds', isLeaf: true)
+external void canvasGetDeviceClipBounds(CanvasHandle canvas, RawIRect outRect);
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_filters.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_filters.dart
new file mode 100644
index 0000000000000000000000000000000000000000..7bf759842145ba0eeecc4778e838279043007d04
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_filters.dart
@@ -0,0 +1,120 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+@DefaultAsset('skwasm')
+library skwasm_impl;
+
+import 'dart:ffi';
+
+import 'package:ui/src/engine/skwasm/skwasm_impl.dart';
+
+final class RawImageFilter extends Opaque {}
+typedef ImageFilterHandle = Pointer<RawImageFilter>;
+
+final class RawColorFilter extends Opaque {}
+typedef ColorFilterHandle = Pointer<RawColorFilter>;
+
+final class RawMaskFilter extends Opaque {}
+typedef MaskFilterHandle = Pointer<RawMaskFilter>;
+
+@Native<ImageFilterHandle Function(
+  Float,
+  Float,
+  Int
+)>(symbol: 'imageFilter_createBlur', isLeaf: true)
+external ImageFilterHandle imageFilterCreateBlur(
+  double sigmaX,
+  double sigmaY,
+  int tileMode,
+);
+
+@Native<ImageFilterHandle Function(
+  Float,
+  Float,
+)>(symbol: 'imageFilter_createDilate', isLeaf: true)
+external ImageFilterHandle imageFilterCreateDilate(
+  double radiusX,
+  double radiusY,
+);
+
+@Native<ImageFilterHandle Function(
+  Float,
+  Float,
+)>(symbol: 'imageFilter_createErode', isLeaf: true)
+external ImageFilterHandle imageFilterCreateErode(
+  double radiusX,
+  double radiusY,
+);
+
+@Native<ImageFilterHandle Function(
+  Pointer<Float>,
+  Int,
+)>(symbol: 'imageFilter_createMatrix', isLeaf: true)
+external ImageFilterHandle imageFilterCreateMatrix(
+  Pointer<Float> matrix33,
+  int quality,
+);
+
+@Native<ImageFilterHandle Function(ColorFilterHandle)>(
+  symbol: 'imageFilter_createFromColorFilter', isLeaf: true)
+external ImageFilterHandle imageFilterCreateFromColorFilter(
+  ColorFilterHandle colorFilte
+);
+
+@Native<ImageFilterHandle Function(
+  ImageFilterHandle,
+  ImageFilterHandle,
+)>(symbol: 'imageFilter_compose', isLeaf: true)
+external ImageFilterHandle imageFilterCompose(
+  ImageFilterHandle outer,
+  ImageFilterHandle inner,
+);
+
+@Native<Void Function(ImageFilterHandle)>(symbol: 'imageFilter_dispose', isLeaf: true)
+external void imageFilterDispose(ImageFilterHandle handle);
+
+@Native<Void Function(ImageFilterHandle, RawIRect)>(
+  symbol: 'imageFilter_getFilterBounds', isLeaf: true)
+external void imageFilterGetFilterBounds(ImageFilterHandle handle, RawIRect inOutRect);
+
+@Native<ColorFilterHandle Function(
+  Int,
+  Int
+)>(symbol: 'colorFilter_createMode', isLeaf: true)
+external ColorFilterHandle colorFilterCreateMode(int color, int mode);
+
+@Native<ColorFilterHandle Function(
+  Pointer<Float>
+)>(symbol: 'colorFilter_createMatrix', isLeaf: true)
+external ColorFilterHandle colorFilterCreateMatrix(Pointer<Float> matrix);
+
+@Native<ColorFilterHandle Function()>(symbol: 'colorFilter_createSRGBToLinearGamma', isLeaf: true)
+external ColorFilterHandle colorFilterCreateSRGBToLinearGamma();
+
+@Native<ColorFilterHandle Function()>(symbol: 'colorFilter_createLinearToSRGBGamma', isLeaf: true)
+external ColorFilterHandle colorFilterCreateLinearToSRGBGamma();
+
+@Native<ColorFilterHandle Function(
+  ColorFilterHandle,
+  ColorFilterHandle
+)>(symbol: 'colorFilter_compose', isLeaf: true)
+external ColorFilterHandle colorFilterCompose(
+  ColorFilterHandle outer,
+  ColorFilterHandle inner,
+);
+
+@Native<Void Function(ColorFilterHandle)>(symbol: 'colorFilter_dispose', isLeaf: true)
+external void colorFilterDispose(ColorFilterHandle handle);
+
+@Native<MaskFilterHandle Function(
+  Int,
+  Float,
+)>(symbol: 'maskFilter_createBlur', isLeaf: true)
+external MaskFilterHandle maskFilterCreateBlur(
+  int blurStyle,
+  double sigma,
+);
+
+@Native<Void Function(MaskFilterHandle)>(symbol: 'maskFilter_dispose', isLeaf: true)
+external void maskFilterDispose(MaskFilterHandle handle);
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_fonts.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_fonts.dart
new file mode 100644
index 0000000000000000000000000000000000000000..855fdeb399a356a5991e2a7bb92d52ff4907e63b
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_fonts.dart
@@ -0,0 +1,57 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+@DefaultAsset('skwasm')
+library skwasm_impl;
+
+import 'dart:ffi';
+
+import 'package:ui/src/engine/skwasm/skwasm_impl.dart';
+
+final class RawFontCollection extends Opaque {}
+typedef FontCollectionHandle = Pointer<RawFontCollection>;
+
+final class RawTypeface extends Opaque {}
+typedef TypefaceHandle = Pointer<RawTypeface>;
+
+@Native<FontCollectionHandle Function()>(symbol: 'fontCollection_create', isLeaf: true)
+external FontCollectionHandle fontCollectionCreate();
+
+@Native<Void Function(FontCollectionHandle)>(symbol: 'fontCollection_dispose', isLeaf: true)
+external void fontCollectionDispose(FontCollectionHandle handle);
+
+@Native<TypefaceHandle Function(SkDataHandle)>(symbol: 'typeface_create', isLeaf: true)
+external TypefaceHandle typefaceCreate(SkDataHandle fontData);
+
+@Native<Void Function(TypefaceHandle)>(symbol: 'typeface_dispose', isLeaf: true)
+external void typefaceDispose(TypefaceHandle handle);
+
+@Native<Int Function(
+  Pointer<TypefaceHandle>,
+  Int,
+  Pointer<Int32>,
+  Int,
+)>(symbol: 'typefaces_filterCoveredCodePoints', isLeaf: true)
+external int typefacesFilterCoveredCodePoints(
+  Pointer<TypefaceHandle> typefaces,
+  int typefaceCount,
+  Pointer<Int32> codepoints,
+  int codePointCount,
+);
+
+@Native<Void Function(
+  FontCollectionHandle,
+  TypefaceHandle,
+  SkStringHandle,
+)>(symbol: 'fontCollection_registerTypeface', isLeaf: true)
+external void fontCollectionRegisterTypeface(
+  FontCollectionHandle handle,
+  TypefaceHandle typeface,
+  SkStringHandle fontName,
+);
+
+@Native<Void Function(
+  FontCollectionHandle
+)>(symbol: 'fontCollection_clearCaches', isLeaf: true)
+external void fontCollectionClearCaches(FontCollectionHandle handle);
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_geometry.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_geometry.dart
new file mode 100644
index 0000000000000000000000000000000000000000..6222eb279c002338748dd1dfad38568d56130ef0
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_geometry.dart
@@ -0,0 +1,14 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:ffi';
+
+typedef RawRect = Pointer<Float>;
+typedef RawIRect = Pointer<Int32>;
+typedef RawRRect = Pointer<Float>;
+typedef RawPointArray = Pointer<Float>;
+typedef RawRSTransformArray = Pointer<Float>;
+typedef RawMatrix33 = Pointer<Float>;
+typedef RawMatrix44 = Pointer<Float>;
+typedef RawColorArray = Pointer<Uint32>;
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_image.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_image.dart
new file mode 100644
index 0000000000000000000000000000000000000000..c0cd2e25db51c3c4dc8b6ccdbe7a750bf586459c
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_image.dart
@@ -0,0 +1,76 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+@DefaultAsset('skwasm')
+library skwasm_impl;
+
+import 'dart:_wasm';
+import 'dart:ffi';
+import 'dart:js_interop';
+
+import 'package:ui/src/engine/skwasm/skwasm_impl.dart';
+
+final class RawImage extends Opaque {}
+typedef ImageHandle = Pointer<RawImage>;
+
+@Native<ImageHandle Function(
+  PictureHandle,
+  Int32,
+  Int32,
+)>(symbol: 'image_createFromPicture', isLeaf: true)
+external ImageHandle imageCreateFromPicture(
+  PictureHandle handle,
+  int width,
+  int height,
+);
+
+@Native<ImageHandle Function(
+  SkDataHandle,
+  Int,
+  Int,
+  Int,
+  Size
+)>(symbol: 'image_createFromPixels', isLeaf: true)
+external ImageHandle imageCreateFromPixels(
+  SkDataHandle pixelData,
+  int width,
+  int height,
+  int pixelFormat,
+  int rowByteCount,
+);
+
+// We use a wasm import directly here instead of @Native since this uses an externref
+// in the function signature.
+ImageHandle imageCreateFromTextureSource(
+  JSAny frame,
+  int width,
+  int height,
+  SurfaceHandle handle
+) => ImageHandle.fromAddress(
+  imageCreateFromTextureSourceImpl(
+    externRefForJSAny(frame),
+    width.toWasmI32(),
+    height.toWasmI32(),
+    handle.address.toWasmI32(),
+  ).toIntUnsigned()
+);
+@pragma('wasm:import', 'skwasm.image_createFromTextureSource')
+external WasmI32 imageCreateFromTextureSourceImpl(
+  WasmExternRef? frame,
+  WasmI32 width,
+  WasmI32 height,
+  WasmI32 surfaceHandle,
+);
+
+@Native<Void Function(ImageHandle)>(symbol:'image_ref', isLeaf: true)
+external void imageRef(ImageHandle handle);
+
+@Native<Void Function(ImageHandle)>(symbol: 'image_dispose', isLeaf: true)
+external void imageDispose(ImageHandle handle);
+
+@Native<Int Function(ImageHandle)>(symbol: 'image_getWidth', isLeaf: true)
+external int imageGetWidth(ImageHandle handle);
+
+@Native<Int Function(ImageHandle)>(symbol: 'image_getHeight', isLeaf: true)
+external int imageGetHeight(ImageHandle handle);
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_memory.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_memory.dart
new file mode 100644
index 0000000000000000000000000000000000000000..9b63df3e12439e1cf58ad2519e50eac01c36ceed
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_memory.dart
@@ -0,0 +1,240 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+@DefaultAsset('skwasm')
+library skwasm_impl;
+
+import 'dart:convert';
+import 'dart:ffi';
+import 'dart:typed_data';
+
+import 'package:ui/ui.dart' as ui;
+
+final class Stack extends Opaque {}
+typedef StackPointer = Pointer<Stack>;
+
+/// Generic linear memory allocation
+@Native<StackPointer Function(Size)>(symbol: 'stackAlloc', isLeaf: true)
+external StackPointer stackAlloc(int length);
+
+@Native<StackPointer Function()>(symbol: 'stackSave', isLeaf: true)
+external StackPointer stackSave();
+
+@Native<Void Function(StackPointer)>(symbol: 'stackRestore', isLeaf: true)
+external void stackRestore(StackPointer pointer);
+
+class StackScope {
+  Pointer<Int8> convertStringToNative(String string) {
+    final Uint8List encoded = utf8.encode(string);
+    final Pointer<Int8> pointer = allocInt8Array(encoded.length + 1);
+    for (int i = 0; i < encoded.length; i++) {
+      pointer[i] = encoded[i];
+    }
+    pointer[encoded.length] = 0;
+    return pointer;
+  }
+
+  Pointer<Float> convertMatrix4toSkMatrix(List<double> matrix4) {
+    final Pointer<Float> pointer = allocFloatArray(9);
+    final int matrixLength = matrix4.length;
+
+    double getVal(int index) {
+      return (index < matrixLength) ? matrix4[index] : 0.0;
+    }
+
+    pointer[0] = getVal(0);
+    pointer[1] = getVal(4);
+    pointer[2] = getVal(12);
+
+    pointer[3] = getVal(1);
+    pointer[4] = getVal(5);
+    pointer[5] = getVal(13);
+
+    pointer[6] = getVal(3);
+    pointer[7] = getVal(7);
+    pointer[8] = getVal(15);
+
+    return pointer;
+  }
+
+  Pointer<Float> convertMatrix44toNative(Float64List matrix4) {
+    assert(matrix4.length == 16);
+    final Pointer<Float> pointer = allocFloatArray(16);
+    for (int i = 0; i < 16; i++) {
+      pointer[i] = matrix4[i];
+    }
+    return pointer;
+  }
+
+  Float64List convertMatrix44FromNative(Pointer<Float> buffer) {
+    final Float64List matrix = Float64List(16);
+    for (int i = 0; i < 16; i++) {
+      matrix[i] = buffer[i];
+    }
+    return matrix;
+  }
+
+  Pointer<Float> convertRectToNative(ui.Rect rect) {
+    final Pointer<Float> pointer = allocFloatArray(4);
+    pointer[0] = rect.left;
+    pointer[1] = rect.top;
+    pointer[2] = rect.right;
+    pointer[3] = rect.bottom;
+    return pointer;
+  }
+
+  Pointer<Float> convertRectsToNative(List<ui.Rect> rects) {
+    final Pointer<Float> pointer = allocFloatArray(rects.length * 4);
+    for (int i = 0; i < rects.length; i++) {
+      final ui.Rect rect = rects[i];
+      pointer[i * 4] = rect.left;
+      pointer[i * 4 + 1] = rect.top;
+      pointer[i * 4 + 2] = rect.right;
+      pointer[i * 4 + 3] = rect.bottom;
+    }
+    return pointer;
+  }
+
+  ui.Rect convertRectFromNative(Pointer<Float> buffer) {
+    return ui.Rect.fromLTRB(
+      buffer[0],
+      buffer[1],
+      buffer[2],
+      buffer[3],
+    );
+  }
+
+  Pointer<Int32> convertIRectToNative(ui.Rect rect) {
+    final Pointer<Int32> pointer = allocInt32Array(4);
+    pointer[0] = rect.left.floor();
+    pointer[1] = rect.top.floor();
+    pointer[2] = rect.right.ceil();
+    pointer[3] = rect.bottom.ceil();
+    return pointer;
+  }
+
+  ui.Rect convertIRectFromNative(Pointer<Int32> buffer) {
+    return ui.Rect.fromLTRB(
+      buffer[0].toDouble(),
+      buffer[1].toDouble(),
+      buffer[2].toDouble(),
+      buffer[3].toDouble(),
+    );
+  }
+
+  Pointer<Float> convertRRectToNative(ui.RRect rect) {
+    final Pointer<Float> pointer = allocFloatArray(12);
+    pointer[0] = rect.left;
+    pointer[1] = rect.top;
+    pointer[2] = rect.right;
+    pointer[3] = rect.bottom;
+
+    pointer[4] = rect.tlRadiusX;
+    pointer[5] = rect.tlRadiusY;
+    pointer[6] = rect.trRadiusX;
+    pointer[7] = rect.trRadiusY;
+
+    pointer[8] = rect.brRadiusX;
+    pointer[9] = rect.brRadiusY;
+    pointer[10] = rect.blRadiusX;
+    pointer[11] = rect.blRadiusY;
+
+    return pointer;
+  }
+
+  Pointer<Float> convertRSTransformsToNative(List<ui.RSTransform> transforms) {
+    final Pointer<Float> pointer = allocFloatArray(transforms.length * 4);
+    for (int i = 0; i < transforms.length; i++) {
+      final ui.RSTransform transform = transforms[i];
+      pointer[i * 4] = transform.scos;
+      pointer[i * 4 + 1] = transform.ssin;
+      pointer[i * 4 + 2] = transform.tx;
+      pointer[i * 4 + 3] = transform.ty;
+    }
+    return pointer;
+  }
+
+  Pointer<Float> convertDoublesToNative(List<double> values) {
+    final Pointer<Float> pointer = allocFloatArray(values.length);
+    for (int i = 0; i < values.length; i++) {
+      pointer[i] = values[i];
+    }
+    return pointer;
+  }
+
+  Pointer<Uint16> convertIntsToUint16Native(List<int> values) {
+    final Pointer<Uint16> pointer = allocUint16Array(values.length);
+    for (int i = 0; i < values.length; i++) {
+      pointer[i] = values[i];
+    }
+    return pointer;
+  }
+
+  Pointer<Uint32> convertIntsToUint32Native(List<int> values) {
+    final Pointer<Uint32> pointer = allocUint32Array(values.length);
+    for (int i = 0; i < values.length; i++) {
+      pointer[i] = values[i];
+    }
+    return pointer;
+  }
+
+  Pointer<Float> convertPointArrayToNative(List<ui.Offset> points) {
+    final Pointer<Float> pointer = allocFloatArray(points.length * 2);
+    for (int i = 0; i < points.length; i++) {
+      pointer[i * 2] = points[i].dx;
+      pointer[i * 2 + 1] = points[i].dy;
+    }
+    return pointer;
+  }
+
+  Pointer<Uint32> convertColorArrayToNative(List<ui.Color> colors) {
+    final Pointer<Uint32> pointer = allocUint32Array(colors.length);
+    for (int i = 0; i < colors.length; i++) {
+      pointer[i] = colors[i].value;
+    }
+    return pointer;
+  }
+
+  Pointer<Bool> allocBoolArray(int count) {
+    final int length = count * sizeOf<Bool>();
+    return stackAlloc(length).cast<Bool>();
+  }
+
+  Pointer<Int8> allocInt8Array(int count) {
+    final int length = count * sizeOf<Int8>();
+    return stackAlloc(length).cast<Int8>();
+  }
+
+  Pointer<Uint16> allocUint16Array(int count) {
+    final int length = count * sizeOf<Uint16>();
+    return stackAlloc(length).cast<Uint16>();
+  }
+
+  Pointer<Int32> allocInt32Array(int count) {
+    final int length = count * sizeOf<Int32>();
+    return stackAlloc(length).cast<Int32>();
+  }
+
+  Pointer<Uint32> allocUint32Array(int count) {
+    final int length = count * sizeOf<Uint32>();
+    return stackAlloc(length).cast<Uint32>();
+  }
+
+  Pointer<Float> allocFloatArray(int count) {
+    final int length = count * sizeOf<Float>();
+    return stackAlloc(length).cast<Float>();
+  }
+
+  Pointer<Pointer<Void>> allocPointerArray(int count) {
+    final int length = count * sizeOf<Pointer<Void>>();
+    return stackAlloc(length).cast<Pointer<Void>>();
+  }
+}
+
+T withStackScope<T>(T Function(StackScope scope) f) {
+  final StackPointer stack = stackSave();
+  final T result = f(StackScope());
+  stackRestore(stack);
+  return result;
+}
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_paint.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_paint.dart
new file mode 100644
index 0000000000000000000000000000000000000000..307e6968d517ac8b0ccc3ffd23702b9e27ae57ea
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_paint.dart
@@ -0,0 +1,77 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+@DefaultAsset('skwasm')
+library skwasm_impl;
+
+import 'dart:ffi';
+
+import 'package:ui/src/engine/skwasm/skwasm_impl.dart';
+
+final class RawPaint extends Opaque {}
+
+typedef PaintHandle = Pointer<RawPaint>;
+
+@Native<PaintHandle Function()>(symbol: 'paint_create', isLeaf: true)
+external PaintHandle paintCreate();
+
+@Native<Void Function(PaintHandle)>(symbol: 'paint_dispose', isLeaf: true)
+external void paintDispose(PaintHandle paint);
+
+@Native<Void Function(PaintHandle, Int)>(symbol: 'paint_setBlendMode', isLeaf: true)
+external void paintSetBlendMode(PaintHandle paint, int blendMode);
+
+@Native<Void Function(PaintHandle, Int)>(symbol: 'paint_setStyle', isLeaf: true)
+external void paintSetStyle(PaintHandle paint, int paintStyle);
+
+@Native<Int Function(PaintHandle)>(symbol: 'paint_getStyle', isLeaf: true)
+external int paintGetStyle(PaintHandle paint);
+
+@Native<Void Function(PaintHandle, Float)>(symbol: 'paint_setStrokeWidth', isLeaf: true)
+external void paintSetStrokeWidth(PaintHandle paint, double strokeWidth);
+
+@Native<Float Function(PaintHandle)>(symbol: 'paint_getStrokeWidth', isLeaf: true)
+external double paintGetStrokeWidth(PaintHandle paint);
+
+@Native<Void Function(PaintHandle, Int)>(symbol: 'paint_setStrokeCap', isLeaf: true)
+external void paintSetStrokeCap(PaintHandle paint, int cap);
+
+@Native<Int Function(PaintHandle)>(symbol: 'paint_getStrokeCap', isLeaf: true)
+external int paintGetStrokeCap(PaintHandle paint);
+
+@Native<Void Function(PaintHandle, Int)>(symbol: 'paint_setStrokeJoin', isLeaf: true)
+external void paintSetStrokeJoin(PaintHandle paint, int join);
+
+@Native<Int Function(PaintHandle)>(symbol: 'paint_getStrokeJoin', isLeaf: true)
+external int paintGetStrokeJoin(PaintHandle paint);
+
+@Native<Void Function(PaintHandle, Bool)>(symbol: 'paint_setAntiAlias', isLeaf: true)
+external void paintSetAntiAlias(PaintHandle paint, bool antiAlias);
+
+@Native<Bool Function(PaintHandle)>(symbol: 'paint_getAntiAlias', isLeaf: true)
+external bool paintGetAntiAlias(PaintHandle paint);
+
+@Native<Void Function(PaintHandle, Uint32)>(symbol: 'paint_setColorInt', isLeaf: true)
+external void paintSetColorInt(PaintHandle paint, int color);
+
+@Native<Uint32 Function(PaintHandle)>(symbol: 'paint_getColorInt', isLeaf: true)
+external int paintGetColorInt(PaintHandle paint);
+
+@Native<Void Function(PaintHandle, Float)>(symbol: 'paint_setMiterLimit', isLeaf: true)
+external void paintSetMiterLimit(PaintHandle paint, double miterLimit);
+
+@Native<Float Function(PaintHandle)>(symbol: 'paint_getMiterLimit', isLeaf: true)
+external double paintGetMiterLimit(PaintHandle paint);
+
+@Native<Void Function(PaintHandle, ShaderHandle)>(symbol: 'paint_setShader', isLeaf: true)
+external void paintSetShader(PaintHandle handle, ShaderHandle shader);
+
+@Native<Void Function(PaintHandle, ImageFilterHandle)>(symbol: 'paint_setImageFilter', isLeaf: true)
+external void paintSetImageFilter(PaintHandle handle, ImageFilterHandle filter);
+
+@Native<Void Function(PaintHandle, ColorFilterHandle)>(symbol: 'paint_setColorFilter', isLeaf: true)
+external void paintSetColorFilter(PaintHandle handle, ColorFilterHandle filter);
+
+@Native<Void Function(PaintHandle, MaskFilterHandle)>(symbol: 'paint_setMaskFilter', isLeaf: true)
+external void paintSetMaskFilter(PaintHandle handle, MaskFilterHandle filter);
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_path.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_path.dart
new file mode 100644
index 0000000000000000000000000000000000000000..4a4108a10862a77486e66edf45a66e98d293f1c9
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_path.dart
@@ -0,0 +1,203 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+@DefaultAsset('skwasm')
+library skwasm_impl;
+
+import 'dart:ffi';
+
+import 'package:ui/src/engine/skwasm/skwasm_impl.dart';
+
+final class RawPath extends Opaque {}
+
+typedef PathHandle = Pointer<RawPath>;
+
+@Native<PathHandle Function()>(symbol: 'path_create', isLeaf: true)
+external PathHandle pathCreate();
+
+@Native<Void Function(PathHandle)>(symbol: 'path_dispose', isLeaf: true)
+external void pathDispose(PathHandle path);
+
+@Native<PathHandle Function(PathHandle)>(symbol: 'path_copy', isLeaf: true)
+external PathHandle pathCopy(PathHandle path);
+
+@Native<Void Function(PathHandle, Int)>(symbol: 'path_setFillType', isLeaf: true)
+external void pathSetFillType(PathHandle path, int fillType);
+
+@Native<Int Function(PathHandle)>(symbol: 'path_getFillType', isLeaf: true)
+external int pathGetFillType(PathHandle path);
+
+@Native<Void Function(PathHandle, Float, Float)>(symbol: 'path_moveTo', isLeaf: true)
+external void pathMoveTo(PathHandle path, double x, double y);
+
+@Native<Void Function(PathHandle, Float, Float)>(symbol: 'path_relativeMoveTo', isLeaf: true)
+external void pathRelativeMoveTo(PathHandle path, double x, double y);
+
+@Native<Void Function(PathHandle, Float, Float)>(symbol: 'path_lineTo', isLeaf: true)
+external void pathLineTo(PathHandle path, double x, double y);
+
+@Native<Void Function(PathHandle, Float, Float)>(
+  symbol: 'path_relativeLineTo',
+  isLeaf: true)
+external void pathRelativeLineTo(PathHandle path, double x, double y);
+
+@Native<Void Function(PathHandle, Float, Float, Float, Float)>(
+  symbol: 'path_quadraticBezierTo',
+  isLeaf: true)
+external void pathQuadraticBezierTo(
+    PathHandle path, double x1, double y1, double x2, double y2);
+
+@Native<Void Function(PathHandle, Float, Float, Float, Float)>(
+  symbol: 'path_relativeQuadraticBezierTo',
+  isLeaf: true)
+external void pathRelativeQuadraticBezierTo(
+    PathHandle path, double x1, double y1, double x2, double y2);
+
+@Native<Void Function(PathHandle, Float, Float, Float, Float, Float, Float)>(
+  symbol: 'path_cubicTo',
+  isLeaf: true)
+external void pathCubicTo(
+  PathHandle path,
+  double x1,
+  double y1,
+  double x2,
+  double y2,
+  double x3,
+  double y3
+);
+
+@Native<Void Function(PathHandle, Float, Float, Float, Float, Float, Float)>(
+  symbol: 'path_relativeCubicTo',
+  isLeaf: true)
+external void pathRelativeCubicTo(
+  PathHandle path,
+  double x1,
+  double y1,
+  double x2,
+  double y2,
+  double x3,
+  double y3
+);
+
+@Native<Void Function(PathHandle, Float, Float, Float, Float, Float)>(
+  symbol: 'path_conicTo',
+  isLeaf: true)
+external void pathConicTo(
+  PathHandle path,
+  double x1,
+  double y1,
+  double x2,
+  double y2,
+  double w
+);
+
+@Native<Void Function(PathHandle, Float, Float, Float, Float, Float)>(
+  symbol: 'path_relativeConicTo',
+  isLeaf: true)
+external void pathRelativeConicTo(
+  PathHandle path,
+  double x1,
+  double y1,
+  double x2,
+  double y2,
+  double w
+);
+
+@Native<Void Function(PathHandle, RawRect, Float, Float, Bool)>(
+  symbol: 'path_arcToOval',
+  isLeaf: true)
+external void pathArcToOval(
+  PathHandle path,
+  RawRect rect,
+  double startAngle,
+  double sweepAngle,
+  bool forceMoveto
+);
+
+@Native<Void Function(PathHandle, Float, Float, Float, Int, Int, Float, Float)>(
+  symbol: 'path_arcToRotated',
+  isLeaf: true)
+external void pathArcToRotated(
+    PathHandle path,
+    double rx,
+    double ry,
+    double xAxisRotate,
+    int arcSize,
+    int pathDirection,
+    double x,
+    double y
+);
+
+@Native<Void Function(PathHandle, Float, Float, Float, Int, Int, Float, Float)>(
+  symbol: 'path_relativeArcToRotated',
+  isLeaf: true)
+external void pathRelativeArcToRotated(
+    PathHandle path,
+    double rx,
+    double ry,
+    double xAxisRotate,
+    int arcSize,
+    int pathDirection,
+    double x,
+    double y
+);
+
+@Native<Void Function(PathHandle, RawRect)>(symbol: 'path_addRect', isLeaf: true)
+external void pathAddRect(PathHandle path, RawRect oval);
+
+@Native<Void Function(PathHandle, RawRect)>(symbol: 'path_addOval', isLeaf: true)
+external void pathAddOval(PathHandle path, RawRect oval);
+
+@Native<Void Function(PathHandle, RawRect, Float, Float)>(
+  symbol: 'path_addArc',
+  isLeaf: true)
+external void pathAddArc(
+  PathHandle path,
+  RawRect ovalRect,
+  double startAngleDegrees,
+  double sweepAngleDegrees
+);
+
+@Native<Void Function(PathHandle, RawPointArray, Int, Bool)>(
+  symbol: 'path_addPolygon',
+  isLeaf: true)
+external void pathAddPolygon(
+  PathHandle path,
+  RawPointArray points,
+  int pointCount,
+  bool close
+);
+
+@Native<Void Function(PathHandle, RawRRect)>(symbol: 'path_addRRect', isLeaf: true)
+external void pathAddRRect(PathHandle path, RawRRect rrectValues);
+
+@Native<Void Function(PathHandle, PathHandle, RawMatrix33, Bool)>(
+  symbol: 'path_addPath',
+  isLeaf: true)
+external void pathAddPath(
+  PathHandle path,
+  PathHandle other,
+  RawMatrix33 matrix33,
+  bool extendPath
+);
+
+@Native<Void Function(PathHandle)>(symbol: 'path_close', isLeaf: true)
+external void pathClose(PathHandle path);
+
+@Native<Void Function(PathHandle)>(symbol: 'path_reset', isLeaf: true)
+external void pathReset(PathHandle path);
+
+@Native<Bool Function(PathHandle, Float, Float)>(symbol: 'path_contains', isLeaf: true)
+external bool pathContains(PathHandle path, double x, double y);
+
+@Native<Void Function(PathHandle, RawMatrix33)>(symbol: 'path_transform', isLeaf: true)
+external void pathTransform(PathHandle path, RawMatrix33 matrix33);
+
+@Native<Void Function(PathHandle, RawRect)>(symbol: 'path_getBounds', isLeaf: true)
+external void pathGetBounds(PathHandle path, RawRect outRect);
+
+@Native<PathHandle Function(Int, PathHandle, PathHandle)>(
+  symbol: 'path_combine',
+  isLeaf: true)
+external PathHandle pathCombine(int operation, PathHandle path1, PathHandle path2);
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_path_metrics.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_path_metrics.dart
new file mode 100644
index 0000000000000000000000000000000000000000..01705325ce9476a18612e6b15ae700c856d0a706
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_path_metrics.dart
@@ -0,0 +1,51 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+@DefaultAsset('skwasm')
+library skwasm_impl;
+
+import 'dart:ffi';
+
+import 'package:ui/src/engine/skwasm/skwasm_impl.dart';
+
+final class RawContourMeasure extends Opaque {}
+
+final class RawContourMeasureIter extends Opaque {}
+
+typedef ContourMeasureHandle = Pointer<RawContourMeasure>;
+typedef ContourMeasureIterHandle = Pointer<RawContourMeasureIter>;
+
+@Native<ContourMeasureIterHandle Function(PathHandle, Bool, Float)>(
+    symbol: 'contourMeasureIter_create')
+external ContourMeasureIterHandle contourMeasureIterCreate(
+    PathHandle path, bool forceClosed, double resScale);
+
+@Native<ContourMeasureHandle Function(ContourMeasureIterHandle)>(
+    symbol: 'contourMeasureIter_next')
+external ContourMeasureHandle contourMeasureIterNext(
+    ContourMeasureIterHandle handle);
+
+@Native<Void Function(ContourMeasureIterHandle)>(
+    symbol: 'contourMeasureIter_dispose')
+external void contourMeasureIterDispose(ContourMeasureIterHandle handle);
+
+@Native<Void Function(ContourMeasureHandle)>(symbol: 'contourMeasure_dispose')
+external void contourMeasureDispose(ContourMeasureHandle handle);
+
+@Native<Float Function(ContourMeasureHandle)>(symbol: 'contourMeasure_length')
+external double contourMeasureLength(ContourMeasureHandle handle);
+
+@Native<Bool Function(ContourMeasureHandle)>(symbol: 'contourMeasure_isClosed')
+external bool contourMeasureIsClosed(ContourMeasureHandle handle);
+
+@Native<
+    Bool Function(ContourMeasureHandle, Float, RawPointArray,
+        RawPointArray)>(symbol: 'contourMeasure_getPosTan')
+external bool contourMeasureGetPosTan(ContourMeasureHandle handle,
+    double distance, RawPointArray outPosition, RawPointArray outTangent);
+
+@Native<PathHandle Function(ContourMeasureHandle, Float, Float, Bool)>(
+    symbol: 'contourMeasure_getSegment')
+external PathHandle contourMeasureGetSegment(ContourMeasureHandle handle,
+    double start, double stop, bool startWithMoveTo);
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_picture.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_picture.dart
new file mode 100644
index 0000000000000000000000000000000000000000..a1499068df49be725cfea4f9a470b160187b8070
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_picture.dart
@@ -0,0 +1,52 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+@DefaultAsset('skwasm')
+library skwasm_impl;
+
+import 'dart:ffi';
+
+import 'package:ui/src/engine/skwasm/skwasm_impl.dart';
+
+final class RawPictureRecorder extends Opaque {}
+typedef PictureRecorderHandle = Pointer<RawPictureRecorder>;
+
+final class RawPicture extends Opaque {}
+typedef PictureHandle = Pointer<RawPicture>;
+
+@Native<PictureRecorderHandle Function()>(
+  symbol: 'pictureRecorder_create',
+  isLeaf: true)
+external PictureRecorderHandle pictureRecorderCreate();
+
+@Native<Void Function(PictureRecorderHandle)>(
+  symbol: 'pictureRecorder_dispose',
+  isLeaf: true)
+external void pictureRecorderDispose(PictureRecorderHandle picture);
+
+@Native<CanvasHandle Function(PictureRecorderHandle, RawRect)>(
+  symbol: 'pictureRecorder_beginRecording',
+  isLeaf: true)
+external CanvasHandle pictureRecorderBeginRecording(
+    PictureRecorderHandle picture, RawRect cullRect);
+
+@Native<PictureHandle Function(PictureRecorderHandle)>(
+  symbol: 'pictureRecorder_endRecording',
+  isLeaf: true)
+external PictureHandle pictureRecorderEndRecording(PictureRecorderHandle picture);
+
+@Native<Void Function(PictureHandle)>(
+  symbol: 'picture_dispose',
+  isLeaf: true)
+external void pictureDispose(PictureHandle handle);
+
+@Native<Uint32 Function(PictureHandle)>(
+  symbol: 'picture_approximateBytesUsed',
+  isLeaf: true)
+external int pictureApproximateBytesUsed(PictureHandle handle);
+
+@Native<Void Function(PictureHandle, RawRect)>(
+  symbol: 'picture_getCullRect',
+  isLeaf: true)
+external void pictureGetCullRect(PictureHandle handle, RawRect outRect);
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_shaders.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_shaders.dart
new file mode 100644
index 0000000000000000000000000000000000000000..9bda0b4e08e332bdb917efc1ab2b28def767ef89
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_shaders.dart
@@ -0,0 +1,138 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+@DefaultAsset('skwasm')
+library skwasm_impl;
+
+import 'dart:ffi';
+
+import 'package:ui/src/engine/skwasm/skwasm_impl.dart';
+
+final class RawShader extends Opaque {}
+typedef ShaderHandle = Pointer<RawShader>;
+
+final class RawRuntimeEffect extends Opaque {}
+typedef RuntimeEffectHandle = Pointer<RawRuntimeEffect>;
+
+@Native<ShaderHandle Function(
+  RawPointArray,
+  RawColorArray,
+  Pointer<Float>,
+  Int,
+  Int,
+  RawMatrix33,
+)>(symbol: 'shader_createLinearGradient', isLeaf: true)
+external ShaderHandle shaderCreateLinearGradient(
+  RawPointArray endPoints, // two points
+  RawColorArray colors,
+  Pointer<Float> stops, // Can be nullptr
+  int count, // Number of stops/colors
+  int tileMode,
+  RawMatrix33 matrix, // Can be nullptr
+);
+
+@Native<ShaderHandle Function(
+  Float,
+  Float,
+  Float,
+  RawColorArray,
+  Pointer<Float>,
+  Int,
+  Int,
+  RawMatrix33,
+)>(symbol: 'shader_createRadialGradient', isLeaf: true)
+external ShaderHandle shaderCreateRadialGradient(
+  double centerX,
+  double centerY,
+  double radius,
+  RawColorArray colors,
+  Pointer<Float> stops,
+  int count,
+  int tileMode,
+  RawMatrix33 localMatrix,
+);
+
+@Native<ShaderHandle Function(
+  RawPointArray,
+  Float,
+  Float,
+  RawColorArray,
+  Pointer<Float>,
+  Int,
+  Int,
+  RawMatrix33,
+)>(symbol: 'shader_createConicalGradient', isLeaf: true)
+external ShaderHandle shaderCreateConicalGradient(
+  RawPointArray endPoints, // Two points,
+  double startRadius,
+  double endRadius,
+  RawColorArray colors,
+  Pointer<Float> stops,
+  int count,
+  int tileMode,
+  RawMatrix33 localMatrix,
+);
+
+@Native<ShaderHandle Function(
+  Float,
+  Float,
+  RawColorArray,
+  Pointer<Float>,
+  Int,
+  Int,
+  Float,
+  Float,
+  RawMatrix33,
+)>(symbol: 'shader_createSweepGradient', isLeaf: true)
+external ShaderHandle shaderCreateSweepGradient(
+  double centerX,
+  double centerY,
+  RawColorArray colors,
+  Pointer<Float> stops,
+  int count,
+  int tileMode,
+  double startAngle,
+  double endAngle,
+  RawMatrix33 localMatrix
+);
+
+@Native<Void Function(ShaderHandle)>(symbol: 'shader_dispose', isLeaf: true)
+external void shaderDispose(ShaderHandle handle);
+
+@Native<RuntimeEffectHandle Function(SkStringHandle)>(symbol: 'runtimeEffect_create', isLeaf: true)
+external RuntimeEffectHandle runtimeEffectCreate(SkStringHandle source);
+
+@Native<Void Function(RuntimeEffectHandle)>(symbol: 'runtimeEffect_dispose', isLeaf: true)
+external void runtimeEffectDispose(RuntimeEffectHandle handle);
+
+@Native<Size Function(RuntimeEffectHandle)>(symbol: 'runtimeEffect_getUniformSize', isLeaf: true)
+external int runtimeEffectGetUniformSize(RuntimeEffectHandle handle);
+
+@Native<ShaderHandle Function(
+  RuntimeEffectHandle,
+  SkDataHandle,
+  Pointer<ShaderHandle>,
+  Size
+)>(symbol: 'shader_createRuntimeEffectShader', isLeaf: true)
+external ShaderHandle shaderCreateRuntimeEffectShader(
+  RuntimeEffectHandle runtimeEffect,
+  SkDataHandle uniforms,
+  Pointer<ShaderHandle> childShaders,
+  int childCount
+);
+
+@Native<ShaderHandle Function(
+  ImageHandle,
+  Int,
+  Int,
+  Int,
+  RawMatrix33,
+)>(symbol: 'shader_createFromImage', isLeaf: true)
+external ShaderHandle shaderCreateFromImage(
+  ImageHandle handle,
+  int tileModeX,
+  int tileModeY,
+  int quality,
+  RawMatrix33 localMatrix,
+);
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_skdata.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_skdata.dart
new file mode 100644
index 0000000000000000000000000000000000000000..8d25154f870df423abf7b845aba15e47fd0d9541
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_skdata.dart
@@ -0,0 +1,26 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+@DefaultAsset('skwasm')
+library skwasm_impl;
+
+import 'dart:ffi';
+
+final class RawSkData extends Opaque {}
+typedef SkDataHandle = Pointer<RawSkData>;
+
+@Native<SkDataHandle Function(Size)>(symbol: 'skData_create', isLeaf: true)
+external SkDataHandle skDataCreate(int size);
+
+@Native<Pointer<Void> Function(SkDataHandle)>(symbol: 'skData_getPointer', isLeaf: true)
+external Pointer<Void> skDataGetPointer(SkDataHandle handle);
+
+@Native<Pointer<Void> Function(SkDataHandle)>(symbol: 'skData_getConstPointer', isLeaf: true)
+external Pointer<Void> skDataGetConstPointer(SkDataHandle handle);
+
+@Native<Size Function(SkDataHandle)>(symbol: 'skData_getSize', isLeaf: true)
+external int skDataGetSize(SkDataHandle handle);
+
+@Native<Void Function(SkDataHandle)>(symbol: 'skData_dispose', isLeaf: true)
+external void skDataDispose(SkDataHandle handle);
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_skstring.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_skstring.dart
new file mode 100644
index 0000000000000000000000000000000000000000..84a500ebc5950a5781d03fcdd9525546ee357f45
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_skstring.dart
@@ -0,0 +1,52 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+@DefaultAsset('skwasm')
+library skwasm_impl;
+
+import 'dart:convert';
+import 'dart:ffi';
+
+final class RawSkString extends Opaque {}
+typedef SkStringHandle = Pointer<RawSkString>;
+
+final class RawSkString16 extends Opaque {}
+typedef SkString16Handle = Pointer<RawSkString16>;
+
+@Native<SkStringHandle Function(Size)>(symbol: 'skString_allocate', isLeaf: true)
+external SkStringHandle skStringAllocate(int size);
+
+@Native<Pointer<Int8> Function(SkStringHandle)>(symbol: 'skString_getData', isLeaf: true)
+external Pointer<Int8> skStringGetData(SkStringHandle handle);
+
+@Native<Void Function(SkStringHandle)>(symbol: 'skString_free', isLeaf: true)
+external void skStringFree(SkStringHandle handle);
+
+@Native<SkString16Handle Function(Size)>(symbol: 'skString16_allocate', isLeaf: true)
+external SkString16Handle skString16Allocate(int size);
+
+@Native<Pointer<Int16> Function(SkString16Handle)>(symbol: 'skString16_getData', isLeaf: true)
+external Pointer<Int16> skString16GetData(SkString16Handle handle);
+
+@Native<Void Function(SkString16Handle)>(symbol: 'skString16_free', isLeaf: true)
+external void skString16Free(SkString16Handle handle);
+
+SkStringHandle skStringFromDartString(String string) {
+  final List<int> rawUtf8Bytes = utf8.encode(string);
+  final SkStringHandle stringHandle = skStringAllocate(rawUtf8Bytes.length);
+  final Pointer<Int8> stringDataPointer = skStringGetData(stringHandle);
+  for (int i = 0; i < rawUtf8Bytes.length; i++) {
+    stringDataPointer[i] = rawUtf8Bytes[i];
+  }
+  return stringHandle;
+}
+
+SkString16Handle skString16FromDartString(String string) {
+  final SkString16Handle stringHandle = skString16Allocate(string.length);
+  final Pointer<Int16> stringDataPointer = skString16GetData(stringHandle);
+  for (int i = 0; i < string.length; i++) {
+    stringDataPointer[i] = string.codeUnitAt(i);
+  }
+  return stringHandle;
+}
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_surface.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_surface.dart
new file mode 100644
index 0000000000000000000000000000000000000000..22b7462eec9bcee4e1c4e68b5d5c40d6da84ea0a
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_surface.dart
@@ -0,0 +1,52 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+@DefaultAsset('skwasm')
+library skwasm_impl;
+
+import 'dart:ffi';
+import 'package:ui/src/engine/skwasm/skwasm_impl.dart';
+
+final class RawSurface extends Opaque {}
+typedef SurfaceHandle = Pointer<RawSurface>;
+
+final class RawRenderCallback extends Opaque {}
+typedef OnRenderCallbackHandle = Pointer<RawRenderCallback>;
+
+typedef CallbackId = int;
+
+@Native<SurfaceHandle Function()>(symbol: 'surface_create', isLeaf: true)
+external SurfaceHandle surfaceCreate();
+
+@Native<UnsignedLong Function(SurfaceHandle)>(symbol: 'surface_getThreadId', isLeaf: true)
+external int surfaceGetThreadId(SurfaceHandle handle);
+
+@Native<Void Function(SurfaceHandle, OnRenderCallbackHandle)>(
+  symbol: 'surface_setCallbackHandler',
+  isLeaf: true)
+external void surfaceSetCallbackHandler(
+  SurfaceHandle surface,
+  OnRenderCallbackHandle callback,
+);
+
+@Native<Void Function(SurfaceHandle)>(
+  symbol: 'surface_destroy',
+  isLeaf: true)
+external void surfaceDestroy(SurfaceHandle surface);
+
+@Native<Int32 Function(SurfaceHandle, Pointer<PictureHandle>, Int)>(
+  symbol: 'surface_renderPictures',
+  isLeaf: true)
+external CallbackId surfaceRenderPictures(SurfaceHandle surface, Pointer<PictureHandle> picture, int count);
+
+@Native<Int32 Function(
+  SurfaceHandle,
+  ImageHandle,
+  Int
+)>(symbol: 'surface_rasterizeImage', isLeaf: true)
+external CallbackId surfaceRasterizeImage(
+  SurfaceHandle handle,
+  ImageHandle image,
+  int format,
+);
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_vertices.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_vertices.dart
new file mode 100644
index 0000000000000000000000000000000000000000..dd9f61b914195762ae4e2165c020e6c91b32e648
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_vertices.dart
@@ -0,0 +1,35 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+@DefaultAsset('skwasm')
+library skwasm_impl;
+
+import 'dart:ffi';
+
+import 'package:ui/src/engine/skwasm/skwasm_impl.dart';
+
+final class RawVertices extends Opaque {}
+typedef VerticesHandle = Pointer<RawVertices>;
+
+@Native<VerticesHandle Function(
+  Int vertexMode,
+  Int vertexCount,
+  RawPointArray positions,
+  RawPointArray textureCoordinates,
+  RawColorArray colors,
+  Int indexCount,
+  Pointer<Uint16> indices,
+)>(symbol: 'vertices_create', isLeaf: true)
+external VerticesHandle verticesCreate(
+  int vertexMode,
+  int vertexCount,
+  RawPointArray positions,
+  RawPointArray textureCoordinates,
+  RawColorArray colors,
+  int indexCount,
+  Pointer<Uint16> indices,
+);
+
+@Native<Void Function(VerticesHandle)>(symbol: 'vertices_dispose', isLeaf: true)
+external void verticesDispose(VerticesHandle handle);
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/skwasm_module.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/skwasm_module.dart
new file mode 100644
index 0000000000000000000000000000000000000000..d162f190dbe7060e14c8a876210c08b924022cb4
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/skwasm_module.dart
@@ -0,0 +1,28 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:_wasm';
+import 'dart:js_interop';
+
+@JS()
+@staticInterop
+class WebAssemblyMemory {}
+
+extension WebAssemblyMemoryExtension on WebAssemblyMemory {
+  external JSArrayBuffer get buffer;
+}
+
+@JS()
+@staticInterop
+class SkwasmInstance {}
+
+extension SkwasmInstanceExtension on SkwasmInstance {
+  external WebAssemblyMemory get wasmMemory;
+}
+
+@JS('window._flutter_skwasmInstance')
+external SkwasmInstance get skwasmInstance;
+
+@pragma('wasm:import', 'skwasmWrapper.addFunction')
+external WasmI32 addFunction(WasmFuncRef function);
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/text/raw_line_metrics.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/text/raw_line_metrics.dart
new file mode 100644
index 0000000000000000000000000000000000000000..c00d4acd1641e2f6aa1fddf7c8e278099858baeb
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/text/raw_line_metrics.dart
@@ -0,0 +1,70 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+@DefaultAsset('skwasm')
+library skwasm_impl;
+
+import 'dart:ffi';
+
+final class RawLineMetrics extends Opaque {}
+typedef LineMetricsHandle = Pointer<RawLineMetrics>;
+
+@Native<LineMetricsHandle Function(
+  Bool,
+  Double,
+  Double,
+  Double,
+  Double,
+  Double,
+  Double,
+  Double,
+  Size,
+)>(symbol: 'lineMetrics_create', isLeaf: true)
+external LineMetricsHandle lineMetricsCreate(
+  bool hardBreak,
+  double ascent,
+  double descent,
+  double unscaledAscent,
+  double height,
+  double width,
+  double left,
+  double baseline,
+  int lineNumber
+);
+
+@Native<Void Function(LineMetricsHandle)>(symbol: 'lineMetrics_dispose', isLeaf: true)
+external void lineMetricsDispose(LineMetricsHandle handle);
+
+@Native<Bool Function(LineMetricsHandle)>(symbol: 'lineMetrics_getHardBreak', isLeaf: true)
+external bool lineMetricsGetHardBreak(LineMetricsHandle handle);
+
+@Native<Float Function(LineMetricsHandle)>(symbol: 'lineMetrics_getAscent', isLeaf: true)
+external double lineMetricsGetAscent(LineMetricsHandle handle);
+
+@Native<Float Function(LineMetricsHandle)>(symbol: 'lineMetrics_getDescent', isLeaf: true)
+external double lineMetricsGetDescent(LineMetricsHandle handle);
+
+@Native<Float Function(LineMetricsHandle)>(symbol: 'lineMetrics_getUnscaledAscent', isLeaf: true)
+external double lineMetricsGetUnscaledAscent(LineMetricsHandle handle);
+
+@Native<Float Function(LineMetricsHandle)>(symbol: 'lineMetrics_getHeight', isLeaf: true)
+external double lineMetricsGetHeight(LineMetricsHandle handle);
+
+@Native<Float Function(LineMetricsHandle)>(symbol: 'lineMetrics_getWidth', isLeaf: true)
+external double lineMetricsGetWidth(LineMetricsHandle handle);
+
+@Native<Float Function(LineMetricsHandle)>(symbol: 'lineMetrics_getLeft', isLeaf: true)
+external double lineMetricsGetLeft(LineMetricsHandle handle);
+
+@Native<Float Function(LineMetricsHandle)>(symbol: 'lineMetrics_getBaseline', isLeaf: true)
+external double lineMetricsGetBaseline(LineMetricsHandle handle);
+
+@Native<Int Function(LineMetricsHandle)>(symbol: 'lineMetrics_getLineNumber', isLeaf: true)
+external int lineMetricsGetLineNumber(LineMetricsHandle handle);
+
+@Native<Size Function(LineMetricsHandle)>(symbol: 'lineMetrics_getStartIndex', isLeaf: true)
+external int lineMetricsGetStartIndex(LineMetricsHandle handle);
+
+@Native<Size Function(LineMetricsHandle)>(symbol: 'lineMetrics_getEndIndex', isLeaf: true)
+external int lineMetricsGetEndIndex(LineMetricsHandle handle);
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/text/raw_paragraph.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/text/raw_paragraph.dart
new file mode 100644
index 0000000000000000000000000000000000000000..f8a3e811719a78cca5a6a710f2aca87091f1f665
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/text/raw_paragraph.dart
@@ -0,0 +1,171 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+@DefaultAsset('skwasm')
+library skwasm_impl;
+
+import 'dart:ffi';
+
+import 'package:ui/src/engine/skwasm/skwasm_impl.dart';
+
+final class RawParagraph extends Opaque {}
+typedef ParagraphHandle = Pointer<RawParagraph>;
+
+final class RawTextBoxList extends Opaque {}
+typedef TextBoxListHandle = Pointer<RawTextBoxList>;
+
+final class RawUnicodePositionBuffer extends Opaque {}
+typedef UnicodePositionBufferHandle = Pointer<RawUnicodePositionBuffer>;
+
+final class RawLineBreakBuffer extends Opaque {}
+typedef LineBreakBufferHandle = Pointer<RawLineBreakBuffer>;
+
+final class LineBreak extends Struct {
+  @Int32()
+  external int position;
+
+  @Int32()
+  external int lineBreakType;
+}
+
+@Native<Void Function(ParagraphHandle)>(symbol: 'paragraph_dispose', isLeaf: true)
+external void paragraphDispose(ParagraphHandle handle);
+
+@Native<Float Function(ParagraphHandle)>(symbol: 'paragraph_getWidth', isLeaf: true)
+external double paragraphGetWidth(ParagraphHandle handle);
+
+@Native<Float Function(ParagraphHandle)>(symbol: 'paragraph_getHeight', isLeaf: true)
+external double paragraphGetHeight(ParagraphHandle handle);
+
+@Native<Float Function(ParagraphHandle)>(symbol: 'paragraph_getLongestLine', isLeaf: true)
+external double paragraphGetLongestLine(ParagraphHandle handle);
+
+@Native<Float Function(ParagraphHandle)>(symbol: 'paragraph_getMinIntrinsicWidth', isLeaf: true)
+external double paragraphGetMinIntrinsicWidth(ParagraphHandle handle);
+
+@Native<Float Function(ParagraphHandle)>(symbol: 'paragraph_getMaxIntrinsicWidth', isLeaf: true)
+external double paragraphGetMaxIntrinsicWidth(ParagraphHandle handle);
+
+@Native<Float Function(ParagraphHandle)>(symbol: 'paragraph_getAlphabeticBaseline', isLeaf: true)
+external double paragraphGetAlphabeticBaseline(ParagraphHandle handle);
+
+@Native<Float Function(ParagraphHandle)>(symbol: 'paragraph_getIdeographicBaseline', isLeaf: true)
+external double paragraphGetIdeographicBaseline(ParagraphHandle handle);
+
+@Native<Bool Function(ParagraphHandle)>(symbol: 'paragraph_getDidExceedMaxLines', isLeaf: true)
+external bool paragraphGetDidExceedMaxLines(ParagraphHandle handle);
+
+@Native<Void Function(ParagraphHandle, Float)>(symbol: 'paragraph_layout', isLeaf: true)
+external void paragraphLayout(ParagraphHandle handle, double width);
+
+@Native<Int32 Function(
+  ParagraphHandle,
+  Float,
+  Float,
+  Pointer<Int32>
+)>(symbol: 'paragraph_getPositionForOffset', isLeaf: true)
+external int paragraphGetPositionForOffset(
+  ParagraphHandle handle,
+  double offsetX,
+  double offsetY,
+  Pointer<Int32> outAffinity,
+);
+
+@Native<Bool Function(ParagraphHandle, Float, Float, RawRect, Pointer<Uint32>, Pointer<Bool>)>(symbol: 'paragraph_getClosestGlyphInfoAtCoordinate')
+external bool paragraphGetClosestGlyphInfoAtCoordinate(
+  ParagraphHandle handle,
+  double offsetX, double offsetY,
+  RawRect graphemeLayoutBounds,          // 4 floats, [LTRB]
+  Pointer<Uint32> graphemeCodeUnitRange, // 2 `size_t`s, start and end.
+  Pointer<Bool> booleanFlags,            // 1 boolean, isLTR.
+);
+
+@Native<Bool Function(ParagraphHandle, Uint32, RawRect, Pointer<Uint32>, Pointer<Bool>)>(symbol: 'paragraph_getGlyphInfoAt')
+external bool paragraphGetGlyphInfoAt(
+  ParagraphHandle handle,
+  int codeUnitOffset,
+  RawRect graphemeLayoutBounds,          // 4 floats, [LTRB]
+  Pointer<Uint32> graphemeCodeUnitRange, // 2 `size_t`s, start and end.
+  Pointer<Bool> booleanFlags,            // 1 boolean, isLTR.
+);
+
+@Native<Void Function(
+  ParagraphHandle,
+  UnsignedInt,
+  Pointer<Int32>,
+)>(symbol: 'paragraph_getWordBoundary', isLeaf: true)
+external void paragraphGetWordBoundary(
+  ParagraphHandle handle,
+  int position,
+  Pointer<Int32> outRange, // Two `size_t`s, start and end
+);
+
+@Native<Size Function(ParagraphHandle)>(symbol: 'paragraph_getLineCount', isLeaf: true)
+external int paragraphGetLineCount(ParagraphHandle handle);
+
+@Native<Int Function(ParagraphHandle, Size)>(symbol: 'paragraph_getLineNumberAt', isLeaf: true)
+external int paragraphGetLineNumberAt(ParagraphHandle handle, int characterIndex);
+
+@Native<LineMetricsHandle Function(
+  ParagraphHandle,
+  Size,
+)>(symbol: 'paragraph_getLineMetricsAtIndex', isLeaf: true)
+external LineMetricsHandle paragraphGetLineMetricsAtIndex(
+  ParagraphHandle handle,
+  int index,
+);
+
+@Native<Void Function(TextBoxListHandle)>(symbol: 'textBoxList_dispose', isLeaf: true)
+external void textBoxListDispose(TextBoxListHandle handle);
+
+@Native<Size Function(TextBoxListHandle)>(symbol: 'textBoxList_getLength', isLeaf: true)
+external int textBoxListGetLength(TextBoxListHandle handle);
+
+@Native<Int Function(
+TextBoxListHandle,
+  Size,
+  RawRect
+)>(symbol: 'textBoxList_getBoxAtIndex', isLeaf: true)
+external int textBoxListGetBoxAtIndex(
+  TextBoxListHandle handle,
+  int index,
+  RawRect outRect,
+);
+
+@Native<TextBoxListHandle Function(
+  ParagraphHandle,
+  Int,
+  Int,
+  Int,
+  Int,
+)>(symbol: 'paragraph_getBoxesForRange', isLeaf: true)
+external TextBoxListHandle paragraphGetBoxesForRange(
+  ParagraphHandle handle,
+  int start,
+  int end,
+  int heightStyle,
+  int widthStyle,
+);
+
+@Native<TextBoxListHandle Function(ParagraphHandle)>(
+  symbol: 'paragraph_getBoxesForPlaceholders', isLeaf: true)
+external TextBoxListHandle paragraphGetBoxesForPlaceholders(ParagraphHandle handle);
+
+// Returns a list of the code points that were unable to be rendered with the
+// selected fonts. The list is deduplicated, so each code point in the output
+// is unique.
+// If `nullptr` is passed in for `outCodePoints`, we simply return the count
+// of the code points.
+// Note: This must be called after the paragraph has been laid out at least
+// once in order to get valid data.
+@Native<Int Function(
+  ParagraphHandle,
+  Pointer<Uint32>,
+  Int,
+)>(symbol: 'paragraph_getUnresolvedCodePoints', isLeaf: true)
+external int paragraphGetUnresolvedCodePoints(
+  ParagraphHandle handle,
+  Pointer<Uint32> outCodePoints,
+  int outLength,
+);
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/text/raw_paragraph_builder.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/text/raw_paragraph_builder.dart
new file mode 100644
index 0000000000000000000000000000000000000000..451f66126fcddefee393e93d98923fba219b51a1
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/text/raw_paragraph_builder.dart
@@ -0,0 +1,120 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+@DefaultAsset('skwasm')
+library skwasm_impl;
+
+import 'dart:ffi';
+
+import 'package:ui/src/engine/skwasm/skwasm_impl.dart';
+
+final class RawParagraphBuilder extends Opaque {}
+typedef ParagraphBuilderHandle = Pointer<RawParagraphBuilder>;
+
+@Native<ParagraphBuilderHandle Function(
+  ParagraphStyleHandle,
+  FontCollectionHandle,
+)>(symbol: 'paragraphBuilder_create', isLeaf: true)
+external ParagraphBuilderHandle paragraphBuilderCreate(
+  ParagraphStyleHandle styleHandle,
+  FontCollectionHandle fontCollectionHandle,
+);
+
+@Native<Void Function(ParagraphBuilderHandle)>(symbol: 'paragraphBuilder_dispose', isLeaf: true)
+external void paragraphBuilderDispose(ParagraphBuilderHandle handle);
+
+@Native<Void Function(
+  ParagraphBuilderHandle,
+  Float,
+  Float,
+  Int,
+  Float,
+  Int,
+)>(symbol: 'paragraphBuilder_addPlaceholder', isLeaf: true)
+external void paragraphBuilderAddPlaceholder(
+  ParagraphBuilderHandle handle,
+  double width,
+  double height,
+  int alignment,
+  double baslineOffset,
+  int baseline,
+);
+
+@Native<Void Function(
+  ParagraphBuilderHandle,
+  SkString16Handle,
+)>(symbol: 'paragraphBuilder_addText', isLeaf: true)
+external void paragraphBuilderAddText(
+  ParagraphBuilderHandle handle,
+  SkString16Handle text,
+);
+
+@Native<Pointer<Uint8> Function(
+  ParagraphBuilderHandle,
+  Pointer<Uint32>
+)>(symbol: 'paragraphBuilder_getUtf8Text', isLeaf: true)
+external Pointer<Uint8> paragraphBuilderGetUtf8Text(
+  ParagraphBuilderHandle handle,
+  Pointer<Uint32> outSize
+);
+
+@Native<Void Function(
+  ParagraphBuilderHandle,
+  TextStyleHandle,
+)>(symbol: 'paragraphBuilder_pushStyle', isLeaf: true)
+external void paragraphBuilderPushStyle(
+  ParagraphBuilderHandle handle,
+  TextStyleHandle styleHandle,
+);
+
+@Native<Void Function(ParagraphBuilderHandle)>(symbol: 'paragraphBuilder_pop', isLeaf: true)
+external void paragraphBuilderPop(ParagraphBuilderHandle handle);
+
+@Native<ParagraphHandle Function(ParagraphBuilderHandle)>(symbol: 'paragraphBuilder_build', isLeaf: true)
+external ParagraphHandle paragraphBuilderBuild(ParagraphBuilderHandle handle);
+
+@Native<UnicodePositionBufferHandle Function(Size)>(
+  symbol: 'unicodePositionBuffer_create', isLeaf: true)
+external UnicodePositionBufferHandle unicodePositionBufferCreate(int size);
+
+@Native<Pointer<Uint32> Function(UnicodePositionBufferHandle)>(
+  symbol: 'unicodePositionBuffer_getDataPointer', isLeaf: true)
+external Pointer<Uint32> unicodePositionBufferGetDataPointer(UnicodePositionBufferHandle handle);
+
+@Native<Void Function(UnicodePositionBufferHandle)>(
+  symbol: 'unicodePositionBuffer_free', isLeaf: true)
+external void unicodePositionBufferFree(UnicodePositionBufferHandle handle);
+
+@Native<LineBreakBufferHandle Function(Size)>(
+  symbol: 'lineBreakBuffer_create', isLeaf: true)
+external LineBreakBufferHandle lineBreakBufferCreate(int size);
+
+@Native<Pointer<LineBreak> Function(LineBreakBufferHandle)>(
+  symbol: 'lineBreakBuffer_getDataPointer', isLeaf: true)
+external Pointer<LineBreak> lineBreakBufferGetDataPointer(LineBreakBufferHandle handle);
+
+@Native<Void Function(LineBreakBufferHandle)>(
+  symbol: 'lineBreakBuffer_free', isLeaf: true)
+external void lineBreakBufferFree(LineBreakBufferHandle handle);
+
+@Native<Void Function(ParagraphBuilderHandle, UnicodePositionBufferHandle)>(
+  symbol: 'paragraphBuilder_setGraphemeBreaksUtf16', isLeaf: true)
+external void paragraphBuilderSetGraphemeBreaksUtf16(
+  ParagraphBuilderHandle handle,
+  UnicodePositionBufferHandle positionBuffer,
+);
+
+@Native<Void Function(ParagraphBuilderHandle, UnicodePositionBufferHandle)>(
+  symbol: 'paragraphBuilder_setWordBreaksUtf16', isLeaf: true)
+external void paragraphBuilderSetWordBreaksUtf16(
+  ParagraphBuilderHandle handle,
+  UnicodePositionBufferHandle positionBuffer,
+);
+
+@Native<Void Function(ParagraphBuilderHandle, LineBreakBufferHandle)>(
+  symbol: 'paragraphBuilder_setLineBreaksUtf16', isLeaf: true)
+external void paragraphBuilderSetLineBreaksUtf16(
+  ParagraphBuilderHandle handle,
+  LineBreakBufferHandle positionBuffer,
+);
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/text/raw_paragraph_style.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/text/raw_paragraph_style.dart
new file mode 100644
index 0000000000000000000000000000000000000000..77a7d64328638790a49af81fe58fa4a8be14a7fc
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/text/raw_paragraph_style.dart
@@ -0,0 +1,54 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+@DefaultAsset('skwasm')
+library skwasm_impl;
+
+import 'dart:ffi';
+
+import 'package:ui/src/engine/skwasm/skwasm_impl.dart';
+
+final class RawParagraphStyle extends Opaque {}
+typedef ParagraphStyleHandle = Pointer<RawParagraphStyle>;
+
+@Native<ParagraphStyleHandle Function()>(symbol: 'paragraphStyle_create', isLeaf: true)
+external ParagraphStyleHandle paragraphStyleCreate();
+
+@Native<Void Function(ParagraphStyleHandle)>(symbol: 'paragraphStyle_dispose', isLeaf: true)
+external void paragraphStyleDispose(ParagraphStyleHandle handle);
+
+@Native<Void Function(ParagraphStyleHandle, Int)>(symbol: 'paragraphStyle_setTextAlign', isLeaf: true)
+external void paragraphStyleSetTextAlign(ParagraphStyleHandle handle, int textAlign);
+
+@Native<Void Function(ParagraphStyleHandle, Int)>(symbol: 'paragraphStyle_setTextDirection', isLeaf: true)
+external void paragraphStyleSetTextDirection(ParagraphStyleHandle handle, int textDirection);
+
+@Native<Void Function(ParagraphStyleHandle, Size)>(symbol: 'paragraphStyle_setMaxLines', isLeaf: true)
+external void paragraphStyleSetMaxLines(ParagraphStyleHandle handle, int maxLines);
+
+@Native<Void Function(ParagraphStyleHandle, Float)>(symbol: 'paragraphStyle_setHeight', isLeaf: true)
+external void paragraphStyleSetHeight(ParagraphStyleHandle handle, double height);
+
+@Native<Void Function(
+  ParagraphStyleHandle,
+  Bool,
+  Bool,
+)>(symbol: 'paragraphStyle_setTextHeightBehavior', isLeaf: true)
+external void paragraphStyleSetTextHeightBehavior(
+  ParagraphStyleHandle handle,
+  bool applyHeightToFirstAscent,
+  bool applyHeightToLastDescent,
+);
+
+@Native<Void Function(ParagraphStyleHandle, SkStringHandle)>(symbol: 'paragraphStyle_setEllipsis', isLeaf: true)
+external void paragraphStyleSetEllipsis(ParagraphStyleHandle handle, SkStringHandle ellipsis);
+
+@Native<Void Function(ParagraphStyleHandle, StrutStyleHandle)>(symbol: 'paragraphStyle_setStrutStyle', isLeaf: true)
+external void paragraphStyleSetStrutStyle(ParagraphStyleHandle handle, StrutStyleHandle strutStyle);
+
+@Native<Void Function(ParagraphStyleHandle, TextStyleHandle)>(symbol: 'paragraphStyle_setTextStyle', isLeaf: true)
+external void paragraphStyleSetTextStyle(ParagraphStyleHandle handle, TextStyleHandle textStyle);
+
+@Native<Void Function(ParagraphStyleHandle, Bool)>(symbol: 'paragraphStyle_setApplyRoundingHack', isLeaf: true)
+external void paragraphStyleSetApplyRoundingHack(ParagraphStyleHandle handle, bool applyRoundingHack);
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/text/raw_strut_style.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/text/raw_strut_style.dart
new file mode 100644
index 0000000000000000000000000000000000000000..d9f925b125444b511a6408c192fd67350e6aa4ef
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/text/raw_strut_style.dart
@@ -0,0 +1,57 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+@DefaultAsset('skwasm')
+library skwasm_impl;
+
+import 'dart:ffi';
+
+import 'package:ui/src/engine/skwasm/skwasm_impl.dart';
+
+final class RawStrutStyle extends Opaque {}
+
+typedef StrutStyleHandle = Pointer<RawStrutStyle>;
+
+@Native<StrutStyleHandle Function()>(symbol: 'strutStyle_create', isLeaf: true)
+external StrutStyleHandle strutStyleCreate();
+
+@Native<Void Function(StrutStyleHandle)>(symbol: 'strutStyle_dispose', isLeaf: true)
+external void strutStyleDispose(StrutStyleHandle handle);
+
+@Native<Void Function(
+  StrutStyleHandle,
+  Pointer<SkStringHandle> families,
+  Int count
+)>(symbol: 'strutStyle_setFontFamilies', isLeaf: true)
+external void strutStyleSetFontFamilies(
+  StrutStyleHandle handle,
+  Pointer<SkStringHandle> families,
+  int count
+);
+
+@Native<Void Function(StrutStyleHandle, Float)>(symbol: 'strutStyle_setFontSize', isLeaf: true)
+external void strutStyleSetFontSize(StrutStyleHandle handle, double fontSize);
+
+@Native<Void Function(StrutStyleHandle, Float)>(symbol: 'strutStyle_setHeight', isLeaf: true)
+external void strutStyleSetHeight(StrutStyleHandle handle, double height);
+
+@Native<Void Function(StrutStyleHandle, Bool)>(symbol: 'strutStyle_setHalfLeading', isLeaf: true)
+external void strutStyleSetHalfLeading(StrutStyleHandle handle, bool height);
+
+@Native<Void Function(StrutStyleHandle, Float)>(symbol: 'strutStyle_setLeading', isLeaf: true)
+external void strutStyleSetLeading(StrutStyleHandle handle, double leading);
+
+@Native<Void Function(
+  StrutStyleHandle,
+  Int,
+  Int,
+)>(symbol: 'strutStyle_setFontStyle', isLeaf: true)
+external void strutStyleSetFontStyle(
+  StrutStyleHandle handle,
+  int weight,
+  int slant,
+);
+
+@Native<Void Function(StrutStyleHandle, Bool)>(symbol: 'strutStyle_setForceStrutHeight', isLeaf: true)
+external void strutStyleSetForceStrutHeight(StrutStyleHandle handle, bool forceStrutHeight);
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/text/raw_text_style.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/text/raw_text_style.dart
new file mode 100644
index 0000000000000000000000000000000000000000..3a8aca91674ae867f40c508619b6509052f32990
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/text/raw_text_style.dart
@@ -0,0 +1,129 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+@DefaultAsset('skwasm')
+library skwasm_impl;
+
+import 'dart:ffi';
+
+import 'package:ui/src/engine/skwasm/skwasm_impl.dart';
+
+final class RawTextStyle extends Opaque {}
+
+typedef TextStyleHandle = Pointer<RawTextStyle>;
+
+@Native<TextStyleHandle Function()>(symbol: 'textStyle_create', isLeaf: true)
+external TextStyleHandle textStyleCreate();
+
+@Native<TextStyleHandle Function(TextStyleHandle)>(symbol: 'textStyle_copy', isLeaf: true)
+external TextStyleHandle textStyleCopy(TextStyleHandle handle);
+
+@Native<Void Function(TextStyleHandle)>(symbol: 'textStyle_dispose', isLeaf: true)
+external void textStyleDispose(TextStyleHandle handle);
+
+@Native<Void Function(TextStyleHandle, Int32)>(symbol: 'textStyle_setColor', isLeaf: true)
+external void textStyleSetColor(TextStyleHandle handle, int color);
+
+@Native<Void Function(TextStyleHandle, Int)>(symbol: 'textStyle_setDecoration', isLeaf: true)
+external void textStyleSetDecoration(TextStyleHandle handle, int decoration);
+
+@Native<Void Function(TextStyleHandle, Int32)>(symbol: 'textStyle_setDecorationColor', isLeaf: true)
+external void textStyleSetDecorationColor(TextStyleHandle handle, int decorationColor);
+
+@Native<Void Function(TextStyleHandle, Int)>(symbol: 'textStyle_setDecorationStyle', isLeaf: true)
+external void textStyleSetDecorationStyle(TextStyleHandle handle, int decorationStyle);
+
+@Native<Void Function(TextStyleHandle, Float)>(symbol: 'textStyle_setDecorationThickness', isLeaf: true)
+external void textStyleSetDecorationThickness(TextStyleHandle handle, double decorationThickness);
+
+@Native<Void Function(
+  TextStyleHandle,
+  Int,
+  Int
+)>(symbol: 'textStyle_setFontStyle', isLeaf: true)
+external void textStyleSetFontStyle(
+  TextStyleHandle handle,
+  int weight,
+  int slant
+);
+
+@Native<Void Function(TextStyleHandle, Int)>(symbol: 'textStyle_setTextBaseline', isLeaf: true)
+external void textStyleSetTextBaseline(TextStyleHandle handle, int baseline);
+
+@Native<Void Function(TextStyleHandle)>(symbol: 'textStyle_clearFontFamilies', isLeaf: true)
+external void textStyleClearFontFamilies(TextStyleHandle handle);
+
+@Native<Void Function(
+  TextStyleHandle,
+  Pointer<SkStringHandle>,
+  Int count
+)>(symbol: 'textStyle_addFontFamilies', isLeaf: true)
+external void textStyleAddFontFamilies(
+  TextStyleHandle handle,
+  Pointer<SkStringHandle> families,
+  int count
+);
+
+@Native<Void Function(TextStyleHandle, Float)>(symbol: 'textStyle_setFontSize', isLeaf: true)
+external void textStyleSetFontSize(TextStyleHandle handle, double size);
+
+@Native<Void Function(TextStyleHandle, Float)>(symbol: 'textStyle_setLetterSpacing', isLeaf: true)
+external void textStyleSetLetterSpacing(TextStyleHandle handle, double spacing);
+
+@Native<Void Function(TextStyleHandle, Float)>(symbol: 'textStyle_setWordSpacing', isLeaf: true)
+external void textStyleSetWordSpacing(TextStyleHandle handle, double spacing);
+
+@Native<Void Function(TextStyleHandle, Float)>(symbol: 'textStyle_setHeight', isLeaf: true)
+external void textStyleSetHeight(TextStyleHandle handle, double height);
+
+@Native<Void Function(TextStyleHandle, Bool)>(symbol: 'textStyle_setHalfLeading', isLeaf: true)
+external void textStyleSetHalfLeading(TextStyleHandle handle, bool halfLeading);
+
+@Native<Void Function(TextStyleHandle, SkStringHandle)>(symbol: 'textStyle_setLocale', isLeaf: true)
+external void textStyleSetLocale(TextStyleHandle handle, SkStringHandle locale);
+
+@Native<Void Function(TextStyleHandle, PaintHandle)>(symbol: 'textStyle_setBackground', isLeaf: true)
+external void textStyleSetBackground(TextStyleHandle handle, PaintHandle paint);
+
+@Native<Void Function(TextStyleHandle, PaintHandle)>(symbol: 'textStyle_setForeground', isLeaf: true)
+external void textStyleSetForeground(TextStyleHandle handle, PaintHandle paint);
+
+@Native<Void Function(
+  TextStyleHandle,
+  Int32,
+  Float,
+  Float,
+  Float,
+)>(symbol: 'textStyle_addShadow', isLeaf: true)
+external void textStyleAddShadow(
+  TextStyleHandle handle,
+  int color,
+  double offsetX,
+  double offsetY,
+  double blurSigma,
+);
+
+@Native<Void Function(
+  TextStyleHandle,
+  SkStringHandle,
+  Int
+)>(symbol: 'textStyle_addFontFeature', isLeaf: true)
+external void textStyleAddFontFeature(
+  TextStyleHandle handle,
+  SkStringHandle featureName,
+  int value,
+);
+
+@Native<Void Function(
+  TextStyleHandle,
+  Pointer<Uint32>,
+  Pointer<Float>,
+  Int
+)>(symbol: 'textStyle_setFontVariations', isLeaf: true)
+external void textStyleSetFontVariations(
+  TextStyleHandle handle,
+  Pointer<Uint32> axes,
+  Pointer<Float> values,
+  int count,
+);
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/renderer.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/renderer.dart
index 00f3108af1b2425859f40100a6c196b6c8df0dc2..695c734cfed783c87625f2cb23afc49ce8eb1cb0 100644
--- a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/renderer.dart
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/renderer.dart
@@ -3,174 +3,493 @@
 // found in the LICENSE file.
 
 import 'dart:async';
+import 'dart:js_interop';
 import 'dart:math' as math;
 import 'dart:typed_data';
 
+import 'package:ui/src/engine.dart';
+import 'package:ui/src/engine/skwasm/skwasm_impl.dart';
 import 'package:ui/ui.dart' as ui;
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
-import '../../embedder.dart';
-import '../../fonts.dart';
-import '../../html_image_codec.dart';
-import '../../renderer.dart';
-
-// TODO(jacksongardner): Actually implement skwasm renderer.
 class SkwasmRenderer implements Renderer {
-  @override
-  ui.Path combinePaths(ui.PathOperation op, ui.Path path1, ui.Path path2) {
-    throw UnimplementedError('Not yet implemented');
-  }
+  late SkwasmSurface surface;
+  EngineSceneView? _sceneView;
 
   @override
-  ui.ImageFilter composeImageFilters({required ui.ImageFilter outer, required ui.ImageFilter inner}) {
-    throw UnimplementedError('Not yet implemented');
-  }
+  final SkwasmFontCollection fontCollection = SkwasmFontCollection();
 
   @override
-  ui.Path copyPath(ui.Path src) {
-    throw UnimplementedError('Not yet implemented');
+  ui.Path combinePaths(ui.PathOperation op, ui.Path path1, ui.Path path2) {
+    return SkwasmPath.combine(op, path1 as SkwasmPath, path2 as SkwasmPath);
   }
 
   @override
-  ui.ImageFilter createBlurImageFilter({double sigmaX = 0.0, double sigmaY = 0.0, ui.TileMode tileMode = ui.TileMode.clamp}) {
-    throw UnimplementedError('Not yet implemented');
+  ui.Path copyPath(ui.Path src) {
+    return SkwasmPath.from(src as SkwasmPath);
   }
 
   @override
   ui.Canvas createCanvas(ui.PictureRecorder recorder, [ui.Rect? cullRect]) {
-    throw UnimplementedError('Not yet implemented');
-  }
-
-  @override
-  ui.Gradient createConicalGradient(ui.Offset focal, double focalRadius, ui.Offset center, double radius, List<ui.Color> colors, [List<double>? colorStops, ui.TileMode tileMode = ui.TileMode.clamp, Float32List? matrix]) {
-    throw UnimplementedError('Not yet implemented');
-  }
-
-  @override
-  ui.ImageFilter createDilateImageFilter({double radiusX = 0.0, double radiusY = 0.0}) {
-    throw UnimplementedError('Not yet implemented');
-  }
-
-  @override
-  ui.ImageFilter createErodeImageFilter({double radiusX = 0.0, double radiusY = 0.0}) {
-    throw UnimplementedError('Not yet implemented');
-  }
-
-  @override
-  ui.ImageShader createImageShader(ui.Image image, ui.TileMode tmx, ui.TileMode tmy, Float64List matrix4, ui.FilterQuality? filterQuality) {
-    throw UnimplementedError('Not yet implemented');
-  }
-
-  @override
-  ui.Gradient createLinearGradient(ui.Offset from, ui.Offset to, List<ui.Color> colors, [List<double>? colorStops, ui.TileMode tileMode = ui.TileMode.clamp, Float32List? matrix4]) {
-    throw UnimplementedError('Not yet implemented');
-  }
-
-  @override
-  ui.ImageFilter createMatrixImageFilter(Float64List matrix4, {ui.FilterQuality filterQuality = ui.FilterQuality.low}) {
-    throw UnimplementedError('Not yet implemented');
-  }
-
-  @override
-  ui.Paint createPaint() {
-    throw UnimplementedError('Not yet implemented');
-  }
-
-  @override
-  ui.ParagraphBuilder createParagraphBuilder(ui.ParagraphStyle style) {
-    throw UnimplementedError('Not yet implemented');
-  }
-
-  @override
-  ui.ParagraphStyle createParagraphStyle({ui.TextAlign? textAlign, ui.TextDirection? textDirection, int? maxLines, String? fontFamily, double? fontSize, double? height, ui.TextHeightBehavior? textHeightBehavior, ui.FontWeight? fontWeight, ui.FontStyle? fontStyle, ui.StrutStyle? strutStyle, String? ellipsis, ui.Locale? locale}) {
-    throw UnimplementedError('Not yet implemented');
+    return SkwasmCanvas(recorder as SkwasmPictureRecorder, cullRect ?? ui.Rect.largest);
   }
 
   @override
-  ui.Path createPath() {
-    throw UnimplementedError('Not yet implemented');
+  ui.Gradient createConicalGradient(
+    ui.Offset focal,
+    double focalRadius,
+    ui.Offset center,
+    double radius,
+    List<ui.Color> colors, [
+    List<double>? colorStops,
+    ui.TileMode tileMode = ui.TileMode.clamp,
+    Float32List? matrix]) => SkwasmGradient.conical(
+      focal: focal,
+      focalRadius: focalRadius,
+      center: center,
+      centerRadius: radius,
+      colors: colors,
+      colorStops: colorStops,
+      tileMode: tileMode,
+      matrix4: matrix,
+    );
+
+  @override
+  ui.ImageFilter createBlurImageFilter({
+    double sigmaX = 0.0,
+    double sigmaY = 0.0,
+    ui.TileMode tileMode = ui.TileMode.clamp
+  }) => SkwasmImageFilter.blur(
+    sigmaX: sigmaX,
+    sigmaY: sigmaY,
+    tileMode: tileMode
+  );
+
+  @override
+  ui.ImageFilter createDilateImageFilter({
+    double radiusX = 0.0,
+    double radiusY = 0.0
+  }) => SkwasmImageFilter.dilate(
+    radiusX: radiusX,
+    radiusY: radiusY,
+  );
+
+  @override
+  ui.ImageFilter createErodeImageFilter({
+    double radiusX = 0.0,
+    double radiusY = 0.0
+  }) => SkwasmImageFilter.erode(
+    radiusX: radiusX,
+    radiusY: radiusY,
+  );
+
+  @override
+  ui.ImageFilter composeImageFilters({
+    required ui.ImageFilter outer,
+    required ui.ImageFilter inner
+  }) => SkwasmImageFilter.compose(
+    SkwasmImageFilter.fromUiFilter(outer),
+    SkwasmImageFilter.fromUiFilter(inner),
+  );
+
+  @override
+  ui.ImageFilter createMatrixImageFilter(
+    Float64List matrix4, {
+    ui.FilterQuality filterQuality = ui.FilterQuality.low
+  }) => SkwasmImageFilter.matrix(
+    matrix4,
+    filterQuality: filterQuality
+  );
+
+  @override
+  ui.ImageShader createImageShader(
+    ui.Image image,
+    ui.TileMode tmx,
+    ui.TileMode tmy,
+    Float64List matrix4,
+    ui.FilterQuality? filterQuality
+  ) => SkwasmImageShader.imageShader(
+    image as SkwasmImage,
+    tmx,
+    tmy,
+    matrix4,
+    filterQuality
+  );
+
+  @override
+  ui.Gradient createLinearGradient(
+    ui.Offset from,
+    ui.Offset to,
+    List<ui.Color> colors, [
+    List<double>? colorStops,
+    ui.TileMode tileMode = ui.TileMode.clamp,
+    Float32List? matrix4
+  ]) => SkwasmGradient.linear(
+    from: from,
+    to: to,
+    colors: colors,
+    colorStops: colorStops,
+    tileMode: tileMode,
+    matrix4: matrix4,
+  );
+
+
+  @override
+  ui.Paint createPaint() => SkwasmPaint();
+
+  @override
+  ui.ParagraphBuilder createParagraphBuilder(ui.ParagraphStyle style) =>
+    SkwasmParagraphBuilder(style as SkwasmParagraphStyle, fontCollection);
+
+  @override
+  ui.ParagraphStyle createParagraphStyle({
+    ui.TextAlign? textAlign,
+    ui.TextDirection? textDirection,
+    int? maxLines, String? fontFamily,
+    double? fontSize,
+    double? height,
+    ui.TextHeightBehavior? textHeightBehavior,
+    ui.FontWeight? fontWeight,
+    ui.FontStyle? fontStyle,
+    ui.StrutStyle? strutStyle,
+    String? ellipsis,
+    ui.Locale? locale
+  }) => SkwasmParagraphStyle(
+    textAlign: textAlign,
+    textDirection: textDirection,
+    maxLines: maxLines,
+    fontFamily: fontFamily,
+    fontSize: fontSize,
+    height: height,
+    textHeightBehavior: textHeightBehavior,
+    fontWeight: fontWeight,
+    fontStyle: fontStyle,
+    strutStyle: strutStyle,
+    ellipsis: ellipsis,
+    locale: locale,
+  );
+
+  @override
+  ui.Path createPath() => SkwasmPath();
+
+  @override
+  ui.PictureRecorder createPictureRecorder() => SkwasmPictureRecorder();
+
+  @override
+  ui.Gradient createRadialGradient(
+    ui.Offset center,
+    double radius,
+    List<ui.Color> colors, [
+    List<double>? colorStops,
+    ui.TileMode tileMode = ui.TileMode.clamp,
+    Float32List? matrix4
+  ]) => SkwasmGradient.radial(
+    center: center,
+    radius: radius,
+    colors: colors,
+    colorStops: colorStops,
+    tileMode: tileMode,
+    matrix4: matrix4
+  );
+
+  @override
+  ui.SceneBuilder createSceneBuilder() => EngineSceneBuilder();
+
+  @override
+  ui.StrutStyle createStrutStyle({
+    String? fontFamily,
+    List<String>? fontFamilyFallback,
+    double? fontSize,
+    double? height,
+    ui.TextLeadingDistribution? leadingDistribution,
+    double? leading,
+    ui.FontWeight? fontWeight,
+    ui.FontStyle? fontStyle,
+    bool? forceStrutHeight
+  }) => SkwasmStrutStyle(
+    fontFamily: fontFamily,
+    fontFamilyFallback: fontFamilyFallback,
+    fontSize: fontSize,
+    height: height,
+    leadingDistribution: leadingDistribution,
+    leading: leading,
+    fontWeight: fontWeight,
+    fontStyle: fontStyle,
+    forceStrutHeight: forceStrutHeight,
+  );
+
+  @override
+  ui.Gradient createSweepGradient(
+    ui.Offset center,
+    List<ui.Color> colors, [
+    List<double>? colorStops,
+    ui.TileMode tileMode = ui.TileMode.clamp,
+    double startAngle = 0.0,
+    double endAngle = math.pi * 2,
+    Float32List? matrix4
+  ]) => SkwasmGradient.sweep(
+    center: center,
+    colors: colors,
+    colorStops: colorStops,
+    tileMode: tileMode,
+    startAngle: startAngle,
+    endAngle: endAngle,
+    matrix4: matrix4
+  );
+
+  @override
+  ui.TextStyle createTextStyle({
+    ui.Color? color,
+    ui.TextDecoration? decoration,
+    ui.Color? decorationColor,
+    ui.TextDecorationStyle? decorationStyle,
+    double? decorationThickness,
+    ui.FontWeight? fontWeight,
+    ui.FontStyle? fontStyle,
+    ui.TextBaseline? textBaseline,
+    String? fontFamily,
+    List<String>? fontFamilyFallback,
+    double? fontSize,
+    double? letterSpacing,
+    double? wordSpacing,
+    double? height,
+    ui.TextLeadingDistribution? leadingDistribution,
+    ui.Locale? locale,
+    ui.Paint? background,
+    ui.Paint? foreground,
+    List<ui.Shadow>? shadows,
+    List<ui.FontFeature>? fontFeatures,
+    List<ui.FontVariation>? fontVariations
+  }) => SkwasmTextStyle(
+    color: color,
+    decoration: decoration,
+    decorationColor: decorationColor,
+    decorationStyle: decorationStyle,
+    decorationThickness: decorationThickness,
+    fontWeight: fontWeight,
+    fontStyle: fontStyle,
+    textBaseline: textBaseline,
+    fontFamily: fontFamily,
+    fontFamilyFallback: fontFamilyFallback,
+    fontSize: fontSize,
+    letterSpacing: letterSpacing,
+    wordSpacing: wordSpacing,
+    height: height,
+    leadingDistribution: leadingDistribution,
+    locale: locale,
+    background: background,
+    foreground: foreground,
+    shadows: shadows,
+    fontFeatures: fontFeatures,
+    fontVariations: fontVariations,
+  );
+
+  @override
+  ui.Vertices createVertices(
+    ui.VertexMode mode,
+    List<ui.Offset> positions,
+    {
+      List<ui.Offset>? textureCoordinates,
+      List<ui.Color>? colors,
+      List<int>? indices
+    }) =>
+    SkwasmVertices(
+      mode,
+      positions,
+      textureCoordinates: textureCoordinates,
+      colors: colors,
+      indices: indices
+    );
+
+  @override
+  ui.Vertices createVerticesRaw(
+    ui.VertexMode mode,
+    Float32List positions,
+    {
+      Float32List? textureCoordinates,
+      Int32List? colors,
+      Uint16List? indices
+    }) =>
+    SkwasmVertices.raw(
+      mode,
+      positions,
+      textureCoordinates: textureCoordinates,
+      colors: colors,
+      indices: indices
+    );
+
+  @override
+  void decodeImageFromPixels(
+    Uint8List pixels,
+    int width,
+    int height,
+    ui.PixelFormat format,
+    ui.ImageDecoderCallback callback, {
+    int? rowBytes,
+    int? targetWidth,
+    int? targetHeight,
+    bool allowUpscaling = true
+  }) {
+    final SkwasmImage pixelImage = SkwasmImage.fromPixels(
+      pixels,
+      width,
+      height,
+      format
+    );
+    final ui.Image scaledImage = scaleImageIfNeeded(
+      pixelImage,
+      targetWidth: targetWidth,
+      targetHeight: targetHeight,
+      allowUpscaling: allowUpscaling,
+    );
+    callback(scaledImage);
   }
 
   @override
-  ui.PictureRecorder createPictureRecorder() {
-    throw UnimplementedError('Not yet implemented');
-  }
-
-  @override
-  ui.Gradient createRadialGradient(ui.Offset center, double radius, List<ui.Color> colors, [List<double>? colorStops, ui.TileMode tileMode = ui.TileMode.clamp, Float32List? matrix4]) {
-    throw UnimplementedError('Not yet implemented');
-  }
-
-  @override
-  ui.SceneBuilder createSceneBuilder() {
-    throw UnimplementedError('Not yet implemented');
+  FutureOr<void> initialize() {
+    surface = SkwasmSurface();
   }
 
   @override
-  ui.StrutStyle createStrutStyle({String? fontFamily, List<String>? fontFamilyFallback, double? fontSize, double? height, ui.TextLeadingDistribution? leadingDistribution, double? leading, ui.FontWeight? fontWeight, ui.FontStyle? fontStyle, bool? forceStrutHeight}) {
-    throw UnimplementedError('Not yet implemented');
+  Future<ui.Codec> instantiateImageCodec(
+    Uint8List list, {
+    int? targetWidth,
+    int? targetHeight,
+    bool allowUpscaling = true
+  }) async {
+    final String? contentType = detectContentType(list);
+    if (contentType == null) {
+      throw Exception('Could not determine content type of image from data');
+    }
+    final SkwasmImageDecoder baseDecoder = SkwasmImageDecoder(
+      contentType: contentType,
+      dataSource: list.toJS,
+      debugSource: 'encoded image bytes',
+    );
+    await baseDecoder.initialize();
+    if (targetWidth == null && targetHeight == null) {
+      return baseDecoder;
+    }
+    return ResizingCodec(
+      baseDecoder,
+      targetWidth: targetWidth,
+      targetHeight: targetHeight,
+      allowUpscaling: allowUpscaling
+    );
   }
 
   @override
-  ui.Gradient createSweepGradient(ui.Offset center, List<ui.Color> colors, [List<double>? colorStops, ui.TileMode tileMode = ui.TileMode.clamp, double startAngle = 0.0, double endAngle = math.pi * 2, Float32List? matrix4]) {
-    throw UnimplementedError('Not yet implemented');
+  Future<ui.Codec> instantiateImageCodecFromUrl(
+    Uri uri, {
+    ui_web.ImageCodecChunkCallback? chunkCallback
+  }) async {
+    final DomResponse response = await rawHttpGet(uri.toString());
+    final String? contentType = response.headers.get('Content-Type');
+    if (contentType == null) {
+      throw Exception('Could not determine content type of image at url $uri');
+    }
+    final SkwasmImageDecoder decoder = SkwasmImageDecoder(
+      contentType: contentType,
+      dataSource: response.body as JSObject,
+      debugSource: uri.toString(),
+    );
+    await decoder.initialize();
+    return decoder;
   }
 
+  // TODO(harryterkelsen): Add multiview support,
+  // https://github.com/flutter/flutter/issues/137073.
   @override
-  ui.TextStyle createTextStyle({ui.Color? color, ui.TextDecoration? decoration, ui.Color? decorationColor, ui.TextDecorationStyle? decorationStyle, double? decorationThickness, ui.FontWeight? fontWeight, ui.FontStyle? fontStyle, ui.TextBaseline? textBaseline, String? fontFamily, List<String>? fontFamilyFallback, double? fontSize, double? letterSpacing, double? wordSpacing, double? height, ui.TextLeadingDistribution? leadingDistribution, ui.Locale? locale, ui.Paint? background, ui.Paint? foreground, List<ui.Shadow>? shadows, List<ui.FontFeature>? fontFeatures, List<ui.FontVariation>? fontVariations}) {
-    throw UnimplementedError('Not yet implemented');
-  }
+  Future<void> renderScene(ui.Scene scene, ui.FlutterView view) {
+    final FrameTimingRecorder? recorder = FrameTimingRecorder.frameTimingsEnabled ? FrameTimingRecorder() : null;
+    recorder?.recordBuildFinish();
 
-  @override
-  ui.Vertices createVertices(ui.VertexMode mode, List<ui.Offset> positions, {List<ui.Offset>? textureCoordinates, List<ui.Color>? colors, List<int>? indices}) {
-    throw UnimplementedError('Not yet implemented');
+    view as EngineFlutterView;
+    assert(view is EngineFlutterWindow, 'Skwasm does not support multi-view mode yet');
+    final EngineSceneView sceneView = _getSceneViewForView(view);
+    return sceneView.renderScene(scene as EngineScene, recorder);
   }
 
-  @override
-  ui.Vertices createVerticesRaw(ui.VertexMode mode, Float32List positions, {Float32List? textureCoordinates, Int32List? colors, Uint16List? indices}) {
-    throw UnimplementedError('Not yet implemented');
+  EngineSceneView _getSceneViewForView(EngineFlutterView view) {
+    // TODO(mdebbar): Support multi-view mode.
+    if (_sceneView == null) {
+      _sceneView = EngineSceneView(SkwasmPictureRenderer(surface), view);
+      final EngineFlutterView implicitView = EnginePlatformDispatcher.instance.implicitView!;
+      implicitView.dom.setScene(_sceneView!.sceneElement);
+    }
+    return _sceneView!;
   }
 
   @override
-  void decodeImageFromPixels(Uint8List pixels, int width, int height, ui.PixelFormat format, ui.ImageDecoderCallback callback, {int? rowBytes, int? targetWidth, int? targetHeight, bool allowUpscaling = true}) {
-    throw UnimplementedError('Not yet implemented');
-  }
+  String get rendererTag => 'skwasm';
 
-  @override
-  FontCollection get fontCollection => throw UnimplementedError('Not yet implemented');
+  static final Map<String, Future<ui.FragmentProgram>> _programs = <String, Future<ui.FragmentProgram>>{};
 
   @override
-  FutureOr<void> initialize() {
-    throw UnimplementedError('Not yet implemented');
+  void clearFragmentProgramCache() {
+    _programs.clear();
   }
 
   @override
-  Future<ui.Codec> instantiateImageCodec(Uint8List list, {int? targetWidth, int? targetHeight, bool allowUpscaling = true}) {
-    throw UnimplementedError('Not yet implemented');
+  Future<ui.FragmentProgram> createFragmentProgram(String assetKey) {
+    if (_programs.containsKey(assetKey)) {
+      return _programs[assetKey]!;
+    }
+    return _programs[assetKey] = ui_web.assetManager.load(assetKey).then((ByteData data) {
+      return SkwasmFragmentProgram.fromBytes(assetKey, data.buffer.asUint8List());
+    });
   }
 
   @override
-  Future<ui.Codec> instantiateImageCodecFromUrl(Uri uri, {WebOnlyImageCodecChunkCallback? chunkCallback}) {
-    throw UnimplementedError('Not yet implemented');
+  ui.LineMetrics createLineMetrics({
+    required bool hardBreak,
+    required double ascent,
+    required double descent,
+    required double unscaledAscent,
+    required double height,
+    required double width,
+    required double left,
+    required double baseline,
+    required int lineNumber
+  }) => SkwasmLineMetrics(
+    hardBreak: hardBreak,
+    ascent: ascent,
+    descent: descent,
+    unscaledAscent: unscaledAscent,
+    height: height,
+    width: width,
+    left: left,
+    baseline: baseline,
+    lineNumber: lineNumber
+  );
+
+  @override
+  ui.Image createImageFromImageBitmap(DomImageBitmap imageSource) {
+    return SkwasmImage(imageCreateFromTextureSource(
+      imageSource as JSObject,
+      imageSource.width.toDartInt,
+      imageSource.height.toDartInt,
+      surface.handle,
+    ));
   }
+}
 
-  @override
-  void renderScene(ui.Scene scene) {
-    throw UnimplementedError('Not yet implemented');
-  }
+class SkwasmPictureRenderer implements PictureRenderer {
+  SkwasmPictureRenderer(this.surface);
 
-  @override
-  String get rendererTag => throw UnimplementedError('Not yet implemented');
+  SkwasmSurface surface;
 
   @override
-  void reset(FlutterViewEmbedder embedder) {
-    throw UnimplementedError('Not yet implemented');
-  }
+  FutureOr<RenderResult> renderPictures(List<ScenePicture> pictures) =>
+    surface.renderPictures(pictures.cast<SkwasmPicture>());
 
   @override
-  void clearFragmentProgramCache() { }
+  ScenePicture clipPicture(ScenePicture picture, ui.Rect clip) {
+    final ui.PictureRecorder recorder = ui.PictureRecorder();
+    final ui.Canvas canvas = ui.Canvas(recorder, clip);
+    canvas.clipRect(clip);
+    canvas.drawPicture(picture);
 
-  @override
-  Future<ui.FragmentProgram> createFragmentProgram(String assetKey) {
-    throw UnimplementedError('Not yet implemented');
+    return recorder.endRecording() as ScenePicture;
   }
 }
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/shaders.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/shaders.dart
new file mode 100644
index 0000000000000000000000000000000000000000..36fd442bbb8785dc6334f54ba6b90a1b98f814a8
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/shaders.dart
@@ -0,0 +1,346 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:convert';
+import 'dart:ffi';
+import 'dart:typed_data';
+
+import 'package:ui/src/engine.dart';
+import 'package:ui/src/engine/skwasm/skwasm_impl.dart';
+import 'package:ui/ui.dart' as ui;
+
+// A shared interface for shaders for which you can acquire a native handle
+abstract class SkwasmShader implements ui.Shader {
+  ShaderHandle get handle;
+}
+
+// An implementation that handles the storage, disposal, and finalization of
+// a native shader handle.
+class SkwasmNativeShader extends SkwasmObjectWrapper<RawShader> implements SkwasmShader {
+  SkwasmNativeShader(ShaderHandle handle) : super(handle, _registry);
+
+  static final SkwasmFinalizationRegistry<RawShader> _registry =
+    SkwasmFinalizationRegistry<RawShader>(shaderDispose);
+}
+
+class SkwasmGradient extends SkwasmNativeShader implements ui.Gradient {
+  factory SkwasmGradient.linear({
+    required ui.Offset from,
+    required ui.Offset to,
+    required List<ui.Color> colors,
+    List<double>? colorStops,
+    ui.TileMode tileMode = ui.TileMode.clamp,
+    Float32List? matrix4,
+  }) => withStackScope((StackScope scope) {
+    assert(() {
+      validateColorStops(colors, colorStops);
+      return true;
+    }());
+
+    final RawPointArray endPoints =
+      scope.convertPointArrayToNative(<ui.Offset>[from, to]);
+    final RawColorArray nativeColors = scope.convertColorArrayToNative(colors);
+    final Pointer<Float> stops = colorStops != null
+      ? scope.convertDoublesToNative(colorStops)
+      : nullptr;
+    final Pointer<Float> matrix = matrix4 != null
+      ? scope.convertMatrix4toSkMatrix(matrix4)
+      : nullptr;
+    final ShaderHandle handle = shaderCreateLinearGradient(
+      endPoints,
+      nativeColors,
+      stops,
+      colors.length,
+      tileMode.index,
+      matrix
+    );
+    return SkwasmGradient._(handle);
+  });
+
+  factory SkwasmGradient.radial({
+    required ui.Offset center,
+    required double radius,
+    required List<ui.Color> colors,
+    List<double>? colorStops,
+    ui.TileMode tileMode = ui.TileMode.clamp,
+    Float32List? matrix4,
+  }) => withStackScope((StackScope scope) {
+    assert(() {
+      validateColorStops(colors, colorStops);
+      return true;
+    }());
+
+    final RawColorArray rawColors = scope.convertColorArrayToNative(colors);
+    final Pointer<Float> rawStops = colorStops != null
+      ? scope.convertDoublesToNative(colorStops)
+      : nullptr;
+    final Pointer<Float> matrix = matrix4 != null
+      ? scope.convertMatrix4toSkMatrix(matrix4)
+      : nullptr;
+    final ShaderHandle handle = shaderCreateRadialGradient(
+      center.dx,
+      center.dy,
+      radius,
+      rawColors,
+      rawStops,
+      colors.length,
+      tileMode.index,
+      matrix,
+    );
+    return SkwasmGradient._(handle);
+  });
+
+  factory SkwasmGradient.conical({
+    required ui.Offset focal,
+    required double focalRadius,
+    required ui.Offset center,
+    required double centerRadius,
+    required List<ui.Color> colors,
+    List<double>? colorStops,
+    ui.TileMode tileMode = ui.TileMode.clamp,
+    Float32List? matrix4,
+  }) => withStackScope((StackScope scope) {
+    assert(() {
+      validateColorStops(colors, colorStops);
+      return true;
+    }());
+
+    final RawPointArray endPoints =
+      scope.convertPointArrayToNative(<ui.Offset>[focal, center]);
+    final RawColorArray rawColors = scope.convertColorArrayToNative(colors);
+    final Pointer<Float> rawStops = colorStops != null
+      ? scope.convertDoublesToNative(colorStops)
+      : nullptr;
+    final Pointer<Float> matrix = matrix4 != null
+      ? scope.convertMatrix4toSkMatrix(matrix4)
+      : nullptr;
+    final ShaderHandle handle = shaderCreateConicalGradient(
+      endPoints,
+      focalRadius,
+      centerRadius,
+      rawColors,
+      rawStops,
+      colors.length,
+      tileMode.index,
+      matrix
+    );
+    return SkwasmGradient._(handle);
+  });
+
+  factory SkwasmGradient.sweep({
+    required ui.Offset center,
+    required List<ui.Color> colors,
+    List<double>? colorStops,
+    ui.TileMode tileMode = ui.TileMode.clamp,
+    required double startAngle,
+    required double endAngle,
+    Float32List? matrix4,
+  }) => withStackScope((StackScope scope) {
+    assert(() {
+      validateColorStops(colors, colorStops);
+      return true;
+    }());
+
+    final RawColorArray rawColors = scope.convertColorArrayToNative(colors);
+    final Pointer<Float> rawStops = colorStops != null
+      ? scope.convertDoublesToNative(colorStops)
+      : nullptr;
+    final Pointer<Float> matrix = matrix4 != null
+      ? scope.convertMatrix4toSkMatrix(matrix4)
+      : nullptr;
+    final ShaderHandle handle = shaderCreateSweepGradient(
+      center.dx,
+      center.dy,
+      rawColors,
+      rawStops,
+      colors.length,
+      tileMode.index,
+      ui.toDegrees(startAngle),
+      ui.toDegrees(endAngle),
+      matrix
+    );
+    return SkwasmGradient._(handle);
+  });
+
+  SkwasmGradient._(super.handle);
+
+  @override
+  String toString() => 'Gradient()';
+}
+
+class SkwasmImageShader extends SkwasmNativeShader implements ui.ImageShader {
+  SkwasmImageShader._(super.handle);
+
+  factory SkwasmImageShader.imageShader(
+    SkwasmImage image,
+    ui.TileMode tmx,
+    ui.TileMode tmy,
+    Float64List? matrix4,
+    ui.FilterQuality? filterQuality,
+  ) {
+    if (matrix4 != null) {
+      return withStackScope((StackScope scope) {
+        final RawMatrix33 localMatrix = scope.convertMatrix4toSkMatrix(matrix4);
+        return SkwasmImageShader._(shaderCreateFromImage(
+          image.handle,
+          tmx.index,
+          tmy.index,
+          (filterQuality ?? ui.FilterQuality.medium).index,
+          localMatrix,
+        ));
+      });
+    } else {
+      return SkwasmImageShader._(shaderCreateFromImage(
+        image.handle,
+        tmx.index,
+        tmy.index,
+        (filterQuality ?? ui.FilterQuality.medium).index,
+        nullptr,
+      ));
+    }
+  }
+}
+
+class SkwasmFragmentProgram extends SkwasmObjectWrapper<RawRuntimeEffect> implements ui.FragmentProgram {
+  SkwasmFragmentProgram._(
+    this.name,
+    RuntimeEffectHandle handle,
+    this.floatUniformCount,
+    this.childShaderCount,
+  ) : super(handle, _registry);
+
+  factory SkwasmFragmentProgram.fromBytes(String name, Uint8List bytes) {
+    final ShaderData shaderData = ShaderData.fromBytes(bytes);
+
+    // TODO(jacksongardner): Can we avoid this copy?
+    final List<int> sourceData = utf8.encode(shaderData.source);
+    final SkStringHandle sourceString = skStringAllocate(sourceData.length);
+    final Pointer<Int8> sourceBuffer = skStringGetData(sourceString);
+    int i = 0;
+    for (final int byte in sourceData) {
+      sourceBuffer[i] = byte;
+      i++;
+    }
+    final RuntimeEffectHandle handle = runtimeEffectCreate(sourceString);
+    skStringFree(sourceString);
+    return SkwasmFragmentProgram._(
+      name,
+      handle,
+      shaderData.floatCount,
+      shaderData.textureCount
+    );
+  }
+
+  static final SkwasmFinalizationRegistry<RawRuntimeEffect> _registry =
+    SkwasmFinalizationRegistry<RawRuntimeEffect>(runtimeEffectDispose);
+
+  final String name;
+  final int floatUniformCount;
+  final int childShaderCount;
+
+  @override
+  ui.FragmentShader fragmentShader() => SkwasmFragmentShader(this);
+
+  int get uniformSize => runtimeEffectGetUniformSize(handle);
+}
+
+class SkwasmShaderData extends SkwasmObjectWrapper<RawSkData> {
+  SkwasmShaderData(int size) : super(skDataCreate(size), _registry);
+
+  static final SkwasmFinalizationRegistry<RawSkData> _registry =
+    SkwasmFinalizationRegistry<RawSkData>(skDataDispose);
+}
+
+// This class does not inherit from SkwasmNativeShader, as its handle might
+// change over time if the uniforms or image shaders are changed. Instead this
+// wraps a SkwasmNativeShader that it creates and destroys on demand. It does
+// implement SkwasmShader though, in order to provide the handle for the
+// underlying shader object.
+class SkwasmFragmentShader implements SkwasmShader, ui.FragmentShader {
+  SkwasmFragmentShader(SkwasmFragmentProgram program) :
+    _program = program,
+    _uniformData = SkwasmShaderData(program.uniformSize),
+    _floatUniformCount = program.floatUniformCount,
+    _childShaders = List<SkwasmShader?>.filled(program.childShaderCount, null);
+
+  @override
+  ShaderHandle get handle {
+    if (_nativeShader == null) {
+      final ShaderHandle newHandle = withStackScope((StackScope s) {
+        Pointer<ShaderHandle> childShaders = nullptr;
+        if (_childShaders.isNotEmpty) {
+          childShaders = s.allocPointerArray(_childShaders.length)
+            .cast<ShaderHandle>();
+          for (int i = 0; i < _childShaders.length; i++) {
+            final SkwasmShader? child = _childShaders[i];
+            childShaders[i] = child != null ? child.handle : nullptr;
+          }
+        }
+        return shaderCreateRuntimeEffectShader(
+          _program.handle,
+          _uniformData.handle,
+          childShaders,
+          _childShaders.length,
+        );
+      });
+      _nativeShader = SkwasmNativeShader(newHandle);
+    }
+    return _nativeShader!.handle;
+  }
+
+  SkwasmShader? _nativeShader;
+  final SkwasmFragmentProgram _program;
+  final SkwasmShaderData _uniformData;
+  bool _isDisposed = false;
+  final int _floatUniformCount;
+  final List<SkwasmShader?> _childShaders;
+
+  @override
+  void dispose() {
+    assert(!_isDisposed);
+    _nativeShader?.dispose();
+    _uniformData.dispose();
+    _isDisposed = true;
+  }
+
+  @override
+  bool get debugDisposed => _isDisposed;
+
+  @override
+  void setFloat(int index, double value) {
+    if (_nativeShader != null) {
+      // Invalidate the previous shader so that it is recreated with the new
+      // uniform data.
+      _nativeShader!.dispose();
+      _nativeShader = null;
+    }
+    final Pointer<Float> dataPointer = skDataGetPointer(_uniformData.handle).cast<Float>();
+    dataPointer[index] = value;
+  }
+
+  @override
+  void setImageSampler(int index, ui.Image image) {
+    if (_nativeShader != null) {
+      // Invalidate the previous shader so that it is recreated with the new
+      // child shaders.
+      _nativeShader!.dispose();
+      _nativeShader = null;
+    }
+
+    final SkwasmImageShader shader = SkwasmImageShader.imageShader(
+      image as SkwasmImage,
+      ui.TileMode.clamp,
+      ui.TileMode.clamp,
+      null,
+      ui.FilterQuality.none,
+    );
+    final SkwasmShader? oldShader = _childShaders[index];
+    _childShaders[index] = shader;
+    oldShader?.dispose();
+
+    final Pointer<Float> dataPointer = skDataGetPointer(_uniformData.handle).cast<Float>();
+    dataPointer[_floatUniformCount + index * 2] = image.width.toDouble();
+    dataPointer[_floatUniformCount + index * 2 + 1] = image.height.toDouble();
+  }
+}
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/surface.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/surface.dart
new file mode 100644
index 0000000000000000000000000000000000000000..eddcc19ff402bc3b1d9d4229b8c6c77dffe3c5e6
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/surface.dart
@@ -0,0 +1,130 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:_wasm';
+import 'dart:async';
+import 'dart:ffi';
+import 'dart:js_interop';
+import 'dart:typed_data';
+
+import 'package:ui/src/engine.dart';
+import 'package:ui/src/engine/skwasm/skwasm_impl.dart';
+import 'package:ui/ui.dart' as ui;
+
+@JS()
+@staticInterop
+@anonymous
+class RasterResult {}
+
+extension RasterResultExtension on RasterResult {
+  external JSNumber get rasterStartMilliseconds;
+  external JSNumber get rasterEndMilliseconds;
+  external JSArray<JSAny> get imageBitmaps;
+}
+
+@pragma('wasm:export')
+WasmVoid callbackHandler(WasmI32 callbackId, WasmI32 context, WasmExternRef? jsContext) {
+  // Actually hide this call behind whether skwasm is enabled. Otherwise, the SkwasmCallbackHandler
+  // won't actually be tree-shaken, and we end up with skwasm imports in non-skwasm builds.
+  if (FlutterConfiguration.flutterWebUseSkwasm) {
+    SkwasmCallbackHandler.instance.handleCallback(callbackId, context, jsContext);
+  }
+  return WasmVoid();
+}
+
+// This class handles callbacks coming from Skwasm by keeping a map of callback IDs to Completers
+class SkwasmCallbackHandler {
+  SkwasmCallbackHandler._withCallbackPointer(this.callbackPointer);
+
+  factory SkwasmCallbackHandler._() {
+    final WasmFuncRef wasmFunction = WasmFunction<WasmVoid Function(WasmI32, WasmI32, WasmExternRef?)>.fromFunction(callbackHandler);
+    final int functionIndex = addFunction(wasmFunction).toIntUnsigned();
+    return SkwasmCallbackHandler._withCallbackPointer(
+      OnRenderCallbackHandle.fromAddress(functionIndex)
+    );
+  }
+  static SkwasmCallbackHandler instance = SkwasmCallbackHandler._();
+
+  final OnRenderCallbackHandle callbackPointer;
+  final Map<CallbackId, Completer<JSAny>> _pendingCallbacks = <int, Completer<JSAny>>{};
+
+  // Returns a future that will resolve when Skwasm calls back with the given callbackID
+  Future<JSAny> registerCallback(int callbackId) {
+    final Completer<JSAny> completer = Completer<JSAny>();
+    _pendingCallbacks[callbackId] = completer;
+    return completer.future;
+  }
+
+  void handleCallback(WasmI32 callbackId, WasmI32 context, WasmExternRef? jsContext) {
+    // Skwasm can either callback with a JS object (an externref) or it can call back
+    // with a simple integer, which usually refers to a pointer on its heap. In order
+    // to coerce these into a single type, we just make the completers take a JSAny
+    // that either contains the JS object or a JSNumber that contains the integer value.
+    final Completer<JSAny> completer = _pendingCallbacks.remove(callbackId.toIntUnsigned())!;
+    if (!jsContext.isNull) {
+      completer.complete(jsContext!.toJS);
+    } else {
+      completer.complete(context.toIntUnsigned().toJS);
+    }
+  }
+}
+
+class SkwasmSurface {
+  factory SkwasmSurface() {
+    final SurfaceHandle surfaceHandle = withStackScope((StackScope scope) {
+      return surfaceCreate();
+    });
+    final SkwasmSurface surface = SkwasmSurface._fromHandle(surfaceHandle);
+    surface._initialize();
+    return surface;
+  }
+
+  SkwasmSurface._fromHandle(this.handle) : threadId = surfaceGetThreadId(handle);
+  final SurfaceHandle handle;
+
+  final int threadId;
+
+  void _initialize() {
+    surfaceSetCallbackHandler(handle, SkwasmCallbackHandler.instance.callbackPointer);
+  }
+
+  Future<RenderResult> renderPictures(List<SkwasmPicture> pictures) =>
+    withStackScope((StackScope scope) async {
+      final Pointer<PictureHandle> pictureHandles =
+        scope.allocPointerArray(pictures.length).cast<PictureHandle>();
+      for (int i = 0; i < pictures.length; i++) {
+        pictureHandles[i] = pictures[i].handle;
+      }
+      final int callbackId = surfaceRenderPictures(handle, pictureHandles, pictures.length);
+      final RasterResult rasterResult = (await SkwasmCallbackHandler.instance.registerCallback(callbackId)) as RasterResult;
+      final RenderResult result = (
+        imageBitmaps: rasterResult.imageBitmaps.toDart.cast<DomImageBitmap>(),
+        rasterStartMicros: (rasterResult.rasterStartMilliseconds.toDartDouble * 1000).toInt(),
+        rasterEndMicros: (rasterResult.rasterEndMilliseconds.toDartDouble * 1000).toInt(),
+      );
+      return result;
+    });
+
+  Future<ByteData> rasterizeImage(SkwasmImage image, ui.ImageByteFormat format) async {
+    final int callbackId = surfaceRasterizeImage(
+      handle,
+      image.handle,
+      format.index,
+    );
+    final int context = (await SkwasmCallbackHandler.instance.registerCallback(callbackId) as JSNumber).toDartInt;
+    final SkDataHandle dataHandle = SkDataHandle.fromAddress(context);
+    final int byteCount = skDataGetSize(dataHandle);
+    final Pointer<Uint8> dataPointer = skDataGetConstPointer(dataHandle).cast<Uint8>();
+    final Uint8List output = Uint8List(byteCount);
+    for (int i = 0; i < byteCount; i++) {
+      output[i] = dataPointer[i];
+    }
+    skDataDispose(dataHandle);
+    return ByteData.sublistView(output);
+  }
+
+  void dispose() {
+    surfaceDestroy(handle);
+  }
+}
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/vertices.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/vertices.dart
new file mode 100644
index 0000000000000000000000000000000000000000..e4d5142c0e767683fd0bb15d7a1c59939566dc8f
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/vertices.dart
@@ -0,0 +1,76 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// ignore_for_file: avoid_unused_constructor_parameters
+
+import 'dart:ffi';
+import 'dart:typed_data';
+
+import 'package:ui/src/engine/skwasm/skwasm_impl.dart';
+import 'package:ui/ui.dart' as ui;
+
+class SkwasmVertices extends SkwasmObjectWrapper<RawVertices> implements ui.Vertices {
+  factory SkwasmVertices(
+    ui.VertexMode mode,
+    List<ui.Offset> positions, {
+    List<ui.Offset>? textureCoordinates,
+    List<ui.Color>? colors,
+    List<int>? indices,
+  }) => withStackScope((StackScope scope) {
+    final RawPointArray rawPositions = scope.convertPointArrayToNative(positions);
+    final RawPointArray rawTextureCoordinates = textureCoordinates != null
+      ? scope.convertPointArrayToNative(textureCoordinates)
+      : nullptr;
+    final RawColorArray rawColors = colors != null
+      ? scope.convertColorArrayToNative(colors)
+      : nullptr;
+    final Pointer<Uint16> rawIndices = indices != null
+      ? scope.convertIntsToUint16Native(indices)
+      : nullptr;
+    final int indexCount = indices != null ? indices.length : 0;
+    return SkwasmVertices._(verticesCreate(
+      mode.index,
+      positions.length,
+      rawPositions,
+      rawTextureCoordinates,
+      rawColors,
+      indexCount,
+      rawIndices,
+    ));
+  });
+
+  factory SkwasmVertices.raw(
+    ui.VertexMode mode,
+    Float32List positions, {
+    Float32List? textureCoordinates,
+    Int32List? colors,
+    Uint16List? indices,
+  }) => withStackScope((StackScope scope) {
+    final RawPointArray rawPositions = scope.convertDoublesToNative(positions);
+    final RawPointArray rawTextureCoordinates = textureCoordinates != null
+      ? scope.convertDoublesToNative(textureCoordinates)
+      : nullptr;
+    final RawColorArray rawColors = colors != null
+      ? scope.convertIntsToUint32Native(colors)
+      : nullptr;
+    final Pointer<Uint16> rawIndices = indices != null
+      ? scope.convertIntsToUint16Native(indices)
+      : nullptr;
+    final int indexCount = indices != null ? indices.length : 0;
+    return SkwasmVertices._(verticesCreate(
+      mode.index,
+      positions.length ~/ 2,
+      rawPositions,
+      rawTextureCoordinates,
+      rawColors,
+      indexCount,
+      rawIndices,
+    ));
+  });
+
+  SkwasmVertices._(VerticesHandle handle) : super(handle, _registry);
+
+  static final SkwasmFinalizationRegistry<RawVertices> _registry =
+    SkwasmFinalizationRegistry<RawVertices>(verticesDispose);
+}
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_stub.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_stub.dart
index 32f7960a81fff2053d7c1e100f65b96002ea934b..50c1791aecc2e1e3c1515b1150d652a296689363 100644
--- a/lib/web_ui/lib/src/engine/skwasm/skwasm_stub.dart
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_stub.dart
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// The web_sdk/sdk_rewriter.dart uses this directive.
+// ignore: unnecessary_library_directive
 library skwasm_stub;
 
+export 'skwasm_stub/dart_js_conversion.dart';
 export 'skwasm_stub/renderer.dart';
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_stub/dart_js_conversion.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_stub/dart_js_conversion.dart
new file mode 100644
index 0000000000000000000000000000000000000000..b05af5dcff599d086cad47f216d09ff420ecf063
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_stub/dart_js_conversion.dart
@@ -0,0 +1,13 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:js_interop';
+
+@pragma('wasm:prefer-inline')
+@pragma('dart2js:tryInline')
+JSAny dartToJsWrapper(Object object) => object as JSAny;
+
+@pragma('wasm:prefer-inline')
+@pragma('dart2js:tryInline')
+Object jsWrapperToDart(JSAny jsWrapper) => jsWrapper;
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_stub/renderer.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_stub/renderer.dart
index 4a3f5621c7e5c081ed229fe5582a731b8ca79794..024f588dda091207fa92f3ecc12a5e8a95f440f7 100644
--- a/lib/web_ui/lib/src/engine/skwasm/skwasm_stub/renderer.dart
+++ b/lib/web_ui/lib/src/engine/skwasm/skwasm_stub/renderer.dart
@@ -6,12 +6,9 @@ import 'dart:async';
 import 'dart:math' as math;
 import 'dart:typed_data';
 
+import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
-
-import '../../embedder.dart';
-import '../../fonts.dart';
-import '../../html_image_codec.dart';
-import '../../renderer.dart';
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
 class SkwasmRenderer implements Renderer {
   @override
@@ -135,7 +132,7 @@ class SkwasmRenderer implements Renderer {
   }
 
   @override
-  FontCollection get fontCollection => throw UnimplementedError('Skwasm not implemented on this platform.');
+  FlutterFontCollection get fontCollection => throw UnimplementedError('Skwasm not implemented on this platform.');
 
   @override
   FutureOr<void> initialize() {
@@ -148,12 +145,12 @@ class SkwasmRenderer implements Renderer {
   }
 
   @override
-  Future<ui.Codec> instantiateImageCodecFromUrl(Uri uri, {WebOnlyImageCodecChunkCallback? chunkCallback}) {
+  Future<ui.Codec> instantiateImageCodecFromUrl(Uri uri, {ui_web.ImageCodecChunkCallback? chunkCallback}) {
     throw UnimplementedError('Skwasm not implemented on this platform.');
   }
 
   @override
-  void renderScene(ui.Scene scene) {
+  Future<void> renderScene(ui.Scene scene, ui.FlutterView view) {
     throw UnimplementedError('Skwasm not implemented on this platform.');
   }
 
@@ -161,15 +158,35 @@ class SkwasmRenderer implements Renderer {
   String get rendererTag => throw UnimplementedError('Skwasm not implemented on this platform.');
 
   @override
-  void reset(FlutterViewEmbedder embedder) {
-    throw UnimplementedError('Skwasm not implemented on this platform.');
+  void clearFragmentProgramCache() => _programs.clear();
+
+  static final Map<String, Future<ui.FragmentProgram>> _programs = <String, Future<ui.FragmentProgram>>{};
+
+  @override
+  Future<ui.FragmentProgram> createFragmentProgram(String assetKey) {
+    if (_programs.containsKey(assetKey)) {
+      return _programs[assetKey]!;
+    }
+    return _programs[assetKey] = ui_web.assetManager.load(assetKey).then((ByteData data) {
+      return CkFragmentProgram.fromBytes(assetKey, data.buffer.asUint8List());
+    });
   }
 
   @override
-  void clearFragmentProgramCache() { }
+  ui.LineMetrics createLineMetrics({
+    required bool hardBreak,
+    required double ascent,
+    required double descent,
+    required double unscaledAscent,
+    required double height,
+    required double width,
+    required double left,
+    required double baseline,
+    required int lineNumber
+  }) => throw UnimplementedError('Skwasm not implemented on this platform.');
 
   @override
-  Future<ui.FragmentProgram> createFragmentProgram(String assetKey) {
-     throw UnimplementedError('Skwasm not implemented on this platform.');
+  ui.Image createImageFromImageBitmap(DomImageBitmap imageSource) {
+    throw UnimplementedError('Skwasm not implemented on this platform.');
   }
 }
diff --git a/lib/web_ui/lib/src/engine/svg.dart b/lib/web_ui/lib/src/engine/svg.dart
index 8f0ffbc743b90657b573296bcf0f5c34dbb1b217..db6784a14c9a8ecfb7aca09aeffe399112926f7b 100644
--- a/lib/web_ui/lib/src/engine/svg.dart
+++ b/lib/web_ui/lib/src/engine/svg.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:js/js.dart';
+import 'dart:js_interop';
 
 import 'dom.dart';
 
@@ -91,8 +91,14 @@ extension SVGAnimatedLengthExtension on SVGAnimatedLength {
 class SVGLength {}
 
 extension SVGLengthExtension on SVGLength {
-  external set valueAsString(String? value);
-  external void newValueSpecifiedUnits(int unitType, num valueInSpecifiedUnits);
+  @JS('valueAsString')
+  external set _valueAsString(JSString? value);
+  set valueAsString(String? value) => _valueAsString = value?.toJS;
+
+  @JS('newValueSpecifiedUnits')
+  external JSVoid _newValueSpecifiedUnits(JSNumber unitType, JSNumber valueInSpecifiedUnits);
+  void newValueSpecifiedUnits(int unitType, num valueInSpecifiedUnits) =>
+      _newValueSpecifiedUnits(unitType.toJS, valueInSpecifiedUnits.toJS);
 }
 
 const int svgLengthTypeNumber = 1;
@@ -102,7 +108,9 @@ const int svgLengthTypeNumber = 1;
 class SVGAnimatedEnumeration {}
 
 extension SVGAnimatedEnumerationExtenson on SVGAnimatedEnumeration {
-  external set baseVal(int? value);
+  @JS('baseVal')
+  external set _baseVal(JSNumber? value);
+  set baseVal(int? value) => _baseVal = value?.toJS;
 }
 
 @JS()
@@ -186,7 +194,9 @@ extension SVGFEBlendCompositeExtension on SVGFECompositeElement {
 class SVGAnimatedString {}
 
 extension SVGAnimatedStringExtension on SVGAnimatedString {
-  external set baseVal(String? value);
+  @JS('baseVal')
+  external set _baseVal(JSString? value);
+  set baseVal(String? value) => _baseVal = value?.toJS;
 }
 
 @JS()
@@ -194,7 +204,9 @@ extension SVGAnimatedStringExtension on SVGAnimatedString {
 class SVGAnimatedNumber {}
 
 extension SVGAnimatedNumberExtension on SVGAnimatedNumber {
-  external set baseVal(num? value);
+  @JS('baseVal')
+  external set _baseVal(JSNumber? value);
+  set baseVal(num? value) => _baseVal = value?.toJS;
 }
 
 @JS()
@@ -218,5 +230,7 @@ extension SVGNumberListExtension on SVGNumberList {
 class SVGNumber {}
 
 extension SVGNumberExtension on SVGNumber {
-  external set value(num? value);
+  @JS('value')
+  external set _value(JSNumber? value);
+  set value(num? v) => _value = v?.toJS;
 }
diff --git a/lib/web_ui/lib/src/engine/test_embedding.dart b/lib/web_ui/lib/src/engine/test_embedding.dart
index 8f28532a50539fcda9a2cfb3f764da69a68aa914..ba5647c8df475fb5884217329432ffb4b1071683 100644
--- a/lib/web_ui/lib/src/engine/test_embedding.dart
+++ b/lib/web_ui/lib/src/engine/test_embedding.dart
@@ -8,31 +8,7 @@
 import 'dart:async';
 
 import 'package:ui/ui.dart' as ui;
-
-import '../engine.dart';
-
-Future<void>? _platformInitializedFuture;
-
-Future<void> initializeTestFlutterViewEmbedder({double devicePixelRatio = 3.0}) {
-  // Force-initialize FlutterViewEmbedder so it doesn't overwrite test pixel ratio.
-  ensureFlutterViewEmbedderInitialized();
-
-  // The following parameters are hard-coded in Flutter's test embedder. Since
-  // we don't have an embedder yet this is the lowest-most layer we can put
-  // this stuff in.
-  window.debugOverrideDevicePixelRatio(devicePixelRatio);
-  window.webOnlyDebugPhysicalSizeOverride =
-      ui.Size(800 * devicePixelRatio, 600 * devicePixelRatio);
-  scheduleFrameCallback = () {};
-  ui.debugEmulateFlutterTesterEnvironment = true;
-
-  // Initialize platform once and reuse across all tests.
-  if (_platformInitializedFuture != null) {
-    return _platformInitializedFuture!;
-  }
-  return _platformInitializedFuture =
-      initializeEngine(assetManager: WebOnlyMockAssetManager());
-}
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
 const bool _debugLogHistoryActions = false;
 
@@ -54,7 +30,7 @@ class TestHistoryEntry {
 ///
 /// It keeps a list of history entries and event listeners in memory and
 /// manipulates them in order to achieve the desired functionality.
-class TestUrlStrategy extends UrlStrategy {
+class TestUrlStrategy implements ui_web.UrlStrategy {
   /// Creates a instance of [TestUrlStrategy] with an empty string as the
   /// path.
   factory TestUrlStrategy() => TestUrlStrategy.fromEntry(const TestHistoryEntry(null, null, ''));
@@ -148,16 +124,15 @@ class TestUrlStrategy extends UrlStrategy {
     });
   }
 
-  final List<DomEventListener> listeners = <DomEventListener>[];
+  final List<ui_web.PopStateListener> listeners = <ui_web.PopStateListener>[];
 
   @override
-  ui.VoidCallback addPopStateListener(DomEventListener fn) {
-    final DomEventListener wrappedFn = allowInterop(fn);
-    listeners.add(wrappedFn);
+  ui.VoidCallback addPopStateListener(ui_web.PopStateListener fn) {
+    listeners.add(fn);
     return () {
       // Schedule a micro task here to avoid removing the listener during
       // iteration in [_firePopStateEvent].
-      scheduleMicrotask(() => listeners.remove(wrappedFn));
+      scheduleMicrotask(() => listeners.remove(fn));
     };
   }
 
@@ -172,16 +147,12 @@ class TestUrlStrategy extends UrlStrategy {
   /// like a real browser.
   void _firePopStateEvent() {
     assert(withinAppHistory);
-    final DomPopStateEvent event = createDomPopStateEvent(
-      'popstate',
-      <String, dynamic>{'state': currentEntry.state},
-    );
     for (int i = 0; i < listeners.length; i++) {
-      listeners[i](event);
+      listeners[i](currentEntry.state);
     }
 
     if (_debugLogHistoryActions) {
-      print('$runtimeType: fired popstate event $event');
+      print('$runtimeType: fired popstate with state ${currentEntry.state}');
     }
   }
 
diff --git a/lib/web_ui/lib/src/engine/text/canvas_paragraph.dart b/lib/web_ui/lib/src/engine/text/canvas_paragraph.dart
index 272781147c78d21b2280778fabdc49e1cdf05b7c..55db09a32410ba685bbd1ce16296599f187085f2 100644
--- a/lib/web_ui/lib/src/engine/text/canvas_paragraph.dart
+++ b/lib/web_ui/lib/src/engine/text/canvas_paragraph.dart
@@ -5,18 +5,15 @@
 import 'package:ui/ui.dart' as ui;
 
 import '../dom.dart';
-import '../embedder.dart';
 import '../html/bitmap_canvas.dart';
 import '../profiler.dart';
-import '../util.dart';
+import '../view_embedder/style_manager.dart';
 import 'layout_fragmenter.dart';
 import 'layout_service.dart';
 import 'paint_service.dart';
 import 'paragraph.dart';
 import 'word_breaker.dart';
 
-const ui.Color _defaultTextColor = ui.Color(0xFFFF0000);
-
 final String placeholderChar = String.fromCharCode(0xFFFC);
 
 /// A paragraph made up of a flat list of text spans and placeholders.
@@ -43,7 +40,7 @@ class CanvasParagraph implements ui.Paragraph {
   final EngineParagraphStyle paragraphStyle;
 
   /// The full textual content of the paragraph.
-  late String plainText;
+  final String plainText;
 
   /// Whether this paragraph can be drawn on a bitmap canvas.
   ///
@@ -90,17 +87,6 @@ class CanvasParagraph implements ui.Paragraph {
 
   @override
   void layout(ui.ParagraphConstraints constraints) {
-    // When constraint width has a decimal place, we floor it to avoid getting
-    // a layout width that's higher than the constraint width.
-    //
-    // For example, if constraint width is `30.8` and the text has a width of
-    // `30.5` then the TextPainter in the framework will ceil the `30.5` width
-    // which will result in a width of `40.0` that's higher than the constraint
-    // width.
-    constraints = ui.ParagraphConstraints(
-      width: constraints.width.floorToDouble(),
-    );
-
     if (constraints == _lastUsedConstraints) {
       return;
     }
@@ -174,6 +160,9 @@ class CanvasParagraph implements ui.Paragraph {
         }
 
         final DomElement spanElement = domDocument.createElement('flt-span');
+        if (fragment.textDirection == ui.TextDirection.rtl) {
+          spanElement.setAttribute('dir', 'rtl');
+        }
         applyTextStyleToElement(element: spanElement, style: fragment.style);
         _positionSpanElement(spanElement, line, fragment);
 
@@ -205,16 +194,43 @@ class CanvasParagraph implements ui.Paragraph {
     return _layoutService.getPositionForOffset(offset);
   }
 
+  @override
+  ui.GlyphInfo? getClosestGlyphInfoForOffset(ui.Offset offset) => _layoutService.getClosestGlyphInfo(offset);
+
+  @override
+  ui.GlyphInfo? getGlyphInfoAt(int codeUnitOffset) {
+    final int? lineNumber = _findLine(codeUnitOffset, 0, numberOfLines);
+    if (lineNumber == null) {
+      return null;
+    }
+    final ParagraphLine line = lines[lineNumber];
+    final ui.TextRange? range = line.getCharacterRangeAt(codeUnitOffset);
+    if (range == null) {
+      return null;
+    }
+    assert(line.overlapsWith(range.start, range.end));
+    for (final LayoutFragment fragment in line.fragments) {
+      if (fragment.overlapsWith(range.start, range.end)) {
+        // If the grapheme cluster is split into multiple fragments (which really
+        // shouldn't happen but currently if they are in different TextSpans they
+        // don't combine), use the layout box of the first base character as its
+        // layout box has a better chance to be not that far-off.
+        final ui.TextBox textBox = fragment.toTextBox(start: range.start, end: range.end);
+        return ui.GlyphInfo(textBox.toRect(), range, textBox.direction);
+      }
+    }
+    assert(false, 'This should not be reachable.');
+    return null;
+  }
+
   @override
   ui.TextRange getWordBoundary(ui.TextPosition position) {
     final int characterPosition;
     switch (position.affinity) {
       case ui.TextAffinity.upstream:
         characterPosition = position.offset - 1;
-        break;
       case ui.TextAffinity.downstream:
         characterPosition = position.offset;
-        break;
     }
     final int start = WordBreaker.prevBreakIndex(plainText, characterPosition + 1);
     final int end = WordBreaker.nextBreakIndex(plainText, characterPosition);
@@ -223,18 +239,13 @@ class CanvasParagraph implements ui.Paragraph {
 
   @override
   ui.TextRange getLineBoundary(ui.TextPosition position) {
-    final int index = position.offset;
-
-    int i;
-    for (i = 0; i < lines.length - 1; i++) {
-      final ParagraphLine line = lines[i];
-      if (index >= line.startIndex && index < line.endIndex) {
-        break;
-      }
+    if (lines.isEmpty) {
+      return ui.TextRange.empty;
     }
-
-    final ParagraphLine line = lines[i];
-    return ui.TextRange(start: line.startIndex, end: line.endIndex);
+    final int? lineNumber = getLineNumberAt(position.offset);
+    // Fallback to the last line for backward compatibility.
+    final ParagraphLine line = lineNumber != null ? lines[lineNumber] : lines.last;
+    return ui.TextRange(start: line.startIndex, end: line.endIndex - line.trailingNewlines);
   }
 
   @override
@@ -242,6 +253,39 @@ class CanvasParagraph implements ui.Paragraph {
     return lines.map((ParagraphLine line) => line.lineMetrics).toList();
   }
 
+  @override
+  EngineLineMetrics? getLineMetricsAt(int lineNumber) {
+    return 0 <= lineNumber && lineNumber < lines.length
+      ? lines[lineNumber].lineMetrics
+      : null;
+  }
+
+  @override
+  int get numberOfLines => lines.length;
+
+  @override
+  int? getLineNumberAt(int codeUnitOffset) => _findLine(codeUnitOffset, 0, lines.length);
+
+  int? _findLine(int codeUnitOffset, int startLine, int endLine) {
+    assert(endLine <= lines.length);
+    final bool isOutOfBounds = endLine <= startLine
+                            || codeUnitOffset < lines[startLine].startIndex
+                            || (endLine < numberOfLines && lines[endLine].startIndex <= codeUnitOffset);
+    if (isOutOfBounds) {
+      return null;
+    }
+
+    if (endLine == startLine + 1) {
+      assert(lines[startLine].startIndex <= codeUnitOffset);
+      assert(endLine == numberOfLines || codeUnitOffset < lines[endLine].startIndex);
+      return codeUnitOffset >= lines[startLine].visibleEndIndex ? null : startLine;
+    }
+    // endLine >= startLine + 2 thus we have
+    // startLine + 1 <= midIndex <= endLine - 1
+    final int midIndex = (startLine + endLine) ~/ 2;
+    return _findLine(codeUnitOffset, midIndex, endLine) ?? _findLine(codeUnitOffset, startLine, midIndex);
+  }
+
   bool _disposed = false;
 
   @override
@@ -254,9 +298,16 @@ class CanvasParagraph implements ui.Paragraph {
 
   @override
   bool get debugDisposed {
-    if (assertionsEnabled) {
-      return _disposed;
+    bool? result;
+    assert(() {
+      result = _disposed;
+      return true;
+    }());
+
+    if (result != null) {
+      return result!;
     }
+
     throw StateError('Paragraph.debugDisposed is only avialalbe when asserts are enabled.');
   }
 }
@@ -369,6 +420,7 @@ abstract class StyleNode {
         letterSpacing: _letterSpacing,
         wordSpacing: _wordSpacing,
         height: _height,
+        leadingDistribution: _leadingDistribution,
         locale: _locale,
         background: _background,
         foreground: _foreground,
@@ -394,6 +446,7 @@ abstract class StyleNode {
   double? get _letterSpacing;
   double? get _wordSpacing;
   double? get _height;
+  ui.TextLeadingDistribution? get _leadingDistribution;
   ui.Locale? get _locale;
   ui.Paint? get _background;
   ui.Paint? get _foreground;
@@ -459,6 +512,9 @@ class ChildStyleNode extends StyleNode {
   @override
   double? get _height => style.height ?? parent._height;
 
+  @override
+  ui.TextLeadingDistribution? get _leadingDistribution => style.leadingDistribution ?? parent._leadingDistribution;
+
   @override
   ui.Locale? get _locale => style.locale ?? parent._locale;
 
@@ -490,7 +546,7 @@ class RootStyleNode extends StyleNode {
   final EngineParagraphStyle paragraphStyle;
 
   @override
-  final ui.Color _color = _defaultTextColor;
+  ui.Color? get _color => null;
 
   @override
   ui.TextDecoration? get _decoration => null;
@@ -513,7 +569,7 @@ class RootStyleNode extends StyleNode {
   ui.TextBaseline? get _textBaseline => null;
 
   @override
-  String get _fontFamily => paragraphStyle.fontFamily ?? FlutterViewEmbedder.defaultFontFamily;
+  String get _fontFamily => paragraphStyle.fontFamily ?? StyleManager.defaultFontFamily;
 
   @override
   List<String>? get _fontFamilyFallback => null;
@@ -525,7 +581,7 @@ class RootStyleNode extends StyleNode {
   List<ui.FontVariation>? get _fontVariations => null;
 
   @override
-  double get _fontSize => paragraphStyle.fontSize ?? FlutterViewEmbedder.defaultFontSize;
+  double get _fontSize => paragraphStyle.fontSize ?? StyleManager.defaultFontSize;
 
   @override
   double? get _letterSpacing => null;
@@ -536,6 +592,9 @@ class RootStyleNode extends StyleNode {
   @override
   double? get _height => paragraphStyle.height;
 
+  @override
+  ui.TextLeadingDistribution? get _leadingDistribution => null;
+
   @override
   ui.Locale? get _locale => paragraphStyle.locale;
 
@@ -643,6 +702,12 @@ class CanvasParagraphBuilder implements ui.ParagraphBuilder {
       return;
     }
 
+    final double? letterSpacing = style.letterSpacing;
+    if (letterSpacing != null && letterSpacing != 0.0) {
+      _canDrawOnCanvas = false;
+      return;
+    }
+
     final ui.TextDecoration? decoration = style.decoration;
     if (decoration != null && decoration != ui.TextDecoration.none) {
       _canDrawOnCanvas = false;
diff --git a/lib/web_ui/lib/src/engine/text/font_collection.dart b/lib/web_ui/lib/src/engine/text/font_collection.dart
index ba33172b029c0e46409e512d8ca0a670c564048e..fca02705974689721f941f885187793815f50a01 100644
--- a/lib/web_ui/lib/src/engine/text/font_collection.dart
+++ b/lib/web_ui/lib/src/engine/text/font_collection.dart
@@ -3,15 +3,10 @@
 // found in the LICENSE file.
 
 import 'dart:async';
-import 'dart:convert';
 import 'dart:typed_data';
 
-import 'package:ui/src/engine/fonts.dart';
-
-import '../assets.dart';
-import '../dom.dart';
-import '../util.dart';
-import 'layout_service.dart';
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
 /// This class is responsible for registering and loading fonts.
 ///
@@ -19,101 +14,52 @@ import 'layout_service.dart';
 /// [downloadAssetFonts] with it to register fonts declared in the
 /// font manifest. If test fonts are enabled, then call
 /// [debugDownloadTestFonts] as well.
-class HtmlFontCollection implements FontCollection {
-  FontManager? _assetFontManager;
-  FontManager? _testFontManager;
-
-  /// Reads the font manifest using the [assetManager] and downloads all of the
+class HtmlFontCollection implements FlutterFontCollection {
+  /// Reads the font manifest using the [ui_web.assetManager] and downloads all of the
   /// fonts declared within.
   @override
-  Future<void> downloadAssetFonts(AssetManager assetManager) async {
-    ByteData byteData;
-
-    try {
-      byteData = await assetManager.load('FontManifest.json');
-    } on AssetManagerException catch (e) {
-      if (e.httpStatus == 404) {
-        printWarning('Font manifest does not exist at `${e.url}` – ignoring.');
-        return;
-      } else {
-        rethrow;
+  Future<AssetFontsResult> loadAssetFonts(FontManifest manifest) async {
+    final List<Future<(String, FontLoadError?)>> pendingFonts = <Future<(String, FontLoadError?)>>[];
+    for (final FontFamily family in manifest.families) {
+      for (final FontAsset fontAsset in family.fontAssets) {
+        pendingFonts.add(() async {
+          return (
+            fontAsset.asset,
+            await _loadFontAsset(family.name, fontAsset.asset, fontAsset.descriptors)
+          );
+        }());
       }
     }
 
-    final List<dynamic>? fontManifest =
-        json.decode(utf8.decode(byteData.buffer.asUint8List())) as List<dynamic>?;
-    if (fontManifest == null) {
-      throw AssertionError(
-          'There was a problem trying to load FontManifest.json');
-    }
-
-    _assetFontManager = FontManager();
-
-    for (final Map<String, dynamic> fontFamily
-        in fontManifest.cast<Map<String, dynamic>>()) {
-      final String? family = fontFamily.tryString('family');
-      final List<Map<String, dynamic>> fontAssets = fontFamily.castList<Map<String, dynamic>>('fonts');
-
-      for (final Map<String, dynamic> fontAsset in fontAssets) {
-        final String asset = fontAsset.readString('asset');
-        final Map<String, String> descriptors = <String, String>{};
-        for (final String descriptor in fontAsset.keys) {
-          if (descriptor != 'asset') {
-            descriptors[descriptor] = '${fontAsset[descriptor]}';
-          }
-        }
-        _assetFontManager!.downloadAsset(
-            family!, 'url(${assetManager.getAssetUrl(asset)})', descriptors);
+    final List<String> loadedFonts = <String>[];
+    final Map<String, FontLoadError> fontFailures = <String, FontLoadError>{};
+    for (final (String asset, FontLoadError? error) in await Future.wait(pendingFonts)) {
+      if (error == null) {
+        loadedFonts.add(asset);
+      } else {
+        fontFailures[asset] = error;
       }
     }
-    await _assetFontManager!.downloadAllFonts();
+    return AssetFontsResult(loadedFonts, fontFailures);
   }
 
   @override
-  Future<void> loadFontFromList(Uint8List list, {String? fontFamily}) {
+  Future<bool> loadFontFromList(Uint8List list, {String? fontFamily}) async {
     if (fontFamily == null) {
-      throw AssertionError('Font family must be provided to HtmlFontCollection.');
+      printWarning('Font family must be provided to HtmlFontCollection.');
+      return false;
     }
-    return _assetFontManager!._loadFontFaceBytes(fontFamily, list);
-  }
-
-  /// Downloads fonts that are used by tests.
-  @override
-  Future<void> debugDownloadTestFonts() async {
-    _testFontManager = FontManager();
-    _testFontManager!.downloadAsset(
-        ahemFontFamily, 'url($ahemFontUrl)', const <String, String>{});
-    _testFontManager!.downloadAsset(robotoFontFamily,
-        'url($robotoTestFontUrl)', const <String, String>{});
-    _testFontManager!.downloadAsset(robotoVariableFontFamily,
-        'url($robotoVariableTestFontUrl)', const <String, String>{});
-    await _testFontManager!.downloadAllFonts();
+    return _loadFontFaceBytes(fontFamily, list);
   }
 
   @override
-  void registerDownloadedFonts() {
-    _assetFontManager?.registerDownloadedFonts();
-    _testFontManager?.registerDownloadedFonts();
-  }
+  Null get fontFallbackManager => null;
 
   /// Unregister all fonts that have been registered.
   @override
   void clear() {
-    _assetFontManager = null;
-    _testFontManager = null;
     domDocument.fonts!.clear();
   }
-}
-
-/// Manages a collection of fonts and ensures they are loaded.
-class FontManager {
-
-  /// Fonts that started the downloading process. Once the fonts have downloaded
-  /// without error, they are moved to [_downloadedFonts]. Those fonts
-  /// are subsequently registered by [registerDownloadedFonts].
-  final List<Future<DomFontFace?>> _fontLoadingFutures = <Future<DomFontFace?>>[];
-
-  final List<DomFontFace> _downloadedFonts = <DomFontFace>[];
 
   // Regular expression to detect a string with no punctuations.
   // For example font family 'Ahem!' does not fall into this category
@@ -132,7 +78,7 @@ class FontManager {
   ///
   /// Safari 12 and Firefox crash if you create a [DomFontFace] with a font
   /// family that is not correct CSS syntax. Font family names with invalid
-  /// characters are accepted accepted on these browsers, when wrapped it in
+  /// characters are accepted on these browsers, when wrapped it in
   /// quotes.
   ///
   /// Additionally, for Safari 12 to work [DomFontFace] name should be
@@ -156,74 +102,86 @@ class FontManager {
   ///
   /// * https://developer.mozilla.org/en-US/docs/Web/CSS/font-family#Valid_family_names
   /// * https://drafts.csswg.org/css-fonts-3/#font-family-prop
-  void downloadAsset(
+  Future<FontLoadError?> _loadFontAsset(
     String family,
     String asset,
     Map<String, String> descriptors,
-  ) {
-    if (startWithDigit.hasMatch(family) ||
-        notPunctuation.stringMatch(family) != family) {
-      // Load a font family name with special characters once here wrapped in
-      // quotes.
-      _loadFontFace("'$family'", asset, descriptors);
+  ) async {
+    final List<DomFontFace> fontFaces = <DomFontFace>[];
+    final List<FontLoadError> errors = <FontLoadError>[];
+    try {
+      if (startWithDigit.hasMatch(family) ||
+          notPunctuation.stringMatch(family) != family) {
+        // Load a font family name with special characters once here wrapped in
+        // quotes.
+        fontFaces.add(await _loadFontFace("'$family'", asset, descriptors));
+      }
+    } on FontLoadError catch (error) {
+      errors.add(error);
+    }
+    try {
+          // Load all fonts, without quoted family names.
+      fontFaces.add(await _loadFontFace(family, asset, descriptors));
+    } on FontLoadError catch (error) {
+      errors.add(error);
     }
-    // Load all fonts, without quoted family names.
-    _loadFontFace(family, asset, descriptors);
+    if (fontFaces.isEmpty) {
+      // We failed to load either font face. Return the first error.
+      return errors.first;
+    }
+
+    try {
+      // Since we can't use tear-offs for interop members, this code is faster
+      // and easier to read with a for loop instead of forEach.
+      // ignore: prefer_foreach
+      for (final DomFontFace font in fontFaces) {
+        domDocument.fonts!.add(font);
+      }
+    } catch (e) {
+      return FontInvalidDataError(asset);
+    }
+    return null;
   }
 
-  void _loadFontFace(
+  Future<DomFontFace> _loadFontFace(
     String family,
     String asset,
     Map<String, String> descriptors,
-  ) {
-    Future<DomFontFace?> fontFaceLoad(DomFontFace fontFace) async {
-      try {
-        final DomFontFace loadedFontFace = await fontFace.load();
-        return loadedFontFace;
-      } catch (e) {
-        printWarning('Error while trying to load font family "$family":\n$e');
-        return null;
-      }
-    }
+  ) async {
     // try/catch because `new FontFace` can crash with an improper font family.
     try {
-      final DomFontFace fontFace = createDomFontFace(family, asset, descriptors);
-      _fontLoadingFutures.add(fontFaceLoad(fontFace));
+      final DomFontFace fontFace = createDomFontFace(family, 'url(${ui_web.assetManager.getAssetUrl(asset)})', descriptors);
+      return await fontFace.load();
     } catch (e) {
       printWarning('Error while loading font family "$family":\n$e');
+      throw FontDownloadError(asset, e);
     }
   }
 
-  void registerDownloadedFonts() {
-    if (_downloadedFonts.isEmpty) {
-      return;
-    }
-    _downloadedFonts.forEach(domDocument.fonts!.add);
-  }
-
-
-  Future<void> downloadAllFonts() async {
-    final List<DomFontFace?> loadedFonts = await Future.wait(_fontLoadingFutures);
-    _downloadedFonts.addAll(loadedFonts.whereType<DomFontFace>());
-  }
-
   // Loads a font from bytes, surfacing errors through the future.
-  Future<void> _loadFontFaceBytes(String family, Uint8List list) {
+  Future<bool> _loadFontFaceBytes(String family, Uint8List list) async {
     // Since these fonts are loaded by user code, surface the error
     // through the returned future.
-    final DomFontFace fontFace = createDomFontFace(family, list);
-    return fontFace.load().then((_) {
+    try {
+      final DomFontFace fontFace = createDomFontFace(family, list);
+      if (fontFace.status == 'error') {
+        // Font failed to load.
+        return false;
+      }
       domDocument.fonts!.add(fontFace);
+
       // There might be paragraph measurements for this new font before it is
       // loaded. They were measured using fallback font, so we should clear the
       // cache.
       Spanometer.clearRulersCache();
-    }, onError: (dynamic exception) {
-      // Failures here will throw an DomException which confusingly
-      // does not implement Exception or Error. Rethrow an Exception so it can
-      // be caught in user code without depending on dart:html or requiring a
-      // catch block without "on".
-      throw Exception(exception.toString());
-    });
+    } catch (exception) {
+      // Failures here will throw an DomException. Return false.
+      return false;
+    }
+    return true;
+  }
+
+  @override
+  void debugResetFallbackFonts() {
   }
 }
diff --git a/lib/web_ui/lib/src/engine/text/layout_fragmenter.dart b/lib/web_ui/lib/src/engine/text/layout_fragmenter.dart
index 0c48c0f5eeb928fcaecf946d6146abb9fdfbbe09..cf1eb647c21032853a6afd7e1dc394e2f1326d81 100644
--- a/lib/web_ui/lib/src/engine/text/layout_fragmenter.dart
+++ b/lib/web_ui/lib/src/engine/text/layout_fragmenter.dart
@@ -591,6 +591,107 @@ mixin _FragmentBox on _CombinedFragment, _FragmentMetrics, _FragmentPosition {
     }
     return x;
   }
+
+  // [start, end).map((index) => line.graphemeStarts[index]) gives an ascending
+  // list of UTF16 offsets of graphemes that start in this fragment.
+  //
+  // Returns null if this fragment contains no grapheme starts.
+  late final (int, int)? graphemeStartIndexRange = _getBreaksRange();
+  (int, int)? _getBreaksRange() {
+    if (end == start) {
+      return null;
+    }
+    final List<int> lineGraphemeBreaks = line.graphemeStarts;
+    assert(end > start);
+    assert(line.graphemeStarts.isNotEmpty);
+    final int startIndex = line.graphemeStartIndexBefore(start, 0, lineGraphemeBreaks.length);
+    final int endIndex = end == start + 1
+      ? startIndex + 1
+      : line.graphemeStartIndexBefore(end - 1, startIndex, lineGraphemeBreaks.length) + 1;
+    final int firstGraphemeStart = lineGraphemeBreaks[startIndex];
+    return firstGraphemeStart > start
+      ? (endIndex == startIndex + 1 ? null : (startIndex + 1, endIndex))
+      : (startIndex, endIndex);
+  }
+
+  /// Whether the first codepoints of this fragment is not a valid grapheme start,
+  /// and belongs in the the previous fragment.
+  ///
+  /// This is the result of a known bug: in rare circumstances, a grapheme is
+  /// split into different fragments. To workaround this we ignore the trailing
+  /// part of the grapheme during hit-testing, by adjusting the leading offset of
+  /// a fragment to the leading edge of the first grapheme start in that fragment.
+  //
+  // TODO(LongCatIsLooong): Grapheme clusters should not be separately even
+  // when they are in different runs. Also document the recommendation to use
+  // U+25CC or U+00A0 for showing nonspacing marks in isolation.
+  bool get hasLeadingBrokenGrapheme {
+    final int? graphemeStartIndexRangeStart = graphemeStartIndexRange?.$1;
+    return graphemeStartIndexRangeStart == null || line.graphemeStarts[graphemeStartIndexRangeStart] != start;
+  }
+
+  /// Returns the GlyphInfo within the range [line.graphemeStarts[startIndex], line.graphemeStarts[endIndex]),
+  /// that's visually closeset to the given horizontal offset `x` (in the paragraph's coordinates).
+  ui.GlyphInfo _getClosestCharacterInRange(double x, int startIndex, int endIndex) {
+    final List<int> graphemeStartIndices = line.graphemeStarts;
+    final ui.TextRange fullRange = ui.TextRange(start: graphemeStartIndices[startIndex], end: graphemeStartIndices[endIndex]);
+    final ui.TextBox fullBox = toTextBox(start: fullRange.start, end: fullRange.end);
+    if (startIndex + 1 == endIndex) {
+      return ui.GlyphInfo(fullBox.toRect(), fullRange, fullBox.direction);
+    }
+    assert(startIndex + 1 < endIndex);
+    final ui.TextBox(:double left, :double right) = fullBox;
+
+    // The toTextBox call is potentially expensive so we'll try reducing the
+    // search steps with a binary search.
+    //
+    // x ∈ (left, right),
+    if (left < x && x < right) {
+      final int midIndex = (startIndex + endIndex) ~/ 2;
+      // endIndex >= startIndex + 2, so midIndex >= start + 1
+      final ui.GlyphInfo firstHalf = _getClosestCharacterInRange(x, startIndex, midIndex);
+      if (firstHalf.graphemeClusterLayoutBounds.left < x && x < firstHalf.graphemeClusterLayoutBounds.right) {
+        return firstHalf;
+      }
+      // startIndex <= endIndex - 2, so midIndex <= endIndex - 1
+      final ui.GlyphInfo secondHalf = _getClosestCharacterInRange(x, midIndex, endIndex);
+      if (secondHalf.graphemeClusterLayoutBounds.left < x && x < secondHalf.graphemeClusterLayoutBounds.right) {
+        return secondHalf;
+      }
+      // Neither box clips the given x. This is supposed to be rare.
+      final double distanceToFirst = (x - x.clamp(firstHalf.graphemeClusterLayoutBounds.left, firstHalf.graphemeClusterLayoutBounds.right)).abs();
+      final double distanceToSecond = (x - x.clamp(secondHalf.graphemeClusterLayoutBounds.left, secondHalf.graphemeClusterLayoutBounds.right)).abs();
+      return distanceToFirst > distanceToSecond ? firstHalf : secondHalf;
+    }
+
+    // x ∉ (left, right), it's either the first character or the last, since
+    // there can only be one writing direction in the fragment.
+    final ui.TextRange range = switch ((fullBox.direction, x <= left)) {
+      (ui.TextDirection.ltr, true) || (ui.TextDirection.rtl, false) => ui.TextRange(
+        start: graphemeStartIndices[startIndex],
+        end: graphemeStartIndices[startIndex + 1],
+      ),
+      (ui.TextDirection.ltr, false) || (ui.TextDirection.rtl, true) => ui.TextRange(
+        start: graphemeStartIndices[endIndex - 1],
+        end: graphemeStartIndices[endIndex],
+      ),
+    };
+    assert(!range.isCollapsed);
+    final ui.TextBox box = toTextBox(start: range.start, end: range.end);
+    return ui.GlyphInfo(box.toRect(), range, box.direction);
+  }
+
+  /// Returns the GlyphInfo of the character in the fragment that is closest to
+  /// the given offset x.
+  ui.GlyphInfo getClosestCharacterBox(double x) {
+    assert(end > start);
+    assert(graphemeStartIndexRange != null);
+    // The force ! is safe here because this method is only called by
+    // LayoutService.getClosestGlyphInfo which checks this fragment has at least
+    // one grapheme start before calling this method.
+    final (int rangeStart, int rangeEnd) = graphemeStartIndexRange!;
+    return _getClosestCharacterInRange(x, rangeStart, rangeEnd);
+  }
 }
 
 class EllipsisFragment extends LayoutFragment {
diff --git a/lib/web_ui/lib/src/engine/text/layout_service.dart b/lib/web_ui/lib/src/engine/text/layout_service.dart
index b289abc13c5d13e263f137f2f1043d68f64cc89b..3273c85f4755634bb11694da8974bc8eccd88a91 100644
--- a/lib/web_ui/lib/src/engine/text/layout_service.dart
+++ b/lib/web_ui/lib/src/engine/text/layout_service.dart
@@ -16,6 +16,16 @@ import 'paragraph.dart';
 import 'ruler.dart';
 import 'text_direction.dart';
 
+/// A single canvas2d context to use for all text measurements.
+@visibleForTesting
+final DomCanvasRenderingContext2D textContext =
+    // We don't use this canvas to draw anything, so let's make it as small as
+    // possible to save memory.
+    createDomCanvasElement(width: 0, height: 0).context2D;
+
+/// The last font used in the [textContext].
+String? _lastContextFont;
+
 /// Performs layout on a [CanvasParagraph].
 ///
 /// It uses a [DomCanvasElement] to measure text.
@@ -24,9 +34,6 @@ class TextLayoutService {
 
   final CanvasParagraph paragraph;
 
-  final DomCanvasRenderingContext2D context =
-      createDomCanvasElement().context2D;
-
   // *** Results of layout *** //
 
   // Look at the Paragraph class for documentation of the following properties.
@@ -53,7 +60,7 @@ class TextLayoutService {
   ui.Rect get paintBounds => _paintBounds;
   ui.Rect _paintBounds = ui.Rect.zero;
 
-  late final Spanometer spanometer = Spanometer(paragraph, context);
+  late final Spanometer spanometer = Spanometer(paragraph);
 
   late final LayoutFragmenter layoutFragmenter =
       LayoutFragmenter(paragraph.plainText, paragraph.spans);
@@ -203,7 +210,6 @@ class TextLayoutService {
         case LineBreakType.opportunity:
           minIntrinsicWidth = math.max(minIntrinsicWidth, runningMinIntrinsicWidth);
           runningMinIntrinsicWidth = 0;
-          break;
 
         case LineBreakType.mandatory:
         case LineBreakType.endOfText:
@@ -211,7 +217,6 @@ class TextLayoutService {
           maxIntrinsicWidth = math.max(maxIntrinsicWidth, runningMaxIntrinsicWidth);
           runningMinIntrinsicWidth = 0;
           runningMaxIntrinsicWidth = 0;
-          break;
       }
     }
   }
@@ -385,7 +390,10 @@ class TextLayoutService {
     // it possible to do hit testing. Once we find the box, we look inside that
     // box to find where exactly the `offset` is located.
 
-    final ParagraphLine line = _findLineForY(offset.dy);
+    final ParagraphLine? line = _findLineForY(offset.dy);
+    if (line == null) {
+      return const ui.TextPosition(offset: 0);
+    }
     // [offset] is to the left of the line.
     if (offset.dx <= line.left) {
       return ui.TextPosition(
@@ -411,7 +419,52 @@ class TextLayoutService {
     return ui.TextPosition(offset: line.startIndex);
   }
 
-  ParagraphLine _findLineForY(double y) {
+  ui.GlyphInfo? getClosestGlyphInfo(ui.Offset offset) {
+    final ParagraphLine? line = _findLineForY(offset.dy);
+    if (line == null) {
+      return null;
+    }
+    final LayoutFragment? fragment = line.closestFragmentAtOffset(offset.dx - line.left);
+    if (fragment == null) {
+      return null;
+    }
+    final double dx = offset.dx;
+    final bool closestGraphemeStartInFragment = !fragment.hasLeadingBrokenGrapheme
+                                             || dx <= fragment.line.left
+                                             || fragment.line.left + fragment.line.width <= dx
+                                             || switch (fragment.textDirection!) {
+                                               // If dx is closer to the trailing edge, no need to check other fragments.
+                                               ui.TextDirection.ltr => dx >= line.left + (fragment.left + fragment.right) / 2,
+                                               ui.TextDirection.rtl => dx <= line.left + (fragment.left + fragment.right) / 2,
+                                             };
+    final ui.GlyphInfo candidate1 = fragment.getClosestCharacterBox(dx);
+    if (closestGraphemeStartInFragment) {
+      return candidate1;
+    }
+    final bool searchLeft = switch (fragment.textDirection!) {
+      ui.TextDirection.ltr => true,
+      ui.TextDirection.rtl => false,
+    };
+    final ui.GlyphInfo? candidate2 = fragment.line.closestFragmentTo(fragment, searchLeft)?.getClosestCharacterBox(dx);
+    if (candidate2 == null) {
+      return candidate1;
+    }
+
+    final double distance1 = math.min(
+      (candidate1.graphemeClusterLayoutBounds.left - dx).abs(),
+      (candidate1.graphemeClusterLayoutBounds.right - dx).abs(),
+    );
+    final double distance2 = math.min(
+      (candidate2.graphemeClusterLayoutBounds.left - dx).abs(),
+      (candidate2.graphemeClusterLayoutBounds.right - dx).abs(),
+    );
+    return distance2 > distance1 ? candidate1 : candidate2;
+  }
+
+  ParagraphLine? _findLineForY(double y) {
+    if (lines.isEmpty) {
+      return null;
+    }
     // We could do a binary search here but it's not worth it because the number
     // of line is typically low, and each iteration is a cheap comparison of
     // doubles.
@@ -633,14 +686,12 @@ class LineBuilder {
         // `descent` enough to fit the placeholder.
         ascent = this.ascent;
         descent = placeholder.height - this.ascent;
-        break;
 
       case ui.PlaceholderAlignment.bottom:
         // The opposite of `top`. The `descent` is the same, but we extend the
         // `ascent`.
         ascent = placeholder.height - this.descent;
         descent = this.descent;
-        break;
 
       case ui.PlaceholderAlignment.middle:
         final double textMidPoint = height / 2;
@@ -648,22 +699,18 @@ class LineBuilder {
         final double diff = placeholderMidPoint - textMidPoint;
         ascent = this.ascent + diff;
         descent = this.descent + diff;
-        break;
 
       case ui.PlaceholderAlignment.aboveBaseline:
         ascent = placeholder.height;
         descent = 0.0;
-        break;
 
       case ui.PlaceholderAlignment.belowBaseline:
         ascent = 0.0;
         descent = placeholder.height;
-        break;
 
       case ui.PlaceholderAlignment.baseline:
         ascent = placeholder.baselineOffset;
         descent = placeholder.height - ascent;
-        break;
     }
 
     // Update the metrics of the fragment to reflect the calculated ascent and
@@ -851,6 +898,7 @@ class LineBuilder {
       descent: descent,
       fragments: _fragments,
       textDirection: _paragraphDirection,
+      paragraph: paragraph,
     );
 
     for (final LayoutFragment fragment in _fragments) {
@@ -882,10 +930,9 @@ class LineBuilder {
 /// it's set, the [Spanometer] updates the underlying [context] so that
 /// subsequent measurements use the correct styles.
 class Spanometer {
-  Spanometer(this.paragraph, this.context);
+  Spanometer(this.paragraph);
 
   final CanvasParagraph paragraph;
-  final DomCanvasRenderingContext2D context;
 
   static final RulerHost _rulerHost = RulerHost();
 
@@ -904,8 +951,6 @@ class Spanometer {
     _rulers.clear();
   }
 
-  String _cssFontString = '';
-
   double? get letterSpacing => currentSpan.style.letterSpacing;
 
   TextHeightRuler? _currentRuler;
@@ -913,12 +958,24 @@ class Spanometer {
 
   ParagraphSpan get currentSpan => _currentSpan!;
   set currentSpan(ParagraphSpan? span) {
+    // Update the font string if it's different from the last applied font
+    // string.
+    //
+    // Also, we need to update the font string even if the span isn't changing.
+    // That's because `textContext` is shared across all spanometers.
+    if (span != null) {
+      final String newCssFontString = span.style.cssFontString;
+      if (_lastContextFont != newCssFontString) {
+        _lastContextFont = newCssFontString;
+        textContext.font = newCssFontString;
+      }
+    }
+
     if (span == _currentSpan) {
       return;
     }
     _currentSpan = span;
 
-    // No need to update css font string when `span` is null.
     if (span == null) {
       _currentRuler = null;
       return;
@@ -933,13 +990,6 @@ class Spanometer {
       _rulers[heightStyle] = ruler;
     }
     _currentRuler = ruler;
-
-    // Update the font string if it's different from the previous span.
-    final String cssFontString = span.style.cssFontString;
-    if (_cssFontString != cssFontString) {
-      _cssFontString = cssFontString;
-      context.font = cssFontString;
-    }
   }
 
   /// Whether the spanometer is ready to take measurements.
@@ -955,7 +1005,7 @@ class Spanometer {
   double get height => _currentRuler!.height;
 
   double measureText(String text) {
-    return measureSubstring(context, text, 0, text.length);
+    return measureSubstring(textContext, text, 0, text.length);
   }
 
   double measureRange(int start, int end) {
@@ -1047,7 +1097,7 @@ class Spanometer {
     assert(end >= currentSpan.start && end <= currentSpan.end);
 
     return measureSubstring(
-      context,
+      textContext,
       paragraph.plainText,
       start,
       end,
diff --git a/lib/web_ui/lib/src/engine/text/line_breaker.dart b/lib/web_ui/lib/src/engine/text/line_breaker.dart
index c2bf0ab1e2090277861d57f8a9614de803b36bf4..98b02aa73af40c2e8928db6eab87472e8ff3259f 100644
--- a/lib/web_ui/lib/src/engine/text/line_breaker.dart
+++ b/lib/web_ui/lib/src/engine/text/line_breaker.dart
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:js_interop';
+
 import '../dom.dart';
 import 'fragmenter.dart';
 import 'line_break_properties.dart';
@@ -42,7 +44,7 @@ enum LineBreakType {
 /// Splits [text] into fragments based on line breaks.
 abstract class LineBreakFragmenter extends TextFragmenter {
   factory LineBreakFragmenter(String text) {
-    if (domWindow.Intl.v8BreakIterator != null) {
+    if (domIntl.v8BreakIterator != null) {
       return V8LineBreakFragmenter(text);
     }
     return FWLineBreakFragmenter(text);
@@ -65,80 +67,76 @@ class FWLineBreakFragmenter extends TextFragmenter implements LineBreakFragmente
 /// An implementation of [LineBreakFragmenter] that uses V8's
 /// `v8BreakIterator` API to find line breaks in the given [text].
 class V8LineBreakFragmenter extends TextFragmenter implements LineBreakFragmenter {
-  V8LineBreakFragmenter(super.text)
-      : assert(domWindow.Intl.v8BreakIterator != null);
+  V8LineBreakFragmenter(super.text) : assert(domIntl.v8BreakIterator != null);
+
+  final DomV8BreakIterator _v8BreakIterator = createV8BreakIterator();
 
   @override
   List<LineBreakFragment> fragment() {
-    final List<LineBreakFragment> breaks = <LineBreakFragment>[];
-    int fragmentStart = 0;
-
-    final DomV8BreakIterator iterator = createV8BreakIterator();
-
-    iterator.adoptText(text);
-    iterator.first();
-    while (iterator.next() != -1) {
-      final LineBreakType type = _getBreakType(iterator);
-
-      final int fragmentEnd = iterator.current().toInt();
-      int trailingNewlines = 0;
-      int trailingSpaces = 0;
-
-      // Calculate trailing newlines and spaces.
-      for (int i = fragmentStart; i < fragmentEnd; i++) {
-        final int codeUnit = text.codeUnitAt(i);
-        if (_kNewlines.contains(codeUnit)) {
-          trailingNewlines++;
-          trailingSpaces++;
-        } else if (_kSpaces.contains(codeUnit)) {
-          trailingSpaces++;
-        } else {
-          // Always break after a sequence of spaces.
-          if (trailingSpaces > 0) {
-            breaks.add(LineBreakFragment(
-              fragmentStart,
-              i,
-              LineBreakType.opportunity,
-              trailingNewlines: trailingNewlines,
-              trailingSpaces: trailingSpaces,
-            ));
-            fragmentStart = i;
-            trailingNewlines = 0;
-            trailingSpaces = 0;
-          }
+    return breakLinesUsingV8BreakIterator(text, text.toJS, _v8BreakIterator);
+  }
+}
+
+List<LineBreakFragment> breakLinesUsingV8BreakIterator(String text, JSString jsText, DomV8BreakIterator iterator) {
+  final List<LineBreakFragment> breaks = <LineBreakFragment>[];
+  int fragmentStart = 0;
+
+  iterator.adoptText(jsText);
+  iterator.first();
+  while (iterator.next() != -1) {
+    final int fragmentEnd = iterator.current().toInt();
+    int trailingNewlines = 0;
+    int trailingSpaces = 0;
+
+    // Calculate trailing newlines and spaces.
+    for (int i = fragmentStart; i < fragmentEnd; i++) {
+      final int codeUnit = text.codeUnitAt(i);
+      if (_kNewlines.contains(codeUnit)) {
+        trailingNewlines++;
+        trailingSpaces++;
+      } else if (_kSpaces.contains(codeUnit)) {
+        trailingSpaces++;
+      } else {
+        // Always break after a sequence of spaces.
+        if (trailingSpaces > 0) {
+          breaks.add(LineBreakFragment(
+            fragmentStart,
+            i,
+            LineBreakType.opportunity,
+            trailingNewlines: trailingNewlines,
+            trailingSpaces: trailingSpaces,
+          ));
+          fragmentStart = i;
+          trailingNewlines = 0;
+          trailingSpaces = 0;
         }
       }
-
-      breaks.add(LineBreakFragment(
-        fragmentStart,
-        fragmentEnd,
-        type,
-        trailingNewlines: trailingNewlines,
-        trailingSpaces: trailingSpaces,
-      ));
-      fragmentStart = fragmentEnd;
     }
 
-    if (breaks.isEmpty || breaks.last.type == LineBreakType.mandatory) {
-      breaks.add(LineBreakFragment(text.length, text.length, LineBreakType.endOfText, trailingNewlines: 0, trailingSpaces: 0));
+    final LineBreakType type;
+    if (trailingNewlines > 0) {
+      type = LineBreakType.mandatory;
+    } else if (fragmentEnd == text.length) {
+      type = LineBreakType.endOfText;
+    } else {
+      type = LineBreakType.opportunity;
     }
 
-    return breaks;
+    breaks.add(LineBreakFragment(
+      fragmentStart,
+      fragmentEnd,
+      type,
+      trailingNewlines: trailingNewlines,
+      trailingSpaces: trailingSpaces,
+    ));
+    fragmentStart = fragmentEnd;
   }
 
-  /// Gets break type from v8BreakIterator.
-  LineBreakType _getBreakType(DomV8BreakIterator iterator) {
-    final int fragmentEnd = iterator.current().toInt();
-
-    // I don't know why v8BreakIterator uses the type "none" to mean "soft break".
-    if (iterator.breakType() != 'none') {
-      return LineBreakType.mandatory;
-    }
-    if (fragmentEnd == text.length) {
-      return LineBreakType.endOfText;
-    }
-    return LineBreakType.opportunity;
+  if (breaks.isEmpty || breaks.last.type == LineBreakType.mandatory) {
+    breaks.add(LineBreakFragment(text.length, text.length, LineBreakType.endOfText, trailingNewlines: 0, trailingSpaces: 0));
   }
+
+  return breaks;
 }
 
 class LineBreakFragment extends TextFragment {
diff --git a/lib/web_ui/lib/src/engine/text/measurement.dart b/lib/web_ui/lib/src/engine/text/measurement.dart
index 0a8ccddfe16e1b1ab37a090f67ca60174b2535fb..b5ca5dff66b3a351c946533be67ebb19c30c145d 100644
--- a/lib/web_ui/lib/src/engine/text/measurement.dart
+++ b/lib/web_ui/lib/src/engine/text/measurement.dart
@@ -4,7 +4,8 @@
 
 import '../../engine.dart' show registerHotRestartListener;
 import '../dom.dart';
-import '../embedder.dart';
+import '../platform_dispatcher.dart';
+import '../view_embedder/dom_manager.dart';
 
 // TODO(yjbanov): this is a hack we use to compute ideographic baseline; this
 //                number is the ratio ideographic/alphabetic for font Ahem,
@@ -14,11 +15,9 @@ import '../embedder.dart';
 //                anything as of this writing.
 const double baselineRatioHack = 1.1662499904632568;
 
-/// Hosts ruler DOM elements in a hidden container under a `root` [DomNode].
-///
-/// The `root` [DomNode] is optional. Defaults to [flutterViewEmbedder.glassPaneShadow].
+/// Hosts ruler DOM elements in a hidden container under [DomManager.renderingHost].
 class RulerHost {
-  RulerHost({DomNode? root}) {
+  RulerHost() {
     _rulerHost.style
       ..position = 'fixed'
       ..visibility = 'hidden'
@@ -28,11 +27,10 @@ class RulerHost {
       ..width = '0'
       ..height = '0';
 
-    if (root == null) {
-      flutterViewEmbedder.glassPaneShadow!.node.appendChild(_rulerHost);
-    } else {
-      root.appendChild(_rulerHost);
-    }
+    // TODO(mdebbar): There could be multiple views with multiple rendering hosts.
+    //                https://github.com/flutter/flutter/issues/137344
+    final DomNode renderingHost = EnginePlatformDispatcher.instance.implicitView!.dom.renderingHost;
+    renderingHost.appendChild(_rulerHost);
     registerHotRestartListener(dispose);
   }
 
diff --git a/lib/web_ui/lib/src/engine/text/paint_service.dart b/lib/web_ui/lib/src/engine/text/paint_service.dart
index 1fb4d688044ff9e6e4fafb38fa129cd805715e20..7c1de48489c73e0ceeb3c326a3d86b12ed2e8a40 100644
--- a/lib/web_ui/lib/src/engine/text/paint_service.dart
+++ b/lib/web_ui/lib/src/engine/text/paint_service.dart
@@ -4,7 +4,6 @@
 
 import 'package:ui/ui.dart' as ui;
 
-import '../dom.dart';
 import '../html/bitmap_canvas.dart';
 import '../html/painting.dart';
 import 'canvas_paragraph.dart';
@@ -78,23 +77,7 @@ class TextPaintService {
     final EngineTextStyle style = fragment.style;
 
     final String text = fragment.getText(paragraph);
-    final double? letterSpacing = style.letterSpacing;
-    if (letterSpacing == null || letterSpacing == 0.0) {
-      canvas.drawText(text, x, y,
-          style: style.foreground?.style, shadows: style.shadows);
-    } else {
-      // TODO(mdebbar): Implement letter-spacing on canvas more efficiently:
-      //                https://github.com/flutter/flutter/issues/51234
-      double charX = x;
-      final int len = text.length;
-      for (int i = 0; i < len; i++) {
-        final String char = text[i];
-        canvas.drawText(char, charX.roundToDouble(), y,
-            style: style.foreground?.style,
-            shadows: style.shadows);
-        charX += letterSpacing + canvas.measureText(char).width!;
-      }
-    }
+    canvas.drawText(text, x, y, style: style.foreground?.style, shadows: style.shadows);
 
     canvas.tearDownPaint();
   }
@@ -107,7 +90,10 @@ class TextPaintService {
     if (foreground != null) {
       paint = foreground as SurfacePaint;
     } else {
-      paint = (ui.Paint()..color = style.color!) as SurfacePaint;
+      paint = ui.Paint() as SurfacePaint;
+      if (style.color != null) {
+        paint.color = style.color!;
+      }
     }
 
     canvas.setCssFont(style.cssFontString, fragment.textDirection!);
diff --git a/lib/web_ui/lib/src/engine/text/paragraph.dart b/lib/web_ui/lib/src/engine/text/paragraph.dart
index c24b476290049aeee0236a53cec44168e06dc1ac..ab5b87f34e7aecca6944d3118008744893f3ee82 100644
--- a/lib/web_ui/lib/src/engine/text/paragraph.dart
+++ b/lib/web_ui/lib/src/engine/text/paragraph.dart
@@ -5,11 +5,12 @@
 import 'dart:math' as math;
 
 import 'package:ui/ui.dart' as ui;
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
 import '../browser_detection.dart';
 import '../dom.dart';
-import '../embedder.dart';
 import '../util.dart';
+import '../view_embedder/style_manager.dart';
 import 'canvas_paragraph.dart';
 import 'layout_fragmenter.dart';
 import 'ruler.dart';
@@ -89,8 +90,9 @@ class EngineLineMetrics implements ui.LineMetrics {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
-      return 'LineMetrics(hardBreak: $hardBreak, '
+    String result = super.toString();
+    assert(() {
+      result = 'LineMetrics(hardBreak: $hardBreak, '
           'ascent: $ascent, '
           'descent: $descent, '
           'unscaledAscent: $unscaledAscent, '
@@ -99,9 +101,9 @@ class EngineLineMetrics implements ui.LineMetrics {
           'left: $left, '
           'baseline: $baseline, '
           'lineNumber: $lineNumber)';
-    } else {
-      return super.toString();
-    }
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -123,6 +125,7 @@ class ParagraphLine {
     required this.widthWithTrailingSpaces,
     required this.fragments,
     required this.textDirection,
+    required this.paragraph,
     this.displayText,
   }) : assert(trailingNewlines <= endIndex - startIndex),
        lineMetrics = EngineLineMetrics(
@@ -149,6 +152,17 @@ class ParagraphLine {
   /// the text and doesn't stop at the overflow cutoff.
   final int endIndex;
 
+  /// The largest visible index (exclusive) in this line.
+  ///
+  /// When the line contains an overflow, or is ellipsized at the end, this is
+  /// the largest index that remains visible in this line. If the entire line is
+  /// ellipsized, this returns [startIndex];
+  late final int visibleEndIndex = switch (fragments) {
+    [] => startIndex,
+    [...final List<LayoutFragment> rest, EllipsisFragment()]
+    || final List<LayoutFragment> rest => rest.last.end,
+  };
+
   /// The number of new line characters at the end of the line.
   final int trailingNewlines;
 
@@ -171,6 +185,10 @@ class ParagraphLine {
   final double widthWithTrailingSpaces;
 
   /// The fragments that make up this line.
+  ///
+  /// The fragments in the [List] are sorted by their logical order in within the
+  /// line. In other words, a [LayoutFragment] in the [List] will have larger
+  /// start and end indices than all [LayoutFragment]s that appear before it.
   final List<LayoutFragment> fragments;
 
   /// The text direction of this line, which is the same as the paragraph's.
@@ -179,6 +197,9 @@ class ParagraphLine {
   /// The text to be rendered on the screen representing this line.
   final String? displayText;
 
+  /// The [CanvasParagraph] this line is part of.
+  final CanvasParagraph paragraph;
+
   /// The number of space characters in the line excluding trailing spaces.
   int get nonTrailingSpaces => spaceCount - trailingSpaces;
 
@@ -206,6 +227,165 @@ class ParagraphLine {
     return buffer.toString();
   }
 
+  // This is the fallback graphme breaker that is only used if Intl.Segmenter()
+  // is not supported so _fromDomSegmenter can't be called. This implementation
+  // breaks the text into UTF-16 codepoints instead of graphme clusters.
+  List<int> _fallbackGraphemeStartIterable(String lineText) {
+    final List<int> graphemeStarts = <int>[];
+    bool precededByHighSurrogate = false;
+    for (int i = 0; i < lineText.length; i++) {
+      final int maskedCodeUnit = lineText.codeUnitAt(i) & 0xFC00;
+      // Only skip `i` if it points to a low surrogate in a valid surrogate pair.
+      if (maskedCodeUnit != 0xDC00 || !precededByHighSurrogate) {
+        graphemeStarts.add(startIndex + i);
+      }
+      precededByHighSurrogate = maskedCodeUnit == 0xD800;
+    }
+    return graphemeStarts;
+  }
+
+  // This will be called at most once to lazily populate _graphemeStarts.
+  List<int> _fromDomSegmenter(String fragmentText) {
+    final DomSegmenter domSegmenter = createIntlSegmenter(granularity: 'grapheme');
+    final List<int> graphemeStarts = <int>[];
+    final Iterator<DomSegment> segments = domSegmenter.segment(fragmentText).iterator();
+    while (segments.moveNext()) {
+      graphemeStarts.add(segments.current.index + startIndex);
+    }
+    assert(graphemeStarts.isEmpty || graphemeStarts.first == startIndex);
+    return graphemeStarts;
+  }
+
+  List<int> _breakTextIntoGraphemes(String text) {
+    final List<int> graphemeStarts = domIntl.Segmenter == null ? _fallbackGraphemeStartIterable(text) : _fromDomSegmenter(text);
+    // Add the end index of the fragment to the list if the text is not empty.
+    if (graphemeStarts.isNotEmpty) {
+      graphemeStarts.add(visibleEndIndex);
+    }
+    return graphemeStarts;
+  }
+
+  /// This List contains an ascending sequence of UTF16 offsets that points to
+  /// grapheme starts within the line. Each UTF16 offset is relative to the
+  /// start of the paragraph, instead of the start of the line.
+  ///
+  /// For example, `graphemeStarts[n]` gives the UTF16 offset of the `n`-th
+  /// grapheme in the line.
+  late final List<int> graphemeStarts = visibleEndIndex == startIndex
+    ? const <int>[]
+    : _breakTextIntoGraphemes(paragraph.plainText.substring(startIndex, visibleEndIndex));
+
+  /// Translate a UTF16 code unit in the paragaph (`offset`), to a grapheme
+  /// offset with in the current line.
+  ///
+  /// The `start` and `end` parameters are both grapheme offsets within the
+  /// current line. They are used to limit the search range (so the return value
+  /// that corresponds to the code unit `offset` must be with in [start, end)).
+  int graphemeStartIndexBefore(int offset, int start, int end) {
+    int low = start;
+    int high = end;
+    assert(0 <= low);
+    assert(low < high);
+
+    final List<int> lineGraphemeBreaks = graphemeStarts;
+    assert(offset >= lineGraphemeBreaks[start]);
+    assert(offset < lineGraphemeBreaks.last, '$offset, $lineGraphemeBreaks');
+    assert(end == lineGraphemeBreaks.length || offset < lineGraphemeBreaks[end]);
+    while (low + 2 <= high) {
+      // high >= low + 2, so low + 1 <= mid <= high - 1
+      final int mid = (low + high) ~/ 2;
+      switch (lineGraphemeBreaks[mid] - offset) {
+        case > 0: high = mid;
+        case < 0: low = mid;
+        case == 0: return mid;
+      }
+    }
+
+    assert(lineGraphemeBreaks[low] <= offset);
+    assert(high == lineGraphemeBreaks.length || offset < lineGraphemeBreaks[high]);
+    return low;
+  }
+
+  /// Returns the UTF-16 range of the character that encloses the code unit at
+  /// the given offset.
+  ui.TextRange? getCharacterRangeAt(int codeUnitOffset) {
+    assert(codeUnitOffset >= this.startIndex);
+    if (codeUnitOffset >= visibleEndIndex || graphemeStarts.isEmpty) {
+      return null;
+    }
+
+    final int startIndex = graphemeStartIndexBefore(codeUnitOffset, 0, graphemeStarts.length);
+    assert(startIndex < graphemeStarts.length - 1);
+    return ui.TextRange(start: graphemeStarts[startIndex], end: graphemeStarts[startIndex + 1]);
+  }
+
+  LayoutFragment? closestFragmentTo(LayoutFragment targetFragment, bool searchLeft) {
+    ({LayoutFragment fragment, double distance})? closestFragment;
+    for (final LayoutFragment fragment in fragments) {
+      assert(fragment is! EllipsisFragment);
+      if (fragment.start >= visibleEndIndex) {
+        break;
+      }
+      if (fragment.graphemeStartIndexRange == null) {
+        continue;
+      }
+      final double distance = searchLeft
+        ? targetFragment.left - fragment.right
+        : fragment.left - targetFragment.right;
+      final double? minDistance = closestFragment?.distance;
+      switch (distance) {
+        case > 0.0 when minDistance == null || minDistance > distance:
+          closestFragment = (fragment: fragment, distance: distance);
+        case == 0.0: return fragment;
+        case _: continue;
+      }
+    }
+    return closestFragment?.fragment;
+  }
+
+  /// Finds the closest [LayoutFragment] to the given horizontal offset `dx` in
+  /// this line, that is not an [EllipsisFragment] and contains at least one
+  /// grapheme start.
+  LayoutFragment? closestFragmentAtOffset(double dx) {
+    if (graphemeStarts.isEmpty) {
+      return null;
+    }
+    assert(graphemeStarts.length >= 2);
+    int graphemeIndex = 0;
+    ({LayoutFragment fragment, double distance})? closestFragment;
+    for (final LayoutFragment fragment in fragments) {
+      assert(fragment is! EllipsisFragment);
+      if (fragment.start >= visibleEndIndex) {
+        break;
+      }
+      if (fragment.length == 0) {
+        continue;
+      }
+      while (fragment.start > graphemeStarts[graphemeIndex]) {
+        graphemeIndex += 1;
+      }
+      final int firstGraphemeStartInFragment = graphemeStarts[graphemeIndex];
+      if (firstGraphemeStartInFragment >= fragment.end) {
+        continue;
+      }
+      final double distance;
+      if (dx < fragment.left) {
+        distance = fragment.left - dx;
+      } else if (dx > fragment.right) {
+        distance = dx - fragment.right;
+      } else {
+        return fragment;
+      }
+      assert(distance > 0);
+
+      final double? minDistance = closestFragment?.distance;
+      if (minDistance == null || minDistance > distance) {
+        closestFragment = (fragment: fragment, distance: distance);
+      }
+    }
+    return closestFragment?.fragment;
+  }
+
   @override
   int get hashCode => Object.hash(
         lineMetrics,
@@ -321,6 +501,7 @@ class EngineParagraphStyle implements ui.ParagraphStyle {
         other.fontSize == fontSize &&
         other.height == height &&
         other._textHeightBehavior == _textHeightBehavior &&
+        other._strutStyle == _strutStyle &&
         other.ellipsis == ellipsis &&
         other.locale == locale;
   }
@@ -328,25 +509,28 @@ class EngineParagraphStyle implements ui.ParagraphStyle {
   @override
   int get hashCode {
     return Object.hash(
-        textAlign,
-        textDirection,
-        fontWeight,
-        fontStyle,
-        maxLines,
-        fontFamily,
-        fontSize,
-        height,
-        _textHeightBehavior,
-        ellipsis,
-        locale);
+      textAlign,
+      textDirection,
+      fontWeight,
+      fontStyle,
+      maxLines,
+      fontFamily,
+      fontSize,
+      height,
+      _textHeightBehavior,
+      _strutStyle,
+      ellipsis,
+      locale,
+    );
   }
 
   @override
   String toString() {
-    if (assertionsEnabled) {
+    String result = super.toString();
+    assert(() {
       final double? fontSize = this.fontSize;
       final double? height = this.height;
-      return 'ParagraphStyle('
+      result = 'ParagraphStyle('
           'textAlign: ${textAlign ?? "unspecified"}, '
           'textDirection: ${textDirection ?? "unspecified"}, '
           'fontWeight: ${fontWeight ?? "unspecified"}, '
@@ -356,12 +540,13 @@ class EngineParagraphStyle implements ui.ParagraphStyle {
           'fontFamily: ${fontFamily ?? "unspecified"}, '
           'fontSize: ${fontSize != null ? fontSize.toStringAsFixed(1) : "unspecified"}, '
           'height: ${height != null ? "${height.toStringAsFixed(1)}x" : "unspecified"}, '
+          'strutStyle: ${_strutStyle ?? "unspecified"}, '
           'ellipsis: ${ellipsis != null ? '"$ellipsis"' : "unspecified"}, '
           'locale: ${locale ?? "unspecified"}'
           ')';
-    } else {
-      return super.toString();
-    }
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -387,6 +572,7 @@ class EngineTextStyle implements ui.TextStyle {
     required double? letterSpacing,
     required double? wordSpacing,
     required double? height,
+    required ui.TextLeadingDistribution? leadingDistribution,
     required ui.Locale? locale,
     required ui.Paint? background,
     required ui.Paint? foreground,
@@ -414,6 +600,7 @@ class EngineTextStyle implements ui.TextStyle {
     this.letterSpacing,
     this.wordSpacing,
     this.height,
+    this.leadingDistribution,
     this.locale,
     this.background,
     this.foreground,
@@ -459,23 +646,25 @@ class EngineTextStyle implements ui.TextStyle {
   final double? letterSpacing;
   final double? wordSpacing;
   final double? height;
+  final ui.TextLeadingDistribution? leadingDistribution;
   final ui.Locale? locale;
   final ui.Paint? background;
   final ui.Paint? foreground;
   final List<ui.Shadow>? shadows;
 
+  static final List<String> _testFonts = <String>['FlutterTest', 'Ahem'];
   String get effectiveFontFamily {
-    if (assertionsEnabled) {
-      // In the flutter tester environment, we use a predictable-size font
-      // "Ahem". This makes widget tests predictable and less flaky.
-      if (ui.debugEmulateFlutterTesterEnvironment) {
-        return 'Ahem';
+    final String fontFamily = this.fontFamily.isEmpty ? StyleManager.defaultFontFamily : this.fontFamily;
+    // In the flutter tester environment, we use predictable-size test fonts.
+    // This makes widget tests predictable and less flaky.
+    String result = fontFamily;
+    assert(() {
+      if (ui_web.debugEmulateFlutterTesterEnvironment && !_testFonts.contains(fontFamily)) {
+        result = _testFonts.first;
       }
-    }
-    if (fontFamily.isEmpty) {
-      return FlutterViewEmbedder.defaultFontFamily;
-    }
-    return fontFamily;
+      return true;
+    }());
+    return result;
   }
 
   String? _cssFontString;
@@ -497,7 +686,7 @@ class EngineTextStyle implements ui.TextStyle {
   TextHeightStyle _createHeightStyle() {
     return TextHeightStyle(
       fontFamily: effectiveFontFamily,
-      fontSize: fontSize ?? FlutterViewEmbedder.defaultFontSize,
+      fontSize: fontSize ?? StyleManager.defaultFontSize,
       height: height,
       // TODO(mdebbar): Pass the actual value when font features become supported
       //                https://github.com/flutter/flutter/issues/64595
@@ -506,109 +695,77 @@ class EngineTextStyle implements ui.TextStyle {
     );
   }
 
-  EngineTextStyle copyWith({
-    ui.Color? color,
-    ui.TextDecoration? decoration,
-    ui.Color? decorationColor,
-    ui.TextDecorationStyle? decorationStyle,
-    double? decorationThickness,
-    ui.FontWeight? fontWeight,
-    ui.FontStyle? fontStyle,
-    ui.TextBaseline? textBaseline,
-    String? fontFamily,
-    List<String>? fontFamilyFallback,
-    double? fontSize,
-    double? letterSpacing,
-    double? wordSpacing,
-    double? height,
-    ui.Locale? locale,
-    ui.Paint? background,
-    ui.Paint? foreground,
-    List<ui.Shadow>? shadows,
-    List<ui.FontFeature>? fontFeatures,
-    List<ui.FontVariation>? fontVariations,
-  }) {
-    return EngineTextStyle(
-      color: color ?? this.color,
-      decoration: decoration ?? this.decoration,
-      decorationColor: decorationColor ?? this.decorationColor,
-      decorationStyle: decorationStyle ?? this.decorationStyle,
-      decorationThickness: decorationThickness ?? this.decorationThickness,
-      fontWeight: fontWeight ?? this.fontWeight,
-      fontStyle: fontStyle ?? this.fontStyle,
-      textBaseline: textBaseline ?? this.textBaseline,
-      fontFamily: fontFamily ?? this.fontFamily,
-      fontFamilyFallback: fontFamilyFallback ?? this.fontFamilyFallback,
-      fontSize: fontSize ?? this.fontSize,
-      letterSpacing: letterSpacing ?? this.letterSpacing,
-      wordSpacing: wordSpacing ?? this.wordSpacing,
-      height: height ?? this.height,
-      locale: locale ?? this.locale,
-      background: background ?? this.background,
-      foreground: foreground ?? this.foreground,
-      shadows: shadows ?? this.shadows,
-      fontFeatures: fontFeatures ?? this.fontFeatures,
-      fontVariations: fontVariations ?? this.fontVariations,
-    );
-  }
-
   @override
   bool operator ==(Object other) {
     if (identical(this, other)) {
       return true;
     }
-    if (other.runtimeType != runtimeType) {
-      return false;
-    }
-    return other is EngineTextStyle &&
-        other.color == color &&
-        other.decoration == decoration &&
-        other.decorationColor == decorationColor &&
-        other.decorationStyle == decorationStyle &&
-        other.fontWeight == fontWeight &&
-        other.fontStyle == fontStyle &&
-        other.textBaseline == textBaseline &&
-        other.fontFamily == fontFamily &&
-        other.fontSize == fontSize &&
-        other.letterSpacing == letterSpacing &&
-        other.wordSpacing == wordSpacing &&
-        other.height == height &&
-        other.locale == locale &&
-        other.background == background &&
-        other.foreground == foreground &&
-        listEquals<ui.Shadow>(other.shadows, shadows) &&
-        listEquals<String>(other.fontFamilyFallback, fontFamilyFallback);
+    return other is EngineTextStyle
+        && other.color == color
+        && other.decoration == decoration
+        && other.decorationColor == decorationColor
+        && other.decorationStyle == decorationStyle
+        && other.fontWeight == fontWeight
+        && other.fontStyle == fontStyle
+        && other.textBaseline == textBaseline
+        && other.leadingDistribution == leadingDistribution
+        && other.fontFamily == fontFamily
+        && other.fontSize == fontSize
+        && other.letterSpacing == letterSpacing
+        && other.wordSpacing == wordSpacing
+        && other.height == height
+        && other.decorationThickness == decorationThickness
+        && other.locale == locale
+        && other.background == background
+        && other.foreground == foreground
+        && listEquals<ui.Shadow>(other.shadows, shadows)
+        && listEquals<String>(other.fontFamilyFallback, fontFamilyFallback)
+        && listEquals<ui.FontFeature>(other.fontFeatures, fontFeatures)
+        && listEquals<ui.FontVariation>(other.fontVariations, fontVariations);
   }
 
   @override
-  int get hashCode => Object.hash(
-        color,
-        decoration,
-        decorationColor,
-        decorationStyle,
-        decorationThickness,
-        fontWeight,
-        fontStyle,
-        textBaseline,
-        fontFamily,
-        fontFamilyFallback,
-        fontSize,
-        letterSpacing,
-        wordSpacing,
-        height,
-        locale,
-        background,
-        foreground,
-        shadows,
-      );
+  int get hashCode {
+    final List<ui.Shadow>? shadows = this.shadows;
+    final List<ui.FontFeature>? fontFeatures = this.fontFeatures;
+    final List<ui.FontVariation>? fontVariations = this.fontVariations;
+    final List<String>? fontFamilyFallback = this.fontFamilyFallback;
+    return Object.hash(
+      color,
+      decoration,
+      decorationColor,
+      decorationStyle,
+      fontWeight,
+      fontStyle,
+      textBaseline,
+      leadingDistribution,
+      fontFamily,
+      fontFamilyFallback == null ? null : Object.hashAll(fontFamilyFallback),
+      fontSize,
+      letterSpacing,
+      wordSpacing,
+      height,
+      locale,
+      background,
+      foreground,
+      shadows == null ? null : Object.hashAll(shadows),
+      decorationThickness,
+      // Object.hash goes up to 20 arguments, but we have 21
+      Object.hash(
+        fontFeatures == null ? null : Object.hashAll(fontFeatures),
+        fontVariations == null ? null : Object.hashAll(fontVariations),
+      )
+    );
+  }
 
   @override
   String toString() {
-    if (assertionsEnabled) {
+    String result = super.toString();
+    assert(() {
       final List<String>? fontFamilyFallback = this.fontFamilyFallback;
       final double? fontSize = this.fontSize;
       final double? height = this.height;
-      return 'TextStyle('
+      result = 'TextStyle('
           'color: ${color ?? "unspecified"}, '
           'decoration: ${decoration ?? "unspecified"}, '
           'decorationColor: ${decorationColor ?? "unspecified"}, '
@@ -623,6 +780,7 @@ class EngineTextStyle implements ui.TextStyle {
           'letterSpacing: ${letterSpacing != null ? "${letterSpacing}x" : "unspecified"}, '
           'wordSpacing: ${wordSpacing != null ? "${wordSpacing}x" : "unspecified"}, '
           'height: ${height != null ? "${height.toStringAsFixed(1)}x" : "unspecified"}, '
+          'leadingDistribution: ${leadingDistribution ?? "unspecified"}, '
           'locale: ${locale ?? "unspecified"}, '
           'background: ${background ?? "unspecified"}, '
           'foreground: ${foreground ?? "unspecified"}, '
@@ -630,9 +788,9 @@ class EngineTextStyle implements ui.TextStyle {
           'fontFeatures: ${fontFeatures ?? "unspecified"}, '
           'fontVariations: ${fontVariations ?? "unspecified"}'
           ')';
-    } else {
-      return super.toString();
-    }
+      return true;
+    }());
+    return result;
   }
 }
 
@@ -689,9 +847,11 @@ class EngineStrutStyle implements ui.StrutStyle {
   }
 
   @override
-  int get hashCode => Object.hash(
+  int get hashCode {
+    final List<String>? fontFamilyFallback = _fontFamilyFallback;
+    return Object.hash(
         _fontFamily,
-        _fontFamilyFallback,
+        fontFamilyFallback != null ? Object.hashAll(fontFamilyFallback) : null,
         _fontSize,
         _height,
         _leading,
@@ -700,6 +860,7 @@ class EngineStrutStyle implements ui.StrutStyle {
         _fontStyle,
         _forceStrutHeight,
       );
+  }
 }
 
 /// Holds information for a placeholder in a paragraph.
@@ -733,12 +894,18 @@ class ParagraphPlaceholder {
   final ui.TextBaseline baseline;
 }
 
-/// Converts [fontWeight] to its CSS equivalent value.
-String? fontWeightToCss(ui.FontWeight? fontWeight) {
-  if (fontWeight == null) {
-    return null;
+extension FontStyleExtension on ui.FontStyle {
+  /// Converts a [ui.FontStyle] value to its CSS equivalent.
+  String toCssString() {
+    return this == ui.FontStyle.normal ? 'normal' : 'italic';
+  }
+}
+
+extension FontWeightExtension on ui.FontWeight {
+  /// Converts a [ui.FontWeight] value to its CSS equivalent.
+  String toCssString() {
+    return fontWeightIndexToCss(fontWeightIndex: index);
   }
-  return fontWeightIndexToCss(fontWeightIndex: fontWeight.index);
 }
 
 String fontWeightIndexToCss({int fontWeightIndex = 3}) {
@@ -778,8 +945,6 @@ void applyTextStyleToElement({
   required DomElement element,
   required EngineTextStyle style,
 }) {
-  assert(element != null);
-  assert(style != null);
   bool updateDecoration = false;
   final DomCSSStyleDeclaration cssStyle = element.style;
 
@@ -797,28 +962,27 @@ void applyTextStyleToElement({
     final double adaptedWidth = strokeWidth != null && strokeWidth > 0
         ? strokeWidth
         : 1.0 / ui.window.devicePixelRatio;
-    cssStyle.textStroke = '${adaptedWidth}px ${colorToCssString(color)}';
+    cssStyle.textStroke = '${adaptedWidth}px ${color?.toCssString()}';
   } else if (color != null) {
-    cssStyle.color = colorToCssString(color)!;
+    cssStyle.color = color.toCssString();
   }
   final ui.Color? background = style.background?.color;
   if (background != null) {
-    cssStyle.backgroundColor = colorToCssString(background)!;
+    cssStyle.backgroundColor = background.toCssString();
   }
   final double? fontSize = style.fontSize;
   if (fontSize != null) {
     cssStyle.fontSize = '${fontSize.floor()}px';
   }
   if (style.fontWeight != null) {
-    cssStyle.fontWeight = fontWeightToCss(style.fontWeight)!;
+    cssStyle.fontWeight = style.fontWeight!.toCssString();
   }
   if (style.fontStyle != null) {
-    cssStyle.fontStyle =
-        style.fontStyle == ui.FontStyle.normal ? 'normal' : 'italic';
+    cssStyle.fontStyle = style.fontStyle!.toCssString();
   }
   // For test environment use effectiveFontFamily since we need to
-  // consistently use Ahem font.
-  if (ui.debugEmulateFlutterTesterEnvironment) {
+  // consistently use the correct test font.
+  if (ui_web.debugEmulateFlutterTesterEnvironment) {
     cssStyle.fontFamily = canonicalizeFontFamily(style.effectiveFontFamily)!;
   } else {
     cssStyle.fontFamily = canonicalizeFontFamily(style.fontFamily)!;
@@ -849,7 +1013,7 @@ void applyTextStyleToElement({
         }
         final ui.Color? decorationColor = style.decorationColor;
         if (decorationColor != null) {
-          cssStyle.textDecorationColor = colorToCssString(decorationColor)!;
+          cssStyle.textDecorationColor = decorationColor.toCssString();
         }
       }
     }
@@ -884,7 +1048,7 @@ String _shadowListToCss(List<ui.Shadow> shadows) {
     }
     final ui.Shadow shadow = shadows[i];
     sb.write('${shadow.offset.dx}px ${shadow.offset.dy}px '
-        '${shadow.blurRadius}px ${colorToCssString(shadow.color)}');
+        '${shadow.blurRadius}px ${shadow.color.toCssString()}');
   }
   return sb.toString();
 }
diff --git a/lib/web_ui/lib/src/engine/text/ruler.dart b/lib/web_ui/lib/src/engine/text/ruler.dart
index bce0e6bbd08ff615ecd8439b098c4dd1b9eed534..990299699cd48694854b53575fe198040ff44307 100644
--- a/lib/web_ui/lib/src/engine/text/ruler.dart
+++ b/lib/web_ui/lib/src/engine/text/ruler.dart
@@ -3,11 +3,12 @@
 // found in the LICENSE file.
 
 import 'package:ui/ui.dart' as ui;
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
 import '../browser_detection.dart';
 import '../dom.dart';
-import '../embedder.dart';
 import '../util.dart';
+import '../view_embedder/style_manager.dart';
 import 'measurement.dart';
 import 'paragraph.dart';
 
@@ -17,33 +18,12 @@ String buildCssFontString({
   required double? fontSize,
   required String fontFamily,
 }) {
-  final StringBuffer result = StringBuffer();
+  final String cssFontStyle = fontStyle?.toCssString() ?? StyleManager.defaultFontStyle;
+  final String cssFontWeight = fontWeight?.toCssString() ?? StyleManager.defaultFontWeight;
+  final int cssFontSize = (fontSize ?? StyleManager.defaultFontSize).floor();
+  final String cssFontFamily = canonicalizeFontFamily(fontFamily)!;
 
-  // Font style
-  if (fontStyle != null) {
-    result.write(fontStyle == ui.FontStyle.normal ? 'normal' : 'italic');
-  } else {
-    result.write(FlutterViewEmbedder.defaultFontStyle);
-  }
-  result.write(' ');
-
-  // Font weight.
-  if (fontWeight != null) {
-    result.write(fontWeightToCss(fontWeight));
-  } else {
-    result.write(FlutterViewEmbedder.defaultFontWeight);
-  }
-  result.write(' ');
-
-  if (fontSize != null) {
-    result.write(fontSize.floor());
-  } else {
-    result.write(FlutterViewEmbedder.defaultFontSize);
-  }
-  result.write('px ');
-  result.write(canonicalizeFontFamily(fontFamily));
-
-  return result.toString();
+  return '$cssFontStyle $cssFontWeight ${cssFontSize}px $cssFontFamily';
 }
 
 /// Contains all styles that have an effect on the height of text.
@@ -119,8 +99,11 @@ class TextDimensions {
       ..fontFamily = canonicalizeFontFamily(fontFamily)!;
 
     final double? height = textHeightStyle.height;
-    if (height != null) {
-      style.lineHeight = height.toString();
+    // Workaround the rounding introduced by https://github.com/flutter/flutter/issues/122066
+    // in tests.
+    final double? effectiveLineHeight = height ?? (fontFamily == 'FlutterTest' ? 1.0 : null);
+    if (effectiveLineHeight != null) {
+      style.lineHeight = effectiveLineHeight.toString();
     }
     _invalidateBoundsCache();
   }
@@ -141,7 +124,7 @@ class TextDimensions {
     if (browserEngine == BrowserEngine.firefox &&
       // In the flutter tester environment, we use a predictable-size for font
       // measurement tests.
-      !ui.debugEmulateFlutterTesterEnvironment) {
+      !ui_web.debugEmulateFlutterTesterEnvironment) {
       // See subpixel rounding bug :
       // https://bugzilla.mozilla.org/show_bug.cgi?id=442139
       // This causes bottom of letters such as 'y' to be cutoff and
@@ -194,9 +177,10 @@ class TextHeightRuler {
       ..border = '0'
       ..padding = '0';
 
-    if (assertionsEnabled) {
+    assert(() {
       host.setAttribute('data-ruler', 'line-height');
-    }
+      return true;
+    }());
 
     _dimensions.applyHeightStyle(textHeightStyle);
 
@@ -208,8 +192,6 @@ class TextHeightRuler {
 
     _dimensions.appendToHost(host);
 
-    // [rulerHost] is not migrated yet so add a cast to [html.HtmlElement].
-    // This cast will be removed after the migration is complete.
     rulerHost.addElement(host);
     return host;
   }
diff --git a/lib/web_ui/lib/src/engine/text/unicode_range.dart b/lib/web_ui/lib/src/engine/text/unicode_range.dart
index 0e280cc6ae8bcb08a6d8b61a5c2384667159d00c..d612efb80a322e25170fb1d5878caecc774a4a70 100644
--- a/lib/web_ui/lib/src/engine/text/unicode_range.dart
+++ b/lib/web_ui/lib/src/engine/text/unicode_range.dart
@@ -170,10 +170,8 @@ class UnicodePropertyLookup<P> {
       switch (range.compare(value)) {
         case _ComparisonResult.higher:
           min = mid + 1;
-          break;
         case _ComparisonResult.lower:
           max = mid;
-          break;
         case _ComparisonResult.inside:
           return mid;
       }
@@ -253,16 +251,16 @@ int _consumeInt(String packedData, int index) {
   //
   // But using substring is slow when called too many times. This custom
   // implementation makes the unpacking 25%-45% faster than using substring.
-  final int digit0 = _getIntFromCharCode(packedData.codeUnitAt(index + 3));
-  final int digit1 = _getIntFromCharCode(packedData.codeUnitAt(index + 2));
-  final int digit2 = _getIntFromCharCode(packedData.codeUnitAt(index + 1));
-  final int digit3 = _getIntFromCharCode(packedData.codeUnitAt(index));
+  final int digit0 = getIntFromCharCode(packedData.codeUnitAt(index + 3));
+  final int digit1 = getIntFromCharCode(packedData.codeUnitAt(index + 2));
+  final int digit2 = getIntFromCharCode(packedData.codeUnitAt(index + 1));
+  final int digit3 = getIntFromCharCode(packedData.codeUnitAt(index));
   return digit0 + (digit1 * 36) + (digit2 * 36 * 36) + (digit3 * 36 * 36 * 36);
 }
 
 /// Does the same thing as [int.parse(str, 36)] but takes only a single
 /// character as a [charCode] integer.
-int _getIntFromCharCode(int charCode) {
+int getIntFromCharCode(int charCode) {
   assert((charCode >= kChar_0 && charCode <= kChar_9) ||
       (charCode >= kChar_a && charCode <= kChar_z));
 
diff --git a/lib/web_ui/lib/src/engine/text/word_breaker.dart b/lib/web_ui/lib/src/engine/text/word_breaker.dart
index 1e4fd51920006c31db86fbef755eaebf9974c60b..55a395cbad545ee54720b8f59f1f8feb54b955a3 100644
--- a/lib/web_ui/lib/src/engine/text/word_breaker.dart
+++ b/lib/web_ui/lib/src/engine/text/word_breaker.dart
@@ -5,21 +5,17 @@
 import '../util.dart';
 import 'word_break_properties.dart';
 
-class _FindBreakDirection {
-  const _FindBreakDirection({required this.step});
+enum _FindBreakDirection {
+  forward(step: 1),
+  backward(step: -1);
 
-  static const _FindBreakDirection forward = _FindBreakDirection(step: 1);
-  static const _FindBreakDirection backward = _FindBreakDirection(step: -1);
+  const _FindBreakDirection({required this.step});
 
   final int step;
 }
 
 /// [WordBreaker] exposes static methods to identify word boundaries.
-abstract class WordBreaker {
-  // This class is not meant to be instantiated or extended; this constructor
-  // prevents instantiation and extension.
-  WordBreaker._();
-
+abstract final class WordBreaker {
   /// It starts from [index] and tries to find the next word boundary in [text].
   static int nextBreakIndex(String text, int index) =>
       _findBreakIndex(_FindBreakDirection.forward, text, index);
diff --git a/lib/web_ui/lib/src/engine/text_editing/autofill_hint.dart b/lib/web_ui/lib/src/engine/text_editing/autofill_hint.dart
index 7ee1cfb732431510bc2fcf3abe1159f3919d67d3..392998111c04894945973d7479a40ab930cb31f0 100644
--- a/lib/web_ui/lib/src/engine/text_editing/autofill_hint.dart
+++ b/lib/web_ui/lib/src/engine/text_editing/autofill_hint.dart
@@ -33,7 +33,7 @@ class BrowserAutofillHints {
           'impp': 'impp',
           'jobTitle': 'organization-title',
           'language': 'language',
-          'middleName': 'middleName',
+          'middleName': 'additional-name',
           'name': 'name',
           'namePrefix': 'honorific-prefix',
           'nameSuffix': 'honorific-suffix',
diff --git a/lib/web_ui/lib/src/engine/text_editing/composition_aware_mixin.dart b/lib/web_ui/lib/src/engine/text_editing/composition_aware_mixin.dart
index 7ba45ad442f5bab5f5797998d860262eb45cee88..71294e25d79308852475088cd8ed8043f254eae8 100644
--- a/lib/web_ui/lib/src/engine/text_editing/composition_aware_mixin.dart
+++ b/lib/web_ui/lib/src/engine/text_editing/composition_aware_mixin.dart
@@ -2,8 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:js_interop';
+
 import '../dom.dart';
-import '../safe_browser_api.dart';
 import 'text_editing.dart';
 
 /// Provides default functionality for listening to HTML composition events.
@@ -30,11 +31,11 @@ mixin CompositionAwareMixin {
   static const String _kCompositionEnd = 'compositionend';
 
   late final DomEventListener _compositionStartListener =
-      allowInterop(_handleCompositionStart);
+      createDomEventListener(_handleCompositionStart);
   late final DomEventListener _compositionUpdateListener =
-      allowInterop(_handleCompositionUpdate);
+      createDomEventListener(_handleCompositionUpdate);
   late final DomEventListener _compositionEndListener =
-      allowInterop(_handleCompositionEnd);
+      createDomEventListener(_handleCompositionEnd);
 
   /// The currently composing text in the `domElement`.
   ///
@@ -55,26 +56,26 @@ mixin CompositionAwareMixin {
     domElement.removeEventListener(_kCompositionEnd, _compositionEndListener);
   }
 
-  void _handleCompositionStart(DomEvent event) {
+  JSVoid _handleCompositionStart(DomEvent event) {
     composingText = null;
   }
 
-  void _handleCompositionUpdate(DomEvent event) {
+  JSVoid _handleCompositionUpdate(DomEvent event) {
     if (domInstanceOfString(event, 'CompositionEvent')) {
       composingText = (event as DomCompositionEvent).data;
     }
   }
 
-  void _handleCompositionEnd(DomEvent event) {
+  JSVoid _handleCompositionEnd(DomEvent event) {
     composingText = null;
   }
 
   EditingState determineCompositionState(EditingState editingState) {
-    if (editingState.baseOffset == null || composingText == null || editingState.text == null) {
+    if (editingState.extentOffset == null || composingText == null || editingState.text == null) {
       return editingState;
     }
 
-    final int composingBase = editingState.baseOffset! - composingText!.length;
+    final int composingBase = editingState.extentOffset! - composingText!.length;
 
     if (composingBase < 0) {
       return editingState;
diff --git a/lib/web_ui/lib/src/engine/text_editing/input_type.dart b/lib/web_ui/lib/src/engine/text_editing/input_type.dart
index c9f07c5d3270e0ab3171581edb4397dd2b393185..20cceedf4ff5672af4bd58db25ff50ccf2a9aad3 100644
--- a/lib/web_ui/lib/src/engine/text_editing/input_type.dart
+++ b/lib/web_ui/lib/src/engine/text_editing/input_type.dart
@@ -14,7 +14,7 @@ import '../dom.dart';
 abstract class EngineInputType {
   const EngineInputType();
 
-  static EngineInputType fromName(String name, {bool isDecimal = false}) {
+  static EngineInputType fromName(String name, {bool isDecimal = false, bool isMultiline = false}) {
     switch (name) {
       case 'TextInputType.number':
         return isDecimal ? decimal : number;
@@ -27,7 +27,7 @@ abstract class EngineInputType {
       case 'TextInputType.multiline':
         return multiline;
       case 'TextInputType.none':
-        return none;
+        return isMultiline ? multilineNone : none;
       case 'TextInputType.text':
       default:
         return text;
@@ -37,6 +37,9 @@ abstract class EngineInputType {
   /// No text input.
   static const NoTextInputType none = NoTextInputType();
 
+  /// Multi-line no text input.
+  static const MultilineNoTextInputType multilineNone = MultilineNoTextInputType();
+
   /// Single-line text input type.
   static const TextInputType text = TextInputType();
 
@@ -94,6 +97,31 @@ class NoTextInputType extends EngineInputType {
   String get inputmodeAttribute => 'none';
 }
 
+/// See: https://github.com/flutter/flutter/issues/125875
+/// Multi-line no text input from system virtual keyboard.
+///
+/// Use this for inputting multiple lines with a customized keyboard.
+///
+/// When Flutter uses a custom virtual keyboard, it sends [TextInputType.none]
+/// with a [isMultiline] flag to block the system virtual keyboard.
+///
+/// For [MultilineNoTextInputType] (mapped to [TextInputType.none] with
+/// [isMultiline] = true), it creates a <textarea> element with the
+/// inputmode="none" attribute.
+///
+/// For [NoTextInputType] (mapped to [TextInputType.none] with
+/// [isMultiline] = false), it creates an <input> element with the
+/// inputmode="none" attribute.
+class MultilineNoTextInputType extends MultilineInputType {
+  const MultilineNoTextInputType();
+
+  @override
+  String? get inputmodeAttribute => 'none';
+
+  @override
+  DomHTMLElement createDomElement() => createDomHTMLTextAreaElement();
+}
+
 /// Single-line text input type.
 class TextInputType extends EngineInputType {
   const TextInputType();
diff --git a/lib/web_ui/lib/src/engine/text_editing/text_capitalization.dart b/lib/web_ui/lib/src/engine/text_editing/text_capitalization.dart
index b871b737d7e7f763eff43db2ff4115765415c5e7..865725f0bedb4abf1ee25fc3f1a0de9ef6e53b7d 100644
--- a/lib/web_ui/lib/src/engine/text_editing/text_capitalization.dart
+++ b/lib/web_ui/lib/src/engine/text_editing/text_capitalization.dart
@@ -69,13 +69,10 @@ class TextCapitalizationConfig {
         } else {
           autocapitalize = 'words';
         }
-        break;
       case TextCapitalization.characters:
         autocapitalize = 'characters';
-        break;
       case TextCapitalization.sentences:
         autocapitalize = 'sentences';
-        break;
       case TextCapitalization.none:
       default:
         autocapitalize = 'off';
diff --git a/lib/web_ui/lib/src/engine/text_editing/text_editing.dart b/lib/web_ui/lib/src/engine/text_editing/text_editing.dart
index 76b5b4543ca2ae18d140637233b65d83945a95cc..672a5ad3be61d8089f2509eed33fd6ad28a1760f 100644
--- a/lib/web_ui/lib/src/engine/text_editing/text_editing.dart
+++ b/lib/web_ui/lib/src/engine/text_editing/text_editing.dart
@@ -11,8 +11,7 @@ import 'package:ui/ui.dart' as ui;
 
 import '../browser_detection.dart';
 import '../dom.dart';
-import '../embedder.dart';
-import '../host_node.dart';
+import '../mouse/prevent_default.dart';
 import '../platform_dispatcher.dart';
 import '../safe_browser_api.dart';
 import '../semantics.dart';
@@ -34,6 +33,9 @@ bool _debugPrintTextInputCommands = false;
 /// The `keyCode` of the "Enter" key.
 const int _kReturnKeyCode = 13;
 
+/// Offset in pixels to place an element outside of the screen.
+const int offScreenOffset = -9999;
+
 /// Blink and Webkit engines, bring an overlay on top of the text field when it
 /// is autofilled.
 bool browserHasAutofillOverlay() =>
@@ -48,7 +50,9 @@ void _emptyCallback(dynamic _) {}
 
 /// The default [HostNode] that hosts all DOM required for text editing when a11y is not enabled.
 @visibleForTesting
-HostNode get defaultTextEditingRoot => flutterViewEmbedder.glassPaneShadow!;
+// TODO(mdebbar): There could be multiple views with multiple text editing hosts.
+//                https://github.com/flutter/flutter/issues/137344
+DomElement get defaultTextEditingRoot => EnginePlatformDispatcher.instance.implicitView!.dom.textEditingHost;
 
 /// These style attributes are constant throughout the life time of an input
 /// element.
@@ -98,8 +102,12 @@ void _setStaticStyleAttributes(DomHTMLElement domElement) {
 /// element.
 ///
 /// They are assigned once during the creation of the DOM element.
-void _hideAutofillElements(DomHTMLElement domElement,
-    {bool isOffScreen = false}) {
+void _styleAutofillElements(
+  DomHTMLElement domElement, {
+  bool isOffScreen = false,
+  bool shouldHideElement = true,
+  bool shouldDisablePointerEvents = false,
+}) {
   final DomCSSStyleDeclaration elementStyle = domElement.style;
   elementStyle
     ..whiteSpace = 'pre-wrap'
@@ -112,15 +120,23 @@ void _hideAutofillElements(DomHTMLElement domElement,
     ..outline = 'none'
     ..border = 'none'
     ..resize = 'none'
-    ..width = '0'
-    ..height = '0'
     ..textShadow = 'transparent'
     ..transformOrigin = '0 0 0';
 
   if (isOffScreen) {
     elementStyle
-      ..top = '-9999px'
-      ..left = '-9999px';
+      ..top = '${offScreenOffset}px'
+      ..left = '${offScreenOffset}px';
+  }
+
+  if (shouldHideElement) {
+    elementStyle
+      ..width = '0'
+      ..height = '0';
+  }
+
+  if (shouldDisablePointerEvents) {
+    elementStyle.pointerEvents = 'none';
   }
 
   if (browserHasAutofillOverlay()) {
@@ -142,6 +158,7 @@ class EngineAutofillForm {
     this.elements,
     this.items,
     this.formIdentifier = '',
+    this.insertionReferenceNode,
   });
 
   final DomHTMLFormElement formElement;
@@ -150,6 +167,7 @@ class EngineAutofillForm {
 
   final Map<String, AutofillInfo>? items;
 
+  final DomHTMLElement? insertionReferenceNode;
   /// Identifier for the form.
   ///
   /// It is constructed by concatenating unique ids of input elements on the
@@ -186,16 +204,19 @@ class EngineAutofillForm {
     final Map<String, DomHTMLElement> elements = <String, DomHTMLElement>{};
     final Map<String, AutofillInfo> items = <String, AutofillInfo>{};
     final DomHTMLFormElement formElement = createDomHTMLFormElement();
+    final bool isSafariDesktopStrategy = textEditing.strategy is SafariDesktopTextEditingStrategy;
+    DomHTMLElement? insertionReferenceNode;
 
     // Validation is in the framework side.
     formElement.noValidate = true;
     formElement.method = 'post';
     formElement.action = '#';
-    formElement.addEventListener('submit', allowInterop((DomEvent e) {
-      e.preventDefault();
-    }));
+    formElement.addEventListener('submit', preventDefaultListener);
 
-    _hideAutofillElements(formElement);
+    // We need to explicitly disable pointer events on the form in Safari Desktop,
+    // so that we don't have pointer event collisions if users hover over or click
+    // into the invisible autofill elements within the form.
+    _styleAutofillElements(formElement, shouldDisablePointerEvents: isSafariDesktopStrategy);
 
     // We keep the ids in a list then sort them later, in case the text fields'
     // locations are re-ordered on the framework side.
@@ -206,6 +227,7 @@ class EngineAutofillForm {
         AutofillInfo.fromFrameworkMessage(focusedElementAutofill);
 
     if (fields != null) {
+      bool fieldIsFocusedElement = false;
       for (final Map<String, dynamic> field in
           fields.cast<Map<String, dynamic>>()) {
         final Map<String, dynamic> autofillInfo = field.readJson('autofill');
@@ -226,11 +248,31 @@ class EngineAutofillForm {
           final DomHTMLElement htmlElement = engineInputType.createDomElement();
           autofill.editingState.applyToDomElement(htmlElement);
           autofill.applyToDomElement(htmlElement);
-          _hideAutofillElements(htmlElement);
+
+          // Safari Desktop does not respect elements that are invisible (or
+          // have no size) and that leads to issues with autofill only partially
+          // working (ref: https://github.com/flutter/flutter/issues/71275).
+          // Thus, we have to make sure that the elements remain invisible to users,
+          // but not to Safari for autofill to work. Since these elements are
+          // sized and placed on the DOM, we also have to disable pointer events.
+          _styleAutofillElements(htmlElement,
+              shouldHideElement: !isSafariDesktopStrategy,
+              shouldDisablePointerEvents: isSafariDesktopStrategy);
 
           items[autofill.uniqueIdentifier] = autofill;
           elements[autofill.uniqueIdentifier] = htmlElement;
           formElement.append(htmlElement);
+
+          // We want to track the node in the position directly after our focused
+          // element, so we can later insert that element in the correct position
+          // right before this node.
+          if(fieldIsFocusedElement){
+            insertionReferenceNode = htmlElement;
+            fieldIsFocusedElement = false;
+          }
+        } else {
+          // current field is the focused element that we create elsewhere
+          fieldIsFocusedElement = true;
         }
       }
     } else {
@@ -259,28 +301,41 @@ class EngineAutofillForm {
     // In order to submit the form when Framework sends a `TextInput.commit`
     // message, we add a submit button to the form.
     final DomHTMLInputElement submitButton = createDomHTMLInputElement();
-    _hideAutofillElements(submitButton, isOffScreen: true);
+    _styleAutofillElements(submitButton, isOffScreen: true);
     submitButton.className = 'submitBtn';
     submitButton.type = 'submit';
 
     formElement.append(submitButton);
 
+    // If the focused node is at the end of the form, we'll default to inserting
+    // it before the submit field.
+    insertionReferenceNode ??= submitButton;
+
     return EngineAutofillForm(
       formElement: formElement,
       elements: elements,
       items: items,
       formIdentifier: formIdentifier,
+      insertionReferenceNode: insertionReferenceNode
     );
   }
 
   void placeForm(DomHTMLElement mainTextEditingElement) {
-    formElement.append(mainTextEditingElement);
+    // Since we're disabling pointer events on the form to fix Safari autofill,
+    // we need to explicitly set pointer events on the active input element in
+    // order to calculate the correct pointer event offsets.
+    // See: https://github.com/flutter/flutter/issues/136006
+    if(textEditing.strategy is SafariDesktopTextEditingStrategy) {
+      mainTextEditingElement.style.pointerEvents = 'all';
+    }
+
+    formElement.insertBefore(mainTextEditingElement, insertionReferenceNode);
     defaultTextEditingRoot.append(formElement);
   }
 
   void storeForm() {
     formsOnTheDom[formIdentifier] = formElement;
-    _hideAutofillElements(formElement, isOffScreen: true);
+    _styleAutofillElements(formElement, isOffScreen: true);
   }
 
   /// Listens to `onInput` event on the form fields.
@@ -301,7 +356,7 @@ class EngineAutofillForm {
         final DomElement element = elements![key]!;
         subscriptions.add(
             DomSubscription(element, 'input',
-                allowInterop((DomEvent e) {
+                (DomEvent e) {
                   if (items![key] == null) {
                     throw StateError(
                         'AutofillInfo must have a valid uniqueIdentifier.');
@@ -309,7 +364,7 @@ class EngineAutofillForm {
                     final AutofillInfo autofillInfo = items![key]!;
                     handleChange(element, autofillInfo);
                   }
-                })));
+                }));
     }
 
     keys.forEach(addSubscriptionForKey);
@@ -357,7 +412,6 @@ class AutofillInfo {
   factory AutofillInfo.fromFrameworkMessage(Map<String, dynamic> autofill,
       {TextCapitalizationConfig textCapitalization =
           const TextCapitalizationConfig.defaultCapitalization()}) {
-    assert(autofill != null);
     final String uniqueIdentifier = autofill.readString('uniqueIdentifier');
     final List<dynamic>? hintsList = autofill.tryList('hints');
     final String? firstHint = (hintsList == null || hintsList.isEmpty) ? null : hintsList.first as String;
@@ -500,7 +554,7 @@ class TextEditingDeltaState {
     if (isTextBeingRemoved) {
       // When text is deleted outside of the composing region or is cut using the native toolbar,
       // we calculate the length of the deleted text by comparing the new and old editing state lengths.
-      // If the deletion is backward, the length is susbtracted from the [deltaEnd]
+      // If the deletion is backward, the length is subtracted from the [deltaEnd]
       // that we set when beforeinput was fired to determine the [deltaStart].
       // If the deletion is forward, [deltaStart] is set to the new editing state baseOffset
       // and [deltaEnd] is set to [deltaStart] incremented by the length of the deletion.
@@ -514,9 +568,10 @@ class TextEditingDeltaState {
         newTextEditingDeltaState.deltaEnd = newTextEditingDeltaState.deltaStart + deletedLength;
       }
     } else if (isTextBeingChangedAtActiveSelection) {
+      final bool isPreviousSelectionInverted = lastEditingState!.baseOffset! > lastEditingState.extentOffset!;
       // When a selection of text is replaced by a copy/paste operation we set the starting range
       // of the delta to be the beginning of the selection of the previous editing state.
-      newTextEditingDeltaState.deltaStart = lastEditingState!.baseOffset!;
+      newTextEditingDeltaState.deltaStart = isPreviousSelectionInverted ? lastEditingState.extentOffset! : lastEditingState.baseOffset!;
     }
 
     // If we are composing then set the delta range to the composing region we
@@ -722,17 +777,31 @@ class EditingState {
   factory EditingState.fromDomElement(DomHTMLElement? domElement) {
     if (domInstanceOfString(domElement, 'HTMLInputElement')) {
       final DomHTMLInputElement element = domElement! as DomHTMLInputElement;
-      return EditingState(
-          text: element.value,
-          baseOffset: element.selectionStart?.toInt(),
-          extentOffset: element.selectionEnd?.toInt());
+      if (element.selectionDirection == 'backward') {
+        return EditingState(
+            text: element.value,
+            baseOffset: element.selectionEnd?.toInt(),
+            extentOffset: element.selectionStart?.toInt());
+      } else {
+        return EditingState(
+            text: element.value,
+            baseOffset: element.selectionStart?.toInt(),
+            extentOffset: element.selectionEnd?.toInt());
+        }
     } else if (domInstanceOfString(domElement, 'HTMLTextAreaElement')) {
       final DomHTMLTextAreaElement element = domElement! as
           DomHTMLTextAreaElement;
-      return EditingState(
-          text: element.value,
-          baseOffset: element.selectionStart?.toInt(),
-          extentOffset: element.selectionEnd?.toInt());
+      if (element.selectionDirection == 'backward') {
+        return EditingState(
+            text: element.value,
+            baseOffset: element.selectionEnd?.toInt(),
+            extentOffset: element.selectionStart?.toInt());
+      } else {
+        return EditingState(
+            text: element.value,
+            baseOffset: element.selectionStart?.toInt(),
+            extentOffset: element.selectionEnd?.toInt());
+      }
     } else {
       throw UnsupportedError('Initialized with unsupported input type');
     }
@@ -811,9 +880,12 @@ class EditingState {
 
   @override
   String toString() {
-    return assertionsEnabled
-        ? 'EditingState("$text", base:$baseOffset, extent:$extentOffset, composingBase:$composingBaseOffset, composingExtent:$composingExtentOffset)'
-        : super.toString();
+    String result = super.toString();
+    assert(() {
+      result = 'EditingState("$text", base:$baseOffset, extent:$extentOffset, composingBase:$composingBaseOffset, composingExtent:$composingExtentOffset)';
+      return true;
+    }());
+    return result;
   }
 
   /// Sets the selection values of a DOM element using this [EditingState].
@@ -889,6 +961,7 @@ class InputConfiguration {
       : inputType = EngineInputType.fromName(
           flutterInputConfiguration.readJson('inputType').readString('name'),
           isDecimal: flutterInputConfiguration.readJson('inputType').tryBool('decimal') ?? false,
+          isMultiline: flutterInputConfiguration.readJson('inputType').tryBool('isMultiline') ?? false,
         ),
         inputAction =
             flutterInputConfiguration.tryString('inputAction') ?? 'TextInputAction.done',
@@ -1052,24 +1125,35 @@ class SafariDesktopTextEditingStrategy extends DefaultTextEditingStrategy {
   void placeElement() {
     geometry?.applyToDomElement(activeDomElement);
     if (hasAutofillGroup) {
-      placeForm();
-      // On Safari Desktop, when a form is focused, it opens an autofill menu
-      // immediately.
-      // Flutter framework sends `setEditableSizeAndTransform` for informing
-      // the engine about the location of the text field. This call may arrive
-      // after the first `show` call, depending on the text input widget's
-      // implementation. Therefore form is placed, when
-      // `setEditableSizeAndTransform` method is called and focus called on the
-      // form only after placing it to the correct position and only once after
-      // that. Calling focus multiple times causes flickering.
-      focusedFormElement!.focus();
-
-      // Set the last editing state if it exists, this is critical for a
-      // users ongoing work to continue uninterrupted when there is an update to
-      // the transform.
-      // If domElement is not focused cursor location will not be correct.
-      activeDomElement.focus();
-      lastEditingState?.applyToDomElement(activeDomElement);
+      // We listen to pointerdown events on the Flutter View element and programatically
+      // focus our inputs. However, these inputs are focused before the pointerdown
+      // events conclude. Thus, the browser triggers a blur event immediately after
+      // focusing these inputs. This causes issues with Safari Desktop's autofill
+      // dialog (ref: https://github.com/flutter/flutter/issues/127960).
+      // In order to guarantee that we only focus after the pointerdown event concludes,
+      // we wrap the form autofill placement and focus logic in a zero-duration Timer.
+      // This ensures that our input doesn't have instantaneous focus/blur events
+      // occur on it and fixes the autofill dialog bug as a result.
+      Timer(Duration.zero, () {
+        placeForm();
+        // On Safari Desktop, when a form is focused, it opens an autofill menu
+        // immediately.
+        // Flutter framework sends `setEditableSizeAndTransform` for informing
+        // the engine about the location of the text field. This call may arrive
+        // after the first `show` call, depending on the text input widget's
+        // implementation. Therefore form is placed, when
+        // `setEditableSizeAndTransform` method is called and focus called on the
+        // form only after placing it to the correct position and only once after
+        // that. Calling focus multiple times causes flickering.
+        focusedFormElement!.focus();
+
+        // Set the last editing state if it exists, this is critical for a
+        // users ongoing work to continue uninterrupted when there is an update to
+        // the transform.
+        // If domElement is not focused cursor location will not be correct.
+        activeDomElement.focus();
+        lastEditingState?.applyToDomElement(activeDomElement);
+      });
     }
   }
 
@@ -1197,7 +1281,7 @@ abstract class DefaultTextEditingStrategy with CompositionAwareMixin implements
       activeDomElement.setAttribute('type', 'password');
     }
 
-    if (config.inputType == EngineInputType.none) {
+    if (config.inputType.inputmodeAttribute == 'none') {
       activeDomElement.setAttribute('inputmode', 'none');
     }
 
@@ -1229,23 +1313,23 @@ abstract class DefaultTextEditingStrategy with CompositionAwareMixin implements
 
     // Subscribe to text and selection changes.
     subscriptions.add(DomSubscription(activeDomElement, 'input',
-            allowInterop(handleChange)));
+            handleChange));
 
     subscriptions.add(DomSubscription(activeDomElement, 'keydown',
-            allowInterop(maybeSendAction)));
+            maybeSendAction));
 
     subscriptions.add(DomSubscription(domDocument, 'selectionchange',
-            allowInterop(handleChange)));
+            handleChange));
 
     activeDomElement.addEventListener('beforeinput',
-        allowInterop(handleBeforeInput));
+        createDomEventListener(handleBeforeInput));
 
     addCompositionEventHandlers(activeDomElement);
 
     // Refocus on the activeDomElement after blur, so that user can keep editing the
     // text field.
     subscriptions.add(DomSubscription(activeDomElement, 'blur',
-            allowInterop((_) { activeDomElement.focus(); })));
+            (_) { activeDomElement.focus(); }));
 
     preventDefaultForMouseEvents();
   }
@@ -1254,7 +1338,16 @@ abstract class DefaultTextEditingStrategy with CompositionAwareMixin implements
   void updateElementPlacement(EditableTextGeometry textGeometry) {
     geometry = textGeometry;
     if (isEnabled) {
-      placeElement();
+      // On updates, we shouldn't go through the entire placeElement() flow if
+      // we are in the middle of IME composition, otherwise we risk interrupting it.
+      // Geometry updates occur when a multiline input expands or contracts. If
+      // we are in the middle of composition, we should just update the geometry.
+      // See: https://github.com/flutter/flutter/issues/98817
+      if (composingText != null) {
+        geometry?.applyToDomElement(activeDomElement);
+      } else {
+        placeElement();
+      }
     }
   }
 
@@ -1289,7 +1382,7 @@ abstract class DefaultTextEditingStrategy with CompositionAwareMixin implements
         inputConfiguration.autofillGroup?.formElement != null) {
       // Subscriptions are removed, listeners won't be triggered.
       activeDomElement.blur();
-      _hideAutofillElements(activeDomElement, isOffScreen: true);
+      _styleAutofillElements(activeDomElement, isOffScreen: true);
       inputConfiguration.autofillGroup?.storeForm();
     } else {
       activeDomElement.remove();
@@ -1332,9 +1425,9 @@ abstract class DefaultTextEditingStrategy with CompositionAwareMixin implements
       lastEditingState = newEditingState;
       _editingDeltaState = newTextEditingDeltaState;
       onChange!(lastEditingState, _editingDeltaState);
-      // Flush delta after it has been sent to framework.
-      _editingDeltaState = null;
     }
+    // Flush delta state.
+    _editingDeltaState = null;
   }
 
   void handleBeforeInput(DomEvent event) {
@@ -1350,23 +1443,25 @@ abstract class DefaultTextEditingStrategy with CompositionAwareMixin implements
     final String? inputType = getJsProperty<void>(event, 'inputType') as String?;
 
     if (inputType != null) {
+      final bool isSelectionInverted = lastEditingState!.baseOffset! > lastEditingState!.extentOffset!;
+      final int deltaOffset = isSelectionInverted ? lastEditingState!.baseOffset! : lastEditingState!.extentOffset!;
       if (inputType.contains('delete')) {
         // The deltaStart is set in handleChange because there is where we get access
         // to the new selection baseOffset which is our new deltaStart.
         editingDeltaState.deltaText = '';
-        editingDeltaState.deltaEnd = lastEditingState!.extentOffset!;
+        editingDeltaState.deltaEnd = deltaOffset;
       } else if (inputType == 'insertLineBreak'){
         // event.data is null on a line break, so we manually set deltaText as a line break by setting it to '\n'.
         editingDeltaState.deltaText = '\n';
-        editingDeltaState.deltaStart = lastEditingState!.extentOffset!;
-        editingDeltaState.deltaEnd = lastEditingState!.extentOffset!;
+        editingDeltaState.deltaStart = deltaOffset;
+        editingDeltaState.deltaEnd = deltaOffset;
       } else if (eventData != null) {
-        // When event.data is not null we we will begin by considering this delta as an insertion
+        // When event.data is not null we will begin by considering this delta as an insertion
         // at the selection extentOffset. This may change due to logic in handleChange to handle
         // composition and other IME behaviors.
         editingDeltaState.deltaText = eventData;
-        editingDeltaState.deltaStart = lastEditingState!.extentOffset!;
-        editingDeltaState.deltaEnd = lastEditingState!.extentOffset!;
+        editingDeltaState.deltaStart = deltaOffset;
+        editingDeltaState.deltaEnd = deltaOffset;
       }
     }
   }
@@ -1413,24 +1508,27 @@ abstract class DefaultTextEditingStrategy with CompositionAwareMixin implements
 
   /// Prevent default behavior for mouse down, up and move.
   ///
-  /// When normal mouse events are not prevented, in desktop browsers, mouse
-  /// selection conflicts with selection sent from the framework, which creates
+  /// When normal mouse events are not prevented, mouse selection
+  /// conflicts with selection sent from the framework, which creates
   /// flickering during selection by mouse.
+  ///
+  /// On mobile browsers, mouse events are sent after a touch event,
+  /// see: https://bugs.chromium.org/p/chromium/issues/detail?id=119216#c11.
   void preventDefaultForMouseEvents() {
     subscriptions.add(
-        DomSubscription(activeDomElement, 'mousedown', allowInterop((_) {
-      _.preventDefault();
-    })));
+        DomSubscription(activeDomElement, 'mousedown', (DomEvent event) {
+      event.preventDefault();
+    }));
 
     subscriptions.add(
-        DomSubscription(activeDomElement, 'mouseup', allowInterop((_) {
-      _.preventDefault();
-    })));
+        DomSubscription(activeDomElement, 'mouseup', (DomEvent event) {
+      event.preventDefault();
+    }));
 
     subscriptions.add(
-        DomSubscription(activeDomElement, 'mousemove', allowInterop((_) {
-      _.preventDefault();
-    })));
+        DomSubscription(activeDomElement, 'mousemove', (DomEvent event) {
+      event.preventDefault();
+    }));
   }
 }
 
@@ -1509,7 +1607,7 @@ class IOSTextEditingStrategy extends GloballyPositionedTextEditingStrategy {
     /// Position the element outside of the page before focusing on it. This is
     /// useful for not triggering a scroll when iOS virtual keyboard is
     /// coming up.
-    activeDomElement.style.transform = 'translate(-9999px, -9999px)';
+    activeDomElement.style.transform = 'translate(${offScreenOffset}px, ${offScreenOffset}px)';
 
     _canPosition = false;
   }
@@ -1523,25 +1621,25 @@ class IOSTextEditingStrategy extends GloballyPositionedTextEditingStrategy {
 
     // Subscribe to text and selection changes.
     subscriptions.add(DomSubscription(activeDomElement, 'input',
-            allowInterop(handleChange)));
+            handleChange));
 
     subscriptions.add(DomSubscription(activeDomElement, 'keydown',
-            allowInterop(maybeSendAction)));
+            maybeSendAction));
 
     subscriptions.add(DomSubscription(domDocument, 'selectionchange',
-            allowInterop(handleChange)));
+            handleChange));
 
     activeDomElement.addEventListener('beforeinput',
-        allowInterop(handleBeforeInput));
+        createDomEventListener(handleBeforeInput));
 
     addCompositionEventHandlers(activeDomElement);
 
     // Position the DOM element after it is focused.
     subscriptions.add(DomSubscription(activeDomElement, 'focus',
-            allowInterop((_) {
+            (_) {
               // Cancel previous timer if exists.
               _schedulePlacement();
-            })));
+            }));
 
     _addTapListener();
 
@@ -1565,14 +1663,14 @@ class IOSTextEditingStrategy extends GloballyPositionedTextEditingStrategy {
     //    input field was activated. If the time is too short, we re-focus the
     //    input element.
     subscriptions.add(DomSubscription(activeDomElement, 'blur',
-            allowInterop((_) {
+            (_) {
               final bool isFastCallback = blurWatch.elapsed < _blurFastCallbackInterval;
               if (windowHasFocus && isFastCallback) {
                 activeDomElement.focus();
               } else {
                 owner.sendTextConnectionClosedToFrameworkIfAny();
               }
-            })));
+            }));
   }
 
   @override
@@ -1608,7 +1706,7 @@ class IOSTextEditingStrategy extends GloballyPositionedTextEditingStrategy {
   /// [_positionInputElementTimer] timer is restarted. The element will be
   /// placed to its correct position after [_delayBeforePlacement].
   void _addTapListener() {
-    subscriptions.add(DomSubscription(activeDomElement, 'click', allowInterop((_) {
+    subscriptions.add(DomSubscription(activeDomElement, 'click', (_) {
       // Check if the element is already positioned. If not this does not fall
       // under `The user was using the long press, now they want to enter text
       // via keyboard` journey.
@@ -1619,7 +1717,7 @@ class IOSTextEditingStrategy extends GloballyPositionedTextEditingStrategy {
         // Re-configure the timer to place the element.
         _schedulePlacement();
       }
-    })));
+    }));
   }
 
   void _schedulePlacement() {
@@ -1674,24 +1772,24 @@ class AndroidTextEditingStrategy extends GloballyPositionedTextEditingStrategy {
 
     // Subscribe to text and selection changes.
     subscriptions.add(
-        DomSubscription(activeDomElement, 'input', allowInterop(handleChange)));
+        DomSubscription(activeDomElement, 'input', handleChange));
 
     subscriptions.add(
         DomSubscription(activeDomElement, 'keydown',
-            allowInterop(maybeSendAction)));
+            maybeSendAction));
 
     subscriptions.add(
         DomSubscription(domDocument, 'selectionchange',
-            allowInterop(handleChange)));
+            handleChange));
 
     activeDomElement.addEventListener('beforeinput',
-        allowInterop(handleBeforeInput));
+        createDomEventListener(handleBeforeInput));
 
     addCompositionEventHandlers(activeDomElement);
 
     subscriptions.add(
         DomSubscription(activeDomElement, 'blur',
-            allowInterop((_) {
+            (_) {
               if (windowHasFocus) {
                 // Chrome on Android will hide the onscreen keyboard when you tap outside
                 // the text box. Instead, we want the framework to tell us to hide the
@@ -1701,7 +1799,9 @@ class AndroidTextEditingStrategy extends GloballyPositionedTextEditingStrategy {
               } else {
                 owner.sendTextConnectionClosedToFrameworkIfAny();
               }
-            })));
+            }));
+
+    preventDefaultForMouseEvents();
   }
 
   @override
@@ -1740,14 +1840,14 @@ class FirefoxTextEditingStrategy extends GloballyPositionedTextEditingStrategy {
 
     // Subscribe to text and selection changes.
     subscriptions.add(
-        DomSubscription(activeDomElement, 'input', allowInterop(handleChange)));
+        DomSubscription(activeDomElement, 'input', handleChange));
 
     subscriptions.add(
         DomSubscription(
-            activeDomElement, 'keydown', allowInterop(maybeSendAction)));
+            activeDomElement, 'keydown', maybeSendAction));
 
     activeDomElement.addEventListener('beforeinput',
-        allowInterop(handleBeforeInput));
+        createDomEventListener(handleBeforeInput));
 
     addCompositionEventHandlers(activeDomElement);
 
@@ -1768,16 +1868,16 @@ class FirefoxTextEditingStrategy extends GloballyPositionedTextEditingStrategy {
         DomSubscription(
             activeDomElement,
             'keyup',
-            allowInterop((DomEvent event) {
+            (DomEvent event) {
               handleChange(event);
-            })));
+            }));
 
     // In Firefox the context menu item "Select All" does not work without
     // listening to onSelect. On the other browsers onSelectionChange is
     // enough for covering "Select All" functionality.
     subscriptions.add(
         DomSubscription(
-            activeDomElement, 'select', allowInterop(handleChange)));
+            activeDomElement, 'select', handleChange));
 
     // Refocus on the activeDomElement after blur, so that user can keep editing the
     // text field.
@@ -1785,9 +1885,9 @@ class FirefoxTextEditingStrategy extends GloballyPositionedTextEditingStrategy {
         DomSubscription(
             activeDomElement,
             'blur',
-            allowInterop((_) {
+            (_) {
               _postponeFocus();
-            })));
+            }));
 
     preventDefaultForMouseEvents();
   }
@@ -1849,19 +1949,19 @@ class TextInputSetClient extends TextInputCommand {
 /// Creates the text editing strategy used in non-a11y mode.
 DefaultTextEditingStrategy createDefaultTextEditingStrategy(HybridTextEditing textEditing) {
   DefaultTextEditingStrategy strategy;
-  if (browserEngine == BrowserEngine.webkit &&
-      operatingSystem == OperatingSystem.iOs) {
+
+  if(operatingSystem == OperatingSystem.iOs) {
     strategy = IOSTextEditingStrategy(textEditing);
-  } else if (browserEngine == BrowserEngine.webkit) {
-    strategy = SafariDesktopTextEditingStrategy(textEditing);
-  } else if (browserEngine == BrowserEngine.blink &&
-      operatingSystem == OperatingSystem.android) {
+  } else if(operatingSystem == OperatingSystem.android) {
     strategy = AndroidTextEditingStrategy(textEditing);
-  } else if (browserEngine == BrowserEngine.firefox) {
+  } else if(browserEngine == BrowserEngine.webkit) {
+    strategy = SafariDesktopTextEditingStrategy(textEditing);
+  } else if(browserEngine == BrowserEngine.firefox) {
     strategy = FirefoxTextEditingStrategy(textEditing);
   } else {
     strategy = GloballyPositionedTextEditingStrategy(textEditing);
   }
+
   return strategy;
 }
 
@@ -2046,7 +2146,6 @@ class TextEditingChannel {
           clientId: call.arguments[0] as int,
           configuration: InputConfiguration.fromFrameworkMessage(call.arguments[1] as Map<String, dynamic>),
         );
-        break;
 
       case 'TextInput.updateConfig':
         // Set configuration eagerly because it contains data about the text
@@ -2056,7 +2155,6 @@ class TextEditingChannel {
           call.arguments as Map<String, dynamic>
         );
         command = const TextInputUpdateConfig();
-        break;
 
       case 'TextInput.setEditingState':
         command = TextInputSetEditingState(
@@ -2064,11 +2162,9 @@ class TextEditingChannel {
             call.arguments as Map<String, dynamic>
           ),
         );
-        break;
 
       case 'TextInput.show':
         command = const TextInputShow();
-        break;
 
       case 'TextInput.setEditableSizeAndTransform':
         command = TextInputSetEditableSizeAndTransform(
@@ -2076,7 +2172,6 @@ class TextEditingChannel {
             call.arguments as Map<String, dynamic>
           ),
         );
-        break;
 
       case 'TextInput.setStyle':
         command = TextInputSetStyle(
@@ -2084,36 +2179,29 @@ class TextEditingChannel {
             call.arguments as Map<String, dynamic>,
           ),
         );
-        break;
 
       case 'TextInput.clearClient':
         command = const TextInputClearClient();
-        break;
 
       case 'TextInput.hide':
         command = const TextInputHide();
-        break;
 
       case 'TextInput.requestAutofill':
         // There's no API to request autofill on the web. Instead we let the
         // browser show autofill options automatically, if available. We
         // therefore simply ignore this message.
         command = const TextInputRequestAutofill();
-        break;
 
       case 'TextInput.finishAutofillContext':
         command = TextInputFinishAutofillContext(
           saveForm: call.arguments as bool,
         );
-        break;
 
       case 'TextInput.setMarkedTextRect':
         command = const TextInputSetMarkedTextRect();
-        break;
 
       case 'TextInput.setCaretRect':
         command = const TextInputSetCaretRect();
-        break;
 
       default:
         EnginePlatformDispatcher.instance.replyToPlatformMessage(callback, null);
@@ -2230,7 +2318,7 @@ class HybridTextEditing {
   /// Supplies the DOM element used for editing.
   late final DefaultTextEditingStrategy strategy =
     debugTextEditingStrategyOverride ??
-    (EngineSemanticsOwner.instance.semanticsEnabled
+    (EngineSemantics.instance.semanticsEnabled
       ? SemanticsTextEditingStrategy.ensureInitialized(this)
       : createDefaultTextEditingStrategy(this));
 
@@ -2355,7 +2443,9 @@ class EditableTextGeometry {
     assert(encodedGeometry.containsKey('transform'));
 
     final List<double> transformList =
-        List<double>.from(encodedGeometry.readList('transform'));
+        List<double>.from(encodedGeometry.readList('transform').map(
+          (final dynamic e) => (e as num).toDouble()
+        ));
     return EditableTextGeometry(
       width: encodedGeometry.readDouble('width'),
       height: encodedGeometry.readDouble('height'),
diff --git a/lib/web_ui/lib/src/engine/ulps.dart b/lib/web_ui/lib/src/engine/ulps.dart
deleted file mode 100644
index 65db11f5e7018c616991d33e92c04a9dc605a491..0000000000000000000000000000000000000000
--- a/lib/web_ui/lib/src/engine/ulps.dart
+++ /dev/null
@@ -1,216 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'dart:math' as math;
-import 'dart:typed_data';
-
-// This is a small library to handle stability for floating point operations.
-//
-// Since we are representing an infinite number of real numbers in finite
-// number of bits, when we perform comparisons of coordinates for paths for
-// example, we want to make sure that line and curve sections that are too
-// close to each other (number of floating point numbers
-// representable in bits between two numbers) are handled correctly and
-// don't cause algorithms to fail when we perform operations such as
-// subtraction or between checks.
-//
-// Small introduction into floating point comparison:
-//
-// For some good articles on the topic, see
-// https://randomascii.wordpress.com/category/floating-point/page/2/
-// Port based on:
-// https://github.com/google/skia/blob/main/include/private/SkFloatBits.h
-//
-// Here is the 32 bit IEEE representation:
-//   uint32_t mantissa : 23;
-//   uint32_t exponent : 8;
-//   uint32_t sign : 1;
-// As you can see it was carefully designed to be reinterpreted as an integer.
-//
-// Ulps stands for unit in the last place. ulp(x) is the gap between two
-// floating point numbers nearest x.
-
-/// Converts a sign-bit int (float interpreted as int) into a 2s complement
-/// int. Also converts 0x80000000 to 0. Allows result to be compared using
-/// int comparison.
-int signBitTo2sCompliment(int x) =>
-    (x & 0x80000000) != 0 ? (-(x & 0x7fffffff)) : x;
-
-/// Convert a 2s complement int to a sign-bit (i.e. int interpreted as float).
-int twosComplimentToSignBit(int x) {
-  if ((x & 0x80000000) == 0) {
-    return x;
-  }
-  x = ~x + 1;
-  x |= 0x80000000;
-  return x;
-}
-
-class _FloatBitConverter {
-  factory _FloatBitConverter() {
-    final Float32List float32List = Float32List(1);
-    return _FloatBitConverter._(
-        float32List, float32List.buffer.asInt32List(0, 1));
-  }
-
-  _FloatBitConverter._(this.float32List, this.int32List);
-
-  final Float32List float32List;
-  final Int32List int32List;
-
-  int toInt(Float32List source, int index) {
-    float32List[0] = source[index];
-    return int32List[0];
-  }
-
-  int toBits(double x) {
-    float32List[0] = x;
-    return int32List[0];
-  }
-
-  double toDouble(int bits) {
-    int32List[0] = bits;
-    return float32List[0];
-  }
-}
-
-// Singleton bit converter to prevent typed array allocations.
-final _FloatBitConverter _floatBitConverter = _FloatBitConverter();
-
-// Converts float to bits.
-int float2Bits(Float32List source, int index) {
-  return _floatBitConverter.toInt(source, index);
-}
-
-// Converts bits to float.
-double bitsToFloat(int bits) {
-  return _floatBitConverter.toDouble(bits);
-}
-
-const int floatBitsExponentMask = 0x7F800000;
-const int floatBitsMatissaMask = 0x007FFFFF;
-
-/// Returns a float as 2s complement int to be able to compare floats to each
-/// other.
-int floatFromListAs2sCompliment(Float32List source, int index) =>
-    signBitTo2sCompliment(float2Bits(source, index));
-
-int floatAs2sCompliment(double x) =>
-    signBitTo2sCompliment(_floatBitConverter.toBits(x));
-
-double twosComplimentAsFloat(int x) => bitsToFloat(twosComplimentToSignBit(x));
-
-bool _argumentsDenormalized(double a, double b, int epsilon) {
-  final double denormalizedCheck = kFltEpsilon * epsilon / 2;
-  return a.abs() <= denormalizedCheck && b.abs() <= denormalizedCheck;
-}
-
-bool equalUlps(double a, double b, int epsilon, int depsilon) {
-  if (_argumentsDenormalized(a, b, depsilon)) {
-    return true;
-  }
-  final int aBits = floatAs2sCompliment(a);
-  final int bBits = floatAs2sCompliment(b);
-  // Find the difference in ULPs.
-  return aBits < bBits + epsilon && bBits < aBits + epsilon;
-}
-
-/// General equality check that covers between, product and division by using
-/// ulps epsilon 16.
-bool almostEqualUlps(double a, double b) {
-  const int kUlpsEpsilon = 16;
-  return equalUlps(a, b, kUlpsEpsilon, kUlpsEpsilon);
-}
-
-/// Equality using the same error term for between comparison.
-bool almostBequalUlps(double a, double b) {
-  const int kUlpsEpsilon = 2;
-  return equalUlps(a, b, kUlpsEpsilon, kUlpsEpsilon);
-}
-
-/// Equality check for product.
-bool almostPequalUlps(double a, double b) {
-  const int kUlpsEpsilon = 8;
-  return equalUlps(a, b, kUlpsEpsilon, kUlpsEpsilon);
-}
-
-/// Equality check for division.
-bool almostDequalUlps(double a, double b) {
-  const int kUlpsEpsilon = 16;
-  return equalUlps(a, b, kUlpsEpsilon, kUlpsEpsilon);
-}
-
-/// Checks if 2 points are roughly equal (ulp 256) to each other.
-bool approximatelyEqual(double ax, double ay, double bx, double by) {
-  if (approximatelyEqualT(ax, bx) && approximatelyEqualT(ay, by)) {
-    return true;
-  }
-  if (!roughlyEqualUlps(ax, bx) || !roughlyEqualUlps(ay, by)) {
-    return false;
-  }
-  final double dx = ax - bx;
-  final double dy = ay - by;
-  final double dist = math.sqrt(dx * dx + dy * dy);
-  final double tiniest = math.min(math.min(math.min(ax, bx), ay), by);
-  double largest = math.max(math.max(math.max(ax, bx), ay), by);
-  largest = math.max(largest, -tiniest);
-  return almostDequalUlps(largest, largest + dist);
-}
-
-/// Equality check for comparing curve T values in the range of 0 to 1.
-///
-/// For general numbers (larger and smaller) use
-/// AlmostEqualUlps instead.
-bool approximatelyEqualT(double t1, double t2) {
-  return approximatelyZero(t1 - t2);
-}
-
-bool approximatelyZero(double value) => value.abs() < kFltEpsilon;
-
-bool roughlyEqualUlps(double a, double b) {
-  const int kUlpsEpsilon = 256;
-  const int kDUlpsEpsilon = 1024;
-  return equalUlps(a, b, kUlpsEpsilon, kDUlpsEpsilon);
-}
-
-bool dEqualUlpsEpsilon(double a, double b, int epsilon) {
-  final int aBits = floatAs2sCompliment(a);
-  final int bBits = floatAs2sCompliment(b);
-  // Find the difference in ULPs.
-  return aBits < bBits + epsilon && bBits < aBits + epsilon;
-}
-
-// Checks equality for division.
-bool almostDequalUlpsDouble(double a, double b) {
-  final double absA = a.abs();
-  final double absB = b.abs();
-  if (absA < kScalarMax && absB < kScalarMax) {
-    return almostDequalUlps(a, b);
-  }
-  return (a - b).abs() / math.max(absA, absB) < kDblEpsilonSubdivideErr;
-}
-
-const double kFltEpsilon = 1.19209290E-07; // == 1 / (2 ^ 23)
-const double kDblEpsilon = 2.22045e-16;
-const double kFltEpsilonCubed = kFltEpsilon * kFltEpsilon * kFltEpsilon;
-const double kFltEpsilonHalf = kFltEpsilon / 2;
-const double kFltEpsilonDouble = kFltEpsilon * 2;
-// Epsilon to use when ordering vectors.
-const double kFltEpsilonOrderableErr = kFltEpsilon * 16;
-const double kFltEpsilonSquared = kFltEpsilon * kFltEpsilon;
-// Use a compile-time constant for FLT_EPSILON_SQRT to avoid initializers.
-// A 17 digit constant guarantees exact results.
-const double kFltEpsilonSqrt = 0.00034526697709225118; // sqrt(kFltEpsilon);
-const double kFltEpsilonInverse = 1 / kFltEpsilon;
-const double kDblEpsilonErr = kDblEpsilon * 4;
-const double kDblEpsilonSubdivideErr = kDblEpsilon * 16;
-const double kRoughEpsilon = kFltEpsilon * 64;
-const double kMoreRoughEpsilon = kFltEpsilon * 256;
-const double kWayRoughEpsilon = kFltEpsilon * 2048;
-const double kBumpEpsilon = kFltEpsilon * 4096;
-
-// Scalar max is based on 32 bit float since [PathRef] stores values in
-// Float32List.
-const double kScalarMax = 3.402823466e+38;
-const double kScalarMin = -kScalarMax;
diff --git a/lib/web_ui/lib/src/engine/util.dart b/lib/web_ui/lib/src/engine/util.dart
index 3f78e859e8286ebaccb166538cae192b8c05ca28..1889e412747634709e9b52dca9b02634be1dc63e 100644
--- a/lib/web_ui/lib/src/engine/util.dart
+++ b/lib/web_ui/lib/src/engine/util.dart
@@ -2,17 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-library util;
-
 import 'dart:async';
+import 'dart:collection';
 import 'dart:math' as math;
 import 'dart:typed_data';
 
+import 'package:meta/meta.dart';
 import 'package:ui/ui.dart' as ui;
 
 import 'browser_detection.dart';
 import 'dom.dart';
 import 'safe_browser_api.dart';
+import 'services.dart';
 import 'vector_math.dart';
 
 /// Generic callback signature, used by [_futurize].
@@ -51,10 +52,10 @@ Future<T> futurize<T>(Callbacker<T> callbacker) {
   // If the callback synchronously throws an error, then synchronously
   // rethrow that error instead of adding it to the completer. This
   // prevents the Zone from receiving an uncaught exception.
-  bool sync = true;
+  bool isSync = true;
   final String? error = callbacker((T? t) {
     if (t == null) {
-      if (sync) {
+      if (isSync) {
         throw Exception('operation failed');
       } else {
         completer.completeError(Exception('operation failed'));
@@ -63,7 +64,7 @@ Future<T> futurize<T>(Callbacker<T> callbacker) {
       completer.complete(t);
     }
   });
-  sync = false;
+  isSync = false;
   if (error != null) {
     throw Exception(error);
   }
@@ -216,12 +217,6 @@ String float64ListToCssTransform3d(List<double> matrix) {
   }
 }
 
-bool get assertionsEnabled {
-  bool k = false;
-  assert(k = true);
-  return k;
-}
-
 final Float32List _tempRectData = Float32List(4);
 
 /// Transforms a [ui.Rect] given the effective [transform].
@@ -229,7 +224,7 @@ final Float32List _tempRectData = Float32List(4);
 /// The resulting rect is aligned to the pixel grid, i.e. two of
 /// its sides are vertical and two are horizontal. In the presence of rotations
 /// the rectangle is inflated such that it fits the rotated rectangle.
-ui.Rect transformRect(Matrix4 transform, ui.Rect rect) {
+ui.Rect transformRectWithMatrix(Matrix4 transform, ui.Rect rect) {
   _tempRectData[0] = rect.left;
   _tempRectData[1] = rect.top;
   _tempRectData[2] = rect.right;
@@ -338,20 +333,15 @@ bool rectContainsOther(ui.Rect rect, ui.Rect other) {
       rect.bottom >= other.bottom;
 }
 
-/// Converts color to a css compatible attribute value.
-String? colorToCssString(ui.Color? color) {
-  if (color == null) {
-    return null;
+extension CssColor on ui.Color {
+  /// Converts color to a css compatible attribute value.
+  String toCssString() {
+    return colorValueToCssString(value);
   }
-  final int value = color.value;
-  return colorValueToCssString(value);
 }
 
 // Converts a color value (as an int) into a CSS-compatible value.
-String? colorValueToCssString(int? value) {
-  if (value == null) {
-    return null;
-  }
+String colorValueToCssString(int value) {
   if (value == 0xFF000000) {
     return '#000000';
   }
@@ -536,6 +526,20 @@ int clampInt(int value, int min, int max) {
 /// to verify that warnings are printed under certain circumstances.
 void Function(String) printWarning = domWindow.console.warn;
 
+/// Converts a 4x4 matrix into a human-readable String.
+String matrixString(List<num> matrix) {
+  final StringBuffer sb = StringBuffer();
+  for (int i = 0; i < 16; i++) {
+    sb.write(matrix[i]);
+    if ((i + 1) % 4 == 0) {
+      sb.write('\n');
+    } else {
+      sb.write(' ');
+    }
+  }
+  return sb.toString();
+}
+
 /// Determines if lists [a] and [b] are deep equivalent.
 ///
 /// Returns true if the lists are both null, or if they are both non-null, have
@@ -563,12 +567,6 @@ String blurSigmasToCssString(double sigmaX, double sigmaY) {
   return 'blur(${(sigmaX + sigmaY) * 0.5}px)';
 }
 
-/// A typed variant of [domWindow.fetch].
-Future<DomResponse> httpFetch(String url) async {
-  final Object? result = await domWindow.fetch(url);
-  return result! as DomResponse;
-}
-
 /// Extensions to [Map] that make it easier to treat it as a JSON object. The
 /// keys are `dynamic` because when JSON is deserialized from method channels
 /// it arrives as `Map<dynamic, dynamic>`.
@@ -627,20 +625,41 @@ extension JsonExtensions on Map<dynamic, dynamic> {
   }
 
   int readInt(String propertyName) {
-    return this[propertyName] as int;
+    return (this[propertyName] as num).toInt();
   }
 
   int? tryInt(String propertyName) {
-    return this[propertyName] as int?;
+    return (this[propertyName] as num?)?.toInt();
   }
 
   double readDouble(String propertyName) {
-    return this[propertyName] as double;
+    return (this[propertyName] as num).toDouble();
   }
 
   double? tryDouble(String propertyName) {
-    return this[propertyName] as double?;
+    return (this[propertyName] as num?)?.toDouble();
+  }
+}
+
+/// Extracts view ID from the [MethodCall.arguments] map.
+///
+/// Throws if the view ID is not present or if [arguments] is not a map.
+int readViewId(Object? arguments) {
+  final int? viewId = tryViewId(arguments);
+  if (viewId == null) {
+    throw Exception('Could not find a `viewId` in the arguments: $arguments');
+  }
+  return viewId;
+}
+
+/// Extracts view ID from the [MethodCall.arguments] map.
+///
+/// Returns null if the view ID is not present or if [arguments] is not a map.
+int? tryViewId(Object? arguments) {
+  if (arguments is Map) {
+    return arguments.tryInt('viewId');
   }
+  return null;
 }
 
 /// Prints a list of bytes in hex format.
@@ -653,15 +672,16 @@ extension JsonExtensions on Map<dynamic, dynamic> {
 ///     Input: [0, 1, 2, 3]
 ///     Output: 0x00 0x01 0x02 0x03
 String bytesToHexString(List<int> data) {
-  return data.map((int byte) => '0x${byte.toRadixString(16).padLeft(2, '0')}').join(' ');
+  return data
+      .map((int byte) => '0x${byte.toRadixString(16).padLeft(2, '0')}')
+      .join(' ');
 }
 
 /// Sets a style property on [element].
 ///
 /// [name] is the name of the property. [value] is the value of the property.
 /// If [value] is null, removes the style property.
-void setElementStyle(
-    DomElement element, String name, String? value) {
+void setElementStyle(DomElement element, String name, String? value) {
   if (value == null) {
     element.style.removeProperty(name);
   } else {
@@ -684,16 +704,21 @@ void setClipPath(DomElement element, String? value) {
   }
 }
 
-void setThemeColor(ui.Color color) {
+void setThemeColor(ui.Color? color) {
   DomHTMLMetaElement? theme =
       domDocument.querySelector('#flutterweb-theme') as DomHTMLMetaElement?;
-  if (theme == null) {
-    theme = createDomHTMLMetaElement()
-      ..id = 'flutterweb-theme'
-      ..name = 'theme-color';
-    domDocument.head!.append(theme);
+
+  if (color != null) {
+    if (theme == null) {
+      theme = createDomHTMLMetaElement()
+        ..id = 'flutterweb-theme'
+        ..name = 'theme-color';
+      domDocument.head!.append(theme);
+    }
+    theme.content = color.toCssString();
+  } else {
+    theme?.remove();
   }
-  theme.content = colorToCssString(color)!;
 }
 
 bool? _ellipseFeatureDetected;
@@ -709,7 +734,8 @@ void drawEllipse(
     double startAngle,
     double endAngle,
     bool antiClockwise) {
-  _ellipseFeatureDetected ??= getJsProperty<Object?>(context, 'ellipse') != null;
+  _ellipseFeatureDetected ??=
+      getJsProperty<Object?>(context, 'ellipse') != null;
   if (_ellipseFeatureDetected!) {
     context.ellipse(centerX, centerY, radiusX, radiusY, rotation, startAngle,
         endAngle, antiClockwise);
@@ -744,3 +770,118 @@ extension FirstWhereOrNull<T> on Iterable<T> {
     return null;
   }
 }
+
+typedef _LruCacheEntry<K extends Object, V extends Object> = ({K key, V value});
+
+/// Caches up to a [maximumSize] key-value pairs.
+///
+/// Call [cache] to cache a key-value pair.
+class LruCache<K extends Object, V extends Object> {
+  LruCache(this.maximumSize);
+
+  /// The maximum number of key/value pairs this cache can contain.
+  ///
+  /// To avoid exceeding this limit the cache remove least recently used items.
+  final int maximumSize;
+
+  /// A doubly linked list of the objects in the cache.
+  ///
+  /// This makes it fast to move a recently used object to the front.
+  final DoubleLinkedQueue<_LruCacheEntry<K, V>> _itemQueue =
+      DoubleLinkedQueue<_LruCacheEntry<K, V>>();
+
+  @visibleForTesting
+  DoubleLinkedQueue<_LruCacheEntry<K, V>> get debugItemQueue => _itemQueue;
+
+  /// A map of objects to their associated node in the [_itemQueue].
+  ///
+  /// This makes it fast to find the node in the queue when we need to
+  /// move the object to the front of the queue.
+  final Map<K, DoubleLinkedQueueEntry<_LruCacheEntry<K, V>>> _itemMap =
+      <K, DoubleLinkedQueueEntry<_LruCacheEntry<K, V>>>{};
+
+  @visibleForTesting
+  Map<K, DoubleLinkedQueueEntry<_LruCacheEntry<K, V>>> get itemMap => _itemMap;
+
+  /// The number of objects in the cache.
+  int get length => _itemQueue.length;
+
+  /// Whether or not [object] is in the cache.
+  ///
+  /// This is only for testing.
+  @visibleForTesting
+  bool debugContainsValue(V object) {
+    return _itemMap.containsValue(object);
+  }
+
+  @visibleForTesting
+  bool debugContainsKey(K key) {
+    return _itemMap.containsKey(key);
+  }
+
+  /// Returns the cached value associated with the [key].
+  ///
+  /// If the value is not in the cache, returns null.
+  V? operator [](K key) {
+    return _itemMap[key]?.element.value;
+  }
+
+  /// Caches the given [key]/[value] pair in this cache.
+  ///
+  /// If the pair is not already in the cache, adds it to the cache as the most
+  /// recently used pair.
+  ///
+  /// If the [key] is already in the cache, moves it to the most recently used
+  /// position. If the [value] corresponding to the [key] is different from
+  /// what's in the cache, updates the value.
+  void cache(K key, V value) {
+    final DoubleLinkedQueueEntry<_LruCacheEntry<K, V>>? item = _itemMap[key];
+    if (item == null) {
+      // New key-value pair, just add.
+      _add(key, value);
+    } else if (item.element.value != value) {
+      // Key already in the cache, but value is new. Re-add.
+      item.remove();
+      _add(key, value);
+    } else {
+      // Key-value pair already in the cache, move to most recently used.
+      item.remove();
+      _itemQueue.addFirst(item.element);
+      _itemMap[key] = _itemQueue.firstEntry()!;
+    }
+  }
+
+  void clear() {
+    _itemQueue.clear();
+    _itemMap.clear();
+  }
+
+  void _add(K key, V value) {
+    _itemQueue.addFirst((key: key, value: value));
+    _itemMap[key] = _itemQueue.firstEntry()!;
+
+    if (_itemQueue.length > maximumSize) {
+      _removeLeastRecentlyUsedValue();
+    }
+  }
+
+  void _removeLeastRecentlyUsedValue() {
+    final bool didRemove = _itemMap.remove(_itemQueue.last.key) != null;
+    assert(didRemove);
+    _itemQueue.removeLast();
+  }
+}
+
+/// Returns the VM-compatible string for the tile mode.
+String tileModeString(ui.TileMode tileMode) {
+  switch (tileMode) {
+    case ui.TileMode.clamp:
+      return 'clamp';
+    case ui.TileMode.mirror:
+      return 'mirror';
+    case ui.TileMode.repeated:
+      return 'repeated';
+    case ui.TileMode.decal:
+      return 'decal';
+  }
+}
diff --git a/lib/web_ui/lib/src/engine/validators.dart b/lib/web_ui/lib/src/engine/validators.dart
index 64c3dd5a2ed95a9657380df9d4379393d7dd167a..5db10f9dc8289d0f5f495aa77a88196fa9601d13 100644
--- a/lib/web_ui/lib/src/engine/validators.dart
+++ b/lib/web_ui/lib/src/engine/validators.dart
@@ -7,7 +7,6 @@ import 'dart:typed_data';
 import 'package:ui/ui.dart' as ui;
 
 bool rectIsValid(ui.Rect rect) {
-  assert(rect != null, 'Rect argument was null.');
   assert(
       !(rect.left.isNaN ||
           rect.right.isNaN ||
@@ -18,7 +17,6 @@ bool rectIsValid(ui.Rect rect) {
 }
 
 bool rrectIsValid(ui.RRect rrect) {
-  assert(rrect != null, 'RRect argument was null.');
   assert(
       !(rrect.left.isNaN ||
           rrect.right.isNaN ||
@@ -29,20 +27,17 @@ bool rrectIsValid(ui.RRect rrect) {
 }
 
 bool offsetIsValid(ui.Offset offset) {
-  assert(offset != null, 'Offset argument was null.');
   assert(!offset.dx.isNaN && !offset.dy.isNaN,
       'Offset argument contained a NaN value.');
   return true;
 }
 
 bool matrix4IsValid(Float32List matrix4) {
-  assert(matrix4 != null, 'Matrix4 argument was null.');
   assert(matrix4.length == 16, 'Matrix4 must have 16 entries.');
   return true;
 }
 
 bool radiusIsValid(ui.Radius radius) {
-  assert(radius != null, 'Radius argument was null.');
   assert(!radius.x.isNaN && !radius.y.isNaN,
       'Radius argument contained a NaN value.');
   return true;
diff --git a/lib/web_ui/lib/src/engine/vector_math.dart b/lib/web_ui/lib/src/engine/vector_math.dart
index 28fb5f70c60003294f805e0059b95bfb8085028d..a6edaa5a6143856ee336be653350d7cc5aa4fcb7 100644
--- a/lib/web_ui/lib/src/engine/vector_math.dart
+++ b/lib/web_ui/lib/src/engine/vector_math.dart
@@ -5,6 +5,8 @@
 import 'dart:math' as math;
 import 'dart:typed_data';
 
+import 'package:ui/ui.dart' as ui;
+
 import 'util.dart';
 
 class Matrix4 {
@@ -377,30 +379,34 @@ class Matrix4 {
 
   /// Transform [arg] of type [Vector3] using the perspective transformation
   /// defined by [this].
-  Vector3 perspectiveTransform(Vector3 arg) {
-    final Float32List argStorage = arg._v3storage;
-
-    final double x = (_m4storage[0] * argStorage[0]) +
-        (_m4storage[4] * argStorage[1]) +
-        (_m4storage[8] * argStorage[2]) +
+  Vector3 perspectiveTransform({
+    required double x,
+    required double y,
+    required double z,
+  }) {
+    final double transformedX = (_m4storage[0] * x) +
+        (_m4storage[4] * y) +
+        (_m4storage[8] * z) +
         _m4storage[12];
-    final double y = (_m4storage[1] * argStorage[0]) +
-        (_m4storage[5] * argStorage[1]) +
-        (_m4storage[9] * argStorage[2]) +
+    final double transformedY = (_m4storage[1] * x) +
+        (_m4storage[5] * y) +
+        (_m4storage[9] * z) +
         _m4storage[13];
-    final double z = (_m4storage[2] * argStorage[0]) +
-        (_m4storage[6] * argStorage[1]) +
-        (_m4storage[10] * argStorage[2]) +
+    final double transformedZ = (_m4storage[2] * x) +
+        (_m4storage[6] * y) +
+        (_m4storage[10] * z) +
         _m4storage[14];
     final double w = 1.0 /
-        ((_m4storage[3] * argStorage[0]) +
-            (_m4storage[7] * argStorage[1]) +
-            (_m4storage[11] * argStorage[2]) +
+        ((_m4storage[3] * x) +
+            (_m4storage[7] * y) +
+            (_m4storage[11] * z) +
             _m4storage[15]);
-    argStorage[0] = x * w;
-    argStorage[1] = y * w;
-    argStorage[2] = z * w;
-    return arg;
+
+    return (
+      x: transformedX * w,
+      y: transformedY * w,
+      z: transformedZ * w,
+    );
   }
 
   bool isIdentity() =>
@@ -441,18 +447,18 @@ class Matrix4 {
 
   /// Returns the translation vector from this homogeneous transformation matrix.
   Vector3 getTranslation() {
-    final double z = _m4storage[14];
-    final double y = _m4storage[13];
-    final double x = _m4storage[12];
-    return Vector3(x, y, z);
+    return (
+      x: _m4storage[12],
+      y: _m4storage[13],
+      z: _m4storage[14],
+    );
   }
 
   void rotate(Vector3 axis, double angle) {
     final double len = axis.length;
-    final Float32List axisStorage = axis._v3storage;
-    final double x = axisStorage[0] / len;
-    final double y = axisStorage[1] / len;
-    final double z = axisStorage[2] / len;
+    final double x = axis.x / len;
+    final double y = axis.y / len;
+    final double z = axis.z / len;
     final double c = math.cos(angle);
     final double s = math.sin(angle);
     final double C = 1.0 - c;
@@ -526,13 +532,9 @@ class Matrix4 {
 
   /// Sets the translation vector in this homogeneous transformation matrix.
   void setTranslation(Vector3 t) {
-    final Float32List tStorage = t._v3storage;
-    final double z = tStorage[2];
-    final double y = tStorage[1];
-    final double x = tStorage[0];
-    _m4storage[14] = z;
-    _m4storage[13] = y;
-    _m4storage[12] = x;
+    _m4storage[14] = t.z;
+    _m4storage[13] = t.y;
+    _m4storage[12] = t.x;
   }
 
   /// Sets the translation vector in this homogeneous transformation matrix.
@@ -951,35 +953,6 @@ class Matrix4 {
         (m33 * argStorage[15]);
   }
 
-  /// Rotate [arg] of type [Vector3] using the rotation defined by [this].
-  Vector3 rotate3(Vector3 arg) {
-    final Float32List argStorage = arg._v3storage;
-    final double x = (_m4storage[0] * argStorage[0]) +
-        (_m4storage[4] * argStorage[1]) +
-        (_m4storage[8] * argStorage[2]);
-    final double y = (_m4storage[1] * argStorage[0]) +
-        (_m4storage[5] * argStorage[1]) +
-        (_m4storage[9] * argStorage[2]);
-    final double z = (_m4storage[2] * argStorage[0]) +
-        (_m4storage[6] * argStorage[1]) +
-        (_m4storage[10] * argStorage[2]);
-    argStorage[0] = x;
-    argStorage[1] = y;
-    argStorage[2] = z;
-    return arg;
-  }
-
-  /// Rotate a copy of [arg] of type [Vector3] using the rotation defined by
-  /// [this]. If a [out] parameter is supplied, the copy is stored in [out].
-  Vector3 rotated3(Vector3 arg, [Vector3? out]) {
-    if (out == null) {
-      out = Vector3.copy(arg);
-    } else {
-      out.setFrom(arg);
-    }
-    return rotate3(out);
-  }
-
   /// Transforms a 3-component vector in-place.
   void transform3(Float32List vector) {
     final double x = (_m4storage[0] * vector[0]) +
@@ -1014,6 +987,10 @@ class Matrix4 {
         _m4storage[13];
   }
 
+  /// Transforms the input rect and calculates the bounding box of the rect
+  /// after the transform.
+  ui.Rect transformRect(ui.Rect rect) => transformRectWithMatrix(this, rect);
+
   /// Copies [this] into [array] starting at [offset].
   void copyIntoArray(List<num> array, [int offset = 0]) {
     final int i = offset;
@@ -1070,330 +1047,37 @@ class Matrix4 {
 
   @override
   String toString() {
-    if (assertionsEnabled) {
+    String result = super.toString();
+    assert(() {
       String fmt(int index) {
         return storage[index].toStringAsFixed(2);
       }
 
-      return '[${fmt(0)}, ${fmt(4)}, ${fmt(8)}, ${fmt(12)}]\n'
-             '[${fmt(1)}, ${fmt(5)}, ${fmt(9)}, ${fmt(13)}]\n'
-             '[${fmt(2)}, ${fmt(6)}, ${fmt(10)}, ${fmt(14)}]\n'
-             '[${fmt(3)}, ${fmt(7)}, ${fmt(11)}, ${fmt(15)}]';
-    } else {
-      return super.toString();
-    }
+      result = '[${fmt(0)}, ${fmt(4)}, ${fmt(8)}, ${fmt(12)}]\n'
+               '[${fmt(1)}, ${fmt(5)}, ${fmt(9)}, ${fmt(13)}]\n'
+               '[${fmt(2)}, ${fmt(6)}, ${fmt(10)}, ${fmt(14)}]\n'
+               '[${fmt(3)}, ${fmt(7)}, ${fmt(11)}, ${fmt(15)}]';
+      return true;
+    }());
+    return result;
   }
 }
 
-/// 3D column vector.
-class Vector3 {
-  /// Construct a new vector with the specified values.
-  factory Vector3(double x, double y, double z) =>
-      Vector3.zero()..setValues(x, y, z);
-
-  /// Zero vector.
-  Vector3.zero() : _v3storage = Float32List(3);
-
-  /// Splat [value] into all lanes of the vector.
-  factory Vector3.all(double value) => Vector3.zero()..splat(value);
-
-  /// Copy of [other].
-  factory Vector3.copy(Vector3 other) => Vector3.zero()..setFrom(other);
-
-  /// Constructs Vector3 with given Float32List as [storage].
-  Vector3.fromFloat32List(this._v3storage);
-
-  /// Constructs Vector3 with a [storage] that views given [buffer] starting at
-  /// [offset]. [offset] has to be multiple of [Float32List.bytesPerElement].
-  Vector3.fromBuffer(ByteBuffer buffer, int offset)
-      : _v3storage = Float32List.view(buffer, offset, 3);
-
-  /// Generate random vector in the range (0, 0, 0) to (1, 1, 1). You can
-  /// optionally pass your own random number generator.
-  factory Vector3.random([math.Random? rng]) {
-    rng ??= math.Random();
-    return Vector3(rng.nextDouble(), rng.nextDouble(), rng.nextDouble());
-  }
+const Vector3 kUnitX = (x: 1.0, y: 0.0, z: 0.0);
+const Vector3 kUnitY = (x: 0.0, y: 1.0, z: 0.0);
+const Vector3 kUnitZ = (x: 0.0, y: 0.0, z: 1.0);
 
-  final Float32List _v3storage;
-
-  /// The components of the vector.
-  Float32List get storage => _v3storage;
-
-  /// Set the values of [result] to the minimum of [a] and [b] for each line.
-  static void min(Vector3 a, Vector3 b, Vector3 result) {
-    result
-      ..x = math.min(a.x, b.x)
-      ..y = math.min(a.y, b.y)
-      ..z = math.min(a.z, b.z);
-  }
-
-  /// Set the values of [result] to the maximum of [a] and [b] for each line.
-  static void max(Vector3 a, Vector3 b, Vector3 result) {
-    result
-      ..x = math.max(a.x, b.x)
-      ..y = math.max(a.y, b.y)
-      ..z = math.max(a.z, b.z);
-  }
-
-  /// Interpolate between [min] and [max] with the amount of [a] using a linear
-  /// interpolation and store the values in [result].
-  static void mix(Vector3 min, Vector3 max, double a, Vector3 result) {
-    result
-      ..x = min.x + a * (max.x - min.x)
-      ..y = min.y + a * (max.y - min.y)
-      ..z = min.z + a * (max.z - min.z);
-  }
-
-  /// Set the values of the vector.
-  void setValues(double x, double y, double z) {
-    _v3storage[0] = x;
-    _v3storage[1] = y;
-    _v3storage[2] = z;
-  }
-
-  /// Zero vector.
-  void setZero() {
-    _v3storage[2] = 0.0;
-    _v3storage[1] = 0.0;
-    _v3storage[0] = 0.0;
-  }
-
-  /// Set the values by copying them from [other].
-  void setFrom(Vector3 other) {
-    final Float32List otherStorage = other._v3storage;
-    _v3storage[0] = otherStorage[0];
-    _v3storage[1] = otherStorage[1];
-    _v3storage[2] = otherStorage[2];
-  }
-
-  /// Splat [arg] into all lanes of the vector.
-  void splat(double arg) {
-    _v3storage[2] = arg;
-    _v3storage[1] = arg;
-    _v3storage[0] = arg;
-  }
-
-  /// Access the component of the vector at the index [i].
-  double operator [](int i) => _v3storage[i];
-
-  /// Set the component of the vector at the index [i].
-  void operator []=(int i, double v) {
-    _v3storage[i] = v;
-  }
-
-  /// Set the length of the vector. A negative [value] will change the vectors
-  /// orientation and a [value] of zero will set the vector to zero.
-  set length(double value) {
-    if (value == 0.0) {
-      setZero();
-    } else {
-      double l = length;
-      if (l == 0.0) {
-        return;
-      }
-      l = value / l;
-      _v3storage[0] *= l;
-      _v3storage[1] *= l;
-      _v3storage[2] *= l;
-    }
-  }
+/// 3D column vector.
+typedef Vector3 = ({double x, double y, double z});
 
+extension Vector3Extension on Vector3 {
   /// Length.
   double get length => math.sqrt(length2);
 
   /// Length squared.
   double get length2 {
-    double sum;
-    sum = _v3storage[0] * _v3storage[0];
-    sum += _v3storage[1] * _v3storage[1];
-    sum += _v3storage[2] * _v3storage[2];
-    return sum;
-  }
-
-  /// Normalizes [this].
-  double normalize() {
-    final double l = length;
-    if (l == 0.0) {
-      return 0.0;
-    }
-    final double d = 1.0 / l;
-    _v3storage[0] *= d;
-    _v3storage[1] *= d;
-    _v3storage[2] *= d;
-    return l;
-  }
-
-  /// Normalizes copy of [this].
-  Vector3 normalized() => Vector3.copy(this)..normalize();
-
-  /// Normalize vector into [out].
-  Vector3 normalizeInto(Vector3 out) {
-    out
-      ..setFrom(this)
-      ..normalize();
-    return out;
-  }
-
-  /// Distance from [this] to [arg]
-  double distanceTo(Vector3 arg) => math.sqrt(distanceToSquared(arg));
-
-  /// Squared distance from [this] to [arg]
-  double distanceToSquared(Vector3 arg) {
-    final Float32List argStorage = arg._v3storage;
-    final double dx = _v3storage[0] - argStorage[0];
-    final double dy = _v3storage[1] - argStorage[1];
-    final double dz = _v3storage[2] - argStorage[2];
-
-    return dx * dx + dy * dy + dz * dz;
-  }
-
-  /// Returns the angle between [this] vector and [other] in radians.
-  double angleTo(Vector3 other) {
-    final Float32List otherStorage = other._v3storage;
-    if (_v3storage[0] == otherStorage[0] &&
-        _v3storage[1] == otherStorage[1] &&
-        _v3storage[2] == otherStorage[2]) {
-      return 0.0;
-    }
-
-    final double d = dot(other) / (length * other.length);
-
-    return math.acos(d.clamp(-1.0, 1.0));
-  }
-
-  /// Inner product.
-  double dot(Vector3 other) {
-    final Float32List otherStorage = other._v3storage;
-    double sum;
-    sum = _v3storage[0] * otherStorage[0];
-    sum += _v3storage[1] * otherStorage[1];
-    sum += _v3storage[2] * otherStorage[2];
-    return sum;
-  }
-
-  /// Projects [this] using the projection matrix [arg]
-  void applyProjection(Matrix4 arg) {
-    final Float32List argStorage = arg.storage;
-    final double x = _v3storage[0];
-    final double y = _v3storage[1];
-    final double z = _v3storage[2];
-    final double d = 1.0 /
-        (argStorage[3] * x +
-            argStorage[7] * y +
-            argStorage[11] * z +
-            argStorage[15]);
-    _v3storage[0] = (argStorage[0] * x +
-            argStorage[4] * y +
-            argStorage[8] * z +
-            argStorage[12]) *
-        d;
-    _v3storage[1] = (argStorage[1] * x +
-            argStorage[5] * y +
-            argStorage[9] * z +
-            argStorage[13]) *
-        d;
-    _v3storage[2] = (argStorage[2] * x +
-            argStorage[6] * y +
-            argStorage[10] * z +
-            argStorage[14]) *
-        d;
-  }
-
-  /// True if any component is infinite.
-  bool get isInfinite {
-    bool isInfinite = false;
-    isInfinite = isInfinite || _v3storage[0].isInfinite;
-    isInfinite = isInfinite || _v3storage[1].isInfinite;
-    isInfinite = isInfinite || _v3storage[2].isInfinite;
-    return isInfinite;
+    return (x * x) + (y * y) + (z * z);
   }
-
-  /// True if any component is NaN.
-  bool get isNaN {
-    bool isNan = false;
-    isNan = isNan || _v3storage[0].isNaN;
-    isNan = isNan || _v3storage[1].isNaN;
-    isNan = isNan || _v3storage[2].isNaN;
-    return isNan;
-  }
-
-  /// Add [arg] to [this].
-  void add(Vector3 arg) {
-    final Float32List argStorage = arg._v3storage;
-    _v3storage[0] = _v3storage[0] + argStorage[0];
-    _v3storage[1] = _v3storage[1] + argStorage[1];
-    _v3storage[2] = _v3storage[2] + argStorage[2];
-  }
-
-  /// Add [arg] scaled by [factor] to [this].
-  void addScaled(Vector3 arg, double factor) {
-    final Float32List argStorage = arg._v3storage;
-    _v3storage[0] = _v3storage[0] + argStorage[0] * factor;
-    _v3storage[1] = _v3storage[1] + argStorage[1] * factor;
-    _v3storage[2] = _v3storage[2] + argStorage[2] * factor;
-  }
-
-  /// Subtract [arg] from [this].
-  void sub(Vector3 arg) {
-    final Float32List argStorage = arg._v3storage;
-    _v3storage[0] = _v3storage[0] - argStorage[0];
-    _v3storage[1] = _v3storage[1] - argStorage[1];
-    _v3storage[2] = _v3storage[2] - argStorage[2];
-  }
-
-  /// Multiply entries in [this] with entries in [arg].
-  void multiply(Vector3 arg) {
-    final Float32List argStorage = arg._v3storage;
-    _v3storage[0] = _v3storage[0] * argStorage[0];
-    _v3storage[1] = _v3storage[1] * argStorage[1];
-    _v3storage[2] = _v3storage[2] * argStorage[2];
-  }
-
-  /// Divide entries in [this] with entries in [arg].
-  void divide(Vector3 arg) {
-    final Float32List argStorage = arg._v3storage;
-    _v3storage[0] = _v3storage[0] / argStorage[0];
-    _v3storage[1] = _v3storage[1] / argStorage[1];
-    _v3storage[2] = _v3storage[2] / argStorage[2];
-  }
-
-  /// Scale [this].
-  void scale(double arg) {
-    _v3storage[2] = _v3storage[2] * arg;
-    _v3storage[1] = _v3storage[1] * arg;
-    _v3storage[0] = _v3storage[0] * arg;
-  }
-
-  /// Create a copy of [this] and scale it by [arg].
-  Vector3 scaled(double arg) => clone()..scale(arg);
-
-  /// Clone of [this].
-  Vector3 clone() => Vector3.copy(this);
-
-  /// Copy [this] into [arg].
-  Vector3 copyInto(Vector3 arg) {
-    final Float32List argStorage = arg._v3storage;
-    argStorage[0] = _v3storage[0];
-    argStorage[1] = _v3storage[1];
-    argStorage[2] = _v3storage[2];
-    return arg;
-  }
-
-  /// Copies [this] into [array] starting at [offset].
-  void copyIntoArray(List<double> array, [int offset = 0]) {
-    array[offset + 2] = _v3storage[2];
-    array[offset + 1] = _v3storage[1];
-    array[offset + 0] = _v3storage[0];
-  }
-
-  set x(double arg) => _v3storage[0] = arg;
-  set y(double arg) => _v3storage[1] = arg;
-  set z(double arg) => _v3storage[2] = arg;
-
-  double get x => _v3storage[0];
-  double get y => _v3storage[1];
-  double get z => _v3storage[2];
 }
 
 /// Converts a matrix represented using [Float64List] to one represented using
diff --git a/lib/web_ui/lib/src/engine/view_embedder/dimensions_provider/custom_element_dimensions_provider.dart b/lib/web_ui/lib/src/engine/view_embedder/dimensions_provider/custom_element_dimensions_provider.dart
new file mode 100644
index 0000000000000000000000000000000000000000..25f77afdd50388383bcb0e7d705a72a8eb93d79d
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/view_embedder/dimensions_provider/custom_element_dimensions_provider.dart
@@ -0,0 +1,107 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:ui/src/engine/display.dart';
+import 'package:ui/src/engine/dom.dart';
+import 'package:ui/src/engine/window.dart';
+import 'package:ui/ui.dart' as ui show Size;
+
+import 'dimensions_provider.dart';
+
+/// This class provides observable, real-time dimensions of a host element.
+///
+/// This class needs a `Stream` of `devicePixelRatio` changes, like the one
+/// provided by [DisplayDprStream], because html resize observers do not report
+/// DPR changes.
+///
+/// All the measurements returned from this class are potentially *expensive*,
+/// and should be cached as needed. Every call to every method on this class
+/// WILL perform actual DOM measurements.
+///
+/// This broadcasts `null` size events, to match the implementation of the
+/// FullPageDimensionsProvider, but it could broadcast the size coming from the
+/// DomResizeObserverEntry. Further changes in the engine are required for this
+/// to be effective.
+class CustomElementDimensionsProvider extends DimensionsProvider {
+  /// Creates a [CustomElementDimensionsProvider] from a [_hostElement].
+  CustomElementDimensionsProvider(this._hostElement, {
+    Stream<double>? onDprChange,
+  }) {
+    // Send a resize event when the page DPR changes.
+    _dprChangeStreamSubscription = onDprChange?.listen((_) {
+      _broadcastSize(null);
+    });
+
+    // Hook up a resize observer on the hostElement (if supported!).
+    _hostElementResizeObserver = createDomResizeObserver((
+      List<DomResizeObserverEntry> entries,
+      DomResizeObserver _,
+    ) {
+      for (final DomResizeObserverEntry _ in entries) {
+        _broadcastSize(null);
+      }
+    });
+
+    assert(() {
+      if (_hostElementResizeObserver == null) {
+        domWindow.console.warn('ResizeObserver API not supported. '
+            'Flutter will not resize with its hostElement.');
+      }
+      return true;
+    }());
+
+    _hostElementResizeObserver?.observe(_hostElement);
+  }
+
+  // The host element that will be used to retrieve (and observe) app size measurements.
+  final DomElement _hostElement;
+
+  // Handle resize events
+  late DomResizeObserver? _hostElementResizeObserver;
+  late StreamSubscription<double>? _dprChangeStreamSubscription;
+  final StreamController<ui.Size?> _onResizeStreamController =
+      StreamController<ui.Size?>.broadcast();
+
+  // Broadcasts the last seen `Size`.
+  void _broadcastSize(ui.Size? size) {
+    _onResizeStreamController.add(size);
+  }
+
+  @override
+  void close() {
+    super.close();
+    _hostElementResizeObserver?.disconnect();
+    // ignore:unawaited_futures
+    _dprChangeStreamSubscription?.cancel();
+    // ignore:unawaited_futures
+    _onResizeStreamController.close();
+  }
+
+  @override
+  Stream<ui.Size?> get onResize => _onResizeStreamController.stream;
+
+  @override
+  ui.Size computePhysicalSize() {
+    final double devicePixelRatio = EngineFlutterDisplay.instance.devicePixelRatio;
+    return ui.Size(
+      _hostElement.clientWidth * devicePixelRatio,
+      _hostElement.clientHeight * devicePixelRatio,
+    );
+  }
+
+  @override
+  ViewPadding computeKeyboardInsets(
+    double physicalHeight,
+    bool isEditingOnMobile,
+  ) {
+    return const ViewPadding(
+      top: 0,
+      right: 0,
+      bottom: 0,
+      left: 0,
+    );
+  }
+}
diff --git a/lib/web_ui/lib/src/engine/view_embedder/dimensions_provider/dimensions_provider.dart b/lib/web_ui/lib/src/engine/view_embedder/dimensions_provider/dimensions_provider.dart
new file mode 100644
index 0000000000000000000000000000000000000000..469f3a197d25b58deb3fb87282f7144e9032a306
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/view_embedder/dimensions_provider/dimensions_provider.dart
@@ -0,0 +1,81 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:meta/meta.dart';
+import 'package:ui/src/engine/dom.dart';
+import 'package:ui/src/engine/view_embedder/display_dpr_stream.dart';
+import 'package:ui/src/engine/window.dart';
+import 'package:ui/ui.dart' as ui show Size;
+
+import 'custom_element_dimensions_provider.dart';
+import 'full_page_dimensions_provider.dart';
+
+/// This class provides the dimensions of the "viewport" in which the app is rendered.
+///
+/// Similarly to the `EmbeddingStrategy`, this class is specialized to handle
+/// different sources of information:
+///
+/// * [FullPageDimensionsProvider] - The default behavior, uses the VisualViewport
+///   API to measure, and react to, the dimensions of the full browser window.
+/// * [CustomElementDimensionsProvider] - Uses a custom html Element as the source
+///   of dimensions, and the ResizeObserver to notify the app of changes.
+///
+/// All the measurements returned from this class are potentially *expensive*,
+/// and should be cached as needed. Every call to every method on this class
+/// WILL perform actual DOM measurements.
+abstract class DimensionsProvider {
+  DimensionsProvider();
+
+  /// Creates the appropriate DimensionsProvider depending on the incoming [hostElement].
+  factory DimensionsProvider.create({DomElement? hostElement}) {
+    if (hostElement != null) {
+      return CustomElementDimensionsProvider(
+        hostElement,
+        onDprChange: DisplayDprStream.instance.dprChanged,
+      );
+    } else {
+      return FullPageDimensionsProvider();
+    }
+  }
+
+  /// Returns the [ui.Size] of the "viewport".
+  ///
+  /// This function is expensive. It triggers browser layout if there are
+  /// pending DOM writes.
+  ui.Size computePhysicalSize();
+
+  /// Returns the [ViewPadding] of the keyboard insets (if present).
+  ViewPadding computeKeyboardInsets(
+    double physicalHeight,
+    bool isEditingOnMobile,
+  );
+
+  /// Returns a Stream with the changes to [ui.Size] (when cheap to get).
+  ///
+  /// Currently this Stream always returns `null` measurements because the
+  /// resize event that we use for [FullPageDimensionsProvider] does not contain
+  /// the new size, so users of this Stream everywhere immediately retrieve the
+  /// new `physicalSize` from the window.
+  ///
+  /// The [CustomElementDimensionsProvider] *could* broadcast the new size, but
+  /// to keep both implementations consistent (and their consumers), for now all
+  /// events from this Stream are going to be `null` (until we find a performant
+  /// way to retrieve the dimensions in full-page mode).
+  Stream<ui.Size?> get onResize;
+
+  /// Whether the [DimensionsProvider] instance has been closed or not.
+  @visibleForTesting
+  bool isClosed = false;
+
+  /// Clears any resources grabbed by the DimensionsProvider instance.
+  ///
+  /// All internal event handlers will be disconnected, and the [onResize] Stream
+  /// will be closed.
+  @mustCallSuper
+  void close() {
+    isClosed = true;
+  }
+}
diff --git a/lib/web_ui/lib/src/engine/view_embedder/dimensions_provider/full_page_dimensions_provider.dart b/lib/web_ui/lib/src/engine/view_embedder/dimensions_provider/full_page_dimensions_provider.dart
new file mode 100644
index 0000000000000000000000000000000000000000..bcacba4c869f34e23b07f780d6f7509739b125cf
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/view_embedder/dimensions_provider/full_page_dimensions_provider.dart
@@ -0,0 +1,124 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:ui/src/engine/browser_detection.dart';
+import 'package:ui/src/engine/display.dart';
+import 'package:ui/src/engine/dom.dart';
+import 'package:ui/src/engine/window.dart';
+import 'package:ui/ui.dart' as ui show Size;
+
+import 'dimensions_provider.dart';
+
+/// This class provides the real-time dimensions of a "full page" viewport.
+///
+/// All the measurements returned from this class are potentially *expensive*,
+/// and should be cached as needed. Every call to every method on this class
+/// WILL perform actual DOM measurements.
+class FullPageDimensionsProvider extends DimensionsProvider {
+  /// Constructs a global [FullPageDimensionsProvider].
+  ///
+  /// Doesn't need any parameters, because all the measurements come from the
+  /// globally available [DomVisualViewport].
+  FullPageDimensionsProvider() {
+    // Determine what 'resize' event we'll be listening to.
+    // This is needed for older browsers (Firefox < 91, Safari < 13)
+    // TODO(dit): Clean this up, https://github.com/flutter/flutter/issues/117105
+    final DomEventTarget resizeEventTarget =
+        domWindow.visualViewport ?? domWindow;
+
+    // Subscribe to the 'resize' event, and convert it to a ui.Size stream.
+    _domResizeSubscription = DomSubscription(
+      resizeEventTarget,
+      'resize',
+      _onVisualViewportResize,
+    );
+  }
+
+  late DomSubscription _domResizeSubscription;
+  final StreamController<ui.Size?> _onResizeStreamController =
+      StreamController<ui.Size?>.broadcast();
+
+  void _onVisualViewportResize(DomEvent event) {
+    // `event` doesn't contain any size information (as opposed to the custom
+    // element resize observer). If it did, we could broadcast the physical
+    // dimensions here and never have to re-measure the app, until the next
+    // resize event triggers.
+    // Would it be too costly to broadcast the computed physical size from here,
+    // and then never re-measure the app?
+    // Related: https://github.com/flutter/flutter/issues/117036
+    _onResizeStreamController.add(null);
+  }
+
+  @override
+  void close() {
+    super.close();
+    _domResizeSubscription.cancel();
+    // ignore:unawaited_futures
+    _onResizeStreamController.close();
+  }
+
+  @override
+  Stream<ui.Size?> get onResize => _onResizeStreamController.stream;
+
+  @override
+  ui.Size computePhysicalSize() {
+    late double windowInnerWidth;
+    late double windowInnerHeight;
+    final DomVisualViewport? viewport = domWindow.visualViewport;
+    final double devicePixelRatio = EngineFlutterDisplay.instance.devicePixelRatio;
+
+    if (viewport != null) {
+      if (operatingSystem == OperatingSystem.iOs) {
+        /// Chrome on iOS reports incorrect viewport.height when app
+        /// starts in portrait orientation and the phone is rotated to
+        /// landscape.
+        ///
+        /// We instead use documentElement clientWidth/Height to read
+        /// accurate physical size. VisualViewport api is only used during
+        /// text editing to make sure inset is correctly reported to
+        /// framework.
+        final double docWidth = domDocument.documentElement!.clientWidth;
+        final double docHeight = domDocument.documentElement!.clientHeight;
+        windowInnerWidth = docWidth * devicePixelRatio;
+        windowInnerHeight = docHeight * devicePixelRatio;
+      } else {
+        windowInnerWidth = viewport.width! * devicePixelRatio;
+        windowInnerHeight = viewport.height! * devicePixelRatio;
+      }
+    } else {
+      windowInnerWidth = domWindow.innerWidth! * devicePixelRatio;
+      windowInnerHeight = domWindow.innerHeight! * devicePixelRatio;
+    }
+    return ui.Size(
+      windowInnerWidth,
+      windowInnerHeight,
+    );
+  }
+
+  @override
+  ViewPadding computeKeyboardInsets(
+    double physicalHeight,
+    bool isEditingOnMobile,
+  ) {
+    final double devicePixelRatio = EngineFlutterDisplay.instance.devicePixelRatio;
+    final DomVisualViewport? viewport = domWindow.visualViewport;
+    late double windowInnerHeight;
+
+    if (viewport != null) {
+      if (operatingSystem == OperatingSystem.iOs && !isEditingOnMobile) {
+        windowInnerHeight =
+            domDocument.documentElement!.clientHeight * devicePixelRatio;
+      } else {
+        windowInnerHeight = viewport.height! * devicePixelRatio;
+      }
+    } else {
+      windowInnerHeight = domWindow.innerHeight! * devicePixelRatio;
+    }
+    final double bottomPadding = physicalHeight - windowInnerHeight;
+
+    return ViewPadding(bottom: bottomPadding, left: 0, right: 0, top: 0);
+  }
+}
diff --git a/lib/web_ui/lib/src/engine/view_embedder/display_dpr_stream.dart b/lib/web_ui/lib/src/engine/view_embedder/display_dpr_stream.dart
new file mode 100644
index 0000000000000000000000000000000000000000..d73eeb5aec2441604ebf1ade9148f1bcf78e28a7
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/view_embedder/display_dpr_stream.dart
@@ -0,0 +1,93 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'dart:js_interop';
+
+import 'package:meta/meta.dart';
+import 'package:ui/src/engine/display.dart';
+import 'package:ui/src/engine/dom.dart';
+import 'package:ui/ui.dart' as ui show Display;
+
+/// Provides a stream of `devicePixelRatio` changes for the given display.
+///
+/// Note that until the Window Management API is generally available, this class
+/// only monitors the global `devicePixelRatio` property, provided by the default
+/// [EngineFlutterDisplay.instance].
+///
+/// See: https://developer.mozilla.org/en-US/docs/Web/API/Window_Management_API
+class DisplayDprStream {
+  DisplayDprStream(
+    this._display, {
+    @visibleForTesting DebugDisplayDprStreamOverrides? overrides,
+  })  : _currentDpr = _display.devicePixelRatio,
+        _debugOverrides = overrides {
+    // Start listening to DPR changes.
+    _subscribeToMediaQuery();
+  }
+
+  /// A singleton instance of DisplayDprStream.
+  static DisplayDprStream instance =
+      DisplayDprStream(EngineFlutterDisplay.instance);
+
+  // The display object that will provide the DPR information.
+  final ui.Display _display;
+
+  // Last reported value of DPR.
+  double _currentDpr;
+
+  // Controls the [dprChanged] broadcast Stream.
+  final StreamController<double> _dprStreamController =
+      StreamController<double>.broadcast();
+
+  // Object that fires a `change` event for the `_currentDpr`.
+  late DomEventTarget _dprMediaQuery;
+
+  // Creates the media query for the latest known DPR value, and adds a change listener to it.
+  void _subscribeToMediaQuery() {
+    if (_debugOverrides?.getMediaQuery != null) {
+      _dprMediaQuery = _debugOverrides!.getMediaQuery!(_currentDpr);
+    } else {
+      _dprMediaQuery = domWindow.matchMedia('(resolution: ${_currentDpr}dppx)');
+    }
+    _dprMediaQuery.addEventListenerWithOptions(
+      'change',
+      createDomEventListener(_onDprMediaQueryChange),
+      <String, Object>{
+        // We only listen `once` because this event only triggers once when the
+        // DPR changes from `_currentDpr`. Once that happens, we need a new
+        // `_dprMediaQuery` that is watching the new `_currentDpr`.
+        //
+        // By using `once`, we don't need to worry about detaching the event
+        // listener from the old mediaQuery after we're done with it.
+        'once': true,
+        'passive': true,
+      },
+    );
+  }
+
+  // Handler of the _dprMediaQuery 'change' event.
+  //
+  // This calls subscribe again because events are listened to with `once: true`.
+  JSVoid _onDprMediaQueryChange(DomEvent _) {
+    _currentDpr = _display.devicePixelRatio;
+    _dprStreamController.add(_currentDpr);
+    // Re-subscribe...
+    _subscribeToMediaQuery();
+  }
+
+  /// A stream that emits the latest value of [EngineFlutterDisplay.instance.devicePixelRatio].
+  Stream<double> get dprChanged => _dprStreamController.stream;
+
+  // The overrides object that is used for testing.
+  final DebugDisplayDprStreamOverrides? _debugOverrides;
+}
+
+@visibleForTesting
+class DebugDisplayDprStreamOverrides {
+  DebugDisplayDprStreamOverrides({
+    this.getMediaQuery,
+  });
+  final DomEventTarget Function(double currentValue)? getMediaQuery;
+}
diff --git a/lib/web_ui/lib/src/engine/view_embedder/dom_manager.dart b/lib/web_ui/lib/src/engine/view_embedder/dom_manager.dart
new file mode 100644
index 0000000000000000000000000000000000000000..22d7cb372d10666df463acceeaca6053581c2a39
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/view_embedder/dom_manager.dart
@@ -0,0 +1,233 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:ui/ui.dart' as ui;
+
+import '../configuration.dart';
+import '../dom.dart';
+import '../platform_views/content_manager.dart';
+import '../safe_browser_api.dart';
+import 'style_manager.dart';
+
+/// Manages DOM elements and the DOM structure for a [ui.FlutterView].
+///
+/// Here's the general DOM structure of a Flutter View:
+///
+/// [rootElement] <flutter-view>
+///   |
+///   +- [platformViewsHost] <flt-glass-pane>
+///   |    |
+///   |    +- [renderingHost] #shadow-root
+///   |    |    |
+///   |    |    +- <flt-semantics-placeholder>
+///   |    |    |
+///   |    |    +- [sceneHost] <flt-scene-host>
+///   |    |    |    |
+///   |    |    |    +- <flt-scene>
+///   |    |    |
+///   |    |    +- [announcementsHost] <flt-announcement-host>
+///   |    |    |
+///   |    |    +- <style>
+///   |    |
+///   |    +- ...platform views
+///   |
+///   +- [textEditingHost] <flt-text-editing-host>
+///   |    |
+///   |    +- ...text fields
+///   |
+///   +- [semanticsHost] <flt-semantics-host>
+///   |    |
+///   |    +- ...semantics nodes
+///   |
+///   +- <style>
+///
+class DomManager {
+  factory DomManager({required double devicePixelRatio}) {
+    final DomElement rootElement = domDocument.createElement(DomManager.flutterViewTagName);
+    final DomElement platformViewsHost = domDocument.createElement(DomManager.glassPaneTagName);
+    final DomShadowRoot renderingHost = _attachShadowRoot(platformViewsHost);
+    final DomElement sceneHost = domDocument.createElement(DomManager.sceneHostTagName);
+    final DomElement textEditingHost = domDocument.createElement(DomManager.textEditingHostTagName);
+    final DomElement semanticsHost = domDocument.createElement(DomManager.semanticsHostTagName);
+    final DomElement announcementsHost = createDomElement(DomManager.announcementsHostTagName);
+
+    // Root element children.
+    rootElement.appendChild(platformViewsHost);
+    rootElement.appendChild(textEditingHost);
+
+    // The semantic host goes last because hit-test order-wise it must be
+    // first. If semantics goes under the scene host, platform views will
+    // obscure semantic elements.
+    //
+    // You may be wondering: wouldn't semantics obscure platform views and
+    // make then not accessible? At least with some careful planning, that
+    // should not be the case. The semantics tree makes all of its non-leaf
+    // elements transparent. This way, if a platform view appears among other
+    // interactive Flutter widgets, as long as those widgets do not intersect
+    // with the platform view, the platform view will be reachable.
+    rootElement.appendChild(semanticsHost);
+
+    // Rendering host (shadow root) children.
+
+    renderingHost.append(sceneHost);
+    renderingHost.append(announcementsHost);
+
+    // Styling.
+
+    StyleManager.attachGlobalStyles(
+      node: rootElement,
+      styleId: 'flt-text-editing-stylesheet',
+      styleNonce: configuration.nonce,
+      cssSelectorPrefix: DomManager.flutterViewTagName,
+    );
+
+    StyleManager.attachGlobalStyles(
+      node: renderingHost,
+      styleId: 'flt-internals-stylesheet',
+      styleNonce: configuration.nonce,
+      cssSelectorPrefix: '',
+    );
+
+    StyleManager.styleSceneHost(
+      sceneHost,
+      debugShowSemanticsNodes: configuration.debugShowSemanticsNodes,
+    );
+
+    StyleManager.styleSemanticsHost(
+      semanticsHost,
+      devicePixelRatio,
+    );
+
+    return DomManager._(
+      rootElement: rootElement,
+      platformViewsHost: platformViewsHost,
+      renderingHost: renderingHost,
+      sceneHost: sceneHost,
+      textEditingHost: textEditingHost,
+      semanticsHost: semanticsHost,
+      announcementsHost: announcementsHost,
+    );
+  }
+
+  DomManager._({
+    required this.rootElement,
+    required this.platformViewsHost,
+    required this.renderingHost,
+    required this.sceneHost,
+    required this.textEditingHost,
+    required this.semanticsHost,
+    required this.announcementsHost,
+  });
+
+  /// The tag name for the Flutter View root element.
+  static const String flutterViewTagName = 'flutter-view';
+
+  /// The tag name for the glass-pane.
+  static const String glassPaneTagName = 'flt-glass-pane';
+
+  /// The tag name for the scene host.
+  static const String sceneHostTagName = 'flt-scene-host';
+
+  /// The tag name for the text editing host.
+  static const String textEditingHostTagName = 'flt-text-editing-host';
+
+  /// The tag name for the semantics host.
+  static const String semanticsHostTagName = 'flt-semantics-host';
+
+  /// The tag name for the accessibility announcements host.
+  static const String announcementsHostTagName = 'flt-announcement-host';
+
+  /// The root DOM element for the entire Flutter View.
+  ///
+  /// This is where input events are captured, such as pointer events.
+  ///
+  /// If semantics is enabled, this element also contains the semantics DOM tree,
+  /// which captures semantics input events.
+  final DomElement rootElement;
+
+  /// Hosts all platform view elements.
+  final DomElement platformViewsHost;
+
+  /// Hosts all rendering elements and canvases.
+  final DomShadowRoot renderingHost;
+
+  /// Hosts the <flt-scene> element.
+  ///
+  /// This element is created and inserted in the HTML DOM once. It is never
+  /// removed or moved. However the <flt-scene> inside of it may be replaced.
+  final DomElement sceneHost;
+
+  /// Hosts all text editing elements.
+  final DomElement textEditingHost;
+
+  /// Hosts the semantics tree.
+  ///
+  /// This element is in front of the [renderingHost] and [platformViewsHost].
+  /// Otherwise, the phone will disable focusing by touch, only by tabbing
+  /// around the UI.
+  final DomElement semanticsHost;
+
+  /// This is where accessibility announcements are inserted.
+  final DomElement announcementsHost;
+
+  DomElement? _lastSceneElement;
+
+  /// Inserts the [sceneElement] into the DOM and removes the existing scene (if
+  /// any).
+  ///
+  /// The [sceneElement] is inserted  as a child of the <flt-scene-host> element
+  /// inside the [renderingHost].
+  ///
+  /// If the [sceneElement] has already been inserted, this method does nothing
+  /// to avoid unnecessary DOM mutations. This is both faster and more correct,
+  /// because moving DOM nodes loses internal state, such as text selection.
+  void setScene(DomElement sceneElement) {
+    if (sceneElement != _lastSceneElement) {
+      _lastSceneElement?.remove();
+      _lastSceneElement = sceneElement;
+      sceneHost.append(sceneElement);
+    }
+  }
+
+  /// Injects a platform view with [platformViewId] into [platformViewsHost].
+  ///
+  /// If the platform view is already injected, this method does *nothing*.
+  ///
+  /// The `platformViewsHost` can only be different if `platformViewId` is moving
+  /// from one [FlutterView] to another. In that case, the browser will move the
+  /// slot contents from the old `platformViewsHost` to the new one, but that
+  /// will cause the platformView to reset its state (an iframe will re-render,
+  /// text selections will be lost, video playback interrupted, etc...)
+  ///
+  /// Try not to move platform views across views!
+  void injectPlatformView(int platformViewId) {
+    // For now, we don't need anything fancier. If needed, this can be converted
+    // to a PlatformViewStrategy class for each web-renderer backend?
+    final DomElement? pv = PlatformViewManager.instance.getSlottedContent(platformViewId);
+    if (pv == null) {
+      domWindow.console.debug('Failed to inject Platform View Id: $platformViewId. '
+        'Render seems to be happening before a `flutter/platform_views:create` platform message!');
+      return;
+    }
+    // If pv is already a descendant of platformViewsHost -> noop
+    if (pv.parent == platformViewsHost) {
+      return;
+    }
+    platformViewsHost.append(pv);
+  }
+}
+
+DomShadowRoot _attachShadowRoot(DomElement element) {
+  assert(
+    getJsProperty<Object?>(element, 'attachShadow') != null,
+    'ShadowDOM is not supported in this browser.',
+  );
+
+  return element.attachShadow(<String, dynamic>{
+    'mode': 'open',
+    // This needs to stay false to prevent issues like this:
+    // - https://github.com/flutter/flutter/issues/85759
+    'delegatesFocus': false,
+  });
+}
diff --git a/lib/web_ui/lib/src/engine/view_embedder/embedding_strategy/custom_element_embedding_strategy.dart b/lib/web_ui/lib/src/engine/view_embedder/embedding_strategy/custom_element_embedding_strategy.dart
new file mode 100644
index 0000000000000000000000000000000000000000..802d81341eb570378457a3093757fe02e88f6369
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/view_embedder/embedding_strategy/custom_element_embedding_strategy.dart
@@ -0,0 +1,44 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:ui/src/engine/dom.dart';
+
+import '../hot_restart_cache_handler.dart' show registerElementForCleanup;
+import 'embedding_strategy.dart';
+
+/// An [EmbeddingStrategy] that renders flutter inside a target host element.
+///
+/// This strategy attempts to minimize DOM modifications outside of the host
+/// element, so it plays "nice" with other web frameworks.
+class CustomElementEmbeddingStrategy implements EmbeddingStrategy {
+  /// Creates a [CustomElementEmbeddingStrategy] to embed a Flutter view into [_hostElement].
+  CustomElementEmbeddingStrategy(this.hostElement) {
+    hostElement.clearChildren();
+    hostElement.setAttribute('flt-embedding', 'custom-element');
+  }
+
+  @override
+  DomEventTarget get globalEventTarget => _rootElement;
+
+  @override
+  final DomElement hostElement;
+
+  /// The root element of the Flutter view.
+  late final DomElement _rootElement;
+
+  @override
+  void attachViewRoot(DomElement rootElement) {
+    rootElement
+      ..style.width = '100%'
+      ..style.height = '100%'
+      ..style.display = 'block'
+      ..style.overflow = 'hidden'
+      ..style.position = 'relative';
+
+    hostElement.appendChild(rootElement);
+
+    registerElementForCleanup(rootElement);
+    _rootElement = rootElement;
+  }
+}
diff --git a/lib/web_ui/lib/src/engine/view_embedder/embedding_strategy/embedding_strategy.dart b/lib/web_ui/lib/src/engine/view_embedder/embedding_strategy/embedding_strategy.dart
new file mode 100644
index 0000000000000000000000000000000000000000..e792ac5476d59a34ce2ee6cdd74896c4ebf33a23
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/view_embedder/embedding_strategy/embedding_strategy.dart
@@ -0,0 +1,37 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:ui/src/engine/dom.dart';
+
+import 'custom_element_embedding_strategy.dart';
+import 'full_page_embedding_strategy.dart';
+
+/// Controls how a Flutter app is placed, sized and measured on the page.
+///
+/// The base class handles general behavior (like hot-restart cleanup), and then
+/// each specialization enables different types of DOM embeddings:
+///
+/// * [FullPageEmbeddingStrategy] - The default behavior, where flutter takes
+///   control of the whole page.
+/// * [CustomElementEmbeddingStrategy] - Flutter is rendered inside a custom host
+///   element, provided by the web app programmer through the engine
+///   initialization.
+abstract class EmbeddingStrategy {
+  factory EmbeddingStrategy.create({DomElement? hostElement}) {
+    if (hostElement != null) {
+      return CustomElementEmbeddingStrategy(hostElement);
+    } else {
+      return FullPageEmbeddingStrategy();
+    }
+  }
+
+  /// The host element in which the Flutter view is embedded.
+  DomElement get hostElement;
+
+  /// The global event target for the Flutter view.
+  DomEventTarget get globalEventTarget;
+
+  /// Attaches the view root element into the hostElement.
+  void attachViewRoot(DomElement rootElement);
+}
diff --git a/lib/web_ui/lib/src/engine/view_embedder/embedding_strategy/full_page_embedding_strategy.dart b/lib/web_ui/lib/src/engine/view_embedder/embedding_strategy/full_page_embedding_strategy.dart
new file mode 100644
index 0000000000000000000000000000000000000000..90de0467d295df848afd4fc80a43c8ca44989026
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/view_embedder/embedding_strategy/full_page_embedding_strategy.dart
@@ -0,0 +1,95 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:ui/src/engine/dom.dart';
+import 'package:ui/src/engine/util.dart' show setElementStyle;
+
+import '../hot_restart_cache_handler.dart' show registerElementForCleanup;
+import 'embedding_strategy.dart';
+
+/// An [EmbeddingStrategy] that takes over the whole web page.
+///
+/// This strategy takes over the <body> element, modifies the viewport meta-tag,
+/// and ensures that the root Flutter view covers the whole screen.
+class FullPageEmbeddingStrategy implements EmbeddingStrategy {
+  FullPageEmbeddingStrategy() {
+    hostElement.setAttribute('flt-embedding', 'full-page');
+    _applyViewportMeta();
+    _setHostStyles();
+  }
+
+  @override
+  final DomElement hostElement = domDocument.body!;
+
+  @override
+  DomEventTarget get globalEventTarget => domWindow;
+
+  @override
+  void attachViewRoot(DomElement rootElement) {
+    /// Tweaks style so the rootElement works well with the hostElement.
+    rootElement.style
+      ..position = 'absolute'
+      ..top = '0'
+      ..right = '0'
+      ..bottom = '0'
+      ..left = '0';
+
+    hostElement.append(rootElement);
+
+    registerElementForCleanup(rootElement);
+  }
+
+  // Sets the global styles for a flutter app.
+  void _setHostStyles() {
+    setElementStyle(hostElement, 'position', 'fixed');
+    setElementStyle(hostElement, 'top', '0');
+    setElementStyle(hostElement, 'right', '0');
+    setElementStyle(hostElement, 'bottom', '0');
+    setElementStyle(hostElement, 'left', '0');
+    setElementStyle(hostElement, 'overflow', 'hidden');
+    setElementStyle(hostElement, 'padding', '0');
+    setElementStyle(hostElement, 'margin', '0');
+
+    setElementStyle(hostElement, 'user-select', 'none');
+    setElementStyle(hostElement, '-webkit-user-select', 'none');
+
+    // This is required to prevent the browser from doing any native touch
+    // handling. If this is not done, the browser doesn't report 'pointermove'
+    // events properly.
+    setElementStyle(hostElement, 'touch-action', 'none');
+  }
+
+  // Sets a meta viewport tag appropriate for Flutter Web in full screen.
+  void _applyViewportMeta() {
+    for (final DomElement viewportMeta
+        in domDocument.head!.querySelectorAll('meta[name="viewport"]')) {
+      assert(() {
+        // Filter out the meta tag that the engine placed on the page. This is
+        // to avoid UI flicker during hot restart. Hot restart will clean up the
+        // old meta tag synchronously with the first post-restart frame.
+        if (!viewportMeta.hasAttribute('flt-viewport')) {
+          print(
+            'WARNING: found an existing <meta name="viewport"> tag. Flutter '
+            'Web uses its own viewport configuration for better compatibility '
+            'with Flutter. This tag will be replaced.',
+          );
+        }
+        return true;
+      }());
+      viewportMeta.remove();
+    }
+
+    // The meta viewport is always removed by the for method above, so we don't
+    // need to do anything else here, other than create it again.
+    final DomHTMLMetaElement viewportMeta = createDomHTMLMetaElement()
+      ..setAttribute('flt-viewport', '')
+      ..name = 'viewport'
+      ..content = 'width=device-width, initial-scale=1.0, '
+          'maximum-scale=1.0, user-scalable=no';
+
+    domDocument.head!.append(viewportMeta);
+
+    registerElementForCleanup(viewportMeta);
+  }
+}
diff --git a/lib/web_ui/lib/src/engine/view_embedder/flutter_view_manager.dart b/lib/web_ui/lib/src/engine/view_embedder/flutter_view_manager.dart
new file mode 100644
index 0000000000000000000000000000000000000000..684e5ea667c225298ba8aa08c683d797fd7527ec
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/view_embedder/flutter_view_manager.dart
@@ -0,0 +1,118 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+import 'dart:async';
+import 'package:ui/src/engine.dart';
+
+/// Encapsulates view objects, and their optional metadata indexed by `viewId`.
+class FlutterViewManager {
+  FlutterViewManager(this._dispatcher);
+
+  final EnginePlatformDispatcher _dispatcher;
+
+  // A map of EngineFlutterViews indexed by their viewId.
+  final Map<int, EngineFlutterView> _viewData = <int, EngineFlutterView>{};
+  // A map of (optional) JsFlutterViewOptions, indexed by their viewId.
+  final Map<int, JsFlutterViewOptions> _jsViewOptions =
+      <int, JsFlutterViewOptions>{};
+  // The controller of the [onViewCreated] stream.
+  final StreamController<int> _onViewCreatedController =
+      StreamController<int>.broadcast(sync: true);
+  // The controller of the [onViewDisposed] stream.
+  final StreamController<int> _onViewDisposedController =
+      StreamController<int>.broadcast(sync: true);
+
+  /// A stream of viewIds that will fire when a view is created.
+  Stream<int> get onViewCreated => _onViewCreatedController.stream;
+
+  /// A stream of viewIds that will fire when a view is disposed.
+  Stream<int> get onViewDisposed => _onViewDisposedController.stream;
+
+  /// Exposes all the [EngineFlutterView]s registered so far.
+  Iterable<EngineFlutterView> get views => _viewData.values;
+
+  /// Retrieves an [EngineFlutterView] by its `viewId`.
+  EngineFlutterView? operator [](int viewId) {
+    return _viewData[viewId];
+  }
+
+  EngineFlutterView createAndRegisterView(
+    JsFlutterViewOptions jsViewOptions,
+  ) {
+    final EngineFlutterView view = EngineFlutterView(
+      _dispatcher,
+      jsViewOptions.hostElement,
+      viewConstraints: jsViewOptions.viewConstraints,
+    );
+    registerView(view, jsViewOptions: jsViewOptions);
+    return view;
+  }
+
+  /// Stores a [view] and its (optional) [jsViewOptions], indexed by `viewId`.
+  ///
+  /// Returns the registered [view].
+  EngineFlutterView registerView(
+    EngineFlutterView view, {
+    JsFlutterViewOptions? jsViewOptions,
+  }) {
+    final int viewId = view.viewId;
+    assert(!_viewData.containsKey(viewId)); // Adding the same view twice?
+
+    // Store the view, and the jsViewOptions, if any...
+    _viewData[viewId] = view;
+    if (jsViewOptions != null) {
+      _jsViewOptions[viewId] = jsViewOptions;
+    }
+    _onViewCreatedController.add(viewId);
+
+    return view;
+  }
+
+  JsFlutterViewOptions? disposeAndUnregisterView(int viewId) {
+    final EngineFlutterView? view = _viewData[viewId];
+    if (view == null) {
+      return null;
+    }
+    final JsFlutterViewOptions? options = unregisterView(viewId);
+    view.dispose();
+    return options;
+  }
+
+  /// Un-registers [viewId].
+  ///
+  /// Returns its [JsFlutterViewOptions] (if any).
+  JsFlutterViewOptions? unregisterView(int viewId) {
+    _viewData.remove(viewId); // .dispose();
+    final JsFlutterViewOptions? jsViewOptions = _jsViewOptions.remove(viewId);
+    _onViewDisposedController.add(viewId);
+    return jsViewOptions;
+  }
+
+  /// Returns the [JsFlutterViewOptions] associated to `viewId` (if any).
+  ///
+  /// This is useful for plugins and apps that need this information, and can
+  /// be exposed through a method in ui_web.
+  JsFlutterViewOptions? getOptions(int viewId) {
+    return _jsViewOptions[viewId];
+  }
+
+  /// Returns the [viewId] if [rootElement] corresponds to any of the [views].
+  int? viewIdForRootElement(DomElement rootElement)  {
+    for(final EngineFlutterView view in views) {
+      if (view.dom.rootElement == rootElement) {
+        return view.viewId;
+      }
+    }
+    return null;
+  }
+
+  void dispose() {
+    // We need to call `toList()` in order to avoid concurrent modification
+    // inside the loop.
+    _viewData.keys.toList().forEach(disposeAndUnregisterView);
+    // Let listeners receive the unregistration events from the loop above, then
+    // close the streams.
+    _onViewCreatedController.close();
+    _onViewDisposedController.close();
+  }
+}
diff --git a/lib/web_ui/lib/src/engine/view_embedder/global_html_attributes.dart b/lib/web_ui/lib/src/engine/view_embedder/global_html_attributes.dart
new file mode 100644
index 0000000000000000000000000000000000000000..1af573c93d20766aed49175e96113edc4b85819c
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/view_embedder/global_html_attributes.dart
@@ -0,0 +1,53 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import '../dom.dart';
+
+/// Sets global attributes for a Flutter View.
+///
+/// The global attributes are set on the [rootElement] of the Flutter View, as
+/// well as the on [hostElement] where the Flutter View is inserted.
+///
+/// The [hostElement] corresponds to the <body> element in full-page mode.
+///
+/// The global attributes provide quick and general information about the
+/// Flutter app. They are set on a global element (e.g. the body element) to
+/// make it easily accessible to the user.
+class GlobalHtmlAttributes {
+  GlobalHtmlAttributes({required this.rootElement, required this.hostElement});
+
+  /// The [FlutterView.viewId] attribute name.
+  static const String flutterViewIdAttributeName = 'flt-view-id';
+
+  final DomElement rootElement;
+  final DomElement hostElement;
+
+  void applyAttributes({
+    required int viewId,
+    required bool autoDetectRenderer,
+    required String rendererTag,
+    required String buildMode,
+  }) {
+    // This `flt-view-id` attribute does not serve a function in the engine's
+    // operation, but it's useful for debugging, test automation, and DOM
+    // interop use-cases. It allows one to use CSS selectors to find views by
+    // their identifiers.
+    //
+    // Example:
+    //
+    //     document.querySelector('flutter-view[flt-view-id="$viewId"]')
+    rootElement.setAttribute(flutterViewIdAttributeName, viewId);
+
+    // How was the current renderer selected?
+    final String rendererSelection = autoDetectRenderer
+        ? 'auto-selected'
+        : 'requested explicitly';
+
+    hostElement.setAttribute('flt-renderer', '$rendererTag ($rendererSelection)');
+    hostElement.setAttribute('flt-build-mode', buildMode);
+    // TODO(mdebbar): Disable spellcheck until changes in the framework and
+    // engine are complete.
+    hostElement.setAttribute('spellcheck', 'false');
+  }
+}
diff --git a/lib/web_ui/lib/src/engine/view_embedder/hot_restart_cache_handler.dart b/lib/web_ui/lib/src/engine/view_embedder/hot_restart_cache_handler.dart
new file mode 100644
index 0000000000000000000000000000000000000000..eb8be79747b07ad37a8a35cc3312147134dc8725
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/view_embedder/hot_restart_cache_handler.dart
@@ -0,0 +1,73 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:js_interop';
+
+import 'package:meta/meta.dart';
+import 'package:ui/src/engine.dart';
+
+import '../dom.dart';
+
+/// This is state persistent across hot restarts that indicates what
+/// to clear.  Delay removal of old visible state to make the
+/// transition appear smooth.
+@JS('window.__flutterState')
+external JSArray<JSAny?>? get _jsHotRestartStore;
+
+@JS('window.__flutterState')
+external set _jsHotRestartStore(JSArray<JSAny?>? nodes);
+
+/// Handles [DomElement]s that need to be removed after a hot-restart.
+///
+/// This class shouldn't be used directly. It's only made public for testing
+/// purposes. Instead, use [registerElementForCleanup].
+///
+/// Elements are stored in a [JSArray] stored globally at `window.__flutterState`.
+///
+/// When the app hot-restarts (and a new instance of this class is created),
+/// all elements in the global [JSArray] is removed from the DOM.
+class HotRestartCacheHandler {
+  @visibleForTesting
+  HotRestartCacheHandler() {
+    _resetHotRestartStore();
+  }
+
+  /// Removes every element that was registered prior to the hot-restart from
+  /// the DOM.
+  void _resetHotRestartStore() {
+    final JSArray<JSAny?>? jsStore = _jsHotRestartStore;
+
+    if (jsStore != null) {
+      // We are in a post hot-restart world, clear the elements now.
+      final List<Object?> store = jsStore.toObjectShallow as List<Object?>;
+      for (final Object? element in store) {
+        if (element != null) {
+          (element as DomElement).remove();
+        }
+      }
+    }
+    _jsHotRestartStore = JSArray<JSAny?>();
+  }
+
+  /// Registers a [DomElement] to be removed after hot-restart.
+  @visibleForTesting
+  void registerElement(DomElement element) {
+    _jsHotRestartStore!.push(element as JSObject);
+  }
+}
+
+final HotRestartCacheHandler? _hotRestartCache = () {
+  // In release mode, we don't need a hot restart cache, so we leave it null.
+  HotRestartCacheHandler? cache;
+  assert(() {
+    cache = HotRestartCacheHandler();
+    return true;
+  }());
+  return cache;
+}();
+
+/// Registers a [DomElement] to be cleaned up after hot restart.
+void registerElementForCleanup(DomElement element) {
+  _hotRestartCache?.registerElement(element);
+}
diff --git a/lib/web_ui/lib/src/engine/view_embedder/style_manager.dart b/lib/web_ui/lib/src/engine/view_embedder/style_manager.dart
new file mode 100644
index 0000000000000000000000000000000000000000..5080b852c1d4a928ba5ed124d7ba4993b9ace2fd
--- /dev/null
+++ b/lib/web_ui/lib/src/engine/view_embedder/style_manager.dart
@@ -0,0 +1,197 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:meta/meta.dart';
+
+import '../browser_detection.dart';
+import '../dom.dart';
+import '../text_editing/text_editing.dart';
+import 'dom_manager.dart';
+
+/// Manages the CSS styles of the Flutter View.
+class StyleManager {
+  static const String defaultFontStyle = 'normal';
+  static const String defaultFontWeight = 'normal';
+  static const double defaultFontSize = 14.0;
+  static const String defaultFontFamily = 'sans-serif';
+  static const String defaultCssFont = '$defaultFontStyle $defaultFontWeight ${defaultFontSize}px $defaultFontFamily';
+
+  static void attachGlobalStyles({
+    required DomNode node,
+    required String styleId,
+    required String? styleNonce,
+    required String cssSelectorPrefix,
+  }) {
+    final DomHTMLStyleElement styleElement = createDomHTMLStyleElement(styleNonce);
+    styleElement.id = styleId;
+    // The style element must be appended to the DOM, or its `sheet` will be null later.
+    node.appendChild(styleElement);
+    applyGlobalCssRulesToSheet(
+      styleElement,
+      defaultCssFont: StyleManager.defaultCssFont,
+      cssSelectorPrefix: cssSelectorPrefix,
+    );
+  }
+
+  static void styleSceneHost(
+    DomElement sceneHost, {
+    bool debugShowSemanticsNodes = false,
+  }) {
+    assert(sceneHost.tagName.toLowerCase() == DomManager.sceneHostTagName.toLowerCase());
+    // Don't allow the scene to receive pointer events.
+    sceneHost.style.pointerEvents = 'none';
+    // When debugging semantics, make the scene semi-transparent so that the
+    // semantics tree is more prominent.
+    if (debugShowSemanticsNodes) {
+      sceneHost.style.opacity = '0.3';
+    }
+  }
+
+  static void styleSemanticsHost(
+    DomElement semanticsHost,
+    double devicePixelRatio,
+  ) {
+    assert(semanticsHost.tagName.toLowerCase() == DomManager.semanticsHostTagName.toLowerCase());
+    semanticsHost.style
+      ..position = 'absolute'
+      ..transformOrigin = '0 0 0';
+    scaleSemanticsHost(semanticsHost, devicePixelRatio);
+  }
+
+  /// The framework specifies semantics in physical pixels, but CSS uses
+  /// logical pixels. To compensate, an inverse scale is injected at the root
+  /// level.
+  static void scaleSemanticsHost(
+    DomElement semanticsHost,
+    double devicePixelRatio,
+  ) {
+    assert(semanticsHost.tagName.toLowerCase() == DomManager.semanticsHostTagName.toLowerCase());
+    semanticsHost.style.transform = 'scale(${1 / devicePixelRatio})';
+  }
+}
+
+/// Applies the required global CSS to an incoming [DomCSSStyleSheet] `sheet`.
+@visibleForTesting
+void applyGlobalCssRulesToSheet(
+  DomHTMLStyleElement styleElement, {
+  String cssSelectorPrefix = '',
+  required String defaultCssFont,
+}) {
+  styleElement.appendText(
+    // Fixes #115216 by ensuring that our parameters only affect the flt-scene-host children.
+    '$cssSelectorPrefix ${DomManager.sceneHostTagName} {'
+    '  font: $defaultCssFont;'
+    '}'
+
+    // This undoes browser's default painting and layout attributes of range
+    // input, which is used in semantics.
+    '$cssSelectorPrefix flt-semantics input[type=range] {'
+    '  appearance: none;'
+    '  -webkit-appearance: none;'
+    '  width: 100%;'
+    '  position: absolute;'
+    '  border: none;'
+    '  top: 0;'
+    '  right: 0;'
+    '  bottom: 0;'
+    '  left: 0;'
+    '}'
+
+    // The invisible semantic text field may have a visible cursor and selection
+    // highlight. The following 2 CSS rules force everything to be transparent.
+    '$cssSelectorPrefix input::selection {'
+    '  background-color: transparent;'
+    '}'
+    '$cssSelectorPrefix textarea::selection {'
+    '  background-color: transparent;'
+    '}'
+
+    '$cssSelectorPrefix flt-semantics input,'
+    '$cssSelectorPrefix flt-semantics textarea,'
+    '$cssSelectorPrefix flt-semantics [contentEditable="true"] {'
+    '  caret-color: transparent;'
+    '}'
+
+    // Hide placeholder text
+    '$cssSelectorPrefix .flt-text-editing::placeholder {'
+    '  opacity: 0;'
+    '}'
+
+    // Hide outline when the flutter-view root element is focused.
+    '$cssSelectorPrefix:focus {'
+    ' outline: none;'
+    '}',
+  );
+
+  // By default on iOS, Safari would highlight the element that's being tapped
+  // on using gray background. This CSS rule disables that.
+  if (isSafari) {
+    styleElement.appendText(
+      '$cssSelectorPrefix * {'
+      '  -webkit-tap-highlight-color: transparent;'
+      '}'
+
+      '$cssSelectorPrefix flt-semantics input[type=range]::-webkit-slider-thumb {'
+      '  -webkit-appearance: none;'
+      '}'
+    );
+  }
+
+  if (isFirefox) {
+    // For firefox set line-height, otherwise text at same font-size will
+    // measure differently in ruler.
+    //
+    // - See: https://github.com/flutter/flutter/issues/44803
+    styleElement.appendText(
+      '$cssSelectorPrefix flt-paragraph,'
+      '$cssSelectorPrefix flt-span {'
+      '  line-height: 100%;'
+      '}'
+    );
+  }
+
+  // This CSS makes the autofill overlay transparent in order to prevent it
+  // from overlaying on top of Flutter-rendered text inputs.
+  // See: https://github.com/flutter/flutter/issues/118337.
+  if (browserHasAutofillOverlay()) {
+    styleElement.appendText(
+      '$cssSelectorPrefix .transparentTextEditing:-webkit-autofill,'
+      '$cssSelectorPrefix .transparentTextEditing:-webkit-autofill:hover,'
+      '$cssSelectorPrefix .transparentTextEditing:-webkit-autofill:focus,'
+      '$cssSelectorPrefix .transparentTextEditing:-webkit-autofill:active {'
+      '  opacity: 0 !important;'
+      '}'
+    );
+  }
+
+  // Removes password reveal icon for text inputs in Edge browsers.
+  // Non-Edge browsers will crash trying to parse -ms-reveal CSS selector,
+  // so we guard it behind an isEdge check.
+  // Fixes: https://github.com/flutter/flutter/issues/83695
+  if (isEdge) {
+    // We try-catch this, because in testing, we fake Edge via the UserAgent,
+    // so the below will throw an exception (because only real Edge understands
+    // the ::-ms-reveal pseudo-selector).
+    try {
+      styleElement.appendText(
+        '$cssSelectorPrefix input::-ms-reveal {'
+        '  display: none;'
+        '}'
+      );
+    } on DomException catch (e) {
+      // Browsers that don't understand ::-ms-reveal throw a DOMException
+      // of type SyntaxError.
+      domWindow.console.warn(e);
+      // Add a fake rule if our code failed because we're under testing
+      assert(() {
+        styleElement.appendText(
+          '$cssSelectorPrefix input.fallback-for-fakey-browser-in-ci {'
+          '  display: none;'
+          '}'
+        );
+        return true;
+      }());
+    }
+  }
+}
diff --git a/lib/web_ui/lib/src/engine/window.dart b/lib/web_ui/lib/src/engine/window.dart
index 7010ece2079c62898ac3f5e296280255e69495af..c82edb24f332da25265c52bc4c4d689eaac039c9 100644
--- a/lib/web_ui/lib/src/engine/window.dart
+++ b/lib/web_ui/lib/src/engine/window.dart
@@ -2,66 +2,520 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-@JS()
-library window;
-
 import 'dart:async';
 import 'dart:typed_data';
 
-import 'package:js/js.dart';
 import 'package:meta/meta.dart';
 import 'package:ui/ui.dart' as ui;
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
-import '../engine.dart' show registerHotRestartListener, renderer;
+import '../engine.dart' show DimensionsProvider, registerHotRestartListener, renderer;
 import 'browser_detection.dart';
+import 'configuration.dart';
+import 'display.dart';
 import 'dom.dart';
+import 'initialization.dart';
+import 'js_interop/js_app.dart';
+import 'mouse/context_menu.dart';
+import 'mouse/cursor.dart';
 import 'navigation/history.dart';
-import 'navigation/js_url_strategy.dart';
-import 'navigation/url_strategy.dart';
 import 'platform_dispatcher.dart';
+import 'pointer_binding.dart';
+import 'semantics.dart';
 import 'services.dart';
-import 'test_embedding.dart';
+import 'text_editing/text_editing.dart';
 import 'util.dart';
+import 'view_embedder/dom_manager.dart';
+import 'view_embedder/embedding_strategy/embedding_strategy.dart';
+import 'view_embedder/global_html_attributes.dart';
+import 'view_embedder/style_manager.dart';
 
 typedef _HandleMessageCallBack = Future<bool> Function();
 
 /// When set to true, all platform messages will be printed to the console.
 const bool debugPrintPlatformMessages = false;
 
-/// Whether [_customUrlStrategy] has been set or not.
+/// The view ID for the implicit flutter view provided by the platform.
+const int kImplicitViewId = 0;
+
+int _nextViewId = kImplicitViewId + 1;
+
+/// Represents all views in the Flutter Web Engine.
 ///
-/// It is valid to set [_customUrlStrategy] to null, so we can't use a null
-/// check to determine whether it was set or not. We need an extra boolean.
-bool _isUrlStrategySet = false;
-
-/// A custom URL strategy set by the app before running.
-UrlStrategy? _customUrlStrategy;
-set customUrlStrategy(UrlStrategy? strategy) {
-  assert(!_isUrlStrategySet, 'Cannot set URL strategy more than once.');
-  _isUrlStrategySet = true;
-  _customUrlStrategy = strategy;
+/// In addition to everything defined in [ui.FlutterView], this class adds
+/// a few web-specific properties.
+base class EngineFlutterView implements ui.FlutterView {
+  /// Creates a [ui.FlutterView] that can be used in multi-view mode.
+  ///
+  /// The [hostElement] parameter specifies the container in the DOM into which
+  /// the Flutter view will be rendered.
+  factory EngineFlutterView(
+    EnginePlatformDispatcher platformDispatcher,
+    DomElement hostElement, {
+      JsViewConstraints? viewConstraints,
+    }
+  ) = _EngineFlutterViewImpl;
+
+  EngineFlutterView._(
+    this.viewId,
+    this.platformDispatcher,
+    // This is nullable to accommodate the legacy `EngineFlutterWindow`. In
+    // multi-view mode, the host element is required for each view (as reflected
+    // by the public `EngineFlutterView` constructor).
+    DomElement? hostElement, {
+      JsViewConstraints? viewConstraints,
+    }
+  )   : _jsViewConstraints = viewConstraints,
+        embeddingStrategy = EmbeddingStrategy.create(hostElement: hostElement),
+        dimensionsProvider = DimensionsProvider.create(hostElement: hostElement) {
+    // The embeddingStrategy will take care of cleaning up the rootElement on
+    // hot restart.
+    embeddingStrategy.attachViewRoot(dom.rootElement);
+    pointerBinding = PointerBinding(this);
+    _resizeSubscription = onResize.listen(_didResize);
+    _globalHtmlAttributes.applyAttributes(
+      viewId: viewId,
+      autoDetectRenderer: FlutterConfiguration.flutterWebAutoDetect,
+      rendererTag: renderer.rendererTag,
+      buildMode: buildMode,
+    );
+    registerHotRestartListener(dispose);
+  }
+
+  static EngineFlutterWindow implicit(
+    EnginePlatformDispatcher platformDispatcher,
+    DomElement? hostElement,
+  ) => EngineFlutterWindow._(platformDispatcher, hostElement);
+
+  @override
+  final int viewId;
+
+  @override
+  final EnginePlatformDispatcher platformDispatcher;
+
+  /// Abstracts all the DOM manipulations required to embed a Flutter view in a user-supplied `hostElement`.
+  final EmbeddingStrategy embeddingStrategy;
+
+  late final StreamSubscription<ui.Size?> _resizeSubscription;
+
+  final ViewConfiguration _viewConfiguration = const ViewConfiguration();
+
+  /// Whether this [EngineFlutterView] has been disposed or not.
+  bool isDisposed = false;
+
+  /// Disposes of the [EngineFlutterView] instance and undoes all of its DOM
+  /// tree and any event listeners.
+  @mustCallSuper
+  void dispose() {
+    if (isDisposed) {
+      return;
+    }
+    isDisposed = true;
+    _resizeSubscription.cancel();
+    dimensionsProvider.close();
+    pointerBinding.dispose();
+    dom.rootElement.remove();
+    // TODO(harryterkelsen): What should we do about this in multi-view?
+    renderer.clearFragmentProgramCache();
+    semantics.reset();
+  }
+
+  @override
+  void render(ui.Scene scene, {ui.Size? size}) {
+    assert(!isDisposed, 'Trying to render a disposed EngineFlutterView.');
+    if (size != null) {
+      resize(size);
+    }
+    platformDispatcher.render(scene, this);
+  }
+
+  @override
+  void updateSemantics(ui.SemanticsUpdate update) {
+    assert(!isDisposed, 'Trying to update semantics on a disposed EngineFlutterView.');
+    semantics.updateSemantics(update);
+  }
+
+  // TODO(yjbanov): How should this look like for multi-view?
+  //                https://github.com/flutter/flutter/issues/137445
+  late final AccessibilityAnnouncements accessibilityAnnouncements =
+      AccessibilityAnnouncements(hostElement: dom.announcementsHost);
+
+  late final GlobalHtmlAttributes _globalHtmlAttributes = GlobalHtmlAttributes(
+    rootElement: dom.rootElement,
+    hostElement: embeddingStrategy.hostElement,
+  );
+
+  late final MouseCursor mouseCursor = MouseCursor(dom.rootElement);
+
+  late final ContextMenu contextMenu = ContextMenu(dom.rootElement);
+
+  late final DomManager dom = DomManager(devicePixelRatio: devicePixelRatio);
+
+  late final PointerBinding pointerBinding;
+
+  @override
+  ViewConstraints get physicalConstraints {
+    final double dpr = devicePixelRatio;
+    final ui.Size currentLogicalSize = physicalSize / dpr;
+    return ViewConstraints.fromJs(_jsViewConstraints, currentLogicalSize) * dpr;
+  }
+
+  final JsViewConstraints? _jsViewConstraints;
+
+  late final EngineSemanticsOwner semantics = EngineSemanticsOwner(dom.semanticsHost);
+
+  @override
+  ui.Size get physicalSize {
+    return _physicalSize ??= _computePhysicalSize();
+  }
+
+  /// Resizes the `rootElement` to `newPhysicalSize` by changing its CSS style.
+  ///
+  /// This is used by the [render] method, when the framework sends new dimensions
+  /// for the current Flutter View.
+  ///
+  /// Dimensions from the framework are constrained by the [physicalConstraints]
+  /// that can be configured by the user when adding a view to the app.
+  ///
+  /// In practice, this method changes the size of the `rootElement` of the app
+  /// so it can push/shrink inside its `hostElement`. That way, a Flutter app
+  /// can change the layout of the container page.
+  ///
+  /// ```
+  /// <p>Some HTML content...</p>
+  /// +--- (div) hostElement ------------------------------------+
+  /// | +--- rootElement ---------------------+                  |
+  /// | |                                     |                  |
+  /// | |                                     |    container     |
+  /// | |    size applied to *this*           |    must be able  |
+  /// | |                                     |    to reflow     |
+  /// | |                                     |                  |
+  /// | +-------------------------------------+                  |
+  /// +----------------------------------------------------------+
+  /// <p>More HTML content...</p>
+  /// ```
+  ///
+  /// The `hostElement` needs to be styled in a way that allows its size to flow
+  /// with its contents. Things like `max-height: 100px; overflow: hidden` will
+  /// work as expected (by hiding the overflowing part of the flutter app), but
+  /// if in that case flutter is not made aware of that max-height with
+  /// `physicalConstraints`, it will end up rendering more pixels that are visible
+  /// on the screen, with a possible hit to performance.
+  ///
+  /// TL;DR: The `viewConstraints` of a Flutter view, must take into consideration
+  /// the CSS box-model restrictions imposed on its `hostElement` (especially when
+  /// hiding `overflow`). Flutter does not attempt to interpret the styles of
+  /// `hostElement` to compute its `physicalConstraints`, only its current size.
+  void resize(ui.Size newPhysicalSize) {
+    // The browser uses CSS, and CSS operates in logical sizes.
+    final ui.Size logicalSize = newPhysicalSize / devicePixelRatio;
+    dom.rootElement.style
+      ..width = '${logicalSize.width}px'
+      ..height = '${logicalSize.height}px';
+
+    // Force an update of the physicalSize so it's ready for the renderer.
+    _computePhysicalSize();
+  }
+
+  /// Lazily populated and cleared at the end of the frame.
+  ui.Size? _physicalSize;
+
+  ui.Size? debugPhysicalSizeOverride;
+
+  /// Computes the physical size of the view.
+  ///
+  /// This function is expensive. It triggers browser layout if there are
+  /// pending DOM writes.
+  ui.Size _computePhysicalSize() {
+    ui.Size? physicalSizeOverride;
+
+    assert(() {
+      physicalSizeOverride = debugPhysicalSizeOverride;
+      return true;
+    }());
+
+    return physicalSizeOverride ?? dimensionsProvider.computePhysicalSize();
+  }
+
+  /// Forces the view to recompute its physical size. Useful for tests.
+  void debugForceResize() {
+    _physicalSize = _computePhysicalSize();
+  }
+
+  @override
+  ViewPadding get viewInsets => _viewInsets;
+  ViewPadding _viewInsets = ui.ViewPadding.zero as ViewPadding;
+
+  @override
+  ViewPadding get viewPadding => _viewConfiguration.viewPadding;
+
+  @override
+  ViewPadding get systemGestureInsets => _viewConfiguration.systemGestureInsets;
+
+  @override
+  ViewPadding get padding => _viewConfiguration.padding;
+
+  @override
+  ui.GestureSettings get gestureSettings => _viewConfiguration.gestureSettings;
+
+  @override
+  List<ui.DisplayFeature> get displayFeatures => _viewConfiguration.displayFeatures;
+
+  @override
+  EngineFlutterDisplay get display => EngineFlutterDisplay.instance;
+
+  @override
+  double get devicePixelRatio => display.devicePixelRatio;
+
+  @visibleForTesting
+  final DimensionsProvider dimensionsProvider;
+
+  Stream<ui.Size?> get onResize => dimensionsProvider.onResize;
+
+  /// Called immediately after the view has been resized.
+  ///
+  /// When there is a text editing going on in mobile devices, do not change
+  /// the physicalSize, change the [window.viewInsets]. See:
+  /// https://api.flutter.dev/flutter/dart-ui/FlutterView/viewInsets.html
+  /// https://api.flutter.dev/flutter/dart-ui/FlutterView/physicalSize.html
+  ///
+  /// Note: always check for rotations for a mobile device. Update the physical
+  /// size if the change is caused by a rotation.
+  void _didResize(ui.Size? newSize) {
+    StyleManager.scaleSemanticsHost(dom.semanticsHost, devicePixelRatio);
+    final ui.Size newPhysicalSize = _computePhysicalSize();
+    final bool isEditingOnMobile =
+        isMobile && !_isRotation(newPhysicalSize) && textEditing.isEditing;
+    if (isEditingOnMobile) {
+      _computeOnScreenKeyboardInsets(true);
+    } else {
+      _physicalSize = newPhysicalSize;
+      // When physical size changes this value has to be recalculated.
+      _computeOnScreenKeyboardInsets(false);
+    }
+    platformDispatcher.invokeOnMetricsChanged();
+  }
+
+  /// Uses the previous physical size and current innerHeight/innerWidth
+  /// values to decide if a device is rotating.
+  ///
+  /// During a rotation the height and width values will (almost) swap place.
+  /// Values can slightly differ due to space occupied by the browser header.
+  /// For example the following values are collected for Pixel 3 rotation:
+  ///
+  /// height: 658 width: 393
+  /// new height: 313 new width: 738
+  ///
+  /// The following values are from a changed caused by virtual keyboard.
+  ///
+  /// height: 658 width: 393
+  /// height: 368 width: 393
+  bool _isRotation(ui.Size newPhysicalSize) {
+    // This method compares the new dimensions with the previous ones.
+    // Return false if the previous dimensions are not set.
+    if (_physicalSize != null) {
+      // First confirm both height and width are effected.
+      if (_physicalSize!.height != newPhysicalSize.height && _physicalSize!.width != newPhysicalSize.width) {
+        // If prior to rotation height is bigger than width it should be the
+        // opposite after the rotation and vice versa.
+        if ((_physicalSize!.height > _physicalSize!.width && newPhysicalSize.height < newPhysicalSize.width) ||
+            (_physicalSize!.width > _physicalSize!.height && newPhysicalSize.width < newPhysicalSize.height)) {
+          // Rotation detected
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+
+  void _computeOnScreenKeyboardInsets(bool isEditingOnMobile) {
+    _viewInsets = dimensionsProvider.computeKeyboardInsets(
+      _physicalSize!.height,
+      isEditingOnMobile,
+    );
+  }
+}
+
+final class _EngineFlutterViewImpl extends EngineFlutterView {
+  _EngineFlutterViewImpl(
+    EnginePlatformDispatcher platformDispatcher,
+    DomElement hostElement, {
+      JsViewConstraints? viewConstraints,
+    }
+  ) : super._(_nextViewId++, platformDispatcher, hostElement, viewConstraints: viewConstraints);
 }
 
 /// The Web implementation of [ui.SingletonFlutterWindow].
-class EngineFlutterWindow extends ui.SingletonFlutterWindow {
-  EngineFlutterWindow(this._windowId, this.platformDispatcher) {
-    final EnginePlatformDispatcher engineDispatcher =
-        platformDispatcher as EnginePlatformDispatcher;
-    engineDispatcher.windows[_windowId] = this;
-    engineDispatcher.windowConfigurations[_windowId] = const ui.ViewConfiguration();
-    if (_isUrlStrategySet) {
-      _browserHistory = createHistoryForExistingState(_customUrlStrategy);
+final class EngineFlutterWindow extends EngineFlutterView implements ui.SingletonFlutterWindow {
+  EngineFlutterWindow._(
+    EnginePlatformDispatcher platformDispatcher,
+    DomElement? hostElement,
+  ) : super._(kImplicitViewId, platformDispatcher, hostElement) {
+    if (ui_web.isCustomUrlStrategySet) {
+      _browserHistory = createHistoryForExistingState(ui_web.urlStrategy);
     }
-    registerHotRestartListener(() {
-      _browserHistory?.dispose();
-      renderer.clearFragmentProgramCache();
-    });
   }
 
-  final Object _windowId;
+  @override
+  void dispose() {
+    super.dispose();
+    _browserHistory?.dispose();
+  }
+
+  @override
+  ui.VoidCallback? get onMetricsChanged => platformDispatcher.onMetricsChanged;
+  @override
+  set onMetricsChanged(ui.VoidCallback? callback) {
+    platformDispatcher.onMetricsChanged = callback;
+  }
+
+  @override
+  ui.Locale get locale => platformDispatcher.locale;
+  @override
+  List<ui.Locale> get locales => platformDispatcher.locales;
+
+  @override
+  ui.Locale? computePlatformResolvedLocale(List<ui.Locale> supportedLocales) {
+    return platformDispatcher.computePlatformResolvedLocale(supportedLocales);
+  }
+
+  @override
+  ui.VoidCallback? get onLocaleChanged => platformDispatcher.onLocaleChanged;
+  @override
+  set onLocaleChanged(ui.VoidCallback? callback) {
+    platformDispatcher.onLocaleChanged = callback;
+  }
+
+  @override
+  String get initialLifecycleState => platformDispatcher.initialLifecycleState;
+
+  @override
+  double get textScaleFactor => platformDispatcher.textScaleFactor;
+
+  @override
+  bool get nativeSpellCheckServiceDefined => platformDispatcher.nativeSpellCheckServiceDefined;
+
+  @override
+  bool get brieflyShowPassword => platformDispatcher.brieflyShowPassword;
+
+  @override
+  bool get alwaysUse24HourFormat => platformDispatcher.alwaysUse24HourFormat;
+
+  @override
+  ui.VoidCallback? get onTextScaleFactorChanged => platformDispatcher.onTextScaleFactorChanged;
+  @override
+  set onTextScaleFactorChanged(ui.VoidCallback? callback) {
+    platformDispatcher.onTextScaleFactorChanged = callback;
+  }
+
+  @override
+  ui.Brightness get platformBrightness => platformDispatcher.platformBrightness;
+
+  @override
+  ui.VoidCallback? get onPlatformBrightnessChanged => platformDispatcher.onPlatformBrightnessChanged;
+  @override
+  set onPlatformBrightnessChanged(ui.VoidCallback? callback) {
+    platformDispatcher.onPlatformBrightnessChanged = callback;
+  }
+
+  @override
+  String? get systemFontFamily => platformDispatcher.systemFontFamily;
+
+  @override
+  ui.VoidCallback? get onSystemFontFamilyChanged => platformDispatcher.onSystemFontFamilyChanged;
+  @override
+  set onSystemFontFamilyChanged(ui.VoidCallback? callback) {
+    platformDispatcher.onSystemFontFamilyChanged = callback;
+  }
+
+  @override
+  ui.FrameCallback? get onBeginFrame => platformDispatcher.onBeginFrame;
+  @override
+  set onBeginFrame(ui.FrameCallback? callback) {
+    platformDispatcher.onBeginFrame = callback;
+  }
+
+  @override
+  ui.VoidCallback? get onDrawFrame => platformDispatcher.onDrawFrame;
+  @override
+  set onDrawFrame(ui.VoidCallback? callback) {
+    platformDispatcher.onDrawFrame = callback;
+  }
+
+  @override
+  ui.TimingsCallback? get onReportTimings => platformDispatcher.onReportTimings;
+  @override
+  set onReportTimings(ui.TimingsCallback? callback) {
+    platformDispatcher.onReportTimings = callback;
+  }
+
+  @override
+  ui.PointerDataPacketCallback? get onPointerDataPacket => platformDispatcher.onPointerDataPacket;
+  @override
+  set onPointerDataPacket(ui.PointerDataPacketCallback? callback) {
+    platformDispatcher.onPointerDataPacket = callback;
+  }
+
+  @override
+  ui.KeyDataCallback? get onKeyData => platformDispatcher.onKeyData;
+  @override
+  set onKeyData(ui.KeyDataCallback? callback) {
+    platformDispatcher.onKeyData = callback;
+  }
+
+  @override
+  String get defaultRouteName => platformDispatcher.defaultRouteName;
+
+  @override
+  void scheduleFrame() => platformDispatcher.scheduleFrame();
+
+  @override
+  bool get semanticsEnabled => platformDispatcher.semanticsEnabled;
+
+  @override
+  ui.VoidCallback? get onSemanticsEnabledChanged => platformDispatcher.onSemanticsEnabledChanged;
+  @override
+  set onSemanticsEnabledChanged(ui.VoidCallback? callback) {
+    platformDispatcher.onSemanticsEnabledChanged = callback;
+  }
+
+  @override
+  ui.FrameData get frameData => const ui.FrameData.webOnly();
+
+  @override
+  ui.VoidCallback? get onFrameDataChanged => null;
+  @override
+  set onFrameDataChanged(ui.VoidCallback? callback) {}
+
+  @override
+  ui.AccessibilityFeatures get accessibilityFeatures => platformDispatcher.accessibilityFeatures;
+
+  @override
+  ui.VoidCallback? get onAccessibilityFeaturesChanged =>
+      platformDispatcher.onAccessibilityFeaturesChanged;
+  @override
+  set onAccessibilityFeaturesChanged(ui.VoidCallback? callback) {
+    platformDispatcher.onAccessibilityFeaturesChanged = callback;
+  }
+
+  @override
+  void sendPlatformMessage(
+    String name,
+    ByteData? data,
+    ui.PlatformMessageResponseCallback? callback,
+  ) {
+    platformDispatcher.sendPlatformMessage(name, data, callback);
+  }
 
   @override
-  final ui.PlatformDispatcher platformDispatcher;
+  ui.PlatformMessageCallback? get onPlatformMessage => platformDispatcher.onPlatformMessage;
+  @override
+  set onPlatformMessage(ui.PlatformMessageCallback? callback) {
+    platformDispatcher.onPlatformMessage = callback;
+  }
+
+  @override
+  void setIsolateDebugName(String name) => ui.PlatformDispatcher.instance.setIsolateDebugName(name);
 
   /// Handles the browser history integration to allow users to use the back
   /// button, etc.
@@ -70,12 +524,10 @@ class EngineFlutterWindow extends ui.SingletonFlutterWindow {
         createHistoryForExistingState(_urlStrategyForInitialization);
   }
 
-  UrlStrategy? get _urlStrategyForInitialization {
-    final UrlStrategy? urlStrategy =
-        _isUrlStrategySet ? _customUrlStrategy : _createDefaultUrlStrategy();
+  ui_web.UrlStrategy? get _urlStrategyForInitialization {
     // Prevent any further customization of URL strategy.
-    _isUrlStrategySet = true;
-    return urlStrategy;
+    ui_web.preventCustomUrlStrategy();
+    return ui_web.urlStrategy;
   }
 
   BrowserHistory?
@@ -100,7 +552,7 @@ class EngineFlutterWindow extends ui.SingletonFlutterWindow {
 
     // At this point, we know that `_browserHistory` is a non-null
     // `MultiEntriesBrowserHistory` instance.
-    final UrlStrategy? strategy = _browserHistory?.urlStrategy;
+    final ui_web.UrlStrategy? strategy = _browserHistory?.urlStrategy;
     await _browserHistory?.tearDown();
     _browserHistory = SingleEntryBrowserHistory(urlStrategy: strategy);
   }
@@ -124,19 +576,19 @@ class EngineFlutterWindow extends ui.SingletonFlutterWindow {
 
     // At this point, we know that `_browserHistory` is a non-null
     // `SingleEntryBrowserHistory` instance.
-    final UrlStrategy? strategy = _browserHistory?.urlStrategy;
+    final ui_web.UrlStrategy? strategy = _browserHistory?.urlStrategy;
     await _browserHistory?.tearDown();
     _browserHistory = MultiEntriesBrowserHistory(urlStrategy: strategy);
   }
 
   @visibleForTesting
   Future<void> debugInitializeHistory(
-    UrlStrategy? strategy, {
+    ui_web.UrlStrategy? strategy, {
     required bool useSingle,
   }) async {
-    // Prevent any further customization of URL strategy.
-    _isUrlStrategySet = true;
     await _browserHistory?.tearDown();
+
+    ui_web.urlStrategy = strategy;
     if (useSingle) {
       _browserHistory = SingleEntryBrowserHistory(urlStrategy: strategy);
     } else {
@@ -147,9 +599,7 @@ class EngineFlutterWindow extends ui.SingletonFlutterWindow {
   Future<void> resetHistory() async {
     await _browserHistory?.tearDown();
     _browserHistory = null;
-    // Reset the globals too.
-    _isUrlStrategySet = false;
-    _customUrlStrategy = null;
+    ui_web.debugResetCustomUrlStrategy();
   }
 
   Future<void> _endOfTheLine = Future<void>.value();
@@ -187,8 +637,23 @@ class EngineFlutterWindow extends ui.SingletonFlutterWindow {
           return true;
         case 'routeInformationUpdated':
           assert(arguments != null);
+          final String? uriString = arguments!.tryString('uri');
+          final String path;
+          if (uriString != null) {
+            final Uri uri = Uri.parse(uriString);
+            // Need to remove scheme and authority.
+            path = Uri.decodeComponent(
+              Uri(
+                path: uri.path.isEmpty ? '/' : uri.path,
+                queryParameters: uri.queryParametersAll.isEmpty ? null : uri.queryParametersAll,
+                fragment: uri.fragment.isEmpty ? null : uri.fragment,
+              ).toString(),
+            );
+          } else {
+            path = arguments.tryString('location')!;
+          }
           browserHistory.setRouteName(
-            arguments!.tryString('location'),
+            path,
             state: arguments['state'],
             replace: arguments.tryBool('replace') ?? false,
           );
@@ -198,231 +663,235 @@ class EngineFlutterWindow extends ui.SingletonFlutterWindow {
     });
   }
 
-  @override
-  ui.ViewConfiguration get viewConfiguration {
-    final EnginePlatformDispatcher engineDispatcher =
-        platformDispatcher as EnginePlatformDispatcher;
-    assert(engineDispatcher.windowConfigurations.containsKey(_windowId));
-    return engineDispatcher.windowConfigurations[_windowId] ??
-        const ui.ViewConfiguration();
-  }
-
-  @override
-  ui.Size get physicalSize {
-    if (_physicalSize == null) {
-      computePhysicalSize();
-    }
-    assert(_physicalSize != null);
-    return _physicalSize!;
+  // TODO(mdebbar): Deprecate this and remove it.
+  // https://github.com/flutter/flutter/issues/127395
+  void debugOverrideDevicePixelRatio(double? value) {
+    assert(() {
+      printWarning(
+        'The window.debugOverrideDevicePixelRatio API is deprecated and will '
+        'be removed in a future release. Please use '
+        '`debugOverrideDevicePixelRatio` from `dart:ui_web` instead.',
+      );
+      return true;
+    }());
+    display.debugOverrideDevicePixelRatio(value);
   }
 
-  /// Computes the physical size of the screen from [domWindow].
-  ///
-  /// This function is expensive. It triggers browser layout if there are
-  /// pending DOM writes.
-  void computePhysicalSize() {
-    bool override = false;
-
+  // TODO(mdebbar): Deprecate this and remove it.
+  // https://github.com/flutter/flutter/issues/127395
+  ui.Size? get webOnlyDebugPhysicalSizeOverride {
     assert(() {
-      if (webOnlyDebugPhysicalSizeOverride != null) {
-        _physicalSize = webOnlyDebugPhysicalSizeOverride;
-        override = true;
-      }
+      printWarning(
+        'The webOnlyDebugPhysicalSizeOverride API is deprecated and will be '
+        'removed in a future release. Please use '
+        '`SingletonFlutterWindow.debugPhysicalSizeOverride` from `dart:ui_web` '
+        'instead.',
+      );
       return true;
     }());
+    return debugPhysicalSizeOverride;
+  }
 
-    if (!override) {
-      double windowInnerWidth;
-      double windowInnerHeight;
-      final DomVisualViewport? viewport = domWindow.visualViewport;
-
-      if (viewport != null) {
-        if (operatingSystem == OperatingSystem.iOs) {
-          /// Chrome on iOS reports incorrect viewport.height when app
-          /// starts in portrait orientation and the phone is rotated to
-          /// landscape.
-          ///
-          /// We instead use documentElement clientWidth/Height to read
-          /// accurate physical size. VisualViewport api is only used during
-          /// text editing to make sure inset is correctly reported to
-          /// framework.
-          final double docWidth =
-              domDocument.documentElement!.clientWidth;
-          final double docHeight =
-              domDocument.documentElement!.clientHeight;
-          windowInnerWidth = docWidth * devicePixelRatio;
-          windowInnerHeight = docHeight * devicePixelRatio;
-        } else {
-          windowInnerWidth = viewport.width! * devicePixelRatio;
-          windowInnerHeight = viewport.height! * devicePixelRatio;
-        }
-      } else {
-        windowInnerWidth = domWindow.innerWidth! * devicePixelRatio;
-        windowInnerHeight = domWindow.innerHeight! * devicePixelRatio;
-      }
-      _physicalSize = ui.Size(
-        windowInnerWidth,
-        windowInnerHeight,
+  // TODO(mdebbar): Deprecate this and remove it.
+  // https://github.com/flutter/flutter/issues/127395
+  set webOnlyDebugPhysicalSizeOverride(ui.Size? value) {
+    assert(() {
+      printWarning(
+        'The webOnlyDebugPhysicalSizeOverride API is deprecated and will be '
+        'removed in a future release. Please use '
+        '`SingletonFlutterWindow.debugPhysicalSizeOverride` from `dart:ui_web` '
+        'instead.',
       );
-    }
+      return true;
+    }());
+    debugPhysicalSizeOverride = value;
   }
+}
 
-  /// Forces the window to recompute its physical size. Useful for tests.
-  void debugForceResize() {
-    computePhysicalSize();
-  }
-
-  void computeOnScreenKeyboardInsets(bool isEditingOnMobile) {
-    double windowInnerHeight;
-    final DomVisualViewport? viewport = domWindow.visualViewport;
-    if (viewport != null) {
-      if (operatingSystem == OperatingSystem.iOs && !isEditingOnMobile) {
-        windowInnerHeight =
-            domDocument.documentElement!.clientHeight * devicePixelRatio;
-      } else {
-        windowInnerHeight = viewport.height! * devicePixelRatio;
-      }
-    } else {
-      windowInnerHeight = domWindow.innerHeight! * devicePixelRatio;
-    }
-    final double bottomPadding = _physicalSize!.height - windowInnerHeight;
-    _viewInsets =
-        WindowPadding(bottom: bottomPadding, left: 0, right: 0, top: 0);
+/// The window singleton.
+///
+/// `dart:ui` window delegates to this value. However, this value has a wider
+/// API surface, providing Web-specific functionality that the standard
+/// `dart:ui` version does not.
+EngineFlutterWindow get window {
+  assert(
+    _window != null,
+    'Trying to access the implicit FlutterView, but it is not available.\n'
+    'Note: the implicit FlutterView is not available in multi-view mode.',
+  );
+  return _window!;
+}
+EngineFlutterWindow? _window;
+
+/// Initializes the [window] (aka the implicit view), if it's not already
+/// initialized.
+EngineFlutterWindow ensureImplicitViewInitialized({
+  DomElement? hostElement,
+}) {
+  if (_window == null) {
+    _window = EngineFlutterView.implicit(
+      EnginePlatformDispatcher.instance,
+      hostElement,
+    );
+    EnginePlatformDispatcher.instance.viewManager.registerView(_window!);
   }
+  return _window!;
+}
 
-  /// Uses the previous physical size and current innerHeight/innerWidth
-  /// values to decide if a device is rotating.
-  ///
-  /// During a rotation the height and width values will (almost) swap place.
-  /// Values can slightly differ due to space occupied by the browser header.
-  /// For example the following values are collected for Pixel 3 rotation:
-  ///
-  /// height: 658 width: 393
-  /// new height: 313 new width: 738
-  ///
-  /// The following values are from a changed caused by virtual keyboard.
-  ///
-  /// height: 658 width: 393
-  /// height: 368 width: 393
-  bool isRotation() {
-    double height = 0;
-    double width = 0;
-    if (domWindow.visualViewport != null) {
-      height =
-          domWindow.visualViewport!.height! * devicePixelRatio;
-      width = domWindow.visualViewport!.width! * devicePixelRatio;
-    } else {
-      height = domWindow.innerHeight! * devicePixelRatio;
-      width = domWindow.innerWidth! * devicePixelRatio;
-    }
-
-    // This method compares the new dimensions with the previous ones.
-    // Return false if the previous dimensions are not set.
-    if (_physicalSize != null) {
-      // First confirm both height and width are effected.
-      if (_physicalSize!.height != height && _physicalSize!.width != width) {
-        // If prior to rotation height is bigger than width it should be the
-        // opposite after the rotation and vice versa.
-        if ((_physicalSize!.height > _physicalSize!.width && height < width) ||
-            (_physicalSize!.width > _physicalSize!.height && width < height)) {
-          // Rotation detected
-          return true;
-        }
-      }
-    }
-    return false;
-  }
+/// The Web implementation of [ui.ViewPadding].
+class ViewPadding implements ui.ViewPadding {
+  const ViewPadding({
+    required this.left,
+    required this.top,
+    required this.right,
+    required this.bottom,
+  });
 
   @override
-  WindowPadding get viewInsets => _viewInsets;
-  WindowPadding _viewInsets = ui.WindowPadding.zero as WindowPadding;
-
-  /// Lazily populated and cleared at the end of the frame.
-  ui.Size? _physicalSize;
-
-  /// Overrides the value of [physicalSize] in tests.
-  ui.Size? webOnlyDebugPhysicalSizeOverride;
+  final double left;
+  @override
+  final double top;
+  @override
+  final double right;
+  @override
+  final double bottom;
 }
 
-typedef _JsSetUrlStrategy = void Function(JsUrlStrategy?);
+class ViewConstraints implements ui.ViewConstraints {
+  const ViewConstraints({
+    this.minWidth = 0.0,
+    this.maxWidth = double.infinity,
+    this.minHeight = 0.0,
+    this.maxHeight = double.infinity,
+  });
 
-/// A JavaScript hook to customize the URL strategy of a Flutter app.
-//
-// Keep this js name in sync with flutter_web_plugins. Find it at:
-// https://github.com/flutter/flutter/blob/custom_location_strategy/packages/flutter_web_plugins/lib/src/navigation/js_url_strategy.dart
-//
-// TODO(mdebbar): Add integration test https://github.com/flutter/flutter/issues/66852
-@JS('_flutter_web_set_location_strategy')
-external set jsSetUrlStrategy(_JsSetUrlStrategy? newJsSetUrlStrategy);
-
-UrlStrategy? _createDefaultUrlStrategy() {
-  return ui.debugEmulateFlutterTesterEnvironment
-      ? TestUrlStrategy.fromEntry(const TestHistoryEntry('default', null, '/'))
-      : const HashUrlStrategy();
-}
+  ViewConstraints.tight(ui.Size size)
+    : minWidth = size.width,
+      maxWidth = size.width,
+      minHeight = size.height,
+      maxHeight = size.height;
 
-/// The Web implementation of [ui.SingletonFlutterWindow].
-class EngineSingletonFlutterWindow extends EngineFlutterWindow {
-  EngineSingletonFlutterWindow(
-      super.windowId, super.platformDispatcher);
+  /// Converts JsViewConstraints into ViewConstraints.
+  ///
+  /// Since JsViewConstraints are expressed by the user, in logical pixels, this
+  /// conversion uses logical pixels for the current size as well.
+  ///
+  /// The resulting ViewConstraints object will be multiplied by devicePixelRatio
+  /// later to compute the physicalViewConstraints, which is what the framework
+  /// uses.
+  factory ViewConstraints.fromJs(
+    JsViewConstraints? constraints, ui.Size currentLogicalSize) {
+    if (constraints == null) {
+      return ViewConstraints.tight(currentLogicalSize);
+    }
+    return ViewConstraints(
+      minWidth: _computeMinConstraintValue(constraints.minWidth, currentLogicalSize.width),
+      minHeight: _computeMinConstraintValue(constraints.minHeight, currentLogicalSize.height),
+      maxWidth: _computeMaxConstraintValue(constraints.maxWidth, currentLogicalSize.width),
+      maxHeight: _computeMaxConstraintValue(constraints.maxHeight, currentLogicalSize.height),
+    );
+  }
 
   @override
-  double get devicePixelRatio =>
-      _debugDevicePixelRatio ??
-      EnginePlatformDispatcher.browserDevicePixelRatio;
+  final double minWidth;
+  @override
+  final double maxWidth;
+  @override
+  final double minHeight;
+  @override
+  final double maxHeight;
 
-  /// Overrides the default device pixel ratio.
-  ///
-  /// This is useful in tests to emulate screens of different dimensions.
-  void debugOverrideDevicePixelRatio(double value) {
-    _debugDevicePixelRatio = value;
+  @override
+  bool isSatisfiedBy(ui.Size size) {
+    return (minWidth <= size.width) && (size.width <= maxWidth) &&
+           (minHeight <= size.height) && (size.height <= maxHeight);
   }
 
-  double? _debugDevicePixelRatio;
-}
+  @override
+  bool get isTight => minWidth >= maxWidth && minHeight >= maxHeight;
+
+  ViewConstraints operator*(double factor) {
+    return ViewConstraints(
+      minWidth: minWidth * factor,
+      maxWidth: maxWidth * factor,
+      minHeight: minHeight * factor,
+      maxHeight: maxHeight * factor,
+    );
+  }
 
-/// A type of [FlutterView] that can be hosted inside of a [FlutterWindow].
-class EngineFlutterWindowView extends ui.FlutterWindow {
-  EngineFlutterWindowView._(this._viewId, this.platformDispatcher);
+  @override
+  ViewConstraints operator/(double factor) {
+    return ViewConstraints(
+      minWidth: minWidth / factor,
+      maxWidth: maxWidth / factor,
+      minHeight: minHeight / factor,
+      maxHeight: maxHeight / factor,
+    );
+  }
 
-  final Object _viewId;
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) {
+      return true;
+    }
+    if (other.runtimeType != runtimeType) {
+      return false;
+    }
+    return other is ViewConstraints
+        && other.minWidth == minWidth
+        && other.maxWidth == maxWidth
+        && other.minHeight == minHeight
+        && other.maxHeight == maxHeight;
+  }
 
   @override
-  final ui.PlatformDispatcher platformDispatcher;
+  int get hashCode => Object.hash(minWidth, maxWidth, minHeight, maxHeight);
 
   @override
-  ui.ViewConfiguration get viewConfiguration {
-    final EnginePlatformDispatcher engineDispatcher =
-        platformDispatcher as EnginePlatformDispatcher;
-    assert(engineDispatcher.windowConfigurations.containsKey(_viewId));
-    return engineDispatcher.windowConfigurations[_viewId] ??
-        const ui.ViewConfiguration();
+  String toString() {
+    if (minWidth == double.infinity && minHeight == double.infinity) {
+      return 'ViewConstraints(biggest)';
+    }
+    if (minWidth == 0 && maxWidth == double.infinity &&
+        minHeight == 0 && maxHeight == double.infinity) {
+      return 'ViewConstraints(unconstrained)';
+    }
+    String describe(double min, double max, String dim) {
+      if (min == max) {
+        return '$dim=${min.toStringAsFixed(1)}';
+      }
+      return '${min.toStringAsFixed(1)}<=$dim<=${max.toStringAsFixed(1)}';
+    }
+    final String width = describe(minWidth, maxWidth, 'w');
+    final String height = describe(minHeight, maxHeight, 'h');
+    return 'ViewConstraints($width, $height)';
   }
 }
 
-/// The window singleton.
-///
-/// `dart:ui` window delegates to this value. However, this value has a wider
-/// API surface, providing Web-specific functionality that the standard
-/// `dart:ui` version does not.
-final EngineSingletonFlutterWindow window =
-    EngineSingletonFlutterWindow(0, EnginePlatformDispatcher.instance);
-
-/// The Web implementation of [ui.WindowPadding].
-class WindowPadding implements ui.WindowPadding {
-  const WindowPadding({
-    required this.left,
-    required this.top,
-    required this.right,
-    required this.bottom,
-  });
+// Computes the "min" value for a constraint that takes into account user `desired`
+// configuration and the actual available value.
+//
+// Returns the `desired` value unless it is `null`, in which case it returns the
+// `available` value.
+double _computeMinConstraintValue(double? desired, double available) {
+  assert(desired == null || desired >= 0, 'Minimum constraint must be >= 0 if set.');
+  assert(desired == null || desired.isFinite, 'Minimum constraint must be finite.');
+  return desired ?? available;
+}
 
-  @override
-  final double left;
-  @override
-  final double top;
-  @override
-  final double right;
-  @override
-  final double bottom;
+// Computes the "max" value for a constraint that takes into account user `desired`
+// configuration and the `available` size.
+//
+// Returns the `desired` value unless it is `null`, in which case it returns the
+// `available` value.
+//
+// A `desired` value of `Infinity` or `Number.POSITIVE_INFINITY` (from JS) means
+// "unconstrained".
+//
+// This method allows returning values larger than `available`, so the Flutter
+// app is able to stretch its container up to a certain value, without being
+// fully unconstrained.
+double _computeMaxConstraintValue(double? desired, double available) {
+  assert(desired == null || desired >= 0, 'Maximum constraint must be >= 0 if set.');
+  return desired ?? available;
 }
diff --git a/lib/web_ui/lib/text.dart b/lib/web_ui/lib/text.dart
index 7c7e3c6c100a1eddb2d218c4c2cbae27035fdc23..c4b2fdb3268d1e3b2f9d24792bd4678a39c9c6fa 100644
--- a/lib/web_ui/lib/text.dart
+++ b/lib/web_ui/lib/text.dart
@@ -45,7 +45,6 @@ class FontWeight {
     w900
   ];
   static FontWeight? lerp(FontWeight? a, FontWeight? b, double t) {
-    assert(t != null);
     if (a == null && b == null) {
       return null;
     }
@@ -75,10 +74,8 @@ class FontWeight {
 
 class FontFeature {
   const FontFeature(this.feature, [this.value = 1])
-      : assert(feature != null),
-        assert(feature.length == 4,
+      : assert(feature.length == 4,
             'Feature tag must be exactly four characters long.'),
-        assert(value != null),
         assert(value >= 0, 'Feature value must be zero or a positive integer.');
   const FontFeature.enable(String feature) : this(feature, 1);
   const FontFeature.disable(String feature) : this(feature, 0);
@@ -184,9 +181,14 @@ class FontVariation {
   const FontVariation(
     this.axis,
     this.value,
-  ) : assert(axis != null),
-      assert(axis.length == 4, 'Axis tag must be exactly four characters long.'),
-      assert(value != null);
+  ) : assert(axis.length == 4, 'Axis tag must be exactly four characters long.'),
+      assert(value >= -32768.0 && value < 32768.0, 'Value must be representable as a signed 16.16 fixed-point number, i.e. it must be in this range: -32768.0 ≤ value < 32768.0');
+
+  const FontVariation.italic(this.value) : assert(value >= 0.0), assert(value <= 1.0), axis = 'ital';
+  const FontVariation.opticalSize(this.value) : assert(value > 0.0), axis = 'opsz';
+  const FontVariation.slant(this.value) : assert(value > -90.0), assert(value < 90.0), axis = 'slnt';
+  const FontVariation.width(this.value) : assert(value >= 0.0), axis = 'wdth';
+  const FontVariation.weight(this.value) : assert(value >= 1), assert(value <= 1000), axis = 'wght';
 
   final String axis;
   final double value;
@@ -204,10 +206,45 @@ class FontVariation {
   @override
   int get hashCode => Object.hash(axis, value);
 
+  static FontVariation? lerp(FontVariation? a, FontVariation? b, double t) {
+    if (a?.axis != b?.axis || (a == null && b == null)) {
+      return t < 0.5 ? a : b;
+    }
+    return FontVariation(
+      a!.axis,
+      clampDouble(lerpDouble(a.value, b!.value, t)!, -32768.0, 32768.0 - 1.0/65536.0),
+    );
+  }
+
   @override
   String toString() => "FontVariation('$axis', $value)";
 }
 
+final class GlyphInfo {
+  GlyphInfo(this.graphemeClusterLayoutBounds, this.graphemeClusterCodeUnitRange, this.writingDirection);
+
+  final Rect graphemeClusterLayoutBounds;
+  final TextRange graphemeClusterCodeUnitRange;
+  final TextDirection writingDirection;
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) {
+      return true;
+    }
+    return other is GlyphInfo
+        && graphemeClusterLayoutBounds == other.graphemeClusterLayoutBounds
+        && graphemeClusterCodeUnitRange == other.graphemeClusterCodeUnitRange
+        && writingDirection == other.writingDirection;
+  }
+
+  @override
+  int get hashCode => Object.hash(graphemeClusterLayoutBounds, graphemeClusterCodeUnitRange, writingDirection);
+
+  @override
+  String toString() => 'Glyph($graphemeClusterLayoutBounds, textRange: $graphemeClusterCodeUnitRange, direction: $writingDirection)';
+}
+
 // The order of this enum must match the order of the values in RenderStyleConstants.h's ETextAlign.
 enum TextAlign {
   left,
@@ -234,6 +271,9 @@ class TextDecoration {
   }
 
   final int _mask;
+
+  int get maskValue => _mask;
+
   bool contains(TextDecoration other) {
     return (_mask | other._mask) == _mask;
   }
@@ -519,8 +559,7 @@ class TextPosition {
   const TextPosition({
     required this.offset,
     this.affinity = TextAffinity.downstream,
-  })  : assert(offset != null),
-        assert(affinity != null);
+  });
   final int offset;
   final TextAffinity affinity;
 
@@ -595,7 +634,7 @@ class TextRange {
 class ParagraphConstraints {
   const ParagraphConstraints({
     required this.width,
-  }) : assert(width != null);
+  });
   final double width;
 
   @override
@@ -640,7 +679,18 @@ abstract class LineMetrics {
     required double left,
     required double baseline,
     required int lineNumber,
-  }) = engine.EngineLineMetrics;
+  }) => engine.renderer.createLineMetrics(
+    hardBreak: hardBreak,
+    ascent: ascent,
+    descent: descent,
+    unscaledAscent: unscaledAscent,
+    height: height,
+    width: width,
+    left: left,
+    baseline: baseline,
+    lineNumber: lineNumber,
+  );
+
   bool get hardBreak;
   double get ascent;
   double get descent;
@@ -666,10 +716,15 @@ abstract class Paragraph {
       {BoxHeightStyle boxHeightStyle = BoxHeightStyle.tight,
       BoxWidthStyle boxWidthStyle = BoxWidthStyle.tight});
   TextPosition getPositionForOffset(Offset offset);
+  GlyphInfo? getGlyphInfoAt(int codeUnitOffset);
+  GlyphInfo? getClosestGlyphInfoForOffset(Offset offset);
   TextRange getWordBoundary(TextPosition position);
   TextRange getLineBoundary(TextPosition position);
   List<TextBox> getBoxesForPlaceholders();
   List<LineMetrics> computeLineMetrics();
+  LineMetrics? getLineMetricsAt(int lineNumber);
+  int get numberOfLines;
+  int? getLineNumberAt(int codeUnitOffset);
   void dispose();
   bool get debugDisposed;
 }
@@ -677,6 +732,7 @@ abstract class Paragraph {
 abstract class ParagraphBuilder {
   factory ParagraphBuilder(ParagraphStyle style) =>
     engine.renderer.createParagraphBuilder(style);
+
   void pushStyle(TextStyle style);
   void pop();
   void addText(String text);
diff --git a/lib/web_ui/lib/ui.dart b/lib/web_ui/lib/ui.dart
index 1878d4faa7b390d7bd8950ca4ba55226e0f001e6..80a06c1c1e07642975bcd0e62c454a8385a61c07 100644
--- a/lib/web_ui/lib/ui.dart
+++ b/lib/web_ui/lib/ui.dart
@@ -14,6 +14,7 @@ import 'dart:math' as math;
 import 'dart:typed_data';
 
 import 'src/engine.dart' as engine;
+import 'ui_web/src/ui_web.dart' as ui_web;
 
 part 'annotations.dart';
 part 'canvas.dart';
@@ -30,6 +31,7 @@ part 'painting.dart';
 part 'path.dart';
 part 'path_metrics.dart';
 part 'platform_dispatcher.dart';
+part 'platform_isolate.dart';
 part 'pointer.dart';
 part 'semantics.dart';
 part 'text.dart';
diff --git a/lib/web_ui/lib/ui_web/src/ui_web.dart b/lib/web_ui/lib/ui_web/src/ui_web.dart
new file mode 100644
index 0000000000000000000000000000000000000000..74bbf84b79feaa746f43f8e065fddceee616699e
--- /dev/null
+++ b/lib/web_ui/lib/ui_web/src/ui_web.dart
@@ -0,0 +1,20 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// This library defines the web-specific additions that go along with dart:ui
+//
+// The web_sdk/sdk_rewriter.dart uses this directive.
+// ignore: unnecessary_library_directive
+library ui_web;
+
+export 'ui_web/asset_manager.dart';
+export 'ui_web/benchmarks.dart';
+export 'ui_web/flutter_views_proxy.dart';
+export 'ui_web/images.dart';
+export 'ui_web/initialization.dart';
+export 'ui_web/navigation/platform_location.dart';
+export 'ui_web/navigation/url_strategy.dart';
+export 'ui_web/platform_view_registry.dart';
+export 'ui_web/plugins.dart';
+export 'ui_web/testing.dart';
diff --git a/lib/web_ui/lib/src/engine/assets.dart b/lib/web_ui/lib/ui_web/src/ui_web/asset_manager.dart
similarity index 30%
rename from lib/web_ui/lib/src/engine/assets.dart
rename to lib/web_ui/lib/ui_web/src/ui_web/asset_manager.dart
index bfc7bba0e46e9dd9bde4f55500ec2a2ca40e4c27..53788bdd368be7505202eca0cfb3e5c5fa77d68d 100644
--- a/lib/web_ui/lib/src/engine/assets.dart
+++ b/lib/web_ui/lib/ui_web/src/ui_web/asset_manager.dart
@@ -5,38 +5,55 @@
 import 'dart:convert';
 import 'dart:typed_data';
 
-import 'dom.dart';
-import 'util.dart';
+import 'package:ui/src/engine.dart';
 
-const String ahemFontFamily = 'Ahem';
-const String ahemFontUrl = '/assets/fonts/ahem.ttf';
-const String robotoFontFamily = 'Roboto';
-const String robotoTestFontUrl = '/assets/fonts/Roboto-Regular.ttf';
-const String robotoVariableFontFamily = 'RobotoVariable';
-const String robotoVariableTestFontUrl = '/assets/fonts/RobotoSlab-VariableFont_wght.ttf';
+/// Provides the [AssetManager] used by the Flutter Engine.
+AssetManager get assetManager => engineAssetManager;
 
 /// This class downloads assets over the network.
 ///
-/// The assets are resolved relative to [assetsDir] inside the directory
-/// containing the currently executing JS script.
+/// Assets are resolved relative to [assetsDir] inside the absolute base
+/// specified by [assetBase] (optional).
+///
+/// By default, URLs are relative to the `<base>` of the current website.
 class AssetManager {
-  /// Initializes [AssetManager] with path to assets relative to baseUrl.
-  const AssetManager({this.assetsDir = _defaultAssetsDir});
+  /// Initializes [AssetManager] with paths.
+  AssetManager({
+    this.assetsDir = _defaultAssetsDir,
+    String? assetBase,
+  })  : assert(
+          assetBase == null || assetBase.endsWith('/'),
+          '`assetBase` must end with a `/` character.',
+        ),
+        _assetBase = assetBase;
 
   static const String _defaultAssetsDir = 'assets';
 
   /// The directory containing the assets.
   final String assetsDir;
 
-  String? get _baseUrl {
-    return domWindow.document
-        .querySelectorAll('meta')
-        .where((DomElement domNode) => domInstanceOfString(domNode,
-                'HTMLMetaElement'))
-        .map((DomElement domNode) => domNode as DomHTMLMetaElement)
-        .firstWhereOrNull(
-            (DomHTMLMetaElement element) => element.name == 'assetBase')
-        ?.content;
+  /// The absolute base URL for assets.
+  String? _assetBase;
+
+  // Cache a value for `_assetBase` so we don't hit the DOM multiple times.
+  String get _baseUrl => _assetBase ??= _deprecatedAssetBase ?? '';
+
+  // Retrieves the `assetBase` value from the DOM.
+  //
+  // This warns the user and points them to the new initializeEngine style.
+  String? get _deprecatedAssetBase {
+    final DomHTMLMetaElement? meta = domWindow.document
+        .querySelector('meta[name=assetBase]') as DomHTMLMetaElement?;
+
+    final String? fallbackBaseUrl = meta?.content;
+
+    if (fallbackBaseUrl != null) {
+      // Warn users that they're using a deprecated configuration style...
+      domWindow.console.warn('The `assetBase` meta tag is now deprecated.\n'
+          'Use engineInitializer.initializeEngine(config) instead.\n'
+          'See: https://docs.flutter.dev/development/platform-integration/web/initialization');
+    }
+    return fallbackBaseUrl;
   }
 
   /// Returns the URL to load the asset from, given the asset key.
@@ -60,105 +77,24 @@ class AssetManager {
     if (Uri.parse(asset).hasScheme) {
       return Uri.encodeFull(asset);
     }
-    return Uri.encodeFull('${_baseUrl ?? ''}$assetsDir/$asset');
+    return Uri.encodeFull('$_baseUrl$assetsDir/$asset');
   }
 
-  /// Loads an asset using an [DomXMLHttpRequest] and returns data as [ByteData].
-  Future<ByteData> load(String asset) async {
-    final String url = getAssetUrl(asset);
-    try {
-      final DomXMLHttpRequest request =
-          await domHttpRequest(url, responseType: 'arraybuffer');
-
-      final ByteBuffer response = request.response as ByteBuffer;
-      return response.asByteData();
-    } catch (e) {
-      if (!domInstanceOfString(e, 'ProgressEvent')){
-        rethrow;
-      }
-      final DomProgressEvent p = e as DomProgressEvent;
-      final DomEventTarget? target = p.target;
-      if (domInstanceOfString(target,'XMLHttpRequest')) {
-        final DomXMLHttpRequest request = target! as DomXMLHttpRequest;
-        if (request.status == 404 && asset == 'AssetManifest.json') {
-          printWarning('Asset manifest does not exist at `$url` – ignoring.');
-          return Uint8List.fromList(utf8.encode('{}')).buffer.asByteData();
-        }
-        throw AssetManagerException(url, request.status!.toInt());
-      }
-
-      final String? constructorName = target == null ? 'null' :
-          domGetConstructorName(target);
-      printWarning('Caught ProgressEvent with unknown target: '
-          '$constructorName');
-      rethrow;
-    }
+  /// Loads an asset and returns the server response.
+  Future<Object> loadAsset(String asset) {
+    return httpFetch(getAssetUrl(asset));
   }
-}
 
-/// Thrown to indicate http failure during asset loading.
-class AssetManagerException implements Exception {
-  /// Initializes exception with request url and http status.
-  AssetManagerException(this.url, this.httpStatus);
-
-  /// Http request url for asset.
-  final String url;
-
-  /// Http status of response.
-  final int httpStatus;
-
-  @override
-  String toString() => 'Failed to load asset at "$url" ($httpStatus)';
-}
+  /// Loads an asset using an [XMLHttpRequest] and returns data as [ByteData].
+  Future<ByteData> load(String asset) async {
+    final String url = getAssetUrl(asset);
+    final HttpFetchResponse response = await httpFetch(url);
 
-/// An asset manager that gives fake empty responses for assets.
-class WebOnlyMockAssetManager implements AssetManager {
-  /// Mock asset directory relative to base url.
-  String defaultAssetsDir = '';
-
-  /// Mock empty asset manifest.
-  String defaultAssetManifest = '{}';
-
-  /// Mock font manifest overridable for unit testing.
-  String defaultFontManifest = '''
-  [
-   {
-      "family":"$robotoFontFamily",
-      "fonts":[{"asset":"$robotoTestFontUrl"}]
-   },
-   {
-      "family":"$ahemFontFamily",
-      "fonts":[{"asset":"$ahemFontUrl"}]
-   }
-  ]''';
-
-  @override
-  String get assetsDir => defaultAssetsDir;
-
-  @override
-  String get _baseUrl => '';
-
-  @override
-  String getAssetUrl(String asset) => asset;
-
-  @override
-  Future<ByteData> load(String asset) {
-    if (asset == getAssetUrl('AssetManifest.json')) {
-      return Future<ByteData>.value(
-          _toByteData(utf8.encode(defaultAssetManifest)));
-    }
-    if (asset == getAssetUrl('FontManifest.json')) {
-      return Future<ByteData>.value(
-          _toByteData(utf8.encode(defaultFontManifest)));
+    if (response.status == 404 && asset == 'AssetManifest.json') {
+      printWarning('Asset manifest does not exist at `$url` - ignoring.');
+      return ByteData.sublistView(utf8.encode('{}'));
     }
-    throw AssetManagerException(asset, 404);
-  }
 
-  ByteData _toByteData(List<int> bytes) {
-    final ByteData byteData = ByteData(bytes.length);
-    for (int i = 0; i < bytes.length; i++) {
-      byteData.setUint8(i, bytes[i]);
-    }
-    return byteData;
+    return (await response.payload.asByteBuffer()).asByteData();
   }
 }
diff --git a/lib/web_ui/lib/ui_web/src/ui_web/benchmarks.dart b/lib/web_ui/lib/ui_web/src/ui_web/benchmarks.dart
new file mode 100644
index 0000000000000000000000000000000000000000..bd22abfe0d4611dd6a262b53b2ae7cc10ca67306
--- /dev/null
+++ b/lib/web_ui/lib/ui_web/src/ui_web/benchmarks.dart
@@ -0,0 +1,16 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:ui/src/engine.dart';
+
+/// Signature of the callback that receives a benchmark [value] labeled by
+/// [name].
+typedef BenchmarkValueCallback = void Function(String name, double value);
+
+/// A callback for receiving benchmark values.
+///
+/// Each benchmark value is labeled by a `name` and has a double `value`.
+set benchmarkValueCallback(BenchmarkValueCallback? callback) {
+  engineBenchmarkValueCallback = callback;
+}
diff --git a/lib/web_ui/lib/ui_web/src/ui_web/flutter_views_proxy.dart b/lib/web_ui/lib/ui_web/src/ui_web/flutter_views_proxy.dart
new file mode 100644
index 0000000000000000000000000000000000000000..7e7e99f968b440fa9708ebc2eaef58739482b2f7
--- /dev/null
+++ b/lib/web_ui/lib/ui_web/src/ui_web/flutter_views_proxy.dart
@@ -0,0 +1,39 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+import 'dart:js_interop';
+import 'package:ui/src/engine.dart';
+
+/// Exposes web-only functionality for this app's `FlutterView`s objects.
+final FlutterViewManagerProxy views = FlutterViewManagerProxy(
+  viewManager: EnginePlatformDispatcher.instance.viewManager,
+);
+
+/// This class exposes web-only attributes for the registered views in a multi-view app.
+class FlutterViewManagerProxy {
+  FlutterViewManagerProxy({
+      required FlutterViewManager viewManager,
+    }) : _viewManager = viewManager;
+  // The proxied viewManager instance.
+  final FlutterViewManager _viewManager;
+
+  /// Returns the `hostElement` configuration value passed from JS when `viewId` was added.
+  ///
+  /// This is useful for plugins and apps to have a safe DOM Element where they
+  /// can add their own custom HTML elements (for example: file inputs for the
+  /// file_selector plugin).
+  JSAny? getHostElement(int viewId) {
+    return _viewManager.getOptions(viewId)?.hostElement as JSAny?;
+  }
+
+  /// Returns the `initialData` configuration value passed from JS when `viewId` was added.
+  ///
+  /// Developers can access the initial data from Dart in two ways:
+  ///  * Defining their own `staticInterop` class that describes what you're
+  ///    passing to your views, to retain type safety on Dart (preferred).
+  ///  * Calling [NullableUndefineableJSAnyExtension.dartify] and accessing the
+  ///    returned object as if it were a [Map] (not recommended).
+  JSAny? getInitialData(int viewId) {
+    return _viewManager.getOptions(viewId)?.initialData;
+  }
+}
diff --git a/lib/web_ui/lib/ui_web/src/ui_web/images.dart b/lib/web_ui/lib/ui_web/src/ui_web/images.dart
new file mode 100644
index 0000000000000000000000000000000000000000..5e297337f2c494b80086084613972a3bb7152c86
--- /dev/null
+++ b/lib/web_ui/lib/ui_web/src/ui_web/images.dart
@@ -0,0 +1,46 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'dart:js_interop';
+
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui;
+
+/// Signature of the callback that receives progress updates as image chunks are
+/// loaded.
+typedef ImageCodecChunkCallback = void Function(
+  int cumulativeBytesLoaded,
+  int expectedTotalBytes,
+);
+
+/// Creates a [ui.Codec] for the image located at [uri].
+///
+/// The [chunkCallback] is called with progress updates as image chunks are
+/// loaded.
+Future<ui.Codec> createImageCodecFromUrl(
+  Uri uri, {
+  ImageCodecChunkCallback? chunkCallback,
+}) {
+  return renderer.instantiateImageCodecFromUrl(
+    uri,
+    chunkCallback: chunkCallback,
+  );
+}
+
+/// Creates a [ui.Image] from an ImageBitmap object.
+///
+/// The contents of the ImageBitmap must have a premultiplied alpha.
+/// The engine will take ownership of the ImageBitmap object and consume its
+/// contents.
+///
+/// See https://developer.mozilla.org/en-US/docs/Web/API/ImageBitmap
+FutureOr<ui.Image> createImageFromImageBitmap(JSAny imageSource) {
+  if (!domInstanceOfString(imageSource, 'ImageBitmap')) {
+    throw ArgumentError('Image source $imageSource is not an ImageBitmap.', 'imageSource');
+  }
+  return renderer.createImageFromImageBitmap(
+    imageSource as DomImageBitmap,
+  );
+}
diff --git a/lib/web_ui/lib/ui_web/src/ui_web/initialization.dart b/lib/web_ui/lib/ui_web/src/ui_web/initialization.dart
new file mode 100644
index 0000000000000000000000000000000000000000..ad42a26dae6779439950859b0fcf7a347f4a5783
--- /dev/null
+++ b/lib/web_ui/lib/ui_web/src/ui_web/initialization.dart
@@ -0,0 +1,55 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui;
+
+/// Bootstraps the Flutter Web engine and app.
+///
+/// If the app uses plugins, then the [registerPlugins] callback can be provided
+/// to register those plugins. This is done typically by calling
+/// `registerPlugins` from the auto-generated `web_plugin_registrant.dart` file.
+///
+/// The [runApp] callback is invoked to run the app after the engine is fully
+/// initialized.
+///
+/// For more information, see what the `flutter_tools` does in the entrypoint
+/// that it generates around the app's main method:
+///
+/// * https://github.com/flutter/flutter/blob/95be76ab7e3dca2def54454313e97f94f4ac4582/packages/flutter_tools/lib/src/web/file_generators/main_dart.dart#L14-L43
+///
+/// By default, engine initialization and app startup occur immediately and back
+/// to back. They can be programmatically controlled by setting
+/// `FlutterLoader.didCreateEngineInitializer`. For more information, see how
+/// `flutter.js` does it:
+///
+/// * https://github.com/flutter/flutter/blob/95be76ab7e3dca2def54454313e97f94f4ac4582/packages/flutter_tools/lib/src/web/file_generators/js/flutter.js
+Future<void> bootstrapEngine({
+  ui.VoidCallback? registerPlugins,
+  ui.VoidCallback? runApp,
+}) async {
+  // Create the object that knows how to bootstrap an app from JS and Dart.
+  final AppBootstrap bootstrap = AppBootstrap(
+    initializeEngine: ([JsFlutterConfiguration? configuration]) async {
+      await initializeEngineServices(jsConfiguration: configuration);
+    }, runApp: () async {
+      if (registerPlugins != null) {
+        registerPlugins();
+      }
+      await initializeEngineUi();
+      if (runApp != null) {
+        runApp();
+      }
+    },
+  );
+
+  final FlutterLoader? loader = flutter?.loader;
+  if (loader == null || loader.isAutoStart) {
+    // The user does not want control of the app, bootstrap immediately.
+    await bootstrap.autoStart();
+  } else {
+    // Yield control of the bootstrap procedure to the user.
+    loader.didCreateEngineInitializer(bootstrap.prepareEngineInitializer());
+  }
+}
diff --git a/lib/web_ui/lib/ui_web/src/ui_web/navigation/platform_location.dart b/lib/web_ui/lib/ui_web/src/ui_web/navigation/platform_location.dart
new file mode 100644
index 0000000000000000000000000000000000000000..a4764546494347dc55f61b1aaee3de5faf54ce6e
--- /dev/null
+++ b/lib/web_ui/lib/ui_web/src/ui_web/navigation/platform_location.dart
@@ -0,0 +1,139 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:meta/meta.dart';
+import 'package:ui/src/engine.dart';
+
+import 'url_strategy.dart';
+
+/// Function type that handles pop state events.
+typedef EventListener = dynamic Function(Object event);
+
+/// Encapsulates all calls to DOM apis, which allows the [UrlStrategy] classes
+/// to be platform agnostic and testable.
+///
+/// For convenience, the [PlatformLocation] class can be used by implementations
+/// of [UrlStrategy] to interact with DOM apis like pushState, popState, etc.
+abstract interface class PlatformLocation {
+  /// Registers an event listener for the `popstate` event.
+  ///
+  /// See: https://developer.mozilla.org/en-US/docs/Web/API/WindowEventHandlers/onpopstate
+  void addPopStateListener(EventListener fn);
+
+  /// Unregisters the given listener (added by [addPopStateListener]) from the
+  /// `popstate` event.
+  ///
+  /// See: https://developer.mozilla.org/en-US/docs/Web/API/WindowEventHandlers/onpopstate
+  void removePopStateListener(EventListener fn);
+
+  /// The `pathname` part of the URL in the browser address bar.
+  ///
+  /// See: https://developer.mozilla.org/en-US/docs/Web/API/Location/pathname
+  String get pathname;
+
+  /// The `query` part of the URL in the browser address bar.
+  ///
+  /// See: https://developer.mozilla.org/en-US/docs/Web/API/Location/search
+  String get search;
+
+  /// The `hash]` part of the URL in the browser address bar.
+  ///
+  /// See: https://developer.mozilla.org/en-US/docs/Web/API/Location/hash
+  String? get hash;
+
+  /// The `state` in the current history entry.
+  ///
+  /// See: https://developer.mozilla.org/en-US/docs/Web/API/History/state
+  Object? get state;
+
+  /// Adds a new entry to the browser history stack.
+  ///
+  /// See: https://developer.mozilla.org/en-US/docs/Web/API/History/pushState
+  void pushState(Object? state, String title, String url);
+
+  /// Replaces the current entry in the browser history stack.
+  ///
+  /// See: https://developer.mozilla.org/en-US/docs/Web/API/History/replaceState
+  void replaceState(Object? state, String title, String url);
+
+  /// Moves forwards or backwards through the history stack.
+  ///
+  /// A negative [count] value causes a backward move in the history stack. And
+  /// a positive [count] value causs a forward move.
+  ///
+  /// Examples:
+  ///
+  /// * `go(-2)` moves back 2 steps in history.
+  /// * `go(3)` moves forward 3 steps in hisotry.
+  ///
+  /// See: https://developer.mozilla.org/en-US/docs/Web/API/History/go
+  void go(int count);
+
+  /// The base href where the Flutter app is being served.
+  ///
+  /// See: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base
+  String? getBaseHref();
+}
+
+final Map<EventListener, DomEventListener> _popStateListenersCache =
+    <EventListener, DomEventListener>{};
+
+/// Delegates to real browser APIs to provide platform location functionality.
+class BrowserPlatformLocation implements PlatformLocation {
+  /// Default constructor for [BrowserPlatformLocation].
+  const BrowserPlatformLocation();
+
+  DomLocation get _location => domWindow.location;
+  DomHistory get _history => domWindow.history;
+
+  @visibleForTesting
+  DomEventListener getOrCreateDomEventListener(EventListener fn) {
+    return _popStateListenersCache.putIfAbsent(fn, () => createDomEventListener(fn));
+  }
+
+  @override
+  void addPopStateListener(EventListener fn) {
+    domWindow.addEventListener('popstate', getOrCreateDomEventListener(fn));
+  }
+
+  @override
+  void removePopStateListener(EventListener fn) {
+    assert(
+      _popStateListenersCache.containsKey(fn),
+      'Removing a listener that was never added or was removed already.',
+    );
+    domWindow.removeEventListener('popstate', getOrCreateDomEventListener(fn));
+    _popStateListenersCache.remove(fn);
+  }
+
+  @override
+  String get pathname => _location.pathname!;
+
+  @override
+  String get search => _location.search!;
+
+  @override
+  String get hash => _location.locationHash;
+
+  @override
+  Object? get state => _history.state;
+
+  @override
+  void pushState(Object? state, String title, String url) {
+    _history.pushState(state, title, url);
+  }
+
+  @override
+  void replaceState(Object? state, String title, String url) {
+    _history.replaceState(state, title, url);
+  }
+
+  @override
+  void go(int count) {
+    _history.go(count);
+  }
+
+  @override
+  String? getBaseHref() => domDocument.baseUri;
+}
diff --git a/lib/web_ui/lib/src/engine/navigation/url_strategy.dart b/lib/web_ui/lib/ui_web/src/ui_web/navigation/url_strategy.dart
similarity index 44%
rename from lib/web_ui/lib/src/engine/navigation/url_strategy.dart
rename to lib/web_ui/lib/ui_web/src/ui_web/navigation/url_strategy.dart
index c57bc39512725fc21d802e9989751e924b4d4d79..9760f005bf92f7b6dc9a76018b4b7b1351f35955 100644
--- a/lib/web_ui/lib/src/engine/navigation/url_strategy.dart
+++ b/lib/web_ui/lib/ui_web/src/ui_web/navigation/url_strategy.dart
@@ -4,24 +4,89 @@
 
 import 'dart:async';
 
+import 'package:meta/meta.dart';
+import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
 
-import '../dom.dart';
-import '../safe_browser_api.dart';
-import 'js_url_strategy.dart';
+import '../testing.dart';
+import 'platform_location.dart';
+
+UrlStrategy _realDefaultUrlStrategy = debugEmulateFlutterTesterEnvironment
+      ? TestUrlStrategy.fromEntry(const TestHistoryEntry('default', null, '/'))
+      : const HashUrlStrategy();
+
+UrlStrategy get _defaultUrlStrategy => debugDefaultUrlStrategyOverride ?? _realDefaultUrlStrategy;
+
+/// Overrides the default URL strategy.
+///
+/// Setting this to null allows the real default URL strategy to be used.
+///
+/// This is intended to be used for testing and debugging only.
+@visibleForTesting
+UrlStrategy? debugDefaultUrlStrategyOverride;
+
+/// Whether a custom URL strategy has been set or not.
+//
+// It is valid to set [_customUrlStrategy] to null, so we can't use a null
+// check to determine whether it was set or not. We need an extra boolean.
+bool isCustomUrlStrategySet = false;
+
+/// Whether a custom URL strategy can be set or not.
+///
+/// This is used to prevent setting a custom URL strategy for a second time or
+/// after the app has already started running.
+bool _customUrlStrategyCanBeSet = true;
+
+/// A custom URL strategy set by the app before running.
+UrlStrategy? _customUrlStrategy;
+
+/// Returns the present [UrlStrategy] for handling the browser URL.
+///
+/// Returns null when the browser integration has been manually disabled.
+UrlStrategy? get urlStrategy =>
+    isCustomUrlStrategySet ? _customUrlStrategy : _defaultUrlStrategy;
+
+/// Sets a custom URL strategy instead of the default one.
+///
+/// Passing null disables browser history integration altogether.
+///
+/// This setter can only be called once. Subsequent calls will throw an error
+/// in debug mode.
+set urlStrategy(UrlStrategy? strategy) {
+  assert(
+    _customUrlStrategyCanBeSet,
+    'Cannot set URL strategy a second time or after the app has been initialized.',
+  );
+  preventCustomUrlStrategy();
+  isCustomUrlStrategySet = true;
+  _customUrlStrategy = strategy;
+}
+
+/// From this point on, prevents setting a custom URL strategy.
+void preventCustomUrlStrategy() {
+  _customUrlStrategyCanBeSet = false;
+}
+
+/// Resets everything to do with custom URL strategy.
+///
+/// This should only be used in tests to reset things back after each test.
+void debugResetCustomUrlStrategy() {
+  isCustomUrlStrategySet = false;
+  _customUrlStrategyCanBeSet = true;
+  _customUrlStrategy = null;
+}
+
+/// Callback that receives the new state of the browser history entry.
+typedef PopStateListener = void Function(Object? state);
 
 /// Represents and reads route state from the browser's URL.
 ///
 /// By default, the [HashUrlStrategy] subclass is used if the app doesn't
 /// specify one.
 abstract class UrlStrategy {
-  /// Abstract const constructor. This constructor enables subclasses to provide
-  /// const constructors so that they can be used in const expressions.
-  const UrlStrategy();
-
   /// Adds a listener to the `popstate` event and returns a function that, when
   /// invoked, removes the listener.
-  ui.VoidCallback addPopStateListener(DomEventListener fn);
+  ui.VoidCallback addPopStateListener(PopStateListener fn);
 
   /// Returns the active path in the browser.
   String getPath();
@@ -71,19 +136,22 @@ abstract class UrlStrategy {
 /// // Somewhere before calling `runApp()` do:
 /// setUrlStrategy(const HashUrlStrategy());
 /// ```
-class HashUrlStrategy extends UrlStrategy {
+class HashUrlStrategy implements UrlStrategy {
   /// Creates an instance of [HashUrlStrategy].
   ///
   /// The [PlatformLocation] parameter is useful for testing to mock out browser
-  /// interations.
+  /// interactions.
   const HashUrlStrategy(
       [this._platformLocation = const BrowserPlatformLocation()]);
 
   final PlatformLocation _platformLocation;
 
   @override
-  ui.VoidCallback addPopStateListener(DomEventListener fn) {
-    final DomEventListener wrappedFn = allowInterop(fn);
+  ui.VoidCallback addPopStateListener(PopStateListener fn) {
+    void wrappedFn(Object event) {
+      // `fn` expects `event.state`, not a `DomEvent`.
+      fn((event as DomPopStateEvent).state);
+    }
     _platformLocation.addPopStateListener(wrappedFn);
     return () => _platformLocation.removePopStateListener(wrappedFn);
   }
@@ -110,11 +178,19 @@ class HashUrlStrategy extends UrlStrategy {
   String prepareExternalUrl(String internalUrl) {
     // It's convention that if the hash path is empty, we omit the `#`; however,
     // if the empty URL is pushed it won't replace any existing fragment. So
-    // when the hash path is empty, we instead return the location's path and
+    // when the hash path is empty, we still return the location's path and
     // query.
-    return internalUrl.isEmpty
-        ? '${_platformLocation.pathname}${_platformLocation.search}'
-        : '#$internalUrl';
+    final String hash;
+    if (internalUrl.isEmpty || internalUrl == '/') {
+      // Let's not add the hash at all when the app is in the home page. That
+      // way, the URL of the home page is cleaner.
+      //
+      // See: https://github.com/flutter/flutter/issues/127608
+      hash = '';
+    } else {
+      hash = '#$internalUrl';
+    }
+    return '${_platformLocation.pathname}${_platformLocation.search}$hash';
   }
 
   @override
@@ -147,156 +223,3 @@ class HashUrlStrategy extends UrlStrategy {
     return completer.future;
   }
 }
-
-/// Wraps a custom implementation of [UrlStrategy] that was previously converted
-/// to a [JsUrlStrategy].
-class CustomUrlStrategy extends UrlStrategy {
-  /// Wraps the [delegate] in a [CustomUrlStrategy] instance.
-  CustomUrlStrategy.fromJs(this.delegate);
-
-  final JsUrlStrategy delegate;
-
-  @override
-  ui.VoidCallback addPopStateListener(DomEventListener fn) =>
-      delegate.addPopStateListener(allowInterop(fn));
-
-  @override
-  String getPath() => delegate.getPath();
-
-  @override
-  Object? getState() => delegate.getState();
-
-  @override
-  String prepareExternalUrl(String internalUrl) =>
-      delegate.prepareExternalUrl(internalUrl);
-
-  @override
-  void pushState(Object? state, String title, String url) =>
-      delegate.pushState(state, title, url);
-
-  @override
-  void replaceState(Object? state, String title, String url) =>
-      delegate.replaceState(state, title, url);
-
-  @override
-  Future<void> go(int count) => delegate.go(count);
-}
-
-/// Encapsulates all calls to DOM apis, which allows the [UrlStrategy] classes
-/// to be platform agnostic and testable.
-///
-/// For convenience, the [PlatformLocation] class can be used by implementations
-/// of [UrlStrategy] to interact with DOM apis like pushState, popState, etc.
-abstract class PlatformLocation {
-  /// Abstract const constructor. This constructor enables subclasses to provide
-  /// const constructors so that they can be used in const expressions.
-  const PlatformLocation();
-
-  /// Registers an event listener for the `popstate` event.
-  ///
-  /// See: https://developer.mozilla.org/en-US/docs/Web/API/WindowEventHandlers/onpopstate
-  void addPopStateListener(DomEventListener fn);
-
-  /// Unregisters the given listener (added by [addPopStateListener]) from the
-  /// `popstate` event.
-  ///
-  /// See: https://developer.mozilla.org/en-US/docs/Web/API/WindowEventHandlers/onpopstate
-  void removePopStateListener(DomEventListener fn);
-
-  /// The `pathname` part of the URL in the browser address bar.
-  ///
-  /// See: https://developer.mozilla.org/en-US/docs/Web/API/Location/pathname
-  String get pathname;
-
-  /// The `query` part of the URL in the browser address bar.
-  ///
-  /// See: https://developer.mozilla.org/en-US/docs/Web/API/Location/search
-  String get search;
-
-  /// The `hash]` part of the URL in the browser address bar.
-  ///
-  /// See: https://developer.mozilla.org/en-US/docs/Web/API/Location/hash
-  String? get hash;
-
-  /// The `state` in the current history entry.
-  ///
-  /// See: https://developer.mozilla.org/en-US/docs/Web/API/History/state
-  Object? get state;
-
-  /// Adds a new entry to the browser history stack.
-  ///
-  /// See: https://developer.mozilla.org/en-US/docs/Web/API/History/pushState
-  void pushState(Object? state, String title, String url);
-
-  /// Replaces the current entry in the browser history stack.
-  ///
-  /// See: https://developer.mozilla.org/en-US/docs/Web/API/History/replaceState
-  void replaceState(Object? state, String title, String url);
-
-  /// Moves forwards or backwards through the history stack.
-  ///
-  /// A negative [count] value causes a backward move in the history stack. And
-  /// a positive [count] value causs a forward move.
-  ///
-  /// Examples:
-  ///
-  /// * `go(-2)` moves back 2 steps in history.
-  /// * `go(3)` moves forward 3 steps in hisotry.
-  ///
-  /// See: https://developer.mozilla.org/en-US/docs/Web/API/History/go
-  void go(int count);
-
-  /// The base href where the Flutter app is being served.
-  ///
-  /// See: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base
-  String? getBaseHref();
-}
-
-/// Delegates to real browser APIs to provide platform location functionality.
-class BrowserPlatformLocation extends PlatformLocation {
-  /// Default constructor for [BrowserPlatformLocation].
-  const BrowserPlatformLocation();
-
-  DomLocation get _location => domWindow.location;
-  DomHistory get _history => domWindow.history;
-
-  @override
-  void addPopStateListener(DomEventListener fn) {
-    domWindow.addEventListener('popstate', fn);
-  }
-
-  @override
-  void removePopStateListener(DomEventListener fn) {
-    domWindow.removeEventListener('popstate', fn);
-  }
-
-  @override
-  String get pathname => _location.pathname!;
-
-  @override
-  String get search => _location.search!;
-
-  @override
-  String get hash => _location.locationHash;
-
-  @override
-  Object? get state => _history.state;
-
-  @override
-  void pushState(Object? state, String title, String url) {
-    _history.pushState(state, title, url);
-  }
-
-  @override
-  void replaceState(Object? state, String title, String url) {
-    _history.replaceState(state, title, url);
-  }
-
-  @override
-  void go(int count) {
-    _history.go(count);
-  }
-
-  @override
-  String? getBaseHref() => domDocument.baseUri;
-}
diff --git a/lib/web_ui/lib/ui_web/src/ui_web/platform_view_registry.dart b/lib/web_ui/lib/ui_web/src/ui_web/platform_view_registry.dart
new file mode 100644
index 0000000000000000000000000000000000000000..fc17cfb1ee3d3f3339cdd16b3a067237d68bff23
--- /dev/null
+++ b/lib/web_ui/lib/ui_web/src/ui_web/platform_view_registry.dart
@@ -0,0 +1,58 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:ui/src/engine.dart';
+
+/// A function which takes a unique `id` and some `params` and creates an HTML
+/// element.
+typedef ParameterizedPlatformViewFactory = Object Function(
+  int viewId, {
+  Object? params,
+});
+
+/// A function which takes a unique `id` and creates an HTML element.
+typedef PlatformViewFactory = Object Function(int viewId);
+
+/// The platform view registry for this app.
+final PlatformViewRegistry platformViewRegistry = PlatformViewRegistry();
+
+/// A registry for factories that create platform views.
+class PlatformViewRegistry {
+  /// The view type of the built-in factory that creates visible platform view
+  /// DOM elements.
+  ///
+  /// There's no need to register this view type with [PlatformViewRegistry]
+  /// because it is registered by default.
+  static const String defaultVisibleViewType = '_default_document_create_element_visible';
+
+  /// The view type of the built-in factory that creates invisible platform view
+  /// DOM elements.
+  ///
+  /// There's no need to register this view type with [PlatformViewRegistry]
+  /// because it is registered by default.
+  static const String defaultInvisibleViewType = '_default_document_create_element_invisible';
+
+  /// Register [viewType] as being created by the given [viewFactory].
+  ///
+  /// [viewFactory] can be any function that takes an integer and optional
+  /// `params` and returns an `HTMLElement` DOM object.
+  bool registerViewFactory(
+    String viewType,
+    Function viewFactory, {
+    bool isVisible = true,
+  }) {
+    return PlatformViewManager.instance.registerFactory(
+      viewType,
+      viewFactory,
+      isVisible: isVisible,
+    );
+  }
+
+  /// Returns the view previously created for [viewId].
+  ///
+  /// Throws if no view has been created for [viewId].
+  Object getViewById(int viewId) {
+    return PlatformViewManager.instance.getViewById(viewId);
+  }
+}
diff --git a/lib/web_ui/lib/ui_web/src/ui_web/plugins.dart b/lib/web_ui/lib/ui_web/src/ui_web/plugins.dart
new file mode 100644
index 0000000000000000000000000000000000000000..c3a5dcc45ba467961032311291f270f8b2a9cac0
--- /dev/null
+++ b/lib/web_ui/lib/ui_web/src/ui_web/plugins.dart
@@ -0,0 +1,14 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui;
+
+/// Sets the handler that forwards platform messages to web plugins.
+///
+/// This function exists because unlike mobile, on the web plugins are also
+/// implemented using Dart code, and that code needs a way to receive messages.
+void setPluginHandler(ui.PlatformMessageCallback handler) {
+  pluginMessageCallHandler = handler;
+}
diff --git a/lib/web_ui/lib/ui_web/src/ui_web/testing.dart b/lib/web_ui/lib/ui_web/src/ui_web/testing.dart
new file mode 100644
index 0000000000000000000000000000000000000000..ccf19efdfe3d070b1186232faeac1a2f7f31c81b
--- /dev/null
+++ b/lib/web_ui/lib/ui_web/src/ui_web/testing.dart
@@ -0,0 +1,41 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui;
+
+extension SingletonFlutterWindowExtension on ui.SingletonFlutterWindow {
+  /// Overrides the value of [physicalSize] in tests.
+  set debugPhysicalSizeOverride(ui.Size? value) {
+    (this as EngineFlutterWindow).debugPhysicalSizeOverride = value;
+  }
+}
+
+/// Overrides the value of [ui.FlutterView.devicePixelRatio] in tests.
+///
+/// Passing `null` resets the device pixel ratio to the browser's default.
+void debugOverrideDevicePixelRatio(double? value) {
+  EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(value);
+}
+
+/// Whether the Flutter engine is running in `flutter test` emulation mode.
+///
+/// When true, the engine will emulate a specific screen size, and always
+/// use the "Ahem" font to reduce test flakiness and dependence on the test
+/// environment.
+bool get debugEmulateFlutterTesterEnvironment =>
+    _debugEmulateFlutterTesterEnvironment;
+
+/// Sets whether the Flutter engine is running in `flutter test` emulation mode.
+set debugEmulateFlutterTesterEnvironment(bool value) {
+  _debugEmulateFlutterTesterEnvironment = value;
+  if (_debugEmulateFlutterTesterEnvironment) {
+    const ui.Size logicalSize = ui.Size(800.0, 600.0);
+    final EngineFlutterWindow? implicitView = EnginePlatformDispatcher.instance.implicitView;
+    implicitView?.debugPhysicalSizeOverride = logicalSize * implicitView.devicePixelRatio;
+  }
+  debugDisableFontFallbacks = value;
+}
+
+bool _debugEmulateFlutterTesterEnvironment = false;
diff --git a/lib/web_ui/lib/window.dart b/lib/web_ui/lib/window.dart
index ee4e0e35ec897b100149ae4b0df74130b81d273d..1f4e10aac287d69799817254f65ee8800dc0e2d8 100644
--- a/lib/web_ui/lib/window.dart
+++ b/lib/web_ui/lib/window.dart
@@ -4,147 +4,109 @@
 
 part of ui;
 
+abstract class Display {
+  int get id;
+  double get devicePixelRatio;
+  Size get size;
+  double get refreshRate;
+}
+
 abstract class FlutterView {
   PlatformDispatcher get platformDispatcher;
-  ViewConfiguration get viewConfiguration;
-  double get devicePixelRatio => viewConfiguration.devicePixelRatio;
-  Rect get physicalGeometry => viewConfiguration.geometry;
-  Size get physicalSize => viewConfiguration.geometry.size;
-  WindowPadding get viewInsets => viewConfiguration.viewInsets;
-  WindowPadding get viewPadding => viewConfiguration.viewPadding;
-  WindowPadding get systemGestureInsets => viewConfiguration.systemGestureInsets;
-  WindowPadding get padding => viewConfiguration.padding;
-  List<DisplayFeature> get displayFeatures => viewConfiguration.displayFeatures;
-  void render(Scene scene) => platformDispatcher.render(scene, this);
+  int get viewId;
+  double get devicePixelRatio;
+  ViewConstraints get physicalConstraints;
+  Size get physicalSize;
+  ViewPadding get viewInsets;
+  ViewPadding get viewPadding;
+  ViewPadding get systemGestureInsets;
+  ViewPadding get padding;
+  GestureSettings get gestureSettings;
+  List<DisplayFeature> get displayFeatures;
+  Display get display;
+  void render(Scene scene, {Size? size});
   void updateSemantics(SemanticsUpdate update) => platformDispatcher.updateSemantics(update);
 }
 
-abstract class FlutterWindow extends FlutterView {
-  @override
-  PlatformDispatcher get platformDispatcher;
+abstract class SingletonFlutterWindow extends FlutterView {
+  VoidCallback? get onMetricsChanged;
+  set onMetricsChanged(VoidCallback? callback);
 
-  @override
-  ViewConfiguration get viewConfiguration;
-}
+  Locale get locale;
+  List<Locale> get locales;
 
-abstract class SingletonFlutterWindow extends FlutterWindow {
-  VoidCallback? get onMetricsChanged => platformDispatcher.onMetricsChanged;
-  set onMetricsChanged(VoidCallback? callback) {
-    platformDispatcher.onMetricsChanged = callback;
-  }
+  Locale? computePlatformResolvedLocale(List<Locale> supportedLocales);
 
-  Locale get locale => platformDispatcher.locale;
-  List<Locale> get locales => platformDispatcher.locales;
+  VoidCallback? get onLocaleChanged;
+  set onLocaleChanged(VoidCallback? callback);
 
-  Locale? computePlatformResolvedLocale(List<Locale> supportedLocales) {
-    return platformDispatcher.computePlatformResolvedLocale(supportedLocales);
-  }
+  String get initialLifecycleState;
 
-  VoidCallback? get onLocaleChanged => platformDispatcher.onLocaleChanged;
-  set onLocaleChanged(VoidCallback? callback) {
-    platformDispatcher.onLocaleChanged = callback;
-  }
-
-  String get initialLifecycleState => platformDispatcher.initialLifecycleState;
+  double get textScaleFactor;
 
-  double get textScaleFactor => platformDispatcher.textScaleFactor;
+  bool get nativeSpellCheckServiceDefined;
 
-  bool get nativeSpellCheckServiceDefined => platformDispatcher.nativeSpellCheckServiceDefined;
+  bool get brieflyShowPassword;
 
-  bool get brieflyShowPassword => platformDispatcher.brieflyShowPassword;
+  bool get alwaysUse24HourFormat;
 
-  bool get alwaysUse24HourFormat => platformDispatcher.alwaysUse24HourFormat;
-
-  VoidCallback? get onTextScaleFactorChanged => platformDispatcher.onTextScaleFactorChanged;
-  set onTextScaleFactorChanged(VoidCallback? callback) {
-    platformDispatcher.onTextScaleFactorChanged = callback;
-  }
-
-  Brightness get platformBrightness => platformDispatcher.platformBrightness;
-
-  VoidCallback? get onPlatformBrightnessChanged => platformDispatcher.onPlatformBrightnessChanged;
-  set onPlatformBrightnessChanged(VoidCallback? callback) {
-    platformDispatcher.onPlatformBrightnessChanged = callback;
-  }
+  VoidCallback? get onTextScaleFactorChanged;
+  set onTextScaleFactorChanged(VoidCallback? callback);
 
-  String? get systemFontFamily => platformDispatcher.systemFontFamily;
+  Brightness get platformBrightness;
 
-  VoidCallback? get onSystemFontFamilyChanged => platformDispatcher.onSystemFontFamilyChanged;
-  set onSystemFontFamilyChanged(VoidCallback? callback) {
-    platformDispatcher.onSystemFontFamilyChanged = callback;
-  }
+  VoidCallback? get onPlatformBrightnessChanged;
+  set onPlatformBrightnessChanged(VoidCallback? callback);
 
-  FrameCallback? get onBeginFrame => platformDispatcher.onBeginFrame;
-  set onBeginFrame(FrameCallback? callback) {
-    platformDispatcher.onBeginFrame = callback;
-  }
+  String? get systemFontFamily;
 
-  VoidCallback? get onDrawFrame => platformDispatcher.onDrawFrame;
-  set onDrawFrame(VoidCallback? callback) {
-    platformDispatcher.onDrawFrame = callback;
-  }
+  VoidCallback? get onSystemFontFamilyChanged;
+  set onSystemFontFamilyChanged(VoidCallback? callback);
 
-  TimingsCallback? get onReportTimings => platformDispatcher.onReportTimings;
-  set onReportTimings(TimingsCallback? callback) {
-    platformDispatcher.onReportTimings = callback;
-  }
+  FrameCallback? get onBeginFrame;
+  set onBeginFrame(FrameCallback? callback);
 
-  PointerDataPacketCallback? get onPointerDataPacket => platformDispatcher.onPointerDataPacket;
-  set onPointerDataPacket(PointerDataPacketCallback? callback) {
-    platformDispatcher.onPointerDataPacket = callback;
-  }
+  VoidCallback? get onDrawFrame;
+  set onDrawFrame(VoidCallback? callback);
 
-  KeyDataCallback? get onKeyData => platformDispatcher.onKeyData;
-  set onKeyData(KeyDataCallback? callback) {
-    platformDispatcher.onKeyData = callback;
-  }
+  TimingsCallback? get onReportTimings;
+  set onReportTimings(TimingsCallback? callback);
 
-  String get defaultRouteName => platformDispatcher.defaultRouteName;
+  PointerDataPacketCallback? get onPointerDataPacket;
+  set onPointerDataPacket(PointerDataPacketCallback? callback);
 
-  void scheduleFrame() => platformDispatcher.scheduleFrame();
+  KeyDataCallback? get onKeyData;
+  set onKeyData(KeyDataCallback? callback);
 
-  @override
-  void render(Scene scene) => platformDispatcher.render(scene, this);
+  String get defaultRouteName;
 
-  bool get semanticsEnabled => platformDispatcher.semanticsEnabled;
+  void scheduleFrame();
 
-  VoidCallback? get onSemanticsEnabledChanged => platformDispatcher.onSemanticsEnabledChanged;
-  set onSemanticsEnabledChanged(VoidCallback? callback) {
-    platformDispatcher.onSemanticsEnabledChanged = callback;
-  }
+  bool get semanticsEnabled;
 
-  SemanticsActionCallback? get onSemanticsAction => platformDispatcher.onSemanticsAction;
-  set onSemanticsAction(SemanticsActionCallback? callback) {
-    platformDispatcher.onSemanticsAction = callback;
-  }
+  VoidCallback? get onSemanticsEnabledChanged;
+  set onSemanticsEnabledChanged(VoidCallback? callback);
 
-  FrameData get frameData => const FrameData._();
+  FrameData get frameData;
 
-  VoidCallback? get onFrameDataChanged => null;
-  set onFrameDataChanged(VoidCallback? callback) {}
+  VoidCallback? get onFrameDataChanged;
+  set onFrameDataChanged(VoidCallback? callback);
 
-  AccessibilityFeatures get accessibilityFeatures => platformDispatcher.accessibilityFeatures;
+  AccessibilityFeatures get accessibilityFeatures;
 
-  VoidCallback? get onAccessibilityFeaturesChanged =>
-      platformDispatcher.onAccessibilityFeaturesChanged;
-  set onAccessibilityFeaturesChanged(VoidCallback? callback) {
-    platformDispatcher.onAccessibilityFeaturesChanged = callback;
-  }
+  VoidCallback? get onAccessibilityFeaturesChanged;
+  set onAccessibilityFeaturesChanged(VoidCallback? callback);
 
   void sendPlatformMessage(
     String name,
     ByteData? data,
     PlatformMessageResponseCallback? callback,
-  ) {
-    platformDispatcher.sendPlatformMessage(name, data, callback);
-  }
+  );
 
-  PlatformMessageCallback? get onPlatformMessage => platformDispatcher.onPlatformMessage;
-  set onPlatformMessage(PlatformMessageCallback? callback) {
-    platformDispatcher.onPlatformMessage = callback;
-  }
+  PlatformMessageCallback? get onPlatformMessage;
+  set onPlatformMessage(PlatformMessageCallback? callback);
 
-  void setIsolateDebugName(String name) => PlatformDispatcher.instance.setIsolateDebugName(name);
+  void setIsolateDebugName(String name);
 }
 
 abstract class AccessibilityFeatures {
@@ -165,8 +127,7 @@ enum Brightness {
 // Unimplemented classes.
 // TODO(dit): see https://github.com/flutter/flutter/issues/33614.
 class CallbackHandle {
-  CallbackHandle.fromRawHandle(this._handle)
-    : assert(_handle != null, "'_handle' must not be null.");
+  CallbackHandle.fromRawHandle(this._handle);
 
   final int _handle;
 
@@ -181,11 +142,7 @@ class CallbackHandle {
 }
 
 // TODO(dit): see https://github.com/flutter/flutter/issues/33615.
-class PluginUtilities {
-  // This class is only a namespace, and should not be instantiated or
-  // extended directly.
-  factory PluginUtilities._() => throw UnsupportedError('Namespace');
-
+abstract final class PluginUtilities {
   static CallbackHandle? getCallbackHandle(Function callback) {
     throw UnimplementedError();
   }
@@ -195,11 +152,7 @@ class PluginUtilities {
   }
 }
 
-class IsolateNameServer {
-  // This class is only a namespace, and should not be instantiated or
-  // extended directly.
-  factory IsolateNameServer._() => throw UnsupportedError('Namespace');
-
+abstract final class IsolateNameServer {
   static dynamic lookupPortByName(String name) {
     throw UnimplementedError();
   }
@@ -216,8 +169,6 @@ class IsolateNameServer {
 SingletonFlutterWindow get window => engine.window;
 
 class FrameData {
-  const FrameData._();
-
   const FrameData.webOnly();
 
   int get frameNumber => -1;
diff --git a/lib/web_ui/pubspec.yaml b/lib/web_ui/pubspec.yaml
index cf0233c8b85d4edc3acb1fbd2d8fca965d4187b6..e777c0ef266037d1c638c1f55674199f4938c476 100644
--- a/lib/web_ui/pubspec.yaml
+++ b/lib/web_ui/pubspec.yaml
@@ -3,7 +3,7 @@ publish_to: none
 
 # Keep the SDK version range in sync with pubspecs under web_sdk
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: '>=3.2.0-0 <4.0.0'
 
 dependencies:
   js: 0.6.4
@@ -14,32 +14,38 @@ dependencies:
   web_unicode:
     path: ../../third_party/web_unicode
 
+  web_test_fonts:
+    path: ../../third_party/web_test_fonts
+
 dev_dependencies:
-  archive: 3.1.2
+  archive: 3.4.2
   args: any
   async: any
-  html: 0.15.0
-  http: 0.13.5
+  convert: any
+  crypto: any
+  html: 0.15.4
+  http: 1.1.0
   http_multi_server: any
   image: 3.0.1
+  matcher: 0.12.16
   package_config: any
   path: 1.8.0
   pool: any
-  quiver: 3.0.0
+  quiver: 3.2.1
   shelf: any
   shelf_packages_handler: any
   shelf_static: any
   shelf_web_socket: any
   stack_trace: any
   stream_channel: 2.1.1
-  test: 1.22.0
+  test: 1.24.8
   test_api: any
   test_core: any
   typed_data: any
-  uuid: 3.0.6
-  watcher: 1.0.0
+  uuid: 4.1.0
+  watcher: 1.1.0
   web_socket_channel: any
-  webdriver: 3.0.0
+  webdriver: 3.0.3
   webkit_inspection_protocol: any
   yaml: 3.0.0
   web_test_utils:
@@ -48,3 +54,7 @@ dev_dependencies:
     path: ../../web_sdk/web_engine_tester
   skia_gold_client:
     path: ../../testing/skia_gold_client
+
+dependency_overrides:
+  engine_repo_tools:
+    path: ../../tools/pkg/engine_repo_tools
diff --git a/lib/web_ui/skwasm/BUILD.gn b/lib/web_ui/skwasm/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..0abf32c9926114cffccae701336d33dc359a0528
--- /dev/null
+++ b/lib/web_ui/skwasm/BUILD.gn
@@ -0,0 +1,74 @@
+# Copyright 2019 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/toolchain/wasm.gni")
+
+wasm_lib("skwasm") {
+  public_configs = [ "//flutter:config" ]
+
+  sources = [
+    "canvas.cpp",
+    "contour_measure.cpp",
+    "data.cpp",
+    "export.h",
+    "filters.cpp",
+    "fonts.cpp",
+    "helpers.h",
+    "image.cpp",
+    "paint.cpp",
+    "path.cpp",
+    "picture.cpp",
+    "shaders.cpp",
+    "skwasm_support.h",
+    "string.cpp",
+    "surface.cpp",
+    "text/line_metrics.cpp",
+    "text/paragraph.cpp",
+    "text/paragraph_builder.cpp",
+    "text/paragraph_style.cpp",
+    "text/strut_style.cpp",
+    "text/text_style.cpp",
+    "vertices.cpp",
+    "wrappers.h",
+  ]
+
+  cflags = [
+    "-mreference-types",
+    "-pthread",
+  ]
+
+  ldflags = [
+    "-std=c++20",
+    "-lGL",
+    "-sUSE_WEBGL2=1",
+    "-sMAX_WEBGL_VERSION=2",
+    "-sOFFSCREENCANVAS_SUPPORT",
+    "-sPTHREAD_POOL_SIZE=1",
+    "-sALLOW_MEMORY_GROWTH",
+    "-sALLOW_TABLE_GROWTH",
+    "-lexports.js",
+    "-sEXPORTED_FUNCTIONS=[stackAlloc]",
+    "-sEXPORTED_RUNTIME_METHODS=[addFunction,wasmExports]",
+    "-Wno-pthreads-mem-growth",
+    "--js-library",
+    rebase_path("library_skwasm_support.js"),
+  ]
+
+  inputs = [ rebase_path("library_skwasm_support.js") ]
+
+  if (is_debug) {
+    ldflags += [
+      "-sDEMANGLE_SUPPORT=1",
+      "-sASSERTIONS=1",
+      "-sGL_ASSERTIONS=1",
+    ]
+  } else {
+    ldflags += [ "--closure=1" ]
+  }
+
+  deps = [
+    "//flutter/skia",
+    "//flutter/skia/modules/skparagraph",
+  ]
+}
diff --git a/lib/web_ui/skwasm/canvas.cpp b/lib/web_ui/skwasm/canvas.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..9a8da8ad06b6ecf12d6cf16389ca30331c992dc6
--- /dev/null
+++ b/lib/web_ui/skwasm/canvas.cpp
@@ -0,0 +1,273 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "export.h"
+#include "helpers.h"
+#include "wrappers.h"
+
+#include "third_party/skia/include/core/SkPoint3.h"
+#include "third_party/skia/include/core/SkVertices.h"
+#include "third_party/skia/include/utils/SkShadowUtils.h"
+#include "third_party/skia/modules/skparagraph/include/Paragraph.h"
+
+using namespace skia::textlayout;
+
+using namespace Skwasm;
+
+namespace {
+// These numbers have been chosen empirically to give a result closest to the
+// material spec.
+// These values are also used by the CanvasKit renderer and the native engine.
+// See:
+//   flutter/display_list/skia/dl_sk_dispatcher.cc
+//   flutter/lib/web_ui/lib/src/engine/canvaskit/util.dart
+constexpr SkScalar kShadowAmbientAlpha = 0.039;
+constexpr SkScalar kShadowSpotAlpha = 0.25;
+constexpr SkScalar kShadowLightRadius = 1.1;
+constexpr SkScalar kShadowLightHeight = 600.0;
+constexpr SkScalar kShadowLightXOffset = 0;
+constexpr SkScalar kShadowLightYOffset = -450;
+}  // namespace
+
+SKWASM_EXPORT void canvas_saveLayer(SkCanvas* canvas,
+                                    SkRect* rect,
+                                    SkPaint* paint,
+                                    SkImageFilter* backdrop) {
+  canvas->saveLayer(SkCanvas::SaveLayerRec(rect, paint, backdrop, 0));
+}
+
+SKWASM_EXPORT void canvas_save(SkCanvas* canvas) {
+  canvas->save();
+}
+
+SKWASM_EXPORT void canvas_restore(SkCanvas* canvas) {
+  canvas->restore();
+}
+
+SKWASM_EXPORT void canvas_restoreToCount(SkCanvas* canvas, int count) {
+  canvas->restoreToCount(count);
+}
+
+SKWASM_EXPORT int canvas_getSaveCount(SkCanvas* canvas) {
+  return canvas->getSaveCount();
+}
+
+SKWASM_EXPORT void canvas_translate(SkCanvas* canvas,
+                                    SkScalar dx,
+                                    SkScalar dy) {
+  canvas->translate(dx, dy);
+}
+
+SKWASM_EXPORT void canvas_scale(SkCanvas* canvas, SkScalar sx, SkScalar sy) {
+  canvas->scale(sx, sy);
+}
+
+SKWASM_EXPORT void canvas_rotate(SkCanvas* canvas, SkScalar degrees) {
+  canvas->rotate(degrees);
+}
+
+SKWASM_EXPORT void canvas_skew(SkCanvas* canvas, SkScalar sx, SkScalar sy) {
+  canvas->skew(sx, sy);
+}
+
+SKWASM_EXPORT void canvas_transform(SkCanvas* canvas, const SkM44* matrix44) {
+  canvas->concat(*matrix44);
+}
+
+SKWASM_EXPORT void canvas_clipRect(SkCanvas* canvas,
+                                   const SkRect* rect,
+                                   SkClipOp op,
+                                   bool antialias) {
+  canvas->clipRect(*rect, op, antialias);
+}
+
+SKWASM_EXPORT void canvas_clipRRect(SkCanvas* canvas,
+                                    const SkScalar* rrectValues,
+                                    bool antialias) {
+  canvas->clipRRect(createRRect(rrectValues), antialias);
+}
+
+SKWASM_EXPORT void canvas_clipPath(SkCanvas* canvas,
+                                   SkPath* path,
+                                   bool antialias) {
+  canvas->clipPath(*path, antialias);
+}
+
+SKWASM_EXPORT void canvas_drawColor(SkCanvas* canvas,
+                                    SkColor color,
+                                    SkBlendMode blendMode) {
+  canvas->drawColor(color, blendMode);
+}
+
+SKWASM_EXPORT void canvas_drawLine(SkCanvas* canvas,
+                                   SkScalar x1,
+                                   SkScalar y1,
+                                   SkScalar x2,
+                                   SkScalar y2,
+                                   SkPaint* paint) {
+  canvas->drawLine(x1, y1, x2, y2, *paint);
+}
+
+SKWASM_EXPORT void canvas_drawPaint(SkCanvas* canvas, SkPaint* paint) {
+  canvas->drawPaint(*paint);
+}
+
+SKWASM_EXPORT void canvas_drawRect(SkCanvas* canvas,
+                                   SkRect* rect,
+                                   SkPaint* paint) {
+  canvas->drawRect(*rect, *paint);
+}
+
+SKWASM_EXPORT void canvas_drawRRect(SkCanvas* canvas,
+                                    const SkScalar* rrectValues,
+                                    SkPaint* paint) {
+  canvas->drawRRect(createRRect(rrectValues), *paint);
+}
+
+SKWASM_EXPORT void canvas_drawDRRect(SkCanvas* canvas,
+                                     const SkScalar* outerRrectValues,
+                                     const SkScalar* innerRrectValues,
+                                     SkPaint* paint) {
+  canvas->drawDRRect(createRRect(outerRrectValues),
+                     createRRect(innerRrectValues), *paint);
+}
+
+SKWASM_EXPORT void canvas_drawOval(SkCanvas* canvas,
+                                   const SkRect* rect,
+                                   SkPaint* paint) {
+  canvas->drawOval(*rect, *paint);
+}
+
+SKWASM_EXPORT void canvas_drawCircle(SkCanvas* canvas,
+                                     SkScalar x,
+                                     SkScalar y,
+                                     SkScalar radius,
+                                     SkPaint* paint) {
+  canvas->drawCircle(x, y, radius, *paint);
+}
+
+SKWASM_EXPORT void canvas_drawArc(SkCanvas* canvas,
+                                  const SkRect* rect,
+                                  SkScalar startAngleDegrees,
+                                  SkScalar sweepAngleDegrees,
+                                  bool useCenter,
+                                  SkPaint* paint) {
+  canvas->drawArc(*rect, startAngleDegrees, sweepAngleDegrees, useCenter,
+                  *paint);
+}
+
+SKWASM_EXPORT void canvas_drawPath(SkCanvas* canvas,
+                                   SkPath* path,
+                                   SkPaint* paint) {
+  canvas->drawPath(*path, *paint);
+}
+
+SKWASM_EXPORT void canvas_drawShadow(SkCanvas* canvas,
+                                     SkPath* path,
+                                     SkScalar elevation,
+                                     SkScalar devicePixelRatio,
+                                     SkColor color,
+                                     bool transparentOccluder) {
+  SkColor inAmbient =
+      SkColorSetA(color, kShadowAmbientAlpha * SkColorGetA(color));
+  SkColor inSpot = SkColorSetA(color, kShadowSpotAlpha * SkColorGetA(color));
+  SkColor outAmbient;
+  SkColor outSpot;
+  SkShadowUtils::ComputeTonalColors(inAmbient, inSpot, &outAmbient, &outSpot);
+  uint32_t flags = transparentOccluder
+                       ? SkShadowFlags::kTransparentOccluder_ShadowFlag
+                       : SkShadowFlags::kNone_ShadowFlag;
+  flags |= SkShadowFlags::kDirectionalLight_ShadowFlag;
+  SkShadowUtils::DrawShadow(
+      canvas, *path, SkPoint3::Make(0.0f, 0.0f, elevation * devicePixelRatio),
+      SkPoint3::Make(kShadowLightXOffset, kShadowLightYOffset,
+                     kShadowLightHeight * devicePixelRatio),
+      devicePixelRatio * kShadowLightRadius, outAmbient, outSpot, flags);
+}
+
+SKWASM_EXPORT void canvas_drawParagraph(SkCanvas* canvas,
+                                        Paragraph* paragraph,
+                                        SkScalar x,
+                                        SkScalar y) {
+  paragraph->paint(canvas, x, y);
+}
+
+SKWASM_EXPORT void canvas_drawPicture(SkCanvas* canvas, SkPicture* picture) {
+  canvas->drawPicture(picture);
+}
+
+SKWASM_EXPORT void canvas_drawImage(SkCanvas* canvas,
+                                    SkImage* image,
+                                    SkScalar offsetX,
+                                    SkScalar offsetY,
+                                    SkPaint* paint,
+                                    FilterQuality quality) {
+  canvas->drawImage(image, offsetX, offsetY, samplingOptionsForQuality(quality),
+                    paint);
+}
+
+SKWASM_EXPORT void canvas_drawImageRect(SkCanvas* canvas,
+                                        SkImage* image,
+                                        SkRect* sourceRect,
+                                        SkRect* destRect,
+                                        SkPaint* paint,
+                                        FilterQuality quality) {
+  canvas->drawImageRect(image, *sourceRect, *destRect,
+                        samplingOptionsForQuality(quality), paint,
+                        SkCanvas::kStrict_SrcRectConstraint);
+}
+
+SKWASM_EXPORT void canvas_drawImageNine(SkCanvas* canvas,
+                                        SkImage* image,
+                                        SkIRect* centerRect,
+                                        SkRect* destinationRect,
+                                        SkPaint* paint,
+                                        FilterQuality quality) {
+  canvas->drawImageNine(image, *centerRect, *destinationRect,
+                        filterModeForQuality(quality), paint);
+}
+
+SKWASM_EXPORT void canvas_drawVertices(SkCanvas* canvas,
+                                       SkVertices* vertices,
+                                       SkBlendMode mode,
+                                       SkPaint* paint) {
+  canvas->drawVertices(sk_ref_sp<SkVertices>(vertices), mode, *paint);
+}
+
+SKWASM_EXPORT void canvas_drawPoints(SkCanvas* canvas,
+                                     SkCanvas::PointMode mode,
+                                     SkPoint* points,
+                                     int pointCount,
+                                     SkPaint* paint) {
+  canvas->drawPoints(mode, pointCount, points, *paint);
+}
+
+SKWASM_EXPORT void canvas_drawAtlas(SkCanvas* canvas,
+                                    SkImage* atlas,
+                                    SkRSXform* transforms,
+                                    SkRect* rects,
+                                    SkColor* colors,
+                                    int spriteCount,
+                                    SkBlendMode mode,
+                                    SkRect* cullRect,
+                                    SkPaint* paint) {
+  canvas->drawAtlas(
+      atlas, transforms, rects, colors, spriteCount, mode,
+      SkSamplingOptions{SkFilterMode::kLinear, SkMipmapMode::kNone}, cullRect,
+      paint);
+}
+
+SKWASM_EXPORT void canvas_getTransform(SkCanvas* canvas, SkM44* outTransform) {
+  *outTransform = canvas->getLocalToDevice();
+}
+
+SKWASM_EXPORT void canvas_getLocalClipBounds(SkCanvas* canvas,
+                                             SkRect* outRect) {
+  *outRect = canvas->getLocalClipBounds();
+}
+
+SKWASM_EXPORT void canvas_getDeviceClipBounds(SkCanvas* canvas,
+                                              SkIRect* outRect) {
+  *outRect = canvas->getDeviceClipBounds();
+}
diff --git a/lib/web_ui/skwasm/contour_measure.cpp b/lib/web_ui/skwasm/contour_measure.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..4af486ffe3d3a3f3ed57e746303629aadd9ee844
--- /dev/null
+++ b/lib/web_ui/skwasm/contour_measure.cpp
@@ -0,0 +1,60 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "export.h"
+#include "helpers.h"
+
+#include "third_party/skia/include/core/SkContourMeasure.h"
+#include "third_party/skia/include/core/SkPath.h"
+
+using namespace Skwasm;
+
+SKWASM_EXPORT SkContourMeasureIter*
+contourMeasureIter_create(SkPath* path, bool forceClosed, SkScalar resScale) {
+  return new SkContourMeasureIter(*path, forceClosed, resScale);
+}
+
+SKWASM_EXPORT SkContourMeasure* contourMeasureIter_next(
+    SkContourMeasureIter* iter) {
+  auto next = iter->next();
+  if (next) {
+    next->ref();
+  }
+  return next.get();
+}
+
+SKWASM_EXPORT void contourMeasureIter_dispose(SkContourMeasureIter* iter) {
+  delete iter;
+}
+
+SKWASM_EXPORT void contourMeasure_dispose(SkContourMeasure* measure) {
+  measure->unref();
+}
+
+SKWASM_EXPORT SkScalar contourMeasure_length(SkContourMeasure* measure) {
+  return measure->length();
+}
+
+SKWASM_EXPORT bool contourMeasure_isClosed(SkContourMeasure* measure) {
+  return measure->isClosed();
+}
+
+SKWASM_EXPORT bool contourMeasure_getPosTan(SkContourMeasure* measure,
+                                            SkScalar distance,
+                                            SkPoint* outPosition,
+                                            SkVector* outTangent) {
+  return measure->getPosTan(distance, outPosition, outTangent);
+}
+
+SKWASM_EXPORT SkPath* contourMeasure_getSegment(SkContourMeasure* measure,
+                                                SkScalar startD,
+                                                SkScalar stopD,
+                                                bool startWithMoveTo) {
+  SkPath* outPath = new SkPath();
+  if (!measure->getSegment(startD, stopD, outPath, startWithMoveTo)) {
+    delete outPath;
+    return nullptr;
+  }
+  return outPath;
+}
diff --git a/lib/web_ui/skwasm/data.cpp b/lib/web_ui/skwasm/data.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..1f1b9b748aadc55b3c656ed2920d9ec57d154cb9
--- /dev/null
+++ b/lib/web_ui/skwasm/data.cpp
@@ -0,0 +1,27 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "export.h"
+
+#include "third_party/skia/include/core/SkData.h"
+
+SKWASM_EXPORT SkData* skData_create(size_t size) {
+  return SkData::MakeUninitialized(size).release();
+}
+
+SKWASM_EXPORT void* skData_getPointer(SkData* data) {
+  return data->writable_data();
+}
+
+SKWASM_EXPORT const void* skData_getConstPointer(SkData* data) {
+  return data->data();
+}
+
+SKWASM_EXPORT size_t skData_getSize(SkData* data) {
+  return data->size();
+}
+
+SKWASM_EXPORT void skData_dispose(SkData* data) {
+  return data->unref();
+}
diff --git a/lib/web_ui/skwasm/export.h b/lib/web_ui/skwasm/export.h
new file mode 100644
index 0000000000000000000000000000000000000000..fff508157d82eacbfeb3cefb833c4e852f08f5c4
--- /dev/null
+++ b/lib/web_ui/skwasm/export.h
@@ -0,0 +1,12 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_LIB_WEB_UI_SKWASM_EXPORT_H_
+#define FLUTTER_LIB_WEB_UI_SKWASM_EXPORT_H_
+
+#include <emscripten.h>
+
+#define SKWASM_EXPORT extern "C" EMSCRIPTEN_KEEPALIVE
+
+#endif  // FLUTTER_LIB_WEB_UI_SKWASM_EXPORT_H_
diff --git a/lib/web_ui/skwasm/filters.cpp b/lib/web_ui/skwasm/filters.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..d50763ead09fcb85042e6fbe4a1a8562b42be654
--- /dev/null
+++ b/lib/web_ui/skwasm/filters.cpp
@@ -0,0 +1,100 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "export.h"
+#include "helpers.h"
+
+#include "third_party/skia/include/core/SkColorFilter.h"
+#include "third_party/skia/include/core/SkMaskFilter.h"
+#include "third_party/skia/include/effects/SkImageFilters.h"
+
+using namespace Skwasm;
+
+SKWASM_EXPORT SkImageFilter* imageFilter_createBlur(SkScalar sigmaX,
+                                                    SkScalar sigmaY,
+                                                    SkTileMode tileMode) {
+  return SkImageFilters::Blur(sigmaX, sigmaY, tileMode, nullptr).release();
+}
+
+SKWASM_EXPORT SkImageFilter* imageFilter_createDilate(SkScalar radiusX,
+                                                      SkScalar radiusY) {
+  return SkImageFilters::Dilate(radiusX, radiusY, nullptr).release();
+}
+
+SKWASM_EXPORT SkImageFilter* imageFilter_createErode(SkScalar radiusX,
+                                                     SkScalar radiusY) {
+  return SkImageFilters::Erode(radiusX, radiusY, nullptr).release();
+}
+
+SKWASM_EXPORT SkImageFilter* imageFilter_createMatrix(SkScalar* matrix33,
+                                                      FilterQuality quality) {
+  return SkImageFilters::MatrixTransform(createMatrix(matrix33),
+                                         samplingOptionsForQuality(quality),
+                                         nullptr)
+      .release();
+}
+
+SKWASM_EXPORT SkImageFilter* imageFilter_createFromColorFilter(
+    SkColorFilter* filter) {
+  return SkImageFilters::ColorFilter(sk_ref_sp<SkColorFilter>(filter), nullptr)
+      .release();
+}
+
+SKWASM_EXPORT SkImageFilter* imageFilter_compose(SkImageFilter* outer,
+                                                 SkImageFilter* inner) {
+  return SkImageFilters::Compose(sk_ref_sp<SkImageFilter>(outer),
+                                 sk_ref_sp<SkImageFilter>(inner))
+      .release();
+}
+
+SKWASM_EXPORT void imageFilter_dispose(SkImageFilter* filter) {
+  filter->unref();
+}
+
+SKWASM_EXPORT void imageFilter_getFilterBounds(SkImageFilter* filter,
+                                               SkIRect* inOutBounds) {
+  SkIRect outputRect =
+      filter->filterBounds(*inOutBounds, SkMatrix(),
+                           SkImageFilter::MapDirection::kForward_MapDirection);
+  *inOutBounds = outputRect;
+}
+
+SKWASM_EXPORT SkColorFilter* colorFilter_createMode(SkColor color,
+                                                    SkBlendMode mode) {
+  return SkColorFilters::Blend(color, mode).release();
+}
+
+SKWASM_EXPORT SkColorFilter* colorFilter_createMatrix(
+    float* matrixData  // 20 values
+) {
+  return SkColorFilters::Matrix(matrixData).release();
+}
+
+SKWASM_EXPORT SkColorFilter* colorFilter_createSRGBToLinearGamma() {
+  return SkColorFilters::SRGBToLinearGamma().release();
+}
+
+SKWASM_EXPORT SkColorFilter* colorFilter_createLinearToSRGBGamma() {
+  return SkColorFilters::LinearToSRGBGamma().release();
+}
+
+SKWASM_EXPORT SkColorFilter* colorFilter_compose(SkColorFilter* outer,
+                                                 SkColorFilter* inner) {
+  return SkColorFilters::Compose(sk_ref_sp<SkColorFilter>(outer),
+                                 sk_ref_sp<SkColorFilter>(inner))
+      .release();
+}
+
+SKWASM_EXPORT void colorFilter_dispose(SkColorFilter* filter) {
+  filter->unref();
+}
+
+SKWASM_EXPORT SkMaskFilter* maskFilter_createBlur(SkBlurStyle blurStyle,
+                                                  SkScalar sigma) {
+  return SkMaskFilter::MakeBlur(blurStyle, sigma).release();
+}
+
+SKWASM_EXPORT void maskFilter_dispose(SkMaskFilter* filter) {
+  filter->unref();
+}
diff --git a/lib/web_ui/skwasm/fonts.cpp b/lib/web_ui/skwasm/fonts.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e8e3e4d5eab82c4ed75c6d29f99087dbaaf903ef
--- /dev/null
+++ b/lib/web_ui/skwasm/fonts.cpp
@@ -0,0 +1,95 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "export.h"
+#include "third_party/skia/include/core/SkFontMgr.h"
+#include "third_party/skia/include/ports/SkFontMgr_empty.h"
+#include "third_party/skia/modules/skparagraph/include/FontCollection.h"
+#include "third_party/skia/modules/skparagraph/include/TypefaceFontProvider.h"
+#include "wrappers.h"
+
+#include <memory>
+
+using namespace skia::textlayout;
+using namespace Skwasm;
+
+SKWASM_EXPORT FlutterFontCollection* fontCollection_create() {
+  auto collection = sk_make_sp<FontCollection>();
+  auto provider = sk_make_sp<TypefaceFontProvider>();
+  collection->enableFontFallback();
+  collection->setDefaultFontManager(provider, "Roboto");
+  return new FlutterFontCollection{
+      std::move(collection),
+      std::move(provider),
+  };
+}
+
+SKWASM_EXPORT void fontCollection_dispose(FlutterFontCollection* collection) {
+  delete collection;
+}
+
+static sk_sp<SkFontMgr> default_fontmgr() {
+  static sk_sp<SkFontMgr> mgr = SkFontMgr_New_Custom_Empty();
+  return mgr;
+}
+
+SKWASM_EXPORT SkTypeface* typeface_create(SkData* fontData) {
+  auto typeface = default_fontmgr()->makeFromData(sk_ref_sp<SkData>(fontData));
+  return typeface.release();
+}
+
+SKWASM_EXPORT void typeface_dispose(SkTypeface* typeface) {
+  typeface->unref();
+}
+
+// Calculates the code points that are not covered by the specified typefaces.
+// This function mutates the `codePoints` buffer in place and returns the count
+// of code points that are not covered by the fonts.
+SKWASM_EXPORT int typefaces_filterCoveredCodePoints(SkTypeface** typefaces,
+                                                    int typefaceCount,
+                                                    SkUnichar* codePoints,
+                                                    int codePointCount) {
+  std::unique_ptr<SkGlyphID[]> glyphBuffer =
+      std::make_unique<SkGlyphID[]>(codePointCount);
+  SkGlyphID* glyphPointer = glyphBuffer.get();
+  int remainingCodePointCount = codePointCount;
+  for (int typefaceIndex = 0; typefaceIndex < typefaceCount; typefaceIndex++) {
+    typefaces[typefaceIndex]->unicharsToGlyphs(
+        codePoints, remainingCodePointCount, glyphPointer);
+    int outputIndex = 0;
+    for (int inputIndex = 0; inputIndex < remainingCodePointCount;
+         inputIndex++) {
+      if (glyphPointer[inputIndex] == 0) {
+        if (outputIndex != inputIndex) {
+          codePoints[outputIndex] = codePoints[inputIndex];
+        }
+        outputIndex++;
+      }
+    }
+    if (outputIndex == 0) {
+      return 0;
+    } else {
+      remainingCodePointCount = outputIndex;
+    }
+  }
+  return remainingCodePointCount;
+}
+
+SKWASM_EXPORT void fontCollection_registerTypeface(
+    FlutterFontCollection* collection,
+    SkTypeface* typeface,
+    SkString* fontName) {
+  if (fontName) {
+    SkString alias = *fontName;
+    collection->provider->registerTypeface(sk_ref_sp<SkTypeface>(typeface),
+                                           alias);
+  } else {
+    collection->provider->registerTypeface(sk_ref_sp<SkTypeface>(typeface));
+  }
+}
+
+SKWASM_EXPORT void fontCollection_clearCaches(
+    FlutterFontCollection* collection) {
+  collection->collection->clearCaches();
+}
diff --git a/lib/web_ui/skwasm/helpers.h b/lib/web_ui/skwasm/helpers.h
new file mode 100644
index 0000000000000000000000000000000000000000..fbe186a0c8c4c3dc70d79b5a774715d077afb3b8
--- /dev/null
+++ b/lib/web_ui/skwasm/helpers.h
@@ -0,0 +1,63 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_LIB_WEB_UI_SKWASM_HELPERS_H_
+#define FLUTTER_LIB_WEB_UI_SKWASM_HELPERS_H_
+
+#include "third_party/skia/include/core/SkMatrix.h"
+#include "third_party/skia/include/core/SkRRect.h"
+#include "third_party/skia/include/core/SkSamplingOptions.h"
+
+namespace Skwasm {
+
+inline SkMatrix createMatrix(const SkScalar* f) {
+  return SkMatrix::MakeAll(f[0], f[1], f[2], f[3], f[4], f[5], f[6], f[7],
+                           f[8]);
+}
+
+inline SkRRect createRRect(const SkScalar* f) {
+  const SkRect* rect = reinterpret_cast<const SkRect*>(f);
+  const SkVector* radiiValues = reinterpret_cast<const SkVector*>(f + 4);
+
+  SkRRect rr;
+  rr.setRectRadii(*rect, radiiValues);
+  return rr;
+}
+
+// This needs to be kept in sync with the "FilterQuality" enum in dart:ui
+enum class FilterQuality {
+  none,
+  low,
+  medium,
+  high,
+};
+
+inline SkFilterMode filterModeForQuality(FilterQuality quality) {
+  switch (quality) {
+    case FilterQuality::none:
+    case FilterQuality::low:
+      return SkFilterMode::kNearest;
+    case FilterQuality::medium:
+    case FilterQuality::high:
+      return SkFilterMode::kLinear;
+  }
+}
+
+inline SkSamplingOptions samplingOptionsForQuality(FilterQuality quality) {
+  switch (quality) {
+    case FilterQuality::none:
+      return SkSamplingOptions(SkFilterMode::kNearest, SkMipmapMode::kNone);
+    case FilterQuality::low:
+      return SkSamplingOptions(SkFilterMode::kNearest, SkMipmapMode::kNearest);
+    case FilterQuality::medium:
+      return SkSamplingOptions(SkFilterMode::kLinear, SkMipmapMode::kLinear);
+    case FilterQuality::high:
+      // Cubic equation coefficients recommended by Mitchell & Netravali
+      // in their paper on cubic interpolation.
+      return SkSamplingOptions(SkCubicResampler::Mitchell());
+  }
+}
+}  // namespace Skwasm
+
+#endif  // FLUTTER_LIB_WEB_UI_SKWASM_HELPERS_H_
diff --git a/lib/web_ui/skwasm/image.cpp b/lib/web_ui/skwasm/image.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..def216398afa5f15b0bdcb23a2f012bdc1ea2be0
--- /dev/null
+++ b/lib/web_ui/skwasm/image.cpp
@@ -0,0 +1,167 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "export.h"
+#include "skwasm_support.h"
+#include "surface.h"
+#include "wrappers.h"
+
+#include "third_party/skia/include/core/SkColorSpace.h"
+#include "third_party/skia/include/core/SkData.h"
+#include "third_party/skia/include/core/SkImage.h"
+#include "third_party/skia/include/core/SkImageInfo.h"
+#include "third_party/skia/include/core/SkPicture.h"
+#include "third_party/skia/include/gpu/GpuTypes.h"
+#include "third_party/skia/include/gpu/GrBackendSurface.h"
+#include "third_party/skia/include/gpu/GrDirectContext.h"
+#include "third_party/skia/include/gpu/ganesh/GrExternalTextureGenerator.h"
+#include "third_party/skia/include/gpu/ganesh/SkImageGanesh.h"
+#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
+#include "third_party/skia/include/gpu/ganesh/gl/GrGLBackendSurface.h"
+#include "third_party/skia/include/gpu/gl/GrGLInterface.h"
+#include "third_party/skia/include/gpu/gl/GrGLTypes.h"
+
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+#include <emscripten/html5_webgl.h>
+
+using namespace SkImages;
+
+namespace {
+
+enum class PixelFormat {
+  rgba8888,
+  bgra8888,
+  rgbaFloat32,
+};
+
+SkColorType colorTypeForPixelFormat(PixelFormat format) {
+  switch (format) {
+    case PixelFormat::rgba8888:
+      return SkColorType::kRGBA_8888_SkColorType;
+    case PixelFormat::bgra8888:
+      return SkColorType::kBGRA_8888_SkColorType;
+    case PixelFormat::rgbaFloat32:
+      return SkColorType::kRGBA_F32_SkColorType;
+  }
+}
+
+SkAlphaType alphaTypeForPixelFormat(PixelFormat format) {
+  switch (format) {
+    case PixelFormat::rgba8888:
+    case PixelFormat::bgra8888:
+      return SkAlphaType::kPremul_SkAlphaType;
+    case PixelFormat::rgbaFloat32:
+      return SkAlphaType::kUnpremul_SkAlphaType;
+  }
+}
+
+class ExternalWebGLTexture : public GrExternalTexture {
+ public:
+  ExternalWebGLTexture(GrBackendTexture backendTexture,
+                       GLuint textureId,
+                       EMSCRIPTEN_WEBGL_CONTEXT_HANDLE context)
+      : _backendTexture(backendTexture),
+        _textureId(textureId),
+        _webGLContext(context) {}
+
+  GrBackendTexture getBackendTexture() override { return _backendTexture; }
+
+  void dispose() override {
+    Skwasm::makeCurrent(_webGLContext);
+    glDeleteTextures(1, &_textureId);
+  }
+
+ private:
+  GrBackendTexture _backendTexture;
+  GLuint _textureId;
+  EMSCRIPTEN_WEBGL_CONTEXT_HANDLE _webGLContext;
+};
+}  // namespace
+
+class TextureSourceImageGenerator : public GrExternalTextureGenerator {
+ public:
+  TextureSourceImageGenerator(SkImageInfo ii,
+                              SkwasmObject textureSource,
+                              Skwasm::Surface* surface)
+      : GrExternalTextureGenerator(ii),
+        _textureSourceWrapper(
+            surface->createTextureSourceWrapper(textureSource)) {}
+
+  std::unique_ptr<GrExternalTexture> generateExternalTexture(
+      GrRecordingContext* context,
+      skgpu::Mipmapped mipmapped) override {
+    GrGLTextureInfo glInfo;
+    glInfo.fID = skwasm_createGlTextureFromTextureSource(
+        _textureSourceWrapper->getTextureSource(), fInfo.width(),
+        fInfo.height());
+    glInfo.fFormat = GL_RGBA8_OES;
+    glInfo.fTarget = GL_TEXTURE_2D;
+
+    auto backendTexture = GrBackendTextures::MakeGL(
+        fInfo.width(), fInfo.height(), mipmapped, glInfo);
+
+    // In order to bind the image source to the texture, makeTexture has changed
+    // which texture is "in focus" for the WebGL context.
+    GrAsDirectContext(context)->resetContext(kTextureBinding_GrGLBackendState);
+    return std::make_unique<ExternalWebGLTexture>(
+        backendTexture, glInfo.fID, emscripten_webgl_get_current_context());
+  }
+
+ private:
+  std::unique_ptr<Skwasm::TextureSourceWrapper> _textureSourceWrapper;
+};
+
+SKWASM_EXPORT SkImage* image_createFromPicture(SkPicture* picture,
+                                               int32_t width,
+                                               int32_t height) {
+  return DeferredFromPicture(sk_ref_sp<SkPicture>(picture), {width, height},
+                             nullptr, nullptr, BitDepth::kU8,
+                             SkColorSpace::MakeSRGB())
+      .release();
+}
+
+SKWASM_EXPORT SkImage* image_createFromPixels(SkData* data,
+                                              int width,
+                                              int height,
+                                              PixelFormat pixelFormat,
+                                              size_t rowByteCount) {
+  return SkImages::RasterFromData(
+             SkImageInfo::Make(width, height,
+                               colorTypeForPixelFormat(pixelFormat),
+                               alphaTypeForPixelFormat(pixelFormat),
+                               SkColorSpace::MakeSRGB()),
+             sk_ref_sp(data), rowByteCount)
+      .release();
+}
+
+SKWASM_EXPORT SkImage* image_createFromTextureSource(SkwasmObject textureSource,
+                                                     int width,
+                                                     int height,
+                                                     Skwasm::Surface* surface) {
+  return SkImages::DeferredFromTextureGenerator(
+             std::unique_ptr<TextureSourceImageGenerator>(
+                 new TextureSourceImageGenerator(
+                     SkImageInfo::Make(width, height,
+                                       SkColorType::kRGBA_8888_SkColorType,
+                                       SkAlphaType::kPremul_SkAlphaType),
+                     textureSource, surface)))
+      .release();
+}
+
+SKWASM_EXPORT void image_ref(SkImage* image) {
+  image->ref();
+}
+
+SKWASM_EXPORT void image_dispose(SkImage* image) {
+  image->unref();
+}
+
+SKWASM_EXPORT int image_getWidth(SkImage* image) {
+  return image->width();
+}
+
+SKWASM_EXPORT int image_getHeight(SkImage* image) {
+  return image->height();
+}
diff --git a/lib/web_ui/skwasm/library_skwasm_support.js b/lib/web_ui/skwasm/library_skwasm_support.js
new file mode 100644
index 0000000000000000000000000000000000000000..5d3b660016c6c63bf2b21b4eeeb0f369f6b0bba9
--- /dev/null
+++ b/lib/web_ui/skwasm/library_skwasm_support.js
@@ -0,0 +1,180 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// This file adds JavaScript APIs that are accessible to the C++ layer.
+// See: https://emscripten.org/docs/porting/connecting_cpp_and_javascript/Interacting-with-code.html#implement-a-c-api-in-javascript
+
+mergeInto(LibraryManager.library, {
+  $skwasm_support_setup__postset: 'skwasm_support_setup();',
+  $skwasm_support_setup: function() {
+    const handleToCanvasMap = new Map();
+    const associatedObjectsMap = new Map();
+
+    // This value represents the difference between the time origin of the main
+    // thread and whichever web worker this code is running on. This is so that
+    // when we report frame timings, that they are in the same time domain
+    // regardless of whether they are captured on the main thread or the web
+    // worker.
+    let timeOriginDelta;
+    _skwasm_setAssociatedObjectOnThread = function(threadId, pointer, object) {
+      PThread.pthreads[threadId].postMessage({
+        skwasmMessage: 'setAssociatedObject',
+        pointer,
+        object,
+      }, [object]);
+    };
+    _skwasm_getAssociatedObject = function(pointer) {
+      return associatedObjectsMap.get(pointer);
+    };
+    _skwasm_syncTimeOriginForThread = function(threadId) {
+      PThread.pthreads[threadId].postMessage({
+        skwasmMessage: 'syncTimeOrigin',
+        timeOrigin: performance.timeOrigin,
+      });
+    }
+    _skwasm_registerMessageListener = function(threadId) {
+      const eventListener = function({data}) {
+        const skwasmMessage = data.skwasmMessage;
+        if (!skwasmMessage) {
+          return;
+        }
+        switch (skwasmMessage) {
+          case 'syncTimeOrigin':
+            timeOriginDelta = performance.timeOrigin - data.timeOrigin;
+            return;
+          case 'renderPictures':
+            _surface_renderPicturesOnWorker(
+              data.surface,
+              data.pictures,
+              data.pictureCount,
+              data.callbackId,
+              performance.now() + timeOriginDelta);
+            return;
+          case 'onRenderComplete':
+            _surface_onRenderComplete(
+              data.surface,
+              data.callbackId, {
+                "imageBitmaps": data.imageBitmaps,
+                "rasterStartMilliseconds": data.rasterStart,
+                "rasterEndMilliseconds": data.rasterEnd,
+              },
+            );
+            return;
+          case 'setAssociatedObject':
+            associatedObjectsMap.set(data.pointer, data.object);
+            return;
+          case 'disposeAssociatedObject':
+            const pointer = data.pointer;
+            const object = associatedObjectsMap.get(pointer);
+            if (object.close) {
+              object.close();
+            }
+            associatedObjectsMap.delete(pointer);
+            return;
+          default:
+            console.warn(`unrecognized skwasm message: ${skwasmMessage}`);
+        }
+      };
+      if (!threadId) {
+        addEventListener("message", eventListener);
+      } else {
+        PThread.pthreads[threadId].addEventListener("message", eventListener);
+      }
+    };
+    _skwasm_dispatchRenderPictures = function(threadId, surfaceHandle, pictures, pictureCount, callbackId) {
+      PThread.pthreads[threadId].postMessage({
+        skwasmMessage: 'renderPictures',
+        surface: surfaceHandle,
+        pictures,
+        pictureCount,
+        callbackId,
+      });
+    };
+    _skwasm_createOffscreenCanvas = function(width, height) {
+      const canvas = new OffscreenCanvas(width, height);
+      var contextAttributes = {
+        majorVersion: 2,
+        alpha: true,
+        depth: true,
+        stencil: true,
+        antialias: false,
+        premultipliedAlpha: true,
+        preserveDrawingBuffer: false,
+        powerPreference: 'default',
+        failIfMajorPerformanceCaveat: false,
+        enableExtensionsByDefault: true,
+      };
+      const contextHandle = GL.createContext(canvas, contextAttributes);
+      handleToCanvasMap.set(contextHandle, canvas);
+      return contextHandle;
+    };
+    _skwasm_resizeCanvas = function(contextHandle, width, height) {
+      const canvas = handleToCanvasMap.get(contextHandle);
+      canvas.width = width;
+      canvas.height = height;
+    };
+    _skwasm_captureImageBitmap = function(contextHandle, width, height, imagePromises) {
+      if (!imagePromises) imagePromises = Array();
+      const canvas = handleToCanvasMap.get(contextHandle);
+      imagePromises.push(createImageBitmap(canvas, 0, 0, width, height));
+      return imagePromises;
+    };
+    _skwasm_resolveAndPostImages = async function(surfaceHandle, imagePromises, rasterStart, callbackId) {
+      const imageBitmaps = imagePromises ? await Promise.all(imagePromises) : [];
+      const rasterEnd = performance.now() + timeOriginDelta;
+      postMessage({
+        skwasmMessage: 'onRenderComplete',
+        surface: surfaceHandle,
+        callbackId,
+        imageBitmaps,
+        rasterStart,
+        rasterEnd,
+      }, [...imageBitmaps]);
+    };
+    _skwasm_createGlTextureFromTextureSource = function(textureSource, width, height) {
+      const glCtx = GL.currentContext.GLctx;
+      const newTexture = glCtx.createTexture();
+      glCtx.bindTexture(glCtx.TEXTURE_2D, newTexture);
+      glCtx.pixelStorei(glCtx.UNPACK_PREMULTIPLY_ALPHA_WEBGL, true);
+      
+      glCtx.texImage2D(glCtx.TEXTURE_2D, 0, glCtx.RGBA, width, height, 0, glCtx.RGBA, glCtx.UNSIGNED_BYTE, textureSource);
+
+      glCtx.pixelStorei(glCtx.UNPACK_PREMULTIPLY_ALPHA_WEBGL, false);
+      glCtx.bindTexture(glCtx.TEXTURE_2D, null);
+
+      const textureId = GL.getNewId(GL.textures);
+      GL.textures[textureId] = newTexture;
+      return textureId;
+    };
+    _skwasm_disposeAssociatedObjectOnThread = function(threadId, pointer) {
+      PThread.pthreads[threadId].postMessage({
+        skwasmMessage: 'disposeAssociatedObject',
+        pointer,
+      });
+    };
+  },
+  skwasm_setAssociatedObjectOnThread: function () {},
+  skwasm_setAssociatedObjectOnThread__deps: ['$skwasm_support_setup'],
+  skwasm_getAssociatedObject: function () {},
+  skwasm_getAssociatedObject__deps: ['$skwasm_support_setup'],
+  skwasm_disposeAssociatedObjectOnThread: function () {},
+  skwasm_disposeAssociatedObjectOnThread__deps: ['$skwasm_support_setup'],
+  skwasm_syncTimeOriginForThread: function() {},
+  skwasm_syncTimeOriginForThread__deps: ['$skwasm_support_setup'],
+  skwasm_registerMessageListener: function() {},
+  skwasm_registerMessageListener__deps: ['$skwasm_support_setup'],
+  skwasm_dispatchRenderPictures: function() {},
+  skwasm_dispatchRenderPictures__deps: ['$skwasm_support_setup'],
+  skwasm_createOffscreenCanvas: function () {},
+  skwasm_createOffscreenCanvas__deps: ['$skwasm_support_setup'],
+  skwasm_resizeCanvas: function () {},
+  skwasm_resizeCanvas__deps: ['$skwasm_support_setup'],
+  skwasm_captureImageBitmap: function () {},
+  skwasm_captureImageBitmap__deps: ['$skwasm_support_setup'],
+  skwasm_resolveAndPostImages: function () {},
+  skwasm_resolveAndPostImages__deps: ['$skwasm_support_setup'],
+  skwasm_createGlTextureFromTextureSource: function () {},
+  skwasm_createGlTextureFromTextureSource__deps: ['$skwasm_support_setup'],
+});
+  
\ No newline at end of file
diff --git a/lib/web_ui/skwasm/paint.cpp b/lib/web_ui/skwasm/paint.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..d75264dad42a8577184726fe3a99f1e7cc1cd855
--- /dev/null
+++ b/lib/web_ui/skwasm/paint.cpp
@@ -0,0 +1,103 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "export.h"
+#include "helpers.h"
+#include "third_party/skia/include/core/SkColorFilter.h"
+#include "third_party/skia/include/core/SkImageFilter.h"
+#include "third_party/skia/include/core/SkMaskFilter.h"
+#include "third_party/skia/include/core/SkPaint.h"
+#include "third_party/skia/include/core/SkShader.h"
+
+using namespace Skwasm;
+
+SKWASM_EXPORT SkPaint* paint_create() {
+  auto paint = new SkPaint();
+
+  // Antialias defaults to true in flutter.
+  paint->setAntiAlias(true);
+  return paint;
+}
+
+SKWASM_EXPORT void paint_dispose(SkPaint* paint) {
+  delete paint;
+}
+
+SKWASM_EXPORT void paint_setBlendMode(SkPaint* paint, SkBlendMode mode) {
+  paint->setBlendMode(mode);
+}
+
+// No getter for blend mode, as it's non trivial. Cache on the dart side.
+
+SKWASM_EXPORT void paint_setStyle(SkPaint* paint, SkPaint::Style style) {
+  paint->setStyle(style);
+}
+
+SKWASM_EXPORT SkPaint::Style paint_getStyle(SkPaint* paint) {
+  return paint->getStyle();
+}
+
+SKWASM_EXPORT void paint_setStrokeWidth(SkPaint* paint, SkScalar width) {
+  paint->setStrokeWidth(width);
+}
+
+SKWASM_EXPORT SkScalar paint_getStrokeWidth(SkPaint* paint) {
+  return paint->getStrokeWidth();
+}
+
+SKWASM_EXPORT void paint_setStrokeCap(SkPaint* paint, SkPaint::Cap cap) {
+  paint->setStrokeCap(cap);
+}
+
+SKWASM_EXPORT SkPaint::Cap paint_getStrokeCap(SkPaint* paint) {
+  return paint->getStrokeCap();
+}
+
+SKWASM_EXPORT void paint_setStrokeJoin(SkPaint* paint, SkPaint::Join join) {
+  paint->setStrokeJoin(join);
+}
+
+SKWASM_EXPORT SkPaint::Join paint_getStrokeJoin(SkPaint* paint) {
+  return paint->getStrokeJoin();
+}
+
+SKWASM_EXPORT void paint_setAntiAlias(SkPaint* paint, bool antiAlias) {
+  paint->setAntiAlias(antiAlias);
+}
+
+SKWASM_EXPORT bool paint_getAntiAlias(SkPaint* paint) {
+  return paint->isAntiAlias();
+}
+
+SKWASM_EXPORT void paint_setColorInt(SkPaint* paint, SkColor colorInt) {
+  paint->setColor(colorInt);
+}
+
+SKWASM_EXPORT SkColor paint_getColorInt(SkPaint* paint) {
+  return paint->getColor();
+}
+
+SKWASM_EXPORT void paint_setMiterLimit(SkPaint* paint, SkScalar miterLimit) {
+  paint->setStrokeMiter(miterLimit);
+}
+
+SKWASM_EXPORT SkScalar paint_getMiterLImit(SkPaint* paint) {
+  return paint->getStrokeMiter();
+}
+
+SKWASM_EXPORT void paint_setShader(SkPaint* paint, SkShader* shader) {
+  paint->setShader(sk_ref_sp<SkShader>(shader));
+}
+
+SKWASM_EXPORT void paint_setImageFilter(SkPaint* paint, SkImageFilter* filter) {
+  paint->setImageFilter(sk_ref_sp<SkImageFilter>(filter));
+}
+
+SKWASM_EXPORT void paint_setColorFilter(SkPaint* paint, SkColorFilter* filter) {
+  paint->setColorFilter(sk_ref_sp<SkColorFilter>(filter));
+}
+
+SKWASM_EXPORT void paint_setMaskFilter(SkPaint* paint, SkMaskFilter* filter) {
+  paint->setMaskFilter(sk_ref_sp<SkMaskFilter>(filter));
+}
diff --git a/lib/web_ui/skwasm/path.cpp b/lib/web_ui/skwasm/path.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e0092bf612f2466212a6e72d118b3eeb80706aae
--- /dev/null
+++ b/lib/web_ui/skwasm/path.cpp
@@ -0,0 +1,196 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "export.h"
+#include "helpers.h"
+#include "third_party/skia/include/core/SkPath.h"
+#include "third_party/skia/include/pathops/SkPathOps.h"
+
+using namespace Skwasm;
+
+SKWASM_EXPORT SkPath* path_create() {
+  return new SkPath();
+}
+
+SKWASM_EXPORT void path_dispose(SkPath* path) {
+  delete path;
+}
+
+SKWASM_EXPORT SkPath* path_copy(SkPath* path) {
+  return new SkPath(*path);
+}
+
+SKWASM_EXPORT void path_setFillType(SkPath* path, SkPathFillType fillType) {
+  path->setFillType(fillType);
+}
+
+SKWASM_EXPORT SkPathFillType path_getFillType(SkPath* path) {
+  return path->getFillType();
+}
+
+SKWASM_EXPORT void path_moveTo(SkPath* path, SkScalar x, SkScalar y) {
+  path->moveTo(x, y);
+}
+
+SKWASM_EXPORT void path_relativeMoveTo(SkPath* path, SkScalar x, SkScalar y) {
+  path->rMoveTo(x, y);
+}
+
+SKWASM_EXPORT void path_lineTo(SkPath* path, SkScalar x, SkScalar y) {
+  path->lineTo(x, y);
+}
+
+SKWASM_EXPORT void path_relativeLineTo(SkPath* path, SkScalar x, SkScalar y) {
+  path->rLineTo(x, y);
+}
+
+SKWASM_EXPORT void path_quadraticBezierTo(SkPath* path,
+                                          SkScalar x1,
+                                          SkScalar y1,
+                                          SkScalar x2,
+                                          SkScalar y2) {
+  path->quadTo(x1, y1, x2, y2);
+}
+
+SKWASM_EXPORT void path_relativeQuadraticBezierTo(SkPath* path,
+                                                  SkScalar x1,
+                                                  SkScalar y1,
+                                                  SkScalar x2,
+                                                  SkScalar y2) {
+  path->rQuadTo(x1, y1, x2, y2);
+}
+
+SKWASM_EXPORT void path_cubicTo(SkPath* path,
+                                SkScalar x1,
+                                SkScalar y1,
+                                SkScalar x2,
+                                SkScalar y2,
+                                SkScalar x3,
+                                SkScalar y3) {
+  path->cubicTo(x1, y1, x2, y2, x3, y3);
+}
+
+SKWASM_EXPORT void path_relativeCubicTo(SkPath* path,
+                                        SkScalar x1,
+                                        SkScalar y1,
+                                        SkScalar x2,
+                                        SkScalar y2,
+                                        SkScalar x3,
+                                        SkScalar y3) {
+  path->rCubicTo(x1, y1, x2, y2, x3, y3);
+}
+
+SKWASM_EXPORT void path_conicTo(SkPath* path,
+                                SkScalar x1,
+                                SkScalar y1,
+                                SkScalar x2,
+                                SkScalar y2,
+                                SkScalar w) {
+  path->conicTo(x1, y1, x2, y2, w);
+}
+
+SKWASM_EXPORT void path_relativeConicTo(SkPath* path,
+                                        SkScalar x1,
+                                        SkScalar y1,
+                                        SkScalar x2,
+                                        SkScalar y2,
+                                        SkScalar w) {
+  path->rConicTo(x1, y1, x2, y2, w);
+}
+
+SKWASM_EXPORT void path_arcToOval(SkPath* path,
+                                  const SkRect* rect,
+                                  SkScalar startAngle,
+                                  SkScalar sweepAngle,
+                                  bool forceMoveTo) {
+  path->arcTo(*rect, startAngle, sweepAngle, forceMoveTo);
+}
+
+SKWASM_EXPORT void path_arcToRotated(SkPath* path,
+                                     SkScalar rx,
+                                     SkScalar ry,
+                                     SkScalar xAxisRotate,
+                                     SkPath::ArcSize arcSize,
+                                     SkPathDirection pathDirection,
+                                     SkScalar x,
+                                     SkScalar y) {
+  path->arcTo(rx, ry, xAxisRotate, arcSize, pathDirection, x, y);
+}
+
+SKWASM_EXPORT void path_relativeArcToRotated(SkPath* path,
+                                             SkScalar rx,
+                                             SkScalar ry,
+                                             SkScalar xAxisRotate,
+                                             SkPath::ArcSize arcSize,
+                                             SkPathDirection pathDirection,
+                                             SkScalar x,
+                                             SkScalar y) {
+  path->rArcTo(rx, ry, xAxisRotate, arcSize, pathDirection, x, y);
+}
+
+SKWASM_EXPORT void path_addRect(SkPath* path, const SkRect* rect) {
+  path->addRect(*rect);
+}
+
+SKWASM_EXPORT void path_addOval(SkPath* path, const SkRect* oval) {
+  path->addOval(*oval, SkPathDirection::kCW, 1);
+}
+
+SKWASM_EXPORT void path_addArc(SkPath* path,
+                               const SkRect* oval,
+                               SkScalar startAngle,
+                               SkScalar sweepAngle) {
+  path->addArc(*oval, startAngle, sweepAngle);
+}
+
+SKWASM_EXPORT void path_addPolygon(SkPath* path,
+                                   const SkPoint* points,
+                                   int count,
+                                   bool close) {
+  path->addPoly(points, count, close);
+}
+
+SKWASM_EXPORT void path_addRRect(SkPath* path, const SkScalar* rrectValues) {
+  path->addRRect(createRRect(rrectValues), SkPathDirection::kCW);
+}
+
+SKWASM_EXPORT void path_addPath(SkPath* path,
+                                const SkPath* other,
+                                const SkScalar* matrix33,
+                                SkPath::AddPathMode extendPath) {
+  path->addPath(*other, createMatrix(matrix33), extendPath);
+}
+
+SKWASM_EXPORT void path_close(SkPath* path) {
+  path->close();
+}
+
+SKWASM_EXPORT void path_reset(SkPath* path) {
+  path->reset();
+}
+
+SKWASM_EXPORT bool path_contains(SkPath* path, SkScalar x, SkScalar y) {
+  return path->contains(x, y);
+}
+
+SKWASM_EXPORT void path_transform(SkPath* path, const SkScalar* matrix33) {
+  path->transform(createMatrix(matrix33));
+}
+
+SKWASM_EXPORT void path_getBounds(SkPath* path, SkRect* rect) {
+  *rect = path->getBounds();
+}
+
+SKWASM_EXPORT SkPath* path_combine(SkPathOp operation,
+                                   const SkPath* path1,
+                                   const SkPath* path2) {
+  SkPath* output = new SkPath();
+  if (Op(*path1, *path2, operation, output)) {
+    output->setFillType(path1->getFillType());
+    return output;
+  } else {
+    delete output;
+    return nullptr;
+  }
+}
diff --git a/lib/web_ui/skwasm/picture.cpp b/lib/web_ui/skwasm/picture.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..aac6465cb4e224ad7eb45171cb4bf4f5fb680a9e
--- /dev/null
+++ b/lib/web_ui/skwasm/picture.cpp
@@ -0,0 +1,45 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "export.h"
+#include "helpers.h"
+#include "third_party/skia/include/core/SkBBHFactory.h"
+#include "third_party/skia/include/core/SkPicture.h"
+#include "third_party/skia/include/core/SkPictureRecorder.h"
+#include "wrappers.h"
+
+using namespace Skwasm;
+
+SkRTreeFactory bbhFactory;
+
+SKWASM_EXPORT SkPictureRecorder* pictureRecorder_create() {
+  return new SkPictureRecorder();
+}
+
+SKWASM_EXPORT void pictureRecorder_dispose(SkPictureRecorder* recorder) {
+  delete recorder;
+}
+
+SKWASM_EXPORT SkCanvas* pictureRecorder_beginRecording(
+    SkPictureRecorder* recorder,
+    const SkRect* cullRect) {
+  return recorder->beginRecording(*cullRect, &bbhFactory);
+}
+
+SKWASM_EXPORT SkPicture* pictureRecorder_endRecording(
+    SkPictureRecorder* recorder) {
+  return recorder->finishRecordingAsPicture().release();
+}
+
+SKWASM_EXPORT void picture_getCullRect(SkPicture* picture, SkRect* outRect) {
+  *outRect = picture->cullRect();
+}
+
+SKWASM_EXPORT void picture_dispose(SkPicture* picture) {
+  picture->unref();
+}
+
+SKWASM_EXPORT uint32_t picture_approximateBytesUsed(SkPicture* picture) {
+  return static_cast<uint32_t>(picture->approximateBytesUsed());
+}
diff --git a/lib/web_ui/skwasm/shaders.cpp b/lib/web_ui/skwasm/shaders.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..d7f7d36825e9db5c66aa18e3436e4928a146613e
--- /dev/null
+++ b/lib/web_ui/skwasm/shaders.cpp
@@ -0,0 +1,155 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "export.h"
+#include "helpers.h"
+#include "third_party/skia/include/core/SkImage.h"
+#include "third_party/skia/include/effects/SkGradientShader.h"
+#include "third_party/skia/include/effects/SkRuntimeEffect.h"
+#include "wrappers.h"
+
+using namespace Skwasm;
+
+SKWASM_EXPORT SkShader* shader_createLinearGradient(
+    SkPoint* endPoints,  // Two points
+    SkColor* colors,
+    SkScalar* stops,
+    int count,  // Number of stops/colors
+    SkTileMode tileMode,
+    SkScalar* matrix33  // Can be nullptr
+) {
+  if (matrix33) {
+    SkMatrix localMatrix = createMatrix(matrix33);
+    return SkGradientShader::MakeLinear(endPoints, colors, stops, count,
+                                        tileMode, 0, &localMatrix)
+        .release();
+  } else {
+    return SkGradientShader::MakeLinear(endPoints, colors, stops, count,
+                                        tileMode)
+        .release();
+  }
+}
+
+SKWASM_EXPORT SkShader* shader_createRadialGradient(SkScalar centerX,
+                                                    SkScalar centerY,
+                                                    SkScalar radius,
+                                                    SkColor* colors,
+                                                    SkScalar* stops,
+                                                    int count,
+                                                    SkTileMode tileMode,
+                                                    SkScalar* matrix33) {
+  if (matrix33) {
+    SkMatrix localMatrix = createMatrix(matrix33);
+    return SkGradientShader::MakeRadial({centerX, centerY}, radius, colors,
+                                        stops, count, tileMode, 0, &localMatrix)
+        .release();
+  } else {
+    return SkGradientShader::MakeRadial({centerX, centerY}, radius, colors,
+                                        stops, count, tileMode)
+        .release();
+  }
+}
+
+SKWASM_EXPORT SkShader* shader_createConicalGradient(
+    SkPoint* endPoints,  // Two points
+    SkScalar startRadius,
+    SkScalar endRadius,
+    SkColor* colors,
+    SkScalar* stops,
+    int count,
+    SkTileMode tileMode,
+    SkScalar* matrix33) {
+  if (matrix33) {
+    SkMatrix localMatrix = createMatrix(matrix33);
+    return SkGradientShader::MakeTwoPointConical(
+               endPoints[0], startRadius, endPoints[1], endRadius, colors,
+               stops, count, tileMode, 0, &localMatrix)
+        .release();
+
+  } else {
+    return SkGradientShader::MakeTwoPointConical(endPoints[0], startRadius,
+                                                 endPoints[1], endRadius,
+                                                 colors, stops, count, tileMode)
+        .release();
+  }
+}
+
+SKWASM_EXPORT SkShader* shader_createSweepGradient(SkScalar centerX,
+                                                   SkScalar centerY,
+                                                   SkColor* colors,
+                                                   SkScalar* stops,
+                                                   int count,
+                                                   SkTileMode tileMode,
+                                                   SkScalar startAngle,
+                                                   SkScalar endAngle,
+                                                   SkScalar* matrix33) {
+  if (matrix33) {
+    SkMatrix localMatrix = createMatrix(matrix33);
+    return SkGradientShader::MakeSweep(centerX, centerY, colors, stops, count,
+                                       tileMode, startAngle, endAngle, 0,
+                                       &localMatrix)
+        .release();
+  } else {
+    return SkGradientShader::MakeSweep(centerX, centerY, colors, stops, count,
+                                       tileMode, startAngle, endAngle, 0,
+                                       nullptr)
+        .release();
+  }
+}
+
+SKWASM_EXPORT void shader_dispose(SkShader* shader) {
+  shader->unref();
+}
+
+SKWASM_EXPORT SkRuntimeEffect* runtimeEffect_create(SkString* source) {
+  auto result = SkRuntimeEffect::MakeForShader(*source);
+  if (result.effect == nullptr) {
+    printf("Failed to compile shader. Error text:\n%s",
+           result.errorText.data());
+    return nullptr;
+  } else {
+    return result.effect.release();
+  }
+}
+
+SKWASM_EXPORT void runtimeEffect_dispose(SkRuntimeEffect* effect) {
+  effect->unref();
+}
+
+SKWASM_EXPORT size_t runtimeEffect_getUniformSize(SkRuntimeEffect* effect) {
+  return effect->uniformSize();
+}
+
+SKWASM_EXPORT SkShader* shader_createRuntimeEffectShader(
+    SkRuntimeEffect* runtimeEffect,
+    SkData* uniforms,
+    SkShader** children,
+    size_t childCount) {
+  std::vector<sk_sp<SkShader>> childPointers;
+  for (size_t i = 0; i < childCount; i++) {
+    childPointers.emplace_back(sk_ref_sp<SkShader>(children[i]));
+  }
+  return runtimeEffect
+      ->makeShader(SkData::MakeWithCopy(uniforms->data(), uniforms->size()),
+                   childPointers.data(), childCount, nullptr)
+      .release();
+}
+
+SKWASM_EXPORT SkShader* shader_createFromImage(SkImage* image,
+                                               SkTileMode tileModeX,
+                                               SkTileMode tileModeY,
+                                               FilterQuality quality,
+                                               SkScalar* matrix33) {
+  if (matrix33) {
+    SkMatrix localMatrix = createMatrix(matrix33);
+    return image
+        ->makeShader(tileModeX, tileModeY, samplingOptionsForQuality(quality),
+                     &localMatrix)
+        .release();
+  } else {
+    return image
+        ->makeShader(tileModeX, tileModeY, samplingOptionsForQuality(quality))
+        .release();
+  }
+}
diff --git a/lib/web_ui/skwasm/skwasm_support.h b/lib/web_ui/skwasm/skwasm_support.h
new file mode 100644
index 0000000000000000000000000000000000000000..c588ab8efd642d72a2018d0810e1615378e471bf
--- /dev/null
+++ b/lib/web_ui/skwasm/skwasm_support.h
@@ -0,0 +1,48 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_LIB_WEB_UI_SKWASM_SKWASM_SUPPORT_H_
+#define FLUTTER_LIB_WEB_UI_SKWASM_SKWASM_SUPPORT_H_
+
+#include <emscripten/threading.h>
+#include <cinttypes>
+#include "third_party/skia/include/core/SkPicture.h"
+
+namespace Skwasm {
+class Surface;
+}
+
+using SkwasmObject = __externref_t;
+
+extern "C" {
+extern void skwasm_setAssociatedObjectOnThread(unsigned long threadId,
+                                               void* pointer,
+                                               SkwasmObject object);
+extern SkwasmObject skwasm_getAssociatedObject(void* pointer);
+extern void skwasm_disposeAssociatedObjectOnThread(unsigned long threadId,
+                                                   void* pointer);
+extern void skwasm_registerMessageListener(pthread_t threadId);
+extern void skwasm_syncTimeOriginForThread(pthread_t threadId);
+extern void skwasm_dispatchRenderPictures(unsigned long threadId,
+                                          Skwasm::Surface* surface,
+                                          sk_sp<SkPicture>* pictures,
+                                          int count,
+                                          uint32_t callbackId);
+extern uint32_t skwasm_createOffscreenCanvas(int width, int height);
+extern void skwasm_resizeCanvas(uint32_t contextHandle, int width, int height);
+extern SkwasmObject skwasm_captureImageBitmap(uint32_t contextHandle,
+                                              int width,
+                                              int height,
+                                              SkwasmObject imagePromises);
+extern void skwasm_resolveAndPostImages(Skwasm::Surface* surface,
+                                        SkwasmObject imagePromises,
+                                        double rasterStart,
+                                        uint32_t callbackId);
+extern unsigned int skwasm_createGlTextureFromTextureSource(
+    SkwasmObject textureSource,
+    int width,
+    int height);
+}
+
+#endif  // FLUTTER_LIB_WEB_UI_SKWASM_SKWASM_SUPPORT_H_
diff --git a/lib/web_ui/skwasm/string.cpp b/lib/web_ui/skwasm/string.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..d7591a546c462e4d5a1e02c74c4af77c32a479aa
--- /dev/null
+++ b/lib/web_ui/skwasm/string.cpp
@@ -0,0 +1,33 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "export.h"
+
+#include "third_party/skia/include/core/SkString.h"
+
+SKWASM_EXPORT SkString* skString_allocate(size_t length) {
+  return new SkString(length);
+}
+
+SKWASM_EXPORT char* skString_getData(SkString* string) {
+  return string->data();
+}
+
+SKWASM_EXPORT void skString_free(SkString* string) {
+  return delete string;
+}
+
+SKWASM_EXPORT std::u16string* skString16_allocate(size_t length) {
+  std::u16string* string = new std::u16string();
+  string->resize(length);
+  return string;
+}
+
+SKWASM_EXPORT char16_t* skString16_getData(std::u16string* string) {
+  return string->data();
+}
+
+SKWASM_EXPORT void skString16_free(std::u16string* string) {
+  delete string;
+}
diff --git a/lib/web_ui/skwasm/surface.cpp b/lib/web_ui/skwasm/surface.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..7567335f3f81a82a9d4cebb82d91b0b91772e81d
--- /dev/null
+++ b/lib/web_ui/skwasm/surface.cpp
@@ -0,0 +1,280 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "surface.h"
+#include <algorithm>
+
+#include "third_party/skia/include/gpu/GrBackendSurface.h"
+#include "third_party/skia/include/gpu/GrDirectContext.h"
+#include "third_party/skia/include/gpu/ganesh/gl/GrGLBackendSurface.h"
+#include "third_party/skia/include/gpu/ganesh/gl/GrGLDirectContext.h"
+
+using namespace Skwasm;
+
+Surface::Surface() {
+  assert(emscripten_is_main_browser_thread());
+
+  pthread_attr_t attr;
+  pthread_attr_init(&attr);
+  pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+
+  pthread_create(
+      &_thread, &attr,
+      [](void* context) -> void* {
+        static_cast<Surface*>(context)->_runWorker();
+        return nullptr;
+      },
+      this);
+  // Listen to messages from the worker
+  skwasm_registerMessageListener(_thread);
+
+  // Synchronize the time origin for the worker thread
+  skwasm_syncTimeOriginForThread(_thread);
+}
+
+// Main thread only
+void Surface::dispose() {
+  assert(emscripten_is_main_browser_thread());
+  emscripten_dispatch_to_thread(_thread, EM_FUNC_SIG_VI,
+                                reinterpret_cast<void*>(fDispose), nullptr,
+                                this);
+}
+
+// Main thread only
+uint32_t Surface::renderPictures(SkPicture** pictures, int count) {
+  assert(emscripten_is_main_browser_thread());
+  uint32_t callbackId = ++_currentCallbackId;
+  std::unique_ptr<sk_sp<SkPicture>[]> picturePointers =
+      std::make_unique<sk_sp<SkPicture>[]>(count);
+  for (int i = 0; i < count; i++) {
+    picturePointers[i] = sk_ref_sp(pictures[i]);
+  }
+
+  // Releasing picturePointers here and will recreate the unique_ptr on the
+  // other thread See surface_renderPicturesOnWorker
+  skwasm_dispatchRenderPictures(_thread, this, picturePointers.release(), count,
+                                callbackId);
+  return callbackId;
+}
+
+// Main thread only
+uint32_t Surface::rasterizeImage(SkImage* image, ImageByteFormat format) {
+  assert(emscripten_is_main_browser_thread());
+  uint32_t callbackId = ++_currentCallbackId;
+  image->ref();
+
+  emscripten_dispatch_to_thread(_thread, EM_FUNC_SIG_VIIII,
+                                reinterpret_cast<void*>(fRasterizeImage),
+                                nullptr, this, image, format, callbackId);
+  return callbackId;
+}
+
+std::unique_ptr<TextureSourceWrapper> Surface::createTextureSourceWrapper(
+    SkwasmObject textureSource) {
+  return std::unique_ptr<TextureSourceWrapper>(
+      new TextureSourceWrapper(_thread, textureSource));
+}
+
+// Main thread only
+void Surface::setCallbackHandler(CallbackHandler* callbackHandler) {
+  assert(emscripten_is_main_browser_thread());
+  _callbackHandler = callbackHandler;
+}
+
+// Worker thread only
+void Surface::_runWorker() {
+  _init();
+  emscripten_exit_with_live_runtime();
+}
+
+// Worker thread only
+void Surface::_init() {
+  // Listen to messages from the main thread
+  skwasm_registerMessageListener(0);
+  _glContext = skwasm_createOffscreenCanvas(256, 256);
+  if (!_glContext) {
+    printf("Failed to create context!\n");
+    return;
+  }
+
+  makeCurrent(_glContext);
+  emscripten_webgl_enable_extension(_glContext, "WEBGL_debug_renderer_info");
+
+  _grContext = GrDirectContexts::MakeGL(GrGLMakeNativeInterface());
+
+  // WebGL should already be clearing the color and stencil buffers, but do it
+  // again here to ensure Skia receives them in the expected state.
+  emscripten_glBindFramebuffer(GL_FRAMEBUFFER, 0);
+  emscripten_glClearColor(0, 0, 0, 0);
+  emscripten_glClearStencil(0);
+  emscripten_glClear(GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+  _grContext->resetContext(kRenderTarget_GrGLBackendState |
+                           kMisc_GrGLBackendState);
+
+  // The on-screen canvas is FBO 0. Wrap it in a Skia render target so Skia
+  // can render to it.
+  _fbInfo.fFBOID = 0;
+  _fbInfo.fFormat = GL_RGBA8_OES;
+
+  emscripten_glGetIntegerv(GL_SAMPLES, &_sampleCount);
+  emscripten_glGetIntegerv(GL_STENCIL_BITS, &_stencil);
+}
+
+// Worker thread only
+void Surface::_dispose() {
+  delete this;
+}
+
+// Worker thread only
+void Surface::_resizeCanvasToFit(int width, int height) {
+  if (!_surface || width > _canvasWidth || height > _canvasHeight) {
+    _canvasWidth = std::max(width, _canvasWidth);
+    _canvasHeight = std::max(height, _canvasHeight);
+    _recreateSurface();
+  }
+}
+
+// Worker thread only
+void Surface::_recreateSurface() {
+  makeCurrent(_glContext);
+  skwasm_resizeCanvas(_glContext, _canvasWidth, _canvasHeight);
+  auto target = GrBackendRenderTargets::MakeGL(_canvasWidth, _canvasHeight,
+                                               _sampleCount, _stencil, _fbInfo);
+  _surface = SkSurfaces::WrapBackendRenderTarget(
+      _grContext.get(), target, kBottomLeft_GrSurfaceOrigin,
+      kRGBA_8888_SkColorType, SkColorSpace::MakeSRGB(), nullptr);
+}
+
+// Worker thread only
+void Surface::renderPicturesOnWorker(sk_sp<SkPicture>* pictures,
+                                     int pictureCount,
+                                     uint32_t callbackId,
+                                     double rasterStart) {
+  // This is populated by the `captureImageBitmap` call the first time it is
+  // passed in.
+  SkwasmObject imagePromiseArray = __builtin_wasm_ref_null_extern();
+  for (int i = 0; i < pictureCount; i++) {
+    sk_sp<SkPicture> picture = pictures[i];
+    SkRect pictureRect = picture->cullRect();
+    SkIRect roundedOutRect;
+    pictureRect.roundOut(&roundedOutRect);
+    _resizeCanvasToFit(roundedOutRect.width(), roundedOutRect.height());
+    SkMatrix matrix =
+        SkMatrix::Translate(-roundedOutRect.fLeft, -roundedOutRect.fTop);
+    makeCurrent(_glContext);
+    auto canvas = _surface->getCanvas();
+    canvas->drawColor(SK_ColorTRANSPARENT, SkBlendMode::kSrc);
+    canvas->drawPicture(picture, &matrix, nullptr);
+    _grContext->flush(_surface.get());
+    imagePromiseArray =
+        skwasm_captureImageBitmap(_glContext, roundedOutRect.width(),
+                                  roundedOutRect.height(), imagePromiseArray);
+  }
+  skwasm_resolveAndPostImages(this, imagePromiseArray, rasterStart, callbackId);
+}
+
+void Surface::_rasterizeImage(SkImage* image,
+                              ImageByteFormat format,
+                              uint32_t callbackId) {
+  // We handle PNG encoding with browser APIs so that we can omit libpng from
+  // skia to save binary size.
+  assert(format != ImageByteFormat::png);
+  sk_sp<SkData> data;
+  SkAlphaType alphaType = format == ImageByteFormat::rawStraightRgba
+                              ? SkAlphaType::kUnpremul_SkAlphaType
+                              : SkAlphaType::kPremul_SkAlphaType;
+  SkImageInfo info = SkImageInfo::Make(image->width(), image->height(),
+                                       SkColorType::kRGBA_8888_SkColorType,
+                                       alphaType, SkColorSpace::MakeSRGB());
+  size_t bytesPerRow = 4 * image->width();
+  size_t byteSize = info.computeByteSize(bytesPerRow);
+  data = SkData::MakeUninitialized(byteSize);
+  uint8_t* pixels = reinterpret_cast<uint8_t*>(data->writable_data());
+  bool success = image->readPixels(_grContext.get(), image->imageInfo(), pixels,
+                                   bytesPerRow, 0, 0);
+  if (!success) {
+    printf("Failed to read pixels from image!\n");
+    data = nullptr;
+  }
+  emscripten_async_run_in_main_runtime_thread(
+      EM_FUNC_SIG_VIII, fOnRasterizeComplete, this, data.release(), callbackId);
+}
+
+void Surface::_onRasterizeComplete(SkData* data, uint32_t callbackId) {
+  _callbackHandler(callbackId, data, __builtin_wasm_ref_null_extern());
+}
+
+// Main thread only
+void Surface::onRenderComplete(uint32_t callbackId, SkwasmObject imageBitmap) {
+  assert(emscripten_is_main_browser_thread());
+  _callbackHandler(callbackId, nullptr, imageBitmap);
+}
+
+void Surface::fDispose(Surface* surface) {
+  surface->_dispose();
+}
+
+void Surface::fOnRasterizeComplete(Surface* surface,
+                                   SkData* imageData,
+                                   uint32_t callbackId) {
+  surface->_onRasterizeComplete(imageData, callbackId);
+}
+
+void Surface::fRasterizeImage(Surface* surface,
+                              SkImage* image,
+                              ImageByteFormat format,
+                              uint32_t callbackId) {
+  surface->_rasterizeImage(image, format, callbackId);
+  image->unref();
+}
+
+SKWASM_EXPORT Surface* surface_create() {
+  return new Surface();
+}
+
+SKWASM_EXPORT unsigned long surface_getThreadId(Surface* surface) {
+  return surface->getThreadId();
+}
+
+SKWASM_EXPORT void surface_setCallbackHandler(
+    Surface* surface,
+    Surface::CallbackHandler* callbackHandler) {
+  surface->setCallbackHandler(callbackHandler);
+}
+
+SKWASM_EXPORT void surface_destroy(Surface* surface) {
+  surface->dispose();
+}
+
+SKWASM_EXPORT uint32_t surface_renderPictures(Surface* surface,
+                                              SkPicture** pictures,
+                                              int count) {
+  return surface->renderPictures(pictures, count);
+}
+
+SKWASM_EXPORT void surface_renderPicturesOnWorker(Surface* surface,
+                                                  sk_sp<SkPicture>* pictures,
+                                                  int pictureCount,
+                                                  uint32_t callbackId,
+                                                  double rasterStart) {
+  // This will release the pictures when they leave scope.
+  std::unique_ptr<sk_sp<SkPicture>> picturesPointer =
+      std::unique_ptr<sk_sp<SkPicture>>(pictures);
+  surface->renderPicturesOnWorker(pictures, pictureCount, callbackId,
+                                  rasterStart);
+}
+
+SKWASM_EXPORT uint32_t surface_rasterizeImage(Surface* surface,
+                                              SkImage* image,
+                                              ImageByteFormat format) {
+  return surface->rasterizeImage(image, format);
+}
+
+// This is used by the skwasm JS support code to call back into C++ when the
+// we finish creating the image bitmap, which is an asynchronous operation.
+SKWASM_EXPORT void surface_onRenderComplete(Surface* surface,
+                                            uint32_t callbackId,
+                                            SkwasmObject imageBitmap) {
+  return surface->onRenderComplete(callbackId, imageBitmap);
+}
diff --git a/lib/web_ui/skwasm/surface.h b/lib/web_ui/skwasm/surface.h
new file mode 100644
index 0000000000000000000000000000000000000000..7e1d5fbb526e135fd9fc0d8fd3194f97a4074958
--- /dev/null
+++ b/lib/web_ui/skwasm/surface.h
@@ -0,0 +1,121 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_LIB_WEB_UI_SKWASM_SURFACE_H_
+#define FLUTTER_LIB_WEB_UI_SKWASM_SURFACE_H_
+
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+#include <emscripten.h>
+#include <emscripten/html5_webgl.h>
+#include <emscripten/threading.h>
+#include <webgl/webgl1.h>
+#include <cassert>
+#include "export.h"
+#include "skwasm_support.h"
+#include "third_party/skia/include/core/SkCanvas.h"
+#include "third_party/skia/include/core/SkColorSpace.h"
+#include "third_party/skia/include/core/SkPicture.h"
+#include "third_party/skia/include/core/SkSurface.h"
+#include "third_party/skia/include/encode/SkPngEncoder.h"
+#include "third_party/skia/include/gpu/GrDirectContext.h"
+#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
+#include "third_party/skia/include/gpu/gl/GrGLInterface.h"
+#include "third_party/skia/include/gpu/gl/GrGLTypes.h"
+#include "wrappers.h"
+
+namespace Skwasm {
+// This must be kept in sync with the `ImageByteFormat` enum in dart:ui.
+enum class ImageByteFormat {
+  rawRgba,
+  rawStraightRgba,
+  rawUnmodified,
+  png,
+};
+
+class TextureSourceWrapper {
+ public:
+  TextureSourceWrapper(unsigned long threadId, SkwasmObject textureSource)
+      : _rasterThreadId(threadId) {
+    skwasm_setAssociatedObjectOnThread(_rasterThreadId, this, textureSource);
+  }
+
+  ~TextureSourceWrapper() {
+    skwasm_disposeAssociatedObjectOnThread(_rasterThreadId, this);
+  }
+
+  SkwasmObject getTextureSource() { return skwasm_getAssociatedObject(this); }
+
+ private:
+  unsigned long _rasterThreadId;
+};
+
+class Surface {
+ public:
+  using CallbackHandler = void(uint32_t, void*, SkwasmObject);
+
+  // Main thread only
+  Surface();
+
+  unsigned long getThreadId() { return _thread; }
+
+  // Main thread only
+  void dispose();
+  uint32_t renderPictures(SkPicture** picture, int count);
+  uint32_t rasterizeImage(SkImage* image, ImageByteFormat format);
+  void setCallbackHandler(CallbackHandler* callbackHandler);
+  void onRenderComplete(uint32_t callbackId, SkwasmObject imageBitmap);
+
+  // Any thread
+  std::unique_ptr<TextureSourceWrapper> createTextureSourceWrapper(
+      SkwasmObject textureSource);
+
+  // Worker thread
+  void renderPicturesOnWorker(sk_sp<SkPicture>* picture,
+                              int pictureCount,
+                              uint32_t callbackId,
+                              double rasterStart);
+
+ private:
+  void _runWorker();
+  void _init();
+  void _dispose();
+  void _resizeCanvasToFit(int width, int height);
+  void _recreateSurface();
+  void _rasterizeImage(SkImage* image,
+                       ImageByteFormat format,
+                       uint32_t callbackId);
+  void _onRasterizeComplete(SkData* data, uint32_t callbackId);
+
+  std::string _canvasID;
+  CallbackHandler* _callbackHandler = nullptr;
+  uint32_t _currentCallbackId = 0;
+
+  int _canvasWidth = 0;
+  int _canvasHeight = 0;
+
+  EMSCRIPTEN_WEBGL_CONTEXT_HANDLE _glContext = 0;
+  sk_sp<GrDirectContext> _grContext = nullptr;
+  sk_sp<SkSurface> _surface = nullptr;
+  GrGLFramebufferInfo _fbInfo;
+  GrGLint _sampleCount;
+  GrGLint _stencil;
+
+  pthread_t _thread;
+
+  static void fDispose(Surface* surface);
+  static void fOnRenderComplete(Surface* surface,
+                                uint32_t callbackId,
+                                SkwasmObject imageBitmap);
+  static void fRasterizeImage(Surface* surface,
+                              SkImage* image,
+                              ImageByteFormat format,
+                              uint32_t callbackId);
+  static void fOnRasterizeComplete(Surface* surface,
+                                   SkData* imageData,
+                                   uint32_t callbackId);
+};
+}  // namespace Skwasm
+
+#endif  // FLUTTER_LIB_WEB_UI_SKWASM_SURFACE_H_
diff --git a/lib/web_ui/skwasm/text/line_metrics.cpp b/lib/web_ui/skwasm/text/line_metrics.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..c163dc322dee24d1f0120c752fcc63f7bfa16a9a
--- /dev/null
+++ b/lib/web_ui/skwasm/text/line_metrics.cpp
@@ -0,0 +1,78 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "../export.h"
+#include "third_party/skia/modules/skparagraph/include/Paragraph.h"
+
+using namespace skia::textlayout;
+
+SKWASM_EXPORT LineMetrics* lineMetrics_create(bool hardBreak,
+                                              double ascent,
+                                              double descent,
+                                              double unscaledAscent,
+                                              double height,
+                                              double width,
+                                              double left,
+                                              double baseline,
+                                              size_t lineNumber) {
+  auto metrics = new LineMetrics();
+  metrics->fHardBreak = hardBreak;
+  metrics->fAscent = ascent;
+  metrics->fDescent = descent;
+  metrics->fUnscaledAscent = unscaledAscent;
+  metrics->fHeight = height;
+  metrics->fWidth = width;
+  metrics->fLeft = left;
+  metrics->fBaseline = baseline;
+  metrics->fLineNumber = lineNumber;
+  return metrics;
+}
+
+SKWASM_EXPORT void lineMetrics_dispose(LineMetrics* metrics) {
+  delete metrics;
+}
+
+SKWASM_EXPORT bool lineMetrics_getHardBreak(LineMetrics* metrics) {
+  return metrics->fHardBreak;
+}
+
+SKWASM_EXPORT SkScalar lineMetrics_getAscent(LineMetrics* metrics) {
+  return metrics->fAscent;
+}
+
+SKWASM_EXPORT SkScalar lineMetrics_getDescent(LineMetrics* metrics) {
+  return metrics->fDescent;
+}
+
+SKWASM_EXPORT SkScalar lineMetrics_getUnscaledAscent(LineMetrics* metrics) {
+  return metrics->fUnscaledAscent;
+}
+
+SKWASM_EXPORT SkScalar lineMetrics_getHeight(LineMetrics* metrics) {
+  return metrics->fHeight;
+}
+
+SKWASM_EXPORT SkScalar lineMetrics_getWidth(LineMetrics* metrics) {
+  return metrics->fWidth;
+}
+
+SKWASM_EXPORT SkScalar lineMetrics_getLeft(LineMetrics* metrics) {
+  return metrics->fLeft;
+}
+
+SKWASM_EXPORT SkScalar lineMetrics_getBaseline(LineMetrics* metrics) {
+  return metrics->fBaseline;
+}
+
+SKWASM_EXPORT int lineMetrics_getLineNumber(LineMetrics* metrics) {
+  return metrics->fLineNumber;
+}
+
+SKWASM_EXPORT size_t lineMetrics_getStartIndex(LineMetrics* metrics) {
+  return metrics->fStartIndex;
+}
+
+SKWASM_EXPORT size_t lineMetrics_getEndIndex(LineMetrics* metrics) {
+  return metrics->fEndIndex;
+}
diff --git a/lib/web_ui/skwasm/text/paragraph.cpp b/lib/web_ui/skwasm/text/paragraph.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..0b94bdc03bac52f2733345dec3c6322d9413960f
--- /dev/null
+++ b/lib/web_ui/skwasm/text/paragraph.cpp
@@ -0,0 +1,195 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "third_party/skia/modules/skparagraph/include/Paragraph.h"
+#include "../export.h"
+#include "DartTypes.h"
+#include "TextStyle.h"
+#include "include/core/SkScalar.h"
+
+using namespace skia::textlayout;
+
+SKWASM_EXPORT void paragraph_dispose(Paragraph* paragraph) {
+  delete paragraph;
+}
+
+SKWASM_EXPORT SkScalar paragraph_getWidth(Paragraph* paragraph) {
+  return paragraph->getMaxWidth();
+}
+
+SKWASM_EXPORT SkScalar paragraph_getHeight(Paragraph* paragraph) {
+  return paragraph->getHeight();
+}
+
+SKWASM_EXPORT SkScalar paragraph_getLongestLine(Paragraph* paragraph) {
+  return paragraph->getLongestLine();
+}
+
+SKWASM_EXPORT SkScalar paragraph_getMinIntrinsicWidth(Paragraph* paragraph) {
+  return paragraph->getMinIntrinsicWidth();
+}
+
+SKWASM_EXPORT SkScalar paragraph_getMaxIntrinsicWidth(Paragraph* paragraph) {
+  return paragraph->getMaxIntrinsicWidth();
+}
+
+SKWASM_EXPORT SkScalar paragraph_getAlphabeticBaseline(Paragraph* paragraph) {
+  return paragraph->getAlphabeticBaseline();
+}
+
+SKWASM_EXPORT SkScalar paragraph_getIdeographicBaseline(Paragraph* paragraph) {
+  return paragraph->getIdeographicBaseline();
+}
+
+SKWASM_EXPORT bool paragraph_getDidExceedMaxLines(Paragraph* paragraph) {
+  return paragraph->didExceedMaxLines();
+}
+
+SKWASM_EXPORT void paragraph_layout(Paragraph* paragraph, SkScalar width) {
+  paragraph->layout(width);
+}
+
+SKWASM_EXPORT int32_t paragraph_getPositionForOffset(Paragraph* paragraph,
+                                                     SkScalar offsetX,
+                                                     SkScalar offsetY,
+                                                     Affinity* outAffinity) {
+  auto position = paragraph->getGlyphPositionAtCoordinate(offsetX, offsetY);
+  if (outAffinity) {
+    *outAffinity = position.affinity;
+  }
+  return position.position;
+}
+
+SKWASM_EXPORT bool paragraph_getClosestGlyphInfoAtCoordinate(
+    Paragraph* paragraph,
+    SkScalar offsetX,
+    SkScalar offsetY,
+    // Out parameters:
+    SkRect* graphemeLayoutBounds,   // 1 SkRect
+    size_t* graphemeCodeUnitRange,  // 2 size_ts: [start, end]
+    bool* booleanFlags) {           // 1 boolean: isLTR
+  Paragraph::GlyphInfo glyphInfo;
+  if (!paragraph->getClosestUTF16GlyphInfoAt(offsetX, offsetY, &glyphInfo)) {
+    return false;
+  }
+  // This is more verbose than memcpying the whole struct but ideally we don't
+  // want to depend on the exact memory layout of the struct.
+  std::memcpy(graphemeLayoutBounds, &glyphInfo.fGraphemeLayoutBounds,
+              sizeof(SkRect));
+  std::memcpy(graphemeCodeUnitRange, &glyphInfo.fGraphemeClusterTextRange,
+              2 * sizeof(size_t));
+  booleanFlags[0] =
+      glyphInfo.fDirection == skia::textlayout::TextDirection::kLtr;
+  return true;
+}
+
+SKWASM_EXPORT bool paragraph_getGlyphInfoAt(
+    Paragraph* paragraph,
+    size_t index,
+    // Out parameters:
+    SkRect* graphemeLayoutBounds,   // 1 SkRect
+    size_t* graphemeCodeUnitRange,  // 2 size_ts: [start, end]
+    bool* booleanFlags) {           // 1 boolean: isLTR
+  Paragraph::GlyphInfo glyphInfo;
+  if (!paragraph->getGlyphInfoAtUTF16Offset(index, &glyphInfo)) {
+    return false;
+  }
+  std::memcpy(graphemeLayoutBounds, &glyphInfo.fGraphemeLayoutBounds,
+              sizeof(SkRect));
+  std::memcpy(graphemeCodeUnitRange, &glyphInfo.fGraphemeClusterTextRange,
+              2 * sizeof(size_t));
+  booleanFlags[0] =
+      glyphInfo.fDirection == skia::textlayout::TextDirection::kLtr;
+  return true;
+}
+
+SKWASM_EXPORT void paragraph_getWordBoundary(
+    Paragraph* paragraph,
+    unsigned int position,
+    int32_t* outRange  // Two `int32_t`s, start and end
+) {
+  auto range = paragraph->getWordBoundary(position);
+  outRange[0] = range.start;
+  outRange[1] = range.end;
+}
+
+SKWASM_EXPORT size_t paragraph_getLineCount(Paragraph* paragraph) {
+  return paragraph->lineNumber();
+}
+
+SKWASM_EXPORT int paragraph_getLineNumberAt(Paragraph* paragraph,
+                                            size_t characterIndex) {
+  return paragraph->getLineNumberAtUTF16Offset(characterIndex);
+}
+
+SKWASM_EXPORT LineMetrics* paragraph_getLineMetricsAtIndex(Paragraph* paragraph,
+                                                           size_t lineNumber) {
+  auto metrics = new LineMetrics();
+  if (paragraph->getLineMetricsAt(lineNumber, metrics)) {
+    return metrics;
+  } else {
+    delete metrics;
+    return nullptr;
+  }
+}
+
+struct TextBoxList {
+  std::vector<TextBox> boxes;
+};
+
+SKWASM_EXPORT void textBoxList_dispose(TextBoxList* list) {
+  delete list;
+}
+
+SKWASM_EXPORT size_t textBoxList_getLength(TextBoxList* list) {
+  return list->boxes.size();
+}
+
+SKWASM_EXPORT TextDirection textBoxList_getBoxAtIndex(TextBoxList* list,
+                                                      size_t index,
+                                                      SkRect* outRect) {
+  const auto& box = list->boxes[index];
+  *outRect = box.rect;
+  return box.direction;
+}
+
+SKWASM_EXPORT TextBoxList* paragraph_getBoxesForRange(
+    Paragraph* paragraph,
+    int start,
+    int end,
+    RectHeightStyle heightStyle,
+    RectWidthStyle widthStyle) {
+  return new TextBoxList{
+      paragraph->getRectsForRange(start, end, heightStyle, widthStyle)};
+}
+
+SKWASM_EXPORT TextBoxList* paragraph_getBoxesForPlaceholders(
+    Paragraph* paragraph) {
+  return new TextBoxList{paragraph->getRectsForPlaceholders()};
+}
+
+// Returns a list of the code points that were unable to be rendered with the
+// selected fonts. The list is deduplicated, so each code point in the output
+// is unique.
+// If `nullptr` is passed in for `outCodePoints`, we simply return the count
+// of the code points.
+// Note: This must be called after the paragraph has been laid out at least
+// once in order to get valid data.
+SKWASM_EXPORT int paragraph_getUnresolvedCodePoints(Paragraph* paragraph,
+                                                    SkUnichar* outCodePoints,
+                                                    int outLength) {
+  if (!outCodePoints) {
+    return paragraph->unresolvedCodepoints().size();
+  }
+  int outIndex = 0;
+  for (SkUnichar character : paragraph->unresolvedCodepoints()) {
+    if (outIndex < outLength) {
+      outCodePoints[outIndex] = character;
+      outIndex++;
+    } else {
+      break;
+    }
+  }
+  return outIndex;
+}
diff --git a/lib/web_ui/skwasm/text/paragraph_builder.cpp b/lib/web_ui/skwasm/text/paragraph_builder.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..29e659dd914c83e6ba855b801b00aafc9e52d075
--- /dev/null
+++ b/lib/web_ui/skwasm/text/paragraph_builder.cpp
@@ -0,0 +1,105 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "../export.h"
+#include "../wrappers.h"
+#include "third_party/skia/modules/skparagraph/include/ParagraphBuilder.h"
+
+using namespace skia::textlayout;
+using namespace Skwasm;
+
+SKWASM_EXPORT ParagraphBuilder* paragraphBuilder_create(
+    ParagraphStyle* style,
+    FlutterFontCollection* collection) {
+  return ParagraphBuilder::make(*style, collection->collection).release();
+}
+
+SKWASM_EXPORT void paragraphBuilder_dispose(ParagraphBuilder* builder) {
+  delete builder;
+}
+
+SKWASM_EXPORT void paragraphBuilder_addPlaceholder(
+    ParagraphBuilder* builder,
+    SkScalar width,
+    SkScalar height,
+    PlaceholderAlignment alignment,
+    SkScalar baselineOffset,
+    TextBaseline baseline) {
+  builder->addPlaceholder(
+      PlaceholderStyle(width, height, alignment, baseline, baselineOffset));
+}
+
+SKWASM_EXPORT void paragraphBuilder_addText(ParagraphBuilder* builder,
+                                            std::u16string* text) {
+  builder->addText(*text);
+}
+
+SKWASM_EXPORT char* paragraphBuilder_getUtf8Text(ParagraphBuilder* builder,
+                                                 uint32_t* outLength) {
+  auto span = builder->getText();
+  *outLength = span.size();
+  return span.data();
+}
+
+SKWASM_EXPORT void paragraphBuilder_pushStyle(ParagraphBuilder* builder,
+                                              TextStyle* style) {
+  builder->pushStyle(*style);
+}
+
+SKWASM_EXPORT void paragraphBuilder_pop(ParagraphBuilder* builder) {
+  builder->pop();
+}
+
+SKWASM_EXPORT Paragraph* paragraphBuilder_build(ParagraphBuilder* builder) {
+  return builder->Build().release();
+}
+
+SKWASM_EXPORT std::vector<SkUnicode::Position>* unicodePositionBuffer_create(
+    size_t length) {
+  return new std::vector<SkUnicode::Position>(length);
+}
+
+SKWASM_EXPORT SkUnicode::Position* unicodePositionBuffer_getDataPointer(
+    std::vector<SkUnicode::Position>* buffer) {
+  return buffer->data();
+}
+
+SKWASM_EXPORT void unicodePositionBuffer_free(
+    std::vector<SkUnicode::Position>* buffer) {
+  delete buffer;
+}
+
+SKWASM_EXPORT std::vector<SkUnicode::LineBreakBefore>* lineBreakBuffer_create(
+    size_t length) {
+  return new std::vector<SkUnicode::LineBreakBefore>(
+      length, {0, SkUnicode::LineBreakType::kSoftLineBreak});
+}
+
+SKWASM_EXPORT SkUnicode::LineBreakBefore* lineBreakBuffer_getDataPointer(
+    std::vector<SkUnicode::LineBreakBefore>* buffer) {
+  return buffer->data();
+}
+
+SKWASM_EXPORT void lineBreakBuffer_free(
+    std::vector<SkUnicode::LineBreakBefore>* buffer) {
+  delete buffer;
+}
+
+SKWASM_EXPORT void paragraphBuilder_setGraphemeBreaksUtf16(
+    ParagraphBuilder* builder,
+    std::vector<SkUnicode::Position>* breaks) {
+  builder->setGraphemeBreaksUtf16(std::move(*breaks));
+}
+
+SKWASM_EXPORT void paragraphBuilder_setWordBreaksUtf16(
+    ParagraphBuilder* builder,
+    std::vector<SkUnicode::Position>* breaks) {
+  builder->setWordsUtf16(std::move(*breaks));
+}
+
+SKWASM_EXPORT void paragraphBuilder_setLineBreaksUtf16(
+    ParagraphBuilder* builder,
+    std::vector<SkUnicode::LineBreakBefore>* breaks) {
+  builder->setLineBreaksUtf16(std::move(*breaks));
+}
diff --git a/lib/web_ui/skwasm/text/paragraph_style.cpp b/lib/web_ui/skwasm/text/paragraph_style.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..a319287bebebaf656d2ef0e8a3165215fe96dab6
--- /dev/null
+++ b/lib/web_ui/skwasm/text/paragraph_style.cpp
@@ -0,0 +1,85 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "../export.h"
+#include "../wrappers.h"
+#include "third_party/skia/modules/skparagraph/include/Paragraph.h"
+
+using namespace skia::textlayout;
+using namespace Skwasm;
+
+SKWASM_EXPORT ParagraphStyle* paragraphStyle_create() {
+  auto style = new ParagraphStyle();
+
+  // This is the default behavior in Flutter
+  style->setReplaceTabCharacters(true);
+
+  // Default text style has a black color
+  TextStyle textStyle;
+  textStyle.setColor(SK_ColorBLACK);
+  style->setTextStyle(textStyle);
+
+  return style;
+}
+
+SKWASM_EXPORT void paragraphStyle_dispose(ParagraphStyle* style) {
+  delete style;
+}
+
+SKWASM_EXPORT void paragraphStyle_setTextAlign(ParagraphStyle* style,
+                                               TextAlign align) {
+  style->setTextAlign(align);
+}
+
+SKWASM_EXPORT void paragraphStyle_setTextDirection(ParagraphStyle* style,
+                                                   TextDirection direction) {
+  style->setTextDirection(direction);
+}
+
+SKWASM_EXPORT void paragraphStyle_setMaxLines(ParagraphStyle* style,
+                                              size_t maxLines) {
+  style->setMaxLines(maxLines);
+}
+
+SKWASM_EXPORT void paragraphStyle_setHeight(ParagraphStyle* style,
+                                            SkScalar height) {
+  style->setHeight(height);
+}
+
+SKWASM_EXPORT void paragraphStyle_setTextHeightBehavior(
+    ParagraphStyle* style,
+    bool applyHeightToFirstAscent,
+    bool applyHeightToLastDescent) {
+  TextHeightBehavior behavior;
+  if (!applyHeightToFirstAscent && !applyHeightToLastDescent) {
+    behavior = kDisableAll;
+  } else if (!applyHeightToLastDescent) {
+    behavior = kDisableLastDescent;
+  } else if (!applyHeightToFirstAscent) {
+    behavior = kDisableFirstAscent;
+  } else {
+    behavior = kAll;
+  }
+  style->setTextHeightBehavior(behavior);
+}
+
+SKWASM_EXPORT void paragraphStyle_setEllipsis(ParagraphStyle* style,
+                                              SkString* ellipsis) {
+  style->setEllipsis(*ellipsis);
+}
+
+SKWASM_EXPORT void paragraphStyle_setStrutStyle(ParagraphStyle* style,
+                                                StrutStyle* strutStyle) {
+  style->setStrutStyle(*strutStyle);
+}
+
+SKWASM_EXPORT void paragraphStyle_setTextStyle(ParagraphStyle* style,
+                                               TextStyle* textStyle) {
+  style->setTextStyle(*textStyle);
+}
+
+SKWASM_EXPORT void paragraphStyle_setApplyRoundingHack(ParagraphStyle* style,
+                                                       bool applyRoundingHack) {
+  style->setApplyRoundingHack(applyRoundingHack);
+}
diff --git a/lib/web_ui/skwasm/text/strut_style.cpp b/lib/web_ui/skwasm/text/strut_style.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..6d1de9b44cb00bd2c77c2dbbe7f5143e37fe938d
--- /dev/null
+++ b/lib/web_ui/skwasm/text/strut_style.cpp
@@ -0,0 +1,59 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "../export.h"
+#include "third_party/skia/modules/skparagraph/include/Paragraph.h"
+
+using namespace skia::textlayout;
+
+SKWASM_EXPORT StrutStyle* strutStyle_create() {
+  auto style = new StrutStyle();
+  style->setStrutEnabled(true);
+  return style;
+}
+
+SKWASM_EXPORT void strutStyle_dispose(StrutStyle* style) {
+  delete style;
+}
+
+SKWASM_EXPORT void strutStyle_setFontFamilies(StrutStyle* style,
+                                              SkString** fontFamilies,
+                                              int count) {
+  std::vector<SkString> families;
+  families.reserve(count);
+  for (int i = 0; i < count; i++) {
+    families.push_back(*fontFamilies[i]);
+  }
+  style->setFontFamilies(std::move(families));
+}
+
+SKWASM_EXPORT void strutStyle_setFontSize(StrutStyle* style,
+                                          SkScalar fontSize) {
+  style->setFontSize(fontSize);
+}
+
+SKWASM_EXPORT void strutStyle_setHeight(StrutStyle* style, SkScalar height) {
+  style->setHeight(height);
+  style->setHeightOverride(true);
+}
+
+SKWASM_EXPORT void strutStyle_setHalfLeading(StrutStyle* style,
+                                             bool halfLeading) {
+  style->setHalfLeading(halfLeading);
+}
+
+SKWASM_EXPORT void strutStyle_setLeading(StrutStyle* style, SkScalar leading) {
+  style->setLeading(leading);
+}
+
+SKWASM_EXPORT void strutStyle_setFontStyle(StrutStyle* style,
+                                           int weight,
+                                           SkFontStyle::Slant slant) {
+  style->setFontStyle(SkFontStyle(weight, SkFontStyle::kNormal_Width, slant));
+}
+
+SKWASM_EXPORT void strutStyle_setForceStrutHeight(StrutStyle* style,
+                                                  bool forceStrutHeight) {
+  style->setForceStrutHeight(forceStrutHeight);
+}
diff --git a/lib/web_ui/skwasm/text/text_style.cpp b/lib/web_ui/skwasm/text/text_style.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..c0a50451fb10e9dff3864c1fd90159cdcbb76413
--- /dev/null
+++ b/lib/web_ui/skwasm/text/text_style.cpp
@@ -0,0 +1,145 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "../export.h"
+#include "../wrappers.h"
+#include "third_party/skia/modules/skparagraph/include/Paragraph.h"
+
+using namespace skia::textlayout;
+using namespace Skwasm;
+
+SKWASM_EXPORT TextStyle* textStyle_create() {
+  auto style = new TextStyle();
+
+  // Default color in flutter is black.
+  style->setColor(SK_ColorBLACK);
+  return style;
+}
+
+SKWASM_EXPORT TextStyle* textStyle_copy(TextStyle* style) {
+  return new TextStyle(*style);
+}
+
+SKWASM_EXPORT void textStyle_dispose(TextStyle* style) {
+  delete style;
+}
+
+SKWASM_EXPORT void textStyle_setColor(TextStyle* style, SkColor color) {
+  style->setColor(color);
+}
+
+SKWASM_EXPORT void textStyle_setDecoration(TextStyle* style,
+                                           TextDecoration decoration) {
+  style->setDecoration(decoration);
+}
+
+SKWASM_EXPORT void textStyle_setDecorationColor(TextStyle* style,
+                                                SkColor color) {
+  style->setDecorationColor(color);
+}
+
+SKWASM_EXPORT void textStyle_setDecorationStyle(
+    TextStyle* style,
+    TextDecorationStyle decorationStyle) {
+  style->setDecorationStyle(decorationStyle);
+}
+
+SKWASM_EXPORT void textStyle_setDecorationThickness(TextStyle* style,
+                                                    SkScalar thickness) {
+  style->setDecorationThicknessMultiplier(thickness);
+}
+
+SKWASM_EXPORT void textStyle_setFontStyle(TextStyle* style,
+                                          int weight,
+                                          SkFontStyle::Slant slant) {
+  style->setFontStyle(SkFontStyle(weight, SkFontStyle::kNormal_Width, slant));
+}
+
+SKWASM_EXPORT void textStyle_setTextBaseline(TextStyle* style,
+                                             TextBaseline baseline) {
+  style->setTextBaseline(baseline);
+}
+
+SKWASM_EXPORT void textStyle_clearFontFamilies(TextStyle* style) {
+  style->setFontFamilies({});
+}
+
+SKWASM_EXPORT void textStyle_addFontFamilies(TextStyle* style,
+                                             SkString** fontFamilies,
+                                             int count) {
+  const std::vector<SkString>& currentFamilies = style->getFontFamilies();
+  std::vector<SkString> newFamilies;
+  newFamilies.reserve(currentFamilies.size() + count);
+  for (int i = 0; i < count; i++) {
+    newFamilies.push_back(*fontFamilies[i]);
+  }
+  for (const auto& family : currentFamilies) {
+    newFamilies.push_back(family);
+  }
+  style->setFontFamilies(std::move(newFamilies));
+}
+
+SKWASM_EXPORT void textStyle_setFontSize(TextStyle* style, SkScalar size) {
+  style->setFontSize(size);
+}
+
+SKWASM_EXPORT void textStyle_setLetterSpacing(TextStyle* style,
+                                              SkScalar letterSpacing) {
+  style->setLetterSpacing(letterSpacing);
+}
+
+SKWASM_EXPORT void textStyle_setWordSpacing(TextStyle* style,
+                                            SkScalar wordSpacing) {
+  style->setWordSpacing(wordSpacing);
+}
+
+SKWASM_EXPORT void textStyle_setHeight(TextStyle* style, SkScalar height) {
+  style->setHeight(height);
+  style->setHeightOverride(true);
+}
+
+SKWASM_EXPORT void textStyle_setHalfLeading(TextStyle* style,
+                                            bool halfLeading) {
+  style->setHalfLeading(halfLeading);
+}
+
+SKWASM_EXPORT void textStyle_setLocale(TextStyle* style, SkString* locale) {
+  style->setLocale(*locale);
+}
+
+SKWASM_EXPORT void textStyle_setBackground(TextStyle* style, SkPaint* paint) {
+  style->setBackgroundColor(*paint);
+}
+
+SKWASM_EXPORT void textStyle_setForeground(TextStyle* style, SkPaint* paint) {
+  style->setForegroundColor(*paint);
+}
+
+SKWASM_EXPORT void textStyle_addShadow(TextStyle* style,
+                                       SkColor color,
+                                       SkScalar offsetX,
+                                       SkScalar offsetY,
+                                       SkScalar blurSigma) {
+  style->addShadow(TextShadow(color, {offsetX, offsetY}, blurSigma));
+}
+
+SKWASM_EXPORT void textStyle_addFontFeature(TextStyle* style,
+                                            SkString* featureName,
+                                            int value) {
+  style->addFontFeature(*featureName, value);
+}
+
+SKWASM_EXPORT void textStyle_setFontVariations(TextStyle* style,
+                                               SkFourByteTag* axes,
+                                               float* values,
+                                               int count) {
+  std::vector<SkFontArguments::VariationPosition::Coordinate> coordinates;
+  for (int i = 0; i < count; i++) {
+    coordinates.push_back({axes[i], values[i]});
+  }
+  SkFontArguments::VariationPosition position = {
+      coordinates.data(), static_cast<int>(coordinates.size())};
+  style->setFontArguments(
+      SkFontArguments().setVariationDesignPosition(position));
+}
diff --git a/lib/web_ui/skwasm/vertices.cpp b/lib/web_ui/skwasm/vertices.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..caf187f1c7e67576e937de130256f81ac01173af
--- /dev/null
+++ b/lib/web_ui/skwasm/vertices.cpp
@@ -0,0 +1,23 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "export.h"
+
+#include "third_party/skia/include/core/SkVertices.h"
+
+SKWASM_EXPORT SkVertices* vertices_create(SkVertices::VertexMode vertexMode,
+                                          int vertexCount,
+                                          SkPoint* positions,
+                                          SkPoint* textureCoordinates,
+                                          SkColor* colors,
+                                          int indexCount,
+                                          uint16_t* indices) {
+  return SkVertices::MakeCopy(vertexMode, vertexCount, positions,
+                              textureCoordinates, colors, indexCount, indices)
+      .release();
+}
+
+SKWASM_EXPORT void vertices_dispose(SkVertices* vertices) {
+  vertices->unref();
+}
diff --git a/lib/web_ui/skwasm/wrappers.h b/lib/web_ui/skwasm/wrappers.h
new file mode 100644
index 0000000000000000000000000000000000000000..8fdee6584ea6268198a9090fd1c098b8bcfa12a2
--- /dev/null
+++ b/lib/web_ui/skwasm/wrappers.h
@@ -0,0 +1,39 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_LIB_WEB_UI_SKWASM_WRAPPERS_H_
+#define FLUTTER_LIB_WEB_UI_SKWASM_WRAPPERS_H_
+
+#include <emscripten/html5_webgl.h>
+#include "third_party/skia/include/core/SkCanvas.h"
+#include "third_party/skia/include/core/SkSurface.h"
+#include "third_party/skia/modules/skparagraph/include/FontCollection.h"
+#include "third_party/skia/modules/skparagraph/include/TypefaceFontProvider.h"
+
+namespace Skwasm {
+
+struct SurfaceWrapper {
+  EMSCRIPTEN_WEBGL_CONTEXT_HANDLE context;
+  sk_sp<GrDirectContext> grContext;
+  sk_sp<SkSurface> surface;
+};
+
+inline void makeCurrent(EMSCRIPTEN_WEBGL_CONTEXT_HANDLE handle) {
+  if (!handle)
+    return;
+
+  int result = emscripten_webgl_make_context_current(handle);
+  if (result != EMSCRIPTEN_RESULT_SUCCESS) {
+    printf("make_context failed: %d", result);
+  }
+}
+
+struct FlutterFontCollection {
+  sk_sp<skia::textlayout::FontCollection> collection;
+  sk_sp<skia::textlayout::TypefaceFontProvider> provider;
+};
+
+}  // namespace Skwasm
+
+#endif  // FLUTTER_LIB_WEB_UI_SKWASM_WRAPPERS_H_
diff --git a/lib/web_ui/test/README.md b/lib/web_ui/test/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..9c3ae657a14116ae94c2a9beaca9c1674283f5c8
--- /dev/null
+++ b/lib/web_ui/test/README.md
@@ -0,0 +1,50 @@
+...............................................................................
+# Flutter Web Engine Test Suites
+The flutter engine unit tests can be run with a number of different
+configuration options that affect both compile time and run time. The
+permutations of these options are specified in the `felt_config.yaml` file that
+is colocated with this README. Here is an overview of the way the test suite
+configurations are structured:
+
+## `compile-configs`
+Specifies how the tests should be compiled. Each compile config specifies the
+following:
+  * `name` - The name of the compile configuration.
+  * `compiler` - What compiler is used to compile the tests. Currently we support
+    `dart2js` and `dart2wasm` as values.
+  * `renderer` - Which renderer to use when compiling the tests. Currently we
+    support `html`, `canvaskit`, and `skwasm`.
+
+## `test-sets`
+A group of files that contain unit tests. Each test set specifies the following:
+  * `name` - The name of the test set.
+  * `directory` - The name of the directory under `flutter/lib/web_ui/test` that
+    contains all the test files.
+
+## `test-bundles`
+Specifies a group of tests and a compile configuration of those tests. The output
+of the test bundles appears in `flutter/lib/web_ui/build/test_bundles/<name>`
+where `<name>` is replaced by the name of the bundle. Each test bundle may be used
+by multiple test suites. Each test bundle specifies the following:
+  * `name` - The name of the test bundle.
+  * `test-set` - The name of the test set that contains the tests to be compiled.
+  * `compile-config` - The name of the compile configuration to use.
+
+## `run-configs`
+Specifies the test environment that should be provided to a unit test. Each run
+config specifies the following:
+  * `name` - Name of the run configuration.
+  * `browser` - The browser with which to run the tests. Valid values for this are
+    `chrome`, `firefox`, `safari` or `edge`.
+  * `canvaskit-variant` - An optionally supplied argument that forces the tests to
+    use a particular variant of CanvasKit, either `full` or `chromium`. If none
+    is specified, the engine will select the variant based on its normal selection
+    logic.
+
+## `test-suites`
+This is a fully specified run of a group of unit tests. They specify the following:
+  * `name` - Name of the test suite.
+  * `test-bundle` - Which compiled test bundle to use when running the suite.
+  * `run-config` - Which run configuration to use when runnin the tests.
+  * `artifact-deps` - Which gn/ninja build artifacts are needed to run the suite.
+    Valid values are `canvaskit`, `canvaskit_chromium` or `skwasm`.
\ No newline at end of file
diff --git a/lib/web_ui/test/canvas_test.dart b/lib/web_ui/test/canvas_test.dart
deleted file mode 100644
index 432f0741c5d2ec5c891e1a3c0915b72cccf49813..0000000000000000000000000000000000000000
--- a/lib/web_ui/test/canvas_test.dart
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'package:test/bootstrap/browser.dart';
-import 'package:test/test.dart';
-
-import 'package:ui/src/engine.dart';
-import 'package:ui/ui.dart' as ui;
-
-import 'mock_engine_canvas.dart';
-
-void main() {
-  internalBootstrapBrowserTest(() => testMain);
-}
-
-Future<void> testMain() async {
-  await initializeEngine();
-
-  group('EngineCanvas', () {
-    late MockEngineCanvas mockCanvas;
-    late ui.Paragraph paragraph;
-
-    void testCanvas(
-      String description,
-      void Function(EngineCanvas canvas) testFn, {
-      ui.Rect canvasSize = const ui.Rect.fromLTWH(0, 0, 100, 100),
-      ui.VoidCallback? whenDone,
-    }) {
-      test(description, () {
-        testFn(BitmapCanvas(canvasSize, RenderStrategy()));
-        testFn(DomCanvas(domDocument.createElement('flt-picture')));
-        testFn(mockCanvas = MockEngineCanvas());
-        whenDone?.call();
-      });
-    }
-
-    testCanvas('draws laid out paragraph', (EngineCanvas canvas) {
-      const ui.Rect screenRect = ui.Rect.fromLTWH(0, 0, 100, 100);
-      final RecordingCanvas recordingCanvas = RecordingCanvas(screenRect);
-      final ui.ParagraphBuilder builder =
-          ui.ParagraphBuilder(ui.ParagraphStyle());
-      builder.addText('sample');
-      paragraph = builder.build();
-      paragraph.layout(const ui.ParagraphConstraints(width: 100));
-      recordingCanvas.drawParagraph(paragraph, const ui.Offset(10, 10));
-      recordingCanvas.endRecording();
-      canvas.clear();
-      recordingCanvas.apply(canvas, screenRect);
-    }, whenDone: () {
-      expect(mockCanvas.methodCallLog, hasLength(3));
-
-      MockCanvasCall call = mockCanvas.methodCallLog[0];
-      expect(call.methodName, 'clear');
-
-      call = mockCanvas.methodCallLog[1];
-      expect(call.methodName, 'drawParagraph');
-      final Map<dynamic, dynamic> arguments = call.arguments as Map<dynamic, dynamic>;
-      expect(arguments['paragraph'], paragraph);
-      expect(arguments['offset'], const ui.Offset(10, 10));
-    });
-
-    testCanvas('ignores paragraphs that were not laid out',
-        (EngineCanvas canvas) {
-      const ui.Rect screenRect = ui.Rect.fromLTWH(0, 0, 100, 100);
-      final RecordingCanvas recordingCanvas = RecordingCanvas(screenRect);
-      final ui.ParagraphBuilder builder =
-          ui.ParagraphBuilder(ui.ParagraphStyle());
-      builder.addText('sample');
-      final ui.Paragraph paragraph = builder.build();
-      recordingCanvas.drawParagraph(paragraph, const ui.Offset(10, 10));
-      recordingCanvas.endRecording();
-      canvas.clear();
-      recordingCanvas.apply(canvas, screenRect);
-    }, whenDone: () {
-      expect(mockCanvas.methodCallLog, hasLength(2));
-      expect(mockCanvas.methodCallLog[0].methodName, 'clear');
-      expect(mockCanvas.methodCallLog[1].methodName, 'endOfPaint');
-    });
-  });
-}
diff --git a/lib/web_ui/test/canvaskit/backdrop_filter_golden_test.dart b/lib/web_ui/test/canvaskit/backdrop_filter_golden_test.dart
index 00ccd76fbffac44de281624fe006d3b4ba2cc9e9..d297e7b6ec7f06cca66ce1612a407ff5cf9c7f29 100644
--- a/lib/web_ui/test/canvaskit/backdrop_filter_golden_test.dart
+++ b/lib/web_ui/test/canvaskit/backdrop_filter_golden_test.dart
@@ -6,8 +6,7 @@ import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
-
-import 'package:web_engine_tester/golden_tester.dart';
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
 import 'common.dart';
 
@@ -19,8 +18,16 @@ const ui.Rect region = ui.Rect.fromLTRB(0, 0, 500, 500);
 
 void testMain() {
   group('BackdropFilter', () {
-    setUpCanvasKitTest();
-    window.debugOverrideDevicePixelRatio(1.0);
+    setUpCanvasKitTest(withImplicitView: true);
+
+    setUp(() {
+      EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(1);
+    });
+
+    tearDown(() {
+      PlatformViewManager.instance.debugClear();
+      CanvasKitRenderer.instance.debugClear();
+    });
 
     test('blur renders to the edges', () async {
       // Make a checkerboard picture so we can see the blur.
@@ -49,8 +56,8 @@ void testMain() {
       builder.pushOffset(0, 0);
       builder.addPicture(ui.Offset.zero, checkerboard);
       builder.pushBackdropFilter(ui.ImageFilter.blur(sigmaX: 10, sigmaY: 10));
-      CanvasKitRenderer.instance.rasterizer.draw(builder.build().layerTree);
-      await matchGoldenFile('canvaskit_backdropfilter_blur_edges.png',
+      await matchSceneGolden(
+          'canvaskit_backdropfilter_blur_edges.png', builder.build(),
           region: region);
     });
     test('ImageFilter with ColorFilter as child', () async {
@@ -62,9 +69,7 @@ void testMain() {
       final CkPictureRecorder recorder = CkPictureRecorder();
       final CkCanvas canvas = recorder.beginRecording(region);
       final ui.ColorFilter colorFilter = ui.ColorFilter.mode(
-        const ui.Color(0XFF00FF00).withOpacity(0.55),
-        ui.BlendMode.darken
-      );
+          const ui.Color(0XFF00FF00).withOpacity(0.55), ui.BlendMode.darken);
 
       // using a colorFilter as an imageFilter for backDrop filter
       builder.pushBackdropFilter(colorFilter);
@@ -75,7 +80,81 @@ void testMain() {
       );
       final CkPicture redCircle1 = recorder.endRecording();
       builder.addPicture(ui.Offset.zero, redCircle1);
-      await matchSceneGolden('canvaskit_red_circle_green_backdrop_colorFilter.png', builder.build(), region: region);
+      await matchSceneGolden(
+          'canvaskit_red_circle_green_backdrop_colorFilter.png',
+          builder.build(),
+          region: region);
+    });
+
+    test('works with an invisible platform view inside', () async {
+      ui_web.platformViewRegistry.registerViewFactory(
+        'test-platform-view',
+        (int viewId) => createDomHTMLDivElement()..id = 'view-0',
+        isVisible: false,
+      );
+      await createPlatformView(0, 'test-platform-view');
+
+      // Make a checkerboard picture so we can see the blur.
+      final CkPictureRecorder recorder = CkPictureRecorder();
+      final CkCanvas canvas = recorder.beginRecording(region);
+      canvas.drawColor(const ui.Color(0xffffffff), ui.BlendMode.srcOver);
+      final double sideLength = region.width / 20;
+      final int rows = (region.height / sideLength).ceil();
+
+      for (int row = 0; row < rows; row++) {
+        for (int column = 0; column < 10; column++) {
+          final ui.Rect rect = ui.Rect.fromLTWH(
+            row.isEven
+                ? (column * 2) * sideLength
+                : (column * 2 + 1) * sideLength,
+            row * sideLength,
+            sideLength,
+            sideLength,
+          );
+          canvas.drawRect(rect, CkPaint()..color = const ui.Color(0xffff0000));
+        }
+      }
+      final CkPicture checkerboard = recorder.endRecording();
+
+      final LayerSceneBuilder builder = LayerSceneBuilder();
+      builder.pushOffset(0, 0);
+      builder.addPicture(ui.Offset.zero, checkerboard);
+      builder.pushBackdropFilter(ui.ImageFilter.blur(sigmaX: 10, sigmaY: 10));
+
+      // Draw a green rectangle, then an invisible platform view, then a blue
+      // rectangle. Both rectangles should not be blurred.
+      final CkPictureRecorder greenRectRecorder = CkPictureRecorder();
+      final CkCanvas greenRectCanvas = greenRectRecorder.beginRecording(region);
+      final CkPaint greenPaint = CkPaint()..color = const ui.Color(0xff00ff00);
+      greenRectCanvas.drawRect(
+          ui.Rect.fromCenter(
+              center: ui.Offset(region.width / 3, region.height / 2),
+              width: region.width / 6,
+              height: region.height / 6),
+          greenPaint);
+      final CkPicture greenRectPicture = greenRectRecorder.endRecording();
+
+      final CkPictureRecorder blueRectRecorder = CkPictureRecorder();
+      final CkCanvas blueRectCanvas = blueRectRecorder.beginRecording(region);
+      final CkPaint bluePaint = CkPaint()..color = const ui.Color(0xff0000ff);
+      blueRectCanvas.drawRect(
+          ui.Rect.fromCenter(
+              center: ui.Offset(2 * region.width / 3, region.height / 2),
+              width: region.width / 6,
+              height: region.height / 6),
+          bluePaint);
+      final CkPicture blueRectPicture = blueRectRecorder.endRecording();
+
+      builder.addPicture(ui.Offset.zero, greenRectPicture);
+      builder.addPlatformView(0, width: 10, height: 10);
+      builder.addPicture(ui.Offset.zero, blueRectPicture);
+
+      // Pop the backdrop filter layer.
+      builder.pop();
+
+      await matchSceneGolden(
+          'canvaskit_backdropfilter_with_platformview.png', builder.build(),
+          region: region);
     });
     // TODO(hterkelsen): https://github.com/flutter/flutter/issues/71520
   }, skip: isSafari || isFirefox);
diff --git a/lib/web_ui/test/canvaskit/canvas_golden_test.dart b/lib/web_ui/test/canvaskit/canvas_golden_test.dart
index c24f353a7d8e3805f8bb70dddf69514cab414e03..70570582e915e3bc33bb517c727c980ef387d218 100644
--- a/lib/web_ui/test/canvaskit/canvas_golden_test.dart
+++ b/lib/web_ui/test/canvaskit/canvas_golden_test.dart
@@ -9,17 +9,10 @@ import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
-
-import 'package:web_engine_tester/golden_tester.dart';
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
 import 'common.dart';
 
-// TODO(yjbanov): tests that render using Noto are not hermetic, as those fonts
-//                come from fonts.google.com, where fonts can change any time.
-//                These tests are skipped.
-//                https://github.com/flutter/flutter/issues/86432
-const bool kIssue86432Exists = true;
-
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
@@ -28,24 +21,14 @@ const ui.Rect kDefaultRegion = ui.Rect.fromLTRB(0, 0, 500, 250);
 
 void testMain() {
   group('CkCanvas', () {
-    setUpCanvasKitTest();
+    setUpCanvasKitTest(withImplicitView: true);
 
     setUp(() {
-      expect(notoDownloadQueue.downloader.debugActiveDownloadCount, 0);
-      expect(notoDownloadQueue.isPending, isFalse);
-      FontFallbackData.debugReset();
-    });
-
-    tearDown(() {
-      expect(notoDownloadQueue.downloader.debugActiveDownloadCount, 0);
-      expect(notoDownloadQueue.isPending, isFalse);
+      renderer.fontCollection.debugResetFallbackFonts();
     });
 
     test('renders using non-recording canvas if weak refs are supported',
         () async {
-      expect(browserSupportsFinalizationRegistry, isTrue,
-          reason: 'This test specifically tests non-recording canvas, which '
-              'only works if FinalizationRegistry is available.');
       final CkPictureRecorder recorder = CkPictureRecorder();
       final CkCanvas canvas = recorder.beginRecording(kDefaultRegion);
       expect(canvas.runtimeType, CkCanvas);
@@ -55,522 +38,8 @@ void testMain() {
         recorder.endRecording(),
         region: kDefaultRegion,
       );
-    // Safari does not support weak refs (FinalizationRegistry).
-    // This test should be revisited when Safari ships weak refs.
-    // TODO(yjbanov): skip Firefox due to a crash: https://github.com/flutter/flutter/issues/86632
-    }, skip: isSafari || isFirefox);
-
-    test('renders using a recording canvas if weak refs are not supported',
-        () async {
-      browserSupportsFinalizationRegistry = false;
-      final CkPictureRecorder recorder = CkPictureRecorder();
-      final CkCanvas canvas = recorder.beginRecording(kDefaultRegion);
-      expect(canvas, isA<RecordingCkCanvas>());
-      drawTestPicture(canvas);
-
-      final CkPicture originalPicture = recorder.endRecording();
-      await matchPictureGolden('canvaskit_picture.png', originalPicture, region: kDefaultRegion);
-
-      final ByteData originalPixels =
-          (await (await originalPicture.toImage(50, 50)).toByteData())!;
-
-      // Test that a picture restored from a snapshot looks the same.
-      final CkPictureSnapshot? snapshot = canvas.pictureSnapshot;
-      expect(snapshot, isNotNull);
-      final SkPicture restoredSkPicture = snapshot!.toPicture();
-      expect(restoredSkPicture, isNotNull);
-      final CkPicture restoredPicture = CkPicture(
-          restoredSkPicture, const ui.Rect.fromLTRB(0, 0, 50, 50), snapshot);
-      final ByteData restoredPixels =
-        (await (await restoredPicture.toImage(50, 50)).toByteData())!;
-
-      await matchPictureGolden('canvaskit_picture.png', restoredPicture, region: kDefaultRegion);
-      expect(restoredPixels.buffer.asUint8List(),
-          originalPixels.buffer.asUint8List());
-    });
-
-    // Regression test for https://github.com/flutter/flutter/issues/51237
-    // Draws a grid of shadows at different offsets. Prior to directional
-    // light the shadows would shift depending on the offset. With directional
-    // light the cells in the grid must look identical.
-    test('uses directional shadows', () async {
-      const ui.Rect region = ui.Rect.fromLTRB(0, 0, 820, 420);
-      final CkPicture picture = paintPicture(region, (CkCanvas canvas) {
-        final CkPath shape = CkPath()
-          ..addRect(const ui.Rect.fromLTRB(0, 0, 40, 40));
-        final CkPaint shapePaint = CkPaint()
-          ..style = ui.PaintingStyle.stroke
-          ..strokeWidth = 1
-          ..color = const ui.Color(0xFF009900);
-        final CkPaint shadowBoundsPaint = CkPaint()
-          ..style = ui.PaintingStyle.stroke
-          ..strokeWidth = 1
-          ..color = const ui.Color(0xFF000099);
-        canvas.translate(20, 20);
-
-        for (int row = 0; row < 5; row += 1) {
-          canvas.save();
-          for (int col = 0; col < 10; col += 1) {
-            final double elevation = 2 * (col % 5).toDouble();
-            canvas.drawShadow(shape, const ui.Color(0xFFFF0000), elevation, true);
-            canvas.drawPath(shape, shapePaint);
-
-            final PhysicalShapeEngineLayer psl = PhysicalShapeEngineLayer(
-              elevation,
-              const ui.Color(0xFF000000),
-              const ui.Color(0xFF000000),
-              shape,
-              ui.Clip.antiAlias,
-            );
-            psl.preroll(
-              PrerollContext(
-                RasterCache(),
-                HtmlViewEmbedder.instance,
-              ),
-              Matrix4.identity(),
-            );
-            canvas.drawRect(psl.paintBounds, shadowBoundsPaint);
-
-            final CkParagraph p = makeSimpleText('$elevation');
-            p.layout(const ui.ParagraphConstraints(width: 1000));
-            canvas.drawParagraph(
-                p, ui.Offset(20 - p.maxIntrinsicWidth / 2, 20 - p.height / 2));
-            canvas.translate(80, 0);
-          }
-          canvas.restore();
-          canvas.translate(0, 80);
-        }
-      });
-      await matchPictureGolden('canvaskit_directional_shadows.png', picture,
-          region: region);
-    });
-
-    test('computes shadow bounds correctly with parent transforms', () async {
-      const double rectSize = 50;
-      const double halfSize = rectSize / 2;
-      const double padding = 110;
-      const ui.Rect region = ui.Rect.fromLTRB(
-        0,
-        0,
-        (rectSize + padding) * 3 + padding,
-        (rectSize + padding) * 2 + padding,
-      );
-      late List<PhysicalShapeEngineLayer> physicalShapeLayers;
-
-      LayerTree buildTestScene({required bool paintShadowBounds}) {
-        final Iterator<PhysicalShapeEngineLayer>? shadowBounds =
-            paintShadowBounds ? physicalShapeLayers.iterator : null;
-        physicalShapeLayers = <PhysicalShapeEngineLayer>[];
-
-        final LayerSceneBuilder builder = LayerSceneBuilder();
-        builder.pushOffset(padding + halfSize, padding + halfSize);
-
-        final CkPath shape = CkPath()
-          ..addRect(
-              const ui.Rect.fromLTRB(-halfSize, -halfSize, halfSize, halfSize));
-        final CkPaint shadowBoundsPaint = CkPaint()
-          ..style = ui.PaintingStyle.stroke
-          ..strokeWidth = 1
-          ..color = const ui.Color(0xFF000099);
-
-        for (int row = 0; row < 2; row += 1) {
-          for (int col = 0; col < 3; col += 1) {
-            builder.pushOffset(
-                col * (rectSize + padding), row * (rectSize + padding));
-            builder.pushTransform(Float64List.fromList(
-                Matrix4.rotationZ(row * math.pi / 4).storage));
-            final double scale = 1 / (1 + col);
-            builder.pushTransform(Float64List.fromList(
-                Matrix4.diagonal3Values(scale, scale, 1).storage));
-            physicalShapeLayers.add(builder.pushPhysicalShape(
-              path: shape,
-              elevation: 6,
-              color: const ui.Color(0xFF009900),
-              shadowColor: const ui.Color(0xFF000000),
-            ));
-            if (shadowBounds != null) {
-              shadowBounds.moveNext();
-              final ui.Rect bounds = shadowBounds.current.paintBounds;
-              builder.addPicture(
-                  ui.Offset.zero,
-                  paintPicture(region, (CkCanvas canvas) {
-                    canvas.drawRect(bounds, shadowBoundsPaint);
-                  }));
-            }
-            builder.pop();
-            builder.pop();
-            builder.pop();
-            builder.pop();
-          }
-        }
-        builder.pop();
-        return builder.build().layerTree;
-      }
-
-      // Render the scene once without painting the shadow bounds just to
-      // preroll the scene to compute the shadow bounds.
-      buildTestScene(paintShadowBounds: false).rootLayer.preroll(
-            PrerollContext(
-              RasterCache(),
-              HtmlViewEmbedder.instance,
-            ),
-            Matrix4.identity(),
-          );
-
-      // Render again, this time with the shadow bounds.
-      final LayerTree layerTree = buildTestScene(paintShadowBounds: true);
-
-      CanvasKitRenderer.instance.rasterizer.draw(layerTree);
-      await matchGoldenFile('canvaskit_shadow_bounds.png', region: region);
-    });
-
-    test('text styles - default', () async {
-      await testTextStyle('default');
-    });
-
-    test('text styles - center aligned', () async {
-      await testTextStyle('center aligned',
-          paragraphTextAlign: ui.TextAlign.center);
-    });
-
-    test('text styles - right aligned', () async {
-      await testTextStyle('right aligned',
-          paragraphTextAlign: ui.TextAlign.right);
-    });
-
-    test('text styles - rtl', () async {
-      await testTextStyle('rtl', paragraphTextDirection: ui.TextDirection.rtl);
-    });
-
-    test('text styles - multiline', () async {
-      await testTextStyle('multiline', layoutWidth: 50);
-    });
-
-    test('text styles - max lines', () async {
-      await testTextStyle('max lines', paragraphMaxLines: 1, layoutWidth: 50);
-    });
-
-    test('text styles - ellipsis', () async {
-      await testTextStyle('ellipsis',
-          paragraphMaxLines: 1, paragraphEllipsis: '...', layoutWidth: 60);
-    });
-
-    test('text styles - paragraph font family', () async {
-      await testTextStyle('paragraph font family', paragraphFontFamily: 'Ahem');
-    });
-
-    test('text styles - paragraph font size', () async {
-      await testTextStyle('paragraph font size', paragraphFontSize: 22);
-    });
-
-    test('text styles - paragraph height', () async {
-      await testTextStyle('paragraph height',
-          layoutWidth: 50, paragraphHeight: 1.5);
-    });
-
-    test('text styles - paragraph text height behavior', () async {
-      await testTextStyle('paragraph text height behavior',
-          layoutWidth: 50,
-          paragraphHeight: 1.5,
-          paragraphTextHeightBehavior: const ui.TextHeightBehavior(
-            applyHeightToFirstAscent: false,
-            applyHeightToLastDescent: false,
-          ));
-    });
-
-    test('text styles - paragraph weight', () async {
-      await testTextStyle('paragraph weight',
-          paragraphFontWeight: ui.FontWeight.w900);
-    });
-
-    test('text style - paragraph font style', () async {
-      await testTextStyle(
-        'paragraph font style',
-        paragraphFontStyle: ui.FontStyle.italic,
-      );
-    });
-
-    // TODO(yjbanov): locales specified in paragraph styles don't work:
-    //                https://github.com/flutter/flutter/issues/74687
-    // TODO(yjbanov): spaces are not rendered correctly:
-    //                https://github.com/flutter/flutter/issues/74742
-    test('text styles - paragraph locale zh_CN', () async {
-      await testTextStyle('paragraph locale zh_CN',
-          outerText: '次 化 刃 直 入 令',
-          innerText: '',
-          paragraphLocale: const ui.Locale('zh', 'CN'));
-    }, skip: kIssue86432Exists);
-
-    test('text styles - paragraph locale zh_TW', () async {
-      await testTextStyle('paragraph locale zh_TW',
-          outerText: '次 化 刃 直 入 令',
-          innerText: '',
-          paragraphLocale: const ui.Locale('zh', 'TW'));
-    }, skip: kIssue86432Exists);
-
-    test('text styles - paragraph locale ja', () async {
-      await testTextStyle('paragraph locale ja',
-          outerText: '次 化 刃 直 入 令',
-          innerText: '',
-          paragraphLocale: const ui.Locale('ja'));
-    }, skip: kIssue86432Exists);
-
-    test('text styles - paragraph locale ko', () async {
-      await testTextStyle('paragraph locale ko',
-          outerText: '次 化 刃 直 入 令',
-          innerText: '',
-          paragraphLocale: const ui.Locale('ko'));
-    }, skip: kIssue86432Exists);
-
-    test('text styles - color', () async {
-      await testTextStyle('color', color: const ui.Color(0xFF009900));
-    });
-
-    test('text styles - decoration', () async {
-      await testTextStyle('decoration',
-          decoration: ui.TextDecoration.underline);
-    });
-
-    test('text styles - decoration style', () async {
-      await testTextStyle('decoration style',
-          decoration: ui.TextDecoration.underline,
-          decorationStyle: ui.TextDecorationStyle.dashed);
-    });
-
-    test('text styles - decoration thickness', () async {
-      await testTextStyle('decoration thickness',
-          decoration: ui.TextDecoration.underline, decorationThickness: 5.0);
-    });
-
-    test('text styles - font weight', () async {
-      await testTextStyle('font weight', fontWeight: ui.FontWeight.w900);
-    });
-
-    test('text styles - font style', () async {
-      await testTextStyle('font style', fontStyle: ui.FontStyle.italic);
-    });
-
-    // TODO(yjbanov): not sure how to test this.
-    test('text styles - baseline', () async {
-      await testTextStyle('baseline',
-          textBaseline: ui.TextBaseline.ideographic);
-    });
-
-    test('text styles - font family', () async {
-      await testTextStyle('font family', fontFamily: 'Ahem');
-    });
-
-    test('text styles - non-existent font family', () async {
-      await testTextStyle('non-existent font family',
-          fontFamily: 'DoesNotExist');
-    });
-
-    test('text styles - family fallback', () async {
-      await testTextStyle('family fallback',
-          fontFamily: 'DoesNotExist', fontFamilyFallback: <String>['Ahem']);
-    });
-
-    test('text styles - font size', () async {
-      await testTextStyle('font size', fontSize: 24);
-    });
-
-    test('text styles - letter spacing', () async {
-      await testTextStyle('letter spacing', letterSpacing: 5);
-    });
-
-    test('text styles - word spacing', () async {
-      await testTextStyle('word spacing',
-          innerText: 'Beautiful World!', wordSpacing: 25);
-    });
-
-    test('text styles - height', () async {
-      await testTextStyle('height', height: 2);
-    });
-
-    test('text styles - leading distribution', () async {
-      await testTextStyle('half leading',
-          height: 20,
-          fontSize: 10,
-          leadingDistribution: ui.TextLeadingDistribution.even);
-      await testTextStyle(
-        'half leading inherited from paragraph',
-        height: 20,
-        fontSize: 10,
-        paragraphTextHeightBehavior: const ui.TextHeightBehavior(
-          leadingDistribution: ui.TextLeadingDistribution.even,
-        ),
-      );
-      await testTextStyle(
-        'text style half leading overrides paragraph style half leading',
-        height: 20,
-        fontSize: 10,
-        leadingDistribution: ui.TextLeadingDistribution.proportional,
-        paragraphTextHeightBehavior: const ui.TextHeightBehavior(
-          leadingDistribution: ui.TextLeadingDistribution.even,
-        ),
-      );
-    });
-
-    // TODO(yjbanov): locales specified in text styles don't work:
-    //                https://github.com/flutter/flutter/issues/74687
-    // TODO(yjbanov): spaces are not rendered correctly:
-    //                https://github.com/flutter/flutter/issues/74742
-    test('text styles - locale zh_CN', () async {
-      await testTextStyle('locale zh_CN',
-          innerText: '次 化 刃 直 入 令',
-          outerText: '',
-          locale: const ui.Locale('zh', 'CN'));
-    }, skip: kIssue86432Exists);
-
-    test('text styles - locale zh_TW', () async {
-      await testTextStyle('locale zh_TW',
-          innerText: '次 化 刃 直 入 令',
-          outerText: '',
-          locale: const ui.Locale('zh', 'TW'));
-    }, skip: kIssue86432Exists);
-
-    test('text styles - locale ja', () async {
-      await testTextStyle('locale ja',
-          innerText: '次 化 刃 直 入 令',
-          outerText: '',
-          locale: const ui.Locale('ja'));
-    }, skip: kIssue86432Exists);
-
-    test('text styles - locale ko', () async {
-      await testTextStyle('locale ko',
-          innerText: '次 化 刃 直 入 令',
-          outerText: '',
-          locale: const ui.Locale('ko'));
-    }, skip: kIssue86432Exists);
-
-    test('text styles - background', () async {
-      await testTextStyle('background',
-          background: CkPaint()..color = const ui.Color(0xFF00FF00));
-    });
-
-    test('text styles - foreground', () async {
-      await testTextStyle('foreground',
-          foreground: CkPaint()..color = const ui.Color(0xFF0000FF));
-    });
-
-    test('text styles - foreground and background', () async {
-      await testTextStyle(
-        'foreground and background',
-        foreground: CkPaint()..color = const ui.Color(0xFFFF5555),
-        background: CkPaint()..color = const ui.Color(0xFF007700),
-      );
-    });
-
-    test('text styles - background and color', () async {
-      await testTextStyle(
-        'background and color',
-        color: const ui.Color(0xFFFFFF00),
-        background: CkPaint()..color = const ui.Color(0xFF007700),
-      );
-    });
-
-    test('text styles - shadows', () async {
-      await testTextStyle('shadows', shadows: <ui.Shadow>[
-        const ui.Shadow(
-          color: ui.Color(0xFF999900),
-          offset: ui.Offset(10, 10),
-          blurRadius: 5,
-        ),
-        const ui.Shadow(
-          color: ui.Color(0xFF009999),
-          offset: ui.Offset(-10, -10),
-          blurRadius: 10,
-        ),
-      ]);
-    });
-
-    test('text styles - old style figures', () async {
-      await testTextStyle(
-        'old style figures',
-        paragraphFontFamily: 'Roboto',
-        paragraphFontSize: 24,
-        outerText: '0 1 2 3 4 5 ',
-        innerText: '0 1 2 3 4 5',
-        fontFeatures: <ui.FontFeature>[const ui.FontFeature.oldstyleFigures()],
-      );
-    });
-
-    test('text styles - stylistic set 1', () async {
-      await testTextStyle(
-        'stylistic set 1',
-        paragraphFontFamily: 'Roboto',
-        paragraphFontSize: 24,
-        outerText: 'g',
-        innerText: 'g',
-        fontFeatures: <ui.FontFeature>[ui.FontFeature.stylisticSet(1)],
-      );
-    });
-
-    test('text styles - stylistic set 2', () async {
-      await testTextStyle(
-        'stylistic set 2',
-        paragraphFontFamily: 'Roboto',
-        paragraphFontSize: 24,
-        outerText: 'α',
-        innerText: 'α',
-        fontFeatures: <ui.FontFeature>[ui.FontFeature.stylisticSet(2)],
-      );
-    });
-
-    test('text styles - override font family', () async {
-      await testTextStyle(
-        'override font family',
-        paragraphFontFamily: 'Ahem',
-        fontFamily: 'Roboto',
-      );
-    });
-
-    test('text styles - override font size', () async {
-      await testTextStyle(
-        'override font size',
-        paragraphFontSize: 36,
-        fontSize: 18,
-      );
-    });
-
-    test('text style - override font weight', () async {
-      await testTextStyle(
-        'override font weight',
-        paragraphFontWeight: ui.FontWeight.w900,
-        fontWeight: ui.FontWeight.normal,
-      );
-    });
-
-    test('text style - override font style', () async {
-      await testTextStyle(
-        'override font style',
-        paragraphFontStyle: ui.FontStyle.italic,
-        fontStyle: ui.FontStyle.normal,
-      );
     });
 
-    test('text style - characters from multiple fallback fonts', () async {
-      await testTextStyle(
-        'multi-font characters',
-        // This character is claimed by multiple fonts. This test makes sure
-        // we can find a font supporting it.
-        outerText: '欢',
-        innerText: '',
-      );
-    }, skip: kIssue86432Exists);
-
-    test('text style - symbols', () async {
-      // One of the CJK fonts loaded in one of the tests above also contains
-      // some of these symbols. To make sure the test produces predictable
-      // results we reset the fallback data forcing the engine to reload
-      // fallbacks, which for this test will only load Noto Symbols.
-      await testTextStyle(
-        'symbols',
-        outerText: '← ↑ → ↓ ',
-        innerText: '',
-      );
-    }, skip: kIssue86432Exists);
-
     test(
         'text style - foreground/background/color do not leak across paragraphs',
         () async {
@@ -663,131 +132,6 @@ void testMain() {
       );
     });
 
-    test('sample Chinese text', () async {
-      await testSampleText(
-        'chinese',
-        '也称乱数假文或者哑元文本， '
-            '是印刷及排版领域所常用的虚拟文字。'
-            '由于曾经一台匿名的打印机刻意打乱了'
-            '一盒印刷字体从而造出一本字体样品书',
-      );
-    });
-
-    test('sample Armenian text', () async {
-      await testSampleText(
-        'armenian',
-        'տպագրության և տպագրական արդյունաբերության համար նախատեսված մոդելային տեքստ է',
-      );
-    });
-
-    test('sample Albanian text', () async {
-      await testSampleText(
-        'albanian',
-        'është një tekst shabllon i industrisë së printimit dhe shtypshkronjave Lorem Ipsum ka qenë teksti shabllon',
-      );
-    });
-
-    test('sample Arabic text', () async {
-      await testSampleText(
-        'arabic',
-        'هناك حقيقة مثبتة منذ زمن طويل وهي أن المحتوى المقروء لصفحة ما سيلهي',
-        textDirection: ui.TextDirection.rtl,
-      );
-    });
-
-    test('sample Bulgarian text', () async {
-      await testSampleText(
-        'bulgarian',
-        'е елементарен примерен текст използван в печатарската и типографската индустрия',
-      );
-    });
-
-    test('sample Catalan text', () async {
-      await testSampleText(
-        'catalan',
-        'és un text de farciment usat per la indústria de la tipografia i la impremta',
-      );
-    });
-
-    test('sample English text', () async {
-      await testSampleText(
-        'english',
-        'Lorem Ipsum is simply dummy text of the printing and typesetting industry',
-      );
-    });
-
-    test('sample Greek text', () async {
-      await testSampleText(
-        'greek',
-        'είναι απλά ένα κείμενο χωρίς νόημα για τους επαγγελματίες της τυπογραφίας και στοιχειοθεσίας',
-      );
-    });
-
-    test('sample Hebrew text', () async {
-      await testSampleText(
-        'hebrew',
-        'זוהי עובדה מבוססת שדעתו של הקורא תהיה מוסחת על ידי טקטס קריא כאשר הוא יביט בפריסתו',
-        textDirection: ui.TextDirection.rtl,
-      );
-    });
-
-    test('sample Hindi text', () async {
-      await testSampleText(
-        'hindi',
-        'छपाई और अक्षर योजन उद्योग का एक साधारण डमी पाठ है सन १५०० के बाद से अभी तक इस उद्योग का मानक डमी पाठ मन गया जब एक अज्ञात मुद्रक ने नमूना लेकर एक नमूना किताब बनाई',
-      );
-    });
-
-    test('sample Thai text', () async {
-      await testSampleText(
-        'thai',
-        'คือ เนื้อหาจำลองแบบเรียบๆ ที่ใช้กันในธุรกิจงานพิมพ์หรืองานเรียงพิมพ์ มันได้กลายมาเป็นเนื้อหาจำลองมาตรฐานของธุรกิจดังกล่าวมาตั้งแต่ศตวรรษที่',
-      );
-    });
-
-    test('sample Georgian text', () async {
-      await testSampleText(
-        'georgian',
-        'საბეჭდი და ტიპოგრაფიული ინდუსტრიის უშინაარსო ტექსტია. იგი სტანდარტად',
-      );
-    });
-
-    test('sample Bengali text', () async {
-      await testSampleText(
-        'bengali',
-        'ঈদের জামাত মসজিদে, মানতে হবে স্বাস্থ্যবিধি: ধর্ম মন্ত্রণালয়',
-      );
-    });
-
-    test('hindi svayan test', () async {
-      await testSampleText('hindi_svayan', 'स्वयं');
-    });
-
-    // We've seen text break when we load many fonts simultaneously. This test
-    // combines text in multiple languages into one long paragraph to make sure
-    // we can handle it.
-    test('sample multilingual text', () async {
-      await testSampleText(
-        'multilingual',
-        '也称乱数假文或者哑元文本， 是印刷及排版领域所常用的虚拟文字。 '
-            'տպագրության և տպագրական արդյունաբերության համար '
-            'është një tekst shabllon i industrisë së printimit '
-            ' زمن طويل وهي أن المحتوى المقروء لصفحة ما سيلهي '
-            'е елементарен примерен текст използван в печатарската '
-            'és un text de farciment usat per la indústria de la '
-            'Lorem Ipsum is simply dummy text of the printing '
-            'είναι απλά ένα κείμενο χωρίς νόημα για τους επαγγελματίες '
-            ' זוהי עובדה מבוססת שדעתו של הקורא תהיה מוסחת על ידי טקטס קריא '
-            'छपाई और अक्षर योजन उद्योग का एक साधारण डमी पाठ है सन '
-            'คือ เนื้อหาจำลองแบบเรียบๆ ที่ใช้กันในธุรกิจงานพิมพ์หรืองานเรียงพิมพ์ '
-            'საბეჭდი და ტიპოგრაფიული ინდუსტრიის უშინაარსო ტექსტია ',
-      );
-    });
-
-    test('emoji text with skin tone', () async {
-      await testSampleText('emoji_with_skin_tone', '👋🏿 👋🏾 👋🏽 👋🏼 👋🏻');
-    });
-
     // Make sure we clear the canvas in between frames.
     test('empty frame after contentful frame', () async {
       // First draw a frame with a red rectangle
@@ -799,48 +143,73 @@ void testMain() {
       final LayerSceneBuilder builder = LayerSceneBuilder();
       builder.pushOffset(0, 0);
       builder.addPicture(ui.Offset.zero, picture);
-      final LayerTree layerTree = builder.build().layerTree;
-      CanvasKitRenderer.instance.rasterizer.draw(layerTree);
+      final LayerScene scene = builder.build();
+      await renderScene(scene);
 
       // Now draw an empty layer tree and confirm that the red rectangle is
       // no longer drawn.
       final LayerSceneBuilder emptySceneBuilder = LayerSceneBuilder();
       emptySceneBuilder.pushOffset(0, 0);
-      final LayerTree emptyLayerTree = emptySceneBuilder.build().layerTree;
-      CanvasKitRenderer.instance.rasterizer.draw(emptyLayerTree);
-
-      await matchGoldenFile('canvaskit_empty_scene.png',
+      final LayerScene emptyScene = emptySceneBuilder.build();
+      await matchSceneGolden('canvaskit_empty_scene.png', emptyScene,
           region: const ui.Rect.fromLTRB(0, 0, 100, 100));
     });
-    // TODO(hterkelsen): https://github.com/flutter/flutter/issues/71520
-  }, skip: isSafari || isFirefox);
-}
 
-Future<void> testSampleText(String language, String text,
-    {ui.TextDirection textDirection = ui.TextDirection.ltr}) async {
-  const double testWidth = 300;
-  double paragraphHeight = 0;
-  final CkPicture picture = await generatePictureWhenFontsStable(() {
-    final CkPictureRecorder recorder = CkPictureRecorder();
-    final CkCanvas canvas = recorder.beginRecording(ui.Rect.largest);
-    final CkParagraphBuilder paragraphBuilder =
-        CkParagraphBuilder(CkParagraphStyle(
-      textDirection: textDirection,
-    ));
-    paragraphBuilder.addText(text);
-    final CkParagraph paragraph = paragraphBuilder.build();
-    paragraph.layout(const ui.ParagraphConstraints(width: testWidth - 20));
-    canvas.drawParagraph(paragraph, const ui.Offset(10, 10));
-    paragraphHeight = paragraph.height;
-    return recorder.endRecording();
+    // Regression test for https://github.com/flutter/flutter/issues/121758
+    test(
+        'resources used in temporary surfaces for Image.toByteData can cross to rendering overlays',
+        () async {
+      ui_web.platformViewRegistry.registerViewFactory(
+        'test-platform-view',
+        (int viewId) => createDomHTMLDivElement()..id = 'view-0',
+      );
+      await createPlatformView(0, 'test-platform-view');
+
+      CkPicture makeTextPicture(String text, ui.Offset offset) {
+        final CkPictureRecorder recorder = CkPictureRecorder();
+        final CkCanvas canvas = recorder.beginRecording(ui.Rect.largest);
+        final CkParagraphBuilder builder = CkParagraphBuilder(CkParagraphStyle());
+        builder.addText(text);
+        final CkParagraph paragraph = builder.build();
+        paragraph.layout(const ui.ParagraphConstraints(width: 100));
+        canvas.drawRect(
+          ui.Rect.fromLTWH(offset.dx, offset.dy, paragraph.width, paragraph.height).inflate(10),
+          CkPaint()..color = const ui.Color(0xFF00FF00)
+        );
+        canvas.drawParagraph(paragraph, offset);
+        return recorder.endRecording();
+      }
+
+      CkPicture imageToPicture(CkImage image, ui.Offset offset) {
+        final CkPictureRecorder recorder = CkPictureRecorder();
+        final CkCanvas canvas = recorder.beginRecording(ui.Rect.largest);
+        canvas.drawImage(image, offset, CkPaint());
+        return recorder.endRecording();
+      }
+
+      final CkPicture helloPicture = makeTextPicture('Hello', ui.Offset.zero);
+
+      final CkImage helloImage = helloPicture.toImageSync(100, 100);
+
+      // Calling toByteData is essential to hit the bug.
+      await helloImage.toByteData(format: ui.ImageByteFormat.png);
+
+      final LayerSceneBuilder sb = LayerSceneBuilder();
+      sb.pushOffset(0, 0);
+      sb.addPicture(ui.Offset.zero, helloPicture);
+      sb.addPlatformView(0, width: 10, height: 10);
+
+      // The image is rendered after the platform view so that it's rendered into
+      // a separate surface, which is what triggers the bug. If the bug is present
+      // the image will not appear on the UI.
+      sb.addPicture(const ui.Offset(0, 50), imageToPicture(helloImage, ui.Offset.zero));
+      sb.pop();
+
+      // The below line should not throw an error.
+      await matchSceneGolden('cross_overlay_resources.png', sb.build(),
+          region: const ui.Rect.fromLTRB(0, 0, 100, 100));
+    });
   });
-  if (!kIssue86432Exists) {
-    await matchPictureGolden(
-      'canvaskit_sample_text_$language.png',
-      picture,
-      region: ui.Rect.fromLTRB(0, 0, testWidth, paragraphHeight + 20),
-    );
-  }
 }
 
 typedef ParagraphFactory = CkParagraph Function();
@@ -1161,187 +530,3 @@ CkImage generateTestImage() {
       4 * 20)!;
   return CkImage(skImage);
 }
-
-/// A convenience function for testing paragraph and text styles.
-///
-/// Renders a paragraph with two pieces of text, [outerText] and [innerText].
-/// [outerText] is added to the root of the paragraph where only paragraph
-/// style applies. [innerText] is added under a text style with properties
-/// set from the arguments to this method. Parameters with prefix "paragraph"
-/// are applied to the paragraph style. Others are applied to the text style.
-///
-/// [name] is the name of the test used as the description on the golden as
-/// well as in the golden file name. Avoid special characters. Spaces are OK;
-/// they are replaced by "_" in the file name.
-///
-/// Use [layoutWidth] to customize the width of the paragraph constraints.
-Future<void> testTextStyle(
-  // Test properties
-  String name, {
-  double? layoutWidth,
-  // Top-level text where only paragraph style applies
-  String outerText = 'Hello ',
-  // Second-level text where paragraph and text styles both apply.
-  String innerText = 'World!',
-
-  // ParagraphStyle properties
-  ui.TextAlign? paragraphTextAlign,
-  ui.TextDirection? paragraphTextDirection,
-  int? paragraphMaxLines,
-  String? paragraphFontFamily,
-  double? paragraphFontSize,
-  double? paragraphHeight,
-  ui.TextHeightBehavior? paragraphTextHeightBehavior,
-  ui.FontWeight? paragraphFontWeight,
-  ui.FontStyle? paragraphFontStyle,
-  ui.StrutStyle? paragraphStrutStyle,
-  String? paragraphEllipsis,
-  ui.Locale? paragraphLocale,
-
-  // TextStyle properties
-  ui.Color? color,
-  ui.TextDecoration? decoration,
-  ui.Color? decorationColor,
-  ui.TextDecorationStyle? decorationStyle,
-  double? decorationThickness,
-  ui.FontWeight? fontWeight,
-  ui.FontStyle? fontStyle,
-  ui.TextBaseline? textBaseline,
-  String? fontFamily,
-  List<String>? fontFamilyFallback,
-  double? fontSize,
-  double? letterSpacing,
-  double? wordSpacing,
-  double? height,
-  ui.TextLeadingDistribution? leadingDistribution,
-  ui.Locale? locale,
-  CkPaint? background,
-  CkPaint? foreground,
-  List<ui.Shadow>? shadows,
-  List<ui.FontFeature>? fontFeatures,
-}) async {
-  late ui.Rect region;
-  CkPicture renderPicture() {
-    const double testWidth = 512;
-    final CkPictureRecorder recorder = CkPictureRecorder();
-    final CkCanvas canvas = recorder.beginRecording(ui.Rect.largest);
-    canvas.translate(30, 10);
-    final CkParagraphBuilder descriptionBuilder =
-        CkParagraphBuilder(CkParagraphStyle());
-    descriptionBuilder.addText(name);
-    final CkParagraph descriptionParagraph = descriptionBuilder.build();
-    descriptionParagraph
-        .layout(const ui.ParagraphConstraints(width: testWidth / 2 - 70));
-    const ui.Offset descriptionOffset = ui.Offset(testWidth / 2 + 30, 0);
-    canvas.drawParagraph(descriptionParagraph, descriptionOffset);
-
-    final CkParagraphBuilder pb = CkParagraphBuilder(CkParagraphStyle(
-      textAlign: paragraphTextAlign,
-      textDirection: paragraphTextDirection,
-      maxLines: paragraphMaxLines,
-      fontFamily: paragraphFontFamily,
-      fontSize: paragraphFontSize,
-      height: paragraphHeight,
-      textHeightBehavior: paragraphTextHeightBehavior,
-      fontWeight: paragraphFontWeight,
-      fontStyle: paragraphFontStyle,
-      strutStyle: paragraphStrutStyle,
-      ellipsis: paragraphEllipsis,
-      locale: paragraphLocale,
-    ));
-
-    pb.addText(outerText);
-
-    pb.pushStyle(CkTextStyle(
-      color: color,
-      decoration: decoration,
-      decorationColor: decorationColor,
-      decorationStyle: decorationStyle,
-      decorationThickness: decorationThickness,
-      fontWeight: fontWeight,
-      fontStyle: fontStyle,
-      textBaseline: textBaseline,
-      fontFamily: fontFamily,
-      fontFamilyFallback: fontFamilyFallback,
-      fontSize: fontSize,
-      letterSpacing: letterSpacing,
-      wordSpacing: wordSpacing,
-      height: height,
-      leadingDistribution: leadingDistribution,
-      locale: locale,
-      background: background,
-      foreground: foreground,
-      shadows: shadows,
-      fontFeatures: fontFeatures,
-    ));
-    pb.addText(innerText);
-    pb.pop();
-    final CkParagraph p = pb.build();
-    p.layout(ui.ParagraphConstraints(width: layoutWidth ?? testWidth / 2));
-    canvas.drawParagraph(p, ui.Offset.zero);
-
-    canvas.drawPath(
-      CkPath()
-        ..moveTo(-10, 0)
-        ..lineTo(-20, 0)
-        ..lineTo(-20, p.height)
-        ..lineTo(-10, p.height),
-      CkPaint()
-        ..style = ui.PaintingStyle.stroke
-        ..strokeWidth = 1.0,
-    );
-    canvas.drawPath(
-      CkPath()
-        ..moveTo(testWidth / 2 + 10, 0)
-        ..lineTo(testWidth / 2 + 20, 0)
-        ..lineTo(testWidth / 2 + 20, p.height)
-        ..lineTo(testWidth / 2 + 10, p.height),
-      CkPaint()
-        ..style = ui.PaintingStyle.stroke
-        ..strokeWidth = 1.0,
-    );
-    const double padding = 20;
-    region = ui.Rect.fromLTRB(
-      0,
-      0,
-      testWidth,
-      math.max(
-        descriptionOffset.dy + descriptionParagraph.height + padding,
-        p.height + padding,
-      ),
-    );
-    return recorder.endRecording();
-  }
-
-  // Render once to trigger font downloads.
-  final CkPicture picture = await generatePictureWhenFontsStable(renderPicture);
-  await matchPictureGolden(
-    'canvaskit_text_styles_${name.replaceAll(' ', '_')}.png',
-    picture,
-    region: region,
-  );
-  expect(notoDownloadQueue.debugIsLoadingFonts, isFalse);
-  expect(notoDownloadQueue.pendingFonts, isEmpty);
-  expect(notoDownloadQueue.downloader.debugActiveDownloadCount, 0);
-}
-
-typedef PictureGenerator = CkPicture Function();
-
-Future<CkPicture> generatePictureWhenFontsStable(
-    PictureGenerator generator) async {
-  CkPicture picture = generator();
-  // Fallback fonts start downloading as a post-frame callback.
-  CanvasKitRenderer.instance.rasterizer.debugRunPostFrameCallbacks();
-  // Font downloading begins asynchronously so we inject a timer before checking the download queue.
-  await Future<void>.delayed(Duration.zero);
-  while (notoDownloadQueue.isPending ||
-      notoDownloadQueue.downloader.debugActiveDownloadCount > 0) {
-    await notoDownloadQueue.debugWhenIdle();
-    await notoDownloadQueue.downloader.debugWhenIdle();
-    picture = generator();
-    CanvasKitRenderer.instance.rasterizer.debugRunPostFrameCallbacks();
-    // Dummy timer for the same reason as above.
-    await Future<void>.delayed(Duration.zero);
-  }
-  return picture;
-}
diff --git a/lib/web_ui/test/canvaskit/canvaskit_api_test.dart b/lib/web_ui/test/canvaskit/canvaskit_api_test.dart
index 2aacd2ea9304fed5f4aef38764cfbdc3e061eee8..69d9f6bf85967b40b7aa10676a5a2f1ce3d0ec6a 100644
--- a/lib/web_ui/test/canvaskit/canvaskit_api_test.dart
+++ b/lib/web_ui/test/canvaskit/canvaskit_api_test.dart
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:js_interop';
 import 'dart:math';
 import 'dart:typed_data';
 
@@ -12,7 +13,7 @@ import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
 import 'package:web_engine_tester/golden_tester.dart';
 
-import '../matchers.dart';
+import '../common/matchers.dart';
 import 'common.dart';
 import 'test_data.dart';
 
@@ -50,6 +51,7 @@ void testMain() {
     _matrix4x4CompositionTests();
     _toSkRectTests();
     _skVerticesTests();
+    _pictureTests();
     group('SkParagraph', () {
       _paragraphTests();
     });
@@ -347,6 +349,44 @@ void _shaderTests() {
         ),
         isNotNull);
   });
+
+  test('RuntimeEffect', () {
+    const String kSkSlProgram = r'''
+half4 main(vec2 fragCoord) {
+  return vec4(1.0, 0.0, 0.0, 1.0);
+}
+  ''';
+
+    final SkRuntimeEffect? effect = MakeRuntimeEffect(kSkSlProgram);
+    expect(effect, isNotNull);
+
+    const String kInvalidSkSlProgram = '';
+
+    // Invalid SkSL returns null.
+    final SkRuntimeEffect? invalidEffect = MakeRuntimeEffect(kInvalidSkSlProgram);
+    expect(invalidEffect, isNull);
+
+    final SkShader? shader = effect!.makeShader(<double>[]);
+    expect(shader, isNotNull);
+
+    // mismatched uniforms returns null.
+    final SkShader? invalidShader = effect.makeShader(<double>[1]);
+
+    expect(invalidShader, isNull);
+
+    const String kSkSlProgramWithUniforms = r'''
+uniform vec4 u_color;
+
+half4 main(vec2 fragCoord) {
+return u_color;
+}
+''';
+
+    final SkShader? shaderWithUniform = MakeRuntimeEffect(kSkSlProgramWithUniforms)
+      !.makeShader(<double>[1.0, 0.0, 0.0, 1.0]);
+
+    expect(shaderWithUniform, isNotNull);
+  });
 }
 
 SkShader _makeTestShader() {
@@ -492,11 +532,40 @@ void _imageFilterTests() {
 }
 
 void _mallocTests() {
-  test('SkFloat32List', () {
+  test('$SkFloat32List', () {
+    final List<SkFloat32List> lists = <SkFloat32List>[];
+
     for (int size = 0; size < 1000; size++) {
       final SkFloat32List skList = mallocFloat32List(4);
       expect(skList, isNotNull);
-      expect(skList.toTypedArray().length, 4);
+      expect(skList.toTypedArray(), hasLength(4));
+      lists.add(skList);
+    }
+
+    for (final SkFloat32List skList in lists) {
+      // toTypedArray() still works.
+      expect(() => skList.toTypedArray(), returnsNormally);
+      free(skList);
+      // toTypedArray() throws after free.
+      expect(() => skList.toTypedArray(), throwsA(isA<Error>()));
+    }
+  });
+  test('$SkUint32List', () {
+    final List<SkUint32List> lists = <SkUint32List>[];
+
+    for (int size = 0; size < 1000; size++) {
+      final SkUint32List skList = mallocUint32List(4);
+      expect(skList, isNotNull);
+      expect(skList.toTypedArray(), hasLength(4));
+      lists.add(skList);
+    }
+
+    for (final SkUint32List skList in lists) {
+      // toTypedArray() still works.
+      expect(() => skList.toTypedArray(), returnsNormally);
+      free(skList);
+      // toTypedArray() throws after free.
+      expect(() => skList.toTypedArray(), throwsA(isA<Error>()));
     }
   });
 }
@@ -686,8 +755,8 @@ void _matrix4x4CompositionTests() {
       paint(canvas, (ui.Canvas canvas) {
         final Matrix4 matrix = Matrix4.identity();
         matrix.setEntry(3, 2, 0.001);
-        matrix.rotate(Vector3(1, 0, 0), rotateAroundX);
-        matrix.rotate(Vector3(0, 1, 0), rotateAroundY);
+        matrix.rotate(kUnitX, rotateAroundX);
+        matrix.rotate(kUnitY, rotateAroundY);
         canvas.transform(matrix.toFloat64());
       });
     }, width, height);
@@ -771,7 +840,7 @@ void _pathTests() {
       ui.Offset(10, 10),
     ]);
     path.addPoly(encodedPoints.toTypedArray(), true);
-    freeFloat32List(encodedPoints);
+    free(encodedPoints);
   });
 
   test('addRRect', () {
@@ -981,6 +1050,26 @@ void _skVerticesTests() {
   });
 }
 
+void _pictureTests() {
+  late SkPicture picture;
+
+  setUp(() {
+    final SkPictureRecorder recorder = SkPictureRecorder();
+    final SkCanvas canvas = recorder.beginRecording(toSkRect(ui.Rect.largest));
+    canvas.drawRect(toSkRect(const ui.Rect.fromLTRB(20, 30, 40, 50)),
+        SkPaint()..setColorInt(0xffff00ff));
+    picture = recorder.finishRecordingAsPicture();
+  });
+  test('cullRect', () {
+    expect(
+        fromSkRect(picture.cullRect()), const ui.Rect.fromLTRB(20, 30, 40, 50));
+  });
+
+  test('approximateBytesUsed', () {
+    expect(picture.approximateBytesUsed() > 0, isTrue);
+  });
+}
+
 void _canvasTests() {
   late SkPictureRecorder recorder;
   late SkCanvas canvas;
@@ -1244,7 +1333,7 @@ void _canvasTests() {
         devicePixelRatio * kLightRadius,
         tonalColors.ambient,
         tonalColors.spot,
-        flags,
+        flags.toDouble(),
       );
     }
   });
@@ -1364,16 +1453,11 @@ void _canvasTests() {
     builder.addText('Hello');
     final CkParagraph paragraph = builder.build();
 
-    paragraph.delete();
     paragraph.dispose();
     expect(paragraph.debugDisposed, true);
   });
 
   test('toImage.toByteData', () async {
-    // Pretend that FinalizationRegistry is supported, so we can run this
-    // test in older browsers (the test will use a TestCollector instead of
-    // ProductionCollector)
-    browserSupportsFinalizationRegistry = true;
     final SkPictureRecorder otherRecorder = SkPictureRecorder();
     final SkCanvas otherCanvas = otherRecorder
         .beginRecording(Float32List.fromList(<double>[0, 0, 1, 1]));
@@ -1382,7 +1466,7 @@ void _canvasTests() {
       SkPaint()..setColorInt(0xAAFFFFFF),
     );
     final CkPicture picture =
-        CkPicture(otherRecorder.finishRecordingAsPicture(), null, null);
+        CkPicture(otherRecorder.finishRecordingAsPicture());
     final CkImage image = await picture.toImage(1, 1) as CkImage;
     final ByteData rawData =
         await image.toByteData();
@@ -1464,11 +1548,6 @@ void _textStyleTests() {
 }
 
 void _paragraphTests() {
-  setUpAll(() async {
-    await CanvasKitRenderer.instance.fontCollection.debugDownloadTestFonts();
-    CanvasKitRenderer.instance.fontCollection.registerDownloadedFonts();
-  });
-
   // This test is just a kitchen sink that blasts CanvasKit with all paragraph
   // properties all at once, making sure CanvasKit doesn't choke on anything.
   // In particular, this tests that our JS bindings are correct, such as that
@@ -1517,15 +1596,15 @@ void _paragraphTests() {
         ..weight = canvasKit.FontWeight.Bold)
       ..fontSize = 72
       ..heightMultiplier = 1.5
-      ..halfLeading = true
+      ..halfLeading = false
       ..leading = 0
       ..strutEnabled = true
       ..forceStrutHeight = false;
 
     final SkParagraphStyle paragraphStyle = canvasKit.ParagraphStyle(props);
-    final SkParagraphBuilder builder = canvasKit.ParagraphBuilder.MakeFromFontProvider(
+    final SkParagraphBuilder builder = canvasKit.ParagraphBuilder.MakeFromFontCollection(
       paragraphStyle,
-      CanvasKitRenderer.instance.fontCollection.fontProvider,
+      CanvasKitRenderer.instance.fontCollection.skFontCollection,
     );
 
     builder.addText('Hello');
@@ -1557,6 +1636,9 @@ void _paragraphTests() {
     builder.pushStyle(
         canvasKit.TextStyle(SkTextStyleProperties()..halfLeading = true));
     builder.pop();
+    if (canvasKit.ParagraphBuilder.RequiresClientICU()) {
+      injectClientICU(builder);
+    }
     final SkParagraph paragraph = builder.build();
     paragraph.layout(500);
 
@@ -1599,15 +1681,21 @@ void _paragraphTests() {
     expectAlmost(paragraph.getMaxIntrinsicWidth(), 263);
     expectAlmost(paragraph.getMinIntrinsicWidth(), 135);
     expectAlmost(paragraph.getMaxWidth(), 500);
+    final SkRectWithDirection rectWithDirection =
+      paragraph.getRectsForRange(
+        1,
+        3,
+        canvasKit.RectHeightStyle.Tight,
+        canvasKit.RectWidthStyle.Max).single;
     expect(
-      paragraph.getRectsForRange(1, 3, canvasKit.RectHeightStyle.Tight, canvasKit.RectWidthStyle.Max).single,
+      rectWithDirection.rect,
       hasLength(4),
     );
     expect(paragraph.getRectsForPlaceholders(), hasLength(1));
     expect(paragraph.getLineMetrics(), hasLength(1));
 
     final SkLineMetrics lineMetrics =
-        paragraph.getLineMetrics().cast<SkLineMetrics>().single;
+        paragraph.getLineMetrics().single;
     expectAlmost(lineMetrics.ascent, 55.6);
     expectAlmost(lineMetrics.descent, 14.8);
     expect(lineMetrics.isHardBreak, isTrue);
@@ -1624,16 +1712,16 @@ void _paragraphTests() {
 
     // "Hello"
     for (int i = 0; i < 5; i++) {
-      expect(paragraph.getWordBoundary(i).start, 0);
-      expect(paragraph.getWordBoundary(i).end, 5);
+      expect(paragraph.getWordBoundary(i.toDouble()).start, 0);
+      expect(paragraph.getWordBoundary(i.toDouble()).end, 5);
     }
     // Placeholder
     expect(paragraph.getWordBoundary(5).start, 5);
     expect(paragraph.getWordBoundary(5).end, 6);
     // "World"
     for (int i = 6; i < 11; i++) {
-      expect(paragraph.getWordBoundary(i).start, 6);
-      expect(paragraph.getWordBoundary(i).end, 11);
+      expect(paragraph.getWordBoundary(i.toDouble()).start, 6);
+      expect(paragraph.getWordBoundary(i.toDouble()).end, 11);
     }
     // "!"
     expect(paragraph.getWordBoundary(11).start, 11);
@@ -1660,26 +1748,28 @@ void _paragraphTests() {
       ..fontStyle = (SkFontStyle()..weight = canvasKit.FontWeight.Normal);
     final SkParagraphStyle paragraphStyle = canvasKit.ParagraphStyle(props);
     final SkParagraphBuilder builder =
-        canvasKit.ParagraphBuilder.MakeFromFontProvider(
+        canvasKit.ParagraphBuilder.MakeFromFontCollection(
       paragraphStyle,
-      CanvasKitRenderer.instance.fontCollection.fontProvider,
+      CanvasKitRenderer.instance.fontCollection.skFontCollection,
     );
     builder.addText('hello');
 
+    if (canvasKit.ParagraphBuilder.RequiresClientICU()) {
+      injectClientICU(builder);
+    }
+
     final SkParagraph paragraph = builder.build();
     paragraph.layout(500);
 
-    expect(
-      paragraph.getRectsForRange(
-        0,
-        1,
-        canvasKit.RectHeightStyle.Strut,
-        canvasKit.RectWidthStyle.Tight,
-      ),
-      <List<double>>[
-        <double>[0, 0, 13.770000457763672, 75],
-      ],
+    final List<SkRectWithDirection> rects = paragraph.getRectsForRange(
+      0,
+      1,
+      canvasKit.RectHeightStyle.Strut,
+      canvasKit.RectWidthStyle.Tight,
     );
+    expect(rects.length, 1);
+    final SkRectWithDirection rect = rects.first;
+    expect(rect.rect, <double>[0, 0, 13.770000457763672, 75]);
   });
 
   test('TextHeightBehavior', () {
@@ -1708,45 +1798,150 @@ void _paragraphTests() {
     );
   });
 
-  test('RuntimeEffect', () {
-    // Is supported..
-    expect(isRuntimeEffectAvailable, isTrue);
+  test('MakeOnScreenGLSurface test', () {
+    final DomCanvasElement canvas = createDomCanvasElement(
+      width: 100,
+      height: 100,
+    );
+    final WebGLContext gl = canvas.getGlContext(webGLVersion);
+    final int sampleCount = gl.getParameter(gl.samples);
+    final int stencilBits = gl.getParameter(gl.stencilBits);
+
+    final double glContext = canvasKit.GetWebGLContext(
+      canvas,
+      SkWebGLContextOptions(
+        antialias: 0,
+        majorVersion: webGLVersion.toDouble(),
+      ),
+    );
+    final SkGrContext grContext =  canvasKit.MakeGrContext(glContext);
+    final SkSurface? skSurface = canvasKit.MakeOnScreenGLSurface(
+      grContext,
+      100,
+      100,
+      SkColorSpaceSRGB,
+      sampleCount,
+      stencilBits
+    );
 
-    const String kSkSlProgram = r'''
-half4 main(vec2 fragCoord) {
-  return vec4(1.0, 0.0, 0.0, 1.0);
-}
-''';
+    expect(skSurface, isNotNull);
+  }, skip: isFirefox); // Intended: Headless firefox has no webgl support https://github.com/flutter/flutter/issues/109265
 
-    final SkRuntimeEffect? effect = MakeRuntimeEffect(kSkSlProgram);
-    expect(effect, isNotNull);
+  test('MakeRenderTarget test', () {
+    final DomCanvasElement canvas = createDomCanvasElement(
+      width: 100,
+      height: 100,
+    );
 
-    const String kInvalidSkSlProgram = '';
+    final int glContext = canvasKit.GetWebGLContext(
+      canvas,
+      SkWebGLContextOptions(
+        antialias: 0,
+        majorVersion: webGLVersion.toDouble(),
+      ),
+    ).toInt();
+    final SkGrContext grContext =  canvasKit.MakeGrContext(glContext.toDouble());
+    final SkSurface? surface = canvasKit.MakeRenderTarget(grContext, 1, 1);
 
-    // Invalid SkSL returns null.
-    final SkRuntimeEffect? invalidEffect = MakeRuntimeEffect(kInvalidSkSlProgram);
-    expect(invalidEffect, isNull);
+    expect(surface, isNotNull);
+  }, skip: isFirefox); // Intended: Headless firefox has no webgl support https://github.com/flutter/flutter/issues/109265
 
-    final SkShader? shader = effect!.makeShader(<double>[]);
-    expect(shader, isNotNull);
+  group('getCanvasKitJsFileNames', () {
+    JSAny? oldV8BreakIterator = v8BreakIterator;
+    JSAny? oldIntlSegmenter = intlSegmenter;
 
-    // mismatched uniforms returns null.
-    final SkShader? invalidShader = effect.makeShader(<double>[1]);
+    setUp(() {
+      oldV8BreakIterator = v8BreakIterator;
+      oldIntlSegmenter = intlSegmenter;
+    });
+    tearDown(() {
+      v8BreakIterator = oldV8BreakIterator;
+      intlSegmenter = oldIntlSegmenter;
+      debugResetBrowserSupportsImageDecoder();
+    });
 
-    expect(invalidShader, isNull);
+    test('in Chromium-based browsers', () {
+      v8BreakIterator = Object().toJSBox; // Any non-null value.
+      intlSegmenter = Object().toJSBox; // Any non-null value.
+      browserSupportsImageDecoder = true;
+
+      expect(getCanvasKitJsFileNames(CanvasKitVariant.full), <String>['canvaskit.js']);
+      expect(getCanvasKitJsFileNames(CanvasKitVariant.chromium), <String>['chromium/canvaskit.js']);
+      expect(getCanvasKitJsFileNames(CanvasKitVariant.auto), <String>[
+        'chromium/canvaskit.js',
+        'canvaskit.js',
+      ]);
+    });
 
-    const String kSkSlProgramWithUniforms = r'''
-uniform vec4 u_color;
+    test('in older versions of Chromium-based browsers', () {
+      v8BreakIterator = Object().toJSBox; // Any non-null value.
+      intlSegmenter = null; // Older versions of Chromium didn't have the Intl.Segmenter API.
+      browserSupportsImageDecoder = true;
 
-half4 main(vec2 fragCoord) {
-  return u_color;
-}
-''';
+      expect(getCanvasKitJsFileNames(CanvasKitVariant.full), <String>['canvaskit.js']);
+      expect(getCanvasKitJsFileNames(CanvasKitVariant.chromium), <String>['chromium/canvaskit.js']);
+      expect(getCanvasKitJsFileNames(CanvasKitVariant.auto), <String>['canvaskit.js']);
+    });
 
-    final SkShader? shaderWithUniform = MakeRuntimeEffect(kSkSlProgramWithUniforms)
-      !.makeShader(<double>[1.0, 0.0, 0.0, 1.0]);
+    test('in other browsers', () {
+      intlSegmenter = Object().toJSBox; // Any non-null value.
+
+      v8BreakIterator = null;
+      browserSupportsImageDecoder = true;
+      expect(getCanvasKitJsFileNames(CanvasKitVariant.full), <String>['canvaskit.js']);
+      expect(getCanvasKitJsFileNames(CanvasKitVariant.chromium), <String>['chromium/canvaskit.js']);
+      expect(getCanvasKitJsFileNames(CanvasKitVariant.auto), <String>['canvaskit.js']);
+
+      v8BreakIterator = Object().toJSBox;
+      browserSupportsImageDecoder = false;
+      // TODO(mdebbar): we don't check image codecs for now.
+      // https://github.com/flutter/flutter/issues/122331
+      expect(getCanvasKitJsFileNames(CanvasKitVariant.full), <String>['canvaskit.js']);
+      expect(getCanvasKitJsFileNames(CanvasKitVariant.chromium), <String>['chromium/canvaskit.js']);
+      expect(getCanvasKitJsFileNames(CanvasKitVariant.auto), <String>['chromium/canvaskit.js', 'canvaskit.js']);
+
+      v8BreakIterator = null;
+      browserSupportsImageDecoder = false;
+      expect(getCanvasKitJsFileNames(CanvasKitVariant.full), <String>['canvaskit.js']);
+      expect(getCanvasKitJsFileNames(CanvasKitVariant.chromium), <String>['chromium/canvaskit.js']);
+      expect(getCanvasKitJsFileNames(CanvasKitVariant.auto), <String>['canvaskit.js']);
+    });
+  });
 
-    expect(shaderWithUniform, isNotNull);
-  // TODO(hterkelsen): https://github.com/flutter/flutter/issues/115327
-  }, skip: true);
+  test('respects actual location of canvaskit files', () {
+    expect(
+      canvasKitWasmModuleUrl('canvaskit.wasm', 'https://example.com/'),
+      'https://example.com/canvaskit.wasm',
+    );
+    expect(
+      canvasKitWasmModuleUrl('canvaskit.wasm', 'http://localhost:1234/'),
+      'http://localhost:1234/canvaskit.wasm',
+    );
+    expect(
+      canvasKitWasmModuleUrl('canvaskit.wasm', 'http://localhost:1234/foo/'),
+      'http://localhost:1234/foo/canvaskit.wasm',
+    );
+  });
+
+  test('SkObjectFinalizationRegistry', () {
+    // There's no reliable way to test the actual functionality of
+    // FinalizationRegistry because it depends on GC, which cannot be controlled,
+    // So the test simply tests that a FinalizationRegistry can be constructed
+    // and its `register` method can be called.
+    final DomFinalizationRegistry registry = DomFinalizationRegistry((String arg) {}.toJS);
+    registry.register(Object().toJSWrapper, Object().toJSWrapper);
+  });
 }
+
+
+@JS('window.Intl.v8BreakIterator')
+external JSAny? get v8BreakIterator;
+
+@JS('window.Intl.v8BreakIterator')
+external set v8BreakIterator(JSAny? x);
+
+@JS('window.Intl.Segmenter')
+external JSAny? get intlSegmenter;
+
+@JS('window.Intl.Segmenter')
+external set intlSegmenter(JSAny? x);
diff --git a/lib/web_ui/test/canvaskit/canvaskit_api_tt_on_test.dart b/lib/web_ui/test/canvaskit/canvaskit_api_tt_on_test.dart
index 05dee0bfa696297d92a3c4cd9ff5b8b8e4b5c5d6..d0a2a54bd7408054ba117dace2525edd5d531f4d 100644
--- a/lib/web_ui/test/canvaskit/canvaskit_api_tt_on_test.dart
+++ b/lib/web_ui/test/canvaskit/canvaskit_api_tt_on_test.dart
@@ -6,7 +6,7 @@ import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 
-import '../matchers.dart';
+import '../common/matchers.dart';
 import 'canvaskit_api_test.dart';
 
 final bool isBlink = browserEngine == BrowserEngine.blink;
diff --git a/lib/web_ui/test/canvaskit/color_filter_golden_test.dart b/lib/web_ui/test/canvaskit/color_filter_golden_test.dart
index 18633e5df5ac393845d6bd6ff0573724a132b740..cf5ba125bbe185d4390cb9ab94c7cd3d90adff9f 100644
--- a/lib/web_ui/test/canvaskit/color_filter_golden_test.dart
+++ b/lib/web_ui/test/canvaskit/color_filter_golden_test.dart
@@ -17,7 +17,7 @@ const ui.Rect region = ui.Rect.fromLTRB(0, 0, 500, 250);
 
 void testMain() {
   group('ColorFilter', () {
-    setUpCanvasKitTest();
+    setUpCanvasKitTest(withImplicitView: true);
 
     test('ColorFilter.matrix applies a color filter', () async {
       final LayerSceneBuilder builder = LayerSceneBuilder();
@@ -156,7 +156,44 @@ void testMain() {
 
       builder.addPicture(ui.Offset.zero, redCircle2);
 
-      await matchSceneGolden('canvaskit_transparent_colorfilter.png', builder.build(), region: region);
+      await matchSceneGolden(
+          'canvaskit_transparent_colorfilter.png', builder.build(),
+          region: region);
+    });
+
+    test('ColorFilter with dst blend mode', () async {
+      final LayerSceneBuilder builder = LayerSceneBuilder();
+      builder.pushOffset(0, 0);
+      final CkPictureRecorder recorder = CkPictureRecorder();
+      final CkCanvas canvas = recorder.beginRecording(region);
+
+      canvas.drawCircle(
+        const ui.Offset(75, 125),
+        50,
+        CkPaint()..color = const ui.Color.fromARGB(255, 255, 0, 0),
+      );
+      final CkPicture redCircle1 = recorder.endRecording();
+      builder.addPicture(ui.Offset.zero, redCircle1);
+
+      // Push dst color filter
+      builder.pushColorFilter(
+          const ui.ColorFilter.mode(ui.Color(0xffff0000), ui.BlendMode.dst));
+
+      // Draw another red circle and apply it to the scene.
+      // This one should also be red with the color filter doing nothing
+      final CkPictureRecorder recorder2 = CkPictureRecorder();
+      final CkCanvas canvas2 = recorder2.beginRecording(region);
+      canvas2.drawCircle(
+        const ui.Offset(425, 125),
+        50,
+        CkPaint()..color = const ui.Color.fromARGB(255, 255, 0, 0),
+      );
+      final CkPicture redCircle2 = recorder2.endRecording();
+
+      builder.addPicture(ui.Offset.zero, redCircle2);
+
+      await matchSceneGolden('canvaskit_dst_colorfilter.png', builder.build(),
+          region: region);
     });
     // TODO(hterkelsen): https://github.com/flutter/flutter/issues/71520
   }, skip: isSafari || isFirefox);
diff --git a/lib/web_ui/test/canvaskit/common.dart b/lib/web_ui/test/canvaskit/common.dart
index 68d88c0396dca6147a3312ce1c387eec404cf8c2..cc69142d8b90ea4da04528c62ffc4a5a7028fa2e 100644
--- a/lib/web_ui/test/canvaskit/common.dart
+++ b/lib/web_ui/test/canvaskit/common.dart
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import 'dart:async';
+import 'dart:js_interop';
 import 'dart:typed_data';
 
 import 'package:test/test.dart';
@@ -11,40 +12,30 @@ import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
 import 'package:web_engine_tester/golden_tester.dart';
 
-/// Used in tests instead of [ProductionCollector] to control Skia object
-/// collection explicitly, and to prevent leaks across tests.
-///
-/// See [TestCollector] for usage.
-late TestCollector testCollector;
+import '../common/rendering.dart';
+import '../common/test_initialization.dart';
+
+export '../common/rendering.dart' show renderScene;
 
 const MethodCodec codec = StandardMethodCodec();
 
 /// Common test setup for all CanvasKit unit-tests.
-void setUpCanvasKitTest() {
-  setUpAll(() async {
-    expect(renderer, isA<CanvasKitRenderer>(), reason: 'This test must run in CanvasKit mode.');
-    debugResetBrowserSupportsFinalizationRegistry();
-    debugDisableFontFallbacks = false;
-    await initializeEngine(assetManager: WebOnlyMockAssetManager());
-  });
-
-  setUp(() async {
-    testCollector = TestCollector();
-    Collector.debugOverrideCollector(testCollector);
-  });
-
-  tearDown(() {
-    testCollector.cleanUpAfterTest();
-    debugResetBrowserSupportsFinalizationRegistry();
-    HtmlViewEmbedder.instance.debugClear();
-    SurfaceFactory.instance.debugClear();
-  });
+void setUpCanvasKitTest({bool withImplicitView = false}) {
+  setUpUnitTests(
+    withImplicitView: withImplicitView,
+    emulateTesterEnvironment: false,
+    setUpTestViewDimensions: false,
+  );
 
-  tearDownAll(() {
-    debugResetBrowserSupportsFinalizationRegistry();
-  });
+  setUp(() => debugOverrideJsConfiguration(<String, Object?>{
+        'fontFallbackBaseUrl': 'assets/fallback_fonts/',
+      }.jsify() as JsFlutterConfiguration?));
 }
 
+/// Convenience getter for the implicit view.
+ui.FlutterView get implicitView =>
+    EnginePlatformDispatcher.instance.implicitView!;
+
 /// Utility function for CanvasKit tests to draw pictures without
 /// the [CkPictureRecorder] boilerplate.
 CkPicture paintPicture(
@@ -55,131 +46,12 @@ CkPicture paintPicture(
   return recorder.endRecording();
 }
 
-class _TestFinalizerRegistration {
-  _TestFinalizerRegistration(this.wrapper, this.deletable, this.stackTrace);
-
-  final Object wrapper;
-  final SkDeletable deletable;
-  final StackTrace stackTrace;
-}
-
-class _TestCollection {
-  _TestCollection(this.deletable, this.stackTrace);
-
-  final SkDeletable deletable;
-  final StackTrace stackTrace;
-}
-
-/// Provides explicit synchronous API for collecting Skia objects in tests.
-///
-/// [ProductionCollector] relies on `FinalizationRegistry` and timers to
-/// delete Skia objects, which makes it more precise and efficient. However,
-/// it also makes it unpredictable. For example, an object created in one
-/// test may be collected while running another test because the timing is
-/// subject to browser-specific GC scheduling.
-///
-/// Tests should use [collectNow] and [collectAfterTest] to trigger collections.
-class TestCollector implements Collector {
-  final List<_TestFinalizerRegistration> _activeRegistrations =
-      <_TestFinalizerRegistration>[];
-  final List<_TestFinalizerRegistration> _collectedRegistrations =
-      <_TestFinalizerRegistration>[];
-
-  final List<_TestCollection> _pendingCollections = <_TestCollection>[];
-  final List<_TestCollection> _completedCollections = <_TestCollection>[];
-
-  @override
-  void register(Object wrapper, SkDeletable deletable) {
-    _activeRegistrations.add(
-      _TestFinalizerRegistration(wrapper, deletable, StackTrace.current),
-    );
-  }
-
-  @override
-  void collect(SkDeletable deletable) {
-    _pendingCollections.add(
-      _TestCollection(deletable, StackTrace.current),
-    );
-  }
-
-  /// Deletes all Skia objects scheduled for collection.
-  void collectNow() {
-    for (final _TestCollection collection in _pendingCollections) {
-      late final _TestFinalizerRegistration? activeRegistration;
-      for (final _TestFinalizerRegistration registration in _activeRegistrations) {
-        if (identical(registration.deletable, collection.deletable)) {
-          activeRegistration = registration;
-          break;
-        }
-      }
-      if (activeRegistration == null) {
-        late final _TestFinalizerRegistration? collectedRegistration;
-        for (final _TestFinalizerRegistration registration
-            in _collectedRegistrations) {
-          if (identical(registration.deletable, collection.deletable)) {
-            collectedRegistration = registration;
-            break;
-          }
-        }
-        if (collectedRegistration == null) {
-          fail(
-              'Attempted to collect an object that was never registered for finalization.\n'
-              'The collection was requested here:\n'
-              '${collection.stackTrace}');
-        } else {
-          final _TestCollection firstCollection = _completedCollections
-              .firstWhere((_TestCollection completedCollection) {
-            return identical(
-                completedCollection.deletable, collection.deletable);
-          });
-          fail(
-            'Attempted to collect an object that was previously collected.\n'
-            'The object was registered for finalization here:\n'
-            '${collection.stackTrace}\n\n'
-            'The first collection was requested here:\n'
-            '${firstCollection.stackTrace}\n\n'
-            'The second collection was requested here:\n'
-            '${collection.stackTrace}',
-          );
-        }
-      } else {
-        _collectedRegistrations.add(activeRegistration);
-        _activeRegistrations.remove(activeRegistration);
-        _completedCollections.add(collection);
-        if (!collection.deletable.isDeleted()) {
-          collection.deletable.delete();
-        }
-      }
-    }
-    _pendingCollections.clear();
-  }
-
-  /// Deletes all Skia objects with registered finalizers.
-  ///
-  /// This also deletes active objects that have not been scheduled for
-  /// collection, to prevent objects leaking across tests.
-  void cleanUpAfterTest() {
-    for (final _TestCollection collection in _pendingCollections) {
-      if (!collection.deletable.isDeleted()) {
-        collection.deletable.delete();
-      }
-    }
-    for (final _TestFinalizerRegistration registration in _activeRegistrations) {
-      if (!registration.deletable.isDeleted()) {
-        registration.deletable.delete();
-      }
-    }
-    _activeRegistrations.clear();
-    _collectedRegistrations.clear();
-    _pendingCollections.clear();
-    _completedCollections.clear();
-  }
-}
-
-Future<void> matchSceneGolden(String goldenFile, LayerScene scene, {
+Future<void> matchSceneGolden(
+  String goldenFile,
+  ui.Scene scene, {
   required ui.Rect region,
 }) async {
-  CanvasKitRenderer.instance.rasterizer.draw(scene.layerTree);
+  await renderScene(scene);
   await matchGoldenFile(goldenFile, region: region);
 }
 
@@ -192,7 +64,7 @@ Future<void> matchPictureGolden(String goldenFile, CkPicture picture,
   final LayerSceneBuilder sb = LayerSceneBuilder();
   sb.pushOffset(0, 0);
   sb.addPicture(ui.Offset.zero, picture);
-  CanvasKitRenderer.instance.rasterizer.draw(sb.build().layerTree);
+  await renderScene(sb.build());
   await matchGoldenFile(goldenFile, region: region);
 }
 
@@ -200,7 +72,8 @@ Future<bool> matchImage(ui.Image left, ui.Image right) async {
   if (left.width != right.width || left.height != right.height) {
     return false;
   }
-  int getPixel(ByteData data, int x, int y) => data.getUint32((x + y * left.width) * 4);
+  int getPixel(ByteData data, int x, int y) =>
+      data.getUint32((x + y * left.width) * 4);
   final ByteData leftData = (await left.toByteData())!;
   final ByteData rightData = (await right.toByteData())!;
   for (int y = 0; y < left.height; y++) {
@@ -216,7 +89,7 @@ Future<bool> matchImage(ui.Image left, ui.Image right) async {
 /// Sends a platform message to create a Platform View with the given id and viewType.
 Future<void> createPlatformView(int id, String viewType) {
   final Completer<void> completer = Completer<void>();
-  window.sendPlatformMessage(
+  ui.PlatformDispatcher.instance.sendPlatformMessage(
     'flutter/platform_views',
     codec.encodeMethodCall(MethodCall(
       'create',
@@ -233,7 +106,7 @@ Future<void> createPlatformView(int id, String viewType) {
 /// Disposes of the platform view with the given [id].
 Future<void> disposePlatformView(int id) {
   final Completer<void> completer = Completer<void>();
-  window.sendPlatformMessage(
+  ui.PlatformDispatcher.instance.sendPlatformMessage(
     'flutter/platform_views',
     codec.encodeMethodCall(MethodCall('dispose', id)),
     (dynamic _) => completer.complete(),
@@ -244,7 +117,8 @@ Future<void> disposePlatformView(int id) {
 /// Creates a pre-laid out one-line paragraph of text.
 ///
 /// Useful in tests that need a simple label to annotate goldens.
-CkParagraph makeSimpleText(String text, {
+CkParagraph makeSimpleText(
+  String text, {
   String? fontFamily,
   double? fontSize,
   ui.FontStyle? fontStyle,
diff --git a/lib/web_ui/test/canvaskit/configuration_canvaskit_variant_test.dart b/lib/web_ui/test/canvaskit/configuration_canvaskit_variant_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..6166cd3b863478b020e05bdfb590eef13323ecc2
--- /dev/null
+++ b/lib/web_ui/test/canvaskit/configuration_canvaskit_variant_test.dart
@@ -0,0 +1,45 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:js_interop';
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+
+import 'common.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+// This test exists to make sure we don't accidentally run the CanvasKit test suite
+// in "auto" mode. The CanvasKit variant should always be deterministic.
+void testMain() {
+  setUpCanvasKitTest();
+
+  test('CanvasKit tests always run with a specific variant', () {
+    expect(
+      configuration.canvasKitVariant,
+      anyOf(CanvasKitVariant.chromium, CanvasKitVariant.full),
+      reason: 'canvasKitVariant must be set to "chromium" or "full" in canvaskit tests!',
+    );
+  });
+
+  test('debugOverrideJsConfiguration can bypass (and restore) variant', () {
+    // Set-up in the test_platform.dart file. See `_testBootstrapHandler`.
+    final CanvasKitVariant originalValue = configuration.canvasKitVariant;
+    expect(configuration.canvasKitVariant, isNot(CanvasKitVariant.auto));
+
+    debugOverrideJsConfiguration(
+      <String, Object?>{
+        'canvasKitVariant': 'auto',
+      }.jsify() as JsFlutterConfiguration?
+    );
+    expect(configuration.canvasKitVariant, CanvasKitVariant.auto);
+
+    debugOverrideJsConfiguration(null);
+    expect(configuration.canvasKitVariant, originalValue);
+  });
+}
diff --git a/lib/web_ui/test/canvaskit/display_canvas_factory_test.dart b/lib/web_ui/test/canvaskit/display_canvas_factory_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..228ce121a41df5f49a0533bf882c3cdcad9b9425
--- /dev/null
+++ b/lib/web_ui/test/canvaskit/display_canvas_factory_test.dart
@@ -0,0 +1,119 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+
+import 'common.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+class DummyDisplayCanvas extends DisplayCanvas {
+  @override
+  void dispose() {}
+
+  final DomElement _element = createDomElement('div');
+
+  @override
+  DomElement get hostElement => _element;
+
+  @override
+  void initialize() {}
+
+  @override
+  bool get isConnected => throw UnimplementedError();
+}
+
+void testMain() {
+  group('$DisplayCanvasFactory', () {
+    setUpCanvasKitTest(withImplicitView: true);
+
+    test('getCanvas', () {
+      final DisplayCanvasFactory<DisplayCanvas> factory =
+          DisplayCanvasFactory<DisplayCanvas>(
+              createCanvas: () => DummyDisplayCanvas());
+      expect(factory.baseCanvas, isNotNull);
+
+      expect(factory.debugSurfaceCount, equals(1));
+
+      // Get a canvas from the factory, it should be unique.
+      final DisplayCanvas newCanvas = factory.getCanvas();
+      expect(newCanvas, isNot(equals(factory.baseCanvas)));
+
+      expect(factory.debugSurfaceCount, equals(2));
+
+      // Get another canvas from the factory. Now we are at maximum capacity.
+      final DisplayCanvas anotherCanvas = factory.getCanvas();
+      expect(anotherCanvas, isNot(equals(factory.baseCanvas)));
+
+      expect(factory.debugSurfaceCount, equals(3));
+    });
+
+    test('releaseCanvas', () {
+      final DisplayCanvasFactory<DisplayCanvas> factory =
+          DisplayCanvasFactory<DisplayCanvas>(
+              createCanvas: () => DummyDisplayCanvas());
+
+      // Create a new canvas and immediately release it.
+      final DisplayCanvas canvas = factory.getCanvas();
+      factory.releaseCanvas(canvas);
+
+      // If we create a new canvas, it should be the same as the one we
+      // just created.
+      final DisplayCanvas newCanvas = factory.getCanvas();
+      expect(newCanvas, equals(canvas));
+    });
+
+    test('isLive', () {
+      final DisplayCanvasFactory<DisplayCanvas> factory =
+          DisplayCanvasFactory<DisplayCanvas>(
+              createCanvas: () => DummyDisplayCanvas());
+
+      expect(factory.isLive(factory.baseCanvas), isTrue);
+
+      final DisplayCanvas canvas = factory.getCanvas();
+      expect(factory.isLive(canvas), isTrue);
+
+      factory.releaseCanvas(canvas);
+      expect(factory.isLive(canvas), isFalse);
+    });
+
+    test('hot restart', () {
+      void expectDisposed(DisplayCanvas canvas) {
+        expect(canvas.isConnected, isFalse);
+      }
+
+      final EngineFlutterView implicitView =
+          EnginePlatformDispatcher.instance.implicitView!;
+
+      final DisplayCanvasFactory<DisplayCanvas> originalFactory =
+          CanvasKitRenderer.instance
+              .debugGetRasterizerForView(implicitView)!
+              .displayFactory;
+
+      // Cause the surface and its canvas to be attached to the page
+      implicitView.dom.sceneHost
+          .prepend(originalFactory.baseCanvas.hostElement);
+      expect(originalFactory.baseCanvas.isConnected, isTrue);
+
+      // Create a few overlay canvases
+      final List<DisplayCanvas> overlays = <DisplayCanvas>[];
+      for (int i = 0; i < 3; i++) {
+        final DisplayCanvas canvas = originalFactory.getCanvas();
+        implicitView.dom.sceneHost.prepend(canvas.hostElement);
+        overlays.add(canvas);
+      }
+      expect(originalFactory.debugSurfaceCount, 4);
+
+      // Trigger hot restart clean-up logic and check that we indeed clean up.
+      debugEmulateHotRestart();
+      expectDisposed(originalFactory.baseCanvas);
+      overlays.forEach(expectDisposed);
+      expect(originalFactory.debugSurfaceCount, 1);
+    });
+  });
+}
diff --git a/lib/web_ui/test/canvaskit/embedded_views_diff_test.dart b/lib/web_ui/test/canvaskit/embedded_views_diff_test.dart
deleted file mode 100644
index cb5edda0d15d9a7942e77358bb6d8434114138e7..0000000000000000000000000000000000000000
--- a/lib/web_ui/test/canvaskit/embedded_views_diff_test.dart
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'package:test/bootstrap/browser.dart';
-import 'package:test/test.dart';
-import 'package:ui/src/engine/canvaskit/embedded_views_diff.dart';
-
-import 'common.dart';
-
-void main() {
-  internalBootstrapBrowserTest(() => testMain);
-}
-
-void testMain() {
-  group('diffViewList', () {
-    setUpCanvasKitTest();
-
-    test('works in the expected case', () {
-      ViewListDiffResult? result = diffViewList(
-        <int>[1, 2, 3, 4, 5],
-        <int>[3, 4, 5, 6, 7],
-      );
-      expect(result, isNotNull);
-      expect(result!.viewsToAdd, <int>[6, 7]);
-      expect(result.viewsToRemove, <int>[1, 2]);
-      expect(result.addToBeginning, isFalse);
-
-      result = diffViewList(
-        <int>[3, 4, 5, 6, 7],
-        <int>[1, 2, 3, 4, 5],
-      );
-      expect(result, isNotNull);
-      expect(result!.viewsToAdd, <int>[1, 2]);
-      expect(result.viewsToRemove, <int>[6, 7]);
-      expect(result.addToBeginning, isTrue);
-      expect(result.viewToInsertBefore, 3);
-
-      result = diffViewList(<int>[3, 4, 5], <int>[2, 3, 4, 5]);
-      expect(result, isNotNull);
-      expect(result!.viewsToAdd, <int>[2]);
-      expect(result.viewsToRemove, <int>[]);
-      expect(result.addToBeginning, isTrue);
-      expect(result.viewToInsertBefore, 3);
-
-      result = diffViewList(<int>[3, 4, 5], <int>[3, 4, 5, 6]);
-      expect(result, isNotNull);
-      expect(result!.viewsToAdd, <int>[6]);
-      expect(result.viewsToRemove, <int>[]);
-      expect(result.addToBeginning, isFalse);
-
-      result = diffViewList(<int>[3, 4, 5, 6], <int>[3, 4, 5]);
-      expect(result, isNotNull);
-      expect(result!.viewsToAdd, <int>[]);
-      expect(result.viewsToRemove, <int>[6]);
-
-      result = diffViewList(<int>[3, 4, 5, 6], <int>[4, 5, 6]);
-      expect(result, isNotNull);
-      expect(result!.viewsToAdd, <int>[]);
-      expect(result.viewsToRemove, <int>[3]);
-      expect(result.addToBeginning, isFalse);
-
-      result = diffViewList(<int>[3, 4, 5, 6, 7, 8], <int>[3, 4, 5]);
-      expect(result, isNotNull);
-      expect(result!.viewsToAdd, <int>[]);
-      expect(result.viewsToRemove, <int>[6, 7, 8]);
-
-      result = diffViewList(<int>[1, 2, 3, 4, 5, 6], <int>[4, 5, 6]);
-      expect(result, isNotNull);
-      expect(result!.viewsToAdd, <int>[]);
-      expect(result.viewsToRemove, <int>[1, 2, 3]);
-      expect(result.addToBeginning, isFalse);
-
-      result = diffViewList(<int>[3, 4, 5, 6, 7, 8], <int>[2, 3, 4, 5]);
-      expect(result, isNotNull);
-      expect(result!.viewsToAdd, <int>[2]);
-      expect(result.viewsToRemove, <int>[6, 7, 8]);
-      expect(result.addToBeginning, isTrue);
-      expect(result.viewToInsertBefore, 3);
-
-      result = diffViewList(<int>[1, 2, 3, 4, 5, 6], <int>[4, 5, 6, 7]);
-      expect(result, isNotNull);
-      expect(result!.viewsToAdd, <int>[7]);
-      expect(result.viewsToRemove, <int>[1, 2, 3]);
-      expect(result.addToBeginning, isFalse);
-
-      result = diffViewList(<int>[1, 2, 3], <int>[4, 5]);
-      expect(result, isNull);
-
-      result = diffViewList(<int>[1, 2, 3, 4], <int>[2, 3, 5, 4]);
-      expect(result, isNull);
-
-      result = diffViewList(<int>[3, 4], <int>[1, 2, 3, 4, 5, 6]);
-      expect(result, isNull);
-
-      result = diffViewList(<int>[1, 2, 3, 4, 5], <int>[2, 3, 4]);
-      expect(result, isNull);
-    });
-
-    test('works for flutter/flutter#101580', () {
-      ViewListDiffResult? result;
-
-      // Reverse the list
-      result = diffViewList(<int>[1, 2, 3, 4], <int>[4, 3, 2, 1]);
-      expect(result, isNotNull);
-      expect(result!.viewsToAdd, <int>[3, 2, 1]);
-      expect(result.viewsToRemove, <int>[1, 2, 3]);
-      expect(result.addToBeginning, isFalse);
-
-      // Sort the list
-      result = diffViewList(<int>[3, 4, 1, 2], <int>[1, 2, 3, 4]);
-      expect(result, isNotNull);
-      expect(result!.viewsToAdd, <int>[3, 4]);
-      expect(result.viewsToRemove, <int>[3, 4]);
-      expect(result.addToBeginning, isFalse);
-
-      // Move last view to the beginning
-      result = diffViewList(<int>[2, 3, 4, 1], <int>[1, 2, 3, 4]);
-      expect(result, isNotNull);
-      expect(result!.viewsToAdd, <int>[1]);
-      expect(result.viewsToRemove, <int>[1]);
-      expect(result.addToBeginning, isTrue);
-      expect(result.viewToInsertBefore, 2);
-
-      // Shuffle the list
-      result = diffViewList(<int>[1, 2, 3, 4], <int>[2, 4, 1, 3]);
-      expect(result, isNull);
-    });
-  });
-}
diff --git a/lib/web_ui/test/canvaskit/embedded_views_test.dart b/lib/web_ui/test/canvaskit/embedded_views_test.dart
index 112fc0b34ae770800df51d38802b6d4bcb4ab4a2..1b0d76249d3938d4f460330890b2c47318e77c23 100644
--- a/lib/web_ui/test/canvaskit/embedded_views_test.dart
+++ b/lib/web_ui/test/canvaskit/embedded_views_test.dart
@@ -4,30 +4,40 @@
 
 import 'dart:async';
 
-import 'package:js/js_util.dart' as js_util;
 import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
 import 'common.dart';
 import 'test_data.dart';
 
+EngineFlutterWindow get implicitView =>
+    EnginePlatformDispatcher.instance.implicitView!;
+
+DomElement get platformViewsHost => implicitView.dom.platformViewsHost;
+DomElement get sceneHost => implicitView.dom.sceneHost;
+
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
 
 void testMain() {
   group('$HtmlViewEmbedder', () {
-    setUpCanvasKitTest();
+    setUpCanvasKitTest(withImplicitView: true);
 
     setUp(() {
-      window.debugOverrideDevicePixelRatio(1);
+      EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(1);
+    });
+
+    tearDown(() {
+      PlatformViewManager.instance.debugClear();
+      CanvasKitRenderer.instance.debugClear();
     });
 
     test('embeds interactive platform views', () async {
-      final Rasterizer rasterizer = CanvasKitRenderer.instance.rasterizer;
-      ui.platformViewRegistry.registerViewFactory(
+      ui_web.platformViewRegistry.registerViewFactory(
         'test-platform-view',
         (int viewId) => createDomHTMLDivElement()..id = 'view-0',
       );
@@ -36,15 +46,13 @@ void testMain() {
       final LayerSceneBuilder sb = LayerSceneBuilder();
       sb.pushOffset(0, 0);
       sb.addPlatformView(0, width: 10, height: 10);
-      rasterizer.draw(sb.build().layerTree);
+      await renderScene(sb.build());
 
       // The platform view is now split in two parts. The contents live
       // as a child of the glassPane, and the slot lives in the glassPane
       // shadow root. The slot is the one that has pointer events auto.
-      final DomElement contents = flutterViewEmbedder.glassPaneElement!
-          .querySelector('#view-0')!;
-      final DomElement slot = flutterViewEmbedder.sceneElement!
-          .querySelector('slot')!;
+      final DomElement contents = platformViewsHost.querySelector('#view-0')!;
+      final DomElement slot = sceneHost.querySelector('slot')!;
       final DomElement contentsHost = contents.parent!;
       final DomElement slotHost = slot.parent!;
 
@@ -61,8 +69,7 @@ void testMain() {
     });
 
     test('clips platform views with RRects', () async {
-      final Rasterizer rasterizer = CanvasKitRenderer.instance.rasterizer;
-      ui.platformViewRegistry.registerViewFactory(
+      ui_web.platformViewRegistry.registerViewFactory(
         'test-platform-view',
         (int viewId) => createDomHTMLDivElement()..id = 'view-0',
       );
@@ -73,16 +80,14 @@ void testMain() {
       sb.pushClipRRect(
           ui.RRect.fromLTRBR(0, 0, 10, 10, const ui.Radius.circular(3)));
       sb.addPlatformView(0, width: 10, height: 10);
-      rasterizer.draw(sb.build().layerTree);
+      await renderScene(sb.build());
 
       expect(
-        flutterViewEmbedder.sceneElement!
-            .querySelectorAll('#sk_path_defs')
-            .single,
+        sceneHost.querySelectorAll('#sk_path_defs').single,
         isNotNull,
       );
       expect(
-        flutterViewEmbedder.sceneElement!
+        sceneHost
             .querySelectorAll('#sk_path_defs')
             .single
             .querySelectorAll('clipPath')
@@ -90,34 +95,21 @@ void testMain() {
         isNotNull,
       );
       expect(
-        flutterViewEmbedder.sceneElement!
-            .querySelectorAll('flt-clip')
-            .single
-            .style
-            .clipPath,
+        sceneHost.querySelectorAll('flt-clip').single.style.clipPath,
         'url("#svgClip1")',
       );
       expect(
-        flutterViewEmbedder.sceneElement!
-            .querySelectorAll('flt-clip')
-            .single
-            .style
-            .width,
+        sceneHost.querySelectorAll('flt-clip').single.style.width,
         '100%',
       );
       expect(
-        flutterViewEmbedder.sceneElement!
-            .querySelectorAll('flt-clip')
-            .single
-            .style
-            .height,
+        sceneHost.querySelectorAll('flt-clip').single.style.height,
         '100%',
       );
     });
 
     test('correctly transforms platform views', () async {
-      final Rasterizer rasterizer = CanvasKitRenderer.instance.rasterizer;
-      ui.platformViewRegistry.registerViewFactory(
+      ui_web.platformViewRegistry.registerViewFactory(
         'test-platform-view',
         (int viewId) => createDomHTMLDivElement()..id = 'view-0',
       );
@@ -131,11 +123,11 @@ void testMain() {
       sb.pushTransform(scaleMatrix.toFloat64());
       sb.pushOffset(3, 3);
       sb.addPlatformView(0, width: 10, height: 10);
-      rasterizer.draw(sb.build().layerTree);
+      await renderScene(sb.build());
 
       // Transformations happen on the slot element.
-      final DomElement slotHost = flutterViewEmbedder.sceneElement!
-          .querySelector('flt-platform-view-slot')!;
+      final DomElement slotHost =
+          sceneHost.querySelector('flt-platform-view-slot')!;
 
       expect(
         slotHost.style.transform,
@@ -147,7 +139,7 @@ void testMain() {
     });
 
     test('correctly offsets platform views', () async {
-      ui.platformViewRegistry.registerViewFactory(
+      ui_web.platformViewRegistry.registerViewFactory(
         'test-platform-view',
         (int viewId) => createDomHTMLDivElement()..id = 'view-0',
       );
@@ -155,10 +147,10 @@ void testMain() {
 
       final LayerSceneBuilder sb = LayerSceneBuilder();
       sb.addPlatformView(0, offset: const ui.Offset(3, 4), width: 5, height: 6);
-      CanvasKitRenderer.instance.rasterizer.draw(sb.build().layerTree);
+      await renderScene(sb.build());
 
-      final DomElement slotHost = flutterViewEmbedder.sceneElement!
-          .querySelector('flt-platform-view-slot')!;
+      final DomElement slotHost =
+          sceneHost.querySelector('flt-platform-view-slot')!;
       final DomCSSStyleDeclaration style = slotHost.style;
 
       expect(style.transform, 'matrix(1, 0, 0, 1, 3, 4)');
@@ -173,11 +165,13 @@ void testMain() {
     });
 
     // Returns the list of CSS transforms applied to the ancestor chain of
-    // elements starting from `viewHost`, up until and excluding <flt-scene>.
+    // elements starting from `viewHost`, up until and excluding
+    // <flt-scene-host>.
     List<String> getTransformChain(DomElement viewHost) {
       final List<String> chain = <String>[];
       DomElement? element = viewHost;
-      while (element != null && element.tagName.toLowerCase() != 'flt-scene') {
+      while (element != null &&
+          element.tagName.toLowerCase() != 'flt-scene-host') {
         chain.add(element.style.transform);
         element = element.parent;
       }
@@ -185,7 +179,7 @@ void testMain() {
     }
 
     test('correctly offsets when clip chain length is changed', () async {
-      ui.platformViewRegistry.registerViewFactory(
+      ui_web.platformViewRegistry.registerViewFactory(
         'test-platform-view',
         (int viewId) => createDomHTMLDivElement()..id = 'view-0',
       );
@@ -197,11 +191,10 @@ void testMain() {
       sb.pushOffset(6, 6);
       sb.addPlatformView(0, width: 10, height: 10);
       sb.pop();
-      CanvasKitRenderer.instance.rasterizer.draw(sb.build().layerTree);
+      await renderScene(sb.build());
 
       // Transformations happen on the slot element.
-      DomElement slotHost = flutterViewEmbedder.sceneElement!
-          .querySelector('flt-platform-view-slot')!;
+      DomElement slotHost = sceneHost.querySelector('flt-platform-view-slot')!;
 
       expect(
         getTransformChain(slotHost),
@@ -218,11 +211,10 @@ void testMain() {
       sb.pushClipRect(ui.Rect.largest);
       sb.pushOffset(9, 9);
       sb.addPlatformView(0, width: 10, height: 10);
-      CanvasKitRenderer.instance.rasterizer.draw(sb.build().layerTree);
+      await renderScene(sb.build());
 
       // Transformations happen on the slot element.
-      slotHost = flutterViewEmbedder.sceneElement!
-          .querySelector('flt-platform-view-slot')!;
+      slotHost = sceneHost.querySelector('flt-platform-view-slot')!;
 
       expect(
         getTransformChain(slotHost),
@@ -235,8 +227,8 @@ void testMain() {
     });
 
     test('converts device pixels to logical pixels (no clips)', () async {
-      window.debugOverrideDevicePixelRatio(4);
-      ui.platformViewRegistry.registerViewFactory(
+      EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(4);
+      ui_web.platformViewRegistry.registerViewFactory(
         'test-platform-view',
         (int viewId) => createDomHTMLDivElement()..id = 'view-0',
       );
@@ -247,11 +239,11 @@ void testMain() {
       sb.pushOffset(2, 2);
       sb.pushOffset(3, 3);
       sb.addPlatformView(0, width: 10, height: 10);
-      CanvasKitRenderer.instance.rasterizer.draw(sb.build().layerTree);
+      await renderScene(sb.build());
 
       // Transformations happen on the slot element.
-      final DomElement slotHost = flutterViewEmbedder.sceneElement!
-          .querySelector('flt-platform-view-slot')!;
+      final DomElement slotHost =
+          sceneHost.querySelector('flt-platform-view-slot')!;
 
       expect(
         getTransformChain(slotHost),
@@ -260,8 +252,8 @@ void testMain() {
     });
 
     test('converts device pixels to logical pixels (with clips)', () async {
-      window.debugOverrideDevicePixelRatio(4);
-      ui.platformViewRegistry.registerViewFactory(
+      EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(4);
+      ui_web.platformViewRegistry.registerViewFactory(
         'test-platform-view',
         (int viewId) => createDomHTMLDivElement()..id = 'view-0',
       );
@@ -274,11 +266,11 @@ void testMain() {
       sb.pushClipRect(ui.Rect.largest);
       sb.pushOffset(9, 9);
       sb.addPlatformView(0, width: 10, height: 10);
-      CanvasKitRenderer.instance.rasterizer.draw(sb.build().layerTree);
+      await renderScene(sb.build());
 
       // Transformations happen on the slot element.
-      final DomElement slotHost = flutterViewEmbedder.sceneElement!
-          .querySelector('flt-platform-view-slot')!;
+      final DomElement slotHost =
+          sceneHost.querySelector('flt-platform-view-slot')!;
 
       expect(
         getTransformChain(slotHost),
@@ -291,8 +283,6 @@ void testMain() {
     });
 
     test('renders overlays on top of platform views', () async {
-      expect(SurfaceFactory.instance.debugCacheSize, 0);
-      expect(configuration.canvasKitMaximumSurfaces, 8);
       final CkPicture testPicture =
           paintPicture(const ui.Rect.fromLTRB(0, 0, 10, 10), (CkCanvas canvas) {
         canvas.drawCircle(const ui.Offset(5, 5), 5, CkPaint());
@@ -301,7 +291,7 @@ void testMain() {
       // Initialize all platform views to be used in the test.
       final List<int> platformViewIds = <int>[];
       for (int i = 0; i < 16; i++) {
-        ui.platformViewRegistry.registerViewFactory(
+        ui_web.platformViewRegistry.registerViewFactory(
           'test-platform-view',
           (int viewId) => createDomHTMLDivElement()..id = 'view-$i',
         );
@@ -309,20 +299,20 @@ void testMain() {
         platformViewIds.add(i);
       }
 
-      void renderTestScene({required int viewCount}) {
+      Future<void> renderTestScene({required int viewCount}) async {
         final LayerSceneBuilder sb = LayerSceneBuilder();
         sb.pushOffset(0, 0);
         for (int i = 0; i < viewCount; i++) {
           sb.addPicture(ui.Offset.zero, testPicture);
           sb.addPlatformView(i, width: 10, height: 10);
         }
-        CanvasKitRenderer.instance.rasterizer.draw(sb.build().layerTree);
+        await renderScene(sb.build());
       }
 
       // Frame 1:
       //   Render: up to cache size platform views.
       //   Expect: main canvas plus platform view overlays.
-      renderTestScene(viewCount: 8);
+      await renderTestScene(viewCount: 8);
       _expectSceneMatches(<_EmbeddedViewMarker>[
         _overlay,
         _platformView,
@@ -345,15 +335,13 @@ void testMain() {
       // Frame 2:
       //   Render: zero platform views.
       //   Expect: main canvas, no overlays.
-      await Future<void>.delayed(Duration.zero);
-      renderTestScene(viewCount: 0);
-      _expectSceneMatches(<_EmbeddedViewMarker>[_overlay]);
+      await renderTestScene(viewCount: 0);
+      _expectSceneMatches(<_EmbeddedViewMarker>[]);
 
       // Frame 3:
       //   Render: less than cache size platform views.
       //   Expect: overlays reused.
-      await Future<void>.delayed(Duration.zero);
-      renderTestScene(viewCount: 6);
+      await renderTestScene(viewCount: 6);
       _expectSceneMatches(<_EmbeddedViewMarker>[
         _overlay,
         _platformView,
@@ -367,14 +355,12 @@ void testMain() {
         _platformView,
         _overlay,
         _platformView,
-        _overlay,
       ]);
 
       // Frame 4:
-      //   Render: more platform views than max cache size.
+      //   Render: more platform views than max overlay count.
       //   Expect: main canvas, backup overlay, maximum overlays.
-      await Future<void>.delayed(Duration.zero);
-      renderTestScene(viewCount: 16);
+      await renderTestScene(viewCount: 16);
       _expectSceneMatches(<_EmbeddedViewMarker>[
         _overlay,
         _platformView,
@@ -390,7 +376,6 @@ void testMain() {
         _platformView,
         _overlay,
         _platformView,
-        _overlay,
         _platformView,
         _platformView,
         _platformView,
@@ -399,15 +384,15 @@ void testMain() {
         _platformView,
         _platformView,
         _platformView,
+        _overlay,
         _platformView,
       ]);
 
       // Frame 5:
       //   Render: zero platform views.
       //   Expect: main canvas, no overlays.
-      await Future<void>.delayed(Duration.zero);
-      renderTestScene(viewCount: 0);
-      _expectSceneMatches(<_EmbeddedViewMarker>[_overlay]);
+      await renderTestScene(viewCount: 0);
+      _expectSceneMatches(<_EmbeddedViewMarker>[]);
 
       // Frame 6:
       //   Render: deleted platform views.
@@ -415,7 +400,7 @@ void testMain() {
       for (final int id in platformViewIds) {
         const StandardMethodCodec codec = StandardMethodCodec();
         final Completer<void> completer = Completer<void>();
-        ui.window.sendPlatformMessage(
+        ui.PlatformDispatcher.instance.sendPlatformMessage(
           'flutter/platform_views',
           codec.encodeMethodCall(MethodCall(
             'dispose',
@@ -427,7 +412,7 @@ void testMain() {
       }
 
       try {
-        renderTestScene(viewCount: platformViewIds.length);
+        await renderTestScene(viewCount: platformViewIds.length);
         fail('Expected to throw');
       } on AssertionError catch (error) {
         expect(
@@ -440,10 +425,9 @@ void testMain() {
       //   Render: a platform view after error.
       //   Expect: success. Just checking the system is not left in a corrupted state.
       await createPlatformView(0, 'test-platform-view');
-      renderTestScene(viewCount: 0);
-      _expectSceneMatches(<_EmbeddedViewMarker>[_overlay]);
-      // TODO(yjbanov): skipped due to https://github.com/flutter/flutter/issues/73867
-    }, skip: isSafari);
+      await renderTestScene(viewCount: 0);
+      _expectSceneMatches(<_EmbeddedViewMarker>[]);
+    });
 
     test('correctly reuses overlays', () async {
       final CkPicture testPicture =
@@ -454,7 +438,7 @@ void testMain() {
       // Initialize all platform views to be used in the test.
       final List<int> platformViewIds = <int>[];
       for (int i = 0; i < 20; i++) {
-        ui.platformViewRegistry.registerViewFactory(
+        ui_web.platformViewRegistry.registerViewFactory(
           'test-platform-view',
           (int viewId) => createDomHTMLDivElement()..id = 'view-$i',
         );
@@ -462,21 +446,20 @@ void testMain() {
         platformViewIds.add(i);
       }
 
-      void renderTestScene(List<int> views) {
+      Future<void> renderTestScene(List<int> views) async {
         final LayerSceneBuilder sb = LayerSceneBuilder();
         sb.pushOffset(0, 0);
         for (final int view in views) {
           sb.addPicture(ui.Offset.zero, testPicture);
           sb.addPlatformView(view, width: 10, height: 10);
         }
-        CanvasKitRenderer.instance.rasterizer.draw(sb.build().layerTree);
+        await renderScene(sb.build());
       }
 
       // Frame 1:
       //   Render: Views 1-10
       //   Expect: main canvas plus platform view overlays; empty cache.
-      renderTestScene(<int>[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
-      expect(SurfaceFactory.instance.numAvailableOverlays, 0);
+      await renderTestScene(<int>[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
       _expectSceneMatches(<_EmbeddedViewMarker>[
         _overlay,
         _platformView,
@@ -492,18 +475,16 @@ void testMain() {
         _platformView,
         _overlay,
         _platformView,
-        _overlay,
         _platformView,
         _platformView,
+        _overlay,
         _platformView,
       ]);
 
       // Frame 2:
       //   Render: Views 2-11
       //   Expect: main canvas plus platform view overlays; empty cache.
-      await Future<void>.delayed(Duration.zero);
-      renderTestScene(<int>[2, 3, 4, 5, 6, 7, 8, 9, 10, 11]);
-      expect(SurfaceFactory.instance.numAvailableOverlays, 0);
+      await renderTestScene(<int>[2, 3, 4, 5, 6, 7, 8, 9, 10, 11]);
       _expectSceneMatches(<_EmbeddedViewMarker>[
         _overlay,
         _platformView,
@@ -519,17 +500,16 @@ void testMain() {
         _platformView,
         _overlay,
         _platformView,
-        _overlay,
         _platformView,
         _platformView,
+        _overlay,
         _platformView,
       ]);
 
       // Frame 3:
       //   Render: Views 3-12
       //   Expect: main canvas plus platform view overlays; empty cache.
-      await Future<void>.delayed(Duration.zero);
-      renderTestScene(<int>[3, 4, 5, 6, 7, 8, 9, 10, 11, 12]);
+      await renderTestScene(<int>[3, 4, 5, 6, 7, 8, 9, 10, 11, 12]);
       _expectSceneMatches(<_EmbeddedViewMarker>[
         _overlay,
         _platformView,
@@ -545,17 +525,16 @@ void testMain() {
         _platformView,
         _overlay,
         _platformView,
-        _overlay,
         _platformView,
         _platformView,
+        _overlay,
         _platformView,
       ]);
 
       // Frame 4:
       //   Render: Views 3-12 again (same as last frame)
       //   Expect: main canvas plus platform view overlays; empty cache.
-      await Future<void>.delayed(Duration.zero);
-      renderTestScene(<int>[3, 4, 5, 6, 7, 8, 9, 10, 11, 12]);
+      await renderTestScene(<int>[3, 4, 5, 6, 7, 8, 9, 10, 11, 12]);
       _expectSceneMatches(<_EmbeddedViewMarker>[
         _overlay,
         _platformView,
@@ -571,17 +550,15 @@ void testMain() {
         _platformView,
         _overlay,
         _platformView,
-        _overlay,
         _platformView,
         _platformView,
+        _overlay,
         _platformView,
       ]);
-
-      // TODO(yjbanov): skipped due to https://github.com/flutter/flutter/issues/73867
-    }, skip: isSafari);
+    });
 
     test('embeds and disposes of a platform view', () async {
-      ui.platformViewRegistry.registerViewFactory(
+      ui_web.platformViewRegistry.registerViewFactory(
         'test-platform-view',
         (int viewId) => createDomHTMLDivElement()..id = 'view-0',
       );
@@ -590,38 +567,28 @@ void testMain() {
       LayerSceneBuilder sb = LayerSceneBuilder();
       sb.pushOffset(0, 0);
       sb.addPlatformView(0, width: 10, height: 10);
-      CanvasKitRenderer.instance.rasterizer.draw(sb.build().layerTree);
+      await renderScene(sb.build());
       _expectSceneMatches(<_EmbeddedViewMarker>[
-        _overlay,
         _platformView,
-        _overlay,
       ]);
 
-      expect(
-        flutterViewEmbedder.glassPaneElement!
-            .querySelector('flt-platform-view'),
-        isNotNull,
-      );
+      expect(platformViewsHost.querySelector('flt-platform-view'), isNotNull);
 
       await disposePlatformView(0);
 
       sb = LayerSceneBuilder();
       sb.pushOffset(0, 0);
-      CanvasKitRenderer.instance.rasterizer.draw(sb.build().layerTree);
+      await renderScene(sb.build());
 
-      _expectSceneMatches(<_EmbeddedViewMarker>[
-        _overlay,
-      ]);
+      _expectSceneMatches(<_EmbeddedViewMarker>[]);
 
-      expect(
-        flutterViewEmbedder.glassPaneElement!
-            .querySelector('flt-platform-view'),
-        isNull,
-      );
+      expect(platformViewsHost.querySelector('flt-platform-view'), isNull);
     });
 
-    test('does not crash when resizing the window after textures have been registered', () async {
-      ui.platformViewRegistry.registerViewFactory(
+    test(
+        'does not crash when resizing the window after textures have been registered',
+        () async {
+      ui_web.platformViewRegistry.registerViewFactory(
         'test-platform-view',
         (int viewId) => createDomHTMLDivElement()..id = 'view-0',
       );
@@ -643,32 +610,30 @@ void testMain() {
       sb.addPicture(ui.Offset.zero, picture);
       sb.addPlatformView(0, width: 10, height: 10);
 
-      window.webOnlyDebugPhysicalSizeOverride = const ui.Size(100, 100);
-      window.debugForceResize();
-      CanvasKitRenderer.instance.rasterizer.draw(sb.build().layerTree);
+      implicitView.debugPhysicalSizeOverride = const ui.Size(100, 100);
+      implicitView.debugForceResize();
+      await renderScene(sb.build());
       _expectSceneMatches(<_EmbeddedViewMarker>[
         _overlay,
         _platformView,
-        _overlay,
       ]);
 
-      window.webOnlyDebugPhysicalSizeOverride = const ui.Size(200, 200);
-      window.debugForceResize();
-      CanvasKitRenderer.instance.rasterizer.draw(sb.build().layerTree);
+      implicitView.debugPhysicalSizeOverride = const ui.Size(200, 200);
+      implicitView.debugForceResize();
+      await renderScene(sb.build());
       _expectSceneMatches(<_EmbeddedViewMarker>[
         _overlay,
         _platformView,
-        _overlay,
       ]);
 
-      window.webOnlyDebugPhysicalSizeOverride = null;
-      window.debugForceResize();
-    // ImageDecoder is not supported in Safari or Firefox.
+      implicitView.debugPhysicalSizeOverride = null;
+      implicitView.debugForceResize();
+
+      // ImageDecoder is not supported in Safari or Firefox.
     }, skip: isSafari || isFirefox);
 
-    test('removed the DOM node of an unrendered platform view', () async {
-      final Rasterizer rasterizer = CanvasKitRenderer.instance.rasterizer;
-      ui.platformViewRegistry.registerViewFactory(
+    test('removes the DOM node of an unrendered platform view', () async {
+      ui_web.platformViewRegistry.registerViewFactory(
         'test-platform-view',
         (int viewId) => createDomHTMLDivElement()..id = 'view-0',
       );
@@ -677,93 +642,78 @@ void testMain() {
       LayerSceneBuilder sb = LayerSceneBuilder();
       sb.pushOffset(0, 0);
       sb.addPlatformView(0, width: 10, height: 10);
-      CanvasKitRenderer.instance.rasterizer.draw(sb.build().layerTree);
+      await renderScene(sb.build());
       _expectSceneMatches(<_EmbeddedViewMarker>[
-        _overlay,
         _platformView,
-        _overlay,
       ]);
 
-      expect(
-        flutterViewEmbedder.glassPaneElement!
-            .querySelector('flt-platform-view'),
-        isNotNull,
-      );
+      expect(platformViewsHost.querySelector('flt-platform-view'), isNotNull);
 
       // Render a frame with a different platform view.
       await createPlatformView(1, 'test-platform-view');
       sb = LayerSceneBuilder();
       sb.pushOffset(0, 0);
       sb.addPlatformView(1, width: 10, height: 10);
-      rasterizer.draw(sb.build().layerTree);
+      await renderScene(sb.build());
       _expectSceneMatches(<_EmbeddedViewMarker>[
-        _overlay,
         _platformView,
-        _overlay,
       ]);
 
       expect(
-          flutterViewEmbedder.glassPaneElement!
-              .querySelectorAll('flt-platform-view'),
-          hasLength(2));
+        platformViewsHost.querySelectorAll('flt-platform-view'),
+        hasLength(2),
+      );
 
       // Render a frame without a platform view, but also without disposing of
       // the platform view.
       sb = LayerSceneBuilder();
       sb.pushOffset(0, 0);
-      CanvasKitRenderer.instance.rasterizer.draw(sb.build().layerTree);
-      _expectSceneMatches(<_EmbeddedViewMarker>[
-        _overlay,
-      ]);
+      await renderScene(sb.build());
+      _expectSceneMatches(<_EmbeddedViewMarker>[]);
 
       // The actual contents of the platform view are kept in the dom, until
       // it's actually disposed of!
       expect(
-          flutterViewEmbedder.glassPaneElement!
-              .querySelectorAll('flt-platform-view'),
-          hasLength(2));
+        platformViewsHost.querySelectorAll('flt-platform-view'),
+        hasLength(2),
+      );
     });
 
     test(
         'removes old SVG clip definitions from the DOM when the view is recomposited',
         () async {
-      final Rasterizer rasterizer = CanvasKitRenderer.instance.rasterizer;
-      ui.platformViewRegistry.registerViewFactory(
+      ui_web.platformViewRegistry.registerViewFactory(
         'test-platform-view',
         (int viewId) => createDomHTMLDivElement()..id = 'test-view',
       );
       await createPlatformView(0, 'test-platform-view');
 
-      void renderTestScene() {
+      Future<void> renderTestScene() async {
         final LayerSceneBuilder sb = LayerSceneBuilder();
         sb.pushOffset(0, 0);
         sb.pushClipRRect(
             ui.RRect.fromLTRBR(0, 0, 10, 10, const ui.Radius.circular(3)));
         sb.addPlatformView(0, width: 10, height: 10);
-        rasterizer.draw(sb.build().layerTree);
+        await renderScene(sb.build());
       }
 
-      final DomNode skPathDefs = flutterViewEmbedder.sceneElement!
-          .querySelector('#sk_path_defs')!;
+      final DomNode skPathDefs = sceneHost.querySelector('#sk_path_defs')!;
 
       expect(skPathDefs.childNodes, hasLength(0));
 
-      renderTestScene();
+      await renderTestScene();
       expect(skPathDefs.childNodes, hasLength(1));
 
-      await Future<void>.delayed(Duration.zero);
-      renderTestScene();
+      await renderTestScene();
       expect(skPathDefs.childNodes, hasLength(1));
 
-      await Future<void>.delayed(Duration.zero);
-      renderTestScene();
+      await renderTestScene();
       expect(skPathDefs.childNodes, hasLength(1));
     });
 
     test('does not crash when a prerolled platform view is not composited',
         () async {
-      final Rasterizer rasterizer = CanvasKitRenderer.instance.rasterizer;
-      ui.platformViewRegistry.registerViewFactory(
+      ui_web.platformViewRegistry.registerViewFactory(
         'test-platform-view',
         (int viewId) => createDomHTMLDivElement()..id = 'view-0',
       );
@@ -775,133 +725,20 @@ void testMain() {
       sb.addPlatformView(0, width: 10, height: 10);
       sb.pop();
       // The below line should not throw an error.
-      rasterizer.draw(sb.build().layerTree);
-      _expectSceneMatches(<_EmbeddedViewMarker>[
-        _overlay,
-      ]);
-    });
-
-    test('does not crash when overlays are disabled', () async {
-      final Rasterizer rasterizer = CanvasKitRenderer.instance.rasterizer;
-      HtmlViewEmbedder.debugDisableOverlays = true;
-      ui.platformViewRegistry.registerViewFactory(
-        'test-platform-view',
-        (int viewId) => createDomHTMLDivElement()..id = 'view-0',
-      );
-      await createPlatformView(0, 'test-platform-view');
-
-      final LayerSceneBuilder sb = LayerSceneBuilder();
-      sb.pushOffset(0, 0);
-      sb.addPlatformView(0, width: 10, height: 10);
-      sb.pop();
-      // The below line should not throw an error.
-      rasterizer.draw(sb.build().layerTree);
-      _expectSceneMatches(<_EmbeddedViewMarker>[
-        _overlay,
-        _platformView,
-      ]);
-      HtmlViewEmbedder.debugDisableOverlays = false;
-    });
-
-    test('works correctly with max overlays == 2', () async {
-      final Rasterizer rasterizer = CanvasKitRenderer.instance.rasterizer;
-      final FlutterConfiguration config = FlutterConfiguration()
-        ..setUserConfiguration(
-          js_util.jsify(<String, Object?>{
-            'canvasKitMaximumSurfaces': 2,
-          }) as JsFlutterConfiguration);
-      debugSetConfiguration(config);
-
-      SurfaceFactory.instance.debugClear();
-
-      expect(SurfaceFactory.instance.maximumSurfaces, 2);
-      expect(SurfaceFactory.instance.maximumOverlays, 1);
-
-      ui.platformViewRegistry.registerViewFactory(
-        'test-platform-view',
-        (int viewId) => createDomHTMLDivElement()..id = 'view-0',
-      );
-      await createPlatformView(0, 'test-platform-view');
-      await createPlatformView(1, 'test-platform-view');
-
-      LayerSceneBuilder sb = LayerSceneBuilder();
-      sb.pushOffset(0, 0);
-      sb.addPlatformView(0, width: 10, height: 10);
-      sb.pop();
-      // The below line should not throw an error.
-      rasterizer.draw(sb.build().layerTree);
-
-      _expectSceneMatches(<_EmbeddedViewMarker>[
-        _overlay,
-        _platformView,
-        _overlay,
-      ]);
-
-      sb = LayerSceneBuilder();
-      sb.pushOffset(0, 0);
-      sb.addPlatformView(1, width: 10, height: 10);
-      sb.addPlatformView(0, width: 10, height: 10);
-      sb.pop();
-      // The below line should not throw an error.
-      rasterizer.draw(sb.build().layerTree);
-
-      _expectSceneMatches(<_EmbeddedViewMarker>[
-        _overlay,
-        _platformView,
-        _overlay,
-        _platformView,
-      ]);
-
-      // Reset configuration
-      debugSetConfiguration(FlutterConfiguration());
-    });
-
-    test(
-        'correctly renders when overlays are disabled and a subset '
-        'of views is used', () async {
-      final Rasterizer rasterizer = CanvasKitRenderer.instance.rasterizer;
-      HtmlViewEmbedder.debugDisableOverlays = true;
-      ui.platformViewRegistry.registerViewFactory(
-        'test-platform-view',
-        (int viewId) => createDomHTMLDivElement()..id = 'view-0',
-      );
-      await createPlatformView(0, 'test-platform-view');
-      await createPlatformView(1, 'test-platform-view');
-
-      LayerSceneBuilder sb = LayerSceneBuilder();
-      sb.pushOffset(0, 0);
-      sb.addPlatformView(0, width: 10, height: 10);
-      sb.addPlatformView(1, width: 10, height: 10);
-      sb.pop();
-      // The below line should not throw an error.
-      rasterizer.draw(sb.build().layerTree);
-      _expectSceneMatches(<_EmbeddedViewMarker>[
-        _overlay,
-        _platformView,
-        _platformView,
-      ]);
-
-      sb = LayerSceneBuilder();
-      sb.pushOffset(0, 0);
-      sb.addPlatformView(1, width: 10, height: 10);
-      sb.pop();
-      // The below line should not throw an error.
-      rasterizer.draw(sb.build().layerTree);
-      _expectSceneMatches(<_EmbeddedViewMarker>[
-        _overlay,
-        _platformView,
-      ]);
-
-      HtmlViewEmbedder.debugDisableOverlays = false;
+      await renderScene(sb.build());
+      _expectSceneMatches(<_EmbeddedViewMarker>[]);
     });
 
     test('does not create overlays for invisible platform views', () async {
-      final Rasterizer rasterizer = CanvasKitRenderer.instance.rasterizer;
-      ui.platformViewRegistry.registerViewFactory(
+      final CkPicture testPicture =
+          paintPicture(const ui.Rect.fromLTRB(0, 0, 10, 10), (CkCanvas canvas) {
+        canvas.drawCircle(const ui.Offset(5, 5), 5, CkPaint());
+      });
+      ui_web.platformViewRegistry.registerViewFactory(
           'test-visible-view',
           (int viewId) =>
               createDomHTMLDivElement()..className = 'visible-platform-view');
-      ui.platformViewRegistry.registerViewFactory(
+      ui_web.platformViewRegistry.registerViewFactory(
         'test-invisible-view',
         (int viewId) =>
             createDomHTMLDivElement()..className = 'invisible-platform-view',
@@ -915,57 +752,67 @@ void testMain() {
       await createPlatformView(5, 'test-invisible-view');
       await createPlatformView(6, 'test-invisible-view');
 
-      expect(platformViewManager.isInvisible(0), isFalse);
-      expect(platformViewManager.isInvisible(1), isTrue);
+      expect(PlatformViewManager.instance.isInvisible(0), isFalse);
+      expect(PlatformViewManager.instance.isInvisible(1), isTrue);
 
       LayerSceneBuilder sb = LayerSceneBuilder();
       sb.pushOffset(0, 0);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(1, width: 10, height: 10);
       sb.pop();
-      rasterizer.draw(sb.build().layerTree);
+      await renderScene(sb.build());
       _expectSceneMatches(<_EmbeddedViewMarker>[
-        _overlay,
         _platformView,
         _overlay,
-      ]);
+      ], reason: 'Invisible view renders, followed by an overlay.');
 
       sb = LayerSceneBuilder();
       sb.pushOffset(0, 0);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(0, width: 10, height: 10);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(1, width: 10, height: 10);
       sb.pop();
-      rasterizer.draw(sb.build().layerTree);
+      await renderScene(sb.build());
       _expectSceneMatches(<_EmbeddedViewMarker>[
         _overlay,
         _platformView,
         _platformView,
         _overlay,
-      ]);
+      ], reason: 'Overlay created after a group containing a visible view.');
 
       sb = LayerSceneBuilder();
       sb.pushOffset(0, 0);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(0, width: 10, height: 10);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(1, width: 10, height: 10);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(2, width: 10, height: 10);
       sb.pop();
-      rasterizer.draw(sb.build().layerTree);
+      await renderScene(sb.build());
       _expectSceneMatches(<_EmbeddedViewMarker>[
         _overlay,
         _platformView,
         _platformView,
         _overlay,
         _platformView,
-        _overlay,
-      ]);
+      ],
+          reason:
+              'Overlays created after each group containing a visible view.');
 
       sb = LayerSceneBuilder();
       sb.pushOffset(0, 0);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(0, width: 10, height: 10);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(1, width: 10, height: 10);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(2, width: 10, height: 10);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(3, width: 10, height: 10);
       sb.pop();
-      rasterizer.draw(sb.build().layerTree);
+      await renderScene(sb.build());
       _expectSceneMatches(<_EmbeddedViewMarker>[
         _overlay,
         _platformView,
@@ -974,17 +821,22 @@ void testMain() {
         _platformView,
         _platformView,
         _overlay,
-      ]);
+      ], reason: 'Invisible views grouped in with visible views.');
 
       sb = LayerSceneBuilder();
       sb.pushOffset(0, 0);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(0, width: 10, height: 10);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(1, width: 10, height: 10);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(2, width: 10, height: 10);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(3, width: 10, height: 10);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(4, width: 10, height: 10);
       sb.pop();
-      rasterizer.draw(sb.build().layerTree);
+      await renderScene(sb.build());
       _expectSceneMatches(<_EmbeddedViewMarker>[
         _overlay,
         _platformView,
@@ -998,14 +850,20 @@ void testMain() {
 
       sb = LayerSceneBuilder();
       sb.pushOffset(0, 0);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(0, width: 10, height: 10);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(1, width: 10, height: 10);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(2, width: 10, height: 10);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(3, width: 10, height: 10);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(4, width: 10, height: 10);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(5, width: 10, height: 10);
       sb.pop();
-      rasterizer.draw(sb.build().layerTree);
+      await renderScene(sb.build());
       _expectSceneMatches(<_EmbeddedViewMarker>[
         _overlay,
         _platformView,
@@ -1020,15 +878,22 @@ void testMain() {
 
       sb = LayerSceneBuilder();
       sb.pushOffset(0, 0);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(0, width: 10, height: 10);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(1, width: 10, height: 10);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(2, width: 10, height: 10);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(3, width: 10, height: 10);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(4, width: 10, height: 10);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(5, width: 10, height: 10);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(6, width: 10, height: 10);
       sb.pop();
-      rasterizer.draw(sb.build().layerTree);
+      await renderScene(sb.build());
       _expectSceneMatches(<_EmbeddedViewMarker>[
         _overlay,
         _platformView,
@@ -1044,34 +909,44 @@ void testMain() {
 
       sb = LayerSceneBuilder();
       sb.pushOffset(0, 0);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(1, width: 10, height: 10);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(3, width: 10, height: 10);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(4, width: 10, height: 10);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(5, width: 10, height: 10);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(6, width: 10, height: 10);
       sb.pop();
-      rasterizer.draw(sb.build().layerTree);
+      await renderScene(sb.build());
       _expectSceneMatches(<_EmbeddedViewMarker>[
-        _overlay,
         _platformView,
         _platformView,
         _platformView,
         _platformView,
         _platformView,
         _overlay,
-      ]);
+      ],
+          reason:
+              'Many invisible views can be rendered on top of the base overlay.');
 
       sb = LayerSceneBuilder();
       sb.pushOffset(0, 0);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(1, width: 10, height: 10);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(2, width: 10, height: 10);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(3, width: 10, height: 10);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(4, width: 10, height: 10);
       sb.pop();
-      rasterizer.draw(sb.build().layerTree);
+      await renderScene(sb.build());
       _expectSceneMatches(<_EmbeddedViewMarker>[
-        _overlay,
         _platformView,
+        _overlay,
         _platformView,
         _platformView,
         _platformView,
@@ -1080,19 +955,201 @@ void testMain() {
 
       sb = LayerSceneBuilder();
       sb.pushOffset(0, 0);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(4, width: 10, height: 10);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(3, width: 10, height: 10);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(2, width: 10, height: 10);
+      sb.addPicture(ui.Offset.zero, testPicture);
       sb.addPlatformView(1, width: 10, height: 10);
       sb.pop();
-      rasterizer.draw(sb.build().layerTree);
+      await renderScene(sb.build());
+      _expectSceneMatches(<_EmbeddedViewMarker>[
+        _platformView,
+        _platformView,
+        _overlay,
+        _platformView,
+        _platformView,
+        _overlay,
+      ]);
+    });
+
+    test('can dispose without crashing', () async {
+      ui_web.platformViewRegistry.registerViewFactory(
+          'test-view',
+          (int viewId) =>
+              createDomHTMLDivElement()..className = 'platform-view',
+          isVisible: false);
+
+      await createPlatformView(0, 'test-view');
+      await createPlatformView(1, 'test-view');
+      await createPlatformView(2, 'test-view');
+
+      final LayerSceneBuilder sb = LayerSceneBuilder()
+        ..pushOffset(0, 0)
+        ..addPlatformView(0, width: 10, height: 10)
+        ..addPlatformView(1, width: 10, height: 10)
+        ..addPlatformView(2, width: 10, height: 10)
+        ..pop();
+
+      await renderScene(sb.build());
+
+      _expectSceneMatches(<_EmbeddedViewMarker>[
+        _platformView,
+        _platformView,
+        _platformView,
+      ]);
+
+      expect(() {
+        final HtmlViewEmbedder embedder = (renderer as CanvasKitRenderer)
+            .debugGetRasterizerForView(implicitView)!
+            .viewEmbedder;
+        // The following line used to cause a "Concurrent modification during iteration"
+        embedder.dispose();
+      }, returnsNormally);
+    });
+
+    test('optimizes overlays when pictures and platform views do not overlap',
+        () async {
+      ui_web.platformViewRegistry.registerViewFactory(
+        'test-view',
+        (int viewId) => createDomHTMLDivElement()..className = 'platform-view',
+      );
+
+      CkPicture rectPicture(ui.Rect rect) {
+        return paintPicture(rect, (CkCanvas canvas) {
+          canvas.drawRect(
+              rect, CkPaint()..color = const ui.Color.fromARGB(255, 255, 0, 0));
+        });
+      }
+
+      await createPlatformView(0, 'test-view');
+      await createPlatformView(1, 'test-view');
+      await createPlatformView(2, 'test-view');
+
+      expect(PlatformViewManager.instance.isVisible(0), isTrue);
+      expect(PlatformViewManager.instance.isVisible(1), isTrue);
+      expect(PlatformViewManager.instance.isVisible(2), isTrue);
+
+      // Scene 1: Pictures just overlap with the most recently painted platform
+      // view. Analogous to third-party images with subtitles overlaid. Should
+      // only need one overlay at the end of the scene.
+      final LayerSceneBuilder sb1 = LayerSceneBuilder();
+      sb1.pushOffset(0, 0);
+      sb1.addPlatformView(0,
+          offset: const ui.Offset(10, 10), width: 50, height: 50);
+      sb1.addPicture(
+          ui.Offset.zero, rectPicture(const ui.Rect.fromLTWH(12, 12, 10, 10)));
+      sb1.addPlatformView(1,
+          offset: const ui.Offset(70, 10), width: 50, height: 50);
+      sb1.addPicture(
+          ui.Offset.zero, rectPicture(const ui.Rect.fromLTWH(72, 12, 10, 10)));
+      sb1.addPlatformView(2,
+          offset: const ui.Offset(130, 10), width: 50, height: 50);
+      sb1.addPicture(
+          ui.Offset.zero, rectPicture(const ui.Rect.fromLTWH(132, 12, 10, 10)));
+      final LayerScene scene1 = sb1.build();
+      await renderScene(scene1);
+      _expectSceneMatches(<_EmbeddedViewMarker>[
+        _platformView,
+        _platformView,
+        _platformView,
+        _overlay,
+      ]);
+
+      // Scene 2: Same as scene 1 but with a background painted first. Should only
+      // need a canvas for the background and one more for the rest of the
+      // pictures.
+      final LayerSceneBuilder sb2 = LayerSceneBuilder();
+      sb2.pushOffset(0, 0);
+      sb2.addPicture(
+          ui.Offset.zero, rectPicture(const ui.Rect.fromLTWH(0, 0, 300, 300)));
+      sb2.addPlatformView(0,
+          offset: const ui.Offset(10, 10), width: 50, height: 50);
+      sb2.addPicture(
+          ui.Offset.zero, rectPicture(const ui.Rect.fromLTWH(12, 12, 10, 10)));
+      sb2.addPlatformView(1,
+          offset: const ui.Offset(70, 10), width: 50, height: 50);
+      sb2.addPicture(
+          ui.Offset.zero, rectPicture(const ui.Rect.fromLTWH(72, 12, 10, 10)));
+      sb2.addPlatformView(2,
+          offset: const ui.Offset(130, 10), width: 50, height: 50);
+      sb2.addPicture(
+          ui.Offset.zero, rectPicture(const ui.Rect.fromLTWH(132, 12, 10, 10)));
+      final LayerScene scene2 = sb2.build();
+      await renderScene(scene2);
       _expectSceneMatches(<_EmbeddedViewMarker>[
         _overlay,
         _platformView,
         _platformView,
         _platformView,
+        _overlay,
+      ]);
+
+      // Scene 3: Paints a full-screen picture between each platform view. This
+      // is the worst case scenario. There should be an overlay between each
+      // platform view.
+      final LayerSceneBuilder sb3 = LayerSceneBuilder();
+      sb3.pushOffset(0, 0);
+      sb3.addPicture(
+          ui.Offset.zero, rectPicture(const ui.Rect.fromLTWH(0, 0, 300, 300)));
+      sb3.addPlatformView(0,
+          offset: const ui.Offset(10, 10), width: 50, height: 50);
+      sb3.addPicture(
+          ui.Offset.zero, rectPicture(const ui.Rect.fromLTWH(0, 0, 300, 300)));
+      sb3.addPlatformView(1,
+          offset: const ui.Offset(70, 10), width: 50, height: 50);
+      sb3.addPicture(
+          ui.Offset.zero, rectPicture(const ui.Rect.fromLTWH(0, 0, 300, 300)));
+      sb3.addPlatformView(2,
+          offset: const ui.Offset(130, 10), width: 50, height: 50);
+      sb3.addPicture(
+          ui.Offset.zero, rectPicture(const ui.Rect.fromLTWH(0, 0, 300, 300)));
+      final LayerScene scene3 = sb3.build();
+      await renderScene(scene3);
+      _expectSceneMatches(<_EmbeddedViewMarker>[
+        _overlay,
+        _platformView,
+        _overlay,
         _platformView,
         _overlay,
+        _platformView,
+        _overlay,
+      ]);
+    });
+
+    test('optimized overlays correctly with transforms and clips', () async {
+      ui_web.platformViewRegistry.registerViewFactory(
+        'test-view',
+        (int viewId) => createDomHTMLDivElement()..className = 'platform-view',
+      );
+
+      CkPicture rectPicture(ui.Rect rect) {
+        return paintPicture(rect, (CkCanvas canvas) {
+          canvas.drawRect(
+              rect, CkPaint()..color = const ui.Color.fromARGB(255, 255, 0, 0));
+        });
+      }
+
+      await createPlatformView(0, 'test-view');
+
+      expect(PlatformViewManager.instance.isVisible(0), isTrue);
+
+      // Test optimization correctly computes bounds with transforms and clips.
+      final LayerSceneBuilder sb = LayerSceneBuilder();
+      sb.pushOffset(0, 0);
+      final Matrix4 scaleMatrix = Matrix4.identity()..scale(3, 3, 1);
+      sb.pushTransform(scaleMatrix.toFloat64());
+      sb.pushClipRect(const ui.Rect.fromLTWH(10, 10, 10, 10));
+      sb.addPicture(
+          ui.Offset.zero, rectPicture(const ui.Rect.fromLTWH(0, 0, 20, 20)));
+      sb.addPlatformView(0, width: 20, height: 20);
+      final LayerScene scene = sb.build();
+      await renderScene(scene);
+      _expectSceneMatches(<_EmbeddedViewMarker>[
+        _overlay,
+        _platformView,
       ]);
     });
   });
@@ -1108,20 +1165,23 @@ enum _EmbeddedViewMarker {
 _EmbeddedViewMarker get _overlay => _EmbeddedViewMarker.overlay;
 _EmbeddedViewMarker get _platformView => _EmbeddedViewMarker.platformView;
 
-void _expectSceneMatches(List<_EmbeddedViewMarker> markers) {
-  final List<DomElement> sceneElements = flutterViewEmbedder
-      .sceneElement!.children
+const Map<String, _EmbeddedViewMarker> _tagToViewMarker =
+    <String, _EmbeddedViewMarker>{
+  'flt-canvas-container': _EmbeddedViewMarker.overlay,
+  'flt-platform-view-slot': _EmbeddedViewMarker.platformView,
+  'flt-clip': _EmbeddedViewMarker.platformView,
+};
+
+void _expectSceneMatches(
+  List<_EmbeddedViewMarker> expectedMarkers, {
+  String? reason,
+}) {
+  // Convert the scene elements to its corresponding array of _EmbeddedViewMarker
+  final List<_EmbeddedViewMarker> sceneElements = sceneHost.children
       .where((DomElement element) => element.tagName != 'svg')
+      .map((DomElement element) =>
+          _tagToViewMarker[element.tagName.toLowerCase()]!)
       .toList();
-  expect(markers, hasLength(sceneElements.length));
-  for (int i = 0; i < markers.length; i++) {
-    switch (markers[i]) {
-      case _EmbeddedViewMarker.overlay:
-        expect(sceneElements[i].tagName, 'FLT-CANVAS-CONTAINER');
-        break;
-      case _EmbeddedViewMarker.platformView:
-        expect(sceneElements[i].tagName, 'FLT-PLATFORM-VIEW-SLOT');
-        break;
-    }
-  }
+
+  expect(sceneElements, expectedMarkers, reason: reason);
 }
diff --git a/lib/web_ui/test/canvaskit/filter_test.dart b/lib/web_ui/test/canvaskit/filter_test.dart
index 6ab7dac78a95e52413e8850b46c1af15a7fabac9..1548911aa8c23cfa62b07c51659208ab6bb2931e 100644
--- a/lib/web_ui/test/canvaskit/filter_test.dart
+++ b/lib/web_ui/test/canvaskit/filter_test.dart
@@ -38,22 +38,28 @@ void testMain() {
   }
 
   List<CkImageFilter> createImageFilters() {
-    return <CkImageFilter>[
+    final List<CkImageFilter> filters = <CkImageFilter>[
       CkImageFilter.blur(sigmaX: 5, sigmaY: 6, tileMode: ui.TileMode.clamp),
       CkImageFilter.blur(sigmaX: 6, sigmaY: 5, tileMode: ui.TileMode.clamp),
       CkImageFilter.blur(sigmaX: 6, sigmaY: 5, tileMode: ui.TileMode.decal),
       for (final CkColorFilter colorFilter in createColorFilters()) CkImageFilter.color(colorFilter: colorFilter),
     ];
+    filters.add(CkImageFilter.compose(outer: filters[0], inner: filters[1]));
+    filters.add(CkImageFilter.compose(outer: filters[1], inner: filters[3]));
+    return filters;
   }
 
-  setUpCanvasKitTest();
+  setUpCanvasKitTest(withImplicitView: true);
 
   group('ImageFilters', () {
     test('can be constructed', () {
       final CkImageFilter imageFilter = CkImageFilter.blur(sigmaX: 5, sigmaY: 10, tileMode: ui.TileMode.clamp);
       expect(imageFilter, isA<CkImageFilter>());
-      expect(imageFilter.createDefault(), isNotNull);
-      expect(imageFilter.resurrect(), isNotNull);
+      SkImageFilter? skFilter;
+      imageFilter.imageFilter((SkImageFilter value) {
+        skFilter = value;
+      });
+      expect(skFilter, isNotNull);
     });
 
 
@@ -82,11 +88,12 @@ void testMain() {
       final CkPaint paint = CkPaint();
       paint.imageFilter = CkImageFilter.blur(sigmaX: 5, sigmaY: 10, tileMode: ui.TileMode.clamp);
 
-      final ManagedSkiaObject<Object> managedFilter = paint.imageFilter! as ManagedSkiaObject<Object>;
-      final Object skiaFilter = managedFilter.skiaObject;
+      final CkManagedSkImageFilterConvertible managedFilter1 = paint.imageFilter! as CkManagedSkImageFilterConvertible;
 
       paint.imageFilter = CkImageFilter.blur(sigmaX: 5, sigmaY: 10, tileMode: ui.TileMode.clamp);
-      expect((paint.imageFilter! as ManagedSkiaObject<Object>).skiaObject, same(skiaFilter));
+      final CkManagedSkImageFilterConvertible managedFilter2 = paint.imageFilter! as CkManagedSkImageFilterConvertible;
+
+      expect(managedFilter1, same(managedFilter2));
     });
 
     test('does not throw for both sigmaX and sigmaY set to 0', () async {
@@ -152,7 +159,47 @@ void testMain() {
       builder.addPicture(ui.Offset.zero, redCircle1);
       // The drawn red circle should actually be green with the colorFilter.
 
-      await matchSceneGolden('canvaskit_imageFilter_using_colorFilter.png', builder.build(), region: region);
+      await matchSceneGolden(
+          'canvaskit_imageFilter_using_colorFilter.png', builder.build(),
+          region: region);
+    });
+
+    test('using a compose filter', () async {
+      final CkImageFilter blurFilter = CkImageFilter.blur(
+        sigmaX: 5,
+        sigmaY: 5,
+        tileMode: ui.TileMode.clamp,
+      );
+      final CkColorFilter colorFilter = createCkColorFilter(
+          const EngineColorFilter.mode(
+              ui.Color.fromARGB(255, 0, 255, 0), ui.BlendMode.srcIn))!;
+      final CkImageFilter colorImageFilter =
+          CkImageFilter.color(colorFilter: colorFilter);
+      final CkImageFilter composeFilter =
+          CkImageFilter.compose(outer: blurFilter, inner: colorImageFilter);
+
+      const ui.Rect region = ui.Rect.fromLTRB(0, 0, 500, 250);
+
+      final LayerSceneBuilder builder = LayerSceneBuilder();
+      builder.pushOffset(0, 0);
+
+      builder.pushImageFilter(composeFilter);
+
+      final CkPictureRecorder recorder = CkPictureRecorder();
+      final CkCanvas canvas = recorder.beginRecording(region);
+
+      canvas.drawCircle(
+        const ui.Offset(75, 125),
+        50,
+        CkPaint()..color = const ui.Color.fromARGB(255, 255, 0, 0),
+      );
+      final CkPicture redCircle1 = recorder.endRecording();
+      builder.addPicture(ui.Offset.zero, redCircle1);
+      // The drawn red circle should actually be green and blurred.
+
+      await matchSceneGolden(
+          'canvaskit_composeImageFilter.png', builder.build(),
+          region: region);
     });
   });
 
diff --git a/lib/web_ui/test/canvaskit/flutter_tester_emulation_golden_test.dart b/lib/web_ui/test/canvaskit/flutter_tester_emulation_golden_test.dart
index add30b29ca95d4ca4332ebe67577d45705fc81c9..3bc6a5cd3893ee3e06aa263f9776727304e375eb 100644
--- a/lib/web_ui/test/canvaskit/flutter_tester_emulation_golden_test.dart
+++ b/lib/web_ui/test/canvaskit/flutter_tester_emulation_golden_test.dart
@@ -6,6 +6,7 @@ import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
 import 'common.dart';
 
@@ -16,12 +17,12 @@ void main() {
 const ui.Rect kDefaultRegion = ui.Rect.fromLTRB(0, 0, 500, 250);
 
 void testMain() {
-  ui.debugEmulateFlutterTesterEnvironment = true;
+  ui_web.debugEmulateFlutterTesterEnvironment = true;
 
   group('flutter_tester emulation', () {
-    setUpCanvasKitTest();
+    setUpCanvasKitTest(withImplicitView: true);
 
-    test('defaults to Ahem font family',
+    test('defaults to FlutterTest font family',
         () async {
       final CkPictureRecorder recorder = CkPictureRecorder();
       final CkCanvas canvas = recorder.beginRecording(kDefaultRegion);
diff --git a/lib/web_ui/test/canvaskit/font_variation_golden_test.dart b/lib/web_ui/test/canvaskit/font_variation_golden_test.dart
deleted file mode 100644
index 5f582f0be1351f45f2c39139d1acf90f04014f83..0000000000000000000000000000000000000000
--- a/lib/web_ui/test/canvaskit/font_variation_golden_test.dart
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'package:test/bootstrap/browser.dart';
-import 'package:test/test.dart';
-
-import 'package:ui/src/engine.dart';
-import 'package:ui/ui.dart' as ui;
-
-import 'common.dart';
-
-void main() {
-  internalBootstrapBrowserTest(() => testMain);
-}
-
-void testMain() {
-  setUpAll(() async {
-    await ui.webOnlyInitializePlatform();
-  });
-
-  group('font variation', () {
-    test('is correctly rendered', () async {
-      const double testWidth = 300;
-      final CkPictureRecorder recorder = CkPictureRecorder();
-      final CkCanvas canvas = recorder.beginRecording(ui.Rect.largest);
-      final CkParagraphBuilder builder =
-        CkParagraphBuilder(CkParagraphStyle(
-          fontSize: 40.0,
-          textDirection: ui.TextDirection.ltr,
-        ));
-
-      builder.pushStyle(CkTextStyle(
-          fontFamily: 'RobotoVariable',
-      ));
-      builder.addText('Normal\n');
-      builder.pop();
-
-      ui.FontVariation weight(double w) => ui.FontVariation('wght', w);
-      builder.pushStyle(CkTextStyle(
-          fontFamily: 'RobotoVariable',
-          fontVariations: <ui.FontVariation>[weight(900)],
-      ));
-      builder.addText('Heavy\n');
-      builder.pop();
-
-      builder.pushStyle(CkTextStyle(
-          fontFamily: 'RobotoVariable',
-          fontVariations: <ui.FontVariation>[weight(100)],
-      ));
-      builder.addText('Light\n');
-      builder.pop();
-
-      final CkParagraph paragraph = builder.build();
-      paragraph.layout(const ui.ParagraphConstraints(width: testWidth - 20));
-      canvas.drawParagraph(paragraph, const ui.Offset(10, 10));
-      final CkPicture picture = recorder.endRecording();
-      await matchPictureGolden(
-        'font_variation.jpg',
-        picture,
-        region: ui.Rect.fromLTRB(0, 0, testWidth, paragraph.height + 20),
-      );
-    });
-  });
-}
diff --git a/lib/web_ui/test/canvaskit/fragment_program_test.dart b/lib/web_ui/test/canvaskit/fragment_program_test.dart
index e4afafd6cb9e6085815234f84984cfd58813bd13..6395ae0924f0be989fc2ffe50a82ba8af325c6e4 100644
--- a/lib/web_ui/test/canvaskit/fragment_program_test.dart
+++ b/lib/web_ui/test/canvaskit/fragment_program_test.dart
@@ -11,6 +11,8 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
 
+import '../common/test_initialization.dart';
+
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
@@ -19,194 +21,344 @@ void main() {
 /// simplify the build.
 const String kJsonIPLR = r'''
 {
-  "sksl": "// This SkSL shader is autogenerated by spirv-cross.\n\nfloat4 flutter_FragCoord;\n\nuniform vec4 u_color;\nuniform float u_alpha;\nuniform vec4 u_sparkle_color;\nuniform float u_sparkle_alpha;\nuniform float u_blur;\nuniform vec2 u_center;\nuniform float u_radius_scale;\nuniform float u_max_radius;\nuniform vec2 u_resolution_scale;\nuniform vec2 u_noise_scale;\nuniform float u_noise_phase;\nuniform vec2 u_circle1;\nuniform vec2 u_circle2;\nuniform vec2 u_circle3;\nuniform vec2 u_rotation1;\nuniform vec2 u_rotation2;\nuniform vec2 u_rotation3;\n\nvec4 fragColor;\n\nmat2 FLT_flutter_local_rotate2d(vec2 rad)\n{\n    return mat2(vec2(rad.x, -rad.y), vec2(rad.y, rad.x));\n}\n\nfloat FLT_flutter_local_soft_circle(vec2 uv, vec2 xy, float radius, float blur)\n{\n    float blur_half = blur * 0.5;\n    float d = distance(uv, xy);\n    return 1.0 - smoothstep(1.0 - blur_half, 1.0 + blur_half, d / radius);\n}\n\nfloat FLT_flutter_local_circle_grid(vec2 resolution, inout vec2 p, vec2 xy, vec2 rotation, float cell_diameter)\n{\n    vec2 param = rotation;\n    p = (FLT_flutter_local_rotate2d(param) * (xy - p)) + xy;\n    p = mod(p, vec2(cell_diameter)) / resolution;\n    float cell_uv = (cell_diameter / resolution.y) * 0.5;\n    float r = 0.64999997615814208984375 * cell_uv;\n    vec2 param_1 = p;\n    vec2 param_2 = vec2(cell_uv);\n    float param_3 = r;\n    float param_4 = r * 50.0;\n    return FLT_flutter_local_soft_circle(param_1, param_2, param_3, param_4);\n}\n\nfloat FLT_flutter_local_turbulence(vec2 uv)\n{\n    vec2 uv_scale = uv * vec2(0.800000011920928955078125);\n    vec2 param = vec2(0.800000011920928955078125);\n    vec2 param_1 = uv_scale;\n    vec2 param_2 = u_circle1;\n    vec2 param_3 = u_rotation1;\n    float param_4 = 0.17000000178813934326171875;\n    float _290 = FLT_flutter_local_circle_grid(param, param_1, param_2, param_3, param_4);\n    float g1 = _290;\n    vec2 param_5 = vec2(0.800000011920928955078125);\n    vec2 param_6 = uv_scale;\n    vec2 param_7 = u_circle2;\n    vec2 param_8 = u_rotation2;\n    float param_9 = 0.20000000298023223876953125;\n    float _302 = FLT_flutter_local_circle_grid(param_5, param_6, param_7, param_8, param_9);\n    float g2 = _302;\n    vec2 param_10 = vec2(0.800000011920928955078125);\n    vec2 param_11 = uv_scale;\n    vec2 param_12 = u_circle3;\n    vec2 param_13 = u_rotation3;\n    float param_14 = 0.2750000059604644775390625;\n    float _315 = FLT_flutter_local_circle_grid(param_10, param_11, param_12, param_13, param_14);\n    float g3 = _315;\n    float v = (((g1 * g1) + g2) - g3) * 0.5;\n    return clamp(0.449999988079071044921875 + (0.800000011920928955078125 * v), 0.0, 1.0);\n}\n\nfloat FLT_flutter_local_soft_ring(vec2 uv, vec2 xy, float radius, float thickness, float blur)\n{\n    vec2 param = uv;\n    vec2 param_1 = xy;\n    float param_2 = radius + thickness;\n    float param_3 = blur;\n    float circle_outer = FLT_flutter_local_soft_circle(param, param_1, param_2, param_3);\n    vec2 param_4 = uv;\n    vec2 param_5 = xy;\n    float param_6 = max(radius - thickness, 0.0);\n    float param_7 = blur;\n    float circle_inner = FLT_flutter_local_soft_circle(param_4, param_5, param_6, param_7);\n    return clamp(circle_outer - circle_inner, 0.0, 1.0);\n}\n\nfloat FLT_flutter_local_triangle_noise(inout vec2 n)\n{\n    n = fract(n * vec2(5.398700237274169921875, 5.442100048065185546875));\n    n += vec2(dot(n.yx, n + vec2(21.5351009368896484375, 14.3136997222900390625)));\n    float xy = n.x * n.y;\n    return (fract(xy * 95.43070220947265625) + fract(xy * 75.0496063232421875)) - 1.0;\n}\n\nfloat FLT_flutter_local_threshold(float v, float l, float h)\n{\n    return step(l, v) * (1.0 - step(h, v));\n}\n\nfloat FLT_flutter_local_sparkle(vec2 uv, float t)\n{\n    vec2 param = uv;\n    float _213 = FLT_flutter_local_triangle_noise(param);\n    float n = _213;\n    float param_1 = n;\n    float param_2 = 0.0;\n    float param_3 = 0.0500000007450580596923828125;\n    float s = FLT_flutter_local_threshold(param_1, param_2, param_3);\n    float param_4 = n + sin(3.1415927410125732421875 * (t + 0.3499999940395355224609375));\n    float param_5 = 0.100000001490116119384765625;\n    float param_6 = 0.1500000059604644775390625;\n    s += FLT_flutter_local_threshold(param_4, param_5, param_6);\n    float param_7 = n + sin(3.1415927410125732421875 * (t + 0.699999988079071044921875));\n    float param_8 = 0.20000000298023223876953125;\n    float param_9 = 0.25;\n    s += FLT_flutter_local_threshold(param_7, param_8, param_9);\n    float param_10 = n + sin(3.1415927410125732421875 * (t + 1.0499999523162841796875));\n    float param_11 = 0.300000011920928955078125;\n    float param_12 = 0.3499999940395355224609375;\n    s += FLT_flutter_local_threshold(param_10, param_11, param_12);\n    return clamp(s, 0.0, 1.0) * 0.550000011920928955078125;\n}\n\nvoid FLT_main()\n{\n    vec2 p = flutter_FragCoord.xy;\n    vec2 uv_1 = p * u_resolution_scale;\n    vec2 density_uv = uv_1 - mod(p, u_noise_scale);\n    float radius = u_max_radius * u_radius_scale;\n    vec2 param_13 = uv_1;\n    float turbulence = FLT_flutter_local_turbulence(param_13);\n    vec2 param_14 = p;\n    vec2 param_15 = u_center;\n    float param_16 = radius;\n    float param_17 = 0.0500000007450580596923828125 * u_max_radius;\n    float param_18 = u_blur;\n    float ring = FLT_flutter_local_soft_ring(param_14, param_15, param_16, param_17, param_18);\n    vec2 param_19 = density_uv;\n    float param_20 = u_noise_phase;\n    float sparkle = ((FLT_flutter_local_sparkle(param_19, param_20) * ring) * turbulence) * u_sparkle_alpha;\n    vec2 param_21 = p;\n    vec2 param_22 = u_center;\n    float param_23 = radius;\n    float param_24 = u_blur;\n    float wave_alpha = (FLT_flutter_local_soft_circle(param_21, param_22, param_23, param_24) * u_alpha) * u_color.w;\n    vec4 wave_color = vec4(u_color.xyz * wave_alpha, wave_alpha);\n    vec4 sparkle_color = vec4(u_sparkle_color.xyz * u_sparkle_color.w, u_sparkle_color.w);\n    fragColor = mix(wave_color, sparkle_color, vec4(sparkle));\n}\n\nhalf4 main(float2 iFragCoord)\n{\n      flutter_FragCoord = float4(iFragCoord, 0, 0);\n      FLT_main();\n      return fragColor;\n}\n",
-  "stage": 1,
-  "target_platform": 0,
-  "uniforms": [
-    {
-      "array_elements": 0,
-      "bit_width": 32,
-      "columns": 1,
-      "location": 11,
-      "name": "u_circle1",
-      "rows": 2,
-      "type": 10
-    },
-    {
-      "array_elements": 0,
-      "bit_width": 32,
-      "columns": 1,
-      "location": 14,
-      "name": "u_rotation1",
-      "rows": 2,
-      "type": 10
-    },
-    {
-      "array_elements": 0,
-      "bit_width": 32,
-      "columns": 1,
-      "location": 12,
-      "name": "u_circle2",
-      "rows": 2,
-      "type": 10
-    },
-    {
-      "array_elements": 0,
-      "bit_width": 32,
-      "columns": 1,
-      "location": 15,
-      "name": "u_rotation2",
-      "rows": 2,
-      "type": 10
-    },
-    {
-      "array_elements": 0,
-      "bit_width": 32,
-      "columns": 1,
-      "location": 13,
-      "name": "u_circle3",
-      "rows": 2,
-      "type": 10
-    },
-    {
-      "array_elements": 0,
-      "bit_width": 32,
-      "columns": 1,
-      "location": 16,
-      "name": "u_rotation3",
-      "rows": 2,
-      "type": 10
-    },
-    {
-      "array_elements": 0,
-      "bit_width": 32,
-      "columns": 1,
-      "location": 8,
-      "name": "u_resolution_scale",
-      "rows": 2,
-      "type": 10
-    },
-    {
-      "array_elements": 0,
-      "bit_width": 32,
-      "columns": 1,
-      "location": 9,
-      "name": "u_noise_scale",
-      "rows": 2,
-      "type": 10
-    },
-    {
-      "array_elements": 0,
-      "bit_width": 32,
-      "columns": 1,
-      "location": 7,
-      "name": "u_max_radius",
-      "rows": 1,
-      "type": 10
-    },
-    {
-      "array_elements": 0,
-      "bit_width": 32,
-      "columns": 1,
-      "location": 6,
-      "name": "u_radius_scale",
-      "rows": 1,
-      "type": 10
-    },
-    {
-      "array_elements": 0,
-      "bit_width": 32,
-      "columns": 1,
-      "location": 5,
-      "name": "u_center",
-      "rows": 2,
-      "type": 10
-    },
-    {
-      "array_elements": 0,
-      "bit_width": 32,
-      "columns": 1,
-      "location": 4,
-      "name": "u_blur",
-      "rows": 1,
-      "type": 10
-    },
-    {
-      "array_elements": 0,
-      "bit_width": 32,
-      "columns": 1,
-      "location": 10,
-      "name": "u_noise_phase",
-      "rows": 1,
-      "type": 10
-    },
-    {
-      "array_elements": 0,
-      "bit_width": 32,
-      "columns": 1,
-      "location": 3,
-      "name": "u_sparkle_alpha",
-      "rows": 1,
-      "type": 10
-    },
-    {
-      "array_elements": 0,
-      "bit_width": 32,
-      "columns": 1,
-      "location": 1,
-      "name": "u_alpha",
-      "rows": 1,
-      "type": 10
-    },
-    {
-      "array_elements": 0,
-      "bit_width": 32,
-      "columns": 1,
-      "location": 0,
-      "name": "u_color",
-      "rows": 4,
-      "type": 10
-    },
-    {
-      "array_elements": 0,
-      "bit_width": 32,
-      "columns": 1,
-      "location": 2,
-      "name": "u_sparkle_color",
-      "rows": 4,
-      "type": 10
-    }
-  ]
+  "sksl": {
+    "entrypoint": "ink_sparkle_fragment_main",
+    "shader": "// This SkSL shader is autogenerated by spirv-cross.\n\nfloat4 flutter_FragCoord;\n\nuniform vec4 u_color;\nuniform float u_alpha;\nuniform vec4 u_sparkle_color;\nuniform float u_sparkle_alpha;\nuniform float u_blur;\nuniform vec2 u_center;\nuniform float u_radius_scale;\nuniform float u_max_radius;\nuniform vec2 u_resolution_scale;\nuniform vec2 u_noise_scale;\nuniform float u_noise_phase;\nuniform vec2 u_circle1;\nuniform vec2 u_circle2;\nuniform vec2 u_circle3;\nuniform vec2 u_rotation1;\nuniform vec2 u_rotation2;\nuniform vec2 u_rotation3;\n\nvec4 fragColor;\n\nmat2 FLT_flutter_local_rotate2d(vec2 rad)\n{\n    return mat2(vec2(rad.x, -rad.y), vec2(rad.y, rad.x));\n}\n\nfloat FLT_flutter_local_soft_circle(vec2 uv, vec2 xy, float radius, float blur)\n{\n    float blur_half = blur * 0.5;\n    float d = distance(uv, xy);\n    return 1.0 - smoothstep(1.0 - blur_half, 1.0 + blur_half, d / radius);\n}\n\nfloat FLT_flutter_local_circle_grid(vec2 resolution, inout vec2 p, vec2 xy, vec2 rotation, float cell_diameter)\n{\n    vec2 param = rotation;\n    p = (FLT_flutter_local_rotate2d(param) * (xy - p)) + xy;\n    p = mod(p, vec2(cell_diameter)) / resolution;\n    float cell_uv = (cell_diameter / resolution.y) * 0.5;\n    float r = 0.64999997615814208984375 * cell_uv;\n    vec2 param_1 = p;\n    vec2 param_2 = vec2(cell_uv);\n    float param_3 = r;\n    float param_4 = r * 50.0;\n    return FLT_flutter_local_soft_circle(param_1, param_2, param_3, param_4);\n}\n\nfloat FLT_flutter_local_turbulence(vec2 uv)\n{\n    vec2 uv_scale = uv * vec2(0.800000011920928955078125);\n    vec2 param = vec2(0.800000011920928955078125);\n    vec2 param_1 = uv_scale;\n    vec2 param_2 = u_circle1;\n    vec2 param_3 = u_rotation1;\n    float param_4 = 0.17000000178813934326171875;\n    float _290 = FLT_flutter_local_circle_grid(param, param_1, param_2, param_3, param_4);\n    float g1 = _290;\n    vec2 param_5 = vec2(0.800000011920928955078125);\n    vec2 param_6 = uv_scale;\n    vec2 param_7 = u_circle2;\n    vec2 param_8 = u_rotation2;\n    float param_9 = 0.20000000298023223876953125;\n    float _302 = FLT_flutter_local_circle_grid(param_5, param_6, param_7, param_8, param_9);\n    float g2 = _302;\n    vec2 param_10 = vec2(0.800000011920928955078125);\n    vec2 param_11 = uv_scale;\n    vec2 param_12 = u_circle3;\n    vec2 param_13 = u_rotation3;\n    float param_14 = 0.2750000059604644775390625;\n    float _315 = FLT_flutter_local_circle_grid(param_10, param_11, param_12, param_13, param_14);\n    float g3 = _315;\n    float v = (((g1 * g1) + g2) - g3) * 0.5;\n    return clamp(0.449999988079071044921875 + (0.800000011920928955078125 * v), 0.0, 1.0);\n}\n\nfloat FLT_flutter_local_soft_ring(vec2 uv, vec2 xy, float radius, float thickness, float blur)\n{\n    vec2 param = uv;\n    vec2 param_1 = xy;\n    float param_2 = radius + thickness;\n    float param_3 = blur;\n    float circle_outer = FLT_flutter_local_soft_circle(param, param_1, param_2, param_3);\n    vec2 param_4 = uv;\n    vec2 param_5 = xy;\n    float param_6 = max(radius - thickness, 0.0);\n    float param_7 = blur;\n    float circle_inner = FLT_flutter_local_soft_circle(param_4, param_5, param_6, param_7);\n    return clamp(circle_outer - circle_inner, 0.0, 1.0);\n}\n\nfloat FLT_flutter_local_triangle_noise(inout vec2 n)\n{\n    n = fract(n * vec2(5.398700237274169921875, 5.442100048065185546875));\n    n += vec2(dot(n.yx, n + vec2(21.5351009368896484375, 14.3136997222900390625)));\n    float xy = n.x * n.y;\n    return (fract(xy * 95.43070220947265625) + fract(xy * 75.0496063232421875)) - 1.0;\n}\n\nfloat FLT_flutter_local_threshold(float v, float l, float h)\n{\n    return step(l, v) * (1.0 - step(h, v));\n}\n\nfloat FLT_flutter_local_sparkle(vec2 uv, float t)\n{\n    vec2 param = uv;\n    float _213 = FLT_flutter_local_triangle_noise(param);\n    float n = _213;\n    float param_1 = n;\n    float param_2 = 0.0;\n    float param_3 = 0.0500000007450580596923828125;\n    float s = FLT_flutter_local_threshold(param_1, param_2, param_3);\n    float param_4 = n + sin(3.1415927410125732421875 * (t + 0.3499999940395355224609375));\n    float param_5 = 0.100000001490116119384765625;\n    float param_6 = 0.1500000059604644775390625;\n    s += FLT_flutter_local_threshold(param_4, param_5, param_6);\n    float param_7 = n + sin(3.1415927410125732421875 * (t + 0.699999988079071044921875));\n    float param_8 = 0.20000000298023223876953125;\n    float param_9 = 0.25;\n    s += FLT_flutter_local_threshold(param_7, param_8, param_9);\n    float param_10 = n + sin(3.1415927410125732421875 * (t + 1.0499999523162841796875));\n    float param_11 = 0.300000011920928955078125;\n    float param_12 = 0.3499999940395355224609375;\n    s += FLT_flutter_local_threshold(param_10, param_11, param_12);\n    return clamp(s, 0.0, 1.0) * 0.550000011920928955078125;\n}\n\nvoid FLT_main()\n{\n    vec2 p = flutter_FragCoord.xy;\n    vec2 uv_1 = p * u_resolution_scale;\n    vec2 density_uv = uv_1 - mod(p, u_noise_scale);\n    float radius = u_max_radius * u_radius_scale;\n    vec2 param_13 = uv_1;\n    float turbulence = FLT_flutter_local_turbulence(param_13);\n    vec2 param_14 = p;\n    vec2 param_15 = u_center;\n    float param_16 = radius;\n    float param_17 = 0.0500000007450580596923828125 * u_max_radius;\n    float param_18 = u_blur;\n    float ring = FLT_flutter_local_soft_ring(param_14, param_15, param_16, param_17, param_18);\n    vec2 param_19 = density_uv;\n    float param_20 = u_noise_phase;\n    float sparkle = ((FLT_flutter_local_sparkle(param_19, param_20) * ring) * turbulence) * u_sparkle_alpha;\n    vec2 param_21 = p;\n    vec2 param_22 = u_center;\n    float param_23 = radius;\n    float param_24 = u_blur;\n    float wave_alpha = (FLT_flutter_local_soft_circle(param_21, param_22, param_23, param_24) * u_alpha) * u_color.w;\n    vec4 wave_color = vec4(u_color.xyz * wave_alpha, wave_alpha);\n    vec4 sparkle_color = vec4(u_sparkle_color.xyz * u_sparkle_color.w, u_sparkle_color.w);\n    fragColor = mix(wave_color, sparkle_color, vec4(sparkle));\n}\n\nhalf4 main(float2 iFragCoord)\n{\n      flutter_FragCoord = float4(iFragCoord, 0, 0);\n      FLT_main();\n      return fragColor;\n}\n",
+    "stage": 1,
+    "uniforms": [
+      {
+        "array_elements": 0,
+        "bit_width": 32,
+        "columns": 1,
+        "location": 11,
+        "name": "u_circle1",
+        "rows": 2,
+        "type": 10
+      },
+      {
+        "array_elements": 0,
+        "bit_width": 32,
+        "columns": 1,
+        "location": 14,
+        "name": "u_rotation1",
+        "rows": 2,
+        "type": 10
+      },
+      {
+        "array_elements": 0,
+        "bit_width": 32,
+        "columns": 1,
+        "location": 12,
+        "name": "u_circle2",
+        "rows": 2,
+        "type": 10
+      },
+      {
+        "array_elements": 0,
+        "bit_width": 32,
+        "columns": 1,
+        "location": 15,
+        "name": "u_rotation2",
+        "rows": 2,
+        "type": 10
+      },
+      {
+        "array_elements": 0,
+        "bit_width": 32,
+        "columns": 1,
+        "location": 13,
+        "name": "u_circle3",
+        "rows": 2,
+        "type": 10
+      },
+      {
+        "array_elements": 0,
+        "bit_width": 32,
+        "columns": 1,
+        "location": 16,
+        "name": "u_rotation3",
+        "rows": 2,
+        "type": 10
+      },
+      {
+        "array_elements": 0,
+        "bit_width": 32,
+        "columns": 1,
+        "location": 8,
+        "name": "u_resolution_scale",
+        "rows": 2,
+        "type": 10
+      },
+      {
+        "array_elements": 0,
+        "bit_width": 32,
+        "columns": 1,
+        "location": 9,
+        "name": "u_noise_scale",
+        "rows": 2,
+        "type": 10
+      },
+      {
+        "array_elements": 0,
+        "bit_width": 32,
+        "columns": 1,
+        "location": 7,
+        "name": "u_max_radius",
+        "rows": 1,
+        "type": 10
+      },
+      {
+        "array_elements": 0,
+        "bit_width": 32,
+        "columns": 1,
+        "location": 6,
+        "name": "u_radius_scale",
+        "rows": 1,
+        "type": 10
+      },
+      {
+        "array_elements": 0,
+        "bit_width": 32,
+        "columns": 1,
+        "location": 5,
+        "name": "u_center",
+        "rows": 2,
+        "type": 10
+      },
+      {
+        "array_elements": 0,
+        "bit_width": 32,
+        "columns": 1,
+        "location": 4,
+        "name": "u_blur",
+        "rows": 1,
+        "type": 10
+      },
+      {
+        "array_elements": 0,
+        "bit_width": 32,
+        "columns": 1,
+        "location": 10,
+        "name": "u_noise_phase",
+        "rows": 1,
+        "type": 10
+      },
+      {
+        "array_elements": 0,
+        "bit_width": 32,
+        "columns": 1,
+        "location": 3,
+        "name": "u_sparkle_alpha",
+        "rows": 1,
+        "type": 10
+      },
+      {
+        "array_elements": 0,
+        "bit_width": 32,
+        "columns": 1,
+        "location": 1,
+        "name": "u_alpha",
+        "rows": 1,
+        "type": 10
+      },
+      {
+        "array_elements": 0,
+        "bit_width": 32,
+        "columns": 1,
+        "location": 0,
+        "name": "u_color",
+        "rows": 4,
+        "type": 10
+      },
+      {
+        "array_elements": 0,
+        "bit_width": 32,
+        "columns": 1,
+        "location": 2,
+        "name": "u_sparkle_color",
+        "rows": 4,
+        "type": 10
+      }
+    ]
+  }
+}
+''';
+
+/// Geenrated by impellerc from
+/// ```
+/// #include <flutter/runtime_effect.glsl>
+/// uniform vec2 uSize;
+/// uniform float[10] uFloats;
+/// uniform float uLoneFloat;
+/// uniform vec2[3] uVectors;
+/// uniform vec3 uLoneVector;
+/// uniform mat4[2] uMatrices;
+/// uniform mat4 uLoneMatrix;
+/// ...
+/// ```
+const String kJsonArrayIPLR = r'''
+{
+  "sksl": {
+    "entrypoint": "array_shader_fragment_main",
+    "shader": "// This SkSL shader is autogenerated by spirv-cross.\n\nfloat4 flutter_FragCoord;\n\nuniform vec2 uSize;\nuniform float uFloats[10];\nuniform float uLoneFloat;\nuniform vec2 uVectors[3];\nuniform vec3 uLoneVector;\nuniform mat4 uMatrices[2];\nuniform mat4 uLoneMatrix;\n\nvec4 fragColor;\n\nvec2 FLT_flutter_local_FlutterFragCoord()\n{\n    return flutter_FragCoord.xy;\n}\n\nvoid FLT_main()\n{\n    vec2 pos = FLT_flutter_local_FlutterFragCoord();\n    vec2 uv = pos / uSize;\n    float barWidth = 0.100000001490116119384765625;\n    float barIndex = floor(uv.x / barWidth);\n    for (int i = 0; i < 10; i++)\n    {\n        if (i == int(barIndex))\n        {\n            float barHeight = uFloats[i];\n            if (uv.y > (1.0 - barHeight))\n            {\n                fragColor = vec4(0.3300000131130218505859375, 0.0900000035762786865234375, 0.0900000035762786865234375, 1.0);\n            }\n            else\n            {\n                fragColor = vec4(1.0);\n            }\n        }\n    }\n}\n\nhalf4 main(float2 iFragCoord)\n{\n      flutter_FragCoord = float4(iFragCoord, 0, 0);\n      FLT_main();\n      return fragColor;\n}\n",
+    "stage": 1,
+    "uniforms": [
+      {
+        "array_elements": 0,
+        "bit_width": 32,
+        "columns": 1,
+        "location": 0,
+        "name": "uSize",
+        "rows": 2,
+        "type": 10
+      },
+      {
+        "array_elements": 10,
+        "bit_width": 32,
+        "columns": 1,
+        "location": 1,
+        "name": "uFloats",
+        "rows": 1,
+        "type": 10
+      },
+      {
+        "array_elements": 0,
+        "bit_width": 32,
+        "columns": 1,
+        "location": 11,
+        "name": "uLoneFloat",
+        "rows": 1,
+        "type": 10
+      },
+      {
+        "array_elements": 3,
+        "bit_width": 32,
+        "columns": 1,
+        "location": 12,
+        "name": "uVectors",
+        "rows": 2,
+        "type": 10
+      },
+      {
+        "array_elements": 0,
+        "bit_width": 32,
+        "columns": 1,
+        "location": 15,
+        "name": "uLoneVector",
+        "rows": 3,
+        "type": 10
+      },
+      {
+        "array_elements": 2,
+        "bit_width": 32,
+        "columns": 4,
+        "location": 16,
+        "name": "uMatrices",
+        "rows": 4,
+        "type": 10
+      },
+      {
+        "array_elements": 0,
+        "bit_width": 32,
+        "columns": 4,
+        "location": 18,
+        "name": "uLoneMatrix",
+        "rows": 4,
+        "type": 10
+      }
+    ]
+  }
 }
 ''';
 
 void testMain() {
   setUpAll(() async {
-    await ui.webOnlyInitializePlatform();
+    await bootstrapAndRunApp();
   });
 
-  test('FragmentProgram can be created from JSON IPLR bundle', () async {
-    final Uint8List data = utf8.encode(kJsonIPLR) as Uint8List;
-    final CkFragmentProgram program = await CkFragmentProgram.fromBytes('test', data);
+  test('FragmentProgram can be created from JSON IPLR bundle', () {
+    final Uint8List data = utf8.encode(kJsonIPLR);
+    final CkFragmentProgram program = CkFragmentProgram.fromBytes('test', data);
 
     expect(program.effect, isNotNull);
-    expect(program.floatCount, 17);
+    expect(program.floatCount, 32);
     expect(program.textureCount, 0);
     expect(program.uniforms, hasLength(17));
     expect(program.name, 'test');
 
-    final ui.FragmentShader shader = program.fragmentShader();
+    {
+      final CkFragmentShader shader =
+          program.fragmentShader() as CkFragmentShader;
+
+      shader.setFloat(0, 4);
+      expect(
+        reason: 'SkShaders are created lazily',
+        shader.ref,
+        isNull,
+      );
+
+      final SkShader skShader = shader.getSkShader(ui.FilterQuality.none);
+      final UniqueRef<SkShader> ref = shader.ref!;
+      expect(skShader, same(ref.nativeObject));
+      expect(ref.isDisposed, false);
 
-    shader.setFloat(0, 4);
-    shader.dispose();
+      shader.dispose();
+      expect(ref.isDisposed, true);
+      expect(shader.ref, isNull);
+      expect(shader.debugDisposed, true);
+    }
+
+    {
+      final CkFragmentShader shader =
+          program.fragmentShader() as CkFragmentShader;
+      shader.setFloat(0, 5);
 
-    expect(shader.debugDisposed, true);
+      final SkShader skShader1 = shader.getSkShader(ui.FilterQuality.none);
+      final UniqueRef<SkShader> ref1 = shader.ref!;
 
-    final ui.FragmentShader shader2 = program.fragmentShader();
+      final SkShader skShader2 = shader.getSkShader(ui.FilterQuality.none);
+      final UniqueRef<SkShader> ref2 = shader.ref!;
+      expect(ref1, isNot(same(ref2)));
+      expect(
+        reason:
+            'getSkShader creates a new shader every time. Old references should be disposed of.',
+        ref1.isDisposed,
+        true,
+      );
+      expect(ref2.isDisposed, false);
 
-    shader.setFloat(0, 5);
-    shader2.dispose();
-    expect(shader2.debugDisposed, true);
-  // TODO(hterkelsen): https://github.com/flutter/flutter/issues/115327
-  }, skip: true);
+      expect(
+        reason:
+            'Fragment shaders are mutable, so a new instance is created with every application.',
+        skShader1,
+        isNot(same(skShader2)),
+      );
+
+      shader.dispose();
+      expect(shader.debugDisposed, true);
+      expect(
+        reason:
+            'The last remaining SkShader reference should be disposed of when the FragmentShader itself is disposed of.',
+        ref2.isDisposed,
+        true,
+      );
+    }
+  });
+
+  test(
+      'FragmentProgram can be created from JSON IPLR bundle with arrays and matrices',
+      () {
+    final Uint8List data = utf8.encode(kJsonArrayIPLR);
+    final CkFragmentProgram program = CkFragmentProgram.fromBytes('test', data);
+
+    expect(program.effect, isNotNull);
+    expect(
+      program.floatCount,
+      70,
+      reason: 'Columns, rows and array elements should be accounted for'
+    );
+    expect(program.textureCount, 0);
+    expect(program.uniforms, hasLength(7));
+    expect(program.name, 'test');
+  });
 }
diff --git a/lib/web_ui/test/canvaskit/hot_restart_test.dart b/lib/web_ui/test/canvaskit/hot_restart_test.dart
index b032f532e31b7dfe56df6bd1f68d7f480070639c..3ee6903857c44c85bb4f1782f3ea54e49eade1e0 100644
--- a/lib/web_ui/test/canvaskit/hot_restart_test.dart
+++ b/lib/web_ui/test/canvaskit/hot_restart_test.dart
@@ -12,8 +12,6 @@ void main() {
 
 void testMain() {
   test('CanvasKit reuses the instance already set on `window`', () async {
-    expect(windowFlutterCanvasKit, isNull);
-
     // First initialization should make CanvasKit available through `window`.
     await renderer.initialize();
     expect(windowFlutterCanvasKit, isNotNull);
diff --git a/lib/web_ui/test/canvaskit/image_golden_test.dart b/lib/web_ui/test/canvaskit/image_golden_test.dart
index d611a0fc8c753547916df03ad8442a3d7e0713d5..824eeca9d7c19efcff2aa3e01178b2f99dc337f8 100644
--- a/lib/web_ui/test/canvaskit/image_golden_test.dart
+++ b/lib/web_ui/test/canvaskit/image_golden_test.dart
@@ -5,14 +5,13 @@
 import 'dart:async';
 import 'dart:typed_data';
 
-import 'package:js/js.dart';
 import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
-import 'package:web_engine_tester/golden_tester.dart';
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
-import '../matchers.dart';
+import '../common/matchers.dart';
 import 'common.dart';
 import 'test_data.dart';
 
@@ -22,10 +21,10 @@ void main() {
 
 void testMain() {
   group('CanvasKit Images', () {
-    setUpCanvasKitTest();
+    setUpCanvasKitTest(withImplicitView: true);
 
     tearDown(() {
-      debugRestoreHttpRequestFactory();
+      mockHttpFetchResponseFactory = null;
     });
 
     _testCkAnimatedImage();
@@ -59,16 +58,30 @@ void testMain() {
 
 void _testForImageCodecs({required bool useBrowserImageDecoder}) {
   final String mode = useBrowserImageDecoder ? 'webcodecs' : 'wasm';
+  final List<String> warnings = <String>[];
+  late void Function(String) oldPrintWarning;
 
-  group('($mode})', () {
+  group('($mode)', () {
     setUp(() {
       browserSupportsImageDecoder = useBrowserImageDecoder;
+      warnings.clear();
+    });
+
+    setUpAll(() {
+      oldPrintWarning = printWarning;
+      printWarning = (String warning) {
+        warnings.add(warning);
+      };
     });
 
     tearDown(() {
       debugResetBrowserSupportsImageDecoder();
     });
 
+    tearDownAll(() {
+      printWarning = oldPrintWarning;
+    });
+
     test('CkAnimatedImage can be explicitly disposed of', () {
       final CkAnimatedImage image = CkAnimatedImage.decodeFromBytes(kTransparentImage, 'test');
       expect(image.debugDisposed, isFalse);
@@ -82,12 +95,9 @@ void _testForImageCodecs({required bool useBrowserImageDecoder}) {
 
       // Disallow double-dispose.
       expect(() => image.dispose(), throwsAssertionError);
-      testCollector.collectNow();
     });
 
-    test('CkAnimatedImage remembers last animation position after resurrection', () async {
-      browserSupportsFinalizationRegistry = false;
-
+    test('CkAnimatedImage iterates frames correctly', () async {
       final CkAnimatedImage image = CkAnimatedImage.decodeFromBytes(kAnimatedGif, 'test');
       expect(image.frameCount, 3);
       expect(image.repetitionCount, -1);
@@ -96,16 +106,8 @@ void _testForImageCodecs({required bool useBrowserImageDecoder}) {
       await expectFrameData(frame1, <int>[255, 0, 0, 255]);
       final ui.FrameInfo frame2 = await image.getNextFrame();
       await expectFrameData(frame2, <int>[0, 255, 0, 255]);
-
-      // Pretend that the image is temporarily deleted.
-      image.delete();
-      image.didDelete();
-
-      // Check that we got the 3rd frame after resurrection.
       final ui.FrameInfo frame3 = await image.getNextFrame();
       await expectFrameData(frame3, <int>[0, 0, 255, 255]);
-
-      testCollector.collectNow();
     });
 
     test('CkImage toString', () {
@@ -115,7 +117,6 @@ void _testForImageCodecs({required bool useBrowserImageDecoder}) {
       final CkImage image = CkImage(skImage);
       expect(image.toString(), '[1×1]');
       image.dispose();
-      testCollector.collectNow();
     });
 
     test('CkImage can be explicitly disposed of', () {
@@ -124,14 +125,13 @@ void _testForImageCodecs({required bool useBrowserImageDecoder}) {
               .makeImageAtCurrentFrame();
       final CkImage image = CkImage(skImage);
       expect(image.debugDisposed, isFalse);
-      expect(image.box.isDeletedPermanently, isFalse);
+      expect(image.box.isDisposed, isFalse);
       image.dispose();
       expect(image.debugDisposed, isTrue);
-      expect(image.box.isDeletedPermanently, isTrue);
+      expect(image.box.isDisposed, isTrue);
 
       // Disallow double-dispose.
       expect(() => image.dispose(), throwsAssertionError);
-      testCollector.collectNow();
     });
 
     test('CkImage can be explicitly disposed of when cloned', () async {
@@ -139,7 +139,7 @@ void _testForImageCodecs({required bool useBrowserImageDecoder}) {
           canvasKit.MakeAnimatedImageFromEncoded(kTransparentImage)!
               .makeImageAtCurrentFrame();
       final CkImage image = CkImage(skImage);
-      final SkiaObjectBox<CkImage, SkImage> box = image.box;
+      final CountedRef<CkImage, SkImage> box = image.box;
       expect(box.refCount, 1);
       expect(box.debugGetStackTraces().length, 1);
 
@@ -148,24 +148,20 @@ void _testForImageCodecs({required bool useBrowserImageDecoder}) {
       expect(box.debugGetStackTraces().length, 2);
 
       expect(image.isCloneOf(clone), isTrue);
-      expect(box.isDeletedPermanently, isFalse);
+      expect(box.isDisposed, isFalse);
 
-      testCollector.collectNow();
       expect(skImage.isDeleted(), isFalse);
       image.dispose();
       expect(box.refCount, 1);
-      expect(box.isDeletedPermanently, isFalse);
+      expect(box.isDisposed, isFalse);
 
-      testCollector.collectNow();
       expect(skImage.isDeleted(), isFalse);
       clone.dispose();
       expect(box.refCount, 0);
-      expect(box.isDeletedPermanently, isTrue);
+      expect(box.isDisposed, isTrue);
 
-      testCollector.collectNow();
       expect(skImage.isDeleted(), isTrue);
       expect(box.debugGetStackTraces().length, 0);
-      testCollector.collectNow();
     });
 
     test('CkImage toByteData', () async {
@@ -175,9 +171,61 @@ void _testForImageCodecs({required bool useBrowserImageDecoder}) {
       final CkImage image = CkImage(skImage);
       expect((await image.toByteData()).lengthInBytes, greaterThan(0));
       expect((await image.toByteData(format: ui.ImageByteFormat.png)).lengthInBytes, greaterThan(0));
-      testCollector.collectNow();
     });
 
+    test('toByteData with decodeImageFromPixels on videoFrame formats', () async {
+      // This test ensures that toByteData() returns pixels that can be used by decodeImageFromPixels
+      // for the following videoFrame formats:
+      // [BGRX, I422, I420, I444, BGRA]
+      final HttpFetchResponse listingResponse = await httpFetch('/test_images/');
+      final List<String> testFiles = (await listingResponse.json() as List<dynamic>).cast<String>();
+
+      Future<ui.Image> testDecodeFromPixels(Uint8List pixels, int width, int height) async {
+        final Completer<ui.Image> completer = Completer<ui.Image>();
+        ui.decodeImageFromPixels(
+          pixels,
+          width,
+          height,
+          ui.PixelFormat.rgba8888,
+          (ui.Image image) {
+            completer.complete(image);
+          },
+        );
+        return completer.future;
+      }
+
+      // Sanity-check the test file list. If suddenly test files are moved or
+      // deleted, and the test server returns an empty list, or is missing some
+      // important test files, we want to know.
+      expect(testFiles, isNotEmpty);
+      expect(testFiles, contains(matches(RegExp(r'.*\.jpg'))));
+      expect(testFiles, contains(matches(RegExp(r'.*\.png'))));
+      expect(testFiles, contains(matches(RegExp(r'.*\.gif'))));
+      expect(testFiles, contains(matches(RegExp(r'.*\.webp'))));
+      expect(testFiles, contains(matches(RegExp(r'.*\.bmp'))));
+
+      for (final String testFile in testFiles) {
+        final HttpFetchResponse imageResponse = await httpFetch('/test_images/$testFile');
+        final Uint8List imageData = await imageResponse.asUint8List();
+        final ui.Codec codec = await skiaInstantiateImageCodec(imageData);
+        expect(codec.frameCount, greaterThan(0));
+        expect(codec.repetitionCount, isNotNull);
+
+        final ui.FrameInfo frame = await codec.getNextFrame();
+        final CkImage ckImage = frame.image as CkImage;
+        final ByteData imageBytes = await ckImage.toByteData();
+        expect(imageBytes.lengthInBytes, greaterThan(0));
+
+        final Uint8List pixels = imageBytes.buffer.asUint8List();
+        final ui.Image testImage = await testDecodeFromPixels(pixels, ckImage.width, ckImage.height);
+        expect(testImage, isNotNull);
+        codec.dispose();
+      }
+      // TODO(hterkelsen): Firefox and Safari do not currently support ImageDecoder.
+      // TODO(jacksongardner): enable on wasm
+      // see https://github.com/flutter/flutter/issues/118334
+    }, skip: isFirefox || isSafari || isWasm);
+
     test('CkImage.clone also clones the VideoFrame', () async {
       final CkBrowserImageDecoder image = await CkBrowserImageDecoder.create(
         data: kAnimatedGif,
@@ -196,46 +244,25 @@ void _testForImageCodecs({required bool useBrowserImageDecoder}) {
       // The precise PNG encoding is browser-specific, but we can check the file
       // signature.
       expect(detectContentType(png.buffer.asUint8List()), 'image/png');
-      testCollector.collectNow();
     // TODO(hterkelsen): Firefox and Safari do not currently support ImageDecoder.
     }, skip: isFirefox || isSafari);
 
-    // Regression test for https://github.com/flutter/flutter/issues/72469
-    test('CkImage can be resurrected', () {
-      browserSupportsFinalizationRegistry = false;
-      final SkImage skImage =
-          canvasKit.MakeAnimatedImageFromEncoded(kTransparentImage)!
-              .makeImageAtCurrentFrame();
-      final CkImage image = CkImage(skImage);
-      expect(image.box.rawSkiaObject, isNotNull);
-
-      // Pretend that the image is temporarily deleted.
-      image.box.delete();
-      image.box.didDelete();
-      expect(image.box.rawSkiaObject, isNull);
-
-      // Attempting to access the skia object here would previously throw
-      // "Stack Overflow" in Safari.
-      expect(image.box.skiaObject, isNotNull);
-      testCollector.collectNow();
-    });
-
     test('skiaInstantiateWebImageCodec loads an image from the network',
         () async {
-      final TestHttpRequestMock mock = TestHttpRequestMock()
-          ..status = 200
-          ..response = kTransparentImage.buffer;
-      httpRequestFactory = () => TestHttpRequest(mock);
-      final Future<ui.Codec> futureCodec =
-          skiaInstantiateWebImageCodec('http://image-server.com/picture.jpg',
-              null);
-      mock.sendEvent('load', DomProgressEvent('test progress event'));
-      final ui.Codec codec = await futureCodec;
+      mockHttpFetchResponseFactory = (String url) async {
+        return MockHttpFetchResponse(
+          url: url,
+          status: 200,
+          payload: MockHttpFetchPayload(byteBuffer: kTransparentImage.buffer),
+        );
+      };
+
+      final ui.Codec codec = await skiaInstantiateWebImageCodec(
+          'http://image-server.com/picture.jpg', null);
       expect(codec.frameCount, 1);
       final ui.Image image = (await codec.getNextFrame()).image;
       expect(image.height, 1);
       expect(image.width, 1);
-      testCollector.collectNow();
     });
 
     test('instantiateImageCodec respects target image size',
@@ -260,25 +287,46 @@ void _testForImageCodecs({required bool useBrowserImageDecoder}) {
         );
 
         final ui.Image image = (await codec.getNextFrame()).image;
-        // TODO(yjbanov): https://github.com/flutter/flutter/issues/34075
-        // expect(image.width, targetWidth);
-        // expect(image.height, targetHeight);
+        expect(image.width, targetWidth);
+        expect(image.height, targetHeight);
         image.dispose();
         codec.dispose();
       }
+    });
+
+    test('instantiateImageCodec with multi-frame image does not support targetWidth/targetHeight',
+        () async {
+        final ui.Codec codec = await ui.instantiateImageCodec(
+          kAnimatedGif,
+          targetWidth: 2,
+          targetHeight: 3,
+        );
+        final ui.Image image = (await codec.getNextFrame()).image;
+
+        expect(
+        warnings,
+        containsAllInOrder(
+          <String>[
+            'targetWidth and targetHeight for multi-frame images not supported',
+          ],
+        ),
+      );
 
-      testCollector.collectNow();
+        // expect the re-size did not happen, kAnimatedGif is [1x1]
+        expect(image.width, 1);
+        expect(image.height, 1);
+        image.dispose();
+        codec.dispose();
     });
 
     test('skiaInstantiateWebImageCodec throws exception on request error',
         () async {
-      final TestHttpRequestMock mock = TestHttpRequestMock();
-      httpRequestFactory = () => TestHttpRequest(mock);
+      mockHttpFetchResponseFactory = (String url) async {
+        throw HttpFetchError(url, requestError: 'This is a test request error.');
+      };
+
       try {
-        final Future<ui.Codec> futureCodec = skiaInstantiateWebImageCodec(
-            'url-does-not-matter', null);
-        mock.sendEvent('error', DomProgressEvent('test error'));
-        await futureCodec;
+        await skiaInstantiateWebImageCodec('url-does-not-matter', null);
         fail('Expected to throw');
       } on ImageCodecException catch (exception) {
         expect(
@@ -289,7 +337,6 @@ void _testForImageCodecs({required bool useBrowserImageDecoder}) {
           'https://flutter.dev/docs/development/platform-integration/web-images',
         );
       }
-      testCollector.collectNow();
     });
 
     test('skiaInstantiateWebImageCodec throws exception on HTTP error',
@@ -305,20 +352,20 @@ void _testForImageCodecs({required bool useBrowserImageDecoder}) {
           'Server response code: 404',
         );
       }
-      testCollector.collectNow();
     });
 
     test('skiaInstantiateWebImageCodec includes URL in the error for malformed image',
         () async {
-      final TestHttpRequestMock mock = TestHttpRequestMock()
-          ..status = 200
-          ..response = Uint8List(0).buffer;
-      httpRequestFactory = () => TestHttpRequest(mock);
+      mockHttpFetchResponseFactory = (String url) async {
+        return MockHttpFetchResponse(
+          url: url,
+          status: 200,
+          payload: MockHttpFetchPayload(byteBuffer: Uint8List(0).buffer),
+        );
+      };
+
       try {
-        final Future<ui.Codec> futureCodec = skiaInstantiateWebImageCodec(
-            'http://image-server.com/picture.jpg', null);
-        mock.sendEvent('load', DomProgressEvent('test progress event'));
-        await futureCodec;
+        await skiaInstantiateWebImageCodec('http://image-server.com/picture.jpg', null);
         fail('Expected to throw');
       } on ImageCodecException catch (exception) {
         if (!browserSupportsImageDecoder) {
@@ -336,7 +383,6 @@ void _testForImageCodecs({required bool useBrowserImageDecoder}) {
           );
         }
       }
-      testCollector.collectNow();
     });
 
     test('Reports error when failing to decode empty image data', () async {
@@ -468,8 +514,66 @@ void _testForImageCodecs({required bool useBrowserImageDecoder}) {
       expect(image2.height, 100);
     });
 
+    test('decodeImageFromPixels respects target image size', () async {
+      Future<ui.Image> testDecodeFromPixels(int width, int height, int targetWidth, int targetHeight) async {
+        final Completer<ui.Image> completer = Completer<ui.Image>();
+        ui.decodeImageFromPixels(
+          Uint8List.fromList(List<int>.filled(width * height * 4, 0)),
+          width,
+          height,
+          ui.PixelFormat.rgba8888,
+          (ui.Image image) {
+            completer.complete(image);
+          },
+          targetWidth: targetWidth,
+          targetHeight: targetHeight,
+        );
+        return completer.future;
+      }
+
+      const List<List<int>> targetSizes = <List<int>>[
+        <int>[1, 1],
+        <int>[1, 2],
+        <int>[2, 3],
+        <int>[3, 4],
+        <int>[4, 4],
+        <int>[10, 20],
+      ];
+
+      for (final List<int> targetSize in targetSizes) {
+        final int targetWidth = targetSize[0];
+        final int targetHeight = targetSize[1];
+
+        final ui.Image image = await testDecodeFromPixels(10, 20, targetWidth, targetHeight);
+
+        expect(image.width, targetWidth);
+        expect(image.height, targetHeight);
+        image.dispose();
+      }
+    });
+
+    test('decodeImageFromPixels upscale when allowUpscaling is false', () async {
+      Future<ui.Image> testDecodeFromPixels(int width, int height) async {
+        final Completer<ui.Image> completer = Completer<ui.Image>();
+        ui.decodeImageFromPixels(
+          Uint8List.fromList(List<int>.filled(width * height * 4, 0)),
+          width,
+          height,
+          ui.PixelFormat.rgba8888,
+          (ui.Image image) {
+            completer.complete(image);
+          },
+          targetWidth: 20,
+          targetHeight: 30,
+          allowUpscaling: false
+        );
+        return completer.future;
+      }
+      expect(() async => testDecodeFromPixels(10, 20), throwsAssertionError);
+    });
+
     test('Decode test images', () async {
-      final DomResponse listingResponse = await httpFetch('/test_images/');
+      final HttpFetchResponse listingResponse = await httpFetch('/test_images/');
       final List<String> testFiles = (await listingResponse.json() as List<dynamic>).cast<String>();
 
       // Sanity-check the test file list. If suddenly test files are moved or
@@ -483,8 +587,8 @@ void _testForImageCodecs({required bool useBrowserImageDecoder}) {
       expect(testFiles, contains(matches(RegExp(r'.*\.bmp'))));
 
       for (final String testFile in testFiles) {
-        final DomResponse imageResponse = await httpFetch('/test_images/$testFile');
-        final Uint8List imageData = (await imageResponse.arrayBuffer() as ByteBuffer).asUint8List();
+        final HttpFetchResponse imageResponse = await httpFetch('/test_images/$testFile');
+        final Uint8List imageData = await imageResponse.asUint8List();
         final ui.Codec codec = await skiaInstantiateImageCodec(imageData);
         expect(codec.frameCount, greaterThan(0));
         expect(codec.repetitionCount, isNotNull);
@@ -499,8 +603,8 @@ void _testForImageCodecs({required bool useBrowserImageDecoder}) {
 
     // Reproduces https://skbug.com/12721
     test('decoded image can be read back from picture', () async {
-      final DomResponse imageResponse = await httpFetch('/test_images/mandrill_128.png');
-      final Uint8List imageData = (await imageResponse.arrayBuffer() as ByteBuffer).asUint8List();
+      final HttpFetchResponse imageResponse = await httpFetch('/test_images/mandrill_128.png');
+      final Uint8List imageData = await imageResponse.asUint8List();
       final ui.Codec codec = await skiaInstantiateImageCodec(imageData);
       final ui.FrameInfo frame = await codec.getNextFrame();
       final CkImage image = frame.image as CkImage;
@@ -532,11 +636,9 @@ void _testForImageCodecs({required bool useBrowserImageDecoder}) {
         canvas.drawImage(snapshot, ui.Offset.zero, CkPaint());
         sb.addPicture(ui.Offset.zero, recorder.endRecording());
 
-        CanvasKitRenderer.instance.rasterizer.draw(sb.build().layerTree);
-        await matchGoldenFile(
-          'canvaskit_read_back_decoded_image_$mode.png',
-          region: const ui.Rect.fromLTRB(0, 0, 150, 150),
-        );
+        await matchSceneGolden(
+            'canvaskit_read_back_decoded_image_$mode.png', sb.build(),
+            region: const ui.Rect.fromLTRB(0, 0, 150, 150));
       }
 
       image.dispose();
@@ -549,7 +651,7 @@ void _testForImageCodecs({required bool useBrowserImageDecoder}) {
     //  * https://github.com/flutter/flutter/issues/86809
     //  * https://github.com/flutter/flutter/issues/91881
     test('the same image can be rendered on difference surfaces', () async {
-      ui.platformViewRegistry.registerViewFactory(
+      ui_web.platformViewRegistry.registerViewFactory(
         'test-platform-view',
         (int viewId) => createDomHTMLDivElement()..id = 'view-0',
       );
@@ -582,18 +684,17 @@ void _testForImageCodecs({required bool useBrowserImageDecoder}) {
         canvas.drawParagraph(makeSimpleText('2'), const ui.Offset(2, 2));
         sb.addPicture(ui.Offset.zero, recorder.endRecording());
       }
-      CanvasKitRenderer.instance.rasterizer.draw(sb.build().layerTree);
-      await matchGoldenFile(
-        'canvaskit_cross_gl_context_image_$mode.png',
-        region: const ui.Rect.fromLTRB(0, 0, 100, 100),
-      );
+
+      await matchSceneGolden(
+          'canvaskit_cross_gl_context_image_$mode.png', sb.build(),
+          region: const ui.Rect.fromLTRB(0, 0, 100, 100));
 
       await disposePlatformView(0);
     });
 
     test('toImageSync with texture-backed image', () async {
-      final DomResponse imageResponse = await httpFetch('/test_images/mandrill_128.png');
-      final Uint8List imageData = (await imageResponse.arrayBuffer() as ByteBuffer).asUint8List();
+      final HttpFetchResponse imageResponse = await httpFetch('/test_images/mandrill_128.png');
+      final Uint8List imageData = await imageResponse.asUint8List();
       final ui.Codec codec = await skiaInstantiateImageCodec(imageData);
       final ui.FrameInfo frame = await codec.getNextFrame();
       final CkImage mandrill = frame.image as CkImage;
@@ -626,18 +727,17 @@ void _testForImageCodecs({required bool useBrowserImageDecoder}) {
         canvas.restore();
         sb.addPicture(ui.Offset.zero, recorder.endRecording());
       }
-      CanvasKitRenderer.instance.rasterizer.draw(sb.build().layerTree);
-      await matchGoldenFile(
-        'canvaskit_picture_texture_toimage',
-        region: const ui.Rect.fromLTRB(0, 0, 128, 128),
-      );
+
+      await matchSceneGolden(
+          'canvaskit_picture_texture_toimage.png', sb.build(),
+          region: const ui.Rect.fromLTRB(0, 0, 128, 128));
       mandrill.dispose();
       codec.dispose();
     });
 
     test('decoded image can be read back from picture', () async {
-      final DomResponse imageResponse = await httpFetch('/test_images/mandrill_128.png');
-      final Uint8List imageData = (await imageResponse.arrayBuffer() as ByteBuffer).asUint8List();
+      final HttpFetchResponse imageResponse = await httpFetch('/test_images/mandrill_128.png');
+      final Uint8List imageData = await imageResponse.asUint8List();
       final ui.Codec codec = await skiaInstantiateImageCodec(imageData);
       final ui.FrameInfo frame = await codec.getNextFrame();
       final CkImage image = frame.image as CkImage;
@@ -669,11 +769,9 @@ void _testForImageCodecs({required bool useBrowserImageDecoder}) {
         canvas.drawImage(snapshot, ui.Offset.zero, CkPaint());
         sb.addPicture(ui.Offset.zero, recorder.endRecording());
 
-        CanvasKitRenderer.instance.rasterizer.draw(sb.build().layerTree);
-        await matchGoldenFile(
-          'canvaskit_read_back_decoded_image_$mode.png',
-          region: const ui.Rect.fromLTRB(0, 0, 150, 150),
-        );
+        await matchSceneGolden(
+            'canvaskit_read_back_decoded_image_$mode.png', sb.build(),
+            region: const ui.Rect.fromLTRB(0, 0, 150, 150));
       }
 
       image.dispose();
@@ -686,7 +784,7 @@ void _testForImageCodecs({required bool useBrowserImageDecoder}) {
           Uint8List.fromList(<int>[0xff, 0xd8, 0xff, 0xe2, 0x0c, 0x58, 0x49, 0x43, 0x43, 0x5f])),
         'image/jpeg');
     });
-  });
+  }, timeout: const Timeout.factor(10)); // These tests can take a while. Allow for a longer timeout.
 }
 
 /// Tests specific to WASM codecs bundled with CanvasKit.
@@ -700,7 +798,6 @@ void _testCkAnimatedImage() {
     // The precise PNG encoding is browser-specific, but we can check the file
     // signature.
     expect(detectContentType(png!.buffer.asUint8List()), 'image/png');
-    testCollector.collectNow();
   });
 
   test('CkAnimatedImage toByteData(RGBA)', () async {
@@ -716,7 +813,6 @@ void _testCkAnimatedImage() {
       expect(rgba, isNotNull);
       expect(rgba!.buffer.asUint8List(), expectedColors[i]);
     }
-    testCollector.collectNow();
   });
 }
 
@@ -736,7 +832,6 @@ void _testCkBrowserImageDecoder() {
     // The precise PNG encoding is browser-specific, but we can check the file
     // signature.
     expect(detectContentType(png!.buffer.asUint8List()), 'image/png');
-    testCollector.collectNow();
   });
 
   test('ImageDecoder toByteData(RGBA)', () async {
@@ -755,7 +850,6 @@ void _testCkBrowserImageDecoder() {
       expect(rgba, isNotNull);
       expect(rgba!.buffer.asUint8List(), expectedColors[i]);
     }
-    testCollector.collectNow();
   });
 
   test('ImageDecoder expires after inactivity', () async {
@@ -799,60 +893,10 @@ void _testCkBrowserImageDecoder() {
     final ui.FrameInfo frame3 = await image.getNextFrame();
     await expectFrameData(frame3, <int>[0, 0, 255, 255]);
 
-    testCollector.collectNow();
     debugRestoreWebDecoderExpireDuration();
   });
 }
 
-class TestHttpRequestMock {
-  String responseType = 'invalid';
-  int timeout = 10;
-  bool withCredentials = false;
-  dynamic response;
-  int status = -1;
-  Map<String, DomEventListener> listeners = <String, DomEventListener>{};
-
-  void open(String method, String url, [bool? async]) {}
-  void send() {}
-  void addEventListener(String eventType, DomEventListener listener, [bool?
-      useCapture]) =>
-      listeners[eventType] = listener;
-
-  void sendEvent(String eventType, DomProgressEvent event) =>
-      listeners[eventType]!(event);
-}
-
-@JS()
-@anonymous
-@staticInterop
-class TestHttpRequest implements DomXMLHttpRequest {
-  factory TestHttpRequest(TestHttpRequestMock mock) {
-    return TestHttpRequest._(
-        responseType: mock.responseType,
-        timeout: mock.timeout,
-        withCredentials: mock.withCredentials,
-        response: mock.response,
-        status: mock.status,
-        open: allowInterop((String method, String url, [bool? async]) =>
-            mock.open(method, url, async)),
-        send: allowInterop(() => mock.send()),
-        addEventListener: allowInterop((String eventType, DomEventListener
-                listener, [bool? useCapture]) =>
-            mock.addEventListener(eventType, listener, useCapture)));
-  }
-
-  external factory TestHttpRequest._({
-    String responseType,
-    int timeout,
-    bool withCredentials,
-    dynamic response,
-    int status,
-    void Function(String method, String url, [bool? async]) open,
-    void Function() send,
-    void Function(String eventType, DomEventListener listener) addEventListener
-  });
-}
-
 Future<void> expectFrameData(ui.FrameInfo frame, List<int> data) async {
   final ByteData frameData = (await frame.image.toByteData())!;
   expect(frameData.buffer.asUint8List(), Uint8List.fromList(data));
diff --git a/lib/web_ui/test/canvaskit/image_test.dart b/lib/web_ui/test/canvaskit/image_test.dart
index f3b9fd88e07a9ae6879a9d8d45c70ee12147028e..26ad0f889a42f2f378735a5acbdd5447c79a83cc 100644
--- a/lib/web_ui/test/canvaskit/image_test.dart
+++ b/lib/web_ui/test/canvaskit/image_test.dart
@@ -3,9 +3,11 @@
 // found in the LICENSE file.
 
 import 'dart:async';
+import 'dart:typed_data';
 
 import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
+import 'package:ui/src/engine/canvaskit/image.dart';
 import 'package:ui/ui.dart' as ui;
 
 import 'common.dart';
@@ -64,6 +66,38 @@ void testMain() {
 
     ui.Image.onDispose = null;
   });
+
+  test('fetchImage fetches image in chunks', () async {
+    final List<int> cumulativeBytesLoadedInvocations = <int>[];
+    final List<int> expectedTotalBytesInvocations = <int>[];
+    final Uint8List result = await fetchImage('/long_test_payload?length=100000&chunk=1000', (int cumulativeBytesLoaded, int expectedTotalBytes) {
+      cumulativeBytesLoadedInvocations.add(cumulativeBytesLoaded);
+      expectedTotalBytesInvocations.add(expectedTotalBytes);
+    });
+
+    // Check that image payload was chunked.
+    expect(cumulativeBytesLoadedInvocations, hasLength(greaterThan(1)));
+
+    // Check that reported total byte count is the same across all invocations.
+    for (final int expectedTotalBytes in expectedTotalBytesInvocations) {
+      expect(expectedTotalBytes, 100000);
+    }
+
+    // Check that cumulative byte count grows with each invocation.
+    cumulativeBytesLoadedInvocations.reduce((int previous, int next) {
+      expect(next, greaterThan(previous));
+      return next;
+    });
+
+    // Check that the last cumulative byte count matches the total byte count.
+    expect(cumulativeBytesLoadedInvocations.last, 100000);
+
+    // Check the contents of the returned data.
+    expect(
+      result,
+      List<int>.generate(100000, (int i) => i & 0xFF),
+    );
+  });
 }
 
 Future<ui.Image> _createImage() => _createPicture().toImage(10, 10);
diff --git a/lib/web_ui/test/canvaskit/initialization/does_not_mock_module_exports_test.dart b/lib/web_ui/test/canvaskit/initialization/does_not_mock_module_exports_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..b6676f2af4fcf8861792407f53378f9be6317fe9
--- /dev/null
+++ b/lib/web_ui/test/canvaskit/initialization/does_not_mock_module_exports_test.dart
@@ -0,0 +1,41 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+import 'package:js/js_util.dart' as js_util;
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+
+import '../../common/test_initialization.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+void testMain() {
+  group('initializeEngineServices', () {
+    test('does not mock module loaders', () async {
+      // Initialize CanvasKit...
+      await bootstrapAndRunApp();
+
+      // CanvasKitInit should be defined...
+      expect(
+        js_util.hasProperty(domWindow, 'CanvasKitInit'),
+        isTrue,
+        reason: 'CanvasKitInit should be defined on Window',
+      );
+
+      // window.exports and window.module should be undefined!
+      expect(
+        js_util.hasProperty(domWindow, 'exports'),
+        isFalse,
+        reason: '`window.exports` should not be defined.',
+      );
+      expect(
+        js_util.hasProperty(domWindow, 'module'),
+        isFalse,
+        reason: '`window.module` should not be defined.',
+      );
+    });
+  });
+}
diff --git a/lib/web_ui/test/canvaskit/initialization/initialization_services_vs_ui_test.dart b/lib/web_ui/test/canvaskit/initialization/services_vs_ui_test.dart
similarity index 42%
rename from lib/web_ui/test/canvaskit/initialization/initialization_services_vs_ui_test.dart
rename to lib/web_ui/test/canvaskit/initialization/services_vs_ui_test.dart
index 8f6d74cc0946968306a88288f4d88fa4f1898278..709b88aff9a92b94c5514217e41a4c5d6aeacd55 100644
--- a/lib/web_ui/test/canvaskit/initialization/initialization_services_vs_ui_test.dart
+++ b/lib/web_ui/test/canvaskit/initialization/services_vs_ui_test.dart
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:async';
+
 import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
@@ -12,36 +14,57 @@ void main() {
 
 void testMain() {
   test('services are initalized separately from UI', () async {
+    final JsFlutterConfiguration? config = await bootstrapAndExtractConfig();
     expect(scheduleFrameCallback, isNull);
-    expect(windowFlutterCanvasKit, isNull);
 
     expect(findGlassPane(), isNull);
     expect(RawKeyboard.instance, isNull);
-    expect(MouseCursor.instance, isNull);
     expect(KeyboardBinding.instance, isNull);
-    expect(PointerBinding.instance, isNull);
+    expect(EnginePlatformDispatcher.instance.implicitView, isNull);
 
     // After initializing services the UI should remain intact.
-    await initializeEngineServices();
+    await initializeEngineServices(jsConfiguration: config);
     expect(scheduleFrameCallback, isNotNull);
     expect(windowFlutterCanvasKit, isNotNull);
 
     expect(findGlassPane(), isNull);
     expect(RawKeyboard.instance, isNull);
-    expect(MouseCursor.instance, isNull);
     expect(KeyboardBinding.instance, isNull);
-    expect(PointerBinding.instance, isNull);
+    expect(EnginePlatformDispatcher.instance.implicitView, isNull);
 
     // Now UI should be taken over by Flutter.
     await initializeEngineUi();
     expect(findGlassPane(), isNotNull);
     expect(RawKeyboard.instance, isNotNull);
-    expect(MouseCursor.instance, isNotNull);
     expect(KeyboardBinding.instance, isNotNull);
-    expect(PointerBinding.instance, isNotNull);
+    expect(EnginePlatformDispatcher.instance.implicitView, isNotNull);
   });
 }
 
 DomElement? findGlassPane() {
   return domDocument.querySelector('flt-glass-pane');
 }
+
+Future<JsFlutterConfiguration?> bootstrapAndExtractConfig() {
+  // Since this test is explicitly checking each part of the bootstrapping process,
+  // we can't use the standard bootstrapper here. However, we do need the flutter
+  // configuration object that is passed into flutter.js to actually initialize the
+  // engine with, so here we do a little no-op bootstrap that just retrieves the
+  // configuration that is passed into the `initializeEngine` callback.
+  final Completer<JsFlutterConfiguration?> configCompleter = Completer<JsFlutterConfiguration?>();
+  final AppBootstrap bootstrap = AppBootstrap(
+    initializeEngine: ([JsFlutterConfiguration? config]) async => configCompleter.complete(config),
+    runApp: () {}
+  );
+  final FlutterLoader? loader = flutter?.loader;
+  if (loader == null || loader.isAutoStart) {
+    // TODO(jacksongardner): Unit tests under dart2wasm still use the old way which
+    // doesn't invoke flutter.js directly, so we autostart here. Once dart2wasm tests
+    // work with flutter.js, we can remove this code path.
+    bootstrap.autoStart();
+  } else {
+    loader.didCreateEngineInitializer(bootstrap.prepareEngineInitializer());
+  }
+
+  return configCompleter.future;
+}
diff --git a/lib/web_ui/test/canvaskit/initialization/initialization_stores_config_test.dart b/lib/web_ui/test/canvaskit/initialization/stores_config_test.dart
similarity index 48%
rename from lib/web_ui/test/canvaskit/initialization/initialization_stores_config_test.dart
rename to lib/web_ui/test/canvaskit/initialization/stores_config_test.dart
index 317164059be441f5dea60cc92af9f0fbcabba17f..e708471d4ef657df36ba7b32b468790f075a103e 100644
--- a/lib/web_ui/test/canvaskit/initialization/initialization_stores_config_test.dart
+++ b/lib/web_ui/test/canvaskit/initialization/stores_config_test.dart
@@ -14,16 +14,24 @@ void main() {
 void testMain() {
   group('initializeEngineServices', () {
     test('stores user configuration', () async {
-      // dev/test_platform.dart injects a global configuration object. Let's
-      // fetch that, override one of its properties (under test), then delete it
-      // from window (so our configuration asserts don't fire!)
-      final JsFlutterConfiguration config = js_util.getProperty(domWindow, 'flutterConfiguration');
-      js_util.setProperty(config, 'canvasKitMaximumSurfaces', 32);
+      final JsFlutterConfiguration config = JsFlutterConfiguration();
+      // `canvasKitBaseUrl` is required for the test to actually run.
+      js_util.setProperty(config, 'canvasKitBaseUrl', '/canvaskit/');
+      // A property under test, that we'll try to read later.
+      js_util.setProperty(config, 'nonce', 'some_nonce');
+      // A non-existing property to verify our js-interop doesn't crash.
+      js_util.setProperty(config, 'canvasKitMaximumSurfaces', 32.0);
+
+      // Remove window.flutterConfiguration (if it's there)
       js_util.setProperty(domWindow, 'flutterConfiguration', null);
 
+      // TODO(web): Replace the above nullification by the following assertion
+      // when wasm and JS tests initialize their config the same way:
+      // assert(js_util.getProperty<Object?>(domWindow, 'flutterConfiguration') == null);
+
       await initializeEngineServices(jsConfiguration: config);
 
-      expect(configuration.canvasKitMaximumSurfaces, 32);
+      expect(configuration.nonce, 'some_nonce');
     });
   });
 }
diff --git a/lib/web_ui/test/canvaskit/interval_tree_test.dart b/lib/web_ui/test/canvaskit/interval_tree_test.dart
deleted file mode 100644
index 39eb3ff917fd4b8e1469537d74cb78ed1942310d..0000000000000000000000000000000000000000
--- a/lib/web_ui/test/canvaskit/interval_tree_test.dart
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'package:test/bootstrap/browser.dart';
-import 'package:test/test.dart';
-import 'package:ui/src/engine.dart';
-
-void main() {
-  internalBootstrapBrowserTest(() => testMain);
-}
-
-void testMain() {
-  group('$IntervalTree', () {
-    test('is balanced', () {
-      final Map<String, List<CodeunitRange>> ranges = <String, List<CodeunitRange>>{
-        'A': const <CodeunitRange>[CodeunitRange(0, 5), CodeunitRange(6, 10)],
-        'B': const <CodeunitRange>[CodeunitRange(4, 6)],
-      };
-
-      // Should create a balanced 3-node tree with a root with a left and right
-      // child.
-      final IntervalTree<String> tree = IntervalTree<String>.createFromRanges(ranges);
-      final IntervalTreeNode<String> root = tree.root;
-      expect(root.left, isNotNull);
-      expect(root.right, isNotNull);
-      expect(root.left!.left, isNull);
-      expect(root.left!.right, isNull);
-      expect(root.right!.left, isNull);
-      expect(root.right!.right, isNull);
-
-      // Should create a balanced 15-node tree (4 layers deep).
-      final Map<String, List<CodeunitRange>> ranges2 = <String, List<CodeunitRange>>{
-        'A': const <CodeunitRange>[
-          CodeunitRange(1, 1),
-          CodeunitRange(2, 2),
-          CodeunitRange(3, 3),
-          CodeunitRange(4, 4),
-          CodeunitRange(5, 5),
-          CodeunitRange(6, 6),
-          CodeunitRange(7, 7),
-          CodeunitRange(8, 8),
-          CodeunitRange(9, 9),
-          CodeunitRange(10, 10),
-          CodeunitRange(11, 11),
-          CodeunitRange(12, 12),
-          CodeunitRange(13, 13),
-          CodeunitRange(14, 14),
-          CodeunitRange(15, 15),
-        ],
-      };
-
-      // Should create a balanced 3-node tree with a root with a left and right
-      // child.
-      final IntervalTree<String> tree2 = IntervalTree<String>.createFromRanges(ranges2);
-      final IntervalTreeNode<String> root2 = tree2.root;
-
-      expect(root2.left!.left!.left, isNotNull);
-      expect(root2.left!.left!.right, isNotNull);
-      expect(root2.left!.right!.left, isNotNull);
-      expect(root2.left!.right!.right, isNotNull);
-      expect(root2.right!.left!.left, isNotNull);
-      expect(root2.right!.left!.right, isNotNull);
-      expect(root2.right!.right!.left, isNotNull);
-      expect(root2.right!.right!.right, isNotNull);
-    });
-
-    test('finds values whose intervals overlap with a given point', () {
-      final Map<String, List<CodeunitRange>> ranges = <String, List<CodeunitRange>>{
-        'A': const <CodeunitRange>[CodeunitRange(0, 5), CodeunitRange(7, 10)],
-        'B': const <CodeunitRange>[CodeunitRange(4, 6)],
-      };
-      final IntervalTree<String> tree = IntervalTree<String>.createFromRanges(ranges);
-
-      expect(tree.intersections(1), <String>['A']);
-      expect(tree.intersections(4), <String>['A', 'B']);
-      expect(tree.intersections(6), <String>['B']);
-      expect(tree.intersections(7), <String>['A']);
-      expect(tree.intersections(11), <String>[]);
-    });
-  });
-}
diff --git a/lib/web_ui/test/canvaskit/layer_test.dart b/lib/web_ui/test/canvaskit/layer_test.dart
index 4dae7c63addb9d9b1005263772028d5ecf2dc391..180599dc7c79cbbb9f535dbae71c23102eb0cee7 100644
--- a/lib/web_ui/test/canvaskit/layer_test.dart
+++ b/lib/web_ui/test/canvaskit/layer_test.dart
@@ -17,7 +17,7 @@ void main() {
 
 void testMain() {
   group('CanvasKit', () {
-    setUpCanvasKitTest();
+    setUpCanvasKitTest(withImplicitView: true);
 
     // Regression test for https://github.com/flutter/flutter/issues/63715
     test('TransformLayer prerolls correctly', () async {
@@ -32,18 +32,20 @@ void testMain() {
 
       // Intentionally use a perspective transform, which triggered the
       // https://github.com/flutter/flutter/issues/63715 bug.
-      sb.pushTransform(
-          Float64List.fromList(Matrix4.identity().storage
-            ..[15] = 2,
+      sb.pushTransform(Float64List.fromList(
+        Matrix4.identity().storage..[15] = 2,
       ));
 
       sb.addPicture(ui.Offset.zero, picture);
-      final LayerTree layerTree = sb.build().layerTree;
-      CanvasKitRenderer.instance.rasterizer.draw(layerTree);
-      final ClipRectEngineLayer clipRect = layerTree.rootLayer.debugLayers.single as ClipRectEngineLayer;
+      final LayerScene scene = sb.build();
+      final LayerTree layerTree = scene.layerTree;
+      await renderScene(scene);
+      final ClipRectEngineLayer clipRect =
+          layerTree.rootLayer.debugLayers.single as ClipRectEngineLayer;
       expect(clipRect.paintBounds, const ui.Rect.fromLTRB(15, 15, 30, 30));
 
-      final TransformEngineLayer transform = clipRect.debugLayers.single as TransformEngineLayer;
+      final TransformEngineLayer transform =
+          clipRect.debugLayers.single as TransformEngineLayer;
       expect(transform.paintBounds, const ui.Rect.fromLTRB(0, 0, 30, 30));
     });
 
@@ -72,5 +74,60 @@ void testMain() {
         region: kDefaultRegion,
       );
     });
+
+    test('ImageFilter layer applies matrix in preroll', () async {
+      final CkPicture picture = paintPicture(
+          const ui.Rect.fromLTRB(0, 0, 100, 100), (CkCanvas canvas) {
+        canvas.drawRect(const ui.Rect.fromLTRB(0, 0, 100, 100),
+            CkPaint()..style = ui.PaintingStyle.fill);
+      });
+
+      final LayerSceneBuilder sb = LayerSceneBuilder();
+      sb.pushImageFilter(
+        ui.ImageFilter.matrix(
+          (Matrix4.identity()
+                ..scale(0.5, 0.5)
+                ..translate(20))
+              .toFloat64(),
+        ),
+      );
+      sb.addPicture(ui.Offset.zero, picture);
+
+      final LayerScene scene = sb.build();
+      final LayerTree layerTree = scene.layerTree;
+      await renderScene(scene);
+
+      final ImageFilterEngineLayer imageFilterLayer =
+          layerTree.rootLayer.debugLayers.single as ImageFilterEngineLayer;
+      expect(
+          imageFilterLayer.paintBounds, const ui.Rect.fromLTRB(10, 0, 60, 50));
+    });
+
+    test('Opacity layer works correctly with Scene.toImage', () async {
+      // This is a regression test for https://github.com/flutter/flutter/issues/138009
+      final CkPicture picture = paintPicture(
+          const ui.Rect.fromLTRB(0, 0, 100, 100), (CkCanvas canvas) {
+        canvas.drawRect(const ui.Rect.fromLTRB(0, 0, 100, 100),
+            CkPaint()..style = ui.PaintingStyle.fill);
+      });
+
+      final LayerSceneBuilder sb = LayerSceneBuilder();
+      sb.pushTransform(Matrix4.identity().toFloat64());
+      sb.pushOpacity(97, offset: const ui.Offset(20, 20));
+      sb.addPicture(ui.Offset.zero, picture);
+
+      final LayerScene scene = sb.build();
+      final ui.Image testImage = await scene.toImage(200, 200);
+
+      final CkPictureRecorder recorder = CkPictureRecorder();
+      final CkCanvas canvas =
+          recorder.beginRecording(const ui.Rect.fromLTRB(0, 0, 200, 200));
+      canvas.drawImage(testImage as CkImage, ui.Offset.zero, CkPaint());
+      await matchPictureGolden(
+        'canvaskit_scene_toimage_opacity_layer.png',
+        recorder.endRecording(),
+        region: const ui.Rect.fromLTRB(0, 0, 200, 200),
+      );
+    });
   });
 }
diff --git a/lib/web_ui/test/canvaskit/linear_gradient_golden_test.dart b/lib/web_ui/test/canvaskit/linear_gradient_golden_test.dart
index e99564f69eeaeff710c21eeee1aa31cf04006915..af4888b457453c16ee307a62a477df330eeba618 100644
--- a/lib/web_ui/test/canvaskit/linear_gradient_golden_test.dart
+++ b/lib/web_ui/test/canvaskit/linear_gradient_golden_test.dart
@@ -19,7 +19,7 @@ const ui.Rect region = ui.Rect.fromLTRB(0, 0, 500, 250);
 
 void testMain() {
   group('Linear', () {
-    setUpCanvasKitTest();
+    setUpCanvasKitTest(withImplicitView: true);
 
     test('is correctly rendered', () async {
       final CkPictureRecorder recorder = CkPictureRecorder();
diff --git a/lib/web_ui/test/canvaskit/multi_view_test.dart b/lib/web_ui/test/canvaskit/multi_view_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..84dca650681e904f2e5382478c29826ec48768fa
--- /dev/null
+++ b/lib/web_ui/test/canvaskit/multi_view_test.dart
@@ -0,0 +1,103 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui;
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
+
+import '../common/matchers.dart';
+import 'common.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+void testMain() {
+  group('CanvasKit', () {
+    setUpCanvasKitTest(withImplicitView: true);
+
+    late LayerScene scene;
+
+    setUp(() {
+      // Create a scene to use in tests.
+      final CkPicture picture =
+          paintPicture(const ui.Rect.fromLTRB(0, 0, 60, 60), (CkCanvas canvas) {
+        canvas.drawRect(const ui.Rect.fromLTRB(0, 0, 60, 60),
+            CkPaint()..style = ui.PaintingStyle.fill);
+      });
+      final LayerSceneBuilder sb = LayerSceneBuilder();
+      sb.addPicture(ui.Offset.zero, picture);
+      scene = sb.build();
+    });
+
+    test('can render into arbitrary views', () async {
+      await CanvasKitRenderer.instance.renderScene(scene, implicitView);
+
+      final EngineFlutterView anotherView = EngineFlutterView(
+          EnginePlatformDispatcher.instance, createDomElement('another-view'));
+      EnginePlatformDispatcher.instance.viewManager.registerView(anotherView);
+
+      await CanvasKitRenderer.instance.renderScene(scene, anotherView);
+    });
+
+    test('will error if trying to render into an unregistered view', () async {
+      final EngineFlutterView unregisteredView = EngineFlutterView(
+          EnginePlatformDispatcher.instance,
+          createDomElement('unregistered-view'));
+      expect(
+        () => CanvasKitRenderer.instance.renderScene(scene, unregisteredView),
+        throwsAssertionError,
+      );
+    });
+
+    test('will dispose the Rasterizer for a disposed view', () async {
+      final EngineFlutterView view = EngineFlutterView(
+          EnginePlatformDispatcher.instance, createDomElement('multi-view'));
+      EnginePlatformDispatcher.instance.viewManager.registerView(view);
+      expect(
+        CanvasKitRenderer.instance.debugGetRasterizerForView(view),
+        isNotNull,
+      );
+
+      EnginePlatformDispatcher.instance.viewManager
+          .disposeAndUnregisterView(view.viewId);
+      expect(
+        CanvasKitRenderer.instance.debugGetRasterizerForView(view),
+        isNull,
+      );
+    });
+
+    // Issue https://github.com/flutter/flutter/issues/142094
+    test('does not reset platform view factories when disposing a view',
+        () async {
+      expect(PlatformViewManager.instance.knowsViewType('self-test'), isFalse);
+
+      final EngineFlutterView view = EngineFlutterView(
+          EnginePlatformDispatcher.instance, createDomElement('multi-view'));
+      EnginePlatformDispatcher.instance.viewManager.registerView(view);
+      expect(
+        CanvasKitRenderer.instance.debugGetRasterizerForView(view),
+        isNotNull,
+      );
+
+      EnginePlatformDispatcher.instance.viewManager
+          .disposeAndUnregisterView(view.viewId);
+      expect(
+        CanvasKitRenderer.instance.debugGetRasterizerForView(view),
+        isNull,
+      );
+
+      expect(
+          PlatformViewManager.instance.knowsViewType(
+              ui_web.PlatformViewRegistry.defaultVisibleViewType),
+          isTrue);
+      expect(
+          PlatformViewManager.instance.knowsViewType(
+              ui_web.PlatformViewRegistry.defaultInvisibleViewType),
+          isTrue);
+    });
+  });
+}
diff --git a/lib/web_ui/test/canvaskit/native_memory_test.dart b/lib/web_ui/test/canvaskit/native_memory_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..beecd63db179b882c13214c90323926d46e3a5d7
--- /dev/null
+++ b/lib/web_ui/test/canvaskit/native_memory_test.dart
@@ -0,0 +1,298 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:js_interop';
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+
+import 'package:ui/src/engine.dart';
+
+import 'common.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+void testMain() {
+  setUpCanvasKitTest();
+
+  late _MockNativeMemoryFinalizationRegistry mockFinalizationRegistry;
+
+  setUp(() {
+    TestSkDeletableMock.deleteCount = 0;
+    nativeMemoryFinalizationRegistry = mockFinalizationRegistry = _MockNativeMemoryFinalizationRegistry();
+  });
+
+  tearDown(() {
+    nativeMemoryFinalizationRegistry = NativeMemoryFinalizationRegistry();
+  });
+
+  group(UniqueRef, () {
+    test('create-dispose-collect cycle', () {
+      expect(mockFinalizationRegistry.registeredPairs, hasLength(0));
+      final Object owner = Object();
+      final TestSkDeletable nativeObject = TestSkDeletable();
+      final UniqueRef<TestSkDeletable> ref = UniqueRef<TestSkDeletable>(owner, nativeObject, 'TestSkDeletable');
+      expect(ref.isDisposed, isFalse);
+      expect(ref.nativeObject, same(nativeObject));
+      expect(TestSkDeletableMock.deleteCount, 0);
+      expect(mockFinalizationRegistry.registeredPairs, hasLength(1));
+      expect(mockFinalizationRegistry.registeredPairs.single.owner, same(owner));
+      expect(mockFinalizationRegistry.registeredPairs.single.ref, same(ref));
+
+      ref.dispose();
+      expect(TestSkDeletableMock.deleteCount, 1);
+      expect(ref.isDisposed, isTrue);
+      expect(
+        reason: 'Cannot access object that was disposed',
+        () => ref.nativeObject, throwsA(isA<AssertionError>()),
+      );
+      expect(
+        reason: 'Cannot dispose object more than once',
+        () => ref.dispose(), throwsA(isA<AssertionError>()),
+      );
+      expect(TestSkDeletableMock.deleteCount, 1);
+
+      // Simulate a GC
+      mockFinalizationRegistry.registeredPairs.single.ref.collect();
+      expect(
+        reason: 'Manually disposed object should not be deleted again by GC.',
+        TestSkDeletableMock.deleteCount, 1,
+      );
+    });
+
+    test('create-collect cycle', () {
+      expect(mockFinalizationRegistry.registeredPairs, hasLength(0));
+      final Object owner = Object();
+      final TestSkDeletable nativeObject = TestSkDeletable();
+      final UniqueRef<TestSkDeletable> ref = UniqueRef<TestSkDeletable>(owner, nativeObject, 'TestSkDeletable');
+      expect(ref.isDisposed, isFalse);
+      expect(ref.nativeObject, same(nativeObject));
+      expect(TestSkDeletableMock.deleteCount, 0);
+      expect(mockFinalizationRegistry.registeredPairs, hasLength(1));
+
+      ref.collect();
+      expect(TestSkDeletableMock.deleteCount, 1);
+      // There's nothing else to test for any practical gain. UniqueRef.collect
+      // is called when GC decided that the owner is no longer reachable. So
+      // there must not be anything else calling into this object for anything
+      // useful.
+    });
+
+    test('dispose instrumentation', () {
+      Instrumentation.enabled = true;
+      Instrumentation.instance.debugCounters.clear();
+
+      final Object owner = Object();
+      final TestSkDeletable nativeObject = TestSkDeletable();
+
+      expect(Instrumentation.instance.debugCounters, <String, int>{});
+      final UniqueRef<TestSkDeletable> ref = UniqueRef<TestSkDeletable>(owner, nativeObject, 'TestSkDeletable');
+      expect(Instrumentation.instance.debugCounters, <String, int>{
+        'TestSkDeletable Created': 1,
+      });
+      ref.dispose();
+      expect(Instrumentation.instance.debugCounters, <String, int>{
+        'TestSkDeletable Created': 1,
+        'TestSkDeletable Deleted': 1,
+      });
+    });
+
+    test('collect instrumentation', () {
+      Instrumentation.enabled = true;
+      Instrumentation.instance.debugCounters.clear();
+
+      final Object owner = Object();
+      final TestSkDeletable nativeObject = TestSkDeletable();
+
+      expect(Instrumentation.instance.debugCounters, <String, int>{});
+      final UniqueRef<TestSkDeletable> ref = UniqueRef<TestSkDeletable>(owner, nativeObject, 'TestSkDeletable');
+      expect(Instrumentation.instance.debugCounters, <String, int>{
+        'TestSkDeletable Created': 1,
+      });
+      ref.collect();
+      expect(Instrumentation.instance.debugCounters, <String, int>{
+        'TestSkDeletable Created': 1,
+        'TestSkDeletable Leaked': 1,
+        'TestSkDeletable Deleted': 1,
+      });
+    });
+  });
+
+  group(CountedRef, () {
+    test('single owner', () {
+      expect(mockFinalizationRegistry.registeredPairs, hasLength(0));
+      final TestSkDeletable nativeObject = TestSkDeletable();
+      final TestCountedRefOwner owner = TestCountedRefOwner(nativeObject);
+      expect(owner.ref.debugReferrers, hasLength(1));
+      expect(owner.ref.debugReferrers.single, owner);
+      expect(owner.ref.refCount, 1);
+      expect(owner.ref.nativeObject, nativeObject);
+      expect(TestSkDeletableMock.deleteCount, 0);
+      expect(mockFinalizationRegistry.registeredPairs, hasLength(1));
+
+      owner.dispose();
+      expect(owner.ref.debugReferrers, isEmpty);
+      expect(owner.ref.refCount, 0);
+      expect(
+        reason: 'Cannot access object that was disposed',
+        () => owner.ref.nativeObject, throwsA(isA<AssertionError>()),
+      );
+      expect(TestSkDeletableMock.deleteCount, 1);
+
+      expect(
+        reason: 'Cannot dispose object more than once',
+        () => owner.dispose(), throwsA(isA<AssertionError>()),
+      );
+    });
+
+    test('multiple owners', () {
+      expect(mockFinalizationRegistry.registeredPairs, hasLength(0));
+      final TestSkDeletable nativeObject = TestSkDeletable();
+      final TestCountedRefOwner owner1 = TestCountedRefOwner(nativeObject);
+      expect(owner1.ref.debugReferrers, hasLength(1));
+      expect(owner1.ref.debugReferrers.single, owner1);
+      expect(owner1.ref.refCount, 1);
+      expect(owner1.ref.nativeObject, nativeObject);
+      expect(TestSkDeletableMock.deleteCount, 0);
+      expect(mockFinalizationRegistry.registeredPairs, hasLength(1));
+
+      final TestCountedRefOwner owner2 = owner1.clone();
+      expect(owner2.ref, same(owner1.ref));
+      expect(owner2.ref.debugReferrers, hasLength(2));
+      expect(owner2.ref.debugReferrers.first, owner1);
+      expect(owner2.ref.debugReferrers.last, owner2);
+      expect(owner2.ref.refCount, 2);
+      expect(owner2.ref.nativeObject, nativeObject);
+      expect(TestSkDeletableMock.deleteCount, 0);
+      expect(
+        reason: 'Second owner does not add more native object owners. '
+                'The underlying shared UniqueRef is the only one.',
+        mockFinalizationRegistry.registeredPairs, hasLength(1),
+      );
+
+      owner1.dispose();
+      expect(owner2.ref.debugReferrers, hasLength(1));
+      expect(owner2.ref.debugReferrers.single, owner2);
+      expect(owner2.ref.refCount, 1);
+      expect(owner2.ref.nativeObject, nativeObject);
+      expect(TestSkDeletableMock.deleteCount, 0);
+      expect(
+        reason: 'The same owner cannot dispose its CountedRef more than once, even when CountedRef is still alive.',
+        () => owner1.dispose(), throwsA(isA<AssertionError>()),
+      );
+
+      owner2.dispose();
+      expect(owner2.ref.debugReferrers, isEmpty);
+      expect(owner2.ref.refCount, 0);
+      expect(
+        reason: 'Cannot access object that was disposed',
+        () => owner2.ref.nativeObject, throwsA(isA<AssertionError>()),
+      );
+      expect(TestSkDeletableMock.deleteCount, 1);
+
+      expect(
+        reason: 'The same owner cannot dispose its CountedRef more than once.',
+        () => owner2.dispose(), throwsA(isA<AssertionError>()),
+      );
+
+      // Simulate a GC
+      mockFinalizationRegistry.registeredPairs.single.ref.collect();
+      expect(
+        reason: 'Manually disposed object should not be deleted again by GC.',
+        TestSkDeletableMock.deleteCount, 1,
+      );
+    });
+  });
+}
+
+class TestSkDeletableMock {
+  static int deleteCount = 0;
+
+  bool isDeleted() => _isDeleted;
+  bool _isDeleted = false;
+
+  void delete() {
+    expect(_isDeleted, isFalse,
+        reason:
+            'CanvasKit does not allow deleting the same object more than once.');
+    _isDeleted = true;
+    deleteCount++;
+  }
+
+  JsConstructor get constructor => TestJsConstructor(name: 'TestSkDeletable');
+}
+
+@JS()
+@anonymous
+@staticInterop
+class TestSkDeletable implements SkDeletable {
+  factory TestSkDeletable() {
+    final TestSkDeletableMock mock = TestSkDeletableMock();
+    return TestSkDeletable._(
+        isDeleted: () { return mock.isDeleted(); }.toJS,
+        delete: () { return mock.delete(); }.toJS,
+        constructor: mock.constructor);
+  }
+
+  external factory TestSkDeletable._({
+    JSFunction isDeleted,
+    JSFunction delete,
+    JsConstructor constructor});
+}
+
+@JS()
+@anonymous
+@staticInterop
+class TestJsConstructor implements JsConstructor {
+  external factory TestJsConstructor({String name});
+}
+
+class TestCountedRefOwner implements StackTraceDebugger {
+  TestCountedRefOwner(TestSkDeletable nativeObject) {
+    assert(() {
+      _debugStackTrace = StackTrace.current;
+      return true;
+    }());
+    ref = CountedRef<TestCountedRefOwner, TestSkDeletable>(
+        nativeObject, this, 'TestCountedRefOwner');
+  }
+
+  TestCountedRefOwner.cloneOf(this.ref) {
+    assert(() {
+      _debugStackTrace = StackTrace.current;
+      return true;
+    }());
+    ref.ref(this);
+  }
+
+  @override
+  StackTrace get debugStackTrace => _debugStackTrace;
+  late StackTrace _debugStackTrace;
+
+  late final CountedRef<TestCountedRefOwner, TestSkDeletable> ref;
+
+  void dispose() {
+    ref.unref(this);
+  }
+
+  TestCountedRefOwner clone() => TestCountedRefOwner.cloneOf(ref);
+}
+
+class _MockNativeMemoryFinalizationRegistry implements NativeMemoryFinalizationRegistry {
+  final List<_MockPair> registeredPairs = <_MockPair>[];
+
+  @override
+  void register(Object owner, UniqueRef<Object> ref) {
+    registeredPairs.add(_MockPair(owner, ref));
+  }
+}
+
+class _MockPair {
+  _MockPair(this.owner, this.ref);
+
+  Object owner;
+  UniqueRef<Object> ref;
+}
diff --git a/lib/web_ui/test/canvaskit/no_create_image_bitmap_test.dart b/lib/web_ui/test/canvaskit/no_create_image_bitmap_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..a3855e4b0030fcf08d45f2a8d5f3a5e52f2b8248
--- /dev/null
+++ b/lib/web_ui/test/canvaskit/no_create_image_bitmap_test.dart
@@ -0,0 +1,78 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui;
+
+import 'common.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+const ui.Rect region = ui.Rect.fromLTRB(0, 0, 500, 250);
+
+/// Test that we can render even if `createImageBitmap` is not supported.
+void testMain() {
+  group('CanvasKit', () {
+    setUpCanvasKitTest(withImplicitView: true);
+    setUp(() async {
+      EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(1.0);
+    });
+
+    tearDown(() {
+      debugDisableCreateImageBitmapSupport = false;
+      debugIsChrome110OrOlder = null;
+    });
+
+    test('can render without createImageBitmap', () async {
+      debugDisableCreateImageBitmapSupport = true;
+
+      expect(browserSupportsCreateImageBitmap, isFalse);
+
+      final CkPictureRecorder recorder = CkPictureRecorder();
+      final CkCanvas canvas = recorder.beginRecording(region);
+
+      final CkGradientLinear gradient = CkGradientLinear(
+          ui.Offset(region.left + region.width / 4, region.height / 2),
+          ui.Offset(region.right - region.width / 8, region.height / 2),
+          const <ui.Color>[
+            ui.Color(0xFF4285F4),
+            ui.Color(0xFF34A853),
+            ui.Color(0xFFFBBC05),
+            ui.Color(0xFFEA4335),
+            ui.Color(0xFF4285F4),
+          ],
+          const <double>[
+            0.0,
+            0.25,
+            0.5,
+            0.75,
+            1.0,
+          ],
+          ui.TileMode.clamp,
+          null);
+
+      final CkPaint paint = CkPaint()..shader = gradient;
+
+      canvas.drawRect(region, paint);
+
+      await matchPictureGolden(
+        'canvaskit_linear_gradient_no_create_image_bitmap.png',
+        recorder.endRecording(),
+        region: region,
+      );
+    });
+
+    test(
+        'createImageBitmap support is disabled on '
+        'Windows on Chrome version 110 or older', () async {
+      debugIsChrome110OrOlder = true;
+      debugDisableCreateImageBitmapSupport = false;
+
+      expect(browserSupportsCreateImageBitmap, isFalse);
+    });
+  });
+}
diff --git a/lib/web_ui/test/canvaskit/initialization_test.dart b/lib/web_ui/test/canvaskit/painting_test.dart
similarity index 50%
rename from lib/web_ui/test/canvaskit/initialization_test.dart
rename to lib/web_ui/test/canvaskit/painting_test.dart
index 53f3dd34674ec9a43c12fea22d6d9b47724b7533..c2ab64cab621e8151a01eb959806ec2d05c3e7bc 100644
--- a/lib/web_ui/test/canvaskit/initialization_test.dart
+++ b/lib/web_ui/test/canvaskit/painting_test.dart
@@ -4,8 +4,10 @@
 
 import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
+
 import 'package:ui/src/engine.dart';
 
+import '../common/matchers.dart';
 import 'common.dart';
 
 void main() {
@@ -13,14 +15,20 @@ void main() {
 }
 
 void testMain() {
-  group('CanvasKit', () {
+  group('CkPaint', () {
     setUpCanvasKitTest();
 
-    test('populates flt-renderer and flt-build-mode', () {
-      FlutterViewEmbedder();
-      expect(domDocument.body!.getAttribute('flt-renderer'),
-          'canvaskit (requested explicitly)');
-      expect(domDocument.body!.getAttribute('flt-build-mode'), 'debug');
+    test('lifecycle', () {
+      final CkPaint paint = CkPaint();
+      expect(paint.skiaObject, isNotNull);
+      expect(paint.debugRef.isDisposed, isFalse);
+      paint.dispose();
+      expect(paint.debugRef.isDisposed, isTrue);
+      expect(
+        reason: 'Cannot dispose more than once',
+        () => paint.dispose(),
+        throwsA(isAssertionError),
+      );
     });
   });
 }
diff --git a/lib/web_ui/test/canvaskit/path_test.dart b/lib/web_ui/test/canvaskit/path_test.dart
index bad26e4a9e2d86aea6acd852bafd0fb444c0438e..ef884a2df540cdf942f2f48f313f4370e7b7d5b2 100644
--- a/lib/web_ui/test/canvaskit/path_test.dart
+++ b/lib/web_ui/test/canvaskit/path_test.dart
@@ -94,18 +94,7 @@ void testMain() {
       expect(path.getBounds(), testRect);
     });
 
-    test('CkPath resurrection', () {
-      const ui.Rect rect = ui.Rect.fromLTRB(0, 0, 10, 10);
-      final CkPath path = CkPath();
-      path.addRect(rect);
-      path.delete();
-
-      final SkPath resurrectedCopy = path.resurrect();
-      expect(fromSkRect(resurrectedCopy.getBounds()), rect);
-    });
-
-    test('Resurrect CkContourMeasure in the middle of iteration', () {
-      browserSupportsFinalizationRegistry = false;
+    test('CkContourMeasure iteration', () {
       final ui.Path path = ui.Path();
       expect(path, isA<CkPath>());
       path.addRect(const ui.Rect.fromLTRB(0, 0, 10, 10));
@@ -119,19 +108,9 @@ void testMain() {
       expect(iterator.current.contourIndex, 0);
       expect(iterator.moveNext(), isTrue);
       expect(iterator.current.contourIndex, 1);
-
-      // Delete iterator in the middle of iteration
-      iterator.delete();
-      iterator.rawSkiaObject = null;
-
-      // Check that the iterator can continue from the last position.
-      expect(iterator.moveNext(), isTrue);
-      expect(iterator.current.contourIndex, 2);
-      expect(iterator.moveNext(), isFalse);
     });
 
-    test('Resurrect CkContourMeasure', () {
-      browserSupportsFinalizationRegistry = false;
+    test('CkContourMeasure index', () {
       final ui.Path path = ui.Path();
       expect(path, isA<CkPath>());
       path.addRect(const ui.Rect.fromLTRB(0, 0, 10, 10));
@@ -150,20 +129,6 @@ void testMain() {
       final CkContourMeasure measure1 = iterator.current as CkContourMeasure;
       expect(measure1.contourIndex, 1);
       expect(measure1.extractPath(0, 15).getBounds(), const ui.Rect.fromLTRB(20, 20, 30, 25));
-
-      // Delete iterator and the measure in the middle of iteration
-      iterator.delete();
-      iterator.rawSkiaObject = null;
-      measure0.delete();
-      measure0.rawSkiaObject = null;
-      measure1.delete();
-      measure1.rawSkiaObject = null;
-
-      // Check that the measure is still value after resurrection.
-      expect(measure0.contourIndex, 0);
-      expect(measure0.extractPath(0, 15).getBounds(), const ui.Rect.fromLTRB(0, 0, 10, 5));
-      expect(measure1.contourIndex, 1);
-      expect(measure1.extractPath(0, 15).getBounds(), const ui.Rect.fromLTRB(20, 20, 30, 25));
     });
 
     test('Path.from', () {
diff --git a/lib/web_ui/test/canvaskit/picture_test.dart b/lib/web_ui/test/canvaskit/picture_test.dart
index 922581e08429dce98150f0747c5c79e92f3ad893..035ea3ba4c197818b681ee91cdb66ae99e0dbedc 100644
--- a/lib/web_ui/test/canvaskit/picture_test.dart
+++ b/lib/web_ui/test/canvaskit/picture_test.dart
@@ -10,6 +10,7 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
 
+import '../common/matchers.dart';
 import 'common.dart';
 
 void main() {
@@ -20,19 +21,17 @@ void testMain() {
   group('CkPicture', () {
     setUpCanvasKitTest();
 
-    group('in browsers that do not support FinalizationRegistry', () {
+    group('lifecycle', () {
       test('can be disposed of manually', () {
-        browserSupportsFinalizationRegistry = false;
-
         final ui.PictureRecorder recorder = ui.PictureRecorder();
         final ui.Canvas canvas = ui.Canvas(recorder);
         canvas.drawPaint(ui.Paint());
         final CkPicture picture = recorder.endRecording() as CkPicture;
-        expect(picture.rawSkiaObject, isNotNull);
+        expect(picture.skiaObject, isNotNull);
         expect(picture.debugDisposed, isFalse);
         picture.debugCheckNotDisposed('Test.'); // must not throw
         picture.dispose();
-        expect(picture.rawSkiaObject, isNull);
+        expect(() => picture.skiaObject, throwsA(isAssertionError));
         expect(picture.debugDisposed, isTrue);
 
         StateError? actualError;
@@ -45,44 +44,11 @@ void testMain() {
         expect(actualError, isNotNull);
 
         // TODO(yjbanov): cannot test precise message due to https://github.com/flutter/flutter/issues/96298
-        expect('$actualError', allOf(
-          startsWith(
-            'Bad state: Test.\n'
-            'The picture has been disposed. '
-            'When the picture was disposed the stack trace was:\n'
-          ),
-          contains('StackTrace_current'),
-        ));
-
-        // Emulate SkiaObjectCache deleting the picture
-        picture.delete();
-        picture.didDelete();
-        expect(picture.rawSkiaObject, isNull);
-
-        // A Picture that's been disposed of can no longer be resurrected
-        expect(() => picture.resurrect(), throwsStateError);
-        expect(() => picture.toImage(10, 10), throwsStateError);
-        expect(() => picture.dispose(), throwsStateError);
-      });
-
-      test('can be deleted by SkiaObjectCache', () {
-        browserSupportsFinalizationRegistry = false;
-
-        final ui.PictureRecorder recorder = ui.PictureRecorder();
-        final ui.Canvas canvas = ui.Canvas(recorder);
-        canvas.drawPaint(ui.Paint());
-        final CkPicture picture = recorder.endRecording() as CkPicture;
-        expect(picture.rawSkiaObject, isNotNull);
-
-        // Emulate SkiaObjectCache deleting the picture
-        picture.delete();
-        picture.didDelete();
-        expect(picture.rawSkiaObject, isNull);
-
-        // Deletion is softer than disposal. An object may still be resurrected
-        // if it was deleted prematurely.
-        expect(picture.debugDisposed, isFalse);
-        expect(picture.resurrect(), isNotNull);
+        expect(
+            '$actualError',
+            startsWith('Bad state: Test.\n'
+                'The picture has been disposed. '
+                'When the picture was disposed the stack trace was:\n'));
       });
     });
 
@@ -102,6 +68,76 @@ void testMain() {
       expect(data!.lengthInBytes, 10 * 15 * 4);
       expect(data.buffer.asUint32List().first, color.value);
     });
-  // TODO(hterkelsen): https://github.com/flutter/flutter/issues/60040
+
+    test('cullRect bounds are tight', () async {
+      const ui.Color red = ui.Color.fromRGBO(255, 0, 0, 1);
+      const ui.Color green = ui.Color.fromRGBO(0, 255, 0, 1);
+      const ui.Color blue = ui.Color.fromRGBO(0, 0, 255, 1);
+
+      final ui.PictureRecorder recorder = ui.PictureRecorder();
+      final ui.Canvas canvas = ui.Canvas(recorder);
+      canvas.drawRRect(
+        ui.RRect.fromRectXY(const ui.Rect.fromLTRB(20, 20, 150, 300), 15, 15),
+        ui.Paint()..color = red,
+      );
+      canvas.drawCircle(
+        const ui.Offset(200, 200),
+        100,
+        ui.Paint()..color = green,
+      );
+      canvas.drawOval(
+        const ui.Rect.fromLTRB(210, 40, 268, 199),
+        ui.Paint()..color = blue,
+      );
+
+      final CkPicture picture = recorder.endRecording() as CkPicture;
+      final ui.Rect bounds = picture.cullRect;
+      // Top left bounded by the red rrect, right bounded by right edge
+      // of red rrect, bottom bounded by bottom of green circle.
+      expect(bounds, equals(const ui.Rect.fromLTRB(20, 20, 300, 300)));
+    });
+
+    test('cullRect bounds with infinite size draw', () async {
+      const ui.Color red = ui.Color.fromRGBO(255, 0, 0, 1);
+
+      final ui.PictureRecorder recorder = ui.PictureRecorder();
+      final ui.Canvas canvas = ui.Canvas(recorder);
+      canvas.drawColor(red, ui.BlendMode.src);
+
+      final CkPicture picture = recorder.endRecording() as CkPicture;
+      final ui.Rect bounds = picture.cullRect;
+      // Since the drawColor command fills the entire canvas, the computed
+      // bounds default to the cullRect that is passed in when the
+      // PictureRecorder is created, ie ui.Rect.largest.
+      expect(bounds, equals(ui.Rect.largest));
+    });
+
+    test('approximateBytesUsed', () async {
+      const ui.Color red = ui.Color.fromRGBO(255, 0, 0, 1);
+      const ui.Color green = ui.Color.fromRGBO(0, 255, 0, 1);
+      const ui.Color blue = ui.Color.fromRGBO(0, 0, 255, 1);
+
+      final ui.PictureRecorder recorder = ui.PictureRecorder();
+      final ui.Canvas canvas = ui.Canvas(recorder);
+      canvas.drawRRect(
+        ui.RRect.fromRectXY(const ui.Rect.fromLTRB(20, 20, 150, 300), 15, 15),
+        ui.Paint()..color = red,
+      );
+      canvas.drawCircle(
+        const ui.Offset(200, 200),
+        100,
+        ui.Paint()..color = green,
+      );
+      canvas.drawOval(
+        const ui.Rect.fromLTRB(210, 40, 268, 199),
+        ui.Paint()..color = blue,
+      );
+
+      final CkPicture picture = recorder.endRecording() as CkPicture;
+      final int bytesUsed = picture.approximateBytesUsed;
+      // Sanity check: the picture should use more than 20 bytes of memory.
+      expect(bytesUsed, greaterThan(20));
+    });
+    // TODO(hterkelsen): https://github.com/flutter/flutter/issues/60040
   }, skip: isIosSafari);
 }
diff --git a/lib/web_ui/test/canvaskit/render_canvas_test.dart b/lib/web_ui/test/canvaskit/render_canvas_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..f5a174e7c9a69735ae8ae3da0e9b904a817f82e2
--- /dev/null
+++ b/lib/web_ui/test/canvaskit/render_canvas_test.dart
@@ -0,0 +1,63 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+import 'dart:js_interop';
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+
+import 'common.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+void testMain() {
+  group('CanvasKit', () {
+    setUpCanvasKitTest();
+    setUp(() async {
+      EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(1.0);
+    });
+
+    Future<DomImageBitmap> newBitmap(int width, int height) async {
+      return createImageBitmap(
+          createBlankDomImageData(width, height) as JSAny, (
+        x: 0,
+        y: 0,
+        width: width,
+        height: height,
+      ));
+    }
+
+    // Regression test for https://github.com/flutter/flutter/issues/75286
+    test('updates canvas logical size when device-pixel ratio changes',
+        () async {
+      final RenderCanvas canvas = RenderCanvas();
+      canvas.render(await newBitmap(10, 16));
+
+      expect(canvas.canvasElement.width, 10);
+      expect(canvas.canvasElement.height, 16);
+      expect(canvas.canvasElement.style.width, '10px');
+      expect(canvas.canvasElement.style.height, '16px');
+
+      // Increase device-pixel ratio: this makes CSS pixels bigger, so we need
+      // fewer of them to cover the browser window.
+      EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(2.0);
+      canvas.render(await newBitmap(10, 16));
+      expect(canvas.canvasElement.width, 10);
+      expect(canvas.canvasElement.height, 16);
+      expect(canvas.canvasElement.style.width, '5px');
+      expect(canvas.canvasElement.style.height, '8px');
+
+      // Decrease device-pixel ratio: this makes CSS pixels smaller, so we need
+      // more of them to cover the browser window.
+      EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(0.5);
+      canvas.render(await newBitmap(10, 16));
+      expect(canvas.canvasElement.width, 10);
+      expect(canvas.canvasElement.height, 16);
+      expect(canvas.canvasElement.style.width, '20px');
+      expect(canvas.canvasElement.style.height, '32px');
+    });
+  });
+}
diff --git a/lib/web_ui/test/canvaskit/renderer_test.dart b/lib/web_ui/test/canvaskit/renderer_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..6dc626462461c03acef4a963fcdaa4f9b29e9b20
--- /dev/null
+++ b/lib/web_ui/test/canvaskit/renderer_test.dart
@@ -0,0 +1,176 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui;
+
+import 'common.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+class TestRasterizer extends Rasterizer {
+  Map<EngineFlutterView, TestViewRasterizer> viewRasterizers =
+      <EngineFlutterView, TestViewRasterizer>{};
+
+  @override
+  TestViewRasterizer createViewRasterizer(EngineFlutterView view) {
+    return viewRasterizers.putIfAbsent(view, () => TestViewRasterizer(view));
+  }
+
+  @override
+  void dispose() {
+    // Do nothing
+  }
+
+  @override
+  void setResourceCacheMaxBytes(int bytes) {
+    // Do nothing
+  }
+
+  List<LayerTree> treesRenderedInView(EngineFlutterView view) {
+    return viewRasterizers[view]!.treesRendered;
+  }
+}
+
+class TestViewRasterizer extends ViewRasterizer {
+  TestViewRasterizer(super.view);
+
+  List<LayerTree> treesRendered = <LayerTree>[];
+
+  @override
+  DisplayCanvasFactory<DisplayCanvas> get displayFactory =>
+      throw UnimplementedError();
+
+  @override
+  void prepareToDraw() {
+    // Do nothing
+  }
+
+  @override
+  Future<void> draw(LayerTree tree) async {
+    treesRendered.add(tree);
+    return Future<void>.value();
+  }
+
+  @override
+  Future<void> rasterizeToCanvas(
+      DisplayCanvas canvas, List<CkPicture> pictures) {
+    // No-op
+    return Future<void>.value();
+  }
+}
+
+void testMain() {
+  group('Renderer', () {
+    setUpCanvasKitTest();
+
+    test('always renders most recent picture and skips intermediate pictures',
+        () async {
+      final TestRasterizer testRasterizer = TestRasterizer();
+      CanvasKitRenderer.instance.debugOverrideRasterizer(testRasterizer);
+
+      // Create another view to render into to force the renderer to make
+      // a [ViewRasterizer] for it.
+      final EngineFlutterView testView = EngineFlutterView(
+          EnginePlatformDispatcher.instance, createDomElement('test-view'));
+      EnginePlatformDispatcher.instance.viewManager.registerView(testView);
+
+      final List<LayerTree> treesToRender = <LayerTree>[];
+      final List<Future<void>> renderFutures = <Future<void>>[];
+      for (int i = 1; i < 20; i++) {
+        final ui.PictureRecorder recorder = ui.PictureRecorder();
+        final ui.Canvas canvas = ui.Canvas(recorder);
+        canvas.drawRect(const ui.Rect.fromLTWH(0, 0, 50, 50),
+            ui.Paint()..color = const ui.Color(0xff00ff00));
+        final ui.Picture picture = recorder.endRecording();
+        final ui.SceneBuilder builder = ui.SceneBuilder();
+        builder.addPicture(ui.Offset.zero, picture);
+        final ui.Scene scene = builder.build();
+        treesToRender.add((scene as LayerScene).layerTree);
+        renderFutures
+            .add(CanvasKitRenderer.instance.renderScene(scene, testView));
+      }
+      await Future.wait(renderFutures);
+
+      // Should just render the first and last pictures and skip the one inbetween.
+      final List<LayerTree> treesRendered =
+          testRasterizer.treesRenderedInView(testView);
+      expect(treesRendered.length, 2);
+      expect(treesRendered.first, treesToRender.first);
+      expect(treesRendered.last, treesToRender.last);
+    });
+
+    test('can render multiple frames at once into multiple views', () async {
+      final TestRasterizer testRasterizer = TestRasterizer();
+      CanvasKitRenderer.instance.debugOverrideRasterizer(testRasterizer);
+
+      // Create another view to render into to force the renderer to make
+      // a [ViewRasterizer] for it.
+      final EngineFlutterView testView1 = EngineFlutterView(
+          EnginePlatformDispatcher.instance, createDomElement('test-view'));
+      EnginePlatformDispatcher.instance.viewManager.registerView(testView1);
+      final EngineFlutterView testView2 = EngineFlutterView(
+          EnginePlatformDispatcher.instance, createDomElement('test-view'));
+      EnginePlatformDispatcher.instance.viewManager.registerView(testView2);
+      final EngineFlutterView testView3 = EngineFlutterView(
+          EnginePlatformDispatcher.instance, createDomElement('test-view'));
+      EnginePlatformDispatcher.instance.viewManager.registerView(testView3);
+
+      final Map<EngineFlutterView, List<LayerTree>> treesToRender =
+          <EngineFlutterView, List<LayerTree>>{};
+      treesToRender[testView1] = <LayerTree>[];
+      treesToRender[testView2] = <LayerTree>[];
+      treesToRender[testView3] = <LayerTree>[];
+      final List<Future<void>> renderFutures = <Future<void>>[];
+
+      for (int i = 1; i < 20; i++) {
+        for (final EngineFlutterView testView in <EngineFlutterView>[
+          testView1,
+          testView2,
+          testView3,
+        ]) {
+          final ui.PictureRecorder recorder = ui.PictureRecorder();
+          final ui.Canvas canvas = ui.Canvas(recorder);
+          canvas.drawRect(const ui.Rect.fromLTWH(0, 0, 50, 50),
+              ui.Paint()..color = const ui.Color(0xff00ff00));
+          final ui.Picture picture = recorder.endRecording();
+          final ui.SceneBuilder builder = ui.SceneBuilder();
+          builder.addPicture(ui.Offset.zero, picture);
+          final ui.Scene scene = builder.build();
+          treesToRender[testView]!.add((scene as LayerScene).layerTree);
+          renderFutures
+              .add(CanvasKitRenderer.instance.renderScene(scene, testView));
+        }
+      }
+      await Future.wait(renderFutures);
+
+      // Should just render the first and last pictures and skip the one inbetween.
+      final List<LayerTree> treesRenderedInView1 =
+          testRasterizer.treesRenderedInView(testView1);
+      final List<LayerTree> treesToRenderInView1 = treesToRender[testView1]!;
+      expect(treesRenderedInView1.length, 2);
+      expect(treesRenderedInView1.first, treesToRenderInView1.first);
+      expect(treesRenderedInView1.last, treesToRenderInView1.last);
+
+      final List<LayerTree> treesRenderedInView2 =
+          testRasterizer.treesRenderedInView(testView2);
+      final List<LayerTree> treesToRenderInView2 = treesToRender[testView2]!;
+      expect(treesRenderedInView2.length, 2);
+      expect(treesRenderedInView2.first, treesToRenderInView2.first);
+      expect(treesRenderedInView2.last, treesToRenderInView2.last);
+
+      final List<LayerTree> treesRenderedInView3 =
+          testRasterizer.treesRenderedInView(testView3);
+      final List<LayerTree> treesToRenderInView3 = treesToRender[testView3]!;
+      expect(treesRenderedInView3.length, 2);
+      expect(treesRenderedInView3.first, treesToRenderInView3.first);
+      expect(treesRenderedInView3.last, treesToRenderInView3.last);
+    });
+  });
+}
diff --git a/lib/web_ui/test/canvaskit/scene_test.dart b/lib/web_ui/test/canvaskit/scene_test.dart
index 9395c067bb3d7fdbbde4ca2b73194c6aab0258a3..9526636fbad3c017f1dc5b48c4c8284b51acaefe 100644
--- a/lib/web_ui/test/canvaskit/scene_test.dart
+++ b/lib/web_ui/test/canvaskit/scene_test.dart
@@ -8,6 +8,8 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
 
+import '../common/test_initialization.dart';
+
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
@@ -15,7 +17,7 @@ void main() {
 void testMain() {
   group('$LayerScene', () {
     setUpAll(() async {
-      await ui.webOnlyInitializePlatform();
+      await bootstrapAndRunApp();
     });
 
     test('toImage returns an image', () async {
diff --git a/lib/web_ui/test/canvaskit/semantics_test.dart b/lib/web_ui/test/canvaskit/semantics_test.dart
index 7df21aeeaac191a0682d16302e3dd168a3fc2d8e..ce4b8598de419054b97cca4385b834f2c038aa7c 100644
--- a/lib/web_ui/test/canvaskit/semantics_test.dart
+++ b/lib/web_ui/test/canvaskit/semantics_test.dart
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 @TestOn('chrome || safari || firefox')
+library;
 
 import 'dart:async';
 
@@ -21,7 +22,7 @@ void main() {
 // semantics.
 Future<void> testMain() async {
   group('CanvasKit semantics', () {
-    setUpCanvasKitTest();
+    setUpCanvasKitTest(withImplicitView: true);
 
     runSemanticsTests();
   });
diff --git a/lib/web_ui/test/canvaskit/shader_mask_golden_test.dart b/lib/web_ui/test/canvaskit/shader_mask_golden_test.dart
index f1cb2dddb596e7a9974fda6d271f9c389ec83131..f1af16b2ec797231fe573f4d74ce299a2c651a33 100644
--- a/lib/web_ui/test/canvaskit/shader_mask_golden_test.dart
+++ b/lib/web_ui/test/canvaskit/shader_mask_golden_test.dart
@@ -18,7 +18,7 @@ const ui.Rect region = ui.Rect.fromLTRB(0, 0, 500, 250);
 
 void testMain() {
   group('ShaderMask', () {
-    setUpCanvasKitTest();
+    setUpCanvasKitTest(withImplicitView: true);
 
     test('Renders sweep gradient with color blend', () async {
       final LayerSceneBuilder builder = LayerSceneBuilder();
diff --git a/lib/web_ui/test/canvaskit/shader_test.dart b/lib/web_ui/test/canvaskit/shader_test.dart
index 619cf9dd196c45400fde4d7f599cd942b22e122c..6be40459c729531e5b8473a5294c3420f897be1e 100644
--- a/lib/web_ui/test/canvaskit/shader_test.dart
+++ b/lib/web_ui/test/canvaskit/shader_test.dart
@@ -25,7 +25,7 @@ void testMain() {
         ui.Offset.zero,
         testColors,
       ) as CkGradientSweep;
-      expect(gradient.createDefault(), isNotNull);
+      expect(gradient.getSkShader(ui.FilterQuality.none), isNotNull);
     });
 
     test('Linear gradient', () {
@@ -34,7 +34,7 @@ void testMain() {
         const ui.Offset(0, 1),
         testColors,
       ) as CkGradientLinear;
-      expect(gradient.createDefault(), isNotNull);
+      expect(gradient.getSkShader(ui.FilterQuality.none), isNotNull);
     });
 
     test('Radial gradient', () {
@@ -43,7 +43,7 @@ void testMain() {
         10,
         testColors,
       ) as CkGradientRadial;
-      expect(gradient.createDefault(), isNotNull);
+      expect(gradient.getSkShader(ui.FilterQuality.none), isNotNull);
     });
 
     test('Conical gradient', () {
@@ -57,10 +57,10 @@ void testMain() {
         const ui.Offset(10, 10),
         40,
       ) as CkGradientConical;
-      expect(gradient.createDefault(), isNotNull);
+      expect(gradient.getSkShader(ui.FilterQuality.none), isNotNull);
     });
 
-    test('Image shader', () {
+    test('Image shader initialize/dispose cycle', () {
       final SkImage skImage = canvasKit.MakeAnimatedImageFromEncoded(kTransparentImage)!.makeImageAtCurrentFrame();
       final CkImage image = CkImage(skImage);
       final CkImageShader imageShader = ui.ImageShader(
@@ -71,9 +71,61 @@ void testMain() {
       ) as CkImageShader;
       expect(imageShader, isA<CkImageShader>());
 
+      final UniqueRef<SkShader> ref = imageShader.ref!;
       expect(imageShader.debugDisposed, false);
+      expect(imageShader.getSkShader(ui.FilterQuality.none), same(ref.nativeObject));
+      expect(ref.isDisposed, false);
+      expect(image.debugDisposed, false);
       imageShader.dispose();
       expect(imageShader.debugDisposed, true);
+      expect(ref.isDisposed, true);
+      expect(imageShader.ref, isNull);
+      expect(image.debugDisposed, true);
+    });
+
+    test('Image shader withQuality', () {
+      final SkImage skImage = canvasKit.MakeAnimatedImageFromEncoded(kTransparentImage)!.makeImageAtCurrentFrame();
+      final CkImage image = CkImage(skImage);
+      final CkImageShader imageShader = ui.ImageShader(
+        image,
+        ui.TileMode.clamp,
+        ui.TileMode.repeated,
+        Float64List.fromList(Matrix4.diagonal3Values(1, 2, 3).storage),
+      ) as CkImageShader;
+      expect(imageShader, isA<CkImageShader>());
+
+      final UniqueRef<SkShader> ref1 = imageShader.ref!;
+      expect(imageShader.getSkShader(ui.FilterQuality.none), same(ref1.nativeObject));
+
+      // Request the same quality as the default quality (none).
+      expect(imageShader.getSkShader(ui.FilterQuality.none), isNotNull);
+      final UniqueRef<SkShader> ref2 = imageShader.ref!;
+      expect(ref1, same(ref2));
+      expect(ref1.isDisposed, false);
+      expect(image.debugDisposed, false);
+
+      // Change quality to medium.
+      expect(imageShader.getSkShader(ui.FilterQuality.medium), isNotNull);
+      final UniqueRef<SkShader> ref3 = imageShader.ref!;
+      expect(ref1, isNot(same(ref3)));
+      expect(ref1.isDisposed, true, reason: 'The previous reference must be released to avoid a memory leak');
+      expect(image.debugDisposed, false);
+      expect(imageShader.ref!.nativeObject, same(ref3.nativeObject));
+
+      // Ask for medium again.
+      expect(imageShader.getSkShader(ui.FilterQuality.medium), isNotNull);
+      final UniqueRef<SkShader> ref4 = imageShader.ref!;
+      expect(ref4, same(ref3));
+      expect(ref3.isDisposed, false);
+      expect(image.debugDisposed, false);
+      expect(imageShader.ref!.nativeObject, same(ref4.nativeObject));
+
+      // Done with the shader.
+      imageShader.dispose();
+      expect(imageShader.debugDisposed, true);
+      expect(ref4.isDisposed, true);
+      expect(imageShader.ref, isNull);
+      expect(image.debugDisposed, true);
     });
   });
 }
diff --git a/lib/web_ui/test/canvaskit/skia_font_collection_test.dart b/lib/web_ui/test/canvaskit/skia_font_collection_test.dart
index 9dc43898158e55c886b3da8859866434307c0947..6b364009e70b75365f9ca601c8011c492bbc6f5e 100644
--- a/lib/web_ui/test/canvaskit/skia_font_collection_test.dart
+++ b/lib/web_ui/test/canvaskit/skia_font_collection_test.dart
@@ -9,18 +9,22 @@ import 'package:test/test.dart';
 
 import 'package:ui/src/engine.dart';
 
+import '../common/fake_asset_manager.dart';
+import '../common/test_initialization.dart';
+
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
 
 void testMain() {
   group('$SkiaFontCollection', () {
+    setUpUnitTests();
+
     final List<String> warnings = <String>[];
     late void Function(String) oldPrintWarning;
+    late FakeAssetScope testAssetScope;
 
     setUpAll(() async {
-      ensureFlutterViewEmbedderInitialized();
-      await renderer.initialize();
       oldPrintWarning = printWarning;
       printWarning = (String warning) {
         warnings.add(warning);
@@ -32,24 +36,35 @@ void testMain() {
     });
 
     setUp(() {
+      testAssetScope = fakeAssetManager.pushAssetScope();
+      mockHttpFetchResponseFactory = null;
       warnings.clear();
     });
 
+    tearDown(() {
+      fakeAssetManager.popAssetScope(testAssetScope);
+      mockHttpFetchResponseFactory = null;
+    });
+
     test('logs no warnings with the default mock asset manager', () async {
       final SkiaFontCollection fontCollection = SkiaFontCollection();
-      final WebOnlyMockAssetManager mockAssetManager =
-          WebOnlyMockAssetManager();
-      await fontCollection.downloadAssetFonts(mockAssetManager);
-      fontCollection.registerDownloadedFonts();
+      await fontCollection.loadAssetFonts(await fetchFontManifest(fakeAssetManager));
 
       expect(warnings, isEmpty);
     });
 
     test('logs a warning if one of the registered fonts is invalid', () async {
+      mockHttpFetchResponseFactory = (String url) async {
+        final ByteBuffer bogusData = Uint8List.fromList('this is not valid font data'.codeUnits).buffer;
+        return MockHttpFetchResponse(
+          status: 200,
+          url: url,
+          contentLength: bogusData.lengthInBytes,
+          payload: MockHttpFetchPayload(byteBuffer: bogusData),
+        );
+      };
       final SkiaFontCollection fontCollection = SkiaFontCollection();
-      final WebOnlyMockAssetManager mockAssetManager =
-          WebOnlyMockAssetManager();
-      mockAssetManager.defaultFontManifest = '''
+      testAssetScope.setAsset('FontManifest.json', stringAsUtf8Data('''
 [
    {
       "family":"Roboto",
@@ -60,10 +75,9 @@ void testMain() {
       "fonts":[{"asset":"packages/bogus/BrokenFont.ttf"}]
    }
   ]
-      ''';
+      '''));
       // It should complete without error, but emit a warning about BrokenFont.
-      await fontCollection.downloadAssetFonts(mockAssetManager);
-      fontCollection.registerDownloadedFonts();
+      await fontCollection.loadAssetFonts(await fetchFontManifest(fakeAssetManager));
       expect(
         warnings,
         containsAllInOrder(
@@ -75,24 +89,49 @@ void testMain() {
       );
     });
 
+    test('logs an HTTP warning if one of the registered fonts is missing (404 file not found)', () async {
+      final SkiaFontCollection fontCollection = SkiaFontCollection();
+      testAssetScope.setAsset('FontManifest.json', stringAsUtf8Data('''
+[
+   {
+      "family":"Roboto",
+      "fonts":[{"asset":"/fonts/Roboto-Regular.ttf"}]
+   },
+   {
+      "family": "ThisFontDoesNotExist",
+      "fonts":[{"asset":"packages/bogus/ThisFontDoesNotExist.ttf"}]
+   }
+  ]
+      '''));
+
+      // It should complete without error, but emit a warning about ThisFontDoesNotExist.
+      await fontCollection.loadAssetFonts(await fetchFontManifest(fakeAssetManager));
+      expect(
+        warnings,
+        containsAllInOrder(<String>[
+          'Font family ThisFontDoesNotExist not found (404) at packages/bogus/ThisFontDoesNotExist.ttf'
+        ]),
+      );
+    });
+
     test('prioritizes Ahem loaded via FontManifest.json', () async {
       final SkiaFontCollection fontCollection = SkiaFontCollection();
-      final WebOnlyMockAssetManager mockAssetManager =
-          WebOnlyMockAssetManager();
-      mockAssetManager.defaultFontManifest = '''
+      testAssetScope.setAsset('FontManifest.json', stringAsUtf8Data('''
         [
+          {
+            "family":"Roboto",
+            "fonts":[{"asset":"/assets/fonts/Roboto-Regular.ttf"}]
+          },
           {
             "family":"Ahem",
             "fonts":[{"asset":"/assets/fonts/Roboto-Regular.ttf"}]
           }
         ]
-      '''.trim();
+      '''.trim()));
 
-      final ByteBuffer robotoData = (await (await httpFetch('/assets/fonts/Roboto-Regular.ttf')).arrayBuffer())! as ByteBuffer;
+      final ByteBuffer robotoData = await httpFetchByteBuffer('/assets/fonts/Roboto-Regular.ttf');
 
-      await fontCollection.downloadAssetFonts(mockAssetManager);
-      await fontCollection.debugDownloadTestFonts();
-      fontCollection.registerDownloadedFonts();
+      await fontCollection.loadAssetFonts(await fetchFontManifest(fakeAssetManager));
       expect(warnings, isEmpty);
 
       // Use `singleWhere` to make sure only one version of 'Ahem' is loaded.
@@ -105,17 +144,9 @@ void testMain() {
     });
 
     test('falls back to default Ahem URL', () async {
-      final SkiaFontCollection fontCollection = SkiaFontCollection();
-      final WebOnlyMockAssetManager mockAssetManager =
-          WebOnlyMockAssetManager();
-      mockAssetManager.defaultFontManifest = '[]';
+      final SkiaFontCollection fontCollection = renderer.fontCollection as SkiaFontCollection;
 
-      final ByteBuffer ahemData = (await (await httpFetch('/assets/fonts/ahem.ttf')).arrayBuffer())! as ByteBuffer;
-
-      await fontCollection.downloadAssetFonts(mockAssetManager);
-      await fontCollection.debugDownloadTestFonts();
-      fontCollection.registerDownloadedFonts();
-      expect(warnings, isEmpty);
+      final ByteBuffer ahemData = await httpFetchByteBuffer('/assets/fonts/ahem.ttf');
 
       // Use `singleWhere` to make sure only one version of 'Ahem' is loaded.
       final RegisteredFont ahem = fontCollection.debugRegisteredFonts!
@@ -126,17 +157,11 @@ void testMain() {
       expect(ahem.bytes.length, ahemData.lengthInBytes);
     });
 
-    test('download fonts separately from registering', () async {
-      final SkiaFontCollection fontCollection = SkiaFontCollection();
-
-      await fontCollection.debugDownloadTestFonts();
-      /// Fonts should have been downloaded, but not yet registered
-      expect(fontCollection.debugRegisteredFonts, isEmpty);
+    test('FlutterTest is the default test font', () async {
+      final SkiaFontCollection fontCollection = renderer.fontCollection as SkiaFontCollection;
 
-      fontCollection.registerDownloadedFonts();
-      /// Fonts should now be registered and _registeredFonts should be filled
       expect(fontCollection.debugRegisteredFonts, isNotEmpty);
-      expect(warnings, isEmpty);
+      expect(fontCollection.debugRegisteredFonts!.first.family, 'FlutterTest');
     });
   });
 }
diff --git a/lib/web_ui/test/canvaskit/skia_objects_cache_test.dart b/lib/web_ui/test/canvaskit/skia_objects_cache_test.dart
deleted file mode 100644
index b58fe26cc8b304b486dd3ab715eb62cbfa1a5ea8..0000000000000000000000000000000000000000
--- a/lib/web_ui/test/canvaskit/skia_objects_cache_test.dart
+++ /dev/null
@@ -1,467 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'package:js/js.dart';
-
-import 'package:test/bootstrap/browser.dart';
-import 'package:test/test.dart';
-
-import 'package:ui/src/engine.dart';
-import 'package:ui/ui.dart';
-
-import '../matchers.dart';
-import '../spy.dart';
-import 'common.dart';
-
-void main() {
-  internalBootstrapBrowserTest(() => testMain);
-}
-
-void testMain() {
-  group('skia_objects_cache', () {
-    _tests();
-  });
-}
-
-void _tests() {
-  SkiaObjects.maximumCacheSize = 4;
-
-  setUpCanvasKitTest();
-
-  setUp(() async {
-    // Pretend the browser does not support FinalizationRegistry so we can test the
-    // resurrection logic.
-    browserSupportsFinalizationRegistry = false;
-  });
-
-  group(ManagedSkiaObject, () {
-    test('implements create, cache, delete, resurrect, delete lifecycle', () {
-      final FakeRasterizer fakeRasterizer = FakeRasterizer();
-      CanvasKitRenderer.instance.rasterizer = fakeRasterizer;
-
-      // Trigger first create
-      final TestSkiaObject testObject = TestSkiaObject();
-      expect(SkiaObjects.resurrectableObjects.single, testObject);
-      expect(testObject.createDefaultCount, 1);
-      expect(testObject.resurrectCount, 0);
-      expect(testObject.deleteCount, 0);
-
-      // Check that the getter does not have side-effects
-      final SkPaint skiaObject1 = testObject.skiaObject;
-      expect(skiaObject1, isNotNull);
-      expect(SkiaObjects.resurrectableObjects.single, testObject);
-      expect(testObject.createDefaultCount, 1);
-      expect(testObject.resurrectCount, 0);
-      expect(testObject.deleteCount, 0);
-
-      // Trigger first delete
-      SkiaObjects.postFrameCleanUp();
-      expect(SkiaObjects.resurrectableObjects, isEmpty);
-      expect(fakeRasterizer.addPostFrameCallbackCount, 1);
-      expect(testObject.createDefaultCount, 1);
-      expect(testObject.resurrectCount, 0);
-      expect(testObject.deleteCount, 1);
-
-      // Trigger resurrect
-      final SkPaint skiaObject2 = testObject.skiaObject;
-      expect(skiaObject2, isNotNull);
-      expect(skiaObject2, isNot(same(skiaObject1)));
-      expect(SkiaObjects.resurrectableObjects.single, testObject);
-      expect(fakeRasterizer.addPostFrameCallbackCount, 1);
-      expect(testObject.createDefaultCount, 1);
-      expect(testObject.resurrectCount, 1);
-      expect(testObject.deleteCount, 1);
-
-      // Trigger final delete
-      SkiaObjects.postFrameCleanUp();
-      expect(SkiaObjects.resurrectableObjects, isEmpty);
-      expect(fakeRasterizer.addPostFrameCallbackCount, 1);
-      expect(testObject.createDefaultCount, 1);
-      expect(testObject.resurrectCount, 1);
-      expect(testObject.deleteCount, 2);
-    });
-
-    test('is added to SkiaObjects cache if expensive', () {
-      final TestSkiaObject object1 = TestSkiaObject(isExpensive: true);
-      expect(SkiaObjects.expensiveCache.length, 1);
-      expect(SkiaObjects.expensiveCache.debugContains(object1), isTrue);
-
-      final TestSkiaObject object2 = TestSkiaObject(isExpensive: true);
-      expect(SkiaObjects.expensiveCache.length, 2);
-      expect(SkiaObjects.expensiveCache.debugContains(object2), isTrue);
-
-      SkiaObjects.postFrameCleanUp();
-      expect(SkiaObjects.expensiveCache.length, 2);
-      expect(SkiaObjects.expensiveCache.debugContains(object1), isTrue);
-      expect(SkiaObjects.expensiveCache.debugContains(object2), isTrue);
-
-      /// Add 3 more objects to the cache to overflow it.
-      TestSkiaObject(isExpensive: true);
-      TestSkiaObject(isExpensive: true);
-      TestSkiaObject(isExpensive: true);
-      expect(SkiaObjects.expensiveCache.length, 5);
-      expect(SkiaObjects.cachesToResize.length, 1);
-
-      SkiaObjects.postFrameCleanUp();
-      expect(object1.deleteCount, 1);
-      expect(object2.deleteCount, 1);
-      expect(SkiaObjects.expensiveCache.length, 3);
-      expect(SkiaObjects.expensiveCache.debugContains(object1), isFalse);
-      expect(SkiaObjects.expensiveCache.debugContains(object2), isFalse);
-    });
-  });
-
-  group(SkiaObjectBox, () {
-    test('Records stack traces and respects refcounts', () async {
-      final ZoneSpy spy = ZoneSpy();
-      spy.run(() {
-        Instrumentation.enabled = true;
-        TestSkDeletableMock.deleteCount = 0;
-        TestBoxWrapper.resurrectCount = 0;
-        final TestBoxWrapper original = TestBoxWrapper();
-
-        expect(original.box.debugGetStackTraces().length, 1);
-        expect(original.box.refCount, 1);
-        expect(original.box.isDeletedPermanently, isFalse);
-
-        final TestBoxWrapper clone = original.clone();
-        expect(clone.box, same(original.box));
-        expect(clone.box.debugGetStackTraces().length, 2);
-        expect(clone.box.refCount, 2);
-        expect(original.box.debugGetStackTraces().length, 2);
-        expect(original.box.refCount, 2);
-        expect(original.box.isDeletedPermanently, isFalse);
-
-        original.dispose();
-
-        testCollector.collectNow();
-        expect(TestSkDeletableMock.deleteCount, 0);
-
-        spy.fakeAsync.elapse(const Duration(seconds: 2));
-        expect(
-          spy.printLog,
-          <String>[
-            'Engine counters:\n  TestSkDeletable created: 1\n'
-          ],
-        );
-
-        expect(clone.box.debugGetStackTraces().length, 1);
-        expect(clone.box.refCount, 1);
-        expect(original.box.debugGetStackTraces().length, 1);
-        expect(original.box.refCount, 1);
-
-        clone.dispose();
-        expect(clone.box.debugGetStackTraces().length, 0);
-        expect(clone.box.refCount, 0);
-        expect(original.box.debugGetStackTraces().length, 0);
-        expect(original.box.refCount, 0);
-        expect(original.box.isDeletedPermanently, isTrue);
-
-        testCollector.collectNow();
-        expect(TestSkDeletableMock.deleteCount, 1);
-        expect(TestBoxWrapper.resurrectCount, 0);
-
-        expect(() => clone.box.unref(clone), throwsAssertionError);
-        spy.printLog.clear();
-        spy.fakeAsync.elapse(const Duration(seconds: 2));
-        expect(
-          spy.printLog,
-          <String>[
-            'Engine counters:\n  TestSkDeletable created: 1\n  TestSkDeletable deleted: 1\n'
-          ],
-        );
-        Instrumentation.enabled = false;
-      });
-    });
-
-    test('Can resurrect Skia objects', () async {
-      TestSkDeletableMock.deleteCount = 0;
-      TestBoxWrapper.resurrectCount = 0;
-      final TestBoxWrapper object = TestBoxWrapper();
-      expect(TestSkDeletableMock.deleteCount, 0);
-      expect(TestBoxWrapper.resurrectCount, 0);
-
-      // Test 3 cycles of delete/resurrect.
-      for (int i = 0; i < 3; i++) {
-        object.box.delete();
-        object.box.didDelete();
-        expect(TestSkDeletableMock.deleteCount, i + 1);
-        expect(TestBoxWrapper.resurrectCount, i);
-        expect(object.box.isDeletedTemporarily, isTrue);
-        expect(object.box.isDeletedPermanently, isFalse);
-
-        expect(object.box.skiaObject, isNotNull);
-        expect(TestSkDeletableMock.deleteCount, i + 1);
-        expect(TestBoxWrapper.resurrectCount, i + 1);
-        expect(object.box.isDeletedTemporarily, isFalse);
-        expect(object.box.isDeletedPermanently, isFalse);
-      }
-
-      object.dispose();
-      expect(object.box.isDeletedPermanently, isTrue);
-    });
-
-    test('Can dispose temporarily deleted object', () async {
-      TestSkDeletableMock.deleteCount = 0;
-      TestBoxWrapper.resurrectCount = 0;
-      final TestBoxWrapper object = TestBoxWrapper();
-      expect(TestSkDeletableMock.deleteCount, 0);
-      expect(TestBoxWrapper.resurrectCount, 0);
-
-      object.box.delete();
-      object.box.didDelete();
-      expect(TestSkDeletableMock.deleteCount, 1);
-      expect(TestBoxWrapper.resurrectCount, 0);
-      expect(object.box.isDeletedTemporarily, isTrue);
-      expect(object.box.isDeletedPermanently, isFalse);
-
-      object.dispose();
-      expect(object.box.isDeletedPermanently, isTrue);
-    });
-  });
-
-  group('$SynchronousSkiaObjectCache', () {
-    test('is initialized empty', () {
-      expect(SynchronousSkiaObjectCache(10), hasLength(0));
-    });
-
-    test('adds objects', () {
-      final SynchronousSkiaObjectCache cache = SynchronousSkiaObjectCache(2);
-      cache.add(TestSelfManagedObject());
-      expect(cache, hasLength(1));
-      cache.add(TestSelfManagedObject());
-      expect(cache, hasLength(2));
-    });
-
-    test('forbids adding the same object twice', () {
-      final SynchronousSkiaObjectCache cache = SynchronousSkiaObjectCache(2);
-      final TestSelfManagedObject object = TestSelfManagedObject();
-      cache.add(object);
-      expect(cache, hasLength(1));
-      expect(() => cache.add(object), throwsAssertionError);
-    });
-
-    void expectObjectInCache(
-      SynchronousSkiaObjectCache cache,
-      TestSelfManagedObject object,
-    ) {
-      expect(cache.debugContains(object), isTrue);
-      expect(object._skiaObject, isNotNull);
-    }
-
-    void expectObjectNotInCache(
-      SynchronousSkiaObjectCache cache,
-      TestSelfManagedObject object,
-    ) {
-      expect(cache.debugContains(object), isFalse);
-      expect(object._skiaObject, isNull);
-    }
-
-    test('respects maximumSize', () {
-      final SynchronousSkiaObjectCache cache = SynchronousSkiaObjectCache(2);
-      final TestSelfManagedObject object1 = TestSelfManagedObject();
-      final TestSelfManagedObject object2 = TestSelfManagedObject();
-      final TestSelfManagedObject object3 = TestSelfManagedObject();
-      final TestSelfManagedObject object4 = TestSelfManagedObject();
-
-      cache.add(object1);
-      expect(cache, hasLength(1));
-      expectObjectInCache(cache, object1);
-
-      cache.add(object2);
-      expect(cache, hasLength(2));
-      expectObjectInCache(cache, object1);
-      expectObjectInCache(cache, object2);
-
-      cache.add(object3);
-      expect(cache, hasLength(2));
-      expectObjectNotInCache(cache, object1);
-      expectObjectInCache(cache, object2);
-      expectObjectInCache(cache, object3);
-
-      cache.add(object4);
-      expect(cache, hasLength(2));
-      expectObjectNotInCache(cache, object1);
-      expectObjectNotInCache(cache, object2);
-      expectObjectInCache(cache, object3);
-      expectObjectInCache(cache, object4);
-    });
-
-    test('uses RLU strategy', () {
-      final SynchronousSkiaObjectCache cache = SynchronousSkiaObjectCache(2);
-      final TestSelfManagedObject object1 = TestSelfManagedObject();
-      final TestSelfManagedObject object2 = TestSelfManagedObject();
-      final TestSelfManagedObject object3 = TestSelfManagedObject();
-      final TestSelfManagedObject object4 = TestSelfManagedObject();
-
-      cache.add(object1);
-      expectObjectInCache(cache, object1);
-      cache.add(object2);
-      expectObjectInCache(cache, object2);
-      cache.add(object3);
-      expectObjectInCache(cache, object3);
-      expectObjectNotInCache(cache, object1);
-
-      cache.markUsed(object2);
-      cache.add(object4);
-      expectObjectInCache(cache, object2);
-      expectObjectNotInCache(cache, object3);
-      expectObjectInCache(cache, object4);
-    });
-  });
-}
-
-/// A simple class that wraps a [SkiaObjectBox].
-///
-/// Can be [clone]d such that the clones share the same ref counted box.
-class TestBoxWrapper implements StackTraceDebugger {
-  TestBoxWrapper() {
-    if (assertionsEnabled) {
-      _debugStackTrace = StackTrace.current;
-    }
-    box = SkiaObjectBox<TestBoxWrapper, TestSkDeletable>.resurrectable(
-        this, TestSkDeletable(), () {
-      resurrectCount += 1;
-      return TestSkDeletable();
-    });
-  }
-
-  TestBoxWrapper.cloneOf(this.box) {
-    if (assertionsEnabled) {
-      _debugStackTrace = StackTrace.current;
-    }
-    box.ref(this);
-  }
-
-  static int resurrectCount = 0;
-
-  @override
-  StackTrace get debugStackTrace => _debugStackTrace;
-  late StackTrace _debugStackTrace;
-
-  late SkiaObjectBox<TestBoxWrapper, TestSkDeletable> box;
-
-  void dispose() {
-    box.unref(this);
-  }
-
-  TestBoxWrapper clone() => TestBoxWrapper.cloneOf(box);
-}
-
-class TestSkDeletableMock {
-  static int deleteCount = 0;
-
-  bool isDeleted() => _isDeleted;
-  bool _isDeleted = false;
-
-  void delete() {
-    expect(_isDeleted, isFalse,
-        reason:
-            'CanvasKit does not allow deleting the same object more than once.');
-    _isDeleted = true;
-    deleteCount++;
-  }
-
-  JsConstructor get constructor => TestJsConstructor(name: 'TestSkDeletable');
-}
-
-@JS()
-@anonymous
-@staticInterop
-class TestSkDeletable implements SkDeletable {
-  factory TestSkDeletable() {
-    final TestSkDeletableMock mock = TestSkDeletableMock();
-    return TestSkDeletable._(
-        isDeleted: allowInterop(() => mock.isDeleted()),
-        delete: allowInterop(() => mock.delete()),
-        constructor: mock.constructor);
-  }
-
-  external factory TestSkDeletable._({
-    bool Function() isDeleted,
-    void Function() delete,
-    JsConstructor constructor});
-}
-
-@JS()
-@anonymous
-@staticInterop
-class TestJsConstructor implements JsConstructor {
-  external factory TestJsConstructor({String name});
-}
-
-class TestSkiaObject extends ManagedSkiaObject<SkPaint> {
-  TestSkiaObject({this.isExpensive = false});
-
-  int createDefaultCount = 0;
-  int resurrectCount = 0;
-  int deleteCount = 0;
-
-  final bool isExpensive;
-
-  @override
-  SkPaint createDefault() {
-    createDefaultCount++;
-    return SkPaint();
-  }
-
-  @override
-  SkPaint resurrect() {
-    resurrectCount++;
-    return SkPaint();
-  }
-
-  @override
-  void delete() {
-    rawSkiaObject?.delete();
-    deleteCount++;
-  }
-
-  @override
-  bool get isResurrectionExpensive => isExpensive;
-}
-
-class FakeRasterizer implements Rasterizer {
-  int addPostFrameCallbackCount = 0;
-
-  @override
-  void addPostFrameCallback(VoidCallback callback) {
-    addPostFrameCallbackCount++;
-  }
-
-  @override
-  CompositorContext get context => throw UnimplementedError();
-
-  @override
-  void draw(LayerTree layerTree) {
-    throw UnimplementedError();
-  }
-
-  @override
-  void setSkiaResourceCacheMaxBytes(int bytes) {
-    throw UnimplementedError();
-  }
-
-  @override
-  void debugRunPostFrameCallbacks() {
-    throw UnimplementedError();
-  }
-}
-
-class TestSelfManagedObject extends SkiaObject<TestSkDeletable> {
-  TestSkDeletable? _skiaObject = TestSkDeletable();
-
-  @override
-  void delete() {
-    _skiaObject!.delete();
-  }
-
-  @override
-  void didDelete() {
-    _skiaObject = null;
-  }
-
-  @override
-  TestSkDeletable get skiaObject => throw UnimplementedError();
-}
diff --git a/lib/web_ui/test/canvaskit/surface_factory_test.dart b/lib/web_ui/test/canvaskit/surface_factory_test.dart
deleted file mode 100644
index d9da96d693ffe34953a21af3c0de3647a6eb1193..0000000000000000000000000000000000000000
--- a/lib/web_ui/test/canvaskit/surface_factory_test.dart
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'package:test/bootstrap/browser.dart';
-import 'package:test/test.dart';
-import 'package:ui/src/engine.dart';
-import 'package:ui/ui.dart' as ui;
-
-import 'common.dart';
-
-const MethodCodec codec = StandardMethodCodec();
-
-void main() {
-  internalBootstrapBrowserTest(() => testMain);
-}
-
-void testMain() {
-  group('$SurfaceFactory', () {
-    setUpCanvasKitTest();
-
-    test('cannot be created with size less than 1', () {
-      expect(SurfaceFactory(-1).maximumSurfaces, 1);
-      expect(SurfaceFactory(0).maximumSurfaces, 1);
-      expect(SurfaceFactory(1).maximumSurfaces, 1);
-      expect(SurfaceFactory(2).maximumSurfaces, 2);
-    });
-
-    test('has a Surface dedicated to Picture.toImage', () {
-      expect(SurfaceFactory(1).pictureToImageSurface, isNotNull);
-    });
-
-    test('getSurface', () {
-      final SurfaceFactory factory = SurfaceFactory(3);
-      expect(factory.baseSurface, isNotNull);
-
-      expect(factory.debugSurfaceCount, equals(1));
-
-      // Get a surface from the factory, it should be unique.
-      final Surface? newSurface = factory.getSurface();
-      expect(newSurface, isNot(equals(factory.baseSurface)));
-
-      expect(factory.debugSurfaceCount, equals(2));
-
-      // Get another surface from the factory. Now we are at maximum capacity.
-      final Surface? anotherSurface = factory.getSurface();
-      expect(anotherSurface, isNot(equals(factory.baseSurface)));
-
-      expect(factory.debugSurfaceCount, equals(3));
-    });
-
-    test('releaseSurface', () {
-      final SurfaceFactory factory = SurfaceFactory(3);
-
-      // Create a new surface and immediately release it.
-      final Surface? surface = factory.getSurface();
-      factory.releaseSurface(surface!);
-
-      // If we create a new surface, it should be the same as the one we
-      // just created.
-      final Surface? newSurface = factory.getSurface();
-      expect(newSurface, equals(surface));
-    });
-
-    test('isLive', () {
-      final SurfaceFactory factory = SurfaceFactory(3);
-
-      expect(factory.isLive(factory.baseSurface), isTrue);
-
-      final Surface? surface = factory.getSurface();
-      expect(factory.isLive(surface!), isTrue);
-
-      factory.releaseSurface(surface);
-      expect(factory.isLive(surface), isFalse);
-    });
-
-    test('hot restart', () {
-      void expectDisposed(Surface surface) {
-        expect(surface.htmlCanvas!.isConnected, isFalse);
-      }
-
-      final SurfaceFactory originalFactory = SurfaceFactory.instance;
-      expect(SurfaceFactory.debugUninitializedInstance, isNotNull);
-
-      // Cause the surface and its canvas to be attached to the page
-      originalFactory.baseSurface.acquireFrame(const ui.Size(10, 10));
-      originalFactory.baseSurface.addToScene();
-      expect(originalFactory.baseSurface.htmlCanvas!.isConnected, isTrue);
-
-      // Create a few overlay surfaces
-      final List<Surface> overlays = <Surface>[];
-      for (int i = 0; i < 3; i++) {
-        overlays.add(originalFactory.getSurface()!
-          ..acquireFrame(const ui.Size(10, 10))
-          ..addToScene());
-      }
-      expect(originalFactory.debugSurfaceCount, 4);
-
-      // Trigger hot restart clean-up logic and check that we indeed clean up.
-      debugEmulateHotRestart();
-      expect(SurfaceFactory.debugUninitializedInstance, isNull);
-      expectDisposed(originalFactory.baseSurface);
-      overlays.forEach(expectDisposed);
-      expect(originalFactory.debugSurfaceCount, 1);
-    });
-  });
-}
diff --git a/lib/web_ui/test/canvaskit/surface_test.dart b/lib/web_ui/test/canvaskit/surface_test.dart
index 178fd5f762c066ea7ee8fb34358ac6e1ecf30705..0df8e0fb052cc4ada6871806df6b70662c815b38 100644
--- a/lib/web_ui/test/canvaskit/surface_test.dart
+++ b/lib/web_ui/test/canvaskit/surface_test.dart
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:js_util' as js_util;
+
 import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
@@ -17,100 +19,83 @@ void testMain() {
   group('CanvasKit', () {
     setUpCanvasKitTest();
     setUp(() {
-      window.debugOverrideDevicePixelRatio(1.0);
+      EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(1.0);
     });
 
     test('Surface allocates canvases efficiently', () {
-      final Surface? surface = SurfaceFactory.instance.getSurface();
+      final Surface surface = Surface();
       final CkSurface originalSurface =
-          surface!.acquireFrame(const ui.Size(9, 19)).skiaSurface;
-      final DomCanvasElement original = surface.htmlCanvas!;
+          surface.acquireFrame(const ui.Size(9, 19)).skiaSurface;
+      final DomOffscreenCanvas original = surface.debugOffscreenCanvas!;
 
       // Expect exact requested dimensions.
       expect(original.width, 9);
       expect(original.height, 19);
-      expect(original.style.width, '9px');
-      expect(original.style.height, '19px');
-      expect(original.style.transform, _isTranslate(0, 0));
       expect(originalSurface.width(), 9);
       expect(originalSurface.height(), 19);
 
-      // Shrinking reuses the existing canvas but translates it so Skia renders into the visible area.
+      // Shrinking reuses the existing canvas but translates it so
+      // Skia renders into the visible area.
       final CkSurface shrunkSurface =
           surface.acquireFrame(const ui.Size(5, 15)).skiaSurface;
-      final DomCanvasElement shrunk = surface.htmlCanvas!;
+      final DomOffscreenCanvas shrunk = surface.debugOffscreenCanvas!;
       expect(shrunk, same(original));
-      expect(shrunk.style.width, '9px');
-      expect(shrunk.style.height, '19px');
-      expect(shrunk.style.transform, _isTranslate(0, -4));
-      expect(shrunkSurface, isNot(same(original)));
+      expect(shrunkSurface, isNot(same(originalSurface)));
       expect(shrunkSurface.width(), 5);
       expect(shrunkSurface.height(), 15);
 
-      // The first increase will allocate a new canvas, but will overallocate
+      // The first increase will allocate a new surface, but will overallocate
       // by 40% to accommodate future increases.
       final CkSurface firstIncreaseSurface =
           surface.acquireFrame(const ui.Size(10, 20)).skiaSurface;
-      final DomCanvasElement firstIncrease = surface.htmlCanvas!;
-      expect(firstIncrease, isNot(same(original)));
+      final DomOffscreenCanvas firstIncrease = surface.debugOffscreenCanvas!;
+      expect(firstIncrease, same(original));
       expect(firstIncreaseSurface, isNot(same(shrunkSurface)));
 
       // Expect overallocated dimensions
       expect(firstIncrease.width, 14);
       expect(firstIncrease.height, 28);
-      expect(firstIncrease.style.width, '14px');
-      expect(firstIncrease.style.height, '28px');
-      expect(firstIncrease.style.transform, _isTranslate(0, -8));
       expect(firstIncreaseSurface.width(), 10);
       expect(firstIncreaseSurface.height(), 20);
 
       // Subsequent increases within 40% reuse the old canvas.
       final CkSurface secondIncreaseSurface =
           surface.acquireFrame(const ui.Size(11, 22)).skiaSurface;
-      final DomCanvasElement secondIncrease = surface.htmlCanvas!;
+      final DomOffscreenCanvas secondIncrease = surface.debugOffscreenCanvas!;
       expect(secondIncrease, same(firstIncrease));
-      expect(secondIncrease.style.transform, _isTranslate(0, -6));
       expect(secondIncreaseSurface, isNot(same(firstIncreaseSurface)));
       expect(secondIncreaseSurface.width(), 11);
       expect(secondIncreaseSurface.height(), 22);
 
       // Increases beyond the 40% limit will cause a new allocation.
-      final CkSurface hugeSurface = surface.acquireFrame(const ui.Size(20, 40)).skiaSurface;
-      final DomCanvasElement huge = surface.htmlCanvas!;
-      expect(huge, isNot(same(secondIncrease)));
+      final CkSurface hugeSurface =
+          surface.acquireFrame(const ui.Size(20, 40)).skiaSurface;
+      final DomOffscreenCanvas huge = surface.debugOffscreenCanvas!;
+      expect(huge, same(secondIncrease));
       expect(hugeSurface, isNot(same(secondIncreaseSurface)));
 
       // Also over-allocated
       expect(huge.width, 28);
       expect(huge.height, 56);
-      expect(huge.style.width, '28px');
-      expect(huge.style.height, '56px');
-      expect(huge.style.transform, _isTranslate(0, -16));
       expect(hugeSurface.width(), 20);
       expect(hugeSurface.height(), 40);
 
       // Shrink again. Reuse the last allocated surface.
       final CkSurface shrunkSurface2 =
           surface.acquireFrame(const ui.Size(5, 15)).skiaSurface;
-      final DomCanvasElement shrunk2 = surface.htmlCanvas!;
+      final DomOffscreenCanvas shrunk2 = surface.debugOffscreenCanvas!;
       expect(shrunk2, same(huge));
-      expect(shrunk2.style.width, '28px');
-      expect(shrunk2.style.height, '56px');
-      expect(shrunk2.style.transform, _isTranslate(0, -41));
       expect(shrunkSurface2, isNot(same(hugeSurface)));
       expect(shrunkSurface2.width(), 5);
       expect(shrunkSurface2.height(), 15);
 
       // Doubling the DPR should halve the CSS width, height, and translation of the canvas.
       // This tests https://github.com/flutter/flutter/issues/77084
-      window.debugOverrideDevicePixelRatio(2.0);
+      EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(2.0);
       final CkSurface dpr2Surface2 =
           surface.acquireFrame(const ui.Size(5, 15)).skiaSurface;
-      final DomCanvasElement dpr2Canvas = surface.htmlCanvas!;
+      final DomOffscreenCanvas dpr2Canvas = surface.debugOffscreenCanvas!;
       expect(dpr2Canvas, same(huge));
-      expect(dpr2Canvas.style.width, '14px');
-      expect(dpr2Canvas.style.height, '28px');
-      expect(dpr2Canvas.style.transform, _isTranslate(0, -20.5));
       expect(dpr2Surface2, isNot(same(hugeSurface)));
       expect(dpr2Surface2.width(), 5);
       expect(dpr2Surface2.height(), 15);
@@ -120,13 +105,102 @@ void testMain() {
       // which cannot be a different size from the canvas.
       // TODO(hterkelsen): See if we can give a custom size for software
       //     surfaces.
-    }, skip: isFirefox);
+    }, skip: isFirefox || !Surface.offscreenCanvasSupported);
+
+    test('Surface used as DisplayCanvas resizes correctly', () {
+      final Surface surface = Surface(isDisplayCanvas: true);
+
+      surface.createOrUpdateSurface(const ui.Size(9, 19));
+      final DomCanvasElement original = getDisplayCanvas(surface);
+      ui.Size canvasSize = getCssSize(surface);
+
+      // Expect exact requested dimensions.
+      expect(original.width, 9);
+      expect(original.height, 19);
+      expect(canvasSize.width, 9);
+      expect(canvasSize.height, 19);
+
+      // Shrinking reuses the existing canvas but translates it so
+      // Skia renders into the visible area.
+      surface.createOrUpdateSurface(const ui.Size(5, 15));
+      final DomCanvasElement shrunk = getDisplayCanvas(surface);
+      canvasSize = getCssSize(surface);
+      expect(shrunk.width, 9);
+      expect(shrunk.height, 19);
+      expect(canvasSize.width, 9);
+      expect(canvasSize.height, 19);
+
+      // The first increase will allocate a new surface, but will overallocate
+      // by 40% to accommodate future increases.
+      surface.createOrUpdateSurface(const ui.Size(10, 20));
+      final DomCanvasElement firstIncrease = getDisplayCanvas(surface);
+      canvasSize = getCssSize(surface);
+
+      expect(firstIncrease, same(original));
+
+      // Expect overallocated dimensions
+      expect(firstIncrease.width, 14);
+      expect(firstIncrease.height, 28);
+      expect(canvasSize.width, 14);
+      expect(canvasSize.height, 28);
+
+      // Subsequent increases within 40% reuse the old canvas.
+      surface.createOrUpdateSurface(const ui.Size(11, 22));
+      final DomCanvasElement secondIncrease = getDisplayCanvas(surface);
+      canvasSize = getCssSize(surface);
+
+      expect(secondIncrease, same(firstIncrease));
+      expect(secondIncrease.width, 14);
+      expect(secondIncrease.height, 28);
+      expect(canvasSize.width, 14);
+      expect(canvasSize.height, 28);
+
+      // Increases beyond the 40% limit will cause a new allocation.
+      surface.createOrUpdateSurface(const ui.Size(20, 40));
+      final DomCanvasElement huge = getDisplayCanvas(surface);
+      canvasSize = getCssSize(surface);
+
+      expect(huge, same(secondIncrease));
+
+      // Also over-allocated
+      expect(huge.width, 28);
+      expect(huge.height, 56);
+      expect(canvasSize.width, 28);
+      expect(canvasSize.height, 56);
+
+      // Shrink again. Reuse the last allocated surface.
+      surface.createOrUpdateSurface(const ui.Size(5, 15));
+      final DomCanvasElement shrunk2 = getDisplayCanvas(surface);
+      canvasSize = getCssSize(surface);
+
+      expect(shrunk2, same(huge));
+      expect(shrunk2.width, 28);
+      expect(shrunk2.height, 56);
+      expect(canvasSize.width, 28);
+      expect(canvasSize.height, 56);
+
+      // Doubling the DPR should halve the CSS width, height, and translation of the canvas.
+      // This tests https://github.com/flutter/flutter/issues/77084
+      EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(2.0);
+      surface.createOrUpdateSurface(const ui.Size(5, 15));
+      final DomCanvasElement dpr2Canvas = getDisplayCanvas(surface);
+      canvasSize = getCssSize(surface);
+
+      expect(dpr2Canvas, same(huge));
+      expect(dpr2Canvas.width, 28);
+      expect(dpr2Canvas.height, 56);
+      // Canvas is half the size in logical pixels because device pixel ratio is
+      // 2.0.
+      expect(canvasSize.width, 14);
+      expect(canvasSize.height, 28);
+      // Skip on wasm since same() doesn't work for JSValues.
+    }, skip: isWasm);
 
     test(
       'Surface creates new context when WebGL context is restored',
       () async {
-        final Surface? surface = SurfaceFactory.instance.getSurface();
-        expect(surface!.debugForceNewContext, isTrue);
+        final Surface surface = Surface();
+        expect(surface.debugForceNewContext, isTrue);
         final CkSurface before =
             surface.acquireFrame(const ui.Size(9, 19)).skiaSurface;
         expect(surface.debugForceNewContext, isFalse);
@@ -139,22 +213,27 @@ void testMain() {
         expect(afterAcquireFrame, same(before));
 
         // Emulate WebGL context loss.
-        final DomCanvasElement canvas =
-            surface.htmlElement.children.single as DomCanvasElement;
-        final dynamic ctx = canvas.getContext('webgl2');
-        expect(ctx, isNotNull);
-        final dynamic loseContextExtension =
-            ctx.getExtension('WEBGL_lose_context');
-        loseContextExtension.loseContext();
+        final DomOffscreenCanvas canvas = surface.debugOffscreenCanvas!;
+        final Object ctx = canvas.getContext('webgl2')!;
+        final Object loseContextExtension = js_util.callMethod(
+          ctx,
+          'getExtension',
+          <String>['WEBGL_lose_context'],
+        );
+        js_util.callMethod<void>(
+            loseContextExtension, 'loseContext', const <void>[]);
 
         // Pump a timer to allow the "lose context" event to propagate.
         await Future<void>.delayed(Duration.zero);
         // We don't create a new GL context until the context is restored.
         expect(surface.debugContextLost, isTrue);
-        expect(ctx.isContextLost(), isTrue);
+        final bool isContextLost =
+            js_util.callMethod<bool>(ctx, 'isContextLost', const <void>[]);
+        expect(isContextLost, isTrue);
 
         // Emulate WebGL context restoration.
-        loseContextExtension.restoreContext();
+        js_util.callMethod<void>(
+            loseContextExtension, 'restoreContext', const <void>[]);
 
         // Pump a timer to allow the "restore context" event to propagate.
         await Future<void>.delayed(Duration.zero);
@@ -165,73 +244,73 @@ void testMain() {
         // A new context is created.
         expect(afterContextLost, isNot(same(before)));
       },
-      // Firefox and Safari don't have the WEBGL_lose_context extension.
-      // TODO(hterkelsen): https://github.com/flutter/flutter/issues/115327
-      skip: true,
+      // Firefox can't create a WebGL2 context in headless mode.
+      skip: isFirefox || !Surface.offscreenCanvasSupported,
     );
 
     // Regression test for https://github.com/flutter/flutter/issues/75286
-    test('updates canvas logical size when device-pixel ratio changes', () {
-      final Surface surface = Surface();
-      final CkSurface original =
-          surface.acquireFrame(const ui.Size(10, 16)).skiaSurface;
-
-      expect(original.width(), 10);
-      expect(original.height(), 16);
-      expect(surface.htmlCanvas!.style.width, '10px');
-      expect(surface.htmlCanvas!.style.height, '16px');
-      expect(surface.htmlCanvas!.style.transform, _isTranslate(0, 0));
-
-      // Increase device-pixel ratio: this makes CSS pixels bigger, so we need
-      // fewer of them to cover the browser window.
-      window.debugOverrideDevicePixelRatio(2.0);
-      final CkSurface highDpr =
-          surface.acquireFrame(const ui.Size(10, 16)).skiaSurface;
-      expect(highDpr.width(), 10);
-      expect(highDpr.height(), 16);
-      expect(surface.htmlCanvas!.style.width, '5px');
-      expect(surface.htmlCanvas!.style.height, '8px');
-      expect(surface.htmlCanvas!.style.transform, _isTranslate(0, 0));
-
-      // Decrease device-pixel ratio: this makes CSS pixels smaller, so we need
-      // more of them to cover the browser window.
-      window.debugOverrideDevicePixelRatio(0.5);
-      final CkSurface lowDpr =
-          surface.acquireFrame(const ui.Size(10, 16)).skiaSurface;
-      expect(lowDpr.width(), 10);
-      expect(lowDpr.height(), 16);
-      expect(surface.htmlCanvas!.style.width, '20px');
-      expect(surface.htmlCanvas!.style.height, '32px');
-      expect(surface.htmlCanvas!.style.transform, _isTranslate(0, 0));
-
-      // See https://github.com/flutter/flutter/issues/77084#issuecomment-1120151172
-      window.debugOverrideDevicePixelRatio(2.0);
-      final CkSurface changeRatioAndSize =
-          surface.acquireFrame(const ui.Size(9.9, 15.9)).skiaSurface;
-      expect(changeRatioAndSize.width(), 10);
-      expect(changeRatioAndSize.height(), 16);
-      expect(surface.htmlCanvas!.style.width, '5px');
-      expect(surface.htmlCanvas!.style.height, '8px');
-      expect(surface.htmlCanvas!.style.transform, _isTranslate(0, 0));
-    });
+    test(
+      'updates canvas logical size when device-pixel ratio changes',
+      () {
+        final Surface surface = Surface();
+        final CkSurface original =
+            surface.acquireFrame(const ui.Size(10, 16)).skiaSurface;
+
+        expect(original.width(), 10);
+        expect(original.height(), 16);
+        expect(surface.debugOffscreenCanvas!.width, 10);
+        expect(surface.debugOffscreenCanvas!.height, 16);
+
+        // Increase device-pixel ratio: this makes CSS pixels bigger, so we need
+        // fewer of them to cover the browser window.
+        EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(2.0);
+        final CkSurface highDpr =
+            surface.acquireFrame(const ui.Size(10, 16)).skiaSurface;
+        expect(highDpr.width(), 10);
+        expect(highDpr.height(), 16);
+        expect(surface.debugOffscreenCanvas!.width, 10);
+        expect(surface.debugOffscreenCanvas!.height, 16);
+
+        // Decrease device-pixel ratio: this makes CSS pixels smaller, so we need
+        // more of them to cover the browser window.
+        EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(0.5);
+        final CkSurface lowDpr =
+            surface.acquireFrame(const ui.Size(10, 16)).skiaSurface;
+        expect(lowDpr.width(), 10);
+        expect(lowDpr.height(), 16);
+        expect(surface.debugOffscreenCanvas!.width, 10);
+        expect(surface.debugOffscreenCanvas!.height, 16);
+
+        // See https://github.com/flutter/flutter/issues/77084#issuecomment-1120151172
+        EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(2.0);
+        final CkSurface changeRatioAndSize =
+            surface.acquireFrame(const ui.Size(9.9, 15.9)).skiaSurface;
+        expect(changeRatioAndSize.width(), 10);
+        expect(changeRatioAndSize.height(), 16);
+        expect(surface.debugOffscreenCanvas!.width, 10);
+        expect(surface.debugOffscreenCanvas!.height, 16);
+      },
+      skip: !Surface.offscreenCanvasSupported,
+    );
   });
 }
 
-/// Checks that the CSS 'transform' property is a translation in a cross-browser way.
-///
-/// Assumes that the `x` and `y` values are round enough for their `toString` values
-/// to match the stringified CSS length value.
-Matcher _isTranslate(double x, double y) {
-  // When the y coordinate is zero, Firefox omits it, e.g.:
-  //   Chrome/Safari/Edge: translate(0px, 0px)
-  //   Firefox:            translate(0px)
-  final String fullFormat = 'translate(${x}px, ${y}px)';
-  if (y != 0) {
-    return equals(fullFormat);
-  } else {
-    return anyOf(
-      fullFormat,  // Non-Firefox browsers use this format.
-      'translate(${x}px)',  // Firefox omits y when it's zero.
-    );
-  }
+DomCanvasElement getDisplayCanvas(Surface surface) {
+  assert(surface.isDisplayCanvas);
+  return surface.hostElement.children.first as DomCanvasElement;
+}
+
+/// Extracts the CSS style values of 'width' and 'height' and returns them
+/// as a [ui.Size].
+ui.Size getCssSize(Surface surface) {
+  final DomCanvasElement canvas = getDisplayCanvas(surface);
+  final String cssWidth = canvas.style.width;
+  final String cssHeight = canvas.style.height;
+  // CSS width and height should be in the form 'NNNpx'. So cut off the 'px' and
+  // convert to a number.
+  final double width =
+      double.parse(cssWidth.substring(0, cssWidth.length - 2).trim());
+  final double height =
+      double.parse(cssHeight.substring(0, cssHeight.length - 2).trim());
+  return ui.Size(width, height);
 }
diff --git a/lib/web_ui/test/canvaskit/sweep_gradient_golden_test.dart b/lib/web_ui/test/canvaskit/sweep_gradient_golden_test.dart
index 13374c0be678fbdab559a32e240c6c2af7cebf0f..c00eceb0a93ce2a4feba688996b898d2801ea4e2 100644
--- a/lib/web_ui/test/canvaskit/sweep_gradient_golden_test.dart
+++ b/lib/web_ui/test/canvaskit/sweep_gradient_golden_test.dart
@@ -19,7 +19,7 @@ const ui.Rect region = ui.Rect.fromLTRB(0, 0, 500, 250);
 
 void testMain() {
   group('SweepGradient', () {
-    setUpCanvasKitTest();
+    setUpCanvasKitTest(withImplicitView: true);
 
     test('is correctly rendered', () async {
       final CkPictureRecorder recorder = CkPictureRecorder();
diff --git a/lib/web_ui/test/canvaskit/text_fragmenter_test.dart b/lib/web_ui/test/canvaskit/text_fragmenter_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..365de0c8677a27ec0eac144fd2bc2dcdda7dcb83
--- /dev/null
+++ b/lib/web_ui/test/canvaskit/text_fragmenter_test.dart
@@ -0,0 +1,231 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:math';
+import 'dart:typed_data';
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+
+import 'common.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+void testMain() {
+  setUpCanvasKitTest();
+
+  group('$fragmentUsingIntlSegmenter', () {
+    test('fragments text into words', () {
+      final Uint32List breaks = fragmentUsingIntlSegmenter(
+        'Hello world 你好世界',
+        IntlSegmenterGranularity.word,
+      );
+      expect(
+        breaks,
+        orderedEquals(<int>[0, 5, 6, 11, 12, 14, 16]),
+      );
+    });
+
+    test('fragments multi-line text into words', () {
+      final Uint32List breaks = fragmentUsingIntlSegmenter(
+        'Lorem ipsum\ndolor 你好世界 sit\namet',
+        IntlSegmenterGranularity.word,
+      );
+      expect(
+        breaks,
+        orderedEquals(<int>[
+          0, 5, 6, 11, 12, // "Lorem ipsum\n"
+          17, 18, 20, 22, 23, 26, 27, // "dolor 你好世界 sit\n"
+          31, // "amet"
+        ]),
+      );
+    });
+
+    test('fragments text into grapheme clusters', () {
+      // The smiley emoji has a length of 2.
+      // The family emoji has a length of 11.
+      final Uint32List breaks = fragmentUsingIntlSegmenter(
+        'Lorem🙂ipsum👨‍👩‍👧‍👦',
+        IntlSegmenterGranularity.grapheme,
+      );
+      expect(
+        breaks,
+        orderedEquals(<int>[
+          0, 1, 2, 3, 4, 5, 7, // "Lorem🙂"
+          8, 9, 10, 11, 12, 23, // "ipsum👨‍👩‍👧‍👦"
+        ]),
+      );
+    });
+
+    test('fragments multi-line text into grapheme clusters', () {
+      // The smiley emojis have a length of 2 each.
+      // The family emoji has a length of 11.
+      final Uint32List breaks = fragmentUsingIntlSegmenter(
+        'Lorem🙂\nipsum👨‍👩‍👧‍👦dolor\n😄',
+        IntlSegmenterGranularity.grapheme,
+      );
+      expect(
+        breaks,
+        orderedEquals(<int>[
+          0, 1, 2, 3, 4, 5, 7, 8, // "Lorem🙂\n"
+          9, 10, 11, 12, 13, 24, // "ipsum👨‍👩‍👧‍👦"
+          25, 26, 27, 28, 29, 30, 32, // "dolor😄\n"
+        ]),
+      );
+    });
+  }, skip: !browserSupportsCanvaskitChromium);
+
+  group('$fragmentUsingV8LineBreaker', () {
+    const int kSoft = 0;
+    const int kHard = 1;
+
+    test('fragments text into soft and hard line breaks', () {
+      final Uint32List breaks = fragmentUsingV8LineBreaker(
+        'Lorem-ipsum 你好🙂\nDolor sit',
+      );
+      expect(
+        breaks,
+        orderedEquals(<int>[
+          0, kSoft,
+          6, kSoft, // "Lorem-"
+          12, kSoft, // "ipsum "
+          13, kSoft, // "你"
+          14, kSoft, // "好"
+          17, kHard, // "🙂\n"
+          23, kSoft, // "Dolor "
+          26, kSoft, // "sit"
+        ]),
+      );
+    });
+  }, skip: !browserSupportsCanvaskitChromium);
+
+  group('segmentText', () {
+    setUp(() {
+      segmentationCache.clear();
+    });
+
+    tearDown(() {
+      segmentationCache.clear();
+    });
+
+    test('segments correctly', () {
+      const String text = 'Lorem-ipsum 你好🙂\nDolor sit';
+      final SegmentationResult segmentation = segmentText(text);
+      expect(
+        segmentation.words,
+        fragmentUsingIntlSegmenter(text, IntlSegmenterGranularity.word),
+      );
+      expect(
+        segmentation.graphemes,
+        fragmentUsingIntlSegmenter(text, IntlSegmenterGranularity.grapheme),
+      );
+      expect(
+        segmentation.breaks,
+        fragmentUsingV8LineBreaker(text),
+      );
+    });
+
+    test('caches segmentation results in LRU fashion', () {
+      const String text1 = 'hello';
+      segmentText(text1);
+      expect(segmentationCache.small.debugItemQueue, hasLength(1));
+      expect(segmentationCache.small[text1], isNotNull);
+
+      const String text2 = 'world';
+      segmentText(text2);
+      expect(segmentationCache.small.debugItemQueue, hasLength(2));
+      expect(segmentationCache.small[text2], isNotNull);
+
+      // "world" was segmented last, so it should be first, as in most recently used.
+      expect(segmentationCache.small.debugItemQueue.first.key, 'world');
+      expect(segmentationCache.small.debugItemQueue.last.key, 'hello');
+    });
+
+    test('puts segmentation results in the appropriate cache', () {
+      final String smallText = 'a' * (kSmallParagraphCacheSpec.maxTextLength - 1);
+      segmentText(smallText);
+      expect(segmentationCache.small.debugItemQueue, hasLength(1));
+      expect(segmentationCache.medium.debugItemQueue, hasLength(0));
+      expect(segmentationCache.large.debugItemQueue, hasLength(0));
+      expect(segmentationCache.small[smallText], isNotNull);
+      segmentationCache.clear();
+
+      final String mediumText = 'a' * (kMediumParagraphCacheSpec.maxTextLength - 1);
+      segmentText(mediumText);
+      expect(segmentationCache.small.debugItemQueue, hasLength(0));
+      expect(segmentationCache.medium.debugItemQueue, hasLength(1));
+      expect(segmentationCache.large.debugItemQueue, hasLength(0));
+      expect(segmentationCache.medium[mediumText], isNotNull);
+      segmentationCache.clear();
+
+      final String largeText = 'a' * (kLargeParagraphCacheSpec.maxTextLength - 1);
+      segmentText(largeText);
+      expect(segmentationCache.small.debugItemQueue, hasLength(0));
+      expect(segmentationCache.medium.debugItemQueue, hasLength(0));
+      expect(segmentationCache.large.debugItemQueue, hasLength(1));
+      expect(segmentationCache.large[largeText], isNotNull);
+      segmentationCache.clear();
+
+      // Should not cache extremely large texts.
+      final String tooLargeText = 'a' * (kLargeParagraphCacheSpec.maxTextLength + 1);
+      segmentText(tooLargeText);
+      expect(segmentationCache.small.debugItemQueue, hasLength(0));
+      expect(segmentationCache.medium.debugItemQueue, hasLength(0));
+      expect(segmentationCache.large.debugItemQueue, hasLength(0));
+      segmentationCache.clear();
+    });
+
+    test('has a limit on the number of entries', () {
+      testCacheCapacity(segmentationCache.small, kSmallParagraphCacheSpec);
+      testCacheCapacity(segmentationCache.medium, kMediumParagraphCacheSpec);
+      testCacheCapacity(segmentationCache.large, kLargeParagraphCacheSpec);
+    }, timeout: const Timeout.factor(4));
+  }, skip: !browserSupportsCanvaskitChromium);
+}
+
+void testCacheCapacity(
+  LruCache<String, SegmentationResult> cache,
+  SegmentationCacheSpec spec,
+) {
+  // 1. Fill the cache.
+  for (int i = 0; i < spec.cacheSize; i++) {
+    final String text = _randomString(spec.maxTextLength);
+    segmentText(text);
+    // The segmented text should have been added to the cache.
+    // TODO(mdebbar): This may fail if the random string generator generates
+    //                the same string twice.
+    expect(cache.debugItemQueue, hasLength(i + 1));
+  }
+
+  // 2. Make sure the cache is full.
+  expect(cache.length, spec.cacheSize);
+
+  // 3. Add more items to the cache.
+  for (int i = 0; i < 10; i++) {
+    final String text = _randomString(spec.maxTextLength);
+    segmentText(text);
+    // The cache size should remain the same.
+    expect(cache.debugItemQueue, hasLength(spec.cacheSize));
+  }
+
+  // 4. Clear the cache.
+  cache.clear();
+}
+
+int _seed = 0;
+String _randomString(int length) {
+  const String allChars = ' 1234567890'
+      'abcdefghijklmnopqrstuvwxyz'
+      'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+
+  final String text = '*' * length;
+  return text.replaceAllMapped(
+    '*',
+    // Passing a seed so the results are reproducible.
+    (_) => allChars[Random(_seed++).nextInt(allChars.length)],
+  );
+}
diff --git a/lib/web_ui/test/canvaskit/text_test.dart b/lib/web_ui/test/canvaskit/text_test.dart
index 87efad258b60b452ab44537a72679c2b6e34866e..52532fc4ee4b5eb1be56a3271d732c72f3caf5e5 100644
--- a/lib/web_ui/test/canvaskit/text_test.dart
+++ b/lib/web_ui/test/canvaskit/text_test.dart
@@ -6,6 +6,7 @@ import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
 import 'common.dart';
 
@@ -92,6 +93,38 @@ void testMain() {
       expect(await matchImage(tabImage, spaceImage), isTrue);
       expect(await matchImage(tabImage, tofuImage), isFalse);
     });
+
+    group('test fonts in flutterTester environment', () {
+      final bool resetValue = ui_web.debugEmulateFlutterTesterEnvironment;
+      ui_web.debugEmulateFlutterTesterEnvironment = true;
+      tearDownAll(() {
+        ui_web.debugEmulateFlutterTesterEnvironment = resetValue;
+      });
+      const List<String> testFonts = <String>['FlutterTest', 'Ahem'];
+
+      test('The default test font is used when a non-test fontFamily is specified', () {
+        final String defaultTestFontFamily = testFonts.first;
+
+        expect(CkTextStyle(fontFamily: 'BogusFontFamily').effectiveFontFamily, defaultTestFontFamily);
+        expect(CkParagraphStyle(fontFamily: 'BogusFontFamily').getTextStyle().effectiveFontFamily, defaultTestFontFamily);
+        expect(CkStrutStyle(fontFamily: 'BogusFontFamily'), CkStrutStyle(fontFamily: defaultTestFontFamily));
+      });
+
+      test('The default test font is used when fontFamily is unspecified', () {
+        final String defaultTestFontFamily = testFonts.first;
+
+        expect(CkTextStyle().effectiveFontFamily, defaultTestFontFamily);
+        expect(CkParagraphStyle().getTextStyle().effectiveFontFamily, defaultTestFontFamily);
+        expect(CkStrutStyle(), CkStrutStyle(fontFamily: defaultTestFontFamily));
+      });
+
+      test('Can specify test fontFamily to use', () {
+        for (final String testFont in testFonts) {
+          expect(CkTextStyle(fontFamily: testFont).effectiveFontFamily, testFont);
+          expect(CkParagraphStyle(fontFamily: testFont).getTextStyle().effectiveFontFamily, testFont);
+        }
+      });
+    });
     // TODO(hterkelsen): https://github.com/flutter/flutter/issues/71520
   }, skip: isSafari || isFirefox);
 }
diff --git a/lib/web_ui/test/common/fake_asset_manager.dart b/lib/web_ui/test/common/fake_asset_manager.dart
new file mode 100644
index 0000000000000000000000000000000000000000..b6f8c176e5c8a9c5a0f7d0434343f09dcad0db73
--- /dev/null
+++ b/lib/web_ui/test/common/fake_asset_manager.dart
@@ -0,0 +1,134 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:convert';
+import 'dart:typed_data';
+
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
+
+class FakeAssetManager implements ui_web.AssetManager {
+  FakeAssetManager();
+
+  @override
+  String get assetsDir => 'assets';
+
+  @override
+  String getAssetUrl(String asset) => asset;
+
+  @override
+  Future<ByteData> load(String assetKey) async {
+    final ByteData? assetData = await _currentScope?.getAssetData(assetKey);
+    if (assetData == null) {
+      throw HttpFetchNoPayloadError(assetKey, status: 404);
+    }
+    return assetData;
+  }
+
+  @override
+  Future<HttpFetchResponse> loadAsset(String asset) async {
+    final ByteData? assetData = await _currentScope?.getAssetData(asset);
+    if (assetData != null) {
+      return MockHttpFetchResponse(
+        url: asset,
+        status: 200,
+        payload: MockHttpFetchPayload(
+          byteBuffer: assetData.buffer,
+        ),
+      );
+    } else {
+      return MockHttpFetchResponse(
+        url: asset,
+        status: 404,
+      );
+    }
+  }
+
+  FakeAssetScope pushAssetScope() {
+    final FakeAssetScope scope = FakeAssetScope._(_currentScope);
+    _currentScope = scope;
+    return scope;
+  }
+
+  void popAssetScope(FakeAssetScope scope) {
+    assert(_currentScope == scope);
+    _currentScope = scope._parent;
+  }
+
+  FakeAssetScope? _currentScope;
+}
+
+class FakeAssetScope {
+  FakeAssetScope._(this._parent);
+
+  final FakeAssetScope? _parent;
+  final Map<String, Future<ByteData> Function()> _assetFetcherMap = <String, Future<ByteData> Function()>{};
+
+  void setAsset(String assetKey, ByteData assetData) {
+    _assetFetcherMap[assetKey] = () async => assetData;
+  }
+
+  void setAssetPassthrough(String assetKey) {
+    _assetFetcherMap[assetKey] = () async {
+      return ByteData.view(await httpFetchByteBuffer(assetKey));
+    };
+  }
+
+  Future<ByteData>? getAssetData(String assetKey) {
+    final Future<ByteData> Function()? fetcher = _assetFetcherMap[assetKey];
+    if (fetcher != null) {
+      return fetcher();
+    }
+    if (_parent != null) {
+      return _parent.getAssetData(assetKey);
+    }
+    return null;
+  }
+}
+
+FakeAssetManager fakeAssetManager = FakeAssetManager();
+
+ByteData stringAsUtf8Data(String string) {
+  return ByteData.sublistView(utf8.encode(string));
+}
+
+const String ahemFontFamily = 'Ahem';
+const String ahemFontUrl = '/assets/fonts/ahem.ttf';
+const String robotoFontFamily = 'Roboto';
+const String robotoTestFontUrl = '/assets/fonts/Roboto-Regular.ttf';
+const String robotoVariableFontFamily = 'RobotoVariable';
+const String robotoVariableFontUrl = '/assets/fonts/RobotoSlab-VariableFont_wght.ttf';
+
+/// The list of test fonts, in the form of font family name - font file url pairs.
+/// This list does not include embedded test fonts, which need to be loaded and
+/// registered separately in [FontCollection.debugDownloadTestFonts].
+const Map<String, String> testFontUrls = <String, String>{
+  ahemFontFamily: ahemFontUrl,
+  robotoFontFamily: robotoTestFontUrl,
+  robotoVariableFontFamily: robotoVariableFontUrl,
+};
+
+FakeAssetScope configureDebugFontsAssetScope(FakeAssetManager manager) {
+  final FakeAssetScope scope = manager.pushAssetScope();
+  scope.setAsset('AssetManifest.json', stringAsUtf8Data('{}'));
+  scope.setAsset('FontManifest.json', stringAsUtf8Data('''
+  [
+   {
+      "family":"$robotoFontFamily",
+      "fonts":[{"asset":"$robotoTestFontUrl"}]
+   },
+   {
+      "family":"$ahemFontFamily",
+      "fonts":[{"asset":"$ahemFontUrl"}]
+   },
+   {
+      "family":"$robotoVariableFontFamily",
+      "fonts":[{"asset":"$robotoVariableFontUrl"}]
+    }
+  ]'''));
+  scope.setAssetPassthrough(robotoTestFontUrl);
+  scope.setAssetPassthrough(ahemFontUrl);
+  scope.setAssetPassthrough(robotoVariableFontUrl);
+  return scope;
+}
diff --git a/lib/web_ui/test/keyboard_test_common.dart b/lib/web_ui/test/common/keyboard_test_common.dart
similarity index 93%
rename from lib/web_ui/test/keyboard_test_common.dart
rename to lib/web_ui/test/common/keyboard_test_common.dart
index 0b447d8b3b5e7b084205cb13226797f2044e3d6c..0ec1e5d75acb966c77b8d25a68346a0ed6b52028 100644
--- a/lib/web_ui/test/keyboard_test_common.dart
+++ b/lib/web_ui/test/common/keyboard_test_common.dart
@@ -22,6 +22,7 @@ class MockKeyboardEvent implements FlutterHtmlKeyboardEvent {
     bool altGrKey = false,
     this.location = 0,
     this.onPreventDefault,
+    this.onStopPropagation,
   }) : modifierState =
         <String>{
           if (altKey) 'Alt',
@@ -84,6 +85,12 @@ class MockKeyboardEvent implements FlutterHtmlKeyboardEvent {
   bool get defaultPrevented => _defaultPrevented;
   bool _defaultPrevented = false;
 
+  @override
+  void stopPropagation() {
+    onStopPropagation?.call();
+  }
+  VoidCallback? onStopPropagation;
+
   static bool get lastDefaultPrevented => _lastEvent?.defaultPrevented ?? false;
   static MockKeyboardEvent? _lastEvent;
 }
diff --git a/lib/web_ui/test/matchers.dart b/lib/web_ui/test/common/matchers.dart
similarity index 81%
rename from lib/web_ui/test/matchers.dart
rename to lib/web_ui/test/common/matchers.dart
index b754d4b2387e06e4078d75d6096584f05389eba6..51698843d66a8f33e65f1418fc4343ef6d00a41b 100644
--- a/lib/web_ui/test/matchers.dart
+++ b/lib/web_ui/test/common/matchers.dart
@@ -15,6 +15,13 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart';
 
+/// The epsilon of tolerable double precision error.
+///
+/// This is used in various places in the framework to allow for floating point
+/// precision loss in calculations. Differences below this threshold are safe
+/// to disregard.
+const double precisionErrorTolerance = 1e-10;
+
 /// Enumerates all persisted surfaces in the tree rooted at [root].
 ///
 /// If [root] is `null` returns all surfaces from the last rendered scene.
@@ -60,7 +67,7 @@ Iterable<PersistedOffset> enumerateOffsets([PersistedSurface? root]) {
 ///
 /// This makes it useful for comparing numbers, [Color]s, [Offset]s and other
 /// sets of value for which a metric space is defined.
-typedef DistanceFunction<T> = num Function(T a, T b);
+typedef DistanceFunction<T> = double Function(T a, T b);
 
 /// The type of a union of instances of [DistanceFunction<T>] for various types
 /// T.
@@ -73,7 +80,7 @@ typedef DistanceFunction<T> = num Function(T a, T b);
 ///
 /// Calling an instance of this type must either be done dynamically, or by
 /// first casting it to a [DistanceFunction<T>] for some concrete T.
-typedef AnyDistanceFunction = num Function(Never a, Never b);
+typedef AnyDistanceFunction = double Function(Never a, Never b);
 
 const Map<Type, AnyDistanceFunction> _kStandardDistanceFunctions =
     <Type, AnyDistanceFunction>{
@@ -85,7 +92,7 @@ const Map<Type, AnyDistanceFunction> _kStandardDistanceFunctions =
   Size: _sizeDistance,
 };
 
-int _intDistance(int a, int b) => (b - a).abs();
+double _intDistance(int a, int b) => (b - a).abs().toDouble();
 double _doubleDistance(double a, double b) => (b - a).abs();
 double _offsetDistance(Offset a, Offset b) => (b - a).distance;
 
@@ -131,8 +138,8 @@ double _sizeDistance(Size a, Size b) {
 ///    [double]s and has an optional `epsilon` parameter.
 ///  * [closeTo], which specializes in numbers only.
 Matcher within<T>({
-  required num distance,
   required T from,
+  double distance = precisionErrorTolerance,
   DistanceFunction<T>? distanceFunction,
 }) {
   distanceFunction ??= _kStandardDistanceFunctions[T] as DistanceFunction<T>?;
@@ -152,7 +159,7 @@ class _IsWithinDistance<T> extends Matcher {
 
   final DistanceFunction<T> distanceFunction;
   final T value;
-  final num epsilon;
+  final double epsilon;
 
   @override
   bool matches(Object? object, Map<dynamic, dynamic> matchState) {
@@ -163,7 +170,7 @@ class _IsWithinDistance<T> extends Matcher {
       return true;
     }
     final T test = object;
-    final num distance = distanceFunction(test, value);
+    final double distance = distanceFunction(test, value);
     if (distance < 0) {
       throw ArgumentError(
           'Invalid distance function was used to compare a ${value.runtimeType} '
@@ -220,23 +227,23 @@ enum HtmlComparisonMode {
 
 /// Rewrites [htmlContent] by removing irrelevant style attributes.
 ///
-/// If [throwOnUnusedAttributes] is `true`, throws instead of rewriting. Set
-/// [throwOnUnusedAttributes] to `true` to check that expected HTML strings do
+/// If [throwOnUnusedStyleProperties] is `true`, throws instead of rewriting. Set
+/// [throwOnUnusedStyleProperties] to `true` to check that expected HTML strings do
 /// not contain irrelevant attributes. It is ok for actual HTML to contain all
 /// kinds of attributes. They only need to be filtered out before testing.
 String canonicalizeHtml(
   String htmlContent, {
   HtmlComparisonMode mode = HtmlComparisonMode.nonLayoutOnly,
-  bool throwOnUnusedAttributes = false,
-  List<String>? ignoredAttributes,
+  bool throwOnUnusedStyleProperties = false,
+  List<String>? ignoredStyleProperties,
 }) {
   if (htmlContent.trim().isEmpty) {
     return '';
   }
 
-  String? unusedAttribute(String name) {
-    if (throwOnUnusedAttributes) {
-      fail('Provided HTML contains style attribute "$name" which '
+  String? unusedStyleProperty(String name) {
+    if (throwOnUnusedStyleProperties) {
+      fail('Provided HTML contains style property "$name" which '
           'is not used for comparison in the test. The HTML was:\n\n$htmlContent');
     }
 
@@ -248,70 +255,61 @@ String canonicalizeHtml(
     switch (replacementTag) {
       case 'flt-scene':
         replacementTag = 's';
-        break;
       case 'flt-transform':
         replacementTag = 't';
-        break;
       case 'flt-opacity':
         replacementTag = 'o';
-        break;
       case 'flt-clip':
         final String? clipType = original.attributes['clip-type'];
         switch (clipType) {
           case 'rect':
             replacementTag = 'clip';
-            break;
           case 'rrect':
             replacementTag = 'rclip';
-            break;
           case 'physical-shape':
             replacementTag = 'pshape';
-            break;
           default:
             throw Exception('Unknown clip type: $clipType');
         }
-        break;
       case 'flt-clip-interior':
         replacementTag = 'clip-i';
-        break;
       case 'flt-picture':
         replacementTag = 'pic';
-        break;
       case 'flt-canvas':
         replacementTag = 'c';
-        break;
       case 'flt-dom-canvas':
         replacementTag = 'd';
-        break;
       case 'flt-semantics':
         replacementTag = 'sem';
-        break;
       case 'flt-semantics-container':
         replacementTag = 'sem-c';
-        break;
       case 'flt-semantics-img':
         replacementTag = 'sem-img';
-        break;
       case 'flt-semantics-text-field':
         replacementTag = 'sem-tf';
-        break;
     }
 
     final html_package.Element replacement =
         html_package.Element.tag(replacementTag);
 
     if (mode != HtmlComparisonMode.noAttributes) {
-      original.attributes.forEach((dynamic name, String value) {
-        if (name is! String) {
-          throw ArgumentError('"$name" should be String but was ${name.runtimeType}.');
-        }
+      // Sort the attributes so tests are not sensitive to their order, which
+      // does not matter in terms of functionality.
+      final List<String> attributeNames = original.attributes.keys.cast<String>().toList();
+      attributeNames.sort();
+      for (final String name in attributeNames) {
+        final String value = original.attributes[name]!;
         if (name == 'style') {
-          return;
+          // The style attribute is handled separately because it contains substructure.
+          continue;
         }
-        if (name.startsWith('aria-')) {
+
+        // These are the only attributes we're interested in testing. This list
+        // can change over time.
+        if (name.startsWith('aria-') || name.startsWith('flt-') || name == 'role') {
           replacement.attributes[name] = value;
         }
-      });
+      }
 
       if (original.attributes.containsKey('style')) {
         final String styleValue = original.attributes['style']!;
@@ -331,7 +329,7 @@ String canonicalizeHtml(
                 if (parts.length == 2) {
                   final String name = parts.first;
 
-                  if (ignoredAttributes != null && ignoredAttributes.contains(name)) {
+                  if (ignoredStyleProperties != null && ignoredStyleProperties.contains(name)) {
                     return null;
                   }
 
@@ -345,7 +343,7 @@ String canonicalizeHtml(
                   ].contains(name);
 
                   if (isStaticAttribute) {
-                    return unusedAttribute(name);
+                    return unusedStyleProperty(name);
                   }
 
                   // Whether the attribute is set by the layout system.
@@ -365,7 +363,7 @@ String canonicalizeHtml(
 
                   if (forLayout && !isLayoutAttribute ||
                       !forLayout && isLayoutAttribute) {
-                    return unusedAttribute(name);
+                    return unusedStyleProperty(name);
                   }
                 }
               }
@@ -380,7 +378,7 @@ String canonicalizeHtml(
           replacement.attributes['style'] = processedAttributes;
         }
       }
-    } else if (throwOnUnusedAttributes && original.attributes.isNotEmpty) {
+    } else if (throwOnUnusedStyleProperties && original.attributes.isNotEmpty) {
       fail('Provided HTML contains attributes. However, the comparison mode '
           'is $mode. The HTML was:\n\n$htmlContent');
     }
@@ -416,51 +414,11 @@ String canonicalizeHtml(
 void expectHtml(DomElement element, String expectedHtml,
     {HtmlComparisonMode mode = HtmlComparisonMode.nonLayoutOnly}) {
   expectedHtml =
-      canonicalizeHtml(expectedHtml, mode: mode, throwOnUnusedAttributes: true);
+      canonicalizeHtml(expectedHtml, mode: mode, throwOnUnusedStyleProperties: true);
   final String actualHtml = canonicalizeHtml(element.outerHTML!, mode: mode);
   expect(actualHtml, expectedHtml);
 }
 
-/// Tests that [currentHtml] matches [expectedHtml].
-///
-/// The comparison does not consider every minutia of the DOM. By default it
-/// tests the element tree structure and non-layout style attributes, and
-/// ignores everything else. If you are testing layout specifically, pass the
-/// [HtmlComparisonMode.layoutOnly] as the [mode] argument.
-///
-/// To keep test HTML strings manageable, you may use short HTML tag names
-/// instead of the full names:
-///
-/// * <flt-scene> is interchangeable with <s>
-/// * <flt-transform> is interchangeable with <t>
-/// * <flt-opacity> is interchangeable with <o>
-/// * <flt-clip clip-type="rect"> is interchangeable with <clip>
-/// * <flt-clip clip-type="rrect"> is interchangeable with <rclip>
-/// * <flt-clip clip-type="physical-shape"> is interchangeable with <pshape>
-/// * <flt-picture> is interchangeable with <pic>
-/// * <flt-canvas> is interchangeable with <c>
-///
-/// To simplify test HTML strings further the elements corresponding to the
-/// root view [RenderView], such as <flt-scene> (i.e. <s>), are also stripped
-/// out before comparison.
-///
-/// Example:
-///
-/// If you call [WidgetTester.pumpWidget] that results in HTML
-/// `<s><t><pic><c><p>Hello</p></c></pic></t></s>`, you don't have to specify
-/// `<s><t>` tags and simply expect `<pic><c><p>Hello</p></c></pic>`.
-void expectPageHtml(String expectedHtml,
-    {HtmlComparisonMode mode = HtmlComparisonMode.nonLayoutOnly}) {
-  expectedHtml = canonicalizeHtml(expectedHtml, mode: mode);
-  final String actualHtml = canonicalizeHtml(currentHtml, mode: mode);
-  expect(actualHtml, expectedHtml);
-}
-
-/// Currently rendered HTML DOM as an HTML string.
-String get currentHtml {
-  return flutterViewEmbedder.sceneElement?.outerHTML ?? '';
-}
-
 class SceneTester {
   SceneTester(this.scene);
 
diff --git a/lib/web_ui/test/mock_engine_canvas.dart b/lib/web_ui/test/common/mock_engine_canvas.dart
similarity index 100%
rename from lib/web_ui/test/mock_engine_canvas.dart
rename to lib/web_ui/test/common/mock_engine_canvas.dart
diff --git a/lib/web_ui/test/common/rendering.dart b/lib/web_ui/test/common/rendering.dart
new file mode 100644
index 0000000000000000000000000000000000000000..89ecc319b19bb79f8e793fac6b7054461afbd397
--- /dev/null
+++ b/lib/web_ui/test/common/rendering.dart
@@ -0,0 +1,38 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui;
+
+// The scene that will be rendered in the next call to `onDrawFrame`.
+ui.Scene? _sceneToRender;
+
+// Completer that will complete when the call to render completes.
+Completer<void>? _sceneCompleter;
+
+/// Sets up rendering so that `onDrawFrame` will render the last requested
+/// scene.
+void setUpRenderingForTests() {
+  // Set `onDrawFrame` to call `renderer.renderScene`.
+  EnginePlatformDispatcher.instance.onDrawFrame = () {
+    if (_sceneToRender != null) {
+      EnginePlatformDispatcher.instance.render(_sceneToRender!).then<void>((_) {
+        _sceneCompleter?.complete();
+      }).catchError((Object error) {
+        _sceneCompleter?.completeError(error);
+      });
+      _sceneToRender = null;
+    }
+  };
+}
+
+/// Render the given [scene] in an `onDrawFrame` scope.
+Future<void> renderScene(ui.Scene scene) {
+  _sceneToRender = scene;
+  _sceneCompleter = Completer<void>();
+  EnginePlatformDispatcher.instance.invokeOnDrawFrame();
+  return _sceneCompleter!.future;
+}
diff --git a/lib/web_ui/test/spy.dart b/lib/web_ui/test/common/spy.dart
similarity index 88%
rename from lib/web_ui/test/spy.dart
rename to lib/web_ui/test/common/spy.dart
index 8df49dcac1065ed45f1a31be63101adb0bc958a9..f339151197caa22a1aec222290008184881399fb 100644
--- a/lib/web_ui/test/spy.dart
+++ b/lib/web_ui/test/common/spy.dart
@@ -53,8 +53,8 @@ class PlatformMessagesSpy {
       ));
     };
 
-    _backup = window.onPlatformMessage;
-    window.onPlatformMessage = _callback;
+    _backup = PlatformDispatcher.instance.onPlatformMessage;
+    PlatformDispatcher.instance.onPlatformMessage = _callback;
   }
 
   /// Stop spying on platform messages and clear all intercepted messages.
@@ -62,11 +62,11 @@ class PlatformMessagesSpy {
   /// Make sure this is called after each test that uses [PlatformMessagesSpy].
   void tearDown() {
     assert(_isActive);
-    // Make sure [window.onPlatformMessage] wasn't tampered with.
-    assert(window.onPlatformMessage == _callback);
+    // Make sure [PlatformDispatcher.instance.onPlatformMessage] wasn't tampered with.
+    assert(PlatformDispatcher.instance.onPlatformMessage == _callback);
     _callback = null;
     messages.clear();
-    window.onPlatformMessage = _backup;
+    PlatformDispatcher.instance.onPlatformMessage = _backup;
   }
 }
 
diff --git a/lib/web_ui/test/common/test_initialization.dart b/lib/web_ui/test/common/test_initialization.dart
new file mode 100644
index 0000000000000000000000000000000000000000..2f0c943462151834eb0676e7443754ee5ed33fb3
--- /dev/null
+++ b/lib/web_ui/test/common/test_initialization.dart
@@ -0,0 +1,71 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'dart:js_interop';
+
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart' as engine;
+import 'package:ui/src/engine/initialization.dart';
+import 'package:ui/ui.dart' as ui;
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
+
+import 'fake_asset_manager.dart';
+import 'rendering.dart';
+
+void setUpUnitTests({
+  bool withImplicitView = false,
+  bool emulateTesterEnvironment = true,
+  bool setUpTestViewDimensions = true,
+}) {
+  late final FakeAssetScope debugFontsScope;
+  setUpAll(() async {
+    if (emulateTesterEnvironment) {
+      ui_web.debugEmulateFlutterTesterEnvironment = true;
+    }
+
+    debugFontsScope = configureDebugFontsAssetScope(fakeAssetManager);
+    debugOnlyAssetManager = fakeAssetManager;
+    await bootstrapAndRunApp(withImplicitView: withImplicitView);
+    engine.debugOverrideJsConfiguration(<String, Object?>{
+      'fontFallbackBaseUrl': 'assets/fallback_fonts/',
+    }.jsify() as engine.JsFlutterConfiguration?);
+
+    if (setUpTestViewDimensions) {
+      // The following parameters are hard-coded in Flutter's test embedder. Since
+      // we don't have an embedder yet this is the lowest-most layer we can put
+      // this stuff in.
+      const double devicePixelRatio = 3.0;
+      engine.EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(devicePixelRatio);
+      engine.EnginePlatformDispatcher.instance.implicitView?.debugPhysicalSizeOverride =
+          const ui.Size(800 * devicePixelRatio, 600 * devicePixelRatio);
+      engine.scheduleFrameCallback = () {};
+    }
+
+    setUpRenderingForTests();
+  });
+
+  tearDownAll(() async {
+    fakeAssetManager.popAssetScope(debugFontsScope);
+  });
+}
+
+Future<void> bootstrapAndRunApp({bool withImplicitView = false}) async {
+  final Completer<void> completer = Completer<void>();
+  await ui_web.bootstrapEngine(runApp: () => completer.complete());
+  await completer.future;
+  if (!withImplicitView) {
+    _disableImplicitView();
+  }
+}
+
+void _disableImplicitView() {
+  // TODO(mdebbar): Instead of disabling the implicit view, we should be able to
+  //                initialize tests without an implicit view to begin with.
+  //                https://github.com/flutter/flutter/issues/138906
+  final engine.EngineFlutterWindow? implicitView = engine.EnginePlatformDispatcher.instance.implicitView;
+  if (implicitView != null) {
+    engine.EnginePlatformDispatcher.instance.viewManager.disposeAndUnregisterView(implicitView.viewId);
+  }
+}
diff --git a/lib/web_ui/test/embedder_test.dart b/lib/web_ui/test/embedder_test.dart
deleted file mode 100644
index a4197061fa304bcd90344e16b4292e0edda23348..0000000000000000000000000000000000000000
--- a/lib/web_ui/test/embedder_test.dart
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-@JS()
-library embedder_test; // We need this to mess with the ShadowDOM.
-
-import 'package:js/js.dart';
-import 'package:test/bootstrap/browser.dart';
-import 'package:test/test.dart';
-import 'package:ui/src/engine.dart';
-
-void main() {
-  internalBootstrapBrowserTest(() => testMain);
-}
-
-void testMain() {
-  test('populates flt-renderer and flt-build-mode', () {
-    FlutterViewEmbedder();
-    expect(domDocument.body!.getAttribute('flt-renderer'),
-        'html (requested explicitly)');
-    expect(domDocument.body!.getAttribute('flt-build-mode'), 'debug');
-  });
-
-  test('innerHeight/innerWidth are equal to visualViewport height and width',
-      () {
-    if (domWindow.visualViewport != null) {
-      expect(domWindow.visualViewport!.width, domWindow.innerWidth);
-      expect(domWindow.visualViewport!.height, domWindow.innerHeight);
-    }
-  });
-
-  test('replaces viewport meta tags during style reset', () {
-    final DomHTMLMetaElement existingMeta = createDomHTMLMetaElement()
-      ..name = 'viewport'
-      ..content = 'foo=bar';
-    domDocument.head!.append(existingMeta);
-    expect(existingMeta.isConnected, isTrue);
-
-    final FlutterViewEmbedder embedder = FlutterViewEmbedder();
-    embedder.reset();
-  },
-      // TODO(ferhat): https://github.com/flutter/flutter/issues/46638
-      skip: browserEngine == BrowserEngine.firefox);
-
-  test('accesibility placeholder is attached after creation', () {
-    final FlutterViewEmbedder embedder = FlutterViewEmbedder();
-
-    expect(
-      embedder.glassPaneShadow?.querySelectorAll('flt-semantics-placeholder'),
-      isNotEmpty,
-    );
-  });
-
-  test('renders a shadowRoot by default', () {
-    final FlutterViewEmbedder embedder = FlutterViewEmbedder();
-    final HostNode hostNode = embedder.glassPaneShadow!;
-    expect(domInstanceOfString(hostNode.node, 'ShadowRoot'), isTrue);
-  });
-
-  test('starts without shadowDom available too', () {
-    final dynamic oldAttachShadow = attachShadow;
-    expect(oldAttachShadow, isNotNull);
-
-    attachShadow = null; // Break ShadowDOM
-
-    final FlutterViewEmbedder embedder = FlutterViewEmbedder();
-    final HostNode hostNode = embedder.glassPaneShadow!;
-    expect(domInstanceOfString(hostNode.node, 'Element'), isTrue);
-    expect(
-      (hostNode.node as DomElement).tagName,
-      equalsIgnoringCase('flt-element-host-node'),
-    );
-    attachShadow = oldAttachShadow; // Restore ShadowDOM
-  });
-
-  test('should add/remove global resource', () {
-    final FlutterViewEmbedder embedder = FlutterViewEmbedder();
-    final DomHTMLDivElement resource = createDomHTMLDivElement();
-    embedder.addResource(resource);
-    final DomElement? resourceRoot = resource.parent;
-    expect(resourceRoot, isNotNull);
-    expect(resourceRoot!.childNodes.length, 1);
-    embedder.removeResource(resource);
-    expect(resourceRoot.childNodes.length, 0);
-  });
-
-  test('hide placeholder text for textfield', () {
-    final FlutterViewEmbedder embedder = FlutterViewEmbedder();
-    final DomHTMLInputElement regularTextField = createDomHTMLInputElement();
-    regularTextField.placeholder = 'Now you see me';
-    embedder.addResource(regularTextField);
-
-    regularTextField.focus();
-    DomCSSStyleDeclaration? style = domWindow.getComputedStyle(
-        embedder.glassPaneShadow!.querySelector('input')!,
-        '::placeholder');
-    expect(style, isNotNull);
-    expect(style.opacity, isNot('0'));
-
-    final DomHTMLInputElement textField = createDomHTMLInputElement();
-    textField.placeholder = 'Now you dont';
-    textField.classList.add('flt-text-editing');
-    embedder.addResource(textField);
-
-    textField.focus();
-    style = domWindow.getComputedStyle(
-        embedder.glassPaneShadow!.querySelector('input.flt-text-editing')!,
-        '::placeholder');
-    expect(style, isNotNull);
-    expect(style.opacity, '0');
-  }, skip: browserEngine != BrowserEngine.firefox);
-}
-
-@JS('Element.prototype.attachShadow')
-external dynamic get attachShadow;
-
-@JS('Element.prototype.attachShadow')
-external set attachShadow(dynamic x);
diff --git a/lib/web_ui/test/alarm_clock_test.dart b/lib/web_ui/test/engine/alarm_clock_test.dart
similarity index 100%
rename from lib/web_ui/test/alarm_clock_test.dart
rename to lib/web_ui/test/engine/alarm_clock_test.dart
diff --git a/lib/web_ui/test/engine/app_bootstrap_test.dart b/lib/web_ui/test/engine/app_bootstrap_test.dart
index 76d7da58c24220d1666a52b485e4c3c9e8c376f5..683073ea02c181faf42e4c5f378da75757cf2d68 100644
--- a/lib/web_ui/test/engine/app_bootstrap_test.dart
+++ b/lib/web_ui/test/engine/app_bootstrap_test.dart
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 @TestOn('browser')
+library;
 
 import 'dart:js_util';
 
@@ -27,6 +28,8 @@ void testMain() {
   });
 
   Future<void> mockInit ([JsFlutterConfiguration? configuration]) async {
+    debugOverrideJsConfiguration(configuration);
+    addTearDown(() => debugOverrideJsConfiguration(null));
     initCalled = callOrder++;
     await Future<void>.delayed(const Duration(milliseconds: 1));
   }
@@ -87,11 +90,81 @@ void testMain() {
 
     final FlutterEngineInitializer engineInitializer = bootstrap.prepareEngineInitializer();
 
-    final Object appInitializer = await promiseToFuture<Object>(callMethod<Object>(engineInitializer, 'initializeEngine', <Object?>[]));
-    final Object maybeApp = await promiseToFuture<Object>(callMethod<Object>(appInitializer, 'runApp', <Object?>[]));
-
+    final Object appInitializer = await promiseToFuture<Object>(callMethod<Object>(
+      engineInitializer,
+      'initializeEngine',
+      <Object?>[]
+    ));
+    expect(appInitializer, isA<FlutterAppRunner>());
+    final Object maybeApp = await promiseToFuture<Object>(callMethod<Object>(
+      appInitializer,
+      'runApp',
+      <Object?>[]
+    ));
     expect(maybeApp, isA<FlutterApp>());
     expect(initCalled, 1, reason: 'initEngine should have been called.');
     expect(runCalled, 2, reason: 'runApp should have been called.');
   });
+
+  group('FlutterApp', () {
+    test('has addView/removeView methods', () async {
+      final AppBootstrap bootstrap = AppBootstrap(
+        initializeEngine: mockInit,
+        runApp: mockRunApp,
+      );
+
+      final FlutterEngineInitializer engineInitializer = bootstrap.prepareEngineInitializer();
+
+      final Object appInitializer = await promiseToFuture<Object>(callMethod<Object>(
+        engineInitializer,
+        'initializeEngine',
+        <Object?>[]
+      ));
+      final Object maybeApp = await promiseToFuture<Object>(callMethod<Object>(
+        appInitializer,
+        'runApp',
+        <Object?>[]
+      ));
+
+      expect(maybeApp, isA<FlutterApp>());
+      expect(getJsProperty<dynamic>(maybeApp, 'addView'), isA<Function>());
+      expect(getJsProperty<dynamic>(maybeApp, 'removeView'), isA<Function>());
+    });
+    test('addView/removeView respectively adds/removes view', () async {
+      final AppBootstrap bootstrap = AppBootstrap(
+        initializeEngine: mockInit,
+        runApp: mockRunApp,
+      );
+
+      final FlutterEngineInitializer engineInitializer = bootstrap.prepareEngineInitializer();
+
+      final Object appInitializer = await promiseToFuture<Object>(callMethod<Object>(
+        engineInitializer,
+        'initializeEngine',
+        <dynamic>[jsify(<String, Object?>{
+          'multiViewEnabled': true,
+        })]
+      ));
+      final Object maybeApp = await promiseToFuture<Object>(callMethod<Object>(
+        appInitializer,
+        'runApp',
+        <Object?>[]
+      ));
+      final int viewId = callMethod<num>(
+        maybeApp,
+        'addView',
+        <dynamic>[jsify(<String, Object?>{
+          'hostElement': createDomElement('div'),
+        })]
+      ).toInt();
+      expect(bootstrap.viewManager[viewId], isNotNull);
+
+      callMethod<Object>(
+        maybeApp,
+        'removeView',
+        <Object>[viewId]
+      );
+      expect(bootstrap.viewManager[viewId], isNull);
+    });
+  });
 }
diff --git a/lib/web_ui/test/engine/assets_test.dart b/lib/web_ui/test/engine/assets_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..bb1b0080b4aec1b359be4ea18c6fbbeb35fdb110
--- /dev/null
+++ b/lib/web_ui/test/engine/assets_test.dart
@@ -0,0 +1,143 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+@TestOn('browser')
+library;
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
+
+import '../common/matchers.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+void testMain() {
+  group('AssetManager getAssetUrl', () {
+    setUp(() {
+      // Remove the meta-tag from the environment before each test.
+      removeAssetBaseMeta();
+    });
+
+    test('initializes with default values', () {
+      final ui_web.AssetManager assets = ui_web.AssetManager();
+
+      expect(
+        assets.getAssetUrl('asset.txt'),
+        'assets/asset.txt',
+        reason: 'Default `assetsDir` is "assets".',
+      );
+    });
+
+    test('assetsDir changes the directory where assets are stored', () {
+      final ui_web.AssetManager assets = ui_web.AssetManager(assetsDir: 'static');
+
+      expect(assets.getAssetUrl('asset.txt'), 'static/asset.txt');
+    });
+
+    test('assetBase must end with slash', () {
+      expect(() {
+        ui_web.AssetManager(assetBase: '/deployment');
+      }, throwsAssertionError);
+    });
+
+    test('assetBase can be relative', () {
+      final ui_web.AssetManager assets = ui_web.AssetManager(assetBase: 'base/');
+
+      expect(assets.getAssetUrl('asset.txt'), 'base/assets/asset.txt');
+    });
+
+    test('assetBase can be absolute', () {
+      final ui_web.AssetManager assets = ui_web.AssetManager(
+        assetBase: 'https://www.gstatic.com/my-app/',
+      );
+
+      expect(
+        assets.getAssetUrl('asset.txt'),
+        'https://www.gstatic.com/my-app/assets/asset.txt',
+      );
+    });
+
+    test('assetBase in conjunction with assetsDir, fully custom paths', () {
+      final ui_web.AssetManager assets = ui_web.AssetManager(
+        assetBase: '/asset/base/',
+        assetsDir: 'static',
+      );
+
+      expect(assets.getAssetUrl('asset.txt'), '/asset/base/static/asset.txt');
+    });
+
+    test('Fully-qualified asset URLs are untouched', () {
+      final ui_web.AssetManager assets = ui_web.AssetManager();
+
+      expect(
+        assets.getAssetUrl('https://static.my-app.com/favicon.ico'),
+        'https://static.my-app.com/favicon.ico',
+      );
+    });
+
+    test('Fully-qualified asset URLs are untouched (even with assetBase)', () {
+      final ui_web.AssetManager assets = ui_web.AssetManager(
+        assetBase: 'https://static.my-app.com/',
+      );
+
+      expect(
+        assets.getAssetUrl('https://static.my-app.com/favicon.ico'),
+        'https://static.my-app.com/favicon.ico',
+      );
+    });
+  });
+
+  group('AssetManager getAssetUrl with <meta name=assetBase> tag', () {
+    setUp(() {
+      removeAssetBaseMeta();
+      addAssetBaseMeta('/dom/base/');
+    });
+
+    test('reads value from DOM', () {
+      final ui_web.AssetManager assets = ui_web.AssetManager();
+
+      expect(assets.getAssetUrl('asset.txt'), '/dom/base/assets/asset.txt');
+    });
+
+    test('reads value from DOM (only once!)', () {
+      final ui_web.AssetManager firstManager = ui_web.AssetManager();
+      expect(
+        firstManager.getAssetUrl('asset.txt'),
+        '/dom/base/assets/asset.txt',
+      );
+
+      removeAssetBaseMeta();
+      final ui_web.AssetManager anotherManager = ui_web.AssetManager();
+
+      expect(
+        firstManager.getAssetUrl('asset.txt'),
+        '/dom/base/assets/asset.txt',
+        reason: 'The old value of the assetBase meta should be cached.',
+      );
+      expect(anotherManager.getAssetUrl('asset.txt'), 'assets/asset.txt');
+    });
+  });
+}
+
+/// Removes all meta-tags with name=assetBase.
+void removeAssetBaseMeta() {
+  domWindow.document
+      .querySelectorAll('meta[name=assetBase]')
+      .forEach((DomElement element) {
+    element.remove();
+  });
+}
+
+/// Adds a meta-tag with name=assetBase and the passed-in [value].
+void addAssetBaseMeta(String value) {
+  final DomHTMLMetaElement meta = createDomHTMLMetaElement()
+    ..name = 'assetBase'
+    ..content = value;
+
+  domDocument.head!.append(meta);
+}
diff --git a/lib/web_ui/test/browser_detect_test.dart b/lib/web_ui/test/engine/browser_detect_test.dart
similarity index 60%
rename from lib/web_ui/test/browser_detect_test.dart
rename to lib/web_ui/test/engine/browser_detect_test.dart
index ae291d0cc5bf7aef6e35523566b5f694dbcbcabe..d6ad9a838094f4d5413952df76f02ad619e8c6e0 100644
--- a/lib/web_ui/test/browser_detect_test.dart
+++ b/lib/web_ui/test/engine/browser_detect_test.dart
@@ -2,9 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:js_interop';
+
 import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/src/engine/browser_detection.dart';
+import 'package:ui/src/engine/safe_browser_api.dart';
 
 void main() {
   internalBootstrapBrowserTest(() => testMain);
@@ -46,13 +49,18 @@ void testMain() {
       String ua = 'any',
       int touchPoints = 0,
     }) {
-      expect(
+      try {
+        getUserAgent = () => ua;
+        expect(
           detectOperatingSystem(
             overridePlatform: platform,
-            overrideUserAgent: ua,
             overrideMaxTouchPoints: touchPoints,
           ),
-          expectedOs);
+          expectedOs,
+        );
+      } finally {
+        getUserAgent = defaultGetUserAgent;
+      }
     }
 
     test('Determine unknown for weird values of platform/ua', () {
@@ -152,4 +160,80 @@ void testMain() {
       );
     });
   });
+
+  group('browserSupportsCanvasKitChromium', () {
+    JSAny? oldV8BreakIterator = v8BreakIterator;
+    JSAny? oldIntlSegmenter = intlSegmenter;
+
+    setUp(() {
+      oldV8BreakIterator = v8BreakIterator;
+      oldIntlSegmenter = intlSegmenter;
+    });
+    tearDown(() {
+      v8BreakIterator = oldV8BreakIterator;
+      intlSegmenter = oldIntlSegmenter;
+      debugResetBrowserSupportsImageDecoder();
+    });
+
+    test('Detect browsers that support CanvasKit Chromium', () {
+      v8BreakIterator = Object().toJSBox; // Any non-null value.
+      intlSegmenter = Object().toJSBox; // Any non-null value.
+      browserSupportsImageDecoder = true;
+
+      expect(browserSupportsCanvaskitChromium, isTrue);
+    });
+
+    test('Detect browsers that do not support image codecs', () {
+      v8BreakIterator = Object().toJSBox; // Any non-null value.
+      intlSegmenter = Object().toJSBox; // Any non-null value.
+      browserSupportsImageDecoder = false;
+
+      // TODO(mdebbar): we don't check image codecs for now.
+      // https://github.com/flutter/flutter/issues/122331
+      expect(browserSupportsCanvaskitChromium, isTrue);
+    });
+
+    test('Detect browsers that do not support v8BreakIterator', () {
+      v8BreakIterator = null;
+      intlSegmenter = Object().toJSBox; // Any non-null value.
+      browserSupportsImageDecoder = true;
+
+      expect(browserSupportsCanvaskitChromium, isFalse);
+    });
+
+    test('Detect browsers that support neither', () {
+      v8BreakIterator = null;
+      intlSegmenter = Object().toJSBox; // Any non-null value.
+      browserSupportsImageDecoder = false;
+
+      expect(browserSupportsCanvaskitChromium, isFalse);
+    });
+
+    test('Detect browsers that support v8BreakIterator but no Intl.Segmenter', () {
+      v8BreakIterator = Object().toJSBox; // Any non-null value.
+      intlSegmenter = null;
+
+      expect(browserSupportsCanvaskitChromium, isFalse);
+    });
+  });
+
+  group('OffscreenCanvas', () {
+    test('OffscreenCanvas is detected as unsupported in Safari', () {
+      debugBrowserEngineOverride = BrowserEngine.webkit;
+      expect(OffScreenCanvas.supported, isFalse);
+      debugBrowserEngineOverride = null;
+    });
+  });
 }
+
+@JS('window.Intl.v8BreakIterator')
+external JSAny? get v8BreakIterator;
+
+@JS('window.Intl.v8BreakIterator')
+external set v8BreakIterator(JSAny? x);
+
+@JS('window.Intl.Segmenter')
+external JSAny? get intlSegmenter;
+
+@JS('window.Intl.Segmenter')
+external set intlSegmenter(JSAny? x);
diff --git a/lib/web_ui/test/engine/canvas_test.dart b/lib/web_ui/test/engine/canvas_test.dart
index 053cd9c155b6b0e91d7ed67d373f2f1a3183094b..497bed0d34416099f1a6a0e854d4a8a3edc40186 100644
--- a/lib/web_ui/test/engine/canvas_test.dart
+++ b/lib/web_ui/test/engine/canvas_test.dart
@@ -2,322 +2,81 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:math';
-import 'dart:typed_data';
-
 import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
-import 'package:ui/src/engine.dart';
 
+import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
 
+import '../common/mock_engine_canvas.dart';
+import '../common/test_initialization.dart';
+
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
 
 Future<void> testMain() async {
-  await ui.webOnlyInitializePlatform();
-  runCanvasTests(deviceClipRoundsOut: false);
-}
-
-void runCanvasTests({required bool deviceClipRoundsOut}) {
-  setUp(() {
-    EngineSemanticsOwner.debugResetSemantics();
-  });
-
-  group('ui.Canvas transform tests', () {
-    void transformsClose(Float64List value, Float64List expected) {
-      expect(expected.length, equals(16));
-      expect(value.length, equals(16));
-      for (int r = 0; r < 4; r++) {
-        for (int c = 0; c < 4; c++) {
-          expect(value[r*4 + c], closeTo(expected[r*4 + c], 1e-10));
-        }
-      }
-    }
-
-    void transformsNotClose(Float64List value, Float64List expected) {
-      // We check the lengths here even though [transformsClose] will
-      // check them so that the [TestFailure] we catch below can only
-      // be due to a difference in matrix values.
-      expect(expected.length, equals(16));
-      expect(value.length, equals(16));
-      try {
-        transformsClose(value, expected);
-      } on TestFailure {
-        return;
-      }
-      throw TestFailure('transforms were too close to equal'); // ignore: only_throw_errors
-    }
-
-    test('ui.Canvas.translate affects canvas.getTransform', () {
-      final ui.PictureRecorder recorder = ui.PictureRecorder();
-      final ui.Canvas canvas = ui.Canvas(recorder);
-      canvas.translate(12, 14.5);
-      final Float64List matrix = Matrix4.translationValues(12, 14.5, 0).toFloat64();
-      final Float64List curMatrix = canvas.getTransform();
-      transformsClose(curMatrix, matrix);
-      canvas.translate(10, 10);
-      final Float64List newCurMatrix = canvas.getTransform();
-      transformsNotClose(newCurMatrix, matrix);
-      transformsClose(curMatrix, matrix);
-    });
-
-    test('ui.Canvas.scale affects canvas.getTransform', () {
-      final ui.PictureRecorder recorder = ui.PictureRecorder();
-      final ui.Canvas canvas = ui.Canvas(recorder);
-      canvas.scale(12, 14.5);
-      final Float64List matrix = Matrix4.diagonal3Values(12, 14.5, 1).toFloat64();
-      final Float64List curMatrix = canvas.getTransform();
-      transformsClose(curMatrix, matrix);
-      canvas.scale(10, 10);
-      final Float64List newCurMatrix = canvas.getTransform();
-      transformsNotClose(newCurMatrix, matrix);
-      transformsClose(curMatrix, matrix);
-    });
-
-    test('Canvas.rotate affects canvas.getTransform', () async {
-      final ui.PictureRecorder recorder = ui.PictureRecorder();
-      final ui.Canvas canvas = ui.Canvas(recorder);
-      canvas.rotate(pi);
-      final Float64List matrix = Matrix4.rotationZ(pi).toFloat64();
-      final Float64List curMatrix = canvas.getTransform();
-      transformsClose(curMatrix, matrix);
-      canvas.rotate(pi / 2);
-      final Float64List newCurMatrix = canvas.getTransform();
-      transformsNotClose(newCurMatrix, matrix);
-      transformsClose(curMatrix, matrix);
-    });
-
-    test('Canvas.skew affects canvas.getTransform', () async {
-      final ui.PictureRecorder recorder = ui.PictureRecorder();
-      final ui.Canvas canvas = ui.Canvas(recorder);
-      canvas.skew(12, 14.5);
-      final Float64List matrix = (Matrix4.identity()..setEntry(0, 1, 12)..setEntry(1, 0, 14.5)).toFloat64();
-      final Float64List curMatrix = canvas.getTransform();
-      transformsClose(curMatrix, matrix);
-      canvas.skew(10, 10);
-      final Float64List newCurMatrix = canvas.getTransform();
-      transformsNotClose(newCurMatrix, matrix);
-      transformsClose(curMatrix, matrix);
-    });
-
-    test('Canvas.transform affects canvas.getTransform', () async {
-      final ui.PictureRecorder recorder = ui.PictureRecorder();
-      final ui.Canvas canvas = ui.Canvas(recorder);
-      final Float64List matrix = (Matrix4.identity()..translate(12.0, 14.5)..scale(12.0, 14.5)).toFloat64();
-      canvas.transform(matrix);
-      final Float64List curMatrix = canvas.getTransform();
-      transformsClose(curMatrix, matrix);
-      canvas.translate(10, 10);
-      final Float64List newCurMatrix = canvas.getTransform();
-      transformsNotClose(newCurMatrix, matrix);
-      transformsClose(curMatrix, matrix);
-    });
-  });
-
-  void rectsClose(ui.Rect value, ui.Rect expected) {
-    expect(value.left,   closeTo(expected.left,   1e-6));
-    expect(value.top,    closeTo(expected.top,    1e-6));
-    expect(value.right,  closeTo(expected.right,  1e-6));
-    expect(value.bottom, closeTo(expected.bottom, 1e-6));
-  }
-
-  void rectsNotClose(ui.Rect value, ui.Rect expected) {
-    try {
-      rectsClose(value, expected);
-    } on TestFailure {
-      return;
+  await bootstrapAndRunApp(withImplicitView: true);
+
+  group('EngineCanvas', () {
+    late MockEngineCanvas mockCanvas;
+    late ui.Paragraph paragraph;
+
+    void testCanvas(
+      String description,
+      void Function(EngineCanvas canvas) testFn, {
+      ui.Rect canvasSize = const ui.Rect.fromLTWH(0, 0, 100, 100),
+      ui.VoidCallback? whenDone,
+    }) {
+      test(description, () {
+        testFn(BitmapCanvas(canvasSize, RenderStrategy()));
+        testFn(DomCanvas(domDocument.createElement('flt-picture')));
+        testFn(mockCanvas = MockEngineCanvas());
+        whenDone?.call();
+      });
     }
-    throw TestFailure('transforms were too close to equal'); // ignore: only_throw_errors
-  }
-
-  group('ui.Canvas clip tests', () {
-    test('Canvas.clipRect affects canvas.getClipBounds', () async {
-      final ui.PictureRecorder recorder = ui.PictureRecorder();
-      final ui.Canvas canvas = ui.Canvas(recorder, const ui.Rect.fromLTRB(0, 0, 100, 100));
-      const ui.Rect clipRawBounds = ui.Rect.fromLTRB(10.2, 11.3, 20.4, 25.7);
-      const ui.Rect clipExpandedBounds = ui.Rect.fromLTRB(10, 11, 21, 26);
-      final ui.Rect clipDestBounds = deviceClipRoundsOut ? clipExpandedBounds : clipRawBounds;
-      canvas.clipRect(clipRawBounds);
-
-      // Save initial return values for testing restored values
-      final ui.Rect initialLocalBounds = canvas.getLocalClipBounds();
-      final ui.Rect initialDestinationBounds = canvas.getDestinationClipBounds();
-      rectsClose(initialLocalBounds, clipExpandedBounds);
-      rectsClose(initialDestinationBounds, clipDestBounds);
-
-      canvas.save();
-      canvas.clipRect(const ui.Rect.fromLTRB(0, 0, 15, 15));
-      // Both clip bounds have changed
-      rectsNotClose(canvas.getLocalClipBounds(), clipExpandedBounds);
-      rectsNotClose(canvas.getDestinationClipBounds(), clipDestBounds);
-      // Previous return values have not changed
-      rectsClose(initialLocalBounds, clipExpandedBounds);
-      rectsClose(initialDestinationBounds, clipDestBounds);
-      canvas.restore();
-
-      // save/restore returned the values to their original values
-      expect(canvas.getLocalClipBounds(), initialLocalBounds);
-      expect(canvas.getDestinationClipBounds(), initialDestinationBounds);
-
-      canvas.save();
-      canvas.scale(2, 2);
-      const ui.Rect scaledExpandedBounds = ui.Rect.fromLTRB(5, 5.5, 10.5, 13);
-      rectsClose(canvas.getLocalClipBounds(), scaledExpandedBounds);
-      // Destination bounds are unaffected by transform
-      rectsClose(canvas.getDestinationClipBounds(), clipDestBounds);
-      canvas.restore();
-
-      // save/restore returned the values to their original values
-      expect(canvas.getLocalClipBounds(), initialLocalBounds);
-      expect(canvas.getDestinationClipBounds(), initialDestinationBounds);
-    });
-
-    test('Canvas.clipRRect affects canvas.getClipBounds', () async {
-      final ui.PictureRecorder recorder = ui.PictureRecorder();
-      final ui.Canvas canvas = ui.Canvas(recorder, const ui.Rect.fromLTRB(0, 0, 100, 100));
-      const ui.Rect clipRawBounds = ui.Rect.fromLTRB(10.2, 11.3, 20.4, 25.7);
-      const ui.Rect clipExpandedBounds = ui.Rect.fromLTRB(10, 11, 21, 26);
-      final ui.Rect clipDestBounds = deviceClipRoundsOut ? clipExpandedBounds : clipRawBounds;
-      final ui.RRect clip = ui.RRect.fromRectAndRadius(clipRawBounds, const ui.Radius.circular(3));
-      canvas.clipRRect(clip);
-
-      // Save initial return values for testing restored values
-      final ui.Rect initialLocalBounds = canvas.getLocalClipBounds();
-      final ui.Rect initialDestinationBounds = canvas.getDestinationClipBounds();
-      rectsClose(initialLocalBounds, clipExpandedBounds);
-      rectsClose(initialDestinationBounds, clipDestBounds);
-
-      canvas.save();
-      canvas.clipRect(const ui.Rect.fromLTRB(0, 0, 15, 15));
-      // Both clip bounds have changed
-      rectsNotClose(canvas.getLocalClipBounds(), clipExpandedBounds);
-      rectsNotClose(canvas.getDestinationClipBounds(), clipDestBounds);
-      // Previous return values have not changed
-      rectsClose(initialLocalBounds, clipExpandedBounds);
-      rectsClose(initialDestinationBounds, clipDestBounds);
-      canvas.restore();
-
-      // save/restore returned the values to their original values
-      expect(canvas.getLocalClipBounds(), initialLocalBounds);
-      expect(canvas.getDestinationClipBounds(), initialDestinationBounds);
-
-      canvas.save();
-      canvas.scale(2, 2);
-      const ui.Rect scaledExpandedBounds = ui.Rect.fromLTRB(5, 5.5, 10.5, 13);
-      rectsClose(canvas.getLocalClipBounds(), scaledExpandedBounds);
-      // Destination bounds are unaffected by transform
-      rectsClose(canvas.getDestinationClipBounds(), clipDestBounds);
-      canvas.restore();
-
-      // save/restore returned the values to their original values
-      expect(canvas.getLocalClipBounds(), initialLocalBounds);
-      expect(canvas.getDestinationClipBounds(), initialDestinationBounds);
-    });
-
-    test('Canvas.clipPath affects canvas.getClipBounds', () async {
-      final ui.PictureRecorder recorder = ui.PictureRecorder();
-      final ui.Canvas canvas = ui.Canvas(recorder, const ui.Rect.fromLTRB(0, 0, 100, 100));
-      const ui.Rect clipRawBounds = ui.Rect.fromLTRB(10.2, 11.3, 20.4, 25.7);
-      const ui.Rect clipExpandedBounds = ui.Rect.fromLTRB(10, 11, 21, 26);
-      final ui.Rect clipDestBounds = deviceClipRoundsOut ? clipExpandedBounds : clipRawBounds;
-      final ui.Path clip = ui.Path()..addRect(clipRawBounds)..addOval(clipRawBounds);
-      canvas.clipPath(clip);
-
-      // Save initial return values for testing restored values
-      final ui.Rect initialLocalBounds = canvas.getLocalClipBounds();
-      final ui.Rect initialDestinationBounds = canvas.getDestinationClipBounds();
-      rectsClose(initialLocalBounds, clipExpandedBounds);
-      rectsClose(initialDestinationBounds, clipDestBounds);
-
-      canvas.save();
-      canvas.clipRect(const ui.Rect.fromLTRB(0, 0, 15, 15));
-      // Both clip bounds have changed
-      rectsNotClose(canvas.getLocalClipBounds(), clipExpandedBounds);
-      rectsNotClose(canvas.getDestinationClipBounds(), clipDestBounds);
-      // Previous return values have not changed
-      rectsClose(initialLocalBounds, clipExpandedBounds);
-      rectsClose(initialDestinationBounds, clipDestBounds);
-      canvas.restore();
-
-      // save/restore returned the values to their original values
-      expect(canvas.getLocalClipBounds(), initialLocalBounds);
-      expect(canvas.getDestinationClipBounds(), initialDestinationBounds);
-
-      canvas.save();
-      canvas.scale(2, 2);
-      const ui.Rect scaledExpandedBounds = ui.Rect.fromLTRB(5, 5.5, 10.5, 13);
-      rectsClose(canvas.getLocalClipBounds(), scaledExpandedBounds);
-      // Destination bounds are unaffected by transform
-      rectsClose(canvas.getDestinationClipBounds(), clipDestBounds);
-      canvas.restore();
-
-      // save/restore returned the values to their original values
-      expect(canvas.getLocalClipBounds(), initialLocalBounds);
-      expect(canvas.getDestinationClipBounds(), initialDestinationBounds);
-    });
-
-    test('Canvas.clipRect(diff) does not affect canvas.getClipBounds', () async {
-      final ui.PictureRecorder recorder = ui.PictureRecorder();
-      final ui.Canvas canvas = ui.Canvas(recorder, const ui.Rect.fromLTRB(0, 0, 100, 100));
-      const ui.Rect clipRawBounds = ui.Rect.fromLTRB(10.2, 11.3, 20.4, 25.7);
-      const ui.Rect clipExpandedBounds = ui.Rect.fromLTRB(10, 11, 21, 26);
-      final ui.Rect clipDestBounds = deviceClipRoundsOut ? clipExpandedBounds : clipRawBounds;
-      canvas.clipRect(clipRawBounds);
-
-      // Save initial return values for testing restored values
-      final ui.Rect initialLocalBounds = canvas.getLocalClipBounds();
-      final ui.Rect initialDestinationBounds = canvas.getDestinationClipBounds();
-      rectsClose(initialLocalBounds, clipExpandedBounds);
-      rectsClose(initialDestinationBounds, clipDestBounds);
-
-      canvas.clipRect(const ui.Rect.fromLTRB(0, 0, 15, 15), clipOp: ui.ClipOp.difference);
-      expect(canvas.getLocalClipBounds(), initialLocalBounds);
-      expect(canvas.getDestinationClipBounds(), initialDestinationBounds);
-    });
-  });
-
-  group('RestoreToCount function tests', () {
-    test('RestoreToCount can work', () async {
-      final ui.PictureRecorder recorder = ui.PictureRecorder();
-      final ui.Canvas canvas = ui.Canvas(recorder);
-      canvas.save();
-      canvas.save();
-      canvas.save();
-      canvas.save();
-      canvas.save();
-      expect(canvas.getSaveCount(), 6);
-      canvas.restoreToCount(2);
-      expect(canvas.getSaveCount(), 2);
-      canvas.restore();
-      expect(canvas.getSaveCount(), 1);
-    });
 
-    test('RestoreToCount count less than 1, the stack should be reset', () async {
-      final ui.PictureRecorder recorder = ui.PictureRecorder();
-      final ui.Canvas canvas = ui.Canvas(recorder);
-      canvas.save();
-      canvas.save();
-      canvas.save();
-      canvas.save();
-      canvas.save();
-      expect(canvas.getSaveCount(), equals(6));
-      canvas.restoreToCount(0);
-      expect(canvas.getSaveCount(), equals(1));
+    testCanvas('draws laid out paragraph', (EngineCanvas canvas) {
+      const ui.Rect screenRect = ui.Rect.fromLTWH(0, 0, 100, 100);
+      final RecordingCanvas recordingCanvas = RecordingCanvas(screenRect);
+      final ui.ParagraphBuilder builder =
+          ui.ParagraphBuilder(ui.ParagraphStyle());
+      builder.addText('sample');
+      paragraph = builder.build();
+      paragraph.layout(const ui.ParagraphConstraints(width: 100));
+      recordingCanvas.drawParagraph(paragraph, const ui.Offset(10, 10));
+      recordingCanvas.endRecording();
+      canvas.clear();
+      recordingCanvas.apply(canvas, screenRect);
+    }, whenDone: () {
+      expect(mockCanvas.methodCallLog, hasLength(3));
+
+      MockCanvasCall call = mockCanvas.methodCallLog[0];
+      expect(call.methodName, 'clear');
+
+      call = mockCanvas.methodCallLog[1];
+      expect(call.methodName, 'drawParagraph');
+      final Map<dynamic, dynamic> arguments = call.arguments as Map<dynamic, dynamic>;
+      expect(arguments['paragraph'], paragraph);
+      expect(arguments['offset'], const ui.Offset(10, 10));
     });
 
-    test('RestoreToCount count greater than current [getSaveCount]', () async {
-      final ui.PictureRecorder recorder = ui.PictureRecorder();
-      final ui.Canvas canvas = ui.Canvas(recorder);
-      canvas.save();
-      canvas.save();
-      canvas.save();
-      canvas.save();
-      canvas.save();
-      expect(canvas.getSaveCount(), equals(6));
-      canvas.restoreToCount(canvas.getSaveCount() + 1);
-      expect(canvas.getSaveCount(), equals(6));
+    testCanvas('ignores paragraphs that were not laid out',
+        (EngineCanvas canvas) {
+      const ui.Rect screenRect = ui.Rect.fromLTWH(0, 0, 100, 100);
+      final RecordingCanvas recordingCanvas = RecordingCanvas(screenRect);
+      final ui.ParagraphBuilder builder =
+          ui.ParagraphBuilder(ui.ParagraphStyle());
+      builder.addText('sample');
+      final ui.Paragraph paragraph = builder.build();
+      recordingCanvas.drawParagraph(paragraph, const ui.Offset(10, 10));
+      recordingCanvas.endRecording();
+      canvas.clear();
+      recordingCanvas.apply(canvas, screenRect);
+    }, whenDone: () {
+      expect(mockCanvas.methodCallLog, hasLength(2));
+      expect(mockCanvas.methodCallLog[0].methodName, 'clear');
+      expect(mockCanvas.methodCallLog[1].methodName, 'endOfPaint');
     });
   });
 }
diff --git a/lib/web_ui/test/channel_buffers_test.dart b/lib/web_ui/test/engine/channel_buffers_test.dart
similarity index 98%
rename from lib/web_ui/test/channel_buffers_test.dart
rename to lib/web_ui/test/engine/channel_buffers_test.dart
index 924d545aeccc71e43eb5bf985db9be2f0070bacd..7bc79d33979575e0b06e99e2343839ba6d158b2a 100644
--- a/lib/web_ui/test/channel_buffers_test.dart
+++ b/lib/web_ui/test/engine/channel_buffers_test.dart
@@ -15,6 +15,7 @@ import 'dart:typed_data';
 
 import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
+import 'package:ui/src/engine/browser_detection.dart';
 import 'package:ui/ui.dart' as ui;
 
 void main() {
@@ -22,7 +23,7 @@ void main() {
 }
 
 ByteData _makeByteData(String str) {
-  final Uint8List list = utf8.encode(str) as Uint8List;
+  final Uint8List list = utf8.encode(str);
   final ByteBuffer buffer = list.buffer;
   return ByteData.view(buffer);
 }
@@ -125,13 +126,10 @@ void testMain() {
       switch (counter) {
         case 0:
           expect(drainedData, equals(two));
-          break;
         case 1:
           expect(drainedData, equals(three));
-          break;
         case 2:
           expect(drainedData, equals(four));
-          break;
       }
       counter += 1;
       return Future<void>.value();
@@ -320,7 +318,7 @@ void testMain() {
       'a2: four',
       '-7',
     ]);
-  });
+  }, skip: isWasm); // https://github.com/dart-lang/sdk/issues/50778
 
   test('ChannelBuffers.handleMessage for resize', () async {
     final List<String> log = <String>[];
diff --git a/lib/web_ui/test/clipboard_test.dart b/lib/web_ui/test/engine/clipboard_test.dart
similarity index 64%
rename from lib/web_ui/test/clipboard_test.dart
rename to lib/web_ui/test/engine/clipboard_test.dart
index 48578bf246b5b3b0e90c57e12a3274864e547430..bad7902156ca625fe9c79defd1ddb3d53dc83386 100644
--- a/lib/web_ui/test/clipboard_test.dart
+++ b/lib/web_ui/test/engine/clipboard_test.dart
@@ -9,12 +9,14 @@ import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 
+import '../common/test_initialization.dart';
+
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
 
 Future<void> testMain() async {
-  await initializeTestFlutterViewEmbedder();
+  setUpUnitTests();
   group('message handler', () {
     const String testText = 'test text';
 
@@ -56,7 +58,7 @@ Future<void> testMain() async {
       const MethodCodec codec = JSONMethodCodec();
       final Completer<ByteData> completer = Completer<ByteData>();
       void callback(ByteData? data) {
-        completer.complete(data);
+        completer.complete(data!);
       }
 
       clipboardMessageHandler.setDataMethodCall(
@@ -85,6 +87,48 @@ Future<void> testMain() async {
       final Map<String, dynamic> result = await completer.future;
       expect(result['text'], testText);
     });
+
+    test('has strings true', () async {
+      clipboardAPIPasteStrategy.testResult = testText;
+      const MethodCodec codec = JSONMethodCodec();
+      final Completer<Map<String, dynamic>> completer = Completer<Map<String, dynamic>>();
+      void callback(ByteData? data) {
+        completer.complete(codec.decodeEnvelope(data!) as Map<String, dynamic>);
+      }
+
+      clipboardMessageHandler.hasStringsMethodCall(callback);
+
+      final Map<String, dynamic> result = await completer.future;
+      expect(result['value'], isTrue);
+    });
+
+    test('has strings false', () async {
+      clipboardAPIPasteStrategy.testResult = '';
+      const MethodCodec codec = JSONMethodCodec();
+      final Completer<Map<String, dynamic>> completer = Completer<Map<String, dynamic>>();
+      void callback(ByteData? data) {
+        completer.complete(codec.decodeEnvelope(data!) as Map<String, dynamic>);
+      }
+
+      clipboardMessageHandler.hasStringsMethodCall(callback);
+
+      final Map<String, dynamic> result = await completer.future;
+      expect(result['value'], isFalse);
+    });
+
+    test('has strings error', () async {
+      clipboardAPIPasteStrategy.errors = true;
+      const MethodCodec codec = JSONMethodCodec();
+      final Completer<Map<String, dynamic>> completer = Completer<Map<String, dynamic>>();
+      void callback(ByteData? data) {
+        completer.complete(codec.decodeEnvelope(data!) as Map<String, dynamic>);
+      }
+
+      clipboardMessageHandler.hasStringsMethodCall(callback);
+
+      final Map<String, dynamic> result = await completer.future;
+      expect(result['value'], isFalse);
+    });
   });
 }
 
@@ -100,8 +144,14 @@ class MockClipboardAPICopyStrategy implements ClipboardAPICopyStrategy {
 class MockClipboardAPIPasteStrategy implements ClipboardAPIPasteStrategy {
   String testResult = '';
 
+  // Whether getData's Future will resolve with an error.
+  bool errors = false;
+
   @override
   Future<String> getData() {
+    if (errors) {
+      return Future<String>.error(Error());
+    }
     return Future<String>.value(testResult);
   }
 }
diff --git a/lib/web_ui/test/composition_test.dart b/lib/web_ui/test/engine/composition_test.dart
similarity index 74%
rename from lib/web_ui/test/composition_test.dart
rename to lib/web_ui/test/engine/composition_test.dart
index 5d4b9fb6a89d680c3f1bcd4eb248904f27d36cd0..6e743139bd47d54a1f5ffb462b809a1d9db0fcd0 100644
--- a/lib/web_ui/test/composition_test.dart
+++ b/lib/web_ui/test/engine/composition_test.dart
@@ -9,10 +9,11 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine/browser_detection.dart';
 
 import 'package:ui/src/engine/dom.dart';
-import 'package:ui/src/engine/initialization.dart';
 import 'package:ui/src/engine/text_editing/composition_aware_mixin.dart';
 import 'package:ui/src/engine/text_editing/text_editing.dart';
 
+import '../common/test_initialization.dart';
+
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
@@ -47,7 +48,7 @@ GloballyPositionedTextEditingStrategy _enableEditingStrategy({
 }
 
 Future<void> testMain() async {
-  await initializeEngine();
+  await bootstrapAndRunApp(withImplicitView: true);
 
   const String fakeComposingText = 'ImComposingText';
 
@@ -106,14 +107,81 @@ Future<void> testMain() async {
     });
 
     group('determine composition state', () {
-      test('should return new composition state if valid new composition', () {
-        const int baseOffset = 100;
+      test('should return editing state if extentOffset is null', () {
+        final EditingState editingState = EditingState(text: 'Test');
+
+        final _MockWithCompositionAwareMixin mockWithCompositionAwareMixin =
+            _MockWithCompositionAwareMixin();
+        mockWithCompositionAwareMixin.composingText = 'Test';
+
+        expect(
+          mockWithCompositionAwareMixin.determineCompositionState(editingState),
+          editingState,
+        );
+      });
+
+      test('should return editing state if composingText is null', () {
+        final EditingState editingState = EditingState(
+          text: 'Test',
+          baseOffset: 0,
+          extentOffset: 4,
+        );
+
+        final _MockWithCompositionAwareMixin mockWithCompositionAwareMixin =
+            _MockWithCompositionAwareMixin();
+
+        expect(
+          mockWithCompositionAwareMixin.determineCompositionState(editingState),
+          editingState,
+        );
+      });
+
+      test('should return editing state if text is null', () {
+        final EditingState editingState = EditingState(
+          baseOffset: 0,
+          extentOffset: 0,
+        );
+
+        final _MockWithCompositionAwareMixin mockWithCompositionAwareMixin =
+            _MockWithCompositionAwareMixin();
+        mockWithCompositionAwareMixin.composingText = 'Test';
+
+        expect(
+          mockWithCompositionAwareMixin.determineCompositionState(editingState),
+          editingState,
+        );
+      });
+
+      test(
+          'should return editing state if extentOffset is smaller than composingText length',
+          () {
         const String composingText = 'composeMe';
 
         final EditingState editingState = EditingState(
-          extentOffset: baseOffset,
-          text: 'testing',
+          text: 'Test',
+          baseOffset: 0,
+          extentOffset: 4,
+        );
+
+        final _MockWithCompositionAwareMixin mockWithCompositionAwareMixin =
+            _MockWithCompositionAwareMixin();
+        mockWithCompositionAwareMixin.composingText = composingText;
+
+        expect(
+          mockWithCompositionAwareMixin.determineCompositionState(editingState),
+          editingState,
+        );
+      });
+
+      test('should return new composition state - compositing middle of text',
+          () {
+        const int baseOffset = 7;
+        const String composingText = 'Test';
+
+        final EditingState editingState = EditingState(
+          text: 'Testing',
           baseOffset: baseOffset,
+          extentOffset: baseOffset,
         );
 
         final _MockWithCompositionAwareMixin mockWithCompositionAwareMixin =
@@ -123,10 +191,38 @@ Future<void> testMain() async {
         const int expectedComposingBase = baseOffset - composingText.length;
 
         expect(
-            mockWithCompositionAwareMixin.determineCompositionState(editingState),
+          mockWithCompositionAwareMixin.determineCompositionState(editingState),
+          editingState.copyWith(
+            composingBaseOffset: expectedComposingBase,
+            composingExtentOffset: expectedComposingBase + composingText.length,
+          ),
+        );
+      });
+
+      test(
+          'should return new composition state - compositing from beginning of text',
+          () {
+        const String composingText = '今日は';
+
+        final EditingState editingState = EditingState(
+          text: '今日は',
+          baseOffset: 0,
+          extentOffset: 3,
+        );
+
+        final _MockWithCompositionAwareMixin mockWithCompositionAwareMixin =
+            _MockWithCompositionAwareMixin();
+        mockWithCompositionAwareMixin.composingText = composingText;
+
+        const int expectedComposingBase = 0;
+
+        expect(
+            mockWithCompositionAwareMixin
+                .determineCompositionState(editingState),
             editingState.copyWith(
                 composingBaseOffset: expectedComposingBase,
-                composingExtentOffset: expectedComposingBase + composingText.length));
+                composingExtentOffset:
+                    expectedComposingBase + composingText.length));
       });
     });
   });
diff --git a/lib/web_ui/test/engine/configuration_test.dart b/lib/web_ui/test/engine/configuration_test.dart
index 7b3f819d4af51c1ca685b1af617b2b9793c9df27..60eca6cab9424dfa04c6328053e42d94027b9292 100644
--- a/lib/web_ui/test/engine/configuration_test.dart
+++ b/lib/web_ui/test/engine/configuration_test.dart
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 @TestOn('browser')
+library;
 
 import 'package:js/js_util.dart' as js_util;
 
@@ -10,7 +11,7 @@ import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 
-import '../matchers.dart';
+import '../common/matchers.dart';
 
 void main() {
   internalBootstrapBrowserTest(() => testMain);
@@ -21,16 +22,16 @@ void testMain() {
     test('initializes with null', () async {
       final FlutterConfiguration config = FlutterConfiguration.legacy(null);
 
-      expect(config.canvasKitMaximumSurfaces, 8); // _defaultCanvasKitMaximumSurfaces
+      expect(config.canvasKitBaseUrl, 'canvaskit/'); // _defaultCanvasKitBaseUrl
     });
 
     test('legacy constructor initializes with a Js Object', () async {
       final FlutterConfiguration config = FlutterConfiguration.legacy(
         js_util.jsify(<String, Object?>{
-          'canvasKitMaximumSurfaces': 16,
+          'canvasKitBaseUrl': 'some_other_url/',
         }) as JsFlutterConfiguration);
 
-      expect(config.canvasKitMaximumSurfaces, 16);
+      expect(config.canvasKitBaseUrl, 'some_other_url/');
     });
   });
 
@@ -38,13 +39,13 @@ void testMain() {
     test('throws assertion error if already initialized from JS', () async {
       final FlutterConfiguration config = FlutterConfiguration.legacy(
         js_util.jsify(<String, Object?>{
-          'canvasKitMaximumSurfaces': 12,
+          'canvasKitBaseUrl': 'some_other_url/',
         }) as JsFlutterConfiguration);
 
       expect(() {
         config.setUserConfiguration(
           js_util.jsify(<String, Object?>{
-            'canvasKitMaximumSurfaces': 16,
+            'canvasKitBaseUrl': 'yet_another_url/',
           }) as JsFlutterConfiguration);
       }, throwsAssertionError);
     });
@@ -54,10 +55,98 @@ void testMain() {
 
       config.setUserConfiguration(
         js_util.jsify(<String, Object?>{
-          'canvasKitMaximumSurfaces': 16,
+          'canvasKitBaseUrl': 'one_more_url/',
         }) as JsFlutterConfiguration);
 
-      expect(config.canvasKitMaximumSurfaces, 16);
+      expect(config.canvasKitBaseUrl, 'one_more_url/');
+    });
+
+    test('can receive non-existing properties without crashing', () async {
+      final FlutterConfiguration config = FlutterConfiguration.legacy(null);
+
+      expect(() {
+        config.setUserConfiguration(
+          js_util.jsify(<String, Object?>{
+            'canvasKitMaximumSurfaces': 32.0,
+          }) as JsFlutterConfiguration);
+      }, returnsNormally);
+    });
+  });
+
+  group('Default configuration values', () {
+    late FlutterConfiguration defaultConfig;
+    setUp(() {
+      defaultConfig = FlutterConfiguration();
+      defaultConfig.setUserConfiguration(
+        js_util.jsify(<String, Object?>{}) as JsFlutterConfiguration,
+      );
+    });
+
+    test('canvasKitVariant', () {
+      expect(defaultConfig.canvasKitVariant, CanvasKitVariant.auto);
+    });
+
+    test('useColorEmoji', () {
+      expect(defaultConfig.useColorEmoji, isFalse);
+    });
+
+    test('multiViewEnabled', () {
+      expect(defaultConfig.multiViewEnabled, isFalse);
+    });
+
+  });
+
+  group('setUserConfiguration (values)', () {
+    group('canvasKitVariant', () {
+      test('value undefined - defaults to "auto"', () {
+        final FlutterConfiguration config = FlutterConfiguration();
+        config.setUserConfiguration(
+          // With an empty map, the canvasKitVariant is undefined in JS.
+          js_util.jsify(<String, Object?>{}) as JsFlutterConfiguration,
+        );
+
+        expect(config.canvasKitVariant, CanvasKitVariant.auto);
+      });
+
+      test('value - converts to CanvasKitVariant enum (or throw)', () {
+        final FlutterConfiguration config = FlutterConfiguration();
+
+        config.setUserConfiguration(
+          js_util.jsify(<String, Object?>{'canvasKitVariant': 'foo'}) as JsFlutterConfiguration,
+        );
+        expect(() => config.canvasKitVariant, throwsArgumentError);
+
+        config.setUserConfiguration(
+          js_util.jsify(<String, Object?>{'canvasKitVariant': 'auto'}) as JsFlutterConfiguration,
+        );
+        expect(config.canvasKitVariant, CanvasKitVariant.auto);
+
+        config.setUserConfiguration(
+          js_util.jsify(<String, Object?>{'canvasKitVariant': 'full'}) as JsFlutterConfiguration,
+        );
+        expect(config.canvasKitVariant, CanvasKitVariant.full);
+
+        config.setUserConfiguration(
+          js_util.jsify(<String, Object?>{'canvasKitVariant': 'chromium'}) as JsFlutterConfiguration,
+        );
+        expect(config.canvasKitVariant, CanvasKitVariant.chromium);
+      });
+    });
+
+    test('useColorEmoji', () {
+      final FlutterConfiguration config = FlutterConfiguration();
+      config.setUserConfiguration(
+        js_util.jsify(<String, Object?>{'useColorEmoji': true}) as JsFlutterConfiguration,
+      );
+      expect(config.useColorEmoji, isTrue);
+    });
+
+    test('multiViewEnabled', () {
+      final FlutterConfiguration config = FlutterConfiguration();
+      config.setUserConfiguration(
+        js_util.jsify(<String, Object?>{'multiViewEnabled': true}) as JsFlutterConfiguration,
+      );
+      expect(config.multiViewEnabled, isTrue);
     });
   });
 }
diff --git a/lib/web_ui/test/canvaskit/frame_timings_test.dart b/lib/web_ui/test/engine/display_test.dart
similarity index 36%
rename from lib/web_ui/test/canvaskit/frame_timings_test.dart
rename to lib/web_ui/test/engine/display_test.dart
index 7cab6bc8f0247d0ab751867f89d2bf38175460c2..c44b82220b71bdc7b6207e78172b5eabb1c72bc6 100644
--- a/lib/web_ui/test/canvaskit/frame_timings_test.dart
+++ b/lib/web_ui/test/engine/display_test.dart
@@ -4,20 +4,28 @@
 
 import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
-
-import '../frame_timings_common.dart';
-import 'common.dart';
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui;
 
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
 
 void testMain() {
-  group('frame timings', () {
-    setUpCanvasKitTest();
+  group('EngineFlutterDisplay', () {
+    test('overrides and restores devicePixelRatio', () {
+      final EngineFlutterDisplay display = EngineFlutterDisplay(
+        id: 0,
+        size: const ui.Size(100.0, 100.0),
+        refreshRate: 60.0,
+      );
+
+      final double originalDevicePixelRatio = display.devicePixelRatio;
+      display.debugOverrideDevicePixelRatio(99.3);
+      expect(display.devicePixelRatio, 99.3);
 
-    test('collects frame timings', () async {
-      await runFrameTimingsTest();
+      display.debugOverrideDevicePixelRatio(null);
+      expect(display.devicePixelRatio, originalDevicePixelRatio);
     });
   });
 }
diff --git a/lib/web_ui/test/engine/dom_http_fetch_test.dart b/lib/web_ui/test/engine/dom_http_fetch_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..fbe48969d4890a5c1dfd0e8221dd8e45b423936d
--- /dev/null
+++ b/lib/web_ui/test/engine/dom_http_fetch_test.dart
@@ -0,0 +1,234 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:js_interop';
+import 'dart:typed_data';
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+
+import '../common/test_initialization.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+Future<void> testMain() async {
+  await bootstrapAndRunApp();
+
+  // Test successful HTTP roundtrips where the server returns a happy status
+  // code and a payload.
+  await _testSuccessfulPayloads();
+
+  // Test successful HTTP roundtrips where the server returned something other
+  // than a happy result (404 in particular is a common one).
+  await _testHttpErrorCodes();
+
+  // Test network errors that prevent the HTTP roundtrip to complete. These
+  // errors include invalid URLs, CORS issues, lost internet access, etc.
+  await _testNetworkErrors();
+
+  test('window.fetch is banned', () async {
+    expect(
+      () => domWindow.fetch('/'),
+      throwsA(isA<UnsupportedError>()),
+    );
+  });
+}
+
+Future<void> _testSuccessfulPayloads() async {
+  test('httpFetch fetches a text file', () async {
+    final HttpFetchResponse response = await httpFetch('/lib/src/engine/alarm_clock.dart');
+    expect(response.status, 200);
+    expect(response.contentLength, greaterThan(0));
+    expect(response.hasPayload, isTrue);
+    expect(response.payload, isNotNull);
+    expect(response.url, '/lib/src/engine/alarm_clock.dart');
+    expect(
+      await response.text(),
+      startsWith('''
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.'''),
+    );
+  });
+
+  test('httpFetch fetches a binary file as ByteBuffer', () async {
+    final HttpFetchResponse response = await httpFetch('/test_images/1x1.png');
+    expect(response.status, 200);
+    expect(response.contentLength, greaterThan(0));
+    expect(response.hasPayload, isTrue);
+    expect(response.payload, isNotNull);
+    expect(response.url, '/test_images/1x1.png');
+    expect(
+      (await response.asByteBuffer()).asUint8List().sublist(0, 8),
+      <int>[0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A],
+    );
+  });
+
+  test('httpFetch fetches a binary file as Uint8List', () async {
+    final HttpFetchResponse response = await httpFetch('/test_images/1x1.png');
+    expect(response.status, 200);
+    expect(response.contentLength, greaterThan(0));
+    expect(response.hasPayload, isTrue);
+    expect(response.payload, isNotNull);
+    expect(response.url, '/test_images/1x1.png');
+    expect(
+      (await response.asUint8List()).sublist(0, 8),
+      <int>[0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A],
+    );
+  });
+
+  test('httpFetch fetches json', () async {
+    final HttpFetchResponse response = await httpFetch('/test_images/');
+    expect(response.status, 200);
+    expect(response.contentLength, greaterThan(0));
+    expect(response.hasPayload, isTrue);
+    expect(response.payload, isNotNull);
+    expect(response.url, '/test_images/');
+    expect(
+      await response.json(),
+      isA<List<Object?>>(),
+    );
+  });
+
+  test('httpFetch reads data in chunks', () async {
+    // There is no guarantee that the server will actually serve the data in any
+    // particular chunk sizes, but breaking up the data in _some_ way does cause
+    // it to chunk it.
+    const List<List<int>> lengthAndChunks = <List<int>>[
+      <int>[0, 0],
+      <int>[10, 10],
+      <int>[1000, 100],
+      <int>[10000, 1000],
+      <int>[100000, 10000],
+    ];
+    for (final List<int> lengthAndChunk in lengthAndChunks) {
+      final int length = lengthAndChunk.first;
+      final int chunkSize = lengthAndChunk.last;
+      final String url = '/long_test_payload?length=$length&chunk=$chunkSize';
+      final HttpFetchResponse response = await httpFetch(url);
+      expect(response.status, 200);
+      expect(response.contentLength, length);
+      expect(response.hasPayload, isTrue);
+      expect(response.payload, isNotNull);
+      expect(response.url, url);
+
+      final List<int> result = <int>[];
+      await response.payload.read<JSUint8Array>((JSUint8Array chunk) => result.addAll(chunk.toDart));
+      expect(result, hasLength(length));
+      expect(
+        result,
+        List<int>.generate(length, (int i) => i & 0xFF),
+      );
+    }
+  });
+
+  test('httpFetchText fetches a text file', () async {
+    final String text = await httpFetchText('/lib/src/engine/alarm_clock.dart');
+    expect(
+      text,
+      startsWith('''
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.'''),
+    );
+  });
+
+  test('httpFetchByteBuffer fetches a binary file as ByteBuffer', () async {
+    final ByteBuffer response = await httpFetchByteBuffer('/test_images/1x1.png');
+    expect(
+      response.asUint8List().sublist(0, 8),
+      <int>[0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A],
+    );
+  });
+
+  test('httpFetchJson fetches json', () async {
+    final Object? json = await httpFetchJson('/test_images/');
+    expect(json, isA<List<Object?>>());
+  });
+}
+
+Future<void> _testHttpErrorCodes() async {
+  test('httpFetch throws HttpFetchNoPayloadError on 404', () async {
+    final HttpFetchResponse response = await httpFetch('/file_not_found');
+    expect(response.status, 404);
+    expect(response.hasPayload, isFalse);
+    expect(response.url, '/file_not_found');
+
+    try {
+      // Attempting to read the payload when there isn't one should result in
+      // HttpFetchNoPayloadError thrown.
+      response.payload;
+      fail('Expected HttpFetchNoPayloadError');
+    } on HttpFetchNoPayloadError catch(error) {
+      expect(error.status, 404);
+      expect(error.url, '/file_not_found');
+      expect(
+        error.toString(),
+        'Flutter Web engine failed to fetch "/file_not_found". '
+        'HTTP request succeeded, but the server responded with HTTP status 404.',
+      );
+    }
+  });
+
+  test('httpFetch* functions throw HttpFetchNoPayloadError on 404', () async {
+    final List<AsyncCallback> testFunctions = <AsyncCallback>[
+      () async => httpFetchText('/file_not_found'),
+      () async => httpFetchByteBuffer('/file_not_found'),
+      () async => httpFetchJson('/file_not_found'),
+    ];
+
+    for (final AsyncCallback testFunction in testFunctions) {
+      try {
+        await testFunction();
+        fail('Expected HttpFetchNoPayloadError');
+      } on HttpFetchNoPayloadError catch(error) {
+        expect(error.status, 404);
+        expect(error.url, '/file_not_found');
+        expect(
+          error.toString(),
+          'Flutter Web engine failed to fetch "/file_not_found". '
+          'HTTP request succeeded, but the server responded with HTTP status 404.',
+        );
+      }
+    }
+  });
+}
+
+Future<void> _testNetworkErrors() async {
+  test('httpFetch* functions throw HttpFetchError on network errors', () async {
+    // Fetch throws the error this test wants on URLs with user credentials.
+    const String badUrl = 'https://user:password@example.com/';
+
+    final List<AsyncCallback> testFunctions = <AsyncCallback>[
+      () async => httpFetch(badUrl),
+      () async => httpFetchText(badUrl),
+      () async => httpFetchByteBuffer(badUrl),
+      () async => httpFetchJson(badUrl),
+    ];
+
+    for (final AsyncCallback testFunction in testFunctions) {
+      try {
+        await testFunction();
+        fail('Expected HttpFetchError');
+      } on HttpFetchError catch(error) {
+        expect(error.url, badUrl);
+        expect(
+          error.toString(),
+          // Browsers agree on throwing a TypeError, but they disagree on the
+          // error message. So this only checks for the common error prefix, but
+          // not the entire error message.
+          startsWith(
+            'Flutter Web engine failed to complete HTTP request to fetch '
+            '"https://user:password@example.com/": TypeError: '
+          ),
+        );
+      }
+    }
+  });
+}
+
+typedef AsyncCallback = Future<void> Function();
diff --git a/lib/web_ui/test/geometry_test.dart b/lib/web_ui/test/engine/geometry_test.dart
similarity index 87%
rename from lib/web_ui/test/geometry_test.dart
rename to lib/web_ui/test/engine/geometry_test.dart
index 24150d801cdf406dc55f28343ebf038fd0b1e313..d1a9d89580d76b85e6ab11635121f1ff4b1fa36f 100644
--- a/lib/web_ui/test/geometry_test.dart
+++ b/lib/web_ui/test/engine/geometry_test.dart
@@ -13,6 +13,8 @@ import 'package:test/test.dart';
 
 import 'package:ui/ui.dart';
 
+import '../common/matchers.dart';
+
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
@@ -31,34 +33,32 @@ void testMain() {
   });
   test('Offset.fromDirection', () {
     expect(Offset.fromDirection(0.0, 0.0), const Offset(0.0, 0.0));
-    expect(Offset.fromDirection(pi / 2.0).dx,
-        closeTo(0.0, 1e-12)); // aah, floating point math. i love you so.
-    expect(Offset.fromDirection(pi / 2.0).dy, 1.0);
-    expect(Offset.fromDirection(-pi / 2.0).dx, closeTo(0.0, 1e-12));
-    expect(Offset.fromDirection(-pi / 2.0).dy, -1.0);
+     // aah, floating point math. i love you so.
+    expect(Offset.fromDirection(pi / 2.0), within(from: const Offset(0.0, 1.0)));
+    expect(Offset.fromDirection(-pi / 2.0), within(from: const Offset(0.0, -1.0)));
     expect(Offset.fromDirection(0.0), const Offset(1.0, 0.0));
-    expect(Offset.fromDirection(pi / 4.0).dx,
-        closeTo(1.0 / math.sqrt(2.0), 1e-12));
-    expect(Offset.fromDirection(pi / 4.0).dy,
-        closeTo(1.0 / math.sqrt(2.0), 1e-12));
-    expect(Offset.fromDirection(-pi / 4.0).dx,
-        closeTo(1.0 / math.sqrt(2.0), 1e-12));
-    expect(Offset.fromDirection(-pi / 4.0).dy,
-        closeTo(-1.0 / math.sqrt(2.0), 1e-12));
-    expect(Offset.fromDirection(pi).dx, -1.0);
-    expect(Offset.fromDirection(pi).dy, closeTo(0.0, 1e-12));
-    expect(Offset.fromDirection(pi * 3.0 / 4.0).dx,
-        closeTo(-1.0 / math.sqrt(2.0), 1e-12));
-    expect(Offset.fromDirection(pi * 3.0 / 4.0).dy,
-        closeTo(1.0 / math.sqrt(2.0), 1e-12));
-    expect(Offset.fromDirection(-pi * 3.0 / 4.0).dx,
-        closeTo(-1.0 / math.sqrt(2.0), 1e-12));
-    expect(Offset.fromDirection(-pi * 3.0 / 4.0).dy,
-        closeTo(-1.0 / math.sqrt(2.0), 1e-12));
+    expect(
+      Offset.fromDirection(pi / 4.0),
+      within(from: Offset(1.0 / math.sqrt(2.0), 1.0 / math.sqrt(2.0))),
+    );
+    expect(
+      Offset.fromDirection(-pi / 4.0),
+      within(from: Offset(1.0 / math.sqrt(2.0), -1.0 / math.sqrt(2.0))),
+    );
+    expect(Offset.fromDirection(pi), within(from: const Offset(-1.0, 0.0)));
+    expect(
+      Offset.fromDirection(pi * 3.0 / 4.0),
+      within(from: Offset(-1.0 / math.sqrt(2.0), 1.0 / math.sqrt(2.0))),
+    );
+    expect(
+      Offset.fromDirection(-pi * 3.0 / 4.0),
+      within(from: Offset(-1.0 / math.sqrt(2.0), -1.0 / math.sqrt(2.0))),
+    );
     expect(Offset.fromDirection(0.0, 2.0), const Offset(2.0, 0.0));
     expect(
-        Offset.fromDirection(pi / 6, 2.0).dx, closeTo(math.sqrt(3.0), 1e-12));
-    expect(Offset.fromDirection(pi / 6, 2.0).dy, closeTo(1.0, 1e-12));
+      Offset.fromDirection(pi / 6, 2.0),
+      within(from: Offset(math.sqrt(3.0), 1.0)),
+    );
   });
   test('Size.aspectRatio', () {
     expect(const Size(0.0, 0.0).aspectRatio, 0.0);
diff --git a/lib/web_ui/test/gesture_settings_test.dart b/lib/web_ui/test/engine/gesture_settings_test.dart
similarity index 93%
rename from lib/web_ui/test/gesture_settings_test.dart
rename to lib/web_ui/test/engine/gesture_settings_test.dart
index 21e896edb2df3f4d2e6e34557563bf1d9e35ae26..c86414e13c06669a0968a771518f00ce696d15fb 100644
--- a/lib/web_ui/test/gesture_settings_test.dart
+++ b/lib/web_ui/test/engine/gesture_settings_test.dart
@@ -13,10 +13,10 @@ void main() {
 void testMain() {
   test('GestureSettings has a reasonable toString', () {
     const GestureSettings gestureSettings =
-        GestureSettings(physicalDoubleTapSlop: 2.0, physicalTouchSlop: 1.0);
+        GestureSettings(physicalDoubleTapSlop: 2.5, physicalTouchSlop: 1.5);
 
     expect(gestureSettings.toString(),
-        'GestureSettings(physicalTouchSlop: 1, physicalDoubleTapSlop: 2)');
+        'GestureSettings(physicalTouchSlop: 1.5, physicalDoubleTapSlop: 2.5)');
   });
 
   test('GestureSettings has a correct equality', () {
diff --git a/lib/web_ui/test/engine/global_styles_test.dart b/lib/web_ui/test/engine/global_styles_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..f87dd1633dbc36cbc4e29b5cb836064a0708fb86
--- /dev/null
+++ b/lib/web_ui/test/engine/global_styles_test.dart
@@ -0,0 +1,119 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+
+const String _kDefaultCssFont = '14px monospace';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+void testMain() {
+  late DomHTMLStyleElement styleElement;
+
+  setUp(() {
+    styleElement = createDomHTMLStyleElement(null);
+    applyGlobalCssRulesToSheet(
+      styleElement,
+      defaultCssFont: _kDefaultCssFont,
+    );
+  });
+
+  tearDown(() {
+    styleElement.remove();
+  });
+
+  test('createDomHTMLStyleElement sets a nonce value, when passed', () {
+    expect(styleElement.nonce, isEmpty);
+
+    final DomHTMLStyleElement style = createDomHTMLStyleElement('a-nonce-value');
+    expect(style.nonce, 'a-nonce-value');
+  });
+
+  test('(Self-test) hasCssRule can extract rules', () {
+    final bool hasRule = hasCssRule(styleElement,
+        selector: '.flt-text-editing::placeholder', declaration: 'opacity: 0');
+
+    final bool hasFakeRule = hasCssRule(styleElement,
+        selector: 'input::selection', declaration: 'color: #fabada;');
+
+    expect(hasRule, isTrue);
+    expect(hasFakeRule, isFalse);
+  });
+
+  test('Attaches styling to remove password reveal icons on Edge', () {
+    // Check that style.sheet! contains input::-ms-reveal rule
+    final bool hidesRevealIcons = hasCssRule(styleElement,
+        selector: 'input::-ms-reveal', declaration: 'display: none');
+
+    final bool codeRanInFakeyBrowser = hasCssRule(styleElement,
+        selector: 'input.fallback-for-fakey-browser-in-ci',
+        declaration: 'display: none');
+
+    if (codeRanInFakeyBrowser) {
+      print('Please, fix https://github.com/flutter/flutter/issues/116302');
+    }
+
+    expect(hidesRevealIcons || codeRanInFakeyBrowser, isTrue,
+        reason: 'In Edge, stylesheet must contain "input::-ms-reveal" rule.');
+  }, skip: !isEdge);
+
+  test('Does not attach the Edge-specific style tag on non-Edge browsers', () {
+    // Check that style.sheet! contains input::-ms-reveal rule
+    final bool hidesRevealIcons = hasCssRule(styleElement,
+        selector: 'input::-ms-reveal', declaration: 'display: none');
+
+    expect(hidesRevealIcons, isFalse);
+  }, skip: isEdge);
+
+  test(
+      'Attaches styles to hide the autofill overlay for browsers that support it',
+      () {
+    final String vendorPrefix = (isSafari || isFirefox) ? '' : '-webkit-';
+    final bool autofillOverlay = hasCssRule(styleElement,
+        selector: '.transparentTextEditing:${vendorPrefix}autofill',
+        declaration: 'opacity: 0 !important');
+    final bool autofillOverlayHovered = hasCssRule(styleElement,
+        selector: '.transparentTextEditing:${vendorPrefix}autofill:hover',
+        declaration: 'opacity: 0 !important');
+    final bool autofillOverlayFocused = hasCssRule(styleElement,
+        selector: '.transparentTextEditing:${vendorPrefix}autofill:focus',
+        declaration: 'opacity: 0 !important');
+    final bool autofillOverlayActive = hasCssRule(styleElement,
+        selector: '.transparentTextEditing:${vendorPrefix}autofill:active',
+        declaration: 'opacity: 0 !important');
+
+    expect(autofillOverlay, isTrue);
+    expect(autofillOverlayHovered, isTrue);
+    expect(autofillOverlayFocused, isTrue);
+    expect(autofillOverlayActive, isTrue);
+  }, skip: !browserHasAutofillOverlay());
+}
+
+/// Finds out whether a given CSS Rule ([selector] { [declaration]; }) exists in a [styleElement].
+bool hasCssRule(
+  DomHTMLStyleElement styleElement, {
+  required String selector,
+  required String declaration,
+}) {
+  domDocument.body!.append(styleElement);
+  assert(styleElement.sheet != null);
+
+  // regexr.com/740ff
+  final RegExp ruleLike =
+      RegExp('[^{]*(?:$selector)[^{]*{[^}]*(?:$declaration)[^}]*}');
+
+  final DomCSSStyleSheet sheet = styleElement.sheet! as DomCSSStyleSheet;
+
+  // Check that the cssText of any rule matches the ruleLike RegExp.
+  final bool result = sheet.cssRules
+      .map((DomCSSRule rule) => rule.cssText)
+      .any((String rule) => ruleLike.hasMatch(rule));
+
+  styleElement.remove();
+  return result;
+}
diff --git a/lib/web_ui/test/hash_codes_test.dart b/lib/web_ui/test/engine/hash_codes_test.dart
similarity index 51%
rename from lib/web_ui/test/hash_codes_test.dart
rename to lib/web_ui/test/engine/hash_codes_test.dart
index 7f56a727b68114e11893a93996d15dfe5274ede7..7c0c7afbbdc936f91d7e900710173f5b218d2793 100644
--- a/lib/web_ui/test/hash_codes_test.dart
+++ b/lib/web_ui/test/engine/hash_codes_test.dart
@@ -16,64 +16,37 @@ void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
 
+// Ignoring the deprecated member use because we're specifically testing
+// deprecated API.
+// ignore: deprecated_member_use
+
 void testMain() {
-  test('hashValues can hash lots of huge values effectively', () {
-    expect(
-      hashValues(
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-      ),
-      496984395,
-    );
-    // Hash a slightly smaller number to verify that the hash code is different.
-    expect(
-      hashValues(
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt,
-        _kBiggestExactJavaScriptInt - 1,
-      ),
-      455584273,
+  test('hashValues and hashList can hash lots of huge values effectively', () {
+    final int hashValueFromArgs = hashValues(
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
     );
-  });
 
-  test('hashList can hash lots of huge values effectively', () {
-    expect(
-      hashList(<int>[
+    // Hash the same values via a list
+    final int hashValueFromList = hashList(<int>[
         _kBiggestExactJavaScriptInt,
         _kBiggestExactJavaScriptInt,
         _kBiggestExactJavaScriptInt,
@@ -94,12 +67,33 @@ void testMain() {
         _kBiggestExactJavaScriptInt,
         _kBiggestExactJavaScriptInt,
         _kBiggestExactJavaScriptInt,
-      ]),
-      496984395,
-    );
+    ]);
+
     // Hash a slightly smaller number to verify that the hash code is different.
-    expect(
-      hashList(<int>[
+    final int slightlyDifferentHashValueFromArgs = hashValues(
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt,
+      _kBiggestExactJavaScriptInt - 1,
+    );
+
+    final int slightlyDifferentHashValueFromList = hashList(<int>[
         _kBiggestExactJavaScriptInt,
         _kBiggestExactJavaScriptInt,
         _kBiggestExactJavaScriptInt,
@@ -120,8 +114,10 @@ void testMain() {
         _kBiggestExactJavaScriptInt,
         _kBiggestExactJavaScriptInt,
         _kBiggestExactJavaScriptInt - 1,
-      ]),
-      455584273,
-    );
+    ]);
+
+    expect(hashValueFromArgs, equals(hashValueFromList));
+    expect(slightlyDifferentHashValueFromArgs, equals(slightlyDifferentHashValueFromList));
+    expect(hashValueFromArgs, isNot(equals(slightlyDifferentHashValueFromArgs)));
   });
 }
diff --git a/lib/web_ui/test/engine/history_test.dart b/lib/web_ui/test/engine/history_test.dart
index ccad2e44d5c84c7ae59f442ce1d04a42bb4ec4ec..91b99f36cfeb5c9b13882335800928d03eefcab5 100644
--- a/lib/web_ui/test/engine/history_test.dart
+++ b/lib/web_ui/test/engine/history_test.dart
@@ -2,21 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-@TestOn('!safari')
-// TODO(mdebbar): https://github.com/flutter/flutter/issues/51169
-
 import 'dart:async';
 
 import 'package:quiver/testing/async.dart';
 import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
-import 'package:ui/src/engine.dart' show DomEventListener, window;
-import 'package:ui/src/engine/browser_detection.dart';
-import 'package:ui/src/engine/navigation.dart';
-import 'package:ui/src/engine/services.dart';
-import 'package:ui/src/engine/test_embedding.dart';
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui_web/src/ui_web.dart';
+
+import '../common/matchers.dart';
+import '../common/spy.dart';
+import '../common/test_initialization.dart';
 
-import '../spy.dart';
+EngineFlutterWindow get implicitView =>
+    EnginePlatformDispatcher.instance.implicitView!;
 
 Map<String, dynamic> _wrapOriginState(dynamic state) {
   return <String, dynamic>{'origin': true, 'state': state};
@@ -29,7 +28,6 @@ Map<String, dynamic> _tagStateWithSerialCount(dynamic state, int serialCount) {
   };
 }
 
-const Map<String, bool> originState = <String, bool>{'origin': true};
 const Map<String, bool> flutterState = <String, bool>{'flutter': true};
 
 const MethodCodec codec = JSONMethodCodec();
@@ -39,6 +37,10 @@ void main() {
 }
 
 void testMain() {
+  setUpAll(() async {
+    await bootstrapAndRunApp(withImplicitView: true);
+  });
+
   test('createHistoryForExistingState', () {
     TestUrlStrategy strategy;
     BrowserHistory history;
@@ -50,7 +52,7 @@ void testMain() {
 
     // Random history state.
     strategy = TestUrlStrategy.fromEntry(
-      const TestHistoryEntry(<dynamic, dynamic>{'foo': 123}, null, '/'),
+      const TestHistoryEntry(<dynamic, dynamic>{'foo': 123.0}, null, '/'),
     );
     history = createHistoryForExistingState(strategy);
     expect(history, isA<MultiEntriesBrowserHistory>());
@@ -58,8 +60,8 @@ void testMain() {
 
     // Multi-entry history state.
     final Map<dynamic, dynamic> state = <dynamic, dynamic>{
-      'serialCount': 1,
-      'state': <dynamic, dynamic>{'foo': 123},
+      'serialCount': 1.0,
+      'state': <dynamic, dynamic>{'foo': 123.0},
     };
     strategy = TestUrlStrategy.fromEntry(TestHistoryEntry(state, null, '/'));
     history = createHistoryForExistingState(strategy);
@@ -92,14 +94,14 @@ void testMain() {
 
     tearDown(() async {
       spy.tearDown();
-      await window.resetHistory();
+      await implicitView.resetHistory();
     });
 
     test('basic setup works', () async {
       final TestUrlStrategy strategy = TestUrlStrategy.fromEntry(
         const TestHistoryEntry('initial state', null, '/initial'),
       );
-      await window.debugInitializeHistory(strategy, useSingle: true);
+      await implicitView.debugInitializeHistory(strategy, useSingle: true);
 
       // There should be two entries: origin and flutter.
       expect(strategy.history, hasLength(2));
@@ -128,7 +130,7 @@ void testMain() {
       );
       expect(strategy.listeners, isEmpty);
 
-      await window.debugInitializeHistory(strategy, useSingle: true);
+      await implicitView.debugInitializeHistory(strategy, useSingle: true);
 
 
       // There should be one `popstate` listener and two history entries.
@@ -140,7 +142,7 @@ void testMain() {
       expect(strategy.history[1].url, '/initial');
 
       FakeAsync().run((FakeAsync fakeAsync) {
-        window.browserHistory.dispose();
+        implicitView.browserHistory.dispose();
         // The `TestUrlStrategy` implementation uses microtasks to schedule the
         // removal of event listeners.
         fakeAsync.flushMicrotasks();
@@ -157,7 +159,7 @@ void testMain() {
 
       // An extra call to dispose should be safe.
       FakeAsync().run((FakeAsync fakeAsync) {
-        expect(() => window.browserHistory.dispose(), returnsNormally);
+        expect(() => implicitView.browserHistory.dispose(), returnsNormally);
         fakeAsync.flushMicrotasks();
       });
 
@@ -170,22 +172,22 @@ void testMain() {
       expect(strategy.history[1].url, '/initial');
 
       // Can still teardown after being disposed.
-      await window.browserHistory.tearDown();
+      await implicitView.browserHistory.tearDown();
       expect(strategy.history, hasLength(2));
       expect(strategy.currentEntry.state, unwrappedOriginState);
       expect(strategy.currentEntry.url, '/initial');
     });
 
     test('disposes gracefully when url strategy is null', () async {
-      await window.debugInitializeHistory(null, useSingle: true);
-      expect(() => window.browserHistory.dispose(), returnsNormally);
+      await implicitView.debugInitializeHistory(null, useSingle: true);
+      expect(() => implicitView.browserHistory.dispose(), returnsNormally);
     });
 
     test('browser back button pops routes correctly', () async {
       final TestUrlStrategy strategy = TestUrlStrategy.fromEntry(
         const TestHistoryEntry(null, null, '/home'),
       );
-      await window.debugInitializeHistory(strategy, useSingle: true);
+      await implicitView.debugInitializeHistory(strategy, useSingle: true);
 
       // Initially, we should be on the flutter entry.
       expect(strategy.history, hasLength(2));
@@ -220,7 +222,7 @@ void testMain() {
       final TestUrlStrategy strategy = TestUrlStrategy.fromEntry(
         const TestHistoryEntry(null, null, '/home'),
       );
-      await window.debugInitializeHistory(strategy, useSingle: true);
+      await implicitView.debugInitializeHistory(strategy, useSingle: true);
 
       await routeUpdated('/page1');
       await routeUpdated('/page2');
@@ -280,13 +282,13 @@ void testMain() {
       // 3. The active entry doesn't belong to our history anymore because we
       // navigated past it.
       expect(originalStrategy.currentEntryIndex, -1);
-    }, skip: browserEngine == BrowserEngine.webkit);
+    });
 
     test('handle user-provided url', () async {
       final TestUrlStrategy strategy = TestUrlStrategy.fromEntry(
         const TestHistoryEntry(null, null, '/home'),
       );
-      await window.debugInitializeHistory(strategy, useSingle: true);
+      await implicitView.debugInitializeHistory(strategy, useSingle: true);
 
       await strategy.simulateUserTypingUrl('/page3');
       // This delay is necessary to wait for [BrowserHistory] because it
@@ -327,7 +329,7 @@ void testMain() {
       final TestUrlStrategy strategy = TestUrlStrategy.fromEntry(
         const TestHistoryEntry(null, null, '/home'),
       );
-      await window.debugInitializeHistory(strategy, useSingle: true);
+      await implicitView.debugInitializeHistory(strategy, useSingle: true);
 
       await strategy.simulateUserTypingUrl('/unknown');
       // This delay is necessary to wait for [BrowserHistory] because it
@@ -357,14 +359,14 @@ void testMain() {
 
     tearDown(() async {
       spy.tearDown();
-      await window.resetHistory();
+      await implicitView.resetHistory();
     });
 
     test('basic setup works', () async {
       final TestUrlStrategy strategy = TestUrlStrategy.fromEntry(
         const TestHistoryEntry('initial state', null, '/initial'),
       );
-      await window.debugInitializeHistory(strategy, useSingle: false);
+      await implicitView.debugInitializeHistory(strategy, useSingle: false);
 
       // There should be only one entry.
       expect(strategy.history, hasLength(1));
@@ -384,7 +386,7 @@ void testMain() {
       );
       expect(strategy.listeners, isEmpty);
 
-      await window.debugInitializeHistory(strategy, useSingle: false);
+      await implicitView.debugInitializeHistory(strategy, useSingle: false);
 
 
       // There should be one `popstate` listener and one history entry.
@@ -394,7 +396,7 @@ void testMain() {
       expect(strategy.history.single.url, '/initial');
 
       FakeAsync().run((FakeAsync fakeAsync) {
-        window.browserHistory.dispose();
+        implicitView.browserHistory.dispose();
         // The `TestUrlStrategy` implementation uses microtasks to schedule the
         // removal of event listeners.
         fakeAsync.flushMicrotasks();
@@ -409,7 +411,7 @@ void testMain() {
 
       // An extra call to dispose should be safe.
       FakeAsync().run((FakeAsync fakeAsync) {
-        expect(() => window.browserHistory.dispose(), returnsNormally);
+        expect(() => implicitView.browserHistory.dispose(), returnsNormally);
         fakeAsync.flushMicrotasks();
       });
 
@@ -420,22 +422,22 @@ void testMain() {
       expect(strategy.history.single.url, '/initial');
 
       // Can still teardown after being disposed.
-      await window.browserHistory.tearDown();
+      await implicitView.browserHistory.tearDown();
       expect(strategy.history, hasLength(1));
       expect(strategy.history.single.state, untaggedState);
       expect(strategy.history.single.url, '/initial');
     });
 
     test('disposes gracefully when url strategy is null', () async {
-      await window.debugInitializeHistory(null, useSingle: false);
-      expect(() => window.browserHistory.dispose(), returnsNormally);
+      await implicitView.debugInitializeHistory(null, useSingle: false);
+      expect(() => implicitView.browserHistory.dispose(), returnsNormally);
     });
 
     test('browser back button push route information correctly', () async {
       final TestUrlStrategy strategy = TestUrlStrategy.fromEntry(
         const TestHistoryEntry('initial state', null, '/home'),
       );
-      await window.debugInitializeHistory(strategy, useSingle: false);
+      await implicitView.debugInitializeHistory(strategy, useSingle: false);
 
       // Initially, we should be on the flutter entry.
       expect(strategy.history, hasLength(1));
@@ -474,7 +476,7 @@ void testMain() {
       final TestUrlStrategy strategy = TestUrlStrategy.fromEntry(
         const TestHistoryEntry('initial state', null, '/home'),
       );
-      await window.debugInitializeHistory(strategy, useSingle: false);
+      await implicitView.debugInitializeHistory(strategy, useSingle: false);
 
       await routeInformationUpdated('/page1', 'page1 state');
       await routeInformationUpdated('/page2', 'page2 state');
@@ -517,13 +519,13 @@ void testMain() {
       expect(strategy.currentEntryIndex, 0);
       expect(strategy.currentEntry.state, _tagStateWithSerialCount('initial state', 0));
       expect(strategy.currentEntry.url, '/home');
-    }, skip: browserEngine == BrowserEngine.webkit);
+    });
 
     test('handle user-provided url', () async {
       final TestUrlStrategy strategy = TestUrlStrategy.fromEntry(
         const TestHistoryEntry('initial state', null, '/home'),
       );
-      await window.debugInitializeHistory(strategy, useSingle: false);
+      await implicitView.debugInitializeHistory(strategy, useSingle: false);
 
       await strategy.simulateUserTypingUrl('/page3');
       // This delay is necessary to wait for [BrowserHistory] because it
@@ -566,7 +568,7 @@ void testMain() {
       final TestUrlStrategy strategy = TestUrlStrategy.fromEntry(
         const TestHistoryEntry('initial state', null, '/home'),
       );
-      await window.debugInitializeHistory(strategy, useSingle: false);
+      await implicitView.debugInitializeHistory(strategy, useSingle: false);
 
       await routeInformationUpdated('/page1', 'page1 state');
       await routeInformationUpdated('/page2', 'page2 state');
@@ -646,12 +648,105 @@ void testMain() {
       location.hash = '#';
       expect(strategy.getPath(), '/');
     });
+
+    test('prepareExternalUrl', () {
+      const String internalUrl = '/menu?foo=bar';
+      final HashUrlStrategy strategy = HashUrlStrategy(location);
+
+      location.pathname = '/';
+      expect(strategy.prepareExternalUrl(internalUrl), '/#/menu?foo=bar');
+
+      location.pathname = '/main';
+      expect(strategy.prepareExternalUrl(internalUrl), '/main#/menu?foo=bar');
+
+      location.search = '?foo=bar';
+      expect(
+        strategy.prepareExternalUrl(internalUrl),
+        '/main?foo=bar#/menu?foo=bar',
+      );
+    });
+
+    test('removes /#/ from the home page', () {
+      const String internalUrl = '/';
+      final HashUrlStrategy strategy = HashUrlStrategy(location);
+
+      location.pathname = '/';
+      expect(strategy.prepareExternalUrl(internalUrl), '/');
+
+      location.pathname = '/main';
+      expect(strategy.prepareExternalUrl(internalUrl), '/main');
+
+      location.search = '?foo=bar';
+      expect(
+        strategy.prepareExternalUrl(internalUrl),
+        '/main?foo=bar',
+      );
+    });
+
+    test('addPopStateListener fn unwraps DomPopStateEvent state', () {
+      final HashUrlStrategy strategy = HashUrlStrategy(location);
+      const String expected = 'expected value';
+      final List<Object?> states = <Object?>[];
+
+      // Put the popStates received from the `location` in a list
+      strategy.addPopStateListener(states.add);
+
+      // Simulate a popstate with a null state:
+      location.debugTriggerPopState(null);
+
+      expect(states, hasLength(1));
+      expect(states[0], isNull);
+
+      // Simulate a popstate event with `expected` as its 'state'.
+      location.debugTriggerPopState(expected);
+
+      expect(states, hasLength(2));
+      final Object? state = states[1];
+      expect(state, isNotNull);
+      // flutter/flutter#125228
+      expect(state, isNot(isA<DomEvent>()));
+      expect(state, expected);
+    });
+  });
+
+  group('$BrowserPlatformLocation', () {
+    test('getOrCreateDomEventListener caches funcions', () {
+      const BrowserPlatformLocation location = BrowserPlatformLocation();
+      void myListener(Object event) {}
+
+      expect(
+        identical(
+          location.getOrCreateDomEventListener(myListener),
+          location.getOrCreateDomEventListener(myListener),
+        ),
+        isTrue,
+      );
+    });
+
+    test('throws if removing an invalid listener', () {
+      const BrowserPlatformLocation location = BrowserPlatformLocation();
+      void myAddedListener(Object event) {}
+      void myNonAddedListener(Object event) {}
+
+      location.addPopStateListener(myAddedListener);
+      expect(() => location.removePopStateListener(myAddedListener), returnsNormally);
+      // Removing the same listener twice should throw.
+      expect(() => location.removePopStateListener(myAddedListener), throwsAssertionError);
+
+      // A listener that was never added.
+      expect(() => location.removePopStateListener(myNonAddedListener), throwsAssertionError);
+    });
+
+    test('returns a non-empty baseUri', () {
+      const BrowserPlatformLocation location = BrowserPlatformLocation();
+      expect(location.getBaseHref(), isNotNull);
+    });
   });
 }
 
 Future<void> routeUpdated(String routeName) {
   final Completer<void> completer = Completer<void>();
-  window.sendPlatformMessage(
+  EnginePlatformDispatcher.instance.sendPlatformMessage(
     'flutter/navigation',
     codec.encodeMethodCall(MethodCall(
       'routeUpdated',
@@ -664,7 +759,7 @@ Future<void> routeUpdated(String routeName) {
 
 Future<void> routeInformationUpdated(String location, dynamic state) {
   final Completer<void> completer = Completer<void>();
-  window.sendPlatformMessage(
+  EnginePlatformDispatcher.instance.sendPlatformMessage(
     'flutter/navigation',
     codec.encodeMethodCall(MethodCall(
       'routeInformationUpdated',
@@ -677,7 +772,7 @@ Future<void> routeInformationUpdated(String location, dynamic state) {
 
 Future<void> systemNavigatorPop() {
   final Completer<void> completer = Completer<void>();
-  window.sendPlatformMessage(
+  EnginePlatformDispatcher.instance.sendPlatformMessage(
     'flutter/platform',
     codec.encodeMethodCall(const MethodCall('SystemNavigator.pop')),
     (_) => completer.complete(),
@@ -686,26 +781,42 @@ Future<void> systemNavigatorPop() {
 }
 
 /// A mock implementation of [PlatformLocation] that doesn't access the browser.
-class TestPlatformLocation extends PlatformLocation {
+class TestPlatformLocation implements PlatformLocation {
   @override
   String? hash;
 
   @override
   dynamic state;
 
+  List<EventListener> popStateListeners = <EventListener>[];
+
   @override
-  String get pathname => throw UnimplementedError();
+  String pathname = '';
 
   @override
-  String get search => throw UnimplementedError();
+  String search = '';
+
+  /// Calls all the registered `popStateListeners` with a 'popstate'
+  /// event with value `state`
+  void debugTriggerPopState(Object? state) {
+    final DomEvent event = createDomPopStateEvent(
+      'popstate',
+      <Object, Object>{
+        if (state != null) 'state': state,
+      },
+    );
+    for (final EventListener listener in popStateListeners) {
+      listener(event);
+    }
+  }
 
   @override
-  void addPopStateListener(DomEventListener fn) {
-    throw UnimplementedError();
+  void addPopStateListener(EventListener fn) {
+    popStateListeners.add(fn);
   }
 
   @override
-  void removePopStateListener(DomEventListener fn) {
+  void removePopStateListener(EventListener fn) {
     throw UnimplementedError();
   }
 
diff --git a/lib/web_ui/test/engine/host_node_test.dart b/lib/web_ui/test/engine/host_node_test.dart
deleted file mode 100644
index 100b9ce01bc62fa1daab398e8c675ab7bca0128a..0000000000000000000000000000000000000000
--- a/lib/web_ui/test/engine/host_node_test.dart
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'package:test/bootstrap/browser.dart';
-import 'package:test/test.dart';
-import 'package:ui/src/engine.dart';
-
-void main() {
-  internalBootstrapBrowserTest(() => testMain);
-}
-
-void testMain() {
-  final DomElement rootNode = domDocument.createElement('div');
-  domDocument.body!.append(rootNode);
-
-  group('ShadowDomHostNode', () {
-    final HostNode hostNode = ShadowDomHostNode(rootNode);
-
-    test('Initializes and attaches a shadow root', () {
-      expect(domInstanceOfString(hostNode.node, 'ShadowRoot'), isTrue);
-      expect((hostNode.node as DomShadowRoot).host, rootNode);
-      expect(hostNode.node, rootNode.shadowRoot);
-
-      // The shadow root should be initialized with correct parameters.
-      expect(rootNode.shadowRoot!.mode, 'open');
-      if (browserEngine != BrowserEngine.firefox &&
-          browserEngine != BrowserEngine.webkit) {
-        // Older versions of Safari and Firefox don't support this flag yet.
-        // See: https://caniuse.com/mdn-api_shadowroot_delegatesfocus
-        expect(rootNode.shadowRoot!.delegatesFocus, isFalse);
-      }
-    });
-
-    test('Attaches a stylesheet to the shadow root', () {
-      final DomElement firstChild =
-          (hostNode.node as DomShadowRoot).childNodes.toList()[0] as DomElement;
-
-      expect(firstChild.tagName, equalsIgnoringCase('style'));
-    });
-
-    _runDomTests(hostNode);
-  });
-
-  group('ElementHostNode', () {
-    final HostNode hostNode = ElementHostNode(rootNode);
-
-    test('Initializes and attaches a child element', () {
-      expect(domInstanceOfString(hostNode.node, 'Element'), isTrue);
-      expect((hostNode.node as DomElement).shadowRoot, isNull);
-      expect(hostNode.node.parentNode, rootNode);
-    });
-
-    _runDomTests(hostNode);
-  });
-}
-
-// The common test suite that all types of HostNode implementations need to pass.
-void _runDomTests(HostNode hostNode) {
-  group('DOM operations', () {
-    final DomElement target = domDocument.createElement('div')..id = 'yep';
-
-    setUp(() {
-      hostNode.appendAll(<DomNode>[
-        domDocument.createElement('div'),
-        target,
-        domDocument.createElement('flt-span'),
-        domDocument.createElement('div'),
-      ]);
-    });
-
-    tearDown(() {
-      hostNode.node.clearChildren();
-    });
-
-    test('querySelector', () {
-      final DomElement? found = hostNode.querySelector('#yep');
-
-      expect(identical(found, target), isTrue);
-    });
-
-    test('.contains and .append', () {
-      final DomElement another = domDocument.createElement('div')
-        ..id = 'another';
-
-      expect(hostNode.contains(target), isTrue);
-      expect(hostNode.contains(another), isFalse);
-      expect(hostNode.contains(null), isFalse);
-
-      hostNode.append(another);
-      expect(hostNode.contains(another), isTrue);
-    });
-
-    test('querySelectorAll', () {
-      final List<DomNode> found = hostNode.querySelectorAll('div').toList();
-
-      expect(found.length, 3);
-      expect(found[1], target);
-    });
-  });
-}
diff --git a/lib/web_ui/test/engine/image/html_image_codec_test.dart b/lib/web_ui/test/engine/image/html_image_codec_test.dart
index 9017fde35d081c2e7549551b116ceb9440d480c3..e161cea5fb25e34c50079569c14e253dfd3e4896 100644
--- a/lib/web_ui/test/engine/image/html_image_codec_test.dart
+++ b/lib/web_ui/test/engine/image/html_image_codec_test.dart
@@ -8,15 +8,17 @@ import 'dart:typed_data';
 import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/src/engine/html_image_codec.dart';
-import 'package:ui/src/engine/test_embedding.dart';
 import 'package:ui/ui.dart' as ui;
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
+
+import '../../common/test_initialization.dart';
 
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
 
 Future<void> testMain() async {
-  await initializeTestFlutterViewEmbedder();
+  setUpUnitTests();
   group('HtmCodec', () {
     test('supports raw images - RGBA8888', () async {
       final Completer<ui.Image> completer = Completer<ui.Image>();
@@ -103,7 +105,7 @@ Future<void> testMain() async {
   group('ImageCodecUrl', () {
     test('loads sample image from web', () async {
       final Uri uri = Uri.base.resolve('sample_image1.png');
-      final HtmlCodec codec = await ui.webOnlyInstantiateImageCodecFromUrl(uri) as HtmlCodec;
+      final HtmlCodec codec = await ui_web.createImageCodecFromUrl(uri) as HtmlCodec;
       final ui.FrameInfo frameInfo = await codec.getNextFrame();
       expect(frameInfo.image, isNotNull);
       expect(frameInfo.image.width, 100);
@@ -111,7 +113,7 @@ Future<void> testMain() async {
     test('provides image loading progress from web', () async {
       final Uri uri = Uri.base.resolve('sample_image1.png');
       final StringBuffer buffer = StringBuffer();
-      final HtmlCodec codec = await ui.webOnlyInstantiateImageCodecFromUrl(uri,
+      final HtmlCodec codec = await ui_web.createImageCodecFromUrl(uri,
           chunkCallback: (int loaded, int total) {
         buffer.write('$loaded/$total,');
       }) as HtmlCodec;
diff --git a/lib/web_ui/test/engine/image_to_byte_data_test.dart b/lib/web_ui/test/engine/image_to_byte_data_test.dart
index a9bb8a791f2ea55f15c634eb0b28a123567c3f84..306e50c560ec209151e0d67108a0f7d5d661316c 100644
--- a/lib/web_ui/test/engine/image_to_byte_data_test.dart
+++ b/lib/web_ui/test/engine/image_to_byte_data_test.dart
@@ -9,16 +9,14 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart';
 
+import '../common/test_initialization.dart';
+
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
 
 Future<void> testMain() async {
-  setUpAll(() async {
-    await webOnlyInitializePlatform();
-    await renderer.fontCollection.debugDownloadTestFonts();
-    renderer.fontCollection.registerDownloadedFonts();
-  });
+  setUpUnitTests();
 
   Future<Image> createTestImageByColor(Color color) async {
     final EnginePictureRecorder recorder = EnginePictureRecorder();
diff --git a/lib/web_ui/test/initialization_test.dart b/lib/web_ui/test/engine/initialization_test.dart
similarity index 73%
rename from lib/web_ui/test/initialization_test.dart
rename to lib/web_ui/test/engine/initialization_test.dart
index 37cada5529bbd6f900b3f6a7f0c592c66a57692e..2f5a2f45d89f2f12e320f0cc714520a202441d56 100644
--- a/lib/web_ui/test/initialization_test.dart
+++ b/lib/web_ui/test/engine/initialization_test.dart
@@ -2,44 +2,47 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:js/js.dart';
+import 'dart:js_interop';
+
 import 'package:js/js_util.dart' as js_util;
 import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/src/engine.dart' as engine;
-import 'package:ui/ui.dart' as ui;
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
 @JS('_flutter')
-external set loader(Object? loader);
+external set _loader(JSAny? loader);
+set loader(Object? l) => _loader = l?.toJSAnyShallow;
 
 @JS('_flutter.loader.didCreateEngineInitializer')
-external set didCreateEngineInitializer(Object? callback);
+external set didCreateEngineInitializer(JSFunction? callback);
 
 void main() {
   // Prepare _flutter.loader.didCreateEngineInitializer, so it's ready in the page ASAP.
   loader = js_util.jsify(<String, Object>{
     'loader': <String, Object>{
-      'didCreateEngineInitializer': allowInterop(() { print('not mocked'); }),
+      'didCreateEngineInitializer': () { print('not mocked'); }.toJS,
     },
   });
   internalBootstrapBrowserTest(() => testMain);
 }
 
 void testMain() {
-  test('webOnlyWarmupEngine calls _flutter.loader.didCreateEngineInitializer callback', () async {
-    Object? engineInitializer;
+  test('bootstrapEngine calls _flutter.loader.didCreateEngineInitializer callback', () async {
+    JSAny? engineInitializer;
 
-    void didCreateEngineInitializerMock(Object? obj) {
+    void didCreateEngineInitializerMock(JSAny? obj) {
+      print('obj: $obj');
       engineInitializer = obj;
     }
 
     // Prepare the DOM for: _flutter.loader.didCreateEngineInitializer
-    didCreateEngineInitializer = allowInterop(didCreateEngineInitializerMock);
+    didCreateEngineInitializer = didCreateEngineInitializerMock.toJS;
 
     // Reset the engine
     engine.debugResetEngineInitializationState();
 
-    await ui.webOnlyWarmupEngine(
+    await ui_web.bootstrapEngine(
       registerPlugins: () {},
       runApp: () {},
     );
@@ -50,7 +53,7 @@ void testMain() {
     expect(js_util.hasProperty(engineInitializer!, 'autoStart'), isTrue, reason: 'Missing FlutterEngineInitializer method: autoStart.');
   });
 
-  test('webOnlyWarmupEngine does auto-start when _flutter.loader.didCreateEngineInitializer does not exist', () async {
+  test('bootstrapEngine does auto-start when _flutter.loader.didCreateEngineInitializer does not exist', () async {
     loader = null;
 
     bool pluginsRegistered = false;
@@ -65,7 +68,7 @@ void testMain() {
     // Reset the engine
     engine.debugResetEngineInitializationState();
 
-    await ui.webOnlyWarmupEngine(
+    await ui_web.bootstrapEngine(
       registerPlugins: registerPluginsMock,
       runApp: runAppMock,
     );
@@ -74,6 +77,7 @@ void testMain() {
     expect(pluginsRegistered, isTrue, reason: 'Plugins should be immediately registered in autoStart mode.');
     expect(appRan, isTrue, reason: 'App should run immediately in autoStart mode');
   });
+
   // We cannot test anymore, because by now the engine has registered some stuff that can't be rewound back.
   // Like the `ext.flutter.disassemble` developer extension.
 }
diff --git a/lib/web_ui/test/keyboard_converter_test.dart b/lib/web_ui/test/engine/keyboard_converter_test.dart
similarity index 84%
rename from lib/web_ui/test/keyboard_converter_test.dart
rename to lib/web_ui/test/engine/keyboard_converter_test.dart
index a5c81b39bd96effd98f226826da804d61e41ac91..dab4914f64f3dfe17e953b86e081f24b082c7eb3 100644
--- a/lib/web_ui/test/keyboard_converter_test.dart
+++ b/lib/web_ui/test/engine/keyboard_converter_test.dart
@@ -9,9 +9,8 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
 
-import 'keyboard_test_common.dart';
+import '../common/keyboard_test_common.dart';
 
-const int kLocationStandard = 0;
 const int kLocationLeft = 1;
 const int kLocationRight = 2;
 const int kLocationNumpad = 3;
@@ -25,9 +24,9 @@ final int kPhysicalNumpad1 = kWebToPhysicalKey['Numpad1']!;
 final int kPhysicalShiftLeft = kWebToPhysicalKey['ShiftLeft']!;
 final int kPhysicalShiftRight = kWebToPhysicalKey['ShiftRight']!;
 final int kPhysicalMetaLeft = kWebToPhysicalKey['MetaLeft']!;
-final int kPhysicalTab = kWebToPhysicalKey['Tab']!;
 final int kPhysicalCapsLock = kWebToPhysicalKey['CapsLock']!;
 final int kPhysicalScrollLock = kWebToPhysicalKey['ScrollLock']!;
+final int kPhysicalBracketLeft = kWebToPhysicalKey['BracketLeft']!;
 // A web-specific physical key when code is empty.
 const int kPhysicalEmptyCode = 0x1700000000;
 
@@ -41,11 +40,11 @@ final int kLogicalShiftRight = kWebLogicalLocationMap['Shift']![kLocationRight]!
 final int kLogicalCtrlLeft = kWebLogicalLocationMap['Control']![kLocationLeft]!;
 final int kLogicalAltLeft = kWebLogicalLocationMap['Alt']![kLocationLeft]!;
 final int kLogicalMetaLeft = kWebLogicalLocationMap['Meta']![kLocationLeft]!;
-const int kLogicalTab = 0x0000000009;
 final int kLogicalCapsLock = kWebToLogicalKey['CapsLock']!;
 final int kLogicalScrollLock = kWebToLogicalKey['ScrollLock']!;
-
-typedef VoidCallback = void Function();
+final int kLogicalProcess = kWebToLogicalKey['Process']!;
+const int kWebKeyIdPlane = 0x1700000000;
+final int kLogicalBracketLeft = kPhysicalBracketLeft + kWebKeyIdPlane; // Dead key algorithm.
 
 void main() {
   internalBootstrapBrowserTest(() => testMain);
@@ -60,7 +59,7 @@ void testMain() {
       character: 'A',
       timeStamp: Duration.zero,
       synthesized: false,
-    ).toString(), 'KeyData(type: down, physical: 0x700e5, logical: 0x61 (Unicode), character: "A" (0x41))');
+    ).toString(), 'KeyData(Key Down, physical: 0x700e5, logical: 0x61 (Unicode), character: "A" (0x41))');
 
     expect(const ui.KeyData(
       type: ui.KeyEventType.up,
@@ -69,7 +68,7 @@ void testMain() {
       character: '\n',
       timeStamp: Duration.zero,
       synthesized: true,
-    ).toString(), r'KeyData(type: up, physical: 0x700e6, logical: 0x100000061 (Unprintable), character: "\n" (0x0a), synthesized)');
+    ).toString(), r'KeyData(Key Up, physical: 0x700e6, logical: 0x100000061 (Unprintable), character: "\n" (0x0a), synthesized)');
 
     expect(const ui.KeyData(
       type: ui.KeyEventType.repeat,
@@ -78,7 +77,7 @@ void testMain() {
       character: null,
       timeStamp: Duration.zero,
       synthesized: false,
-    ).toString(), 'KeyData(type: repeat, physical: 0x700e7, logical: 0x9900000071, character: <none>)');
+    ).toString(), 'KeyData(Key Repeat, physical: 0x700e7, logical: 0x9900000071, character: <none>)');
   });
 
   test('Single key press, repeat, and release', () {
@@ -93,6 +92,7 @@ void testMain() {
     expectKeyData(keyDataList.last,
       timeStamp: const Duration(milliseconds: 1),
       type: ui.KeyEventType.down,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalKeyA,
       logical: kLogicalKeyA,
       character: 'a',
@@ -103,6 +103,7 @@ void testMain() {
     expectKeyData(keyDataList.last,
       timeStamp: const Duration(milliseconds: 1, microseconds: 500),
       type: ui.KeyEventType.repeat,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalKeyA,
       logical: kLogicalKeyA,
       character: 'a',
@@ -113,6 +114,7 @@ void testMain() {
     expectKeyData(keyDataList.last,
       timeStamp: const Duration(seconds: 1, milliseconds: 500),
       type: ui.KeyEventType.repeat,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalKeyA,
       logical: kLogicalKeyA,
       character: 'a',
@@ -123,6 +125,7 @@ void testMain() {
     expectKeyData(keyDataList.last,
       timeStamp: const Duration(seconds: 2, microseconds: 500),
       type: ui.KeyEventType.up,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalKeyA,
       logical: kLogicalKeyA,
       character: null,
@@ -143,6 +146,7 @@ void testMain() {
     expectKeyData(keyDataList.last,
       timeStamp: const Duration(milliseconds: 1),
       type: ui.KeyEventType.down,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalKeyL,
       logical: kLogicalKeyL,
       character: 'l̥',
@@ -160,6 +164,7 @@ void testMain() {
     converter.handleEvent(keyDownEvent('ShiftLeft', 'Shift', kShift, kLocationLeft));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.down,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalShiftLeft,
       logical: kLogicalShiftLeft,
       character: null,
@@ -169,6 +174,7 @@ void testMain() {
     converter.handleEvent(keyDownEvent('KeyA', 'A', kShift));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.down,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalKeyA,
       logical: kLogicalKeyA,
       character: 'A',
@@ -178,6 +184,7 @@ void testMain() {
     converter.handleEvent(keyRepeatedDownEvent('KeyA', 'A', kShift));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.repeat,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalKeyA,
       logical: kLogicalKeyA,
       character: 'A',
@@ -187,6 +194,7 @@ void testMain() {
     converter.handleEvent(keyUpEvent('ShiftLeft', 'Shift', 0, kLocationLeft));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.up,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalShiftLeft,
       logical: kLogicalShiftLeft,
       character: null,
@@ -196,6 +204,7 @@ void testMain() {
     converter.handleEvent(keyRepeatedDownEvent('KeyA', 'a'));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.repeat,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalKeyA,
       logical: kLogicalKeyA,
       character: 'a',
@@ -205,6 +214,7 @@ void testMain() {
     converter.handleEvent(keyRepeatedDownEvent('KeyA', 'a'));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.repeat,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalKeyA,
       logical: kLogicalKeyA,
       character: 'a',
@@ -214,6 +224,7 @@ void testMain() {
     converter.handleEvent(keyUpEvent('KeyA', 'a'));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.up,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalKeyA,
       logical: kLogicalKeyA,
       character: null,
@@ -231,6 +242,7 @@ void testMain() {
     converter.handleEvent(keyDownEvent('ShiftLeft', 'Shift', kShift, kLocationLeft));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.down,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalShiftLeft,
       logical: kLogicalShiftLeft,
       character: null,
@@ -239,6 +251,7 @@ void testMain() {
     converter.handleEvent(keyDownEvent('ShiftRight', 'Shift', kShift, kLocationRight));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.down,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalShiftRight,
       logical: kLogicalShiftRight,
       character: null,
@@ -247,6 +260,7 @@ void testMain() {
     converter.handleEvent(keyUpEvent('ShiftLeft', 'Shift', kShift, kLocationLeft));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.up,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalShiftLeft,
       logical: kLogicalShiftLeft,
       character: null,
@@ -255,6 +269,7 @@ void testMain() {
     converter.handleEvent(keyUpEvent('ShiftRight', 'Shift', 0, kLocationRight));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.up,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalShiftRight,
       logical: kLogicalShiftRight,
       character: null,
@@ -271,6 +286,7 @@ void testMain() {
     converter.handleEvent(keyDownEvent('', 'Shift', kShift));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.down,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalEmptyCode,
       logical: kLogicalShiftLeft,
       character: null,
@@ -279,6 +295,7 @@ void testMain() {
     converter.handleEvent(keyUpEvent('', 'Shift', kShift));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.up,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalEmptyCode,
       logical: kLogicalShiftLeft,
       character: null,
@@ -287,6 +304,7 @@ void testMain() {
     converter.handleEvent(keyDownEvent('', 'Control', kCtrl));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.down,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalEmptyCode,
       logical: kLogicalCtrlLeft,
       character: null,
@@ -295,6 +313,7 @@ void testMain() {
     converter.handleEvent(keyUpEvent('', 'Control', kCtrl));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.up,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalEmptyCode,
       logical: kLogicalCtrlLeft,
       character: null,
@@ -303,6 +322,7 @@ void testMain() {
     converter.handleEvent(keyDownEvent('', 'Alt', kAlt));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.down,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalEmptyCode,
       logical: kLogicalAltLeft,
       character: null,
@@ -311,6 +331,7 @@ void testMain() {
     converter.handleEvent(keyUpEvent('', 'Alt', kAlt));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.up,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalEmptyCode,
       logical: kLogicalAltLeft,
       character: null,
@@ -319,6 +340,7 @@ void testMain() {
     converter.handleEvent(keyDownEvent('', 'Meta', kMeta));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.down,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalEmptyCode,
       logical: kLogicalMetaLeft,
       character: null,
@@ -327,6 +349,7 @@ void testMain() {
     converter.handleEvent(keyUpEvent('', 'Meta', kMeta));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.up,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalEmptyCode,
       logical: kLogicalMetaLeft,
       character: null,
@@ -343,6 +366,7 @@ void testMain() {
     converter.handleEvent(keyDownEvent('Digit1', '1'));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.down,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalDigit1,
       logical: kLogicalDigit1,
       character: '1',
@@ -351,6 +375,7 @@ void testMain() {
     converter.handleEvent(keyDownEvent('Numpad1', '1', 0, kLocationNumpad));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.down,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalNumpad1,
       logical: kLogicalNumpad1,
       character: '1',
@@ -359,6 +384,7 @@ void testMain() {
     converter.handleEvent(keyUpEvent('Digit1', '1'));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.up,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalDigit1,
       logical: kLogicalDigit1,
       character: null,
@@ -367,6 +393,7 @@ void testMain() {
     converter.handleEvent(keyUpEvent('Numpad1', '1', 0, kLocationNumpad));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.up,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalNumpad1,
       logical: kLogicalNumpad1,
       character: null,
@@ -393,6 +420,7 @@ void testMain() {
     converter.handleEvent(keyDownEvent('KeyE', 'Dead', kAlt));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.down,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalKeyE,
       logical: kLogicalAltE,
       character: null,
@@ -401,6 +429,7 @@ void testMain() {
     converter.handleEvent(keyUpEvent('KeyE', 'Dead', kAlt));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.up,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalKeyE,
       logical: kLogicalAltE,
       character: null,
@@ -409,6 +438,7 @@ void testMain() {
     converter.handleEvent(keyDownEvent('KeyU', 'Dead', kAlt));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.down,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalKeyU,
       logical: kLogicalAltU,
       character: null,
@@ -417,6 +447,7 @@ void testMain() {
     converter.handleEvent(keyUpEvent('KeyU', 'Dead', kAlt));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.up,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalKeyU,
       logical: kLogicalAltU,
       character: null,
@@ -429,6 +460,7 @@ void testMain() {
     converter.handleEvent(keyDownEvent('KeyE', 'Dead', kAlt | kShift));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.down,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalKeyE,
       logical: kLogicalAltShiftE,
       character: null,
@@ -439,6 +471,7 @@ void testMain() {
     converter.handleEvent(keyUpEvent('KeyE', 'e', kShift));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.up,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalKeyE,
       logical: kLogicalAltShiftE,
       character: null,
@@ -463,6 +496,7 @@ void testMain() {
     expect(keyDataList, hasLength(2));
     expectKeyData(keyDataList.first,
       type: ui.KeyEventType.up,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalShiftLeft,
       logical: kLogicalShiftLeft,
       character: null,
@@ -470,6 +504,7 @@ void testMain() {
     );
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.down,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalShiftLeft,
       logical: kLogicalShiftLeft,
       character: null,
@@ -481,6 +516,7 @@ void testMain() {
     expect(keyDataList, hasLength(1));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.up,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalShiftLeft,
       logical: kLogicalShiftLeft,
       character: null,
@@ -488,6 +524,49 @@ void testMain() {
     expect(MockKeyboardEvent.lastDefaultPrevented, isTrue);
   });
 
+  test('Duplicate down is preceded with synthesized up using registered logical key', () {
+    // Regression test for https://github.com/flutter/flutter/issues/126247.
+    final List<ui.KeyData> keyDataList = <ui.KeyData>[];
+    final KeyboardConverter converter = KeyboardConverter((ui.KeyData key) {
+      keyDataList.add(key);
+      return true;
+    }, OperatingSystem.linux);
+
+    // This test simulates the use of 'BracketLeft' on a french keyboard, see:
+    // https://github.com/flutter/flutter/issues/126247#issuecomment-1856112566.
+    converter.handleEvent(keyDownEvent('BracketLeft', 'Dead'));
+    expect(MockKeyboardEvent.lastDefaultPrevented, isTrue);
+    expectKeyData(keyDataList.first,
+      type: ui.KeyEventType.down,
+      deviceType: ui.KeyEventDeviceType.keyboard,
+      physical: kPhysicalBracketLeft,
+      logical: kLogicalBracketLeft,
+      character: null,
+    );
+
+    // A KeyUp of BracketLeft is missed.
+    keyDataList.clear();
+
+    converter.handleEvent(keyDownEvent('BracketLeft', 'Process'));
+    expect(keyDataList, hasLength(2));
+    expectKeyData(keyDataList.first,
+      type: ui.KeyEventType.up,
+      deviceType: ui.KeyEventDeviceType.keyboard,
+      physical: kPhysicalBracketLeft,
+      logical: kLogicalBracketLeft,
+      character: null,
+      synthesized: true,
+    );
+    expectKeyData(keyDataList.last,
+      type: ui.KeyEventType.down,
+      deviceType: ui.KeyEventDeviceType.keyboard,
+      physical: kPhysicalBracketLeft,
+      logical: kLogicalProcess,
+      character: null,
+    );
+    expect(MockKeyboardEvent.lastDefaultPrevented, isTrue);
+  });
+
   test('Duplicate ups are skipped', () {
     final List<ui.KeyData> keyDataList = <ui.KeyData>[];
     final KeyboardConverter converter = KeyboardConverter((ui.KeyData key) {
@@ -527,6 +606,7 @@ void testMain() {
     converter.handleEvent(keyDownEvent('KeyA', 'a'));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.down,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalKeyA,
       logical: kLogicalKeyA,
       character: 'a',
@@ -535,6 +615,7 @@ void testMain() {
     converter.handleEvent(keyDownEvent('KeyU', 'u'));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.down,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalKeyU,
       logical: kLogicalKeyU,
       character: 'u',
@@ -554,6 +635,7 @@ void testMain() {
       expect(keyDataList, hasLength(1));
       expectKeyData(keyDataList.last,
         type: ui.KeyEventType.down,
+        deviceType: ui.KeyEventDeviceType.keyboard,
         physical: kPhysicalCapsLock,
         logical: kLogicalCapsLock,
         character: null,
@@ -565,6 +647,7 @@ void testMain() {
       expect(keyDataList, hasLength(1));
       expectKeyData(keyDataList.last,
         type: ui.KeyEventType.up,
+        deviceType: ui.KeyEventDeviceType.keyboard,
         physical: kPhysicalCapsLock,
         logical: kLogicalCapsLock,
         character: null,
@@ -577,6 +660,7 @@ void testMain() {
       expect(keyDataList, hasLength(1));
       expectKeyData(keyDataList.last,
         type: ui.KeyEventType.down,
+        deviceType: ui.KeyEventDeviceType.keyboard,
         physical: kPhysicalCapsLock,
         logical: kLogicalCapsLock,
         character: null,
@@ -588,6 +672,7 @@ void testMain() {
       expect(keyDataList, hasLength(1));
       expectKeyData(keyDataList.last,
         type: ui.KeyEventType.up,
+        deviceType: ui.KeyEventDeviceType.keyboard,
         physical: kPhysicalCapsLock,
         logical: kLogicalCapsLock,
         character: null,
@@ -601,6 +686,7 @@ void testMain() {
       expect(keyDataList, hasLength(1));
       expectKeyData(keyDataList.last,
         type: ui.KeyEventType.down,
+        deviceType: ui.KeyEventDeviceType.keyboard,
         physical: kPhysicalCapsLock,
         logical: kLogicalCapsLock,
         character: null,
@@ -626,6 +712,7 @@ void testMain() {
     expect(keyDataList, hasLength(1));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.down,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalCapsLock,
       logical: kLogicalCapsLock,
       character: null,
@@ -639,6 +726,7 @@ void testMain() {
     expect(keyDataList, hasLength(1));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.up,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalCapsLock,
       logical: kLogicalCapsLock,
       character: null,
@@ -651,6 +739,7 @@ void testMain() {
     converter.handleEvent(keyDownEvent('CapsLock', 'CapsLock'));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.down,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalCapsLock,
       logical: kLogicalCapsLock,
       character: null,
@@ -659,6 +748,7 @@ void testMain() {
     converter.handleEvent(keyUpEvent('CapsLock', 'CapsLock'));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.up,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalCapsLock,
       logical: kLogicalCapsLock,
       character: null,
@@ -680,18 +770,20 @@ void testMain() {
       expectKeyData(keyDataList.last,
         timeStamp: const Duration(milliseconds: 200),
         type: ui.KeyEventType.down,
+        deviceType: ui.KeyEventDeviceType.keyboard,
         physical: kPhysicalKeyA,
         logical: kLogicalKeyA,
         character: 'a',
       );
       keyDataList.clear();
 
-      // Keyup of KeyA is omitted due to being a shortcut.
+      // Key Up of KeyA is omitted due to being a shortcut.
 
       async.elapse(const Duration(milliseconds: 2500));
       expectKeyData(keyDataList.last,
         timeStamp: const Duration(milliseconds: 2200),
         type: ui.KeyEventType.up,
+        deviceType: ui.KeyEventDeviceType.keyboard,
         physical: kPhysicalKeyA,
         logical: kLogicalKeyA,
         character: null,
@@ -703,6 +795,7 @@ void testMain() {
       expectKeyData(keyDataList.last,
         timeStamp: const Duration(milliseconds: 2700),
         type: ui.KeyEventType.up,
+        deviceType: ui.KeyEventDeviceType.keyboard,
         physical: kPhysicalMetaLeft,
         logical: kLogicalMetaLeft,
         character: null,
@@ -714,6 +807,7 @@ void testMain() {
       expectKeyData(keyDataList.last,
         timeStamp: const Duration(milliseconds: 2800),
         type: ui.KeyEventType.down,
+        deviceType: ui.KeyEventDeviceType.keyboard,
         physical: kPhysicalKeyA,
         logical: kLogicalKeyA,
         character: 'a',
@@ -724,6 +818,7 @@ void testMain() {
       expectKeyData(keyDataList.last,
         timeStamp: const Duration(milliseconds: 2900),
         type: ui.KeyEventType.up,
+        deviceType: ui.KeyEventDeviceType.keyboard,
         physical: kPhysicalKeyA,
         logical: kLogicalKeyA,
         character: null,
@@ -750,12 +845,13 @@ void testMain() {
     async.elapse(const Duration(milliseconds: 50));
     converter.handleEvent(keyRepeatedDownEvent('KeyA', 'a', kMeta)..timeStamp = 700);
 
-    // Keyup of KeyA is omitted due to being a shortcut.
+    // Key Up of KeyA is omitted due to being a shortcut.
 
     async.elapse(const Duration(milliseconds: 2000));
     expectKeyData(keyDataList.last,
       timeStamp: const Duration(milliseconds: 2700),
       type: ui.KeyEventType.up,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalKeyA,
       logical: kLogicalKeyA,
       character: null,
@@ -767,6 +863,7 @@ void testMain() {
     expectKeyData(keyDataList.last,
       timeStamp: const Duration(milliseconds: 3200),
       type: ui.KeyEventType.up,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalMetaLeft,
       logical: kLogicalMetaLeft,
       character: null,
@@ -778,6 +875,7 @@ void testMain() {
     expectKeyData(keyDataList.last,
       timeStamp: const Duration(milliseconds: 3300),
       type: ui.KeyEventType.down,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalKeyA,
       logical: kLogicalKeyA,
       character: 'a',
@@ -788,6 +886,7 @@ void testMain() {
     expectKeyData(keyDataList.last,
       timeStamp: const Duration(milliseconds: 3400),
       type: ui.KeyEventType.up,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalKeyA,
       logical: kLogicalKeyA,
       character: null,
@@ -808,6 +907,7 @@ void testMain() {
     expectKeyData(keyDataList.last,
       timeStamp: const Duration(milliseconds: 200),
       type: ui.KeyEventType.down,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalKeyA,
       logical: kLogicalKeyA,
       character: 'a',
@@ -822,6 +922,7 @@ void testMain() {
     expectKeyData(keyDataList.last,
       timeStamp: const Duration(milliseconds: 800),
       type: ui.KeyEventType.up,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalKeyA,
       logical: kLogicalKeyA,
       character: null,
@@ -835,6 +936,7 @@ void testMain() {
     expectKeyData(keyDataList.last,
       timeStamp: const Duration(milliseconds: 2800),
       type: ui.KeyEventType.down,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalKeyA,
       logical: kLogicalKeyA,
       character: 'a',
@@ -845,6 +947,7 @@ void testMain() {
     expectKeyData(keyDataList.last,
       timeStamp: const Duration(milliseconds: 2900),
       type: ui.KeyEventType.up,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalKeyA,
       logical: kLogicalKeyA,
       character: null,
@@ -865,6 +968,7 @@ void testMain() {
     expectKeyData(keyDataList.last,
       timeStamp: const Duration(milliseconds: 200),
       type: ui.KeyEventType.down,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalKeyA,
       logical: kLogicalKeyA,
       character: 'a',
@@ -886,6 +990,7 @@ void testMain() {
     expect(keyDataList, hasLength(1));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.down,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalScrollLock,
       logical: kLogicalScrollLock,
       character: null,
@@ -899,6 +1004,7 @@ void testMain() {
     expect(keyDataList, hasLength(1));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.up,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalScrollLock,
       logical: kLogicalScrollLock,
       character: null,
@@ -908,6 +1014,7 @@ void testMain() {
     converter.handleEvent(keyDownEvent('ScrollLock', 'ScrollLock'));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.down,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalScrollLock,
       logical: kLogicalScrollLock,
       character: null,
@@ -916,6 +1023,7 @@ void testMain() {
     converter.handleEvent(keyUpEvent('ScrollLock', 'ScrollLock'));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.up,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalScrollLock,
       logical: kLogicalScrollLock,
       character: null,
@@ -932,6 +1040,7 @@ void testMain() {
     converter.handleEvent(keyDownEvent('ShiftRight', 'Shift', kShift, kLocationRight));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.down,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalShiftRight,
       logical: kLogicalShiftRight,
       character: null,
@@ -940,6 +1049,7 @@ void testMain() {
     converter.handleEvent(keyDownEvent('ShiftLeft', 'Shift', kShift, kLocationLeft));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.down,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalShiftLeft,
       logical: kLogicalShiftLeft,
       character: null,
@@ -952,6 +1062,7 @@ void testMain() {
     expect(keyDataList, hasLength(3));
     expectKeyData(keyDataList[0],
       type: ui.KeyEventType.up,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalShiftLeft,
       logical: kLogicalShiftLeft,
       character: null,
@@ -959,6 +1070,7 @@ void testMain() {
     );
     expectKeyData(keyDataList[1],
       type: ui.KeyEventType.up,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalShiftRight,
       logical: kLogicalShiftRight,
       character: null,
@@ -966,6 +1078,7 @@ void testMain() {
     );
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.down,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalKeyA,
       logical: kLogicalKeyA,
       character: 'a',
@@ -988,6 +1101,7 @@ void testMain() {
     converter.handleEvent(keyDownEvent('ShiftLeft', 'Shift', kShift, kLocationLeft));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.down,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalShiftLeft,
       logical: kLogicalShiftLeft,
       character: null,
@@ -999,6 +1113,7 @@ void testMain() {
     expect(keyDataList, hasLength(1));
     expectKeyData(keyDataList.first,
       type: ui.KeyEventType.down,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalMetaLeft,
       logical: kLogicalMetaLeft,
       character: null,
@@ -1010,6 +1125,7 @@ void testMain() {
     expect(keyDataList, hasLength(1));
     expectKeyData(keyDataList.first,
       type: ui.KeyEventType.up,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalMetaLeft,
       logical: kLogicalMetaLeft,
       character: null,
@@ -1019,12 +1135,28 @@ void testMain() {
     converter.handleEvent(keyUpEvent('ShiftLeft', 'Shift', 0, kLocationLeft));
     expectKeyData(keyDataList.last,
       type: ui.KeyEventType.up,
+      deviceType: ui.KeyEventDeviceType.keyboard,
       physical: kPhysicalShiftLeft,
       logical: kLogicalShiftLeft,
       character: null,
     );
     keyDataList.clear();
   });
+
+  test('Ignore DOM event when event.key is null', () {
+    // Regression test for https://github.com/flutter/flutter/issues/114620.
+    final List<ui.KeyData> keyDataList = <ui.KeyData>[];
+    final KeyboardConverter converter = KeyboardConverter((ui.KeyData key) {
+      keyDataList.add(key);
+      return true;
+    }, OperatingSystem.linux);
+
+    converter.handleEvent(keyDownEvent(null, null));
+    converter.handleEvent(keyUpEvent(null, null));
+
+    // Invalid key events are ignored.
+    expect(keyDataList, isEmpty);
+  });
 }
 
 // Flags used for the `modifiers` argument of `key***Event` functions.
@@ -1036,7 +1168,7 @@ const int kMeta = 0x8;
 // Utility functions to make code more concise.
 //
 // To add timeStamp , use syntax `..timeStamp = `.
-MockKeyboardEvent keyDownEvent(String code, String key, [int modifiers = 0, int location = 0]) {
+MockKeyboardEvent keyDownEvent(String? code, String? key, [int modifiers = 0, int location = 0]) {
   return MockKeyboardEvent(
     type: 'keydown',
     code: code,
@@ -1049,7 +1181,7 @@ MockKeyboardEvent keyDownEvent(String code, String key, [int modifiers = 0, int
   );
 }
 
-MockKeyboardEvent keyUpEvent(String code, String key, [int modifiers = 0, int location = 0]) {
+MockKeyboardEvent keyUpEvent(String? code, String? key, [int modifiers = 0, int location = 0]) {
   return MockKeyboardEvent(
     type: 'keyup',
     code: code,
@@ -1076,14 +1208,10 @@ MockKeyboardEvent keyRepeatedDownEvent(String code, String key, [int modifiers =
   );
 }
 
-// Flags used for the `activeLocks` argument of expectKeyData.
-const int kCapsLock = 0x1;
-const int kNumlLock = 0x2;
-const int kScrollLock = 0x4;
-
 void expectKeyData(
   ui.KeyData target, {
   required ui.KeyEventType type,
+  required ui.KeyEventDeviceType deviceType,
   required int physical,
   required int logical,
   required String? character,
diff --git a/lib/web_ui/test/lerp_test.dart b/lib/web_ui/test/engine/lerp_test.dart
similarity index 74%
rename from lib/web_ui/test/lerp_test.dart
rename to lib/web_ui/test/engine/lerp_test.dart
index 2c9d1fc0574c026d994ef8d16ddced58bec0b39c..d69d5c1ffc2eaf114b0bb96e1ba1a807018c9e54 100644
--- a/lib/web_ui/test/lerp_test.dart
+++ b/lib/web_ui/test/engine/lerp_test.dart
@@ -7,12 +7,7 @@ import 'package:test/test.dart';
 
 import 'package:ui/ui.dart';
 
-/// The epsilon of tolerable double precision error.
-///
-/// This is used in various places in the framework to allow for floating point
-/// precision loss in calculations. Differences below this threshold are safe
-/// to disregard.
-const double precisionErrorTolerance = 1e-10;
+import '../common/matchers.dart';
 
 void main() {
   internalBootstrapBrowserTest(() => testMain);
@@ -31,19 +26,19 @@ void testMain() {
   });
 
   test('lerpDouble should treat a null input as 0 if the other input is non-null', () {
-    expect(lerpDouble(null, 10.0, 0.25), closeTo(2.5, precisionErrorTolerance));
-    expect(lerpDouble(10.0, null, 0.25), closeTo(7.5, precisionErrorTolerance));
+    expect(lerpDouble(null, 10.0, 0.25), within(from: 2.5));
+    expect(lerpDouble(10.0, null, 0.25), within(from: 7.5));
 
-    expect(lerpDouble(null, 10, 0.25), closeTo(2.5, precisionErrorTolerance));
-    expect(lerpDouble(10, null, 0.25), closeTo(7.5, precisionErrorTolerance));
+    expect(lerpDouble(null, 10, 0.25), within(from: 2.5));
+    expect(lerpDouble(10, null, 0.25), within(from: 7.5));
   });
 
   test('lerpDouble should handle interpolation values < 0.0', () {
-    expect(lerpDouble(0.0, 10.0, -5.0), closeTo(-50.0, precisionErrorTolerance));
-    expect(lerpDouble(10.0, 0.0, -5.0), closeTo(60.0, precisionErrorTolerance));
+    expect(lerpDouble(0.0, 10.0, -5.0), within(from: -50.0));
+    expect(lerpDouble(10.0, 0.0, -5.0), within(from: 60.0));
 
-    expect(lerpDouble(0, 10, -5), closeTo(-50, precisionErrorTolerance));
-    expect(lerpDouble(10, 0, -5), closeTo(60, precisionErrorTolerance));
+    expect(lerpDouble(0, 10, -5), within(from: -50.0));
+    expect(lerpDouble(10, 0, -5), within(from: 60.0));
   });
 
   test('lerpDouble should return the start value at 0.0', () {
@@ -55,17 +50,17 @@ void testMain() {
   });
 
   test('lerpDouble should interpolate between two values', () {
-    expect(lerpDouble(0.0, 10.0, 0.25), closeTo(2.5, precisionErrorTolerance));
-    expect(lerpDouble(10.0, 0.0, 0.25), closeTo(7.5, precisionErrorTolerance));
+    expect(lerpDouble(0.0, 10.0, 0.25), within(from: 2.5));
+    expect(lerpDouble(10.0, 0.0, 0.25), within(from: 7.5));
 
-    expect(lerpDouble(0, 10, 0.25), closeTo(2.5, precisionErrorTolerance));
-    expect(lerpDouble(10, 0, 0.25), closeTo(7.5, precisionErrorTolerance));
+    expect(lerpDouble(0, 10, 0.25), within(from: 2.5));
+    expect(lerpDouble(10, 0, 0.25), within(from: 7.5));
 
     // Exact answer: 20.0 - 1.0e-29
-    expect(lerpDouble(10.0, 1.0e30, 1.0e-29), closeTo(20.0, precisionErrorTolerance));
+    expect(lerpDouble(10.0, 1.0e30, 1.0e-29), within(from: 20.0));
 
     // Exact answer: 5.0 + 5.0e29
-    expect(lerpDouble(10.0, 1.0e30, 0.5), closeTo(5.0e29, precisionErrorTolerance));
+    expect(lerpDouble(10.0, 1.0e30, 0.5), within(from: 5.0e29));
   });
 
   test('lerpDouble should return the end value at 1.0', () {
@@ -80,11 +75,11 @@ void testMain() {
   });
 
   test('lerpDouble should handle interpolation values > 1.0', () {
-    expect(lerpDouble(0.0, 10.0, 5.0), closeTo(50.0, precisionErrorTolerance));
-    expect(lerpDouble(10.0, 0.0, 5.0), closeTo(-40.0, precisionErrorTolerance));
+    expect(lerpDouble(0.0, 10.0, 5.0), within(from: 50.0));
+    expect(lerpDouble(10.0, 0.0, 5.0), within(from: -40.0));
 
-    expect(lerpDouble(0, 10, 5), closeTo(50, precisionErrorTolerance));
-    expect(lerpDouble(10, 0, 5), closeTo(-40, precisionErrorTolerance));
+    expect(lerpDouble(0, 10, 5), within(from: 50.0));
+    expect(lerpDouble(10, 0, 5), within(from: -40.0));
   });
 
   test('lerpDouble should return input value in all cases if begin/end are equal', () {
diff --git a/lib/web_ui/test/locale_test.dart b/lib/web_ui/test/engine/locale_test.dart
similarity index 100%
rename from lib/web_ui/test/locale_test.dart
rename to lib/web_ui/test/engine/locale_test.dart
diff --git a/lib/web_ui/test/engine/lru_cache_test.dart b/lib/web_ui/test/engine/lru_cache_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..ba1dfcaea0fd600738f29fdfa5b54d26a60ef511
--- /dev/null
+++ b/lib/web_ui/test/engine/lru_cache_test.dart
@@ -0,0 +1,99 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine/util.dart';
+
+typedef TestCacheEntry = ({String key, int value});
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+void testMain() {
+  test('$LruCache starts out empty', () {
+    final LruCache<String, int> cache = LruCache<String, int>(10);
+    expect(cache.length, 0);
+  });
+
+  test('$LruCache adds up to a maximum number of items in most recently used first order', () {
+    final LruCache<String, int> cache = LruCache<String, int>(3);
+    cache.cache('a', 1);
+    expect(cache.debugItemQueue.toList(), <TestCacheEntry>[
+      (key: 'a', value: 1),
+    ]);
+    expect(cache['a'], 1);
+    expect(cache['b'], isNull);
+
+    cache.cache('b', 2);
+    expect(cache.debugItemQueue.toList(), <TestCacheEntry>[
+      (key: 'b', value: 2),
+      (key: 'a', value: 1),
+    ]);
+    expect(cache['a'], 1);
+    expect(cache['b'], 2);
+
+    cache.cache('c', 3);
+    expect(cache.debugItemQueue.toList(), <TestCacheEntry>[
+      (key: 'c', value: 3),
+      (key: 'b', value: 2),
+      (key: 'a', value: 1),
+    ]);
+
+    cache.cache('d', 4);
+    expect(cache.debugItemQueue.toList(), <TestCacheEntry>[
+      (key: 'd', value: 4),
+      (key: 'c', value: 3),
+      (key: 'b', value: 2),
+    ]);
+
+    cache.cache('e', 5);
+    expect(cache.debugItemQueue.toList(), <TestCacheEntry>[
+      (key: 'e', value: 5),
+      (key: 'd', value: 4),
+      (key: 'c', value: 3),
+    ]);
+  });
+
+  test('$LruCache promotes entry to most recently used position', () {
+    final LruCache<String, int> cache = LruCache<String, int>(3);
+    cache.cache('a', 1);
+    cache.cache('b', 2);
+    cache.cache('c', 3);
+    expect(cache.debugItemQueue.toList(), <TestCacheEntry>[
+      (key: 'c', value: 3),
+      (key: 'b', value: 2),
+      (key: 'a', value: 1),
+    ]);
+
+    cache.cache('b', 2);
+    expect(cache.debugItemQueue.toList(), <TestCacheEntry>[
+      (key: 'b', value: 2),
+      (key: 'c', value: 3),
+      (key: 'a', value: 1),
+    ]);
+  });
+
+  test('$LruCache updates and promotes entry to most recently used position', () {
+    final LruCache<String, int> cache = LruCache<String, int>(3);
+    cache.cache('a', 1);
+    cache.cache('b', 2);
+    cache.cache('c', 3);
+    expect(cache.debugItemQueue.toList(), <TestCacheEntry>[
+      (key: 'c', value: 3),
+      (key: 'b', value: 2),
+      (key: 'a', value: 1),
+    ]);
+    expect(cache['b'], 2);
+
+    cache.cache('b', 42);
+    expect(cache.debugItemQueue.toList(), <TestCacheEntry>[
+      (key: 'b', value: 42),
+      (key: 'c', value: 3),
+      (key: 'a', value: 1),
+    ]);
+    expect(cache['b'], 42);
+  });
+}
diff --git a/lib/web_ui/test/engine/mouse/context_menu_test.dart b/lib/web_ui/test/engine/mouse/context_menu_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..a432678657927b6f04611f3e1607ccee040b67eb
--- /dev/null
+++ b/lib/web_ui/test/engine/mouse/context_menu_test.dart
@@ -0,0 +1,104 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+void testMain() {
+  group('$ContextMenu', () {
+    test('can disable context menu', () {
+      final DomElement rootViewElement = createDomElement('div');
+      final ContextMenu contextMenu = ContextMenu(rootViewElement);
+
+      // When the app starts, contextmenu events are not prevented.
+      DomEvent event = createDomEvent('Event', 'contextmenu');
+      expect(event.defaultPrevented, isFalse);
+      rootViewElement.dispatchEvent(event);
+      expect(event.defaultPrevented, isFalse);
+
+      // Disabling the context menu causes contextmenu events to be prevented.
+      contextMenu.disable();
+      event = createDomEvent('Event', 'contextmenu');
+      expect(event.defaultPrevented, isFalse);
+      rootViewElement.dispatchEvent(event);
+      expect(event.defaultPrevented, isTrue);
+
+      // Disabling again has no effect.
+      contextMenu.disable();
+      event = createDomEvent('Event', 'contextmenu');
+      expect(event.defaultPrevented, isFalse);
+      rootViewElement.dispatchEvent(event);
+      expect(event.defaultPrevented, isTrue);
+    });
+
+    test('does not disable context menu outside root view element', () {
+      final DomElement rootViewElement = createDomElement('div');
+      final ContextMenu contextMenu = ContextMenu(rootViewElement);
+
+      contextMenu.disable();
+
+      // Dispatching on a DOM element outside of target's subtree has no effect.
+      final DomEvent event = createDomEvent('Event', 'contextmenu');
+      expect(event.defaultPrevented, isFalse);
+      domDocument.body!.dispatchEvent(event);
+      expect(event.defaultPrevented, isFalse);
+    });
+
+    test('can enable context menu after disabling', () {
+      final DomElement rootViewElement = createDomElement('div');
+      final ContextMenu contextMenu = ContextMenu(rootViewElement);
+
+      // When the app starts, contextmenu events are not prevented.
+      DomEvent event = createDomEvent('Event', 'contextmenu');
+      expect(event.defaultPrevented, isFalse);
+      rootViewElement.dispatchEvent(event);
+      expect(event.defaultPrevented, isFalse);
+
+      // Disabling the context menu causes contextmenu events to be prevented.
+      contextMenu.disable();
+      event = createDomEvent('Event', 'contextmenu');
+      expect(event.defaultPrevented, isFalse);
+      rootViewElement.dispatchEvent(event);
+      expect(event.defaultPrevented, isTrue);
+
+      // Enabling the context menu means that contextmenu events are back to not
+      // being prevented.
+      contextMenu.enable();
+      event = createDomEvent('Event', 'contextmenu');
+      expect(event.defaultPrevented, isFalse);
+      rootViewElement.dispatchEvent(event);
+      expect(event.defaultPrevented, isFalse);
+
+      // Enabling again has no effect.
+      contextMenu.enable();
+      event = createDomEvent('Event', 'contextmenu');
+      expect(event.defaultPrevented, isFalse);
+      rootViewElement.dispatchEvent(event);
+      expect(event.defaultPrevented, isFalse);
+    });
+
+    test('enabling before disabling has no effect', () {
+      final DomElement rootViewElement = createDomElement('div');
+      final ContextMenu contextMenu = ContextMenu(rootViewElement);
+
+      // When the app starts, contextmenu events are not prevented.
+      DomEvent event = createDomEvent('Event', 'contextmenu');
+      expect(event.defaultPrevented, isFalse);
+      rootViewElement.dispatchEvent(event);
+      expect(event.defaultPrevented, isFalse);
+
+      // Enabling has no effect.
+      contextMenu.enable();
+      event = createDomEvent('Event', 'contextmenu');
+      expect(event.defaultPrevented, isFalse);
+      rootViewElement.dispatchEvent(event);
+      expect(event.defaultPrevented, isFalse);
+    });
+  });
+}
diff --git a/lib/web_ui/test/engine/mouse/cursor_test.dart b/lib/web_ui/test/engine/mouse/cursor_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..4d621ed365b1080d15dfe2d6704ffc7f89dfd355
--- /dev/null
+++ b/lib/web_ui/test/engine/mouse/cursor_test.dart
@@ -0,0 +1,53 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+void testMain() {
+  group('$MouseCursor', () {
+    test('sets correct `cursor` style on root element', () {
+      final DomElement rootViewElement = createDomElement('div');
+      final MouseCursor mouseCursor = MouseCursor(rootViewElement);
+
+      // TODO(mdebbar): This should be `rootViewElement`.
+      //                https://github.com/flutter/flutter/issues/140226
+      final DomElement cursorTarget = domDocument.body!;
+
+      mouseCursor.activateSystemCursor('alias');
+      expect(cursorTarget.style.cursor, 'alias');
+
+      mouseCursor.activateSystemCursor('move');
+      expect(cursorTarget.style.cursor, 'move');
+
+      mouseCursor.activateSystemCursor('precise');
+      expect(cursorTarget.style.cursor, 'crosshair');
+
+      mouseCursor.activateSystemCursor('resizeDownRight');
+      expect(cursorTarget.style.cursor, 'se-resize');
+
+      mouseCursor.activateSystemCursor('basic');
+      expect(cursorTarget.style.cursor, isEmpty);
+    });
+
+    test('handles unknown cursor type', () {
+      final DomElement rootViewElement = createDomElement('div');
+      final MouseCursor mouseCursor = MouseCursor(rootViewElement);
+
+      // TODO(mdebbar): This should be `rootViewElement`.
+      //                https://github.com/flutter/flutter/issues/140226
+      final DomElement cursorTarget = domDocument.body!;
+
+      mouseCursor.activateSystemCursor('unknown');
+      expect(cursorTarget.style.cursor, isEmpty);
+
+      mouseCursor.activateSystemCursor(null);
+    });
+  });
+}
diff --git a/lib/web_ui/test/engine/navigation_test.dart b/lib/web_ui/test/engine/navigation_test.dart
index 27ec64e09dd0a96e6199048923e371a180a2640e..e3386e6c21c8e83b01bd477a2c0d62a7914ccaec 100644
--- a/lib/web_ui/test/engine/navigation_test.dart
+++ b/lib/web_ui/test/engine/navigation_test.dart
@@ -7,40 +7,67 @@ import 'dart:typed_data';
 
 import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
-import 'package:ui/src/engine.dart' as engine;
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui;
 
-const engine.MethodCodec codec = engine.JSONMethodCodec();
+import '../common/test_initialization.dart';
 
-void emptyCallback(ByteData date) {}
+const MethodCodec codec = JSONMethodCodec();
+
+EngineFlutterWindow get implicitView =>
+    EnginePlatformDispatcher.instance.implicitView!;
 
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
 
 void testMain() {
-  engine.TestUrlStrategy? strategy;
+  group('without implicit view', () {
+    test('Handles navigation gracefully when no implicit view exists', () async {
+      expect(EnginePlatformDispatcher.instance.implicitView, isNull);
 
-  setUp(() async {
-    strategy = engine.TestUrlStrategy();
-    await engine.window.debugInitializeHistory(strategy, useSingle: true);
+      final Completer<ByteData?> completer = Completer<ByteData?>();
+      ui.PlatformDispatcher.instance.sendPlatformMessage(
+        'flutter/navigation',
+        codec.encodeMethodCall(const MethodCall(
+          'routeUpdated',
+          <String, dynamic>{'routeName': '/foo'},
+        )),
+        (ByteData? response) => completer.complete(response),
+      );
+      final ByteData? response = await completer.future;
+      expect(response, isNull);
+    });
   });
 
-  tearDown(() async {
-    strategy = null;
-    await engine.window.resetHistory();
-  });
+  group('with implicit view', () {
+    late TestUrlStrategy strategy;
+
+    setUpAll(() async {
+      await bootstrapAndRunApp(withImplicitView: true);
+    });
+
+    setUp(() async {
+      strategy = TestUrlStrategy();
+      await implicitView.debugInitializeHistory(strategy, useSingle: true);
+    });
+
+    tearDown(() async {
+      await implicitView.resetHistory();
+    });
 
-  test('Tracks pushed, replaced and popped routes', () async {
-    final Completer<void> completer = Completer<void>();
-    engine.window.sendPlatformMessage(
-      'flutter/navigation',
-      codec.encodeMethodCall(const engine.MethodCall(
-        'routeUpdated',
-        <String, dynamic>{'routeName': '/foo'},
-      )),
-      (_) => completer.complete(),
-    );
-    await completer.future;
-    expect(strategy!.getPath(), '/foo');
+    test('Tracks pushed, replaced and popped routes', () async {
+      final Completer<void> completer = Completer<void>();
+      ui.PlatformDispatcher.instance.sendPlatformMessage(
+        'flutter/navigation',
+        codec.encodeMethodCall(const MethodCall(
+          'routeUpdated',
+          <String, dynamic>{'routeName': '/foo'},
+        )),
+        (_) => completer.complete(),
+      );
+      await completer.future;
+      expect(strategy.getPath(), '/foo');
+    });
   });
 }
diff --git a/lib/web_ui/test/ui/title_test.dart b/lib/web_ui/test/engine/platform_dispatcher/application_switcher_description_test.dart
similarity index 34%
rename from lib/web_ui/test/ui/title_test.dart
rename to lib/web_ui/test/engine/platform_dispatcher/application_switcher_description_test.dart
index c7caa806f5363d850d446736b159261c4b0321f6..9b23085505dbc9310983bf50ca6590f0cca37952 100644
--- a/lib/web_ui/test/ui/title_test.dart
+++ b/lib/web_ui/test/engine/platform_dispatcher/application_switcher_description_test.dart
@@ -6,84 +6,102 @@ import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
-
-import 'utils.dart';
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
 
-void testMain() {
-  setUpUiTest();
+Future<void> testMain() async {
+  String? getCssThemeColor() {
+    final DomHTMLMetaElement? theme =
+        domDocument.querySelector('#flutterweb-theme') as DomHTMLMetaElement?;
+    return theme?.content;
+  }
 
   const MethodCodec codec = JSONMethodCodec();
 
-  group('Title', () {
+  group('Title and Primary Color/Theme meta', () {
     test('is set on the document by platform message', () {
       // Run the unit test without emulating Flutter tester environment.
-      ui.debugEmulateFlutterTesterEnvironment = false;
+      ui_web.debugEmulateFlutterTesterEnvironment = false;
 
-      // TODO(yjbanov): https://github.com/flutter/flutter/issues/39159
-      domDocument.title = '';
       expect(domDocument.title, '');
-
-      ui.window.sendPlatformMessage(
-          'flutter/platform',
-          codec.encodeMethodCall(const MethodCall(
-              'SystemChrome.setApplicationSwitcherDescription',
-              <String, dynamic>{
-                'label': 'Title Test',
-                'primaryColor': 0xFF00FF00,
-              })),
-          null);
+      expect(getCssThemeColor(), isNull);
+
+      ui.PlatformDispatcher.instance.sendPlatformMessage(
+        'flutter/platform',
+        codec.encodeMethodCall(const MethodCall(
+          'SystemChrome.setApplicationSwitcherDescription',
+          <String, dynamic>{
+            'label': 'Title Test',
+            'primaryColor': 0xFF00FF00,
+          },
+        )),
+        null,
+      );
+
+      const ui.Color expectedPrimaryColor = ui.Color(0xFF00FF00);
 
       expect(domDocument.title, 'Title Test');
-
-      ui.window.sendPlatformMessage(
-          'flutter/platform',
-          codec.encodeMethodCall(const MethodCall(
-              'SystemChrome.setApplicationSwitcherDescription',
-              <String, dynamic>{
-                'label': 'Different title',
-                'primaryColor': 0xFF00FF00,
-              })),
-          null);
+      expect(getCssThemeColor(), expectedPrimaryColor.toCssString());
+
+      ui.PlatformDispatcher.instance.sendPlatformMessage(
+        'flutter/platform',
+        codec.encodeMethodCall(const MethodCall(
+          'SystemChrome.setApplicationSwitcherDescription',
+          <String, dynamic>{
+            'label': 'Different title',
+            'primaryColor': 0xFFFABADA,
+          },
+        )),
+        null,
+      );
+
+      const ui.Color expectedNewPrimaryColor = ui.Color(0xFFFABADA);
 
       expect(domDocument.title, 'Different title');
+      expect(getCssThemeColor(), expectedNewPrimaryColor.toCssString());
     });
 
     test('supports null title and primaryColor', () {
       // Run the unit test without emulating Flutter tester environment.
-      ui.debugEmulateFlutterTesterEnvironment = false;
+      ui_web.debugEmulateFlutterTesterEnvironment = false;
 
+      const ui.Color expectedNullColor = ui.Color(0xFF000000);
       // TODO(yjbanov): https://github.com/flutter/flutter/issues/39159
       domDocument.title = 'Something Else';
       expect(domDocument.title, 'Something Else');
 
-      ui.window.sendPlatformMessage(
-          'flutter/platform',
-          codec.encodeMethodCall(const MethodCall(
-              'SystemChrome.setApplicationSwitcherDescription',
-              <String, dynamic>{
-                'label': null,
-                'primaryColor': null,
-              })),
-          null);
+      ui.PlatformDispatcher.instance.sendPlatformMessage(
+        'flutter/platform',
+        codec.encodeMethodCall(const MethodCall(
+          'SystemChrome.setApplicationSwitcherDescription',
+          <String, dynamic>{
+            'label': null,
+            'primaryColor': null,
+          },
+        )),
+        null,
+      );
 
       expect(domDocument.title, '');
+      expect(getCssThemeColor(), expectedNullColor.toCssString());
 
       domDocument.title = 'Something Else';
       expect(domDocument.title, 'Something Else');
 
-      ui.window.sendPlatformMessage(
-          'flutter/platform',
-          codec.encodeMethodCall(const MethodCall(
-              'SystemChrome.setApplicationSwitcherDescription',
-              <String, dynamic>{
-              })),
-          null);
+      ui.PlatformDispatcher.instance.sendPlatformMessage(
+        'flutter/platform',
+        codec.encodeMethodCall(const MethodCall(
+          'SystemChrome.setApplicationSwitcherDescription',
+          <String, dynamic>{},
+        )),
+        null,
+      );
 
       expect(domDocument.title, '');
+      expect(getCssThemeColor(), expectedNullColor.toCssString());
     });
   });
 }
diff --git a/lib/web_ui/test/engine/platform_dispatcher_test.dart b/lib/web_ui/test/engine/platform_dispatcher/platform_dispatcher_test.dart
similarity index 32%
rename from lib/web_ui/test/engine/platform_dispatcher_test.dart
rename to lib/web_ui/test/engine/platform_dispatcher/platform_dispatcher_test.dart
index 2568f27181e36397d0098ab81e1a178fe7036f4a..c9f9e69f5b4add1e7583739596bcd5b6a83f3e7b 100644
--- a/lib/web_ui/test/engine/platform_dispatcher_test.dart
+++ b/lib/web_ui/test/engine/platform_dispatcher/platform_dispatcher_test.dart
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 import 'dart:async';
-import 'dart:js_util' as js_util;
 import 'dart:typed_data';
 
 import 'package:test/bootstrap/browser.dart';
@@ -11,25 +10,135 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
 
+import '../../common/test_initialization.dart';
+
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
 
 void testMain() {
+  setUpAll(() async {
+    await bootstrapAndRunApp(withImplicitView: true);
+  });
+
   group('PlatformDispatcher', () {
+    late EnginePlatformDispatcher dispatcher;
+
+    setUp(() {
+      dispatcher = EnginePlatformDispatcher();
+    });
+
+    tearDown(() {
+      dispatcher.dispose();
+    });
+
+    test('reports at least one display', () {
+      expect(ui.PlatformDispatcher.instance.displays.length, greaterThan(0));
+    });
+
     test('high contrast in accessibilityFeatures has the correct value', () {
       final MockHighContrastSupport mockHighContrast =
           MockHighContrastSupport();
       HighContrastSupport.instance = mockHighContrast;
-      final EnginePlatformDispatcher engineDispatcher =
+
+      final EnginePlatformDispatcher dispatcher =
           EnginePlatformDispatcher();
 
-      expect(engineDispatcher.accessibilityFeatures.highContrast, isTrue);
+      expect(dispatcher.accessibilityFeatures.highContrast, isTrue);
       mockHighContrast.isEnabled = false;
       mockHighContrast.invokeListeners(mockHighContrast.isEnabled);
-      expect(engineDispatcher.accessibilityFeatures.highContrast, isFalse);
+      expect(dispatcher.accessibilityFeatures.highContrast, isFalse);
 
-      engineDispatcher.dispose();
+      dispatcher.dispose();
+    });
+
+    test('AppLifecycleState transitions through all states', () {
+      final List<ui.AppLifecycleState> states = <ui.AppLifecycleState>[];
+      void listener(ui.AppLifecycleState state) {
+        states.add(state);
+      }
+
+      final MockAppLifecycleState mockAppLifecycleState =
+          MockAppLifecycleState();
+
+      expect(mockAppLifecycleState.appLifecycleState,
+          ui.AppLifecycleState.resumed);
+
+      mockAppLifecycleState.addListener(listener);
+      expect(mockAppLifecycleState.activeCallCount, 1);
+
+      expect(
+          states, equals(<ui.AppLifecycleState>[ui.AppLifecycleState.resumed]));
+
+      mockAppLifecycleState.inactive();
+      expect(mockAppLifecycleState.appLifecycleState,
+          ui.AppLifecycleState.inactive);
+      expect(
+          states,
+          equals(<ui.AppLifecycleState>[
+            ui.AppLifecycleState.resumed,
+            ui.AppLifecycleState.inactive
+          ]));
+
+      // consecutive same states are skipped
+      mockAppLifecycleState.inactive();
+      expect(
+          states,
+          equals(<ui.AppLifecycleState>[
+            ui.AppLifecycleState.resumed,
+            ui.AppLifecycleState.inactive
+          ]));
+
+      mockAppLifecycleState.hidden();
+      expect(
+          mockAppLifecycleState.appLifecycleState, ui.AppLifecycleState.hidden);
+      expect(
+          states,
+          equals(<ui.AppLifecycleState>[
+            ui.AppLifecycleState.resumed,
+            ui.AppLifecycleState.inactive,
+            ui.AppLifecycleState.hidden
+          ]));
+
+      mockAppLifecycleState.resume();
+      expect(mockAppLifecycleState.appLifecycleState,
+          ui.AppLifecycleState.resumed);
+      expect(
+          states,
+          equals(<ui.AppLifecycleState>[
+            ui.AppLifecycleState.resumed,
+            ui.AppLifecycleState.inactive,
+            ui.AppLifecycleState.hidden,
+            ui.AppLifecycleState.resumed
+          ]));
+
+      mockAppLifecycleState.detach();
+      expect(mockAppLifecycleState.appLifecycleState,
+          ui.AppLifecycleState.detached);
+      expect(
+          states,
+          equals(<ui.AppLifecycleState>[
+            ui.AppLifecycleState.resumed,
+            ui.AppLifecycleState.inactive,
+            ui.AppLifecycleState.hidden,
+            ui.AppLifecycleState.resumed,
+            ui.AppLifecycleState.detached
+          ]));
+
+      mockAppLifecycleState.removeListener(listener);
+      expect(mockAppLifecycleState.deactivateCallCount, 1);
+
+      // No more states should be recorded after the listener is removed.
+      mockAppLifecycleState.resume();
+      expect(
+          states,
+          equals(<ui.AppLifecycleState>[
+            ui.AppLifecycleState.resumed,
+            ui.AppLifecycleState.inactive,
+            ui.AppLifecycleState.hidden,
+            ui.AppLifecycleState.resumed,
+            ui.AppLifecycleState.detached
+          ]));
     });
 
     test('responds to flutter/skia Skia.setResourceCacheMaxBytes', () async {
@@ -71,30 +180,63 @@ void testMain() {
       );
     });
 
-    test('responds correctly to flutter/platform Clipboard.getData failure',
+    test('responds to flutter/platform SystemChrome.setSystemUIOverlayStyle',
         () async {
-      // Patch browser so that clipboard api is not available.
-      final Object? originalClipboard =
-          js_util.getProperty<Object?>(domWindow.navigator, 'clipboard');
-      js_util.setProperty(domWindow.navigator, 'clipboard', null);
       const MethodCodec codec = JSONMethodCodec();
       final Completer<ByteData?> completer = Completer<ByteData?>();
       ui.PlatformDispatcher.instance.sendPlatformMessage(
         'flutter/platform',
         codec.encodeMethodCall(const MethodCall(
-          'Clipboard.getData',
+          'SystemChrome.setSystemUIOverlayStyle',
+          <String, dynamic>{},
         )),
         completer.complete,
       );
+
       final ByteData? response = await completer.future;
-      if (response != null) {
-        expect(
-              () => codec.decodeEnvelope(response),
-          throwsA(isA<PlatformException>()),
-        );
-      }
-      js_util.setProperty(
-          domWindow.navigator, 'clipboard', originalClipboard);
+      expect(response, isNotNull);
+      expect(
+        codec.decodeEnvelope(response!),
+        true,
+      );
+    });
+
+    test('responds to flutter/contextmenu enable', () async {
+      const MethodCodec codec = JSONMethodCodec();
+      final Completer<ByteData?> completer = Completer<ByteData?>();
+      ui.PlatformDispatcher.instance.sendPlatformMessage(
+        'flutter/contextmenu',
+        codec.encodeMethodCall(const MethodCall(
+          'enableContextMenu',
+        )),
+        completer.complete,
+      );
+
+      final ByteData? response = await completer.future;
+      expect(response, isNotNull);
+      expect(
+        codec.decodeEnvelope(response!),
+        true,
+      );
+    });
+
+    test('responds to flutter/contextmenu disable', () async {
+      const MethodCodec codec = JSONMethodCodec();
+      final Completer<ByteData?> completer = Completer<ByteData?>();
+      ui.PlatformDispatcher.instance.sendPlatformMessage(
+        'flutter/contextmenu',
+        codec.encodeMethodCall(const MethodCall(
+          'disableContextMenu',
+        )),
+        completer.complete,
+      );
+
+      final ByteData? response = await completer.future;
+      expect(response, isNotNull);
+      expect(
+        codec.decodeEnvelope(response!),
+        true,
+      );
     });
 
     test('can find text scale factor', () async {
@@ -131,7 +273,8 @@ void testMain() {
         () async {
       final DomElement root = domDocument.documentElement!;
       final String oldFontSize = root.style.fontSize;
-      final ui.VoidCallback? oldCallback = ui.PlatformDispatcher.instance.onTextScaleFactorChanged;
+      final ui.VoidCallback? oldCallback =
+          ui.PlatformDispatcher.instance.onTextScaleFactorChanged;
 
       addTearDown(() {
         root.style.fontSize = oldFontSize;
@@ -149,7 +292,8 @@ void testMain() {
       await Future<void>.delayed(Duration.zero);
       expect(root.style.fontSize, '20px');
       expect(isCalled, isTrue);
-      expect(ui.PlatformDispatcher.instance.textScaleFactor, findBrowserTextScaleFactor());
+      expect(ui.PlatformDispatcher.instance.textScaleFactor,
+          findBrowserTextScaleFactor());
 
       isCalled = false;
 
@@ -157,7 +301,139 @@ void testMain() {
       await Future<void>.delayed(Duration.zero);
       expect(root.style.fontSize, '16px');
       expect(isCalled, isTrue);
-      expect(ui.PlatformDispatcher.instance.textScaleFactor, findBrowserTextScaleFactor());
+      expect(ui.PlatformDispatcher.instance.textScaleFactor,
+          findBrowserTextScaleFactor());
+    });
+
+    test('disposes all its views', () {
+      final EngineFlutterView view1 =
+          EngineFlutterView(dispatcher, createDomHTMLDivElement());
+      final EngineFlutterView view2 =
+          EngineFlutterView(dispatcher, createDomHTMLDivElement());
+      final EngineFlutterView view3 =
+          EngineFlutterView(dispatcher, createDomHTMLDivElement());
+
+      dispatcher.viewManager
+        ..registerView(view1)
+        ..registerView(view2)
+        ..registerView(view3);
+
+      expect(view1.isDisposed, isFalse);
+      expect(view2.isDisposed, isFalse);
+      expect(view3.isDisposed, isFalse);
+
+      dispatcher.dispose();
+      expect(view1.isDisposed, isTrue);
+      expect(view2.isDisposed, isTrue);
+      expect(view3.isDisposed, isTrue);
+    });
+
+    test('connects view disposal to metrics changed event', () {
+      final EngineFlutterView view1 =
+          EngineFlutterView(dispatcher, createDomHTMLDivElement());
+      final EngineFlutterView view2 =
+          EngineFlutterView(dispatcher, createDomHTMLDivElement());
+
+      dispatcher.viewManager
+        ..registerView(view1)
+        ..registerView(view2);
+
+      expect(view1.isDisposed, isFalse);
+      expect(view2.isDisposed, isFalse);
+
+      bool onMetricsChangedCalled = false;
+      dispatcher.onMetricsChanged = () {
+        onMetricsChangedCalled = true;
+      };
+
+      expect(onMetricsChangedCalled, isFalse);
+
+      dispatcher.viewManager.disposeAndUnregisterView(view2.viewId);
+
+      expect(onMetricsChangedCalled, isTrue, reason: 'onMetricsChanged should have been called.');
+
+      dispatcher.dispose();
+    });
+
+    test('disconnects view disposal event on dispose', () {
+      final EngineFlutterView view1 =
+          EngineFlutterView(dispatcher, createDomHTMLDivElement());
+
+      dispatcher.viewManager.registerView(view1);
+
+      expect(view1.isDisposed, isFalse);
+
+      bool onMetricsChangedCalled = false;
+      dispatcher.onMetricsChanged = () {
+        onMetricsChangedCalled = true;
+      };
+
+      dispatcher.dispose();
+
+      expect(onMetricsChangedCalled, isFalse);
+      expect(view1.isDisposed, isTrue);
+    });
+
+    test('invokeOnViewFocusChange calls onViewFocusChange', () {
+      final List<ui.ViewFocusEvent> dispatchedViewFocusEvents = <ui.ViewFocusEvent>[];
+      const ui.ViewFocusEvent viewFocusEvent = ui.ViewFocusEvent(
+        viewId: 0,
+        state: ui.ViewFocusState.focused,
+        direction: ui.ViewFocusDirection.undefined,
+      );
+
+      dispatcher.onViewFocusChange = dispatchedViewFocusEvents.add;
+      dispatcher.invokeOnViewFocusChange(viewFocusEvent);
+
+      expect(dispatchedViewFocusEvents, hasLength(1));
+      expect(dispatchedViewFocusEvents.single, viewFocusEvent);
+    });
+
+    test('invokeOnViewFocusChange preserves the zone', () {
+      final Zone zone1 = Zone.current.fork();
+      final Zone zone2 = Zone.current.fork();
+      const ui.ViewFocusEvent viewFocusEvent = ui.ViewFocusEvent(
+        viewId: 0,
+        state: ui.ViewFocusState.focused,
+        direction: ui.ViewFocusDirection.undefined,
+      );
+
+      zone1.runGuarded(() {
+        dispatcher.onViewFocusChange = (_) {
+          expect(Zone.current, zone1);
+        };
+      });
+
+      zone2.runGuarded(() {
+        dispatcher.invokeOnViewFocusChange(viewFocusEvent);
+      });
+    });
+
+    test('adds the accesibility placeholder', () {
+      expect(dispatcher.accessibilityPlaceholder.isConnected, isTrue);
+      expect(domDocument.body!.children.first, dispatcher.accessibilityPlaceholder);
+    });
+
+    test('removes the accesibility placeholder', () {
+      dispatcher.dispose();
+      expect(dispatcher.accessibilityPlaceholder.isConnected, isFalse);
+    });
+
+    test('scheduleWarmupFrame should call both callbacks', () async {
+      bool beginFrameCalled = false;
+      final Completer<void> drawFrameCalled = Completer<void>();
+      dispatcher.scheduleWarmUpFrame(beginFrame: () {
+        expect(drawFrameCalled.isCompleted, false);
+        expect(beginFrameCalled, false);
+        beginFrameCalled = true;
+      }, drawFrame: () {
+        expect(beginFrameCalled, true);
+        expect(drawFrameCalled.isCompleted, false);
+        drawFrameCalled.complete();
+      });
+      await drawFrameCalled.future;
+      expect(beginFrameCalled, true);
+      expect(drawFrameCalled.isCompleted, true);
     });
   });
 }
@@ -170,7 +446,6 @@ class MockHighContrastSupport implements HighContrastSupport {
   @override
   bool get isHighContrastEnabled => isEnabled;
 
-
   void invokeListeners(bool val) {
     for (final HighContrastListener listener in _listeners) {
       listener(val);
@@ -187,3 +462,34 @@ class MockHighContrastSupport implements HighContrastSupport {
     _listeners.remove(listener);
   }
 }
+
+class MockAppLifecycleState extends AppLifecycleState {
+  int activeCallCount = 0;
+  int deactivateCallCount = 0;
+
+  void detach() {
+    onAppLifecycleStateChange(ui.AppLifecycleState.detached);
+  }
+
+  void resume() {
+    onAppLifecycleStateChange(ui.AppLifecycleState.resumed);
+  }
+
+  void inactive() {
+    onAppLifecycleStateChange(ui.AppLifecycleState.inactive);
+  }
+
+  void hidden() {
+    onAppLifecycleStateChange(ui.AppLifecycleState.hidden);
+  }
+
+  @override
+  void activate() {
+    activeCallCount++;
+  }
+
+  @override
+  void deactivate() {
+    deactivateCallCount++;
+  }
+}
diff --git a/lib/web_ui/test/engine/platform_dispatcher/system_ui_overlay_style_test.dart b/lib/web_ui/test/engine/platform_dispatcher/system_ui_overlay_style_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..c0d6feea3f6f73baf9ec71f9bd531bb0ef7abff2
--- /dev/null
+++ b/lib/web_ui/test/engine/platform_dispatcher/system_ui_overlay_style_test.dart
@@ -0,0 +1,52 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui;
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+void testMain() {
+  const MethodCodec codec = JSONMethodCodec();
+
+  void sendSetSystemUIOverlayStyle({ui.Color? statusBarColor}) {
+    ui.PlatformDispatcher.instance.sendPlatformMessage(
+      'flutter/platform',
+      codec.encodeMethodCall(MethodCall(
+        'SystemChrome.setSystemUIOverlayStyle',
+        <String, dynamic>{
+          'statusBarColor': statusBarColor?.value,
+        },
+      )),
+      null,
+    );
+  }
+
+  String? getCssThemeColor() {
+    final DomHTMLMetaElement? theme =
+        domDocument.querySelector('#flutterweb-theme') as DomHTMLMetaElement?;
+    return theme?.content;
+  }
+
+  group('SystemUIOverlayStyle', () {
+    test('theme color is set / removed by platform message', () {
+      // Run the unit test without emulating Flutter tester environment.
+      ui_web.debugEmulateFlutterTesterEnvironment = false;
+
+      expect(getCssThemeColor(), null);
+
+      const ui.Color statusBarColor = ui.Color(0xFFF44336);
+      sendSetSystemUIOverlayStyle(statusBarColor: statusBarColor);
+      expect(getCssThemeColor(), statusBarColor.toCssString());
+
+      sendSetSystemUIOverlayStyle();
+      expect(getCssThemeColor(), null);
+    });
+  });
+}
diff --git a/lib/web_ui/test/engine/platform_dispatcher/view_focus_binding_test.dart b/lib/web_ui/test/engine/platform_dispatcher/view_focus_binding_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..419de687ac66ea2163e8880c6b5a8e726309b360
--- /dev/null
+++ b/lib/web_ui/test/engine/platform_dispatcher/view_focus_binding_test.dart
@@ -0,0 +1,298 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui;
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+void testMain() {
+  group(ViewFocusBinding, () {
+    late List<ui.ViewFocusEvent> dispatchedViewFocusEvents;
+    late EnginePlatformDispatcher dispatcher;
+
+    setUp(() {
+      domDocument.activeElement?.blur();
+      EngineSemantics.instance.semanticsEnabled = false;
+
+      dispatcher = EnginePlatformDispatcher.instance;
+      dispatchedViewFocusEvents = <ui.ViewFocusEvent>[];
+      dispatcher.onViewFocusChange = dispatchedViewFocusEvents.add;
+    });
+
+    test('The view is focusable and reachable by keyboard when registered', () async {
+      final EngineFlutterView view = createAndRegisterView(dispatcher);
+
+
+      // The root element should have a tabindex="0" to make the flutter view
+      // focusable and reachable by the keyboard.
+      expect(view.dom.rootElement.getAttribute('tabindex'), '0');
+    });
+
+    test('The view is focusable but not reachable by keyboard when focused', () async {
+      final EngineFlutterView view = createAndRegisterView(dispatcher);
+
+      view.dom.rootElement.focus();
+
+      // The root element should have a tabindex="-1" to make the flutter view
+      // focusable but not reachable by the keyboard.
+      expect(view.dom.rootElement.getAttribute('tabindex'), '-1');
+    });
+
+    test('marks the focusable views as reachable by the keyboard or not', () async {
+      final EngineFlutterView view1 = createAndRegisterView(dispatcher);
+      final EngineFlutterView view2 = createAndRegisterView(dispatcher);
+
+      expect(view1.dom.rootElement.getAttribute('tabindex'), '0');
+      expect(view2.dom.rootElement.getAttribute('tabindex'), '0');
+
+      view1.dom.rootElement.focus();
+      expect(view1.dom.rootElement.getAttribute('tabindex'), '-1');
+      expect(view2.dom.rootElement.getAttribute('tabindex'), '0');
+
+      view2.dom.rootElement.focus();
+      expect(view1.dom.rootElement.getAttribute('tabindex'), '0');
+      expect(view2.dom.rootElement.getAttribute('tabindex'), '-1');
+
+      view2.dom.rootElement.blur();
+      expect(view1.dom.rootElement.getAttribute('tabindex'), '0');
+      expect(view2.dom.rootElement.getAttribute('tabindex'), '0');
+    });
+
+    test('never marks the views as focusable with semantincs enabled', () async {
+      EngineSemantics.instance.semanticsEnabled = true;
+
+      final EngineFlutterView view1 = createAndRegisterView(dispatcher);
+      final EngineFlutterView view2 = createAndRegisterView(dispatcher);
+
+      expect(view1.dom.rootElement.getAttribute('tabindex'), isNull);
+      expect(view2.dom.rootElement.getAttribute('tabindex'), isNull);
+
+      view1.dom.rootElement.focus();
+      expect(view1.dom.rootElement.getAttribute('tabindex'), isNull);
+      expect(view2.dom.rootElement.getAttribute('tabindex'), isNull);
+
+      view2.dom.rootElement.focus();
+      expect(view1.dom.rootElement.getAttribute('tabindex'), isNull);
+      expect(view2.dom.rootElement.getAttribute('tabindex'), isNull);
+
+      view2.dom.rootElement.blur();
+      expect(view1.dom.rootElement.getAttribute('tabindex'), isNull);
+      expect(view2.dom.rootElement.getAttribute('tabindex'), isNull);
+    });
+
+    test('fires a focus event - a view was focused', () async {
+      final EngineFlutterView view = createAndRegisterView(dispatcher);
+
+      view.dom.rootElement.focus();
+
+      expect(dispatchedViewFocusEvents, hasLength(1));
+
+      expect(dispatchedViewFocusEvents[0].viewId, view.viewId);
+      expect(dispatchedViewFocusEvents[0].state, ui.ViewFocusState.focused);
+      expect(dispatchedViewFocusEvents[0].direction, ui.ViewFocusDirection.forward);
+    });
+
+    test('fires a focus event - a view was unfocused', () async {
+      final EngineFlutterView view = createAndRegisterView(dispatcher);
+
+      view.dom.rootElement.focus();
+      view.dom.rootElement.blur();
+
+      expect(dispatchedViewFocusEvents, hasLength(2));
+
+      expect(dispatchedViewFocusEvents[0].viewId, view.viewId);
+      expect(dispatchedViewFocusEvents[0].state, ui.ViewFocusState.focused);
+      expect(dispatchedViewFocusEvents[0].direction, ui.ViewFocusDirection.forward);
+
+      expect(dispatchedViewFocusEvents[1].viewId, view.viewId);
+      expect(dispatchedViewFocusEvents[1].state, ui.ViewFocusState.unfocused);
+      expect(dispatchedViewFocusEvents[1].direction, ui.ViewFocusDirection.undefined);
+    });
+
+    test('fires a focus event - focus transitions between views', () async {
+      final EngineFlutterView view1 = createAndRegisterView(dispatcher);
+      final EngineFlutterView view2 = createAndRegisterView(dispatcher);
+
+      view1.dom.rootElement.focus();
+      view2.dom.rootElement.focus();
+      // The statements simulate the user pressing shift + tab in the keyboard.
+      // Synthetic keyboard events do not trigger focus changes.
+      domDocument.body!.pressTabKey(shift: true);
+      view1.dom.rootElement.focus();
+      domDocument.body!.releaseTabKey();
+
+      expect(dispatchedViewFocusEvents, hasLength(3));
+
+      expect(dispatchedViewFocusEvents[0].viewId, view1.viewId);
+      expect(dispatchedViewFocusEvents[0].state, ui.ViewFocusState.focused);
+      expect(dispatchedViewFocusEvents[0].direction, ui.ViewFocusDirection.forward);
+
+      expect(dispatchedViewFocusEvents[1].viewId, view2.viewId);
+      expect(dispatchedViewFocusEvents[1].state, ui.ViewFocusState.focused);
+      expect(dispatchedViewFocusEvents[1].direction, ui.ViewFocusDirection.forward);
+
+      expect(dispatchedViewFocusEvents[2].viewId, view1.viewId);
+      expect(dispatchedViewFocusEvents[2].state, ui.ViewFocusState.focused);
+      expect(dispatchedViewFocusEvents[2].direction, ui.ViewFocusDirection.backward);
+    });
+
+    test('fires a focus event - focus transitions on and off views', () async {
+      final EngineFlutterView view1 = createAndRegisterView(dispatcher);
+      final EngineFlutterView view2 = createAndRegisterView(dispatcher);
+
+      view1.dom.rootElement.focus();
+      view2.dom.rootElement.focus();
+      view2.dom.rootElement.blur();
+
+      expect(dispatchedViewFocusEvents, hasLength(3));
+
+      expect(dispatchedViewFocusEvents[0].viewId, view1.viewId);
+      expect(dispatchedViewFocusEvents[0].state, ui.ViewFocusState.focused);
+      expect(dispatchedViewFocusEvents[0].direction, ui.ViewFocusDirection.forward);
+
+      expect(dispatchedViewFocusEvents[1].viewId, view2.viewId);
+      expect(dispatchedViewFocusEvents[1].state, ui.ViewFocusState.focused);
+      expect(dispatchedViewFocusEvents[1].direction, ui.ViewFocusDirection.forward);
+
+      expect(dispatchedViewFocusEvents[2].viewId, view2.viewId);
+      expect(dispatchedViewFocusEvents[2].state, ui.ViewFocusState.unfocused);
+      expect(dispatchedViewFocusEvents[2].direction, ui.ViewFocusDirection.undefined);
+    });
+
+    test('requestViewFocusChange focuses the view', () {
+      final EngineFlutterView view = createAndRegisterView(dispatcher);
+
+      dispatcher.requestViewFocusChange(
+        viewId: view.viewId,
+        state: ui.ViewFocusState.focused,
+        direction: ui.ViewFocusDirection.forward,
+      );
+
+      expect(domDocument.activeElement, view.dom.rootElement);
+
+      expect(dispatchedViewFocusEvents, hasLength(1));
+
+      expect(dispatchedViewFocusEvents[0].viewId, view.viewId);
+      expect(dispatchedViewFocusEvents[0].state, ui.ViewFocusState.focused);
+      expect(dispatchedViewFocusEvents[0].direction, ui.ViewFocusDirection.forward);
+    });
+
+    test('requestViewFocusChange blurs the view', () {
+      final EngineFlutterView view = createAndRegisterView(dispatcher);
+
+      dispatcher.requestViewFocusChange(
+        viewId: view.viewId,
+        state: ui.ViewFocusState.focused,
+        direction: ui.ViewFocusDirection.forward,
+      );
+
+      dispatcher.requestViewFocusChange(
+        viewId: view.viewId,
+        state: ui.ViewFocusState.unfocused,
+        direction: ui.ViewFocusDirection.undefined,
+      );
+
+      expect(domDocument.activeElement, isNot(view.dom.rootElement));
+
+      expect(dispatchedViewFocusEvents, hasLength(2));
+
+      expect(dispatchedViewFocusEvents[0].viewId, view.viewId);
+      expect(dispatchedViewFocusEvents[0].state, ui.ViewFocusState.focused);
+      expect(dispatchedViewFocusEvents[0].direction, ui.ViewFocusDirection.forward);
+
+      expect(dispatchedViewFocusEvents[1].viewId, view.viewId);
+      expect(dispatchedViewFocusEvents[1].state, ui.ViewFocusState.unfocused);
+      expect(dispatchedViewFocusEvents[1].direction, ui.ViewFocusDirection.undefined);
+    });
+
+    test('requestViewFocusChange does nothing if the view does not exist', () {
+      final EngineFlutterView view = createAndRegisterView(dispatcher);
+
+      dispatcher.requestViewFocusChange(
+        viewId: 5094555,
+        state: ui.ViewFocusState.focused,
+        direction: ui.ViewFocusDirection.forward,
+      );
+
+      expect(domDocument.activeElement, isNot(view.dom.rootElement));
+      expect(dispatchedViewFocusEvents, isEmpty);
+    });
+
+    test('requestViewFocusChange does nothing if the view is already focused', () {
+      final EngineFlutterView view = createAndRegisterView(dispatcher);
+
+      dispatcher.requestViewFocusChange(
+        viewId: view.viewId,
+        state: ui.ViewFocusState.focused,
+        direction: ui.ViewFocusDirection.forward,
+      );
+      dispatcher.requestViewFocusChange(
+        viewId: view.viewId,
+        state: ui.ViewFocusState.focused,
+        direction: ui.ViewFocusDirection.forward,
+      );
+
+      expect(dispatchedViewFocusEvents, hasLength(1));
+
+      expect(dispatchedViewFocusEvents[0].viewId, view.viewId);
+      expect(dispatchedViewFocusEvents[0].state, ui.ViewFocusState.focused);
+      expect(dispatchedViewFocusEvents[0].direction, ui.ViewFocusDirection.forward);
+    });
+
+    test('requestViewFocusChange does not move the focus to the view', () {
+      final DomElement input = createDomElement('input');
+      final EngineFlutterView view = createAndRegisterView(dispatcher);
+
+      view.dom.rootElement.append(input);
+      input.focus();
+
+      dispatcher.requestViewFocusChange(
+        viewId: view.viewId,
+        state: ui.ViewFocusState.focused,
+        direction: ui.ViewFocusDirection.forward,
+      );
+
+      expect(domDocument.activeElement, input);
+
+      expect(dispatchedViewFocusEvents, hasLength(1));
+
+      expect(dispatchedViewFocusEvents[0].viewId, view.viewId);
+      expect(dispatchedViewFocusEvents[0].state, ui.ViewFocusState.focused);
+      expect(dispatchedViewFocusEvents[0].direction, ui.ViewFocusDirection.forward);
+    });
+  });
+}
+
+EngineFlutterView createAndRegisterView(EnginePlatformDispatcher dispatcher) {
+  final DomElement div = createDomElement('div');
+  final EngineFlutterView view = EngineFlutterView(dispatcher, div);
+  domDocument.body!.append(div);
+  dispatcher.viewManager.registerView(view);
+  return view;
+}
+
+extension on DomElement {
+  void pressTabKey({bool shift = false}) {
+    dispatchKeyboardEvent(type: 'keydown', key: 'Tab', shiftKey: shift);
+  }
+
+  void releaseTabKey({bool shift = false}) {
+    dispatchKeyboardEvent(type: 'keyup', key: 'Tab', shiftKey: shift);
+  }
+
+  void dispatchKeyboardEvent({
+    required String type,
+    required String key,
+    bool shiftKey = false,
+  }) {
+    dispatchEvent(
+      createDomKeyboardEvent(type, <String, Object>{'key': key, 'shiftKey': shiftKey}),
+    );
+  }
+}
diff --git a/lib/web_ui/test/engine/platform_views/content_manager_test.dart b/lib/web_ui/test/engine/platform_views/content_manager_test.dart
index 133e5e16abc5bbbdea5ec394ab0eb5d89eedd5fd..6c214419c904d149d0a540493311846392351d56 100644
--- a/lib/web_ui/test/engine/platform_views/content_manager_test.dart
+++ b/lib/web_ui/test/engine/platform_views/content_manager_test.dart
@@ -5,8 +5,9 @@
 import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
-import '../../matchers.dart';
+import '../../common/test_initialization.dart';
 
 void main() {
   internalBootstrapBrowserTest(() => testMain);
@@ -14,7 +15,7 @@ void main() {
 
 void testMain() {
   setUpAll(() async {
-    await initializeEngine();
+    await bootstrapAndRunApp();
   });
 
   group('PlatformViewManager', () {
@@ -52,13 +53,14 @@ void testMain() {
 
       test('forgets viewIds after clearing them', () {
         contentManager.registerFactory(viewType, (int id) => createDomHTMLDivElement());
-        contentManager.renderContent(viewType, viewId, null);
+        final DomElement view = contentManager.renderContent(viewType, viewId, null);
 
         expect(contentManager.knowsViewId(viewId), isTrue);
 
         contentManager.clearPlatformView(viewId);
 
         expect(contentManager.knowsViewId(viewId), isFalse);
+        expect(view.parentNode, isNull);
       });
     });
 
@@ -97,19 +99,21 @@ void testMain() {
       });
 
       test('refuse to render views for unregistered factories', () async {
-        try {
-          contentManager.renderContent(unregisteredViewType, viewId, null);
-          fail('renderContent should have thrown an Assertion error!');
-        } catch (e) {
-          expect(e, isAssertionError);
-          expect((e as AssertionError).message, contains(unregisteredViewType));
-        }
+        expect(
+          () => contentManager.renderContent(unregisteredViewType, viewId, null),
+          throwsA(const TypeMatcher<AssertionError>().having(
+            (AssertionError error) => error.message,
+            'assertion message',
+            contains(unregisteredViewType),
+          )),
+        );
       });
 
       test('rendered markup contains required attributes', () async {
         final DomElement content =
             contentManager.renderContent(viewType, viewId, null);
-        expect(content.getAttribute('slot'), contains('$viewId'));
+        expect(content.getAttribute('slot'), getPlatformViewSlotName(viewId));
+        expect(content.getAttribute('id'), getPlatformViewDomId(viewId));
 
         final DomElement userContent = content.querySelector('div')!;
         expect(userContent.style.height, '100%');
@@ -145,5 +149,101 @@ void testMain() {
         expect(firstRender, same(anotherRender));
       });
     });
+
+    group('getViewById', () {
+      test('finds created views', () async {
+        final Map<int, DomElement> views1 = <int, DomElement>{
+          1: createDomHTMLDivElement(),
+          2: createDomHTMLDivElement(),
+          5: createDomHTMLDivElement(),
+        };
+        final Map<int, DomElement> views2 = <int, DomElement>{
+          3: createDomHTMLDivElement(),
+          4: createDomHTMLDivElement(),
+        };
+
+        contentManager.registerFactory('forTest1', (int id) => views1[id]!);
+        contentManager.registerFactory('forTest2', (int id) => views2[id]!);
+
+        // Render all 5 views.
+        for (final int id in views1.keys) {
+          contentManager.renderContent('forTest1', id, null);
+        }
+        for (final int id in views2.keys) {
+          contentManager.renderContent('forTest2', id, null);
+        }
+
+        // Check all 5 views.
+        for (final int id in views1.keys) {
+          expect(contentManager.getViewById(id), views1[id]);
+        }
+        for (final int id in views2.keys) {
+          expect(contentManager.getViewById(id), views2[id]);
+        }
+
+        // Throws for unknown viewId.
+        expect(() {
+          contentManager.getViewById(99);
+        }, throwsA(isA<AssertionError>()));
+      });
+
+      test('throws if view has been cleared', () {
+        final DomHTMLDivElement view = createDomHTMLDivElement();
+        contentManager.registerFactory(viewType, (int id) => view);
+
+        // Throws before viewId is rendered.
+        expect(() {
+          contentManager.getViewById(viewId);
+        }, throwsA(isA<AssertionError>()));
+
+        contentManager.renderContent(viewType, viewId, null);
+        // Succeeds after viewId is rendered.
+        expect(contentManager.getViewById(viewId), view);
+
+        contentManager.clearPlatformView(viewId);
+        // Throws after viewId is cleared.
+        expect(() {
+          contentManager.getViewById(viewId);
+        }, throwsA(isA<AssertionError>()));
+      });
+    });
+
+    test('default factories', () {
+      final DomElement content0 = contentManager.renderContent(
+        ui_web.PlatformViewRegistry.defaultVisibleViewType,
+        viewId,
+        <dynamic, dynamic>{'tagName': 'table'},
+      );
+      expect(
+        contentManager.getViewById(viewId),
+        content0.querySelector('table'),
+      );
+      expect(contentManager.isVisible(viewId), isTrue);
+      expect(contentManager.isInvisible(viewId), isFalse);
+
+      final DomElement content1 = contentManager.renderContent(
+        ui_web.PlatformViewRegistry.defaultInvisibleViewType,
+        viewId + 1,
+        <dynamic, dynamic>{'tagName': 'script'},
+      );
+      expect(
+        contentManager.getViewById(viewId + 1),
+        content1.querySelector('script'),
+      );
+      expect(contentManager.isVisible(viewId + 1), isFalse);
+      expect(contentManager.isInvisible(viewId + 1), isTrue);
+
+      final DomElement content2 = contentManager.renderContent(
+        ui_web.PlatformViewRegistry.defaultVisibleViewType,
+        viewId + 2,
+        <dynamic, dynamic>{'tagName': 'p'},
+      );
+      expect(
+        contentManager.getViewById(viewId + 2),
+        content2.querySelector('p'),
+      );
+      expect(contentManager.isVisible(viewId + 2), isTrue);
+      expect(contentManager.isInvisible(viewId + 2), isFalse);
+    });
   });
 }
diff --git a/lib/web_ui/test/engine/platform_views/message_handler_test.dart b/lib/web_ui/test/engine/platform_views/message_handler_test.dart
index 429779ac09a34acbc9df5809bc26c6a509664332..42b7059e8299fd233e6ccb505ba021ba3a347006 100644
--- a/lib/web_ui/test/engine/platform_views/message_handler_test.dart
+++ b/lib/web_ui/test/engine/platform_views/message_handler_test.dart
@@ -15,19 +15,19 @@ void main() {
 
 const MethodCodec codec = StandardMethodCodec();
 
+typedef PlatformViewFactoryCall = ({int viewId, Object? params});
+
 void testMain() {
   group('PlatformViewMessageHandler', () {
     group('handlePlatformViewCall', () {
-      const String viewType = 'forTest';
-      const int viewId = 6;
+      const String platformViewType = 'forTest';
+      const int platformViewId = 6;
       late PlatformViewManager contentManager;
       late Completer<ByteData?> completer;
-      late Completer<DomElement> contentCompleter;
 
       setUp(() {
         contentManager = PlatformViewManager();
         completer = Completer<ByteData?>();
-        contentCompleter = Completer<DomElement>();
       });
 
       group('"create" message', () {
@@ -36,50 +36,50 @@ void testMain() {
           final PlatformViewMessageHandler messageHandler = PlatformViewMessageHandler(
             contentManager: contentManager,
           );
-          final ByteData? message = _getCreateMessage(viewType, viewId);
+          final Map<dynamic, dynamic> arguments = _getCreateArguments(platformViewType, platformViewId);
 
-          messageHandler.handlePlatformViewCall(message, completer.complete);
+          messageHandler.handlePlatformViewCall('create', arguments, completer.complete);
 
           final ByteData? response = await completer.future;
           try {
             codec.decodeEnvelope(response!);
           } on PlatformException catch (e) {
             expect(e.code, 'unregistered_view_type');
-            expect(e.message, contains(viewType));
+            expect(e.message, contains(platformViewType));
             expect(e.details, contains('registerViewFactory'));
           }
         });
 
         test('duplicate viewId, fails with descriptive exception', () async {
           contentManager.registerFactory(
-              viewType, (int id) => createDomHTMLDivElement());
-          contentManager.renderContent(viewType, viewId, null);
+              platformViewType, (int id) => createDomHTMLDivElement());
+          contentManager.renderContent(platformViewType, platformViewId, null);
           final PlatformViewMessageHandler messageHandler = PlatformViewMessageHandler(
             contentManager: contentManager,
           );
-          final ByteData? message = _getCreateMessage(viewType, viewId);
+          final Map<dynamic, dynamic> arguments = _getCreateArguments(platformViewType, platformViewId);
 
-          messageHandler.handlePlatformViewCall(message, completer.complete);
+          messageHandler.handlePlatformViewCall('create', arguments, completer.complete);
 
           final ByteData? response = await completer.future;
           try {
             codec.decodeEnvelope(response!);
           } on PlatformException catch (e) {
             expect(e.code, 'recreating_view');
-            expect(e.details, contains('$viewId'));
+            expect(e.details, contains('$platformViewId'));
           }
         });
 
         test('returns a successEnvelope when the view is created normally',
             () async {
           contentManager.registerFactory(
-              viewType, (int id) => createDomHTMLDivElement()..id = 'success');
+              platformViewType, (int id) => createDomHTMLDivElement()..id = 'success');
           final PlatformViewMessageHandler messageHandler = PlatformViewMessageHandler(
             contentManager: contentManager,
           );
-          final ByteData? message = _getCreateMessage(viewType, viewId);
+          final Map<dynamic, dynamic> arguments = _getCreateArguments(platformViewType, platformViewId);
 
-          messageHandler.handlePlatformViewCall(message, completer.complete);
+          messageHandler.handlePlatformViewCall('create', arguments, completer.complete);
 
           final ByteData? response = await completer.future;
           expect(codec.decodeEnvelope(response!), isNull,
@@ -87,27 +87,119 @@ void testMain() {
                   'The response should be a success envelope, with null in it.');
         });
 
-        test('calls a contentHandler with the result of creating a view',
+        test('caches the created view so it can be retrieved (not on the DOM)',
             () async {
+          final DomElement platformViewsContainer = createDomElement('pv-container');
           contentManager.registerFactory(
-              viewType, (int id) => createDomHTMLDivElement()..id = 'success');
+              platformViewType, (int id) => createDomHTMLDivElement()..id = 'success');
           final PlatformViewMessageHandler messageHandler = PlatformViewMessageHandler(
             contentManager: contentManager,
-            contentHandler: contentCompleter.complete,
           );
-          final ByteData? message = _getCreateMessage(viewType, viewId);
+          final Map<dynamic, dynamic> arguments = _getCreateArguments(platformViewType, platformViewId);
 
-          messageHandler.handlePlatformViewCall(message, completer.complete);
+          messageHandler.handlePlatformViewCall('create', arguments, completer.complete);
 
-          final DomElement contents = await contentCompleter.future;
           final ByteData? response = await completer.future;
 
-          expect(contents.querySelector('div#success'), isNotNull,
-              reason:
-                  'The element created by the factory should be present in the created view.');
-          expect(codec.decodeEnvelope(response!), isNull,
-              reason:
-                  'The response should be a success envelope, with null in it.');
+          expect(
+            codec.decodeEnvelope(response!),
+            isNull,
+            reason: 'The response should be a success envelope, with null in it.',
+          );
+          expect(
+            contentManager.knowsViewId(platformViewId),
+            isTrue,
+            reason: 'The contentManager should have pre-rendered the platformViewId.'
+          );
+          expect(
+            contentManager.getViewById(platformViewId).matches('div#success'),
+            isNotNull,
+            reason: 'The element created by the factory should be retrievable.',
+          );
+          expect(
+            platformViewsContainer.children,
+            hasLength(0),
+            reason: 'The view should not have been injected into the DOM',
+          );
+        });
+
+        test('passes creation params to the factory', () async {
+          final List<PlatformViewFactoryCall> factoryCalls = <PlatformViewFactoryCall>[];
+          contentManager.registerFactory(platformViewType, (int viewId, {Object? params}) {
+            factoryCalls.add((viewId: viewId, params: params));
+            return createDomHTMLDivElement();
+          });
+          final PlatformViewMessageHandler messageHandler = PlatformViewMessageHandler(
+            contentManager: contentManager,
+          );
+
+          final List<Completer<ByteData?>> completers = <Completer<ByteData?>>[];
+
+          completers.add(Completer<ByteData?>());
+          messageHandler.handlePlatformViewCall(
+            'create',
+            _getCreateArguments(platformViewType, 111),
+            completers.last.complete,
+          );
+
+          completers.add(Completer<ByteData?>());
+          messageHandler.handlePlatformViewCall(
+            'create',
+            _getCreateArguments(platformViewType, 222, <dynamic, dynamic>{'foo': 'bar'}),
+            completers.last.complete,
+          );
+
+          completers.add(Completer<ByteData?>());
+          messageHandler.handlePlatformViewCall(
+            'create',
+            _getCreateArguments(platformViewType, 333, 'foobar'),
+            completers.last.complete,
+          );
+
+          completers.add(Completer<ByteData?>());
+          messageHandler.handlePlatformViewCall(
+            'create',
+            _getCreateArguments(platformViewType, 444, <dynamic>[1, null, 'str']),
+            completers.last.complete,
+          );
+
+          final List<ByteData?> responses = await Future.wait(
+            completers.map((Completer<ByteData?> c) => c.future),
+          );
+
+          for (final ByteData? response in responses) {
+            expect(
+              codec.decodeEnvelope(response!),
+              isNull,
+              reason: 'The response should be a success envelope, with null in it.',
+            );
+          }
+
+          expect(factoryCalls, hasLength(4));
+          expect(factoryCalls[0].viewId, 111);
+          expect(factoryCalls[0].params, isNull);
+          expect(factoryCalls[1].viewId, 222);
+          expect(factoryCalls[1].params, <dynamic, dynamic>{'foo': 'bar'});
+          expect(factoryCalls[2].viewId, 333);
+          expect(factoryCalls[2].params, 'foobar');
+          expect(factoryCalls[3].viewId, 444);
+          expect(factoryCalls[3].params, <dynamic>[1, null, 'str']);
+        });
+
+        test('fails if the factory returns a non-DOM object', () async {
+          contentManager.registerFactory(platformViewType, (int viewId) {
+            // Return an object that's not a DOM element.
+            return Object();
+          });
+
+          final PlatformViewMessageHandler messageHandler = PlatformViewMessageHandler(
+            contentManager: contentManager,
+          );
+          final Map<dynamic, dynamic> arguments = _getCreateArguments(platformViewType, platformViewId);
+
+          expect(() {
+            messageHandler.handlePlatformViewCall('create', arguments, (_) {});
+          }, throwsA(isA<TypeError>()));
         });
       });
 
@@ -122,9 +214,8 @@ void testMain() {
           final PlatformViewMessageHandler messageHandler = PlatformViewMessageHandler(
             contentManager: contentManager,
           );
-          final ByteData? message = _getDisposeMessage(viewId);
 
-          messageHandler.handlePlatformViewCall(message, completer.complete);
+          messageHandler.handlePlatformViewCall('dispose', platformViewId, completer.complete);
 
           final ByteData? response = await completer.future;
           expect(codec.decodeEnvelope(response!), isNull,
@@ -136,12 +227,11 @@ void testMain() {
           final PlatformViewMessageHandler messageHandler = PlatformViewMessageHandler(
             contentManager: _FakePlatformViewManager(viewIdCompleter.complete),
           );
-          final ByteData? message = _getDisposeMessage(viewId);
 
-          messageHandler.handlePlatformViewCall(message, completer.complete);
+          messageHandler.handlePlatformViewCall('dispose', platformViewId, completer.complete);
 
           final int disposedViewId = await viewIdCompleter.future;
-          expect(disposedViewId, viewId,
+          expect(disposedViewId, platformViewId,
               reason:
                   'The viewId to dispose should be passed to the contentManager');
         });
@@ -162,19 +252,10 @@ class _FakePlatformViewManager extends PlatformViewManager {
   }
 }
 
-ByteData? _getCreateMessage(String viewType, int viewId) {
-  return codec.encodeMethodCall(MethodCall(
-    'create',
-    <String, dynamic>{
-      'id': viewId,
-      'viewType': viewType,
-    },
-  ));
-}
-
-ByteData? _getDisposeMessage(int viewId) {
-  return codec.encodeMethodCall(MethodCall(
-    'dispose',
-    viewId,
-  ));
+Map<dynamic, dynamic> _getCreateArguments(String viewType, int viewId, [Object? params]) {
+  return <String, dynamic>{
+    'id': viewId,
+    'viewType': viewType,
+    if (params != null) 'params': params,
+  };
 }
diff --git a/lib/web_ui/test/engine/platform_views/slots_test.dart b/lib/web_ui/test/engine/platform_views/slots_test.dart
index e694a74072eaa261101026ec273c3f23211d050a..bc6d175209c8d386472a41a89cc294959bf63b3f 100644
--- a/lib/web_ui/test/engine/platform_views/slots_test.dart
+++ b/lib/web_ui/test/engine/platform_views/slots_test.dart
@@ -35,4 +35,12 @@ void testMain() {
       });
     });
   });
+
+  test('getPlatformViewSlotName', () {
+    expect(getPlatformViewSlotName(42), 'flt-pv-slot-42');
+  });
+
+  test('getPlatformViewDomId', () {
+    expect(getPlatformViewDomId(42), 'flt-pv-42');
+  });
 }
diff --git a/lib/web_ui/test/engine/pointer_binding/event_position_helper_test.dart b/lib/web_ui/test/engine/pointer_binding/event_position_helper_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..eca204cd6e6132a42ef838a7dc78634bbca87c7c
--- /dev/null
+++ b/lib/web_ui/test/engine/pointer_binding/event_position_helper_test.dart
@@ -0,0 +1,112 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+@TestOn('browser')
+library;
+
+import 'dart:async';
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui show Offset;
+
+void main() {
+  internalBootstrapBrowserTest(() => doTests);
+}
+
+void doTests() {
+  late EngineFlutterView view;
+  late DomElement rootElement;
+  late DomElement eventSource;
+  final StreamController<DomEvent> events = StreamController<DomEvent>.broadcast();
+
+  /// Dispatches an event `e` on `target`, and returns it after it's gone through the browser.
+  Future<DomPointerEvent> dispatchAndCatch(DomElement target, DomPointerEvent e) async {
+    final Future<DomEvent> nextEvent = events.stream.first;
+    target.dispatchEvent(e);
+    return (await nextEvent) as DomPointerEvent;
+  }
+
+  group('computeEventOffsetToTarget', () {
+    setUp(() {
+      view = EngineFlutterView(EnginePlatformDispatcher.instance, domDocument.body!);
+      rootElement = view.dom.rootElement;
+      eventSource = createDomElement('div-event-source');
+      rootElement.append(eventSource);
+
+      // make containers known fixed sizes, absolutely positioned elements, so
+      // we can reason about screen coordinates relatively easily later!
+      rootElement.style
+        ..position = 'absolute'
+        ..width = '320px'
+        ..height = '240px'
+        ..top = '0px'
+        ..left = '0px';
+
+      eventSource.style
+        ..position = 'absolute'
+        ..width = '100px'
+        ..height = '80px'
+        ..top = '100px'
+        ..left = '120px';
+
+      rootElement.addEventListener('click', createDomEventListener((DomEvent e) {
+        events.add(e);
+      }));
+    });
+
+    tearDown(() {
+      view.dispose();
+    });
+
+    test('Event dispatched by target returns offsetX, offsetY', () async {
+      // Fire an event contained within target...
+      final DomMouseEvent event = await dispatchAndCatch(rootElement, createDomPointerEvent(
+        'click',
+        <String, Object>{
+          'bubbles': true,
+          'clientX': 10,
+          'clientY': 20,
+        }
+      ));
+
+      expect(event.offsetX, 10);
+      expect(event.offsetY, 20);
+
+      final ui.Offset offset = computeEventOffsetToTarget(event, view);
+
+      expect(offset.dx, event.offsetX);
+      expect(offset.dy, event.offsetY);
+    });
+
+    test('Event dispatched on child re-computes offset (offsetX/Y invalid)', () async {
+      // Fire an event contained within target...
+      final DomMouseEvent event = await dispatchAndCatch(eventSource, createDomPointerEvent(
+        'click',
+        <String, Object>{
+          'bubbles': true, // So it can be caught in `target`
+          'clientX': 140, // x = 20px into `eventSource`.
+          'clientY': 110, // y = 10px into `eventSource`.
+        }
+      ));
+
+      expect(event.offsetX, 20);
+      expect(event.offsetY, 10);
+
+      final ui.Offset offset = computeEventOffsetToTarget(event, view);
+
+      expect(offset.dx, 140);
+      expect(offset.dy, 110);
+    });
+
+    test('Event dispatched by TalkBack gets a computed offset', () async {
+      // Fill this in to test _computeOffsetForTalkbackEvent
+    }, skip: 'To be implemented!');
+
+    test('Event dispatched on text editing node computes offset with framework geometry', () async {
+      // Fill this in to test _computeOffsetForInputs
+    }, skip: 'To be implemented!');
+  });
+}
diff --git a/lib/web_ui/test/engine/pointer_binding_test.dart b/lib/web_ui/test/engine/pointer_binding_test.dart
index 88c02a05a3ac9f4a0cbe0ed6eb5e790dfe64b1bf..e5a3c0f0cdc0aa0f2df958ded08e25ca1ed299d8 100644
--- a/lib/web_ui/test/engine/pointer_binding_test.dart
+++ b/lib/web_ui/test/engine/pointer_binding_test.dart
@@ -9,44 +9,38 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
 
-import '../keyboard_converter_test.dart';
+import 'keyboard_converter_test.dart';
 
 const int _kNoButtonChange = -1;
-const PointerSupportDetector _defaultSupportDetector = PointerSupportDetector();
 
 List<ui.PointerData> _allPointerData(List<ui.PointerDataPacket> packets) {
   return packets.expand((ui.PointerDataPacket packet) => packet.data).toList();
 }
 
-typedef _ContextTestBody<T> = void Function(T);
-
-void _testEach<T extends _BasicEventContext>(
-  Iterable<T> contexts,
-  String description,
-  _ContextTestBody<T> body,
-) {
-  for (final T context in contexts) {
-    if (context.isSupported) {
-      test('${context.name} $description', () {
-        body(context);
-      });
-    }
-  }
-}
-
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
 
+late EngineFlutterView view;
+DomElement get rootElement => view.dom.rootElement;
+
 void testMain() {
-  ensureFlutterViewEmbedderInitialized();
-  final DomElement glassPane = flutterViewEmbedder.glassPaneElement!;
-  late double dpi;
+  final DomElement hostElement = createDomHTMLDivElement();
 
-  setUp(() {
-    ui.window.onPointerDataPacket = null;
-    dpi = window.devicePixelRatio;
+  setUpAll(() {
+    domDocument.body!.append(hostElement);
+    // Remove <body> margins to avoid messing up with all the test coordinates.
+    domDocument.body!.style.margin = '0';
   });
+  tearDownAll(() {
+    hostElement.remove();
+  });
+
+  late List<ui.KeyData> keyDataList;
+  late KeyboardConverter keyboardConverter;
+  late PointerBinding instance;
+  late double dpi;
+
 
   KeyboardConverter createKeyboardConverter(List<ui.KeyData> keyDataList) {
     return KeyboardConverter((ui.KeyData key) {
@@ -55,27 +49,41 @@ void testMain() {
     }, OperatingSystem.linux);
   }
 
+  setUp(() {
+    keyDataList = <ui.KeyData>[];
+    keyboardConverter = createKeyboardConverter(keyDataList);
+
+    view = EngineFlutterView(EnginePlatformDispatcher.instance, hostElement);
+    instance = view.pointerBinding;
+    instance.debugOverrideKeyboardConverter(keyboardConverter);
+
+    ui.PlatformDispatcher.instance.onPointerDataPacket = null;
+    dpi = EngineFlutterDisplay.instance.devicePixelRatio;
+  });
+
+  tearDown(() {
+    keyboardConverter.dispose();
+    view.dispose();
+    PointerBinding.debugResetGlobalState();
+  });
+
   test('ios workaround', () {
     debugEmulateIosSafari = true;
     addTearDown(() {
       debugEmulateIosSafari = false;
     });
 
-    final MockSafariPointerEventWorkaround mockSafariPointer =
+    final MockSafariPointerEventWorkaround mockSafariWorkaround =
         MockSafariPointerEventWorkaround();
-    SafariPointerEventWorkaround.instance = mockSafariPointer;
-    final List<ui.KeyData> keyDataList = <ui.KeyData>[];
-    final KeyboardConverter keyboardConverter = createKeyboardConverter(keyDataList);
-    final PointerBinding instance = PointerBinding(createDomHTMLDivElement(), keyboardConverter);
-    expect(mockSafariPointer.workAroundInvoked, isIosSafari);
+    final PointerBinding instance = PointerBinding(
+      view,
+      safariWorkaround: mockSafariWorkaround,
+    );
+    expect(mockSafariWorkaround.workAroundInvoked, isIosSafari);
     instance.dispose();
   }, skip: !isSafari);
 
   test('_PointerEventContext generates expected events', () {
-    if (!_PointerEventContext().isSupported) {
-      return;
-    }
-
     DomPointerEvent expectCorrectType(DomEvent e) {
       expect(domInstanceOfString(e, 'PointerEvent'), isTrue);
       return e as DomPointerEvent;
@@ -260,255 +268,68 @@ void testMain() {
     expect(event.getModifierState('Shift'), false);
   });
 
-  test('_TouchEventContext generates expected events', () {
-    if (!_TouchEventContext().isSupported) {
-      return;
-    }
-
-    DomTouchEvent expectCorrectType(DomEvent e) {
-      expect(domInstanceOfString(e, 'TouchEvent'), isTrue);
-      return e as DomTouchEvent;
-    }
-
-    List<DomTouchEvent> expectCorrectTypes(List<DomEvent> events) {
-      return events.map(expectCorrectType).toList();
-    }
-
-    final _TouchEventContext context = _TouchEventContext();
-    DomTouchEvent event;
-    List<DomTouchEvent> events;
-
-    event = expectCorrectType(context.primaryDown(clientX: 100, clientY: 101));
-    expect(event.type, equals('touchstart'));
-    expect(event.changedTouches!.length, equals(1));
-    expect(event.changedTouches![0].identifier, equals(1));
-    expect(event.changedTouches![0].client.x, equals(100));
-    expect(event.changedTouches![0].client.y, equals(101));
-
-    events = expectCorrectTypes(context.multiTouchDown(const <_TouchDetails>[
-      _TouchDetails(pointer: 100, clientX: 120, clientY: 121),
-      _TouchDetails(pointer: 101, clientX: 122, clientY: 123),
-    ]));
-    expect(events.length, equals(1));
-    expect(events[0].type, equals('touchstart'));
-    expect(events[0].changedTouches!.length, equals(2));
-    expect(events[0].changedTouches![0].identifier, equals(100));
-    expect(events[0].changedTouches![0].client.x, equals(120));
-    expect(events[0].changedTouches![0].client.y, equals(121));
-    expect(events[0].changedTouches![1].identifier, equals(101));
-    expect(events[0].changedTouches![1].client.x, equals(122));
-    expect(events[0].changedTouches![1].client.y, equals(123));
-
-    event = expectCorrectType(context.primaryMove(clientX: 200, clientY: 201));
-    expect(event.type, equals('touchmove'));
-    expect(event.changedTouches!.length, equals(1));
-    expect(event.changedTouches![0].identifier, equals(1));
-    expect(event.changedTouches![0].client.x, equals(200));
-    expect(event.changedTouches![0].client.y, equals(201));
-
-    events = expectCorrectTypes(context.multiTouchMove(const <_TouchDetails>[
-      _TouchDetails(pointer: 102, clientX: 220, clientY: 221),
-      _TouchDetails(pointer: 103, clientX: 222, clientY: 223),
-    ]));
-    expect(events.length, equals(1));
-    expect(events[0].type, equals('touchmove'));
-    expect(events[0].changedTouches!.length, equals(2));
-    expect(events[0].changedTouches![0].identifier, equals(102));
-    expect(events[0].changedTouches![0].client.x, equals(220));
-    expect(events[0].changedTouches![0].client.y, equals(221));
-    expect(events[0].changedTouches![1].identifier, equals(103));
-    expect(events[0].changedTouches![1].client.x, equals(222));
-    expect(events[0].changedTouches![1].client.y, equals(223));
-
-    event = expectCorrectType(context.primaryUp(clientX: 300, clientY: 301));
-    expect(event.type, equals('touchend'));
-    expect(event.changedTouches!.length, equals(1));
-    expect(event.changedTouches![0].identifier, equals(1));
-    expect(event.changedTouches![0].client.x, equals(300));
-    expect(event.changedTouches![0].client.y, equals(301));
-
-    events = expectCorrectTypes(context.multiTouchUp(const <_TouchDetails>[
-      _TouchDetails(pointer: 104, clientX: 320, clientY: 321),
-      _TouchDetails(pointer: 105, clientX: 322, clientY: 323),
-    ]));
-    expect(events.length, equals(1));
-    expect(events[0].type, equals('touchend'));
-    expect(events[0].changedTouches!.length, equals(2));
-    expect(events[0].changedTouches![0].identifier, equals(104));
-    expect(events[0].changedTouches![0].client.x, equals(320));
-    expect(events[0].changedTouches![0].client.y, equals(321));
-    expect(events[0].changedTouches![1].identifier, equals(105));
-    expect(events[0].changedTouches![1].client.x, equals(322));
-    expect(events[0].changedTouches![1].client.y, equals(323));
-
-    events = expectCorrectTypes(context.multiTouchCancel(const <_TouchDetails>[
-      _TouchDetails(pointer: 104, clientX: 320, clientY: 321),
-      _TouchDetails(pointer: 105, clientX: 322, clientY: 323),
-    ]));
-    expect(events.length, equals(1));
-    expect(events[0].type, equals('touchcancel'));
-    expect(events[0].changedTouches!.length, equals(2));
-    expect(events[0].changedTouches![0].identifier, equals(104));
-    expect(events[0].changedTouches![0].client.x, equals(320));
-    expect(events[0].changedTouches![0].client.y, equals(321));
-    expect(events[0].changedTouches![1].identifier, equals(105));
-    expect(events[0].changedTouches![1].client.x, equals(322));
-    expect(events[0].changedTouches![1].client.y, equals(323));
-
-    context.pressAllModifiers();
-    event = expectCorrectType(context.primaryDown(clientX: 100, clientY: 101));
-    expect(event.altKey, true);
-    expect(event.ctrlKey, true);
-    expect(event.metaKey, true);
-    expect(event.shiftKey, true);
-    context.unpressAllModifiers();
-    event = expectCorrectType(context.primaryDown(clientX: 100, clientY: 101));
-    expect(event.altKey, false);
-    expect(event.ctrlKey, false);
-    expect(event.metaKey, false);
-    expect(event.shiftKey, false);
-  });
-
-  test('_MouseEventContext generates expected events', () {
-    if (!_MouseEventContext().isSupported) {
-      return;
-    }
-
-    DomMouseEvent expectCorrectType(DomEvent e) {
-      expect(domInstanceOfString(e, 'MouseEvent'), isTrue);
-      return e as DomMouseEvent;
-    }
-
-    final _MouseEventContext context = _MouseEventContext();
-    DomMouseEvent event;
-
-    event = expectCorrectType(context.primaryDown(clientX: 100, clientY: 101));
-    expect(event.type, equals('mousedown'));
-    expect(event.button, equals(0));
-    expect(event.buttons, equals(1));
-    expect(event.client.x, equals(100));
-    expect(event.client.y, equals(101));
-
-    event = expectCorrectType(
-        context.mouseDown(clientX: 110, clientY: 111, button: 2, buttons: 2));
-    expect(event.type, equals('mousedown'));
-    expect(event.button, equals(2));
-    expect(event.buttons, equals(2));
-    expect(event.client.x, equals(110));
-    expect(event.client.y, equals(111));
-
-    event = expectCorrectType(context.primaryMove(clientX: 200, clientY: 201));
-    expect(event.type, equals('mousemove'));
-    expect(event.button, equals(0));
-    expect(event.buttons, equals(1));
-    expect(event.client.x, equals(200));
-    expect(event.client.y, equals(201));
-
-    event = expectCorrectType(context.mouseMove(
-        clientX: 210, clientY: 211, button: _kNoButtonChange, buttons: 6));
-    expect(event.type, equals('mousemove'));
-    expect(event.button, equals(0));
-    expect(event.buttons, equals(6));
-    expect(event.client.x, equals(210));
-    expect(event.client.y, equals(211));
-
-    event = expectCorrectType(
-        context.mouseMove(clientX: 212, clientY: 213, button: 2, buttons: 6));
-    expect(event.type, equals('mousedown'));
-    expect(event.button, equals(2));
-    expect(event.buttons, equals(6));
-    expect(event.client.x, equals(212));
-    expect(event.client.y, equals(213));
-
-    event = expectCorrectType(
-        context.mouseMove(clientX: 214, clientY: 215, button: 2, buttons: 1));
-    expect(event.type, equals('mouseup'));
-    expect(event.button, equals(2));
-    expect(event.buttons, equals(1));
-    expect(event.client.x, equals(214));
-    expect(event.client.y, equals(215));
+  // The reason we listen for pointer events in the bubble phase instead of the
+  // capture phase is to allow platform views and native text fields to receive
+  // the event first. This way, they can potentially handle the event and stop
+  // its propagation to prevent Flutter from receiving and handling it.
+  test(
+    'event listeners are attached to the bubble phase',
+    () {
+      final _BasicEventContext context = _PointerEventContext();
+      final List<ui.PointerDataPacket> packets = <ui.PointerDataPacket>[];
+      ui.PlatformDispatcher.instance.onPointerDataPacket = (ui.PointerDataPacket packet) {
+        packets.add(packet);
+      };
 
-    event = expectCorrectType(context.mouseLeave(clientX: 1000, clientY: 2000, buttons: 6));
-    expect(event.type, equals('mouseleave'));
-    expect(event.button, equals(0));
-    expect(event.buttons, equals(6));
-    expect(event.client.x, equals(1000));
-    expect(event.client.y, equals(2000));
+      final DomElement child = createDomHTMLDivElement();
+      rootElement.append(child);
 
-    event = expectCorrectType(context.primaryUp(clientX: 300, clientY: 301));
-    expect(event.type, equals('mouseup'));
-    expect(event.button, equals(0));
-    expect(event.buttons, equals(0));
-    expect(event.client.x, equals(300));
-    expect(event.client.y, equals(301));
+      final DomEventListener stopPropagationListener = createDomEventListener((DomEvent event) {
+        event.stopPropagation();
+      });
 
-    event = expectCorrectType(
-        context.mouseUp(clientX: 310, clientY: 311, button: 2));
-    expect(event.type, equals('mouseup'));
-    expect(event.button, equals(2));
-    expect(event.buttons, equals(0));
-    expect(event.client.x, equals(310));
-    expect(event.client.y, equals(311));
+      // The event reaches `PointerBinding` as expected.
+      child.dispatchEvent(context.primaryDown());
+      expect(packets, isNotEmpty);
+      packets.clear();
 
-    event = expectCorrectType(context.hover(clientX: 400, clientY: 401));
-    expect(event.type, equals('mousemove'));
-    expect(event.button, equals(0));
-    expect(event.buttons, equals(0));
-    expect(event.client.x, equals(400));
-    expect(event.client.y, equals(401));
+      // The child stops propagation so the event doesn't reach `PointerBinding`.
+      final DomEvent event = context.primaryDown();
+      child.addEventListener(event.type, stopPropagationListener);
+      child.dispatchEvent(event);
+      expect(packets, isEmpty);
+      packets.clear();
 
-    context.pressAllModifiers();
-    event = expectCorrectType(context.primaryDown(clientX: 100, clientY: 101));
-    expect(event.getModifierState('Alt'), true);
-    expect(event.getModifierState('Control'), true);
-    expect(event.getModifierState('Meta'), true);
-    expect(event.getModifierState('Shift'), true);
-    context.unpressAllModifiers();
-    event = expectCorrectType(context.primaryDown(clientX: 100, clientY: 101));
-    expect(event.getModifierState('Alt'), false);
-    expect(event.getModifierState('Control'), false);
-    expect(event.getModifierState('Meta'), false);
-    expect(event.getModifierState('Shift'), false);
-  });
+      child.remove();
+    },
+  );
 
-  // ALL ADAPTERS
-
-  _testEach<_BasicEventContext>(
-    <_BasicEventContext>[
-      _PointerEventContext(),
-      _MouseEventContext(),
-      _TouchEventContext(),
-    ],
-    'can receive pointer events on the glass pane',
-    (_BasicEventContext context) {
-      PointerBinding.instance!.debugOverrideDetector(context);
+  test(
+    'can receive pointer events on the app root',
+    () {
+      final _BasicEventContext context = _PointerEventContext();
       ui.PointerDataPacket? receivedPacket;
-      ui.window.onPointerDataPacket = (ui.PointerDataPacket packet) {
+      ui.PlatformDispatcher.instance.onPointerDataPacket = (ui.PointerDataPacket packet) {
         receivedPacket = packet;
       };
 
-      glassPane.dispatchEvent(context.primaryDown());
+      rootElement.dispatchEvent(context.primaryDown());
 
       expect(receivedPacket, isNotNull);
       expect(receivedPacket!.data[0].buttons, equals(1));
     },
   );
 
-  _testEach<_BasicEventContext>(
-    <_BasicEventContext>[
-      _PointerEventContext(),
-      _MouseEventContext(),
-      _TouchEventContext(),
-    ],
+  test(
     'does create an add event if got a pointerdown',
-    (_BasicEventContext context) {
-      PointerBinding.instance!.debugOverrideDetector(context);
+    () {
+      final _BasicEventContext context = _PointerEventContext();
       final List<ui.PointerDataPacket> packets = <ui.PointerDataPacket>[];
-      ui.window.onPointerDataPacket = (ui.PointerDataPacket packet) {
+      ui.PlatformDispatcher.instance.onPointerDataPacket = (ui.PointerDataPacket packet) {
         packets.add(packet);
       };
 
-      glassPane.dispatchEvent(context.primaryDown());
+      rootElement.dispatchEvent(context.primaryDown());
 
       expect(packets, hasLength(1));
       expect(packets.single.data, hasLength(2));
@@ -518,15 +339,10 @@ void testMain() {
     },
   );
 
-  _testEach<_BasicEventContext>(
-    <_BasicEventContext>[
-      _PointerEventContext(),
-      _MouseEventContext(),
-      _TouchEventContext(),
-    ],
+  test(
     'synthesize modifier keys left down event if left or right are not pressed',
-    (_BasicEventContext context) {
-      PointerBinding.instance!.debugOverrideDetector(context);
+    () {
+      final _BasicEventContext context = _PointerEventContext();
 
       // Should synthesize a modifier left key down event when DOM event indicates
       // that the modifier key is pressed and known pressing state doesn't contain
@@ -536,21 +352,20 @@ void testMain() {
         final int physicalRight = kWebToPhysicalKey['${key}Right']!;
         final int logicalLeft = kWebLogicalLocationMap[key]![kLocationLeft]!;
 
-        final List<ui.KeyData> keyDataList = <ui.KeyData>[];
-        final KeyboardConverter keyboardConverter = createKeyboardConverter(keyDataList);
-        PointerBinding.instance!.debugOverrideKeyboardConverter(keyboardConverter);
-
-        expect(keyboardConverter.debugKeyIsPressed(physicalLeft), false);
-        expect(keyboardConverter.debugKeyIsPressed(physicalRight), false);
-        glassPane.dispatchEvent(context.primaryDown());
+        expect(keyboardConverter.keyIsPressed(physicalLeft), false);
+        expect(keyboardConverter.keyIsPressed(physicalRight), false);
+        rootElement.dispatchEvent(context.primaryDown());
         expect(keyDataList.length, 1);
         expectKeyData(keyDataList.last,
           type: ui.KeyEventType.down,
+          deviceType: ui.KeyEventDeviceType.keyboard,
           physical: physicalLeft,
           logical: logicalLeft,
           character: null,
           synthesized: true,
         );
+        keyDataList.clear();
+        keyboardConverter.clearPressedKeys();
       }
 
       context.altPressed = true;
@@ -568,15 +383,10 @@ void testMain() {
     },
   );
 
-  _testEach<_BasicEventContext>(
-    <_BasicEventContext>[
-      _PointerEventContext(),
-      _MouseEventContext(),
-      _TouchEventContext(),
-    ],
+  test(
     'should not synthesize modifier keys down event if left or right are pressed',
-    (_BasicEventContext context) {
-      PointerBinding.instance!.debugOverrideDetector(context);
+    () {
+      final _BasicEventContext context = _PointerEventContext();
 
       // Should not synthesize a modifier down event when DOM event indicates
       // that the modifier key is pressed and known pressing state contains
@@ -585,17 +395,14 @@ void testMain() {
         final int physicalLeft = kWebToPhysicalKey['${key}Left']!;
         final int physicalRight = kWebToPhysicalKey['${key}Right']!;
 
-        final List<ui.KeyData> keyDataList = <ui.KeyData>[];
-        final KeyboardConverter keyboardConverter = createKeyboardConverter(keyDataList);
-        PointerBinding.instance!.debugOverrideKeyboardConverter(keyboardConverter);
-
         keyboardConverter.handleEvent(keyDownEvent('${key}Left', key, modifiers, kLocationLeft));
-        expect(keyboardConverter.debugKeyIsPressed(physicalLeft), true);
-        expect(keyboardConverter.debugKeyIsPressed(physicalRight), false);
+        expect(keyboardConverter.keyIsPressed(physicalLeft), true);
+        expect(keyboardConverter.keyIsPressed(physicalRight), false);
         keyDataList.clear(); // Remove key data generated by handleEvent
 
-        glassPane.dispatchEvent(context.primaryDown());
+        rootElement.dispatchEvent(context.primaryDown());
         expect(keyDataList.length, 0);
+        keyboardConverter.clearPressedKeys();
       }
 
       // Should not synthesize a modifier down event when DOM event indicates
@@ -605,17 +412,14 @@ void testMain() {
         final int physicalLeft = kWebToPhysicalKey['${key}Left']!;
         final int physicalRight = kWebToPhysicalKey['${key}Right']!;
 
-        final List<ui.KeyData> keyDataList = <ui.KeyData>[];
-        final KeyboardConverter keyboardConverter = createKeyboardConverter(keyDataList);
-        PointerBinding.instance!.debugOverrideKeyboardConverter(keyboardConverter);
-
         keyboardConverter.handleEvent(keyDownEvent('${key}Right', key, modifiers, kLocationRight));
-        expect(keyboardConverter.debugKeyIsPressed(physicalLeft), false);
-        expect(keyboardConverter.debugKeyIsPressed(physicalRight), true);
+        expect(keyboardConverter.keyIsPressed(physicalLeft), false);
+        expect(keyboardConverter.keyIsPressed(physicalRight), true);
         keyDataList.clear(); // Remove key data generated by handleEvent
 
-        glassPane.dispatchEvent(context.primaryDown());
+        rootElement.dispatchEvent(context.primaryDown());
         expect(keyDataList.length, 0);
+        keyboardConverter.clearPressedKeys();
       }
 
       context.altPressed = true;
@@ -637,15 +441,10 @@ void testMain() {
     },
   );
 
-  _testEach<_BasicEventContext>(
-    <_BasicEventContext>[
-      _PointerEventContext(),
-      _MouseEventContext(),
-      _TouchEventContext(),
-    ],
+  test(
     'synthesize modifier keys up event if left or right are pressed',
-    (_BasicEventContext context) {
-      PointerBinding.instance!.debugOverrideDetector(context);
+    () {
+      final _BasicEventContext context = _PointerEventContext();
 
       // Should synthesize a modifier left key up event when DOM event indicates
       // that the modifier key is not pressed and known pressing state contains
@@ -655,25 +454,23 @@ void testMain() {
         final int physicalRight = kWebToPhysicalKey['${key}Right']!;
         final int logicalLeft = kWebLogicalLocationMap[key]![kLocationLeft]!;
 
-        final List<ui.KeyData> keyDataList = <ui.KeyData>[];
-        final KeyboardConverter keyboardConverter = createKeyboardConverter(keyDataList);
-        PointerBinding.instance!.debugOverrideKeyboardConverter(keyboardConverter);
-
         keyboardConverter.handleEvent(keyDownEvent('${key}Left', key, modifiers, kLocationLeft));
-        expect(keyboardConverter.debugKeyIsPressed(physicalLeft), true);
-        expect(keyboardConverter.debugKeyIsPressed(physicalRight), false);
+        expect(keyboardConverter.keyIsPressed(physicalLeft), true);
+        expect(keyboardConverter.keyIsPressed(physicalRight), false);
         keyDataList.clear(); // Remove key data generated by handleEvent
 
-        glassPane.dispatchEvent(context.primaryDown());
+        rootElement.dispatchEvent(context.primaryDown());
         expect(keyDataList.length, 1);
         expectKeyData(keyDataList.last,
           type: ui.KeyEventType.up,
+          deviceType: ui.KeyEventDeviceType.keyboard,
           physical: physicalLeft,
           logical: logicalLeft,
           character: null,
           synthesized: true,
         );
-        expect(keyboardConverter.debugKeyIsPressed(physicalLeft), false);
+        expect(keyboardConverter.keyIsPressed(physicalLeft), false);
+        keyboardConverter.clearPressedKeys();
       }
 
       // Should synthesize a modifier right key up event when DOM event indicates
@@ -684,25 +481,23 @@ void testMain() {
         final int physicalRight = kWebToPhysicalKey['${key}Right']!;
         final int logicalRight = kWebLogicalLocationMap[key]![kLocationRight]!;
 
-        final List<ui.KeyData> keyDataList = <ui.KeyData>[];
-        final KeyboardConverter keyboardConverter = createKeyboardConverter(keyDataList);
-        PointerBinding.instance!.debugOverrideKeyboardConverter(keyboardConverter);
-
         keyboardConverter.handleEvent(keyDownEvent('${key}Right', key, modifiers, kLocationRight));
-        expect(keyboardConverter.debugKeyIsPressed(physicalLeft), false);
-        expect(keyboardConverter.debugKeyIsPressed(physicalRight), true);
+        expect(keyboardConverter.keyIsPressed(physicalLeft), false);
+        expect(keyboardConverter.keyIsPressed(physicalRight), true);
         keyDataList.clear(); // Remove key data generated by handleEvent
 
-        glassPane.dispatchEvent(context.primaryDown());
+        rootElement.dispatchEvent(context.primaryDown());
         expect(keyDataList.length, 1);
         expectKeyData(keyDataList.last,
           type: ui.KeyEventType.up,
+          deviceType: ui.KeyEventDeviceType.keyboard,
           physical: physicalRight,
           logical: logicalRight,
           character: null,
           synthesized: true,
         );
-        expect(keyboardConverter.debugKeyIsPressed(physicalRight), false);
+        expect(keyboardConverter.keyIsPressed(physicalRight), false);
+        keyboardConverter.clearPressedKeys();
       }
 
       context.altPressed = false;
@@ -720,15 +515,10 @@ void testMain() {
     },
   );
 
-  _testEach<_BasicEventContext>(
-    <_BasicEventContext>[
-      _PointerEventContext(),
-      _MouseEventContext(),
-      _TouchEventContext(),
-    ],
+  test(
     'should not synthesize modifier keys up event if left or right are not pressed',
-    (_BasicEventContext context) {
-      PointerBinding.instance!.debugOverrideDetector(context);
+    () {
+      final _BasicEventContext context = _PointerEventContext();
 
       // Should not synthesize a modifier up event when DOM event indicates
       // that the modifier key is not pressed and known pressing state does
@@ -737,16 +527,13 @@ void testMain() {
         final int physicalLeft = kWebToPhysicalKey['${key}Left']!;
         final int physicalRight = kWebToPhysicalKey['${key}Right']!;
 
-        final List<ui.KeyData> keyDataList = <ui.KeyData>[];
-        final KeyboardConverter keyboardConverter = createKeyboardConverter(keyDataList);
-        PointerBinding.instance!.debugOverrideKeyboardConverter(keyboardConverter);
-
-        expect(keyboardConverter.debugKeyIsPressed(physicalLeft), false);
-        expect(keyboardConverter.debugKeyIsPressed(physicalRight), false);
+        expect(keyboardConverter.keyIsPressed(physicalLeft), false);
+        expect(keyboardConverter.keyIsPressed(physicalRight), false);
         keyDataList.clear(); // Remove key data generated by handleEvent
 
-        glassPane.dispatchEvent(context.primaryDown());
+        rootElement.dispatchEvent(context.primaryDown());
         expect(keyDataList.length, 0);
+        keyboardConverter.clearPressedKeys();
       }
 
       context.altPressed = false;
@@ -760,57 +547,46 @@ void testMain() {
     },
   );
 
-  _testEach<_BasicEventContext>(
-    <_BasicEventContext>[
-      _PointerEventContext(),
-      _MouseEventContext(),
-      _TouchEventContext(),
-    ],
+  test(
     'should synthesize modifier keys up event for AltGraph',
-    (_BasicEventContext context) {
-      PointerBinding.instance!.debugOverrideDetector(context);
-
-      final List<ui.KeyData> keyDataList = <ui.KeyData>[];
-      final KeyboardConverter keyboardConverter = createKeyboardConverter(keyDataList);
-      PointerBinding.instance!.debugOverrideKeyboardConverter(keyboardConverter);
+    () {
+      final _BasicEventContext context = _PointerEventContext();
 
       final int physicalAltRight = kWebToPhysicalKey['AltRight']!;
       final int logicalAltGraph = kWebLogicalLocationMap['AltGraph']![0]!;
 
       // Simulate pressing `AltGr` key.
       keyboardConverter.handleEvent(keyDownEvent('AltRight', 'AltGraph'));
-      expect(keyboardConverter.debugKeyIsPressed(physicalAltRight), true);
+      expect(keyboardConverter.keyIsPressed(physicalAltRight), true);
       keyDataList.clear(); // Remove key data generated by handleEvent.
 
-      glassPane.dispatchEvent(context.primaryDown());
+      rootElement.dispatchEvent(context.primaryDown());
       expect(keyDataList.length, 1);
       expectKeyData(keyDataList.last,
         type: ui.KeyEventType.up,
+        deviceType: ui.KeyEventDeviceType.keyboard,
         physical: physicalAltRight,
         logical: logicalAltGraph,
         character: null,
         synthesized: true,
       );
-      expect(keyboardConverter.debugKeyIsPressed(physicalAltRight), false);
+      expect(keyboardConverter.keyIsPressed(physicalAltRight), false);
+      keyDataList.clear();
     },
   );
 
-  _testEach<_ButtonedEventMixin>(
-    <_ButtonedEventMixin>[
-      if (!isIosSafari) _PointerEventContext(),
-      if (!isIosSafari) _MouseEventContext(),
-    ],
+  test(
     'correctly detects events on the semantics placeholder',
-    (_ButtonedEventMixin context) {
-      PointerBinding.instance!.debugOverrideDetector(context);
+    () {
+      final _ButtonedEventMixin context = _PointerEventContext();
       final List<ui.PointerDataPacket> packets = <ui.PointerDataPacket>[];
-      ui.window.onPointerDataPacket = (ui.PointerDataPacket packet) {
+      ui.PlatformDispatcher.instance.onPointerDataPacket = (ui.PointerDataPacket packet) {
         packets.add(packet);
       };
 
       final DomElement semanticsPlaceholder =
           createDomElement('flt-semantics-placeholder');
-      glassPane.append(semanticsPlaceholder);
+      rootElement.append(semanticsPlaceholder);
 
       // Press on the semantics placeholder.
       semanticsPlaceholder.dispatchEvent(context.primaryDown(
@@ -849,7 +625,7 @@ void testMain() {
       packets.clear();
 
       // Release the pointer on the semantics placeholder.
-      domWindow.dispatchEvent(context.primaryUp(
+      rootElement.dispatchEvent(context.primaryUp(
         clientX: 100.0,
         clientY: 200.0,
       ));
@@ -865,24 +641,21 @@ void testMain() {
 
       semanticsPlaceholder.remove();
     },
+    skip: isFirefox, // https://bugzilla.mozilla.org/show_bug.cgi?id=1804190
   );
 
   // BUTTONED ADAPTERS
 
-  _testEach<_ButtonedEventMixin>(
-    <_ButtonedEventMixin>[
-      _PointerEventContext(),
-      _MouseEventContext(),
-    ],
+  test(
     'creates an add event if the first pointer activity is a hover',
-    (_ButtonedEventMixin context) {
-      PointerBinding.instance!.debugOverrideDetector(context);
+    () {
+      final _ButtonedEventMixin context = _PointerEventContext();
       final List<ui.PointerDataPacket> packets = <ui.PointerDataPacket>[];
-      ui.window.onPointerDataPacket = (ui.PointerDataPacket packet) {
+      ui.PlatformDispatcher.instance.onPointerDataPacket = (ui.PointerDataPacket packet) {
         packets.add(packet);
       };
 
-      glassPane.dispatchEvent(context.hover());
+      rootElement.dispatchEvent(context.hover());
 
       expect(packets, hasLength(1));
       expect(packets.single.data, hasLength(2));
@@ -893,20 +666,16 @@ void testMain() {
     },
   );
 
-  _testEach<_ButtonedEventMixin>(
-    <_ButtonedEventMixin>[
-      _PointerEventContext(),
-      _MouseEventContext(),
-    ],
+  test(
     'sends a pointermove event instead of the second pointerdown in a row',
-    (_ButtonedEventMixin context) {
-      PointerBinding.instance!.debugOverrideDetector(context);
+    () {
+      final _ButtonedEventMixin context = _PointerEventContext();
       final List<ui.PointerDataPacket> packets = <ui.PointerDataPacket>[];
-      ui.window.onPointerDataPacket = (ui.PointerDataPacket packet) {
+      ui.PlatformDispatcher.instance.onPointerDataPacket = (ui.PointerDataPacket packet) {
         packets.add(packet);
       };
 
-      glassPane.dispatchEvent(context.primaryDown(
+      rootElement.dispatchEvent(context.primaryDown(
         clientX: 10.0,
         clientY: 10.0,
       ));
@@ -918,7 +687,7 @@ void testMain() {
       expect(packets[0].data[1].change, equals(ui.PointerChange.down));
       packets.clear();
 
-      glassPane.dispatchEvent(context.primaryDown(
+      rootElement.dispatchEvent(context.primaryDown(
         clientX: 20.0,
         clientY: 20.0,
       ));
@@ -930,20 +699,16 @@ void testMain() {
     },
   );
 
-  _testEach<_ButtonedEventMixin>(
-    <_ButtonedEventMixin>[
-      if (!isIosSafari) _PointerEventContext(),
-      if (!isIosSafari) _MouseEventContext(),
-    ],
+  test(
     'does synthesize add or hover or move for scroll',
-    (_ButtonedEventMixin context) {
-      PointerBinding.instance!.debugOverrideDetector(context);
+    () {
+      final _ButtonedEventMixin context = _PointerEventContext();
       final List<ui.PointerDataPacket> packets = <ui.PointerDataPacket>[];
-      ui.window.onPointerDataPacket = (ui.PointerDataPacket packet) {
+      ui.PlatformDispatcher.instance.onPointerDataPacket = (ui.PointerDataPacket packet) {
         packets.add(packet);
       };
 
-      glassPane.dispatchEvent(context.wheel(
+      rootElement.dispatchEvent(context.wheel(
         buttons: 0,
         clientX: 10,
         clientY: 10,
@@ -951,7 +716,7 @@ void testMain() {
         deltaY: 10,
       ));
 
-      glassPane.dispatchEvent(context.wheel(
+      rootElement.dispatchEvent(context.wheel(
         buttons: 0,
         clientX: 20,
         clientY: 50,
@@ -959,14 +724,14 @@ void testMain() {
         deltaY: 10,
       ));
 
-      glassPane.dispatchEvent(context.mouseDown(
+      rootElement.dispatchEvent(context.mouseDown(
         button: 0,
         buttons: 1,
         clientX: 20.0,
         clientY: 50.0,
       ));
 
-      glassPane.dispatchEvent(context.wheel(
+      rootElement.dispatchEvent(context.wheel(
         buttons: 1,
         clientX: 30,
         clientY: 60,
@@ -1049,26 +814,21 @@ void testMain() {
     },
   );
 
-  _testEach<_ButtonedEventMixin>(
-    <_ButtonedEventMixin>[
-      if (!isIosSafari) _PointerEventContext(),
-      if (!isIosSafari) _MouseEventContext(),
-    ],
-    'converts scroll delta to physical pixels (Firefox)',
-    (_ButtonedEventMixin context) {
-      PointerBinding.instance!.debugOverrideDetector(context);
+  test(
+    'converts scroll delta to physical pixels (macOs)',
+    () {
+      final _ButtonedEventMixin context = _PointerEventContext();
 
       const double dpi = 2.5;
       debugOperatingSystemOverride = OperatingSystem.macOs;
-      debugBrowserEngineOverride = BrowserEngine.firefox;
-      window.debugOverrideDevicePixelRatio(dpi);
+      EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(dpi);
 
       final List<ui.PointerDataPacket> packets = <ui.PointerDataPacket>[];
-      ui.window.onPointerDataPacket = (ui.PointerDataPacket packet) {
+      ui.PlatformDispatcher.instance.onPointerDataPacket = (ui.PointerDataPacket packet) {
         packets.add(packet);
       };
 
-      glassPane.dispatchEvent(context.wheel(
+      rootElement.dispatchEvent(context.wheel(
         buttons: 0,
         clientX: 10,
         clientY: 10,
@@ -1092,79 +852,105 @@ void testMain() {
       expect(packets[0].data[0].scrollDeltaX, equals(10.0 * dpi));
       expect(packets[0].data[0].scrollDeltaY, equals(10.0 * dpi));
 
-      window.debugOverrideDevicePixelRatio(1.0);
-      debugOperatingSystemOverride = null;
+      EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(1.0);
       debugBrowserEngineOverride = null;
     },
   );
 
-  _testEach<_ButtonedEventMixin>(
-    <_ButtonedEventMixin>[
-      if (!isIosSafari) _PointerEventContext(),
-      if (!isIosSafari) _MouseEventContext(),
-    ],
-    'scroll delta are already in physical pixels (Chrome)',
-    (_ButtonedEventMixin context) {
-      PointerBinding.instance!.debugOverrideDetector(context);
-
-      const double dpi = 2.5;
-      debugOperatingSystemOverride = OperatingSystem.macOs;
-      debugBrowserEngineOverride = BrowserEngine.blink;
-      window.debugOverrideDevicePixelRatio(dpi);
-
+  test(
+    'does set pointer device kind based on delta precision and wheelDelta',
+    () {
+      if (isFirefox) {
+        // Firefox does not support trackpad events, as they cannot be
+        // disambiguated from smoothed mouse wheel events.
+        return;
+      }
+      final _ButtonedEventMixin context = _PointerEventContext();
       final List<ui.PointerDataPacket> packets = <ui.PointerDataPacket>[];
-      ui.window.onPointerDataPacket = (ui.PointerDataPacket packet) {
+      ui.PlatformDispatcher.instance.onPointerDataPacket = (ui.PointerDataPacket packet) {
         packets.add(packet);
       };
 
-      glassPane.dispatchEvent(context.wheel(
+      rootElement.dispatchEvent(context.wheel(
         buttons: 0,
         clientX: 10,
         clientY: 10,
-        deltaX: 10,
-        deltaY: 10,
+        deltaX: 119,
+        deltaY: 119,
+        wheelDeltaX: -357,
+        wheelDeltaY: -357,
+        timeStamp: 0,
       ));
 
-      expect(packets, hasLength(1));
-
+      rootElement.dispatchEvent(context.wheel(
+        buttons: 0,
+        clientX: 10,
+        clientY: 10,
+        deltaX: 120,
+        deltaY: 120,
+        wheelDeltaX: -360,
+        wheelDeltaY: -360,
+        timeStamp: 10,
+      ));
 
-      // An add will be synthesized.
-      expect(packets[0].data, hasLength(2));
-      expect(packets[0].data[0].change, equals(ui.PointerChange.add));
-      // Scroll deltas should NOT be multiplied by `dpi`.
-      expect(packets[0].data[0].scrollDeltaX, equals(10.0));
-      expect(packets[0].data[0].scrollDeltaY, equals(10.0));
+      rootElement.dispatchEvent(context.wheel(
+        buttons: 0,
+        clientX: 10,
+        clientY: 10,
+        deltaX: 120,
+        deltaY: 120,
+        wheelDeltaX: -360,
+        wheelDeltaY: -360,
+        timeStamp: 20,
+      ));
 
-      expect(packets[0].data[1].change, equals(ui.PointerChange.hover));
-      expect(packets[0].data[1].signalKind, equals(ui.PointerSignalKind.scroll));
-      // Scroll deltas should NOT be multiplied by `dpi`.
-      expect(packets[0].data[0].scrollDeltaX, equals(10.0));
-      expect(packets[0].data[0].scrollDeltaY, equals(10.0));
+      rootElement.dispatchEvent(context.wheel(
+        buttons: 0,
+        clientX: 10,
+        clientY: 10,
+        deltaX: 119,
+        deltaY: 119,
+        wheelDeltaX: -357,
+        wheelDeltaY: -357,
+        timeStamp: 1000,
+      ));
 
-      window.debugOverrideDevicePixelRatio(1.0);
-      debugOperatingSystemOverride = null;
-      debugBrowserEngineOverride = null;
-    },
-  );
+      rootElement.dispatchEvent(context.wheel(
+        buttons: 0,
+        clientX: 10,
+        clientY: 10,
+        deltaX: -120,
+        deltaY: -120,
+        wheelDeltaX: 360,
+        wheelDeltaY: 360,
+        timeStamp: 1010,
+      ));
 
-  _testEach<_ButtonedEventMixin>(
-    <_ButtonedEventMixin>[
-      if (!isIosSafari) _PointerEventContext(),
-      if (!isIosSafari) _MouseEventContext()
-    ],
-    'does calculate delta and pointer identifier correctly',
-    (_ButtonedEventMixin context) {
-      PointerBinding.instance!.debugOverrideDetector(context);
-      final List<ui.PointerDataPacket> packets = <ui.PointerDataPacket>[];
-      ui.window.onPointerDataPacket = (ui.PointerDataPacket packet) {
-        packets.add(packet);
-      };
+      rootElement.dispatchEvent(context.wheel(
+        buttons: 0,
+        clientX: 10,
+        clientY: 10,
+        deltaX: 0,
+        deltaY: -120,
+        wheelDeltaX: 0,
+        wheelDeltaY: 360,
+        timeStamp: 2000,
+      ));
 
-      glassPane.dispatchEvent(context.hover(
-        clientX: 10.0,
-        clientY: 10.0,
+      rootElement.dispatchEvent(context.wheel(
+        buttons: 0,
+        clientX: 10,
+        clientY: 10,
+        deltaX: 0,
+        deltaY: 40,
+        wheelDeltaX: 0,
+        wheelDeltaY: -360,
+        timeStamp: 3000,
       ));
-      expect(packets, hasLength(1));
+
+      expect(packets, hasLength(7));
+
+      // An add will be synthesized.
       expect(packets[0].data, hasLength(2));
       expect(packets[0].data[0].change, equals(ui.PointerChange.add));
       expect(packets[0].data[0].pointerIdentifier, equals(0));
@@ -1173,51 +959,315 @@ void testMain() {
       expect(packets[0].data[0].physicalY, equals(10.0 * dpi));
       expect(packets[0].data[0].physicalDeltaX, equals(0.0));
       expect(packets[0].data[0].physicalDeltaY, equals(0.0));
-
+      // Because the delta is not in increments of 120 and has matching wheelDelta,
+      // it will be a trackpad event.
       expect(packets[0].data[1].change, equals(ui.PointerChange.hover));
+      expect(
+          packets[0].data[1].signalKind, equals(ui.PointerSignalKind.scroll));
+      expect(
+          packets[0].data[1].kind, equals(ui.PointerDeviceKind.trackpad));
+      expect(packets[0].data[1].device, equals(-2));
       expect(packets[0].data[1].pointerIdentifier, equals(0));
       expect(packets[0].data[1].synthesized, isFalse);
       expect(packets[0].data[1].physicalX, equals(10.0 * dpi));
       expect(packets[0].data[1].physicalY, equals(10.0 * dpi));
       expect(packets[0].data[1].physicalDeltaX, equals(0.0));
       expect(packets[0].data[1].physicalDeltaY, equals(0.0));
-      packets.clear();
+      expect(packets[0].data[1].scrollDeltaX, equals(119.0));
+      expect(packets[0].data[1].scrollDeltaY, equals(119.0));
 
-      glassPane.dispatchEvent(context.hover(
-        clientX: 20.0,
-        clientY: 20.0,
-      ));
-      expect(packets, hasLength(1));
-      expect(packets[0].data, hasLength(1));
-      expect(packets[0].data[0].change, equals(ui.PointerChange.hover));
-      expect(packets[0].data[0].pointerIdentifier, equals(0));
-      expect(packets[0].data[0].synthesized, isFalse);
-      expect(packets[0].data[0].physicalX, equals(20.0 * dpi));
-      expect(packets[0].data[0].physicalY, equals(20.0 * dpi));
-      expect(packets[0].data[0].physicalDeltaX, equals(10.0 * dpi));
-      expect(packets[0].data[0].physicalDeltaY, equals(10.0 * dpi));
-      packets.clear();
+      // Because the delta is in increments of 120, but is similar to the
+      // previous event, it will be a trackpad event.
+      expect(packets[1].data[0].change, equals(ui.PointerChange.hover));
+      expect(
+          packets[1].data[0].signalKind, equals(ui.PointerSignalKind.scroll));
+      expect(
+          packets[1].data[0].kind, equals(ui.PointerDeviceKind.trackpad));
+      expect(packets[1].data[0].device, equals(-2));
+      expect(packets[1].data[0].pointerIdentifier, equals(0));
+      expect(packets[1].data[0].synthesized, isFalse);
+      expect(packets[1].data[0].physicalX, equals(10.0 * dpi));
+      expect(packets[1].data[0].physicalY, equals(10.0 * dpi));
+      expect(packets[1].data[0].physicalDeltaX, equals(0.0));
+      expect(packets[1].data[0].physicalDeltaY, equals(0.0));
+      expect(packets[1].data[0].scrollDeltaX, equals(120.0));
+      expect(packets[1].data[0].scrollDeltaY, equals(120.0));
+
+      // Because the delta is in increments of 120, but is again similar to the
+      // previous event, it will be a trackpad event.
+      expect(packets[2].data[0].change, equals(ui.PointerChange.hover));
+      expect(
+          packets[2].data[0].signalKind, equals(ui.PointerSignalKind.scroll));
+      expect(
+          packets[2].data[0].kind, equals(ui.PointerDeviceKind.trackpad));
+      expect(packets[2].data[0].device, equals(-2));
+      expect(packets[2].data[0].pointerIdentifier, equals(0));
+      expect(packets[2].data[0].synthesized, isFalse);
+      expect(packets[2].data[0].physicalX, equals(10.0 * dpi));
+      expect(packets[2].data[0].physicalY, equals(10.0 * dpi));
+      expect(packets[2].data[0].physicalDeltaX, equals(0.0));
+      expect(packets[2].data[0].physicalDeltaY, equals(0.0));
+      expect(packets[2].data[0].scrollDeltaX, equals(120.0));
+      expect(packets[2].data[0].scrollDeltaY, equals(120.0));
 
-      glassPane.dispatchEvent(context.primaryDown(
-        clientX: 20.0,
-        clientY: 20.0,
-      ));
-      expect(packets, hasLength(1));
-      expect(packets[0].data, hasLength(1));
-      expect(packets[0].data[0].change, equals(ui.PointerChange.down));
-      expect(packets[0].data[0].pointerIdentifier, equals(1));
-      expect(packets[0].data[0].synthesized, isFalse);
-      expect(packets[0].data[0].physicalX, equals(20.0 * dpi));
-      expect(packets[0].data[0].physicalY, equals(20.0 * dpi));
-      expect(packets[0].data[0].physicalDeltaX, equals(0.0));
-      expect(packets[0].data[0].physicalDeltaY, equals(0.0));
-      packets.clear();
+      // Because the delta is not in increments of 120 and has matching wheelDelta,
+      // it will be a trackpad event.
+      expect(packets[3].data[0].change, equals(ui.PointerChange.hover));
+      expect(
+          packets[3].data[0].signalKind, equals(ui.PointerSignalKind.scroll));
+      expect(
+          packets[3].data[0].kind, equals(ui.PointerDeviceKind.trackpad));
+      expect(packets[3].data[0].device, equals(-2));
+      expect(packets[3].data[0].pointerIdentifier, equals(0));
+      expect(packets[3].data[0].synthesized, isFalse);
+      expect(packets[3].data[0].physicalX, equals(10.0 * dpi));
+      expect(packets[3].data[0].physicalY, equals(10.0 * dpi));
+      expect(packets[3].data[0].physicalDeltaX, equals(0.0));
+      expect(packets[3].data[0].physicalDeltaY, equals(0.0));
+      expect(packets[3].data[0].scrollDeltaX, equals(119.0));
+      expect(packets[3].data[0].scrollDeltaY, equals(119.0));
+
+      // Because the delta is in increments of 120, and is not similar to the
+      // previous event, but occurred soon after the previous event, it will be
+      // a trackpad event.
+      expect(packets[4].data[0].change, equals(ui.PointerChange.hover));
+      expect(
+          packets[4].data[0].signalKind, equals(ui.PointerSignalKind.scroll));
+      expect(
+          packets[4].data[0].kind, equals(ui.PointerDeviceKind.trackpad));
+      expect(packets[4].data[0].device, equals(-2));
+      expect(packets[4].data[0].pointerIdentifier, equals(0));
+      expect(packets[4].data[0].synthesized, isFalse);
+      expect(packets[4].data[0].physicalX, equals(10.0 * dpi));
+      expect(packets[4].data[0].physicalY, equals(10.0 * dpi));
+      expect(packets[4].data[0].physicalDeltaX, equals(0.0));
+      expect(packets[4].data[0].physicalDeltaY, equals(0.0));
+      expect(packets[4].data[0].scrollDeltaX, equals(-120.0));
+      expect(packets[4].data[0].scrollDeltaY, equals(-120.0));
 
-      glassPane.dispatchEvent(context.primaryMove(
-        clientX: 40.0,
-        clientY: 30.0,
-      ));
-      expect(packets, hasLength(1));
+      // An add will be synthesized.
+      expect(packets[5].data, hasLength(2));
+      expect(packets[5].data[0].change, equals(ui.PointerChange.add));
+      expect(
+          packets[5].data[0].signalKind, equals(ui.PointerSignalKind.none));
+      expect(
+          packets[5].data[0].kind, equals(ui.PointerDeviceKind.mouse));
+      expect(packets[5].data[0].device, equals(-1));
+      expect(packets[5].data[0].pointerIdentifier, equals(0));
+      expect(packets[5].data[0].synthesized, isTrue);
+      expect(packets[5].data[0].physicalX, equals(10.0 * dpi));
+      expect(packets[5].data[0].physicalY, equals(10.0 * dpi));
+      expect(packets[5].data[0].physicalDeltaX, equals(0.0));
+      expect(packets[5].data[0].physicalDeltaY, equals(0.0));
+      expect(packets[5].data[0].scrollDeltaX, equals(0.0));
+      expect(packets[5].data[0].scrollDeltaY, equals(-120.0));
+      // Because the delta is in increments of 120, and is not similar to
+      // the previous event, and occurred long after the previous event, it will
+      // be a mouse event.
+      expect(packets[5].data[1].change, equals(ui.PointerChange.hover));
+      expect(
+          packets[5].data[1].signalKind, equals(ui.PointerSignalKind.scroll));
+      expect(
+          packets[5].data[1].kind, equals(ui.PointerDeviceKind.mouse));
+      expect(packets[5].data[1].device, equals(-1));
+      expect(packets[5].data[1].pointerIdentifier, equals(0));
+      expect(packets[5].data[1].synthesized, isFalse);
+      expect(packets[5].data[1].physicalX, equals(10.0 * dpi));
+      expect(packets[5].data[1].physicalY, equals(10.0 * dpi));
+      expect(packets[5].data[1].physicalDeltaX, equals(0.0));
+      expect(packets[5].data[1].physicalDeltaY, equals(0.0));
+      expect(packets[5].data[1].scrollDeltaX, equals(0.0));
+      expect(packets[5].data[1].scrollDeltaY, equals(-120.0));
+
+      // Because the delta is not in increments of 120 and has non-matching
+      // wheelDelta, it will be a mouse event.
+      expect(packets[6].data, hasLength(1));
+      expect(packets[6].data[0].change, equals(ui.PointerChange.hover));
+      expect(
+          packets[6].data[0].signalKind, equals(ui.PointerSignalKind.scroll));
+      expect(
+          packets[6].data[0].kind, equals(ui.PointerDeviceKind.mouse));
+      expect(packets[6].data[0].device, equals(-1));
+      expect(packets[6].data[0].pointerIdentifier, equals(0));
+      expect(packets[6].data[0].synthesized, isFalse);
+      expect(packets[6].data[0].physicalX, equals(10.0 * dpi));
+      expect(packets[6].data[0].physicalY, equals(10.0 * dpi));
+      expect(packets[6].data[0].physicalDeltaX, equals(0.0));
+      expect(packets[6].data[0].physicalDeltaY, equals(0.0));
+      expect(packets[6].data[0].scrollDeltaX, equals(0.0));
+      expect(packets[6].data[0].scrollDeltaY, equals(40.0));
+    },
+  );
+
+  test(
+    'does choose scroll vs scale based on ctrlKey',
+    () {
+      final _ButtonedEventMixin context = _PointerEventContext();
+      final List<ui.PointerDataPacket> packets = <ui.PointerDataPacket>[];
+      ui.PlatformDispatcher.instance.onPointerDataPacket = (ui.PointerDataPacket packet) {
+        packets.add(packet);
+      };
+
+      debugOperatingSystemOverride = OperatingSystem.macOs;
+
+      rootElement.dispatchEvent(context.wheel(
+        buttons: 0,
+        clientX: 10,
+        clientY: 10,
+        deltaX: 0,
+        deltaY: 120,
+      ));
+
+      rootElement.dispatchEvent(context.wheel(
+        buttons: 0,
+        clientX: 10,
+        clientY: 10,
+        deltaX: 0,
+        deltaY: 100,
+        ctrlKey: true,
+      ));
+
+      keyboardConverter.handleEvent(keyDownEvent('ControlLeft', 'Control', kCtrl));
+
+      rootElement.dispatchEvent(context.wheel(
+        buttons: 0,
+        clientX: 10,
+        clientY: 10,
+        deltaX: 0,
+        deltaY: 240,
+        ctrlKey: true,
+      ));
+
+      keyboardConverter.handleEvent(keyUpEvent('ControlLeft', 'Control', kCtrl));
+
+      expect(packets, hasLength(3));
+
+      // An add will be synthesized.
+      expect(packets[0].data, hasLength(2));
+      expect(packets[0].data[0].change, equals(ui.PointerChange.add));
+      expect(packets[0].data[0].pointerIdentifier, equals(0));
+      expect(packets[0].data[0].synthesized, isTrue);
+      expect(packets[0].data[0].physicalX, equals(10.0 * dpi));
+      expect(packets[0].data[0].physicalY, equals(10.0 * dpi));
+      expect(packets[0].data[0].physicalDeltaX, equals(0.0));
+      expect(packets[0].data[0].physicalDeltaY, equals(0.0));
+      // Because ctrlKey is not pressed, it will be a scroll.
+      expect(packets[0].data[1].change, equals(ui.PointerChange.hover));
+      expect(
+          packets[0].data[1].signalKind, equals(ui.PointerSignalKind.scroll));
+      expect(
+          packets[0].data[1].kind, equals(ui.PointerDeviceKind.mouse));
+      expect(packets[0].data[1].pointerIdentifier, equals(0));
+      expect(packets[0].data[1].synthesized, isFalse);
+      expect(packets[0].data[1].physicalX, equals(10.0 * dpi));
+      expect(packets[0].data[1].physicalY, equals(10.0 * dpi));
+      expect(packets[0].data[1].physicalDeltaX, equals(0.0));
+      expect(packets[0].data[1].physicalDeltaY, equals(0.0));
+      expect(packets[0].data[1].scrollDeltaX, equals(0.0));
+      expect(packets[0].data[1].scrollDeltaY, equals(120.0));
+
+      // Because ctrlKey is pressed, it will be a scale.
+      expect(packets[1].data, hasLength(1));
+      expect(packets[1].data[0].change, equals(ui.PointerChange.hover));
+      expect(
+          packets[1].data[0].signalKind, equals(ui.PointerSignalKind.scale));
+      expect(
+          packets[1].data[0].kind, equals(ui.PointerDeviceKind.mouse));
+      expect(packets[1].data[0].pointerIdentifier, equals(0));
+      expect(packets[1].data[0].synthesized, isFalse);
+      expect(packets[1].data[0].physicalX, equals(10.0 * dpi));
+      expect(packets[1].data[0].physicalY, equals(10.0 * dpi));
+      expect(packets[1].data[0].physicalDeltaX, equals(0.0));
+      expect(packets[1].data[0].physicalDeltaY, equals(0.0));
+      expect(packets[1].data[0].scale, closeTo(0.60653065971, 1e-10)); // math.exp(-100/200)
+
+      // [macOS only]: Because ctrlKey is true, but the key is pressed physically, it will be a scroll.
+      expect(packets[2].data, hasLength(1));
+      expect(packets[2].data[0].change, equals(ui.PointerChange.hover));
+      expect(
+          packets[2].data[0].signalKind, equals(ui.PointerSignalKind.scroll));
+      expect(
+          packets[2].data[0].kind, equals(ui.PointerDeviceKind.mouse));
+      expect(packets[2].data[0].pointerIdentifier, equals(0));
+      expect(packets[2].data[0].synthesized, isFalse);
+      expect(packets[2].data[0].physicalX, equals(10.0 * dpi));
+      expect(packets[2].data[0].physicalY, equals(10.0 * dpi));
+      expect(packets[2].data[0].physicalDeltaX, equals(0.0));
+      expect(packets[2].data[0].physicalDeltaY, equals(0.0));
+      expect(packets[2].data[0].scrollDeltaX, equals(0.0));
+      expect(packets[2].data[0].scrollDeltaY, equals(240.0));
+
+      debugOperatingSystemOverride = null;
+    },
+  );
+
+  test(
+    'does calculate delta and pointer identifier correctly',
+    () {
+      final _ButtonedEventMixin context = _PointerEventContext();
+      final List<ui.PointerDataPacket> packets = <ui.PointerDataPacket>[];
+      ui.PlatformDispatcher.instance.onPointerDataPacket = (ui.PointerDataPacket packet) {
+        packets.add(packet);
+      };
+
+      rootElement.dispatchEvent(context.hover(
+        clientX: 10.0,
+        clientY: 10.0,
+      ));
+      expect(packets, hasLength(1));
+      expect(packets[0].data, hasLength(2));
+      expect(packets[0].data[0].change, equals(ui.PointerChange.add));
+      expect(packets[0].data[0].pointerIdentifier, equals(0));
+      expect(packets[0].data[0].synthesized, isTrue);
+      expect(packets[0].data[0].physicalX, equals(10.0 * dpi));
+      expect(packets[0].data[0].physicalY, equals(10.0 * dpi));
+      expect(packets[0].data[0].physicalDeltaX, equals(0.0));
+      expect(packets[0].data[0].physicalDeltaY, equals(0.0));
+
+      expect(packets[0].data[1].change, equals(ui.PointerChange.hover));
+      expect(packets[0].data[1].pointerIdentifier, equals(0));
+      expect(packets[0].data[1].synthesized, isFalse);
+      expect(packets[0].data[1].physicalX, equals(10.0 * dpi));
+      expect(packets[0].data[1].physicalY, equals(10.0 * dpi));
+      expect(packets[0].data[1].physicalDeltaX, equals(0.0));
+      expect(packets[0].data[1].physicalDeltaY, equals(0.0));
+      packets.clear();
+
+      rootElement.dispatchEvent(context.hover(
+        clientX: 20.0,
+        clientY: 20.0,
+      ));
+      expect(packets, hasLength(1));
+      expect(packets[0].data, hasLength(1));
+      expect(packets[0].data[0].change, equals(ui.PointerChange.hover));
+      expect(packets[0].data[0].pointerIdentifier, equals(0));
+      expect(packets[0].data[0].synthesized, isFalse);
+      expect(packets[0].data[0].physicalX, equals(20.0 * dpi));
+      expect(packets[0].data[0].physicalY, equals(20.0 * dpi));
+      expect(packets[0].data[0].physicalDeltaX, equals(10.0 * dpi));
+      expect(packets[0].data[0].physicalDeltaY, equals(10.0 * dpi));
+      packets.clear();
+
+      rootElement.dispatchEvent(context.primaryDown(
+        clientX: 20.0,
+        clientY: 20.0,
+      ));
+      expect(packets, hasLength(1));
+      expect(packets[0].data, hasLength(1));
+      expect(packets[0].data[0].change, equals(ui.PointerChange.down));
+      expect(packets[0].data[0].pointerIdentifier, equals(1));
+      expect(packets[0].data[0].synthesized, isFalse);
+      expect(packets[0].data[0].physicalX, equals(20.0 * dpi));
+      expect(packets[0].data[0].physicalY, equals(20.0 * dpi));
+      expect(packets[0].data[0].physicalDeltaX, equals(0.0));
+      expect(packets[0].data[0].physicalDeltaY, equals(0.0));
+      packets.clear();
+
+      rootElement.dispatchEvent(context.primaryMove(
+        clientX: 40.0,
+        clientY: 30.0,
+      ));
+      expect(packets, hasLength(1));
       expect(packets[0].data, hasLength(1));
       expect(packets[0].data[0].change, equals(ui.PointerChange.move));
       expect(packets[0].data[0].pointerIdentifier, equals(1));
@@ -1228,7 +1278,7 @@ void testMain() {
       expect(packets[0].data[0].physicalDeltaY, equals(10.0 * dpi));
       packets.clear();
 
-      glassPane.dispatchEvent(context.primaryUp(
+      rootElement.dispatchEvent(context.primaryUp(
         clientX: 40.0,
         clientY: 30.0,
       ));
@@ -1243,7 +1293,7 @@ void testMain() {
       expect(packets[0].data[0].physicalDeltaY, equals(0.0));
       packets.clear();
 
-      glassPane.dispatchEvent(context.hover(
+      rootElement.dispatchEvent(context.hover(
         clientX: 20.0,
         clientY: 10.0,
       ));
@@ -1258,7 +1308,7 @@ void testMain() {
       expect(packets[0].data[0].physicalDeltaY, equals(-20.0 * dpi));
       packets.clear();
 
-      glassPane.dispatchEvent(context.primaryDown(
+      rootElement.dispatchEvent(context.primaryDown(
         clientX: 20.0,
         clientY: 10.0,
       ));
@@ -1275,22 +1325,18 @@ void testMain() {
     },
   );
 
-  _testEach<_ButtonedEventMixin>(
-    <_ButtonedEventMixin>[
-      if (!isIosSafari) _PointerEventContext(),
-      if (!isIosSafari) _MouseEventContext(),
-    ],
+  test(
     'correctly converts buttons of down, move, leave, and up events',
-    (_ButtonedEventMixin context) {
-      PointerBinding.instance!.debugOverrideDetector(context);
+    () {
+      final _ButtonedEventMixin context = _PointerEventContext();
       final List<ui.PointerDataPacket> packets = <ui.PointerDataPacket>[];
-      ui.window.onPointerDataPacket = (ui.PointerDataPacket packet) {
+      ui.PlatformDispatcher.instance.onPointerDataPacket = (ui.PointerDataPacket packet) {
         packets.add(packet);
       };
 
       // Add and hover
 
-      glassPane.dispatchEvent(context.hover(
+      rootElement.dispatchEvent(context.hover(
         clientX: 10,
         clientY: 11,
       ));
@@ -1309,7 +1355,7 @@ void testMain() {
       expect(packets[0].data[1].buttons, equals(0));
       packets.clear();
 
-      glassPane.dispatchEvent(context.mouseDown(
+      rootElement.dispatchEvent(context.mouseDown(
         button: 0,
         buttons: 1,
         clientX: 10.0,
@@ -1324,7 +1370,7 @@ void testMain() {
       expect(packets[0].data[0].buttons, equals(1));
       packets.clear();
 
-      glassPane.dispatchEvent(context.mouseMove(
+      rootElement.dispatchEvent(context.mouseMove(
         button: _kNoButtonChange,
         buttons: 1,
         clientX: 20.0,
@@ -1339,7 +1385,7 @@ void testMain() {
       expect(packets[0].data[0].buttons, equals(1));
       packets.clear();
 
-      glassPane.dispatchEvent(context.mouseUp(
+      rootElement.dispatchEvent(context.mouseUp(
         button: 0,
         clientX: 20.0,
         clientY: 21.0,
@@ -1354,7 +1400,7 @@ void testMain() {
       packets.clear();
 
       // Drag with secondary button
-      glassPane.dispatchEvent(context.mouseDown(
+      rootElement.dispatchEvent(context.mouseDown(
         button: 2,
         buttons: 2,
         clientX: 20.0,
@@ -1369,7 +1415,7 @@ void testMain() {
       expect(packets[0].data[0].buttons, equals(2));
       packets.clear();
 
-      glassPane.dispatchEvent(context.mouseMove(
+      rootElement.dispatchEvent(context.mouseMove(
         button: _kNoButtonChange,
         buttons: 2,
         clientX: 30.0,
@@ -1384,7 +1430,7 @@ void testMain() {
       expect(packets[0].data[0].buttons, equals(2));
       packets.clear();
 
-      glassPane.dispatchEvent(context.mouseUp(
+      rootElement.dispatchEvent(context.mouseUp(
         button: 2,
         clientX: 30.0,
         clientY: 31.0,
@@ -1399,7 +1445,7 @@ void testMain() {
       packets.clear();
 
       // Drag with middle button
-      glassPane.dispatchEvent(context.mouseDown(
+      rootElement.dispatchEvent(context.mouseDown(
         button: 1,
         buttons: 4,
         clientX: 30.0,
@@ -1414,7 +1460,7 @@ void testMain() {
       expect(packets[0].data[0].buttons, equals(4));
       packets.clear();
 
-      glassPane.dispatchEvent(context.mouseMove(
+      rootElement.dispatchEvent(context.mouseMove(
         button: _kNoButtonChange,
         buttons: 4,
         clientX: 40.0,
@@ -1429,7 +1475,7 @@ void testMain() {
       expect(packets[0].data[0].buttons, equals(4));
       packets.clear();
 
-      glassPane.dispatchEvent(context.mouseUp(
+      rootElement.dispatchEvent(context.mouseUp(
         button: 1,
         clientX: 40.0,
         clientY: 41.0,
@@ -1445,7 +1491,7 @@ void testMain() {
 
       // Leave
 
-      glassPane.dispatchEvent(context.mouseLeave(
+      rootElement.dispatchEvent(context.mouseLeave(
         buttons: 1,
         clientX: 1000.0,
         clientY: 2000.0,
@@ -1453,7 +1499,7 @@ void testMain() {
       expect(packets, isEmpty);
       packets.clear();
 
-      glassPane.dispatchEvent(context.mouseLeave(
+      rootElement.dispatchEvent(context.mouseLeave(
         buttons: 0,
         clientX: 1000.0,
         clientY: 2000.0,
@@ -1469,21 +1515,17 @@ void testMain() {
     },
   );
 
-  _testEach<_ButtonedEventMixin>(
-    <_ButtonedEventMixin>[
-      _PointerEventContext(),
-      _MouseEventContext(),
-    ],
+  test(
     'correctly handles button changes during a down sequence',
-    (_ButtonedEventMixin context) {
-      PointerBinding.instance!.debugOverrideDetector(context);
+    () {
+      final _ButtonedEventMixin context = _PointerEventContext();
       final List<ui.PointerDataPacket> packets = <ui.PointerDataPacket>[];
-      ui.window.onPointerDataPacket = (ui.PointerDataPacket packet) {
+      ui.PlatformDispatcher.instance.onPointerDataPacket = (ui.PointerDataPacket packet) {
         packets.add(packet);
       };
 
       // Press LMB.
-      glassPane.dispatchEvent(context.mouseDown(
+      rootElement.dispatchEvent(context.mouseDown(
         button: 0,
         buttons: 1,
       ));
@@ -1498,7 +1540,7 @@ void testMain() {
       packets.clear();
 
       // Press MMB.
-      glassPane.dispatchEvent(context.mouseMove(
+      rootElement.dispatchEvent(context.mouseMove(
         button: 1,
         buttons: 5,
       ));
@@ -1510,7 +1552,7 @@ void testMain() {
       packets.clear();
 
       // Release LMB.
-      glassPane.dispatchEvent(context.mouseMove(
+      rootElement.dispatchEvent(context.mouseMove(
         button: 0,
         buttons: 4,
       ));
@@ -1522,7 +1564,7 @@ void testMain() {
       packets.clear();
 
       // Release MMB.
-      glassPane.dispatchEvent(context.mouseUp(
+      rootElement.dispatchEvent(context.mouseUp(
         button: 1,
       ));
       expect(packets, hasLength(1));
@@ -1534,23 +1576,19 @@ void testMain() {
     },
   );
 
-  _testEach<_ButtonedEventMixin>(
-    <_ButtonedEventMixin>[
-      if (!isIosSafari) _PointerEventContext(),
-      if (!isIosSafari) _MouseEventContext(),
-    ],
+  test(
     'synthesizes a pointerup event when pointermove comes before the up',
-    (_ButtonedEventMixin context) {
-      PointerBinding.instance!.debugOverrideDetector(context);
+    () {
+      final _ButtonedEventMixin context = _PointerEventContext();
       // This can happen when the user pops up the context menu by right
       // clicking, then dismisses it with a left click.
 
       final List<ui.PointerDataPacket> packets = <ui.PointerDataPacket>[];
-      ui.window.onPointerDataPacket = (ui.PointerDataPacket packet) {
+      ui.PlatformDispatcher.instance.onPointerDataPacket = (ui.PointerDataPacket packet) {
         packets.add(packet);
       };
 
-      glassPane.dispatchEvent(context.mouseDown(
+      rootElement.dispatchEvent(context.mouseDown(
         button: 2,
         buttons: 2,
         clientX: 10,
@@ -1571,7 +1609,7 @@ void testMain() {
       expect(packets[0].data[1].buttons, equals(2));
       packets.clear();
 
-      glassPane.dispatchEvent(context.mouseMove(
+      rootElement.dispatchEvent(context.mouseMove(
         button: _kNoButtonChange,
         buttons: 2,
         clientX: 20.0,
@@ -1586,7 +1624,7 @@ void testMain() {
       expect(packets[0].data[0].buttons, equals(2));
       packets.clear();
 
-      glassPane.dispatchEvent(context.mouseMove(
+      rootElement.dispatchEvent(context.mouseMove(
         button: _kNoButtonChange,
         buttons: 2,
         clientX: 20.0,
@@ -1601,7 +1639,7 @@ void testMain() {
       expect(packets[0].data[0].buttons, equals(2));
       packets.clear();
 
-      glassPane.dispatchEvent(context.mouseUp(
+      rootElement.dispatchEvent(context.mouseUp(
         button: 2,
         clientX: 20.0,
         clientY: 21.0,
@@ -1617,14 +1655,10 @@ void testMain() {
     },
   );
 
-  _testEach<_ButtonedEventMixin>(
-    <_ButtonedEventMixin>[
-      _PointerEventContext(),
-      _MouseEventContext(),
-    ],
+  test(
     'correctly handles uncontinuous button changes during a down sequence',
-    (_ButtonedEventMixin context) {
-      PointerBinding.instance!.debugOverrideDetector(context);
+    () {
+      final _ButtonedEventMixin context = _PointerEventContext();
       // This can happen with the following gesture sequence:
       //
       //  - Pops up the context menu by right clicking, but holds RMB;
@@ -1632,12 +1666,12 @@ void testMain() {
       //  - Releases RMB.
 
       final List<ui.PointerDataPacket> packets = <ui.PointerDataPacket>[];
-      ui.window.onPointerDataPacket = (ui.PointerDataPacket packet) {
+      ui.PlatformDispatcher.instance.onPointerDataPacket = (ui.PointerDataPacket packet) {
         packets.add(packet);
       };
 
       // Press RMB and hold, popping up the context menu.
-      glassPane.dispatchEvent(context.mouseDown(
+      rootElement.dispatchEvent(context.mouseDown(
         button: 2,
         buttons: 2,
       ));
@@ -1654,7 +1688,7 @@ void testMain() {
       // Press LMB. The event will have "button: -1" here, despite the change
       // in "buttons", probably because the "press" gesture was absorbed by
       // dismissing the context menu.
-      glassPane.dispatchEvent(context.mouseMove(
+      rootElement.dispatchEvent(context.mouseMove(
         button: _kNoButtonChange,
         buttons: 3,
       ));
@@ -1666,7 +1700,7 @@ void testMain() {
       packets.clear();
 
       // Release LMB.
-      glassPane.dispatchEvent(context.mouseMove(
+      rootElement.dispatchEvent(context.mouseMove(
         button: 0,
         buttons: 2,
       ));
@@ -1678,7 +1712,7 @@ void testMain() {
       packets.clear();
 
       // Release RMB.
-      glassPane.dispatchEvent(context.mouseUp(
+      rootElement.dispatchEvent(context.mouseUp(
         button: 2,
       ));
       expect(packets, hasLength(1));
@@ -1690,13 +1724,10 @@ void testMain() {
     },
   );
 
-  _testEach<_ButtonedEventMixin>(
-    <_ButtonedEventMixin>[
-      _PointerEventContext(),
-    ],
+  test(
     'correctly handles missing right mouse button up when followed by move',
-    (_ButtonedEventMixin context) {
-      PointerBinding.instance!.debugOverrideDetector(context);
+    () {
+      final _ButtonedEventMixin context = _PointerEventContext();
       // This can happen with the following gesture sequence:
       //
       //  - Pops up the context menu by right clicking;
@@ -1704,13 +1735,13 @@ void testMain() {
       //  - Moves mouse.
 
       final List<ui.PointerDataPacket> packets = <ui.PointerDataPacket>[];
-      ui.window.onPointerDataPacket = (ui.PointerDataPacket packet) {
+      ui.PlatformDispatcher.instance.onPointerDataPacket = (ui.PointerDataPacket packet) {
         packets.add(packet);
       };
 
       // Press RMB popping up the context menu, then release by LMB down and up.
       // Browser won't send up event in that case.
-      glassPane.dispatchEvent(context.mouseDown(
+      rootElement.dispatchEvent(context.mouseDown(
         button: 2,
         buttons: 2,
       ));
@@ -1725,7 +1756,7 @@ void testMain() {
       packets.clear();
 
       // User now hovers.
-      glassPane.dispatchEvent(context.mouseMove(
+      rootElement.dispatchEvent(context.mouseMove(
         button: _kNoButtonChange,
         buttons: 0,
       ));
@@ -1741,25 +1772,21 @@ void testMain() {
     },
   );
 
-  _testEach<_ButtonedEventMixin>(
-    <_ButtonedEventMixin>[
-      _PointerEventContext(),
-      _MouseEventContext(),
-    ],
+  test(
     'handles RMB click when the browser sends it as a move',
-    (_ButtonedEventMixin context) {
-      PointerBinding.instance!.debugOverrideDetector(context);
+    () {
+      final _ButtonedEventMixin context = _PointerEventContext();
       // When the user clicks the RMB and moves the mouse quickly (before the
       // context menu shows up), the browser sends a move event before down.
       // The move event will have "button:-1, buttons:2".
 
       final List<ui.PointerDataPacket> packets = <ui.PointerDataPacket>[];
-      ui.window.onPointerDataPacket = (ui.PointerDataPacket packet) {
+      ui.PlatformDispatcher.instance.onPointerDataPacket = (ui.PointerDataPacket packet) {
         packets.add(packet);
       };
 
       // Press RMB and hold, popping up the context menu.
-      glassPane.dispatchEvent(context.mouseMove(
+      rootElement.dispatchEvent(context.mouseMove(
         button: -1,
         buttons: 2,
         clientX: 10.0,
@@ -1777,26 +1804,22 @@ void testMain() {
     },
   );
 
-  _testEach<_ButtonedEventMixin>(
-    <_ButtonedEventMixin>[
-      _PointerEventContext(),
-      _MouseEventContext(),
-    ],
+  test(
     'correctly handles hover after RMB click',
-    (_ButtonedEventMixin context) {
-      PointerBinding.instance!.debugOverrideDetector(context);
+    () {
+      final _ButtonedEventMixin context = _PointerEventContext();
       // This can happen with the following gesture sequence:
       //
       //  - Pops up the context menu by right clicking, but holds RMB;
       //  - Move the pointer to hover.
 
       final List<ui.PointerDataPacket> packets = <ui.PointerDataPacket>[];
-      ui.window.onPointerDataPacket = (ui.PointerDataPacket packet) {
+      ui.PlatformDispatcher.instance.onPointerDataPacket = (ui.PointerDataPacket packet) {
         packets.add(packet);
       };
 
       // Press RMB and hold, popping up the context menu.
-      glassPane.dispatchEvent(context.mouseDown(
+      rootElement.dispatchEvent(context.mouseDown(
         button: 2,
         buttons: 2,
         clientX: 10.0,
@@ -1815,7 +1838,7 @@ void testMain() {
       // Move the mouse. The event will have "buttons: 0" because RMB was
       // released but the browser didn't send a pointerup/mouseup event.
       // The hover is also triggered at a different position.
-      glassPane.dispatchEvent(context.hover(
+      rootElement.dispatchEvent(context.hover(
         clientX: 20.0,
         clientY: 20.0,
       ));
@@ -1834,14 +1857,10 @@ void testMain() {
     },
   );
 
-  _testEach<_ButtonedEventMixin>(
-    <_ButtonedEventMixin>[
-      _PointerEventContext(),
-      _MouseEventContext(),
-    ],
+  test(
     'correctly handles LMB click after RMB click',
-    (_ButtonedEventMixin context) {
-      PointerBinding.instance!.debugOverrideDetector(context);
+    () {
+      final _ButtonedEventMixin context = _PointerEventContext();
       // This can happen with the following gesture sequence:
       //
       //  - Pops up the context menu by right clicking, but holds RMB;
@@ -1854,12 +1873,12 @@ void testMain() {
       // could be in a different location without any `*move` events in between.
 
       final List<ui.PointerDataPacket> packets = <ui.PointerDataPacket>[];
-      ui.window.onPointerDataPacket = (ui.PointerDataPacket packet) {
+      ui.PlatformDispatcher.instance.onPointerDataPacket = (ui.PointerDataPacket packet) {
         packets.add(packet);
       };
 
       // Press RMB and hold, popping up the context menu.
-      glassPane.dispatchEvent(context.mouseDown(
+      rootElement.dispatchEvent(context.mouseDown(
         button: 2,
         buttons: 2,
         clientX: 10.0,
@@ -1876,7 +1895,7 @@ void testMain() {
       packets.clear();
 
       // Press LMB.
-      glassPane.dispatchEvent(context.mouseDown(
+      rootElement.dispatchEvent(context.mouseDown(
         button: 0,
         buttons: 3,
         clientX: 20.0,
@@ -1890,7 +1909,7 @@ void testMain() {
       packets.clear();
 
       // Release LMB.
-      glassPane.dispatchEvent(context.primaryUp(
+      rootElement.dispatchEvent(context.primaryUp(
         clientX: 20.0,
         clientY: 20.0,
       ));
@@ -1903,26 +1922,22 @@ void testMain() {
     },
   );
 
-  _testEach<_ButtonedEventMixin>(
-    <_ButtonedEventMixin>[
-      _PointerEventContext(),
-      _MouseEventContext(),
-    ],
+  test(
     'correctly handles two consecutive RMB clicks with no up in between',
-    (_ButtonedEventMixin context) {
-      PointerBinding.instance!.debugOverrideDetector(context);
+    () {
+      final _ButtonedEventMixin context = _PointerEventContext();
       // This can happen with the following gesture sequence:
       //
       //  - Pops up the context menu by right clicking, but holds RMB;
       //  - Clicks RMB again in a different location;
 
       final List<ui.PointerDataPacket> packets = <ui.PointerDataPacket>[];
-      ui.window.onPointerDataPacket = (ui.PointerDataPacket packet) {
+      ui.PlatformDispatcher.instance.onPointerDataPacket = (ui.PointerDataPacket packet) {
         packets.add(packet);
       };
 
       // Press RMB and hold, popping up the context menu.
-      glassPane.dispatchEvent(context.mouseDown(
+      rootElement.dispatchEvent(context.mouseDown(
         button: 2,
         buttons: 2,
         clientX: 10.0,
@@ -1940,7 +1955,7 @@ void testMain() {
       // Press RMB again. In Chrome, when RMB is clicked again while the
       // context menu is still active, it sends a pointerdown/mousedown event
       // with "buttons:0". We convert this to pointer up, pointer down.
-      glassPane.dispatchEvent(context.mouseDown(
+      rootElement.dispatchEvent(context.mouseDown(
         button: 2,
         buttons: 0,
         clientX: 20.0,
@@ -1962,7 +1977,7 @@ void testMain() {
       packets.clear();
 
       // Release RMB.
-      glassPane.dispatchEvent(context.mouseUp(
+      rootElement.dispatchEvent(context.mouseUp(
         button: 2,
         clientX: 20.0,
         clientY: 20.0,
@@ -1976,14 +1991,10 @@ void testMain() {
     },
   );
 
-  _testEach<_ButtonedEventMixin>(
-    <_ButtonedEventMixin>[
-      _PointerEventContext(),
-      _MouseEventContext(),
-    ],
+  test(
     'correctly handles two consecutive RMB clicks with up in between',
-    (_ButtonedEventMixin context) {
-      PointerBinding.instance!.debugOverrideDetector(context);
+    () {
+      final _ButtonedEventMixin context = _PointerEventContext();
       // This can happen with the following gesture sequence:
       //
       //  - Pops up the context menu by right clicking, but doesn't hold RMB;
@@ -1992,12 +2003,12 @@ void testMain() {
       // This seems to be happening sometimes when using RMB on the Mac trackpad.
 
       final List<ui.PointerDataPacket> packets = <ui.PointerDataPacket>[];
-      ui.window.onPointerDataPacket = (ui.PointerDataPacket packet) {
+      ui.PlatformDispatcher.instance.onPointerDataPacket = (ui.PointerDataPacket packet) {
         packets.add(packet);
       };
 
       // Press RMB, popping up the context menu.
-      glassPane.dispatchEvent(context.mouseDown(
+      rootElement.dispatchEvent(context.mouseDown(
         button: 2,
         buttons: 2,
         clientX: 10.0,
@@ -2013,7 +2024,7 @@ void testMain() {
       packets.clear();
 
       // RMB up.
-      glassPane.dispatchEvent(context.mouseUp(
+      rootElement.dispatchEvent(context.mouseUp(
         button: 2,
         clientX: 10.0,
         clientY: 10.0,
@@ -2028,7 +2039,7 @@ void testMain() {
       // Press RMB again. In Chrome, when RMB is clicked again while the
       // context menu is still active, it sends a pointerdown/mousedown event
       // with "buttons:0".
-      glassPane.dispatchEvent(context.mouseDown(
+      rootElement.dispatchEvent(context.mouseDown(
         button: 2,
         buttons: 0,
         clientX: 20.0,
@@ -2045,7 +2056,7 @@ void testMain() {
       packets.clear();
 
       // Release RMB.
-      glassPane.dispatchEvent(context.mouseUp(
+      rootElement.dispatchEvent(context.mouseUp(
         button: 2,
         clientX: 20.0,
         clientY: 20.0,
@@ -2059,14 +2070,10 @@ void testMain() {
     },
   );
 
-  _testEach<_ButtonedEventMixin>(
-    <_ButtonedEventMixin>[
-      _PointerEventContext(),
-      _MouseEventContext(),
-    ],
+  test(
     'correctly handles two consecutive RMB clicks in two different locations',
-    (_ButtonedEventMixin context) {
-      PointerBinding.instance!.debugOverrideDetector(context);
+    () {
+      final _ButtonedEventMixin context = _PointerEventContext();
       // This can happen with the following gesture sequence:
       //
       //  - Pops up the context menu by right clicking;
@@ -2078,12 +2085,12 @@ void testMain() {
       // when the context menu is shown.
 
       final List<ui.PointerDataPacket> packets = <ui.PointerDataPacket>[];
-      ui.window.onPointerDataPacket = (ui.PointerDataPacket packet) {
+      ui.PlatformDispatcher.instance.onPointerDataPacket = (ui.PointerDataPacket packet) {
         packets.add(packet);
       };
 
       // Press RMB and hold, popping up the context menu.
-      glassPane.dispatchEvent(context.mouseDown(
+      rootElement.dispatchEvent(context.mouseDown(
         button: 2,
         buttons: 2,
         clientX: 10.0,
@@ -2099,7 +2106,7 @@ void testMain() {
       packets.clear();
 
       // Release RMB.
-      glassPane.dispatchEvent(context.mouseUp(
+      rootElement.dispatchEvent(context.mouseUp(
         button: 2,
         clientX: 10.0,
         clientY: 10.0,
@@ -2111,7 +2118,7 @@ void testMain() {
       packets.clear();
 
       // Press RMB again, in a different location.
-      glassPane.dispatchEvent(context.mouseDown(
+      rootElement.dispatchEvent(context.mouseDown(
         button: 2,
         buttons: 2,
         clientX: 20.0,
@@ -2129,14 +2136,10 @@ void testMain() {
     },
   );
 
-  _testEach<_ButtonedEventMixin>(
-    <_ButtonedEventMixin>[
-      _PointerEventContext(),
-      _MouseEventContext(),
-    ],
+  test(
     'handles overlapping left/right down and up events',
-    (_ButtonedEventMixin context) {
-      PointerBinding.instance!.debugOverrideDetector(context);
+    () {
+      final _ButtonedEventMixin context = _PointerEventContext();
       // This can happen with the following gesture sequence:
       //
       //     LMB:   down-------------------up
@@ -2144,12 +2147,12 @@ void testMain() {
       // Flutter:   down-------move-------move-------up
 
       final List<ui.PointerDataPacket> packets = <ui.PointerDataPacket>[];
-      ui.window.onPointerDataPacket = (ui.PointerDataPacket packet) {
+      ui.PlatformDispatcher.instance.onPointerDataPacket = (ui.PointerDataPacket packet) {
         packets.add(packet);
       };
 
       // Press and hold LMB.
-      glassPane.dispatchEvent(context.mouseDown(
+      rootElement.dispatchEvent(context.mouseDown(
         button: 0,
         buttons: 1,
         clientX: 5.0,
@@ -2168,7 +2171,7 @@ void testMain() {
 
       // Press and hold RMB. The pointer is already down, so we only send a move
       // to update the position of the pointer.
-      glassPane.dispatchEvent(context.mouseDown(
+      rootElement.dispatchEvent(context.mouseDown(
         button: 2,
         buttons: 3,
         clientX: 20.0,
@@ -2184,7 +2187,7 @@ void testMain() {
 
       // Release LMB. The pointer is still down (RMB), so we only send a move to
       // update the position of the pointer.
-      glassPane.dispatchEvent(context.mouseUp(
+      rootElement.dispatchEvent(context.mouseUp(
         button: 0,
         buttons: 2,
         clientX: 30.0,
@@ -2199,7 +2202,7 @@ void testMain() {
       packets.clear();
 
       // Release RMB. There's no more buttons down, so we send an up event.
-      glassPane.dispatchEvent(context.mouseUp(
+      rootElement.dispatchEvent(context.mouseUp(
         button: 2,
         buttons: 0,
         clientX: 30.0,
@@ -2213,43 +2216,39 @@ void testMain() {
     },
   );
 
-  _testEach<_ButtonedEventMixin>(
-    <_ButtonedEventMixin>[
-      if (!isIosSafari) _PointerEventContext(),
-      if (!isIosSafari) _MouseEventContext(),
-    ],
-    'correctly detects up event outside of glasspane',
-    (_ButtonedEventMixin context) {
-      PointerBinding.instance!.debugOverrideDetector(context);
+  test(
+    'correctly detects up event outside of flutterViewElement',
+    () {
+      final _ButtonedEventMixin context = _PointerEventContext();
       // This can happen when the up event occurs while the mouse is outside the
       // browser window.
 
       final List<ui.PointerDataPacket> packets = <ui.PointerDataPacket>[];
-      ui.window.onPointerDataPacket = (ui.PointerDataPacket packet) {
+      ui.PlatformDispatcher.instance.onPointerDataPacket = (ui.PointerDataPacket packet) {
         packets.add(packet);
       };
 
       // Press and drag around.
-      glassPane.dispatchEvent(context.primaryDown(
+      rootElement.dispatchEvent(context.primaryDown(
         clientX: 10.0,
         clientY: 10.0,
       ));
-      glassPane.dispatchEvent(context.primaryMove(
+      rootElement.dispatchEvent(context.primaryMove(
         clientX: 12.0,
         clientY: 10.0,
       ));
-      glassPane.dispatchEvent(context.primaryMove(
+      rootElement.dispatchEvent(context.primaryMove(
         clientX: 15.0,
         clientY: 10.0,
       ));
-      glassPane.dispatchEvent(context.primaryMove(
+      rootElement.dispatchEvent(context.primaryMove(
         clientX: 20.0,
         clientY: 10.0,
       ));
       packets.clear();
 
-      // Move outside the glasspane.
-      domWindow.dispatchEvent(context.primaryMove(
+      // Move outside the flutterViewElement.
+      rootElement.dispatchEvent(context.primaryMove(
         clientX: 900.0,
         clientY: 1900.0,
       ));
@@ -2260,8 +2259,8 @@ void testMain() {
       expect(packets[0].data[0].physicalY, equals(1900.0 * dpi));
       packets.clear();
 
-      // Release outside the glasspane.
-      domWindow.dispatchEvent(context.primaryUp(
+      // Release outside the flutterViewElement.
+      rootElement.dispatchEvent(context.primaryUp(
         clientX: 1000.0,
         clientY: 2000.0,
       ));
@@ -2279,17 +2278,13 @@ void testMain() {
 
   // MULTIPOINTER ADAPTERS
 
-  _testEach<_MultiPointerEventMixin>(
-    <_MultiPointerEventMixin>[
-      if (!isIosSafari) _PointerEventContext(),
-      if (!isIosSafari) _TouchEventContext(),
-    ],
+  test(
     'treats each pointer separately',
-    (_MultiPointerEventMixin context) {
-      PointerBinding.instance!.debugOverrideDetector(context);
+    () {
+      final _MultiPointerEventMixin context = _PointerEventContext();
       final List<ui.PointerDataPacket> packets = <ui.PointerDataPacket>[];
       List<ui.PointerData> data;
-      ui.window.onPointerDataPacket = (ui.PointerDataPacket packet) {
+      ui.PlatformDispatcher.instance.onPointerDataPacket = (ui.PointerDataPacket packet) {
         packets.add(packet);
       };
 
@@ -2297,17 +2292,10 @@ void testMain() {
       context.multiTouchDown(const <_TouchDetails>[
         _TouchDetails(pointer: 2, clientX: 100, clientY: 101),
         _TouchDetails(pointer: 3, clientX: 200, clientY: 201),
-      ]).forEach(glassPane.dispatchEvent);
-      if (context.runtimeType == _PointerEventContext) {
-        expect(packets.length, 2);
-        expect(packets[0].data.length, 2);
-        expect(packets[1].data.length, 2);
-      } else if (context.runtimeType == _TouchEventContext) {
-        expect(packets.length, 1);
-        expect(packets[0].data.length, 4);
-      } else {
-        assert(false, 'Unexpected context type ${context.runtimeType}');
-      }
+      ]).forEach(rootElement.dispatchEvent);
+      expect(packets.length, 2);
+      expect(packets[0].data.length, 2);
+      expect(packets[1].data.length, 2);
 
       data = _allPointerData(packets);
       expect(data, hasLength(4));
@@ -2344,17 +2332,10 @@ void testMain() {
       context.multiTouchMove(const <_TouchDetails>[
         _TouchDetails(pointer: 3, clientX: 300, clientY: 302),
         _TouchDetails(pointer: 2, clientX: 400, clientY: 402),
-      ]).forEach(glassPane.dispatchEvent);
-      if (context.runtimeType == _PointerEventContext) {
-        expect(packets.length, 2);
-        expect(packets[0].data.length, 1);
-        expect(packets[1].data.length, 1);
-      } else if (context.runtimeType == _TouchEventContext) {
-        expect(packets.length, 1);
-        expect(packets[0].data.length, 2);
-      } else {
-        assert(false, 'Unexpected context type ${context.runtimeType}');
-      }
+      ]).forEach(rootElement.dispatchEvent);
+      expect(packets.length, 2);
+      expect(packets[0].data.length, 1);
+      expect(packets[1].data.length, 1);
 
       data = _allPointerData(packets);
       expect(data, hasLength(2));
@@ -2378,7 +2359,7 @@ void testMain() {
       // One pointer up
       context.multiTouchUp(const <_TouchDetails>[
         _TouchDetails(pointer: 3, clientX: 300, clientY: 302),
-      ]).forEach(glassPane.dispatchEvent);
+      ]).forEach(rootElement.dispatchEvent);
       expect(packets, hasLength(1));
       expect(packets[0].data, hasLength(2));
       expect(packets[0].data[0].change, equals(ui.PointerChange.up));
@@ -2401,7 +2382,7 @@ void testMain() {
       // Another pointer up
       context.multiTouchUp(const <_TouchDetails>[
         _TouchDetails(pointer: 2, clientX: 400, clientY: 402),
-      ]).forEach(glassPane.dispatchEvent);
+      ]).forEach(rootElement.dispatchEvent);
       expect(packets, hasLength(1));
       expect(packets[0].data, hasLength(2));
       expect(packets[0].data[0].change, equals(ui.PointerChange.up));
@@ -2425,17 +2406,10 @@ void testMain() {
       context.multiTouchDown(const <_TouchDetails>[
         _TouchDetails(pointer: 3, clientX: 500, clientY: 501),
         _TouchDetails(pointer: 2, clientX: 600, clientY: 601),
-      ]).forEach(glassPane.dispatchEvent);
-      if (context.runtimeType == _PointerEventContext) {
-        expect(packets.length, 2);
-        expect(packets[0].data.length, 2);
-        expect(packets[1].data.length, 2);
-      } else if (context.runtimeType == _TouchEventContext) {
-        expect(packets.length, 1);
-        expect(packets[0].data.length, 4);
-      } else {
-        assert(false, 'Unexpected context type ${context.runtimeType}');
-      }
+      ]).forEach(rootElement.dispatchEvent);
+      expect(packets.length, 2);
+      expect(packets[0].data.length, 2);
+      expect(packets[1].data.length, 2);
 
       data = _allPointerData(packets);
       expect(data, hasLength(4));
@@ -2470,16 +2444,12 @@ void testMain() {
     },
   );
 
-  _testEach<_MultiPointerEventMixin>(
-    <_MultiPointerEventMixin>[
-      if (!isIosSafari) _PointerEventContext(),
-      if (!isIosSafari) _TouchEventContext(),
-    ],
+  test(
     'correctly parses cancel event',
-    (_MultiPointerEventMixin context) {
-      PointerBinding.instance!.debugOverrideDetector(context);
+    () {
+      final _MultiPointerEventMixin context = _PointerEventContext();
       final List<ui.PointerDataPacket> packets = <ui.PointerDataPacket>[];
-      ui.window.onPointerDataPacket = (ui.PointerDataPacket packet) {
+      ui.PlatformDispatcher.instance.onPointerDataPacket = (ui.PointerDataPacket packet) {
         packets.add(packet);
       };
 
@@ -2487,13 +2457,13 @@ void testMain() {
       context.multiTouchDown(const <_TouchDetails>[
         _TouchDetails(pointer: 2, clientX: 100, clientY: 101),
         _TouchDetails(pointer: 3, clientX: 200, clientY: 201),
-      ]).forEach(glassPane.dispatchEvent);
+      ]).forEach(rootElement.dispatchEvent);
       packets.clear(); // Down event is tested in other tests.
 
       // One pointer cancel
       context.multiTouchCancel(const <_TouchDetails>[
         _TouchDetails(pointer: 3, clientX: 300, clientY: 302),
-      ]).forEach(glassPane.dispatchEvent);
+      ]).forEach(rootElement.dispatchEvent);
       expect(packets.length, 1);
       expect(packets[0].data.length, 2);
       expect(packets[0].data[0].change, equals(ui.PointerChange.cancel));
@@ -2515,23 +2485,18 @@ void testMain() {
     },
   );
 
-  // POINTER ADAPTER
-
-  _testEach<_PointerEventContext>(
-    <_PointerEventContext>[
-      if (!isIosSafari) _PointerEventContext(),
-    ],
+  test(
     'does not synthesize pointer up if from different device',
-    (_PointerEventContext context) {
-      PointerBinding.instance!.debugOverrideDetector(context);
+    () {
+      final _PointerEventContext context = _PointerEventContext();
       final List<ui.PointerDataPacket> packets = <ui.PointerDataPacket>[];
-      ui.window.onPointerDataPacket = (ui.PointerDataPacket packet) {
+      ui.PlatformDispatcher.instance.onPointerDataPacket = (ui.PointerDataPacket packet) {
         packets.add(packet);
       };
 
       context.multiTouchDown(const <_TouchDetails>[
         _TouchDetails(pointer: 1, clientX: 100, clientY: 101),
-      ]).forEach(glassPane.dispatchEvent);
+      ]).forEach(rootElement.dispatchEvent);
       expect(packets, hasLength(1));
       // An add will be synthesized.
       expect(packets[0].data, hasLength(2));
@@ -2544,7 +2509,7 @@ void testMain() {
 
       context.multiTouchDown(const <_TouchDetails>[
         _TouchDetails(pointer: 2, clientX: 200, clientY: 202),
-      ]).forEach(glassPane.dispatchEvent);
+      ]).forEach(rootElement.dispatchEvent);
       // An add will be synthesized.
       expect(packets, hasLength(1));
       expect(packets[0].data, hasLength(2));
@@ -2557,37 +2522,31 @@ void testMain() {
     },
   );
 
-  _testEach<_PointerEventContext>(
-    <_PointerEventContext>[
-      if (!isIosSafari) _PointerEventContext(),
-    ],
+  test(
     'ignores pointer up or pointer cancel events for unknown device',
-    (_PointerEventContext context) {
-      PointerBinding.instance!.debugOverrideDetector(context);
+    () {
+      final _PointerEventContext context = _PointerEventContext();
       final List<ui.PointerDataPacket> packets = <ui.PointerDataPacket>[];
-      ui.window.onPointerDataPacket = (ui.PointerDataPacket packet) {
+      ui.PlatformDispatcher.instance.onPointerDataPacket = (ui.PointerDataPacket packet) {
         packets.add(packet);
       };
 
       context.multiTouchUp(const <_TouchDetails>[
         _TouchDetails(pointer: 23, clientX: 200, clientY: 202),
-      ]).forEach(glassPane.dispatchEvent);
+      ]).forEach(rootElement.dispatchEvent);
       expect(packets, hasLength(0));
 
       context.multiTouchCancel(const <_TouchDetails>[
         _TouchDetails(pointer: 24, clientX: 200, clientY: 202),
-      ]).forEach(glassPane.dispatchEvent);
+      ]).forEach(rootElement.dispatchEvent);
       expect(packets, hasLength(0));
     },
   );
 
-  _testEach<_PointerEventContext>(
-    <_PointerEventContext>[
-      _PointerEventContext(),
-    ],
+  test(
     'handles random pointer id on up events',
-    (_PointerEventContext context) {
-      PointerBinding.instance!.debugOverrideDetector(context);
+    () {
+      final _PointerEventContext context = _PointerEventContext();
       // This happens with pens that are simulated with mouse events
       // (e.g. Wacom). It sends events with the pointer type "mouse", and
       // assigns a random pointer ID to each event.
@@ -2595,11 +2554,11 @@ void testMain() {
       // For more info, see: https://github.com/flutter/flutter/issues/75559
 
       final List<ui.PointerDataPacket> packets = <ui.PointerDataPacket>[];
-      ui.window.onPointerDataPacket = (ui.PointerDataPacket packet) {
+      ui.PlatformDispatcher.instance.onPointerDataPacket = (ui.PointerDataPacket packet) {
         packets.add(packet);
       };
 
-      glassPane.dispatchEvent(context.mouseDown(
+      rootElement.dispatchEvent(context.mouseDown(
         pointerId: 12,
         button: 0,
         buttons: 1,
@@ -2617,7 +2576,7 @@ void testMain() {
 
       expect(
         () {
-          glassPane.dispatchEvent(context.mouseUp(
+          rootElement.dispatchEvent(context.mouseUp(
             pointerId: 41,
             button: 0,
             buttons: 0,
@@ -2635,102 +2594,387 @@ void testMain() {
     },
   );
 
-  // TOUCH ADAPTER
+  test('throws if browser does not support pointer events', () {
+    expect(
+      () => PointerBinding(view, detector: MockPointerSupportDetector(false)),
+      throwsUnsupportedError,
+    );
+  });
 
-  _testEach<_TouchEventContext>(
-    <_TouchEventContext>[
-      if (!isIosSafari) _TouchEventContext(),
-    ],
-    'does calculate delta and pointer identifier correctly',
-    (_TouchEventContext context) {
-      // Mouse and Pointer are in another test since these tests can involve hovering
-      PointerBinding.instance!.debugOverrideDetector(context);
-      final List<ui.PointerDataPacket> packets = <ui.PointerDataPacket>[];
-      ui.window.onPointerDataPacket = (ui.PointerDataPacket packet) {
-        packets.add(packet);
-      };
+  group('ClickDebouncer', () {
+    _testClickDebouncer(getBinding: () => instance);
+  });
+}
 
-      context.multiTouchDown(const <_TouchDetails>[
-        _TouchDetails(pointer: 1, clientX: 20, clientY: 20),
-      ]).forEach(glassPane.dispatchEvent);
-      expect(packets, hasLength(1));
-      expect(packets[0].data, hasLength(2));
-      expect(packets[0].data[0].change, equals(ui.PointerChange.add));
-      expect(packets[0].data[0].pointerIdentifier, equals(1));
-      expect(packets[0].data[0].synthesized, isTrue);
-      expect(packets[0].data[0].physicalX, equals(20.0 * dpi));
-      expect(packets[0].data[0].physicalY, equals(20.0 * dpi));
-      expect(packets[0].data[0].physicalDeltaX, equals(0.0));
-      expect(packets[0].data[0].physicalDeltaY, equals(0.0));
+typedef CapturedSemanticsEvent = ({
+  ui.SemanticsAction type,
+  int nodeId,
+});
+
+void _testClickDebouncer({required PointerBinding Function() getBinding}) {
+  final DateTime testTime = DateTime(2018, 12, 17);
+  late List<ui.PointerChange> pointerPackets;
+  late List<CapturedSemanticsEvent> semanticsActions;
+  late _PointerEventContext context;
+  late PointerBinding binding;
+
+  void testWithSemantics(
+    String description,
+    Future<void> Function() body, {
+    Object? skip,
+  }) {
+    test(
+      description,
+      () async {
+        EngineSemantics.instance
+          ..debugOverrideTimestampFunction(() => testTime)
+          ..semanticsEnabled = true;
+        await body();
+        EngineSemantics.instance.semanticsEnabled = false;
+      },
+      skip: skip,
+    );
+  }
 
-      expect(packets[0].data[1].change, equals(ui.PointerChange.down));
-      expect(packets[0].data[1].pointerIdentifier, equals(1));
-      expect(packets[0].data[1].synthesized, isFalse);
-      expect(packets[0].data[1].physicalX, equals(20.0 * dpi));
-      expect(packets[0].data[1].physicalY, equals(20.0 * dpi));
-      expect(packets[0].data[1].physicalDeltaX, equals(0.0));
-      expect(packets[0].data[1].physicalDeltaY, equals(0.0));
-      packets.clear();
+  setUp(() {
+    context = _PointerEventContext();
+    pointerPackets = <ui.PointerChange>[];
+    semanticsActions = <CapturedSemanticsEvent>[];
+    ui.PlatformDispatcher.instance.onPointerDataPacket = (ui.PointerDataPacket packet) {
+      for (final ui.PointerData data in packet.data) {
+        pointerPackets.add(data.change);
+      }
+    };
+    EnginePlatformDispatcher.instance.onSemanticsActionEvent = (ui.SemanticsActionEvent event) {
+      semanticsActions.add((type: event.type, nodeId: event.nodeId));
+    };
+    binding = getBinding();
+  });
 
-      context.multiTouchMove(const <_TouchDetails>[
-        _TouchDetails(pointer: 1, clientX: 40, clientY: 30),
-      ]).forEach(glassPane.dispatchEvent);
-      expect(packets, hasLength(1));
-      expect(packets[0].data, hasLength(1));
-      expect(packets[0].data[0].change, equals(ui.PointerChange.move));
-      expect(packets[0].data[0].pointerIdentifier, equals(1));
-      expect(packets[0].data[0].synthesized, isFalse);
-      expect(packets[0].data[0].physicalX, equals(40.0 * dpi));
-      expect(packets[0].data[0].physicalY, equals(30.0 * dpi));
-      expect(packets[0].data[0].physicalDeltaX, equals(20.0 * dpi));
-      expect(packets[0].data[0].physicalDeltaY, equals(10.0 * dpi));
-      packets.clear();
+  test('Forwards to framework when semantics is off', () {
+    expect(EnginePlatformDispatcher.instance.semanticsEnabled, false);
+    expect(PointerBinding.clickDebouncer.isDebouncing, false);
+    binding.rootElement.dispatchEvent(context.primaryDown());
+    expect(pointerPackets, <ui.PointerChange>[
+      ui.PointerChange.add,
+      ui.PointerChange.down,
+    ]);
+    expect(PointerBinding.clickDebouncer.isDebouncing, false);
+    expect(semanticsActions, isEmpty);
+  });
 
-      context.multiTouchUp(const <_TouchDetails>[
-        _TouchDetails(pointer: 1, clientX: 40, clientY: 30),
-      ]).forEach(glassPane.dispatchEvent);
-      expect(packets, hasLength(1));
-      expect(packets[0].data, hasLength(2));
-      expect(packets[0].data[0].change, equals(ui.PointerChange.up));
-      expect(packets[0].data[0].pointerIdentifier, equals(1));
-      expect(packets[0].data[0].synthesized, isFalse);
-      expect(packets[0].data[0].physicalX, equals(40.0 * dpi));
-      expect(packets[0].data[0].physicalY, equals(30.0 * dpi));
-      expect(packets[0].data[0].physicalDeltaX, equals(0.0));
-      expect(packets[0].data[0].physicalDeltaY, equals(0.0));
+  testWithSemantics('Forwards to framework when not debouncing', () async {
+    expect(EnginePlatformDispatcher.instance.semanticsEnabled, true);
+    expect(PointerBinding.clickDebouncer.isDebouncing, false);
+
+    // This test DOM element is missing the `flt-tappable` attribute on purpose
+    // so that the debouncer does not debounce events and simply lets
+    // everything through.
+    final DomElement testElement = createDomElement('flt-semantics');
+    view.dom.semanticsHost.appendChild(testElement);
+
+    testElement.dispatchEvent(context.primaryDown());
+    testElement.dispatchEvent(context.primaryUp());
+    expect(PointerBinding.clickDebouncer.isDebouncing, false);
+
+    expect(pointerPackets, <ui.PointerChange>[
+      ui.PointerChange.add,
+      ui.PointerChange.down,
+      ui.PointerChange.up,
+    ]);
+    expect(semanticsActions, isEmpty);
+  });
 
-      expect(packets[0].data[1].change, equals(ui.PointerChange.remove));
-      expect(packets[0].data[1].pointerIdentifier, equals(1));
-      expect(packets[0].data[1].synthesized, isTrue);
-      expect(packets[0].data[1].physicalX, equals(40.0 * dpi));
-      expect(packets[0].data[1].physicalY, equals(30.0 * dpi));
-      expect(packets[0].data[1].physicalDeltaX, equals(0.0));
-      expect(packets[0].data[1].physicalDeltaY, equals(0.0));
-      packets.clear();
+  testWithSemantics('Accumulates pointer events starting from pointerdown', () async {
+    expect(EnginePlatformDispatcher.instance.semanticsEnabled, true);
+    expect(PointerBinding.clickDebouncer.isDebouncing, false);
 
-      context.multiTouchDown(const <_TouchDetails>[
-        _TouchDetails(pointer: 2, clientX: 20, clientY: 10),
-      ]).forEach(glassPane.dispatchEvent);
-      expect(packets, hasLength(1));
-      expect(packets[0].data, hasLength(2));
-      expect(packets[0].data[0].change, equals(ui.PointerChange.add));
-      expect(packets[0].data[0].pointerIdentifier, equals(2));
-      expect(packets[0].data[0].synthesized, isTrue);
-      expect(packets[0].data[0].physicalX, equals(20.0 * dpi));
-      expect(packets[0].data[0].physicalY, equals(10.0 * dpi));
-      expect(packets[0].data[0].physicalDeltaX, equals(0.0));
-      expect(packets[0].data[0].physicalDeltaY, equals(0.0));
+    final DomElement testElement = createDomElement('flt-semantics');
+    testElement.setAttribute('flt-tappable', '');
+    view.dom.semanticsHost.appendChild(testElement);
 
-      expect(packets[0].data[1].change, equals(ui.PointerChange.down));
-      expect(packets[0].data[1].pointerIdentifier, equals(2));
-      expect(packets[0].data[1].synthesized, isFalse);
-      expect(packets[0].data[1].physicalX, equals(20.0 * dpi));
-      expect(packets[0].data[1].physicalY, equals(10.0 * dpi));
-      expect(packets[0].data[1].physicalDeltaX, equals(0.0));
-      expect(packets[0].data[1].physicalDeltaY, equals(0.0));
-      packets.clear();
-    },
-  );
+    testElement.dispatchEvent(context.primaryDown());
+    expect(
+      reason: 'Should start debouncing at first pointerdown',
+      PointerBinding.clickDebouncer.isDebouncing,
+      true,
+    );
+
+    testElement.dispatchEvent(context.primaryUp());
+    expect(
+      reason: 'Should still be debouncing after pointerup',
+      PointerBinding.clickDebouncer.isDebouncing,
+      true,
+    );
+
+    expect(
+      reason: 'Events are withheld from the framework while debouncing',
+      pointerPackets,
+      <ui.PointerChange>[],
+    );
+    expect(
+      PointerBinding.clickDebouncer.debugState!.target,
+      testElement,
+    );
+    expect(
+      PointerBinding.clickDebouncer.debugState!.timer.isActive,
+      isTrue,
+    );
+    expect(
+      PointerBinding.clickDebouncer.debugState!.queue.map<String>((QueuedEvent e) => e.event.type),
+      <String>['pointerdown', 'pointerup'],
+    );
+
+    await Future<void>.delayed(const Duration(milliseconds: 250));
+    expect(
+      reason: 'Should stop debouncing after timer expires.',
+      PointerBinding.clickDebouncer.isDebouncing,
+      false,
+    );
+    expect(
+      reason: 'Queued up events should be flushed to the framework.',
+      pointerPackets,
+      <ui.PointerChange>[
+        ui.PointerChange.add,
+        ui.PointerChange.down,
+        ui.PointerChange.up,
+      ],
+    );
+    expect(semanticsActions, isEmpty);
+  });
+
+  testWithSemantics('Flushes events to framework when target changes', () async {
+    expect(EnginePlatformDispatcher.instance.semanticsEnabled, true);
+    expect(PointerBinding.clickDebouncer.isDebouncing, false);
+
+    final DomElement testElement = createDomElement('flt-semantics');
+    testElement.setAttribute('flt-tappable', '');
+    view.dom.semanticsHost.appendChild(testElement);
+
+    testElement.dispatchEvent(context.primaryDown());
+    expect(
+      reason: 'Should start debouncing at first pointerdown',
+      PointerBinding.clickDebouncer.isDebouncing,
+      true,
+    );
+
+    final DomElement newTarget = createDomElement('flt-semantics');
+    newTarget.setAttribute('flt-tappable', '');
+    view.dom.semanticsHost.appendChild(newTarget);
+    newTarget.dispatchEvent(context.primaryUp());
+
+    expect(
+      reason: 'Should stop debouncing when target changes.',
+      PointerBinding.clickDebouncer.isDebouncing,
+      false,
+    );
+    expect(
+      reason: 'The state should be cleaned up after stopping debouncing.',
+      PointerBinding.clickDebouncer.debugState,
+      isNull,
+    );
+    expect(
+      reason: 'Queued up events should be flushed to the framework.',
+      pointerPackets,
+      <ui.PointerChange>[
+        ui.PointerChange.add,
+        ui.PointerChange.down,
+        ui.PointerChange.up,
+      ],
+    );
+    expect(semanticsActions, isEmpty);
+  });
+
+  testWithSemantics('Forwards click to framework when not debouncing but listening', () async {
+    expect(PointerBinding.clickDebouncer.isDebouncing, false);
+
+    final DomElement testElement = createDomElement('flt-semantics');
+    testElement.setAttribute('flt-tappable', '');
+    view.dom.semanticsHost.appendChild(testElement);
+
+    final DomEvent click = createDomMouseEvent(
+      'click',
+      <Object?, Object?>{
+        'clientX': testElement.getBoundingClientRect().x,
+        'clientY': testElement.getBoundingClientRect().y,
+      }
+    );
+
+    PointerBinding.clickDebouncer.onClick(click, 42, true);
+    expect(PointerBinding.clickDebouncer.isDebouncing, false);
+    expect(pointerPackets, isEmpty);
+    expect(semanticsActions, <CapturedSemanticsEvent>[
+      (type: ui.SemanticsAction.tap, nodeId: 42)
+    ]);
+  });
+
+  testWithSemantics('Forwards click to framework when debouncing and listening', () async {
+    expect(PointerBinding.clickDebouncer.isDebouncing, false);
+
+    final DomElement testElement = createDomElement('flt-semantics');
+    testElement.setAttribute('flt-tappable', '');
+    view.dom.semanticsHost.appendChild(testElement);
+    testElement.dispatchEvent(context.primaryDown());
+    expect(PointerBinding.clickDebouncer.isDebouncing, true);
+
+    final DomEvent click = createDomMouseEvent(
+      'click',
+      <Object?, Object?>{
+        'clientX': testElement.getBoundingClientRect().x,
+        'clientY': testElement.getBoundingClientRect().y,
+      }
+    );
+
+    PointerBinding.clickDebouncer.onClick(click, 42, true);
+    expect(pointerPackets, isEmpty);
+    expect(semanticsActions, <CapturedSemanticsEvent>[
+      (type: ui.SemanticsAction.tap, nodeId: 42)
+    ]);
+  });
+
+  testWithSemantics('Dedupes click if debouncing but not listening', () async {
+    expect(PointerBinding.clickDebouncer.isDebouncing, false);
+
+    final DomElement testElement = createDomElement('flt-semantics');
+    testElement.setAttribute('flt-tappable', '');
+    view.dom.semanticsHost.appendChild(testElement);
+    testElement.dispatchEvent(context.primaryDown());
+    expect(PointerBinding.clickDebouncer.isDebouncing, true);
+
+    final DomEvent click = createDomMouseEvent(
+      'click',
+      <Object?, Object?>{
+        'clientX': testElement.getBoundingClientRect().x,
+        'clientY': testElement.getBoundingClientRect().y,
+      }
+    );
+
+    PointerBinding.clickDebouncer.onClick(click, 42, false);
+    expect(
+      reason: 'When tappable declares that it is not listening to click events '
+              'the debouncer flushes the pointer events to the framework and '
+              'lets it sort it out.',
+      pointerPackets,
+      <ui.PointerChange>[
+        ui.PointerChange.add,
+        ui.PointerChange.down,
+      ],
+    );
+    expect(semanticsActions, isEmpty);
+  });
+
+  testWithSemantics('Dedupes click if pointer down/up flushed recently', () async {
+    expect(EnginePlatformDispatcher.instance.semanticsEnabled, true);
+    expect(PointerBinding.clickDebouncer.isDebouncing, false);
+
+    final DomElement testElement = createDomElement('flt-semantics');
+    testElement.setAttribute('flt-tappable', '');
+    view.dom.semanticsHost.appendChild(testElement);
+
+    testElement.dispatchEvent(context.primaryDown());
+
+    // Simulate the user holding the pointer down for some time before releasing,
+    // such that the pointerup event happens close to timer expiration. This
+    // will create the situation that the click event arrives just after the
+    // pointerup is flushed. Forwarding the click to the framework would look
+    // like a double-click, so the click event is deduped.
+    await Future<void>.delayed(const Duration(milliseconds: 190));
+
+    testElement.dispatchEvent(context.primaryUp());
+    expect(PointerBinding.clickDebouncer.isDebouncing, true);
+    expect(
+      reason: 'Timer has not expired yet',
+      pointerPackets, isEmpty,
+    );
+
+    // Wait for the timer to expire to make sure pointer events are flushed.
+    await Future<void>.delayed(const Duration(milliseconds: 20));
+
+    expect(
+      reason: 'Queued up events should be flushed to the framework because the '
+              'time expired before the click event arrived.',
+      pointerPackets,
+      <ui.PointerChange>[
+        ui.PointerChange.add,
+        ui.PointerChange.down,
+        ui.PointerChange.up,
+      ],
+    );
+
+    final DomEvent click = createDomMouseEvent(
+      'click',
+      <Object?, Object?>{
+        'clientX': testElement.getBoundingClientRect().x,
+        'clientY': testElement.getBoundingClientRect().y,
+      }
+    );
+    PointerBinding.clickDebouncer.onClick(click, 42, true);
+
+    expect(
+      reason: 'Because the DOM click event was deduped.',
+      semanticsActions,
+      isEmpty,
+    );
+    // TODO(yjbanov): https://github.com/flutter/flutter/issues/142991.
+  }, skip: operatingSystem == OperatingSystem.windows);
+
+  testWithSemantics('Forwards click if enough time passed after the last flushed pointerup', () async {
+    expect(EnginePlatformDispatcher.instance.semanticsEnabled, true);
+    expect(PointerBinding.clickDebouncer.isDebouncing, false);
+
+    final DomElement testElement = createDomElement('flt-semantics');
+    testElement.setAttribute('flt-tappable', '');
+    view.dom.semanticsHost.appendChild(testElement);
+
+    testElement.dispatchEvent(context.primaryDown());
+
+    // Simulate the user holding the pointer down for some time before releasing,
+    // such that the pointerup event happens close to timer expiration. This
+    // makes it possible for the click to arrive early. However, this test in
+    // particular will delay the click to check that the delay is checked
+    // correctly. The inverse situation was already tested in the previous test.
+    await Future<void>.delayed(const Duration(milliseconds: 190));
+
+    testElement.dispatchEvent(context.primaryUp());
+    expect(PointerBinding.clickDebouncer.isDebouncing, true);
+    expect(
+      reason: 'Timer has not expired yet',
+      pointerPackets, isEmpty,
+    );
+
+    // Wait for the timer to expire to make sure pointer events are flushed.
+    await Future<void>.delayed(const Duration(milliseconds: 100));
+
+    expect(
+      reason: 'Queued up events should be flushed to the framework because the '
+              'time expired before the click event arrived.',
+      pointerPackets,
+      <ui.PointerChange>[
+        ui.PointerChange.add,
+        ui.PointerChange.down,
+        ui.PointerChange.up,
+      ],
+    );
+
+    final DomEvent click = createDomMouseEvent(
+      'click',
+      <Object?, Object?>{
+        'clientX': testElement.getBoundingClientRect().x,
+        'clientY': testElement.getBoundingClientRect().y,
+      }
+    );
+    PointerBinding.clickDebouncer.onClick(click, 42, true);
+
+    expect(
+      reason: 'The DOM click should still be sent to the framework because it '
+              'happened far enough from the last pointerup that it is unlikely '
+              'to be a duplicate.',
+      semanticsActions,
+      <CapturedSemanticsEvent>[
+        (type: ui.SemanticsAction.tap, nodeId: 42)
+      ],
+    );
+  });
 }
 
 class MockSafariPointerEventWorkaround implements SafariPointerEventWorkaround {
@@ -2740,13 +2984,14 @@ class MockSafariPointerEventWorkaround implements SafariPointerEventWorkaround {
   void workAroundMissingPointerEvents() {
     workAroundInvoked = true;
   }
+
+  @override
+  void dispose() {}
 }
 
-abstract class _BasicEventContext implements PointerSupportDetector {
+abstract class _BasicEventContext {
   String get name;
 
-  bool get isSupported;
-
   // Accepted modifier keys are 'Alt', 'Control', 'Meta' and 'Shift'.
   // https://www.w3.org/TR/uievents-key/#keys-modifier defines more modifiers,
   // but only the four main modifiers could be set from MouseEvent, PointerEvent
@@ -2854,22 +3099,37 @@ mixin _ButtonedEventMixin on _BasicEventContext {
     required double? clientY,
     required double? deltaX,
     required double? deltaY,
+    double? wheelDeltaX,
+    double? wheelDeltaY,
+    int? timeStamp,
+    bool ctrlKey = false,
   }) {
-    final Function jsWheelEvent = js_util.getProperty<Function>(domWindow, 'WheelEvent');
-    final List<dynamic> eventArgs = <dynamic>[
-      'wheel',
-      <String, dynamic>{
-        'buttons': buttons,
-        'clientX': clientX,
-        'clientY': clientY,
-        'deltaX': deltaX,
-        'deltaY': deltaY,
-      }
-    ];
-    return js_util.callConstructor<DomEvent>(
-      jsWheelEvent,
-      js_util.jsify(eventArgs) as List<Object?>,
-    );
+    final DomEvent event = createDomWheelEvent('wheel', <String, Object>{
+        if (buttons != null) 'buttons': buttons,
+        if (clientX != null) 'clientX': clientX,
+        if (clientY != null) 'clientY': clientY,
+        if (deltaX != null) 'deltaX': deltaX,
+        if (deltaY != null) 'deltaY': deltaY,
+        if (wheelDeltaX != null) 'wheelDeltaX': wheelDeltaX,
+        if (wheelDeltaY != null) 'wheelDeltaY': wheelDeltaY,
+        'ctrlKey': ctrlKey,
+    });
+    // timeStamp can't be set in the constructor, need to override the getter.
+    if (timeStamp != null) {
+      js_util.callMethod<void>(
+        objectConstructor,
+        'defineProperty',
+        <dynamic>[
+          event,
+          'timeStamp',
+          js_util.jsify(<String, dynamic>{
+            'value': timeStamp,
+            'configurable': true
+          })
+        ]
+      );
+    }
+    return event;
   }
 }
 
@@ -2921,231 +3181,16 @@ mixin _MultiPointerEventMixin on _BasicEventContext {
   }
 }
 
-// A test context for `_TouchAdapter`, including its name, PointerSupportDetector
-// to override, and how to generate events.
-class _TouchEventContext extends _BasicEventContext
-    with _MultiPointerEventMixin
-    implements PointerSupportDetector {
-  _TouchEventContext() : _target = domDocument.createElement('div');
-
-  @override
-  String get name => 'TouchAdapter';
-
-  @override
-  bool get isSupported => _defaultSupportDetector.hasTouchEvents;
-
-  @override
-  bool get hasPointerEvents => false;
-
-  @override
-  bool get hasTouchEvents => true;
-
-  @override
-  bool get hasMouseEvents => false;
-
-  final DomEventTarget _target;
-
-  DomTouch _createTouch({
-    int? identifier,
-    double? clientX,
-    double? clientY,
-  }) {
-    return createDomTouch(<String, dynamic>{
-      'identifier': identifier,
-      'clientX': clientX,
-      'clientY': clientY,
-      'target': _target,
-    });
-  }
-
-  DomTouchEvent _createTouchEvent(
-      String eventType, List<_TouchDetails> touches) {
-    return createDomTouchEvent(
-      eventType,
-      <String, dynamic>{
-        'changedTouches': touches
-            .map(
-              (_TouchDetails details) => _createTouch(
-                identifier: details.pointer,
-                clientX: details.clientX,
-                clientY: details.clientY,
-              ),
-            )
-            .toList(),
-        'altKey': altPressed,
-        'ctrlKey': ctrlPressed,
-        'metaKey': metaPressed,
-        'shiftKey': shiftPressed,
-      },
-    );
-  }
-
-  @override
-  List<DomEvent> multiTouchDown(List<_TouchDetails> touches) {
-    return <DomEvent>[_createTouchEvent('touchstart', touches)];
-  }
-
-  @override
-  List<DomEvent> multiTouchMove(List<_TouchDetails> touches) {
-    return <DomEvent>[_createTouchEvent('touchmove', touches)];
-  }
-
-  @override
-  List<DomEvent> multiTouchUp(List<_TouchDetails> touches) {
-    return <DomEvent>[_createTouchEvent('touchend', touches)];
-  }
-
-  @override
-  List<DomEvent> multiTouchCancel(List<_TouchDetails> touches) {
-    return <DomEvent>[_createTouchEvent('touchcancel', touches)];
-  }
-}
-
-// A test context for `_MouseAdapter`, including its name, PointerSupportDetector
-// to override, and how to generate events.
-//
-// For the difference between MouseEvent and PointerEvent, see _MouseAdapter.
-class _MouseEventContext extends _BasicEventContext
-    with _ButtonedEventMixin
-    implements PointerSupportDetector {
-  @override
-  String get name => 'MouseAdapter';
-
-  @override
-  bool get isSupported => _defaultSupportDetector.hasMouseEvents;
-
-  @override
-  bool get hasPointerEvents => false;
-
-  @override
-  bool get hasTouchEvents => false;
-
-  @override
-  bool get hasMouseEvents => true;
-
-  @override
-  DomEvent mouseDown({
-    double? clientX,
-    double? clientY,
-    int? button,
-    int? buttons,
-  }) {
-    return _createMouseEvent(
-      'mousedown',
-      buttons: buttons,
-      button: button,
-      clientX: clientX,
-      clientY: clientY,
-    );
-  }
-
-  @override
-  DomEvent mouseMove({
-    double? clientX,
-    double? clientY,
-    required int button,
-    required int buttons,
-  }) {
-    final bool hasButtonChange = button != _kNoButtonChange;
-    final bool changeIsButtonDown =
-        hasButtonChange && (buttons & convertButtonToButtons(button)) != 0;
-    final String adjustedType = !hasButtonChange
-        ? 'mousemove'
-        : changeIsButtonDown
-            ? 'mousedown'
-            : 'mouseup';
-    final int adjustedButton = hasButtonChange ? button : 0;
-    return _createMouseEvent(
-      adjustedType,
-      buttons: buttons,
-      button: adjustedButton,
-      clientX: clientX,
-      clientY: clientY,
-    );
-  }
-
-  @override
-  DomEvent mouseLeave({
-    double? clientX,
-    double? clientY,
-    required int buttons,
-  }) {
-    return _createMouseEvent(
-      'mouseleave',
-      buttons: buttons,
-      button: 0,
-      clientX: clientX,
-      clientY: clientY,
-    );
-  }
-
-  @override
-  DomEvent mouseUp({
-    double? clientX,
-    double? clientY,
-    int? button,
-    int? buttons,
-  }) {
-    return _createMouseEvent(
-      'mouseup',
-      buttons: buttons,
-      button: button,
-      clientX: clientX,
-      clientY: clientY,
-    );
-  }
-
-  DomMouseEvent _createMouseEvent(
-    String type, {
-    int? buttons,
-    int? button,
-    double? clientX,
-    double? clientY,
-  }) {
-    final Function jsMouseEvent =
-        js_util.getProperty<Function>(domWindow, 'MouseEvent');
-    final List<dynamic> eventArgs = <dynamic>[
-      type,
-      <String, dynamic>{
-        'buttons': buttons,
-        'button': button,
-        'clientX': clientX,
-        'clientY': clientY,
-        'altKey': altPressed,
-        'ctrlKey': ctrlPressed,
-        'metaKey': metaPressed,
-        'shiftKey': shiftPressed,
-      }
-    ];
-    return js_util.callConstructor<DomMouseEvent>(
-      jsMouseEvent,
-      js_util.jsify(eventArgs) as List<Object?>,
-    );
-  }
-}
-
-// A test context for `_PointerAdapter`, including its name, PointerSupportDetector
-// to override, and how to generate events.
+// A test context for `_PointerAdapter`, including its name, and how to generate
+// events.
 //
 // For the difference between MouseEvent and PointerEvent, see _MouseAdapter.
 class _PointerEventContext extends _BasicEventContext
     with _ButtonedEventMixin
-    implements PointerSupportDetector, _MultiPointerEventMixin {
+    implements _MultiPointerEventMixin {
   @override
   String get name => 'PointerAdapter';
 
-  @override
-  bool get isSupported => _defaultSupportDetector.hasPointerEvents;
-
-  @override
-  bool get hasPointerEvents => true;
-
-  @override
-  bool get hasTouchEvents => false;
-
-  @override
-  bool get hasMouseEvents => false;
-
   @override
   List<DomEvent> multiTouchDown(List<_TouchDetails> touches) {
     return touches
@@ -3187,6 +3232,7 @@ class _PointerEventContext extends _BasicEventContext
     String? pointerType,
   }) {
     return createDomPointerEvent('pointerdown', <String, dynamic>{
+      'bubbles': true,
       'pointerId': pointer,
       'button': button,
       'buttons': buttons,
@@ -3241,6 +3287,7 @@ class _PointerEventContext extends _BasicEventContext
     String? pointerType,
   }) {
     return createDomPointerEvent('pointermove', <String, dynamic>{
+      'bubbles': true,
       'pointerId': pointer,
       'button': button,
       'buttons': buttons,
@@ -3276,6 +3323,7 @@ class _PointerEventContext extends _BasicEventContext
     String? pointerType,
   }) {
     return createDomPointerEvent('pointerleave', <String, dynamic>{
+      'bubbles': true,
       'pointerId': pointer,
       'button': button,
       'buttons': buttons,
@@ -3325,6 +3373,7 @@ class _PointerEventContext extends _BasicEventContext
     String? pointerType,
   }) {
     return createDomPointerEvent('pointerup', <String, dynamic>{
+      'bubbles': true,
       'pointerId': pointer,
       'button': button,
       'buttons': buttons,
@@ -3339,6 +3388,7 @@ class _PointerEventContext extends _BasicEventContext
     return touches
         .map((_TouchDetails details) =>
             createDomPointerEvent('pointercancel', <String, dynamic>{
+              'bubbles': true,
               'pointerId': details.pointer,
               'button': 0,
               'buttons': 0,
@@ -3349,3 +3399,10 @@ class _PointerEventContext extends _BasicEventContext
         .toList();
   }
 }
+
+class MockPointerSupportDetector implements PointerSupportDetector {
+  MockPointerSupportDetector(this.hasPointerEvents);
+
+  @override
+  final bool hasPointerEvents;
+}
diff --git a/lib/web_ui/test/engine/profiler_test.dart b/lib/web_ui/test/engine/profiler_test.dart
index 16299147480e1b4d0c3538b3b86eb4ad99aa6f63..5f113891eaa9f3d592fe108386f1c9c6c82dadfc 100644
--- a/lib/web_ui/test/engine/profiler_test.dart
+++ b/lib/web_ui/test/engine/profiler_test.dart
@@ -2,13 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:js_util' as js_util;
+import 'dart:js_interop';
 
 import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
-import '../spy.dart';
+import '../common/spy.dart';
+
+@JS('window._flutter_internal_on_benchmark')
+external set jsBenchmarkValueCallback(JSAny? object);
 
 void main() {
   internalBootstrapBrowserTest(() => testMain);
@@ -25,13 +29,29 @@ void testMain() {
 }
 
 void _profilerTests() {
+  final List<String> warnings = <String>[];
+  late void Function(String) oldPrintWarning;
+
+  setUpAll(() {
+    oldPrintWarning = printWarning;
+    printWarning = (String warning) {
+      warnings.add(warning);
+    };
+  });
+
   setUp(() {
+    warnings.clear();
     Profiler.isBenchmarkMode = true;
     Profiler.ensureInitialized();
   });
 
+  tearDownAll(() {
+    printWarning = oldPrintWarning;
+  });
+
   tearDown(() {
-    jsOnBenchmark(null);
+    jsBenchmarkValueCallback = null;
+    ui_web.benchmarkValueCallback = null;
     Profiler.isBenchmarkMode = false;
   });
 
@@ -41,44 +61,116 @@ void _profilerTests() {
 
   test('can listen to benchmarks', () {
     final List<BenchmarkDatapoint> data = <BenchmarkDatapoint>[];
-    jsOnBenchmark(allowInterop((String name, num value) {
-      data.add(BenchmarkDatapoint(name, value));
-    }));
+    ui_web.benchmarkValueCallback = (String name, double value) {
+      data.add((name, value));
+    };
 
     Profiler.instance.benchmark('foo', 123);
-    expect(data, <BenchmarkDatapoint>[BenchmarkDatapoint('foo', 123)]);
+    expect(data, <BenchmarkDatapoint>[('foo', 123)]);
     data.clear();
 
     Profiler.instance.benchmark('bar', 0.0125);
-    expect(data, <BenchmarkDatapoint>[BenchmarkDatapoint('bar', 0.0125)]);
+    expect(data, <BenchmarkDatapoint>[('bar', 0.0125)]);
     data.clear();
 
     // Remove listener and make sure nothing breaks and the data isn't being
     // sent to the old callback anymore.
-    jsOnBenchmark(null);
+    ui_web.benchmarkValueCallback = null;
     expect(() => Profiler.instance.benchmark('baz', 99.999), returnsNormally);
     expect(data, isEmpty);
   });
 
-  test('throws on wrong listener type', () {
-    final List<BenchmarkDatapoint> data = <BenchmarkDatapoint>[];
+  // TODO(mdebbar): Remove this group once the JS API is removed.
+  // https://github.com/flutter/flutter/issues/127395
+  group('[JS API]', () {
+    test('can listen to benchmarks', () {
+      final List<BenchmarkDatapoint> data = <BenchmarkDatapoint>[];
+      jsBenchmarkValueCallback = (String name, double value) {
+        data.add((name, value));
+      }.toJS;
+
+      Profiler.instance.benchmark('foo', 123);
+      expect(warnings, hasLength(1));
+      expect(warnings.single, contains('deprecated'));
+      expect(warnings.single, contains('benchmarkValueCallback'));
+      expect(warnings.single, contains('dart:ui_web'));
+      warnings.clear();
+
+      expect(data, <BenchmarkDatapoint>[('foo', 123)]);
+      data.clear();
+
+      Profiler.instance.benchmark('bar', 0.0125);
+      expect(data, <BenchmarkDatapoint>[('bar', 0.0125)]);
+      data.clear();
+
+      // Remove listener and make sure nothing breaks and the data isn't being
+      // sent to the old callback anymore.
+      jsBenchmarkValueCallback = null;
+      expect(() => Profiler.instance.benchmark('baz', 99.999), returnsNormally);
+      expect(data, isEmpty);
+    });
 
-    // Wrong callback signature.
-    jsOnBenchmark(allowInterop((num value) {
-      data.add(BenchmarkDatapoint('bad', value));
-    }));
-    expect(
-      () => Profiler.instance.benchmark('foo', 123),
-      throwsA(isA<NoSuchMethodError>()),
-    );
-    expect(data, isEmpty);
+    test('throws on wrong listener type', () {
+      final List<BenchmarkDatapoint> data = <BenchmarkDatapoint>[];
+
+      // Wrong callback signature.
+      jsBenchmarkValueCallback = (double value) {
+        data.add(('bad', value));
+      }.toJS;
+      expect(
+        () => Profiler.instance.benchmark('foo', 123),
 
-    // Not even a callback.
-    jsOnBenchmark('string');
-    expect(
-      () => Profiler.instance.benchmark('foo', 123),
-      throwsA(isA<TypeError>()),
-    );
+        // dart2js throws a NoSuchMethodError, dart2wasm throws a TypeError here.
+        // Just make sure it throws an error in this case.
+        throwsA(isA<Error>()),
+      );
+      expect(data, isEmpty);
+
+      // Not even a callback.
+      jsBenchmarkValueCallback = 'string'.toJS;
+      expect(
+        () => Profiler.instance.benchmark('foo', 123),
+        // dart2js throws a TypeError, while dart2wasm throws an explicit
+        // exception.
+        throwsA(anything),
+      );
+    });
+
+    test('can be combined with ui_web API', () {
+      final List<BenchmarkDatapoint> uiWebData = <BenchmarkDatapoint>[];
+      final List<BenchmarkDatapoint> jsData = <BenchmarkDatapoint>[];
+
+      ui_web.benchmarkValueCallback = (String name, double value) {
+        uiWebData.add((name, value));
+      };
+      jsBenchmarkValueCallback = (String name, double value) {
+        jsData.add((name, value));
+      }.toJS;
+
+      Profiler.instance.benchmark('foo', 123);
+      expect(warnings, hasLength(1));
+      expect(warnings.single, contains('deprecated'));
+      expect(warnings.single, contains('benchmarkValueCallback'));
+      expect(warnings.single, contains('dart:ui_web'));
+      warnings.clear();
+
+      expect(uiWebData, <BenchmarkDatapoint>[('foo', 123)]);
+      expect(jsData, <BenchmarkDatapoint>[('foo', 123)]);
+      uiWebData.clear();
+      jsData.clear();
+
+      Profiler.instance.benchmark('bar', 0.0125);
+      expect(uiWebData, <BenchmarkDatapoint>[('bar', 0.0125)]);
+      expect(jsData, <BenchmarkDatapoint>[('bar', 0.0125)]);
+      uiWebData.clear();
+      jsData.clear();
+
+      ui_web.benchmarkValueCallback = null;
+      jsBenchmarkValueCallback = null;
+      expect(() => Profiler.instance.benchmark('baz', 99.999), returnsNormally);
+      expect(uiWebData, isEmpty);
+      expect(jsData, isEmpty);
+    });
   });
 }
 
@@ -128,38 +220,4 @@ void _instrumentationTests() {
   });
 }
 
-class BenchmarkDatapoint {
-  BenchmarkDatapoint(this.name, this.value);
-
-  final String name;
-  final num value;
-
-  @override
-  int get hashCode => Object.hash(name, value);
-
-  @override
-  bool operator ==(Object other) {
-    if (identical(this, other)) {
-      return true;
-    }
-    if (other.runtimeType != runtimeType) {
-      return false;
-    }
-    return other is BenchmarkDatapoint
-        && other.name == name
-        && other.value == value;
-  }
-
-  @override
-  String toString() {
-    return '$runtimeType("$name", $value)';
-  }
-}
-
-void jsOnBenchmark(dynamic listener) {
-  js_util.setProperty(
-    domWindow,
-    '_flutter_internal_on_benchmark',
-    listener
-  );
-}
+typedef BenchmarkDatapoint = (String, double);
diff --git a/lib/web_ui/test/raw_keyboard_test.dart b/lib/web_ui/test/engine/raw_keyboard_test.dart
similarity index 81%
rename from lib/web_ui/test/raw_keyboard_test.dart
rename to lib/web_ui/test/engine/raw_keyboard_test.dart
index 0f137ff42df9568c5abf0f8d88ad6395084870e9..cece887b9914944bd30f488455ebbd0a9df12b9c 100644
--- a/lib/web_ui/test/raw_keyboard_test.dart
+++ b/lib/web_ui/test/engine/raw_keyboard_test.dart
@@ -2,16 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:js_util' as js_util;
 import 'dart:typed_data';
 
 import 'package:quiver/testing/async.dart';
 import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
-import 'package:ui/src/engine/dom.dart';
-import 'package:ui/src/engine/raw_keyboard.dart';
-import 'package:ui/src/engine/services.dart';
-import 'package:ui/src/engine/text_editing/text_editing.dart';
+import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
 
 void main() {
@@ -20,15 +16,15 @@ void main() {
 
 void testMain() {
   group('RawKeyboard', () {
-    /// Used to save and restore [ui.window.onPlatformMessage] after each test.
+    /// Used to save and restore [PlatformDispatcher.onPlatformMessage] after each test.
     ui.PlatformMessageCallback? savedCallback;
 
     setUp(() {
-      savedCallback = ui.window.onPlatformMessage;
+      savedCallback = ui.PlatformDispatcher.instance.onPlatformMessage;
     });
 
     tearDown(() {
-      ui.window.onPlatformMessage = savedCallback;
+      ui.PlatformDispatcher.instance.onPlatformMessage = savedCallback;
     });
 
     test('initializes and disposes', () {
@@ -44,7 +40,7 @@ void testMain() {
 
       String? channelReceived;
       Map<String, dynamic>? dataReceived;
-      ui.window.onPlatformMessage = (String channel, ByteData? data,
+      ui.PlatformDispatcher.instance.onPlatformMessage = (String channel, ByteData? data,
           ui.PlatformMessageResponseCallback? callback) {
         channelReceived = channel;
         dataReceived = const JSONMessageCodec().decodeMessage(data) as Map<String, dynamic>?;
@@ -52,6 +48,10 @@ void testMain() {
 
       DomKeyboardEvent event;
 
+      // Dispatch a keydown event first so that KeyboardBinding will recognize the keyup event.
+      // and will not set preventDefault on it.
+      event = dispatchKeyboardEvent('keydown', key: 'SomeKey', code: 'SomeCode', keyCode: 1);
+
       event = dispatchKeyboardEvent('keyup', key: 'SomeKey', code: 'SomeCode', keyCode: 1);
 
       expect(event.defaultPrevented, isFalse);
@@ -74,7 +74,7 @@ void testMain() {
 
       String? channelReceived;
       Map<String, dynamic>? dataReceived;
-      ui.window.onPlatformMessage = (String channel, ByteData? data,
+      ui.PlatformDispatcher.instance.onPlatformMessage = (String channel, ByteData? data,
           ui.PlatformMessageResponseCallback? callback) {
         channelReceived = channel;
         dataReceived = const JSONMessageCodec().decodeMessage(data) as Map<String, dynamic>?;
@@ -104,7 +104,7 @@ void testMain() {
       RawKeyboard.initialize();
 
       Map<String, dynamic>? dataReceived;
-      ui.window.onPlatformMessage = (String channel, ByteData? data,
+      ui.PlatformDispatcher.instance.onPlatformMessage = (String channel, ByteData? data,
           ui.PlatformMessageResponseCallback? callback) {
         dataReceived = const JSONMessageCodec().decodeMessage(data) as Map<String, dynamic>?;
       };
@@ -152,11 +152,72 @@ void testMain() {
       RawKeyboard.instance!.dispose();
     });
 
+    // Regression test for https://github.com/flutter/flutter/issues/125672.
+    test('updates meta state for Meta key and wrong DOM event metaKey value (Linux)', () {
+      RawKeyboard.initialize();
+
+      Map<String, dynamic>? dataReceived;
+      ui.PlatformDispatcher.instance.onPlatformMessage = (String channel, ByteData? data,
+          ui.PlatformMessageResponseCallback? callback) {
+        dataReceived = const JSONMessageCodec().decodeMessage(data) as Map<String, dynamic>?;
+      };
+
+      // Purposely send an incoherent DOM event where Meta key is pressed but event.metaKey is not set to true.
+      final DomKeyboardEvent event = dispatchKeyboardEvent(
+        'keydown',
+        key: 'Meta',
+        code: 'MetaLeft',
+      );
+      expect(event.defaultPrevented, isFalse);
+      expect(dataReceived, <String, dynamic>{
+        'type': 'keydown',
+        'keymap': 'web',
+        'code': 'MetaLeft',
+        'key': 'Meta',
+        'location': 0,
+        'metaState': 0x8,
+        'keyCode': 0,
+      });
+      RawKeyboard.instance!.dispose();
+    }, skip: operatingSystem != OperatingSystem.linux);
+
+    // Regression test for https://github.com/flutter/flutter/issues/141186.
+    test('updates meta state for Meta key seen as "Process" key', () {
+      RawKeyboard.initialize();
+
+      Map<String, dynamic>? dataReceived;
+      ui.PlatformDispatcher.instance.onPlatformMessage = (String channel, ByteData? data,
+          ui.PlatformMessageResponseCallback? callback) {
+        dataReceived = const JSONMessageCodec().decodeMessage(data) as Map<String, dynamic>?;
+      };
+
+      // Purposely send a DOM event where Meta key is pressed but event.metaKey is not set to true.
+      // This can happen when the Meta key is seen as the 'Process' key.
+      final DomKeyboardEvent event = dispatchKeyboardEvent(
+        'keydown',
+        key: 'Process',
+        code: 'MetaLeft',
+        location: 1,
+        keyCode: 229,
+      );
+      expect(event.defaultPrevented, isFalse);
+      expect(dataReceived, <String, dynamic>{
+        'type': 'keydown',
+        'keymap': 'web',
+        'code': 'MetaLeft',
+        'key': 'Process',
+        'location': 1,
+        'metaState': 0x8,
+        'keyCode': 229,
+      });
+      RawKeyboard.instance!.dispose();
+    });
+
     test('dispatches repeat events', () {
       RawKeyboard.initialize();
 
       final List<Map<String, dynamic>> messages = <Map<String, dynamic>>[];
-      ui.window.onPlatformMessage = (String channel, ByteData? data,
+      ui.PlatformDispatcher.instance.onPlatformMessage = (String channel, ByteData? data,
           ui.PlatformMessageResponseCallback? callback) {
         messages.add(const JSONMessageCodec().decodeMessage(data) as Map<String, dynamic>);
       };
@@ -209,7 +270,7 @@ void testMain() {
       RawKeyboard.initialize();
 
       int count = 0;
-      ui.window.onPlatformMessage = (String channel, ByteData? data,
+      ui.PlatformDispatcher.instance.onPlatformMessage = (String channel, ByteData? data,
           ui.PlatformMessageResponseCallback? callback) {
         count += 1;
       };
@@ -233,7 +294,7 @@ void testMain() {
       RawKeyboard.initialize();
 
       int count = 0;
-      ui.window.onPlatformMessage = (String channel, ByteData? data,
+      ui.PlatformDispatcher.instance.onPlatformMessage = (String channel, ByteData? data,
           ui.PlatformMessageResponseCallback? callback) {
         count += 1;
         final ByteData response = const JSONMessageCodec().encodeMessage(<String, dynamic>{'handled': true})!;
@@ -256,7 +317,7 @@ void testMain() {
       RawKeyboard.initialize();
 
       int count = 0;
-      ui.window.onPlatformMessage = (String channel, ByteData? data,
+      ui.PlatformDispatcher.instance.onPlatformMessage = (String channel, ByteData? data,
           ui.PlatformMessageResponseCallback? callback) {
         count += 1;
         final ByteData response = const JSONMessageCodec().encodeMessage(<String, dynamic>{'handled': false})!;
@@ -279,7 +340,7 @@ void testMain() {
       RawKeyboard.initialize();
 
       int count = 0;
-      ui.window.onPlatformMessage = (String channel, ByteData? data,
+      ui.PlatformDispatcher.instance.onPlatformMessage = (String channel, ByteData? data,
           ui.PlatformMessageResponseCallback? callback) {
         count += 1;
       };
@@ -305,7 +366,7 @@ void testMain() {
       RawKeyboard.initialize();
 
       int count = 0;
-      ui.window.onPlatformMessage = (String channel, ByteData? data,
+      ui.PlatformDispatcher.instance.onPlatformMessage = (String channel, ByteData? data,
           ui.PlatformMessageResponseCallback? callback) {
         count += 1;
         final ByteData response = const JSONMessageCodec().encodeMessage(<String, dynamic>{'handled': true})!;
@@ -331,7 +392,7 @@ void testMain() {
       RawKeyboard.initialize();
 
       int count = 0;
-      ui.window.onPlatformMessage = (String channel, ByteData? data,
+      ui.PlatformDispatcher.instance.onPlatformMessage = (String channel, ByteData? data,
           ui.PlatformMessageResponseCallback? callback) {
         count += 1;
         final ByteData response = const JSONMessageCodec()
@@ -362,7 +423,7 @@ void testMain() {
         RawKeyboard.initialize(onMacOs: true);
 
         final List<Map<String, dynamic>> messages = <Map<String, dynamic>>[];
-        ui.window.onPlatformMessage = (String channel, ByteData? data,
+        ui.PlatformDispatcher.instance.onPlatformMessage = (String channel, ByteData? data,
             ui.PlatformMessageResponseCallback? callback) {
           messages.add(const JSONMessageCodec().decodeMessage(data) as Map<String, dynamic>);
         };
@@ -485,7 +546,7 @@ void testMain() {
         RawKeyboard.initialize(onMacOs: true);
 
         final List<Map<String, dynamic>> messages = <Map<String, dynamic>>[];
-        ui.window.onPlatformMessage = (String channel, ByteData? data,
+        ui.PlatformDispatcher.instance.onPlatformMessage = (String channel, ByteData? data,
             ui.PlatformMessageResponseCallback? callback) {
           messages.add(const JSONMessageCodec().decodeMessage(data) as Map<String, dynamic>);
         };
@@ -567,7 +628,7 @@ void testMain() {
         RawKeyboard.initialize();
 
         final List<Map<String, dynamic>> messages = <Map<String, dynamic>>[];
-        ui.window.onPlatformMessage = (String channel, ByteData? data,
+        ui.PlatformDispatcher.instance.onPlatformMessage = (String channel, ByteData? data,
             ui.PlatformMessageResponseCallback? callback) {
           messages.add(const JSONMessageCodec().decodeMessage(data) as Map<String, dynamic>);
         };
@@ -597,7 +658,7 @@ void testMain() {
       RawKeyboard.initialize(onMacOs: true);
 
       final List<Map<String, dynamic>> messages = <Map<String, dynamic>>[];
-      ui.window.onPlatformMessage = (String channel, ByteData? data,
+      ui.PlatformDispatcher.instance.onPlatformMessage = (String channel, ByteData? data,
           ui.PlatformMessageResponseCallback? callback) {
         messages.add(const JSONMessageCodec().decodeMessage(data) as Map<String, dynamic>);
       };
@@ -661,7 +722,7 @@ void testMain() {
         RawKeyboard.initialize(); // onMacOs: false
 
         final List<Map<String, dynamic>> messages = <Map<String, dynamic>>[];
-        ui.window.onPlatformMessage = (String channel, ByteData? data,
+        ui.PlatformDispatcher.instance.onPlatformMessage = (String channel, ByteData? data,
             ui.PlatformMessageResponseCallback? callback) {
           messages.add(const JSONMessageCodec().decodeMessage(data) as Map<String, dynamic>);
         };
@@ -748,29 +809,20 @@ DomKeyboardEvent dispatchKeyboardEvent(
 }) {
   target ??= domWindow;
 
-  final Function jsKeyboardEvent =
-      js_util.getProperty<Function>(domWindow, 'KeyboardEvent');
-  final List<dynamic> eventArgs = <dynamic>[
-    type,
-    <String, dynamic>{
-      'key': key,
-      'code': code,
-      'location': location,
-      'repeat': repeat,
-      'shiftKey': isShiftPressed,
-      'altKey': isAltPressed,
-      'ctrlKey': isControlPressed,
-      'metaKey': isMetaPressed,
-      'isComposing': isComposing,
-      'keyCode': keyCode,
-      'bubbles': true,
-      'cancelable': true,
-    }
-  ];
-  final DomKeyboardEvent event = js_util.callConstructor<DomKeyboardEvent>(
-    jsKeyboardEvent,
-    js_util.jsify(eventArgs) as List<Object?>,
-  );
+  final DomKeyboardEvent event = createDomKeyboardEvent(type, <String, Object> {
+    if (key != null) 'key': key,
+    if (code != null) 'code': code,
+    'location': location,
+    'repeat': repeat,
+    'shiftKey': isShiftPressed,
+    'altKey': isAltPressed,
+    'ctrlKey': isControlPressed,
+    'metaKey': isMetaPressed,
+    'isComposing': isComposing,
+    'keyCode': keyCode,
+    'bubbles': true,
+    'cancelable': true,
+  });
   target.dispatchEvent(event);
 
   return event;
diff --git a/lib/web_ui/test/engine/recording_canvas_test.dart b/lib/web_ui/test/engine/recording_canvas_test.dart
index e5ae2c462afe0a16953f205592f0ab9353476937..db122e5d8e6827377f79b68cd10168a07f61f480 100644
--- a/lib/web_ui/test/engine/recording_canvas_test.dart
+++ b/lib/web_ui/test/engine/recording_canvas_test.dart
@@ -7,16 +7,18 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart';
 
-import '../html/screenshot.dart';
-import '../mock_engine_canvas.dart';
+import '../common/mock_engine_canvas.dart';
+import '../common/test_initialization.dart';
 
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
 
 void testMain() {
-  debugEmulateFlutterTesterEnvironment = true;
-  setUpStableTestFonts();
+  setUpUnitTests(
+    withImplicitView: true,
+    setUpTestViewDimensions: false,
+  );
 
   late RecordingCanvas underTest;
   late MockEngineCanvas mockCanvas;
@@ -88,7 +90,28 @@ void testMain() {
 
       _expectDrawDRRectCall(mockCanvas, <String, dynamic>{
         'path':
-            'Path(MoveTo(10, 47) LineTo(10, 13) Conic(10, 10, 10, 13, w = 0.7071067690849304) LineTo(47, 10) Conic(50, 10, 10, 50, w = 0.7071067690849304) LineTo(50, 47) Conic(50, 50, 50, 47, w = 0.7071067690849304) LineTo(13, 50) Conic(10, 50, 50, 10, w = 0.7071067690849304) Close() MoveTo(11, 47) LineTo(11, 13) Conic(11, 11, 11, 13, w = 0.7071067690849304) LineTo(47, 11) Conic(49, 11, 11, 49, w = 0.7071067690849304) LineTo(49, 47) Conic(49, 49, 49, 47, w = 0.7071067690849304) LineTo(13, 49) Conic(11, 49, 49, 11, w = 0.7071067690849304) Close())',
+          'Path('
+            'MoveTo(${10.0}, ${47.0}) '
+            'LineTo(${10.0}, ${13.0}) '
+            'Conic(${10.0}, ${10.0}, ${10.0}, ${13.0}, w = ${0.7071067690849304}) '
+            'LineTo(${47.0}, ${10.0}) '
+            'Conic(${50.0}, ${10.0}, ${10.0}, ${50.0}, w = ${0.7071067690849304}) '
+            'LineTo(${50.0}, ${47.0}) '
+            'Conic(${50.0}, ${50.0}, ${50.0}, ${47.0}, w = ${0.7071067690849304}) '
+            'LineTo(${13.0}, ${50.0}) '
+            'Conic(${10.0}, ${50.0}, ${50.0}, ${10.0}, w = ${0.7071067690849304}) '
+            'Close() '
+            'MoveTo(${11.0}, ${47.0}) '
+            'LineTo(${11.0}, ${13.0}) '
+            'Conic(${11.0}, ${11.0}, ${11.0}, ${13.0}, w = ${0.7071067690849304}) '
+            'LineTo(${47.0}, ${11.0}) '
+            'Conic(${49.0}, ${11.0}, ${11.0}, ${49.0}, w = ${0.7071067690849304}) '
+            'LineTo(${49.0}, ${47.0}) '
+            'Conic(${49.0}, ${49.0}, ${49.0}, ${47.0}, w = ${0.7071067690849304}) '
+            'LineTo(${13.0}, ${49.0}) '
+            'Conic(${11.0}, ${49.0}, ${49.0}, ${11.0}, w = ${0.7071067690849304}) '
+            'Close()'
+          ')',
         'paint': somePaint.paintData,
       });
     });
@@ -139,12 +162,33 @@ void testMain() {
       // Expect to draw, even when inner has negative radii (which get ignored by canvas)
       _expectDrawDRRectCall(mockCanvas, <String, dynamic>{
         'path':
-            'Path(MoveTo(0, 42) LineTo(0, 6) Conic(0, 0, 0, 6, w = 0.7071067690849304) LineTo(88, 0) Conic(88, 0, 0, 88, w = 0.7071067690849304) LineTo(88, 48) Conic(88, 48, 48, 88, w = 0.7071067690849304) LineTo(6, 48) Conic(0, 48, 48, 0, w = 0.7071067690849304) Close() MoveTo(1, 42) LineTo(1, 6) Conic(1, 1, 1, 6, w = 0.7071067690849304) LineTo(87, 1) Conic(87, 1, 1, 87, w = 0.7071067690849304) LineTo(87, 47) Conic(87, 47, 47, 87, w = 0.7071067690849304) LineTo(6, 47) Conic(1, 47, 47, 1, w = 0.7071067690849304) Close())',
+          'Path('
+            'MoveTo(${0.0}, ${42.0}) '
+            'LineTo(${0.0}, ${6.0}) '
+            'Conic(${0.0}, ${0.0}, ${0.0}, ${6.0}, w = ${0.7071067690849304}) '
+            'LineTo(${88.0}, ${0.0}) '
+            'Conic(${88.0}, ${0.0}, ${0.0}, ${88.0}, w = ${0.7071067690849304}) '
+            'LineTo(${88.0}, ${48.0}) '
+            'Conic(${88.0}, ${48.0}, ${48.0}, ${88.0}, w = ${0.7071067690849304}) '
+            'LineTo(${6.0}, ${48.0}) '
+            'Conic(${0.0}, ${48.0}, ${48.0}, ${0.0}, w = ${0.7071067690849304}) '
+            'Close() '
+            'MoveTo(${1.0}, ${42.0}) '
+            'LineTo(${1.0}, ${6.0}) '
+            'Conic(${1.0}, ${1.0}, ${1.0}, ${6.0}, w = ${0.7071067690849304}) '
+            'LineTo(${87.0}, ${1.0}) '
+            'Conic(${87.0}, ${1.0}, ${1.0}, ${87.0}, w = ${0.7071067690849304}) '
+            'LineTo(${87.0}, ${47.0}) '
+            'Conic(${87.0}, ${47.0}, ${47.0}, ${87.0}, w = ${0.7071067690849304}) '
+            'LineTo(${6.0}, ${47.0}) '
+            'Conic(${1.0}, ${47.0}, ${47.0}, ${1.0}, w = ${0.7071067690849304}) '
+            'Close()'
+          ')',
         'paint': somePaint.paintData,
       });
     });
 
-    test('preserve old scuba test behavior', () {
+    test('preserve old golden test behavior', () {
       final RRect outer =
           RRect.fromRectAndCorners(const Rect.fromLTRB(10, 20, 30, 40));
       final RRect inner =
@@ -156,7 +200,18 @@ void testMain() {
 
       _expectDrawDRRectCall(mockCanvas, <String, dynamic>{
         'path':
-            'Path(MoveTo(10, 20) LineTo(30, 20) LineTo(30, 40) LineTo(10, 40) Close() MoveTo(12, 22) LineTo(28, 22) LineTo(28, 38) LineTo(12, 38) Close())',
+          'Path('
+            'MoveTo(${10.0}, ${20.0}) '
+            'LineTo(${30.0}, ${20.0}) '
+            'LineTo(${30.0}, ${40.0}) '
+            'LineTo(${10.0}, ${40.0}) '
+            'Close() '
+            'MoveTo(${12.0}, ${22.0}) '
+            'LineTo(${28.0}, ${22.0}) '
+            'LineTo(${28.0}, ${38.0}) '
+            'LineTo(${12.0}, ${38.0}) '
+            'Close()'
+          ')',
         'paint': somePaint.paintData,
       });
     });
diff --git a/lib/web_ui/test/window_test.dart b/lib/web_ui/test/engine/routing_test.dart
similarity index 60%
rename from lib/web_ui/test/window_test.dart
rename to lib/web_ui/test/engine/routing_test.dart
index 775fa994f68877d51732732ba851d63a4e97e369..e5713cd49b34e10ccdaae1a44516c404f7803e13 100644
--- a/lib/web_ui/test/window_test.dart
+++ b/lib/web_ui/test/engine/routing_test.dart
@@ -3,17 +3,15 @@
 // found in the LICENSE file.
 
 import 'dart:async';
-import 'dart:js_util' as js_util;
 
 import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/src/engine.dart' hide window;
 import 'package:ui/ui.dart' as ui;
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
-import 'engine/history_test.dart';
-import 'matchers.dart';
-
-const MethodCodec codec = JSONMethodCodec();
+import '../common/matchers.dart';
+import 'history_test.dart';
 
 Map<String, dynamic> _tagStateWithSerialCount(dynamic state, int serialCount) {
   return <String, dynamic> {
@@ -27,53 +25,49 @@ void main() {
 }
 
 void testMain() {
-  late EngineSingletonFlutterWindow window;
+  late EngineFlutterWindow myWindow;
 
-  setUpAll(() async {
-    await initializeEngine();
-  });
+  final EnginePlatformDispatcher dispatcher = EnginePlatformDispatcher.instance;
 
   setUp(() {
-    window = EngineSingletonFlutterWindow(0, EnginePlatformDispatcher.instance);
+    myWindow = EngineFlutterView.implicit(dispatcher, createDomHTMLDivElement());
+    dispatcher.viewManager.registerView(myWindow);
   });
 
   tearDown(() async {
-    await window.resetHistory();
+    dispatcher.viewManager.unregisterView(myWindow.viewId);
+    await myWindow.resetHistory();
+    myWindow.dispose();
   });
 
-  test('window.defaultRouteName should work with JsUrlStrategy', () async {
-    dynamic state = <dynamic, dynamic>{};
-    final JsUrlStrategy jsUrlStrategy = JsUrlStrategy(
-        getPath: allowInterop(() => '/initial'),
-        getState: allowInterop(() => state),
-        addPopStateListener: allowInterop((DomEventListener listener) => () {}),
-        prepareExternalUrl: allowInterop((String value) => ''),
-        pushState: allowInterop((Object? newState, String title, String url) {
-          expect(newState is Map, true);
-        }),
-        replaceState: allowInterop((Object? newState, String title, String url) {
-          expect(newState is Map, true);
-          state = newState;
-        }),
-        go: allowInterop(([int? delta]) async {
-          expect(delta, -1);
-        }));
-    final CustomUrlStrategy strategy =
-        CustomUrlStrategy.fromJs(jsUrlStrategy);
-    await window.debugInitializeHistory(strategy, useSingle: true);
-    expect(window.defaultRouteName, '/initial');
+  // For now, web always has an implicit view provided by the web engine.
+  test('EnginePlatformDispatcher.instance.implicitView should be non-null', () async {
+    expect(EnginePlatformDispatcher.instance.implicitView, isNotNull);
+    expect(EnginePlatformDispatcher.instance.implicitView?.viewId, 0);
+    expect(myWindow.viewId, 0);
+  });
+
+  test('window.defaultRouteName should work with a custom url strategy', () async {
+    const String path = '/initial';
+    const Object state = <dynamic, dynamic>{'origin': true};
+
+    final _SampleUrlStrategy customStrategy = _SampleUrlStrategy(path, state);
+    await myWindow.debugInitializeHistory(customStrategy, useSingle: true);
+    expect(myWindow.defaultRouteName, '/initial');
+    // Also make sure that the custom url strategy was actually used.
+    expect(customStrategy.wasUsed, isTrue);
   });
 
   test('window.defaultRouteName should not change', () async {
     final TestUrlStrategy strategy = TestUrlStrategy.fromEntry(
       const TestHistoryEntry('initial state', null, '/initial'),
     );
-    await window.debugInitializeHistory(strategy, useSingle: true);
-    expect(window.defaultRouteName, '/initial');
+    await myWindow.debugInitializeHistory(strategy, useSingle: true);
+    expect(myWindow.defaultRouteName, '/initial');
 
     // Changing the URL in the address bar later shouldn't affect [window.defaultRouteName].
     strategy.replaceState(null, '', '/newpath');
-    expect(window.defaultRouteName, '/initial');
+    expect(myWindow.defaultRouteName, '/initial');
   });
 
   // window.defaultRouteName is now permanently decoupled from the history,
@@ -81,17 +75,17 @@ void testMain() {
 
   test('window.defaultRouteName should reset after navigation platform message',
       () async {
-    await window.debugInitializeHistory(TestUrlStrategy.fromEntry(
+    await myWindow.debugInitializeHistory(TestUrlStrategy.fromEntry(
       // The URL here does not set the PlatformDispatcher's defaultRouteName,
       // since it got cached as soon as we read it above.
       const TestHistoryEntry('initial state', null, '/not-really-inital/THIS_IS_IGNORED'),
     ), useSingle: true);
     // Reading it multiple times should return the same value.
-    expect(window.defaultRouteName, '/initial');
-    expect(window.defaultRouteName, '/initial');
+    expect(myWindow.defaultRouteName, '/initial');
+    expect(myWindow.defaultRouteName, '/initial');
 
     final Completer<void> callback = Completer<void>();
-    window.sendPlatformMessage(
+    myWindow.sendPlatformMessage(
       'flutter/navigation',
       const JSONMethodCodec().encodeMethodCall(const MethodCall(
         'routeUpdated',
@@ -102,27 +96,27 @@ void testMain() {
     await callback.future;
     // After a navigation platform message, the PlatformDispatcher's
     // defaultRouteName resets to "/".
-    expect(window.defaultRouteName, '/');
+    expect(myWindow.defaultRouteName, '/');
   });
 
   // window.defaultRouteName is now '/'.
 
   test('can switch history mode', () async {
     Completer<void> callback;
-    await window.debugInitializeHistory(TestUrlStrategy.fromEntry(
+    await myWindow.debugInitializeHistory(TestUrlStrategy.fromEntry(
       const TestHistoryEntry('initial state', null, '/initial'),
     ), useSingle: false);
-    expect(window.browserHistory, isA<MultiEntriesBrowserHistory>());
+    expect(myWindow.browserHistory, isA<MultiEntriesBrowserHistory>());
 
     Future<void> check<T>(String method, Object? arguments) async {
       callback = Completer<void>();
-      window.sendPlatformMessage(
+      myWindow.sendPlatformMessage(
         'flutter/navigation',
         const JSONMethodCodec().encodeMethodCall(MethodCall(method, arguments)),
         (_) { callback.complete(); },
       );
       await callback.future;
-      expect(window.browserHistory, isA<T>());
+      expect(myWindow.browserHistory, isA<T>());
     }
 
     // These may be initialized as `null`
@@ -140,7 +134,7 @@ void testMain() {
   test('handleNavigationMessage throws for route update methods called with null arguments',
       () async {
     expect(() async {
-      await window.handleNavigationMessage(
+      await myWindow.handleNavigationMessage(
         const JSONMethodCodec().encodeMethodCall(const MethodCall(
           'routeUpdated',
         ))
@@ -148,7 +142,7 @@ void testMain() {
     }, throwsAssertionError);
 
     expect(() async {
-      await window.handleNavigationMessage(
+      await myWindow.handleNavigationMessage(
         const JSONMethodCodec().encodeMethodCall(const MethodCall(
           'routeInformationUpdated',
         ))
@@ -158,33 +152,33 @@ void testMain() {
 
   test('handleNavigationMessage execute request in order.', () async {
     // Start with multi entries.
-    await window.debugInitializeHistory(TestUrlStrategy.fromEntry(
+    await myWindow.debugInitializeHistory(TestUrlStrategy.fromEntry(
       const TestHistoryEntry('initial state', null, '/initial'),
     ), useSingle: false);
-    expect(window.browserHistory, isA<MultiEntriesBrowserHistory>());
+    expect(myWindow.browserHistory, isA<MultiEntriesBrowserHistory>());
     final List<String> executionOrder = <String>[];
-    await window.handleNavigationMessage(
+    await myWindow.handleNavigationMessage(
       const JSONMethodCodec().encodeMethodCall(const MethodCall(
         'selectSingleEntryHistory',
       ))
     ).then<void>((bool data) {
       executionOrder.add('1');
     });
-    await window.handleNavigationMessage(
+    await myWindow.handleNavigationMessage(
       const JSONMethodCodec().encodeMethodCall(const MethodCall(
         'selectMultiEntryHistory',
       ))
     ).then<void>((bool data) {
       executionOrder.add('2');
     });
-    await window.handleNavigationMessage(
+    await myWindow.handleNavigationMessage(
         const JSONMethodCodec().encodeMethodCall(const MethodCall(
         'selectSingleEntryHistory',
       ))
     ).then<void>((bool data) {
       executionOrder.add('3');
     });
-    await window.handleNavigationMessage(
+    await myWindow.handleNavigationMessage(
         const JSONMethodCodec().encodeMethodCall(const MethodCall(
         'routeInformationUpdated',
         <String, dynamic>{
@@ -206,14 +200,14 @@ void testMain() {
 
   test('should not throw when using nav1 and nav2 together',
       () async {
-    await window.debugInitializeHistory(TestUrlStrategy.fromEntry(
+    await myWindow.debugInitializeHistory(TestUrlStrategy.fromEntry(
       const TestHistoryEntry('initial state', null, '/initial'),
     ), useSingle: false);
-    expect(window.browserHistory, isA<MultiEntriesBrowserHistory>());
+    expect(myWindow.browserHistory, isA<MultiEntriesBrowserHistory>());
 
     // routeUpdated resets the history type
     Completer<void> callback = Completer<void>();
-    window.sendPlatformMessage(
+    myWindow.sendPlatformMessage(
       'flutter/navigation',
       const JSONMethodCodec().encodeMethodCall(const MethodCall(
         'routeUpdated',
@@ -222,12 +216,12 @@ void testMain() {
       (_) { callback.complete(); },
     );
     await callback.future;
-    expect(window.browserHistory, isA<SingleEntryBrowserHistory>());
-    expect(window.browserHistory.urlStrategy!.getPath(), '/bar');
+    expect(myWindow.browserHistory, isA<SingleEntryBrowserHistory>());
+    expect(myWindow.browserHistory.urlStrategy!.getPath(), '/bar');
 
     // routeInformationUpdated does not
     callback = Completer<void>();
-    window.sendPlatformMessage(
+    myWindow.sendPlatformMessage(
       'flutter/navigation',
       const JSONMethodCodec().encodeMethodCall(const MethodCall(
         'routeInformationUpdated',
@@ -239,31 +233,31 @@ void testMain() {
       (_) { callback.complete(); },
     );
     await callback.future;
-    expect(window.browserHistory, isA<SingleEntryBrowserHistory>());
-    expect(window.browserHistory.urlStrategy!.getPath(), '/baz');
+    expect(myWindow.browserHistory, isA<SingleEntryBrowserHistory>());
+    expect(myWindow.browserHistory.urlStrategy!.getPath(), '/baz');
 
     // they can be interleaved safely
-    await window.handleNavigationMessage(
+    await myWindow.handleNavigationMessage(
         const JSONMethodCodec().encodeMethodCall(const MethodCall(
         'routeUpdated',
         <String, dynamic>{'routeName': '/foo'},
       ))
     );
-    expect(window.browserHistory, isA<SingleEntryBrowserHistory>());
-    expect(window.browserHistory.urlStrategy!.getPath(), '/foo');
+    expect(myWindow.browserHistory, isA<SingleEntryBrowserHistory>());
+    expect(myWindow.browserHistory.urlStrategy!.getPath(), '/foo');
   });
 
   test('should not throw when state is complex json object',
       () async {
     // Regression test https://github.com/flutter/flutter/issues/87823.
-    await window.debugInitializeHistory(TestUrlStrategy.fromEntry(
+    await myWindow.debugInitializeHistory(TestUrlStrategy.fromEntry(
       const TestHistoryEntry('initial state', null, '/initial'),
     ), useSingle: false);
-    expect(window.browserHistory, isA<MultiEntriesBrowserHistory>());
+    expect(myWindow.browserHistory, isA<MultiEntriesBrowserHistory>());
 
     // routeInformationUpdated does not
     final Completer<void> callback = Completer<void>();
-    window.sendPlatformMessage(
+    myWindow.sendPlatformMessage(
       'flutter/navigation',
       const JSONMethodCodec().encodeMethodCall(const MethodCall(
         'routeInformationUpdated',
@@ -283,9 +277,9 @@ void testMain() {
       (_) { callback.complete(); },
     );
     await callback.future;
-    expect(window.browserHistory, isA<MultiEntriesBrowserHistory>());
-    expect(window.browserHistory.urlStrategy!.getPath(), '/baz');
-    final dynamic wrappedState = window.browserHistory.urlStrategy!.getState();
+    expect(myWindow.browserHistory, isA<MultiEntriesBrowserHistory>());
+    expect(myWindow.browserHistory.urlStrategy!.getPath(), '/baz');
+    final dynamic wrappedState = myWindow.browserHistory.urlStrategy!.getState();
     final dynamic actualState = wrappedState['state'];
     expect(actualState['state1'], true);
     expect(actualState['state2'], 1);
@@ -294,15 +288,39 @@ void testMain() {
     expect(actualState['state4']['substate2'], 'string2');
   });
 
+  test('routeInformationUpdated can handle uri',
+      () async {
+    await myWindow.debugInitializeHistory(TestUrlStrategy.fromEntry(
+      const TestHistoryEntry('initial state', null, '/initial'),
+    ), useSingle: false);
+    expect(myWindow.browserHistory, isA<MultiEntriesBrowserHistory>());
+
+    // routeInformationUpdated does not
+    final Completer<void> callback = Completer<void>();
+    myWindow.sendPlatformMessage(
+      'flutter/navigation',
+      const JSONMethodCodec().encodeMethodCall(const MethodCall(
+        'routeInformationUpdated',
+        <String, dynamic>{
+          'uri': 'http://myhostname.com/baz?abc=def#fragment',
+        },
+      )),
+      (_) { callback.complete(); },
+    );
+    await callback.future;
+    expect(myWindow.browserHistory, isA<MultiEntriesBrowserHistory>());
+    expect(myWindow.browserHistory.urlStrategy!.getPath(), '/baz?abc=def#fragment');
+  });
+
   test('can replace in MultiEntriesBrowserHistory',
       () async {
-    await window.debugInitializeHistory(TestUrlStrategy.fromEntry(
+    await myWindow.debugInitializeHistory(TestUrlStrategy.fromEntry(
       const TestHistoryEntry('initial state', null, '/initial'),
     ), useSingle: false);
-    expect(window.browserHistory, isA<MultiEntriesBrowserHistory>());
+    expect(myWindow.browserHistory, isA<MultiEntriesBrowserHistory>());
 
     Completer<void> callback = Completer<void>();
-    window.sendPlatformMessage(
+    myWindow.sendPlatformMessage(
       'flutter/navigation',
       const JSONMethodCodec().encodeMethodCall(const MethodCall(
         'routeInformationUpdated',
@@ -314,11 +332,11 @@ void testMain() {
       (_) { callback.complete(); },
     );
     await callback.future;
-    expect(window.browserHistory.urlStrategy!.getPath(), '/baz');
-    expect(window.browserHistory.urlStrategy!.getState(), _tagStateWithSerialCount('/state', 1));
+    expect(myWindow.browserHistory.urlStrategy!.getPath(), '/baz');
+    expect(myWindow.browserHistory.urlStrategy!.getState(), _tagStateWithSerialCount('/state', 1));
 
     callback = Completer<void>();
-    window.sendPlatformMessage(
+    myWindow.sendPlatformMessage(
       'flutter/navigation',
       const JSONMethodCodec().encodeMethodCall(const MethodCall(
         'routeInformationUpdated',
@@ -331,11 +349,11 @@ void testMain() {
       (_) { callback.complete(); },
     );
     await callback.future;
-    expect(window.browserHistory.urlStrategy!.getPath(), '/baz');
-    expect(window.browserHistory.urlStrategy!.getState(), _tagStateWithSerialCount('/state1', 1));
+    expect(myWindow.browserHistory.urlStrategy!.getPath(), '/baz');
+    expect(myWindow.browserHistory.urlStrategy!.getState(), _tagStateWithSerialCount('/state1', 1));
 
     callback = Completer<void>();
-    window.sendPlatformMessage(
+    myWindow.sendPlatformMessage(
       'flutter/navigation',
       const JSONMethodCodec().encodeMethodCall(const MethodCall(
         'routeInformationUpdated',
@@ -347,12 +365,12 @@ void testMain() {
       (_) { callback.complete(); },
     );
     await callback.future;
-    expect(window.browserHistory.urlStrategy!.getPath(), '/foo');
-    expect(window.browserHistory.urlStrategy!.getState(), _tagStateWithSerialCount('/foostate1', 2));
+    expect(myWindow.browserHistory.urlStrategy!.getPath(), '/foo');
+    expect(myWindow.browserHistory.urlStrategy!.getState(), _tagStateWithSerialCount('/foostate1', 2));
 
-    await window.browserHistory.back();
-    expect(window.browserHistory.urlStrategy!.getPath(), '/baz');
-    expect(window.browserHistory.urlStrategy!.getState(), _tagStateWithSerialCount('/state1', 1));
+    await myWindow.browserHistory.back();
+    expect(myWindow.browserHistory.urlStrategy!.getPath(), '/baz');
+    expect(myWindow.browserHistory.urlStrategy!.getState(), _tagStateWithSerialCount('/state1', 1));
   });
 
   test('initialize browser history with default url strategy (single)', () async {
@@ -361,10 +379,10 @@ void testMain() {
 
     // Without initializing history, the default route name should be
     // initialized to "/" in tests.
-    expect(window.defaultRouteName, '/');
+    expect(myWindow.defaultRouteName, '/');
 
     final Completer<void> callback = Completer<void>();
-    window.sendPlatformMessage(
+    myWindow.sendPlatformMessage(
       'flutter/navigation',
       const JSONMethodCodec().encodeMethodCall(const MethodCall(
         'routeUpdated',
@@ -373,11 +391,11 @@ void testMain() {
       (_) { callback.complete(); },
     );
     await callback.future;
-    expect(window.browserHistory, isA<SingleEntryBrowserHistory>());
+    expect(myWindow.browserHistory, isA<SingleEntryBrowserHistory>());
     // The url strategy should've been set to the default, and the path
     // should've been correctly set to "/bar".
-    expect(window.browserHistory.urlStrategy, isNot(isNull));
-    expect(window.browserHistory.urlStrategy!.getPath(), '/bar');
+    expect(myWindow.browserHistory.urlStrategy, isNot(isNull));
+    expect(myWindow.browserHistory.urlStrategy!.getPath(), '/bar');
   }, skip: isSafari); // https://github.com/flutter/flutter/issues/50836
 
   test('initialize browser history with default url strategy (multiple)', () async {
@@ -386,10 +404,10 @@ void testMain() {
 
     // Without initializing history, the default route name should be
     // initialized to "/" in tests.
-    expect(window.defaultRouteName, '/');
+    expect(myWindow.defaultRouteName, '/');
 
     final Completer<void> callback = Completer<void>();
-    window.sendPlatformMessage(
+    myWindow.sendPlatformMessage(
       'flutter/navigation',
       const JSONMethodCodec().encodeMethodCall(const MethodCall(
         'routeInformationUpdated',
@@ -401,63 +419,108 @@ void testMain() {
       (_) { callback.complete(); },
     );
     await callback.future;
-    expect(window.browserHistory, isA<MultiEntriesBrowserHistory>());
+    expect(myWindow.browserHistory, isA<MultiEntriesBrowserHistory>());
     // The url strategy should've been set to the default, and the path
     // should've been correctly set to "/baz".
-    expect(window.browserHistory.urlStrategy, isNot(isNull));
-    expect(window.browserHistory.urlStrategy!.getPath(), '/baz');
+    expect(myWindow.browserHistory.urlStrategy, isNot(isNull));
+    expect(myWindow.browserHistory.urlStrategy!.getPath(), '/baz');
   }, skip: isSafari); // https://github.com/flutter/flutter/issues/50836
 
   test('can disable location strategy', () async {
     // Disable URL strategy.
-    expect(() => jsSetUrlStrategy(null), returnsNormally);
+    expect(
+      () {
+        ui_web.urlStrategy = null;
+      },
+      returnsNormally,
+    );
     // History should be initialized.
-    expect(window.browserHistory, isNotNull);
+    expect(myWindow.browserHistory, isNotNull);
     // But without a URL strategy.
-    expect(window.browserHistory.urlStrategy, isNull);
+    expect(myWindow.browserHistory.urlStrategy, isNull);
     // Current path is always "/" in this case.
-    expect(window.browserHistory.currentPath, '/');
+    expect(myWindow.browserHistory.currentPath, '/');
 
     // Perform some navigation operations.
     await routeInformationUpdated('/foo/bar', null);
     // Path should not be updated because URL strategy is disabled.
-    expect(window.browserHistory.currentPath, '/');
+    expect(myWindow.browserHistory.currentPath, '/');
   });
 
-  test('js interop throws on wrong type', () {
-    expect(() => jsSetUrlStrategy(123), throwsA(anything));
-    expect(() => jsSetUrlStrategy('foo'), throwsA(anything));
-    expect(() => jsSetUrlStrategy(false), throwsA(anything));
-  });
-
-  test('cannot set url strategy after it is initialized', () async {
+  test('cannot set url strategy after it was initialized', () async {
     final TestUrlStrategy testStrategy = TestUrlStrategy.fromEntry(
       const TestHistoryEntry('initial state', null, '/'),
     );
-    await window.debugInitializeHistory(testStrategy, useSingle: true);
+    await myWindow.debugInitializeHistory(testStrategy, useSingle: true);
 
-    expect(() => jsSetUrlStrategy(null), throwsA(isAssertionError));
+    expect(
+      () {
+        ui_web.urlStrategy = null;
+      },
+      throwsA(isAssertionError),
+    );
   });
 
   test('cannot set url strategy more than once', () async {
     // First time is okay.
-    expect(() => jsSetUrlStrategy(null), returnsNormally);
+    expect(
+      () {
+        ui_web.urlStrategy = null;
+      },
+      returnsNormally,
+    );
     // Second time is not allowed.
-    expect(() => jsSetUrlStrategy(null), throwsA(isAssertionError));
+    expect(
+      () {
+        ui_web.urlStrategy = null;
+      },
+      throwsA(isAssertionError),
+    );
   });
 
   // Regression test for https://github.com/flutter/flutter/issues/77817
   test('window.locale(s) are not nullable', () {
     // If the getters were nullable, these expressions would result in compiler errors.
-    ui.window.locale.countryCode;
-    ui.window.locales.first.countryCode;
+    ui.PlatformDispatcher.instance.locale.countryCode;
+    ui.PlatformDispatcher.instance.locales.first.countryCode;
   });
 }
 
-void jsSetUrlStrategy(dynamic strategy) {
-  js_util.callMethod<void>(
-    domWindow,
-    '_flutter_web_set_location_strategy',
-    <dynamic>[strategy],
-  );
+class _SampleUrlStrategy implements ui_web.UrlStrategy {
+  _SampleUrlStrategy(this._path, this._state);
+
+  final String _path;
+  final Object? _state;
+
+  bool wasUsed = false;
+
+  @override
+  String getPath() => _path;
+
+  @override
+  Object? getState() => _state;
+
+  @override
+  ui.VoidCallback addPopStateListener(DartDomEventListener listener) {
+    wasUsed = true;
+    return () {};
+  }
+
+  @override
+  String prepareExternalUrl(String value) => '';
+
+  @override
+  void pushState(Object? newState, String title, String url) {
+    wasUsed = true;
+  }
+
+  @override
+  void replaceState(Object? newState, String title, String url) {
+    wasUsed = true;
+  }
+
+  @override
+  Future<void> go(int delta) async {
+    wasUsed = true;
+  }
 }
diff --git a/lib/web_ui/test/engine/scene_builder_test.dart b/lib/web_ui/test/engine/scene_builder_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..0a80cb2cad9877163984ace182b1ed914ea65dcd
--- /dev/null
+++ b/lib/web_ui/test/engine/scene_builder_test.dart
@@ -0,0 +1,231 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+
+import 'package:ui/ui.dart' as ui;
+
+import 'scene_builder_utils.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+void testMain() {
+  setUpAll(() {
+    LayerBuilder.debugRecorderFactory = (ui.Rect rect) {
+      final StubSceneCanvas canvas = StubSceneCanvas();
+      final StubPictureRecorder recorder = StubPictureRecorder(canvas);
+      return (recorder, canvas);
+    };
+  });
+
+  tearDownAll(() {
+    LayerBuilder.debugRecorderFactory = null;
+  });
+
+  group('EngineSceneBuilder', () {
+    test('single picture', () {
+      final EngineSceneBuilder sceneBuilder = EngineSceneBuilder();
+
+      const ui.Rect pictureRect = ui.Rect.fromLTRB(100, 100, 200, 200);
+      sceneBuilder.addPicture(ui.Offset.zero, StubPicture(pictureRect));
+
+      final EngineScene scene = sceneBuilder.build() as EngineScene;
+      final List<LayerSlice> slices = scene.rootLayer.slices;
+      expect(slices.length, 1);
+      expect(slices[0], pictureSliceWithRect(pictureRect));
+    });
+
+    test('two pictures', () {
+      final EngineSceneBuilder sceneBuilder = EngineSceneBuilder();
+
+      const ui.Rect pictureRect1 = ui.Rect.fromLTRB(100, 100, 200, 200);
+      const ui.Rect pictureRect2 = ui.Rect.fromLTRB(300, 400, 400, 400);
+      sceneBuilder.addPicture(ui.Offset.zero, StubPicture(pictureRect1));
+      sceneBuilder.addPicture(ui.Offset.zero, StubPicture(pictureRect2));
+
+      final EngineScene scene = sceneBuilder.build() as EngineScene;
+      final List<LayerSlice> slices = scene.rootLayer.slices;
+      expect(slices.length, 1);
+      expect(slices[0], pictureSliceWithRect(const ui.Rect.fromLTRB(100, 100, 400, 400)));
+    });
+
+    test('picture + platform view (overlapping)', () {
+            final EngineSceneBuilder sceneBuilder = EngineSceneBuilder();
+
+      const ui.Rect pictureRect = ui.Rect.fromLTRB(100, 100, 200, 200);
+      const ui.Rect platformViewRect = ui.Rect.fromLTRB(150, 150, 250, 250);
+      sceneBuilder.addPicture(ui.Offset.zero, StubPicture(pictureRect));
+      sceneBuilder.addPlatformView(
+        1,
+        offset: platformViewRect.topLeft,
+        width: platformViewRect.width,
+        height: platformViewRect.height
+      );
+
+      final EngineScene scene = sceneBuilder.build() as EngineScene;
+      final List<LayerSlice> slices = scene.rootLayer.slices;
+      expect(slices.length, 2);
+      expect(slices[0], pictureSliceWithRect(pictureRect));
+      expect(slices[1], platformViewSliceWithViews(<PlatformView>[
+        PlatformView(1, platformViewRect.size, PlatformViewStyling(
+          position: PlatformViewPosition.offset(platformViewRect.topLeft)
+        ))
+      ]));
+    });
+
+    test('platform view + picture (overlapping)', () {
+      final EngineSceneBuilder sceneBuilder = EngineSceneBuilder();
+
+      const ui.Rect pictureRect = ui.Rect.fromLTRB(100, 100, 200, 200);
+      const ui.Rect platformViewRect = ui.Rect.fromLTRB(150, 150, 250, 250);
+      sceneBuilder.addPlatformView(
+        1,
+        offset: platformViewRect.topLeft,
+        width: platformViewRect.width,
+        height: platformViewRect.height
+      );
+      sceneBuilder.addPicture(ui.Offset.zero, StubPicture(pictureRect));
+
+      final EngineScene scene = sceneBuilder.build() as EngineScene;
+      final List<LayerSlice> slices = scene.rootLayer.slices;
+      expect(slices.length, 2);
+      expect(slices[0], platformViewSliceWithViews(<PlatformView>[
+        PlatformView(1, platformViewRect.size, PlatformViewStyling(
+          position: PlatformViewPosition.offset(platformViewRect.topLeft)
+        ))
+      ]));
+      expect(slices[1], pictureSliceWithRect(pictureRect));
+    });
+
+    test('platform view sandwich (overlapping)', () {
+      final EngineSceneBuilder sceneBuilder = EngineSceneBuilder();
+
+      const ui.Rect pictureRect1 = ui.Rect.fromLTRB(100, 100, 200, 200);
+      const ui.Rect platformViewRect = ui.Rect.fromLTRB(150, 150, 250, 250);
+      const ui.Rect pictureRect2 = ui.Rect.fromLTRB(200, 200, 300, 300);
+      sceneBuilder.addPicture(ui.Offset.zero, StubPicture(pictureRect1));
+      sceneBuilder.addPlatformView(
+        1,
+        offset: platformViewRect.topLeft,
+        width: platformViewRect.width,
+        height: platformViewRect.height
+      );
+      sceneBuilder.addPicture(ui.Offset.zero, StubPicture(pictureRect2));
+
+      final EngineScene scene = sceneBuilder.build() as EngineScene;
+      final List<LayerSlice> slices = scene.rootLayer.slices;
+      expect(slices.length, 3);
+      expect(slices[0], pictureSliceWithRect(pictureRect1));
+      expect(slices[1], platformViewSliceWithViews(<PlatformView>[
+        PlatformView(1, platformViewRect.size, PlatformViewStyling(
+          position: PlatformViewPosition.offset(platformViewRect.topLeft)
+        ))
+      ]));
+      expect(slices[2], pictureSliceWithRect(pictureRect2));
+    });
+
+    test('platform view sandwich (non-overlapping)', () {
+      final EngineSceneBuilder sceneBuilder = EngineSceneBuilder();
+
+      const ui.Rect pictureRect1 = ui.Rect.fromLTRB(100, 100, 200, 200);
+      const ui.Rect platformViewRect = ui.Rect.fromLTRB(150, 150, 250, 250);
+      const ui.Rect pictureRect2 = ui.Rect.fromLTRB(50, 50, 100, 100);
+      sceneBuilder.addPicture(ui.Offset.zero, StubPicture(pictureRect1));
+      sceneBuilder.addPlatformView(
+        1,
+        offset: platformViewRect.topLeft,
+        width: platformViewRect.width,
+        height: platformViewRect.height
+      );
+      sceneBuilder.addPicture(ui.Offset.zero, StubPicture(pictureRect2));
+
+      final EngineScene scene = sceneBuilder.build() as EngineScene;
+      final List<LayerSlice> slices = scene.rootLayer.slices;
+
+      // The top picture does not overlap with the platform view, so it should
+      // be grouped into the slice below it to reduce the number of canvases we
+      // need.
+      expect(slices.length, 2);
+      expect(slices[0], pictureSliceWithRect(const ui.Rect.fromLTRB(50, 50, 200, 200)));
+      expect(slices[1], platformViewSliceWithViews(<PlatformView>[
+        PlatformView(1, platformViewRect.size, PlatformViewStyling(
+          position: PlatformViewPosition.offset(platformViewRect.topLeft)
+        ))
+      ]));
+    });
+  });
+}
+
+PictureSliceMatcher pictureSliceWithRect(ui.Rect rect) => PictureSliceMatcher(rect);
+PlatformViewSliceMatcher platformViewSliceWithViews(List<PlatformView> views)
+  => PlatformViewSliceMatcher(views);
+
+class PictureSliceMatcher extends Matcher {
+  PictureSliceMatcher(this.expectedRect);
+
+  final ui.Rect expectedRect;
+
+  @override
+  Description describe(Description description) {
+    return description.add('<picture slice with cullRect: $expectedRect>');
+  }
+
+  @override
+  bool matches(dynamic item, Map<dynamic, dynamic> matchState) {
+    if (item is! PictureSlice) {
+      return false;
+    }
+    final ScenePicture picture = item.picture;
+    if (picture is! StubPicture) {
+      return false;
+    }
+
+    if (picture.cullRect != expectedRect) {
+      return false;
+    }
+
+    return true;
+  }
+}
+
+class PlatformViewSliceMatcher extends Matcher {
+  PlatformViewSliceMatcher(this.expectedPlatformViews);
+
+  final List<PlatformView> expectedPlatformViews;
+
+  @override
+  Description describe(Description description) {
+    return description.add('<platform view slice with platform views: $expectedPlatformViews>');
+  }
+
+  @override
+  bool matches(dynamic item, Map<dynamic, dynamic> matchState) {
+    if (item is! PlatformViewSlice) {
+      return false;
+    }
+
+    if (item.views.length != expectedPlatformViews.length) {
+      return false;
+    }
+
+    for (int i = 0; i < item.views.length; i++) {
+      final PlatformView expectedView = expectedPlatformViews[i];
+      final PlatformView actualView = item.views[i];
+      if (expectedView.viewId != actualView.viewId) {
+        return false;
+      }
+      if (expectedView.size != actualView.size) {
+        return false;
+      }
+      if (expectedView.styling != actualView.styling) {
+        return false;
+      }
+    }
+    return true;
+  }
+}
diff --git a/lib/web_ui/test/engine/scene_builder_utils.dart b/lib/web_ui/test/engine/scene_builder_utils.dart
new file mode 100644
index 0000000000000000000000000000000000000000..72541786f819fbbbf22bf540fddd560188454631
--- /dev/null
+++ b/lib/web_ui/test/engine/scene_builder_utils.dart
@@ -0,0 +1,186 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:typed_data';
+
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui;
+
+class StubPicture implements ScenePicture {
+  StubPicture(this.cullRect);
+
+  @override
+  final ui.Rect cullRect;
+
+  @override
+  int get approximateBytesUsed => throw UnimplementedError();
+
+  @override
+  bool get debugDisposed => throw UnimplementedError();
+
+  @override
+  void dispose() {}
+
+  @override
+  Future<ui.Image> toImage(int width, int height) {
+    throw UnimplementedError();
+  }
+
+  @override
+  ui.Image toImageSync(int width, int height) {
+    throw UnimplementedError();
+  }
+}
+
+class StubCompositePicture extends StubPicture {
+  StubCompositePicture(this.children) : super(
+    children.fold(null, (ui.Rect? previousValue, StubPicture child) {
+      return previousValue?.expandToInclude(child.cullRect) ?? child.cullRect;
+    })!
+  );
+
+  final List<StubPicture> children;
+}
+
+class StubPictureRecorder implements ui.PictureRecorder {
+  StubPictureRecorder(this.canvas);
+
+  final StubSceneCanvas canvas;
+
+  @override
+  ui.Picture endRecording() {
+    return StubCompositePicture(canvas.pictures);
+  }
+
+  @override
+  bool get isRecording => throw UnimplementedError();
+}
+
+class StubSceneCanvas implements SceneCanvas {
+  List<StubPicture> pictures = <StubPicture>[];
+
+  @override
+  void drawPicture(ui.Picture picture) {
+    pictures.add(picture as StubPicture);
+  }
+
+  @override
+  void clipPath(ui.Path path, {bool doAntiAlias = true}) {}
+
+  @override
+  void clipRRect(ui.RRect rrect, {bool doAntiAlias = true}) {}
+
+  @override
+  void clipRect(ui.Rect rect, {ui.ClipOp clipOp = ui.ClipOp.intersect, bool doAntiAlias = true}) {}
+
+  @override
+  void drawArc(ui.Rect rect, double startAngle, double sweepAngle, bool useCenter, ui.Paint paint) {}
+
+  @override
+  void drawAtlas(ui.Image atlas, List<ui.RSTransform> transforms, List<ui.Rect> rects, List<ui.Color>? colors, ui.BlendMode? blendMode, ui.Rect? cullRect, ui.Paint paint) {}
+
+  @override
+  void drawCircle(ui.Offset c, double radius, ui.Paint paint) {}
+
+  @override
+  void drawColor(ui.Color color, ui.BlendMode blendMode) {}
+
+  @override
+  void drawDRRect(ui.RRect outer, ui.RRect inner, ui.Paint paint) {}
+
+  @override
+  void drawImage(ui.Image image, ui.Offset offset, ui.Paint paint) {}
+
+  @override
+  void drawImageNine(ui.Image image, ui.Rect center, ui.Rect dst, ui.Paint paint) {}
+
+  @override
+  void drawImageRect(ui.Image image, ui.Rect src, ui.Rect dst, ui.Paint paint) {}
+
+  @override
+  void drawLine(ui.Offset p1, ui.Offset p2, ui.Paint paint) {}
+
+  @override
+  void drawOval(ui.Rect rect, ui.Paint paint) {}
+
+  @override
+  void drawPaint(ui.Paint paint) {}
+
+  @override
+  void drawParagraph(ui.Paragraph paragraph, ui.Offset offset) {}
+
+  @override
+  void drawPath(ui.Path path, ui.Paint paint) {}
+
+  @override
+  void drawPoints(ui.PointMode pointMode, List<ui.Offset> points, ui.Paint paint) {}
+
+  @override
+  void drawRRect(ui.RRect rrect, ui.Paint paint) {}
+
+  @override
+  void drawRawAtlas(ui.Image atlas, Float32List rstTransforms, Float32List rects, Int32List? colors, ui.BlendMode? blendMode, ui.Rect? cullRect, ui.Paint paint) {}
+
+  @override
+  void drawRawPoints(ui.PointMode pointMode, Float32List points, ui.Paint paint) {}
+
+  @override
+  void drawRect(ui.Rect rect, ui.Paint paint) {}
+
+  @override
+  void drawShadow(ui.Path path, ui.Color color, double elevation, bool transparentOccluder) {}
+
+  @override
+  void drawVertices(ui.Vertices vertices, ui.BlendMode blendMode, ui.Paint paint) {}
+
+  @override
+  ui.Rect getDestinationClipBounds() {
+    throw UnimplementedError();
+  }
+
+  @override
+  ui.Rect getLocalClipBounds() {
+    throw UnimplementedError();
+  }
+
+  @override
+  int getSaveCount() {
+    throw UnimplementedError();
+  }
+
+  @override
+  Float64List getTransform() {
+    throw UnimplementedError();
+  }
+
+  @override
+  void restore() {}
+
+  @override
+  void restoreToCount(int count) {}
+
+  @override
+  void rotate(double radians) {}
+
+  @override
+  void save() {}
+
+  @override
+  void saveLayer(ui.Rect? bounds, ui.Paint paint) {}
+
+  @override
+  void saveLayerWithFilter(ui.Rect? bounds, ui.Paint paint, ui.ImageFilter backdropFilter) {}
+
+  @override
+  void scale(double sx, [double? sy]) {}
+
+  @override
+  void skew(double sx, double sy) {}
+
+  @override
+  void transform(Float64List matrix4) {}
+
+  @override
+  void translate(double dx, double dy) {}
+}
diff --git a/lib/web_ui/test/engine/scene_view_test.dart b/lib/web_ui/test/engine/scene_view_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..38c88f5049e21d281f20f5049ebc6aa7d87995ed
--- /dev/null
+++ b/lib/web_ui/test/engine/scene_view_test.dart
@@ -0,0 +1,222 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'dart:js_interop';
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+
+import 'package:ui/ui.dart' as ui;
+import 'package:ui/ui_web/src/ui_web.dart';
+
+import '../common/test_initialization.dart';
+import 'scene_builder_utils.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+class StubPictureRenderer implements PictureRenderer {
+  final DomCanvasElement scratchCanvasElement =
+      createDomCanvasElement(width: 500, height: 500);
+
+  @override
+  Future<RenderResult> renderPictures(List<ScenePicture> pictures) async {
+    renderedPictures.addAll(pictures);
+    final List<DomImageBitmap> bitmaps = await Future.wait(pictures.map((ScenePicture picture) {
+      final ui.Rect cullRect = picture.cullRect;
+      final Future<DomImageBitmap> bitmap = createImageBitmap(scratchCanvasElement as JSObject, (
+        x: 0,
+        y: 0,
+        width: cullRect.width.toInt(),
+        height: cullRect.height.toInt(),
+      ));
+      return bitmap;
+    }));
+    return (
+      imageBitmaps: bitmaps,
+      rasterStartMicros: 0,
+      rasterEndMicros: 0,
+    );
+  }
+
+  @override
+  ScenePicture clipPicture(ScenePicture picture, ui.Rect clip) {
+    clipRequests[picture] = clip;
+    return picture;
+  }
+
+  List<ScenePicture> renderedPictures = <ScenePicture>[];
+  Map<ScenePicture, ui.Rect> clipRequests = <ScenePicture, ui.Rect>{};
+}
+
+class StubFlutterView implements ui.FlutterView {
+  @override
+  double get devicePixelRatio => throw UnimplementedError();
+
+  @override
+  ui.Display get display => throw UnimplementedError();
+
+  @override
+  List<ui.DisplayFeature> get displayFeatures => throw UnimplementedError();
+
+  @override
+  ui.GestureSettings get gestureSettings => throw UnimplementedError();
+
+  @override
+  ui.ViewPadding get padding => throw UnimplementedError();
+
+  @override
+  ui.ViewConstraints get physicalConstraints => throw UnimplementedError();
+
+  @override
+  ui.Size get physicalSize => const ui.Size(1000, 1000);
+
+  @override
+  ui.PlatformDispatcher get platformDispatcher => throw UnimplementedError();
+
+  @override
+  void render(ui.Scene scene, {ui.Size? size}) {
+  }
+
+  @override
+  ui.ViewPadding get systemGestureInsets => throw UnimplementedError();
+
+  @override
+  void updateSemantics(ui.SemanticsUpdate update) {
+  }
+
+  @override
+  int get viewId => throw UnimplementedError();
+
+  @override
+  ui.ViewPadding get viewInsets => throw UnimplementedError();
+
+  @override
+  ui.ViewPadding get viewPadding => throw UnimplementedError();
+}
+
+void testMain() {
+  late EngineSceneView sceneView;
+  late StubPictureRenderer stubPictureRenderer;
+
+  setUpAll(() async {
+    await bootstrapAndRunApp(withImplicitView: true);
+  });
+
+  setUp(() {
+    stubPictureRenderer = StubPictureRenderer();
+    sceneView = EngineSceneView(stubPictureRenderer, StubFlutterView());
+  });
+
+  test('SceneView places canvas according to device-pixel ratio', () async {
+    debugOverrideDevicePixelRatio(2.0);
+
+    final StubPicture picture = StubPicture(const ui.Rect.fromLTWH(
+      50,
+      80,
+      100,
+      120,
+    ));
+    final EngineRootLayer rootLayer = EngineRootLayer();
+    rootLayer.slices.add(PictureSlice(picture));
+    final EngineScene scene = EngineScene(rootLayer);
+    await sceneView.renderScene(scene, null);
+
+    final DomElement sceneElement = sceneView.sceneElement;
+    final List<DomElement> children = sceneElement.children.toList();
+    expect(children.length, 1);
+    final DomElement containerElement = children.first;
+    expect(
+        containerElement.tagName, equalsIgnoringCase('flt-canvas-container'));
+
+    final List<DomElement> containerChildren =
+        containerElement.children.toList();
+    expect(containerChildren.length, 1);
+    final DomElement canvasElement = containerChildren.first;
+    final DomCSSStyleDeclaration style = canvasElement.style;
+    expect(style.left, '25px');
+    expect(style.top, '40px');
+    expect(style.width, '50px');
+    expect(style.height, '60px');
+
+    debugOverrideDevicePixelRatio(null);
+  });
+
+  test('SceneView places platform view according to device-pixel ratio',
+      () async {
+    debugOverrideDevicePixelRatio(2.0);
+
+    final PlatformView platformView = PlatformView(
+        1,
+        const ui.Size(100, 120),
+        const PlatformViewStyling(
+          position: PlatformViewPosition.offset(ui.Offset(50, 80)),
+        ));
+    final EngineRootLayer rootLayer = EngineRootLayer();
+    rootLayer.slices.add(PlatformViewSlice(<PlatformView>[platformView], null));
+    final EngineScene scene = EngineScene(rootLayer);
+    await sceneView.renderScene(scene, null);
+
+    final DomElement sceneElement = sceneView.sceneElement;
+    final List<DomElement> children = sceneElement.children.toList();
+    expect(children.length, 1);
+    final DomElement containerElement = children.first;
+    expect(
+        containerElement.tagName, equalsIgnoringCase('flt-platform-view-slot'));
+
+    final DomCSSStyleDeclaration style = containerElement.style;
+    expect(style.left, '25px');
+    expect(style.top, '40px');
+    expect(style.width, '50px');
+    expect(style.height, '60px');
+
+    debugOverrideDevicePixelRatio(null);
+  });
+
+  test(
+      'SceneView always renders most recent picture and skips intermediate pictures',
+      () async {
+    final List<StubPicture> pictures = <StubPicture>[];
+    final List<Future<void>> renderFutures = <Future<void>>[];
+    for (int i = 1; i < 20; i++) {
+      final StubPicture picture = StubPicture(const ui.Rect.fromLTWH(
+        50,
+        80,
+        100,
+        120,
+      ));
+      pictures.add(picture);
+      final EngineRootLayer rootLayer = EngineRootLayer();
+      rootLayer.slices.add(PictureSlice(picture));
+      final EngineScene scene = EngineScene(rootLayer);
+      renderFutures.add(sceneView.renderScene(scene, null));
+    }
+    await Future.wait(renderFutures);
+
+    // Should just render the first and last pictures and skip the one inbetween.
+    expect(stubPictureRenderer.renderedPictures.length, 2);
+    expect(stubPictureRenderer.renderedPictures.first, pictures.first);
+    expect(stubPictureRenderer.renderedPictures.last, pictures.last);
+  });
+
+  test('SceneView clips pictures that are outside the window screen', () async {
+      final StubPicture picture = StubPicture(const ui.Rect.fromLTWH(
+        -50,
+        -50,
+        100,
+        120,
+      ));
+
+      final EngineRootLayer rootLayer = EngineRootLayer();
+      rootLayer.slices.add(PictureSlice(picture));
+      final EngineScene scene = EngineScene(rootLayer);
+      await sceneView.renderScene(scene, null);
+
+      expect(stubPictureRenderer.renderedPictures.length, 1);
+      expect(stubPictureRenderer.clipRequests.containsKey(picture), true);
+  });
+}
diff --git a/lib/web_ui/test/engine/semantics/accessibility_test.dart b/lib/web_ui/test/engine/semantics/accessibility_test.dart
deleted file mode 100644
index c8b2059f202ea3ee67e1af34302f2f135a025950..0000000000000000000000000000000000000000
--- a/lib/web_ui/test/engine/semantics/accessibility_test.dart
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'dart:async' show Future;
-
-import 'package:test/bootstrap/browser.dart';
-import 'package:test/test.dart';
-import 'package:ui/src/engine/dom.dart';
-import 'package:ui/src/engine/semantics.dart';
-import 'package:ui/src/engine/services.dart';
-
-const StandardMessageCodec codec = StandardMessageCodec();
-const String testMessage = 'This is an tooltip.';
-const Map<dynamic, dynamic> testInput = <dynamic, dynamic>{
-  'data': <dynamic, dynamic>{'message': testMessage}
-};
-
-void main() {
-  internalBootstrapBrowserTest(() => testMain);
-}
-
-void testMain() {
-  late AccessibilityAnnouncements accessibilityAnnouncements;
-
-  group('$AccessibilityAnnouncements', () {
-    setUp(() {
-      accessibilityAnnouncements = AccessibilityAnnouncements.instance;
-    });
-
-    test(
-        'Creates element when handling a message and removes '
-        'is after a delay', () {
-      // Set the a11y announcement's duration on DOM to half seconds.
-      accessibilityAnnouncements.durationA11yMessageIsOnDom =
-          const Duration(milliseconds: 500);
-
-      // Initially there is no accessibility-element
-      expect(domDocument.getElementById('accessibility-element'), isNull);
-
-      accessibilityAnnouncements.handleMessage(codec,
-          codec.encodeMessage(testInput));
-      expect(
-        domDocument.getElementById('accessibility-element'),
-        isNotNull,
-      );
-      final DomHTMLLabelElement input =
-          domDocument.getElementById('accessibility-element')! as DomHTMLLabelElement;
-      expect(input.getAttribute('aria-live'), equals('polite'));
-      expect(input.text, testMessage);
-
-      // The element should have been removed after the duration.
-      Future<void>.delayed(
-          accessibilityAnnouncements.durationA11yMessageIsOnDom,
-          () =>
-              expect(domDocument.getElementById('accessibility-element'), isNull));
-    });
-
-    test('Default value of aria-live is polite when assertiveness is not specified', () {
-      const Map<dynamic, dynamic> testInput = <dynamic, dynamic>{'data': <dynamic, dynamic>{'message': 'message'}};
-      accessibilityAnnouncements.handleMessage(codec, codec.encodeMessage(testInput));
-      final DomHTMLLabelElement input = domDocument.getElementById('accessibility-element')! as DomHTMLLabelElement;
-
-      expect(input.getAttribute('aria-live'), equals('polite'));
-    });
-
-     test('aria-live is assertive when assertiveness is set to 1', () {
-      const Map<dynamic, dynamic> testInput = <dynamic, dynamic>{'data': <dynamic, dynamic>{'message': 'message', 'assertiveness': 1}};
-      accessibilityAnnouncements.handleMessage(codec, codec.encodeMessage(testInput));
-      final DomHTMLLabelElement input = domDocument.getElementById('accessibility-element')! as DomHTMLLabelElement;
-
-      expect(input.getAttribute('aria-live'), equals('assertive'));
-    });
-
-    test('aria-live is polite when assertiveness is null', () {
-      const Map<dynamic, dynamic> testInput = <dynamic, dynamic>{'data': <dynamic, dynamic>{'message': 'message', 'assertiveness': null}};
-      accessibilityAnnouncements.handleMessage(codec, codec.encodeMessage(testInput));
-      final DomHTMLLabelElement input = domDocument.getElementById('accessibility-element')! as DomHTMLLabelElement;
-
-      expect(input.getAttribute('aria-live'), equals('polite'));
-    });
-
-    test('aria-live is polite when assertiveness is set to 0', () {
-      const Map<dynamic, dynamic> testInput = <dynamic, dynamic>{'data': <dynamic, dynamic>{'message': 'message', 'assertiveness': 0}};
-      accessibilityAnnouncements.handleMessage(codec, codec.encodeMessage(testInput));
-      final DomHTMLLabelElement input = domDocument.getElementById('accessibility-element')! as DomHTMLLabelElement;
-
-      expect(input.getAttribute('aria-live'), equals('polite'));
-    });
-  });
-}
diff --git a/lib/web_ui/test/engine/semantics/semantics_announcement_test.dart b/lib/web_ui/test/engine/semantics/semantics_announcement_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..a9c4e9fa9453b48124979587ebe6fecb2f30e570
--- /dev/null
+++ b/lib/web_ui/test/engine/semantics/semantics_announcement_test.dart
@@ -0,0 +1,142 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'dart:typed_data';
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+
+const StandardMessageCodec codec = StandardMessageCodec();
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+void testMain() {
+  late AccessibilityAnnouncements accessibilityAnnouncements;
+
+  setUp(() {
+    final DomElement announcementsHost = createDomElement('flt-announcement-host');
+    accessibilityAnnouncements = AccessibilityAnnouncements(hostElement: announcementsHost);
+    setLiveMessageDurationForTest(const Duration(milliseconds: 10));
+    expect(
+      announcementsHost.querySelector('flt-announcement-polite'),
+      accessibilityAnnouncements.ariaLiveElementFor(Assertiveness.polite),
+    );
+    expect(
+      announcementsHost.querySelector('flt-announcement-assertive'),
+      accessibilityAnnouncements.ariaLiveElementFor(Assertiveness.assertive),
+    );
+  });
+
+  tearDown(() async {
+    await Future<void>.delayed(liveMessageDuration * 2);
+  });
+
+  group('$AccessibilityAnnouncements', () {
+    ByteData? encodeMessageOnly({required String message}) {
+      return codec.encodeMessage(<dynamic, dynamic>{
+        'data': <dynamic, dynamic>{'message': message},
+      });
+    }
+
+    void sendAnnouncementMessage({required String message, int? assertiveness}) {
+      accessibilityAnnouncements.handleMessage(codec, codec.encodeMessage(<dynamic, dynamic>{
+        'data': <dynamic, dynamic>{
+          'message': message,
+          'assertiveness': assertiveness,
+        },
+      }));
+    }
+
+    void expectMessages({String polite = '', String assertive = ''}) {
+      expect(accessibilityAnnouncements.ariaLiveElementFor(Assertiveness.polite).text, polite);
+      expect(accessibilityAnnouncements.ariaLiveElementFor(Assertiveness.assertive).text, assertive);
+    }
+
+    void expectNoMessages() => expectMessages();
+
+    test('Default value of aria-live is polite when assertiveness is not specified', () async {
+      accessibilityAnnouncements.handleMessage(codec, encodeMessageOnly(message: 'polite message'));
+      expectMessages(polite: 'polite message');
+
+      await Future<void>.delayed(liveMessageDuration);
+      expectNoMessages();
+    });
+
+    test('aria-live is assertive when assertiveness is set to 1', () async {
+      sendAnnouncementMessage(message: 'assertive message', assertiveness: 1);
+      expectMessages(assertive: 'assertive message');
+
+      await Future<void>.delayed(liveMessageDuration);
+      expectNoMessages();
+    });
+
+    test('aria-live is polite when assertiveness is null', () async {
+      sendAnnouncementMessage(message: 'polite message');
+      expectMessages(polite: 'polite message');
+
+      await Future<void>.delayed(liveMessageDuration);
+      expectNoMessages();
+    });
+
+    test('aria-live is polite when assertiveness is set to 0', () async {
+      sendAnnouncementMessage(message: 'polite message', assertiveness: 0);
+      expectMessages(polite: 'polite message');
+
+      await Future<void>.delayed(liveMessageDuration);
+      expectNoMessages();
+    });
+
+    test('Rapid-fire messages are each announced', () async {
+      sendAnnouncementMessage(message: 'Hello');
+      expectMessages(polite: 'Hello');
+
+      await Future<void>.delayed(liveMessageDuration * 0.5);
+      sendAnnouncementMessage(message: 'There');
+      expectMessages(polite: 'HelloThere\u00A0');
+
+      await Future<void>.delayed(liveMessageDuration * 0.6);
+      expectMessages(polite: 'There\u00A0');
+
+      await Future<void>.delayed(liveMessageDuration * 0.5);
+      expectNoMessages();
+    });
+
+    test('Repeated announcements are modified to ensure screen readers announce them', () async {
+      sendAnnouncementMessage(message: 'Hello');
+      expectMessages(polite: 'Hello');
+      await Future<void>.delayed(liveMessageDuration);
+      expectNoMessages();
+
+      sendAnnouncementMessage(message: 'Hello');
+      expectMessages(polite: 'Hello\u00A0');
+      await Future<void>.delayed(liveMessageDuration);
+      expectNoMessages();
+
+      sendAnnouncementMessage(message: 'Hello');
+      expectMessages(polite: 'Hello');
+      await Future<void>.delayed(liveMessageDuration);
+      expectNoMessages();
+    });
+
+    test('announce() polite', () async {
+      accessibilityAnnouncements.announce('polite message', Assertiveness.polite);
+      expectMessages(polite: 'polite message');
+
+      await Future<void>.delayed(liveMessageDuration);
+      expectNoMessages();
+    });
+
+    test('announce() assertive', () async {
+      accessibilityAnnouncements.announce('assertive message', Assertiveness.assertive);
+      expectMessages(assertive: 'assertive message');
+
+      await Future<void>.delayed(liveMessageDuration);
+      expectNoMessages();
+    });
+  });
+}
diff --git a/lib/web_ui/test/engine/semantics/semantics_api_test.dart b/lib/web_ui/test/engine/semantics/semantics_api_test.dart
index 5a457eff1aef3ad986a585f75b486d7554f98b0f..db1cda282e1c5be9a6fb317f2175c5a60815cec8 100644
--- a/lib/web_ui/test/engine/semantics/semantics_api_test.dart
+++ b/lib/web_ui/test/engine/semantics/semantics_api_test.dart
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 @TestOn('chrome || safari || firefox')
+library;
 
 import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
@@ -17,13 +18,13 @@ void main() {
 
 void testMain() {
   // This must match the number of flags in lib/ui/semantics.dart
-  const int numSemanticsFlags = 26;
+  const int numSemanticsFlags = 28;
   test('SemanticsFlag.values refers to all flags.', () async {
     expect(SemanticsFlag.values.length, equals(numSemanticsFlags));
     for (int index = 0; index < numSemanticsFlags; ++index) {
       final int flag = 1 << index;
-      expect(SemanticsFlag.values[flag], isNotNull);
-      expect(SemanticsFlag.values[flag].toString(), startsWith('SemanticsFlag.'));
+      expect(SemanticsFlag.fromIndex(flag), isNotNull);
+      expect(SemanticsFlag.fromIndex(flag).toString(), startsWith('SemanticsFlag.'));
     }
   });
 
@@ -32,9 +33,9 @@ void testMain() {
   test('SemanticsAction.values refers to all actions.', () async {
     expect(SemanticsAction.values.length, equals(numSemanticsActions));
     for (int index = 0; index < numSemanticsActions; ++index) {
-      final int flag = 1 << index;
-      expect(SemanticsAction.values[flag], isNotNull);
-      expect(SemanticsAction.values[flag].toString(), startsWith('SemanticsAction.'));
+      final int action = 1 << index;
+      expect(SemanticsAction.fromIndex(action), isNotNull);
+      expect(SemanticsAction.fromIndex(action).toString(), startsWith('SemanticsAction.'));
     }
   });
 
diff --git a/lib/web_ui/test/engine/semantics/semantics_auto_enable_test.dart b/lib/web_ui/test/engine/semantics/semantics_auto_enable_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..bdd35a9fbbccaeacf65a1eb9ae5f71ff5128140f
--- /dev/null
+++ b/lib/web_ui/test/engine/semantics/semantics_auto_enable_test.dart
@@ -0,0 +1,52 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+
+import 'package:ui/src/engine.dart';
+
+import '../../common/test_initialization.dart';
+import 'semantics_tester.dart';
+
+EngineSemantics semantics() => EngineSemantics.instance;
+EngineSemanticsOwner owner() => EnginePlatformDispatcher.instance.implicitView!.semantics;
+
+void main() {
+  internalBootstrapBrowserTest(() {
+    return testMain;
+  });
+}
+
+Future<void> testMain() async {
+  await bootstrapAndRunApp(withImplicitView: true);
+
+  test('EngineSemanticsOwner auto-enables semantics on update', () async {
+    expect(semantics().semanticsEnabled, isFalse);
+    expect(
+        EnginePlatformDispatcher
+            .instance.accessibilityFeatures.accessibleNavigation,
+        isFalse);
+
+    final DomElement placeholder = domDocument.querySelector('flt-semantics-placeholder')!;
+
+    expect(placeholder.isConnected, isTrue);
+
+    // Sending a semantics update should auto-enable engine semantics.
+    final SemanticsTester tester = SemanticsTester(owner());
+    tester.updateNode(id: 0);
+    tester.apply();
+
+    expect(semantics().semanticsEnabled, isTrue);
+    expect(
+      EnginePlatformDispatcher.instance.accessibilityFeatures.accessibleNavigation,
+      isTrue,
+    );
+
+    // The placeholder should be removed
+    expect(placeholder.isConnected, isFalse);
+  });
+}
diff --git a/lib/web_ui/test/engine/semantics/semantics_crawler_test.dart b/lib/web_ui/test/engine/semantics/semantics_crawler_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..78b4c581ef2fad9f5f45671513f3ad07e34773eb
--- /dev/null
+++ b/lib/web_ui/test/engine/semantics/semantics_crawler_test.dart
@@ -0,0 +1,194 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui;
+
+import '../../common/rendering.dart';
+import '../../common/test_initialization.dart';
+import 'semantics_tester.dart';
+
+const String _rootStyle = 'style="filter: opacity(0%); color: rgba(0, 0, 0, 0)"';
+DateTime _testTime = DateTime(2023, 2, 17);
+EngineSemantics semantics() => EngineSemantics.instance;
+EngineSemanticsOwner owner() => EnginePlatformDispatcher.instance.implicitView!.semantics;
+
+void main() {
+  internalBootstrapBrowserTest(() {
+    return testMain;
+  });
+}
+
+Future<void> testMain() async {
+  await bootstrapAndRunApp(withImplicitView: true);
+  setUpRenderingForTests();
+
+  test('renders label text as DOM', () async {
+    semantics()
+      ..debugOverrideTimestampFunction(() => _testTime)
+      ..semanticsEnabled = true;
+
+    // Add a node with a label - expect a <span>
+    {
+      final SemanticsTester tester = SemanticsTester(owner());
+      tester.updateNode(
+        id: 0,
+        label: 'Hello',
+        transform: Matrix4.identity().toFloat64(),
+        rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+      );
+      tester.apply();
+
+      expectSemanticsTree(owner(), '''
+        <sem role="text" $_rootStyle>Hello</sem>'''
+      );
+
+      final SemanticsObject node = owner().debugSemanticsTree![0]!;
+      expect(node.primaryRole?.role, PrimaryRole.generic);
+      expect(
+        reason: 'A node with a label should get a LabelAndValue role',
+        node.primaryRole!.debugSecondaryRoles,
+        contains(Role.labelAndValue),
+      );
+    }
+
+    // Change label - expect both <span> and aria-label to be updated.
+    {
+      final SemanticsTester tester = SemanticsTester(owner());
+      tester.updateNode(
+        id: 0,
+        label: 'World',
+        transform: Matrix4.identity().toFloat64(),
+        rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+      );
+      tester.apply();
+
+      expectSemanticsTree(owner(), '''
+        <sem role="text" $_rootStyle>World</sem>'''
+      );
+    }
+
+    // Empty the label - expect the <span> to be removed.
+    {
+      final SemanticsTester tester = SemanticsTester(owner());
+      tester.updateNode(
+        id: 0,
+        label: '',
+        transform: Matrix4.identity().toFloat64(),
+        rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+      );
+      tester.apply();
+
+      expectSemanticsTree(owner(), '<sem role="text" $_rootStyle></sem>');
+    }
+
+    semantics().semanticsEnabled = false;
+  });
+
+  test('does not add a span in container nodes', () async {
+    semantics()
+      ..debugOverrideTimestampFunction(() => _testTime)
+      ..semanticsEnabled = true;
+
+    final SemanticsTester tester = SemanticsTester(owner());
+    tester.updateNode(
+      id: 0,
+      label: 'I am a parent',
+      transform: Matrix4.identity().toFloat64(),
+      rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+      children: <SemanticsNodeUpdate>[
+        tester.updateNode(
+          id: 1,
+          label: 'I am a child',
+          transform: Matrix4.identity().toFloat64(),
+          rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+        ),
+      ],
+    );
+    tester.apply();
+
+    expectSemanticsTree(owner(), '''
+      <sem aria-label="I am a parent" role="group" $_rootStyle>
+        <sem-c>
+          <sem role="text">I am a child</sem>
+        </sem-c>
+      </sem>'''
+    );
+
+    semantics().semanticsEnabled = false;
+  });
+
+  test('adds a span when a leaf becomes a parent, and vice versa', () async {
+    semantics()
+      ..debugOverrideTimestampFunction(() => _testTime)
+      ..semanticsEnabled = true;
+
+    // A leaf node with a label - expect <span>
+    {
+      final SemanticsTester tester = SemanticsTester(owner());
+      tester.updateNode(
+        id: 0,
+        label: 'I am a leaf',
+        transform: Matrix4.identity().toFloat64(),
+        rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+      );
+      tester.apply();
+
+      expectSemanticsTree(owner(), '''
+        <sem role="text" $_rootStyle>I am a leaf</sem>'''
+      );
+    }
+
+    // Add a child - expect <span> to be removed from the parent.
+    {
+      final SemanticsTester tester = SemanticsTester(owner());
+      tester.updateNode(
+        id: 0,
+        label: 'I am a parent',
+        transform: Matrix4.identity().toFloat64(),
+        rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+        children: <SemanticsNodeUpdate>[
+          tester.updateNode(
+            id: 1,
+            label: 'I am a child',
+            transform: Matrix4.identity().toFloat64(),
+            rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+          ),
+        ],
+      );
+      tester.apply();
+
+      expectSemanticsTree(owner(), '''
+        <sem aria-label="I am a parent" role="group" $_rootStyle>
+          <sem-c>
+            <sem role="text">I am a child</sem>
+          </sem-c>
+        </sem>'''
+      );
+    }
+
+    // Remove the child - expect the <span> to be readded to the former parent.
+    {
+      final SemanticsTester tester = SemanticsTester(owner());
+      tester.updateNode(
+        id: 0,
+        label: 'I am a leaf again',
+        transform: Matrix4.identity().toFloat64(),
+        rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+      );
+      tester.apply();
+
+      expectSemanticsTree(owner(), '''
+        <sem role="text" $_rootStyle>I am a leaf again</sem>'''
+      );
+    }
+
+    semantics().semanticsEnabled = false;
+  });
+}
diff --git a/lib/web_ui/test/engine/semantics/semantics_helper_test.dart b/lib/web_ui/test/engine/semantics/semantics_helper_test.dart
index 2a6f5c64da0e5129e58d65a84f3475f18a5ec597..0fd5734fc967a4bc0edb278ef305acba2476b8ac 100644
--- a/lib/web_ui/test/engine/semantics/semantics_helper_test.dart
+++ b/lib/web_ui/test/engine/semantics/semantics_helper_test.dart
@@ -6,11 +6,8 @@ import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/src/engine/browser_detection.dart';
 import 'package:ui/src/engine/dom.dart';
-import 'package:ui/src/engine/pointer_binding.dart';
 import 'package:ui/src/engine/semantics.dart';
 
-const PointerSupportDetector _defaultSupportDetector = PointerSupportDetector();
-
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
@@ -21,7 +18,7 @@ void testMain() {
     late DomElement? placeholder;
 
     setUp(() {
-      EngineSemanticsOwner.instance.semanticsEnabled = false;
+      EngineSemantics.instance.semanticsEnabled = false;
       desktopSemanticsEnabler = DesktopSemanticsEnabler();
       placeholder = desktopSemanticsEnabler.prepareAccessibilityPlaceholder();
       domDocument.body!.append(placeholder!);
@@ -31,7 +28,7 @@ void testMain() {
       expect(placeholder, isNotNull,
           reason: 'Expected the test to create a placeholder');
       placeholder!.remove();
-      EngineSemanticsOwner.instance.semanticsEnabled = false;
+      EngineSemantics.instance.semanticsEnabled = false;
     });
 
     test('prepare accessibility placeholder', () async {
@@ -98,7 +95,7 @@ void testMain() {
       DomElement? placeholder;
 
       setUp(() {
-        EngineSemanticsOwner.instance.semanticsEnabled = false;
+        EngineSemantics.instance.semanticsEnabled = false;
         mobileSemanticsEnabler = MobileSemanticsEnabler();
         placeholder = mobileSemanticsEnabler.prepareAccessibilityPlaceholder();
         domDocument.body!.append(placeholder!);
@@ -106,7 +103,7 @@ void testMain() {
 
       tearDown(() {
         placeholder!.remove();
-        EngineSemanticsOwner.instance.semanticsEnabled = false;
+        EngineSemantics.instance.semanticsEnabled = false;
       });
 
       test('prepare accessibility placeholder', () async {
@@ -122,14 +119,7 @@ void testMain() {
 
       test('Non-relevant events should be forwarded to the framework',
           () async {
-        DomEvent event;
-        if (_defaultSupportDetector.hasPointerEvents) {
-          event = createDomPointerEvent('pointermove');
-        } else if (_defaultSupportDetector.hasTouchEvents) {
-          event = createDomTouchEvent('touchcancel');
-        } else {
-          event = createDomMouseEvent('mousemove');
-        }
+        final DomEvent event = createDomPointerEvent('pointermove');
 
         final bool shouldForwardToFramework =
             mobileSemanticsEnabler.tryEnableSemantics(event);
diff --git a/lib/web_ui/test/engine/semantics/semantics_multi_view_test.dart b/lib/web_ui/test/engine/semantics/semantics_multi_view_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..56f940f37ee270989dcb84b60bb7bc4753f4820c
--- /dev/null
+++ b/lib/web_ui/test/engine/semantics/semantics_multi_view_test.dart
@@ -0,0 +1,122 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui;
+
+import '../../common/test_initialization.dart';
+import 'semantics_tester.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() {
+    return testMain;
+  });
+}
+
+Future<void> testMain() async {
+  await bootstrapAndRunApp();
+
+  test('Can create multiple views each with its own semantics tree', () async {
+    EngineSemantics.instance.semanticsEnabled = true;
+
+    final DomElement host1 = createDomElement('view-host');
+    domDocument.body!.append(host1);
+    final EngineFlutterView view1 = EngineFlutterView(EnginePlatformDispatcher.instance, host1);
+    EnginePlatformDispatcher.instance.viewManager.registerView(view1);
+    final SemanticsTester tester1 = SemanticsTester(view1.semantics);
+
+    final DomElement host2 = createDomElement('view-host');
+    domDocument.body!.append(host2);
+    final EngineFlutterView view2 = EngineFlutterView(EnginePlatformDispatcher.instance, host2);
+    EnginePlatformDispatcher.instance.viewManager.registerView(view2);
+    final SemanticsTester tester2 = SemanticsTester(view2.semantics);
+
+    tester1.updateNode(id: 0);
+    tester1.apply();
+
+    tester2.updateNode(id: 0);
+    tester2.apply();
+
+    // Check that we have both root nodes in the DOM (root nodes have id == 0)
+    expect(domDocument.querySelectorAll('flutter-view'), hasLength(2));
+    expect(domDocument.querySelectorAll('flutter-view[flt-view-id="${view1.viewId}"]'), hasLength(1));
+    expect(domDocument.querySelectorAll('flutter-view[flt-view-id="${view2.viewId}"]'), hasLength(1));
+    expect(domDocument.querySelectorAll('flt-semantics[id=flt-semantic-node-0]'), hasLength(2));
+
+    // Check that each is attached to its own view
+    expect(view1.semantics.semanticsHost, view1.dom.semanticsHost);
+    expect(view2.semantics.semanticsHost, view2.dom.semanticsHost);
+
+    // Check semantics
+    expectSemanticsTree(view1.semantics, '<sem style="filter: opacity(0%); color: rgba(0, 0, 0, 0)"></sem>');
+    expectSemanticsTree(view2.semantics, '<sem style="filter: opacity(0%); color: rgba(0, 0, 0, 0)"></sem>');
+
+    // Add some children
+    tester1.updateNode(
+      id: 0,
+      children: <SemanticsNodeUpdate>[
+        tester1.updateNode(
+          id: 1,
+          isFocusable: true,
+          hasTap: true,
+          hasEnabledState: true,
+          isEnabled: true,
+          isButton: true,
+          rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+        )
+      ],
+    );
+    tester1.apply();
+
+    tester2.updateNode(
+      id: 0,
+      children: <SemanticsNodeUpdate>[
+        tester2.updateNode(
+          id: 2,
+          hasIncrease: true,
+          label: 'd',
+          rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+        ),
+      ],
+    );
+    tester2.apply();
+
+    // Test that each view renders its own semantics tree.
+    expectSemanticsTree(
+      view1.semantics,
+      '''
+<sem style="filter: opacity(0%); color: rgba(0, 0, 0, 0)">
+  <sem-c>
+    <sem flt-tappable="" role="button"></sem>
+  </sem-c>
+</sem>''',
+    );
+    expectSemanticsTree(
+      view2.semantics,
+      '''
+<sem style="filter: opacity(0%); color: rgba(0, 0, 0, 0)">
+  <sem-c>
+    <sem aria-label="d"><input aria-valuemax="1" aria-valuemin="1" aria-valuenow="1" aria-valuetext="" role="slider"></sem>
+  </sem-c>
+</sem>
+''');
+
+    // Remove the first view, but keep the second one.
+    EnginePlatformDispatcher.instance.viewManager.disposeAndUnregisterView(view1.viewId);
+
+    expect(domDocument.querySelectorAll('flutter-view'), hasLength(1));
+    expect(domDocument.querySelectorAll('flt-semantics[id=flt-semantic-node-0]'), hasLength(1));
+    expect(domDocument.querySelectorAll('flt-semantics[id=flt-semantic-node-2]'), hasLength(1));
+
+    // Disable semantics; make sure the view is there but semantics is removed.
+    EngineSemantics.instance.semanticsEnabled = false;
+    expect(domDocument.querySelectorAll('flutter-view'), hasLength(1));
+    expect(domDocument.querySelectorAll('flt-semantics[id=flt-semantic-node-0]'), isEmpty);
+  });
+}
diff --git a/lib/web_ui/test/engine/semantics/semantics_placeholder_enable_test.dart b/lib/web_ui/test/engine/semantics/semantics_placeholder_enable_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..ca0943fb56a4049e305488b9101fff6b03667c2b
--- /dev/null
+++ b/lib/web_ui/test/engine/semantics/semantics_placeholder_enable_test.dart
@@ -0,0 +1,48 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+
+import 'package:ui/src/engine.dart';
+
+import '../../common/test_initialization.dart';
+
+EngineSemantics semantics() => EngineSemantics.instance;
+
+void main() {
+  internalBootstrapBrowserTest(() {
+    return testMain;
+  });
+}
+
+Future<void> testMain() async {
+  await bootstrapAndRunApp(withImplicitView: true);
+
+  test('EngineSemantics is enabled via a placeholder click', () async {
+    expect(semantics().semanticsEnabled, isFalse);
+
+    // Synthesize a click on the placeholder.
+    final DomElement placeholder = domDocument.querySelector('flt-semantics-placeholder')!;
+
+    expect(placeholder.isConnected, isTrue);
+
+    final DomRect rect = placeholder.getBoundingClientRect();
+    placeholder.dispatchEvent(createDomMouseEvent('click', <Object?, Object?>{
+      'clientX': (rect.left + (rect.right - rect.left) / 2).floor(),
+      'clientY': (rect.top + (rect.bottom - rect.top) / 2).floor(),
+    }));
+
+    // On mobile semantics is enabled asynchronously.
+    if (isMobile) {
+      while (placeholder.isConnected!) {
+        await Future<void>.delayed(const Duration(milliseconds: 50));
+      }
+    }
+    expect(semantics().semanticsEnabled, isTrue);
+    expect(placeholder.isConnected, isFalse);
+  });
+}
diff --git a/lib/web_ui/test/engine/semantics/semantics_test.dart b/lib/web_ui/test/engine/semantics/semantics_test.dart
index c5683b9afaed04351506cdc474db943843feb86c..e44a85c46213c385284d83713d342211fce5eaf8 100644
--- a/lib/web_ui/test/engine/semantics/semantics_test.dart
+++ b/lib/web_ui/test/engine/semantics/semantics_test.dart
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-@TestOn('chrome || safari || firefox')
-
 import 'dart:async';
 import 'dart:typed_data';
 
@@ -13,12 +11,19 @@ import 'package:test/test.dart';
 
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
+import '../../common/rendering.dart';
+import '../../common/test_initialization.dart';
 import 'semantics_tester.dart';
 
 DateTime _testTime = DateTime(2018, 12, 17);
 
-EngineSemanticsOwner semantics() => EngineSemanticsOwner.instance;
+EngineSemantics semantics() => EngineSemantics.instance;
+EngineSemanticsOwner owner() => EnginePlatformDispatcher.instance.implicitView!.semantics;
+
+DomElement get platformViewsHost =>
+    EnginePlatformDispatcher.instance.implicitView!.dom.platformViewsHost;
 
 void main() {
   internalBootstrapBrowserTest(() {
@@ -27,13 +32,14 @@ void main() {
 }
 
 Future<void> testMain() async {
-  await ui.webOnlyInitializePlatform();
+  await bootstrapAndRunApp(withImplicitView: true);
+  setUpRenderingForTests();
   runSemanticsTests();
 }
 
 void runSemanticsTests() {
   setUp(() {
-    EngineSemanticsOwner.debugResetSemantics();
+    EngineSemantics.debugResetSemantics();
   });
 
   group(EngineSemanticsOwner, () {
@@ -42,6 +48,15 @@ void runSemanticsTests() {
   group('longestIncreasingSubsequence', () {
     _testLongestIncreasingSubsequence();
   });
+  group('Role managers', () {
+    _testRoleManagerLifecycle();
+  });
+  group('Text', () {
+    _testText();
+  });
+  group('labels', () {
+    _testLabels();
+  });
   group('container', () {
     _testContainer();
   });
@@ -81,6 +96,69 @@ void runSemanticsTests() {
   group('group', () {
     _testGroup();
   });
+  group('dialog', () {
+    _testDialog();
+  });
+  group('focusable', () {
+    _testFocusable();
+  });
+  group('link', () {
+    _testLink();
+  });
+}
+
+void _testRoleManagerLifecycle() {
+  test('Secondary role managers are added upon node initialization', () {
+    semantics()
+      ..debugOverrideTimestampFunction(() => _testTime)
+      ..semanticsEnabled = true;
+
+    // Check that roles are initialized immediately
+    {
+      final SemanticsTester tester = SemanticsTester(owner());
+      tester.updateNode(
+        id: 0,
+        isButton: true,
+        rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+      );
+      tester.apply();
+
+      tester.expectSemantics('<sem role="button" style="$rootSemanticStyle"></sem>');
+
+      final SemanticsObject node = owner().debugSemanticsTree![0]!;
+      expect(node.primaryRole?.role, PrimaryRole.button);
+      expect(
+        node.primaryRole?.debugSecondaryRoles,
+        containsAll(<Role>[Role.focusable, Role.tappable, Role.labelAndValue]),
+      );
+      expect(tester.getSemanticsObject(0).element.tabIndex, -1);
+    }
+
+    // Check that roles apply their functionality upon update.
+    {
+      final SemanticsTester tester = SemanticsTester(owner());
+      tester.updateNode(
+        id: 0,
+        label: 'a label',
+        isFocusable: true,
+        isButton: true,
+        rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+      );
+      tester.apply();
+
+      tester.expectSemantics('<sem role="button" style="$rootSemanticStyle">a label</sem>');
+
+      final SemanticsObject node = owner().debugSemanticsTree![0]!;
+      expect(node.primaryRole?.role, PrimaryRole.button);
+      expect(
+        node.primaryRole?.debugSecondaryRoles,
+        containsAll(<Role>[Role.focusable, Role.tappable, Role.labelAndValue]),
+      );
+      expect(tester.getSemanticsObject(0).element.tabIndex, 0);
+    }
+
+    semantics().semanticsEnabled = false;
+  });
 }
 
 void _testEngineAccessibilityBuilder() {
@@ -151,37 +229,10 @@ void _testEngineSemanticsOwner() {
     expect(semantics().mode, AccessibilityMode.unknown);
   });
 
-  test('placeholder enables semantics', () async {
-    flutterViewEmbedder.reset(); // triggers `autoEnableOnTap` to be called
-    expect(semantics().semanticsEnabled, isFalse);
-
-    // Synthesize a click on the placeholder.
-    final DomElement placeholder =
-        appHostNode.querySelector('flt-semantics-placeholder')!;
-
-    expect(placeholder.isConnected, isTrue);
-
-    final DomRect rect = placeholder.getBoundingClientRect();
-    placeholder.dispatchEvent(createDomMouseEvent(
-      'click', <Object?, Object?>{
-        'clientX': (rect.left + (rect.right - rect.left) / 2).floor(),
-        'clientY': (rect.top + (rect.bottom - rect.top) / 2).floor(),
-      }
-    ));
-
-    // On mobile semantics is enabled asynchronously.
-    if (isMobile) {
-      while (placeholder.isConnected!) {
-        await Future<void>.delayed(const Duration(milliseconds: 50));
-      }
-    }
-    expect(semantics().semanticsEnabled, isTrue);
-    expect(placeholder.isConnected, isFalse);
-  });
-
   test('accessibilityFeatures copyWith function works', () {
     const EngineAccessibilityFeatures original = EngineAccessibilityFeatures(0);
-    EngineAccessibilityFeatures copy = original.copyWith(accessibleNavigation: true);
+    EngineAccessibilityFeatures copy =
+        original.copyWith(accessibleNavigation: true);
     expect(copy.accessibleNavigation, true);
     expect(copy.boldText, false);
     expect(copy.disableAnimations, false);
@@ -245,35 +296,11 @@ void _testEngineSemanticsOwner() {
     expect(copy.reduceMotion, true);
   });
 
-  test('auto-enables semantics', () async {
-    flutterViewEmbedder.reset(); // triggers `autoEnableOnTap` to be called
-    expect(semantics().semanticsEnabled, isFalse);
-    expect(
-        EnginePlatformDispatcher
-            .instance.configuration.accessibilityFeatures.accessibleNavigation,
-        isFalse);
-
-    final DomElement placeholder =
-        appHostNode.querySelector('flt-semantics-placeholder')!;
-
-    expect(placeholder.isConnected, isTrue);
-
-    // Sending a semantics update should auto-enable engine semantics.
-    final ui.SemanticsUpdateBuilder builder = ui.SemanticsUpdateBuilder();
-    updateNode(builder);
-    semantics().updateSemantics(builder.build());
-
-    expect(semantics().semanticsEnabled, isTrue);
-    expect(
-        EnginePlatformDispatcher
-            .instance.configuration.accessibilityFeatures.accessibleNavigation,
-        isTrue);
-
-    // The placeholder should be removed
-    expect(placeholder.isConnected, isFalse);
-  });
-
-  void renderSemantics({String? label, String? tooltip}) {
+  void renderSemantics({String? label, String? tooltip, Set<ui.SemanticsFlag> flags = const <ui.SemanticsFlag>{}}) {
+    int flagValues = 0;
+    for (final ui.SemanticsFlag flag in flags) {
+      flagValues = flagValues | flag.index;
+    }
     final ui.SemanticsUpdateBuilder builder = ui.SemanticsUpdateBuilder();
     updateNode(
       builder,
@@ -287,55 +314,95 @@ void _testEngineSemanticsOwner() {
       id: 1,
       label: label ?? '',
       tooltip: tooltip ?? '',
+      flags: flagValues,
       transform: Matrix4.identity().toFloat64(),
       rect: const ui.Rect.fromLTRB(0, 0, 20, 20),
     );
-    semantics().updateSemantics(builder.build());
+    owner().updateSemantics(builder.build());
   }
 
   void renderLabel(String label) {
     renderSemantics(label: label);
   }
 
-  test('produces an aria-label', () async {
+  test('produces a label', () async {
     semantics().semanticsEnabled = true;
 
     // Create
     renderLabel('Hello');
 
-    final Map<int, SemanticsObject> tree = semantics().debugSemanticsTree!;
+    final Map<int, SemanticsObject> tree = owner().debugSemanticsTree!;
     expect(tree.length, 2);
     expect(tree[0]!.id, 0);
     expect(tree[0]!.element.tagName.toLowerCase(), 'flt-semantics');
     expect(tree[1]!.id, 1);
     expect(tree[1]!.label, 'Hello');
 
-    expectSemanticsTree('''
+    expectSemanticsTree(owner(), '''
 <sem style="$rootSemanticStyle">
   <sem-c>
-    <sem aria-label="Hello"></sem>
+    <sem role="text">Hello</sem>
   </sem-c>
 </sem>''');
 
     // Update
     renderLabel('World');
 
-    expectSemanticsTree('''
+    expectSemanticsTree(owner(), '''
 <sem style="$rootSemanticStyle">
   <sem-c>
-    <sem aria-label="World"></sem>
+    <sem role="text">World</sem>
   </sem-c>
 </sem>''');
 
     // Remove
     renderLabel('');
 
-    expectSemanticsTree('''
+    expectSemanticsTree(owner(), '''
 <sem style="$rootSemanticStyle">
   <sem-c>
-    <sem></sem>
+    <sem role="text"></sem>
+  </sem-c>
+</sem>''');
+
+    semantics().semanticsEnabled = false;
+  });
+
+  test('can switch role', () async {
+    semantics().semanticsEnabled = true;
+
+    // Create
+    renderSemantics(label: 'Hello');
+
+    Map<int, SemanticsObject> tree = owner().debugSemanticsTree!;
+    expect(tree.length, 2);
+    expect(tree[1]!.element.tagName.toLowerCase(), 'flt-semantics');
+    expect(tree[1]!.id, 1);
+    expect(tree[1]!.label, 'Hello');
+    final DomElement existingParent = tree[1]!.element.parent!;
+
+    expectSemanticsTree(owner(), '''
+<sem style="$rootSemanticStyle">
+  <sem-c>
+    <sem role="text">Hello</sem>
+  </sem-c>
+</sem>''');
+
+    // Update
+    renderSemantics(label: 'Hello', flags: <ui.SemanticsFlag>{ ui.SemanticsFlag.isLink });
+
+    tree = owner().debugSemanticsTree!;
+    expect(tree.length, 2);
+    expect(tree[1]!.id, 1);
+    expect(tree[1]!.label, 'Hello');
+    expect(tree[1]!.element.tagName.toLowerCase(), 'a');
+    expectSemanticsTree(owner(), '''
+<sem style="$rootSemanticStyle">
+  <sem-c>
+    <a style="display: block;">Hello</a>
   </sem-c>
 </sem>''');
+    expect(existingParent, tree[1]!.element.parent);
 
     semantics().semanticsEnabled = false;
   });
@@ -346,37 +413,37 @@ void _testEngineSemanticsOwner() {
     // Create
     renderSemantics(tooltip: 'tooltip');
 
-    final Map<int, SemanticsObject> tree = semantics().debugSemanticsTree!;
+    final Map<int, SemanticsObject> tree = owner().debugSemanticsTree!;
     expect(tree.length, 2);
     expect(tree[0]!.id, 0);
     expect(tree[0]!.element.tagName.toLowerCase(), 'flt-semantics');
     expect(tree[1]!.id, 1);
     expect(tree[1]!.tooltip, 'tooltip');
 
-    expectSemanticsTree('''
+    expectSemanticsTree(owner(), '''
 <sem style="$rootSemanticStyle">
   <sem-c>
-    <sem aria-label="tooltip"></sem>
+    <sem>tooltip</sem>
   </sem-c>
 </sem>''');
 
     // Update
     renderSemantics(label: 'Hello', tooltip: 'tooltip');
 
-    expectSemanticsTree('''
+    expectSemanticsTree(owner(), '''
 <sem style="$rootSemanticStyle">
   <sem-c>
-    <sem aria-label="tooltip\nHello"></sem>
+    <sem role="text">tooltip\nHello</sem>
   </sem-c>
 </sem>''');
 
     // Remove
     renderSemantics();
 
-    expectSemanticsTree('''
+    expectSemanticsTree(owner(), '''
 <sem style="$rootSemanticStyle">
   <sem-c>
-    <sem></sem>
+    <sem role="text"></sem>
   </sem-c>
 </sem>''');
 
@@ -384,12 +451,12 @@ void _testEngineSemanticsOwner() {
   });
 
   test('clears semantics tree when disabled', () {
-    expect(semantics().debugSemanticsTree, isEmpty);
+    expect(owner().debugSemanticsTree, isEmpty);
     semantics().semanticsEnabled = true;
     renderLabel('Hello');
-    expect(semantics().debugSemanticsTree, isNotEmpty);
+    expect(owner().debugSemanticsTree, isNotEmpty);
     semantics().semanticsEnabled = false;
-    expect(semantics().debugSemanticsTree, isEmpty);
+    expect(owner().debugSemanticsTree, isEmpty);
   });
 
   test('accepts standalone browser gestures', () {
@@ -427,19 +494,107 @@ void _testEngineSemanticsOwner() {
     );
   });
 
-  test('forwards events to framework if shouldEnableSemantics returns true', () {
+  test('forwards events to framework if shouldEnableSemantics returns true',
+      () {
     final MockSemanticsEnabler mockSemanticsEnabler = MockSemanticsEnabler();
     semantics().semanticsHelper.semanticsEnabler = mockSemanticsEnabler;
     final DomEvent pointerEvent = createDomEvent('Event', 'pointermove');
     mockSemanticsEnabler.shouldEnableSemanticsReturnValue = true;
     expect(semantics().receiveGlobalEvent(pointerEvent), isTrue);
   });
+
+  test('semantics owner update phases', () async {
+    semantics()
+      ..debugOverrideTimestampFunction(() => _testTime)
+      ..semanticsEnabled = true;
+
+    expect(
+      reason: 'Should start in idle phase',
+      owner().phase,
+      SemanticsUpdatePhase.idle,
+    );
+
+    void pumpSemantics({ required String label }) {
+      final SemanticsTester tester = SemanticsTester(owner());
+      tester.updateNode(
+        id: 0,
+        children: <SemanticsNodeUpdate>[
+          tester.updateNode(id: 1, label: label),
+        ],
+      );
+      tester.apply();
+    }
+
+    SemanticsUpdatePhase? capturedPostUpdateCallbackPhase;
+    owner().addOneTimePostUpdateCallback(() {
+      capturedPostUpdateCallbackPhase = owner().phase;
+    });
+
+    pumpSemantics(label: 'Hello');
+
+    final SemanticsObject semanticsObject = owner().debugSemanticsTree![1]!;
+
+    expect(
+      reason: 'Should be in postUpdate phase while calling post-update callbacks',
+      capturedPostUpdateCallbackPhase,
+      SemanticsUpdatePhase.postUpdate,
+    );
+    expect(
+      reason: 'After the update is done, should go back to idle',
+      owner().phase,
+      SemanticsUpdatePhase.idle,
+    );
+
+    // Rudely replace the role manager with a mock, and trigger an update.
+    final MockRoleManager mockRoleManager = MockRoleManager(PrimaryRole.generic, semanticsObject);
+    semanticsObject.primaryRole = mockRoleManager;
+
+    pumpSemantics(label: 'World');
+
+    expect(
+      reason: 'While updating must be in SemanticsUpdatePhase.updating phase',
+      mockRoleManager.log,
+      <MockRoleManagerLogEntry>[
+        (method: 'update', phase: SemanticsUpdatePhase.updating),
+      ],
+    );
+
+    semantics().semanticsEnabled = false;
+  });
 }
 
-class MockSemanticsEnabler implements SemanticsEnabler {
+typedef MockRoleManagerLogEntry = ({
+  String method,
+  SemanticsUpdatePhase phase,
+});
+
+class MockRoleManager extends PrimaryRoleManager {
+  MockRoleManager(super.role, super.semanticsObject) : super.blank();
+
+  final List<MockRoleManagerLogEntry> log = <MockRoleManagerLogEntry>[];
+
+  void _log(String method) {
+    log.add((
+      method: method,
+      phase: semanticsObject.owner.phase,
+    ));
+  }
+
+  @override
+  void update() {
+    super.update();
+    _log('update');
+  }
+
   @override
-  void dispose() {
+  bool focusAsRouteDefault() {
+    throw UnimplementedError();
   }
+}
+
+class MockSemanticsEnabler implements SemanticsEnabler {
+  @override
+  void dispose() {}
 
   @override
   bool get isWaitingToEnableSemantics => throw UnimplementedError();
@@ -479,9 +634,9 @@ void _testHeader() {
       rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
     );
 
-    semantics().updateSemantics(builder.build());
-    expectSemanticsTree('''
-<sem role="heading" aria-label="Header of the page" style="$rootSemanticStyle"></sem>
+    owner().updateSemantics(builder.build());
+    expectSemanticsTree(owner(), '''
+<sem role="heading" style="$rootSemanticStyle">Header of the page</sem>
 ''');
 
     semantics().semanticsEnabled = false;
@@ -515,8 +670,8 @@ void _testHeader() {
       rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
     );
 
-    semantics().updateSemantics(builder.build());
-    expectSemanticsTree('''
+    owner().updateSemantics(builder.build());
+    expectSemanticsTree(owner(), '''
 <sem role="group" aria-label="Header of the page" style="$rootSemanticStyle"><sem-c><sem></sem></sem-c></sem>
 ''');
 
@@ -569,6 +724,158 @@ void _testLongestIncreasingSubsequence() {
   });
 }
 
+void _testText() {
+  test('renders a piece of plain text', () async {
+    semantics()
+      ..debugOverrideTimestampFunction(() => _testTime)
+      ..semanticsEnabled = true;
+
+    final ui.SemanticsUpdateBuilder builder = ui.SemanticsUpdateBuilder();
+    updateNode(
+      builder,
+      label: 'plain text',
+      rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+    );
+    owner().updateSemantics(builder.build());
+
+    expectSemanticsTree(
+      owner(),
+      '''<sem role="text" style="$rootSemanticStyle">plain text</sem>''',
+    );
+
+    final SemanticsObject node = owner().debugSemanticsTree![0]!;
+    expect(node.primaryRole?.role, PrimaryRole.generic);
+    expect(
+      node.primaryRole!.secondaryRoleManagers!.map((RoleManager m) => m.runtimeType).toList(),
+      <Type>[
+        Focusable,
+        LiveRegion,
+        RouteName,
+        LabelAndValue,
+      ],
+    );
+    semantics().semanticsEnabled = false;
+  });
+
+  test('renders a tappable piece of text', () async {
+    semantics()
+      ..debugOverrideTimestampFunction(() => _testTime)
+      ..semanticsEnabled = true;
+
+    final SemanticsTester tester = SemanticsTester(owner());
+    tester.updateNode(
+      id: 0,
+      hasTap: true,
+      label: 'tappable text',
+      rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+    );
+    tester.apply();
+
+    expectSemanticsTree(
+      owner(),
+      '''<sem flt-tappable="" role="text" style="$rootSemanticStyle">tappable text</sem>''',
+    );
+
+    final SemanticsObject node = owner().debugSemanticsTree![0]!;
+    expect(node.primaryRole?.role, PrimaryRole.generic);
+    expect(
+      node.primaryRole!.secondaryRoleManagers!.map((RoleManager m) => m.runtimeType).toList(),
+      <Type>[
+        Focusable,
+        LiveRegion,
+        RouteName,
+        LabelAndValue,
+        Tappable,
+      ],
+    );
+    semantics().semanticsEnabled = false;
+  });
+}
+
+void _testLabels() {
+  test('computeDomSemanticsLabel combines tooltip, label, value, and hint', () {
+    expect(
+      computeDomSemanticsLabel(tooltip: 'tooltip'),
+      'tooltip',
+    );
+    expect(
+      computeDomSemanticsLabel(label: 'label'),
+      'label',
+    );
+    expect(
+      computeDomSemanticsLabel(value: 'value'),
+      'value',
+    );
+    expect(
+      computeDomSemanticsLabel(hint: 'hint'),
+      'hint',
+    );
+    expect(
+      computeDomSemanticsLabel(tooltip: 'tooltip', label: 'label', hint: 'hint', value: 'value'),
+      '''
+tooltip
+label hint value'''
+    );
+    expect(
+      computeDomSemanticsLabel(tooltip: 'tooltip', hint: 'hint', value: 'value'),
+      '''
+tooltip
+hint value'''
+    );
+    expect(
+      computeDomSemanticsLabel(tooltip: 'tooltip', label: 'label', value: 'value'),
+      '''
+tooltip
+label value'''
+    );
+    expect(
+      computeDomSemanticsLabel(tooltip: 'tooltip', label: 'label', hint: 'hint'),
+      '''
+tooltip
+label hint'''
+    );
+  });
+
+  test('computeDomSemanticsLabel collapses empty labels to null', () {
+    expect(
+      computeDomSemanticsLabel(),
+      isNull,
+    );
+    expect(
+      computeDomSemanticsLabel(tooltip: ''),
+      isNull,
+    );
+    expect(
+      computeDomSemanticsLabel(label: ''),
+      isNull,
+    );
+    expect(
+      computeDomSemanticsLabel(value: ''),
+      isNull,
+    );
+    expect(
+      computeDomSemanticsLabel(hint: ''),
+      isNull,
+    );
+    expect(
+      computeDomSemanticsLabel(tooltip: '', label: '', hint: '', value: ''),
+      isNull,
+    );
+    expect(
+      computeDomSemanticsLabel(tooltip: '', hint: '', value: ''),
+      isNull,
+    );
+    expect(
+      computeDomSemanticsLabel(tooltip: '', label: '', value: ''),
+      isNull,
+    );
+    expect(
+      computeDomSemanticsLabel(tooltip: '', label: '', hint: ''),
+      isNull,
+    );
+  });
+}
+
 void _testContainer() {
   test('container node has no transform when there is no rect offset',
       () async {
@@ -592,8 +899,8 @@ void _testContainer() {
       rect: zeroOffsetRect,
     );
 
-    semantics().updateSemantics(builder.build());
-    expectSemanticsTree('''
+    owner().updateSemantics(builder.build());
+    expectSemanticsTree(owner(), '''
 <sem style="$rootSemanticStyle">
   <sem-c>
     <sem></sem>
@@ -601,9 +908,9 @@ void _testContainer() {
 </sem>''');
 
     final DomElement parentElement =
-        appHostNode.querySelector('flt-semantics')!;
+        owner().semanticsHost.querySelector('flt-semantics')!;
     final DomElement container =
-        appHostNode.querySelector('flt-semantics-container')!;
+        owner().semanticsHost.querySelector('flt-semantics-container')!;
 
     if (isMacOrIOS) {
       expect(parentElement.style.top, '0px');
@@ -643,8 +950,8 @@ void _testContainer() {
       rect: const ui.Rect.fromLTRB(10, 10, 20, 20),
     );
 
-    semantics().updateSemantics(builder.build());
-    expectSemanticsTree('''
+    owner().updateSemantics(builder.build());
+    expectSemanticsTree(owner(), '''
 <sem style="$rootSemanticStyle">
   <sem-c>
     <sem></sem>
@@ -652,12 +959,17 @@ void _testContainer() {
 </sem>''');
 
     final DomElement parentElement =
-        appHostNode.querySelector('flt-semantics')!;
+        owner().semanticsHost.querySelector('flt-semantics')!;
     final DomElement container =
-        appHostNode.querySelector('flt-semantics-container')!;
+        owner().semanticsHost.querySelector('flt-semantics-container')!;
 
     expect(parentElement.style.transform, 'matrix(1, 0, 0, 1, 10, 10)');
-    expect(parentElement.style.transformOrigin, '0px 0px 0px');
+    if (isSafari) {
+      // macOS 13 returns different values than macOS 12.
+      expect(parentElement.style.transformOrigin, anyOf(contains('0px 0px 0px'), contains('0px 0px')));
+    } else {
+      expect(parentElement.style.transformOrigin, '0px 0px 0px');
+    }
     expect(container.style.top, '-10px');
     expect(container.style.left, '-10px');
     semantics().semanticsEnabled = false;
@@ -683,8 +995,8 @@ void _testContainer() {
       rect: const ui.Rect.fromLTRB(10, 10, 20, 20),
     );
 
-    semantics().updateSemantics(builder.build());
-    expectSemanticsTree('''
+    owner().updateSemantics(builder.build());
+    expectSemanticsTree(owner(), '''
 <sem style="$rootSemanticStyle">
   <sem-c>
     <sem></sem>
@@ -692,9 +1004,9 @@ void _testContainer() {
 </sem>''');
 
     final DomElement parentElement =
-        appHostNode.querySelector('flt-semantics')!;
+        owner().semanticsHost.querySelector('flt-semantics')!;
     final DomElement container =
-        appHostNode.querySelector('flt-semantics-container')!;
+        owner().semanticsHost.querySelector('flt-semantics-container')!;
 
     if (isMacOrIOS) {
       expect(parentElement.style.top, '0px');
@@ -715,7 +1027,8 @@ void _testContainer() {
     semantics().semanticsEnabled = false;
   });
 
-  test('renders in traversal order, hit-tests in reverse z-index order', () async {
+  test('renders in traversal order, hit-tests in reverse z-index order',
+      () async {
     semantics()
       ..debugOverrideTimestampFunction(() => _testTime)
       ..semanticsEnabled = true;
@@ -733,8 +1046,8 @@ void _testContainer() {
         updateNode(builder, id: id);
       }
 
-      semantics().updateSemantics(builder.build());
-      expectSemanticsTree('''
+      owner().updateSemantics(builder.build());
+      expectSemanticsTree(owner(), '''
 <sem style="$rootSemanticStyle">
   <sem-c>
     <sem style="z-index: 4"></sem>
@@ -753,8 +1066,8 @@ void _testContainer() {
         childrenInTraversalOrder: Int32List.fromList(<int>[1, 2, 3, 4]),
         childrenInHitTestOrder: Int32List.fromList(<int>[1, 2, 3, 4]),
       );
-      semantics().updateSemantics(builder.build());
-      expectSemanticsTree('''
+      owner().updateSemantics(builder.build());
+      expectSemanticsTree(owner(), '''
 <sem style="$rootSemanticStyle">
   <sem-c>
     <sem style="z-index: 4"></sem>
@@ -773,8 +1086,8 @@ void _testContainer() {
         childrenInTraversalOrder: Int32List.fromList(<int>[4, 2, 3, 1]),
         childrenInHitTestOrder: Int32List.fromList(<int>[1, 2, 3, 4]),
       );
-      semantics().updateSemantics(builder.build());
-      expectSemanticsTree('''
+      owner().updateSemantics(builder.build());
+      expectSemanticsTree(owner(), '''
 <sem style="$rootSemanticStyle">
   <sem-c>
     <sem style="z-index: 1"></sem>
@@ -793,8 +1106,8 @@ void _testContainer() {
         childrenInTraversalOrder: Int32List.fromList(<int>[1, 3, 2, 4]),
         childrenInHitTestOrder: Int32List.fromList(<int>[3, 4, 1, 2]),
       );
-      semantics().updateSemantics(builder.build());
-      expectSemanticsTree('''
+      owner().updateSemantics(builder.build());
+      expectSemanticsTree(owner(), '''
 <sem style="$rootSemanticStyle">
   <sem-c>
     <sem style="z-index: 2"></sem>
@@ -808,7 +1121,9 @@ void _testContainer() {
     semantics().semanticsEnabled = false;
   });
 
-  test('container nodes are transparent and leaf children are opaque hit-test wise', () async {
+  test(
+      'container nodes are transparent and leaf children are opaque hit-test wise',
+      () async {
     semantics()
       ..debugOverrideTimestampFunction(() => _testTime)
       ..semanticsEnabled = true;
@@ -822,8 +1137,8 @@ void _testContainer() {
     updateNode(builder, id: 1);
     updateNode(builder, id: 2);
 
-    semantics().updateSemantics(builder.build());
-    expectSemanticsTree('''
+    owner().updateSemantics(builder.build());
+    expectSemanticsTree(owner(), '''
 <sem style="$rootSemanticStyle">
   <sem-c>
     <sem style="z-index: 2"></sem>
@@ -831,17 +1146,105 @@ void _testContainer() {
   </sem-c>
 </sem>''');
 
-    final DomElement root = appHostNode.querySelector('#flt-semantic-node-0')!;
+    final DomElement root = owner().semanticsHost.querySelector('#flt-semantic-node-0')!;
     expect(root.style.pointerEvents, 'none');
 
-    final DomElement child1 = appHostNode.querySelector('#flt-semantic-node-1')!;
+    final DomElement child1 =
+        owner().semanticsHost.querySelector('#flt-semantic-node-1')!;
     expect(child1.style.pointerEvents, 'all');
 
-    final DomElement child2 = appHostNode.querySelector('#flt-semantic-node-2')!;
+    final DomElement child2 =
+        owner().semanticsHost.querySelector('#flt-semantic-node-2')!;
     expect(child2.style.pointerEvents, 'all');
 
     semantics().semanticsEnabled = false;
   });
+
+  test('descendant nodes are removed from the node map, unless reparented', () async {
+    semantics()
+      ..debugOverrideTimestampFunction(() => _testTime)
+      ..semanticsEnabled = true;
+
+    {
+      final ui.SemanticsUpdateBuilder builder = ui.SemanticsUpdateBuilder();
+      updateNode(
+        builder,
+        childrenInTraversalOrder: Int32List.fromList(<int>[1, 2]),
+        childrenInHitTestOrder: Int32List.fromList(<int>[1, 2]),
+      );
+      updateNode(
+        builder,
+        id: 1,
+        childrenInTraversalOrder: Int32List.fromList(<int>[3, 4]),
+        childrenInHitTestOrder: Int32List.fromList(<int>[3, 4]),
+      );
+      updateNode(
+        builder,
+        id: 2,
+        childrenInTraversalOrder: Int32List.fromList(<int>[5, 6]),
+        childrenInHitTestOrder: Int32List.fromList(<int>[5, 6]),
+      );
+      updateNode(builder, id: 3);
+      updateNode(builder, id: 4);
+      updateNode(builder, id: 5);
+      updateNode(builder, id: 6);
+
+      owner().updateSemantics(builder.build());
+      expectSemanticsTree(owner(), '''
+  <sem style="$rootSemanticStyle">
+    <sem-c>
+      <sem style="z-index: 2">
+        <sem-c>
+          <sem style="z-index: 2"></sem>
+          <sem style="z-index: 1"></sem>
+        </sem-c>
+      </sem>
+      <sem style="z-index: 1">
+        <sem-c>
+          <sem style="z-index: 2"></sem>
+          <sem style="z-index: 1"></sem>
+        </sem-c>
+      </sem>
+    </sem-c>
+  </sem>''');
+
+      expect(owner().debugSemanticsTree!.keys.toList(), unorderedEquals(<int>[0, 1, 2, 3, 4, 5, 6]));
+    }
+
+    // Remove node #2 => expect nodes #2 and #5 to be removed and #6 reparented.
+    {
+      final ui.SemanticsUpdateBuilder builder = ui.SemanticsUpdateBuilder();
+      updateNode(
+        builder,
+        childrenInTraversalOrder: Int32List.fromList(<int>[1]),
+        childrenInHitTestOrder: Int32List.fromList(<int>[1]),
+      );
+      updateNode(
+        builder,
+        id: 1,
+        childrenInTraversalOrder: Int32List.fromList(<int>[3, 4, 6]),
+        childrenInHitTestOrder: Int32List.fromList(<int>[3, 4, 6]),
+      );
+
+      owner().updateSemantics(builder.build());
+      expectSemanticsTree(owner(), '''
+  <sem style="$rootSemanticStyle">
+    <sem-c>
+      <sem style="z-index: 2">
+        <sem-c>
+          <sem style="z-index: 3"></sem>
+          <sem style="z-index: 2"></sem>
+          <sem style="z-index: 1"></sem>
+        </sem-c>
+      </sem>
+    </sem-c>
+  </sem>''');
+
+      expect(owner().debugSemanticsTree!.keys.toList(), unorderedEquals(<int>[0, 1, 3, 4, 6]));
+    }
+
+    semantics().semanticsEnabled = false;
+  });
 }
 
 void _testVerticalScrolling() {
@@ -858,14 +1261,14 @@ void _testVerticalScrolling() {
       rect: const ui.Rect.fromLTRB(0, 0, 50, 100),
     );
 
-    semantics().updateSemantics(builder.build());
-    expectSemanticsTree('''
+    owner().updateSemantics(builder.build());
+    expectSemanticsTree(owner(), '''
 <sem style="$rootSemanticStyle; touch-action: none; overflow-y: scroll">
 <flt-semantics-scroll-overflow></flt-semantics-scroll-overflow>
 </sem>''');
 
-    final DomElement? scrollable = findScrollable();
-    expect(scrollable!.scrollTop, isPositive);
+    final DomElement scrollable = findScrollable(owner());
+    expect(scrollable.scrollTop, isPositive);
     semantics().semanticsEnabled = false;
   });
 
@@ -890,8 +1293,8 @@ void _testVerticalScrolling() {
       rect: const ui.Rect.fromLTRB(10, 10, 20, 20),
     );
 
-    semantics().updateSemantics(builder.build());
-    expectSemanticsTree('''
+    owner().updateSemantics(builder.build());
+    expectSemanticsTree(owner(), '''
 <sem style="$rootSemanticStyle; touch-action: none; overflow-y: scroll">
 <flt-semantics-scroll-overflow></flt-semantics-scroll-overflow>
   <sem-c>
@@ -899,42 +1302,34 @@ void _testVerticalScrolling() {
   </sem-c>
 </sem>''');
 
-    final DomElement? scrollable = findScrollable();
+    final DomElement scrollable = findScrollable(owner());
     expect(scrollable, isNotNull);
 
     // When there's less content than the available size the neutral scrollTop
     // is still a positive number.
-    expect(scrollable!.scrollTop, isPositive);
+    expect(scrollable.scrollTop, isPositive);
 
     semantics().semanticsEnabled = false;
   });
 
   test('scrollable node dispatches scroll events', () async {
-    final StreamController<int> idLogController = StreamController<int>();
-    final StreamController<ui.SemanticsAction> actionLogController =
-        StreamController<ui.SemanticsAction>();
-    final Stream<int> idLog = idLogController.stream.asBroadcastStream();
-    final Stream<ui.SemanticsAction> actionLog =
-        actionLogController.stream.asBroadcastStream();
-
-    // The browser kicks us out of the test zone when the scroll event happens.
-    // We memorize the test zone so we can call expect when the callback is
-    // fired.
-    final Zone testZone = Zone.current;
-
-    ui.window.onSemanticsAction =
-        (int id, ui.SemanticsAction action, ByteData? args) {
-      idLogController.add(id);
-      actionLogController.add(action);
-      testZone.run(() {
-        expect(args, null);
-      });
-    };
+    Future<ui.SemanticsActionEvent> captureSemanticsEvent() {
+      final Completer<ui.SemanticsActionEvent> completer = Completer<ui.SemanticsActionEvent>();
+      ui.PlatformDispatcher.instance.onSemanticsActionEvent = (ui.SemanticsActionEvent event) {
+        completer.complete(event);
+      };
+      return completer.future;
+    }
+
     semantics()
       ..debugOverrideTimestampFunction(() => _testTime)
       ..semanticsEnabled = true;
 
-    final ui.SemanticsUpdateBuilder builder = ui.SemanticsUpdateBuilder();
+    addTearDown(() async {
+      semantics().semanticsEnabled = false;
+    });
+
+    final ui.SemanticsUpdateBuilder builder = ui.SemanticsUpdateBuilder();
     updateNode(
       builder,
       actions: 0 |
@@ -946,7 +1341,7 @@ void _testVerticalScrolling() {
       childrenInTraversalOrder: Int32List.fromList(<int>[1, 2, 3]),
     );
 
-    for (int id = 1; id <= 5; id++) {
+    for (int id = 1; id <= 3; id++) {
       updateNode(
         builder,
         id: id,
@@ -955,8 +1350,8 @@ void _testVerticalScrolling() {
       );
     }
 
-    semantics().updateSemantics(builder.build());
-    expectSemanticsTree('''
+    owner().updateSemantics(builder.build());
+    expectSemanticsTree(owner(), '''
 <sem style="$rootSemanticStyle; touch-action: none; overflow-y: scroll">
   <flt-semantics-scroll-overflow></flt-semantics-scroll-overflow>
   <sem-c>
@@ -966,7 +1361,7 @@ void _testVerticalScrolling() {
   </sem-c>
 </sem>''');
 
-    final DomElement? scrollable = findScrollable();
+    final DomElement scrollable = owner().debugSemanticsTree![0]!.element;
     expect(scrollable, isNotNull);
 
     // When there's more content than the available size the neutral scrollTop
@@ -979,23 +1374,29 @@ void _testVerticalScrolling() {
       browserMaxScrollDiff = 1;
     }
 
-    expect(scrollable!.scrollTop >= (10 - browserMaxScrollDiff), isTrue);
+    expect(scrollable.scrollTop >= (10 - browserMaxScrollDiff), isTrue);
 
+    Future<ui.SemanticsActionEvent> capturedEventFuture = captureSemanticsEvent();
     scrollable.scrollTop = 20;
     expect(scrollable.scrollTop, 20);
-    expect(await idLog.first, 0);
-    expect(await actionLog.first, ui.SemanticsAction.scrollUp);
+    ui.SemanticsActionEvent capturedEvent = await capturedEventFuture;
+
+    expect(capturedEvent.nodeId, 0);
+    expect(capturedEvent.type, ui.SemanticsAction.scrollUp);
+    expect(capturedEvent.arguments, isNull);
     // Engine semantics returns scroll top back to neutral.
     expect(scrollable.scrollTop >= (10 - browserMaxScrollDiff), isTrue);
 
+    capturedEventFuture = captureSemanticsEvent();
     scrollable.scrollTop = 5;
+    capturedEvent = await capturedEventFuture;
+
     expect(scrollable.scrollTop >= (5 - browserMaxScrollDiff), isTrue);
-    expect(await idLog.first, 0);
-    expect(await actionLog.first, ui.SemanticsAction.scrollDown);
+    expect(capturedEvent.nodeId, 0);
+    expect(capturedEvent.type, ui.SemanticsAction.scrollDown);
+    expect(capturedEvent.arguments, isNull);
     // Engine semantics returns scroll top back to neutral.
     expect(scrollable.scrollTop >= (10 - browserMaxScrollDiff), isTrue);
-
-    semantics().semanticsEnabled = false;
   });
 }
 
@@ -1013,8 +1414,8 @@ void _testHorizontalScrolling() {
       rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
     );
 
-    semantics().updateSemantics(builder.build());
-    expectSemanticsTree('''
+    owner().updateSemantics(builder.build());
+    expectSemanticsTree(owner(), '''
 <sem style="$rootSemanticStyle; touch-action: none; overflow-x: scroll">
 <flt-semantics-scroll-overflow></flt-semantics-scroll-overflow>
 </sem>''');
@@ -1043,8 +1444,8 @@ void _testHorizontalScrolling() {
       rect: const ui.Rect.fromLTRB(10, 10, 20, 20),
     );
 
-    semantics().updateSemantics(builder.build());
-    expectSemanticsTree('''
+    owner().updateSemantics(builder.build());
+    expectSemanticsTree(owner(), '''
 <sem style="$rootSemanticStyle; touch-action: none; overflow-x: scroll">
 <flt-semantics-scroll-overflow></flt-semantics-scroll-overflow>
   <sem-c>
@@ -1052,22 +1453,33 @@ void _testHorizontalScrolling() {
   </sem-c>
 </sem>''');
 
-    final DomElement? scrollable = findScrollable();
+    final DomElement scrollable = findScrollable(owner());
     expect(scrollable, isNotNull);
 
     // When there's less content than the available size the neutral
     // scrollLeft is still a positive number.
-    expect(scrollable!.scrollLeft, isPositive);
+    expect(scrollable.scrollLeft, isPositive);
 
     semantics().semanticsEnabled = false;
   });
 
   test('scrollable node dispatches scroll events', () async {
-    final SemanticsActionLogger logger = SemanticsActionLogger();
+    Future<ui.SemanticsActionEvent> captureSemanticsEvent() {
+      final Completer<ui.SemanticsActionEvent> completer = Completer<ui.SemanticsActionEvent>();
+      ui.PlatformDispatcher.instance.onSemanticsActionEvent = (ui.SemanticsActionEvent event) {
+        completer.complete(event);
+      };
+      return completer.future;
+    }
+
     semantics()
       ..debugOverrideTimestampFunction(() => _testTime)
       ..semanticsEnabled = true;
 
+    addTearDown(() async {
+      semantics().semanticsEnabled = false;
+    });
+
     final ui.SemanticsUpdateBuilder builder = ui.SemanticsUpdateBuilder();
     updateNode(
       builder,
@@ -1089,8 +1501,8 @@ void _testHorizontalScrolling() {
       );
     }
 
-    semantics().updateSemantics(builder.build());
-    expectSemanticsTree('''
+    owner().updateSemantics(builder.build());
+    expectSemanticsTree(owner(), '''
 <sem style="$rootSemanticStyle; touch-action: none; overflow-x: scroll">
   <flt-semantics-scroll-overflow></flt-semantics-scroll-overflow>
   <sem-c>
@@ -1100,7 +1512,7 @@ void _testHorizontalScrolling() {
   </sem-c>
 </sem>''');
 
-    final DomElement? scrollable = findScrollable();
+    final DomElement scrollable = findScrollable(owner());
     expect(scrollable, isNotNull);
 
     // When there's more content than the available size the neutral scrollTop
@@ -1112,23 +1524,29 @@ void _testHorizontalScrolling() {
         operatingSystem == OperatingSystem.macOs) {
       browserMaxScrollDiff = 1;
     }
-    expect(scrollable!.scrollLeft >= (10 - browserMaxScrollDiff), isTrue);
+    expect(scrollable.scrollLeft >= (10 - browserMaxScrollDiff), isTrue);
 
+    Future<ui.SemanticsActionEvent> capturedEventFuture = captureSemanticsEvent();
     scrollable.scrollLeft = 20;
     expect(scrollable.scrollLeft, 20);
-    expect(await logger.idLog.first, 0);
-    expect(await logger.actionLog.first, ui.SemanticsAction.scrollLeft);
+    ui.SemanticsActionEvent capturedEvent = await capturedEventFuture;
+
+    expect(capturedEvent.nodeId, 0);
+    expect(capturedEvent.type, ui.SemanticsAction.scrollLeft);
+    expect(capturedEvent.arguments, isNull);
     // Engine semantics returns scroll position back to neutral.
     expect(scrollable.scrollLeft >= (10 - browserMaxScrollDiff), isTrue);
 
+    capturedEventFuture = captureSemanticsEvent();
     scrollable.scrollLeft = 5;
+    capturedEvent = await capturedEventFuture;
+
     expect(scrollable.scrollLeft >= (5 - browserMaxScrollDiff), isTrue);
-    expect(await logger.idLog.first, 0);
-    expect(await logger.actionLog.first, ui.SemanticsAction.scrollRight);
+    expect(capturedEvent.nodeId, 0);
+    expect(capturedEvent.type, ui.SemanticsAction.scrollRight);
+    expect(capturedEvent.arguments, isNull);
     // Engine semantics returns scroll top back to neutral.
     expect(scrollable.scrollLeft >= (10 - browserMaxScrollDiff), isTrue);
-
-    semantics().semanticsEnabled = false;
   });
 }
 
@@ -1147,12 +1565,20 @@ void _testIncrementables() {
       rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
     );
 
-    semantics().updateSemantics(builder.build());
-    expectSemanticsTree('''
+    owner().updateSemantics(builder.build());
+    expectSemanticsTree(owner(), '''
 <sem style="$rootSemanticStyle">
-  <input aria-valuenow="1" aria-valuetext="d" aria-valuemax="1" aria-valuemin="1">
+  <input role="slider" aria-valuenow="1" aria-valuetext="d" aria-valuemax="1" aria-valuemin="1">
 </sem>''');
 
+    final SemanticsObject node = owner().debugSemanticsTree![0]!;
+    expect(node.primaryRole?.role, PrimaryRole.incrementable);
+    expect(
+      reason: 'Incrementables use custom focus management',
+      node.primaryRole!.debugSecondaryRoles,
+      isNot(contains(Role.focusable)),
+    );
+
     semantics().semanticsEnabled = false;
   });
 
@@ -1172,14 +1598,14 @@ void _testIncrementables() {
       rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
     );
 
-    semantics().updateSemantics(builder.build());
-    expectSemanticsTree('''
+    owner().updateSemantics(builder.build());
+    expectSemanticsTree(owner(), '''
 <sem style="$rootSemanticStyle">
-  <input aria-valuenow="1" aria-valuetext="d" aria-valuemax="2" aria-valuemin="1">
+  <input role="slider" aria-valuenow="1" aria-valuetext="d" aria-valuemax="2" aria-valuemin="1">
 </sem>''');
 
-    final DomHTMLInputElement input = appHostNode.querySelector('input')! as
-        DomHTMLInputElement;
+    final DomHTMLInputElement input =
+        owner().semanticsHost.querySelector('input')! as DomHTMLInputElement;
     input.value = '2';
     input.dispatchEvent(createDomEvent('Event', 'change'));
 
@@ -1205,14 +1631,14 @@ void _testIncrementables() {
       rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
     );
 
-    semantics().updateSemantics(builder.build());
-    expectSemanticsTree('''
+    owner().updateSemantics(builder.build());
+    expectSemanticsTree(owner(), '''
 <sem style="$rootSemanticStyle">
-  <input aria-valuenow="1" aria-valuetext="d" aria-valuemax="1" aria-valuemin="0">
+  <input role="slider" aria-valuenow="1" aria-valuetext="d" aria-valuemax="1" aria-valuemin="0">
 </sem>''');
 
-    final DomHTMLInputElement input = appHostNode.querySelector('input')! as
-        DomHTMLInputElement;
+    final DomHTMLInputElement input =
+        owner().semanticsHost.querySelector('input')! as DomHTMLInputElement;
     input.value = '0';
     input.dispatchEvent(createDomEvent('Event', 'change'));
 
@@ -1240,14 +1666,65 @@ void _testIncrementables() {
       rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
     );
 
-    semantics().updateSemantics(builder.build());
-    expectSemanticsTree('''
+    owner().updateSemantics(builder.build());
+    expectSemanticsTree(owner(), '''
 <sem style="$rootSemanticStyle">
-  <input aria-valuenow="1" aria-valuetext="d" aria-valuemax="2" aria-valuemin="0">
+  <input role="slider" aria-valuenow="1" aria-valuetext="d" aria-valuemax="2" aria-valuemin="0">
 </sem>''');
 
     semantics().semanticsEnabled = false;
   });
+
+  test('sends focus events', () async {
+    semantics()
+      ..debugOverrideTimestampFunction(() => _testTime)
+      ..semanticsEnabled = true;
+
+    void pumpSemantics({ required bool isFocused }) {
+      final SemanticsTester tester = SemanticsTester(owner());
+      tester.updateNode(
+        id: 0,
+        hasIncrease: true,
+        isFocusable: true,
+        isFocused: isFocused,
+        hasEnabledState: true,
+        isEnabled: true,
+        value: 'd',
+        transform: Matrix4.identity().toFloat64(),
+        rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+      );
+      tester.apply();
+    }
+
+    final List<CapturedAction> capturedActions = <CapturedAction>[];
+    EnginePlatformDispatcher.instance.onSemanticsActionEvent = (ui.SemanticsActionEvent event) {
+      capturedActions.add((event.nodeId, event.type, event.arguments));
+    };
+
+    pumpSemantics(isFocused: false);
+    final DomElement element = owner().debugSemanticsTree![0]!.element.querySelector('input')!;
+    expect(capturedActions, isEmpty);
+
+    pumpSemantics(isFocused: true);
+    expect(capturedActions, <CapturedAction>[
+      (0, ui.SemanticsAction.didGainAccessibilityFocus, null),
+    ]);
+    capturedActions.clear();
+
+    pumpSemantics(isFocused: false);
+    expect(
+      reason: 'The engine never calls blur() explicitly.',
+      capturedActions,
+      isEmpty,
+    );
+
+    element.blur();
+    expect(capturedActions, <CapturedAction>[
+      (0, ui.SemanticsAction.didLoseAccessibilityFocus, null),
+    ]);
+
+    semantics().semanticsEnabled = false;
+  });
 }
 
 void _testTextField() {
@@ -1266,18 +1743,26 @@ void _testTextField() {
       rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
     );
 
-    semantics().updateSemantics(builder.build());
-    expectSemanticsTree('''
+    owner().updateSemantics(builder.build());
+    expectSemanticsTree(owner(), '''
 <sem style="$rootSemanticStyle">
   <input value="hello" />
 </sem>''');
 
+    final SemanticsObject node = owner().debugSemanticsTree![0]!;
+    expect(node.primaryRole?.role, PrimaryRole.textField);
+    expect(
+      reason: 'Text fields use custom focus management',
+      node.primaryRole!.debugSecondaryRoles,
+      isNot(contains(Role.focusable)),
+    );
+
     semantics().semanticsEnabled = false;
   });
 
   // TODO(yjbanov): this test will need to be adjusted for Safari when we add
   //                Safari testing.
-  test('sends a tap action when text field is activated', () async {
+  test('sends a focus action when text field is activated', () async {
     final SemanticsActionLogger logger = SemanticsActionLogger();
     semantics()
       ..debugOverrideTimestampFunction(() => _testTime)
@@ -1286,30 +1771,29 @@ void _testTextField() {
     final ui.SemanticsUpdateBuilder builder = ui.SemanticsUpdateBuilder();
     updateNode(
       builder,
-      actions: 0 | ui.SemanticsAction.tap.index,
+      actions: 0 | ui.SemanticsAction.didGainAccessibilityFocus.index,
       flags: 0 | ui.SemanticsFlag.isTextField.index,
       value: 'hello',
       transform: Matrix4.identity().toFloat64(),
       rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
     );
 
-    semantics().updateSemantics(builder.build());
+    owner().updateSemantics(builder.build());
 
     final DomElement textField =
-        appHostNode.querySelector('input[data-semantics-role="text-field"]')!;
+        owner().semanticsHost.querySelector('input[data-semantics-role="text-field"]')!;
 
-    expect(appHostNode.activeElement, isNot(textField));
+    expect(owner().semanticsHost.ownerDocument?.activeElement, isNot(textField));
 
     textField.focus();
 
-    expect(appHostNode.activeElement, textField);
+    expect(owner().semanticsHost.ownerDocument?.activeElement, textField);
     expect(await logger.idLog.first, 0);
-    expect(await logger.actionLog.first, ui.SemanticsAction.tap);
+    expect(await logger.actionLog.first, ui.SemanticsAction.didGainAccessibilityFocus);
 
     semantics().semanticsEnabled = false;
   }, // TODO(yjbanov): https://github.com/flutter/flutter/issues/46638
       // TODO(yjbanov): https://github.com/flutter/flutter/issues/50590
-      // TODO(yjbanov): https://github.com/flutter/flutter/issues/50754
       skip: browserEngine != BrowserEngine.blink);
 }
 
@@ -1323,20 +1807,30 @@ void _testCheckables() {
     updateNode(
       builder,
       actions: 0 | ui.SemanticsAction.tap.index,
+      label: 'test label',
       flags: 0 |
           ui.SemanticsFlag.isEnabled.index |
           ui.SemanticsFlag.hasEnabledState.index |
           ui.SemanticsFlag.hasToggledState.index |
-          ui.SemanticsFlag.isToggled.index,
+          ui.SemanticsFlag.isToggled.index |
+          ui.SemanticsFlag.isFocusable.index,
       transform: Matrix4.identity().toFloat64(),
       rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
     );
 
-    semantics().updateSemantics(builder.build());
-    expectSemanticsTree('''
-<sem role="switch" aria-checked="true" style="$rootSemanticStyle"></sem>
+    owner().updateSemantics(builder.build());
+    expectSemanticsTree(owner(), '''
+<sem aria-label="test label" flt-tappable role="switch" aria-checked="true" style="$rootSemanticStyle"></sem>
 ''');
 
+    final SemanticsObject node = owner().debugSemanticsTree![0]!;
+    expect(node.primaryRole?.role, PrimaryRole.checkable);
+    expect(
+      reason: 'Checkables use generic secondary roles',
+      node.primaryRole!.debugSecondaryRoles,
+      containsAll(<Role>[Role.focusable, Role.tappable]),
+    );
+
     semantics().semanticsEnabled = false;
   });
 
@@ -1357,8 +1851,8 @@ void _testCheckables() {
       rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
     );
 
-    semantics().updateSemantics(builder.build());
-    expectSemanticsTree('''
+    owner().updateSemantics(builder.build());
+    expectSemanticsTree(owner(), '''
 <sem role="switch" aria-disabled="true" aria-checked="true" style="$rootSemanticStyle"></sem>
 ''');
 
@@ -1382,9 +1876,9 @@ void _testCheckables() {
       rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
     );
 
-    semantics().updateSemantics(builder.build());
-    expectSemanticsTree('''
-<sem role="switch" aria-checked="false" style="$rootSemanticStyle"></sem>
+    owner().updateSemantics(builder.build());
+    expectSemanticsTree(owner(), '''
+<sem role="switch" flt-tappable aria-checked="false" style="$rootSemanticStyle"></sem>
 ''');
 
     semantics().semanticsEnabled = false;
@@ -1408,9 +1902,9 @@ void _testCheckables() {
       rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
     );
 
-    semantics().updateSemantics(builder.build());
-    expectSemanticsTree('''
-<sem role="checkbox" aria-checked="true" style="$rootSemanticStyle"></sem>
+    owner().updateSemantics(builder.build());
+    expectSemanticsTree(owner(), '''
+<sem role="checkbox" flt-tappable aria-checked="true" style="$rootSemanticStyle"></sem>
 ''');
 
     semantics().semanticsEnabled = false;
@@ -1433,8 +1927,8 @@ void _testCheckables() {
       rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
     );
 
-    semantics().updateSemantics(builder.build());
-    expectSemanticsTree('''
+    owner().updateSemantics(builder.build());
+    expectSemanticsTree(owner(), '''
 <sem role="checkbox" aria-disabled="true" aria-checked="true" style="$rootSemanticStyle"></sem>
 ''');
 
@@ -1458,9 +1952,9 @@ void _testCheckables() {
       rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
     );
 
-    semantics().updateSemantics(builder.build());
-    expectSemanticsTree('''
-<sem role="checkbox" aria-checked="false" style="$rootSemanticStyle"></sem>
+    owner().updateSemantics(builder.build());
+    expectSemanticsTree(owner(), '''
+<sem role="checkbox" flt-tappable aria-checked="false" style="$rootSemanticStyle"></sem>
 ''');
 
     semantics().semanticsEnabled = false;
@@ -1485,9 +1979,9 @@ void _testCheckables() {
       rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
     );
 
-    semantics().updateSemantics(builder.build());
-    expectSemanticsTree('''
-<sem role="radio" aria-checked="true" style="$rootSemanticStyle"></sem>
+    owner().updateSemantics(builder.build());
+    expectSemanticsTree(owner(), '''
+<sem role="radio" flt-tappable aria-checked="true" style="$rootSemanticStyle"></sem>
 ''');
 
     semantics().semanticsEnabled = false;
@@ -1511,8 +2005,8 @@ void _testCheckables() {
       rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
     );
 
-    semantics().updateSemantics(builder.build());
-    expectSemanticsTree('''
+    owner().updateSemantics(builder.build());
+    expectSemanticsTree(owner(), '''
 <sem role="radio" aria-disabled="true" aria-checked="true" style="$rootSemanticStyle"></sem>
 ''');
 
@@ -1537,13 +2031,72 @@ void _testCheckables() {
       rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
     );
 
-    semantics().updateSemantics(builder.build());
-    expectSemanticsTree('''
-<sem role="radio" aria-checked="false" style="$rootSemanticStyle"></sem>
+    owner().updateSemantics(builder.build());
+    expectSemanticsTree(owner(), '''
+<sem role="radio" flt-tappable aria-checked="false" style="$rootSemanticStyle"></sem>
 ''');
 
     semantics().semanticsEnabled = false;
   });
+
+  test('sends focus events', () async {
+    semantics()
+      ..debugOverrideTimestampFunction(() => _testTime)
+      ..semanticsEnabled = true;
+
+    void pumpSemantics({ required bool isFocused }) {
+      final SemanticsTester tester = SemanticsTester(owner());
+      tester.updateNode(
+        id: 0,
+
+        // The following combination of actions and flags describe a checkbox.
+        hasTap: true,
+        hasEnabledState: true,
+        isEnabled: true,
+        hasCheckedState: true,
+        isFocusable: true,
+        isFocused: isFocused,
+
+        value: 'd',
+        transform: Matrix4.identity().toFloat64(),
+        rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+      );
+      tester.apply();
+    }
+
+    final List<CapturedAction> capturedActions = <CapturedAction>[];
+    EnginePlatformDispatcher.instance.onSemanticsActionEvent = (ui.SemanticsActionEvent event) {
+      capturedActions.add((event.nodeId, event.type, event.arguments));
+    };
+
+    pumpSemantics(isFocused: false);
+    final DomElement element = owner().debugSemanticsTree![0]!.element;
+    expect(capturedActions, isEmpty);
+
+    pumpSemantics(isFocused: true);
+    expect(capturedActions, <CapturedAction>[
+      (0, ui.SemanticsAction.didGainAccessibilityFocus, null),
+    ]);
+    capturedActions.clear();
+
+    // The framework removes focus from the widget (i.e. "blurs" it). Since the
+    // blurring is initiated by the framework, there's no need to send any
+    // notifications back to the framework about it.
+    pumpSemantics(isFocused: false);
+    expect(capturedActions, isEmpty);
+
+    // If the element is blurred by the browser, then we do want to notify the
+    // framework. This is because screen reader can be focused on something
+    // other than what the framework is focused on, and notifying the framework
+    // about the loss of focus on a node is information that the framework did
+    // not have before.
+    element.blur();
+    expect(capturedActions, <CapturedAction>[
+      (0, ui.SemanticsAction.didLoseAccessibilityFocus, null),
+    ]);
+
+    semantics().semanticsEnabled = false;
+  });
 }
 
 void _testTappable() {
@@ -1552,9 +2105,10 @@ void _testTappable() {
       ..debugOverrideTimestampFunction(() => _testTime)
       ..semanticsEnabled = true;
 
-    final SemanticsTester tester = SemanticsTester(semantics());
+    final SemanticsTester tester = SemanticsTester(owner());
     tester.updateNode(
       id: 0,
+      isFocusable: true,
       hasTap: true,
       hasEnabledState: true,
       isEnabled: true,
@@ -1563,10 +2117,16 @@ void _testTappable() {
     );
     tester.apply();
 
-    expectSemanticsTree('''
-<sem role="button" style="$rootSemanticStyle"></sem>
+    expectSemanticsTree(owner(), '''
+<sem role="button" flt-tappable style="$rootSemanticStyle"></sem>
 ''');
 
+    final SemanticsObject node = owner().debugSemanticsTree![0]!;
+    expect(node.primaryRole?.role, PrimaryRole.button);
+    expect(
+      node.primaryRole?.debugSecondaryRoles,
+      containsAll(<Role>[Role.focusable, Role.tappable]),
+    );
     expect(tester.getSemanticsObject(0).element.tabIndex, 0);
 
     semantics().semanticsEnabled = false;
@@ -1588,8 +2148,8 @@ void _testTappable() {
       rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
     );
 
-    semantics().updateSemantics(builder.build());
-    expectSemanticsTree('''
+    owner().updateSemantics(builder.build());
+    expectSemanticsTree(owner(), '''
 <sem role="button" aria-disabled="true" style="$rootSemanticStyle"></sem>
 ''');
 
@@ -1602,7 +2162,7 @@ void _testTappable() {
       ..semanticsEnabled = true;
 
     void updateTappable({required bool enabled}) {
-      final SemanticsTester tester = SemanticsTester(semantics());
+      final SemanticsTester tester = SemanticsTester(owner());
       tester.updateNode(
         id: 0,
         hasTap: true,
@@ -1615,16 +2175,184 @@ void _testTappable() {
     }
 
     updateTappable(enabled: false);
-    expectSemanticsTree('<sem role="button" aria-disabled="true" style="$rootSemanticStyle"></sem>');
+    expectSemanticsTree(
+      owner(),
+      '<sem role="button" aria-disabled="true" style="$rootSemanticStyle"></sem>'
+    );
 
     updateTappable(enabled: true);
-    expectSemanticsTree('<sem role="button" style="$rootSemanticStyle"></sem>');
+    expectSemanticsTree(
+      owner(),
+      '<sem role="button" flt-tappable style="$rootSemanticStyle"></sem>',
+    );
 
     updateTappable(enabled: false);
-    expectSemanticsTree('<sem role="button" aria-disabled="true" style="$rootSemanticStyle"></sem>');
+    expectSemanticsTree(
+      owner(),
+      '<sem role="button" aria-disabled="true" style="$rootSemanticStyle"></sem>',
+    );
 
     updateTappable(enabled: true);
-    expectSemanticsTree('<sem role="button" style="$rootSemanticStyle"></sem>');
+    expectSemanticsTree(
+      owner(),
+      '<sem role="button" flt-tappable style="$rootSemanticStyle"></sem>',
+    );
+
+    semantics().semanticsEnabled = false;
+  });
+
+  test('focuses on tappable after element has been attached', () async {
+    semantics()
+      ..debugOverrideTimestampFunction(() => _testTime)
+      ..semanticsEnabled = true;
+
+    final SemanticsTester tester = SemanticsTester(owner());
+    tester.updateNode(
+      id: 0,
+      hasTap: true,
+      hasEnabledState: true,
+      isEnabled: true,
+      isButton: true,
+      isFocusable: true,
+      isFocused: true,
+      rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+    );
+    tester.apply();
+
+    expect(domDocument.activeElement, tester.getSemanticsObject(0).element);
+    semantics().semanticsEnabled = false;
+  });
+
+  test('sends focus events', () async {
+    semantics()
+      ..debugOverrideTimestampFunction(() => _testTime)
+      ..semanticsEnabled = true;
+
+    void pumpSemantics({ required bool isFocused }) {
+      final SemanticsTester tester = SemanticsTester(owner());
+      tester.updateNode(
+        id: 0,
+
+        // The following combination of actions and flags describe a button.
+        hasTap: true,
+        hasEnabledState: true,
+        isEnabled: true,
+        isButton: true,
+        isFocusable: true,
+        isFocused: isFocused,
+
+        value: 'd',
+        transform: Matrix4.identity().toFloat64(),
+        rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+      );
+      tester.apply();
+    }
+
+    final List<CapturedAction> capturedActions = <CapturedAction>[];
+    EnginePlatformDispatcher.instance.onSemanticsActionEvent = (ui.SemanticsActionEvent event) {
+      capturedActions.add((event.nodeId, event.type, event.arguments));
+    };
+
+    pumpSemantics(isFocused: false);
+    final DomElement element = owner().debugSemanticsTree![0]!.element;
+    expect(capturedActions, isEmpty);
+
+    pumpSemantics(isFocused: true);
+    expect(capturedActions, <CapturedAction>[
+      (0, ui.SemanticsAction.didGainAccessibilityFocus, null),
+    ]);
+    capturedActions.clear();
+
+    pumpSemantics(isFocused: false);
+    expect(capturedActions, isEmpty);
+
+    element.blur();
+    expect(capturedActions, <CapturedAction>[
+      (0, ui.SemanticsAction.didLoseAccessibilityFocus, null),
+    ]);
+
+    semantics().semanticsEnabled = false;
+  });
+
+  // Regression test for: https://github.com/flutter/flutter/issues/134842
+  //
+  // If the click event is allowed to propagate through the hierarchy, then both
+  // the descendant and the parent will generate a SemanticsAction.tap, causing
+  // a double-tap to happen on the framework side.
+  test('inner tappable overrides ancestor tappable', () async {
+    semantics()
+      ..debugOverrideTimestampFunction(() => _testTime)
+      ..semanticsEnabled = true;
+
+    final List<CapturedAction> capturedActions = <CapturedAction>[];
+    EnginePlatformDispatcher.instance.onSemanticsActionEvent = (ui.SemanticsActionEvent event) {
+      capturedActions.add((event.nodeId, event.type, event.arguments));
+    };
+
+    final SemanticsTester tester = SemanticsTester(owner());
+    tester.updateNode(
+      id: 0,
+      isFocusable: true,
+      hasTap: true,
+      hasEnabledState: true,
+      isEnabled: true,
+      isButton: true,
+      rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+      children: <SemanticsNodeUpdate>[
+        tester.updateNode(
+          id: 1,
+          isFocusable: true,
+          hasTap: true,
+          hasEnabledState: true,
+          isEnabled: true,
+          isButton: true,
+          rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+        ),
+      ],
+    );
+    tester.apply();
+
+    expectSemanticsTree(owner(), '''
+<sem flt-tappable role="button" style="$rootSemanticStyle">
+  <sem-c>
+    <sem flt-tappable role="button"></sem>
+  </sem-c>
+</sem>
+''');
+
+    // Tap on the outer element
+    {
+      final DomElement element = tester.getSemanticsObject(0).element;
+      final DomRect rect = element.getBoundingClientRect();
+
+      element.dispatchEvent(createDomMouseEvent('click', <Object?, Object?>{
+        'clientX': (rect.left + (rect.right - rect.left) / 2).floor(),
+        'clientY': (rect.top + (rect.bottom - rect.top) / 2).floor(),
+      }));
+
+      expect(capturedActions, <CapturedAction>[
+        (0, ui.SemanticsAction.tap, null),
+      ]);
+    }
+
+    // Tap on the inner element
+    {
+      capturedActions.clear();
+      final DomElement element = tester.getSemanticsObject(1).element;
+      final DomRect rect = element.getBoundingClientRect();
+
+      element.dispatchEvent(createDomMouseEvent('click', <Object?, Object?>{
+        'bubbles': true,
+        'clientX': (rect.left + (rect.right - rect.left) / 2).floor(),
+        'clientY': (rect.top + (rect.bottom - rect.top) / 2).floor(),
+      }));
+
+      // The click on the inner element should not propagate to the parent to
+      // avoid sending a second SemanticsAction.tap action to the framework.
+      expect(capturedActions, <CapturedAction>[
+        (1, ui.SemanticsAction.tap, null),
+      ]);
+    }
 
     semantics().semanticsEnabled = false;
   });
@@ -1645,8 +2373,8 @@ void _testImage() {
       rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
     );
 
-    semantics().updateSemantics(builder.build());
-    expectSemanticsTree('''
+    owner().updateSemantics(builder.build());
+    expectSemanticsTree(owner(), '''
 <sem role="img" aria-label="Test Image Label" style="$rootSemanticStyle"></sem>
 ''');
 
@@ -1675,8 +2403,8 @@ void _testImage() {
       rect: const ui.Rect.fromLTRB(10, 10, 20, 20),
     );
 
-    semantics().updateSemantics(builder.build());
-    expectSemanticsTree('''
+    owner().updateSemantics(builder.build());
+    expectSemanticsTree(owner(), '''
 <sem style="$rootSemanticStyle">
   <sem-img role="img" aria-label="Test Image Label">
   </sem-img>
@@ -1701,9 +2429,11 @@ void _testImage() {
       rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
     );
 
-    semantics().updateSemantics(builder.build());
+    owner().updateSemantics(builder.build());
     expectSemanticsTree(
-        '''<sem role="img" style="$rootSemanticStyle"></sem>''');
+      owner(),
+      '<sem role="img" style="$rootSemanticStyle"></sem>',
+    );
 
     semantics().semanticsEnabled = false;
   });
@@ -1729,8 +2459,8 @@ void _testImage() {
       rect: const ui.Rect.fromLTRB(10, 10, 20, 20),
     );
 
-    semantics().updateSemantics(builder.build());
-    expectSemanticsTree('''
+    owner().updateSemantics(builder.build());
+    expectSemanticsTree(owner(), '''
 <sem style="$rootSemanticStyle">
   <sem-img role="img">
   </sem-img>
@@ -1743,12 +2473,41 @@ void _testImage() {
   });
 }
 
+class MockAccessibilityAnnouncements implements AccessibilityAnnouncements {
+  int announceInvoked = 0;
+
+  @override
+  void announce(String message, Assertiveness assertiveness) {
+    announceInvoked += 1;
+  }
+
+  @override
+  DomHTMLElement ariaLiveElementFor(Assertiveness assertiveness) {
+    throw UnsupportedError(
+        'ariaLiveElementFor is not supported in MockAccessibilityAnnouncements');
+  }
+
+  @override
+  void handleMessage(StandardMessageCodec codec, ByteData? data) {
+    throw UnsupportedError(
+        'handleMessage is not supported in MockAccessibilityAnnouncements!');
+  }
+}
+
 void _testLiveRegion() {
-  test('renders a live region if there is a label', () async {
+  tearDown(() {
+    LiveRegion.debugOverrideAccessibilityAnnouncements(null);
+  });
+
+  test('announces the label after an update', () async {
     semantics()
       ..debugOverrideTimestampFunction(() => _testTime)
       ..semanticsEnabled = true;
 
+    final MockAccessibilityAnnouncements mockAccessibilityAnnouncements =
+        MockAccessibilityAnnouncements();
+    LiveRegion.debugOverrideAccessibilityAnnouncements(mockAccessibilityAnnouncements);
+
     final ui.SemanticsUpdateBuilder builder = ui.SemanticsUpdateBuilder();
     updateNode(
       builder,
@@ -1757,20 +2516,21 @@ void _testLiveRegion() {
       transform: Matrix4.identity().toFloat64(),
       rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
     );
-    semantics().updateSemantics(builder.build());
-
-    expectSemanticsTree('''
-<sem aria-label="This is a snackbar" aria-live="polite" style="$rootSemanticStyle"></sem>
-''');
+    owner().updateSemantics(builder.build());
+    expect(mockAccessibilityAnnouncements.announceInvoked, 1);
 
     semantics().semanticsEnabled = false;
   });
 
-  test('does not render a live region if there is no label', () async {
+  test('does not announce anything if there is no label', () async {
     semantics()
       ..debugOverrideTimestampFunction(() => _testTime)
       ..semanticsEnabled = true;
 
+    final MockAccessibilityAnnouncements mockAccessibilityAnnouncements =
+        MockAccessibilityAnnouncements();
+    LiveRegion.debugOverrideAccessibilityAnnouncements(mockAccessibilityAnnouncements);
+
     final ui.SemanticsUpdateBuilder builder = ui.SemanticsUpdateBuilder();
     updateNode(
       builder,
@@ -1778,17 +2538,86 @@ void _testLiveRegion() {
       transform: Matrix4.identity().toFloat64(),
       rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
     );
-    semantics().updateSemantics(builder.build());
+    owner().updateSemantics(builder.build());
+    expect(mockAccessibilityAnnouncements.announceInvoked, 0);
 
-    expectSemanticsTree('''
-<sem style="$rootSemanticStyle"></sem>
-''');
+    semantics().semanticsEnabled = false;
+  });
+
+  test('does not announce the same label over and over', () async {
+    semantics()
+      ..debugOverrideTimestampFunction(() => _testTime)
+      ..semanticsEnabled = true;
+
+    final MockAccessibilityAnnouncements mockAccessibilityAnnouncements =
+        MockAccessibilityAnnouncements();
+    LiveRegion.debugOverrideAccessibilityAnnouncements(mockAccessibilityAnnouncements);
+
+    ui.SemanticsUpdateBuilder builder = ui.SemanticsUpdateBuilder();
+    updateNode(
+      builder,
+      label: 'This is a snackbar',
+      flags: 0 | ui.SemanticsFlag.isLiveRegion.index,
+      transform: Matrix4.identity().toFloat64(),
+      rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+    );
+    owner().updateSemantics(builder.build());
+    expect(mockAccessibilityAnnouncements.announceInvoked, 1);
+
+    builder = ui.SemanticsUpdateBuilder();
+    updateNode(
+      builder,
+      label: 'This is a snackbar',
+      flags: 0 | ui.SemanticsFlag.isLiveRegion.index,
+      transform: Matrix4.identity().toFloat64(),
+      rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+    );
+    owner().updateSemantics(builder.build());
+    expect(mockAccessibilityAnnouncements.announceInvoked, 1);
 
     semantics().semanticsEnabled = false;
   });
 }
 
 void _testPlatformView() {
+  test('sets and updates aria-owns', () async {
+    semantics()
+      ..debugOverrideTimestampFunction(() => _testTime)
+      ..semanticsEnabled = true;
+
+    // Set.
+    {
+      final ui.SemanticsUpdateBuilder builder = ui.SemanticsUpdateBuilder();
+      updateNode(
+        builder,
+        platformViewId: 5,
+        rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+      );
+      owner().updateSemantics(builder.build());
+      expectSemanticsTree(
+        owner(),
+        '<sem aria-owns="flt-pv-5" style="$rootSemanticStyle"></sem>',
+      );
+    }
+
+    // Update.
+    {
+      final ui.SemanticsUpdateBuilder builder = ui.SemanticsUpdateBuilder();
+      updateNode(
+        builder,
+        platformViewId: 42,
+        rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+      );
+      owner().updateSemantics(builder.build());
+      expectSemanticsTree(
+        owner(),
+        '<sem aria-owns="flt-pv-42" style="$rootSemanticStyle"></sem>',
+      );
+    }
+
+    semantics().semanticsEnabled = false;
+  });
+
   test('is transparent w.r.t. hit testing', () async {
     semantics()
       ..debugOverrideTimestampFunction(() => _testTime)
@@ -1800,10 +2629,13 @@ void _testPlatformView() {
       platformViewId: 5,
       rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
     );
-    semantics().updateSemantics(builder.build());
+    owner().updateSemantics(builder.build());
 
-    expectSemanticsTree('<sem style="$rootSemanticStyle"></sem>');
-    final DomElement element = appHostNode.querySelector('flt-semantics')!;
+    expectSemanticsTree(
+      owner(),
+      '<sem aria-owns="flt-pv-5" style="$rootSemanticStyle"></sem>',
+    );
+    final DomElement element = owner().semanticsHost.querySelector('flt-semantics')!;
     expect(element.style.pointerEvents, 'none');
 
     semantics().semanticsEnabled = false;
@@ -1838,7 +2670,7 @@ void _testPlatformView() {
       ..debugOverrideTimestampFunction(() => _testTime)
       ..semanticsEnabled = true;
 
-    ui.platformViewRegistry.registerViewFactory(
+    ui_web.platformViewRegistry.registerViewFactory(
       'test-platform-view',
       (int viewId) => createDomHTMLDivElement()
         ..id = 'view-0'
@@ -1854,16 +2686,15 @@ void _testPlatformView() {
       width: 20,
       height: 30,
     );
-    ui.window.render(sceneBuilder.build());
+    await renderScene(sceneBuilder.build());
 
     final ui.SemanticsUpdateBuilder builder = ui.SemanticsUpdateBuilder();
-    updateNode(
-      builder,
-      rect: const ui.Rect.fromLTRB(0, 0, 20, 60),
-      childrenInTraversalOrder: Int32List.fromList(<int>[1, 2, 3]),
-      childrenInHitTestOrder: Int32List.fromList(<int>[1, 2, 3]),
-      transform: Float64List.fromList(Matrix4.diagonal3Values(ui.window.devicePixelRatio, ui.window.devicePixelRatio, 1).storage)
-    );
+    final double dpr = EngineFlutterDisplay.instance.devicePixelRatio;
+    updateNode(builder,
+        rect: const ui.Rect.fromLTRB(0, 0, 20, 60),
+        childrenInTraversalOrder: Int32List.fromList(<int>[1, 2, 3]),
+        childrenInHitTestOrder: Int32List.fromList(<int>[1, 2, 3]),
+        transform: Float64List.fromList(Matrix4.diagonal3Values(dpr, dpr, 1).storage));
     updateNode(
       builder,
       id: 1,
@@ -1882,21 +2713,21 @@ void _testPlatformView() {
       rect: const ui.Rect.fromLTRB(0, 35, 20, 60),
     );
 
-    semantics().updateSemantics(builder.build());
-    expectSemanticsTree('''
+    owner().updateSemantics(builder.build());
+    expectSemanticsTree(owner(), '''
 <sem style="$rootSemanticStyle">
   <sem-c>
     <sem style="z-index: 3"></sem>
-    <sem style="z-index: 2"></sem>
+    <sem style="z-index: 2" aria-owns="flt-pv-0"></sem>
     <sem style="z-index: 1"></sem>
   </sem-c>
 </sem>''');
 
-    final DomElement root = appHostNode.querySelector('#flt-semantic-node-0')!;
+    final DomElement root = owner().semanticsHost.querySelector('#flt-semantic-node-0')!;
     expect(root.style.pointerEvents, 'none');
 
     final DomElement child1 =
-        appHostNode.querySelector('#flt-semantic-node-1')!;
+        owner().semanticsHost.querySelector('#flt-semantic-node-1')!;
     expect(child1.style.pointerEvents, 'all');
     final DomRect child1Rect = child1.getBoundingClientRect();
     expect(child1Rect.left, 0);
@@ -1905,7 +2736,7 @@ void _testPlatformView() {
     expect(child1Rect.bottom, 25);
 
     final DomElement child2 =
-        appHostNode.querySelector('#flt-semantic-node-2')!;
+        owner().semanticsHost.querySelector('#flt-semantic-node-2')!;
     expect(child2.style.pointerEvents, 'none');
     final DomRect child2Rect = child2.getBoundingClientRect();
     expect(child2Rect.left, 0);
@@ -1914,7 +2745,7 @@ void _testPlatformView() {
     expect(child2Rect.bottom, 45);
 
     final DomElement child3 =
-        appHostNode.querySelector('#flt-semantic-node-3')!;
+        owner().semanticsHost.querySelector('#flt-semantic-node-3')!;
     expect(child3.style.pointerEvents, 'all');
     final DomRect child3Rect = child3.getBoundingClientRect();
     expect(child3Rect.left, 0);
@@ -1923,23 +2754,20 @@ void _testPlatformView() {
     expect(child3Rect.bottom, 60);
 
     final DomElement platformViewElement =
-        flutterViewEmbedder.glassPaneElement!.querySelector('#view-0')!;
-    final DomRect platformViewRect = platformViewElement.getBoundingClientRect();
+        platformViewsHost.querySelector('#view-0')!;
+    final DomRect platformViewRect =
+        platformViewElement.getBoundingClientRect();
     expect(platformViewRect.left, 0);
     expect(platformViewRect.top, 15);
     expect(platformViewRect.right, 20);
     expect(platformViewRect.bottom, 45);
 
-    // This test is only relevant for shadow DOM because we only really support
-    // proper platform view embedding in browsers that support shadow DOM.
-    final DomShadowRoot shadowRoot = appHostNode.node as DomShadowRoot;
-
     // Hit test child 1
-    expect(shadowRoot.elementFromPoint(10, 10), child1);
+    expect(domDocument.elementFromPoint(10, 10), child1);
 
     // Hit test overlap between child 1 and 2
     // TODO(yjbanov): this is a known limitation, see https://github.com/flutter/flutter/issues/101439
-    expect(shadowRoot.elementFromPoint(10, 20), child1);
+    expect(domDocument.elementFromPoint(10, 20), child1);
 
     // Hit test child 2
     // Clicking at the location of the middle semantics node should allow the
@@ -1958,10 +2786,10 @@ void _testPlatformView() {
     expect(domDocument.elementFromPoint(10, 30), platformViewElement);
 
     // Hit test overlap between child 2 and 3
-    expect(shadowRoot.elementFromPoint(10, 40), child3);
+    expect(domDocument.elementFromPoint(10, 40), child3);
 
     // Hit test child 3
-    expect(shadowRoot.elementFromPoint(10, 50), child3);
+    expect(domDocument.elementFromPoint(10, 50), child3);
 
     semantics().semanticsEnabled = false;
   });
@@ -1989,8 +2817,8 @@ void _testGroup() {
       rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
     );
 
-    semantics().updateSemantics(builder.build());
-    expectSemanticsTree('''
+    owner().updateSemantics(builder.build());
+    expectSemanticsTree(owner(), '''
 <sem role="group" aria-label="this is a label for a group of elements" style="$rootSemanticStyle"><sem-c><sem></sem></sem-c></sem>
 ''');
 
@@ -1998,9 +2826,627 @@ void _testGroup() {
   });
 }
 
+void _testDialog() {
+  test('renders named and labeled routes', () {
+    semantics()
+      ..debugOverrideTimestampFunction(() => _testTime)
+      ..semanticsEnabled = true;
+
+    final ui.SemanticsUpdateBuilder builder = ui.SemanticsUpdateBuilder();
+    updateNode(
+      builder,
+      label: 'this is a dialog label',
+      flags: 0 | ui.SemanticsFlag.scopesRoute.index | ui.SemanticsFlag.namesRoute.index,
+      transform: Matrix4.identity().toFloat64(),
+      rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+      childrenInHitTestOrder: Int32List.fromList(<int>[1]),
+      childrenInTraversalOrder: Int32List.fromList(<int>[1]),
+    );
+    updateNode(
+      builder,
+      id: 1,
+      transform: Matrix4.identity().toFloat64(),
+      rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+    );
+
+    owner().updateSemantics(builder.build());
+    expectSemanticsTree(owner(), '''
+      <sem role="dialog" aria-label="this is a dialog label" style="$rootSemanticStyle"><sem-c><sem></sem></sem-c></sem>
+    ''');
+
+    expect(
+      owner().debugSemanticsTree![0]!.primaryRole?.role,
+      PrimaryRole.dialog,
+    );
+
+    semantics().semanticsEnabled = false;
+  });
+
+  test('warns about missing label', () {
+    final List<String> warnings = <String>[];
+    printWarning = warnings.add;
+
+    semantics()
+      ..debugOverrideTimestampFunction(() => _testTime)
+      ..semanticsEnabled = true;
+
+    final ui.SemanticsUpdateBuilder builder = ui.SemanticsUpdateBuilder();
+    updateNode(
+      builder,
+      flags: 0 | ui.SemanticsFlag.scopesRoute.index | ui.SemanticsFlag.namesRoute.index,
+      transform: Matrix4.identity().toFloat64(),
+      rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+      childrenInHitTestOrder: Int32List.fromList(<int>[1]),
+      childrenInTraversalOrder: Int32List.fromList(<int>[1]),
+    );
+    updateNode(
+      builder,
+      id: 1,
+      transform: Matrix4.identity().toFloat64(),
+      rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+    );
+
+    owner().updateSemantics(builder.build());
+    expect(
+      warnings,
+      <String>[
+        'Semantic node 0 had both scopesRoute and namesRoute set, indicating a self-labelled dialog, but it is missing the label. A dialog should be labelled either by setting namesRoute on itself and providing a label, or by containing a child node with namesRoute that can describe it with its content.',
+      ],
+    );
+
+    // But still sets the dialog role.
+    expectSemanticsTree(owner(), '''
+      <sem role="dialog" aria-label="" style="$rootSemanticStyle"><sem-c><sem></sem></sem-c></sem>
+    ''');
+
+    expect(
+      owner().debugSemanticsTree![0]!.primaryRole?.role,
+      PrimaryRole.dialog,
+    );
+
+    semantics().semanticsEnabled = false;
+  });
+
+  test('dialog can be described by a descendant', () {
+    semantics()
+      ..debugOverrideTimestampFunction(() => _testTime)
+      ..semanticsEnabled = true;
+
+    void pumpSemantics({ required String label }) {
+      final SemanticsTester tester = SemanticsTester(owner());
+      tester.updateNode(
+        id: 0,
+        scopesRoute: true,
+        transform: Matrix4.identity().toFloat64(),
+        children: <SemanticsNodeUpdate>[
+          tester.updateNode(
+            id: 1,
+            children: <SemanticsNodeUpdate>[
+              tester.updateNode(
+                id: 2,
+                namesRoute: true,
+                label: label,
+              ),
+            ],
+          ),
+        ],
+      );
+      tester.apply();
+
+      expectSemanticsTree(owner(), '''
+        <sem role="dialog" aria-describedby="flt-semantic-node-2" style="$rootSemanticStyle">
+          <sem-c>
+            <sem>
+              <sem-c>
+                <sem role="text">$label</sem>
+              </sem-c>
+            </sem>
+          </sem-c>
+        </sem>
+      ''');
+    }
+
+    pumpSemantics(label: 'Dialog label');
+
+    expect(
+      owner().debugSemanticsTree![0]!.primaryRole?.role,
+      PrimaryRole.dialog,
+    );
+    expect(
+      owner().debugSemanticsTree![2]!.primaryRole?.role,
+      PrimaryRole.generic,
+    );
+    expect(
+      owner().debugSemanticsTree![2]!.primaryRole?.debugSecondaryRoles,
+      contains(Role.routeName),
+    );
+
+    pumpSemantics(label: 'Updated dialog label');
+
+    semantics().semanticsEnabled = false;
+  });
+
+  test('scopesRoute alone sets the dialog role with no label', () {
+    final List<String> warnings = <String>[];
+    printWarning = warnings.add;
+
+    semantics()
+      ..debugOverrideTimestampFunction(() => _testTime)
+      ..semanticsEnabled = true;
+
+    final SemanticsTester tester = SemanticsTester(owner());
+    tester.updateNode(
+      id: 0,
+      scopesRoute: true,
+      transform: Matrix4.identity().toFloat64(),
+    );
+    tester.apply();
+
+    expectSemanticsTree(owner(), '''
+      <sem style="$rootSemanticStyle"></sem>
+    ''');
+
+    expect(
+      owner().debugSemanticsTree![0]!.primaryRole?.role,
+      PrimaryRole.dialog,
+    );
+    expect(
+      owner().debugSemanticsTree![0]!.primaryRole?.secondaryRoleManagers,
+      isNot(contains(Role.routeName)),
+    );
+
+    semantics().semanticsEnabled = false;
+  });
+
+  test('namesRoute alone has no effect', () {
+    semantics()
+      ..debugOverrideTimestampFunction(() => _testTime)
+      ..semanticsEnabled = true;
+
+    final SemanticsTester tester = SemanticsTester(owner());
+    tester.updateNode(
+      id: 0,
+      transform: Matrix4.identity().toFloat64(),
+      children: <SemanticsNodeUpdate>[
+        tester.updateNode(
+          id: 1,
+          children: <SemanticsNodeUpdate>[
+            tester.updateNode(
+              id: 2,
+              namesRoute: true,
+              label: 'Hello',
+            ),
+          ],
+        ),
+      ],
+    );
+    tester.apply();
+
+    expectSemanticsTree(owner(), '''
+      <sem style="$rootSemanticStyle">
+        <sem-c>
+          <sem>
+            <sem-c>
+              <sem role="text">Hello</sem>
+            </sem-c>
+          </sem>
+        </sem-c>
+      </sem>
+    ''');
+
+    expect(
+      owner().debugSemanticsTree![0]!.primaryRole?.role,
+      PrimaryRole.generic,
+    );
+    expect(
+      owner().debugSemanticsTree![2]!.primaryRole?.debugSecondaryRoles,
+      contains(Role.routeName),
+    );
+
+    semantics().semanticsEnabled = false;
+  });
+
+  // Test the simple scenario of a dialog coming up and containing focusable
+  // descendants that are not initially focused. The expectation is that the
+  // first descendant will be auto-focused.
+  test('focuses on the first unfocused Focusable', () async {
+    semantics()
+      ..debugOverrideTimestampFunction(() => _testTime)
+      ..semanticsEnabled = true;
+
+    final List<CapturedAction> capturedActions = <CapturedAction>[];
+    EnginePlatformDispatcher.instance.onSemanticsActionEvent = (ui.SemanticsActionEvent event) {
+      capturedActions.add((event.nodeId, event.type, event.arguments));
+    };
+
+    final SemanticsTester tester = SemanticsTester(owner());
+    tester.updateNode(
+      id: 0,
+      scopesRoute: true,
+      transform: Matrix4.identity().toFloat64(),
+      children: <SemanticsNodeUpdate>[
+        tester.updateNode(
+          id: 1,
+          // None of the children should have isFocused set to `true` to make
+          // sure that the auto-focus logic kicks in.
+          children: <SemanticsNodeUpdate>[
+            tester.updateNode(
+              id: 2,
+              label: 'Button 1',
+              hasTap: true,
+              hasEnabledState: true,
+              isEnabled: true,
+              isButton: true,
+              isFocusable: true,
+              isFocused: false,
+              rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+            ),
+            tester.updateNode(
+              id: 3,
+              label: 'Button 2',
+              hasTap: true,
+              hasEnabledState: true,
+              isEnabled: true,
+              isButton: true,
+              isFocusable: true,
+              isFocused: false,
+              rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+            ),
+          ],
+        ),
+      ],
+    );
+    tester.apply();
+
+    expect(
+      capturedActions,
+      <CapturedAction>[
+        (2, ui.SemanticsAction.didGainAccessibilityFocus, null),
+      ],
+    );
+
+    semantics().semanticsEnabled = false;
+  });
+
+  // Test the scenario of a dialog coming up and containing focusable
+  // descendants with one of them explicitly requesting focus. The expectation
+  // is that the dialog will not attempt to auto-focus on anything and let the
+  // respective descendant take focus.
+  test('does nothing if a descendant asks for focus explicitly', () async {
+    semantics()
+      ..debugOverrideTimestampFunction(() => _testTime)
+      ..semanticsEnabled = true;
+
+    final List<CapturedAction> capturedActions = <CapturedAction>[];
+    EnginePlatformDispatcher.instance.onSemanticsActionEvent = (ui.SemanticsActionEvent event) {
+      capturedActions.add((event.nodeId, event.type, event.arguments));
+    };
+
+    final SemanticsTester tester = SemanticsTester(owner());
+    tester.updateNode(
+      id: 0,
+      scopesRoute: true,
+      transform: Matrix4.identity().toFloat64(),
+      children: <SemanticsNodeUpdate>[
+        tester.updateNode(
+          id: 1,
+          children: <SemanticsNodeUpdate>[
+            tester.updateNode(
+              id: 2,
+              label: 'Button 1',
+              hasTap: true,
+              hasEnabledState: true,
+              isEnabled: true,
+              isButton: true,
+              isFocusable: true,
+              isFocused: false,
+              rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+            ),
+            tester.updateNode(
+              id: 3,
+              label: 'Button 2',
+              hasTap: true,
+              hasEnabledState: true,
+              isEnabled: true,
+              isButton: true,
+              isFocusable: true,
+              // Asked for focus explicitly.
+              isFocused: true,
+              rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+            ),
+          ],
+        ),
+      ],
+    );
+    tester.apply();
+
+    expect(
+      capturedActions,
+      <CapturedAction>[
+        (3, ui.SemanticsAction.didGainAccessibilityFocus, null),
+      ],
+    );
+
+    semantics().semanticsEnabled = false;
+  });
+
+  // Test the scenario of a dialog coming up and containing non-focusable
+  // descendants that can have a11y focus. The expectation is that the first
+  // descendant will be auto-focused, even if it's not input-focusable.
+  test('focuses on the first non-focusable descedant', () async {
+    semantics()
+      ..debugOverrideTimestampFunction(() => _testTime)
+      ..semanticsEnabled = true;
+
+    final List<CapturedAction> capturedActions = <CapturedAction>[];
+    EnginePlatformDispatcher.instance.onSemanticsActionEvent = (ui.SemanticsActionEvent event) {
+      capturedActions.add((event.nodeId, event.type, event.arguments));
+    };
+
+    final SemanticsTester tester = SemanticsTester(owner());
+    tester.updateNode(
+      id: 0,
+      scopesRoute: true,
+      transform: Matrix4.identity().toFloat64(),
+      children: <SemanticsNodeUpdate>[
+        tester.updateNode(
+          id: 1,
+          children: <SemanticsNodeUpdate>[
+            tester.updateNode(
+              id: 2,
+              label: 'Heading',
+              rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+            ),
+            tester.updateNode(
+              id: 3,
+              label: 'Click me!',
+              hasTap: true,
+              hasEnabledState: true,
+              isEnabled: true,
+              isButton: true,
+              isFocusable: true,
+              isFocused: false,
+              rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+            ),
+          ],
+        ),
+      ],
+    );
+    tester.apply();
+
+    // The focused node is not focusable, so no notification is sent to the
+    // framework.
+    expect(capturedActions, isEmpty);
+
+    // However, the element should have gotten the focus.
+    final DomElement element = owner().debugSemanticsTree![2]!.element;
+    expect(element.tabIndex, -1);
+    expect(domDocument.activeElement, element);
+
+    semantics().semanticsEnabled = false;
+  });
+
+  // This mostly makes sure the engine doesn't crash if given a completely empty
+  // dialog trying to find something to focus on.
+  test('does nothing if nothing is focusable inside the dialog', () async {
+    semantics()
+      ..debugOverrideTimestampFunction(() => _testTime)
+      ..semanticsEnabled = true;
+
+    final List<CapturedAction> capturedActions = <CapturedAction>[];
+    EnginePlatformDispatcher.instance.onSemanticsActionEvent = (ui.SemanticsActionEvent event) {
+      capturedActions.add((event.nodeId, event.type, event.arguments));
+    };
+
+    final SemanticsTester tester = SemanticsTester(owner());
+    tester.updateNode(
+      id: 0,
+      scopesRoute: true,
+      transform: Matrix4.identity().toFloat64(),
+    );
+    tester.apply();
+
+    expect(capturedActions, isEmpty);
+    expect(domDocument.activeElement, domDocument.body);
+
+    semantics().semanticsEnabled = false;
+  });
+}
+
+typedef CapturedAction = (int nodeId, ui.SemanticsAction action, Object? args);
+
+void _testFocusable() {
+  test('AccessibilityFocusManager can manage element focus', () async {
+    semantics()
+      ..debugOverrideTimestampFunction(() => _testTime)
+      ..semanticsEnabled = true;
+
+    void pumpSemantics() {
+      final ui.SemanticsUpdateBuilder builder = ui.SemanticsUpdateBuilder();
+      updateNode(
+        builder,
+        label: 'Dummy root element',
+        transform: Matrix4.identity().toFloat64(),
+        rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+        childrenInHitTestOrder: Int32List.fromList(<int>[]),
+        childrenInTraversalOrder: Int32List.fromList(<int>[]),
+      );
+      owner().updateSemantics(builder.build());
+    }
+
+    final List<CapturedAction> capturedActions = <CapturedAction>[];
+    EnginePlatformDispatcher.instance.onSemanticsActionEvent = (ui.SemanticsActionEvent event) {
+      capturedActions.add((event.nodeId, event.type, event.arguments));
+    };
+    expect(capturedActions, isEmpty);
+
+    final AccessibilityFocusManager manager = AccessibilityFocusManager(owner());
+    expect(capturedActions, isEmpty);
+
+    final DomElement element = createDomElement('test-element');
+    expect(element.tabIndex, -1);
+    domDocument.body!.append(element);
+
+    // Start managing element
+    manager.manage(1, element);
+    expect(element.tabIndex, 0);
+    expect(capturedActions, isEmpty);
+    expect(domDocument.activeElement, isNot(element));
+
+    // Request focus
+    manager.changeFocus(true);
+    pumpSemantics(); // triggers post-update callbacks
+    expect(domDocument.activeElement, element);
+    expect(capturedActions, <CapturedAction>[
+      (1, ui.SemanticsAction.didGainAccessibilityFocus, null),
+    ]);
+    capturedActions.clear();
+
+    // Give up focus
+    manager.changeFocus(false);
+    pumpSemantics(); // triggers post-update callbacks
+    expect(capturedActions, isEmpty);
+    expect(domDocument.activeElement, element);
+
+    // Browser blurs the element
+    element.blur();
+    expect(domDocument.activeElement, isNot(element));
+    expect(capturedActions, <CapturedAction>[
+      (1, ui.SemanticsAction.didLoseAccessibilityFocus, null),
+    ]);
+    capturedActions.clear();
+
+    // Request focus again
+    manager.changeFocus(true);
+    pumpSemantics(); // triggers post-update callbacks
+    expect(domDocument.activeElement, element);
+    expect(capturedActions, <CapturedAction>[
+      (1, ui.SemanticsAction.didGainAccessibilityFocus, null),
+    ]);
+    capturedActions.clear();
+
+    // Double-request focus
+    manager.changeFocus(true);
+    pumpSemantics(); // triggers post-update callbacks
+    expect(domDocument.activeElement, element);
+    expect(
+      reason: 'Nothing should be sent to the framework on focus re-request.',
+      capturedActions, isEmpty);
+    capturedActions.clear();
+
+    // Stop managing
+    manager.stopManaging();
+    pumpSemantics(); // triggers post-update callbacks
+    expect(
+      reason: 'There should be no notification to the framework because the '
+              'framework should already know. Otherwise, it would not have '
+              'asked to stop managing the node.',
+      capturedActions,
+      isEmpty,
+    );
+    expect(domDocument.activeElement, element);
+
+    // Attempt to request focus when not managing an element.
+    element.blur();
+    manager.changeFocus(true);
+    pumpSemantics(); // triggers post-update callbacks
+    expect(
+      reason: 'Attempting to request focus on a node that is not managed should '
+              'not result in any notifications to the framework.',
+      capturedActions,
+      isEmpty,
+    );
+    expect(domDocument.activeElement, isNot(element));
+
+    semantics().semanticsEnabled = false;
+  });
+
+  test('applies generic Focusable role', () {
+    semantics()
+      ..debugOverrideTimestampFunction(() => _testTime)
+      ..semanticsEnabled = true;
+
+    {
+      final SemanticsTester tester = SemanticsTester(owner());
+      tester.updateNode(
+        id: 0,
+        transform: Matrix4.identity().toFloat64(),
+        children: <SemanticsNodeUpdate>[
+          tester.updateNode(
+            id: 1,
+            label: 'focusable text',
+            isFocusable: true,
+            rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+          ),
+        ],
+      );
+      tester.apply();
+    }
+
+    expectSemanticsTree(owner(), '''
+<sem style="$rootSemanticStyle">
+  <sem-c>
+    <sem role="text">focusable text</sem>
+  </sem-c>
+</sem>
+''');
+
+    final SemanticsObject node = owner().debugSemanticsTree![1]!;
+    expect(node.isFocusable, isTrue);
+    expect(
+      node.primaryRole?.role,
+      PrimaryRole.generic,
+    );
+    expect(
+      node.primaryRole?.debugSecondaryRoles,
+      contains(Role.focusable),
+    );
+
+    final DomElement element = node.element;
+    expect(domDocument.activeElement, isNot(element));
+
+    {
+      final SemanticsTester tester = SemanticsTester(owner());
+      tester.updateNode(
+        id: 1,
+        label: 'test focusable',
+        isFocusable: true,
+        isFocused: true,
+        transform: Matrix4.identity().toFloat64(),
+        rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+      );
+      tester.apply();
+    }
+    expect(domDocument.activeElement, element);
+
+    semantics().semanticsEnabled = false;
+  });
+}
+
+void _testLink() {
+  test('nodes with link: true creates anchor tag', () {
+    semantics()
+      ..debugOverrideTimestampFunction(() => _testTime)
+      ..semanticsEnabled = true;
+
+    SemanticsObject pumpSemantics() {
+      final SemanticsTester tester = SemanticsTester(owner());
+      tester.updateNode(
+        id: 0,
+        isLink: true,
+        rect: const ui.Rect.fromLTRB(0, 0, 100, 50),
+      );
+      tester.apply();
+      return tester.getSemanticsObject(0);
+    }
+
+    final SemanticsObject object = pumpSemantics();
+    expect(object.element.tagName.toLowerCase(), 'a');
+  });
+}
+
 /// A facade in front of [ui.SemanticsUpdateBuilder.updateNode] that
 /// supplies default values for semantics attributes.
-// TODO(yjbanov): move this to TestSemanticsBuilder
 void updateNode(
   ui.SemanticsUpdateBuilder builder, {
   int id = 0,
@@ -2019,6 +3465,7 @@ void updateNode(
   double elevation = 0.0,
   double thickness = 0.0,
   ui.Rect rect = ui.Rect.zero,
+  String identifier = '',
   String label = '',
   List<ui.StringAttribute> labelAttributes = const <ui.StringAttribute>[],
   String hint = '',
@@ -2026,9 +3473,11 @@ void updateNode(
   String value = '',
   List<ui.StringAttribute> valueAttributes = const <ui.StringAttribute>[],
   String increasedValue = '',
-  List<ui.StringAttribute> increasedValueAttributes = const <ui.StringAttribute>[],
+  List<ui.StringAttribute> increasedValueAttributes =
+      const <ui.StringAttribute>[],
   String decreasedValue = '',
-  List<ui.StringAttribute> decreasedValueAttributes = const <ui.StringAttribute>[],
+  List<ui.StringAttribute> decreasedValueAttributes =
+      const <ui.StringAttribute>[],
   String tooltip = '',
   ui.TextDirection textDirection = ui.TextDirection.ltr,
   Float64List? transform,
@@ -2057,6 +3506,7 @@ void updateNode(
     elevation: elevation,
     thickness: thickness,
     rect: rect,
+    identifier: identifier,
     label: label,
     labelAttributes: labelAttributes,
     hint: hint,
@@ -2081,7 +3531,7 @@ const MethodCodec codec = StandardMethodCodec();
 /// Sends a platform message to create a Platform View with the given id and viewType.
 Future<void> createPlatformView(int id, String viewType) {
   final Completer<void> completer = Completer<void>();
-  ui.window.sendPlatformMessage(
+  ui.PlatformDispatcher.instance.sendPlatformMessage(
     'flutter/platform_views',
     codec.encodeMethodCall(MethodCall(
       'create',
@@ -2094,14 +3544,3 @@ Future<void> createPlatformView(int id, String viewType) {
   );
   return completer.future;
 }
-
-/// Disposes of the platform view with the given [id].
-Future<void> disposePlatformView(int id) {
-  final Completer<void> completer = Completer<void>();
-  window.sendPlatformMessage(
-    'flutter/platform_views',
-    codec.encodeMethodCall(MethodCall('dispose', id)),
-    (dynamic _) => completer.complete(),
-  );
-  return completer.future;
-}
diff --git a/lib/web_ui/test/engine/semantics/semantics_tester.dart b/lib/web_ui/test/engine/semantics/semantics_tester.dart
index 5feab92baef31232c741910a6fa585dd51a5afc2..ff49a461e7ef1e96bb8038dc3e73740281aa14e8 100644
--- a/lib/web_ui/test/engine/semantics/semantics_tester.dart
+++ b/lib/web_ui/test/engine/semantics/semantics_tester.dart
@@ -7,22 +7,11 @@ import 'dart:typed_data';
 
 import 'package:test/test.dart';
 import 'package:ui/src/engine/dom.dart';
-import 'package:ui/src/engine/embedder.dart';
-import 'package:ui/src/engine/host_node.dart';
 import 'package:ui/src/engine/semantics.dart';
-import 'package:ui/src/engine/util.dart';
 import 'package:ui/src/engine/vector_math.dart';
 import 'package:ui/ui.dart' as ui;
 
-import '../../matchers.dart';
-
-/// Gets the DOM host where the Flutter app is being rendered.
-///
-/// This function returns the correct host for the flutter app under testing,
-/// so we don't have to hardcode domDocument across the test. (The host of a
-/// normal flutter app used to be domDocument, but now that the app is wrapped
-/// in a Shadow DOM, that's not the case anymore.)
-HostNode get appHostNode => flutterViewEmbedder.glassPaneShadow!;
+import '../../common/matchers.dart';
 
 /// CSS style applied to the root of the semantics tree.
 // TODO(yjbanov): this should be handled internally by [expectSemanticsTree].
@@ -111,6 +100,7 @@ class SemanticsTester {
     double? elevation,
     double? thickness,
     ui.Rect? rect,
+    String? identifier,
     String? label,
     List<ui.StringAttribute>? labelAttributes,
     String? hint,
@@ -274,7 +264,7 @@ class SemanticsTester {
 
     // Other attributes
     ui.Rect childRect(SemanticsNodeUpdate child) {
-      return transformRect(Matrix4.fromFloat32List(child.transform), child.rect);
+      return Matrix4.fromFloat32List(child.transform).transformRect(child.rect);
     }
 
     // If a rect is not provided, generate one than covers all children.
@@ -301,13 +291,14 @@ class SemanticsTester {
       currentValueLength: currentValueLength ?? 0,
       textSelectionBase: textSelectionBase ?? 0,
       textSelectionExtent: textSelectionExtent ?? 0,
-      platformViewId: platformViewId ?? 0,
+      platformViewId: platformViewId ?? -1,
       scrollChildren: scrollChildren ?? 0,
       scrollIndex: scrollIndex ?? 0,
       scrollPosition: scrollPosition ?? 0,
       scrollExtentMax: scrollExtentMax ?? 0,
       scrollExtentMin: scrollExtentMin ?? 0,
       rect: effectiveRect,
+      identifier: identifier ?? '',
       label: label ?? '',
       labelAttributes: labelAttributes ?? const <ui.StringAttribute>[],
       hint: hint ?? '',
@@ -344,29 +335,28 @@ class SemanticsTester {
     return owner.debugSemanticsTree![id]!;
   }
 
-  /// Locates the role manager of the semantics object with the give [id].
-  RoleManager? getRoleManager(int id, Role role) {
-    return getSemanticsObject(id).debugRoleManagerFor(role);
-  }
-
   /// Locates the [TextField] role manager of the semantics object with the give [id].
   TextField getTextField(int id) {
-    return getRoleManager(id, Role.textField)! as TextField;
+    return getSemanticsObject(id).primaryRole! as TextField;
+  }
+
+  void expectSemantics(String semanticsHtml) {
+    expectSemanticsTree(owner, semanticsHtml);
   }
 }
 
 /// Verifies the HTML structure of the current semantics tree.
-void expectSemanticsTree(String semanticsHtml) {
-  const List<String> ignoredAttributes = <String>['pointer-events'];
+void expectSemanticsTree(EngineSemanticsOwner owner, String semanticsHtml) {
+  const List<String> ignoredStyleProperties = <String>['pointer-events'];
   expect(
-    canonicalizeHtml(appHostNode.querySelector('flt-semantics')!.outerHTML!, ignoredAttributes: ignoredAttributes),
+    canonicalizeHtml(owner.semanticsHost.querySelector('flt-semantics')!.outerHTML!, ignoredStyleProperties: ignoredStyleProperties),
     canonicalizeHtml(semanticsHtml),
   );
 }
 
 /// Finds the first HTML element in the semantics tree used for scrolling.
-DomElement? findScrollable() {
-  return appHostNode.querySelectorAll('flt-semantics').firstWhereOrNull(
+DomElement findScrollable(EngineSemanticsOwner owner) {
+  return owner.semanticsHost.querySelectorAll('flt-semantics').singleWhere(
     (DomElement? element) {
       return element!.style.overflow == 'hidden' ||
         element.style.overflowY == 'scroll' ||
@@ -375,7 +365,7 @@ DomElement? findScrollable() {
   );
 }
 
-/// Logs semantics actions dispatched to [ui.window].
+/// Logs semantics actions dispatched to [ui.PlatformDispatcher].
 class SemanticsActionLogger {
   SemanticsActionLogger() {
     _idLogController = StreamController<int>();
@@ -388,12 +378,12 @@ class SemanticsActionLogger {
     // fired.
     final Zone testZone = Zone.current;
 
-    ui.window.onSemanticsAction =
-        (int id, ui.SemanticsAction action, ByteData? args) {
-      _idLogController.add(id);
-      _actionLogController.add(action);
+    ui.PlatformDispatcher.instance.onSemanticsActionEvent =
+        (ui.SemanticsActionEvent event) {
+      _idLogController.add(event.nodeId);
+      _actionLogController.add(event.type);
       testZone.run(() {
-        expect(args, null);
+        expect(event.arguments, null);
       });
     };
   }
@@ -405,7 +395,7 @@ class SemanticsActionLogger {
   Stream<int> get idLog => _idLog;
   late Stream<int> _idLog;
 
-  /// The actions that were dispatched to [ui.window].
+  /// The actions that were dispatched to [ui.PlatformDispatcher].
   Stream<ui.SemanticsAction> get actionLog => _actionLog;
   late Stream<ui.SemanticsAction> _actionLog;
 }
diff --git a/lib/web_ui/test/engine/semantics/text_field_test.dart b/lib/web_ui/test/engine/semantics/text_field_test.dart
index 91129dc3648b1696c5ef9392637849b194223490..60e4cbaa314878611abc2a4acea106c35527f1c2 100644
--- a/lib/web_ui/test/engine/semantics/text_field_test.dart
+++ b/lib/web_ui/test/engine/semantics/text_field_test.dart
@@ -3,13 +3,16 @@
 // found in the LICENSE file.
 
 @TestOn('chrome || safari || firefox')
+library;
+
+import 'dart:typed_data';
 
 import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
-
 import 'package:ui/src/engine.dart' hide window;
 import 'package:ui/ui.dart' as ui;
 
+import '../../common/test_initialization.dart';
 import 'semantics_tester.dart';
 
 final InputConfiguration singlelineConfig = InputConfiguration();
@@ -19,7 +22,8 @@ final InputConfiguration multilineConfig = InputConfiguration(
   inputAction: 'TextInputAction.newline',
 );
 
-EngineSemanticsOwner semantics() => EngineSemanticsOwner.instance;
+EngineSemantics semantics() => EngineSemantics.instance;
+EngineSemanticsOwner owner() => EnginePlatformDispatcher.instance.implicitView!.semantics;
 
 const MethodCodec codec = JSONMethodCodec();
 
@@ -30,10 +34,38 @@ void main() {
 }
 
 void testMain() {
-  ensureFlutterViewEmbedderInitialized();
+  setUpAll(() async {
+    await bootstrapAndRunApp(withImplicitView: true);
+  });
 
   setUp(() {
-    EngineSemanticsOwner.debugResetSemantics();
+    EngineSemantics.debugResetSemantics();
+  });
+
+  group('$SemanticsTextEditingStrategy pre-initialization tests', () {
+    setUp(() {
+      semantics()
+        ..debugOverrideTimestampFunction(() => _testTime)
+        ..semanticsEnabled = true;
+    });
+
+    tearDown(() {
+      semantics().semanticsEnabled = false;
+    });
+
+    test('Calling dispose() pre-initialization will not throw an error', () {
+      final SemanticsObject textFieldSemantics = createTextFieldSemantics(
+        value: 'hi',
+        isFocused: true,
+      );
+      final TextField textField = textFieldSemantics.primaryRole! as TextField;
+
+      // ensureInitialized() isn't called prior to calling dispose() here.
+      // Since we are conditionally calling dispose() on our
+      // SemanticsTextEditingStrategy._instance, we shouldn't expect an error.
+      // ref: https://github.com/flutter/engine/pull/40146
+      expect(() => textField.dispose(), returnsNormally);
+    });
   });
 
   group('$SemanticsTextEditingStrategy', () {
@@ -46,94 +78,52 @@ void testMain() {
       strategy = SemanticsTextEditingStrategy.instance;
       testTextEditing.debugTextEditingStrategyOverride = strategy;
       testTextEditing.configuration = singlelineConfig;
+      semantics()
+        ..debugOverrideTimestampFunction(() => _testTime)
+        ..semanticsEnabled = true;
     });
 
-  test('renders a text field', () async {
-    semantics()
-      ..debugOverrideTimestampFunction(() => _testTime)
-      ..semanticsEnabled = true;
+    tearDown(() {
+      semantics().semanticsEnabled = false;
+    });
 
+  test('renders a text field', () {
     createTextFieldSemantics(value: 'hello');
 
-    expectSemanticsTree('''
+    expectSemanticsTree(owner(), '''
 <sem style="$rootSemanticStyle">
   <input value="hello" />
 </sem>''');
-
-    semantics().semanticsEnabled = false;
   });
 
-  test('tap detection works', () async {
-    debugBrowserEngineOverride = BrowserEngine.webkit;
-    debugOperatingSystemOverride = OperatingSystem.iOs;
+    // TODO(yjbanov): this test will need to be adjusted for Safari when we add
+    //                Safari testing.
+    test('sends a didGainAccessibilityFocus/didLoseAccessibilityFocus action when browser requests focus/blur', () async {
+      final SemanticsActionLogger logger = SemanticsActionLogger();
+      createTextFieldSemantics(value: 'hello');
 
-    final SemanticsActionLogger logger = SemanticsActionLogger();
-    semantics()
-      ..debugOverrideTimestampFunction(() => _testTime)
-      ..semanticsEnabled = true;
+      final DomElement textField = owner().semanticsHost
+          .querySelector('input[data-semantics-role="text-field"]')!;
 
-    createTextFieldSemantics(value: 'hello');
-
-    final DomElement textField = appHostNode
-        .querySelector('input[data-semantics-role="text-field"]')!;
-
-    textField.dispatchEvent(createDomPointerEvent(
-        'pointerdown',
-        <Object?, Object?>{
-          'clientX': 25,
-          'clientY': 48,
-        },
-      ));
-    textField.dispatchEvent(createDomPointerEvent(
-        'pointerup',
-        <Object?, Object?>{
-          'clientX': 26,
-          'clientY': 48,
-        },
-      ));
-
-    expect(await logger.idLog.first, 0);
-    expect(await logger.actionLog.first, ui.SemanticsAction.tap);
-
-    semantics().semanticsEnabled = false;
-    debugBrowserEngineOverride = null;
-    debugOperatingSystemOverride = null;
-  });
-
-  // TODO(yjbanov): this test will need to be adjusted for Safari when we add
-  //                Safari testing.
-  test('sends a tap action when browser requests focus', () async {
-    final SemanticsActionLogger logger = SemanticsActionLogger();
-    semantics()
-      ..debugOverrideTimestampFunction(() => _testTime)
-      ..semanticsEnabled = true;
-
-    createTextFieldSemantics(value: 'hello');
-
-    final DomElement textField = appHostNode
-        .querySelector('input[data-semantics-role="text-field"]')!;
+      expect(owner().semanticsHost.ownerDocument?.activeElement, isNot(textField));
 
-    expect(appHostNode.activeElement, isNot(textField));
+      textField.focus();
 
-    textField.focus();
+      expect(owner().semanticsHost.ownerDocument?.activeElement, textField);
+      expect(await logger.idLog.first, 0);
+      expect(await logger.actionLog.first, ui.SemanticsAction.didGainAccessibilityFocus);
 
-    expect(appHostNode.activeElement, textField);
-    expect(await logger.idLog.first, 0);
-    expect(await logger.actionLog.first, ui.SemanticsAction.tap);
+      textField.blur();
 
-    semantics().semanticsEnabled = false;
-  },  // TODO(yjbanov): https://github.com/flutter/flutter/issues/46638
-      // TODO(yjbanov): https://github.com/flutter/flutter/issues/50590
-      // TODO(yjbanov): https://github.com/flutter/flutter/issues/50754
-      skip: browserEngine != BrowserEngine.blink);
+      expect(owner().semanticsHost.ownerDocument?.activeElement, isNot(textField));
+      expect(await logger.idLog.first, 0);
+      expect(await logger.actionLog.first, ui.SemanticsAction.didLoseAccessibilityFocus);
+    }, // TODO(yjbanov): https://github.com/flutter/flutter/issues/46638
+       // TODO(yjbanov): https://github.com/flutter/flutter/issues/50590
+    skip: browserEngine != BrowserEngine.blink);
 
-    test('Syncs editing state from framework', () async {
-      semantics()
-        ..debugOverrideTimestampFunction(() => _testTime)
-        ..semanticsEnabled = true;
-
-      expect(domDocument.activeElement, domDocument.body);
-      expect(appHostNode.activeElement, null);
+    test('Syncs semantic state from framework', () {
+      expect(owner().semanticsHost.ownerDocument?.activeElement, domDocument.body);
 
       int changeCount = 0;
       int actionCount = 0;
@@ -155,14 +145,12 @@ void testMain() {
         rect: const ui.Rect.fromLTWH(0, 0, 10, 15),
       );
 
-      final TextField textField = textFieldSemantics.debugRoleManagerFor(Role.textField)! as TextField;
-      expect(domDocument.activeElement, flutterViewEmbedder.glassPaneElement);
-      expect(appHostNode.activeElement, strategy.domElement);
+      final TextField textField = textFieldSemantics.primaryRole! as TextField;
+      expect(owner().semanticsHost.ownerDocument?.activeElement, strategy.domElement);
       expect(textField.editableElement, strategy.domElement);
-      expect((textField.editableElement as dynamic).value, 'hello');
-      expect(textField.editableElement.getAttribute('aria-label'), 'greeting');
-      expect(textField.editableElement.style.width, '10px');
-      expect(textField.editableElement.style.height, '15px');
+      expect(textField.activeEditableElement.getAttribute('aria-label'), 'greeting');
+      expect(textField.activeEditableElement.style.width, '10px');
+      expect(textField.activeEditableElement.style.height, '15px');
 
       // Update
       createTextFieldSemantics(
@@ -171,16 +159,13 @@ void testMain() {
         rect: const ui.Rect.fromLTWH(0, 0, 12, 17),
       );
 
-      expect(domDocument.activeElement, domDocument.body);
-      expect(appHostNode.activeElement, null);
+      expect(owner().semanticsHost.ownerDocument?.activeElement, domDocument.body);
       expect(strategy.domElement, null);
-      expect((textField.editableElement as dynamic).value, 'bye');
-      expect(textField.editableElement.getAttribute('aria-label'), 'farewell');
-      expect(textField.editableElement.style.width, '12px');
-      expect(textField.editableElement.style.height, '17px');
+      expect(textField.activeEditableElement.getAttribute('aria-label'), 'farewell');
+      expect(textField.activeEditableElement.style.width, '12px');
+      expect(textField.activeEditableElement.style.height, '17px');
 
       strategy.disable();
-      semantics().semanticsEnabled = false;
 
       // There was no user interaction with the <input> element,
       // so we should expect no engine-to-framework feedback.
@@ -188,13 +173,81 @@ void testMain() {
       expect(actionCount, 0);
     });
 
-    test('Gives up focus after DOM blur', () async {
-      semantics()
-        ..debugOverrideTimestampFunction(() => _testTime)
-        ..semanticsEnabled = true;
+    test(
+        'Does not overwrite text value and selection editing state on semantic updates',
+        () {
+      strategy.enable(
+        singlelineConfig,
+        onChange: (_, __) {},
+        onAction: (_) {},
+      );
+
+      final SemanticsObject textFieldSemantics = createTextFieldSemantics(
+          value: 'hello',
+          textSelectionBase: 1,
+          textSelectionExtent: 3,
+          isFocused: true,
+          rect: const ui.Rect.fromLTWH(0, 0, 10, 15));
+
+      final TextField textField = textFieldSemantics.primaryRole! as TextField;
+      final DomHTMLInputElement editableElement =
+          textField.activeEditableElement as DomHTMLInputElement;
+
+      expect(editableElement, strategy.domElement);
+      expect(editableElement.value, '');
+      expect(editableElement.selectionStart, 0);
+      expect(editableElement.selectionEnd, 0);
+
+      strategy.disable();
+    });
+
+    test(
+        'Updates editing state when receiving framework messages from the text input channel',
+        () {
+      expect(owner().semanticsHost.ownerDocument?.activeElement, domDocument.body);
+
+      strategy.enable(
+        singlelineConfig,
+        onChange: (_, __) {},
+        onAction: (_) {},
+      );
+
+      final SemanticsObject textFieldSemantics = createTextFieldSemantics(
+          value: 'hello',
+          textSelectionBase: 1,
+          textSelectionExtent: 3,
+          isFocused: true,
+          rect: const ui.Rect.fromLTWH(0, 0, 10, 15));
+
+      final TextField textField = textFieldSemantics.primaryRole! as TextField;
+      final DomHTMLInputElement editableElement =
+          textField.activeEditableElement as DomHTMLInputElement;
+
+      // No updates expected on semantic updates
+      expect(editableElement, strategy.domElement);
+      expect(editableElement.value, '');
+      expect(editableElement.selectionStart, 0);
+      expect(editableElement.selectionEnd, 0);
+
+      // Update from framework
+      const MethodCall setEditingState =
+          MethodCall('TextInput.setEditingState', <String, dynamic>{
+        'text': 'updated',
+        'selectionBase': 2,
+        'selectionExtent': 3,
+      });
+      sendFrameworkMessage(codec.encodeMethodCall(setEditingState), testTextEditing);
+
+      // Editing state should now be updated
+      expect(editableElement.value, 'updated');
+      expect(editableElement.selectionStart, 2);
+      expect(editableElement.selectionEnd, 3);
+
+      strategy.disable();
+    });
 
-      expect(domDocument.activeElement, domDocument.body);
-      expect(appHostNode.activeElement, null);
+    test('Gives up focus after DOM blur', () {
+      expect(owner().semanticsHost.ownerDocument?.activeElement, domDocument.body);
 
       strategy.enable(
         singlelineConfig,
@@ -206,24 +259,17 @@ void testMain() {
         isFocused: true,
       );
 
-      final TextField textField = textFieldSemantics.debugRoleManagerFor(Role.textField)! as TextField;
+      final TextField textField = textFieldSemantics.primaryRole! as TextField;
       expect(textField.editableElement, strategy.domElement);
-      expect(domDocument.activeElement, flutterViewEmbedder.glassPaneElement);
-      expect(appHostNode.activeElement, strategy.domElement);
+      expect(owner().semanticsHost.ownerDocument?.activeElement, strategy.domElement);
 
       // The input should not refocus after blur.
-      textField.editableElement.blur();
-      expect(domDocument.activeElement, domDocument.body);
-      expect(appHostNode.activeElement, null);
+      textField.activeEditableElement.blur();
+      expect(owner().semanticsHost.ownerDocument?.activeElement, domDocument.body);
       strategy.disable();
-      semantics().semanticsEnabled = false;
     });
 
     test('Does not dispose and recreate dom elements in persistent mode', () {
-      semantics()
-        ..debugOverrideTimestampFunction(() => _testTime)
-        ..semanticsEnabled = true;
-
       strategy.enable(
         singlelineConfig,
         onChange: (_, __) {},
@@ -239,27 +285,20 @@ void testMain() {
         isFocused: true,
       );
       expect(strategy.domElement, isNotNull);
-      expect(domDocument.activeElement, flutterViewEmbedder.glassPaneElement);
-      expect(appHostNode.activeElement, strategy.domElement);
+      expect(owner().semanticsHost.ownerDocument?.activeElement, strategy.domElement);
 
       strategy.disable();
       expect(strategy.domElement, isNull);
 
       // It doesn't remove the DOM element.
-      final TextField textField = textFieldSemantics.debugRoleManagerFor(Role.textField)! as TextField;
-      expect(appHostNode.contains(textField.editableElement), isTrue);
+      final TextField textField = textFieldSemantics.primaryRole! as TextField;
+      expect(owner().semanticsHost.contains(textField.editableElement), isTrue);
       // Editing element is not enabled.
       expect(strategy.isEnabled, isFalse);
-      expect(domDocument.activeElement, domDocument.body);
-      expect(appHostNode.activeElement, null);
-      semantics().semanticsEnabled = false;
+      expect(owner().semanticsHost.ownerDocument?.activeElement, domDocument.body);
     });
 
     test('Refocuses when setting editing state', () {
-      semantics()
-        ..debugOverrideTimestampFunction(() => _testTime)
-        ..semanticsEnabled = true;
-
       strategy.enable(
         singlelineConfig,
         onChange: (_, __) {},
@@ -271,13 +310,11 @@ void testMain() {
         isFocused: true,
       );
       expect(strategy.domElement, isNotNull);
-      expect(domDocument.activeElement, flutterViewEmbedder.glassPaneElement);
-      expect(appHostNode.activeElement, strategy.domElement);
+      expect(owner().semanticsHost.ownerDocument?.activeElement, strategy.domElement);
 
       // Blur the element without telling the framework.
       strategy.activeDomElement.blur();
-      expect(domDocument.activeElement, domDocument.body);
-      expect(appHostNode.activeElement, null);
+      expect(owner().semanticsHost.ownerDocument?.activeElement, domDocument.body);
 
       // The input will have focus after editing state is set and semantics updated.
       strategy.setEditingState(EditingState(text: 'foo'));
@@ -295,18 +332,12 @@ void testMain() {
         value: 'hello',
         isFocused: true,
       );
-      expect(domDocument.activeElement, flutterViewEmbedder.glassPaneElement);
-      expect(appHostNode.activeElement, strategy.domElement);
+      expect(owner().semanticsHost.ownerDocument?.activeElement, strategy.domElement);
 
       strategy.disable();
-      semantics().semanticsEnabled = false;
     });
 
     test('Works in multi-line mode', () {
-      semantics()
-        ..debugOverrideTimestampFunction(() => _testTime)
-        ..semanticsEnabled = true;
-
       strategy.enable(
         multilineConfig,
         onChange: (_, __) {},
@@ -318,10 +349,10 @@ void testMain() {
         isMultiline: true,
       );
 
-      final DomHTMLTextAreaElement textArea = strategy.domElement! as DomHTMLTextAreaElement;
+      final DomHTMLTextAreaElement textArea =
+          strategy.domElement! as DomHTMLTextAreaElement;
 
-      expect(domDocument.activeElement, flutterViewEmbedder.glassPaneElement);
-      expect(appHostNode.activeElement, strategy.domElement);
+      expect(owner().semanticsHost.ownerDocument?.activeElement, strategy.domElement);
 
       strategy.enable(
         singlelineConfig,
@@ -330,22 +361,16 @@ void testMain() {
       );
 
       textArea.blur();
-      expect(domDocument.activeElement, domDocument.body);
-      expect(appHostNode.activeElement, null);
+      expect(owner().semanticsHost.ownerDocument?.activeElement, domDocument.body);
 
       strategy.disable();
       // It doesn't remove the textarea from the DOM.
-      expect(appHostNode.contains(textArea), isTrue);
+      expect(owner().semanticsHost.contains(textArea), isTrue);
       // Editing element is not enabled.
       expect(strategy.isEnabled, isFalse);
-      semantics().semanticsEnabled = false;
     });
 
     test('Does not position or size its DOM element', () {
-      semantics()
-        ..debugOverrideTimestampFunction(() => _testTime)
-        ..semanticsEnabled = true;
-
       strategy.enable(
         singlelineConfig,
         onChange: (_, __) {},
@@ -359,7 +384,6 @@ void testMain() {
         width: 13,
         globalTransform: Matrix4.translationValues(14, 15, 0).storage,
       );
-      const ui.Rect semanticsRect = ui.Rect.fromLTRB(0, 0, 100, 50);
 
       testTextEditing.acceptCommand(
         TextInputSetEditableSizeAndTransform(geometry: geometry),
@@ -375,17 +399,17 @@ void testMain() {
       // EditableTextGeometry.
       void checkPlacementIsSetBySemantics() {
         expect(strategy.activeDomElement.style.transform, '');
-        expect(strategy.activeDomElement.style.width, '${semanticsRect.width}px');
-        expect(strategy.activeDomElement.style.height, '${semanticsRect.height}px');
+        expect(strategy.activeDomElement.style.width, '100px');
+        expect(strategy.activeDomElement.style.height, '50px');
       }
 
       checkPlacementIsSetBySemantics();
       strategy.placeElement();
       checkPlacementIsSetBySemantics();
-      semantics().semanticsEnabled = false;
     });
 
-    Map<int, SemanticsObject> createTwoFieldSemantics(SemanticsTester builder, { int? focusFieldId }) {
+    Map<int, SemanticsObject> createTwoFieldSemantics(SemanticsTester builder,
+        {int? focusFieldId}) {
       builder.updateNode(
         id: 0,
         children: <SemanticsNodeUpdate>[
@@ -408,11 +432,7 @@ void testMain() {
       return builder.apply();
     }
 
-    test('Changes focus from one text field to another through a semantics update', () async {
-      semantics()
-        ..debugOverrideTimestampFunction(() => _testTime)
-        ..semanticsEnabled = true;
-
+    test('Changes focus from one text field to another through a semantics update', () {
       strategy.enable(
         singlelineConfig,
         onChange: (_, __) {},
@@ -421,33 +441,444 @@ void testMain() {
 
       // Switch between the two fields a few times.
       for (int i = 0; i < 5; i++) {
-        final SemanticsTester tester = SemanticsTester(semantics());
+        final SemanticsTester tester = SemanticsTester(owner());
         createTwoFieldSemantics(tester, focusFieldId: 1);
         expect(tester.apply().length, 3);
 
-        expect(domDocument.activeElement, flutterViewEmbedder.glassPaneElement);
-        expect(appHostNode.activeElement, tester.getTextField(1).editableElement);
+        expect(owner().semanticsHost.ownerDocument?.activeElement,
+            tester.getTextField(1).editableElement);
         expect(strategy.domElement, tester.getTextField(1).editableElement);
 
         createTwoFieldSemantics(tester, focusFieldId: 2);
         expect(tester.apply().length, 3);
-        expect(appHostNode.activeElement, tester.getTextField(2).editableElement);
+        expect(owner().semanticsHost.ownerDocument?.activeElement,
+            tester.getTextField(2).editableElement);
         expect(strategy.domElement, tester.getTextField(2).editableElement);
       }
+    });
+  }, skip: isIosSafari);
+
+  group('$SemanticsTextEditingStrategy in iOS', () {
+    late HybridTextEditing testTextEditing;
+    late SemanticsTextEditingStrategy strategy;
+
+    setUp(() {
+      testTextEditing = HybridTextEditing();
+      SemanticsTextEditingStrategy.ensureInitialized(testTextEditing);
+      strategy = SemanticsTextEditingStrategy.instance;
+      testTextEditing.debugTextEditingStrategyOverride = strategy;
+      testTextEditing.configuration = singlelineConfig;
+      debugBrowserEngineOverride = BrowserEngine.webkit;
+      debugOperatingSystemOverride = OperatingSystem.iOs;
+      semantics()
+        ..debugOverrideTimestampFunction(() => _testTime)
+        ..semanticsEnabled = true;
+    });
 
+    tearDown(() {
+      debugBrowserEngineOverride = null;
+      debugOperatingSystemOverride = null;
       semantics().semanticsEnabled = false;
     });
-  });
+
+    test('does not render a text field', () {
+      expect(owner().semanticsHost.querySelector('flt-semantics[role="textbox"]'), isNull);
+      createTextFieldSemanticsForIos(value: 'hello');
+      expect(owner().semanticsHost.querySelector('flt-semantics[role="textbox"]'), isNotNull);
+    });
+
+    test('tap detection works', () async {
+      final SemanticsActionLogger logger = SemanticsActionLogger();
+      createTextFieldSemanticsForIos(value: 'hello');
+
+      final DomElement textField = owner().semanticsHost
+          .querySelector('flt-semantics[role="textbox"]')!;
+
+      simulateTap(textField);
+      expect(await logger.idLog.first, 0);
+      expect(await logger.actionLog.first, ui.SemanticsAction.tap);
+    });
+
+    test('Syncs semantic state from framework', () {
+      expect(owner().semanticsHost.ownerDocument?.activeElement, domDocument.body);
+
+      int changeCount = 0;
+      int actionCount = 0;
+      strategy.enable(
+        singlelineConfig,
+        onChange: (_, __) {
+          changeCount++;
+        },
+        onAction: (_) {
+          actionCount++;
+        },
+      );
+
+      // Create
+      final SemanticsObject textFieldSemantics = createTextFieldSemanticsForIos(
+        value: 'hello',
+        label: 'greeting',
+        isFocused: true,
+        rect: const ui.Rect.fromLTWH(0, 0, 10, 15),
+      );
+
+      final TextField textField = textFieldSemantics.primaryRole! as TextField;
+      expect(owner().semanticsHost.ownerDocument?.activeElement, strategy.domElement);
+      expect(textField.editableElement, strategy.domElement);
+      expect(textField.activeEditableElement.getAttribute('aria-label'), 'greeting');
+      expect(textField.activeEditableElement.style.width, '10px');
+      expect(textField.activeEditableElement.style.height, '15px');
+
+      // Update
+      createTextFieldSemanticsForIos(
+        value: 'bye',
+        label: 'farewell',
+        rect: const ui.Rect.fromLTWH(0, 0, 12, 17),
+      );
+      final DomElement textBox =
+          owner().semanticsHost.querySelector('flt-semantics[role="textbox"]')!;
+
+      expect(strategy.domElement, null);
+      expect(owner().semanticsHost.ownerDocument?.activeElement, textBox);
+      expect(textBox.getAttribute('aria-label'), 'farewell');
+
+      strategy.disable();
+
+      // There was no user interaction with the <input> element,
+      // so we should expect no engine-to-framework feedback.
+      expect(changeCount, 0);
+      expect(actionCount, 0);
+    });
+
+    test(
+        'Does not overwrite text value and selection editing state on semantic updates',
+        () {
+      strategy.enable(
+        singlelineConfig,
+        onChange: (_, __) {},
+        onAction: (_) {},
+      );
+
+      final SemanticsObject textFieldSemantics = createTextFieldSemanticsForIos(
+          value: 'hello',
+          textSelectionBase: 1,
+          textSelectionExtent: 3,
+          isFocused: true,
+          rect: const ui.Rect.fromLTWH(0, 0, 10, 15));
+
+      final TextField textField = textFieldSemantics.primaryRole! as TextField;
+      final DomHTMLInputElement editableElement =
+          textField.activeEditableElement as DomHTMLInputElement;
+
+      expect(editableElement, strategy.domElement);
+      expect(editableElement.value, '');
+      expect(editableElement.selectionStart, 0);
+      expect(editableElement.selectionEnd, 0);
+
+      strategy.disable();
+    });
+
+    test(
+        'Updates editing state when receiving framework messages from the text input channel',
+        () {
+      expect(owner().semanticsHost.ownerDocument?.activeElement, domDocument.body);
+
+      strategy.enable(
+        singlelineConfig,
+        onChange: (_, __) {},
+        onAction: (_) {},
+      );
+
+      final SemanticsObject textFieldSemantics = createTextFieldSemanticsForIos(
+          value: 'hello',
+          textSelectionBase: 1,
+          textSelectionExtent: 3,
+          isFocused: true,
+          rect: const ui.Rect.fromLTWH(0, 0, 10, 15));
+
+      final TextField textField = textFieldSemantics.primaryRole! as TextField;
+      final DomHTMLInputElement editableElement =
+          textField.activeEditableElement as DomHTMLInputElement;
+
+      // No updates expected on semantic updates
+      expect(editableElement, strategy.domElement);
+      expect(editableElement.value, '');
+      expect(editableElement.selectionStart, 0);
+      expect(editableElement.selectionEnd, 0);
+
+      // Update from framework
+      const MethodCall setEditingState =
+          MethodCall('TextInput.setEditingState', <String, dynamic>{
+        'text': 'updated',
+        'selectionBase': 2,
+        'selectionExtent': 3,
+      });
+      sendFrameworkMessage(codec.encodeMethodCall(setEditingState), testTextEditing);
+
+      // Editing state should now be updated
+      // expect(editableElement.value, 'updated');
+      expect(editableElement.selectionStart, 2);
+      expect(editableElement.selectionEnd, 3);
+
+      strategy.disable();
+    });
+
+    test('Gives up focus after DOM blur', () {
+      expect(owner().semanticsHost.ownerDocument?.activeElement, domDocument.body);
+
+      strategy.enable(
+        singlelineConfig,
+        onChange: (_, __) {},
+        onAction: (_) {},
+      );
+      final SemanticsObject textFieldSemantics = createTextFieldSemanticsForIos(
+        value: 'hello',
+        isFocused: true,
+      );
+
+      final TextField textField = textFieldSemantics.primaryRole! as TextField;
+      expect(textField.editableElement, strategy.domElement);
+      expect(owner().semanticsHost.ownerDocument?.activeElement, strategy.domElement);
+
+      // The input should not refocus after blur.
+      textField.activeEditableElement.blur();
+      final DomElement textBox =
+          owner().semanticsHost.querySelector('flt-semantics[role="textbox"]')!;
+      expect(owner().semanticsHost.ownerDocument?.activeElement, textBox);
+
+      strategy.disable();
+    });
+
+    test('Disposes and recreates dom elements in persistent mode', () {
+      strategy.enable(
+        singlelineConfig,
+        onChange: (_, __) {},
+        onAction: (_) {},
+      );
+
+      // It doesn't create a new DOM element.
+      expect(strategy.domElement, isNull);
+
+      // During the semantics update the DOM element is created and is focused on.
+      final SemanticsObject textFieldSemantics = createTextFieldSemanticsForIos(
+        value: 'hello',
+        isFocused: true,
+      );
+      expect(strategy.domElement, isNotNull);
+      expect(owner().semanticsHost.ownerDocument?.activeElement, strategy.domElement);
+
+      strategy.disable();
+      expect(strategy.domElement, isNull);
+
+      // It removes the DOM element.
+      final TextField textField = textFieldSemantics.primaryRole! as TextField;
+      expect(owner().semanticsHost.contains(textField.editableElement), isFalse);
+      // Editing element is not enabled.
+      expect(strategy.isEnabled, isFalse);
+      // Focus is on the semantic object
+      final DomElement textBox =
+          owner().semanticsHost.querySelector('flt-semantics[role="textbox"]')!;
+      expect(owner().semanticsHost.ownerDocument?.activeElement, textBox);
+    });
+
+    test('Refocuses when setting editing state', () {
+      strategy.enable(
+        singlelineConfig,
+        onChange: (_, __) {},
+        onAction: (_) {},
+      );
+
+      createTextFieldSemanticsForIos(
+        value: 'hello',
+        isFocused: true,
+      );
+      expect(strategy.domElement, isNotNull);
+      expect(owner().semanticsHost.ownerDocument?.activeElement, strategy.domElement);
+
+      // Blur the element without telling the framework.
+      strategy.activeDomElement.blur();
+      final DomElement textBox =
+          owner().semanticsHost.querySelector('flt-semantics[role="textbox"]')!;
+      expect(owner().semanticsHost.ownerDocument?.activeElement, textBox);
+
+      // The input will have focus after editing state is set and semantics updated.
+      strategy.setEditingState(EditingState(text: 'foo'));
+
+      // NOTE: at this point some browsers, e.g. some versions of Safari will
+      //       have set the focus on the editing element as a result of setting
+      //       the test selection range. Other browsers require an explicit call
+      //       to `element.focus()` for the element to acquire focus. So far,
+      //       this discrepancy hasn't caused issues, so we're not checking for
+      //       any particular focus state between setEditingState and
+      //       createTextFieldSemantics. However, this is something for us to
+      //       keep in mind in case this causes issues in the future.
+
+      createTextFieldSemanticsForIos(
+        value: 'hello',
+        isFocused: true,
+      );
+      expect(owner().semanticsHost.ownerDocument?.activeElement, strategy.domElement);
+
+      strategy.disable();
+    });
+
+    test('Works in multi-line mode', () {
+      strategy.enable(
+        multilineConfig,
+        onChange: (_, __) {},
+        onAction: (_) {},
+      );
+      createTextFieldSemanticsForIos(
+        value: 'hello',
+        isFocused: true,
+        isMultiline: true,
+      );
+
+      final DomHTMLTextAreaElement textArea =
+          strategy.domElement! as DomHTMLTextAreaElement;
+      expect(owner().semanticsHost.ownerDocument?.activeElement, strategy.domElement);
+
+      strategy.enable(
+        singlelineConfig,
+        onChange: (_, __) {},
+        onAction: (_) {},
+      );
+
+      expect(owner().semanticsHost.contains(textArea), isTrue);
+
+      textArea.blur();
+      final DomElement textBox =
+          owner().semanticsHost.querySelector('flt-semantics[role="textbox"]')!;
+
+      expect(owner().semanticsHost.ownerDocument?.activeElement, textBox);
+
+      strategy.disable();
+      // It removes the textarea from the DOM.
+      expect(owner().semanticsHost.contains(textArea), isFalse);
+      // Editing element is not enabled.
+      expect(strategy.isEnabled, isFalse);
+    });
+
+    test('Does not position or size its DOM element', () {
+      strategy.enable(
+        singlelineConfig,
+        onChange: (_, __) {},
+        onAction: (_) {},
+      );
+
+      // Send width and height that are different from semantics values on
+      // purpose.
+      final Matrix4 transform = Matrix4.translationValues(14, 15, 0);
+      final EditableTextGeometry geometry = EditableTextGeometry(
+        height: 12,
+        width: 13,
+        globalTransform: transform.storage,
+      );
+      const ui.Rect semanticsRect = ui.Rect.fromLTRB(0, 0, 100, 50);
+
+      testTextEditing.acceptCommand(
+        TextInputSetEditableSizeAndTransform(geometry: geometry),
+        () {},
+      );
+
+      createTextFieldSemanticsForIos(
+        value: 'hello',
+        isFocused: true,
+      );
+
+      // Checks that the placement attributes come from semantics and not from
+      // EditableTextGeometry.
+      void checkPlacementIsSetBySemantics() {
+        expect(strategy.activeDomElement.style.transform,
+            isNot(equals(transform.toString())));
+        expect(strategy.activeDomElement.style.width, '${semanticsRect.width}px');
+        expect(strategy.activeDomElement.style.height, '${semanticsRect.height}px');
+      }
+
+      checkPlacementIsSetBySemantics();
+      strategy.placeElement();
+      checkPlacementIsSetBySemantics();
+    });
+
+    test('Changes focus from one text field to another through a semantics update', () {
+      strategy.enable(
+        singlelineConfig,
+        onChange: (_, __) {},
+        onAction: (_) {},
+      );
+
+      // Switch between the two fields a few times.
+      for (int i = 0; i < 1; i++) {
+        final SemanticsTester tester = SemanticsTester(owner());
+        createTwoFieldSemanticsForIos(tester, focusFieldId: 1);
+
+        expect(tester.apply().length, 3);
+        expect(owner().semanticsHost.ownerDocument?.activeElement,
+            tester.getTextField(1).editableElement);
+        expect(strategy.domElement, tester.getTextField(1).editableElement);
+
+        createTwoFieldSemanticsForIos(tester, focusFieldId: 2);
+        expect(tester.apply().length, 3);
+        expect(owner().semanticsHost.ownerDocument?.activeElement,
+            tester.getTextField(2).editableElement);
+        expect(strategy.domElement, tester.getTextField(2).editableElement);
+      }
+    });
+
+    test('input transform is correct', () async {
+      strategy.enable(
+        singlelineConfig,
+        onChange: (_, __) {},
+        onAction: (_) {},
+      );
+      createTextFieldSemanticsForIos(
+        value: 'hello',
+        isFocused: true,
+        );
+      expect(strategy.activeDomElement.style.transform, 'translate(${offScreenOffset}px, ${offScreenOffset}px)');
+      // See [_delayBeforePlacement].
+      await Future<void>.delayed(const Duration(milliseconds: 120) , (){});
+      expect(strategy.activeDomElement.style.transform, '');
+    });
+
+    test('disposes the editable element, if there is one', () {
+      strategy.enable(
+        singlelineConfig,
+        onChange: (_, __) {},
+        onAction: (_) {},
+      );
+      SemanticsObject textFieldSemantics = createTextFieldSemanticsForIos(
+        value: 'hello',
+      );
+      TextField textField = textFieldSemantics.primaryRole! as TextField;
+      expect(textField.editableElement, isNull);
+      textField.dispose();
+      expect(textField.editableElement, isNull);
+
+      textFieldSemantics = createTextFieldSemanticsForIos(
+        value: 'hi',
+        isFocused: true,
+      );
+      textField = textFieldSemantics.primaryRole! as TextField;
+
+      expect(textField.editableElement, isNotNull);
+      textField.dispose();
+      expect(textField.editableElement, isNull);
+    });
+  }, skip: !isSafari);
 }
 
+
 SemanticsObject createTextFieldSemantics({
   required String value,
   String label = '',
   bool isFocused = false,
   bool isMultiline = false,
   ui.Rect rect = const ui.Rect.fromLTRB(0, 0, 100, 50),
+  int textSelectionBase = 0,
+  int textSelectionExtent = 0,
 }) {
-  final SemanticsTester tester = SemanticsTester(semantics());
+  final SemanticsTester tester = SemanticsTester(owner());
   tester.updateNode(
     id: 0,
     label: label,
@@ -458,7 +889,126 @@ SemanticsObject createTextFieldSemantics({
     hasTap: true,
     rect: rect,
     textDirection: ui.TextDirection.ltr,
+    textSelectionBase: textSelectionBase,
+    textSelectionExtent: textSelectionExtent
   );
   tester.apply();
   return tester.getSemanticsObject(0);
 }
+
+void simulateTap(DomElement element) {
+  element.dispatchEvent(createDomPointerEvent(
+    'pointerdown',
+    <Object?, Object?>{
+      'clientX': 125,
+      'clientY': 248,
+    },
+  ));
+  element.dispatchEvent(createDomPointerEvent(
+    'pointerup',
+    <Object?, Object?>{
+      'clientX': 126,
+      'clientY': 248,
+    },
+  ));
+}
+
+/// An editable DOM element won't be created on iOS unless a tap is detected.
+/// This function mimics the workflow by simulating a tap and sending a second
+/// semantic update.
+SemanticsObject createTextFieldSemanticsForIos({
+  required String value,
+  String label = '',
+  bool isFocused = false,
+  bool isMultiline = false,
+  ui.Rect rect = const ui.Rect.fromLTRB(0, 0, 100, 50),
+  int textSelectionBase = 0,
+  int textSelectionExtent = 0,
+}) {
+  final SemanticsObject textFieldSemantics = createTextFieldSemantics(
+    value: value,
+    isFocused: isFocused,
+    label: label,
+    isMultiline: isMultiline,
+    rect: rect,
+    textSelectionBase: textSelectionBase,
+    textSelectionExtent: textSelectionExtent,
+  );
+
+  if (isFocused) {
+    final TextField textField = textFieldSemantics.primaryRole! as TextField;
+
+    simulateTap(textField.semanticsObject.element);
+
+    return createTextFieldSemantics(
+      value: value,
+      isFocused: isFocused,
+      label: label,
+      isMultiline: isMultiline,
+      rect: rect,
+      textSelectionBase: textSelectionBase,
+      textSelectionExtent: textSelectionExtent,
+    );
+  }
+  return textFieldSemantics;
+}
+
+/// See [createTextFieldSemanticsForIos].
+Map<int, SemanticsObject> createTwoFieldSemanticsForIos(SemanticsTester builder,
+    {int? focusFieldId}) {
+  builder.updateNode(
+    id: 0,
+    children: <SemanticsNodeUpdate>[
+      builder.updateNode(
+        id: 1,
+        isTextField: true,
+        value: 'Hello',
+        label: 'Hello',
+        isFocused: false,
+        rect: const ui.Rect.fromLTWH(0, 0, 10, 10),
+      ),
+      builder.updateNode(
+        id: 2,
+        isTextField: true,
+        value: 'World',
+        label: 'World',
+        isFocused: false,
+        rect: const ui.Rect.fromLTWH(20, 20, 10, 10),
+      ),
+    ],
+  );
+  builder.apply();
+  final String label = focusFieldId == 1 ? 'Hello' : 'World';
+  final DomElement textBox =
+      owner().semanticsHost.querySelector('flt-semantics[aria-label="$label"]')!;
+
+  simulateTap(textBox);
+
+  builder.updateNode(
+    id: 0,
+    children: <SemanticsNodeUpdate>[
+      builder.updateNode(
+        id: 1,
+        isTextField: true,
+        value: 'Hello',
+        label: 'Hello',
+        isFocused: focusFieldId == 1,
+        rect: const ui.Rect.fromLTWH(0, 0, 10, 10),
+      ),
+      builder.updateNode(
+        id: 2,
+        isTextField: true,
+        value: 'World',
+        label: 'World',
+        isFocused: focusFieldId == 2,
+        rect: const ui.Rect.fromLTWH(20, 20, 10, 10),
+      ),
+    ],
+  );
+  return builder.apply();
+}
+
+/// Emulates sending of a message by the framework to the engine.
+void sendFrameworkMessage(ByteData? message, HybridTextEditing testTextEditing) {
+  testTextEditing.channel.handleTextInput(message, (ByteData? data) {});
+}
diff --git a/lib/web_ui/test/engine/surface/path/path_winding_test.dart b/lib/web_ui/test/engine/surface/path/path_winding_test.dart
index 6c1dc06169a11da6c2a63f7166aef65aea9ba792..9f0953004ba5bd6e4bea1fa99ac3ffb5b0897b04 100644
--- a/lib/web_ui/test/engine/surface/path/path_winding_test.dart
+++ b/lib/web_ui/test/engine/surface/path/path_winding_test.dart
@@ -54,20 +54,18 @@ void testMain() {
 
     test('moveto/lineto convexity', () {
       final List<LineTestCase> testCases = <LineTestCase>[
-        LineTestCase('', SPathConvexityType.kConvex, SPathDirection.kUnknown),
+        LineTestCase('', SPathConvexityType.kConvex),
         LineTestCase(
-            '0 0', SPathConvexityType.kConvex, SPathDirection.kUnknown),
+            '0 0', SPathConvexityType.kConvex),
         LineTestCase(
-            '0 0 10 10', SPathConvexityType.kConvex, SPathDirection.kUnknown),
-        LineTestCase('0 0 10 10 20 20 0 0 10 10', SPathConvexityType.kConcave,
-            SPathDirection.kUnknown),
+            '0 0 10 10', SPathConvexityType.kConvex),
+        LineTestCase('0 0 10 10 20 20 0 0 10 10', SPathConvexityType.kConcave),
         LineTestCase(
-            '0 0 10 10 10 20', SPathConvexityType.kConvex, SPathDirection.kCW),
+            '0 0 10 10 10 20', SPathConvexityType.kConvex),
         LineTestCase(
-            '0 0 10 10 10 0', SPathConvexityType.kConvex, SPathDirection.kCCW),
-        LineTestCase('0 0 10 10 10 0 0 10', SPathConvexityType.kConcave, null),
-        LineTestCase('0 0 10 0 0 10 -10 -10', SPathConvexityType.kConcave,
-            SPathDirection.kCW),
+            '0 0 10 10 10 0', SPathConvexityType.kConvex),
+        LineTestCase('0 0 10 10 10 0 0 10', SPathConvexityType.kConcave),
+        LineTestCase('0 0 10 0 0 10 -10 -10', SPathConvexityType.kConcave),
       ];
 
       for (final LineTestCase testCase in testCases) {
@@ -113,19 +111,15 @@ void testMain() {
         switch (index % 13) {
           case 0:
             path.lineTo(nonFinitePts[i].dx, nonFinitePts[i].dy);
-            break;
           case 1:
             path.quadraticBezierTo(nonFinitePts[i].dx, nonFinitePts[i].dy,
                 nonFinitePts[i].dx, nonFinitePts[i].dy);
-            break;
           case 2:
             path.quadraticBezierTo(nonFinitePts[i].dx, nonFinitePts[i].dy,
                 axisAlignedPts[f].dx, axisAlignedPts[f].dy);
-            break;
           case 3:
             path.quadraticBezierTo(axisAlignedPts[f].dx, axisAlignedPts[f].dy,
                 nonFinitePts[i].dx, nonFinitePts[i].dy);
-            break;
           case 4:
             path.cubicTo(
                 nonFinitePts[i].dx,
@@ -134,7 +128,6 @@ void testMain() {
                 axisAlignedPts[f].dy,
                 axisAlignedPts[f].dx,
                 axisAlignedPts[f].dy);
-            break;
           case 5:
             path.cubicTo(
                 axisAlignedPts[f].dx,
@@ -143,7 +136,6 @@ void testMain() {
                 nonFinitePts[i].dy,
                 axisAlignedPts[f].dx,
                 axisAlignedPts[f].dy);
-            break;
           case 6:
             path.cubicTo(
                 axisAlignedPts[f].dx,
@@ -152,7 +144,6 @@ void testMain() {
                 axisAlignedPts[f].dy,
                 nonFinitePts[i].dx,
                 nonFinitePts[i].dy);
-            break;
           case 7:
             path.cubicTo(
                 nonFinitePts[i].dx,
@@ -161,7 +152,6 @@ void testMain() {
                 nonFinitePts[i].dy,
                 axisAlignedPts[f].dx,
                 axisAlignedPts[f].dy);
-            break;
           case 8:
             path.cubicTo(
                 nonFinitePts[i].dx,
@@ -170,7 +160,6 @@ void testMain() {
                 axisAlignedPts[f].dy,
                 nonFinitePts[i].dx,
                 nonFinitePts[i].dy);
-            break;
           case 9:
             path.cubicTo(
                 axisAlignedPts[f].dx,
@@ -179,7 +168,6 @@ void testMain() {
                 nonFinitePts[i].dy,
                 nonFinitePts[i].dx,
                 nonFinitePts[i].dy);
-            break;
           case 10:
             path.cubicTo(
                 nonFinitePts[i].dx,
@@ -188,7 +176,6 @@ void testMain() {
                 nonFinitePts[i].dy,
                 nonFinitePts[i].dx,
                 nonFinitePts[i].dy);
-            break;
           case 11:
             path.cubicTo(
                 nonFinitePts[i].dx,
@@ -197,10 +184,8 @@ void testMain() {
                 axisAlignedPts[f].dy,
                 axisAlignedPts[g].dx,
                 axisAlignedPts[g].dy);
-            break;
           case 12:
             path.moveTo(nonFinitePts[i].dx, nonFinitePts[i].dy);
-            break;
         }
         expect(path.convexityType, SPathConvexityType.kUnknown);
       }
@@ -213,22 +198,17 @@ void testMain() {
         switch (curveSelect) {
           case 0:
             path.moveTo(axisAlignedPts[f].dx, axisAlignedPts[f].dy);
-            break;
           case 1:
             path.lineTo(axisAlignedPts[f].dx, axisAlignedPts[f].dy);
-            break;
           case 2:
             path.quadraticBezierTo(axisAlignedPts[f].dx, axisAlignedPts[f].dy,
                 axisAlignedPts[f].dx, axisAlignedPts[f].dy);
-            break;
           case 3:
             path.quadraticBezierTo(axisAlignedPts[f].dx, axisAlignedPts[f].dy,
                 axisAlignedPts[g].dx, axisAlignedPts[g].dy);
-            break;
           case 4:
             path.quadraticBezierTo(axisAlignedPts[g].dx, axisAlignedPts[g].dy,
                 axisAlignedPts[f].dx, axisAlignedPts[f].dy);
-            break;
           case 5:
             path.cubicTo(
                 axisAlignedPts[f].dx,
@@ -237,7 +217,6 @@ void testMain() {
                 axisAlignedPts[f].dy,
                 axisAlignedPts[f].dx,
                 axisAlignedPts[f].dy);
-            break;
           case 6:
             path.cubicTo(
                 axisAlignedPts[f].dx,
@@ -246,7 +225,6 @@ void testMain() {
                 axisAlignedPts[f].dy,
                 axisAlignedPts[g].dx,
                 axisAlignedPts[g].dy);
-            break;
           case 7:
             path.cubicTo(
                 axisAlignedPts[f].dx,
@@ -255,7 +233,6 @@ void testMain() {
                 axisAlignedPts[g].dy,
                 axisAlignedPts[f].dx,
                 axisAlignedPts[f].dy);
-            break;
           case 8:
             path.cubicTo(
                 axisAlignedPts[f].dx,
@@ -264,7 +241,6 @@ void testMain() {
                 axisAlignedPts[g].dy,
                 axisAlignedPts[g].dx,
                 axisAlignedPts[g].dy);
-            break;
           case 9:
             path.cubicTo(
                 axisAlignedPts[g].dx,
@@ -273,7 +249,6 @@ void testMain() {
                 axisAlignedPts[f].dy,
                 axisAlignedPts[f].dx,
                 axisAlignedPts[f].dy);
-            break;
           case 10:
             path.cubicTo(
                 axisAlignedPts[g].dx,
@@ -282,7 +257,6 @@ void testMain() {
                 axisAlignedPts[f].dy,
                 axisAlignedPts[g].dx,
                 axisAlignedPts[g].dy);
-            break;
         }
         if (curveSelect != 7 && curveSelect != 10) {
           final int result = path.convexityType;
@@ -442,10 +416,9 @@ void testMain() {
 }
 
 class LineTestCase {
-  LineTestCase(this.pathContent, this.convexity, this.direction);
+  LineTestCase(this.pathContent, this.convexity);
   final String pathContent;
   final int convexity;
-  final int? direction;
 }
 
 /// Parses a string of the format "mx my lx1 ly1 lx2 ly2..." into a path
diff --git a/lib/web_ui/test/engine/surface/platform_view_test.dart b/lib/web_ui/test/engine/surface/platform_view_test.dart
index 243d75025d63cc85dd6e309b19808777938256aa..9281d73bb5ebe897724eb3dc9b3bb7115854d2e4 100644
--- a/lib/web_ui/test/engine/surface/platform_view_test.dart
+++ b/lib/web_ui/test/engine/surface/platform_view_test.dart
@@ -7,29 +7,52 @@ import 'dart:async';
 import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
-import 'package:ui/ui.dart';
+import 'package:ui/ui.dart' as ui;
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
-import '../../matchers.dart';
+import '../../common/matchers.dart';
+import '../../common/test_initialization.dart';
 
 const MethodCodec codec = StandardMethodCodec();
-final EngineSingletonFlutterWindow window = EngineSingletonFlutterWindow(0, EnginePlatformDispatcher.instance);
 
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
 
 Future<void> testMain() async {
-  await webOnlyInitializePlatform();
+  await bootstrapAndRunApp(withImplicitView: true);
 
   late PersistedPlatformView view;
 
+  test('importing platformViewRegistry from dart:ui is deprecated', () {
+    final void Function(String) oldPrintWarning = printWarning;
+
+    final List<String> warnings = <String>[];
+    printWarning = (String message) {
+      warnings.add(message);
+    };
+
+    // ignore: unnecessary_statements
+    ui_web.platformViewRegistry;
+    expect(warnings, isEmpty);
+
+    // ignore: unnecessary_statements
+    ui.platformViewRegistry;
+    expect(warnings, hasLength(1));
+    expect(warnings.single, contains('platformViewRegistry'));
+    expect(warnings.single, contains('deprecated'));
+    expect(warnings.single, contains('dart:ui_web'));
+
+    printWarning = oldPrintWarning;
+  });
+
   group('PersistedPlatformView', () {
     setUp(() async {
-      platformViewRegistry.registerViewFactory(
+      ui_web.platformViewRegistry.registerViewFactory(
         'test-0',
         (int viewId) => createDomHTMLDivElement(),
       );
-      platformViewRegistry.registerViewFactory(
+      ui_web.platformViewRegistry.registerViewFactory(
         'test-1',
         (int viewId) => createDomHTMLDivElement(),
       );
@@ -62,7 +85,7 @@ Future<void> testMain() async {
       });
 
       test('returns false when other view is not a PlatformView', () {
-        final PersistedOpacity anyView = PersistedOpacity(null, 1, Offset.zero)..build();
+        final PersistedOpacity anyView = PersistedOpacity(null, 1, ui.Offset.zero)..build();
         expect(view.canUpdateAsMatch(anyView), isFalse);
       });
     });
@@ -81,7 +104,7 @@ Future<void> testMain() async {
 // Sends a platform message to create a Platform View with the given id and viewType.
 Future<void> _createPlatformView(int id, String viewType) {
   final Completer<void> completer = Completer<void>();
-  window.sendPlatformMessage(
+  ui.PlatformDispatcher.instance.sendPlatformMessage(
     'flutter/platform_views',
     codec.encodeMethodCall(MethodCall(
       'create',
diff --git a/lib/web_ui/test/engine/surface/scene_builder_test.dart b/lib/web_ui/test/engine/surface/scene_builder_test.dart
index e0535d7351847aab1ba6659dcdbee9e1c7cb16f6..494c4019a56aa93c74c3564297d83f36f091ff70 100644
--- a/lib/web_ui/test/engine/surface/scene_builder_test.dart
+++ b/lib/web_ui/test/engine/surface/scene_builder_test.dart
@@ -3,8 +3,10 @@
 // found in the LICENSE file.
 
 @TestOn('chrome || firefox')
+library;
 
 import 'dart:async';
+import 'dart:js_interop';
 import 'dart:js_util' as js_util;
 
 import 'package:test/bootstrap/browser.dart';
@@ -12,7 +14,9 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
 
-import '../../matchers.dart';
+import '../../common/matchers.dart';
+import '../../common/rendering.dart';
+import '../../common/test_initialization.dart';
 
 void main() {
   internalBootstrapBrowserTest(() => testMain);
@@ -20,7 +24,8 @@ void main() {
 
 void testMain() {
   setUpAll(() async {
-    await ui.webOnlyInitializePlatform();
+    await bootstrapAndRunApp(withImplicitView: true);
+    setUpRenderingForTests();
   });
 
   group('SceneBuilder', () {
@@ -35,7 +40,7 @@ void testMain() {
     test('pushTransform implements surface lifecycle', () {
       testLayerLifeCycle((ui.SceneBuilder sceneBuilder, ui.EngineLayer? oldLayer) {
         return sceneBuilder.pushTransform(
-            (Matrix4.identity()..scale(domWindow.devicePixelRatio)).toFloat64());
+            (Matrix4.identity()..scale(EngineFlutterDisplay.instance.browserDevicePixelRatio)).toFloat64());
       }, () {
         return '''<s><flt-transform></flt-transform></s>''';
       });
@@ -91,22 +96,6 @@ void testMain() {
         return '''<s><o></o></s>''';
       });
     });
-
-    test('pushPhysicalShape implements surface lifecycle', () {
-      testLayerLifeCycle((ui.SceneBuilder sceneBuilder, ui.EngineLayer? oldLayer) {
-        final ui.Path path = ui.Path()..addRect(const ui.Rect.fromLTRB(10, 20, 30, 40));
-        return sceneBuilder.pushPhysicalShape(
-          path: path,
-          elevation: 2,
-          color: const ui.Color.fromRGBO(0, 0, 0, 1),
-          shadowColor: const ui.Color.fromRGBO(0, 0, 0, 1),
-          oldLayer: oldLayer as ui.PhysicalShapeEngineLayer?,
-        );
-      }, () {
-        return '''<s><pshape><clip-i></clip-i></pshape></s>''';
-      });
-    });
-
     test('pushBackdropFilter implements surface lifecycle', () {
       testLayerLifeCycle((ui.SceneBuilder sceneBuilder, ui.EngineLayer? oldLayer) {
         return sceneBuilder.pushBackdropFilter(
@@ -490,7 +479,7 @@ void testMain() {
     // Pump an empty scene to reset it, otherwise the first frame will attempt
     // to diff left-overs from a previous test, which results in unpredictable
     // DOM mutations.
-    window.render(SurfaceSceneBuilder().build());
+    await renderScene(SurfaceSceneBuilder().build());
 
     // Renders a `string` by breaking it up into individual characters and
     // rendering each character into its own layer.
@@ -500,12 +489,12 @@ void testMain() {
 
       // Watches DOM mutations and counts deletions and additions to the child
       // list of the `<flt-scene>` element.
-      final DomMutationObserver observer = createDomMutationObserver(allowInterop((List<dynamic> mutations, _) {
-        for (final DomMutationRecord record in mutations.cast<DomMutationRecord>()) {
+      final DomMutationObserver observer = createDomMutationObserver((JSArray<JSAny?> mutations, _) {
+        for (final DomMutationRecord record in mutations.toDart.cast<DomMutationRecord>()) {
           actualDeletions.addAll(record.removedNodes!);
           actualAdditions.addAll(record.addedNodes!);
         }
-      }));
+      });
       observer.observe(
           SurfaceSceneBuilder.debugLastFrameScene!.rootElement!, childList: true);
 
diff --git a/lib/web_ui/test/engine/surface/shaders/shader_builder_test.dart b/lib/web_ui/test/engine/surface/shaders/shader_builder_test.dart
index add593d18d5d43c12fb6eeefc8282d66e99c5798..f20467bbcc287b1420c36cdc278a6a74812f8c9e 100644
--- a/lib/web_ui/test/engine/surface/shaders/shader_builder_test.dart
+++ b/lib/web_ui/test/engine/surface/shaders/shader_builder_test.dart
@@ -5,7 +5,8 @@
 import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
-import 'package:ui/ui.dart' hide window;
+
+import '../../../common/test_initialization.dart';
 
 void main() {
   internalBootstrapBrowserTest(() => testMain);
@@ -24,7 +25,7 @@ void testMain() {
       ')';
 
   setUpAll(() async {
-    await webOnlyInitializePlatform();
+    await bootstrapAndRunApp();
   });
 
   group('Shader Declarations', () {
diff --git a/lib/web_ui/test/engine/surface/surface_test.dart b/lib/web_ui/test/engine/surface/surface_test.dart
index 4b78dec4f7238a78a11373fa8b60ba117a596d10..cf21f80a2ef0467d2d21a5b101d5c9b3e047a493 100644
--- a/lib/web_ui/test/engine/surface/surface_test.dart
+++ b/lib/web_ui/test/engine/surface/surface_test.dart
@@ -7,6 +7,8 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart';
 
+import '../../common/test_initialization.dart';
+
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
@@ -14,7 +16,7 @@ void main() {
 void testMain() {
   group('Surface', () {
     setUpAll(() async {
-      await webOnlyInitializePlatform();
+      await bootstrapAndRunApp(withImplicitView: true);
     });
 
     setUp(() {
@@ -160,7 +162,7 @@ void testMain() {
       final SurfaceSceneBuilder builder1 = SurfaceSceneBuilder();
       final PersistedTransform a1 =
           builder1.pushTransform(
-              (Matrix4.identity()..scale(domWindow.devicePixelRatio)).toFloat64()) as PersistedTransform;
+              (Matrix4.identity()..scale(EngineFlutterDisplay.instance.browserDevicePixelRatio)).toFloat64()) as PersistedTransform;
       final PersistedOpacity b1 = builder1.pushOpacity(100) as PersistedOpacity;
       final PersistedTransform c1 =
           builder1.pushTransform(Matrix4.identity().toFloat64()) as PersistedTransform;
@@ -181,7 +183,7 @@ void testMain() {
       final SurfaceSceneBuilder builder2 = SurfaceSceneBuilder();
       final PersistedTransform a2 =
           builder2.pushTransform(
-              (Matrix4.identity()..scale(domWindow.devicePixelRatio)).toFloat64(),
+              (Matrix4.identity()..scale(EngineFlutterDisplay.instance.browserDevicePixelRatio)).toFloat64(),
               oldLayer: a1) as PersistedTransform;
       final PersistedTransform c2 =
           builder2.pushTransform(Matrix4.identity().toFloat64(), oldLayer: c1) as PersistedTransform;
@@ -362,22 +364,6 @@ void testMain() {
       expect(
           opacityLayer2.rootElement, element); // adopts old surface's element
     });
-
-    // Regression test for https://github.com/flutter/flutter/issues/60461
-    //
-    // During retained match many to many, build can be called on existing
-    // PersistedPhysicalShape multiple times when not matched.
-    test('Can call apply multiple times on existing PersistedPhysicalShape'
-        'when using arbitrary path',
-            () {
-      final SceneBuilder builder1 = SceneBuilder();
-      final Path path = Path();
-      path.addPolygon(const <Offset>[Offset(50, 0), Offset(100, 80), Offset(20, 40)], true);
-      final PersistedPhysicalShape shape = builder1.pushPhysicalShape(path: path,
-        color: const Color(0xFF00FF00), elevation: 1) as PersistedPhysicalShape;
-      builder1.build();
-      expect(() => shape.apply(), returnsNormally);
-    });
   });
 
   final Map<String, TestEngineLayerFactory> layerFactories = <String, TestEngineLayerFactory>{
@@ -406,11 +392,6 @@ void testMain() {
         );
         return builder.pushShaderMask(shader, shaderBounds, BlendMode.srcOver);
       },
-    'PhysicalShapeEngineLayer': (SurfaceSceneBuilder builder) => builder.pushPhysicalShape(
-      path: Path()..addRect(const Rect.fromLTRB(0, 0, 10, 10)),
-      elevation: 3,
-      color: const Color(0xAABBCCDD),
-    ),
   };
 
   // Regression test for https://github.com/flutter/flutter/issues/104305
diff --git a/lib/web_ui/test/text_editing_test.dart b/lib/web_ui/test/engine/text_editing_test.dart
similarity index 77%
rename from lib/web_ui/test/text_editing_test.dart
rename to lib/web_ui/test/engine/text_editing_test.dart
index 5a174483ad9a2f8b360cf5875c6db5f5f4faa2c8..a9fa99443eb5b4e69cf9b692b86c5223a823eba5 100644
--- a/lib/web_ui/test/text_editing_test.dart
+++ b/lib/web_ui/test/engine/text_editing_test.dart
@@ -9,19 +9,19 @@ import 'dart:typed_data';
 import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 
-import 'package:ui/src/engine.dart' show flutterViewEmbedder;
 import 'package:ui/src/engine/browser_detection.dart';
 import 'package:ui/src/engine/dom.dart';
-import 'package:ui/src/engine/initialization.dart';
-import 'package:ui/src/engine/safe_browser_api.dart';
+import 'package:ui/src/engine/raw_keyboard.dart';
 import 'package:ui/src/engine/services.dart';
 import 'package:ui/src/engine/text_editing/autofill_hint.dart';
 import 'package:ui/src/engine/text_editing/input_type.dart';
 import 'package:ui/src/engine/text_editing/text_editing.dart';
 import 'package:ui/src/engine/util.dart';
 import 'package:ui/src/engine/vector_math.dart';
+import 'package:ui/ui.dart' as ui;
 
-import 'spy.dart';
+import '../common/spy.dart';
+import '../common/test_initialization.dart';
 
 /// The `keyCode` of the "Enter" key.
 const int _kReturnKeyCode = 13;
@@ -61,7 +61,11 @@ void main() {
 }
 
 Future<void> testMain() async {
-  await initializeEngine();
+  setUpUnitTests(
+    withImplicitView: true,
+    emulateTesterEnvironment: false,
+    setUpTestViewDimensions: false
+  );
 
   tearDown(() {
     lastEditingState = null;
@@ -80,8 +84,6 @@ Future<void> testMain() async {
       editingStrategy = GloballyPositionedTextEditingStrategy(testTextEditing);
       testTextEditing.debugTextEditingStrategyOverride = editingStrategy;
       testTextEditing.configuration = singlelineConfig;
-      // Ensure the glass-pane and its shadow root exist.
-      flutterViewEmbedder.reset();
     });
 
     test('Creates element when enabled and removes it when disabled', () {
@@ -91,7 +93,8 @@ Future<void> testMain() async {
       );
       // The focus initially is on the body.
       expect(domDocument.activeElement, domDocument.body);
-      expect(defaultTextEditingRoot.activeElement, null);
+      expect(defaultTextEditingRoot.ownerDocument?.activeElement,
+          domDocument.body);
 
       editingStrategy!.enable(
         singlelineConfig,
@@ -106,8 +109,8 @@ Future<void> testMain() async {
       final DomElement input = defaultTextEditingRoot.querySelector('input')!;
       // Now the editing element should have focus.
 
-      expect(domDocument.activeElement, flutterViewEmbedder.glassPaneElement);
-      expect(defaultTextEditingRoot.activeElement, input);
+      expect(domDocument.activeElement, input);
+      expect(defaultTextEditingRoot.ownerDocument?.activeElement, input);
 
       expect(editingStrategy!.domElement, input);
       expect(input.getAttribute('type'), null);
@@ -122,7 +125,8 @@ Future<void> testMain() async {
       );
       // The focus is back to the body.
       expect(domDocument.activeElement, domDocument.body);
-      expect(defaultTextEditingRoot.activeElement, null);
+      expect(defaultTextEditingRoot.ownerDocument?.activeElement,
+          domDocument.body);
     });
 
     test('Respects read-only config', () {
@@ -281,7 +285,7 @@ Future<void> testMain() async {
       final DomHTMLTextAreaElement textarea =
           defaultTextEditingRoot.querySelector('textarea')! as DomHTMLTextAreaElement;
       // Now the textarea should have focus.
-      expect(defaultTextEditingRoot.activeElement, textarea);
+      expect(defaultTextEditingRoot.ownerDocument?.activeElement, textarea);
       expect(editingStrategy!.domElement, textarea);
 
       textarea.value = 'foo\nbar';
@@ -303,7 +307,8 @@ Future<void> testMain() async {
       // The textarea should be cleaned up.
       expect(defaultTextEditingRoot.querySelectorAll('textarea'), hasLength(0));
       // The focus is back to the body.
-      expect(defaultTextEditingRoot.activeElement, null);
+      expect(defaultTextEditingRoot.ownerDocument?.activeElement,
+          domDocument.body);
 
       // There should be no input action.
       expect(lastInputAction, isNull);
@@ -365,6 +370,52 @@ Future<void> testMain() async {
       expect(lastInputAction, 'TextInputAction.done');
     });
 
+   test('handling keyboard event prevents triggering input action', () {
+      final ui.PlatformMessageCallback? savedCallback = ui.PlatformDispatcher.instance.onPlatformMessage;
+
+      bool markTextEventHandled = false;
+      ui.PlatformDispatcher.instance.onPlatformMessage = (String channel, ByteData? data,
+          ui.PlatformMessageResponseCallback? callback) {
+        final ByteData response = const JSONMessageCodec()
+            .encodeMessage(<String, dynamic>{'handled': markTextEventHandled})!;
+        callback!(response);
+      };
+      RawKeyboard.initialize();
+
+      final InputConfiguration config = InputConfiguration();
+      editingStrategy!.enable(
+        config,
+        onChange: trackEditingState,
+        onAction: trackInputAction,
+      );
+
+      // No input action so far.
+      expect(lastInputAction, isNull);
+
+      markTextEventHandled = true;
+      dispatchKeyboardEvent(
+        editingStrategy!.domElement!,
+        'keydown',
+        keyCode: _kReturnKeyCode,
+      );
+
+      // Input action prevented by platform message callback.
+      expect(lastInputAction, isNull);
+
+      markTextEventHandled = false;
+      dispatchKeyboardEvent(
+        editingStrategy!.domElement!,
+        'keydown',
+        keyCode: _kReturnKeyCode,
+      );
+
+      // Input action received.
+      expect(lastInputAction, 'TextInputAction.done');
+
+      ui.PlatformDispatcher.instance.onPlatformMessage = savedCallback;
+      RawKeyboard.instance?.dispose();
+    });
+
     test('Triggers input action in multi-line mode', () {
       final InputConfiguration config = InputConfiguration(
         inputType: EngineInputType.multiline,
@@ -390,6 +441,31 @@ Future<void> testMain() async {
       expect(event.defaultPrevented, isFalse);
     });
 
+    test('Triggers input action in multiline-none mode', () {
+      final InputConfiguration config = InputConfiguration(
+        inputType: EngineInputType.multilineNone,
+      );
+      editingStrategy!.enable(
+        config,
+        onChange: trackEditingState,
+        onAction: trackInputAction,
+      );
+
+      // No input action so far.
+      expect(lastInputAction, isNull);
+
+      final DomKeyboardEvent event = dispatchKeyboardEvent(
+        editingStrategy!.domElement!,
+        'keydown',
+        keyCode: _kReturnKeyCode,
+      );
+
+      // Input action is triggered!
+      expect(lastInputAction, 'TextInputAction.done');
+      // And default behavior of keyboard event shouldn't have been prevented.
+      expect(event.defaultPrevented, isFalse);
+    });
+
     test('Triggers input action and prevent new line key event for single line field', () {
       // Regression test for https://github.com/flutter/flutter/issues/113559
       final InputConfiguration config = InputConfiguration();
@@ -437,6 +513,64 @@ Future<void> testMain() async {
       expect(editingStrategy!.domElement!.style.width, '13px');
       expect(editingStrategy!.domElement!.style.height, '12px');
     });
+
+    test('updateElementPlacement() should not call placeElement() when in mid-composition', () {
+      final HybridTextEditing testTextEditing = HybridTextEditing();
+      final GlobalTextEditingStrategySpy editingStrategy = GlobalTextEditingStrategySpy(testTextEditing);
+      testTextEditing.debugTextEditingStrategyOverride = editingStrategy;
+      testTextEditing.configuration = singlelineConfig;
+
+      editingStrategy.enable(
+        singlelineConfig,
+        onChange: trackEditingState,
+        onAction: trackInputAction,
+      );
+      expect(editingStrategy.isEnabled, isTrue);
+
+      // placeElement() called from enable()
+      expect(editingStrategy.placeElementCount, 1);
+
+      // No geometry should be set until setEditableSizeAndTransform is called.
+      expect(editingStrategy.domElement!.style.transform, '');
+      expect(editingStrategy.domElement!.style.width, '');
+      expect(editingStrategy.domElement!.style.height, '');
+
+      // set some composing text.
+      editingStrategy.composingText = '뮤';
+
+      testTextEditing.acceptCommand(TextInputSetEditableSizeAndTransform(geometry: EditableTextGeometry(
+        width: 13,
+        height: 12,
+        globalTransform: Matrix4.translationValues(14, 15, 0).storage,
+      )), () {});
+
+      // placeElement() should not be called again.
+      expect(editingStrategy.placeElementCount, 1);
+
+      // geometry should be applied.
+      expect(editingStrategy.domElement!.style.transform,
+          'matrix(1, 0, 0, 1, 14, 15)');
+      expect(editingStrategy.domElement!.style.width, '13px');
+      expect(editingStrategy.domElement!.style.height, '12px');
+
+      // set composing text to null.
+      editingStrategy.composingText = null;
+
+      testTextEditing.acceptCommand(TextInputSetEditableSizeAndTransform(geometry: EditableTextGeometry(
+        width: 10,
+        height: 10,
+        globalTransform: Matrix4.translationValues(11, 12, 0).storage,
+      )), () {});
+
+      // placeElement() should be called again.
+      expect(editingStrategy.placeElementCount, 2);
+
+      // geometry should be updated.
+      expect(editingStrategy.domElement!.style.transform,
+          'matrix(1, 0, 0, 1, 11, 12)');
+      expect(editingStrategy.domElement!.style.width, '10px');
+      expect(editingStrategy.domElement!.style.height, '10px');
+    });
   });
 
   group('$HybridTextEditing', () {
@@ -458,13 +592,14 @@ Future<void> testMain() async {
       required String inputType,
       String? inputAction,
       bool decimal = false,
+      bool isMultiline = false,
     }) {
       final MethodCall setClient = MethodCall(
         'TextInput.setClient',
         <dynamic>[
           ++clientId,
           createFlutterConfig(inputType,
-              inputAction: inputAction, decimal: decimal),
+              inputAction: inputAction, decimal: decimal, isMultiline: isMultiline),
         ],
       );
       sendFrameworkMessage(codec.encodeMethodCall(setClient));
@@ -507,7 +642,7 @@ Future<void> testMain() async {
       //No-op and without crashing.
     });
 
-    test('setClient, show, setEditingState, hide', () {
+    test('setClient, show, setEditingState, hide', () async {
       final MethodCall setClient = MethodCall(
           'TextInput.setClient', <dynamic>[123, flutterSinglelineConfig]);
       sendFrameworkMessage(codec.encodeMethodCall(setClient));
@@ -527,6 +662,8 @@ Future<void> testMain() async {
               Matrix4.translationValues(10.0, 20.0, 30.0).storage.toList());
       sendFrameworkMessage(codec.encodeMethodCall(setSizeAndTransform));
 
+      await waitForDesktopSafariFocus();
+
       checkInputEditingState(textEditing!.strategy.domElement, '', 0, 0);
 
       const MethodCall setEditingState =
@@ -550,7 +687,7 @@ Future<void> testMain() async {
       expect(spy.messages, isEmpty);
     });
 
-    test('setClient, setEditingState, show, clearClient', () {
+    test('setClient, setEditingState, show, clearClient', () async {
       final MethodCall setClient = MethodCall(
           'TextInput.setClient', <dynamic>[123, flutterSinglelineConfig]);
       sendFrameworkMessage(codec.encodeMethodCall(setClient));
@@ -578,6 +715,8 @@ Future<void> testMain() async {
               Matrix4.translationValues(10.0, 20.0, 30.0).storage.toList());
       sendFrameworkMessage(codec.encodeMethodCall(setSizeAndTransform));
 
+      await waitForDesktopSafariFocus();
+
       checkInputEditingState(
           textEditing!.strategy.domElement, 'abcd', 2, 3);
 
@@ -590,20 +729,15 @@ Future<void> testMain() async {
       expect(spy.messages, isEmpty);
     });
 
-    test('setClient, setEditingState, setSizeAndTransform, show - input element is put into the DOM', () {
+    test('setClient, setEditingState, setSizeAndTransform, show - input element is put into the DOM Safari Desktop', () async {
       editingStrategy = SafariDesktopTextEditingStrategy(textEditing!);
       textEditing!.debugTextEditingStrategyOverride = editingStrategy;
       final MethodCall setClient = MethodCall(
           'TextInput.setClient', <dynamic>[123, flutterSinglelineConfig]);
       sendFrameworkMessage(codec.encodeMethodCall(setClient));
 
-      const MethodCall setEditingState =
-          MethodCall('TextInput.setEditingState', <String, dynamic>{
-        'text': 'abcd',
-        'selectionBase': 2,
-        'selectionExtent': 3,
-      });
-      sendFrameworkMessage(codec.encodeMethodCall(setEditingState));
+      const MethodCall show = MethodCall('TextInput.show');
+      sendFrameworkMessage(codec.encodeMethodCall(show));
 
       // Editing shouldn't have started yet.
       expect(domDocument.activeElement, domDocument.body);
@@ -617,12 +751,19 @@ Future<void> testMain() async {
               Matrix4.translationValues(10.0, 20.0, 30.0).storage.toList());
       sendFrameworkMessage(codec.encodeMethodCall(setSizeAndTransform));
 
-      const MethodCall show = MethodCall('TextInput.show');
-      sendFrameworkMessage(codec.encodeMethodCall(show));
+      await waitForDesktopSafariFocus();
+
+      const MethodCall setEditingState =
+        MethodCall('TextInput.setEditingState', <String, dynamic>{
+        'text': 'abcd',
+        'selectionBase': 2,
+        'selectionExtent': 3,
+      });
+      sendFrameworkMessage(codec.encodeMethodCall(setEditingState));
 
-      expect(defaultTextEditingRoot.activeElement,
+      expect(defaultTextEditingRoot.ownerDocument?.activeElement,
           textEditing!.strategy.domElement);
-    });
+    }, skip: !isSafari);
 
     test('setClient, setEditingState, show, updateConfig, clearClient', () {
       final MethodCall setClient = MethodCall('TextInput.setClient', <dynamic>[
@@ -680,7 +821,8 @@ Future<void> testMain() async {
       sendFrameworkMessage(codec.encodeMethodCall(setEditingState));
 
       // Editing shouldn't have started yet.
-      expect(defaultTextEditingRoot.activeElement, null);
+      expect(defaultTextEditingRoot.ownerDocument?.activeElement,
+          domDocument.body);
 
       const MethodCall show = MethodCall('TextInput.show');
       sendFrameworkMessage(codec.encodeMethodCall(show));
@@ -694,6 +836,8 @@ Future<void> testMain() async {
               Matrix4.translationValues(10.0, 20.0, 30.0).storage.toList());
       sendFrameworkMessage(codec.encodeMethodCall(setSizeAndTransform));
 
+      await waitForDesktopSafariFocus();
+
       checkInputEditingState(
           textEditing!.strategy.domElement, 'abcd', 2, 3);
       expect(textEditing!.isEditing, isTrue);
@@ -705,7 +849,7 @@ Future<void> testMain() async {
       expect(spy.messages, hasLength(0));
       await Future<void>.delayed(Duration.zero);
       // DOM element still keeps the focus.
-      expect(defaultTextEditingRoot.activeElement,
+      expect(defaultTextEditingRoot.ownerDocument?.activeElement,
           textEditing!.strategy.domElement);
     });
 
@@ -723,7 +867,8 @@ Future<void> testMain() async {
       sendFrameworkMessage(codec.encodeMethodCall(setEditingState));
 
       // Editing shouldn't have started yet.
-      expect(defaultTextEditingRoot.activeElement, null);
+      expect(defaultTextEditingRoot.ownerDocument?.activeElement,
+          domDocument.body);
 
       const MethodCall show = MethodCall('TextInput.show');
       sendFrameworkMessage(codec.encodeMethodCall(show));
@@ -752,7 +897,8 @@ Future<void> testMain() async {
           spy.messages[0].methodName, 'TextInputClient.onConnectionClosed');
       await Future<void>.delayed(Duration.zero);
       // DOM element loses the focus.
-      expect(defaultTextEditingRoot.activeElement, null);
+      expect(defaultTextEditingRoot.ownerDocument?.activeElement,
+          domDocument.body);
     },
         // Test on ios-safari only.
         skip: browserEngine != BrowserEngine.webkit ||
@@ -773,7 +919,8 @@ Future<void> testMain() async {
       sendFrameworkMessage(codec.encodeMethodCall(setEditingState));
 
       // Editing shouldn't have started yet.
-      expect(defaultTextEditingRoot.activeElement, null);
+      expect(defaultTextEditingRoot.ownerDocument?.activeElement,
+          domDocument.body);
 
       const MethodCall show = MethodCall('TextInput.show');
       sendFrameworkMessage(codec.encodeMethodCall(show));
@@ -787,6 +934,8 @@ Future<void> testMain() async {
               Matrix4.translationValues(10.0, 20.0, 30.0).storage.toList());
       sendFrameworkMessage(codec.encodeMethodCall(setSizeAndTransform));
 
+      await waitForDesktopSafariFocus();
+
       checkInputEditingState(
           textEditing!.strategy.domElement, 'abcd', 2, 3);
 
@@ -843,6 +992,8 @@ Future<void> testMain() async {
               Matrix4.translationValues(10.0, 20.0, 30.0).storage.toList());
       sendFrameworkMessage(codec.encodeMethodCall(setSizeAndTransform));
 
+      await waitForDesktopSafariFocus();
+
       // Form is added to DOM.
       expect(defaultTextEditingRoot.querySelectorAll('form'), isNotEmpty);
 
@@ -897,13 +1048,15 @@ Future<void> testMain() async {
               Matrix4.translationValues(10.0, 20.0, 30.0).storage.toList());
       sendFrameworkMessage(codec.encodeMethodCall(setSizeAndTransform));
 
+      await waitForDesktopSafariFocus();
+
       // Form is added to DOM.
       expect(defaultTextEditingRoot.querySelectorAll('form'), isNotEmpty);
       final DomHTMLFormElement formElement =
           defaultTextEditingRoot.querySelector('form')! as DomHTMLFormElement;
       final Completer<bool> submittedForm = Completer<bool>();
       formElement.addEventListener(
-          'submit', allowInterop((DomEvent event) =>
+          'submit', createDomEventListener((DomEvent event) =>
               submittedForm.complete(true)));
 
       const MethodCall clearClient = MethodCall('TextInput.clearClient');
@@ -950,13 +1103,15 @@ Future<void> testMain() async {
               Matrix4.translationValues(10.0, 20.0, 30.0).storage.toList());
       sendFrameworkMessage(codec.encodeMethodCall(setSizeAndTransform));
 
+      await waitForDesktopSafariFocus();
+
       // Form is added to DOM.
       expect(defaultTextEditingRoot.querySelectorAll('form'), isNotEmpty);
       final DomHTMLFormElement formElement =
           defaultTextEditingRoot.querySelector('form')! as DomHTMLFormElement;
       final Completer<bool> submittedForm = Completer<bool>();
       formElement.addEventListener(
-          'submit', allowInterop((DomEvent event) =>
+          'submit', createDomEventListener((DomEvent event) =>
               submittedForm.complete(true)));
 
       // Clear client is not called. The used requested context to be finalized.
@@ -976,7 +1131,52 @@ Future<void> testMain() async {
       expect(formsOnTheDom, hasLength(0));
     });
 
-    test('setClient, setEditingState, show, setClient', () {
+    test('form is not placed and input is not focused until after tick on Desktop Safari', () async {
+      // Create a configuration with an AutofillGroup of four text fields.
+      final Map<String, dynamic> flutterMultiAutofillElementConfig =
+          createFlutterConfig('text',
+              autofillHint: 'username',
+              autofillHintsForFields: <String>[
+            'username',
+            'email',
+            'name',
+            'telephoneNumber'
+          ]);
+      final MethodCall setClient = MethodCall('TextInput.setClient',
+          <dynamic>[123, flutterMultiAutofillElementConfig]);
+      sendFrameworkMessage(codec.encodeMethodCall(setClient));
+
+      const MethodCall setEditingState1 =
+          MethodCall('TextInput.setEditingState', <String, dynamic>{
+        'text': 'abcd',
+        'selectionBase': 2,
+        'selectionExtent': 3,
+      });
+      sendFrameworkMessage(codec.encodeMethodCall(setEditingState1));
+
+      const MethodCall show = MethodCall('TextInput.show');
+      sendFrameworkMessage(codec.encodeMethodCall(show));
+
+      final MethodCall setSizeAndTransform =
+          configureSetSizeAndTransformMethodCall(150, 50,
+              Matrix4.translationValues(10.0, 20.0, 30.0).storage.toList());
+      sendFrameworkMessage(codec.encodeMethodCall(setSizeAndTransform));
+
+      // Prior to tick, form should not exist and no elements should be focused.
+      expect(defaultTextEditingRoot.querySelectorAll('form'), isEmpty);
+      expect(domDocument.activeElement, domDocument.body);
+
+      await waitForDesktopSafariFocus();
+
+      // Form is added to DOM.
+      expect(defaultTextEditingRoot.querySelectorAll('form'), isNotEmpty);
+
+      final DomHTMLInputElement inputElement =
+          textEditing!.strategy.domElement! as DomHTMLInputElement;
+      expect(domDocument.activeElement, inputElement);
+    }, skip: !isSafari);
+
+    test('setClient, setEditingState, show, setClient', () async {
       final MethodCall setClient = MethodCall(
           'TextInput.setClient', <dynamic>[123, flutterSinglelineConfig]);
       sendFrameworkMessage(codec.encodeMethodCall(setClient));
@@ -1004,6 +1204,8 @@ Future<void> testMain() async {
               Matrix4.translationValues(10.0, 20.0, 30.0).storage.toList());
       sendFrameworkMessage(codec.encodeMethodCall(setSizeAndTransform));
 
+      await waitForDesktopSafariFocus();
+
       checkInputEditingState(
           textEditing!.strategy.domElement, 'abcd', 2, 3);
 
@@ -1021,7 +1223,7 @@ Future<void> testMain() async {
       hideKeyboard();
     });
 
-    test('setClient, setEditingState, show, setEditingState, clearClient', () {
+    test('setClient, setEditingState, show, setEditingState, clearClient', () async {
       final MethodCall setClient = MethodCall(
           'TextInput.setClient', <dynamic>[123, flutterSinglelineConfig]);
       sendFrameworkMessage(codec.encodeMethodCall(setClient));
@@ -1054,6 +1256,7 @@ Future<void> testMain() async {
       });
       sendFrameworkMessage(codec.encodeMethodCall(setEditingState2));
 
+      await waitForDesktopSafariFocus();
       // The second [setEditingState] should override the first one.
       checkInputEditingState(
           textEditing!.strategy.domElement, 'xyz', 0, 2);
@@ -1067,7 +1270,7 @@ Future<void> testMain() async {
 
     test(
         'singleTextField Autofill: setClient, setEditingState, show, '
-        'setSizeAndTransform, setEditingState, clearClient', () {
+        'setSizeAndTransform, setEditingState, clearClient', () async {
       // Create a configuration with focused element has autofil hint.
       final Map<String, dynamic> flutterSingleAutofillElementConfig =
           createFlutterConfig('text', autofillHint: 'username');
@@ -1095,6 +1298,7 @@ Future<void> testMain() async {
               Matrix4.translationValues(10.0, 20.0, 30.0).storage.toList());
       sendFrameworkMessage(codec.encodeMethodCall(setSizeAndTransform));
 
+      await waitForDesktopSafariFocus();
       // The second [setEditingState] should override the first one.
       checkInputEditingState(
           textEditing!.strategy.domElement, 'abcd', 2, 3);
@@ -1116,7 +1320,7 @@ Future<void> testMain() async {
 
     test(
         'singleTextField Autofill setEditableSizeAndTransform preserves'
-        'editing state', () {
+        'editing state', () async {
       // Create a configuration with focused element has autofil hint.
       final Map<String, dynamic> flutterSingleAutofillElementConfig =
           createFlutterConfig('text', autofillHint: 'username');
@@ -1152,7 +1356,8 @@ Future<void> testMain() async {
         // In Safari Desktop Autofill menu appears as soon as an element is
         // focused, therefore the input element is only focused after the
         // location is received.
-        expect(defaultTextEditingRoot.activeElement, inputElement);
+        expect(
+            defaultTextEditingRoot.ownerDocument?.activeElement, inputElement);
         expect(inputElement.selectionStart, 2);
         expect(inputElement.selectionEnd, 3);
       }
@@ -1164,8 +1369,9 @@ Future<void> testMain() async {
               Matrix4.translationValues(10.0, 20.0, 30.0).storage.toList());
       sendFrameworkMessage(codec.encodeMethodCall(updateSizeAndTransform));
 
+      await waitForDesktopSafariFocus();
       // Check the element still has focus. User can keep editing.
-      expect(defaultTextEditingRoot.activeElement,
+      expect(defaultTextEditingRoot.ownerDocument?.activeElement,
           textEditing!.strategy.domElement);
 
       // Check the cursor location is the same.
@@ -1184,7 +1390,7 @@ Future<void> testMain() async {
 
     test(
         'multiTextField Autofill: setClient, setEditingState, show, '
-        'setSizeAndTransform setEditingState, clearClient', () {
+        'setSizeAndTransform setEditingState, clearClient', () async {
       // Create a configuration with an AutofillGroup of four text fields.
       final Map<String, dynamic> flutterMultiAutofillElementConfig =
           createFlutterConfig('text',
@@ -1219,6 +1425,8 @@ Future<void> testMain() async {
               Matrix4.translationValues(10.0, 20.0, 30.0).storage.toList());
       sendFrameworkMessage(codec.encodeMethodCall(setSizeAndTransform));
 
+      await waitForDesktopSafariFocus();
+
       // The second [setEditingState] should override the first one.
       checkInputEditingState(
           textEditing!.strategy.domElement, 'abcd', 2, 3);
@@ -1343,10 +1551,11 @@ Future<void> testMain() async {
       checkInputEditingState(domElement, 'abcd', 2, 3);
 
       // Check if the location and styling is correct.
-      expect(
-          domElement.getBoundingClientRect(),
-          createDomRectFromPoints(DomPoint(10.0, 20.0),
-              DomPoint(160.0, 70.0)));
+      final DomRect boundingRect = domElement.getBoundingClientRect();
+      expect(boundingRect.left, 10.0);
+      expect(boundingRect.top, 20.0);
+      expect(boundingRect.right, 160.0);
+      expect(boundingRect.bottom, 70.0);
       expect(domElement.style.transform,
           'matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 10, 20, 30, 1)');
       expect(textEditing!.strategy.domElement!.style.font,
@@ -1403,11 +1612,11 @@ Future<void> testMain() async {
       checkInputEditingState(domElement, 'abcd', 2, 3);
 
       // Check if the position is correct.
-      expect(
-        domElement.getBoundingClientRect(),
-        createDomRectFromPoints(
-            DomPoint(10.0, 20.0), DomPoint(160.0, 70.0)),
-      );
+      final DomRect boundingRect = domElement.getBoundingClientRect();
+      expect(boundingRect.left, 10.0);
+      expect(boundingRect.top, 20.0);
+      expect(boundingRect.right, 160.0);
+      expect(boundingRect.bottom, 70.0);
       expect(
         domElement.style.transform,
         'matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 10, 20, 30, 1)',
@@ -1464,10 +1673,11 @@ Future<void> testMain() async {
       checkInputEditingState(domElement, 'abcd', 2, 3);
 
       // Check if the location and styling is correct.
-      expect(
-          domElement.getBoundingClientRect(),
-          createDomRectFromPoints(DomPoint(10.0, 20.0),
-              DomPoint(160.0, 70.0)));
+      final DomRect boundingRect = domElement.getBoundingClientRect();
+      expect(boundingRect.left, 10.0);
+      expect(boundingRect.top, 20.0);
+      expect(boundingRect.right, 160.0);
+      expect(boundingRect.bottom, 70.0);
       expect(domElement.style.transform,
           'matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 10, 20, 30, 1)');
       expect(
@@ -1502,7 +1712,7 @@ Future<void> testMain() async {
 
     test(
         'negative base offset and selection extent values in editing state is handled',
-        () {
+        () async {
       final MethodCall setClient = MethodCall(
           'TextInput.setClient', <dynamic>[123, flutterSinglelineConfig]);
       sendFrameworkMessage(codec.encodeMethodCall(setClient));
@@ -1527,6 +1737,8 @@ Future<void> testMain() async {
               Matrix4.translationValues(10.0, 20.0, 30.0).storage.toList());
       sendFrameworkMessage(codec.encodeMethodCall(setSizeAndTransform));
 
+      await waitForDesktopSafariFocus();
+
       // Check if the selection range is correct.
       checkInputEditingState(
           textEditing!.strategy.domElement, 'xyz', 1, 2);
@@ -1675,7 +1887,157 @@ Future<void> testMain() async {
       hideKeyboard();
     });
 
-    test('multiTextField Autofill sync updates back to Flutter', () {
+    test('Supports deletion at inverted selection', () async {
+      final MethodCall setClient = MethodCall(
+          'TextInput.setClient', <dynamic>[123, createFlutterConfig('text', enableDeltaModel: true)]);
+      sendFrameworkMessage(codec.encodeMethodCall(setClient));
+
+      const MethodCall setEditingState =
+      MethodCall('TextInput.setEditingState', <String, dynamic>{
+        'text': 'Hello world',
+        'selectionBase': 9,
+        'selectionExtent': 3,
+      });
+      sendFrameworkMessage(codec.encodeMethodCall(setEditingState));
+
+      const MethodCall show = MethodCall('TextInput.show');
+      sendFrameworkMessage(codec.encodeMethodCall(show));
+
+      // The "setSizeAndTransform" message has to be here before we call
+      // checkInputEditingState, since on some platforms (e.g. Desktop Safari)
+      // we don't put the input element into the DOM until we get its correct
+      // dimensions from the framework.
+      final MethodCall setSizeAndTransform =
+          configureSetSizeAndTransformMethodCall(150, 50,
+              Matrix4.translationValues(10.0, 20.0, 30.0).storage.toList());
+      sendFrameworkMessage(codec.encodeMethodCall(setSizeAndTransform));
+
+      await waitForDesktopSafariFocus();
+
+      final DomHTMLInputElement input = textEditing!.strategy.domElement! as
+          DomHTMLInputElement;
+
+      final DomInputEvent testEvent = createDomInputEvent(
+        'beforeinput',
+        <Object?, Object?>{
+          'inputType': 'deleteContentBackward',
+        },
+      );
+      input.dispatchEvent(testEvent);
+
+      final EditingState editingState = EditingState(
+        text: 'Helld',
+        baseOffset: 3,
+        extentOffset: 3,
+      );
+      editingState.applyToDomElement(input);
+      input.dispatchEvent(createDomEvent('Event', 'input'));
+
+      expect(spy.messages, hasLength(1));
+      expect(spy.messages[0].channel, 'flutter/textinput');
+      expect(spy.messages[0].methodName, 'TextInputClient.updateEditingStateWithDeltas');
+      expect(
+        spy.messages[0].methodArguments,
+        <dynamic>[
+          123, // Client ID
+          <String, dynamic>{
+            'deltas': <Map<String, dynamic>>[
+              <String, dynamic>{
+                'oldText': 'Hello world',
+                'deltaText': '',
+                'deltaStart': 3,
+                'deltaEnd': 9,
+                'selectionBase': 3,
+                'selectionExtent': 3,
+                'composingBase': -1,
+                'composingExtent': -1
+              }
+            ],
+          }
+        ],
+      );
+      spy.messages.clear();
+
+      hideKeyboard();
+      // TODO(Renzo-Olivares): https://github.com/flutter/flutter/issues/134271
+    }, skip: isSafari);
+
+    test('Supports new line at inverted selection', () async {
+      final MethodCall setClient = MethodCall(
+          'TextInput.setClient', <dynamic>[123, createFlutterConfig('text', enableDeltaModel: true)]);
+      sendFrameworkMessage(codec.encodeMethodCall(setClient));
+
+      const MethodCall setEditingState =
+      MethodCall('TextInput.setEditingState', <String, dynamic>{
+        'text': 'Hello world',
+        'selectionBase': 9,
+        'selectionExtent': 3,
+      });
+      sendFrameworkMessage(codec.encodeMethodCall(setEditingState));
+
+      const MethodCall show = MethodCall('TextInput.show');
+      sendFrameworkMessage(codec.encodeMethodCall(show));
+
+      // The "setSizeAndTransform" message has to be here before we call
+      // checkInputEditingState, since on some platforms (e.g. Desktop Safari)
+      // we don't put the input element into the DOM until we get its correct
+      // dimensions from the framework.
+      final MethodCall setSizeAndTransform =
+          configureSetSizeAndTransformMethodCall(150, 50,
+              Matrix4.translationValues(10.0, 20.0, 30.0).storage.toList());
+      sendFrameworkMessage(codec.encodeMethodCall(setSizeAndTransform));
+
+      await waitForDesktopSafariFocus();
+
+      final DomHTMLInputElement input = textEditing!.strategy.domElement! as
+          DomHTMLInputElement;
+
+      final DomInputEvent testEvent = createDomInputEvent(
+        'beforeinput',
+        <Object?, Object?>{
+          'inputType': 'insertLineBreak',
+        },
+      );
+      input.dispatchEvent(testEvent);
+
+      final EditingState editingState = EditingState(
+        text: 'Hel\nld',
+        baseOffset: 3,
+        extentOffset: 3,
+      );
+      editingState.applyToDomElement(input);
+      input.dispatchEvent(createDomEvent('Event', 'input'));
+
+      expect(spy.messages, hasLength(1));
+      expect(spy.messages[0].channel, 'flutter/textinput');
+      expect(spy.messages[0].methodName, 'TextInputClient.updateEditingStateWithDeltas');
+      expect(
+        spy.messages[0].methodArguments,
+        <dynamic>[
+          123, // Client ID
+          <String, dynamic>{
+            'deltas': <Map<String, dynamic>>[
+              <String, dynamic>{
+                'oldText': 'Hello world',
+                'deltaText': '\n',
+                'deltaStart': 3,
+                'deltaEnd': 9,
+                'selectionBase': 3,
+                'selectionExtent': 3,
+                'composingBase': -1,
+                'composingExtent': -1
+              }
+            ],
+          }
+        ],
+      );
+      spy.messages.clear();
+
+      hideKeyboard();
+      // TODO(Renzo-Olivares): https://github.com/flutter/flutter/issues/134271
+    }, skip: isSafari);
+
+    test('multiTextField Autofill sync updates back to Flutter', () async {
       // Create a configuration with an AutofillGroup of four text fields.
       const String hintForFirstElement = 'familyName';
       final Map<String, dynamic> flutterMultiAutofillElementConfig =
@@ -1711,6 +2073,7 @@ Future<void> testMain() async {
               Matrix4.translationValues(10.0, 20.0, 30.0).storage.toList());
       sendFrameworkMessage(codec.encodeMethodCall(setSizeAndTransform));
 
+      await waitForDesktopSafariFocus();
       // The second [setEditingState] should override the first one.
       checkInputEditingState(
           textEditing!.strategy.domElement, 'abcd', 2, 3);
@@ -1757,13 +2120,14 @@ Future<void> testMain() async {
       hideKeyboard();
     });
 
-    test('Multi-line mode also works', () {
+    test('Multi-line mode also works', () async {
       final MethodCall setClient = MethodCall(
           'TextInput.setClient', <dynamic>[123, flutterMultilineConfig]);
       sendFrameworkMessage(codec.encodeMethodCall(setClient));
 
       // Editing shouldn't have started yet.
-      expect(defaultTextEditingRoot.activeElement, null);
+      expect(defaultTextEditingRoot.ownerDocument?.activeElement,
+          domDocument.body);
 
       const MethodCall show = MethodCall('TextInput.show');
       sendFrameworkMessage(codec.encodeMethodCall(show));
@@ -1777,6 +2141,8 @@ Future<void> testMain() async {
               Matrix4.translationValues(10.0, 20.0, 30.0).storage.toList());
       sendFrameworkMessage(codec.encodeMethodCall(setSizeAndTransform));
 
+      await waitForDesktopSafariFocus();
+
       final DomHTMLTextAreaElement textarea = textEditing!.strategy.domElement!
           as DomHTMLTextAreaElement;
       checkTextAreaEditingState(textarea, '', 0, 0);
@@ -1851,6 +2217,52 @@ Future<void> testMain() async {
       expect(spy.messages, isEmpty);
     });
 
+    test('none mode works', () async {
+      final MethodCall setClient = MethodCall(
+          'TextInput.setClient', <dynamic>[123, createFlutterConfig('none')]);
+      sendFrameworkMessage(codec.encodeMethodCall(setClient));
+
+      const MethodCall show = MethodCall('TextInput.show');
+      sendFrameworkMessage(codec.encodeMethodCall(show));
+
+      // The "setSizeAndTransform" message has to be here before we call
+      // checkInputEditingState, since on some platforms (e.g. Desktop Safari)
+      // we don't put the input element into the DOM until we get its correct
+      // dimensions from the framework.
+      final MethodCall setSizeAndTransform =
+          configureSetSizeAndTransformMethodCall(150, 50,
+              Matrix4.translationValues(10.0, 20.0, 30.0).storage.toList());
+      sendFrameworkMessage(codec.encodeMethodCall(setSizeAndTransform));
+
+      await waitForDesktopSafariFocus();
+
+      expect(textEditing!.strategy.domElement!.tagName, 'INPUT');
+      expect(getEditingInputMode(), 'none');
+    });
+
+    test('none multiline mode works', () async {
+      final MethodCall setClient = MethodCall(
+          'TextInput.setClient', <dynamic>[123, createFlutterConfig('none', isMultiline: true)]);
+      sendFrameworkMessage(codec.encodeMethodCall(setClient));
+
+      const MethodCall show = MethodCall('TextInput.show');
+      sendFrameworkMessage(codec.encodeMethodCall(show));
+
+      // The "setSizeAndTransform" message has to be here before we call
+      // checkInputEditingState, since on some platforms (e.g. Desktop Safari)
+      // we don't put the input element into the DOM until we get its correct
+      // dimensions from the framework.
+      final MethodCall setSizeAndTransform =
+          configureSetSizeAndTransformMethodCall(150, 50,
+              Matrix4.translationValues(10.0, 20.0, 30.0).storage.toList());
+      sendFrameworkMessage(codec.encodeMethodCall(setSizeAndTransform));
+
+      await waitForDesktopSafariFocus();
+
+      expect(textEditing!.strategy.domElement!.tagName, 'TEXTAREA');
+      expect(getEditingInputMode(), 'none');
+    });
+
     test('sets correct input type in Android', () {
       debugOperatingSystemOverride = OperatingSystem.android;
       debugBrowserEngineOverride = BrowserEngine.blink;
@@ -1882,6 +2294,100 @@ Future<void> testMain() async {
 
       showKeyboard(inputType: 'none');
       expect(getEditingInputMode(), 'none');
+      expect(textEditing!.strategy.domElement!.tagName, 'INPUT');
+
+      showKeyboard(inputType: 'none', isMultiline: true);
+      expect(getEditingInputMode(), 'none');
+      expect(textEditing!.strategy.domElement!.tagName, 'TEXTAREA');
+
+      hideKeyboard();
+    });
+
+    test('sets correct input type for Firefox on Android', () {
+      debugOperatingSystemOverride = OperatingSystem.android;
+      debugBrowserEngineOverride = BrowserEngine.firefox;
+
+      /// During initialization [HybridTextEditing] will pick the correct
+      /// text editing strategy for [OperatingSystem.android].
+      textEditing = HybridTextEditing();
+
+      showKeyboard(inputType: 'text');
+      expect(getEditingInputMode(), null);
+
+      showKeyboard(inputType: 'number');
+      expect(getEditingInputMode(), 'numeric');
+
+      showKeyboard(inputType: 'number');
+      expect(getEditingInputMode(), 'numeric');
+
+      showKeyboard(inputType: 'number', decimal: true);
+      expect(getEditingInputMode(), 'decimal');
+
+      showKeyboard(inputType: 'phone');
+      expect(getEditingInputMode(), 'tel');
+
+      showKeyboard(inputType: 'emailAddress');
+      expect(getEditingInputMode(), 'email');
+
+      showKeyboard(inputType: 'url');
+      expect(getEditingInputMode(), 'url');
+
+      showKeyboard(inputType: 'none');
+      expect(getEditingInputMode(), 'none');
+
+      hideKeyboard();
+    });
+
+    test('prevent mouse events on Android', () {
+      // Regression test for https://github.com/flutter/flutter/issues/124483.
+      debugOperatingSystemOverride = OperatingSystem.android;
+      debugBrowserEngineOverride = BrowserEngine.blink;
+
+      /// During initialization [HybridTextEditing] will pick the correct
+      /// text editing strategy for [OperatingSystem.android].
+      textEditing = HybridTextEditing();
+
+      final MethodCall setClient = MethodCall(
+        'TextInput.setClient',
+        <dynamic>[123, flutterMultilineConfig],
+      );
+      sendFrameworkMessage(codec.encodeMethodCall(setClient));
+
+      // Editing shouldn't have started yet.
+      expect(defaultTextEditingRoot.ownerDocument?.activeElement, domDocument.body);
+
+      const MethodCall show = MethodCall('TextInput.show');
+      sendFrameworkMessage(codec.encodeMethodCall(show));
+
+      // The "setSizeAndTransform" message has to be here before we call
+      // checkInputEditingState, since on some platforms (e.g. Desktop Safari)
+      // we don't put the input element into the DOM until we get its correct
+      // dimensions from the framework.
+      final List<double> transform = Matrix4.translationValues(10.0, 20.0, 30.0).storage.toList();
+      final MethodCall setSizeAndTransform = configureSetSizeAndTransformMethodCall(150, 50, transform);
+      sendFrameworkMessage(codec.encodeMethodCall(setSizeAndTransform));
+
+      final DomHTMLTextAreaElement textarea = textEditing!.strategy.domElement! as DomHTMLTextAreaElement;
+      checkTextAreaEditingState(textarea, '', 0, 0);
+
+      // Can set editing state and preserve new lines.
+      const MethodCall setEditingState = MethodCall(
+        'TextInput.setEditingState',
+        <String, dynamic>{
+          'text': '1\n2\n3\n4\n',
+          'selectionBase': 8,
+          'selectionExtent': 8,
+          'composingBase': null,
+          'composingExtent': null,
+        },
+      );
+      sendFrameworkMessage(codec.encodeMethodCall(setEditingState));
+      checkTextAreaEditingState(textarea, '1\n2\n3\n4\n', 8, 8);
+
+      // 'mousedown' event should be prevented.
+      final DomEvent event = createDomEvent('Event', 'mousedown');
+      textarea.dispatchEvent(event);
+      expect(event.defaultPrevented, isTrue);
 
       hideKeyboard();
     });
@@ -1917,6 +2423,11 @@ Future<void> testMain() async {
 
         showKeyboard(inputType: 'none');
         expect(getEditingInputMode(), 'none');
+        expect(textEditing!.strategy.domElement!.tagName, 'INPUT');
+
+        showKeyboard(inputType: 'none', isMultiline: true);
+        expect(getEditingInputMode(), 'none');
+        expect(textEditing!.strategy.domElement!.tagName, 'TEXTAREA');
 
         hideKeyboard();
       }
@@ -2109,6 +2620,150 @@ Future<void> testMain() async {
       expect(autofillForm, isNull);
     });
 
+    test('placeForm() should place element in correct position', () {
+      final List<dynamic> fields = createFieldValues(<String>[
+        'email',
+        'username',
+        'password',
+      ], <String>[
+        'field1',
+        'field2',
+        'field3'
+      ]);
+      final EngineAutofillForm autofillForm =
+          EngineAutofillForm.fromFrameworkMessage(
+              createAutofillInfo('email', 'field1'), fields)!;
+
+      expect(autofillForm.elements, hasLength(2));
+
+      List<DomHTMLInputElement> formChildNodes =
+          autofillForm.formElement.childNodes.toList() as List<DomHTMLInputElement>;
+
+      // Only username, password, submit nodes are created
+      expect(formChildNodes, hasLength(3));
+      expect(formChildNodes[0].name, 'username');
+      expect(formChildNodes[1].name, 'current-password');
+      expect(formChildNodes[2].type, 'submit');
+      // insertion point for email should be before username
+      expect(autofillForm.insertionReferenceNode, formChildNodes[0]);
+
+      final DomHTMLInputElement testInputElement = createDomHTMLInputElement();
+      testInputElement.name = 'email';
+      autofillForm.placeForm(testInputElement);
+
+      formChildNodes = autofillForm.formElement.childNodes.toList()
+          as List<DomHTMLInputElement>;
+      // email node should be placed before username
+      expect(formChildNodes, hasLength(4));
+      expect(formChildNodes[0].name, 'email');
+      expect(formChildNodes[1].name, 'username');
+      expect(formChildNodes[2].name, 'current-password');
+      expect(formChildNodes[3].type, 'submit');
+    });
+
+    test(
+        'hidden autofill elements should have a width and height of 0 on non-Safari browsers',
+        () {
+      final List<dynamic> fields = createFieldValues(<String>[
+        'email',
+        'username',
+        'password',
+      ], <String>[
+        'field1',
+        'field2',
+        'field3'
+      ]);
+      final EngineAutofillForm autofillForm =
+          EngineAutofillForm.fromFrameworkMessage(
+              createAutofillInfo('email', 'field1'), fields)!;
+      final List<DomHTMLInputElement> formChildNodes =
+          autofillForm.formElement.childNodes.toList()
+              as List<DomHTMLInputElement>;
+      final DomHTMLInputElement username = formChildNodes[0];
+      final DomHTMLInputElement password = formChildNodes[1];
+
+      expect(username.name, 'username');
+      expect(password.name, 'current-password');
+      expect(username.style.width, '0px');
+      expect(username.style.height, '0px');
+      expect(username.style.pointerEvents, isNot('none'));
+      expect(password.style.width, '0px');
+      expect(password.style.height, '0px');
+      expect(password.style.pointerEvents, isNot('none'));
+      expect(autofillForm.formElement.style.pointerEvents, isNot('none'));
+    }, skip: isSafari);
+
+    test(
+        'hidden autofill elements should not have a width and height of 0 on Safari',
+        () {
+      final List<dynamic> fields = createFieldValues(<String>[
+        'email',
+        'username',
+        'password',
+      ], <String>[
+        'field1',
+        'field2',
+        'field3'
+      ]);
+      final EngineAutofillForm autofillForm =
+          EngineAutofillForm.fromFrameworkMessage(
+              createAutofillInfo('email', 'field1'), fields)!;
+      final List<DomHTMLInputElement> formChildNodes =
+          autofillForm.formElement.childNodes.toList()
+              as List<DomHTMLInputElement>;
+      final DomHTMLInputElement username = formChildNodes[0];
+      final DomHTMLInputElement password = formChildNodes[1];
+      expect(username.name, 'username');
+      expect(password.name, 'current-password');
+      expect(username.style.width, isNot('0px'));
+      expect(username.style.height, isNot('0px'));
+      expect(username.style.pointerEvents, 'none');
+      expect(password.style.width, isNot('0px'));
+      expect(password.style.height, isNot('0px'));
+      expect(password.style.pointerEvents, 'none');
+      expect(autofillForm.formElement.style.pointerEvents, 'none');
+    }, skip: !isSafari);
+
+    test(
+        'the focused element within a form should explicitly set pointer events on Safari',
+        () {
+      final List<dynamic> fields = createFieldValues(<String>[
+        'email',
+        'username',
+        'password',
+      ], <String>[
+        'field1',
+        'field2',
+        'field3'
+      ]);
+      final EngineAutofillForm autofillForm =
+          EngineAutofillForm.fromFrameworkMessage(
+              createAutofillInfo('email', 'field1'), fields)!;
+
+      final DomHTMLInputElement testInputElement = createDomHTMLInputElement();
+      testInputElement.name = 'email';
+      autofillForm.placeForm(testInputElement);
+
+      final List<DomHTMLInputElement> formChildNodes =
+          autofillForm.formElement.childNodes.toList()
+              as List<DomHTMLInputElement>;
+      final DomHTMLInputElement email = formChildNodes[0];
+      final DomHTMLInputElement username = formChildNodes[1];
+      final DomHTMLInputElement password = formChildNodes[2];
+
+      expect(email.name, 'email');
+      expect(username.name, 'username');
+      expect(password.name, 'current-password');
+
+      // pointer events are none on the form and all non-focused elements
+      expect(autofillForm.formElement.style.pointerEvents, 'none');
+      expect(username.style.pointerEvents, 'none');
+      expect(password.style.pointerEvents, 'none');
+
+      // pointer events are set to all on the activeDomElement
+      expect(email.style.pointerEvents, 'all');
+    }, skip: !isSafari);
+
     tearDown(() {
       clearForms();
     });
@@ -2220,6 +2875,12 @@ Future<void> testMain() async {
       expect(testInputElement.getAttribute('autocomplete'),'on');
       expect(testInputElement.placeholder, 'enter your password');
     });
+
+    // Regression test for https://github.com/flutter/flutter/issues/135542
+    test('autofill with middleName hint', () {
+      expect(BrowserAutofillHints.instance.flutterToEngine('middleName'),
+          'additional-name');
+    });
   });
 
   group('EditingState', () {
@@ -2332,14 +2993,17 @@ Future<void> testMain() async {
       final DomHTMLInputElement input =
           defaultTextEditingRoot.querySelector('input')! as DomHTMLInputElement;
       input.value = 'Test';
-      input.selectionStart = 1;
-      input.selectionEnd = 2;
 
+      input.setSelectionRange(1, 2);
       editingState = EditingState.fromDomElement(input);
-
       expect(editingState.text, 'Test');
       expect(editingState.baseOffset, 1);
       expect(editingState.extentOffset, 2);
+
+      input.setSelectionRange(1, 2, 'backward');
+      editingState = EditingState.fromDomElement(input);
+      expect(editingState.baseOffset, 2);
+      expect(editingState.extentOffset, 1);
     });
 
     test('Get Editing State from text area element', () {
@@ -2353,14 +3017,17 @@ Future<void> testMain() async {
       final DomHTMLTextAreaElement input =
           defaultTextEditingRoot.querySelector('textarea')! as DomHTMLTextAreaElement;
       input.value = 'Test';
-      input.selectionStart = 1;
-      input.selectionEnd = 2;
 
+      input.setSelectionRange(1, 2);
       editingState = EditingState.fromDomElement(input);
-
       expect(editingState.text, 'Test');
       expect(editingState.baseOffset, 1);
       expect(editingState.extentOffset, 2);
+
+      input.setSelectionRange(1, 2, 'backward');
+      editingState = EditingState.fromDomElement(input);
+      expect(editingState.baseOffset, 2);
+      expect(editingState.extentOffset, 1);
     });
 
     group('comparing editing states', () {
@@ -2549,6 +3216,26 @@ Future<void> testMain() async {
       expect(textEditingDeltaState.composingOffset, -1);
       expect(textEditingDeltaState.composingExtent, -1);
     });
+
+    test('Delta state is cleared after setting editing state', (){
+      editingStrategy!.enable(
+        multilineConfig,
+        onChange: trackEditingState,
+        onAction: trackInputAction,
+      );
+      final DomHTMLInputElement input = editingStrategy!.domElement! as DomHTMLInputElement;
+      input.value = 'foo bar';
+      input.dispatchEvent(createDomEvent('Event', 'input'));
+      expect(
+        lastEditingState,
+        EditingState(text: 'foo bar', baseOffset: 7, extentOffset: 7),
+      );
+      expect(editingStrategy!.editingDeltaState.oldText, 'foo bar');
+
+      editingStrategy!.setEditingState(EditingState(text: 'foo bar baz', baseOffset: 11, extentOffset: 11));
+      input.dispatchEvent(createDomEvent('Event', 'input'));
+      expect(editingStrategy?.editingDeltaState.oldText, 'foo bar baz');
+    });
   });
 
   group('text editing styles', () {
@@ -2560,15 +3247,21 @@ Future<void> testMain() async {
       );
 
       final DomHTMLElement input = editingStrategy!.activeDomElement;
-      expect(input.style.color, 'transparent');
-      expect(input.style.background, 'transparent');
-      expect(input.style.backgroundColor, 'transparent');
-      expect(input.style.caretColor, 'transparent');
-      expect(input.style.outline, 'none');
-      expect(input.style.border, 'none');
-      expect(input.style.textShadow, 'none');
-    // TODO(hterkelsen): https://github.com/flutter/flutter/issues/115327
-    }, skip: isFirefox);
+      expect(input.style.color, contains('transparent'));
+      if (isSafari) {
+        // macOS 13 returns different values than macOS 12.
+        expect(input.style.background, anyOf(contains('transparent'), contains('none')));
+        expect(input.style.outline, anyOf(contains('none'), contains('currentcolor')));
+        expect(input.style.border, anyOf(contains('none'), contains('medium')));
+      } else {
+        expect(input.style.background, contains('transparent'));
+        expect(input.style.outline, contains('none'));
+        expect(input.style.border, contains('none'));
+      }
+      expect(input.style.backgroundColor, contains('transparent'));
+      expect(input.style.caretColor, contains('transparent'));
+      expect(input.style.textShadow, contains('none'));
+    });
 
     test('prevents effect of (forced-colors: active)', () {
       editingStrategy!.enable(
@@ -2579,7 +3272,9 @@ Future<void> testMain() async {
 
       final DomHTMLElement input = editingStrategy!.activeDomElement;
       expect(input.style.getPropertyValue('forced-color-adjust'), 'none');
-    // TODO(hterkelsen): https://github.com/flutter/flutter/issues/115327
+    // TODO(hterkelsen): Firefox does not support forced-color-adjust even
+    // though it supports forced-colors. Safari doesn't support forced-colors
+    // so this isn't a problem there.
     }, skip: isFirefox || isSafari);
   });
 }
@@ -2589,17 +3284,17 @@ DomKeyboardEvent dispatchKeyboardEvent(
   String type, {
   required int keyCode,
 }) {
-  final Function jsKeyboardEvent = js_util.getProperty<Function>(domWindow, 'KeyboardEvent');
+  final Object jsKeyboardEvent = js_util.getProperty<Object>(domWindow, 'KeyboardEvent');
   final List<dynamic> eventArgs = <dynamic>[
     type,
-    <String, dynamic>{
+    js_util.jsify(<String, dynamic>{
       'keyCode': keyCode,
       'cancelable': true,
-    }
+    }),
   ];
   final DomKeyboardEvent event = js_util.callConstructor<DomKeyboardEvent>(
     jsKeyboardEvent,
-    js_util.jsify(eventArgs) as List<Object?>?,
+    eventArgs,
   );
   target.dispatchEvent(event);
 
@@ -2645,7 +3340,7 @@ void checkInputEditingState(
   expect(element, isNotNull);
   expect(domInstanceOfString(element, 'HTMLInputElement'), true);
   final DomHTMLInputElement input = element! as DomHTMLInputElement;
-  expect(defaultTextEditingRoot.activeElement, input);
+  expect(defaultTextEditingRoot.ownerDocument?.activeElement, input);
   expect(input.value, text);
   expect(input.selectionStart, start);
   expect(input.selectionEnd, end);
@@ -2671,7 +3366,7 @@ void checkTextAreaEditingState(
   int start,
   int end,
 ) {
-  expect(defaultTextEditingRoot.activeElement, textarea);
+  expect(defaultTextEditingRoot.ownerDocument?.activeElement, textarea);
   expect(textarea.value, text);
   expect(textarea.selectionStart, start);
   expect(textarea.selectionEnd, end);
@@ -2694,11 +3389,13 @@ Map<String, dynamic> createFlutterConfig(
   List<String>? autofillHintsForFields,
   bool decimal = false,
   bool enableDeltaModel = false,
+  bool isMultiline = false,
 }) {
   return <String, dynamic>{
     'inputType': <String, dynamic>{
       'name': 'TextInputType.$inputType',
       if (decimal) 'decimal': true,
+      if (isMultiline) 'isMultiline': true,
     },
     'readOnly': readOnly,
     'obscureText': obscureText,
@@ -2760,3 +3457,24 @@ void clearForms() {
   }
   formsOnTheDom.clear();
 }
+
+/// On Desktop Safari, the editing element is focused after a zero-duration timer
+/// to prevent autofill popup flickering. We must wait a tick for this placement
+/// before referencing these elements.
+Future<void> waitForDesktopSafariFocus() async {
+  if (textEditing.strategy is SafariDesktopTextEditingStrategy) {
+    await Future<void>.delayed(Duration.zero);
+  }
+}
+
+class GlobalTextEditingStrategySpy extends GloballyPositionedTextEditingStrategy {
+  GlobalTextEditingStrategySpy(super.owner);
+
+  int placeElementCount = 0;
+
+  @override
+  void placeElement() {
+    placeElementCount++;
+    super.placeElement();
+  }
+}
diff --git a/lib/web_ui/test/engine/ulps_test.dart b/lib/web_ui/test/engine/ulps_test.dart
deleted file mode 100644
index 8970225ddb6b65ac28578c8ad9e8db38c3664f45..0000000000000000000000000000000000000000
--- a/lib/web_ui/test/engine/ulps_test.dart
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'dart:typed_data';
-import 'package:test/bootstrap/browser.dart';
-import 'package:test/test.dart';
-import 'package:ui/src/engine/ulps.dart';
-
-void main() {
-  internalBootstrapBrowserTest(() => testMain);
-}
-
-void testMain() {
-  group('Float Int conversions', (){
-    test("Should convert signbit to 2's compliment", () {
-      expect(signBitTo2sCompliment(0), 0);
-      expect(signBitTo2sCompliment(0x7fffffff).toUnsigned(32), 0x7fffffff);
-      expect(signBitTo2sCompliment(0x80000000), 0);
-      expect(signBitTo2sCompliment(0x8f000000).toUnsigned(32), 0xf1000000);
-      expect(signBitTo2sCompliment(0x8fffffff).toUnsigned(32), 0xf0000001);
-      expect(signBitTo2sCompliment(0xffffffff).toUnsigned(32), 0x80000001);
-      expect(signBitTo2sCompliment(0x8f000000), -251658240);
-      expect(signBitTo2sCompliment(0x8fffffff), -268435455);
-      expect(signBitTo2sCompliment(0xffffffff), -2147483647);
-    });
-
-    test('Should convert 2s compliment to signbit', () {
-      expect(twosComplimentToSignBit(0), 0);
-      expect(twosComplimentToSignBit(0x7fffffff), 0x7fffffff);
-      expect(twosComplimentToSignBit(0), 0);
-      expect(twosComplimentToSignBit(0xf1000000).toRadixString(16), 0x8f000000.toRadixString(16));
-      expect(twosComplimentToSignBit(0xf0000001), 0x8fffffff);
-      expect(twosComplimentToSignBit(0x80000001), 0xffffffff);
-      expect(twosComplimentToSignBit(0x81234561), 0xfedcba9f);
-      expect(twosComplimentToSignBit(-5), 0x80000005);
-    });
-
-    test('Should convert float to bits', () {
-      final Float32List floatList = Float32List(1);
-      floatList[0] = 0;
-      expect(float2Bits(floatList, 0), 0);
-      floatList[0] = 0.1;
-      expect(float2Bits(floatList, 0).toUnsigned(32).toRadixString(16), 0x3dcccccd.toRadixString(16));
-      floatList[0] = 123456.0;
-      expect(float2Bits(floatList, 0).toUnsigned(32).toRadixString(16), 0x47f12000.toRadixString(16));
-      floatList[0] = -0.1;
-      expect(float2Bits(floatList, 0).toUnsigned(32).toRadixString(16), 0xbdcccccd.toRadixString(16));
-      floatList[0] = -123456.0;
-      expect(float2Bits(floatList, 0).toUnsigned(32).toRadixString(16), 0xc7f12000.toRadixString(16));
-    });
-  });
-  group('Comparison', () {
-    test('Should compare equality based on ulps', () {
-      // If number of floats between a=1.1 and b are below 16, equals should
-      // return true.
-      const double a = 1.1;
-      final int aBits = floatAs2sCompliment(a);
-      double b = twosComplimentAsFloat(aBits + 1);
-      expect(almostEqualUlps(a, b), isTrue);
-      b = twosComplimentAsFloat(aBits + 15);
-      expect(almostEqualUlps(a, b), isTrue);
-      b = twosComplimentAsFloat(aBits + 16);
-      expect(almostEqualUlps(a, b), isFalse);
-
-      // Test between variant of equalUlps.
-      b = twosComplimentAsFloat(aBits + 1);
-      expect(almostBequalUlps(a, b), isTrue);
-      b = twosComplimentAsFloat(aBits + 1);
-      expect(almostBequalUlps(a, b), isTrue);
-      b = twosComplimentAsFloat(aBits + 2);
-      expect(almostBequalUlps(a, b), isFalse);
-    });
-
-    test('Should compare 2 coordinates based on ulps', () {
-      double a = 1.1;
-      int aBits = floatAs2sCompliment(a);
-      double b = twosComplimentAsFloat(aBits + 1);
-      expect(approximatelyEqual(5.0, a, 5.0, b), isTrue);
-      b = twosComplimentAsFloat(aBits + 16);
-      expect(approximatelyEqual(5.0, a, 5.0, b), isTrue);
-
-      // Increase magnitude which should start checking with ulps rather than
-      // fltEpsilon.
-      a = 3000000.1;
-      aBits = floatAs2sCompliment(a);
-      b = twosComplimentAsFloat(aBits + 1);
-      expect(approximatelyEqual(5.0, a, 5.0, b), isTrue);
-      b = twosComplimentAsFloat(aBits + 16);
-      expect(approximatelyEqual(5.0, a, 5.0, b), isFalse);
-    });
-  });
-}
diff --git a/lib/web_ui/test/engine/view/view_constraints_test.dart b/lib/web_ui/test/engine/view/view_constraints_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..3ea1c09517ed52c3c43a0b91c068c69c432940ff
--- /dev/null
+++ b/lib/web_ui/test/engine/view/view_constraints_test.dart
@@ -0,0 +1,155 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui;
+
+import '../../common/matchers.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+Future<void> testMain() async {
+  const ui.Size size = ui.Size(640, 480);
+
+  group('ViewConstraints.fromJs', () {
+    test('Negative min constraints -> Assertion error.', () async {
+      expect(
+          () => ViewConstraints.fromJs(
+              JsViewConstraints(
+                minWidth: -1,
+              ),
+              size),
+          throwsAssertionError);
+      expect(
+          () => ViewConstraints.fromJs(
+              JsViewConstraints(
+                minHeight: -1,
+              ),
+              size),
+          throwsAssertionError);
+    });
+
+    test('Infinite min constraints -> Assertion error.', () async {
+      expect(
+          () => ViewConstraints.fromJs(
+              JsViewConstraints(
+                minWidth: double.infinity,
+              ),
+              size),
+          throwsAssertionError);
+      expect(
+          () => ViewConstraints.fromJs(
+              JsViewConstraints(
+                minHeight: double.infinity,
+              ),
+              size),
+          throwsAssertionError);
+    });
+
+    test('Negative max constraints -> Assertion error.', () async {
+      expect(
+          () => ViewConstraints.fromJs(
+              JsViewConstraints(
+                maxWidth: -1,
+              ),
+              size),
+          throwsAssertionError);
+      expect(
+          () => ViewConstraints.fromJs(
+              JsViewConstraints(
+                maxHeight: -1,
+              ),
+              size),
+          throwsAssertionError);
+    });
+
+    test('null JS Constraints -> Tight to size', () async {
+      expect(
+          ViewConstraints.fromJs(null, size),
+          const ViewConstraints(
+            minWidth: 640, maxWidth: 640, //
+            minHeight: 480, maxHeight: 480, //
+          ));
+    });
+
+    test('non-null JS Constraints -> Computes sizes', () async {
+      final JsViewConstraints constraints = JsViewConstraints(
+        minWidth: 500, maxWidth: 600, //
+        minHeight: 300, maxHeight: 400, //
+      );
+      expect(
+          ViewConstraints.fromJs(constraints, size),
+          const ViewConstraints(
+            minWidth: 500, maxWidth: 600, //
+            minHeight: 300, maxHeight: 400, //
+          ));
+    });
+
+    test('null JS Width -> Tight to width. Computes height.', () async {
+      final JsViewConstraints constraints = JsViewConstraints(
+        minHeight: 200,
+        maxHeight: 320,
+      );
+      expect(
+          ViewConstraints.fromJs(constraints, size),
+          const ViewConstraints(
+            minWidth: 640, maxWidth: 640, //
+            minHeight: 200, maxHeight: 320, //
+          ));
+    });
+
+    test('null JS Height -> Tight to height. Computed width.', () async {
+      final JsViewConstraints constraints = JsViewConstraints(
+        minWidth: 200,
+        maxWidth: 320,
+      );
+      expect(
+          ViewConstraints.fromJs(constraints, size),
+          const ViewConstraints(
+            minWidth: 200, maxWidth: 320, //
+            minHeight: 480, maxHeight: 480, //
+          ));
+    });
+
+    test(
+        'non-null JS Constraints -> Computes sizes. Max values can be greater than available size.',
+        () async {
+      final JsViewConstraints constraints = JsViewConstraints(
+        minWidth: 500, maxWidth: 1024, //
+        minHeight: 300, maxHeight: 768, //
+      );
+      expect(
+          ViewConstraints.fromJs(constraints, size),
+          const ViewConstraints(
+            minWidth: 500, maxWidth: 1024, //
+            minHeight: 300, maxHeight: 768, //
+          ));
+    });
+
+    test(
+        'non-null JS Constraints -> Computes sizes. Max values can be unconstrained.',
+        () async {
+      final JsViewConstraints constraints = JsViewConstraints(
+        minWidth: 500,
+        maxWidth: double.infinity,
+        minHeight: 300,
+        maxHeight: double.infinity,
+      );
+      expect(
+          ViewConstraints.fromJs(constraints, size),
+          const ViewConstraints(
+            // ignore: avoid_redundant_argument_values
+            minWidth: 500, maxWidth: double.infinity,
+            // ignore: avoid_redundant_argument_values
+            minHeight: 300, maxHeight: double.infinity,
+          ));
+    });
+  });
+}
diff --git a/lib/web_ui/test/engine/view_embedder/dimensions_provider/custom_element_dimensions_provider_test.dart b/lib/web_ui/test/engine/view_embedder/dimensions_provider/custom_element_dimensions_provider_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..4416aa59bc56c6123a525fff2fcd46fb55b5fccd
--- /dev/null
+++ b/lib/web_ui/test/engine/view_embedder/dimensions_provider/custom_element_dimensions_provider_test.dart
@@ -0,0 +1,173 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui show Size;
+
+void main() {
+  internalBootstrapBrowserTest(() => doTests);
+}
+
+void doTests() {
+  final DomElement sizeSource = createDomElement('div')
+    ..style.display = 'block';
+
+  group('computePhysicalSize', () {
+    late CustomElementDimensionsProvider provider;
+
+    setUp(() {
+      sizeSource
+        ..style.width = '10px'
+        ..style.height = '10px';
+      domDocument.body!.append(sizeSource);
+      provider = CustomElementDimensionsProvider(sizeSource);
+    });
+
+    tearDown(() {
+      provider.close(); // cleanup
+      sizeSource.remove();
+    });
+
+    test('returns physical size of element (width * dpr)', () {
+      const double dpr = 2.5;
+      const double logicalWidth = 50;
+      const double logicalHeight = 75;
+      EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(dpr);
+
+      sizeSource
+        ..style.width = '${logicalWidth}px'
+        ..style.height = '${logicalHeight}px';
+
+      const ui.Size expected = ui.Size(logicalWidth * dpr, logicalHeight * dpr);
+
+      final ui.Size computed = provider.computePhysicalSize();
+
+      expect(computed, expected);
+    });
+  });
+
+  group('computeKeyboardInsets', () {
+    late CustomElementDimensionsProvider provider;
+
+    setUp(() {
+      sizeSource
+        ..style.width = '10px'
+        ..style.height = '10px';
+      domDocument.body!.append(sizeSource);
+      provider = CustomElementDimensionsProvider(sizeSource);
+    });
+
+    tearDown(() {
+      provider.close(); // cleanup
+      sizeSource.remove();
+    });
+
+    test('from viewport physical size (simulated keyboard) - always zero', () {
+      // Simulate a 100px tall keyboard showing...
+      const double dpr = 2.5;
+      EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(dpr);
+      const double keyboardGap = 100;
+      final double physicalHeight =
+          (domWindow.visualViewport!.height! + keyboardGap) * dpr;
+
+      final ViewPadding computed =
+          provider.computeKeyboardInsets(physicalHeight, false);
+
+      expect(computed.top, 0);
+      expect(computed.right, 0);
+      expect(computed.bottom, 0);
+      expect(computed.left, 0);
+    });
+  });
+
+  group('onResize Stream', () {
+    late CustomElementDimensionsProvider provider;
+
+    setUp(() async {
+      sizeSource
+        ..style.width = '10px'
+        ..style.height = '10px';
+      domDocument.body!.append(sizeSource);
+      provider = CustomElementDimensionsProvider(sizeSource);
+      // Let the DOM settle before starting the test, so we don't get the first
+      // 10,10 Size in the test. Otherwise, the ResizeObserver may trigger
+      // unexpectedly after the test has started, and break our "first" result.
+      await Future<void>.delayed(const Duration(milliseconds: 250));
+    });
+
+    tearDown(() {
+      provider.close(); // cleanup
+      sizeSource.remove();
+    });
+
+    test('funnels resize events on sizeSource', () async {
+      EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(2.7);
+
+      sizeSource
+        ..style.width = '100px'
+        ..style.height = '100px';
+
+      expect(provider.onResize.first, completes);
+      expect(provider.computePhysicalSize(), const ui.Size(270, 270));
+
+      sizeSource
+        ..style.width = '200px'
+        ..style.height = '200px';
+
+      expect(provider.onResize.first, completes);
+      expect(provider.computePhysicalSize(), const ui.Size(540, 540));
+
+      sizeSource
+        ..style.width = '300px'
+        ..style.height = '300px';
+
+      expect(provider.onResize.first, completes);
+      expect(provider.computePhysicalSize(), const ui.Size(810, 810));
+    });
+
+    test('funnels DPR change events too', () async {
+      // Override the source of DPR events...
+      final StreamController<double> dprController =
+          StreamController<double>.broadcast();
+
+      // Inject the dprController stream into the CustomElementDimensionsProvider.
+      final CustomElementDimensionsProvider provider =
+          CustomElementDimensionsProvider(
+        sizeSource,
+        onDprChange: dprController.stream,
+      );
+
+      // Set and broadcast the mock DPR value
+      EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(3.2);
+      dprController.add(3.2);
+
+      expect(provider.onResize.first, completes);
+      expect(provider.computePhysicalSize(), const ui.Size(32, 32));
+    });
+
+    test('closed by onHotRestart', () async {
+      // Register an onDone listener for the stream
+      final Completer<bool> completer = Completer<bool>();
+      provider.onResize.listen(null, onDone: () {
+        completer.complete(true);
+      });
+
+      // Should close the stream
+      provider.close();
+
+      sizeSource
+        ..style.width = '100px'
+        ..style.height = '100px';
+      // Give time to the mutationObserver to fire (if needed, it won't)
+      await Future<void>.delayed(const Duration(milliseconds: 100));
+
+      expect(provider.onResize.isEmpty, completion(isTrue));
+      expect(completer.future, completion(isTrue));
+    });
+  });
+}
diff --git a/lib/web_ui/test/engine/view_embedder/dimensions_provider/dimensions_provider_test.dart b/lib/web_ui/test/engine/view_embedder/dimensions_provider/dimensions_provider_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..7c355f94fdd174599b0afd58057bfc5ef8e17b52
--- /dev/null
+++ b/lib/web_ui/test/engine/view_embedder/dimensions_provider/dimensions_provider_test.dart
@@ -0,0 +1,31 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => doTests);
+}
+
+void doTests() {
+  group('Factory', () {
+    test('Creates a FullPage instance when hostElement is null', () async {
+      final DimensionsProvider provider = DimensionsProvider.create();
+
+      expect(provider, isA<FullPageDimensionsProvider>());
+    });
+
+    test('Creates a CustomElement instance when hostElement is not null',
+        () async {
+      final DomElement element = createDomElement('some-random-element');
+      final DimensionsProvider provider = DimensionsProvider.create(
+        hostElement: element,
+      );
+
+      expect(provider, isA<CustomElementDimensionsProvider>());
+    });
+  });
+}
diff --git a/lib/web_ui/test/engine/view_embedder/dimensions_provider/full_page_dimensions_provider_test.dart b/lib/web_ui/test/engine/view_embedder/dimensions_provider/full_page_dimensions_provider_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..cd633da01526d23376c880e889dffece0096f51c
--- /dev/null
+++ b/lib/web_ui/test/engine/view_embedder/dimensions_provider/full_page_dimensions_provider_test.dart
@@ -0,0 +1,103 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui show Size;
+
+void main() {
+  internalBootstrapBrowserTest(() => doTests);
+}
+
+void doTests() {
+  group('computePhysicalSize', () {
+    late FullPageDimensionsProvider provider;
+
+    setUp(() {
+      provider = FullPageDimensionsProvider();
+    });
+
+    test('returns visualViewport physical size (width * dpr)', () {
+      const double dpr = 2.5;
+      EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(dpr);
+      final ui.Size expected = ui.Size(domWindow.visualViewport!.width! * dpr,
+          domWindow.visualViewport!.height! * dpr);
+
+      final ui.Size computed = provider.computePhysicalSize();
+
+      expect(computed, expected);
+    });
+  });
+
+  group('computeKeyboardInsets', () {
+    late FullPageDimensionsProvider provider;
+
+    setUp(() {
+      provider = FullPageDimensionsProvider();
+    });
+
+    test('from viewport physical size (simulated keyboard)', () {
+      // Simulate a 100px tall keyboard showing...
+      const double dpr = 2.5;
+      EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(dpr);
+      const double keyboardGap = 100;
+      final double physicalHeight =
+          (domWindow.visualViewport!.height! + keyboardGap) * dpr;
+      const double expectedBottom = keyboardGap * dpr;
+
+      final ViewPadding computed =
+          provider.computeKeyboardInsets(physicalHeight, false);
+
+      expect(computed.top, 0);
+      expect(computed.right, 0);
+      expect(computed.bottom, expectedBottom);
+      expect(computed.left, 0);
+    });
+  });
+
+  group('onResize Stream', () {
+    // Needed to synthesize "resize" events
+    final DomEventTarget resizeEventTarget =
+        domWindow.visualViewport ?? domWindow;
+
+    late FullPageDimensionsProvider provider;
+
+    setUp(() {
+      provider = FullPageDimensionsProvider();
+    });
+
+    test('funnels resize events on resizeEventTarget', () {
+      final Future<Object?> event = provider.onResize.first;
+
+      final Future<List<Object?>> events = provider.onResize.take(3).toList();
+
+      resizeEventTarget.dispatchEvent(createDomEvent('Event', 'resize'));
+      resizeEventTarget.dispatchEvent(createDomEvent('Event', 'resize'));
+      resizeEventTarget.dispatchEvent(createDomEvent('Event', 'resize'));
+
+      expect(event, completes);
+      expect(events, completes);
+      expect(events, completion(hasLength(3)));
+    });
+
+    test('closed by onHotRestart', () {
+      // Register an onDone listener for the stream
+      final Completer<bool> completer = Completer<bool>();
+      provider.onResize.listen(null, onDone: () {
+        completer.complete(true);
+      });
+
+      // Should close the stream
+      provider.close();
+
+      resizeEventTarget.dispatchEvent(createDomEvent('Event', 'resize'));
+
+      expect(provider.onResize.isEmpty, completion(isTrue));
+      expect(completer.future, completion(isTrue));
+    });
+  });
+}
diff --git a/lib/web_ui/test/engine/view_embedder/display_dpr_stream_test.dart b/lib/web_ui/test/engine/view_embedder/display_dpr_stream_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..a32ff78620fcf8b1c957ba3fb47cea3e609faef8
--- /dev/null
+++ b/lib/web_ui/test/engine/view_embedder/display_dpr_stream_test.dart
@@ -0,0 +1,45 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => doTests);
+}
+
+void doTests() {
+  final DomEventTarget eventTarget = createDomElement('div');
+
+  group('dprChanged Stream', () {
+    late DisplayDprStream dprStream;
+
+    setUp(() async {
+      dprStream = DisplayDprStream(EngineFlutterDisplay.instance,
+          overrides: DebugDisplayDprStreamOverrides(
+            getMediaQuery: (_) => eventTarget,
+          ));
+    });
+
+    test('funnels display DPR on every mediaQuery "change" event.', () async {
+      final Future<List<double>> dprs = dprStream.dprChanged
+          .take(3)
+          .timeout(const Duration(seconds: 1))
+          .toList();
+
+      // Simulate the events
+      EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(6.9);
+      eventTarget.dispatchEvent(createDomEvent('Event', 'change'));
+      EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(4.2);
+      eventTarget.dispatchEvent(createDomEvent('Event', 'change'));
+      EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(0.71);
+      eventTarget.dispatchEvent(createDomEvent('Event', 'change'));
+
+      expect(await dprs, <double>[6.9, 4.2, 0.71]);
+    });
+  });
+}
diff --git a/lib/web_ui/test/engine/view_embedder/dom_manager_test.dart b/lib/web_ui/test/engine/view_embedder/dom_manager_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..a07409bedb6fcb08d33aea83cbdab9a58fa9a8ad
--- /dev/null
+++ b/lib/web_ui/test/engine/view_embedder/dom_manager_test.dart
@@ -0,0 +1,149 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+@JS()
+library dom_manager_test; // We need this to mess with the ShadowDOM.
+import 'dart:js_interop';
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+
+import '../../common/matchers.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => doTests);
+}
+
+void doTests() {
+  group('DomManager', () {
+    test('DOM tree looks right', () {
+      final DomManager domManager = DomManager(devicePixelRatio: 3.0);
+
+      // Check tag names.
+
+      expect(domManager.rootElement.tagName, equalsIgnoringCase(DomManager.flutterViewTagName));
+      expect(domManager.platformViewsHost.tagName, equalsIgnoringCase(DomManager.glassPaneTagName));
+      expect(domManager.textEditingHost.tagName, equalsIgnoringCase(DomManager.textEditingHostTagName));
+      expect(domManager.semanticsHost.tagName, equalsIgnoringCase(DomManager.semanticsHostTagName));
+      expect(domManager.announcementsHost.tagName, equalsIgnoringCase(DomManager.announcementsHostTagName));
+
+      // Check parent-child relationships.
+
+      final List<DomElement> rootChildren = domManager.rootElement.children.toList();
+      expect(rootChildren.length, 4);
+      expect(rootChildren[0], domManager.platformViewsHost);
+      expect(rootChildren[1], domManager.textEditingHost);
+      expect(rootChildren[2], domManager.semanticsHost);
+      expect(rootChildren[3].tagName, equalsIgnoringCase('style'));
+
+      final List<DomElement> shadowChildren = domManager.renderingHost.childNodes.cast<DomElement>().toList();
+      expect(shadowChildren.length, 3);
+      expect(shadowChildren[0], domManager.sceneHost);
+      expect(shadowChildren[1], domManager.announcementsHost);
+      expect(shadowChildren[2].tagName, equalsIgnoringCase('style'));
+    });
+
+    test('hide placeholder text for textfield', () {
+      final DomManager domManager = DomManager(devicePixelRatio: 3.0);
+      domDocument.body!.append(domManager.rootElement);
+
+      final DomHTMLInputElement regularTextField = createDomHTMLInputElement();
+      regularTextField.placeholder = 'Now you see me';
+      domManager.rootElement.appendChild(regularTextField);
+
+      regularTextField.focus();
+      DomCSSStyleDeclaration? style = domWindow.getComputedStyle(
+          domManager.rootElement.querySelector('input')!,
+          '::placeholder');
+      expect(style, isNotNull);
+      expect(style.opacity, isNot('0'));
+
+      final DomHTMLInputElement textField = createDomHTMLInputElement();
+      textField.placeholder = 'Now you dont';
+      textField.classList.add('flt-text-editing');
+      domManager.rootElement.appendChild(textField);
+
+      textField.focus();
+      style = domWindow.getComputedStyle(
+          domManager.rootElement.querySelector('input.flt-text-editing')!,
+          '::placeholder');
+      expect(style, isNotNull);
+      expect(style.opacity, '0');
+
+      domManager.rootElement.remove();
+
+      // For some reason, only Firefox is able to correctly compute styles for
+      // the `::placeholder` pseudo-element.
+    }, skip: browserEngine != BrowserEngine.firefox);
+  });
+
+  group('Shadow root', () {
+    test('throws when shadowDom is not available', () {
+      final dynamic oldAttachShadow = attachShadow;
+      expect(oldAttachShadow, isNotNull);
+
+      attachShadow = null; // Break ShadowDOM
+
+      expect(() => DomManager(devicePixelRatio: 3.0), throwsAssertionError);
+      attachShadow = oldAttachShadow; // Restore ShadowDOM
+    });
+
+    test('Initializes and attaches a shadow root', () {
+      final DomManager domManager = DomManager(devicePixelRatio: 3.0);
+
+      expect(domInstanceOfString(domManager.renderingHost, 'ShadowRoot'), isTrue);
+      expect(domManager.renderingHost.host, domManager.platformViewsHost);
+      expect(domManager.renderingHost, domManager.platformViewsHost.shadowRoot);
+
+      // The shadow root should be initialized with correct parameters.
+      expect(domManager.renderingHost.mode, 'open');
+      if (browserEngine != BrowserEngine.firefox &&
+          browserEngine != BrowserEngine.webkit) {
+        // Older versions of Safari and Firefox don't support this flag yet.
+        // See: https://caniuse.com/mdn-api_shadowroot_delegatesfocus
+        expect(domManager.renderingHost.delegatesFocus, isFalse);
+      }
+    });
+
+    test('Attaches a stylesheet to the shadow root', () {
+      final DomManager domManager = DomManager(devicePixelRatio: 3.0);
+      final DomElement? style =
+          domManager.renderingHost.querySelector('#flt-internals-stylesheet');
+
+      expect(style, isNotNull);
+      expect(style!.tagName, equalsIgnoringCase('style'));
+      expect(style.parentNode, domManager.renderingHost);
+    });
+
+    test('setScene', () {
+      final DomManager domManager = DomManager(devicePixelRatio: 3.0);
+
+      final DomElement sceneHost =
+          domManager.renderingHost.querySelector('flt-scene-host')!;
+
+      final DomElement scene1 = createDomElement('flt-scene');
+      domManager.setScene(scene1);
+      expect(sceneHost.children, <DomElement>[scene1]);
+
+      // Insert the same scene again.
+      domManager.setScene(scene1);
+      expect(sceneHost.children, <DomElement>[scene1]);
+
+      // Insert a different scene.
+      final DomElement scene2 = createDomElement('flt-scene');
+      domManager.setScene(scene2);
+      expect(sceneHost.children, <DomElement>[scene2]);
+      expect(scene1.parent, isNull);
+    });
+  });
+}
+
+@JS('Element.prototype.attachShadow')
+external JSAny? get _attachShadow;
+dynamic get attachShadow => _attachShadow?.toObjectShallow;
+
+@JS('Element.prototype.attachShadow')
+external set _attachShadow(JSAny? x);
+set attachShadow(Object? x) => _attachShadow = x?.toJSAnyShallow;
diff --git a/lib/web_ui/test/engine/view_embedder/embedding_strategy/custom_element_embedding_strategy_test.dart b/lib/web_ui/test/engine/view_embedder/embedding_strategy/custom_element_embedding_strategy_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..fd28d14fe2ce01a2dbdd5a24f62e3ace157dd9f2
--- /dev/null
+++ b/lib/web_ui/test/engine/view_embedder/embedding_strategy/custom_element_embedding_strategy_test.dart
@@ -0,0 +1,81 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+@TestOn('browser')
+library;
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine/dom.dart';
+import 'package:ui/src/engine/view_embedder/embedding_strategy/custom_element_embedding_strategy.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => doTests);
+}
+
+void doTests() {
+  late CustomElementEmbeddingStrategy strategy;
+  late DomElement target;
+
+  group('initialize', () {
+    setUp(() {
+      target = createDomElement('this-is-the-target');
+      domDocument.body!.append(target);
+      strategy = CustomElementEmbeddingStrategy(target);
+    });
+
+    tearDown(() {
+      target.remove();
+    });
+
+    test('Prepares target environment', () {
+      expect(target.getAttribute('flt-embedding'), 'custom-element',
+          reason:
+              'Should identify itself as a specific key=value into the target element.');
+    });
+  });
+
+  group('attachViewRoot', () {
+    setUp(() {
+      target = createDomElement('this-is-the-target');
+      domDocument.body!.append(target);
+      strategy = CustomElementEmbeddingStrategy(target);
+    });
+
+    tearDown(() {
+      target.remove();
+    });
+
+    test('Should attach glasspane into embedder target (body)', () async {
+      final DomElement glassPane = createDomElement('some-tag-for-tests');
+      final DomCSSStyleDeclaration style = glassPane.style;
+
+      expect(glassPane.isConnected, isFalse);
+      expect(style.position, '',
+          reason: 'Should not have any specific position.');
+      expect(style.width, '', reason: 'Should not have any size set.');
+
+      strategy.attachViewRoot(glassPane);
+
+      // Assert injection into <body>
+      expect(glassPane.isConnected, isTrue,
+          reason: 'Should inject glassPane into the document.');
+      expect(glassPane.parent, target,
+          reason: 'Should inject glassPane into the target element');
+
+      final DomCSSStyleDeclaration styleAfter = glassPane.style;
+
+      // Assert required styling to cover the viewport
+      expect(styleAfter.position, 'relative',
+          reason: 'Should be relatively positioned.');
+      expect(styleAfter.display, 'block', reason: 'Should be display:block.');
+      expect(styleAfter.width, '100%',
+          reason: 'Should take 100% of the available width');
+      expect(styleAfter.height, '100%',
+          reason: 'Should take 100% of the available height');
+      expect(styleAfter.overflow, 'hidden',
+          reason: 'Should hide the occasional oversized canvas elements.');
+    });
+  });
+}
diff --git a/lib/web_ui/test/engine/view_embedder/embedding_strategy/embedding_strategy_test.dart b/lib/web_ui/test/engine/view_embedder/embedding_strategy/embedding_strategy_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..f254455ecd58aa9d480de0a3862bef621704a02b
--- /dev/null
+++ b/lib/web_ui/test/engine/view_embedder/embedding_strategy/embedding_strategy_test.dart
@@ -0,0 +1,37 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+@TestOn('browser')
+library;
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine/dom.dart';
+import 'package:ui/src/engine/view_embedder/embedding_strategy/custom_element_embedding_strategy.dart';
+import 'package:ui/src/engine/view_embedder/embedding_strategy/embedding_strategy.dart';
+import 'package:ui/src/engine/view_embedder/embedding_strategy/full_page_embedding_strategy.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => doTests);
+}
+
+void doTests() {
+  group('Factory', () {
+    test('Creates a FullPage instance when hostElement is null', () async {
+      final EmbeddingStrategy strategy = EmbeddingStrategy.create();
+
+      expect(strategy, isA<FullPageEmbeddingStrategy>());
+    });
+
+    test('Creates a CustomElement instance when hostElement is not null',
+        () async {
+      final DomElement element = createDomElement('some-random-element');
+      final EmbeddingStrategy strategy = EmbeddingStrategy.create(
+        hostElement: element,
+      );
+
+      expect(strategy, isA<CustomElementEmbeddingStrategy>());
+    });
+  });
+}
diff --git a/lib/web_ui/test/engine/view_embedder/embedding_strategy/full_page_embedding_strategy_test.dart b/lib/web_ui/test/engine/view_embedder/embedding_strategy/full_page_embedding_strategy_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..bb096227dbdd18ff39ebe6975be1760d0af0458c
--- /dev/null
+++ b/lib/web_ui/test/engine/view_embedder/embedding_strategy/full_page_embedding_strategy_test.dart
@@ -0,0 +1,91 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+@TestOn('browser')
+library;
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine/dom.dart';
+import 'package:ui/src/engine/view_embedder/embedding_strategy/full_page_embedding_strategy.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => doTests);
+}
+
+void doTests() {
+  group('initialize', () {
+    test('Prepares target environment', () {
+      final DomElement target = domDocument.body!;
+      final DomHTMLMetaElement meta = createDomHTMLMetaElement();
+      meta
+        ..id = 'my_viewport_meta_for_testing'
+        ..name = 'viewport'
+        ..content = 'width=device-width, initial-scale=1.0, '
+            'maximum-scale=1.0, user-scalable=no';
+      domDocument.head!.append(meta);
+
+      DomElement? userMeta =
+          domDocument.querySelector('#my_viewport_meta_for_testing');
+
+      expect(userMeta, isNotNull);
+
+      // ignore: unused_local_variable
+      final FullPageEmbeddingStrategy strategy = FullPageEmbeddingStrategy();
+
+      expect(target.getAttribute('flt-embedding'), 'full-page',
+          reason:
+              'Should identify itself as a specific key=value into the target element.');
+
+      // Locate the viewport metas again...
+      userMeta = domDocument.querySelector('#my_viewport_meta_for_testing');
+
+      final DomElement? flutterMeta =
+          domDocument.querySelector('meta[name="viewport"]');
+
+      expect(userMeta, isNull,
+          reason: 'Should delete previously existing viewport meta tags.');
+      expect(flutterMeta, isNotNull);
+      expect(flutterMeta!.hasAttribute('flt-viewport'), isTrue,
+          reason: 'Should install flutter viewport meta tag.');
+    });
+  });
+
+  group('attachViewRoot', () {
+    test('Should attach glasspane into embedder target (body)', () async {
+      final FullPageEmbeddingStrategy strategy = FullPageEmbeddingStrategy();
+
+      final DomElement glassPane = createDomElement('some-tag-for-tests');
+      final DomCSSStyleDeclaration style = glassPane.style;
+
+      expect(glassPane.isConnected, isFalse);
+      expect(style.position, '',
+          reason: 'Should not have any specific position.');
+      expect(style.top, '',
+          reason:
+              'Should not have any top/right/bottom/left positioning/inset.');
+
+      strategy.attachViewRoot(glassPane);
+
+      // Assert injection into <body>
+      expect(glassPane.isConnected, isTrue,
+          reason: 'Should inject glassPane into the document.');
+      expect(glassPane.parent, domDocument.body,
+          reason: 'Should inject glassPane into the <body>');
+
+      final DomCSSStyleDeclaration styleAfter = glassPane.style;
+
+      // Assert required styling to cover the viewport
+      expect(styleAfter.position, 'absolute',
+          reason: 'Should be absolutely positioned.');
+      expect(styleAfter.top, '0px', reason: 'Should cover the whole viewport.');
+      expect(styleAfter.right, '0px',
+          reason: 'Should cover the whole viewport.');
+      expect(styleAfter.bottom, '0px',
+          reason: 'Should cover the whole viewport.');
+      expect(styleAfter.left, '0px',
+          reason: 'Should cover the whole viewport.');
+    });
+  });
+}
diff --git a/lib/web_ui/test/engine/view_embedder/flutter_view_manager_test.dart b/lib/web_ui/test/engine/view_embedder/flutter_view_manager_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..5dbec513268d0bf0d201288c3be3951e6a2071a6
--- /dev/null
+++ b/lib/web_ui/test/engine/view_embedder/flutter_view_manager_test.dart
@@ -0,0 +1,115 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'dart:js_util';
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+
+import '../../common/matchers.dart';
+import '../../html/image_test.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => doTests);
+}
+
+Future<void> doTests() async {
+  group('FlutterViewManager', () {
+    final EnginePlatformDispatcher platformDispatcher = EnginePlatformDispatcher.instance;
+    final FlutterViewManager viewManager = FlutterViewManager(platformDispatcher);
+
+    group('registerView', () {
+      test('can register view', () {
+        final EngineFlutterView view = EngineFlutterView(platformDispatcher, createDomElement('div'));
+        final int viewId = view.viewId;
+
+        viewManager.registerView(view);
+
+        expect(viewManager[viewId], view);
+      });
+
+      test('fails if the same viewId is already registered', () {
+        final EngineFlutterView view = EngineFlutterView(platformDispatcher, createDomElement('div'));
+
+        viewManager.registerView(view);
+
+        expect(() { viewManager.registerView(view); }, throwsAssertionError);
+      });
+
+      test('stores JSOptions that getOptions can retrieve', () {
+        final EngineFlutterView view = EngineFlutterView(platformDispatcher, createDomElement('div'));
+        final int viewId = view.viewId;
+        final JsFlutterViewOptions expectedOptions = jsify(<String, Object?>{
+          'hostElement': createDomElement('div'),
+        }) as JsFlutterViewOptions;
+
+        viewManager.registerView(view, jsViewOptions: expectedOptions);
+
+        final JsFlutterViewOptions? storedOptions = viewManager.getOptions(viewId);
+        expect(storedOptions, expectedOptions);
+      });
+    });
+
+    group('unregisterView', () {
+      test('unregisters a view', () {
+        final EngineFlutterView view = EngineFlutterView(platformDispatcher, createDomElement('div'));
+        final int viewId = view.viewId;
+
+        viewManager.registerView(view);
+        expect(viewManager[viewId], isNotNull);
+
+        viewManager.unregisterView(viewId);
+        expect(viewManager[viewId], isNull);
+      });
+    });
+
+    group('onViewsChanged', () {
+      // Prepares a "timed-out" version of the onViewsChanged Stream so tests
+      // can't hang "forever" waiting for this to complete. This stream will close
+      // after 100ms of inactivity, regardless of what the test or the code do.
+      final Stream<int> onViewCreated = viewManager.onViewCreated.timeout(
+          const Duration(milliseconds: 100), onTimeout: (EventSink<int> sink) {
+        sink.close();
+      });
+
+      final Stream<int> onViewDisposed = viewManager.onViewDisposed.timeout(
+          const Duration(milliseconds: 100), onTimeout: (EventSink<int> sink) {
+        sink.close();
+      });
+
+      test('on view registered/unregistered - fires event', () async {
+        final EngineFlutterView view = EngineFlutterView(platformDispatcher, createDomElement('div'));
+        final int viewId = view.viewId;
+
+        final Future<List<void>> viewCreatedEvents = onViewCreated.toList();
+        final Future<List<void>> viewDisposedEvents = onViewDisposed.toList();
+        viewManager.registerView(view);
+        viewManager.unregisterView(viewId);
+
+        expect(viewCreatedEvents, completes);
+        expect(viewDisposedEvents, completes);
+
+        final List<void> createdViewsList = await viewCreatedEvents;
+        final List<void> disposedViewsList = await viewCreatedEvents;
+
+        expect(createdViewsList, listEqual(<int>[viewId]),
+            reason: 'Should fire creation event for view');
+        expect(disposedViewsList, listEqual(<int>[viewId]),
+            reason: 'Should fire dispose event for view');
+      });
+    });
+
+    group('viewIdForRootElement', () {
+      test('works', () {
+        final EngineFlutterView view = EngineFlutterView(platformDispatcher, createDomElement('div'));
+        final int viewId = view.viewId;
+        viewManager.registerView(view);
+
+        expect(viewManager.viewIdForRootElement(view.dom.rootElement), viewId);
+      });
+    });
+  });
+}
diff --git a/lib/web_ui/test/engine/view_embedder/flutter_views_proxy_test.dart b/lib/web_ui/test/engine/view_embedder/flutter_views_proxy_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..230d655d17e4d2287cb0f5d4bfd61461dee97b07
--- /dev/null
+++ b/lib/web_ui/test/engine/view_embedder/flutter_views_proxy_test.dart
@@ -0,0 +1,107 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'dart:js_interop';
+import 'dart:math' as math;
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui_web/src/ui_web.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => doTests);
+}
+
+Future<void> doTests() async {
+  group('FlutterViewManagerProxy', () {
+    final EnginePlatformDispatcher platformDispatcher =
+        EnginePlatformDispatcher.instance;
+    final FlutterViewManager viewManager =
+        FlutterViewManager(platformDispatcher);
+    final FlutterViewManagerProxy views =
+        FlutterViewManagerProxy(viewManager: viewManager);
+
+    late EngineFlutterView view;
+    late int viewId;
+    late DomElement hostElement;
+
+    int registerViewWithOptions(Map<String, Object?> options) {
+      final JsFlutterViewOptions jsOptions =
+          options.toJSAnyDeep as JsFlutterViewOptions;
+      viewManager.registerView(view, jsViewOptions: jsOptions);
+      return viewId;
+    }
+
+    setUp(() {
+      view = EngineFlutterView(platformDispatcher, createDomElement('div'));
+      viewId = view.viewId;
+      hostElement = createDomElement('div');
+    });
+
+    tearDown(() {
+      viewManager.unregisterView(viewId);
+    });
+
+    group('getHostElement', () {
+      test('null when viewId is unknown', () {
+        final JSAny? element = views.getHostElement(33930);
+        expect(element, isNull);
+      });
+
+      test('can retrieve hostElement for a known view', () {
+        final int viewId = registerViewWithOptions(<String, Object?>{
+          'hostElement': hostElement,
+        });
+
+        final JSAny? element = views.getHostElement(viewId);
+
+        expect(element, hostElement);
+      });
+    });
+
+    group('getInitialData', () {
+      test('null when viewId is unknown', () {
+        final JSAny? element = views.getInitialData(33930);
+        expect(element, isNull);
+      });
+
+      test('can retrieve initialData for a known view', () {
+        final int viewId = registerViewWithOptions(<String, Object?>{
+          'hostElement': hostElement,
+          'initialData': <String, Object?>{
+            'someInt': 42,
+            'someString': 'A String',
+            'decimals': <double>[math.pi, math.e],
+          },
+        });
+
+        final InitialData? element =
+            views.getInitialData(viewId) as InitialData?;
+
+        expect(element, isNotNull);
+        expect(element!.someInt, 42);
+        expect(element.someString, 'A String');
+        expect(element.decimals, <double>[math.pi, math.e]);
+      });
+    });
+  });
+}
+
+// The JS-interop definition of the `initialData` object passed to the views of this app.
+@JS()
+@staticInterop
+class InitialData {}
+
+/// The attributes of the [InitialData] object.
+extension InitialDataExtension on InitialData {
+  external int get someInt;
+  external String? get someString;
+
+  @JS('decimals')
+  external JSArray<JSNumber> get _decimals;
+  List<double> get decimals =>
+      _decimals.toDart.map((JSNumber e) => e.toDartDouble).toList();
+}
diff --git a/lib/web_ui/test/engine/view_embedder/global_html_attributes_test.dart b/lib/web_ui/test/engine/view_embedder/global_html_attributes_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..f31ab0ed6a90c51acd819f9a9071243625418fb8
--- /dev/null
+++ b/lib/web_ui/test/engine/view_embedder/global_html_attributes_test.dart
@@ -0,0 +1,48 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => doTests);
+}
+
+void doTests() {
+  group('GlobalHtmlAttributes', () {
+    test('applies global attributes to the root and host elements', () {
+      final DomElement hostElement = createDomElement('host-element');
+      final DomElement rootElement = createDomElement('root-element');
+      final GlobalHtmlAttributes globalHtmlAttributes = GlobalHtmlAttributes(
+        rootElement: rootElement,
+        hostElement: hostElement,
+      );
+
+      globalHtmlAttributes.applyAttributes(
+        viewId: 123,
+        autoDetectRenderer: true,
+        rendererTag: 'canvaskit',
+        buildMode: 'release',
+      );
+
+      expect(rootElement.getAttribute('flt-view-id'), '123');
+      expect(hostElement.getAttribute('flt-renderer'), 'canvaskit (auto-selected)');
+      expect(hostElement.getAttribute('flt-build-mode'), 'release');
+      expect(hostElement.getAttribute('spellcheck'), 'false');
+
+      globalHtmlAttributes.applyAttributes(
+        viewId: 456,
+        autoDetectRenderer: false,
+        rendererTag: 'html',
+        buildMode: 'debug',
+      );
+
+      expect(rootElement.getAttribute('flt-view-id'), '456');
+      expect(hostElement.getAttribute('flt-renderer'), 'html (requested explicitly)');
+      expect(hostElement.getAttribute('flt-build-mode'), 'debug');
+      expect(hostElement.getAttribute('spellcheck'), 'false');
+    });
+  });
+}
diff --git a/lib/web_ui/test/engine/view_embedder/hot_restart_cache_handler_test.dart b/lib/web_ui/test/engine/view_embedder/hot_restart_cache_handler_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..6c1ccac606082742569125d69d02f94f8073cab7
--- /dev/null
+++ b/lib/web_ui/test/engine/view_embedder/hot_restart_cache_handler_test.dart
@@ -0,0 +1,102 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+@TestOn('browser')
+library;
+
+import 'dart:js_interop';
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine/dom.dart';
+import 'package:ui/src/engine/view_embedder/hot_restart_cache_handler.dart';
+
+@JS('window.__flutterState')
+external JSArray<JSAny?>? get _jsHotRestartStore;
+
+@JS('window.__flutterState')
+external set _jsHotRestartStore(JSArray<JSAny?>? nodes);
+
+void main() {
+  internalBootstrapBrowserTest(() => doTests);
+}
+
+void doTests() {
+  tearDown(() {
+    _jsHotRestartStore = null;
+  });
+
+  group('registerElementForCleanup', () {
+    test('stores elements in a global cache', () async {
+      final DomElement toBeCached = createDomElement('some-element-to-cache');
+      final DomElement other = createDomElement('other-element-to-cache');
+      final DomElement another = createDomElement('another-element-to-cache');
+
+      registerElementForCleanup(toBeCached);
+      registerElementForCleanup(other);
+      registerElementForCleanup(another);
+
+      expect(_jsHotRestartStore!.toDart, <DomElement>[
+        toBeCached,
+        other,
+        another,
+      ]);
+    });
+  });
+
+  group('HotRestartCacheHandler Constructor', () {
+    test('Creates a cache in the JS environment', () async {
+      HotRestartCacheHandler();
+
+      expect(_jsHotRestartStore, isNotNull);
+      // For dart2wasm, we have to check the length this way.
+      expect(_jsHotRestartStore!.length, 0.toJS);
+    });
+  });
+
+  group('HotRestartCacheHandler.registerElement', () {
+    late HotRestartCacheHandler cache;
+
+    setUp(() {
+      cache = HotRestartCacheHandler();
+    });
+
+    test('Registers an element in the DOM cache', () async {
+      final DomElement element = createDomElement('for-test');
+      cache.registerElement(element);
+
+      expect(_jsHotRestartStore!.toDart, <DomElement>[element]);
+    });
+
+    test('Registers elements in the DOM cache', () async {
+      final DomElement element = createDomElement('for-test');
+      domDocument.body!.append(element);
+
+      cache.registerElement(element);
+
+      expect(_jsHotRestartStore!.toDart, <DomElement>[element]);
+    });
+
+    test('Clears registered elements from the DOM and the cache upon restart',
+        () async {
+      final DomElement element = createDomElement('for-test');
+      final DomElement element2 = createDomElement('for-test-two');
+      domDocument.body!.append(element);
+      domDocument.body!.append(element2);
+
+      cache.registerElement(element);
+
+      expect(element.isConnected, isTrue);
+      expect(element2.isConnected, isTrue);
+
+      // Simulate a hot restart...
+      cache = HotRestartCacheHandler();
+
+      // For dart2wasm, we have to check the length this way.
+      expect(_jsHotRestartStore!.length, 0.toJS);
+      expect(element.isConnected, isFalse); // Removed
+      expect(element2.isConnected, isTrue);
+    });
+  });
+}
diff --git a/lib/web_ui/test/engine/view_embedder/style_manager_test.dart b/lib/web_ui/test/engine/view_embedder/style_manager_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..97634fef7c0067487e79ccfdbc69765867ce0d1f
--- /dev/null
+++ b/lib/web_ui/test/engine/view_embedder/style_manager_test.dart
@@ -0,0 +1,81 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+
+import '../../common/matchers.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => doTests);
+}
+
+void doTests() {
+  group('StyleManager', () {
+    test('attachGlobalStyles hides the outline when focused', () {
+      final DomElement flutterViewElement = createDomElement(DomManager.flutterViewTagName);
+
+      domDocument.body!.append(flutterViewElement);
+      StyleManager.attachGlobalStyles(
+        node: flutterViewElement,
+        styleId: 'testing',
+        styleNonce: 'testing',
+        cssSelectorPrefix: DomManager.flutterViewTagName,
+      );
+      final String expected = browserEngine == BrowserEngine.firefox
+        ? 'rgb(0, 0, 0) 0px'
+        : 'rgb(0, 0, 0) none 0px';
+      final String got  = domWindow.getComputedStyle(flutterViewElement, 'focus').outline;
+
+      expect(got, expected);
+    });
+
+    test('styleSceneHost', () {
+      expect(
+        () => StyleManager.styleSceneHost(createDomHTMLDivElement()),
+        throwsAssertionError,
+      );
+
+      final DomElement sceneHost = createDomElement('flt-scene-host');
+      StyleManager.styleSceneHost(sceneHost);
+      expect(sceneHost.style.pointerEvents, 'none');
+      expect(sceneHost.style.opacity, isEmpty);
+
+      final DomElement sceneHost2 = createDomElement('flt-scene-host');
+      StyleManager.styleSceneHost(sceneHost2, debugShowSemanticsNodes: true);
+      expect(sceneHost2.style.pointerEvents, 'none');
+      expect(sceneHost2.style.opacity, isNotEmpty);
+    });
+
+    test('styleSemanticsHost', () {
+      expect(
+        () => StyleManager.styleSemanticsHost(createDomHTMLDivElement(), 1.0),
+        throwsAssertionError,
+        reason: 'Only accepts a <flt-semantics-host> element.'
+      );
+
+      final DomElement semanticsHost = createDomElement('flt-semantics-host');
+      StyleManager.styleSemanticsHost(semanticsHost, 4.0);
+      expect(semanticsHost.style.transform, 'scale(0.25)');
+      expect(semanticsHost.style.position, 'absolute');
+      expect(semanticsHost.style.transformOrigin, anyOf('0px 0px 0px', '0px 0px'));
+    });
+
+    test('scaleSemanticsHost', () {
+      expect(
+        () => StyleManager.scaleSemanticsHost(createDomHTMLDivElement(), 1.0),
+        throwsAssertionError,
+        reason: 'Only accepts a <flt-semantics-host> element.'
+      );
+
+      final DomElement semanticsHost = createDomElement('flt-semantics-host');
+      StyleManager.scaleSemanticsHost(semanticsHost, 5.0);
+      expect(semanticsHost.style.transform, 'scale(0.2)');
+      // Didn't set other styles.
+      expect(semanticsHost.style.position, isEmpty);
+      expect(semanticsHost.style.transformOrigin, isEmpty);
+    });
+  });
+}
diff --git a/lib/web_ui/test/engine/window_test.dart b/lib/web_ui/test/engine/window_test.dart
index a696fd6c33ba82e4750d8e4edb16a12054555413..522cc5742c4777e00dfd8387ccac5536ab7c6c47 100644
--- a/lib/web_ui/test/engine/window_test.dart
+++ b/lib/web_ui/test/engine/window_test.dart
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import 'dart:async';
+import 'dart:js_interop';
 import 'dart:js_util' as js_util;
 import 'dart:typed_data';
 
@@ -11,6 +12,8 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
 
+import '../common/matchers.dart';
+
 const int kPhysicalKeyA = 0x00070004;
 const int kLogicalKeyA = 0x00000000061;
 
@@ -19,7 +22,19 @@ void main() {
 }
 
 Future<void> testMain() async {
-  await ui.webOnlyInitializePlatform();
+  late EngineFlutterWindow myWindow;
+  final EnginePlatformDispatcher dispatcher = EnginePlatformDispatcher.instance;
+
+  setUp(() {
+    myWindow = EngineFlutterView.implicit(dispatcher, createDomHTMLDivElement());
+    dispatcher.viewManager.registerView(myWindow);
+  });
+
+  tearDown(() async {
+    dispatcher.viewManager.unregisterView(myWindow.viewId);
+    await myWindow.resetHistory();
+    myWindow.dispose();
+  });
 
   test('onTextScaleFactorChanged preserves the zone', () {
     final Zone innerZone = Zone.current.fork();
@@ -28,10 +43,10 @@ Future<void> testMain() async {
       void callback() {
         expect(Zone.current, innerZone);
       }
-      window.onTextScaleFactorChanged = callback;
+      myWindow.onTextScaleFactorChanged = callback;
 
       // Test that the getter returns the exact same callback, e.g. it doesn't wrap it.
-      expect(window.onTextScaleFactorChanged, same(callback));
+      expect(myWindow.onTextScaleFactorChanged, same(callback));
     });
 
     EnginePlatformDispatcher.instance.invokeOnTextScaleFactorChanged();
@@ -44,10 +59,10 @@ Future<void> testMain() async {
       void callback() {
         expect(Zone.current, innerZone);
       }
-      window.onPlatformBrightnessChanged = callback;
+      myWindow.onPlatformBrightnessChanged = callback;
 
       // Test that the getter returns the exact same callback, e.g. it doesn't wrap it.
-      expect(window.onPlatformBrightnessChanged, same(callback));
+      expect(myWindow.onPlatformBrightnessChanged, same(callback));
     });
 
     EnginePlatformDispatcher.instance.invokeOnPlatformBrightnessChanged();
@@ -60,10 +75,10 @@ Future<void> testMain() async {
       void callback() {
         expect(Zone.current, innerZone);
       }
-      window.onMetricsChanged = callback;
+      myWindow.onMetricsChanged = callback;
 
       // Test that the getter returns the exact same callback, e.g. it doesn't wrap it.
-      expect(window.onMetricsChanged, same(callback));
+      expect(myWindow.onMetricsChanged, same(callback));
     });
 
     EnginePlatformDispatcher.instance.invokeOnMetricsChanged();
@@ -76,10 +91,10 @@ Future<void> testMain() async {
       void callback() {
         expect(Zone.current, innerZone);
       }
-      window.onLocaleChanged = callback;
+      myWindow.onLocaleChanged = callback;
 
       // Test that the getter returns the exact same callback, e.g. it doesn't wrap it.
-      expect(window.onLocaleChanged, same(callback));
+      expect(myWindow.onLocaleChanged, same(callback));
     });
 
     EnginePlatformDispatcher.instance.invokeOnLocaleChanged();
@@ -92,10 +107,10 @@ Future<void> testMain() async {
       void callback(Duration _) {
         expect(Zone.current, innerZone);
       }
-      window.onBeginFrame = callback;
+      myWindow.onBeginFrame = callback;
 
       // Test that the getter returns the exact same callback, e.g. it doesn't wrap it.
-      expect(window.onBeginFrame, same(callback));
+      expect(myWindow.onBeginFrame, same(callback));
     });
 
     EnginePlatformDispatcher.instance.invokeOnBeginFrame(Duration.zero);
@@ -108,10 +123,10 @@ Future<void> testMain() async {
       void callback(List<dynamic> _) {
         expect(Zone.current, innerZone);
       }
-      window.onReportTimings = callback;
+      myWindow.onReportTimings = callback;
 
       // Test that the getter returns the exact same callback, e.g. it doesn't wrap it.
-      expect(window.onReportTimings, same(callback));
+      expect(myWindow.onReportTimings, same(callback));
     });
 
     EnginePlatformDispatcher.instance.invokeOnReportTimings(<ui.FrameTiming>[]);
@@ -124,10 +139,10 @@ Future<void> testMain() async {
       void callback() {
         expect(Zone.current, innerZone);
       }
-      window.onDrawFrame = callback;
+      myWindow.onDrawFrame = callback;
 
       // Test that the getter returns the exact same callback, e.g. it doesn't wrap it.
-      expect(window.onDrawFrame, same(callback));
+      expect(myWindow.onDrawFrame, same(callback));
     });
 
     EnginePlatformDispatcher.instance.invokeOnDrawFrame();
@@ -140,10 +155,10 @@ Future<void> testMain() async {
       void callback(ui.PointerDataPacket _) {
         expect(Zone.current, innerZone);
       }
-      window.onPointerDataPacket = callback;
+      myWindow.onPointerDataPacket = callback;
 
       // Test that the getter returns the exact same callback, e.g. it doesn't wrap it.
-      expect(window.onPointerDataPacket, same(callback));
+      expect(myWindow.onPointerDataPacket, same(callback));
     });
 
     EnginePlatformDispatcher.instance.invokeOnPointerDataPacket(const ui.PointerDataPacket());
@@ -173,11 +188,11 @@ Future<void> testMain() async {
         expect(Zone.current, innerZone);
         return false;
       }
-      window.onKeyData = onKeyData;
+      myWindow.onKeyData = onKeyData;
 
       // Test that the getter returns the exact same onKeyData, e.g. it doesn't
       // wrap it.
-      expect(window.onKeyData, same(onKeyData));
+      expect(myWindow.onKeyData, same(onKeyData));
     });
 
     const  ui.KeyData keyData = ui.KeyData(
@@ -192,7 +207,7 @@ Future<void> testMain() async {
       expect(result, isFalse);
     });
 
-    window.onKeyData = null;
+    myWindow.onKeyData = null;
   });
 
   test('onSemanticsEnabledChanged preserves the zone', () {
@@ -202,26 +217,26 @@ Future<void> testMain() async {
       void callback() {
         expect(Zone.current, innerZone);
       }
-      window.onSemanticsEnabledChanged = callback;
+      myWindow.onSemanticsEnabledChanged = callback;
 
       // Test that the getter returns the exact same callback, e.g. it doesn't wrap it.
-      expect(window.onSemanticsEnabledChanged, same(callback));
+      expect(myWindow.onSemanticsEnabledChanged, same(callback));
     });
 
     EnginePlatformDispatcher.instance.invokeOnSemanticsEnabledChanged();
   });
 
-  test('onSemanticsAction preserves the zone', () {
+  test('onSemanticsActionEvent preserves the zone', () {
     final Zone innerZone = Zone.current.fork();
 
     innerZone.runGuarded(() {
-      void callback(int _, ui.SemanticsAction __, ByteData? ___) {
+      void callback(ui.SemanticsActionEvent _) {
         expect(Zone.current, innerZone);
       }
-      window.onSemanticsAction = callback;
+      ui.PlatformDispatcher.instance.onSemanticsActionEvent = callback;
 
       // Test that the getter returns the exact same callback, e.g. it doesn't wrap it.
-      expect(window.onSemanticsAction, same(callback));
+      expect(ui.PlatformDispatcher.instance.onSemanticsActionEvent, same(callback));
     });
 
     EnginePlatformDispatcher.instance.invokeOnSemanticsAction(0, ui.SemanticsAction.tap, null);
@@ -234,10 +249,10 @@ Future<void> testMain() async {
       void callback() {
         expect(Zone.current, innerZone);
       }
-      window.onAccessibilityFeaturesChanged = callback;
+      myWindow.onAccessibilityFeaturesChanged = callback;
 
       // Test that the getter returns the exact same callback, e.g. it doesn't wrap it.
-      expect(window.onAccessibilityFeaturesChanged, same(callback));
+      expect(myWindow.onAccessibilityFeaturesChanged, same(callback));
     });
 
     EnginePlatformDispatcher.instance.invokeOnAccessibilityFeaturesChanged();
@@ -250,10 +265,10 @@ Future<void> testMain() async {
       void callback(String _, ByteData? __, void Function(ByteData?)? ___) {
         expect(Zone.current, innerZone);
       }
-      window.onPlatformMessage = callback;
+      myWindow.onPlatformMessage = callback;
 
       // Test that the getter returns the exact same callback, e.g. it doesn't wrap it.
-      expect(window.onPlatformMessage, same(callback));
+      expect(myWindow.onPlatformMessage, same(callback));
     });
 
     EnginePlatformDispatcher.instance.invokeOnPlatformMessage('foo', null, (ByteData? data) {
@@ -268,7 +283,7 @@ Future<void> testMain() async {
     innerZone.runGuarded(() {
       final ByteData inputData = ByteData(4);
       inputData.setUint32(0, 42);
-      window.sendPlatformMessage(
+      myWindow.sendPlatformMessage(
         'flutter/debug-echo',
         inputData,
         (ByteData? outputData) {
@@ -286,7 +301,7 @@ Future<void> testMain() async {
 
     final ByteData inputData = ByteData(4);
     inputData.setUint32(0, 42);
-    window.sendPlatformMessage(
+    myWindow.sendPlatformMessage(
       'flutter/__unknown__channel__',
       null,
       (ByteData? outputData) {
@@ -307,7 +322,7 @@ Future<void> testMain() async {
       orientations,
     ));
 
-    window.sendPlatformMessage(
+    myWindow.sendPlatformMessage(
       'flutter/platform',
       inputData,
       (ByteData? outputData) {
@@ -321,7 +336,7 @@ Future<void> testMain() async {
 
   // Regression test for https://github.com/flutter/flutter/issues/88269
   test('sets preferred screen orientation', () async {
-    final DomScreen original = domWindow.screen!;
+    final DomScreen? original = domWindow.screen;
 
     final List<String> lockCalls = <String>[];
     int unlockCount = 0;
@@ -330,19 +345,18 @@ Future<void> testMain() async {
     // The `orientation` property cannot be overridden, so this test overrides the entire `screen`.
     js_util.setProperty(domWindow, 'screen', js_util.jsify(<Object?, Object?>{
       'orientation': <Object?, Object?>{
-        'lock': allowInterop((String lockType) {
+        'lock': (String lockType) {
           lockCalls.add(lockType);
-          return JsPromise(allowInterop((Function(Object? value) resolve, Function reject) {
-            if (!simulateError) {
-              resolve(null);
-            } else {
-              reject('Simulating error');
+          return futureToPromise(() async {
+            if (simulateError) {
+              throw Error();
             }
-          }));
-        }),
-        'unlock': allowInterop(() {
+            return 0.toJS;
+          }());
+        }.toJS,
+        'unlock': () {
           unlockCount += 1;
-        }),
+        }.toJS,
       },
     }));
 
@@ -357,25 +371,25 @@ Future<void> testMain() async {
     unlockCount = 0;
 
     expect(await sendSetPreferredOrientations(<dynamic>['DeviceOrientation.portraitUp']), isTrue);
-    expect(lockCalls, <String>[FlutterViewEmbedder.orientationLockTypePortraitPrimary]);
+    expect(lockCalls, <String>[ScreenOrientation.lockTypePortraitPrimary]);
     expect(unlockCount, 0);
     lockCalls.clear();
     unlockCount = 0;
 
     expect(await sendSetPreferredOrientations(<dynamic>['DeviceOrientation.portraitDown']), isTrue);
-    expect(lockCalls, <String>[FlutterViewEmbedder.orientationLockTypePortraitSecondary]);
+    expect(lockCalls, <String>[ScreenOrientation.lockTypePortraitSecondary]);
     expect(unlockCount, 0);
     lockCalls.clear();
     unlockCount = 0;
 
     expect(await sendSetPreferredOrientations(<dynamic>['DeviceOrientation.landscapeLeft']), isTrue);
-    expect(lockCalls, <String>[FlutterViewEmbedder.orientationLockTypeLandscapePrimary]);
+    expect(lockCalls, <String>[ScreenOrientation.lockTypeLandscapePrimary]);
     expect(unlockCount, 0);
     lockCalls.clear();
     unlockCount = 0;
 
     expect(await sendSetPreferredOrientations(<dynamic>['DeviceOrientation.landscapeRight']), isTrue);
-    expect(lockCalls, <String>[FlutterViewEmbedder.orientationLockTypeLandscapeSecondary]);
+    expect(lockCalls, <String>[ScreenOrientation.lockTypeLandscapeSecondary]);
     expect(unlockCount, 0);
     lockCalls.clear();
     unlockCount = 0;
@@ -388,7 +402,7 @@ Future<void> testMain() async {
 
     simulateError = true;
     expect(await sendSetPreferredOrientations(<dynamic>['DeviceOrientation.portraitDown']), isFalse);
-    expect(lockCalls, <String>[FlutterViewEmbedder.orientationLockTypePortraitSecondary]);
+    expect(lockCalls, <String>[ScreenOrientation.lockTypePortraitSecondary]);
     expect(unlockCount, 0);
 
     js_util.setProperty(domWindow, 'screen', original);
@@ -396,7 +410,7 @@ Future<void> testMain() async {
 
   /// Regression test for https://github.com/flutter/flutter/issues/66128.
   test("setPreferredOrientation responds even if browser doesn't support api", () async {
-    final DomScreen original = domWindow.screen!;
+    final DomScreen? original = domWindow.screen;
 
     // The `orientation` property cannot be overridden, so this test overrides the entire `screen`.
     js_util.setProperty(domWindow, 'screen', js_util.jsify(<Object?, Object?>{
@@ -410,38 +424,36 @@ Future<void> testMain() async {
   test('SingletonFlutterWindow implements locale, locales, and locale change notifications', () async {
     // This will count how many times we notified about locale changes.
     int localeChangedCount = 0;
-    window.onLocaleChanged = () {
+    myWindow.onLocaleChanged = () {
       localeChangedCount += 1;
     };
 
-    ensureFlutterViewEmbedderInitialized();
-
     // We populate the initial list of locales automatically (only test that we
     // got some locales; some contributors may be in different locales, so we
     // can't test the exact contents).
-    expect(window.locale, isA<ui.Locale>());
-    expect(window.locales, isNotEmpty);
+    expect(myWindow.locale, isA<ui.Locale>());
+    expect(myWindow.locales, isNotEmpty);
 
     // Trigger a change notification (reset locales because the notification
     // doesn't actually change the list of languages; the test only observes
     // that the list is populated again).
     EnginePlatformDispatcher.instance.debugResetLocales();
-    expect(window.locales, isEmpty);
-    expect(window.locale, equals(const ui.Locale.fromSubtags()));
+    expect(myWindow.locales, isEmpty);
+    expect(myWindow.locale, equals(const ui.Locale.fromSubtags()));
     expect(localeChangedCount, 0);
     domWindow.dispatchEvent(createDomEvent('Event', 'languagechange'));
-    expect(window.locales, isNotEmpty);
+    expect(myWindow.locales, isNotEmpty);
     expect(localeChangedCount, 1);
   });
 
   test('dispatches browser event on flutter/service_worker channel', () async {
     final Completer<void> completer = Completer<void>();
     domWindow.addEventListener('flutter-first-frame',
-        allowInterop((DomEvent e) => completer.complete()));
+        createDomEventListener((DomEvent e) => completer.complete()));
     final Zone innerZone = Zone.current.fork();
 
     innerZone.runGuarded(() {
-      window.sendPlatformMessage(
+      myWindow.sendPlatformMessage(
         'flutter/service_worker',
         ByteData(0),
         (ByteData? outputData) { },
@@ -450,4 +462,239 @@ Future<void> testMain() async {
 
     await expectLater(completer.future, completes);
   });
+
+  test('sets global html attributes', () {
+    final DomElement host = createDomHTMLDivElement();
+    final EngineFlutterView view = EngineFlutterView(dispatcher, host);
+
+    expect(host.getAttribute('flt-renderer'), 'html (requested explicitly)');
+    expect(host.getAttribute('flt-build-mode'), 'debug');
+
+    view.dispose();
+  });
+
+  test('in full-page mode, Flutter window replaces viewport meta tags', () {
+    final DomHTMLMetaElement existingMeta = createDomHTMLMetaElement()
+      ..name = 'viewport'
+      ..content = 'foo=bar';
+    domDocument.head!.append(existingMeta);
+    expect(existingMeta.isConnected, isTrue);
+
+    final EngineFlutterWindow implicitView = EngineFlutterView.implicit(dispatcher, null);
+    // The existing viewport meta tag should've been removed.
+    expect(existingMeta.isConnected, isFalse);
+    // And a new one should've been added.
+    final DomHTMLMetaElement? newMeta = domDocument.head!.querySelector('meta[name="viewport"]') as DomHTMLMetaElement?;
+    expect(newMeta, isNotNull);
+    newMeta!;
+    expect(newMeta.getAttribute('flt-viewport'), isNotNull);
+    expect(newMeta.name, 'viewport');
+    expect(newMeta.content, contains('width=device-width'));
+    expect(newMeta.content, contains('initial-scale=1.0'));
+    expect(newMeta.content, contains('maximum-scale=1.0'));
+    expect(newMeta.content, contains('user-scalable=no'));
+    implicitView.dispose();
+  });
+
+  test('auto-view-id', () {
+    final DomElement host = createDomHTMLDivElement();
+    final EngineFlutterView implicit1 = EngineFlutterView.implicit(dispatcher, host);
+    final EngineFlutterView implicit2 = EngineFlutterView.implicit(dispatcher, host);
+
+    expect(implicit1.viewId, kImplicitViewId);
+    expect(implicit2.viewId, kImplicitViewId);
+
+    final EngineFlutterView view1 = EngineFlutterView(dispatcher, host);
+    final EngineFlutterView view2 = EngineFlutterView(dispatcher, host);
+    final EngineFlutterView view3 = EngineFlutterView(dispatcher, host);
+
+    expect(view1.viewId, isNot(kImplicitViewId));
+    expect(view2.viewId, isNot(kImplicitViewId));
+    expect(view3.viewId, isNot(kImplicitViewId));
+
+    expect(view1.viewId, isNot(view2.viewId));
+    expect(view2.viewId, isNot(view3.viewId));
+    expect(view3.viewId, isNot(view1.viewId));
+
+    implicit1.dispose();
+    implicit2.dispose();
+    view1.dispose();
+    view2.dispose();
+    view3.dispose();
+  });
+
+  test('registration', () {
+    final DomHTMLDivElement host = createDomHTMLDivElement();
+    final EnginePlatformDispatcher dispatcher = EnginePlatformDispatcher();
+    expect(dispatcher.viewManager.views, isEmpty);
+
+    // Creating the view shouldn't register it.
+    final EngineFlutterView view = EngineFlutterView(dispatcher, host);
+    expect(dispatcher.viewManager.views, isEmpty);
+    dispatcher.viewManager.registerView(view);
+    expect(dispatcher.viewManager.views, <EngineFlutterView>[view]);
+
+    // Disposing the view shouldn't unregister it.
+    view.dispose();
+    expect(dispatcher.viewManager.views, <EngineFlutterView>[view]);
+
+    dispatcher.dispose();
+  });
+
+  test('dispose', () {
+    final DomHTMLDivElement host = createDomHTMLDivElement();
+    final EngineFlutterView view =
+        EngineFlutterView(EnginePlatformDispatcher.instance, host);
+
+    // First, let's make sure the view's root element was inserted into the
+    // host, and the dimensions provider is active.
+    expect(view.dom.rootElement.parentElement, host);
+    expect(view.dimensionsProvider.isClosed, isFalse);
+
+    // Now, let's dispose the view and make sure its root element was removed,
+    // and the dimensions provider is closed.
+    view.dispose();
+    expect(view.dom.rootElement.parentElement, isNull);
+    expect(view.dimensionsProvider.isClosed, isTrue);
+
+    // Can't render into a disposed view.
+    expect(
+      () => view.render(ui.SceneBuilder().build()),
+      throwsAssertionError,
+    );
+
+    // Can't update semantics on a disposed view.
+    expect(
+      () => view.updateSemantics(ui.SemanticsUpdateBuilder().build()),
+      throwsAssertionError,
+    );
+  });
+
+  group('resizing', () {
+    late DomHTMLDivElement host;
+    late EngineFlutterView view;
+    late int metricsChangedCount;
+
+    setUp(() async {
+      EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(2.5);
+      host = createDomHTMLDivElement();
+      view = EngineFlutterView(EnginePlatformDispatcher.instance, host);
+
+      host.style
+        ..width = '10px'
+        ..height = '10px';
+      domDocument.body!.append(host);
+
+      // Let the DOM settle before starting the test, so we don't get the first
+      // 10,10 Size in the test. Otherwise, the ResizeObserver may trigger
+      // unexpectedly after the test has started, and break our "first" result.
+      await view.onResize.first;
+
+      metricsChangedCount = 0;
+      view.platformDispatcher.onMetricsChanged = () {
+        metricsChangedCount++;
+      };
+    });
+
+    tearDown(() {
+      view.dispose();
+      host.remove();
+      EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(null);
+      view.platformDispatcher.onMetricsChanged = null;
+    });
+
+    test('listens to resize', () async {
+      // Initial size is 10x10, with a 2.5 dpr, is equal to 25x25 physical pixels.
+      expect(view.physicalSize, const ui.Size(25.0, 25.0));
+      expect(metricsChangedCount, 0);
+
+      // Simulate the browser resizing the host to 20x20.
+      host.style
+        ..width = '20px'
+        ..height = '20px';
+      await view.onResize.first;
+      expect(view.physicalSize, const ui.Size(50.0, 50.0));
+      expect(metricsChangedCount, 1);
+    });
+
+    test('maintains debugPhysicalSizeOverride', () async {
+      // Initial size is 10x10, with a 2.5 dpr, is equal to 25x25 physical pixels.
+      expect(view.physicalSize, const ui.Size(25.0, 25.0));
+
+      view.debugPhysicalSizeOverride = const ui.Size(100.0, 100.0);
+      view.debugForceResize();
+      expect(view.physicalSize, const ui.Size(100.0, 100.0));
+
+      // Resize the host to 20x20.
+      host.style
+        ..width = '20px'
+        ..height = '20px';
+      await view.onResize.first;
+      // The view should maintain the debugPhysicalSizeOverride.
+      expect(view.physicalSize, const ui.Size(100.0, 100.0));
+    });
+
+    test('can resize host', () async {
+      // Reset host style, so it tightly wraps the rootElement of the view.
+      // This style change will trigger a "onResize" event when all the DOM
+      // operations settle that we must await before taking measurements.
+      host.style
+        ..display = 'inline-block'
+        ..width = 'auto'
+        ..height = 'auto';
+
+      // Resize the host to 20x20 (physical pixels).
+      view.resize(const ui.Size.square(50));
+
+      await view.onResize.first;
+
+      // The host tightly wraps the rootElement:
+      expect(view.physicalSize, const ui.Size(50.0, 50.0));
+
+      // Inspect the rootElement directly:
+      expect(view.dom.rootElement.clientWidth, 50 / view.devicePixelRatio);
+      expect(view.dom.rootElement.clientHeight, 50 / view.devicePixelRatio);
+    });
+  });
+
+  group('physicalConstraints', () {
+    const double dpr = 2.5;
+    late DomHTMLDivElement host;
+    late EngineFlutterView view;
+
+    setUp(() async {
+      EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(dpr);
+      host = createDomHTMLDivElement()
+        ..style.width = '640px'
+        ..style.height = '480px';
+      domDocument.body!.append(host);
+    });
+
+    tearDown(() {
+      host.remove();
+      EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(null);
+    });
+
+    test('JsViewConstraints are passed and used to compute physicalConstraints', () async {
+      view = EngineFlutterView(
+        EnginePlatformDispatcher.instance,
+        host,
+        viewConstraints: JsViewConstraints(
+          minHeight: 320,
+          maxHeight: double.infinity,
+        ));
+
+      // All the metrics until now have been expressed in logical pixels, because
+      // they're coming from CSS/the browser, which works in logical pixels.
+      expect(view.physicalConstraints, const ViewConstraints(
+        minHeight: 320,
+        // ignore: avoid_redundant_argument_values
+        maxHeight: double.infinity,
+        minWidth: 640,
+        maxWidth: 640,
+      // However the framework expects physical pixels, so we multiply our expectations
+      // by the current DPR (2.5)
+      ) * dpr);
+    });
+  });
 }
diff --git a/lib/web_ui/test/engine/surface/frame_timings_test.dart b/lib/web_ui/test/fallbacks/fallbacks_test.dart
similarity index 46%
rename from lib/web_ui/test/engine/surface/frame_timings_test.dart
rename to lib/web_ui/test/fallbacks/fallbacks_test.dart
index c0c295057dd9603d5d530e923ef9f5db537ac77f..da9ac9a64fe1ef7bc7c4d22cac564c19611d1e84 100644
--- a/lib/web_ui/test/engine/surface/frame_timings_test.dart
+++ b/lib/web_ui/test/fallbacks/fallbacks_test.dart
@@ -2,22 +2,30 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+
 import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 
-import '../../frame_timings_common.dart';
+import '../common/test_initialization.dart';
+import '../ui/utils.dart';
 
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
 
-void testMain() {
-  setUp(() async {
-    await initializeEngine();
-  });
+Future<void> testMain() async {
+  setUpUnitTests(
+    setUpTestViewDimensions: false,
+  );
 
-  test('collects frame timings', () async {
-    await runFrameTimingsTest();
+  test('bootstrapper selects correct builds', () {
+    if (browserEngine == BrowserEngine.blink) {
+      expect(isWasm, isTrue);
+      expect(isSkwasm, isTrue);
+    } else {
+      expect(isWasm, isFalse);
+      expect(isCanvasKit, isTrue);
+    }
   });
 }
diff --git a/lib/web_ui/test/felt_config.yaml b/lib/web_ui/test/felt_config.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..2e20a355c3244685098b0ca90d92268e220ae38d
--- /dev/null
+++ b/lib/web_ui/test/felt_config.yaml
@@ -0,0 +1,284 @@
+# See the `README.md` in this directory for documentation on the structure of
+# this file.
+compile-configs:
+  - name: dart2js-html
+    compiler: dart2js
+    renderer: html
+
+  - name: dart2js-canvaskit
+    compiler: dart2js
+    renderer: canvaskit
+
+  - name: dart2js-skwasm
+    compiler: dart2js
+    renderer: skwasm
+
+  - name: dart2wasm-html
+    compiler: dart2wasm
+    renderer: html
+
+  - name: dart2wasm-canvaskit
+    compiler: dart2wasm
+    renderer: canvaskit
+
+  - name: dart2wasm-skwasm
+    compiler: dart2wasm
+    renderer: skwasm
+
+test-sets:
+  # Tests for non-renderer logic
+  - name: engine
+    directory: engine
+
+  # Tests for canvaskit-renderer-specific functionality
+  - name: canvaskit
+    directory: canvaskit
+
+  # Tests for html-renderer-specific functionality
+  - name: html
+    directory: html
+
+  # Tests for renderer functionality that can be run on any renderer
+  - name: ui
+    directory: ui
+
+  # Tests for fallback functionality between build variants
+  - name: fallbacks
+    directory: fallbacks
+
+test-bundles:
+  - name: dart2js-html-engine
+    test-set: engine
+    compile-configs: dart2js-html
+
+  - name: dart2js-html-html
+    test-set: html
+    compile-configs: dart2js-html
+
+  - name: dart2js-html-ui
+    test-set: ui
+    compile-configs: dart2js-html
+
+  - name: dart2js-canvaskit-canvaskit
+    test-set: canvaskit
+    compile-configs: dart2js-canvaskit
+
+  - name: dart2js-canvaskit-ui
+    test-set: ui
+    compile-configs: dart2js-canvaskit
+
+  - name: dart2wasm-html-engine
+    test-set: engine
+    compile-configs: dart2wasm-html
+
+  - name: dart2wasm-html-html
+    test-set: html
+    compile-configs: dart2wasm-html
+
+  - name: dart2wasm-html-ui
+    test-set: ui
+    compile-configs: dart2wasm-html
+
+  - name: dart2wasm-canvaskit-canvaskit
+    test-set: canvaskit
+    compile-configs: dart2wasm-canvaskit
+
+  - name: dart2wasm-canvaskit-ui
+    test-set: ui
+    compile-configs: dart2wasm-canvaskit
+
+  - name: dart2wasm-skwasm-ui
+    test-set: ui
+    compile-configs: dart2wasm-skwasm
+
+  - name: fallbacks
+    test-set: fallbacks
+    compile-configs:
+      - dart2wasm-skwasm
+      - dart2js-canvaskit
+
+run-configs:
+  - name: chrome
+    browser: chrome
+    canvaskit-variant: chromium
+
+  - name: chrome-full
+    browser: chrome
+    canvaskit-variant: full
+
+  - name: edge
+    browser: edge
+    canvaskit-variant: chromium
+
+  - name: edge-full
+    browser: edge
+    canvaskit-variant: full
+
+  - name: firefox
+    browser: firefox
+    canvaskit-variant: full
+
+  - name: safari
+    browser: safari
+    canvaskit-variant: full
+
+test-suites:
+  - name: chrome-dart2js-html-engine
+    test-bundle: dart2js-html-engine
+    run-config: chrome
+
+  - name: chrome-dart2js-html-html
+    test-bundle: dart2js-html-html
+    run-config: chrome
+
+  - name: chrome-dart2js-html-ui
+    test-bundle: dart2js-html-ui
+    run-config: chrome
+
+  - name: chrome-dart2js-canvaskit-canvaskit
+    test-bundle: dart2js-canvaskit-canvaskit
+    run-config: chrome
+    artifact-deps: [ canvaskit_chromium ]
+
+  - name: chrome-dart2js-canvaskit-ui
+    test-bundle: dart2js-canvaskit-ui
+    run-config: chrome
+    artifact-deps: [ canvaskit_chromium ]
+
+  - name: chrome-full-dart2js-canvaskit-canvaskit
+    test-bundle: dart2js-canvaskit-canvaskit
+    run-config: chrome-full
+    artifact-deps: [ canvaskit ]
+
+  - name: chrome-full-dart2js-canvaskit-ui
+    test-bundle: dart2js-canvaskit-ui
+    run-config: chrome-full
+    artifact-deps: [ canvaskit ]
+
+  - name: edge-dart2js-html-engine
+    test-bundle: dart2js-html-engine
+    run-config: edge
+
+  - name: edge-dart2js-html-html
+    test-bundle: dart2js-html-html
+    run-config: edge
+
+  - name: edge-dart2js-html-ui
+    test-bundle: dart2js-html-ui
+    run-config: edge
+
+  - name: edge-dart2js-canvaskit-canvaskit
+    test-bundle: dart2js-canvaskit-canvaskit
+    run-config: edge
+    artifact-deps: [ canvaskit_chromium ]
+
+  - name: edge-dart2js-canvaskit-ui
+    test-bundle: dart2js-canvaskit-ui
+    run-config: edge
+    artifact-deps: [ canvaskit_chromium ]
+
+  - name: edge-full-dart2js-canvaskit-canvaskit
+    test-bundle: dart2js-canvaskit-canvaskit
+    run-config: edge-full
+    artifact-deps: [ canvaskit ]
+
+  - name: edge-full-dart2js-canvaskit-ui
+    test-bundle: dart2js-canvaskit-ui
+    run-config: edge-full
+    artifact-deps: [ canvaskit ]
+
+  - name: firefox-dart2js-html-engine
+    test-bundle: dart2js-html-engine
+    run-config: firefox
+
+  - name: firefox-dart2js-html-html
+    test-bundle: dart2js-html-html
+    run-config: firefox
+
+  - name: firefox-dart2js-html-ui
+    test-bundle: dart2js-html-ui
+    run-config: firefox
+
+  - name: firefox-dart2js-canvaskit-canvaskit
+    test-bundle: dart2js-canvaskit-canvaskit
+    run-config: firefox
+    artifact-deps: [ canvaskit ]
+
+  - name: firefox-dart2js-canvaskit-ui
+    test-bundle: dart2js-canvaskit-ui
+    run-config: firefox
+    artifact-deps: [ canvaskit ]
+
+  - name: safari-dart2js-html-engine
+    test-bundle: dart2js-html-engine
+    run-config: safari
+
+  - name: safari-dart2js-html-html
+    test-bundle: dart2js-html-html
+    run-config: safari
+
+  - name: safari-dart2js-html-ui
+    test-bundle: dart2js-html-ui
+    run-config: safari
+
+  - name: safari-dart2js-canvaskit-canvaskit
+    test-bundle: dart2js-canvaskit-canvaskit
+    run-config: safari
+    artifact-deps: [ canvaskit ]
+
+  - name: safari-dart2js-canvaskit-ui
+    test-bundle: dart2js-canvaskit-ui
+    run-config: safari
+    artifact-deps: [ canvaskit ]
+
+  - name: chrome-dart2wasm-html-engine
+    test-bundle: dart2wasm-html-engine
+    run-config: chrome
+
+  - name: chrome-dart2wasm-html-html
+    test-bundle: dart2wasm-html-html
+    run-config: chrome
+
+  - name: chrome-dart2wasm-html-ui
+    test-bundle: dart2wasm-html-ui
+    run-config: chrome
+
+  - name: chrome-dart2wasm-canvaskit-canvaskit
+    test-bundle: dart2wasm-canvaskit-canvaskit
+    run-config: chrome
+    artifact-deps: [ canvaskit_chromium ]
+
+  - name: chrome-dart2wasm-canvaskit-ui
+    test-bundle: dart2wasm-canvaskit-ui
+    run-config: chrome
+    artifact-deps: [ canvaskit_chromium ]
+
+  - name: chrome-dart2wasm-skwasm-ui
+    test-bundle: dart2wasm-skwasm-ui
+    run-config: chrome
+    artifact-deps: [ skwasm ]
+
+  - name: chrome-full-dart2wasm-canvaskit-canvaskit
+    test-bundle: dart2wasm-canvaskit-canvaskit
+    run-config: chrome-full
+    artifact-deps: [ canvaskit ]
+
+  - name: chrome-full-dart2wasm-canvaskit-ui
+    test-bundle: dart2wasm-canvaskit-ui
+    run-config: chrome-full
+    artifact-deps: [ canvaskit ]
+
+  - name: chrome-fallbacks
+    test-bundle: fallbacks
+    run-config: chrome
+    artifact-deps: [ canvaskit, skwasm ]
+
+  - name: firefox-fallbacks
+    test-bundle: fallbacks
+    run-config: firefox
+    artifact-deps: [ canvaskit ]
+
+  - name: safari-fallbacks
+    test-bundle: fallbacks
+    run-config: safari
+    artifact-deps: [ canvaskit ]
diff --git a/lib/web_ui/test/frame_timings_common.dart b/lib/web_ui/test/frame_timings_common.dart
deleted file mode 100644
index acc04ef5ad9d4e2887962905844756bc5d8dbcb4..0000000000000000000000000000000000000000
--- a/lib/web_ui/test/frame_timings_common.dart
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'dart:async';
-
-import 'package:test/test.dart';
-import 'package:ui/ui.dart' as ui;
-
-/// Tests frame timings in a renderer-agnostic way.
-///
-/// See CanvasKit-specific and HTML-specific test files `frame_timings_test.dart`.
-Future<void> runFrameTimingsTest() async {
-  List<ui.FrameTiming>? timings;
-  ui.window.onReportTimings = (List<ui.FrameTiming> data) {
-    timings = data;
-  };
-  Completer<void> frameDone = Completer<void>();
-  ui.window.onDrawFrame = () {
-    final ui.SceneBuilder sceneBuilder = ui.SceneBuilder();
-    sceneBuilder
-      ..pushOffset(0, 0)
-      ..pop();
-    ui.window.render(sceneBuilder.build());
-    frameDone.complete();
-  };
-
-  // Frame 1.
-  ui.window.scheduleFrame();
-  await frameDone.future;
-  expect(timings, isNull, reason: "100 ms hasn't passed yet");
-  await Future<void>.delayed(const Duration(milliseconds: 150));
-
-  // Frame 2.
-  frameDone = Completer<void>();
-  ui.window.scheduleFrame();
-  await frameDone.future;
-  expect(timings, hasLength(2), reason: '100 ms passed. 2 frames pumped.');
-  for (final ui.FrameTiming timing in timings!) {
-    expect(timing.vsyncOverhead, greaterThanOrEqualTo(Duration.zero));
-    expect(timing.buildDuration, greaterThanOrEqualTo(Duration.zero));
-    expect(timing.rasterDuration, greaterThanOrEqualTo(Duration.zero));
-    expect(timing.totalSpan, greaterThanOrEqualTo(Duration.zero));
-    expect(timing.layerCacheCount, equals(0));
-    expect(timing.layerCacheBytes, equals(0));
-    expect(timing.pictureCacheCount, equals(0));
-    expect(timing.pictureCacheBytes, equals(0));
-  }
-}
diff --git a/lib/web_ui/test/html/bitmap_canvas_golden_test.dart b/lib/web_ui/test/html/bitmap_canvas_golden_test.dart
index 8f3f5db1c31cff2f6d84a3c3de0cb816c7e65e87..e028c1907a1a3b6f80c0208301c24693a027eb7c 100644
--- a/lib/web_ui/test/html/bitmap_canvas_golden_test.dart
+++ b/lib/web_ui/test/html/bitmap_canvas_golden_test.dart
@@ -10,8 +10,12 @@ import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart';
 
 import 'package:web_engine_tester/golden_tester.dart';
+import '../common/test_initialization.dart';
 import 'paragraph/helper.dart';
-import 'screenshot.dart';
+
+DomElement get sceneHost =>
+    EnginePlatformDispatcher.instance.implicitView!.dom.renderingHost
+        .querySelector(DomManager.sceneHostTagName)!;
 
 void main() {
   internalBootstrapBrowserTest(() => testMain);
@@ -32,13 +36,17 @@ Future<void> testMain() async {
       testScene.style.transform = 'scale(0.3)';
     }
     testScene.append(canvas.rootElement);
-    flutterViewEmbedder.glassPaneShadow!.querySelector('flt-scene-host')!.append(testScene);
+    sceneHost.append(testScene);
   }
 
-  setUpStableTestFonts();
+  setUpUnitTests(
+    withImplicitView: true,
+    emulateTesterEnvironment: false,
+    setUpTestViewDimensions: false,
+  );
 
   tearDown(() {
-    flutterViewEmbedder.glassPaneShadow?.querySelector('flt-scene')?.remove();
+    sceneHost.querySelector('flt-scene')?.remove();
   });
 
   /// Draws several lines, some aligned precisely with the pixel grid, and some
@@ -241,8 +249,8 @@ Future<void> testMain() async {
     );
 
     final SceneBuilder sb = SceneBuilder();
-    sb.pushTransform(Matrix4.diagonal3Values(EnginePlatformDispatcher.browserDevicePixelRatio,
-        EnginePlatformDispatcher.browserDevicePixelRatio, 1.0).toFloat64());
+    sb.pushTransform(Matrix4.diagonal3Values(EngineFlutterDisplay.instance.browserDevicePixelRatio,
+        EngineFlutterDisplay.instance.browserDevicePixelRatio, 1.0).toFloat64());
     sb.pushTransform(Matrix4.rotationZ(math.pi / 2).toFloat64());
     sb.pushOffset(0, -500);
     sb.pushClipRect(canvasSize);
@@ -260,7 +268,7 @@ Future<void> testMain() async {
     }
 
     sceneElement.querySelector('flt-clip')!.append(canvas.rootElement);
-    flutterViewEmbedder.glassPaneShadow!.querySelector('flt-scene-host')!.append(sceneElement);
+    sceneHost.append(sceneElement);
 
     await matchGoldenFile(
       'bitmap_canvas_draws_text_on_top_of_canvas.png',
diff --git a/lib/web_ui/test/html/canvas_clip_path_golden_test.dart b/lib/web_ui/test/html/canvas_clip_path_golden_test.dart
index a4643c3a97359c1cc5a68c2533bed689d69d5d3a..a0ea6e9c4adf4ac1407c4e102ff97f462fc1c9b7 100644
--- a/lib/web_ui/test/html/canvas_clip_path_golden_test.dart
+++ b/lib/web_ui/test/html/canvas_clip_path_golden_test.dart
@@ -7,8 +7,10 @@ import 'dart:js_util' as js_util;
 import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/src/engine.dart' as engine;
+import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' hide TextStyle;
 
+import '../common/test_initialization.dart';
 import 'screenshot.dart';
 
 void main() {
@@ -16,12 +18,9 @@ void main() {
 }
 
 Future<void> testMain() async {
-  setUpAll(() async {
-    debugEmulateFlutterTesterEnvironment = true;
-    await webOnlyInitializePlatform();
-    await engine.renderer.fontCollection.debugDownloadTestFonts();
-    engine.renderer.fontCollection.registerDownloadedFonts();
-  });
+  setUpUnitTests(
+    setUpTestViewDimensions: false,
+  );
 
   // Regression test for https://github.com/flutter/flutter/issues/48683
   // Should clip image with oval.
@@ -119,6 +118,50 @@ Future<void> testMain() async {
     await canvasScreenshot(rc, 'image_clipped_by_oval_path',
         region: const Rect.fromLTWH(0, 0, 600, 800));
   });
+
+  test('Clips with fillType evenOdd', () async {
+    final engine.RecordingCanvas rc = engine.RecordingCanvas(const Rect.fromLTRB(0, 0, 500, 500));
+    rc.save();
+    const double testWidth = 400;
+    const double testHeight = 350;
+
+    // draw RGB test image
+    rc.drawImageRect(createTestImage(), const Rect.fromLTRB(0, 0, testWidth, testHeight),
+        const Rect.fromLTWH(0, 0, testWidth, testHeight), engine.SurfacePaint());
+
+    // draw a clipping path with:
+    // 1) an outside larger rectangle
+    // 2) a smaller inner rectangle specified by a path
+    final Path path = Path();
+    path.addRect(const Rect.fromLTWH(0, 0, testWidth, testHeight));
+    const double left = 25;
+    const double top = 30;
+    const double right = 300;
+    const double bottom = 250;
+    path
+      ..moveTo(left, top)
+      ..lineTo(right,top)
+      ..lineTo(right,bottom)
+      ..lineTo(left, bottom)
+      ..close();
+    path.fillType = PathFillType.evenOdd;
+    rc.clipPath(path);
+
+    // draw an orange paint path of size testWidth and testHeight
+    final Path paintPath = Path();
+    paintPath.addRect(const Rect.fromLTWH(0, 0, testWidth, testHeight));
+    paintPath.close();
+    rc.drawPath(paintPath,
+        engine.SurfacePaint()
+          ..color = const Color(0xFFFF9800)
+          ..style = PaintingStyle.fill);
+    rc.restore();
+
+    // when fillType is set to evenOdd from the clipping path, expect the inner
+    // rectangle should clip some of the orange painted portion, revealing the RGB testImage
+    await canvasScreenshot(rc, 'clipPath_uses_fillType_evenOdd',
+        region: const Rect.fromLTWH(0, 0, 600, 800));
+  });
 }
 
 engine.HtmlImage createTestImage({int width = 200, int height = 150}) {
diff --git a/lib/web_ui/test/html/canvas_context_golden_test.dart b/lib/web_ui/test/html/canvas_context_golden_test.dart
index 53a9d30a2e2015bd52302bd950930dfcd4aedd60..282bd2590d712d1cf03caec7c81271e8c71101ee 100644
--- a/lib/web_ui/test/html/canvas_context_golden_test.dart
+++ b/lib/web_ui/test/html/canvas_context_golden_test.dart
@@ -7,6 +7,7 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart' as engine;
 import 'package:ui/ui.dart' hide TextStyle;
 
+import '../common/test_initialization.dart';
 import 'screenshot.dart';
 
 void main() {
@@ -19,12 +20,9 @@ Future<void> testMain() async {
   const double screenHeight = 800.0;
   const Rect screenRect = Rect.fromLTWH(0, 0, screenWidth, screenHeight);
 
-  setUpAll(() async {
-    debugEmulateFlutterTesterEnvironment = true;
-    await webOnlyInitializePlatform();
-    await engine.renderer.fontCollection.debugDownloadTestFonts();
-    engine.renderer.fontCollection.registerDownloadedFonts();
-  });
+  setUpUnitTests(
+    setUpTestViewDimensions: false,
+  );
 
   // Regression test for https://github.com/flutter/flutter/issues/49429
   // Should clip with correct transform.
diff --git a/lib/web_ui/test/html/canvas_reuse_golden_test.dart b/lib/web_ui/test/html/canvas_reuse_golden_test.dart
index 0757f0851e879275546a398039cd732e112234f5..ded21b4350e426aa0bb42cde458a275a7128a8c6 100644
--- a/lib/web_ui/test/html/canvas_reuse_golden_test.dart
+++ b/lib/web_ui/test/html/canvas_reuse_golden_test.dart
@@ -9,6 +9,8 @@ import 'package:ui/ui.dart' hide TextStyle;
 
 import 'package:web_engine_tester/golden_tester.dart';
 
+import '../common/test_initialization.dart';
+
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
@@ -22,12 +24,7 @@ Future<void> testMain() async {
     ..strokeWidth = 2.0
     ..color = const Color(0xFFFF00FF);
 
-  setUp(() async {
-    debugEmulateFlutterTesterEnvironment = true;
-    await webOnlyInitializePlatform();
-    await renderer.fontCollection.debugDownloadTestFonts();
-    renderer.fontCollection.registerDownloadedFonts();
-  });
+  setUpUnitTests();
 
   // Regression test for https://github.com/flutter/flutter/issues/51514
   test("Canvas is reused and z-index doesn't leak across paints", () async {
diff --git a/lib/web_ui/test/html/clip_op_golden_test.dart b/lib/web_ui/test/html/clip_op_golden_test.dart
index 2d2b34535dc619a8b58c8c54fc8c79706c4aca57..cfbe996f3f1b4d70dfaa50ed3f33ae925c490175 100644
--- a/lib/web_ui/test/html/clip_op_golden_test.dart
+++ b/lib/web_ui/test/html/clip_op_golden_test.dart
@@ -7,6 +7,7 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart';
 
+import '../common/test_initialization.dart';
 import 'paragraph/helper.dart';
 import 'screenshot.dart';
 
@@ -15,7 +16,11 @@ void main() {
 }
 
 Future<void> testMain() async {
-  setUpStableTestFonts();
+  setUpUnitTests(
+    withImplicitView: true,
+    emulateTesterEnvironment: false,
+    setUpTestViewDimensions: false,
+  );
 
   /// Regression test for https://github.com/flutter/flutter/issues/64734.
   test('Clips using difference', () async {
diff --git a/lib/web_ui/test/html/compositing/backdrop_filter_golden_test.dart b/lib/web_ui/test/html/compositing/backdrop_filter_golden_test.dart
index 41743319b73ef2e41e4f7c904ecef849fc755a8d..8535dff5564475f7682e36e5f4820bd309f38179 100644
--- a/lib/web_ui/test/html/compositing/backdrop_filter_golden_test.dart
+++ b/lib/web_ui/test/html/compositing/backdrop_filter_golden_test.dart
@@ -9,16 +9,18 @@ import 'package:ui/ui.dart';
 
 import 'package:web_engine_tester/golden_tester.dart';
 
+import '../../common/test_initialization.dart';
+
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
 
 Future<void> testMain() async {
-  setUpAll(() async {
-    await webOnlyInitializePlatform();
-    await renderer.fontCollection.debugDownloadTestFonts();
-    renderer.fontCollection.registerDownloadedFonts();
-  });
+  setUpUnitTests(
+    withImplicitView: true,
+    emulateTesterEnvironment: false,
+    setUpTestViewDimensions: false,
+  );
 
   setUp(() async {
     debugShowClipLayers = true;
diff --git a/lib/web_ui/test/html/compositing/canvas_blend_golden_test.dart b/lib/web_ui/test/html/compositing/canvas_blend_golden_test.dart
index b1851aa4e51b6d7847961f16b3dbf92445d4439e..816219f879e7e07a04ff758dbf00a391e384503b 100644
--- a/lib/web_ui/test/html/compositing/canvas_blend_golden_test.dart
+++ b/lib/web_ui/test/html/compositing/canvas_blend_golden_test.dart
@@ -9,6 +9,7 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' hide TextStyle;
 
+import '../../common/test_initialization.dart';
 import '../screenshot.dart';
 
 void main() {
@@ -16,13 +17,9 @@ void main() {
 }
 
 Future<void> testMain() async {
-
-  setUpAll(() async {
-    debugEmulateFlutterTesterEnvironment = true;
-    await webOnlyInitializePlatform();
-    await renderer.fontCollection.debugDownloadTestFonts();
-    renderer.fontCollection.registerDownloadedFonts();
-  });
+  setUpUnitTests(
+    setUpTestViewDimensions: false,
+  );
 
   test('Blend circles with difference and color', () async {
     final RecordingCanvas rc =
diff --git a/lib/web_ui/test/html/compositing/canvas_image_blend_mode_golden_test.dart b/lib/web_ui/test/html/compositing/canvas_image_blend_mode_golden_test.dart
index 3b985102d4f4c370fd01c3123bd81002a59318d2..64e165f697fa0978a2c2dbc628730437d577d25b 100644
--- a/lib/web_ui/test/html/compositing/canvas_image_blend_mode_golden_test.dart
+++ b/lib/web_ui/test/html/compositing/canvas_image_blend_mode_golden_test.dart
@@ -7,6 +7,7 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' hide TextStyle;
 
+import '../../common/test_initialization.dart';
 import '../screenshot.dart';
 import '../testimage.dart';
 
@@ -17,12 +18,10 @@ void main() {
 SurfacePaint makePaint() => Paint() as SurfacePaint;
 
 Future<void> testMain() async {
-  setUpAll(() async {
-    debugEmulateFlutterTesterEnvironment = true;
-    await webOnlyInitializePlatform();
-    await renderer.fontCollection.debugDownloadTestFonts();
-    renderer.fontCollection.registerDownloadedFonts();
-  });
+  setUpUnitTests(
+    withImplicitView: true,
+    setUpTestViewDimensions: false,
+  );
 
   const Color red = Color(0xFFFF0000);
   const Color green = Color(0xFF00FF00);
diff --git a/lib/web_ui/test/html/compositing/canvas_mask_filter_golden_test.dart b/lib/web_ui/test/html/compositing/canvas_mask_filter_golden_test.dart
index 03e8b8d2ccf5b62ff5ee9597616b645abc6334b0..840bb0c23332d71992961a68e51a3f9c9fbf6f19 100644
--- a/lib/web_ui/test/html/compositing/canvas_mask_filter_golden_test.dart
+++ b/lib/web_ui/test/html/compositing/canvas_mask_filter_golden_test.dart
@@ -10,6 +10,7 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
 
+import '../../common/test_initialization.dart';
 import '../screenshot.dart';
 
 void main() {
@@ -17,12 +18,9 @@ void main() {
 }
 
 Future<void> testMain() async {
-  setUpAll(() async {
-    ui.debugEmulateFlutterTesterEnvironment = true;
-    await ui.webOnlyInitializePlatform();
-    await renderer.fontCollection.debugDownloadTestFonts();
-    renderer.fontCollection.registerDownloadedFonts();
-  });
+  setUpUnitTests(
+    setUpTestViewDimensions: false,
+  );
 
   tearDown(() {
     ContextStateHandle.debugEmulateWebKitMaskFilter = false;
@@ -159,7 +157,7 @@ Future<void> testMain() async {
 
   for (final int testDpr in <int>[1, 2, 4]) {
     test('MaskFilter.blur blurs correctly for device-pixel ratio $testDpr', () async {
-      window.debugOverrideDevicePixelRatio(testDpr.toDouble());
+      EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(testDpr.toDouble());
       const ui.Rect screenRect = ui.Rect.fromLTWH(0, 0, 150, 150);
 
       final RecordingCanvas rc = RecordingCanvas(screenRect);
@@ -176,7 +174,7 @@ Future<void> testMain() async {
 
       await canvasScreenshot(rc, 'mask_filter_blur_dpr_$testDpr',
           region: screenRect);
-      window.debugOverrideDevicePixelRatio(1.0);
+      EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(1.0);
     });
   }
 }
diff --git a/lib/web_ui/test/html/compositing/color_filter_golden_test.dart b/lib/web_ui/test/html/compositing/color_filter_golden_test.dart
index 3da07d2fc5ccca057451dbcacc6664abfd7e6c21..08436af35500e790654c38aac0283fac2ce774ee 100644
--- a/lib/web_ui/test/html/compositing/color_filter_golden_test.dart
+++ b/lib/web_ui/test/html/compositing/color_filter_golden_test.dart
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:js_util' as js_util;
-
 import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
-import 'package:ui/src/engine.dart' hide PhysicalShapeEngineLayer;
+import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart';
 
 import 'package:web_engine_tester/golden_tester.dart';
 
+import '../../common/test_initialization.dart';
+
 const Rect region = Rect.fromLTWH(0, 0, 500, 500);
 
 void main() {
@@ -18,11 +18,11 @@ void main() {
 }
 
 Future<void> testMain() async {
-  setUpAll(() async {
-    await webOnlyInitializePlatform();
-    await renderer.fontCollection.debugDownloadTestFonts();
-    renderer.fontCollection.registerDownloadedFonts();
-  });
+  setUpUnitTests(
+    withImplicitView: true,
+    emulateTesterEnvironment: false,
+    setUpTestViewDimensions: false,
+  );
 
   setUp(() async {
     debugShowClipLayers = true;
@@ -83,35 +83,6 @@ Future<void> testMain() async {
     domDocument.body!.append(builder.build().webOnlyRootElement!);
     await matchGoldenFile('color_filter_mode.png', region: region);
   });
-
-  /// Regression test for https://github.com/flutter/flutter/issues/59451.
-  ///
-  /// Picture with overlay blend inside a physical shape. Should show image
-  /// at 0,0. In the filed issue it was leaving a gap on top.
-  test('Should render image with color filter without gap', () async {
-    final SurfaceSceneBuilder builder = SurfaceSceneBuilder();
-    final Path path = Path();
-    path.addRRect(RRect.fromRectAndRadius(
-        const Rect.fromLTRB(0, 0, 400, 400), const Radius.circular(2)));
-    final PhysicalShapeEngineLayer oldLayer = builder.pushPhysicalShape(
-        path: path, color: const Color(0xFFFFFFFF), elevation: 0);
-    final Picture circles1 = _drawTestPictureWithImage(
-        const ColorFilter.mode(Color(0x3C4043), BlendMode.overlay));
-    builder.addPicture(const Offset(10, 0), circles1);
-    builder.pop();
-    builder.build();
-
-    final SurfaceSceneBuilder builder2 = SurfaceSceneBuilder();
-    builder2.pushPhysicalShape(
-        path: path, color: const Color(0xFFFFFFFF), elevation: 0, oldLayer: oldLayer);
-    builder2.addPicture(const Offset(10, 0), circles1);
-    builder2.pop();
-
-    domDocument.body!.append(builder2.build().webOnlyRootElement!);
-
-    await matchGoldenFile('color_filter_blendMode_overlay.png',
-        region: region);
-  });
 }
 
 Picture _drawTestPictureWithCircles(double offsetX, double offsetY) {
@@ -142,23 +113,6 @@ Picture _drawTestPictureWithCircles(double offsetX, double offsetY) {
   return recorder.endRecording();
 }
 
-Picture _drawTestPictureWithImage(ColorFilter filter) {
-  final EnginePictureRecorder recorder =
-      PictureRecorder() as EnginePictureRecorder;
-  final RecordingCanvas canvas =
-      recorder.beginRecording(const Rect.fromLTRB(0, 0, 400, 400));
-  final Image testImage = createTestImage();
-  canvas.drawImageRect(
-      testImage,
-      const Rect.fromLTWH(0, 0, 200, 150),
-      const Rect.fromLTWH(0, 0, 300, 300),
-      (Paint()
-        ..style = PaintingStyle.fill
-        ..colorFilter = filter
-        ..color = const Color.fromRGBO(0, 0, 255, 1)) as SurfacePaint);
-  return recorder.endRecording();
-}
-
 Picture _drawBackground() {
   final EnginePictureRecorder recorder =
       PictureRecorder() as EnginePictureRecorder;
@@ -171,21 +125,3 @@ Picture _drawBackground() {
         ..color = const Color(0xFFE0FFE0)) as SurfacePaint);
   return recorder.endRecording();
 }
-
-HtmlImage createTestImage({int width = 200, int height = 150}) {
-  final DomCanvasElement canvas =
-      createDomCanvasElement(width: width, height: height);
-  final DomCanvasRenderingContext2D ctx = canvas.context2D;
-  ctx.fillStyle = '#E04040';
-  ctx.fillRect(0, 0, width / 3, height);
-  ctx.fill();
-  ctx.fillStyle = '#40E080';
-  ctx.fillRect(width / 3, 0, width / 3, height);
-  ctx.fill();
-  ctx.fillStyle = '#2040E0';
-  ctx.fillRect(2 * width / 3, 0, width / 3, height);
-  ctx.fill();
-  final DomHTMLImageElement imageElement = createDomHTMLImageElement();
-  imageElement.src = js_util.callMethod<String>(canvas, 'toDataURL', <dynamic>[]);
-  return HtmlImage(imageElement, width, height);
-}
diff --git a/lib/web_ui/test/html/compositing/compositing_golden_test.dart b/lib/web_ui/test/html/compositing/compositing_golden_test.dart
index fd4e3d4791ebb9fa4d7b7fb12dadaba5cd1fe3c0..a47d3f44ece5c011b5665b73c7a1e7265f398bfe 100644
--- a/lib/web_ui/test/html/compositing/compositing_golden_test.dart
+++ b/lib/web_ui/test/html/compositing/compositing_golden_test.dart
@@ -10,7 +10,8 @@ import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
 import 'package:web_engine_tester/golden_tester.dart';
 
-import '../../matchers.dart';
+import '../../common/matchers.dart';
+import '../../common/test_initialization.dart';
 
 const ui.Rect region = ui.Rect.fromLTWH(0, 0, 500, 100);
 
@@ -19,11 +20,11 @@ void main() {
 }
 
 Future<void> testMain() async {
-  setUpAll(() async {
-    await ui.webOnlyInitializePlatform();
-    await renderer.fontCollection.debugDownloadTestFonts();
-    renderer.fontCollection.registerDownloadedFonts();
-  });
+  setUpUnitTests(
+    withImplicitView: true,
+    emulateTesterEnvironment: false,
+    setUpTestViewDimensions: false,
+  );
 
   setUp(() async {
     // To debug test failures uncomment the following to visualize clipping
@@ -128,237 +129,6 @@ Future<void> testMain() async {
     await matchGoldenFile('compositing_shifted_clip_rrect.png', region: region);
   });
 
-  test('pushPhysicalShape', () async {
-    final SurfaceSceneBuilder builder = SurfaceSceneBuilder();
-    builder.pushPhysicalShape(
-      path: ui.Path()..addRect(const ui.Rect.fromLTRB(10, 10, 60, 60)),
-      clipBehavior: ui.Clip.hardEdge,
-      color: const ui.Color.fromRGBO(0, 0, 0, 0.3),
-      elevation: 0,
-    );
-    _drawTestPicture(builder);
-    builder.pop();
-
-    builder.pushOffset(70, 0);
-    builder.pushPhysicalShape(
-      path: ui.Path()
-        ..addRRect(ui.RRect.fromLTRBR(10, 10, 60, 60, const ui.Radius.circular(5))),
-      clipBehavior: ui.Clip.hardEdge,
-      color: const ui.Color.fromRGBO(0, 0, 0, 0.3),
-      elevation: 0,
-    );
-    _drawTestPicture(builder);
-    builder.pop();
-    builder.pop();
-
-    domDocument.body!.append(builder.build().webOnlyRootElement!);
-
-    await matchGoldenFile('compositing_shifted_physical_shape_clip.png',
-        region: region);
-  });
-
-  test('pushPhysicalShape clipOp.none', () async {
-    final SurfaceSceneBuilder builder = SurfaceSceneBuilder();
-    builder.pushPhysicalShape(
-      path: ui.Path()..addRect(const ui.Rect.fromLTRB(10, 10, 60, 60)),
-      clipBehavior: ui.Clip.hardEdge,
-      color: const ui.Color.fromRGBO(0, 0, 0, 0.3),
-      elevation: 0,
-    );
-    _drawTestPicture(builder);
-    builder.pop();
-
-    builder.pushOffset(70, 0);
-    builder.pushPhysicalShape(
-      path: ui.Path()
-        ..addRRect(ui.RRect.fromLTRBR(10, 10, 60, 60, const ui.Radius.circular(5))),
-      color: const ui.Color.fromRGBO(0, 0, 0, 0.3),
-      elevation: 0,
-    );
-    _drawTestPicture(builder);
-    builder.pop();
-    builder.pop();
-
-    domDocument.body!.append(builder.build().webOnlyRootElement!);
-
-    await matchGoldenFile('compositing_shifted_physical_shape_clipnone.png',
-        region: region);
-  });
-
-  test('pushPhysicalShape with path and elevation', () async {
-    final ui.Path cutCornersButton = ui.Path()
-      ..moveTo(15, 10)
-      ..lineTo(60, 10)
-      ..lineTo(60, 60)
-      ..lineTo(15, 60)
-      ..lineTo(10, 55)
-      ..lineTo(10, 15);
-
-    final SurfaceSceneBuilder builder = SurfaceSceneBuilder();
-    builder.pushPhysicalShape(
-      path: cutCornersButton,
-      clipBehavior: ui.Clip.hardEdge,
-      color: const ui.Color(0xFFA0FFFF),
-      elevation: 2,
-    );
-    _drawTestPicture(builder);
-    builder.pop();
-
-    builder.pushOffset(70, 0);
-    builder.pushPhysicalShape(
-      path: cutCornersButton,
-      clipBehavior: ui.Clip.hardEdge,
-      color: const ui.Color(0xFFA0FFFF),
-      elevation: 8,
-    );
-    _drawTestPicture(builder);
-    builder.pop();
-    builder.pop();
-
-    builder.pushOffset(140, 0);
-    builder.pushPhysicalShape(
-      path: ui.Path()..addOval(const ui.Rect.fromLTRB(10, 10, 60, 60)),
-      clipBehavior: ui.Clip.hardEdge,
-      color: const ui.Color(0xFFA0FFFF),
-      elevation: 4,
-    );
-    _drawTestPicture(builder);
-    builder.pop();
-    builder.pop();
-
-    builder.pushOffset(210, 0);
-    builder.pushPhysicalShape(
-      path: ui.Path()
-        ..addRRect(ui.RRect.fromRectAndRadius(
-            const ui.Rect.fromLTRB(10, 10, 60, 60), const ui.Radius.circular(10.0))),
-      clipBehavior: ui.Clip.hardEdge,
-      color: const ui.Color(0xFFA0FFFF),
-      elevation: 4,
-    );
-    _drawTestPicture(builder);
-    builder.pop();
-    builder.pop();
-
-    domDocument.body!.append(builder.build().webOnlyRootElement!);
-
-    await matchGoldenFile('compositing_physical_shape_path.png',
-        region: region);
-  });
-
-  test('pushPhysicalShape should update across frames', () async {
-    final ui.Path cutCornersButton = ui.Path()
-      ..moveTo(15, 10)
-      ..lineTo(60, 10)
-      ..lineTo(60, 60)
-      ..lineTo(15, 60)
-      ..lineTo(10, 55)
-      ..lineTo(10, 15);
-
-    /// Start with shape that has elevation and red color.
-    final SurfaceSceneBuilder builder = SurfaceSceneBuilder();
-    final ui.PhysicalShapeEngineLayer oldShapeLayer = builder.pushPhysicalShape(
-      path: cutCornersButton,
-      clipBehavior: ui.Clip.hardEdge,
-      color: const ui.Color(0xFFFF0000),
-      elevation: 2,
-    );
-    _drawTestPicture(builder);
-    builder.pop();
-
-    final DomElement viewElement = builder.build().webOnlyRootElement!;
-    domDocument.body!.append(viewElement);
-    await matchGoldenFile('compositing_physical_update_1.png', region: region);
-    viewElement.remove();
-
-    /// Update color to green.
-    final SurfaceSceneBuilder builder2 = SurfaceSceneBuilder();
-    final ui.PhysicalShapeEngineLayer oldShapeLayer2 = builder2.pushPhysicalShape(
-      path: cutCornersButton,
-      clipBehavior: ui.Clip.hardEdge,
-      color: const ui.Color(0xFF00FF00),
-      elevation: 2,
-      oldLayer: oldShapeLayer,
-    );
-    _drawTestPicture(builder2);
-    builder2.pop();
-
-    final DomElement viewElement2 = builder2.build().webOnlyRootElement!;
-    domDocument.body!.append(viewElement2);
-    await matchGoldenFile('compositing_physical_update_2.png', region: region);
-    viewElement2.remove();
-
-    /// Update elevation.
-    final SurfaceSceneBuilder builder3 = SurfaceSceneBuilder();
-    final ui.PhysicalShapeEngineLayer oldShapeLayer3 = builder3.pushPhysicalShape(
-      path: cutCornersButton,
-      clipBehavior: ui.Clip.hardEdge,
-      color: const ui.Color(0xFF00FF00),
-      elevation: 6,
-      oldLayer: oldShapeLayer2,
-    );
-    _drawTestPicture(builder3);
-    builder3.pop();
-
-    final DomElement viewElement3 = builder3.build().webOnlyRootElement!;
-    domDocument.body!.append(viewElement3);
-    await matchGoldenFile('compositing_physical_update_3.png',
-        region: region);
-    viewElement3.remove();
-
-    /// Update shape from arbitrary path to rect.
-    final SurfaceSceneBuilder builder4 = SurfaceSceneBuilder();
-    final ui.PhysicalShapeEngineLayer oldShapeLayer4 = builder4.pushPhysicalShape(
-      path: ui.Path()..addOval(const ui.Rect.fromLTRB(10, 10, 60, 60)),
-      clipBehavior: ui.Clip.hardEdge,
-      color: const ui.Color(0xFF00FF00),
-      elevation: 6,
-      oldLayer: oldShapeLayer3,
-    );
-    _drawTestPicture(builder4);
-    builder4.pop();
-
-    final DomElement viewElement4 = builder4.build().webOnlyRootElement!;
-    domDocument.body!.append(viewElement4);
-    await matchGoldenFile('compositing_physical_update_4.png', region: region);
-    viewElement4.remove();
-
-    /// Update shape back to arbitrary path.
-    final SurfaceSceneBuilder builder5 = SurfaceSceneBuilder();
-    final ui.PhysicalShapeEngineLayer oldShapeLayer5 = builder5.pushPhysicalShape(
-      path: cutCornersButton,
-      clipBehavior: ui.Clip.hardEdge,
-      color: const ui.Color(0xFF00FF00),
-      elevation: 6,
-      oldLayer: oldShapeLayer4,
-    );
-    _drawTestPicture(builder5);
-    builder5.pop();
-
-    final DomElement viewElement5 = builder5.build().webOnlyRootElement!;
-    domDocument.body!.append(viewElement5);
-    await matchGoldenFile('compositing_physical_update_3.png',
-        region: region);
-    viewElement5.remove();
-
-    /// Update shadow color.
-    final SurfaceSceneBuilder builder6 = SurfaceSceneBuilder();
-    builder6.pushPhysicalShape(
-      path: cutCornersButton,
-      clipBehavior: ui.Clip.hardEdge,
-      color: const ui.Color(0xFF00FF00),
-      shadowColor: const ui.Color(0xFFFF0000),
-      elevation: 6,
-      oldLayer: oldShapeLayer5,
-    );
-    _drawTestPicture(builder6);
-    builder6.pop();
-
-    final DomElement viewElement6 = builder6.build().webOnlyRootElement!;
-    domDocument.body!.append(viewElement6);
-    await matchGoldenFile('compositing_physical_update_5.png', region: region);
-    viewElement6.remove();
-  });
-
   test('pushImageFilter blur', () async {
     final SurfaceSceneBuilder builder = SurfaceSceneBuilder();
     builder.pushImageFilter(
@@ -718,8 +488,8 @@ void _testCullRectComputation() {
     final SurfaceSceneBuilder builder = SurfaceSceneBuilder();
 
     builder.pushTransform(Matrix4.diagonal3Values(
-            EnginePlatformDispatcher.browserDevicePixelRatio,
-            EnginePlatformDispatcher.browserDevicePixelRatio,
+            EngineFlutterDisplay.instance.browserDevicePixelRatio,
+            EngineFlutterDisplay.instance.browserDevicePixelRatio,
             1.0)
         .toFloat64());
 
diff --git a/lib/web_ui/test/html/compositing/dom_mask_filter_golden_test.dart b/lib/web_ui/test/html/compositing/dom_mask_filter_golden_test.dart
index bf7e63d20fb0ed58044b4df22139bf853025937f..db41df3e346ad9073f529353a943761157409095 100644
--- a/lib/web_ui/test/html/compositing/dom_mask_filter_golden_test.dart
+++ b/lib/web_ui/test/html/compositing/dom_mask_filter_golden_test.dart
@@ -6,6 +6,7 @@ import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' hide TextStyle;
+import '../../common/test_initialization.dart';
 import '../screenshot.dart';
 
 void main() {
@@ -13,12 +14,9 @@ void main() {
 }
 
 Future<void> testMain() async {
-  setUp(() async {
-    debugEmulateFlutterTesterEnvironment = true;
-    await webOnlyInitializePlatform();
-    await renderer.fontCollection.debugDownloadTestFonts();
-    renderer.fontCollection.registerDownloadedFonts();
-  });
+  setUpUnitTests(
+    setUpTestViewDimensions: false,
+  );
 
   test('Should blur rectangles based on sigma.', () async {
     final RecordingCanvas rc =
diff --git a/lib/web_ui/test/html/drawing/canvas_draw_color_golden_test.dart b/lib/web_ui/test/html/drawing/canvas_draw_color_golden_test.dart
index 8b26b7342f6c1a6816d3d0613c2a61b7427df0af..14be3d83c1914821ec8910085c8ac9d4db15bffc 100644
--- a/lib/web_ui/test/html/drawing/canvas_draw_color_golden_test.dart
+++ b/lib/web_ui/test/html/drawing/canvas_draw_color_golden_test.dart
@@ -7,6 +7,7 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart';
 
+import '../../common/test_initialization.dart';
 import '../screenshot.dart';
 
 void main() {
@@ -14,12 +15,14 @@ void main() {
 }
 
 Future<void> testMain() async {
+  setUpUnitTests(
+    emulateTesterEnvironment: false,
+    setUpTestViewDimensions: false,
+  );
+
   setUp(() async {
     debugShowClipLayers = true;
     SurfaceSceneBuilder.debugForgetFrameScene();
-    await webOnlyInitializePlatform();
-    await renderer.fontCollection.debugDownloadTestFonts();
-    renderer.fontCollection.registerDownloadedFonts();
   });
 
   tearDown(() {
diff --git a/lib/web_ui/test/html/drawing/canvas_draw_image_golden_test.dart b/lib/web_ui/test/html/drawing/canvas_draw_image_golden_test.dart
index ad86f7ad77b9e159f2ac538d000c5ef9be33f8f5..5bcf1108f4eea532e0f4d9b05e6f2329bec2feba 100644
--- a/lib/web_ui/test/html/drawing/canvas_draw_image_golden_test.dart
+++ b/lib/web_ui/test/html/drawing/canvas_draw_image_golden_test.dart
@@ -11,9 +11,11 @@ import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart';
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
 import 'package:web_engine_tester/golden_tester.dart';
 
+import '../../common/test_initialization.dart';
 import '../screenshot.dart';
 
 void main() {
@@ -21,12 +23,10 @@ void main() {
 }
 
 Future<void> testMain() async {
-
-  setUp(() async {
-    debugEmulateFlutterTesterEnvironment = true;
-  });
-
-  setUpStableTestFonts();
+  setUpUnitTests(
+    withImplicitView: true,
+    setUpTestViewDimensions: false,
+  );
 
   test('Paints image', () async {
     final RecordingCanvas rc =
@@ -320,7 +320,7 @@ Future<void> testMain() async {
   // Cyan text should be above everything.
   test('Paints text above and below image', () async {
     // Use a non-Ahem font so that text is visible.
-    debugEmulateFlutterTesterEnvironment = false;
+    ui_web.debugEmulateFlutterTesterEnvironment = false;
     final RecordingCanvas rc =
         RecordingCanvas(const Rect.fromLTRB(0, 0, 400, 300));
     rc.save();
@@ -383,7 +383,7 @@ Future<void> testMain() async {
           region: region);
     } finally {
       // The page is reused across tests, so remove the element after taking the
-      // Scuba screenshot.
+      // screenshot.
       sceneElement.remove();
     }
   });
@@ -422,7 +422,7 @@ Future<void> testMain() async {
           region: region);
     } finally {
       // The page is reused across tests, so remove the element after taking the
-      // Scuba screenshot.
+      // screenshot.
       sceneElement.remove();
     }
   });
diff --git a/lib/web_ui/test/html/drawing/canvas_draw_picture_golden_test.dart b/lib/web_ui/test/html/drawing/canvas_draw_picture_golden_test.dart
index a2cfffb29e7b208680184fd84e95211f666a597f..d40996ee5968b6fdc7ca0c10f39b30d89c679c32 100644
--- a/lib/web_ui/test/html/drawing/canvas_draw_picture_golden_test.dart
+++ b/lib/web_ui/test/html/drawing/canvas_draw_picture_golden_test.dart
@@ -7,6 +7,7 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart';
 
+import '../../common/test_initialization.dart';
 import '../screenshot.dart';
 
 const Rect region = Rect.fromLTWH(0, 0, 500, 100);
@@ -18,11 +19,13 @@ void main() {
 SurfacePaint makePaint() => Paint() as SurfacePaint;
 
 Future<void> testMain() async {
+  setUpUnitTests(
+    emulateTesterEnvironment: false,
+    setUpTestViewDimensions: false,
+  );
+
   setUpAll(() async {
     debugShowClipLayers = true;
-    await webOnlyInitializePlatform();
-    await renderer.fontCollection.debugDownloadTestFonts();
-    renderer.fontCollection.registerDownloadedFonts();
   });
 
   setUp(() async {
@@ -133,8 +136,6 @@ Picture _drawGreenRectIntoPicture() {
   return recorder.endRecording();
 }
 
-typedef PaintCallback = void Function(RecordingCanvas canvas);
-
 const String _base64Encoded20x20TestImage =
     'iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAIAAAAC64paAAAACXBIWXMAAC4jAAAuIwF4pT92AAAA'
     'B3RJTUUH5AMFFBksg4i3gQAAABl0RVh0Q29tbWVudABDcmVhdGVkIHdpdGggR0lNUFeBDhcAAAAj'
diff --git a/lib/web_ui/test/html/drawing/canvas_draw_points_golden_test.dart b/lib/web_ui/test/html/drawing/canvas_draw_points_golden_test.dart
deleted file mode 100644
index 97e19fd0e713e190633ca6584ee6fd2fe05a9472..0000000000000000000000000000000000000000
--- a/lib/web_ui/test/html/drawing/canvas_draw_points_golden_test.dart
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'dart:typed_data';
-
-import 'package:test/bootstrap/browser.dart';
-import 'package:test/test.dart';
-import 'package:ui/src/engine.dart';
-import 'package:ui/ui.dart';
-
-import 'package:web_engine_tester/golden_tester.dart';
-
-void main() {
-  internalBootstrapBrowserTest(() => testMain);
-}
-
-Future<void> testMain() async {
-  const Rect region = Rect.fromLTWH(0, 0, 400, 600);
-
-  late BitmapCanvas canvas;
-
-  setUp(() {
-    canvas = BitmapCanvas(region, RenderStrategy());
-  });
-
-  tearDown(() {
-    canvas.rootElement.remove();
-  });
-
-  test('draws points in all 3 modes', () async {
-    final SurfacePaintData paint = SurfacePaintData();
-    paint.strokeWidth = 2.0;
-    paint.color = 0xFF0000FF;
-    final Float32List points = offsetListToFloat32List(const <Offset>[
-      Offset(10, 10),
-      Offset(50, 10),
-      Offset(70, 70),
-      Offset(170, 70)
-    ]);
-    canvas.drawPoints(PointMode.points, points, paint);
-    final Float32List points2 = offsetListToFloat32List(const <Offset>[
-      Offset(10, 110),
-      Offset(50, 110),
-      Offset(70, 170),
-      Offset(170, 170)
-    ]);
-    canvas.drawPoints(PointMode.lines, points2, paint);
-    final Float32List points3 = offsetListToFloat32List(const <Offset>[
-      Offset(10, 210),
-      Offset(50, 210),
-      Offset(70, 270),
-      Offset(170, 270)
-    ]);
-    canvas.drawPoints(PointMode.polygon, points3, paint);
-
-    domDocument.body!.append(canvas.rootElement);
-    await matchGoldenFile('canvas_draw_points.png', region: region);
-  });
-
-  test('Should draw points with strokeWidth', () async {
-    final SurfacePaintData nullStrokePaint =
-      SurfacePaintData()..color = 0xffff0000;
-    canvas.drawPoints(PointMode.lines, Float32List.fromList(<double>[
-      30.0, 20.0, 200.0, 20.0]), nullStrokePaint);
-    final SurfacePaintData strokePaint1 = SurfacePaintData()
-      ..strokeWidth = 1.0
-      ..color = 0xff0000ff;
-    canvas.drawPoints(PointMode.lines, Float32List.fromList(<double>[
-      30.0, 30.0, 200.0, 30.0]), strokePaint1);
-    final SurfacePaintData strokePaint3 = SurfacePaintData()
-      ..strokeWidth = 3.0
-      ..color = 0xff00a000;
-    canvas.drawPoints(PointMode.lines, Float32List.fromList(<double>[
-      30.0, 40.0, 200.0, 40.0]), strokePaint3);
-    canvas.drawPoints(PointMode.points, Float32List.fromList(<double>[
-      30.0, 50.0, 40.0, 50.0, 50.0, 50.0]), strokePaint3);
-    domDocument.body!.append(canvas.rootElement);
-    await matchGoldenFile('canvas_draw_points_stroke.png', region: region);
-  });
-}
diff --git a/lib/web_ui/test/html/drawing/canvas_lines_golden_test.dart b/lib/web_ui/test/html/drawing/canvas_lines_golden_test.dart
index 166df80c58277e3d41e72a84630b9e8dd2b2655c..db0d0fcb148fc7d653f57435298c521cabfdd6fe 100644
--- a/lib/web_ui/test/html/drawing/canvas_lines_golden_test.dart
+++ b/lib/web_ui/test/html/drawing/canvas_lines_golden_test.dart
@@ -17,13 +17,17 @@ Future<void> testMain() async {
   const Rect region = Rect.fromLTWH(0, 0, 300, 300);
 
   late BitmapCanvas canvas;
+  late BitmapCanvas domCanvas;
 
   setUp(() {
     canvas = BitmapCanvas(region, RenderStrategy());
+    // setting isInsideSvgFilterTree true forces use of DOM canvas
+    domCanvas = BitmapCanvas(region, RenderStrategy()..isInsideSvgFilterTree = true);
   });
 
   tearDown(() {
     canvas.rootElement.remove();
+    domCanvas.rootElement.remove();
   });
 
   test('draws lines with varying strokeWidth', () async {
@@ -33,6 +37,75 @@ Future<void> testMain() async {
     domDocument.body!.append(canvas.rootElement);
     await matchGoldenFile('canvas_lines_thickness.png', region: region);
   });
+  test('draws lines with varying strokeWidth with dom canvas', () async {
+
+    paintLines(domCanvas);
+
+    domDocument.body!.append(domCanvas.rootElement);
+    await matchGoldenFile('canvas_lines_thickness_dom_canvas.png', region: region);
+  });
+  test('draws lines with negative Offset values with dom canvas', () async {
+    // test rendering lines correctly with negative offset when using DOM
+    final SurfacePaintData paintWithStyle = SurfacePaintData()
+    ..color = 0xFFE91E63 // Colors.pink
+    ..style = PaintingStyle.stroke
+    ..strokeWidth = 16
+    ..strokeCap = StrokeCap.round;
+
+    // canvas.drawLine ignores paint.style (defaults to fill) according to api docs.
+    // expect lines are rendered the same regardless of the set paint.style
+    final SurfacePaintData paintWithoutStyle = SurfacePaintData()
+    ..color = 0xFF4CAF50 // Colors.green
+    ..strokeWidth = 16
+    ..strokeCap = StrokeCap.round;
+
+    // test vertical, horizontal, and diagonal lines
+    final List<Offset> points = <Offset>[
+      const Offset(-25, 50), const Offset(45, 50),
+      const Offset(100, -25), const Offset(100, 200),
+      const Offset(-150, -145), const Offset(100, 200),
+    ];
+    final List<Offset> shiftedPoints = points.map((Offset point) => point.translate(20, 20)).toList();
+
+    paintLinesFromPoints(domCanvas, paintWithStyle, points);
+    paintLinesFromPoints(domCanvas, paintWithoutStyle, shiftedPoints);
+
+    domDocument.body!.append(domCanvas.rootElement);
+    await matchGoldenFile('canvas_lines_with_negative_offset.png', region: region);
+  });
+
+  test('drawLines method respects strokeCap with dom canvas', () async {
+    final SurfacePaintData paintStrokeCapRound = SurfacePaintData()
+    ..color = 0xFFE91E63 // Colors.pink
+    ..strokeWidth = 16
+    ..strokeCap = StrokeCap.round;
+
+    final SurfacePaintData paintStrokeCapSquare = SurfacePaintData()
+    ..color = 0xFF4CAF50 // Colors.green
+    ..strokeWidth = 16
+    ..strokeCap = StrokeCap.square;
+
+    final SurfacePaintData paintStrokeCapButt = SurfacePaintData()
+    ..color = 0xFFFF9800 // Colors.orange
+    ..strokeWidth = 16
+    ..strokeCap = StrokeCap.butt;
+
+    // test vertical, horizontal, and diagonal lines
+    final List<Offset> points = <Offset>[
+      const Offset(5, 50), const Offset(45, 50),
+      const Offset(100, 5), const Offset(100, 200),
+      const Offset(5, 10), const Offset(100, 200),
+    ];
+    final List<Offset> shiftedPoints = points.map((Offset point) => point.translate(50, 50)).toList();
+    final List<Offset> twiceShiftedPoints = shiftedPoints.map((Offset point) => point.translate(50, 50)).toList();
+
+    paintLinesFromPoints(domCanvas, paintStrokeCapRound, points);
+    paintLinesFromPoints(domCanvas, paintStrokeCapSquare, shiftedPoints);
+    paintLinesFromPoints(domCanvas, paintStrokeCapButt, twiceShiftedPoints);
+
+    domDocument.body!.append(domCanvas.rootElement);
+    await matchGoldenFile('canvas_lines_with_strokeCap.png', region: region);
+  });
 }
 
 void paintLines(BitmapCanvas canvas) {
@@ -70,3 +143,10 @@ void paintLines(BitmapCanvas canvas) {
   paint3.color = 0xFFFF9800; // Colors.orange;
   canvas.drawLine(const Offset(50, 70), const Offset(150, 70), paint3);
 }
+
+void paintLinesFromPoints(BitmapCanvas canvas, SurfacePaintData paint, List<Offset> points) {
+  // points list contains pairs of Offset points, so for loop step is 2
+  for (int i = 0; i < points.length - 1; i += 2) {
+    canvas.drawLine(points[i], points[i + 1], paint);
+  }
+}
diff --git a/lib/web_ui/test/html/drawing/canvas_rrect_golden_test.dart b/lib/web_ui/test/html/drawing/canvas_rrect_golden_test.dart
index 31f5d45e7b1c3682952ae35445c59e07b5c1942d..3a7e1359a90130fabd8cb4d17bfea58acc7f5964 100644
--- a/lib/web_ui/test/html/drawing/canvas_rrect_golden_test.dart
+++ b/lib/web_ui/test/html/drawing/canvas_rrect_golden_test.dart
@@ -17,7 +17,7 @@ Future<void> testMain() async {
   late RecordingCanvas rc;
   const Rect canvasRect = Rect.fromLTWH(0, 0, 500, 100);
 
-  const Rect region = Rect.fromLTWH(8, 8, 500, 100); // Compensate for old scuba tester padding
+  const Rect region = Rect.fromLTWH(8, 8, 500, 100); // Compensate for old golden tester padding
 
   final SurfacePaint niceRRectPaint = SurfacePaint()
     ..color = const Color.fromRGBO(250, 186, 218, 1.0) // #fabada
diff --git a/lib/web_ui/test/html/drawing/conic_golden_test.dart b/lib/web_ui/test/html/drawing/conic_golden_test.dart
index 535f7d1529b91c0fa480c9ce1a9956df5f0b231c..851b97801de7e9773bd545fbaf8a8c76c2a2213b 100644
--- a/lib/web_ui/test/html/drawing/conic_golden_test.dart
+++ b/lib/web_ui/test/html/drawing/conic_golden_test.dart
@@ -14,9 +14,9 @@ void main() {
 }
 
 Future<void> testMain() async {
-  const Rect region = Rect.fromLTWH(8, 8, 600, 800); // Compensate for old scuba tester padding
+  const Rect region = Rect.fromLTWH(8, 8, 600, 800); // Compensate for old golden tester padding
 
-  Future<void> testPath(Path path, String scubaFileName) async {
+  Future<void> testPath(Path path, String goldenFileName) async {
     const Rect canvasBounds = Rect.fromLTWH(0, 0, 600, 800);
     final BitmapCanvas bitmapCanvas = BitmapCanvas(canvasBounds,
         RenderStrategy());
@@ -38,7 +38,7 @@ Future<void> testMain() async {
 
     domDocument.body!.append(bitmapCanvas.rootElement);
     canvas.apply(bitmapCanvas, canvasBounds);
-    await matchGoldenFile('$scubaFileName.png', region: region);
+    await matchGoldenFile('$goldenFileName.png', region: region);
     bitmapCanvas.rootElement.remove();
   }
 
diff --git a/lib/web_ui/test/html/drawing/draw_vertices_golden_test.dart b/lib/web_ui/test/html/drawing/draw_vertices_golden_test.dart
index 8a1a10ccb568ddda5150916f7d54c7d01cce8385..94548a1745aad4f5678eecdc7bd1142c3324d1b9 100644
--- a/lib/web_ui/test/html/drawing/draw_vertices_golden_test.dart
+++ b/lib/web_ui/test/html/drawing/draw_vertices_golden_test.dart
@@ -11,6 +11,7 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' hide ImageShader, TextStyle;
 
+import '../../common/test_initialization.dart';
 import '../screenshot.dart';
 
 void main() {
@@ -22,12 +23,9 @@ Future<void> testMain() async {
   const double screenHeight = 800.0;
   const Rect screenRect = Rect.fromLTWH(0, 0, screenWidth, screenHeight);
 
-  setUpAll(() async {
-    debugEmulateFlutterTesterEnvironment = true;
-    await webOnlyInitializePlatform();
-    await renderer.fontCollection.debugDownloadTestFonts();
-    renderer.fontCollection.registerDownloadedFonts();
-  });
+  setUpUnitTests(
+    setUpTestViewDimensions: false,
+  );
 
   setUp(() {
     GlContextCache.dispose();
@@ -397,7 +395,7 @@ Future<HtmlImage> createTestImage({int width = 50, int height = 40}) {
   ctx.fill();
   final DomHTMLImageElement imageElement = createDomHTMLImageElement();
   final Completer<HtmlImage> completer = Completer<HtmlImage>();
-  imageElement.addEventListener('load', allowInterop((DomEvent event) {
+  imageElement.addEventListener('load', createDomEventListener((DomEvent event) {
     completer.complete(HtmlImage(imageElement, width, height));
   }));
   imageElement.src = js_util.callMethod<String>(canvas, 'toDataURL', <dynamic>[]);
diff --git a/lib/web_ui/test/html/image_test.dart b/lib/web_ui/test/html/image_test.dart
index c7c70499878896aa7089e6a6c2079eb2461934f1..bd8883fc4e398f17bb27fb812122152e3759b77f 100644
--- a/lib/web_ui/test/html/image_test.dart
+++ b/lib/web_ui/test/html/image_test.dart
@@ -35,14 +35,15 @@ Matcher listEqual(List<int> source, {int tolerance = 0}) {
 // Each element of `rawPixels` represents a bytes in order 0xRRGGBBAA, with
 // pixel order Left to right, then top to bottom.
 Uint8List _pixelsToBytes(List<int> rawPixels) {
-  return Uint8List.fromList((() sync* {
-    for (final int pixel in rawPixels) {
-      yield (pixel >> 24) & 0xff; // r
-      yield (pixel >> 16) & 0xff; // g
-      yield (pixel >> 8)  & 0xff; // b
-      yield (pixel >> 0)  & 0xff; // a
-    }
-  })().toList());
+  return Uint8List.fromList(<int>[
+    for (final int pixel in rawPixels)
+      ...<int>[
+        (pixel >> 24) & 0xff, // r
+        (pixel >> 16) & 0xff, // g
+        (pixel >> 8)  & 0xff, // b
+        (pixel >> 0)  & 0xff, // a
+      ]
+  ]);
 }
 
 Future<Image> _encodeToHtmlThenDecode(
diff --git a/lib/web_ui/test/html/paragraph/bidi_golden_test.dart b/lib/web_ui/test/html/paragraph/bidi_golden_test.dart
index 8f1c6f20605687ad691b3e2b89102fcd8e2c1cd5..6eb61c7d188f92d1766e5b08ebb06ba63965d333 100644
--- a/lib/web_ui/test/html/paragraph/bidi_golden_test.dart
+++ b/lib/web_ui/test/html/paragraph/bidi_golden_test.dart
@@ -7,7 +7,7 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' hide window;
 
-import '../screenshot.dart';
+import '../../common/test_initialization.dart';
 import 'helper.dart';
 
 const String _rtlWord1 = 'واحد';
@@ -18,7 +18,11 @@ void main() {
 }
 
 Future<void> testMain() async {
-  setUpStableTestFonts();
+  setUpUnitTests(
+    withImplicitView: true,
+    emulateTesterEnvironment: false,
+    setUpTestViewDimensions: false,
+  );
 
   void paintBasicBidiStartingWithLtr(
     EngineCanvas canvas,
diff --git a/lib/web_ui/test/html/paragraph/general_golden_test.dart b/lib/web_ui/test/html/paragraph/general_golden_test.dart
index 82d2e4da230f05d03763ffac21bd4949fb5d131d..ee3756841db53a1210c4464a3bb4b0040883e543 100644
--- a/lib/web_ui/test/html/paragraph/general_golden_test.dart
+++ b/lib/web_ui/test/html/paragraph/general_golden_test.dart
@@ -10,7 +10,7 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' hide window;
 
-import '../screenshot.dart';
+import '../../common/test_initialization.dart';
 import 'helper.dart';
 
 const Rect bounds = Rect.fromLTWH(0, 0, 800, 600);
@@ -20,7 +20,11 @@ void main() {
 }
 
 Future<void> testMain() async {
-  setUpStableTestFonts();
+  setUpUnitTests(
+    withImplicitView: true,
+    emulateTesterEnvironment: false,
+    setUpTestViewDimensions: false,
+  );
 
   test('paints spans and lines correctly', () {
     final BitmapCanvas canvas = BitmapCanvas(bounds, RenderStrategy());
@@ -334,6 +338,28 @@ Future<void> testMain() async {
     return takeScreenshot(canvas, bounds, 'canvas_paragraph_letter_spacing');
   });
 
+  test('letter-spacing Thai', () {
+    final BitmapCanvas canvas = BitmapCanvas(bounds, RenderStrategy());
+
+    const String yes = '\u0e43\u0e0a\u0e48';
+    const String no = '\u0e44\u0e21\u0e48';
+
+    final CanvasParagraph paragraph = rich(
+      EngineParagraphStyle(fontFamily: 'Roboto', fontSize: 36),
+      (CanvasParagraphBuilder builder) {
+        builder.pushStyle(EngineTextStyle.only(color: blue));
+        builder.addText('$yes $no ');
+        builder.pushStyle(EngineTextStyle.only(color: green, letterSpacing: 1));
+        builder.addText('$yes $no ');
+        builder.pushStyle(EngineTextStyle.only(color: red, letterSpacing: 3));
+        builder.addText('$yes $no');
+      },
+    )..layout(constrain(double.infinity));
+    canvas.drawParagraph(paragraph, const Offset(20, 20));
+
+    return takeScreenshot(canvas, bounds, 'canvas_paragraph_letter_spacing_thai');
+  });
+
   test('draws text decorations', () {
     final BitmapCanvas canvas = BitmapCanvas(bounds, RenderStrategy());
     final List<TextDecorationStyle> decorationStyles = <TextDecorationStyle>[
diff --git a/lib/web_ui/test/html/paragraph/helper.dart b/lib/web_ui/test/html/paragraph/helper.dart
index 1497f7b4ab2ff09b599154a001a7792846eebb9d..855da331fb625d13042f30e6731592f7268b2697 100644
--- a/lib/web_ui/test/html/paragraph/helper.dart
+++ b/lib/web_ui/test/html/paragraph/helper.dart
@@ -37,7 +37,7 @@ const Color yellow = Color(0xFFFFEB3B);
 const Color lightPurple = Color(0xFFE1BEE7);
 
 final EngineParagraphStyle ahemStyle = EngineParagraphStyle(
-  fontFamily: 'ahem',
+  fontFamily: 'Ahem',
   fontSize: 10,
 );
 
@@ -85,7 +85,7 @@ Future<void> takeScreenshot(
     await matchGoldenFile('$fileName.png', region: region);
   } finally {
     // The page is reused across tests, so remove the element after taking the
-    // Scuba screenshot.
+    // screenshot.
     sceneElement.remove();
   }
 }
diff --git a/lib/web_ui/test/html/paragraph/justify_golden_test.dart b/lib/web_ui/test/html/paragraph/justify_golden_test.dart
index 00a0033df3b0a7568ddcba2a0d81765937d4c233..4538fe0a70fac523e95126ac3a209062d3ac0bbb 100644
--- a/lib/web_ui/test/html/paragraph/justify_golden_test.dart
+++ b/lib/web_ui/test/html/paragraph/justify_golden_test.dart
@@ -9,7 +9,7 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' hide window;
 
-import '../screenshot.dart';
+import '../../common/test_initialization.dart';
 import 'helper.dart';
 
 void main() {
@@ -17,7 +17,11 @@ void main() {
 }
 
 Future<void> testMain() async {
-  setUpStableTestFonts();
+  setUpUnitTests(
+    withImplicitView: true,
+    emulateTesterEnvironment: false,
+    setUpTestViewDimensions: false,
+  );
 
   void testJustifyWithMultipleSpans(EngineCanvas canvas) {
     void build(CanvasParagraphBuilder builder) {
diff --git a/lib/web_ui/test/html/paragraph/overflow_golden_test.dart b/lib/web_ui/test/html/paragraph/overflow_golden_test.dart
index eebfde0c1489e84b770ef650525085b937c1686b..bde5887d7d66118a81f03bbb91a6a3179b33b1c6 100644
--- a/lib/web_ui/test/html/paragraph/overflow_golden_test.dart
+++ b/lib/web_ui/test/html/paragraph/overflow_golden_test.dart
@@ -9,7 +9,7 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' hide window;
 
-import '../screenshot.dart';
+import '../../common/test_initialization.dart';
 import 'helper.dart';
 
 void main() {
@@ -17,7 +17,11 @@ void main() {
 }
 
 Future<void> testMain() async {
-  setUpStableTestFonts();
+  setUpUnitTests(
+    withImplicitView: true,
+    emulateTesterEnvironment: false,
+    setUpTestViewDimensions: false,
+  );
 
   void testEllipsis(EngineCanvas canvas) {
     Offset offset = Offset.zero;
diff --git a/lib/web_ui/test/html/paragraph/placeholders_golden_test.dart b/lib/web_ui/test/html/paragraph/placeholders_golden_test.dart
index 7f90cde8a32437d096496f3553309e14d8852525..17f08ed508e29ff523735ba693306067a253dac9 100644
--- a/lib/web_ui/test/html/paragraph/placeholders_golden_test.dart
+++ b/lib/web_ui/test/html/paragraph/placeholders_golden_test.dart
@@ -9,7 +9,7 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' hide window;
 
-import '../screenshot.dart';
+import '../../common/test_initialization.dart';
 import 'helper.dart';
 
 const Rect bounds = Rect.fromLTWH(0, 0, 800, 600);
@@ -19,7 +19,11 @@ void main() {
 }
 
 Future<void> testMain() async {
-  setUpStableTestFonts();
+  setUpUnitTests(
+    withImplicitView: true,
+    emulateTesterEnvironment: false,
+    setUpTestViewDimensions: false,
+  );
 
   test('draws paragraphs with placeholders', () {
     final BitmapCanvas canvas = BitmapCanvas(bounds, RenderStrategy());
diff --git a/lib/web_ui/test/html/paragraph/shadows_golden_test.dart b/lib/web_ui/test/html/paragraph/shadows_golden_test.dart
index 3c6f30fec8fcd31afcfcad62f88c1ece5f21fa2c..d9f37a0af2140ab11e6cadf83cfb33b48fcbd794 100644
--- a/lib/web_ui/test/html/paragraph/shadows_golden_test.dart
+++ b/lib/web_ui/test/html/paragraph/shadows_golden_test.dart
@@ -7,7 +7,7 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' hide window;
 
-import '../screenshot.dart';
+import '../../common/test_initialization.dart';
 import 'helper.dart';
 
 const Rect bounds = Rect.fromLTWH(0, 0, 800, 600);
@@ -17,7 +17,11 @@ void main() {
 }
 
 Future<void> testMain() async {
-  setUpStableTestFonts();
+  setUpUnitTests(
+    withImplicitView: true,
+    emulateTesterEnvironment: false,
+    setUpTestViewDimensions: false,
+  );
 
   test('paints multiple shadows', () {
     final BitmapCanvas canvas = BitmapCanvas(bounds, RenderStrategy());
diff --git a/lib/web_ui/test/html/paragraph/text_scuba.dart b/lib/web_ui/test/html/paragraph/text_goldens.dart
similarity index 85%
rename from lib/web_ui/test/html/paragraph/text_scuba.dart
rename to lib/web_ui/test/html/paragraph/text_goldens.dart
index 1f2c5cbb352c6b24a9173d56b5b7aed4ec9554e3..f6542a54e82219fa700fbfdcdcf55692dcc8bf6c 100644
--- a/lib/web_ui/test/html/paragraph/text_scuba.dart
+++ b/lib/web_ui/test/html/paragraph/text_goldens.dart
@@ -13,29 +13,24 @@ import 'package:web_engine_tester/golden_tester.dart';
 import 'helper.dart';
 
 /// Class that controls some details of how screenshotting is made.
-///
-/// (For Googlers: Not really related with internal Scuba anymore)
-class EngineScubaTester {
-  EngineScubaTester(this.viewportSize);
+class EngineGoldenTester {
+  EngineGoldenTester(this.viewportSize);
 
-  /// The size of the browser window used in this scuba test.
+  /// The size of the browser window used in this golden test.
   final ui.Size viewportSize;
 
-  static Future<EngineScubaTester> initialize(
+  static Future<EngineGoldenTester> initialize(
       {ui.Size viewportSize = const ui.Size(2400, 1800)}) async {
     assert(() {
       if (viewportSize.width.ceil() != viewportSize.width ||
           viewportSize.height.ceil() != viewportSize.height) {
         throw Exception(
-            'Scuba only supports integer screen sizes, but found: $viewportSize');
-      }
-      if (viewportSize.width < 472) {
-        throw Exception('Scuba does not support screen width smaller than 472');
+            'Gold only supports integer screen sizes, but found: $viewportSize');
       }
       return true;
     }());
 
-    return EngineScubaTester(viewportSize);
+    return EngineGoldenTester(viewportSize);
   }
 
   ui.Rect get viewportRegion =>
@@ -51,7 +46,7 @@ class EngineScubaTester {
     );
   }
 
-  /// Prepares the DOM and inserts all the necessary nodes, then invokes scuba's
+  /// Prepares the DOM and inserts all the necessary nodes, then invokes Gold's
   /// screenshot diffing.
   ///
   /// It also cleans up the DOM after itself.
@@ -81,7 +76,7 @@ class EngineScubaTester {
       );
     } finally {
       // The page is reused across tests, so remove the element after taking the
-      // Scuba screenshot.
+      // screenshot.
       sceneElement.remove();
     }
   }
diff --git a/lib/web_ui/test/html/paragraph/text_multiline_clipping_golden_test.dart b/lib/web_ui/test/html/paragraph/text_multiline_clipping_golden_test.dart
index a4164b2dd6b357e6d8c0d16391e80ab4bcf78a9b..855d68cde0747e4bcda36e42d24e488a559da5fe 100644
--- a/lib/web_ui/test/html/paragraph/text_multiline_clipping_golden_test.dart
+++ b/lib/web_ui/test/html/paragraph/text_multiline_clipping_golden_test.dart
@@ -8,8 +8,8 @@ import 'package:test/bootstrap/browser.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart';
 
-import '../screenshot.dart';
-import 'text_scuba.dart';
+import '../../common/test_initialization.dart';
+import 'text_goldens.dart';
 
 typedef PaintTest = void Function(RecordingCanvas recordingCanvas);
 
@@ -18,12 +18,15 @@ void main() {
 }
 
 Future<void> testMain() async {
-  // Scuba doesn't give us viewport smaller than 472px wide.
-  final EngineScubaTester scuba = await EngineScubaTester.initialize(
+  final EngineGoldenTester goldenTester = await EngineGoldenTester.initialize(
     viewportSize: const Size(600, 600),
   );
 
-  setUpStableTestFonts();
+  setUpUnitTests(
+    withImplicitView: true,
+    emulateTesterEnvironment: false,
+    setUpTestViewDimensions: false,
+  );
 
   void paintTest(EngineCanvas canvas, PaintTest painter) {
     const Rect screenRect = Rect.fromLTWH(0, 0, 600, 600);
@@ -39,7 +42,7 @@ Future<void> testMain() async {
       // [DomCanvas] doesn't support clip commands.
       if (canvas is! DomCanvas) {
         paintTest(canvas, paintTextWithClipRect);
-        return scuba.diffCanvasScreenshot(
+        return goldenTester.diffCanvasScreenshot(
             canvas, 'multiline_text_clipping_rect');
       }
       return null;
@@ -52,7 +55,7 @@ Future<void> testMain() async {
       // [DomCanvas] doesn't support clip commands.
       if (canvas is! DomCanvas) {
         paintTest(canvas, paintTextWithClipRectTranslated);
-        return scuba.diffCanvasScreenshot(
+        return goldenTester.diffCanvasScreenshot(
             canvas, 'multiline_text_clipping_rect_translate');
       }
       return null;
@@ -65,7 +68,7 @@ Future<void> testMain() async {
       // [DomCanvas] doesn't support clip commands.
       if (canvas is! DomCanvas) {
         paintTest(canvas, paintTextWithClipRoundRect);
-        return scuba.diffCanvasScreenshot(
+        return goldenTester.diffCanvasScreenshot(
             canvas, 'multiline_text_clipping_roundrect');
       }
       return null;
@@ -78,7 +81,7 @@ Future<void> testMain() async {
       // [DomCanvas] doesn't support clip commands.
       if (canvas is! DomCanvas) {
         paintTest(canvas, paintTextWithClipPath);
-        return scuba.diffCanvasScreenshot(
+        return goldenTester.diffCanvasScreenshot(
             canvas, 'multiline_text_clipping_path');
       }
       return null;
@@ -90,11 +93,8 @@ Future<void> testMain() async {
     (EngineCanvas canvas) {
       // [DomCanvas] doesn't support clip commands.
       if (canvas is! DomCanvas) {
-        // TODO(mdebbar): https://github.com/flutter/flutter/issues/35086
-        // This produces the wrong result when using [BitmapCanvas] but without
-        // the new experimental canvas mode.
         paintTest(canvas, paintTextWithClipStack);
-        return scuba.diffCanvasScreenshot(
+        return goldenTester.diffCanvasScreenshot(
             canvas, 'multiline_text_clipping_stack1');
       }
       return null;
diff --git a/lib/web_ui/test/html/paragraph/text_overflow_golden_test.dart b/lib/web_ui/test/html/paragraph/text_overflow_golden_test.dart
index a97bce79940f6271aa0f68b816ac33fce37899cf..0a308e0534558b0eb90002b7306123db9ae36b39 100644
--- a/lib/web_ui/test/html/paragraph/text_overflow_golden_test.dart
+++ b/lib/web_ui/test/html/paragraph/text_overflow_golden_test.dart
@@ -8,24 +8,27 @@ import 'package:test/bootstrap/browser.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' hide window;
 
-import '../screenshot.dart';
-import 'text_scuba.dart';
+import '../../common/test_initialization.dart';
+import 'text_goldens.dart';
 
 const String threeLines = 'First\nSecond\nThird';
 const String veryLong =
     'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.';
-const String longUnbreakable = 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
 
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
 
 Future<void> testMain() async {
-  final EngineScubaTester scuba = await EngineScubaTester.initialize(
+  final EngineGoldenTester goldenTester = await EngineGoldenTester.initialize(
     viewportSize: const Size(800, 800),
   );
 
-  setUpStableTestFonts();
+  setUpUnitTests(
+    withImplicitView: true,
+    emulateTesterEnvironment: false,
+    setUpTestViewDimensions: false,
+  );
 
   testEachCanvas('maxLines clipping', (EngineCanvas canvas) {
     Offset offset = Offset.zero;
@@ -52,6 +55,6 @@ Future<void> testMain() async {
     canvas.drawParagraph(p, offset);
     offset = offset.translate(0, p.height + 10);
 
-    return scuba.diffCanvasScreenshot(canvas, 'text_max_lines');
+    return goldenTester.diffCanvasScreenshot(canvas, 'text_max_lines');
   });
 }
diff --git a/lib/web_ui/test/html/paragraph/text_placeholders_golden_test.dart b/lib/web_ui/test/html/paragraph/text_placeholders_golden_test.dart
index 4474bba0b9f33a77b8b0fc66e356c8ac960d46bc..ee96414f47086f5b60e9187c4b5a2c73e4a82bf1 100644
--- a/lib/web_ui/test/html/paragraph/text_placeholders_golden_test.dart
+++ b/lib/web_ui/test/html/paragraph/text_placeholders_golden_test.dart
@@ -6,21 +6,24 @@ import 'package:test/bootstrap/browser.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart';
 
-import '../screenshot.dart';
+import '../../common/test_initialization.dart';
 import 'helper.dart';
-import 'text_scuba.dart';
+import 'text_goldens.dart';
 
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
 
 Future<void> testMain() async {
-  final EngineScubaTester scuba = await EngineScubaTester.initialize(
+  final EngineGoldenTester goldenTester = await EngineGoldenTester.initialize(
     viewportSize: const Size(600, 600),
   );
 
-
-  setUpStableTestFonts();
+  setUpUnitTests(
+    withImplicitView: true,
+    emulateTesterEnvironment: false,
+    setUpTestViewDimensions: false,
+  );
 
   testEachCanvas('draws paragraphs with placeholders', (EngineCanvas canvas) {
     const Rect screenRect = Rect.fromLTWH(0, 0, 600, 600);
@@ -40,7 +43,7 @@ Future<void> testMain() async {
     }
     recordingCanvas.endRecording();
     recordingCanvas.apply(canvas, screenRect);
-    return scuba.diffCanvasScreenshot(canvas, 'text_with_placeholders');
+    return goldenTester.diffCanvasScreenshot(canvas, 'text_with_placeholders');
   });
 
   testEachCanvas('text alignment and placeholders', (EngineCanvas canvas) {
@@ -73,7 +76,7 @@ Future<void> testMain() async {
     );
     recordingCanvas.endRecording();
     recordingCanvas.apply(canvas, screenRect);
-    return scuba.diffCanvasScreenshot(canvas, 'text_align_with_placeholders');
+    return goldenTester.diffCanvasScreenshot(canvas, 'text_align_with_placeholders');
   });
 }
 
diff --git a/lib/web_ui/test/html/path_metrics_golden_test.dart b/lib/web_ui/test/html/path_metrics_golden_test.dart
index 49410f5f9c70bf41a090c62ba9ffe7f18d5b0146..6ce6bd660da06ff5d3f7e017a463f6479f819970 100644
--- a/lib/web_ui/test/html/path_metrics_golden_test.dart
+++ b/lib/web_ui/test/html/path_metrics_golden_test.dart
@@ -7,7 +7,8 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' hide TextStyle;
 
-import '../matchers.dart';
+import '../common/matchers.dart';
+import '../common/test_initialization.dart';
 import 'screenshot.dart';
 
 void main() {
@@ -22,12 +23,9 @@ Future<void> testMain() async {
   const Color redAccentColor = Color(0xFFFF1744);
   const double kDashLength = 5.0;
 
-  setUpAll(() async {
-    debugEmulateFlutterTesterEnvironment = true;
-    await webOnlyInitializePlatform();
-    await renderer.fontCollection.debugDownloadTestFonts();
-    renderer.fontCollection.registerDownloadedFonts();
-  });
+  setUpUnitTests(
+    setUpTestViewDimensions: false,
+  );
 
   test('Should calculate tangent on line', () async {
     final Path path = Path();
diff --git a/lib/web_ui/test/path_test.dart b/lib/web_ui/test/html/path_test.dart
similarity index 99%
rename from lib/web_ui/test/path_test.dart
rename to lib/web_ui/test/html/path_test.dart
index 3165c5fba13f63c03a331b49204b192b4837a574..ceac251d72053b2fd724391e8e1f6ea6e9a66654 100644
--- a/lib/web_ui/test/path_test.dart
+++ b/lib/web_ui/test/html/path_test.dart
@@ -10,7 +10,7 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' hide window;
 
-import 'matchers.dart';
+import '../common/matchers.dart';
 
 void main() {
   internalBootstrapBrowserTest(() => testMain);
@@ -408,7 +408,7 @@ void testMain() {
     // Regression test for https://github.com/flutter/flutter/issues/44470
     test('Should handle contains for devicepixelratio != 1.0', () {
       js_util.setProperty(domWindow, 'devicePixelRatio', 4.0);
-      window.debugOverrideDevicePixelRatio(4.0);
+      EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(4.0);
       final Path path = Path()
         ..moveTo(50, 0)
         ..lineTo(100, 100)
@@ -417,7 +417,7 @@ void testMain() {
         ..close();
       expect(path.contains(const Offset(50, 50)), isTrue);
       js_util.setProperty(domWindow, 'devicePixelRatio', 1.0);
-      window.debugOverrideDevicePixelRatio(1.0);
+      EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(1.0);
       // TODO(ferhat): Investigate failure on CI. Locally this passes.
       // [Exception... "Failure"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"
     }, skip: browserEngine == BrowserEngine.firefox);
diff --git a/lib/web_ui/test/html/path_to_svg_golden_test.dart b/lib/web_ui/test/html/path_to_svg_golden_test.dart
index 0356f1f1d30b88c6402bc019bda6bc625efd8be9..2ed88dfd53d6642816f700c8642e4bbead4d98f3 100644
--- a/lib/web_ui/test/html/path_to_svg_golden_test.dart
+++ b/lib/web_ui/test/html/path_to_svg_golden_test.dart
@@ -22,9 +22,9 @@ enum PaintMode {
 
 Future<void> testMain() async {
   const Rect region =
-      Rect.fromLTWH(8, 8, 600, 400); // Compensate for old scuba tester padding
+      Rect.fromLTWH(8, 8, 600, 400); // Compensate for old golden tester padding
 
-  Future<void> testPath(Path path, String scubaFileName,
+  Future<void> testPath(Path path, String goldenFileName,
       {SurfacePaint? paint,
       PaintMode mode = PaintMode.kStrokeAndFill}) async {
     const Rect canvasBounds = Rect.fromLTWH(0, 0, 600, 400);
@@ -72,7 +72,7 @@ Future<void> testMain() async {
     sceneElement.append(bitmapCanvas.rootElement);
     sceneElement.append(svgElement);
 
-    await matchGoldenFile('$scubaFileName.png',
+    await matchGoldenFile('$goldenFileName.png',
         region: region);
 
     bitmapCanvas.rootElement.remove();
@@ -194,14 +194,14 @@ DomElement pathToSvgElement(Path path, Paint paint, bool enableFill) {
   root.append(pathElement);
   if (paint.style == PaintingStyle.stroke ||
       paint.strokeWidth != 0.0) {
-    pathElement.setAttribute('stroke', colorToCssString(paint.color)!);
+    pathElement.setAttribute('stroke', paint.color.toCssString());
     pathElement.setAttribute('stroke-width', paint.strokeWidth);
     if (!enableFill) {
       pathElement.setAttribute('fill', 'none');
     }
   }
   if (paint.style == PaintingStyle.fill) {
-    pathElement.setAttribute('fill', colorToCssString(paint.color)!);
+    pathElement.setAttribute('fill', paint.color.toCssString());
   }
   pathElement.setAttribute('d', pathToSvg((path as SurfacePath).pathRef)); // This is what we're testing!
   return root;
@@ -230,13 +230,4 @@ class ArcSample {
         clockwise: clockwise);
     return path;
   }
-
-  // Returns bounds of start/end point of arc.
-  Rect getBounds() {
-    final Offset startP =
-        Offset(75 - distance + offset.dx, 75 - distance + offset.dy);
-    final Offset endP =
-        Offset(75.0 + distance + offset.dx, 75.0 + distance + offset.dy);
-    return Rect.fromLTRB(startP.dx, startP.dy, endP.dx, endP.dy);
-  }
 }
diff --git a/lib/web_ui/test/html/path_transform_golden_test.dart b/lib/web_ui/test/html/path_transform_golden_test.dart
index cb5b398169540e043433b4a3c791924ca348e5ec..68a2b417c0a229f1af5d1de18c23f52051cd3874 100644
--- a/lib/web_ui/test/html/path_transform_golden_test.dart
+++ b/lib/web_ui/test/html/path_transform_golden_test.dart
@@ -9,6 +9,7 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' hide TextStyle;
 
+import '../common/test_initialization.dart';
 import 'screenshot.dart';
 
 void main() {
@@ -20,12 +21,9 @@ Future<void> testMain() async {
   const double screenHeight = 800.0;
   const Rect screenRect = Rect.fromLTWH(0, 0, screenWidth, screenHeight);
 
-  setUpAll(() async {
-    debugEmulateFlutterTesterEnvironment = true;
-    await webOnlyInitializePlatform();
-    await renderer.fontCollection.debugDownloadTestFonts();
-    renderer.fontCollection.registerDownloadedFonts();
-  });
+  setUpUnitTests(
+    setUpTestViewDimensions: false,
+  );
 
   test('Should draw transformed line.', () async {
     final RecordingCanvas rc =
diff --git a/lib/web_ui/test/html/recording_canvas_golden_test.dart b/lib/web_ui/test/html/recording_canvas_golden_test.dart
index eaad748b4b8de5d3019a6e2946d33473847adeb1..f1377059d6ab0edf2ba4bf336077d5ab1e231583 100644
--- a/lib/web_ui/test/html/recording_canvas_golden_test.dart
+++ b/lib/web_ui/test/html/recording_canvas_golden_test.dart
@@ -7,23 +7,22 @@ import 'dart:typed_data';
 
 import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
-import 'package:ui/src/engine.dart';
+import 'package:ui/src/engine.dart' hide ColorSpace;
 import 'package:ui/ui.dart' hide TextStyle;
 import 'package:web_engine_tester/golden_tester.dart';
 
-import '../matchers.dart';
-import 'screenshot.dart';
+import '../common/matchers.dart';
+import '../common/test_initialization.dart';
 
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
 
 Future<void> testMain() async {
-  setUpAll(() async {
-    debugEmulateFlutterTesterEnvironment = true;
-  });
-
-  setUpStableTestFonts();
+  setUpUnitTests(
+    withImplicitView: true,
+    setUpTestViewDimensions: false,
+  );
 
   const double screenWidth = 600.0;
   const double screenHeight = 800.0;
@@ -37,7 +36,7 @@ Future<void> testMain() async {
     final EngineCanvas engineCanvas = BitmapCanvas(screenRect,
         RenderStrategy());
 
-    // Draws the estimated bounds so we can spot the bug in Scuba.
+    // Draws the estimated bounds so we can spot the bug in Gold.
     engineCanvas
       ..save()
       ..drawRect(
@@ -65,7 +64,7 @@ Future<void> testMain() async {
       await matchGoldenFile('paint_bounds_for_$fileName.png', region: region);
     } finally {
       // The page is reused across tests, so remove the element after taking the
-      // Scuba screenshot.
+      // screenshot.
       sceneElement.remove();
     }
   }
@@ -418,7 +417,7 @@ Future<void> testMain() async {
     expect(
       rc.pictureBounds,
       within(
-          distance: 0.05, from: const Rect.fromLTRB(17.9, 28.5, 103.5, 114.1)),
+          distance: 0.05, from: const Rect.fromLTRB(0.0, 8.5, 123.5, 134.1)),
     );
     await checkScreenshot(rc, 'path_with_shadow');
   });
@@ -780,6 +779,9 @@ class TestImage implements Image {
 
   @override
   List<StackTrace>/*?*/ debugGetOpenHandleStackTraces() => <StackTrace>[];
+
+  @override
+  ColorSpace get colorSpace => ColorSpace.sRGB;
 }
 
 Paragraph createTestParagraph() {
diff --git a/lib/web_ui/test/html/resource_manager_test.dart b/lib/web_ui/test/html/resource_manager_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..18fecdd2f80c1bbb2f75182bff68e489abbd2d7c
--- /dev/null
+++ b/lib/web_ui/test/html/resource_manager_test.dart
@@ -0,0 +1,91 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+void testMain() {
+  final DomElement hostElement = createDomHTMLDivElement();
+  late DomManager domManager;
+  late ResourceManager resourceManager;
+
+  setUp(() {
+    domManager = DomManager(devicePixelRatio: 3);
+    hostElement.appendChild(domManager.rootElement);
+    resourceManager = ResourceManager(domManager);
+  });
+
+  tearDown(() {
+    hostElement.clearChildren();
+  });
+
+  test('prepends resources host as sibling to root element (webkit)', () {
+    debugBrowserEngineOverride = BrowserEngine.webkit;
+
+    // Resource host hasn't been inserted yet.
+    expect(
+      hostElement.children.map((DomElement e) => e.tagName.toLowerCase()),
+      isNot(contains(ResourceManager.resourcesHostTagName.toLowerCase())),
+    );
+
+    final List<DomElement> resources = <DomElement>[
+      createDomHTMLDivElement()..setAttribute('test-resource', 'r1'),
+      createDomHTMLDivElement()..setAttribute('test-resource', 'r2'),
+      createDomHTMLDivElement()..setAttribute('test-resource', 'r3'),
+    ];
+    resources.forEach(resourceManager.addResource);
+
+    final DomElement resourcesHost = hostElement.firstElementChild!;
+    expect(
+      resourcesHost.tagName.toLowerCase(),
+      ResourceManager.resourcesHostTagName.toLowerCase(),
+    );
+    // Make sure the resources were correctly inserted into the host.
+    expect(resourcesHost.children, resources);
+
+    debugBrowserEngineOverride = null;
+  });
+
+  test('prepends resources host inside the shadow root (non-webkit)', () {
+    debugBrowserEngineOverride = BrowserEngine.blink;
+
+    // Resource host hasn't been inserted yet.
+    expect(
+      hostElement.children.map((DomElement e) => e.tagName.toLowerCase()),
+      isNot(contains(ResourceManager.resourcesHostTagName.toLowerCase())),
+    );
+
+    final List<DomElement> resources = <DomElement>[
+      createDomHTMLDivElement()..setAttribute('test-resource', 'r1'),
+      createDomHTMLDivElement()..setAttribute('test-resource', 'r2'),
+      createDomHTMLDivElement()..setAttribute('test-resource', 'r3'),
+    ];
+    resources.forEach(resourceManager.addResource);
+
+    final DomElement resourcesHost = domManager.renderingHost.firstElementChild!;
+    expect(
+      resourcesHost.tagName.toLowerCase(),
+      ResourceManager.resourcesHostTagName.toLowerCase(),
+    );
+    // Make sure the resources were correctly inserted into the host.
+    expect(resourcesHost.children, resources);
+
+    debugBrowserEngineOverride = null;
+  });
+
+  test('can remove resource', () {
+    final DomHTMLDivElement resource = createDomHTMLDivElement();
+    resourceManager.addResource(resource);
+    final DomElement? resourceRoot = resource.parent;
+    expect(resourceRoot, isNotNull);
+    expect(resourceRoot!.childNodes.length, 1);
+    resourceManager.removeResource(resource);
+    expect(resourceRoot.childNodes.length, 0);
+  });
+}
diff --git a/lib/web_ui/test/html/screenshot.dart b/lib/web_ui/test/html/screenshot.dart
index 3e2226ae68803b72c3eb8752aecc83e7b2a571f6..f27177caab9b545f7410ece37c18f08ac20cad12 100644
--- a/lib/web_ui/test/html/screenshot.dart
+++ b/lib/web_ui/test/html/screenshot.dart
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 import 'dart:async';
-import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
 import 'package:web_engine_tester/golden_tester.dart';
@@ -49,7 +48,7 @@ Future<void> canvasScreenshot(
         region: region);
   } finally {
     // The page is reused across tests, so remove the element after taking the
-    // Scuba screenshot.
+    // screenshot.
     sceneElement.remove();
   }
 }
@@ -66,18 +65,7 @@ Future<void> sceneScreenshot(SurfaceSceneBuilder sceneBuilder, String fileName,
         region: region);
   } finally {
     // The page is reused across tests, so remove the element after taking the
-    // Scuba screenshot.
+    // screenshot.
     sceneElement?.remove();
   }
 }
-
-
-/// Configures the test to use bundled Roboto and Ahem fonts to avoid golden
-/// screenshot differences due to differences in the preinstalled system fonts.
-void setUpStableTestFonts() {
-  setUpAll(() async {
-    await ui.webOnlyInitializePlatform();
-    await renderer.fontCollection.debugDownloadTestFonts();
-    renderer.fontCollection.registerDownloadedFonts();
-  });
-}
diff --git a/lib/web_ui/test/html/shaders/gradient_golden_test.dart b/lib/web_ui/test/html/shaders/gradient_golden_test.dart
index 5aebc78ef0070c478bf1e967a67473598eb2d6fb..0a67ed766bc2d13e0281f9313400b46becb6a547 100644
--- a/lib/web_ui/test/html/shaders/gradient_golden_test.dart
+++ b/lib/web_ui/test/html/shaders/gradient_golden_test.dart
@@ -10,6 +10,7 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart';
 
+import '../../common/test_initialization.dart';
 import '../screenshot.dart';
 
 // TODO(yjbanov): unskip Firefox tests when Firefox implements WebGL in headless mode.
@@ -25,11 +26,7 @@ Future<void> testMain() async {
   const Rect screenRect = Rect.fromLTWH(0, 0, screenWidth, screenHeight);
   const Rect region = Rect.fromLTWH(0, 0, 500, 240);
 
-  setUp(() async {
-    debugEmulateFlutterTesterEnvironment = true;
-  });
-
-  setUpStableTestFonts();
+  setUpUnitTests(withImplicitView: true);
 
   test('Paints sweep gradient rectangles', () async {
     final RecordingCanvas canvas =
@@ -355,7 +352,7 @@ Future<void> testMain() async {
         RenderStrategy());
     canvas.endRecording();
     canvas.apply(engineCanvas, screenRect);
-  });
+  }, skip: isFirefox);
 
   test("Creating lots of gradients doesn't create too many webgl contexts",
       () async {
@@ -434,7 +431,7 @@ Future<void> testMain() async {
 
     canvas.restore();
     await canvasScreenshot(canvas, 'linear_gradient_rect_clamp_rotated', canvasRect: screenRect, region: region);
-  });
+    }, skip: isFirefox);
 
   test('Paints linear gradient properly when within svg context', () async {
     final RecordingCanvas canvas =
@@ -468,7 +465,176 @@ Future<void> testMain() async {
 
     canvas.restore();
     await canvasScreenshot(canvas, 'linear_gradient_in_svg_context', canvasRect: screenRect, region: region);
-  });
+  }, skip: isFirefox);
+
+  test('Paints transformed linear gradient', () async {
+    final RecordingCanvas canvas =
+        RecordingCanvas(const Rect.fromLTRB(0, 0, 400, 300));
+    canvas.save();
+
+    const List<Color> colors = <Color>[
+      Color(0xFF000000),
+      Color(0xFFFF3C38),
+      Color(0xFFFF8C42),
+      Color(0xFFFFF275),
+      Color(0xFF6699CC),
+      Color(0xFF656D78),
+    ];
+
+    const List<double> stops = <double>[0.0, 0.05, 0.4, 0.6, 0.9, 1.0];
+
+    final Matrix4 transform = Matrix4.identity()
+      ..translate(50, 50)
+      ..scale(0.3, 0.7)
+      ..rotateZ(0.5);
+
+    final GradientLinear linearGradient = GradientLinear(
+      const Offset(5, 5),
+      const Offset(200, 130),
+      colors,
+      stops,
+      TileMode.clamp,
+      transform.storage,
+    );
+
+    const double kBoxWidth = 150;
+    const double kBoxHeight = 80;
+
+    Rect rectBounds = const Rect.fromLTWH(10, 20, kBoxWidth, kBoxHeight);
+    canvas.drawRect(
+      rectBounds,
+      SurfacePaint()
+        ..shader = engineLinearGradientToShader(linearGradient, rectBounds),
+    );
+
+    rectBounds = const Rect.fromLTWH(10, 110, kBoxWidth, kBoxHeight);
+    canvas.drawOval(
+      rectBounds,
+      SurfacePaint()
+        ..shader = engineLinearGradientToShader(linearGradient, rectBounds),
+    );
+
+    canvas.restore();
+    await canvasScreenshot(
+      canvas,
+      'linear_gradient_clamp_transformed',
+      canvasRect: screenRect,
+      region: region,
+    );
+  }, skip: isFirefox);
+
+  test('Paints transformed sweep gradient', () async {
+    final RecordingCanvas canvas =
+        RecordingCanvas(const Rect.fromLTRB(0, 0, 400, 300));
+    canvas.save();
+
+    const List<Color> colors = <Color>[
+      Color(0xFF000000),
+      Color(0xFFFF3C38),
+      Color(0xFFFF8C42),
+      Color(0xFFFFF275),
+      Color(0xFF6699CC),
+      Color(0xFF656D78),
+    ];
+
+    const List<double> stops = <double>[0.0, 0.05, 0.4, 0.6, 0.9, 1.0];
+
+    final Matrix4 transform = Matrix4.identity()
+      ..translate(100, 150)
+      ..scale(0.3, 0.7)
+      ..rotateZ(0.5);
+
+    final GradientSweep sweepGradient = GradientSweep(
+      const Offset(0.5, 0.5),
+      colors,
+      stops,
+      TileMode.clamp,
+      0.0,
+      2 * math.pi,
+      transform.storage,
+    );
+
+    const double kBoxWidth = 150;
+    const double kBoxHeight = 80;
+
+    Rect rectBounds = const Rect.fromLTWH(10, 20, kBoxWidth, kBoxHeight);
+    canvas.drawRect(
+      rectBounds,
+      SurfacePaint()
+        ..shader = engineGradientToShader(sweepGradient, rectBounds),
+    );
+
+    rectBounds = const Rect.fromLTWH(10, 110, kBoxWidth, kBoxHeight);
+    canvas.drawOval(
+      rectBounds,
+      SurfacePaint()
+        ..shader = engineGradientToShader(sweepGradient, rectBounds),
+    );
+
+    canvas.restore();
+    await canvasScreenshot(
+      canvas,
+      'sweep_gradient_clamp_transformed',
+      canvasRect: screenRect,
+      region: region,
+    );
+  }, skip: isFirefox);
+
+  test('Paints transformed radial gradient', () async {
+    final RecordingCanvas canvas =
+        RecordingCanvas(const Rect.fromLTRB(0, 0, 400, 300));
+    canvas.save();
+
+    const List<Color> colors = <Color>[
+      Color(0xFF000000),
+      Color(0xFFFF3C38),
+      Color(0xFFFF8C42),
+      Color(0xFFFFF275),
+      Color(0xFF6699CC),
+      Color(0xFF656D78),
+    ];
+
+    const List<double> stops = <double>[0.0, 0.05, 0.4, 0.6, 0.9, 1.0];
+
+    final Matrix4 transform = Matrix4.identity()
+      ..translate(50, 50)
+      ..scale(0.3, 0.7)
+      ..rotateZ(0.5);
+
+    final GradientRadial radialGradient = GradientRadial(
+      const Offset(0.5, 0.5),
+      400,
+      colors,
+      stops,
+      TileMode.clamp,
+      transform.storage,
+    );
+
+    const double kBoxWidth = 150;
+    const double kBoxHeight = 80;
+
+    Rect rectBounds = const Rect.fromLTWH(10, 20, kBoxWidth, kBoxHeight);
+    canvas.drawRect(
+      rectBounds,
+      SurfacePaint()
+        ..shader = engineRadialGradientToShader(radialGradient, rectBounds),
+    );
+
+    rectBounds = const Rect.fromLTWH(10, 110, kBoxWidth, kBoxHeight);
+    canvas.drawOval(
+      rectBounds,
+      SurfacePaint()
+        ..shader = engineRadialGradientToShader(radialGradient, rectBounds),
+    );
+
+    canvas.restore();
+    await canvasScreenshot(
+      canvas,
+      'radial_gradient_clamp_transformed',
+      canvasRect: screenRect,
+      region: region,
+    );
+  }, skip: isFirefox);
 }
 
 Shader engineGradientToShader(GradientSweep gradient, Rect rect) {
@@ -491,6 +657,18 @@ Shader engineLinearGradientToShader(GradientLinear gradient, Rect rect) {
   );
 }
 
+Shader engineRadialGradientToShader(GradientRadial gradient, Rect rect) {
+  return Gradient.radial(
+    Offset(rect.left + gradient.center.dx * rect.width,
+        rect.top + gradient.center.dy * rect.height),
+    gradient.radius,
+    gradient.colors,
+    gradient.colorStops,
+    gradient.tileMode,
+    gradient.matrix4 == null ? null : Float64List.fromList(gradient.matrix4!),
+  );
+}
+
 Path samplePathFromRect(Rect rectBounds) =>
   Path()
     ..moveTo(rectBounds.center.dx, rectBounds.top)
diff --git a/lib/web_ui/test/html/shaders/image_shader_golden_test.dart b/lib/web_ui/test/html/shaders/image_shader_golden_test.dart
index 405250062d46286bc26d6446590ac0b0459ec0c1..ba7d7fc52ab23cbb605a43f01bbe25feae9b1861 100644
--- a/lib/web_ui/test/html/shaders/image_shader_golden_test.dart
+++ b/lib/web_ui/test/html/shaders/image_shader_golden_test.dart
@@ -9,6 +9,7 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' hide TextStyle;
 
+import '../../common/test_initialization.dart';
 import '../screenshot.dart';
 
 // TODO(yjbanov): unskip Firefox tests when Firefox implements WebGL in headless mode.
@@ -24,12 +25,9 @@ Future<void> testMain() async {
   const Rect screenRect = Rect.fromLTWH(0, 0, screenWidth, screenHeight);
   final HtmlImage testImage = createTestImage();
 
-  setUpAll(() async {
-    debugEmulateFlutterTesterEnvironment = true;
-    await webOnlyInitializePlatform();
-    await renderer.fontCollection.debugDownloadTestFonts();
-    renderer.fontCollection.registerDownloadedFonts();
-  });
+  setUpUnitTests(
+    setUpTestViewDimensions: false,
+  );
 
   void drawShapes(RecordingCanvas rc, SurfacePaint paint, Rect shaderRect) {
     /// Rect.
diff --git a/lib/web_ui/test/html/shaders/linear_gradient_golden_test.dart b/lib/web_ui/test/html/shaders/linear_gradient_golden_test.dart
index 742067e4914e0d89a645f42b360b55ad0781ebaa..433d697348535358b206c1e19c8fe5b9677f2b64 100644
--- a/lib/web_ui/test/html/shaders/linear_gradient_golden_test.dart
+++ b/lib/web_ui/test/html/shaders/linear_gradient_golden_test.dart
@@ -8,6 +8,7 @@ import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' hide TextStyle;
+import '../../common/test_initialization.dart';
 import '../screenshot.dart';
 
 // TODO(yjbanov): unskip Firefox tests when Firefox implements WebGL in headless mode.
@@ -18,12 +19,9 @@ void main() {
 }
 
 Future<void> testMain() async {
-  setUpAll(() async {
-    debugEmulateFlutterTesterEnvironment = true;
-    await webOnlyInitializePlatform();
-    await renderer.fontCollection.debugDownloadTestFonts();
-    renderer.fontCollection.registerDownloadedFonts();
-  });
+  setUpUnitTests(
+    setUpTestViewDimensions: false,
+  );
 
   test('Should draw linear gradient using rectangle.', () async {
     final RecordingCanvas rc =
@@ -86,7 +84,7 @@ Future<void> testMain() async {
     }
     expect(rc.renderStrategy.hasArbitraryPaint, isTrue);
     await canvasScreenshot(rc, 'linear_gradient_oval_matrix');
-  });
+  }, skip: isFirefox);
 
   // Regression test for https://github.com/flutter/flutter/issues/50010
   test('Should draw linear gradient using rounded rect.', () async {
diff --git a/lib/web_ui/test/html/shaders/radial_gradient_golden_test.dart b/lib/web_ui/test/html/shaders/radial_gradient_golden_test.dart
index 51bfab70965a1811e0af53bdaff9e8c242005fd0..27f64b3022a7a9778ee32c8edc9072ed44c131b1 100644
--- a/lib/web_ui/test/html/shaders/radial_gradient_golden_test.dart
+++ b/lib/web_ui/test/html/shaders/radial_gradient_golden_test.dart
@@ -6,6 +6,7 @@ import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' hide TextStyle;
+import '../../common/test_initialization.dart';
 import '../screenshot.dart';
 
 void main() {
@@ -13,13 +14,9 @@ void main() {
 }
 
 Future<void> testMain() async {
-
-  setUpAll(() async {
-    debugEmulateFlutterTesterEnvironment = true;
-    await webOnlyInitializePlatform();
-    await renderer.fontCollection.debugDownloadTestFonts();
-    renderer.fontCollection.registerDownloadedFonts();
-  });
+  setUpUnitTests(
+    setUpTestViewDimensions: false,
+  );
 
   Future<void> testGradient(String fileName, Shader shader,
       {Rect paintRect = const Rect.fromLTRB(50, 50, 300, 300),
diff --git a/lib/web_ui/test/html/shaders/shader_mask_golden_test.dart b/lib/web_ui/test/html/shaders/shader_mask_golden_test.dart
index 6c11494b9f8f02f17e5915340998f89ca77d12b1..06ea0f32d8fa6474cc0f38aa157c47195de8927d 100644
--- a/lib/web_ui/test/html/shaders/shader_mask_golden_test.dart
+++ b/lib/web_ui/test/html/shaders/shader_mask_golden_test.dart
@@ -10,11 +10,17 @@ import 'package:ui/ui.dart';
 
 import 'package:web_engine_tester/golden_tester.dart';
 
+import '../../common/test_initialization.dart';
+
 /// To debug compositing failures on browsers, set this flag to true and run
 /// flutter run -d chrome --web-renderer=html
 ///        test/golden_tests/engine/shader_mask_golden_test.dart --profile
 const bool debugTest = false;
 
+DomElement get sceneHost =>
+    EnginePlatformDispatcher.instance.implicitView!.dom.renderingHost
+        .querySelector(DomManager.sceneHostTagName)!;
+
 Future<void> main() async {
   if (!debugTest) {
     internalBootstrapBrowserTest(() => testMain);
@@ -29,20 +35,22 @@ Future<void> main() async {
 // https://github.com/flutter/flutter/issues/86623
 
 Future<void> testMain() async {
+  setUpUnitTests(
+    withImplicitView: true,
+    emulateTesterEnvironment: false,
+    setUpTestViewDimensions: false,
+  );
+
   setUpAll(() async {
     debugShowClipLayers = true;
-    await webOnlyInitializePlatform();
   });
 
   setUp(() async {
     SurfaceSceneBuilder.debugForgetFrameScene();
-    for (final DomNode scene in
-        flutterViewEmbedder.sceneHostElement!.querySelectorAll('flt-scene').cast<DomNode>()) {
+    for (final DomNode scene in sceneHost.querySelectorAll('flt-scene').cast<DomNode>()) {
       scene.remove();
     }
     initWebGl();
-    await renderer.fontCollection.debugDownloadTestFonts();
-    renderer.fontCollection.registerDownloadedFonts();
   });
 
   /// Should render the picture unmodified.
@@ -160,7 +168,7 @@ void _renderCirclesScene(BlendMode blendMode) {
   builder.addPicture(Offset.zero, circles2);
   builder.pop();
 
-  flutterViewEmbedder.sceneHostElement!.append(builder.build().webOnlyRootElement!);
+  sceneHost.append(builder.build().webOnlyRootElement!);
 }
 
 Picture _drawTestPictureWithText(
@@ -215,5 +223,5 @@ void _renderTextScene(BlendMode blendMode) {
   builder.addPicture(Offset.zero, textPicture2);
   builder.pop();
 
-  flutterViewEmbedder.sceneHostElement!.append(builder.build().webOnlyRootElement!);
+  sceneHost.append(builder.build().webOnlyRootElement!);
 }
diff --git a/lib/web_ui/test/html/shadow_golden_test.dart b/lib/web_ui/test/html/shadow_golden_test.dart
index 4ca020c030b52f4b1be717f0f5de87ca1c4a9068..ca0b7ccee366b0f6deb8d3526a90fbe102252945 100644
--- a/lib/web_ui/test/html/shadow_golden_test.dart
+++ b/lib/web_ui/test/html/shadow_golden_test.dart
@@ -9,7 +9,7 @@ import 'package:ui/ui.dart';
 
 import 'package:web_engine_tester/golden_tester.dart';
 
-import 'screenshot.dart';
+import '../common/test_initialization.dart';
 
 const Color _kShadowColor = Color.fromARGB(255, 0, 0, 0);
 
@@ -22,7 +22,10 @@ Future<void> testMain() async {
 
   late SurfaceSceneBuilder builder;
 
-  setUpStableTestFonts();
+  setUpUnitTests(
+    emulateTesterEnvironment: false,
+    setUpTestViewDimensions: false,
+  );
 
   setUp(() {
     builder = SurfaceSceneBuilder();
@@ -56,22 +59,6 @@ Future<void> testMain() async {
     builder.addPicture(Offset.zero, recorder.endRecording());
   }
 
-  void paintPhysicalShapeShadow(double elevation, Offset offset) {
-    final SurfacePath path = SurfacePath()
-      ..addRect(const Rect.fromLTRB(0, 0, 20, 20));
-    builder.pushOffset(offset.dx, offset.dy);
-    builder.pushPhysicalShape(
-      path: path,
-      elevation: elevation,
-      shadowColor: _kShadowColor,
-      color: const Color.fromARGB(255, 255, 255, 255),
-    );
-    builder.pop(); // physical shape
-    paintShapeOutline();
-    paintShadowBounds(path, elevation);
-    builder.pop(); // offset
-  }
-
   void paintBitmapCanvasShadow(
       double elevation, Offset offset, bool transparentOccluder) {
     final SurfacePath path = SurfacePath()
@@ -135,10 +122,6 @@ Future<void> testMain() async {
 
       builder.pushOffset(10, 20);
 
-      for (int i = 0; i < 10; i++) {
-        paintPhysicalShapeShadow(i.toDouble(), Offset(50.0 * i, 0));
-      }
-
       for (int i = 0; i < 10; i++) {
         paintBitmapCanvasShadow(i.toDouble(), Offset(50.0 * i, 60), false);
       }
diff --git a/lib/web_ui/test/text/canvas_paragraph_builder_test.dart b/lib/web_ui/test/html/text/canvas_paragraph_builder_test.dart
similarity index 90%
rename from lib/web_ui/test/text/canvas_paragraph_builder_test.dart
rename to lib/web_ui/test/html/text/canvas_paragraph_builder_test.dart
index b8d92315da7d25570b9b773b909f953b21fe1369..f0fbf8e2d0bee4c43ac947b6d4ec5de2be052310 100644
--- a/lib/web_ui/test/text/canvas_paragraph_builder_test.dart
+++ b/lib/web_ui/test/html/text/canvas_paragraph_builder_test.dart
@@ -6,8 +6,10 @@ import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart';
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
-import '../html/paragraph/helper.dart';
+import '../../common/test_initialization.dart';
+import '../paragraph/helper.dart';
 
 /// Some text measurements are sensitive to browser implementations. Position
 /// info in the following tests only pass in Chrome, they are slightly different
@@ -31,7 +33,7 @@ void main() {
 }
 
 Future<void> testMain() async {
-  await initializeTestFlutterViewEmbedder();
+  setUpUnitTests(withImplicitView: true);
 
   test('empty paragraph', () {
     final CanvasParagraph paragraph1 = rich(
@@ -410,10 +412,10 @@ Future<void> testMain() async {
   });
 
   test('various font sizes', () {
-    // Paragraphs and spans force the Ahem font in test mode. We need to trick
-    // them into thinking they are not in test mode, so they use the provided
-    // font family.
-    debugEmulateFlutterTesterEnvironment = false;
+    // Paragraphs and spans force the FlutterTest font in test mode. We need to
+    // trick them into thinking they are not in test mode, so they use the
+    // provided font family.
+    ui_web.debugEmulateFlutterTesterEnvironment = false;
     final EngineParagraphStyle style = EngineParagraphStyle(fontSize: 12.0, fontFamily: 'first');
     final CanvasParagraphBuilder builder = CanvasParagraphBuilder(style);
 
@@ -453,11 +455,45 @@ Future<void> testMain() async {
       // measurements.
       ignorePositions: true,
     );
-    debugEmulateFlutterTesterEnvironment = true;
+    ui_web.debugEmulateFlutterTesterEnvironment = true;
+  });
+
+  // Regression test for https://github.com/flutter/flutter/issues/108431.
+  // Set dir attribute for RTL fragments in order to let the browser
+  // handle mirrored characters.
+  test('Sets "dir" attribute for RTL fragment', () {
+    final EngineParagraphStyle style = EngineParagraphStyle(
+      fontSize: 20.0,
+      textDirection: TextDirection.rtl,
+    );
+    final CanvasParagraphBuilder builder = CanvasParagraphBuilder(style);
+
+    builder.addText('(1)');
+
+    final CanvasParagraph paragraph = builder.build();
+    expect(paragraph.paragraphStyle, style);
+    expect(paragraph.plainText, '(1)');
+
+    paragraph.layout(const ParagraphConstraints(width: double.infinity));
+    expectOuterHtml(
+      paragraph,
+      '<flt-paragraph style="${paragraphStyle()}">'
+      '<flt-span dir="rtl" style="${spanStyle(top: null, left: null, width: null, fontSize: 20)}">'
+      '('
+      '</flt-span>'
+      '<flt-span style="${spanStyle(top: null, left: null, width: null, fontSize: 20)}">'
+      '1'
+      '</flt-span>'
+      '<flt-span dir="rtl" style="${spanStyle(top: null, left: null, width: null, fontSize: 20)}">'
+      ')'
+      '</flt-span>'
+      '</flt-paragraph>',
+      ignorePositions: true,
+    );
   });
 }
 
-const String defaultFontFamily = 'Ahem';
+const String defaultFontFamily = 'FlutterTest';
 const num defaultFontSize = 14;
 
 String paragraphStyle() {
@@ -479,7 +515,6 @@ String spanStyle({
   num? letterSpacing,
 }) {
   return <String>[
-    'color: rgb(255, 0, 0);',
     'font-size: ${fontSize}px;',
     if (fontWeight != null) 'font-weight: $fontWeight;',
     if (fontStyle != null) 'font-style: $fontStyle;',
@@ -494,16 +529,14 @@ String spanStyle({
 }
 
 TextStyle styleWithDefaults({
-  Color color = const Color(0xFFFF0000),
-  String fontFamily = FlutterViewEmbedder.defaultFontFamily,
-  double fontSize = FlutterViewEmbedder.defaultFontSize,
+  String fontFamily = StyleManager.defaultFontFamily,
+  double fontSize = StyleManager.defaultFontSize,
   FontWeight? fontWeight,
   FontStyle? fontStyle,
   double? height,
   double? letterSpacing,
 }) {
   return TextStyle(
-    color: color,
     fontFamily: fontFamily,
     fontSize: fontSize,
     fontWeight: fontWeight,
diff --git a/lib/web_ui/test/text/canvas_paragraph_test.dart b/lib/web_ui/test/html/text/canvas_paragraph_test.dart
similarity index 98%
rename from lib/web_ui/test/text/canvas_paragraph_test.dart
rename to lib/web_ui/test/html/text/canvas_paragraph_test.dart
index c97ad8fb2b9538b24971254628621865fc366c82..a00c6d16f9357970de7bed55f56df74d16e991df 100644
--- a/lib/web_ui/test/text/canvas_paragraph_test.dart
+++ b/lib/web_ui/test/html/text/canvas_paragraph_test.dart
@@ -7,14 +7,16 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
 
-import '../html/paragraph/helper.dart';
+import '../../common/rendering.dart';
+import '../../common/test_initialization.dart';
+import '../paragraph/helper.dart';
 
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
 
 Future<void> testMain() async {
-  await initializeTestFlutterViewEmbedder();
+  setUpUnitTests(withImplicitView: true);
 
   group('$CanvasParagraph.getBoxesForRange', () {
     test('return empty list for invalid ranges', () {
@@ -700,7 +702,8 @@ Future<void> testMain() async {
       for (int i = 0; i < 11; i++) {
         expect(
           paragraph.getLineBoundary(ui.TextPosition(offset: i)),
-          const ui.TextRange(start: 0, end: 11),
+          // The "\n" is not included in the line boundary.
+          const ui.TextRange(start: 0, end: 10),
           reason: 'failed at offset $i',
         );
       }
@@ -709,7 +712,8 @@ Future<void> testMain() async {
       for (int i = 11; i < 23; i++) {
         expect(
           paragraph.getLineBoundary(ui.TextPosition(offset: i)),
-          const ui.TextRange(start: 11, end: 23),
+          // The "\n" is not included in the line boundary.
+          const ui.TextRange(start: 11, end: 22),
           reason: 'failed at offset $i',
         );
       }
@@ -773,15 +777,7 @@ Future<void> testMain() async {
     expect(paragraph.longestLine, 50.0);
   });
 
-  test('$CanvasParagraph.width should be a whole integer', () {
-    final ui.Paragraph paragraph = plain(ahemStyle, 'abc');
-    paragraph.layout(const ui.ParagraphConstraints(width: 30.8));
-
-    expect(paragraph.width, 30);
-    expect(paragraph.height, 10);
-  });
-
-  test('Render after dispose', () {
+  test('Render after dispose', () async {
     final ui.Paragraph paragraph = plain(ahemStyle, 'abc');
     paragraph.layout(const ui.ParagraphConstraints(width: 30.8));
 
@@ -796,7 +792,7 @@ Future<void> testMain() async {
     builder.addPicture(ui.Offset.zero, picture);
     final ui.Scene scene = builder.build();
 
-    ui.window.render(scene);
+    await renderScene(scene);
 
     picture.dispose();
     scene.dispose();
diff --git a/lib/web_ui/test/text/font_collection_test.dart b/lib/web_ui/test/html/text/font_collection_test.dart
similarity index 56%
rename from lib/web_ui/test/text/font_collection_test.dart
rename to lib/web_ui/test/html/text/font_collection_test.dart
index 8c074a2c38c7099b922de5a8455880745a7d3b36..3f7485ff71c40ac0a6829512a4f613f521ef1f82 100644
--- a/lib/web_ui/test/text/font_collection_test.dart
+++ b/lib/web_ui/test/html/text/font_collection_test.dart
@@ -7,36 +7,47 @@ import 'package:test/test.dart';
 
 import 'package:ui/src/engine.dart';
 
+import '../../common/fake_asset_manager.dart';
+import '../../common/test_initialization.dart';
+
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
 
 void testMain() {
-  group('$FontManager', () {
-    late FontManager fontManager;
+  group('$HtmlFontCollection', () {
+    setUpUnitTests();
+
     const String testFontUrl = '/assets/fonts/ahem.ttf';
 
+    late FakeAssetScope testScope;
     setUp(() {
-      fontManager = FontManager();
+      testScope = fakeAssetManager.pushAssetScope();
+      testScope.setAssetPassthrough(testFontUrl);
+
+      // Clear the fonts before the test begins to wipe out the fonts from the
+      // test initialization.
+      domDocument.fonts!.clear();
     });
 
     tearDown(() {
-      domDocument.fonts!.clear();
+      fakeAssetManager.popAssetScope(testScope);
     });
 
     group('regular special characters', () {
       test('Register Asset with no special characters', () async {
         const String testFontFamily = 'Ahem';
         final List<String> fontFamilyList = <String>[];
-
-        fontManager.downloadAsset(
-            testFontFamily, 'url($testFontUrl)', const <String, String>{});
-        await fontManager.downloadAllFonts();
-        fontManager.registerDownloadedFonts();
+        final HtmlFontCollection collection = HtmlFontCollection();
+        await collection.loadAssetFonts(FontManifest(<FontFamily>[
+          FontFamily(testFontFamily, <FontAsset>[
+            FontAsset(testFontUrl, <String, String>{})
+          ])
+        ]));
         domDocument.fonts!
-            .forEach(allowInterop((DomFontFace f, DomFontFace f2, DomFontFaceSet s) {
+            .forEach((DomFontFace f, DomFontFace f2, DomFontFaceSet s) {
           fontFamilyList.add(f.family!);
-        }));
+        });
 
         expect(fontFamilyList.length, equals(1));
         expect(fontFamilyList.first, 'Ahem');
@@ -46,14 +57,16 @@ void testMain() {
         const String testFontFamily = 'Ahem ahem ahem';
         final List<String> fontFamilyList = <String>[];
 
-        fontManager.downloadAsset(
-            testFontFamily, 'url($testFontUrl)', const <String, String>{});
-        await fontManager.downloadAllFonts();
-        fontManager.registerDownloadedFonts();
+        final HtmlFontCollection collection = HtmlFontCollection();
+        await collection.loadAssetFonts(FontManifest(<FontFamily>[
+          FontFamily(testFontFamily, <FontAsset>[
+            FontAsset(testFontUrl, <String, String>{})
+          ])
+        ]));
         domDocument.fonts!
-            .forEach(allowInterop((DomFontFace f, DomFontFace f2, DomFontFaceSet s) {
+            .forEach((DomFontFace f, DomFontFace f2, DomFontFaceSet s) {
           fontFamilyList.add(f.family!);
-        }));
+        });
 
         expect(fontFamilyList.length, equals(1));
         expect(fontFamilyList.first, 'Ahem ahem ahem');
@@ -65,18 +78,43 @@ void testMain() {
         const String testFontFamily = 'AhEm';
         final List<String> fontFamilyList = <String>[];
 
-        fontManager.downloadAsset(
-            testFontFamily, 'url($testFontUrl)', const <String, String>{});
-        await fontManager.downloadAllFonts();
-        fontManager.registerDownloadedFonts();
+        final HtmlFontCollection collection = HtmlFontCollection();
+        await collection.loadAssetFonts(FontManifest(<FontFamily>[
+          FontFamily(testFontFamily, <FontAsset>[
+            FontAsset(testFontUrl, <String, String>{})
+          ])
+        ]));
         domDocument.fonts!
-            .forEach(allowInterop((DomFontFace f, DomFontFace f2, DomFontFaceSet s) {
+            .forEach((DomFontFace f, DomFontFace f2, DomFontFaceSet s) {
           fontFamilyList.add(f.family!);
-        }));
+        });
 
         expect(fontFamilyList.length, equals(1));
         expect(fontFamilyList.first, 'AhEm');
       });
+
+      test('Register Asset with descriptor', () async {
+        const String testFontFamily = 'Ahem';
+        final List<String> fontFamilyList = <String>[];
+        final HtmlFontCollection collection = HtmlFontCollection();
+        await collection.loadAssetFonts(FontManifest(<FontFamily>[
+          FontFamily(testFontFamily, <FontAsset>[
+            FontAsset(testFontUrl, <String, String>{
+              'weight': 'bold'
+            })
+          ])
+        ]));
+
+        domDocument.fonts!
+            .forEach((DomFontFace f, DomFontFace f2, DomFontFaceSet s) {
+          expect(f.weight, 'bold');
+          expect(f2.weight, 'bold');
+          fontFamilyList.add(f.family!);
+        });
+
+        expect(fontFamilyList.length, equals(1));
+        expect(fontFamilyList.first, 'Ahem');
+      });
     });
 
     group('fonts with special characters', () {
@@ -84,14 +122,16 @@ void testMain() {
         const String testFontFamily = '/Ahem';
         final List<String> fontFamilyList = <String>[];
 
-        fontManager.downloadAsset(
-            testFontFamily, 'url($testFontUrl)', const <String, String>{});
-        await fontManager.downloadAllFonts();
-        fontManager.registerDownloadedFonts();
+        final HtmlFontCollection collection = HtmlFontCollection();
+        await collection.loadAssetFonts(FontManifest(<FontFamily>[
+          FontFamily(testFontFamily, <FontAsset>[
+            FontAsset(testFontUrl, <String, String>{})
+          ])
+        ]));
         domDocument.fonts!
-            .forEach(allowInterop((DomFontFace f, DomFontFace f2, DomFontFaceSet s) {
+            .forEach((DomFontFace f, DomFontFace f2, DomFontFaceSet s) {
           fontFamilyList.add(f.family!);
-        }));
+        });
 
         if (browserEngine != BrowserEngine.firefox) {
           expect(fontFamilyList.length, equals(2));
@@ -109,14 +149,16 @@ void testMain() {
         const String testFontFamily = 'Ahem!!ahem';
         final List<String> fontFamilyList = <String>[];
 
-        fontManager.downloadAsset(
-            testFontFamily, 'url($testFontUrl)', const <String, String>{});
-        await fontManager.downloadAllFonts();
-        fontManager.registerDownloadedFonts();
+        final HtmlFontCollection collection = HtmlFontCollection();
+        await collection.loadAssetFonts(FontManifest(<FontFamily>[
+          FontFamily(testFontFamily, <FontAsset>[
+            FontAsset(testFontUrl, <String, String>{})
+          ])
+        ]));
         domDocument.fonts!
-            .forEach(allowInterop((DomFontFace f, DomFontFace f2, DomFontFaceSet s) {
+            .forEach((DomFontFace f, DomFontFace f2, DomFontFaceSet s) {
           fontFamilyList.add(f.family!);
-        }));
+        });
 
         if (browserEngine != BrowserEngine.firefox) {
           expect(fontFamilyList.length, equals(2));
@@ -134,14 +176,16 @@ void testMain() {
         const String testFontFamily = 'Ahem ,ahem';
         final List<String> fontFamilyList = <String>[];
 
-        fontManager.downloadAsset(
-            testFontFamily, 'url($testFontUrl)', const <String, String>{});
-        await fontManager.downloadAllFonts();
-        fontManager.registerDownloadedFonts();
+        final HtmlFontCollection collection = HtmlFontCollection();
+        await collection.loadAssetFonts(FontManifest(<FontFamily>[
+          FontFamily(testFontFamily, <FontAsset>[
+            FontAsset(testFontUrl, <String, String>{})
+          ])
+        ]));
         domDocument.fonts!
-            .forEach(allowInterop((DomFontFace f, DomFontFace f2, DomFontFaceSet s) {
+            .forEach((DomFontFace f, DomFontFace f2, DomFontFaceSet s) {
           fontFamilyList.add(f.family!);
-        }));
+        });
 
         if (browserEngine != BrowserEngine.firefox) {
           expect(fontFamilyList.length, equals(2));
@@ -160,14 +204,16 @@ void testMain() {
         const String testFontFamily = 'Ahem 1998';
         final List<String> fontFamilyList = <String>[];
 
-        fontManager.downloadAsset(
-            testFontFamily, 'url($testFontUrl)', const <String, String>{});
-        await fontManager.downloadAllFonts();
-        fontManager.registerDownloadedFonts();
+        final HtmlFontCollection collection = HtmlFontCollection();
+        await collection.loadAssetFonts(FontManifest(<FontFamily>[
+          FontFamily(testFontFamily, <FontAsset>[
+            FontAsset(testFontUrl, <String, String>{})
+          ])
+        ]));
         domDocument.fonts!
-            .forEach(allowInterop((DomFontFace f, DomFontFace f2, DomFontFaceSet s) {
+            .forEach((DomFontFace f, DomFontFace f2, DomFontFaceSet s) {
           fontFamilyList.add(f.family!);
-        }));
+        });
 
         if (browserEngine != BrowserEngine.firefox) {
           expect(fontFamilyList.length, equals(2));
diff --git a/lib/web_ui/test/text/font_loading_test.dart b/lib/web_ui/test/html/text/font_loading_test.dart
similarity index 69%
rename from lib/web_ui/test/text/font_loading_test.dart
rename to lib/web_ui/test/html/text/font_loading_test.dart
index b68aef33d8ee36229217673bb38d72f53643d402..eb344b39eed6a020aaa3853d28afcca048a76f4a 100644
--- a/lib/web_ui/test/text/font_loading_test.dart
+++ b/lib/web_ui/test/html/text/font_loading_test.dart
@@ -11,12 +11,14 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
 
+import '../../common/test_initialization.dart';
+
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
 
 Future<void> testMain() async {
-  await initializeTestFlutterViewEmbedder();
+  setUpUnitTests(withImplicitView: true);
   group('loadFontFromList', () {
     const String testFontUrl = '/assets/fonts/ahem.ttf';
 
@@ -24,10 +26,11 @@ Future<void> testMain() async {
       domDocument.fonts!.clear();
     });
 
-    test('surfaces error from invalid font buffer', () async {
+    test('returns normally from invalid font buffer', () async {
       await expectLater(
-          ui.loadFontFromList(Uint8List(0), fontFamily: 'test-font'),
-          throwsA(const TypeMatcher<Exception>()));
+        () async => ui.loadFontFromList(Uint8List(0), fontFamily: 'test-font'),
+        returnsNormally
+      );
     },
         // TODO(hterkelsen): https://github.com/flutter/flutter/issues/56702
         skip: browserEngine == BrowserEngine.webkit);
@@ -35,11 +38,8 @@ Future<void> testMain() async {
     test('loads Blehm font from buffer', () async {
       expect(_containsFontFamily('Blehm'), isFalse);
 
-      final DomXMLHttpRequest response = await domHttpRequest(
-          testFontUrl,
-          responseType: 'arraybuffer');
-      await ui.loadFontFromList(Uint8List.view(response.response as ByteBuffer),
-          fontFamily: 'Blehm');
+      final ByteBuffer response = await httpFetchByteBuffer(testFontUrl);
+      await ui.loadFontFromList(response.asUint8List(), fontFamily: 'Blehm');
 
       expect(_containsFontFamily('Blehm'), isTrue);
     },
@@ -59,11 +59,8 @@ Future<void> testMain() async {
 
       // Now, loads a new font using loadFontFromList. This should clear the
       // cache
-      final DomXMLHttpRequest response = await domHttpRequest(
-          testFontUrl,
-          responseType: 'arraybuffer');
-      await ui.loadFontFromList(Uint8List.view(response.response as ByteBuffer),
-          fontFamily: 'Blehm');
+      final ByteBuffer response = await httpFetchByteBuffer(testFontUrl);
+      await ui.loadFontFromList(response.asUint8List(), fontFamily: 'Blehm');
 
       // Verifies the font is loaded, and the cache is cleaned.
       expect(_containsFontFamily('Blehm'), isTrue);
@@ -73,10 +70,10 @@ Future<void> testMain() async {
         skip: browserEngine == BrowserEngine.webkit);
 
     test('loading font should send font change message', () async {
-      final ui.PlatformMessageCallback? oldHandler = ui.window.onPlatformMessage;
+      final ui.PlatformMessageCallback? oldHandler = ui.PlatformDispatcher.instance.onPlatformMessage;
       String? actualName;
       String? message;
-      window.onPlatformMessage = (String name, ByteData? data,
+      ui.PlatformDispatcher.instance.onPlatformMessage = (String name, ByteData? data,
           ui.PlatformMessageResponseCallback? callback) {
         actualName = name;
         final ByteBuffer buffer = data!.buffer;
@@ -84,15 +81,12 @@ Future<void> testMain() async {
             buffer.asUint8List(data.offsetInBytes, data.lengthInBytes);
         message = utf8.decode(list);
       };
-      final DomXMLHttpRequest response = await domHttpRequest(
-          testFontUrl,
-          responseType: 'arraybuffer');
-      await ui.loadFontFromList(Uint8List.view(response.response as ByteBuffer),
-          fontFamily: 'Blehm');
+      final ByteBuffer response = await httpFetchByteBuffer(testFontUrl);
+      await ui.loadFontFromList(response.asUint8List(), fontFamily: 'Blehm');
       final Completer<void> completer = Completer<void>();
-      domWindow.requestAnimationFrame(allowInterop((_) { completer.complete();}) );
+      domWindow.requestAnimationFrame((_) { completer.complete();});
       await completer.future;
-      window.onPlatformMessage = oldHandler;
+      ui.PlatformDispatcher.instance.onPlatformMessage = oldHandler;
       expect(actualName, 'flutter/system');
       expect(message, '{"type":"fontsChange"}');
     },
@@ -103,11 +97,11 @@ Future<void> testMain() async {
 
 bool _containsFontFamily(String family) {
   bool found = false;
-  domDocument.fonts!.forEach(allowInterop((DomFontFace fontFace,
+  domDocument.fonts!.forEach((DomFontFace fontFace,
       DomFontFace fontFaceAgain, DomFontFaceSet fontFaceSet) {
     if (fontFace.family == family) {
       found = true;
     }
-  }));
+  });
   return found;
 }
diff --git a/lib/web_ui/test/text/layout_fragmenter_test.dart b/lib/web_ui/test/html/text/layout_fragmenter_test.dart
similarity index 84%
rename from lib/web_ui/test/text/layout_fragmenter_test.dart
rename to lib/web_ui/test/html/text/layout_fragmenter_test.dart
index a36dc89433db7762b288f6964580572da3b79a39..056c52c859c816ceed92321df29bd191858437d6 100644
--- a/lib/web_ui/test/text/layout_fragmenter_test.dart
+++ b/lib/web_ui/test/html/text/layout_fragmenter_test.dart
@@ -7,12 +7,11 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart';
 
-import '../html/paragraph/helper.dart';
+import '../paragraph/helper.dart';
 
 final EngineTextStyle defaultStyle = EngineTextStyle.only(
-  color: const Color(0xFFFF0000),
-  fontFamily: FlutterViewEmbedder.defaultFontFamily,
-  fontSize: FlutterViewEmbedder.defaultFontSize,
+  fontFamily: StyleManager.defaultFontFamily,
+  fontSize: StyleManager.defaultFontSize,
 );
 final EngineTextStyle style1 = defaultStyle.copyWith(fontSize: 20);
 final EngineTextStyle style2 = defaultStyle.copyWith(color: blue);
@@ -288,3 +287,53 @@ List<_Fragment> split(CanvasParagraph paragraph) {
 List<LayoutFragment> computeLayoutFragments(CanvasParagraph paragraph) {
   return LayoutFragmenter(paragraph.plainText, paragraph.spans).fragment();
 }
+
+extension _EngineTextStyle on EngineTextStyle {
+  EngineTextStyle copyWith({
+    Color? color,
+    TextDecoration? decoration,
+    Color? decorationColor,
+    TextDecorationStyle? decorationStyle,
+    double? decorationThickness,
+    FontWeight? fontWeight,
+    FontStyle? fontStyle,
+    TextBaseline? textBaseline,
+    String? fontFamily,
+    List<String>? fontFamilyFallback,
+    double? fontSize,
+    double? letterSpacing,
+    double? wordSpacing,
+    double? height,
+    TextLeadingDistribution? leadingDistribution,
+    Locale? locale,
+    Paint? background,
+    Paint? foreground,
+    List<Shadow>? shadows,
+    List<FontFeature>? fontFeatures,
+    List<FontVariation>? fontVariations,
+  }) {
+    return EngineTextStyle(
+      color: color ?? this.color,
+      decoration: decoration ?? this.decoration,
+      decorationColor: decorationColor ?? this.decorationColor,
+      decorationStyle: decorationStyle ?? this.decorationStyle,
+      decorationThickness: decorationThickness ?? this.decorationThickness,
+      fontWeight: fontWeight ?? this.fontWeight,
+      fontStyle: fontStyle ?? this.fontStyle,
+      textBaseline: textBaseline ?? this.textBaseline,
+      fontFamily: fontFamily ?? this.fontFamily,
+      fontFamilyFallback: fontFamilyFallback ?? this.fontFamilyFallback,
+      fontSize: fontSize ?? this.fontSize,
+      letterSpacing: letterSpacing ?? this.letterSpacing,
+      wordSpacing: wordSpacing ?? this.wordSpacing,
+      height: height ?? this.height,
+      leadingDistribution: leadingDistribution,
+      locale: locale ?? this.locale,
+      background: background ?? this.background,
+      foreground: foreground ?? this.foreground,
+      shadows: shadows ?? this.shadows,
+      fontFeatures: fontFeatures ?? this.fontFeatures,
+      fontVariations: fontVariations ?? this.fontVariations,
+    );
+  }
+}
diff --git a/lib/web_ui/test/text/layout_service_helper.dart b/lib/web_ui/test/html/text/layout_service_helper.dart
similarity index 94%
rename from lib/web_ui/test/text/layout_service_helper.dart
rename to lib/web_ui/test/html/text/layout_service_helper.dart
index e516d199ec790e780de6aadb27948c3f5a0469f8..545001c3a03121e10149b1ad95da5f987a44659f 100644
--- a/lib/web_ui/test/text/layout_service_helper.dart
+++ b/lib/web_ui/test/html/text/layout_service_helper.dart
@@ -107,6 +107,13 @@ void expectLines(CanvasParagraph paragraph, List<TestLine> expectedLines) {
             'line #$i had a different `left` value: "${line.left}" vs. "${expectedLine.left}"',
       );
     }
+    if (expectedLine.baseline != null) {
+      expect(
+        line.baseline,
+        expectedLine.baseline,
+        reason: 'line #$i had a different `baseline` value: "${line.baseline}" vs. "${expectedLine.baseline}"',
+      );
+    }
   }
 }
 
diff --git a/lib/web_ui/test/text/layout_service_plain_test.dart b/lib/web_ui/test/html/text/layout_service_plain_test.dart
similarity index 91%
rename from lib/web_ui/test/text/layout_service_plain_test.dart
rename to lib/web_ui/test/html/text/layout_service_plain_test.dart
index e67291e6ad95837b7c3845d964d7596d75f10560..870f2163bab242ea7f6fd40378c78eb95814a4d3 100644
--- a/lib/web_ui/test/text/layout_service_plain_test.dart
+++ b/lib/web_ui/test/html/text/layout_service_plain_test.dart
@@ -6,8 +6,10 @@ import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
-import '../html/paragraph/helper.dart';
+import '../../common/test_initialization.dart';
+import '../paragraph/helper.dart';
 import 'layout_service_helper.dart';
 
 const bool skipWordSpacing = true;
@@ -17,7 +19,7 @@ void main() {
 }
 
 Future<void> testMain() async {
-  await initializeTestFlutterViewEmbedder();
+  setUpUnitTests(withImplicitView: true);
 
   test('no text', () {
     final CanvasParagraph paragraph = CanvasParagraphBuilder(ahemStyle).build();
@@ -388,7 +390,7 @@ Future<void> testMain() async {
 
   test('respects text overflow', () {
     final EngineParagraphStyle overflowStyle = EngineParagraphStyle(
-      fontFamily: 'ahem',
+      fontFamily: 'Ahem',
       fontSize: 10,
       ellipsis: '...',
     );
@@ -458,7 +460,7 @@ Future<void> testMain() async {
 
   test('respects max lines', () {
     final EngineParagraphStyle maxlinesStyle = EngineParagraphStyle(
-      fontFamily: 'ahem',
+      fontFamily: 'Ahem',
       fontSize: 10,
       maxLines: 2,
     );
@@ -506,13 +508,13 @@ Future<void> testMain() async {
 
   test('respects text overflow and max lines combined', () {
     final EngineParagraphStyle onelineStyle = EngineParagraphStyle(
-      fontFamily: 'ahem',
+      fontFamily: 'Ahem',
       fontSize: 10,
       maxLines: 1,
       ellipsis: '...',
     );
     final EngineParagraphStyle multilineStyle = EngineParagraphStyle(
-      fontFamily: 'ahem',
+      fontFamily: 'Ahem',
       fontSize: 10,
       maxLines: 2,
       ellipsis: '...',
@@ -591,7 +593,7 @@ Future<void> testMain() async {
 
     EngineParagraphStyle createStyle(ui.TextAlign textAlign) {
       return EngineParagraphStyle(
-        fontFamily: 'ahem',
+        fontFamily: 'Ahem',
         fontSize: 10,
         textAlign: textAlign,
         textDirection: ui.TextDirection.ltr,
@@ -644,7 +646,7 @@ Future<void> testMain() async {
 
     EngineParagraphStyle createStyle(ui.TextAlign textAlign) {
       return EngineParagraphStyle(
-        fontFamily: 'ahem',
+        fontFamily: 'Ahem',
         fontSize: 10,
         textAlign: textAlign,
         textDirection: ui.TextDirection.rtl,
@@ -691,4 +693,64 @@ Future<void> testMain() async {
       l('i', 9, 10, hardBreak: true, width: 10.0, left: 40.0),
     ]);
   });
+
+  test('uses a single minimal canvas', () {
+    debugResetCanvasCount();
+
+    plain(ahemStyle, 'Lorem').layout(constrain(double.infinity));
+    plain(ahemStyle, 'ipsum dolor').layout(constrain(150.0));
+    // Try different styles too.
+    plain(EngineParagraphStyle(fontWeight: ui.FontWeight.bold), 'sit amet').layout(constrain(300.0));
+
+    expect(textContext.canvas!.width, isZero);
+    expect(textContext.canvas!.height, isZero);
+    // This number is 0 instead of 1 because the canvas is created at the top
+    // level as a global variable. So by the time this test runs, the canvas
+    // would have been created already.
+    //
+    // So we just make sure that no new canvas is created after the above layout
+    // calls.
+    expect(debugCanvasCount, 0);
+  });
+
+  test('does not leak styles across spanometers', () {
+    // This prevents the Ahem font from being forced in all paragraphs.
+    ui_web.debugEmulateFlutterTesterEnvironment = false;
+
+    final CanvasParagraph p1 = plain(
+      EngineParagraphStyle(
+        fontSize: 20.0,
+        fontFamily: 'FontFamily1',
+      ),
+      'Lorem',
+    )..layout(constrain(double.infinity));
+    // After the layout, the canvas should have the above style applied.
+    expect(textContext.font, contains('20px'));
+    expect(textContext.font, contains('FontFamily1'));
+
+    final CanvasParagraph p2 = plain(
+      EngineParagraphStyle(
+        fontSize: 40.0,
+        fontFamily: 'FontFamily2',
+      ),
+      'ipsum dolor',
+    )..layout(constrain(double.infinity));
+    // After the layout, the canvas should have the above style applied.
+    expect(textContext.font, contains('40px'));
+    expect(textContext.font, contains('FontFamily2'));
+
+    p1.getBoxesForRange(0, 2);
+    // getBoxesForRange performs some text measurements. Let's make sure that it
+    // applied the correct style.
+    expect(textContext.font, contains('20px'));
+    expect(textContext.font, contains('FontFamily1'));
+
+    p2.getBoxesForRange(0, 4);
+    // getBoxesForRange performs some text measurements. Let's make sure that it
+    // applied the correct style.
+    expect(textContext.font, contains('40px'));
+    expect(textContext.font, contains('FontFamily2'));
+
+    ui_web.debugEmulateFlutterTesterEnvironment = true;
+  });
 }
diff --git a/lib/web_ui/test/text/layout_service_rich_test.dart b/lib/web_ui/test/html/text/layout_service_rich_test.dart
similarity index 97%
rename from lib/web_ui/test/text/layout_service_rich_test.dart
rename to lib/web_ui/test/html/text/layout_service_rich_test.dart
index 9843d154bf8a2b94b94934f6bef1ed65fdb022d1..01f358f22632de870907f29e53fc865ecbfd61df 100644
--- a/lib/web_ui/test/text/layout_service_rich_test.dart
+++ b/lib/web_ui/test/html/text/layout_service_rich_test.dart
@@ -8,7 +8,8 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
 
-import '../html/paragraph/helper.dart';
+import '../../common/test_initialization.dart';
+import '../paragraph/helper.dart';
 import 'layout_service_helper.dart';
 
 void main() {
@@ -16,7 +17,7 @@ void main() {
 }
 
 Future<void> testMain() async {
-  await initializeTestFlutterViewEmbedder();
+  setUpUnitTests(withImplicitView: true);
 
   test('does not crash on empty spans', () {
     final CanvasParagraph paragraph = rich(ahemStyle, (CanvasParagraphBuilder builder) {
@@ -143,7 +144,7 @@ Future<void> testMain() async {
 
   test('should handle placeholder-only paragraphs', () {
     final EngineParagraphStyle paragraphStyle = EngineParagraphStyle(
-      fontFamily: 'ahem',
+      fontFamily: 'Ahem',
       fontSize: 10,
       textAlign: ui.TextAlign.center,
     );
@@ -161,7 +162,7 @@ Future<void> testMain() async {
 
   test('correct maxIntrinsicWidth when paragraph ends with placeholder', () {
     final EngineParagraphStyle paragraphStyle = EngineParagraphStyle(
-      fontFamily: 'ahem',
+      fontFamily: 'Ahem',
       fontSize: 10,
       textAlign: ui.TextAlign.center,
     );
@@ -180,7 +181,7 @@ Future<void> testMain() async {
 
   test('handles new line followed by a placeholder', () {
     final EngineParagraphStyle paragraphStyle = EngineParagraphStyle(
-      fontFamily: 'ahem',
+      fontFamily: 'Ahem',
       fontSize: 10,
       textAlign: ui.TextAlign.center,
     );
diff --git a/lib/web_ui/test/text/line_breaker_test.dart b/lib/web_ui/test/html/text/line_breaker_test.dart
similarity index 90%
rename from lib/web_ui/test/text/line_breaker_test.dart
rename to lib/web_ui/test/html/text/line_breaker_test.dart
index 479920271d4ea2c4719ec6cef5205c18ecc78440..c59063f967e1f40c482ef80ce9303565a14c3c53 100644
--- a/lib/web_ui/test/text/line_breaker_test.dart
+++ b/lib/web_ui/test/html/text/line_breaker_test.dart
@@ -8,7 +8,7 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart';
 
-import '../html/paragraph/helper.dart';
+import '../paragraph/helper.dart';
 import 'line_breaker_test_helper.dart';
 import 'line_breaker_test_raw_data.dart';
 
@@ -410,9 +410,48 @@ void testMain() {
       }
     });
   });
+
+  group('v8BreakIterator hard line breaks', () {
+    List<Line> split(String text) {
+      return V8LineBreakFragmenter(text)
+          .fragment()
+          .map((LineBreakFragment fragment) => Line.fromLineBreakFragment(text, fragment))
+          .toList();
+    }
+
+    test('thai text with hard line breaks', () {
+      const String thaiText = '\u0E1A\u0E38\u0E1C\u0E25\u0E01\u0E32\u0E23';
+      expect(split(thaiText), <Line>[
+        Line('\u0E1A\u0E38', opportunity),
+        Line('\u0E1C\u0E25', opportunity),
+        Line('\u0E01\u0E32\u0E23', endOfText),
+      ]);
+      expect(split('$thaiText\n'), <Line>[
+        Line('\u0E1A\u0E38', opportunity),
+        Line('\u0E1C\u0E25', opportunity),
+        Line('\u0E01\u0E32\u0E23\n', mandatory, nl: 1, sp: 1),
+        Line('', endOfText),
+      ]);
+    });
+
+    test('khmer text with hard line breaks', () {
+      const String khmerText =
+          '\u179B\u1792\u17D2\u179C\u17BE\u17B2\u17D2\u1799';
+      expect(split(khmerText), <Line>[
+        Line('\u179B', opportunity),
+        Line('\u1792\u17D2\u179C\u17BE', opportunity),
+        Line('\u17B2\u17D2\u1799', endOfText),
+      ]);
+      expect(split('$khmerText\n'), <Line>[
+        Line('\u179B', opportunity),
+        Line('\u1792\u17D2\u179C\u17BE', opportunity),
+        Line('\u17B2\u17D2\u1799\n', mandatory, nl: 1, sp: 1),
+        Line('', endOfText),
+      ]);
+    });
+  }, skip: domIntl.v8BreakIterator == null);
 }
 
-typedef CreateLineBreakFragmenter = LineBreakFragmenter Function(String text);
 typedef GroupBody = void Function({required bool isV8});
 
 void groupForEachFragmenter(GroupBody callback) {
@@ -421,7 +460,7 @@ void groupForEachFragmenter(GroupBody callback) {
     () => callback(isV8: false),
   );
 
-  if (domWindow.Intl.v8BreakIterator != null) {
+  if (domIntl.v8BreakIterator != null) {
     group(
       '$V8LineBreakFragmenter',
       () => callback(isV8: true),
diff --git a/lib/web_ui/test/text/line_breaker_test_helper.dart b/lib/web_ui/test/html/text/line_breaker_test_helper.dart
similarity index 100%
rename from lib/web_ui/test/text/line_breaker_test_helper.dart
rename to lib/web_ui/test/html/text/line_breaker_test_helper.dart
diff --git a/lib/web_ui/test/text/line_breaker_test_raw_data.dart b/lib/web_ui/test/html/text/line_breaker_test_raw_data.dart
similarity index 100%
rename from lib/web_ui/test/text/line_breaker_test_raw_data.dart
rename to lib/web_ui/test/html/text/line_breaker_test_raw_data.dart
diff --git a/lib/web_ui/test/text/text_direction_test.dart b/lib/web_ui/test/html/text/text_direction_test.dart
similarity index 99%
rename from lib/web_ui/test/text/text_direction_test.dart
rename to lib/web_ui/test/html/text/text_direction_test.dart
index 3c39220c0159e141c629721dbaf78cda65fbc810..9049c0948ef54147a4ae22d29f7dff0bdcdb897e 100644
--- a/lib/web_ui/test/text/text_direction_test.dart
+++ b/lib/web_ui/test/html/text/text_direction_test.dart
@@ -7,7 +7,7 @@ import 'package:test/test.dart';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart';
 
-import '../html/paragraph/helper.dart';
+import '../paragraph/helper.dart';
 
 void main() {
   internalBootstrapBrowserTest(() => testMain);
diff --git a/lib/web_ui/test/text/word_breaker_test.dart b/lib/web_ui/test/html/text/word_breaker_test.dart
similarity index 100%
rename from lib/web_ui/test/text/word_breaker_test.dart
rename to lib/web_ui/test/html/text/word_breaker_test.dart
diff --git a/lib/web_ui/test/text_test.dart b/lib/web_ui/test/html/text_test.dart
similarity index 62%
rename from lib/web_ui/test/text_test.dart
rename to lib/web_ui/test/html/text_test.dart
index f24fc2281f60a2e195beaeef134e70d8665939e3..b287352ec2959f94c3d4ce4a103a0bf1ff02f8d1 100644
--- a/lib/web_ui/test/text_test.dart
+++ b/lib/web_ui/test/html/text_test.dart
@@ -7,12 +7,13 @@
 
 import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
-
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart';
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
-import 'html/paragraph/helper.dart';
-import 'matchers.dart';
+import '../common/matchers.dart';
+import '../common/test_initialization.dart';
+import 'paragraph/helper.dart';
 
 void main() {
   internalBootstrapBrowserTest(() => testMain);
@@ -21,7 +22,7 @@ void main() {
 Future<void> testMain() async {
   const double baselineRatio = 1.1662499904632568;
 
-  await initializeTestFlutterViewEmbedder();
+  setUpUnitTests(withImplicitView: true);
 
   late String fallback;
   setUp(() {
@@ -78,10 +79,6 @@ Future<void> testMain() async {
       expect(paragraph.height, fontSize * 2.0); // because it wraps
       expect(paragraph.width, fontSize * 5.0);
       expect(paragraph.minIntrinsicWidth, fontSize * 4.0);
-
-      // TODO(yjbanov): due to https://github.com/flutter/flutter/issues/21965
-      //                Flutter reports a different number. Ours is correct
-      //                though.
       expect(paragraph.maxIntrinsicWidth, fontSize * 9.0);
       expect(paragraph.alphabeticBaseline, fontSize * .8);
       expect(
@@ -93,6 +90,137 @@ Future<void> testMain() async {
     }
   });
 
+  test('Basic line related metrics', () {
+    const double fontSize = 10;
+    final ParagraphBuilder builder = ParagraphBuilder(ParagraphStyle(
+      fontStyle: FontStyle.normal,
+      fontWeight: FontWeight.normal,
+      fontSize: fontSize,
+      maxLines: 1,
+      ellipsis: 'BBB',
+    ))..addText('A' * 100);
+    final Paragraph paragraph = builder.build();
+    paragraph.layout(const ParagraphConstraints(width: 100.0));
+
+    expect(paragraph.numberOfLines, 1);
+
+    expect(paragraph.getLineMetricsAt(-1), isNull);
+    expect(paragraph.getLineMetricsAt(0)?.lineNumber, 0);
+    expect(paragraph.getLineMetricsAt(1), isNull);
+
+    expect(paragraph.getLineNumberAt(-1), isNull);
+    expect(paragraph.getLineNumberAt(0), 0);
+    expect(paragraph.getLineNumberAt(6), 0);
+    // The last 3 characters on the first line are ellipsized with BBB.
+    expect(paragraph.getLineNumberAt(7), isNull);
+  });
+
+  test('Basic glyph metrics', () {
+    const double fontSize = 10;
+    final ParagraphBuilder builder = ParagraphBuilder(ParagraphStyle(
+      fontStyle: FontStyle.normal,
+      fontWeight: FontWeight.normal,
+      fontSize: fontSize,
+      maxLines: 1,
+      ellipsis: 'BBB',
+    ))..addText('A' * 100);
+    final Paragraph paragraph = builder.build();
+    paragraph.layout(const ParagraphConstraints(width: 100.0));
+
+    expect(paragraph.getGlyphInfoAt(-1), isNull);
+
+    // The last 3 characters on the first line are ellipsized with BBB.
+    expect(paragraph.getGlyphInfoAt(0)?.graphemeClusterCodeUnitRange, const TextRange(start: 0, end: 1));
+    expect(paragraph.getGlyphInfoAt(6)?.graphemeClusterCodeUnitRange, const TextRange(start: 6, end: 7));
+    expect(paragraph.getGlyphInfoAt(7), isNull);
+    expect(paragraph.getGlyphInfoAt(200), isNull);
+  });
+
+  test('Basic glyph metrics - hit test', () {
+    const double fontSize = 10.0;
+    final ParagraphBuilder builder = ParagraphBuilder(ParagraphStyle(
+      fontSize: fontSize,
+      fontFamily: 'FlutterTest',
+    ))..addText('Test\nTest');
+    final Paragraph paragraph = builder.build();
+    paragraph.layout(const ParagraphConstraints(width: double.infinity));
+
+    final GlyphInfo? bottomRight = paragraph.getClosestGlyphInfoForOffset(const Offset(99.0, 99.0));
+    final GlyphInfo? last = paragraph.getGlyphInfoAt(8);
+    expect(bottomRight, equals(last));
+    expect(bottomRight, isNot(paragraph.getGlyphInfoAt(0)));
+
+    expect(bottomRight?.graphemeClusterLayoutBounds, const Rect.fromLTWH(30, 10, 10, 10));
+    expect(bottomRight?.graphemeClusterCodeUnitRange, const TextRange(start: 8, end: 9));
+    expect(bottomRight?.writingDirection, TextDirection.ltr);
+  });
+
+  test('Basic glyph metrics - hit test - center aligned text in separate fragments', () {
+    const double fontSize = 10.0;
+    final ParagraphBuilder builder = ParagraphBuilder(ParagraphStyle(
+      fontSize: fontSize,
+      textAlign: TextAlign.center,
+      fontFamily: 'FlutterTest',
+    ))..addText('12345\n')
+      ..addText('1')
+      ..addText('2')
+      ..addText('3');
+    final Paragraph paragraph = builder.build();
+    paragraph.layout(const ParagraphConstraints(width: 50));
+
+    final GlyphInfo? bottomCenter = paragraph.getClosestGlyphInfoForOffset(const Offset(25.0, 99.0));
+    final GlyphInfo? expected = paragraph.getGlyphInfoAt(7);
+    expect(bottomCenter, equals(expected));
+    expect(bottomCenter, isNot(paragraph.getGlyphInfoAt(8)));
+
+    expect(bottomCenter?.graphemeClusterLayoutBounds, const Rect.fromLTWH(20, 10, 10, 10));
+    expect(bottomCenter?.graphemeClusterCodeUnitRange, const TextRange(start: 7, end: 8));
+    expect(bottomCenter?.writingDirection, TextDirection.ltr);
+  });
+
+  test('Glyph metrics with grapheme split into different runs', () {
+    const double fontSize = 10;
+    final ParagraphBuilder builder = ParagraphBuilder(ParagraphStyle(
+      fontStyle: FontStyle.normal,
+      fontWeight: FontWeight.normal,
+      fontSize: fontSize,
+      maxLines: 1,
+    ))..addText('A') // The base charater A.
+      ..addText('̀'); // The diacritical grave accent, which should combine with the base character to form a single grapheme.
+    final Paragraph paragraph = builder.build();
+    paragraph.layout(const ParagraphConstraints(width: double.infinity));
+
+    expect(paragraph.getGlyphInfoAt(0)?.graphemeClusterCodeUnitRange, const TextRange(start: 0, end: 2));
+    expect(paragraph.getGlyphInfoAt(0)?.graphemeClusterLayoutBounds, const Rect.fromLTWH(0.0, 0.0, 10.0, 10.0));
+    expect(paragraph.getGlyphInfoAt(1)?.graphemeClusterCodeUnitRange, const TextRange(start: 0, end: 2));
+    expect(paragraph.getGlyphInfoAt(1)?.graphemeClusterLayoutBounds, const Rect.fromLTWH(0.0, 0.0, 10.0, 10.0));
+
+    final GlyphInfo? bottomRight = paragraph.getClosestGlyphInfoForOffset(const Offset(99.0, 99.0));
+    expect(bottomRight?.graphemeClusterCodeUnitRange, const TextRange(start: 0, end: 2));
+    expect(bottomRight?.graphemeClusterLayoutBounds, const Rect.fromLTWH(0.0, 0.0, 10.0, 10.0));
+  }, skip: domIntl.v8BreakIterator == null); // Intended: Intl.v8breakiterator is needed for correctly breaking grapheme clusters.
+
+  test('disable rounding hack', () {
+    const double fontSize = 1;
+    const String text = '12345';
+    const double letterSpacing = 0.25;
+    const double expectedIntrinsicWidth = text.length * (fontSize + letterSpacing);
+    assert(expectedIntrinsicWidth.truncate() != expectedIntrinsicWidth);
+    final ParagraphBuilder builder = ParagraphBuilder(ParagraphStyle(fontSize: fontSize, fontFamily: 'FlutterTest'));
+    builder.pushStyle(TextStyle(letterSpacing: letterSpacing));
+    builder.addText(text);
+    final Paragraph paragraph = builder.build()
+      ..layout(const ParagraphConstraints(width: expectedIntrinsicWidth));
+
+    expect(paragraph.maxIntrinsicWidth, expectedIntrinsicWidth);
+    switch (paragraph.computeLineMetrics()) {
+      case [LineMetrics(width: final double width)]:
+        expect(width, expectedIntrinsicWidth);
+      case final List<LineMetrics> metrics:
+        expect(metrics, hasLength(1));
+    }
+  });
+
   test('lay out unattached paragraph', () {
     final CanvasParagraph paragraph = plain(EngineParagraphStyle(
       fontFamily: 'sans-serif',
@@ -227,16 +355,16 @@ Future<void> testMain() async {
     expect(paragraph.plainText, 'abcdef');
     final List<DomElement> spans =
         paragraph.toDomElement().querySelectorAll('flt-span').toList();
-    expect(spans[0].style.fontFamily, 'Ahem, $fallback, sans-serif');
+    expect(spans[0].style.fontFamily, 'FlutterTest, $fallback, sans-serif');
     // The nested span here should not set it's family to default sans-serif.
-    expect(spans[1].style.fontFamily, 'Ahem, $fallback, sans-serif');
+    expect(spans[1].style.fontFamily, 'FlutterTest, $fallback, sans-serif');
   },
       // TODO(mdebbar): https://github.com/flutter/flutter/issues/46638
       skip: browserEngine == BrowserEngine.firefox);
 
   test('adds Arial and sans-serif as fallback fonts', () {
-    // Set this to false so it doesn't default to 'Ahem' font.
-    debugEmulateFlutterTesterEnvironment = false;
+    // Set this to false so it doesn't default to the test font.
+    ui_web.debugEmulateFlutterTesterEnvironment = false;
 
     final CanvasParagraph paragraph = plain(EngineParagraphStyle(
       fontFamily: 'SomeFont',
@@ -247,14 +375,14 @@ Future<void> testMain() async {
     expect(paragraph.toDomElement().children.single.style.fontFamily,
         'SomeFont, $fallback, sans-serif');
 
-    debugEmulateFlutterTesterEnvironment = true;
+    ui_web.debugEmulateFlutterTesterEnvironment = true;
   },
       // TODO(mdebbar): https://github.com/flutter/flutter/issues/46638
       skip: browserEngine == BrowserEngine.firefox);
 
   test('does not add fallback fonts to generic families', () {
-    // Set this to false so it doesn't default to 'Ahem' font.
-    debugEmulateFlutterTesterEnvironment = false;
+    // Set this to false so it doesn't default to the default test font.
+    ui_web.debugEmulateFlutterTesterEnvironment = false;
 
     final CanvasParagraph paragraph = plain(EngineParagraphStyle(
       fontFamily: 'serif',
@@ -264,12 +392,12 @@ Future<void> testMain() async {
     paragraph.layout(constrain(double.infinity));
     expect(paragraph.toDomElement().children.single.style.fontFamily, 'serif');
 
-    debugEmulateFlutterTesterEnvironment = true;
+    ui_web.debugEmulateFlutterTesterEnvironment = true;
   });
 
   test('can set font families that need to be quoted', () {
-    // Set this to false so it doesn't default to 'Ahem' font.
-    debugEmulateFlutterTesterEnvironment = false;
+    // Set this to false so it doesn't default to the default test font.
+    ui_web.debugEmulateFlutterTesterEnvironment = false;
 
     final CanvasParagraph paragraph = plain(EngineParagraphStyle(
       fontFamily: 'MyFont 2000',
@@ -280,7 +408,7 @@ Future<void> testMain() async {
     expect(paragraph.toDomElement().children.single.style.fontFamily,
         '"MyFont 2000", $fallback, sans-serif');
 
-    debugEmulateFlutterTesterEnvironment = true;
+    ui_web.debugEmulateFlutterTesterEnvironment = true;
   });
 
   group('TextRange', () {
@@ -358,4 +486,26 @@ Future<void> testMain() async {
     expect(FontWeight.w800.value, 800);
     expect(FontWeight.w900.value, 900);
   });
+
+  group('test fonts in flutterTester environment', () {
+    final bool resetValue = ui_web.debugEmulateFlutterTesterEnvironment;
+    ui_web.debugEmulateFlutterTesterEnvironment = true;
+    tearDownAll(() {
+      ui_web.debugEmulateFlutterTesterEnvironment = resetValue;
+    });
+    const List<String> testFonts = <String>['FlutterTest', 'Ahem'];
+
+    test('The default test font is used when a non-test fontFamily is specified, or fontFamily is not specified', () {
+      final String defaultTestFontFamily = testFonts.first;
+
+      expect(EngineTextStyle.only().effectiveFontFamily, defaultTestFontFamily);
+      expect(EngineTextStyle.only(fontFamily: 'BogusFontFamily').effectiveFontFamily, defaultTestFontFamily);
+    });
+
+    test('Can specify test fontFamily to use', () {
+      for (final String testFont in testFonts) {
+        expect(EngineTextStyle.only(fontFamily: testFont).effectiveFontFamily, testFont);
+      }
+    });
+  });
 }
diff --git a/lib/web_ui/test/skwasm/smoke_test.dart b/lib/web_ui/test/skwasm/smoke_test.dart
deleted file mode 100644
index 74c5a30ad7ab962e8c0c1ca08af06e2fa2368bcc..0000000000000000000000000000000000000000
--- a/lib/web_ui/test/skwasm/smoke_test.dart
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-@TestOn('chrome || safari || firefox')
-
-import 'dart:async';
-
-import 'package:test/bootstrap/browser.dart';
-import 'package:test/test.dart';
-import 'package:ui/src/engine/renderer.dart';
-import 'package:ui/src/engine/skwasm/skwasm_stub/renderer.dart';
-
-void main() {
-  internalBootstrapBrowserTest(() => testMain);
-}
-
-Future<void> testMain() async {
-  group('Skwasm stub tests', () {
-    test('Skwasm stub renderer throws', () {
-      expect(renderer, isA<SkwasmRenderer>());
-      expect(() {
-        renderer.initialize();
-      }, throwsUnimplementedError);
-    });
-  });
-}
diff --git a/lib/web_ui/test/ui/README.md b/lib/web_ui/test/ui/README.md
index acd49655295e0ae4ba7297b956ed34cdf159260e..9ce5ea6d15f445406fe9f4e43c6ef1b74c506fb6 100644
--- a/lib/web_ui/test/ui/README.md
+++ b/lib/web_ui/test/ui/README.md
@@ -8,5 +8,5 @@ In practice, this means these tests should only use `dart:ui` APIs or
 
 ## Notes
 
-These tests should call `setUpUiTest()` at the top level to initialize the
+These tests should call `setUpUnitTests()` at the top level to initialize the
 renderer they are expected to run.
diff --git a/lib/web_ui/test/ui/canvas_curves_golden_test.dart b/lib/web_ui/test/ui/canvas_curves_golden_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..cdbd05935a0de0939185b9eaff1e306e56af6a95
--- /dev/null
+++ b/lib/web_ui/test/ui/canvas_curves_golden_test.dart
@@ -0,0 +1,78 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:math' as math;
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/ui.dart';
+import 'package:web_engine_tester/golden_tester.dart';
+
+import '../common/test_initialization.dart';
+import 'utils.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+Future<void> testMain() async {
+  setUpUnitTests(
+    withImplicitView: true,
+    setUpTestViewDimensions: false,
+  );
+
+  const Rect region = Rect.fromLTWH(0, 0, 300, 300);
+
+  test('draw arc', () async {
+    final PictureRecorder recorder = PictureRecorder();
+    final Canvas canvas = Canvas(recorder, region);
+    canvas.drawArc(
+      const Rect.fromLTRB(100, 100, 200, 200),
+      math.pi / 3.0,
+      4.0 * math.pi / 3.0,
+      false,
+      Paint()
+        ..style = PaintingStyle.stroke
+        ..strokeWidth = 3.0
+        ..color = const Color(0xFFFF00FF)
+    );
+
+    await drawPictureUsingCurrentRenderer(recorder.endRecording());
+
+    await matchGoldenFile('ui_canvas_draw_arc.png', region: region);
+  });
+
+  test('draw circle', () async {
+    final PictureRecorder recorder = PictureRecorder();
+    final Canvas canvas = Canvas(recorder, region);
+    canvas.drawCircle(
+      const Offset(150, 150),
+      50,
+      Paint()
+        ..style = PaintingStyle.stroke
+        ..strokeWidth = 3.0
+        ..color = const Color(0xFFFF0000)
+    );
+
+    await drawPictureUsingCurrentRenderer(recorder.endRecording());
+
+    await matchGoldenFile('ui_canvas_draw_circle.png', region: region);
+  });
+
+  test('draw oval', () async {
+    final PictureRecorder recorder = PictureRecorder();
+    final Canvas canvas = Canvas(recorder, region);
+    canvas.drawOval(
+      const Rect.fromLTRB(100, 125, 200, 175),
+      Paint()
+        ..style = PaintingStyle.stroke
+        ..strokeWidth = 3.0
+        ..color = const Color(0xFF00FFFF)
+    );
+
+    await drawPictureUsingCurrentRenderer(recorder.endRecording());
+
+    await matchGoldenFile('ui_canvas_draw_oval.png', region: region);
+  });
+}
diff --git a/lib/web_ui/test/ui/canvas_draw_points_golden_test.dart b/lib/web_ui/test/ui/canvas_draw_points_golden_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..ca2540245cb82e7b0121e4a5913d66968c5b432e
--- /dev/null
+++ b/lib/web_ui/test/ui/canvas_draw_points_golden_test.dart
@@ -0,0 +1,120 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:typed_data';
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui;
+
+import 'package:web_engine_tester/golden_tester.dart';
+
+import '../common/test_initialization.dart';
+import 'utils.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+Future<void> testMain() async {
+  setUpUnitTests(
+    withImplicitView: true,
+    setUpTestViewDimensions: false,
+  );
+
+  const ui.Rect region = ui.Rect.fromLTWH(0, 0, 400, 600);
+
+  late ui.PictureRecorder recorder;
+  late ui.Canvas canvas;
+
+  setUp(() {
+    recorder = ui.PictureRecorder();
+    canvas = ui.Canvas(recorder, region);
+  });
+
+  tearDown(() {
+  });
+
+  test('draws points in all 3 modes', () async {
+    final ui.Paint paint = ui.Paint();
+    paint.strokeWidth = 2.0;
+    paint.color = const ui.Color(0xFF00FF00);
+    const List<ui.Offset> points = <ui.Offset>[
+      ui.Offset(10, 10),
+      ui.Offset(50, 10),
+      ui.Offset(70, 70),
+      ui.Offset(170, 70)
+    ];
+    canvas.drawPoints(ui.PointMode.points, points, paint);
+    const List<ui.Offset> points2 = <ui.Offset>[
+      ui.Offset(10, 110),
+      ui.Offset(50, 110),
+      ui.Offset(70, 170),
+      ui.Offset(170, 170)
+    ];
+    canvas.drawPoints(ui.PointMode.lines, points2, paint);
+    const List<ui.Offset> points3 = <ui.Offset>[
+      ui.Offset(10, 210),
+      ui.Offset(50, 210),
+      ui.Offset(70, 270),
+      ui.Offset(170, 270)
+    ];
+    canvas.drawPoints(ui.PointMode.polygon, points3, paint);
+
+    await drawPictureUsingCurrentRenderer(recorder.endRecording());
+    await matchGoldenFile('ui_canvas_draw_points.png', region: region);
+  });
+
+  test('draws raw points in all 3 modes', () async {
+    final ui.Paint paint = ui.Paint();
+    paint.strokeWidth = 2.0;
+    paint.color = const ui.Color(0xFF0000FF);
+    final Float32List points = offsetListToFloat32List(const <ui.Offset>[
+      ui.Offset(10, 10),
+      ui.Offset(50, 10),
+      ui.Offset(70, 70),
+      ui.Offset(170, 70)
+    ]);
+    canvas.drawRawPoints(ui.PointMode.points, points, paint);
+    final Float32List points2 = offsetListToFloat32List(const <ui.Offset>[
+      ui.Offset(10, 110),
+      ui.Offset(50, 110),
+      ui.Offset(70, 170),
+      ui.Offset(170, 170)
+    ]);
+    canvas.drawRawPoints(ui.PointMode.lines, points2, paint);
+    final Float32List points3 = offsetListToFloat32List(const <ui.Offset>[
+      ui.Offset(10, 210),
+      ui.Offset(50, 210),
+      ui.Offset(70, 270),
+      ui.Offset(170, 270)
+    ]);
+    canvas.drawRawPoints(ui.PointMode.polygon, points3, paint);
+
+    await drawPictureUsingCurrentRenderer(recorder.endRecording());
+    await matchGoldenFile('ui_canvas_draw_raw_points.png', region: region);
+  });
+
+  test('Should draw points with strokeWidth', () async {
+    final ui.Paint nullStrokePaint =
+      ui.Paint()..color = const ui.Color(0xffff0000);
+    canvas.drawRawPoints(ui.PointMode.lines, Float32List.fromList(<double>[
+      30.0, 20.0, 200.0, 20.0]), nullStrokePaint);
+    final ui.Paint strokePaint1 = ui.Paint()
+      ..strokeWidth = 1.0
+      ..color = const ui.Color(0xff0000ff);
+    canvas.drawRawPoints(ui.PointMode.lines, Float32List.fromList(<double>[
+      30.0, 30.0, 200.0, 30.0]), strokePaint1);
+    final ui.Paint strokePaint3 = ui.Paint()
+      ..strokeWidth = 3.0
+      ..color = const ui.Color(0xff00a000);
+    canvas.drawRawPoints(ui.PointMode.lines, Float32List.fromList(<double>[
+      30.0, 40.0, 200.0, 40.0]), strokePaint3);
+    canvas.drawRawPoints(ui.PointMode.points, Float32List.fromList(<double>[
+      30.0, 50.0, 40.0, 50.0, 50.0, 50.0]), strokePaint3);
+    await drawPictureUsingCurrentRenderer(recorder.endRecording());
+    await matchGoldenFile('ui_canvas_draw_points_stroke.png', region: region);
+  });
+}
diff --git a/lib/web_ui/test/ui/canvas_lines_golden_test.dart b/lib/web_ui/test/ui/canvas_lines_golden_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..46c39e8cd96642e6b6798989e5dd030a91863d26
--- /dev/null
+++ b/lib/web_ui/test/ui/canvas_lines_golden_test.dart
@@ -0,0 +1,146 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/ui.dart';
+import 'package:web_engine_tester/golden_tester.dart';
+
+import '../common/test_initialization.dart';
+import 'utils.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+Future<void> testMain() async {
+  setUpUnitTests(
+    withImplicitView: true,
+    setUpTestViewDimensions: false,
+  );
+
+  const Rect region = Rect.fromLTWH(0, 0, 300, 300);
+
+  test('draws lines with varying strokeWidth', () async {
+    final PictureRecorder recorder = PictureRecorder();
+    final Canvas canvas = Canvas(recorder, region);
+    paintLines(canvas);
+
+    await drawPictureUsingCurrentRenderer(recorder.endRecording());
+
+    await matchGoldenFile('canvas_lines_thickness.png', region: region);
+  });
+
+  test('draws lines with negative Offset values', () async {
+    final PictureRecorder recorder = PictureRecorder();
+    final Canvas canvas = Canvas(recorder, region);
+
+    // test rendering lines correctly with negative offset when using DOM
+    final Paint paintWithStyle = Paint()
+    ..color = const Color(0xFFE91E63) // Colors.pink
+    ..style = PaintingStyle.stroke
+    ..strokeWidth = 16
+    ..strokeCap = StrokeCap.round;
+
+    // canvas.drawLine ignores paint.style (defaults to fill) according to api docs.
+    // expect lines are rendered the same regardless of the set paint.style
+    final Paint paintWithoutStyle = Paint()
+    ..color = const Color(0xFF4CAF50) // Colors.green
+    ..strokeWidth = 16
+    ..strokeCap = StrokeCap.round;
+
+    // test vertical, horizontal, and diagonal lines
+    final List<Offset> points = <Offset>[
+      const Offset(-25, 50), const Offset(45, 50),
+      const Offset(100, -25), const Offset(100, 200),
+      const Offset(-150, -145), const Offset(100, 200),
+    ];
+    final List<Offset> shiftedPoints = points.map((Offset point) => point.translate(20, 20)).toList();
+
+    paintLinesFromPoints(canvas, paintWithStyle, points);
+    paintLinesFromPoints(canvas, paintWithoutStyle, shiftedPoints);
+
+    await drawPictureUsingCurrentRenderer(recorder.endRecording());
+    await matchGoldenFile('canvas_lines_with_negative_offset.png', region: region);
+  });
+
+  test('drawLines method respects strokeCap', () async {
+    final PictureRecorder recorder = PictureRecorder();
+    final Canvas canvas = Canvas(recorder, region);
+
+    final Paint paintStrokeCapRound = Paint()
+    ..color = const Color(0xFFE91E63) // Colors.pink
+    ..strokeWidth = 16
+    ..strokeCap = StrokeCap.round;
+
+    final Paint paintStrokeCapSquare = Paint()
+    ..color = const Color(0xFF4CAF50) // Colors.green
+    ..strokeWidth = 16
+    ..strokeCap = StrokeCap.square;
+
+    final Paint paintStrokeCapButt = Paint()
+    ..color = const Color(0xFFFF9800) // Colors.orange
+    ..strokeWidth = 16
+    ..strokeCap = StrokeCap.butt;
+
+    // test vertical, horizontal, and diagonal lines
+    final List<Offset> points = <Offset>[
+      const Offset(5, 50), const Offset(45, 50),
+      const Offset(100, 5), const Offset(100, 200),
+      const Offset(5, 10), const Offset(100, 200),
+    ];
+    final List<Offset> shiftedPoints = points.map((Offset point) => point.translate(50, 50)).toList();
+    final List<Offset> twiceShiftedPoints = shiftedPoints.map((Offset point) => point.translate(50, 50)).toList();
+
+    paintLinesFromPoints(canvas, paintStrokeCapRound, points);
+    paintLinesFromPoints(canvas, paintStrokeCapSquare, shiftedPoints);
+    paintLinesFromPoints(canvas, paintStrokeCapButt, twiceShiftedPoints);
+
+    await drawPictureUsingCurrentRenderer(recorder.endRecording());
+    await matchGoldenFile('canvas_lines_with_strokeCap.png', region: region);
+  });
+}
+
+void paintLines(Canvas canvas) {
+  final Paint nullPaint = Paint()
+    ..strokeWidth = 1.0
+    ..style = PaintingStyle.stroke;
+  final Paint paint1 = Paint()
+      ..color = const Color(0xFF9E9E9E) // Colors.grey
+      ..strokeWidth = 1.0
+      ..style = PaintingStyle.stroke;
+  final Paint paint2 = Paint()
+      ..color = const Color(0x7fff0000)
+      ..strokeWidth = 1.0
+      ..style = PaintingStyle.stroke;
+  final Paint paint3 = Paint()
+      ..color = const Color(0xFF4CAF50) //Colors.green
+      ..strokeWidth = 1.0
+      ..style = PaintingStyle.stroke;
+  // Draw markers around 100x100 box
+  canvas.drawLine(const Offset(50, 40), const Offset(148, 40), nullPaint);
+  canvas.drawLine(const Offset(50, 50), const Offset(52, 50), paint1);
+  canvas.drawLine(const Offset(150, 50), const Offset(148, 50), paint1);
+  canvas.drawLine(const Offset(50, 150), const Offset(52, 150), paint1);
+  canvas.drawLine(const Offset(150, 150), const Offset(148, 150), paint1);
+  // Draw diagonal
+  canvas.drawLine(const Offset(50, 50), const Offset(150, 150), paint2);
+  // Draw horizontal
+  paint3.strokeWidth = 1.0;
+  paint3.color = const Color(0xFFFF0000);
+  canvas.drawLine(const Offset(50, 55), const Offset(150, 55), paint3);
+  paint3.strokeWidth = 2.0;
+  paint3.color = const Color(0xFF2196F3); // Colors.blue;
+  canvas.drawLine(const Offset(50, 60), const Offset(150, 60), paint3);
+  paint3.strokeWidth = 4.0;
+  paint3.color = const Color(0xFFFF9800); // Colors.orange;
+  canvas.drawLine(const Offset(50, 70), const Offset(150, 70), paint3);
+}
+
+void paintLinesFromPoints(Canvas canvas, Paint paint, List<Offset> points) {
+  // points list contains pairs of Offset points, so for loop step is 2
+  for (int i = 0; i < points.length - 1; i += 2) {
+    canvas.drawLine(points[i], points[i + 1], paint);
+  }
+}
diff --git a/lib/web_ui/test/ui/canvas_test.dart b/lib/web_ui/test/ui/canvas_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..57faf92ecb77d523c98b69f6e7562d6cffdb1524
--- /dev/null
+++ b/lib/web_ui/test/ui/canvas_test.dart
@@ -0,0 +1,329 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:math';
+import 'dart:typed_data';
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui;
+
+import '../common/matchers.dart';
+import '../common/test_initialization.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+Future<void> testMain() async {
+  setUpUnitTests(
+    setUpTestViewDimensions: false,
+  );
+
+  final bool deviceClipRoundsOut = renderer is! HtmlRenderer;
+  runCanvasTests(deviceClipRoundsOut: deviceClipRoundsOut);
+}
+
+void runCanvasTests({required bool deviceClipRoundsOut}) {
+  setUp(() {
+    EngineSemantics.debugResetSemantics();
+  });
+
+  group('ui.Canvas transform tests', () {
+    void transformsClose(Float64List value, Float64List expected) {
+      expect(expected.length, equals(16));
+      expect(value.length, equals(16));
+      for (int r = 0; r < 4; r++) {
+        for (int c = 0; c < 4; c++) {
+          expect(value[r*4 + c], within(from: expected[r*4 + c]));
+        }
+      }
+    }
+
+    void transformsNotClose(Float64List value, Float64List expected) {
+      // We check the lengths here even though [transformsClose] will
+      // check them so that the [TestFailure] we catch below can only
+      // be due to a difference in matrix values.
+      expect(expected.length, equals(16));
+      expect(value.length, equals(16));
+      try {
+        transformsClose(value, expected);
+      } on TestFailure {
+        return;
+      }
+      throw TestFailure('transforms were too close to equal'); // ignore: only_throw_errors
+    }
+
+    test('ui.Canvas.translate affects canvas.getTransform', () {
+      final ui.PictureRecorder recorder = ui.PictureRecorder();
+      final ui.Canvas canvas = ui.Canvas(recorder);
+      canvas.translate(12, 14.5);
+      final Float64List matrix = Matrix4.translationValues(12, 14.5, 0).toFloat64();
+      final Float64List curMatrix = canvas.getTransform();
+      transformsClose(curMatrix, matrix);
+      canvas.translate(10, 10);
+      final Float64List newCurMatrix = canvas.getTransform();
+      transformsNotClose(newCurMatrix, matrix);
+      transformsClose(curMatrix, matrix);
+    });
+
+    test('ui.Canvas.scale affects canvas.getTransform', () {
+      final ui.PictureRecorder recorder = ui.PictureRecorder();
+      final ui.Canvas canvas = ui.Canvas(recorder);
+      canvas.scale(12, 14.5);
+      final Float64List matrix = Matrix4.diagonal3Values(12, 14.5, 1).toFloat64();
+      final Float64List curMatrix = canvas.getTransform();
+      transformsClose(curMatrix, matrix);
+      canvas.scale(10, 10);
+      final Float64List newCurMatrix = canvas.getTransform();
+      transformsNotClose(newCurMatrix, matrix);
+      transformsClose(curMatrix, matrix);
+    });
+
+    test('Canvas.rotate affects canvas.getTransform', () async {
+      final ui.PictureRecorder recorder = ui.PictureRecorder();
+      final ui.Canvas canvas = ui.Canvas(recorder);
+      canvas.rotate(pi);
+      final Float64List matrix = Matrix4.rotationZ(pi).toFloat64();
+      final Float64List curMatrix = canvas.getTransform();
+      transformsClose(curMatrix, matrix);
+      canvas.rotate(pi / 2);
+      final Float64List newCurMatrix = canvas.getTransform();
+      transformsNotClose(newCurMatrix, matrix);
+      transformsClose(curMatrix, matrix);
+    });
+
+    test('Canvas.skew affects canvas.getTransform', () async {
+      final ui.PictureRecorder recorder = ui.PictureRecorder();
+      final ui.Canvas canvas = ui.Canvas(recorder);
+      canvas.skew(12, 14.5);
+      final Float64List matrix = (Matrix4.identity()..setEntry(0, 1, 12)..setEntry(1, 0, 14.5)).toFloat64();
+      final Float64List curMatrix = canvas.getTransform();
+      transformsClose(curMatrix, matrix);
+      canvas.skew(10, 10);
+      final Float64List newCurMatrix = canvas.getTransform();
+      transformsNotClose(newCurMatrix, matrix);
+      transformsClose(curMatrix, matrix);
+    });
+
+    test('Canvas.transform affects canvas.getTransform', () async {
+      final ui.PictureRecorder recorder = ui.PictureRecorder();
+      final ui.Canvas canvas = ui.Canvas(recorder);
+      final Float64List matrix = (Matrix4.identity()..translate(12.0, 14.5)..scale(12.0, 14.5)).toFloat64();
+      canvas.transform(matrix);
+      final Float64List curMatrix = canvas.getTransform();
+      transformsClose(curMatrix, matrix);
+      canvas.translate(10, 10);
+      final Float64List newCurMatrix = canvas.getTransform();
+      transformsNotClose(newCurMatrix, matrix);
+      transformsClose(curMatrix, matrix);
+    });
+  });
+
+  void rectsClose(ui.Rect value, ui.Rect expected) {
+    expect(value.left,   closeTo(expected.left,   1e-6));
+    expect(value.top,    closeTo(expected.top,    1e-6));
+    expect(value.right,  closeTo(expected.right,  1e-6));
+    expect(value.bottom, closeTo(expected.bottom, 1e-6));
+  }
+
+  void rectsNotClose(ui.Rect value, ui.Rect expected) {
+    try {
+      rectsClose(value, expected);
+    } on TestFailure {
+      return;
+    }
+    throw TestFailure('transforms were too close to equal'); // ignore: only_throw_errors
+  }
+
+  group('ui.Canvas clip tests', () {
+    test('Canvas.clipRect affects canvas.getClipBounds', () async {
+      final ui.PictureRecorder recorder = ui.PictureRecorder();
+      final ui.Canvas canvas = ui.Canvas(recorder, const ui.Rect.fromLTRB(0, 0, 100, 100));
+      const ui.Rect clipRawBounds = ui.Rect.fromLTRB(10.2, 11.3, 20.4, 25.7);
+      const ui.Rect clipExpandedBounds = ui.Rect.fromLTRB(10, 11, 21, 26);
+      final ui.Rect clipDestBounds = deviceClipRoundsOut ? clipExpandedBounds : clipRawBounds;
+      canvas.clipRect(clipRawBounds);
+
+      // Save initial return values for testing restored values
+      final ui.Rect initialLocalBounds = canvas.getLocalClipBounds();
+      final ui.Rect initialDestinationBounds = canvas.getDestinationClipBounds();
+      rectsClose(initialLocalBounds, clipExpandedBounds);
+      rectsClose(initialDestinationBounds, clipDestBounds);
+
+      canvas.save();
+      canvas.clipRect(const ui.Rect.fromLTRB(0, 0, 15, 15));
+      // Both clip bounds have changed
+      rectsNotClose(canvas.getLocalClipBounds(), clipExpandedBounds);
+      rectsNotClose(canvas.getDestinationClipBounds(), clipDestBounds);
+      // Previous return values have not changed
+      rectsClose(initialLocalBounds, clipExpandedBounds);
+      rectsClose(initialDestinationBounds, clipDestBounds);
+      canvas.restore();
+
+      // save/restore returned the values to their original values
+      expect(canvas.getLocalClipBounds(), initialLocalBounds);
+      expect(canvas.getDestinationClipBounds(), initialDestinationBounds);
+
+      canvas.save();
+      canvas.scale(2, 2);
+      const ui.Rect scaledExpandedBounds = ui.Rect.fromLTRB(5, 5.5, 10.5, 13);
+      rectsClose(canvas.getLocalClipBounds(), scaledExpandedBounds);
+      // Destination bounds are unaffected by transform
+      rectsClose(canvas.getDestinationClipBounds(), clipDestBounds);
+      canvas.restore();
+
+      // save/restore returned the values to their original values
+      expect(canvas.getLocalClipBounds(), initialLocalBounds);
+      expect(canvas.getDestinationClipBounds(), initialDestinationBounds);
+    });
+
+    test('Canvas.clipRRect affects canvas.getClipBounds', () async {
+      final ui.PictureRecorder recorder = ui.PictureRecorder();
+      final ui.Canvas canvas = ui.Canvas(recorder, const ui.Rect.fromLTRB(0, 0, 100, 100));
+      const ui.Rect clipRawBounds = ui.Rect.fromLTRB(10.2, 11.3, 20.4, 25.7);
+      const ui.Rect clipExpandedBounds = ui.Rect.fromLTRB(10, 11, 21, 26);
+      final ui.Rect clipDestBounds = deviceClipRoundsOut ? clipExpandedBounds : clipRawBounds;
+      final ui.RRect clip = ui.RRect.fromRectAndRadius(clipRawBounds, const ui.Radius.circular(3));
+      canvas.clipRRect(clip);
+
+      // Save initial return values for testing restored values
+      final ui.Rect initialLocalBounds = canvas.getLocalClipBounds();
+      final ui.Rect initialDestinationBounds = canvas.getDestinationClipBounds();
+      rectsClose(initialLocalBounds, clipExpandedBounds);
+      rectsClose(initialDestinationBounds, clipDestBounds);
+
+      canvas.save();
+      canvas.clipRect(const ui.Rect.fromLTRB(0, 0, 15, 15));
+      // Both clip bounds have changed
+      rectsNotClose(canvas.getLocalClipBounds(), clipExpandedBounds);
+      rectsNotClose(canvas.getDestinationClipBounds(), clipDestBounds);
+      // Previous return values have not changed
+      rectsClose(initialLocalBounds, clipExpandedBounds);
+      rectsClose(initialDestinationBounds, clipDestBounds);
+      canvas.restore();
+
+      // save/restore returned the values to their original values
+      expect(canvas.getLocalClipBounds(), initialLocalBounds);
+      expect(canvas.getDestinationClipBounds(), initialDestinationBounds);
+
+      canvas.save();
+      canvas.scale(2, 2);
+      const ui.Rect scaledExpandedBounds = ui.Rect.fromLTRB(5, 5.5, 10.5, 13);
+      rectsClose(canvas.getLocalClipBounds(), scaledExpandedBounds);
+      // Destination bounds are unaffected by transform
+      rectsClose(canvas.getDestinationClipBounds(), clipDestBounds);
+      canvas.restore();
+
+      // save/restore returned the values to their original values
+      expect(canvas.getLocalClipBounds(), initialLocalBounds);
+      expect(canvas.getDestinationClipBounds(), initialDestinationBounds);
+    });
+
+    test('Canvas.clipPath affects canvas.getClipBounds', () async {
+      final ui.PictureRecorder recorder = ui.PictureRecorder();
+      final ui.Canvas canvas = ui.Canvas(recorder, const ui.Rect.fromLTRB(0, 0, 100, 100));
+      const ui.Rect clipRawBounds = ui.Rect.fromLTRB(10.2, 11.3, 20.4, 25.7);
+      const ui.Rect clipExpandedBounds = ui.Rect.fromLTRB(10, 11, 21, 26);
+      final ui.Rect clipDestBounds = deviceClipRoundsOut ? clipExpandedBounds : clipRawBounds;
+      final ui.Path clip = ui.Path()..addRect(clipRawBounds)..addOval(clipRawBounds);
+      canvas.clipPath(clip);
+
+      // Save initial return values for testing restored values
+      final ui.Rect initialLocalBounds = canvas.getLocalClipBounds();
+      final ui.Rect initialDestinationBounds = canvas.getDestinationClipBounds();
+      rectsClose(initialLocalBounds, clipExpandedBounds);
+      rectsClose(initialDestinationBounds, clipDestBounds);
+
+      canvas.save();
+      canvas.clipRect(const ui.Rect.fromLTRB(0, 0, 15, 15));
+      // Both clip bounds have changed
+      rectsNotClose(canvas.getLocalClipBounds(), clipExpandedBounds);
+      rectsNotClose(canvas.getDestinationClipBounds(), clipDestBounds);
+      // Previous return values have not changed
+      rectsClose(initialLocalBounds, clipExpandedBounds);
+      rectsClose(initialDestinationBounds, clipDestBounds);
+      canvas.restore();
+
+      // save/restore returned the values to their original values
+      expect(canvas.getLocalClipBounds(), initialLocalBounds);
+      expect(canvas.getDestinationClipBounds(), initialDestinationBounds);
+
+      canvas.save();
+      canvas.scale(2, 2);
+      const ui.Rect scaledExpandedBounds = ui.Rect.fromLTRB(5, 5.5, 10.5, 13);
+      rectsClose(canvas.getLocalClipBounds(), scaledExpandedBounds);
+      // Destination bounds are unaffected by transform
+      rectsClose(canvas.getDestinationClipBounds(), clipDestBounds);
+      canvas.restore();
+
+      // save/restore returned the values to their original values
+      expect(canvas.getLocalClipBounds(), initialLocalBounds);
+      expect(canvas.getDestinationClipBounds(), initialDestinationBounds);
+    });
+
+    test('Canvas.clipRect(diff) does not affect canvas.getClipBounds', () async {
+      final ui.PictureRecorder recorder = ui.PictureRecorder();
+      final ui.Canvas canvas = ui.Canvas(recorder, const ui.Rect.fromLTRB(0, 0, 100, 100));
+      const ui.Rect clipRawBounds = ui.Rect.fromLTRB(10.2, 11.3, 20.4, 25.7);
+      const ui.Rect clipExpandedBounds = ui.Rect.fromLTRB(10, 11, 21, 26);
+      final ui.Rect clipDestBounds = deviceClipRoundsOut ? clipExpandedBounds : clipRawBounds;
+      canvas.clipRect(clipRawBounds);
+
+      // Save initial return values for testing restored values
+      final ui.Rect initialLocalBounds = canvas.getLocalClipBounds();
+      final ui.Rect initialDestinationBounds = canvas.getDestinationClipBounds();
+      rectsClose(initialLocalBounds, clipExpandedBounds);
+      rectsClose(initialDestinationBounds, clipDestBounds);
+
+      canvas.clipRect(const ui.Rect.fromLTRB(0, 0, 15, 15), clipOp: ui.ClipOp.difference);
+      expect(canvas.getLocalClipBounds(), initialLocalBounds);
+      expect(canvas.getDestinationClipBounds(), initialDestinationBounds);
+    });
+  });
+
+  group('RestoreToCount function tests', () {
+    test('RestoreToCount can work', () async {
+      final ui.PictureRecorder recorder = ui.PictureRecorder();
+      final ui.Canvas canvas = ui.Canvas(recorder);
+      canvas.save();
+      canvas.save();
+      canvas.save();
+      canvas.save();
+      canvas.save();
+      expect(canvas.getSaveCount(), 6);
+      canvas.restoreToCount(2);
+      expect(canvas.getSaveCount(), 2);
+      canvas.restore();
+      expect(canvas.getSaveCount(), 1);
+    });
+
+    test('RestoreToCount count less than 1, the stack should be reset', () async {
+      final ui.PictureRecorder recorder = ui.PictureRecorder();
+      final ui.Canvas canvas = ui.Canvas(recorder);
+      canvas.save();
+      canvas.save();
+      canvas.save();
+      canvas.save();
+      canvas.save();
+      expect(canvas.getSaveCount(), equals(6));
+      canvas.restoreToCount(0);
+      expect(canvas.getSaveCount(), equals(1));
+    });
+
+    test('RestoreToCount count greater than current [getSaveCount]', () async {
+      final ui.PictureRecorder recorder = ui.PictureRecorder();
+      final ui.Canvas canvas = ui.Canvas(recorder);
+      canvas.save();
+      canvas.save();
+      canvas.save();
+      canvas.save();
+      canvas.save();
+      expect(canvas.getSaveCount(), equals(6));
+      canvas.restoreToCount(canvas.getSaveCount() + 1);
+      expect(canvas.getSaveCount(), equals(6));
+    });
+  });
+}
diff --git a/lib/web_ui/test/ui/color_test.dart b/lib/web_ui/test/ui/color_test.dart
index 83190e5c3d6cedea55854e6fb9ba98501acf8df8..2ac2df7595d022333924ff3a9fc9097eff333e7f 100644
--- a/lib/web_ui/test/ui/color_test.dart
+++ b/lib/web_ui/test/ui/color_test.dart
@@ -6,7 +6,7 @@ import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/ui.dart';
 
-import 'utils.dart';
+import '../common/test_initialization.dart';
 
 void main() {
   internalBootstrapBrowserTest(() => testMain);
@@ -16,8 +16,8 @@ class NotAColor extends Color {
   const NotAColor(super.value);
 }
 
-void testMain() {
-  setUpUiTest();
+Future<void> testMain() async {
+  setUpUnitTests();
 
   test('color accessors should work', () {
     const Color foo = Color(0x12345678);
diff --git a/lib/web_ui/test/ui/draw_atlas_golden_test.dart b/lib/web_ui/test/ui/draw_atlas_golden_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..77b54f6204a805dbe9210f2d42a79644dbb3ec62
--- /dev/null
+++ b/lib/web_ui/test/ui/draw_atlas_golden_test.dart
@@ -0,0 +1,226 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:math' as math;
+import 'dart:typed_data';
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/ui.dart' as ui;
+import 'package:web_engine_tester/golden_tester.dart';
+
+import '../common/test_initialization.dart';
+import 'utils.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+const ui.Rect kBlueSquareRegion = ui.Rect.fromLTRB(0, 0, 25, 25);
+const ui.Rect kRedCircleRegion = ui.Rect.fromLTRB(25, 0, 50, 25);
+const ui.Rect kMagentaStarRegion = ui.Rect.fromLTRB(0, 25, 30, 55);
+const ui.Rect kGreenSquiggleRegion = ui.Rect.fromLTRB(30, 25, 50, 55);
+const ui.Rect kTotalAtlasRegion = ui.Rect.fromLTRB(0, 0, 55, 55);
+
+ui.Image generateAtlas() {
+  final ui.PictureRecorder recorder = ui.PictureRecorder();
+  final ui.Canvas canvas = ui.Canvas(recorder);
+
+  canvas.drawColor(const ui.Color(0), ui.BlendMode.src);
+
+  // Draw the square
+  canvas.save();
+  canvas.clipRect(kBlueSquareRegion);
+  canvas.drawRect(
+    // Inset the square by one pixel so it doesn't bleed into the other sprites.
+    kBlueSquareRegion.deflate(1.0),
+    ui.Paint()..color = const ui.Color(0xFF0000FF)
+  );
+  canvas.restore();
+
+  // Draw the circle
+  canvas.save();
+  canvas.clipRect(kRedCircleRegion);
+  canvas.drawCircle(
+    kRedCircleRegion.center,
+    // Make the circle one pixel smaller than the bounds to it doesn't bleed
+    // into the other shapes.
+    (kRedCircleRegion.width / 2.0) - 1.0,
+    ui.Paint()..color = const ui.Color(0xFFFF0000));
+  canvas.restore();
+
+  // Draw the star
+  canvas.save();
+  canvas.clipRect(kMagentaStarRegion);
+  final ui.Offset starCenter = kMagentaStarRegion.center;
+
+  // Make the star one pixel smaller than the bounds so that it doesn't bleed
+  // into the other shapes.
+  final double radius = (kMagentaStarRegion.height / 2.0) - 1.0;
+
+  // Start at the top (rotated 90 degrees)
+  double theta = -math.pi / 2.0;
+
+  // Rotate two fifths of the circle each time
+  const double rotation = 4.0 * math.pi / 5.0;
+  final ui.Path starPath = ui.Path();
+  starPath.moveTo(
+    starCenter.dx + radius * math.cos(theta),
+    starCenter.dy + radius * math.sin(theta)
+  );
+  for (int i = 0; i < 5; i++) {
+    theta += rotation;
+    starPath.lineTo(
+      starCenter.dx + radius * math.cos(theta),
+      starCenter.dy + radius * math.sin(theta)
+    );
+  }
+  canvas.drawPath(
+    starPath,
+    ui.Paint()
+      ..color = const ui.Color(0xFFFF00FF)
+      ..style = ui.PaintingStyle.fill
+  );
+  canvas.restore();
+
+  // Draw the Squiggle
+  canvas.save();
+  canvas.clipRect(kGreenSquiggleRegion);
+  final ui.Path squigglePath = ui.Path();
+  squigglePath.moveTo(kGreenSquiggleRegion.topCenter.dx, kGreenSquiggleRegion.topCenter.dy + 2.0);
+  squigglePath.cubicTo(
+    kGreenSquiggleRegion.left - 10.0, kGreenSquiggleRegion.top + kGreenSquiggleRegion.height * 0.33,
+    kGreenSquiggleRegion.right + 10.0, kGreenSquiggleRegion.top + kGreenSquiggleRegion.height * 0.66,
+    kGreenSquiggleRegion.bottomCenter.dx, kGreenSquiggleRegion.bottomCenter.dy - 2.0
+  );
+  canvas.drawPath(
+    squigglePath,
+    ui.Paint()
+      ..color = const ui.Color(0xFF00FF00)
+      ..style = ui.PaintingStyle.stroke
+      ..strokeWidth = 5.0
+  );
+  canvas.restore();
+
+  final ui.Picture picture = recorder.endRecording();
+  return picture.toImageSync(
+    kTotalAtlasRegion.width.toInt(),
+    kTotalAtlasRegion.height.toInt()
+  );
+}
+
+Future<void> testMain() async {
+  setUpUnitTests(
+    withImplicitView: true,
+    setUpTestViewDimensions: false,
+  );
+
+  const ui.Rect region = ui.Rect.fromLTWH(0, 0, 300, 300);
+
+  test('render atlas', () async {
+    final ui.PictureRecorder recorder = ui.PictureRecorder();
+    final ui.Canvas canvas = ui.Canvas(recorder, region);
+    final ui.Image atlas = generateAtlas();
+    canvas.drawImage(atlas, ui.Offset.zero, ui.Paint());
+    await drawPictureUsingCurrentRenderer(recorder.endRecording());
+    await matchGoldenFile('ui_atlas.png', region: region);
+  }, skip: isHtml); // HTML renderer doesn't support drawAtlas
+
+  test('drawAtlas', () async {
+    final ui.PictureRecorder recorder = ui.PictureRecorder();
+    final ui.Canvas canvas = ui.Canvas(recorder, region);
+    final ui.Image atlas = generateAtlas();
+    final List<ui.RSTransform> transforms = List<ui.RSTransform>.generate(
+      12, (int index) {
+        const double radius = 100;
+        const double rotation = math.pi / 6.0;
+        final double angle = rotation * index;
+        final double scos = math.sin(angle);
+        final double ssin = math.cos(angle);
+        return ui.RSTransform(
+          scos,
+          ssin,
+          region.center.dx + radius * scos,
+          region.center.dy + radius * ssin,
+        );
+      }
+    );
+    final List<ui.Rect> rects = <ui.Rect>[
+      kBlueSquareRegion,
+      kRedCircleRegion,
+      kMagentaStarRegion,
+      kGreenSquiggleRegion,
+      kBlueSquareRegion,
+      kRedCircleRegion,
+      kMagentaStarRegion,
+      kGreenSquiggleRegion,
+      kBlueSquareRegion,
+      kRedCircleRegion,
+      kMagentaStarRegion,
+      kGreenSquiggleRegion,
+    ];
+    canvas.drawAtlas(
+      atlas, transforms, rects, null, null, null, ui.Paint());
+
+    await drawPictureUsingCurrentRenderer(recorder.endRecording());
+    await matchGoldenFile('ui_draw_atlas.png', region: region);
+  }, skip: isHtml); // HTML renderer doesn't support drawAtlas
+
+  test('drawAtlasRaw', () async {
+    final ui.PictureRecorder recorder = ui.PictureRecorder();
+    final ui.Canvas canvas = ui.Canvas(recorder, region);
+    final ui.Image atlas = generateAtlas();
+    final Float32List transforms = Float32List(12 * 4);
+    for (int i = 0; i < 12; i++) {
+      const double radius = 100;
+      const double rotation = math.pi / 6.0;
+      final double angle = rotation * i;
+      final double scos = math.sin(angle);
+      final double ssin = math.cos(angle);
+      transforms[i * 4] = scos;
+      transforms[i * 4 + 1] = ssin;
+      transforms[i * 4 + 2] = region.center.dx + radius * scos;
+      transforms[i * 4 + 3] = region.center.dy + radius * ssin;
+    }
+    final List<ui.Rect> rects = <ui.Rect>[
+      kBlueSquareRegion,
+      kRedCircleRegion,
+      kMagentaStarRegion,
+      kGreenSquiggleRegion,
+      kBlueSquareRegion,
+      kRedCircleRegion,
+      kMagentaStarRegion,
+      kGreenSquiggleRegion,
+      kBlueSquareRegion,
+      kRedCircleRegion,
+      kMagentaStarRegion,
+      kGreenSquiggleRegion,
+    ];
+    final Float32List rawRects = Float32List(rects.length * 4);
+    for (int i = 0; i < rects.length; i++) {
+      rawRects[i * 4] = rects[i].left;
+      rawRects[i * 4 + 1] = rects[i].top;
+      rawRects[i * 4 + 2] = rects[i].right;
+      rawRects[i * 4 + 3] = rects[i].bottom;
+    }
+
+    final Int32List colors = Int32List(12);
+    for (int i = 0; i < 12; i++) {
+      final int rgb = 0xFF << (8 * (i % 3));
+      colors[i] = 0xFF000000 | rgb;
+    }
+    canvas.drawRawAtlas(
+      atlas,
+      transforms,
+      rawRects,
+      colors,
+      ui.BlendMode.dstIn,
+      null,
+      ui.Paint()
+    );
+
+    await drawPictureUsingCurrentRenderer(recorder.endRecording());
+    await matchGoldenFile('ui_draw_atlas_raw.png', region: region);
+  }, skip: isHtml); // HTML renderer doesn't support drawAtlas
+}
diff --git a/lib/web_ui/test/canvaskit/fallback_fonts_golden_test.dart b/lib/web_ui/test/ui/fallback_fonts_golden_test.dart
similarity index 48%
rename from lib/web_ui/test/canvaskit/fallback_fonts_golden_test.dart
rename to lib/web_ui/test/ui/fallback_fonts_golden_test.dart
index 84c05602b8d699ded1552d1ce8683873b8c5a7ab..f530d86c2c3586e7b76081bcab71221d083c0f14 100644
--- a/lib/web_ui/test/canvaskit/fallback_fonts_golden_test.dart
+++ b/lib/web_ui/test/ui/fallback_fonts_golden_test.dart
@@ -2,255 +2,283 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:async';
+import 'dart:js_interop';
 import 'dart:math' as math;
-import 'dart:typed_data';
 
 import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
+import 'package:web_engine_tester/golden_tester.dart';
 
-import 'common.dart';
+import '../common/test_initialization.dart';
+import 'utils.dart';
 
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
 
-const ui.Rect kDefaultRegion = ui.Rect.fromLTRB(0, 0, 100, 50);
+const ui.Rect kDefaultRegion = ui.Rect.fromLTRB(0, 0, 100, 100);
 
 void testMain() {
   group('Font fallbacks', () {
-    setUpCanvasKitTest();
+    setUpUnitTests(
+      withImplicitView: true,
+      emulateTesterEnvironment: false,
+      setUpTestViewDimensions: false,
+    );
 
-    /// Used to save and restore [ui.window.onPlatformMessage] after each test.
+    setUp(() {
+      debugDisableFontFallbacks = false;
+    });
+
+    /// Used to save and restore [ui.PlatformDispatcher.onPlatformMessage] after each test.
     ui.PlatformMessageCallback? savedCallback;
 
+    final List<String> downloadedFontFamilies = <String>[];
+
     setUp(() {
-      FontFallbackData.debugReset();
-      notoDownloadQueue.downloader = TestDownloader();
-      TestDownloader.mockDownloads.clear();
-      final String notoSansArabicUrl = fallbackFonts
-          .singleWhere((NotoFont font) => font.name == 'Noto Sans Arabic')
-          .url;
-      final String notoEmojiUrl = fallbackFonts
-          .singleWhere((NotoFont font) => font.name == 'Noto Emoji')
-          .url;
-      TestDownloader.mockDownloads[notoSansArabicUrl] =
-          '/assets/fonts/NotoNaskhArabic-Regular.ttf';
-      TestDownloader.mockDownloads[notoEmojiUrl] =
-          '/assets/fonts/NotoColorEmoji.ttf';
-      savedCallback = ui.window.onPlatformMessage;
+      renderer.fontCollection.debugResetFallbackFonts();
+      debugOverrideJsConfiguration(<String, Object?>{
+        'fontFallbackBaseUrl': 'assets/fallback_fonts/',
+      }.jsify() as JsFlutterConfiguration?);
+      renderer.fontCollection.fontFallbackManager!.downloadQueue
+              .debugOnLoadFontFamily =
+          (String family) => downloadedFontFamilies.add(family);
+      savedCallback = ui.PlatformDispatcher.instance.onPlatformMessage;
     });
 
     tearDown(() {
-      ui.window.onPlatformMessage = savedCallback;
+      downloadedFontFamilies.clear();
+      ui.PlatformDispatcher.instance.onPlatformMessage = savedCallback;
     });
 
     test('Roboto is always a fallback font', () {
-      expect(FontFallbackData.instance.globalFontFallbacks, contains('Roboto'));
+      expect(renderer.fontCollection.fontFallbackManager!.globalFontFallbacks,
+          contains('Roboto'));
+    });
+
+    test('can override font fallback base URL using JS', () {
+      expect(
+        renderer.fontCollection.fontFallbackManager!.downloadQueue
+            .fallbackFontUrlPrefix,
+        'assets/fallback_fonts/',
+      );
+      debugOverrideJsConfiguration(<String, Object?>{
+        'fontFallbackBaseUrl': 'http://my-special-fonts.com/',
+      }.jsify() as JsFlutterConfiguration?);
+
+      expect(
+        renderer.fontCollection.fontFallbackManager!.downloadQueue
+            .fallbackFontUrlPrefix,
+        'http://my-special-fonts.com/',
+      );
     });
 
     test('will download Noto Sans Arabic if Arabic text is added', () async {
-      final Rasterizer rasterizer = CanvasKitRenderer.instance.rasterizer;
-      expect(FontFallbackData.instance.globalFontFallbacks, <String>['Roboto']);
+      expect(renderer.fontCollection.fontFallbackManager!.globalFontFallbacks,
+          <String>['Roboto']);
 
       // Creating this paragraph should cause us to start to download the
       // fallback font.
-      CkParagraphBuilder pb = CkParagraphBuilder(
-        CkParagraphStyle(),
+      ui.ParagraphBuilder pb = ui.ParagraphBuilder(
+        ui.ParagraphStyle(),
       );
       pb.addText('مرحبا');
+      pb.build().layout(const ui.ParagraphConstraints(width: 1000));
 
-      rasterizer.debugRunPostFrameCallbacks();
-      await notoDownloadQueue.debugWhenIdle();
+      await renderer.fontCollection.fontFallbackManager!.debugWhenIdle();
 
-      expect(FontFallbackData.instance.globalFontFallbacks,
+      expect(renderer.fontCollection.fontFallbackManager!.globalFontFallbacks,
           contains('Noto Sans Arabic'));
 
-      final CkPictureRecorder recorder = CkPictureRecorder();
-      final CkCanvas canvas = recorder.beginRecording(kDefaultRegion);
+      final ui.PictureRecorder recorder = ui.PictureRecorder();
+      final ui.Canvas canvas = ui.Canvas(recorder);
 
-      pb = CkParagraphBuilder(
-        CkParagraphStyle(),
+      pb = ui.ParagraphBuilder(
+        ui.ParagraphStyle(),
       );
       pb.pushStyle(ui.TextStyle(fontSize: 32));
       pb.addText('مرحبا');
       pb.pop();
-      final CkParagraph paragraph = pb.build();
+      final ui.Paragraph paragraph = pb.build();
       paragraph.layout(const ui.ParagraphConstraints(width: 1000));
 
       canvas.drawParagraph(paragraph, ui.Offset.zero);
+      await drawPictureUsingCurrentRenderer(recorder.endRecording());
 
-      await matchPictureGolden(
-        'canvaskit_font_fallback_arabic.png',
-        recorder.endRecording(),
+      await matchGoldenFile(
+        'ui_font_fallback_arabic.png',
         region: kDefaultRegion,
       );
       // TODO(hterkelsen): https://github.com/flutter/flutter/issues/71520
-    }, skip: isSafari || isFirefox);
+    });
 
-    test('will put the Noto Emoji font before other fallback fonts in the list',
+    test(
+        'will put the Noto Color Emoji font before other fallback fonts in the list',
         () async {
-      final Rasterizer rasterizer = CanvasKitRenderer.instance.rasterizer;
-      expect(FontFallbackData.instance.globalFontFallbacks, <String>['Roboto']);
+      expect(renderer.fontCollection.fontFallbackManager!.globalFontFallbacks,
+          <String>['Roboto']);
 
       // Creating this paragraph should cause us to start to download the
       // Arabic fallback font.
-      CkParagraphBuilder pb = CkParagraphBuilder(
-        CkParagraphStyle(),
+      ui.ParagraphBuilder pb = ui.ParagraphBuilder(
+        ui.ParagraphStyle(),
       );
       pb.addText('مرحبا');
+      pb.build().layout(const ui.ParagraphConstraints(width: 1000));
 
-      rasterizer.debugRunPostFrameCallbacks();
-      await notoDownloadQueue.debugWhenIdle();
+      await renderer.fontCollection.fontFallbackManager!.debugWhenIdle();
 
-      expect(FontFallbackData.instance.globalFontFallbacks,
+      expect(renderer.fontCollection.fontFallbackManager!.globalFontFallbacks,
           <String>['Roboto', 'Noto Sans Arabic']);
 
-      pb = CkParagraphBuilder(
-        CkParagraphStyle(),
+      pb = ui.ParagraphBuilder(
+        ui.ParagraphStyle(),
       );
       pb.pushStyle(ui.TextStyle(fontSize: 26));
       pb.addText('Hello 😊 مرحبا');
       pb.pop();
-      final CkParagraph paragraph = pb.build();
+      final ui.Paragraph paragraph = pb.build();
       paragraph.layout(const ui.ParagraphConstraints(width: 1000));
 
-      rasterizer.debugRunPostFrameCallbacks();
-      await notoDownloadQueue.debugWhenIdle();
+      await renderer.fontCollection.fontFallbackManager!.debugWhenIdle();
 
-      expect(FontFallbackData.instance.globalFontFallbacks, <String>[
-        'Roboto',
-        'Noto Emoji',
-        'Noto Sans Arabic',
-      ]);
+      expect(
+          renderer.fontCollection.fontFallbackManager!.globalFontFallbacks,
+          <String>[
+            'Roboto',
+            'Noto Color Emoji',
+            'Noto Sans Arabic',
+          ]);
     });
 
-    test('will download Noto Emojis and Noto Symbols if no matching Noto Font',
+    test(
+        'will download Noto Color Emojis and Noto Symbols if no matching Noto Font',
         () async {
-      final Rasterizer rasterizer = CanvasKitRenderer.instance.rasterizer;
-      expect(FontFallbackData.instance.globalFontFallbacks, <String>['Roboto']);
+      expect(renderer.fontCollection.fontFallbackManager!.globalFontFallbacks,
+          <String>['Roboto']);
 
       // Creating this paragraph should cause us to start to download the
       // fallback font.
-      CkParagraphBuilder pb = CkParagraphBuilder(
-        CkParagraphStyle(),
+      ui.ParagraphBuilder pb = ui.ParagraphBuilder(
+        ui.ParagraphStyle(),
       );
       pb.addText('Hello 😊');
+      pb.build().layout(const ui.ParagraphConstraints(width: 1000));
 
-      rasterizer.debugRunPostFrameCallbacks();
-      await notoDownloadQueue.debugWhenIdle();
+      await renderer.fontCollection.fontFallbackManager!.debugWhenIdle();
 
-      expect(FontFallbackData.instance.globalFontFallbacks,
-          contains('Noto Emoji'));
+      expect(renderer.fontCollection.fontFallbackManager!.globalFontFallbacks,
+          contains('Noto Color Emoji'));
 
-      final CkPictureRecorder recorder = CkPictureRecorder();
-      final CkCanvas canvas = recorder.beginRecording(kDefaultRegion);
+      final ui.PictureRecorder recorder = ui.PictureRecorder();
+      final ui.Canvas canvas = ui.Canvas(recorder);
 
-      pb = CkParagraphBuilder(
-        CkParagraphStyle(),
+      pb = ui.ParagraphBuilder(
+        ui.ParagraphStyle(),
       );
       pb.pushStyle(ui.TextStyle(fontSize: 26));
       pb.addText('Hello 😊');
       pb.pop();
-      final CkParagraph paragraph = pb.build();
+      final ui.Paragraph paragraph = pb.build();
       paragraph.layout(const ui.ParagraphConstraints(width: 1000));
 
       canvas.drawParagraph(paragraph, ui.Offset.zero);
+      await drawPictureUsingCurrentRenderer(recorder.endRecording());
 
-      await matchPictureGolden(
-        'canvaskit_font_fallback_emoji.png',
-        recorder.endRecording(),
+      await matchGoldenFile(
+        'ui_font_fallback_emoji.png',
         region: kDefaultRegion,
       );
       // TODO(hterkelsen): https://github.com/flutter/flutter/issues/71520
-    }, skip: isSafari || isFirefox);
+    });
 
-    // Regression test for https://github.com/flutter/flutter/issues/75836
-    // When we had this bug our font fallback resolution logic would end up in an
-    // infinite loop and this test would freeze and time out.
-    test(
-        'Can find fonts for two adjacent unmatched code units from different fonts',
-        () async {
-      final Rasterizer rasterizer = CanvasKitRenderer.instance.rasterizer;
-      final LoggingDownloader loggingDownloader =
-          LoggingDownloader(NotoDownloader());
-      notoDownloadQueue.downloader = loggingDownloader;
+    /// Attempts to render [text] and verifies that [expectedFamilies] are downloaded.
+    ///
+    /// Then it does the same, but asserts that the families aren't downloaded again
+    /// (because they already exist in memory).
+    Future<void> checkDownloadedFamiliesForString(
+        String text, List<String> expectedFamilies) async {
       // Try rendering text that requires fallback fonts, initially before the fonts are loaded.
+      ui.ParagraphBuilder pb = ui.ParagraphBuilder(ui.ParagraphStyle());
+      pb.addText(text);
+      pb.build().layout(const ui.ParagraphConstraints(width: 1000));
 
-      CkParagraphBuilder(CkParagraphStyle()).addText('ヽಠ');
-      rasterizer.debugRunPostFrameCallbacks();
-      await notoDownloadQueue.debugWhenIdle();
+      await renderer.fontCollection.fontFallbackManager!.debugWhenIdle();
       expect(
-        loggingDownloader.log,
-        <String>[
-          'Noto Sans SC',
-          'Noto Sans Kannada',
-        ],
+        downloadedFontFamilies,
+        expectedFamilies,
       );
 
       // Do the same thing but this time with loaded fonts.
-      loggingDownloader.log.clear();
-      CkParagraphBuilder(CkParagraphStyle()).addText('ヽಠ');
-      rasterizer.debugRunPostFrameCallbacks();
-      await notoDownloadQueue.debugWhenIdle();
-      expect(loggingDownloader.log, isEmpty);
-    });
+      downloadedFontFamilies.clear();
+      pb = ui.ParagraphBuilder(ui.ParagraphStyle());
+      pb.addText(text);
+      pb.build().layout(const ui.ParagraphConstraints(width: 1000));
 
-    test('can find glyph for 2/3 symbol', () async {
-      final Rasterizer rasterizer = CanvasKitRenderer.instance.rasterizer;
-      final LoggingDownloader loggingDownloader =
-          LoggingDownloader(NotoDownloader());
-      notoDownloadQueue.downloader = loggingDownloader;
-      // Try rendering text that requires fallback fonts, initially before the fonts are loaded.
+      await renderer.fontCollection.fontFallbackManager!.debugWhenIdle();
+      expect(downloadedFontFamilies, isEmpty);
+    }
 
-      CkParagraphBuilder(CkParagraphStyle()).addText('⅔');
-      rasterizer.debugRunPostFrameCallbacks();
-      await notoDownloadQueue.debugWhenIdle();
-      expect(
-        loggingDownloader.log,
-        <String>[
-          'Noto Sans',
-        ],
-      );
+    // Regression test for https://github.com/flutter/flutter/issues/75836
+    // When we had this bug our font fallback resolution logic would end up in an
+    // infinite loop and this test would freeze and time out.
+    test(
+        'can find fonts for two adjacent unmatched code points from different fonts',
+        () async {
+      await checkDownloadedFamiliesForString('ヽಠ', <String>[
+        'Noto Sans SC',
+        'Noto Sans Kannada',
+      ]);
+    });
 
-      // Do the same thing but this time with loaded fonts.
-      loggingDownloader.log.clear();
-      CkParagraphBuilder(CkParagraphStyle()).addText('⅔');
-      rasterizer.debugRunPostFrameCallbacks();
-      await notoDownloadQueue.debugWhenIdle();
-      expect(loggingDownloader.log, isEmpty);
+    test('can find glyph for 2/3 symbol', () async {
+      await checkDownloadedFamiliesForString('⅔', <String>[
+        'Noto Sans',
+      ]);
     });
 
-    test('findMinimumFontsForCodeunits for all supported code units', () async {
-      final LoggingDownloader loggingDownloader =
-          LoggingDownloader(NotoDownloader());
-      notoDownloadQueue.downloader = loggingDownloader;
+    // https://github.com/flutter/devtools/issues/6149
+    test('can find glyph for treble clef', () async {
+      await checkDownloadedFamiliesForString('𝄞', <String>[
+        'Noto Music',
+      ]);
+    });
 
-      // Collect all supported code units from all fallback fonts in the Noto
+    test('findMinimumFontsForCodePoints for all supported code points',
+        () async {
+      // Collect all supported code points from all fallback fonts in the Noto
       // font tree.
       final Set<String> testedFonts = <String>{};
-      final Set<int> supportedUniqueCodeUnits = <int>{};
-      final IntervalTree<NotoFont> notoTree =
-          FontFallbackData.instance.notoTree;
-      for (final NotoFont font in notoTree.root.enumerateAllElements()) {
-        testedFonts.add(font.name);
-        for (final CodeunitRange range in font.computeUnicodeRanges()) {
-          for (int codeUnit = range.start; codeUnit < range.end; codeUnit++) {
-            supportedUniqueCodeUnits.add(codeUnit);
+      final Set<int> supportedUniqueCodePoints = <int>{};
+      renderer.fontCollection.fontFallbackManager!.codePointToComponents
+          .forEachRange((int start, int end, FallbackFontComponent component) {
+        if (component.fonts.isNotEmpty) {
+          bool componentHasEnabledFont = false;
+          for (final NotoFont font in component.fonts) {
+            if (font.enabled) {
+              testedFonts.add(font.name);
+              componentHasEnabledFont = true;
+            }
+          }
+          if (componentHasEnabledFont) {
+            for (int codePoint = start; codePoint <= end; codePoint++) {
+              supportedUniqueCodePoints.add(codePoint);
+            }
           }
         }
-      }
+      });
 
       expect(
-          supportedUniqueCodeUnits.length, greaterThan(10000)); // sanity check
+          supportedUniqueCodePoints.length, greaterThan(10000)); // sanity check
       expect(
           testedFonts,
           unorderedEquals(<String>{
+            'Noto Color Emoji',
+            'Noto Music',
             'Noto Sans',
-            'Noto Emoji',
             'Noto Sans Symbols',
             'Noto Sans Symbols 2',
             'Noto Sans Adlam',
@@ -332,7 +360,7 @@ void testMain() {
             'Noto Sans Mro',
             'Noto Sans Multani',
             'Noto Sans Myanmar',
-            'Noto Sans N Ko',
+            'Noto Sans NKo',
             'Noto Sans Nabataean',
             'Noto Sans New Tai Lue',
             'Noto Sans Newa',
@@ -392,101 +420,70 @@ void testMain() {
             'Noto Sans Zanabazar Square',
           }));
 
-      // Construct random paragraphs out of supported code units.
+      // Construct random paragraphs out of supported code points.
       final math.Random random = math.Random(0);
-      final List<int> supportedCodeUnits = supportedUniqueCodeUnits.toList()
+      final List<int> supportedCodePoints = supportedUniqueCodePoints.toList()
         ..shuffle(random);
       const int paragraphLength = 3;
+      const int totalTestSize = 1000;
 
       for (int batchStart = 0;
-          batchStart < supportedCodeUnits.length;
+          batchStart < totalTestSize;
           batchStart += paragraphLength) {
         final int batchEnd =
-            math.min(batchStart + paragraphLength, supportedCodeUnits.length);
-        final Set<int> codeUnits = <int>{};
+            math.min(batchStart + paragraphLength, supportedCodePoints.length);
+        final Set<int> codePoints = <int>{};
         for (int i = batchStart; i < batchEnd; i += 1) {
-          codeUnits.add(supportedCodeUnits[i]);
+          codePoints.add(supportedCodePoints[i]);
         }
         final Set<NotoFont> fonts = <NotoFont>{};
-        for (final int codeUnit in codeUnits) {
-          final List<NotoFont> fontsForUnit = notoTree.intersections(codeUnit);
-
-          // All code units are extracted from the same tree, so there must
-          // be at least one font supporting each code unit
-          expect(fontsForUnit, isNotEmpty);
-          fonts.addAll(fontsForUnit);
+        for (final int codePoint in codePoints) {
+          final List<NotoFont> fontsForPoint = renderer
+              .fontCollection.fontFallbackManager!.codePointToComponents
+              .lookup(codePoint)
+              .fonts;
+
+          // All code points are extracted from the same tree, so there must
+          // be at least one font supporting each code point
+          expect(fontsForPoint, isNotEmpty);
+          fonts.addAll(fontsForPoint);
         }
 
         try {
-          findMinimumFontsForCodeUnits(codeUnits, fonts);
+          renderer.fontCollection.fontFallbackManager!
+              .findFontsForMissingCodePoints(codePoints.toList());
         } catch (e) {
           print(
-            'findMinimumFontsForCodeunits failed:\n'
-            '  Code units: ${codeUnits.join(', ')}\n'
+            'findFontsForMissingCodePoints failed:\n'
+            '  Code points: ${codePoints.join(', ')}\n'
             '  Fonts: ${fonts.map((NotoFont f) => f.name).join(', ')}',
           );
           rethrow;
         }
       }
     });
-  }, skip: isSafari);
-}
 
-class TestDownloader extends NotoDownloader {
-  // Where to redirect downloads to.
-  static final Map<String, String> mockDownloads = <String, String>{};
-  @override
-  Future<String> downloadAsString(String url,
-      {String? debugDescription}) async {
-    if (mockDownloads.containsKey(url)) {
-      url = mockDownloads[url]!;
-      final Uri uri = Uri.parse(url);
-      expect(uri.isScheme('http'), isFalse);
-      expect(uri.isScheme('https'), isFalse);
-      return super.downloadAsString(url);
-    } else {
-      return '';
-    }
-  }
-
-  @override
-  Future<ByteBuffer> downloadAsBytes(String url, {String? debugDescription}) {
-    if (mockDownloads.containsKey(url)) {
-      url = mockDownloads[url]!;
-      final Uri uri = Uri.parse(url);
-      expect(uri.isScheme('http'), isFalse);
-      expect(uri.isScheme('https'), isFalse);
-      return super.downloadAsBytes(url);
-    } else {
-      return Future<ByteBuffer>.value(Uint8List(0).buffer);
-    }
-  }
-}
+    test('fallback fonts do not download when debugDisableFontFallbacks is set', () async {
+      debugDisableFontFallbacks = true;
 
-class LoggingDownloader implements NotoDownloader {
-  LoggingDownloader(this.delegate);
+      expect(renderer.fontCollection.fontFallbackManager!.globalFontFallbacks, <String>['Roboto']);
 
-  final List<String> log = <String>[];
-
-  final NotoDownloader delegate;
-
-  @override
-  Future<void> debugWhenIdle() {
-    return delegate.debugWhenIdle();
-  }
-
-  @override
-  Future<ByteBuffer> downloadAsBytes(String url, {String? debugDescription}) {
-    log.add(debugDescription ?? url);
-    return delegate.downloadAsBytes(url);
-  }
+      // Creating this paragraph would cause us to start to download the
+      // fallback font if we didn't disable font fallbacks.
+      final ui.ParagraphBuilder pb = ui.ParagraphBuilder(
+        ui.ParagraphStyle(),
+      );
+      pb.addText('Hello 😊');
+      pb.build().layout(const ui.ParagraphConstraints(width: 1000));
 
-  @override
-  Future<String> downloadAsString(String url, {String? debugDescription}) {
-    log.add(debugDescription ?? url);
-    return delegate.downloadAsString(url);
-  }
+      await renderer.fontCollection.fontFallbackManager!.debugWhenIdle();
 
-  @override
-  int get debugActiveDownloadCount => delegate.debugActiveDownloadCount;
+      // Make sure we didn't download the fallback font.
+      expect(renderer.fontCollection.fontFallbackManager!.globalFontFallbacks,
+          isNot(contains('Noto Color Emoji')));
+    });
+  },
+      // HTML renderer doesn't use the fallback font manager.
+      skip: isHtml,
+      timeout: const Timeout.factor(4));
 }
diff --git a/lib/web_ui/test/ui/filters_test.dart b/lib/web_ui/test/ui/filters_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..530551727c33beef906aabdc64d26c808ba0fb61
--- /dev/null
+++ b/lib/web_ui/test/ui/filters_test.dart
@@ -0,0 +1,192 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'dart:math' as math;
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui;
+import 'package:web_engine_tester/golden_tester.dart';
+
+import '../common/test_initialization.dart';
+import 'utils.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+Future<void> testMain() async {
+  setUpUnitTests(
+    withImplicitView: true,
+    setUpTestViewDimensions: false,
+  );
+
+  const ui.Rect region = ui.Rect.fromLTWH(0, 0, 128, 128);
+
+  Future<void> drawTestImageWithPaint(ui.Paint paint) async {
+    final ui.Codec codec = await renderer.instantiateImageCodecFromUrl(
+      Uri(path: '/test_images/mandrill_128.png')
+    );
+    expect(codec.frameCount, 1);
+
+    final ui.FrameInfo info = await codec.getNextFrame();
+    final ui.Image image = info.image;
+    expect(image.width, 128);
+    expect(image.height, 128);
+    final ui.PictureRecorder recorder = ui.PictureRecorder();
+    final ui.Canvas canvas = ui.Canvas(recorder, region);
+    canvas.drawImage(
+      image,
+      ui.Offset.zero,
+      paint,
+    );
+
+    await drawPictureUsingCurrentRenderer(recorder.endRecording());
+  }
+
+  test('blur filter', () async {
+    await drawTestImageWithPaint(ui.Paint()..imageFilter = ui.ImageFilter.blur(
+        sigmaX: 5.0,
+        sigmaY: 5.0,
+    ));
+    await matchGoldenFile('ui_filter_blur_imagefilter.png', region: region);
+  });
+
+  test('dilate filter', () async {
+    await drawTestImageWithPaint(ui.Paint()..imageFilter = ui.ImageFilter.dilate(
+        radiusX: 5.0,
+        radiusY: 5.0,
+    ));
+    await matchGoldenFile('ui_filter_dilate_imagefilter.png', region: region);
+  }, skip: !isSkwasm); // Only skwasm supports dilate filter right now
+
+  test('erode filter', () async {
+    await drawTestImageWithPaint(ui.Paint()..imageFilter = ui.ImageFilter.erode(
+        radiusX: 5.0,
+        radiusY: 5.0,
+    ));
+    await matchGoldenFile('ui_filter_erode_imagefilter.png', region: region);
+  }, skip: !isSkwasm); // Only skwasm supports erode filter
+
+  test('matrix filter', () async {
+    await drawTestImageWithPaint(ui.Paint()..imageFilter = ui.ImageFilter.matrix(
+      Matrix4.rotationZ(math.pi / 6).toFloat64(),
+      filterQuality: ui.FilterQuality.high,
+    ));
+    await matchGoldenFile('ui_filter_matrix_imagefilter.png', region: region);
+  });
+
+  test('resizing matrix filter', () async {
+    await drawTestImageWithPaint(ui.Paint()
+      ..imageFilter = ui.ImageFilter.matrix(
+        Matrix4.diagonal3Values(0.5, 0.5, 1).toFloat64(),
+        filterQuality: ui.FilterQuality.high,
+      ));
+    await matchGoldenFile('ui_filter_matrix_imagefilter_scaled.png',
+        region: region);
+  });
+
+  test('composed filters', () async {
+    final ui.ImageFilter filter = ui.ImageFilter.compose(
+      outer: ui.ImageFilter.matrix(
+        Matrix4.rotationZ(math.pi / 6).toFloat64(),
+        filterQuality: ui.FilterQuality.high,
+      ),
+      inner: ui.ImageFilter.blur(
+        sigmaX: 5.0,
+        sigmaY: 5.0,
+      )
+    );
+    await drawTestImageWithPaint(ui.Paint()..imageFilter = filter);
+    await matchGoldenFile('ui_filter_composed_imagefilters.png', region: region);
+  }, skip: isHtml); // Only Skwasm and CanvasKit implement composable filters right now.
+
+  test('compose with colorfilter', () async {
+    final ui.ImageFilter filter = ui.ImageFilter.compose(
+      outer: const ui.ColorFilter.mode(
+        ui.Color.fromRGBO(0, 0, 255, 128),
+        ui.BlendMode.srcOver,
+      ),
+      inner: ui.ImageFilter.blur(
+        sigmaX: 5.0,
+        sigmaY: 5.0,
+      )
+    );
+    await drawTestImageWithPaint(ui.Paint()..imageFilter = filter);
+    await matchGoldenFile('ui_filter_composed_colorfilter.png', region: region);
+  }, skip: isHtml); // Only Skwasm and CanvasKit implements composable filters right now.
+
+  test('color filter as image filter', () async {
+    const ui.ColorFilter colorFilter = ui.ColorFilter.mode(
+      ui.Color.fromRGBO(0, 0, 255, 128),
+      ui.BlendMode.srcOver,
+    );
+    await drawTestImageWithPaint(ui.Paint()..imageFilter = colorFilter);
+    await matchGoldenFile('ui_filter_colorfilter_as_imagefilter.png', region: region);
+    expect(colorFilter.toString(), 'ColorFilter.mode(Color(0x800000ff), BlendMode.srcOver)');
+  });
+
+  test('mode color filter', () async {
+    const ui.ColorFilter colorFilter = ui.ColorFilter.mode(
+      ui.Color.fromRGBO(0, 0, 255, 128),
+      ui.BlendMode.srcOver,
+    );
+    await drawTestImageWithPaint(ui.Paint()..colorFilter = colorFilter);
+    await matchGoldenFile('ui_filter_mode_colorfilter.png', region: region);
+    expect(colorFilter.toString(), 'ColorFilter.mode(Color(0x800000ff), BlendMode.srcOver)');
+  });
+
+  test('linearToSRGBGamma color filter', () async {
+    const ui.ColorFilter colorFilter = ui.ColorFilter.linearToSrgbGamma();
+    await drawTestImageWithPaint(ui.Paint()..colorFilter = colorFilter);
+    await matchGoldenFile('ui_filter_linear_to_srgb_colorfilter.png', region: region);
+    expect(colorFilter.toString(), 'ColorFilter.linearToSrgbGamma()');
+  }, skip: isHtml); // HTML renderer hasn't implemented this.
+
+  test('srgbToLinearGamma color filter', () async {
+    const ui.ColorFilter colorFilter = ui.ColorFilter.srgbToLinearGamma();
+    await drawTestImageWithPaint(ui.Paint()..colorFilter = colorFilter);
+    await matchGoldenFile('ui_filter_srgb_to_linear_colorfilter.png', region: region);
+    expect(colorFilter.toString(), 'ColorFilter.srgbToLinearGamma()');
+  }, skip: isHtml); // HTML renderer hasn't implemented this.
+
+  test('matrix color filter', () async {
+    const ui.ColorFilter sepia = ui.ColorFilter.matrix(<double>[
+      0.393, 0.769, 0.189, 0, 0,
+      0.349, 0.686, 0.168, 0, 0,
+      0.272, 0.534, 0.131, 0, 0,
+      0,     0,     0,     1, 0,
+    ]);
+    await drawTestImageWithPaint(ui.Paint()..colorFilter = sepia);
+    await matchGoldenFile('ui_filter_matrix_colorfilter.png', region: region);
+    expect(sepia.toString(), startsWith('ColorFilter.matrix([0.393, 0.769, 0.189, '));
+  });
+
+  test('invert colors', () async {
+    await drawTestImageWithPaint(ui.Paint()..invertColors = true);
+    await matchGoldenFile('ui_filter_invert_colors.png', region: region);
+  });
+
+  test('invert colors with color filter', () async {
+    const ui.ColorFilter sepia = ui.ColorFilter.matrix(<double>[
+      0.393, 0.769, 0.189, 0, 0,
+      0.349, 0.686, 0.168, 0, 0,
+      0.272, 0.534, 0.131, 0, 0,
+      0,     0,     0,     1, 0,
+    ]);
+
+    await drawTestImageWithPaint(ui.Paint()
+      ..invertColors = true
+      ..colorFilter = sepia);
+    await matchGoldenFile('ui_filter_invert_colors_with_colorfilter.png', region: region);
+  });
+
+  test('mask filter', () async {
+    const ui.MaskFilter maskFilter = ui.MaskFilter.blur(ui.BlurStyle.normal, 25.0);
+    await drawTestImageWithPaint(ui.Paint()..maskFilter = maskFilter);
+    await matchGoldenFile('ui_filter_blur_maskfilter.png', region: region);
+  });
+}
diff --git a/lib/web_ui/test/ui/font_collection_test.dart b/lib/web_ui/test/ui/font_collection_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..ee9e975166d147ea3eaf4a7d76d6996f62ea35fb
--- /dev/null
+++ b/lib/web_ui/test/ui/font_collection_test.dart
@@ -0,0 +1,185 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:convert';
+import 'dart:typed_data';
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+
+import '../common/fake_asset_manager.dart';
+import '../common/test_initialization.dart';
+import 'utils.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+Future<void> testMain() async {
+  setUpUnitTests();
+
+  late FakeAssetScope testScope;
+  setUp(() {
+    mockHttpFetchResponseFactory = null;
+    testScope = fakeAssetManager.pushAssetScope();
+  });
+
+  tearDown(() {
+    fakeAssetManager.popAssetScope(testScope);
+  });
+
+  test('Loading valid font from data succeeds without family name (except in HTML renderer)', () async {
+    final FlutterFontCollection collection = renderer.fontCollection;
+    final ByteBuffer ahemData = await httpFetchByteBuffer('/assets/fonts/ahem.ttf');
+    expect(
+      await collection.loadFontFromList(ahemData.asUint8List()),
+      !isHtml, // HtmlFontCollection requires family name
+    );
+  });
+
+  test('Loading valid font from data succeeds with family name', () async {
+    final FlutterFontCollection collection = renderer.fontCollection;
+    final ByteBuffer ahemData = await httpFetchByteBuffer('/assets/fonts/ahem.ttf');
+    expect(
+      await collection.loadFontFromList(ahemData.asUint8List(), fontFamily: 'FamilyName'),
+      true
+    );
+  });
+
+  test('Loading invalid font from data returns false', () async {
+    final FlutterFontCollection collection = renderer.fontCollection;
+    final List<int> invalidFontData = utf8.encode('This is not valid font data');
+    expect(
+      await collection.loadFontFromList(Uint8List.fromList(invalidFontData), fontFamily: 'FamilyName'),
+      false
+    );
+  });
+
+  test('Loading valid asset fonts succeds', () async {
+    testScope.setAssetPassthrough(robotoVariableFontUrl);
+    testScope.setAssetPassthrough(robotoTestFontUrl);
+    testScope.setAssetPassthrough(ahemFontUrl);
+
+    final FlutterFontCollection collection = renderer.fontCollection;
+    final AssetFontsResult result = await collection.loadAssetFonts(FontManifest(<FontFamily>[
+      FontFamily(robotoFontFamily, <FontAsset>[
+        FontAsset(robotoVariableFontUrl, <String, String>{}),
+        FontAsset(robotoTestFontUrl, <String, String>{'weight': 'bold'}),
+      ]),
+      FontFamily(ahemFontFamily, <FontAsset>[
+        FontAsset(ahemFontUrl, <String, String>{})
+      ]),
+    ]));
+    expect(result.loadedFonts, <String>[
+      robotoVariableFontUrl,
+      robotoTestFontUrl,
+      ahemFontUrl,
+    ]);
+    expect(result.fontFailures, isEmpty);
+  });
+
+  test('Loading asset fonts reports when font not found', () async {
+    testScope.setAssetPassthrough(robotoVariableFontUrl);
+    testScope.setAssetPassthrough(robotoTestFontUrl);
+
+    const String invalidFontUrl = 'assets/invalid_font_url.ttf';
+
+    final FlutterFontCollection collection = renderer.fontCollection;
+    final AssetFontsResult result = await collection.loadAssetFonts(FontManifest(<FontFamily>[
+      FontFamily(robotoFontFamily, <FontAsset>[
+        FontAsset(robotoVariableFontUrl, <String, String>{}),
+        FontAsset(robotoTestFontUrl, <String, String>{'weight': 'bold'}),
+      ]),
+      FontFamily(ahemFontFamily, <FontAsset>[
+        FontAsset(invalidFontUrl, <String, String>{})
+      ]),
+    ]));
+    expect(result.loadedFonts, <String>[
+      robotoVariableFontUrl,
+      robotoTestFontUrl,
+    ]);
+    expect(result.fontFailures, hasLength(1));
+    if (isHtml) {
+      // The HTML renderer doesn't have a way to differentiate 404's from other
+      // download errors.
+      expect(result.fontFailures[invalidFontUrl], isA<FontDownloadError>());
+    } else {
+      expect(result.fontFailures[invalidFontUrl], isA<FontNotFoundError>());
+    }
+  });
+
+  test('Loading asset fonts reports when a font has invalid data', () async {
+    const String invalidFontUrl = 'assets/invalid_font_data.ttf';
+
+    testScope.setAssetPassthrough(robotoVariableFontUrl);
+    testScope.setAssetPassthrough(robotoTestFontUrl);
+    testScope.setAssetPassthrough(invalidFontUrl);
+
+    mockHttpFetchResponseFactory = (String url) async {
+      if (url == invalidFontUrl) {
+        return MockHttpFetchResponse(
+          url: url,
+          status: 200,
+          payload: MockHttpFetchPayload(
+            byteBuffer: stringAsUtf8Data('this is invalid data').buffer
+          ),
+        );
+      }
+      return null;
+    };
+
+    final FlutterFontCollection collection = renderer.fontCollection;
+    final AssetFontsResult result = await collection.loadAssetFonts(FontManifest(<FontFamily>[
+      FontFamily(robotoFontFamily, <FontAsset>[
+        FontAsset(robotoVariableFontUrl, <String, String>{}),
+        FontAsset(robotoTestFontUrl, <String, String>{'weight': 'bold'}),
+      ]),
+      FontFamily(ahemFontFamily, <FontAsset>[
+        FontAsset(invalidFontUrl, <String, String>{})
+      ]),
+    ]));
+    expect(result.loadedFonts, <String>[
+      robotoVariableFontUrl,
+      robotoTestFontUrl,
+    ]);
+    expect(result.fontFailures, hasLength(1));
+    if (isHtml) {
+      // The HTML renderer doesn't have a way to differentiate invalid data
+      // from other download errors.
+      expect(result.fontFailures[invalidFontUrl], isA<FontDownloadError>());
+    } else {
+      expect(result.fontFailures[invalidFontUrl], isA<FontInvalidDataError>());
+    }
+  });
+
+  test('Font manifest with numeric and string descriptor values parses correctly', () async {
+    testScope.setAsset('FontManifest.json', stringAsUtf8Data(r'''
+[
+  {
+    "family": "FakeFont",
+    "fonts": [
+      {
+        "asset": "fonts/FakeFont.ttf",
+        "style": "italic",
+        "weight": 400
+      }
+    ]
+  }
+]
+'''));
+    final FontManifest manifest = await fetchFontManifest(fakeAssetManager);
+    expect(manifest.families.length, 1);
+
+    final FontFamily family = manifest.families.single;
+    expect(family.name, 'FakeFont');
+    expect(family.fontAssets.length, 1);
+
+    final FontAsset fontAsset = family.fontAssets.single;
+    expect(fontAsset.asset, 'fonts/FakeFont.ttf');
+    expect(fontAsset.descriptors.length, 2);
+    expect(fontAsset.descriptors['style'], 'italic');
+    expect(fontAsset.descriptors['weight'], '400');
+  });
+}
diff --git a/lib/web_ui/test/ui/fragment_shader_test.dart b/lib/web_ui/test/ui/fragment_shader_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..7e74d152ecbe59dbb135b07482880541635fdb45
--- /dev/null
+++ b/lib/web_ui/test/ui/fragment_shader_test.dart
@@ -0,0 +1,86 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:convert';
+import 'dart:typed_data';
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui;
+import 'package:web_engine_tester/golden_tester.dart';
+
+import '../common/fake_asset_manager.dart';
+import '../common/test_initialization.dart';
+import 'utils.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+// This fragment shader generates some voronoi noise. It uses a pseudo-random
+// number generator implemented in the shader itself, so its output is
+// deterministic.
+const String kVoronoiShaderSksl = r'''
+{"sksl": {
+  "shader": "// This SkSL shader is autogenerated by spirv-cross.\n\nfloat4 flutter_FragCoord;\n\nuniform float uTileSize;\n\nvec4 fragColor;\n\nvec2 FLT_flutter_local_FlutterFragCoord()\n{\n    return flutter_FragCoord.xy;\n}\n\nfloat FLT_flutter_local_rand(vec2 co)\n{\n    return fract(sin(dot(co, vec2(12.98980045318603515625, 78.233001708984375))) * 43758.546875);\n}\n\nvec2 FLT_flutter_local_fuzzGridPoint(vec2 coordinate)\n{\n    vec2 param = coordinate * 400.0;\n    vec2 param_1 = coordinate * 400.0;\n    return coordinate + vec2((FLT_flutter_local_rand(param) - 0.5) * 0.800000011920928955078125, (FLT_flutter_local_rand(param_1) - 0.5) * 0.800000011920928955078125);\n}\n\nvec3 FLT_flutter_local_getColorForGridPoint(vec2 coordinate)\n{\n    vec2 param = coordinate * 100.0;\n    vec2 param_1 = coordinate * 200.0;\n    vec2 param_2 = coordinate * 300.0;\n    return vec3(FLT_flutter_local_rand(param), FLT_flutter_local_rand(param_1), FLT_flutter_local_rand(param_2));\n}\n\nvoid FLT_main()\n{\n    vec2 uv = FLT_flutter_local_FlutterFragCoord() / vec2(uTileSize);\n    vec2 upperLeft = floor(uv);\n    vec2 upperRight = vec2(ceil(uv.x), floor(uv.y));\n    vec2 bottomLeft = vec2(floor(uv.x), ceil(uv.y));\n    vec2 bottomRight = ceil(uv);\n    vec2 closestPoint = upperLeft;\n    vec2 param_3 = upperLeft;\n    float dist = distance(uv, FLT_flutter_local_fuzzGridPoint(param_3));\n    vec2 param_4 = upperRight;\n    float upperRightDistance = distance(uv, FLT_flutter_local_fuzzGridPoint(param_4));\n    if (upperRightDistance < dist)\n    {\n        dist = upperRightDistance;\n        closestPoint = upperRight;\n    }\n    vec2 param_5 = bottomLeft;\n    float bottomLeftDistance = distance(uv, FLT_flutter_local_fuzzGridPoint(param_5));\n    if (bottomLeftDistance < dist)\n    {\n        dist = bottomLeftDistance;\n        closestPoint = bottomLeft;\n    }\n    vec2 param_6 = bottomRight;\n    float bottomRightDistance = distance(uv, FLT_flutter_local_fuzzGridPoint(param_6));\n    if (bottomRightDistance < dist)\n    {\n        dist = bottomRightDistance;\n        closestPoint = bottomRight;\n    }\n    vec2 param_7 = closestPoint;\n    fragColor = vec4(FLT_flutter_local_getColorForGridPoint(param_7), 1.0);\n}\n\nhalf4 main(float2 iFragCoord)\n{\n      flutter_FragCoord = float4(iFragCoord, 0, 0);\n      FLT_main();\n      return fragColor;\n}\n",
+  "entrypoint": "main",
+  "stage": 1,
+  "uniforms": [
+    {
+      "array_elements": 0,
+      "bit_width": 32,
+      "columns": 1,
+      "location": 0,
+      "name": "uTileSize",
+      "rows": 1,
+      "type": 10
+    }
+  ]
+}}
+''';
+
+Future<void> testMain() async {
+  setUpUnitTests(
+    withImplicitView: true,
+    setUpTestViewDimensions: false,
+  );
+
+  const ui.Rect region = ui.Rect.fromLTWH(0, 0, 300, 300);
+
+  late FakeAssetScope assetScope;
+  setUp(() {
+    assetScope = fakeAssetManager.pushAssetScope();
+    assetScope.setAsset(
+      'voronoi_shader',
+      ByteData.sublistView(utf8.encode(kVoronoiShaderSksl))
+    );
+  });
+
+  tearDown(() {
+    fakeAssetManager.popAssetScope(assetScope);
+  });
+
+  test('fragment shader', () async {
+    final ui.FragmentProgram program = await renderer.createFragmentProgram('voronoi_shader');
+    final ui.FragmentShader shader = program.fragmentShader();
+
+    Future<void> drawCircle(String goldenFilename) async {
+      final ui.PictureRecorder recorder = ui.PictureRecorder();
+      final ui.Canvas canvas = ui.Canvas(recorder, region);
+      canvas.drawCircle(const ui.Offset(150, 150), 100, ui.Paint()..shader = shader);
+
+      await drawPictureUsingCurrentRenderer(recorder.endRecording());
+
+      await matchGoldenFile(goldenFilename, region: region);
+    }
+
+    shader.setFloat(0, 10.0);
+    await drawCircle('fragment_shader_voronoi_tile10px.png');
+
+    // Make sure we can reuse the shader object with a new uniform value.
+    shader.setFloat(0, 25.0);
+    await drawCircle('fragment_shader_voronoi_tile25px.png');
+  }, skip: isHtml); // Fragment shaders are not supported by the HTML renderer.
+}
diff --git a/lib/web_ui/test/ui/frame_timings_test.dart b/lib/web_ui/test/ui/frame_timings_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..62f83b71d4d0956e917273966259d21dc9086c51
--- /dev/null
+++ b/lib/web_ui/test/ui/frame_timings_test.dart
@@ -0,0 +1,62 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui;
+
+import '../common/test_initialization.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+void testMain() {
+  setUp(() async {
+    await bootstrapAndRunApp(withImplicitView: true);
+  });
+
+  test('collects frame timings', () async {
+    final EnginePlatformDispatcher dispatcher = ui.PlatformDispatcher.instance as EnginePlatformDispatcher;
+    List<ui.FrameTiming>? timings;
+    dispatcher.onReportTimings = (List<ui.FrameTiming> data) {
+      timings = data;
+    };
+    Completer<void> frameDone = Completer<void>();
+    dispatcher.onDrawFrame = () {
+      final ui.SceneBuilder sceneBuilder = ui.SceneBuilder();
+      sceneBuilder
+        ..pushOffset(0, 0)
+        ..pop();
+      dispatcher.render(sceneBuilder.build()).then((_) {
+        frameDone.complete();
+      });
+    };
+
+    // Frame 1.
+    dispatcher.scheduleFrame();
+    await frameDone.future;
+    expect(timings, isNull, reason: "100 ms hasn't passed yet");
+    await Future<void>.delayed(const Duration(milliseconds: 150));
+
+    // Frame 2.
+    frameDone = Completer<void>();
+    dispatcher.scheduleFrame();
+    await frameDone.future;
+    expect(timings, hasLength(2), reason: '100 ms passed. 2 frames pumped.');
+    for (final ui.FrameTiming timing in timings!) {
+      expect(timing.vsyncOverhead, greaterThanOrEqualTo(Duration.zero));
+      expect(timing.buildDuration, greaterThanOrEqualTo(Duration.zero));
+      expect(timing.rasterDuration, greaterThanOrEqualTo(Duration.zero));
+      expect(timing.totalSpan, greaterThanOrEqualTo(Duration.zero));
+      expect(timing.layerCacheCount, equals(0));
+      expect(timing.layerCacheBytes, equals(0));
+      expect(timing.pictureCacheCount, equals(0));
+      expect(timing.pictureCacheBytes, equals(0));
+    }
+  });
+}
diff --git a/lib/web_ui/test/ui/gradient_golden_test.dart b/lib/web_ui/test/ui/gradient_golden_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..2587e99c067f0595c37cbf6721a3039e30427c29
--- /dev/null
+++ b/lib/web_ui/test/ui/gradient_golden_test.dart
@@ -0,0 +1,127 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:math' as math;
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine/browser_detection.dart';
+import 'package:ui/ui.dart';
+import 'package:web_engine_tester/golden_tester.dart';
+
+import '../common/test_initialization.dart';
+import 'utils.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+Future<void> testMain() async {
+  setUpUnitTests(
+    withImplicitView: true,
+    setUpTestViewDimensions: false,
+  );
+
+  const Rect region = Rect.fromLTWH(0, 0, 300, 300);
+
+  group('Gradients', () {
+    test('Using a linear gradient on a paint', () async {
+      final PictureRecorder recorder = PictureRecorder();
+      final Canvas canvas = Canvas(recorder, region);
+      canvas.drawRect(
+        const Rect.fromLTRB(50, 50, 250, 250),
+        Paint()
+          ..shader = Gradient.linear(
+            const Offset(50, 50),
+            const Offset(250, 250),
+            <Color>[
+              const Color(0xFFFF0000),
+              const Color(0xFF00FF00),
+              const Color(0xFF0000FF),
+            ],
+            <double>[0.0, 0.5, 1.0],
+          )
+        );
+
+      await drawPictureUsingCurrentRenderer(recorder.endRecording());
+
+      await matchGoldenFile('linear_gradient_paint.png', region: region);
+    });
+
+    test('Using a radial gradient on a paint', () async {
+      final PictureRecorder recorder = PictureRecorder();
+      final Canvas canvas = Canvas(recorder, region);
+      canvas.drawRect(
+        const Rect.fromLTRB(50, 50, 250, 250),
+        Paint()
+          ..shader = Gradient.radial(
+            const Offset(150, 150),
+            100,
+            <Color>[
+              const Color(0xFFFF0000),
+              const Color(0xFF00FF00),
+              const Color(0xFF0000FF),
+            ],
+            <double>[0.0, 0.5, 1.0],
+          )
+        );
+
+      await drawPictureUsingCurrentRenderer(recorder.endRecording());
+
+      await matchGoldenFile('radial_gradient_paint.png', region: region);
+    });
+
+    test('Using a conical gradient on a paint', () async {
+      final PictureRecorder recorder = PictureRecorder();
+      final Canvas canvas = Canvas(recorder, region);
+      canvas.drawRect(
+        const Rect.fromLTRB(50, 50, 250, 250),
+        Paint()
+          ..shader = Gradient.radial(
+            const Offset(200, 200),
+            100,
+            <Color>[
+              const Color(0xFFFF0000),
+              const Color(0xFF00FF00),
+              const Color(0xFF0000FF),
+            ],
+            <double>[0.0, 0.5, 1.0],
+            TileMode.clamp,
+            null,
+            const Offset(50, 50),
+            5,
+          )
+        );
+
+      await drawPictureUsingCurrentRenderer(recorder.endRecording());
+
+      await matchGoldenFile('conical_gradient_paint.png', region: region);
+    });
+
+    test('Using a sweep gradient on a paint', () async {
+      final PictureRecorder recorder = PictureRecorder();
+      final Canvas canvas = Canvas(recorder, region);
+      canvas.drawRect(
+        const Rect.fromLTRB(50, 50, 250, 250),
+        Paint()
+          ..shader = Gradient.sweep(
+            const Offset(150, 150),
+            <Color>[
+              const Color(0xFFFF0000),
+              const Color(0xFF00FF00),
+              const Color(0xFF0000FF),
+            ],
+            <double>[0.0, 0.5, 1.0],
+            TileMode.clamp,
+            math.pi / 3.0,
+            4.0 * math.pi / 3.0,
+          )
+        );
+
+      await drawPictureUsingCurrentRenderer(recorder.endRecording());
+
+      await matchGoldenFile('sweep_gradient_paint.png', region: region);
+    });
+  }, skip: isFirefox && isHtml); // https://github.com/flutter/flutter/issues/86623
+}
diff --git a/lib/web_ui/test/gradient_test.dart b/lib/web_ui/test/ui/gradient_test.dart
similarity index 66%
rename from lib/web_ui/test/gradient_test.dart
rename to lib/web_ui/test/ui/gradient_test.dart
index 667e286c0106a45365315dc283e9b0ff8d081c30..3ae0f886a079300424eaaa7bcd60a287317f071e 100644
--- a/lib/web_ui/test/gradient_test.dart
+++ b/lib/web_ui/test/ui/gradient_test.dart
@@ -7,11 +7,15 @@ import 'package:test/test.dart';
 
 import 'package:ui/ui.dart';
 
+import '../common/test_initialization.dart';
+
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
 
-void testMain() {
+Future<void> testMain() async {
+  setUpUnitTests();
+
   test('Gradient.radial with no focal point', () {
     expect(
       Gradient.radial(
@@ -71,4 +75,45 @@ void testMain() {
       throwsA(const TypeMatcher<AssertionError>()),
     );
   });
+
+  test('gradients throw on invalid color stops', () {
+    expect(
+      () => Gradient.linear(
+        Offset.zero,
+        const Offset(1.0, 1.0),
+        const <Color>[
+          Color(0x11111111),
+          Color(0x22222222),
+          Color(0x33333333),
+        ],
+        const <double>[0.0, 1.0],
+      ),
+      throwsArgumentError
+    );
+    expect(
+      () => Gradient.radial(
+        Offset.zero,
+        5.0,
+        const <Color>[
+          Color(0x11111111),
+          Color(0x22222222),
+          Color(0x33333333),
+        ],
+        const <double>[0.0, 1.0],
+      ),
+      throwsArgumentError
+    );
+    expect(
+      () => Gradient.sweep(
+        Offset.zero,
+        const <Color>[
+          Color(0x11111111),
+          Color(0x22222222),
+          Color(0x33333333),
+        ],
+        const <double>[0.0, 1.0],
+      ),
+      throwsArgumentError
+    );
+  });
 }
diff --git a/lib/web_ui/test/ui/image_golden_test.dart b/lib/web_ui/test/ui/image_golden_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..7821339dbe286eea3fe9a03793642c5f8d727cdf
--- /dev/null
+++ b/lib/web_ui/test/ui/image_golden_test.dart
@@ -0,0 +1,349 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'dart:convert';
+import 'dart:js_interop';
+import 'dart:math';
+import 'dart:typed_data';
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+
+import 'package:ui/ui.dart' as ui;
+import 'package:web_engine_tester/golden_tester.dart';
+
+import '../common/fake_asset_manager.dart';
+import '../common/test_initialization.dart';
+import 'utils.dart';
+
+const String kGlitchShaderSksl = r'''
+{"sksl": {
+  "shader": "// This SkSL shader is autogenerated by spirv-cross.\n\nfloat4 flutter_FragCoord;\n\nuniform vec2 uResolution;\nuniform float uTime;\nuniform shader uTex;\nuniform half2 uTex_size;\n\nvec4 oColor;\n\nvec2 FLT_flutter_local_FlutterFragCoord()\n{\n    return flutter_FragCoord.xy;\n}\n\nfloat FLT_flutter_local_cubicPulse(float c, float w, inout float x)\n{\n    x = abs(x - c);\n    if (x > w)\n    {\n        return 0.0;\n    }\n    x /= w;\n    return 1.0 - ((x * x) * (3.0 - (2.0 * x)));\n}\n\nfloat FLT_flutter_local_twoSin(inout float x)\n{\n    x = (6.4899997711181640625 * x) - 0.64999997615814208984375;\n    float t = ((-0.699999988079071044921875) * sin(6.80000019073486328125 * x)) + (1.39999997615814208984375 * sin(2.900000095367431640625 * x));\n    t = (t / 4.099999904632568359375) + 0.5;\n    return t;\n}\n\nfloat FLT_flutter_local_hash_1d(float v)\n{\n    float u = 50.0 * sin(v * 3000.0);\n    return (2.0 * fract((2.0 * u) * u)) - 1.0;\n}\n\nvoid FLT_main()\n{\n    vec2 uv = vec2(FLT_flutter_local_FlutterFragCoord()) / uResolution;\n    float param = 0.5;\n    float param_1 = 0.0500000007450580596923828125;\n    float param_2 = fract(uTime / 4.0);\n    float _127 = FLT_flutter_local_cubicPulse(param, param_1, param_2);\n    float t_2 = _127;\n    float param_3 = fract(uTime / 5.0);\n    float _134 = FLT_flutter_local_twoSin(param_3);\n    float t_1 = _134;\n    float glitchScale = mix(0.0, 8.0, t_1 + t_2);\n    float aberrationSize = mix(0.0, 5.0, t_1 + t_2);\n    float param_4 = uv.y;\n    float h = FLT_flutter_local_hash_1d(param_4);\n    float hs = sign(h);\n    h = max(h, 0.0);\n    h *= h;\n    h = floor(h + float(0.5)) * hs;\n    uv += (vec2(h * glitchScale, 0.0) / uResolution);\n    vec2 redOffset = vec2(aberrationSize, 0.0) / uResolution;\n    vec2 greenOffset = vec2(0.0) / uResolution;\n    vec2 blueOffset = vec2(-aberrationSize, 0.0) / uResolution;\n    vec2 redUv = uv + redOffset;\n    vec2 greenUv = uv + greenOffset;\n    vec2 blueUv = uv + blueOffset;\n    vec2 ra = uTex.eval(uTex_size *  redUv).xw;\n    vec2 ga = uTex.eval(uTex_size *  greenUv).yw;\n    vec2 ba = uTex.eval(uTex_size *  blueUv).zw;\n    ra.x /= ra.y;\n    ga.x /= ga.y;\n    ba.x /= ba.y;\n    float alpha = max(ra.y, max(ga.y, ba.y));\n    oColor = vec4(ra.x, ga.x, ba.x, 1.0) * alpha;\n}\n\nhalf4 main(float2 iFragCoord)\n{\n      flutter_FragCoord = float4(iFragCoord, 0, 0);\n      FLT_main();\n      return oColor;\n}\n",
+  "entrypoint": "main",
+  "stage": 1,
+  "uniforms": [
+    {
+      "array_elements": 0,
+      "bit_width": 32,
+      "columns": 1,
+      "location": 0,
+      "name": "uResolution",
+      "rows": 2,
+      "type": 10
+    },
+    {
+      "array_elements": 0,
+      "bit_width": 32,
+      "columns": 1,
+      "location": 1,
+      "name": "uTime",
+      "rows": 1,
+      "type": 10
+    },
+    {
+      "array_elements": 0,
+      "bit_width": 0,
+      "columns": 1,
+      "location": 2,
+      "name": "uTex",
+      "rows": 1,
+      "type": 12
+    }
+  ]
+}}
+''';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+Future<void> testMain() async {
+  setUpUnitTests(
+    withImplicitView: true,
+    setUpTestViewDimensions: false,
+  );
+
+  late FakeAssetScope assetScope;
+  setUp(() {
+    assetScope = fakeAssetManager.pushAssetScope();
+    assetScope.setAsset(
+      'glitch_shader',
+      ByteData.sublistView(utf8.encode(kGlitchShaderSksl))
+    );
+  });
+
+  tearDown(() {
+    fakeAssetManager.popAssetScope(assetScope);
+  });
+
+  const ui.Rect drawRegion = ui.Rect.fromLTWH(0, 0, 300, 300);
+  const ui.Rect imageRegion = ui.Rect.fromLTWH(0, 0, 150, 150);
+
+  // Emits a set of rendering tests for an image
+  // `imageGenerator` should produce an image that is 150x150 pixels.
+  void emitImageTests(String name, Future<ui.Image> Function() imageGenerator) {
+    group(name, () {
+      late ui.Image image;
+      setUp(() async {
+        image = await imageGenerator();
+      });
+
+      tearDown(() {
+        image.dispose();
+      });
+
+      test('drawImage', () async {
+        final ui.Image image = await imageGenerator();
+
+        final ui.PictureRecorder recorder = ui.PictureRecorder();
+        final ui.Canvas canvas = ui.Canvas(recorder, drawRegion);
+        canvas.drawImage(image, const ui.Offset(100, 100), ui.Paint());
+
+        await drawPictureUsingCurrentRenderer(recorder.endRecording());
+
+        await matchGoldenFile('${name}_canvas_drawImage.png', region: drawRegion);
+      });
+
+      test('drawImageRect', () async {
+        final ui.Image image = await imageGenerator();
+
+        final ui.PictureRecorder recorder = ui.PictureRecorder();
+        final ui.Canvas canvas = ui.Canvas(recorder, drawRegion);
+        canvas.drawImageRect(
+          image,
+          const ui.Rect.fromLTRB(50, 50, 100, 100),
+          const ui.Rect.fromLTRB(100, 100, 150, 150),
+          ui.Paint()
+        );
+
+        await drawPictureUsingCurrentRenderer(recorder.endRecording());
+
+        await matchGoldenFile('${name}_canvas_drawImageRect.png', region: drawRegion);
+      });
+
+      test('drawImageNine', () async {
+        final ui.Image image = await imageGenerator();
+
+        final ui.PictureRecorder recorder = ui.PictureRecorder();
+        final ui.Canvas canvas = ui.Canvas(recorder, drawRegion);
+        canvas.drawImageNine(
+          image,
+          const ui.Rect.fromLTRB(50, 50, 100, 100),
+          drawRegion,
+          ui.Paint()
+        );
+
+        await drawPictureUsingCurrentRenderer(recorder.endRecording());
+
+        await matchGoldenFile('${name}_canvas_drawImageNine.png', region: drawRegion);
+      });
+
+      test('image_shader_cubic_rotated', () async {
+        final ui.Image image = await imageGenerator();
+
+        final Float64List matrix = Matrix4.rotationZ(pi / 6).toFloat64();
+        final ui.ImageShader shader = ui.ImageShader(
+          image,
+          ui.TileMode.repeated,
+          ui.TileMode.repeated,
+          matrix,
+          filterQuality: ui.FilterQuality.high,
+        );
+        final ui.PictureRecorder recorder = ui.PictureRecorder();
+        final ui.Canvas canvas = ui.Canvas(recorder, drawRegion);
+        canvas.drawOval(
+          const ui.Rect.fromLTRB(0, 50, 300, 250),
+          ui.Paint()..shader = shader
+        );
+
+        await drawPictureUsingCurrentRenderer(recorder.endRecording());
+        await matchGoldenFile('${name}_image_shader_cubic_rotated.png', region: drawRegion);
+      });
+
+      test('fragment_shader_sampler', () async {
+        final ui.Image image = await imageGenerator();
+
+        final ui.FragmentProgram program = await renderer.createFragmentProgram('glitch_shader');
+        final ui.FragmentShader shader = program.fragmentShader();
+
+        // Resolution
+        shader.setFloat(0, 300);
+        shader.setFloat(1, 300);
+
+        // Time
+        shader.setFloat(2, 2);
+
+        // Image
+        shader.setImageSampler(0, image);
+
+        final ui.PictureRecorder recorder = ui.PictureRecorder();
+        final ui.Canvas canvas = ui.Canvas(recorder, drawRegion);
+        canvas.drawCircle(const ui.Offset(150, 150), 100, ui.Paint()..shader = shader);
+
+        await drawPictureUsingCurrentRenderer(recorder.endRecording());
+
+        await matchGoldenFile('${name}_fragment_shader_sampler.png', region: drawRegion);
+      }, skip: isHtml); // HTML doesn't support fragment shaders
+
+      test('toByteData_rgba', () async {
+        final ui.Image image = await imageGenerator();
+
+        final ByteData? rgbaData = await image.toByteData();
+        expect(rgbaData, isNotNull);
+        expect(rgbaData!.lengthInBytes, isNonZero);
+      });
+
+      test('toByteData_png', () async {
+        final ui.Image image = await imageGenerator();
+
+        final ByteData? pngData = await image.toByteData(format: ui.ImageByteFormat.png);
+        expect(pngData, isNotNull);
+        expect(pngData!.lengthInBytes, isNonZero);
+      }, skip: isHtml); // https://github.com/flutter/flutter/issues/126611
+    });
+  }
+
+  emitImageTests('picture_toImage', () {
+    final ui.PictureRecorder recorder = ui.PictureRecorder();
+    final ui.Canvas canvas = ui.Canvas(recorder, imageRegion);
+    for (int y = 0; y < 15; y++) {
+      for (int x = 0; x < 15; x++) {
+        final ui.Offset center = ui.Offset(x * 10 + 5, y * 10 + 5);
+        final ui.Color color = ui.Color.fromRGBO(
+          (center.dx * 256 / 150).round(),
+          (center.dy * 256 / 150).round(), 0, 1);
+        canvas.drawCircle(center, 5, ui.Paint()..color = color);
+      }
+    }
+    return recorder.endRecording().toImage(150, 150);
+  });
+
+  Uint8List generatePixelData(
+    int width,
+    int height,
+    ui.Color Function(double, double) generator
+  ) {
+    final Uint8List data = Uint8List(width * height * 4);
+    int outputIndex = 0;
+    for (int y = 0; y < height; y++) {
+      for (int x = 0; x < width; x++) {
+        final ui.Color pixelColor = generator(
+          (2.0 * x / width) - 1.0,
+          (2.0 * y / height) - 1.0,
+        );
+        data[outputIndex++] = pixelColor.red;
+        data[outputIndex++] = pixelColor.green;
+        data[outputIndex++] = pixelColor.blue;
+        data[outputIndex++] = pixelColor.alpha;
+      }
+    }
+    return data;
+  }
+
+  emitImageTests('decodeImageFromPixels_unscaled', () {
+    final Uint8List pixels = generatePixelData(150, 150, (double x, double y) {
+      final double r = sqrt(x * x + y * y);
+      final double theta = atan2(x, y);
+      return ui.Color.fromRGBO(
+        (255 * (sin(r * 10.0) + 1.0) / 2.0).round(),
+        (255 * (sin(theta * 10.0) + 1.0) / 2.0).round(),
+        0,
+        1,
+      );
+    });
+    final Completer<ui.Image> completer = Completer<ui.Image>();
+    ui.decodeImageFromPixels(pixels, 150, 150, ui.PixelFormat.rgba8888, completer.complete);
+    return completer.future;
+  });
+
+  // https://github.com/flutter/flutter/issues/126603
+  if (!isHtml) {
+    emitImageTests('decodeImageFromPixels_scaled', () {
+      final Uint8List pixels = generatePixelData(50, 50, (double x, double y) {
+        final double r = sqrt(x * x + y * y);
+        final double theta = atan2(x, y);
+        return ui.Color.fromRGBO(
+          (255 * (sin(r * 10.0) + 1.0) / 2.0).round(),
+          (255 * (sin(theta * 10.0) + 1.0) / 2.0).round(),
+          0,
+          1,
+        );
+      });
+      final Completer<ui.Image> completer = Completer<ui.Image>();
+      ui.decodeImageFromPixels(
+        pixels,
+        50,
+        50,
+        ui.PixelFormat.rgba8888,
+        completer.complete,
+        targetWidth: 150,
+        targetHeight: 150,
+      );
+      return completer.future;
+    });
+  }
+
+  emitImageTests('codec_uri', () async {
+    final ui.Codec codec = await renderer.instantiateImageCodecFromUrl(
+      Uri(path: '/test_images/mandrill_128.png')
+    );
+    expect(codec.frameCount, 1);
+
+    final ui.FrameInfo info = await codec.getNextFrame();
+    return info.image;
+  });
+
+  // This API doesn't work in headless Firefox due to requiring WebGL
+  // See https://github.com/flutter/flutter/issues/109265
+  if (!isFirefox) {
+    emitImageTests('svg_image_bitmap', () async {
+      final DomBlob svgBlob = createDomBlob(<String>[
+  '''
+  <svg xmlns="http://www.w3.org/2000/svg" width="150" height="150">
+    <path d="M25,75  A50,50 0 1,0 125 75 L75,25 Z" stroke="blue" stroke-width="10" fill="red"></path>
+  </svg>
+  '''
+      ], <String, String>{'type': 'image/svg+xml'});
+      final String url = domWindow.URL.createObjectURL(svgBlob);
+      final DomHTMLImageElement image = createDomHTMLImageElement();
+      final Completer<void> completer = Completer<void>();
+      late final DomEventListener loadListener;
+      loadListener = createDomEventListener((DomEvent event) {
+        completer.complete();
+        image.removeEventListener('load', loadListener);
+      });
+      image.addEventListener('load', loadListener);
+      image.src = url;
+      await completer.future;
+
+      final DomImageBitmap bitmap = await createImageBitmap(image as JSObject);
+
+      expect(bitmap.width.toDartInt, 150);
+      expect(bitmap.height.toDartInt, 150);
+      final ui.Image uiImage = await renderer.createImageFromImageBitmap(bitmap);
+
+      if (isSkwasm) {
+        // Skwasm transfers the bitmap to the web worker, so it should be disposed/consumed.
+        expect(bitmap.width.toDartInt, 0);
+        expect(bitmap.height.toDartInt, 0);
+      }
+      return uiImage;
+    });
+  }
+
+  emitImageTests('codec_list_resized', () async {
+    final ByteBuffer data = await httpFetchByteBuffer('/test_images/mandrill_128.png');
+    final ui.Codec codec = await renderer.instantiateImageCodec(
+      data.asUint8List(),
+      targetWidth: 150,
+      targetHeight: 150,
+    );
+    expect(codec.frameCount, 1);
+
+    final ui.FrameInfo info = await codec.getNextFrame();
+    return info.image;
+  });
+}
diff --git a/lib/web_ui/test/ui/line_metrics_test.dart b/lib/web_ui/test/ui/line_metrics_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..678f5d0920edba42c37ad11569af195256911a1b
--- /dev/null
+++ b/lib/web_ui/test/ui/line_metrics_test.dart
@@ -0,0 +1,180 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/ui.dart' as ui;
+import 'package:ui/ui_web/src/ui_web/testing.dart';
+
+import '../common/test_initialization.dart';
+import 'utils.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+Future<void> testMain() async {
+  setUpUnitTests(
+    withImplicitView: true,
+    setUpTestViewDimensions: false,
+  );
+
+  test('empty paragraph', () {
+    const double fontSize = 10.0;
+    final ui.Paragraph paragraph = ui.ParagraphBuilder(ui.ParagraphStyle(
+      fontSize: fontSize,
+    )).build();
+    paragraph.layout(const ui.ParagraphConstraints(width: double.infinity));
+
+    expect(paragraph.getLineMetricsAt(0), isNull);
+    expect(paragraph.numberOfLines, 0);
+    expect(paragraph.getLineNumberAt(0), isNull);
+  }, skip: isHtml); // https://github.com/flutter/flutter/issues/144412
+
+  test('Basic line related metrics', () {
+    const double fontSize = 10;
+    final ui.ParagraphBuilder builder = ui.ParagraphBuilder(ui.ParagraphStyle(
+      fontStyle: ui.FontStyle.normal,
+      fontWeight: ui.FontWeight.normal,
+      fontSize: fontSize,
+      maxLines: 1,
+      ellipsis: 'BBB',
+    ))..addText('A' * 100);
+    final ui.Paragraph paragraph = builder.build();
+    paragraph.layout(const ui.ParagraphConstraints(width: 100.0));
+
+    expect(paragraph.numberOfLines, 1);
+
+    expect(paragraph.getLineMetricsAt(-1), isNull);
+    expect(paragraph.getLineMetricsAt(0)?.lineNumber, 0);
+    expect(paragraph.getLineMetricsAt(1), isNull);
+
+    expect(paragraph.getLineNumberAt(-1), isNull);
+    expect(paragraph.getLineNumberAt(0), 0);
+    expect(paragraph.getLineNumberAt(6), 0);
+    // The last 3 characters on the first line are ellipsized with BBB.
+    expect(paragraph.getLineMetricsAt(7), isNull);
+  });
+
+  test('Basic glyph metrics', () {
+    const double fontSize = 10;
+    final ui.ParagraphBuilder builder = ui.ParagraphBuilder(ui.ParagraphStyle(
+      fontStyle: ui.FontStyle.normal,
+      fontWeight: ui.FontWeight.normal,
+      fontFamily: 'FlutterTest',
+      fontSize: fontSize,
+      maxLines: 1,
+      ellipsis: 'BBB',
+    ))..addText('A' * 100);
+    final ui.Paragraph paragraph = builder.build();
+    paragraph.layout(const ui.ParagraphConstraints(width: 100.0));
+
+    expect(paragraph.getGlyphInfoAt(-1), isNull);
+
+    // The last 3 characters on the first line are ellipsized with BBB.
+    expect(paragraph.getGlyphInfoAt(0)?.graphemeClusterCodeUnitRange, const ui.TextRange(start: 0, end: 1));
+    expect(paragraph.getGlyphInfoAt(6)?.graphemeClusterCodeUnitRange, const ui.TextRange(start: 6, end: 7));
+    expect(paragraph.getGlyphInfoAt(7), isNull);
+    expect(paragraph.getGlyphInfoAt(200), isNull);
+  });
+
+  test('Basic glyph metrics - hit test', () {
+    const double fontSize = 10.0;
+    final ui.ParagraphBuilder builder = ui.ParagraphBuilder(ui.ParagraphStyle(
+      fontSize: fontSize,
+      fontFamily: 'FlutterTest',
+    ))..addText('Test\nTest');
+    final ui.Paragraph paragraph = builder.build();
+    paragraph.layout(const ui.ParagraphConstraints(width: double.infinity));
+
+    final ui.GlyphInfo? bottomRight = paragraph.getClosestGlyphInfoForOffset(const ui.Offset(99.0, 99.0));
+    final ui.GlyphInfo? last = paragraph.getGlyphInfoAt(8);
+    expect(bottomRight, equals(last));
+    expect(bottomRight, isNot(paragraph.getGlyphInfoAt(0)));
+
+    expect(bottomRight?.graphemeClusterLayoutBounds, const ui.Rect.fromLTWH(30, 10, 10, 10));
+    expect(bottomRight?.graphemeClusterCodeUnitRange, const ui.TextRange(start: 8, end: 9));
+    expect(bottomRight?.writingDirection, ui.TextDirection.ltr);
+  });
+
+  test('rounding hack is always disabled', () {
+    const double fontSize = 1.25;
+    const String text = '12345';
+    assert((fontSize * text.length).truncate() != fontSize * text.length);
+    final ui.ParagraphBuilder builder = ui.ParagraphBuilder(
+      ui.ParagraphStyle(fontSize: fontSize, fontFamily: 'FlutterTest'),
+    );
+    builder.addText(text);
+    final ui.Paragraph paragraph = builder.build()
+      ..layout(const ui.ParagraphConstraints(width: text.length * fontSize));
+
+    expect(paragraph.maxIntrinsicWidth, text.length * fontSize);
+    switch (paragraph.computeLineMetrics()) {
+      case [ui.LineMetrics(width: final double width)]:
+        expect(width, text.length * fontSize);
+      case final List<ui.LineMetrics> metrics:
+        expect(metrics, hasLength(1));
+    }
+  }, skip: isHtml); // The rounding hack doesn't apply to the html renderer
+
+  test('overrides with flutter test font when debugEmulateFlutterTesterEnvironment is enabled', () {
+    final ui.ParagraphBuilder builder = ui.ParagraphBuilder(ui.ParagraphStyle());
+    builder.pushStyle(ui.TextStyle(
+      fontSize: 10.0,
+      fontFamily: 'Roboto',
+    ));
+    builder.addText('XXXX');
+    final ui.Paragraph paragraph = builder.build();
+    paragraph.layout(const ui.ParagraphConstraints(width: 400));
+
+    expect(paragraph.numberOfLines, 1);
+    expect(paragraph.height, 10);
+
+    final ui.LineMetrics? metrics = paragraph.getLineMetricsAt(0);
+    expect(metrics, isNotNull);
+
+    // FlutterTest font's 'X' character is a square, so it's the font size (10.0) * 4 characters.
+    expect(metrics!.width, 40.0);
+  });
+
+  test('uses flutter test font by default when debugEmulateFlutterTesterEnvironment is enabled', () {
+    final ui.ParagraphBuilder builder = ui.ParagraphBuilder(ui.ParagraphStyle());
+    builder.pushStyle(ui.TextStyle(
+      fontSize: 10.0,
+    ));
+    builder.addText('XXXX');
+    final ui.Paragraph paragraph = builder.build();
+    paragraph.layout(const ui.ParagraphConstraints(width: 400));
+
+    expect(paragraph.numberOfLines, 1);
+    expect(paragraph.height, 10);
+
+    final ui.LineMetrics? metrics = paragraph.getLineMetricsAt(0);
+    expect(metrics, isNotNull);
+
+    // FlutterTest font's 'X' character is a square, so it's the font size (10.0) * 4 characters.
+    expect(metrics!.width, 40.0);
+  });
+
+  test('uses specified font when debugEmulateFlutterTesterEnvironment is disabled', () {
+    debugEmulateFlutterTesterEnvironment = false;
+
+    final ui.ParagraphBuilder builder = ui.ParagraphBuilder(ui.ParagraphStyle());
+    builder.pushStyle(ui.TextStyle(
+      fontSize: 16.0,
+      fontFamily: 'Roboto',
+    ));
+    builder.addText('O');
+    final ui.Paragraph paragraph = builder.build();
+    paragraph.layout(const ui.ParagraphConstraints(width: 400));
+
+    expect(paragraph.numberOfLines, 1);
+
+    final ui.LineMetrics? metrics = paragraph.getLineMetricsAt(0);
+    expect(metrics, isNotNull);
+
+    // In Roboto, the width should be 11 here. In the test font, it would be square (16 points)
+    expect(metrics!.width, 11);
+  });
+}
diff --git a/lib/web_ui/test/ui/paint_test.dart b/lib/web_ui/test/ui/paint_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..4518d08c4d3ec84b9bb9a1f4253039e4f4319587
--- /dev/null
+++ b/lib/web_ui/test/ui/paint_test.dart
@@ -0,0 +1,71 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/ui.dart' as ui;
+
+import '../common/test_initialization.dart';
+import 'utils.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+Future<void> testMain() async {
+  setUpUnitTests(
+    emulateTesterEnvironment: false,
+    setUpTestViewDimensions: false,
+  );
+
+  test('toString()', () {
+    final ui.Paint paint = ui.Paint();
+    paint.blendMode = ui.BlendMode.darken;
+    paint.style = ui.PaintingStyle.fill;
+    paint.strokeWidth = 1.2;
+    paint.strokeCap = ui.StrokeCap.square;
+    paint.strokeJoin = ui.StrokeJoin.bevel;
+    paint.isAntiAlias = true;
+    paint.color = const ui.Color(0xaabbccdd);
+    paint.invertColors = true;
+    paint.shader = ui.Gradient.linear(
+      const ui.Offset(0.1, 0.2),
+      const ui.Offset(1.5, 1.6),
+      const <ui.Color>[
+        ui.Color(0xaabbccdd),
+        ui.Color(0xbbccddee),
+      ],
+      <double>[0.3, 0.4],
+      ui.TileMode.decal,
+    );
+    paint.maskFilter = const ui.MaskFilter.blur(ui.BlurStyle.normal, 1.7);
+    paint.filterQuality = ui.FilterQuality.high;
+    paint.colorFilter = const ui.ColorFilter.linearToSrgbGamma();
+    paint.strokeMiterLimit = 1.8;
+    paint.imageFilter = ui.ImageFilter.blur(
+      sigmaX: 1.9,
+      sigmaY: 2.1,
+      tileMode: ui.TileMode.mirror,
+    );
+
+    if (!isSkwasm) {
+      expect(
+        paint.toString(),
+        'Paint('
+        'Color(0xaabbccdd); '
+        'BlendMode.darken; '
+        'colorFilter: ColorFilter.linearToSrgbGamma(); '
+        'maskFilter: MaskFilter.blur(BlurStyle.normal, 1.7); '
+        'filterQuality: FilterQuality.high; '
+        'shader: Gradient(); '
+        'imageFilter: ImageFilter.blur(1.9, 2.1, mirror); '
+        'invert: true'
+        ')',
+      );
+    } else {
+      // TODO(yjbanov): https://github.com/flutter/flutter/issues/141639
+      expect(paint.toString(), 'Paint()');
+    }
+  });
+}
diff --git a/lib/web_ui/test/paragraph_builder_test.dart b/lib/web_ui/test/ui/paragraph_builder_test.dart
similarity index 47%
rename from lib/web_ui/test/paragraph_builder_test.dart
rename to lib/web_ui/test/ui/paragraph_builder_test.dart
index a795a35adf686e7de504f40870af4e94f4668a3f..b83d255b0a2dea8135cfcfeaf685fdedac4d2d60 100644
--- a/lib/web_ui/test/paragraph_builder_test.dart
+++ b/lib/web_ui/test/ui/paragraph_builder_test.dart
@@ -6,12 +6,18 @@ import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/ui.dart';
 
+import '../common/test_initialization.dart';
+
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
 
 Future<void> testMain() async {
-  await webOnlyInitializePlatform();
+  setUpUnitTests(
+    withImplicitView: true,
+    emulateTesterEnvironment: false,
+    setUpTestViewDimensions: false,
+  );
 
   test('Should be able to build and layout a paragraph', () {
     final ParagraphBuilder builder = ParagraphBuilder(ParagraphStyle());
@@ -24,13 +30,6 @@ Future<void> testMain() async {
     expect(paragraph.height, isNonZero);
   });
 
-  test('pushStyle should not segfault after build()', () {
-    final ParagraphBuilder paragraphBuilder =
-        ParagraphBuilder(ParagraphStyle());
-    paragraphBuilder.build();
-    paragraphBuilder.pushStyle(TextStyle());
-  });
-
   test('the presence of foreground style should not throw', () {
     final ParagraphBuilder builder = ParagraphBuilder(ParagraphStyle());
     builder.pushStyle(TextStyle(
@@ -40,4 +39,33 @@ Future<void> testMain() async {
 
     expect(() => builder.build(), returnsNormally);
   });
+
+  test('getWordBoundary respects position affinity', () {
+    final ParagraphBuilder builder = ParagraphBuilder(ParagraphStyle());
+    builder.addText('hello world');
+
+    final Paragraph paragraph = builder.build();
+    paragraph.layout(const ParagraphConstraints(width: double.infinity));
+
+    final TextRange downstreamWordBoundary = paragraph.getWordBoundary(const TextPosition(
+      offset: 5,
+    ));
+    expect(downstreamWordBoundary, const TextRange(start: 5, end: 6));
+
+    final TextRange upstreamWordBoundary = paragraph.getWordBoundary(const TextPosition(
+      offset: 5,
+      affinity: TextAffinity.upstream,
+    ));
+    expect(upstreamWordBoundary, const TextRange(start: 0, end: 5));
+  });
+
+  test('build and layout a paragraph with an empty addText', () {
+    final ParagraphBuilder builder = ParagraphBuilder(ParagraphStyle());
+    builder.addText('');
+    final Paragraph paragraph = builder.build();
+    expect(
+      () => paragraph.layout(const ParagraphConstraints(width: double.infinity)),
+      returnsNormally,
+    );
+  });
 }
diff --git a/lib/web_ui/test/ui/paragraph_style_test.dart b/lib/web_ui/test/ui/paragraph_style_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..26e573eefd707671ad2fb7d4912270522a54bdea
--- /dev/null
+++ b/lib/web_ui/test/ui/paragraph_style_test.dart
@@ -0,0 +1,162 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/ui.dart' as ui;
+
+import '../common/test_initialization.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+Future<void> testMain() async {
+  setUpUnitTests(
+    emulateTesterEnvironment: false,
+    setUpTestViewDimensions: false,
+  );
+
+  test('blanks are equal to each other', () {
+    final ui.ParagraphStyle a = ui.ParagraphStyle();
+    final ui.ParagraphStyle b = ui.ParagraphStyle();
+    expect(a, b);
+    expect(a.hashCode, b.hashCode);
+  });
+
+  test('each property individually equal', () {
+    for (final String property in _populatorsA.keys) {
+      final _ParagraphStylePropertyPopulator populator = _populatorsA[property]!;
+
+      final _TestParagraphStyleBuilder aBuilder = _TestParagraphStyleBuilder();
+      populator(aBuilder);
+      final ui.ParagraphStyle a = aBuilder.build();
+
+      final _TestParagraphStyleBuilder bBuilder = _TestParagraphStyleBuilder();
+      populator(bBuilder);
+      final ui.ParagraphStyle b = bBuilder.build();
+
+      expect(reason: '$property property is equal', a, b);
+      expect(reason: '$property hashCode is equal', a.hashCode, b.hashCode);
+    }
+  });
+
+  test('each property individually not equal', () {
+    for (final String property in _populatorsA.keys) {
+      final _ParagraphStylePropertyPopulator populatorA = _populatorsA[property]!;
+
+      final _TestParagraphStyleBuilder aBuilder = _TestParagraphStyleBuilder();
+      populatorA(aBuilder);
+      final ui.ParagraphStyle a = aBuilder.build();
+
+      final _ParagraphStylePropertyPopulator populatorB = _populatorsB[property]!;
+      final _TestParagraphStyleBuilder bBuilder = _TestParagraphStyleBuilder();
+      populatorB(bBuilder);
+      final ui.ParagraphStyle b = bBuilder.build();
+
+      expect(reason: '$property property is not equal', a, isNot(b));
+      expect(reason: '$property hashCode is not equal', a.hashCode, isNot(b.hashCode));
+    }
+  });
+
+  test('all properties altogether equal', () {
+    final _TestParagraphStyleBuilder aBuilder = _TestParagraphStyleBuilder();
+    final _TestParagraphStyleBuilder bBuilder = _TestParagraphStyleBuilder();
+
+    for (final String property in _populatorsA.keys) {
+      final _ParagraphStylePropertyPopulator populator = _populatorsA[property]!;
+      populator(aBuilder);
+      populator(bBuilder);
+    }
+
+    final ui.ParagraphStyle a = aBuilder.build();
+    final ui.ParagraphStyle b = bBuilder.build();
+
+    expect(a, b);
+    expect(a.hashCode, b.hashCode);
+  });
+
+  test('all properties altogether not equal', () {
+    final _TestParagraphStyleBuilder aBuilder = _TestParagraphStyleBuilder();
+    final _TestParagraphStyleBuilder bBuilder = _TestParagraphStyleBuilder();
+
+    for (final String property in _populatorsA.keys) {
+      final _ParagraphStylePropertyPopulator populatorA = _populatorsA[property]!;
+      populatorA(aBuilder);
+
+      final _ParagraphStylePropertyPopulator populatorB = _populatorsB[property]!;
+      populatorB(bBuilder);
+    }
+
+    final ui.ParagraphStyle a = aBuilder.build();
+    final ui.ParagraphStyle b = bBuilder.build();
+
+    expect(a, isNot(b));
+    expect(a.hashCode, isNot(b.hashCode));
+  });
+}
+
+typedef _ParagraphStylePropertyPopulator = void Function(_TestParagraphStyleBuilder builder);
+
+final Map<String, _ParagraphStylePropertyPopulator> _populatorsA = <String, _ParagraphStylePropertyPopulator>{
+  'textAlign': (_TestParagraphStyleBuilder builder) { builder.textAlign = ui.TextAlign.left; },
+  'textDirection': (_TestParagraphStyleBuilder builder) { builder.textDirection = ui.TextDirection.rtl; },
+  'fontWeight': (_TestParagraphStyleBuilder builder) { builder.fontWeight = ui.FontWeight.w400; },
+  'fontStyle': (_TestParagraphStyleBuilder builder) { builder.fontStyle = ui.FontStyle.normal; },
+  'maxLines': (_TestParagraphStyleBuilder builder) { builder.maxLines = 1; },
+  'fontFamily': (_TestParagraphStyleBuilder builder) { builder.fontFamily = 'Arial'; },
+  'fontSize': (_TestParagraphStyleBuilder builder) { builder.fontSize = 12; },
+  'height': (_TestParagraphStyleBuilder builder) { builder.height = 13; },
+  'textHeightBehavior': (_TestParagraphStyleBuilder builder) { builder.textHeightBehavior = const ui.TextHeightBehavior(); },
+  'strutStyle': (_TestParagraphStyleBuilder builder) { builder.strutStyle = ui.StrutStyle(fontFamily: 'Times New Roman'); },
+  'ellipsis': (_TestParagraphStyleBuilder builder) { builder.ellipsis = '...'; },
+  'locale': (_TestParagraphStyleBuilder builder) { builder.locale = const ui.Locale('en', 'US'); },
+};
+
+final Map<String, _ParagraphStylePropertyPopulator> _populatorsB = <String, _ParagraphStylePropertyPopulator>{
+  'textAlign': (_TestParagraphStyleBuilder builder) { builder.textAlign = ui.TextAlign.right; },
+  'textDirection': (_TestParagraphStyleBuilder builder) { builder.textDirection = ui.TextDirection.ltr; },
+  'fontWeight': (_TestParagraphStyleBuilder builder) { builder.fontWeight = ui.FontWeight.w600; },
+  'fontStyle': (_TestParagraphStyleBuilder builder) { builder.fontStyle = ui.FontStyle.italic; },
+  'maxLines': (_TestParagraphStyleBuilder builder) { builder.maxLines = 2; },
+  'fontFamily': (_TestParagraphStyleBuilder builder) { builder.fontFamily = 'Noto'; },
+  'fontSize': (_TestParagraphStyleBuilder builder) { builder.fontSize = 12.1; },
+  'height': (_TestParagraphStyleBuilder builder) { builder.height = 13.1; },
+  'textHeightBehavior': (_TestParagraphStyleBuilder builder) { builder.textHeightBehavior = const ui.TextHeightBehavior(applyHeightToFirstAscent: false); },
+  'strutStyle': (_TestParagraphStyleBuilder builder) { builder.strutStyle = ui.StrutStyle(fontFamily: 'sans-serif'); },
+  'ellipsis': (_TestParagraphStyleBuilder builder) { builder.ellipsis = '___'; },
+  'locale': (_TestParagraphStyleBuilder builder) { builder.locale = const ui.Locale('fr', 'CA'); },
+};
+
+class _TestParagraphStyleBuilder {
+  ui.TextAlign? textAlign;
+  ui.TextDirection? textDirection;
+  ui.FontWeight? fontWeight;
+  ui.FontStyle? fontStyle;
+  int? maxLines;
+  String? fontFamily;
+  double? fontSize;
+  double? height;
+  ui.TextHeightBehavior? textHeightBehavior;
+  ui.StrutStyle? strutStyle;
+  String? ellipsis;
+  ui.Locale? locale;
+
+  ui.ParagraphStyle build() {
+    return ui.ParagraphStyle(
+      textAlign: textAlign,
+      textDirection: textDirection,
+      fontWeight: fontWeight,
+      fontStyle: fontStyle,
+      maxLines: maxLines,
+      fontFamily: fontFamily,
+      fontSize: fontSize,
+      height: height,
+      textHeightBehavior: textHeightBehavior,
+      strutStyle: strutStyle,
+      ellipsis: ellipsis,
+      locale: locale,
+    );
+  }
+}
diff --git a/lib/web_ui/test/engine/path_metrics_test.dart b/lib/web_ui/test/ui/path_metrics_test.dart
similarity index 98%
rename from lib/web_ui/test/engine/path_metrics_test.dart
rename to lib/web_ui/test/ui/path_metrics_test.dart
index d237d696fb9dbcbd22c4e564be227c2a828e7152..ba820f7590c5963c63e768c594824d86ec1d7fa7 100644
--- a/lib/web_ui/test/engine/path_metrics_test.dart
+++ b/lib/web_ui/test/ui/path_metrics_test.dart
@@ -8,15 +8,17 @@ import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/ui.dart';
 
-import '../matchers.dart';
+import '../common/matchers.dart';
+import '../common/test_initialization.dart';
 
-const double kTolerance = 0.001;
+const double kTolerance = 0.1;
 
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
 
-void testMain() {
+Future<void> testMain() async {
+  setUpUnitTests();
   group('PathMetric length', () {
     test('empty path', () {
       final Path path = Path();
diff --git a/lib/web_ui/test/ui/path_test.dart b/lib/web_ui/test/ui/path_test.dart
index 444e59161215446fa8bd406357908a3ae86c7622..94094a03b50ba54580788d07976dc2425cc956db 100644
--- a/lib/web_ui/test/ui/path_test.dart
+++ b/lib/web_ui/test/ui/path_test.dart
@@ -8,14 +8,15 @@ import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/ui.dart';
 
+import '../common/test_initialization.dart';
 import 'utils.dart';
 
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
 
-void testMain() {
-  setUpUiTest();
+Future<void> testMain() async {
+  setUpUnitTests();
   test('path getBounds', () {
     const Rect r = Rect.fromLTRB(1.0, 3.0, 5.0, 7.0);
     final Path p = Path()..addRect(r);
diff --git a/lib/web_ui/test/engine/picture_test.dart b/lib/web_ui/test/ui/picture_test.dart
similarity index 96%
rename from lib/web_ui/test/engine/picture_test.dart
rename to lib/web_ui/test/ui/picture_test.dart
index d4c5928d38fdbe2545e8099f840bb7de2b80e825..297d8b50f403aeceb29ab85fd970e173f08a58e8 100644
--- a/lib/web_ui/test/engine/picture_test.dart
+++ b/lib/web_ui/test/ui/picture_test.dart
@@ -6,11 +6,15 @@ import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/ui.dart' as ui;
 
+import '../common/test_initialization.dart';
+
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
 
 Future<void> testMain() async {
+  setUpUnitTests();
+
   test('Picture construction invokes onCreate once', () async {
     int onCreateInvokedCount = 0;
     ui.Picture? createdPicture;
diff --git a/lib/web_ui/test/ui/platform_view_test.dart b/lib/web_ui/test/ui/platform_view_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..84ab3d1741701535b36b8300cecc5353c96a5824
--- /dev/null
+++ b/lib/web_ui/test/ui/platform_view_test.dart
@@ -0,0 +1,181 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui;
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
+import 'package:web_engine_tester/golden_tester.dart';
+
+import '../common/rendering.dart';
+import '../common/test_initialization.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+Future<void> testMain() async {
+  setUpUnitTests(
+    withImplicitView: true,
+    emulateTesterEnvironment: false,
+    setUpTestViewDimensions: false,
+  );
+
+  const ui.Rect region = ui.Rect.fromLTWH(0, 0, 300, 300);
+  const String platformViewType = 'test-platform-view';
+
+  setUp(() {
+    ui_web.platformViewRegistry.registerViewFactory(
+      platformViewType,
+      (int viewId) {
+        final DomElement element = createDomHTMLDivElement();
+        element.style.backgroundColor = 'blue';
+        return element;
+      }
+    );
+  });
+
+  tearDown(() {
+    PlatformViewManager.instance.debugClear();
+  });
+
+  test('picture + overlapping platformView', () async {
+    await _createPlatformView(1, platformViewType);
+
+    final ui.PictureRecorder recorder = ui.PictureRecorder();
+    final ui.Canvas canvas = ui.Canvas(recorder);
+    canvas.drawCircle(
+      const ui.Offset(50, 50),
+      50,
+      ui.Paint()
+        ..style = ui.PaintingStyle.fill
+        ..color = const ui.Color(0xFFFF0000)
+    );
+
+    final ui.SceneBuilder sb = ui.SceneBuilder();
+    sb.pushOffset(0, 0);
+    sb.addPicture(const ui.Offset(100, 100), recorder.endRecording());
+
+    sb.addPlatformView(
+      1,
+      offset: const ui.Offset(125, 125),
+      width: 50,
+      height: 50,
+    );
+    await renderScene(sb.build());
+
+    await matchGoldenFile('picture_platformview_overlap.png', region: region);
+  });
+
+  test('platformView sandwich', () async {
+    await _createPlatformView(1, platformViewType);
+
+    final ui.PictureRecorder recorder = ui.PictureRecorder();
+    final ui.Canvas canvas = ui.Canvas(recorder);
+    canvas.drawCircle(
+      const ui.Offset(50, 50),
+      50,
+      ui.Paint()
+        ..style = ui.PaintingStyle.fill
+        ..color = const ui.Color(0xFF00FF00)
+    );
+
+    final ui.Picture picture = recorder.endRecording();
+
+    final ui.SceneBuilder sb = ui.SceneBuilder();
+    sb.pushOffset(0, 0);
+    sb.addPicture(const ui.Offset(75, 75), picture);
+
+    sb.addPlatformView(
+      1,
+      offset: const ui.Offset(100, 100),
+      width: 100,
+      height: 100,
+    );
+
+    sb.addPicture(const ui.Offset(125, 125), picture);
+    await renderScene(sb.build());
+
+    await matchGoldenFile('picture_platformview_sandwich.png', region: region);
+  });
+
+  test('transformed platformview', () async {
+    await _createPlatformView(1, platformViewType);
+
+    final ui.PictureRecorder recorder = ui.PictureRecorder();
+    final ui.Canvas canvas = ui.Canvas(recorder);
+    canvas.drawCircle(
+      const ui.Offset(50, 50),
+      50,
+      ui.Paint()
+        ..style = ui.PaintingStyle.fill
+        ..color = const ui.Color(0xFFFF0000)
+    );
+
+    final ui.SceneBuilder sb = ui.SceneBuilder();
+    sb.pushOffset(0, 0);
+    sb.addPicture(const ui.Offset(100, 100), recorder.endRecording());
+
+    sb.pushTransform(Matrix4.rotationZ(0.1).toFloat64());
+    sb.addPlatformView(
+      1,
+      offset: const ui.Offset(125, 125),
+      width: 50,
+      height: 50,
+    );
+    await renderScene(sb.build());
+
+    await matchGoldenFile('platformview_transformed.png', region: region);
+  });
+
+  test('platformview with opacity', () async {
+    await _createPlatformView(1, platformViewType);
+
+    final ui.PictureRecorder recorder = ui.PictureRecorder();
+    final ui.Canvas canvas = ui.Canvas(recorder);
+    canvas.drawCircle(
+      const ui.Offset(50, 50),
+      50,
+      ui.Paint()
+        ..style = ui.PaintingStyle.fill
+        ..color = const ui.Color(0xFFFF0000)
+    );
+
+    final ui.SceneBuilder sb = ui.SceneBuilder();
+    sb.pushOffset(0, 0);
+    sb.addPicture(const ui.Offset(100, 100), recorder.endRecording());
+
+    sb.pushOpacity(127);
+    sb.addPlatformView(
+      1,
+      offset: const ui.Offset(125, 125),
+      width: 50,
+      height: 50,
+    );
+    await renderScene(sb.build());
+
+    await matchGoldenFile('platformview_opacity.png', region: region);
+  });
+}
+
+// Sends a platform message to create a Platform View with the given id and viewType.
+Future<void> _createPlatformView(int id, String viewType) {
+  final Completer<void> completer = Completer<void>();
+  const MethodCodec codec = StandardMethodCodec();
+  ui.PlatformDispatcher.instance.sendPlatformMessage(
+    'flutter/platform_views',
+    codec.encodeMethodCall(MethodCall(
+      'create',
+      <String, dynamic>{
+        'id': id,
+        'viewType': viewType,
+      },
+    )),
+    (dynamic _) => completer.complete(),
+  );
+  return completer.future;
+}
diff --git a/lib/web_ui/test/ui/rect_test.dart b/lib/web_ui/test/ui/rect_test.dart
index 156b6fc84363b43837595828beb106aff0914d7a..3fa4eb0d14d0131f1e08f90424ee73aa053d89cf 100644
--- a/lib/web_ui/test/ui/rect_test.dart
+++ b/lib/web_ui/test/ui/rect_test.dart
@@ -6,14 +6,14 @@ import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/ui.dart';
 
-import 'utils.dart';
+import '../common/test_initialization.dart';
 
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
 
-void testMain() {
-  setUpUiTest();
+Future<void> testMain() async {
+  setUpUnitTests();
   test('rect accessors', () {
     const Rect r = Rect.fromLTRB(1.0, 3.0, 5.0, 7.0);
     expect(r.left, equals(1.0));
diff --git a/lib/web_ui/test/ui/rrect_test.dart b/lib/web_ui/test/ui/rrect_test.dart
index bdf84f1cc17a6b698e8e738453f58d563f5fb565..958c7aa137cfa7e68b20a1619548c3204f3eea4e 100644
--- a/lib/web_ui/test/ui/rrect_test.dart
+++ b/lib/web_ui/test/ui/rrect_test.dart
@@ -6,14 +6,14 @@ import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart' hide TypeMatcher, isInstanceOf;
 import 'package:ui/ui.dart';
 
-import 'utils.dart';
+import '../common/test_initialization.dart';
 
 void main() {
   internalBootstrapBrowserTest(() => testMain);
 }
 
-void testMain() {
-  setUpUiTest();
+Future<void> testMain() async {
+  setUpUnitTests();
   test('RRect.contains()', () {
     final RRect rrect = RRect.fromRectAndCorners(
         const Rect.fromLTRB(1.0, 1.0, 2.0, 2.0),
diff --git a/lib/web_ui/test/ui/scene_builder_test.dart b/lib/web_ui/test/ui/scene_builder_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..fee4e87e6b74ad0524637973adc9927a87b41218
--- /dev/null
+++ b/lib/web_ui/test/ui/scene_builder_test.dart
@@ -0,0 +1,266 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:math' as math;
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui;
+import 'package:web_engine_tester/golden_tester.dart';
+
+import '../common/rendering.dart';
+import '../common/test_initialization.dart';
+import 'utils.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+Future<void> testMain() async {
+  setUpUnitTests(
+    withImplicitView: true,
+    emulateTesterEnvironment: false,
+    setUpTestViewDimensions: false,
+  );
+
+  group('${ui.SceneBuilder}', () {
+    const ui.Rect region = ui.Rect.fromLTWH(0, 0, 300, 300);
+    test('Test offset layer', () async {
+      final ui.SceneBuilder sceneBuilder = ui.SceneBuilder();
+      sceneBuilder.pushOffset(150, 150);
+      sceneBuilder.addPicture(ui.Offset.zero, drawPicture((ui.Canvas canvas) {
+        canvas.drawCircle(
+          ui.Offset.zero,
+          50,
+          ui.Paint()..color = const ui.Color(0xFF00FF00)
+        );
+      }));
+
+      await renderScene(sceneBuilder.build());
+      await matchGoldenFile('scene_builder_centered_circle.png', region: region);
+    });
+
+    test('Test transform layer', () async {
+      final ui.SceneBuilder sceneBuilder = ui.SceneBuilder();
+      final Matrix4 transform = Matrix4.identity();
+
+      // The html renderer expects the top-level transform to just be a scaling
+      // matrix for the device pixel ratio, so just push the identity matrix.
+      sceneBuilder.pushTransform(transform.toFloat64());
+      transform.translate(150, 150);
+      transform.rotate(kUnitZ, math.pi / 3);
+      sceneBuilder.pushTransform(transform.toFloat64());
+      sceneBuilder.addPicture(ui.Offset.zero, drawPicture((ui.Canvas canvas) {
+        canvas.drawRRect(
+          ui.RRect.fromRectAndRadius(
+            ui.Rect.fromCircle(center: ui.Offset.zero, radius: 50),
+            const ui.Radius.circular(10)
+          ),
+          ui.Paint()..color = const ui.Color(0xFF0000FF)
+        );
+      }));
+
+      await renderScene(sceneBuilder.build());
+      await matchGoldenFile('scene_builder_rotated_rounded_square.png', region: region);
+    });
+
+    test('Test clipRect layer', () async {
+      final ui.SceneBuilder sceneBuilder = ui.SceneBuilder();
+      sceneBuilder.pushClipRect(const ui.Rect.fromLTRB(0, 0, 150, 150));
+      sceneBuilder.addPicture(ui.Offset.zero, drawPicture((ui.Canvas canvas) {
+        canvas.drawCircle(
+          const ui.Offset(150, 150),
+          50,
+          ui.Paint()..color = const ui.Color(0xFFFF0000)
+        );
+      }));
+
+      await renderScene(sceneBuilder.build());
+      await matchGoldenFile('scene_builder_circle_clip_rect.png', region: region);
+    });
+
+    test('Test clipRRect layer', () async {
+      final ui.SceneBuilder sceneBuilder = ui.SceneBuilder();
+      sceneBuilder.pushClipRRect(ui.RRect.fromRectAndRadius(
+        const ui.Rect.fromLTRB(0, 0, 150, 150),
+        const ui.Radius.circular(25),
+      ), clipBehavior: ui.Clip.antiAlias);
+      sceneBuilder.addPicture(ui.Offset.zero, drawPicture((ui.Canvas canvas) {
+        canvas.drawCircle(
+          const ui.Offset(150, 150),
+          50,
+          ui.Paint()..color = const ui.Color(0xFFFF00FF)
+        );
+      }));
+
+      await renderScene(sceneBuilder.build());
+      await matchGoldenFile('scene_builder_circle_clip_rrect.png', region: region);
+    });
+
+    test('Test clipPath layer', () async {
+      final ui.SceneBuilder sceneBuilder = ui.SceneBuilder();
+      final ui.Path path = ui.Path();
+      path.addOval(ui.Rect.fromCircle(center: const ui.Offset(150, 150), radius: 60));
+      sceneBuilder.pushClipPath(path);
+      sceneBuilder.addPicture(ui.Offset.zero, drawPicture((ui.Canvas canvas) {
+        canvas.drawRect(
+          ui.Rect.fromCircle(center: const ui.Offset(150, 150), radius: 50),
+          ui.Paint()..color = const ui.Color(0xFF00FFFF)
+        );
+      }));
+
+      await renderScene(sceneBuilder.build());
+      await matchGoldenFile('scene_builder_rectangle_clip_circular_path.png', region: region);
+    });
+
+    test('Test opacity layer', () async {
+      final ui.SceneBuilder sceneBuilder = ui.SceneBuilder();
+      sceneBuilder.addPicture(ui.Offset.zero, drawPicture((ui.Canvas canvas) {
+        canvas.drawRect(
+          ui.Rect.fromCircle(center: const ui.Offset(150, 150), radius: 50),
+          ui.Paint()..color = const ui.Color(0xFF00FF00)
+        );
+      }));
+
+      sceneBuilder.pushOpacity(0x7F, offset: const ui.Offset(150, 150));
+      sceneBuilder.addPicture(ui.Offset.zero, drawPicture((ui.Canvas canvas) {
+        final ui.Paint paint = ui.Paint()..color = const ui.Color(0xFFFF0000);
+        canvas.drawCircle(
+          const ui.Offset(-25, 0),
+          50,
+          paint
+        );
+        canvas.drawCircle(
+          const ui.Offset(25, 0),
+          50,
+          paint
+        );
+      }));
+
+      await renderScene(sceneBuilder.build());
+      await matchGoldenFile('scene_builder_opacity_circles_on_square.png', region: region);
+    });
+
+    test('shader mask layer', () async {
+      final ui.SceneBuilder sceneBuilder = ui.SceneBuilder();
+
+      sceneBuilder.addPicture(ui.Offset.zero, drawPicture((ui.Canvas canvas) {
+        final ui.Paint paint = ui.Paint()..color = const ui.Color(0xFFFF0000);
+        canvas.drawCircle(
+          const ui.Offset(125, 150),
+          50,
+          paint
+        );
+        canvas.drawCircle(
+          const ui.Offset(175, 150),
+          50,
+          paint
+        );
+      }));
+
+      final ui.Shader shader = ui.Gradient.linear(
+        ui.Offset.zero,
+        const ui.Offset(50, 50), <ui.Color>[
+          const ui.Color(0xFFFFFFFF),
+          const ui.Color(0x00000000),
+        ]);
+      sceneBuilder.pushShaderMask(
+        shader,
+        const ui.Rect.fromLTRB(125, 125, 175, 175),
+        ui.BlendMode.srcATop
+      );
+
+      sceneBuilder.addPicture(ui.Offset.zero, drawPicture((ui.Canvas canvas) {
+        canvas.drawRect(
+          ui.Rect.fromCircle(center: const ui.Offset(150, 150), radius: 50),
+          ui.Paint()..color = const ui.Color(0xFF00FF00)
+        );
+      }));
+
+      await renderScene(sceneBuilder.build());
+      await matchGoldenFile('scene_builder_shader_mask.png', region: region);
+    }, skip: isFirefox && isHtml); // https://github.com/flutter/flutter/issues/86623
+
+    test('backdrop filter layer', () async {
+      final ui.SceneBuilder sceneBuilder = ui.SceneBuilder();
+
+      sceneBuilder.addPicture(ui.Offset.zero, drawPicture((ui.Canvas canvas) {
+        // Create a red and blue checkerboard pattern
+        final ui.Paint redPaint = ui.Paint()..color = const ui.Color(0xFFFF0000);
+        final ui.Paint bluePaint = ui.Paint()..color = const ui.Color(0xFF0000FF);
+        for (double y = 0; y < 300; y += 10) {
+          for (double x = 0; x < 300; x += 10) {
+            final ui.Paint paint = ((x + y) % 20 == 0) ? redPaint : bluePaint;
+            canvas.drawRect(ui.Rect.fromLTWH(x, y, 10, 10), paint);
+          }
+        }
+      }));
+
+      sceneBuilder.pushBackdropFilter(ui.ImageFilter.blur(
+        sigmaX: 3.0,
+        sigmaY: 3.0,
+      ));
+
+      sceneBuilder.addPicture(ui.Offset.zero, drawPicture((ui.Canvas canvas) {
+        canvas.drawCircle(
+          const ui.Offset(150, 150),
+          50,
+          ui.Paint()..color = const ui.Color(0xFF00FF00)
+        );
+      }));
+
+      await renderScene(sceneBuilder.build());
+      await matchGoldenFile('scene_builder_backdrop_filter.png', region: region);
+    });
+
+    test('image filter layer', () async {
+      final ui.SceneBuilder sceneBuilder = ui.SceneBuilder();
+      sceneBuilder.pushImageFilter(ui.ImageFilter.blur(
+        sigmaX: 5.0,
+        sigmaY: 5.0,
+      ));
+
+      sceneBuilder.addPicture(ui.Offset.zero, drawPicture((ui.Canvas canvas) {
+        canvas.drawCircle(
+          const ui.Offset(150, 150),
+          50,
+          ui.Paint()..color = const ui.Color(0xFF00FF00)
+        );
+      }));
+
+      await renderScene(sceneBuilder.build());
+      await matchGoldenFile('scene_builder_image_filter.png', region: region);
+    });
+
+    test('color filter layer', () async {
+      final ui.SceneBuilder sceneBuilder = ui.SceneBuilder();
+      const ui.ColorFilter sepia = ui.ColorFilter.matrix(<double>[
+        0.393, 0.769, 0.189, 0, 0,
+        0.349, 0.686, 0.168, 0, 0,
+        0.272, 0.534, 0.131, 0, 0,
+        0,     0,     0,     1, 0,
+      ]);
+      sceneBuilder.pushColorFilter(sepia);
+
+      sceneBuilder.addPicture(ui.Offset.zero, drawPicture((ui.Canvas canvas) {
+        canvas.drawCircle(
+          const ui.Offset(150, 150),
+          50,
+          ui.Paint()..color = const ui.Color(0xFF00FF00)
+        );
+      }));
+
+      await renderScene(sceneBuilder.build());
+      await matchGoldenFile('scene_builder_color_filter.png', region: region);
+    });
+  });
+}
+
+ui.Picture drawPicture(void Function(ui.Canvas) drawCommands) {
+  final ui.PictureRecorder recorder = ui.PictureRecorder();
+  final ui.Canvas canvas = ui.Canvas(recorder);
+  drawCommands(canvas);
+  return recorder.endRecording();
+}
diff --git a/lib/web_ui/test/ui/shadow_test.dart b/lib/web_ui/test/ui/shadow_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..cff30217802714c024d936abbfe0c478b0e21c1f
--- /dev/null
+++ b/lib/web_ui/test/ui/shadow_test.dart
@@ -0,0 +1,59 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/ui.dart' as ui;
+import 'package:web_engine_tester/golden_tester.dart';
+
+import '../common/test_initialization.dart';
+import 'utils.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+Future<void> testMain() async {
+  const ui.Rect region = ui.Rect.fromLTWH(0, 0, 300, 300);
+
+  setUpUnitTests(
+    withImplicitView: true,
+    emulateTesterEnvironment: false,
+    setUpTestViewDimensions: false,
+  );
+
+  test('Test drawing a shadow of an opaque object', () async {
+    final ui.Picture picture = drawPicture((ui.Canvas canvas) {
+      final ui.Path path = ui.Path();
+      path.moveTo(50, 150);
+      path.cubicTo(100, 50, 200, 250, 250, 150);
+
+      canvas.drawShadow(
+        path,
+        const ui.Color(0xFF000000),
+        5,
+        false);
+      canvas.drawPath(path, ui.Paint()..color = const ui.Color(0xFFFF00FF));
+    });
+    await drawPictureUsingCurrentRenderer(picture);
+    await matchGoldenFile('shadow_opaque_object.png', region: region);
+  });
+
+  test('Test drawing a shadow of a translucent object', () async {
+    final ui.Picture picture = drawPicture((ui.Canvas canvas) {
+      final ui.Path path = ui.Path();
+      path.moveTo(50, 150);
+      path.cubicTo(100, 250, 200, 50, 250, 150);
+
+      canvas.drawShadow(
+        path,
+        const ui.Color(0xFF000000),
+        5,
+        true);
+      canvas.drawPath(path, ui.Paint()..color = const ui.Color(0x8F00FFFF));
+    });
+    await drawPictureUsingCurrentRenderer(picture);
+    await matchGoldenFile('shadow_translucent_object.png', region: region);
+  });
+}
diff --git a/lib/web_ui/test/ui/strut_style_test.dart b/lib/web_ui/test/ui/strut_style_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..4d182e6f65ce33a154c41b5eaffe67e57ad3802b
--- /dev/null
+++ b/lib/web_ui/test/ui/strut_style_test.dart
@@ -0,0 +1,152 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/ui.dart' as ui;
+
+import '../common/test_initialization.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+Future<void> testMain() async {
+  setUpUnitTests(
+    emulateTesterEnvironment: false,
+    setUpTestViewDimensions: false,
+  );
+
+  test('blanks are equal to each other', () {
+    final ui.StrutStyle a = ui.StrutStyle();
+    final ui.StrutStyle b = ui.StrutStyle();
+    expect(a, b);
+    expect(a.hashCode, b.hashCode);
+  });
+
+  test('each property individually equal', () {
+    for (final String property in _populatorsA.keys) {
+      final _StrutStylePropertyPopulator populator = _populatorsA[property]!;
+
+      final _TestStrutStyleBuilder aBuilder = _TestStrutStyleBuilder();
+      populator(aBuilder);
+      final ui.StrutStyle a = aBuilder.build();
+
+      final _TestStrutStyleBuilder bBuilder = _TestStrutStyleBuilder();
+      populator(bBuilder);
+      final ui.StrutStyle b = bBuilder.build();
+
+      expect(reason: '$property property is equal', a, b);
+      expect(reason: '$property hashCode is equal', a.hashCode, b.hashCode);
+    }
+  });
+
+  test('each property individually not equal', () {
+    for (final String property in _populatorsA.keys) {
+      final _StrutStylePropertyPopulator populatorA = _populatorsA[property]!;
+
+      final _TestStrutStyleBuilder aBuilder = _TestStrutStyleBuilder();
+      populatorA(aBuilder);
+      final ui.StrutStyle a = aBuilder.build();
+
+      final _StrutStylePropertyPopulator populatorB = _populatorsB[property]!;
+      final _TestStrutStyleBuilder bBuilder = _TestStrutStyleBuilder();
+      populatorB(bBuilder);
+      final ui.StrutStyle b = bBuilder.build();
+
+      expect(reason: '$property property is not equal', a, isNot(b));
+      expect(reason: '$property hashCode is not equal', a.hashCode, isNot(b.hashCode));
+    }
+  });
+
+  test('all properties altogether equal', () {
+    final _TestStrutStyleBuilder aBuilder = _TestStrutStyleBuilder();
+    final _TestStrutStyleBuilder bBuilder = _TestStrutStyleBuilder();
+
+    for (final String property in _populatorsA.keys) {
+      final _StrutStylePropertyPopulator populator = _populatorsA[property]!;
+      populator(aBuilder);
+      populator(bBuilder);
+    }
+
+    final ui.StrutStyle a = aBuilder.build();
+    final ui.StrutStyle b = bBuilder.build();
+
+    expect(a, b);
+    expect(a.hashCode, b.hashCode);
+  });
+
+  test('all properties altogether not equal', () {
+    final _TestStrutStyleBuilder aBuilder = _TestStrutStyleBuilder();
+    final _TestStrutStyleBuilder bBuilder = _TestStrutStyleBuilder();
+
+    for (final String property in _populatorsA.keys) {
+      final _StrutStylePropertyPopulator populatorA = _populatorsA[property]!;
+      populatorA(aBuilder);
+
+      final _StrutStylePropertyPopulator populatorB = _populatorsB[property]!;
+      populatorB(bBuilder);
+    }
+
+    final ui.StrutStyle a = aBuilder.build();
+    final ui.StrutStyle b = bBuilder.build();
+
+    expect(a, isNot(b));
+    expect(a.hashCode, isNot(b.hashCode));
+  });
+}
+
+typedef _StrutStylePropertyPopulator = void Function(_TestStrutStyleBuilder builder);
+
+final Map<String, _StrutStylePropertyPopulator> _populatorsA = <String, _StrutStylePropertyPopulator>{
+  'fontFamily': (_TestStrutStyleBuilder builder) { builder.fontFamily = 'Arial'; },
+  // Intentionally do not use const List to make sure Object.hashAll is used to compute hashCode
+  'fontFamilyFallback': (_TestStrutStyleBuilder builder) { builder.fontFamilyFallback = <String>['Roboto']; },
+  'fontSize': (_TestStrutStyleBuilder builder) { builder.fontSize = 12; },
+  'height': (_TestStrutStyleBuilder builder) { builder.height = 13; },
+  'leading': (_TestStrutStyleBuilder builder) { builder.leading = 0.1; },
+  'fontWeight': (_TestStrutStyleBuilder builder) { builder.fontWeight = ui.FontWeight.w400; },
+  'fontStyle': (_TestStrutStyleBuilder builder) { builder.fontStyle = ui.FontStyle.normal; },
+  'forceStrutHeight': (_TestStrutStyleBuilder builder) { builder.forceStrutHeight = false; },
+  'leadingDistribution': (_TestStrutStyleBuilder builder) { builder.leadingDistribution = ui.TextLeadingDistribution.proportional; },
+};
+
+final Map<String, _StrutStylePropertyPopulator> _populatorsB = <String, _StrutStylePropertyPopulator>{
+  'fontFamily': (_TestStrutStyleBuilder builder) { builder.fontFamily = 'Noto'; },
+  // Intentionally do not use const List to make sure Object.hashAll is used to compute hashCode
+  'fontFamilyFallback': (_TestStrutStyleBuilder builder) { builder.fontFamilyFallback = <String>['Verdana']; },
+  'fontSize': (_TestStrutStyleBuilder builder) { builder.fontSize = 12.1; },
+  'height': (_TestStrutStyleBuilder builder) { builder.height = 13.1; },
+  'leading': (_TestStrutStyleBuilder builder) { builder.leading = 0.2; },
+  'fontWeight': (_TestStrutStyleBuilder builder) { builder.fontWeight = ui.FontWeight.w600; },
+  'fontStyle': (_TestStrutStyleBuilder builder) { builder.fontStyle = ui.FontStyle.italic; },
+  'forceStrutHeight': (_TestStrutStyleBuilder builder) { builder.forceStrutHeight = true; },
+  'leadingDistribution': (_TestStrutStyleBuilder builder) { builder.leadingDistribution = ui.TextLeadingDistribution.even; },
+};
+
+class _TestStrutStyleBuilder {
+  String? fontFamily;
+  List<String>? fontFamilyFallback;
+  double? fontSize;
+  double? height;
+  double? leading;
+  ui.FontWeight? fontWeight;
+  ui.FontStyle? fontStyle;
+  bool? forceStrutHeight;
+  ui.TextLeadingDistribution? leadingDistribution;
+
+  ui.StrutStyle build() {
+    return ui.StrutStyle(
+      fontFamily: fontFamily,
+      fontFamilyFallback: fontFamilyFallback,
+      fontSize: fontSize,
+      height: height,
+      leading: leading,
+      fontWeight: fontWeight,
+      fontStyle: fontStyle,
+      forceStrutHeight: forceStrutHeight,
+      leadingDistribution: leadingDistribution,
+    );
+  }
+}
diff --git a/lib/web_ui/test/ui/text_golden_test.dart b/lib/web_ui/test/ui/text_golden_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..e7a9307b6b52dfd15d2653c1571c25510795d5e2
--- /dev/null
+++ b/lib/web_ui/test/ui/text_golden_test.dart
@@ -0,0 +1,763 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:math' as math;
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui.dart' as ui;
+import 'package:web_engine_tester/golden_tester.dart';
+
+import '../common/test_initialization.dart';
+import 'utils.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+Future<void> testMain() async {
+  setUpUnitTests(
+    withImplicitView: true,
+    emulateTesterEnvironment: false,
+    setUpTestViewDimensions: false,
+  );
+
+  test('text styles - default', () async {
+    await testTextStyle('default');
+  });
+
+  test('text styles - center aligned', () async {
+    await testTextStyle('center aligned',
+        paragraphTextAlign: ui.TextAlign.center);
+  });
+
+  test('text styles - right aligned', () async {
+    await testTextStyle('right aligned',
+        paragraphTextAlign: ui.TextAlign.right);
+  });
+
+  test('text styles - rtl', () async {
+    await testTextStyle('rtl', paragraphTextDirection: ui.TextDirection.rtl);
+  });
+
+  test('text styles - multiline', () async {
+    await testTextStyle('multiline', layoutWidth: 50);
+  });
+
+  test('text styles - max lines', () async {
+    await testTextStyle('max lines', paragraphMaxLines: 1, layoutWidth: 50);
+  });
+
+  test('text styles - ellipsis', () async {
+    await testTextStyle('ellipsis',
+        paragraphMaxLines: 1, paragraphEllipsis: '...', layoutWidth: 60);
+  });
+
+  test('text styles - paragraph font family', () async {
+    await testTextStyle('paragraph font family', paragraphFontFamily: 'Ahem');
+  });
+
+  test('text styles - paragraph font size', () async {
+    await testTextStyle('paragraph font size', paragraphFontSize: 22);
+  });
+
+  test('text styles - paragraph height', () async {
+    await testTextStyle('paragraph height',
+        layoutWidth: 50, paragraphHeight: 1.5);
+  });
+
+  test('text styles - text style height overriding paragraph height', () async {
+    await testTextStyle('text style height and paragraph style height',
+      layoutWidth: 50, paragraphHeight: 1.5, height: 2.0);
+  });
+
+  test('text styles - paragraph text height behavior', () async {
+    await testTextStyle('paragraph text height behavior',
+        layoutWidth: 50,
+        paragraphHeight: 1.5,
+        paragraphTextHeightBehavior: const ui.TextHeightBehavior(
+          applyHeightToFirstAscent: false,
+          applyHeightToLastDescent: false,
+        ));
+  });
+
+  test('text styles - paragraph weight', () async {
+    await testTextStyle('paragraph weight',
+        paragraphFontWeight: ui.FontWeight.w900);
+  });
+
+  test('text style - paragraph font style', () async {
+    await testTextStyle(
+      'paragraph font style',
+      paragraphFontStyle: ui.FontStyle.italic,
+    );
+  });
+
+  // TODO(yjbanov): locales specified in paragraph styles don't work:
+  //                https://github.com/flutter/flutter/issues/74687
+  // TODO(yjbanov): spaces are not rendered correctly:
+  //                https://github.com/flutter/flutter/issues/74742
+  test('text styles - paragraph locale zh_CN', () async {
+    await testTextStyle('paragraph locale zh_CN',
+        outerText: '次 化 刃 直 入 令',
+        innerText: '',
+        paragraphLocale: const ui.Locale('zh', 'CN'));
+  });
+
+  test('text styles - paragraph locale zh_TW', () async {
+    await testTextStyle('paragraph locale zh_TW',
+        outerText: '次 化 刃 直 入 令',
+        innerText: '',
+        paragraphLocale: const ui.Locale('zh', 'TW'));
+  });
+
+  test('text styles - paragraph locale ja', () async {
+    await testTextStyle('paragraph locale ja',
+        outerText: '次 化 刃 直 入 令',
+        innerText: '',
+        paragraphLocale: const ui.Locale('ja'));
+  });
+
+  test('text styles - paragraph locale ko', () async {
+    await testTextStyle('paragraph locale ko',
+        outerText: '次 化 刃 直 入 令',
+        innerText: '',
+        paragraphLocale: const ui.Locale('ko'));
+  });
+
+  test('text styles - color', () async {
+    await testTextStyle('color', color: const ui.Color(0xFF009900));
+  });
+
+  test('text styles - decoration', () async {
+    await testTextStyle('decoration',
+        decoration: ui.TextDecoration.underline);
+  });
+
+  test('text styles - decoration style', () async {
+    await testTextStyle('decoration style',
+        decoration: ui.TextDecoration.underline,
+        decorationStyle: ui.TextDecorationStyle.dashed);
+  });
+
+  test('text styles - decoration thickness', () async {
+    await testTextStyle('decoration thickness',
+        decoration: ui.TextDecoration.underline, decorationThickness: 5.0);
+  });
+
+  test('text styles - font weight', () async {
+    await testTextStyle('font weight', fontWeight: ui.FontWeight.w900);
+  });
+
+  test('text styles - font style', () async {
+    await testTextStyle('font style', fontStyle: ui.FontStyle.italic);
+  });
+
+  // TODO(yjbanov): not sure how to test this.
+  test('text styles - baseline', () async {
+    await testTextStyle('baseline',
+        textBaseline: ui.TextBaseline.ideographic);
+  });
+
+  test('text styles - font family', () async {
+    await testTextStyle('font family', fontFamily: 'Ahem');
+  });
+
+  test('text styles - non-existent font family', () async {
+    await testTextStyle('non-existent font family',
+        fontFamily: 'DoesNotExist');
+  });
+
+  test('text styles - family fallback', () async {
+    await testTextStyle('family fallback',
+        fontFamily: 'DoesNotExist', fontFamilyFallback: <String>['Ahem']);
+  });
+
+  test('text styles - font size', () async {
+    await testTextStyle('font size', fontSize: 24);
+  });
+
+  // A regression test for the special case when CanvasKit would default to
+  // a positive font size when Flutter specifies zero.
+  //
+  // See: https://github.com/flutter/flutter/issues/98248
+  test('text styles - zero font size', () async {
+    // This only sets the inner text style, but not the paragraph style, so
+    // "Hello" should be visible, but "World!" should disappear.
+    await testTextStyle('zero font size', fontSize: 0);
+
+    // This sets the paragraph font size to zero, but the inner text gets
+    // an explicit non-zero size that should override paragraph properties,
+    // so this time "Hello" should disappear, but "World!" should still be
+    // visible.
+    await testTextStyle('zero paragraph font size', paragraphFontSize: 0, fontSize: 14);
+  });
+
+  test('text styles - letter spacing', () async {
+    await testTextStyle('letter spacing', letterSpacing: 5);
+  });
+
+  test('text styles - word spacing', () async {
+    await testTextStyle('word spacing',
+        innerText: 'Beautiful World!', wordSpacing: 25);
+  });
+
+  test('text styles - height', () async {
+    await testTextStyle('height', height: 2);
+  });
+
+  test('text styles - leading distribution', () async {
+    await testTextStyle('half leading',
+        height: 20,
+        fontSize: 10,
+        leadingDistribution: ui.TextLeadingDistribution.even);
+    await testTextStyle(
+      'half leading inherited from paragraph',
+      height: 20,
+      fontSize: 10,
+      paragraphTextHeightBehavior: const ui.TextHeightBehavior(
+        leadingDistribution: ui.TextLeadingDistribution.even,
+      ),
+    );
+    await testTextStyle(
+      'text style half leading overrides paragraph style half leading',
+      height: 20,
+      fontSize: 10,
+      leadingDistribution: ui.TextLeadingDistribution.proportional,
+      paragraphTextHeightBehavior: const ui.TextHeightBehavior(
+        leadingDistribution: ui.TextLeadingDistribution.even,
+      ),
+    );
+  });
+
+  // TODO(yjbanov): locales specified in text styles don't work:
+  //                https://github.com/flutter/flutter/issues/74687
+  // TODO(yjbanov): spaces are not rendered correctly:
+  //                https://github.com/flutter/flutter/issues/74742
+  test('text styles - locale zh_CN', () async {
+    await testTextStyle('locale zh_CN',
+        innerText: '次 化 刃 直 入 令',
+        outerText: '',
+        locale: const ui.Locale('zh', 'CN'));
+  });
+
+  test('text styles - locale zh_TW', () async {
+    await testTextStyle('locale zh_TW',
+        innerText: '次 化 刃 直 入 令',
+        outerText: '',
+        locale: const ui.Locale('zh', 'TW'));
+  });
+
+  test('text styles - locale ja', () async {
+    await testTextStyle('locale ja',
+        innerText: '次 化 刃 直 入 令',
+        outerText: '',
+        locale: const ui.Locale('ja'));
+  });
+
+  test('text styles - locale ko', () async {
+    await testTextStyle('locale ko',
+        innerText: '次 化 刃 直 入 令',
+        outerText: '',
+        locale: const ui.Locale('ko'));
+  });
+
+  test('text styles - background', () async {
+    await testTextStyle('background',
+        background: ui.Paint()..color = const ui.Color(0xFF00FF00));
+  });
+
+  test('text styles - foreground', () async {
+    await testTextStyle('foreground',
+        foreground: ui.Paint()..color = const ui.Color(0xFF0000FF));
+  });
+
+  test('text styles - foreground and background', () async {
+    await testTextStyle(
+      'foreground and background',
+      foreground: ui.Paint()..color = const ui.Color(0xFFFF5555),
+      background: ui.Paint()..color = const ui.Color(0xFF007700),
+    );
+  });
+
+  test('text styles - background and color', () async {
+    await testTextStyle(
+      'background and color',
+      color: const ui.Color(0xFFFFFF00),
+      background: ui.Paint()..color = const ui.Color(0xFF007700),
+    );
+  });
+
+  test('text styles - shadows', () async {
+    await testTextStyle('shadows', shadows: <ui.Shadow>[
+      const ui.Shadow(
+        color: ui.Color(0xFF999900),
+        offset: ui.Offset(10, 10),
+        blurRadius: 5,
+      ),
+      const ui.Shadow(
+        color: ui.Color(0xFF009999),
+        offset: ui.Offset(-10, -10),
+        blurRadius: 10,
+      ),
+    ]);
+  });
+
+  test('text styles - old style figures', () async {
+    await testTextStyle(
+      'old style figures',
+      paragraphFontFamily: 'Roboto',
+      paragraphFontSize: 24,
+      outerText: '0 1 2 3 4 5 ',
+      innerText: '0 1 2 3 4 5',
+      fontFeatures: <ui.FontFeature>[const ui.FontFeature.oldstyleFigures()],
+    );
+  });
+
+  test('text styles - stylistic set 1', () async {
+    await testTextStyle(
+      'stylistic set 1',
+      paragraphFontFamily: 'Roboto',
+      paragraphFontSize: 24,
+      outerText: 'g',
+      innerText: 'g',
+      fontFeatures: <ui.FontFeature>[ui.FontFeature.stylisticSet(1)],
+    );
+  });
+
+  test('text styles - stylistic set 2', () async {
+    await testTextStyle(
+      'stylistic set 2',
+      paragraphFontFamily: 'Roboto',
+      paragraphFontSize: 24,
+      outerText: 'α',
+      innerText: 'α',
+      fontFeatures: <ui.FontFeature>[ui.FontFeature.stylisticSet(2)],
+    );
+  });
+
+  test('text styles - override font family', () async {
+    await testTextStyle(
+      'override font family',
+      paragraphFontFamily: 'Ahem',
+      fontFamily: 'Roboto',
+    );
+  });
+
+  test('text styles - override font size', () async {
+    await testTextStyle(
+      'override font size',
+      paragraphFontSize: 36,
+      fontSize: 18,
+    );
+  });
+
+  test('text style - override font weight', () async {
+    await testTextStyle(
+      'override font weight',
+      paragraphFontWeight: ui.FontWeight.w900,
+      fontWeight: ui.FontWeight.normal,
+    );
+  });
+
+  test('text style - override font style', () async {
+    await testTextStyle(
+      'override font style',
+      paragraphFontStyle: ui.FontStyle.italic,
+      fontStyle: ui.FontStyle.normal,
+    );
+  });
+
+  test('text style - characters from multiple fallback fonts', () async {
+    await testTextStyle(
+      'multi-font characters',
+      // This character is claimed by multiple fonts. This test makes sure
+      // we can find a font supporting it.
+      outerText: '欢',
+      innerText: '',
+    );
+  });
+
+  test('text style - symbols', () async {
+    // One of the CJK fonts loaded in one of the tests above also contains
+    // some of these symbols. To make sure the test produces predictable
+    // results we reset the fallback data forcing the engine to reload
+    // fallbacks, which for this test will only load Noto Symbols.
+    await testTextStyle(
+      'symbols',
+      outerText: '← ↑ → ↓ ',
+      innerText: '',
+    );
+  });
+
+  test('strut style - override height', () async {
+    await testTextStyle(
+      'strut style',
+      paragraphStrutStyle: ui.StrutStyle(
+        forceStrutHeight: true,
+        height: 2,
+      ),
+    );
+  });
+
+  test('sample Chinese text', () async {
+    await testSampleText(
+      'chinese',
+      '也称乱数假文或者哑元文本， '
+          '是印刷及排版领域所常用的虚拟文字。'
+          '由于曾经一台匿名的打印机刻意打乱了'
+          '一盒印刷字体从而造出一本字体样品书',
+    );
+  });
+
+  test('sample Armenian text', () async {
+    await testSampleText(
+      'armenian',
+      'տպագրության և տպագրական արդյունաբերության համար նախատեսված մոդելային տեքստ է',
+    );
+  });
+
+  test('sample Albanian text', () async {
+    await testSampleText(
+      'albanian',
+      'është një tekst shabllon i industrisë së printimit dhe shtypshkronjave Lorem Ipsum ka qenë teksti shabllon',
+    );
+  });
+
+  test('sample Arabic text', () async {
+    await testSampleText(
+      'arabic',
+      'هناك حقيقة مثبتة منذ زمن طويل وهي أن المحتوى المقروء لصفحة ما سيلهي',
+      textDirection: ui.TextDirection.rtl,
+    );
+  });
+
+  test('sample Bulgarian text', () async {
+    await testSampleText(
+      'bulgarian',
+      'е елементарен примерен текст използван в печатарската и типографската индустрия',
+    );
+  });
+
+  test('sample Catalan text', () async {
+    await testSampleText(
+      'catalan',
+      'és un text de farciment usat per la indústria de la tipografia i la impremta',
+    );
+  });
+
+  test('sample English text', () async {
+    await testSampleText(
+      'english',
+      'Lorem Ipsum is simply dummy text of the printing and typesetting industry',
+    );
+  });
+
+  test('sample Greek text', () async {
+    await testSampleText(
+      'greek',
+      'είναι απλά ένα κείμενο χωρίς νόημα για τους επαγγελματίες της τυπογραφίας και στοιχειοθεσίας',
+    );
+  });
+
+  test('sample Hebrew text', () async {
+    await testSampleText(
+      'hebrew',
+      'זוהי עובדה מבוססת שדעתו של הקורא תהיה מוסחת על ידי טקטס קריא כאשר הוא יביט בפריסתו',
+      textDirection: ui.TextDirection.rtl,
+    );
+  });
+
+  test('sample Hindi text', () async {
+    await testSampleText(
+      'hindi',
+      'छपाई और अक्षर योजन उद्योग का एक साधारण डमी पाठ है सन १५०० के बाद से अभी तक इस उद्योग का मानक डमी पाठ मन गया जब एक अज्ञात मुद्रक ने नमूना लेकर एक नमूना किताब बनाई',
+    );
+  });
+
+  test('sample Thai text', () async {
+    await testSampleText(
+      'thai',
+      'คือ เนื้อหาจำลองแบบเรียบๆ ที่ใช้กันในธุรกิจงานพิมพ์หรืองานเรียงพิมพ์ มันได้กลายมาเป็นเนื้อหาจำลองมาตรฐานของธุรกิจดังกล่าวมาตั้งแต่ศตวรรษที่',
+    );
+  });
+
+  test('sample Georgian text', () async {
+    await testSampleText(
+      'georgian',
+      'საბეჭდი და ტიპოგრაფიული ინდუსტრიის უშინაარსო ტექსტია. იგი სტანდარტად',
+    );
+  });
+
+  test('sample Bengali text', () async {
+    await testSampleText(
+      'bengali',
+      'ঈদের জামাত মসজিদে, মানতে হবে স্বাস্থ্যবিধি: ধর্ম মন্ত্রণালয়',
+    );
+  });
+
+  test('hindi svayan test', () async {
+    await testSampleText('hindi_svayan', 'स्वयं');
+  });
+
+  // We've seen text break when we load many fonts simultaneously. This test
+  // combines text in multiple languages into one long paragraph to make sure
+  // we can handle it.
+  test('sample multilingual text', () async {
+    await testSampleText(
+      'multilingual',
+      '也称乱数假文或者哑元文本， 是印刷及排版领域所常用的虚拟文字。 '
+          'տպագրության և տպագրական արդյունաբերության համար '
+          'është një tekst shabllon i industrisë së printimit '
+          ' زمن طويل وهي أن المحتوى المقروء لصفحة ما سيلهي '
+          'е елементарен примерен текст използван в печатарската '
+          'és un text de farciment usat per la indústria de la '
+          'Lorem Ipsum is simply dummy text of the printing '
+          'είναι απλά ένα κείμενο χωρίς νόημα για τους επαγγελματίες '
+          ' זוהי עובדה מבוססת שדעתו של הקורא תהיה מוסחת על ידי טקטס קריא '
+          'छपाई और अक्षर योजन उद्योग का एक साधारण डमी पाठ है सन '
+          'คือ เนื้อหาจำลองแบบเรียบๆ ที่ใช้กันในธุรกิจงานพิมพ์หรืองานเรียงพิมพ์ '
+          'საბეჭდი და ტიპოგრაფიული ინდუსტრიის უშინაარსო ტექსტია ',
+    );
+  });
+
+  test('emoji text with skin tone', () async {
+    await testSampleText('emoji_with_skin_tone', '👋🏿 👋🏾 👋🏽 👋🏼 👋🏻');
+  }, timeout: const Timeout.factor(2));
+
+  test('font variations are correctly rendered', () async {
+    const double testWidth = 300;
+    final ui.PictureRecorder recorder = ui.PictureRecorder();
+    final ui.Canvas canvas = ui.Canvas(recorder);
+    final ui.ParagraphBuilder builder =
+      ui.ParagraphBuilder(ui.ParagraphStyle(
+        fontSize: 40.0,
+        textDirection: ui.TextDirection.ltr,
+      ));
+
+    builder.pushStyle(ui.TextStyle(
+        fontFamily: 'RobotoVariable',
+    ));
+    builder.addText('Normal\n');
+    builder.pop();
+
+    ui.FontVariation weight(double w) => ui.FontVariation('wght', w);
+    builder.pushStyle(ui.TextStyle(
+        fontFamily: 'RobotoVariable',
+        fontVariations: <ui.FontVariation>[weight(900)],
+    ));
+    builder.addText('Heavy\n');
+    builder.pop();
+
+    builder.pushStyle(ui.TextStyle(
+        fontFamily: 'RobotoVariable',
+        fontVariations: <ui.FontVariation>[weight(100)],
+    ));
+    builder.addText('Light\n');
+    builder.pop();
+
+    final ui.Paragraph paragraph = builder.build();
+    paragraph.layout(const ui.ParagraphConstraints(width: testWidth - 20));
+    canvas.drawParagraph(paragraph, const ui.Offset(10, 10));
+    final ui.Picture picture = recorder.endRecording();
+    await drawPictureUsingCurrentRenderer(picture);
+    await matchGoldenFile(
+      'ui_text_font_variation.png',
+      region: ui.Rect.fromLTRB(0, 0, testWidth, paragraph.height + 20),
+    );
+  });
+}
+
+/// A convenience function for testing paragraph and text styles.
+///
+/// Renders a paragraph with two pieces of text, [outerText] and [innerText].
+/// [outerText] is added to the root of the paragraph where only paragraph
+/// style applies. [innerText] is added under a text style with properties
+/// set from the arguments to this method. Parameters with prefix "paragraph"
+/// are applied to the paragraph style. Others are applied to the text style.
+///
+/// [name] is the name of the test used as the description on the golden as
+/// well as in the golden file name. Avoid special characters. Spaces are OK;
+/// they are replaced by "_" in the file name.
+///
+/// Use [layoutWidth] to customize the width of the paragraph constraints.
+Future<void> testTextStyle(
+  // Test properties
+  String name, {
+  double? layoutWidth,
+  // Top-level text where only paragraph style applies
+  String outerText = 'Hello ',
+  // Second-level text where paragraph and text styles both apply.
+  String innerText = 'World!',
+
+  // ParagraphStyle properties
+  ui.TextAlign? paragraphTextAlign,
+  ui.TextDirection? paragraphTextDirection,
+  int? paragraphMaxLines,
+  String? paragraphFontFamily,
+  double? paragraphFontSize,
+  double? paragraphHeight,
+  ui.TextHeightBehavior? paragraphTextHeightBehavior,
+  ui.FontWeight? paragraphFontWeight,
+  ui.FontStyle? paragraphFontStyle,
+  ui.StrutStyle? paragraphStrutStyle,
+  String? paragraphEllipsis,
+  ui.Locale? paragraphLocale,
+
+  // TextStyle properties
+  ui.Color? color,
+  ui.TextDecoration? decoration,
+  ui.Color? decorationColor,
+  ui.TextDecorationStyle? decorationStyle,
+  double? decorationThickness,
+  ui.FontWeight? fontWeight,
+  ui.FontStyle? fontStyle,
+  ui.TextBaseline? textBaseline,
+  String? fontFamily,
+  List<String>? fontFamilyFallback,
+  double? fontSize,
+  double? letterSpacing,
+  double? wordSpacing,
+  double? height,
+  ui.TextLeadingDistribution? leadingDistribution,
+  ui.Locale? locale,
+  ui.Paint? background,
+  ui.Paint? foreground,
+  List<ui.Shadow>? shadows,
+  List<ui.FontFeature>? fontFeatures,
+}) async {
+  late ui.Rect region;
+  ui.Picture renderPicture() {
+    const double testWidth = 512;
+    final ui.PictureRecorder recorder = ui.PictureRecorder();
+    final ui.Canvas canvas = ui.Canvas(recorder);
+    canvas.translate(30, 10);
+    final ui.ParagraphBuilder descriptionBuilder =
+        ui.ParagraphBuilder(ui.ParagraphStyle());
+    descriptionBuilder.addText(name);
+    final ui.Paragraph descriptionParagraph = descriptionBuilder.build();
+    descriptionParagraph
+        .layout(const ui.ParagraphConstraints(width: testWidth / 2 - 70));
+    const ui.Offset descriptionOffset = ui.Offset(testWidth / 2 + 30, 0);
+    canvas.drawParagraph(descriptionParagraph, descriptionOffset);
+
+    final ui.ParagraphBuilder pb = ui.ParagraphBuilder(ui.ParagraphStyle(
+      textAlign: paragraphTextAlign,
+      textDirection: paragraphTextDirection,
+      maxLines: paragraphMaxLines,
+      fontFamily: paragraphFontFamily,
+      fontSize: paragraphFontSize,
+      height: paragraphHeight,
+      textHeightBehavior: paragraphTextHeightBehavior,
+      fontWeight: paragraphFontWeight,
+      fontStyle: paragraphFontStyle,
+      strutStyle: paragraphStrutStyle,
+      ellipsis: paragraphEllipsis,
+      locale: paragraphLocale,
+    ));
+
+    pb.addText(outerText);
+
+    pb.pushStyle(ui.TextStyle(
+      color: color,
+      decoration: decoration,
+      decorationColor: decorationColor,
+      decorationStyle: decorationStyle,
+      decorationThickness: decorationThickness,
+      fontWeight: fontWeight,
+      fontStyle: fontStyle,
+      textBaseline: textBaseline,
+      fontFamily: fontFamily,
+      fontFamilyFallback: fontFamilyFallback,
+      fontSize: fontSize,
+      letterSpacing: letterSpacing,
+      wordSpacing: wordSpacing,
+      height: height,
+      leadingDistribution: leadingDistribution,
+      locale: locale,
+      background: background,
+      foreground: foreground,
+      shadows: shadows,
+      fontFeatures: fontFeatures,
+    ));
+    pb.addText(innerText);
+    pb.pop();
+    final ui.Paragraph p = pb.build();
+    p.layout(ui.ParagraphConstraints(width: layoutWidth ?? testWidth / 2));
+    canvas.drawParagraph(p, ui.Offset.zero);
+
+    canvas.drawPath(
+      ui.Path()
+        ..moveTo(-10, 0)
+        ..lineTo(-20, 0)
+        ..lineTo(-20, p.height)
+        ..lineTo(-10, p.height),
+      ui.Paint()
+        ..style = ui.PaintingStyle.stroke
+        ..strokeWidth = 1.0,
+    );
+    canvas.drawPath(
+      ui.Path()
+        ..moveTo(testWidth / 2 + 10, 0)
+        ..lineTo(testWidth / 2 + 20, 0)
+        ..lineTo(testWidth / 2 + 20, p.height)
+        ..lineTo(testWidth / 2 + 10, p.height),
+      ui.Paint()
+        ..style = ui.PaintingStyle.stroke
+        ..strokeWidth = 1.0,
+    );
+    const double padding = 20;
+    region = ui.Rect.fromLTRB(
+      0,
+      0,
+      testWidth,
+      math.max(
+        descriptionOffset.dy + descriptionParagraph.height + padding,
+        p.height + padding,
+      ),
+    );
+    return recorder.endRecording();
+  }
+
+  // Render once to trigger font downloads.
+  renderPicture();
+  await renderer.fontCollection.fontFallbackManager?.debugWhenIdle();
+  final ui.Picture picture = renderPicture();
+  await drawPictureUsingCurrentRenderer(picture);
+
+  await matchGoldenFile(
+    'ui_text_styles_${name.replaceAll(' ', '_')}.png',
+    region: region,
+  );
+}
+
+Future<void> testSampleText(String language, String text,
+    {ui.TextDirection textDirection = ui.TextDirection.ltr}) async {
+  const double testWidth = 300;
+  double paragraphHeight = 0;
+  ui.Picture renderPicture() {
+    final ui.PictureRecorder recorder = ui.PictureRecorder();
+    final ui.Canvas canvas = ui.Canvas(recorder);
+    final ui.ParagraphBuilder paragraphBuilder =
+        ui.ParagraphBuilder(ui.ParagraphStyle(
+      textDirection: textDirection,
+    ));
+    paragraphBuilder.addText(text);
+    final ui.Paragraph paragraph = paragraphBuilder.build();
+    paragraph.layout(const ui.ParagraphConstraints(width: testWidth - 20));
+    canvas.drawParagraph(paragraph, const ui.Offset(10, 10));
+    paragraphHeight = paragraph.height;
+    return recorder.endRecording();
+  }
+  // Render once to trigger font downloads.
+  renderPicture();
+  await renderer.fontCollection.fontFallbackManager?.debugWhenIdle();
+  final ui.Picture picture = renderPicture();
+  await drawPictureUsingCurrentRenderer(picture);
+  await matchGoldenFile(
+    'ui_sample_text_$language.png',
+    region: ui.Rect.fromLTRB(0, 0, testWidth, paragraphHeight + 20),
+  );
+}
diff --git a/lib/web_ui/test/ui/text_style_test.dart b/lib/web_ui/test/ui/text_style_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..67eda1dedf0078470a6ac2bcdf37f02b6e1e5005
--- /dev/null
+++ b/lib/web_ui/test/ui/text_style_test.dart
@@ -0,0 +1,299 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/ui.dart' as ui;
+
+import '../common/test_initialization.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+Future<void> testMain() async {
+  setUpUnitTests(
+    emulateTesterEnvironment: false,
+    setUpTestViewDimensions: false,
+  );
+
+  test('blanks are equal to each other', () {
+    final ui.TextStyle a = ui.TextStyle();
+    final ui.TextStyle b = ui.TextStyle();
+    expect(a, b);
+    expect(a.hashCode, b.hashCode);
+  });
+
+  test('each property individually equal', () {
+    for (final String property in _populatorsA.keys) {
+      final _TextStylePropertyPopulator populator = _populatorsA[property]!;
+
+      final _TestTextStyleBuilder aBuilder = _TestTextStyleBuilder();
+      populator(aBuilder);
+      final ui.TextStyle a = aBuilder.build();
+
+      final _TestTextStyleBuilder bBuilder = _TestTextStyleBuilder();
+      populator(bBuilder);
+      final ui.TextStyle b = bBuilder.build();
+
+      expect(reason: '$property property is equal', a, b);
+      expect(reason: '$property hashCode is equal', a.hashCode, b.hashCode);
+    }
+  });
+
+  test('each property individually not equal', () {
+    for (final String property in _populatorsA.keys) {
+      final _TextStylePropertyPopulator populatorA = _populatorsA[property]!;
+
+      final _TestTextStyleBuilder aBuilder = _TestTextStyleBuilder();
+      populatorA(aBuilder);
+      final ui.TextStyle a = aBuilder.build();
+
+      final _TextStylePropertyPopulator populatorB = _populatorsB[property]!;
+      final _TestTextStyleBuilder bBuilder = _TestTextStyleBuilder();
+      populatorB(bBuilder);
+      final ui.TextStyle b = bBuilder.build();
+
+      expect(reason: '$property property is not equal', a, isNot(b));
+      expect(reason: '$property hashCode is not equal', a.hashCode, isNot(b.hashCode));
+    }
+  });
+
+  // `color` and `foreground` cannot be used at the same time, so each test skips
+  // one or the other to be able to test all variations.
+  for (final String skipProperty in const <String>['color', 'foreground']) {
+    test('all properties (except $skipProperty) altogether equal', () {
+      final _TestTextStyleBuilder aBuilder = _TestTextStyleBuilder();
+      final _TestTextStyleBuilder bBuilder = _TestTextStyleBuilder();
+
+      for (final String property in _populatorsA.keys) {
+        if (property == skipProperty) {
+          continue;
+        }
+        final _TextStylePropertyPopulator populator = _populatorsA[property]!;
+        populator(aBuilder);
+        populator(bBuilder);
+      }
+
+      final ui.TextStyle a = aBuilder.build();
+      final ui.TextStyle b = bBuilder.build();
+
+      expect(a, b);
+      expect(a.hashCode, b.hashCode);
+    });
+
+    test('all properties (except $skipProperty) altogether not equal', () {
+      final _TestTextStyleBuilder aBuilder = _TestTextStyleBuilder();
+      final _TestTextStyleBuilder bBuilder = _TestTextStyleBuilder();
+
+      for (final String property in _populatorsA.keys) {
+        if (property == skipProperty) {
+          continue;
+        }
+        final _TextStylePropertyPopulator populatorA = _populatorsA[property]!;
+        populatorA(aBuilder);
+
+        final _TextStylePropertyPopulator populatorB = _populatorsB[property]!;
+        populatorB(bBuilder);
+      }
+
+      final ui.TextStyle a = aBuilder.build();
+      final ui.TextStyle b = bBuilder.build();
+
+      expect(a, isNot(b));
+      expect(a.hashCode, isNot(b.hashCode));
+    });
+  }
+
+  test('toString() with color', () {
+    final _TestTextStyleBuilder builder = _TestTextStyleBuilder();
+
+    for (final String property in _populatorsA.keys) {
+      if (property == 'foreground') {
+        continue;
+      }
+      final _TextStylePropertyPopulator populator = _populatorsA[property]!;
+      populator(builder);
+    }
+
+    final ui.TextStyle style = builder.build();
+
+    expect(
+      style.toString(),
+      'TextStyle('
+      'color: Color(0xff000000), '
+      'decoration: TextDecoration.none, '
+      'decorationColor: Color(0xffaa0000), '
+      'decorationStyle: TextDecorationStyle.solid, '
+      'decorationThickness: ${1.0}, '
+      'fontWeight: FontWeight.w400, '
+      'fontStyle: FontStyle.normal, '
+      'textBaseline: TextBaseline.alphabetic, '
+      'fontFamily: Arial, '
+      'fontFamilyFallback: [Roboto], '
+      'fontSize: 12.0, '
+      'letterSpacing: 1.2x, '
+      'wordSpacing: 2.3x, '
+      'height: 13.0x, '
+      'leadingDistribution: TextLeadingDistribution.proportional, '
+      'locale: en_US, '
+      'background: Paint(), '
+      'foreground: unspecified, '
+      'shadows: [TextShadow(Color(0xff000000), Offset(0.0, 0.0), ${0.0})], '
+      "fontFeatures: [FontFeature('case', 1)], "
+      "fontVariations: [FontVariation('ital', 0.1)]"
+      ')',
+    );
+  });
+
+  test('toString() with foreground', () {
+    final _TestTextStyleBuilder builder = _TestTextStyleBuilder();
+
+    for (final String property in _populatorsA.keys) {
+      if (property == 'color') {
+        continue;
+      }
+      final _TextStylePropertyPopulator populator = _populatorsA[property]!;
+      populator(builder);
+    }
+
+    final ui.TextStyle style = builder.build();
+
+    expect(
+      style.toString(),
+      'TextStyle('
+      'color: unspecified, '
+      'decoration: TextDecoration.none, '
+      'decorationColor: Color(0xffaa0000), '
+      'decorationStyle: TextDecorationStyle.solid, '
+      'decorationThickness: ${1.0}, '
+      'fontWeight: FontWeight.w400, '
+      'fontStyle: FontStyle.normal, '
+      'textBaseline: TextBaseline.alphabetic, '
+      'fontFamily: Arial, '
+      'fontFamilyFallback: [Roboto], '
+      'fontSize: 12.0, '
+      'letterSpacing: 1.2x, '
+      'wordSpacing: 2.3x, '
+      'height: 13.0x, '
+      'leadingDistribution: TextLeadingDistribution.proportional, '
+      'locale: en_US, '
+      'background: Paint(), '
+      'foreground: Paint(), '
+      'shadows: [TextShadow(Color(0xff000000), Offset(0.0, 0.0), ${0.0})], '
+      "fontFeatures: [FontFeature('case', 1)], "
+      "fontVariations: [FontVariation('ital', 0.1)]"
+      ')',
+    );
+  });
+}
+
+typedef _TextStylePropertyPopulator = void Function(_TestTextStyleBuilder builder);
+
+// Paint equality is based on identity, so all the paints below are different,
+// even though they express the same paint.
+final ui.Paint _backgroundA = ui.Paint();
+final ui.Paint _foregroundA = ui.Paint();
+final ui.Paint _backgroundB = ui.Paint();
+final ui.Paint _foregroundB = ui.Paint();
+
+// Intentionally do not use const List expressions to make sure Object.hashAll is used to compute hashCode
+final Map<String, _TextStylePropertyPopulator> _populatorsA = <String, _TextStylePropertyPopulator>{
+  'color': (_TestTextStyleBuilder builder) { builder.color = const ui.Color(0xff000000); },
+  'decoration': (_TestTextStyleBuilder builder) { builder.decoration = ui.TextDecoration.none; },
+  'decorationColor': (_TestTextStyleBuilder builder) { builder.decorationColor = const ui.Color(0xffaa0000); },
+  'decorationStyle': (_TestTextStyleBuilder builder) { builder.decorationStyle = ui.TextDecorationStyle.solid; },
+  'decorationThickness': (_TestTextStyleBuilder builder) { builder.decorationThickness = 1.0; },
+  'fontWeight': (_TestTextStyleBuilder builder) { builder.fontWeight = ui.FontWeight.w400; },
+  'fontStyle': (_TestTextStyleBuilder builder) { builder.fontStyle = ui.FontStyle.normal; },
+  'textBaseline': (_TestTextStyleBuilder builder) { builder.textBaseline = ui.TextBaseline.alphabetic; },
+  'fontFamily': (_TestTextStyleBuilder builder) { builder.fontFamily = 'Arial'; },
+  'fontFamilyFallback': (_TestTextStyleBuilder builder) { builder.fontFamilyFallback = <String>['Roboto']; },
+  'fontSize': (_TestTextStyleBuilder builder) { builder.fontSize = 12; },
+  'letterSpacing': (_TestTextStyleBuilder builder) { builder.letterSpacing = 1.2; },
+  'wordSpacing': (_TestTextStyleBuilder builder) { builder.wordSpacing = 2.3; },
+  'height': (_TestTextStyleBuilder builder) { builder.height = 13; },
+  'leadingDistribution': (_TestTextStyleBuilder builder) { builder.leadingDistribution = ui.TextLeadingDistribution.proportional; },
+  'locale': (_TestTextStyleBuilder builder) { builder.locale = const ui.Locale('en', 'US'); },
+  'background': (_TestTextStyleBuilder builder) { builder.background = _backgroundA; },
+  'foreground': (_TestTextStyleBuilder builder) { builder.foreground = _foregroundA; },
+  'shadows': (_TestTextStyleBuilder builder) { builder.shadows = <ui.Shadow>[const ui.Shadow()]; },
+  'fontFeatures': (_TestTextStyleBuilder builder) { builder.fontFeatures = <ui.FontFeature>[const ui.FontFeature.caseSensitiveForms()]; },
+  'fontVariations': (_TestTextStyleBuilder builder) { builder.fontVariations = <ui.FontVariation>[ const ui.FontVariation.italic(0.1)]; },
+};
+
+// Intentionally do not use const List expressions to make sure Object.hashAll is used to compute hashCode
+final Map<String, _TextStylePropertyPopulator> _populatorsB = <String, _TextStylePropertyPopulator>{
+  'color': (_TestTextStyleBuilder builder) { builder.color = const ui.Color(0xffbb0000); },
+  'decoration': (_TestTextStyleBuilder builder) { builder.decoration = ui.TextDecoration.lineThrough; },
+  'decorationColor': (_TestTextStyleBuilder builder) { builder.decorationColor = const ui.Color(0xffcc0000); },
+  'decorationStyle': (_TestTextStyleBuilder builder) { builder.decorationStyle = ui.TextDecorationStyle.dotted; },
+  'decorationThickness': (_TestTextStyleBuilder builder) { builder.decorationThickness = 1.4; },
+  'fontWeight': (_TestTextStyleBuilder builder) { builder.fontWeight = ui.FontWeight.w600; },
+  'fontStyle': (_TestTextStyleBuilder builder) { builder.fontStyle = ui.FontStyle.italic; },
+  'textBaseline': (_TestTextStyleBuilder builder) { builder.textBaseline = ui.TextBaseline.ideographic; },
+  'fontFamily': (_TestTextStyleBuilder builder) { builder.fontFamily = 'Noto'; },
+  'fontFamilyFallback': (_TestTextStyleBuilder builder) { builder.fontFamilyFallback = <String>['Verdana']; },
+  'fontSize': (_TestTextStyleBuilder builder) { builder.fontSize = 12.1; },
+  'letterSpacing': (_TestTextStyleBuilder builder) { builder.letterSpacing = 1.25; },
+  'wordSpacing': (_TestTextStyleBuilder builder) { builder.wordSpacing = 2.35; },
+  'height': (_TestTextStyleBuilder builder) { builder.height = 13.1; },
+  'leadingDistribution': (_TestTextStyleBuilder builder) { builder.leadingDistribution = ui.TextLeadingDistribution.even; },
+  'locale': (_TestTextStyleBuilder builder) { builder.locale = const ui.Locale('fr', 'CA'); },
+  'background': (_TestTextStyleBuilder builder) { builder.background = _backgroundB; },
+  'foreground': (_TestTextStyleBuilder builder) { builder.foreground = _foregroundB; },
+  'shadows': (_TestTextStyleBuilder builder) { builder.shadows = <ui.Shadow>[const ui.Shadow(blurRadius: 5)]; },
+  'fontFeatures': (_TestTextStyleBuilder builder) { builder.fontFeatures = <ui.FontFeature>[const ui.FontFeature.alternative(2)]; },
+  'fontVariations': (_TestTextStyleBuilder builder) { builder.fontVariations = <ui.FontVariation>[ const ui.FontVariation.italic(0.4)]; },
+};
+
+class _TestTextStyleBuilder {
+  ui.Color? color;
+  ui.TextDecoration? decoration;
+  ui.Color? decorationColor;
+  ui.TextDecorationStyle? decorationStyle;
+  double? decorationThickness;
+  ui.FontWeight? fontWeight;
+  ui.FontStyle? fontStyle;
+  ui.TextBaseline? textBaseline;
+  String? fontFamily;
+  List<String>? fontFamilyFallback;
+  double? fontSize;
+  double? letterSpacing;
+  double? wordSpacing;
+  double? height;
+  ui.TextLeadingDistribution? leadingDistribution;
+  ui.Locale? locale;
+  ui.Paint? background;
+  ui.Paint? foreground;
+  List<ui.Shadow>? shadows;
+  List<ui.FontFeature>? fontFeatures;
+  List<ui.FontVariation>? fontVariations;
+
+  ui.TextStyle build() {
+    return ui.TextStyle(
+      color: color,
+      decoration: decoration,
+      decorationColor: decorationColor,
+      decorationStyle: decorationStyle,
+      decorationThickness: decorationThickness,
+      fontWeight: fontWeight,
+      fontStyle: fontStyle,
+      textBaseline: textBaseline,
+      fontFamily: fontFamily,
+      fontFamilyFallback: fontFamilyFallback,
+      fontSize: fontSize,
+      letterSpacing: letterSpacing,
+      wordSpacing: wordSpacing,
+      height: height,
+      leadingDistribution: leadingDistribution,
+      locale: locale,
+      background: background,
+      foreground: foreground,
+      shadows: shadows,
+      fontFeatures: fontFeatures,
+      fontVariations: fontVariations,
+    );
+  }
+}
diff --git a/lib/web_ui/test/ui/text_style_test_env_test.dart b/lib/web_ui/test/ui/text_style_test_env_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..b65946aed1dc89832a62832d617b38af0f650d24
--- /dev/null
+++ b/lib/web_ui/test/ui/text_style_test_env_test.dart
@@ -0,0 +1,39 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart';
+import 'package:ui/ui.dart' as ui;
+
+import '../common/test_initialization.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+Future<void> testMain() async {
+  setUpUnitTests(setUpTestViewDimensions: false);
+
+  // Previously the logic that set the effective font family would forget the
+  // original value and would print incorrect value in toString.
+  test('TextStyle remembers original fontFamily value', () {
+    final ui.TextStyle style1 = ui.TextStyle();
+    expect(style1.toString(), contains('fontFamily: unspecified'));
+
+    final ui.TextStyle style2 = ui.TextStyle(
+      fontFamily: 'Hello',
+    );
+    expect(style2.toString(), contains('fontFamily: Hello'));
+  });
+
+  test('ParagraphStyle remembers original fontFamily value', () {
+    final ui.ParagraphStyle style1 = ui.ParagraphStyle();
+    expect(style1.toString(), contains('fontFamily: unspecified'));
+
+    final ui.ParagraphStyle style2 = ui.ParagraphStyle(
+      fontFamily: 'Hello',
+    );
+    expect(style2.toString(), contains('fontFamily: Hello'));
+  });
+}
diff --git a/lib/web_ui/test/ui/url_strategy_test.dart b/lib/web_ui/test/ui/url_strategy_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..46299accbac94370ca216e121ba7d850b1352ba6
--- /dev/null
+++ b/lib/web_ui/test/ui/url_strategy_test.dart
@@ -0,0 +1,61 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:test/bootstrap/browser.dart';
+import 'package:test/test.dart' hide TypeMatcher, isInstanceOf;
+import 'package:ui/src/engine.dart';
+import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
+
+import '../common/matchers.dart';
+import '../common/test_initialization.dart';
+
+void main() {
+  internalBootstrapBrowserTest(() => testMain);
+}
+
+Future<void> testMain() async {
+  setUpUnitTests();
+
+  setUp(() {
+    ui_web.debugResetCustomUrlStrategy();
+  });
+  tearDown(() {
+    ui_web.debugResetCustomUrlStrategy();
+  });
+
+  test('uses the default if no custom URL strategy is set', () {
+    final ui_web.UrlStrategy defaultUrlStrategy = TestUrlStrategy();
+    ui_web.debugDefaultUrlStrategyOverride = defaultUrlStrategy;
+
+    expect(ui_web.urlStrategy, defaultUrlStrategy);
+    expect(ui_web.isCustomUrlStrategySet, isFalse);
+  });
+
+  test('can set a custom URL strategy', () {
+    final TestUrlStrategy customUrlStrategy = TestUrlStrategy();
+    ui_web.urlStrategy = customUrlStrategy;
+
+    expect(ui_web.urlStrategy, customUrlStrategy);
+    expect(ui_web.isCustomUrlStrategySet, isTrue);
+    // Does not allow custom URL strategy to be set again.
+    expect(
+      () {
+        ui_web.urlStrategy = customUrlStrategy;
+      },
+      throwsAssertionError,
+    );
+  });
+
+  test('custom URL strategy can be prevented manually', () {
+    ui_web.preventCustomUrlStrategy();
+
+    expect(ui_web.isCustomUrlStrategySet, isFalse);
+    expect(
+      () {
+        ui_web.urlStrategy = TestUrlStrategy();
+      },
+      throwsAssertionError,
+    );
+  });
+}
diff --git a/lib/web_ui/test/ui/utils.dart b/lib/web_ui/test/ui/utils.dart
index da6c5ffb720d7cada757d8358edacfaf772e079d..ec7eaf4c0aed86185ffabc3b5def5f23e3ac4891 100644
--- a/lib/web_ui/test/ui/utils.dart
+++ b/lib/web_ui/test/ui/utils.dart
@@ -2,19 +2,37 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:async';
+
 import 'package:ui/src/engine.dart';
+import 'package:ui/src/engine/skwasm/skwasm_stub.dart'
+    if (dart.library.ffi) 'package:ui/src/engine/skwasm/skwasm_impl.dart';
+import 'package:ui/ui.dart';
+
+import '../common/rendering.dart';
 
-import '../canvaskit/common.dart';
+Picture drawPicture(void Function(Canvas) drawCommands) {
+  final PictureRecorder recorder = PictureRecorder();
+  final Canvas canvas = Canvas(recorder);
+  drawCommands(canvas);
+  return recorder.endRecording();
+}
 
-/// Initializes the renderer for this test.
-void setUpUiTest() {
-  if (renderer is CanvasKitRenderer) {
-    setUpCanvasKitTest();
-  }
+/// Draws the [Picture]. This is in preparation for a golden test.
+Future<void> drawPictureUsingCurrentRenderer(Picture picture) async {
+  final SceneBuilder sb = SceneBuilder();
+  sb.pushOffset(0, 0);
+  sb.addPicture(Offset.zero, picture);
+  await renderScene(sb.build());
 }
 
+/// Convenience getter for the implicit view.
+FlutterView get implicitView => EnginePlatformDispatcher.instance.implicitView!;
+
 /// Returns [true] if this test is running in the CanvasKit renderer.
 bool get isCanvasKit => renderer is CanvasKitRenderer;
 
 /// Returns [true] if this test is running in the HTML renderer.
 bool get isHtml => renderer is HtmlRenderer;
+
+bool get isSkwasm => renderer is SkwasmRenderer;
diff --git a/lib/web_ui/test/canvaskit/vertices_test.dart b/lib/web_ui/test/ui/vertices_test.dart
similarity index 75%
rename from lib/web_ui/test/canvaskit/vertices_test.dart
rename to lib/web_ui/test/ui/vertices_test.dart
index dc0c0110f35566904bf09e7f2d603cdd23d6f6f4..defceaf6707e586bc0ba7cfd98354bef0090f6b2 100644
--- a/lib/web_ui/test/canvaskit/vertices_test.dart
+++ b/lib/web_ui/test/ui/vertices_test.dart
@@ -6,11 +6,11 @@ import 'dart:typed_data';
 
 import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
-import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
 import 'package:web_engine_tester/golden_tester.dart';
 
-import 'common.dart';
+import '../common/test_initialization.dart';
+import 'utils.dart';
 
 void main() {
   internalBootstrapBrowserTest(() => testMain);
@@ -18,54 +18,49 @@ void main() {
 
 void testMain() {
   group('Vertices', () {
-    setUpCanvasKitTest();
+    setUpUnitTests(withImplicitView: true, setUpTestViewDimensions: false);
 
-    test('can be constructed, drawn, and deleted', () {
-      final CkVertices vertices = _testVertices();
-      expect(vertices, isA<CkVertices>());
-      expect(vertices.createDefault(), isNotNull);
-      expect(vertices.resurrect(), isNotNull);
+    test('can be constructed, drawn, and disposed of', () {
+      final ui.Vertices vertices = _testVertices();
+      expect(vertices.debugDisposed, isFalse);
 
-      final CkPictureRecorder recorder = CkPictureRecorder();
-      final CkCanvas canvas =
-          recorder.beginRecording(const ui.Rect.fromLTRB(0, 0, 100, 100));
+      final ui.PictureRecorder recorder = ui.PictureRecorder();
+      final ui.Canvas canvas = ui.Canvas(
+        recorder,
+        const ui.Rect.fromLTRB(0, 0, 100, 100)
+      );
       canvas.drawVertices(
         vertices,
         ui.BlendMode.srcOver,
-        CkPaint(),
+        ui.Paint(),
       );
-      vertices.delete();
+      vertices.dispose();
+      expect(vertices.debugDisposed, isTrue);
     });
   });
 
   test('Vertices are not anti-aliased by default', () async {
     const ui.Rect region = ui.Rect.fromLTRB(0, 0, 500, 500);
-    final CkPictureRecorder recorder = CkPictureRecorder();
-    final CkCanvas canvas = recorder.beginRecording(region);
-    final CkVertices vertices = ui.Vertices.raw(
+    final ui.PictureRecorder recorder = ui.PictureRecorder();
+    final ui.Canvas canvas = ui.Canvas(recorder, region);
+    final ui.Vertices vertices = ui.Vertices.raw(
       ui.VertexMode.triangles,
       Float32List.fromList(_circularVertices),
       indices: Uint16List.fromList(_circularVertexIndices),
-    ) as CkVertices;
+    );
     canvas.scale(3.0, 3.0);
     canvas.drawVertices(
       vertices,
       ui.BlendMode.srcOver,
-      CkPaint()..color = const ui.Color(0xFFFF0000),
+      ui.Paint()..color = const ui.Color(0xFFFF0000),
     );
 
-    final CkPicture verticesPicture = recorder.endRecording();
-
-    final LayerSceneBuilder builder = LayerSceneBuilder();
-    builder.pushOffset(0, 0);
-    builder.addPicture(ui.Offset.zero, verticesPicture);
-    CanvasKitRenderer.instance.rasterizer
-        .draw(builder.build().layerTree);
-    await matchGoldenFile('canvaskit_vertices_antialiased.png', region: region);
-  }, skip: isSafari);
+    await drawPictureUsingCurrentRenderer(recorder.endRecording());
+    await matchGoldenFile('ui_vertices_antialiased.png', region: region);
+  }, skip: isHtml); // https://github.com/flutter/flutter/issues/127454
 }
 
-CkVertices _testVertices() {
+ui.Vertices _testVertices() {
   return ui.Vertices(
     ui.VertexMode.triangles,
     const <ui.Offset>[
@@ -84,7 +79,7 @@ CkVertices _testVertices() {
       ui.Color.fromRGBO(0, 0, 255, 1.0),
     ],
     indices: <int>[0, 1, 2],
-  ) as CkVertices;
+  );
 }
 
 const List<double> _circularVertices = <double>[
diff --git a/runtime/BUILD.gn b/runtime/BUILD.gn
index 48ef5882eca4b31758065dc33e8238309a9dd575..1ed968a4d62d4459a07b92ff2a36199a662367d5 100644
--- a/runtime/BUILD.gn
+++ b/runtime/BUILD.gn
@@ -10,7 +10,10 @@ source_set("test_font") {
     "test_font_data.cc",
     "test_font_data.h",
   ]
-  deps = [ "//third_party/skia" ]
+  deps = [
+    "//flutter/skia",
+    "//flutter/third_party/txt",
+  ]
   public_configs = [ "//flutter:config" ]
   defines = []
   if (flutter_runtime_mode == "debug" || current_toolchain == host_toolchain) {
@@ -26,11 +29,11 @@ group("libdart") {
   public_deps = []
 
   if (flutter_runtime_mode == "profile" || flutter_runtime_mode == "release") {
-    public_deps += [ "//third_party/dart/runtime:libdart_precompiled_runtime" ]
+    public_deps += [ "$dart_src/runtime:libdart_precompiled_runtime" ]
   } else {
     public_deps += [
+      "$dart_src/runtime:libdart_jit",
       "//flutter/lib/snapshot",
-      "//third_party/dart/runtime:libdart_jit",
     ]
   }
 }
@@ -41,9 +44,9 @@ source_set("dart_plugin_registrant") {
     "dart_plugin_registrant.h",
   ]
   deps = [
+    "$dart_src/runtime:dart_api",
     "//flutter/fml",
     "//flutter/third_party/tonic",
-    "//third_party/dart/runtime:dart_api",
   ]
 }
 
@@ -73,6 +76,8 @@ source_set("runtime") {
     "isolate_configuration.h",
     "platform_data.cc",
     "platform_data.h",
+    "platform_isolate_manager.cc",
+    "platform_isolate_manager.h",
     "ptrace_check.h",
     "runtime_controller.cc",
     "runtime_controller.h",
@@ -90,8 +95,9 @@ source_set("runtime") {
   }
 
   public_deps = [
+    "//flutter/lib/gpu",
     "//flutter/lib/ui",
-    "//third_party/rapidjson",
+    "//flutter/third_party/rapidjson",
   ]
 
   public_configs = [ "//flutter:config" ]
@@ -99,24 +105,23 @@ source_set("runtime") {
   deps = [
     ":dart_plugin_registrant",
     ":test_font",
+    "$dart_src/runtime:dart_api",
+    "$dart_src/runtime/bin:dart_io_api",
     "//flutter/assets",
     "//flutter/common",
     "//flutter/flow",
     "//flutter/fml",
     "//flutter/lib/io",
+    "//flutter/shell/common:display",
+    "//flutter/skia",
     "//flutter/third_party/tonic",
     "//flutter/third_party/txt",
-    "//third_party/dart/runtime:dart_api",
-    "//third_party/dart/runtime/bin:dart_io_api",
-    "//third_party/skia",
   ]
 
   if (flutter_runtime_mode != "release" && !is_fuchsia) {
     # Only link in Observatory in non-release modes on non-Fuchsia. Fuchsia
     # instead puts Observatory into the runner's package.
-    deps += [
-      "//third_party/dart/runtime/observatory:embedded_observatory_archive",
-    ]
+    deps += [ "$dart_src/runtime/observatory:embedded_observatory_archive" ]
   }
 }
 
@@ -133,6 +138,7 @@ if (enable_unittests) {
       "dart_lifecycle_unittests.cc",
       "dart_service_isolate_unittests.cc",
       "dart_vm_unittests.cc",
+      "platform_isolate_manager_unittests.cc",
       "type_conversions_unittests.cc",
     ]
 
@@ -142,15 +148,15 @@ if (enable_unittests) {
       ":libdart",
       ":runtime",
       ":runtime_fixtures",
+      "$dart_src/runtime/bin:elf_loader",
       "//flutter/common",
       "//flutter/fml",
       "//flutter/lib/snapshot",
+      "//flutter/skia",
       "//flutter/testing",
       "//flutter/testing:dart",
       "//flutter/testing:fixture_test",
       "//flutter/third_party/tonic",
-      "//third_party/dart/runtime/bin:elf_loader",
-      "//third_party/skia",
     ]
   }
 
diff --git a/runtime/dart_isolate.cc b/runtime/dart_isolate.cc
index 0f819ef9981c11e5d9515702f184eed4d4245e19..9d063bedbe35a9c74ed17a6c98031822ae6096d5 100644
--- a/runtime/dart_isolate.cc
+++ b/runtime/dart_isolate.cc
@@ -14,12 +14,14 @@
 #include "flutter/lib/io/dart_io.h"
 #include "flutter/lib/ui/dart_runtime_hooks.h"
 #include "flutter/lib/ui/dart_ui.h"
+#include "flutter/lib/ui/window/platform_isolate.h"
 #include "flutter/runtime/dart_isolate_group_data.h"
 #include "flutter/runtime/dart_plugin_registrant.h"
 #include "flutter/runtime/dart_service_isolate.h"
 #include "flutter/runtime/dart_vm.h"
 #include "flutter/runtime/dart_vm_lifecycle.h"
 #include "flutter/runtime/isolate_configuration.h"
+#include "flutter/runtime/runtime_controller.h"
 #include "fml/message_loop_task_queues.h"
 #include "fml/task_source.h"
 #include "fml/time/time_point.h"
@@ -196,25 +198,15 @@ std::weak_ptr<DartIsolate> DartIsolate::CreateRootIsolate(
     const DartIsolate* spawning_isolate) {
   TRACE_EVENT0("flutter", "DartIsolate::CreateRootIsolate");
 
-  // The child isolate preparer is null but will be set when the isolate is
-  // being prepared to run.
-  auto isolate_group_data =
-      std::make_unique<std::shared_ptr<DartIsolateGroupData>>(
-          std::shared_ptr<DartIsolateGroupData>(new DartIsolateGroupData(
-              settings,                            // settings
-              std::move(isolate_snapshot),         // isolate snapshot
-              context.advisory_script_uri,         // advisory URI
-              context.advisory_script_entrypoint,  // advisory entrypoint
-              nullptr,                             // child isolate preparer
-              isolate_create_callback,             // isolate create callback
-              isolate_shutdown_callback            // isolate shutdown callback
-              )));
+  // Only needed if this is the main isolate for the group.
+  std::unique_ptr<std::shared_ptr<DartIsolateGroupData>> isolate_group_data;
 
   auto isolate_data = std::make_unique<std::shared_ptr<DartIsolate>>(
-      std::shared_ptr<DartIsolate>(new DartIsolate(settings,  // settings
-                                                   true,      // is_root_isolate
-                                                   context    // context
-                                                   )));
+      std::shared_ptr<DartIsolate>(new DartIsolate(
+          /*settings=*/settings,
+          /*is_root_isolate=*/true,
+          /*context=*/context,
+          /*is_spawning_in_group=*/!!spawning_isolate)));
 
   DartErrorString error;
   Dart_Isolate vm_isolate = nullptr;
@@ -222,24 +214,40 @@ std::weak_ptr<DartIsolate> DartIsolate::CreateRootIsolate(
 
   IsolateMaker isolate_maker;
   if (spawning_isolate) {
-    isolate_maker = [spawning_isolate](
-                        std::shared_ptr<DartIsolateGroupData>*
-                            isolate_group_data,
-                        std::shared_ptr<DartIsolate>* isolate_data,
-                        Dart_IsolateFlags* flags, char** error) {
-      return Dart_CreateIsolateInGroup(
-          /*group_member=*/spawning_isolate->isolate(),
-          /*name=*/(*isolate_group_data)->GetAdvisoryScriptEntrypoint().c_str(),
-          /*shutdown_callback=*/
-          reinterpret_cast<Dart_IsolateShutdownCallback>(
-              DartIsolate::SpawnIsolateShutdownCallback),
-          /*cleanup_callback=*/
-          reinterpret_cast<Dart_IsolateCleanupCallback>(
-              DartIsolateCleanupCallback),
-          /*child_isolate_data=*/isolate_data,
-          /*error=*/error);
-    };
+    isolate_maker =
+        [spawning_isolate](
+            std::shared_ptr<DartIsolateGroupData>* isolate_group_data,
+            std::shared_ptr<DartIsolate>* isolate_data,
+            Dart_IsolateFlags* flags, char** error) {
+          return Dart_CreateIsolateInGroup(
+              /*group_member=*/spawning_isolate->isolate(),
+              /*name=*/
+              spawning_isolate->GetIsolateGroupData()
+                  .GetAdvisoryScriptEntrypoint()
+                  .c_str(),
+              /*shutdown_callback=*/
+              reinterpret_cast<Dart_IsolateShutdownCallback>(
+                  DartIsolate::SpawnIsolateShutdownCallback),
+              /*cleanup_callback=*/
+              reinterpret_cast<Dart_IsolateCleanupCallback>(
+                  DartIsolateCleanupCallback),
+              /*child_isolate_data=*/isolate_data,
+              /*error=*/error);
+        };
   } else {
+    // The child isolate preparer is null but will be set when the isolate is
+    // being prepared to run.
+    isolate_group_data =
+        std::make_unique<std::shared_ptr<DartIsolateGroupData>>(
+            std::shared_ptr<DartIsolateGroupData>(new DartIsolateGroupData(
+                settings,                            // settings
+                std::move(isolate_snapshot),         // isolate snapshot
+                context.advisory_script_uri,         // advisory URI
+                context.advisory_script_entrypoint,  // advisory entrypoint
+                nullptr,                             // child isolate preparer
+                isolate_create_callback,             // isolate create callback
+                isolate_shutdown_callback  // isolate shutdown callback
+                )));
     isolate_maker = [](std::shared_ptr<DartIsolateGroupData>*
                            isolate_group_data,
                        std::shared_ptr<DartIsolate>* isolate_data,
@@ -274,9 +282,154 @@ std::weak_ptr<DartIsolate> DartIsolate::CreateRootIsolate(
   return (*root_isolate_data)->GetWeakIsolatePtr();
 }
 
+Dart_Isolate DartIsolate::CreatePlatformIsolate(Dart_Handle entry_point,
+                                                char** error) {
+  *error = nullptr;
+  PlatformConfiguration* platform_config = platform_configuration();
+  FML_DCHECK(platform_config != nullptr);
+  std::shared_ptr<PlatformIsolateManager> platform_isolate_manager =
+      platform_config->client()->GetPlatformIsolateManager();
+  std::weak_ptr<PlatformIsolateManager> weak_platform_isolate_manager =
+      platform_isolate_manager;
+  if (platform_isolate_manager->HasShutdownMaybeFalseNegative()) {
+    // Don't set the error string. We want to silently ignore this error,
+    // because the engine is shutting down.
+    FML_LOG(INFO) << "CreatePlatformIsolate called after shutdown";
+    return nullptr;
+  }
+
+  Dart_Isolate parent_isolate = isolate();
+  Dart_ExitIsolate();  // Exit parent_isolate.
+
+  const TaskRunners& task_runners = GetTaskRunners();
+  fml::RefPtr<fml::TaskRunner> platform_task_runner =
+      task_runners.GetPlatformTaskRunner();
+  FML_DCHECK(platform_task_runner);
+
+  auto isolate_group_data = std::shared_ptr<DartIsolateGroupData>(
+      *static_cast<std::shared_ptr<DartIsolateGroupData>*>(
+          Dart_IsolateGroupData(parent_isolate)));
+
+  Settings settings(isolate_group_data->GetSettings());
+
+  // PlatformIsolate.spawn should behave like Isolate.spawn when unhandled
+  // exceptions happen (log the exception, but don't terminate the app). But the
+  // default unhandled_exception_callback may terminate the app, because it is
+  // only called for the root isolate (child isolates are managed by the VM and
+  // have a different error code path). So override it to simply log the error.
+  settings.unhandled_exception_callback = [](const std::string& error,
+                                             const std::string& stack_trace) {
+    FML_LOG(ERROR) << "Unhandled exception:\n" << error << "\n" << stack_trace;
+    return true;
+  };
+
+  // The platform isolate task observer must be added on the platform thread. So
+  // schedule the add function on the platform task runner.
+  TaskObserverAdd old_task_observer_add = settings.task_observer_add;
+  settings.task_observer_add = [old_task_observer_add, platform_task_runner,
+                                weak_platform_isolate_manager](
+                                   intptr_t key, const fml::closure& callback) {
+    platform_task_runner->PostTask([old_task_observer_add,
+                                    weak_platform_isolate_manager, key,
+                                    callback]() {
+      std::shared_ptr<PlatformIsolateManager> platform_isolate_manager =
+          weak_platform_isolate_manager.lock();
+      if (platform_isolate_manager == nullptr ||
+          platform_isolate_manager->HasShutdown()) {
+        // Shutdown happened in between this task being posted, and it running.
+        // platform_isolate has already been shut down. Do nothing.
+        FML_LOG(INFO) << "Shutdown before platform isolate task observer added";
+        return;
+      }
+      old_task_observer_add(key, callback);
+    });
+  };
+
+  UIDartState::Context context(task_runners);
+  context.advisory_script_uri = isolate_group_data->GetAdvisoryScriptURI();
+  context.advisory_script_entrypoint =
+      isolate_group_data->GetAdvisoryScriptEntrypoint();
+  auto isolate_data = std::make_unique<std::shared_ptr<DartIsolate>>(
+      std::shared_ptr<DartIsolate>(
+          new DartIsolate(settings, context, platform_isolate_manager)));
+
+  IsolateMaker isolate_maker =
+      [parent_isolate](
+          std::shared_ptr<DartIsolateGroupData>* unused_isolate_group_data,
+          std::shared_ptr<DartIsolate>* isolate_data, Dart_IsolateFlags* flags,
+          char** error) {
+        return Dart_CreateIsolateInGroup(
+            /*group_member=*/parent_isolate,
+            /*name=*/"PlatformIsolate",
+            /*shutdown_callback=*/
+            reinterpret_cast<Dart_IsolateShutdownCallback>(
+                DartIsolate::SpawnIsolateShutdownCallback),
+            /*cleanup_callback=*/
+            reinterpret_cast<Dart_IsolateCleanupCallback>(
+                DartIsolateCleanupCallback),
+            /*child_isolate_data=*/isolate_data,
+            /*error=*/error);
+      };
+  Dart_Isolate platform_isolate = CreateDartIsolateGroup(
+      nullptr, std::move(isolate_data), nullptr, error, isolate_maker);
+
+  Dart_EnterIsolate(parent_isolate);
+
+  if (*error) {
+    return nullptr;
+  }
+
+  if (!platform_isolate_manager->RegisterPlatformIsolate(platform_isolate)) {
+    // The PlatformIsolateManager was shutdown while we were creating the
+    // isolate. This means that we're shutting down the engine. We need to
+    // shutdown the platform isolate.
+    FML_LOG(INFO) << "Shutdown during platform isolate creation";
+    tonic::DartIsolateScope isolate_scope(platform_isolate);
+    Dart_ShutdownIsolate();
+    return nullptr;
+  }
+
+  tonic::DartApiScope api_scope;
+  Dart_PersistentHandle entry_point_handle =
+      Dart_NewPersistentHandle(entry_point);
+
+  platform_task_runner->PostTask([entry_point_handle, platform_isolate,
+                                  weak_platform_isolate_manager]() {
+    std::shared_ptr<PlatformIsolateManager> platform_isolate_manager =
+        weak_platform_isolate_manager.lock();
+    if (platform_isolate_manager == nullptr ||
+        platform_isolate_manager->HasShutdown()) {
+      // Shutdown happened in between this task being posted, and it running.
+      // platform_isolate has already been shut down. Do nothing.
+      FML_LOG(INFO) << "Shutdown before platform isolate entry point";
+      return;
+    }
+
+    tonic::DartIsolateScope isolate_scope(platform_isolate);
+    tonic::DartApiScope api_scope;
+    Dart_Handle entry_point = Dart_HandleFromPersistent(entry_point_handle);
+    Dart_DeletePersistentHandle(entry_point_handle);
+
+    // Disable Isolate.exit().
+    Dart_Handle isolate_lib = Dart_LookupLibrary(tonic::ToDart("dart:isolate"));
+    FML_CHECK(!tonic::CheckAndHandleError(isolate_lib));
+    Dart_Handle isolate_type = Dart_GetNonNullableType(
+        isolate_lib, tonic::ToDart("Isolate"), 0, nullptr);
+    FML_CHECK(!tonic::CheckAndHandleError(isolate_type));
+    Dart_Handle result =
+        Dart_SetField(isolate_type, tonic::ToDart("_mayExit"), Dart_False());
+    FML_CHECK(!tonic::CheckAndHandleError(result));
+
+    tonic::DartInvokeVoid(entry_point);
+  });
+
+  return platform_isolate;
+}
+
 DartIsolate::DartIsolate(const Settings& settings,
                          bool is_root_isolate,
-                         const UIDartState::Context& context)
+                         const UIDartState::Context& context,
+                         bool is_spawning_in_group)
     : UIDartState(settings.task_observer_add,
                   settings.task_observer_remove,
                   settings.log_tag,
@@ -284,14 +437,36 @@ DartIsolate::DartIsolate(const Settings& settings,
                   settings.log_message_callback,
                   DartVMRef::GetIsolateNameServer(),
                   is_root_isolate,
-                  settings.enable_skparagraph,
                   context),
       may_insecurely_connect_to_all_domains_(
           settings.may_insecurely_connect_to_all_domains),
+      is_platform_isolate_(false),
+      is_spawning_in_group_(is_spawning_in_group),
       domain_network_policy_(settings.domain_network_policy) {
   phase_ = Phase::Uninitialized;
 }
 
+DartIsolate::DartIsolate(
+    const Settings& settings,
+    const UIDartState::Context& context,
+    std::shared_ptr<PlatformIsolateManager> platform_isolate_manager)
+    : UIDartState(settings.task_observer_add,
+                  settings.task_observer_remove,
+                  settings.log_tag,
+                  settings.unhandled_exception_callback,
+                  settings.log_message_callback,
+                  DartVMRef::GetIsolateNameServer(),
+                  false,  // is_root_isolate
+                  context),
+      may_insecurely_connect_to_all_domains_(
+          settings.may_insecurely_connect_to_all_domains),
+      is_platform_isolate_(true),
+      is_spawning_in_group_(false),
+      domain_network_policy_(settings.domain_network_policy),
+      platform_isolate_manager_(std::move(platform_isolate_manager)) {
+  phase_ = Phase::Uninitialized;
+}
+
 DartIsolate::~DartIsolate() {
   if (IsRootIsolate() && GetMessageHandlingTaskRunner()) {
     FML_DCHECK(GetMessageHandlingTaskRunner()->RunsTasksOnCurrentThread());
@@ -329,7 +504,12 @@ bool DartIsolate::Initialize(Dart_Isolate dart_isolate) {
     Dart_SetCurrentUserTag(Dart_NewUserTag("AppStartUp"));
   }
 
-  SetMessageHandlingTaskRunner(GetTaskRunners().GetUITaskRunner());
+  if (is_platform_isolate_) {
+    SetMessageHandlingTaskRunner(GetTaskRunners().GetPlatformTaskRunner(),
+                                 true);
+  } else {
+    SetMessageHandlingTaskRunner(GetTaskRunners().GetUITaskRunner(), false);
+  }
 
   if (tonic::CheckAndHandleError(
           Dart_SetLibraryTagHandler(tonic::DartState::HandleLibraryTag))) {
@@ -385,34 +565,45 @@ void DartIsolate::LoadLoadingUnitError(intptr_t loading_unit_id,
 }
 
 void DartIsolate::SetMessageHandlingTaskRunner(
-    const fml::RefPtr<fml::TaskRunner>& runner) {
-  if (!IsRootIsolate() || !runner) {
+    const fml::RefPtr<fml::TaskRunner>& runner,
+    bool post_directly_to_runner) {
+  if (!runner) {
     return;
   }
 
   message_handling_task_runner_ = runner;
 
-  message_handler().Initialize([runner](std::function<void()> task) {
+  tonic::DartMessageHandler::TaskDispatcher dispatcher;
+
 #ifdef OS_FUCHSIA
-    runner->PostTask([task = std::move(task)]() {
-      TRACE_EVENT0("flutter", "DartIsolate::HandleMessage");
-      task();
-    });
-#else
-    auto task_queues = fml::MessageLoopTaskQueues::GetInstance();
-    task_queues->RegisterTask(
-        runner->GetTaskQueueId(),
-        [task = std::move(task)]() {
-          TRACE_EVENT0("flutter", "DartIsolate::HandleMessage");
-          task();
-        },
-        fml::TimePoint::Now(), fml::TaskSourceGrade::kDartMicroTasks);
+  post_directly_to_runner = true;
 #endif
-  });
+
+  if (post_directly_to_runner) {
+    dispatcher = [runner](std::function<void()> task) {
+      runner->PostTask([task = std::move(task)]() {
+        TRACE_EVENT0("flutter", "DartIsolate::HandleMessage");
+        task();
+      });
+    };
+  } else {
+    dispatcher = [runner](std::function<void()> task) {
+      auto task_queues = fml::MessageLoopTaskQueues::GetInstance();
+      task_queues->RegisterTask(
+          runner->GetTaskQueueId(),
+          [task = std::move(task)]() {
+            TRACE_EVENT0("flutter", "DartIsolate::HandleMessage");
+            task();
+          },
+          fml::TimePoint::Now(), fml::TaskSourceGrade::kDartEventLoop);
+    };
+  }
+
+  message_handler().Initialize(dispatcher);
 }
 
 // Updating thread names here does not change the underlying OS thread names.
-// Instead, this is just additional metadata for the Observatory to show the
+// Instead, this is just additional metadata for the Dart VM Service to show the
 // thread name of the isolate.
 bool DartIsolate::UpdateThreadPoolNames() const {
   // TODO(chinmaygarde): This implementation does not account for multiple
@@ -515,8 +706,8 @@ bool DartIsolate::LoadKernel(const std::shared_ptr<const fml::Mapping>& mapping,
     return false;
   }
 
-  // Mapping must be retained until isolate shutdown.
-  kernel_buffers_.push_back(mapping);
+  // Mapping must be retained until isolate group shutdown.
+  GetIsolateGroupData().AddKernelBuffer(mapping);
 
   Dart_Handle library =
       Dart_LoadLibraryFromKernel(mapping->GetMapping(), mapping->GetSize());
@@ -549,13 +740,13 @@ bool DartIsolate::LoadKernel(const std::shared_ptr<const fml::Mapping>& mapping,
     return false;
   }
 
-  if (!mapping || mapping->GetSize() == 0) {
-    return false;
-  }
-
   tonic::DartState::Scope scope(this);
 
-  if (!child_isolate) {
+  if (!child_isolate && !is_spawning_in_group_) {
+    if (!mapping || mapping->GetSize() == 0) {
+      return false;
+    }
+
     // Use root library provided by kernel in favor of one provided by snapshot.
     Dart_SetRootLibrary(Dart_Null());
 
@@ -582,7 +773,8 @@ bool DartIsolate::LoadKernel(const std::shared_ptr<const fml::Mapping>& mapping,
   // executed leads to crashes.
   if (GetIsolateGroupData().GetChildIsolatePreparer() == nullptr) {
     GetIsolateGroupData().SetChildIsolatePreparer(
-        [buffers = kernel_buffers_](DartIsolate* isolate) {
+        [buffers =
+             GetIsolateGroupData().GetKernelBuffers()](DartIsolate* isolate) {
           for (uint64_t i = 0; i < buffers.size(); i++) {
             bool last_piece = i + 1 == buffers.size();
             const std::shared_ptr<const fml::Mapping>& buffer = buffers.at(i);
@@ -628,6 +820,7 @@ bool DartIsolate::LoadKernel(const std::shared_ptr<const fml::Mapping>& mapping,
 [[nodiscard]] bool DartIsolate::PrepareForRunningFromKernels(
     std::vector<std::unique_ptr<const fml::Mapping>> kernels) {
   std::vector<std::shared_ptr<const fml::Mapping>> shared_kernels;
+  shared_kernels.reserve(kernels.size());
   for (auto& kernel : kernels) {
     shared_kernels.emplace_back(std::move(kernel));
   }
@@ -766,7 +959,7 @@ Dart_Isolate DartIsolate::DartCreateAndStartServiceIsolate(
 
   const auto& settings = vm_data->GetSettings();
 
-  if (!settings.enable_observatory) {
+  if (!settings.enable_vm_service) {
     return nullptr;
   }
 
@@ -802,8 +995,8 @@ Dart_Isolate DartIsolate::DartCreateAndStartServiceIsolate(
 
   tonic::DartState::Scope scope(service_isolate);
   if (!DartServiceIsolate::Startup(
-          settings.observatory_host,           // server IP address
-          settings.observatory_port,           // server observatory port
+          settings.vm_service_host,            // server IP address
+          settings.vm_service_port,            // server VM service port
           tonic::DartState::HandleLibraryTag,  // embedder library tag handler
           false,  //  disable websocket origin check
           settings.disable_service_auth_codes,  // disable VM service auth codes
@@ -923,7 +1116,7 @@ Dart_Isolate DartIsolate::DartIsolateGroupCreateCallback(
       });
 
   if (*error) {
-    FML_LOG(ERROR) << "CreateDartIsolateGroup failed: " << error;
+    FML_LOG(ERROR) << "CreateDartIsolateGroup failed: " << *error;
   }
 
   return vm_isolate;
@@ -1099,6 +1292,11 @@ void DartIsolate::OnShutdownCallback() {
     }
   }
 
+  if (is_platform_isolate_) {
+    FML_DCHECK(platform_isolate_manager_ != nullptr);
+    platform_isolate_manager_->RemovePlatformIsolate(isolate());
+  }
+
   shutdown_callbacks_.clear();
 
   const fml::closure& isolate_shutdown_callback =
@@ -1115,13 +1313,37 @@ Dart_Handle DartIsolate::OnDartLoadLibrary(intptr_t loading_unit_id) {
     return Dart_Null();
   }
   const std::string error_message =
-      "Platform Configuration was null. Deferred library load request"
+      "Platform Configuration was null. Deferred library load request "
       "for loading unit id " +
       std::to_string(loading_unit_id) + " was not sent.";
   FML_LOG(ERROR) << error_message;
   return Dart_NewApiError(error_message.c_str());
 }
 
+Dart_Handle DartIsolate::LoadLibraryFromKernel(
+    const std::shared_ptr<const fml::Mapping>& mapping) {
+  if (DartVM::IsRunningPrecompiledCode()) {
+    return Dart_Null();
+  }
+
+  auto* isolate_group_data =
+      static_cast<std::shared_ptr<DartIsolateGroupData>*>(
+          Dart_CurrentIsolateGroupData());
+  // Mapping must be retained until isolate shutdown.
+  (*isolate_group_data)->AddKernelBuffer(mapping);
+
+  auto lib =
+      Dart_LoadLibraryFromKernel(mapping->GetMapping(), mapping->GetSize());
+  if (tonic::CheckAndHandleError(lib)) {
+    return Dart_Null();
+  }
+  auto result = Dart_FinalizeLoading(false);
+  if (Dart_IsError(result)) {
+    return result;
+  }
+  return Dart_GetField(lib, Dart_NewStringFromCString("main"));
+}
+
 DartIsolate::AutoFireClosure::AutoFireClosure(const fml::closure& closure)
     : closure_(closure) {}
 
diff --git a/runtime/dart_isolate.h b/runtime/dart_isolate.h
index 16efd22c3a729961b2536419f94c6b88e5460c55..e8facb468eb01d9f69932802e390d4c242c2ef51 100644
--- a/runtime/dart_isolate.h
+++ b/runtime/dart_isolate.h
@@ -20,6 +20,7 @@
 #include "flutter/lib/ui/ui_dart_state.h"
 #include "flutter/lib/ui/window/platform_configuration.h"
 #include "flutter/runtime/dart_snapshot.h"
+#include "flutter/runtime/isolate_configuration.h"
 #include "third_party/dart/runtime/include/dart_api.h"
 #include "third_party/tonic/dart_state.h"
 
@@ -91,6 +92,7 @@ class DartIsolate : public UIDartState {
   ///             isolate and start over.
   ///
   enum class Phase {
+    // NOLINTBEGIN(readability-identifier-naming)
     //--------------------------------------------------------------------------
     /// The initial phase of all Dart isolates. This is an internal phase and
     /// callers can never get a reference to a Dart isolate in this phase.
@@ -103,7 +105,7 @@ class DartIsolate : public UIDartState {
     ///
     Uninitialized,
     //--------------------------------------------------------------------------
-    /// The Dart isolate has been been fully initialized but none of the
+    /// The Dart isolate has been fully initialized but none of the
     /// libraries referenced by that isolate have been loaded yet. This is an
     /// internal phase and callers can never get a reference to a Dart isolate
     /// in this phase.
@@ -132,6 +134,7 @@ class DartIsolate : public UIDartState {
     /// reference to a Dart isolate in this phase.
     ///
     Shutdown,
+    // NOLINTEND(readability-identifier-naming)
   };
 
   //----------------------------------------------------------------------------
@@ -376,6 +379,25 @@ class DartIsolate : public UIDartState {
   ///
   fml::RefPtr<fml::TaskRunner> GetMessageHandlingTaskRunner() const;
 
+  //----------------------------------------------------------------------------
+  /// @brief      Creates a new isolate in the same group as this isolate, which
+  ///             runs on the platform thread. This method can only be invoked
+  ///             on the root isolate.
+  ///
+  /// @param[in]  entry_point   The entrypoint to invoke once the isolate is
+  ///                           spawned. Will be run on the platform thread.
+  /// @param[out] error         If spawning fails inside the Dart VM, this is
+  ///                           set to the error string. The error should be
+  ///                           reported to the user. Otherwise it is set to
+  ///                           null. It's possible for spawning to fail, but
+  ///                           this error still be null. In that case the
+  ///                           failure should not be reported to the user.
+  ///
+  /// @return     The newly created isolate, or null if spawning failed.
+  ///
+  Dart_Isolate CreatePlatformIsolate(Dart_Handle entry_point,
+                                     char** error) override;
+
   bool LoadLoadingUnit(
       intptr_t loading_unit_id,
       std::unique_ptr<const fml::Mapping> snapshot_data,
@@ -389,6 +411,11 @@ class DartIsolate : public UIDartState {
 
   const DartIsolateGroupData& GetIsolateGroupData() const;
 
+  /// Returns the "main" entrypoint of the library contained in the kernel
+  /// data in `mapping`.
+  static Dart_Handle LoadLibraryFromKernel(
+      const std::shared_ptr<const fml::Mapping>& mapping);
+
  private:
   friend class IsolateConfiguration;
   class AutoFireClosure {
@@ -404,12 +431,14 @@ class DartIsolate : public UIDartState {
   friend class DartVM;
 
   Phase phase_ = Phase::Unknown;
-  std::vector<std::shared_ptr<const fml::Mapping>> kernel_buffers_;
   std::vector<std::unique_ptr<AutoFireClosure>> shutdown_callbacks_;
   std::unordered_set<fml::RefPtr<DartSnapshot>> loading_unit_snapshots_;
   fml::RefPtr<fml::TaskRunner> message_handling_task_runner_;
   const bool may_insecurely_connect_to_all_domains_;
+  const bool is_platform_isolate_;
+  const bool is_spawning_in_group_;
   std::string domain_network_policy_;
+  std::shared_ptr<PlatformIsolateManager> platform_isolate_manager_;
 
   static std::weak_ptr<DartIsolate> CreateRootIsolate(
       const Settings& settings,
@@ -423,7 +452,12 @@ class DartIsolate : public UIDartState {
 
   DartIsolate(const Settings& settings,
               bool is_root_isolate,
-              const UIDartState::Context& context);
+              const UIDartState::Context& context,
+              bool is_spawning_in_group = false);
+
+  DartIsolate(const Settings& settings,
+              const UIDartState::Context& context,
+              std::shared_ptr<PlatformIsolateManager> platform_isolate_manager);
 
   //----------------------------------------------------------------------------
   /// @brief      Initializes the given (current) isolate.
@@ -436,7 +470,8 @@ class DartIsolate : public UIDartState {
   ///
   [[nodiscard]] bool Initialize(Dart_Isolate dart_isolate);
 
-  void SetMessageHandlingTaskRunner(const fml::RefPtr<fml::TaskRunner>& runner);
+  void SetMessageHandlingTaskRunner(const fml::RefPtr<fml::TaskRunner>& runner,
+                                    bool post_directly_to_runner);
 
   bool LoadKernel(const std::shared_ptr<const fml::Mapping>& mapping,
                   bool last_piece);
diff --git a/runtime/dart_isolate_group_data.cc b/runtime/dart_isolate_group_data.cc
index 131f887715bfef9f4f368085fe58c46ae172f212..8c1c09b257786381bfc4f184ec38fa843e5cbd03 100644
--- a/runtime/dart_isolate_group_data.cc
+++ b/runtime/dart_isolate_group_data.cc
@@ -83,4 +83,14 @@ DartIsolateGroupData::GetPlatformMessageHandler(
              : it->second;
 }
 
+void DartIsolateGroupData::AddKernelBuffer(
+    const std::shared_ptr<const fml::Mapping>& buffer) {
+  kernel_buffers_.push_back(buffer);
+}
+
+std::vector<std::shared_ptr<const fml::Mapping>>
+DartIsolateGroupData::GetKernelBuffers() const {
+  return kernel_buffers_;
+}
+
 }  // namespace flutter
diff --git a/runtime/dart_isolate_group_data.h b/runtime/dart_isolate_group_data.h
index 8faef1abf89417ef7000231d52ce291b27bfe6ae..8b862564d21e2256d5046eef0943ce8541d2c822 100644
--- a/runtime/dart_isolate_group_data.h
+++ b/runtime/dart_isolate_group_data.h
@@ -56,6 +56,13 @@ class DartIsolateGroupData : public PlatformMessageHandlerStorage {
 
   void SetChildIsolatePreparer(const ChildIsolatePreparer& value);
 
+  /// Adds a kernel buffer mapping to the kernels loaded for this isolate group.
+  void AddKernelBuffer(const std::shared_ptr<const fml::Mapping>& buffer);
+
+  /// A copy of the mappings for all kernel buffer objects loaded into this
+  /// isolate group.
+  std::vector<std::shared_ptr<const fml::Mapping>> GetKernelBuffers() const;
+
   // |PlatformMessageHandlerStorage|
   void SetPlatformMessageHandler(
       int64_t root_isolate_token,
@@ -66,6 +73,7 @@ class DartIsolateGroupData : public PlatformMessageHandlerStorage {
       int64_t root_isolate_token) const override;
 
  private:
+  std::vector<std::shared_ptr<const fml::Mapping>> kernel_buffers_;
   const Settings settings_;
   const fml::RefPtr<const DartSnapshot> isolate_snapshot_;
   const std::string advisory_script_uri_;
diff --git a/runtime/dart_isolate_unittests.cc b/runtime/dart_isolate_unittests.cc
index e5f43fd56616a6ac296259da92dbb2a1cbe0782a..845d7237d431b431d5d93ebdbcb307f677caf39e 100644
--- a/runtime/dart_isolate_unittests.cc
+++ b/runtime/dart_isolate_unittests.cc
@@ -2,14 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/runtime/dart_isolate.h"
-
 #include "flutter/fml/mapping.h"
 #include "flutter/fml/synchronization/count_down_latch.h"
 #include "flutter/fml/synchronization/waitable_event.h"
+#include "flutter/lib/ui/window/platform_message.h"
+#include "flutter/runtime/dart_isolate.h"
 #include "flutter/runtime/dart_vm.h"
 #include "flutter/runtime/dart_vm_lifecycle.h"
 #include "flutter/runtime/isolate_configuration.h"
+#include "flutter/runtime/platform_isolate_manager.h"
 #include "flutter/testing/dart_isolate_runner.h"
 #include "flutter/testing/fixture_test.h"
 #include "flutter/testing/testing.h"
@@ -404,9 +405,9 @@ TEST_F(DartIsolateTest, CanCreateServiceIsolate) {
   ASSERT_FALSE(DartVMRef::IsInstanceRunning());
   fml::AutoResetWaitableEvent service_isolate_latch;
   auto settings = CreateSettingsForFixture();
-  settings.enable_observatory = true;
-  settings.observatory_port = 0;
-  settings.observatory_host = "127.0.0.1";
+  settings.enable_vm_service = true;
+  settings.vm_service_port = 0;
+  settings.vm_service_host = "127.0.0.1";
   settings.enable_service_port_fallback = true;
   settings.service_isolate_create_callback = [&service_isolate_latch]() {
     service_isolate_latch.Signal();
@@ -592,6 +593,604 @@ TEST_F(DartIsolateTest, DartPluginRegistrantIsCalled) {
   ASSERT_EQ(messages[0], "_PluginRegistrant.register() was called");
 }
 
+TEST_F(DartIsolateTest, SpawningAnIsolateDoesNotReloadKernel) {
+  ASSERT_FALSE(DartVMRef::IsInstanceRunning());
+  auto settings = CreateSettingsForFixture();
+  auto vm_ref = DartVMRef::Create(settings);
+  ASSERT_TRUE(vm_ref);
+  auto vm_data = vm_ref.GetVMData();
+  ASSERT_TRUE(vm_data);
+  TaskRunners task_runners(GetCurrentTestName(),    //
+                           GetCurrentTaskRunner(),  //
+                           GetCurrentTaskRunner(),  //
+                           GetCurrentTaskRunner(),  //
+                           GetCurrentTaskRunner()   //
+  );
+
+  size_t get_kernel_count = 0u;
+  if (!DartVM::IsRunningPrecompiledCode()) {
+    ASSERT_TRUE(settings.application_kernels);
+    auto mappings = settings.application_kernels();
+    ASSERT_EQ(mappings.size(), 1u);
+
+    // This feels a little brittle, but the alternative seems to be making
+    // DartIsolate have virtual methods so it can be mocked or exposing weird
+    // test-only API on IsolateConfiguration.
+    settings.application_kernels = fml::MakeCopyable(
+        [&get_kernel_count,
+         mapping = std::move(mappings.front())]() mutable -> Mappings {
+          get_kernel_count++;
+          EXPECT_EQ(get_kernel_count, 1u)
+              << "Unexpectedly got more than one call for the kernel mapping.";
+          EXPECT_TRUE(mapping);
+          std::vector<std::unique_ptr<const fml::Mapping>> kernel_mappings;
+          if (mapping) {
+            kernel_mappings.emplace_back(std::move(mapping));
+          }
+          return kernel_mappings;
+        });
+  }
+
+  std::shared_ptr<DartIsolate> root_isolate;
+  {
+    auto isolate_configuration =
+        IsolateConfiguration::InferFromSettings(settings);
+
+    UIDartState::Context context(task_runners);
+    context.advisory_script_uri = "main.dart";
+    context.advisory_script_entrypoint = "main";
+    auto weak_isolate = DartIsolate::CreateRunningRootIsolate(
+        /*settings=*/vm_data->GetSettings(),
+        /*isolate_snapshot=*/vm_data->GetIsolateSnapshot(),
+        /*platform_configuration=*/nullptr,
+        /*flags=*/DartIsolate::Flags{},
+        /*root_isolate_create_callback=*/nullptr,
+        /*isolate_create_callback=*/settings.isolate_create_callback,
+        /*isolate_shutdown_callback=*/settings.isolate_shutdown_callback,
+        /*dart_entrypoint=*/"main",
+        /*dart_entrypoint_library=*/std::nullopt,
+        /*dart_entrypoint_args=*/{},
+        /*isolate_configuration=*/std::move(isolate_configuration),
+        /*context=*/context);
+    root_isolate = weak_isolate.lock();
+  }
+  ASSERT_TRUE(root_isolate);
+  ASSERT_EQ(root_isolate->GetPhase(), DartIsolate::Phase::Running);
+  if (!DartVM::IsRunningPrecompiledCode()) {
+    ASSERT_EQ(get_kernel_count, 1u);
+  }
+
+  {
+    auto isolate_configuration = IsolateConfiguration::InferFromSettings(
+        /*settings=*/settings,
+        /*asset_manager=*/nullptr,
+        /*io_worker=*/nullptr,
+        /*launch_type=*/IsolateLaunchType::kExistingGroup);
+
+    UIDartState::Context context(task_runners);
+    context.advisory_script_uri = "main.dart";
+    context.advisory_script_entrypoint = "main";
+    auto weak_isolate = DartIsolate::CreateRunningRootIsolate(
+        /*settings=*/vm_data->GetSettings(),
+        /*isolate_snapshot=*/vm_data->GetIsolateSnapshot(),
+        /*platform_configuration=*/nullptr,
+        /*flags=*/DartIsolate::Flags{},
+        /*root_isolate_create_callback=*/nullptr,
+        /*isolate_create_callback=*/settings.isolate_create_callback,
+        /*isolate_shutdown_callback=*/settings.isolate_shutdown_callback,
+        /*dart_entrypoint=*/"main",
+        /*dart_entrypoint_library=*/std::nullopt,
+        /*dart_entrypoint_args=*/{},
+        /*isolate_configuration=*/std::move(isolate_configuration),
+        /*context=*/context,
+        /*spawning_isolate=*/root_isolate.get());
+    auto spawned_isolate = weak_isolate.lock();
+    ASSERT_TRUE(spawned_isolate);
+    ASSERT_EQ(spawned_isolate->GetPhase(), DartIsolate::Phase::Running);
+    if (!DartVM::IsRunningPrecompiledCode()) {
+      ASSERT_EQ(get_kernel_count, 1u);
+    }
+    ASSERT_TRUE(spawned_isolate->Shutdown());
+  }
+
+  ASSERT_TRUE(root_isolate->Shutdown());
+}
+
+class FakePlatformConfigurationClient : public PlatformConfigurationClient {
+ public:
+  std::shared_ptr<PlatformIsolateManager> mgr =
+      std::shared_ptr<PlatformIsolateManager>(new PlatformIsolateManager());
+  std::shared_ptr<PlatformIsolateManager> GetPlatformIsolateManager() override {
+    return mgr;
+  }
+
+  std::string DefaultRouteName() override { return ""; }
+  void ScheduleFrame() override {}
+  void EndWarmUpFrame() override {}
+  void Render(int64_t view_id,
+              Scene* scene,
+              double width,
+              double height) override {}
+  void UpdateSemantics(SemanticsUpdate* update) override {}
+  void HandlePlatformMessage(
+      std::unique_ptr<PlatformMessage> message) override {}
+  FontCollection& GetFontCollection() override {
+    FML_UNREACHABLE();
+    return *(FontCollection*)(this);
+  }
+  std::shared_ptr<AssetManager> GetAssetManager() override { return nullptr; }
+  void UpdateIsolateDescription(const std::string isolate_name,
+                                int64_t isolate_port) override {}
+  void SetNeedsReportTimings(bool value) override {}
+  std::shared_ptr<const fml::Mapping> GetPersistentIsolateData() override {
+    return nullptr;
+  }
+  std::unique_ptr<std::vector<std::string>> ComputePlatformResolvedLocale(
+      const std::vector<std::string>& supported_locale_data) override {
+    return nullptr;
+  }
+  void RequestDartDeferredLibrary(intptr_t loading_unit_id) override {}
+  void SendChannelUpdate(std::string name, bool listening) override {}
+  double GetScaledFontSize(double unscaled_font_size,
+                           int configuration_id) const override {
+    return 0;
+  }
+};
+
+TEST_F(DartIsolateTest, PlatformIsolateCreationAndShutdown) {
+  fml::AutoResetWaitableEvent message_latch;
+  AddNativeCallback(
+      "PassMessage",
+      CREATE_NATIVE_ENTRY(([&message_latch](Dart_NativeArguments args) {
+        auto message = tonic::DartConverter<std::string>::FromDart(
+            Dart_GetNativeArgument(args, 0));
+        ASSERT_EQ("Platform isolate is ready", message);
+        message_latch.Signal();
+      })));
+
+  FakePlatformConfigurationClient client;
+  auto platform_configuration =
+      std::make_unique<PlatformConfiguration>(&client);
+  Dart_Isolate platform_isolate = nullptr;
+
+  {
+    ASSERT_FALSE(DartVMRef::IsInstanceRunning());
+    auto settings = CreateSettingsForFixture();
+    auto vm_ref = DartVMRef::Create(settings);
+    ASSERT_TRUE(vm_ref);
+    auto vm_data = vm_ref.GetVMData();
+    ASSERT_TRUE(vm_data);
+
+    auto platform_thread = CreateNewThread();
+    auto ui_thread = CreateNewThread();
+    TaskRunners task_runners(GetCurrentTestName(),  // label
+                             platform_thread,       // platform
+                             ui_thread,             // raster
+                             ui_thread,             // ui
+                             ui_thread              // io
+    );
+    auto isolate =
+        RunDartCodeInIsolate(vm_ref, settings, task_runners, "emptyMain", {},
+                             GetDefaultKernelFilePath(), {}, nullptr,
+                             std::move(platform_configuration));
+    ASSERT_TRUE(isolate);
+    auto root_isolate = isolate->get();
+    ASSERT_EQ(root_isolate->GetPhase(), DartIsolate::Phase::Running);
+    EXPECT_FALSE(
+        client.mgr->IsRegisteredForTestingOnly(root_isolate->isolate()));
+
+    // Post a task to the platform_thread that just waits, to delay execution of
+    // the platform isolate until we're ready.
+    fml::AutoResetWaitableEvent platform_thread_latch;
+    fml::TaskRunner::RunNowOrPostTask(
+        platform_thread, fml::MakeCopyable([&platform_thread_latch]() mutable {
+          platform_thread_latch.Wait();
+        }));
+
+    fml::AutoResetWaitableEvent ui_thread_latch;
+    fml::TaskRunner::RunNowOrPostTask(
+        ui_thread, fml::MakeCopyable([&]() mutable {
+          ASSERT_TRUE(
+              isolate->RunInIsolateScope([root_isolate, &platform_isolate]() {
+                Dart_Handle lib = Dart_RootLibrary();
+                Dart_Handle entry_point = Dart_GetField(
+                    lib, tonic::ToDart("mainForPlatformIsolates"));
+                char* error = nullptr;
+                platform_isolate =
+                    root_isolate->CreatePlatformIsolate(entry_point, &error);
+
+                EXPECT_FALSE(error);
+                EXPECT_TRUE(platform_isolate);
+                EXPECT_EQ(Dart_CurrentIsolate(), root_isolate->isolate());
+                return true;
+              }));
+          ui_thread_latch.Signal();
+        }));
+
+    ui_thread_latch.Wait();
+    ASSERT_TRUE(platform_isolate);
+    EXPECT_TRUE(client.mgr->IsRegisteredForTestingOnly(platform_isolate));
+
+    // Allow the platform isolate to run.
+    platform_thread_latch.Signal();
+
+    // Wait for a message from the platform isolate.
+    message_latch.Wait();
+
+    // root isolate will be auto-shutdown
+  }
+  EXPECT_FALSE(client.mgr->IsRegisteredForTestingOnly(platform_isolate));
+}
+
+TEST_F(DartIsolateTest, PlatformIsolateEarlyShutdown) {
+  FakePlatformConfigurationClient client;
+  auto platform_configuration =
+      std::make_unique<PlatformConfiguration>(&client);
+
+  ASSERT_FALSE(DartVMRef::IsInstanceRunning());
+  auto settings = CreateSettingsForFixture();
+  auto vm_ref = DartVMRef::Create(settings);
+  ASSERT_TRUE(vm_ref);
+  auto vm_data = vm_ref.GetVMData();
+  ASSERT_TRUE(vm_data);
+
+  auto platform_thread = CreateNewThread();
+  auto ui_thread = CreateNewThread();
+  TaskRunners task_runners(GetCurrentTestName(),  // label
+                           platform_thread,       // platform
+                           ui_thread,             // raster
+                           ui_thread,             // ui
+                           ui_thread              // io
+  );
+  auto isolate =
+      RunDartCodeInIsolate(vm_ref, settings, task_runners, "emptyMain", {},
+                           GetDefaultKernelFilePath(), {}, nullptr,
+                           std::move(platform_configuration));
+  ASSERT_TRUE(isolate);
+  auto root_isolate = isolate->get();
+  ASSERT_EQ(root_isolate->GetPhase(), DartIsolate::Phase::Running);
+  EXPECT_FALSE(client.mgr->IsRegisteredForTestingOnly(root_isolate->isolate()));
+
+  fml::AutoResetWaitableEvent ui_thread_latch;
+  Dart_Isolate platform_isolate = nullptr;
+  fml::TaskRunner::RunNowOrPostTask(
+      ui_thread, fml::MakeCopyable([&]() mutable {
+        ASSERT_TRUE(
+            isolate->RunInIsolateScope([root_isolate, &platform_isolate]() {
+              Dart_Handle lib = Dart_RootLibrary();
+              Dart_Handle entry_point =
+                  Dart_GetField(lib, tonic::ToDart("emptyMain"));
+              char* error = nullptr;
+              platform_isolate =
+                  root_isolate->CreatePlatformIsolate(entry_point, &error);
+
+              EXPECT_FALSE(error);
+              EXPECT_TRUE(platform_isolate);
+              EXPECT_EQ(Dart_CurrentIsolate(), root_isolate->isolate());
+
+              return true;
+            }));
+        ui_thread_latch.Signal();
+      }));
+
+  ui_thread_latch.Wait();
+  ASSERT_TRUE(platform_isolate);
+  EXPECT_TRUE(client.mgr->IsRegisteredForTestingOnly(platform_isolate));
+
+  // Post a task to the platform thread to shut down the platform isolate.
+  fml::AutoResetWaitableEvent platform_thread_latch;
+  fml::TaskRunner::RunNowOrPostTask(
+      platform_thread,
+      fml::MakeCopyable([&platform_thread_latch, platform_isolate]() mutable {
+        Dart_EnterIsolate(platform_isolate);
+        Dart_ShutdownIsolate();
+        platform_thread_latch.Signal();
+      }));
+  platform_thread_latch.Wait();
+
+  // The platform isolate should be shut down.
+  EXPECT_FALSE(client.mgr->IsRegisteredForTestingOnly(platform_isolate));
+
+  // root isolate will be auto-shutdown
+}
+
+TEST_F(DartIsolateTest, PlatformIsolateSendAndReceive) {
+  fml::AutoResetWaitableEvent message_latch;
+  AddNativeCallback(
+      "PassMessage",
+      CREATE_NATIVE_ENTRY(([&message_latch](Dart_NativeArguments args) {
+        auto message = tonic::DartConverter<std::string>::FromDart(
+            Dart_GetNativeArgument(args, 0));
+        ASSERT_EQ("Platform isolate received: Hello from root isolate!",
+                  message);
+        message_latch.Signal();
+      })));
+
+  FakePlatformConfigurationClient client;
+  auto platform_configuration =
+      std::make_unique<PlatformConfiguration>(&client);
+
+  ASSERT_FALSE(DartVMRef::IsInstanceRunning());
+  auto settings = CreateSettingsForFixture();
+  auto vm_ref = DartVMRef::Create(settings);
+  ASSERT_TRUE(vm_ref);
+  auto vm_data = vm_ref.GetVMData();
+  ASSERT_TRUE(vm_data);
+
+  auto platform_thread = CreateNewThread();
+  auto ui_thread = CreateNewThread();
+  TaskRunners task_runners(GetCurrentTestName(),  // label
+                           platform_thread,       // platform
+                           ui_thread,             // raster
+                           ui_thread,             // ui
+                           ui_thread              // io
+  );
+  auto isolate =
+      RunDartCodeInIsolate(vm_ref, settings, task_runners, "emptyMain", {},
+                           GetDefaultKernelFilePath(), {}, nullptr,
+                           std::move(platform_configuration));
+  ASSERT_TRUE(isolate);
+  auto root_isolate = isolate->get();
+  ASSERT_EQ(root_isolate->GetPhase(), DartIsolate::Phase::Running);
+
+  fml::AutoResetWaitableEvent ui_thread_latch;
+  Dart_Isolate platform_isolate = nullptr;
+  fml::TaskRunner::RunNowOrPostTask(
+      ui_thread, fml::MakeCopyable([&]() mutable {
+        ASSERT_TRUE(isolate->RunInIsolateScope([root_isolate,
+                                                &platform_isolate]() {
+          Dart_Handle lib = Dart_RootLibrary();
+          Dart_Handle entry_point = Dart_Invoke(
+              lib, tonic::ToDart("createEntryPointForPlatIsoSendAndRecvTest"),
+              0, nullptr);
+          char* error = nullptr;
+          platform_isolate =
+              root_isolate->CreatePlatformIsolate(entry_point, &error);
+          EXPECT_FALSE(error);
+          return true;
+        }));
+        ui_thread_latch.Signal();
+      }));
+  ui_thread_latch.Wait();
+
+  // Wait for a message from the platform isolate.
+  message_latch.Wait();
+
+  // Post a task to the platform_thread that runs after the platform isolate's
+  // entry point and all messages, and wait for it to run.
+  fml::AutoResetWaitableEvent epilogue_latch;
+  fml::TaskRunner::RunNowOrPostTask(
+      platform_thread, fml::MakeCopyable([&epilogue_latch]() mutable {
+        epilogue_latch.Signal();
+      }));
+  epilogue_latch.Wait();
+
+  // root isolate will be auto-shutdown
+}
+
+TEST_F(DartIsolateTest, PlatformIsolateCreationAfterManagerShutdown) {
+  AddNativeCallback("PassMessage",
+                    CREATE_NATIVE_ENTRY((
+                        [](Dart_NativeArguments args) { FML_UNREACHABLE(); })));
+
+  FakePlatformConfigurationClient client;
+  auto platform_configuration =
+      std::make_unique<PlatformConfiguration>(&client);
+
+  ASSERT_FALSE(DartVMRef::IsInstanceRunning());
+  auto settings = CreateSettingsForFixture();
+  auto vm_ref = DartVMRef::Create(settings);
+  ASSERT_TRUE(vm_ref);
+  auto vm_data = vm_ref.GetVMData();
+  ASSERT_TRUE(vm_data);
+
+  auto platform_thread = CreateNewThread();
+  auto ui_thread = CreateNewThread();
+  TaskRunners task_runners(GetCurrentTestName(),  // label
+                           platform_thread,       // platform
+                           ui_thread,             // raster
+                           ui_thread,             // ui
+                           ui_thread              // io
+  );
+  auto isolate =
+      RunDartCodeInIsolate(vm_ref, settings, task_runners, "emptyMain", {},
+                           GetDefaultKernelFilePath(), {}, nullptr,
+                           std::move(platform_configuration));
+  ASSERT_TRUE(isolate);
+  auto root_isolate = isolate->get();
+  ASSERT_EQ(root_isolate->GetPhase(), DartIsolate::Phase::Running);
+
+  // Shut down the manager on the platform thread.
+  fml::AutoResetWaitableEvent manager_shutdown_latch;
+  fml::TaskRunner::RunNowOrPostTask(
+      platform_thread,
+      fml::MakeCopyable([&manager_shutdown_latch, &client]() mutable {
+        client.mgr->ShutdownPlatformIsolates();
+        manager_shutdown_latch.Signal();
+      }));
+  manager_shutdown_latch.Wait();
+
+  fml::AutoResetWaitableEvent ui_thread_latch;
+  fml::TaskRunner::RunNowOrPostTask(
+      ui_thread, fml::MakeCopyable([&]() mutable {
+        ASSERT_TRUE(isolate->RunInIsolateScope([root_isolate]() {
+          Dart_Handle lib = Dart_RootLibrary();
+          Dart_Handle entry_point =
+              Dart_GetField(lib, tonic::ToDart("mainForPlatformIsolates"));
+          char* error = nullptr;
+          Dart_Isolate platform_isolate =
+              root_isolate->CreatePlatformIsolate(entry_point, &error);
+
+          // Failed to create a platform isolate, but we've still re-entered the
+          // root isolate.
+          EXPECT_FALSE(error);
+          EXPECT_FALSE(platform_isolate);
+          EXPECT_EQ(Dart_CurrentIsolate(), root_isolate->isolate());
+
+          return true;
+        }));
+        ui_thread_latch.Signal();
+      }));
+  ui_thread_latch.Wait();
+
+  // root isolate will be auto-shutdown
+}
+
+TEST_F(DartIsolateTest, PlatformIsolateManagerShutdownBeforeMainRuns) {
+  AddNativeCallback("PassMessage",
+                    CREATE_NATIVE_ENTRY((
+                        [](Dart_NativeArguments args) { FML_UNREACHABLE(); })));
+
+  FakePlatformConfigurationClient client;
+  auto platform_configuration =
+      std::make_unique<PlatformConfiguration>(&client);
+
+  ASSERT_FALSE(DartVMRef::IsInstanceRunning());
+  auto settings = CreateSettingsForFixture();
+  auto vm_ref = DartVMRef::Create(settings);
+  ASSERT_TRUE(vm_ref);
+  auto vm_data = vm_ref.GetVMData();
+  ASSERT_TRUE(vm_data);
+
+  auto platform_thread = CreateNewThread();
+  auto ui_thread = CreateNewThread();
+  TaskRunners task_runners(GetCurrentTestName(),  // label
+                           platform_thread,       // platform
+                           ui_thread,             // raster
+                           ui_thread,             // ui
+                           ui_thread              // io
+  );
+  auto isolate =
+      RunDartCodeInIsolate(vm_ref, settings, task_runners, "emptyMain", {},
+                           GetDefaultKernelFilePath(), {}, nullptr,
+                           std::move(platform_configuration));
+  ASSERT_TRUE(isolate);
+  auto root_isolate = isolate->get();
+  ASSERT_EQ(root_isolate->GetPhase(), DartIsolate::Phase::Running);
+
+  Dart_Isolate platform_isolate = nullptr;
+
+  // Post a task to the platform_thread that just waits, to delay execution of
+  // the platform isolate until we're ready, and shutdown the manager just
+  // before it runs.
+  fml::AutoResetWaitableEvent platform_thread_latch;
+  fml::TaskRunner::RunNowOrPostTask(
+      platform_thread, fml::MakeCopyable([&platform_thread_latch, &client,
+                                          &platform_isolate]() mutable {
+        platform_thread_latch.Wait();
+        client.mgr->ShutdownPlatformIsolates();
+        EXPECT_TRUE(platform_isolate);
+        EXPECT_FALSE(client.mgr->IsRegisteredForTestingOnly(platform_isolate));
+      }));
+
+  fml::AutoResetWaitableEvent ui_thread_latch;
+  fml::TaskRunner::RunNowOrPostTask(
+      ui_thread, fml::MakeCopyable([&]() mutable {
+        ASSERT_TRUE(
+            isolate->RunInIsolateScope([root_isolate, &platform_isolate]() {
+              Dart_Handle lib = Dart_RootLibrary();
+              Dart_Handle entry_point =
+                  Dart_GetField(lib, tonic::ToDart("mainForPlatformIsolates"));
+              char* error = nullptr;
+              platform_isolate =
+                  root_isolate->CreatePlatformIsolate(entry_point, &error);
+
+              EXPECT_FALSE(error);
+              EXPECT_TRUE(platform_isolate);
+              EXPECT_EQ(Dart_CurrentIsolate(), root_isolate->isolate());
+
+              return true;
+            }));
+        ui_thread_latch.Signal();
+      }));
+  ui_thread_latch.Wait();
+  ASSERT_TRUE(platform_isolate);
+  EXPECT_TRUE(client.mgr->IsRegisteredForTestingOnly(platform_isolate));
+
+  // Allow the platform isolate to run, but its main is never run.
+  platform_thread_latch.Signal();
+
+  // Post a task to the platform_thread that runs after the platform isolate's
+  // entry point, and wait for it to run.
+  fml::AutoResetWaitableEvent epilogue_latch;
+  fml::TaskRunner::RunNowOrPostTask(
+      platform_thread, fml::MakeCopyable([&epilogue_latch]() mutable {
+        epilogue_latch.Signal();
+      }));
+  epilogue_latch.Wait();
+
+  // root isolate will be auto-shutdown
+}
+
+TEST_F(DartIsolateTest, PlatformIsolateMainThrowsError) {
+  AddNativeCallback("PassMessage",
+                    CREATE_NATIVE_ENTRY((
+                        [](Dart_NativeArguments args) { FML_UNREACHABLE(); })));
+
+  FakePlatformConfigurationClient client;
+  auto platform_configuration =
+      std::make_unique<PlatformConfiguration>(&client);
+
+  ASSERT_FALSE(DartVMRef::IsInstanceRunning());
+  auto settings = CreateSettingsForFixture();
+  auto vm_ref = DartVMRef::Create(settings);
+  ASSERT_TRUE(vm_ref);
+  auto vm_data = vm_ref.GetVMData();
+  ASSERT_TRUE(vm_data);
+
+  auto platform_thread = CreateNewThread();
+  auto ui_thread = CreateNewThread();
+  TaskRunners task_runners(GetCurrentTestName(),  // label
+                           platform_thread,       // platform
+                           ui_thread,             // raster
+                           ui_thread,             // ui
+                           ui_thread              // io
+  );
+  auto isolate =
+      RunDartCodeInIsolate(vm_ref, settings, task_runners, "emptyMain", {},
+                           GetDefaultKernelFilePath(), {}, nullptr,
+                           std::move(platform_configuration));
+  ASSERT_TRUE(isolate);
+  auto root_isolate = isolate->get();
+  ASSERT_EQ(root_isolate->GetPhase(), DartIsolate::Phase::Running);
+
+  Dart_Isolate platform_isolate = nullptr;
+  fml::AutoResetWaitableEvent ui_thread_latch;
+  fml::TaskRunner::RunNowOrPostTask(
+      ui_thread, fml::MakeCopyable([&]() mutable {
+        ASSERT_TRUE(
+            isolate->RunInIsolateScope([root_isolate, &platform_isolate]() {
+              Dart_Handle lib = Dart_RootLibrary();
+              Dart_Handle entry_point = Dart_GetField(
+                  lib, tonic::ToDart("mainForPlatformIsolatesThrowError"));
+              char* error = nullptr;
+              platform_isolate =
+                  root_isolate->CreatePlatformIsolate(entry_point, &error);
+
+              EXPECT_FALSE(error);
+              EXPECT_TRUE(platform_isolate);
+              EXPECT_EQ(Dart_CurrentIsolate(), root_isolate->isolate());
+
+              return true;
+            }));
+        ui_thread_latch.Signal();
+      }));
+  ui_thread_latch.Wait();
+  ASSERT_TRUE(platform_isolate);
+  EXPECT_TRUE(client.mgr->IsRegisteredForTestingOnly(platform_isolate));
+
+  // Post a task to the platform_thread that runs after the platform isolate's
+  // entry point, and wait for it to run.
+  fml::AutoResetWaitableEvent epilogue_latch;
+  fml::TaskRunner::RunNowOrPostTask(
+      platform_thread, fml::MakeCopyable([&epilogue_latch]() mutable {
+        epilogue_latch.Signal();
+      }));
+  epilogue_latch.Wait();
+
+  // root isolate will be auto-shutdown
+}
+
 }  // namespace testing
 }  // namespace flutter
 
diff --git a/runtime/dart_lifecycle_unittests.cc b/runtime/dart_lifecycle_unittests.cc
index d3162905e3ae6b074e91f4abd0641e13ebf4f84a..467df37d273afad6c9aebe9662a02e8f24dd2a01 100644
--- a/runtime/dart_lifecycle_unittests.cc
+++ b/runtime/dart_lifecycle_unittests.cc
@@ -19,7 +19,7 @@ using DartLifecycleTest = FixtureTest;
 TEST_F(DartLifecycleTest, CanStartAndShutdownVM) {
   auto settings = CreateSettingsForFixture();
   settings.leak_vm = false;
-  settings.enable_observatory = false;
+  settings.enable_vm_service = false;
   ASSERT_FALSE(DartVMRef::IsInstanceRunning());
   {
     auto vm_ref = DartVMRef::Create(settings);
@@ -31,7 +31,7 @@ TEST_F(DartLifecycleTest, CanStartAndShutdownVM) {
 TEST_F(DartLifecycleTest, CanStartAndShutdownVMOverAndOver) {
   auto settings = CreateSettingsForFixture();
   settings.leak_vm = false;
-  settings.enable_observatory = false;
+  settings.enable_vm_service = false;
   ASSERT_FALSE(DartVMRef::IsInstanceRunning());
   auto count = DartVM::GetVMLaunchCount();
   for (size_t i = 0; i < 10; i++) {
@@ -89,7 +89,7 @@ TEST_F(DartLifecycleTest, DISABLED_ShuttingDownTheVMShutsDownAllIsolates) {
   auto settings = CreateSettingsForFixture();
   settings.leak_vm = false;
   // Make sure the service protocol launches
-  settings.enable_observatory = true;
+  settings.enable_vm_service = true;
 
   auto thread_task_runner = CreateNewThread();
 
diff --git a/runtime/dart_plugin_registrant.h b/runtime/dart_plugin_registrant.h
index f78dfccca8c795410ef27f6b69c291ad35ff8cdc..46706a5cf1a34c87d8e5612d63312c4d741948df 100644
--- a/runtime/dart_plugin_registrant.h
+++ b/runtime/dart_plugin_registrant.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_DART_PLUGIN_REGISTRANT_H_
-#define FLUTTER_DART_PLUGIN_REGISTRANT_H_
+#ifndef FLUTTER_RUNTIME_DART_PLUGIN_REGISTRANT_H_
+#define FLUTTER_RUNTIME_DART_PLUGIN_REGISTRANT_H_
 
 #include "third_party/dart/runtime/include/dart_api.h"
 
@@ -23,4 +23,4 @@ bool FindAndInvokeDartPluginRegistrant();
 
 }  // namespace flutter
 
-#endif  // FLUTTER_DART_PLUGIN_REGISTRANT_H_
+#endif  // FLUTTER_RUNTIME_DART_PLUGIN_REGISTRANT_H_
diff --git a/runtime/dart_service_isolate.cc b/runtime/dart_service_isolate.cc
index 18b51a32a6f1a33fa538a14bd39c74b7aa80ea71..9f27e16d323b953caa7c3a2236056f84f86ecc01 100644
--- a/runtime/dart_service_isolate.cc
+++ b/runtime/dart_service_isolate.cc
@@ -33,7 +33,7 @@ namespace {
 
 static Dart_LibraryTagHandler g_embedder_tag_handler;
 static tonic::DartLibraryNatives* g_natives;
-static std::string g_observatory_uri;
+static std::string g_vm_service_uri;
 
 Dart_NativeFunction GetNativeFunction(Dart_Handle name,
                                       int argument_count,
@@ -51,7 +51,7 @@ const uint8_t* GetSymbol(Dart_NativeFunction native_function) {
 
 std::mutex DartServiceIsolate::callbacks_mutex_;
 
-std::set<std::unique_ptr<DartServiceIsolate::ObservatoryServerStateCallback>>
+std::set<std::unique_ptr<DartServiceIsolate::DartVMServiceServerStateCallback>>
     DartServiceIsolate::callbacks_;
 
 void DartServiceIsolate::NotifyServerState(Dart_NativeArguments args) {
@@ -63,11 +63,11 @@ void DartServiceIsolate::NotifyServerState(Dart_NativeArguments args) {
     return;
   }
 
-  g_observatory_uri = uri;
+  g_vm_service_uri = uri;
 
   // Collect callbacks to fire in a separate collection and invoke them outside
   // the lock.
-  std::vector<DartServiceIsolate::ObservatoryServerStateCallback>
+  std::vector<DartServiceIsolate::DartVMServiceServerStateCallback>
       callbacks_to_fire;
   {
     std::scoped_lock lock(callbacks_mutex_);
@@ -82,13 +82,13 @@ void DartServiceIsolate::NotifyServerState(Dart_NativeArguments args) {
 }
 
 DartServiceIsolate::CallbackHandle DartServiceIsolate::AddServerStatusCallback(
-    const DartServiceIsolate::ObservatoryServerStateCallback& callback) {
+    const DartServiceIsolate::DartVMServiceServerStateCallback& callback) {
   if (!callback) {
     return 0;
   }
 
   auto callback_pointer =
-      std::make_unique<DartServiceIsolate::ObservatoryServerStateCallback>(
+      std::make_unique<DartServiceIsolate::DartVMServiceServerStateCallback>(
           callback);
 
   auto handle = reinterpret_cast<CallbackHandle>(callback_pointer.get());
@@ -98,8 +98,8 @@ DartServiceIsolate::CallbackHandle DartServiceIsolate::AddServerStatusCallback(
     callbacks_.insert(std::move(callback_pointer));
   }
 
-  if (!g_observatory_uri.empty()) {
-    callback(g_observatory_uri);
+  if (!g_vm_service_uri.empty()) {
+    callback(g_vm_service_uri);
   }
 
   return handle;
diff --git a/runtime/dart_service_isolate.h b/runtime/dart_service_isolate.h
index 754a963d1369398e83ddc06665df17069ee1be89..5078c28a78a83f87ee52a63c596887b8e540641c 100644
--- a/runtime/dart_service_isolate.h
+++ b/runtime/dart_service_isolate.h
@@ -27,11 +27,11 @@ class DartServiceIsolate {
   using CallbackHandle = ptrdiff_t;
 
   //----------------------------------------------------------------------------
-  /// A callback made by the Dart VM when the observatory is ready. The argument
-  /// indicates the observatory URI.
+  /// A callback made by the Dart VM when the VM Service is ready. The argument
+  /// indicates the VM Service URI.
   ///
-  using ObservatoryServerStateCallback =
-      std::function<void(const std::string& observatory_uri)>;
+  using DartVMServiceServerStateCallback =
+      std::function<void(const std::string& vm_service_uri)>;
 
   //----------------------------------------------------------------------------
   /// @brief      Start the service isolate. This call may only be made in the
@@ -68,19 +68,19 @@ class DartServiceIsolate {
                       char** error);
 
   //----------------------------------------------------------------------------
-  /// @brief      Add a callback that will get invoked when the observatory
-  ///             starts up. If the observatory has already started before this
+  /// @brief      Add a callback that will get invoked when the VM Service
+  ///             starts up. If the VM Service has already started before this
   ///             call is made, the callback is invoked immediately.
   ///
   ///             This method is thread safe.
   ///
-  /// @param[in]  callback  The callback with information about the observatory.
+  /// @param[in]  callback  The callback with information about the VM Service.
   ///
   /// @return     A handle for the callback that can be used later in
   ///             `RemoveServerStatusCallback`.
   ///
   [[nodiscard]] static CallbackHandle AddServerStatusCallback(
-      const ObservatoryServerStateCallback& callback);
+      const DartVMServiceServerStateCallback& callback);
 
   //----------------------------------------------------------------------------
   /// @brief      Removed a callback previously registered via
@@ -101,7 +101,7 @@ class DartServiceIsolate {
   static void Shutdown(Dart_NativeArguments args);
 
   static std::mutex callbacks_mutex_;
-  static std::set<std::unique_ptr<ObservatoryServerStateCallback>> callbacks_;
+  static std::set<std::unique_ptr<DartVMServiceServerStateCallback>> callbacks_;
 };
 
 }  // namespace flutter
diff --git a/runtime/dart_vm.cc b/runtime/dart_vm.cc
index b8b75719b3e4ebbc90f9f3465f8205644c36fee9..23e59cf93b0f2231cdbce90aee7b28b144fd3604 100644
--- a/runtime/dart_vm.cc
+++ b/runtime/dart_vm.cc
@@ -11,6 +11,7 @@
 
 #include "flutter/common/settings.h"
 #include "flutter/fml/compiler_specific.h"
+#include "flutter/fml/cpu_affinity.h"
 #include "flutter/fml/logging.h"
 #include "flutter/fml/mapping.h"
 #include "flutter/fml/size.h"
@@ -90,19 +91,20 @@ static const char* kDartStartPausedArgs[]{
     "--pause_isolates_on_start",
 };
 
-static const char* kDartDisableServiceAuthCodesArgs[]{
-    "--disable-service-auth-codes",
-};
-
 static const char* kDartEndlessTraceBufferArgs[]{
     "--timeline_recorder=endless",
 };
 
-// This is the same as --timeline_recorder=systrace.
 static const char* kDartSystraceTraceBufferArgs[] = {
-    "--systrace_timeline",
+    "--timeline_recorder=systrace",
 };
 
+static std::string DartFileRecorderArgs(const std::string& path) {
+  std::ostringstream oss;
+  oss << "--timeline_recorder=perfettofile:" << path;
+  return oss.str();
+}
+
 FML_ALLOW_UNUSED_TYPE
 static const char* kDartDefaultTraceStreamsArgs[]{
     "--timeline_streams=Dart,Embedder,GC",
@@ -217,22 +219,22 @@ static std::vector<const char*> ProfilingFlags(bool enable_profiling) {
   // flags.
   if (enable_profiling) {
     return {
-      // This is the default. But just be explicit.
-      "--profiler",
-          // This instructs the profiler to walk C++ frames, and to include
-          // them in the profile.
-          "--profile-vm",
+        // This is the default. But just be explicit.
+        "--profiler",
+        // This instructs the profiler to walk C++ frames, and to include
+        // them in the profile.
+        "--profile-vm",
 #if FML_OS_IOS && FML_ARCH_CPU_ARM_FAMILY && FML_ARCH_CPU_ARMEL
-          // Set the profiler interrupt period to 500Hz instead of the
-          // default 1000Hz on 32-bit iOS devices to reduce average and worst
-          // case frame build times.
-          //
-          // Note: profile_period is time in microseconds between sampling
-          // events, not frequency. Frequency is calculated 1/period (or
-          // 1,000,000 / 2,000 -> 500Hz in this case).
-          "--profile_period=2000",
+        // Set the profiler interrupt period to 500Hz instead of the
+        // default 1000Hz on 32-bit iOS devices to reduce average and worst
+        // case frame build times.
+        //
+        // Note: profile_period is time in microseconds between sampling
+        // events, not frequency. Frequency is calculated 1/period (or
+        // 1,000,000 / 2,000 -> 500Hz in this case).
+        "--profile_period=2000",
 #else
-          "--profile_period=1000",
+        "--profile_period=1000",
 #endif  // FML_OS_IOS && FML_ARCH_CPU_ARM_FAMILY && FML_ARCH_CPU_ARMEL
     };
   } else {
@@ -283,7 +285,9 @@ size_t DartVM::GetVMLaunchCount() {
 DartVM::DartVM(const std::shared_ptr<const DartVMData>& vm_data,
                std::shared_ptr<IsolateNameServer> isolate_name_server)
     : settings_(vm_data->GetSettings()),
-      concurrent_message_loop_(fml::ConcurrentMessageLoop::Create()),
+      concurrent_message_loop_(fml::ConcurrentMessageLoop::Create(
+          fml::EfficiencyCoreCount().value_or(
+              std::thread::hardware_concurrency()))),
       skia_concurrent_executor_(
           [runner = concurrent_message_loop_->GetTaskRunner()](
               const fml::closure& work) { runner->PostTask(work); }),
@@ -380,11 +384,6 @@ DartVM::DartVM(const std::shared_ptr<const DartVMData>& vm_data,
     PushBackAll(&args, kDartStartPausedArgs, fml::size(kDartStartPausedArgs));
   }
 
-  if (settings_.disable_service_auth_codes) {
-    PushBackAll(&args, kDartDisableServiceAuthCodesArgs,
-                fml::size(kDartDisableServiceAuthCodesArgs));
-  }
-
   if (settings_.endless_trace_buffer || settings_.trace_startup) {
     // If we are tracing startup, make sure the trace buffer is endless so we
     // don't lose early traces.
@@ -399,6 +398,14 @@ DartVM::DartVM(const std::shared_ptr<const DartVMData>& vm_data,
                 fml::size(kDartSystraceTraceStreamsArgs));
   }
 
+  std::string file_recorder_args;
+  if (!settings_.trace_to_file.empty()) {
+    file_recorder_args = DartFileRecorderArgs(settings_.trace_to_file);
+    args.push_back(file_recorder_args.c_str());
+    PushBackAll(&args, kDartSystraceTraceStreamsArgs,
+                fml::size(kDartSystraceTraceStreamsArgs));
+  }
+
   if (settings_.trace_startup) {
     PushBackAll(&args, kDartStartupTraceStreamsArgs,
                 fml::size(kDartStartupTraceStreamsArgs));
@@ -472,13 +479,15 @@ DartVM::DartVM(const std::shared_ptr<const DartVMData>& vm_data,
     // As this call is immediately after initialization of the Dart VM,
     // we are interested in only one timestamp.
     int64_t micros = Dart_TimelineGetMicros();
-    Dart_TimelineEvent("FlutterEngineMainEnter",     // label
-                       micros,                       // timestamp0
-                       micros,                       // timestamp1_or_async_id
-                       Dart_Timeline_Event_Instant,  // event type
-                       0,                            // argument_count
-                       nullptr,                      // argument_names
-                       nullptr                       // argument_values
+    Dart_RecordTimelineEvent("FlutterEngineMainEnter",  // label
+                             micros,                    // timestamp0
+                             micros,   // timestamp1_or_async_id
+                             0,        // flow_id_count
+                             nullptr,  // flow_ids
+                             Dart_Timeline_Event_Instant,  // event type
+                             0,                            // argument_count
+                             nullptr,                      // argument_names
+                             nullptr                       // argument_values
     );
   }
 
diff --git a/runtime/dart_vm_initializer.cc b/runtime/dart_vm_initializer.cc
index 521b26d04eb8efcf4f3a48df10d88e734c8d20b4..fbd941d11f8ce368c19773b6d83c9c37e48d712c 100644
--- a/runtime/dart_vm_initializer.cc
+++ b/runtime/dart_vm_initializer.cc
@@ -113,17 +113,17 @@ void DartVMInitializer::Initialize(Dart_InitializeParams* params,
 void DartVMInitializer::Cleanup() {
   FML_DCHECK(gDartInitialized);
 
-  // Dart_TimelineEvent is unsafe during a concurrent call to Dart_Cleanup
+  // Dart_RecordTimelineEvent is unsafe during a concurrent call to Dart_Cleanup
   // because Dart_Cleanup will destroy the timeline recorder.  Clear the
   // initialized flag so that future calls to LogDartTimelineEvent will not
-  // call Dart_TimelineEvent.
+  // call Dart_RecordTimelineEvent.
   //
   // Note that this is inherently racy.  If a thread sees that gDartInitialized
-  // is set and proceeds to call Dart_TimelineEvent shortly before another
-  // thread calls Dart_Cleanup, then the Dart_TimelineEvent call may crash
-  // if Dart_Cleanup deletes the timeline before Dart_TimelineEvent completes.
-  // In practice this is unlikely because Dart_Cleanup does significant other
-  // work before deleting the timeline.
+  // is set and proceeds to call Dart_RecordTimelineEvent shortly before another
+  // thread calls Dart_Cleanup, then the Dart_RecordTimelineEvent call may crash
+  // if Dart_Cleanup deletes the timeline before Dart_RecordTimelineEvent
+  // completes. In practice this is unlikely because Dart_Cleanup does
+  // significant other work before deleting the timeline.
   //
   // The engine can not safely guard Dart_Cleanup and LogDartTimelineEvent with
   // a lock due to the risk of deadlocks.  Dart_Cleanup waits for various
@@ -142,12 +142,15 @@ void DartVMInitializer::Cleanup() {
 void DartVMInitializer::LogDartTimelineEvent(const char* label,
                                              int64_t timestamp0,
                                              int64_t timestamp1_or_async_id,
+                                             intptr_t flow_id_count,
+                                             const int64_t* flow_ids,
                                              Dart_Timeline_Event_Type type,
                                              intptr_t argument_count,
                                              const char** argument_names,
                                              const char** argument_values) {
   if (gDartInitialized) {
-    Dart_TimelineEvent(label, timestamp0, timestamp1_or_async_id, type,
-                       argument_count, argument_names, argument_values);
+    Dart_RecordTimelineEvent(label, timestamp0, timestamp1_or_async_id,
+                             flow_id_count, flow_ids, type, argument_count,
+                             argument_names, argument_values);
   }
 }
diff --git a/runtime/dart_vm_initializer.h b/runtime/dart_vm_initializer.h
index 861a1b54c407f66dfaca69abd49923abd66f920a..9889d2402ce404bb8210835320e48688d86ceea4 100644
--- a/runtime/dart_vm_initializer.h
+++ b/runtime/dart_vm_initializer.h
@@ -19,6 +19,8 @@ class DartVMInitializer {
   static void LogDartTimelineEvent(const char* label,
                                    int64_t timestamp0,
                                    int64_t timestamp1_or_async_id,
+                                   intptr_t flow_id_count,
+                                   const int64_t* flow_ids,
                                    Dart_Timeline_Event_Type type,
                                    intptr_t argument_count,
                                    const char** argument_names,
diff --git a/runtime/dart_vm_lifecycle.h b/runtime/dart_vm_lifecycle.h
index c5b016be89cad2672822b96edb2949d86a48a362..0b7189fe5dc74496179c6011b356d11256de80b2 100644
--- a/runtime/dart_vm_lifecycle.h
+++ b/runtime/dart_vm_lifecycle.h
@@ -71,6 +71,7 @@ class DartVMRef {
     return vm_.get();
   }
 
+  // NOLINTNEXTLINE(google-runtime-operator)
   DartVM* operator&() {
     FML_DCHECK(vm_);
     return vm_.get();
diff --git a/runtime/fixtures/runtime_test.dart b/runtime/fixtures/runtime_test.dart
index 013083fb2e32e133d45d01cda4fe7a1522f8e6d0..416902a815186725c5426ecbf87cede6e8b584f2 100644
--- a/runtime/fixtures/runtime_test.dart
+++ b/runtime/fixtures/runtime_test.dart
@@ -188,3 +188,34 @@ void mainForPluginRegistrantTest() {
     passMessage('_PluginRegistrant.register() was not called');
   }
 }
+
+@pragma('vm:entry-point')
+void mainForPlatformIsolates() {
+  passMessage('Platform isolate is ready');
+}
+
+@pragma('vm:entry-point')
+void emptyMain(args) {}
+
+@pragma('vm:entry-point')
+Function createEntryPointForPlatIsoSendAndRecvTest() {
+  final port = RawReceivePort();
+  port.handler = (message) {
+    port.close();
+    (message as SendPort).send('Hello from root isolate!');
+  };
+  final SendPort sendPort = port.sendPort;
+  return () {
+    final replyPort = RawReceivePort();
+    replyPort.handler = (message) {
+      replyPort.close();
+      passMessage('Platform isolate received: $message');
+    };
+    sendPort.send(replyPort.sendPort);
+  };
+}
+
+@pragma('vm:entry-point')
+void mainForPlatformIsolatesThrowError() {
+  throw 'Error from platform isolate';
+}
diff --git a/runtime/isolate_configuration.cc b/runtime/isolate_configuration.cc
index 54eb6c35ee3c4ad14342848bd943f9757b822586..ffbc28e03549628207893d77888d94dab5996600 100644
--- a/runtime/isolate_configuration.cc
+++ b/runtime/isolate_configuration.cc
@@ -43,6 +43,7 @@ class AppSnapshotIsolateConfiguration final : public IsolateConfiguration {
 
 class KernelIsolateConfiguration : public IsolateConfiguration {
  public:
+  // The kernel mapping may be nullptr if reusing the group's loaded kernel.
   explicit KernelIsolateConfiguration(
       std::unique_ptr<const fml::Mapping> kernel)
       : kernel_(std::move(kernel)) {}
@@ -202,12 +203,17 @@ PrepareKernelMappings(const std::vector<std::string>& kernel_pieces_paths,
 std::unique_ptr<IsolateConfiguration> IsolateConfiguration::InferFromSettings(
     const Settings& settings,
     const std::shared_ptr<AssetManager>& asset_manager,
-    const fml::RefPtr<fml::TaskRunner>& io_worker) {
+    const fml::RefPtr<fml::TaskRunner>& io_worker,
+    IsolateLaunchType launch_type) {
   // Running in AOT mode.
   if (DartVM::IsRunningPrecompiledCode()) {
     return CreateForAppSnapshot();
   }
 
+  if (launch_type == IsolateLaunchType::kExistingGroup) {
+    return CreateForKernel(nullptr);
+  }
+
   if (settings.application_kernels) {
     return CreateForKernelList(settings.application_kernels());
   }
diff --git a/runtime/isolate_configuration.h b/runtime/isolate_configuration.h
index 46f9c9368c2d307eb127e6507b045eca463d2b3d..05e2270b266d7ec6112970f75ff212c3ca5bb6c8 100644
--- a/runtime/isolate_configuration.h
+++ b/runtime/isolate_configuration.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_RUNTIME_ISOLATE_CONFIGURATION_H_
-#define FLUTTER_SHELL_RUNTIME_ISOLATE_CONFIGURATION_H_
+#ifndef FLUTTER_RUNTIME_ISOLATE_CONFIGURATION_H_
+#define FLUTTER_RUNTIME_ISOLATE_CONFIGURATION_H_
 
 #include <future>
 #include <memory>
@@ -19,6 +19,17 @@
 
 namespace flutter {
 
+/// Describes whether the isolate is part of a group or not.
+///
+/// If the isolate is part of a group, it avoids reloading the kernel snapshot.
+enum class IsolateLaunchType {
+  /// The isolate is launched as a solo isolate or to start a new group.
+  kNewGroup,
+  /// The isolate is launched as part of a group, and avoids reloading the
+  /// kernel snapshot.
+  kExistingGroup,
+};
+
 //------------------------------------------------------------------------------
 /// @brief      An isolate configuration is a collection of snapshots and asset
 ///             managers that the engine will use to configure the isolate
@@ -57,6 +68,10 @@ class IsolateConfiguration {
   /// @param[in]  io_worker      An optional IO worker. Specify `nullptr` if a
   ///                            worker should not be used or one is not
   ///                            available.
+  /// @param[in]  launch_type    Whether the isolate is launching to form a new
+  ///                            group or as part of an existing group. If it is
+  ///                            part of an existing group, the isolate will
+  ///                            reuse resources if it can.
   ///
   /// @return     An isolate configuration if one can be inferred from the
   ///             settings. If not, returns `nullptr`.
@@ -64,7 +79,8 @@ class IsolateConfiguration {
   [[nodiscard]] static std::unique_ptr<IsolateConfiguration> InferFromSettings(
       const Settings& settings,
       const std::shared_ptr<AssetManager>& asset_manager = nullptr,
-      const fml::RefPtr<fml::TaskRunner>& io_worker = nullptr);
+      const fml::RefPtr<fml::TaskRunner>& io_worker = nullptr,
+      IsolateLaunchType launch_type = IsolateLaunchType::kNewGroup);
 
   //----------------------------------------------------------------------------
   /// @brief      Creates an AOT isolate configuration using snapshot symbols
@@ -168,4 +184,4 @@ class IsolateConfiguration {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_RUNTIME_ISOLATE_CONFIGURATION_H_
+#endif  // FLUTTER_RUNTIME_ISOLATE_CONFIGURATION_H_
diff --git a/runtime/platform_data.h b/runtime/platform_data.h
index ca7b683a1e8e6a7e84d84c89e7e4bcd874286a2d..f7f00e1380b7699ccc5f5d288b87701ee37c1fde 100644
--- a/runtime/platform_data.h
+++ b/runtime/platform_data.h
@@ -10,27 +10,31 @@
 #include <vector>
 
 #include "flutter/lib/ui/window/viewport_metrics.h"
+#include "flutter/shell/common/display.h"
 
 namespace flutter {
 
 //------------------------------------------------------------------------------
-/// The struct of platform-specific data used for initializing ui.Window.
+/// The struct of platform-specific data used for initializing
+/// ui.PlatformDispatcher.
 ///
-/// framework may request data from ui.Window before platform is properly
-/// configured. Engine this struct to set the desired default value for
-/// ui.Window when creating Shell before platform is ready to send the real
+/// The framework may request data from ui.PlatformDispatcher before the
+/// platform is properly configured. When creating the Shell, the engine sets
+/// this struct to default values until the platform is ready to send the real
 /// data.
 ///
 /// See also:
 ///
 ///  * flutter::Shell::Create, which takes a platform_data to initialize the
-///    ui.Window attached to it.
+///    ui.PlatformDispatcher attached to it.
 struct PlatformData {
   PlatformData();
 
   ~PlatformData();
 
-  ViewportMetrics viewport_metrics;
+  // A map from view IDs of existing views to their viewport metrics.
+  std::unordered_map<int64_t, ViewportMetrics> viewport_metrics_for_views;
+
   std::string language_code;
   std::string country_code;
   std::string script_code;
@@ -41,6 +45,7 @@ struct PlatformData {
   bool semantics_enabled = false;
   bool assistive_technology_enabled = false;
   int32_t accessibility_feature_flags_ = 0;
+  std::vector<DisplayData> displays;
 };
 
 }  // namespace flutter
diff --git a/runtime/platform_isolate_manager.cc b/runtime/platform_isolate_manager.cc
new file mode 100644
index 0000000000000000000000000000000000000000..03a41c9a09d3e3268f014582e6a0d2a0d36dff45
--- /dev/null
+++ b/runtime/platform_isolate_manager.cc
@@ -0,0 +1,70 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/runtime/platform_isolate_manager.h"
+
+#include "flutter/runtime/dart_isolate.h"
+
+namespace flutter {
+
+bool PlatformIsolateManager::HasShutdown() {
+  // TODO(flutter/flutter#136314): Assert that we're on the platform thread.
+  std::scoped_lock lock(lock_);
+  return is_shutdown_;
+}
+
+bool PlatformIsolateManager::HasShutdownMaybeFalseNegative() {
+  std::scoped_lock lock(lock_);
+  return is_shutdown_;
+}
+
+bool PlatformIsolateManager::RegisterPlatformIsolate(Dart_Isolate isolate) {
+  std::scoped_lock lock(lock_);
+  if (is_shutdown_) {
+    // It's possible shutdown occured while we were trying to aquire the lock.
+    return false;
+  }
+  FML_DCHECK(platform_isolates_.find(isolate) == platform_isolates_.end());
+  platform_isolates_.insert(isolate);
+  return true;
+}
+
+void PlatformIsolateManager::RemovePlatformIsolate(Dart_Isolate isolate) {
+  // This method is only called by DartIsolate::OnShutdownCallback() during
+  // isolate shutdown. This can happen either during the ordinary platform
+  // isolate shutdown, or during ShutdownPlatformIsolates(). In either case
+  // we're on the platform thread.
+  // TODO(flutter/flutter#136314): Assert that we're on the platform thread.
+  // Need a method that works for ShutdownPlatformIsolates() too.
+  std::scoped_lock lock(lock_);
+  if (is_shutdown_) {
+    // Removal during ShutdownPlatformIsolates. Ignore, to avoid modifying
+    // platform_isolates_ during iteration.
+    FML_DCHECK(platform_isolates_.empty());
+    return;
+  }
+  FML_DCHECK(platform_isolates_.find(isolate) != platform_isolates_.end());
+  platform_isolates_.erase(isolate);
+}
+
+void PlatformIsolateManager::ShutdownPlatformIsolates() {
+  // TODO(flutter/flutter#136314): Assert that we're on the platform thread.
+  // There's no current UIDartState here, so platform_isolate.cc's method won't
+  // work.
+  std::scoped_lock lock(lock_);
+  is_shutdown_ = true;
+  std::unordered_set<Dart_Isolate> platform_isolates;
+  std::swap(platform_isolates_, platform_isolates);
+  for (Dart_Isolate isolate : platform_isolates) {
+    Dart_EnterIsolate(isolate);
+    Dart_ShutdownIsolate();
+  }
+}
+
+bool PlatformIsolateManager::IsRegisteredForTestingOnly(Dart_Isolate isolate) {
+  std::scoped_lock lock(lock_);
+  return platform_isolates_.find(isolate) != platform_isolates_.end();
+}
+
+}  // namespace flutter
diff --git a/runtime/platform_isolate_manager.h b/runtime/platform_isolate_manager.h
new file mode 100644
index 0000000000000000000000000000000000000000..81fb477375c0bd5e030b309a32516a2077803895
--- /dev/null
+++ b/runtime/platform_isolate_manager.h
@@ -0,0 +1,56 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_RUNTIME_PLATFORM_ISOLATE_MANAGER_H_
+#define FLUTTER_RUNTIME_PLATFORM_ISOLATE_MANAGER_H_
+
+#include <atomic>
+#include <mutex>
+#include <unordered_set>
+
+#include "third_party/dart/runtime/include/dart_api.h"
+
+namespace flutter {
+
+/// Maintains a list of registered platform isolates, so that they can be
+/// proactively shutdown as a group during shell shutdown.
+class PlatformIsolateManager {
+ public:
+  /// Returns whether the PlatformIsolateManager is shutdown. New isolates
+  /// cannot be registered after the manager is shutdown. Must be called on the
+  /// platform thread.
+  bool HasShutdown();
+
+  /// Returns whether the PlatformIsolateManager is shutdown. New isolates
+  /// cannot be registered after the manager is shutdown. Callable from any
+  /// thread. The result may be obsolete immediately after the call.
+  bool HasShutdownMaybeFalseNegative();
+
+  /// Register an isolate in the list of platform isolates. Callable from any
+  /// thread.
+  bool RegisterPlatformIsolate(Dart_Isolate isolate);
+
+  /// Remove an isolate from the list of platform isolates. Must be called from
+  /// the platform thread.
+  void RemovePlatformIsolate(Dart_Isolate isolate);
+
+  /// Shuts down all registered isolates, and the manager itself. Must be called
+  /// from the platform thread.
+  void ShutdownPlatformIsolates();
+
+  /// Returns whether an isolate is registered. For testing only. Callable from
+  /// any thread.
+  bool IsRegisteredForTestingOnly(Dart_Isolate isolate);
+
+ private:
+  // This lock must be recursive because ShutdownPlatformIsolates indirectly
+  // calls RemovePlatformIsolate.
+  std::recursive_mutex lock_;
+  std::unordered_set<Dart_Isolate> platform_isolates_;
+  bool is_shutdown_ = false;
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_RUNTIME_PLATFORM_ISOLATE_MANAGER_H_
diff --git a/runtime/platform_isolate_manager_unittests.cc b/runtime/platform_isolate_manager_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..312beff516999cd01a55da6426698ca59f13273e
--- /dev/null
+++ b/runtime/platform_isolate_manager_unittests.cc
@@ -0,0 +1,268 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/runtime/dart_vm.h"
+#include "flutter/runtime/dart_vm_lifecycle.h"
+#include "flutter/runtime/platform_isolate_manager.h"
+#include "flutter/testing/fixture_test.h"
+#include "flutter/testing/testing.h"
+
+namespace flutter {
+namespace testing {
+
+struct IsolateData {
+  PlatformIsolateManager* mgr;
+  Dart_Isolate isolate = nullptr;
+  bool is_shutdown = false;
+  bool was_registered = false;
+  explicit IsolateData(PlatformIsolateManager* _mgr) : mgr(_mgr) {}
+};
+
+// The IsolateDataMap is a map from Dart_Isolate to a *vector* of IsolateData,
+// because Dart_Isolates are frequently reused after shutdown, and we want the
+// IsolateData objects to live as long as the map itself. The last element of
+// the vector is always the currently active IsolateData, and the other elements
+// refer to isolates that have been shutdown.
+using IsolateDataMap =
+    std::unordered_map<Dart_Isolate, std::vector<std::unique_ptr<IsolateData>>>;
+
+// Using a thread local isolate data map so that MultithreadedCreation test
+// can avoid using locks while creating isolates on multiple threads. A lock
+// would sync up the threads, so would defeat the purpose of the test.
+static thread_local std::unique_ptr<IsolateDataMap> isolate_data_map_;
+
+class PlatformIsolateManagerTest : public FixtureTest {
+ public:
+  PlatformIsolateManagerTest() {}
+
+  void TestWithRootIsolate(const std::function<void()>& test) {
+    ASSERT_FALSE(DartVMRef::IsInstanceRunning());
+    auto settings = CreateSettingsForFixture();
+    auto vm_ref = DartVMRef::Create(settings);
+    ASSERT_TRUE(vm_ref);
+    auto vm_data = vm_ref.GetVMData();
+    ASSERT_TRUE(vm_data);
+
+    TaskRunners task_runners(GetCurrentTestName(),    //
+                             GetCurrentTaskRunner(),  //
+                             GetCurrentTaskRunner(),  //
+                             GetCurrentTaskRunner(),  //
+                             GetCurrentTaskRunner()   //
+    );
+
+    auto isolate_configuration =
+        IsolateConfiguration::InferFromSettings(settings);
+
+    UIDartState::Context context(task_runners);
+    context.advisory_script_uri = "main.dart";
+    context.advisory_script_entrypoint = "main";
+    auto weak_isolate = DartIsolate::CreateRunningRootIsolate(
+        vm_data->GetSettings(),              // settings
+        vm_data->GetIsolateSnapshot(),       // isolate snapshot
+        nullptr,                             // platform configuration
+        DartIsolate::Flags{},                // flags
+        nullptr,                             // root_isolate_create_callback
+        settings.isolate_create_callback,    // isolate create callback
+        settings.isolate_shutdown_callback,  // isolate shutdown callback
+        "main",                              // dart entrypoint
+        std::nullopt,                        // dart entrypoint library
+        {},                                  // dart entrypoint arguments
+        std::move(isolate_configuration),    // isolate configuration
+        context                              // engine context
+    );
+    root_isolate_ = weak_isolate.lock()->isolate();
+    ASSERT_TRUE(root_isolate_);
+
+    test();
+
+    Dart_EnterIsolate(root_isolate_);
+    Dart_ShutdownIsolate();
+  }
+
+  Dart_Isolate CreateAndRegisterIsolate(PlatformIsolateManager* mgr) {
+    if (isolate_data_map_.get() == nullptr) {
+      isolate_data_map_.reset(new IsolateDataMap());
+    }
+
+    IsolateData* isolate_data = new IsolateData(mgr);
+    char* error = nullptr;
+    Dart_Isolate isolate =
+        Dart_CreateIsolateInGroup(root_isolate_, "TestIsolate", OnShutdown,
+                                  nullptr, isolate_data, &error);
+    isolate_data->isolate = isolate;
+    EXPECT_TRUE(isolate);
+    Dart_ExitIsolate();
+
+    (*isolate_data_map_.get())[isolate].push_back(
+        std::unique_ptr<IsolateData>(isolate_data));
+    isolate_data->was_registered = mgr->RegisterPlatformIsolate(isolate);
+
+    return isolate;
+  }
+
+  bool IsolateIsShutdown(Dart_Isolate isolate) {
+    EXPECT_EQ(1u, isolate_data_map_.get()->count(isolate));
+    EXPECT_LT(0u, (*isolate_data_map_.get())[isolate].size());
+    return (*isolate_data_map_.get())[isolate].back()->is_shutdown;
+  }
+
+  bool IsolateWasRegistered(Dart_Isolate isolate) {
+    EXPECT_EQ(1u, isolate_data_map_.get()->count(isolate));
+    EXPECT_LT(0u, (*isolate_data_map_.get())[isolate].size());
+    return (*isolate_data_map_.get())[isolate].back()->was_registered;
+  }
+
+ private:
+  Dart_Isolate root_isolate_ = nullptr;
+
+  static void OnShutdown(void*, void* raw_isolate_data) {
+    IsolateData* isolate_data =
+        reinterpret_cast<IsolateData*>(raw_isolate_data);
+    EXPECT_TRUE(isolate_data->isolate);
+    EXPECT_FALSE(isolate_data->is_shutdown);
+    isolate_data->is_shutdown = true;
+    if (isolate_data->was_registered) {
+      isolate_data->mgr->RemovePlatformIsolate(isolate_data->isolate);
+    }
+  }
+
+  FML_DISALLOW_COPY_AND_ASSIGN(PlatformIsolateManagerTest);
+};
+
+TEST_F(PlatformIsolateManagerTest, OrdinaryFlow) {
+  TestWithRootIsolate([this]() {
+    PlatformIsolateManager mgr;
+    EXPECT_FALSE(mgr.HasShutdown());
+    EXPECT_FALSE(mgr.HasShutdownMaybeFalseNegative());
+
+    Dart_Isolate isolateA = CreateAndRegisterIsolate(&mgr);
+    ASSERT_TRUE(isolateA);
+    EXPECT_FALSE(IsolateIsShutdown(isolateA));
+    EXPECT_TRUE(IsolateWasRegistered(isolateA));
+    EXPECT_TRUE(mgr.IsRegisteredForTestingOnly(isolateA));
+
+    Dart_Isolate isolateB = CreateAndRegisterIsolate(&mgr);
+    ASSERT_TRUE(isolateB);
+    EXPECT_FALSE(IsolateIsShutdown(isolateB));
+    EXPECT_TRUE(IsolateWasRegistered(isolateB));
+    EXPECT_TRUE(mgr.IsRegisteredForTestingOnly(isolateB));
+
+    mgr.ShutdownPlatformIsolates();
+    EXPECT_TRUE(mgr.HasShutdown());
+    EXPECT_TRUE(mgr.HasShutdownMaybeFalseNegative());
+
+    EXPECT_TRUE(IsolateIsShutdown(isolateA));
+    EXPECT_FALSE(mgr.IsRegisteredForTestingOnly(isolateA));
+    EXPECT_TRUE(IsolateIsShutdown(isolateB));
+    EXPECT_FALSE(mgr.IsRegisteredForTestingOnly(isolateB));
+  });
+}
+
+TEST_F(PlatformIsolateManagerTest, EarlyShutdown) {
+  TestWithRootIsolate([this]() {
+    PlatformIsolateManager mgr;
+    EXPECT_FALSE(mgr.HasShutdown());
+
+    Dart_Isolate isolateA = CreateAndRegisterIsolate(&mgr);
+    ASSERT_TRUE(isolateA);
+    EXPECT_FALSE(IsolateIsShutdown(isolateA));
+    EXPECT_TRUE(IsolateWasRegistered(isolateA));
+    EXPECT_TRUE(mgr.IsRegisteredForTestingOnly(isolateA));
+
+    Dart_Isolate isolateB = CreateAndRegisterIsolate(&mgr);
+    ASSERT_TRUE(isolateB);
+    EXPECT_FALSE(IsolateIsShutdown(isolateB));
+    EXPECT_TRUE(IsolateWasRegistered(isolateB));
+    EXPECT_TRUE(mgr.IsRegisteredForTestingOnly(isolateB));
+
+    Dart_EnterIsolate(isolateA);
+    Dart_ShutdownIsolate();
+    EXPECT_TRUE(IsolateIsShutdown(isolateA));
+    EXPECT_FALSE(mgr.IsRegisteredForTestingOnly(isolateA));
+
+    Dart_EnterIsolate(isolateB);
+    Dart_ShutdownIsolate();
+    EXPECT_TRUE(IsolateIsShutdown(isolateB));
+    EXPECT_FALSE(mgr.IsRegisteredForTestingOnly(isolateB));
+
+    mgr.ShutdownPlatformIsolates();
+    EXPECT_TRUE(mgr.HasShutdown());
+
+    EXPECT_TRUE(IsolateIsShutdown(isolateA));
+    EXPECT_FALSE(mgr.IsRegisteredForTestingOnly(isolateA));
+    EXPECT_TRUE(IsolateIsShutdown(isolateB));
+    EXPECT_FALSE(mgr.IsRegisteredForTestingOnly(isolateB));
+  });
+}
+
+TEST_F(PlatformIsolateManagerTest, RegistrationAfterShutdown) {
+  TestWithRootIsolate([this]() {
+    PlatformIsolateManager mgr;
+    EXPECT_FALSE(mgr.HasShutdown());
+
+    Dart_Isolate isolateA = CreateAndRegisterIsolate(&mgr);
+    ASSERT_TRUE(isolateA);
+    EXPECT_FALSE(IsolateIsShutdown(isolateA));
+    EXPECT_TRUE(IsolateWasRegistered(isolateA));
+    EXPECT_TRUE(mgr.IsRegisteredForTestingOnly(isolateA));
+
+    mgr.ShutdownPlatformIsolates();
+    EXPECT_TRUE(mgr.HasShutdown());
+
+    EXPECT_TRUE(IsolateIsShutdown(isolateA));
+    EXPECT_FALSE(mgr.IsRegisteredForTestingOnly(isolateA));
+
+    Dart_Isolate isolateB = CreateAndRegisterIsolate(&mgr);
+    ASSERT_TRUE(isolateB);
+    EXPECT_FALSE(IsolateIsShutdown(isolateB));
+    EXPECT_FALSE(IsolateWasRegistered(isolateB));
+    EXPECT_FALSE(mgr.IsRegisteredForTestingOnly(isolateB));
+
+    Dart_EnterIsolate(isolateB);
+    Dart_ShutdownIsolate();
+    EXPECT_TRUE(IsolateIsShutdown(isolateB));
+    EXPECT_FALSE(mgr.IsRegisteredForTestingOnly(isolateB));
+  });
+}
+
+TEST_F(PlatformIsolateManagerTest, MultithreadedCreation) {
+  // Try to generate race conditions by creating Isolates on multiple threads,
+  // while shutting down the manager.
+  TestWithRootIsolate([this]() {
+    PlatformIsolateManager mgr;
+    EXPECT_FALSE(mgr.HasShutdown());
+
+    std::atomic<bool> test_finished = false;
+    std::vector<std::thread> threads;
+    threads.reserve(10);
+    for (int i = 0; i < 10; ++i) {
+      threads.push_back(std::thread([this, &mgr, &test_finished]() {
+        for (int j = 0; j < 100; ++j) {
+          Dart_Isolate isolate = CreateAndRegisterIsolate(&mgr);
+          ASSERT_TRUE(isolate);
+
+          if (!IsolateWasRegistered(isolate)) {
+            Dart_EnterIsolate(isolate);
+            Dart_ShutdownIsolate();
+          }
+        }
+        while (!test_finished.load()) {
+          // Wait for the test to finish, to avoid prematurely destroying thread
+          // local isolate_data_map_.
+        }
+      }));
+    }
+
+    mgr.ShutdownPlatformIsolates();
+    EXPECT_TRUE(mgr.HasShutdown());
+
+    test_finished = true;
+    for (auto& thread : threads) {
+      thread.join();
+    }
+  });
+}
+
+}  // namespace testing
+}  // namespace flutter
diff --git a/runtime/runtime_controller.cc b/runtime/runtime_controller.cc
index 9870d5e7804cac6949eb105dee2346bc702ee731..b967b9cde9912e446b1d4b8d13d9d34426647cbc 100644
--- a/runtime/runtime_controller.cc
+++ b/runtime/runtime_controller.cc
@@ -6,13 +6,14 @@
 
 #include <utility>
 
+#include "flutter/common/constants.h"
+#include "flutter/common/settings.h"
 #include "flutter/fml/message_loop.h"
 #include "flutter/fml/trace_event.h"
 #include "flutter/lib/ui/compositing/scene.h"
 #include "flutter/lib/ui/ui_dart_state.h"
 #include "flutter/lib/ui/window/platform_configuration.h"
 #include "flutter/lib/ui/window/viewport_metrics.h"
-#include "flutter/lib/ui/window/window.h"
 #include "flutter/runtime/dart_isolate_group_data.h"
 #include "flutter/runtime/isolate_configuration.h"
 #include "flutter/runtime/runtime_delegate.h"
@@ -46,8 +47,8 @@ RuntimeController::RuntimeController(
 
 std::unique_ptr<RuntimeController> RuntimeController::Spawn(
     RuntimeDelegate& p_client,
-    std::string advisory_script_uri,
-    std::string advisory_script_entrypoint,
+    const std::string& advisory_script_uri,
+    const std::string& advisory_script_entrypoint,
     const std::function<void(int64_t)>& p_idle_notification_callback,
     const fml::closure& p_isolate_create_callback,
     const fml::closure& p_isolate_shutdown_callback,
@@ -56,13 +57,18 @@ std::unique_ptr<RuntimeController> RuntimeController::Spawn(
     fml::WeakPtr<ImageDecoder> image_decoder,
     fml::WeakPtr<ImageGeneratorRegistry> image_generator_registry,
     fml::TaskRunnerAffineWeakPtr<SnapshotDelegate> snapshot_delegate) const {
-  UIDartState::Context spawned_context{
-      context_.task_runners,          std::move(snapshot_delegate),
-      std::move(io_manager),          context_.unref_queue,
-      std::move(image_decoder),       std::move(image_generator_registry),
-      std::move(advisory_script_uri), std::move(advisory_script_entrypoint),
-      context_.volatile_path_tracker, context_.concurrent_task_runner,
-      context_.enable_impeller};
+  UIDartState::Context spawned_context{context_.task_runners,
+                                       std::move(snapshot_delegate),
+                                       std::move(io_manager),
+                                       context_.unref_queue,
+                                       std::move(image_decoder),
+                                       std::move(image_generator_registry),
+                                       advisory_script_uri,
+                                       advisory_script_entrypoint,
+                                       context_.volatile_path_tracker,
+                                       context_.concurrent_task_runner,
+                                       context_.enable_impeller,
+                                       context_.runtime_stage_backend};
   auto result =
       std::make_unique<RuntimeController>(p_client,                      //
                                           vm_,                           //
@@ -74,7 +80,6 @@ std::unique_ptr<RuntimeController> RuntimeController::Spawn(
                                           p_persistent_isolate_data,     //
                                           spawned_context);              //
   result->spawning_isolate_ = root_isolate_;
-  result->platform_data_.viewport_metrics = ViewportMetrics();
   return result;
 }
 
@@ -113,26 +118,57 @@ std::unique_ptr<RuntimeController> RuntimeController::Clone() const {
 }
 
 bool RuntimeController::FlushRuntimeStateToIsolate() {
-  return SetViewportMetrics(platform_data_.viewport_metrics) &&
-         SetLocales(platform_data_.locale_data) &&
+  FML_DCHECK(!has_flushed_runtime_state_)
+      << "FlushRuntimeStateToIsolate is called more than once somehow.";
+  has_flushed_runtime_state_ = true;
+  for (auto const& [view_id, viewport_metrics] :
+       platform_data_.viewport_metrics_for_views) {
+    if (!AddView(view_id, viewport_metrics)) {
+      return false;
+    }
+  }
+  return SetLocales(platform_data_.locale_data) &&
          SetSemanticsEnabled(platform_data_.semantics_enabled) &&
          SetAccessibilityFeatures(
              platform_data_.accessibility_feature_flags_) &&
          SetUserSettingsData(platform_data_.user_settings_data) &&
-         SetLifecycleState(platform_data_.lifecycle_state);
+         SetInitialLifecycleState(platform_data_.lifecycle_state) &&
+         SetDisplays(platform_data_.displays);
 }
 
-bool RuntimeController::SetViewportMetrics(const ViewportMetrics& metrics) {
-  platform_data_.viewport_metrics = metrics;
-
+bool RuntimeController::AddView(int64_t view_id,
+                                const ViewportMetrics& view_metrics) {
+  platform_data_.viewport_metrics_for_views[view_id] = view_metrics;
   if (auto* platform_configuration = GetPlatformConfigurationIfAvailable()) {
-    platform_configuration->get_window(0)->UpdateWindowMetrics(metrics);
+    platform_configuration->AddView(view_id, view_metrics);
+
     return true;
   }
 
   return false;
 }
 
+bool RuntimeController::RemoveView(int64_t view_id) {
+  platform_data_.viewport_metrics_for_views.erase(view_id);
+  if (auto* platform_configuration = GetPlatformConfigurationIfAvailable()) {
+    return platform_configuration->RemoveView(view_id);
+  }
+
+  return false;
+}
+
+bool RuntimeController::SetViewportMetrics(int64_t view_id,
+                                           const ViewportMetrics& metrics) {
+  TRACE_EVENT0("flutter", "SetViewportMetrics");
+
+  platform_data_.viewport_metrics_for_views[view_id] = metrics;
+  if (auto* platform_configuration = GetPlatformConfigurationIfAvailable()) {
+    return platform_configuration->UpdateViewMetrics(view_id, metrics);
+  }
+
+  return false;
+}
+
 bool RuntimeController::SetLocales(
     const std::vector<std::string>& locale_data) {
   platform_data_.locale_data = locale_data;
@@ -157,11 +193,11 @@ bool RuntimeController::SetUserSettingsData(const std::string& data) {
   return false;
 }
 
-bool RuntimeController::SetLifecycleState(const std::string& data) {
+bool RuntimeController::SetInitialLifecycleState(const std::string& data) {
   platform_data_.lifecycle_state = data;
 
   if (auto* platform_configuration = GetPlatformConfigurationIfAvailable()) {
-    platform_configuration->UpdateLifecycleState(
+    platform_configuration->UpdateInitialLifecycleState(
         platform_data_.lifecycle_state);
     return true;
   }
@@ -194,6 +230,7 @@ bool RuntimeController::SetAccessibilityFeatures(int32_t flags) {
 
 bool RuntimeController::BeginFrame(fml::TimePoint frame_time,
                                    uint64_t frame_number) {
+  MarkAsFrameBorder();
   if (auto* platform_configuration = GetPlatformConfigurationIfAvailable()) {
     platform_configuration->BeginFrame(frame_time, frame_number);
     return true;
@@ -271,20 +308,20 @@ bool RuntimeController::DispatchPointerDataPacket(
     const PointerDataPacket& packet) {
   if (auto* platform_configuration = GetPlatformConfigurationIfAvailable()) {
     TRACE_EVENT0("flutter", "RuntimeController::DispatchPointerDataPacket");
-    platform_configuration->get_window(0)->DispatchPointerDataPacket(packet);
+    platform_configuration->DispatchPointerDataPacket(packet);
     return true;
   }
 
   return false;
 }
 
-bool RuntimeController::DispatchSemanticsAction(int32_t id,
+bool RuntimeController::DispatchSemanticsAction(int32_t node_id,
                                                 SemanticsAction action,
                                                 fml::MallocMapping args) {
   TRACE_EVENT1("flutter", "RuntimeController::DispatchSemanticsAction", "mode",
                "basic");
   if (auto* platform_configuration = GetPlatformConfigurationIfAvailable()) {
-    platform_configuration->DispatchSemanticsAction(id, action,
+    platform_configuration->DispatchSemanticsAction(node_id, action,
                                                     std::move(args));
     return true;
   }
@@ -308,9 +345,37 @@ void RuntimeController::ScheduleFrame() {
   client_.ScheduleFrame();
 }
 
+void RuntimeController::EndWarmUpFrame() {
+  client_.OnAllViewsRendered();
+}
+
 // |PlatformConfigurationClient|
-void RuntimeController::Render(Scene* scene) {
-  client_.Render(scene->takeLayerTree());
+void RuntimeController::Render(int64_t view_id,
+                               Scene* scene,
+                               double width,
+                               double height) {
+  const ViewportMetrics* view_metrics =
+      UIDartState::Current()->platform_configuration()->GetMetrics(view_id);
+  if (view_metrics == nullptr) {
+    return;
+  }
+  client_.Render(view_id, scene->takeLayerTree(width, height),
+                 view_metrics->device_pixel_ratio);
+  rendered_views_during_frame_.insert(view_id);
+  CheckIfAllViewsRendered();
+}
+
+void RuntimeController::MarkAsFrameBorder() {
+  rendered_views_during_frame_.clear();
+}
+
+void RuntimeController::CheckIfAllViewsRendered() {
+  if (rendered_views_during_frame_.size() != 0 &&
+      rendered_views_during_frame_.size() ==
+          platform_data_.viewport_metrics_for_views.size()) {
+    client_.OnAllViewsRendered();
+    MarkAsFrameBorder();
+  }
 }
 
 // |PlatformConfigurationClient|
@@ -360,6 +425,11 @@ RuntimeController::ComputePlatformResolvedLocale(
   return client_.ComputePlatformResolvedLocale(supported_locale_data);
 }
 
+// |PlatformConfigurationClient|
+void RuntimeController::SendChannelUpdate(std::string name, bool listening) {
+  client_.SendChannelUpdate(std::move(name), listening);
+}
+
 Dart_Port RuntimeController::GetMainPort() {
   std::shared_ptr<DartIsolate> root_isolate = root_isolate_.lock();
   return root_isolate ? root_isolate->main_port() : ILLEGAL_PORT;
@@ -493,6 +563,26 @@ void RuntimeController::RequestDartDeferredLibrary(intptr_t loading_unit_id) {
   return client_.RequestDartDeferredLibrary(loading_unit_id);
 }
 
+bool RuntimeController::SetDisplays(const std::vector<DisplayData>& displays) {
+  TRACE_EVENT0("flutter", "SetDisplays");
+  platform_data_.displays = displays;
+
+  if (auto* platform_configuration = GetPlatformConfigurationIfAvailable()) {
+    platform_configuration->UpdateDisplays(displays);
+    return true;
+  }
+  return false;
+}
+
+double RuntimeController::GetScaledFontSize(double unscaled_font_size,
+                                            int configuration_id) const {
+  return client_.GetScaledFontSize(unscaled_font_size, configuration_id);
+}
+
+void RuntimeController::ShutdownPlatformIsolates() {
+  platform_isolate_manager_->ShutdownPlatformIsolates();
+}
+
 RuntimeController::Locale::Locale(std::string language_code_,
                                   std::string country_code_,
                                   std::string script_code_,
diff --git a/runtime/runtime_controller.h b/runtime/runtime_controller.h
index 3f8fa2dcb3ab4d8fd8e83dd1a594ef9a95d642c0..cb1618f9d3326c9106d255af67a93de769a63873 100644
--- a/runtime/runtime_controller.h
+++ b/runtime/runtime_controller.h
@@ -22,6 +22,7 @@
 #include "flutter/lib/ui/window/pointer_data_packet.h"
 #include "flutter/runtime/dart_vm.h"
 #include "flutter/runtime/platform_data.h"
+#include "flutter/runtime/platform_isolate_manager.h"
 #include "rapidjson/document.h"
 #include "rapidjson/stringbuffer.h"
 
@@ -42,6 +43,11 @@ class Window;
 /// used by the engine to copy the currently accumulated window state so it can
 /// be referenced by the new runtime controller.
 ///
+/// When `RuntimeController` is created, it takes some time before the root
+/// isolate becomes ready. Operation during this gap is stored by
+/// `RuntimeController` and flushed to the Dart VM when the isolate becomes
+/// ready before the entrypoint function. See `PlatformData`.
+///
 class RuntimeController : public PlatformConfigurationClient {
  public:
   //----------------------------------------------------------------------------
@@ -98,8 +104,8 @@ class RuntimeController : public PlatformConfigurationClient {
   ///
   std::unique_ptr<RuntimeController> Spawn(
       RuntimeDelegate& p_client,
-      std::string advisory_script_uri,
-      std::string advisory_script_entrypoint,
+      const std::string& advisory_script_uri,
+      const std::string& advisory_script_entrypoint,
       const std::function<void(int64_t)>& idle_notification_callback,
       const fml::closure& isolate_create_callback,
       const fml::closure& isolate_shutdown_callback,
@@ -163,16 +169,49 @@ class RuntimeController : public PlatformConfigurationClient {
   ///
   std::unique_ptr<RuntimeController> Clone() const;
 
+  //----------------------------------------------------------------------------
+  /// @brief      Notify the isolate that a new view is available.
+  ///
+  ///             A view must be added before other methods can refer to it,
+  ///             including the implicit view. Adding a view that already exists
+  ///             triggers an assertion.
+  ///
+  /// @param[in]  view_id           The ID of the new view.
+  /// @param[in]  viewport_metrics  The initial viewport metrics for the view.
+  ///
+  bool AddView(int64_t view_id, const ViewportMetrics& view_metrics);
+
+  //----------------------------------------------------------------------------
+  /// @brief      Notify the isolate that a view is no longer available.
+  ///
+  ///             Removing a view that does not exist triggers an assertion.
+  ///
+  ///             The implicit view (kFlutterImplicitViewId) should never be
+  ///             removed. Doing so triggers an assertion.
+  ///
+  /// @param[in]  view_id  The ID of the view.
+  ///
+  bool RemoveView(int64_t view_id);
+
   //----------------------------------------------------------------------------
   /// @brief      Forward the specified viewport metrics to the running isolate.
   ///             If the isolate is not running, these metrics will be saved and
   ///             flushed to the isolate when it starts.
   ///
+  /// @param[in]  view_id  The ID for the view that `metrics` describes.
   /// @param[in]  metrics  The window's viewport metrics.
   ///
   /// @return     If the window metrics were forwarded to the running isolate.
   ///
-  bool SetViewportMetrics(const ViewportMetrics& metrics);
+  bool SetViewportMetrics(int64_t view_id, const ViewportMetrics& metrics);
+
+  //----------------------------------------------------------------------------
+  /// @brief      Forward the specified display metrics to the running isolate.
+  ///             If the isolate is not running, these metrics will be saved and
+  ///             flushed to the isolate when it starts.
+  ///
+  /// @param[in]  displays  The available displays.
+  bool SetDisplays(const std::vector<DisplayData>& displays);
 
   //----------------------------------------------------------------------------
   /// @brief      Forward the specified locale data to the running isolate. If
@@ -205,9 +244,11 @@ class RuntimeController : public PlatformConfigurationClient {
   bool SetUserSettingsData(const std::string& data);
 
   //----------------------------------------------------------------------------
-  /// @brief      Forward the lifecycle state data to the running isolate. If
-  ///             the isolate is not running, this data will be saved and
-  ///             flushed to the isolate when it starts running.
+  /// @brief      Forward the initial lifecycle state data to the running
+  ///             isolate. If the isolate is not running, this data will be
+  ///             saved and flushed to the isolate when it starts running.
+  ///             After the isolate starts running, the current lifecycle
+  ///             state is pushed to it via the "flutter/lifecycle" channel.
   ///
   /// @deprecated The persistent isolate data must be used for this purpose
   ///             instead.
@@ -217,7 +258,7 @@ class RuntimeController : public PlatformConfigurationClient {
   /// @return     If the lifecycle state data was forwarded to the running
   ///             isolate.
   ///
-  bool SetLifecycleState(const std::string& data);
+  bool SetInitialLifecycleState(const std::string& data);
 
   //----------------------------------------------------------------------------
   /// @brief      Notifies the running isolate about whether the semantics tree
@@ -407,7 +448,7 @@ class RuntimeController : public PlatformConfigurationClient {
   /// @brief      Dispatch the semantics action to the specified accessibility
   ///             node.
   ///
-  /// @param[in]  id      The identified of the accessibility node.
+  /// @param[in]  node_id The identified of the accessibility node.
   /// @param[in]  action  The semantics action to perform on the specified
   ///                     accessibility node.
   /// @param[in]  args    Optional data that applies to the specified action.
@@ -415,7 +456,7 @@ class RuntimeController : public PlatformConfigurationClient {
   /// @return     If the semantics action was dispatched. This may fail if an
   ///             isolate is not running.
   ///
-  bool DispatchSemanticsAction(int32_t id,
+  bool DispatchSemanticsAction(int32_t node_id,
                                SemanticsAction action,
                                fml::MallocMapping args);
 
@@ -477,7 +518,7 @@ class RuntimeController : public PlatformConfigurationClient {
   /// @brief      Get an identifier that represents the Dart isolate group the
   ///             root isolate is in.
   ///
-  /// @return     The root isolate isolate group identifier, zero if one can't
+  /// @return     The root isolate group identifier, zero if one can't
   ///             be established.
   uint64_t GetRootIsolateGroup() const;
 
@@ -535,7 +576,7 @@ class RuntimeController : public PlatformConfigurationClient {
   ///                              temporary conditions such as no network.
   ///                              Transient errors allow the dart VM to
   ///                              re-request the same deferred library and
-  ///                              and loading_unit_id again. Non-transient
+  ///                              loading_unit_id again. Non-transient
   ///                              errors are permanent and attempts to
   ///                              re-request the library will instantly
   ///                              complete with an error.
@@ -574,6 +615,16 @@ class RuntimeController : public PlatformConfigurationClient {
     return root_isolate_;
   }
 
+  std::shared_ptr<PlatformIsolateManager> GetPlatformIsolateManager() override {
+    return platform_isolate_manager_;
+  }
+
+  //--------------------------------------------------------------------------
+  /// @brief      Shuts down all registered platform isolates. Must be called
+  ///             from the platform thread.
+  ///
+  void ShutdownPlatformIsolates();
+
  protected:
   /// Constructor for Mocks.
   RuntimeController(RuntimeDelegate& p_client, const TaskRunners& task_runners);
@@ -605,6 +656,29 @@ class RuntimeController : public PlatformConfigurationClient {
   const fml::closure isolate_shutdown_callback_;
   std::shared_ptr<const fml::Mapping> persistent_isolate_data_;
   UIDartState::Context context_;
+  std::shared_ptr<PlatformIsolateManager> platform_isolate_manager_ =
+      std::shared_ptr<PlatformIsolateManager>(new PlatformIsolateManager());
+  bool has_flushed_runtime_state_ = false;
+
+  // Tracks the views that have been called `Render` during a frame.
+  //
+  // If all views that have been registered by `AddView` have been called
+  // `Render`, then the runtime controller notifies the client of the end of
+  // frame immediately, allowing the client to submit the views to the pipeline
+  // a bit earlier than having to wait for the end of `BeginFrame`. See also
+  // `Animator::OnAllViewsRendered`.
+  //
+  // This mechanism fixes https://github.com/flutter/flutter/issues/144584 with
+  // option 2 and
+  // https://github.com/flutter/engine/pull/51186#issuecomment-1977820525 with
+  // option a in most cases, except if there are multiple views and only part of
+  // them are rendered.
+  // TODO(dkwingsmt): Fix these problems for all cases.
+  std::unordered_set<uint64_t> rendered_views_during_frame_;
+
+  void MarkAsFrameBorder();
+
+  void CheckIfAllViewsRendered();
 
   PlatformConfiguration* GetPlatformConfigurationIfAvailable();
 
@@ -617,7 +691,13 @@ class RuntimeController : public PlatformConfigurationClient {
   void ScheduleFrame() override;
 
   // |PlatformConfigurationClient|
-  void Render(Scene* scene) override;
+  void EndWarmUpFrame() override;
+
+  // |PlatformConfigurationClient|
+  void Render(int64_t view_id,
+              Scene* scene,
+              double width,
+              double height) override;
 
   // |PlatformConfigurationClient|
   void UpdateSemantics(SemanticsUpdate* update) override;
@@ -642,6 +722,13 @@ class RuntimeController : public PlatformConfigurationClient {
   std::unique_ptr<std::vector<std::string>> ComputePlatformResolvedLocale(
       const std::vector<std::string>& supported_locale_data) override;
 
+  // |PlatformConfigurationClient|
+  void SendChannelUpdate(std::string name, bool listening) override;
+
+  // |PlatformConfigurationClient|
+  double GetScaledFontSize(double unscaled_font_size,
+                           int configuration_id) const override;
+
   FML_DISALLOW_COPY_AND_ASSIGN(RuntimeController);
 };
 
diff --git a/runtime/runtime_delegate.h b/runtime/runtime_delegate.h
index 679922e29d7329c87c48dd7a6647f9165463ae21..7c031f1a53068e35e348a925648e3e7d14a062eb 100644
--- a/runtime/runtime_delegate.h
+++ b/runtime/runtime_delegate.h
@@ -23,9 +23,13 @@ class RuntimeDelegate {
  public:
   virtual std::string DefaultRouteName() = 0;
 
-  virtual void ScheduleFrame(bool regenerate_layer_tree = true) = 0;
+  virtual void ScheduleFrame(bool regenerate_layer_trees = true) = 0;
 
-  virtual void Render(std::shared_ptr<flutter::LayerTree> layer_tree) = 0;
+  virtual void OnAllViewsRendered() = 0;
+
+  virtual void Render(int64_t view_id,
+                      std::unique_ptr<flutter::LayerTree> layer_tree,
+                      float device_pixel_ratio) = 0;
 
   virtual void UpdateSemantics(SemanticsNodeUpdates update,
                                CustomAccessibilityActionUpdates actions) = 0;
@@ -53,6 +57,11 @@ class RuntimeDelegate {
   virtual std::weak_ptr<PlatformMessageHandler> GetPlatformMessageHandler()
       const = 0;
 
+  virtual void SendChannelUpdate(std::string name, bool listening) = 0;
+
+  virtual double GetScaledFontSize(double unscaled_font_size,
+                                   int configuration_id) const = 0;
+
  protected:
   virtual ~RuntimeDelegate();
 };
diff --git a/runtime/service_protocol.cc b/runtime/service_protocol.cc
index 20382264ce0b025ca2a68c49a531253d369f4bab..d5d688e2cd23e7fbe2cf5339e17653fe75670bef 100644
--- a/runtime/service_protocol.cc
+++ b/runtime/service_protocol.cc
@@ -268,6 +268,7 @@ bool ServiceProtocol::HandleListViewsMethod(
     rapidjson::Document* response) const {
   fml::SharedLock lock(*handlers_mutex_);
   std::vector<std::pair<intptr_t, Handler::Description>> descriptions;
+  descriptions.reserve(handlers_.size());
   for (const auto& handler : handlers_) {
     descriptions.emplace_back(reinterpret_cast<intptr_t>(handler.first),
                               handler.second.Load());
diff --git a/runtime/test_font_data.cc b/runtime/test_font_data.cc
index ce21eef6e1768c1c4b5d9d1aefca4aeaf7ea3f79..17a0d0c6db00337e57903c616a6aedfbaaa278c7 100644
--- a/runtime/test_font_data.cc
+++ b/runtime/test_font_data.cc
@@ -46,6 +46,10 @@
 
 #if EMBED_TEST_FONT_DATA
 
+#include "third_party/skia/include/core/SkFontMgr.h"
+#include "third_party/skia/include/core/SkTypeface.h"
+#include "txt/platform.h"
+
 static const unsigned char kAhemFont[] = {
     0x00, 0x01, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x80, 0x00, 0x03, 0x00, 0x30,
     0x4f, 0x53, 0x2f, 0x32, 0x77, 0x60, 0xf9, 0x6f, 0x00, 0x00, 0x01, 0x38,
@@ -1205,6 +1209,8 @@ static const unsigned char kAhemFont[] = {
     0x69, 0x69, 0x33, 0x30, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
     0x00, 0x08, 0x00, 0x02, 0x00, 0x10, 0x00, 0x01, 0xff, 0xff, 0x00, 0x03};
 
+static const unsigned int kAhemFontLength = 13884;
+
 // "Cough" font is Flutter's custom test font and may expand to cover
 // font-dependent testing specific features that "Ahem" cannot cover.
 //
@@ -1357,42 +1363,284 @@ static const unsigned char kCoughFont[] = {
     0xd5, 0xed, 0x45, 0xb8, 0x00, 0x00, 0x00, 0x00, 0xd9, 0xe6, 0x56, 0x09,
     0x00, 0x00, 0x00, 0x00, 0xd9, 0xe6, 0x7e, 0x49};
 
-static const unsigned int kAhemFontLength = 13884;
 static const unsigned int kCoughFontLength = 1576;
 
-#else  // EMBED_TEST_FONT_DATA
-
-static const unsigned char kAhemFont[] = {};
-static const unsigned char kCoughFont[] = {};
+static const unsigned char kFlutterTestFont[] = {
+    0x00, 0x01, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x80, 0x00, 0x03, 0x00, 0x60,
+    0x42, 0x41, 0x53, 0x45, 0x8a, 0x4b, 0x87, 0x01, 0x00, 0x00, 0x0b, 0x24,
+    0x00, 0x00, 0x00, 0x82, 0x47, 0x44, 0x45, 0x46, 0x00, 0x29, 0x00, 0x14,
+    0x00, 0x00, 0x0b, 0x04, 0x00, 0x00, 0x00, 0x1e, 0x4f, 0x53, 0x2f, 0x32,
+    0x13, 0xfd, 0x90, 0xf2, 0x00, 0x00, 0x01, 0x68, 0x00, 0x00, 0x00, 0x60,
+    0x63, 0x6d, 0x61, 0x70, 0xec, 0x11, 0x06, 0x0f, 0x00, 0x00, 0x02, 0x00,
+    0x00, 0x00, 0x05, 0x04, 0x63, 0x76, 0x74, 0x20, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x07, 0x18, 0x00, 0x00, 0x00, 0x02, 0x67, 0x6c, 0x79, 0x66,
+    0x09, 0x85, 0x89, 0xf8, 0x00, 0x00, 0x07, 0x3c, 0x00, 0x00, 0x00, 0xd8,
+    0x68, 0x65, 0x61, 0x64, 0x81, 0x1b, 0xef, 0xfd, 0x00, 0x00, 0x00, 0xec,
+    0x00, 0x00, 0x00, 0x36, 0x68, 0x68, 0x65, 0x61, 0x07, 0x02, 0x03, 0x0f,
+    0x00, 0x00, 0x01, 0x24, 0x00, 0x00, 0x00, 0x24, 0x68, 0x6d, 0x74, 0x78,
+    0x1b, 0x86, 0x00, 0x80, 0x00, 0x00, 0x01, 0xc8, 0x00, 0x00, 0x00, 0x38,
+    0x6c, 0x6f, 0x63, 0x61, 0x02, 0x7e, 0x02, 0x50, 0x00, 0x00, 0x07, 0x1c,
+    0x00, 0x00, 0x00, 0x1e, 0x6d, 0x61, 0x78, 0x70, 0x00, 0x52, 0x00, 0x2d,
+    0x00, 0x00, 0x01, 0x48, 0x00, 0x00, 0x00, 0x20, 0x6e, 0x61, 0x6d, 0x65,
+    0x1a, 0xef, 0x7a, 0x5b, 0x00, 0x00, 0x08, 0x14, 0x00, 0x00, 0x02, 0x25,
+    0x70, 0x6f, 0x73, 0x74, 0x89, 0x84, 0x28, 0x37, 0x00, 0x00, 0x0a, 0x3c,
+    0x00, 0x00, 0x00, 0xc7, 0x70, 0x72, 0x65, 0x70, 0x6f, 0x48, 0x68, 0x25,
+    0x00, 0x00, 0x07, 0x04, 0x00, 0x00, 0x00, 0x11, 0x00, 0x01, 0x00, 0x00,
+    0x00, 0x01, 0x00, 0x00, 0xab, 0xb4, 0x91, 0x15, 0x5f, 0x0f, 0x3c, 0xf5,
+    0x00, 0x1f, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8e, 0xf4, 0x56, 0x80,
+    0x00, 0x00, 0x00, 0x00, 0x8e, 0xf4, 0x56, 0x80, 0x00, 0x00, 0xff, 0x00,
+    0x04, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x03, 0x00, 0xff, 0x00,
+    0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x0e, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x08,
+    0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01,
+    0x00, 0x01, 0x00, 0x00, 0x00, 0x40, 0x00, 0x22, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x04, 0x02, 0x05, 0x01, 0x90, 0x00, 0x05, 0x00, 0x00, 0x02, 0x99,
+    0x02, 0xcc, 0x00, 0x00, 0x00, 0x8f, 0x02, 0x99, 0x02, 0xcc, 0x00, 0x00,
+    0x01, 0xeb, 0x00, 0x33, 0x01, 0x09, 0x00, 0x00, 0x02, 0x00, 0x05, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x03, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x80, 0x00, 0x20, 0xfe, 0xff, 0x03, 0x00, 0xff, 0x00,
+    0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+    0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x01,
+    0x04, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x55, 0x00, 0x00,
+    0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+    0x04, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x55, 0x00, 0x00,
+    0x01, 0x00, 0x00, 0x00, 0x00, 0xaa, 0x00, 0x00, 0x00, 0xcc, 0x00, 0x00,
+    0x00, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
+    0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x01, 0x00, 0x00,
+    0x00, 0x00, 0x03, 0xfe, 0x00, 0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1c,
+    0x00, 0x04, 0x03, 0xe2, 0x00, 0x00, 0x00, 0x64, 0x00, 0x40, 0x00, 0x05,
+    0x00, 0x24, 0x00, 0x7e, 0x00, 0xff, 0x01, 0x31, 0x01, 0x53, 0x01, 0x78,
+    0x01, 0x92, 0x02, 0xc9, 0x02, 0xdd, 0x03, 0x94, 0x03, 0xa9, 0x03, 0xc0,
+    0x20, 0x0a, 0x20, 0x26, 0x20, 0x30, 0x20, 0x3a, 0x20, 0x44, 0x21, 0x26,
+    0x22, 0x06, 0x22, 0x12, 0x22, 0x1e, 0x22, 0x2b, 0x22, 0x48, 0x22, 0x65,
+    0x22, 0xf2, 0x25, 0xca, 0x30, 0x07, 0x4e, 0x03, 0x4e, 0x09, 0x4e, 0x2d,
+    0x4e, 0x5d, 0x4e, 0x8c, 0x4e, 0x94, 0x51, 0x6d, 0x53, 0x41, 0x54, 0x26,
+    0x56, 0xdb, 0x57, 0x1f, 0x65, 0x87, 0x66, 0x2f, 0x67, 0x2c, 0x6b, 0x63,
+    0x6c, 0x34, 0x6d, 0x4b, 0x70, 0x6b, 0x78, 0x6e, 0x8b, 0xd5, 0x91, 0xd1,
+    0xf0, 0x02, 0xfe, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x20, 0x00, 0xa1,
+    0x01, 0x31, 0x01, 0x52, 0x01, 0x78, 0x01, 0x92, 0x02, 0xc6, 0x02, 0xd8,
+    0x03, 0x94, 0x03, 0xa5, 0x03, 0xbc, 0x20, 0x02, 0x20, 0x13, 0x20, 0x30,
+    0x20, 0x39, 0x20, 0x44, 0x21, 0x22, 0x22, 0x02, 0x22, 0x0f, 0x22, 0x19,
+    0x22, 0x2b, 0x22, 0x48, 0x22, 0x60, 0x22, 0xf2, 0x25, 0xca, 0x30, 0x07,
+    0x4e, 0x00, 0x4e, 0x09, 0x4e, 0x2d, 0x4e, 0x5d, 0x4e, 0x8c, 0x4e, 0x94,
+    0x51, 0x6b, 0x53, 0x41, 0x54, 0x26, 0x56, 0xd7, 0x57, 0x1f, 0x65, 0x87,
+    0x66, 0x2f, 0x67, 0x28, 0x6b, 0x63, 0x6c, 0x34, 0x6d, 0x4b, 0x70, 0x6b,
+    0x78, 0x6e, 0x8b, 0xd5, 0x91, 0xd1, 0xf0, 0x00, 0xfe, 0xff, 0xff, 0xff,
+    0x00, 0x00, 0x00, 0x00, 0xfe, 0xd2, 0x00, 0x00, 0xfe, 0x8b, 0xfe, 0x71,
+    0x00, 0x00, 0x00, 0x00, 0xfc, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0xdf, 0xd3, 0x00, 0x00, 0xdf, 0xbf, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xdd, 0xd8, 0xdd, 0xbb, 0x00, 0x00, 0xdd, 0x11,
+    0xda, 0x39, 0xcf, 0xfc, 0x00, 0x00, 0xb1, 0xfa, 0xb1, 0xd6, 0xb1, 0xa6,
+    0xb1, 0x77, 0xb1, 0x6f, 0x00, 0x00, 0xac, 0xc2, 0xab, 0xdd, 0x00, 0x00,
+    0xa8, 0xe4, 0x9a, 0x7c, 0x99, 0xd4, 0x00, 0x00, 0x94, 0xa0, 0x93, 0xcf,
+    0x92, 0xb8, 0x8f, 0x98, 0x87, 0x95, 0x74, 0x2e, 0x6e, 0x32, 0x00, 0x00,
+    0x01, 0x0e, 0x00, 0x01, 0x00, 0x64, 0x01, 0x20, 0x00, 0x00, 0x01, 0xda,
+    0x00, 0x00, 0x00, 0x00, 0x01, 0xd8, 0x01, 0xde, 0x00, 0x00, 0x01, 0xe6,
+    0x01, 0xee, 0x01, 0xf6, 0x02, 0x06, 0x00, 0x00, 0x02, 0x2a, 0x00, 0x00,
+    0x02, 0x2a, 0x02, 0x32, 0x02, 0x3a, 0x02, 0x40, 0x00, 0x00, 0x00, 0x00,
+    0x02, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x4a, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x46, 0x00, 0x00,
+    0x00, 0x00, 0x02, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x48,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x02, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x04, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x05, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
+    0x00, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x09, 0x00, 0x0a, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x0b, 0x00, 0x0c, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00,
+    0x01, 0x06, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x01, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+    0x06, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x00, 0x03, 0x03, 0x03, 0x03,
+    0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+    0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+    0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+    0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+    0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+    0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+    0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x00,
+    0x03, 0x03, 0x03, 0x05, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+    0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+    0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+    0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+    0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+    0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+    0x03, 0x03, 0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+    0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x00, 0x03, 0x03, 0x00, 0x00,
+    0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+    0x03, 0x03, 0x03, 0x03, 0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+    0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x18, 0xb8, 0x00, 0x00,
+    0x4c, 0xb8, 0x00, 0xc0, 0x63, 0xb8, 0x00, 0x04, 0x62, 0x20, 0x67, 0x61,
+    0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x26,
+    0x00, 0x26, 0x00, 0x26, 0x00, 0x3c, 0x00, 0x54, 0x00, 0x6c, 0x00, 0x6c,
+    0x00, 0x6c, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x6c,
+    0x00, 0x6c, 0x00, 0x00, 0x00, 0x02, 0x00, 0x80, 0x00, 0x00, 0x03, 0x80,
+    0x03, 0x00, 0x00, 0x03, 0x00, 0x07, 0x00, 0x22, 0x00, 0xb3, 0x00, 0x00,
+    0x00, 0x00, 0x16, 0xe0, 0x12, 0xb2, 0x01, 0x01, 0x01, 0x15, 0x36, 0x16,
+    0xb0, 0x00, 0x2f, 0xb0, 0x01, 0x2f, 0xb0, 0x02, 0x2f, 0xb0, 0x03, 0x2f,
+    0xb0, 0x04, 0x2f, 0xb0, 0x07, 0x2f, 0x25, 0x21, 0x11, 0x21, 0x03, 0x11,
+    0x21, 0x11, 0x01, 0x00, 0x02, 0x00, 0xfe, 0x00, 0x80, 0x03, 0x00, 0x80,
+    0x02, 0x00, 0xfd, 0x80, 0x03, 0x00, 0xfd, 0x00, 0x00, 0x01, 0x00, 0x00,
+    0xff, 0x00, 0x04, 0x00, 0x03, 0x00, 0x00, 0x03, 0x00, 0x11, 0x00, 0xb3,
+    0x00, 0x00, 0x00, 0x00, 0x16, 0xe0, 0x12, 0xb2, 0x01, 0x01, 0x01, 0x15,
+    0x36, 0x16, 0x00, 0x19, 0x01, 0x21, 0x11, 0x04, 0x00, 0xff, 0x00, 0x04,
+    0x00, 0xfc, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xff, 0x00, 0x04, 0x00,
+    0x00, 0x00, 0x00, 0x03, 0x00, 0x16, 0x00, 0xb3, 0x00, 0x00, 0x00, 0x00,
+    0x16, 0xe0, 0x12, 0xb2, 0x01, 0x01, 0x01, 0x15, 0x36, 0x16, 0xb0, 0x01,
+    0x2f, 0xb0, 0x02, 0x2f, 0x19, 0x01, 0x21, 0x11, 0x04, 0x00, 0xff, 0x00,
+    0x01, 0x00, 0xff, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00,
+    0x03, 0x00, 0x00, 0x03, 0x00, 0x16, 0x00, 0xb3, 0x00, 0x00, 0x00, 0x00,
+    0x16, 0xe0, 0x12, 0xb2, 0x01, 0x01, 0x01, 0x15, 0x36, 0x16, 0xb0, 0x00,
+    0x2f, 0xb0, 0x03, 0x2f, 0x31, 0x11, 0x21, 0x11, 0x04, 0x00, 0x03, 0x00,
+    0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0xae, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1d, 0x00, 0x3c, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x07, 0x00, 0x6a, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x07, 0x00, 0x82, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x26, 0x00, 0xd8, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x0b, 0x01, 0x17, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x0f, 0x01, 0x43, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x0b, 0x01, 0x6b, 0x00, 0x03,
+    0x00, 0x01, 0x04, 0x09, 0x00, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x00, 0x03,
+    0x00, 0x01, 0x04, 0x09, 0x00, 0x01, 0x00, 0x0e, 0x00, 0x5a, 0x00, 0x03,
+    0x00, 0x01, 0x04, 0x09, 0x00, 0x02, 0x00, 0x0e, 0x00, 0x72, 0x00, 0x03,
+    0x00, 0x01, 0x04, 0x09, 0x00, 0x03, 0x00, 0x4c, 0x00, 0x8a, 0x00, 0x03,
+    0x00, 0x01, 0x04, 0x09, 0x00, 0x04, 0x00, 0x16, 0x00, 0xff, 0x00, 0x03,
+    0x00, 0x01, 0x04, 0x09, 0x00, 0x05, 0x00, 0x1e, 0x01, 0x23, 0x00, 0x03,
+    0x00, 0x01, 0x04, 0x09, 0x00, 0x06, 0x00, 0x16, 0x01, 0x53, 0x00, 0x43,
+    0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, 0x00, 0x69, 0x00, 0x67,
+    0x00, 0x68, 0x00, 0x74, 0x00, 0x20, 0x00, 0x28, 0x00, 0x63, 0x00, 0x29,
+    0x00, 0x20, 0x00, 0x31, 0x00, 0x39, 0x00, 0x38, 0x00, 0x30, 0x00, 0x2c,
+    0x00, 0x20, 0x00, 0x41, 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x79,
+    0x00, 0x6d, 0x00, 0x6f, 0x00, 0x75, 0x00, 0x73, 0x00, 0x00, 0x43, 0x6f,
+    0x70, 0x79, 0x72, 0x69, 0x67, 0x68, 0x74, 0x20, 0x28, 0x63, 0x29, 0x20,
+    0x31, 0x39, 0x38, 0x30, 0x2c, 0x20, 0x41, 0x6e, 0x6f, 0x6e, 0x79, 0x6d,
+    0x6f, 0x75, 0x73, 0x00, 0x00, 0x4d, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67,
+    0x00, 0x4c, 0x00, 0x69, 0x00, 0x55, 0x00, 0x00, 0x4d, 0x69, 0x6e, 0x67,
+    0x4c, 0x69, 0x55, 0x00, 0x00, 0x52, 0x00, 0x65, 0x00, 0x67, 0x00, 0x75,
+    0x00, 0x6c, 0x00, 0x61, 0x00, 0x72, 0x00, 0x00, 0x52, 0x65, 0x67, 0x75,
+    0x6c, 0x61, 0x72, 0x00, 0x00, 0x46, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x74,
+    0x00, 0x46, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x67, 0x00, 0x65, 0x00, 0x20,
+    0x00, 0x32, 0x00, 0x2e, 0x00, 0x30, 0x00, 0x20, 0x00, 0x3a, 0x00, 0x20,
+    0x00, 0x46, 0x00, 0x6c, 0x00, 0x75, 0x00, 0x74, 0x00, 0x74, 0x00, 0x65,
+    0x00, 0x72, 0x00, 0x54, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x20,
+    0x00, 0x3a, 0x00, 0x20, 0x00, 0x31, 0x00, 0x2d, 0x00, 0x31, 0x00, 0x2d,
+    0x00, 0x31, 0x00, 0x39, 0x00, 0x38, 0x00, 0x30, 0x00, 0x00, 0x46, 0x6f,
+    0x6e, 0x74, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x20, 0x32, 0x2e, 0x30, 0x20,
+    0x3a, 0x20, 0x46, 0x6c, 0x75, 0x74, 0x74, 0x65, 0x72, 0x54, 0x65, 0x73,
+    0x74, 0x20, 0x3a, 0x20, 0x31, 0x2d, 0x31, 0x2d, 0x31, 0x39, 0x38, 0x30,
+    0x00, 0x00, 0x46, 0x00, 0x6c, 0x00, 0x75, 0x00, 0x74, 0x00, 0x74, 0x00,
+    0x65, 0x00, 0x72, 0x00, 0x54, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00,
+    0x00, 0x46, 0x6c, 0x75, 0x74, 0x74, 0x65, 0x72, 0x54, 0x65, 0x73, 0x74,
+    0x00, 0x00, 0x56, 0x00, 0x65, 0x00, 0x72, 0x00, 0x73, 0x00, 0x69, 0x00,
+    0x6f, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x30, 0x00, 0x30, 0x00, 0x31, 0x00,
+    0x2e, 0x00, 0x30, 0x00, 0x30, 0x00, 0x30, 0x00, 0x00, 0x56, 0x65, 0x72,
+    0x73, 0x69, 0x6f, 0x6e, 0x20, 0x30, 0x30, 0x31, 0x2e, 0x30, 0x30, 0x30,
+    0x00, 0x00, 0x46, 0x00, 0x6c, 0x00, 0x75, 0x00, 0x74, 0x00, 0x74, 0x00,
+    0x65, 0x00, 0x72, 0x00, 0x54, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00,
+    0x00, 0x46, 0x6c, 0x75, 0x74, 0x74, 0x65, 0x72, 0x54, 0x65, 0x73, 0x74,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xff, 0x7e, 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x0e, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x01, 0x02, 0x01, 0x03,
+    0x01, 0x04, 0x01, 0x05, 0x01, 0x06, 0x01, 0x07, 0x01, 0x08, 0x01, 0x09,
+    0x01, 0x0a, 0x01, 0x0b, 0x01, 0x0c, 0x06, 0x53, 0x71, 0x75, 0x61, 0x72,
+    0x65, 0x0e, 0x41, 0x73, 0x63, 0x65, 0x6e, 0x74, 0x20, 0x46, 0x6c, 0x75,
+    0x73, 0x68, 0x65, 0x64, 0x0f, 0x44, 0x65, 0x73, 0x63, 0x65, 0x6e, 0x74,
+    0x20, 0x46, 0x6c, 0x75, 0x73, 0x68, 0x65, 0x64, 0x0c, 0x46, 0x75, 0x6c,
+    0x6c, 0x20, 0x41, 0x64, 0x76, 0x61, 0x6e, 0x63, 0x65, 0x0b, 0x31, 0x2f,
+    0x32, 0x20, 0x41, 0x64, 0x76, 0x61, 0x6e, 0x63, 0x65, 0x0b, 0x31, 0x2f,
+    0x33, 0x20, 0x41, 0x64, 0x76, 0x61, 0x6e, 0x63, 0x65, 0x0b, 0x31, 0x2f,
+    0x34, 0x20, 0x41, 0x64, 0x76, 0x61, 0x6e, 0x63, 0x65, 0x0b, 0x31, 0x2f,
+    0x36, 0x20, 0x41, 0x64, 0x76, 0x61, 0x6e, 0x63, 0x65, 0x0b, 0x31, 0x2f,
+    0x35, 0x20, 0x41, 0x64, 0x76, 0x61, 0x6e, 0x63, 0x65, 0x0c, 0x31, 0x2f,
+    0x31, 0x30, 0x20, 0x41, 0x64, 0x76, 0x61, 0x6e, 0x63, 0x65, 0x0c, 0x5a,
+    0x65, 0x72, 0x6f, 0x20, 0x41, 0x64, 0x76, 0x61, 0x6e, 0x63, 0x65, 0x00,
+    0x00, 0x01, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00,
+    0x00, 0x02, 0x00, 0x01, 0x00, 0x03, 0x00, 0x0d, 0x00, 0x01, 0x00, 0x04,
+    0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+    0x00, 0x08, 0x00, 0x00, 0x00, 0x04, 0x00, 0x12, 0x00, 0x03, 0x68, 0x61,
+    0x6e, 0x67, 0x69, 0x64, 0x65, 0x6f, 0x72, 0x6f, 0x6d, 0x6e, 0x00, 0x03,
+    0x67, 0x72, 0x65, 0x6b, 0x00, 0x14, 0x68, 0x61, 0x6e, 0x69, 0x00, 0x30,
+    0x6c, 0x61, 0x74, 0x6e, 0x00, 0x4c, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x02, 0x00, 0x03, 0x00, 0x0a, 0x00, 0x0e, 0x00, 0x12, 0x00, 0x01,
+    0x03, 0x00, 0x00, 0x01, 0xff, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x06,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00, 0x0a, 0x00, 0x0e,
+    0x00, 0x12, 0x00, 0x01, 0x03, 0x00, 0x00, 0x01, 0xff, 0x00, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x03,
+    0x00, 0x0a, 0x00, 0x0e, 0x00, 0x12, 0x00, 0x01, 0x03, 0x00, 0x00, 0x01,
+    0xff, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00};
 
-static const unsigned int kAhemFontLength = 0;
-static const unsigned int kCoughFontLength = 0;
+static const unsigned int kFlutterTestFontLength = 2984;
 
 #endif  // EMBED_TEST_FONT_DATA
 
 namespace flutter {
 
-std::vector<std::unique_ptr<SkStreamAsset>> GetTestFontData() {
-  std::vector<std::unique_ptr<SkStreamAsset>> data;
-  if (kAhemFontLength == 0) {
-    data.push_back(nullptr);
-  } else {
-    data.push_back(std::make_unique<SkMemoryStream>(kAhemFont, kAhemFontLength,
-                                                    false /* copy data */));
-  }
-
-  if (kCoughFontLength == 0) {
-    data.push_back(nullptr);
-  } else {
-    data.push_back(std::make_unique<SkMemoryStream>(
-        kCoughFont, kCoughFontLength, false /* copy data */));
-  }
-  return data;
+std::vector<sk_sp<SkTypeface>> GetTestFontData() {
+  std::vector<sk_sp<SkTypeface>> typefaces;
+#if EMBED_TEST_FONT_DATA
+  sk_sp<SkFontMgr> font_mgr = txt::GetDefaultFontManager();
+  typefaces.push_back(font_mgr->makeFromStream(
+      SkMemoryStream::MakeDirect(kFlutterTestFont, kFlutterTestFontLength)));
+  typefaces.push_back(font_mgr->makeFromStream(
+      SkMemoryStream::MakeDirect(kAhemFont, kAhemFontLength)));
+  typefaces.push_back(font_mgr->makeFromStream(
+      SkMemoryStream::MakeDirect(kCoughFont, kCoughFontLength)));
+#endif  // EMBED_TEST_FONT_DATA
+  return typefaces;
 }
 
 std::vector<std::string> GetTestFontFamilyNames() {
-  std::vector<std::string> names = {"Ahem", "Cough"};
+  std::vector<std::string> names;
+#if EMBED_TEST_FONT_DATA
+  names = {"FlutterTest", "Ahem", "Cough"};
+#endif  // EMBED_TEST_FONT_DATA
   return names;
 }
-
 }  // namespace flutter
diff --git a/runtime/test_font_data.h b/runtime/test_font_data.h
index d1ba0728bdbb0add1be0902e01f673fa140b5638..60df5aa7eb16e7b63730dafc79f6deba3f28778c 100644
--- a/runtime/test_font_data.h
+++ b/runtime/test_font_data.h
@@ -10,10 +10,11 @@
 #include <vector>
 
 #include "third_party/skia/include/core/SkStream.h"
+#include "third_party/skia/include/core/SkTypeface.h"
 
 namespace flutter {
 
-std::vector<std::unique_ptr<SkStreamAsset>> GetTestFontData();
+std::vector<sk_sp<SkTypeface>> GetTestFontData();
 std::vector<std::string> GetTestFontFamilyNames();
 
 }  // namespace flutter
diff --git a/runtime/type_conversions_unittests.cc b/runtime/type_conversions_unittests.cc
index 345eb78ff9e5db3d679739ae5133665bb66e52d7..80e00af3c82295403f860041d6d7749db7e01c48 100644
--- a/runtime/type_conversions_unittests.cc
+++ b/runtime/type_conversions_unittests.cc
@@ -147,32 +147,6 @@ TEST_F(TypeConversionsTest, CanConvertListOfInts) {
   event.Wait();
 }
 
-TEST_F(TypeConversionsTest, CanConvertListOfFloatsToListOfDartDoubles) {
-  fml::AutoResetWaitableEvent event;
-  AddNativeCallback(
-      "NotifySuccess", CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
-        auto bool_handle = Dart_GetNativeArgument(args, 0);
-        ASSERT_FALSE(tonic::CheckAndHandleError(bool_handle));
-        ASSERT_TRUE(tonic::DartConverter<bool>::FromDart(bool_handle));
-        event.Signal();
-      }));
-  AddNativeCallback(
-      "NotifyNative", CREATE_NATIVE_ENTRY([&](Dart_NativeArguments) {
-        std::vector<float> items;
-        items.push_back(1.0f);
-        items.push_back(2.0f);
-        items.push_back(3.0f);
-        items.push_back(4.0f);
-        auto items_handle = tonic::ToDart(items);
-        ASSERT_FALSE(tonic::CheckAndHandleError(items_handle));
-        // This will fail on type mismatch.
-        tonic::DartInvokeField(::Dart_RootLibrary(),
-                               "testCanConvertListOfDoubles", {items_handle});
-      }));
-  ASSERT_TRUE(RunWithEntrypoint("trampoline"));
-  event.Wait();
-}
-
 }  // namespace testing
 }  // namespace flutter
 
diff --git a/shell/common/BUILD.gn b/shell/common/BUILD.gn
index 7fa0c1b23ae702ec61d968210891c412fdc6f482..8e2d9f2174b3ac8efa03be96a7dcfbc2d3f36716 100644
--- a/shell/common/BUILD.gn
+++ b/shell/common/BUILD.gn
@@ -2,12 +2,15 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/fuchsia/sdk.gni")
 import("//flutter/common/config.gni")
 import("//flutter/impeller/tools/impeller.gni")
 import("//flutter/shell/gpu/gpu.gni")
 import("//flutter/testing/testing.gni")
 
+if (is_fuchsia) {
+  import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
+}
+
 # Template to generate a dart embedder resource.cc file.
 # Required invoker inputs:
 #   String output (name of output file)
@@ -20,7 +23,7 @@ import("//flutter/testing/testing.gni")
 #   List datadeps
 template("dart_embedder_resources") {
   action(target_name) {
-    script = "//third_party/dart/runtime/tools/create_resources.py"
+    script = "$dart_src/runtime/tools/create_resources.py"
     deps = []
     if (defined(invoker.deps)) {
       deps += invoker.deps
@@ -65,18 +68,28 @@ source_set("platform_message_handler") {
   deps = [ "//flutter/fml:fml" ]
 }
 
+source_set("display") {
+  sources = [
+    "display.cc",
+    "display.h",
+    "variable_refresh_rate_display.cc",
+    "variable_refresh_rate_display.h",
+    "variable_refresh_rate_reporter.h",
+  ]
+  public_configs = [ "//flutter:config" ]
+  deps = [ "//flutter/fml:fml" ]
+}
+
 source_set("common") {
   sources = [
     "animator.cc",
     "animator.h",
-    "canvas_spy.cc",
-    "canvas_spy.h",
     "context_options.cc",
     "context_options.h",
-    "display.cc",
-    "display.h",
     "display_manager.cc",
     "display_manager.h",
+    "dl_op_spy.cc",
+    "dl_op_spy.h",
     "engine.cc",
     "engine.h",
     "pipeline.cc",
@@ -108,9 +121,6 @@ source_set("common") {
     "switches.h",
     "thread_host.cc",
     "thread_host.h",
-    "variable_refresh_rate_display.cc",
-    "variable_refresh_rate_display.h",
-    "variable_refresh_rate_reporter.h",
     "vsync_waiter.cc",
     "vsync_waiter.h",
     "vsync_waiter_fallback.cc",
@@ -120,14 +130,16 @@ source_set("common") {
   public_configs = [ "//flutter:config" ]
 
   public_deps = [
+    ":display",
     ":platform_message_handler",
     "//flutter/shell/version",
+    "//flutter/third_party/rapidjson",
     "//flutter/third_party/tonic",
     "//flutter/third_party/txt",
-    "//third_party/rapidjson",
   ]
 
   deps = [
+    "$dart_src/runtime:dart_api",
     "//flutter/assets",
     "//flutter/common",
     "//flutter/common/graphics",
@@ -135,9 +147,9 @@ source_set("common") {
     "//flutter/fml",
     "//flutter/lib/ui",
     "//flutter/runtime",
+    "//flutter/shell/common:base64",
     "//flutter/shell/profiling",
-    "//third_party/dart/runtime:dart_api",
-    "//third_party/skia",
+    "//flutter/skia",
   ]
 
   if (impeller_supports_rendering) {
@@ -150,6 +162,15 @@ source_set("common") {
   }
 }
 
+# These are in their own source_set to avoid a dependency cycle with //common/graphics
+source_set("base64") {
+  sources = [
+    "base64.cc",
+    "base64.h",
+  ]
+  deps = [ "//flutter/fml" ]
+}
+
 template("shell_host_executable") {
   executable(target_name) {
     testonly = true
@@ -184,6 +205,7 @@ if (enable_unittests) {
     fixtures = [
       "fixtures/shelltest_screenshot.png",
       "fixtures/hello_loop_2.gif",
+      "//flutter/third_party/txt/third_party/fonts/Roboto-Regular.ttf",
     ]
   }
 
@@ -227,7 +249,6 @@ if (enable_unittests) {
     public_deps = [
       "//flutter/common/graphics",
       "//flutter/flow",
-      "//flutter/fml/dart",
       "//flutter/runtime",
       "//flutter/shell/common",
       "//flutter/testing",
@@ -238,12 +259,16 @@ if (enable_unittests) {
       "//flutter/assets",
       "//flutter/common",
       "//flutter/lib/ui",
+      "//flutter/skia",
       "//flutter/testing:dart",
       "//flutter/testing:fixture_test",
-      "//third_party/rapidjson",
-      "//third_party/skia",
+      "//flutter/third_party/rapidjson",
     ]
 
+    if (impeller_supports_rendering) {
+      deps += [ "//flutter/impeller" ]
+    }
+
     public_configs = [
       ":shell_test_fixture_sources_config",
       ":shell_unittests_gpu_configuration_config",
@@ -285,8 +310,10 @@ if (enable_unittests) {
 
     sources = [
       "animator_unittests.cc",
-      "canvas_spy_unittests.cc",
+      "base64_unittests.cc",
       "context_options_unittests.cc",
+      "dl_op_spy_unittests.cc",
+      "engine_animator_unittests.cc",
       "engine_unittests.cc",
       "input_events_unittests.cc",
       "persistent_cache_unittests.cc",
@@ -304,29 +331,36 @@ if (enable_unittests) {
       ":shell_unittests_fixtures",
       "//flutter/assets",
       "//flutter/common/graphics",
+      "//flutter/display_list/testing:display_list_testing",
+      "//flutter/shell/common:base64",
       "//flutter/shell/profiling:profiling_unittests",
       "//flutter/shell/version",
       "//flutter/testing:fixture_test",
-      "//third_party/googletest:gmock",
+      "//flutter/third_party/googletest:gmock",
     ]
 
     if (is_fuchsia) {
       sources += [ "shell_fuchsia_unittests.cc" ]
 
       deps += [
-        "$fuchsia_sdk_root/fidl:fuchsia.intl",
-        "$fuchsia_sdk_root/fidl:fuchsia.settings",
-        "$fuchsia_sdk_root/pkg:fidl_cpp",
-        "$fuchsia_sdk_root/pkg:sys_cpp",
+        "${fuchsia_sdk}/fidl/fuchsia.intl",
+        "${fuchsia_sdk}/fidl/fuchsia.settings",
+        "${fuchsia_sdk}/pkg/fidl_cpp",
+        "${fuchsia_sdk}/pkg/sys_cpp",
       ]
-    } else {
-      # TODO(63837): This test is hard-coded to use a TestGLSurface so it cannot run on fuchsia.
+    } else if (shell_enable_gl) {
+      # TODO(63837): This test is hard-coded to use a TestGLSurface so it cannot
+      # run on fuchsia or when GL is not enabled.
       sources += [ "shell_io_manager_unittests.cc" ]
+      deps += [ "//flutter/third_party/swiftshader" ]
+    }
 
-      # Swiftshader only needed on non-Fuchsia platforms.
-      if (shell_enable_vulkan) {
-        deps += [ "//third_party/swiftshader" ]
-      }
+    if (shell_enable_gl) {
+      deps += [
+        "//flutter/third_party/angle:libEGL_static",
+        "//flutter/third_party/angle:libGLESv2_static",
+        "//flutter/third_party/swiftshader",
+      ]
     }
   }
 }
diff --git a/shell/common/animator.cc b/shell/common/animator.cc
index 07963bf190de9d0a801faa7c366eb447ba75c693..dee850c6188d693928a74f31faf5fdc84f89ba60 100644
--- a/shell/common/animator.cc
+++ b/shell/common/animator.cc
@@ -4,6 +4,7 @@
 
 #include "flutter/shell/common/animator.h"
 
+#include "flutter/common/constants.h"
 #include "flutter/flow/frame_timings.h"
 #include "flutter/fml/time/time_point.h"
 #include "flutter/fml/trace_event.h"
@@ -29,12 +30,12 @@ Animator::Animator(Delegate& delegate,
       task_runners_(task_runners),
       waiter_(std::move(waiter)),
 #if SHELL_ENABLE_METAL
-      layer_tree_pipeline_(std::make_shared<LayerTreePipeline>(2)),
+      layer_tree_pipeline_(std::make_shared<FramePipeline>(2)),
 #else   // SHELL_ENABLE_METAL
       // TODO(dnfield): We should remove this logic and set the pipeline depth
       // back to 2 in this case. See
       // https://github.com/flutter/engine/pull/9132 for discussion.
-      layer_tree_pipeline_(std::make_shared<LayerTreePipeline>(
+      layer_tree_pipeline_(std::make_shared<FramePipeline>(
           task_runners.GetPlatformTaskRunner() ==
                   task_runners.GetRasterTaskRunner()
               ? 1
@@ -62,13 +63,26 @@ void Animator::BeginFrame(
     std::unique_ptr<FrameTimingsRecorder> frame_timings_recorder) {
   TRACE_EVENT_ASYNC_END0("flutter", "Frame Request Pending",
                          frame_request_number_);
+  // Clear layer trees rendered out of a frame. Only Animator::Render called
+  // within a frame is used.
+  layer_trees_tasks_.clear();
+
   frame_request_number_++;
 
   frame_timings_recorder_ = std::move(frame_timings_recorder);
   frame_timings_recorder_->RecordBuildStart(fml::TimePoint::Now());
 
+  size_t flow_id_count = trace_flow_ids_.size();
+  std::unique_ptr<uint64_t[]> flow_ids =
+      std::make_unique<uint64_t[]>(flow_id_count);
+  for (size_t i = 0; i < flow_id_count; ++i) {
+    flow_ids.get()[i] = trace_flow_ids_.at(i);
+  }
+
   TRACE_EVENT_WITH_FRAME_NUMBER(frame_timings_recorder_, "flutter",
-                                "Animator::BeginFrame");
+                                "Animator::BeginFrame", flow_id_count,
+                                flow_ids.get());
+
   while (!trace_flow_ids_.empty()) {
     uint64_t trace_flow_id = trace_flow_ids_.front();
     TRACE_FLOW_END("flutter", "PointerEvent", trace_flow_id);
@@ -76,12 +90,12 @@ void Animator::BeginFrame(
   }
 
   frame_scheduled_ = false;
-  regenerate_layer_tree_ = false;
+  regenerate_layer_trees_ = false;
   pending_frame_semaphore_.Signal();
 
   if (!producer_continuation_) {
     // We may already have a valid pipeline continuation in case a previous
-    // begin frame did not result in an Animation::Render. Simply reuse that
+    // begin frame did not result in an Animator::Render. Simply reuse that
     // instead of asking the pipeline for a fresh continuation.
     producer_continuation_ = layer_tree_pipeline_->Produce();
 
@@ -103,6 +117,44 @@ void Animator::BeginFrame(
   dart_frame_deadline_ = frame_target_time.ToEpochDelta();
   uint64_t frame_number = frame_timings_recorder_->GetFrameNumber();
   delegate_.OnAnimatorBeginFrame(frame_target_time, frame_number);
+}
+
+void Animator::EndFrame() {
+  if (frame_timings_recorder_ == nullptr) {
+    // `EndFrame` has been called in this frame. This happens if the engine has
+    // called `OnAllViewsRendered` and then the end of the vsync task calls
+    // `EndFrame` again.
+    return;
+  }
+  if (!layer_trees_tasks_.empty()) {
+    // The build is completed in OnAnimatorBeginFrame.
+    frame_timings_recorder_->RecordBuildEnd(fml::TimePoint::Now());
+
+    delegate_.OnAnimatorUpdateLatestFrameTargetTime(
+        frame_timings_recorder_->GetVsyncTargetTime());
+
+    // Commit the pending continuation.
+    std::vector<std::unique_ptr<LayerTreeTask>> layer_tree_task_list;
+    layer_tree_task_list.reserve(layer_trees_tasks_.size());
+    for (auto& [view_id, layer_tree_task] : layer_trees_tasks_) {
+      layer_tree_task_list.push_back(std::move(layer_tree_task));
+    }
+    layer_trees_tasks_.clear();
+    PipelineProduceResult result = producer_continuation_.Complete(
+        std::make_unique<FrameItem>(std::move(layer_tree_task_list),
+                                    std::move(frame_timings_recorder_)));
+
+    if (!result.success) {
+      FML_DLOG(INFO) << "Failed to commit to the pipeline";
+    } else if (!result.is_first_item) {
+      // Do nothing. It has been successfully pushed to the pipeline but not as
+      // the first item. Eventually the 'Rasterizer' will consume it, so we
+      // don't need to notify the delegate.
+    } else {
+      delegate_.OnAnimatorDraw(layer_tree_pipeline_);
+    }
+  }
+  frame_timings_recorder_ = nullptr;
 
   if (!frame_scheduled_ && has_rendered_) {
     // Wait a tad more than 3 60hz frames before reporting a big idle period.
@@ -116,26 +168,33 @@ void Animator::BeginFrame(
           if (!self) {
             return;
           }
-          auto now = fml::TimeDelta::FromMicroseconds(Dart_TimelineGetMicros());
           // If there's a frame scheduled, bail.
           // If there's no frame scheduled, but we're not yet past the last
           // vsync deadline, bail.
-          if (!self->frame_scheduled_ && now > self->dart_frame_deadline_) {
-            TRACE_EVENT0("flutter", "BeginFrame idle callback");
-            self->delegate_.OnAnimatorNotifyIdle(
-                now + fml::TimeDelta::FromMilliseconds(100));
+          if (!self->frame_scheduled_) {
+            auto now =
+                fml::TimeDelta::FromMicroseconds(Dart_TimelineGetMicros());
+            if (now > self->dart_frame_deadline_) {
+              TRACE_EVENT0("flutter", "BeginFrame idle callback");
+              self->delegate_.OnAnimatorNotifyIdle(
+                  now + fml::TimeDelta::FromMilliseconds(100));
+            }
           }
         },
         kNotifyIdleTaskWaitTime);
   }
+  FML_DCHECK(layer_trees_tasks_.empty());
+  FML_DCHECK(frame_timings_recorder_ == nullptr);
 }
 
-void Animator::Render(std::shared_ptr<flutter::LayerTree> layer_tree) {
+void Animator::Render(int64_t view_id,
+                      std::unique_ptr<flutter::LayerTree> layer_tree,
+                      float device_pixel_ratio) {
   has_rendered_ = true;
-  last_layer_tree_size_ = layer_tree->frame_size();
 
   if (!frame_timings_recorder_) {
-    // Framework can directly call render with a built scene.
+    // Framework can directly call render with a built scene. A major reason is
+    // to render warm up frames.
     frame_timings_recorder_ = std::make_unique<FrameTimingsRecorder>();
     const fml::TimePoint placeholder_time = fml::TimePoint::Now();
     frame_timings_recorder_->RecordVsync(placeholder_time, placeholder_time);
@@ -143,31 +202,14 @@ void Animator::Render(std::shared_ptr<flutter::LayerTree> layer_tree) {
   }
 
   TRACE_EVENT_WITH_FRAME_NUMBER(frame_timings_recorder_, "flutter",
-                                "Animator::Render");
-  frame_timings_recorder_->RecordBuildEnd(fml::TimePoint::Now());
-
-  delegate_.OnAnimatorUpdateLatestFrameTargetTime(
-      frame_timings_recorder_->GetVsyncTargetTime());
-
-  auto layer_tree_item = std::make_unique<LayerTreeItem>(
-      std::move(layer_tree), std::move(frame_timings_recorder_));
-  // Commit the pending continuation.
-  PipelineProduceResult result =
-      producer_continuation_.Complete(std::move(layer_tree_item));
-
-  if (!result.success) {
-    FML_DLOG(INFO) << "No pending continuation to commit";
-    return;
-  }
-
-  if (!result.is_first_item) {
-    // It has been successfully pushed to the pipeline but not as the first
-    // item. Eventually the 'Rasterizer' will consume it, so we don't need to
-    // notify the delegate.
-    return;
-  }
-
-  delegate_.OnAnimatorDraw(layer_tree_pipeline_);
+                                "Animator::Render", /*flow_id_count=*/0,
+                                /*flow_ids=*/nullptr);
+
+  // Only inserts if the view ID has not been rendered before, ignoring
+  // duplicate Render calls.
+  layer_trees_tasks_.try_emplace(
+      view_id, std::make_unique<LayerTreeTask>(view_id, std::move(layer_tree),
+                                               device_pixel_ratio));
 }
 
 const std::weak_ptr<VsyncWaiter> Animator::GetVsyncWaiter() const {
@@ -175,15 +217,15 @@ const std::weak_ptr<VsyncWaiter> Animator::GetVsyncWaiter() const {
   return weak;
 }
 
-bool Animator::CanReuseLastLayerTree() {
-  return !regenerate_layer_tree_;
+bool Animator::CanReuseLastLayerTrees() {
+  return !regenerate_layer_trees_;
 }
 
-void Animator::DrawLastLayerTree(
+void Animator::DrawLastLayerTrees(
     std::unique_ptr<FrameTimingsRecorder> frame_timings_recorder) {
   // This method is very cheap, but this makes it explicitly clear in trace
   // files.
-  TRACE_EVENT0("flutter", "Animator::DrawLastLayerTree");
+  TRACE_EVENT0("flutter", "Animator::DrawLastLayerTrees");
 
   pending_frame_semaphore_.Signal();
   // In this case BeginFrame doesn't get called, we need to
@@ -193,18 +235,18 @@ void Animator::DrawLastLayerTree(
   const auto now = fml::TimePoint::Now();
   frame_timings_recorder->RecordBuildStart(now);
   frame_timings_recorder->RecordBuildEnd(now);
-  delegate_.OnAnimatorDrawLastLayerTree(std::move(frame_timings_recorder));
+  delegate_.OnAnimatorDrawLastLayerTrees(std::move(frame_timings_recorder));
 }
 
-void Animator::RequestFrame(bool regenerate_layer_tree) {
-  if (regenerate_layer_tree) {
+void Animator::RequestFrame(bool regenerate_layer_trees) {
+  if (regenerate_layer_trees) {
     // This event will be closed by BeginFrame. BeginFrame will only be called
-    // if regenerating the layer tree. If a frame has been requested to update
+    // if regenerating the layer trees. If a frame has been requested to update
     // an external texture, this will be false and no BeginFrame call will
     // happen.
     TRACE_EVENT_ASYNC_BEGIN0("flutter", "Frame Request Pending",
                              frame_request_number_);
-    regenerate_layer_tree_ = true;
+    regenerate_layer_trees_ = true;
   }
 
   if (!pending_frame_semaphore_.TryWait()) {
@@ -235,10 +277,11 @@ void Animator::AwaitVSync() {
       [self = weak_factory_.GetWeakPtr()](
           std::unique_ptr<FrameTimingsRecorder> frame_timings_recorder) {
         if (self) {
-          if (self->CanReuseLastLayerTree()) {
-            self->DrawLastLayerTree(std::move(frame_timings_recorder));
+          if (self->CanReuseLastLayerTrees()) {
+            self->DrawLastLayerTrees(std::move(frame_timings_recorder));
           } else {
             self->BeginFrame(std::move(frame_timings_recorder));
+            self->EndFrame();
           }
         }
       });
@@ -247,6 +290,12 @@ void Animator::AwaitVSync() {
   }
 }
 
+void Animator::OnAllViewsRendered() {
+  if (!layer_trees_tasks_.empty()) {
+    EndFrame();
+  }
+}
+
 void Animator::ScheduleSecondaryVsyncCallback(uintptr_t id,
                                               const fml::closure& callback) {
   waiter_->ScheduleSecondaryCallback(id, callback);
@@ -259,8 +308,17 @@ void Animator::ScheduleMaybeClearTraceFlowIds() {
           return;
         }
         if (!self->frame_scheduled_ && !self->trace_flow_ids_.empty()) {
-          TRACE_EVENT0("flutter",
-                       "Animator::ScheduleMaybeClearTraceFlowIds - callback");
+          size_t flow_id_count = self->trace_flow_ids_.size();
+          std::unique_ptr<uint64_t[]> flow_ids =
+              std::make_unique<uint64_t[]>(flow_id_count);
+          for (size_t i = 0; i < flow_id_count; ++i) {
+            flow_ids.get()[i] = self->trace_flow_ids_.at(i);
+          }
+
+          TRACE_EVENT0_WITH_FLOW_IDS(
+              "flutter", "Animator::ScheduleMaybeClearTraceFlowIds - callback",
+              flow_id_count, flow_ids.get());
+
           while (!self->trace_flow_ids_.empty()) {
             auto flow_id = self->trace_flow_ids_.front();
             TRACE_FLOW_END("flutter", "PointerEvent", flow_id);
diff --git a/shell/common/animator.h b/shell/common/animator.h
index 79373b5f0f24692533ac943ab0830edc8fcc827e..d559945358b990eaf19cb4864fdbcf4d6b2b9ca5 100644
--- a/shell/common/animator.h
+++ b/shell/common/animator.h
@@ -39,10 +39,9 @@ class Animator final {
     virtual void OnAnimatorUpdateLatestFrameTargetTime(
         fml::TimePoint frame_target_time) = 0;
 
-    virtual void OnAnimatorDraw(
-        std::shared_ptr<LayerTreePipeline> pipeline) = 0;
+    virtual void OnAnimatorDraw(std::shared_ptr<FramePipeline> pipeline) = 0;
 
-    virtual void OnAnimatorDrawLastLayerTree(
+    virtual void OnAnimatorDrawLastLayerTrees(
         std::unique_ptr<FrameTimingsRecorder> frame_timings_recorder) = 0;
   };
 
@@ -52,9 +51,41 @@ class Animator final {
 
   ~Animator();
 
-  void RequestFrame(bool regenerate_layer_tree = true);
+  void RequestFrame(bool regenerate_layer_trees = true);
 
-  void Render(std::shared_ptr<flutter::LayerTree> layer_tree);
+  //--------------------------------------------------------------------------
+  /// @brief    Tells the Animator that all views that should render for this
+  ///           frame have been rendered.
+  ///
+  ///           In regular frames, since all `Render` calls must take place
+  ///           during a vsync task, the Animator knows that all views have
+  ///           been rendered at the end of the vsync task, therefore calling
+  ///           this method is not needed.
+  ///
+  ///           However, the engine might decide to start it a bit earlier, for
+  ///           example, if the engine decides that no more views can be
+  ///           rendered, so that the rasterization can start a bit earlier.
+  ///
+  ///           This method is also useful in warm-up frames. In a warm up
+  ///           frame, `Animator::Render` is called out of vsync tasks, and
+  ///           Animator requires an explicit end-of-frame call to know when to
+  ///           send the layer trees to the pipeline.
+  ///
+  ///           For more about warm up frames, see
+  ///           `PlatformDispatcher.scheduleWarmUpFrame`.
+  ///
+  void OnAllViewsRendered();
+
+  //--------------------------------------------------------------------------
+  /// @brief    Tells the Animator that this frame needs to render another view.
+  ///
+  ///           This method must be called during a vsync callback, or
+  ///           technically, between Animator::BeginFrame and Animator::EndFrame
+  ///           (both private methods). Otherwise, this call will be ignored.
+  ///
+  void Render(int64_t view_id,
+              std::unique_ptr<flutter::LayerTree> layer_tree,
+              float device_pixel_ratio);
 
   const std::weak_ptr<VsyncWaiter> GetVsyncWaiter() const;
 
@@ -78,15 +109,21 @@ class Animator final {
 
   // Enqueue |trace_flow_id| into |trace_flow_ids_|.  The flow event will be
   // ended at either the next frame, or the next vsync interval with no active
-  // active rendering.
+  // rendering.
   void EnqueueTraceFlowId(uint64_t trace_flow_id);
 
  private:
+  // Animator's work during a vsync is split into two methods, BeginFrame and
+  // EndFrame. The two methods should be called synchronously back-to-back to
+  // avoid being interrupted by a regular vsync. The reason to split them is to
+  // allow ShellTest::PumpOneFrame to insert a Render in between.
+
   void BeginFrame(std::unique_ptr<FrameTimingsRecorder> frame_timings_recorder);
+  void EndFrame();
 
-  bool CanReuseLastLayerTree();
+  bool CanReuseLastLayerTrees();
 
-  void DrawLastLayerTree(
+  void DrawLastLayerTrees(
       std::unique_ptr<FrameTimingsRecorder> frame_timings_recorder);
 
   void AwaitVSync();
@@ -99,14 +136,15 @@ class Animator final {
   std::shared_ptr<VsyncWaiter> waiter_;
 
   std::unique_ptr<FrameTimingsRecorder> frame_timings_recorder_;
+  std::unordered_map<int64_t, std::unique_ptr<LayerTreeTask>>
+      layer_trees_tasks_;
   uint64_t frame_request_number_ = 1;
   fml::TimeDelta dart_frame_deadline_;
-  std::shared_ptr<LayerTreePipeline> layer_tree_pipeline_;
+  std::shared_ptr<FramePipeline> layer_tree_pipeline_;
   fml::Semaphore pending_frame_semaphore_;
-  LayerTreePipeline::ProducerContinuation producer_continuation_;
-  bool regenerate_layer_tree_ = false;
+  FramePipeline::ProducerContinuation producer_continuation_;
+  bool regenerate_layer_trees_ = false;
   bool frame_scheduled_ = false;
-  SkISize last_layer_tree_size_ = {0, 0};
   std::deque<uint64_t> trace_flow_ids_;
   bool has_rendered_ = false;
 
diff --git a/shell/common/animator_unittests.cc b/shell/common/animator_unittests.cc
index 05c728c57ae16c6d7cf7c55a5b1214d7976ffcd7..a1f96e799237634f7746ecfecc94f0a39aa2dd5b 100644
--- a/shell/common/animator_unittests.cc
+++ b/shell/common/animator_unittests.cc
@@ -23,22 +23,30 @@
 namespace flutter {
 namespace testing {
 
+constexpr int64_t kImplicitViewId = 0;
+
 class FakeAnimatorDelegate : public Animator::Delegate {
  public:
-  MOCK_METHOD2(OnAnimatorBeginFrame,
-               void(fml::TimePoint frame_target_time, uint64_t frame_number));
+  MOCK_METHOD(void,
+              OnAnimatorBeginFrame,
+              (fml::TimePoint frame_target_time, uint64_t frame_number),
+              (override));
 
   void OnAnimatorNotifyIdle(fml::TimeDelta deadline) override {
     notify_idle_called_ = true;
   }
 
-  MOCK_METHOD1(OnAnimatorUpdateLatestFrameTargetTime,
-               void(fml::TimePoint frame_target_time));
+  MOCK_METHOD(void,
+              OnAnimatorUpdateLatestFrameTargetTime,
+              (fml::TimePoint frame_target_time),
+              (override));
 
-  MOCK_METHOD1(OnAnimatorDraw,
-               void(std::shared_ptr<LayerTreePipeline> pipeline));
+  MOCK_METHOD(void,
+              OnAnimatorDraw,
+              (std::shared_ptr<FramePipeline> pipeline),
+              (override));
 
-  void OnAnimatorDrawLastLayerTree(
+  void OnAnimatorDrawLastLayerTrees(
       std::unique_ptr<FrameTimingsRecorder> frame_timings_recorder) override {}
 
   bool notify_idle_called_ = false;
@@ -81,7 +89,8 @@ TEST_F(ShellTest, VSyncTargetTime) {
         [vsync_clock, &create_vsync_waiter](Shell& shell) {
           return ShellTestPlatformView::Create(
               shell, shell.GetTaskRunners(), vsync_clock, create_vsync_waiter,
-              ShellTestPlatformView::BackendType::kDefaultBackend, nullptr);
+              ShellTestPlatformView::BackendType::kDefaultBackend, nullptr,
+              shell.GetIsGpuDisabledSyncSwitch());
         },
         [](Shell& shell) { return std::make_unique<Rasterizer>(shell); });
     ASSERT_TRUE(DartVMRef::IsInstanceRunning());
@@ -95,7 +104,7 @@ TEST_F(ShellTest, VSyncTargetTime) {
   platform_task.wait();
   on_target_time_latch.Wait();
   const auto vsync_waiter_target_time =
-      ConstantFiringVsyncWaiter::frame_target_time;
+      ConstantFiringVsyncWaiter::kFrameTargetTime;
   ASSERT_EQ(vsync_waiter_target_time.ToEpochDelta().ToMicroseconds(),
             target_time);
 
@@ -151,20 +160,30 @@ TEST_F(ShellTest, AnimatorDoesNotNotifyIdleBeforeRender) {
   latch.Wait();
   ASSERT_FALSE(delegate.notify_idle_called_);
 
+  fml::AutoResetWaitableEvent render_latch;
   // Validate it has not notified idle and try to render.
   task_runners.GetUITaskRunner()->PostDelayedTask(
       [&] {
         ASSERT_FALSE(delegate.notify_idle_called_);
-        auto layer_tree =
-            std::make_shared<LayerTree>(SkISize::Make(600, 800), 1.0);
-        animator->Render(std::move(layer_tree));
+        EXPECT_CALL(delegate, OnAnimatorBeginFrame).WillOnce([&] {
+          auto layer_tree = std::make_unique<LayerTree>(
+              LayerTree::Config(), SkISize::Make(600, 800));
+          animator->Render(kImplicitViewId, std::move(layer_tree), 1.0);
+          render_latch.Signal();
+        });
+        // Request a frame that builds a layer tree and renders a frame.
+        // When the frame is rendered, render_latch will be signaled.
+        animator->RequestFrame(true);
         task_runners.GetPlatformTaskRunner()->PostTask(flush_vsync_task);
       },
       // See kNotifyIdleTaskWaitTime in animator.cc.
       fml::TimeDelta::FromMilliseconds(60));
   latch.Wait();
+  render_latch.Wait();
 
-  // Still hasn't notified idle because there has been no frame request.
+  // A frame has been rendered, and the next frame request will notify idle.
+  // But at the moment there isn't another frame request, therefore it still
+  // hasn't notified idle.
   task_runners.GetUITaskRunner()->PostTask([&] {
     ASSERT_FALSE(delegate.notify_idle_called_);
     // False to avoid getting cals to BeginFrame that will request more frames
@@ -217,11 +236,6 @@ TEST_F(ShellTest, AnimatorDoesNotNotifyDelegateIfPipelineIsNotEmpty) {
   });
 
   fml::AutoResetWaitableEvent begin_frame_latch;
-  EXPECT_CALL(delegate, OnAnimatorBeginFrame)
-      .WillRepeatedly(
-          [&](fml::TimePoint frame_target_time, uint64_t frame_number) {
-            begin_frame_latch.Signal();
-          });
   // It must always be called when the method 'Animator::Render' is called,
   // regardless of whether the pipeline is empty or not.
   EXPECT_CALL(delegate, OnAnimatorUpdateLatestFrameTargetTime).Times(2);
@@ -232,16 +246,16 @@ TEST_F(ShellTest, AnimatorDoesNotNotifyDelegateIfPipelineIsNotEmpty) {
 
   for (int i = 0; i < 2; i++) {
     task_runners.GetUITaskRunner()->PostTask([&] {
+      EXPECT_CALL(delegate, OnAnimatorBeginFrame).WillOnce([&] {
+        auto layer_tree = std::make_unique<LayerTree>(LayerTree::Config(),
+                                                      SkISize::Make(600, 800));
+        animator->Render(kImplicitViewId, std::move(layer_tree), 1.0);
+        begin_frame_latch.Signal();
+      });
       animator->RequestFrame();
       task_runners.GetPlatformTaskRunner()->PostTask(flush_vsync_task);
     });
     begin_frame_latch.Wait();
-
-    PostTaskSync(task_runners.GetUITaskRunner(), [&] {
-      auto layer_tree =
-          std::make_shared<LayerTree>(SkISize::Make(600, 800), 1.0);
-      animator->Render(std::move(layer_tree));
-    });
   }
 
   PostTaskSync(task_runners.GetUITaskRunner(), [&] { animator.reset(); });
diff --git a/shell/common/base64.cc b/shell/common/base64.cc
new file mode 100644
index 0000000000000000000000000000000000000000..5924f1ecd6cf613bae77c62f288a2a0c5ac13e53
--- /dev/null
+++ b/shell/common/base64.cc
@@ -0,0 +1,160 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/common/base64.h"
+
+#include "flutter/fml/logging.h"
+
+#include <cstdint>
+
+#define DecodePad -2
+#define EncodePad 64
+
+static const char kDefaultEncode[] =
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    "abcdefghijklmnopqrstuvwxyz"
+    "0123456789+/=";
+
+static const signed char kDecodeData[] = {
+    62, -1, -1,        -1, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1,
+    -1, -1, DecodePad, -1, -1, -1, 0,  1,  2,  3,  4,  5,  6,  7,  8,  9,
+    10, 11, 12,        13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+    -1, -1, -1,        -1, -1, -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+    36, 37, 38,        39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51};
+
+namespace flutter {
+
+Base64::Error Base64::Decode(const void* srcv,
+                             size_t srcLength,
+                             void* dstv,
+                             size_t* dstLength) {
+  const unsigned char* src = static_cast<const unsigned char*>(srcv);
+  unsigned char* dst = static_cast<unsigned char*>(dstv);
+
+  int i = 0;
+  bool padTwo = false;
+  bool padThree = false;
+  char unsigned const* const end = src + srcLength;
+  while (src < end) {
+    unsigned char bytes[4] = {0, 0, 0, 0};
+    int byte = 0;
+    do {
+      unsigned char srcByte = *src++;
+      if (srcByte == 0) {
+        *dstLength = i;
+        return Error::kNone;
+      }
+      if (srcByte <= ' ') {
+        continue;  // treat as white space
+      }
+      if (srcByte < '+' || srcByte > 'z') {
+        return Error::kBadChar;
+      }
+      signed char decoded = kDecodeData[srcByte - '+'];
+      bytes[byte] = decoded;
+      if (decoded != DecodePad) {
+        if (decoded < 0) {
+          return Error::kBadChar;
+        }
+        byte++;
+        if (*src) {
+          continue;
+        }
+        if (byte == 0) {
+          *dstLength = i;
+          return Error::kNone;
+        }
+        if (byte == 4) {
+          break;
+        }
+      }
+      // As an optimization, if we find an equals sign
+      // we assume all future bytes to read are the
+      // appropriate number of padding equals signs.
+      if (byte < 2) {
+        return Error::kBadPadding;
+      }
+      padThree = true;
+      if (byte == 2) {
+        padTwo = true;
+      }
+      break;
+    } while (byte < 4);
+    int two = 0;
+    int three = 0;
+    if (dst) {
+      int one = (uint8_t)(bytes[0] << 2);
+      two = bytes[1];
+      one |= two >> 4;
+      two = (uint8_t)((two << 4) & 0xFF);
+      three = bytes[2];
+      two |= three >> 2;
+      three = (uint8_t)((three << 6) & 0xFF);
+      three |= bytes[3];
+      FML_DCHECK(one < 256 && two < 256 && three < 256);
+      dst[i] = (unsigned char)one;
+    }
+    i++;
+    if (padTwo) {
+      break;
+    }
+    if (dst) {
+      dst[i] = (unsigned char)two;
+    }
+    i++;
+    if (padThree) {
+      break;
+    }
+    if (dst) {
+      dst[i] = (unsigned char)three;
+    }
+    i++;
+  }
+  *dstLength = i;
+  return Error::kNone;
+}
+
+size_t Base64::Encode(const void* srcv, size_t length, void* dstv) {
+  FML_DCHECK(dstv);
+  const unsigned char* src = static_cast<const unsigned char*>(srcv);
+  unsigned char* dst = static_cast<unsigned char*>(dstv);
+
+  const char* encode = kDefaultEncode;
+  size_t remainder = length % 3;
+  char unsigned const* const end = &src[length - remainder];
+  while (src < end) {
+    unsigned a = *src++;
+    unsigned b = *src++;
+    unsigned c = *src++;
+    int d = c & 0x3F;
+    c = (c >> 6 | b << 2) & 0x3F;
+    b = (b >> 4 | a << 4) & 0x3F;
+    a = a >> 2;
+    // NOLINTBEGIN(clang-analyzer-core.NullDereference)
+    *dst++ = encode[a];
+    *dst++ = encode[b];
+    *dst++ = encode[c];
+    *dst++ = encode[d];
+    // NOLINTEND(clang-analyzer-core.NullDereference)
+  }
+  if (remainder > 0) {
+    int k1 = 0;
+    int k2 = EncodePad;
+    int a = (uint8_t)*src++;
+    if (remainder == 2) {
+      int b = *src++;
+      k1 = b >> 4;
+      k2 = (b << 2) & 0x3F;
+    }
+    // NOLINTBEGIN(clang-analyzer-core.NullDereference)
+    *dst++ = encode[a >> 2];
+    *dst++ = encode[(k1 | a << 4) & 0x3F];
+    *dst++ = encode[k2];
+    *dst++ = encode[EncodePad];
+    // NOLINTEND(clang-analyzer-core.NullDereference)
+  }
+  return EncodedSize(length);
+}
+
+}  // namespace flutter
diff --git a/shell/common/base64.h b/shell/common/base64.h
new file mode 100644
index 0000000000000000000000000000000000000000..18f8a56dad539d62912d54de88ea4aa0e1d84aac
--- /dev/null
+++ b/shell/common/base64.h
@@ -0,0 +1,59 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_COMMON_BASE64_H_
+#define FLUTTER_SHELL_COMMON_BASE64_H_
+
+#include <cstddef>
+
+namespace flutter {
+
+struct Base64 {
+ public:
+  enum class Error {
+    kNone,
+    kBadPadding,
+    kBadChar,
+  };
+
+  /**
+     Base64 encodes src into dst.
+
+     @param dst a pointer to a buffer large enough to receive the result.
+
+     @return the required length of dst for encoding.
+  */
+  static size_t Encode(const void* src, size_t length, void* dst);
+
+  /**
+     Returns the length of the buffer that needs to be allocated to encode
+     srcDataLength bytes.
+  */
+  static size_t EncodedSize(size_t srcDataLength) {
+    // Take the floor of division by 3 to find the number of groups that need to
+    // be encoded. Each group takes 4 bytes to be represented in base64.
+    return ((srcDataLength + 2) / 3) * 4;
+  }
+
+  /**
+     Base64 decodes src into dst.
+
+     This can be called once with 'dst' nullptr to get the required size,
+     then again with an allocated 'dst' pointer to do the actual decoding.
+
+     @param dst nullptr or a pointer to a buffer large enough to receive the
+     result
+
+     @param dstLength assigned the length dst is required to be. Must not be
+     nullptr.
+  */
+  [[nodiscard]] static Error Decode(const void* src,
+                                    size_t srcLength,
+                                    void* dst,
+                                    size_t* dstLength);
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_COMMON_BASE64_H_
diff --git a/shell/common/base64_unittests.cc b/shell/common/base64_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c9b3a04d5e4a17bf3e2377a0c977aad335714126
--- /dev/null
+++ b/shell/common/base64_unittests.cc
@@ -0,0 +1,122 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/common/base64.h"
+
+#include "fml/logging.h"
+#include "gtest/gtest.h"
+
+#include <string>
+
+namespace flutter {
+namespace testing {
+
+TEST(Base64, EncodeStrings) {
+  auto test = [](const std::string& input, const std::string& output) {
+    char buffer[256];
+    size_t len = Base64::Encode(input.c_str(), input.length(), &buffer);
+    FML_CHECK(len <= 256);
+    ASSERT_EQ(len, Base64::EncodedSize(input.length()));
+    std::string actual(buffer, len);
+    ASSERT_STREQ(actual.c_str(), output.c_str());
+  };
+  // Some arbitrary strings
+  test("apple", "YXBwbGU=");
+  test("BANANA", "QkFOQU5B");
+  test("Cherry Pie", "Q2hlcnJ5IFBpZQ==");
+  test("fLoCcInAuCiNiHiLiPiLiFiCaTiOn",
+       "ZkxvQ2NJbkF1Q2lOaUhpTGlQaUxpRmlDYVRpT24=");
+  test("", "");
+}
+
+TEST(Base64, EncodeBytes) {
+  auto test = [](const uint8_t input[], size_t num, const std::string& output) {
+    char buffer[512];
+    size_t len = Base64::Encode(input, num, &buffer);
+    FML_CHECK(len <= 512);
+    ASSERT_EQ(len, Base64::EncodedSize(num));
+    std::string actual(buffer, len);
+    ASSERT_STREQ(actual.c_str(), output.c_str());
+  };
+  // Some arbitrary raw bytes
+  uint8_t e[] = {0x02, 0x71, 0x82, 0x81, 0x82, 0x84, 0x59};
+  test(e, sizeof(e), "AnGCgYKEWQ==");
+
+  uint8_t pi[] = {0x03, 0x24, 0x3F, 0x6A, 0x88, 0x85};
+  test(pi, sizeof(pi), "AyQ/aoiF");
+
+  uint8_t bytes[256];
+  for (int i = 0; i < 256; i++) {
+    bytes[i] = i;
+  }
+  test(bytes, sizeof(bytes),
+       "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gIS"
+       "IjJCUmJygpKissLS4vMDEyMzQ1Njc4OTo7PD0+P0BBQkNERUZHSElKS0xNTk9QUVJTVFV"
+       "WV1hZWltcXV5fYGFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6e3x9fn+AgYKDhIWGh4iJ"
+       "iouMjY6PkJGSk5SVlpeYmZqbnJ2en6ChoqOkpaanqKmqq6ytrq+wsbKztLW2t7i5uru8v"
+       "b6/wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX2Nna29zd3t/g4eLj5OXm5+jp6uvs7e7v8P"
+       "Hy8/T19vf4+fr7/P3+/w==");
+}
+
+TEST(Base64, DecodeStringsSuccess) {
+  auto test = [](const std::string& input, const std::string& output) {
+    char buffer[256];
+    size_t len = 0;
+    auto err = Base64::Decode(input.c_str(), input.length(), &buffer, &len);
+    ASSERT_EQ(err, Base64::Error::kNone);
+    FML_CHECK(len <= 256);
+    std::string actual(buffer, len);
+    ASSERT_STREQ(actual.c_str(), output.c_str());
+  };
+  // Some arbitrary strings
+  test("ZGF0ZQ==", "date");
+  test("RWdncGxhbnQ=", "Eggplant");
+  test("RmlzaCAmIENoaXBz", "Fish & Chips");
+  test("U3VQZVJjQWxJZlJhR2lMaVN0SWNFeFBpQWxJZE9jSW9Vcw==",
+       "SuPeRcAlIfRaGiLiStIcExPiAlIdOcIoUs");
+
+  // Spaces are ignored
+  test("Y X Bwb GU=", "apple");
+}
+
+TEST(Base64, DecodeStringsHasErrors) {
+  auto test = [](const std::string& input, Base64::Error expectedError) {
+    char buffer[256];
+    size_t len = 0;
+    auto err = Base64::Decode(input.c_str(), input.length(), &buffer, &len);
+    ASSERT_EQ(err, expectedError) << input;
+  };
+
+  test("Nuts&Bolts", Base64::Error::kBadChar);
+  test("Error!", Base64::Error::kBadChar);
+  test(":", Base64::Error::kBadChar);
+
+  test("RmlzaCAmIENoaXBz=", Base64::Error::kBadPadding);
+  // Some cases of bad padding may be ignored due to an internal optimization
+  // test("ZGF0ZQ=", Base64::Error::kBadPadding);
+  // test("RWdncGxhbnQ", Base64::Error::kBadPadding);
+}
+
+TEST(Base64, DecodeBytes) {
+  auto test = [](const std::string& input, const uint8_t output[], size_t num) {
+    char buffer[256];
+    size_t len = 0;
+    auto err = Base64::Decode(input.c_str(), input.length(), &buffer, &len);
+    ASSERT_EQ(err, Base64::Error::kNone);
+    FML_CHECK(len <= 256);
+    ASSERT_EQ(num, len) << input;
+    for (int i = 0; i < int(len); i++) {
+      ASSERT_EQ(uint8_t(buffer[i]), output[i]) << input << i;
+    }
+  };
+  // Some arbitrary raw bytes, same as the byte output above
+  uint8_t e[] = {0x02, 0x71, 0x82, 0x81, 0x82, 0x84, 0x59};
+  test("AnGCgYKEWQ==", e, sizeof(e));
+
+  uint8_t pi[] = {0x03, 0x24, 0x3F, 0x6A, 0x88, 0x85};
+  test("AyQ/aoiF", pi, sizeof(pi));
+}
+
+}  // namespace testing
+}  // namespace flutter
\ No newline at end of file
diff --git a/shell/common/dart_native_benchmarks.cc b/shell/common/dart_native_benchmarks.cc
index 30a08a4f879f219b65b525e20402a1b04bb742cd..ff3999eefe0acf3dfba9437e7371e0c466942c66 100644
--- a/shell/common/dart_native_benchmarks.cc
+++ b/shell/common/dart_native_benchmarks.cc
@@ -44,8 +44,8 @@ BENCHMARK_F(DartNativeBenchmarks, TimeToFirstNativeMessageFromIsolateInNewVM)
     DartVMRef vm_ref = DartVMRef::Create(settings);
 
     ThreadHost thread_host("io.flutter.test.DartNativeBenchmarks.",
-                           ThreadHost::Type::Platform | ThreadHost::Type::IO |
-                               ThreadHost::Type::UI);
+                           ThreadHost::Type::kPlatform | ThreadHost::Type::kIo |
+                               ThreadHost::Type::kUi);
     TaskRunners task_runners(
         "test",
         thread_host.platform_thread->GetTaskRunner(),  // platform
@@ -81,8 +81,8 @@ BENCHMARK_F(DartNativeBenchmarks, MultipleDartToNativeMessages)
     DartVMRef vm_ref = DartVMRef::Create(settings);
 
     ThreadHost thread_host("io.flutter.test.DartNativeBenchmarks.",
-                           ThreadHost::Type::Platform | ThreadHost::Type::IO |
-                               ThreadHost::Type::UI);
+                           ThreadHost::Type::kPlatform | ThreadHost::Type::kIo |
+                               ThreadHost::Type::kUi);
     TaskRunners task_runners(
         "test",
         thread_host.platform_thread->GetTaskRunner(),  // platform
diff --git a/shell/common/display.h b/shell/common/display.h
index a4cd5aa0863e0773b451a6d71e7e1eff91735d1c..361e45bfc1207157c02f36137fca33fc24eaf742 100644
--- a/shell/common/display.h
+++ b/shell/common/display.h
@@ -14,11 +14,21 @@ namespace flutter {
 
 /// Unique ID per display that is stable until the Flutter application restarts.
 /// See also: `flutter::Display`
-typedef uint64_t DisplayId;
+typedef size_t DisplayId;
 
 /// To be used when the display refresh rate is unknown.
 static constexpr double kUnknownDisplayRefreshRate = 0;
 
+/// The POD of a |Display|. This data is for a point in time and suitable
+/// for copying.
+struct DisplayData {
+  DisplayId id;
+  double width;
+  double height;
+  double pixel_ratio;
+  double refresh_rate;
+};
+
 /// Display refers to a graphics hardware system consisting of a framebuffer,
 /// typically a monitor or a screen. This class holds the various display
 /// settings.
@@ -26,18 +36,17 @@ class Display {
  public:
   //------------------------------------------------------------------------------
   /// @brief Construct a new Display object in case where the display id of the
-  /// display is known. In cases where there is more than one display, every
-  /// display is expected to have a display id.
-  ///
-  Display(DisplayId display_id, double refresh_rate)
-      : display_id_(display_id), refresh_rate_(refresh_rate) {}
-
-  //------------------------------------------------------------------------------
-  /// @brief Construct a new Display object when there is only a single display.
-  /// When there are multiple displays, every display must have a display id.
-  ///
-  explicit Display(double refresh_rate)
-      : display_id_({}), refresh_rate_(refresh_rate) {}
+  /// display is known.
+  Display(DisplayId display_id,
+          double refresh_rate,
+          double width,
+          double height,
+          double device_pixel_ratio)
+      : display_id_(display_id),
+        refresh_rate_(refresh_rate),
+        width_(width),
+        height_(height),
+        device_pixel_ratio_(device_pixel_ratio) {}
 
   virtual ~Display() = default;
 
@@ -46,11 +55,33 @@ class Display {
   virtual double GetRefreshRate() const;
 
   /// Returns the `DisplayId` of the display.
-  std::optional<DisplayId> GetDisplayId() const { return display_id_; }
+  DisplayId GetDisplayId() const { return display_id_; }
+
+  /// The width of the display in physical pixels.
+  virtual double GetWidth() const { return width_; }
+
+  /// The height of the display in physical pixels.
+  virtual double GetHeight() const { return height_; }
+
+  /// The device pixel ratio of the display.
+  virtual double GetDevicePixelRatio() const { return device_pixel_ratio_; }
+
+  DisplayData GetDisplayData() {
+    return DisplayData{
+        .id = GetDisplayId(),
+        .width = GetWidth(),
+        .height = GetHeight(),
+        .pixel_ratio = GetDevicePixelRatio(),
+        .refresh_rate = GetRefreshRate(),
+    };
+  }
 
  private:
-  std::optional<DisplayId> display_id_;
+  DisplayId display_id_;
   double refresh_rate_;
+  double width_;
+  double height_;
+  double device_pixel_ratio_;
 
   FML_DISALLOW_COPY_AND_ASSIGN(Display);
 };
diff --git a/shell/common/display_manager.cc b/shell/common/display_manager.cc
index 75211308de7276c39303b11d1fc4a36c05ce7f6f..e9382028dc6268cdad38506040184af822b517b7 100644
--- a/shell/common/display_manager.cc
+++ b/shell/common/display_manager.cc
@@ -23,28 +23,10 @@ double DisplayManager::GetMainDisplayRefreshRate() const {
 }
 
 void DisplayManager::HandleDisplayUpdates(
-    DisplayUpdateType update_type,
     std::vector<std::unique_ptr<Display>> displays) {
+  FML_DCHECK(!displays.empty());
   std::scoped_lock lock(displays_mutex_);
-  CheckDisplayConfiguration(displays);
-  switch (update_type) {
-    case DisplayUpdateType::kStartup:
-      FML_CHECK(displays_.empty());
-      displays_ = std::move(displays);
-      return;
-    default:
-      FML_CHECK(false) << "Unknown DisplayUpdateType.";
-  }
-}
-
-void DisplayManager::CheckDisplayConfiguration(
-    const std::vector<std::unique_ptr<Display>>& displays) const {
-  FML_CHECK(!displays.empty());
-  if (displays.size() > 1) {
-    for (auto& display : displays) {
-      FML_CHECK(display->GetDisplayId().has_value());
-    }
-  }
+  displays_ = std::move(displays);
 }
 
 }  // namespace flutter
diff --git a/shell/common/display_manager.h b/shell/common/display_manager.h
index 774373d54e70be921bce8161d25155ceb87c1e74..ae3e9d0a5607eac7f8992ef3c0f85249893c1050 100644
--- a/shell/common/display_manager.h
+++ b/shell/common/display_manager.h
@@ -12,17 +12,6 @@
 
 namespace flutter {
 
-/// The update type parameter that is passed to
-/// `DisplayManager::HandleDisplayUpdates`.
-enum class DisplayUpdateType {
-  /// `flutter::Display`s that were active during start-up. A display is
-  /// considered active if:
-  ///    1. The frame buffer hardware is connected.
-  ///    2. The display is drawable, e.g. it isn't being mirrored from another
-  ///       connected display or sleeping.
-  kStartup
-};
-
 /// Manages lifecycle of the connected displays. This class is thread-safe.
 class DisplayManager {
  public:
@@ -39,20 +28,12 @@ class DisplayManager {
   double GetMainDisplayRefreshRate() const;
 
   /// Handles the display updates.
-  void HandleDisplayUpdates(DisplayUpdateType update_type,
-                            std::vector<std::unique_ptr<Display>> displays);
+  void HandleDisplayUpdates(std::vector<std::unique_ptr<Display>> displays);
 
  private:
   /// Guards `displays_` vector.
   mutable std::mutex displays_mutex_;
   std::vector<std::unique_ptr<Display>> displays_;
-
-  /// Checks that the provided display configuration is valid. Currently this
-  /// ensures that all the displays have an id in the case there are multiple
-  /// displays. In case where there is a single display, it is valid for the
-  /// display to not have an id.
-  void CheckDisplayConfiguration(
-      const std::vector<std::unique_ptr<Display>>& displays) const;
 };
 
 }  // namespace flutter
diff --git a/shell/common/dl_op_spy.cc b/shell/common/dl_op_spy.cc
new file mode 100644
index 0000000000000000000000000000000000000000..f3995a45cf2f2454da006c752c13059d270c59c5
--- /dev/null
+++ b/shell/common/dl_op_spy.cc
@@ -0,0 +1,146 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/common/dl_op_spy.h"
+
+namespace flutter {
+
+bool DlOpSpy::did_draw() {
+  return did_draw_;
+}
+
+void DlOpSpy::setColor(DlColor color) {
+  if (color.isTransparent()) {
+    will_draw_ = false;
+  } else {
+    will_draw_ = true;
+  }
+}
+void DlOpSpy::setColorSource(const DlColorSource* source) {
+  if (!source) {
+    return;
+  }
+  const DlColorColorSource* color_source = source->asColor();
+  if (color_source && color_source->color().isTransparent()) {
+    will_draw_ = false;
+    return;
+  }
+  will_draw_ = true;
+}
+void DlOpSpy::save() {}
+void DlOpSpy::saveLayer(const SkRect& bounds,
+                        const SaveLayerOptions options,
+                        const DlImageFilter* backdrop) {}
+void DlOpSpy::restore() {}
+void DlOpSpy::drawColor(DlColor color, DlBlendMode mode) {
+  did_draw_ |= !color.isTransparent();
+}
+void DlOpSpy::drawPaint() {
+  did_draw_ |= will_draw_;
+}
+// TODO(cyanglaz): check whether the shape (line, rect, oval, etc) needs to be
+// evaluated. https://github.com/flutter/flutter/issues/123803
+void DlOpSpy::drawLine(const SkPoint& p0, const SkPoint& p1) {
+  did_draw_ |= will_draw_;
+}
+void DlOpSpy::drawRect(const SkRect& rect) {
+  did_draw_ |= will_draw_;
+}
+void DlOpSpy::drawOval(const SkRect& bounds) {
+  did_draw_ |= will_draw_;
+}
+void DlOpSpy::drawCircle(const SkPoint& center, SkScalar radius) {
+  did_draw_ |= will_draw_;
+}
+void DlOpSpy::drawRRect(const SkRRect& rrect) {
+  did_draw_ |= will_draw_;
+}
+void DlOpSpy::drawDRRect(const SkRRect& outer, const SkRRect& inner) {
+  did_draw_ |= will_draw_;
+}
+void DlOpSpy::drawPath(const SkPath& path) {
+  did_draw_ |= will_draw_;
+}
+void DlOpSpy::drawArc(const SkRect& oval_bounds,
+                      SkScalar start_degrees,
+                      SkScalar sweep_degrees,
+                      bool use_center) {
+  did_draw_ |= will_draw_;
+}
+void DlOpSpy::drawPoints(PointMode mode,
+                         uint32_t count,
+                         const SkPoint points[]) {
+  did_draw_ |= will_draw_;
+}
+void DlOpSpy::drawVertices(const DlVertices* vertices, DlBlendMode mode) {
+  did_draw_ |= will_draw_;
+}
+// In theory, below drawImage methods can produce a transparent screen when a
+// transparent image is provided. The operation of determine whether an image is
+// transparent needs examine all the pixels in the image object, which is slow.
+// Drawing a completely transparent image is not a valid use case, thus, such
+// case is ignored.
+void DlOpSpy::drawImage(const sk_sp<DlImage> image,
+                        const SkPoint point,
+                        DlImageSampling sampling,
+                        bool render_with_attributes) {
+  did_draw_ = true;
+}
+void DlOpSpy::drawImageRect(const sk_sp<DlImage> image,
+                            const SkRect& src,
+                            const SkRect& dst,
+                            DlImageSampling sampling,
+                            bool render_with_attributes,
+                            SrcRectConstraint constraint) {
+  did_draw_ = true;
+}
+void DlOpSpy::drawImageNine(const sk_sp<DlImage> image,
+                            const SkIRect& center,
+                            const SkRect& dst,
+                            DlFilterMode filter,
+                            bool render_with_attributes) {
+  did_draw_ = true;
+}
+void DlOpSpy::drawAtlas(const sk_sp<DlImage> atlas,
+                        const SkRSXform xform[],
+                        const SkRect tex[],
+                        const DlColor colors[],
+                        int count,
+                        DlBlendMode mode,
+                        DlImageSampling sampling,
+                        const SkRect* cull_rect,
+                        bool render_with_attributes) {
+  did_draw_ = true;
+}
+void DlOpSpy::drawDisplayList(const sk_sp<DisplayList> display_list,
+                              SkScalar opacity) {
+  if (did_draw_ || opacity == 0) {
+    return;
+  }
+  DlOpSpy receiver;
+  display_list->Dispatch(receiver);
+  did_draw_ |= receiver.did_draw();
+}
+void DlOpSpy::drawTextBlob(const sk_sp<SkTextBlob> blob,
+                           SkScalar x,
+                           SkScalar y) {
+  did_draw_ |= will_draw_;
+}
+
+void DlOpSpy::drawTextFrame(
+    const std::shared_ptr<impeller::TextFrame>& text_frame,
+    SkScalar x,
+    SkScalar y) {
+  did_draw_ |= will_draw_;
+}
+
+void DlOpSpy::drawShadow(const SkPath& path,
+                         const DlColor color,
+                         const SkScalar elevation,
+                         bool transparent_occluder,
+                         SkScalar dpr) {
+  did_draw_ |= !color.isTransparent();
+}
+
+}  // namespace flutter
diff --git a/shell/common/dl_op_spy.h b/shell/common/dl_op_spy.h
new file mode 100644
index 0000000000000000000000000000000000000000..438a2757bf63108633f35636c6f3eb95b550f81f
--- /dev/null
+++ b/shell/common/dl_op_spy.h
@@ -0,0 +1,112 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_COMMON_DL_OP_SPY_H_
+#define FLUTTER_SHELL_COMMON_DL_OP_SPY_H_
+
+#include "flutter/display_list/dl_op_receiver.h"
+#include "flutter/display_list/utils/dl_receiver_utils.h"
+
+namespace flutter {
+
+//------------------------------------------------------------------------------
+/// Receives to drawing commands of a DisplayListBuilder.
+///
+/// This is used to determine whether any non-transparent pixels will be drawn
+/// on the canvas.
+/// All the drawImage operations are considered drawing non-transparent pixels.
+///
+/// To use this class, dispatch the operations from DisplayList to a concrete
+/// DlOpSpy object, and check the result of `did_draw` method.
+///
+/// ```
+///    DlOpSpy dl_op_spy;
+///    display_list.Dispatch(dl_op_spy);
+///    bool did_draw = dl_op_spy.did_draw()
+/// ```
+///
+class DlOpSpy final : public virtual DlOpReceiver,
+                      private IgnoreAttributeDispatchHelper,
+                      private IgnoreClipDispatchHelper,
+                      private IgnoreTransformDispatchHelper {
+ public:
+  //----------------------------------------------------------------------------
+  /// @brief      Returns true if any non transparent content has been drawn.
+  bool did_draw();
+
+ private:
+  void setColor(DlColor color) override;
+  void setColorSource(const DlColorSource* source) override;
+  void save() override;
+  void saveLayer(const SkRect& bounds,
+                 const SaveLayerOptions options,
+                 const DlImageFilter* backdrop) override;
+  void restore() override;
+  void drawColor(DlColor color, DlBlendMode mode) override;
+  void drawPaint() override;
+  void drawLine(const SkPoint& p0, const SkPoint& p1) override;
+  void drawRect(const SkRect& rect) override;
+  void drawOval(const SkRect& bounds) override;
+  void drawCircle(const SkPoint& center, SkScalar radius) override;
+  void drawRRect(const SkRRect& rrect) override;
+  void drawDRRect(const SkRRect& outer, const SkRRect& inner) override;
+  void drawPath(const SkPath& path) override;
+  void drawArc(const SkRect& oval_bounds,
+               SkScalar start_degrees,
+               SkScalar sweep_degrees,
+               bool use_center) override;
+  void drawPoints(PointMode mode,
+                  uint32_t count,
+                  const SkPoint points[]) override;
+  void drawVertices(const DlVertices* vertices, DlBlendMode mode) override;
+  void drawImage(const sk_sp<DlImage> image,
+                 const SkPoint point,
+                 DlImageSampling sampling,
+                 bool render_with_attributes) override;
+  void drawImageRect(
+      const sk_sp<DlImage> image,
+      const SkRect& src,
+      const SkRect& dst,
+      DlImageSampling sampling,
+      bool render_with_attributes,
+      SrcRectConstraint constraint = SrcRectConstraint::kFast) override;
+  void drawImageNine(const sk_sp<DlImage> image,
+                     const SkIRect& center,
+                     const SkRect& dst,
+                     DlFilterMode filter,
+                     bool render_with_attributes) override;
+  void drawAtlas(const sk_sp<DlImage> atlas,
+                 const SkRSXform xform[],
+                 const SkRect tex[],
+                 const DlColor colors[],
+                 int count,
+                 DlBlendMode mode,
+                 DlImageSampling sampling,
+                 const SkRect* cull_rect,
+                 bool render_with_attributes) override;
+  void drawDisplayList(const sk_sp<DisplayList> display_list,
+                       SkScalar opacity = SK_Scalar1) override;
+  void drawTextBlob(const sk_sp<SkTextBlob> blob,
+                    SkScalar x,
+                    SkScalar y) override;
+  void drawTextFrame(const std::shared_ptr<impeller::TextFrame>& text_frame,
+                     SkScalar x,
+                     SkScalar y) override;
+  void drawShadow(const SkPath& path,
+                  const DlColor color,
+                  const SkScalar elevation,
+                  bool transparent_occluder,
+                  SkScalar dpr) override;
+
+  // Indicates if the attributes are set to values that will modify the
+  // destination. For now, the test only checks if there is a non-transparent
+  // color set.
+  bool will_draw_ = true;
+
+  bool did_draw_ = false;
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_COMMON_DL_OP_SPY_H_
diff --git a/shell/common/dl_op_spy_unittests.cc b/shell/common/dl_op_spy_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..6aecb4b5dbf5e2fff847daefd387c92daea70791
--- /dev/null
+++ b/shell/common/dl_op_spy_unittests.cc
@@ -0,0 +1,598 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/display_list/display_list.h"
+#include "flutter/display_list/dl_builder.h"
+#include "flutter/display_list/testing/dl_test_snippets.h"
+#include "flutter/shell/common/dl_op_spy.h"
+#include "flutter/testing/testing.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "third_party/skia/include/core/SkFont.h"
+#include "third_party/skia/include/core/SkRSXform.h"
+
+namespace flutter {
+namespace testing {
+
+// The following macros demonstrate that the DlOpSpy class is equivalent
+// to DisplayList::affects_transparent_surface() now that DisplayListBuilder
+// implements operation culling.
+// See https://github.com/flutter/flutter/issues/125403
+#define ASSERT_DID_DRAW(spy, dl)                   \
+  do {                                             \
+    ASSERT_TRUE(spy.did_draw());                   \
+    ASSERT_TRUE(dl->modifies_transparent_black()); \
+  } while (0)
+
+#define ASSERT_NO_DRAW(spy, dl)                     \
+  do {                                              \
+    ASSERT_FALSE(spy.did_draw());                   \
+    ASSERT_FALSE(dl->modifies_transparent_black()); \
+  } while (0)
+
+TEST(DlOpSpy, DidDrawIsFalseByDefault) {
+  DlOpSpy dl_op_spy;
+  ASSERT_FALSE(dl_op_spy.did_draw());
+}
+
+TEST(DlOpSpy, EmptyDisplayList) {
+  DisplayListBuilder builder;
+  sk_sp<DisplayList> dl = builder.Build();
+  DlOpSpy dl_op_spy;
+  dl->Dispatch(dl_op_spy);
+  ASSERT_NO_DRAW(dl_op_spy, dl);
+}
+
+TEST(DlOpSpy, SetColor) {
+  {  // No Color set.
+    DisplayListBuilder builder;
+    DlPaint paint;
+    builder.DrawRect(SkRect::MakeWH(5, 5), paint);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_DID_DRAW(dl_op_spy, dl);
+  }
+  {  // Set transparent color.
+    DisplayListBuilder builder;
+    DlPaint paint(DlColor::kTransparent());
+    builder.DrawRect(SkRect::MakeWH(5, 5), paint);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_NO_DRAW(dl_op_spy, dl);
+  }
+  {  // Set black color.
+    DisplayListBuilder builder;
+    DlPaint paint(DlColor::kBlack());
+    builder.DrawRect(SkRect::MakeWH(5, 5), paint);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_DID_DRAW(dl_op_spy, dl);
+  }
+}
+
+TEST(DlOpSpy, SetColorSource) {
+  {  // Set null source
+    DisplayListBuilder builder;
+    DlPaint paint;
+    paint.setColorSource(nullptr);
+    builder.DrawRect(SkRect::MakeWH(5, 5), paint);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_DID_DRAW(dl_op_spy, dl);
+  }
+  {  // Set transparent color.
+    DisplayListBuilder builder;
+    DlPaint paint;
+    auto color = DlColor::kTransparent();
+    DlColorColorSource color_source_transparent(color);
+    paint.setColorSource(color_source_transparent.shared());
+    builder.DrawRect(SkRect::MakeWH(5, 5), paint);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_NO_DRAW(dl_op_spy, dl);
+  }
+  {  // Set black color.
+    DisplayListBuilder builder;
+    DlPaint paint;
+    auto color = DlColor::kBlack();
+    DlColorColorSource color_source_transparent(color);
+    paint.setColorSource(color_source_transparent.shared());
+    builder.DrawRect(SkRect::MakeWH(5, 5), paint);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_DID_DRAW(dl_op_spy, dl);
+  }
+}
+
+TEST(DlOpSpy, DrawColor) {
+  {  // Black color source.
+    DisplayListBuilder builder;
+    auto color = DlColor::kBlack();
+    builder.DrawColor(color, DlBlendMode::kSrc);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_DID_DRAW(dl_op_spy, dl);
+  }
+  {  // Transparent color with kSrc.
+    DisplayListBuilder builder;
+    auto color = DlColor::kTransparent();
+    builder.DrawColor(color, DlBlendMode::kSrc);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_NO_DRAW(dl_op_spy, dl);
+  }
+  {  // Transparent color with kSrcOver.
+    DisplayListBuilder builder;
+    auto color = DlColor::kTransparent();
+    builder.DrawColor(color, DlBlendMode::kSrcOver);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_NO_DRAW(dl_op_spy, dl);
+  }
+}
+
+TEST(DlOpSpy, DrawPaint) {
+  {  // Transparent color in paint.
+    DisplayListBuilder builder;
+    DlPaint paint(DlColor::kTransparent());
+    builder.DrawPaint(paint);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_NO_DRAW(dl_op_spy, dl);
+  }
+  {  // black color in paint.
+    DisplayListBuilder builder;
+    DlPaint paint(DlColor::kBlack());
+    builder.DrawPaint(paint);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_DID_DRAW(dl_op_spy, dl);
+  }
+}
+
+TEST(DlOpSpy, DrawLine) {
+  {  // black
+    DisplayListBuilder builder;
+    DlPaint paint(DlColor::kBlack());
+    builder.DrawLine(SkPoint::Make(0, 1), SkPoint::Make(1, 2), paint);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_DID_DRAW(dl_op_spy, dl);
+  }
+  {  // transparent
+    DisplayListBuilder builder;
+    DlPaint paint(DlColor::kTransparent());
+    builder.DrawLine(SkPoint::Make(0, 1), SkPoint::Make(1, 2), paint);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_NO_DRAW(dl_op_spy, dl);
+  }
+}
+
+TEST(DlOpSpy, DrawRect) {
+  {  // black
+    DisplayListBuilder builder;
+    DlPaint paint(DlColor::kBlack());
+    builder.DrawRect(SkRect::MakeWH(5, 5), paint);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_DID_DRAW(dl_op_spy, dl);
+  }
+  {  // transparent
+    DisplayListBuilder builder;
+    DlPaint paint(DlColor::kTransparent());
+    builder.DrawRect(SkRect::MakeWH(5, 5), paint);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_NO_DRAW(dl_op_spy, dl);
+  }
+}
+
+TEST(DlOpSpy, DrawOval) {
+  {  // black
+    DisplayListBuilder builder;
+    DlPaint paint(DlColor::kBlack());
+    builder.DrawOval(SkRect::MakeWH(5, 5), paint);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_DID_DRAW(dl_op_spy, dl);
+  }
+  {  // transparent
+    DisplayListBuilder builder;
+    DlPaint paint(DlColor::kTransparent());
+    builder.DrawOval(SkRect::MakeWH(5, 5), paint);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_NO_DRAW(dl_op_spy, dl);
+  }
+}
+
+TEST(DlOpSpy, DrawCircle) {
+  {  // black
+    DisplayListBuilder builder;
+    DlPaint paint(DlColor::kBlack());
+    builder.DrawCircle(SkPoint::Make(5, 5), 1.0, paint);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_DID_DRAW(dl_op_spy, dl);
+  }
+  {  // transparent
+    DisplayListBuilder builder;
+    DlPaint paint(DlColor::kTransparent());
+    builder.DrawCircle(SkPoint::Make(5, 5), 1.0, paint);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_NO_DRAW(dl_op_spy, dl);
+  }
+}
+
+TEST(DlOpSpy, DrawRRect) {
+  {  // black
+    DisplayListBuilder builder;
+    DlPaint paint(DlColor::kBlack());
+    builder.DrawRRect(SkRRect::MakeRect(SkRect::MakeWH(5, 5)), paint);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_DID_DRAW(dl_op_spy, dl);
+  }
+  {  // transparent
+    DisplayListBuilder builder;
+    DlPaint paint(DlColor::kTransparent());
+    builder.DrawRRect(SkRRect::MakeRect(SkRect::MakeWH(5, 5)), paint);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_NO_DRAW(dl_op_spy, dl);
+  }
+}
+
+TEST(DlOpSpy, DrawPath) {
+  {  // black line
+    DisplayListBuilder builder;
+    DlPaint paint(DlColor::kBlack());
+    paint.setDrawStyle(DlDrawStyle::kStroke);
+    builder.DrawPath(SkPath::Line(SkPoint::Make(0, 1), SkPoint::Make(1, 1)),
+                     paint);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_DID_DRAW(dl_op_spy, dl);
+  }
+  {  // triangle
+    DisplayListBuilder builder;
+    DlPaint paint(DlColor::kBlack());
+    SkPath path;
+    path.moveTo({0, 0});
+    path.lineTo({1, 0});
+    path.lineTo({0, 1});
+    builder.DrawPath(path, paint);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_DID_DRAW(dl_op_spy, dl);
+  }
+  {  // transparent line
+    DisplayListBuilder builder;
+    DlPaint paint(DlColor::kTransparent());
+    paint.setDrawStyle(DlDrawStyle::kStroke);
+    builder.DrawPath(SkPath::Line(SkPoint::Make(0, 1), SkPoint::Make(1, 1)),
+                     paint);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_NO_DRAW(dl_op_spy, dl);
+  }
+}
+
+TEST(DlOpSpy, DrawArc) {
+  {  // black
+    DisplayListBuilder builder;
+    DlPaint paint(DlColor::kBlack());
+    builder.DrawArc(SkRect::MakeWH(5, 5), 0, 1, true, paint);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_DID_DRAW(dl_op_spy, dl);
+  }
+  {  // transparent
+    DisplayListBuilder builder;
+    DlPaint paint(DlColor::kTransparent());
+    builder.DrawArc(SkRect::MakeWH(5, 5), 0, 1, true, paint);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_NO_DRAW(dl_op_spy, dl);
+  }
+}
+
+TEST(DlOpSpy, DrawPoints) {
+  {  // black
+    DisplayListBuilder builder;
+    DlPaint paint(DlColor::kBlack());
+    const SkPoint points[] = {SkPoint::Make(5, 4)};
+    builder.DrawPoints(DlCanvas::PointMode::kPoints, 1, points, paint);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_DID_DRAW(dl_op_spy, dl);
+  }
+  {  // transparent
+    DisplayListBuilder builder;
+    DlPaint paint(DlColor::kTransparent());
+    const SkPoint points[] = {SkPoint::Make(5, 4)};
+    builder.DrawPoints(DlCanvas::PointMode::kPoints, 1, points, paint);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_NO_DRAW(dl_op_spy, dl);
+  }
+}
+
+TEST(DlOpSpy, DrawVertices) {
+  {  // black
+    DisplayListBuilder builder;
+    DlPaint paint(DlColor::kBlack());
+    const SkPoint vertices[] = {
+        SkPoint::Make(5, 5),
+        SkPoint::Make(5, 15),
+        SkPoint::Make(15, 5),
+    };
+    const SkPoint texture_coordinates[] = {
+        SkPoint::Make(5, 5),
+        SkPoint::Make(15, 5),
+        SkPoint::Make(5, 15),
+    };
+    const DlColor colors[] = {
+        DlColor::kBlack(),
+        DlColor::kRed(),
+        DlColor::kGreen(),
+    };
+    auto dl_vertices = DlVertices::Make(DlVertexMode::kTriangles, 3, vertices,
+                                        texture_coordinates, colors, 0);
+    builder.DrawVertices(dl_vertices.get(), DlBlendMode::kSrc, paint);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_DID_DRAW(dl_op_spy, dl);
+  }
+  {  // transparent
+    DisplayListBuilder builder;
+    DlPaint paint(DlColor::kTransparent());
+    const SkPoint vertices[] = {
+        SkPoint::Make(5, 5),
+        SkPoint::Make(5, 15),
+        SkPoint::Make(15, 5),
+    };
+    const SkPoint texture_coordinates[] = {
+        SkPoint::Make(5, 5),
+        SkPoint::Make(15, 5),
+        SkPoint::Make(5, 15),
+    };
+    const DlColor colors[] = {
+        DlColor::kBlack(),
+        DlColor::kRed(),
+        DlColor::kGreen(),
+    };
+    auto dl_vertices = DlVertices::Make(DlVertexMode::kTriangles, 3, vertices,
+                                        texture_coordinates, colors, 0);
+    builder.DrawVertices(dl_vertices.get(), DlBlendMode::kSrc, paint);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_NO_DRAW(dl_op_spy, dl);
+  }
+}
+
+TEST(DlOpSpy, Images) {
+  {  // DrawImage
+    DisplayListBuilder builder;
+    DlPaint paint(DlColor::kBlack());
+    SkImageInfo info =
+        SkImageInfo::Make(50, 50, SkColorType::kRGBA_8888_SkColorType,
+                          SkAlphaType::kPremul_SkAlphaType);
+    SkBitmap bitmap;
+    bitmap.allocPixels(info, 0);
+    auto sk_image = SkImages::RasterFromBitmap(bitmap);
+    builder.DrawImage(DlImage::Make(sk_image), SkPoint::Make(5, 5),
+                      DlImageSampling::kLinear);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_DID_DRAW(dl_op_spy, dl);
+  }
+  {  // DrawImageRect
+    DisplayListBuilder builder;
+    DlPaint paint(DlColor::kBlack());
+    SkImageInfo info =
+        SkImageInfo::Make(50, 50, SkColorType::kRGBA_8888_SkColorType,
+                          SkAlphaType::kPremul_SkAlphaType);
+    SkBitmap bitmap;
+    bitmap.allocPixels(info, 0);
+    auto sk_image = SkImages::RasterFromBitmap(bitmap);
+    builder.DrawImageRect(DlImage::Make(sk_image), SkRect::MakeWH(5, 5),
+                          SkRect::MakeWH(5, 5), DlImageSampling::kLinear);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_DID_DRAW(dl_op_spy, dl);
+  }
+  {  // DrawImageNine
+    DisplayListBuilder builder;
+    DlPaint paint(DlColor::kBlack());
+    SkImageInfo info =
+        SkImageInfo::Make(50, 50, SkColorType::kRGBA_8888_SkColorType,
+                          SkAlphaType::kPremul_SkAlphaType);
+    SkBitmap bitmap;
+    bitmap.allocPixels(info, 0);
+    auto sk_image = SkImages::RasterFromBitmap(bitmap);
+    builder.DrawImageNine(DlImage::Make(sk_image), SkIRect::MakeWH(5, 5),
+                          SkRect::MakeWH(5, 5), DlFilterMode::kLinear);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_DID_DRAW(dl_op_spy, dl);
+  }
+  {  // DrawAtlas
+    DisplayListBuilder builder;
+    DlPaint paint(DlColor::kBlack());
+    SkImageInfo info =
+        SkImageInfo::Make(50, 50, SkColorType::kRGBA_8888_SkColorType,
+                          SkAlphaType::kPremul_SkAlphaType);
+    SkBitmap bitmap;
+    bitmap.allocPixels(info, 0);
+    auto sk_image = SkImages::RasterFromBitmap(bitmap);
+    const SkRSXform xform[] = {SkRSXform::Make(1, 0, 0, 0)};
+    const SkRect tex[] = {SkRect::MakeXYWH(10, 10, 10, 10)};
+    SkRect cull_rect = SkRect::MakeWH(5, 5);
+    builder.DrawAtlas(DlImage::Make(sk_image), xform, tex, nullptr, 1,
+                      DlBlendMode::kSrc, DlImageSampling::kLinear, &cull_rect);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_DID_DRAW(dl_op_spy, dl);
+  }
+}
+
+TEST(DlOpSpy, DrawDisplayList) {
+  {  // Recursive Transparent DisplayList
+    DisplayListBuilder builder;
+    DlPaint paint(DlColor::kTransparent());
+    builder.DrawPaint(paint);
+    sk_sp<DisplayList> dl = builder.Build();
+
+    DisplayListBuilder builder_parent;
+    DlPaint paint_parent(DlColor::kTransparent());
+    builder_parent.DrawPaint(paint_parent);
+    builder_parent.DrawDisplayList(dl, 1);
+    sk_sp<DisplayList> dl2 = builder_parent.Build();
+
+    DlOpSpy dl_op_spy;
+    dl2->Dispatch(dl_op_spy);
+    ASSERT_NO_DRAW(dl_op_spy, dl2);
+  }
+  {  // Sub non-transparent DisplayList,
+    DisplayListBuilder builder;
+    DlPaint paint(DlColor::kBlack());
+    builder.DrawPaint(paint);
+    sk_sp<DisplayList> dl = builder.Build();
+
+    DisplayListBuilder builder_parent;
+    DlPaint paint_parent(DlColor::kTransparent());
+    builder_parent.DrawPaint(paint_parent);
+    builder_parent.DrawDisplayList(dl, 1);
+    sk_sp<DisplayList> dl2 = builder_parent.Build();
+
+    DlOpSpy dl_op_spy;
+    dl2->Dispatch(dl_op_spy);
+    ASSERT_DID_DRAW(dl_op_spy, dl2);
+  }
+
+  {  // Sub non-transparent DisplayList, 0 opacity
+    DisplayListBuilder builder;
+    DlPaint paint(DlColor::kBlack());
+    builder.DrawPaint(paint);
+    sk_sp<DisplayList> dl = builder.Build();
+
+    DisplayListBuilder builder_parent;
+    DlPaint paint_parent(DlColor::kTransparent());
+    builder_parent.DrawPaint(paint_parent);
+    builder_parent.DrawDisplayList(dl, 0);
+    sk_sp<DisplayList> dl2 = builder_parent.Build();
+
+    DlOpSpy dl_op_spy;
+    dl2->Dispatch(dl_op_spy);
+    ASSERT_NO_DRAW(dl_op_spy, dl2);
+  }
+
+  {  // Parent non-transparent DisplayList
+    DisplayListBuilder builder;
+    DlPaint paint(DlColor::kTransparent());
+    builder.DrawPaint(paint);
+    sk_sp<DisplayList> dl = builder.Build();
+
+    DisplayListBuilder builder_parent;
+    DlPaint paint_parent(DlColor::kBlack());
+    builder_parent.DrawPaint(paint_parent);
+    builder_parent.DrawDisplayList(dl, 0);
+    sk_sp<DisplayList> dl2 = builder_parent.Build();
+
+    DlOpSpy dl_op_spy;
+    dl2->Dispatch(dl_op_spy);
+    ASSERT_DID_DRAW(dl_op_spy, dl2);
+  }
+}
+
+TEST(DlOpSpy, DrawTextBlob) {
+  {  // Non-transparent color.
+    DisplayListBuilder builder;
+    DlPaint paint(DlColor::kBlack());
+    std::string string = "xx";
+    SkFont font = CreateTestFontOfSize(12);
+    auto text_blob = SkTextBlob::MakeFromString(string.c_str(), font);
+    builder.DrawTextBlob(text_blob, 1, 1, paint);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_DID_DRAW(dl_op_spy, dl);
+  }
+  {  // transparent color.
+    DisplayListBuilder builder;
+    DlPaint paint(DlColor::kTransparent());
+    std::string string = "xx";
+    SkFont font = CreateTestFontOfSize(12);
+    auto text_blob = SkTextBlob::MakeFromString(string.c_str(), font);
+    builder.DrawTextBlob(text_blob, 1, 1, paint);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_NO_DRAW(dl_op_spy, dl);
+  }
+}
+
+TEST(DlOpSpy, DrawShadow) {
+  {  // valid shadow
+    DisplayListBuilder builder;
+    DlPaint paint;
+    DlColor color = DlColor::kBlack();
+    SkPath path = SkPath::Line(SkPoint::Make(0, 1), SkPoint::Make(1, 1));
+    builder.DrawShadow(path, color, 1, false, 1);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_DID_DRAW(dl_op_spy, dl);
+  }
+  {  // transparent color
+    DisplayListBuilder builder;
+    DlPaint paint;
+    DlColor color = DlColor::kTransparent();
+    SkPath path = SkPath::Line(SkPoint::Make(0, 1), SkPoint::Make(1, 1));
+    builder.DrawShadow(path, color, 1, false, 1);
+    sk_sp<DisplayList> dl = builder.Build();
+    DlOpSpy dl_op_spy;
+    dl->Dispatch(dl_op_spy);
+    ASSERT_NO_DRAW(dl_op_spy, dl);
+  }
+}
+
+}  // namespace testing
+}  // namespace flutter
diff --git a/shell/common/engine.cc b/shell/common/engine.cc
index bbdf61cac7194f7b779497f4e7d85ee76d0a8b14..c4081ad891e694e52d01725b7f6efe8c2f8aee55 100644
--- a/shell/common/engine.cc
+++ b/shell/common/engine.cc
@@ -18,6 +18,7 @@
 #include "flutter/shell/common/animator.h"
 #include "flutter/shell/common/platform_view.h"
 #include "flutter/shell/common/shell.h"
+#include "impeller/runtime_stage/runtime_stage.h"
 #include "rapidjson/document.h"
 #include "third_party/dart/runtime/include/dart_tools_api.h"
 
@@ -39,13 +40,14 @@ fml::MallocMapping MakeMapping(const std::string& str) {
 Engine::Engine(
     Delegate& delegate,
     const PointerDataDispatcherMaker& dispatcher_maker,
-    std::shared_ptr<fml::ConcurrentTaskRunner> image_decoder_task_runner,
+    const std::shared_ptr<fml::ConcurrentTaskRunner>& image_decoder_task_runner,
     const TaskRunners& task_runners,
     const Settings& settings,
     std::unique_ptr<Animator> animator,
-    fml::WeakPtr<IOManager> io_manager,
+    const fml::WeakPtr<IOManager>& io_manager,
     const std::shared_ptr<FontCollection>& font_collection,
-    std::unique_ptr<RuntimeController> runtime_controller)
+    std::unique_ptr<RuntimeController> runtime_controller,
+    const std::shared_ptr<fml::SyncSwitch>& gpu_disabled_switch)
     : delegate_(delegate),
       settings_(settings),
       animator_(std::move(animator)),
@@ -53,8 +55,9 @@ Engine::Engine(
       font_collection_(font_collection),
       image_decoder_(ImageDecoder::Make(settings_,
                                         task_runners,
-                                        std::move(image_decoder_task_runner),
-                                        std::move(io_manager))),
+                                        image_decoder_task_runner,
+                                        io_manager,
+                                        gpu_disabled_switch)),
       task_runners_(task_runners),
       weak_factory_(this) {
   pointer_data_dispatcher_ = dispatcher_maker(*this);
@@ -69,9 +72,11 @@ Engine::Engine(Delegate& delegate,
                const Settings& settings,
                std::unique_ptr<Animator> animator,
                fml::WeakPtr<IOManager> io_manager,
-               fml::RefPtr<SkiaUnrefQueue> unref_queue,
+               const fml::RefPtr<SkiaUnrefQueue>& unref_queue,
                fml::TaskRunnerAffineWeakPtr<SnapshotDelegate> snapshot_delegate,
-               std::shared_ptr<VolatilePathTracker> volatile_path_tracker)
+               std::shared_ptr<VolatilePathTracker> volatile_path_tracker,
+               const std::shared_ptr<fml::SyncSwitch>& gpu_disabled_switch,
+               impeller::RuntimeStageBackend runtime_stage_type)
     : Engine(delegate,
              dispatcher_maker,
              vm.GetConcurrentWorkerTaskRunner(),
@@ -80,7 +85,8 @@ Engine::Engine(Delegate& delegate,
              std::move(animator),
              io_manager,
              std::make_shared<FontCollection>(),
-             nullptr) {
+             nullptr,
+             gpu_disabled_switch) {
   runtime_controller_ = std::make_unique<RuntimeController>(
       *this,                                 // runtime delegate
       &vm,                                   // VM
@@ -94,7 +100,7 @@ Engine::Engine(Delegate& delegate,
           task_runners_,                           // task runners
           std::move(snapshot_delegate),            // snapshot delegate
           std::move(io_manager),                   // io manager
-          std::move(unref_queue),                  // Skia unref queue
+          unref_queue,                             // Skia unref queue
           image_decoder_->GetWeakPtr(),            // image decoder
           image_generator_registry_.GetWeakPtr(),  // image generator registry
           settings_.advisory_script_uri,           // advisory script uri
@@ -102,6 +108,7 @@ Engine::Engine(Delegate& delegate,
           std::move(volatile_path_tracker),        // volatile path tracker
           vm.GetConcurrentWorkerTaskRunner(),      // concurrent task runner
           settings_.enable_impeller,               // enable impeller
+          runtime_stage_type,                      // runtime stage type
       });
 }
 
@@ -112,7 +119,8 @@ std::unique_ptr<Engine> Engine::Spawn(
     std::unique_ptr<Animator> animator,
     const std::string& initial_route,
     const fml::WeakPtr<IOManager>& io_manager,
-    fml::TaskRunnerAffineWeakPtr<SnapshotDelegate> snapshot_delegate) const {
+    fml::TaskRunnerAffineWeakPtr<SnapshotDelegate> snapshot_delegate,
+    const std::shared_ptr<fml::SyncSwitch>& gpu_disabled_switch) const {
   auto result = std::make_unique<Engine>(
       /*delegate=*/delegate,
       /*dispatcher_maker=*/dispatcher_maker,
@@ -123,7 +131,8 @@ std::unique_ptr<Engine> Engine::Spawn(
       /*animator=*/std::move(animator),
       /*io_manager=*/io_manager,
       /*font_collection=*/font_collection_,
-      /*runtime_controller=*/nullptr);
+      /*runtime_controller=*/nullptr,
+      /*gpu_disabled_switch=*/gpu_disabled_switch);
   result->runtime_controller_ = runtime_controller_->Spawn(
       /*p_client=*/*result,
       /*advisory_script_uri=*/settings.advisory_script_uri,
@@ -137,6 +146,7 @@ std::unique_ptr<Engine> Engine::Spawn(
       /*image_generator_registry=*/result->GetImageGeneratorRegistry(),
       /*snapshot_delegate=*/std::move(snapshot_delegate));
   result->initial_route_ = initial_route;
+  result->asset_manager_ = asset_manager_;
   return result;
 }
 
@@ -165,7 +175,8 @@ fml::WeakPtr<ImageGeneratorRegistry> Engine::GetImageGeneratorRegistry() {
 
 bool Engine::UpdateAssetManager(
     const std::shared_ptr<AssetManager>& new_asset_manager) {
-  if (asset_manager_ == new_asset_manager) {
+  if (asset_manager_ && new_asset_manager &&
+      *asset_manager_ == *new_asset_manager) {
     return false;
   }
 
@@ -286,8 +297,17 @@ tonic::DartErrorHandleType Engine::GetUIIsolateLastError() {
   return runtime_controller_->GetLastError();
 }
 
-void Engine::SetViewportMetrics(const ViewportMetrics& metrics) {
-  runtime_controller_->SetViewportMetrics(metrics);
+void Engine::AddView(int64_t view_id, const ViewportMetrics& view_metrics) {
+  runtime_controller_->AddView(view_id, view_metrics);
+}
+
+bool Engine::RemoveView(int64_t view_id) {
+  return runtime_controller_->RemoveView(view_id);
+}
+
+void Engine::SetViewportMetrics(int64_t view_id,
+                                const ViewportMetrics& metrics) {
+  runtime_controller_->SetViewportMetrics(view_id, metrics);
   ScheduleFrame();
 }
 
@@ -331,7 +351,7 @@ bool Engine::HandleLifecyclePlatformMessage(PlatformMessage* message) {
       state == "AppLifecycleState.inactive") {
     ScheduleFrame();
   }
-  runtime_controller_->SetLifecycleState(state);
+  runtime_controller_->SetInitialLifecycleState(state);
   // Always forward these messages to the framework by returning false.
   return false;
 }
@@ -411,15 +431,18 @@ void Engine::HandleSettingsPlatformMessage(PlatformMessage* message) {
 void Engine::DispatchPointerDataPacket(
     std::unique_ptr<PointerDataPacket> packet,
     uint64_t trace_flow_id) {
-  TRACE_EVENT0("flutter", "Engine::DispatchPointerDataPacket");
+  TRACE_EVENT0_WITH_FLOW_IDS("flutter", "Engine::DispatchPointerDataPacket",
+                             /*flow_id_count=*/1,
+                             /*flow_ids=*/&trace_flow_id);
   TRACE_FLOW_STEP("flutter", "PointerEvent", trace_flow_id);
   pointer_data_dispatcher_->DispatchPacket(std::move(packet), trace_flow_id);
 }
 
-void Engine::DispatchSemanticsAction(int id,
+void Engine::DispatchSemanticsAction(int node_id,
                                      SemanticsAction action,
                                      fml::MallocMapping args) {
-  runtime_controller_->DispatchSemanticsAction(id, action, std::move(args));
+  runtime_controller_->DispatchSemanticsAction(node_id, action,
+                                               std::move(args));
 }
 
 void Engine::SetSemanticsEnabled(bool enabled) {
@@ -437,31 +460,33 @@ std::string Engine::DefaultRouteName() {
   return "/";
 }
 
-void Engine::ScheduleFrame(bool regenerate_layer_tree) {
-  animator_->RequestFrame(regenerate_layer_tree);
+void Engine::ScheduleFrame(bool regenerate_layer_trees) {
+  animator_->RequestFrame(regenerate_layer_trees);
 }
 
-void Engine::Render(std::shared_ptr<flutter::LayerTree> layer_tree) {
+void Engine::OnAllViewsRendered() {
+  animator_->OnAllViewsRendered();
+}
+
+void Engine::Render(int64_t view_id,
+                    std::unique_ptr<flutter::LayerTree> layer_tree,
+                    float device_pixel_ratio) {
   if (!layer_tree) {
     FML_DLOG(ERROR) << "Render layer_tree IS NULL";
     return;
   }
 
-   if (layer_tree->frame_size().isEmpty()){
-      FML_DLOG(INFO) << "engin Render frame_size is empty";
-   }
+  if (layer_tree->frame_size().isEmpty()) {
+    FML_DLOG(INFO) << "engin Render frame_size is empty";
+  }
 
-   if (layer_tree->device_pixel_ratio() <= 0.0f){
-      FML_DLOG(INFO) << "engin Render device_pixel_ratio <= 0";
-   }
-   
   // Ensure frame dimensions are sane.
-  if (layer_tree->frame_size().isEmpty() ||
-      layer_tree->device_pixel_ratio() <= 0.0f) {
-        FML_DLOG(INFO) << "engin layer_tree isEmpty";
+  if (layer_tree->frame_size().isEmpty() || device_pixel_ratio <= 0.0f) {
+    FML_DLOG(INFO) << "engin Render device_pixel_ratio <= 0";
     return;
   }
-  animator_->Render(std::move(layer_tree));
+
+  animator_->Render(view_id, std::move(layer_tree), device_pixel_ratio);
 }
 
 void Engine::UpdateSemantics(SemanticsNodeUpdates update,
@@ -491,6 +516,11 @@ std::unique_ptr<std::vector<std::string>> Engine::ComputePlatformResolvedLocale(
   return delegate_.ComputePlatformResolvedLocale(supported_locale_data);
 }
 
+double Engine::GetScaledFontSize(double unscaled_font_size,
+                                 int configuration_id) const {
+  return delegate_.GetScaledFontSize(unscaled_font_size, configuration_id);
+}
+
 void Engine::SetNeedsReportTimings(bool needs_reporting) {
   delegate_.SetNeedsReportTimings(needs_reporting);
 }
@@ -556,6 +586,10 @@ std::weak_ptr<PlatformMessageHandler> Engine::GetPlatformMessageHandler()
   return delegate_.GetPlatformMessageHandler();
 }
 
+void Engine::SendChannelUpdate(std::string name, bool listening) {
+  delegate_.OnEngineChannelUpdate(std::move(name), listening);
+}
+
 void Engine::LoadDartDeferredLibrary(
     intptr_t loading_unit_id,
     std::unique_ptr<const fml::Mapping> snapshot_data,
@@ -583,4 +617,13 @@ const std::weak_ptr<VsyncWaiter> Engine::GetVsyncWaiter() const {
   return animator_->GetVsyncWaiter();
 }
 
+void Engine::SetDisplays(const std::vector<DisplayData>& displays) {
+  runtime_controller_->SetDisplays(displays);
+  ScheduleFrame();
+}
+
+void Engine::ShutdownPlatformIsolates() {
+  runtime_controller_->ShutdownPlatformIsolates();
+}
+
 }  // namespace flutter
diff --git a/shell/common/engine.h b/shell/common/engine.h
index 70402c24a7876b11c98480af5c9b442e84bc969a..65660f6124c3f4d55c641e0ce6d8081ea9a995ba 100644
--- a/shell/common/engine.h
+++ b/shell/common/engine.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_COMMON_ENGINE_H_
-#define SHELL_COMMON_ENGINE_H_
+#ifndef FLUTTER_SHELL_COMMON_ENGINE_H_
+#define FLUTTER_SHELL_COMMON_ENGINE_H_
 
 #include <memory>
 #include <string>
@@ -29,10 +29,8 @@
 #include "flutter/shell/common/display_manager.h"
 #include "flutter/shell/common/platform_view.h"
 #include "flutter/shell/common/pointer_data_dispatcher.h"
-#include "flutter/shell/common/rasterizer.h"
 #include "flutter/shell/common/run_configuration.h"
 #include "flutter/shell/common/shell_io_manager.h"
-#include "third_party/skia/include/core/SkPicture.h"
 
 namespace flutter {
 
@@ -78,6 +76,7 @@ class Engine final : public RuntimeDelegate, PointerDataDispatcher::Delegate {
   /// @brief      Indicates the result of the call to `Engine::Run`.
   ///
   enum class RunStatus {
+    // NOLINTBEGIN(readability-identifier-naming)
     //--------------------------------------------------------------------------
     /// The call to |Engine::Run| was successful and the root isolate is in the
     /// `DartIsolate::Phase::Running` phase with its entry-point invocation
@@ -127,6 +126,7 @@ class Engine final : public RuntimeDelegate, PointerDataDispatcher::Delegate {
     ///   AOT mode operation of the Dart VM.
     ///
     Failure,
+    // NOLINTEND(readability-identifier-naming)
   };
 
   //----------------------------------------------------------------------------
@@ -294,6 +294,39 @@ class Engine final : public RuntimeDelegate, PointerDataDispatcher::Delegate {
     ///        Flutter to the host platform (and its responses).
     virtual const std::shared_ptr<PlatformMessageHandler>&
     GetPlatformMessageHandler() const = 0;
+
+    //--------------------------------------------------------------------------
+    /// @brief      Invoked when a listener is registered on a platform channel.
+    ///
+    /// @param[in]  name             The name of the platform channel to which a
+    ///                              listener has been registered or cleared.
+    ///
+    /// @param[in]  listening        Whether the listener has been set (true) or
+    ///                              cleared (false).
+    ///
+    virtual void OnEngineChannelUpdate(std::string name, bool listening) = 0;
+
+    //--------------------------------------------------------------------------
+    /// @brief      Synchronously invokes platform-specific APIs to apply the
+    ///             system text scaling on the given unscaled font size.
+    ///
+    ///             Platforms that support this feature (currently it's only
+    ///             implemented for Android SDK level 34+) will send a valid
+    ///             configuration_id to potential callers, before this method
+    ///             can be called.
+    ///
+    /// @param[in]  unscaled_font_size  The unscaled font size specified by the
+    ///                                 app developer. The value is in logical
+    ///                                 pixels, and is guaranteed to be finite
+    ///                                 and non-negative.
+    /// @param[in]  configuration_id    The unique id of the configuration to
+    ///                                 use for computing the scaled font size.
+    ///
+    /// @return     The scaled font size in logical pixels, or -1 when the given
+    ///             configuration_id did not match a valid configuration.
+    ///
+    virtual double GetScaledFontSize(double unscaled_font_size,
+                                     int configuration_id) const = 0;
   };
 
   //----------------------------------------------------------------------------
@@ -303,13 +336,15 @@ class Engine final : public RuntimeDelegate, PointerDataDispatcher::Delegate {
   ///
   Engine(Delegate& delegate,
          const PointerDataDispatcherMaker& dispatcher_maker,
-         std::shared_ptr<fml::ConcurrentTaskRunner> image_decoder_task_runner,
+         const std::shared_ptr<fml::ConcurrentTaskRunner>&
+             image_decoder_task_runner,
          const TaskRunners& task_runners,
          const Settings& settings,
          std::unique_ptr<Animator> animator,
-         fml::WeakPtr<IOManager> io_manager,
+         const fml::WeakPtr<IOManager>& io_manager,
          const std::shared_ptr<FontCollection>& font_collection,
-         std::unique_ptr<RuntimeController> runtime_controller);
+         std::unique_ptr<RuntimeController> runtime_controller,
+         const std::shared_ptr<fml::SyncSwitch>& gpu_disabled_switch);
 
   //----------------------------------------------------------------------------
   /// @brief      Creates an instance of the engine. This is done by the Shell
@@ -344,7 +379,7 @@ class Engine final : public RuntimeDelegate, PointerDataDispatcher::Delegate {
   ///                                snapshot a specified scene. The engine
   ///                                cannot snapshot a scene on the UI thread
   ///                                directly because the scene (described via
-  ///                                an `SkPicture`) may reference resources on
+  ///                                a `DisplayList`) may reference resources on
   ///                                the GPU and there is no GPU context current
   ///                                on the UI thread. The delegate is a
   ///                                component that has access to all the
@@ -362,9 +397,12 @@ class Engine final : public RuntimeDelegate, PointerDataDispatcher::Delegate {
          const Settings& settings,
          std::unique_ptr<Animator> animator,
          fml::WeakPtr<IOManager> io_manager,
-         fml::RefPtr<SkiaUnrefQueue> unref_queue,
+         const fml::RefPtr<SkiaUnrefQueue>& unref_queue,
          fml::TaskRunnerAffineWeakPtr<SnapshotDelegate> snapshot_delegate,
-         std::shared_ptr<VolatilePathTracker> volatile_path_tracker);
+         std::shared_ptr<VolatilePathTracker> volatile_path_tracker,
+         const std::shared_ptr<fml::SyncSwitch>& gpu_disabled_switch,
+         impeller::RuntimeStageBackend runtime_stage_type =
+             impeller::RuntimeStageBackend::kSkSL);
 
   //----------------------------------------------------------------------------
   /// @brief      Create a Engine that shares as many resources as
@@ -382,7 +420,8 @@ class Engine final : public RuntimeDelegate, PointerDataDispatcher::Delegate {
       std::unique_ptr<Animator> animator,
       const std::string& initial_route,
       const fml::WeakPtr<IOManager>& io_manager,
-      fml::TaskRunnerAffineWeakPtr<SnapshotDelegate> snapshot_delegate) const;
+      fml::TaskRunnerAffineWeakPtr<SnapshotDelegate> snapshot_delegate,
+      const std::shared_ptr<fml::SyncSwitch>& gpu_disabled_switch) const;
 
   //----------------------------------------------------------------------------
   /// @brief      Destroys the engine engine. Called by the shell on the UI task
@@ -674,16 +713,51 @@ class Engine final : public RuntimeDelegate, PointerDataDispatcher::Delegate {
   std::optional<uint32_t> GetUIIsolateReturnCode();
 
   //----------------------------------------------------------------------------
-  /// @brief      Updates the viewport metrics for the currently running Flutter
-  ///             application. The viewport metrics detail the size of the
-  ///             rendering viewport in texels as well as edge insets if
-  ///             present.
+  /// @brief      Notify the Flutter application that a new view is available.
+  ///
+  ///             A view must be added before other methods can refer to it,
+  ///             including the implicit view. Adding a view that already exists
+  ///             triggers an assertion.
+  ///
+  /// @param[in]  view_id           The ID of the new view.
+  /// @param[in]  viewport_metrics  The initial viewport metrics for the view.
+  ///
+  void AddView(int64_t view_id, const ViewportMetrics& view_metrics);
+
+  //----------------------------------------------------------------------------
+  /// @brief      Notify the Flutter application that a view is no
+  ///             longer available.
+  ///
+  ///             Removing a view that does not exist triggers an assertion.
+  ///
+  ///             The implicit view (kFlutterImplicitViewId) should never be
+  ///             removed. Doing so triggers an assertion.
+  ///
+  /// @param[in]  view_id  The ID of the view.
+  ///
+  /// @return     Whether the view was removed.
+  ///
+  bool RemoveView(int64_t view_id);
+
+  //----------------------------------------------------------------------------
+  /// @brief      Updates the viewport metrics for a view. The viewport metrics
+  ///             detail the size of the rendering viewport in texels as well as
+  ///             edge insets if present.
   ///
   /// @see        `ViewportMetrics`
   ///
-  /// @param[in]  metrics  The metrics
+  /// @param[in]  view_id  The ID for the view that `metrics` describes.
+  /// @param[in]  metrics  The metrics.
+  ///
+  void SetViewportMetrics(int64_t view_id, const ViewportMetrics& metrics);
+
+  //----------------------------------------------------------------------------
+  /// @brief      Updates the display metrics for the currently running Flutter
+  ///             application.
+  ///
+  /// @param[in]  displays  A complete list of displays
   ///
-  void SetViewportMetrics(const ViewportMetrics& metrics);
+  void SetDisplays(const std::vector<DisplayData>& displays);
 
   //----------------------------------------------------------------------------
   /// @brief      Notifies the engine that the embedder has sent it a message.
@@ -707,7 +781,7 @@ class Engine final : public RuntimeDelegate, PointerDataDispatcher::Delegate {
   /// @param[in]  trace_flow_id  The trace flow identifier associated with the
   ///                            pointer data packet. The engine uses this trace
   ///                            identifier to connect trace flows in the
-  ///                            timeline from the input event event to the
+  ///                            timeline from the input event to the
   ///                            frames generated due to those input events.
   ///                            These flows are tagged as "PointerEvent" in the
   ///                            timeline and allow grouping frames and input
@@ -722,12 +796,12 @@ class Engine final : public RuntimeDelegate, PointerDataDispatcher::Delegate {
   ///             originates on the platform view and has been forwarded to the
   ///             engine here on the UI task runner by the shell.
   ///
-  /// @param[in]  id      The identifier of the accessibility node.
+  /// @param[in]  node_id The identifier of the accessibility node.
   /// @param[in]  action  The accessibility related action performed on the
   ///                     node of the specified ID.
   /// @param[in]  args    Optional data that applies to the specified action.
   ///
-  void DispatchSemanticsAction(int id,
+  void DispatchSemanticsAction(int node_id,
                                SemanticsAction action,
                                fml::MallocMapping args);
 
@@ -760,12 +834,15 @@ class Engine final : public RuntimeDelegate, PointerDataDispatcher::Delegate {
   void SetAccessibilityFeatures(int32_t flags);
 
   // |RuntimeDelegate|
-  void ScheduleFrame(bool regenerate_layer_tree) override;
+  void ScheduleFrame(bool regenerate_layer_trees) override;
 
   /// Schedule a frame with the default parameter of regenerating the layer
   /// tree.
   void ScheduleFrame() { ScheduleFrame(true); }
 
+  // |RuntimeDelegate|
+  void OnAllViewsRendered() override;
+
   // |RuntimeDelegate|
   FontCollection& GetFontCollection() override;
 
@@ -870,7 +947,7 @@ class Engine final : public RuntimeDelegate, PointerDataDispatcher::Delegate {
   ///                              temporary conditions such as no network.
   ///                              Transient errors allow the dart VM to
   ///                              re-request the same deferred library and
-  ///                              and loading_unit_id again. Non-transient
+  ///                              loading_unit_id again. Non-transient
   ///                              errors are permanent and attempts to
   ///                              re-request the library will instantly
   ///                              complete with an error.
@@ -887,12 +964,20 @@ class Engine final : public RuntimeDelegate, PointerDataDispatcher::Delegate {
 
   const std::weak_ptr<VsyncWaiter> GetVsyncWaiter() const;
 
+  //--------------------------------------------------------------------------
+  /// @brief      Shuts down all registered platform isolates. Must be called
+  ///             from the platform thread.
+  ///
+  void ShutdownPlatformIsolates();
+
  private:
   // |RuntimeDelegate|
   std::string DefaultRouteName() override;
 
   // |RuntimeDelegate|
-  void Render(std::shared_ptr<flutter::LayerTree> layer_tree) override;
+  void Render(int64_t view_id,
+              std::unique_ptr<flutter::LayerTree> layer_tree,
+              float device_pixel_ratio) override;
 
   // |RuntimeDelegate|
   void UpdateSemantics(SemanticsNodeUpdates update,
@@ -919,6 +1004,13 @@ class Engine final : public RuntimeDelegate, PointerDataDispatcher::Delegate {
   std::weak_ptr<PlatformMessageHandler> GetPlatformMessageHandler()
       const override;
 
+  // |RuntimeDelegate|
+  void SendChannelUpdate(std::string name, bool listening) override;
+
+  // |RuntimeDelegate|
+  double GetScaledFontSize(double unscaled_font_size,
+                           int configuration_id) const override;
+
   void SetNeedsReportTimings(bool value) override;
 
   bool HandleLifecyclePlatformMessage(PlatformMessage* message);
@@ -961,4 +1053,4 @@ class Engine final : public RuntimeDelegate, PointerDataDispatcher::Delegate {
 
 }  // namespace flutter
 
-#endif  // SHELL_COMMON_ENGINE_H_
+#endif  // FLUTTER_SHELL_COMMON_ENGINE_H_
diff --git a/shell/common/engine_animator_unittests.cc b/shell/common/engine_animator_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..331bab77e9a16d53f39d3669b27a6a87a8316e29
--- /dev/null
+++ b/shell/common/engine_animator_unittests.cc
@@ -0,0 +1,653 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/common/engine.h"
+
+// #include <cstring>
+
+#include "flutter/common/constants.h"
+#include "flutter/lib/ui/compositing/scene_builder.h"
+#include "flutter/shell/common/shell_test.h"
+#include "flutter/testing/fixture_test.h"
+#include "gmock/gmock.h"
+
+// CREATE_NATIVE_ENTRY is leaky by design
+// NOLINTBEGIN(clang-analyzer-core.StackAddressEscape)
+
+namespace flutter {
+
+namespace {
+
+using ::testing::Invoke;
+using ::testing::ReturnRef;
+
+fml::AutoResetWaitableEvent native_latch;
+
+void PostSync(const fml::RefPtr<fml::TaskRunner>& task_runner,
+              const fml::closure& task) {
+  fml::AutoResetWaitableEvent latch;
+  fml::TaskRunner::RunNowOrPostTask(task_runner, [&latch, &task] {
+    task();
+    latch.Signal();
+  });
+  latch.Wait();
+}
+
+// Sort the argument list of `LayerTreeTask` into a new list that is sorted by
+// their view IDs. `FrameItem::layer_tree_tasks` might not come sorted.
+std::vector<const LayerTreeTask*> Sorted(
+    const std::vector<std::unique_ptr<LayerTreeTask>>& layer_tree_tasks) {
+  std::vector<const LayerTreeTask*> result;
+  result.reserve(layer_tree_tasks.size());
+  for (auto& task_ptr : layer_tree_tasks) {
+    result.push_back(task_ptr.get());
+  }
+  std::sort(result.begin(), result.end(),
+            [](const LayerTreeTask* a, const LayerTreeTask* b) {
+              return a->view_id < b->view_id;
+            });
+  return result;
+}
+
+class MockDelegate : public Engine::Delegate {
+ public:
+  MOCK_METHOD(void,
+              OnEngineUpdateSemantics,
+              (SemanticsNodeUpdates, CustomAccessibilityActionUpdates),
+              (override));
+  MOCK_METHOD(void,
+              OnEngineHandlePlatformMessage,
+              (std::unique_ptr<PlatformMessage>),
+              (override));
+  MOCK_METHOD(void, OnPreEngineRestart, (), (override));
+  MOCK_METHOD(void, OnRootIsolateCreated, (), (override));
+  MOCK_METHOD(void,
+              UpdateIsolateDescription,
+              (const std::string, int64_t),
+              (override));
+  MOCK_METHOD(void, SetNeedsReportTimings, (bool), (override));
+  MOCK_METHOD(std::unique_ptr<std::vector<std::string>>,
+              ComputePlatformResolvedLocale,
+              (const std::vector<std::string>&),
+              (override));
+  MOCK_METHOD(void, RequestDartDeferredLibrary, (intptr_t), (override));
+  MOCK_METHOD(fml::TimePoint, GetCurrentTimePoint, (), (override));
+  MOCK_METHOD(const std::shared_ptr<PlatformMessageHandler>&,
+              GetPlatformMessageHandler,
+              (),
+              (const, override));
+  MOCK_METHOD(void, OnEngineChannelUpdate, (std::string, bool), (override));
+  MOCK_METHOD(double,
+              GetScaledFontSize,
+              (double font_size, int configuration_id),
+              (const, override));
+};
+
+class MockAnimatorDelegate : public Animator::Delegate {
+ public:
+  /* Animator::Delegate */
+  MOCK_METHOD(void,
+              OnAnimatorBeginFrame,
+              (fml::TimePoint frame_target_time, uint64_t frame_number),
+              (override));
+  MOCK_METHOD(void,
+              OnAnimatorNotifyIdle,
+              (fml::TimeDelta deadline),
+              (override));
+  MOCK_METHOD(void,
+              OnAnimatorUpdateLatestFrameTargetTime,
+              (fml::TimePoint frame_target_time),
+              (override));
+  MOCK_METHOD(void,
+              OnAnimatorDraw,
+              (std::shared_ptr<FramePipeline> pipeline),
+              (override));
+  MOCK_METHOD(void,
+              OnAnimatorDrawLastLayerTrees,
+              (std::unique_ptr<FrameTimingsRecorder> frame_timings_recorder),
+              (override));
+};
+
+class MockPlatformMessageHandler : public PlatformMessageHandler {
+ public:
+  MOCK_METHOD(void,
+              HandlePlatformMessage,
+              (std::unique_ptr<PlatformMessage> message),
+              (override));
+  MOCK_METHOD(bool,
+              DoesHandlePlatformMessageOnPlatformThread,
+              (),
+              (const, override));
+  MOCK_METHOD(void,
+              InvokePlatformMessageResponseCallback,
+              (int response_id, std::unique_ptr<fml::Mapping> mapping),
+              (override));
+  MOCK_METHOD(void,
+              InvokePlatformMessageEmptyResponseCallback,
+              (int response_id),
+              (override));
+};
+
+class EngineAnimatorTest : public testing::FixtureTest {
+ public:
+  EngineAnimatorTest()
+      : thread_host_("EngineAnimatorTest",
+                     ThreadHost::Type::kPlatform | ThreadHost::Type::kIo |
+                         ThreadHost::Type::kUi | ThreadHost::Type::kRaster),
+        task_runners_({
+            "EngineAnimatorTest",
+            thread_host_.platform_thread->GetTaskRunner(),  // platform
+            thread_host_.raster_thread->GetTaskRunner(),    // raster
+            thread_host_.ui_thread->GetTaskRunner(),        // ui
+            thread_host_.io_thread->GetTaskRunner()         // io
+        }) {}
+
+  void PostUITaskSync(const std::function<void()>& function) {
+    fml::AutoResetWaitableEvent latch;
+    task_runners_.GetUITaskRunner()->PostTask([&] {
+      function();
+      latch.Signal();
+    });
+    latch.Wait();
+  }
+
+ protected:
+  void SetUp() override {
+    settings_ = CreateSettingsForFixture();
+    dispatcher_maker_ = [](PointerDataDispatcher::Delegate&) {
+      return nullptr;
+    };
+  }
+
+  MockDelegate delegate_;
+  PointerDataDispatcherMaker dispatcher_maker_;
+  ThreadHost thread_host_;
+  TaskRunners task_runners_;
+  Settings settings_;
+  std::unique_ptr<Animator> animator_;
+  fml::WeakPtr<IOManager> io_manager_;
+  std::unique_ptr<RuntimeController> runtime_controller_;
+  std::shared_ptr<fml::ConcurrentTaskRunner> image_decoder_task_runner_;
+  fml::TaskRunnerAffineWeakPtr<SnapshotDelegate> snapshot_delegate_;
+};
+
+// A class that can launch an Engine with the specified Engine::Delegate.
+//
+// To use this class, contruct this class with Create, call Run, and use the
+// engine with EngineTaskSync().
+class EngineContext {
+ public:
+  using EngineCallback = std::function<void(Engine&)>;
+
+  [[nodiscard]] static std::unique_ptr<EngineContext> Create(
+      Engine::Delegate& delegate,       //
+      Settings settings,                //
+      const TaskRunners& task_runners,  //
+      std::unique_ptr<Animator> animator) {
+    auto [vm, isolate_snapshot] = Shell::InferVmInitDataFromSettings(settings);
+    FML_CHECK(vm) << "Must be able to initialize the VM.";
+    // Construct the class with `new` because `make_unique` has no access to the
+    // private constructor.
+    EngineContext* raw_pointer =
+        new EngineContext(delegate, settings, task_runners, std::move(animator),
+                          vm, isolate_snapshot);
+    return std::unique_ptr<EngineContext>(raw_pointer);
+  }
+
+  void Run(RunConfiguration configuration) {
+    PostSync(task_runners_.GetUITaskRunner(), [this, &configuration] {
+      Engine::RunStatus run_status = engine_->Run(std::move(configuration));
+      FML_CHECK(run_status == Engine::RunStatus::Success)
+          << "Engine failed to run.";
+      (void)run_status;  // Suppress unused-variable warning
+    });
+  }
+
+  // Run a task that operates the Engine on the UI thread, and wait for the
+  // task to end.
+  //
+  // If called on the UI thread, the task is executed synchronously.
+  void EngineTaskSync(EngineCallback task) {
+    ASSERT_TRUE(engine_);
+    ASSERT_TRUE(task);
+    auto runner = task_runners_.GetUITaskRunner();
+    if (runner->RunsTasksOnCurrentThread()) {
+      task(*engine_);
+    } else {
+      PostSync(task_runners_.GetUITaskRunner(), [&]() { task(*engine_); });
+    }
+  }
+
+  ~EngineContext() {
+    PostSync(task_runners_.GetUITaskRunner(), [this] { engine_.reset(); });
+  }
+
+ private:
+  EngineContext(Engine::Delegate& delegate,          //
+                Settings settings,                   //
+                const TaskRunners& task_runners,     //
+                std::unique_ptr<Animator> animator,  //
+                const DartVMRef& vm,                 //
+                fml::RefPtr<const DartSnapshot> isolate_snapshot)
+      : task_runners_(task_runners), vm_(vm) {
+    PostSync(task_runners.GetUITaskRunner(), [this, &settings, &animator,
+                                              &delegate, &isolate_snapshot] {
+      auto dispatcher_maker =
+          [](DefaultPointerDataDispatcher::Delegate& delegate) {
+            return std::make_unique<DefaultPointerDataDispatcher>(delegate);
+          };
+      engine_ = std::make_unique<Engine>(
+          /*delegate=*/delegate,
+          /*dispatcher_maker=*/dispatcher_maker,
+          /*vm=*/*&vm_,
+          /*isolate_snapshot=*/std::move(isolate_snapshot),
+          /*task_runners=*/task_runners_,
+          /*platform_data=*/PlatformData(),
+          /*settings=*/settings,
+          /*animator=*/std::move(animator),
+          /*io_manager=*/io_manager_,
+          /*unref_queue=*/nullptr,
+          /*snapshot_delegate=*/snapshot_delegate_,
+          /*volatile_path_tracker=*/nullptr,
+          /*gpu_disabled_switch=*/std::make_shared<fml::SyncSwitch>());
+    });
+  }
+
+  TaskRunners task_runners_;
+  DartVMRef vm_;
+  std::unique_ptr<Engine> engine_;
+
+  fml::WeakPtr<IOManager> io_manager_;
+  fml::TaskRunnerAffineWeakPtr<SnapshotDelegate> snapshot_delegate_;
+};
+}  // namespace
+
+TEST_F(EngineAnimatorTest, AnimatorAcceptsMultipleRenders) {
+  MockAnimatorDelegate animator_delegate;
+  std::unique_ptr<EngineContext> engine_context;
+
+  std::shared_ptr<PlatformMessageHandler> platform_message_handler =
+      std::make_shared<MockPlatformMessageHandler>();
+  EXPECT_CALL(delegate_, GetPlatformMessageHandler)
+      .WillOnce(ReturnRef(platform_message_handler));
+  fml::AutoResetWaitableEvent draw_latch;
+  EXPECT_CALL(animator_delegate, OnAnimatorDraw)
+      .WillOnce(
+          Invoke([&draw_latch](const std::shared_ptr<FramePipeline>& pipeline) {
+            auto status =
+                pipeline->Consume([&](std::unique_ptr<FrameItem> item) {
+                  auto tasks = Sorted(item->layer_tree_tasks);
+                  EXPECT_EQ(tasks.size(), 2u);
+                  EXPECT_EQ(tasks[0]->view_id, 1);
+                  EXPECT_EQ(tasks[1]->view_id, 2);
+                });
+            EXPECT_EQ(status, PipelineConsumeResult::Done);
+            draw_latch.Signal();
+          }));
+  EXPECT_CALL(animator_delegate, OnAnimatorBeginFrame)
+      .WillOnce(Invoke([&engine_context](fml::TimePoint frame_target_time,
+                                         uint64_t frame_number) {
+        engine_context->EngineTaskSync([&](Engine& engine) {
+          engine.BeginFrame(frame_target_time, frame_number);
+        });
+      }));
+
+  native_latch.Reset();
+  AddNativeCallback("NotifyNative", [](auto args) { native_latch.Signal(); });
+
+  std::unique_ptr<Animator> animator;
+  PostSync(task_runners_.GetUITaskRunner(),
+           [&animator, &animator_delegate, &task_runners = task_runners_] {
+             animator = std::make_unique<Animator>(
+                 animator_delegate, task_runners,
+                 static_cast<std::unique_ptr<VsyncWaiter>>(
+                     std::make_unique<testing::ConstantFiringVsyncWaiter>(
+                         task_runners)));
+           });
+
+  engine_context = EngineContext::Create(delegate_, settings_, task_runners_,
+                                         std::move(animator));
+  auto configuration = RunConfiguration::InferFromSettings(settings_);
+  configuration.SetEntrypoint("onDrawFrameRenderAllViews");
+  engine_context->Run(std::move(configuration));
+
+  engine_context->EngineTaskSync([](Engine& engine) {
+    engine.AddView(1, ViewportMetrics{1, 10, 10, 22, 0});
+    engine.AddView(2, ViewportMetrics{1, 10, 10, 22, 0});
+  });
+
+  native_latch.Wait();
+
+  engine_context->EngineTaskSync(
+      [](Engine& engine) { engine.ScheduleFrame(); });
+  draw_latch.Wait();
+}
+
+TEST_F(EngineAnimatorTest, IgnoresOutOfFrameRenders) {
+  MockAnimatorDelegate animator_delegate;
+  std::unique_ptr<EngineContext> engine_context;
+
+  std::shared_ptr<PlatformMessageHandler> platform_message_handler =
+      std::make_shared<MockPlatformMessageHandler>();
+  EXPECT_CALL(delegate_, GetPlatformMessageHandler)
+      .WillOnce(ReturnRef(platform_message_handler));
+  fml::AutoResetWaitableEvent draw_latch;
+  EXPECT_CALL(animator_delegate, OnAnimatorDraw)
+      .WillOnce(
+          Invoke([&draw_latch](const std::shared_ptr<FramePipeline>& pipeline) {
+            auto status =
+                pipeline->Consume([&](std::unique_ptr<FrameItem> item) {
+                  // View 1 is rendered before the frame, and is ignored.
+                  // View 2 is rendered within the frame, and is accepted.
+                  EXPECT_EQ(item->layer_tree_tasks.size(), 1u);
+                  EXPECT_EQ(item->layer_tree_tasks[0]->view_id, 2);
+                });
+            EXPECT_EQ(status, PipelineConsumeResult::Done);
+            draw_latch.Signal();
+          }));
+  EXPECT_CALL(animator_delegate, OnAnimatorBeginFrame)
+      .WillOnce(Invoke([&engine_context](fml::TimePoint frame_target_time,
+                                         uint64_t frame_number) {
+        engine_context->EngineTaskSync([&](Engine& engine) {
+          engine.BeginFrame(frame_target_time, frame_number);
+        });
+      }));
+
+  std::unique_ptr<Animator> animator;
+  PostSync(task_runners_.GetUITaskRunner(),
+           [&animator, &animator_delegate, &task_runners = task_runners_] {
+             animator = std::make_unique<Animator>(
+                 animator_delegate, task_runners,
+                 static_cast<std::unique_ptr<VsyncWaiter>>(
+                     std::make_unique<testing::ConstantFiringVsyncWaiter>(
+                         task_runners)));
+           });
+
+  engine_context = EngineContext::Create(delegate_, settings_, task_runners_,
+                                         std::move(animator));
+
+  engine_context->EngineTaskSync([](Engine& engine) {
+    engine.AddView(1, ViewportMetrics{1, 10, 10, 22, 0});
+    engine.AddView(2, ViewportMetrics{1, 10, 10, 22, 0});
+  });
+
+  auto configuration = RunConfiguration::InferFromSettings(settings_);
+  configuration.SetEntrypoint("renderViewsInFrameAndOutOfFrame");
+  engine_context->Run(std::move(configuration));
+
+  draw_latch.Wait();
+}
+
+TEST_F(EngineAnimatorTest, IgnoresDuplicateRenders) {
+  MockAnimatorDelegate animator_delegate;
+  std::unique_ptr<EngineContext> engine_context;
+
+  std::vector<std::shared_ptr<Layer>> benchmark_layers;
+  auto capture_root_layer = [&benchmark_layers](Dart_NativeArguments args) {
+    auto handle = Dart_GetNativeArgument(args, 0);
+    intptr_t peer = 0;
+    Dart_Handle result = Dart_GetNativeInstanceField(
+        handle, tonic::DartWrappable::kPeerIndex, &peer);
+    ASSERT_FALSE(Dart_IsError(result));
+    SceneBuilder* scene_builder = reinterpret_cast<SceneBuilder*>(peer);
+    ASSERT_TRUE(scene_builder);
+    std::shared_ptr<ContainerLayer> root_layer =
+        scene_builder->layer_stack()[0];
+    ASSERT_TRUE(root_layer);
+    benchmark_layers = root_layer->layers();
+  };
+
+  std::shared_ptr<PlatformMessageHandler> platform_message_handler =
+      std::make_shared<MockPlatformMessageHandler>();
+  EXPECT_CALL(delegate_, GetPlatformMessageHandler)
+      .WillOnce(ReturnRef(platform_message_handler));
+  fml::AutoResetWaitableEvent draw_latch;
+  EXPECT_CALL(animator_delegate, OnAnimatorDraw)
+      .WillOnce(Invoke([&draw_latch, &benchmark_layers](
+                           const std::shared_ptr<FramePipeline>& pipeline) {
+        auto status = pipeline->Consume([&](std::unique_ptr<FrameItem> item) {
+          EXPECT_EQ(item->layer_tree_tasks.size(), 1u);
+          EXPECT_EQ(item->layer_tree_tasks[0]->view_id, kFlutterImplicitViewId);
+          ContainerLayer* root_layer = reinterpret_cast<ContainerLayer*>(
+              item->layer_tree_tasks[0]->layer_tree->root_layer());
+          std::vector<std::shared_ptr<Layer>> result_layers =
+              root_layer->layers();
+          EXPECT_EQ(result_layers.size(), benchmark_layers.size());
+          EXPECT_EQ(result_layers[0], benchmark_layers[0]);
+        });
+        EXPECT_EQ(status, PipelineConsumeResult::Done);
+        draw_latch.Signal();
+      }));
+  EXPECT_CALL(animator_delegate, OnAnimatorBeginFrame)
+      .WillOnce(Invoke([&engine_context](fml::TimePoint frame_target_time,
+                                         uint64_t frame_number) {
+        engine_context->EngineTaskSync([&](Engine& engine) {
+          engine.BeginFrame(frame_target_time, frame_number);
+        });
+      }));
+
+  AddNativeCallback("CaptureRootLayer",
+                    CREATE_NATIVE_ENTRY(capture_root_layer));
+
+  std::unique_ptr<Animator> animator;
+  PostSync(task_runners_.GetUITaskRunner(),
+           [&animator, &animator_delegate, &task_runners = task_runners_] {
+             animator = std::make_unique<Animator>(
+                 animator_delegate, task_runners,
+                 static_cast<std::unique_ptr<VsyncWaiter>>(
+                     std::make_unique<testing::ConstantFiringVsyncWaiter>(
+                         task_runners)));
+           });
+
+  engine_context = EngineContext::Create(delegate_, settings_, task_runners_,
+                                         std::move(animator));
+
+  engine_context->EngineTaskSync([](Engine& engine) {
+    engine.AddView(kFlutterImplicitViewId, ViewportMetrics{1, 10, 10, 22, 0});
+  });
+
+  auto configuration = RunConfiguration::InferFromSettings(settings_);
+  configuration.SetEntrypoint("renderTwiceForOneView");
+  engine_context->Run(std::move(configuration));
+
+  draw_latch.Wait();
+}
+
+TEST_F(EngineAnimatorTest, AnimatorSubmitsImplicitViewBeforeDrawFrameEnds) {
+  MockAnimatorDelegate animator_delegate;
+  std::unique_ptr<EngineContext> engine_context;
+
+  std::shared_ptr<PlatformMessageHandler> platform_message_handler =
+      std::make_shared<MockPlatformMessageHandler>();
+  EXPECT_CALL(delegate_, GetPlatformMessageHandler)
+      .WillOnce(ReturnRef(platform_message_handler));
+
+  bool rasterization_started = false;
+  EXPECT_CALL(animator_delegate, OnAnimatorDraw)
+      .WillOnce(Invoke([&rasterization_started](
+                           const std::shared_ptr<FramePipeline>& pipeline) {
+        rasterization_started = true;
+        auto status = pipeline->Consume([&](std::unique_ptr<FrameItem> item) {
+          EXPECT_EQ(item->layer_tree_tasks.size(), 1u);
+          EXPECT_EQ(item->layer_tree_tasks[0]->view_id, kFlutterImplicitViewId);
+        });
+        EXPECT_EQ(status, PipelineConsumeResult::Done);
+      }));
+  EXPECT_CALL(animator_delegate, OnAnimatorBeginFrame)
+      .WillRepeatedly(Invoke([&engine_context](fml::TimePoint frame_target_time,
+                                               uint64_t frame_number) {
+        engine_context->EngineTaskSync([&](Engine& engine) {
+          engine.BeginFrame(frame_target_time, frame_number);
+        });
+      }));
+
+  std::unique_ptr<Animator> animator;
+  PostSync(task_runners_.GetUITaskRunner(),
+           [&animator, &animator_delegate, &task_runners = task_runners_] {
+             animator = std::make_unique<Animator>(
+                 animator_delegate, task_runners,
+                 static_cast<std::unique_ptr<VsyncWaiter>>(
+                     std::make_unique<testing::ConstantFiringVsyncWaiter>(
+                         task_runners)));
+           });
+
+  native_latch.Reset();
+  // The native_latch is signaled at the end of handleDrawFrame.
+  AddNativeCallback("NotifyNative",
+                    CREATE_NATIVE_ENTRY([&rasterization_started](auto args) {
+                      EXPECT_EQ(rasterization_started, true);
+                      native_latch.Signal();
+                    }));
+
+  engine_context = EngineContext::Create(delegate_, settings_, task_runners_,
+                                         std::move(animator));
+
+  engine_context->EngineTaskSync([](Engine& engine) {
+    engine.AddView(kFlutterImplicitViewId, ViewportMetrics{1.0, 10, 10, 1, 0});
+  });
+
+  auto configuration = RunConfiguration::InferFromSettings(settings_);
+  configuration.SetEntrypoint("renderSingleViewAndCallAfterOnDrawFrame");
+  engine_context->Run(std::move(configuration));
+
+  native_latch.Wait();
+}
+
+// The animator should submit to the pipeline the implicit view rendered in a
+// warm up frame if there's already a continuation (i.e. Animator::BeginFrame
+// has been called)
+TEST_F(EngineAnimatorTest, AnimatorSubmitWarmUpImplicitView) {
+  MockAnimatorDelegate animator_delegate;
+  std::unique_ptr<EngineContext> engine_context;
+
+  std::shared_ptr<PlatformMessageHandler> platform_message_handler =
+      std::make_shared<MockPlatformMessageHandler>();
+  EXPECT_CALL(delegate_, GetPlatformMessageHandler)
+      .WillOnce(ReturnRef(platform_message_handler));
+
+  fml::AutoResetWaitableEvent continuation_ready_latch;
+  fml::AutoResetWaitableEvent draw_latch;
+  EXPECT_CALL(animator_delegate, OnAnimatorDraw)
+      .WillOnce(Invoke([&draw_latch](
+                           const std::shared_ptr<FramePipeline>& pipeline) {
+        auto status = pipeline->Consume([&](std::unique_ptr<FrameItem> item) {
+          EXPECT_EQ(item->layer_tree_tasks.size(), 1u);
+          EXPECT_EQ(item->layer_tree_tasks[0]->view_id, kFlutterImplicitViewId);
+        });
+        EXPECT_EQ(status, PipelineConsumeResult::Done);
+        draw_latch.Signal();
+      }));
+  EXPECT_CALL(animator_delegate, OnAnimatorBeginFrame)
+      .WillRepeatedly(
+          Invoke([&engine_context, &continuation_ready_latch](
+                     fml::TimePoint frame_target_time, uint64_t frame_number) {
+            continuation_ready_latch.Signal();
+            engine_context->EngineTaskSync([&](Engine& engine) {
+              engine.BeginFrame(frame_target_time, frame_number);
+            });
+          }));
+
+  std::unique_ptr<Animator> animator;
+  PostSync(task_runners_.GetUITaskRunner(),
+           [&animator, &animator_delegate, &task_runners = task_runners_] {
+             animator = std::make_unique<Animator>(
+                 animator_delegate, task_runners,
+                 static_cast<std::unique_ptr<VsyncWaiter>>(
+                     std::make_unique<testing::ConstantFiringVsyncWaiter>(
+                         task_runners)));
+           });
+
+  engine_context = EngineContext::Create(delegate_, settings_, task_runners_,
+                                         std::move(animator));
+
+  engine_context->EngineTaskSync([](Engine& engine) {
+    // Schedule a frame to trigger Animator::BeginFrame to create a
+    // continuation. The continuation needs to be available before `Engine::Run`
+    // since the Dart program immediately schedules a warm up frame.
+    engine.ScheduleFrame(true);
+    // Add the implicit view so that the engine recognizes it and that its
+    // metrics is not empty.
+    engine.AddView(kFlutterImplicitViewId, ViewportMetrics{1.0, 10, 10, 1, 0});
+  });
+  continuation_ready_latch.Wait();
+
+  auto configuration = RunConfiguration::InferFromSettings(settings_);
+  configuration.SetEntrypoint("renderWarmUpImplicitView");
+  engine_context->Run(std::move(configuration));
+
+  draw_latch.Wait();
+}
+
+// The warm up frame should work if only some of the registered views are
+// included.
+//
+// This test also verifies that the warm up frame can render multiple views.
+TEST_F(EngineAnimatorTest, AnimatorSubmitPartialViewsForWarmUp) {
+  MockAnimatorDelegate animator_delegate;
+  std::unique_ptr<EngineContext> engine_context;
+
+  std::shared_ptr<PlatformMessageHandler> platform_message_handler =
+      std::make_shared<MockPlatformMessageHandler>();
+  EXPECT_CALL(delegate_, GetPlatformMessageHandler)
+      .WillOnce(ReturnRef(platform_message_handler));
+
+  fml::AutoResetWaitableEvent continuation_ready_latch;
+  fml::AutoResetWaitableEvent draw_latch;
+  EXPECT_CALL(animator_delegate, OnAnimatorDraw)
+      .WillOnce(
+          Invoke([&draw_latch](const std::shared_ptr<FramePipeline>& pipeline) {
+            auto status =
+                pipeline->Consume([&](std::unique_ptr<FrameItem> item) {
+                  auto tasks = Sorted(item->layer_tree_tasks);
+                  EXPECT_EQ(tasks.size(), 2u);
+                  EXPECT_EQ(tasks[0]->view_id, 1);
+                  EXPECT_EQ(tasks[1]->view_id, 2);
+                });
+            EXPECT_EQ(status, PipelineConsumeResult::Done);
+            draw_latch.Signal();
+          }));
+  EXPECT_CALL(animator_delegate, OnAnimatorBeginFrame)
+      .WillRepeatedly(
+          Invoke([&engine_context, &continuation_ready_latch](
+                     fml::TimePoint frame_target_time, uint64_t frame_number) {
+            continuation_ready_latch.Signal();
+            engine_context->EngineTaskSync([&](Engine& engine) {
+              engine.BeginFrame(frame_target_time, frame_number);
+            });
+          }));
+
+  std::unique_ptr<Animator> animator;
+  PostSync(task_runners_.GetUITaskRunner(),
+           [&animator, &animator_delegate, &task_runners = task_runners_] {
+             animator = std::make_unique<Animator>(
+                 animator_delegate, task_runners,
+                 static_cast<std::unique_ptr<VsyncWaiter>>(
+                     std::make_unique<testing::ConstantFiringVsyncWaiter>(
+                         task_runners)));
+           });
+
+  engine_context = EngineContext::Create(delegate_, settings_, task_runners_,
+                                         std::move(animator));
+
+  engine_context->EngineTaskSync([](Engine& engine) {
+    // Schedule a frame to make the animator create a continuation.
+    engine.ScheduleFrame(true);
+    // Add multiple views.
+    engine.AddView(0, ViewportMetrics{1, 10, 10, 22, 0});
+    engine.AddView(1, ViewportMetrics{1, 10, 10, 22, 0});
+    engine.AddView(2, ViewportMetrics{1, 10, 10, 22, 0});
+  });
+
+  continuation_ready_latch.Wait();
+
+  auto configuration = RunConfiguration::InferFromSettings(settings_);
+  configuration.SetEntrypoint("renderWarmUpView1and2");
+  engine_context->Run(std::move(configuration));
+
+  draw_latch.Wait();
+}
+
+}  // namespace flutter
+
+// NOLINTEND(clang-analyzer-core.StackAddressEscape)
diff --git a/shell/common/engine_unittests.cc b/shell/common/engine_unittests.cc
index c2c9a84f634da2783a7f931118ec41020a4a63c3..7a822c5dca1b71c4371f856d3f91debb3b8fa384 100644
--- a/shell/common/engine_unittests.cc
+++ b/shell/common/engine_unittests.cc
@@ -10,61 +10,133 @@
 #include "flutter/shell/common/thread_host.h"
 #include "flutter/testing/fixture_test.h"
 #include "flutter/testing/testing.h"
+#include "fml/mapping.h"
 #include "gmock/gmock.h"
+#include "lib/ui/text/font_collection.h"
 #include "rapidjson/document.h"
 #include "rapidjson/stringbuffer.h"
 #include "rapidjson/writer.h"
-
-///\note Deprecated MOCK_METHOD macros used until this issue is resolved:
-// https://github.com/google/googletest/issues/2490
+#include "runtime/isolate_configuration.h"
+#include "shell/common/run_configuration.h"
 
 namespace flutter {
 
 namespace {
+
+class FontManifestAssetResolver : public AssetResolver {
+ public:
+  FontManifestAssetResolver() {}
+
+  bool IsValid() const override { return true; }
+
+  bool IsValidAfterAssetManagerChange() const override { return true; }
+
+  AssetResolver::AssetResolverType GetType() const override {
+    return AssetResolver::AssetResolverType::kApkAssetProvider;
+  }
+
+  mutable size_t mapping_call_count = 0u;
+  std::unique_ptr<fml::Mapping> GetAsMapping(
+      const std::string& asset_name) const override {
+    mapping_call_count++;
+    if (asset_name == "FontManifest.json") {
+      return std::make_unique<fml::DataMapping>("[{},{},{}]");
+    }
+    return nullptr;
+  }
+
+  std::vector<std::unique_ptr<fml::Mapping>> GetAsMappings(
+      const std::string& asset_pattern,
+      const std::optional<std::string>& subdir) const override {
+    return {};
+  };
+
+  bool operator==(const AssetResolver& other) const override {
+    auto mapping = GetAsMapping("FontManifest.json");
+    return memcmp(other.GetAsMapping("FontManifest.json")->GetMapping(),
+                  mapping->GetMapping(), mapping->GetSize()) == 0;
+  }
+};
+
 class MockDelegate : public Engine::Delegate {
  public:
-  MOCK_METHOD2(OnEngineUpdateSemantics,
-               void(SemanticsNodeUpdates, CustomAccessibilityActionUpdates));
-  MOCK_METHOD1(OnEngineHandlePlatformMessage,
-               void(std::unique_ptr<PlatformMessage>));
-  MOCK_METHOD0(OnPreEngineRestart, void());
-  MOCK_METHOD0(OnRootIsolateCreated, void());
-  MOCK_METHOD2(UpdateIsolateDescription, void(const std::string, int64_t));
-  MOCK_METHOD1(SetNeedsReportTimings, void(bool));
-  MOCK_METHOD1(ComputePlatformResolvedLocale,
-               std::unique_ptr<std::vector<std::string>>(
-                   const std::vector<std::string>&));
-  MOCK_METHOD1(RequestDartDeferredLibrary, void(intptr_t));
-  MOCK_METHOD0(GetCurrentTimePoint, fml::TimePoint());
-  MOCK_CONST_METHOD0(GetPlatformMessageHandler,
-                     const std::shared_ptr<PlatformMessageHandler>&());
+  MOCK_METHOD(void,
+              OnEngineUpdateSemantics,
+              (SemanticsNodeUpdates, CustomAccessibilityActionUpdates),
+              (override));
+  MOCK_METHOD(void,
+              OnEngineHandlePlatformMessage,
+              (std::unique_ptr<PlatformMessage>),
+              (override));
+  MOCK_METHOD(void, OnPreEngineRestart, (), (override));
+  MOCK_METHOD(void, OnRootIsolateCreated, (), (override));
+  MOCK_METHOD(void,
+              UpdateIsolateDescription,
+              (const std::string, int64_t),
+              (override));
+  MOCK_METHOD(void, SetNeedsReportTimings, (bool), (override));
+  MOCK_METHOD(std::unique_ptr<std::vector<std::string>>,
+              ComputePlatformResolvedLocale,
+              (const std::vector<std::string>&),
+              (override));
+  MOCK_METHOD(void, RequestDartDeferredLibrary, (intptr_t), (override));
+  MOCK_METHOD(fml::TimePoint, GetCurrentTimePoint, (), (override));
+  MOCK_METHOD(const std::shared_ptr<PlatformMessageHandler>&,
+              GetPlatformMessageHandler,
+              (),
+              (const, override));
+  MOCK_METHOD(void, OnEngineChannelUpdate, (std::string, bool), (override));
+  MOCK_METHOD(double,
+              GetScaledFontSize,
+              (double font_size, int configuration_id),
+              (const, override));
 };
 
 class MockResponse : public PlatformMessageResponse {
  public:
-  MOCK_METHOD1(Complete, void(std::unique_ptr<fml::Mapping> data));
-  MOCK_METHOD0(CompleteEmpty, void());
+  MOCK_METHOD(void, Complete, (std::unique_ptr<fml::Mapping> data), (override));
+  MOCK_METHOD(void, CompleteEmpty, (), (override));
 };
 
 class MockRuntimeDelegate : public RuntimeDelegate {
  public:
-  MOCK_METHOD0(DefaultRouteName, std::string());
-  MOCK_METHOD1(ScheduleFrame, void(bool));
-  MOCK_METHOD1(Render, void(std::shared_ptr<flutter::LayerTree>));
-  MOCK_METHOD2(UpdateSemantics,
-               void(SemanticsNodeUpdates, CustomAccessibilityActionUpdates));
-  MOCK_METHOD1(HandlePlatformMessage, void(std::unique_ptr<PlatformMessage>));
-  MOCK_METHOD0(GetFontCollection, FontCollection&());
-  MOCK_METHOD0(GetAssetManager, std::shared_ptr<AssetManager>());
-  MOCK_METHOD0(OnRootIsolateCreated, void());
-  MOCK_METHOD2(UpdateIsolateDescription, void(const std::string, int64_t));
-  MOCK_METHOD1(SetNeedsReportTimings, void(bool));
-  MOCK_METHOD1(ComputePlatformResolvedLocale,
-               std::unique_ptr<std::vector<std::string>>(
-                   const std::vector<std::string>&));
-  MOCK_METHOD1(RequestDartDeferredLibrary, void(intptr_t));
-  MOCK_CONST_METHOD0(GetPlatformMessageHandler,
-                     std::weak_ptr<PlatformMessageHandler>());
+  MOCK_METHOD(std::string, DefaultRouteName, (), (override));
+  MOCK_METHOD(void, ScheduleFrame, (bool), (override));
+  MOCK_METHOD(void, OnAllViewsRendered, (), (override));
+  MOCK_METHOD(void,
+              Render,
+              (int64_t, std::unique_ptr<flutter::LayerTree>, float),
+              (override));
+  MOCK_METHOD(void,
+              UpdateSemantics,
+              (SemanticsNodeUpdates, CustomAccessibilityActionUpdates),
+              (override));
+  MOCK_METHOD(void,
+              HandlePlatformMessage,
+              (std::unique_ptr<PlatformMessage>),
+              (override));
+  MOCK_METHOD(FontCollection&, GetFontCollection, (), (override));
+  MOCK_METHOD(std::shared_ptr<AssetManager>, GetAssetManager, (), (override));
+  MOCK_METHOD(void, OnRootIsolateCreated, (), (override));
+  MOCK_METHOD(void,
+              UpdateIsolateDescription,
+              (const std::string, int64_t),
+              (override));
+  MOCK_METHOD(void, SetNeedsReportTimings, (bool), (override));
+  MOCK_METHOD(std::unique_ptr<std::vector<std::string>>,
+              ComputePlatformResolvedLocale,
+              (const std::vector<std::string>&),
+              (override));
+  MOCK_METHOD(void, RequestDartDeferredLibrary, (intptr_t), (override));
+  MOCK_METHOD(std::weak_ptr<PlatformMessageHandler>,
+              GetPlatformMessageHandler,
+              (),
+              (const, override));
+  MOCK_METHOD(void, SendChannelUpdate, (std::string, bool), (override));
+  MOCK_METHOD(double,
+              GetScaledFontSize,
+              (double font_size, int configuration_id),
+              (const, override));
 };
 
 class MockRuntimeController : public RuntimeController {
@@ -72,12 +144,25 @@ class MockRuntimeController : public RuntimeController {
   MockRuntimeController(RuntimeDelegate& client,
                         const TaskRunners& p_task_runners)
       : RuntimeController(client, p_task_runners) {}
-  MOCK_METHOD0(IsRootIsolateRunning, bool());
-  MOCK_METHOD1(DispatchPlatformMessage, bool(std::unique_ptr<PlatformMessage>));
-  MOCK_METHOD3(LoadDartDeferredLibraryError,
-               void(intptr_t, const std::string, bool));
-  MOCK_CONST_METHOD0(GetDartVM, DartVM*());
-  MOCK_METHOD1(NotifyIdle, bool(fml::TimeDelta));
+  MOCK_METHOD(bool, IsRootIsolateRunning, (), (override));
+  MOCK_METHOD(bool,
+              DispatchPlatformMessage,
+              (std::unique_ptr<PlatformMessage>),
+              (override));
+  MOCK_METHOD(void,
+              LoadDartDeferredLibraryError,
+              (intptr_t, const std::string, bool),
+              (override));
+  MOCK_METHOD(DartVM*, GetDartVM, (), (const, override));
+  MOCK_METHOD(bool, NotifyIdle, (fml::TimeDelta), (override));
+};
+
+class MockFontCollection : public FontCollection {
+ public:
+  MOCK_METHOD(void,
+              RegisterFonts,
+              (const std::shared_ptr<AssetManager>& asset_manager),
+              (override));
 };
 
 std::unique_ptr<PlatformMessage> MakePlatformMessage(
@@ -110,8 +195,8 @@ class EngineTest : public testing::FixtureTest {
  public:
   EngineTest()
       : thread_host_("EngineTest",
-                     ThreadHost::Type::Platform | ThreadHost::Type::IO |
-                         ThreadHost::Type::UI | ThreadHost::Type::RASTER),
+                     ThreadHost::Type::kPlatform | ThreadHost::Type::kIo |
+                         ThreadHost::Type::kUi | ThreadHost::Type::kRaster),
         task_runners_({
             "EngineTest",
             thread_host_.platform_thread->GetTaskRunner(),  // platform
@@ -161,7 +246,8 @@ TEST_F(EngineTest, Create) {
         /*animator=*/std::move(animator_),
         /*io_manager=*/io_manager_,
         /*font_collection=*/std::make_shared<FontCollection>(),
-        /*runtime_controller=*/std::move(runtime_controller_));
+        /*runtime_controller=*/std::move(runtime_controller_),
+        /*gpu_disabled_switch=*/std::make_shared<fml::SyncSwitch>());
     EXPECT_TRUE(engine);
   });
 }
@@ -182,7 +268,8 @@ TEST_F(EngineTest, DispatchPlatformMessageUnknown) {
         /*animator=*/std::move(animator_),
         /*io_manager=*/io_manager_,
         /*font_collection=*/std::make_shared<FontCollection>(),
-        /*runtime_controller=*/std::move(mock_runtime_controller));
+        /*runtime_controller=*/std::move(mock_runtime_controller),
+        /*gpu_disabled_switch=*/std::make_shared<fml::SyncSwitch>());
 
     fml::RefPtr<PlatformMessageResponse> response =
         fml::MakeRefCounted<MockResponse>();
@@ -208,7 +295,8 @@ TEST_F(EngineTest, DispatchPlatformMessageInitialRoute) {
         /*animator=*/std::move(animator_),
         /*io_manager=*/io_manager_,
         /*font_collection=*/std::make_shared<FontCollection>(),
-        /*runtime_controller=*/std::move(mock_runtime_controller));
+        /*runtime_controller=*/std::move(mock_runtime_controller),
+        /*gpu_disabled_switch=*/std::make_shared<fml::SyncSwitch>());
 
     fml::RefPtr<PlatformMessageResponse> response =
         fml::MakeRefCounted<MockResponse>();
@@ -241,7 +329,8 @@ TEST_F(EngineTest, DispatchPlatformMessageInitialRouteIgnored) {
         /*animator=*/std::move(animator_),
         /*io_manager=*/io_manager_,
         /*font_collection=*/std::make_shared<FontCollection>(),
-        /*runtime_controller=*/std::move(mock_runtime_controller));
+        /*runtime_controller=*/std::move(mock_runtime_controller),
+        /*gpu_disabled_switch=*/std::make_shared<fml::SyncSwitch>());
 
     fml::RefPtr<PlatformMessageResponse> response =
         fml::MakeRefCounted<MockResponse>();
@@ -273,10 +362,12 @@ TEST_F(EngineTest, SpawnSharesFontLibrary) {
         /*animator=*/std::move(animator_),
         /*io_manager=*/io_manager_,
         /*font_collection=*/std::make_shared<FontCollection>(),
-        /*runtime_controller=*/std::move(mock_runtime_controller));
+        /*runtime_controller=*/std::move(mock_runtime_controller),
+        /*gpu_disabled_switch=*/std::make_shared<fml::SyncSwitch>());
 
-    auto spawn = engine->Spawn(delegate_, dispatcher_maker_, settings_, nullptr,
-                               std::string(), io_manager_, snapshot_delegate_);
+    auto spawn =
+        engine->Spawn(delegate_, dispatcher_maker_, settings_, nullptr,
+                      std::string(), io_manager_, snapshot_delegate_, nullptr);
     EXPECT_TRUE(spawn != nullptr);
     EXPECT_EQ(&engine->GetFontCollection(), &spawn->GetFontCollection());
   });
@@ -299,54 +390,17 @@ TEST_F(EngineTest, SpawnWithCustomInitialRoute) {
         /*animator=*/std::move(animator_),
         /*io_manager=*/io_manager_,
         /*font_collection=*/std::make_shared<FontCollection>(),
-        /*runtime_controller=*/std::move(mock_runtime_controller));
+        /*runtime_controller=*/std::move(mock_runtime_controller),
+        /*gpu_disabled_switch=*/std::make_shared<fml::SyncSwitch>());
 
-    auto spawn = engine->Spawn(delegate_, dispatcher_maker_, settings_, nullptr,
-                               "/foo", io_manager_, snapshot_delegate_);
+    auto spawn =
+        engine->Spawn(delegate_, dispatcher_maker_, settings_, nullptr, "/foo",
+                      io_manager_, snapshot_delegate_, nullptr);
     EXPECT_TRUE(spawn != nullptr);
     ASSERT_EQ("/foo", spawn->InitialRoute());
   });
 }
 
-TEST_F(EngineTest, SpawnResetsViewportMetrics) {
-  PostUITaskSync([this] {
-    MockRuntimeDelegate client;
-    auto mock_runtime_controller =
-        std::make_unique<MockRuntimeController>(client, task_runners_);
-    auto vm_ref = DartVMRef::Create(settings_);
-    EXPECT_CALL(*mock_runtime_controller, GetDartVM())
-        .WillRepeatedly(::testing::Return(vm_ref.get()));
-    ViewportMetrics old_viewport_metrics = ViewportMetrics();
-    const double kViewWidth = 768;
-    const double kViewHeight = 1024;
-    old_viewport_metrics.physical_width = kViewWidth;
-    old_viewport_metrics.physical_height = kViewHeight;
-    mock_runtime_controller->SetViewportMetrics(old_viewport_metrics);
-    auto engine = std::make_unique<Engine>(
-        /*delegate=*/delegate_,
-        /*dispatcher_maker=*/dispatcher_maker_,
-        /*image_decoder_task_runner=*/image_decoder_task_runner_,
-        /*task_runners=*/task_runners_,
-        /*settings=*/settings_,
-        /*animator=*/std::move(animator_),
-        /*io_manager=*/io_manager_,
-        /*font_collection=*/std::make_shared<FontCollection>(),
-        /*runtime_controller=*/std::move(mock_runtime_controller));
-
-    auto& old_platform_data = engine->GetRuntimeController()->GetPlatformData();
-    EXPECT_EQ(old_platform_data.viewport_metrics.physical_width, kViewWidth);
-    EXPECT_EQ(old_platform_data.viewport_metrics.physical_height, kViewHeight);
-
-    auto spawn = engine->Spawn(delegate_, dispatcher_maker_, settings_, nullptr,
-                               std::string(), io_manager_, snapshot_delegate_);
-    EXPECT_TRUE(spawn != nullptr);
-    auto& new_viewport_metrics =
-        spawn->GetRuntimeController()->GetPlatformData().viewport_metrics;
-    EXPECT_EQ(new_viewport_metrics.physical_width, 0);
-    EXPECT_EQ(new_viewport_metrics.physical_height, 0);
-  });
-}
-
 TEST_F(EngineTest, SpawnWithCustomSettings) {
   PostUITaskSync([this] {
     MockRuntimeDelegate client;
@@ -364,14 +418,15 @@ TEST_F(EngineTest, SpawnWithCustomSettings) {
         /*animator=*/std::move(animator_),
         /*io_manager=*/io_manager_,
         /*font_collection=*/std::make_shared<FontCollection>(),
-        /*runtime_controller=*/std::move(mock_runtime_controller));
+        /*runtime_controller=*/std::move(mock_runtime_controller),
+        /*gpu_disabled_switch=*/std::make_shared<fml::SyncSwitch>());
 
     Settings custom_settings = settings_;
     custom_settings.persistent_isolate_data =
         std::make_shared<fml::DataMapping>("foo");
     auto spawn =
         engine->Spawn(delegate_, dispatcher_maker_, custom_settings, nullptr,
-                      std::string(), io_manager_, snapshot_delegate_);
+                      std::string(), io_manager_, snapshot_delegate_, nullptr);
     EXPECT_TRUE(spawn != nullptr);
     auto new_persistent_isolate_data =
         const_cast<RuntimeController*>(spawn->GetRuntimeController())
@@ -404,10 +459,94 @@ TEST_F(EngineTest, PassesLoadDartDeferredLibraryErrorToRuntime) {
         /*animator=*/std::move(animator_),
         /*io_manager=*/io_manager_,
         /*font_collection=*/std::make_shared<FontCollection>(),
-        /*runtime_controller=*/std::move(mock_runtime_controller));
+        /*runtime_controller=*/std::move(mock_runtime_controller),
+        /*gpu_disabled_switch=*/std::make_shared<fml::SyncSwitch>());
 
     engine->LoadDartDeferredLibraryError(error_id, error_message, true);
   });
 }
 
+TEST_F(EngineTest, SpawnedEngineInheritsAssetManager) {
+  PostUITaskSync([this] {
+    MockRuntimeDelegate client;
+    auto mock_runtime_controller =
+        std::make_unique<MockRuntimeController>(client, task_runners_);
+    auto vm_ref = DartVMRef::Create(settings_);
+    EXPECT_CALL(*mock_runtime_controller, GetDartVM())
+        .WillRepeatedly(::testing::Return(vm_ref.get()));
+
+    // auto mock_font_collection = std::make_shared<MockFontCollection>();
+    // EXPECT_CALL(*mock_font_collection, RegisterFonts(::testing::_))
+    //     .WillOnce(::testing::Return());
+    auto engine = std::make_unique<Engine>(
+        /*delegate=*/delegate_,
+        /*dispatcher_maker=*/dispatcher_maker_,
+        /*image_decoder_task_runner=*/image_decoder_task_runner_,
+        /*task_runners=*/task_runners_,
+        /*settings=*/settings_,
+        /*animator=*/std::move(animator_),
+        /*io_manager=*/io_manager_,
+        /*font_collection=*/std::make_shared<FontCollection>(),
+        /*runtime_controller=*/std::move(mock_runtime_controller),
+        /*gpu_disabled_switch=*/std::make_shared<fml::SyncSwitch>());
+
+    EXPECT_EQ(engine->GetAssetManager(), nullptr);
+
+    auto asset_manager = std::make_shared<AssetManager>();
+    asset_manager->PushBack(std::make_unique<FontManifestAssetResolver>());
+    engine->UpdateAssetManager(asset_manager);
+    EXPECT_EQ(engine->GetAssetManager(), asset_manager);
+
+    auto spawn =
+        engine->Spawn(delegate_, dispatcher_maker_, settings_, nullptr,
+                      std::string(), io_manager_, snapshot_delegate_, nullptr);
+    EXPECT_TRUE(spawn != nullptr);
+    EXPECT_EQ(engine->GetAssetManager(), spawn->GetAssetManager());
+  });
+}
+
+TEST_F(EngineTest, UpdateAssetManagerWithEqualManagers) {
+  PostUITaskSync([this] {
+    MockRuntimeDelegate client;
+    auto mock_runtime_controller =
+        std::make_unique<MockRuntimeController>(client, task_runners_);
+    auto vm_ref = DartVMRef::Create(settings_);
+    EXPECT_CALL(*mock_runtime_controller, GetDartVM())
+        .WillRepeatedly(::testing::Return(vm_ref.get()));
+
+    auto mock_font_collection = std::make_shared<MockFontCollection>();
+    EXPECT_CALL(*mock_font_collection, RegisterFonts(::testing::_))
+        .WillOnce(::testing::Return());
+    auto engine = std::make_unique<Engine>(
+        /*delegate=*/delegate_,
+        /*dispatcher_maker=*/dispatcher_maker_,
+        /*image_decoder_task_runner=*/image_decoder_task_runner_,
+        /*task_runners=*/task_runners_,
+        /*settings=*/settings_,
+        /*animator=*/std::move(animator_),
+        /*io_manager=*/io_manager_,
+        /*font_collection=*/mock_font_collection,
+        /*runtime_controller=*/std::move(mock_runtime_controller),
+        /*gpu_disabled_switch=*/std::make_shared<fml::SyncSwitch>());
+
+    EXPECT_EQ(engine->GetAssetManager(), nullptr);
+
+    auto asset_manager = std::make_shared<AssetManager>();
+    asset_manager->PushBack(std::make_unique<FontManifestAssetResolver>());
+
+    auto asset_manager_2 = std::make_shared<AssetManager>();
+    asset_manager_2->PushBack(std::make_unique<FontManifestAssetResolver>());
+
+    EXPECT_NE(asset_manager, asset_manager_2);
+    EXPECT_TRUE(*asset_manager == *asset_manager_2);
+
+    engine->UpdateAssetManager(asset_manager);
+    EXPECT_EQ(engine->GetAssetManager(), asset_manager);
+
+    engine->UpdateAssetManager(asset_manager_2);
+    // Didn't change because they're equivalent.
+    EXPECT_EQ(engine->GetAssetManager(), asset_manager);
+  });
+}
+
 }  // namespace flutter
diff --git a/shell/common/fixtures/shell_test.dart b/shell/common/fixtures/shell_test.dart
index 605e3d951d230e68aeca3cc5afaa661284975fc8..a7727903af3522b8cac72a0c0e11be35509b295e 100644
--- a/shell/common/fixtures/shell_test.dart
+++ b/shell/common/fixtures/shell_test.dart
@@ -2,13 +2,25 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:convert' show utf8, json;
+import 'dart:async' show scheduleMicrotask;
+import 'dart:convert' show json, utf8;
 import 'dart:isolate';
 import 'dart:typed_data';
 import 'dart:ui';
 
+void expect(Object? a, Object? b) {
+  if (a != b) {
+    throw AssertionError('Expected $a to == $b');
+  }
+}
+
 void main() {}
 
+@pragma('vm:entry-point')
+void mainNotifyNative() {
+  notifyNative();
+}
+
 @pragma('vm:external-name', 'NativeReportTimingsCallback')
 external void nativeReportTimingsCallback(List<int> timings);
 @pragma('vm:external-name', 'NativeOnBeginFrame')
@@ -167,7 +179,7 @@ void testSkiaResourceCacheSendsResponse() {
                           }''';
   PlatformDispatcher.instance.sendPlatformMessage(
     'flutter/skia',
-    Uint8List.fromList(utf8.encode(jsonRequest)).buffer.asByteData(),
+    ByteData.sublistView(utf8.encode(jsonRequest)),
     callback,
   );
 }
@@ -220,29 +232,6 @@ void callNotifyDestroyed() {
 @pragma('vm:external-name', 'NotifyMessage')
 external void notifyMessage(String string);
 
-@pragma('vm:entry-point')
-void canConvertMappings() {
-  sendFixtureMapping(getFixtureMapping());
-}
-
-@pragma('vm:external-name', 'GetFixtureMapping')
-external List<int> getFixtureMapping();
-@pragma('vm:external-name', 'SendFixtureMapping')
-external void sendFixtureMapping(List<int> list);
-
-@pragma('vm:entry-point')
-void canDecompressImageFromAsset() {
-  decodeImageFromList(
-    Uint8List.fromList(getFixtureImage()),
-    (Image result) {
-      notifyWidthHeight(result.width, result.height);
-    },
-  );
-}
-
-@pragma('vm:external-name', 'GetFixtureImage')
-external List<int> getFixtureImage();
-
 @pragma('vm:entry-point')
 void canRegisterImageDecoders() {
   decodeImageFromList(
@@ -294,7 +283,7 @@ void canAccessResourceFromAssetDir() async {
   notifySetAssetBundlePath();
   window.sendPlatformMessage(
     'flutter/assets',
-    Uint8List.fromList(utf8.encode('kernel_blob.bin')).buffer.asByteData(),
+    ByteData.sublistView(utf8.encode('kernel_blob.bin')),
     (ByteData? byteData) {
       notifyCanAccessResource(byteData != null);
     },
@@ -326,10 +315,10 @@ void onBeginFrameWithNotifyNativeMain() {
 }
 
 @pragma('vm:entry-point')
-void frameCallback(_Image, int) {
-  // It is used as the frame callback of 'MultiFrameCodec' in the test
-  // 'ItDoesNotCrashThatSkiaUnrefQueueDrainAfterIOManagerReset'.
-  // The test is a regression test and doesn't care about images, so it is empty.
+void frameCallback(Object? image, int durationMilliseconds, String decodeError) {
+  if (image == null) {
+    throw Exception('Expeccted image in frame callback to be non-null');
+  }
 }
 
 Picture CreateRedBox(Size size) {
@@ -354,6 +343,9 @@ void scene_with_red_box() {
   PlatformDispatcher.instance.scheduleFrame();
 }
 
+@pragma('vm:external-name', 'NativeOnBeforeToImageSync')
+external void onBeforeToImageSync();
+
 
 @pragma('vm:entry-point')
 Future<void> toImageSync() async {
@@ -362,12 +354,8 @@ Future<void> toImageSync() async {
   canvas.drawPaint(Paint()..color = const Color(0xFFAAAAAA));
   final Picture picture = recorder.endRecording();
 
+  onBeforeToImageSync();
   final Image image = picture.toImageSync(20, 25);
-  void expect(Object? a, Object? b) {
-    if (a != b) {
-      throw 'Expected $a to == $b';
-    }
-  }
   expect(image.width, 20);
   expect(image.height, 25);
 
@@ -470,3 +458,196 @@ Future<void> testPluginUtilitiesCallbackHandle() async {
   }
   notifyNativeBool(true);
 }
+
+@pragma('vm:entry-point')
+Future<void> testThatAssetLoadingHappensOnWorkerThread() async {
+  try {
+    await ImmutableBuffer.fromAsset('DoesNotExist');
+  } catch (err) { /* Do nothing */ }
+  notifyNative();
+}
+
+@pragma('vm:external-name', 'NativeReportViewIdsCallback')
+external void nativeReportViewIdsCallback(bool hasImplicitView, List<int> viewIds);
+
+List<int> getCurrentViewIds() {
+  final List<int> result = PlatformDispatcher.instance.views
+      .map((FlutterView view) => view.viewId)
+      .toList()
+      ..sort();
+  assert(result.toSet().length == result.length,
+      'Unexpected duplicate view ID found: $result');
+  return result;
+}
+
+bool listEquals<T>(List<T> a, List<T> b) {
+  if (a.length != b.length) {
+    return false;
+  }
+  for (int i = 0; i < a.length; i += 1) {
+    if (a[i] != b[i]) {
+      return false;
+    }
+  }
+  return true;
+}
+
+// This entrypoint reports whether there's an implicit view and the list of view
+// IDs using nativeReportViewIdsCallback on initialization and every time the
+// list of view IDs changes.
+@pragma('vm:entry-point')
+void testReportViewIds() {
+  List<int> viewIds = getCurrentViewIds();
+  nativeReportViewIdsCallback(PlatformDispatcher.instance.implicitView != null, viewIds);
+  PlatformDispatcher.instance.onMetricsChanged = () {
+    final List<int> newViewIds = getCurrentViewIds();
+    if (!listEquals(viewIds, newViewIds)) {
+      viewIds = newViewIds;
+      nativeReportViewIdsCallback(PlatformDispatcher.instance.implicitView != null, viewIds);
+    }
+  };
+}
+
+// Returns a list of [view_id 1, view_width 1, view_id 2, view_width 2, ...]
+// for all views.
+List<int> getCurrentViewWidths() {
+  final List<int> result = <int>[];
+  for (final FlutterView view in PlatformDispatcher.instance.views) {
+    result.add(view.viewId);
+    result.add(view.physicalSize.width.round());
+  }
+  return result;
+}
+
+@pragma('vm:external-name', 'NativeReportViewWidthsCallback')
+external void nativeReportViewWidthsCallback(List<int> viewWidthPacket);
+
+// This entrypoint reports the list of views and their widths using
+// nativeReportViewWidthsCallback on initialization and every onMetricsChanged.
+@pragma('vm:entry-point')
+void testReportViewWidths() {
+  nativeReportViewWidthsCallback(getCurrentViewWidths());
+  PlatformDispatcher.instance.onMetricsChanged = () {
+    nativeReportViewWidthsCallback(getCurrentViewWidths());
+  };
+}
+
+void renderDummyToView(FlutterView view) {
+  final SceneBuilder builder = SceneBuilder();
+  final PictureRecorder recorder = PictureRecorder();
+  final Canvas canvas = Canvas(recorder);
+  canvas.drawPaint(Paint()..color = const Color(0xFFABCDEF));
+  final Picture picture = recorder.endRecording();
+  builder.addPicture(Offset.zero, picture);
+
+  final Scene scene = builder.build();
+  view.render(scene);
+
+  scene.dispose();
+  picture.dispose();
+}
+
+@pragma('vm:entry-point')
+void onDrawFrameRenderAllViews() {
+  PlatformDispatcher.instance.onDrawFrame = () {
+    for (final FlutterView view in PlatformDispatcher.instance.views) {
+      renderDummyToView(view);
+    }
+  };
+  notifyNative();
+}
+
+@pragma('vm:entry-point')
+void renderViewsInFrameAndOutOfFrame() {
+  renderDummyToView(PlatformDispatcher.instance.view(id: 1)!);
+  PlatformDispatcher.instance.onDrawFrame = () {
+    renderDummyToView(PlatformDispatcher.instance.view(id: 2)!);
+  };
+  PlatformDispatcher.instance.scheduleFrame();
+}
+
+@pragma('vm:external-name', 'CaptureRootLayer')
+external _captureRootLayer(SceneBuilder sceneBuilder);
+
+@pragma('vm:entry-point')
+void renderTwiceForOneView() {
+  final SceneBuilder builder = SceneBuilder();
+  final PictureRecorder recorder = PictureRecorder();
+  final Canvas canvas = Canvas(recorder);
+  canvas.drawPaint(Paint()..color = const Color(0xFFABCDEF));
+  final Picture picture = recorder.endRecording();
+  builder.addPicture(Offset.zero, picture);
+
+  PlatformDispatcher.instance.onBeginFrame = (_) {
+    // Tell engine the correct layer tree.
+    _captureRootLayer(builder);
+  };
+
+  PlatformDispatcher.instance.onDrawFrame = () {
+    final Scene scene = builder.build();
+    PlatformDispatcher.instance.implicitView!.render(scene);
+    scene.dispose();
+    picture.dispose();
+
+    // Render a second time. This duplicate render should be ignored.
+    renderDummyToView(PlatformDispatcher.instance.implicitView!);
+  };
+  PlatformDispatcher.instance.scheduleFrame();
+}
+
+@pragma('vm:entry-point')
+void renderSingleViewAndCallAfterOnDrawFrame() {
+  PlatformDispatcher.instance.onDrawFrame = () {
+    final SceneBuilder builder = SceneBuilder();
+    final PictureRecorder recorder = PictureRecorder();
+    final Canvas canvas = Canvas(recorder);
+    canvas.drawPaint(Paint()..color = const Color(0xFFABCDEF));
+    final Picture picture = recorder.endRecording();
+    builder.addPicture(Offset.zero, picture);
+
+    final Scene scene = builder.build();
+    PlatformDispatcher.instance.implicitView!.render(scene);
+    // Notify the engine after the render before the disposal.
+    // The view should have been submitted for rasterization at this moment.
+    notifyNative();
+
+    scene.dispose();
+    picture.dispose();
+  };
+  PlatformDispatcher.instance.scheduleFrame();
+}
+
+@pragma('vm:entry-point')
+void renderWarmUpImplicitView() {
+  bool beginFrameCalled = false;
+
+  PlatformDispatcher.instance.scheduleWarmUpFrame(
+    beginFrame: () {
+      expect(beginFrameCalled, false);
+      beginFrameCalled = true;
+    },
+    drawFrame: () {
+      expect(beginFrameCalled, true);
+      renderDummyToView(PlatformDispatcher.instance.implicitView!);
+    },
+  );
+}
+
+@pragma('vm:entry-point')
+void renderWarmUpView1and2() {
+  bool beginFrameCalled = false;
+
+  PlatformDispatcher.instance.scheduleWarmUpFrame(
+    beginFrame: () {
+      expect(beginFrameCalled, false);
+      beginFrameCalled = true;
+    },
+    drawFrame: () {
+      expect(beginFrameCalled, true);
+
+      for (final int viewId in <int>[1, 2]) {
+        renderDummyToView(PlatformDispatcher.instance.view(id: viewId)!);
+      }
+    }
+  );
+}
diff --git a/shell/common/input_events_unittests.cc b/shell/common/input_events_unittests.cc
index 3f117c006c65ff33ca5edac8176e4de170389b00..66a2b64a39e02244b02a776650ff18ee7bcc27a9 100644
--- a/shell/common/input_events_unittests.cc
+++ b/shell/common/input_events_unittests.cc
@@ -54,7 +54,12 @@ static void TestSimulatedInputEvents(
     bool restart_engine = false) {
   ///// Begin constructing shell ///////////////////////////////////////////////
   auto settings = fixture->CreateSettingsForFixture();
-  std::unique_ptr<Shell> shell = fixture->CreateShell(settings, true);
+  std::unique_ptr<Shell> shell = fixture->CreateShell({
+      .settings = settings,
+      .platform_view_create_callback = ShellTestPlatformViewBuilder({
+          .simulate_vsync = true,
+      }),
+  });
 
   auto configuration = RunConfiguration::InferFromSettings(settings);
   configuration.SetEntrypoint("onPointerDataPacketMain");
@@ -122,11 +127,11 @@ static void TestSimulatedInputEvents(
         ShellTest::DispatchFakePointerData(shell.get());
         i += 1;
       }
-      ShellTest::VSyncFlush(shell.get(), will_draw_new_frame);
+      ShellTest::VSyncFlush(shell.get(), &will_draw_new_frame);
     }
     // Finally, issue a vsync for the pending event that may be generated duing
     // the last vsync.
-    ShellTest::VSyncFlush(shell.get(), will_draw_new_frame);
+    ShellTest::VSyncFlush(shell.get(), &will_draw_new_frame);
   });
 
   simulation.wait();
@@ -300,7 +305,12 @@ TEST_F(ShellTest, HandlesActualIphoneXsInputEvents) {
 TEST_F(ShellTest, CanCorrectlyPipePointerPacket) {
   // Sets up shell with test fixture.
   auto settings = CreateSettingsForFixture();
-  std::unique_ptr<Shell> shell = CreateShell(settings, true);
+  std::unique_ptr<Shell> shell = CreateShell({
+      .settings = settings,
+      .platform_view_create_callback = ShellTestPlatformViewBuilder({
+          .simulate_vsync = true,
+      }),
+  });
 
   auto configuration = RunConfiguration::InferFromSettings(settings);
   configuration.SetEntrypoint("onPointerDataPacketMain");
@@ -335,8 +345,7 @@ TEST_F(ShellTest, CanCorrectlyPipePointerPacket) {
   CreateSimulatedPointerData(data, PointerData::Change::kRemove, 3.0, 4.0);
   packet->SetPointerData(5, data);
   ShellTest::DispatchPointerData(shell.get(), std::move(packet));
-  bool will_draw_new_frame;
-  ShellTest::VSyncFlush(shell.get(), will_draw_new_frame);
+  ShellTest::VSyncFlush(shell.get());
 
   reportLatch.Wait();
   size_t expect_length = 6;
@@ -361,7 +370,12 @@ TEST_F(ShellTest, CanCorrectlyPipePointerPacket) {
 TEST_F(ShellTest, CanCorrectlySynthesizePointerPacket) {
   // Sets up shell with test fixture.
   auto settings = CreateSettingsForFixture();
-  std::unique_ptr<Shell> shell = CreateShell(settings, true);
+  std::unique_ptr<Shell> shell = CreateShell({
+      .settings = settings,
+      .platform_view_create_callback = ShellTestPlatformViewBuilder({
+          .simulate_vsync = true,
+      }),
+  });
 
   auto configuration = RunConfiguration::InferFromSettings(settings);
   configuration.SetEntrypoint("onPointerDataPacketMain");
@@ -392,8 +406,7 @@ TEST_F(ShellTest, CanCorrectlySynthesizePointerPacket) {
   CreateSimulatedPointerData(data, PointerData::Change::kRemove, 3.0, 4.0);
   packet->SetPointerData(3, data);
   ShellTest::DispatchPointerData(shell.get(), std::move(packet));
-  bool will_draw_new_frame;
-  ShellTest::VSyncFlush(shell.get(), will_draw_new_frame);
+  ShellTest::VSyncFlush(shell.get());
 
   reportLatch.Wait();
   size_t expect_length = 6;
diff --git a/shell/common/persistent_cache_unittests.cc b/shell/common/persistent_cache_unittests.cc
index c1d27bfa777949b00f64c08e59f1bbcf3c8484d3..427da231efed07ad9043a288489d0ea94933c514 100644
--- a/shell/common/persistent_cache_unittests.cc
+++ b/shell/common/persistent_cache_unittests.cc
@@ -9,7 +9,6 @@
 #include "flutter/assets/directory_asset_bundle.h"
 #include "flutter/flow/layers/container_layer.h"
 #include "flutter/flow/layers/layer.h"
-#include "flutter/flow/layers/physical_shape_layer.h"
 #include "flutter/fml/command_line.h"
 #include "flutter/fml/file.h"
 #include "flutter/fml/log_settings.h"
@@ -18,174 +17,12 @@
 #include "flutter/shell/common/switches.h"
 #include "flutter/shell/version/version.h"
 #include "flutter/testing/testing.h"
-#include "include/core/SkPicture.h"
 
 namespace flutter {
 namespace testing {
 
 using PersistentCacheTest = ShellTest;
 
-static void WaitForIO(Shell* shell) {
-  std::promise<bool> io_task_finished;
-  shell->GetTaskRunners().GetIOTaskRunner()->PostTask(
-      [&io_task_finished]() { io_task_finished.set_value(true); });
-  io_task_finished.get_future().wait();
-}
-
-static void WaitForRaster(Shell* shell) {
-  std::promise<bool> raster_task_finished;
-  shell->GetTaskRunners().GetRasterTaskRunner()->PostTask(
-      [&raster_task_finished]() { raster_task_finished.set_value(true); });
-  raster_task_finished.get_future().wait();
-}
-
-TEST_F(PersistentCacheTest, CacheSkSLWorks) {
-  // Create a temp dir to store the persistent cache
-  fml::ScopedTemporaryDirectory dir;
-  PersistentCache::SetCacheDirectoryPath(dir.path());
-  PersistentCache::ResetCacheForProcess();
-
-  auto settings = CreateSettingsForFixture();
-  settings.cache_sksl = true;
-  settings.dump_skp_on_shader_compilation = true;
-
-  fml::AutoResetWaitableEvent first_frame_latch;
-  settings.frame_rasterized_callback =
-      [&first_frame_latch](const FrameTiming& t) {
-        first_frame_latch.Signal();
-      };
-
-  auto sksl_config = RunConfiguration::InferFromSettings(settings);
-  sksl_config.SetEntrypoint("emptyMain");
-  std::unique_ptr<Shell> shell = CreateShell(settings);
-  PlatformViewNotifyCreated(shell.get());
-  RunEngine(shell.get(), std::move(sksl_config));
-
-  // Initially, we should have no SkSL cache
-  auto cache = PersistentCache::GetCacheForProcess()->LoadSkSLs();
-  ASSERT_EQ(cache.size(), 0u);
-
-  // Draw something to trigger shader compilations.
-  LayerTreeBuilder builder = [](const std::shared_ptr<ContainerLayer>& root) {
-    SkPath path;
-    path.addCircle(50, 50, 20);
-    auto physical_shape_layer = std::make_shared<PhysicalShapeLayer>(
-        SK_ColorRED, SK_ColorBLUE, 1.0f, path, Clip::antiAlias);
-    root->Add(physical_shape_layer);
-  };
-  PumpOneFrame(shell.get(), 100, 100, builder);
-  first_frame_latch.Wait();
-  WaitForIO(shell.get());
-
-  // Some skp should be dumped due to shader compilations.
-  int skp_count = 0;
-  fml::FileVisitor skp_visitor = [&skp_count](const fml::UniqueFD& directory,
-                                              const std::string& filename) {
-    if (filename.size() >= 4 &&
-        filename.substr(filename.size() - 4, 4) == ".skp") {
-      skp_count += 1;
-    }
-    return true;
-  };
-  fml::VisitFilesRecursively(dir.fd(), skp_visitor);
-  ASSERT_GT(skp_count, 0);
-
-  // SkSL cache should be generated by the last run.
-  cache = PersistentCache::GetCacheForProcess()->LoadSkSLs();
-  ASSERT_GT(cache.size(), 0u);
-
-  // Run the engine again with cache_sksl = false and check that the previously
-  // generated SkSL cache is used for precompile.
-  PersistentCache::ResetCacheForProcess();
-  settings.cache_sksl = false;
-  settings.dump_skp_on_shader_compilation = true;
-  auto normal_config = RunConfiguration::InferFromSettings(settings);
-  normal_config.SetEntrypoint("emptyMain");
-  DestroyShell(std::move(shell));
-  shell = CreateShell(settings);
-  PlatformViewNotifyCreated(shell.get());
-  RunEngine(shell.get(), std::move(normal_config));
-  first_frame_latch.Reset();
-  PumpOneFrame(shell.get(), 100, 100, builder);
-  first_frame_latch.Wait();
-  WaitForIO(shell.get());
-
-// Shader precompilation from SkSL is not implemented on the Skia Vulkan
-// backend so don't run the second half of this test on Vulkan. This can get
-// removed if SkSL precompilation is implemented in the Skia Vulkan backend.
-#if !defined(SHELL_ENABLE_VULKAN)
-  // To check that all shaders are precompiled, verify that no new skp is dumped
-  // due to shader compilations.
-  int old_skp_count = skp_count;
-  skp_count = 0;
-  fml::VisitFilesRecursively(dir.fd(), skp_visitor);
-  ASSERT_EQ(skp_count, old_skp_count);
-#endif  // !defined(SHELL_ENABLE_VULKAN)
-
-  // Remove all files generated
-  fml::RemoveFilesInDirectory(dir.fd());
-  DestroyShell(std::move(shell));
-}
-
-TEST_F(PersistentCacheTest, CanPrecompileMetalShaders) {
-#if !SHELL_ENABLE_METAL
-  GTEST_SKIP();
-#endif  //  !SHELL_ENABLE_METAL
-  fml::ScopedTemporaryDirectory dir;
-  PersistentCache::SetCacheDirectoryPath(dir.path());
-  PersistentCache::ResetCacheForProcess();
-
-  auto settings = CreateSettingsForFixture();
-  settings.cache_sksl = true;
-  settings.dump_skp_on_shader_compilation = true;
-
-  fml::AutoResetWaitableEvent first_frame_latch;
-  settings.frame_rasterized_callback =
-      [&first_frame_latch](const FrameTiming& t) {
-        first_frame_latch.Signal();
-      };
-
-  auto sksl_config = RunConfiguration::InferFromSettings(settings);
-  sksl_config.SetEntrypoint("emptyMain");
-  std::unique_ptr<Shell> shell =
-      CreateShell(settings,                                          //
-                  GetTaskRunnersForFixture(),                        //
-                  false,                                             //
-                  nullptr,                                           //
-                  false,                                             //
-                  ShellTestPlatformView::BackendType::kMetalBackend  //
-      );
-  PlatformViewNotifyCreated(shell.get());
-  RunEngine(shell.get(), std::move(sksl_config));
-
-  // Initially, we should have no SkSL cache
-  {
-    auto empty_cache = PersistentCache::GetCacheForProcess()->LoadSkSLs();
-    ASSERT_EQ(empty_cache.size(), 0u);
-  }
-
-  // Draw something to trigger shader compilations.
-  LayerTreeBuilder builder = [](const std::shared_ptr<ContainerLayer>& root) {
-    SkPath path;
-    path.addCircle(50, 50, 20);
-    auto physical_shape_layer = std::make_shared<PhysicalShapeLayer>(
-        SK_ColorRED, SK_ColorBLUE, 1.0f, path, Clip::antiAlias);
-    root->Add(physical_shape_layer);
-  };
-  PumpOneFrame(shell.get(), 100, 100, builder);
-  first_frame_latch.Wait();
-  WaitForRaster(shell.get());
-  WaitForIO(shell.get());
-
-  // Assert that SkSLs have been generated.
-  auto filled_cache = PersistentCache::GetCacheForProcess()->LoadSkSLs();
-  ASSERT_GT(filled_cache.size(), 0u);
-
-  // Remove all files generated.
-  fml::RemoveFilesInDirectory(dir.fd());
-  DestroyShell(std::move(shell));
-}
-
 static void CheckTextSkData(const sk_sp<SkData>& data,
                             const std::string& expected) {
   std::string data_string(reinterpret_cast<const char*>(data->bytes()),
@@ -205,7 +42,7 @@ static void CheckTwoSkSLsAreLoaded() {
 
 TEST_F(PersistentCacheTest, CanLoadSkSLsFromAsset) {
   // Avoid polluting unit tests output by hiding INFO level logging.
-  fml::LogSettings warning_only = {fml::LOG_WARNING};
+  fml::LogSettings warning_only = {fml::kLogWarning};
   fml::ScopedSetLogSettings scoped_set_log_settings(warning_only);
 
   // The SkSL key is Base32 encoded. "IE" is the encoding of "A" and "II" is the
diff --git a/shell/common/pipeline.h b/shell/common/pipeline.h
index e8b17768cba2f42a88290170a0b67e7b526638c0..2657d96689a2319abd143a427d8a7871d62d3b51 100644
--- a/shell/common/pipeline.h
+++ b/shell/common/pipeline.h
@@ -27,15 +27,39 @@ struct PipelineProduceResult {
 };
 
 enum class PipelineConsumeResult {
+  // NOLINTBEGIN(readability-identifier-naming)
   NoneAvailable,
   Done,
   MoreAvailable,
+  // NOLINTEND(readability-identifier-naming)
 };
 
 size_t GetNextPipelineTraceID();
 
 /// A thread-safe queue of resources for a single consumer and a single
-/// producer.
+/// producer, with a maximum queue depth.
+///
+/// Pipelines support two key operations: produce and consume.
+///
+/// The consumer calls |Consume| to wait for a resource to be produced and
+/// consume it when ready.
+///
+/// The producer calls |Produce| to generate a `ProducerContinuation` which
+/// provides a means to enqueue a resource in the pipeline, if the pipeline is
+/// below its maximum depth. When the resource has been prepared, the producer
+/// calls `Complete` on the continuation, which enqueues the resource and
+/// signals the waiting consumer.
+///
+/// Pipelines generate the following tracing information:
+/// * PipelineItem: async flow tracking time taken from the time a producer
+///   calls |Produce| to the time a consumer consumes calls |Consume|.
+/// * PipelineProduce: async flow tracking time taken from the time a producer
+///   calls |Produce| to the time they complete the `ProducerContinuation` with
+///   a resource.
+/// * Pipeline Depth: counter of inflight resource producers.
+///
+/// The primary use of this class is as the frame pipeline used in Flutter's
+/// animator/rasterizer.
 template <class R>
 class Pipeline {
  public:
@@ -70,6 +94,7 @@ class Pipeline {
       }
     }
 
+    /// Completes the continuation with the specified resource.
     [[nodiscard]] PipelineProduceResult Complete(ResourcePtr resource) {
       PipelineProduceResult result;
       if (continuation_) {
@@ -89,12 +114,14 @@ class Pipeline {
         std::function<PipelineProduceResult(ResourcePtr, size_t)>;
 
     Continuation continuation_;
-    size_t trace_id_;
+    uint64_t trace_id_;
 
-    ProducerContinuation(const Continuation& continuation, size_t trace_id)
+    ProducerContinuation(const Continuation& continuation, uint64_t trace_id)
         : continuation_(continuation), trace_id_(trace_id) {
+      TRACE_EVENT_ASYNC_BEGIN0_WITH_FLOW_IDS("flutter", "PipelineItem",
+                                             trace_id_, /*flow_id_count=*/1,
+                                             /*flow_ids=*/&trace_id);
       TRACE_FLOW_BEGIN("flutter", "PipelineItem", trace_id_);
-      TRACE_EVENT_ASYNC_BEGIN0("flutter", "PipelineItem", trace_id_);
       TRACE_EVENT_ASYNC_BEGIN0("flutter", "PipelineProduce", trace_id_);
     }
 
@@ -108,6 +135,11 @@ class Pipeline {
 
   bool IsValid() const { return empty_.IsValid() && available_.IsValid(); }
 
+  /// Creates a `ProducerContinuation` that a producer can use to add a
+  /// resource to the queue.
+  ///
+  /// If the queue is already at its maximum depth, the `ProducerContinuation`
+  /// is returned with success = false.
   ProducerContinuation Produce() {
     if (!empty_.TryWait()) {
       return {};
@@ -124,10 +156,11 @@ class Pipeline {
         GetNextPipelineTraceID()};         // trace id
   }
 
-  // Create a `ProducerContinuation` that will only push the task if the queue
-  // is empty.
-  // Prefer using |Produce|. ProducerContinuation returned by this method
-  // doesn't guarantee that the frame will be rendered.
+  /// Creates a `ProducerContinuation` that will only push the task if the
+  /// queue is empty.
+  ///
+  /// Prefer using |Produce|. ProducerContinuation returned by this method
+  /// doesn't guarantee that the frame will be rendered.
   ProducerContinuation ProduceIfEmpty() {
     if (!empty_.TryWait()) {
       return {};
@@ -186,6 +219,8 @@ class Pipeline {
   std::mutex queue_mutex_;
   std::deque<std::pair<ResourcePtr, size_t>> queue_;
 
+  /// Commits a produced resource to the queue and signals the consumer that a
+  /// resource is available.
   PipelineProduceResult ProducerCommit(ResourcePtr resource, size_t trace_id) {
     bool is_first_item = false;
     {
@@ -220,17 +255,6 @@ class Pipeline {
   FML_DISALLOW_COPY_AND_ASSIGN(Pipeline);
 };
 
-struct LayerTreeItem {
-  LayerTreeItem(std::shared_ptr<LayerTree> layer_tree,
-                std::unique_ptr<FrameTimingsRecorder> frame_timings_recorder)
-      : layer_tree(std::move(layer_tree)),
-        frame_timings_recorder(std::move(frame_timings_recorder)) {}
-  std::shared_ptr<LayerTree> layer_tree;
-  std::unique_ptr<FrameTimingsRecorder> frame_timings_recorder;
-};
-
-using LayerTreePipeline = Pipeline<LayerTreeItem>;
-
 }  // namespace flutter
 
 #endif  // FLUTTER_SHELL_COMMON_PIPELINE_H_
diff --git a/shell/common/platform_message_handler.h b/shell/common/platform_message_handler.h
index 99a4f6631cf89cbea965f8ea9ca6c0c8eaba36d8..d890495cef294945c239558fdb775bf5361a01c5 100644
--- a/shell/common/platform_message_handler.h
+++ b/shell/common/platform_message_handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_COMMON_PLATFORM_MESSAGE_HANDLER_H_
-#define SHELL_COMMON_PLATFORM_MESSAGE_HANDLER_H_
+#ifndef FLUTTER_SHELL_COMMON_PLATFORM_MESSAGE_HANDLER_H_
+#define FLUTTER_SHELL_COMMON_PLATFORM_MESSAGE_HANDLER_H_
 
 #include <memory>
 
@@ -24,10 +24,10 @@ class PlatformMessageHandler {
   virtual void HandlePlatformMessage(
       std::unique_ptr<PlatformMessage> message) = 0;
 
-  /// Returns true if the platform message will ALWAYS be be dispatched to the
+  /// Returns true if the platform message will ALWAYS be dispatched to the
   /// platform thread.
   ///
-  /// Platforms thats support Background Platform Channels will return
+  /// Platforms that support Background Platform Channels will return
   /// false.
   virtual bool DoesHandlePlatformMessageOnPlatformThread() const = 0;
 
@@ -45,4 +45,4 @@ class PlatformMessageHandler {
 };
 }  // namespace flutter
 
-#endif  // SHELL_COMMON_PLATFORM_MESSAGE_HANDLER_H_
+#endif  // FLUTTER_SHELL_COMMON_PLATFORM_MESSAGE_HANDLER_H_
diff --git a/shell/common/platform_view.cc b/shell/common/platform_view.cc
index 03523f5682a26398b99ca4c660939274a96d57dc..7e04ed75625204461d220a7f6b52e1f970937a44 100644
--- a/shell/common/platform_view.cc
+++ b/shell/common/platform_view.cc
@@ -38,10 +38,11 @@ void PlatformView::DispatchPointerDataPacket(
       pointer_data_packet_converter_.Convert(std::move(packet)));
 }
 
-void PlatformView::DispatchSemanticsAction(int32_t id,
+void PlatformView::DispatchSemanticsAction(int32_t node_id,
                                            SemanticsAction action,
                                            fml::MallocMapping args) {
-  delegate_.OnPlatformViewDispatchSemanticsAction(id, action, std::move(args));
+  delegate_.OnPlatformViewDispatchSemanticsAction(node_id, action,
+                                                  std::move(args));
 }
 
 void PlatformView::SetSemanticsEnabled(bool enabled) {
@@ -52,8 +53,9 @@ void PlatformView::SetAccessibilityFeatures(int32_t flags) {
   delegate_.OnPlatformViewSetAccessibilityFeatures(flags);
 }
 
-void PlatformView::SetViewportMetrics(const ViewportMetrics& metrics) {
-  delegate_.OnPlatformViewSetViewportMetrics(metrics);
+void PlatformView::SetViewportMetrics(int64_t view_id,
+                                      const ViewportMetrics& metrics) {
+  delegate_.OnPlatformViewSetViewportMetrics(view_id, metrics);
 }
 
 void PlatformView::NotifyCreated() {
@@ -114,6 +116,8 @@ void PlatformView::UpdateSemantics(
     // NOLINTNEXTLINE(performance-unnecessary-value-param)
     CustomAccessibilityActionUpdates actions) {}
 
+void PlatformView::SendChannelUpdate(const std::string& name, bool listening) {}
+
 void PlatformView::HandlePlatformMessage(
     std::unique_ptr<PlatformMessage> message) {
   if (auto response = message->response()) {
@@ -199,4 +203,12 @@ const Settings& PlatformView::GetSettings() const {
   return delegate_.OnPlatformViewGetSettings();
 }
 
+double PlatformView::GetScaledFontSize(double unscaled_font_size,
+                                       int configuration_id) const {
+  // Unreachable by default, as most platforms do not support nonlinear scaling
+  // and the Flutter application never invokes this method.
+  FML_UNREACHABLE();
+  return -1;
+}
+
 }  // namespace flutter
diff --git a/shell/common/platform_view.h b/shell/common/platform_view.h
index d46b8b1326ff6c4daaf7750e91e89d855270fdc1..bfb6489b88e49dc247a86786ba12599711a6b388 100644
--- a/shell/common/platform_view.h
+++ b/shell/common/platform_view.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMMON_PLATFORM_VIEW_H_
-#define COMMON_PLATFORM_VIEW_H_
+#ifndef FLUTTER_SHELL_COMMON_PLATFORM_VIEW_H_
+#define FLUTTER_SHELL_COMMON_PLATFORM_VIEW_H_
 
 #include <functional>
 #include <memory>
@@ -104,14 +104,15 @@ class PlatformView {
         const fml::closure& closure) = 0;
 
     //--------------------------------------------------------------------------
-    /// @brief      Notifies the delegate the viewport metrics of the platform
-    ///             view have been updated. The rasterizer will need to be
-    ///             reconfigured to render the frame in the updated viewport
-    ///             metrics.
+    /// @brief      Notifies the delegate the viewport metrics of a view have
+    ///             been updated. The rasterizer will need to be reconfigured to
+    ///             render the frame in the updated viewport metrics.
     ///
+    /// @param[in]  view_id  The ID for the view that `metrics` describes.
     /// @param[in]  metrics  The updated viewport metrics.
     ///
     virtual void OnPlatformViewSetViewportMetrics(
+        int64_t view_id,
         const ViewportMetrics& metrics) = 0;
 
     //--------------------------------------------------------------------------
@@ -144,14 +145,14 @@ class PlatformView {
     ///             event must be forwarded to the running root isolate hosted
     ///             by the engine on the UI thread.
     ///
-    /// @param[in]  id      The identifier of the accessibility node.
+    /// @param[in]  node_id The identifier of the accessibility node.
     /// @param[in]  action  The accessibility related action performed on the
     ///                     node of the specified ID.
     /// @param[in]  args    An optional list of argument that apply to the
     ///                     specified action.
     ///
     virtual void OnPlatformViewDispatchSemanticsAction(
-        int32_t id,
+        int32_t node_id,
         SemanticsAction action,
         fml::MallocMapping args) = 0;
 
@@ -278,7 +279,7 @@ class PlatformView {
     ///                              temporary conditions such as no network.
     ///                              Transient errors allow the dart VM to
     ///                              re-request the same deferred library and
-    ///                              and loading_unit_id again. Non-transient
+    ///                              loading_unit_id again. Non-transient
     ///                              errors are permanent and attempts to
     ///                              re-request the library will instantly
     ///                              complete with an error.
@@ -406,12 +407,12 @@ class PlatformView {
   /// @brief      Used by embedders to dispatch an accessibility action to a
   ///             running isolate hosted by the engine.
   ///
-  /// @param[in]  id      The identifier of the accessibility node on which to
+  /// @param[in]  node_id The identifier of the accessibility node on which to
   ///                     perform the action.
   /// @param[in]  action  The action
   /// @param[in]  args    The arguments
   ///
-  void DispatchSemanticsAction(int32_t id,
+  void DispatchSemanticsAction(int32_t node_id,
                                SemanticsAction action,
                                fml::MallocMapping args);
 
@@ -465,16 +466,28 @@ class PlatformView {
                                CustomAccessibilityActionUpdates actions);
 
   //----------------------------------------------------------------------------
-  /// @brief      Used by embedders to specify the updated viewport metrics. In
-  ///             response to this call, on the raster thread, the rasterizer
-  ///             may need to be reconfigured to the updated viewport
+  /// @brief      Used by the framework to tell the embedder that it has
+  ///             registered a listener on a given channel.
+  ///
+  /// @param[in]  name      The name of the channel on which the listener has
+  ///                       set or cleared a listener.
+  /// @param[in]  listening True if a listener has been set, false if it has
+  ///                       been cleared.
+  ///
+  virtual void SendChannelUpdate(const std::string& name, bool listening);
+
+  //----------------------------------------------------------------------------
+  /// @brief      Used by embedders to specify the updated viewport metrics for
+  ///             a view. In response to this call, on the raster thread, the
+  ///             rasterizer may need to be reconfigured to the updated viewport
   ///             dimensions. On the UI thread, the framework may need to start
   ///             generating a new frame for the updated viewport metrics as
   ///             well.
   ///
+  /// @param[in]  view_id  The ID for the view that `metrics` describes.
   /// @param[in]  metrics  The updated viewport metrics.
   ///
-  void SetViewportMetrics(const ViewportMetrics& metrics);
+  void SetViewportMetrics(int64_t view_id, const ViewportMetrics& metrics);
 
   //----------------------------------------------------------------------------
   /// @brief      Used by embedders to notify the shell that a platform view
@@ -759,7 +772,7 @@ class PlatformView {
   ///                              temporary conditions such as no network.
   ///                              Transient errors allow the dart VM to
   ///                              re-request the same deferred library and
-  ///                              and loading_unit_id again. Non-transient
+  ///                              loading_unit_id again. Non-transient
   ///                              errors are permanent and attempts to
   ///                              re-request the library will instantly
   ///                              complete with an error.
@@ -831,6 +844,28 @@ class PlatformView {
   ///
   const Settings& GetSettings() const;
 
+  //--------------------------------------------------------------------------
+  /// @brief      Synchronously invokes platform-specific APIs to apply the
+  ///             system text scaling on the given unscaled font size.
+  ///
+  ///             Platforms that support this feature (currently it's only
+  ///             implemented for Android SDK level 34+) will send a valid
+  ///             configuration_id to potential callers, before this method can
+  ///             be called.
+  ///
+  /// @param[in]  unscaled_font_size  The unscaled font size specified by the
+  ///                                 app developer. The value is in logical
+  ///                                 pixels, and is guaranteed to be finite and
+  ///                                 non-negative.
+  /// @param[in]  configuration_id    The unique id of the configuration to use
+  ///                                 for computing the scaled font size.
+  ///
+  /// @return     The scaled font size in logical pixels, or -1 if the given
+  ///             configuration_id did not match a valid configuration.
+  ///
+  virtual double GetScaledFontSize(double unscaled_font_size,
+                                   int configuration_id) const;
+
  protected:
   // This is the only method called on the raster task runner.
   virtual std::unique_ptr<Surface> CreateRenderingSurface();
@@ -846,4 +881,4 @@ class PlatformView {
 
 }  // namespace flutter
 
-#endif  // COMMON_PLATFORM_VIEW_H_
+#endif  // FLUTTER_SHELL_COMMON_PLATFORM_VIEW_H_
diff --git a/shell/common/pointer_data_dispatcher.cc b/shell/common/pointer_data_dispatcher.cc
index 78346a9d0ced3acf60ca5b2583569c3d5a88d6f5..58bf4b110b78c952db8f411240c50568c226835e 100644
--- a/shell/common/pointer_data_dispatcher.cc
+++ b/shell/common/pointer_data_dispatcher.cc
@@ -18,7 +18,9 @@ SmoothPointerDataDispatcher::~SmoothPointerDataDispatcher() = default;
 void DefaultPointerDataDispatcher::DispatchPacket(
     std::unique_ptr<PointerDataPacket> packet,
     uint64_t trace_flow_id) {
-  TRACE_EVENT0("flutter", "DefaultPointerDataDispatcher::DispatchPacket");
+  TRACE_EVENT0_WITH_FLOW_IDS("flutter",
+                             "DefaultPointerDataDispatcher::DispatchPacket",
+                             /*flow_id_count=*/1, &trace_flow_id);
   TRACE_FLOW_STEP("flutter", "PointerEvent", trace_flow_id);
   delegate_.DoDispatchPacket(std::move(packet), trace_flow_id);
 }
@@ -26,7 +28,9 @@ void DefaultPointerDataDispatcher::DispatchPacket(
 void SmoothPointerDataDispatcher::DispatchPacket(
     std::unique_ptr<PointerDataPacket> packet,
     uint64_t trace_flow_id) {
-  TRACE_EVENT0("flutter", "SmoothPointerDataDispatcher::DispatchPacket");
+  TRACE_EVENT0_WITH_FLOW_IDS("flutter",
+                             "SmoothPointerDataDispatcher::DispatchPacket",
+                             /*flow_id_count=*/1, &trace_flow_id);
   TRACE_FLOW_STEP("flutter", "PointerEvent", trace_flow_id);
 
   if (is_pointer_data_in_progress_) {
diff --git a/shell/common/pointer_data_dispatcher.h b/shell/common/pointer_data_dispatcher.h
index 89dfd4eeeb83aa68a1c02916410a899ad23de132..b749bfeee99de4e2e51bbc36261577710b192541 100644
--- a/shell/common/pointer_data_dispatcher.h
+++ b/shell/common/pointer_data_dispatcher.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef POINTER_DATA_DISPATCHER_H_
-#define POINTER_DATA_DISPATCHER_H_
+#ifndef FLUTTER_SHELL_COMMON_POINTER_DATA_DISPATCHER_H_
+#define FLUTTER_SHELL_COMMON_POINTER_DATA_DISPATCHER_H_
 
 #include "flutter/runtime/runtime_controller.h"
 #include "flutter/shell/common/animator.h"
@@ -174,4 +174,4 @@ using PointerDataDispatcherMaker =
 
 }  // namespace flutter
 
-#endif  // POINTER_DATA_DISPATCHER_H_
+#endif  // FLUTTER_SHELL_COMMON_POINTER_DATA_DISPATCHER_H_
diff --git a/shell/common/rasterizer.cc b/shell/common/rasterizer.cc
index 78a42915e1244d08a09060700aa505bfe6a6e9c9..ac09da7c6b55f1413cd6155f7153849fbf2a5a7c 100644
--- a/shell/common/rasterizer.cc
+++ b/shell/common/rasterizer.cc
@@ -8,21 +8,43 @@
 #include <memory>
 #include <utility>
 
+#include "display_list/dl_builder.h"
 #include "flow/frame_timings.h"
+#include "flutter/common/constants.h"
 #include "flutter/common/graphics/persistent_cache.h"
 #include "flutter/flow/layers/offscreen_surface.h"
 #include "flutter/fml/time/time_delta.h"
 #include "flutter/fml/time/time_point.h"
+#include "flutter/shell/common/base64.h"
 #include "flutter/shell/common/serialization_callbacks.h"
+#include "fml/closure.h"
 #include "fml/make_copyable.h"
-#include "third_party/skia/include/core/SkImageEncoder.h"
+#include "fml/synchronization/waitable_event.h"
+#include "third_party/skia/include/core/SkColorSpace.h"
+#include "third_party/skia/include/core/SkData.h"
+#include "third_party/skia/include/core/SkImage.h"
+#include "third_party/skia/include/core/SkImageInfo.h"
+#include "third_party/skia/include/core/SkMatrix.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
+#include "third_party/skia/include/core/SkRect.h"
 #include "third_party/skia/include/core/SkSerialProcs.h"
+#include "third_party/skia/include/core/SkSize.h"
 #include "third_party/skia/include/core/SkSurface.h"
-#include "third_party/skia/include/core/SkSurfaceCharacterization.h"
-#include "third_party/skia/include/utils/SkBase64.h"
+#include "third_party/skia/include/encode/SkPngEncoder.h"
+#include "third_party/skia/include/gpu/GpuTypes.h"
+#include "third_party/skia/include/gpu/GrBackendSurface.h"
+#include "third_party/skia/include/gpu/GrDirectContext.h"
+#include "third_party/skia/include/gpu/GrTypes.h"
+#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
+
+#if IMPELLER_SUPPORTS_RENDERING
+#include "impeller/aiks/aiks_context.h"           // nogncheck
+#include "impeller/core/formats.h"                // nogncheck
+#include "impeller/display_list/dl_dispatcher.h"  // nogncheck
+#endif
 
 #include "flutter/fml/logging.h"
+#include "flutter/fml/platform/ohos/hisysevent_c.h"
 
 namespace flutter {
 
@@ -35,7 +57,6 @@ Rasterizer::Rasterizer(Delegate& delegate,
     : delegate_(delegate),
       gpu_image_behavior_(gpu_image_behavior),
       compositor_context_(std::make_unique<flutter::CompositorContext>(*this)),
-      user_override_resource_cache_bytes_(false),
       snapshot_controller_(
           SnapshotController::Make(*this, delegate.GetSettings())),
       weak_factory_(this) {
@@ -53,6 +74,11 @@ fml::TaskRunnerAffineWeakPtr<SnapshotDelegate> Rasterizer::GetSnapshotDelegate()
   return weak_factory_.GetWeakPtr();
 }
 
+void Rasterizer::SetImpellerContext(
+    std::weak_ptr<impeller::Context> impeller_context) {
+  impeller_context_ = std::move(impeller_context);
+}
+
 void Rasterizer::Setup(std::unique_ptr<Surface> surface) {
   surface_ = std::move(surface);
 
@@ -77,7 +103,7 @@ void Rasterizer::Setup(std::unique_ptr<Surface> surface) {
         delegate_.GetParentRasterThreadMerger(), platform_id, gpu_id);
   }
   if (raster_thread_merger_) {
-    raster_thread_merger_->SetMergeUnmergeCallback([=]() {
+    raster_thread_merger_->SetMergeUnmergeCallback([this]() {
       // Clear the GL context after the thread configuration has changed.
       if (surface_) {
         surface_->ClearRenderContext();
@@ -93,18 +119,19 @@ void Rasterizer::TeardownExternalViewEmbedder() {
 }
 
 void Rasterizer::Teardown() {
+  is_torn_down_ = true;
   if (surface_) {
     auto context_switch = surface_->MakeRenderContextCurrent();
     if (context_switch->GetResult()) {
       compositor_context_->OnGrContextDestroyed();
       if (auto* context = surface_->GetContext()) {
-        context->purgeUnlockedResources(/*scratchResourcesOnly=*/false);
+        context->purgeUnlockedResources(GrPurgeResourceOptions::kAllResources);
       }
     }
     surface_.reset();
   }
 
-  last_layer_tree_.reset();
+  view_records_.clear();
 
   if (raster_thread_merger_.get() != nullptr &&
       raster_thread_merger_.get()->IsMerged()) {
@@ -114,6 +141,20 @@ void Rasterizer::Teardown() {
   }
 }
 
+bool Rasterizer::IsTornDown() {
+  return is_torn_down_;
+}
+
+std::optional<DrawSurfaceStatus> Rasterizer::GetLastDrawStatus(
+    int64_t view_id) {
+  auto found = view_records_.find(view_id);
+  if (found != view_records_.end()) {
+    return found->second.last_draw_status;
+  } else {
+    return std::optional<DrawSurfaceStatus>();
+  }
+}
+
 void Rasterizer::EnableThreadMergerIfNeeded() {
   if (raster_thread_merger_) {
     raster_thread_merger_->Enable();
@@ -145,6 +186,10 @@ void Rasterizer::NotifyLowMemoryWarning() const {
   context->performDeferredCleanup(std::chrono::milliseconds(0));
 }
 
+void Rasterizer::CollectView(int64_t view_id) {
+  view_records_.erase(view_id);
+}
+
 std::shared_ptr<flutter::TextureRegistry> Rasterizer::GetTextureRegistry() {
   return compositor_context_->texture_registry();
 }
@@ -153,79 +198,86 @@ GrDirectContext* Rasterizer::GetGrContext() {
   return surface_ ? surface_->GetContext() : nullptr;
 }
 
-flutter::LayerTree* Rasterizer::GetLastLayerTree() {
-  return last_layer_tree_.get();
+flutter::LayerTree* Rasterizer::GetLastLayerTree(int64_t view_id) {
+  auto found = view_records_.find(view_id);
+  if (found == view_records_.end()) {
+    return nullptr;
+  }
+  auto& last_task = found->second.last_successful_task;
+  if (last_task == nullptr) {
+    return nullptr;
+  }
+  return last_task->layer_tree.get();
 }
 
-void Rasterizer::DrawLastLayerTree(
+void Rasterizer::DrawLastLayerTrees(
     std::unique_ptr<FrameTimingsRecorder> frame_timings_recorder) {
-  if (!last_layer_tree_ || !surface_) {
-    FML_DLOG(ERROR)<<"DrawLastLayerTree last_layer_tree_ or  surface_ is nullptr " ;
+  if (!surface_) {
+    return;
+  }
+  std::vector<std::unique_ptr<LayerTreeTask>> tasks;
+  for (auto& [view_id, view_record] : view_records_) {
+    if (view_record.last_successful_task) {
+      tasks.push_back(std::move(view_record.last_successful_task));
+    }
+  }
+  if (tasks.empty()) {
     return;
   }
-  RasterStatus raster_status =
-      DrawToSurface(*frame_timings_recorder, *last_layer_tree_);
+
+  DoDrawResult result =
+      DrawToSurfaces(*frame_timings_recorder, std::move(tasks));
 
   // EndFrame should perform cleanups for the external_view_embedder.
   if (external_view_embedder_ && external_view_embedder_->GetUsedThisFrame()) {
-    bool should_resubmit_frame = ShouldResubmitFrame(raster_status);
+    bool should_resubmit_frame = ShouldResubmitFrame(result);
     external_view_embedder_->SetUsedThisFrame(false);
     external_view_embedder_->EndFrame(should_resubmit_frame,
                                       raster_thread_merger_);
   }
 }
 
-RasterStatus Rasterizer::Draw(
-    const std::shared_ptr<LayerTreePipeline>& pipeline,
-    LayerTreeDiscardCallback discard_callback) {
+DrawStatus Rasterizer::Draw(const std::shared_ptr<FramePipeline>& pipeline) {
+  HISYSEVENT_WRITE_DURATION("flutter rasterize frame time");
   TRACE_EVENT0("flutter", "GPURasterizer::Draw");
   if (raster_thread_merger_ &&
       !raster_thread_merger_->IsOnRasterizingThread()) {
     // we yield and let this frame be serviced on the right thread.
-    return RasterStatus::kYielded;
+    return DrawStatus::kYielded;
   }
   FML_DCHECK(delegate_.GetTaskRunners()
                  .GetRasterTaskRunner()
                  ->RunsTasksOnCurrentThread());
 
-  RasterStatus raster_status = RasterStatus::kFailed;
-  LayerTreePipeline::Consumer consumer =
-      [&](std::unique_ptr<LayerTreeItem> item) {
-        std::shared_ptr<LayerTree> layer_tree = std::move(item->layer_tree);
-        std::unique_ptr<FrameTimingsRecorder> frame_timings_recorder =
-            std::move(item->frame_timings_recorder);
-        if (discard_callback(*layer_tree.get())) {
-          raster_status = RasterStatus::kDiscarded;
-        } else {
-          raster_status =
-              DoDraw(std::move(frame_timings_recorder), std::move(layer_tree));
-        }
-      };
+  DoDrawResult draw_result;
+  FramePipeline::Consumer consumer = [&draw_result,
+                                      this](std::unique_ptr<FrameItem> item) {
+    draw_result = DoDraw(std::move(item->frame_timings_recorder),
+                         std::move(item->layer_tree_tasks));
+  };
 
   PipelineConsumeResult consume_result = pipeline->Consume(consumer);
   if (consume_result == PipelineConsumeResult::NoneAvailable) {
-    return RasterStatus::kFailed;
+    return DrawStatus::kPipelineEmpty;
   }
   // if the raster status is to resubmit the frame, we push the frame to the
   // front of the queue and also change the consume status to more available.
 
-  bool should_resubmit_frame = ShouldResubmitFrame(raster_status);
+  bool should_resubmit_frame = ShouldResubmitFrame(draw_result);
   if (should_resubmit_frame) {
-    auto resubmitted_layer_tree_item = std::make_unique<LayerTreeItem>(
-        std::move(resubmitted_layer_tree_), std::move(resubmitted_recorder_));
+    FML_CHECK(draw_result.resubmitted_item);
     auto front_continuation = pipeline->ProduceIfEmpty();
-    PipelineProduceResult result =
-        front_continuation.Complete(std::move(resubmitted_layer_tree_item));
-    if (result.success) {
+    PipelineProduceResult pipeline_result =
+        front_continuation.Complete(std::move(draw_result.resubmitted_item));
+    if (pipeline_result.success) {
       consume_result = PipelineConsumeResult::MoreAvailable;
     }
-  } else if (raster_status == RasterStatus::kEnqueuePipeline) {
+  } else if (draw_result.status == DoDrawStatus::kEnqueuePipeline) {
     consume_result = PipelineConsumeResult::MoreAvailable;
   }
 
   // EndFrame should perform cleanups for the external_view_embedder.
-  if (surface_ && external_view_embedder_ &&
-      external_view_embedder_->GetUsedThisFrame()) {
+  if (external_view_embedder_ && external_view_embedder_->GetUsedThisFrame()) {
     external_view_embedder_->SetUsedThisFrame(false);
     external_view_embedder_->EndFrame(should_resubmit_frame,
                                       raster_thread_merger_);
@@ -236,25 +288,40 @@ RasterStatus Rasterizer::Draw(
   switch (consume_result) {
     case PipelineConsumeResult::MoreAvailable: {
       delegate_.GetTaskRunners().GetRasterTaskRunner()->PostTask(
-          fml::MakeCopyable(
-              [weak_this = weak_factory_.GetWeakPtr(), pipeline,
-               discard_callback = std::move(discard_callback)]() mutable {
-                if (weak_this) {
-                  weak_this->Draw(pipeline, std::move(discard_callback));
-                }
-              }));
+          [weak_this = weak_factory_.GetWeakPtr(), pipeline]() {
+            if (weak_this) {
+              weak_this->Draw(pipeline);
+            }
+          });
       break;
     }
     default:
       break;
   }
 
-  return raster_status;
+  return ToDrawStatus(draw_result.status);
+}
+
+bool Rasterizer::ShouldResubmitFrame(const DoDrawResult& result) {
+  if (result.resubmitted_item) {
+    FML_CHECK(!result.resubmitted_item->layer_tree_tasks.empty());
+    return true;
+  }
+  return false;
 }
 
-bool Rasterizer::ShouldResubmitFrame(const RasterStatus& raster_status) {
-  return raster_status == RasterStatus::kResubmit ||
-         raster_status == RasterStatus::kSkipAndRetry;
+DrawStatus Rasterizer::ToDrawStatus(DoDrawStatus status) {
+  switch (status) {
+    case DoDrawStatus::kEnqueuePipeline:
+      return DrawStatus::kDone;
+    case DoDrawStatus::kNotSetUp:
+      return DrawStatus::kNotSetUp;
+    case DoDrawStatus::kGpuUnavailable:
+      return DrawStatus::kGpuUnavailable;
+    case DoDrawStatus::kDone:
+      return DrawStatus::kDone;
+  }
+  FML_UNREACHABLE();
 }
 
 namespace {
@@ -270,13 +337,15 @@ std::unique_ptr<SnapshotDelegate::GpuImageResult> MakeBitmapImage(
   if (image_info.width() > 16384 || image_info.height() > 16384) {
     return std::make_unique<SnapshotDelegate::GpuImageResult>(
         GrBackendTexture(), nullptr, nullptr,
-        "unable to create render target at specified size");
+        "unable to create bitmap render target at specified size " +
+            std::to_string(image_info.width()) + "x" +
+            std::to_string(image_info.height()));
   };
 
-  sk_sp<SkSurface> surface = SkSurface::MakeRaster(image_info);
-  SkCanvas* canvas = surface->getCanvas();
-  canvas->clear(SK_ColorTRANSPARENT);
-  display_list->RenderTo(canvas);
+  sk_sp<SkSurface> surface = SkSurfaces::Raster(image_info);
+  auto canvas = DlSkCanvasAdapter(surface->getCanvas());
+  canvas.Clear(DlColor::kTransparent());
+  canvas.DrawDisplayList(display_list);
 
   sk_sp<SkImage> image = surface->makeImageSnapshot();
   return std::make_unique<SnapshotDelegate::GpuImageResult>(
@@ -291,17 +360,12 @@ std::unique_ptr<Rasterizer::GpuImageResult> Rasterizer::MakeSkiaGpuImage(
   TRACE_EVENT0("flutter", "Rasterizer::MakeGpuImage");
   FML_DCHECK(display_list);
 
-// TODO(dnfield): the Linux embedding is in a rough state right now and
-// I can't seem to get the GPU path working on it.
-// https://github.com/flutter/flutter/issues/108835
-#if FML_OS_LINUX
-  return MakeBitmapImage(display_list, image_info);
-#endif
-
   std::unique_ptr<SnapshotDelegate::GpuImageResult> result;
   delegate_.GetIsGpuDisabledSyncSwitch()->Execute(
       fml::SyncSwitch::Handlers()
           .SetIfTrue([&result, &image_info, &display_list] {
+            // TODO(dnfield): This isn't safe if display_list contains any GPU
+            // resources like an SkImage_gpu.
             result = MakeBitmapImage(display_list, image_info);
           })
           .SetIfFalse([&result, &image_info, &display_list,
@@ -309,6 +373,14 @@ std::unique_ptr<Rasterizer::GpuImageResult> Rasterizer::MakeSkiaGpuImage(
                        gpu_image_behavior = gpu_image_behavior_] {
             if (!surface ||
                 gpu_image_behavior == MakeGpuImageBehavior::kBitmap) {
+              // TODO(dnfield): This isn't safe if display_list contains any GPU
+              // resources like an SkImage_gpu.
+              result = MakeBitmapImage(display_list, image_info);
+              return;
+            }
+
+            auto context_switch = surface->MakeRenderContextCurrent();
+            if (!context_switch->GetResult()) {
               result = MakeBitmapImage(display_list, image_info);
               return;
             }
@@ -321,15 +393,17 @@ std::unique_ptr<Rasterizer::GpuImageResult> Rasterizer::MakeSkiaGpuImage(
 
             GrBackendTexture texture = context->createBackendTexture(
                 image_info.width(), image_info.height(), image_info.colorType(),
-                GrMipmapped::kNo, GrRenderable::kYes);
+                skgpu::Mipmapped::kNo, GrRenderable::kYes);
             if (!texture.isValid()) {
               result = std::make_unique<SnapshotDelegate::GpuImageResult>(
                   GrBackendTexture(), nullptr, nullptr,
-                  "unable to create render target at specified size");
+                  "unable to create texture render target at specified size " +
+                      std::to_string(image_info.width()) + "x" +
+                      std::to_string(image_info.height()));
               return;
             }
 
-            sk_sp<SkSurface> sk_surface = SkSurface::MakeFromBackendTexture(
+            sk_sp<SkSurface> sk_surface = SkSurfaces::WrapBackendTexture(
                 context, texture, kTopLeft_GrSurfaceOrigin, /*sampleCnt=*/0,
                 image_info.colorType(), image_info.refColorSpace(), nullptr);
             if (!sk_surface) {
@@ -339,9 +413,9 @@ std::unique_ptr<Rasterizer::GpuImageResult> Rasterizer::MakeSkiaGpuImage(
               return;
             }
 
-            SkCanvas* canvas = sk_surface->getCanvas();
-            canvas->clear(SK_ColorTRANSPARENT);
-            display_list->RenderTo(canvas);
+            auto canvas = DlSkCanvasAdapter(sk_surface->getCanvas());
+            canvas.Clear(DlColor::kTransparent());
+            canvas.DrawDisplayList(display_list);
 
             result = std::make_unique<SnapshotDelegate::GpuImageResult>(
                 texture, sk_ref_sp(context), nullptr, "");
@@ -363,33 +437,33 @@ fml::Milliseconds Rasterizer::GetFrameBudget() const {
   return delegate_.GetFrameBudget();
 };
 
-RasterStatus Rasterizer::DoDraw(
+Rasterizer::DoDrawResult Rasterizer::DoDraw(
     std::unique_ptr<FrameTimingsRecorder> frame_timings_recorder,
-    std::shared_ptr<flutter::LayerTree> layer_tree) {
+    std::vector<std::unique_ptr<LayerTreeTask>> tasks) {
   TRACE_EVENT_WITH_FRAME_NUMBER(frame_timings_recorder, "flutter",
-                                "Rasterizer::DoDraw");
+                                "Rasterizer::DoDraw", /*flow_id_count=*/0,
+                                /*flow_ids=*/nullptr);
   FML_DCHECK(delegate_.GetTaskRunners()
                  .GetRasterTaskRunner()
                  ->RunsTasksOnCurrentThread());
+  frame_timings_recorder->AssertInState(FrameTimingsRecorder::State::kBuildEnd);
 
-  if (!layer_tree || !surface_) {
-    return RasterStatus::kFailed;
+  if (tasks.empty()) {
+    return DoDrawResult{DoDrawStatus::kDone};
+  }
+  if (!surface_) {
+    return DoDrawResult{DoDrawStatus::kNotSetUp};
   }
 
   PersistentCache* persistent_cache = PersistentCache::GetCacheForProcess();
   persistent_cache->ResetStoredNewShaders();
 
-  RasterStatus raster_status =
-      DrawToSurface(*frame_timings_recorder, *layer_tree);
-  if (raster_status == RasterStatus::kSuccess) {
-    last_layer_tree_ = std::move(layer_tree);
-  } else if (ShouldResubmitFrame(raster_status)) {
-    resubmitted_layer_tree_ = std::move(layer_tree);
-    resubmitted_recorder_ = frame_timings_recorder->CloneUntil(
-        FrameTimingsRecorder::State::kBuildEnd);
-    return raster_status;
-  } else if (raster_status == RasterStatus::kDiscarded) {
-    return raster_status;
+  DoDrawResult result =
+      DrawToSurfaces(*frame_timings_recorder, std::move(tasks));
+
+  FML_DCHECK(result.status != DoDrawStatus::kEnqueuePipeline);
+  if (result.status == DoDrawStatus::kGpuUnavailable) {
+    return DoDrawResult{DoDrawStatus::kGpuUnavailable};
   }
 
   if (persistent_cache->IsDumpingSkp() &&
@@ -457,53 +531,145 @@ RasterStatus Rasterizer::DoDraw(
   if (raster_thread_merger_) {
     if (raster_thread_merger_->DecrementLease() ==
         fml::RasterThreadStatus::kUnmergedNow) {
-      return RasterStatus::kEnqueuePipeline;
+      return DoDrawResult{
+          .status = DoDrawStatus::kEnqueuePipeline,
+          .resubmitted_item = std::move(result.resubmitted_item),
+      };
     }
   }
 
-  return raster_status;
+  return result;
 }
 
-RasterStatus Rasterizer::DrawToSurface(
+Rasterizer::DoDrawResult Rasterizer::DrawToSurfaces(
     FrameTimingsRecorder& frame_timings_recorder,
-    flutter::LayerTree& layer_tree) {
-  TRACE_EVENT0("flutter", "Rasterizer::DrawToSurface");
+    std::vector<std::unique_ptr<LayerTreeTask>> tasks) {
+  TRACE_EVENT0("flutter", "Rasterizer::DrawToSurfaces");
   FML_DCHECK(surface_);
+  frame_timings_recorder.AssertInState(FrameTimingsRecorder::State::kBuildEnd);
 
-  RasterStatus raster_status;
+  DoDrawResult result{
+      .status = DoDrawStatus::kDone,
+  };
   if (surface_->AllowsDrawingWhenGpuDisabled()) {
-    raster_status = DrawToSurfaceUnsafe(frame_timings_recorder, layer_tree);
+    result.resubmitted_item =
+        DrawToSurfacesUnsafe(frame_timings_recorder, std::move(tasks));
   } else {
     delegate_.GetIsGpuDisabledSyncSwitch()->Execute(
         fml::SyncSwitch::Handlers()
-            .SetIfTrue([&] { raster_status = RasterStatus::kDiscarded; })
+            .SetIfTrue([&] {
+              result.status = DoDrawStatus::kGpuUnavailable;
+              frame_timings_recorder.RecordRasterStart(fml::TimePoint::Now());
+              frame_timings_recorder.RecordRasterEnd();
+            })
             .SetIfFalse([&] {
-              raster_status =
-                  DrawToSurfaceUnsafe(frame_timings_recorder, layer_tree);
+              result.resubmitted_item = DrawToSurfacesUnsafe(
+                  frame_timings_recorder, std::move(tasks));
             }));
   }
+  frame_timings_recorder.AssertInState(FrameTimingsRecorder::State::kRasterEnd);
 
-  return raster_status;
+  return result;
 }
 
-/// Unsafe because it assumes we have access to the GPU which isn't the case
-/// when iOS is backgrounded, for example.
-/// \see Rasterizer::DrawToSurface
-RasterStatus Rasterizer::DrawToSurfaceUnsafe(
+std::unique_ptr<FrameItem> Rasterizer::DrawToSurfacesUnsafe(
     FrameTimingsRecorder& frame_timings_recorder,
-    flutter::LayerTree& layer_tree) {
-  FML_DCHECK(surface_);
-  
+    std::vector<std::unique_ptr<LayerTreeTask>> tasks) {
   compositor_context_->ui_time().SetLapTime(
       frame_timings_recorder.GetBuildDuration());
 
-  SkCanvas* embedder_root_canvas = nullptr;
+  // First traverse: Filter out discarded trees
+  auto task_iter = tasks.begin();
+  while (task_iter != tasks.end()) {
+    LayerTreeTask& task = **task_iter;
+    if (delegate_.ShouldDiscardLayerTree(task.view_id, *task.layer_tree)) {
+      EnsureViewRecord(task.view_id).last_draw_status =
+          DrawSurfaceStatus::kDiscarded;
+      task_iter = tasks.erase(task_iter);
+    } else {
+      ++task_iter;
+    }
+  }
+  if (tasks.empty()) {
+    frame_timings_recorder.RecordRasterStart(fml::TimePoint::Now());
+    frame_timings_recorder.RecordRasterEnd();
+    return nullptr;
+  }
+
   if (external_view_embedder_) {
     FML_DCHECK(!external_view_embedder_->GetUsedThisFrame());
     external_view_embedder_->SetUsedThisFrame(true);
-    external_view_embedder_->BeginFrame(
-        layer_tree.frame_size(), surface_->GetContext(),
-        layer_tree.device_pixel_ratio(), raster_thread_merger_);
+    external_view_embedder_->BeginFrame(surface_->GetContext(),
+                                        raster_thread_merger_);
+  }
+
+  std::optional<fml::TimePoint> presentation_time = std::nullopt;
+  // TODO (https://github.com/flutter/flutter/issues/105596): this can be in
+  // the past and might need to get snapped to future as this frame could
+  // have been resubmitted. `presentation_time` on SubmitInfo is not set
+  // in this case.
+  {
+    const auto vsync_target_time = frame_timings_recorder.GetVsyncTargetTime();
+    if (vsync_target_time > fml::TimePoint::Now()) {
+      presentation_time = vsync_target_time;
+    }
+  }
+
+  frame_timings_recorder.RecordRasterStart(fml::TimePoint::Now());
+
+  // Second traverse: draw all layer trees.
+  std::vector<std::unique_ptr<LayerTreeTask>> resubmitted_tasks;
+  for (std::unique_ptr<LayerTreeTask>& task : tasks) {
+    int64_t view_id = task->view_id;
+    std::unique_ptr<LayerTree> layer_tree = std::move(task->layer_tree);
+    float device_pixel_ratio = task->device_pixel_ratio;
+
+    DrawSurfaceStatus status = DrawToSurfaceUnsafe(
+        view_id, *layer_tree, device_pixel_ratio, presentation_time);
+    FML_DCHECK(status != DrawSurfaceStatus::kDiscarded);
+
+    auto& view_record = EnsureViewRecord(task->view_id);
+    view_record.last_draw_status = status;
+    if (status == DrawSurfaceStatus::kSuccess) {
+      view_record.last_successful_task = std::make_unique<LayerTreeTask>(
+          view_id, std::move(layer_tree), device_pixel_ratio);
+    } else if (status == DrawSurfaceStatus::kRetry) {
+      resubmitted_tasks.push_back(std::make_unique<LayerTreeTask>(
+          view_id, std::move(layer_tree), device_pixel_ratio));
+    }
+  }
+  // TODO(dkwingsmt): Pass in raster cache(s) for all views.
+  // See https://github.com/flutter/flutter/issues/135530, item 4.
+  frame_timings_recorder.RecordRasterEnd(&compositor_context_->raster_cache());
+  FireNextFrameCallbackIfPresent();
+
+  if (surface_->GetContext()) {
+    surface_->GetContext()->performDeferredCleanup(kSkiaCleanupExpiration);
+  }
+
+  if (resubmitted_tasks.empty()) {
+    return nullptr;
+  } else {
+    return std::make_unique<FrameItem>(
+        std::move(resubmitted_tasks),
+        frame_timings_recorder.CloneUntil(
+            FrameTimingsRecorder::State::kBuildEnd));
+  }
+}
+
+/// \see Rasterizer::DrawToSurfaces
+DrawSurfaceStatus Rasterizer::DrawToSurfaceUnsafe(
+    int64_t view_id,
+    flutter::LayerTree& layer_tree,
+    float device_pixel_ratio,
+    std::optional<fml::TimePoint> presentation_time) {
+  FML_DCHECK(surface_);
+
+  DlCanvas* embedder_root_canvas = nullptr;
+  if (external_view_embedder_) {
+    external_view_embedder_->PrepareFlutterView(layer_tree.frame_size(),
+                                                device_pixel_ratio);
+    // TODO(dkwingsmt): Add view ID here.
     embedder_root_canvas = external_view_embedder_->GetRootCanvas();
   }
 
@@ -513,7 +679,7 @@ RasterStatus Rasterizer::DrawToSurfaceUnsafe(
   // frame after calling `BeginFrame` as this operation resets the GL context.
   auto frame = surface_->AcquireFrame(layer_tree.frame_size());
   if (frame == nullptr) {
-    return RasterStatus::kFailed;
+    return DrawSurfaceStatus::kFailed;
   }
 
   // If the external view embedder has specified an optional root surface, the
@@ -523,8 +689,7 @@ RasterStatus Rasterizer::DrawToSurfaceUnsafe(
       embedder_root_canvas ? SkMatrix{} : surface_->GetRootTransformation();
 
   auto root_surface_canvas =
-      embedder_root_canvas ? embedder_root_canvas : frame->SkiaCanvas();
-
+      embedder_root_canvas ? embedder_root_canvas : frame->Canvas();
   auto compositor_frame = compositor_context_->AcquireFrame(
       surface_->GetContext(),         // skia GrContext
       root_surface_canvas,            // root surface canvas
@@ -532,21 +697,19 @@ RasterStatus Rasterizer::DrawToSurfaceUnsafe(
       root_surface_transformation,    // root surface transformation
       true,                           // instrumentation enabled
       frame->framebuffer_info()
-          .supports_readback,                // surface supports pixel reads
-      raster_thread_merger_,                 // thread merger
-      frame->GetDisplayListBuilder().get(),  // display list builder
-      surface_->GetAiksContext()             // aiks context
+          .supports_readback,           // surface supports pixel reads
+      raster_thread_merger_,            // thread merger
+      surface_->GetAiksContext().get()  // aiks context
   );
   if (compositor_frame) {
     compositor_context_->raster_cache().BeginFrame();
-    frame_timings_recorder.RecordRasterStart(fml::TimePoint::Now());
 
     std::unique_ptr<FrameDamage> damage;
     // when leaf layer tracing is enabled we wish to repaint the whole frame
     // for accurate performance metrics.
     if (frame->framebuffer_info().supports_partial_repaint &&
         !layer_tree.is_leaf_layer_tracing_enabled()) {
-      // Disable partial repaint if external_view_embedder_ SubmitFrame is
+      // Disable partial repaint if external_view_embedder_ SubmitFlutterView is
       // involved - ExternalViewEmbedder unconditionally clears the entire
       // surface and also partial repaint with platform view present is
       // something that still need to be figured out.
@@ -555,9 +718,10 @@ RasterStatus Rasterizer::DrawToSurfaceUnsafe(
           (!raster_thread_merger_ || raster_thread_merger_->IsMerged());
 
       damage = std::make_unique<FrameDamage>();
-      if (frame->framebuffer_info().existing_damage && !force_full_repaint) {
-        damage->SetPreviousLayerTree(last_layer_tree_.get());
-        damage->AddAdditionalDamage(*frame->framebuffer_info().existing_damage);
+      auto existing_damage = frame->framebuffer_info().existing_damage;
+      if (existing_damage.has_value() && !force_full_repaint) {
+        damage->SetPreviousLayerTree(GetLastLayerTree(view_id));
+        damage->AddAdditionalDamage(existing_damage.value());
         damage->SetClipAlignment(
             frame->framebuffer_info().horizontal_clip_alignment,
             frame->framebuffer_info().vertical_clip_alignment);
@@ -570,25 +734,17 @@ RasterStatus Rasterizer::DrawToSurfaceUnsafe(
       ignore_raster_cache = false;
     }
 
-    RasterStatus raster_status =
+    RasterStatus frame_status =
         compositor_frame->Raster(layer_tree,           // layer tree
                                  ignore_raster_cache,  // ignore raster cache
                                  damage.get()          // frame damage
         );
-    if (raster_status == RasterStatus::kFailed ||
-        raster_status == RasterStatus::kSkipAndRetry) {
-      return raster_status;
+    if (frame_status == RasterStatus::kSkipAndRetry) {
+      return DrawSurfaceStatus::kRetry;
     }
 
     SurfaceFrame::SubmitInfo submit_info;
-    // TODO (https://github.com/flutter/flutter/issues/105596): this can be in
-    // the past and might need to get snapped to future as this frame could
-    // have been resubmitted. `presentation_time` on `submit_info` is not set
-    // in this case.
-    const auto presentation_time = frame_timings_recorder.GetVsyncTargetTime();
-    if (presentation_time > fml::TimePoint::Now()) {
-      submit_info.presentation_time = presentation_time;
-    }
+    submit_info.presentation_time = presentation_time;
     if (damage) {
       submit_info.frame_damage = damage->GetFrameDamage();
       submit_info.buffer_damage = damage->GetBufferDamage();
@@ -599,28 +755,32 @@ RasterStatus Rasterizer::DrawToSurfaceUnsafe(
     if (external_view_embedder_ &&
         (!raster_thread_merger_ || raster_thread_merger_->IsMerged())) {
       FML_DCHECK(!frame->IsSubmitted());
-      external_view_embedder_->SubmitFrame(surface_->GetContext(),
-                                           std::move(frame));
+      external_view_embedder_->SubmitFlutterView(
+          view_id, surface_->GetContext(), surface_->GetAiksContext(),
+          std::move(frame));
     } else {
       frame->Submit();
     }
 
-    compositor_context_->raster_cache().EndFrame();
-
-    frame_timings_recorder.RecordRasterEnd(
-        &compositor_context_->raster_cache());
-
-    
-    FireNextFrameCallbackIfPresent();
-
-    if (surface_->GetContext()) {
-      surface_->GetContext()->performDeferredCleanup(kSkiaCleanupExpiration);
+    // Do not update raster cache metrics for kResubmit because that status
+    // indicates that the frame was not actually painted.
+    if (frame_status != RasterStatus::kResubmit) {
+      compositor_context_->raster_cache().EndFrame();
     }
 
-    return raster_status;
+    if (frame_status == RasterStatus::kResubmit) {
+      return DrawSurfaceStatus::kRetry;
+    } else {
+      FML_CHECK(frame_status == RasterStatus::kSuccess);
+      return DrawSurfaceStatus::kSuccess;
+    }
   }
 
-  return RasterStatus::kFailed;
+  return DrawSurfaceStatus::kFailed;
+}
+
+Rasterizer::ViewRecord& Rasterizer::EnsureViewRecord(int64_t view_id) {
+  return view_records_[view_id];
 }
 
 static sk_sp<SkData> ScreenshotLayerTreeAsPicture(
@@ -633,12 +793,13 @@ static sk_sp<SkData> ScreenshotLayerTreeAsPicture(
 
   SkMatrix root_surface_transformation;
   root_surface_transformation.reset();
+  DlSkCanvasAdapter canvas(recorder.getRecordingCanvas());
 
   // TODO(amirh): figure out how to take a screenshot with embedded UIView.
   // https://github.com/flutter/flutter/issues/23435
-  auto frame = compositor_context.AcquireFrame(
-      nullptr, recorder.getRecordingCanvas(), nullptr,
-      root_surface_transformation, false, true, nullptr, nullptr, nullptr);
+  auto frame = compositor_context.AcquireFrame(nullptr, &canvas, nullptr,
+                                               root_surface_transformation,
+                                               false, true, nullptr, nullptr);
   frame->Raster(*tree, true, nullptr);
 
 #if defined(OS_FUCHSIA)
@@ -648,16 +809,138 @@ static sk_sp<SkData> ScreenshotLayerTreeAsPicture(
 #else
   SkSerialProcs procs = {0};
   procs.fTypefaceProc = SerializeTypefaceWithData;
+  procs.fImageProc = [](SkImage* img, void*) -> sk_sp<SkData> {
+    return SkPngEncoder::Encode(nullptr, img, SkPngEncoder::Options{});
+  };
 #endif
 
   return recorder.finishRecordingAsPicture()->serialize(&procs);
 }
 
-sk_sp<SkData> Rasterizer::ScreenshotLayerTreeAsImage(
-    flutter::LayerTree* tree,
+static void RenderFrameForScreenshot(
     flutter::CompositorContext& compositor_context,
+    DlCanvas* canvas,
+    flutter::LayerTree* tree,
     GrDirectContext* surface_context,
+    const std::shared_ptr<impeller::AiksContext>& aiks_context) {
+  // There is no root surface transformation for the screenshot layer. Reset
+  // the matrix to identity.
+  SkMatrix root_surface_transformation;
+  root_surface_transformation.reset();
+
+  auto frame = compositor_context.AcquireFrame(
+      /*gr_context=*/surface_context,
+      /*canvas=*/canvas,
+      /*view_embedder=*/nullptr,
+      /*root_surface_transformation=*/root_surface_transformation,
+      /*instrumentation_enabled=*/false,
+      /*surface_supports_readback=*/true,
+      /*raster_thread_merger=*/nullptr,
+      /*aiks_context=*/aiks_context.get());
+  canvas->Clear(DlColor::kTransparent());
+  frame->Raster(*tree, true, nullptr);
+  canvas->Flush();
+}
+
+#if IMPELLER_SUPPORTS_RENDERING
+Rasterizer::ScreenshotFormat ToScreenshotFormat(impeller::PixelFormat format) {
+  switch (format) {
+    case impeller::PixelFormat::kUnknown:
+    case impeller::PixelFormat::kA8UNormInt:
+    case impeller::PixelFormat::kR8UNormInt:
+    case impeller::PixelFormat::kR8G8UNormInt:
+    case impeller::PixelFormat::kR8G8B8A8UNormIntSRGB:
+    case impeller::PixelFormat::kB8G8R8A8UNormIntSRGB:
+    case impeller::PixelFormat::kB10G10R10XRSRGB:
+    case impeller::PixelFormat::kS8UInt:
+    case impeller::PixelFormat::kD24UnormS8Uint:
+    case impeller::PixelFormat::kD32FloatS8UInt:
+    case impeller::PixelFormat::kR32G32B32A32Float:
+    case impeller::PixelFormat::kB10G10R10XR:
+    case impeller::PixelFormat::kB10G10R10A10XR:
+      FML_DCHECK(false);
+      return Rasterizer::ScreenshotFormat::kUnknown;
+    case impeller::PixelFormat::kR8G8B8A8UNormInt:
+      return Rasterizer::ScreenshotFormat::kR8G8B8A8UNormInt;
+    case impeller::PixelFormat::kB8G8R8A8UNormInt:
+      return Rasterizer::ScreenshotFormat::kB8G8R8A8UNormInt;
+    case impeller::PixelFormat::kR16G16B16A16Float:
+      return Rasterizer::ScreenshotFormat::kR16G16B16A16Float;
+  }
+}
+
+static std::pair<sk_sp<SkData>, Rasterizer::ScreenshotFormat>
+ScreenshotLayerTreeAsImageImpeller(
+    const std::shared_ptr<impeller::AiksContext>& aiks_context,
+    flutter::LayerTree* tree,
+    flutter::CompositorContext& compositor_context,
+    bool compressed) {
+  if (compressed) {
+    FML_LOG(ERROR) << "Compressed screenshots not supported for Impeller";
+    return {nullptr, Rasterizer::ScreenshotFormat::kUnknown};
+  }
+
+  DisplayListBuilder builder(SkRect::MakeSize(
+      SkSize::Make(tree->frame_size().fWidth, tree->frame_size().fHeight)));
+
+  RenderFrameForScreenshot(compositor_context, &builder, tree, nullptr,
+                           aiks_context);
+
+  impeller::DlDispatcher dispatcher;
+  builder.Build()->Dispatch(dispatcher);
+  const auto& picture = dispatcher.EndRecordingAsPicture();
+  const auto& image = picture.ToImage(
+      *aiks_context,
+      impeller::ISize(tree->frame_size().fWidth, tree->frame_size().fHeight));
+  const auto& texture = image->GetTexture();
+  impeller::DeviceBufferDescriptor buffer_desc;
+  buffer_desc.storage_mode = impeller::StorageMode::kHostVisible;
+  buffer_desc.size =
+      texture->GetTextureDescriptor().GetByteSizeOfBaseMipLevel();
+  auto impeller_context = aiks_context->GetContext();
+  auto buffer =
+      impeller_context->GetResourceAllocator()->CreateBuffer(buffer_desc);
+  auto command_buffer = impeller_context->CreateCommandBuffer();
+  command_buffer->SetLabel("BlitTextureToBuffer Command Buffer");
+  auto pass = command_buffer->CreateBlitPass();
+  pass->AddCopy(texture, buffer);
+  pass->EncodeCommands(impeller_context->GetResourceAllocator());
+  fml::AutoResetWaitableEvent latch;
+  sk_sp<SkData> sk_data;
+  auto completion = [buffer, &buffer_desc, &sk_data,
+                     &latch](impeller::CommandBuffer::Status status) {
+    fml::ScopedCleanupClosure cleanup([&latch]() { latch.Signal(); });
+    if (status != impeller::CommandBuffer::Status::kCompleted) {
+      FML_LOG(ERROR) << "Failed to complete blit pass.";
+      return;
+    }
+    sk_data = SkData::MakeWithCopy(buffer->OnGetContents(), buffer_desc.size);
+  };
+
+  if (!impeller_context->GetCommandQueue()
+           ->Submit({command_buffer}, completion)
+           .ok()) {
+    FML_LOG(ERROR) << "Failed to submit commands.";
+  }
+  latch.Wait();
+  return std::make_pair(
+      sk_data, ToScreenshotFormat(texture->GetTextureDescriptor().format));
+}
+#endif
+
+std::pair<sk_sp<SkData>, Rasterizer::ScreenshotFormat>
+Rasterizer::ScreenshotLayerTreeAsImage(
+    flutter::LayerTree* tree,
+    flutter::CompositorContext& compositor_context,
     bool compressed) {
+#if IMPELLER_SUPPORTS_RENDERING
+  if (delegate_.GetSettings().enable_impeller) {
+    return ScreenshotLayerTreeAsImageImpeller(GetAiksContext(), tree,
+                                              compositor_context, compressed);
+  }
+#endif  // IMPELLER_SUPPORTS_RENDERING
+
+  GrDirectContext* surface_context = GetGrContext();
   // Attempt to create a snapshot surface depending on whether we have access
   // to a valid GPU rendering context.
   std::unique_ptr<OffscreenSurface> snapshot_surface =
@@ -665,16 +948,11 @@ sk_sp<SkData> Rasterizer::ScreenshotLayerTreeAsImage(
 
   if (!snapshot_surface->IsValid()) {
     FML_LOG(ERROR) << "Screenshot: unable to create snapshot surface";
-    return nullptr;
+    return {nullptr, ScreenshotFormat::kUnknown};
   }
 
   // Draw the current layer tree into the snapshot surface.
-  auto* canvas = snapshot_surface->GetCanvas();
-
-  // There is no root surface transformation for the screenshot layer. Reset
-  // the matrix to identity.
-  SkMatrix root_surface_transformation;
-  root_surface_transformation.reset();
+  DlCanvas* canvas = snapshot_surface->GetCanvas();
 
   // snapshot_surface->makeImageSnapshot needs the GL context to be set if the
   // render context is GL. frame->Raster() pops the gl context in platforms
@@ -683,68 +961,79 @@ sk_sp<SkData> Rasterizer::ScreenshotLayerTreeAsImage(
   auto context_switch = surface_->MakeRenderContextCurrent();
   if (!context_switch->GetResult()) {
     FML_LOG(ERROR) << "Screenshot: unable to make image screenshot";
-    return nullptr;
+    return {nullptr, ScreenshotFormat::kUnknown};
   }
 
-  auto frame = compositor_context.AcquireFrame(
-      surface_context,              // skia context
-      canvas,                       // canvas
-      nullptr,                      // view embedder
-      root_surface_transformation,  // root surface transformation
-      false,                        // instrumentation enabled
-      true,                         // render buffer readback supported
-      nullptr,                      // thread merger
-      nullptr,                      // display list builder
-      nullptr                       // aiks context
-  );
-  canvas->clear(SK_ColorTRANSPARENT);
-  frame->Raster(*tree, true, nullptr);
-  canvas->flush();
+  RenderFrameForScreenshot(compositor_context, canvas, tree, surface_context,
+                           nullptr);
 
-  return snapshot_surface->GetRasterData(compressed);
+  return std::make_pair(snapshot_surface->GetRasterData(compressed),
+                        ScreenshotFormat::kUnknown);
 }
 
 Rasterizer::Screenshot Rasterizer::ScreenshotLastLayerTree(
     Rasterizer::ScreenshotType type,
     bool base64_encode) {
-  auto* layer_tree = GetLastLayerTree();
+  if (delegate_.GetSettings().enable_impeller &&
+      type == ScreenshotType::SkiaPicture) {
+    FML_DCHECK(false);
+    FML_LOG(ERROR) << "Last layer tree cannot be screenshotted as a "
+                      "SkiaPicture when using Impeller.";
+    return {};
+  }
+  // TODO(dkwingsmt): Support screenshotting all last layer trees
+  // when the shell protocol supports multi-views.
+  // https://github.com/flutter/flutter/issues/135534
+  // https://github.com/flutter/flutter/issues/135535
+  auto* layer_tree = GetLastLayerTree(kFlutterImplicitViewId);
   if (layer_tree == nullptr) {
     FML_LOG(ERROR) << "Last layer tree was null when screenshotting.";
     return {};
   }
 
-  sk_sp<SkData> data = nullptr;
-
-  GrDirectContext* surface_context =
-      surface_ ? surface_->GetContext() : nullptr;
+  std::pair<sk_sp<SkData>, ScreenshotFormat> data{nullptr,
+                                                  ScreenshotFormat::kUnknown};
+  std::string format;
 
   switch (type) {
     case ScreenshotType::SkiaPicture:
-      data = ScreenshotLayerTreeAsPicture(layer_tree, *compositor_context_);
+      format = "ScreenshotType::SkiaPicture";
+      data.first =
+          ScreenshotLayerTreeAsPicture(layer_tree, *compositor_context_);
       break;
     case ScreenshotType::UncompressedImage:
-      data = ScreenshotLayerTreeAsImage(layer_tree, *compositor_context_,
-                                        surface_context, false);
+      format = "ScreenshotType::UncompressedImage";
+      data =
+          ScreenshotLayerTreeAsImage(layer_tree, *compositor_context_, false);
       break;
     case ScreenshotType::CompressedImage:
-      data = ScreenshotLayerTreeAsImage(layer_tree, *compositor_context_,
-                                        surface_context, true);
+      format = "ScreenshotType::CompressedImage";
+      data = ScreenshotLayerTreeAsImage(layer_tree, *compositor_context_, true);
+      break;
+    case ScreenshotType::SurfaceData: {
+      Surface::SurfaceData surface_data = surface_->GetSurfaceData();
+      format = surface_data.pixel_format;
+      data.first = surface_data.data;
       break;
+    }
   }
 
-  if (data == nullptr) {
+  if (data.first == nullptr) {
     FML_LOG(ERROR) << "Screenshot data was null.";
     return {};
   }
 
   if (base64_encode) {
-    size_t b64_size = SkBase64::Encode(data->data(), data->size(), nullptr);
+    size_t b64_size = Base64::EncodedSize(data.first->size());
     auto b64_data = SkData::MakeUninitialized(b64_size);
-    SkBase64::Encode(data->data(), data->size(), b64_data->writable_data());
-    return Rasterizer::Screenshot{b64_data, layer_tree->frame_size()};
+    Base64::Encode(data.first->data(), data.first->size(),
+                   b64_data->writable_data());
+    return Rasterizer::Screenshot{b64_data, layer_tree->frame_size(), format,
+                                  data.second};
   }
 
-  return Rasterizer::Screenshot{data, layer_tree->frame_size()};
+  return Rasterizer::Screenshot{data.first, layer_tree->frame_size(), format,
+                                data.second};
 }
 
 void Rasterizer::SetNextFrameCallback(const fml::closure& callback) {
@@ -813,8 +1102,14 @@ std::optional<size_t> Rasterizer::GetResourceCacheMaxBytes() const {
 
 Rasterizer::Screenshot::Screenshot() {}
 
-Rasterizer::Screenshot::Screenshot(sk_sp<SkData> p_data, SkISize p_size)
-    : data(std::move(p_data)), frame_size(p_size) {}
+Rasterizer::Screenshot::Screenshot(sk_sp<SkData> p_data,
+                                   SkISize p_size,
+                                   const std::string& p_format,
+                                   ScreenshotFormat p_pixel_format)
+    : data(std::move(p_data)),
+      frame_size(p_size),
+      format(p_format),
+      pixel_format(p_pixel_format) {}
 
 Rasterizer::Screenshot::Screenshot(const Screenshot& other) = default;
 
diff --git a/shell/common/rasterizer.h b/shell/common/rasterizer.h
index 32ff4de421a0e16b41bbdca27a511a8ae4bf9a3b..04620957ed38381bc8cd7777c6e22670f2d8955d 100644
--- a/shell/common/rasterizer.h
+++ b/shell/common/rasterizer.h
@@ -2,15 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_COMMON_RASTERIZER_H_
-#define SHELL_COMMON_RASTERIZER_H_
+#ifndef FLUTTER_SHELL_COMMON_RASTERIZER_H_
+#define FLUTTER_SHELL_COMMON_RASTERIZER_H_
 
 #include <memory>
 #include <optional>
+#include <unordered_map>
 
 #include "flutter/common/settings.h"
 #include "flutter/common/task_runners.h"
-#include "flutter/display_list/display_list_image.h"
+#include "flutter/display_list/image/dl_image.h"
 #include "flutter/flow/compositor_context.h"
 #include "flutter/flow/embedded_views.h"
 #include "flutter/flow/frame_timings.h"
@@ -23,15 +24,79 @@
 #include "flutter/fml/synchronization/waitable_event.h"
 #include "flutter/fml/time/time_delta.h"
 #include "flutter/fml/time/time_point.h"
+#if IMPELLER_SUPPORTS_RENDERING
+#include "impeller/aiks/aiks_context.h"  // nogncheck
+#include "impeller/core/formats.h"       // nogncheck
+#include "impeller/renderer/context.h"   // nogncheck
+#include "impeller/typographer/backends/skia/typographer_context_skia.h"  // nogncheck
+#endif  // IMPELLER_SUPPORTS_RENDERING
 #include "flutter/lib/ui/snapshot_delegate.h"
 #include "flutter/shell/common/pipeline.h"
 #include "flutter/shell/common/snapshot_controller.h"
 #include "flutter/shell/common/snapshot_surface_producer.h"
+#include "third_party/skia/include/core/SkData.h"
 #include "third_party/skia/include/core/SkImage.h"
+#include "third_party/skia/include/core/SkRect.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
 
+#if !IMPELLER_SUPPORTS_RENDERING
+namespace impeller {
+class Context;
+class AiksContext;
+}  // namespace impeller
+#endif  // !IMPELLER_SUPPORTS_RENDERING
+
 namespace flutter {
 
+// The result status of Rasterizer::Draw. This is only used for unit tests.
+enum class DrawStatus {
+  // The drawing was done without any specified status.
+  kDone,
+  // Failed to rasterize the frame because the Rasterizer is not set up.
+  kNotSetUp,
+  // Nothing was done, because the call was not on the raster thread. Yielded to
+  // let this frame be serviced on the right thread.
+  kYielded,
+  // Nothing was done, because the pipeline was empty.
+  kPipelineEmpty,
+  // Nothing was done, because the GPU was unavailable.
+  kGpuUnavailable,
+};
+
+// The result status of drawing to a view. This is only used for unit tests.
+enum class DrawSurfaceStatus {
+  // The layer tree was successfully rasterized.
+  kSuccess,
+  // The layer tree must be submitted again.
+  //
+  // This can occur on Android when switching the background surface to
+  // FlutterImageView.  On Android, the first frame doesn't make the image
+  // available to the ImageReader right away. The second frame does.
+  // TODO(egarciad): https://github.com/flutter/flutter/issues/65652
+  //
+  // This can also occur when the frame is dropped to wait for the thread
+  // merger to merge the raster and platform threads.
+  kRetry,
+  // Failed to rasterize the frame.
+  kFailed,
+  // Layer tree was discarded because its size does not match the view size.
+  // This typically occurs during resizing.
+  kDiscarded,
+};
+
+// The information to draw to all views of a frame.
+struct FrameItem {
+  FrameItem(std::vector<std::unique_ptr<LayerTreeTask>> tasks,
+            std::unique_ptr<FrameTimingsRecorder> frame_timings_recorder)
+      : layer_tree_tasks(std::move(tasks)),
+        frame_timings_recorder(std::move(frame_timings_recorder)) {}
+  std::vector<std::unique_ptr<LayerTreeTask>> layer_tree_tasks;
+  std::unique_ptr<FrameTimingsRecorder> frame_timings_recorder;
+};
+
+using FramePipeline = Pipeline<FrameItem>;
+
 //------------------------------------------------------------------------------
 /// The rasterizer is a component owned by the shell that resides on the raster
 /// task runner. Each shell owns exactly one instance of a rasterizer. The
@@ -103,6 +168,9 @@ class Rasterizer final : public SnapshotDelegate,
         const = 0;
 
     virtual const Settings& GetSettings() const = 0;
+
+    virtual bool ShouldDiscardLayerTree(int64_t view_id,
+                                        const flutter::LayerTree& tree) = 0;
   };
 
   //----------------------------------------------------------------------------
@@ -137,6 +205,8 @@ class Rasterizer final : public SnapshotDelegate,
   ///
   ~Rasterizer();
 
+  void SetImpellerContext(std::weak_ptr<impeller::Context> impeller_context);
+
   //----------------------------------------------------------------------------
   /// @brief      Rasterizers may be created well before an on-screen surface is
   ///             available for rendering. Shells usually create a rasterizer in
@@ -159,6 +229,7 @@ class Rasterizer final : public SnapshotDelegate,
   ///             collects associated resources. No more rendering may occur
   ///             till the next call to `Rasterizer::Setup` with a new render
   ///             surface. Calling a teardown without a setup is user error.
+  ///             Calling this method multiple times is safe.
   ///
   void Teardown();
 
@@ -188,34 +259,48 @@ class Rasterizer final : public SnapshotDelegate,
   fml::TaskRunnerAffineWeakPtr<SnapshotDelegate> GetSnapshotDelegate() const;
 
   //----------------------------------------------------------------------------
-  /// @brief      Sometimes, it may be necessary to render the same frame again
-  ///             without having to wait for the framework to build a whole new
-  ///             layer tree describing the same contents. One such case is when
-  ///             external textures (video or camera streams for example) are
-  ///             updated in an otherwise static layer tree. To support this use
-  ///             case, the rasterizer holds onto the last rendered layer tree.
+  /// @brief      Deallocate the resources for displaying a view.
+  ///
+  ///             This method must be called when a view is removed.
+  ///
+  ///             The rasterizer don't need views to be registered. Last-frame
+  ///             states for views are recorded when layer trees are rasterized
+  ///             to the view and used during `Rasterizer::DrawLastLayerTrees`.
+  ///
+  /// @param[in]  view_id  The ID of the view.
+  ///
+  void CollectView(int64_t view_id);
+
+  //----------------------------------------------------------------------------
+  /// @brief      Returns the last successfully drawn layer tree for the given
+  ///             view, or nullptr if there isn't any. This is useful during
+  ///             `DrawLastLayerTrees` and computing frame damage.
   ///
   /// @bug        https://github.com/flutter/flutter/issues/33939
   ///
   /// @return     A pointer to the last layer or `nullptr` if this rasterizer
-  ///             has never rendered a frame.
+  ///             has never rendered a frame to the given view.
   ///
-  flutter::LayerTree* GetLastLayerTree();
+  flutter::LayerTree* GetLastLayerTree(int64_t view_id);
 
   //----------------------------------------------------------------------------
-  /// @brief      Draws a last layer tree to the render surface. This may seem
-  ///             entirely redundant at first glance. After all, on surface loss
-  ///             and re-acquisition, the framework generates a new layer tree.
-  ///             Otherwise, why render the same contents to the screen again?
-  ///             This is used as an optimization in cases where there are
-  ///             external textures (video or camera streams for example) in
-  ///             referenced in the layer tree. These textures may be updated at
-  ///             a cadence different from that of the Flutter application.
-  ///             Flutter can re-render the layer tree with just the updated
-  ///             textures instead of waiting for the framework to do the work
-  ///             to generate the layer tree describing the same contents.
-  ///
-  void DrawLastLayerTree(
+  /// @brief      Draws the last layer trees with their last configuration. This
+  ///             may seem entirely redundant at first glance. After all, on
+  ///             surface loss and re-acquisition, the framework generates a new
+  ///             layer tree. Otherwise, why render the same contents to the
+  ///             screen again? This is used as an optimization in cases where
+  ///             there are external textures (video or camera streams for
+  ///             example) in referenced in the layer tree. These textures may
+  ///             be updated at a cadence different from that of the Flutter
+  ///             application. Flutter can re-render the layer tree with just
+  ///             the updated textures instead of waiting for the framework to
+  ///             do the work to generate the layer tree describing the same
+  ///             contents.
+  ///
+  ///             Calling this method clears all last layer trees
+  ///             (GetLastLayerTree).
+  ///
+  void DrawLastLayerTrees(
       std::unique_ptr<FrameTimingsRecorder> frame_timings_recorder);
 
   // |SnapshotDelegate|
@@ -223,8 +308,6 @@ class Rasterizer final : public SnapshotDelegate,
 
   std::shared_ptr<flutter::TextureRegistry> GetTextureRegistry() override;
 
-  using LayerTreeDiscardCallback = std::function<bool(flutter::LayerTree&)>;
-
   //----------------------------------------------------------------------------
   /// @brief      Takes the next item from the layer tree pipeline and executes
   ///             the raster thread frame workload for that pipeline item to
@@ -253,17 +336,15 @@ class Rasterizer final : public SnapshotDelegate,
   ///
   /// @param[in]  pipeline  The layer tree pipeline to take the next layer tree
   ///                       to render from.
-  /// @param[in]  discard_callback if specified and returns true, the layer tree
-  ///                             is discarded instead of being rendered
   ///
-  RasterStatus Draw(const std::shared_ptr<LayerTreePipeline>& pipeline,
-                    LayerTreeDiscardCallback discard_callback = NoDiscard);
+  DrawStatus Draw(const std::shared_ptr<FramePipeline>& pipeline);
 
   //----------------------------------------------------------------------------
   /// @brief      The type of the screenshot to obtain of the previously
   ///             rendered layer tree.
   ///
   enum class ScreenshotType {
+    // NOLINTBEGIN(readability-identifier-naming)
     //--------------------------------------------------------------------------
     /// A format used to denote a Skia picture. A Skia picture is a serialized
     /// representation of an `SkPicture` that can be used to introspect the
@@ -276,9 +357,10 @@ class Rasterizer final : public SnapshotDelegate,
     SkiaPicture,
 
     //--------------------------------------------------------------------------
-    /// A format used to denote uncompressed image data. This format
+    /// A format used to denote uncompressed image data. For Skia, this format
     /// is 32 bits per pixel, 8 bits per component and
-    /// denoted by the `kN32_SkColorType ` Skia color type.
+    /// denoted by the `kN32_SkColorType ` Skia color type. For Impeller, its
+    /// format is specified in Screenshot::pixel_format.
     ///
     UncompressedImage,
 
@@ -287,6 +369,25 @@ class Rasterizer final : public SnapshotDelegate,
     /// container is used.
     ///
     CompressedImage,
+
+    //--------------------------------------------------------------------------
+    /// Reads the data directly from the Rasterizer's surface. The pixel format
+    /// is determined from the surface. This is the only way to read wide gamut
+    /// color data, but isn't supported everywhere.
+    SurfaceData,
+    // NOLINTEND(readability-identifier-naming)
+  };
+
+  // Specifies the format of pixel data in a Screenshot.
+  enum class ScreenshotFormat {
+    // Unknown format, or Skia default.
+    kUnknown,
+    // RGBA 8 bits per channel.
+    kR8G8B8A8UNormInt,
+    // BGRA 8 bits per channel.
+    kB8G8R8A8UNormInt,
+    // RGBA 16 bit floating point per channel.
+    kR16G16B16A16Float,
   };
 
   //----------------------------------------------------------------------------
@@ -307,6 +408,18 @@ class Rasterizer final : public SnapshotDelegate,
     ///
     SkISize frame_size = SkISize::MakeEmpty();
 
+    //--------------------------------------------------------------------------
+    /// Characterization of the format of the data in `data`.
+    ///
+    std::string format;
+
+    //--------------------------------------------------------------------------
+    /// The pixel format of the data in `data`.
+    ///
+    /// If the impeller backend is not used, this value is always kUnknown and
+    /// the data is in RGBA8888 format.
+    ScreenshotFormat pixel_format = ScreenshotFormat::kUnknown;
+
     //--------------------------------------------------------------------------
     /// @brief      Creates an empty screenshot
     ///
@@ -317,8 +430,13 @@ class Rasterizer final : public SnapshotDelegate,
     ///
     /// @param[in]  p_data  The screenshot data
     /// @param[in]  p_size  The screenshot size.
+    /// @param[in]  p_format  The screenshot format.
+    /// @param[in]  p_pixel_format  The screenshot format.
     ///
-    Screenshot(sk_sp<SkData> p_data, SkISize p_size);
+    Screenshot(sk_sp<SkData> p_data,
+               SkISize p_size,
+               const std::string& p_format,
+               ScreenshotFormat p_pixel_format);
 
     //--------------------------------------------------------------------------
     /// @brief      The copy constructor for a screenshot.
@@ -468,7 +586,56 @@ class Rasterizer final : public SnapshotDelegate,
   ///
   void DisableThreadMergerIfNeeded();
 
+  //----------------------------------------------------------------------------
+  /// @brief      Returns whether TearDown has been called.
+  ///
+  ///             This method is used only in unit tests.
+  ///
+  bool IsTornDown();
+
+  //----------------------------------------------------------------------------
+  /// @brief      Returns the last status of drawing the specific view.
+  ///
+  ///             This method is used only in unit tests.
+  ///
+  std::optional<DrawSurfaceStatus> GetLastDrawStatus(int64_t view_id);
+
  private:
+  // The result status of DoDraw, DrawToSurfaces, and DrawToSurfacesUnsafe.
+  enum class DoDrawStatus {
+    // The drawing was done without any specified status.
+    kDone,
+    // Frame has been successfully rasterized, but there are additional items
+    // in the pipeline waiting to be consumed. This is currently only used when
+    // thread configuration change occurs.
+    kEnqueuePipeline,
+    // Failed to rasterize the frame because the Rasterizer is not set up.
+    kNotSetUp,
+    // Nothing was done, because GPU was unavailable.
+    kGpuUnavailable,
+  };
+
+  // The result of DoDraw.
+  struct DoDrawResult {
+    // The overall status of the drawing process.
+    //
+    // The status of drawing a specific view is available at GetLastDrawStatus.
+    DoDrawStatus status = DoDrawStatus::kDone;
+
+    // The frame item that needs to be submitted again.
+    //
+    // See RasterStatus::kResubmit and kSkipAndRetry for when it happens.
+    //
+    // If `resubmitted_item` is not null, its `tasks` is guaranteed to be
+    // non-empty.
+    std::unique_ptr<FrameItem> resubmitted_item;
+  };
+
+  struct ViewRecord {
+    std::unique_ptr<LayerTreeTask> last_successful_task;
+    std::optional<DrawSurfaceStatus> last_draw_status;
+  };
+
   // |SnapshotDelegate|
   std::unique_ptr<GpuImageResult> MakeSkiaGpuImage(
       sk_sp<DisplayList> display_list,
@@ -492,6 +659,20 @@ class Rasterizer final : public SnapshotDelegate,
     return surface_;
   }
 
+  // |SnapshotController::Delegate|
+  std::shared_ptr<impeller::AiksContext> GetAiksContext() const override {
+#if IMPELLER_SUPPORTS_RENDERING
+    if (surface_) {
+      return surface_->GetAiksContext();
+    }
+    if (auto context = impeller_context_.lock()) {
+      return std::make_shared<impeller::AiksContext>(
+          context, impeller::TypographerContextSkia::Make());
+    }
+#endif
+    return nullptr;
+  }
+
   // |SnapshotController::Delegate|
   const std::unique_ptr<SnapshotSurfaceProducer>& GetSnapshotSurfaceProducer()
       const override {
@@ -504,41 +685,65 @@ class Rasterizer final : public SnapshotDelegate,
     return delegate_.GetIsGpuDisabledSyncSwitch();
   }
 
-  sk_sp<SkData> ScreenshotLayerTreeAsImage(
+  std::pair<sk_sp<SkData>, ScreenshotFormat> ScreenshotLayerTreeAsImage(
       flutter::LayerTree* tree,
       flutter::CompositorContext& compositor_context,
-      GrDirectContext* surface_context,
       bool compressed);
 
-  RasterStatus DoDraw(
+  // This method starts with the frame timing recorder at build end. This
+  // method might push it to raster end and get the recorded time, or abort in
+  // the middle and not get the recorded time.
+  DoDrawResult DoDraw(
       std::unique_ptr<FrameTimingsRecorder> frame_timings_recorder,
-      std::shared_ptr<flutter::LayerTree> layer_tree);
-
-  RasterStatus DrawToSurface(FrameTimingsRecorder& frame_timings_recorder,
-                             flutter::LayerTree& layer_tree);
-
-  RasterStatus DrawToSurfaceUnsafe(FrameTimingsRecorder& frame_timings_recorder,
-                                   flutter::LayerTree& layer_tree);
+      std::vector<std::unique_ptr<LayerTreeTask>> tasks);
+
+  // This method pushes the frame timing recorder from build end to raster end.
+  DoDrawResult DrawToSurfaces(
+      FrameTimingsRecorder& frame_timings_recorder,
+      std::vector<std::unique_ptr<LayerTreeTask>> tasks);
+
+  // Draws the specified layer trees to views, assuming we have access to the
+  // GPU.
+  //
+  // If any layer trees need resubmitting, this method returns the frame item to
+  // be resubmitted. Otherwise, it returns nullptr.
+  //
+  // Unsafe because it assumes we have access to the GPU which isn't the case
+  // when iOS is backgrounded, for example.
+  //
+  // This method pushes the frame timing recorder from build end to raster end.
+  std::unique_ptr<FrameItem> DrawToSurfacesUnsafe(
+      FrameTimingsRecorder& frame_timings_recorder,
+      std::vector<std::unique_ptr<LayerTreeTask>> tasks);
+
+  // Draws the layer tree to the specified view, assuming we have access to the
+  // GPU.
+  //
+  // This method is not affiliated with the frame timing recorder, but must be
+  // included between the RasterStart and RasterEnd.
+  DrawSurfaceStatus DrawToSurfaceUnsafe(
+      int64_t view_id,
+      flutter::LayerTree& layer_tree,
+      float device_pixel_ratio,
+      std::optional<fml::TimePoint> presentation_time);
+
+  ViewRecord& EnsureViewRecord(int64_t view_id);
 
   void FireNextFrameCallbackIfPresent();
 
-  static bool NoDiscard(const flutter::LayerTree& layer_tree) { return false; }
-  static bool ShouldResubmitFrame(const RasterStatus& raster_status);
+  static bool ShouldResubmitFrame(const DoDrawResult& result);
+  static DrawStatus ToDrawStatus(DoDrawStatus status);
 
+  bool is_torn_down_ = false;
   Delegate& delegate_;
   MakeGpuImageBehavior gpu_image_behavior_;
+  std::weak_ptr<impeller::Context> impeller_context_;
   std::unique_ptr<Surface> surface_;
   std::unique_ptr<SnapshotSurfaceProducer> snapshot_surface_producer_;
   std::unique_ptr<flutter::CompositorContext> compositor_context_;
-  // This is the last successfully rasterized layer tree.
-  std::shared_ptr<flutter::LayerTree> last_layer_tree_;
-  // Set when we need attempt to rasterize the layer tree again. This layer_tree
-  // has not successfully rasterized. This can happen due to the change in the
-  // thread configuration. This will be inserted to the front of the pipeline.
-  std::shared_ptr<flutter::LayerTree> resubmitted_layer_tree_;
-  std::unique_ptr<FrameTimingsRecorder> resubmitted_recorder_;
+  std::unordered_map<int64_t, ViewRecord> view_records_;
   fml::closure next_frame_callback_;
-  bool user_override_resource_cache_bytes_;
+  bool user_override_resource_cache_bytes_ = false;
   std::optional<size_t> max_cache_bytes_;
   fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger_;
   std::shared_ptr<ExternalViewEmbedder> external_view_embedder_;
@@ -551,4 +756,4 @@ class Rasterizer final : public SnapshotDelegate,
 
 }  // namespace flutter
 
-#endif  // SHELL_COMMON_RASTERIZER_H_
+#endif  // FLUTTER_SHELL_COMMON_RASTERIZER_H_
diff --git a/shell/common/rasterizer_unittests.cc b/shell/common/rasterizer_unittests.cc
index a6f7ab7159e5d1ee4dedd453eb2b8556f89be40f..a43d92551971a1afa8147bbdb405822cbb664d19 100644
--- a/shell/common/rasterizer_unittests.cc
+++ b/shell/common/rasterizer_unittests.cc
@@ -15,6 +15,11 @@
 #include "flutter/shell/common/thread_host.h"
 #include "flutter/testing/testing.h"
 
+#include "third_party/skia/include/core/SkColorSpace.h"
+#include "third_party/skia/include/core/SkSurface.h"
+#include "third_party/skia/include/gpu/GrTypes.h"
+#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
+
 #include "gmock/gmock.h"
 
 using testing::_;
@@ -25,57 +30,99 @@ using testing::ReturnRef;
 
 namespace flutter {
 namespace {
+
+constexpr float kDevicePixelRatio = 2.0f;
+constexpr int64_t kImplicitViewId = 0;
+
+std::vector<std::unique_ptr<LayerTreeTask>> SingleLayerTreeList(
+    int64_t view_id,
+    std::unique_ptr<LayerTree> layer_tree,
+    float pixel_ratio) {
+  std::vector<std::unique_ptr<LayerTreeTask>> tasks;
+  tasks.push_back(std::make_unique<LayerTreeTask>(
+      view_id, std::move(layer_tree), pixel_ratio));
+  return tasks;
+}
+
 class MockDelegate : public Rasterizer::Delegate {
  public:
-  MOCK_METHOD1(OnFrameRasterized, void(const FrameTiming& frame_timing));
-  MOCK_METHOD0(GetFrameBudget, fml::Milliseconds());
-  MOCK_CONST_METHOD0(GetLatestFrameTargetTime, fml::TimePoint());
-  MOCK_CONST_METHOD0(GetTaskRunners, const TaskRunners&());
-  MOCK_CONST_METHOD0(GetParentRasterThreadMerger,
-                     const fml::RefPtr<fml::RasterThreadMerger>());
-  MOCK_CONST_METHOD0(GetIsGpuDisabledSyncSwitch,
-                     std::shared_ptr<const fml::SyncSwitch>());
-  MOCK_METHOD0(CreateSnapshotSurface, std::unique_ptr<Surface>());
-  MOCK_CONST_METHOD0(GetSettings, const Settings&());
+  MOCK_METHOD(void,
+              OnFrameRasterized,
+              (const FrameTiming& frame_timing),
+              (override));
+  MOCK_METHOD(fml::Milliseconds, GetFrameBudget, (), (override));
+  MOCK_METHOD(fml::TimePoint, GetLatestFrameTargetTime, (), (const, override));
+  MOCK_METHOD(const TaskRunners&, GetTaskRunners, (), (const, override));
+  MOCK_METHOD(const fml::RefPtr<fml::RasterThreadMerger>,
+              GetParentRasterThreadMerger,
+              (),
+              (const, override));
+  MOCK_METHOD(std::shared_ptr<const fml::SyncSwitch>,
+              GetIsGpuDisabledSyncSwitch,
+              (),
+              (const, override));
+  MOCK_METHOD(const Settings&, GetSettings, (), (const, override));
+  MOCK_METHOD(bool,
+              ShouldDiscardLayerTree,
+              (int64_t, const flutter::LayerTree&),
+              (override));
 };
 
 class MockSurface : public Surface {
  public:
-  MOCK_METHOD0(IsValid, bool());
-  MOCK_METHOD1(AcquireFrame,
-               std::unique_ptr<SurfaceFrame>(const SkISize& size));
-  MOCK_CONST_METHOD0(GetRootTransformation, SkMatrix());
-  MOCK_METHOD0(GetContext, GrDirectContext*());
-  MOCK_METHOD0(GetExternalViewEmbedder, ExternalViewEmbedder*());
-  MOCK_METHOD0(MakeRenderContextCurrent, std::unique_ptr<GLContextResult>());
-  MOCK_METHOD0(ClearRenderContext, bool());
-  MOCK_CONST_METHOD0(AllowsDrawingWhenGpuDisabled, bool());
+  MOCK_METHOD(bool, IsValid, (), (override));
+  MOCK_METHOD(std::unique_ptr<SurfaceFrame>,
+              AcquireFrame,
+              (const SkISize& size),
+              (override));
+  MOCK_METHOD(SkMatrix, GetRootTransformation, (), (const, override));
+  MOCK_METHOD(GrDirectContext*, GetContext, (), (override));
+  MOCK_METHOD(std::unique_ptr<GLContextResult>,
+              MakeRenderContextCurrent,
+              (),
+              (override));
+  MOCK_METHOD(bool, ClearRenderContext, (), (override));
+  MOCK_METHOD(bool, AllowsDrawingWhenGpuDisabled, (), (const, override));
 };
 
 class MockExternalViewEmbedder : public ExternalViewEmbedder {
  public:
-  MOCK_METHOD0(GetRootCanvas, SkCanvas*());
-  MOCK_METHOD0(CancelFrame, void());
-  MOCK_METHOD4(BeginFrame,
-               void(SkISize frame_size,
-                    GrDirectContext* context,
-                    double device_pixel_ratio,
-                    fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger));
-  MOCK_METHOD2(PrerollCompositeEmbeddedView,
-               void(int view_id, std::unique_ptr<EmbeddedViewParams> params));
-  MOCK_METHOD1(PostPrerollAction,
-               PostPrerollResult(
-                   fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger));
-  MOCK_METHOD0(GetCurrentCanvases, std::vector<SkCanvas*>());
-  MOCK_METHOD0(GetCurrentBuilders, std::vector<DisplayListBuilder*>());
-  MOCK_METHOD1(CompositeEmbeddedView, EmbedderPaintContext(int view_id));
-  MOCK_METHOD2(SubmitFrame,
-               void(GrDirectContext* context,
-                    std::unique_ptr<SurfaceFrame> frame));
-  MOCK_METHOD2(EndFrame,
-               void(bool should_resubmit_frame,
-                    fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger));
-  MOCK_METHOD0(SupportsDynamicThreadMerging, bool());
+  MOCK_METHOD(DlCanvas*, GetRootCanvas, (), (override));
+  MOCK_METHOD(void, CancelFrame, (), (override));
+  MOCK_METHOD(
+      void,
+      BeginFrame,
+      (GrDirectContext * context,
+       const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger),
+      (override));
+  MOCK_METHOD(void,
+              PrepareFlutterView,
+              (SkISize frame_size, double device_pixel_ratio),
+              (override));
+  MOCK_METHOD(void,
+              PrerollCompositeEmbeddedView,
+              (int64_t view_id, std::unique_ptr<EmbeddedViewParams> params),
+              (override));
+  MOCK_METHOD(
+      PostPrerollResult,
+      PostPrerollAction,
+      (const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger),
+      (override));
+  MOCK_METHOD(DlCanvas*, CompositeEmbeddedView, (int64_t view_id), (override));
+  MOCK_METHOD(void,
+              SubmitFlutterView,
+              (int64_t flutter_view_id,
+               GrDirectContext* context,
+               const std::shared_ptr<impeller::AiksContext>& aiks_context,
+               std::unique_ptr<SurfaceFrame> frame),
+              (override));
+  MOCK_METHOD(
+      void,
+      EndFrame,
+      (bool should_resubmit_frame,
+       const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger),
+      (override));
+  MOCK_METHOD(bool, SupportsDynamicThreadMerging, (), (override));
 };
 }  // namespace
 
@@ -105,8 +152,9 @@ TEST(RasterizerTest, drawEmptyPipeline) {
   std::string test_name =
       ::testing::UnitTest::GetInstance()->current_test_info()->name();
   ThreadHost thread_host("io.flutter.test." + test_name + ".",
-                         ThreadHost::Type::Platform | ThreadHost::Type::RASTER |
-                             ThreadHost::Type::IO | ThreadHost::Type::UI);
+                         ThreadHost::Type::kPlatform |
+                             ThreadHost::Type::kRaster | ThreadHost::Type::kIo |
+                             ThreadHost::Type::kUi);
   TaskRunners task_runners("test", thread_host.platform_thread->GetTaskRunner(),
                            thread_host.raster_thread->GetTaskRunner(),
                            thread_host.ui_thread->GetTaskRunner(),
@@ -122,8 +170,9 @@ TEST(RasterizerTest, drawEmptyPipeline) {
   rasterizer->Setup(std::move(surface));
   fml::AutoResetWaitableEvent latch;
   thread_host.raster_thread->GetTaskRunner()->PostTask([&] {
-    auto pipeline = std::make_shared<LayerTreePipeline>(/*depth=*/10);
-    rasterizer->Draw(pipeline, nullptr);
+    auto pipeline = std::make_shared<FramePipeline>(/*depth=*/10);
+    ON_CALL(delegate, ShouldDiscardLayerTree).WillByDefault(Return(false));
+    rasterizer->Draw(pipeline);
     latch.Signal();
   });
   latch.Wait();
@@ -134,8 +183,9 @@ TEST(RasterizerTest,
   std::string test_name =
       ::testing::UnitTest::GetInstance()->current_test_info()->name();
   ThreadHost thread_host("io.flutter.test." + test_name + ".",
-                         ThreadHost::Type::Platform | ThreadHost::Type::RASTER |
-                             ThreadHost::Type::IO | ThreadHost::Type::UI);
+                         ThreadHost::Type::kPlatform |
+                             ThreadHost::Type::kRaster | ThreadHost::Type::kIo |
+                             ThreadHost::Type::kUi);
   TaskRunners task_runners("test", thread_host.platform_thread->GetTaskRunner(),
                            thread_host.raster_thread->GetTaskRunner(),
                            thread_host.ui_thread->GetTaskRunner(),
@@ -157,8 +207,9 @@ TEST(RasterizerTest,
   framebuffer_info.supports_readback = true;
 
   auto surface_frame = std::make_unique<SurfaceFrame>(
-      /*surface=*/nullptr, framebuffer_info,
-      /*submit_callback=*/[](const SurfaceFrame&, SkCanvas*) { return true; },
+      /*surface=*/
+      nullptr, framebuffer_info,
+      /*submit_callback=*/[](const SurfaceFrame&, DlCanvas*) { return true; },
       /*frame_size=*/SkISize::Make(800, 600));
   EXPECT_CALL(*surface, AllowsDrawingWhenGpuDisabled()).WillOnce(Return(true));
   EXPECT_CALL(*surface, AcquireFrame(SkISize()))
@@ -167,12 +218,17 @@ TEST(RasterizerTest,
       .WillOnce(Return(ByMove(std::make_unique<GLContextDefaultResult>(true))));
 
   EXPECT_CALL(*external_view_embedder,
-              BeginFrame(/*frame_size=*/SkISize(), /*context=*/nullptr,
-                         /*device_pixel_ratio=*/2.0,
+              BeginFrame(/*context=*/nullptr,
                          /*raster_thread_merger=*/
                          fml::RefPtr<fml::RasterThreadMerger>(nullptr)))
       .Times(1);
-  EXPECT_CALL(*external_view_embedder, SubmitFrame).Times(1);
+  EXPECT_CALL(*external_view_embedder, PrepareFlutterView(
+                                           /*frame_size=*/SkISize(),
+                                           /*device_pixel_ratio=*/2.0))
+      .Times(1);
+  EXPECT_CALL(*external_view_embedder,
+              SubmitFlutterView(/*flutter_view_id=*/kImplicitViewId, _, _, _))
+      .Times(1);
   EXPECT_CALL(
       *external_view_embedder,
       EndFrame(/*should_resubmit_frame=*/false,
@@ -183,16 +239,19 @@ TEST(RasterizerTest,
   rasterizer->Setup(std::move(surface));
   fml::AutoResetWaitableEvent latch;
   thread_host.raster_thread->GetTaskRunner()->PostTask([&] {
-    auto pipeline = std::make_shared<LayerTreePipeline>(/*depth=*/10);
-    auto layer_tree = std::make_shared<LayerTree>(/*frame_size=*/SkISize(),
-                                                  /*device_pixel_ratio=*/2.0f);
-    auto layer_tree_item = std::make_unique<LayerTreeItem>(
-        std::move(layer_tree), CreateFinishedBuildRecorder());
+    auto pipeline = std::make_shared<FramePipeline>(/*depth=*/10);
+    auto layer_tree =
+        std::make_unique<LayerTree>(/*config=*/LayerTree::Config(),
+                                    /*frame_size=*/SkISize());
+    auto layer_tree_item = std::make_unique<FrameItem>(
+        SingleLayerTreeList(kImplicitViewId, std::move(layer_tree),
+                            kDevicePixelRatio),
+        CreateFinishedBuildRecorder());
     PipelineProduceResult result =
         pipeline->Produce().Complete(std::move(layer_tree_item));
     EXPECT_TRUE(result.success);
-    auto no_discard = [](LayerTree&) { return false; };
-    rasterizer->Draw(pipeline, no_discard);
+    ON_CALL(delegate, ShouldDiscardLayerTree).WillByDefault(Return(false));
+    rasterizer->Draw(pipeline);
     latch.Signal();
   });
   latch.Wait();
@@ -204,8 +263,9 @@ TEST(
   std::string test_name =
       ::testing::UnitTest::GetInstance()->current_test_info()->name();
   ThreadHost thread_host("io.flutter.test." + test_name + ".",
-                         ThreadHost::Type::Platform | ThreadHost::Type::RASTER |
-                             ThreadHost::Type::IO | ThreadHost::Type::UI);
+                         ThreadHost::Type::kPlatform |
+                             ThreadHost::Type::kRaster | ThreadHost::Type::kIo |
+                             ThreadHost::Type::kUi);
   TaskRunners task_runners("test", thread_host.platform_thread->GetTaskRunner(),
                            thread_host.raster_thread->GetTaskRunner(),
                            thread_host.ui_thread->GetTaskRunner(),
@@ -226,8 +286,9 @@ TEST(
   SurfaceFrame::FramebufferInfo framebuffer_info;
   framebuffer_info.supports_readback = true;
   auto surface_frame = std::make_unique<SurfaceFrame>(
-      /*surface=*/nullptr, framebuffer_info,
-      /*submit_callback=*/[](const SurfaceFrame&, SkCanvas*) { return true; },
+      /*surface=*/
+      nullptr, framebuffer_info,
+      /*submit_callback=*/[](const SurfaceFrame&, DlCanvas*) { return true; },
       /*frame_size=*/SkISize::Make(800, 600));
   EXPECT_CALL(*surface, AllowsDrawingWhenGpuDisabled()).WillOnce(Return(true));
   EXPECT_CALL(*surface, AcquireFrame(SkISize()))
@@ -235,12 +296,16 @@ TEST(
   EXPECT_CALL(*surface, MakeRenderContextCurrent())
       .WillOnce(Return(ByMove(std::make_unique<GLContextDefaultResult>(true))));
 
-  EXPECT_CALL(*external_view_embedder,
-              BeginFrame(/*frame_size=*/SkISize(), /*context=*/nullptr,
-                         /*device_pixel_ratio=*/2.0,
-                         /*raster_thread_merger=*/_))
+  EXPECT_CALL(*external_view_embedder, BeginFrame(/*context=*/nullptr,
+                                                  /*raster_thread_merger=*/_))
+      .Times(1);
+  EXPECT_CALL(*external_view_embedder, PrepareFlutterView(
+                                           /*frame_size=*/SkISize(),
+                                           /*device_pixel_ratio=*/2.0))
       .Times(1);
-  EXPECT_CALL(*external_view_embedder, SubmitFrame).Times(0);
+  EXPECT_CALL(*external_view_embedder,
+              SubmitFlutterView(/*flutter_view_id=*/kImplicitViewId, _, _, _))
+      .Times(0);
   EXPECT_CALL(*external_view_embedder, EndFrame(/*should_resubmit_frame=*/false,
                                                 /*raster_thread_merger=*/_))
       .Times(1);
@@ -248,16 +313,18 @@ TEST(
   rasterizer->Setup(std::move(surface));
   fml::AutoResetWaitableEvent latch;
   thread_host.raster_thread->GetTaskRunner()->PostTask([&] {
-    auto pipeline = std::make_shared<LayerTreePipeline>(/*depth=*/10);
-    auto layer_tree = std::make_shared<LayerTree>(/*frame_size=*/SkISize(),
-                                                  /*device_pixel_ratio=*/2.0f);
-    auto layer_tree_item = std::make_unique<LayerTreeItem>(
-        std::move(layer_tree), CreateFinishedBuildRecorder());
+    auto pipeline = std::make_shared<FramePipeline>(/*depth=*/10);
+    auto layer_tree = std::make_unique<LayerTree>(
+        /*config=*/LayerTree::Config(), /*frame_size=*/SkISize());
+    auto layer_tree_item = std::make_unique<FrameItem>(
+        SingleLayerTreeList(kImplicitViewId, std::move(layer_tree),
+                            kDevicePixelRatio),
+        CreateFinishedBuildRecorder());
     PipelineProduceResult result =
         pipeline->Produce().Complete(std::move(layer_tree_item));
     EXPECT_TRUE(result.success);
-    auto no_discard = [](LayerTree&) { return false; };
-    rasterizer->Draw(pipeline, no_discard);
+    ON_CALL(delegate, ShouldDiscardLayerTree).WillByDefault(Return(false));
+    rasterizer->Draw(pipeline);
     latch.Signal();
   });
   latch.Wait();
@@ -269,8 +336,9 @@ TEST(
   std::string test_name =
       ::testing::UnitTest::GetInstance()->current_test_info()->name();
   ThreadHost thread_host("io.flutter.test." + test_name + ".",
-                         ThreadHost::Type::Platform | ThreadHost::Type::RASTER |
-                             ThreadHost::Type::IO | ThreadHost::Type::UI);
+                         ThreadHost::Type::kPlatform |
+                             ThreadHost::Type::kRaster | ThreadHost::Type::kIo |
+                             ThreadHost::Type::kUi);
   fml::MessageLoop::EnsureInitializedForCurrentThread();
   TaskRunners task_runners("test",
                            fml::MessageLoop::GetCurrent().GetTaskRunner(),
@@ -296,8 +364,9 @@ TEST(
   framebuffer_info.supports_readback = true;
 
   auto surface_frame = std::make_unique<SurfaceFrame>(
-      /*surface=*/nullptr, framebuffer_info,
-      /*submit_callback=*/[](const SurfaceFrame&, SkCanvas*) { return true; },
+      /*surface=*/
+      nullptr, framebuffer_info,
+      /*submit_callback=*/[](const SurfaceFrame&, DlCanvas*) { return true; },
       /*frame_size=*/SkISize::Make(800, 600));
   EXPECT_CALL(*surface, AllowsDrawingWhenGpuDisabled()).WillOnce(Return(true));
   EXPECT_CALL(*surface, AcquireFrame(SkISize()))
@@ -307,28 +376,34 @@ TEST(
   EXPECT_CALL(*external_view_embedder, SupportsDynamicThreadMerging)
       .WillRepeatedly(Return(true));
 
+  EXPECT_CALL(*external_view_embedder, BeginFrame(/*context=*/nullptr,
+                                                  /*raster_thread_merger=*/_))
+      .Times(1);
+  EXPECT_CALL(*external_view_embedder, PrepareFlutterView(
+                                           /*frame_size=*/SkISize(),
+                                           /*device_pixel_ratio=*/2.0))
+      .Times(1);
   EXPECT_CALL(*external_view_embedder,
-              BeginFrame(/*frame_size=*/SkISize(), /*context=*/nullptr,
-                         /*device_pixel_ratio=*/2.0,
-                         /*raster_thread_merger=*/_))
+              SubmitFlutterView(/*flutter_view_id=*/kImplicitViewId, _, _, _))
       .Times(1);
-  EXPECT_CALL(*external_view_embedder, SubmitFrame).Times(1);
   EXPECT_CALL(*external_view_embedder, EndFrame(/*should_resubmit_frame=*/false,
                                                 /*raster_thread_merger=*/_))
       .Times(1);
 
   rasterizer->Setup(std::move(surface));
 
-  auto pipeline = std::make_shared<LayerTreePipeline>(/*depth=*/10);
-  auto layer_tree = std::make_shared<LayerTree>(/*frame_size=*/SkISize(),
-                                                /*device_pixel_ratio=*/2.0f);
-  auto layer_tree_item = std::make_unique<LayerTreeItem>(
-      std::move(layer_tree), CreateFinishedBuildRecorder());
+  auto pipeline = std::make_shared<FramePipeline>(/*depth=*/10);
+  auto layer_tree = std::make_unique<LayerTree>(/*config=*/LayerTree::Config(),
+                                                /*frame_size=*/SkISize());
+  auto layer_tree_item = std::make_unique<FrameItem>(
+      SingleLayerTreeList(kImplicitViewId, std::move(layer_tree),
+                          kDevicePixelRatio),
+      CreateFinishedBuildRecorder());
   PipelineProduceResult result =
       pipeline->Produce().Complete(std::move(layer_tree_item));
   EXPECT_TRUE(result.success);
-  auto no_discard = [](LayerTree&) { return false; };
-  rasterizer->Draw(pipeline, no_discard);
+  ON_CALL(delegate, ShouldDiscardLayerTree).WillByDefault(Return(false));
+  rasterizer->Draw(pipeline);
 }
 
 TEST(RasterizerTest,
@@ -336,8 +411,9 @@ TEST(RasterizerTest,
   std::string test_name =
       ::testing::UnitTest::GetInstance()->current_test_info()->name();
   ThreadHost thread_host("io.flutter.test." + test_name + ".",
-                         ThreadHost::Type::Platform | ThreadHost::Type::RASTER |
-                             ThreadHost::Type::IO | ThreadHost::Type::UI);
+                         ThreadHost::Type::kPlatform |
+                             ThreadHost::Type::kRaster | ThreadHost::Type::kIo |
+                             ThreadHost::Type::kUi);
   fml::MessageLoop::EnsureInitializedForCurrentThread();
   TaskRunners task_runners("test",
                            fml::MessageLoop::GetCurrent().GetTaskRunner(),
@@ -363,16 +439,18 @@ TEST(RasterizerTest,
   framebuffer_info.supports_readback = true;
 
   auto surface_frame1 = std::make_unique<SurfaceFrame>(
-      /*surface=*/nullptr, framebuffer_info,
-      /*submit_callback=*/[](const SurfaceFrame&, SkCanvas*) { return true; },
+      /*surface=*/
+      nullptr, framebuffer_info,
+      /*submit_callback=*/[](const SurfaceFrame&, DlCanvas*) { return true; },
       /*frame_size=*/SkISize::Make(800, 600));
   auto surface_frame2 = std::make_unique<SurfaceFrame>(
-      /*surface=*/nullptr, framebuffer_info,
-      /*submit_callback=*/[](const SurfaceFrame&, SkCanvas*) { return true; },
+      /*surface=*/
+      nullptr, framebuffer_info,
+      /*submit_callback=*/[](const SurfaceFrame&, DlCanvas*) { return true; },
       /*frame_size=*/SkISize::Make(800, 600));
   EXPECT_CALL(*surface, AllowsDrawingWhenGpuDisabled())
       .WillRepeatedly(Return(true));
-  // Prepare two frames for Draw() and DrawLastLayerTree().
+  // Prepare two frames for Draw() and DrawLastLayerTrees().
   EXPECT_CALL(*surface, AcquireFrame(SkISize()))
       .WillOnce(Return(ByMove(std::move(surface_frame1))))
       .WillOnce(Return(ByMove(std::move(surface_frame2))));
@@ -381,43 +459,50 @@ TEST(RasterizerTest,
   EXPECT_CALL(*external_view_embedder, SupportsDynamicThreadMerging)
       .WillRepeatedly(Return(true));
 
+  EXPECT_CALL(*external_view_embedder, BeginFrame(/*context=*/nullptr,
+                                                  /*raster_thread_merger=*/_))
+      .Times(2);
+  EXPECT_CALL(*external_view_embedder, PrepareFlutterView(
+                                           /*frame_size=*/SkISize(),
+                                           /*device_pixel_ratio=*/2.0))
+      .Times(2);
   EXPECT_CALL(*external_view_embedder,
-              BeginFrame(/*frame_size=*/SkISize(), /*context=*/nullptr,
-                         /*device_pixel_ratio=*/2.0,
-                         /*raster_thread_merger=*/_))
+              SubmitFlutterView(/*flutter_view_id=*/kImplicitViewId, _, _, _))
       .Times(2);
-  EXPECT_CALL(*external_view_embedder, SubmitFrame).Times(2);
   EXPECT_CALL(*external_view_embedder, EndFrame(/*should_resubmit_frame=*/false,
                                                 /*raster_thread_merger=*/_))
       .Times(2);
 
   rasterizer->Setup(std::move(surface));
 
-  auto pipeline = std::make_shared<LayerTreePipeline>(/*depth=*/10);
-  auto layer_tree = std::make_shared<LayerTree>(/*frame_size=*/SkISize(),
-                                                /*device_pixel_ratio=*/2.0f);
-  auto layer_tree_item = std::make_unique<LayerTreeItem>(
-      std::move(layer_tree), CreateFinishedBuildRecorder());
+  auto pipeline = std::make_shared<FramePipeline>(/*depth=*/10);
+  auto layer_tree = std::make_unique<LayerTree>(/*config=*/LayerTree::Config(),
+                                                /*frame_size=*/SkISize());
+  auto layer_tree_item = std::make_unique<FrameItem>(
+      SingleLayerTreeList(kImplicitViewId, std::move(layer_tree),
+                          kDevicePixelRatio),
+      CreateFinishedBuildRecorder());
   PipelineProduceResult result =
       pipeline->Produce().Complete(std::move(layer_tree_item));
   EXPECT_TRUE(result.success);
-  auto no_discard = [](LayerTree&) { return false; };
 
-  // The Draw() will respectively call BeginFrame(), SubmitFrame() and
+  // The Draw() will respectively call BeginFrame(), SubmitFlutterView() and
   // EndFrame() one time.
-  rasterizer->Draw(pipeline, no_discard);
+  ON_CALL(delegate, ShouldDiscardLayerTree).WillByDefault(Return(false));
+  rasterizer->Draw(pipeline);
 
-  // The DrawLastLayerTree() will respectively call BeginFrame(), SubmitFrame()
-  // and EndFrame() one more time, totally 2 times.
-  rasterizer->DrawLastLayerTree(CreateFinishedBuildRecorder());
+  // The DrawLastLayerTrees() will respectively call BeginFrame(),
+  // SubmitFlutterView() and EndFrame() one more time, totally 2 times.
+  rasterizer->DrawLastLayerTrees(CreateFinishedBuildRecorder());
 }
 
 TEST(RasterizerTest, externalViewEmbedderDoesntEndFrameWhenNoSurfaceIsSet) {
   std::string test_name =
       ::testing::UnitTest::GetInstance()->current_test_info()->name();
   ThreadHost thread_host("io.flutter.test." + test_name + ".",
-                         ThreadHost::Type::Platform | ThreadHost::Type::RASTER |
-                             ThreadHost::Type::IO | ThreadHost::Type::UI);
+                         ThreadHost::Type::kPlatform |
+                             ThreadHost::Type::kRaster | ThreadHost::Type::kIo |
+                             ThreadHost::Type::kUi);
   TaskRunners task_runners("test", thread_host.platform_thread->GetTaskRunner(),
                            thread_host.raster_thread->GetTaskRunner(),
                            thread_host.ui_thread->GetTaskRunner(),
@@ -442,16 +527,18 @@ TEST(RasterizerTest, externalViewEmbedderDoesntEndFrameWhenNoSurfaceIsSet) {
 
   fml::AutoResetWaitableEvent latch;
   thread_host.raster_thread->GetTaskRunner()->PostTask([&] {
-    auto pipeline = std::make_shared<LayerTreePipeline>(/*depth=*/10);
-    auto layer_tree = std::make_shared<LayerTree>(/*frame_size=*/SkISize(),
-                                                  /*device_pixel_ratio=*/2.0f);
-    auto layer_tree_item = std::make_unique<LayerTreeItem>(
-        std::move(layer_tree), CreateFinishedBuildRecorder());
+    auto pipeline = std::make_shared<FramePipeline>(/*depth=*/10);
+    auto layer_tree = std::make_unique<LayerTree>(
+        /*config=*/LayerTree::Config(), /*frame_size=*/SkISize());
+    auto layer_tree_item = std::make_unique<FrameItem>(
+        SingleLayerTreeList(kImplicitViewId, std::move(layer_tree),
+                            kDevicePixelRatio),
+        CreateFinishedBuildRecorder());
     PipelineProduceResult result =
         pipeline->Produce().Complete(std::move(layer_tree_item));
     EXPECT_TRUE(result.success);
-    auto no_discard = [](LayerTree&) { return false; };
-    rasterizer->Draw(pipeline, no_discard);
+    ON_CALL(delegate, ShouldDiscardLayerTree).WillByDefault(Return(false));
+    rasterizer->Draw(pipeline);
     latch.Signal();
   });
   latch.Wait();
@@ -461,8 +548,9 @@ TEST(RasterizerTest, externalViewEmbedderDoesntEndFrameWhenNotUsedThisFrame) {
   std::string test_name =
       ::testing::UnitTest::GetInstance()->current_test_info()->name();
   ThreadHost thread_host("io.flutter.test." + test_name + ".",
-                         ThreadHost::Type::Platform | ThreadHost::Type::RASTER |
-                             ThreadHost::Type::IO | ThreadHost::Type::UI);
+                         ThreadHost::Type::kPlatform |
+                             ThreadHost::Type::kRaster | ThreadHost::Type::kIo |
+                             ThreadHost::Type::kUi);
   TaskRunners task_runners("test", thread_host.platform_thread->GetTaskRunner(),
                            thread_host.raster_thread->GetTaskRunner(),
                            thread_host.ui_thread->GetTaskRunner(),
@@ -472,6 +560,10 @@ TEST(RasterizerTest, externalViewEmbedderDoesntEndFrameWhenNotUsedThisFrame) {
   ON_CALL(delegate, GetSettings()).WillByDefault(ReturnRef(settings));
   EXPECT_CALL(delegate, GetTaskRunners())
       .WillRepeatedly(ReturnRef(task_runners));
+  auto is_gpu_disabled_sync_switch =
+      std::make_shared<const fml::SyncSwitch>(false);
+  ON_CALL(delegate, GetIsGpuDisabledSyncSwitch())
+      .WillByDefault(Return(is_gpu_disabled_sync_switch));
 
   auto rasterizer = std::make_unique<Rasterizer>(delegate);
   auto surface = std::make_unique<NiceMock<MockSurface>>();
@@ -483,10 +575,12 @@ TEST(RasterizerTest, externalViewEmbedderDoesntEndFrameWhenNotUsedThisFrame) {
   rasterizer->SetExternalViewEmbedder(external_view_embedder);
   rasterizer->Setup(std::move(surface));
 
-  EXPECT_CALL(*external_view_embedder,
-              BeginFrame(/*frame_size=*/SkISize(), /*context=*/nullptr,
-                         /*device_pixel_ratio=*/2.0,
-                         /*raster_thread_merger=*/_))
+  EXPECT_CALL(*external_view_embedder, BeginFrame(/*context=*/nullptr,
+                                                  /*raster_thread_merger=*/_))
+      .Times(0);
+  EXPECT_CALL(*external_view_embedder, PrepareFlutterView(
+                                           /*frame_size=*/SkISize(),
+                                           /*device_pixel_ratio=*/2.0))
       .Times(0);
   EXPECT_CALL(
       *external_view_embedder,
@@ -497,18 +591,22 @@ TEST(RasterizerTest, externalViewEmbedderDoesntEndFrameWhenNotUsedThisFrame) {
 
   fml::AutoResetWaitableEvent latch;
   thread_host.raster_thread->GetTaskRunner()->PostTask([&] {
-    auto pipeline = std::make_shared<LayerTreePipeline>(/*depth=*/10);
-    auto layer_tree = std::make_shared<LayerTree>(/*frame_size=*/SkISize(),
-                                                  /*device_pixel_ratio=*/2.0f);
-    auto layer_tree_item = std::make_unique<LayerTreeItem>(
-        std::move(layer_tree), CreateFinishedBuildRecorder());
+    auto pipeline = std::make_shared<FramePipeline>(/*depth=*/10);
+    auto layer_tree = std::make_unique<LayerTree>(
+        /*config=*/LayerTree::Config(), /*frame_size=*/SkISize());
+    auto layer_tree_item = std::make_unique<FrameItem>(
+        SingleLayerTreeList(kImplicitViewId, std::move(layer_tree),
+                            kDevicePixelRatio),
+        CreateFinishedBuildRecorder());
     PipelineProduceResult result =
         pipeline->Produce().Complete(std::move(layer_tree_item));
     EXPECT_TRUE(result.success);
     // Always discard the layer tree.
-    auto discard_callback = [](LayerTree&) { return true; };
-    RasterStatus status = rasterizer->Draw(pipeline, discard_callback);
-    EXPECT_EQ(status, RasterStatus::kDiscarded);
+    ON_CALL(delegate, ShouldDiscardLayerTree).WillByDefault(Return(true));
+    DrawStatus status = rasterizer->Draw(pipeline);
+    EXPECT_EQ(status, DrawStatus::kDone);
+    EXPECT_EQ(rasterizer->GetLastDrawStatus(kImplicitViewId),
+              DrawSurfaceStatus::kDiscarded);
     latch.Signal();
   });
   latch.Wait();
@@ -518,8 +616,9 @@ TEST(RasterizerTest, externalViewEmbedderDoesntEndFrameWhenPipelineIsEmpty) {
   std::string test_name =
       ::testing::UnitTest::GetInstance()->current_test_info()->name();
   ThreadHost thread_host("io.flutter.test." + test_name + ".",
-                         ThreadHost::Type::Platform | ThreadHost::Type::RASTER |
-                             ThreadHost::Type::IO | ThreadHost::Type::UI);
+                         ThreadHost::Type::kPlatform |
+                             ThreadHost::Type::kRaster | ThreadHost::Type::kIo |
+                             ThreadHost::Type::kUi);
   TaskRunners task_runners("test", thread_host.platform_thread->GetTaskRunner(),
                            thread_host.raster_thread->GetTaskRunner(),
                            thread_host.ui_thread->GetTaskRunner(),
@@ -549,10 +648,90 @@ TEST(RasterizerTest, externalViewEmbedderDoesntEndFrameWhenPipelineIsEmpty) {
 
   fml::AutoResetWaitableEvent latch;
   thread_host.raster_thread->GetTaskRunner()->PostTask([&] {
-    auto pipeline = std::make_shared<LayerTreePipeline>(/*depth=*/10);
-    auto no_discard = [](LayerTree&) { return false; };
-    RasterStatus status = rasterizer->Draw(pipeline, no_discard);
-    EXPECT_EQ(status, RasterStatus::kFailed);
+    auto pipeline = std::make_shared<FramePipeline>(/*depth=*/10);
+    ON_CALL(delegate, ShouldDiscardLayerTree).WillByDefault(Return(false));
+    DrawStatus status = rasterizer->Draw(pipeline);
+    EXPECT_EQ(status, DrawStatus::kPipelineEmpty);
+    latch.Signal();
+  });
+  latch.Wait();
+}
+
+TEST(RasterizerTest, drawMultipleViewsWithExternalViewEmbedder) {
+  std::string test_name =
+      ::testing::UnitTest::GetInstance()->current_test_info()->name();
+  ThreadHost thread_host("io.flutter.test." + test_name + ".",
+                         ThreadHost::Type::kPlatform |
+                             ThreadHost::Type::kRaster | ThreadHost::Type::kIo |
+                             ThreadHost::Type::kUi);
+  TaskRunners task_runners("test", thread_host.platform_thread->GetTaskRunner(),
+                           thread_host.raster_thread->GetTaskRunner(),
+                           thread_host.ui_thread->GetTaskRunner(),
+                           thread_host.io_thread->GetTaskRunner());
+  NiceMock<MockDelegate> delegate;
+  Settings settings;
+  ON_CALL(delegate, GetSettings()).WillByDefault(ReturnRef(settings));
+  EXPECT_CALL(delegate, GetTaskRunners())
+      .WillRepeatedly(ReturnRef(task_runners));
+  EXPECT_CALL(delegate, OnFrameRasterized(_));
+  auto rasterizer = std::make_unique<Rasterizer>(delegate);
+  auto surface = std::make_unique<NiceMock<MockSurface>>();
+  std::shared_ptr<NiceMock<MockExternalViewEmbedder>> external_view_embedder =
+      std::make_shared<NiceMock<MockExternalViewEmbedder>>();
+  rasterizer->SetExternalViewEmbedder(external_view_embedder);
+  EXPECT_CALL(*external_view_embedder, SupportsDynamicThreadMerging)
+      .WillRepeatedly(Return(false));
+  EXPECT_CALL(*surface, AllowsDrawingWhenGpuDisabled()).WillOnce(Return(true));
+  EXPECT_CALL(*surface, AcquireFrame(SkISize())).Times(2);
+  ON_CALL(*surface, AcquireFrame).WillByDefault([](const SkISize& size) {
+    SurfaceFrame::FramebufferInfo framebuffer_info;
+    framebuffer_info.supports_readback = true;
+    return std::make_unique<SurfaceFrame>(
+        /*surface=*/
+        nullptr, framebuffer_info,
+        /*submit_callback=*/[](const SurfaceFrame&, DlCanvas*) { return true; },
+        /*frame_size=*/SkISize::Make(800, 600));
+  });
+  EXPECT_CALL(*surface, MakeRenderContextCurrent())
+      .WillOnce(Return(ByMove(std::make_unique<GLContextDefaultResult>(true))));
+
+  EXPECT_CALL(*external_view_embedder, BeginFrame(/*context=*/nullptr,
+                                                  /*raster_thread_merger=*/_))
+      .Times(1);
+  EXPECT_CALL(*external_view_embedder,
+              PrepareFlutterView(/*frame_size=*/SkISize(),
+                                 /*device_pixel_ratio=*/1.5))
+      .Times(1);
+  EXPECT_CALL(*external_view_embedder,
+              SubmitFlutterView(/*flutter_view_id=*/0, _, _, _))
+      .Times(1);
+  EXPECT_CALL(*external_view_embedder,
+              PrepareFlutterView(/*frame_size=*/SkISize(),
+                                 /*device_pixel_ratio=*/2.0))
+      .Times(1);
+  EXPECT_CALL(*external_view_embedder,
+              SubmitFlutterView(/*flutter_view_id=*/1, _, _, _))
+      .Times(1);
+  EXPECT_CALL(*external_view_embedder, EndFrame(/*should_resubmit_frame=*/false,
+                                                /*raster_thread_merger=*/_))
+      .Times(1);
+
+  rasterizer->Setup(std::move(surface));
+  fml::AutoResetWaitableEvent latch;
+  thread_host.raster_thread->GetTaskRunner()->PostTask([&] {
+    auto pipeline = std::make_shared<FramePipeline>(/*depth=*/10);
+    std::vector<std::unique_ptr<LayerTreeTask>> tasks;
+    tasks.push_back(std::make_unique<LayerTreeTask>(
+        0, std::make_unique<LayerTree>(LayerTree::Config(), SkISize()), 1.5));
+    tasks.push_back(std::make_unique<LayerTreeTask>(
+        1, std::make_unique<LayerTree>(LayerTree::Config(), SkISize()), 2.0));
+    auto layer_tree_item = std::make_unique<FrameItem>(
+        std::move(tasks), CreateFinishedBuildRecorder());
+    PipelineProduceResult result =
+        pipeline->Produce().Complete(std::move(layer_tree_item));
+    EXPECT_TRUE(result.success);
+    ON_CALL(delegate, ShouldDiscardLayerTree).WillByDefault(Return(false));
+    rasterizer->Draw(pipeline);
     latch.Signal();
   });
   latch.Wait();
@@ -563,8 +742,9 @@ TEST(RasterizerTest,
   std::string test_name =
       ::testing::UnitTest::GetInstance()->current_test_info()->name();
   ThreadHost thread_host("io.flutter.test." + test_name + ".",
-                         ThreadHost::Type::Platform | ThreadHost::Type::RASTER |
-                             ThreadHost::Type::IO | ThreadHost::Type::UI);
+                         ThreadHost::Type::kPlatform |
+                             ThreadHost::Type::kRaster | ThreadHost::Type::kIo |
+                             ThreadHost::Type::kUi);
   TaskRunners task_runners("test", thread_host.platform_thread->GetTaskRunner(),
                            thread_host.raster_thread->GetTaskRunner(),
                            thread_host.ui_thread->GetTaskRunner(),
@@ -584,8 +764,9 @@ TEST(RasterizerTest,
   SurfaceFrame::FramebufferInfo framebuffer_info;
   framebuffer_info.supports_readback = true;
   auto surface_frame = std::make_unique<SurfaceFrame>(
-      /*surface=*/nullptr, /*framebuffer_info=*/framebuffer_info,
-      /*submit_callback=*/[](const SurfaceFrame&, SkCanvas*) { return true; },
+      /*surface=*/
+      nullptr, /*framebuffer_info=*/framebuffer_info,
+      /*submit_callback=*/[](const SurfaceFrame&, DlCanvas*) { return true; },
       /*frame_size=*/SkISize::Make(800, 600));
   EXPECT_CALL(*surface, AllowsDrawingWhenGpuDisabled()).WillOnce(Return(true));
   ON_CALL(delegate, GetIsGpuDisabledSyncSwitch())
@@ -599,16 +780,18 @@ TEST(RasterizerTest,
   rasterizer->Setup(std::move(surface));
   fml::AutoResetWaitableEvent latch;
   thread_host.raster_thread->GetTaskRunner()->PostTask([&] {
-    auto pipeline = std::make_shared<LayerTreePipeline>(/*depth=*/10);
-    auto layer_tree = std::make_shared<LayerTree>(/*frame_size=*/SkISize(),
-                                                  /*device_pixel_ratio=*/2.0f);
-    auto layer_tree_item = std::make_unique<LayerTreeItem>(
-        std::move(layer_tree), CreateFinishedBuildRecorder());
+    auto pipeline = std::make_shared<FramePipeline>(/*depth=*/10);
+    auto layer_tree = std::make_unique<LayerTree>(
+        /*config=*/LayerTree::Config(), /*frame_size=*/SkISize());
+    auto layer_tree_item = std::make_unique<FrameItem>(
+        SingleLayerTreeList(kImplicitViewId, std::move(layer_tree),
+                            kDevicePixelRatio),
+        CreateFinishedBuildRecorder());
     PipelineProduceResult result =
         pipeline->Produce().Complete(std::move(layer_tree_item));
     EXPECT_TRUE(result.success);
-    auto no_discard = [](LayerTree&) { return false; };
-    rasterizer->Draw(pipeline, no_discard);
+    ON_CALL(delegate, ShouldDiscardLayerTree).WillByDefault(Return(false));
+    rasterizer->Draw(pipeline);
     latch.Signal();
   });
   latch.Wait();
@@ -620,8 +803,9 @@ TEST(
   std::string test_name =
       ::testing::UnitTest::GetInstance()->current_test_info()->name();
   ThreadHost thread_host("io.flutter.test." + test_name + ".",
-                         ThreadHost::Type::Platform | ThreadHost::Type::RASTER |
-                             ThreadHost::Type::IO | ThreadHost::Type::UI);
+                         ThreadHost::Type::kPlatform |
+                             ThreadHost::Type::kRaster | ThreadHost::Type::kIo |
+                             ThreadHost::Type::kUi);
   TaskRunners task_runners("test", thread_host.platform_thread->GetTaskRunner(),
                            thread_host.raster_thread->GetTaskRunner(),
                            thread_host.ui_thread->GetTaskRunner(),
@@ -641,8 +825,9 @@ TEST(
   framebuffer_info.supports_readback = true;
 
   auto surface_frame = std::make_unique<SurfaceFrame>(
-      /*surface=*/nullptr, /*framebuffer_info=*/framebuffer_info,
-      /*submit_callback=*/[](const SurfaceFrame&, SkCanvas*) { return true; },
+      /*surface=*/
+      nullptr, /*framebuffer_info=*/framebuffer_info,
+      /*submit_callback=*/[](const SurfaceFrame&, DlCanvas*) { return true; },
       /*frame_size=*/SkISize::Make(800, 600));
   EXPECT_CALL(*surface, AllowsDrawingWhenGpuDisabled()).WillOnce(Return(true));
   ON_CALL(delegate, GetIsGpuDisabledSyncSwitch())
@@ -656,17 +841,19 @@ TEST(
   rasterizer->Setup(std::move(surface));
   fml::AutoResetWaitableEvent latch;
   thread_host.raster_thread->GetTaskRunner()->PostTask([&] {
-    auto pipeline = std::make_shared<LayerTreePipeline>(/*depth=*/10);
-    auto layer_tree = std::make_shared<LayerTree>(/*frame_size=*/SkISize(),
-                                                  /*device_pixel_ratio=*/2.0f);
-    auto layer_tree_item = std::make_unique<LayerTreeItem>(
-        std::move(layer_tree), CreateFinishedBuildRecorder());
+    auto pipeline = std::make_shared<FramePipeline>(/*depth=*/10);
+    auto layer_tree = std::make_unique<LayerTree>(
+        /*config=*/LayerTree::Config(), /*frame_size=*/SkISize());
+    auto layer_tree_item = std::make_unique<FrameItem>(
+        SingleLayerTreeList(kImplicitViewId, std::move(layer_tree),
+                            kDevicePixelRatio),
+        CreateFinishedBuildRecorder());
     PipelineProduceResult result =
         pipeline->Produce().Complete(std::move(layer_tree_item));
     EXPECT_TRUE(result.success);
-    auto no_discard = [](LayerTree&) { return false; };
-    RasterStatus status = rasterizer->Draw(pipeline, no_discard);
-    EXPECT_EQ(status, RasterStatus::kSuccess);
+    ON_CALL(delegate, ShouldDiscardLayerTree).WillByDefault(Return(false));
+    DrawStatus status = rasterizer->Draw(pipeline);
+    EXPECT_EQ(status, DrawStatus::kDone);
     latch.Signal();
   });
   latch.Wait();
@@ -678,8 +865,9 @@ TEST(
   std::string test_name =
       ::testing::UnitTest::GetInstance()->current_test_info()->name();
   ThreadHost thread_host("io.flutter.test." + test_name + ".",
-                         ThreadHost::Type::Platform | ThreadHost::Type::RASTER |
-                             ThreadHost::Type::IO | ThreadHost::Type::UI);
+                         ThreadHost::Type::kPlatform |
+                             ThreadHost::Type::kRaster | ThreadHost::Type::kIo |
+                             ThreadHost::Type::kUi);
   TaskRunners task_runners("test", thread_host.platform_thread->GetTaskRunner(),
                            thread_host.raster_thread->GetTaskRunner(),
                            thread_host.ui_thread->GetTaskRunner(),
@@ -699,8 +887,9 @@ TEST(
   framebuffer_info.supports_readback = true;
 
   auto surface_frame = std::make_unique<SurfaceFrame>(
-      /*surface=*/nullptr, /*framebuffer_info=*/framebuffer_info,
-      /*submit_callback=*/[](const SurfaceFrame&, SkCanvas*) { return true; },
+      /*surface=*/
+      nullptr, /*framebuffer_info=*/framebuffer_info,
+      /*submit_callback=*/[](const SurfaceFrame&, DlCanvas*) { return true; },
       /*frame_size=*/SkISize::Make(800, 600));
   EXPECT_CALL(*surface, AllowsDrawingWhenGpuDisabled()).WillOnce(Return(false));
   EXPECT_CALL(delegate, GetIsGpuDisabledSyncSwitch())
@@ -713,17 +902,19 @@ TEST(
   rasterizer->Setup(std::move(surface));
   fml::AutoResetWaitableEvent latch;
   thread_host.raster_thread->GetTaskRunner()->PostTask([&] {
-    auto pipeline = std::make_shared<LayerTreePipeline>(/*depth=*/10);
-    auto layer_tree = std::make_shared<LayerTree>(/*frame_size=*/SkISize(),
-                                                  /*device_pixel_ratio=*/2.0f);
-    auto layer_tree_item = std::make_unique<LayerTreeItem>(
-        std::move(layer_tree), CreateFinishedBuildRecorder());
+    auto pipeline = std::make_shared<FramePipeline>(/*depth=*/10);
+    auto layer_tree = std::make_unique<LayerTree>(
+        /*config=*/LayerTree::Config(), /*frame_size=*/SkISize());
+    auto layer_tree_item = std::make_unique<FrameItem>(
+        SingleLayerTreeList(kImplicitViewId, std::move(layer_tree),
+                            kDevicePixelRatio),
+        CreateFinishedBuildRecorder());
     PipelineProduceResult result =
         pipeline->Produce().Complete(std::move(layer_tree_item));
     EXPECT_TRUE(result.success);
-    auto no_discard = [](LayerTree&) { return false; };
-    RasterStatus status = rasterizer->Draw(pipeline, no_discard);
-    EXPECT_EQ(status, RasterStatus::kSuccess);
+    ON_CALL(delegate, ShouldDiscardLayerTree).WillByDefault(Return(false));
+    DrawStatus status = rasterizer->Draw(pipeline);
+    EXPECT_EQ(status, DrawStatus::kDone);
     latch.Signal();
   });
   latch.Wait();
@@ -735,8 +926,9 @@ TEST(
   std::string test_name =
       ::testing::UnitTest::GetInstance()->current_test_info()->name();
   ThreadHost thread_host("io.flutter.test." + test_name + ".",
-                         ThreadHost::Type::Platform | ThreadHost::Type::RASTER |
-                             ThreadHost::Type::IO | ThreadHost::Type::UI);
+                         ThreadHost::Type::kPlatform |
+                             ThreadHost::Type::kRaster | ThreadHost::Type::kIo |
+                             ThreadHost::Type::kUi);
   TaskRunners task_runners("test", thread_host.platform_thread->GetTaskRunner(),
                            thread_host.raster_thread->GetTaskRunner(),
                            thread_host.ui_thread->GetTaskRunner(),
@@ -756,8 +948,9 @@ TEST(
   framebuffer_info.supports_readback = true;
 
   auto surface_frame = std::make_unique<SurfaceFrame>(
-      /*surface=*/nullptr, /*framebuffer_info=*/framebuffer_info,
-      /*submit_callback=*/[](const SurfaceFrame&, SkCanvas*) { return true; },
+      /*surface=*/
+      nullptr, /*framebuffer_info=*/framebuffer_info,
+      /*submit_callback=*/[](const SurfaceFrame&, DlCanvas*) { return true; },
       /*frame_size=*/SkISize::Make(800, 600));
   EXPECT_CALL(*surface, AllowsDrawingWhenGpuDisabled()).WillOnce(Return(false));
   EXPECT_CALL(delegate, GetIsGpuDisabledSyncSwitch())
@@ -769,17 +962,79 @@ TEST(
   rasterizer->Setup(std::move(surface));
   fml::AutoResetWaitableEvent latch;
   thread_host.raster_thread->GetTaskRunner()->PostTask([&] {
-    auto pipeline = std::make_shared<LayerTreePipeline>(/*depth=*/10);
-    auto layer_tree = std::make_shared<LayerTree>(/*frame_size=*/SkISize(),
-                                                  /*device_pixel_ratio=*/2.0f);
-    auto layer_tree_item = std::make_unique<LayerTreeItem>(
-        std::move(layer_tree), CreateFinishedBuildRecorder());
+    auto pipeline = std::make_shared<FramePipeline>(/*depth=*/10);
+    auto layer_tree = std::make_unique<LayerTree>(
+        /*config=*/LayerTree::Config(), /*frame_size=*/SkISize());
+    auto layer_tree_item = std::make_unique<FrameItem>(
+        SingleLayerTreeList(kImplicitViewId, std::move(layer_tree),
+                            kDevicePixelRatio),
+        CreateFinishedBuildRecorder());
     PipelineProduceResult result =
         pipeline->Produce().Complete(std::move(layer_tree_item));
     EXPECT_TRUE(result.success);
-    auto no_discard = [](LayerTree&) { return false; };
-    RasterStatus status = rasterizer->Draw(pipeline, no_discard);
-    EXPECT_EQ(status, RasterStatus::kDiscarded);
+    ON_CALL(delegate, ShouldDiscardLayerTree).WillByDefault(Return(false));
+    DrawStatus status = rasterizer->Draw(pipeline);
+    EXPECT_EQ(status, DrawStatus::kGpuUnavailable);
+    latch.Signal();
+  });
+  latch.Wait();
+}
+
+TEST(
+    RasterizerTest,
+    FrameTimingRecorderShouldStartRecordingRasterTimeBeforeSurfaceAcquireFrame) {
+  std::string test_name =
+      ::testing::UnitTest::GetInstance()->current_test_info()->name();
+  ThreadHost thread_host("io.flutter.test." + test_name + ".",
+                         ThreadHost::Type::kPlatform |
+                             ThreadHost::Type::kRaster | ThreadHost::Type::kIo |
+                             ThreadHost::Type::kUi);
+  TaskRunners task_runners("test", thread_host.platform_thread->GetTaskRunner(),
+                           thread_host.raster_thread->GetTaskRunner(),
+                           thread_host.ui_thread->GetTaskRunner(),
+                           thread_host.io_thread->GetTaskRunner());
+  NiceMock<MockDelegate> delegate;
+  Settings settings;
+  ON_CALL(delegate, GetSettings()).WillByDefault(ReturnRef(settings));
+  EXPECT_CALL(delegate, GetTaskRunners())
+      .WillRepeatedly(ReturnRef(task_runners));
+  EXPECT_CALL(delegate, OnFrameRasterized(_))
+      .WillOnce([&](const FrameTiming& frame_timing) {
+        fml::TimePoint now = fml::TimePoint::Now();
+        fml::TimePoint raster_start =
+            frame_timing.Get(FrameTiming::kRasterStart);
+        EXPECT_TRUE(now - raster_start < fml::TimeDelta::FromSecondsF(1));
+      });
+
+  auto rasterizer = std::make_unique<Rasterizer>(delegate);
+  auto surface = std::make_unique<NiceMock<MockSurface>>();
+  auto is_gpu_disabled_sync_switch =
+      std::make_shared<const fml::SyncSwitch>(false);
+  ON_CALL(delegate, GetIsGpuDisabledSyncSwitch())
+      .WillByDefault(Return(is_gpu_disabled_sync_switch));
+  ON_CALL(*surface, AcquireFrame(SkISize()))
+      .WillByDefault(::testing::Invoke([] { return nullptr; }));
+  EXPECT_CALL(*surface, AcquireFrame(SkISize()));
+  EXPECT_CALL(*surface, MakeRenderContextCurrent())
+      .WillOnce(Return(ByMove(std::make_unique<GLContextDefaultResult>(true))));
+  rasterizer->Setup(std::move(surface));
+  fml::AutoResetWaitableEvent latch;
+  thread_host.raster_thread->GetTaskRunner()->PostTask([&] {
+    auto pipeline = std::make_shared<FramePipeline>(/*depth=*/10);
+    auto layer_tree = std::make_unique<LayerTree>(
+        /*config=*/LayerTree::Config(), /*frame_size=*/SkISize());
+    auto layer_tree_item = std::make_unique<FrameItem>(
+        SingleLayerTreeList(kImplicitViewId, std::move(layer_tree),
+                            kDevicePixelRatio),
+        CreateFinishedBuildRecorder());
+    PipelineProduceResult result =
+        pipeline->Produce().Complete(std::move(layer_tree_item));
+    EXPECT_TRUE(result.success);
+    ON_CALL(delegate, ShouldDiscardLayerTree).WillByDefault(Return(false));
+    DrawStatus status = rasterizer->Draw(pipeline);
+    EXPECT_EQ(status, DrawStatus::kDone);
+    EXPECT_EQ(rasterizer->GetLastDrawStatus(kImplicitViewId),
+              DrawSurfaceStatus::kFailed);
     latch.Signal();
   });
   latch.Wait();
@@ -790,8 +1045,9 @@ TEST(RasterizerTest,
   std::string test_name =
       ::testing::UnitTest::GetInstance()->current_test_info()->name();
   ThreadHost thread_host("io.flutter.test." + test_name + ".",
-                         ThreadHost::Type::Platform | ThreadHost::Type::RASTER |
-                             ThreadHost::Type::IO | ThreadHost::Type::UI);
+                         ThreadHost::Type::kPlatform |
+                             ThreadHost::Type::kRaster | ThreadHost::Type::kIo |
+                             ThreadHost::Type::kUi);
   TaskRunners task_runners("test", thread_host.platform_thread->GetTaskRunner(),
                            thread_host.raster_thread->GetTaskRunner(),
                            thread_host.ui_thread->GetTaskRunner(),
@@ -817,9 +1073,10 @@ TEST(RasterizerTest,
         SurfaceFrame::FramebufferInfo framebuffer_info;
         framebuffer_info.supports_readback = true;
         return std::make_unique<SurfaceFrame>(
-            /*surface=*/nullptr, framebuffer_info,
+            /*surface=*/
+            nullptr, framebuffer_info,
             /*submit_callback=*/
-            [](const SurfaceFrame& frame, SkCanvas*) { return true; },
+            [](const SurfaceFrame& frame, DlCanvas*) { return true; },
             /*frame_size=*/SkISize::Make(800, 600));
       }));
   ON_CALL(*surface, MakeRenderContextCurrent())
@@ -846,22 +1103,23 @@ TEST(RasterizerTest,
 
   thread_host.raster_thread->GetTaskRunner()->PostTask([&] {
     rasterizer->Setup(std::move(surface));
-    auto pipeline = std::make_shared<LayerTreePipeline>(/*depth=*/10);
+    auto pipeline = std::make_shared<FramePipeline>(/*depth=*/10);
     for (int i = 0; i < 2; i++) {
-      auto layer_tree =
-          std::make_shared<LayerTree>(/*frame_size=*/SkISize(),
-                                      /*device_pixel_ratio=*/2.0f);
-      auto layer_tree_item = std::make_unique<LayerTreeItem>(
-          std::move(layer_tree), CreateFinishedBuildRecorder(timestamps[i]));
+      auto layer_tree = std::make_unique<LayerTree>(
+          /*config=*/LayerTree::Config(), /*frame_size=*/SkISize());
+      auto layer_tree_item = std::make_unique<FrameItem>(
+          SingleLayerTreeList(kImplicitViewId, std::move(layer_tree),
+                              kDevicePixelRatio),
+          CreateFinishedBuildRecorder(timestamps[i]));
       PipelineProduceResult result =
           pipeline->Produce().Complete(std::move(layer_tree_item));
       EXPECT_TRUE(result.success);
       EXPECT_EQ(result.is_first_item, i == 0);
     }
-    auto no_discard = [](LayerTree&) { return false; };
     // Although we only call 'Rasterizer::Draw' once, it will be called twice
     // finally because there are two items in the pipeline.
-    rasterizer->Draw(pipeline, no_discard);
+    ON_CALL(delegate, ShouldDiscardLayerTree).WillByDefault(Return(false));
+    rasterizer->Draw(pipeline);
   });
   count_down_latch.Wait();
   thread_host.raster_thread->GetTaskRunner()->PostTask([&] {
@@ -875,8 +1133,9 @@ TEST(RasterizerTest, TeardownFreesResourceCache) {
   std::string test_name =
       ::testing::UnitTest::GetInstance()->current_test_info()->name();
   ThreadHost thread_host("io.flutter.test." + test_name + ".",
-                         ThreadHost::Type::Platform | ThreadHost::Type::RASTER |
-                             ThreadHost::Type::IO | ThreadHost::Type::UI);
+                         ThreadHost::Type::kPlatform |
+                             ThreadHost::Type::kRaster | ThreadHost::Type::kIo |
+                             ThreadHost::Type::kUi);
   TaskRunners task_runners("test", thread_host.platform_thread->GetTaskRunner(),
                            thread_host.raster_thread->GetTaskRunner(),
                            thread_host.ui_thread->GetTaskRunner(),
@@ -913,14 +1172,13 @@ TEST(RasterizerTest, TeardownFreesResourceCache) {
 
   auto image_info =
       SkImageInfo::MakeN32Premul(500, 500, SkColorSpace::MakeSRGB());
-  auto sk_surface =
-      SkSurface::MakeRenderTarget(context.get(), SkBudgeted::kYes, image_info);
+  auto sk_surface = SkSurfaces::RenderTarget(context.get(),
+                                             skgpu::Budgeted::kYes, image_info);
   EXPECT_TRUE(sk_surface);
 
   SkPaint paint;
   sk_surface->getCanvas()->drawPaint(paint);
-  sk_surface->getCanvas()->flush();
-  context->flushAndSubmit(true);
+  context->flushAndSubmit(GrSyncCpu::kYes);
 
   EXPECT_EQ(context->getResourceCachePurgeableBytes(), 0ul);
 
@@ -938,8 +1196,9 @@ TEST(RasterizerTest, TeardownNoSurface) {
   std::string test_name =
       ::testing::UnitTest::GetInstance()->current_test_info()->name();
   ThreadHost thread_host("io.flutter.test." + test_name + ".",
-                         ThreadHost::Type::Platform | ThreadHost::Type::RASTER |
-                             ThreadHost::Type::IO | ThreadHost::Type::UI);
+                         ThreadHost::Type::kPlatform |
+                             ThreadHost::Type::kRaster | ThreadHost::Type::kIo |
+                             ThreadHost::Type::kUi);
   TaskRunners task_runners("test", thread_host.platform_thread->GetTaskRunner(),
                            thread_host.raster_thread->GetTaskRunner(),
                            thread_host.ui_thread->GetTaskRunner(),
@@ -960,11 +1219,12 @@ TEST(RasterizerTest, TeardownNoSurface) {
 TEST(RasterizerTest, presentationTimeSetWhenVsyncTargetInFuture) {
   GTEST_SKIP() << "eglPresentationTime is disabled due to "
                   "https://github.com/flutter/flutter/issues/112503";
+#if false
   std::string test_name =
       ::testing::UnitTest::GetInstance()->current_test_info()->name();
   ThreadHost thread_host("io.flutter.test." + test_name + ".",
-                         ThreadHost::Type::Platform | ThreadHost::Type::RASTER |
-                             ThreadHost::Type::IO | ThreadHost::Type::UI);
+                         ThreadHost::Type::kPlatform | ThreadHost::Type::kRaster |
+                             ThreadHost::Type::kIo | ThreadHost::Type::kUi);
   TaskRunners task_runners("test", thread_host.platform_thread->GetTaskRunner(),
                            thread_host.raster_thread->GetTaskRunner(),
                            thread_host.ui_thread->GetTaskRunner(),
@@ -999,7 +1259,7 @@ TEST(RasterizerTest, presentationTimeSetWhenVsyncTargetInFuture) {
         return std::make_unique<SurfaceFrame>(
             /*surface=*/nullptr, framebuffer_info,
             /*submit_callback=*/
-            [&](const SurfaceFrame& frame, SkCanvas*) {
+            [&](const SurfaceFrame& frame, DlCanvas*) {
               const auto pres_time = *frame.submit_info().presentation_time;
               const auto diff = pres_time - first_timestamp;
               int num_frames_submitted = frames_submitted++;
@@ -1017,22 +1277,23 @@ TEST(RasterizerTest, presentationTimeSetWhenVsyncTargetInFuture) {
 
   thread_host.raster_thread->GetTaskRunner()->PostTask([&] {
     rasterizer->Setup(std::move(surface));
-    auto pipeline = std::make_shared<LayerTreePipeline>(/*depth=*/10);
+    auto pipeline = std::make_shared<FramePipeline>(/*depth=*/10);
     for (int i = 0; i < 2; i++) {
-      auto layer_tree =
-          std::make_shared<LayerTree>(/*frame_size=*/SkISize(),
-                                      /*device_pixel_ratio=*/2.0f);
-      auto layer_tree_item = std::make_unique<LayerTreeItem>(
-          std::move(layer_tree), CreateFinishedBuildRecorder(timestamps[i]));
+      auto layer_tree = std::make_unique<LayerTree>(
+          /*config=*/LayerTree::Config(), /*frame_size=*/SkISize());
+      auto layer_tree_item = std::make_unique<FrameItem>(
+          SingleLayerTreeList(kImplicitViewId, std::move(layer_tree),
+                             kDevicePixelRatio),
+          CreateFinishedBuildRecorder(timestamps[i]));
       PipelineProduceResult result =
           pipeline->Produce().Complete(std::move(layer_tree_item));
       EXPECT_TRUE(result.success);
       EXPECT_EQ(result.is_first_item, i == 0);
     }
-    auto no_discard = [](LayerTree&) { return false; };
     // Although we only call 'Rasterizer::Draw' once, it will be called twice
     // finally because there are two items in the pipeline.
-    rasterizer->Draw(pipeline, no_discard);
+    ON_CALL(delegate, ShouldDiscardLayerTree).WillByDefault(Return(false));
+    rasterizer->Draw(pipeline);
   });
 
   submit_latch.Wait();
@@ -1041,16 +1302,18 @@ TEST(RasterizerTest, presentationTimeSetWhenVsyncTargetInFuture) {
     latch.Signal();
   });
   latch.Wait();
+#endif  // false
 }
 
 TEST(RasterizerTest, presentationTimeNotSetWhenVsyncTargetInPast) {
   GTEST_SKIP() << "eglPresentationTime is disabled due to "
                   "https://github.com/flutter/flutter/issues/112503";
+#if false
   std::string test_name =
       ::testing::UnitTest::GetInstance()->current_test_info()->name();
   ThreadHost thread_host("io.flutter.test." + test_name + ".",
-                         ThreadHost::Type::Platform | ThreadHost::Type::RASTER |
-                             ThreadHost::Type::IO | ThreadHost::Type::UI);
+                         ThreadHost::Type::kPlatform | ThreadHost::Type::kRaster |
+                             ThreadHost::Type::kIo | ThreadHost::Type::kUi);
   TaskRunners task_runners("test", thread_host.platform_thread->GetTaskRunner(),
                            thread_host.raster_thread->GetTaskRunner(),
                            thread_host.ui_thread->GetTaskRunner(),
@@ -1082,7 +1345,7 @@ TEST(RasterizerTest, presentationTimeNotSetWhenVsyncTargetInPast) {
         return std::make_unique<SurfaceFrame>(
             /*surface=*/nullptr, framebuffer_info,
             /*submit_callback=*/
-            [&](const SurfaceFrame& frame, SkCanvas*) {
+            [&](const SurfaceFrame& frame, DlCanvas*) {
               const std::optional<fml::TimePoint> pres_time =
                   frame.submit_info().presentation_time;
               EXPECT_EQ(pres_time, std::nullopt);
@@ -1098,17 +1361,19 @@ TEST(RasterizerTest, presentationTimeNotSetWhenVsyncTargetInPast) {
 
   thread_host.raster_thread->GetTaskRunner()->PostTask([&] {
     rasterizer->Setup(std::move(surface));
-    auto pipeline = std::make_shared<LayerTreePipeline>(/*depth=*/10);
-    auto layer_tree = std::make_shared<LayerTree>(/*frame_size=*/SkISize(),
-                                                  /*device_pixel_ratio=*/2.0f);
-    auto layer_tree_item = std::make_unique<LayerTreeItem>(
-        std::move(layer_tree), CreateFinishedBuildRecorder(first_timestamp));
+    auto pipeline = std::make_shared<FramePipeline>(/*depth=*/10);
+    auto layer_tree = std::make_unique<LayerTree>(
+        /*config=*/LayerTree::Config(), /*frame_size=*/SkISize());
+    auto layer_tree_item = std::make_unique<FrameItem>(
+        SingleLayerTreeList(kImplicitViewId, std::move(layer_tree),
+                           kDevicePixelRatio),
+        CreateFinishedBuildRecorder(first_timestamp));
     PipelineProduceResult result =
         pipeline->Produce().Complete(std::move(layer_tree_item));
     EXPECT_TRUE(result.success);
     EXPECT_EQ(result.is_first_item, true);
-    auto no_discard = [](LayerTree&) { return false; };
-    rasterizer->Draw(pipeline, no_discard);
+    ON_CALL(delegate, ShouldDiscardLayerTree).WillByDefault(Return(false));
+    rasterizer->Draw(pipeline);
   });
 
   submit_latch.Wait();
@@ -1117,6 +1382,7 @@ TEST(RasterizerTest, presentationTimeNotSetWhenVsyncTargetInPast) {
     latch.Signal();
   });
   latch.Wait();
+#endif  // false
 }
 
 }  // namespace flutter
diff --git a/shell/common/resource_cache_limit_calculator.cc b/shell/common/resource_cache_limit_calculator.cc
index 52378c17cfb04a7ea001115d2631c39ec6aadcad..8b13ee28bd5f45400a29512df86c333fd17a607e 100644
--- a/shell/common/resource_cache_limit_calculator.cc
+++ b/shell/common/resource_cache_limit_calculator.cc
@@ -12,7 +12,7 @@ size_t ResourceCacheLimitCalculator::GetResourceCacheMaxBytes() {
                                    ? max_bytes_threshold_
                                    : std::numeric_limits<size_t>::max();
   std::vector<fml::WeakPtr<ResourceCacheLimitItem>> live_items;
-  for (auto item : items_) {
+  for (const auto& item : items_) {
     if (item) {
       live_items.push_back(item);
       max_bytes += item->GetResourceCacheLimit();
diff --git a/shell/common/resource_cache_limit_calculator.h b/shell/common/resource_cache_limit_calculator.h
index cb47727ec4eea2de3516e0be5d5c874e38cabcb2..27965475baa0a04a49a4b4c84a9366dc628b54ed 100644
--- a/shell/common/resource_cache_limit_calculator.h
+++ b/shell/common/resource_cache_limit_calculator.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_COMMON_RESOURCE_CACHE_LIMIT_CALCULATOR_
-#define FLUTTER_SHELL_COMMON_RESOURCE_CACHE_LIMIT_CALCULATOR_
+#ifndef FLUTTER_SHELL_COMMON_RESOURCE_CACHE_LIMIT_CALCULATOR_H_
+#define FLUTTER_SHELL_COMMON_RESOURCE_CACHE_LIMIT_CALCULATOR_H_
 
 #include <cstdint>
 #include <unordered_map>
@@ -24,13 +24,14 @@ class ResourceCacheLimitItem {
 
 class ResourceCacheLimitCalculator {
  public:
-  ResourceCacheLimitCalculator(size_t max_bytes_threshold)
+  explicit ResourceCacheLimitCalculator(size_t max_bytes_threshold)
       : max_bytes_threshold_(max_bytes_threshold) {}
 
   ~ResourceCacheLimitCalculator() = default;
 
   // This will be called on the platform thread.
-  void AddResourceCacheLimitItem(fml::WeakPtr<ResourceCacheLimitItem> item) {
+  void AddResourceCacheLimitItem(
+      const fml::WeakPtr<ResourceCacheLimitItem>& item) {
     items_.push_back(item);
   }
 
@@ -45,4 +46,4 @@ class ResourceCacheLimitCalculator {
 };
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_COMMON_RESOURCE_CACHE_LIMIT_CALCULATOR_
+#endif  // FLUTTER_SHELL_COMMON_RESOURCE_CACHE_LIMIT_CALCULATOR_H_
diff --git a/shell/common/run_configuration.cc b/shell/common/run_configuration.cc
index 964d5d6c15fe64119bb04f33f9d4d91cfdfe60c5..759fe757e3bd56fe6c128368b680cbd0ec9e2ce1 100644
--- a/shell/common/run_configuration.cc
+++ b/shell/common/run_configuration.cc
@@ -12,12 +12,14 @@
 #include "flutter/fml/file.h"
 #include "flutter/fml/unique_fd.h"
 #include "flutter/runtime/dart_vm.h"
+#include "flutter/runtime/isolate_configuration.h"
 
 namespace flutter {
 
 RunConfiguration RunConfiguration::InferFromSettings(
     const Settings& settings,
-    const fml::RefPtr<fml::TaskRunner>& io_worker) {
+    const fml::RefPtr<fml::TaskRunner>& io_worker,
+    IsolateLaunchType launch_type) {
   auto asset_manager = std::make_shared<AssetManager>();
 
   if (fml::UniqueFD::traits_type::IsValid(settings.assets_dir)) {
@@ -31,7 +33,7 @@ RunConfiguration RunConfiguration::InferFromSettings(
       true));
 
   return {IsolateConfiguration::InferFromSettings(settings, asset_manager,
-                                                  io_worker),
+                                                  io_worker, launch_type),
           asset_manager};
 }
 
diff --git a/shell/common/run_configuration.h b/shell/common/run_configuration.h
index c1efeec34d8caa41b90d84d3dd75ebb1d2663373..2c327b7af04a0a38f7426a91aaf368f2004696b8 100644
--- a/shell/common/run_configuration.h
+++ b/shell/common/run_configuration.h
@@ -35,7 +35,7 @@ class RunConfiguration {
   ///             will attempt to look for the VM and isolate snapshots in the
   ///             assets directory (must be specified in settings). In AOT mode,
   ///             it will attempt to look for known snapshot symbols in the
-  ///             currently currently loaded process. The entrypoint defaults to
+  ///             currently loaded process. The entrypoint defaults to
   ///             the "main" method in the root library.
   ///
   /// @param[in]  settings   The settings object used to look for the various
@@ -51,13 +51,16 @@ class RunConfiguration {
   ///                        serial worker is kept alive for the lifetime of the
   ///                        shell associated with the engine that this run
   ///                        configuration is given to.
+  /// @param[in]  launch_type Whether to launch the new isolate into an existing
+  ///                         group or a new one.
   ///
   /// @return     A run configuration. Depending on the completeness of the
   ///             settings, This object may potentially be invalid.
   ///
   static RunConfiguration InferFromSettings(
       const Settings& settings,
-      const fml::RefPtr<fml::TaskRunner>& io_worker = nullptr);
+      const fml::RefPtr<fml::TaskRunner>& io_worker = nullptr,
+      IsolateLaunchType launch_type = IsolateLaunchType::kNewGroup);
 
   //----------------------------------------------------------------------------
   /// @brief      Creates a run configuration with only an isolate
diff --git a/shell/common/serialization_callbacks.cc b/shell/common/serialization_callbacks.cc
index 5a29b3d9cf8ab349d7649947e1b74a1da8af5399..ce3e5356f00951efee02be2447a71a976b962d45 100644
--- a/shell/common/serialization_callbacks.cc
+++ b/shell/common/serialization_callbacks.cc
@@ -3,13 +3,11 @@
 // found in the LICENSE file.
 
 #include "flutter/fml/logging.h"
-#include "include/core/SkColorSpace.h"
-#include "include/core/SkImage.h"
-#include "include/core/SkImageInfo.h"
-#include "include/core/SkPicture.h"
-#include "include/core/SkSerialProcs.h"
-#include "include/core/SkStream.h"
-#include "include/core/SkTypeface.h"
+#include "third_party/skia/include/core/SkColorSpace.h"
+#include "third_party/skia/include/core/SkImage.h"
+#include "third_party/skia/include/core/SkImageInfo.h"
+#include "third_party/skia/include/core/SkStream.h"
+#include "third_party/skia/include/core/SkTypeface.h"
 
 namespace flutter {
 
@@ -24,7 +22,7 @@ sk_sp<SkData> SerializeTypefaceWithData(SkTypeface* typeface, void* ctx) {
 sk_sp<SkTypeface> DeserializeTypefaceWithoutData(const void* data,
                                                  size_t length,
                                                  void* ctx) {
-  return SkTypeface::MakeDefault();
+  return nullptr;
 }
 
 struct ImageMetaData {
@@ -36,7 +34,7 @@ struct ImageMetaData {
 } __attribute__((packed));
 
 sk_sp<SkData> SerializeImageWithoutData(SkImage* image, void* ctx) {
-  auto info = image->imageInfo();
+  const auto& info = image->imageInfo();
   SkDynamicMemoryWStream stream;
 
   ImageMetaData metadata = {info.width(), info.height(),
@@ -75,7 +73,7 @@ sk_sp<SkImage> DeserializeImageWithoutData(const void* data,
       SkData::MakeUninitialized(image_size.width() * image_size.height() * 4);
   memset(image_data->writable_data(), 0x0f, image_data->size());
   sk_sp<SkImage> image =
-      SkImage::MakeRasterData(info, image_data, image_size.width() * 4);
+      SkImages::RasterFromData(info, image_data, image_size.width() * 4);
 
   return image;
 };
diff --git a/shell/common/serialization_callbacks.h b/shell/common/serialization_callbacks.h
index fa148094b72b1c046ea1366d580ee39ec8b5656e..66d7a549d82c3957bf54611ac25646e5a662613e 100644
--- a/shell/common/serialization_callbacks.h
+++ b/shell/common/serialization_callbacks.h
@@ -6,9 +6,8 @@
 #define FLUTTER_SHELL_COMMON_SERIALIZATION_CALLBACKS_H_
 
 #include "flutter/fml/logging.h"
-#include "include/core/SkImage.h"
-#include "include/core/SkPicture.h"
-#include "include/core/SkTypeface.h"
+#include "third_party/skia/include/core/SkImage.h"
+#include "third_party/skia/include/core/SkTypeface.h"
 
 namespace flutter {
 
diff --git a/shell/common/shell.cc b/shell/common/shell.cc
index b0bf51ae5d5cc87e53aeb2f9544b01fc6a8e5bd0..e7fda7cb331394e3eb9ac7c5018e6a735207956d 100644
--- a/shell/common/shell.cc
+++ b/shell/common/shell.cc
@@ -12,6 +12,7 @@
 #include <vector>
 
 #include "flutter/assets/directory_asset_bundle.h"
+#include "flutter/common/constants.h"
 #include "flutter/common/graphics/persistent_cache.h"
 #include "flutter/fml/base32.h"
 #include "flutter/fml/file.h"
@@ -23,15 +24,24 @@
 #include "flutter/fml/paths.h"
 #include "flutter/fml/trace_event.h"
 #include "flutter/runtime/dart_vm.h"
+#include "flutter/shell/common/base64.h"
 #include "flutter/shell/common/engine.h"
 #include "flutter/shell/common/skia_event_tracer_impl.h"
 #include "flutter/shell/common/switches.h"
 #include "flutter/shell/common/vsync_waiter.h"
+#include "impeller/runtime_stage/runtime_stage.h"
 #include "rapidjson/stringbuffer.h"
 #include "rapidjson/writer.h"
 #include "third_party/dart/runtime/include/dart_tools_api.h"
+#include "third_party/skia/include/codec/SkBmpDecoder.h"
+#include "third_party/skia/include/codec/SkCodec.h"
+#include "third_party/skia/include/codec/SkGifDecoder.h"
+#include "third_party/skia/include/codec/SkIcoDecoder.h"
+#include "third_party/skia/include/codec/SkJpegDecoder.h"
+#include "third_party/skia/include/codec/SkPngDecoder.h"
+#include "third_party/skia/include/codec/SkWbmpDecoder.h"
+#include "third_party/skia/include/codec/SkWebpDecoder.h"
 #include "third_party/skia/include/core/SkGraphics.h"
-#include "third_party/skia/include/utils/SkBase64.h"
 #include "third_party/tonic/common/log.h"
 
 namespace flutter {
@@ -55,19 +65,37 @@ std::unique_ptr<Engine> CreateEngine(
     const fml::WeakPtr<IOManager>& io_manager,
     const fml::RefPtr<SkiaUnrefQueue>& unref_queue,
     const fml::TaskRunnerAffineWeakPtr<SnapshotDelegate>& snapshot_delegate,
-    const std::shared_ptr<VolatilePathTracker>& volatile_path_tracker) {
-  return std::make_unique<Engine>(delegate,             //
-                                  dispatcher_maker,     //
-                                  vm,                   //
-                                  isolate_snapshot,     //
-                                  task_runners,         //
-                                  platform_data,        //
-                                  settings,             //
-                                  std::move(animator),  //
-                                  io_manager,           //
-                                  unref_queue,          //
-                                  snapshot_delegate,    //
-                                  volatile_path_tracker);
+    const std::shared_ptr<VolatilePathTracker>& volatile_path_tracker,
+    const std::shared_ptr<fml::SyncSwitch>& gpu_disabled_switch,
+    impeller::RuntimeStageBackend runtime_stage_backend) {
+  return std::make_unique<Engine>(delegate,               //
+                                  dispatcher_maker,       //
+                                  vm,                     //
+                                  isolate_snapshot,       //
+                                  task_runners,           //
+                                  platform_data,          //
+                                  settings,               //
+                                  std::move(animator),    //
+                                  io_manager,             //
+                                  unref_queue,            //
+                                  snapshot_delegate,      //
+                                  volatile_path_tracker,  //
+                                  gpu_disabled_switch,    //
+                                  runtime_stage_backend);
+}
+
+void RegisterCodecsWithSkia() {
+  // These are in the order they will be attempted to be decoded from.
+  // If we have data to back it up, we can order these by "frequency used in
+  // the wild" for a very small performance bump, but for now we mirror the
+  // order Skia had them in.
+  SkCodecs::Register(SkPngDecoder::Decoder());
+  SkCodecs::Register(SkJpegDecoder::Decoder());
+  SkCodecs::Register(SkWebpDecoder::Decoder());
+  SkCodecs::Register(SkGifDecoder::Decoder());
+  SkCodecs::Register(SkBmpDecoder::Decoder());
+  SkCodecs::Register(SkWbmpDecoder::Decoder());
+  SkCodecs::Register(SkIcoDecoder::Decoder());
 }
 
 // Though there can be multiple shells, some settings apply to all components in
@@ -77,12 +105,12 @@ std::unique_ptr<Engine> CreateEngine(
 // that cause shell initialization failures will still lead to some of their
 // settings being applied.
 void PerformInitializationTasks(Settings& settings) {
-/*   {
-    fml::LogSettings log_settings;
-    log_settings.min_log_level =
-        settings.verbose_logging ? fml::LOG_INFO : fml::LOG_ERROR;
-    fml::SetLogSettings(log_settings);
-  } */
+  /*   {
+      fml::LogSettings log_settings;
+      log_settings.min_log_level =
+          settings.verbose_logging ? fml::kLogInfo : fml::kLogError;
+      fml::SetLogSettings(log_settings);
+    } */
   static std::once_flag gShellSettingsInitialization = {};
   std::call_once(gShellSettingsInitialization, [&settings] {
     tonic::SetLogHandler(
@@ -98,7 +126,10 @@ void PerformInitializationTasks(Settings& settings) {
 
     if (!settings.skia_deterministic_rendering_on_cpu) {
       SkGraphics::Init();
+    } else {
+      FML_DLOG(INFO) << "Skia deterministic rendering is enabled.";
     }
+    RegisterCodecsWithSkia();
 
     if (settings.icu_initialization_required) {
       if (!settings.icu_data_path.empty()) {
@@ -110,52 +141,74 @@ void PerformInitializationTasks(Settings& settings) {
       }
     }
   });
+
   PersistentCache::SetCacheSkSL(settings.cache_sksl);
 }
 
 }  // namespace
 
-std::unique_ptr<Shell> Shell::Create(
-    const PlatformData& platform_data,
-    const TaskRunners& task_runners,
-    Settings settings,
-    const Shell::CreateCallback<PlatformView>& on_create_platform_view,
-    const Shell::CreateCallback<Rasterizer>& on_create_rasterizer,
-    bool is_gpu_disabled) {
-  // This must come first as it initializes tracing.
-  PerformInitializationTasks(settings);
-
-  TRACE_EVENT0("flutter", "Shell::Create");
-
+std::pair<DartVMRef, fml::RefPtr<const DartSnapshot>>
+Shell::InferVmInitDataFromSettings(Settings& settings) {
   // Always use the `vm_snapshot` and `isolate_snapshot` provided by the
   // settings to launch the VM.  If the VM is already running, the snapshot
   // arguments are ignored.
   auto vm_snapshot = DartSnapshot::VMSnapshotFromSettings(settings);
   auto isolate_snapshot = DartSnapshot::IsolateSnapshotFromSettings(settings);
   auto vm = DartVMRef::Create(settings, vm_snapshot, isolate_snapshot);
-  FML_CHECK(vm) << "Must be able to initialize the VM.";
 
   // If the settings did not specify an `isolate_snapshot`, fall back to the
   // one the VM was launched with.
   if (!isolate_snapshot) {
     isolate_snapshot = vm->GetVMData()->GetIsolateSnapshot();
   }
+  return {std::move(vm), isolate_snapshot};
+}
+
+std::unique_ptr<Shell> Shell::Create(
+    const PlatformData& platform_data,
+    const TaskRunners& task_runners,
+    Settings settings,
+    const Shell::CreateCallback<PlatformView>& on_create_platform_view,
+    const Shell::CreateCallback<Rasterizer>& on_create_rasterizer,
+    bool is_gpu_disabled) {
+  // This must come first as it initializes tracing.
+  PerformInitializationTasks(settings);
+
+  TRACE_EVENT0("flutter", "Shell::Create");
+
+  auto [vm, isolate_snapshot] = InferVmInitDataFromSettings(settings);
   auto resource_cache_limit_calculator =
       std::make_shared<ResourceCacheLimitCalculator>(
           settings.resource_cache_max_bytes_threshold);
-  return CreateWithSnapshot(platform_data,                    //
-                            task_runners,                     //
-                            /*parent_merger=*/nullptr,        //
-                            /*parent_io_manager=*/nullptr,    //
-                            resource_cache_limit_calculator,  //
-                            settings,                         //
-                            std::move(vm),                    //
-                            std::move(isolate_snapshot),      //
-                            on_create_platform_view,          //
-                            on_create_rasterizer,             //
+
+  return CreateWithSnapshot(platform_data,                     //
+                            task_runners,                      //
+                            /*parent_thread_merger=*/nullptr,  //
+                            /*parent_io_manager=*/nullptr,     //
+                            resource_cache_limit_calculator,   //
+                            settings,                          //
+                            std::move(vm),                     //
+                            std::move(isolate_snapshot),       //
+                            on_create_platform_view,           //
+                            on_create_rasterizer,              //
                             CreateEngine, is_gpu_disabled);
 }
 
+static impeller::RuntimeStageBackend DetermineRuntimeStageBackend(
+    const std::shared_ptr<impeller::Context>& impeller_context) {
+  if (!impeller_context) {
+    return impeller::RuntimeStageBackend::kSkSL;
+  }
+  switch (impeller_context->GetBackendType()) {
+    case impeller::Context::BackendType::kMetal:
+      return impeller::RuntimeStageBackend::kMetal;
+    case impeller::Context::BackendType::kOpenGLES:
+      return impeller::RuntimeStageBackend::kOpenGLES;
+    case impeller::Context::BackendType::kVulkan:
+      return impeller::RuntimeStageBackend::kVulkan;
+  }
+}
+
 std::unique_ptr<Shell> Shell::CreateShellOnPlatformThread(
     DartVMRef vm,
     fml::RefPtr<fml::RasterThreadMerger> parent_merger,
@@ -174,6 +227,7 @@ std::unique_ptr<Shell> Shell::CreateShellOnPlatformThread(
     FML_LOG(ERROR) << "Task runners to run the shell were invalid.";
     return nullptr;
   }
+  FML_LOG(INFO) << "CreateShellOnPlatformThread";
 
   auto shell = std::unique_ptr<Shell>(
       new Shell(std::move(vm), task_runners, std::move(parent_merger),
@@ -183,6 +237,12 @@ std::unique_ptr<Shell> Shell::CreateShellOnPlatformThread(
                     !settings.skia_deterministic_rendering_on_cpu),
                 is_gpu_disabled));
 
+  // Create the platform view on the platform thread (this thread).
+  auto platform_view = on_create_platform_view(*shell.get());
+  if (!platform_view || !platform_view->GetWeakPtr()) {
+    return nullptr;
+  }
+
   // Create the rasterizer on the raster thread.
   std::promise<std::unique_ptr<Rasterizer>> rasterizer_promise;
   auto rasterizer_future = rasterizer_promise.get_future();
@@ -190,23 +250,20 @@ std::unique_ptr<Shell> Shell::CreateShellOnPlatformThread(
       snapshot_delegate_promise;
   auto snapshot_delegate_future = snapshot_delegate_promise.get_future();
   fml::TaskRunner::RunNowOrPostTask(
-      task_runners.GetRasterTaskRunner(), [&rasterizer_promise,  //
-                                           &snapshot_delegate_promise,
-                                           on_create_rasterizer,  //
-                                           shell = shell.get()    //
+      task_runners.GetRasterTaskRunner(),
+      [&rasterizer_promise,  //
+       &snapshot_delegate_promise,
+       on_create_rasterizer,                                   //
+       shell = shell.get(),                                    //
+       impeller_context = platform_view->GetImpellerContext()  //
   ]() {
         TRACE_EVENT0("flutter", "ShellSetupGPUSubsystem");
         std::unique_ptr<Rasterizer> rasterizer(on_create_rasterizer(*shell));
+        rasterizer->SetImpellerContext(impeller_context);
         snapshot_delegate_promise.set_value(rasterizer->GetSnapshotDelegate());
         rasterizer_promise.set_value(std::move(rasterizer));
       });
 
-  // Create the platform view on the platform thread (this thread).
-  auto platform_view = on_create_platform_view(*shell.get());
-  if (!platform_view || !platform_view->GetWeakPtr()) {
-    return nullptr;
-  }
-
   // Ask the platform view for the vsync waiter. This will be used by the engine
   // to create the animator.
   auto vsync_waiter = platform_view->CreateVSyncWaiter();
@@ -274,7 +331,9 @@ std::unique_ptr<Shell> Shell::CreateShellOnPlatformThread(
                          &weak_io_manager_future,                         //
                          &snapshot_delegate_future,                       //
                          &unref_queue_future,                             //
-                         &on_create_engine]() mutable {
+                         &on_create_engine,
+                         runtime_stage_backend = DetermineRuntimeStageBackend(
+                             platform_view->GetImpellerContext())]() mutable {
         TRACE_EVENT0("flutter", "ShellSetupUISubsystem");
         const auto& task_runners = shell->GetTaskRunners();
 
@@ -283,27 +342,31 @@ std::unique_ptr<Shell> Shell::CreateShellOnPlatformThread(
         auto animator = std::make_unique<Animator>(*shell, task_runners,
                                                    std::move(vsync_waiter));
 
-        engine_promise.set_value(
-            on_create_engine(*shell,                          //
-                             dispatcher_maker,                //
-                             *shell->GetDartVM(),             //
-                             std::move(isolate_snapshot),     //
-                             task_runners,                    //
-                             platform_data,                   //
-                             shell->GetSettings(),            //
-                             std::move(animator),             //
-                             weak_io_manager_future.get(),    //
-                             unref_queue_future.get(),        //
-                             snapshot_delegate_future.get(),  //
-                             shell->volatile_path_tracker_));
+        engine_promise.set_value(on_create_engine(
+            *shell,                               //
+            dispatcher_maker,                     //
+            *shell->GetDartVM(),                  //
+            std::move(isolate_snapshot),          //
+            task_runners,                         //
+            platform_data,                        //
+            shell->GetSettings(),                 //
+            std::move(animator),                  //
+            weak_io_manager_future.get(),         //
+            unref_queue_future.get(),             //
+            snapshot_delegate_future.get(),       //
+            shell->volatile_path_tracker_,        //
+            shell->is_gpu_disabled_sync_switch_,  //
+            runtime_stage_backend                 //
+            ));
       }));
-
+  FML_LOG(INFO) << "CreateShellOnPlatformThread Setup";
 
   if (!shell->Setup(std::move(platform_view),  //
                     engine_future.get(),       //
                     rasterizer_future.get(),   //
                     io_manager_future.get())   //
   ) {
+    FML_LOG(ERROR) << "CreateShellOnPlatformThread Setup nullptr";
     return nullptr;
   }
 
@@ -334,6 +397,7 @@ std::unique_ptr<Shell> Shell::CreateWithSnapshot(
   if (!task_runners.IsValid() || !callbacks_valid) {
     return nullptr;
   }
+
   fml::AutoResetWaitableEvent latch;
   std::unique_ptr<Shell> shell;
   auto platform_task_runner = task_runners.GetPlatformTaskRunner();
@@ -387,6 +451,16 @@ Shell::Shell(DartVMRef vm,
       volatile_path_tracker_(std::move(volatile_path_tracker)),
       weak_factory_gpu_(nullptr),
       weak_factory_(this) {
+  FML_CHECK(!settings.enable_software_rendering || !settings.enable_impeller)
+      << "Software rendering is incompatible with Impeller.";
+  if (!settings.enable_impeller && settings.warn_on_impeller_opt_out) {
+    FML_LOG(IMPORTANT)
+        << "[Action Required] The application opted out of Impeller by either "
+           "using the --no-enable-impeller flag or FLTEnableImpeller=false "
+           "plist flag. This option is going to go away in an upcoming Flutter "
+           "release. Remove the explicit opt-out. If you need to opt-out, "
+           "report a bug describing the issue.";
+  }
   FML_CHECK(vm_) << "Must have access to VM to create a shell.";
   FML_DCHECK(task_runners_.IsValid());
   FML_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
@@ -459,7 +533,16 @@ Shell::~Shell() {
 
   vm_->GetServiceProtocol()->RemoveHandler(this);
 
-  fml::AutoResetWaitableEvent ui_latch, gpu_latch, platform_latch, io_latch;
+  fml::AutoResetWaitableEvent platiso_latch, ui_latch, gpu_latch,
+      platform_latch, io_latch;
+
+  fml::TaskRunner::RunNowOrPostTask(
+      task_runners_.GetPlatformTaskRunner(),
+      fml::MakeCopyable([this, &platiso_latch]() mutable {
+        engine_->ShutdownPlatformIsolates();
+        platiso_latch.Signal();
+      }));
+  platiso_latch.Wait();
 
   fml::TaskRunner::RunNowOrPostTask(
       task_runners_.GetUITaskRunner(),
@@ -533,8 +616,9 @@ std::unique_ptr<Shell> Shell::Spawn(
           const fml::WeakPtr<IOManager>& io_manager,
           const fml::RefPtr<SkiaUnrefQueue>& unref_queue,
           fml::TaskRunnerAffineWeakPtr<SnapshotDelegate> snapshot_delegate,
-          const std::shared_ptr<VolatilePathTracker>& volatile_path_tracker) {
-
+          const std::shared_ptr<VolatilePathTracker>& volatile_path_tracker,
+          const std::shared_ptr<fml::SyncSwitch>& is_gpu_disabled_sync_switch,
+          impeller::RuntimeStageBackend runtime_stage_backend) {
         return engine->Spawn(
             /*delegate=*/delegate,
             /*dispatcher_maker=*/dispatcher_maker,
@@ -542,7 +626,8 @@ std::unique_ptr<Shell> Shell::Spawn(
             /*animator=*/std::move(animator),
             /*initial_route=*/initial_route,
             /*io_manager=*/io_manager,
-            /*snapshot_delegate=*/std::move(snapshot_delegate));
+            /*snapshot_delegate=*/std::move(snapshot_delegate),
+            /*gpu_disabled_switch=*/is_gpu_disabled_sync_switch);
       },
       is_gpu_disabled);
   result->RunEngine(std::move(run_configuration));
@@ -584,11 +669,9 @@ void Shell::RunEngine(
       return;
     }
     platform_runner->PostTask(
-        [result_callback, run_result]() { 
-        result_callback(run_result); 
-        });
+        [result_callback, run_result]() { result_callback(run_result); });
   };
-  FML_DCHECK(is_setup_);
+  FML_DCHECK(is_set_up_);
   FML_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
 
   fml::TaskRunner::RunNowOrPostTask(
@@ -612,7 +695,7 @@ void Shell::RunEngine(
 }
 
 std::optional<DartErrorCode> Shell::GetUIIsolateLastError() const {
-  FML_DCHECK(is_setup_);
+  FML_DCHECK(is_set_up_);
   FML_DCHECK(task_runners_.GetUITaskRunner()->RunsTasksOnCurrentThread());
 
   if (!weak_engine_) {
@@ -632,7 +715,7 @@ std::optional<DartErrorCode> Shell::GetUIIsolateLastError() const {
 }
 
 bool Shell::EngineHasLivePorts() const {
-  FML_DCHECK(is_setup_);
+  FML_DCHECK(is_set_up_);
   FML_DCHECK(task_runners_.GetUITaskRunner()->RunsTasksOnCurrentThread());
 
   if (!weak_engine_) {
@@ -643,14 +726,14 @@ bool Shell::EngineHasLivePorts() const {
 }
 
 bool Shell::IsSetup() const {
-  return is_setup_;
+  return is_set_up_;
 }
 
 bool Shell::Setup(std::unique_ptr<PlatformView> platform_view,
                   std::unique_ptr<Engine> engine,
                   std::unique_ptr<Rasterizer> rasterizer,
                   const std::shared_ptr<ShellIOManager>& io_manager) {
-  if (is_setup_) {
+  if (is_set_up_) {
     return false;
   }
 
@@ -683,6 +766,7 @@ bool Shell::Setup(std::unique_ptr<PlatformView> platform_view,
   weak_rasterizer_ = rasterizer_->GetWeakPtr();
   weak_platform_view_ = platform_view_->GetWeakPtr();
 
+  engine_->AddView(kFlutterImplicitViewId, ViewportMetrics{});
   // Setup the time-consuming default font manager right after engine created.
   if (!settings_.prefetched_default_font_manager) {
     fml::TaskRunner::RunNowOrPostTask(task_runners_.GetUITaskRunner(),
@@ -693,7 +777,7 @@ bool Shell::Setup(std::unique_ptr<PlatformView> platform_view,
                                       });
   }
 
-  is_setup_ = true;
+  is_set_up_ = true;
 
   PersistentCache::GetCacheForProcess()->AddWorkerTaskRunner(
       task_runners_.GetIOTaskRunner());
@@ -722,22 +806,22 @@ const fml::RefPtr<fml::RasterThreadMerger> Shell::GetParentRasterThreadMerger()
 }
 
 fml::TaskRunnerAffineWeakPtr<Rasterizer> Shell::GetRasterizer() const {
-  FML_DCHECK(is_setup_);
+  FML_DCHECK(is_set_up_);
   return weak_rasterizer_;
 }
 
 fml::WeakPtr<Engine> Shell::GetEngine() {
-  FML_DCHECK(is_setup_);
+  FML_DCHECK(is_set_up_);
   return weak_engine_;
 }
 
 fml::WeakPtr<PlatformView> Shell::GetPlatformView() {
-  FML_DCHECK(is_setup_);
+  FML_DCHECK(is_set_up_);
   return weak_platform_view_;
 }
 
 fml::WeakPtr<ShellIOManager> Shell::GetIOManager() {
-  FML_DCHECK(is_setup_);
+  FML_DCHECK(is_set_up_);
   return io_manager_->GetWeakPtr();
 }
 
@@ -747,7 +831,8 @@ DartVM* Shell::GetDartVM() {
 
 // |PlatformView::Delegate|
 void Shell::OnPlatformViewCreated(std::unique_ptr<Surface> surface) {
-  FML_DCHECK(is_setup_);
+  TRACE_EVENT0("flutter", "Shell::OnPlatformViewCreated");
+  FML_DCHECK(is_set_up_);
   FML_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
 
   // Prevent any request to change the thread configuration for raster and
@@ -774,11 +859,11 @@ void Shell::OnPlatformViewCreated(std::unique_ptr<Surface> surface) {
   const bool should_post_raster_task =
       !task_runners_.GetRasterTaskRunner()->RunsTasksOnCurrentThread();
 
-  fml::AutoResetWaitableEvent latch;
-  auto raster_task =
-      fml::MakeCopyable([&waiting_for_first_frame = waiting_for_first_frame_,
-                         rasterizer = rasterizer_->GetWeakPtr(),  //
-                         surface = std::move(surface)]() mutable {
+  auto raster_task = fml::MakeCopyable(
+      [&waiting_for_first_frame = waiting_for_first_frame_,  //
+       rasterizer = rasterizer_->GetWeakPtr(),               //
+       surface = std::move(surface)                          //
+  ]() mutable {
         if (rasterizer) {
           // Enables the thread merger which may be used by the external view
           // embedder.
@@ -800,8 +885,8 @@ void Shell::OnPlatformViewCreated(std::unique_ptr<Surface> surface) {
   // weak pointer. However, we are preventing the platform view from being
   // collected by using a latch.
   auto* platform_view = platform_view_.get();
-
   FML_DCHECK(platform_view);
+  fml::AutoResetWaitableEvent latch;
 
   auto io_task = [io_manager = io_manager_->GetWeakPtr(), platform_view,
                   ui_task_runner = task_runners_.GetUITaskRunner(), ui_task,
@@ -838,7 +923,7 @@ void Shell::OnPlatformViewCreated(std::unique_ptr<Surface> surface) {
 // |PlatformView::Delegate|
 void Shell::OnPlatformViewDestroyed() {
   TRACE_EVENT0("flutter", "Shell::OnPlatformViewDestroyed");
-  FML_DCHECK(is_setup_);
+  FML_DCHECK(is_set_up_);
   FML_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
 
   // Prevent any request to change the thread configuration for raster and
@@ -912,7 +997,7 @@ void Shell::OnPlatformViewDestroyed() {
 // |PlatformView::Delegate|
 void Shell::OnPlatformViewScheduleFrame() {
   TRACE_EVENT0("flutter", "Shell::OnPlatformViewScheduleFrame");
-  FML_DCHECK(is_setup_);
+  FML_DCHECK(is_set_up_);
   FML_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
 
   task_runners_.GetUITaskRunner()->PostTask([engine = engine_->GetWeakPtr()]() {
@@ -923,8 +1008,9 @@ void Shell::OnPlatformViewScheduleFrame() {
 }
 
 // |PlatformView::Delegate|
-void Shell::OnPlatformViewSetViewportMetrics(const ViewportMetrics& metrics) {
-  FML_DCHECK(is_setup_);
+void Shell::OnPlatformViewSetViewportMetrics(int64_t view_id,
+                                             const ViewportMetrics& metrics) {
+  FML_DCHECK(is_set_up_);
   FML_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
 
   if (metrics.device_pixel_ratio <= 0 || metrics.physical_width <= 0 ||
@@ -947,15 +1033,15 @@ void Shell::OnPlatformViewSetViewportMetrics(const ViewportMetrics& metrics) {
       });
 
   task_runners_.GetUITaskRunner()->PostTask(
-      [engine = engine_->GetWeakPtr(), metrics]() {
+      [engine = engine_->GetWeakPtr(), view_id, metrics]() {
         if (engine) {
-          engine->SetViewportMetrics(metrics);
+          engine->SetViewportMetrics(view_id, metrics);
         }
       });
 
   {
     std::scoped_lock<std::mutex> lock(resize_mutex_);
-    expected_frame_size_ =
+    expected_frame_sizes_[view_id] =
         SkISize::Make(metrics.physical_width, metrics.physical_height);
     device_pixel_ratio_ = metrics.device_pixel_ratio;
   }
@@ -964,8 +1050,25 @@ void Shell::OnPlatformViewSetViewportMetrics(const ViewportMetrics& metrics) {
 // |PlatformView::Delegate|
 void Shell::OnPlatformViewDispatchPlatformMessage(
     std::unique_ptr<PlatformMessage> message) {
-  FML_DCHECK(is_setup_);
-  FML_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
+  FML_DCHECK(is_set_up_);
+#if FLUTTER_RUNTIME_MODE == FLUTTER_RUNTIME_MODE_DEBUG
+  if (!task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread()) {
+    std::scoped_lock lock(misbehaving_message_channels_mutex_);
+    auto inserted = misbehaving_message_channels_.insert(message->channel());
+    if (inserted.second) {
+      FML_LOG(ERROR)
+          << "The '" << message->channel()
+          << "' channel sent a message from native to Flutter on a "
+             "non-platform thread. Platform channel messages must be sent on "
+             "the platform thread. Failure to do so may result in data loss or "
+             "crashes, and must be fixed in the plugin or application code "
+             "creating that channel.\n"
+             "See https://docs.flutter.dev/platform-integration/"
+             "platform-channels#channels-and-platform-threading for more "
+             "information.";
+    }
+  }
+#endif  // FLUTTER_RUNTIME_MODE == FLUTTER_RUNTIME_MODE_DEBUG
 
   // The static leak checker gets confused by the use of fml::MakeCopyable.
   // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks)
@@ -980,9 +1083,11 @@ void Shell::OnPlatformViewDispatchPlatformMessage(
 // |PlatformView::Delegate|
 void Shell::OnPlatformViewDispatchPointerDataPacket(
     std::unique_ptr<PointerDataPacket> packet) {
-  TRACE_EVENT0("flutter", "Shell::OnPlatformViewDispatchPointerDataPacket");
+  TRACE_EVENT0_WITH_FLOW_IDS(
+      "flutter", "Shell::OnPlatformViewDispatchPointerDataPacket",
+      /*flow_id_count=*/1, /*flow_ids=*/&next_pointer_flow_id_);
   TRACE_FLOW_BEGIN("flutter", "PointerEvent", next_pointer_flow_id_);
-  FML_DCHECK(is_setup_);
+  FML_DCHECK(is_set_up_);
   FML_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
   task_runners_.GetUITaskRunner()->PostTask(
       fml::MakeCopyable([engine = weak_engine_, packet = std::move(packet),
@@ -995,24 +1100,24 @@ void Shell::OnPlatformViewDispatchPointerDataPacket(
 }
 
 // |PlatformView::Delegate|
-void Shell::OnPlatformViewDispatchSemanticsAction(int32_t id,
+void Shell::OnPlatformViewDispatchSemanticsAction(int32_t node_id,
                                                   SemanticsAction action,
                                                   fml::MallocMapping args) {
-  FML_DCHECK(is_setup_);
+  FML_DCHECK(is_set_up_);
   FML_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
 
   task_runners_.GetUITaskRunner()->PostTask(
-      fml::MakeCopyable([engine = engine_->GetWeakPtr(), id, action,
+      fml::MakeCopyable([engine = engine_->GetWeakPtr(), node_id, action,
                          args = std::move(args)]() mutable {
         if (engine) {
-          engine->DispatchSemanticsAction(id, action, std::move(args));
+          engine->DispatchSemanticsAction(node_id, action, std::move(args));
         }
       }));
 }
 
 // |PlatformView::Delegate|
 void Shell::OnPlatformViewSetSemanticsEnabled(bool enabled) {
-  FML_DCHECK(is_setup_);
+  FML_DCHECK(is_set_up_);
   FML_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
 
   task_runners_.GetUITaskRunner()->PostTask(
@@ -1025,7 +1130,7 @@ void Shell::OnPlatformViewSetSemanticsEnabled(bool enabled) {
 
 // |PlatformView::Delegate|
 void Shell::OnPlatformViewSetAccessibilityFeatures(int32_t flags) {
-  FML_DCHECK(is_setup_);
+  FML_DCHECK(is_set_up_);
   FML_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
 
   task_runners_.GetUITaskRunner()->PostTask(
@@ -1039,7 +1144,7 @@ void Shell::OnPlatformViewSetAccessibilityFeatures(int32_t flags) {
 // |PlatformView::Delegate|
 void Shell::OnPlatformViewRegisterTexture(
     std::shared_ptr<flutter::Texture> texture) {
-  FML_DCHECK(is_setup_);
+  FML_DCHECK(is_set_up_);
   FML_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
 
   task_runners_.GetRasterTaskRunner()->PostTask(
@@ -1054,7 +1159,7 @@ void Shell::OnPlatformViewRegisterTexture(
 
 // |PlatformView::Delegate|
 void Shell::OnPlatformViewUnregisterTexture(int64_t texture_id) {
-  FML_DCHECK(is_setup_);
+  FML_DCHECK(is_set_up_);
   FML_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
 
   task_runners_.GetRasterTaskRunner()->PostTask(
@@ -1069,7 +1174,7 @@ void Shell::OnPlatformViewUnregisterTexture(int64_t texture_id) {
 
 // |PlatformView::Delegate|
 void Shell::OnPlatformViewMarkTextureFrameAvailable(int64_t texture_id) {
-  FML_DCHECK(is_setup_);
+  FML_DCHECK(is_set_up_);
   FML_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
 
   // Tell the rasterizer that one of its textures has a new frame available.
@@ -1100,7 +1205,7 @@ void Shell::OnPlatformViewMarkTextureFrameAvailable(int64_t texture_id) {
 
 // |PlatformView::Delegate|
 void Shell::OnPlatformViewSetNextFrameCallback(const fml::closure& closure) {
-  FML_DCHECK(is_setup_);
+  FML_DCHECK(is_set_up_);
   FML_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
 
   task_runners_.GetRasterTaskRunner()->PostTask(
@@ -1119,7 +1224,7 @@ const Settings& Shell::OnPlatformViewGetSettings() const {
 // |Animator::Delegate|
 void Shell::OnAnimatorBeginFrame(fml::TimePoint frame_target_time,
                                  uint64_t frame_number) {
-  FML_DCHECK(is_setup_);
+  FML_DCHECK(is_set_up_);
   FML_DCHECK(task_runners_.GetUITaskRunner()->RunsTasksOnCurrentThread());
 
   // record the target time for use by rasterizer.
@@ -1134,7 +1239,7 @@ void Shell::OnAnimatorBeginFrame(fml::TimePoint frame_target_time,
 
 // |Animator::Delegate|
 void Shell::OnAnimatorNotifyIdle(fml::TimeDelta deadline) {
-  FML_DCHECK(is_setup_);
+  FML_DCHECK(is_set_up_);
   FML_DCHECK(task_runners_.GetUITaskRunner()->RunsTasksOnCurrentThread());
 
   if (engine_) {
@@ -1145,7 +1250,7 @@ void Shell::OnAnimatorNotifyIdle(fml::TimeDelta deadline) {
 
 void Shell::OnAnimatorUpdateLatestFrameTargetTime(
     fml::TimePoint frame_target_time) {
-  FML_DCHECK(is_setup_);
+  FML_DCHECK(is_set_up_);
 
   // record the target time for use by rasterizer.
   {
@@ -1159,25 +1264,18 @@ void Shell::OnAnimatorUpdateLatestFrameTargetTime(
 }
 
 // |Animator::Delegate|
-void Shell::OnAnimatorDraw(std::shared_ptr<LayerTreePipeline> pipeline) {
-  FML_DCHECK(is_setup_);
-
-  auto discard_callback = [this](flutter::LayerTree& tree) {
-    std::scoped_lock<std::mutex> lock(resize_mutex_);
-    return !expected_frame_size_.isEmpty() &&
-           tree.frame_size() != expected_frame_size_;
-  };
+void Shell::OnAnimatorDraw(std::shared_ptr<FramePipeline> pipeline) {
+  FML_DCHECK(is_set_up_);
 
   task_runners_.GetRasterTaskRunner()->PostTask(fml::MakeCopyable(
       [&waiting_for_first_frame = waiting_for_first_frame_,
        &waiting_for_first_frame_condition = waiting_for_first_frame_condition_,
        rasterizer = rasterizer_->GetWeakPtr(),
-       weak_pipeline = std::weak_ptr<LayerTreePipeline>(pipeline),
-       discard_callback = std::move(discard_callback)]() mutable {
+       weak_pipeline = std::weak_ptr<FramePipeline>(pipeline)]() mutable {
         if (rasterizer) {
-          std::shared_ptr<LayerTreePipeline> pipeline = weak_pipeline.lock();
+          std::shared_ptr<FramePipeline> pipeline = weak_pipeline.lock();
           if (pipeline) {
-            rasterizer->Draw(pipeline, std::move(discard_callback));
+            rasterizer->Draw(pipeline);
           }
 
           if (waiting_for_first_frame.load()) {
@@ -1189,15 +1287,15 @@ void Shell::OnAnimatorDraw(std::shared_ptr<LayerTreePipeline> pipeline) {
 }
 
 // |Animator::Delegate|
-void Shell::OnAnimatorDrawLastLayerTree(
+void Shell::OnAnimatorDrawLastLayerTrees(
     std::unique_ptr<FrameTimingsRecorder> frame_timings_recorder) {
-  FML_DCHECK(is_setup_);
+  FML_DCHECK(is_set_up_);
 
   auto task = fml::MakeCopyable(
       [rasterizer = rasterizer_->GetWeakPtr(),
        frame_timings_recorder = std::move(frame_timings_recorder)]() mutable {
         if (rasterizer) {
-          rasterizer->DrawLastLayerTree(std::move(frame_timings_recorder));
+          rasterizer->DrawLastLayerTrees(std::move(frame_timings_recorder));
         }
       });
 
@@ -1207,7 +1305,7 @@ void Shell::OnAnimatorDrawLastLayerTree(
 // |Engine::Delegate|
 void Shell::OnEngineUpdateSemantics(SemanticsNodeUpdates update,
                                     CustomAccessibilityActionUpdates actions) {
-  FML_DCHECK(is_setup_);
+  FML_DCHECK(is_set_up_);
   FML_DCHECK(task_runners_.GetUITaskRunner()->RunsTasksOnCurrentThread());
 
   task_runners_.GetPlatformTaskRunner()->PostTask(
@@ -1222,7 +1320,7 @@ void Shell::OnEngineUpdateSemantics(SemanticsNodeUpdates update,
 // |Engine::Delegate|
 void Shell::OnEngineHandlePlatformMessage(
     std::unique_ptr<PlatformMessage> message) {
-  FML_DCHECK(is_setup_);
+  FML_DCHECK(is_set_up_);
   FML_DCHECK(task_runners_.GetUITaskRunner()->RunsTasksOnCurrentThread());
 
   if (message->channel() == kSkiaChannel) {
@@ -1279,6 +1377,17 @@ void Shell::OnEngineHandlePlatformMessage(
   }
 }
 
+void Shell::OnEngineChannelUpdate(std::string name, bool listening) {
+  FML_DCHECK(is_set_up_);
+
+  task_runners_.GetPlatformTaskRunner()->PostTask(
+      [view = platform_view_->GetWeakPtr(), name = std::move(name), listening] {
+        if (view) {
+          view->SendChannelUpdate(name, listening);
+        }
+      });
+}
+
 void Shell::HandleEngineSkiaMessage(std::unique_ptr<PlatformMessage> message) {
   const auto& data = message->data();
 
@@ -1317,7 +1426,7 @@ void Shell::HandleEngineSkiaMessage(std::unique_ptr<PlatformMessage> message) {
 
 // |Engine::Delegate|
 void Shell::OnPreEngineRestart() {
-  FML_DCHECK(is_setup_);
+  FML_DCHECK(is_set_up_);
   FML_DCHECK(task_runners_.GetUITaskRunner()->RunsTasksOnCurrentThread());
 
   fml::AutoResetWaitableEvent latch;
@@ -1421,8 +1530,15 @@ void Shell::RequestDartDeferredLibrary(intptr_t loading_unit_id) {
       });
 }
 
+// |Engine::Delegate|
+double Shell::GetScaledFontSize(double unscaled_font_size,
+                                int configuration_id) const {
+  return platform_view_->GetScaledFontSize(unscaled_font_size,
+                                           configuration_id);
+}
+
 void Shell::ReportTimings() {
-  FML_DCHECK(is_setup_);
+  FML_DCHECK(is_set_up_);
   FML_DCHECK(task_runners_.GetRasterTaskRunner()->RunsTasksOnCurrentThread());
 
   auto timings = std::move(unreported_timings_);
@@ -1442,7 +1558,7 @@ size_t Shell::UnreportedFramesCount() const {
 }
 
 void Shell::OnFrameRasterized(const FrameTiming& timing) {
-  FML_DCHECK(is_setup_);
+  FML_DCHECK(is_set_up_);
   FML_DCHECK(task_runners_.GetRasterTaskRunner()->RunsTasksOnCurrentThread());
 
   // The C++ callback defined in settings.h and set by Flutter runner. This is
@@ -1522,13 +1638,24 @@ fml::TimePoint Shell::GetLatestFrameTargetTime() const {
   std::scoped_lock time_recorder_lock(time_recorder_mutex_);
   FML_CHECK(latest_frame_target_time_.has_value())
       << "GetLatestFrameTargetTime called before OnAnimatorBeginFrame";
+  // Covered by FML_CHECK().
+  // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
   return latest_frame_target_time_.value();
 }
 
+// |Rasterizer::Delegate|
+bool Shell::ShouldDiscardLayerTree(int64_t view_id,
+                                   const flutter::LayerTree& tree) {
+  std::scoped_lock<std::mutex> lock(resize_mutex_);
+  auto expected_frame_size = ExpectedFrameSize(view_id);
+  return !expected_frame_size.isEmpty() &&
+         tree.frame_size() != expected_frame_size;
+}
+
 // |ServiceProtocol::Handler|
 fml::RefPtr<fml::TaskRunner> Shell::GetServiceProtocolHandlerTaskRunner(
     std::string_view method) const {
-  FML_DCHECK(is_setup_);
+  FML_DCHECK(is_set_up_);
   auto found = service_protocol_handlers_.find(method);
   if (found != service_protocol_handlers_.end()) {
     return found->second.first;
@@ -1612,6 +1739,11 @@ bool Shell::OnServiceProtocolScreenshotSKP(
     const ServiceProtocol::Handler::ServiceProtocolMap& params,
     rapidjson::Document* response) {
   FML_DCHECK(task_runners_.GetRasterTaskRunner()->RunsTasksOnCurrentThread());
+  if (settings_.enable_impeller) {
+    ServiceProtocolFailureError(
+        response, "Cannot capture SKP screenshot with Impeller enabled.");
+    return false;
+  }
   auto screenshot = rasterizer_->ScreenshotLastLayerTree(
       Rasterizer::ScreenshotType::SkiaPicture, true);
   if (screenshot.data) {
@@ -1709,7 +1841,7 @@ bool Shell::OnServiceProtocolFlushUIThreadTasks(
   // It can potentially starve the service isolate if the main isolate pauses
   // at a breakpoint or is in an infinite loop.
   //
-  // It should be invoked from the VM Service and and blocks it until UI thread
+  // It should be invoked from the VM Service and blocks it until UI thread
   // tasks are processed.
   response->SetObject();
   response->AddMember("type", "Success", response->GetAllocator());
@@ -1734,7 +1866,7 @@ double Shell::GetMainDisplayRefreshRate() {
 void Shell::RegisterImageDecoder(ImageGeneratorFactory factory,
                                  int32_t priority) {
   FML_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
-  FML_DCHECK(is_setup_);
+  FML_DCHECK(is_set_up_);
 
   fml::TaskRunner::RunNowOrPostTask(
       task_runners_.GetUITaskRunner(),
@@ -1757,11 +1889,10 @@ bool Shell::OnServiceProtocolGetSkSLs(
   PersistentCache* persistent_cache = PersistentCache::GetCacheForProcess();
   std::vector<PersistentCache::SkSLCache> sksls = persistent_cache->LoadSkSLs();
   for (const auto& sksl : sksls) {
-    size_t b64_size =
-        SkBase64::Encode(sksl.value->data(), sksl.value->size(), nullptr);
+    size_t b64_size = Base64::EncodedSize(sksl.value->size());
     sk_sp<SkData> b64_data = SkData::MakeUninitialized(b64_size + 1);
     char* b64_char = static_cast<char*>(b64_data->writable_data());
-    SkBase64::Encode(sksl.value->data(), sksl.value->size(), b64_char);
+    Base64::Encode(sksl.value->data(), sksl.value->size(), b64_char);
     b64_char[b64_size] = 0;  // make it null terminated for printing
     rapidjson::Value shader_value(b64_char, response->GetAllocator());
     std::string_view key_view(reinterpret_cast<const char*>(sksl.key->data()),
@@ -1885,7 +2016,18 @@ bool Shell::OnServiceProtocolRenderFrameWithRasterStats(
     rapidjson::Document* response) {
   FML_DCHECK(task_runners_.GetRasterTaskRunner()->RunsTasksOnCurrentThread());
 
-  if (auto last_layer_tree = rasterizer_->GetLastLayerTree()) {
+  // Impeller does not support this protocol method.
+  if (io_manager_->GetImpellerContext()) {
+    const char* error = "Raster status not supported on Impeller backend.";
+    ServiceProtocolFailureError(response, error);
+    return false;
+  }
+
+  // TODO(dkwingsmt): This method only handles view #0, including the snapshot
+  // and the frame size. We need to adapt this method to multi-view.
+  // https://github.com/flutter/flutter/issues/131892
+  int64_t view_id = kFlutterImplicitViewId;
+  if (auto last_layer_tree = rasterizer_->GetLastLayerTree(view_id)) {
     auto& allocator = response->GetAllocator();
     response->SetObject();
     response->AddMember("type", "RenderFrameWithRasterStats", allocator);
@@ -1900,7 +2042,7 @@ bool Shell::OnServiceProtocolRenderFrameWithRasterStats(
     frame_timings_recorder->RecordBuildEnd(now);
 
     last_layer_tree->enable_leaf_layer_tracing(true);
-    rasterizer_->DrawLastLayerTree(std::move(frame_timings_recorder));
+    rasterizer_->DrawLastLayerTrees(std::move(frame_timings_recorder));
     last_layer_tree->enable_leaf_layer_tracing(false);
 
     rapidjson::Value snapshots;
@@ -1916,7 +2058,7 @@ bool Shell::OnServiceProtocolRenderFrameWithRasterStats(
 
     response->AddMember("snapshots", snapshots, allocator);
 
-    const auto& frame_size = expected_frame_size_;
+    const auto& frame_size = ExpectedFrameSize(view_id);
     response->AddMember("frame_width", frame_size.width(), allocator);
     response->AddMember("frame_height", frame_size.height(), allocator);
 
@@ -1972,9 +2114,71 @@ bool Shell::OnServiceProtocolReloadAssetFonts(
   return true;
 }
 
+void Shell::AddView(int64_t view_id, const ViewportMetrics& viewport_metrics) {
+  TRACE_EVENT0("flutter", "Shell::AddView");
+  FML_DCHECK(is_set_up_);
+  FML_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
+  FML_DCHECK(view_id != kFlutterImplicitViewId)
+      << "Unexpected request to add the implicit view #"
+      << kFlutterImplicitViewId << ". This view should never be added.";
+
+  task_runners_.GetUITaskRunner()->PostTask([engine = engine_->GetWeakPtr(),  //
+                                             viewport_metrics,                //
+                                             view_id                          //
+  ] {
+    if (engine) {
+      engine->AddView(view_id, viewport_metrics);
+    }
+  });
+}
+
+void Shell::RemoveView(int64_t view_id, RemoveViewCallback callback) {
+  TRACE_EVENT0("flutter", "Shell::RemoveView");
+  FML_DCHECK(is_set_up_);
+  FML_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
+  FML_DCHECK(view_id != kFlutterImplicitViewId)
+      << "Unexpected request to remove the implicit view #"
+      << kFlutterImplicitViewId << ". This view should never be removed.";
+
+  expected_frame_sizes_.erase(view_id);
+  task_runners_.GetUITaskRunner()->PostTask(
+      [&task_runners = task_runners_,           //
+       engine = engine_->GetWeakPtr(),          //
+       rasterizer = rasterizer_->GetWeakPtr(),  //
+       view_id,                                 //
+       callback = std::move(callback)           //
+  ] {
+        if (engine) {
+          bool removed = engine->RemoveView(view_id);
+          callback(removed);
+        }
+        // Don't wait for the raster task here, which only cleans up memory and
+        // does not affect functionality. Make sure it is done after Dart
+        // removes the view to avoid receiving another rasterization request
+        // that adds back the view record.
+        task_runners.GetRasterTaskRunner()->PostTask([rasterizer, view_id]() {
+          if (rasterizer) {
+            rasterizer->CollectView(view_id);
+          }
+        });
+      });
+}
+
 Rasterizer::Screenshot Shell::Screenshot(
     Rasterizer::ScreenshotType screenshot_type,
     bool base64_encode) {
+  if (settings_.enable_impeller) {
+    switch (screenshot_type) {
+      case Rasterizer::ScreenshotType::SkiaPicture:
+        FML_LOG(ERROR)
+            << "Impeller backend cannot produce ScreenshotType::SkiaPicture.";
+        return {};
+      case Rasterizer::ScreenshotType::UncompressedImage:
+      case Rasterizer::ScreenshotType::CompressedImage:
+      case Rasterizer::ScreenshotType::SurfaceData:
+        break;
+    }
+  }
   TRACE_EVENT0("flutter", "Shell::Screenshot");
   fml::AutoResetWaitableEvent latch;
   Rasterizer::Screenshot screenshot;
@@ -1996,7 +2200,7 @@ Rasterizer::Screenshot Shell::Screenshot(
 }
 
 fml::Status Shell::WaitForFirstFrame(fml::TimeDelta timeout) {
-  FML_DCHECK(is_setup_);
+  FML_DCHECK(is_set_up_);
   if (task_runners_.GetUITaskRunner()->RunsTasksOnCurrentThread() ||
       task_runners_.GetRasterTaskRunner()->RunsTasksOnCurrentThread()) {
     return fml::Status(fml::StatusCode::kFailedPrecondition,
@@ -2024,7 +2228,7 @@ fml::Status Shell::WaitForFirstFrame(fml::TimeDelta timeout) {
 }
 
 bool Shell::ReloadSystemFonts() {
-  FML_DCHECK(is_setup_);
+  FML_DCHECK(is_set_up_);
   FML_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
 
   if (!engine_) {
@@ -2068,9 +2272,24 @@ void Shell::SetGpuAvailability(GpuAvailability availability) {
   }
 }
 
-void Shell::OnDisplayUpdates(DisplayUpdateType update_type,
-                             std::vector<std::unique_ptr<Display>> displays) {
-  display_manager_->HandleDisplayUpdates(update_type, std::move(displays));
+void Shell::OnDisplayUpdates(std::vector<std::unique_ptr<Display>> displays) {
+  FML_DCHECK(is_set_up_);
+  FML_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
+
+  std::vector<DisplayData> display_data;
+  display_data.reserve(displays.size());
+  for (const auto& display : displays) {
+    display_data.push_back(display->GetDisplayData());
+  }
+  task_runners_.GetUITaskRunner()->PostTask(
+      [engine = engine_->GetWeakPtr(),
+       display_data = std::move(display_data)]() {
+        if (engine) {
+          engine->SetDisplays(display_data);
+        }
+      });
+
+  display_manager_->HandleDisplayUpdates(std::move(displays));
 }
 
 fml::TimePoint Shell::GetCurrentTimePoint() {
@@ -2083,7 +2302,27 @@ Shell::GetPlatformMessageHandler() const {
 }
 
 const std::weak_ptr<VsyncWaiter> Shell::GetVsyncWaiter() const {
+  if (!engine_) {
+    return {};
+  }
   return engine_->GetVsyncWaiter();
 }
 
+const std::shared_ptr<fml::ConcurrentTaskRunner>
+Shell::GetConcurrentWorkerTaskRunner() const {
+  FML_DCHECK(vm_);
+  if (!vm_) {
+    return nullptr;
+  }
+  return vm_->GetConcurrentWorkerTaskRunner();
+}
+
+SkISize Shell::ExpectedFrameSize(int64_t view_id) {
+  auto found = expected_frame_sizes_.find(view_id);
+  if (found == expected_frame_sizes_.end()) {
+    return SkISize::MakeEmpty();
+  }
+  return found->second;
+}
+
 }  // namespace flutter
diff --git a/shell/common/shell.h b/shell/common/shell.h
index 71ee082c0a4ac5a4cc76f7861832f276e8daddc7..3e2da290ed1301c2ef6b62f794e6f1c906f5ff14 100644
--- a/shell/common/shell.h
+++ b/shell/common/shell.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_COMMON_SHELL_H_
-#define SHELL_COMMON_SHELL_H_
+#ifndef FLUTTER_SHELL_COMMON_SHELL_H_
+#define FLUTTER_SHELL_COMMON_SHELL_H_
 
 #include <functional>
 #include <mutex>
@@ -40,11 +40,13 @@
 #include "flutter/shell/common/rasterizer.h"
 #include "flutter/shell/common/resource_cache_limit_calculator.h"
 #include "flutter/shell/common/shell_io_manager.h"
+#include "impeller/runtime_stage/runtime_stage.h"
 
 namespace flutter {
 
 /// Error exit codes for the Dart isolate.
 enum class DartErrorCode {
+  // NOLINTBEGIN(readability-identifier-naming)
   /// No error has occurred.
   NoError = 0,
   /// The Dart error code for an API error.
@@ -53,6 +55,7 @@ enum class DartErrorCode {
   CompilationError = 254,
   /// The Dart error code for an unknown error.
   UnknownError = 255
+  // NOLINTEND(readability-identifier-naming)
 };
 
 /// Values for |Shell::SetGpuAvailability|.
@@ -126,8 +129,11 @@ class Shell final : public PlatformView::Delegate,
       fml::WeakPtr<IOManager> io_manager,
       fml::RefPtr<SkiaUnrefQueue> unref_queue,
       fml::TaskRunnerAffineWeakPtr<SnapshotDelegate> snapshot_delegate,
-      std::shared_ptr<VolatilePathTracker> volatile_path_tracker)>
+      std::shared_ptr<VolatilePathTracker> volatile_path_tracker,
+      const std::shared_ptr<fml::SyncSwitch>& gpu_disabled_switch,
+      impeller::RuntimeStageBackend runtime_stage_type)>
       EngineCreateCallback;
+  using RemoveViewCallback = std::function<void(bool removed)>;
 
   //----------------------------------------------------------------------------
   /// @brief      Creates a shell instance using the provided settings. The
@@ -297,6 +303,39 @@ class Shell final : public PlatformView::Delegate,
   ///
   bool IsSetup() const;
 
+  /// @brief  Allocates resources for a new non-implicit view.
+  ///
+  ///         This method returns immediately and does not wait for the task on
+  ///         the UI thread to finish. This is safe because operations are
+  ///         either initiated from the UI thread (such as rendering), or are
+  ///         sent as posted tasks that are queued. In either case, it's ok for
+  ///         the engine to have views that the Dart VM doesn't.
+  ///
+  ///         The implicit view should never be added with this function.
+  ///         Instead, it is added internally on Shell initialization. Trying to
+  ///         add `kFlutterImplicitViewId` triggers an assertion.
+  ///
+  /// @param[in]  view_id           The view ID of the new view.
+  /// @param[in]  viewport_metrics  The initial viewport metrics for the view.
+  ///
+  void AddView(int64_t view_id, const ViewportMetrics& viewport_metrics);
+
+  /// @brief  Deallocates resources for a non-implicit view.
+  ///
+  ///         This method returns immediately and does not wait for the task on
+  ///         the UI thread to finish. This means that the Dart VM might still
+  ///         send messages regarding this view ID for a short while, even
+  ///         though this view ID is already invalid.
+  ///
+  ///         The implicit view should never be removed. Trying to remove
+  ///         `kFlutterImplicitViewId` triggers an assertion.
+  ///
+  /// @param[in]  view_id     The view ID of the view to be removed.
+  /// @param[in]  callback    The callback that's invoked once the engine has
+  ///                         attempted to remove the view.
+  ///
+  void RemoveView(int64_t view_id, RemoveViewCallback callback);
+
   //----------------------------------------------------------------------------
   /// @brief      Captures a screenshot and optionally Base64 encodes the data
   ///             of the last layer tree rendered by the rasterizer in this
@@ -356,6 +395,7 @@ class Shell final : public PlatformView::Delegate,
 
   //----------------------------------------------------------------------------
   /// @brief     Accessor for the disable GPU SyncSwitch.
+  // |Rasterizer::Delegate|
   std::shared_ptr<const fml::SyncSwitch> GetIsGpuDisabledSyncSwitch()
       const override;
 
@@ -374,8 +414,7 @@ class Shell final : public PlatformView::Delegate,
   //----------------------------------------------------------------------------
   /// @brief      Notifies the display manager of the updates.
   ///
-  void OnDisplayUpdates(DisplayUpdateType update_type,
-                        std::vector<std::unique_ptr<Display>> displays);
+  void OnDisplayUpdates(std::vector<std::unique_ptr<Display>> displays);
 
   //----------------------------------------------------------------------------
   /// @brief Queries the `DisplayManager` for the main display refresh rate.
@@ -403,11 +442,34 @@ class Shell final : public PlatformView::Delegate,
 
   const std::weak_ptr<VsyncWaiter> GetVsyncWaiter() const;
 
+  const std::shared_ptr<fml::ConcurrentTaskRunner>
+  GetConcurrentWorkerTaskRunner() const;
+
+  // Infer the VM ref and the isolate snapshot based on the settings.
+  //
+  // If the VM is already running, the settings are ignored, but the returned
+  // isolate snapshot always prioritize what is specified by the settings, and
+  // falls back to the one VM was launched with.
+  //
+  // This function is what Shell::Create uses to infer snapshot settings.
+  //
+  // TODO(dkwingsmt): Extracting this method is part of a bigger change. If the
+  // entire change is not eventually landed, we should merge this method back
+  // to Create. https://github.com/flutter/flutter/issues/136826
+  static std::pair<DartVMRef, fml::RefPtr<const DartSnapshot>>
+  InferVmInitDataFromSettings(Settings& settings);
+
  private:
   using ServiceProtocolHandler =
       std::function<bool(const ServiceProtocol::Handler::ServiceProtocolMap&,
                          rapidjson::Document*)>;
 
+  /// A collection of message channels (by name) that have sent at least one
+  /// message from a non-platform thread. Used to prevent printing the error
+  /// log more than once per channel, as a badly behaving plugin may send
+  /// multiple messages per second indefinitely.
+  std::mutex misbehaving_message_channels_mutex_;
+  std::set<std::string> misbehaving_message_channels_;
   const TaskRunners task_runners_;
   const fml::RefPtr<fml::RasterThreadMerger> parent_raster_thread_merger_;
   std::shared_ptr<ResourceCacheLimitCalculator>
@@ -438,7 +500,7 @@ class Shell final : public PlatformView::Delegate,
                                                         // pair
                      >
       service_protocol_handlers_;
-  bool is_setup_ = false;
+  bool is_set_up_ = false;
   bool is_added_to_service_protocol_ = false;
   uint64_t next_pointer_flow_id_ = 0;
 
@@ -452,24 +514,25 @@ class Shell final : public PlatformView::Delegate,
   std::atomic<bool> needs_report_timings_{false};
 
   // Whether there's a task scheduled to report the timings to Dart through
-  // ui.Window.onReportTimings.
+  // ui.PlatformDispatcher.onReportTimings.
   bool frame_timings_report_scheduled_ = false;
 
   // Vector of FrameTiming::kCount * n timestamps for n frames whose timings
-  // have not been reported yet. Vector of ints instead of FrameTiming is stored
-  // here for easier conversions to Dart objects.
+  // have not been reported yet. Vector of ints instead of FrameTiming is
+  // stored here for easier conversions to Dart objects.
   std::vector<int64_t> unreported_timings_;
 
-  /// Manages the displays. This class is thread safe, can be accessed from any
-  /// of the threads.
+  /// Manages the displays. This class is thread safe, can be accessed from
+  /// any of the threads.
   std::unique_ptr<DisplayManager> display_manager_;
 
   // protects expected_frame_size_ which is set on platform thread and read on
   // raster thread
   std::mutex resize_mutex_;
 
-  // used to discard wrong size layer tree produced during interactive resizing
-  SkISize expected_frame_size_ = SkISize::MakeEmpty();
+  // used to discard wrong size layer tree produced during interactive
+  // resizing
+  std::unordered_map<int64_t, SkISize> expected_frame_sizes_;
 
   // Used to communicate the right frame bounds via service protocol.
   double device_pixel_ratio_ = 0.0;
@@ -534,6 +597,7 @@ class Shell final : public PlatformView::Delegate,
 
   // |PlatformView::Delegate|
   void OnPlatformViewSetViewportMetrics(
+      int64_t view_id,
       const ViewportMetrics& metrics) override;
 
   // |PlatformView::Delegate|
@@ -545,7 +609,7 @@ class Shell final : public PlatformView::Delegate,
       std::unique_ptr<PointerDataPacket> packet) override;
 
   // |PlatformView::Delegate|
-  void OnPlatformViewDispatchSemanticsAction(int32_t id,
+  void OnPlatformViewDispatchSemanticsAction(int32_t node_id,
                                              SemanticsAction action,
                                              fml::MallocMapping args) override;
 
@@ -598,10 +662,10 @@ class Shell final : public PlatformView::Delegate,
       fml::TimePoint frame_target_time) override;
 
   // |Animator::Delegate|
-  void OnAnimatorDraw(std::shared_ptr<LayerTreePipeline> pipeline) override;
+  void OnAnimatorDraw(std::shared_ptr<FramePipeline> pipeline) override;
 
   // |Animator::Delegate|
-  void OnAnimatorDrawLastLayerTree(
+  void OnAnimatorDrawLastLayerTrees(
       std::unique_ptr<FrameTimingsRecorder> frame_timings_recorder) override;
 
   // |Engine::Delegate|
@@ -638,6 +702,13 @@ class Shell final : public PlatformView::Delegate,
   // |Engine::Delegate|
   fml::TimePoint GetCurrentTimePoint() override;
 
+  // |Engine::Delegate|
+  void OnEngineChannelUpdate(std::string name, bool listening) override;
+
+  // |Engine::Delegate|
+  double GetScaledFontSize(double unscaled_font_size,
+                           int configuration_id) const override;
+
   // |Rasterizer::Delegate|
   void OnFrameRasterized(const FrameTiming&) override;
 
@@ -647,6 +718,10 @@ class Shell final : public PlatformView::Delegate,
   // |Rasterizer::Delegate|
   fml::TimePoint GetLatestFrameTargetTime() const override;
 
+  // |Rasterizer::Delegate|
+  bool ShouldDiscardLayerTree(int64_t view_id,
+                              const flutter::LayerTree& tree) override;
+
   // |ServiceProtocol::Handler|
   fml::RefPtr<fml::TaskRunner> GetServiceProtocolHandlerTaskRunner(
       std::string_view method) const override;
@@ -693,7 +768,8 @@ class Shell final : public PlatformView::Delegate,
 
   // Service protocol handler
   //
-  // The returned SkSLs are base64 encoded. Decode before storing them to files.
+  // The returned SkSLs are base64 encoded. Decode before storing them to
+  // files.
   bool OnServiceProtocolGetSkSLs(
       const ServiceProtocol::Handler::ServiceProtocolMap& params,
       rapidjson::Document* response);
@@ -714,8 +790,8 @@ class Shell final : public PlatformView::Delegate,
 
   // Service protocol handler
   //
-  // Forces the FontCollection to reload the font manifest. Used to support hot
-  // reload for fonts.
+  // Forces the FontCollection to reload the font manifest. Used to support
+  // hot reload for fonts.
   bool OnServiceProtocolReloadAssetFonts(
       const ServiceProtocol::Handler::ServiceProtocolMap& params,
       rapidjson::Document* response);
@@ -730,6 +806,8 @@ class Shell final : public PlatformView::Delegate,
   // directory.
   std::unique_ptr<DirectoryAssetBundle> RestoreOriginalAssetResolver();
 
+  SkISize ExpectedFrameSize(int64_t view_id);
+
   // For accessing the Shell via the raster thread, necessary for various
   // rasterizer callbacks.
   std::unique_ptr<fml::TaskRunnerAffineWeakPtrFactory<Shell>> weak_factory_gpu_;
@@ -742,4 +820,4 @@ class Shell final : public PlatformView::Delegate,
 
 }  // namespace flutter
 
-#endif  // SHELL_COMMON_SHELL_H_
+#endif  // FLUTTER_SHELL_COMMON_SHELL_H_
diff --git a/shell/common/shell_benchmarks.cc b/shell/common/shell_benchmarks.cc
index efd53d0b31b548c7ebd751a22aa870d902f19955..a1bba720fe940bdb4428f543028c1bffd4056bfd 100644
--- a/shell/common/shell_benchmarks.cc
+++ b/shell/common/shell_benchmarks.cc
@@ -44,9 +44,9 @@ static void StartupAndShutdownShell(benchmark::State& state,
     }
 
     thread_host = std::make_unique<ThreadHost>(ThreadHost::ThreadHostConfig(
-        "io.flutter.bench.", ThreadHost::Type::Platform |
-                                 ThreadHost::Type::RASTER |
-                                 ThreadHost::Type::IO | ThreadHost::Type::UI));
+        "io.flutter.bench.",
+        ThreadHost::Type::kPlatform | ThreadHost::Type::kRaster |
+            ThreadHost::Type::kIo | ThreadHost::Type::kUi));
 
     TaskRunners task_runners("test",
                              thread_host->platform_thread->GetTaskRunner(),
diff --git a/shell/common/shell_fuchsia_unittests.cc b/shell/common/shell_fuchsia_unittests.cc
index 8a1989daf57b179fda9ef1dfaf5cdfbb11c321ec..da6bd0f641432f18d83b0b7ab280ca7504ae1637 100644
--- a/shell/common/shell_fuchsia_unittests.cc
+++ b/shell/common/shell_fuchsia_unittests.cc
@@ -18,7 +18,6 @@
 #include <fuchsia/settings/cpp/fidl.h>
 #include <lib/sys/cpp/component_context.h>
 
-#include "flutter/fml/dart/dart_converter.h"
 #include "flutter/fml/logging.h"
 #include "flutter/fml/synchronization/count_down_latch.h"
 #include "flutter/runtime/dart_vm.h"
@@ -100,6 +99,8 @@ class FuchsiaShellTest : public ShellTest {
   fuchsia::settings::IntlSettings save_settings_;
 };
 
+// These functions are used by tests that are currently disabled.
+#if false
 static bool ValidateShell(Shell* shell) {
   if (!shell) {
     return false;
@@ -145,6 +146,7 @@ static void RunCoroutineWithRetry(int retries,
     sleep(1);
   }
 }
+#endif  // false
 
 // Verifies that changing the Fuchsia settings timezone through the FIDL
 // settings interface results in a change of the reported local time in the
@@ -165,7 +167,7 @@ TEST_F(FuchsiaShellTest, LocaltimesVaryOnTimezoneChanges) {
 #if defined(OS_FUCHSIA)
   GTEST_SKIP()
       << "This test fails after the CF V2 migration. https://fxbug.dev/110019 ";
-#endif  // OS_FUCHSIA
+#else
 
   // See fixtures/shell_test.dart, the callback NotifyLocalTime is declared
   // there.
@@ -258,6 +260,7 @@ TEST_F(FuchsiaShellTest, LocaltimesVaryOnTimezoneChanges) {
   continue_fixture = false;
   fixture_latch.Signal();
   DestroyShell(std::move(shell));
+#endif  // OS_FUCHSIA
 }
 
 }  // namespace testing
diff --git a/shell/common/shell_io_manager.cc b/shell/common/shell_io_manager.cc
index f1bb540131e79c3ba047f405e856cf4d38011d07..59de967e1cc0f17f7873b0689ad39037e2b4507a 100644
--- a/shell/common/shell_io_manager.cc
+++ b/shell/common/shell_io_manager.cc
@@ -8,21 +8,23 @@
 
 #include "flutter/fml/message_loop.h"
 #include "flutter/shell/common/context_options.h"
+#include "third_party/skia/include/gpu/ganesh/gl/GrGLDirectContext.h"
 #include "third_party/skia/include/gpu/gl/GrGLInterface.h"
+#include "third_party/skia/include/gpu/gl/GrGLTypes.h"
 
 namespace flutter {
 
 sk_sp<GrDirectContext> ShellIOManager::CreateCompatibleResourceLoadingContext(
-    GrBackend backend,
+    GrBackendApi backend,
     const sk_sp<const GrGLInterface>& gl_interface) {
 #if SK_GL
-  if (backend != GrBackend::kOpenGL_GrBackend) {
+  if (backend != GrBackendApi::kOpenGL) {
     return nullptr;
   }
 
   const auto options = MakeDefaultContextOptions(ContextType::kResource);
 
-  if (auto context = GrDirectContext::MakeGL(gl_interface, options)) {
+  if (auto context = GrDirectContexts::MakeGL(gl_interface, options)) {
     // Do not cache textures created by the image decoder.  These textures
     // should be deleted when they are no longer referenced by an SkImage.
     context->setResourceCacheLimit(0);
@@ -48,7 +50,8 @@ ShellIOManager::ShellIOManager(
       unref_queue_(fml::MakeRefCounted<flutter::SkiaUnrefQueue>(
           std::move(unref_queue_task_runner),
           unref_queue_drain_delay,
-          resource_context_)),
+          resource_context_,
+          /*drain_immediate=*/!!impeller_context)),
       is_gpu_disabled_sync_switch_(std::move(is_gpu_disabled_sync_switch)),
       impeller_context_(std::move(impeller_context)),
       weak_factory_(this) {
diff --git a/shell/common/shell_io_manager.h b/shell/common/shell_io_manager.h
index b178541939771e6eea653e9b71e51b20784f65b8..9c105a80d174cb8bf652bc8ddc2f1e82e05b06d5 100644
--- a/shell/common/shell_io_manager.h
+++ b/shell/common/shell_io_manager.h
@@ -12,6 +12,9 @@
 #include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/lib/ui/io_manager.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
+#include "third_party/skia/include/gpu/GrTypes.h"
+
+struct GrGLInterface;
 
 namespace flutter {
 
@@ -21,7 +24,7 @@ class ShellIOManager final : public IOManager {
   // supply to the IOManager. The platforms may create the context themselves if
   // they so desire.
   static sk_sp<GrDirectContext> CreateCompatibleResourceLoadingContext(
-      GrBackend backend,
+      GrBackendApi backend,
       const sk_sp<const GrGLInterface>& gl_interface);
 
   ShellIOManager(
diff --git a/shell/common/shell_io_manager_unittests.cc b/shell/common/shell_io_manager_unittests.cc
index b1ac2ed6650e50495d987398b5bc6aa9ce67111e..e262fd7d7840e9c2c67fb87784dc79f5b20519a3 100644
--- a/shell/common/shell_io_manager_unittests.cc
+++ b/shell/common/shell_io_manager_unittests.cc
@@ -10,42 +10,12 @@
 #include "flutter/testing/dart_isolate_runner.h"
 #include "flutter/testing/fixture_test.h"
 #include "flutter/testing/post_task_sync.h"
-#include "flutter/testing/test_gl_surface.h"
+#include "flutter/testing/test_gl_surface.h"  // nogncheck
 #include "flutter/testing/testing.h"
 
 namespace flutter {
 namespace testing {
 
-static sk_sp<SkData> OpenFixtureAsSkData(const char* name) {
-  auto fixtures_directory =
-      fml::OpenDirectory(GetFixturesPath(), false, fml::FilePermission::kRead);
-  if (!fixtures_directory.is_valid()) {
-    return nullptr;
-  }
-
-  auto fixture_mapping =
-      fml::FileMapping::CreateReadOnly(fixtures_directory, name);
-
-  if (!fixture_mapping) {
-    return nullptr;
-  }
-
-  SkData::ReleaseProc on_release = [](const void* ptr, void* context) -> void {
-    delete reinterpret_cast<fml::FileMapping*>(context);
-  };
-
-  auto data = SkData::MakeWithProc(fixture_mapping->GetMapping(),
-                                   fixture_mapping->GetSize(), on_release,
-                                   fixture_mapping.get());
-
-  if (!data) {
-    return nullptr;
-  }
-  // The data is now owned by Skia.
-  fixture_mapping.release();
-  return data;
-}
-
 class ShellIOManagerTest : public FixtureTest {};
 
 // Regression test for https://github.com/flutter/engine/pull/32106.
@@ -54,7 +24,7 @@ TEST_F(ShellIOManagerTest,
   auto settings = CreateSettingsForFixture();
   auto vm_ref = DartVMRef::Create(settings);
   auto vm_data = vm_ref.GetVMData();
-  auto gif_mapping = OpenFixtureAsSkData("hello_loop_2.gif");
+  auto gif_mapping = flutter::testing::OpenFixtureAsSkData("hello_loop_2.gif");
   ASSERT_TRUE(gif_mapping);
 
   ImageGeneratorRegistry registry;
diff --git a/shell/common/shell_test.cc b/shell/common/shell_test.cc
index a799e6bcb48119220e769a5e999c244adefe9b9d..efcf43ce826683c5a5038a7f7f885b9a1a8e2382 100644
--- a/shell/common/shell_test.cc
+++ b/shell/common/shell_test.cc
@@ -20,10 +20,50 @@
 namespace flutter {
 namespace testing {
 
+constexpr int64_t kImplicitViewId = 0;
+
+FrameContent ViewContent::NoViews() {
+  return std::map<int64_t, ViewContent>();
+}
+
+FrameContent ViewContent::DummyView(double width, double height) {
+  FrameContent result;
+  result[kImplicitViewId] = ViewContent{
+      .viewport_metrics = {1.0, width, height, 22, 0},
+      .builder = {},
+  };
+  return result;
+}
+
+FrameContent ViewContent::DummyView(flutter::ViewportMetrics viewport_metrics) {
+  FrameContent result;
+  result[kImplicitViewId] = ViewContent{
+      .viewport_metrics = std::move(viewport_metrics),
+      .builder = {},
+  };
+  return result;
+}
+
+FrameContent ViewContent::ImplicitView(double width,
+                                       double height,
+                                       LayerTreeBuilder builder) {
+  FrameContent result;
+  result[kImplicitViewId] = ViewContent{
+      .viewport_metrics = {1.0, width, height, 22, 0},
+      .builder = std::move(builder),
+  };
+  return result;
+}
+
 ShellTest::ShellTest()
     : thread_host_("io.flutter.test." + GetCurrentTestName() + ".",
-                   ThreadHost::Type::Platform | ThreadHost::Type::IO |
-                       ThreadHost::Type::UI | ThreadHost::Type::RASTER) {}
+                   ThreadHost::Type::kPlatform | ThreadHost::Type::kIo |
+                       ThreadHost::Type::kUi | ThreadHost::Type::kRaster) {}
+
+void ShellTest::SendPlatformMessage(Shell* shell,
+                                    std::unique_ptr<PlatformMessage> message) {
+  shell->OnPlatformViewDispatchPlatformMessage(std::move(message));
+}
 
 void ShellTest::SendEnginePlatformMessage(
     Shell* shell,
@@ -85,16 +125,18 @@ void ShellTest::RestartEngine(Shell* shell, RunConfiguration configuration) {
   ASSERT_TRUE(restarted.get_future().get());
 }
 
-void ShellTest::VSyncFlush(Shell* shell, bool& will_draw_new_frame) {
+void ShellTest::VSyncFlush(Shell* shell, bool* will_draw_new_frame) {
   fml::AutoResetWaitableEvent latch;
   fml::TaskRunner::RunNowOrPostTask(
       shell->GetTaskRunners().GetPlatformTaskRunner(),
-      [shell, &will_draw_new_frame, &latch] {
+      [shell, will_draw_new_frame, &latch] {
         // The following UI task ensures that all previous UI tasks are flushed.
         fml::AutoResetWaitableEvent ui_latch;
         shell->GetTaskRunners().GetUITaskRunner()->PostTask(
-            [&ui_latch, &will_draw_new_frame]() {
-              will_draw_new_frame = true;
+            [&ui_latch, will_draw_new_frame]() {
+              if (will_draw_new_frame != nullptr) {
+                *will_draw_new_frame = true;
+              }
               ui_latch.Signal();
             });
 
@@ -129,7 +171,8 @@ void ShellTest::SetViewportMetrics(Shell* shell, double width, double height) {
       22,                     // physical touch slop
       std::vector<double>(),  // display features bounds
       std::vector<int>(),     // display features type
-      std::vector<int>()      // display features state
+      std::vector<int>(),     // display features state
+      0                       // Display ID
   };
   // Set viewport to nonempty, and call Animator::BeginFrame to make the layer
   // tree pipeline nonempty. Without either of this, the layer tree below
@@ -138,7 +181,7 @@ void ShellTest::SetViewportMetrics(Shell* shell, double width, double height) {
   shell->GetTaskRunners().GetUITaskRunner()->PostTask(
       [&latch, engine = shell->weak_engine_, viewport_metrics]() {
         if (engine) {
-          engine->SetViewportMetrics(viewport_metrics);
+          engine->SetViewportMetrics(kImplicitViewId, viewport_metrics);
           const auto frame_begin_time = fml::TimePoint::Now();
           const auto frame_end_time =
               frame_begin_time + fml::TimeDelta::FromSecondsF(1.0 / 60.0);
@@ -146,6 +189,7 @@ void ShellTest::SetViewportMetrics(Shell* shell, double width, double height) {
               std::make_unique<FrameTimingsRecorder>();
           recorder->RecordVsync(frame_begin_time, frame_end_time);
           engine->animator_->BeginFrame(std::move(recorder));
+          engine->animator_->EndFrame();
         }
         latch.Signal();
       });
@@ -164,23 +208,22 @@ void ShellTest::NotifyIdle(Shell* shell, fml::TimeDelta deadline) {
   latch.Wait();
 }
 
-void ShellTest::PumpOneFrame(Shell* shell,
-                             double width,
-                             double height,
-                             LayerTreeBuilder builder) {
-  PumpOneFrame(shell, {1.0, width, height, 22}, std::move(builder));
+void ShellTest::PumpOneFrame(Shell* shell) {
+  PumpOneFrame(shell, ViewContent::DummyView());
 }
 
-void ShellTest::PumpOneFrame(Shell* shell,
-                             const flutter::ViewportMetrics& viewport_metrics,
-                             LayerTreeBuilder builder) {
+void ShellTest::PumpOneFrame(Shell* shell, FrameContent frame_content) {
   // Set viewport to nonempty, and call Animator::BeginFrame to make the layer
   // tree pipeline nonempty. Without either of this, the layer tree below
   // won't be rasterized.
   fml::AutoResetWaitableEvent latch;
+  fml::WeakPtr<RuntimeDelegate> runtime_delegate = shell->weak_engine_;
   shell->GetTaskRunners().GetUITaskRunner()->PostTask(
-      [&latch, engine = shell->weak_engine_, viewport_metrics]() {
-        engine->SetViewportMetrics(viewport_metrics);
+      [&latch, engine = shell->weak_engine_, &frame_content,
+       runtime_delegate]() {
+        for (auto& [view_id, view_content] : frame_content) {
+          engine->SetViewportMetrics(view_id, view_content.viewport_metrics);
+        }
         const auto frame_begin_time = fml::TimePoint::Now();
         const auto frame_end_time =
             frame_begin_time + fml::TimeDelta::FromSecondsF(1.0 / 60.0);
@@ -188,27 +231,28 @@ void ShellTest::PumpOneFrame(Shell* shell,
             std::make_unique<FrameTimingsRecorder>();
         recorder->RecordVsync(frame_begin_time, frame_end_time);
         engine->animator_->BeginFrame(std::move(recorder));
-        latch.Signal();
-      });
-  latch.Wait();
 
-  latch.Reset();
-  // Call |Render| to rasterize a layer tree and trigger |OnFrameRasterized|
-  fml::WeakPtr<RuntimeDelegate> runtime_delegate = shell->weak_engine_;
-  shell->GetTaskRunners().GetUITaskRunner()->PostTask(
-      [&latch, runtime_delegate, &builder, viewport_metrics]() {
-        auto layer_tree = std::make_shared<LayerTree>(
-            SkISize::Make(viewport_metrics.physical_width,
-                          viewport_metrics.physical_height),
-            static_cast<float>(viewport_metrics.device_pixel_ratio));
-        SkMatrix identity;
-        identity.setIdentity();
-        auto root_layer = std::make_shared<TransformLayer>(identity);
-        layer_tree->set_root_layer(root_layer);
-        if (builder) {
-          builder(root_layer);
+        // The BeginFrame phase and the EndFrame phase must be performed in a
+        // single task, otherwise a normal vsync might be inserted in between,
+        // causing flaky assertion errors.
+
+        for (auto& [view_id, view_content] : frame_content) {
+          SkMatrix identity;
+          identity.setIdentity();
+          auto root_layer = std::make_shared<TransformLayer>(identity);
+          auto layer_tree = std::make_unique<LayerTree>(
+              LayerTree::Config{.root_layer = root_layer},
+              SkISize::Make(view_content.viewport_metrics.physical_width,
+                            view_content.viewport_metrics.physical_height));
+          float device_pixel_ratio = static_cast<float>(
+              view_content.viewport_metrics.device_pixel_ratio);
+          if (view_content.builder) {
+            view_content.builder(root_layer);
+          }
+          runtime_delegate->Render(view_id, std::move(layer_tree),
+                                   device_pixel_ratio);
         }
-        runtime_delegate->Render(std::move(layer_tree));
+        engine->animator_->EndFrame();
         latch.Signal();
       });
   latch.Wait();
@@ -318,46 +362,23 @@ fml::TimePoint ShellTest::GetLatestFrameTargetTime(Shell* shell) const {
   return shell->GetLatestFrameTargetTime();
 }
 
-std::unique_ptr<Shell> ShellTest::CreateShell(const Settings& settings,
-                                              bool simulate_vsync) {
-  return CreateShell(settings, GetTaskRunnersForFixture(), simulate_vsync);
-}
-
 std::unique_ptr<Shell> ShellTest::CreateShell(
     const Settings& settings,
-    TaskRunners task_runners,
-    bool simulate_vsync,
-    const std::shared_ptr<ShellTestExternalViewEmbedder>&
-        shell_test_external_view_embedder,
-    bool is_gpu_disabled,
-    ShellTestPlatformView::BackendType rendering_backend,
-    Shell::CreateCallback<PlatformView> platform_view_create_callback) {
-  const auto vsync_clock = std::make_shared<ShellTestVsyncClock>();
-
-  CreateVsyncWaiter create_vsync_waiter = [&]() {
-    if (simulate_vsync) {
-      return static_cast<std::unique_ptr<VsyncWaiter>>(
-          std::make_unique<ShellTestVsyncWaiter>(task_runners, vsync_clock));
-    } else {
-      return static_cast<std::unique_ptr<VsyncWaiter>>(
-          std::make_unique<VsyncWaiterFallback>(task_runners, true));
-    }
-  };
+    std::optional<TaskRunners> task_runners) {
+  return CreateShell({
+      .settings = settings,
+      .task_runners = std::move(task_runners),
+  });
+}
 
+std::unique_ptr<Shell> ShellTest::CreateShell(const Config& config) {
+  TaskRunners task_runners = config.task_runners.has_value()
+                                 ? config.task_runners.value()
+                                 : GetTaskRunnersForFixture();
+  Shell::CreateCallback<PlatformView> platform_view_create_callback =
+      config.platform_view_create_callback;
   if (!platform_view_create_callback) {
-    platform_view_create_callback = [vsync_clock,                        //
-                                     &create_vsync_waiter,               //
-                                     shell_test_external_view_embedder,  //
-                                     rendering_backend                   //
-    ](Shell& shell) {
-      return ShellTestPlatformView::Create(shell,                             //
-                                           shell.GetTaskRunners(),            //
-                                           vsync_clock,                       //
-                                           create_vsync_waiter,               //
-                                           rendering_backend,                 //
-                                           shell_test_external_view_embedder  //
-      );
-    };
+    platform_view_create_callback = ShellTestPlatformViewBuilder({});
   }
 
   Shell::CreateCallback<Rasterizer> rasterizer_create_callback =
@@ -365,10 +386,10 @@ std::unique_ptr<Shell> ShellTest::CreateShell(
 
   return Shell::Create(flutter::PlatformData(),        //
                        task_runners,                   //
-                       settings,                       //
+                       config.settings,                //
                        platform_view_create_callback,  //
                        rasterizer_create_callback,     //
-                       is_gpu_disabled                 //
+                       config.is_gpu_disabled          //
   );
 }
 
@@ -396,5 +417,9 @@ size_t ShellTest::GetLiveTrackedPathCount(
       });
 }
 
+void ShellTest::TurnOffGPU(Shell* shell, bool value) {
+  shell->is_gpu_disabled_sync_switch_->SetSwitch(value);
+}
+
 }  // namespace testing
 }  // namespace flutter
diff --git a/shell/common/shell_test.h b/shell/common/shell_test.h
index b9e95cc590e8b6da8de03bcf0991562681a1b6e4..c11ad1174dc886724246deea1d9f2ffb5cd3b60d 100644
--- a/shell/common/shell_test.h
+++ b/shell/common/shell_test.h
@@ -29,24 +29,58 @@
 namespace flutter {
 namespace testing {
 
+// The signature of ViewContent::builder.
+using LayerTreeBuilder =
+    std::function<void(std::shared_ptr<ContainerLayer> root)>;
+struct ViewContent;
+// Defines the content to be rendered to all views of a frame in PumpOneFrame.
+using FrameContent = std::map<int64_t, ViewContent>;
+// Defines the content to be rendered to a view in PumpOneFrame.
+struct ViewContent {
+  flutter::ViewportMetrics viewport_metrics;
+  // Given the root layer, this callback builds the layer tree to be rasterized
+  // in PumpOneFrame.
+  LayerTreeBuilder builder;
+
+  // Build a frame with no views. This is useful when PumpOneFrame is used just
+  // to schedule the frame while the frame content is defined by other means.
+  static FrameContent NoViews();
+
+  // Build a frame with a single implicit view with the specific size and no
+  // content.
+  static FrameContent DummyView(double width = 1, double height = 1);
+
+  // Build a frame with a single implicit view with the specific viewport
+  // metrics and no content.
+  static FrameContent DummyView(flutter::ViewportMetrics viewport_metrics);
+
+  // Build a frame with a single implicit view with the specific size and
+  // content.
+  static FrameContent ImplicitView(double width,
+                                   double height,
+                                   LayerTreeBuilder builder);
+};
+
 class ShellTest : public FixtureTest {
  public:
+  struct Config {
+    // Required.
+    const Settings& settings;
+    // Defaults to GetTaskRunnersForFixture().
+    std::optional<TaskRunners> task_runners = {};
+    bool is_gpu_disabled = false;
+    // Defaults to calling ShellTestPlatformView::Create with the provided
+    // arguments.
+    Shell::CreateCallback<PlatformView> platform_view_create_callback;
+  };
+
   ShellTest();
 
   Settings CreateSettingsForFixture() override;
-  std::unique_ptr<Shell> CreateShell(const Settings& settings,
-                                     bool simulate_vsync = false);
   std::unique_ptr<Shell> CreateShell(
       const Settings& settings,
-      TaskRunners task_runners,
-      bool simulate_vsync = false,
-      const std::shared_ptr<ShellTestExternalViewEmbedder>&
-          shell_test_external_view_embedder = nullptr,
-      bool is_gpu_disabled = false,
-      ShellTestPlatformView::BackendType rendering_backend =
-          ShellTestPlatformView::BackendType::kDefaultBackend,
-      Shell::CreateCallback<PlatformView> platform_view_create_callback =
-          nullptr);
+      std::optional<TaskRunners> task_runners = {});
+  std::unique_ptr<Shell> CreateShell(const Config& config);
   void DestroyShell(std::unique_ptr<Shell> shell);
   void DestroyShell(std::unique_ptr<Shell> shell,
                     const TaskRunners& task_runners);
@@ -54,6 +88,9 @@ class ShellTest : public FixtureTest {
 
   fml::TimePoint GetLatestFrameTargetTime(Shell* shell) const;
 
+  void SendPlatformMessage(Shell* shell,
+                           std::unique_ptr<PlatformMessage> message);
+
   void SendEnginePlatformMessage(Shell* shell,
                                  std::unique_ptr<PlatformMessage> message);
 
@@ -65,24 +102,14 @@ class ShellTest : public FixtureTest {
   static void RestartEngine(Shell* shell, RunConfiguration configuration);
 
   /// Issue as many VSYNC as needed to flush the UI tasks so far, and reset
-  /// the `will_draw_new_frame` to true.
-  static void VSyncFlush(Shell* shell, bool& will_draw_new_frame);
-
-  /// Given the root layer, this callback builds the layer tree to be rasterized
-  /// in PumpOneFrame.
-  using LayerTreeBuilder =
-      std::function<void(std::shared_ptr<ContainerLayer> root)>;
+  /// the content of `will_draw_new_frame` to true if it's not nullptr.
+  static void VSyncFlush(Shell* shell, bool* will_draw_new_frame = nullptr);
 
   static void SetViewportMetrics(Shell* shell, double width, double height);
   static void NotifyIdle(Shell* shell, fml::TimeDelta deadline);
 
-  static void PumpOneFrame(Shell* shell,
-                           double width = 1,
-                           double height = 1,
-                           LayerTreeBuilder = {});
-  static void PumpOneFrame(Shell* shell,
-                           const flutter::ViewportMetrics& viewport_metrics,
-                           LayerTreeBuilder = {});
+  static void PumpOneFrame(Shell* shell);
+  static void PumpOneFrame(Shell* shell, FrameContent frame_content);
   static void DispatchFakePointerData(Shell* shell);
   static void DispatchPointerData(Shell* shell,
                                   std::unique_ptr<PointerDataPacket> packet);
@@ -130,6 +157,8 @@ class ShellTest : public FixtureTest {
   static size_t GetLiveTrackedPathCount(
       const std::shared_ptr<VolatilePathTracker>& tracker);
 
+  static void TurnOffGPU(Shell* shell, bool value);
+
  private:
   ThreadHost thread_host_;
 
diff --git a/shell/common/shell_test_external_view_embedder.cc b/shell/common/shell_test_external_view_embedder.cc
index 7d660b724b2f22c004aa10304ebc206669cc6b4f..dd351b5dfc60526c86a26c94998e636482838ba7 100644
--- a/shell/common/shell_test_external_view_embedder.cc
+++ b/shell/common/shell_test_external_view_embedder.cc
@@ -41,10 +41,13 @@ void ShellTestExternalViewEmbedder::CancelFrame() {}
 
 // |ExternalViewEmbedder|
 void ShellTestExternalViewEmbedder::BeginFrame(
-    SkISize frame_size,
     GrDirectContext* context,
-    double device_pixel_ratio,
-    fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
+    const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {}
+
+// |ExternalViewEmbedder|
+void ShellTestExternalViewEmbedder::PrepareFlutterView(
+    SkISize frame_size,
+    double device_pixel_ratio) {
   visited_platform_views_.clear();
   mutators_stacks_.clear();
   current_composition_params_.clear();
@@ -52,36 +55,20 @@ void ShellTestExternalViewEmbedder::BeginFrame(
 
 // |ExternalViewEmbedder|
 void ShellTestExternalViewEmbedder::PrerollCompositeEmbeddedView(
-    int view_id,
+    int64_t view_id,
     std::unique_ptr<EmbeddedViewParams> params) {
   SkRect view_bounds = SkRect::Make(frame_size_);
-  std::unique_ptr<EmbedderViewSlice> view;
-  if (params->display_list_enabled()) {
-    view = std::make_unique<DisplayListEmbedderViewSlice>(view_bounds);
-  } else {
-    view = std::make_unique<SkPictureEmbedderViewSlice>(view_bounds);
-  }
+  auto view = std::make_unique<DisplayListEmbedderViewSlice>(view_bounds);
   slices_.insert_or_assign(view_id, std::move(view));
 }
 
 // |ExternalViewEmbedder|
 PostPrerollResult ShellTestExternalViewEmbedder::PostPrerollAction(
-    fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
+    const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {
   FML_DCHECK(raster_thread_merger);
   return post_preroll_result_;
 }
 
-// |ExternalViewEmbedder|
-std::vector<SkCanvas*> ShellTestExternalViewEmbedder::GetCurrentCanvases() {
-  return {};
-}
-
-// |ExternalViewEmbedder|
-std::vector<DisplayListBuilder*>
-ShellTestExternalViewEmbedder::GetCurrentBuilders() {
-  return {};
-}
-
 // |ExternalViewEmbedder|
 void ShellTestExternalViewEmbedder::PushVisitedPlatformView(int64_t view_id) {
   visited_platform_views_.push_back(view_id);
@@ -89,7 +76,7 @@ void ShellTestExternalViewEmbedder::PushVisitedPlatformView(int64_t view_id) {
 
 // |ExternalViewEmbedder|
 void ShellTestExternalViewEmbedder::PushFilterToVisitedPlatformViews(
-    std::shared_ptr<const DlImageFilter> filter,
+    const std::shared_ptr<const DlImageFilter>& filter,
     const SkRect& filter_rect) {
   for (int64_t id : visited_platform_views_) {
     EmbeddedViewParams params = current_composition_params_[id];
@@ -99,14 +86,16 @@ void ShellTestExternalViewEmbedder::PushFilterToVisitedPlatformViews(
   }
 }
 
-EmbedderPaintContext ShellTestExternalViewEmbedder::CompositeEmbeddedView(
-    int view_id) {
-  return {slices_[view_id]->canvas(), slices_[view_id]->builder()};
+DlCanvas* ShellTestExternalViewEmbedder::CompositeEmbeddedView(
+    int64_t view_id) {
+  return slices_[view_id]->canvas();
 }
 
 // |ExternalViewEmbedder|
-void ShellTestExternalViewEmbedder::SubmitFrame(
+void ShellTestExternalViewEmbedder::SubmitFlutterView(
+    int64_t flutter_view_id,
     GrDirectContext* context,
+    const std::shared_ptr<impeller::AiksContext>& aiks_context,
     std::unique_ptr<SurfaceFrame> frame) {
   if (!frame) {
     return;
@@ -124,12 +113,12 @@ void ShellTestExternalViewEmbedder::SubmitFrame(
 // |ExternalViewEmbedder|
 void ShellTestExternalViewEmbedder::EndFrame(
     bool should_resubmit_frame,
-    fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
+    const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {
   end_frame_call_back_(should_resubmit_frame, raster_thread_merger);
 }
 
 // |ExternalViewEmbedder|
-SkCanvas* ShellTestExternalViewEmbedder::GetRootCanvas() {
+DlCanvas* ShellTestExternalViewEmbedder::GetRootCanvas() {
   return nullptr;
 }
 
diff --git a/shell/common/shell_test_external_view_embedder.h b/shell/common/shell_test_external_view_embedder.h
index 5bff1c97ebdc9818800722ccd61beb19c8fcba5b..b000c239435fbae564105a88c3d1b004e493eeea 100644
--- a/shell/common/shell_test_external_view_embedder.h
+++ b/shell/common/shell_test_external_view_embedder.h
@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_TEST_EXTERNAL_VIEW_EMBEDDER_H_
-#define FLUTTER_SHELL_TEST_EXTERNAL_VIEW_EMBEDDER_H_
+#ifndef FLUTTER_SHELL_COMMON_SHELL_TEST_EXTERNAL_VIEW_EMBEDDER_H_
+#define FLUTTER_SHELL_COMMON_SHELL_TEST_EXTERNAL_VIEW_EMBEDDER_H_
 
 #include "flutter/flow/embedded_views.h"
 #include "flutter/fml/raster_thread_merger.h"
-#include "third_party/skia/include/core/SkPictureRecorder.h"
 
 namespace flutter {
 
@@ -29,7 +28,7 @@ class ShellTestExternalViewEmbedder final : public ExternalViewEmbedder {
   // returns the new `post_preroll_result`.
   void UpdatePostPrerollResult(PostPrerollResult post_preroll_result);
 
-  // Gets the number of times the SubmitFrame method has been called in
+  // Gets the number of times the SubmitFlutterView method has been called in
   // the external view embedder.
   int GetSubmittedFrameCount();
 
@@ -47,49 +46,49 @@ class ShellTestExternalViewEmbedder final : public ExternalViewEmbedder {
   void CancelFrame() override;
 
   // |ExternalViewEmbedder|
-  void BeginFrame(
-      SkISize frame_size,
-      GrDirectContext* context,
-      double device_pixel_ratio,
-      fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) override;
+  void BeginFrame(GrDirectContext* context,
+                  const fml::RefPtr<fml::RasterThreadMerger>&
+                      raster_thread_merger) override;
+
+  // |ExternalViewEmbedder|
+  void PrepareFlutterView(SkISize frame_size,
+                          double device_pixel_ratio) override;
 
   // |ExternalViewEmbedder|
   void PrerollCompositeEmbeddedView(
-      int view_id,
+      int64_t view_id,
       std::unique_ptr<EmbeddedViewParams> params) override;
 
   // |ExternalViewEmbedder|
   PostPrerollResult PostPrerollAction(
-      fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) override;
-
-  // |ExternalViewEmbedder|
-  std::vector<SkCanvas*> GetCurrentCanvases() override;
-
-  // |ExternalViewEmbedder|
-  std::vector<DisplayListBuilder*> GetCurrentBuilders() override;
+      const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger)
+      override;
 
   // |ExternalViewEmbedder|
-  EmbedderPaintContext CompositeEmbeddedView(int view_id) override;
+  DlCanvas* CompositeEmbeddedView(int64_t view_id) override;
 
   // |ExternalViewEmbedder|
   void PushVisitedPlatformView(int64_t view_id) override;
 
   // |ExternalViewEmbedder|
   void PushFilterToVisitedPlatformViews(
-      std::shared_ptr<const DlImageFilter> filter,
+      const std::shared_ptr<const DlImageFilter>& filter,
       const SkRect& filter_rect) override;
 
   // |ExternalViewEmbedder|
-  void SubmitFrame(GrDirectContext* context,
-                   std::unique_ptr<SurfaceFrame> frame) override;
+  void SubmitFlutterView(
+      int64_t flutter_view_id,
+      GrDirectContext* context,
+      const std::shared_ptr<impeller::AiksContext>& aiks_context,
+      std::unique_ptr<SurfaceFrame> frame) override;
 
   // |ExternalViewEmbedder|
-  void EndFrame(
-      bool should_resubmit_frame,
-      fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) override;
+  void EndFrame(bool should_resubmit_frame,
+                const fml::RefPtr<fml::RasterThreadMerger>&
+                    raster_thread_merger) override;
 
   // |ExternalViewEmbedder|
-  SkCanvas* GetRootCanvas() override;
+  DlCanvas* GetRootCanvas() override;
 
   // |ExternalViewEmbedder|
   bool SupportsDynamicThreadMerging() override;
@@ -112,4 +111,4 @@ class ShellTestExternalViewEmbedder final : public ExternalViewEmbedder {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_TEST_EXTERNAL_VIEW_EMBEDDER_H_
+#endif  // FLUTTER_SHELL_COMMON_SHELL_TEST_EXTERNAL_VIEW_EMBEDDER_H_
diff --git a/shell/common/shell_test_platform_view.cc b/shell/common/shell_test_platform_view.cc
index 7653b75a4d96a5bdc60ae4dac68fa727a01950a0..248448f567c7f62760c2ed67d3e08b8b03cd8ccd 100644
--- a/shell/common/shell_test_platform_view.cc
+++ b/shell/common/shell_test_platform_view.cc
@@ -14,6 +14,8 @@
 #include "flutter/shell/common/shell_test_platform_view_metal.h"
 #endif  // SHELL_ENABLE_METAL
 
+#include "flutter/shell/common/vsync_waiter_fallback.h"
+
 namespace flutter {
 namespace testing {
 
@@ -24,7 +26,8 @@ std::unique_ptr<ShellTestPlatformView> ShellTestPlatformView::Create(
     const CreateVsyncWaiter& create_vsync_waiter,
     BackendType backend,
     const std::shared_ptr<ShellTestExternalViewEmbedder>&
-        shell_test_external_view_embedder) {
+        shell_test_external_view_embedder,
+    const std::shared_ptr<const fml::SyncSwitch>& is_gpu_disabled_sync_switch) {
   // TODO(gw280): https://github.com/flutter/flutter/issues/50298
   // Make this fully runtime configurable
   switch (backend) {
@@ -45,7 +48,7 @@ std::unique_ptr<ShellTestPlatformView> ShellTestPlatformView::Create(
     case BackendType::kMetalBackend:
       return std::make_unique<ShellTestPlatformViewMetal>(
           delegate, task_runners, vsync_clock, create_vsync_waiter,
-          shell_test_external_view_embedder);
+          shell_test_external_view_embedder, is_gpu_disabled_sync_switch);
 #endif  // SHELL_ENABLE_METAL
 
     default:
@@ -54,5 +57,34 @@ std::unique_ptr<ShellTestPlatformView> ShellTestPlatformView::Create(
   }
 }
 
+ShellTestPlatformViewBuilder::ShellTestPlatformViewBuilder(Config config)
+    : config_(std::move(config)) {}
+
+std::unique_ptr<PlatformView> ShellTestPlatformViewBuilder::operator()(
+    Shell& shell) {
+  const TaskRunners& task_runners = shell.GetTaskRunners();
+  const auto vsync_clock = std::make_shared<ShellTestVsyncClock>();
+  CreateVsyncWaiter create_vsync_waiter = [&task_runners, vsync_clock,
+                                           simulate_vsync =
+                                               config_.simulate_vsync]() {
+    if (simulate_vsync) {
+      return static_cast<std::unique_ptr<VsyncWaiter>>(
+          std::make_unique<ShellTestVsyncWaiter>(task_runners, vsync_clock));
+    } else {
+      return static_cast<std::unique_ptr<VsyncWaiter>>(
+          std::make_unique<VsyncWaiterFallback>(task_runners, true));
+    }
+  };
+  return ShellTestPlatformView::Create(
+      shell,                                      //
+      task_runners,                               //
+      vsync_clock,                                //
+      create_vsync_waiter,                        //
+      config_.rendering_backend,                  //
+      config_.shell_test_external_view_embedder,  //
+      shell.GetIsGpuDisabledSyncSwitch()          //
+  );
+}
+
 }  // namespace testing
 }  // namespace flutter
diff --git a/shell/common/shell_test_platform_view.h b/shell/common/shell_test_platform_view.h
index 08a8baf3b43d6c61aeee2febe02bca0eadcece9e..459476c668bf257605b62e4b97c8ded349763ce4 100644
--- a/shell/common/shell_test_platform_view.h
+++ b/shell/common/shell_test_platform_view.h
@@ -15,10 +15,10 @@ namespace testing {
 class ShellTestPlatformView : public PlatformView {
  public:
   enum class BackendType {
+    kDefaultBackend = 0,
     kGLBackend,
     kVulkanBackend,
     kMetalBackend,
-    kDefaultBackend,
   };
 
   static std::unique_ptr<ShellTestPlatformView> Create(
@@ -28,19 +28,42 @@ class ShellTestPlatformView : public PlatformView {
       const CreateVsyncWaiter& create_vsync_waiter,
       BackendType backend,
       const std::shared_ptr<ShellTestExternalViewEmbedder>&
-          shell_test_external_view_embedder);
+          shell_test_external_view_embedder,
+      const std::shared_ptr<const fml::SyncSwitch>&
+          is_gpu_disabled_sync_switch);
 
   virtual void SimulateVSync() = 0;
 
  protected:
   ShellTestPlatformView(PlatformView::Delegate& delegate,
-                        TaskRunners task_runners)
+                        const TaskRunners& task_runners)
       : PlatformView(delegate, task_runners) {}
 
   FML_DISALLOW_COPY_AND_ASSIGN(ShellTestPlatformView);
 };
 
+// Create a ShellTestPlatformView from configuration struct.
+class ShellTestPlatformViewBuilder {
+ public:
+  struct Config {
+    bool simulate_vsync = false;
+    std::shared_ptr<ShellTestExternalViewEmbedder>
+        shell_test_external_view_embedder = nullptr;
+    ShellTestPlatformView::BackendType rendering_backend =
+        ShellTestPlatformView::BackendType::kDefaultBackend;
+  };
+
+  explicit ShellTestPlatformViewBuilder(Config config);
+  ~ShellTestPlatformViewBuilder() = default;
+
+  // Override operator () to make this class assignable to std::function.
+  std::unique_ptr<PlatformView> operator()(Shell& shell);
+
+ private:
+  Config config_;
+};
+
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_COMMON_SHELL_TEST_PLATFORM_VIEW_GL_H_
+#endif  // FLUTTER_SHELL_COMMON_SHELL_TEST_PLATFORM_VIEW_H_
diff --git a/shell/common/shell_test_platform_view_gl.cc b/shell/common/shell_test_platform_view_gl.cc
index 98323108fac442911575073b4c49a6159f74acb1..3a52772d0a0f78c15482bbaa6c07e877d6626179 100644
--- a/shell/common/shell_test_platform_view_gl.cc
+++ b/shell/common/shell_test_platform_view_gl.cc
@@ -6,11 +6,30 @@
 
 #include <utility>
 
+#include <EGL/egl.h>
+
 #include "flutter/shell/gpu/gpu_surface_gl_skia.h"
+#include "impeller/entity/gles/entity_shaders_gles.h"
+
+#if IMPELLER_ENABLE_3D
+#include "impeller/scene/shaders/gles/scene_shaders_gles.h"  // nogncheck
+#endif
 
 namespace flutter {
 namespace testing {
 
+static std::vector<std::shared_ptr<fml::Mapping>> ShaderLibraryMappings() {
+  return {
+      std::make_shared<fml::NonOwnedMapping>(
+          impeller_entity_shaders_gles_data,
+          impeller_entity_shaders_gles_length),
+#if IMPELLER_ENABLE_3D
+      std::make_shared<fml::NonOwnedMapping>(
+          impeller_scene_shaders_gles_data, impeller_scene_shaders_gles_length),
+#endif
+  };
+}
+
 ShellTestPlatformViewGL::ShellTestPlatformViewGL(
     PlatformView::Delegate& delegate,
     const TaskRunners& task_runners,
@@ -23,7 +42,23 @@ ShellTestPlatformViewGL::ShellTestPlatformViewGL(
       create_vsync_waiter_(std::move(create_vsync_waiter)),
       vsync_clock_(std::move(vsync_clock)),
       shell_test_external_view_embedder_(
-          std::move(shell_test_external_view_embedder)) {}
+          std::move(shell_test_external_view_embedder)) {
+  if (GetSettings().enable_impeller) {
+    auto resolver = [](const char* name) -> void* {
+      return reinterpret_cast<void*>(::eglGetProcAddress(name));
+    };
+    // ANGLE needs this to initialize version strings checked by
+    // impeller::ProcTableGLES.
+    gl_surface_.MakeCurrent();
+    auto gl = std::make_unique<impeller::ProcTableGLES>(resolver);
+    if (!gl->IsValid()) {
+      FML_LOG(ERROR) << "Proc table when a shell unittests invalid.";
+      return;
+    }
+    impeller_context_ = impeller::ContextGLES::Create(
+        std::move(gl), ShaderLibraryMappings(), true);
+  }
+}
 
 ShellTestPlatformViewGL::~ShellTestPlatformViewGL() = default;
 
diff --git a/shell/common/shell_test_platform_view_gl.h b/shell/common/shell_test_platform_view_gl.h
index 4dca801da3c347c70c2573c47c14f90a1136f514..12aa92d7f96740bd87700b4c63e920282a14229d 100644
--- a/shell/common/shell_test_platform_view_gl.h
+++ b/shell/common/shell_test_platform_view_gl.h
@@ -9,6 +9,7 @@
 #include "flutter/shell/common/shell_test_platform_view.h"
 #include "flutter/shell/gpu/gpu_surface_gl_delegate.h"
 #include "flutter/testing/test_gl_surface.h"
+#include "impeller/renderer/backend/gles/context_gles.h"
 
 namespace flutter {
 namespace testing {
@@ -29,7 +30,14 @@ class ShellTestPlatformViewGL : public ShellTestPlatformView,
   // |ShellTestPlatformView|
   virtual void SimulateVSync() override;
 
+  // |PlatformView|
+  std::shared_ptr<impeller::Context> GetImpellerContext() const {
+    return impeller_context_;
+  }
+
  private:
+  std::shared_ptr<impeller::ContextGLES> impeller_context_;
+
   TestGLSurface gl_surface_;
 
   CreateVsyncWaiter create_vsync_waiter_;
diff --git a/shell/common/shell_test_platform_view_metal.h b/shell/common/shell_test_platform_view_metal.h
index be9dc9ebd4de2f2cacc5e1f272ca9d5d856481a7..c5c0a8d454d046e1b189e6e0dd56b29fe42957c8 100644
--- a/shell/common/shell_test_platform_view_metal.h
+++ b/shell/common/shell_test_platform_view_metal.h
@@ -22,7 +22,9 @@ class ShellTestPlatformViewMetal final : public ShellTestPlatformView,
                              std::shared_ptr<ShellTestVsyncClock> vsync_clock,
                              CreateVsyncWaiter create_vsync_waiter,
                              std::shared_ptr<ShellTestExternalViewEmbedder>
-                                 shell_test_external_view_embedder);
+                                 shell_test_external_view_embedder,
+                             const std::shared_ptr<const fml::SyncSwitch>&
+                                 is_gpu_disabled_sync_switch);
 
   // |ShellTestPlatformView|
   virtual ~ShellTestPlatformViewMetal() override;
@@ -49,6 +51,9 @@ class ShellTestPlatformViewMetal final : public ShellTestPlatformView,
   // |PlatformView|
   std::unique_ptr<Surface> CreateRenderingSurface() override;
 
+  // |PlatformView|
+  std::shared_ptr<impeller::Context> GetImpellerContext() const override;
+
   // |GPUSurfaceMetalDelegate|
   GPUCAMetalLayerHandle GetCAMetalLayer(
       const SkISize& frame_info) const override;
diff --git a/shell/common/shell_test_platform_view_metal.mm b/shell/common/shell_test_platform_view_metal.mm
index 814e67e6f39331831486a94f652c97d4719cdfe9..93cf262e4a810eb6998e052404097fad5d9d12ca 100644
--- a/shell/common/shell_test_platform_view_metal.mm
+++ b/shell/common/shell_test_platform_view_metal.mm
@@ -9,7 +9,9 @@
 #include <utility>
 
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
+#include "flutter/shell/gpu/gpu_surface_metal_impeller.h"
 #include "flutter/shell/gpu/gpu_surface_metal_skia.h"
+#include "flutter/shell/platform/darwin/graphics/FlutterDarwinContextMetalImpeller.h"
 #include "flutter/shell/platform/darwin/graphics/FlutterDarwinContextMetalSkia.h"
 
 namespace flutter {
@@ -29,12 +31,22 @@ static fml::scoped_nsprotocol<id<MTLTexture>> CreateOffscreenTexture(id<MTLDevic
 // non-Objective-C TUs.
 class DarwinContextMetal {
  public:
-  DarwinContextMetal()
-      : context_([[FlutterDarwinContextMetalSkia alloc] initWithDefaultMTLDevice]),
-        offscreen_texture_(CreateOffscreenTexture([context_.get() device])) {}
+  explicit DarwinContextMetal(
+      bool impeller,
+      const std::shared_ptr<const fml::SyncSwitch>& is_gpu_disabled_sync_switch)
+      : context_(impeller ? nil : [[FlutterDarwinContextMetalSkia alloc] initWithDefaultMTLDevice]),
+        impeller_context_(
+            impeller ? [[FlutterDarwinContextMetalImpeller alloc] init:is_gpu_disabled_sync_switch]
+                     : nil),
+        offscreen_texture_(CreateOffscreenTexture(
+            impeller ? [impeller_context_ context]->GetMTLDevice() : [context_ device])) {}
 
   ~DarwinContextMetal() = default;
 
+  fml::scoped_nsobject<FlutterDarwinContextMetalImpeller> impeller_context() const {
+    return impeller_context_;
+  }
+
   fml::scoped_nsobject<FlutterDarwinContextMetalSkia> context() const { return context_; }
 
   fml::scoped_nsprotocol<id<MTLTexture>> offscreen_texture() const { return offscreen_texture_; }
@@ -48,6 +60,7 @@ class DarwinContextMetal {
 
  private:
   const fml::scoped_nsobject<FlutterDarwinContextMetalSkia> context_;
+  const fml::scoped_nsobject<FlutterDarwinContextMetalImpeller> impeller_context_;
   const fml::scoped_nsprotocol<id<MTLTexture>> offscreen_texture_;
 
   FML_DISALLOW_COPY_AND_ASSIGN(DarwinContextMetal);
@@ -58,14 +71,20 @@ ShellTestPlatformViewMetal::ShellTestPlatformViewMetal(
     const TaskRunners& task_runners,
     std::shared_ptr<ShellTestVsyncClock> vsync_clock,
     CreateVsyncWaiter create_vsync_waiter,
-    std::shared_ptr<ShellTestExternalViewEmbedder> shell_test_external_view_embedder)
+    std::shared_ptr<ShellTestExternalViewEmbedder> shell_test_external_view_embedder,
+    const std::shared_ptr<const fml::SyncSwitch>& is_gpu_disabled_sync_switch)
     : ShellTestPlatformView(delegate, task_runners),
       GPUSurfaceMetalDelegate(MTLRenderTargetType::kMTLTexture),
-      metal_context_(std::make_unique<DarwinContextMetal>()),
+      metal_context_(std::make_unique<DarwinContextMetal>(GetSettings().enable_impeller,
+                                                          is_gpu_disabled_sync_switch)),
       create_vsync_waiter_(std::move(create_vsync_waiter)),
       vsync_clock_(std::move(vsync_clock)),
       shell_test_external_view_embedder_(std::move(shell_test_external_view_embedder)) {
-  FML_CHECK([metal_context_->context() mainContext] != nil);
+  if (GetSettings().enable_impeller) {
+    FML_CHECK([metal_context_->impeller_context() context] != nil);
+  } else {
+    FML_CHECK([metal_context_->context() mainContext] != nil);
+  }
 }
 
 ShellTestPlatformViewMetal::~ShellTestPlatformViewMetal() = default;
@@ -93,10 +112,19 @@ PointerDataDispatcherMaker ShellTestPlatformViewMetal::GetDispatcherMaker() {
 
 // |PlatformView|
 std::unique_ptr<Surface> ShellTestPlatformViewMetal::CreateRenderingSurface() {
+  if (GetSettings().enable_impeller) {
+    return std::make_unique<GPUSurfaceMetalImpeller>(this,
+                                                     [metal_context_->impeller_context() context]);
+  }
   return std::make_unique<GPUSurfaceMetalSkia>(this, [metal_context_->context() mainContext],
                                                MsaaSampleCount::kNone);
 }
 
+// |PlatformView|
+std::shared_ptr<impeller::Context> ShellTestPlatformViewMetal::GetImpellerContext() const {
+  return [metal_context_->impeller_context() context];
+}
+
 // |GPUSurfaceMetalDelegate|
 GPUCAMetalLayerHandle ShellTestPlatformViewMetal::GetCAMetalLayer(const SkISize& frame_info) const {
   FML_CHECK(false) << "A Metal Delegate configured with MTLRenderTargetType::kMTLTexture was asked "
diff --git a/shell/common/shell_test_platform_view_vulkan.cc b/shell/common/shell_test_platform_view_vulkan.cc
index fa3267ef731da4595978e33dfe702c9a5b3d0634..11d9018d95f45e0a24000bbb133cc369fd2ed8ad 100644
--- a/shell/common/shell_test_platform_view_vulkan.cc
+++ b/shell/common/shell_test_platform_view_vulkan.cc
@@ -12,14 +12,14 @@
 #include "flutter/vulkan/vulkan_skia_proc_table.h"
 #include "flutter/vulkan/vulkan_utilities.h"
 
+#include "third_party/skia/include/core/SkSurface.h"
+#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
+#include "third_party/skia/include/gpu/ganesh/vk/GrVkDirectContext.h"
+
 #if OS_FUCHSIA
 #define VULKAN_SO_PATH "libvulkan.so"
-#elif FML_OS_MACOSX
-#define VULKAN_SO_PATH "libvk_swiftshader.dylib"
-#elif FML_OS_WIN
-#define VULKAN_SO_PATH "vk_swiftshader.dll"
 #else
-#define VULKAN_SO_PATH "libvk_swiftshader.so"
+#include "flutter/vulkan/swiftshader_path.h"
 #endif
 
 namespace flutter {
@@ -76,8 +76,7 @@ ShellTestPlatformViewVulkan::OffScreenSurface::OffScreenSurface(
     fml::RefPtr<vulkan::VulkanProcTable> vk,
     std::shared_ptr<ShellTestExternalViewEmbedder>
         shell_test_external_view_embedder)
-    : valid_(false),
-      vk_(std::move(vk)),
+    : vk_(std::move(vk)),
       shell_test_external_view_embedder_(
           std::move(shell_test_external_view_embedder)) {
   if (!vk_ || !vk_->HasAcquiredMandatoryProcAddresses()) {
@@ -139,7 +138,7 @@ bool ShellTestPlatformViewVulkan::OffScreenSurface::CreateSkiaGrContext() {
       MakeDefaultContextOptions(ContextType::kRender, GrBackendApi::kVulkan);
 
   sk_sp<GrDirectContext> context =
-      GrDirectContext::MakeVulkan(backend_context, options);
+      GrDirectContexts::MakeVulkan(backend_context, options);
 
   if (context == nullptr) {
     FML_DLOG(ERROR) << "Failed to create GrDirectContext";
@@ -194,11 +193,11 @@ ShellTestPlatformViewVulkan::OffScreenSurface::AcquireFrame(
     const SkISize& size) {
   auto image_info = SkImageInfo::Make(size, SkColorType::kRGBA_8888_SkColorType,
                                       SkAlphaType::kOpaque_SkAlphaType);
-  auto surface = SkSurface::MakeRenderTarget(context_.get(), SkBudgeted::kNo,
-                                             image_info, 0, nullptr);
+  auto surface = SkSurfaces::RenderTarget(context_.get(), skgpu::Budgeted::kNo,
+                                          image_info, 0, nullptr);
   SurfaceFrame::SubmitCallback callback = [](const SurfaceFrame&,
-                                             SkCanvas* canvas) -> bool {
-    canvas->flush();
+                                             DlCanvas* canvas) -> bool {
+    canvas->Flush();
     return true;
   };
 
diff --git a/shell/common/shell_test_platform_view_vulkan.h b/shell/common/shell_test_platform_view_vulkan.h
index 718f7fe6dec06959c9e4d6afa04319e408e6fb43..6631b10b64082c62c8b0a16f11e666613fce71a2 100644
--- a/shell/common/shell_test_platform_view_vulkan.h
+++ b/shell/common/shell_test_platform_view_vulkan.h
@@ -43,13 +43,14 @@ class ShellTestPlatformViewVulkan : public ShellTestPlatformView {
     // |Surface|
     std::unique_ptr<SurfaceFrame> AcquireFrame(const SkISize& size) override;
 
+    // |Surface|
     SkMatrix GetRootTransformation() const override;
 
     // |Surface|
     GrDirectContext* GetContext() override;
 
    private:
-    bool valid_;
+    bool valid_ = false;
     fml::RefPtr<vulkan::VulkanProcTable> vk_;
     std::shared_ptr<ShellTestExternalViewEmbedder>
         shell_test_external_view_embedder_;
diff --git a/shell/common/shell_unittests.cc b/shell/common/shell_unittests.cc
index d850eab6880120970a7c509f6342dc66b85bf80f..70dfdb4da95b204f066e4fe011ffcbf1063d8076 100644
--- a/shell/common/shell_unittests.cc
+++ b/shell/common/shell_unittests.cc
@@ -5,21 +5,30 @@
 #define FML_USED_ON_EMBEDDER
 
 #include <algorithm>
+#include <chrono>
 #include <ctime>
 #include <future>
 #include <memory>
+#include <strstream>
+#include <thread>
 #include <utility>
 #include <vector>
 
+#if SHELL_ENABLE_GL
+#include <EGL/egl.h>
+#endif  // SHELL_ENABLE_GL
+
+#include "assets/asset_resolver.h"
 #include "assets/directory_asset_bundle.h"
 #include "common/graphics/persistent_cache.h"
 #include "flutter/flow/layers/backdrop_filter_layer.h"
+#include "flutter/flow/layers/clip_rect_layer.h"
 #include "flutter/flow/layers/display_list_layer.h"
 #include "flutter/flow/layers/layer_raster_cache_item.h"
 #include "flutter/flow/layers/platform_view_layer.h"
 #include "flutter/flow/layers/transform_layer.h"
+#include "flutter/fml/backtrace.h"
 #include "flutter/fml/command_line.h"
-#include "flutter/fml/dart/dart_converter.h"
 #include "flutter/fml/make_copyable.h"
 #include "flutter/fml/message_loop.h"
 #include "flutter/fml/synchronization/count_down_latch.h"
@@ -33,12 +42,14 @@
 #include "flutter/shell/common/switches.h"
 #include "flutter/shell/common/thread_host.h"
 #include "flutter/shell/common/vsync_waiter_fallback.h"
+#include "flutter/shell/common/vsync_waiters_test.h"
 #include "flutter/shell/version/version.h"
+#include "flutter/testing/mock_canvas.h"
 #include "flutter/testing/testing.h"
 #include "gmock/gmock.h"
+#include "impeller/core/runtime_types.h"
 #include "third_party/rapidjson/include/rapidjson/writer.h"
 #include "third_party/skia/include/codec/SkCodecAnimation.h"
-#include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "third_party/tonic/converter/dart_converter.h"
 
 #ifdef SHELL_ENABLE_VULKAN
@@ -51,80 +62,117 @@
 namespace flutter {
 namespace testing {
 
+constexpr int64_t kImplicitViewId = 0ll;
+
 using ::testing::_;
 using ::testing::Return;
 
 namespace {
 class MockPlatformViewDelegate : public PlatformView::Delegate {
-  MOCK_METHOD1(OnPlatformViewCreated, void(std::unique_ptr<Surface> surface));
-
-  MOCK_METHOD0(OnPlatformViewDestroyed, void());
-
-  MOCK_METHOD0(OnPlatformViewScheduleFrame, void());
-
-  MOCK_METHOD1(OnPlatformViewSetNextFrameCallback,
-               void(const fml::closure& closure));
-
-  MOCK_METHOD1(OnPlatformViewSetViewportMetrics,
-               void(const ViewportMetrics& metrics));
-
-  MOCK_METHOD1(OnPlatformViewDispatchPlatformMessage,
-               void(std::unique_ptr<PlatformMessage> message));
-
-  MOCK_METHOD1(OnPlatformViewDispatchPointerDataPacket,
-               void(std::unique_ptr<PointerDataPacket> packet));
-
-  MOCK_METHOD3(OnPlatformViewDispatchSemanticsAction,
-               void(int32_t id,
-                    SemanticsAction action,
-                    fml::MallocMapping args));
-
-  MOCK_METHOD1(OnPlatformViewSetSemanticsEnabled, void(bool enabled));
-
-  MOCK_METHOD1(OnPlatformViewSetAccessibilityFeatures, void(int32_t flags));
-
-  MOCK_METHOD1(OnPlatformViewRegisterTexture,
-               void(std::shared_ptr<Texture> texture));
-
-  MOCK_METHOD1(OnPlatformViewUnregisterTexture, void(int64_t texture_id));
-
-  MOCK_METHOD1(OnPlatformViewMarkTextureFrameAvailable,
-               void(int64_t texture_id));
+  MOCK_METHOD(void,
+              OnPlatformViewCreated,
+              (std::unique_ptr<Surface> surface),
+              (override));
+
+  MOCK_METHOD(void, OnPlatformViewDestroyed, (), (override));
+
+  MOCK_METHOD(void, OnPlatformViewScheduleFrame, (), (override));
+
+  MOCK_METHOD(void,
+              OnPlatformViewSetNextFrameCallback,
+              (const fml::closure& closure),
+              (override));
+
+  MOCK_METHOD(void,
+              OnPlatformViewSetViewportMetrics,
+              (int64_t view_id, const ViewportMetrics& metrics),
+              (override));
+
+  MOCK_METHOD(void,
+              OnPlatformViewDispatchPlatformMessage,
+              (std::unique_ptr<PlatformMessage> message),
+              (override));
+
+  MOCK_METHOD(void,
+              OnPlatformViewDispatchPointerDataPacket,
+              (std::unique_ptr<PointerDataPacket> packet),
+              (override));
+
+  MOCK_METHOD(void,
+              OnPlatformViewDispatchSemanticsAction,
+              (int32_t id, SemanticsAction action, fml::MallocMapping args),
+              (override));
+
+  MOCK_METHOD(void,
+              OnPlatformViewSetSemanticsEnabled,
+              (bool enabled),
+              (override));
+
+  MOCK_METHOD(void,
+              OnPlatformViewSetAccessibilityFeatures,
+              (int32_t flags),
+              (override));
+
+  MOCK_METHOD(void,
+              OnPlatformViewRegisterTexture,
+              (std::shared_ptr<Texture> texture),
+              (override));
+
+  MOCK_METHOD(void,
+              OnPlatformViewUnregisterTexture,
+              (int64_t texture_id),
+              (override));
+
+  MOCK_METHOD(void,
+              OnPlatformViewMarkTextureFrameAvailable,
+              (int64_t texture_id),
+              (override));
 
   MOCK_METHOD(const Settings&,
               OnPlatformViewGetSettings,
               (),
               (const, override));
 
-  MOCK_METHOD3(LoadDartDeferredLibrary,
-               void(intptr_t loading_unit_id,
-                    std::unique_ptr<const fml::Mapping> snapshot_data,
-                    std::unique_ptr<const fml::Mapping> snapshot_instructions));
-
-  MOCK_METHOD3(LoadDartDeferredLibraryError,
-               void(intptr_t loading_unit_id,
-                    const std::string error_message,
-                    bool transient));
-
-  MOCK_METHOD2(UpdateAssetResolverByType,
-               void(std::unique_ptr<AssetResolver> updated_asset_resolver,
-                    AssetResolver::AssetResolverType type));
+  MOCK_METHOD(void,
+              LoadDartDeferredLibrary,
+              (intptr_t loading_unit_id,
+               std::unique_ptr<const fml::Mapping> snapshot_data,
+               std::unique_ptr<const fml::Mapping> snapshot_instructions),
+              (override));
+
+  MOCK_METHOD(void,
+              LoadDartDeferredLibraryError,
+              (intptr_t loading_unit_id,
+               const std::string error_message,
+               bool transient),
+              (override));
+
+  MOCK_METHOD(void,
+              UpdateAssetResolverByType,
+              (std::unique_ptr<AssetResolver> updated_asset_resolver,
+               AssetResolver::AssetResolverType type),
+              (override));
 };
 
 class MockSurface : public Surface {
  public:
-  MOCK_METHOD0(IsValid, bool());
+  MOCK_METHOD(bool, IsValid, (), (override));
 
-  MOCK_METHOD1(AcquireFrame,
-               std::unique_ptr<SurfaceFrame>(const SkISize& size));
+  MOCK_METHOD(std::unique_ptr<SurfaceFrame>,
+              AcquireFrame,
+              (const SkISize& size),
+              (override));
 
-  MOCK_CONST_METHOD0(GetRootTransformation, SkMatrix());
+  MOCK_METHOD(SkMatrix, GetRootTransformation, (), (const, override));
 
-  MOCK_METHOD0(GetContext, GrDirectContext*());
+  MOCK_METHOD(GrDirectContext*, GetContext, (), (override));
 
-  MOCK_METHOD0(MakeRenderContextCurrent, std::unique_ptr<GLContextResult>());
+  MOCK_METHOD(std::unique_ptr<GLContextResult>,
+              MakeRenderContextCurrent,
+              (),
+              (override));
 
-  MOCK_METHOD0(ClearRenderContext, bool());
+  MOCK_METHOD(bool, ClearRenderContext, (), (override));
 };
 
 class MockPlatformView : public PlatformView {
@@ -132,27 +180,38 @@ class MockPlatformView : public PlatformView {
   MockPlatformView(MockPlatformViewDelegate& delegate,
                    const TaskRunners& task_runners)
       : PlatformView(delegate, task_runners) {}
-  MOCK_METHOD0(CreateRenderingSurface, std::unique_ptr<Surface>());
-  MOCK_CONST_METHOD0(GetPlatformMessageHandler,
-                     std::shared_ptr<PlatformMessageHandler>());
+  MOCK_METHOD(std::unique_ptr<Surface>, CreateRenderingSurface, (), (override));
+  MOCK_METHOD(std::shared_ptr<PlatformMessageHandler>,
+              GetPlatformMessageHandler,
+              (),
+              (const, override));
 };
 
 class TestPlatformView : public PlatformView {
  public:
   TestPlatformView(Shell& shell, const TaskRunners& task_runners)
       : PlatformView(shell, task_runners) {}
-  MOCK_METHOD0(CreateRenderingSurface, std::unique_ptr<Surface>());
+  MOCK_METHOD(std::unique_ptr<Surface>, CreateRenderingSurface, (), (override));
 };
 
 class MockPlatformMessageHandler : public PlatformMessageHandler {
  public:
-  MOCK_METHOD1(HandlePlatformMessage,
-               void(std::unique_ptr<PlatformMessage> message));
-  MOCK_CONST_METHOD0(DoesHandlePlatformMessageOnPlatformThread, bool());
-  MOCK_METHOD2(InvokePlatformMessageResponseCallback,
-               void(int response_id, std::unique_ptr<fml::Mapping> mapping));
-  MOCK_METHOD1(InvokePlatformMessageEmptyResponseCallback,
-               void(int response_id));
+  MOCK_METHOD(void,
+              HandlePlatformMessage,
+              (std::unique_ptr<PlatformMessage> message),
+              (override));
+  MOCK_METHOD(bool,
+              DoesHandlePlatformMessageOnPlatformThread,
+              (),
+              (const, override));
+  MOCK_METHOD(void,
+              InvokePlatformMessageResponseCallback,
+              (int response_id, std::unique_ptr<fml::Mapping> mapping),
+              (override));
+  MOCK_METHOD(void,
+              InvokePlatformMessageEmptyResponseCallback,
+              (int response_id),
+              (override));
 };
 
 class MockPlatformMessageResponse : public PlatformMessageResponse {
@@ -160,8 +219,8 @@ class MockPlatformMessageResponse : public PlatformMessageResponse {
   static fml::RefPtr<MockPlatformMessageResponse> Create() {
     return fml::AdoptRef(new MockPlatformMessageResponse());
   }
-  MOCK_METHOD1(Complete, void(std::unique_ptr<fml::Mapping> data));
-  MOCK_METHOD0(CompleteEmpty, void());
+  MOCK_METHOD(void, Complete, (std::unique_ptr<fml::Mapping> data), (override));
+  MOCK_METHOD(void, CompleteEmpty, (), (override));
 };
 }  // namespace
 
@@ -188,11 +247,55 @@ class TestAssetResolver : public AssetResolver {
     return {};
   };
 
+  bool operator==(const AssetResolver& other) const override {
+    return this == &other;
+  }
+
  private:
   bool valid_;
   AssetResolver::AssetResolverType type_;
 };
 
+class ThreadCheckingAssetResolver : public AssetResolver {
+ public:
+  explicit ThreadCheckingAssetResolver(
+      std::shared_ptr<fml::ConcurrentMessageLoop> concurrent_loop)
+      : concurrent_loop_(std::move(concurrent_loop)) {}
+
+  // |AssetResolver|
+  bool IsValid() const override { return true; }
+
+  // |AssetResolver|
+  bool IsValidAfterAssetManagerChange() const override { return true; }
+
+  // |AssetResolver|
+  AssetResolverType GetType() const {
+    return AssetResolverType::kApkAssetProvider;
+  }
+
+  // |AssetResolver|
+  std::unique_ptr<fml::Mapping> GetAsMapping(
+      const std::string& asset_name) const override {
+    if (asset_name == "FontManifest.json") {
+      // This file is loaded directly by the engine.
+      return nullptr;
+    }
+    mapping_requests.push_back(asset_name);
+    EXPECT_TRUE(concurrent_loop_->RunsTasksOnCurrentThread())
+        << fml::BacktraceHere();
+    return nullptr;
+  }
+
+  mutable std::vector<std::string> mapping_requests;
+
+  bool operator==(const AssetResolver& other) const override {
+    return this == &other;
+  }
+
+ private:
+  std::shared_ptr<fml::ConcurrentMessageLoop> concurrent_loop_;
+};
+
 static bool ValidateShell(Shell* shell) {
   if (!shell) {
     return false;
@@ -217,30 +320,26 @@ static bool ValidateShell(Shell* shell) {
   return true;
 }
 
-static bool RasterizerHasLayerTree(Shell* shell) {
+static bool RasterizerIsTornDown(Shell* shell) {
   fml::AutoResetWaitableEvent latch;
-  bool has_layer_tree = false;
+  bool is_torn_down = false;
   fml::TaskRunner::RunNowOrPostTask(
       shell->GetTaskRunners().GetRasterTaskRunner(),
-      [shell, &latch, &has_layer_tree]() {
-        has_layer_tree = shell->GetRasterizer()->GetLastLayerTree() != nullptr;
+      [shell, &latch, &is_torn_down]() {
+        is_torn_down = shell->GetRasterizer()->IsTornDown();
         latch.Signal();
       });
   latch.Wait();
-  return has_layer_tree;
+  return is_torn_down;
 }
 
 static void ValidateDestroyPlatformView(Shell* shell) {
   ASSERT_TRUE(shell != nullptr);
   ASSERT_TRUE(shell->IsSetup());
 
-  // To validate destroy platform view, we must ensure the rasterizer has a
-  // layer tree before the platform view is destroyed.
-  ASSERT_TRUE(RasterizerHasLayerTree(shell));
-
+  ASSERT_FALSE(RasterizerIsTornDown(shell));
   ShellTest::PlatformViewNotifyDestroyed(shell);
-  // Validate the layer tree is destroyed
-  ASSERT_FALSE(RasterizerHasLayerTree(shell));
+  ASSERT_TRUE(RasterizerIsTornDown(shell));
 }
 
 static std::string CreateFlagsString(std::vector<const char*>& flags) {
@@ -278,10 +377,10 @@ static void PostSync(const fml::RefPtr<fml::TaskRunner>& task_runner,
 }
 
 static sk_sp<DisplayList> MakeSizedDisplayList(int width, int height) {
-  DisplayListCanvasRecorder recorder(SkRect::MakeXYWH(0, 0, width, height));
-  recorder.drawRect(SkRect::MakeXYWH(0, 0, width, height),
-                    SkPaint(SkColor4f::FromColor(SK_ColorRED)));
-  return recorder.Build();
+  DisplayListBuilder builder(SkRect::MakeXYWH(0, 0, width, height));
+  builder.DrawRect(SkRect::MakeXYWH(0, 0, width, height),
+                   DlPaint(DlColor::kRed()));
+  return builder.Build();
 }
 
 TEST_F(ShellTest, InitializeWithInvalidThreads) {
@@ -298,8 +397,8 @@ TEST_F(ShellTest, InitializeWithDifferentThreads) {
   Settings settings = CreateSettingsForFixture();
   std::string name_prefix = "io.flutter.test." + GetCurrentTestName() + ".";
   ThreadHost thread_host(ThreadHost::ThreadHostConfig(
-      name_prefix, ThreadHost::Type::Platform | ThreadHost::Type::RASTER |
-                       ThreadHost::Type::IO | ThreadHost::Type::UI));
+      name_prefix, ThreadHost::Type::kPlatform | ThreadHost::Type::kRaster |
+                       ThreadHost::Type::kIo | ThreadHost::Type::kUi));
   ASSERT_EQ(thread_host.name_prefix, name_prefix);
 
   TaskRunners task_runners("test", thread_host.platform_thread->GetTaskRunner(),
@@ -317,7 +416,7 @@ TEST_F(ShellTest, InitializeWithSingleThread) {
   ASSERT_FALSE(DartVMRef::IsInstanceRunning());
   Settings settings = CreateSettingsForFixture();
   ThreadHost thread_host("io.flutter.test." + GetCurrentTestName() + ".",
-                         ThreadHost::Type::Platform);
+                         ThreadHost::Type::kPlatform);
   auto task_runner = thread_host.platform_thread->GetTaskRunner();
   TaskRunners task_runners("test", task_runner, task_runner, task_runner,
                            task_runner);
@@ -346,9 +445,9 @@ TEST_F(ShellTest,
        InitializeWithMultipleThreadButCallingThreadAsPlatformThread) {
   ASSERT_FALSE(DartVMRef::IsInstanceRunning());
   Settings settings = CreateSettingsForFixture();
-  ThreadHost thread_host(
-      "io.flutter.test." + GetCurrentTestName() + ".",
-      ThreadHost::Type::RASTER | ThreadHost::Type::IO | ThreadHost::Type::UI);
+  ThreadHost thread_host("io.flutter.test." + GetCurrentTestName() + ".",
+                         ThreadHost::Type::kRaster | ThreadHost::Type::kIo |
+                             ThreadHost::Type::kUi);
   fml::MessageLoop::EnsureInitializedForCurrentThread();
   TaskRunners task_runners("test",
                            fml::MessageLoop::GetCurrent().GetTaskRunner(),
@@ -367,7 +466,8 @@ TEST_F(ShellTest,
               return static_cast<std::unique_ptr<VsyncWaiter>>(
                   std::make_unique<VsyncWaiterFallback>(task_runners));
             },
-            ShellTestPlatformView::BackendType::kDefaultBackend, nullptr);
+            ShellTestPlatformView::BackendType::kDefaultBackend, nullptr,
+            shell.GetIsGpuDisabledSyncSwitch());
       },
       [](Shell& shell) { return std::make_unique<Rasterizer>(shell); });
   ASSERT_TRUE(ValidateShell(shell.get()));
@@ -380,13 +480,15 @@ TEST_F(ShellTest, InitializeWithDisabledGpu) {
   ASSERT_FALSE(DartVMRef::IsInstanceRunning());
   Settings settings = CreateSettingsForFixture();
   ThreadHost thread_host("io.flutter.test." + GetCurrentTestName() + ".",
-                         ThreadHost::Type::Platform);
+                         ThreadHost::Type::kPlatform);
   auto task_runner = thread_host.platform_thread->GetTaskRunner();
   TaskRunners task_runners("test", task_runner, task_runner, task_runner,
                            task_runner);
-  auto shell = CreateShell(settings, task_runners, /*simulate_vsync=*/false,
-                           /*shell_test_external_view_embedder=*/nullptr,
-                           /*is_gpu_disabled=*/true);
+  auto shell = CreateShell({
+      .settings = settings,
+      .task_runners = task_runners,
+      .is_gpu_disabled = true,
+  });
   ASSERT_TRUE(DartVMRef::IsInstanceRunning());
   ASSERT_TRUE(ValidateShell(shell.get()));
 
@@ -402,9 +504,9 @@ TEST_F(ShellTest, InitializeWithDisabledGpu) {
 TEST_F(ShellTest, InitializeWithGPUAndPlatformThreadsTheSame) {
   ASSERT_FALSE(DartVMRef::IsInstanceRunning());
   Settings settings = CreateSettingsForFixture();
-  ThreadHost thread_host(
-      "io.flutter.test." + GetCurrentTestName() + ".",
-      ThreadHost::Type::Platform | ThreadHost::Type::IO | ThreadHost::Type::UI);
+  ThreadHost thread_host("io.flutter.test." + GetCurrentTestName() + ".",
+                         ThreadHost::Type::kPlatform | ThreadHost::Type::kIo |
+                             ThreadHost::Type::kUi);
   TaskRunners task_runners(
       "test",
       thread_host.platform_thread->GetTaskRunner(),  // platform
@@ -528,7 +630,7 @@ TEST_F(ShellTest, LastEntrypointArgs) {
 TEST_F(ShellTest, DisallowedDartVMFlag) {
 #if defined(OS_FUCHSIA)
   GTEST_SKIP() << "This test flakes on Fuchsia. https://fxbug.dev/110006 ";
-#endif  // OS_FUCHSIA
+#else
 
   // Run this test in a thread-safe manner, otherwise gtest will complain.
   ::testing::FLAGS_gtest_death_test_style = "threadsafe";
@@ -541,6 +643,7 @@ TEST_F(ShellTest, DisallowedDartVMFlag) {
   const char* expected =
       "Encountered disallowed Dart VM flag: --verify_after_gc";
   ASSERT_DEATH(flutter::SettingsFromCommandLine(command_line), expected);
+#endif  // OS_FUCHSIA
 }
 
 TEST_F(ShellTest, AllowedDartVMFlag) {
@@ -632,10 +735,14 @@ static void CheckFrameTimings(const std::vector<FrameTiming>& timings,
 }
 
 TEST_F(ShellTest, ReportTimingsIsCalled) {
-  fml::TimePoint start = fml::TimePoint::Now();
   auto settings = CreateSettingsForFixture();
   std::unique_ptr<Shell> shell = CreateShell(settings);
 
+  // We MUST put |start| after |CreateShell| because the clock source will be
+  // reset through |TimePoint::SetClockSource()| in
+  // |DartVMInitializer::Initialize()| within |CreateShell()|.
+  fml::TimePoint start = fml::TimePoint::Now();
+
   // Create the surface needed by rasterizer
   PlatformViewNotifyCreated(shell.get());
 
@@ -682,19 +789,10 @@ TEST_F(ShellTest, ReportTimingsIsCalled) {
 }
 
 TEST_F(ShellTest, FrameRasterizedCallbackIsCalled) {
-  fml::TimePoint start = fml::TimePoint::Now();
-
   auto settings = CreateSettingsForFixture();
-  fml::AutoResetWaitableEvent timingLatch;
-  FrameTiming timing;
-
-  for (auto phase : FrameTiming::kPhases) {
-    timing.Set(phase, fml::TimePoint());
-    // Check that the time points are initially smaller than start, so
-    // CheckFrameTimings will fail if they're not properly set later.
-    ASSERT_TRUE(timing.Get(phase) < start);
-  }
 
+  FrameTiming timing;
+  fml::AutoResetWaitableEvent timingLatch;
   settings.frame_rasterized_callback = [&timing,
                                         &timingLatch](const FrameTiming& t) {
     timing = t;
@@ -703,6 +801,22 @@ TEST_F(ShellTest, FrameRasterizedCallbackIsCalled) {
 
   std::unique_ptr<Shell> shell = CreateShell(settings);
 
+  // Wait to make |start| bigger than zero
+  using namespace std::chrono_literals;
+  std::this_thread::sleep_for(1ms);
+
+  // We MUST put |start| after |CreateShell()| because the clock source will be
+  // reset through |TimePoint::SetClockSource()| in
+  // |DartVMInitializer::Initialize()| within |CreateShell()|.
+  fml::TimePoint start = fml::TimePoint::Now();
+
+  for (auto phase : FrameTiming::kPhases) {
+    timing.Set(phase, fml::TimePoint());
+    // Check that the time points are initially smaller than start, so
+    // CheckFrameTimings will fail if they're not properly set later.
+    ASSERT_TRUE(timing.Get(phase) < start);
+  }
+
   // Create the surface needed by rasterizer
   PlatformViewNotifyCreated(shell.get());
 
@@ -750,8 +864,12 @@ TEST_F(ShellTest, ExternalEmbedderNoThreadMerger) {
       };
   auto external_view_embedder = std::make_shared<ShellTestExternalViewEmbedder>(
       end_frame_callback, PostPrerollResult::kResubmitFrame, false);
-  auto shell = CreateShell(settings, GetTaskRunnersForFixture(), false,
-                           external_view_embedder);
+  auto shell = CreateShell({
+      .settings = settings,
+      .platform_view_create_callback = ShellTestPlatformViewBuilder({
+          .shell_test_external_view_embedder = external_view_embedder,
+      }),
+  });
 
   // Create the surface needed by rasterizer
   PlatformViewNotifyCreated(shell.get());
@@ -762,17 +880,12 @@ TEST_F(ShellTest, ExternalEmbedderNoThreadMerger) {
   RunEngine(shell.get(), std::move(configuration));
 
   LayerTreeBuilder builder = [&](const std::shared_ptr<ContainerLayer>& root) {
-    fml::RefPtr<SkiaUnrefQueue> queue = fml::MakeRefCounted<SkiaUnrefQueue>(
-        this->GetCurrentTaskRunner(), fml::TimeDelta::Zero());
     auto display_list_layer = std::make_shared<DisplayListLayer>(
-        SkPoint::Make(10, 10),
-        flutter::SkiaGPUObject<DisplayList>(
-            {MakeSizedDisplayList(80, 80), queue}),
-        false, false);
+        SkPoint::Make(10, 10), MakeSizedDisplayList(80, 80), false, false);
     root->Add(display_list_layer);
   };
 
-  PumpOneFrame(shell.get(), 100, 100, builder);
+  PumpOneFrame(shell.get(), ViewContent::ImplicitView(100, 100, builder));
   end_frame_latch.Wait();
   ASSERT_TRUE(end_frame_called);
 
@@ -783,7 +896,7 @@ TEST_F(ShellTest, PushBackdropFilterToVisitedPlatformViews) {
 #if defined(OS_FUCHSIA)
   GTEST_SKIP() << "RasterThreadMerger flakes on Fuchsia. "
                   "https://github.com/flutter/flutter/issues/59816 ";
-#endif
+#else
 
   auto settings = CreateSettingsForFixture();
 
@@ -812,8 +925,12 @@ TEST_F(ShellTest, PushBackdropFilterToVisitedPlatformViews) {
 
   external_view_embedder = std::make_shared<ShellTestExternalViewEmbedder>(
       end_frame_callback, PostPrerollResult::kResubmitFrame, false);
-  auto shell = CreateShell(settings, GetTaskRunnersForFixture(), false,
-                           external_view_embedder);
+  auto shell = CreateShell({
+      .settings = settings,
+      .platform_view_create_callback = ShellTestPlatformViewBuilder({
+          .shell_test_external_view_embedder = external_view_embedder,
+      }),
+  });
 
   // Create the surface needed by rasterizer
   PlatformViewNotifyCreated(shell.get());
@@ -827,27 +944,38 @@ TEST_F(ShellTest, PushBackdropFilterToVisitedPlatformViews) {
     auto platform_view_layer = std::make_shared<PlatformViewLayer>(
         SkPoint::Make(10, 10), SkSize::Make(10, 10), 50);
     root->Add(platform_view_layer);
+    auto transform_layer =
+        std::make_shared<TransformLayer>(SkMatrix::Translate(1, 1));
+    root->Add(transform_layer);
+    auto clip_rect_layer = std::make_shared<ClipRectLayer>(
+        SkRect::MakeLTRB(0, 0, 30, 30), Clip::kHardEdge);
+    transform_layer->Add(clip_rect_layer);
     auto filter = std::make_shared<DlBlurImageFilter>(5, 5, DlTileMode::kClamp);
     auto backdrop_filter_layer =
         std::make_shared<BackdropFilterLayer>(filter, DlBlendMode::kSrcOver);
-    root->Add(backdrop_filter_layer);
+    clip_rect_layer->Add(backdrop_filter_layer);
     auto platform_view_layer2 = std::make_shared<PlatformViewLayer>(
         SkPoint::Make(10, 10), SkSize::Make(10, 10), 75);
     backdrop_filter_layer->Add(platform_view_layer2);
   };
 
-  PumpOneFrame(shell.get(), 100, 100, builder);
+  PumpOneFrame(shell.get(), ViewContent::ImplicitView(100, 100, builder));
   end_frame_latch.Wait();
   ASSERT_EQ(visited_platform_views, (std::vector<int64_t>{50, 75}));
   ASSERT_TRUE(stack_75.is_empty());
   ASSERT_FALSE(stack_50.is_empty());
 
   auto filter = DlBlurImageFilter(5, 5, DlTileMode::kClamp);
-  auto mutator = *external_view_embedder->GetStack(50).Begin();
+  auto mutator = *stack_50.Begin();
   ASSERT_EQ(mutator->GetType(), MutatorType::kBackdropFilter);
   ASSERT_EQ(mutator->GetFilterMutation().GetFilter(), filter);
+  // Make sure the filterRect is in global coordinates (contains the (1,1)
+  // translation).
+  ASSERT_EQ(mutator->GetFilterMutation().GetFilterRect(),
+            SkRect::MakeLTRB(1, 1, 31, 31));
 
   DestroyShell(std::move(shell));
+#endif  // OS_FUCHSIA
 }
 
 // TODO(https://github.com/flutter/flutter/issues/59816): Enable on fuchsia.
@@ -856,7 +984,7 @@ TEST_F(ShellTest,
 #if defined(OS_FUCHSIA)
   GTEST_SKIP() << "RasterThreadMerger flakes on Fuchsia. "
                   "https://github.com/flutter/flutter/issues/59816 ";
-#endif
+#else
 
   auto settings = CreateSettingsForFixture();
   fml::AutoResetWaitableEvent end_frame_latch;
@@ -871,8 +999,12 @@ TEST_F(ShellTest,
       };
   auto external_view_embedder = std::make_shared<ShellTestExternalViewEmbedder>(
       end_frame_callback, PostPrerollResult::kResubmitFrame, true);
-  auto shell = CreateShell(settings, GetTaskRunnersForFixture(), false,
-                           external_view_embedder);
+  auto shell = CreateShell({
+      .settings = settings,
+      .platform_view_create_callback = ShellTestPlatformViewBuilder({
+          .shell_test_external_view_embedder = external_view_embedder,
+      }),
+  });
 
   // Create the surface needed by rasterizer
   PlatformViewNotifyCreated(shell.get());
@@ -883,29 +1015,25 @@ TEST_F(ShellTest,
   RunEngine(shell.get(), std::move(configuration));
 
   LayerTreeBuilder builder = [&](const std::shared_ptr<ContainerLayer>& root) {
-    fml::RefPtr<SkiaUnrefQueue> queue = fml::MakeRefCounted<SkiaUnrefQueue>(
-        this->GetCurrentTaskRunner(), fml::TimeDelta::Zero());
     auto display_list_layer = std::make_shared<DisplayListLayer>(
-        SkPoint::Make(10, 10),
-        flutter::SkiaGPUObject<DisplayList>(
-            {MakeSizedDisplayList(80, 80), queue}),
-        false, false);
+        SkPoint::Make(10, 10), MakeSizedDisplayList(80, 80), false, false);
     root->Add(display_list_layer);
   };
 
-  PumpOneFrame(shell.get(), 100, 100, builder);
+  PumpOneFrame(shell.get(), ViewContent::ImplicitView(100, 100, builder));
   end_frame_latch.Wait();
 
   ASSERT_TRUE(end_frame_called);
 
   DestroyShell(std::move(shell));
+#endif  // OS_FUCHSIA
 }
 
 TEST_F(ShellTest, OnPlatformViewDestroyDisablesThreadMerger) {
 #if defined(OS_FUCHSIA)
   GTEST_SKIP() << "RasterThreadMerger flakes on Fuchsia. "
                   "https://github.com/flutter/flutter/issues/59816 ";
-#endif
+#else
 
   auto settings = CreateSettingsForFixture();
   fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger;
@@ -917,8 +1045,12 @@ TEST_F(ShellTest, OnPlatformViewDestroyDisablesThreadMerger) {
   auto external_view_embedder = std::make_shared<ShellTestExternalViewEmbedder>(
       end_frame_callback, PostPrerollResult::kSuccess, true);
 
-  auto shell = CreateShell(settings, GetTaskRunnersForFixture(), false,
-                           external_view_embedder);
+  auto shell = CreateShell({
+      .settings = settings,
+      .platform_view_create_callback = ShellTestPlatformViewBuilder({
+          .shell_test_external_view_embedder = external_view_embedder,
+      }),
+  });
 
   // Create the surface needed by rasterizer
   PlatformViewNotifyCreated(shell.get());
@@ -929,19 +1061,17 @@ TEST_F(ShellTest, OnPlatformViewDestroyDisablesThreadMerger) {
   RunEngine(shell.get(), std::move(configuration));
 
   LayerTreeBuilder builder = [&](const std::shared_ptr<ContainerLayer>& root) {
-    fml::RefPtr<SkiaUnrefQueue> queue = fml::MakeRefCounted<SkiaUnrefQueue>(
-        this->GetCurrentTaskRunner(), fml::TimeDelta::Zero());
     auto display_list_layer = std::make_shared<DisplayListLayer>(
-        SkPoint::Make(10, 10),
-        flutter::SkiaGPUObject<DisplayList>(
-            {MakeSizedDisplayList(80, 80), queue}),
-        false, false);
+        SkPoint::Make(10, 10), MakeSizedDisplayList(80, 80), false, false);
     root->Add(display_list_layer);
   };
 
-  PumpOneFrame(shell.get(), 100, 100, builder);
+  PumpOneFrame(shell.get(), ViewContent::ImplicitView(100, 100, builder));
 
   auto result = shell->WaitForFirstFrame(fml::TimeDelta::Max());
+  // Wait for the rasterizer to process the frame. WaitForFirstFrame only waits
+  // for the Animator, but end_frame_callback is called by the Rasterizer.
+  PostSync(shell->GetTaskRunners().GetRasterTaskRunner(), [] {});
   ASSERT_TRUE(result.ok()) << "Result: " << static_cast<int>(result.code())
                            << ": " << result.message();
 
@@ -954,13 +1084,14 @@ TEST_F(ShellTest, OnPlatformViewDestroyDisablesThreadMerger) {
   ValidateShell(shell.get());
   ASSERT_TRUE(raster_thread_merger->IsEnabled());
   DestroyShell(std::move(shell));
+#endif  // OS_FUCHSIA
 }
 
 TEST_F(ShellTest, OnPlatformViewDestroyAfterMergingThreads) {
 #if defined(OS_FUCHSIA)
   GTEST_SKIP() << "RasterThreadMerger flakes on Fuchsia. "
                   "https://github.com/flutter/flutter/issues/59816 ";
-#endif
+#else
 
   const int ThreadMergingLease = 10;
   auto settings = CreateSettingsForFixture();
@@ -984,8 +1115,12 @@ TEST_F(ShellTest, OnPlatformViewDestroyAfterMergingThreads) {
   // Set resubmit once to trigger thread merging.
   external_view_embedder->UpdatePostPrerollResult(
       PostPrerollResult::kResubmitFrame);
-  auto shell = CreateShell(settings, GetTaskRunnersForFixture(), false,
-                           external_view_embedder);
+  auto shell = CreateShell({
+      .settings = settings,
+      .platform_view_create_callback = ShellTestPlatformViewBuilder({
+          .shell_test_external_view_embedder = external_view_embedder,
+      }),
+  });
 
   // Create the surface needed by rasterizer
   PlatformViewNotifyCreated(shell.get());
@@ -996,22 +1131,17 @@ TEST_F(ShellTest, OnPlatformViewDestroyAfterMergingThreads) {
   RunEngine(shell.get(), std::move(configuration));
 
   LayerTreeBuilder builder = [&](const std::shared_ptr<ContainerLayer>& root) {
-    fml::RefPtr<SkiaUnrefQueue> queue = fml::MakeRefCounted<SkiaUnrefQueue>(
-        this->GetCurrentTaskRunner(), fml::TimeDelta::Zero());
     auto display_list_layer = std::make_shared<DisplayListLayer>(
-        SkPoint::Make(10, 10),
-        flutter::SkiaGPUObject<DisplayList>(
-            {MakeSizedDisplayList(80, 80), queue}),
-        false, false);
+        SkPoint::Make(10, 10), MakeSizedDisplayList(80, 80), false, false);
     root->Add(display_list_layer);
   };
 
-  PumpOneFrame(shell.get(), 100, 100, builder);
+  PumpOneFrame(shell.get(), ViewContent::ImplicitView(100, 100, builder));
   // Pump one frame to trigger thread merging.
   end_frame_latch.Wait();
   // Pump another frame to ensure threads are merged and a regular layer tree is
   // submitted.
-  PumpOneFrame(shell.get(), 100, 100, builder);
+  PumpOneFrame(shell.get(), ViewContent::ImplicitView(100, 100, builder));
   // Threads are merged here. PlatformViewNotifyDestroy should be executed
   // successfully.
   ASSERT_TRUE(fml::TaskRunnerChecker::RunsOnTheSameThread(
@@ -1028,13 +1158,14 @@ TEST_F(ShellTest, OnPlatformViewDestroyAfterMergingThreads) {
   ValidateShell(shell.get());
 
   DestroyShell(std::move(shell));
+#endif  // OS_FUCHSIA
 }
 
 TEST_F(ShellTest, OnPlatformViewDestroyWhenThreadsAreMerging) {
 #if defined(OS_FUCHSIA)
   GTEST_SKIP() << "RasterThreadMerger flakes on Fuchsia. "
                   "https://github.com/flutter/flutter/issues/59816 ";
-#endif
+#else
 
   const int kThreadMergingLease = 10;
   auto settings = CreateSettingsForFixture();
@@ -1053,8 +1184,12 @@ TEST_F(ShellTest, OnPlatformViewDestroyWhenThreadsAreMerging) {
   auto external_view_embedder = std::make_shared<ShellTestExternalViewEmbedder>(
       end_frame_callback, PostPrerollResult::kSuccess, true);
 
-  auto shell = CreateShell(settings, GetTaskRunnersForFixture(), false,
-                           external_view_embedder);
+  auto shell = CreateShell({
+      .settings = settings,
+      .platform_view_create_callback = ShellTestPlatformViewBuilder({
+          .shell_test_external_view_embedder = external_view_embedder,
+      }),
+  });
 
   // Create the surface needed by rasterizer
   PlatformViewNotifyCreated(shell.get());
@@ -1065,17 +1200,12 @@ TEST_F(ShellTest, OnPlatformViewDestroyWhenThreadsAreMerging) {
   RunEngine(shell.get(), std::move(configuration));
 
   LayerTreeBuilder builder = [&](const std::shared_ptr<ContainerLayer>& root) {
-    fml::RefPtr<SkiaUnrefQueue> queue = fml::MakeRefCounted<SkiaUnrefQueue>(
-        this->GetCurrentTaskRunner(), fml::TimeDelta::Zero());
     auto display_list_layer = std::make_shared<DisplayListLayer>(
-        SkPoint::Make(10, 10),
-        flutter::SkiaGPUObject<DisplayList>(
-            {MakeSizedDisplayList(80, 80), queue}),
-        false, false);
+        SkPoint::Make(10, 10), MakeSizedDisplayList(80, 80), false, false);
     root->Add(display_list_layer);
   };
 
-  PumpOneFrame(shell.get(), 100, 100, builder);
+  PumpOneFrame(shell.get(), ViewContent::ImplicitView(100, 100, builder));
   // Pump one frame and threads aren't merged
   end_frame_latch.Wait();
   ASSERT_FALSE(fml::TaskRunnerChecker::RunsOnTheSameThread(
@@ -1086,7 +1216,7 @@ TEST_F(ShellTest, OnPlatformViewDestroyWhenThreadsAreMerging) {
   // threads
   external_view_embedder->UpdatePostPrerollResult(
       PostPrerollResult::kResubmitFrame);
-  PumpOneFrame(shell.get(), 100, 100, builder);
+  PumpOneFrame(shell.get(), ViewContent::ImplicitView(100, 100, builder));
 
   // Now destroy the platform view immediately.
   // Two things can happen here:
@@ -1103,6 +1233,7 @@ TEST_F(ShellTest, OnPlatformViewDestroyWhenThreadsAreMerging) {
   ValidateShell(shell.get());
 
   DestroyShell(std::move(shell));
+#endif  // OS_FUCHSIA
 }
 
 TEST_F(ShellTest,
@@ -1110,7 +1241,7 @@ TEST_F(ShellTest,
 #if defined(OS_FUCHSIA)
   GTEST_SKIP() << "RasterThreadMerger flakes on Fuchsia. "
                   "https://github.com/flutter/flutter/issues/59816 ";
-#endif
+#else
 
   auto settings = CreateSettingsForFixture();
   fml::AutoResetWaitableEvent end_frame_latch;
@@ -1121,8 +1252,12 @@ TEST_F(ShellTest,
       };
   auto external_view_embedder = std::make_shared<ShellTestExternalViewEmbedder>(
       end_frame_callback, PostPrerollResult::kSuccess, true);
-  auto shell = CreateShell(settings, GetTaskRunnersForFixture(), false,
-                           external_view_embedder);
+  auto shell = CreateShell({
+      .settings = settings,
+      .platform_view_create_callback = ShellTestPlatformViewBuilder({
+          .shell_test_external_view_embedder = external_view_embedder,
+      }),
+  });
 
   // Create the surface needed by rasterizer
   PlatformViewNotifyCreated(shell.get());
@@ -1133,16 +1268,11 @@ TEST_F(ShellTest,
   RunEngine(shell.get(), std::move(configuration));
 
   LayerTreeBuilder builder = [&](const std::shared_ptr<ContainerLayer>& root) {
-    fml::RefPtr<SkiaUnrefQueue> queue = fml::MakeRefCounted<SkiaUnrefQueue>(
-        this->GetCurrentTaskRunner(), fml::TimeDelta::Zero());
     auto display_list_layer = std::make_shared<DisplayListLayer>(
-        SkPoint::Make(10, 10),
-        flutter::SkiaGPUObject<DisplayList>(
-            {MakeSizedDisplayList(80, 80), queue}),
-        false, false);
+        SkPoint::Make(10, 10), MakeSizedDisplayList(80, 80), false, false);
     root->Add(display_list_layer);
   };
-  PumpOneFrame(shell.get(), 100, 100, builder);
+  PumpOneFrame(shell.get(), ViewContent::ImplicitView(100, 100, builder));
   end_frame_latch.Wait();
 
   // Threads should not be merged.
@@ -1160,13 +1290,13 @@ TEST_F(ShellTest,
   ValidateShell(shell.get());
 
   DestroyShell(std::move(shell));
+#endif  // OS_FUCHSIA
 }
 
 TEST_F(ShellTest, OnPlatformViewDestroyWithoutRasterThreadMerger) {
   auto settings = CreateSettingsForFixture();
 
-  auto shell =
-      CreateShell(settings, GetTaskRunnersForFixture(), false, nullptr);
+  auto shell = CreateShell(settings);
 
   // Create the surface needed by rasterizer
   PlatformViewNotifyCreated(shell.get());
@@ -1177,16 +1307,11 @@ TEST_F(ShellTest, OnPlatformViewDestroyWithoutRasterThreadMerger) {
   RunEngine(shell.get(), std::move(configuration));
 
   LayerTreeBuilder builder = [&](const std::shared_ptr<ContainerLayer>& root) {
-    fml::RefPtr<SkiaUnrefQueue> queue = fml::MakeRefCounted<SkiaUnrefQueue>(
-        this->GetCurrentTaskRunner(), fml::TimeDelta::Zero());
     auto display_list_layer = std::make_shared<DisplayListLayer>(
-        SkPoint::Make(10, 10),
-        flutter::SkiaGPUObject<DisplayList>(
-            {MakeSizedDisplayList(80, 80), queue}),
-        false, false);
+        SkPoint::Make(10, 10), MakeSizedDisplayList(80, 80), false, false);
     root->Add(display_list_layer);
   };
-  PumpOneFrame(shell.get(), 100, 100, builder);
+  PumpOneFrame(shell.get(), ViewContent::ImplicitView(100, 100, builder));
 
   // Threads should not be merged.
   ASSERT_FALSE(fml::TaskRunnerChecker::RunsOnTheSameThread(
@@ -1210,7 +1335,7 @@ TEST_F(ShellTest, OnPlatformViewDestroyWithStaticThreadMerging) {
 #if defined(OS_FUCHSIA)
   GTEST_SKIP() << "RasterThreadMerger flakes on Fuchsia. "
                   "https://github.com/flutter/flutter/issues/59816 ";
-#endif
+#else
 
   auto settings = CreateSettingsForFixture();
   fml::AutoResetWaitableEvent end_frame_latch;
@@ -1221,9 +1346,9 @@ TEST_F(ShellTest, OnPlatformViewDestroyWithStaticThreadMerging) {
       };
   auto external_view_embedder = std::make_shared<ShellTestExternalViewEmbedder>(
       end_frame_callback, PostPrerollResult::kSuccess, true);
-  ThreadHost thread_host(
-      "io.flutter.test." + GetCurrentTestName() + ".",
-      ThreadHost::Type::Platform | ThreadHost::Type::IO | ThreadHost::Type::UI);
+  ThreadHost thread_host("io.flutter.test." + GetCurrentTestName() + ".",
+                         ThreadHost::Type::kPlatform | ThreadHost::Type::kIo |
+                             ThreadHost::Type::kUi);
   TaskRunners task_runners(
       "test",
       thread_host.platform_thread->GetTaskRunner(),  // platform
@@ -1231,8 +1356,13 @@ TEST_F(ShellTest, OnPlatformViewDestroyWithStaticThreadMerging) {
       thread_host.ui_thread->GetTaskRunner(),        // ui
       thread_host.io_thread->GetTaskRunner()         // io
   );
-  auto shell =
-      CreateShell(settings, task_runners, false, external_view_embedder);
+  auto shell = CreateShell({
+      .settings = settings,
+      .task_runners = task_runners,
+      .platform_view_create_callback = ShellTestPlatformViewBuilder({
+          .shell_test_external_view_embedder = external_view_embedder,
+      }),
+  });
 
   // Create the surface needed by rasterizer
   PlatformViewNotifyCreated(shell.get());
@@ -1243,16 +1373,11 @@ TEST_F(ShellTest, OnPlatformViewDestroyWithStaticThreadMerging) {
   RunEngine(shell.get(), std::move(configuration));
 
   LayerTreeBuilder builder = [&](const std::shared_ptr<ContainerLayer>& root) {
-    fml::RefPtr<SkiaUnrefQueue> queue = fml::MakeRefCounted<SkiaUnrefQueue>(
-        this->GetCurrentTaskRunner(), fml::TimeDelta::Zero());
     auto display_list_layer = std::make_shared<DisplayListLayer>(
-        SkPoint::Make(10, 10),
-        flutter::SkiaGPUObject<DisplayList>(
-            {MakeSizedDisplayList(80, 80), queue}),
-        false, false);
+        SkPoint::Make(10, 10), MakeSizedDisplayList(80, 80), false, false);
     root->Add(display_list_layer);
   };
-  PumpOneFrame(shell.get(), 100, 100, builder);
+  PumpOneFrame(shell.get(), ViewContent::ImplicitView(100, 100, builder));
   end_frame_latch.Wait();
 
   ValidateDestroyPlatformView(shell.get());
@@ -1261,6 +1386,7 @@ TEST_F(ShellTest, OnPlatformViewDestroyWithStaticThreadMerging) {
   ValidateShell(shell.get());
 
   DestroyShell(std::move(shell), task_runners);
+#endif  // OS_FUCHSIA
 }
 
 TEST_F(ShellTest, GetUsedThisFrameShouldBeSetBeforeEndFrame) {
@@ -1277,8 +1403,12 @@ TEST_F(ShellTest, GetUsedThisFrameShouldBeSetBeforeEndFrame) {
       };
   external_view_embedder = std::make_shared<ShellTestExternalViewEmbedder>(
       end_frame_callback, PostPrerollResult::kSuccess, true);
-  auto shell = CreateShell(settings, GetTaskRunnersForFixture(), false,
-                           external_view_embedder);
+  auto shell = CreateShell({
+      .settings = settings,
+      .platform_view_create_callback = ShellTestPlatformViewBuilder({
+          .shell_test_external_view_embedder = external_view_embedder,
+      }),
+  });
 
   // Create the surface needed by rasterizer
   PlatformViewNotifyCreated(shell.get());
@@ -1289,16 +1419,11 @@ TEST_F(ShellTest, GetUsedThisFrameShouldBeSetBeforeEndFrame) {
   RunEngine(shell.get(), std::move(configuration));
 
   LayerTreeBuilder builder = [&](const std::shared_ptr<ContainerLayer>& root) {
-    fml::RefPtr<SkiaUnrefQueue> queue = fml::MakeRefCounted<SkiaUnrefQueue>(
-        this->GetCurrentTaskRunner(), fml::TimeDelta::Zero());
     auto display_list_layer = std::make_shared<DisplayListLayer>(
-        SkPoint::Make(10, 10),
-        flutter::SkiaGPUObject<DisplayList>(
-            {MakeSizedDisplayList(80, 80), queue}),
-        false, false);
+        SkPoint::Make(10, 10), MakeSizedDisplayList(80, 80), false, false);
     root->Add(display_list_layer);
   };
-  PumpOneFrame(shell.get(), 100, 100, builder);
+  PumpOneFrame(shell.get(), ViewContent::ImplicitView(100, 100, builder));
   end_frame_latch.Wait();
   ASSERT_FALSE(used_this_frame);
 
@@ -1314,7 +1439,7 @@ TEST_F(ShellTest, DISABLED_SkipAndSubmitFrame) {
 #if defined(OS_FUCHSIA)
   GTEST_SKIP() << "RasterThreadMerger flakes on Fuchsia. "
                   "https://github.com/flutter/flutter/issues/59816 ";
-#endif
+#else
 
   auto settings = CreateSettingsForFixture();
   fml::AutoResetWaitableEvent end_frame_latch;
@@ -1333,8 +1458,12 @@ TEST_F(ShellTest, DISABLED_SkipAndSubmitFrame) {
   external_view_embedder = std::make_shared<ShellTestExternalViewEmbedder>(
       end_frame_callback, PostPrerollResult::kSkipAndRetryFrame, true);
 
-  auto shell = CreateShell(settings, GetTaskRunnersForFixture(), false,
-                           external_view_embedder);
+  auto shell = CreateShell({
+      .settings = settings,
+      .platform_view_create_callback = ShellTestPlatformViewBuilder({
+          .shell_test_external_view_embedder = external_view_embedder,
+      }),
+  });
 
   PlatformViewNotifyCreated(shell.get());
 
@@ -1358,6 +1487,7 @@ TEST_F(ShellTest, DISABLED_SkipAndSubmitFrame) {
 
   PlatformViewNotifyDestroyed(shell.get());
   DestroyShell(std::move(shell));
+#endif  // OS_FUCHSIA
 }
 
 TEST(SettingsTest, FrameTimingSetsAndGetsProperly) {
@@ -1414,36 +1544,6 @@ TEST_F(ShellTest, ReportTimingsIsCalledImmediatelyAfterTheFirstFrame) {
   ASSERT_EQ(timestamps.size(), FrameTiming::kCount);
 }
 
-TEST_F(ShellTest, ReloadSystemFonts) {
-  auto settings = CreateSettingsForFixture();
-
-  fml::MessageLoop::EnsureInitializedForCurrentThread();
-  auto task_runner = fml::MessageLoop::GetCurrent().GetTaskRunner();
-  TaskRunners task_runners("test", task_runner, task_runner, task_runner,
-                           task_runner);
-  auto shell = CreateShell(settings, task_runners);
-
-  auto fontCollection = GetFontCollection(shell.get());
-  std::vector<std::string> families(1, "Robotofake");
-  auto font =
-      fontCollection->GetMinikinFontCollectionForFamilies(families, "en");
-  if (font == nullptr) {
-    // The system does not have default font. Aborts this test.
-    return;
-  }
-  unsigned int id = font->getId();
-  // The result should be cached.
-  font = fontCollection->GetMinikinFontCollectionForFamilies(families, "en");
-  ASSERT_EQ(font->getId(), id);
-  bool result = shell->ReloadSystemFonts();
-
-  // The cache is cleared, and FontCollection will be assigned a new id.
-  font = fontCollection->GetMinikinFontCollectionForFamilies(families, "en");
-  ASSERT_NE(font->getId(), id);
-  ASSERT_TRUE(result);
-  shell.reset();
-}
-
 TEST_F(ShellTest, WaitForFirstFrame) {
   auto settings = CreateSettingsForFixture();
   std::unique_ptr<Shell> shell = CreateShell(settings);
@@ -1473,10 +1573,11 @@ TEST_F(ShellTest, WaitForFirstFrameZeroSizeFrame) {
   configuration.SetEntrypoint("emptyMain");
 
   RunEngine(shell.get(), std::move(configuration));
-  PumpOneFrame(shell.get(), {1.0, 0.0, 0.0, 22});
+  PumpOneFrame(shell.get(), ViewContent::DummyView({1.0, 0.0, 0.0, 22, 0}));
   fml::Status result = shell->WaitForFirstFrame(fml::TimeDelta::Zero());
-  ASSERT_FALSE(result.ok());
-  ASSERT_EQ(result.code(), fml::StatusCode::kDeadlineExceeded);
+  EXPECT_FALSE(result.ok());
+  EXPECT_EQ(result.message(), "timeout");
+  EXPECT_EQ(result.code(), fml::StatusCode::kDeadlineExceeded);
 
   DestroyShell(std::move(shell));
 }
@@ -1589,15 +1690,11 @@ TEST_F(ShellTest, MultipleFluttersSetResourceCacheBytes) {
         return result;
       };
 
-  auto shell = CreateShell(
-      /*settings=*/settings,
-      /*task_runners=*/task_runners,
-      /*simulate_vsync=*/false,
-      /*shell_test_external_view_embedder=*/nullptr,
-      /*is_gpu_disabled=*/false,
-      /*rendering_backend=*/
-      ShellTestPlatformView::BackendType::kDefaultBackend,
-      /*platform_view_create_callback=*/platform_view_create_callback);
+  auto shell = CreateShell({
+      .settings = settings,
+      .task_runners = task_runners,
+      .platform_view_create_callback = platform_view_create_callback,
+  });
 
   // Create the surface needed by rasterizer
   PlatformViewNotifyCreated(shell.get());
@@ -1607,7 +1704,8 @@ TEST_F(ShellTest, MultipleFluttersSetResourceCacheBytes) {
 
   RunEngine(shell.get(), std::move(configuration));
   PostSync(shell->GetTaskRunners().GetPlatformTaskRunner(), [&shell]() {
-    shell->GetPlatformView()->SetViewportMetrics({1.0, 100, 100, 22});
+    shell->GetPlatformView()->SetViewportMetrics(kImplicitViewId,
+                                                 {1.0, 100, 100, 22, 0});
   });
 
   // first cache bytes
@@ -1636,7 +1734,7 @@ TEST_F(ShellTest, MultipleFluttersSetResourceCacheBytes) {
   PostSync(second_shell->GetTaskRunners().GetPlatformTaskRunner(),
            [&second_shell]() {
              second_shell->GetPlatformView()->SetViewportMetrics(
-                 {1.0, 100, 100, 22});
+                 kImplicitViewId, {1.0, 100, 100, 22, 0});
            });
   // first cache bytes + second cache bytes
   EXPECT_EQ(GetRasterizerResourceCacheBytesSync(*shell),
@@ -1645,7 +1743,7 @@ TEST_F(ShellTest, MultipleFluttersSetResourceCacheBytes) {
   PostSync(second_shell->GetTaskRunners().GetPlatformTaskRunner(),
            [&second_shell]() {
              second_shell->GetPlatformView()->SetViewportMetrics(
-                 {1.0, 100, 300, 22});
+                 kImplicitViewId, {1.0, 100, 300, 22, 0});
            });
   // first cache bytes + second cache bytes
   EXPECT_EQ(GetRasterizerResourceCacheBytesSync(*shell),
@@ -1653,18 +1751,20 @@ TEST_F(ShellTest, MultipleFluttersSetResourceCacheBytes) {
 
   std::unique_ptr<Shell> third_shell = shell_spawn_callback();
   PlatformViewNotifyCreated(third_shell.get());
-  PostSync(
-      third_shell->GetTaskRunners().GetPlatformTaskRunner(), [&third_shell]() {
-        third_shell->GetPlatformView()->SetViewportMetrics({1.0, 400, 100, 22});
-      });
+  PostSync(third_shell->GetTaskRunners().GetPlatformTaskRunner(),
+           [&third_shell]() {
+             third_shell->GetPlatformView()->SetViewportMetrics(
+                 kImplicitViewId, {1.0, 400, 100, 22, 0});
+           });
   // first cache bytes + second cache bytes + third cache bytes
   EXPECT_EQ(GetRasterizerResourceCacheBytesSync(*shell),
             static_cast<size_t>(3840000U));
 
-  PostSync(
-      third_shell->GetTaskRunners().GetPlatformTaskRunner(), [&third_shell]() {
-        third_shell->GetPlatformView()->SetViewportMetrics({1.0, 800, 100, 22});
-      });
+  PostSync(third_shell->GetTaskRunners().GetPlatformTaskRunner(),
+           [&third_shell]() {
+             third_shell->GetPlatformView()->SetViewportMetrics(
+                 kImplicitViewId, {1.0, 800, 100, 22, 0});
+           });
   // max bytes threshold
   EXPECT_EQ(GetRasterizerResourceCacheBytesSync(*shell),
             static_cast<size_t>(4000000U));
@@ -1676,7 +1776,7 @@ TEST_F(ShellTest, MultipleFluttersSetResourceCacheBytes) {
   PostSync(second_shell->GetTaskRunners().GetPlatformTaskRunner(),
            [&second_shell]() {
              second_shell->GetPlatformView()->SetViewportMetrics(
-                 {1.0, 100, 100, 22});
+                 kImplicitViewId, {1.0, 100, 100, 22, 0});
            });
   // first cache bytes + second cache bytes
   EXPECT_EQ(GetRasterizerResourceCacheBytesSync(*shell),
@@ -1710,6 +1810,9 @@ TEST_F(ShellTest, SetResourceCacheSize) {
 #if defined(SHELL_ENABLE_VULKAN) && !defined(SHELL_ENABLE_GL)
   EXPECT_EQ(GetRasterizerResourceCacheBytesSync(*shell),
             vulkan::kGrCacheMaxByteSize);
+#elif defined(SHELL_ENABLE_METAL)
+  EXPECT_EQ(GetRasterizerResourceCacheBytesSync(*shell),
+            static_cast<size_t>(256 * (1 << 20)));
 #else
   EXPECT_EQ(GetRasterizerResourceCacheBytesSync(*shell),
             static_cast<size_t>(24 * (1 << 20)));
@@ -1717,7 +1820,8 @@ TEST_F(ShellTest, SetResourceCacheSize) {
 
   fml::TaskRunner::RunNowOrPostTask(
       shell->GetTaskRunners().GetPlatformTaskRunner(), [&shell]() {
-        shell->GetPlatformView()->SetViewportMetrics({1.0, 400, 200, 22});
+        shell->GetPlatformView()->SetViewportMetrics(kImplicitViewId,
+                                                     {1.0, 400, 200, 22, 0});
       });
   PumpOneFrame(shell.get());
 
@@ -1737,7 +1841,8 @@ TEST_F(ShellTest, SetResourceCacheSize) {
 
   fml::TaskRunner::RunNowOrPostTask(
       shell->GetTaskRunners().GetPlatformTaskRunner(), [&shell]() {
-        shell->GetPlatformView()->SetViewportMetrics({1.0, 800, 400, 22});
+        shell->GetPlatformView()->SetViewportMetrics(kImplicitViewId,
+                                                     {1.0, 800, 400, 22, 0});
       });
   PumpOneFrame(shell.get());
 
@@ -1754,7 +1859,8 @@ TEST_F(ShellTest, SetResourceCacheSizeEarly) {
 
   fml::TaskRunner::RunNowOrPostTask(
       shell->GetTaskRunners().GetPlatformTaskRunner(), [&shell]() {
-        shell->GetPlatformView()->SetViewportMetrics({1.0, 400, 200, 22});
+        shell->GetPlatformView()->SetViewportMetrics(kImplicitViewId,
+                                                     {1.0, 400, 200, 22, 0});
       });
   PumpOneFrame(shell.get());
 
@@ -1781,7 +1887,8 @@ TEST_F(ShellTest, SetResourceCacheSizeNotifiesDart) {
 
   fml::TaskRunner::RunNowOrPostTask(
       shell->GetTaskRunners().GetPlatformTaskRunner(), [&shell]() {
-        shell->GetPlatformView()->SetViewportMetrics({1.0, 400, 200, 22});
+        shell->GetPlatformView()->SetViewportMetrics(kImplicitViewId,
+                                                     {1.0, 400, 200, 22, 0});
       });
   PumpOneFrame(shell.get());
 
@@ -1854,7 +1961,7 @@ class MockTexture : public Texture {
   void Paint(PaintContext& context,
              const SkRect& bounds,
              bool freeze,
-             const SkSamplingOptions&) override {}
+             const DlImageSampling) override {}
 
   void OnGrContextCreated() override {}
 
@@ -1986,6 +2093,7 @@ TEST_F(ShellTest, CanScheduleFrameFromPlatform) {
 TEST_F(ShellTest, SecondaryVsyncCallbackShouldBeCalledAfterVsyncCallback) {
   bool is_on_begin_frame_called = false;
   bool is_secondary_callback_called = false;
+  bool test_started = false;
   Settings settings = CreateSettingsForFixture();
   TaskRunners task_runners = GetTaskRunnersForFixture();
   fml::AutoResetWaitableEvent latch;
@@ -1995,12 +2103,18 @@ TEST_F(ShellTest, SecondaryVsyncCallbackShouldBeCalledAfterVsyncCallback) {
   fml::CountDownLatch count_down_latch(2);
   AddNativeCallback("NativeOnBeginFrame",
                     CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
+                      if (!test_started) {
+                        return;
+                      }
                       EXPECT_FALSE(is_on_begin_frame_called);
                       EXPECT_FALSE(is_secondary_callback_called);
                       is_on_begin_frame_called = true;
                       count_down_latch.CountDown();
                     }));
-  std::unique_ptr<Shell> shell = CreateShell(settings, task_runners);
+  std::unique_ptr<Shell> shell = CreateShell({
+      .settings = settings,
+      .task_runners = task_runners,
+  });
   ASSERT_TRUE(shell->IsSetup());
 
   auto configuration = RunConfiguration::InferFromSettings(settings);
@@ -2013,12 +2127,16 @@ TEST_F(ShellTest, SecondaryVsyncCallbackShouldBeCalledAfterVsyncCallback) {
   fml::TaskRunner::RunNowOrPostTask(
       shell->GetTaskRunners().GetUITaskRunner(), [&]() {
         shell->GetEngine()->ScheduleSecondaryVsyncCallback(0, [&]() {
+          if (!test_started) {
+            return;
+          }
           EXPECT_TRUE(is_on_begin_frame_called);
           EXPECT_FALSE(is_secondary_callback_called);
           is_secondary_callback_called = true;
           count_down_latch.CountDown();
         });
         shell->GetEngine()->ScheduleFrame();
+        test_started = true;
       });
   count_down_latch.Wait();
   EXPECT_TRUE(is_on_begin_frame_called);
@@ -2058,17 +2176,12 @@ TEST_F(ShellTest, Screenshot) {
   RunEngine(shell.get(), std::move(configuration));
 
   LayerTreeBuilder builder = [&](const std::shared_ptr<ContainerLayer>& root) {
-    fml::RefPtr<SkiaUnrefQueue> queue = fml::MakeRefCounted<SkiaUnrefQueue>(
-        this->GetCurrentTaskRunner(), fml::TimeDelta::Zero());
     auto display_list_layer = std::make_shared<DisplayListLayer>(
-        SkPoint::Make(10, 10),
-        flutter::SkiaGPUObject<DisplayList>(
-            {MakeSizedDisplayList(80, 80), queue}),
-        false, false);
+        SkPoint::Make(10, 10), MakeSizedDisplayList(80, 80), false, false);
     root->Add(display_list_layer);
   };
 
-  PumpOneFrame(shell.get(), 100, 100, builder);
+  PumpOneFrame(shell.get(), ViewContent::ImplicitView(100, 100, builder));
   firstFrameLatch.Wait();
 
   std::promise<Rasterizer::Screenshot> screenshot_promise;
@@ -2103,52 +2216,6 @@ TEST_F(ShellTest, Screenshot) {
   DestroyShell(std::move(shell));
 }
 
-TEST_F(ShellTest, CanConvertToAndFromMappings) {
-  const size_t buffer_size = 2 << 20;
-
-  uint8_t* buffer = static_cast<uint8_t*>(::malloc(buffer_size));
-  // NOLINTNEXTLINE(clang-analyzer-unix.Malloc)
-  ASSERT_TRUE(buffer != nullptr);
-  ASSERT_TRUE(MemsetPatternSetOrCheck(
-      buffer, buffer_size, MemsetPatternOp::kMemsetPatternOpSetBuffer));
-
-  std::unique_ptr<fml::Mapping> mapping =
-      std::make_unique<fml::MallocMapping>(buffer, buffer_size);
-
-  ASSERT_EQ(mapping->GetSize(), buffer_size);
-
-  fml::AutoResetWaitableEvent latch;
-  AddNativeCallback(
-      "SendFixtureMapping", CREATE_NATIVE_ENTRY([&](auto args) {
-        auto mapping_from_dart =
-            tonic::DartConverter<std::unique_ptr<fml::Mapping>>::FromDart(
-                Dart_GetNativeArgument(args, 0));
-        ASSERT_NE(mapping_from_dart, nullptr);
-        ASSERT_EQ(mapping_from_dart->GetSize(), buffer_size);
-        ASSERT_TRUE(MemsetPatternSetOrCheck(
-            const_cast<uint8_t*>(mapping_from_dart->GetMapping()),  // buffer
-            mapping_from_dart->GetSize(),                           // size
-            MemsetPatternOp::kMemsetPatternOpCheckBuffer            // op
-            ));
-        latch.Signal();
-      }));
-
-  AddNativeCallback(
-      "GetFixtureMapping", CREATE_NATIVE_ENTRY([&](auto args) {
-        tonic::DartConverter<tonic::DartConverterMapping>::SetReturnValue(
-            args, mapping);
-      }));
-
-  auto settings = CreateSettingsForFixture();
-  auto configuration = RunConfiguration::InferFromSettings(settings);
-  configuration.SetEntrypoint("canConvertMappings");
-  std::unique_ptr<Shell> shell = CreateShell(settings);
-  ASSERT_NE(shell.get(), nullptr);
-  RunEngine(shell.get(), std::move(configuration));
-  latch.Wait();
-  DestroyShell(std::move(shell));
-}
-
 // Compares local times as seen by the dart isolate and as seen by this test
 // fixture, to a resolution of 1 hour.
 //
@@ -2197,35 +2264,6 @@ TEST_F(ShellTest, LocaltimesMatch) {
   DestroyShell(std::move(shell));
 }
 
-TEST_F(ShellTest, CanDecompressImageFromAsset) {
-  fml::AutoResetWaitableEvent latch;
-  AddNativeCallback("NotifyWidthHeight", CREATE_NATIVE_ENTRY([&](auto args) {
-                      auto width = tonic::DartConverter<int>::FromDart(
-                          Dart_GetNativeArgument(args, 0));
-                      auto height = tonic::DartConverter<int>::FromDart(
-                          Dart_GetNativeArgument(args, 1));
-                      ASSERT_EQ(width, 100);
-                      ASSERT_EQ(height, 100);
-                      latch.Signal();
-                    }));
-
-  AddNativeCallback(
-      "GetFixtureImage", CREATE_NATIVE_ENTRY([](auto args) {
-        auto fixture = OpenFixtureAsMapping("shelltest_screenshot.png");
-        tonic::DartConverter<tonic::DartConverterMapping>::SetReturnValue(
-            args, fixture);
-      }));
-
-  auto settings = CreateSettingsForFixture();
-  auto configuration = RunConfiguration::InferFromSettings(settings);
-  configuration.SetEntrypoint("canDecompressImageFromAsset");
-  std::unique_ptr<Shell> shell = CreateShell(settings);
-  ASSERT_NE(shell.get(), nullptr);
-  RunEngine(shell.get(), std::move(configuration));
-  latch.Wait();
-  DestroyShell(std::move(shell));
-}
-
 /// An image generator that always creates a 1x1 single-frame green image.
 class SinglePixelImageGenerator : public ImageGenerator {
  public:
@@ -2238,7 +2276,7 @@ class SinglePixelImageGenerator : public ImageGenerator {
 
   unsigned int GetPlayCount() const { return 1; }
 
-  const ImageGenerator::FrameInfo GetFrameInfo(unsigned int frame_index) const {
+  const ImageGenerator::FrameInfo GetFrameInfo(unsigned int frame_index) {
     return {std::nullopt, 0, SkCodecAnimation::DisposalMethod::kKeep};
   }
 
@@ -2416,13 +2454,8 @@ TEST_F(ShellTest, OnServiceProtocolEstimateRasterCacheMemoryWorks) {
 
   // 1. Construct a picture and a picture layer to be raster cached.
   sk_sp<DisplayList> display_list = MakeSizedDisplayList(10, 10);
-  fml::RefPtr<SkiaUnrefQueue> queue = fml::MakeRefCounted<SkiaUnrefQueue>(
-      GetCurrentTaskRunner(), fml::TimeDelta::Zero());
   auto display_list_layer = std::make_shared<DisplayListLayer>(
-      SkPoint::Make(0, 0),
-      flutter::SkiaGPUObject<DisplayList>(
-          {MakeSizedDisplayList(100, 100), queue}),
-      false, false);
+      SkPoint::Make(0, 0), MakeSizedDisplayList(100, 100), false, false);
   display_list_layer->set_paint_bounds(SkRect::MakeWH(100, 100));
 
   // 2. Rasterize the picture and the picture layer in the raster cache.
@@ -2448,7 +2481,6 @@ TEST_F(ShellTest, OnServiceProtocolEstimateRasterCacheMemoryWorks) {
             .ui_time                       = ui_time,
             .texture_registry              = nullptr,
             .raster_cache                  = &raster_cache,
-            .frame_device_pixel_ratio      = 1.0f,
             // clang-format on
         };
 
@@ -2463,7 +2495,6 @@ TEST_F(ShellTest, OnServiceProtocolEstimateRasterCacheMemoryWorks) {
             .raster_time                   = raster_time,
             .ui_time                       = ui_time,
             .texture_registry              = nullptr,
-            .frame_device_pixel_ratio      = 1.0f,
             .has_platform_view             = false,
             .has_texture_layer             = false,
             .raster_cached_entries         = &raster_cache_items,
@@ -2472,11 +2503,11 @@ TEST_F(ShellTest, OnServiceProtocolEstimateRasterCacheMemoryWorks) {
 
         // 2.1. Rasterize the picture. Call Draw multiple times to pass the
         // access threshold (default to 3) so a cache can be generated.
-        SkCanvas dummy_canvas;
-        SkPaint paint;
+        MockCanvas dummy_canvas;
+        DlPaint paint;
         bool picture_cache_generated;
         DisplayListRasterCacheItem display_list_raster_cache_item(
-            display_list.get(), SkPoint(), true, false);
+            display_list, SkPoint(), true, false);
         for (int i = 0; i < 4; i += 1) {
           SkMatrix matrix = SkMatrix::I();
           state_stack.set_preroll_delegate(matrix);
@@ -2515,8 +2546,8 @@ TEST_F(ShellTest, OnServiceProtocolEstimateRasterCacheMemoryWorks) {
   rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
   document.Accept(writer);
   std::string expected_json =
-      "{\"type\":\"EstimateRasterCacheMemory\",\"layerBytes\":40000,\"picture"
-      "Bytes\":400}";
+      "{\"type\":\"EstimateRasterCacheMemory\",\"layerBytes\":40024,\"picture"
+      "Bytes\":424}";
   std::string actual_json = buffer.GetString();
   ASSERT_EQ(actual_json, expected_json);
 
@@ -2535,7 +2566,13 @@ TEST_F(ShellTest, OnServiceProtocolRenderFrameWithRasterStatsWorks) {
   configuration.SetEntrypoint("scene_with_red_box");
 
   RunEngine(shell.get(), std::move(configuration));
-  PumpOneFrame(shell.get());
+  // Set a non-zero viewport metrics, otherwise the scene would be discarded.
+  PostSync(shell->GetTaskRunners().GetUITaskRunner(),
+           [engine = shell->GetEngine()]() {
+             engine->SetViewportMetrics(kImplicitViewId,
+                                        ViewportMetrics{1, 1, 1, 22, 0});
+           });
+  PumpOneFrame(shell.get(), ViewContent::NoViews());
 
   ServiceProtocol::Handler::ServiceProtocolMap empty_params;
   rapidjson::Document document;
@@ -2549,12 +2586,74 @@ TEST_F(ShellTest, OnServiceProtocolRenderFrameWithRasterStatsWorks) {
   // It would be better to parse out the json and check for the validity of
   // fields. Below checks approximate what needs to be checked, this can not be
   // an exact check since duration will not exactly match.
+#ifdef SHELL_ENABLE_METAL
+  std::string expected_json =
+      "\"snapshot\":[137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,3,32,0,"
+      "0,2,88,8,6,0,0,0,154,118,130,112,0,0,0,1,115,82,71,66,0,174,206,28,233,"
+      "0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,7,103,73,68,65,84,120,"
+      "156,237,206,65,13,192,48,0,3,177,211,248,115,78,73,172,234,199,70,224,"
+      "86,91,45,0,0,128,203,190,215,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+      "0,224,47,7,195,182,3,255,101,111,186,90,0,0,0,0,73,69,78,68,174,66,96,"
+      "130]";
+#else
   std::string expected_json =
       "\"snapshot\":[137,80,78,71,13,10,26,10,0,"
       "0,0,13,73,72,68,82,0,0,0,1,0,0,0,1,8,6,0,0,0,31,21,196,137,0,0,0,1,115,"
       "82,71,66,0,174,206,28,233,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,"
       "0,0,13,73,68,65,84,8,153,99,248,207,192,240,31,0,5,0,1,255,171,206,54,"
       "137,0,0,0,0,73,69,78,68,174,66,96,130]";
+#endif
   std::string actual_json = buffer.GetString();
 
   EXPECT_THAT(actual_json, ::testing::HasSubstr(expected_json));
@@ -2566,6 +2665,47 @@ TEST_F(ShellTest, OnServiceProtocolRenderFrameWithRasterStatsWorks) {
   DestroyShell(std::move(shell));
 }
 
+#if defined(FML_OS_MACOSX)
+TEST_F(ShellTest, OnServiceProtocolRenderFrameWithRasterStatsDisableImpeller) {
+  auto settings = CreateSettingsForFixture();
+  settings.enable_impeller = true;
+  std::unique_ptr<Shell> shell = CreateShell({
+      .settings = settings,
+      .platform_view_create_callback = ShellTestPlatformViewBuilder({
+          .rendering_backend =
+              ShellTestPlatformView::BackendType::kMetalBackend,
+      }),
+  });
+
+  // Create the surface needed by rasterizer
+  PlatformViewNotifyCreated(shell.get());
+
+  auto configuration = RunConfiguration::InferFromSettings(settings);
+  configuration.SetEntrypoint("scene_with_red_box");
+
+  RunEngine(shell.get(), std::move(configuration));
+  PumpOneFrame(shell.get(), ViewContent::NoViews());
+
+  ServiceProtocol::Handler::ServiceProtocolMap empty_params;
+  rapidjson::Document document;
+  OnServiceProtocol(
+      shell.get(), ServiceProtocolEnum::kRenderFrameWithRasterStats,
+      shell->GetTaskRunners().GetRasterTaskRunner(), empty_params, &document);
+  rapidjson::StringBuffer buffer;
+  rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
+  document.Accept(writer);
+  std::string actual_json = buffer.GetString();
+  std::string expected_json =
+      "{\"code\":-32000,\"message\":\"Raster status not supported on Impeller "
+      "backend.\"}";
+
+  ASSERT_EQ(actual_json, expected_json);
+
+  PlatformViewNotifyDestroyed(shell.get());
+  DestroyShell(std::move(shell));
+}
+#endif  // FML_OS_MACOSX
+
 // TODO(https://github.com/flutter/flutter/issues/100273): Disabled due to
 // flakiness.
 // TODO(https://github.com/flutter/flutter/issues/100299): Fix it when
@@ -2584,8 +2724,12 @@ TEST_F(ShellTest, DISABLED_DiscardLayerTreeOnResize) {
       };
   auto external_view_embedder = std::make_shared<ShellTestExternalViewEmbedder>(
       std::move(end_frame_callback), PostPrerollResult::kSuccess, false);
-  std::unique_ptr<Shell> shell = CreateShell(
-      settings, GetTaskRunnersForFixture(), false, external_view_embedder);
+  std::unique_ptr<Shell> shell = CreateShell({
+      .settings = settings,
+      .platform_view_create_callback = ShellTestPlatformViewBuilder({
+          .shell_test_external_view_embedder = external_view_embedder,
+      }),
+  });
 
   // Create the surface needed by rasterizer
   PlatformViewNotifyCreated(shell.get());
@@ -2594,8 +2738,9 @@ TEST_F(ShellTest, DISABLED_DiscardLayerTreeOnResize) {
       shell->GetTaskRunners().GetPlatformTaskRunner(),
       [&shell, &expected_size]() {
         shell->GetPlatformView()->SetViewportMetrics(
+            kImplicitViewId,
             {1.0, static_cast<double>(expected_size.width()),
-             static_cast<double>(expected_size.height()), 22});
+             static_cast<double>(expected_size.height()), 22, 0});
       });
 
   auto configuration = RunConfiguration::InferFromSettings(settings);
@@ -2603,14 +2748,16 @@ TEST_F(ShellTest, DISABLED_DiscardLayerTreeOnResize) {
 
   RunEngine(shell.get(), std::move(configuration));
 
-  PumpOneFrame(shell.get(), static_cast<double>(wrong_size.width()),
-               static_cast<double>(wrong_size.height()));
+  PumpOneFrame(shell.get(), ViewContent::DummyView(
+                                static_cast<double>(wrong_size.width()),
+                                static_cast<double>(wrong_size.height())));
   end_frame_latch.Wait();
   // Wrong size, no frames are submitted.
   ASSERT_EQ(0, external_view_embedder->GetSubmittedFrameCount());
 
-  PumpOneFrame(shell.get(), static_cast<double>(expected_size.width()),
-               static_cast<double>(expected_size.height()));
+  PumpOneFrame(shell.get(), ViewContent::DummyView(
+                                static_cast<double>(expected_size.width()),
+                                static_cast<double>(expected_size.height())));
   end_frame_latch.Wait();
   // Expected size, 1 frame submitted.
   ASSERT_EQ(1, external_view_embedder->GetSubmittedFrameCount());
@@ -2657,8 +2804,12 @@ TEST_F(ShellTest, DISABLED_DiscardResubmittedLayerTreeOnResize) {
   external_view_embedder = std::make_shared<ShellTestExternalViewEmbedder>(
       std::move(end_frame_callback), PostPrerollResult::kResubmitFrame, true);
 
-  std::unique_ptr<Shell> shell = CreateShell(
-      settings, GetTaskRunnersForFixture(), false, external_view_embedder);
+  std::unique_ptr<Shell> shell = CreateShell({
+      .settings = settings,
+      .platform_view_create_callback = ShellTestPlatformViewBuilder({
+          .shell_test_external_view_embedder = external_view_embedder,
+      }),
+  });
 
   // Create the surface needed by rasterizer
   PlatformViewNotifyCreated(shell.get());
@@ -2667,8 +2818,9 @@ TEST_F(ShellTest, DISABLED_DiscardResubmittedLayerTreeOnResize) {
       shell->GetTaskRunners().GetPlatformTaskRunner(),
       [&shell, &origin_size]() {
         shell->GetPlatformView()->SetViewportMetrics(
+            kImplicitViewId,
             {1.0, static_cast<double>(origin_size.width()),
-             static_cast<double>(origin_size.height()), 22});
+             static_cast<double>(origin_size.height()), 22, 0});
       });
 
   auto configuration = RunConfiguration::InferFromSettings(settings);
@@ -2676,8 +2828,9 @@ TEST_F(ShellTest, DISABLED_DiscardResubmittedLayerTreeOnResize) {
 
   RunEngine(shell.get(), std::move(configuration));
 
-  PumpOneFrame(shell.get(), static_cast<double>(origin_size.width()),
-               static_cast<double>(origin_size.height()));
+  PumpOneFrame(shell.get(), ViewContent::DummyView(
+                                static_cast<double>(origin_size.width()),
+                                static_cast<double>(origin_size.height())));
 
   end_frame_latch.Wait();
   ASSERT_EQ(0, external_view_embedder->GetSubmittedFrameCount());
@@ -2686,8 +2839,8 @@ TEST_F(ShellTest, DISABLED_DiscardResubmittedLayerTreeOnResize) {
       shell->GetTaskRunners().GetPlatformTaskRunner(),
       [&shell, &new_size, &resize_latch]() {
         shell->GetPlatformView()->SetViewportMetrics(
-            {1.0, static_cast<double>(new_size.width()),
-             static_cast<double>(new_size.height()), 22});
+            kImplicitViewId, {1.0, static_cast<double>(new_size.width()),
+                              static_cast<double>(new_size.height()), 22, 0});
         resize_latch.Signal();
       });
 
@@ -2698,8 +2851,9 @@ TEST_F(ShellTest, DISABLED_DiscardResubmittedLayerTreeOnResize) {
   ASSERT_EQ(0, external_view_embedder->GetSubmittedFrameCount());
 
   // Threads will be merged at the end of this frame.
-  PumpOneFrame(shell.get(), static_cast<double>(new_size.width()),
-               static_cast<double>(new_size.height()));
+  PumpOneFrame(shell.get(),
+               ViewContent::DummyView(static_cast<double>(new_size.width()),
+                                      static_cast<double>(new_size.height())));
 
   end_frame_latch.Wait();
   ASSERT_TRUE(raster_thread_merger_ref->IsMerged());
@@ -2750,13 +2904,21 @@ TEST_F(ShellTest, IgnoresInvalidMetrics) {
   RunEngine(shell.get(), std::move(configuration));
 
   task_runner->PostTask([&]() {
-    shell->GetPlatformView()->SetViewportMetrics({0.0, 400, 200, 22});
+    // This one is invalid for having 0 pixel ratio.
+    shell->GetPlatformView()->SetViewportMetrics(kImplicitViewId,
+                                                 {0.0, 400, 200, 22, 0});
     task_runner->PostTask([&]() {
-      shell->GetPlatformView()->SetViewportMetrics({0.8, 0.0, 200, 22});
+      // This one is invalid for having 0 width.
+      shell->GetPlatformView()->SetViewportMetrics(kImplicitViewId,
+                                                   {0.8, 0.0, 200, 22, 0});
       task_runner->PostTask([&]() {
-        shell->GetPlatformView()->SetViewportMetrics({0.8, 400, 0.0, 22});
+        // This one is invalid for having 0 height.
+        shell->GetPlatformView()->SetViewportMetrics(kImplicitViewId,
+                                                     {0.8, 400, 0.0, 22, 0});
         task_runner->PostTask([&]() {
-          shell->GetPlatformView()->SetViewportMetrics({0.8, 400, 200.0, 22});
+          // This one makes it through.
+          shell->GetPlatformView()->SetViewportMetrics(
+              kImplicitViewId, {0.8, 400, 200.0, 22, 0});
         });
       });
     });
@@ -2768,7 +2930,8 @@ TEST_F(ShellTest, IgnoresInvalidMetrics) {
   latch.Reset();
 
   task_runner->PostTask([&]() {
-    shell->GetPlatformView()->SetViewportMetrics({1.2, 600, 300, 22});
+    shell->GetPlatformView()->SetViewportMetrics(kImplicitViewId,
+                                                 {1.2, 600, 300, 22, 0});
   });
   latch.Wait();
   ASSERT_EQ(last_device_pixel_ratio, 1.2);
@@ -2778,6 +2941,52 @@ TEST_F(ShellTest, IgnoresInvalidMetrics) {
   DestroyShell(std::move(shell), task_runners);
 }
 
+TEST_F(ShellTest, IgnoresMetricsUpdateToInvalidView) {
+  fml::AutoResetWaitableEvent latch;
+  double last_device_pixel_ratio;
+  // This callback will be called whenever any view's metrics change.
+  auto native_report_device_pixel_ratio = [&](Dart_NativeArguments args) {
+    // The correct call will have a DPR of 3.
+    auto dpr_handle = Dart_GetNativeArgument(args, 0);
+    ASSERT_TRUE(Dart_IsDouble(dpr_handle));
+    Dart_DoubleValue(dpr_handle, &last_device_pixel_ratio);
+    ASSERT_TRUE(last_device_pixel_ratio > 2.5);
+
+    latch.Signal();
+  };
+
+  Settings settings = CreateSettingsForFixture();
+  auto task_runner = CreateNewThread();
+  TaskRunners task_runners("test", task_runner, task_runner, task_runner,
+                           task_runner);
+
+  AddNativeCallback("ReportMetrics",
+                    CREATE_NATIVE_ENTRY(native_report_device_pixel_ratio));
+
+  std::unique_ptr<Shell> shell = CreateShell(settings, task_runners);
+
+  auto configuration = RunConfiguration::InferFromSettings(settings);
+  configuration.SetEntrypoint("reportMetrics");
+
+  RunEngine(shell.get(), std::move(configuration));
+
+  task_runner->PostTask([&]() {
+    // This one is invalid for having an nonexistent view ID.
+    // Also, it has a DPR of 2.0 for detection.
+    shell->GetPlatformView()->SetViewportMetrics(2, {2.0, 400, 200, 22, 0});
+    task_runner->PostTask([&]() {
+      // This one is valid with DPR 3.0.
+      shell->GetPlatformView()->SetViewportMetrics(kImplicitViewId,
+                                                   {3.0, 400, 200, 22, 0});
+    });
+  });
+  latch.Wait();
+  ASSERT_EQ(last_device_pixel_ratio, 3.0);
+  latch.Reset();
+
+  DestroyShell(std::move(shell), task_runners);
+}
+
 TEST_F(ShellTest, OnServiceProtocolSetAssetBundlePathWorks) {
   Settings settings = CreateSettingsForFixture();
   std::unique_ptr<Shell> shell = CreateShell(settings);
@@ -2887,7 +3096,7 @@ TEST_F(ShellTest, AssetManagerMulti) {
       "bad1",
   };
 
-  for (auto filename : filenames) {
+  for (const auto& filename : filenames) {
     bool success = fml::WriteAtomically(asset_dir_fd, filename.c_str(),
                                         fml::DataMapping(filename));
     ASSERT_TRUE(success);
@@ -3424,7 +3633,7 @@ TEST_F(ShellTest, UpdateAssetResolverByTypeNull) {
   Settings settings = CreateSettingsForFixture();
   ThreadHost thread_host(ThreadHost::ThreadHostConfig(
       "io.flutter.test." + GetCurrentTestName() + ".",
-      ThreadHost::Type::Platform));
+      ThreadHost::Type::kPlatform));
   auto task_runner = thread_host.platform_thread->GetTaskRunner();
   TaskRunners task_runners("test", task_runner, task_runner, task_runner,
                            task_runner);
@@ -3508,16 +3717,14 @@ TEST_F(ShellTest, CanCreateShellsWithGLBackend) {
 #if !SHELL_ENABLE_GL
   // GL emulation does not exist on Fuchsia.
   GTEST_SKIP();
-#endif  // !SHELL_ENABLE_GL
+#else
   auto settings = CreateSettingsForFixture();
-  std::unique_ptr<Shell> shell =
-      CreateShell(settings,                                       //
-                  GetTaskRunnersForFixture(),                     //
-                  false,                                          //
-                  nullptr,                                        //
-                  false,                                          //
-                  ShellTestPlatformView::BackendType::kGLBackend  //
-      );
+  std::unique_ptr<Shell> shell = CreateShell({
+      .settings = settings,
+      .platform_view_create_callback = ShellTestPlatformViewBuilder({
+          .rendering_backend = ShellTestPlatformView::BackendType::kGLBackend,
+      }),
+  });
   ASSERT_NE(shell, nullptr);
   ASSERT_TRUE(shell->IsSetup());
   auto configuration = RunConfiguration::InferFromSettings(settings);
@@ -3527,21 +3734,21 @@ TEST_F(ShellTest, CanCreateShellsWithGLBackend) {
   PumpOneFrame(shell.get());
   PlatformViewNotifyDestroyed(shell.get());
   DestroyShell(std::move(shell));
+#endif  // !SHELL_ENABLE_GL
 }
 
 TEST_F(ShellTest, CanCreateShellsWithVulkanBackend) {
 #if !SHELL_ENABLE_VULKAN
   GTEST_SKIP();
-#endif  // !SHELL_ENABLE_VULKAN
+#else
   auto settings = CreateSettingsForFixture();
-  std::unique_ptr<Shell> shell =
-      CreateShell(settings,                                           //
-                  GetTaskRunnersForFixture(),                         //
-                  false,                                              //
-                  nullptr,                                            //
-                  false,                                              //
-                  ShellTestPlatformView::BackendType::kVulkanBackend  //
-      );
+  std::unique_ptr<Shell> shell = CreateShell({
+      .settings = settings,
+      .platform_view_create_callback = ShellTestPlatformViewBuilder({
+          .rendering_backend =
+              ShellTestPlatformView::BackendType::kVulkanBackend,
+      }),
+  });
   ASSERT_NE(shell, nullptr);
   ASSERT_TRUE(shell->IsSetup());
   auto configuration = RunConfiguration::InferFromSettings(settings);
@@ -3551,21 +3758,21 @@ TEST_F(ShellTest, CanCreateShellsWithVulkanBackend) {
   PumpOneFrame(shell.get());
   PlatformViewNotifyDestroyed(shell.get());
   DestroyShell(std::move(shell));
+#endif  // !SHELL_ENABLE_VULKAN
 }
 
 TEST_F(ShellTest, CanCreateShellsWithMetalBackend) {
 #if !SHELL_ENABLE_METAL
   GTEST_SKIP();
-#endif  // !SHELL_ENABLE_METAL
+#else
   auto settings = CreateSettingsForFixture();
-  std::unique_ptr<Shell> shell =
-      CreateShell(settings,                                          //
-                  GetTaskRunnersForFixture(),                        //
-                  false,                                             //
-                  nullptr,                                           //
-                  false,                                             //
-                  ShellTestPlatformView::BackendType::kMetalBackend  //
-      );
+  std::unique_ptr<Shell> shell = CreateShell({
+      .settings = settings,
+      .platform_view_create_callback = ShellTestPlatformViewBuilder({
+          .rendering_backend =
+              ShellTestPlatformView::BackendType::kMetalBackend,
+      }),
+  });
   ASSERT_NE(shell, nullptr);
   ASSERT_TRUE(shell->IsSetup());
   auto configuration = RunConfiguration::InferFromSettings(settings);
@@ -3575,6 +3782,7 @@ TEST_F(ShellTest, CanCreateShellsWithMetalBackend) {
   PumpOneFrame(shell.get());
   PlatformViewNotifyDestroyed(shell.get());
   DestroyShell(std::move(shell));
+#endif  // !SHELL_ENABLE_METAL
 }
 
 TEST_F(ShellTest, UserTagSetOnStartup) {
@@ -3729,15 +3937,11 @@ TEST_F(ShellTest, UsesPlatformMessageHandler) {
             .WillOnce(Return(platform_message_handler));
         return result;
       };
-  auto shell = CreateShell(
-      /*settings=*/settings,
-      /*task_runners=*/task_runners,
-      /*simulate_vsync=*/false,
-      /*shell_test_external_view_embedder=*/nullptr,
-      /*is_gpu_disabled=*/false,
-      /*rendering_backend=*/
-      ShellTestPlatformView::BackendType::kDefaultBackend,
-      /*platform_view_create_callback=*/platform_view_create_callback);
+  auto shell = CreateShell({
+      .settings = settings,
+      .task_runners = task_runners,
+      .platform_view_create_callback = platform_view_create_callback,
+  });
 
   EXPECT_EQ(platform_message_handler, shell->GetPlatformMessageHandler());
   PostSync(task_runners.GetUITaskRunner(), [&shell]() {
@@ -3824,20 +4028,56 @@ TEST_F(ShellTest, SpawnWorksWithOnError) {
   ASSERT_FALSE(DartVMRef::IsInstanceRunning());
 }
 
+TEST_F(ShellTest, ImmutableBufferLoadsAssetOnBackgroundThread) {
+  Settings settings = CreateSettingsForFixture();
+  auto task_runner = CreateNewThread();
+  TaskRunners task_runners("test", task_runner, task_runner, task_runner,
+                           task_runner);
+  std::unique_ptr<Shell> shell = CreateShell(settings, task_runners);
+
+  fml::CountDownLatch latch(1);
+  AddNativeCallback("NotifyNative",
+                    CREATE_NATIVE_ENTRY([&](auto args) { latch.CountDown(); }));
+
+  // Create the surface needed by rasterizer
+  PlatformViewNotifyCreated(shell.get());
+
+  auto configuration = RunConfiguration::InferFromSettings(settings);
+  configuration.SetEntrypoint("testThatAssetLoadingHappensOnWorkerThread");
+  auto asset_manager = configuration.GetAssetManager();
+  auto test_resolver = std::make_unique<ThreadCheckingAssetResolver>(
+      shell->GetDartVM()->GetConcurrentMessageLoop());
+  auto leaked_resolver = test_resolver.get();
+  asset_manager->PushBack(std::move(test_resolver));
+
+  RunEngine(shell.get(), std::move(configuration));
+  PumpOneFrame(shell.get());
+
+  latch.Wait();
+
+  EXPECT_EQ(leaked_resolver->mapping_requests[0], "DoesNotExist");
+
+  PlatformViewNotifyDestroyed(shell.get());
+  DestroyShell(std::move(shell), task_runners);
+}
+
 TEST_F(ShellTest, PictureToImageSync) {
 #if !SHELL_ENABLE_GL
   // This test uses the GL backend.
   GTEST_SKIP();
-#endif  // !SHELL_ENABLE_GL
+#else
   auto settings = CreateSettingsForFixture();
-  std::unique_ptr<Shell> shell =
-      CreateShell(settings,                                       //
-                  GetTaskRunnersForFixture(),                     //
-                  false,                                          //
-                  nullptr,                                        //
-                  false,                                          //
-                  ShellTestPlatformView::BackendType::kGLBackend  //
-      );
+  std::unique_ptr<Shell> shell = CreateShell({
+      .settings = settings,
+      .platform_view_create_callback = ShellTestPlatformViewBuilder({
+          .rendering_backend = ShellTestPlatformView::BackendType::kGLBackend,
+      }),
+  });
+
+  AddNativeCallback("NativeOnBeforeToImageSync",
+                    CREATE_NATIVE_ENTRY([&](auto args) {
+                      // nop
+                    }));
 
   fml::CountDownLatch latch(2);
   AddNativeCallback("NotifyNative", CREATE_NATIVE_ENTRY([&](auto args) {
@@ -3859,12 +4099,110 @@ TEST_F(ShellTest, PictureToImageSync) {
 
   PlatformViewNotifyDestroyed(shell.get());
   DestroyShell(std::move(shell));
+#endif  // !SHELL_ENABLE_GL
+}
+
+TEST_F(ShellTest, PictureToImageSyncImpellerNoSurface) {
+#if !SHELL_ENABLE_METAL
+  // This test uses the Metal backend.
+  GTEST_SKIP();
+#else
+  auto settings = CreateSettingsForFixture();
+  settings.enable_impeller = true;
+  std::unique_ptr<Shell> shell = CreateShell({
+      .settings = settings,
+      .platform_view_create_callback = ShellTestPlatformViewBuilder({
+          .rendering_backend =
+              ShellTestPlatformView::BackendType::kMetalBackend,
+      }),
+  });
+
+  AddNativeCallback("NativeOnBeforeToImageSync",
+                    CREATE_NATIVE_ENTRY([&](auto args) {
+                      // nop
+                    }));
+
+  fml::CountDownLatch latch(2);
+  AddNativeCallback("NotifyNative", CREATE_NATIVE_ENTRY([&](auto args) {
+                      // Teardown and set up rasterizer again.
+                      PlatformViewNotifyDestroyed(shell.get());
+                      PlatformViewNotifyCreated(shell.get());
+                      latch.CountDown();
+                    }));
+
+  ASSERT_NE(shell, nullptr);
+  ASSERT_TRUE(shell->IsSetup());
+  auto configuration = RunConfiguration::InferFromSettings(settings);
+
+  // Important: Do not create the platform view yet!
+  // This test is making sure that the rasterizer can create the texture
+  // as expected without a surface.
+
+  configuration.SetEntrypoint("toImageSync");
+  RunEngine(shell.get(), std::move(configuration));
+  PumpOneFrame(shell.get());
+
+  latch.Wait();
+
+  PlatformViewNotifyDestroyed(shell.get());
+  DestroyShell(std::move(shell));
+#endif  // !SHELL_ENABLE_METAL
 }
 
+#if SHELL_ENABLE_GL
+// This test uses the GL backend and refers to symbols in egl.h
+TEST_F(ShellTest, PictureToImageSyncWithTrampledContext) {
+  // make it easier to trample the GL context by running on a single task
+  // runner.
+  ThreadHost thread_host("io.flutter.test." + GetCurrentTestName() + ".",
+                         ThreadHost::Type::kPlatform);
+  auto task_runner = thread_host.platform_thread->GetTaskRunner();
+  TaskRunners task_runners("test", task_runner, task_runner, task_runner,
+                           task_runner);
+
+  auto settings = CreateSettingsForFixture();
+  std::unique_ptr<Shell> shell = CreateShell({
+      .settings = settings,
+      .task_runners = task_runners,
+      .platform_view_create_callback = ShellTestPlatformViewBuilder({
+          .rendering_backend = ShellTestPlatformView::BackendType::kGLBackend,
+      }),
+  });
+
+  AddNativeCallback(
+      "NativeOnBeforeToImageSync", CREATE_NATIVE_ENTRY([&](auto args) {
+        // Trample the GL context. If the rasterizer fails
+        // to make the right one current again, test will
+        // fail.
+        ::eglMakeCurrent(::eglGetCurrentDisplay(), NULL, NULL, NULL);
+      }));
+
+  fml::CountDownLatch latch(2);
+  AddNativeCallback("NotifyNative", CREATE_NATIVE_ENTRY([&](auto args) {
+                      // Teardown and set up rasterizer again.
+                      PlatformViewNotifyDestroyed(shell.get());
+                      PlatformViewNotifyCreated(shell.get());
+                      latch.CountDown();
+                    }));
+
+  ASSERT_NE(shell, nullptr);
+  ASSERT_TRUE(shell->IsSetup());
+  auto configuration = RunConfiguration::InferFromSettings(settings);
+  PlatformViewNotifyCreated(shell.get());
+  configuration.SetEntrypoint("toImageSync");
+  RunEngine(shell.get(), std::move(configuration));
+  PumpOneFrame(shell.get());
+
+  latch.Wait();
+
+  PlatformViewNotifyDestroyed(shell.get());
+  DestroyShell(std::move(shell), task_runners);
+}
+#endif  // SHELL_ENABLE_GL
+
 TEST_F(ShellTest, PluginUtilitiesCallbackHandleErrorHandling) {
   auto settings = CreateSettingsForFixture();
-  std::unique_ptr<Shell> shell =
-      CreateShell(settings, GetTaskRunnersForFixture());
+  std::unique_ptr<Shell> shell = CreateShell(settings);
 
   fml::AutoResetWaitableEvent latch;
   bool test_passed;
@@ -3895,8 +4233,8 @@ TEST_F(ShellTest, NotifyIdleRejectsPastAndNearFuture) {
   ASSERT_FALSE(DartVMRef::IsInstanceRunning());
   Settings settings = CreateSettingsForFixture();
   ThreadHost thread_host("io.flutter.test." + GetCurrentTestName() + ".",
-                         ThreadHost::Type::Platform | ThreadHost::UI |
-                             ThreadHost::IO | ThreadHost::RASTER);
+                         ThreadHost::Type::kPlatform | ThreadHost::kUi |
+                             ThreadHost::kIo | ThreadHost::kRaster);
   auto platform_task_runner = thread_host.platform_thread->GetTaskRunner();
   TaskRunners task_runners("test", thread_host.platform_thread->GetTaskRunner(),
                            thread_host.raster_thread->GetTaskRunner(),
@@ -3940,8 +4278,8 @@ TEST_F(ShellTest, NotifyIdleNotCalledInLatencyMode) {
   ASSERT_FALSE(DartVMRef::IsInstanceRunning());
   Settings settings = CreateSettingsForFixture();
   ThreadHost thread_host("io.flutter.test." + GetCurrentTestName() + ".",
-                         ThreadHost::Type::Platform | ThreadHost::UI |
-                             ThreadHost::IO | ThreadHost::RASTER);
+                         ThreadHost::Type::kPlatform | ThreadHost::kUi |
+                             ThreadHost::kIo | ThreadHost::kRaster);
   auto platform_task_runner = thread_host.platform_thread->GetTaskRunner();
   TaskRunners task_runners("test", thread_host.platform_thread->GetTaskRunner(),
                            thread_host.raster_thread->GetTaskRunner(),
@@ -3983,8 +4321,8 @@ TEST_F(ShellTest, NotifyDestroyed) {
   ASSERT_FALSE(DartVMRef::IsInstanceRunning());
   Settings settings = CreateSettingsForFixture();
   ThreadHost thread_host("io.flutter.test." + GetCurrentTestName() + ".",
-                         ThreadHost::Type::Platform | ThreadHost::UI |
-                             ThreadHost::IO | ThreadHost::RASTER);
+                         ThreadHost::Type::kPlatform | ThreadHost::kUi |
+                             ThreadHost::kIo | ThreadHost::kRaster);
   auto platform_task_runner = thread_host.platform_thread->GetTaskRunner();
   TaskRunners task_runners("test", thread_host.platform_thread->GetTaskRunner(),
                            thread_host.raster_thread->GetTaskRunner(),
@@ -4013,6 +4351,366 @@ TEST_F(ShellTest, NotifyDestroyed) {
   ASSERT_FALSE(DartVMRef::IsInstanceRunning());
 }
 
+TEST_F(ShellTest, PrintsErrorWhenPlatformMessageSentFromWrongThread) {
+#if FLUTTER_RUNTIME_MODE != FLUTTER_RUNTIME_MODE_DEBUG || OS_FUCHSIA
+  GTEST_SKIP() << "Test is for debug mode only on non-fuchsia targets.";
+#else
+  Settings settings = CreateSettingsForFixture();
+  ThreadHost thread_host("io.flutter.test." + GetCurrentTestName() + ".",
+                         ThreadHost::Type::kPlatform);
+  auto task_runner = thread_host.platform_thread->GetTaskRunner();
+  TaskRunners task_runners("test", task_runner, task_runner, task_runner,
+                           task_runner);
+  auto shell = CreateShell(settings, task_runners);
+
+  {
+    fml::testing::LogCapture log_capture;
+
+    // The next call will result in a thread checker violation.
+    fml::ThreadChecker::DisableNextThreadCheckFailure();
+    SendPlatformMessage(shell.get(), std::make_unique<PlatformMessage>(
+                                         "com.test.plugin", nullptr));
+
+    EXPECT_THAT(
+        log_capture.str(),
+        ::testing::EndsWith(
+            "The 'com.test.plugin' channel sent a message from native to "
+            "Flutter on a non-platform thread. Platform channel messages "
+            "must be sent on the platform thread. Failure to do so may "
+            "result in data loss or crashes, and must be fixed in the "
+            "plugin or application code creating that channel.\nSee "
+            "https://docs.flutter.dev/platform-integration/"
+            "platform-channels#channels-and-platform-threading for more "
+            "information.\n"));
+  }
+
+  {
+    fml::testing::LogCapture log_capture;
+
+    // The next call will result in a thread checker violation.
+    fml::ThreadChecker::DisableNextThreadCheckFailure();
+    SendPlatformMessage(shell.get(), std::make_unique<PlatformMessage>(
+                                         "com.test.plugin", nullptr));
+
+    EXPECT_EQ(log_capture.str(), "");
+  }
+
+  DestroyShell(std::move(shell), task_runners);
+  ASSERT_FALSE(DartVMRef::IsInstanceRunning());
+#endif
+}
+
+TEST_F(ShellTest, DiesIfSoftwareRenderingAndImpellerAreEnabledDeathTest) {
+#if defined(OS_FUCHSIA)
+  GTEST_SKIP() << "Fuchsia";
+#else
+  ::testing::FLAGS_gtest_death_test_style = "threadsafe";
+  Settings settings = CreateSettingsForFixture();
+  settings.enable_impeller = true;
+  settings.enable_software_rendering = true;
+  ThreadHost thread_host("io.flutter.test." + GetCurrentTestName() + ".",
+                         ThreadHost::Type::kPlatform);
+  auto task_runner = thread_host.platform_thread->GetTaskRunner();
+  TaskRunners task_runners("test", task_runner, task_runner, task_runner,
+                           task_runner);
+  EXPECT_DEATH_IF_SUPPORTED(
+      CreateShell(settings, task_runners),
+      "Software rendering is incompatible with Impeller.");
+#endif  // OS_FUCHSIA
+}
+
+// Parse the arguments of NativeReportViewIdsCallback and
+// store them in hasImplicitView and viewIds.
+static void ParseViewIdsCallback(const Dart_NativeArguments& args,
+                                 bool* hasImplicitView,
+                                 std::vector<int64_t>* viewIds) {
+  Dart_Handle exception = nullptr;
+  viewIds->clear();
+  *hasImplicitView =
+      tonic::DartConverter<bool>::FromArguments(args, 0, exception);
+  ASSERT_EQ(exception, nullptr);
+  *viewIds = tonic::DartConverter<std::vector<int64_t>>::FromArguments(
+      args, 1, exception);
+  ASSERT_EQ(exception, nullptr);
+}
+
+TEST_F(ShellTest, ShellStartsWithImplicitView) {
+  ASSERT_FALSE(DartVMRef::IsInstanceRunning());
+  Settings settings = CreateSettingsForFixture();
+  auto task_runner = CreateNewThread();
+  TaskRunners task_runners("test", task_runner, task_runner, task_runner,
+                           task_runner);
+  std::unique_ptr<Shell> shell = CreateShell(settings, task_runners);
+  ASSERT_TRUE(shell);
+
+  bool hasImplicitView;
+  std::vector<int64_t> viewIds;
+  fml::AutoResetWaitableEvent reportLatch;
+  auto nativeViewIdsCallback = [&reportLatch, &hasImplicitView,
+                                &viewIds](Dart_NativeArguments args) {
+    ParseViewIdsCallback(args, &hasImplicitView, &viewIds);
+    reportLatch.Signal();
+  };
+  AddNativeCallback("NativeReportViewIdsCallback",
+                    CREATE_NATIVE_ENTRY(nativeViewIdsCallback));
+
+  PlatformViewNotifyCreated(shell.get());
+  auto configuration = RunConfiguration::InferFromSettings(settings);
+  configuration.SetEntrypoint("testReportViewIds");
+  RunEngine(shell.get(), std::move(configuration));
+  reportLatch.Wait();
+
+  ASSERT_TRUE(hasImplicitView);
+  ASSERT_EQ(viewIds.size(), 1u);
+  ASSERT_EQ(viewIds[0], 0ll);
+
+  PlatformViewNotifyDestroyed(shell.get());
+  DestroyShell(std::move(shell), task_runners);
+}
+
+// Tests that Shell::AddView and Shell::RemoveView works.
+TEST_F(ShellTest, ShellCanAddViewOrRemoveView) {
+  ASSERT_FALSE(DartVMRef::IsInstanceRunning());
+  Settings settings = CreateSettingsForFixture();
+  ThreadHost thread_host(ThreadHost::ThreadHostConfig(
+      "io.flutter.test." + GetCurrentTestName() + ".",
+      ThreadHost::Type::kPlatform | ThreadHost::Type::kRaster |
+          ThreadHost::Type::kIo | ThreadHost::Type::kUi));
+  TaskRunners task_runners("test", thread_host.platform_thread->GetTaskRunner(),
+                           thread_host.raster_thread->GetTaskRunner(),
+                           thread_host.ui_thread->GetTaskRunner(),
+                           thread_host.io_thread->GetTaskRunner());
+  std::unique_ptr<Shell> shell = CreateShell(settings, task_runners);
+  ASSERT_TRUE(shell);
+
+  bool hasImplicitView;
+  std::vector<int64_t> viewIds;
+  fml::AutoResetWaitableEvent reportLatch;
+  auto nativeViewIdsCallback = [&reportLatch, &hasImplicitView,
+                                &viewIds](Dart_NativeArguments args) {
+    ParseViewIdsCallback(args, &hasImplicitView, &viewIds);
+    reportLatch.Signal();
+  };
+  AddNativeCallback("NativeReportViewIdsCallback",
+                    CREATE_NATIVE_ENTRY(nativeViewIdsCallback));
+
+  PlatformViewNotifyCreated(shell.get());
+  auto configuration = RunConfiguration::InferFromSettings(settings);
+  configuration.SetEntrypoint("testReportViewIds");
+  RunEngine(shell.get(), std::move(configuration));
+
+  reportLatch.Wait();
+  ASSERT_TRUE(hasImplicitView);
+  ASSERT_EQ(viewIds.size(), 1u);
+  ASSERT_EQ(viewIds[0], 0ll);
+
+  PostSync(shell->GetTaskRunners().GetPlatformTaskRunner(),
+           [&shell] { shell->AddView(2, ViewportMetrics{}); });
+  reportLatch.Wait();
+  ASSERT_TRUE(hasImplicitView);
+  ASSERT_EQ(viewIds.size(), 2u);
+  ASSERT_EQ(viewIds[1], 2ll);
+
+  PostSync(shell->GetTaskRunners().GetPlatformTaskRunner(), [&shell] {
+    shell->RemoveView(2, [](bool removed) { ASSERT_TRUE(removed); });
+  });
+  reportLatch.Wait();
+  ASSERT_TRUE(hasImplicitView);
+  ASSERT_EQ(viewIds.size(), 1u);
+  ASSERT_EQ(viewIds[0], 0ll);
+
+  PostSync(shell->GetTaskRunners().GetPlatformTaskRunner(),
+           [&shell] { shell->AddView(4, ViewportMetrics{}); });
+  reportLatch.Wait();
+  ASSERT_TRUE(hasImplicitView);
+  ASSERT_EQ(viewIds.size(), 2u);
+  ASSERT_EQ(viewIds[1], 4ll);
+
+  PlatformViewNotifyDestroyed(shell.get());
+  DestroyShell(std::move(shell), task_runners);
+}
+
+// Parse the arguments of NativeReportViewWidthsCallback and
+// store them in viewWidths.
+static void ParseViewWidthsCallback(const Dart_NativeArguments& args,
+                                    std::map<int64_t, int64_t>* viewWidths) {
+  Dart_Handle exception = nullptr;
+  viewWidths->clear();
+  std::vector<int64_t> viewWidthPacket =
+      tonic::DartConverter<std::vector<int64_t>>::FromArguments(args, 0,
+                                                                exception);
+  ASSERT_EQ(exception, nullptr);
+  ASSERT_EQ(viewWidthPacket.size() % 2, 0ul);
+  for (size_t packetIndex = 0; packetIndex < viewWidthPacket.size();
+       packetIndex += 2) {
+    (*viewWidths)[viewWidthPacket[packetIndex]] =
+        viewWidthPacket[packetIndex + 1];
+  }
+}
+
+// Ensure that PlatformView::SetViewportMetrics and Shell::AddView that were
+// dispatched before the isolate is run have been flushed to the Dart VM when
+// the main function starts.
+TEST_F(ShellTest, ShellFlushesPlatformStatesByMain) {
+  ASSERT_FALSE(DartVMRef::IsInstanceRunning());
+  Settings settings = CreateSettingsForFixture();
+  ThreadHost thread_host(ThreadHost::ThreadHostConfig(
+      "io.flutter.test." + GetCurrentTestName() + ".",
+      ThreadHost::Type::kPlatform | ThreadHost::Type::kRaster |
+          ThreadHost::Type::kIo | ThreadHost::Type::kUi));
+  TaskRunners task_runners("test", thread_host.platform_thread->GetTaskRunner(),
+                           thread_host.raster_thread->GetTaskRunner(),
+                           thread_host.ui_thread->GetTaskRunner(),
+                           thread_host.io_thread->GetTaskRunner());
+  std::unique_ptr<Shell> shell = CreateShell(settings, task_runners);
+  ASSERT_TRUE(shell);
+
+  PostSync(shell->GetTaskRunners().GetPlatformTaskRunner(), [&shell] {
+    auto platform_view = shell->GetPlatformView();
+    // The construtor for ViewportMetrics{_, width, _, _, _} (only the 2nd
+    // argument matters in this test).
+    platform_view->SetViewportMetrics(0, ViewportMetrics{1, 10, 1, 0, 0});
+    shell->AddView(1, ViewportMetrics{1, 30, 1, 0, 0});
+    platform_view->SetViewportMetrics(0, ViewportMetrics{1, 20, 1, 0, 0});
+  });
+
+  bool first_report = true;
+  std::map<int64_t, int64_t> viewWidths;
+  fml::AutoResetWaitableEvent reportLatch;
+  auto nativeViewWidthsCallback = [&reportLatch, &viewWidths,
+                                   &first_report](Dart_NativeArguments args) {
+    EXPECT_TRUE(first_report);
+    first_report = false;
+    ParseViewWidthsCallback(args, &viewWidths);
+    reportLatch.Signal();
+  };
+  AddNativeCallback("NativeReportViewWidthsCallback",
+                    CREATE_NATIVE_ENTRY(nativeViewWidthsCallback));
+
+  PlatformViewNotifyCreated(shell.get());
+  auto configuration = RunConfiguration::InferFromSettings(settings);
+  configuration.SetEntrypoint("testReportViewWidths");
+  RunEngine(shell.get(), std::move(configuration));
+
+  reportLatch.Wait();
+  EXPECT_EQ(viewWidths.size(), 2u);
+  EXPECT_EQ(viewWidths[0], 20ll);
+  EXPECT_EQ(viewWidths[1], 30ll);
+
+  PlatformViewNotifyDestroyed(shell.get());
+  DestroyShell(std::move(shell), task_runners);
+}
+
+TEST_F(ShellTest, RuntimeStageBackendDefaultsToSkSLWithoutImpeller) {
+  ASSERT_FALSE(DartVMRef::IsInstanceRunning());
+  Settings settings = CreateSettingsForFixture();
+  settings.enable_impeller = false;
+  ThreadHost thread_host(ThreadHost::ThreadHostConfig(
+      "io.flutter.test." + GetCurrentTestName() + ".",
+      ThreadHost::Type::kPlatform | ThreadHost::Type::kRaster |
+          ThreadHost::Type::kIo | ThreadHost::Type::kUi));
+  TaskRunners task_runners("test", thread_host.platform_thread->GetTaskRunner(),
+                           thread_host.raster_thread->GetTaskRunner(),
+                           thread_host.ui_thread->GetTaskRunner(),
+                           thread_host.io_thread->GetTaskRunner());
+  std::unique_ptr<Shell> shell = CreateShell(settings, task_runners);
+  ASSERT_TRUE(shell);
+
+  fml::AutoResetWaitableEvent latch;
+  AddNativeCallback("NotifyNative", CREATE_NATIVE_ENTRY([&latch](auto args) {
+                      auto backend =
+                          UIDartState::Current()->GetRuntimeStageBackend();
+                      EXPECT_EQ(backend, impeller::RuntimeStageBackend::kSkSL);
+                      latch.Signal();
+                    }));
+
+  auto configuration = RunConfiguration::InferFromSettings(settings);
+  configuration.SetEntrypoint("mainNotifyNative");
+  RunEngine(shell.get(), std::move(configuration));
+
+  latch.Wait();
+
+  DestroyShell(std::move(shell), task_runners);
+}
+
+#if IMPELLER_SUPPORTS_RENDERING
+TEST_F(ShellTest, RuntimeStageBackendWithImpeller) {
+  ASSERT_FALSE(DartVMRef::IsInstanceRunning());
+  Settings settings = CreateSettingsForFixture();
+  settings.enable_impeller = true;
+  ThreadHost thread_host(ThreadHost::ThreadHostConfig(
+      "io.flutter.test." + GetCurrentTestName() + ".",
+      ThreadHost::Type::kPlatform | ThreadHost::Type::kRaster |
+          ThreadHost::Type::kIo | ThreadHost::Type::kUi));
+  TaskRunners task_runners("test", thread_host.platform_thread->GetTaskRunner(),
+                           thread_host.raster_thread->GetTaskRunner(),
+                           thread_host.ui_thread->GetTaskRunner(),
+                           thread_host.io_thread->GetTaskRunner());
+  std::unique_ptr<Shell> shell = CreateShell(settings, task_runners);
+  ASSERT_TRUE(shell);
+
+  fml::AutoResetWaitableEvent latch;
+
+  impeller::Context::BackendType impeller_backend;
+  fml::TaskRunner::RunNowOrPostTask(
+      shell->GetTaskRunners().GetPlatformTaskRunner(),
+      [platform_view = shell->GetPlatformView(), &latch, &impeller_backend]() {
+        auto impeller_context = platform_view->GetImpellerContext();
+        EXPECT_TRUE(impeller_context);
+        impeller_backend = impeller_context->GetBackendType();
+        latch.Signal();
+      });
+  latch.Wait();
+
+  AddNativeCallback(
+      "NotifyNative", CREATE_NATIVE_ENTRY([&](auto args) {
+        auto backend = UIDartState::Current()->GetRuntimeStageBackend();
+        switch (impeller_backend) {
+          case impeller::Context::BackendType::kMetal:
+            EXPECT_EQ(backend, impeller::RuntimeStageBackend::kMetal);
+            break;
+          case impeller::Context::BackendType::kOpenGLES:
+            EXPECT_EQ(backend, impeller::RuntimeStageBackend::kOpenGLES);
+            break;
+          case impeller::Context::BackendType::kVulkan:
+            EXPECT_EQ(backend, impeller::RuntimeStageBackend::kVulkan);
+            break;
+        }
+        latch.Signal();
+      }));
+
+  auto configuration = RunConfiguration::InferFromSettings(settings);
+  configuration.SetEntrypoint("mainNotifyNative");
+  RunEngine(shell.get(), std::move(configuration));
+
+  latch.Wait();
+
+  DestroyShell(std::move(shell), task_runners);
+}
+#endif  // IMPELLER_SUPPORTS_RENDERING
+
+TEST_F(ShellTest, WillLogWarningWhenImpellerIsOptedOut) {
+#if !IMPELLER_SUPPORTS_RENDERING
+  GTEST_SKIP() << "This platform doesn't support Impeller.";
+#endif
+  ASSERT_FALSE(DartVMRef::IsInstanceRunning());
+  Settings settings = CreateSettingsForFixture();
+  settings.enable_impeller = false;
+  settings.warn_on_impeller_opt_out = true;
+  // Log captures are thread specific. Just put the shell in single threaded
+  // configuration.
+  const auto& runner = fml::MessageLoop::GetCurrent().GetTaskRunner();
+  TaskRunners task_runners("test", runner, runner, runner, runner);
+  std::ostringstream stream;
+  fml::LogMessage::CaptureNextLog(&stream);
+  std::unique_ptr<Shell> shell = CreateShell(settings, task_runners);
+  ASSERT_TRUE(stream.str().find(
+                  "[Action Required] The application opted out of Impeller") !=
+              std::string::npos);
+  ASSERT_TRUE(shell);
+  DestroyShell(std::move(shell), task_runners);
+}
+
 }  // namespace testing
 }  // namespace flutter
 
diff --git a/shell/common/skia_event_tracer_impl.cc b/shell/common/skia_event_tracer_impl.cc
index 83a620dc9c5b0b6f41d76b15a633a24764e5f957..e7c15f4c7e766bee36257808f22e4bb756de946e 100644
--- a/shell/common/skia_event_tracer_impl.cc
+++ b/shell/common/skia_event_tracer_impl.cc
@@ -220,10 +220,12 @@ class FlutterEventTracer : public SkEventTracer {
       case TRACE_EVENT_PHASE_BEGIN:
       case TRACE_EVENT_PHASE_COMPLETE:
         if (devtoolsTag) {
-          fml::tracing::TraceEvent1(kSkiaTag, name, kDevtoolsTagArg,
+          fml::tracing::TraceEvent1(kSkiaTag, name, /*flow_id_count=*/0,
+                                    /*flow_ids=*/nullptr, kDevtoolsTagArg,
                                     devtoolsTag);
         } else {
-          fml::tracing::TraceEvent0(kSkiaTag, name);
+          fml::tracing::TraceEvent0(kSkiaTag, name, /*flow_id_count=*/0,
+                                    /*flow_ids=*/nullptr);
         }
         break;
       case TRACE_EVENT_PHASE_END:
@@ -231,18 +233,26 @@ class FlutterEventTracer : public SkEventTracer {
         break;
       case TRACE_EVENT_PHASE_INSTANT:
         if (devtoolsTag) {
-          fml::tracing::TraceEventInstant1(kSkiaTag, name, kDevtoolsTagArg,
-                                           devtoolsTag);
+          fml::tracing::TraceEventInstant1(kSkiaTag, name,
+                                           /*flow_id_count=*/0,
+                                           /*flow_ids=*/nullptr,
+                                           kDevtoolsTagArg, devtoolsTag);
         } else {
-          fml::tracing::TraceEventInstant0(kSkiaTag, name);
+          fml::tracing::TraceEventInstant0(kSkiaTag, name,
+                                           /*flow_id_count=*/0,
+                                           /*flow_ids=*/nullptr);
         }
         break;
       case TRACE_EVENT_PHASE_ASYNC_BEGIN:
         if (devtoolsTag) {
           fml::tracing::TraceEventAsyncBegin1(kSkiaTag, name, id,
+                                              /*flow_id_count=*/0,
+                                              /*flow_ids=*/nullptr,
                                               kDevtoolsTagArg, devtoolsTag);
         } else {
-          fml::tracing::TraceEventAsyncBegin0(kSkiaTag, name, id);
+          fml::tracing::TraceEventAsyncBegin0(kSkiaTag, name, id,
+                                              /*flow_id_count=*/0,
+                                              /*flow_ids=*/nullptr);
         }
         break;
       case TRACE_EVENT_PHASE_ASYNC_END:
diff --git a/shell/common/snapshot_controller.h b/shell/common/snapshot_controller.h
index d46fd75a21bcbc6ceb6f4c5135aeafe330613ba5..c402c3ec709fa8d28bc0e79ada19ac4f32fb582f 100644
--- a/shell/common/snapshot_controller.h
+++ b/shell/common/snapshot_controller.h
@@ -6,12 +6,16 @@
 #define FLUTTER_SHELL_COMMON_SNAPSHOT_CONTROLLER_H_
 
 #include "flutter/common/settings.h"
-#include "flutter/display_list/display_list_image.h"
+#include "flutter/display_list/image/dl_image.h"
 #include "flutter/flow/surface.h"
 #include "flutter/fml/synchronization/sync_switch.h"
 #include "flutter/lib/ui/snapshot_delegate.h"
 #include "flutter/shell/common/snapshot_surface_producer.h"
 
+namespace impeller {
+class AiksContext;
+}
+
 namespace flutter {
 
 class SnapshotController {
@@ -20,6 +24,7 @@ class SnapshotController {
    public:
     virtual ~Delegate() = default;
     virtual const std::unique_ptr<Surface>& GetSurface() const = 0;
+    virtual std::shared_ptr<impeller::AiksContext> GetAiksContext() const = 0;
     virtual const std::unique_ptr<SnapshotSurfaceProducer>&
     GetSnapshotSurfaceProducer() const = 0;
     virtual std::shared_ptr<const fml::SyncSwitch> GetIsGpuDisabledSyncSwitch()
@@ -31,6 +36,9 @@ class SnapshotController {
 
   virtual ~SnapshotController() = default;
 
+  // Note that this image is not guaranteed to be UIThreadSafe and must
+  // be converted to a DlImageGPU if it is to be handed back to the UI
+  // thread.
   virtual sk_sp<DlImage> MakeRasterSnapshot(sk_sp<DisplayList> display_list,
                                             SkISize size) = 0;
 
diff --git a/shell/common/snapshot_controller_impeller.cc b/shell/common/snapshot_controller_impeller.cc
index b115b06c0f03e1ac34a4f5158e9c131d81f20dcc..c855c1c5f5a8714e973233958c7918fbbebb1181 100644
--- a/shell/common/snapshot_controller_impeller.cc
+++ b/shell/common/snapshot_controller_impeller.cc
@@ -8,8 +8,8 @@
 
 #include "flutter/flow/surface.h"
 #include "flutter/fml/trace_event.h"
-#include "flutter/impeller/display_list/display_list_dispatcher.h"
-#include "flutter/impeller/display_list/display_list_image_impeller.h"
+#include "flutter/impeller/display_list/dl_dispatcher.h"
+#include "flutter/impeller/display_list/dl_image_impeller.h"
 #include "flutter/impeller/geometry/size.h"
 #include "flutter/shell/common/snapshot_controller.h"
 
@@ -33,14 +33,12 @@ sk_sp<DlImage> SnapshotControllerImpeller::MakeRasterSnapshot(
 sk_sp<DlImage> SnapshotControllerImpeller::DoMakeRasterSnapshot(
     const sk_sp<DisplayList>& display_list,
     SkISize size) {
-  impeller::DisplayListDispatcher dispatcher;
+  TRACE_EVENT0("flutter", __FUNCTION__);
+  impeller::DlDispatcher dispatcher;
   display_list->Dispatch(dispatcher);
   impeller::Picture picture = dispatcher.EndRecordingAsPicture();
-  if (GetDelegate().GetSurface() &&
-      GetDelegate().GetSurface()->GetAiksContext()) {
-    impeller::AiksContext* context =
-        GetDelegate().GetSurface()->GetAiksContext();
-
+  auto context = GetDelegate().GetAiksContext();
+  if (context) {
     auto max_size = context->GetContext()
                         ->GetResourceAllocator()
                         ->GetMaxTextureSizeSupported();
diff --git a/shell/common/snapshot_controller_skia.cc b/shell/common/snapshot_controller_skia.cc
index 62b665cfb1a821b41d57ef15025ee18deefa2f60..fe7897f38d178a086b0c25f9cac61d845f61c021 100644
--- a/shell/common/snapshot_controller_skia.cc
+++ b/shell/common/snapshot_controller_skia.cc
@@ -4,11 +4,13 @@
 
 #include "flutter/shell/common/snapshot_controller_skia.h"
 
-#include "display_list/display_list_image.h"
+#include "display_list/image/dl_image.h"
 #include "flutter/flow/surface.h"
 #include "flutter/fml/trace_event.h"
 #include "flutter/shell/common/snapshot_controller.h"
+#include "third_party/skia/include/core/SkColorSpace.h"
 #include "third_party/skia/include/core/SkSurface.h"
+#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
 
 namespace flutter {
 
@@ -21,11 +23,14 @@ sk_sp<SkImage> DrawSnapshot(
   }
 
   draw_callback(surface->getCanvas());
-  surface->getCanvas()->flush();
+  auto dContext = GrAsDirectContext(surface->recordingContext());
+  if (dContext) {
+    dContext->flushAndSubmit();
+  }
 
   sk_sp<SkImage> device_snapshot;
   {
-    TRACE_EVENT0("flutter", "MakeDeviceSnpashot");
+    TRACE_EVENT0("flutter", "MakeDeviceSnapshot");
     device_snapshot = surface->makeImageSnapshot();
   }
 
@@ -68,13 +73,13 @@ sk_sp<DlImage> SnapshotControllerSkia::DoMakeRasterSnapshot(
   if (!snapshot_surface) {
     // Raster surface is fine if there is no on screen surface. This might
     // happen in case of software rendering.
-    sk_sp<SkSurface> sk_surface = SkSurface::MakeRaster(image_info);
+    sk_sp<SkSurface> sk_surface = SkSurfaces::Raster(image_info);
     result = DrawSnapshot(sk_surface, draw_callback);
   } else {
     delegate.GetIsGpuDisabledSyncSwitch()->Execute(
         fml::SyncSwitch::Handlers()
             .SetIfTrue([&] {
-              sk_sp<SkSurface> surface = SkSurface::MakeRaster(image_info);
+              sk_sp<SkSurface> surface = SkSurfaces::Raster(image_info);
               result = DrawSnapshot(surface, draw_callback);
             })
             .SetIfFalse([&] {
@@ -104,9 +109,9 @@ sk_sp<DlImage> SnapshotControllerSkia::DoMakeRasterSnapshot(
               // When there is an on screen surface, we need a render target
               // SkSurface because we want to access texture backed images.
               sk_sp<SkSurface> sk_surface =
-                  SkSurface::MakeRenderTarget(context,          // context
-                                              SkBudgeted::kNo,  // budgeted
-                                              image_info        // image info
+                  SkSurfaces::RenderTarget(context,               // context
+                                           skgpu::Budgeted::kNo,  // budgeted
+                                           image_info             // image info
                   );
               if (!sk_surface) {
                 FML_LOG(ERROR)
@@ -119,6 +124,8 @@ sk_sp<DlImage> SnapshotControllerSkia::DoMakeRasterSnapshot(
             }));
   }
 
+  // It is up to the caller to create a DlImageGPU version of this image
+  // if the result will interact with the UI thread.
   return DlImage::Make(result);
 }
 
@@ -126,7 +133,7 @@ sk_sp<DlImage> SnapshotControllerSkia::MakeRasterSnapshot(
     sk_sp<DisplayList> display_list,
     SkISize size) {
   return DoMakeRasterSnapshot(size, [display_list](SkCanvas* canvas) {
-    display_list->RenderTo(canvas);
+    DlSkCanvasAdapter(canvas).DrawDisplayList(display_list);
   });
 }
 
diff --git a/shell/common/snapshot_surface_producer.h b/shell/common/snapshot_surface_producer.h
index ae505109beda8e1342c75044925ae0ec203b20ea..9c61ff1e293fca8474cf1ff4c52c75a0b8320e6e 100644
--- a/shell/common/snapshot_surface_producer.h
+++ b/shell/common/snapshot_surface_producer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_COMMON_SNAPSHOT_SURFACE_PRODUCER_H_
-#define SHELL_COMMON_SNAPSHOT_SURFACE_PRODUCER_H_
+#ifndef FLUTTER_SHELL_COMMON_SNAPSHOT_SURFACE_PRODUCER_H_
+#define FLUTTER_SHELL_COMMON_SNAPSHOT_SURFACE_PRODUCER_H_
 
 #include <memory>
 
@@ -19,4 +19,4 @@ class SnapshotSurfaceProducer {
 };
 
 }  // namespace flutter
-#endif  // SHELL_COMMON_SNAPSHOT_SURFACE_PRODUCER_H_
+#endif  // FLUTTER_SHELL_COMMON_SNAPSHOT_SURFACE_PRODUCER_H_
diff --git a/shell/common/switches.cc b/shell/common/switches.cc
index 0cb341d0d6577ba05ee0141752b83d0fa688d9af..fd3d9508fb8c98364027b42dd927f932bf596d67 100644
--- a/shell/common/switches.cc
+++ b/shell/common/switches.cc
@@ -17,7 +17,7 @@
 // Include once for the default enum definition.
 #include "flutter/shell/common/switches.h"
 
-#undef SHELL_COMMON_SWITCHES_H_
+#undef FLUTTER_SHELL_COMMON_SWITCHES_H_
 
 struct SwitchDesc {
   flutter::Switch sw;
@@ -76,14 +76,13 @@ static const std::string kAllowedDartFlags[] = {
 // Define symbols for the ICU data that is linked into the Flutter library on
 // Android.  This is a workaround for crashes seen when doing dynamic lookups
 // of the engine's own symbols on some older versions of Android.
-#if FML_OS_ANDROID 
+#if FML_OS_ANDROID
 extern uint8_t _binary_icudtl_dat_start[];
-extern uint8_t _binary_icudtl_dat_end[];
+extern size_t _binary_icudtl_dat_size;
 
 static std::unique_ptr<fml::Mapping> GetICUStaticMapping() {
-  return std::make_unique<fml::NonOwnedMapping>(
-      _binary_icudtl_dat_start,
-      _binary_icudtl_dat_end - _binary_icudtl_dat_start);
+  return std::make_unique<fml::NonOwnedMapping>(_binary_icudtl_dat_start,
+                                                _binary_icudtl_dat_size);
 }
 #endif
 
@@ -235,33 +234,55 @@ Settings SettingsFromCommandLine(const fml::CommandLine& command_line) {
     settings.executable_name = command_line.argv0();
   }
 
-  // Enable Observatory
-  settings.enable_observatory =
+  // Enable the VM Service
+  settings.enable_vm_service =
+      !command_line.HasOption(FlagForSwitch(Switch::DisableVMService)) &&
+      // TODO(bkonyi): remove once flutter_tools no longer uses this option.
+      // See https://github.com/dart-lang/sdk/issues/50233
       !command_line.HasOption(FlagForSwitch(Switch::DisableObservatory));
 
-  // Enable mDNS Observatory Publication
-  settings.enable_observatory_publication = !command_line.HasOption(
-      FlagForSwitch(Switch::DisableObservatoryPublication));
-
-  // Set Observatory Host
-  if (command_line.HasOption(FlagForSwitch(Switch::DeviceObservatoryHost))) {
+  // Enable mDNS VM Service Publication
+  settings.enable_vm_service_publication =
+      !command_line.HasOption(
+          FlagForSwitch(Switch::DisableVMServicePublication)) &&
+      !command_line.HasOption(
+          FlagForSwitch(Switch::DisableObservatoryPublication));
+
+  // Set VM Service Host
+  if (command_line.HasOption(FlagForSwitch(Switch::DeviceVMServiceHost))) {
+    command_line.GetOptionValue(FlagForSwitch(Switch::DeviceVMServiceHost),
+                                &settings.vm_service_host);
+  } else if (command_line.HasOption(
+                 FlagForSwitch(Switch::DeviceObservatoryHost))) {
+    // TODO(bkonyi): remove once flutter_tools no longer uses this option.
+    // See https://github.com/dart-lang/sdk/issues/50233
     command_line.GetOptionValue(FlagForSwitch(Switch::DeviceObservatoryHost),
-                                &settings.observatory_host);
+                                &settings.vm_service_host);
   }
-  // Default the observatory port based on --ipv6 if not set.
-  if (settings.observatory_host.empty()) {
-    settings.observatory_host =
+  // Default the VM Service port based on --ipv6 if not set.
+  if (settings.vm_service_host.empty()) {
+    settings.vm_service_host =
         command_line.HasOption(FlagForSwitch(Switch::IPv6)) ? "::1"
                                                             : "127.0.0.1";
   }
 
-  // Set Observatory Port
-  if (command_line.HasOption(FlagForSwitch(Switch::DeviceObservatoryPort))) {
+  // Set VM Service Port
+  if (command_line.HasOption(FlagForSwitch(Switch::DeviceVMServicePort))) {
+    if (!GetSwitchValue(command_line, Switch::DeviceVMServicePort,
+                        &settings.vm_service_port)) {
+      FML_LOG(INFO)
+          << "VM Service port specified was malformed. Will default to "
+          << settings.vm_service_port;
+    }
+  } else if (command_line.HasOption(
+                 FlagForSwitch(Switch::DeviceObservatoryPort))) {
+    // TODO(bkonyi): remove once flutter_tools no longer uses this option.
+    // See https://github.com/dart-lang/sdk/issues/50233
     if (!GetSwitchValue(command_line, Switch::DeviceObservatoryPort,
-                        &settings.observatory_port)) {
+                        &settings.vm_service_port)) {
       FML_LOG(INFO)
-          << "Observatory port specified was malformed. Will default to "
-          << settings.observatory_port;
+          << "VM Service port specified was malformed. Will default to "
+          << settings.vm_service_port;
     }
   }
 
@@ -332,6 +353,9 @@ Settings SettingsFromCommandLine(const fml::CommandLine& command_line) {
   settings.trace_systrace =
       command_line.HasOption(FlagForSwitch(Switch::TraceSystrace));
 
+  command_line.GetOptionValue(FlagForSwitch(Switch::TraceToFile),
+                              &settings.trace_to_file);
+
   settings.skia_deterministic_rendering_on_cpu =
       command_line.HasOption(FlagForSwitch(Switch::SkiaDeterministicRendering));
 
@@ -406,7 +430,7 @@ Settings SettingsFromCommandLine(const fml::CommandLine& command_line) {
       command_line.GetOptionValue(FlagForSwitch(Switch::ICUNativeLibPath),
                                   &native_lib_path);
 
-#if FML_OS_ANDROID 
+#if FML_OS_ANDROID
       settings.icu_mapper = GetICUStaticMapping;
 #else
       settings.icu_mapper = [icu_symbol_prefix, native_lib_path] {
@@ -421,12 +445,34 @@ Settings SettingsFromCommandLine(const fml::CommandLine& command_line) {
   settings.use_asset_fonts =
       !command_line.HasOption(FlagForSwitch(Switch::DisableAssetFonts));
 
-  std::string enable_skparagraph = command_line.GetOptionValueWithDefault(
-      FlagForSwitch(Switch::EnableSkParagraph), "");
-  settings.enable_skparagraph = enable_skparagraph != "false";
+  {
+    std::string enable_impeller_value;
+    if (command_line.GetOptionValue(FlagForSwitch(Switch::EnableImpeller),
+                                    &enable_impeller_value)) {
+      settings.enable_impeller =
+          enable_impeller_value.empty() || "true" == enable_impeller_value;
+    }
+  }
+
+  {
+    std::string impeller_backend_value;
+    if (command_line.GetOptionValue(FlagForSwitch(Switch::ImpellerBackend),
+                                    &impeller_backend_value)) {
+      if (!impeller_backend_value.empty()) {
+        settings.requested_rendering_backend = impeller_backend_value;
+      }
+    }
+  }
+
+  settings.enable_vulkan_validation =
+      command_line.HasOption(FlagForSwitch(Switch::EnableVulkanValidation));
+  settings.enable_opengl_gpu_tracing =
+      command_line.HasOption(FlagForSwitch(Switch::EnableOpenGLGPUTracing));
+  settings.enable_vulkan_gpu_tracing =
+      command_line.HasOption(FlagForSwitch(Switch::EnableVulkanGPUTracing));
 
-  settings.enable_impeller =
-      command_line.HasOption(FlagForSwitch(Switch::EnableImpeller));
+  settings.enable_embedder_api =
+      command_line.HasOption(FlagForSwitch(Switch::EnableEmbedderAPI));
 
   settings.prefetched_default_font_manager = command_line.HasOption(
       FlagForSwitch(Switch::PrefetchedDefaultFontManager));
@@ -436,7 +482,7 @@ Settings SettingsFromCommandLine(const fml::CommandLine& command_line) {
                                   &all_dart_flags)) {
     // Assume that individual flags are comma separated.
     std::vector<std::string> flags = ParseCommaDelimited(all_dart_flags);
-    for (auto flag : flags) {
+    for (const auto& flag : flags) {
       if (!IsAllowedDartVMFlag(flag)) {
         FML_LOG(FATAL) << "Encountered disallowed Dart VM flag: " << flag;
       }
@@ -495,6 +541,7 @@ Settings SettingsFromCommandLine(const fml::CommandLine& command_line) {
                       << "' (expected 0, 1, 2, 4, 8, or 16).";
     }
   }
+
   return settings;
 }
 
diff --git a/shell/common/switches.h b/shell/common/switches.h
index a6512908cebe4c537fa5ff7a56e8a7464432f200..70e54a68061b1ddb33f13c4d77597d73c6f693f6 100644
--- a/shell/common/switches.h
+++ b/shell/common/switches.h
@@ -7,8 +7,8 @@
 #include "flutter/common/settings.h"
 #include "flutter/fml/command_line.h"
 
-#ifndef SHELL_COMMON_SWITCHES_H_
-#define SHELL_COMMON_SWITCHES_H_
+#ifndef FLUTTER_SHELL_COMMON_SWITCHES_H_
+#define FLUTTER_SHELL_COMMON_SWITCHES_H_
 
 namespace flutter {
 
@@ -70,30 +70,58 @@ DEF_SWITCH(DartFlags,
            "dart-flags",
            "Flags passed directly to the Dart VM without being interpreted "
            "by the Flutter shell.")
-DEF_SWITCH(DeviceObservatoryHost,
-           "observatory-host",
-           "The hostname/IP address on which the Dart Observatory should "
+DEF_SWITCH(DeviceVMServiceHost,
+           "vm-service-host",
+           "The hostname/IP address on which the Dart VM Service should "
            "be served. If not set, defaults to 127.0.0.1 or ::1 depending on "
            "whether --ipv6 is specified.")
+// TODO(bkonyi): remove once flutter_tools no longer uses this option.
+// See https://github.com/dart-lang/sdk/issues/50233
+DEF_SWITCH(
+    DeviceObservatoryHost,
+    "observatory-host",
+    "(deprecated) The hostname/IP address on which the Dart VM Service should "
+    "be served. If not set, defaults to 127.0.0.1 or ::1 depending on "
+    "whether --ipv6 is specified.")
+DEF_SWITCH(DeviceVMServicePort,
+           "vm-service-port",
+           "A custom Dart VM Service port. The default is to pick a randomly "
+           "available open port.")
+// TODO(bkonyi): remove once flutter_tools no longer uses this option.
+// See https://github.com/dart-lang/sdk/issues/50233
 DEF_SWITCH(DeviceObservatoryPort,
            "observatory-port",
-           "A custom Dart Observatory port. The default is to pick a randomly "
+           "(deprecated) A custom Dart VM Service port. The default is to pick "
+           "a randomly "
            "available open port.")
+DEF_SWITCH(
+    DisableVMService,
+    "disable-vm-service",
+    "Disable the Dart VM Service. The Dart VM Service is never available "
+    "in release mode.")
+// TODO(bkonyi): remove once flutter_tools no longer uses this option.
+// See https://github.com/dart-lang/sdk/issues/50233
 DEF_SWITCH(DisableObservatory,
            "disable-observatory",
-           "Disable the Dart Observatory. The observatory is never available "
+           "(deprecated) Disable the Dart VM Service. The Dart VM Service is "
+           "never available "
            "in release mode.")
+DEF_SWITCH(DisableVMServicePublication,
+           "disable-vm-service-publication",
+           "Disable mDNS Dart VM Service publication.")
+// TODO(bkonyi): remove once flutter_tools no longer uses this option.
+// See https://github.com/dart-lang/sdk/issues/50233
 DEF_SWITCH(DisableObservatoryPublication,
            "disable-observatory-publication",
-           "Disable mDNS Dart Observatory publication.")
+           "(deprecated) Disable mDNS Dart VM Service publication.")
 DEF_SWITCH(IPv6,
            "ipv6",
-           "Bind to the IPv6 localhost address for the Dart Observatory. "
-           "Ignored if --observatory-host is set.")
+           "Bind to the IPv6 localhost address for the Dart VM Service. "
+           "Ignored if --vm-service-host is set.")
 DEF_SWITCH(EnableDartProfiling,
            "enable-dart-profiling",
            "Enable Dart profiling. Profiling information can be viewed from "
-           "the observatory.")
+           "Dart / Flutter DevTools.")
 DEF_SWITCH(EndlessTraceBuffer,
            "endless-trace-buffer",
            "Enable an endless trace buffer. The default is a ring buffer. "
@@ -169,6 +197,11 @@ DEF_SWITCH(
     "Trace to the system tracer (instead of the timeline) on platforms where "
     "such a tracer is available. Currently only supported on Android and "
     "Fuchsia.")
+DEF_SWITCH(TraceToFile,
+           "trace-to-file",
+           "Write the timeline trace to a file at the specified path. The file "
+           "will be in Perfetto's proto format; it will be possible to load "
+           "the file into Perfetto's trace viewer.")
 DEF_SWITCH(UseTestFonts,
            "use-test-fonts",
            "Running tests that layout and measure text will not yield "
@@ -229,13 +262,27 @@ DEF_SWITCH(OldGenHeapSize,
 DEF_SWITCH(ResourceCacheMaxBytesThreshold,
            "resource-cache-max-bytes-threshold",
            "The max bytes threshold of resource cache, or 0 for unlimited.")
-DEF_SWITCH(EnableSkParagraph,
-           "enable-skparagraph",
-           "Selects the SkParagraph implementation of the text layout engine.")
 DEF_SWITCH(EnableImpeller,
            "enable-impeller",
            "Enable the Impeller renderer on supported platforms. Ignored if "
            "Impeller is not supported on the platform.")
+DEF_SWITCH(ImpellerBackend,
+           "impeller-backend",
+           "Requests a particular Impeller backend on platforms that support "
+           "multiple backends. (ex `opengles` or `vulkan`)")
+DEF_SWITCH(EnableVulkanValidation,
+           "enable-vulkan-validation",
+           "Enable loading Vulkan validation layers. The layers must be "
+           "available to the application and loadable. On non-Vulkan backends, "
+           "this flag does nothing.")
+DEF_SWITCH(EnableOpenGLGPUTracing,
+           "enable-opengl-gpu-tracing",
+           "Enable tracing of GPU execution time when using the Impeller "
+           "OpenGLES backend.")
+DEF_SWITCH(EnableVulkanGPUTracing,
+           "enable-vulkan-gpu-tracing",
+           "Enable tracing of GPU execution time when using the Impeller "
+           "Vulkan backend.")
 DEF_SWITCH(LeakVM,
            "leak-vm",
            "When the last shell shuts down, the shared VM is leaked by default "
@@ -248,6 +295,9 @@ DEF_SWITCH(
     "Setting this value to 0 or 1 disables MSAA. If it is not 0 or 1, it must "
     "be one of 2, 4, 8, or 16. However, if the GPU does not support the "
     "requested sampling value, MSAA will be disabled.")
+DEF_SWITCH(EnableEmbedderAPI,
+           "enable-embedder-api",
+           "Enable the embedder api. Defaults to false. iOS only.")
 DEF_SWITCHES_END
 
 void PrintUsage(const std::string& executable_name);
@@ -258,4 +308,4 @@ Settings SettingsFromCommandLine(const fml::CommandLine& command_line);
 
 }  // namespace flutter
 
-#endif  // SHELL_COMMON_SWITCHES_H_
+#endif  // FLUTTER_SHELL_COMMON_SWITCHES_H_
diff --git a/shell/common/switches_unittests.cc b/shell/common/switches_unittests.cc
index c919e873dff782613fa8ab6da1a0288bed8a94ee..617c0a891cfa749eff01b54c176d7b544d31adf4 100644
--- a/shell/common/switches_unittests.cc
+++ b/shell/common/switches_unittests.cc
@@ -10,6 +10,9 @@
 
 #include "gtest/gtest.h"
 
+// TODO(zanderso): https://github.com/flutter/flutter/issues/127701
+// NOLINTBEGIN(bugprone-unchecked-optional-access)
+
 namespace flutter {
 namespace testing {
 
@@ -48,6 +51,14 @@ TEST(SwitchesTest, SkiaTraceAllowlistFlag) {
 #endif
 }
 
+TEST(SwitchesTest, TraceToFile) {
+  fml::CommandLine command_line = fml::CommandLineFromInitializerList(
+      {"command", "--trace-to-file=trace.binpb"});
+  EXPECT_TRUE(command_line.HasOption("trace-to-file"));
+  Settings settings = SettingsFromCommandLine(command_line);
+  EXPECT_EQ(settings.trace_to_file, "trace.binpb");
+}
+
 TEST(SwitchesTest, RouteParsedFlag) {
   fml::CommandLine command_line =
       fml::CommandLineFromInitializerList({"command", "--route=/animation"});
@@ -76,5 +87,43 @@ TEST(SwitchesTest, MsaaSamples) {
   EXPECT_EQ(settings.msaa_samples, 0);
 }
 
+TEST(SwitchesTest, EnableEmbedderAPI) {
+  {
+    // enable
+    fml::CommandLine command_line = fml::CommandLineFromInitializerList(
+        {"command", "--enable-embedder-api"});
+    Settings settings = SettingsFromCommandLine(command_line);
+    EXPECT_EQ(settings.enable_embedder_api, true);
+  }
+  {
+    // default
+    fml::CommandLine command_line =
+        fml::CommandLineFromInitializerList({"command"});
+    Settings settings = SettingsFromCommandLine(command_line);
+    EXPECT_EQ(settings.enable_embedder_api, false);
+  }
+}
+
+TEST(SwitchesTest, NoEnableImpeller) {
+  {
+    // enable
+    fml::CommandLine command_line =
+        fml::CommandLineFromInitializerList({"command", "--enable-impeller"});
+    EXPECT_TRUE(command_line.HasOption("enable-impeller"));
+    Settings settings = SettingsFromCommandLine(command_line);
+    EXPECT_EQ(settings.enable_impeller, true);
+  }
+  {
+    // disable
+    fml::CommandLine command_line = fml::CommandLineFromInitializerList(
+        {"command", "--enable-impeller=false"});
+    EXPECT_TRUE(command_line.HasOption("enable-impeller"));
+    Settings settings = SettingsFromCommandLine(command_line);
+    EXPECT_EQ(settings.enable_impeller, false);
+  }
+}
+
 }  // namespace testing
 }  // namespace flutter
+
+// NOLINTEND(bugprone-unchecked-optional-access)
diff --git a/shell/common/thread_host.cc b/shell/common/thread_host.cc
index e1edd2bd5ccbe8c50960ccaee8dcb8d7a764068a..3b90460cbc357fe15bc8cce6c770c605a9821a6c 100644
--- a/shell/common/thread_host.cc
+++ b/shell/common/thread_host.cc
@@ -16,43 +16,43 @@ std::string ThreadHost::ThreadHostConfig::MakeThreadName(
     Type type,
     const std::string& prefix) {
   switch (type) {
-    case Type::Platform:
+    case Type::kPlatform:
       return prefix + ".platform";
-    case Type::UI:
+    case Type::kUi:
       return prefix + ".ui";
-    case Type::IO:
+    case Type::kIo:
       return prefix + ".io";
-    case Type::RASTER:
+    case Type::kRaster:
       return prefix + ".raster";
-    case Type::Profiler:
+    case Type::kProfiler:
       return prefix + ".profiler";
   }
 }
 
 void ThreadHost::ThreadHostConfig::SetIOConfig(const ThreadConfig& config) {
-  type_mask |= ThreadHost::Type::IO;
+  type_mask |= ThreadHost::Type::kIo;
   io_config = config;
 }
 
 void ThreadHost::ThreadHostConfig::SetUIConfig(const ThreadConfig& config) {
-  type_mask |= ThreadHost::Type::UI;
+  type_mask |= ThreadHost::Type::kUi;
   ui_config = config;
 }
 
 void ThreadHost::ThreadHostConfig::SetPlatformConfig(
     const ThreadConfig& config) {
-  type_mask |= ThreadHost::Type::Platform;
+  type_mask |= ThreadHost::Type::kPlatform;
   platform_config = config;
 }
 
 void ThreadHost::ThreadHostConfig::SetRasterConfig(const ThreadConfig& config) {
-  type_mask |= ThreadHost::Type::RASTER;
+  type_mask |= ThreadHost::Type::kRaster;
   raster_config = config;
 }
 
 void ThreadHost::ThreadHostConfig::SetProfilerConfig(
     const ThreadConfig& config) {
-  type_mask |= ThreadHost::Type::Profiler;
+  type_mask |= ThreadHost::Type::kProfiler;
   profiler_config = config;
 }
 
@@ -78,27 +78,27 @@ ThreadHost::ThreadHost(const std::string& name_prefix, uint64_t mask)
 
 ThreadHost::ThreadHost(const ThreadHostConfig& host_config)
     : name_prefix(host_config.name_prefix) {
-  if (host_config.isThreadNeeded(ThreadHost::Type::Platform)) {
+  if (host_config.isThreadNeeded(ThreadHost::Type::kPlatform)) {
     platform_thread =
-        CreateThread(Type::Platform, host_config.platform_config, host_config);
+        CreateThread(Type::kPlatform, host_config.platform_config, host_config);
   }
 
-  if (host_config.isThreadNeeded(ThreadHost::Type::UI)) {
-    ui_thread = CreateThread(Type::UI, host_config.ui_config, host_config);
+  if (host_config.isThreadNeeded(ThreadHost::Type::kUi)) {
+    ui_thread = CreateThread(Type::kUi, host_config.ui_config, host_config);
   }
 
-  if (host_config.isThreadNeeded(ThreadHost::Type::RASTER)) {
+  if (host_config.isThreadNeeded(ThreadHost::Type::kRaster)) {
     raster_thread =
-        CreateThread(Type::RASTER, host_config.raster_config, host_config);
+        CreateThread(Type::kRaster, host_config.raster_config, host_config);
   }
 
-  if (host_config.isThreadNeeded(ThreadHost::Type::IO)) {
-    io_thread = CreateThread(Type::IO, host_config.io_config, host_config);
+  if (host_config.isThreadNeeded(ThreadHost::Type::kIo)) {
+    io_thread = CreateThread(Type::kIo, host_config.io_config, host_config);
   }
 
-  if (host_config.isThreadNeeded(ThreadHost::Type::Profiler)) {
+  if (host_config.isThreadNeeded(ThreadHost::Type::kProfiler)) {
     profiler_thread =
-        CreateThread(Type::Profiler, host_config.profiler_config, host_config);
+        CreateThread(Type::kProfiler, host_config.profiler_config, host_config);
   }
 }
 
diff --git a/shell/common/thread_host.h b/shell/common/thread_host.h
index cc423cd027b1d5b471e7c70546147b383f994a5d..eabd5eb92f1374782ea58d8205a40a552fc2805b 100644
--- a/shell/common/thread_host.h
+++ b/shell/common/thread_host.h
@@ -20,11 +20,11 @@ using ThreadConfigSetter = fml::Thread::ThreadConfigSetter;
 /// The collection of all the threads used by the engine.
 struct ThreadHost {
   enum Type {
-    Platform = 1 << 0,
-    UI = 1 << 1,
-    RASTER = 1 << 2,
-    IO = 1 << 3,
-    Profiler = 1 << 4,
+    kPlatform = 1 << 0,
+    kUi = 1 << 1,
+    kRaster = 1 << 2,
+    kIo = 1 << 3,
+    kProfiler = 1 << 4,
   };
 
   /// The collection of all the thread configures, and we create custom thread
diff --git a/shell/common/variable_refresh_rate_display.cc b/shell/common/variable_refresh_rate_display.cc
index d51af1a08a724f09f692d1f73cd7e4ec0d580057..138fc0edb6ad5fd9edb1f44bafee7f0879af0bc3 100644
--- a/shell/common/variable_refresh_rate_display.cc
+++ b/shell/common/variable_refresh_rate_display.cc
@@ -18,13 +18,15 @@ namespace flutter {
 
 VariableRefreshRateDisplay::VariableRefreshRateDisplay(
     DisplayId display_id,
-    const std::weak_ptr<VariableRefreshRateReporter>& refresh_rate_reporter)
-    : Display(display_id, GetInitialRefreshRate(refresh_rate_reporter)),
-      refresh_rate_reporter_(refresh_rate_reporter) {}
-
-VariableRefreshRateDisplay::VariableRefreshRateDisplay(
-    const std::weak_ptr<VariableRefreshRateReporter>& refresh_rate_reporter)
-    : Display(GetInitialRefreshRate(refresh_rate_reporter)),
+    const std::weak_ptr<VariableRefreshRateReporter>& refresh_rate_reporter,
+    double width,
+    double height,
+    double device_pixel_ratio)
+    : Display(display_id,
+              GetInitialRefreshRate(refresh_rate_reporter),
+              width,
+              height,
+              device_pixel_ratio),
       refresh_rate_reporter_(refresh_rate_reporter) {}
 
 double VariableRefreshRateDisplay::GetRefreshRate() const {
diff --git a/shell/common/variable_refresh_rate_display.h b/shell/common/variable_refresh_rate_display.h
index 38cb979c36926be7c2bf2d9dfd5e02d5c3828688..e0dcd681bf5717fe5d329873de71a2bea55c75f9 100644
--- a/shell/common/variable_refresh_rate_display.h
+++ b/shell/common/variable_refresh_rate_display.h
@@ -18,9 +18,10 @@ class VariableRefreshRateDisplay : public Display {
  public:
   explicit VariableRefreshRateDisplay(
       DisplayId display_id,
-      const std::weak_ptr<VariableRefreshRateReporter>& refresh_rate_reporter);
-  explicit VariableRefreshRateDisplay(
-      const std::weak_ptr<VariableRefreshRateReporter>& refresh_rate_reporter);
+      const std::weak_ptr<VariableRefreshRateReporter>& refresh_rate_reporter,
+      double width,
+      double height,
+      double device_pixel_ratio);
   ~VariableRefreshRateDisplay() = default;
 
   // |Display|
diff --git a/shell/common/variable_refresh_rate_display_unittests.cc b/shell/common/variable_refresh_rate_display_unittests.cc
index e65641264d8e1e84b3a0ecbd9b74a67cbb3dadb9..d9725cf815dafdd3a59ade6965e36d7cdab4e7d3 100644
--- a/shell/common/variable_refresh_rate_display_unittests.cc
+++ b/shell/common/variable_refresh_rate_display_unittests.cc
@@ -13,14 +13,16 @@ namespace testing {
 TEST(VariableRefreshRateDisplayTest, ReportCorrectInitialRefreshRate) {
   auto refresh_rate_reporter = std::make_shared<TestRefreshRateReporter>(60);
   auto display = flutter::VariableRefreshRateDisplay(
-      std::weak_ptr<TestRefreshRateReporter>(refresh_rate_reporter));
+      0, std::weak_ptr<TestRefreshRateReporter>(refresh_rate_reporter), 600,
+      800, 60);
   ASSERT_EQ(display.GetRefreshRate(), 60);
 }
 
 TEST(VariableRefreshRateDisplayTest, ReportCorrectRefreshRateWhenUpdated) {
   auto refresh_rate_reporter = std::make_shared<TestRefreshRateReporter>(60);
   auto display = flutter::VariableRefreshRateDisplay(
-      std::weak_ptr<TestRefreshRateReporter>(refresh_rate_reporter));
+      0, std::weak_ptr<TestRefreshRateReporter>(refresh_rate_reporter), 600,
+      800, 60);
   refresh_rate_reporter->UpdateRefreshRate(30);
   ASSERT_EQ(display.GetRefreshRate(), 30);
 }
@@ -29,7 +31,8 @@ TEST(VariableRefreshRateDisplayTest,
      Report0IfReporterSharedPointerIsDestroyedAfterDisplayCreation) {
   auto refresh_rate_reporter = std::make_shared<TestRefreshRateReporter>(60);
   auto display = flutter::VariableRefreshRateDisplay(
-      std::weak_ptr<TestRefreshRateReporter>(refresh_rate_reporter));
+      0, std::weak_ptr<TestRefreshRateReporter>(refresh_rate_reporter), 600,
+      800, 60);
   refresh_rate_reporter.reset();
   ASSERT_EQ(display.GetRefreshRate(), 0);
 }
@@ -39,7 +42,8 @@ TEST(VariableRefreshRateDisplayTest,
   auto refresh_rate_reporter = std::make_shared<TestRefreshRateReporter>(60);
   refresh_rate_reporter.reset();
   auto display = flutter::VariableRefreshRateDisplay(
-      std::weak_ptr<TestRefreshRateReporter>(refresh_rate_reporter));
+      0, std::weak_ptr<TestRefreshRateReporter>(refresh_rate_reporter), 600,
+      800, 60);
   ASSERT_EQ(display.GetRefreshRate(), 0);
 }
 
diff --git a/shell/common/vsync_waiter.cc b/shell/common/vsync_waiter.cc
index 5ee04ef530b08cd55726283203b1d7e11db42133..80074fa3ef9826331c77c2e6b27febed7eca6618 100644
--- a/shell/common/vsync_waiter.cc
+++ b/shell/common/vsync_waiter.cc
@@ -110,16 +110,18 @@ void VsyncWaiter::FireCallback(fml::TimePoint frame_start_time,
   }
 
   if (callback) {
-    auto flow_identifier = fml::tracing::TraceNonce();
+    const uint64_t flow_identifier = fml::tracing::TraceNonce();
     if (pause_secondary_tasks) {
-      PauseDartMicroTasks();
+      PauseDartEventLoopTasks();
     }
 
     // The base trace ensures that flows have a root to begin from if one does
     // not exist. The trace viewer will ignore traces that have no base event
     // trace. While all our message loops insert a base trace trace
     // (MessageLoop::RunExpiredTasks), embedders may not.
-    TRACE_EVENT0("flutter", "VsyncFireCallback");
+    TRACE_EVENT0_WITH_FLOW_IDS("flutter", "VsyncFireCallback",
+                               /*flow_id_count=*/1,
+                               /*flow_ids=*/&flow_identifier);
 
     TRACE_FLOW_BEGIN("flutter", kVsyncFlowName, flow_identifier);
 
@@ -129,8 +131,10 @@ void VsyncWaiter::FireCallback(fml::TimePoint frame_start_time,
     task_runners_.GetUITaskRunner()->PostTask(
         [ui_task_queue_id, callback, flow_identifier, frame_start_time,
          frame_target_time, pause_secondary_tasks]() {
-          FML_TRACE_EVENT("flutter", kVsyncTraceName, "StartTime",
-                          frame_start_time, "TargetTime", frame_target_time);
+          FML_TRACE_EVENT_WITH_FLOW_IDS(
+              "flutter", kVsyncTraceName, /*flow_id_count=*/1,
+              /*flow_ids=*/&flow_identifier, "StartTime", frame_start_time,
+              "TargetTime", frame_target_time);
           std::unique_ptr<FrameTimingsRecorder> frame_timings_recorder =
               std::make_unique<FrameTimingsRecorder>();
           frame_timings_recorder->RecordVsync(frame_start_time,
@@ -138,7 +142,7 @@ void VsyncWaiter::FireCallback(fml::TimePoint frame_start_time,
           callback(std::move(frame_timings_recorder));
           TRACE_FLOW_END("flutter", kVsyncFlowName, flow_identifier);
           if (pause_secondary_tasks) {
-            ResumeDartMicroTasks(ui_task_queue_id);
+            ResumeDartEventLoopTasks(ui_task_queue_id);
           }
         });
   }
@@ -148,13 +152,13 @@ void VsyncWaiter::FireCallback(fml::TimePoint frame_start_time,
   }
 }
 
-void VsyncWaiter::PauseDartMicroTasks() {
+void VsyncWaiter::PauseDartEventLoopTasks() {
   auto ui_task_queue_id = task_runners_.GetUITaskRunner()->GetTaskQueueId();
   auto task_queues = fml::MessageLoopTaskQueues::GetInstance();
   task_queues->PauseSecondarySource(ui_task_queue_id);
 }
 
-void VsyncWaiter::ResumeDartMicroTasks(fml::TaskQueueId ui_task_queue_id) {
+void VsyncWaiter::ResumeDartEventLoopTasks(fml::TaskQueueId ui_task_queue_id) {
   auto task_queues = fml::MessageLoopTaskQueues::GetInstance();
   task_queues->ResumeSecondarySource(ui_task_queue_id);
 }
diff --git a/shell/common/vsync_waiter.h b/shell/common/vsync_waiter.h
index cfce4524df4d7a59c90ff8a1fb3ce459b61ca9c9..4ae8ea5d71f8231d17deabdf5337a3c91d6ecf48 100644
--- a/shell/common/vsync_waiter.h
+++ b/shell/common/vsync_waiter.h
@@ -18,6 +18,9 @@ namespace flutter {
 
 /// Abstract Base Class that represents a platform specific mechanism for
 /// getting callbacks when a vsync event happens.
+///
+/// @see VsyncWaiterAndroid
+/// @see VsyncWaiterEmbedder
 class VsyncWaiter : public std::enable_shared_from_this<VsyncWaiter> {
  public:
   using Callback = std::function<void(std::unique_ptr<FrameTimingsRecorder>)>;
@@ -77,8 +80,8 @@ class VsyncWaiter : public std::enable_shared_from_this<VsyncWaiter> {
   Callback callback_;
   std::unordered_map<uintptr_t, fml::closure> secondary_callbacks_;
 
-  void PauseDartMicroTasks();
-  static void ResumeDartMicroTasks(fml::TaskQueueId ui_task_queue_id);
+  void PauseDartEventLoopTasks();
+  static void ResumeDartEventLoopTasks(fml::TaskQueueId ui_task_queue_id);
 
   FML_DISALLOW_COPY_AND_ASSIGN(VsyncWaiter);
 };
diff --git a/shell/common/vsync_waiter_fallback.cc b/shell/common/vsync_waiter_fallback.cc
index 89c3fb0c805fcfcfeef38d8c77e93bdb0a0956eb..bad751e4afd89c85b6559003ddc363de6bd51bad 100644
--- a/shell/common/vsync_waiter_fallback.cc
+++ b/shell/common/vsync_waiter_fallback.cc
@@ -35,13 +35,17 @@ VsyncWaiterFallback::~VsyncWaiterFallback() = default;
 
 // |VsyncWaiter|
 void VsyncWaiterFallback::AwaitVSync() {
-  TRACE_EVENT0("flutter", "VSYNC");
-
   constexpr fml::TimeDelta kSingleFrameInterval =
       fml::TimeDelta::FromSecondsF(1.0 / 60.0);
   auto frame_start_time =
       SnapToNextTick(fml::TimePoint::Now(), phase_, kSingleFrameInterval);
   auto frame_target_time = frame_start_time + kSingleFrameInterval;
+
+  TRACE_EVENT2_INT("flutter", "PlatformVsync", "frame_start_time",
+                   frame_start_time.ToEpochDelta().ToMicroseconds(),
+                   "frame_target_time",
+                   frame_target_time.ToEpochDelta().ToMicroseconds());
+
   std::weak_ptr<VsyncWaiterFallback> weak_this =
       std::static_pointer_cast<VsyncWaiterFallback>(shared_from_this());
 
diff --git a/shell/common/vsync_waiters_test.cc b/shell/common/vsync_waiters_test.cc
index ff26cc6775270bcef9a05d1a930bd8d62c00882a..3c237959df54776c3fe93ac0764a314eeca96a6a 100644
--- a/shell/common/vsync_waiters_test.cc
+++ b/shell/common/vsync_waiters_test.cc
@@ -60,7 +60,7 @@ void ConstantFiringVsyncWaiter::AwaitVSync() {
   FML_DCHECK(task_runners_.GetUITaskRunner()->RunsTasksOnCurrentThread());
   auto async_wait = std::async([this]() {
     task_runners_.GetPlatformTaskRunner()->PostTask(
-        [this]() { FireCallback(frame_begin_time, frame_target_time); });
+        [this]() { FireCallback(kFrameBeginTime, kFrameTargetTime); });
   });
 }
 
diff --git a/shell/common/vsync_waiters_test.h b/shell/common/vsync_waiters_test.h
index 80fa3abfb6c2432d1f2a9434587441000f1a8859..fad0bb34948846a4b1e9d81765acea92070b5493 100644
--- a/shell/common/vsync_waiters_test.h
+++ b/shell/common/vsync_waiters_test.h
@@ -2,11 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#define FML_USED_ON_EMBEDDER
-
 #ifndef FLUTTER_SHELL_COMMON_VSYNC_WAITERS_TEST_H_
 #define FLUTTER_SHELL_COMMON_VSYNC_WAITERS_TEST_H_
 
+#define FML_USED_ON_EMBEDDER
+
+#include <utility>
+
 #include "flutter/shell/common/shell.h"
 
 namespace flutter {
@@ -30,9 +32,9 @@ class ShellTestVsyncClock {
 
 class ShellTestVsyncWaiter : public VsyncWaiter {
  public:
-  ShellTestVsyncWaiter(TaskRunners task_runners,
+  ShellTestVsyncWaiter(const TaskRunners& task_runners,
                        std::shared_ptr<ShellTestVsyncClock> clock)
-      : VsyncWaiter(std::move(task_runners)), clock_(clock) {}
+      : VsyncWaiter(task_runners), clock_(std::move(clock)) {}
 
  protected:
   void AwaitVSync() override;
@@ -44,13 +46,13 @@ class ShellTestVsyncWaiter : public VsyncWaiter {
 class ConstantFiringVsyncWaiter : public VsyncWaiter {
  public:
   // both of these are set in the past so as to fire immediately.
-  static constexpr fml::TimePoint frame_begin_time =
+  static constexpr fml::TimePoint kFrameBeginTime =
       fml::TimePoint::FromEpochDelta(fml::TimeDelta::FromSeconds(0));
-  static constexpr fml::TimePoint frame_target_time =
+  static constexpr fml::TimePoint kFrameTargetTime =
       fml::TimePoint::FromEpochDelta(fml::TimeDelta::FromSeconds(100));
 
-  explicit ConstantFiringVsyncWaiter(TaskRunners task_runners)
-      : VsyncWaiter(std::move(task_runners)) {}
+  explicit ConstantFiringVsyncWaiter(const TaskRunners& task_runners)
+      : VsyncWaiter(task_runners) {}
 
  protected:
   void AwaitVSync() override;
diff --git a/shell/config.gni b/shell/config.gni
index 85dd360cbc036d5c4276303906ecb56fbcab19ac..faf85d4f0b435df15870d0b011697552b6129957 100644
--- a/shell/config.gni
+++ b/shell/config.gni
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 declare_args() {
-  shell_enable_gl = !is_fuchsia
+  shell_enable_gl = !is_fuchsia && !is_mac && !is_ohos
 
   # The logic for enabling Vulkan and Metal is in tools/gn.
   shell_enable_metal = false
diff --git a/shell/gpu/BUILD.gn b/shell/gpu/BUILD.gn
index 5e5c1cce53a6cceab3b14960e5d76090900bdb5e..0e7e68670551fc1de7fe3e018dbc5cd145fafef6 100644
--- a/shell/gpu/BUILD.gn
+++ b/shell/gpu/BUILD.gn
@@ -12,7 +12,7 @@ gpu_common_deps = [
   "//flutter/flow",
   "//flutter/fml",
   "//flutter/shell/common",
-  "//third_party/skia",
+  "//flutter/skia",
 ]
 
 source_set("gpu_surface_software") {
@@ -88,3 +88,26 @@ source_set("gpu_surface_metal") {
     public_deps += [ "//flutter/impeller" ]
   }
 }
+
+if (is_mac) {
+  impeller_component("gpu_surface_metal_unittests") {
+    testonly = true
+    target_type = "executable"
+    sources = [ "gpu_surface_metal_impeller_unittests.mm" ]
+
+    frameworks = [
+      "AppKit.framework",
+      "QuartzCore.framework",
+    ]
+
+    deps = [
+             "//flutter/testing",
+             ":gpu_surface_metal",
+             "//flutter/impeller/fixtures",
+             "//flutter/fml",
+             "//flutter/runtime",
+             "//flutter/runtime:libdart",
+             "//flutter/testing",
+           ] + gpu_common_deps
+  }
+}
diff --git a/shell/gpu/gpu_surface_gl_delegate.h b/shell/gpu/gpu_surface_gl_delegate.h
index f097cba2d0266ea59314d21e2a41be44111e22cd..39a58e6a708a6a97dd1bcde5a2bf843bc4992c48 100644
--- a/shell/gpu/gpu_surface_gl_delegate.h
+++ b/shell/gpu/gpu_surface_gl_delegate.h
@@ -27,8 +27,6 @@ struct GLFrameInfo {
 struct GLFBOInfo {
   // The frame buffer's ID.
   uint32_t fbo_id;
-  // This boolean flags whether the returned FBO supports partial repaint.
-  const bool partial_repaint_enabled;
   // The frame buffer's existing damage (i.e. damage since it was last used).
   const std::optional<SkIRect> existing_damage;
 };
@@ -58,7 +56,7 @@ class GPUSurfaceGLDelegate {
   virtual std::unique_ptr<GLContextResult> GLContextMakeCurrent() = 0;
 
   // Called to clear the current GL context on the thread. This may be called on
-  // either the GPU or IO threads.
+  // either the Raster or IO threads.
   virtual bool GLContextClearCurrent() = 0;
 
   // Inform the GL Context that there's going to be no writing beyond
diff --git a/shell/gpu/gpu_surface_gl_impeller.cc b/shell/gpu/gpu_surface_gl_impeller.cc
index e5d6a8324a0d5f1129c768c38b9065d45475a2c0..2c45762a512fd7e9c66b405546502ad150b21868 100644
--- a/shell/gpu/gpu_surface_gl_impeller.cc
+++ b/shell/gpu/gpu_surface_gl_impeller.cc
@@ -5,15 +5,17 @@
 #include "flutter/shell/gpu/gpu_surface_gl_impeller.h"
 
 #include "flutter/fml/make_copyable.h"
-#include "flutter/impeller/display_list/display_list_dispatcher.h"
-#include "flutter/impeller/renderer/backend/gles/surface_gles.h"
-#include "flutter/impeller/renderer/renderer.h"
+#include "impeller/display_list/dl_dispatcher.h"
+#include "impeller/renderer/backend/gles/surface_gles.h"
+#include "impeller/renderer/renderer.h"
+#include "impeller/typographer/backends/skia/typographer_context_skia.h"
 
 namespace flutter {
 
 GPUSurfaceGLImpeller::GPUSurfaceGLImpeller(
     GPUSurfaceGLDelegate* delegate,
-    std::shared_ptr<impeller::Context> context)
+    std::shared_ptr<impeller::Context> context,
+    bool render_to_surface)
     : weak_factory_(this) {
   if (delegate == nullptr) {
     return;
@@ -28,7 +30,8 @@ GPUSurfaceGLImpeller::GPUSurfaceGLImpeller(
     return;
   }
 
-  auto aiks_context = std::make_shared<impeller::AiksContext>(context);
+  auto aiks_context = std::make_shared<impeller::AiksContext>(
+      context, impeller::TypographerContextSkia::Make());
 
   if (!aiks_context->IsValid()) {
     return;
@@ -36,6 +39,7 @@ GPUSurfaceGLImpeller::GPUSurfaceGLImpeller(
 
   delegate_ = delegate;
   impeller_context_ = std::move(context);
+  render_to_surface_ = render_to_surface;
   impeller_renderer_ = std::move(renderer);
   aiks_context_ = std::move(aiks_context);
   is_valid_ = true;
@@ -61,7 +65,7 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceGLImpeller::AcquireFrame(
                         delegate = delegate_]() -> bool {
     if (weak) {
       GLPresentInfo present_info = {
-          .fbo_id = 0,
+          .fbo_id = 0u,
           .frame_damage = std::nullopt,
           // TODO (https://github.com/flutter/flutter/issues/105597): wire-up
           // presentation time to impeller backend.
@@ -80,10 +84,22 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceGLImpeller::AcquireFrame(
     return nullptr;
   }
 
+  if (!render_to_surface_) {
+    return std::make_unique<SurfaceFrame>(
+        nullptr, SurfaceFrame::FramebufferInfo{.supports_readback = true},
+        [](const SurfaceFrame& surface_frame, DlCanvas* canvas) {
+          return true;
+        },
+        size);
+  }
+
+  GLFrameInfo frame_info = {static_cast<uint32_t>(size.width()),
+                            static_cast<uint32_t>(size.height())};
+  const GLFBOInfo fbo_info = delegate_->GLContextFBO(frame_info);
   auto surface = impeller::SurfaceGLES::WrapFBO(
       impeller_context_,                            // context
       swap_callback,                                // swap_callback
-      0u,                                           // fbo
+      fbo_info.fbo_id,                              // fbo
       impeller::PixelFormat::kR8G8B8A8UNormInt,     // color_format
       impeller::ISize{size.width(), size.height()}  // fbo_size
   );
@@ -92,7 +108,7 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceGLImpeller::AcquireFrame(
       fml::MakeCopyable([renderer = impeller_renderer_,  //
                          aiks_context = aiks_context_,   //
                          surface = std::move(surface)    //
-  ](SurfaceFrame& surface_frame, SkCanvas* canvas) mutable -> bool {
+  ](SurfaceFrame& surface_frame, DlCanvas* canvas) mutable -> bool {
         if (!aiks_context) {
           return false;
         }
@@ -103,8 +119,13 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceGLImpeller::AcquireFrame(
           return false;
         }
 
-        impeller::DisplayListDispatcher impeller_dispatcher;
-        display_list->Dispatch(impeller_dispatcher);
+        auto cull_rect =
+            surface->GetTargetRenderPassDescriptor().GetRenderTargetSize();
+        impeller::Rect dl_cull_rect = impeller::Rect::MakeSize(cull_rect);
+        impeller::DlDispatcher impeller_dispatcher(dl_cull_rect);
+        display_list->Dispatch(
+            impeller_dispatcher,
+            SkIRect::MakeWH(cull_rect.width, cull_rect.height));
         auto picture = impeller_dispatcher.EndRecordingAsPicture();
 
         return renderer->Render(
@@ -112,17 +133,18 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceGLImpeller::AcquireFrame(
             fml::MakeCopyable(
                 [aiks_context, picture = std::move(picture)](
                     impeller::RenderTarget& render_target) -> bool {
-                  return aiks_context->Render(picture, render_target);
+                  return aiks_context->Render(picture, render_target,
+                                              /*reset_host_buffer=*/true);
                 }));
       });
 
   return std::make_unique<SurfaceFrame>(
-      nullptr,                          // surface
-      SurfaceFrame::FramebufferInfo{},  // framebuffer info
-      submit_callback,                  // submit callback
-      size,                             // frame size
-      std::move(context_switch),        // context result
-      true                              // display list fallback
+      nullptr,                                // surface
+      delegate_->GLContextFramebufferInfo(),  // framebuffer info
+      submit_callback,                        // submit callback
+      size,                                   // frame size
+      std::move(context_switch),              // context result
+      true                                    // display list fallback
   );
 }
 
@@ -160,8 +182,9 @@ bool GPUSurfaceGLImpeller::EnableRasterCache() const {
 }
 
 // |Surface|
-impeller::AiksContext* GPUSurfaceGLImpeller::GetAiksContext() const {
-  return aiks_context_.get();
+std::shared_ptr<impeller::AiksContext> GPUSurfaceGLImpeller::GetAiksContext()
+    const {
+  return aiks_context_;
 }
 
 }  // namespace flutter
diff --git a/shell/gpu/gpu_surface_gl_impeller.h b/shell/gpu/gpu_surface_gl_impeller.h
index 367bad23835ac2b8f70a4f597a9c158ff7cd77dd..5b6fbd9c1f3b54627b1bfca077982bb0f3987b42 100644
--- a/shell/gpu/gpu_surface_gl_impeller.h
+++ b/shell/gpu/gpu_surface_gl_impeller.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_GPU_GPU_SURFACE_GL_IMPELLER_H_
-#define SHELL_GPU_GPU_SURFACE_GL_IMPELLER_H_
+#ifndef FLUTTER_SHELL_GPU_GPU_SURFACE_GL_IMPELLER_H_
+#define FLUTTER_SHELL_GPU_GPU_SURFACE_GL_IMPELLER_H_
 
 #include "flutter/common/graphics/gl_context_switch.h"
 #include "flutter/flow/surface.h"
@@ -18,7 +18,8 @@ namespace flutter {
 class GPUSurfaceGLImpeller final : public Surface {
  public:
   explicit GPUSurfaceGLImpeller(GPUSurfaceGLDelegate* delegate,
-                                std::shared_ptr<impeller::Context> context);
+                                std::shared_ptr<impeller::Context> context,
+                                bool render_to_surface);
 
   // |Surface|
   ~GPUSurfaceGLImpeller() override;
@@ -29,10 +30,11 @@ class GPUSurfaceGLImpeller final : public Surface {
  private:
   GPUSurfaceGLDelegate* delegate_ = nullptr;
   std::shared_ptr<impeller::Context> impeller_context_;
+  bool render_to_surface_ = true;
   std::shared_ptr<impeller::Renderer> impeller_renderer_;
   std::shared_ptr<impeller::AiksContext> aiks_context_;
   bool is_valid_ = false;
-  fml::WeakPtrFactory<GPUSurfaceGLImpeller> weak_factory_;
+  fml::TaskRunnerAffineWeakPtrFactory<GPUSurfaceGLImpeller> weak_factory_;
 
   // |Surface|
   std::unique_ptr<SurfaceFrame> AcquireFrame(const SkISize& size) override;
@@ -56,11 +58,11 @@ class GPUSurfaceGLImpeller final : public Surface {
   bool EnableRasterCache() const override;
 
   // |Surface|
-  impeller::AiksContext* GetAiksContext() const override;
+  std::shared_ptr<impeller::AiksContext> GetAiksContext() const override;
 
   FML_DISALLOW_COPY_AND_ASSIGN(GPUSurfaceGLImpeller);
 };
 
 }  // namespace flutter
 
-#endif  // SHELL_GPU_GPU_SURFACE_GL_IMPELLER_H_
+#endif  // FLUTTER_SHELL_GPU_GPU_SURFACE_GL_IMPELLER_H_
diff --git a/shell/gpu/gpu_surface_gl_skia.cc b/shell/gpu/gpu_surface_gl_skia.cc
index 01be975ee831ae13e4f6140058fb5769d5a9100f..04c708808e0a9fa37f7af18b19151f5c15f41981 100644
--- a/shell/gpu/gpu_surface_gl_skia.cc
+++ b/shell/gpu/gpu_surface_gl_skia.cc
@@ -18,9 +18,13 @@
 #include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/gpu/GrBackendSurface.h"
 #include "third_party/skia/include/gpu/GrContextOptions.h"
+#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
+#include "third_party/skia/include/gpu/ganesh/gl/GrGLBackendSurface.h"
+#include "third_party/skia/include/gpu/ganesh/gl/GrGLDirectContext.h"
+#include "third_party/skia/include/gpu/gl/GrGLTypes.h"
 
 // These are common defines present on all OpenGL headers. However, we don't
-// want to perform GL header reasolution on each platform we support. So just
+// want to perform GL header resolution on each platform we support. So just
 // define these upfront. It is unlikely we will need more. But, if we do, we can
 // add the same here.
 #define GPU_GL_RGBA8 0x8058
@@ -48,7 +52,7 @@ sk_sp<GrDirectContext> GPUSurfaceGLSkia::MakeGLContext(
   const auto options =
       MakeDefaultContextOptions(ContextType::kRender, GrBackendApi::kOpenGL);
 
-  auto context = GrDirectContext::MakeGL(delegate->GetGLInterface(), options);
+  auto context = GrDirectContexts::MakeGL(delegate->GetGLInterface(), options);
 
   if (!context) {
     FML_LOG(ERROR) << "Failed to set up Skia Gr context.";
@@ -137,17 +141,18 @@ static sk_sp<SkSurface> WrapOnscreenSurface(GrDirectContext* context,
   framebuffer_info.fFBOID = static_cast<GrGLuint>(fbo);
   framebuffer_info.fFormat = format;
 
-  GrBackendRenderTarget render_target(size.width(),     // width
-                                      size.height(),    // height
-                                      0,                // sample count
-                                      0,                // stencil bits
-                                      framebuffer_info  // framebuffer info
-  );
+  auto render_target =
+      GrBackendRenderTargets::MakeGL(size.width(),     // width
+                                     size.height(),    // height
+                                     0,                // sample count
+                                     0,                // stencil bits
+                                     framebuffer_info  // framebuffer info
+      );
 
   sk_sp<SkColorSpace> colorspace = SkColorSpace::MakeSRGB();
   SkSurfaceProps surface_props(0, kUnknown_SkPixelGeometry);
 
-  return SkSurface::MakeFromBackendRenderTarget(
+  return SkSurfaces::WrapBackendRenderTarget(
       context,                                       // Gr context
       render_target,                                 // render target
       GrSurfaceOrigin::kBottomLeft_GrSurfaceOrigin,  // origin
@@ -227,7 +232,7 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceGLSkia::AcquireFrame(
     framebuffer_info.supports_readback = true;
     return std::make_unique<SurfaceFrame>(
         nullptr, framebuffer_info,
-        [](const SurfaceFrame& surface_frame, SkCanvas* canvas) {
+        [](const SurfaceFrame& surface_frame, DlCanvas* canvas) {
           return true;
         },
         size);
@@ -245,7 +250,7 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceGLSkia::AcquireFrame(
   surface->getCanvas()->setMatrix(root_surface_transformation);
   SurfaceFrame::SubmitCallback submit_callback =
       [weak = weak_factory_.GetWeakPtr()](const SurfaceFrame& surface_frame,
-                                          SkCanvas* canvas) {
+                                          DlCanvas* canvas) {
         return weak ? weak->PresentSurface(surface_frame, canvas) : false;
       };
 
@@ -259,7 +264,7 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceGLSkia::AcquireFrame(
 }
 
 bool GPUSurfaceGLSkia::PresentSurface(const SurfaceFrame& frame,
-                                      SkCanvas* canvas) {
+                                      DlCanvas* canvas) {
   if (delegate_ == nullptr || canvas == nullptr || context_ == nullptr) {
     return false;
   }
@@ -267,8 +272,8 @@ bool GPUSurfaceGLSkia::PresentSurface(const SurfaceFrame& frame,
   delegate_->GLContextSetDamageRegion(frame.submit_info().buffer_damage);
 
   {
-    TRACE_EVENT0("flutter", "SkCanvas::Flush");
-    onscreen_surface_->getCanvas()->flush();
+    TRACE_EVENT0("flutter", "GrDirectContext::flushAndSubmit");
+    context_->flushAndSubmit();
   }
 
   GLPresentInfo present_info = {
diff --git a/shell/gpu/gpu_surface_gl_skia.h b/shell/gpu/gpu_surface_gl_skia.h
index 9b2cac089f8ede9444c554868644a300f876b632..ae6cdaf52d13f3ca4d622ba0fb17e1584b9f3f93 100644
--- a/shell/gpu/gpu_surface_gl_skia.h
+++ b/shell/gpu/gpu_surface_gl_skia.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_GPU_GPU_SURFACE_GL_SKIA_H_
-#define SHELL_GPU_GPU_SURFACE_GL_SKIA_H_
+#ifndef FLUTTER_SHELL_GPU_GPU_SURFACE_GL_SKIA_H_
+#define FLUTTER_SHELL_GPU_GPU_SURFACE_GL_SKIA_H_
 
 #include <functional>
 #include <memory>
@@ -14,6 +14,8 @@
 #include "flutter/fml/macros.h"
 #include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/shell/gpu/gpu_surface_gl_delegate.h"
+
+#include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
 
 namespace flutter {
@@ -60,7 +62,7 @@ class GPUSurfaceGLSkia : public Surface {
       const SkISize& untransformed_size,
       const SkMatrix& root_surface_transformation);
 
-  bool PresentSurface(const SurfaceFrame& frame, SkCanvas* canvas);
+  bool PresentSurface(const SurfaceFrame& frame, DlCanvas* canvas);
 
   GPUSurfaceGLDelegate* delegate_;
   sk_sp<GrDirectContext> context_;
@@ -86,4 +88,4 @@ class GPUSurfaceGLSkia : public Surface {
 
 }  // namespace flutter
 
-#endif  // SHELL_GPU_GPU_SURFACE_GL_SKIA_H_
+#endif  // FLUTTER_SHELL_GPU_GPU_SURFACE_GL_SKIA_H_
diff --git a/shell/gpu/gpu_surface_metal_delegate.h b/shell/gpu/gpu_surface_metal_delegate.h
index cb3900e392c1ff83a14af2091f89067c6fc264d1..f20b0507231c98400a0316a5d6ef2152733df44b 100644
--- a/shell/gpu/gpu_surface_metal_delegate.h
+++ b/shell/gpu/gpu_surface_metal_delegate.h
@@ -10,7 +10,7 @@
 #include "flutter/fml/macros.h"
 #include "third_party/skia/include/core/SkSize.h"
 #include "third_party/skia/include/core/SkSurface.h"
-#include "third_party/skia/include/gpu/mtl/GrMtlTypes.h"
+#include "third_party/skia/include/gpu/ganesh/mtl/GrMtlTypes.h"
 
 namespace flutter {
 
@@ -26,9 +26,13 @@ typedef void* GPUCAMetalLayerHandle;
 // expected to be id<MTLTexture>
 typedef const void* GPUMTLTextureHandle;
 
+typedef void (*GPUMTLDestructionCallback)(void* /* destruction_context */);
+
 struct GPUMTLTextureInfo {
   int64_t texture_id;
   GPUMTLTextureHandle texture;
+  GPUMTLDestructionCallback destruction_callback;
+  void* destruction_context;
 };
 
 enum class MTLRenderTargetType { kMTLTexture, kCAMetalLayer };
diff --git a/shell/gpu/gpu_surface_metal_impeller.h b/shell/gpu/gpu_surface_metal_impeller.h
index 3fda202a631525d9eec33be7d0fc29f5a98ae457..ef0c1e955cd48e6cfd5277a83f1f4cf124eee896 100644
--- a/shell/gpu/gpu_surface_metal_impeller.h
+++ b/shell/gpu/gpu_surface_metal_impeller.h
@@ -5,18 +5,25 @@
 #ifndef FLUTTER_SHELL_GPU_GPU_SURFACE_METAL_IMPELLER_H_
 #define FLUTTER_SHELL_GPU_GPU_SURFACE_METAL_IMPELLER_H_
 
+#include <Metal/Metal.h>
+
 #include "flutter/flow/surface.h"
 #include "flutter/fml/macros.h"
+#include "flutter/fml/platform/darwin/scoped_nsobject.h"
 #include "flutter/impeller/aiks/aiks_context.h"
+#include "flutter/impeller/renderer/backend/metal/context_mtl.h"
 #include "flutter/impeller/renderer/renderer.h"
 #include "flutter/shell/gpu/gpu_surface_metal_delegate.h"
+#include "third_party/skia/include/gpu/ganesh/mtl/GrMtlTypes.h"
 
 namespace flutter {
 
-class SK_API_AVAILABLE_CA_METAL_LAYER GPUSurfaceMetalImpeller : public Surface {
+class IMPELLER_CA_METAL_LAYER_AVAILABLE GPUSurfaceMetalImpeller
+    : public Surface {
  public:
   GPUSurfaceMetalImpeller(GPUSurfaceMetalDelegate* delegate,
-                          const std::shared_ptr<impeller::Context>& context);
+                          const std::shared_ptr<impeller::Context>& context,
+                          bool render_to_surface = true);
 
   // |Surface|
   ~GPUSurfaceMetalImpeller();
@@ -24,13 +31,34 @@ class SK_API_AVAILABLE_CA_METAL_LAYER GPUSurfaceMetalImpeller : public Surface {
   // |Surface|
   bool IsValid() override;
 
+  virtual Surface::SurfaceData GetSurfaceData() const override;
+
  private:
   const GPUSurfaceMetalDelegate* delegate_;
+  const MTLRenderTargetType render_target_type_;
   std::shared_ptr<impeller::Renderer> impeller_renderer_;
   std::shared_ptr<impeller::AiksContext> aiks_context_;
+  fml::scoped_nsprotocol<id<MTLTexture>> last_texture_;
+  // TODO(38466): Refactor GPU surface APIs take into account the fact that an
+  // external view embedder may want to render to the root surface. This is a
+  // hack to make avoid allocating resources for the root surface when an
+  // external view embedder is present.
+  bool render_to_surface_ = true;
+  bool disable_partial_repaint_ = false;
+  // Accumulated damage for each framebuffer; Key is address of underlying
+  // MTLTexture for each drawable
+  std::shared_ptr<std::map<uintptr_t, SkIRect>> damage_ =
+      std::make_shared<std::map<uintptr_t, SkIRect>>();
 
   // |Surface|
-  std::unique_ptr<SurfaceFrame> AcquireFrame(const SkISize& size) override;
+  std::unique_ptr<SurfaceFrame> AcquireFrame(
+      const SkISize& frame_size) override;
+
+  std::unique_ptr<SurfaceFrame> AcquireFrameFromCAMetalLayer(
+      const SkISize& frame_size);
+
+  std::unique_ptr<SurfaceFrame> AcquireFrameFromMTLTexture(
+      const SkISize& frame_size);
 
   // |Surface|
   SkMatrix GetRootTransformation() const override;
@@ -48,7 +76,7 @@ class SK_API_AVAILABLE_CA_METAL_LAYER GPUSurfaceMetalImpeller : public Surface {
   bool EnableRasterCache() const override;
 
   // |Surface|
-  impeller::AiksContext* GetAiksContext() const override;
+  std::shared_ptr<impeller::AiksContext> GetAiksContext() const override;
 
   FML_DISALLOW_COPY_AND_ASSIGN(GPUSurfaceMetalImpeller);
 };
diff --git a/shell/gpu/gpu_surface_metal_impeller.mm b/shell/gpu/gpu_surface_metal_impeller.mm
index 686c3c5a9256290a0853917d2eb5dd1becf39d4d..509383130b109f0b3310f444e5dd1e7ad2f179ea 100644
--- a/shell/gpu/gpu_surface_metal_impeller.mm
+++ b/shell/gpu/gpu_surface_metal_impeller.mm
@@ -7,11 +7,13 @@
 #import <Metal/Metal.h>
 #import <QuartzCore/QuartzCore.h>
 
+#include "flutter/common/settings.h"
 #include "flutter/fml/make_copyable.h"
 #include "flutter/fml/mapping.h"
 #include "flutter/fml/trace_event.h"
-#include "flutter/impeller/display_list/display_list_dispatcher.h"
-#include "flutter/impeller/renderer/backend/metal/surface_mtl.h"
+#include "impeller/display_list/dl_dispatcher.h"
+#include "impeller/renderer/backend/metal/surface_mtl.h"
+#include "impeller/typographer/backends/skia/typographer_context_skia.h"
 
 static_assert(!__has_feature(objc_arc), "ARC must be disabled.");
 
@@ -28,21 +30,32 @@ static std::shared_ptr<impeller::Renderer> CreateImpellerRenderer(
 }
 
 GPUSurfaceMetalImpeller::GPUSurfaceMetalImpeller(GPUSurfaceMetalDelegate* delegate,
-                                                 const std::shared_ptr<impeller::Context>& context)
+                                                 const std::shared_ptr<impeller::Context>& context,
+                                                 bool render_to_surface)
     : delegate_(delegate),
+      render_target_type_(delegate->GetRenderTargetType()),
       impeller_renderer_(CreateImpellerRenderer(context)),
       aiks_context_(
-          std::make_shared<impeller::AiksContext>(impeller_renderer_ ? context : nullptr)) {}
+          std::make_shared<impeller::AiksContext>(impeller_renderer_ ? context : nullptr,
+                                                  impeller::TypographerContextSkia::Make())),
+      render_to_surface_(render_to_surface) {
+  // If this preference is explicitly set, we allow for disabling partial repaint.
+  NSNumber* disablePartialRepaint =
+      [[NSBundle mainBundle] objectForInfoDictionaryKey:@"FLTDisablePartialRepaint"];
+  if (disablePartialRepaint != nil) {
+    disable_partial_repaint_ = disablePartialRepaint.boolValue;
+  }
+}
 
 GPUSurfaceMetalImpeller::~GPUSurfaceMetalImpeller() = default;
 
 // |Surface|
 bool GPUSurfaceMetalImpeller::IsValid() {
-  return !!aiks_context_;
+  return !!aiks_context_ && aiks_context_->IsValid();
 }
 
 // |Surface|
-std::unique_ptr<SurfaceFrame> GPUSurfaceMetalImpeller::AcquireFrame(const SkISize& frame_info) {
+std::unique_ptr<SurfaceFrame> GPUSurfaceMetalImpeller::AcquireFrame(const SkISize& frame_size) {
   TRACE_EVENT0("impeller", "GPUSurfaceMetalImpeller::AcquireFrame");
 
   if (!IsValid()) {
@@ -50,7 +63,33 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceMetalImpeller::AcquireFrame(const SkISiz
     return nullptr;
   }
 
-  auto layer = delegate_->GetCAMetalLayer(frame_info);
+  if (frame_size.isEmpty()) {
+    FML_LOG(ERROR) << "Metal surface was asked for an empty frame.";
+    return nullptr;
+  }
+
+  if (!render_to_surface_) {
+    return std::make_unique<SurfaceFrame>(
+        nullptr, SurfaceFrame::FramebufferInfo(),
+        [](const SurfaceFrame& surface_frame, DlCanvas* canvas) { return true; }, frame_size);
+  }
+
+  switch (render_target_type_) {
+    case MTLRenderTargetType::kCAMetalLayer:
+      return AcquireFrameFromCAMetalLayer(frame_size);
+    case MTLRenderTargetType::kMTLTexture:
+      return AcquireFrameFromMTLTexture(frame_size);
+    default:
+      FML_CHECK(false) << "Unknown MTLRenderTargetType type.";
+  }
+
+  return nullptr;
+}
+
+std::unique_ptr<SurfaceFrame> GPUSurfaceMetalImpeller::AcquireFrameFromCAMetalLayer(
+    const SkISize& frame_size) {
+  auto layer = delegate_->GetCAMetalLayer(frame_size);
+
   if (!layer) {
     FML_LOG(ERROR) << "Invalid CAMetalLayer given by the embedder.";
     return nullptr;
@@ -58,14 +97,24 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceMetalImpeller::AcquireFrame(const SkISiz
 
   auto* mtl_layer = (CAMetalLayer*)layer;
 
-  auto surface = impeller::SurfaceMTL::WrapCurrentMetalLayerDrawable(
+  auto drawable = impeller::SurfaceMTL::GetMetalDrawableAndValidate(
       impeller_renderer_->GetContext(), mtl_layer);
+  if (!drawable) {
+    return nullptr;
+  }
+  if (Settings::kSurfaceDataAccessible) {
+    last_texture_.reset([drawable.texture retain]);
+  }
 
+  id<MTLTexture> last_texture = static_cast<id<MTLTexture>>(last_texture_);
   SurfaceFrame::SubmitCallback submit_callback =
-      fml::MakeCopyable([renderer = impeller_renderer_,  //
-                         aiks_context = aiks_context_,   //
-                         surface = std::move(surface)    //
-  ](SurfaceFrame& surface_frame, SkCanvas* canvas) mutable -> bool {
+      fml::MakeCopyable([damage = damage_,
+                         disable_partial_repaint = disable_partial_repaint_,  //
+                         renderer = impeller_renderer_,                       //
+                         aiks_context = aiks_context_,                        //
+                         drawable,                                            //
+                         last_texture                                         //
+  ](SurfaceFrame& surface_frame, DlCanvas* canvas) mutable -> bool {
         if (!aiks_context) {
           return false;
         }
@@ -76,24 +125,180 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceMetalImpeller::AcquireFrame(const SkISiz
           return false;
         }
 
-        impeller::DisplayListDispatcher impeller_dispatcher;
-        display_list->Dispatch(impeller_dispatcher);
+        if (!disable_partial_repaint && damage) {
+          uintptr_t texture = reinterpret_cast<uintptr_t>(last_texture);
+
+          for (auto& entry : *damage) {
+            if (entry.first != texture) {
+              // Accumulate damage for other framebuffers
+              if (surface_frame.submit_info().frame_damage) {
+                entry.second.join(*surface_frame.submit_info().frame_damage);
+              }
+            }
+          }
+          // Reset accumulated damage for current framebuffer
+          (*damage)[texture] = SkIRect::MakeEmpty();
+        }
+
+        std::optional<impeller::IRect> clip_rect;
+        if (surface_frame.submit_info().buffer_damage.has_value()) {
+          auto buffer_damage = surface_frame.submit_info().buffer_damage;
+          clip_rect = impeller::IRect::MakeXYWH(buffer_damage->x(), buffer_damage->y(),
+                                                buffer_damage->width(), buffer_damage->height());
+        }
+
+        auto surface = impeller::SurfaceMTL::MakeFromMetalLayerDrawable(renderer->GetContext(),
+                                                                        drawable, clip_rect);
+
+        // The surface may be null if we failed to allocate the onscreen render target
+        // due to running out of memory.
+        if (!surface) {
+          return false;
+        }
+
+        if (clip_rect && clip_rect->IsEmpty()) {
+          return surface->Present();
+        }
+
+        impeller::IRect cull_rect = surface->coverage();
+        SkIRect sk_cull_rect = SkIRect::MakeWH(cull_rect.GetWidth(), cull_rect.GetHeight());
+        impeller::DlDispatcher impeller_dispatcher(cull_rect);
+        display_list->Dispatch(impeller_dispatcher, sk_cull_rect);
         auto picture = impeller_dispatcher.EndRecordingAsPicture();
 
         return renderer->Render(
             std::move(surface),
             fml::MakeCopyable([aiks_context, picture = std::move(picture)](
                                   impeller::RenderTarget& render_target) -> bool {
-              return aiks_context->Render(picture, render_target);
+              return aiks_context->Render(picture, render_target, /*reset_host_buffer=*/true);
             }));
       });
 
-  return std::make_unique<SurfaceFrame>(nullptr,                          // surface
-                                        SurfaceFrame::FramebufferInfo{},  // framebuffer info
-                                        submit_callback,                  // submit callback
-                                        frame_info,                       // frame size
-                                        nullptr,                          // context result
-                                        true                              // display list fallback
+  SurfaceFrame::FramebufferInfo framebuffer_info;
+  framebuffer_info.supports_readback = true;
+
+  if (!disable_partial_repaint_) {
+    // Provide accumulated damage to rasterizer (area in current framebuffer that lags behind
+    // front buffer)
+    uintptr_t texture = reinterpret_cast<uintptr_t>(drawable.texture);
+    auto i = damage_->find(texture);
+    if (i != damage_->end()) {
+      framebuffer_info.existing_damage = i->second;
+    }
+    framebuffer_info.supports_partial_repaint = true;
+  }
+
+  return std::make_unique<SurfaceFrame>(nullptr,           // surface
+                                        framebuffer_info,  // framebuffer info
+                                        submit_callback,   // submit callback
+                                        frame_size,        // frame size
+                                        nullptr,           // context result
+                                        true               // display list fallback
+  );
+}
+
+std::unique_ptr<SurfaceFrame> GPUSurfaceMetalImpeller::AcquireFrameFromMTLTexture(
+    const SkISize& frame_size) {
+  GPUMTLTextureInfo texture_info = delegate_->GetMTLTexture(frame_size);
+  id<MTLTexture> mtl_texture = (id<MTLTexture>)(texture_info.texture);
+
+  if (!mtl_texture) {
+    FML_LOG(ERROR) << "Invalid MTLTexture given by the embedder.";
+    return nullptr;
+  }
+
+  if (Settings::kSurfaceDataAccessible) {
+    last_texture_.reset([mtl_texture retain]);
+  }
+
+  SurfaceFrame::SubmitCallback submit_callback =
+      fml::MakeCopyable([disable_partial_repaint = disable_partial_repaint_,  //
+                         damage = damage_,
+                         renderer = impeller_renderer_,  //
+                         aiks_context = aiks_context_,   //
+                         texture_info,                   //
+                         mtl_texture,                    //
+                         delegate = delegate_            //
+  ](SurfaceFrame& surface_frame, DlCanvas* canvas) mutable -> bool {
+        if (!aiks_context) {
+          return false;
+        }
+
+        auto display_list = surface_frame.BuildDisplayList();
+        if (!display_list) {
+          FML_LOG(ERROR) << "Could not build display list for surface frame.";
+          return false;
+        }
+
+        if (!disable_partial_repaint && damage) {
+          uintptr_t texture_ptr = reinterpret_cast<uintptr_t>(mtl_texture);
+
+          for (auto& entry : *damage) {
+            if (entry.first != texture_ptr) {
+              // Accumulate damage for other framebuffers
+              if (surface_frame.submit_info().frame_damage) {
+                entry.second.join(*surface_frame.submit_info().frame_damage);
+              }
+            }
+          }
+          // Reset accumulated damage for current framebuffer
+          (*damage)[texture_ptr] = SkIRect::MakeEmpty();
+        }
+
+        std::optional<impeller::IRect> clip_rect;
+        if (surface_frame.submit_info().buffer_damage.has_value()) {
+          auto buffer_damage = surface_frame.submit_info().buffer_damage;
+          clip_rect = impeller::IRect::MakeXYWH(buffer_damage->x(), buffer_damage->y(),
+                                                buffer_damage->width(), buffer_damage->height());
+        }
+
+        auto surface =
+            impeller::SurfaceMTL::MakeFromTexture(renderer->GetContext(), mtl_texture, clip_rect);
+
+        if (clip_rect && clip_rect->IsEmpty()) {
+          return surface->Present();
+        }
+
+        impeller::IRect cull_rect = surface->coverage();
+        SkIRect sk_cull_rect = SkIRect::MakeWH(cull_rect.GetWidth(), cull_rect.GetHeight());
+        impeller::DlDispatcher impeller_dispatcher(cull_rect);
+        display_list->Dispatch(impeller_dispatcher, sk_cull_rect);
+        auto picture = impeller_dispatcher.EndRecordingAsPicture();
+
+        bool render_result = renderer->Render(
+            std::move(surface),
+            fml::MakeCopyable([aiks_context, picture = std::move(picture)](
+                                  impeller::RenderTarget& render_target) -> bool {
+              return aiks_context->Render(picture, render_target, /*reset_host_buffer=*/true);
+            }));
+        if (!render_result) {
+          FML_LOG(ERROR) << "Failed to render Impeller frame";
+          return false;
+        }
+
+        return delegate->PresentTexture(texture_info);
+      });
+
+  SurfaceFrame::FramebufferInfo framebuffer_info;
+  framebuffer_info.supports_readback = true;
+
+  if (!disable_partial_repaint_) {
+    // Provide accumulated damage to rasterizer (area in current framebuffer that lags behind
+    // front buffer)
+    uintptr_t texture = reinterpret_cast<uintptr_t>(mtl_texture);
+    auto i = damage_->find(texture);
+    if (i != damage_->end()) {
+      framebuffer_info.existing_damage = i->second;
+    }
+    framebuffer_info.supports_partial_repaint = true;
+  }
+
+  return std::make_unique<SurfaceFrame>(nullptr,           // surface
+                                        framebuffer_info,  // framebuffer info
+                                        submit_callback,   // submit callback
+                                        frame_size,        // frame size
+                                        nullptr,           // context result
+                                        true               // display list fallback
   );
 }
 
@@ -125,8 +330,50 @@ bool GPUSurfaceMetalImpeller::EnableRasterCache() const {
 }
 
 // |Surface|
-impeller::AiksContext* GPUSurfaceMetalImpeller::GetAiksContext() const {
-  return aiks_context_.get();
+std::shared_ptr<impeller::AiksContext> GPUSurfaceMetalImpeller::GetAiksContext() const {
+  return aiks_context_;
+}
+
+Surface::SurfaceData GPUSurfaceMetalImpeller::GetSurfaceData() const {
+  if (!(last_texture_ && [last_texture_ conformsToProtocol:@protocol(MTLTexture)])) {
+    return {};
+  }
+  id<MTLTexture> texture = last_texture_.get();
+  int bytesPerPixel = 0;
+  std::string pixel_format;
+  switch (texture.pixelFormat) {
+    case MTLPixelFormatBGR10_XR:
+      bytesPerPixel = 4;
+      pixel_format = "MTLPixelFormatBGR10_XR";
+      break;
+    case MTLPixelFormatBGRA10_XR:
+      bytesPerPixel = 8;
+      pixel_format = "MTLPixelFormatBGRA10_XR";
+      break;
+    case MTLPixelFormatBGRA8Unorm:
+      bytesPerPixel = 4;
+      pixel_format = "MTLPixelFormatBGRA8Unorm";
+      break;
+    case MTLPixelFormatRGBA16Float:
+      bytesPerPixel = 8;
+      pixel_format = "MTLPixelFormatRGBA16Float";
+      break;
+    default:
+      return {};
+  }
+
+  // Zero initialized so that errors are easier to find at the cost of
+  // performance.
+  sk_sp<SkData> result =
+      SkData::MakeZeroInitialized(texture.width * texture.height * bytesPerPixel);
+  [texture getBytes:result->writable_data()
+        bytesPerRow:texture.width * bytesPerPixel
+         fromRegion:MTLRegionMake2D(0, 0, texture.width, texture.height)
+        mipmapLevel:0];
+  return {
+      .pixel_format = pixel_format,
+      .data = result,
+  };
 }
 
 }  // namespace flutter
diff --git a/shell/gpu/gpu_surface_metal_impeller_unittests.mm b/shell/gpu/gpu_surface_metal_impeller_unittests.mm
new file mode 100644
index 0000000000000000000000000000000000000000..383d57b2c666dbaf84ad7976d0722e3596501d43
--- /dev/null
+++ b/shell/gpu/gpu_surface_metal_impeller_unittests.mm
@@ -0,0 +1,101 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <Foundation/Foundation.h>
+#include <QuartzCore/QuartzCore.h>
+
+#include "flutter/shell/gpu/gpu_surface_metal_impeller.h"
+#include "gtest/gtest.h"
+#include "impeller/entity/mtl/entity_shaders.h"
+#include "impeller/entity/mtl/framebuffer_blend_shaders.h"
+#include "impeller/entity/mtl/modern_shaders.h"
+#include "impeller/renderer/backend/metal/context_mtl.h"
+
+namespace flutter {
+namespace testing {
+
+class TestGPUSurfaceMetalDelegate : public GPUSurfaceMetalDelegate {
+ public:
+  TestGPUSurfaceMetalDelegate() : GPUSurfaceMetalDelegate(MTLRenderTargetType::kCAMetalLayer) {
+    layer_ = [[CAMetalLayer alloc] init];
+  }
+
+  ~TestGPUSurfaceMetalDelegate() = default;
+
+  GPUCAMetalLayerHandle GetCAMetalLayer(const SkISize& frame_info) const override {
+    layer_.drawableSize = CGSizeMake(frame_info.width(), frame_info.height());
+    return (__bridge GPUCAMetalLayerHandle)(layer_);
+  }
+
+  bool PresentDrawable(GrMTLHandle drawable) const override { return true; }
+
+  GPUMTLTextureInfo GetMTLTexture(const SkISize& frame_info) const override { return {}; }
+
+  bool PresentTexture(GPUMTLTextureInfo texture) const override { return true; }
+
+  bool AllowsDrawingWhenGpuDisabled() const override { return true; }
+
+  void SetDevice() { layer_.device = ::MTLCreateSystemDefaultDevice(); }
+
+ private:
+  CAMetalLayer* layer_ = nil;
+};
+
+static std::shared_ptr<impeller::ContextMTL> CreateImpellerContext() {
+  std::vector<std::shared_ptr<fml::Mapping>> shader_mappings = {
+      std::make_shared<fml::NonOwnedMapping>(impeller_entity_shaders_data,
+                                             impeller_entity_shaders_length),
+      std::make_shared<fml::NonOwnedMapping>(impeller_modern_shaders_data,
+                                             impeller_modern_shaders_length),
+      std::make_shared<fml::NonOwnedMapping>(impeller_framebuffer_blend_shaders_data,
+                                             impeller_framebuffer_blend_shaders_length),
+  };
+  auto sync_switch = std::make_shared<fml::SyncSwitch>(false);
+  return impeller::ContextMTL::Create(shader_mappings, sync_switch, "Impeller Library");
+}
+
+TEST(GPUSurfaceMetalImpeller, InvalidImpellerContextCreatesCausesSurfaceToBeInvalid) {
+  auto delegate = std::make_shared<TestGPUSurfaceMetalDelegate>();
+  auto surface = std::make_shared<GPUSurfaceMetalImpeller>(delegate.get(), nullptr);
+
+  ASSERT_FALSE(surface->IsValid());
+}
+
+TEST(GPUSurfaceMetalImpeller, CanCreateValidSurface) {
+  auto delegate = std::make_shared<TestGPUSurfaceMetalDelegate>();
+  auto surface = std::make_shared<GPUSurfaceMetalImpeller>(delegate.get(), CreateImpellerContext());
+
+  ASSERT_TRUE(surface->IsValid());
+}
+
+TEST(GPUSurfaceMetalImpeller, AcquireFrameFromCAMetalLayerNullChecksDrawable) {
+  auto delegate = std::make_shared<TestGPUSurfaceMetalDelegate>();
+  std::shared_ptr<Surface> surface =
+      std::make_shared<GPUSurfaceMetalImpeller>(delegate.get(), CreateImpellerContext());
+
+  ASSERT_TRUE(surface->IsValid());
+
+  auto frame = surface->AcquireFrame(SkISize::Make(100, 100));
+  ASSERT_EQ(frame, nullptr);
+}
+
+TEST(GPUSurfaceMetalImpeller, AcquireFrameFromCAMetalLayerDoesNotRetainThis) {
+  auto delegate = std::make_shared<TestGPUSurfaceMetalDelegate>();
+  delegate->SetDevice();
+  std::unique_ptr<Surface> surface =
+      std::make_unique<GPUSurfaceMetalImpeller>(delegate.get(), CreateImpellerContext());
+
+  ASSERT_TRUE(surface->IsValid());
+
+  auto frame = surface->AcquireFrame(SkISize::Make(100, 100));
+  ASSERT_TRUE(frame);
+
+  // Simulate a rasterizer teardown, e.g. due to going to the background.
+  surface.reset();
+
+  ASSERT_TRUE(frame->Submit());
+}
+
+}  // namespace testing
+}  // namespace flutter
diff --git a/shell/gpu/gpu_surface_metal_skia.h b/shell/gpu/gpu_surface_metal_skia.h
index 1628b60098c9522decaa890128842e95c5cc13a0..21a229ac9b7c217db069fb94d7a357c480f9324c 100644
--- a/shell/gpu/gpu_surface_metal_skia.h
+++ b/shell/gpu/gpu_surface_metal_skia.h
@@ -2,15 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_GPU_GPU_SURFACE_METAL_H_
-#define FLUTTER_SHELL_GPU_GPU_SURFACE_METAL_H_
+#ifndef FLUTTER_SHELL_GPU_GPU_SURFACE_METAL_SKIA_H_
+#define FLUTTER_SHELL_GPU_GPU_SURFACE_METAL_SKIA_H_
 
 #include "flutter/common/graphics/msaa_sample_count.h"
 #include "flutter/flow/surface.h"
 #include "flutter/fml/macros.h"
 #include "flutter/shell/gpu/gpu_surface_metal_delegate.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
-#include "third_party/skia/include/gpu/mtl/GrMtlTypes.h"
 
 namespace flutter {
 
@@ -72,4 +71,4 @@ class SK_API_AVAILABLE_CA_METAL_LAYER GPUSurfaceMetalSkia : public Surface {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_GPU_GPU_SURFACE_METAL_H_
+#endif  // FLUTTER_SHELL_GPU_GPU_SURFACE_METAL_SKIA_H_
diff --git a/shell/gpu/gpu_surface_metal_skia.mm b/shell/gpu/gpu_surface_metal_skia.mm
index 8e92d81ae27c8cc210d4a3290cec721a80965046..652891c9acbd68668d1ee3829fc941a241850177 100644
--- a/shell/gpu/gpu_surface_metal_skia.mm
+++ b/shell/gpu/gpu_surface_metal_skia.mm
@@ -24,7 +24,9 @@
 #include "third_party/skia/include/core/SkSize.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/core/SkSurfaceProps.h"
+#include "third_party/skia/include/gpu/GpuTypes.h"
 #include "third_party/skia/include/gpu/GrBackendSurface.h"
+#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
 #include "third_party/skia/include/ports/SkCFObject.h"
 
 static_assert(!__has_feature(objc_arc), "ARC must be disabled.");
@@ -38,13 +40,15 @@ sk_sp<SkSurface> CreateSurfaceFromMetalTexture(GrDirectContext* context,
                                                MsaaSampleCount sample_cnt,
                                                SkColorType color_type,
                                                sk_sp<SkColorSpace> color_space,
-                                               const SkSurfaceProps* props) {
+                                               const SkSurfaceProps* props,
+                                               SkSurfaces::TextureReleaseProc release_proc,
+                                               SkSurface::ReleaseContext release_context) {
   GrMtlTextureInfo info;
   info.fTexture.reset([texture retain]);
-  GrBackendTexture backend_texture(texture.width, texture.height, GrMipmapped::kNo, info);
-  return SkSurface::MakeFromBackendTexture(context, backend_texture, origin,
-                                           static_cast<int>(sample_cnt), color_type,
-                                           std::move(color_space), props);
+  GrBackendTexture backend_texture(texture.width, texture.height, skgpu::Mipmapped::kNo, info);
+  return SkSurfaces::WrapBackendTexture(
+      context, backend_texture, origin, static_cast<int>(sample_cnt), color_type,
+      std::move(color_space), props, release_proc, release_context);
 }
 }  // namespace
 
@@ -97,7 +101,7 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceMetalSkia::AcquireFrame(const SkISize& f
   if (!render_to_surface_) {
     return std::make_unique<SurfaceFrame>(
         nullptr, SurfaceFrame::FramebufferInfo(),
-        [](const SurfaceFrame& surface_frame, SkCanvas* canvas) { return true; }, frame_size);
+        [](const SurfaceFrame& surface_frame, DlCanvas* canvas) { return true; }, frame_size);
   }
 
   PrecompileKnownSkSLsIfNecessary();
@@ -137,7 +141,9 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceMetalSkia::AcquireFrameFromCAMetalLayer(
                                                msaa_samples_,             // sample count
                                                kBGRA_8888_SkColorType,    // color type
                                                nullptr,                   // colorspace
-                                               nullptr                    // surface properties
+                                               nullptr,                   // surface properties
+                                               nullptr,                   // release proc
+                                               nullptr                    // release context
   );
 
   if (!surface) {
@@ -146,7 +152,7 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceMetalSkia::AcquireFrameFromCAMetalLayer(
   }
 
   auto submit_callback = [this, drawable](const SurfaceFrame& surface_frame,
-                                          SkCanvas* canvas) -> bool {
+                                          DlCanvas* canvas) -> bool {
     TRACE_EVENT0("flutter", "GPUSurfaceMetal::Submit");
     if (canvas == nullptr) {
       FML_DLOG(ERROR) << "Canvas not available.";
@@ -155,7 +161,7 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceMetalSkia::AcquireFrameFromCAMetalLayer(
 
     {
       TRACE_EVENT0("flutter", "SkCanvas::Flush");
-      canvas->flush();
+      canvas->Flush();
     }
 
     if (!disable_partial_repaint_) {
@@ -203,9 +209,10 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceMetalSkia::AcquireFrameFromMTLTexture(
     return nullptr;
   }
 
-  sk_sp<SkSurface> surface =
-      CreateSurfaceFromMetalTexture(context_.get(), mtl_texture, kTopLeft_GrSurfaceOrigin,
-                                    msaa_samples_, kBGRA_8888_SkColorType, nullptr, nullptr);
+  sk_sp<SkSurface> surface = CreateSurfaceFromMetalTexture(
+      context_.get(), mtl_texture, kTopLeft_GrSurfaceOrigin, msaa_samples_, kBGRA_8888_SkColorType,
+      nullptr, nullptr, static_cast<SkSurfaces::TextureReleaseProc>(texture.destruction_callback),
+      texture.destruction_context);
 
   if (!surface) {
     FML_LOG(ERROR) << "Could not create the SkSurface from the metal texture.";
@@ -213,7 +220,7 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceMetalSkia::AcquireFrameFromMTLTexture(
   }
 
   auto submit_callback = [texture = texture, delegate = delegate_](
-                             const SurfaceFrame& surface_frame, SkCanvas* canvas) -> bool {
+                             const SurfaceFrame& surface_frame, DlCanvas* canvas) -> bool {
     TRACE_EVENT0("flutter", "GPUSurfaceMetal::PresentTexture");
     if (canvas == nullptr) {
       FML_DLOG(ERROR) << "Canvas not available.";
@@ -222,7 +229,7 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceMetalSkia::AcquireFrameFromMTLTexture(
 
     {
       TRACE_EVENT0("flutter", "SkCanvas::Flush");
-      canvas->flush();
+      canvas->Flush();
     }
 
     return delegate->PresentTexture(texture);
diff --git a/shell/gpu/gpu_surface_software.cc b/shell/gpu/gpu_surface_software.cc
index 78b28e0545ffa74f62cb7b5bb1077f6fb86869dd..8b90ea240bc0d4c5bf6b5535fc83a08f0195ccda 100644
--- a/shell/gpu/gpu_surface_software.cc
+++ b/shell/gpu/gpu_surface_software.cc
@@ -5,8 +5,11 @@
 #include "flutter/shell/gpu/gpu_surface_software.h"
 
 #include <memory>
+
 #include "flutter/fml/logging.h"
 
+#include "third_party/skia/include/core/SkSurface.h"
+
 namespace flutter {
 
 GPUSurfaceSoftware::GPUSurfaceSoftware(GPUSurfaceSoftwareDelegate* delegate,
@@ -34,7 +37,7 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceSoftware::AcquireFrame(
   if (!render_to_surface_) {
     return std::make_unique<SurfaceFrame>(
         nullptr, framebuffer_info,
-        [](const SurfaceFrame& surface_frame, SkCanvas* canvas) {
+        [](const SurfaceFrame& surface_frame, DlCanvas* canvas) {
           return true;
         },
         logical_size);
@@ -68,8 +71,7 @@ FML_DLOG(INFO) << "AcquireFrame";
 FML_DLOG(INFO) << "resetMatrix end";
   SurfaceFrame::SubmitCallback on_submit =
       [self = weak_factory_.GetWeakPtr()](const SurfaceFrame& surface_frame,
-                                          SkCanvas* canvas) -> bool {
-                                            FML_DLOG(INFO) << "on_submit  start";
+                                          DlCanvas* canvas) -> bool {
     // If the surface itself went away, there is nothing more to do.
     FML_DLOG(INFO) <<"AcquireFrame ... on_submit ..." ;
     if (!self || !self->IsValid() || canvas == nullptr) {
@@ -78,7 +80,7 @@ FML_DLOG(INFO) << "resetMatrix end";
     }
     FML_DLOG(INFO) <<"AcquireFrame ... on_submit canvas->flush " ;
 
-    canvas->flush();
+    canvas->Flush();
 
     FML_DLOG(INFO) <<"AcquireFrame ... delegate_-->PresentBackingStore" ;
     return self->delegate_->PresentBackingStore(surface_frame.SkiaSurface());
diff --git a/shell/gpu/gpu_surface_vulkan.cc b/shell/gpu/gpu_surface_vulkan.cc
index ba8383c1343cf63020cb05440406d3b285fe206a..63f1359722c1783c8af146ee9e73ec068721fe68 100644
--- a/shell/gpu/gpu_surface_vulkan.cc
+++ b/shell/gpu/gpu_surface_vulkan.cc
@@ -5,9 +5,15 @@
 #include "flutter/shell/gpu/gpu_surface_vulkan.h"
 
 #include "flutter/fml/logging.h"
-#include "fml/trace_event.h"
-#include "include/core/SkColorSpace.h"
-#include "include/core/SkSize.h"
+#include "flutter/fml/trace_event.h"
+
+#include "third_party/skia/include/core/SkColorSpace.h"
+#include "third_party/skia/include/core/SkSize.h"
+#include "third_party/skia/include/core/SkSurface.h"
+#include "third_party/skia/include/gpu/GrBackendSurface.h"
+#include "third_party/skia/include/gpu/GrDirectContext.h"
+#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
+#include "third_party/skia/include/gpu/ganesh/vk/GrVkBackendSurface.h"
 #include "vulkan/vulkan_core.h"
 
 namespace flutter {
@@ -41,7 +47,7 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceVulkan::AcquireFrame(
   if (!render_to_surface_) {
     return std::make_unique<SurfaceFrame>(
         nullptr, SurfaceFrame::FramebufferInfo(),
-        [](const SurfaceFrame& surface_frame, SkCanvas* canvas) {
+        [](const SurfaceFrame& surface_frame, DlCanvas* canvas) {
           return true;
         },
         frame_size);
@@ -63,14 +69,14 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceVulkan::AcquireFrame(
 
   SurfaceFrame::SubmitCallback callback = [image = image, delegate = delegate_](
                                               const SurfaceFrame&,
-                                              SkCanvas* canvas) -> bool {
+                                              DlCanvas* canvas) -> bool {
     TRACE_EVENT0("flutter", "GPUSurfaceVulkan::PresentImage");
     if (canvas == nullptr) {
       FML_DLOG(ERROR) << "Canvas not available.";
       return false;
     }
 
-    canvas->flush();
+    canvas->Flush();
 
     return delegate->PresentImage(reinterpret_cast<VkImage>(image.image),
                                   static_cast<VkFormat>(image.format));
@@ -98,6 +104,7 @@ sk_sp<SkSurface> GPUSurfaceVulkan::CreateSurfaceFromVulkanImage(
     const VkImage image,
     const VkFormat format,
     const SkISize& size) {
+#ifdef SK_VULKAN
   GrVkImageInfo image_info = {
       .fImage = image,
       .fImageTiling = VK_IMAGE_TILING_OPTIMAL,
@@ -110,14 +117,12 @@ sk_sp<SkSurface> GPUSurfaceVulkan::CreateSurfaceFromVulkanImage(
       .fSampleCount = 1,
       .fLevelCount = 1,
   };
-  GrBackendTexture backend_texture(size.width(),   //
-                                   size.height(),  //
-                                   image_info      //
-  );
+  auto backend_texture =
+      GrBackendTextures::MakeVk(size.width(), size.height(), image_info);
 
   SkSurfaceProps surface_properties(0, kUnknown_SkPixelGeometry);
 
-  return SkSurface::MakeFromBackendTexture(
+  return SkSurfaces::WrapBackendTexture(
       skia_context_.get(),          // context
       backend_texture,              // back-end texture
       kTopLeft_GrSurfaceOrigin,     // surface origin
@@ -126,6 +131,9 @@ sk_sp<SkSurface> GPUSurfaceVulkan::CreateSurfaceFromVulkanImage(
       SkColorSpace::MakeSRGB(),     // color space
       &surface_properties           // surface properties
   );
+#else
+  return nullptr;
+#endif  // SK_VULKAN
 }
 
 SkColorType GPUSurfaceVulkan::ColorTypeFromFormat(const VkFormat format) {
diff --git a/shell/gpu/gpu_surface_vulkan.h b/shell/gpu/gpu_surface_vulkan.h
index b281ac8c0f1605426138a5868d786b1c187afb8d..69da9500393d15048d25b9c5d93ab1dbc23567ea 100644
--- a/shell/gpu/gpu_surface_vulkan.h
+++ b/shell/gpu/gpu_surface_vulkan.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_GPU_GPU_SURFACE_VULKAN_H_
-#define SHELL_GPU_GPU_SURFACE_VULKAN_H_
+#ifndef FLUTTER_SHELL_GPU_GPU_SURFACE_VULKAN_H_
+#define FLUTTER_SHELL_GPU_GPU_SURFACE_VULKAN_H_
 
 #include <memory>
 
@@ -14,7 +14,9 @@
 #include "flutter/vulkan/vulkan_backbuffer.h"
 #include "flutter/vulkan/vulkan_native_surface.h"
 #include "flutter/vulkan/vulkan_window.h"
-#include "include/core/SkRefCnt.h"
+
+#include "third_party/skia/include/core/SkRefCnt.h"
+#include "third_party/skia/include/core/SkSurface.h"
 
 namespace flutter {
 
@@ -64,4 +66,4 @@ class GPUSurfaceVulkan : public Surface {
 
 }  // namespace flutter
 
-#endif  // SHELL_GPU_GPU_SURFACE_VULKAN_H_
+#endif  // FLUTTER_SHELL_GPU_GPU_SURFACE_VULKAN_H_
diff --git a/shell/gpu/gpu_surface_vulkan_impeller.cc b/shell/gpu/gpu_surface_vulkan_impeller.cc
index 6717c3f8b1c3f961cccba96d27d405bca85f253a..cf2733baab5ea6eeab314fb2d039b3d954b4d603 100644
--- a/shell/gpu/gpu_surface_vulkan_impeller.cc
+++ b/shell/gpu/gpu_surface_vulkan_impeller.cc
@@ -5,15 +5,16 @@
 #include "flutter/shell/gpu/gpu_surface_vulkan_impeller.h"
 
 #include "flutter/fml/make_copyable.h"
-#include "flutter/impeller/display_list/display_list_dispatcher.h"
-#include "flutter/impeller/renderer/renderer.h"
-#include "impeller/renderer/backend/vulkan/context_vk.h"
+#include "impeller/display_list/dl_dispatcher.h"
+#include "impeller/renderer/backend/vulkan/surface_context_vk.h"
+#include "impeller/renderer/renderer.h"
+#include "impeller/renderer/surface.h"
+#include "impeller/typographer/backends/skia/typographer_context_skia.h"
 
 namespace flutter {
 
 GPUSurfaceVulkanImpeller::GPUSurfaceVulkanImpeller(
-    std::shared_ptr<impeller::Context> context)
-    : weak_factory_(this) {
+    std::shared_ptr<impeller::Context> context) {
   if (!context || !context->IsValid()) {
     return;
   }
@@ -23,7 +24,8 @@ GPUSurfaceVulkanImpeller::GPUSurfaceVulkanImpeller(
     return;
   }
 
-  auto aiks_context = std::make_shared<impeller::AiksContext>(context);
+  auto aiks_context = std::make_shared<impeller::AiksContext>(
+      context, impeller::TypographerContextSkia::Make());
   if (!aiks_context->IsValid()) {
     return;
   }
@@ -55,23 +57,19 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceVulkanImpeller::AcquireFrame(
     return nullptr;
   }
 
-  auto& context_vk = impeller::ContextVK::Cast(*impeller_context_);
-  std::unique_ptr<impeller::Surface> surface =
-      context_vk.AcquireSurface(frame_num_++);
+  auto& context_vk = impeller::SurfaceContextVK::Cast(*impeller_context_);
+  std::unique_ptr<impeller::Surface> surface = context_vk.AcquireNextSurface();
 
-  auto swap_callback = [weak = weak_factory_.GetWeakPtr()]() -> bool {
-    if (weak) {
-      // TODO (kaushikiska@): Invoke the clean-up callback.
-      // Blocked by - https://github.com/flutter/flutter/issues/112387
-    }
-    return true;
-  };
+  if (!surface) {
+    FML_LOG(ERROR) << "No surface available.";
+    return nullptr;
+  }
 
   SurfaceFrame::SubmitCallback submit_callback =
       fml::MakeCopyable([renderer = impeller_renderer_,  //
                          aiks_context = aiks_context_,   //
                          surface = std::move(surface)    //
-  ](SurfaceFrame& surface_frame, SkCanvas* canvas) mutable -> bool {
+  ](SurfaceFrame& surface_frame, DlCanvas* canvas) mutable -> bool {
         if (!aiks_context) {
           return false;
         }
@@ -82,8 +80,13 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceVulkanImpeller::AcquireFrame(
           return false;
         }
 
-        impeller::DisplayListDispatcher impeller_dispatcher;
-        display_list->Dispatch(impeller_dispatcher);
+        auto cull_rect =
+            surface->GetTargetRenderPassDescriptor().GetRenderTargetSize();
+        impeller::Rect dl_cull_rect = impeller::Rect::MakeSize(cull_rect);
+        impeller::DlDispatcher impeller_dispatcher(dl_cull_rect);
+        display_list->Dispatch(
+            impeller_dispatcher,
+            SkIRect::MakeWH(cull_rect.width, cull_rect.height));
         auto picture = impeller_dispatcher.EndRecordingAsPicture();
 
         return renderer->Render(
@@ -91,7 +94,8 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceVulkanImpeller::AcquireFrame(
             fml::MakeCopyable(
                 [aiks_context, picture = std::move(picture)](
                     impeller::RenderTarget& render_target) -> bool {
-                  return aiks_context->Render(picture, render_target);
+                  return aiks_context->Render(picture, render_target,
+                                              /*reset_host_buffer=*/true);
                 }));
       });
 
@@ -131,8 +135,9 @@ bool GPUSurfaceVulkanImpeller::EnableRasterCache() const {
 }
 
 // |Surface|
-impeller::AiksContext* GPUSurfaceVulkanImpeller::GetAiksContext() const {
-  return aiks_context_.get();
+std::shared_ptr<impeller::AiksContext>
+GPUSurfaceVulkanImpeller::GetAiksContext() const {
+  return aiks_context_;
 }
 
 }  // namespace flutter
diff --git a/shell/gpu/gpu_surface_vulkan_impeller.h b/shell/gpu/gpu_surface_vulkan_impeller.h
index def6198620a060692e78786d637e6eb31e9e5bc1..3ddb106fa7c49d9fa8db45421f33366695065875 100644
--- a/shell/gpu/gpu_surface_vulkan_impeller.h
+++ b/shell/gpu/gpu_surface_vulkan_impeller.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_SHELL_GPU_GPU_SURFACE_VULKAN_IMPELLER_H_
+#define FLUTTER_SHELL_GPU_GPU_SURFACE_VULKAN_IMPELLER_H_
 
 #include "flutter/common/graphics/gl_context_switch.h"
 #include "flutter/flow/surface.h"
@@ -29,8 +30,6 @@ class GPUSurfaceVulkanImpeller final : public Surface {
   std::shared_ptr<impeller::Renderer> impeller_renderer_;
   std::shared_ptr<impeller::AiksContext> aiks_context_;
   bool is_valid_ = false;
-  uint64_t frame_num_ = 0;
-  fml::WeakPtrFactory<GPUSurfaceVulkanImpeller> weak_factory_;
 
   // |Surface|
   std::unique_ptr<SurfaceFrame> AcquireFrame(const SkISize& size) override;
@@ -48,9 +47,11 @@ class GPUSurfaceVulkanImpeller final : public Surface {
   bool EnableRasterCache() const override;
 
   // |Surface|
-  impeller::AiksContext* GetAiksContext() const override;
+  std::shared_ptr<impeller::AiksContext> GetAiksContext() const override;
 
   FML_DISALLOW_COPY_AND_ASSIGN(GPUSurfaceVulkanImpeller);
 };
 
 }  // namespace flutter
+
+#endif  // FLUTTER_SHELL_GPU_GPU_SURFACE_VULKAN_IMPELLER_H_
diff --git a/shell/platform/BUILD.gn b/shell/platform/BUILD.gn
index 8af1e768590fd9303dcc0cbc83ac7c0bfc1fb619..828cf8d84db884e0662f82e34846d1ffd6f423b3 100644
--- a/shell/platform/BUILD.gn
+++ b/shell/platform/BUILD.gn
@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/fuchsia/sdk.gni")
 import("//flutter/shell/platform/config.gni")
 
 group("platform") {
@@ -23,6 +22,7 @@ group("platform") {
       deps += [ "windows" ]
     }
   } else if (is_fuchsia) {
+    import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
     deps = [ "fuchsia" ]
   } else {
     assert(false, "Unknown/Unsupported platform.")
diff --git a/shell/platform/android/AndroidManifest.xml b/shell/platform/android/AndroidManifest.xml
index 5fbd0d8553c2b1c2e3e3ca71928406e5c084ec64..aca92f0ec7887cb3ba474261a8cae581edcdbec9 100644
--- a/shell/platform/android/AndroidManifest.xml
+++ b/shell/platform/android/AndroidManifest.xml
@@ -5,7 +5,7 @@
  -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="io.flutter.app" android:versionCode="1" android:versionName="0.0.1">
 
-    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="31" />
+    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="34" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-feature android:name="android.hardware.sensor.accelerometer" android:required="true" />
@@ -24,4 +24,12 @@
             </intent-filter>
         </activity>
     </application>
+
+    <!-- Required for io.flutter.plugin.text.ProcessTextPlugin to query activities that can process text. -->
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.PROCESS_TEXT" />
+            <data android:mimeType="text/plain" />
+        </intent>
+    </queries>
  </manifest>
diff --git a/shell/platform/android/BUILD.gn b/shell/platform/android/BUILD.gn
index 2da0fe0e893f3905b0c48441265017053028eb3f..b1a0f428e860bdae48d114fa459ed3b25326b65d 100644
--- a/shell/platform/android/BUILD.gn
+++ b/shell/platform/android/BUILD.gn
@@ -4,11 +4,14 @@
 
 import("//build/config/android/config.gni")
 import("//build/toolchain/clang.gni")
+import("//flutter/build/bin_to_obj.gni")
 import("//flutter/build/zip_bundle.gni")
 import("//flutter/common/config.gni")
+import("//flutter/impeller/tools/impeller.gni")
 import("//flutter/shell/config.gni")
 import("//flutter/shell/gpu/gpu.gni")
 import("//flutter/shell/version/version.gni")
+import("//flutter/vulkan/config.gni")
 
 shell_gpu_configuration("android_gpu_configuration") {
   enable_software = true
@@ -26,7 +29,7 @@ source_set("image_generator") {
   deps = [
     "//flutter/fml",
     "//flutter/lib/ui:ui",
-    "//third_party/skia",
+    "//flutter/skia",
   ]
 
   libs = [
@@ -39,44 +42,55 @@ executable("flutter_shell_native_unittests") {
   visibility = [ "*" ]
   testonly = true
   sources = [
+    "android_context_gl_impeller_unittests.cc",
     "android_context_gl_unittests.cc",
     "android_shell_holder_unittests.cc",
     "apk_asset_provider_unittests.cc",
     "flutter_shell_native_unittests.cc",
+    "image_lru_unittests.cc",
+    "platform_view_android_unittests.cc",
   ]
   public_configs = [ "//flutter:config" ]
   deps = [
     ":flutter_shell_native_src",
-    "//third_party/googletest:gmock",
-    "//third_party/googletest:gtest",
+    "//flutter/fml",
+    "//flutter/shell/platform/android/jni:jni_mock",
+    "//flutter/third_party/googletest:gmock",
+    "//flutter/third_party/googletest:gtest",
   ]
 }
 
 shared_library("flutter_shell_native") {
+  inputs = [ "android_exports.lst" ]
   output_name = "flutter"
   deps = [ ":flutter_shell_native_src" ]
   ldflags = [ "-Wl,--version-script=" + rebase_path("android_exports.lst") ]
 }
 
+bin_to_assembly("icudtl_asm") {
+  deps = []
+  input = "//flutter/third_party/icu/flutter/icudtl.dat"
+  symbol = "_binary_icudtl_dat_start"
+  size_symbol = "_binary_icudtl_dat_size"
+  executable = false
+}
+
 source_set("flutter_shell_native_src") {
   visibility = [ ":*" ]
 
   sources = [
-    "$root_build_dir/flutter_icu/icudtl.o",
-    "android_choreographer.cc",
-    "android_choreographer.h",
     "android_context_gl_impeller.cc",
     "android_context_gl_impeller.h",
     "android_context_gl_skia.cc",
     "android_context_gl_skia.h",
+    "android_context_vulkan_impeller.cc",
+    "android_context_vulkan_impeller.h",
     "android_display.cc",
     "android_display.h",
     "android_egl_surface.cc",
     "android_egl_surface.h",
     "android_environment_gl.cc",
     "android_environment_gl.h",
-    "android_external_texture_gl.cc",
-    "android_external_texture_gl.h",
     "android_shell_holder.cc",
     "android_shell_holder.h",
     "android_surface_gl_impeller.cc",
@@ -91,6 +105,14 @@ source_set("flutter_shell_native_src") {
     "apk_asset_provider.h",
     "flutter_main.cc",
     "flutter_main.h",
+    "image_external_texture.cc",
+    "image_external_texture.h",
+    "image_external_texture_gl.cc",
+    "image_external_texture_gl.h",
+    "image_external_texture_vk.cc",
+    "image_external_texture_vk.h",
+    "image_lru.cc",
+    "image_lru.h",
     "library_loader.cc",
     "platform_message_handler_android.cc",
     "platform_message_handler_android.h",
@@ -100,13 +122,19 @@ source_set("flutter_shell_native_src") {
     "platform_view_android.h",
     "platform_view_android_jni_impl.cc",
     "platform_view_android_jni_impl.h",
+    "surface_texture_external_texture.cc",
+    "surface_texture_external_texture.h",
+    "surface_texture_external_texture_gl.cc",
+    "surface_texture_external_texture_gl.h",
     "vsync_waiter_android.cc",
     "vsync_waiter_android.h",
   ]
 
+  sources += get_target_outputs(":icudtl_asm")
+
   public_deps = [
     ":android_gpu_configuration",
-    ":icudtl_object",
+    ":icudtl_asm",
     ":image_generator",
     "//flutter/assets",
     "//flutter/common",
@@ -114,7 +142,9 @@ source_set("flutter_shell_native_src") {
     "//flutter/flow",
     "//flutter/fml",
     "//flutter/impeller",
+    "//flutter/impeller/toolkit/android",
     "//flutter/impeller/toolkit/egl",
+    "//flutter/impeller/toolkit/gles",
     "//flutter/lib/ui",
     "//flutter/runtime",
     "//flutter/runtime:libdart",
@@ -125,8 +155,9 @@ source_set("flutter_shell_native_src") {
     "//flutter/shell/platform/android/platform_view_android_delegate",
     "//flutter/shell/platform/android/surface",
     "//flutter/shell/platform/android/surface:native_window",
+    "//flutter/skia",
+    "//flutter/third_party/txt",
     "//flutter/vulkan",
-    "//third_party/skia",
   ]
 
   public_configs = [ "//flutter:config" ]
@@ -163,6 +194,7 @@ embedding_sources_jar_filename = "$embedding_artifact_id-sources.jar"
 embedding_source_jar_path = "$root_out_dir/$embedding_sources_jar_filename"
 
 android_java_sources = [
+  "io/flutter/Build.java",
   "io/flutter/FlutterInjector.java",
   "io/flutter/Log.java",
   "io/flutter/app/FlutterActivity.java",
@@ -173,7 +205,6 @@ android_java_sources = [
   "io/flutter/app/FlutterPlayStoreSplitApplication.java",
   "io/flutter/app/FlutterPluginRegistry.java",
   "io/flutter/embedding/android/AndroidTouchProcessor.java",
-  "io/flutter/embedding/android/DrawableSplashScreen.java",
   "io/flutter/embedding/android/ExclusiveAppComponent.java",
   "io/flutter/embedding/android/FlutterActivity.java",
   "io/flutter/embedding/android/FlutterActivityAndFragmentDelegate.java",
@@ -184,7 +215,6 @@ android_java_sources = [
   "io/flutter/embedding/android/FlutterFragmentActivity.java",
   "io/flutter/embedding/android/FlutterImageView.java",
   "io/flutter/embedding/android/FlutterPlayStoreSplitApplication.java",
-  "io/flutter/embedding/android/FlutterSplashView.java",
   "io/flutter/embedding/android/FlutterSurfaceView.java",
   "io/flutter/embedding/android/FlutterTextureView.java",
   "io/flutter/embedding/android/FlutterView.java",
@@ -195,14 +225,13 @@ android_java_sources = [
   "io/flutter/embedding/android/KeyboardMap.java",
   "io/flutter/embedding/android/MotionEventTracker.java",
   "io/flutter/embedding/android/RenderMode.java",
-  "io/flutter/embedding/android/SplashScreen.java",
-  "io/flutter/embedding/android/SplashScreenProvider.java",
   "io/flutter/embedding/android/TransparencyMode.java",
   "io/flutter/embedding/android/WindowInfoRepositoryCallbackAdapterWrapper.java",
   "io/flutter/embedding/engine/FlutterEngine.java",
   "io/flutter/embedding/engine/FlutterEngineCache.java",
   "io/flutter/embedding/engine/FlutterEngineConnectionRegistry.java",
   "io/flutter/embedding/engine/FlutterEngineGroup.java",
+  "io/flutter/embedding/engine/FlutterEngineGroupCache.java",
   "io/flutter/embedding/engine/FlutterJNI.java",
   "io/flutter/embedding/engine/FlutterOverlaySurface.java",
   "io/flutter/embedding/engine/FlutterShellArgs.java",
@@ -239,16 +268,20 @@ android_java_sources = [
   "io/flutter/embedding/engine/renderer/FlutterRenderer.java",
   "io/flutter/embedding/engine/renderer/FlutterUiDisplayListener.java",
   "io/flutter/embedding/engine/renderer/RenderSurface.java",
+  "io/flutter/embedding/engine/renderer/SurfaceTextureSurfaceProducer.java",
   "io/flutter/embedding/engine/renderer/SurfaceTextureWrapper.java",
   "io/flutter/embedding/engine/systemchannels/AccessibilityChannel.java",
+  "io/flutter/embedding/engine/systemchannels/BackGestureChannel.java",
   "io/flutter/embedding/engine/systemchannels/DeferredComponentChannel.java",
   "io/flutter/embedding/engine/systemchannels/KeyEventChannel.java",
+  "io/flutter/embedding/engine/systemchannels/KeyboardChannel.java",
   "io/flutter/embedding/engine/systemchannels/LifecycleChannel.java",
   "io/flutter/embedding/engine/systemchannels/LocalizationChannel.java",
   "io/flutter/embedding/engine/systemchannels/MouseCursorChannel.java",
   "io/flutter/embedding/engine/systemchannels/NavigationChannel.java",
   "io/flutter/embedding/engine/systemchannels/PlatformChannel.java",
   "io/flutter/embedding/engine/systemchannels/PlatformViewsChannel.java",
+  "io/flutter/embedding/engine/systemchannels/ProcessTextChannel.java",
   "io/flutter/embedding/engine/systemchannels/RestorationChannel.java",
   "io/flutter/embedding/engine/systemchannels/SettingsChannel.java",
   "io/flutter/embedding/engine/systemchannels/SpellCheckChannel.java",
@@ -282,17 +315,25 @@ android_java_sources = [
   "io/flutter/plugin/localization/LocalizationPlugin.java",
   "io/flutter/plugin/mouse/MouseCursorPlugin.java",
   "io/flutter/plugin/platform/AccessibilityEventsDelegate.java",
+  "io/flutter/plugin/platform/ImageReaderPlatformViewRenderTarget.java",
   "io/flutter/plugin/platform/PlatformOverlayView.java",
   "io/flutter/plugin/platform/PlatformPlugin.java",
   "io/flutter/plugin/platform/PlatformView.java",
   "io/flutter/plugin/platform/PlatformViewFactory.java",
   "io/flutter/plugin/platform/PlatformViewRegistry.java",
   "io/flutter/plugin/platform/PlatformViewRegistryImpl.java",
+  "io/flutter/plugin/platform/PlatformViewRenderTarget.java",
   "io/flutter/plugin/platform/PlatformViewWrapper.java",
   "io/flutter/plugin/platform/PlatformViewsAccessibilityDelegate.java",
   "io/flutter/plugin/platform/PlatformViewsController.java",
+  "io/flutter/plugin/platform/SingleViewFakeWindowViewGroup.java",
   "io/flutter/plugin/platform/SingleViewPresentation.java",
+  "io/flutter/plugin/platform/SingleViewWindowManager.java",
+  "io/flutter/plugin/platform/SurfaceProducerPlatformViewRenderTarget.java",
+  "io/flutter/plugin/platform/SurfaceTexturePlatformViewRenderTarget.java",
   "io/flutter/plugin/platform/VirtualDisplayController.java",
+  "io/flutter/plugin/platform/WindowManagerHandler.java",
+  "io/flutter/plugin/text/ProcessTextPlugin.java",
   "io/flutter/util/HandlerCompat.java",
   "io/flutter/util/PathUtils.java",
   "io/flutter/util/Preconditions.java",
@@ -310,14 +351,38 @@ android_java_sources = [
   "io/flutter/view/VsyncWaiter.java",
 ]
 
-list_script = rebase_path("//build/ls.py", ".", "//")
-embedding_dependencies_jars =
-    exec_script(list_script,
-                [
-                  "--target-directory",
-                  rebase_path("//third_party/android_embedding_dependencies"),
-                ],
-                "list lines")
+embedding_dependencies_jars = [
+  "//third_party/android_embedding_dependencies/lib/activity-1.0.0.jar",
+  "//third_party/android_embedding_dependencies/lib/annotation-1.2.0.jar",
+  "//third_party/android_embedding_dependencies/lib/annotation-experimental-1.1.0.jar",
+  "//third_party/android_embedding_dependencies/lib/annotations-13.0.jar",
+  "//third_party/android_embedding_dependencies/lib/collection-1.1.0.jar",
+  "//third_party/android_embedding_dependencies/lib/core-1.6.0.jar",
+  "//third_party/android_embedding_dependencies/lib/core-1.8.0.jar",
+  "//third_party/android_embedding_dependencies/lib/core-common-2.1.0.jar",
+  "//third_party/android_embedding_dependencies/lib/core-runtime-2.0.0.jar",
+  "//third_party/android_embedding_dependencies/lib/customview-1.0.0.jar",
+  "//third_party/android_embedding_dependencies/lib/fragment-1.1.0.jar",
+  "//third_party/android_embedding_dependencies/lib/kotlin-stdlib-1.5.31.jar",
+  "//third_party/android_embedding_dependencies/lib/kotlin-stdlib-common-1.5.31.jar",
+  "//third_party/android_embedding_dependencies/lib/kotlin-stdlib-jdk7-1.5.30.jar",
+  "//third_party/android_embedding_dependencies/lib/kotlin-stdlib-jdk8-1.5.30.jar",
+  "//third_party/android_embedding_dependencies/lib/kotlinx-coroutines-android-1.5.2.jar",
+  "//third_party/android_embedding_dependencies/lib/kotlinx-coroutines-core-jvm-1.5.2.jar",
+  "//third_party/android_embedding_dependencies/lib/lifecycle-common-2.2.0.jar",
+  "//third_party/android_embedding_dependencies/lib/lifecycle-common-java8-2.2.0.jar",
+  "//third_party/android_embedding_dependencies/lib/lifecycle-livedata-2.0.0.jar",
+  "//third_party/android_embedding_dependencies/lib/lifecycle-livedata-core-2.0.0.jar",
+  "//third_party/android_embedding_dependencies/lib/lifecycle-runtime-2.2.0.jar",
+  "//third_party/android_embedding_dependencies/lib/lifecycle-viewmodel-2.1.0.jar",
+  "//third_party/android_embedding_dependencies/lib/loader-1.0.0.jar",
+  "//third_party/android_embedding_dependencies/lib/savedstate-1.0.0.jar",
+  "//third_party/android_embedding_dependencies/lib/tracing-1.0.0.jar",
+  "//third_party/android_embedding_dependencies/lib/versionedparcelable-1.1.1.jar",
+  "//third_party/android_embedding_dependencies/lib/viewpager-1.0.0.jar",
+  "//third_party/android_embedding_dependencies/lib/window-1.0.0-beta04.jar",
+  "//third_party/android_embedding_dependencies/lib/window-java-1.0.0-beta04.jar",
+]
 
 action("check_imports") {
   script = "//flutter/tools/android_illegal_imports.py"
@@ -405,28 +470,6 @@ action("flutter_shell_java") {
   ]
 }
 
-action("icudtl_object") {
-  script = "//flutter/sky/tools/objcopy.py"
-
-  icudtl_input = "//third_party/icu/flutter/icudtl.dat"
-  icudtl_output = "$root_build_dir/flutter_icu/icudtl.o"
-
-  inputs = [ "$icudtl_input" ]
-
-  outputs = [ "$icudtl_output" ]
-
-  args = [
-    "--objcopy",
-    rebase_path(android_objcopy),
-    "--input",
-    rebase_path(icudtl_input),
-    "--output",
-    rebase_path(icudtl_output),
-    "--arch",
-    current_cpu,
-  ]
-}
-
 action("android_jar") {
   script = "//build/android/gyp/create_flutter_jar.py"
 
@@ -471,6 +514,30 @@ action("android_jar") {
     ":pom_libflutter",
   ]
 
+  if (impeller_enable_vulkan_validation_layers) {
+    assert(impeller_enable_vulkan)
+
+    # We use a different toolchain here so that vulkan validation layers are
+    # built against API level 26, which they require, rather than the default.
+    # This is safe because the Engine can do a version check before loading the
+    # .so for the validation layers.
+    apilevel26_toolchain = "//build/toolchain/android:clang_arm64_apilevel26"
+    validation_layer_target =
+        "//third_party/vulkan_validation_layers($apilevel26_toolchain)"
+    validation_layer_out_dir =
+        get_label_info(validation_layer_target, "root_out_dir")
+    deps += [ validation_layer_target ]
+    args += [
+      "--native_lib",
+      rebase_path("$validation_layer_out_dir/libVkLayer_khronos_validation.so"),
+    ]
+    if (current_cpu != "arm64") {
+      # This may not be necessarily required anymore. It was kept to maintain
+      # old behavior.
+      assert(false, "Validation layers not supported for arch.")
+    }
+  }
+
   if (flutter_runtime_mode == "profile") {
     deps += [ "//flutter/shell/vmservice:vmservice_snapshot" ]
     args += [
@@ -601,9 +668,9 @@ generated_file("android_entitlement_config") {
 if (target_cpu != "x86") {
   zip_bundle("gen_snapshot") {
     gen_snapshot_bin = "gen_snapshot"
-    gen_snapshot_out_dir = get_label_info(
-            "//third_party/dart/runtime/bin:gen_snapshot($host_toolchain)",
-            "root_out_dir")
+    gen_snapshot_out_dir =
+        get_label_info("$dart_src/runtime/bin:gen_snapshot($host_toolchain)",
+                       "root_out_dir")
     gen_snapshot_path = rebase_path("$gen_snapshot_out_dir/$gen_snapshot_bin")
 
     if (host_os == "linux") {
@@ -623,16 +690,26 @@ if (target_cpu != "x86") {
       },
     ]
 
-    deps = [ "//third_party/dart/runtime/bin:gen_snapshot($host_toolchain)" ]
+    deps = [ "$dart_src/runtime/bin:gen_snapshot($host_toolchain)" ]
+
+    if (host_os == "mac") {
+      deps += [ ":android_entitlement_config" ]
+      files += [
+        {
+          source = "$target_gen_dir/android_entitlements.txt"
+          destination = "entitlements.txt"
+        },
+      ]
+    }
   }
 
   # TODO(godofredoc): Remove gen_snapshot and rename new_gen_snapshot when v2 migration is complete.
   # BUG: https://github.com/flutter/flutter/issues/105351
   zip_bundle("new_gen_snapshot") {
     gen_snapshot_bin = "gen_snapshot"
-    gen_snapshot_out_dir = get_label_info(
-            "//third_party/dart/runtime/bin:gen_snapshot($host_toolchain)",
-            "root_out_dir")
+    gen_snapshot_out_dir =
+        get_label_info("$dart_src/runtime/bin:gen_snapshot($host_toolchain)",
+                       "root_out_dir")
     gen_snapshot_path = rebase_path("$gen_snapshot_out_dir/$gen_snapshot_bin")
 
     if (host_os == "linux") {
@@ -652,7 +729,7 @@ if (target_cpu != "x86") {
       },
     ]
 
-    deps = [ "//third_party/dart/runtime/bin:gen_snapshot($host_toolchain)" ]
+    deps = [ "$dart_src/runtime/bin:gen_snapshot($host_toolchain)" ]
 
     if (host_os == "mac") {
       deps += [ ":android_entitlement_config" ]
@@ -666,15 +743,14 @@ if (target_cpu != "x86") {
   }
 }
 
-if (target_cpu == "x64" || target_cpu == "arm64") {
+if (host_os == "linux" && (target_cpu == "x64" || target_cpu == "arm64")) {
   zip_bundle("analyze_snapshot") {
-    deps =
-        [ "//third_party/dart/runtime/bin:analyze_snapshot($host_toolchain)" ]
+    deps = [ "$dart_src/runtime/bin:analyze_snapshot($host_toolchain)" ]
 
     analyze_snapshot_bin = "analyze_snapshot"
     analyze_snapshot_out_dir =
         get_label_info(
-            "//third_party/dart/runtime/bin:analyze_snapshot($host_toolchain)",
+            "$dart_src/runtime/bin:analyze_snapshot($host_toolchain)",
             "root_out_dir")
     analyze_snapshot_path =
         rebase_path("$analyze_snapshot_out_dir/$analyze_snapshot_bin")
@@ -700,13 +776,12 @@ if (target_cpu == "x64" || target_cpu == "arm64") {
   # TODO(godofredoc): Remove analyze_snapshot and rename new_analyze_snapshot when v2 migration is complete.
   # BUG: https://github.com/flutter/flutter/issues/105351
   zip_bundle("new_analyze_snapshot") {
-    deps =
-        [ "//third_party/dart/runtime/bin:analyze_snapshot($host_toolchain)" ]
+    deps = [ "$dart_src/runtime/bin:analyze_snapshot($host_toolchain)" ]
 
     analyze_snapshot_bin = "analyze_snapshot"
     analyze_snapshot_out_dir =
         get_label_info(
-            "//third_party/dart/runtime/bin:analyze_snapshot($host_toolchain)",
+            "$dart_src/runtime/bin:analyze_snapshot($host_toolchain)",
             "root_out_dir")
     analyze_snapshot_path =
         rebase_path("$analyze_snapshot_out_dir/$analyze_snapshot_bin")
diff --git a/shell/platform/android/README.md b/shell/platform/android/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..0a67a370a2c2720e8ff1e20b3df19eff95df39f9
--- /dev/null
+++ b/shell/platform/android/README.md
@@ -0,0 +1,226 @@
+# Android Platform Embedder
+
+Android embedder for Flutter, including Java [`io.flutter`](io/flutter/) sources
+and Android specific engine-side C++.
+
+This code provides the glue between the Flutter engine and the Android platform,
+and is responsible for:
+
+- Initializing the Flutter engine.
+- Providing a platform view for the Flutter engine to render into.
+- Dispatching events to the Flutter engine.
+
+> [!CAUTION]
+> This is a best effort attempt to document the Android embedder. It is not
+> guaranteed to be up to date or complete. If you find a discrepancy, please
+> [send a pull request](https://github.com/flutter/engine/compare)!
+
+See also:
+
+- [`../../tools/android_lint/bin/main.dart`](../../../tools/android_lint/bin/main.dart)
+- [Android Platform Views](https://github.com/flutter/flutter/wiki/Android-Platform-Views)
+- [Hosting native Android views in your Flutter app with Platform Views](https://docs.flutter.dev/platform-integration/android/platform-views)
+- [Testing Android Changes in the Devicelab on an Emulator](https://github.com/flutter/flutter/wiki/Testing-Android-Changes-in-the-Devicelab-on-an-Emulator)
+- [Texture Layer Hybrid Composition](https://github.com/flutter/flutter/wiki/Texture-Layer-Hybrid-Composition)
+
+## Testing
+
+There are two classes of tests for the Android embedder: unit tests that tend
+to test _contracts_ within the embedder, and integration tests that test the
+engine and embedder together, typically coupled with a Flutter app (that's how
+our users interact with the engine and embedder).
+
+### Unit tests
+
+Unit tests for the Android embedder are located in:
+
+- [`test`](test): Java unit tests.
+- C++ files that end in `_unittests.cc` in [`shell/platform/android`](./).
+
+The easiest way (though not the quickest) is to use `run_tests.py`:
+
+```shell
+# Assuming you're at the root of the engine repo where `run_tests.py` is located.
+./testing/run_tests.py --type java
+
+# Confusingly, these are C++ tests for Android.
+./testing/run_tests.py --type android
+
+# If you're using android_debug_unopt_arm64 builds:
+./testing/run_tests.py --type android --android-variant android_debug_unopt_arm64
+./testing/run_tests.py --type java --android-variant android_debug_unopt_arm64
+```
+
+You may also be able to run the tests directly from Android Studio.
+
+### Integration tests
+
+Integration tests for the Android embedder mostly exist outside of the engine
+for dubious historical reasons.
+
+To run these tests, you'll need to have a Flutter checkout and a working Android
+emulator or device:
+
+```shell
+# Build an up-to-date Flutter engine for Android.
+cd $ENGINE/src
+
+# Or, use your favorite arguments and build variant.
+ninja -j1000 -C ../out/android_debug_unopt_arm64 android_jar
+
+# Run the tests. Here is *1* example:
+cd $FLUTTER/dev/integration_tests/external_textures
+flutter drive \
+  --local-engine-host=$ENGINE/out/host_debug_unopt_arm64 \
+  --local-engine=$ENGINE/out/android_debug_unopt_arm64
+```
+
+Another good source of (unfortunately, manual) testing is `flutter/packages`:
+
+```shell
+cd $PACKAGES/packages/video_player/video_player_android/example
+flutter run \
+  --local-engine-host=$ENGINE/out/host_debug_unopt_arm64 \
+  --local-engine=$ENGINE/out/android_debug_unopt_arm64
+```
+
+> [!NOTE]
+> External texture rendering on Android is based on the device API level. For
+> example to test the OpenGLES branch (which uses `SurfaceTexture`), you'll
+> typically need an older device or emulator with an API version 29 or lower.
+>
+> You can also (locally) "force" the engine to use `SurfaceTextures`:
+>
+> ```diff
+> // shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java
+> -  @VisibleForTesting static boolean debugForceSurfaceProducerGlTextures = false;
+> +  @VisibleForTesting static boolean debugForceSurfaceProducerGlTextures = true;
+> ```
+>
+> ... and rebuild the engine.
+
+See [our wiki](https://github.com/flutter/flutter/wiki/Testing-the-engine#java---android-embedding) also.
+
+## Developing
+
+How to edit and contribute to the Android embedder.
+
+> [!TIP]
+> This guide assumes you already have a working Engine development environment:
+>
+> - [Setting up the Engine development environment](https://github.com/flutter/flutter/wiki/Setting-up-the-Engine-development-environment)
+> - [Compiling for Android](https://github.com/flutter/flutter/wiki/Compiling-the-engine#compiling-for-android-from-macos-or-linux)
+>
+> You should also have a working Android development environment:
+>
+> - [Android Studio](https://developer.android.com/studio)
+> - [Install Flutter > Test Drive](https://docs.flutter.dev/get-started/test-drive?tab=androidstudio)
+>
+> _It is also recommended (but not required) to install
+> [Visual Studio Code](https://code.visualstudio.com/)._
+
+Depending on what you are trying to do, you may need to edit the Java code in
+[`io.flutter`](io/flutter/) or the C++ code in [`shell/platform/android`](./),
+sometimes both. Let's start with the C++ code, as it is more similar to
+developing for other platforms or platform-agnostic parts of the engine.
+
+### Editing C++ code
+
+The C++ code for the Android embedder is located in
+[`shell/platform/android`](./) and subdirectories.
+
+Some notable files include:
+
+- [`context/android_context.h`](./context/android_context.h): Holds state that
+  is shared across Android surfaces.
+- [`jni/platform_view_android_jni.h`](./jni/platform_view_android_jni.h): Allows
+  calling Java code running in the JVM.
+- [`AndroidManifest.xml`](./AndroidManifest.xml): Used by [`android_lint`](../../../tools/android_lint/).
+- [`BUILD.gn`](./BUILD.gn): Used by GN to build the C++-side embedder tests and
+  the `flutter.jar` file for the engine.
+- [`ndk_helpers.h`](./ndk_helpers.h): Helper functions for dynamically loading
+  and calling Android NDK (C/C++) functions.
+- [`platform_view_android.h`](./platform_view_android.h): The main entry point
+  for the Android embedder.
+
+See [VSCode with C/C++ Intellisense](https://github.com/flutter/flutter/wiki/Setting-up-the-Engine-development-environment#vscode-with-cc-intellisense-cc)
+for how to use the [`clangd`](https://marketplace.visualstudio.com/items?itemName=llvm-vs-code-extensions.vscode-clangd) extension to get C++ code
+completion:
+
+![Example](https://github.com/flutter/flutter/assets/168174/8a75dd27-66e1-4c4f-88af-667a73b909b6)
+
+> [!NOTE]
+> `--compile-commands-dir` must point to an Android build output:
+>
+> ```jsonc
+> {
+>   /* ... */
+>   "clangd.path": "buildtools/mac-arm64/clang/bin/clangd",
+>   "clangd.arguments": ["--compile-commands-dir=out/android_debug_unopt_arm64"]
+>   /* ... */
+> }
+> ```
+>
+> ... but remember to change it back when editing other parts of the engine.
+
+### Editing Java code
+
+The Java code for the Android embedder is located in
+[`io/flutter/`](io/flutter/) and subdirectories.
+
+The tests are located in [`test/io/flutter/`](test/io/flutter/), and the test
+runner in [`test_runner`](test_runner/).
+
+Some notable files include:
+
+- [`io/flutter/embedding/android/FlutterActivity.java`](io/flutter/embedding/android/FlutterActivity.java):
+  An activity that displays a full-screen Flutter UI.
+- [`io/flutter/embedding/engine/FlutterJNI.java`](io/flutter/embedding/engine/FlutterJNI.java):
+  The Java interface for the C++ engine.
+- [`io/flutter/view/TextureRegistry.java`](io/flutter/view/TextureRegistry.java):
+  Registry of backend textures used by a Flutter View.
+
+It is non-trivial to get a working IDE setup for editing Java code in the
+Flutter engine. Some developers have had success [using VSCode as an IDE for the Android Embedding](https://github.com/flutter/flutter/wiki/Setting-up-the-Engine-development-environment#using-vscode-as-an-ide-for-the-android-embedding-java),
+but the following instructions are for if that doesn't work, or you want to use
+Android Studio:
+
+1. Open `shell/platform/android` in Android Studio.
+1. Configure the following:
+
+   - [`Preferences | Build, Execution, Deployment | Gradle-Android Compiler`](jetbrains://AndroidStudio/settings?name=Build%2C+Execution%2C+Deployment--Gradle-Android+Compiler)
+
+     Command-line Options:
+
+     ```txt
+     -Pbuild_dir="/tmp/build_dir" -Pflutter_jar="$ENGINE/src/out/android_debug_unopt_arm64/flutter.jar"
+     ```
+
+   - [`Preferences | Build, Execution, Deployment | Build Tools | Gradle`](jetbrains://AndroidStudio/settings?name=Build%2C+Execution%2C+Deployment--Build+Tools--Gradle)
+
+     Distribution of `Local Installation` with:
+
+     ```txt
+     $ENGINE/src/third_party/gradle
+     ```
+
+     Gradle SDK using Android Studio (path depends on your machine):
+
+     ```txt
+     /Applications/Android Studio.app/Contents/jbr/Contents/Home
+     ```
+
+1. Sync Gradle.
+
+   ![Example](https://github.com/flutter/flutter/assets/168174/02fe0e6f-f0c4-47b2-8dae-9aa0b9520503)
+
+At this point you should be able to open Java files in Android Studio and get
+code completion in the `io/flutter` and `test/io/flutter` folders. For example, `FlutterJNI.java`:
+
+![Example](https://github.com/flutter/flutter/assets/168174/387550d4-eab7-4097-9da3-7713a6ec4da7)
+
+To get code coverage displayed in line: go to the test class you wish to run and
+1. Right click > Modify Run Configuration..., 
+2. In the window that pops up click Modify options > Specify classes
+and packages (under "code coverage"). 
+3. In the new box that appears at the bottom of the window, click the + > Add package, and then add `io.flutter.*`.
diff --git a/shell/platform/android/android_choreographer.cc b/shell/platform/android/android_choreographer.cc
deleted file mode 100644
index f72787f4239202faf2a75a8fc926d29277953020..0000000000000000000000000000000000000000
--- a/shell/platform/android/android_choreographer.cc
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "flutter/shell/platform/android/android_choreographer.h"
-
-#include "flutter/fml/native_library.h"
-
-// Only avialalbe on API 24+
-typedef void AChoreographer;
-// Only available on API 29+ or API 24+ if the architecture is 64-bit.
-typedef void (*AChoreographer_frameCallback)(int64_t frameTimeNanos,
-                                             void* data);
-// Only avialalbe on API 24+
-typedef AChoreographer* (*AChoreographer_getInstance_FPN)();
-typedef void (*AChoreographer_postFrameCallback_FPN)(
-    AChoreographer* choreographer,
-    AChoreographer_frameCallback callback,
-    void* data);
-static AChoreographer_getInstance_FPN AChoreographer_getInstance;
-static AChoreographer_postFrameCallback_FPN AChoreographer_postFrameCallback;
-
-namespace flutter {
-
-bool AndroidChoreographer::ShouldUseNDKChoreographer() {
-  static std::optional<bool> use_ndk_choreographer;
-  if (use_ndk_choreographer) {
-    return use_ndk_choreographer.value();
-  }
-  auto libandroid = fml::NativeLibrary::Create("libandroid.so");
-  FML_DCHECK(libandroid);
-  auto get_instance_fn =
-      libandroid->ResolveFunction<AChoreographer_getInstance_FPN>(
-          "AChoreographer_getInstance");
-  auto post_frame_callback_fn =
-      libandroid->ResolveFunction<AChoreographer_postFrameCallback_FPN>(
-          "AChoreographer_postFrameCallback64");
-#if FML_ARCH_CPU_64_BITS
-  if (!post_frame_callback_fn) {
-    post_frame_callback_fn =
-        libandroid->ResolveFunction<AChoreographer_postFrameCallback_FPN>(
-            "AChoreographer_postFrameCallback");
-  }
-#endif
-  if (get_instance_fn && post_frame_callback_fn) {
-    AChoreographer_getInstance = get_instance_fn.value();
-    AChoreographer_postFrameCallback = post_frame_callback_fn.value();
-    use_ndk_choreographer = true;
-  } else {
-    use_ndk_choreographer = false;
-  }
-  return use_ndk_choreographer.value();
-}
-
-void AndroidChoreographer::PostFrameCallback(OnFrameCallback callback,
-                                             void* data) {
-  AChoreographer* choreographer = AChoreographer_getInstance();
-  AChoreographer_postFrameCallback(choreographer, callback, data);
-}
-
-}  // namespace flutter
diff --git a/shell/platform/android/android_choreographer.h b/shell/platform/android/android_choreographer.h
deleted file mode 100644
index 632bc77479e48efd9af49b8f5712234f2d9c1ca5..0000000000000000000000000000000000000000
--- a/shell/platform/android/android_choreographer.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_CHOREOGRAPHER_H_
-#define FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_CHOREOGRAPHER_H_
-
-#include "flutter/fml/macros.h"
-
-#include <cstdint>
-
-namespace flutter {
-
-//------------------------------------------------------------------------------
-/// The Android Choreographer is used by `VsyncWaiterAndroid` to await vsync
-/// signal. It's only available on API 29+ or API 24+ if the architecture is
-/// 64-bit.
-///
-class AndroidChoreographer {
- public:
-  typedef void (*OnFrameCallback)(int64_t frame_time_nanos, void* data);
-  static bool ShouldUseNDKChoreographer();
-  static void PostFrameCallback(OnFrameCallback callback, void* data);
-
-  FML_DISALLOW_COPY_AND_ASSIGN(AndroidChoreographer);
-};
-
-}  // namespace flutter
-
-#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_CHOREOGRAPHER_H_
diff --git a/shell/platform/android/android_context_gl_impeller.cc b/shell/platform/android/android_context_gl_impeller.cc
index ff4f59a576f9819f8e22cc0bf2c29a732176a821..d96e55e878055a9c16e5a88518bd4fff7eec31e7 100644
--- a/shell/platform/android/android_context_gl_impeller.cc
+++ b/shell/platform/android/android_context_gl_impeller.cc
@@ -4,15 +4,240 @@
 
 #include "flutter/shell/platform/android/android_context_gl_impeller.h"
 
+#include "flutter/impeller/renderer/backend/gles/context_gles.h"
+#include "flutter/impeller/renderer/backend/gles/proc_table_gles.h"
+#include "flutter/impeller/renderer/backend/gles/reactor_gles.h"
+#include "flutter/impeller/toolkit/egl/context.h"
+#include "flutter/impeller/toolkit/egl/surface.h"
+#include "impeller/entity/gles/entity_shaders_gles.h"
+#include "impeller/entity/gles/framebuffer_blend_shaders_gles.h"
+
+#if IMPELLER_ENABLE_3D
+// This include was turned to an error since it breaks GN.
+#include "impeller/scene/shaders/gles/scene_shaders_gles.h"  // nogncheck
+#endif  // IMPELLER_ENABLE_3D
 namespace flutter {
 
-AndroidContextGLImpeller::AndroidContextGLImpeller()
-    : AndroidContext(AndroidRenderingAPI::kOpenGLES) {}
+class AndroidContextGLImpeller::ReactorWorker final
+    : public impeller::ReactorGLES::Worker {
+ public:
+  ReactorWorker() = default;
+
+  // |impeller::ReactorGLES::Worker|
+  ~ReactorWorker() override = default;
+
+  // |impeller::ReactorGLES::Worker|
+  bool CanReactorReactOnCurrentThreadNow(
+      const impeller::ReactorGLES& reactor) const override {
+    impeller::ReaderLock lock(mutex_);
+    auto found = reactions_allowed_.find(std::this_thread::get_id());
+    if (found == reactions_allowed_.end()) {
+      return false;
+    }
+    return found->second;
+  }
+
+  void SetReactionsAllowedOnCurrentThread(bool allowed) {
+    impeller::WriterLock lock(mutex_);
+    reactions_allowed_[std::this_thread::get_id()] = allowed;
+  }
+
+ private:
+  mutable impeller::RWMutex mutex_;
+  std::map<std::thread::id, bool> reactions_allowed_ IPLR_GUARDED_BY(mutex_);
+
+  FML_DISALLOW_COPY_AND_ASSIGN(ReactorWorker);
+};
+
+static std::shared_ptr<impeller::Context> CreateImpellerContext(
+    const std::shared_ptr<impeller::ReactorGLES::Worker>& worker,
+    bool enable_gpu_tracing) {
+  auto proc_table = std::make_unique<impeller::ProcTableGLES>(
+      impeller::egl::CreateProcAddressResolver());
+
+  if (!proc_table->IsValid()) {
+    FML_LOG(ERROR) << "Could not create OpenGL proc table.";
+    return nullptr;
+  }
+
+  std::vector<std::shared_ptr<fml::Mapping>> shader_mappings = {
+      std::make_shared<fml::NonOwnedMapping>(
+          impeller_entity_shaders_gles_data,
+          impeller_entity_shaders_gles_length),
+      std::make_shared<fml::NonOwnedMapping>(
+          impeller_framebuffer_blend_shaders_gles_data,
+          impeller_framebuffer_blend_shaders_gles_length),
+#if IMPELLER_ENABLE_3D
+      std::make_shared<fml::NonOwnedMapping>(
+          impeller_scene_shaders_gles_data, impeller_scene_shaders_gles_length),
+#endif  // IMPELLER_ENABLE_3D
+  };
+
+  auto context = impeller::ContextGLES::Create(
+      std::move(proc_table), shader_mappings, enable_gpu_tracing);
+  if (!context) {
+    FML_LOG(ERROR) << "Could not create OpenGLES Impeller Context.";
+    return nullptr;
+  }
+
+  if (!context->AddReactorWorker(worker).has_value()) {
+    FML_LOG(ERROR) << "Could not add reactor worker.";
+    return nullptr;
+  }
+  FML_LOG(IMPORTANT) << "Using the Impeller rendering backend (OpenGLES).";
+  return context;
+}
+
+AndroidContextGLImpeller::AndroidContextGLImpeller(
+    std::unique_ptr<impeller::egl::Display> display,
+    bool enable_gpu_tracing)
+    : AndroidContext(AndroidRenderingAPI::kImpellerOpenGLES),
+      reactor_worker_(std::shared_ptr<ReactorWorker>(new ReactorWorker())),
+      display_(std::move(display)) {
+  if (!display_ || !display_->IsValid()) {
+    FML_DLOG(ERROR) << "Could not create context with invalid EGL display.";
+    return;
+  }
+
+  impeller::egl::ConfigDescriptor desc;
+  desc.api = impeller::egl::API::kOpenGLES2;
+  desc.color_format = impeller::egl::ColorFormat::kRGBA8888;
+  desc.depth_bits = impeller::egl::DepthBits::kZero;
+  desc.stencil_bits = impeller::egl::StencilBits::kEight;
+  desc.samples = impeller::egl::Samples::kFour;
+
+  desc.surface_type = impeller::egl::SurfaceType::kWindow;
+  std::unique_ptr<impeller::egl::Config> onscreen_config =
+      display_->ChooseConfig(desc);
+  if (!onscreen_config) {
+    // Fallback for Android emulator.
+    desc.samples = impeller::egl::Samples::kOne;
+    onscreen_config = display_->ChooseConfig(desc);
+    if (onscreen_config) {
+      FML_LOG(INFO) << "Warning: This device doesn't support MSAA for onscreen "
+                       "framebuffers. Falling back to a single sample.";
+    } else {
+      FML_DLOG(ERROR) << "Could not choose onscreen config.";
+      return;
+    }
+  }
+
+  desc.surface_type = impeller::egl::SurfaceType::kPBuffer;
+  auto offscreen_config = display_->ChooseConfig(desc);
+  if (!offscreen_config) {
+    FML_DLOG(ERROR) << "Could not choose offscreen config.";
+    return;
+  }
+
+  auto onscreen_context = display_->CreateContext(*onscreen_config, nullptr);
+  if (!onscreen_context) {
+    FML_DLOG(ERROR) << "Could not create onscreen context.";
+    return;
+  }
+
+  auto offscreen_context =
+      display_->CreateContext(*offscreen_config, onscreen_context.get());
+  if (!offscreen_context) {
+    FML_DLOG(ERROR) << "Could not create offscreen context.";
+    return;
+  }
+
+  // Creating the impeller::Context requires a current context, which requires
+  // some surface.
+  auto offscreen_surface =
+      display_->CreatePixelBufferSurface(*offscreen_config, 1u, 1u);
+  if (!offscreen_context->MakeCurrent(*offscreen_surface)) {
+    FML_DLOG(ERROR) << "Could not make offscreen context current.";
+    return;
+  }
+
+  auto impeller_context =
+      CreateImpellerContext(reactor_worker_, enable_gpu_tracing);
+
+  if (!impeller_context) {
+    FML_DLOG(ERROR) << "Could not create Impeller context.";
+    return;
+  }
+
+  if (!offscreen_context->ClearCurrent()) {
+    FML_DLOG(ERROR) << "Could not clear offscreen context.";
+    return;
+  }
+  // Setup context listeners.
+  impeller::egl::Context::LifecycleListener listener =
+      [worker =
+           reactor_worker_](impeller::egl ::Context::LifecycleEvent event) {
+        switch (event) {
+          case impeller::egl::Context::LifecycleEvent::kDidMakeCurrent:
+            worker->SetReactionsAllowedOnCurrentThread(true);
+            break;
+          case impeller::egl::Context::LifecycleEvent::kWillClearCurrent:
+            worker->SetReactionsAllowedOnCurrentThread(false);
+            break;
+        }
+      };
+  if (!onscreen_context->AddLifecycleListener(listener).has_value() ||
+      !offscreen_context->AddLifecycleListener(listener).has_value()) {
+    FML_DLOG(ERROR) << "Could not add lifecycle listeners";
+  }
+
+  onscreen_config_ = std::move(onscreen_config);
+  offscreen_config_ = std::move(offscreen_config);
+  onscreen_context_ = std::move(onscreen_context);
+  offscreen_context_ = std::move(offscreen_context);
+  SetImpellerContext(impeller_context);
+
+  is_valid_ = true;
+}
 
 AndroidContextGLImpeller::~AndroidContextGLImpeller() = default;
 
 bool AndroidContextGLImpeller::IsValid() const {
-  return true;
+  return is_valid_;
+}
+
+bool AndroidContextGLImpeller::ResourceContextClearCurrent() {
+  if (!offscreen_context_) {
+    return false;
+  }
+
+  return offscreen_context_->ClearCurrent();
+}
+
+bool AndroidContextGLImpeller::ResourceContextMakeCurrent(
+    impeller::egl::Surface* offscreen_surface) {
+  if (!offscreen_context_ || !offscreen_surface) {
+    return false;
+  }
+
+  return offscreen_context_->MakeCurrent(*offscreen_surface);
+}
+
+std::unique_ptr<impeller::egl::Surface>
+AndroidContextGLImpeller::CreateOffscreenSurface() {
+  return display_->CreatePixelBufferSurface(*offscreen_config_, 1u, 1u);
+}
+
+bool AndroidContextGLImpeller::OnscreenContextMakeCurrent(
+    impeller::egl::Surface* onscreen_surface) {
+  if (!onscreen_surface || !onscreen_context_) {
+    return false;
+  }
+
+  return onscreen_context_->MakeCurrent(*onscreen_surface);
+}
+
+bool AndroidContextGLImpeller::OnscreenContextClearCurrent() {
+  if (!onscreen_context_) {
+    return false;
+  }
+
+  return onscreen_context_->ClearCurrent();
+}
+
+std::unique_ptr<impeller::egl::Surface>
+AndroidContextGLImpeller::CreateOnscreenSurface(EGLNativeWindowType window) {
+  return display_->CreateWindowSurface(*onscreen_config_, window);
 }
 
 }  // namespace flutter
diff --git a/shell/platform/android/android_context_gl_impeller.h b/shell/platform/android/android_context_gl_impeller.h
index 51e9f7b128489dc5e9f9e4ced0c48f7d6d84fe31..234ff58d2c91e2f9646608ac98cf6f2a836783be 100644
--- a/shell/platform/android/android_context_gl_impeller.h
+++ b/shell/platform/android/android_context_gl_impeller.h
@@ -6,20 +6,40 @@
 #define FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_CONTEXT_GL_IMPELLER_H_
 
 #include "flutter/fml/macros.h"
+#include "flutter/impeller/toolkit/egl/display.h"
 #include "flutter/shell/platform/android/context/android_context.h"
 
 namespace flutter {
 
 class AndroidContextGLImpeller : public AndroidContext {
  public:
-  AndroidContextGLImpeller();
+  AndroidContextGLImpeller(std::unique_ptr<impeller::egl::Display> display,
+                           bool enable_gpu_tracing);
 
   ~AndroidContextGLImpeller();
 
   // |AndroidContext|
   bool IsValid() const override;
 
+  bool ResourceContextMakeCurrent(impeller::egl::Surface* offscreen_surface);
+  bool ResourceContextClearCurrent();
+  std::unique_ptr<impeller::egl::Surface> CreateOffscreenSurface();
+  bool OnscreenContextMakeCurrent(impeller::egl::Surface* onscreen_surface);
+  bool OnscreenContextClearCurrent();
+  std::unique_ptr<impeller::egl::Surface> CreateOnscreenSurface(
+      EGLNativeWindowType window);
+
  private:
+  class ReactorWorker;
+
+  std::shared_ptr<ReactorWorker> reactor_worker_;
+  std::unique_ptr<impeller::egl::Display> display_;
+  std::unique_ptr<impeller::egl::Config> onscreen_config_;
+  std::unique_ptr<impeller::egl::Config> offscreen_config_;
+  std::unique_ptr<impeller::egl::Context> onscreen_context_;
+  std::unique_ptr<impeller::egl::Context> offscreen_context_;
+  bool is_valid_ = false;
+
   FML_DISALLOW_COPY_AND_ASSIGN(AndroidContextGLImpeller);
 };
 
diff --git a/shell/platform/android/android_context_gl_impeller_unittests.cc b/shell/platform/android/android_context_gl_impeller_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..0a76dd985d855751ca3033ff18ac151a976bd2ee
--- /dev/null
+++ b/shell/platform/android/android_context_gl_impeller_unittests.cc
@@ -0,0 +1,89 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/platform/android/android_context_gl_impeller.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+namespace flutter {
+namespace testing {
+
+using ::testing::_;
+using ::testing::AllOf;
+using ::testing::ByMove;
+using ::testing::Field;
+using ::testing::Matcher;
+using ::testing::Return;
+
+using ::impeller::egl::Config;
+using ::impeller::egl::ConfigDescriptor;
+
+namespace {
+class MockDisplay : public impeller::egl::Display {
+ public:
+  MOCK_METHOD(bool, IsValid, (), (const, override));
+  MOCK_METHOD(std::unique_ptr<Config>,
+              ChooseConfig,
+              (ConfigDescriptor),
+              (const, override));
+};
+}  // namespace
+
+TEST(AndroidContextGLImpeller, MSAAFirstAttempt) {
+  auto display = std::make_unique<MockDisplay>();
+  EXPECT_CALL(*display, IsValid).WillRepeatedly(Return(true));
+  auto first_result = std::make_unique<Config>(ConfigDescriptor(), EGLConfig());
+  auto second_result =
+      std::make_unique<Config>(ConfigDescriptor(), EGLConfig());
+  EXPECT_CALL(
+      *display,
+      ChooseConfig(Matcher<ConfigDescriptor>(AllOf(
+          Field(&ConfigDescriptor::samples, impeller::egl::Samples::kFour),
+          Field(&ConfigDescriptor::surface_type,
+                impeller::egl::SurfaceType::kWindow)))))
+      .WillOnce(Return(ByMove(std::move(first_result))));
+  EXPECT_CALL(*display, ChooseConfig(Matcher<ConfigDescriptor>(
+                            Field(&ConfigDescriptor::surface_type,
+                                  impeller::egl::SurfaceType::kPBuffer))))
+      .WillOnce(Return(ByMove(std::move(second_result))));
+  ON_CALL(*display, ChooseConfig(_))
+      .WillByDefault(Return(ByMove(std::unique_ptr<Config>())));
+  auto context =
+      std::make_unique<AndroidContextGLImpeller>(std::move(display), true);
+  ASSERT_TRUE(context);
+}
+
+TEST(AndroidContextGLImpeller, FallbackForEmulator) {
+  auto display = std::make_unique<MockDisplay>();
+  EXPECT_CALL(*display, IsValid).WillRepeatedly(Return(true));
+  std::unique_ptr<Config> first_result;
+  auto second_result =
+      std::make_unique<Config>(ConfigDescriptor(), EGLConfig());
+  auto third_result = std::make_unique<Config>(ConfigDescriptor(), EGLConfig());
+  EXPECT_CALL(
+      *display,
+      ChooseConfig(Matcher<ConfigDescriptor>(AllOf(
+          Field(&ConfigDescriptor::samples, impeller::egl::Samples::kFour),
+          Field(&ConfigDescriptor::surface_type,
+                impeller::egl::SurfaceType::kWindow)))))
+      .WillOnce(Return(ByMove(std::move(first_result))));
+  EXPECT_CALL(
+      *display,
+      ChooseConfig(Matcher<ConfigDescriptor>(
+          AllOf(Field(&ConfigDescriptor::samples, impeller::egl::Samples::kOne),
+                Field(&ConfigDescriptor::surface_type,
+                      impeller::egl::SurfaceType::kWindow)))))
+      .WillOnce(Return(ByMove(std::move(second_result))));
+  EXPECT_CALL(*display, ChooseConfig(Matcher<ConfigDescriptor>(
+                            Field(&ConfigDescriptor::surface_type,
+                                  impeller::egl::SurfaceType::kPBuffer))))
+      .WillOnce(Return(ByMove(std::move(third_result))));
+  ON_CALL(*display, ChooseConfig(_))
+      .WillByDefault(Return(ByMove(std::unique_ptr<Config>())));
+  auto context =
+      std::make_unique<AndroidContextGLImpeller>(std::move(display), true);
+  ASSERT_TRUE(context);
+}
+}  // namespace testing
+}  // namespace flutter
diff --git a/shell/platform/android/android_context_gl_skia.cc b/shell/platform/android/android_context_gl_skia.cc
index adc29695d7347ee0565c187d3b446d1091cb3f5b..8ad49cf82c5e8f20550ea912d9eccb98fd1cf25f 100644
--- a/shell/platform/android/android_context_gl_skia.cc
+++ b/shell/platform/android/android_context_gl_skia.cc
@@ -65,13 +65,11 @@ static bool TeardownContext(EGLDisplay display, EGLContext context) {
 }
 
 AndroidContextGLSkia::AndroidContextGLSkia(
-    AndroidRenderingAPI rendering_api,
     fml::RefPtr<AndroidEnvironmentGL> environment,
     const TaskRunners& task_runners,
     uint8_t msaa_samples)
-    : AndroidContext(AndroidRenderingAPI::kOpenGLES),
+    : AndroidContext(AndroidRenderingAPI::kSkiaOpenGLES),
       environment_(std::move(environment)),
-      config_(nullptr),
       task_runners_(task_runners) {
   if (!environment_->IsValid()) {
     FML_LOG(ERROR) << "Could not create an Android GL environment.";
@@ -205,6 +203,14 @@ bool AndroidContextGLSkia::ClearCurrent() const {
   return true;
 }
 
+EGLContext AndroidContextGLSkia::GetEGLContext() const {
+  return context_;
+}
+
+EGLDisplay AndroidContextGLSkia::GetEGLDisplay() const {
+  return environment_->Display();
+}
+
 EGLContext AndroidContextGLSkia::CreateNewContext() const {
   bool success;
   EGLContext context;
diff --git a/shell/platform/android/android_context_gl_skia.h b/shell/platform/android/android_context_gl_skia.h
index 145be6144b218df92f9ecf77c71d2d0b69f126ef..af19ef789d8dedfd35eeb63d48d00045d518488d 100644
--- a/shell/platform/android/android_context_gl_skia.h
+++ b/shell/platform/android/android_context_gl_skia.h
@@ -27,8 +27,7 @@ class AndroidEGLSurface;
 ///
 class AndroidContextGLSkia : public AndroidContext {
  public:
-  AndroidContextGLSkia(AndroidRenderingAPI rendering_api,
-                       fml::RefPtr<AndroidEnvironmentGL> environment,
+  AndroidContextGLSkia(fml::RefPtr<AndroidEnvironmentGL> environment,
                        const TaskRunners& taskRunners,
                        uint8_t msaa_samples);
 
@@ -76,6 +75,20 @@ class AndroidContextGLSkia : public AndroidContext {
   ///
   bool ClearCurrent() const;
 
+  //----------------------------------------------------------------------------
+  /// @brief      Returns the EGLContext.
+  ///
+  /// @return     EGLContext.
+  ///
+  EGLContext GetEGLContext() const;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Returns the EGLDisplay.
+  ///
+  /// @return     EGLDisplay.
+  ///
+  EGLDisplay GetEGLDisplay() const;
+
   //----------------------------------------------------------------------------
   /// @brief      Create a new EGLContext using the same EGLConfig.
   ///
diff --git a/shell/platform/android/android_context_gl_unittests.cc b/shell/platform/android/android_context_gl_unittests.cc
index bf1c7a78407ecbc1571c4c4b1bb0376416ec59a1..0bc2848f292b4c7e646891f09694bae3fe92b34f 100644
--- a/shell/platform/android/android_context_gl_unittests.cc
+++ b/shell/platform/android/android_context_gl_unittests.cc
@@ -1,3 +1,7 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 #define FML_USED_ON_EMBEDDER
 
 #include <memory>
@@ -6,60 +10,15 @@
 #include "flutter/shell/platform/android/android_egl_surface.h"
 #include "flutter/shell/platform/android/android_environment_gl.h"
 #include "flutter/shell/platform/android/android_surface_gl_skia.h"
-#include "flutter/shell/platform/android/jni/platform_view_android_jni.h"
+#include "fml/logging.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
+#include "shell/platform/android/context/android_context.h"
 
 namespace flutter {
 namespace testing {
 namespace android {
 namespace {
-class MockPlatformViewAndroidJNI : public PlatformViewAndroidJNI {
- public:
-  MOCK_METHOD2(FlutterViewHandlePlatformMessage,
-               void(std::unique_ptr<flutter::PlatformMessage> message,
-                    int responseId));
-  MOCK_METHOD2(FlutterViewHandlePlatformMessageResponse,
-               void(int responseId, std::unique_ptr<fml::Mapping> data));
-  MOCK_METHOD3(FlutterViewUpdateSemantics,
-               void(std::vector<uint8_t> buffer,
-                    std::vector<std::string> strings,
-                    std::vector<std::vector<uint8_t>> string_attribute_args));
-  MOCK_METHOD2(FlutterViewUpdateCustomAccessibilityActions,
-               void(std::vector<uint8_t> actions_buffer,
-                    std::vector<std::string> strings));
-  MOCK_METHOD0(FlutterViewOnFirstFrame, void());
-  MOCK_METHOD0(FlutterViewOnPreEngineRestart, void());
-  MOCK_METHOD2(SurfaceTextureAttachToGLContext,
-               void(JavaLocalRef surface_texture, int textureId));
-  MOCK_METHOD1(SurfaceTextureUpdateTexImage,
-               void(JavaLocalRef surface_texture));
-  MOCK_METHOD2(SurfaceTextureGetTransformMatrix,
-               void(JavaLocalRef surface_texture, SkMatrix& transform));
-  MOCK_METHOD1(SurfaceTextureDetachFromGLContext,
-               void(JavaLocalRef surface_texture));
-  MOCK_METHOD8(FlutterViewOnDisplayPlatformView,
-               void(int view_id,
-                    int x,
-                    int y,
-                    int width,
-                    int height,
-                    int viewWidth,
-                    int viewHeight,
-                    MutatorsStack mutators_stack));
-  MOCK_METHOD5(FlutterViewDisplayOverlaySurface,
-               void(int surface_id, int x, int y, int width, int height));
-  MOCK_METHOD0(FlutterViewBeginFrame, void());
-  MOCK_METHOD0(FlutterViewEndFrame, void());
-  MOCK_METHOD0(FlutterViewCreateOverlaySurface,
-               std::unique_ptr<PlatformViewAndroidJNI::OverlayMetadata>());
-  MOCK_METHOD0(FlutterViewDestroyOverlaySurfaces, void());
-  MOCK_METHOD1(FlutterViewComputePlatformResolvedLocale,
-               std::unique_ptr<std::vector<std::string>>(
-                   std::vector<std::string> supported_locales_data));
-  MOCK_METHOD0(GetDisplayRefreshRate, double());
-  MOCK_METHOD1(RequestDartDeferredLibrary, bool(int loading_unit_id));
-};
 
 TaskRunners MakeTaskRunners(const std::string& thread_label,
                             const ThreadHost& thread_host) {
@@ -74,6 +33,69 @@ TaskRunners MakeTaskRunners(const std::string& thread_label,
 }
 }  // namespace
 
+class TestImpellerContext : public impeller::Context {
+ public:
+  TestImpellerContext() {}
+
+  ~TestImpellerContext() {}
+
+  impeller::Context::BackendType GetBackendType() const override {
+    return impeller::Context::BackendType::kOpenGLES;
+  }
+
+  std::string DescribeGpuModel() const override { return ""; }
+
+  bool IsValid() const override { return true; }
+
+  const std::shared_ptr<const impeller::Capabilities>& GetCapabilities()
+      const override {
+    FML_UNREACHABLE();
+  }
+
+  bool UpdateOffscreenLayerPixelFormat(impeller::PixelFormat format) override {
+    FML_UNREACHABLE();
+  }
+
+  std::shared_ptr<impeller::Allocator> GetResourceAllocator() const override {
+    FML_UNREACHABLE();
+  }
+
+  std::shared_ptr<impeller::ShaderLibrary> GetShaderLibrary() const override {
+    FML_UNREACHABLE();
+  }
+
+  std::shared_ptr<impeller::SamplerLibrary> GetSamplerLibrary() const override {
+    FML_UNREACHABLE();
+  }
+
+  std::shared_ptr<impeller::PipelineLibrary> GetPipelineLibrary()
+      const override {
+    FML_UNREACHABLE();
+  }
+
+  std::shared_ptr<impeller::CommandBuffer> CreateCommandBuffer()
+      const override {
+    FML_UNREACHABLE();
+  }
+
+  std::shared_ptr<impeller::CommandQueue> GetCommandQueue() const override {
+    FML_UNREACHABLE();
+  }
+
+  void Shutdown() override { did_shutdown = true; }
+
+  bool did_shutdown = false;
+};
+
+class TestAndroidContext : public AndroidContext {
+ public:
+  TestAndroidContext(const std::shared_ptr<impeller::Context>& impeller_context,
+                     AndroidRenderingAPI rendering_api)
+      : AndroidContext(rendering_api) {
+    SetImpellerContext(impeller_context);
+  }
+};
+
 TEST(AndroidContextGl, Create) {
   GrMockOptions main_context_options;
   sk_sp<GrDirectContext> main_context =
@@ -83,17 +105,28 @@ TEST(AndroidContextGl, Create) {
       ::testing::UnitTest::GetInstance()->current_test_info()->name();
 
   ThreadHost thread_host(ThreadHost::ThreadHostConfig(
-      thread_label,
-      ThreadHost::Type::UI | ThreadHost::Type::RASTER | ThreadHost::Type::IO));
+      thread_label, ThreadHost::Type::kUi | ThreadHost::Type::kRaster |
+                        ThreadHost::Type::kIo));
   TaskRunners task_runners = MakeTaskRunners(thread_label, thread_host);
-  auto context = std::make_unique<AndroidContextGLSkia>(
-      AndroidRenderingAPI::kOpenGLES, environment, task_runners, 0);
+  auto context =
+      std::make_unique<AndroidContextGLSkia>(environment, task_runners, 0);
   context->SetMainSkiaContext(main_context);
   EXPECT_NE(context.get(), nullptr);
   context.reset();
   EXPECT_TRUE(main_context->abandoned());
 }
 
+TEST(AndroidContextGl, CreateImpeller) {
+  auto impeller_context = std::make_shared<TestImpellerContext>();
+  auto android_context = std::make_unique<TestAndroidContext>(
+      impeller_context, AndroidRenderingAPI::kImpellerOpenGLES);
+  EXPECT_FALSE(impeller_context->did_shutdown);
+
+  android_context.reset();
+
+  EXPECT_TRUE(impeller_context->did_shutdown);
+}
+
 TEST(AndroidContextGl, CreateSingleThread) {
   GrMockOptions main_context_options;
   sk_sp<GrDirectContext> main_context =
@@ -107,8 +140,8 @@ TEST(AndroidContextGl, CreateSingleThread) {
   TaskRunners task_runners =
       TaskRunners(thread_label, platform_runner, platform_runner,
                   platform_runner, platform_runner);
-  auto context = std::make_unique<AndroidContextGLSkia>(
-      AndroidRenderingAPI::kOpenGLES, environment, task_runners, 0);
+  auto context =
+      std::make_unique<AndroidContextGLSkia>(environment, task_runners, 0);
   context->SetMainSkiaContext(main_context);
   EXPECT_NE(context.get(), nullptr);
   context.reset();
@@ -123,14 +156,13 @@ TEST(AndroidSurfaceGL, CreateSnapshopSurfaceWhenOnscreenSurfaceIsNotNull) {
   std::string thread_label =
       ::testing::UnitTest::GetInstance()->current_test_info()->name();
   ThreadHost thread_host(ThreadHost::ThreadHostConfig(
-      thread_label,
-      ThreadHost::Type::UI | ThreadHost::Type::RASTER | ThreadHost::Type::IO));
+      thread_label, ThreadHost::Type::kUi | ThreadHost::Type::kRaster |
+                        ThreadHost::Type::kIo));
   TaskRunners task_runners = MakeTaskRunners(thread_label, thread_host);
-  auto android_context = std::make_shared<AndroidContextGLSkia>(
-      AndroidRenderingAPI::kOpenGLES, environment, task_runners, 0);
-  auto jni = std::make_shared<MockPlatformViewAndroidJNI>();
+  auto android_context =
+      std::make_shared<AndroidContextGLSkia>(environment, task_runners, 0);
   auto android_surface =
-      std::make_unique<AndroidSurfaceGLSkia>(android_context, jni);
+      std::make_unique<AndroidSurfaceGLSkia>(android_context);
   auto window = fml::MakeRefCounted<AndroidNativeWindow>(
       nullptr, /*is_fake_window=*/true);
   android_surface->SetNativeWindow(window);
@@ -149,16 +181,15 @@ TEST(AndroidSurfaceGL, CreateSnapshopSurfaceWhenOnscreenSurfaceIsNull) {
       ::testing::UnitTest::GetInstance()->current_test_info()->name();
 
   auto mask =
-      ThreadHost::Type::UI | ThreadHost::Type::RASTER | ThreadHost::Type::IO;
+      ThreadHost::Type::kUi | ThreadHost::Type::kRaster | ThreadHost::Type::kIo;
   flutter::ThreadHost::ThreadHostConfig host_config(mask);
 
   ThreadHost thread_host(host_config);
   TaskRunners task_runners = MakeTaskRunners(thread_label, thread_host);
-  auto android_context = std::make_shared<AndroidContextGLSkia>(
-      AndroidRenderingAPI::kOpenGLES, environment, task_runners, 0);
-  auto jni = std::make_shared<MockPlatformViewAndroidJNI>();
+  auto android_context =
+      std::make_shared<AndroidContextGLSkia>(environment, task_runners, 0);
   auto android_surface =
-      std::make_unique<AndroidSurfaceGLSkia>(android_context, jni);
+      std::make_unique<AndroidSurfaceGLSkia>(android_context);
   EXPECT_EQ(android_surface->GetOnscreenSurface(), nullptr);
   android_surface->CreateSnapshotSurface();
   EXPECT_NE(android_surface->GetOnscreenSurface(), nullptr);
@@ -174,11 +205,11 @@ TEST(AndroidContextGl, DISABLED_MSAAx4) {
       ::testing::UnitTest::GetInstance()->current_test_info()->name();
 
   ThreadHost thread_host(ThreadHost::ThreadHostConfig(
-      thread_label,
-      ThreadHost::Type::UI | ThreadHost::Type::RASTER | ThreadHost::Type::IO));
+      thread_label, ThreadHost::Type::kUi | ThreadHost::Type::kRaster |
+                        ThreadHost::Type::kIo));
   TaskRunners task_runners = MakeTaskRunners(thread_label, thread_host);
-  auto context = std::make_unique<AndroidContextGLSkia>(
-      AndroidRenderingAPI::kOpenGLES, environment, task_runners, 4);
+  auto context =
+      std::make_unique<AndroidContextGLSkia>(environment, task_runners, 4);
   context->SetMainSkiaContext(main_context);
 
   EGLint sample_count;
@@ -196,11 +227,11 @@ TEST(AndroidContextGl, EnsureMakeCurrentChecksCurrentContextStatus) {
       ::testing::UnitTest::GetInstance()->current_test_info()->name();
 
   ThreadHost thread_host(ThreadHost::ThreadHostConfig(
-      thread_label,
-      ThreadHost::Type::UI | ThreadHost::Type::RASTER | ThreadHost::Type::IO));
+      thread_label, ThreadHost::Type::kUi | ThreadHost::Type::kRaster |
+                        ThreadHost::Type::kIo));
   TaskRunners task_runners = MakeTaskRunners(thread_label, thread_host);
-  auto context = std::make_unique<AndroidContextGLSkia>(
-      AndroidRenderingAPI::kOpenGLES, environment, task_runners, 0);
+  auto context =
+      std::make_unique<AndroidContextGLSkia>(environment, task_runners, 0);
 
   auto pbuffer_surface = context->CreatePbufferSurface();
   auto status = pbuffer_surface->MakeCurrent();
diff --git a/shell/platform/android/android_context_vulkan_impeller.cc b/shell/platform/android/android_context_vulkan_impeller.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ecbeea6405f5de73653c8dfa15a5e64966ccc1f6
--- /dev/null
+++ b/shell/platform/android/android_context_vulkan_impeller.cc
@@ -0,0 +1,92 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/platform/android/android_context_vulkan_impeller.h"
+
+#include "flutter/fml/paths.h"
+#include "flutter/impeller/entity/vk/entity_shaders_vk.h"
+#include "flutter/impeller/entity/vk/framebuffer_blend_shaders_vk.h"
+#include "flutter/impeller/entity/vk/modern_shaders_vk.h"
+#include "flutter/impeller/renderer/backend/vulkan/context_vk.h"
+
+#if IMPELLER_ENABLE_3D
+#include "flutter/impeller/scene/shaders/vk/scene_shaders_vk.h"  // nogncheck
+#endif  // IMPELLER_ENABLE_3D
+
+namespace flutter {
+
+static std::shared_ptr<impeller::Context> CreateImpellerContext(
+    const fml::RefPtr<fml::NativeLibrary>& vulkan_dylib,
+    bool enable_vulkan_validation,
+    bool enable_gpu_tracing,
+    bool quiet) {
+  if (!vulkan_dylib) {
+    VALIDATION_LOG << "Could not open the Vulkan dylib.";
+    return nullptr;
+  }
+
+  std::vector<std::shared_ptr<fml::Mapping>> shader_mappings = {
+      std::make_shared<fml::NonOwnedMapping>(impeller_entity_shaders_vk_data,
+                                             impeller_entity_shaders_vk_length),
+      std::make_shared<fml::NonOwnedMapping>(
+          impeller_framebuffer_blend_shaders_vk_data,
+          impeller_framebuffer_blend_shaders_vk_length),
+#if IMPELLER_ENABLE_3D
+      std::make_shared<fml::NonOwnedMapping>(impeller_scene_shaders_vk_data,
+                                             impeller_scene_shaders_vk_length),
+#endif
+      std::make_shared<fml::NonOwnedMapping>(impeller_modern_shaders_vk_data,
+                                             impeller_modern_shaders_vk_length),
+  };
+
+  auto instance_proc_addr =
+      vulkan_dylib->ResolveFunction<PFN_vkGetInstanceProcAddr>(
+          "vkGetInstanceProcAddr");
+
+  if (!instance_proc_addr.has_value()) {
+    VALIDATION_LOG << "Could not setup Vulkan proc table.";
+    return nullptr;
+  }
+
+  impeller::ContextVK::Settings settings;
+  settings.proc_address_callback = instance_proc_addr.value();
+  settings.shader_libraries_data = std::move(shader_mappings);
+  settings.cache_directory = fml::paths::GetCachesDirectory();
+  settings.enable_validation = enable_vulkan_validation;
+  settings.enable_gpu_tracing = enable_gpu_tracing;
+
+  auto context = impeller::ContextVK::Create(std::move(settings));
+
+  if (!quiet) {
+    if (context && impeller::CapabilitiesVK::Cast(*context->GetCapabilities())
+                       .AreValidationsEnabled()) {
+      FML_LOG(IMPORTANT) << "Using the Impeller rendering backend (Vulkan with "
+                            "Validation Layers).";
+    } else {
+      FML_LOG(IMPORTANT) << "Using the Impeller rendering backend (Vulkan).";
+    }
+  }
+
+  return context;
+}
+
+AndroidContextVulkanImpeller::AndroidContextVulkanImpeller(
+    bool enable_validation,
+    bool enable_gpu_tracing,
+    bool quiet)
+    : AndroidContext(AndroidRenderingAPI::kImpellerVulkan),
+      vulkan_dylib_(fml::NativeLibrary::Create("libvulkan.so")) {
+  auto impeller_context = CreateImpellerContext(
+      vulkan_dylib_, enable_validation, enable_gpu_tracing, quiet);
+  SetImpellerContext(impeller_context);
+  is_valid_ = !!impeller_context;
+}
+
+AndroidContextVulkanImpeller::~AndroidContextVulkanImpeller() = default;
+
+bool AndroidContextVulkanImpeller::IsValid() const {
+  return is_valid_;
+}
+
+}  // namespace flutter
diff --git a/shell/platform/android/android_context_vulkan_impeller.h b/shell/platform/android/android_context_vulkan_impeller.h
new file mode 100644
index 0000000000000000000000000000000000000000..cd9be6946ad7664914ba989fd06dd4846288828b
--- /dev/null
+++ b/shell/platform/android/android_context_vulkan_impeller.h
@@ -0,0 +1,35 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_CONTEXT_VULKAN_IMPELLER_H_
+#define FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_CONTEXT_VULKAN_IMPELLER_H_
+
+#include "flutter/fml/concurrent_message_loop.h"
+#include "flutter/fml/macros.h"
+#include "flutter/fml/native_library.h"
+#include "flutter/shell/platform/android/context/android_context.h"
+
+namespace flutter {
+
+class AndroidContextVulkanImpeller : public AndroidContext {
+ public:
+  AndroidContextVulkanImpeller(bool enable_validation,
+                               bool enable_gpu_tracing,
+                               bool quiet = false);
+
+  ~AndroidContextVulkanImpeller();
+
+  // |AndroidContext|
+  bool IsValid() const override;
+
+ private:
+  fml::RefPtr<fml::NativeLibrary> vulkan_dylib_;
+  bool is_valid_ = false;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(AndroidContextVulkanImpeller);
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_CONTEXT_VULKAN_IMPELLER_H_
diff --git a/shell/platform/android/android_display.cc b/shell/platform/android/android_display.cc
index edd378bff15d6b2175b3c2c2159d416ac6158fcf..9547341957b6726982a3823608e4e13dcd7e1a58 100644
--- a/shell/platform/android/android_display.cc
+++ b/shell/platform/android/android_display.cc
@@ -3,17 +3,32 @@
 // found in the LICENSE file.
 
 #include "flutter/shell/platform/android/android_display.h"
-#include "android_display.h"
 
 namespace flutter {
 
 AndroidDisplay::AndroidDisplay(
     std::shared_ptr<PlatformViewAndroidJNI> jni_facade)
-    : Display(jni_facade->GetDisplayRefreshRate()),
+    : Display(0,
+              jni_facade->GetDisplayRefreshRate(),
+              jni_facade->GetDisplayWidth(),
+              jni_facade->GetDisplayHeight(),
+              jni_facade->GetDisplayDensity()),
       jni_facade_(std::move(jni_facade)) {}
 
 double AndroidDisplay::GetRefreshRate() const {
   return jni_facade_->GetDisplayRefreshRate();
 }
 
+double AndroidDisplay::GetWidth() const {
+  return jni_facade_->GetDisplayWidth();
+}
+
+double AndroidDisplay::GetHeight() const {
+  return jni_facade_->GetDisplayHeight();
+}
+
+double AndroidDisplay::GetDevicePixelRatio() const {
+  return jni_facade_->GetDisplayDensity();
+}
+
 }  // namespace flutter
diff --git a/shell/platform/android/android_display.h b/shell/platform/android/android_display.h
index 524779af2f067754331c4b600fddc8855dfa130a..c3eb9c33905d19723c1565a9202ee0059ea6e126 100644
--- a/shell/platform/android/android_display.h
+++ b/shell/platform/android/android_display.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_DISPLAY_H_
-#define FLUTTER_SHELL_PLATFORM_ANDROID_DISPLAY_H_
+#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_DISPLAY_H_
+#define FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_DISPLAY_H_
 
 #include <cstdint>
 
@@ -22,6 +22,15 @@ class AndroidDisplay : public Display {
   // |Display|
   double GetRefreshRate() const override;
 
+  // |Display|
+  virtual double GetWidth() const override;
+
+  // |Display|
+  virtual double GetHeight() const override;
+
+  // |Display|
+  virtual double GetDevicePixelRatio() const override;
+
  private:
   std::shared_ptr<PlatformViewAndroidJNI> jni_facade_;
 
@@ -30,4 +39,4 @@ class AndroidDisplay : public Display {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_DISPLAY_H_
+#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_DISPLAY_H_
diff --git a/shell/platform/android/android_egl_surface.cc b/shell/platform/android/android_egl_surface.cc
index ed03ced47d2a72f78fa96a99a45eb5756e8c2c72..d4f3fc648eead4cb781c4d72b307d43c5b14a39a 100644
--- a/shell/platform/android/android_egl_surface.cc
+++ b/shell/platform/android/android_egl_surface.cc
@@ -58,128 +58,27 @@ void LogLastEGLError() {
   FML_LOG(ERROR) << "Unknown EGL Error";
 }
 
-namespace {
-
-static bool HasExtension(const char* extensions, const char* name) {
-  const char* r = strstr(extensions, name);
-  auto len = strlen(name);
-  // check that the extension name is terminated by space or null terminator
-  return r != nullptr && (r[len] == ' ' || r[len] == 0);
-}
-
-}  // namespace
-
 class AndroidEGLSurfaceDamage {
  public:
-  void init(EGLDisplay display, EGLContext context) {
-    if (GetAPILevel() < 29) {
-      // Disable partial repaint for devices older than Android 10. There
-      // are old devices that have extensions below available but the
-      // implementation causes glitches (i.e. Xperia Z3 with Android 6).
-      partial_redraw_supported_ = false;
-      return;
-    }
-
-    const char* extensions = eglQueryString(display, EGL_EXTENSIONS);
-
-    if (HasExtension(extensions, "EGL_KHR_partial_update")) {
-      set_damage_region_ = reinterpret_cast<PFNEGLSETDAMAGEREGIONKHRPROC>(
-          eglGetProcAddress("eglSetDamageRegionKHR"));
-    }
-
-    if (HasExtension(extensions, "EGL_EXT_swap_buffers_with_damage")) {
-      swap_buffers_with_damage_ =
-          reinterpret_cast<PFNEGLSWAPBUFFERSWITHDAMAGEEXTPROC>(
-              eglGetProcAddress("eglSwapBuffersWithDamageEXT"));
-    } else if (HasExtension(extensions, "EGL_KHR_swap_buffers_with_damage")) {
-      swap_buffers_with_damage_ =
-          reinterpret_cast<PFNEGLSWAPBUFFERSWITHDAMAGEEXTPROC>(
-              eglGetProcAddress("eglSwapBuffersWithDamageKHR"));
-    }
-
-    partial_redraw_supported_ =
-        set_damage_region_ != nullptr && swap_buffers_with_damage_ != nullptr;
-  }
-
-  static int GetAPILevel() {
-    char sdk_version_string[PROP_VALUE_MAX];
-    if (__system_property_get("ro.build.version.sdk", sdk_version_string)) {
-      return atoi(sdk_version_string);
-    } else {
-      return -1;
-    }
-  }
+  void init(EGLDisplay display, EGLContext context) {}
 
   void SetDamageRegion(EGLDisplay display,
                        EGLSurface surface,
-                       const std::optional<SkIRect>& region) {
-    if (set_damage_region_ && region) {
-      auto rects = RectToInts(display, surface, *region);
-      set_damage_region_(display, surface, rects.data(), 1);
-    }
-  }
-
-  // Maximum damage history - for triple buffering we need to store damage for
-  // last two frames; Some Android devices (Pixel 4) use quad buffering.
-  static const int kMaxHistorySize = 10;
+                       const std::optional<SkIRect>& region) {}
 
-  bool SupportsPartialRepaint() const { return partial_redraw_supported_; }
+  /// This was disabled after discussion in
+  /// https://github.com/flutter/flutter/issues/123353
+  bool SupportsPartialRepaint() const { return false; }
 
   std::optional<SkIRect> InitialDamage(EGLDisplay display, EGLSurface surface) {
-    if (!partial_redraw_supported_) {
-      return std::nullopt;
-    }
-
-    EGLint age;
-    eglQuerySurface(display, surface, EGL_BUFFER_AGE_EXT, &age);
-
-    if (age == 0) {  // full repaint
-      return std::nullopt;
-    } else {
-      // join up to (age - 1) last rects from damage history
-      --age;
-      auto res = SkIRect::MakeEmpty();
-      for (auto i = damage_history_.rbegin();
-           i != damage_history_.rend() && age > 0; ++i, --age) {
-        res.join(*i);
-      }
-      return res;
-    }
+    return std::nullopt;
   }
 
   bool SwapBuffersWithDamage(EGLDisplay display,
                              EGLSurface surface,
                              const std::optional<SkIRect>& damage) {
-    if (swap_buffers_with_damage_ && damage) {
-      damage_history_.push_back(*damage);
-      if (damage_history_.size() > kMaxHistorySize) {
-        damage_history_.pop_front();
-      }
-      auto rects = RectToInts(display, surface, *damage);
-      return swap_buffers_with_damage_(display, surface, rects.data(), 1);
-    } else {
-      return eglSwapBuffers(display, surface);
-    }
-  }
-
- private:
-  std::array<EGLint, 4> static RectToInts(EGLDisplay display,
-                                          EGLSurface surface,
-                                          const SkIRect& rect) {
-    EGLint height;
-    eglQuerySurface(display, surface, EGL_HEIGHT, &height);
-
-    std::array<EGLint, 4> res{rect.left(), height - rect.bottom(), rect.width(),
-                              rect.height()};
-    return res;
+    return eglSwapBuffers(display, surface);
   }
-
-  PFNEGLSETDAMAGEREGIONKHRPROC set_damage_region_ = nullptr;
-  PFNEGLSWAPBUFFERSWITHDAMAGEEXTPROC swap_buffers_with_damage_ = nullptr;
-
-  bool partial_redraw_supported_;
-
-  std::list<SkIRect> damage_history_;
 };
 
 AndroidEGLSurface::AndroidEGLSurface(EGLSurface surface,
@@ -188,8 +87,7 @@ AndroidEGLSurface::AndroidEGLSurface(EGLSurface surface,
     : surface_(surface),
       display_(display),
       context_(context),
-      damage_(std::make_unique<AndroidEGLSurfaceDamage>()),
-      presentation_time_proc_(nullptr) {
+      damage_(std::make_unique<AndroidEGLSurfaceDamage>()) {
   damage_->init(display_, context);
 }
 
diff --git a/shell/platform/android/android_egl_surface.h b/shell/platform/android/android_egl_surface.h
index f5a7e74ad0084b9389ed4ce7be6141ef9b6b0992..7ab45e03666dd8c9cbff628039aa4211f3e9f482 100644
--- a/shell/platform/android/android_egl_surface.h
+++ b/shell/platform/android/android_egl_surface.h
@@ -108,7 +108,7 @@ class AndroidEGLSurface {
   const EGLDisplay display_;
   const EGLContext context_;
   std::unique_ptr<AndroidEGLSurfaceDamage> damage_;
-  PFNEGLPRESENTATIONTIMEANDROIDPROC presentation_time_proc_;
+  PFNEGLPRESENTATIONTIMEANDROIDPROC presentation_time_proc_ = nullptr;
 };
 
 }  // namespace flutter
diff --git a/shell/platform/android/android_environment_gl.cc b/shell/platform/android/android_environment_gl.cc
index f384ee2d0835d0ae1a360650b13c84868b0a2f7c..88e81e6cec5aea33493581a833224429b51aa50e 100644
--- a/shell/platform/android/android_environment_gl.cc
+++ b/shell/platform/android/android_environment_gl.cc
@@ -6,8 +6,7 @@
 
 namespace flutter {
 
-AndroidEnvironmentGL::AndroidEnvironmentGL()
-    : display_(EGL_NO_DISPLAY), valid_(false) {
+AndroidEnvironmentGL::AndroidEnvironmentGL() : display_(EGL_NO_DISPLAY) {
   // Get the display.
   display_ = eglGetDisplay(EGL_DEFAULT_DISPLAY);
 
diff --git a/shell/platform/android/android_environment_gl.h b/shell/platform/android/android_environment_gl.h
index 23031a775d3902cd6ee85da9c09a5d05d613a88d..299a6c5c22b7eb98dd7c01900382203ed57f234e 100644
--- a/shell/platform/android/android_environment_gl.h
+++ b/shell/platform/android/android_environment_gl.h
@@ -28,7 +28,7 @@ class AndroidEnvironmentGL
 
  private:
   EGLDisplay display_;
-  bool valid_;
+  bool valid_ = false;
 
   FML_FRIEND_MAKE_REF_COUNTED(AndroidEnvironmentGL);
   FML_FRIEND_REF_COUNTED_THREAD_SAFE(AndroidEnvironmentGL);
diff --git a/shell/platform/android/android_image_generator.cc b/shell/platform/android/android_image_generator.cc
index 714eef933b145963bd4e5be4ce72e2fb757f25d7..9ba4c050c9a9afa3a1045e20e23d27f9df831e5d 100644
--- a/shell/platform/android/android_image_generator.cc
+++ b/shell/platform/android/android_image_generator.cc
@@ -38,7 +38,7 @@ unsigned int AndroidImageGenerator::GetPlayCount() const {
 }
 
 const ImageGenerator::FrameInfo AndroidImageGenerator::GetFrameInfo(
-    unsigned int frame_index) const {
+    unsigned int frame_index) {
   return {.required_frame = std::nullopt,
           .duration = 0,
           .disposal_method = SkCodecAnimation::DisposalMethod::kKeep};
diff --git a/shell/platform/android/android_image_generator.h b/shell/platform/android/android_image_generator.h
index 6d13c94116492c89de45479a86b722c29f5f8f3c..53cbadde10afc5768d9215c8667b8f4c021c7fd9 100644
--- a/shell/platform/android/android_image_generator.h
+++ b/shell/platform/android/android_image_generator.h
@@ -32,7 +32,7 @@ class AndroidImageGenerator : public ImageGenerator {
 
   // |ImageGenerator|
   const ImageGenerator::FrameInfo GetFrameInfo(
-      unsigned int frame_index) const override;
+      unsigned int frame_index) override;
 
   // |ImageGenerator|
   SkISize GetScaledDimensions(float desired_scale) override;
diff --git a/shell/platform/android/android_shell_holder.cc b/shell/platform/android/android_shell_holder.cc
index 79605a574345f27a2f7fc35e7890b0ac80f96091..e73295890632865a3beca1af581da96d43182b59 100644
--- a/shell/platform/android/android_shell_holder.cc
+++ b/shell/platform/android/android_shell_holder.cc
@@ -16,6 +16,7 @@
 #include <string>
 #include <utility>
 
+#include "flutter/fml/cpu_affinity.h"
 #include "flutter/fml/logging.h"
 #include "flutter/fml/make_copyable.h"
 #include "flutter/fml/message_loop.h"
@@ -40,19 +41,22 @@ static void AndroidPlatformThreadConfigSetter(
   fml::Thread::SetCurrentThreadName(config);
   // set thread priority
   switch (config.priority) {
-    case fml::Thread::ThreadPriority::BACKGROUND: {
+    case fml::Thread::ThreadPriority::kBackground: {
+      fml::RequestAffinity(fml::CpuAffinity::kEfficiency);
       if (::setpriority(PRIO_PROCESS, 0, 10) != 0) {
         FML_LOG(ERROR) << "Failed to set IO task runner priority";
       }
       break;
     }
-    case fml::Thread::ThreadPriority::DISPLAY: {
+    case fml::Thread::ThreadPriority::kDisplay: {
+      fml::RequestAffinity(fml::CpuAffinity::kPerformance);
       if (::setpriority(PRIO_PROCESS, 0, -1) != 0) {
         FML_LOG(ERROR) << "Failed to set UI task runner priority";
       }
       break;
     }
-    case fml::Thread::ThreadPriority::RASTER: {
+    case fml::Thread::ThreadPriority::kRaster: {
+      fml::RequestAffinity(fml::CpuAffinity::kPerformance);
       // Android describes -8 as "most important display threads, for
       // compositing the screen and retrieving input events". Conservatively
       // set the raster thread to slightly lower priority than it.
@@ -66,6 +70,7 @@ static void AndroidPlatformThreadConfigSetter(
       break;
     }
     default:
+      fml::RequestAffinity(fml::CpuAffinity::kNotPerformance);
       if (::setpriority(PRIO_PROCESS, 0, 0) != 0) {
         FML_LOG(ERROR) << "Failed to set priority";
       }
@@ -85,22 +90,22 @@ AndroidShellHolder::AndroidShellHolder(
   auto thread_label = std::to_string(thread_host_count++);
 
   auto mask =
-      ThreadHost::Type::UI | ThreadHost::Type::RASTER | ThreadHost::Type::IO;
+      ThreadHost::Type::kUi | ThreadHost::Type::kRaster | ThreadHost::Type::kIo;
 
   flutter::ThreadHost::ThreadHostConfig host_config(
       thread_label, mask, AndroidPlatformThreadConfigSetter);
   host_config.ui_config = fml::Thread::ThreadConfig(
       flutter::ThreadHost::ThreadHostConfig::MakeThreadName(
-          flutter::ThreadHost::Type::UI, thread_label),
-      fml::Thread::ThreadPriority::DISPLAY);
+          flutter::ThreadHost::Type::kUi, thread_label),
+      fml::Thread::ThreadPriority::kDisplay);
   host_config.raster_config = fml::Thread::ThreadConfig(
       flutter::ThreadHost::ThreadHostConfig::MakeThreadName(
-          flutter::ThreadHost::Type::RASTER, thread_label),
-      fml::Thread::ThreadPriority::RASTER);
+          flutter::ThreadHost::Type::kRaster, thread_label),
+      fml::Thread::ThreadPriority::kRaster);
   host_config.io_config = fml::Thread::ThreadConfig(
       flutter::ThreadHost::ThreadHostConfig::MakeThreadName(
-          flutter::ThreadHost::Type::IO, thread_label),
-      fml::Thread::ThreadPriority::NORMAL);
+          flutter::ThreadHost::Type::kIo, thread_label),
+      fml::Thread::ThreadPriority::kNormal);
 
   thread_host_ = std::make_shared<ThreadHost>(host_config);
 
@@ -117,10 +122,6 @@ AndroidShellHolder::AndroidShellHolder(
             shell.GetSettings().msaa_samples  // msaa sample count
         );
         weak_platform_view = platform_view_android->GetWeakPtr();
-        std::vector<std::unique_ptr<Display>> displays;
-        displays.push_back(std::make_unique<AndroidDisplay>(jni_facade));
-        shell.OnDisplayUpdates(DisplayUpdateType::kStartup,
-                               std::move(displays));
         return platform_view_android;
       };
 
@@ -180,12 +181,14 @@ AndroidShellHolder::AndroidShellHolder(
     const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade,
     const std::shared_ptr<ThreadHost>& thread_host,
     std::unique_ptr<Shell> shell,
+    std::unique_ptr<APKAssetProvider> apk_asset_provider,
     const fml::WeakPtr<PlatformViewAndroid>& platform_view)
     : settings_(settings),
       jni_facade_(jni_facade),
       platform_view_(platform_view),
       thread_host_(thread_host),
-      shell_(std::move(shell)) {
+      shell_(std::move(shell)),
+      apk_asset_provider_(std::move(apk_asset_provider)) {
   FML_DCHECK(jni_facade);
   FML_DCHECK(shell_);
   FML_DCHECK(shell_->IsSetup());
@@ -246,10 +249,6 @@ std::unique_ptr<AndroidShellHolder> AndroidShellHolder::Spawn(
             android_context          // Android context
         );
         weak_platform_view = platform_view_android->GetWeakPtr();
-        std::vector<std::unique_ptr<Display>> displays;
-        displays.push_back(std::make_unique<AndroidDisplay>(jni_facade));
-        shell.OnDisplayUpdates(DisplayUpdateType::kStartup,
-                               std::move(displays));
         return platform_view_android;
       };
 
@@ -270,9 +269,9 @@ std::unique_ptr<AndroidShellHolder> AndroidShellHolder::Spawn(
       shell_->Spawn(std::move(config.value()), initial_route,
                     on_create_platform_view, on_create_rasterizer);
 
-  return std::unique_ptr<AndroidShellHolder>(
-      new AndroidShellHolder(GetSettings(), jni_facade, thread_host_,
-                             std::move(shell), weak_platform_view));
+  return std::unique_ptr<AndroidShellHolder>(new AndroidShellHolder(
+      GetSettings(), jni_facade, thread_host_, std::move(shell),
+      apk_asset_provider_->Clone(), weak_platform_view));
 }
 
 void AndroidShellHolder::Launch(
@@ -289,6 +288,7 @@ void AndroidShellHolder::Launch(
   if (!config) {
     return;
   }
+  UpdateDisplayMetrics();
   shell_->RunEngine(std::move(config.value()));
 }
 
@@ -296,7 +296,8 @@ Rasterizer::Screenshot AndroidShellHolder::Screenshot(
     Rasterizer::ScreenshotType type,
     bool base64_encode) {
   if (!IsValid()) {
-    return {nullptr, SkISize::MakeEmpty()};
+    return {nullptr, SkISize::MakeEmpty(), "",
+            Rasterizer::ScreenshotFormat::kUnknown};
   }
   return shell_->Screenshot(type, base64_encode);
 }
@@ -346,4 +347,10 @@ std::optional<RunConfiguration> AndroidShellHolder::BuildRunConfiguration(
   return config;
 }
 
+void AndroidShellHolder::UpdateDisplayMetrics() {
+  std::vector<std::unique_ptr<Display>> displays;
+  displays.push_back(std::make_unique<AndroidDisplay>(jni_facade_));
+  shell_->OnDisplayUpdates(std::move(displays));
+}
+
 }  // namespace flutter
diff --git a/shell/platform/android/android_shell_holder.h b/shell/platform/android/android_shell_holder.h
index 36c0b9629f34b8b529b13bdb8c82a4d0bc6c4a40..30530a896204b426368358717594b785e9e172c0 100644
--- a/shell/platform/android/android_shell_holder.h
+++ b/shell/platform/android/android_shell_holder.h
@@ -103,6 +103,8 @@ class AndroidShellHolder {
     return shell_->GetPlatformMessageHandler();
   }
 
+  void UpdateDisplayMetrics();
+
  private:
   const flutter::Settings settings_;
   const std::shared_ptr<PlatformViewAndroidJNI> jni_facade_;
@@ -128,6 +130,7 @@ class AndroidShellHolder {
                      const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade,
                      const std::shared_ptr<ThreadHost>& thread_host,
                      std::unique_ptr<Shell> shell,
+                     std::unique_ptr<APKAssetProvider> apk_asset_provider,
                      const fml::WeakPtr<PlatformViewAndroid>& platform_view);
   static void ThreadDestructCallback(void* value);
   std::optional<RunConfiguration> BuildRunConfiguration(
diff --git a/shell/platform/android/android_shell_holder_unittests.cc b/shell/platform/android/android_shell_holder_unittests.cc
index 85cb352e005f956fdbc618049dd324af1bd4d71d..ba13dd99187c46902f1c65721e90e99e8f49ae76 100644
--- a/shell/platform/android/android_shell_holder_unittests.cc
+++ b/shell/platform/android/android_shell_holder_unittests.cc
@@ -1,56 +1,112 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 #include <memory>
+
 #include "flutter/shell/platform/android/android_shell_holder.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
+#include "shell/platform/android/jni/platform_view_android_jni.h"
 
 namespace flutter {
 namespace testing {
 namespace {
 class MockPlatformViewAndroidJNI : public PlatformViewAndroidJNI {
  public:
-  MOCK_METHOD2(FlutterViewHandlePlatformMessage,
-               void(std::unique_ptr<flutter::PlatformMessage> message,
-                    int responseId));
-  MOCK_METHOD2(FlutterViewHandlePlatformMessageResponse,
-               void(int responseId, std::unique_ptr<fml::Mapping> data));
-  MOCK_METHOD3(FlutterViewUpdateSemantics,
-               void(std::vector<uint8_t> buffer,
-                    std::vector<std::string> strings,
-                    std::vector<std::vector<uint8_t>> string_attribute_args));
-  MOCK_METHOD2(FlutterViewUpdateCustomAccessibilityActions,
-               void(std::vector<uint8_t> actions_buffer,
-                    std::vector<std::string> strings));
-  MOCK_METHOD0(FlutterViewOnFirstFrame, void());
-  MOCK_METHOD0(FlutterViewOnPreEngineRestart, void());
-  MOCK_METHOD2(SurfaceTextureAttachToGLContext,
-               void(JavaLocalRef surface_texture, int textureId));
-  MOCK_METHOD1(SurfaceTextureUpdateTexImage,
-               void(JavaLocalRef surface_texture));
-  MOCK_METHOD2(SurfaceTextureGetTransformMatrix,
-               void(JavaLocalRef surface_texture, SkMatrix& transform));
-  MOCK_METHOD1(SurfaceTextureDetachFromGLContext,
-               void(JavaLocalRef surface_texture));
-  MOCK_METHOD8(FlutterViewOnDisplayPlatformView,
-               void(int view_id,
-                    int x,
-                    int y,
-                    int width,
-                    int height,
-                    int viewWidth,
-                    int viewHeight,
-                    MutatorsStack mutators_stack));
-  MOCK_METHOD5(FlutterViewDisplayOverlaySurface,
-               void(int surface_id, int x, int y, int width, int height));
-  MOCK_METHOD0(FlutterViewBeginFrame, void());
-  MOCK_METHOD0(FlutterViewEndFrame, void());
-  MOCK_METHOD0(FlutterViewCreateOverlaySurface,
-               std::unique_ptr<PlatformViewAndroidJNI::OverlayMetadata>());
-  MOCK_METHOD0(FlutterViewDestroyOverlaySurfaces, void());
-  MOCK_METHOD1(FlutterViewComputePlatformResolvedLocale,
-               std::unique_ptr<std::vector<std::string>>(
-                   std::vector<std::string> supported_locales_data));
-  MOCK_METHOD0(GetDisplayRefreshRate, double());
-  MOCK_METHOD1(RequestDartDeferredLibrary, bool(int loading_unit_id));
+  MOCK_METHOD(void,
+              FlutterViewHandlePlatformMessage,
+              (std::unique_ptr<flutter::PlatformMessage> message,
+               int responseId),
+              (override));
+  MOCK_METHOD(void,
+              FlutterViewHandlePlatformMessageResponse,
+              (int responseId, std::unique_ptr<fml::Mapping> data),
+              (override));
+  MOCK_METHOD(void,
+              FlutterViewUpdateSemantics,
+              (std::vector<uint8_t> buffer,
+               std::vector<std::string> strings,
+               std::vector<std::vector<uint8_t>> string_attribute_args),
+              (override));
+  MOCK_METHOD(void,
+              FlutterViewUpdateCustomAccessibilityActions,
+              (std::vector<uint8_t> actions_buffer,
+               std::vector<std::string> strings),
+              (override));
+  MOCK_METHOD(void, FlutterViewOnFirstFrame, (), (override));
+  MOCK_METHOD(void, FlutterViewOnPreEngineRestart, (), (override));
+  MOCK_METHOD(void,
+              SurfaceTextureAttachToGLContext,
+              (JavaLocalRef surface_texture, int textureId),
+              (override));
+  MOCK_METHOD(bool,
+              SurfaceTextureShouldUpdate,
+              (JavaLocalRef surface_texture),
+              (override));
+  MOCK_METHOD(void,
+              SurfaceTextureUpdateTexImage,
+              (JavaLocalRef surface_texture),
+              (override));
+  MOCK_METHOD(void,
+              SurfaceTextureGetTransformMatrix,
+              (JavaLocalRef surface_texture, SkMatrix& transform),
+              (override));
+  MOCK_METHOD(void,
+              SurfaceTextureDetachFromGLContext,
+              (JavaLocalRef surface_texture),
+              (override));
+  MOCK_METHOD(JavaLocalRef,
+              ImageProducerTextureEntryAcquireLatestImage,
+              (JavaLocalRef image_texture_entry),
+              (override));
+  MOCK_METHOD(JavaLocalRef,
+              ImageGetHardwareBuffer,
+              (JavaLocalRef image),
+              (override));
+  MOCK_METHOD(void, ImageClose, (JavaLocalRef image), (override));
+  MOCK_METHOD(void,
+              HardwareBufferClose,
+              (JavaLocalRef hardware_buffer),
+              (override));
+  MOCK_METHOD(void,
+              FlutterViewOnDisplayPlatformView,
+              (int view_id,
+               int x,
+               int y,
+               int width,
+               int height,
+               int viewWidth,
+               int viewHeight,
+               MutatorsStack mutators_stack),
+              (override));
+  MOCK_METHOD(void,
+              FlutterViewDisplayOverlaySurface,
+              (int surface_id, int x, int y, int width, int height),
+              (override));
+  MOCK_METHOD(void, FlutterViewBeginFrame, (), (override));
+  MOCK_METHOD(void, FlutterViewEndFrame, (), (override));
+  MOCK_METHOD(std::unique_ptr<PlatformViewAndroidJNI::OverlayMetadata>,
+              FlutterViewCreateOverlaySurface,
+              (),
+              (override));
+  MOCK_METHOD(void, FlutterViewDestroyOverlaySurfaces, (), (override));
+  MOCK_METHOD(std::unique_ptr<std::vector<std::string>>,
+              FlutterViewComputePlatformResolvedLocale,
+              (std::vector<std::string> supported_locales_data),
+              (override));
+  MOCK_METHOD(double, GetDisplayRefreshRate, (), (override));
+  MOCK_METHOD(double, GetDisplayWidth, (), (override));
+  MOCK_METHOD(double, GetDisplayHeight, (), (override));
+  MOCK_METHOD(double, GetDisplayDensity, (), (override));
+  MOCK_METHOD(bool,
+              RequestDartDeferredLibrary,
+              (int loading_unit_id),
+              (override));
+  MOCK_METHOD(double,
+              FlutterViewGetScaledFontSize,
+              (double font_size, int configuration_id),
+              (const, override));
 };
 
 class MockPlatformMessageResponse : public PlatformMessageResponse {
@@ -58,8 +114,8 @@ class MockPlatformMessageResponse : public PlatformMessageResponse {
   static fml::RefPtr<MockPlatformMessageResponse> Create() {
     return fml::AdoptRef(new MockPlatformMessageResponse());
   }
-  MOCK_METHOD1(Complete, void(std::unique_ptr<fml::Mapping> data));
-  MOCK_METHOD0(CompleteEmpty, void());
+  MOCK_METHOD(void, Complete, (std::unique_ptr<fml::Mapping> data), (override));
+  MOCK_METHOD(void, CompleteEmpty, (), (override));
 };
 }  // namespace
 
diff --git a/shell/platform/android/android_surface_gl_impeller.cc b/shell/platform/android/android_surface_gl_impeller.cc
index 5d66ab422ffd7d910c1b5c0248022c6a34872f5b..df5b0a32a0364e3a44c2457bbfda52094217d232 100644
--- a/shell/platform/android/android_surface_gl_impeller.cc
+++ b/shell/platform/android/android_surface_gl_impeller.cc
@@ -5,10 +5,6 @@
 #include "flutter/shell/platform/android/android_surface_gl_impeller.h"
 
 #include "flutter/fml/logging.h"
-#include "flutter/impeller/entity/gles/entity_shaders_gles.h"
-#include "flutter/impeller/renderer/backend/gles/context_gles.h"
-#include "flutter/impeller/renderer/backend/gles/proc_table_gles.h"
-#include "flutter/impeller/toolkit/egl/context.h"
 #include "flutter/impeller/toolkit/egl/surface.h"
 #include "flutter/shell/gpu/gpu_surface_gl_impeller.h"
 
@@ -18,163 +14,16 @@
 
 namespace flutter {
 
-class AndroidSurfaceGLImpeller::ReactorWorker final
-    : public impeller::ReactorGLES::Worker {
- public:
-  ReactorWorker() = default;
-
-  // |impeller::ReactorGLES::Worker|
-  ~ReactorWorker() override = default;
-
-  // |impeller::ReactorGLES::Worker|
-  bool CanReactorReactOnCurrentThreadNow(
-      const impeller::ReactorGLES& reactor) const override {
-    impeller::ReaderLock lock(mutex_);
-    auto found = reactions_allowed_.find(std::this_thread::get_id());
-    if (found == reactions_allowed_.end()) {
-      return false;
-    }
-    return found->second;
-  }
-
-  void SetReactionsAllowedOnCurrentThread(bool allowed) {
-    impeller::WriterLock lock(mutex_);
-    reactions_allowed_[std::this_thread::get_id()] = allowed;
-  }
-
- private:
-  mutable impeller::RWMutex mutex_;
-  std::map<std::thread::id, bool> reactions_allowed_ IPLR_GUARDED_BY(mutex_);
-
-  FML_DISALLOW_COPY_AND_ASSIGN(ReactorWorker);
-};
-
-static std::shared_ptr<impeller::Context> CreateImpellerContext(
-    const std::shared_ptr<impeller::ReactorGLES::Worker>& worker) {
-  auto proc_table = std::make_unique<impeller::ProcTableGLES>(
-      impeller::egl::CreateProcAddressResolver());
-
-  if (!proc_table->IsValid()) {
-    FML_LOG(ERROR) << "Could not create OpenGL proc table.";
-    return nullptr;
-  }
-
-  std::vector<std::shared_ptr<fml::Mapping>> shader_mappings = {
-      std::make_shared<fml::NonOwnedMapping>(
-          impeller_entity_shaders_gles_data,
-          impeller_entity_shaders_gles_length),
-  };
-
-  auto context =
-      impeller::ContextGLES::Create(std::move(proc_table), shader_mappings);
-  if (!context) {
-    FML_LOG(ERROR) << "Could not create OpenGLES Impeller Context.";
-    return nullptr;
-  }
-
-  if (!context->AddReactorWorker(worker).has_value()) {
-    FML_LOG(ERROR) << "Could not add reactor worker.";
-    return nullptr;
-  }
-  FML_LOG(ERROR) << "Using the Impeller rendering backend.";
-  return context;
-}
-
 AndroidSurfaceGLImpeller::AndroidSurfaceGLImpeller(
-    const std::shared_ptr<AndroidContext>& android_context,
-    const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade)
-    : AndroidSurface(android_context),
-      reactor_worker_(std::shared_ptr<ReactorWorker>(new ReactorWorker())) {
-  auto display = std::make_unique<impeller::egl::Display>();
-  if (!display->IsValid()) {
-    FML_DLOG(ERROR) << "Could not create EGL display.";
-    return;
-  }
+    const std::shared_ptr<AndroidContextGLImpeller>& android_context)
+    : android_context_(android_context) {
+  offscreen_surface_ = android_context_->CreateOffscreenSurface();
 
-  impeller::egl::ConfigDescriptor desc;
-  desc.api = impeller::egl::API::kOpenGLES2;
-  desc.color_format = impeller::egl::ColorFormat::kRGBA8888;
-  desc.depth_bits = impeller::egl::DepthBits::kZero;
-  desc.stencil_bits = impeller::egl::StencilBits::kEight;
-  desc.samples = impeller::egl::Samples::kFour;
-
-  desc.surface_type = impeller::egl::SurfaceType::kWindow;
-  auto onscreen_config = display->ChooseConfig(desc);
-  if (!onscreen_config) {
-    FML_DLOG(ERROR) << "Could not choose onscreen config.";
-    return;
-  }
-
-  desc.surface_type = impeller::egl::SurfaceType::kPBuffer;
-  auto offscreen_config = display->ChooseConfig(desc);
-  if (!offscreen_config) {
-    FML_DLOG(ERROR) << "Could not choose offscreen config.";
-    return;
-  }
-
-  auto onscreen_context = display->CreateContext(*onscreen_config, nullptr);
-  if (!onscreen_context) {
-    FML_DLOG(ERROR) << "Could not create onscreen context.";
-    return;
-  }
-
-  auto offscreen_context =
-      display->CreateContext(*offscreen_config, onscreen_context.get());
-  if (!offscreen_context) {
-    FML_DLOG(ERROR) << "Could not create offscreen context.";
-    return;
-  }
-
-  auto offscreen_surface =
-      display->CreatePixelBufferSurface(*offscreen_config, 1u, 1u);
-  if (!offscreen_surface) {
+  if (!offscreen_surface_) {
     FML_DLOG(ERROR) << "Could not create offscreen surface.";
     return;
   }
 
-  if (!offscreen_context->MakeCurrent(*offscreen_surface)) {
-    FML_DLOG(ERROR) << "Could not make offscreen context current.";
-    return;
-  }
-
-  auto impeller_context = CreateImpellerContext(reactor_worker_);
-
-  if (!impeller_context) {
-    FML_DLOG(ERROR) << "Could not create Impeller context.";
-    return;
-  }
-
-  if (!offscreen_context->ClearCurrent()) {
-    FML_DLOG(ERROR) << "Could not clear offscreen context.";
-    return;
-  }
-
-  // Setup context listeners.
-  impeller::egl::Context::LifecycleListener listener =
-      [worker =
-           reactor_worker_](impeller::egl ::Context::LifecycleEvent event) {
-        switch (event) {
-          case impeller::egl::Context::LifecycleEvent::kDidMakeCurrent:
-            worker->SetReactionsAllowedOnCurrentThread(true);
-            break;
-          case impeller::egl::Context::LifecycleEvent::kWillClearCurrent:
-            worker->SetReactionsAllowedOnCurrentThread(false);
-            break;
-        }
-      };
-  if (!onscreen_context->AddLifecycleListener(listener).has_value() ||
-      !offscreen_context->AddLifecycleListener(listener).has_value()) {
-    FML_DLOG(ERROR) << "Could not add lifecycle listeners";
-  }
-
-  display_ = std::move(display);
-  onscreen_config_ = std::move(onscreen_config);
-  offscreen_config_ = std::move(offscreen_config);
-  offscreen_surface_ = std::move(offscreen_surface);
-  onscreen_context_ = std::move(onscreen_context);
-  offscreen_context_ = std::move(offscreen_context);
-  impeller_context_ = std::move(impeller_context);
-
   // The onscreen surface will be acquired once the native window is set.
 
   is_valid_ = true;
@@ -190,10 +39,11 @@ bool AndroidSurfaceGLImpeller::IsValid() const {
 // |AndroidSurface|
 std::unique_ptr<Surface> AndroidSurfaceGLImpeller::CreateGPUSurface(
     GrDirectContext* gr_context) {
-  auto surface =
-      std::make_unique<GPUSurfaceGLImpeller>(this,              // delegate
-                                             impeller_context_  // context
-      );
+  auto surface = std::make_unique<GPUSurfaceGLImpeller>(
+      this,                                    // delegate
+      android_context_->GetImpellerContext(),  // context
+      true                                     // render to surface
+  );
   if (!surface->IsValid()) {
     return nullptr;
   }
@@ -215,20 +65,15 @@ bool AndroidSurfaceGLImpeller::OnScreenSurfaceResize(const SkISize& size) {
 
 // |AndroidSurface|
 bool AndroidSurfaceGLImpeller::ResourceContextMakeCurrent() {
-  if (!offscreen_context_ || !offscreen_surface_) {
+  if (!offscreen_surface_) {
     return false;
   }
-
-  return offscreen_context_->MakeCurrent(*offscreen_surface_);
+  return android_context_->ResourceContextMakeCurrent(offscreen_surface_.get());
 }
 
 // |AndroidSurface|
 bool AndroidSurfaceGLImpeller::ResourceContextClearCurrent() {
-  if (!offscreen_context_ || !offscreen_surface_) {
-    return false;
-  }
-
-  return offscreen_context_->ClearCurrent();
+  return android_context_->ResourceContextClearCurrent();
 }
 
 // |AndroidSurface|
@@ -246,7 +91,7 @@ std::unique_ptr<Surface> AndroidSurfaceGLImpeller::CreateSnapshotSurface() {
 // |AndroidSurface|
 std::shared_ptr<impeller::Context>
 AndroidSurfaceGLImpeller::GetImpellerContext() {
-  return impeller_context_;
+  return android_context_->GetImpellerContext();
 }
 
 // |GPUSurfaceGLDelegate|
@@ -256,20 +101,20 @@ AndroidSurfaceGLImpeller::GLContextMakeCurrent() {
 }
 
 bool AndroidSurfaceGLImpeller::OnGLContextMakeCurrent() {
-  if (!onscreen_surface_ || !onscreen_context_) {
+  if (!onscreen_surface_) {
     return false;
   }
 
-  return onscreen_context_->MakeCurrent(*onscreen_surface_);
+  return android_context_->OnscreenContextMakeCurrent(onscreen_surface_.get());
 }
 
 // |GPUSurfaceGLDelegate|
 bool AndroidSurfaceGLImpeller::GLContextClearCurrent() {
-  if (!onscreen_surface_ || !onscreen_context_) {
+  if (!onscreen_surface_) {
     return false;
   }
 
-  return onscreen_context_->ClearCurrent();
+  return android_context_->OnscreenContextClearCurrent();
 }
 
 // |GPUSurfaceGLDelegate|
@@ -318,8 +163,8 @@ bool AndroidSurfaceGLImpeller::
     return false;
   }
   onscreen_surface_.reset();
-  auto onscreen_surface = display_->CreateWindowSurface(
-      *onscreen_config_, native_window_->handle());
+  auto onscreen_surface =
+      android_context_->CreateOnscreenSurface(native_window_->handle());
   if (!onscreen_surface) {
     FML_DLOG(ERROR) << "Could not create onscreen surface.";
     return false;
diff --git a/shell/platform/android/android_surface_gl_impeller.h b/shell/platform/android/android_surface_gl_impeller.h
index b8ca423072f60d233292c23cf836caff1f70e0b2..3066a8552ee25476e36b2aeda2238661e72b80a7 100644
--- a/shell/platform/android/android_surface_gl_impeller.h
+++ b/shell/platform/android/android_surface_gl_impeller.h
@@ -7,8 +7,8 @@
 
 #include "flutter/fml/macros.h"
 #include "flutter/impeller/renderer/context.h"
-#include "flutter/impeller/toolkit/egl/display.h"
 #include "flutter/shell/gpu/gpu_surface_gl_delegate.h"
+#include "flutter/shell/platform/android/android_context_gl_impeller.h"
 #include "flutter/shell/platform/android/surface/android_native_window.h"
 #include "flutter/shell/platform/android/surface/android_surface.h"
 
@@ -17,9 +17,8 @@ namespace flutter {
 class AndroidSurfaceGLImpeller final : public GPUSurfaceGLDelegate,
                                        public AndroidSurface {
  public:
-  AndroidSurfaceGLImpeller(
-      const std::shared_ptr<AndroidContext>& android_context,
-      const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade);
+  explicit AndroidSurfaceGLImpeller(
+      const std::shared_ptr<AndroidContextGLImpeller>& android_context);
 
   // |AndroidSurface|
   ~AndroidSurfaceGLImpeller() override;
@@ -74,17 +73,9 @@ class AndroidSurfaceGLImpeller final : public GPUSurfaceGLDelegate,
   sk_sp<const GrGLInterface> GetGLInterface() const override;
 
  private:
-  class ReactorWorker;
-
-  std::shared_ptr<ReactorWorker> reactor_worker_;
-  std::unique_ptr<impeller::egl::Display> display_;
-  std::unique_ptr<impeller::egl::Config> onscreen_config_;
-  std::unique_ptr<impeller::egl::Config> offscreen_config_;
+  std::shared_ptr<AndroidContextGLImpeller> android_context_;
   std::unique_ptr<impeller::egl::Surface> onscreen_surface_;
   std::unique_ptr<impeller::egl::Surface> offscreen_surface_;
-  std::unique_ptr<impeller::egl::Context> onscreen_context_;
-  std::unique_ptr<impeller::egl::Context> offscreen_context_;
-  std::shared_ptr<impeller::Context> impeller_context_;
   fml::RefPtr<AndroidNativeWindow> native_window_;
 
   bool is_valid_ = false;
diff --git a/shell/platform/android/android_surface_gl_skia.cc b/shell/platform/android/android_surface_gl_skia.cc
index 343d691e2ae75e02c2f053415d7e01a5d140de1f..6a5dda8a06082c302fb80c4b029a7c50c29cc504 100644
--- a/shell/platform/android/android_surface_gl_skia.cc
+++ b/shell/platform/android/android_surface_gl_skia.cc
@@ -21,14 +21,13 @@ constexpr char kEmulatorRendererPrefix[] =
 }  // anonymous namespace
 
 AndroidSurfaceGLSkia::AndroidSurfaceGLSkia(
-    const std::shared_ptr<AndroidContext>& android_context,
-    const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade)
-    : AndroidSurface(android_context),
+    const std::shared_ptr<AndroidContextGLSkia>& android_context)
+    : android_context_(android_context),
       native_window_(nullptr),
       onscreen_surface_(nullptr),
       offscreen_surface_(nullptr) {
   // Acquire the offscreen surface.
-  offscreen_surface_ = GLContextPtr()->CreateOffscreenSurface();
+  offscreen_surface_ = android_context_->CreateOffscreenSurface();
   if (!offscreen_surface_->IsValid()) {
     offscreen_surface_ = nullptr;
   }
@@ -40,12 +39,12 @@ void AndroidSurfaceGLSkia::TeardownOnScreenContext() {
   // When the onscreen surface is destroyed, the context and the surface
   // instance should be deleted. Issue:
   // https://github.com/flutter/flutter/issues/64414
-  GLContextPtr()->ClearCurrent();
+  android_context_->ClearCurrent();
   onscreen_surface_ = nullptr;
 }
 
 bool AndroidSurfaceGLSkia::IsValid() const {
-  return offscreen_surface_ && GLContextPtr()->IsValid();
+  return offscreen_surface_ && android_context_->IsValid();
 }
 
 std::unique_ptr<Surface> AndroidSurfaceGLSkia::CreateGPUSurface(
@@ -55,10 +54,10 @@ std::unique_ptr<Surface> AndroidSurfaceGLSkia::CreateGPUSurface(
                                               true);
   } else {
     sk_sp<GrDirectContext> main_skia_context =
-        GLContextPtr()->GetMainSkiaContext();
+        android_context_->GetMainSkiaContext();
     if (!main_skia_context) {
       main_skia_context = GPUSurfaceGLSkia::MakeGLContext(this);
-      GLContextPtr()->SetMainSkiaContext(main_skia_context);
+      android_context_->SetMainSkiaContext(main_skia_context);
     }
     return std::make_unique<GPUSurfaceGLSkia>(main_skia_context, this, true);
   }
@@ -73,12 +72,12 @@ bool AndroidSurfaceGLSkia::OnScreenSurfaceResize(const SkISize& size) {
     return true;
   }
 
-  GLContextPtr()->ClearCurrent();
+  android_context_->ClearCurrent();
 
   // Ensure the destructor is called since it destroys the `EGLSurface` before
   // creating a new onscreen surface.
   onscreen_surface_ = nullptr;
-  onscreen_surface_ = GLContextPtr()->CreateOnscreenSurface(native_window_);
+  onscreen_surface_ = android_context_->CreateOnscreenSurface(native_window_);
   if (!onscreen_surface_->IsValid()) {
     FML_LOG(ERROR) << "Unable to create EGL window surface on resize.";
     return false;
@@ -109,7 +108,7 @@ bool AndroidSurfaceGLSkia::SetNativeWindow(
   // creating a new onscreen surface.
   onscreen_surface_ = nullptr;
   // Create the onscreen surface.
-  onscreen_surface_ = GLContextPtr()->CreateOnscreenSurface(window);
+  onscreen_surface_ = android_context_->CreateOnscreenSurface(window);
   if (!onscreen_surface_->IsValid()) {
     return false;
   }
@@ -127,7 +126,7 @@ std::unique_ptr<GLContextResult> AndroidSurfaceGLSkia::GLContextMakeCurrent() {
 
 bool AndroidSurfaceGLSkia::GLContextClearCurrent() {
   FML_DCHECK(IsValid());
-  return GLContextPtr()->ClearCurrent();
+  return android_context_->ClearCurrent();
 }
 
 SurfaceFrame::FramebufferInfo AndroidSurfaceGLSkia::GLContextFramebufferInfo()
@@ -167,7 +166,6 @@ GLFBOInfo AndroidSurfaceGLSkia::GLContextFBO(GLFrameInfo frame_info) const {
   // The default window bound framebuffer on Android.
   return GLFBOInfo{
       .fbo_id = 0,
-      .partial_repaint_enabled = onscreen_surface_->SupportsPartialRepaint(),
       .existing_damage = onscreen_surface_->InitialDamage(),
   };
 }
@@ -186,7 +184,7 @@ sk_sp<const GrGLInterface> AndroidSurfaceGLSkia::GetGLInterface() const {
       reinterpret_cast<const char*>(glGetString(GL_RENDERER));
   if (gl_renderer && strncmp(gl_renderer, kEmulatorRendererPrefix,
                              strlen(kEmulatorRendererPrefix)) == 0) {
-    EGLContext new_context = GLContextPtr()->CreateNewContext();
+    EGLContext new_context = android_context_->CreateNewContext();
     if (new_context != EGL_NO_CONTEXT) {
       EGLContext old_context = eglGetCurrentContext();
       EGLDisplay display = eglGetCurrentDisplay();
@@ -205,19 +203,15 @@ sk_sp<const GrGLInterface> AndroidSurfaceGLSkia::GetGLInterface() const {
   return GPUSurfaceGLDelegate::GetGLInterface();
 }
 
-AndroidContextGLSkia* AndroidSurfaceGLSkia::GLContextPtr() const {
-  return reinterpret_cast<AndroidContextGLSkia*>(android_context_.get());
-}
-
 std::unique_ptr<Surface> AndroidSurfaceGLSkia::CreateSnapshotSurface() {
   if (!onscreen_surface_ || !onscreen_surface_->IsValid()) {
-    onscreen_surface_ = GLContextPtr()->CreatePbufferSurface();
+    onscreen_surface_ = android_context_->CreatePbufferSurface();
   }
   sk_sp<GrDirectContext> main_skia_context =
-      GLContextPtr()->GetMainSkiaContext();
+      android_context_->GetMainSkiaContext();
   if (!main_skia_context) {
     main_skia_context = GPUSurfaceGLSkia::MakeGLContext(this);
-    GLContextPtr()->SetMainSkiaContext(main_skia_context);
+    android_context_->SetMainSkiaContext(main_skia_context);
   }
 
   return std::make_unique<GPUSurfaceGLSkia>(main_skia_context, this, true);
diff --git a/shell/platform/android/android_surface_gl_skia.h b/shell/platform/android/android_surface_gl_skia.h
index 274c28f2c67600bf2f5315c9c93836e5ff9a138e..1c35692dc3a0e107ab7c6f4c624ea73eb3ffc351 100644
--- a/shell/platform/android/android_surface_gl_skia.h
+++ b/shell/platform/android/android_surface_gl_skia.h
@@ -21,9 +21,8 @@ namespace flutter {
 class AndroidSurfaceGLSkia final : public GPUSurfaceGLDelegate,
                                    public AndroidSurface {
  public:
-  AndroidSurfaceGLSkia(
-      const std::shared_ptr<AndroidContext>& android_context,
-      const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade);
+  explicit AndroidSurfaceGLSkia(
+      const std::shared_ptr<AndroidContextGLSkia>& android_context);
 
   ~AndroidSurfaceGLSkia() override;
 
@@ -82,16 +81,11 @@ class AndroidSurfaceGLSkia final : public GPUSurfaceGLDelegate,
   }
 
  private:
+  std::shared_ptr<AndroidContextGLSkia> android_context_;
   fml::RefPtr<AndroidNativeWindow> native_window_;
   std::unique_ptr<AndroidEGLSurface> onscreen_surface_;
   std::unique_ptr<AndroidEGLSurface> offscreen_surface_;
 
-  //----------------------------------------------------------------------------
-  /// @brief      Takes the super class AndroidSurface's AndroidContext and
-  ///             return a raw pointer to an AndroidContextGL.
-  ///
-  AndroidContextGLSkia* GLContextPtr() const;
-
   FML_DISALLOW_COPY_AND_ASSIGN(AndroidSurfaceGLSkia);
 };
 
diff --git a/shell/platform/android/android_surface_software.cc b/shell/platform/android/android_surface_software.cc
index 164049d9d9bde4b92206671d36e52f900d6d0ebd..db5881c684b88493ca608981edaf3d92f1eccbed 100644
--- a/shell/platform/android/android_surface_software.cc
+++ b/shell/platform/android/android_surface_software.cc
@@ -13,7 +13,9 @@
 #include "flutter/fml/trace_event.h"
 #include "flutter/shell/platform/android/android_shell_holder.h"
 #include "flutter/shell/platform/android/jni/platform_view_android_jni.h"
+
 #include "third_party/skia/include/core/SkImage.h"
+#include "third_party/skia/include/core/SkSurface.h"
 
 namespace flutter {
 
@@ -38,10 +40,7 @@ bool GetSkColorType(int32_t buffer_format,
 
 }  // anonymous namespace
 
-AndroidSurfaceSoftware::AndroidSurfaceSoftware(
-    const std::shared_ptr<AndroidContext>& android_context,
-    const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade)
-    : AndroidSurface(android_context) {
+AndroidSurfaceSoftware::AndroidSurfaceSoftware() {
   GetSkColorType(WINDOW_FORMAT_RGBA_8888, &target_color_type_,
                  &target_alpha_type_);
 }
@@ -96,7 +95,7 @@ sk_sp<SkSurface> AndroidSurfaceSoftware::AcquireBackingStore(
       SkImageInfo::Make(size.fWidth, size.fHeight, target_color_type_,
                         target_alpha_type_, SkColorSpace::MakeSRGB());
 
-  sk_surface_ = SkSurface::MakeRaster(image_info);
+  sk_surface_ = SkSurfaces::Raster(image_info);
 
   return sk_surface_;
 }
diff --git a/shell/platform/android/android_surface_software.h b/shell/platform/android/android_surface_software.h
index 1ea3fe8637132fc81bc47329807e3e657f412c65..1b7083aa7dda1deb400a8cb0e56d6833fe0f9979 100644
--- a/shell/platform/android/android_surface_software.h
+++ b/shell/platform/android/android_surface_software.h
@@ -12,14 +12,14 @@
 #include "flutter/shell/platform/android/jni/platform_view_android_jni.h"
 #include "flutter/shell/platform/android/surface/android_surface.h"
 
+#include "third_party/skia/include/core/SkSurface.h"
+
 namespace flutter {
 
 class AndroidSurfaceSoftware final : public AndroidSurface,
                                      public GPUSurfaceSoftwareDelegate {
  public:
-  AndroidSurfaceSoftware(
-      const std::shared_ptr<AndroidContext>& android_context,
-      const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade);
+  AndroidSurfaceSoftware();
 
   ~AndroidSurfaceSoftware() override;
 
diff --git a/shell/platform/android/android_surface_vulkan_impeller.cc b/shell/platform/android/android_surface_vulkan_impeller.cc
index b9588df3ac50065b8e9fdc8e3b49fe20e6fbd520..2082d7fef8489c87f0ac8d69cdb0d063d775fef6 100644
--- a/shell/platform/android/android_surface_vulkan_impeller.cc
+++ b/shell/platform/android/android_surface_vulkan_impeller.cc
@@ -13,44 +13,16 @@
 #include "flutter/impeller/renderer/backend/vulkan/context_vk.h"
 #include "flutter/shell/gpu/gpu_surface_vulkan_impeller.h"
 #include "flutter/vulkan/vulkan_native_surface_android.h"
-#include "impeller/entity/vk/entity_shaders_vk.h"
-#include "impeller/entity/vk/modern_shaders_vk.h"
 
 namespace flutter {
 
-std::shared_ptr<impeller::Context> CreateImpellerContext(
-    const fml::RefPtr<vulkan::VulkanProcTable>& proc_table,
-    const std::shared_ptr<fml::ConcurrentMessageLoop>& concurrent_loop) {
-  std::vector<std::shared_ptr<fml::Mapping>> shader_mappings = {
-      std::make_shared<fml::NonOwnedMapping>(impeller_entity_shaders_vk_data,
-                                             impeller_entity_shaders_vk_length),
-      std::make_shared<fml::NonOwnedMapping>(impeller_modern_shaders_vk_data,
-                                             impeller_modern_shaders_vk_length),
-  };
-
-  PFN_vkGetInstanceProcAddr instance_proc_addr =
-      proc_table->NativeGetInstanceProcAddr();
-
-  auto context =
-      impeller::ContextVK::Create(instance_proc_addr,                //
-                                  shader_mappings,                   //
-                                  nullptr,                           //
-                                  concurrent_loop->GetTaskRunner(),  //
-                                  "Android Impeller Vulkan Lib"      //
-      );
-
-  return context;
-}
-
 AndroidSurfaceVulkanImpeller::AndroidSurfaceVulkanImpeller(
-    const std::shared_ptr<AndroidContext>& android_context,
-    const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade)
-    : AndroidSurface(android_context),
-      proc_table_(fml::MakeRefCounted<vulkan::VulkanProcTable>()),
-      workers_(fml::ConcurrentMessageLoop::Create()) {
-  impeller_context_ = CreateImpellerContext(proc_table_, workers_);
-  is_valid_ =
-      proc_table_->HasAcquiredMandatoryProcAddresses() && impeller_context_;
+    const std::shared_ptr<AndroidContextVulkanImpeller>& android_context) {
+  is_valid_ = android_context->IsValid();
+
+  auto& context_vk =
+      impeller::ContextVK::Cast(*android_context->GetImpellerContext());
+  surface_context_vk_ = context_vk.CreateSurfaceContext();
 }
 
 AndroidSurfaceVulkanImpeller::~AndroidSurfaceVulkanImpeller() = default;
@@ -74,7 +46,7 @@ std::unique_ptr<Surface> AndroidSurfaceVulkanImpeller::CreateGPUSurface(
   }
 
   std::unique_ptr<GPUSurfaceVulkanImpeller> gpu_surface =
-      std::make_unique<GPUSurfaceVulkanImpeller>(impeller_context_);
+      std::make_unique<GPUSurfaceVulkanImpeller>(surface_context_vk_);
 
   if (!gpu_surface->IsValid()) {
     return nullptr;
@@ -84,35 +56,34 @@ std::unique_ptr<Surface> AndroidSurfaceVulkanImpeller::CreateGPUSurface(
 }
 
 bool AndroidSurfaceVulkanImpeller::OnScreenSurfaceResize(const SkISize& size) {
+  surface_context_vk_->UpdateSurfaceSize(
+      impeller::ISize{size.width(), size.height()});
   return true;
 }
 
 bool AndroidSurfaceVulkanImpeller::ResourceContextMakeCurrent() {
-  FML_DLOG(ERROR) << "The vulkan backend does not support resource contexts.";
-  return false;
+  return true;
 }
 
 bool AndroidSurfaceVulkanImpeller::ResourceContextClearCurrent() {
-  FML_DLOG(ERROR) << "The vulkan backend does not support resource contexts.";
-  return false;
+  return true;
 }
 
 bool AndroidSurfaceVulkanImpeller::SetNativeWindow(
     fml::RefPtr<AndroidNativeWindow> window) {
   native_window_ = std::move(window);
   bool success = native_window_ && native_window_->IsValid();
-
   if (success) {
-    auto& context_vk = impeller::ContextVK::Cast(*impeller_context_);
-    auto surface = context_vk.CreateAndroidSurface(native_window_->handle());
+    auto surface =
+        surface_context_vk_->CreateAndroidSurface(native_window_->handle());
 
     if (!surface) {
       FML_LOG(ERROR) << "Could not create a vulkan surface.";
       return false;
     }
-
-    context_vk.SetupSwapchain(std::move(surface));
-    return true;
+    auto size = native_window_->GetSize();
+    return surface_context_vk_->SetWindowSurface(
+        std::move(surface), impeller::ISize{size.width(), size.height()});
   }
 
   native_window_ = nullptr;
@@ -121,7 +92,7 @@ bool AndroidSurfaceVulkanImpeller::SetNativeWindow(
 
 std::shared_ptr<impeller::Context>
 AndroidSurfaceVulkanImpeller::GetImpellerContext() {
-  return impeller_context_;
+  return surface_context_vk_;
 }
 
 }  // namespace flutter
diff --git a/shell/platform/android/android_surface_vulkan_impeller.h b/shell/platform/android/android_surface_vulkan_impeller.h
index c96cbd21a8fe1f3a057f8f684e20c6c382dbd2ae..7c5296c180dd324808ac0c8b94b89767c0fa4fb8 100644
--- a/shell/platform/android/android_surface_vulkan_impeller.h
+++ b/shell/platform/android/android_surface_vulkan_impeller.h
@@ -2,22 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_SURFACE_VULKAN_IMPELLER_H_
+#define FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_SURFACE_VULKAN_IMPELLER_H_
 
 #include "flutter/fml/concurrent_message_loop.h"
 #include "flutter/fml/macros.h"
-#include "flutter/impeller/renderer/context.h"
+#include "flutter/impeller/renderer/backend/vulkan/surface_context_vk.h"
+#include "flutter/shell/platform/android/android_context_vulkan_impeller.h"
 #include "flutter/shell/platform/android/surface/android_native_window.h"
 #include "flutter/shell/platform/android/surface/android_surface.h"
-#include "flutter/vulkan/procs/vulkan_proc_table.h"
 
 namespace flutter {
 
 class AndroidSurfaceVulkanImpeller : public AndroidSurface {
  public:
-  AndroidSurfaceVulkanImpeller(
-      const std::shared_ptr<AndroidContext>& android_context,
-      const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade);
+  explicit AndroidSurfaceVulkanImpeller(
+      const std::shared_ptr<AndroidContextVulkanImpeller>& android_context);
 
   ~AndroidSurfaceVulkanImpeller() override;
 
@@ -47,13 +47,13 @@ class AndroidSurfaceVulkanImpeller : public AndroidSurface {
   bool SetNativeWindow(fml::RefPtr<AndroidNativeWindow> window) override;
 
  private:
-  fml::RefPtr<vulkan::VulkanProcTable> proc_table_;
+  std::shared_ptr<impeller::SurfaceContextVK> surface_context_vk_;
   fml::RefPtr<AndroidNativeWindow> native_window_;
-  std::shared_ptr<fml::ConcurrentMessageLoop> workers_;
-  std::shared_ptr<impeller::Context> impeller_context_;
   bool is_valid_ = false;
 
   FML_DISALLOW_COPY_AND_ASSIGN(AndroidSurfaceVulkanImpeller);
 };
 
 }  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_SURFACE_VULKAN_IMPELLER_H_
diff --git a/shell/platform/android/apk_asset_provider.cc b/shell/platform/android/apk_asset_provider.cc
index 663ca6df263b5cccde3e49b5e52a5b5442a614c4..ef5bbd23afe7c1e750590e22da25adf9f750b233 100644
--- a/shell/platform/android/apk_asset_provider.cc
+++ b/shell/platform/android/apk_asset_provider.cc
@@ -10,6 +10,7 @@
 #include <sstream>
 #include <utility>
 
+#include "flutter/assets/asset_resolver.h"
 #include "flutter/fml/logging.h"
 
 namespace flutter {
@@ -103,4 +104,12 @@ std::unique_ptr<APKAssetProvider> APKAssetProvider::Clone() const {
   return std::make_unique<APKAssetProvider>(impl_);
 }
 
+bool APKAssetProvider::operator==(const AssetResolver& other) const {
+  auto other_provider = other.as_apk_asset_provider();
+  if (!other_provider) {
+    return false;
+  }
+  return impl_ == other_provider->impl_;
+}
+
 }  // namespace flutter
diff --git a/shell/platform/android/apk_asset_provider.h b/shell/platform/android/apk_asset_provider.h
index d11ee049a91d476f0220ad44fed2adc4f5a1332c..5d1c472fc06acd41766e66b043d6969f606b1180 100644
--- a/shell/platform/android/apk_asset_provider.h
+++ b/shell/platform/android/apk_asset_provider.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_ASSETS_APK_ASSET_PROVIDER_H_
-#define FLUTTER_ASSETS_APK_ASSET_PROVIDER_H_
+#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_APK_ASSET_PROVIDER_H_
+#define FLUTTER_SHELL_PLATFORM_ANDROID_APK_ASSET_PROVIDER_H_
 
 #include <android/asset_manager_jni.h>
 #include <jni.h>
@@ -43,6 +43,8 @@ class APKAssetProvider final : public AssetResolver {
   // delete the returned pointer.
   APKAssetProviderInternal* GetImpl() const { return impl_.get(); }
 
+  bool operator==(const AssetResolver& other) const override;
+
  private:
   std::shared_ptr<APKAssetProviderInternal> impl_;
 
@@ -59,9 +61,14 @@ class APKAssetProvider final : public AssetResolver {
   std::unique_ptr<fml::Mapping> GetAsMapping(
       const std::string& asset_name) const override;
 
+  // |AssetResolver|
+  const APKAssetProvider* as_apk_asset_provider() const override {
+    return this;
+  }
+
   FML_DISALLOW_COPY_AND_ASSIGN(APKAssetProvider);
 };
 
 }  // namespace flutter
 
-#endif  // FLUTTER_ASSETS_APK_ASSET_PROVIDER_H
+#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_APK_ASSET_PROVIDER_H_
diff --git a/shell/platform/android/apk_asset_provider_unittests.cc b/shell/platform/android/apk_asset_provider_unittests.cc
index 888e70b374317f5d386e574b9d574948d9a2aefa..5f6a7ef894b3558376448797ff27ac6a110a718b 100644
--- a/shell/platform/android/apk_asset_provider_unittests.cc
+++ b/shell/platform/android/apk_asset_provider_unittests.cc
@@ -1,3 +1,7 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 #include "flutter/shell/platform/android/apk_asset_provider.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
@@ -6,12 +10,13 @@ namespace flutter {
 namespace testing {
 class MockAPKAssetProviderImpl : public APKAssetProviderInternal {
  public:
-  MOCK_CONST_METHOD1(
-      GetAsMapping,
-      std::unique_ptr<fml::Mapping>(const std::string& asset_name));
+  MOCK_METHOD(std::unique_ptr<fml::Mapping>,
+              GetAsMapping,
+              (const std::string& asset_name),
+              (const, override));
 };
 
-TEST(APKAssetProvider, Clone) {
+TEST(APKAssetProvider, CloneAndEquals) {
   auto first_provider = std::make_unique<APKAssetProvider>(
       std::make_shared<MockAPKAssetProviderImpl>());
   auto second_provider = std::make_unique<APKAssetProvider>(
@@ -20,6 +25,8 @@ TEST(APKAssetProvider, Clone) {
 
   ASSERT_NE(first_provider->GetImpl(), second_provider->GetImpl());
   ASSERT_EQ(first_provider->GetImpl(), third_provider->GetImpl());
+  ASSERT_FALSE(*first_provider == *second_provider);
+  ASSERT_TRUE(*first_provider == *third_provider);
 }
 }  // namespace testing
 }  // namespace flutter
diff --git a/shell/platform/android/build.gradle b/shell/platform/android/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..3b44b0787bda8c2a7191aafc568fa14a13532d7e
--- /dev/null
+++ b/shell/platform/android/build.gradle
@@ -0,0 +1,65 @@
+// This file only exists to provide IDE support to Android Studio.
+//
+// See ./README.md for details.
+
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath "com.android.tools.build:gradle:7.4.2"
+    }
+}
+
+repositories {
+    google()
+    mavenCentral()
+}
+
+apply plugin: "com.android.library"
+
+android {
+    compileSdkVersion 34
+
+    defaultConfig {
+        minSdkVersion 21
+    }
+
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs './'
+            java.include './io.flutter/**'
+            test {
+                java.srcDir './test'
+                java.include './test/io.flutter/**'
+            }
+        }
+    }
+
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+        }
+
+    }
+
+    dependencies {
+        implementation fileTree(include: ["*.jar"], dir: "../../../../third_party/android_embedding_dependencies/lib/")
+
+        // These dependencies should be kept in line with those in the ./test_runner/build.gradle
+        implementation "androidx.test:core:1.4.0"
+        implementation "com.google.android.play:core:1.8.0"
+        implementation "com.ibm.icu:icu4j:69.1"
+        implementation "org.robolectric:robolectric:4.11.1"
+        implementation "junit:junit:4.13.2"
+        implementation "androidx.test.ext:junit:1.1.4-alpha07"
+
+        def mockitoVersion = "4.7.0"
+        implementation "org.mockito:mockito-core:$mockitoVersion"
+        implementation "org.mockito:mockito-inline:$mockitoVersion"
+        implementation "org.mockito:mockito-android:$mockitoVersion"
+    }
+}
+
diff --git a/shell/platform/android/context/BUILD.gn b/shell/platform/android/context/BUILD.gn
index 89918491187d31bcb454954606a784dd82f83c5f..31c5f0ecb95aba74a1e48a8d88e9e09a4d2d88db 100644
--- a/shell/platform/android/context/BUILD.gn
+++ b/shell/platform/android/context/BUILD.gn
@@ -14,8 +14,10 @@ source_set("context") {
   public_configs = [ "//flutter:config" ]
 
   deps = [
+    "//flutter/common",
     "//flutter/fml",
-    "//third_party/skia",
+    "//flutter/impeller/renderer",
+    "//flutter/skia",
   ]
 
   if (shell_enable_vulkan) {
diff --git a/shell/platform/android/context/android_context.cc b/shell/platform/android/context/android_context.cc
index 1d4badf9543b7eea5fe2027f1bac973de6ae31c1..ed0970cb73d12cbe0a85aef76b0e821ec480a36c 100644
--- a/shell/platform/android/context/android_context.cc
+++ b/shell/platform/android/context/android_context.cc
@@ -13,6 +13,9 @@ AndroidContext::~AndroidContext() {
   if (main_context_) {
     main_context_->releaseResourcesAndAbandonContext();
   }
+  if (impeller_context_) {
+    impeller_context_->Shutdown();
+  }
 };
 
 AndroidRenderingAPI AndroidContext::RenderingApi() const {
@@ -32,4 +35,13 @@ sk_sp<GrDirectContext> AndroidContext::GetMainSkiaContext() const {
   return main_context_;
 }
 
+std::shared_ptr<impeller::Context> AndroidContext::GetImpellerContext() const {
+  return impeller_context_;
+}
+
+void AndroidContext::SetImpellerContext(
+    const std::shared_ptr<impeller::Context>& context) {
+  impeller_context_ = context;
+}
+
 }  // namespace flutter
diff --git a/shell/platform/android/context/android_context.h b/shell/platform/android/context/android_context.h
index 0bed23e39867497ad9a471de17d1480798fb6e8e..598787fd701174ff7ae6f26553d7d260d0ff5a2d 100644
--- a/shell/platform/android/context/android_context.h
+++ b/shell/platform/android/context/android_context.h
@@ -2,20 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_CONTEXT_H_
-#define FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_CONTEXT_H_
+#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_CONTEXT_ANDROID_CONTEXT_H_
+#define FLUTTER_SHELL_PLATFORM_ANDROID_CONTEXT_ANDROID_CONTEXT_H_
 
+#include "common/settings.h"
 #include "flutter/fml/macros.h"
 #include "flutter/fml/task_runner.h"
+#include "flutter/impeller/renderer/context.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
 
 namespace flutter {
 
-enum class AndroidRenderingAPI {
-  kSoftware,
-  kOpenGLES,
-};
-
 //------------------------------------------------------------------------------
 /// @brief      Holds state that is shared across Android surfaces.
 ///
@@ -54,15 +51,28 @@ class AndroidContext {
   ///
   sk_sp<GrDirectContext> GetMainSkiaContext() const;
 
+  //----------------------------------------------------------------------------
+  /// @brief      Accessor for the Impeller context associated with
+  ///             AndroidSurfaces and the raster thread.
+  ///
+  std::shared_ptr<impeller::Context> GetImpellerContext() const;
+
+ protected:
+  /// Intended to be called from a subclass constructor after setup work for the
+  /// context has completed.
+  void SetImpellerContext(const std::shared_ptr<impeller::Context>& context);
+
  private:
   const AndroidRenderingAPI rendering_api_;
 
   // This is the Skia context used for on-screen rendering.
   sk_sp<GrDirectContext> main_context_;
 
+  std::shared_ptr<impeller::Context> impeller_context_;
+
   FML_DISALLOW_COPY_AND_ASSIGN(AndroidContext);
 };
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_CONTEXT_H_
+#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_CONTEXT_ANDROID_CONTEXT_H_
diff --git a/shell/platform/android/external_view_embedder/BUILD.gn b/shell/platform/android/external_view_embedder/BUILD.gn
index 44bcdaddae28004b19881ef2a8fe59b6c2ef5205..44ae1106df18216425b7e0f4b4fcbdeca3815ec0 100644
--- a/shell/platform/android/external_view_embedder/BUILD.gn
+++ b/shell/platform/android/external_view_embedder/BUILD.gn
@@ -22,7 +22,7 @@ source_set("external_view_embedder") {
     "//flutter/shell/platform/android/context",
     "//flutter/shell/platform/android/jni",
     "//flutter/shell/platform/android/surface",
-    "//third_party/skia",
+    "//flutter/skia",
   ]
 }
 
diff --git a/shell/platform/android/external_view_embedder/external_view_embedder.cc b/shell/platform/android/external_view_embedder/external_view_embedder.cc
index c1054c78b9ee641d45fb74e2b9ed4c71f630d196..f6ce9eb1612732b39dcb46dd71629c2eeb9ebf7c 100644
--- a/shell/platform/android/external_view_embedder/external_view_embedder.cc
+++ b/shell/platform/android/external_view_embedder/external_view_embedder.cc
@@ -3,13 +3,9 @@
 // found in the LICENSE file.
 
 #include "flutter/shell/platform/android/external_view_embedder/external_view_embedder.h"
-
-#include <utility>
-
+#include "flutter/common/constants.h"
 #include "flutter/fml/synchronization/waitable_event.h"
-#include "flutter/fml/task_runner.h"
 #include "flutter/fml/trace_event.h"
-#include "flutter/shell/platform/android/surface/android_surface.h"
 
 namespace flutter {
 
@@ -27,18 +23,14 @@ AndroidExternalViewEmbedder::AndroidExternalViewEmbedder(
 
 // |ExternalViewEmbedder|
 void AndroidExternalViewEmbedder::PrerollCompositeEmbeddedView(
-    int view_id,
+    int64_t view_id,
     std::unique_ptr<EmbeddedViewParams> params) {
   TRACE_EVENT0("flutter",
                "AndroidExternalViewEmbedder::PrerollCompositeEmbeddedView");
 
   SkRect view_bounds = SkRect::Make(frame_size_);
   std::unique_ptr<EmbedderViewSlice> view;
-  if (params->display_list_enabled()) {
-    view = std::make_unique<DisplayListEmbedderViewSlice>(view_bounds);
-  } else {
-    view = std::make_unique<SkPictureEmbedderViewSlice>(view_bounds);
-  }
+  view = std::make_unique<DisplayListEmbedderViewSlice>(view_bounds);
   slices_.insert_or_assign(view_id, std::move(view));
 
   composition_order_.push_back(view_id);
@@ -51,40 +43,14 @@ void AndroidExternalViewEmbedder::PrerollCompositeEmbeddedView(
 }
 
 // |ExternalViewEmbedder|
-EmbedderPaintContext AndroidExternalViewEmbedder::CompositeEmbeddedView(
-    int view_id) {
+DlCanvas* AndroidExternalViewEmbedder::CompositeEmbeddedView(int64_t view_id) {
   if (slices_.count(view_id) == 1) {
-    return {slices_.at(view_id)->canvas(), slices_.at(view_id)->builder()};
-  }
-  return {nullptr, nullptr};
-}
-
-// |ExternalViewEmbedder|
-std::vector<SkCanvas*> AndroidExternalViewEmbedder::GetCurrentCanvases() {
-  std::vector<SkCanvas*> canvases;
-  for (size_t i = 0; i < composition_order_.size(); i++) {
-    int64_t view_id = composition_order_[i];
-    if (slices_.count(view_id) == 1) {
-      canvases.push_back(slices_.at(view_id)->canvas());
-    }
-  }
-  return canvases;
-}
-
-// |ExternalViewEmbedder|
-std::vector<DisplayListBuilder*>
-AndroidExternalViewEmbedder::GetCurrentBuilders() {
-  std::vector<DisplayListBuilder*> builders;
-  for (size_t i = 0; i < composition_order_.size(); i++) {
-    int64_t view_id = composition_order_[i];
-    if (slices_.count(view_id) == 1) {
-      builders.push_back(slices_.at(view_id)->builder());
-    }
+    return slices_.at(view_id)->canvas();
   }
-  return builders;
+  return nullptr;
 }
 
-SkRect AndroidExternalViewEmbedder::GetViewRect(int view_id) const {
+SkRect AndroidExternalViewEmbedder::GetViewRect(int64_t view_id) const {
   const EmbeddedViewParams& params = view_params_.at(view_id);
   // TODO(egarciad): The rect should be computed from the mutator stack.
   // (Clipping is missing)
@@ -97,10 +63,15 @@ SkRect AndroidExternalViewEmbedder::GetViewRect(int view_id) const {
 }
 
 // |ExternalViewEmbedder|
-void AndroidExternalViewEmbedder::SubmitFrame(
+void AndroidExternalViewEmbedder::SubmitFlutterView(
+    int64_t flutter_view_id,
     GrDirectContext* context,
+    const std::shared_ptr<impeller::AiksContext>& aiks_context,
     std::unique_ptr<SurfaceFrame> frame) {
-  TRACE_EVENT0("flutter", "AndroidExternalViewEmbedder::SubmitFrame");
+  TRACE_EVENT0("flutter", "AndroidExternalViewEmbedder::SubmitFlutterView");
+  // TODO(dkwingsmt): This class only supports rendering into the implicit view.
+  // Properly support multi-view in the future.
+  FML_DCHECK(flutter_view_id == kFlutterImplicitViewId);
 
   if (!FrameHasPlatformLayers()) {
     frame->Submit();
@@ -108,14 +79,12 @@ void AndroidExternalViewEmbedder::SubmitFrame(
   }
 
   std::unordered_map<int64_t, SkRect> overlay_layers;
-  std::unordered_map<int64_t, sk_sp<SkPicture>> pictures;
-  SkCanvas* background_canvas = frame->SkiaCanvas();
-  DisplayListBuilder* background_builder = frame->GetDisplayListBuilder().get();
+  DlCanvas* background_canvas = frame->Canvas();
   auto current_frame_view_count = composition_order_.size();
 
   // Restore the clip context after exiting this method since it's changed
   // below.
-  SkAutoCanvasRestore save(background_canvas, /*doSave=*/true);
+  DlAutoCanvasRestore save(background_canvas, /*do_save=*/true);
 
   for (size_t i = 0; i < current_frame_view_count; i++) {
     int64_t view_id = composition_order_[i];
@@ -126,7 +95,7 @@ void AndroidExternalViewEmbedder::SubmitFrame(
 
     slice->end_recording();
 
-    SkRect joined_rect = SkRect::MakeEmpty();
+    SkRect full_joined_rect = SkRect::MakeEmpty();
 
     // Determinate if Flutter UI intersects with any of the previous
     // platform views stacked by z position.
@@ -137,40 +106,44 @@ void AndroidExternalViewEmbedder::SubmitFrame(
     for (ssize_t j = i; j >= 0; j--) {
       int64_t current_view_id = composition_order_[j];
       SkRect current_view_rect = GetViewRect(current_view_id);
+      // The rect above the `current_view_rect`
+      SkRect partial_joined_rect = SkRect::MakeEmpty();
       // Each rect corresponds to a native view that renders Flutter UI.
-      std::list<SkRect> intersection_rects =
-          slice->searchNonOverlappingDrawnRects(current_view_rect);
+      std::vector<SkIRect> intersection_rects =
+          slice->region(current_view_rect).getRects();
 
       // Limit the number of native views, so it doesn't grow forever.
       //
       // In this case, the rects are merged into a single one that is the union
       // of all the rects.
-      for (const SkRect& rect : intersection_rects) {
-        joined_rect.join(rect);
+      for (const SkIRect& rect : intersection_rects) {
+        partial_joined_rect.join(SkRect::Make(rect));
       }
+      // Get the intersection rect with the `current_view_rect`,
+      partial_joined_rect.intersect(current_view_rect);
+      // Join the `partial_joined_rect` into `full_joined_rect` to get the rect
+      // above the current `slice`
+      full_joined_rect.join(partial_joined_rect);
     }
-    if (!joined_rect.isEmpty()) {
+    if (!full_joined_rect.isEmpty()) {
       // Subpixels in the platform may not align with the canvas subpixels.
       //
       // To workaround it, round the floating point bounds and make the rect
       // slightly larger.
       //
       // For example, {0.3, 0.5, 3.1, 4.7} becomes {0, 0, 4, 5}.
-      joined_rect.set(joined_rect.roundOut());
-      overlay_layers.insert({view_id, joined_rect});
+      full_joined_rect.set(full_joined_rect.roundOut());
+      overlay_layers.insert({view_id, full_joined_rect});
       // Clip the background canvas, so it doesn't contain any of the pixels
       // drawn on the overlay layer.
-      background_canvas->clipRect(joined_rect, SkClipOp::kDifference);
-    }
-    if (background_builder) {
-      slice->render_into(background_builder);
-    } else {
-      slice->render_into(background_canvas);
+      background_canvas->ClipRect(full_joined_rect,
+                                  DlCanvas::ClipOp::kDifference);
     }
+    slice->render_into(background_canvas);
   }
 
-  // Manually trigger the SkAutoCanvasRestore before we submit the frame
-  save.restore();
+  // Manually trigger the DlAutoCanvasRestore before we submit the frame
+  save.Restore();
 
   // Submit the background canvas frame before switching the GL context to
   // the overlay surfaces.
@@ -233,22 +206,18 @@ AndroidExternalViewEmbedder::CreateSurfaceIfNeeded(GrDirectContext* context,
                                                 rect.width(),  //
                                                 rect.height()  //
   );
-  SkCanvas* overlay_canvas = frame->SkiaCanvas();
-  overlay_canvas->clear(SK_ColorTRANSPARENT);
+  DlCanvas* overlay_canvas = frame->Canvas();
+  overlay_canvas->Clear(DlColor::kTransparent());
   // Offset the picture since its absolute position on the scene is determined
   // by the position of the overlay view.
-  overlay_canvas->translate(-rect.x(), -rect.y());
-  if (frame->GetDisplayListBuilder()) {
-    slice->render_into(frame->GetDisplayListBuilder().get());
-  } else {
-    slice->render_into(overlay_canvas);
-  }
+  overlay_canvas->Translate(-rect.x(), -rect.y());
+  slice->render_into(overlay_canvas);
   return frame;
 }
 
 // |ExternalViewEmbedder|
 PostPrerollResult AndroidExternalViewEmbedder::PostPrerollAction(
-    fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
+    const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {
   if (!FrameHasPlatformLayers()) {
     return PostPrerollResult::kSuccess;
   }
@@ -279,7 +248,7 @@ bool AndroidExternalViewEmbedder::FrameHasPlatformLayers() {
 }
 
 // |ExternalViewEmbedder|
-SkCanvas* AndroidExternalViewEmbedder::GetRootCanvas() {
+DlCanvas* AndroidExternalViewEmbedder::GetRootCanvas() {
   // On Android, the root surface is created from the on-screen render target.
   return nullptr;
 }
@@ -293,10 +262,18 @@ void AndroidExternalViewEmbedder::Reset() {
 
 // |ExternalViewEmbedder|
 void AndroidExternalViewEmbedder::BeginFrame(
-    SkISize frame_size,
     GrDirectContext* context,
-    double device_pixel_ratio,
-    fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
+    const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {
+  // JNI method must be called on the platform thread.
+  if (raster_thread_merger->IsOnPlatformThread()) {
+    jni_facade_->FlutterViewBeginFrame();
+  }
+}
+
+// |ExternalViewEmbedder|
+void AndroidExternalViewEmbedder::PrepareFlutterView(
+    SkISize frame_size,
+    double device_pixel_ratio) {
   Reset();
 
   // The surface size changed. Therefore, destroy existing surfaces as
@@ -305,10 +282,6 @@ void AndroidExternalViewEmbedder::BeginFrame(
     DestroySurfaces();
   }
   surface_pool_->SetFrameSize(frame_size);
-  // JNI method must be called on the platform thread.
-  if (raster_thread_merger->IsOnPlatformThread()) {
-    jni_facade_->FlutterViewBeginFrame();
-  }
 
   frame_size_ = frame_size;
   device_pixel_ratio_ = device_pixel_ratio;
@@ -322,7 +295,7 @@ void AndroidExternalViewEmbedder::CancelFrame() {
 // |ExternalViewEmbedder|
 void AndroidExternalViewEmbedder::EndFrame(
     bool should_resubmit_frame,
-    fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
+    const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {
   surface_pool_->RecycleLayers();
   // JNI method must be called on the platform thread.
   if (raster_thread_merger->IsOnPlatformThread()) {
diff --git a/shell/platform/android/external_view_embedder/external_view_embedder.h b/shell/platform/android/external_view_embedder/external_view_embedder.h
index 0b258854408d6e0f6c3223a8a48a76b84194bbd8..ab00870276ffce31a084b0d026d7fa427be63705 100644
--- a/shell/platform/android/external_view_embedder/external_view_embedder.h
+++ b/shell/platform/android/external_view_embedder/external_view_embedder.h
@@ -2,19 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_EXTERNAL_VIEW_EMBEDDER_H_
-#define FLUTTER_SHELL_PLATFORM_ANDROID_EXTERNAL_VIEW_EMBEDDER_H_
+#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_EXTERNAL_VIEW_EMBEDDER_EXTERNAL_VIEW_EMBEDDER_H_
+#define FLUTTER_SHELL_PLATFORM_ANDROID_EXTERNAL_VIEW_EMBEDDER_EXTERNAL_VIEW_EMBEDDER_H_
 
 #include <unordered_map>
 
 #include "flutter/common/task_runners.h"
 #include "flutter/flow/embedded_views.h"
-#include "flutter/flow/rtree.h"
 #include "flutter/shell/platform/android/context/android_context.h"
 #include "flutter/shell/platform/android/external_view_embedder/surface_pool.h"
 #include "flutter/shell/platform/android/jni/platform_view_android_jni.h"
 #include "flutter/shell/platform/android/surface/android_surface.h"
-#include "third_party/skia/include/core/SkPictureRecorder.h"
 
 namespace flutter {
 
@@ -38,46 +36,43 @@ class AndroidExternalViewEmbedder final : public ExternalViewEmbedder {
 
   // |ExternalViewEmbedder|
   void PrerollCompositeEmbeddedView(
-      int view_id,
+      int64_t view_id,
       std::unique_ptr<flutter::EmbeddedViewParams> params) override;
 
   // |ExternalViewEmbedder|
-  EmbedderPaintContext CompositeEmbeddedView(int view_id) override;
+  DlCanvas* CompositeEmbeddedView(int64_t view_id) override;
 
   // |ExternalViewEmbedder|
-  std::vector<SkCanvas*> GetCurrentCanvases() override;
-
-  // |ExternalViewEmbedder|
-  // Similar call to GetCurrentCanvases but will return the array of
-  // builders being used by PlatformViews on platforms that provide
-  // optional DisplayListBuilder objects for rendering.
-  std::vector<DisplayListBuilder*> GetCurrentBuilders() override;
+  void SubmitFlutterView(
+      int64_t flutter_view_id,
+      GrDirectContext* context,
+      const std::shared_ptr<impeller::AiksContext>& aiks_context,
+      std::unique_ptr<SurfaceFrame> frame) override;
 
   // |ExternalViewEmbedder|
-  void SubmitFrame(GrDirectContext* context,
-                   std::unique_ptr<SurfaceFrame> frame) override;
+  PostPrerollResult PostPrerollAction(
+      const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger)
+      override;
 
   // |ExternalViewEmbedder|
-  PostPrerollResult PostPrerollAction(
-      fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) override;
+  DlCanvas* GetRootCanvas() override;
 
   // |ExternalViewEmbedder|
-  SkCanvas* GetRootCanvas() override;
+  void BeginFrame(GrDirectContext* context,
+                  const fml::RefPtr<fml::RasterThreadMerger>&
+                      raster_thread_merger) override;
 
   // |ExternalViewEmbedder|
-  void BeginFrame(
-      SkISize frame_size,
-      GrDirectContext* context,
-      double device_pixel_ratio,
-      fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) override;
+  void PrepareFlutterView(SkISize frame_size,
+                          double device_pixel_ratio) override;
 
   // |ExternalViewEmbedder|
   void CancelFrame() override;
 
   // |ExternalViewEmbedder|
-  void EndFrame(
-      bool should_resubmit_frame,
-      fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) override;
+  void EndFrame(bool should_resubmit_frame,
+                const fml::RefPtr<fml::RasterThreadMerger>&
+                    raster_thread_merger) override;
 
   bool SupportsDynamicThreadMerging() override;
 
@@ -85,7 +80,7 @@ class AndroidExternalViewEmbedder final : public ExternalViewEmbedder {
 
   // Gets the rect based on the device pixel ratio of a platform view displayed
   // on the screen.
-  SkRect GetViewRect(int view_id) const;
+  SkRect GetViewRect(int64_t view_id) const;
 
  private:
   // The number of frames the rasterizer task runner will continue
@@ -154,4 +149,4 @@ class AndroidExternalViewEmbedder final : public ExternalViewEmbedder {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_EXTERNAL_VIEW_EMBEDDER_H_
+#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_EXTERNAL_VIEW_EMBEDDER_EXTERNAL_VIEW_EMBEDDER_H_
diff --git a/shell/platform/android/external_view_embedder/external_view_embedder_unittests.cc b/shell/platform/android/external_view_embedder/external_view_embedder_unittests.cc
index b174cd92703f9a4970b2ba01c1ad4e3d8dbadfac..57eec1e60d2ebfba798747f10ae086b65e75fa45 100644
--- a/shell/platform/android/external_view_embedder/external_view_embedder_unittests.cc
+++ b/shell/platform/android/external_view_embedder/external_view_embedder_unittests.cc
@@ -5,6 +5,7 @@
 #define FML_USED_ON_EMBEDDER
 
 #include <memory>
+
 #include "flutter/shell/platform/android/external_view_embedder/external_view_embedder.h"
 
 #include "flutter/flow/embedded_views.h"
@@ -14,8 +15,10 @@
 #include "flutter/shell/platform/android/jni/jni_mock.h"
 #include "flutter/shell/platform/android/surface/android_surface.h"
 #include "flutter/shell/platform/android/surface/android_surface_mock.h"
+
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
+#include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
 
 namespace flutter {
@@ -24,6 +27,8 @@ namespace testing {
 using ::testing::ByMove;
 using ::testing::Return;
 
+constexpr int64_t kImplicitViewId = 0;
+
 class TestAndroidSurfaceFactory : public AndroidSurfaceFactory {
  public:
   using TestSurfaceProducer =
@@ -101,76 +106,20 @@ TaskRunners GetTaskRunnersForFixture() {
   };
 }
 
-TEST(AndroidExternalViewEmbedder, GetCurrentCanvases) {
-  auto jni_mock = std::make_shared<JNIMock>();
-
-  auto android_context = AndroidContext(AndroidRenderingAPI::kSoftware);
-  auto embedder = std::make_unique<AndroidExternalViewEmbedder>(
-      android_context, jni_mock, nullptr, GetTaskRunnersForFixture());
-  fml::Thread rasterizer_thread("rasterizer");
-  auto raster_thread_merger =
-      GetThreadMergerFromPlatformThread(&rasterizer_thread);
-
-  EXPECT_CALL(*jni_mock, FlutterViewBeginFrame());
-  embedder->BeginFrame(SkISize::Make(10, 20), nullptr, 1.0,
-                       raster_thread_merger);
-
-  embedder->PrerollCompositeEmbeddedView(
-      0, std::make_unique<EmbeddedViewParams>());
-  embedder->PrerollCompositeEmbeddedView(
-      1, std::make_unique<EmbeddedViewParams>());
-
-  auto canvases = embedder->GetCurrentCanvases();
-  ASSERT_EQ(2UL, canvases.size());
-  ASSERT_EQ(SkISize::Make(10, 20), canvases[0]->getBaseLayerSize());
-  ASSERT_EQ(SkISize::Make(10, 20), canvases[1]->getBaseLayerSize());
-
-  auto builders = embedder->GetCurrentBuilders();
-  ASSERT_EQ(2UL, builders.size());
-}
-
-TEST(AndroidExternalViewEmbedder, GetCurrentCanvasesCompositeOrder) {
-  auto jni_mock = std::make_shared<JNIMock>();
-
-  auto android_context = AndroidContext(AndroidRenderingAPI::kSoftware);
-  auto embedder = std::make_unique<AndroidExternalViewEmbedder>(
-      android_context, jni_mock, nullptr, GetTaskRunnersForFixture());
-  fml::Thread rasterizer_thread("rasterizer");
-  auto raster_thread_merger =
-      GetThreadMergerFromPlatformThread(&rasterizer_thread);
-
-  EXPECT_CALL(*jni_mock, FlutterViewBeginFrame());
-  embedder->BeginFrame(SkISize::Make(10, 20), nullptr, 1.0,
-                       raster_thread_merger);
-
-  embedder->PrerollCompositeEmbeddedView(
-      0, std::make_unique<EmbeddedViewParams>());
-  embedder->PrerollCompositeEmbeddedView(
-      1, std::make_unique<EmbeddedViewParams>());
-
-  auto canvases = embedder->GetCurrentCanvases();
-  ASSERT_EQ(2UL, canvases.size());
-  ASSERT_EQ(embedder->CompositeEmbeddedView(0).canvas, canvases[0]);
-  ASSERT_EQ(embedder->CompositeEmbeddedView(1).canvas, canvases[1]);
-
-  auto builders = embedder->GetCurrentBuilders();
-  ASSERT_EQ(2UL, builders.size());
-}
-
 TEST(AndroidExternalViewEmbedder, CompositeEmbeddedView) {
   auto android_context = AndroidContext(AndroidRenderingAPI::kSoftware);
   auto embedder = std::make_unique<AndroidExternalViewEmbedder>(
       android_context, nullptr, nullptr, GetTaskRunnersForFixture());
 
-  ASSERT_EQ(nullptr, embedder->CompositeEmbeddedView(0).canvas);
+  ASSERT_EQ(nullptr, embedder->CompositeEmbeddedView(0));
   embedder->PrerollCompositeEmbeddedView(
       0, std::make_unique<EmbeddedViewParams>());
-  ASSERT_NE(nullptr, embedder->CompositeEmbeddedView(0).canvas);
+  ASSERT_NE(nullptr, embedder->CompositeEmbeddedView(0));
 
-  ASSERT_EQ(nullptr, embedder->CompositeEmbeddedView(1).canvas);
+  ASSERT_EQ(nullptr, embedder->CompositeEmbeddedView(1));
   embedder->PrerollCompositeEmbeddedView(
       1, std::make_unique<EmbeddedViewParams>());
-  ASSERT_NE(nullptr, embedder->CompositeEmbeddedView(1).canvas);
+  ASSERT_NE(nullptr, embedder->CompositeEmbeddedView(1));
 }
 
 TEST(AndroidExternalViewEmbedder, CancelFrame) {
@@ -182,11 +131,7 @@ TEST(AndroidExternalViewEmbedder, CancelFrame) {
       0, std::make_unique<EmbeddedViewParams>());
   embedder->CancelFrame();
 
-  auto canvases = embedder->GetCurrentCanvases();
-  ASSERT_EQ(0UL, canvases.size());
-
-  auto builders = embedder->GetCurrentBuilders();
-  ASSERT_EQ(0UL, builders.size());
+  ASSERT_EQ(embedder->CompositeEmbeddedView(0), nullptr);
 }
 
 TEST(AndroidExternalViewEmbedder, RasterizerRunsOnPlatformThread) {
@@ -201,8 +146,9 @@ TEST(AndroidExternalViewEmbedder, RasterizerRunsOnPlatformThread) {
   ASSERT_FALSE(raster_thread_merger->IsMerged());
 
   EXPECT_CALL(*jni_mock, FlutterViewBeginFrame());
-  embedder->BeginFrame(SkISize::Make(10, 20), nullptr, 1.0,
-                       raster_thread_merger);
+  embedder->BeginFrame(nullptr, raster_thread_merger);
+  embedder->PrepareFlutterView(SkISize::Make(10, 20), 1.0);
+
   // Push a platform view.
   embedder->PrerollCompositeEmbeddedView(
       0, std::make_unique<EmbeddedViewParams>());
@@ -254,8 +200,8 @@ TEST(AndroidExternalViewEmbedder, PlatformViewRect) {
       GetThreadMergerFromPlatformThread(&rasterizer_thread);
 
   EXPECT_CALL(*jni_mock, FlutterViewBeginFrame());
-  embedder->BeginFrame(SkISize::Make(100, 100), nullptr, 1.5,
-                       raster_thread_merger);
+  embedder->BeginFrame(nullptr, raster_thread_merger);
+  embedder->PrepareFlutterView(SkISize::Make(100, 100), 1.5);
 
   MutatorsStack stack;
   SkMatrix matrix;
@@ -282,8 +228,8 @@ TEST(AndroidExternalViewEmbedder, PlatformViewRectChangedParams) {
       GetThreadMergerFromPlatformThread(&rasterizer_thread);
 
   EXPECT_CALL(*jni_mock, FlutterViewBeginFrame());
-  embedder->BeginFrame(SkISize::Make(100, 100), nullptr, 1.5,
-                       raster_thread_merger);
+  embedder->BeginFrame(nullptr, raster_thread_merger);
+  embedder->PrepareFlutterView(SkISize::Make(100, 100), 1.5);
 
   auto view_id = 0;
 
@@ -311,7 +257,7 @@ TEST(AndroidExternalViewEmbedder, PlatformViewRectChangedParams) {
   ASSERT_EQ(SkRect::MakeXYWH(75, 90, 105, 120), embedder->GetViewRect(view_id));
 }
 
-TEST(AndroidExternalViewEmbedder, SubmitFrame) {
+TEST(AndroidExternalViewEmbedder, SubmitFlutterView) {
   auto jni_mock = std::make_shared<JNIMock>();
   auto android_context =
       std::make_shared<AndroidContext>(AndroidRenderingAPI::kSoftware);
@@ -321,16 +267,16 @@ TEST(AndroidExternalViewEmbedder, SubmitFrame) {
   auto frame_size = SkISize::Make(1000, 1000);
   SurfaceFrame::FramebufferInfo framebuffer_info;
   auto surface_factory = std::make_shared<TestAndroidSurfaceFactory>(
-      [&android_context, gr_context, window, frame_size, framebuffer_info]() {
+      [gr_context, window, frame_size, framebuffer_info]() {
         auto surface_frame_1 = std::make_unique<SurfaceFrame>(
-            SkSurface::MakeNull(1000, 1000), framebuffer_info,
-            [](const SurfaceFrame& surface_frame, SkCanvas* canvas) {
+            SkSurfaces::Null(1000, 1000), framebuffer_info,
+            [](const SurfaceFrame& surface_frame, DlCanvas* canvas) {
               return true;
             },
             /*frame_size=*/SkISize::Make(800, 600));
         auto surface_frame_2 = std::make_unique<SurfaceFrame>(
-            SkSurface::MakeNull(1000, 1000), framebuffer_info,
-            [](const SurfaceFrame& surface_frame, SkCanvas* canvas) {
+            SkSurfaces::Null(1000, 1000), framebuffer_info,
+            [](const SurfaceFrame& surface_frame, DlCanvas* canvas) {
               return true;
             },
             /*frame_size=*/SkISize::Make(800, 600));
@@ -341,8 +287,7 @@ TEST(AndroidExternalViewEmbedder, SubmitFrame) {
             .WillOnce(Return(ByMove(std::move(surface_frame_1))))
             .WillOnce(Return(ByMove(std::move(surface_frame_2))));
 
-        auto android_surface_mock =
-            std::make_unique<AndroidSurfaceMock>(android_context);
+        auto android_surface_mock = std::make_unique<AndroidSurfaceMock>();
         EXPECT_CALL(*android_surface_mock, IsValid()).WillOnce(Return(true));
 
         EXPECT_CALL(*android_surface_mock, CreateGPUSurface(gr_context.get()))
@@ -361,9 +306,9 @@ TEST(AndroidExternalViewEmbedder, SubmitFrame) {
   {
     auto did_submit_frame = false;
     auto surface_frame = std::make_unique<SurfaceFrame>(
-        SkSurface::MakeNull(1000, 1000), framebuffer_info,
+        SkSurfaces::Null(1000, 1000), framebuffer_info,
         [&did_submit_frame](const SurfaceFrame& surface_frame,
-                            SkCanvas* canvas) mutable {
+                            DlCanvas* canvas) mutable {
           if (canvas != nullptr) {
             did_submit_frame = true;
           }
@@ -371,7 +316,8 @@ TEST(AndroidExternalViewEmbedder, SubmitFrame) {
         },
         /*frame_size=*/SkISize::Make(800, 600));
 
-    embedder->SubmitFrame(gr_context.get(), std::move(surface_frame));
+    embedder->SubmitFlutterView(kImplicitViewId, gr_context.get(), nullptr,
+                                std::move(surface_frame));
     // Submits frame if no Android view in the current frame.
     EXPECT_TRUE(did_submit_frame);
     // Doesn't resubmit frame.
@@ -385,7 +331,8 @@ TEST(AndroidExternalViewEmbedder, SubmitFrame) {
   // ------------------ Second frame ------------------ //
   {
     EXPECT_CALL(*jni_mock, FlutterViewBeginFrame());
-    embedder->BeginFrame(frame_size, nullptr, 1.5, raster_thread_merger);
+    embedder->BeginFrame(nullptr, raster_thread_merger);
+    embedder->PrepareFlutterView(frame_size, 1.5);
 
     // Add an Android view.
     MutatorsStack stack1;
@@ -403,17 +350,17 @@ TEST(AndroidExternalViewEmbedder, SubmitFrame) {
 
     embedder->PrerollCompositeEmbeddedView(0, std::move(view_params_1));
     // This is the recording canvas flow writes to.
-    auto canvas_1 = embedder->CompositeEmbeddedView(0).canvas;
+    auto canvas_1 = embedder->CompositeEmbeddedView(0);
 
-    auto rect_paint = SkPaint();
-    rect_paint.setColor(SkColors::kCyan);
-    rect_paint.setStyle(SkPaint::Style::kFill_Style);
+    auto rect_paint = DlPaint();
+    rect_paint.setColor(DlColor::kCyan());
+    rect_paint.setDrawStyle(DlDrawStyle::kFill);
 
     // This simulates Flutter UI that doesn't intersect with the Android view.
-    canvas_1->drawRect(SkRect::MakeXYWH(0, 0, 50, 50), rect_paint);
+    canvas_1->DrawRect(SkRect::MakeXYWH(0, 0, 50, 50), rect_paint);
     // This simulates Flutter UI that intersects with the Android view.
-    canvas_1->drawRect(SkRect::MakeXYWH(50, 50, 200, 200), rect_paint);
-    canvas_1->drawRect(SkRect::MakeXYWH(150, 150, 100, 100), rect_paint);
+    canvas_1->DrawRect(SkRect::MakeXYWH(50, 50, 200, 200), rect_paint);
+    canvas_1->DrawRect(SkRect::MakeXYWH(150, 150, 100, 100), rect_paint);
 
     // Create a new overlay surface.
     EXPECT_CALL(*jni_mock, FlutterViewCreateOverlaySurface())
@@ -425,13 +372,13 @@ TEST(AndroidExternalViewEmbedder, SubmitFrame) {
                                0, 150, 150, 300, 300, 300, 300, stack1));
     // The JNI call to display the overlay surface.
     EXPECT_CALL(*jni_mock,
-                FlutterViewDisplayOverlaySurface(0, 50, 50, 200, 200));
+                FlutterViewDisplayOverlaySurface(0, 150, 150, 100, 100));
 
     auto did_submit_frame = false;
     auto surface_frame = std::make_unique<SurfaceFrame>(
-        SkSurface::MakeNull(1000, 1000), framebuffer_info,
+        SkSurfaces::Null(1000, 1000), framebuffer_info,
         [&did_submit_frame](const SurfaceFrame& surface_frame,
-                            SkCanvas* canvas) mutable {
+                            DlCanvas* canvas) mutable {
           if (canvas != nullptr) {
             did_submit_frame = true;
           }
@@ -439,7 +386,8 @@ TEST(AndroidExternalViewEmbedder, SubmitFrame) {
         },
         /*frame_size=*/SkISize::Make(800, 600));
 
-    embedder->SubmitFrame(gr_context.get(), std::move(surface_frame));
+    embedder->SubmitFlutterView(kImplicitViewId, gr_context.get(), nullptr,
+                                std::move(surface_frame));
     // Doesn't submit frame if there aren't Android views in the previous frame.
     EXPECT_FALSE(did_submit_frame);
     // Resubmits frame.
@@ -453,7 +401,8 @@ TEST(AndroidExternalViewEmbedder, SubmitFrame) {
   // ------------------ Third frame ------------------ //
   {
     EXPECT_CALL(*jni_mock, FlutterViewBeginFrame());
-    embedder->BeginFrame(frame_size, nullptr, 1.5, raster_thread_merger);
+    embedder->BeginFrame(nullptr, raster_thread_merger);
+    embedder->PrepareFlutterView(frame_size, 1.5);
 
     // Add an Android view.
     MutatorsStack stack1;
@@ -471,17 +420,17 @@ TEST(AndroidExternalViewEmbedder, SubmitFrame) {
 
     embedder->PrerollCompositeEmbeddedView(0, std::move(view_params_1));
     // This is the recording canvas flow writes to.
-    auto canvas_1 = embedder->CompositeEmbeddedView(0).canvas;
+    auto canvas_1 = embedder->CompositeEmbeddedView(0);
 
-    auto rect_paint = SkPaint();
-    rect_paint.setColor(SkColors::kCyan);
-    rect_paint.setStyle(SkPaint::Style::kFill_Style);
+    auto rect_paint = DlPaint();
+    rect_paint.setColor(DlColor::kCyan());
+    rect_paint.setDrawStyle(DlDrawStyle::kFill);
 
     // This simulates Flutter UI that doesn't intersect with the Android view.
-    canvas_1->drawRect(SkRect::MakeXYWH(0, 0, 50, 50), rect_paint);
+    canvas_1->DrawRect(SkRect::MakeXYWH(0, 0, 50, 50), rect_paint);
     // This simulates Flutter UI that intersects with the Android view.
-    canvas_1->drawRect(SkRect::MakeXYWH(50, 50, 200, 200), rect_paint);
-    canvas_1->drawRect(SkRect::MakeXYWH(150, 150, 100, 100), rect_paint);
+    canvas_1->DrawRect(SkRect::MakeXYWH(50, 50, 200, 200), rect_paint);
+    canvas_1->DrawRect(SkRect::MakeXYWH(150, 150, 100, 100), rect_paint);
 
     // Don't create a new overlay surface since it's recycled from the first
     // frame.
@@ -491,20 +440,21 @@ TEST(AndroidExternalViewEmbedder, SubmitFrame) {
                                0, 150, 150, 300, 300, 300, 300, stack1));
     // The JNI call to display the overlay surface.
     EXPECT_CALL(*jni_mock,
-                FlutterViewDisplayOverlaySurface(0, 50, 50, 200, 200));
+                FlutterViewDisplayOverlaySurface(0, 150, 150, 100, 100));
 
     auto did_submit_frame = false;
     auto surface_frame = std::make_unique<SurfaceFrame>(
-        SkSurface::MakeNull(1000, 1000), framebuffer_info,
+        SkSurfaces::Null(1000, 1000), framebuffer_info,
         [&did_submit_frame](const SurfaceFrame& surface_frame,
-                            SkCanvas* canvas) mutable {
+                            DlCanvas* canvas) mutable {
           if (canvas != nullptr) {
             did_submit_frame = true;
           }
           return true;
         },
         /*frame_size=*/SkISize::Make(800, 600));
-    embedder->SubmitFrame(gr_context.get(), std::move(surface_frame));
+    embedder->SubmitFlutterView(kImplicitViewId, gr_context.get(), nullptr,
+                                std::move(surface_frame));
     // Submits frame if there are Android views in the previous frame.
     EXPECT_TRUE(did_submit_frame);
     // Doesn't resubmit frame.
@@ -516,6 +466,109 @@ TEST(AndroidExternalViewEmbedder, SubmitFrame) {
   }
 }
 
+TEST(AndroidExternalViewEmbedder, OverlayCoverTwoPlatformViews) {
+  // In this test we will simulate two Android views appearing on the screen
+  // with a rect intersecting both of them
+
+  auto jni_mock = std::make_shared<JNIMock>();
+  auto android_context =
+      std::make_shared<AndroidContext>(AndroidRenderingAPI::kSoftware);
+
+  auto window = fml::MakeRefCounted<AndroidNativeWindow>(nullptr);
+  auto gr_context = GrDirectContext::MakeMock(nullptr);
+  auto frame_size = SkISize::Make(1000, 1000);
+  SurfaceFrame::FramebufferInfo framebuffer_info;
+  auto surface_factory = std::make_shared<TestAndroidSurfaceFactory>(
+      [gr_context, window, frame_size, framebuffer_info]() {
+        auto surface_frame_1 = std::make_unique<SurfaceFrame>(
+            SkSurfaces::Null(1000, 1000), framebuffer_info,
+            [](const SurfaceFrame& surface_frame, DlCanvas* canvas) {
+              return true;
+            },
+            /*frame_size=*/SkISize::Make(800, 600));
+
+        auto surface_mock = std::make_unique<SurfaceMock>();
+        EXPECT_CALL(*surface_mock, AcquireFrame(frame_size))
+            .Times(1 /* frames */)
+            .WillOnce(Return(ByMove(std::move(surface_frame_1))));
+
+        auto android_surface_mock = std::make_unique<AndroidSurfaceMock>();
+        EXPECT_CALL(*android_surface_mock, IsValid()).WillOnce(Return(true));
+
+        EXPECT_CALL(*android_surface_mock, CreateGPUSurface(gr_context.get()))
+            .WillOnce(Return(ByMove(std::move(surface_mock))));
+
+        EXPECT_CALL(*android_surface_mock, SetNativeWindow(window));
+        return android_surface_mock;
+      });
+  auto embedder = std::make_unique<AndroidExternalViewEmbedder>(
+      *android_context, jni_mock, surface_factory, GetTaskRunnersForFixture());
+
+  auto raster_thread_merger = GetThreadMergerFromPlatformThread();
+
+  EXPECT_CALL(*jni_mock, FlutterViewBeginFrame());
+  embedder->BeginFrame(nullptr, raster_thread_merger);
+  embedder->PrepareFlutterView(frame_size, 1.5);
+
+  {
+    // Add first Android view.
+    SkMatrix matrix = SkMatrix::Translate(100, 100);
+    MutatorsStack stack;
+    embedder->PrerollCompositeEmbeddedView(
+        0, std::make_unique<EmbeddedViewParams>(matrix, SkSize::Make(100, 100),
+                                                stack));
+    // The JNI call to display the Android view.
+    EXPECT_CALL(*jni_mock, FlutterViewOnDisplayPlatformView(
+                               0, 100, 100, 100, 100, 150, 150, stack));
+  }
+
+  {
+    // Add second Android view.
+    SkMatrix matrix = SkMatrix::Translate(300, 100);
+    MutatorsStack stack;
+    embedder->PrerollCompositeEmbeddedView(
+        1, std::make_unique<EmbeddedViewParams>(matrix, SkSize::Make(100, 100),
+                                                stack));
+    // The JNI call to display the Android view.
+    EXPECT_CALL(*jni_mock, FlutterViewOnDisplayPlatformView(
+                               1, 300, 100, 100, 100, 150, 150, stack));
+  }
+  auto rect_paint = DlPaint();
+  rect_paint.setColor(DlColor::kCyan());
+  rect_paint.setDrawStyle(DlDrawStyle::kFill);
+
+  // This simulates Flutter UI that intersects with the two Android views.
+  // Since we will compute the intersection for each android view in turn, and
+  // finally merge The final size of the overlay will be smaller than the
+  // width and height of the rect.
+  embedder->CompositeEmbeddedView(1)->DrawRect(
+      SkRect::MakeXYWH(150, 50, 200, 200), rect_paint);
+
+  EXPECT_CALL(*jni_mock, FlutterViewCreateOverlaySurface())
+      .WillRepeatedly([&]() {
+        return std::make_unique<PlatformViewAndroidJNI::OverlayMetadata>(
+            1, window);
+      });
+
+  // The JNI call to display the overlay surface.
+  EXPECT_CALL(*jni_mock,
+              FlutterViewDisplayOverlaySurface(1, 150, 100, 200, 100))
+      .Times(1);
+
+  auto surface_frame = std::make_unique<SurfaceFrame>(
+      SkSurfaces::Null(1000, 1000), framebuffer_info,
+      [](const SurfaceFrame& surface_frame, DlCanvas* canvas) mutable {
+        return true;
+      },
+      /*frame_size=*/SkISize::Make(800, 600));
+
+  embedder->SubmitFlutterView(kImplicitViewId, gr_context.get(), nullptr,
+                              std::move(surface_frame));
+
+  EXPECT_CALL(*jni_mock, FlutterViewEndFrame());
+  embedder->EndFrame(/*should_resubmit_frame=*/false, raster_thread_merger);
+}
+
 TEST(AndroidExternalViewEmbedder, SubmitFrameOverlayComposition) {
   auto jni_mock = std::make_shared<JNIMock>();
   auto android_context =
@@ -526,10 +579,10 @@ TEST(AndroidExternalViewEmbedder, SubmitFrameOverlayComposition) {
   auto frame_size = SkISize::Make(1000, 1000);
   SurfaceFrame::FramebufferInfo framebuffer_info;
   auto surface_factory = std::make_shared<TestAndroidSurfaceFactory>(
-      [&android_context, gr_context, window, frame_size, framebuffer_info]() {
+      [gr_context, window, frame_size, framebuffer_info]() {
         auto surface_frame_1 = std::make_unique<SurfaceFrame>(
-            SkSurface::MakeNull(1000, 1000), framebuffer_info,
-            [](const SurfaceFrame& surface_frame, SkCanvas* canvas) {
+            SkSurfaces::Null(1000, 1000), framebuffer_info,
+            [](const SurfaceFrame& surface_frame, DlCanvas* canvas) {
               return true;
             },
             /*frame_size=*/SkISize::Make(800, 600));
@@ -539,8 +592,7 @@ TEST(AndroidExternalViewEmbedder, SubmitFrameOverlayComposition) {
             .Times(1 /* frames */)
             .WillOnce(Return(ByMove(std::move(surface_frame_1))));
 
-        auto android_surface_mock =
-            std::make_unique<AndroidSurfaceMock>(android_context);
+        auto android_surface_mock = std::make_unique<AndroidSurfaceMock>();
         EXPECT_CALL(*android_surface_mock, IsValid()).WillOnce(Return(true));
 
         EXPECT_CALL(*android_surface_mock, CreateGPUSurface(gr_context.get()))
@@ -555,7 +607,8 @@ TEST(AndroidExternalViewEmbedder, SubmitFrameOverlayComposition) {
   auto raster_thread_merger = GetThreadMergerFromPlatformThread();
 
   EXPECT_CALL(*jni_mock, FlutterViewBeginFrame());
-  embedder->BeginFrame(frame_size, nullptr, 1.5, raster_thread_merger);
+  embedder->BeginFrame(nullptr, raster_thread_merger);
+  embedder->PrepareFlutterView(frame_size, 1.5);
 
   {
     // Add first Android view.
@@ -570,12 +623,12 @@ TEST(AndroidExternalViewEmbedder, SubmitFrameOverlayComposition) {
                                                             300, 300, stack));
   }
 
-  auto rect_paint = SkPaint();
-  rect_paint.setColor(SkColors::kCyan);
-  rect_paint.setStyle(SkPaint::Style::kFill_Style);
+  auto rect_paint = DlPaint();
+  rect_paint.setColor(DlColor::kCyan());
+  rect_paint.setDrawStyle(DlDrawStyle::kFill);
 
   // This simulates Flutter UI that intersects with the first Android view.
-  embedder->CompositeEmbeddedView(0).canvas->drawRect(
+  embedder->CompositeEmbeddedView(0)->DrawRect(
       SkRect::MakeXYWH(25, 25, 80, 150), rect_paint);
 
   {
@@ -592,10 +645,10 @@ TEST(AndroidExternalViewEmbedder, SubmitFrameOverlayComposition) {
   }
   // This simulates Flutter UI that intersects with the first and second Android
   // views.
-  embedder->CompositeEmbeddedView(1).canvas->drawRect(
-      SkRect::MakeXYWH(25, 25, 80, 50), rect_paint);
+  embedder->CompositeEmbeddedView(1)->DrawRect(SkRect::MakeXYWH(25, 25, 80, 50),
+                                               rect_paint);
 
-  embedder->CompositeEmbeddedView(1).canvas->drawRect(
+  embedder->CompositeEmbeddedView(1)->DrawRect(
       SkRect::MakeXYWH(75, 75, 30, 100), rect_paint);
 
   EXPECT_CALL(*jni_mock, FlutterViewCreateOverlaySurface())
@@ -608,13 +661,14 @@ TEST(AndroidExternalViewEmbedder, SubmitFrameOverlayComposition) {
       .Times(2);
 
   auto surface_frame = std::make_unique<SurfaceFrame>(
-      SkSurface::MakeNull(1000, 1000), framebuffer_info,
-      [](const SurfaceFrame& surface_frame, SkCanvas* canvas) mutable {
+      SkSurfaces::Null(1000, 1000), framebuffer_info,
+      [](const SurfaceFrame& surface_frame, DlCanvas* canvas) mutable {
         return true;
       },
       /*frame_size=*/SkISize::Make(800, 600));
 
-  embedder->SubmitFrame(gr_context.get(), std::move(surface_frame));
+  embedder->SubmitFlutterView(kImplicitViewId, gr_context.get(), nullptr,
+                              std::move(surface_frame));
 
   EXPECT_CALL(*jni_mock, FlutterViewEndFrame());
   embedder->EndFrame(/*should_resubmit_frame=*/false, raster_thread_merger);
@@ -630,10 +684,10 @@ TEST(AndroidExternalViewEmbedder, SubmitFramePlatformViewWithoutAnyOverlay) {
   auto frame_size = SkISize::Make(1000, 1000);
   SurfaceFrame::FramebufferInfo framebuffer_info;
   auto surface_factory = std::make_shared<TestAndroidSurfaceFactory>(
-      [&android_context, gr_context, window, frame_size, framebuffer_info]() {
+      [gr_context, window, frame_size, framebuffer_info]() {
         auto surface_frame_1 = std::make_unique<SurfaceFrame>(
-            SkSurface::MakeNull(1000, 1000), framebuffer_info,
-            [](const SurfaceFrame& surface_frame, SkCanvas* canvas) {
+            SkSurfaces::Null(1000, 1000), framebuffer_info,
+            [](const SurfaceFrame& surface_frame, DlCanvas* canvas) {
               return true;
             },
             /*frame_size=*/SkISize::Make(800, 600));
@@ -643,8 +697,7 @@ TEST(AndroidExternalViewEmbedder, SubmitFramePlatformViewWithoutAnyOverlay) {
             .Times(1 /* frames */)
             .WillOnce(Return(ByMove(std::move(surface_frame_1))));
 
-        auto android_surface_mock =
-            std::make_unique<AndroidSurfaceMock>(android_context);
+        auto android_surface_mock = std::make_unique<AndroidSurfaceMock>();
         EXPECT_CALL(*android_surface_mock, IsValid()).WillOnce(Return(true));
 
         EXPECT_CALL(*android_surface_mock, CreateGPUSurface(gr_context.get()))
@@ -659,7 +712,8 @@ TEST(AndroidExternalViewEmbedder, SubmitFramePlatformViewWithoutAnyOverlay) {
   auto raster_thread_merger = GetThreadMergerFromPlatformThread();
 
   EXPECT_CALL(*jni_mock, FlutterViewBeginFrame());
-  embedder->BeginFrame(frame_size, nullptr, 1.5, raster_thread_merger);
+  embedder->BeginFrame(nullptr, raster_thread_merger);
+  embedder->PrepareFlutterView(frame_size, 1.5);
 
   {
     // Add Android view.
@@ -677,13 +731,14 @@ TEST(AndroidExternalViewEmbedder, SubmitFramePlatformViewWithoutAnyOverlay) {
   EXPECT_CALL(*jni_mock, FlutterViewCreateOverlaySurface()).Times(0);
 
   auto surface_frame = std::make_unique<SurfaceFrame>(
-      SkSurface::MakeNull(1000, 1000), framebuffer_info,
-      [](const SurfaceFrame& surface_frame, SkCanvas* canvas) mutable {
+      SkSurfaces::Null(1000, 1000), framebuffer_info,
+      [](const SurfaceFrame& surface_frame, DlCanvas* canvas) mutable {
         return true;
       },
       /*frame_size=*/SkISize::Make(800, 600));
 
-  embedder->SubmitFrame(gr_context.get(), std::move(surface_frame));
+  embedder->SubmitFlutterView(kImplicitViewId, gr_context.get(), nullptr,
+                              std::move(surface_frame));
 
   EXPECT_CALL(*jni_mock, FlutterViewEndFrame());
   embedder->EndFrame(/*should_resubmit_frame=*/false, raster_thread_merger);
@@ -702,8 +757,8 @@ TEST(AndroidExternalViewEmbedder, DoesNotCallJNIPlatformThreadOnlyMethods) {
   auto raster_thread_merger = GetThreadMergerFromRasterThread(&platform_thread);
 
   EXPECT_CALL(*jni_mock, FlutterViewBeginFrame()).Times(0);
-  embedder->BeginFrame(SkISize::Make(10, 20), nullptr, 1.0,
-                       raster_thread_merger);
+  embedder->BeginFrame(nullptr, raster_thread_merger);
+  embedder->PrepareFlutterView(SkISize::Make(10, 20), 1.0);
 
   EXPECT_CALL(*jni_mock, FlutterViewEndFrame()).Times(0);
   embedder->EndFrame(/*should_resubmit_frame=*/false, raster_thread_merger);
@@ -719,10 +774,10 @@ TEST(AndroidExternalViewEmbedder, DestroyOverlayLayersOnSizeChange) {
   auto frame_size = SkISize::Make(1000, 1000);
   SurfaceFrame::FramebufferInfo framebuffer_info;
   auto surface_factory = std::make_shared<TestAndroidSurfaceFactory>(
-      [&android_context, gr_context, window, frame_size, framebuffer_info]() {
+      [gr_context, window, frame_size, framebuffer_info]() {
         auto surface_frame_1 = std::make_unique<SurfaceFrame>(
-            SkSurface::MakeNull(1000, 1000), framebuffer_info,
-            [](const SurfaceFrame& surface_frame, SkCanvas* canvas) {
+            SkSurfaces::Null(1000, 1000), framebuffer_info,
+            [](const SurfaceFrame& surface_frame, DlCanvas* canvas) {
               return true;
             },
             /*frame_size=*/SkISize::Make(800, 600));
@@ -731,8 +786,7 @@ TEST(AndroidExternalViewEmbedder, DestroyOverlayLayersOnSizeChange) {
         EXPECT_CALL(*surface_mock, AcquireFrame(frame_size))
             .WillOnce(Return(ByMove(std::move(surface_frame_1))));
 
-        auto android_surface_mock =
-            std::make_unique<AndroidSurfaceMock>(android_context);
+        auto android_surface_mock = std::make_unique<AndroidSurfaceMock>();
         EXPECT_CALL(*android_surface_mock, IsValid()).WillOnce(Return(true));
 
         EXPECT_CALL(*android_surface_mock, CreateGPUSurface(gr_context.get()))
@@ -752,7 +806,8 @@ TEST(AndroidExternalViewEmbedder, DestroyOverlayLayersOnSizeChange) {
   // ------------------ First frame ------------------ //
   {
     EXPECT_CALL(*jni_mock, FlutterViewBeginFrame());
-    embedder->BeginFrame(frame_size, nullptr, 1.5, raster_thread_merger);
+    embedder->BeginFrame(nullptr, raster_thread_merger);
+    embedder->PrepareFlutterView(frame_size, 1.5);
 
     // Add an Android view.
     MutatorsStack stack1;
@@ -764,8 +819,8 @@ TEST(AndroidExternalViewEmbedder, DestroyOverlayLayersOnSizeChange) {
     embedder->PrerollCompositeEmbeddedView(0, std::move(view_params_1));
 
     // This simulates Flutter UI that intersects with the Android view.
-    embedder->CompositeEmbeddedView(0).canvas->drawRect(
-        SkRect::MakeXYWH(50, 50, 200, 200), SkPaint());
+    embedder->CompositeEmbeddedView(0)->DrawRect(
+        SkRect::MakeXYWH(50, 50, 200, 200), DlPaint());
 
     // Create a new overlay surface.
     EXPECT_CALL(*jni_mock, FlutterViewCreateOverlaySurface())
@@ -776,16 +831,17 @@ TEST(AndroidExternalViewEmbedder, DestroyOverlayLayersOnSizeChange) {
     EXPECT_CALL(*jni_mock, FlutterViewOnDisplayPlatformView(0, 0, 0, 200, 200,
                                                             300, 300, stack1));
     EXPECT_CALL(*jni_mock,
-                FlutterViewDisplayOverlaySurface(0, 50, 50, 200, 200));
+                FlutterViewDisplayOverlaySurface(0, 50, 50, 150, 150));
 
     SurfaceFrame::FramebufferInfo framebuffer_info;
     auto surface_frame = std::make_unique<SurfaceFrame>(
-        SkSurface::MakeNull(1000, 1000), framebuffer_info,
-        [](const SurfaceFrame& surface_frame, SkCanvas* canvas) {
+        SkSurfaces::Null(1000, 1000), framebuffer_info,
+        [](const SurfaceFrame& surface_frame, DlCanvas* canvas) {
           return true;
         },
         /*frame_size=*/SkISize::Make(800, 600));
-    embedder->SubmitFrame(gr_context.get(), std::move(surface_frame));
+    embedder->SubmitFlutterView(kImplicitViewId, gr_context.get(), nullptr,
+                                std::move(surface_frame));
 
     EXPECT_CALL(*jni_mock, FlutterViewEndFrame());
     embedder->EndFrame(/*should_resubmit_frame=*/false, raster_thread_merger);
@@ -794,8 +850,8 @@ TEST(AndroidExternalViewEmbedder, DestroyOverlayLayersOnSizeChange) {
   EXPECT_CALL(*jni_mock, FlutterViewDestroyOverlaySurfaces());
   EXPECT_CALL(*jni_mock, FlutterViewBeginFrame());
   // Change the frame size.
-  embedder->BeginFrame(SkISize::Make(30, 40), nullptr, 1.0,
-                       raster_thread_merger);
+  embedder->BeginFrame(nullptr, raster_thread_merger);
+  embedder->PrepareFlutterView(SkISize::Make(30, 40), 1.0);
 }
 
 TEST(AndroidExternalViewEmbedder, DoesNotDestroyOverlayLayersOnSizeChange) {
@@ -808,10 +864,10 @@ TEST(AndroidExternalViewEmbedder, DoesNotDestroyOverlayLayersOnSizeChange) {
   auto frame_size = SkISize::Make(1000, 1000);
   SurfaceFrame::FramebufferInfo framebuffer_info;
   auto surface_factory = std::make_shared<TestAndroidSurfaceFactory>(
-      [&android_context, gr_context, window, frame_size, framebuffer_info]() {
+      [gr_context, window, frame_size, framebuffer_info]() {
         auto surface_frame_1 = std::make_unique<SurfaceFrame>(
-            SkSurface::MakeNull(1000, 1000), framebuffer_info,
-            [](const SurfaceFrame& surface_frame, SkCanvas* canvas) {
+            SkSurfaces::Null(1000, 1000), framebuffer_info,
+            [](const SurfaceFrame& surface_frame, DlCanvas* canvas) {
               return true;
             },
             /*frame_size=*/SkISize::Make(800, 600));
@@ -820,8 +876,7 @@ TEST(AndroidExternalViewEmbedder, DoesNotDestroyOverlayLayersOnSizeChange) {
         EXPECT_CALL(*surface_mock, AcquireFrame(frame_size))
             .WillOnce(Return(ByMove(std::move(surface_frame_1))));
 
-        auto android_surface_mock =
-            std::make_unique<AndroidSurfaceMock>(android_context);
+        auto android_surface_mock = std::make_unique<AndroidSurfaceMock>();
         EXPECT_CALL(*android_surface_mock, IsValid()).WillOnce(Return(true));
 
         EXPECT_CALL(*android_surface_mock, CreateGPUSurface(gr_context.get()))
@@ -841,7 +896,8 @@ TEST(AndroidExternalViewEmbedder, DoesNotDestroyOverlayLayersOnSizeChange) {
     auto raster_thread_merger =
         GetThreadMergerFromPlatformThread(&rasterizer_thread);
     EXPECT_CALL(*jni_mock, FlutterViewBeginFrame());
-    embedder->BeginFrame(frame_size, nullptr, 1.5, raster_thread_merger);
+    embedder->BeginFrame(nullptr, raster_thread_merger);
+    embedder->PrepareFlutterView(frame_size, 1.5);
 
     // Add an Android view.
     MutatorsStack stack1;
@@ -853,8 +909,8 @@ TEST(AndroidExternalViewEmbedder, DoesNotDestroyOverlayLayersOnSizeChange) {
     embedder->PrerollCompositeEmbeddedView(0, std::move(view_params_1));
 
     // This simulates Flutter UI that intersects with the Android view.
-    embedder->CompositeEmbeddedView(0).canvas->drawRect(
-        SkRect::MakeXYWH(50, 50, 200, 200), SkPaint());
+    embedder->CompositeEmbeddedView(0)->DrawRect(
+        SkRect::MakeXYWH(50, 50, 200, 200), DlPaint());
 
     // Create a new overlay surface.
     EXPECT_CALL(*jni_mock, FlutterViewCreateOverlaySurface())
@@ -865,15 +921,16 @@ TEST(AndroidExternalViewEmbedder, DoesNotDestroyOverlayLayersOnSizeChange) {
     EXPECT_CALL(*jni_mock, FlutterViewOnDisplayPlatformView(0, 0, 0, 200, 200,
                                                             300, 300, stack1));
     EXPECT_CALL(*jni_mock,
-                FlutterViewDisplayOverlaySurface(0, 50, 50, 200, 200));
+                FlutterViewDisplayOverlaySurface(0, 50, 50, 150, 150));
 
     auto surface_frame = std::make_unique<SurfaceFrame>(
-        SkSurface::MakeNull(1000, 1000), framebuffer_info,
-        [](const SurfaceFrame& surface_frame, SkCanvas* canvas) {
+        SkSurfaces::Null(1000, 1000), framebuffer_info,
+        [](const SurfaceFrame& surface_frame, DlCanvas* canvas) {
           return true;
         },
         /*frame_size=*/SkISize::Make(800, 600));
-    embedder->SubmitFrame(gr_context.get(), std::move(surface_frame));
+    embedder->SubmitFlutterView(kImplicitViewId, gr_context.get(), nullptr,
+                                std::move(surface_frame));
 
     EXPECT_CALL(*jni_mock, FlutterViewEndFrame());
     embedder->EndFrame(/*should_resubmit_frame=*/false, raster_thread_merger);
@@ -883,8 +940,9 @@ TEST(AndroidExternalViewEmbedder, DoesNotDestroyOverlayLayersOnSizeChange) {
   EXPECT_CALL(*jni_mock, FlutterViewBeginFrame()).Times(0);
 
   fml::Thread platform_thread("platform");
-  embedder->BeginFrame(SkISize::Make(30, 40), nullptr, 1.0,
+  embedder->BeginFrame(nullptr,
                        GetThreadMergerFromRasterThread(&platform_thread));
+  embedder->PrepareFlutterView(SkISize::Make(30, 40), 1.0);
 }
 
 TEST(AndroidExternalViewEmbedder, SupportsDynamicThreadMerging) {
@@ -910,8 +968,8 @@ TEST(AndroidExternalViewEmbedder, DisableThreadMerger) {
 
   EXPECT_CALL(*jni_mock, FlutterViewBeginFrame()).Times(0);
 
-  embedder->BeginFrame(SkISize::Make(10, 20), nullptr, 1.0,
-                       raster_thread_merger);
+  embedder->BeginFrame(nullptr, raster_thread_merger);
+  embedder->PrepareFlutterView(SkISize::Make(10, 20), 1.0);
   // Push a platform view.
   embedder->PrerollCompositeEmbeddedView(
       0, std::make_unique<EmbeddedViewParams>());
@@ -933,11 +991,11 @@ TEST(AndroidExternalViewEmbedder, Teardown) {
   auto gr_context = GrDirectContext::MakeMock(nullptr);
   auto frame_size = SkISize::Make(1000, 1000);
   auto surface_factory = std::make_shared<TestAndroidSurfaceFactory>(
-      [&android_context, gr_context, window, frame_size]() {
+      [gr_context, window, frame_size]() {
         SurfaceFrame::FramebufferInfo framebuffer_info;
         auto surface_frame_1 = std::make_unique<SurfaceFrame>(
-            SkSurface::MakeNull(1000, 1000), framebuffer_info,
-            [](const SurfaceFrame& surface_frame, SkCanvas* canvas) {
+            SkSurfaces::Null(1000, 1000), framebuffer_info,
+            [](const SurfaceFrame& surface_frame, DlCanvas* canvas) {
               return true;
             },
             /*frame_size=*/SkISize::Make(800, 600));
@@ -946,8 +1004,7 @@ TEST(AndroidExternalViewEmbedder, Teardown) {
         EXPECT_CALL(*surface_mock, AcquireFrame(frame_size))
             .WillOnce(Return(ByMove(std::move(surface_frame_1))));
 
-        auto android_surface_mock =
-            std::make_unique<AndroidSurfaceMock>(android_context);
+        auto android_surface_mock = std::make_unique<AndroidSurfaceMock>();
         EXPECT_CALL(*android_surface_mock, IsValid()).WillOnce(Return(true));
         EXPECT_CALL(*android_surface_mock, CreateGPUSurface(gr_context.get()))
             .WillOnce(Return(ByMove(std::move(surface_mock))));
@@ -961,7 +1018,8 @@ TEST(AndroidExternalViewEmbedder, Teardown) {
   auto raster_thread_merger =
       GetThreadMergerFromPlatformThread(&rasterizer_thread);
 
-  embedder->BeginFrame(frame_size, nullptr, 1.5, raster_thread_merger);
+  embedder->BeginFrame(nullptr, raster_thread_merger);
+  embedder->PrepareFlutterView(frame_size, 1.5);
 
   // Add an Android view.
   MutatorsStack stack;
@@ -971,8 +1029,8 @@ TEST(AndroidExternalViewEmbedder, Teardown) {
   embedder->PrerollCompositeEmbeddedView(0, std::move(view_params));
 
   // This simulates Flutter UI that intersects with the Android view.
-  embedder->CompositeEmbeddedView(0).canvas->drawRect(
-      SkRect::MakeXYWH(50, 50, 200, 200), SkPaint());
+  embedder->CompositeEmbeddedView(0)->DrawRect(
+      SkRect::MakeXYWH(50, 50, 200, 200), DlPaint());
 
   // Create a new overlay surface.
   EXPECT_CALL(*jni_mock, FlutterViewCreateOverlaySurface())
@@ -982,10 +1040,11 @@ TEST(AndroidExternalViewEmbedder, Teardown) {
 
   SurfaceFrame::FramebufferInfo framebuffer_info;
   auto surface_frame = std::make_unique<SurfaceFrame>(
-      SkSurface::MakeNull(1000, 1000), framebuffer_info,
-      [](const SurfaceFrame& surface_frame, SkCanvas* canvas) { return true; },
+      SkSurfaces::Null(1000, 1000), framebuffer_info,
+      [](const SurfaceFrame& surface_frame, DlCanvas* canvas) { return true; },
       /*frame_size=*/SkISize::Make(800, 600));
-  embedder->SubmitFrame(gr_context.get(), std::move(surface_frame));
+  embedder->SubmitFlutterView(kImplicitViewId, gr_context.get(), nullptr,
+                              std::move(surface_frame));
 
   embedder->EndFrame(/*should_resubmit_frame=*/false, raster_thread_merger);
 
diff --git a/shell/platform/android/external_view_embedder/surface_pool_unittests.cc b/shell/platform/android/external_view_embedder/surface_pool_unittests.cc
index ecf4e1a6c78e9ec57d4901ff394ee40b29737de4..d0c505675fe09ea3f40fe3283fb5b1ee6fa3299f 100644
--- a/shell/platform/android/external_view_embedder/surface_pool_unittests.cc
+++ b/shell/platform/android/external_view_embedder/surface_pool_unittests.cc
@@ -50,10 +50,9 @@ TEST(SurfacePool, GetLayerAllocateOneLayer) {
           ByMove(std::make_unique<PlatformViewAndroidJNI::OverlayMetadata>(
               0, window))));
 
-  auto surface_factory = std::make_shared<TestAndroidSurfaceFactory>(
-      [&android_context, gr_context, window]() {
-        auto android_surface_mock =
-            std::make_unique<AndroidSurfaceMock>(android_context);
+  auto surface_factory =
+      std::make_shared<TestAndroidSurfaceFactory>([gr_context, window]() {
+        auto android_surface_mock = std::make_unique<AndroidSurfaceMock>();
         EXPECT_CALL(*android_surface_mock, CreateGPUSurface(gr_context.get()));
         EXPECT_CALL(*android_surface_mock, SetNativeWindow(window));
         EXPECT_CALL(*android_surface_mock, IsValid()).WillOnce(Return(true));
@@ -82,10 +81,9 @@ TEST(SurfacePool, GetUnusedLayers) {
           ByMove(std::make_unique<PlatformViewAndroidJNI::OverlayMetadata>(
               0, window))));
 
-  auto surface_factory = std::make_shared<TestAndroidSurfaceFactory>(
-      [&android_context, gr_context, window]() {
-        auto android_surface_mock =
-            std::make_unique<AndroidSurfaceMock>(android_context);
+  auto surface_factory =
+      std::make_shared<TestAndroidSurfaceFactory>([gr_context, window]() {
+        auto android_surface_mock = std::make_unique<AndroidSurfaceMock>();
         EXPECT_CALL(*android_surface_mock, CreateGPUSurface(gr_context.get()));
         EXPECT_CALL(*android_surface_mock, SetNativeWindow(window));
         EXPECT_CALL(*android_surface_mock, IsValid()).WillOnce(Return(true));
@@ -118,9 +116,8 @@ TEST(SurfacePool, GetLayerRecycle) {
 
   auto gr_context_2 = GrDirectContext::MakeMock(nullptr);
   auto surface_factory = std::make_shared<TestAndroidSurfaceFactory>(
-      [&android_context, gr_context_1, gr_context_2, window]() {
-        auto android_surface_mock =
-            std::make_unique<AndroidSurfaceMock>(android_context);
+      [gr_context_1, gr_context_2, window]() {
+        auto android_surface_mock = std::make_unique<AndroidSurfaceMock>();
         // Allocate two GPU surfaces for each gr context.
         EXPECT_CALL(*android_surface_mock,
                     CreateGPUSurface(gr_context_1.get()));
@@ -166,10 +163,9 @@ TEST(SurfacePool, GetLayerAllocateTwoLayers) {
           ByMove(std::make_unique<PlatformViewAndroidJNI::OverlayMetadata>(
               1, window))));
 
-  auto surface_factory = std::make_shared<TestAndroidSurfaceFactory>(
-      [&android_context, gr_context, window]() {
-        auto android_surface_mock =
-            std::make_unique<AndroidSurfaceMock>(android_context);
+  auto surface_factory =
+      std::make_shared<TestAndroidSurfaceFactory>([gr_context, window]() {
+        auto android_surface_mock = std::make_unique<AndroidSurfaceMock>();
         EXPECT_CALL(*android_surface_mock, CreateGPUSurface(gr_context.get()));
         EXPECT_CALL(*android_surface_mock, SetNativeWindow(window));
         EXPECT_CALL(*android_surface_mock, IsValid()).WillOnce(Return(true));
@@ -206,10 +202,9 @@ TEST(SurfacePool, DestroyLayers) {
           ByMove(std::make_unique<PlatformViewAndroidJNI::OverlayMetadata>(
               0, window))));
 
-  auto surface_factory = std::make_shared<TestAndroidSurfaceFactory>(
-      [&android_context, gr_context, window]() {
-        auto android_surface_mock =
-            std::make_unique<AndroidSurfaceMock>(android_context);
+  auto surface_factory =
+      std::make_shared<TestAndroidSurfaceFactory>([gr_context, window]() {
+        auto android_surface_mock = std::make_unique<AndroidSurfaceMock>();
         EXPECT_CALL(*android_surface_mock, CreateGPUSurface(gr_context.get()));
         EXPECT_CALL(*android_surface_mock, SetNativeWindow(window));
         EXPECT_CALL(*android_surface_mock, IsValid()).WillOnce(Return(true));
@@ -236,10 +231,9 @@ TEST(SurfacePool, DestroyLayersFrameSizeChanged) {
 
   auto window = fml::MakeRefCounted<AndroidNativeWindow>(nullptr);
 
-  auto surface_factory = std::make_shared<TestAndroidSurfaceFactory>(
-      [&android_context, gr_context, window]() {
-        auto android_surface_mock =
-            std::make_unique<AndroidSurfaceMock>(android_context);
+  auto surface_factory =
+      std::make_shared<TestAndroidSurfaceFactory>([gr_context, window]() {
+        auto android_surface_mock = std::make_unique<AndroidSurfaceMock>();
         EXPECT_CALL(*android_surface_mock, CreateGPUSurface(gr_context.get()));
         EXPECT_CALL(*android_surface_mock, SetNativeWindow(window));
         EXPECT_CALL(*android_surface_mock, IsValid()).WillOnce(Return(true));
diff --git a/shell/platform/android/flutter_main.cc b/shell/platform/android/flutter_main.cc
index bf4930b1f1082dab7281e0ad45ba598a79dd50ed..9c9c58e66abe683310f4665ac423bfadc2714739 100644
--- a/shell/platform/android/flutter_main.cc
+++ b/shell/platform/android/flutter_main.cc
@@ -4,15 +4,14 @@
 
 #define FML_USED_ON_EMBEDDER
 
-#include "flutter/shell/platform/android/flutter_main.h"
-
 #include <android/log.h>
-
 #include <optional>
 #include <vector>
 
+#include "common/settings.h"
 #include "flutter/fml/command_line.h"
 #include "flutter/fml/file.h"
+#include "flutter/fml/logging.h"
 #include "flutter/fml/macros.h"
 #include "flutter/fml/message_loop.h"
 #include "flutter/fml/native_library.h"
@@ -24,11 +23,17 @@
 #include "flutter/runtime/dart_vm.h"
 #include "flutter/shell/common/shell.h"
 #include "flutter/shell/common/switches.h"
+#include "flutter/shell/platform/android/android_context_vulkan_impeller.h"
+#include "flutter/shell/platform/android/flutter_main.h"
+#include "impeller/base/validation.h"
+#include "impeller/toolkit/android/proc_table.h"
 #include "third_party/dart/runtime/include/dart_tools_api.h"
-#include "third_party/skia/include/core/SkFontMgr.h"
+#include "txt/platform.h"
 
 namespace flutter {
 
+constexpr int kMinimumAndroidApiLevelForVulkan = 29;
+
 extern "C" {
 #if FLUTTER_RUNTIME_MODE == FLUTTER_RUNTIME_MODE_DEBUG
 // Used for debugging dart:* sources.
@@ -39,27 +44,12 @@ extern const intptr_t kPlatformStrongDillSize;
 
 namespace {
 
-// This is only available on API 23+, so dynamically look it up.
-// This method is only called once at shell creation.
-// Do this in C++ because the API is available at level 23 here, but only 29+ in
-// Java.
-bool IsATraceEnabled() {
-  auto libandroid = fml::NativeLibrary::Create("libandroid.so");
-  FML_CHECK(libandroid);
-  auto atrace_fn =
-      libandroid->ResolveFunction<bool (*)(void)>("ATrace_isEnabled");
-  if (atrace_fn) {
-    return atrace_fn.value()();
-  }
-  return false;
-}
-
 fml::jni::ScopedJavaGlobalRef<jclass>* g_flutter_jni_class = nullptr;
 
 }  // anonymous namespace
 
 FlutterMain::FlutterMain(const flutter::Settings& settings)
-    : settings_(settings), observatory_uri_callback_() {}
+    : settings_(settings) {}
 
 FlutterMain::~FlutterMain() = default;
 
@@ -95,16 +85,29 @@ void FlutterMain::Init(JNIEnv* env,
   // Turn systracing on if ATrace_isEnabled is true and the user did not already
   // request systracing
   if (!settings.trace_systrace) {
-    settings.trace_systrace = IsATraceEnabled();
+    settings.trace_systrace =
+        impeller::android::GetProcTable().TraceIsEnabled();
     if (settings.trace_systrace) {
       __android_log_print(
           ANDROID_LOG_INFO, "Flutter",
           "ATrace was enabled at startup. Flutter and Dart "
-          "tracing will be forwarded to systrace and will not show up in the "
-          "Observatory timeline or Dart DevTools.");
+          "tracing will be forwarded to systrace and will not show up in "
+          "Dart DevTools.");
     }
   }
 
+  settings.android_rendering_api = SelectedRenderingAPI(settings);
+  switch (settings.android_rendering_api) {
+    case AndroidRenderingAPI::kSoftware:
+    case AndroidRenderingAPI::kSkiaOpenGLES:
+      settings.enable_impeller = false;
+      break;
+    case AndroidRenderingAPI::kImpellerOpenGLES:
+    case AndroidRenderingAPI::kImpellerVulkan:
+      settings.enable_impeller = true;
+      break;
+  }
+
 #if FLUTTER_RELEASE
   // On most platforms the timeline is always disabled in release mode.
   // On Android, enable it in release mode only when using systrace.
@@ -164,17 +167,17 @@ void FlutterMain::Init(JNIEnv* env,
   // longer be a singleton.
   g_flutter_main.reset(new FlutterMain(settings));
 
-  g_flutter_main->SetupObservatoryUriCallback(env);
+  g_flutter_main->SetupDartVMServiceUriCallback(env);
 }
 
-void FlutterMain::SetupObservatoryUriCallback(JNIEnv* env) {
+void FlutterMain::SetupDartVMServiceUriCallback(JNIEnv* env) {
   g_flutter_jni_class = new fml::jni::ScopedJavaGlobalRef<jclass>(
       env, env->FindClass("io/flutter/embedding/engine/FlutterJNI"));
   if (g_flutter_jni_class->is_null()) {
     return;
   }
   jfieldID uri_field = env->GetStaticFieldID(
-      g_flutter_jni_class->obj(), "observatoryUri", "Ljava/lang/String;");
+      g_flutter_jni_class->obj(), "vmServiceUri", "Ljava/lang/String;");
   if (uri_field == nullptr) {
     return;
   }
@@ -190,7 +193,7 @@ void FlutterMain::SetupObservatoryUriCallback(JNIEnv* env) {
   fml::RefPtr<fml::TaskRunner> platform_runner =
       fml::MessageLoop::GetCurrent().GetTaskRunner();
 
-  observatory_uri_callback_ = DartServiceIsolate::AddServerStatusCallback(
+  vm_service_uri_callback_ = DartServiceIsolate::AddServerStatusCallback(
       [platform_runner, set_uri](const std::string& uri) {
         platform_runner->PostTask([uri, set_uri] { set_uri(uri); });
       });
@@ -198,7 +201,7 @@ void FlutterMain::SetupObservatoryUriCallback(JNIEnv* env) {
 
 static void PrefetchDefaultFontManager(JNIEnv* env, jclass jcaller) {
   // Initialize a singleton owned by Skia.
-  SkFontMgr::RefDefault();
+  txt::GetDefaultFontManager();
 }
 
 bool FlutterMain::Register(JNIEnv* env) {
@@ -225,4 +228,56 @@ bool FlutterMain::Register(JNIEnv* env) {
   return env->RegisterNatives(clazz, methods, fml::size(methods)) == 0;
 }
 
+// static
+AndroidRenderingAPI FlutterMain::SelectedRenderingAPI(
+    const flutter::Settings& settings) {
+  if (settings.enable_software_rendering) {
+    FML_CHECK(!settings.enable_impeller)
+        << "Impeller does not support software rendering. Either disable "
+           "software rendering or disable impeller.";
+    return AndroidRenderingAPI::kSoftware;
+  }
+  constexpr AndroidRenderingAPI kVulkanUnsupportedFallback =
+      AndroidRenderingAPI::kSkiaOpenGLES;
+
+  // Debug/Profile only functionality for testing a specific
+  // backend configuration.
+#ifndef FLUTTER_RELEASE
+  if (settings.requested_rendering_backend == "opengles" &
+      settings.enable_impeller) {
+    return AndroidRenderingAPI::kImpellerOpenGLES;
+  }
+  if (settings.requested_rendering_backend == "vulkan" &&
+      settings.enable_impeller) {
+    return AndroidRenderingAPI::kImpellerVulkan;
+  }
+#endif
+
+  if (settings.enable_impeller) {
+    // Vulkan must only be used on API level 29+, as older API levels do not
+    // have requisite features to support platform views.
+    //
+    // Even if this check returns true, Impeller may determine it cannot use
+    // Vulkan for some other reason, such as a missing required extension or
+    // feature.
+    int api_level = android_get_device_api_level();
+    if (api_level < kMinimumAndroidApiLevelForVulkan) {
+      return kVulkanUnsupportedFallback;
+    }
+    // Determine if Vulkan is supported by creating a Vulkan context and
+    // checking if it is valid.
+    impeller::ScopedValidationDisable disable_validation;
+    auto vulkan_backend = std::make_unique<AndroidContextVulkanImpeller>(
+        /*enable_vulkan_validation=*/false,
+        /*enable_vulkan_gpu_tracing=*/false,
+        /*quiet=*/true);
+    if (!vulkan_backend->IsValid()) {
+      return kVulkanUnsupportedFallback;
+    }
+    return AndroidRenderingAPI::kImpellerVulkan;
+  }
+
+  return AndroidRenderingAPI::kSkiaOpenGLES;
+}
+
 }  // namespace flutter
diff --git a/shell/platform/android/flutter_main.h b/shell/platform/android/flutter_main.h
index b956377c8e295c4ecc5aaac842714c538dc386a3..c572b458fbc292f339de0f9c19f1f7483d84c2ac 100644
--- a/shell/platform/android/flutter_main.h
+++ b/shell/platform/android/flutter_main.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_PLATFORM_ANDROID_FLUTTER_MAIN_H_
-#define SHELL_PLATFORM_ANDROID_FLUTTER_MAIN_H_
+#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_FLUTTER_MAIN_H_
+#define FLUTTER_SHELL_PLATFORM_ANDROID_FLUTTER_MAIN_H_
 
 #include <jni.h>
 
@@ -23,9 +23,12 @@ class FlutterMain {
 
   const flutter::Settings& GetSettings() const;
 
+  static AndroidRenderingAPI SelectedRenderingAPI(
+      const flutter::Settings& settings);
+
  private:
   const flutter::Settings settings_;
-  DartServiceIsolate::CallbackHandle observatory_uri_callback_;
+  DartServiceIsolate::CallbackHandle vm_service_uri_callback_ = 0;
 
   explicit FlutterMain(const flutter::Settings& settings);
 
@@ -38,11 +41,11 @@ class FlutterMain {
                    jstring engineCachesPath,
                    jlong initTimeMillis);
 
-  void SetupObservatoryUriCallback(JNIEnv* env);
+  void SetupDartVMServiceUriCallback(JNIEnv* env);
 
   FML_DISALLOW_COPY_AND_ASSIGN(FlutterMain);
 };
 
 }  // namespace flutter
 
-#endif  // SHELL_PLATFORM_ANDROID_FLUTTER_MAIN_H_
+#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_FLUTTER_MAIN_H_
diff --git a/shell/platform/android/flutter_shell_native_unittests.cc b/shell/platform/android/flutter_shell_native_unittests.cc
index fbebc29e38923a50cc2d1dc8a814502d9224a192..de1401c1ad00924af01dbe08d657fb3b869aa0f2 100644
--- a/shell/platform/android/flutter_shell_native_unittests.cc
+++ b/shell/platform/android/flutter_shell_native_unittests.cc
@@ -1,3 +1,7 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 #include "gtest/gtest.h"
 
 int main(int argc, char* argv[]) {
diff --git a/shell/platform/android/gradle.properties b/shell/platform/android/gradle.properties
new file mode 100644
index 0000000000000000000000000000000000000000..b515f69e9946dbf84d3acbf2d44664fb75dd9599
--- /dev/null
+++ b/shell/platform/android/gradle.properties
@@ -0,0 +1,5 @@
+# This file only exists to provide IDE support to Android Studio.
+#
+# See ./README.md for details.
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/shell/platform/android/image_external_texture.cc b/shell/platform/android/image_external_texture.cc
new file mode 100644
index 0000000000000000000000000000000000000000..4c9735ccc0eba9332f2914afa5edf60b29c25538
--- /dev/null
+++ b/shell/platform/android/image_external_texture.cc
@@ -0,0 +1,118 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/platform/android/image_external_texture.h"
+
+#include <android/hardware_buffer_jni.h>
+#include <android/sensor.h>
+
+#include "flutter/fml/platform/android/jni_util.h"
+#include "flutter/impeller/toolkit/android/proc_table.h"
+#include "flutter/shell/platform/android/jni/platform_view_android_jni.h"
+
+namespace flutter {
+
+ImageExternalTexture::ImageExternalTexture(
+    int64_t id,
+    const fml::jni::ScopedJavaGlobalRef<jobject>& image_texture_entry,
+    const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade)
+    : Texture(id),
+      image_texture_entry_(image_texture_entry),
+      jni_facade_(jni_facade) {}
+
+// Implementing flutter::Texture.
+void ImageExternalTexture::Paint(PaintContext& context,
+                                 const SkRect& bounds,
+                                 bool freeze,
+                                 const DlImageSampling sampling) {
+  if (state_ == AttachmentState::kDetached) {
+    return;
+  }
+  Attach(context);
+  const bool should_process_frame = !freeze;
+  if (should_process_frame) {
+    ProcessFrame(context, bounds);
+  }
+  if (dl_image_) {
+    context.canvas->DrawImageRect(
+        dl_image_,                                     // image
+        SkRect::Make(dl_image_->bounds()),             // source rect
+        bounds,                                        // destination rect
+        sampling,                                      // sampling
+        context.paint,                                 // paint
+        flutter::DlCanvas::SrcRectConstraint::kStrict  // enforce edges
+    );
+  } else {
+    FML_LOG(INFO) << "No DlImage available for ImageExternalTexture to paint.";
+  }
+}
+
+// Implementing flutter::Texture.
+void ImageExternalTexture::MarkNewFrameAvailable() {
+  // NOOP.
+}
+
+// Implementing flutter::Texture.
+void ImageExternalTexture::OnTextureUnregistered() {}
+
+// Implementing flutter::ContextListener.
+void ImageExternalTexture::OnGrContextCreated() {
+  state_ = AttachmentState::kUninitialized;
+}
+
+// Implementing flutter::ContextListener.
+void ImageExternalTexture::OnGrContextDestroyed() {
+  if (state_ == AttachmentState::kAttached) {
+    dl_image_.reset();
+    image_lru_.Clear();
+    Detach();
+  }
+  state_ = AttachmentState::kDetached;
+}
+
+JavaLocalRef ImageExternalTexture::AcquireLatestImage() {
+  JNIEnv* env = fml::jni::AttachCurrentThread();
+  FML_CHECK(env != nullptr);
+
+  // ImageTextureEntry.acquireLatestImage.
+  JavaLocalRef image_java =
+      jni_facade_->ImageProducerTextureEntryAcquireLatestImage(
+          JavaLocalRef(image_texture_entry_));
+  return image_java;
+}
+
+void ImageExternalTexture::CloseImage(const fml::jni::JavaRef<jobject>& image) {
+  if (image.obj() == nullptr) {
+    return;
+  }
+  jni_facade_->ImageClose(JavaLocalRef(image));
+}
+
+void ImageExternalTexture::CloseHardwareBuffer(
+    const fml::jni::JavaRef<jobject>& hardware_buffer) {
+  if (hardware_buffer.obj() == nullptr) {
+    return;
+  }
+  jni_facade_->HardwareBufferClose(JavaLocalRef(hardware_buffer));
+}
+
+JavaLocalRef ImageExternalTexture::HardwareBufferFor(
+    const fml::jni::JavaRef<jobject>& image) {
+  if (image.obj() == nullptr) {
+    return JavaLocalRef();
+  }
+  // Image.getHardwareBuffer.
+  return jni_facade_->ImageGetHardwareBuffer(JavaLocalRef(image));
+}
+
+AHardwareBuffer* ImageExternalTexture::AHardwareBufferFor(
+    const fml::jni::JavaRef<jobject>& hardware_buffer) {
+  JNIEnv* env = fml::jni::AttachCurrentThread();
+  FML_CHECK(env != nullptr);
+  const auto& proc =
+      impeller::android::GetProcTable().AHardwareBuffer_fromHardwareBuffer;
+  return proc ? proc(env, hardware_buffer.obj()) : nullptr;
+}
+
+}  // namespace flutter
diff --git a/shell/platform/android/image_external_texture.h b/shell/platform/android/image_external_texture.h
new file mode 100644
index 0000000000000000000000000000000000000000..02ccdd91394db1fd1a1441f65563f2a4530687fe
--- /dev/null
+++ b/shell/platform/android/image_external_texture.h
@@ -0,0 +1,73 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_IMAGE_EXTERNAL_TEXTURE_H_
+#define FLUTTER_SHELL_PLATFORM_ANDROID_IMAGE_EXTERNAL_TEXTURE_H_
+
+#include "flutter/common/graphics/texture.h"
+#include "flutter/fml/logging.h"
+#include "flutter/shell/platform/android/image_lru.h"
+#include "flutter/shell/platform/android/jni/platform_view_android_jni.h"
+#include "flutter/shell/platform/android/platform_view_android_jni_impl.h"
+
+#include <android/hardware_buffer.h>
+#include <android/hardware_buffer_jni.h>
+
+namespace flutter {
+
+// External texture peered to a sequence of android.hardware.HardwareBuffers.
+//
+class ImageExternalTexture : public flutter::Texture {
+ public:
+  explicit ImageExternalTexture(
+      int64_t id,
+      const fml::jni::ScopedJavaGlobalRef<jobject>& image_texture_entry,
+      const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade);
+
+  virtual ~ImageExternalTexture() = default;
+
+  // |flutter::Texture|.
+  void Paint(PaintContext& context,
+             const SkRect& bounds,
+             bool freeze,
+             const DlImageSampling sampling) override;
+
+  // |flutter::Texture|.
+  void MarkNewFrameAvailable() override;
+
+  // |flutter::Texture|
+  void OnTextureUnregistered() override;
+
+  // |flutter::ContextListener|
+  void OnGrContextCreated() override;
+
+  // |flutter::ContextListener|
+  void OnGrContextDestroyed() override;
+
+ protected:
+  virtual void Attach(PaintContext& context) = 0;
+  virtual void Detach() = 0;
+  virtual void ProcessFrame(PaintContext& context, const SkRect& bounds) = 0;
+
+  JavaLocalRef AcquireLatestImage();
+  void CloseImage(const fml::jni::JavaRef<jobject>& image);
+  JavaLocalRef HardwareBufferFor(const fml::jni::JavaRef<jobject>& image);
+  void CloseHardwareBuffer(const fml::jni::JavaRef<jobject>& hardware_buffer);
+  AHardwareBuffer* AHardwareBufferFor(
+      const fml::jni::JavaRef<jobject>& hardware_buffer);
+
+  fml::jni::ScopedJavaGlobalRef<jobject> image_texture_entry_;
+  std::shared_ptr<PlatformViewAndroidJNI> jni_facade_;
+
+  enum class AttachmentState { kUninitialized, kAttached, kDetached };
+  AttachmentState state_ = AttachmentState::kUninitialized;
+  sk_sp<flutter::DlImage> dl_image_;
+  ImageLRU image_lru_ = ImageLRU();
+
+  FML_DISALLOW_COPY_AND_ASSIGN(ImageExternalTexture);
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_IMAGE_EXTERNAL_TEXTURE_H_
diff --git a/shell/platform/android/image_external_texture_gl.cc b/shell/platform/android/image_external_texture_gl.cc
new file mode 100644
index 0000000000000000000000000000000000000000..92743654d028913fca5ce592a0d95339443bec21
--- /dev/null
+++ b/shell/platform/android/image_external_texture_gl.cc
@@ -0,0 +1,209 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/platform/android/image_external_texture_gl.h"
+
+#include <android/hardware_buffer_jni.h>
+#include <android/sensor.h>
+
+#include "flutter/common/graphics/texture.h"
+#include "flutter/impeller/core/formats.h"
+#include "flutter/impeller/display_list/dl_image_impeller.h"
+#include "flutter/impeller/toolkit/android/hardware_buffer.h"
+#include "flutter/impeller/toolkit/egl/image.h"
+#include "flutter/impeller/toolkit/gles/texture.h"
+#include "third_party/skia/include/core/SkAlphaType.h"
+#include "third_party/skia/include/core/SkColorType.h"
+#include "third_party/skia/include/gpu/ganesh/SkImageGanesh.h"
+#include "third_party/skia/include/gpu/ganesh/gl/GrGLBackendSurface.h"
+#include "third_party/skia/include/gpu/gl/GrGLTypes.h"
+
+namespace flutter {
+
+ImageExternalTextureGL::ImageExternalTextureGL(
+    int64_t id,
+    const fml::jni::ScopedJavaGlobalRef<jobject>& image_texture_entry,
+    const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade)
+    : ImageExternalTexture(id, image_texture_entry, jni_facade) {}
+
+void ImageExternalTextureGL::Attach(PaintContext& context) {
+  if (state_ == AttachmentState::kUninitialized) {
+    // TODO(johnmccurtchan): We currently display the first frame after an
+    // attach-detach cycle as blank. There seems to be an issue on some
+    // devices where ImageReaders/Images from before the detach aren't
+    // valid after the attach. According to Android folks this doesn't
+    // match the spec. Revisit this in the future.
+    // See https://github.com/flutter/flutter/issues/142978 and
+    // https://github.com/flutter/flutter/issues/139039.
+    state_ = AttachmentState::kAttached;
+  }
+}
+
+void ImageExternalTextureGL::UpdateImage(JavaLocalRef& hardware_buffer,
+                                         const SkRect& bounds,
+                                         PaintContext& context) {
+  AHardwareBuffer* latest_hardware_buffer = AHardwareBufferFor(hardware_buffer);
+  std::optional<HardwareBufferKey> key =
+      impeller::android::HardwareBuffer::GetSystemUniqueID(
+          latest_hardware_buffer);
+  auto existing_image = image_lru_.FindImage(key);
+  if (existing_image != nullptr) {
+    dl_image_ = existing_image;
+    return;
+  }
+
+  auto egl_image = CreateEGLImage(latest_hardware_buffer);
+  if (!egl_image.is_valid()) {
+    return;
+  }
+
+  dl_image_ = CreateDlImage(context, bounds, key, std::move(egl_image));
+  if (key.has_value()) {
+    gl_entries_.erase(image_lru_.AddImage(dl_image_, key.value()));
+  }
+}
+
+void ImageExternalTextureGL::ProcessFrame(PaintContext& context,
+                                          const SkRect& bounds) {
+  JavaLocalRef image = AcquireLatestImage();
+  if (image.is_null()) {
+    return;
+  }
+  JavaLocalRef hardware_buffer = HardwareBufferFor(image);
+  UpdateImage(hardware_buffer, bounds, context);
+  CloseHardwareBuffer(hardware_buffer);
+}
+
+void ImageExternalTextureGL::Detach() {
+  image_lru_.Clear();
+  gl_entries_.clear();
+}
+
+impeller::UniqueEGLImageKHR ImageExternalTextureGL::CreateEGLImage(
+    AHardwareBuffer* hardware_buffer) {
+  if (hardware_buffer == nullptr) {
+    return impeller::UniqueEGLImageKHR();
+  }
+
+  EGLDisplay display = eglGetCurrentDisplay();
+  FML_CHECK(display != EGL_NO_DISPLAY);
+
+  EGLClientBuffer client_buffer =
+      impeller::android::GetProcTable().eglGetNativeClientBufferANDROID(
+          hardware_buffer);
+  FML_DCHECK(client_buffer != nullptr);
+  if (client_buffer == nullptr) {
+    FML_LOG(ERROR) << "eglGetNativeClientBufferAndroid returned null.";
+    return impeller::UniqueEGLImageKHR();
+  }
+
+  impeller::EGLImageKHRWithDisplay maybe_image =
+      impeller::EGLImageKHRWithDisplay{
+          eglCreateImageKHR(display, EGL_NO_CONTEXT, EGL_NATIVE_BUFFER_ANDROID,
+                            client_buffer, 0),
+          display};
+
+  return impeller::UniqueEGLImageKHR(maybe_image);
+}
+
+ImageExternalTextureGLSkia::ImageExternalTextureGLSkia(
+    const std::shared_ptr<AndroidContextGLSkia>& context,
+    int64_t id,
+    const fml::jni::ScopedJavaGlobalRef<jobject>& image_texture_entry,
+    const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade)
+    : ImageExternalTextureGL(id, image_texture_entry, jni_facade) {}
+
+void ImageExternalTextureGLSkia::Attach(PaintContext& context) {
+  if (state_ == AttachmentState::kUninitialized) {
+    // After this call state_ will be AttachmentState::kAttached and egl_image_
+    // will have been created if we still have an Image associated with us.
+    ImageExternalTextureGL::Attach(context);
+  }
+}
+
+void ImageExternalTextureGLSkia::Detach() {
+  ImageExternalTextureGL::Detach();
+}
+
+void ImageExternalTextureGLSkia::BindImageToTexture(
+    const impeller::UniqueEGLImageKHR& image,
+    GLuint tex) {
+  if (!image.is_valid() || tex == 0) {
+    return;
+  }
+  glBindTexture(GL_TEXTURE_EXTERNAL_OES, tex);
+  glEGLImageTargetTexture2DOES(GL_TEXTURE_EXTERNAL_OES,
+                               (GLeglImageOES)image.get().image);
+}
+
+sk_sp<flutter::DlImage> ImageExternalTextureGLSkia::CreateDlImage(
+    PaintContext& context,
+    const SkRect& bounds,
+    std::optional<HardwareBufferKey> id,
+    impeller::UniqueEGLImageKHR&& egl_image) {
+  GLuint texture_name;
+  glGenTextures(1, &texture_name);
+  auto gl_texture = impeller::GLTexture{texture_name};
+  impeller::UniqueGLTexture unique_texture;
+  unique_texture.reset(gl_texture);
+
+  BindImageToTexture(egl_image, unique_texture.get().texture_name);
+  GrGLTextureInfo textureInfo = {
+      GL_TEXTURE_EXTERNAL_OES, unique_texture.get().texture_name, GL_RGBA8_OES};
+  auto backendTexture =
+      GrBackendTextures::MakeGL(1, 1, skgpu::Mipmapped::kNo, textureInfo);
+
+  gl_entries_[id.value_or(0)] = GlEntry{.egl_image = std::move(egl_image),
+                                        .texture = std::move(unique_texture)};
+  return DlImage::Make(SkImages::BorrowTextureFrom(
+      context.gr_context, backendTexture, kTopLeft_GrSurfaceOrigin,
+      kRGBA_8888_SkColorType, kPremul_SkAlphaType, nullptr));
+}
+
+ImageExternalTextureGLImpeller::ImageExternalTextureGLImpeller(
+    const std::shared_ptr<impeller::ContextGLES>& context,
+    int64_t id,
+    const fml::jni::ScopedJavaGlobalRef<jobject>& image_textury_entry,
+    const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade)
+    : ImageExternalTextureGL(id, image_textury_entry, jni_facade),
+      impeller_context_(context) {}
+
+void ImageExternalTextureGLImpeller::Detach() {}
+
+void ImageExternalTextureGLImpeller::Attach(PaintContext& context) {
+  if (state_ == AttachmentState::kUninitialized) {
+    ImageExternalTextureGL::Attach(context);
+  }
+}
+
+sk_sp<flutter::DlImage> ImageExternalTextureGLImpeller::CreateDlImage(
+    PaintContext& context,
+    const SkRect& bounds,
+    std::optional<HardwareBufferKey> id,
+    impeller::UniqueEGLImageKHR&& egl_image) {
+  impeller::TextureDescriptor desc;
+  desc.type = impeller::TextureType::kTextureExternalOES;
+  desc.storage_mode = impeller::StorageMode::kDevicePrivate;
+  desc.format = impeller::PixelFormat::kR8G8B8A8UNormInt;
+  desc.size = {static_cast<int>(bounds.width()),
+               static_cast<int>(bounds.height())};
+  desc.mip_count = 1;
+  auto texture = std::make_shared<impeller::TextureGLES>(
+      impeller_context_->GetReactor(), desc,
+      impeller::TextureGLES::IsWrapped::kWrapped);
+  texture->SetCoordinateSystem(
+      impeller::TextureCoordinateSystem::kUploadFromHost);
+  if (!texture->Bind()) {
+    return nullptr;
+  }
+  // Associate the hardware buffer image with the texture.
+  glEGLImageTargetTexture2DOES(GL_TEXTURE_EXTERNAL_OES,
+                               (GLeglImageOES)egl_image.get().image);
+  gl_entries_[id.value_or(0)] = GlEntry{
+      .egl_image = std::move(egl_image),
+  };
+  return impeller::DlImageImpeller::Make(texture);
+}
+
+}  // namespace flutter
diff --git a/shell/platform/android/image_external_texture_gl.h b/shell/platform/android/image_external_texture_gl.h
new file mode 100644
index 0000000000000000000000000000000000000000..995592c7787f5892d7ba7599c9542fb95956094a
--- /dev/null
+++ b/shell/platform/android/image_external_texture_gl.h
@@ -0,0 +1,108 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_IMAGE_EXTERNAL_TEXTURE_GL_H_
+#define FLUTTER_SHELL_PLATFORM_ANDROID_IMAGE_EXTERNAL_TEXTURE_GL_H_
+
+#include <unordered_map>
+
+#include "flutter/fml/platform/android/scoped_java_ref.h"
+#include "flutter/shell/platform/android/image_external_texture.h"
+
+#include "flutter/impeller/renderer/backend/gles/context_gles.h"
+#include "flutter/impeller/renderer/backend/gles/gles.h"
+#include "flutter/impeller/renderer/backend/gles/texture_gles.h"
+#include "flutter/impeller/toolkit/egl/egl.h"
+#include "flutter/impeller/toolkit/egl/image.h"
+#include "flutter/impeller/toolkit/gles/texture.h"
+#include "flutter/shell/platform/android/android_context_gl_skia.h"
+
+namespace flutter {
+
+class ImageExternalTextureGL : public ImageExternalTexture {
+ public:
+  ImageExternalTextureGL(
+      int64_t id,
+      const fml::jni::ScopedJavaGlobalRef<jobject>& image_textury_entry,
+      const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade);
+
+ protected:
+  void Attach(PaintContext& context) override;
+  void Detach() override;
+  void ProcessFrame(PaintContext& context, const SkRect& bounds) override;
+  void UpdateImage(JavaLocalRef& hardware_buffer,
+                   const SkRect& bounds,
+                   PaintContext& context);
+
+  virtual sk_sp<flutter::DlImage> CreateDlImage(
+      PaintContext& context,
+      const SkRect& bounds,
+      std::optional<HardwareBufferKey> id,
+      impeller::UniqueEGLImageKHR&& egl_image) = 0;
+
+  impeller::UniqueEGLImageKHR CreateEGLImage(AHardwareBuffer* buffer);
+
+  struct GlEntry {
+    impeller::UniqueEGLImageKHR egl_image;
+    impeller::UniqueGLTexture texture;
+  };
+
+  // Each GL entry is keyed off of the currently active
+  // hardware buffers and evicted when the hardware buffer
+  // is removed from the LRU cache.
+  std::unordered_map<HardwareBufferKey, GlEntry> gl_entries_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(ImageExternalTextureGL);
+};
+
+class ImageExternalTextureGLSkia : public ImageExternalTextureGL {
+ public:
+  ImageExternalTextureGLSkia(
+      const std::shared_ptr<AndroidContextGLSkia>& context,
+      int64_t id,
+      const fml::jni::ScopedJavaGlobalRef<jobject>& image_textury_entry,
+      const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade);
+
+ private:
+  void Attach(PaintContext& context) override;
+  void Detach() override;
+
+  void BindImageToTexture(const impeller::UniqueEGLImageKHR& image, GLuint tex);
+
+  sk_sp<flutter::DlImage> CreateDlImage(
+      PaintContext& context,
+      const SkRect& bounds,
+      std::optional<HardwareBufferKey> id,
+      impeller::UniqueEGLImageKHR&& egl_image) override;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(ImageExternalTextureGLSkia);
+};
+
+class ImageExternalTextureGLImpeller : public ImageExternalTextureGL {
+ public:
+  ImageExternalTextureGLImpeller(
+      const std::shared_ptr<impeller::ContextGLES>& context,
+      int64_t id,
+      const fml::jni::ScopedJavaGlobalRef<jobject>&
+          hardware_buffer_texture_entry,
+      const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade);
+
+ private:
+  void Attach(PaintContext& context) override;
+  void Detach() override;
+
+  sk_sp<flutter::DlImage> CreateDlImage(
+      PaintContext& context,
+      const SkRect& bounds,
+      std::optional<HardwareBufferKey> id,
+      impeller::UniqueEGLImageKHR&& egl_image) override;
+
+  const std::shared_ptr<impeller::ContextGLES> impeller_context_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(ImageExternalTextureGLImpeller);
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_IMAGE_EXTERNAL_TEXTURE_GL_H_
diff --git a/shell/platform/android/image_external_texture_vk.cc b/shell/platform/android/image_external_texture_vk.cc
new file mode 100644
index 0000000000000000000000000000000000000000..88574548d6c11773f407c2c7b8c093067a4d51a0
--- /dev/null
+++ b/shell/platform/android/image_external_texture_vk.cc
@@ -0,0 +1,103 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/platform/android/image_external_texture_vk.h"
+
+#include <cstdint>
+
+#include "flutter/impeller/core/formats.h"
+#include "flutter/impeller/core/texture_descriptor.h"
+#include "flutter/impeller/display_list/dl_image_impeller.h"
+#include "flutter/impeller/renderer/backend/vulkan/android/ahb_texture_source_vk.h"
+#include "flutter/impeller/renderer/backend/vulkan/command_buffer_vk.h"
+#include "flutter/impeller/renderer/backend/vulkan/command_encoder_vk.h"
+#include "flutter/impeller/renderer/backend/vulkan/texture_vk.h"
+#include "flutter/impeller/toolkit/android/hardware_buffer.h"
+
+namespace flutter {
+
+ImageExternalTextureVK::ImageExternalTextureVK(
+    const std::shared_ptr<impeller::ContextVK>& impeller_context,
+    int64_t id,
+    const fml::jni::ScopedJavaGlobalRef<jobject>& image_texture_entry,
+    const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade)
+    : ImageExternalTexture(id, image_texture_entry, jni_facade),
+      impeller_context_(impeller_context) {}
+
+ImageExternalTextureVK::~ImageExternalTextureVK() {}
+
+void ImageExternalTextureVK::Attach(PaintContext& context) {
+  if (state_ == AttachmentState::kUninitialized) {
+    // First processed frame we are attached.
+    state_ = AttachmentState::kAttached;
+  }
+}
+
+void ImageExternalTextureVK::Detach() {}
+
+void ImageExternalTextureVK::ProcessFrame(PaintContext& context,
+                                          const SkRect& bounds) {
+  JavaLocalRef image = AcquireLatestImage();
+  if (image.is_null()) {
+    return;
+  }
+  JavaLocalRef hardware_buffer = HardwareBufferFor(image);
+  AHardwareBuffer* latest_hardware_buffer = AHardwareBufferFor(hardware_buffer);
+
+  auto hb_desc =
+      impeller::android::HardwareBuffer::Describe(latest_hardware_buffer);
+  std::optional<HardwareBufferKey> key =
+      impeller::android::HardwareBuffer::GetSystemUniqueID(
+          latest_hardware_buffer);
+  auto existing_image = image_lru_.FindImage(key);
+  if (existing_image != nullptr || !hb_desc.has_value()) {
+    dl_image_ = existing_image;
+
+    CloseHardwareBuffer(hardware_buffer);
+    return;
+  }
+
+  auto texture_source = std::make_shared<impeller::AHBTextureSourceVK>(
+      impeller_context_, latest_hardware_buffer, hb_desc.value());
+  if (!texture_source->IsValid()) {
+    CloseHardwareBuffer(hardware_buffer);
+    return;
+  }
+
+  auto texture =
+      std::make_shared<impeller::TextureVK>(impeller_context_, texture_source);
+  // Transition the layout to shader read.
+  {
+    auto buffer = impeller_context_->CreateCommandBuffer();
+    impeller::CommandBufferVK& buffer_vk =
+        impeller::CommandBufferVK::Cast(*buffer);
+
+    impeller::BarrierVK barrier;
+    barrier.cmd_buffer = buffer_vk.GetEncoder()->GetCommandBuffer();
+    barrier.src_access = impeller::vk::AccessFlagBits::eColorAttachmentWrite |
+                         impeller::vk::AccessFlagBits::eTransferWrite;
+    barrier.src_stage =
+        impeller::vk::PipelineStageFlagBits::eColorAttachmentOutput |
+        impeller::vk::PipelineStageFlagBits::eTransfer;
+    barrier.dst_access = impeller::vk::AccessFlagBits::eShaderRead;
+    barrier.dst_stage = impeller::vk::PipelineStageFlagBits::eFragmentShader;
+
+    barrier.new_layout = impeller::vk::ImageLayout::eShaderReadOnlyOptimal;
+
+    if (!texture->SetLayout(barrier)) {
+      return;
+    }
+    if (!impeller_context_->GetCommandQueue()->Submit({buffer}).ok()) {
+      return;
+    }
+  }
+
+  dl_image_ = impeller::DlImageImpeller::Make(texture);
+  if (key.has_value()) {
+    image_lru_.AddImage(dl_image_, key.value());
+  }
+  CloseHardwareBuffer(hardware_buffer);
+}
+
+}  // namespace flutter
diff --git a/shell/platform/android/image_external_texture_vk.h b/shell/platform/android/image_external_texture_vk.h
new file mode 100644
index 0000000000000000000000000000000000000000..e702671fe84b336f264d7a78dc7b658a8202396e
--- /dev/null
+++ b/shell/platform/android/image_external_texture_vk.h
@@ -0,0 +1,40 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_IMAGE_EXTERNAL_TEXTURE_VK_H_
+#define FLUTTER_SHELL_PLATFORM_ANDROID_IMAGE_EXTERNAL_TEXTURE_VK_H_
+
+#include <cstdint>
+#include <utility>
+#include "flutter/shell/platform/android/image_external_texture.h"
+
+#include "flutter/impeller/renderer/backend/vulkan/android/ahb_texture_source_vk.h"
+#include "flutter/impeller/renderer/backend/vulkan/context_vk.h"
+#include "flutter/impeller/renderer/backend/vulkan/vk.h"
+#include "flutter/shell/platform/android/android_context_vulkan_impeller.h"
+
+namespace flutter {
+
+class ImageExternalTextureVK : public ImageExternalTexture {
+ public:
+  ImageExternalTextureVK(
+      const std::shared_ptr<impeller::ContextVK>& impeller_context,
+      int64_t id,
+      const fml::jni::ScopedJavaGlobalRef<jobject>&
+          hardware_buffer_texture_entry,
+      const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade);
+
+  ~ImageExternalTextureVK() override;
+
+ private:
+  void Attach(PaintContext& context) override;
+  void ProcessFrame(PaintContext& context, const SkRect& bounds) override;
+  void Detach() override;
+
+  const std::shared_ptr<impeller::ContextVK> impeller_context_;
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_IMAGE_EXTERNAL_TEXTURE_VK_H_
diff --git a/shell/platform/android/image_lru.cc b/shell/platform/android/image_lru.cc
new file mode 100644
index 0000000000000000000000000000000000000000..6971483e034a071b777fd086650099435d983ae6
--- /dev/null
+++ b/shell/platform/android/image_lru.cc
@@ -0,0 +1,66 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/platform/android/image_lru.h"
+
+namespace flutter {
+
+sk_sp<flutter::DlImage> ImageLRU::FindImage(
+    std::optional<HardwareBufferKey> key) {
+  if (!key.has_value()) {
+    return nullptr;
+  }
+  auto key_value = key.value();
+  for (size_t i = 0u; i < kImageReaderSwapchainSize; i++) {
+    if (images_[i].key == key_value) {
+      auto result = images_[i].value;
+      UpdateKey(result, key_value);
+      return result;
+    }
+  }
+  return nullptr;
+}
+
+void ImageLRU::UpdateKey(const sk_sp<flutter::DlImage>& image,
+                         HardwareBufferKey key) {
+  if (images_[0].key == key) {
+    return;
+  }
+  size_t i = 1u;
+  for (; i < kImageReaderSwapchainSize; i++) {
+    if (images_[i].key == key) {
+      break;
+    }
+  }
+  for (auto j = i; j > 0; j--) {
+    images_[j] = images_[j - 1];
+  }
+  images_[0] = Data{.key = key, .value = image};
+}
+
+HardwareBufferKey ImageLRU::AddImage(const sk_sp<flutter::DlImage>& image,
+                                     HardwareBufferKey key) {
+  HardwareBufferKey lru_key = images_[kImageReaderSwapchainSize - 1].key;
+  bool updated_image = false;
+  for (size_t i = 0u; i < kImageReaderSwapchainSize; i++) {
+    if (images_[i].key == lru_key) {
+      updated_image = true;
+      images_[i] = Data{.key = key, .value = image};
+      break;
+    }
+  }
+  if (!updated_image) {
+    images_[0] = Data{.key = key, .value = image};
+  }
+  UpdateKey(image, key);
+  return lru_key;
+}
+
+void ImageLRU::Clear() {
+  for (size_t i = 0u; i < kImageReaderSwapchainSize; i++) {
+    images_[i] = Data{.key = 0u, .value = nullptr};
+  }
+}
+
+}  // namespace flutter
diff --git a/shell/platform/android/image_lru.h b/shell/platform/android/image_lru.h
new file mode 100644
index 0000000000000000000000000000000000000000..63829efb970accffd01e2847a0d264116312a090
--- /dev/null
+++ b/shell/platform/android/image_lru.h
@@ -0,0 +1,57 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_IMAGE_LRU_H_
+#define FLUTTER_SHELL_PLATFORM_ANDROID_IMAGE_LRU_H_
+
+#include <array>
+#include <cstddef>
+
+#include "display_list/image/dl_image.h"
+
+namespace flutter {
+
+// This value needs to be larger than the number of swapchain images
+// that a typical image reader will produce to ensure that we effectively
+// cache. If the value is too small, we will unnecessarily churn through
+// images, while if it is too large we may retain images longer than
+// necessary.
+static constexpr size_t kImageReaderSwapchainSize = 6u;
+
+using HardwareBufferKey = uint64_t;
+
+class ImageLRU {
+ public:
+  ImageLRU() = default;
+
+  ~ImageLRU() = default;
+
+  /// @brief Retrieve the image associated with the given [key], or nullptr.
+  sk_sp<flutter::DlImage> FindImage(std::optional<HardwareBufferKey> key);
+
+  /// @brief Add a new image to the cache with a key, returning the key of the
+  ///        LRU entry that was removed.
+  ///
+  /// The value may be `0`, in which case nothing was removed.
+  HardwareBufferKey AddImage(const sk_sp<flutter::DlImage>& image,
+                             HardwareBufferKey key);
+
+  /// @brief Remove all entires from the image cache.
+  void Clear();
+
+ private:
+  /// @brief Marks [key] as the most recently used.
+  void UpdateKey(const sk_sp<flutter::DlImage>& image, HardwareBufferKey key);
+
+  struct Data {
+    HardwareBufferKey key = 0u;
+    sk_sp<flutter::DlImage> value;
+  };
+
+  std::array<Data, kImageReaderSwapchainSize> images_;
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_IMAGE_LRU_H_
diff --git a/shell/platform/android/image_lru_unittests.cc b/shell/platform/android/image_lru_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..d97edfdffc5f756e7a2aaca2bbfd1f88244bdf67
--- /dev/null
+++ b/shell/platform/android/image_lru_unittests.cc
@@ -0,0 +1,57 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/platform/android/image_lru.h"
+#include "gtest/gtest.h"
+
+namespace flutter {
+namespace testing {
+
+TEST(ImageLRU, CanStoreSingleImage) {
+  auto image = DlImage::Make(nullptr);
+  ImageLRU image_lru;
+
+  EXPECT_EQ(image_lru.FindImage(1), nullptr);
+
+  image_lru.AddImage(image, 1);
+
+  EXPECT_EQ(image_lru.FindImage(1), image);
+}
+
+TEST(ImageLRU, EvictsLRU) {
+  auto image = DlImage::Make(nullptr);
+  ImageLRU image_lru;
+
+  // Fill up the cache, nothing is removed
+  for (auto i = 0u; i < kImageReaderSwapchainSize; i++) {
+    EXPECT_EQ(image_lru.AddImage(image, i + 1), 0u);
+  }
+  // Confirm each image is in the cache. This should keep the LRU
+  // order the same.
+  for (auto i = 0u; i < kImageReaderSwapchainSize; i++) {
+    EXPECT_EQ(image_lru.FindImage(i + 1), image);
+  }
+
+  // Insert new image and verify least recently used was removed.
+  EXPECT_EQ(image_lru.AddImage(image, 100), 1u);
+}
+
+TEST(ImageLRU, CanClear) {
+  auto image = DlImage::Make(nullptr);
+  ImageLRU image_lru;
+
+  // Fill up the cache, nothing is removed
+  for (auto i = 0u; i < kImageReaderSwapchainSize; i++) {
+    EXPECT_EQ(image_lru.AddImage(image, i + 1), 0u);
+  }
+  image_lru.Clear();
+
+  // Expect no cache entries.
+  for (auto i = 0u; i < kImageReaderSwapchainSize; i++) {
+    EXPECT_EQ(image_lru.FindImage(i + 1), nullptr);
+  }
+}
+
+}  // namespace testing
+}  // namespace flutter
diff --git a/shell/platform/android/io/flutter/Build.java b/shell/platform/android/io/flutter/Build.java
new file mode 100644
index 0000000000000000000000000000000000000000..904bcc392d1c7e8703cc00f7a56d60c8b611598f
--- /dev/null
+++ b/shell/platform/android/io/flutter/Build.java
@@ -0,0 +1,27 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter;
+
+/** A replacement of utilities from android.os.Build. */
+public class Build {
+  /** For use in place of the Android Build.VERSION_CODES class. */
+  public static class API_LEVELS {
+    public static final int API_21 = 21;
+    public static final int API_22 = 22;
+    public static final int API_23 = 23;
+    public static final int API_24 = 24;
+    public static final int API_25 = 25;
+    public static final int API_26 = 26;
+    public static final int API_27 = 27;
+    public static final int API_28 = 28;
+    public static final int API_29 = 29;
+    public static final int API_30 = 30;
+    public static final int API_31 = 31;
+    public static final int API_32 = 32;
+    public static final int API_33 = 33;
+    public static final int API_34 = 34;
+    public static final int API_35 = 35;
+  }
+}
diff --git a/shell/platform/android/io/flutter/BuildConfig.java b/shell/platform/android/io/flutter/BuildConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..7f74134dbe1daf9878b2d685de03b4e75db50f14
--- /dev/null
+++ b/shell/platform/android/io/flutter/BuildConfig.java
@@ -0,0 +1,19 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// THIS FILE IS REPLACED WITH AN AUTO_GENERATED FILE (AND EXISTS JUST FOR IDE SUPPORT).
+// DO NOT EDIT THE VALUES HERE - SEE $flutter_root/tools/gen_android_buildconfig.py
+package io.flutter;
+
+public final class BuildConfig {
+  private BuildConfig() {
+    {
+    }
+  }
+
+  public static final boolean DEBUG = false;
+  public static final boolean PROFILE = false;
+  public static final boolean RELEASE = false;
+  public static final boolean JIT_RELEASE = false;
+}
diff --git a/shell/platform/android/io/flutter/Log.java b/shell/platform/android/io/flutter/Log.java
index a44835bb0c60ad393a2e72142305b29e46c818d6..359d38bb70bfe025a3efc0a91417efa03b84f19f 100644
--- a/shell/platform/android/io/flutter/Log.java
+++ b/shell/platform/android/io/flutter/Log.java
@@ -8,7 +8,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 /**
- * Port of {@link android.util.Log} that only logs in {@link io.flutter.BuildConfig#DEBUG} mode and
+ * Port of {@link android.util.Log} that only logs in {@value io.flutter.BuildConfig#DEBUG} mode and
  * internally filters logs based on a {@link #logLevel}.
  */
 public class Log {
diff --git a/shell/platform/android/io/flutter/app/FlutterActivity.java b/shell/platform/android/io/flutter/app/FlutterActivity.java
index a28176b0f799bb4bf566c0815bf314be63d57b4e..932ad2c5ada5733ccee71e8c0630a46a878e1499 100644
--- a/shell/platform/android/io/flutter/app/FlutterActivity.java
+++ b/shell/platform/android/io/flutter/app/FlutterActivity.java
@@ -157,6 +157,12 @@ public class FlutterActivity extends Activity
     eventDelegate.onUserLeaveHint();
   }
 
+  @Override
+  public void onWindowFocusChanged(boolean hasFocus) {
+    super.onWindowFocusChanged(hasFocus);
+    eventDelegate.onWindowFocusChanged(hasFocus);
+  }
+
   @Override
   public void onTrimMemory(int level) {
     eventDelegate.onTrimMemory(level);
diff --git a/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java b/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java
index 0fe692c49c6c721ea303e0986d09a394636f5f0b..fcb553bbe8a2f0315468897b3ea514912bafdef3 100644
--- a/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java
+++ b/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java
@@ -17,7 +17,6 @@ import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Configuration;
 import android.content.res.Resources.NotFoundException;
 import android.graphics.drawable.Drawable;
-import android.os.Build;
 import android.os.Bundle;
 import android.util.TypedValue;
 import android.view.View;
@@ -137,12 +136,10 @@ public final class FlutterActivityDelegate
 
   @Override
   public void onCreate(Bundle savedInstanceState) {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      Window window = activity.getWindow();
-      window.addFlags(LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-      window.setStatusBarColor(0x40000000);
-      window.getDecorView().setSystemUiVisibility(PlatformPlugin.DEFAULT_SYSTEM_UI);
-    }
+    Window window = activity.getWindow();
+    window.addFlags(LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+    window.setStatusBarColor(0x40000000);
+    window.getDecorView().setSystemUiVisibility(PlatformPlugin.DEFAULT_SYSTEM_UI);
 
     String[] args = getArgsFromIntent(activity.getIntent());
     FlutterMain.ensureInitializationComplete(activity.getApplicationContext(), args);
@@ -260,6 +257,11 @@ public final class FlutterActivityDelegate
     flutterView.getPluginRegistry().onUserLeaveHint();
   }
 
+  @Override
+  public void onWindowFocusChanged(boolean hasFocus) {
+    flutterView.getPluginRegistry().onWindowFocusChanged(hasFocus);
+  }
+
   @Override
   public void onTrimMemory(int level) {
     // Use a trim level delivered while the application is running so the
@@ -309,6 +311,9 @@ public final class FlutterActivityDelegate
     if (intent.getBooleanExtra("trace-systrace", false)) {
       args.add("--trace-systrace");
     }
+    if (intent.hasExtra("trace-to-file")) {
+      args.add("--trace-to-file=" + intent.getStringExtra("trace-to-file"));
+    }
     if (intent.getBooleanExtra("dump-skp-on-shader-compilation", false)) {
       args.add("--dump-skp-on-shader-compilation");
     }
@@ -321,15 +326,22 @@ public final class FlutterActivityDelegate
     if (intent.getBooleanExtra("verbose-logging", false)) {
       args.add("--verbose-logging");
     }
-    final int observatoryPort = intent.getIntExtra("observatory-port", 0);
-    if (observatoryPort > 0) {
-      args.add("--observatory-port=" + Integer.toString(observatoryPort));
+    int vmServicePort = intent.getIntExtra("vm-service-port", 0);
+    if (vmServicePort > 0) {
+      args.add("--vm-service-port=" + Integer.toString(vmServicePort));
+    } else {
+      // TODO(bkonyi): remove once flutter_tools no longer uses this option.
+      // See https://github.com/dart-lang/sdk/issues/50233
+      vmServicePort = intent.getIntExtra("observatory-port", 0);
+      if (vmServicePort > 0) {
+        args.add("--vm-service-port=" + Integer.toString(vmServicePort));
+      }
     }
     if (intent.getBooleanExtra("endless-trace-buffer", false)) {
       args.add("--endless-trace-buffer");
     }
     // NOTE: all flags provided with this argument are subject to filtering
-    // based on a a list of allowed flags in shell/common/switches.cc. If any
+    // based on a list of allowed flags in shell/common/switches.cc. If any
     // flag provided is not allowed, the process will immediately terminate.
     if (intent.hasExtra("dart-flags")) {
       args.add("--dart-flags=" + intent.getStringExtra("dart-flags"));
diff --git a/shell/platform/android/io/flutter/app/FlutterActivityEvents.java b/shell/platform/android/io/flutter/app/FlutterActivityEvents.java
index 9340adb40539466dfe06b5e35b5a4138d1649267..abbdec4fe6afaba6f2ccaed8d5cf8f545ba3dad3 100644
--- a/shell/platform/android/io/flutter/app/FlutterActivityEvents.java
+++ b/shell/platform/android/io/flutter/app/FlutterActivityEvents.java
@@ -64,4 +64,10 @@ public interface FlutterActivityEvents
 
   /** @see android.app.Activity#onUserLeaveHint() */
   void onUserLeaveHint();
+
+  /**
+   * @param hasFocus True if the current activity window has focus.
+   * @see android.app.Activity#onWindowFocusChanged(boolean)
+   */
+  void onWindowFocusChanged(boolean hasFocus);
 }
diff --git a/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java b/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java
index bf8935e8bb16194c7f5ac901f3d1cfb20f38b89b..778bab65bcf00829aff03ecc5b5bc53423b99fd6 100644
--- a/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java
+++ b/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java
@@ -151,10 +151,17 @@ public class FlutterFragmentActivity extends FragmentActivity
   }
 
   @Override
+  @SuppressWarnings("MissingSuperCall")
   public void onUserLeaveHint() {
     eventDelegate.onUserLeaveHint();
   }
 
+  @Override
+  public void onWindowFocusChanged(boolean hasFocus) {
+    super.onWindowFocusChanged(hasFocus);
+    eventDelegate.onWindowFocusChanged(hasFocus);
+  }
+
   @Override
   public void onTrimMemory(int level) {
     super.onTrimMemory(level);
diff --git a/shell/platform/android/io/flutter/app/FlutterPluginRegistry.java b/shell/platform/android/io/flutter/app/FlutterPluginRegistry.java
index 023e723e93c8ec4ca8eb5b2b155722df5148939b..887a9118979cda0daaed4eb8a549322b07f26172 100644
--- a/shell/platform/android/io/flutter/app/FlutterPluginRegistry.java
+++ b/shell/platform/android/io/flutter/app/FlutterPluginRegistry.java
@@ -28,6 +28,7 @@ public class FlutterPluginRegistry
         PluginRegistry.RequestPermissionsResultListener,
         PluginRegistry.ActivityResultListener,
         PluginRegistry.NewIntentListener,
+        PluginRegistry.WindowFocusChangedListener,
         PluginRegistry.UserLeaveHintListener,
         PluginRegistry.ViewDestroyListener {
   private static final String TAG = "FlutterPluginRegistry";
@@ -44,6 +45,7 @@ public class FlutterPluginRegistry
   private final List<ActivityResultListener> mActivityResultListeners = new ArrayList<>(0);
   private final List<NewIntentListener> mNewIntentListeners = new ArrayList<>(0);
   private final List<UserLeaveHintListener> mUserLeaveHintListeners = new ArrayList<>(0);
+  private final List<WindowFocusChangedListener> mWindowFocusChangedListeners = new ArrayList<>(0);
   private final List<ViewDestroyListener> mViewDestroyListeners = new ArrayList<>(0);
 
   public FlutterPluginRegistry(FlutterNativeView nativeView, Context context) {
@@ -182,6 +184,12 @@ public class FlutterPluginRegistry
       return this;
     }
 
+    @Override
+    public Registrar addWindowFocusChangedListener(WindowFocusChangedListener listener) {
+      mWindowFocusChangedListeners.add(listener);
+      return this;
+    }
+
     @Override
     public Registrar addViewDestroyListener(ViewDestroyListener listener) {
       mViewDestroyListeners.add(listener);
@@ -227,6 +235,13 @@ public class FlutterPluginRegistry
     }
   }
 
+  @Override
+  public void onWindowFocusChanged(boolean hasFocus) {
+    for (WindowFocusChangedListener listener : mWindowFocusChangedListeners) {
+      listener.onWindowFocusChanged(hasFocus);
+    }
+  }
+
   @Override
   public boolean onViewDestroy(FlutterNativeView view) {
     boolean handled = false;
diff --git a/shell/platform/android/io/flutter/embedding/android/AndroidTouchProcessor.java b/shell/platform/android/io/flutter/embedding/android/AndroidTouchProcessor.java
index b3db5df1eb99bc3e0bb52916aeb688660e62543e..3e9c9fb8e0b60ed6e33e48445735495f9c5d4d9f 100644
--- a/shell/platform/android/io/flutter/embedding/android/AndroidTouchProcessor.java
+++ b/shell/platform/android/io/flutter/embedding/android/AndroidTouchProcessor.java
@@ -1,9 +1,15 @@
 package io.flutter.embedding.android;
 
+import static io.flutter.Build.API_LEVELS;
+
+import android.annotation.TargetApi;
+import android.content.Context;
 import android.graphics.Matrix;
 import android.os.Build;
+import android.util.TypedValue;
 import android.view.InputDevice;
 import android.view.MotionEvent;
+import android.view.ViewConfiguration;
 import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
@@ -15,7 +21,7 @@ import java.util.Map;
 
 /** Sends touch information from Android to Flutter in a format that Flutter understands. */
 public class AndroidTouchProcessor {
-
+  private static final String TAG = "AndroidTouchProcessor";
   // Must match the PointerChange enum in pointer.dart.
   @IntDef({
     PointerChange.CANCEL,
@@ -76,14 +82,22 @@ public class AndroidTouchProcessor {
     int UNKNOWN = 4;
   }
 
-  // Must match the unpacking code in hooks.dart.
-  private static final int POINTER_DATA_FIELD_COUNT = 35;
+  // This value must match kPointerDataFieldCount in pointer_data.cc. (The
+  // pointer_data.cc also lists other locations that must be kept consistent.)
+  private static final int POINTER_DATA_FIELD_COUNT = 36;
   @VisibleForTesting static final int BYTES_PER_FIELD = 8;
 
+  // Default if context is null, chosen to ensure reasonable speed scrolling.
+  @VisibleForTesting static final int DEFAULT_VERTICAL_SCROLL_FACTOR = 48;
+  @VisibleForTesting static final int DEFAULT_HORIZONTAL_SCROLL_FACTOR = 48;
+
   // This value must match the value in framework's platform_view.dart.
   // This flag indicates whether the original Android pointer events were batched together.
   private static final int POINTER_DATA_FLAG_BATCHED = 1;
 
+  // The view ID for the only view in a single-view Flutter app.
+  private static final int IMPLICIT_VIEW_ID = 0;
+
   @NonNull private final FlutterRenderer renderer;
   @NonNull private final MotionEventTracker motionEventTracker;
 
@@ -93,6 +107,9 @@ public class AndroidTouchProcessor {
 
   private final Map<Integer, float[]> ongoingPans = new HashMap<>();
 
+  // Only used on api 25 and below to avoid requerying display metrics.
+  private int cachedVerticalScrollFactor;
+
   /**
    * Constructs an {@code AndroidTouchProcessor} that will send touch event data to the Flutter
    * execution context represented by the given {@link FlutterRenderer}.
@@ -123,6 +140,8 @@ public class AndroidTouchProcessor {
   public boolean onTouchEvent(@NonNull MotionEvent event, @NonNull Matrix transformMatrix) {
     int pointerCount = event.getPointerCount();
 
+    // The following packing code must match the struct in pointer_data.h.
+
     // Prepare a data packet of the appropriate size and order.
     ByteBuffer packet =
         ByteBuffer.allocateDirect(pointerCount * POINTER_DATA_FIELD_COUNT * BYTES_PER_FIELD);
@@ -181,18 +200,19 @@ public class AndroidTouchProcessor {
    * wheel movements, etc.
    *
    * @param event The generic motion event being processed.
+   * @param context For use by ViewConfiguration.get(context) to scale input.
    * @return True if the event was handled.
    */
-  public boolean onGenericMotionEvent(@NonNull MotionEvent event) {
+  public boolean onGenericMotionEvent(@NonNull MotionEvent event, @NonNull Context context) {
     // Method isFromSource is only available in API 18+ (Jelly Bean MR2)
     // Mouse hover support is not implemented for API < 18.
-    boolean isPointerEvent =
-        Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2
-            && event.isFromSource(InputDevice.SOURCE_CLASS_POINTER);
+    boolean isPointerEvent = event.isFromSource(InputDevice.SOURCE_CLASS_POINTER);
     boolean isMovementEvent =
         (event.getActionMasked() == MotionEvent.ACTION_HOVER_MOVE
             || event.getActionMasked() == MotionEvent.ACTION_SCROLL);
-    if (!isPointerEvent || !isMovementEvent) {
+    if (isPointerEvent && isMovementEvent) {
+      // Continue.
+    } else {
       return false;
     }
 
@@ -203,7 +223,8 @@ public class AndroidTouchProcessor {
     packet.order(ByteOrder.LITTLE_ENDIAN);
 
     // ACTION_HOVER_MOVE always applies to a single pointer only.
-    addPointerForIndex(event, event.getActionIndex(), pointerChange, 0, IDENTITY_TRANSFORM, packet);
+    addPointerForIndex(
+        event, event.getActionIndex(), pointerChange, 0, IDENTITY_TRANSFORM, packet, context);
     if (packet.position() % (POINTER_DATA_FIELD_COUNT * BYTES_PER_FIELD) != 0) {
       throw new AssertionError("Packet position is not on field boundary.");
     }
@@ -211,8 +232,9 @@ public class AndroidTouchProcessor {
     return true;
   }
 
-  // TODO(mattcarroll): consider creating a PointerPacket class instead of using a procedure that
-  // mutates inputs.
+  /// Calls addPointerForIndex with null for context.
+  ///
+  /// Without context the scroll wheel will not mimick android's scroll speed.
   private void addPointerForIndex(
       MotionEvent event,
       int pointerIndex,
@@ -220,15 +242,28 @@ public class AndroidTouchProcessor {
       int pointerData,
       Matrix transformMatrix,
       ByteBuffer packet) {
+    addPointerForIndex(
+        event, pointerIndex, pointerChange, pointerData, transformMatrix, packet, null);
+  }
+
+  // TODO: consider creating a PointerPacket class instead of using a procedure that
+  // mutates inputs. https://github.com/flutter/flutter/issues/132853
+  private void addPointerForIndex(
+      MotionEvent event,
+      int pointerIndex,
+      int pointerChange,
+      int pointerData,
+      Matrix transformMatrix,
+      ByteBuffer packet,
+      Context context) {
     if (pointerChange == -1) {
       return;
     }
-
-    long motionEventId = 0;
-    if (trackMotionEvents) {
-      MotionEventTracker.MotionEventId trackedEvent = motionEventTracker.track(event);
-      motionEventId = trackedEvent.getId();
-    }
+    // TODO(dkwingsmt): Use the correct source view ID once Android supports
+    // multiple views.
+    // https://github.com/flutter/flutter/issues/134405
+    final int viewId = IMPLICIT_VIEW_ID;
+    final int pointerId = event.getPointerId(pointerIndex);
 
     int pointerKind = getPointerDeviceTypeForToolType(event.getToolType(pointerIndex));
     // We use this in lieu of using event.getRawX and event.getRawY as we wish to support
@@ -244,15 +279,33 @@ public class AndroidTouchProcessor {
         // Some implementations translate trackpad scrolling into a mouse down-move-up event
         // sequence with buttons: 0, such as ARC on a Chromebook. See #11420, a legacy
         // implementation that uses the same condition but converts differently.
-        ongoingPans.put(event.getPointerId(pointerIndex), viewToScreenCoords);
+        ongoingPans.put(pointerId, viewToScreenCoords);
       }
     } else if (pointerKind == PointerDeviceKind.STYLUS) {
+      // Returns converted android button state into flutter framework normalized state
+      // and updates ongoingPans for chromebook trackpad scrolling.
+      // See
+      // https://github.com/flutter/flutter/blob/master/packages/flutter/lib/src/gestures/events.dart
+      // for target button constants.
       buttons = (event.getButtonState() >> 4) & 0xF;
     } else {
       buttons = 0;
     }
 
-    boolean isTrackpadPan = ongoingPans.containsKey(event.getPointerId(pointerIndex));
+    int panZoomType = -1;
+    boolean isTrackpadPan = ongoingPans.containsKey(pointerId);
+    if (isTrackpadPan) {
+      panZoomType = getPointerChangeForPanZoom(pointerChange);
+      if (panZoomType == -1) {
+        return;
+      }
+    }
+
+    long motionEventId = 0;
+    if (trackMotionEvents) {
+      MotionEventTracker.MotionEventId trackedEvent = motionEventTracker.track(event);
+      motionEventId = trackedEvent.getId();
+    }
 
     int signalKind =
         event.getActionMasked() == MotionEvent.ACTION_SCROLL
@@ -264,20 +317,20 @@ public class AndroidTouchProcessor {
     packet.putLong(motionEventId); // motionEventId
     packet.putLong(timeStamp); // time_stamp
     if (isTrackpadPan) {
-      packet.putLong(getPointerChangeForPanZoom(pointerChange)); // change
+      packet.putLong(panZoomType); // change
       packet.putLong(PointerDeviceKind.TRACKPAD); // kind
     } else {
       packet.putLong(pointerChange); // change
       packet.putLong(pointerKind); // kind
     }
     packet.putLong(signalKind); // signal_kind
-    packet.putLong(event.getPointerId(pointerIndex)); // device
+    packet.putLong(pointerId); // device
     packet.putLong(0); // pointer_identifier, will be generated in pointer_data_packet_converter.cc.
 
     if (isTrackpadPan) {
-      float[] panStart = ongoingPans.get(event.getPointerId(pointerIndex));
-      packet.putDouble(panStart[0]);
-      packet.putDouble(panStart[1]);
+      float[] panStart = ongoingPans.get(pointerId);
+      packet.putDouble(panStart[0]); // physical_x
+      packet.putDouble(panStart[1]); // physical_y
     } else {
       packet.putDouble(viewToScreenCoords[0]); // physical_x
       packet.putDouble(viewToScreenCoords[1]); // physical_y
@@ -334,16 +387,30 @@ public class AndroidTouchProcessor {
 
     packet.putLong(pointerData); // platformData
 
+    // See android scrollview for inspiration.
+    // https://cs.android.com/android/platform/superproject/main/+/main:frameworks/base/core/java/android/widget/ScrollView.java?q=function:onGenericMotionEvent%20filepath:widget%2FScrollView.java&ss=android%2Fplatform%2Fsuperproject%2Fmain
     if (signalKind == PointerSignalKind.SCROLL) {
-      packet.putDouble(-event.getAxisValue(MotionEvent.AXIS_HSCROLL)); // scroll_delta_x
-      packet.putDouble(-event.getAxisValue(MotionEvent.AXIS_VSCROLL)); // scroll_delta_y
+      double horizontalScaleFactor = DEFAULT_HORIZONTAL_SCROLL_FACTOR;
+      double verticalScaleFactor = DEFAULT_VERTICAL_SCROLL_FACTOR;
+      if (context != null) {
+        horizontalScaleFactor = getHorizontalScrollFactor(context);
+        verticalScaleFactor = getVerticalScrollFactor(context);
+      }
+      // We flip the sign of the scroll value below because it aligns the pixel value with the
+      // scroll direction in native android.
+      final double horizontalScrollPixels =
+          horizontalScaleFactor * -event.getAxisValue(MotionEvent.AXIS_HSCROLL, pointerIndex);
+      final double verticalScrollPixels =
+          verticalScaleFactor * -event.getAxisValue(MotionEvent.AXIS_VSCROLL, pointerIndex);
+      packet.putDouble(horizontalScrollPixels); // scroll_delta_x
+      packet.putDouble(verticalScrollPixels); // scroll_delta_y
     } else {
       packet.putDouble(0.0); // scroll_delta_x
-      packet.putDouble(0.0); // scroll_delta_x
+      packet.putDouble(0.0); // scroll_delta_y
     }
 
     if (isTrackpadPan) {
-      float[] panStart = ongoingPans.get(event.getPointerId(pointerIndex));
+      float[] panStart = ongoingPans.get(pointerId);
       packet.putDouble(viewToScreenCoords[0] - panStart[0]);
       packet.putDouble(viewToScreenCoords[1] - panStart[1]);
     } else {
@@ -354,12 +421,51 @@ public class AndroidTouchProcessor {
     packet.putDouble(0.0); // pan_delta_y
     packet.putDouble(1.0); // scale
     packet.putDouble(0.0); // rotation
+    packet.putLong(viewId); // view_id
+
+    if (isTrackpadPan && (panZoomType == PointerChange.PAN_ZOOM_END)) {
+      ongoingPans.remove(pointerId);
+    }
+  }
 
-    if (isTrackpadPan && getPointerChangeForPanZoom(pointerChange) == PointerChange.PAN_ZOOM_END) {
-      ongoingPans.remove(event.getPointerId(pointerIndex));
+  private float getHorizontalScrollFactor(@NonNull Context context) {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_26) {
+      return ViewConfiguration.get(context).getScaledHorizontalScrollFactor();
+    } else {
+      // Vertical scroll factor is not a typo. This is what View.java does in android.
+      return getVerticalScrollFactorPre26(context);
     }
   }
 
+  private float getVerticalScrollFactor(@NonNull Context context) {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_26) {
+      return getVerticalScrollFactorAbove26(context);
+    } else {
+      return getVerticalScrollFactorPre26(context);
+    }
+  }
+
+  @TargetApi(API_LEVELS.API_26)
+  private float getVerticalScrollFactorAbove26(@NonNull Context context) {
+    return ViewConfiguration.get(context).getScaledVerticalScrollFactor();
+  }
+
+  // See
+  // https://cs.android.com/android/platform/superproject/main/+/main:frameworks/base/core/java/android/view/View.java?q=function:getVerticalScrollFactor%20filepath:android%2Fview%2FView.java&ss=android%2Fplatform%2Fsuperproject%2Fmain
+  private int getVerticalScrollFactorPre26(@NonNull Context context) {
+    if (cachedVerticalScrollFactor == 0) {
+      TypedValue outValue = new TypedValue();
+      if (!context
+          .getTheme()
+          .resolveAttribute(android.R.attr.listPreferredItemHeight, outValue, true)) {
+        return DEFAULT_VERTICAL_SCROLL_FACTOR;
+      }
+      cachedVerticalScrollFactor =
+          (int) outValue.getDimension(context.getResources().getDisplayMetrics());
+    }
+    return cachedVerticalScrollFactor;
+  }
+
   @PointerChange
   private int getPointerChangeForAction(int maskedAction) {
     // Primary pointer:
@@ -401,7 +507,7 @@ public class AndroidTouchProcessor {
     } else if (pointerChange == PointerChange.UP || pointerChange == PointerChange.CANCEL) {
       return PointerChange.PAN_ZOOM_END;
     }
-    throw new AssertionError("Unexpected pointer change");
+    return -1;
   }
 
   @PointerDeviceKind
diff --git a/shell/platform/android/io/flutter/embedding/android/DrawableSplashScreen.java b/shell/platform/android/io/flutter/embedding/android/DrawableSplashScreen.java
deleted file mode 100644
index d943e653bccd61e3c32840aeb42a5d9a2c2a61ea..0000000000000000000000000000000000000000
--- a/shell/platform/android/io/flutter/embedding/android/DrawableSplashScreen.java
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package io.flutter.embedding.android;
-
-import android.animation.Animator;
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.ImageView;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-/**
- * {@link SplashScreen} that displays a given {@link Drawable}, which then fades its alpha to zero
- * when instructed to {@link #transitionToFlutter(Runnable)}.
- *
- * <p>Please use the new Splash screen API available on Android S. On lower versions of Android,
- * it's no longer necessary to display a splash screen to wait for the Flutter first frame.
- *
- * @deprecated
- */
-@Deprecated
-public final class DrawableSplashScreen implements SplashScreen {
-  private final Drawable drawable;
-  private final ImageView.ScaleType scaleType;
-  private final long crossfadeDurationInMillis;
-  private DrawableSplashScreenView splashView;
-
-  /**
-   * Constructs a {@code DrawableSplashScreen} that displays the given {@code drawable} and
-   * crossfades to Flutter content in 500 milliseconds.
-   *
-   * @param drawable A drawable to display on the Splash screen view.
-   */
-  public DrawableSplashScreen(@NonNull Drawable drawable) {
-    this(drawable, ImageView.ScaleType.FIT_XY, 500);
-  }
-
-  /**
-   * Constructs a {@code DrawableSplashScreen} that displays the given {@code drawable} and
-   * crossfades to Flutter content in the given {@code crossfadeDurationInMillis}.
-   *
-   * @param drawable The {@code Drawable} to be displayed as a splash screen.
-   * @param scaleType The {@link android.widget.ImageView.ScaleType} to be applied to the {@code
-   *     Drawable} when the {@code Drawable} is displayed full-screen.
-   * @param crossfadeDurationInMillis Duration of the crossfade in milliseconds.
-   */
-  public DrawableSplashScreen(
-      @NonNull Drawable drawable,
-      @NonNull ImageView.ScaleType scaleType,
-      long crossfadeDurationInMillis) {
-    this.drawable = drawable;
-    this.scaleType = scaleType;
-    this.crossfadeDurationInMillis = crossfadeDurationInMillis;
-  }
-
-  @Nullable
-  @Override
-  public View createSplashView(@NonNull Context context, @Nullable Bundle savedInstanceState) {
-    splashView = new DrawableSplashScreenView(context);
-    splashView.setSplashDrawable(drawable, scaleType);
-    return splashView;
-  }
-
-  @Override
-  public void transitionToFlutter(@NonNull Runnable onTransitionComplete) {
-    if (splashView == null) {
-      onTransitionComplete.run();
-      return;
-    }
-
-    splashView
-        .animate()
-        .alpha(0.0f)
-        .setDuration(crossfadeDurationInMillis)
-        .setListener(
-            new Animator.AnimatorListener() {
-              @Override
-              public void onAnimationStart(Animator animation) {}
-
-              @Override
-              public void onAnimationEnd(Animator animation) {
-                onTransitionComplete.run();
-              }
-
-              @Override
-              public void onAnimationCancel(Animator animation) {
-                onTransitionComplete.run();
-              }
-
-              @Override
-              public void onAnimationRepeat(Animator animation) {}
-            });
-  }
-
-  // Public for Android OS requirements. This View should not be used by external developers.
-  public static class DrawableSplashScreenView extends ImageView {
-    public DrawableSplashScreenView(@NonNull Context context) {
-      this(context, null, 0);
-    }
-
-    public DrawableSplashScreenView(@NonNull Context context, @Nullable AttributeSet attrs) {
-      this(context, attrs, 0);
-    }
-
-    public DrawableSplashScreenView(
-        @NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
-      super(context, attrs, defStyleAttr);
-    }
-
-    public void setSplashDrawable(@Nullable Drawable drawable) {
-      setSplashDrawable(drawable, ImageView.ScaleType.FIT_XY);
-    }
-
-    public void setSplashDrawable(
-        @Nullable Drawable drawable, @NonNull ImageView.ScaleType scaleType) {
-      setScaleType(scaleType);
-      setImageDrawable(drawable);
-    }
-  }
-}
diff --git a/shell/platform/android/io/flutter/embedding/android/FlutterActivity.java b/shell/platform/android/io/flutter/embedding/android/FlutterActivity.java
index 6f37b5d5c6a7a85ca831efac99d575e60649dbeb..d536fed70dd06423e18ad3919b168df766a5e9cc 100644
--- a/shell/platform/android/io/flutter/embedding/android/FlutterActivity.java
+++ b/shell/platform/android/io/flutter/embedding/android/FlutterActivity.java
@@ -4,13 +4,16 @@
 
 package io.flutter.embedding.android;
 
+import static io.flutter.Build.API_LEVELS;
 import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.DART_ENTRYPOINT_META_DATA_KEY;
 import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.DART_ENTRYPOINT_URI_META_DATA_KEY;
 import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.DEFAULT_BACKGROUND_MODE;
 import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.DEFAULT_DART_ENTRYPOINT;
 import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.DEFAULT_INITIAL_ROUTE;
 import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.EXTRA_BACKGROUND_MODE;
+import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.EXTRA_CACHED_ENGINE_GROUP_ID;
 import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.EXTRA_CACHED_ENGINE_ID;
+import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.EXTRA_DART_ENTRYPOINT;
 import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.EXTRA_DART_ENTRYPOINT_ARGS;
 import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.EXTRA_DESTROY_ENGINE_WITH_ACTIVITY;
 import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.EXTRA_ENABLE_STATE_RESTORATION;
@@ -18,29 +21,29 @@ import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.EXTRA_IN
 import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.HANDLE_DEEPLINKING_META_DATA_KEY;
 import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.INITIAL_ROUTE_META_DATA_KEY;
 import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.NORMAL_THEME_META_DATA_KEY;
-import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.SPLASH_SCREEN_META_DATA_KEY;
 
+import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
-import android.content.res.Resources;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
+import android.window.BackEvent;
+import android.window.OnBackAnimationCallback;
 import android.window.OnBackInvokedCallback;
 import android.window.OnBackInvokedDispatcher;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import androidx.annotation.VisibleForTesting;
-import androidx.core.content.res.ResourcesCompat;
 import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.LifecycleRegistry;
@@ -51,7 +54,6 @@ import io.flutter.embedding.engine.FlutterShellArgs;
 import io.flutter.embedding.engine.plugins.activity.ActivityControlSurface;
 import io.flutter.embedding.engine.plugins.util.GeneratedPluginRegister;
 import io.flutter.plugin.platform.PlatformPlugin;
-import io.flutter.util.ViewUtils;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -67,7 +69,6 @@ import java.util.List;
  *
  * <ul>
  *   <li>Displays an Android launch screen.
- *   <li>Displays a Flutter splash screen.
  *   <li>Configures the status bar appearance.
  *   <li>Chooses the Dart execution app bundle path, entrypoint and entrypoint arguments.
  *   <li>Chooses Flutter's initial route.
@@ -147,7 +148,8 @@ import java.util.List;
  *
  * <pre>{@code
  * // Create and pre-warm a FlutterEngine.
- * FlutterEngine flutterEngine = new FlutterEngine(context);
+ * FlutterEngineGroup group = new FlutterEngineGroup(context);
+ * FlutterEngine flutterEngine = group.createAndRunDefaultEngine(context);
  * flutterEngine.getDartExecutor().executeDartEntrypoint(DartEntrypoint.createDefault());
  *
  * // Cache the pre-warmed FlutterEngine in the FlutterEngineCache.
@@ -164,7 +166,7 @@ import java.util.List;
  * FlutterView}. Using a {@link FlutterView} requires forwarding some calls from an {@code
  * Activity}, as well as forwarding lifecycle calls from an {@code Activity} or a {@code Fragment}.
  *
- * <p><strong>Launch Screen and Splash Screen</strong>
+ * <p><strong>Launch Screen</strong>
  *
  * <p>{@code FlutterActivity} supports the display of an Android "launch screen", which is displayed
  * while the Android application loads. It is only applicable if {@code FlutterActivity} is the
@@ -198,10 +200,6 @@ import java.util.List;
  * <p>With themes defined, and AndroidManifest.xml updated, Flutter displays the specified launch
  * screen until the Android application is initialized.
  *
- * <p>Flutter also requires initialization time. To specify a splash screen for Flutter
- * initialization, subclass {@code FlutterActivity} and override {@link #provideSplashScreen()}. See
- * {@link SplashScreen} for details on implementing a splash screen.
- *
  * <p><strong>Alternative Activity</strong> {@link FlutterFragmentActivity} is also available, which
  * is similar to {@code FlutterActivity} but it extends {@code FragmentActivity}. You should use
  * {@code FlutterActivity}, if possible, but if you need a {@code FragmentActivity} then you should
@@ -214,13 +212,15 @@ public class FlutterActivity extends Activity
     implements FlutterActivityAndFragmentDelegate.Host, LifecycleOwner {
   private static final String TAG = "FlutterActivity";
 
+  private boolean hasRegisteredBackCallback = false;
+
   /**
    * The ID of the {@code FlutterView} created by this activity.
    *
    * <p>This ID can be used to lookup {@code FlutterView} in the Android view hierarchy. For more,
    * see {@link android.view.View#findViewById}.
    */
-  public static final int FLUTTER_VIEW_ID = ViewUtils.generateViewId(0xF1F2);
+  public static final int FLUTTER_VIEW_ID = View.generateViewId();
 
   /**
    * Creates an {@link Intent} that launches a {@code FlutterActivity}, which creates a {@link
@@ -276,7 +276,7 @@ public class FlutterActivity extends Activity
     }
 
     /**
-     * The initial route that a Flutter app will render in this {@link FlutterFragment}, defaults to
+     * The initial route that a Flutter app will render in this {@link FlutterActivity}, defaults to
      * "/".
      *
      * @param initialRoute The route.
@@ -448,6 +448,149 @@ public class FlutterActivity extends Activity
     }
   }
 
+  /**
+   * Creates a {@link NewEngineInGroupIntentBuilder}, which can be used to configure an {@link
+   * Intent} to launch a {@code FlutterActivity} by internally creating a FlutterEngine from an
+   * existing {@link io.flutter.embedding.engine.FlutterEngineGroup} cached in a specified {@link
+   * io.flutter.embedding.engine.FlutterEngineGroupCache}.
+   *
+   * <pre>{@code
+   * // Create a FlutterEngineGroup, such as in the onCreate method of the Application.
+   * FlutterEngineGroup engineGroup = new FlutterEngineGroup(this);
+   * FlutterEngineGroupCache.getInstance().put("my_cached_engine_group_id", engineGroup);
+   *
+   * // Start a FlutterActivity with the FlutterEngineGroup by creating an intent with withNewEngineInGroup
+   * Intent intent = FlutterActivity.withNewEngineInGroup("my_cached_engine_group_id")
+   *     .dartEntrypoint("custom_entrypoint")
+   *     .initialRoute("/custom/route")
+   *     .backgroundMode(BackgroundMode.transparent)
+   *     .build(context);
+   * startActivity(intent);
+   * }</pre>
+   *
+   * @param engineGroupId A cached engine group ID.
+   * @return The builder.
+   */
+  public static NewEngineInGroupIntentBuilder withNewEngineInGroup(@NonNull String engineGroupId) {
+    return new NewEngineInGroupIntentBuilder(FlutterActivity.class, engineGroupId);
+  }
+
+  /**
+   * Builder to create an {@code Intent} that launches a {@code FlutterActivity} with a new {@link
+   * FlutterEngine} created by FlutterEngineGroup#createAndRunEngine.
+   */
+  public static class NewEngineInGroupIntentBuilder {
+    private final Class<? extends FlutterActivity> activityClass;
+    private final String cachedEngineGroupId;
+    private String dartEntrypoint = DEFAULT_DART_ENTRYPOINT;
+    private String initialRoute = DEFAULT_INITIAL_ROUTE;
+    private String backgroundMode = DEFAULT_BACKGROUND_MODE;
+
+    /**
+     * Constructor that allows this {@code NewEngineInGroupIntentBuilder} to be used by subclasses
+     * of {@code FlutterActivity}.
+     *
+     * <p>Subclasses of {@code FlutterActivity} should provide their own static version of {@link
+     * #withNewEngineInGroup}, which returns an instance of {@code NewEngineInGroupIntentBuilder}
+     * constructed with a {@code Class} reference to the {@code FlutterActivity} subclass, e.g.:
+     *
+     * <p>{@code return new NewEngineInGroupIntentBuilder(MyFlutterActivity.class,
+     * cacheedEngineGroupId); }
+     *
+     * <pre>{@code
+     * // Create a FlutterEngineGroup, such as in the onCreate method of the Application.
+     * FlutterEngineGroup engineGroup = new FlutterEngineGroup(this);
+     * FlutterEngineGroupCache.getInstance().put("my_cached_engine_group_id", engineGroup);
+     *
+     * // Create a NewEngineInGroupIntentBuilder that would build an intent to start my custom FlutterActivity subclass.
+     * FlutterActivity.NewEngineInGroupIntentBuilder intentBuilder =
+     *     new FlutterActivity.NewEngineInGroupIntentBuilder(
+     *           MyFlutterActivity.class,
+     *           app.engineGroupId);
+     * intentBuilder.dartEntrypoint("main")
+     *     .initialRoute("/custom/route")
+     *     .backgroundMode(BackgroundMode.transparent);
+     * startActivity(intentBuilder.build(context));
+     * }</pre>
+     *
+     * @param activityClass A subclass of {@code FlutterActivity}.
+     * @param engineGroupId The engine group id.
+     */
+    public NewEngineInGroupIntentBuilder(
+        @NonNull Class<? extends FlutterActivity> activityClass, @NonNull String engineGroupId) {
+      this.activityClass = activityClass;
+      this.cachedEngineGroupId = engineGroupId;
+    }
+
+    /**
+     * The Dart entrypoint that will be executed in the newly created FlutterEngine as soon as the
+     * Dart snapshot is loaded. Default to "main".
+     *
+     * @param dartEntrypoint The dart entrypoint's name
+     * @return The engine group intent builder
+     */
+    @NonNull
+    public NewEngineInGroupIntentBuilder dartEntrypoint(@NonNull String dartEntrypoint) {
+      this.dartEntrypoint = dartEntrypoint;
+      return this;
+    }
+
+    /**
+     * The initial route that a Flutter app will render in this {@link FlutterActivity}, defaults to
+     * "/".
+     *
+     * @param initialRoute The route.
+     * @return The engine group intent builder.
+     */
+    @NonNull
+    public NewEngineInGroupIntentBuilder initialRoute(@NonNull String initialRoute) {
+      this.initialRoute = initialRoute;
+      return this;
+    }
+
+    /**
+     * The mode of {@code FlutterActivity}'s background, either {@link BackgroundMode#opaque} or
+     * {@link BackgroundMode#transparent}.
+     *
+     * <p>The default background mode is {@link BackgroundMode#opaque}.
+     *
+     * <p>Choosing a background mode of {@link BackgroundMode#transparent} will configure the inner
+     * {@link FlutterView} of this {@code FlutterActivity} to be configured with a {@link
+     * FlutterTextureView} to support transparency. This choice has a non-trivial performance
+     * impact. A transparent background should only be used if it is necessary for the app design
+     * being implemented.
+     *
+     * <p>A {@code FlutterActivity} that is configured with a background mode of {@link
+     * BackgroundMode#transparent} must have a theme applied to it that includes the following
+     * property: {@code <item name="android:windowIsTranslucent">true</item>}.
+     *
+     * @param backgroundMode The background mode.
+     * @return The engine group intent builder.
+     */
+    @NonNull
+    public NewEngineInGroupIntentBuilder backgroundMode(@NonNull BackgroundMode backgroundMode) {
+      this.backgroundMode = backgroundMode.name();
+      return this;
+    }
+
+    /**
+     * Creates and returns an {@link Intent} that will launch a {@code FlutterActivity} with the
+     * desired configuration.
+     *
+     * @param context The context. e.g. An Activity.
+     * @return The intent.
+     */
+    @NonNull
+    public Intent build(@NonNull Context context) {
+      return new Intent(context, activityClass)
+          .putExtra(EXTRA_DART_ENTRYPOINT, dartEntrypoint)
+          .putExtra(EXTRA_INITIAL_ROUTE, initialRoute)
+          .putExtra(EXTRA_CACHED_ENGINE_GROUP_ID, cachedEngineGroupId)
+          .putExtra(EXTRA_BACKGROUND_MODE, backgroundMode)
+          .putExtra(EXTRA_DESTROY_ENGINE_WITH_ACTIVITY, true);
+    }
+  }
+
   // Delegate that runs all lifecycle and OS hook logic that is common between
   // FlutterActivity and FlutterFragment. See the FlutterActivityAndFragmentDelegate
   // implementation for details about why it exists.
@@ -497,8 +640,6 @@ public class FlutterActivity extends Activity
 
     lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_CREATE);
 
-    registerOnBackInvokedCallback();
-
     configureWindowForTransparency();
 
     setContentView(createFlutterView());
@@ -518,10 +659,11 @@ public class FlutterActivity extends Activity
    */
   @VisibleForTesting
   public void registerOnBackInvokedCallback() {
-    if (Build.VERSION.SDK_INT >= 33) {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_33) {
       getOnBackInvokedDispatcher()
           .registerOnBackInvokedCallback(
               OnBackInvokedDispatcher.PRIORITY_DEFAULT, onBackInvokedCallback);
+      hasRegisteredBackCallback = true;
     }
   }
 
@@ -533,24 +675,59 @@ public class FlutterActivity extends Activity
    */
   @VisibleForTesting
   public void unregisterOnBackInvokedCallback() {
-    if (Build.VERSION.SDK_INT >= 33) {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_33) {
       getOnBackInvokedDispatcher().unregisterOnBackInvokedCallback(onBackInvokedCallback);
+      hasRegisteredBackCallback = false;
     }
   }
 
   private final OnBackInvokedCallback onBackInvokedCallback =
-      Build.VERSION.SDK_INT >= 33
-          ? new OnBackInvokedCallback() {
-            // TODO(garyq): Remove SuppressWarnings annotation. This was added to workaround
-            // a google3 bug where the linter is not properly running against API 33, causing
-            // a failure here. See b/243609613 and https://github.com/flutter/flutter/issues/111295
-            @SuppressWarnings("Override")
-            @Override
-            public void onBackInvoked() {
-              onBackPressed();
-            }
-          }
-          : null;
+      Build.VERSION.SDK_INT < API_LEVELS.API_33 ? null : createOnBackInvokedCallback();
+
+  @VisibleForTesting
+  protected OnBackInvokedCallback getOnBackInvokedCallback() {
+    return onBackInvokedCallback;
+  }
+
+  @NonNull
+  @TargetApi(API_LEVELS.API_33)
+  @RequiresApi(API_LEVELS.API_33)
+  private OnBackInvokedCallback createOnBackInvokedCallback() {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_34) {
+      return new OnBackAnimationCallback() {
+        @Override
+        public void onBackInvoked() {
+          commitBackGesture();
+        }
+
+        @Override
+        public void onBackCancelled() {
+          cancelBackGesture();
+        }
+
+        @Override
+        public void onBackProgressed(@NonNull BackEvent backEvent) {
+          updateBackGestureProgress(backEvent);
+        }
+
+        @Override
+        public void onBackStarted(@NonNull BackEvent backEvent) {
+          startBackGesture(backEvent);
+        }
+      };
+    }
+
+    return this::onBackPressed;
+  }
+
+  @Override
+  public void setFrameworkHandlesBack(boolean frameworkHandlesBack) {
+    if (frameworkHandlesBack && !hasRegisteredBackCallback) {
+      registerOnBackInvokedCallback();
+    } else if (!frameworkHandlesBack && hasRegisteredBackCallback) {
+      unregisterOnBackInvokedCallback();
+    }
+  }
 
   /**
    * Switches themes for this {@code Activity} from the theme used to launch this {@code Activity}
@@ -599,41 +776,6 @@ public class FlutterActivity extends Activity
     }
   }
 
-  @Nullable
-  @Override
-  public SplashScreen provideSplashScreen() {
-    Drawable manifestSplashDrawable = getSplashScreenFromManifest();
-    if (manifestSplashDrawable != null) {
-      return new DrawableSplashScreen(manifestSplashDrawable);
-    } else {
-      return null;
-    }
-  }
-
-  /**
-   * Returns a {@link Drawable} to be used as a splash screen as requested by meta-data in the
-   * {@code AndroidManifest.xml} file, or null if no such splash screen is requested.
-   *
-   * <p>See {@link FlutterActivityLaunchConfigs#SPLASH_SCREEN_META_DATA_KEY} for the meta-data key
-   * to be used in a manifest file.
-   */
-  @Nullable
-  private Drawable getSplashScreenFromManifest() {
-    try {
-      Bundle metaData = getMetaData();
-      int splashScreenId = metaData != null ? metaData.getInt(SPLASH_SCREEN_META_DATA_KEY) : 0;
-      return splashScreenId != 0
-          ? ResourcesCompat.getDrawable(getResources(), splashScreenId, getTheme())
-          : null;
-    } catch (Resources.NotFoundException e) {
-      Log.e(TAG, "Splash screen not found. Ensure the drawable exists and that it's valid.");
-      throw e;
-    } catch (PackageManager.NameNotFoundException e) {
-      // This is never expected to happen.
-      return null;
-    }
-  }
-
   /**
    * Sets this {@code Activity}'s {@code Window} background to be transparent, and hides the status
    * bar, if this {@code Activity}'s desired {@link BackgroundMode} is {@link
@@ -660,12 +802,10 @@ public class FlutterActivity extends Activity
   }
 
   private void configureStatusBarForFullscreenFlutterExperience() {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      Window window = getWindow();
-      window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-      window.setStatusBarColor(0x40000000);
-      window.getDecorView().setSystemUiVisibility(PlatformPlugin.DEFAULT_SYSTEM_UI);
-    }
+    Window window = getWindow();
+    window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+    window.setStatusBarColor(0x40000000);
+    window.getDecorView().setSystemUiVisibility(PlatformPlugin.DEFAULT_SYSTEM_UI);
   }
 
   @Override
@@ -788,6 +928,38 @@ public class FlutterActivity extends Activity
     }
   }
 
+  @TargetApi(API_LEVELS.API_34)
+  @RequiresApi(API_LEVELS.API_34)
+  public void startBackGesture(@NonNull BackEvent backEvent) {
+    if (stillAttachedForEvent("startBackGesture")) {
+      delegate.startBackGesture(backEvent);
+    }
+  }
+
+  @TargetApi(API_LEVELS.API_34)
+  @RequiresApi(API_LEVELS.API_34)
+  public void updateBackGestureProgress(@NonNull BackEvent backEvent) {
+    if (stillAttachedForEvent("updateBackGestureProgress")) {
+      delegate.updateBackGestureProgress(backEvent);
+    }
+  }
+
+  @TargetApi(API_LEVELS.API_34)
+  @RequiresApi(API_LEVELS.API_34)
+  public void commitBackGesture() {
+    if (stillAttachedForEvent("commitBackGesture")) {
+      delegate.commitBackGesture();
+    }
+  }
+
+  @TargetApi(API_LEVELS.API_34)
+  @RequiresApi(API_LEVELS.API_34)
+  public void cancelBackGesture() {
+    if (stillAttachedForEvent("cancelBackGesture")) {
+      delegate.cancelBackGesture();
+    }
+  }
+
   @Override
   public void onRequestPermissionsResult(
       int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
@@ -803,6 +975,14 @@ public class FlutterActivity extends Activity
     }
   }
 
+  @Override
+  public void onWindowFocusChanged(boolean hasFocus) {
+    super.onWindowFocusChanged(hasFocus);
+    if (stillAttachedForEvent("onWindowFocusChanged")) {
+      delegate.onWindowFocusChanged(hasFocus);
+    }
+  }
+
   @Override
   public void onTrimMemory(int level) {
     super.onTrimMemory(level);
@@ -866,6 +1046,17 @@ public class FlutterActivity extends Activity
     return getIntent().getStringExtra(EXTRA_CACHED_ENGINE_ID);
   }
 
+  /**
+   * Returns the ID of a statically cached {@link io.flutter.embedding.engine.FlutterEngineGroup} to
+   * use within this {@code FlutterActivity}, or {@code null} if this {@code FlutterActivity} does
+   * not want to use a cached {@link io.flutter.embedding.engine.FlutterEngineGroup}.
+   */
+  @Override
+  @Nullable
+  public String getCachedEngineGroupId() {
+    return getIntent().getStringExtra(EXTRA_CACHED_ENGINE_GROUP_ID);
+  }
+
   /**
    * Returns false if the {@link io.flutter.embedding.engine.FlutterEngine} backing this {@code
    * FlutterActivity} should outlive this {@code FlutterActivity}, or true to be destroyed when the
@@ -892,14 +1083,26 @@ public class FlutterActivity extends Activity
   /**
    * The Dart entrypoint that will be executed as soon as the Dart snapshot is loaded.
    *
-   * <p>This preference can be controlled by setting a {@code <meta-data>} called {@link
-   * FlutterActivityLaunchConfigs#DART_ENTRYPOINT_META_DATA_KEY} within the Android manifest
-   * definition for this {@code FlutterActivity}.
+   * <p>This preference can be controlled with 2 methods:
+   *
+   * <ol>
+   *   <li>Pass a boolean as {@link FlutterActivityLaunchConfigs#EXTRA_DART_ENTRYPOINT} with the
+   *       launching {@code Intent}, or
+   *   <li>Set a {@code <meta-data>} called {@link
+   *       FlutterActivityLaunchConfigs#DART_ENTRYPOINT_META_DATA_KEY} within the Android manifest
+   *       definition for this {@code FlutterActivity}
+   * </ol>
+   *
+   * If both preferences are set, the {@code Intent} preference takes priority.
    *
    * <p>Subclasses may override this method to directly control the Dart entrypoint.
    */
   @NonNull
   public String getDartEntrypointFunctionName() {
+    if (getIntent().hasExtra(EXTRA_DART_ENTRYPOINT)) {
+      return getIntent().getStringExtra(EXTRA_DART_ENTRYPOINT);
+    }
+
     try {
       Bundle metaData = getMetaData();
       String desiredDartEntrypoint =
@@ -1228,7 +1431,7 @@ public class FlutterActivity extends Activity
     // * reportFullyDrawn behavior isn't tested on pre-Q versions.
     // See https://github.com/flutter/flutter/issues/46172, and
     // https://github.com/flutter/flutter/issues/88767.
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_29) {
       reportFullyDrawn();
     }
   }
@@ -1263,6 +1466,19 @@ public class FlutterActivity extends Activity
     return true;
   }
 
+  /**
+   * Whether to automatically attach the {@link FlutterView} to the engine.
+   *
+   * <p>Returning {@code false} means that the task of attaching the {@link FlutterView} to the
+   * engine will be taken over by the host application.
+   *
+   * <p>Defaults to {@code true}.
+   */
+  @Override
+  public boolean attachToEngineAutomatically() {
+    return true;
+  }
+
   @Override
   public boolean popSystemNavigator() {
     // Hook for subclass. No-op if returns false.
diff --git a/shell/platform/android/io/flutter/embedding/android/FlutterActivityAndFragmentDelegate.java b/shell/platform/android/io/flutter/embedding/android/FlutterActivityAndFragmentDelegate.java
index 848ed43962785c77d032f7a4cf52b225247482df..1f6118bfe56c4621c8d19b9eb0d0b0946216a355 100644
--- a/shell/platform/android/io/flutter/embedding/android/FlutterActivityAndFragmentDelegate.java
+++ b/shell/platform/android/io/flutter/embedding/android/FlutterActivityAndFragmentDelegate.java
@@ -7,6 +7,7 @@ package io.flutter.embedding.android;
 import static android.content.ComponentCallbacks2.TRIM_MEMORY_RUNNING_LOW;
 import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.DEFAULT_INITIAL_ROUTE;
 
+import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -16,19 +17,24 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver.OnPreDrawListener;
+import android.window.BackEvent;
+import android.window.OnBackAnimationCallback;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import androidx.annotation.VisibleForTesting;
 import androidx.lifecycle.Lifecycle;
+import io.flutter.Build.API_LEVELS;
 import io.flutter.FlutterInjector;
 import io.flutter.Log;
 import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.embedding.engine.FlutterEngineCache;
+import io.flutter.embedding.engine.FlutterEngineGroup;
+import io.flutter.embedding.engine.FlutterEngineGroupCache;
 import io.flutter.embedding.engine.FlutterShellArgs;
 import io.flutter.embedding.engine.dart.DartExecutor;
 import io.flutter.embedding.engine.renderer.FlutterUiDisplayListener;
 import io.flutter.plugin.platform.PlatformPlugin;
-import io.flutter.util.ViewUtils;
 import java.util.Arrays;
 import java.util.List;
 
@@ -88,6 +94,7 @@ import java.util.List;
   private boolean isFirstFrameRendered;
   private boolean isAttached;
   private Integer previousVisibility;
+  @Nullable private FlutterEngineGroup engineGroup;
 
   @NonNull
   private final FlutterUiDisplayListener flutterUiDisplayListener =
@@ -107,8 +114,13 @@ import java.util.List;
       };
 
   FlutterActivityAndFragmentDelegate(@NonNull Host host) {
+    this(host, null);
+  }
+
+  FlutterActivityAndFragmentDelegate(@NonNull Host host, @Nullable FlutterEngineGroup engineGroup) {
     this.host = host;
     this.isFirstFrameRendered = false;
+    this.engineGroup = engineGroup;
   }
 
   /**
@@ -178,7 +190,7 @@ import java.util.List;
     // When "retain instance" is true, the FlutterEngine will survive configuration
     // changes. Therefore, we create a new one only if one does not already exist.
     if (flutterEngine == null) {
-      setupFlutterEngine();
+      setUpFlutterEngine();
     }
 
     if (host.shouldAttachEngineToActivity()) {
@@ -218,6 +230,28 @@ import java.util.List;
     return activity;
   }
 
+  private FlutterEngineGroup.Options addEntrypointOptions(FlutterEngineGroup.Options options) {
+    String appBundlePathOverride = host.getAppBundlePath();
+    if (appBundlePathOverride == null || appBundlePathOverride.isEmpty()) {
+      appBundlePathOverride = FlutterInjector.instance().flutterLoader().findAppBundlePath();
+    }
+
+    DartExecutor.DartEntrypoint dartEntrypoint =
+        new DartExecutor.DartEntrypoint(
+            appBundlePathOverride, host.getDartEntrypointFunctionName());
+    String initialRoute = host.getInitialRoute();
+    if (initialRoute == null) {
+      initialRoute = maybeGetInitialRouteFromIntent(host.getActivity().getIntent());
+      if (initialRoute == null) {
+        initialRoute = DEFAULT_INITIAL_ROUTE;
+      }
+    }
+    return options
+        .setDartEntrypoint(dartEntrypoint)
+        .setInitialRoute(initialRoute)
+        .setDartEntrypointArgs(host.getDartEntrypointArgs());
+  }
+
   /**
    * Obtains a reference to a FlutterEngine to back this delegate and its {@code host}.
    *
@@ -230,11 +264,15 @@ import java.util.List;
    * <p>Second, the {@code host} is given an opportunity to provide a {@link
    * io.flutter.embedding.engine.FlutterEngine} via {@link Host#provideFlutterEngine(Context)}.
    *
+   * <p>Third, the {@code host} is asked if it would like to use a cached {@link
+   * io.flutter.embedding.engine.FlutterEngineGroup} to create a new {@link FlutterEngine} by {@link
+   * FlutterEngineGroup#createAndRunEngine}
+   *
    * <p>If the {@code host} does not provide a {@link io.flutter.embedding.engine.FlutterEngine},
    * then a new {@link FlutterEngine} is instantiated.
    */
   @VisibleForTesting
-  /* package */ void setupFlutterEngine() {
+  /* package */ void setUpFlutterEngine() {
     Log.v(TAG, "Setting up FlutterEngine.");
 
     // First, check if the host wants to use a cached FlutterEngine.
@@ -258,18 +296,43 @@ import java.util.List;
       return;
     }
 
+    // Third, check if the host wants to use a cached FlutterEngineGroup
+    // and create new FlutterEngine using FlutterEngineGroup#createAndRunEngine
+    String cachedEngineGroupId = host.getCachedEngineGroupId();
+    if (cachedEngineGroupId != null) {
+      FlutterEngineGroup flutterEngineGroup =
+          FlutterEngineGroupCache.getInstance().get(cachedEngineGroupId);
+      if (flutterEngineGroup == null) {
+        throw new IllegalStateException(
+            "The requested cached FlutterEngineGroup did not exist in the FlutterEngineGroupCache: '"
+                + cachedEngineGroupId
+                + "'");
+      }
+
+      flutterEngine =
+          flutterEngineGroup.createAndRunEngine(
+              addEntrypointOptions(new FlutterEngineGroup.Options(host.getContext())));
+      isFlutterEngineFromHost = false;
+      return;
+    }
+
     // Our host did not provide a custom FlutterEngine. Create a FlutterEngine to back our
     // FlutterView.
     Log.v(
         TAG,
         "No preferred FlutterEngine was provided. Creating a new FlutterEngine for"
             + " this FlutterFragment.");
+
+    FlutterEngineGroup group =
+        engineGroup == null
+            ? new FlutterEngineGroup(host.getContext(), host.getFlutterShellArgs().toArray())
+            : engineGroup;
     flutterEngine =
-        new FlutterEngine(
-            host.getContext(),
-            host.getFlutterShellArgs().toArray(),
-            /*automaticallyRegisterPlugins=*/ false,
-            /*willProvideRestorationData=*/ host.shouldRestoreAndSaveState());
+        group.createAndRunEngine(
+            addEntrypointOptions(
+                new FlutterEngineGroup.Options(host.getContext())
+                    .setAutomaticallyRegisterPlugins(false)
+                    .setWaitForRestorationData(host.shouldRestoreAndSaveState())));
     isFlutterEngineFromHost = false;
   }
 
@@ -285,9 +348,7 @@ import java.util.List;
    * with Android tools, such as "Displayed" timing printed with `am start`.
    *
    * <p>Note that it should only be set to true when {@code Host#getRenderMode()} is {@code
-   * RenderMode.surface}. This parameter is also ignored, disabling the delay should the legacy
-   * {@code Host#provideSplashScreen()} be non-null. See <a
-   * href="https://flutter.dev/go/android-splash-migration">Android Splash Migration</a>.
+   * RenderMode.surface}.
    *
    * <p>This method:
    *
@@ -334,23 +395,11 @@ import java.util.List;
     // Add listener to be notified when Flutter renders its first frame.
     flutterView.addOnFirstFrameRenderedListener(flutterUiDisplayListener);
 
-    Log.v(TAG, "Attaching FlutterEngine to FlutterView.");
-    flutterView.attachToFlutterEngine(flutterEngine);
-    flutterView.setId(flutterViewId);
-
-    SplashScreen splashScreen = host.provideSplashScreen();
-
-    if (splashScreen != null) {
-      Log.w(
-          TAG,
-          "A splash screen was provided to Flutter, but this is deprecated. See"
-              + " flutter.dev/go/android-splash-migration for migration steps.");
-      FlutterSplashView flutterSplashView = new FlutterSplashView(host.getContext());
-      flutterSplashView.setId(ViewUtils.generateViewId(FLUTTER_SPLASH_VIEW_FALLBACK_ID));
-      flutterSplashView.displayFlutterViewWithSplash(flutterView, splashScreen);
-
-      return flutterSplashView;
+    if (host.attachToEngineAutomatically()) {
+      Log.v(TAG, "Attaching FlutterEngine to FlutterView.");
+      flutterView.attachToFlutterEngine(flutterEngine);
     }
+    flutterView.setId(flutterViewId);
 
     if (shouldDelayFirstAndroidViewDraw) {
       delayFirstAndroidViewDraw(flutterView);
@@ -466,16 +515,7 @@ import java.util.List;
     if (host.shouldHandleDeeplinking()) {
       Uri data = intent.getData();
       if (data != null) {
-        String fullRoute = data.getPath();
-        if (fullRoute != null && !fullRoute.isEmpty()) {
-          if (data.getQuery() != null && !data.getQuery().isEmpty()) {
-            fullRoute += "?" + data.getQuery();
-          }
-          if (data.getFragment() != null && !data.getFragment().isEmpty()) {
-            fullRoute += "#" + data.getFragment();
-          }
-          return fullRoute;
-        }
+        return data.toString();
       }
     }
     return null;
@@ -522,7 +562,7 @@ import java.util.List;
   void onResume() {
     Log.v(TAG, "onResume()");
     ensureAlive();
-    if (host.shouldDispatchAppLifecycleState()) {
+    if (host.shouldDispatchAppLifecycleState() && flutterEngine != null) {
       flutterEngine.getLifecycleChannel().appIsResumed();
     }
   }
@@ -543,6 +583,7 @@ import java.util.List;
     ensureAlive();
     if (flutterEngine != null) {
       updateSystemUiOverlays();
+      flutterEngine.getPlatformViewsController().onResume();
     } else {
       Log.w(TAG, "onPostResume() invoked before FlutterFragment was attached to an Activity.");
     }
@@ -570,7 +611,7 @@ import java.util.List;
   void onPause() {
     Log.v(TAG, "onPause()");
     ensureAlive();
-    if (host.shouldDispatchAppLifecycleState()) {
+    if (host.shouldDispatchAppLifecycleState() && flutterEngine != null) {
       flutterEngine.getLifecycleChannel().appIsInactive();
     }
   }
@@ -593,7 +634,7 @@ import java.util.List;
     Log.v(TAG, "onStop()");
     ensureAlive();
 
-    if (host.shouldDispatchAppLifecycleState()) {
+    if (host.shouldDispatchAppLifecycleState() && flutterEngine != null) {
       flutterEngine.getLifecycleChannel().appIsPaused();
     }
 
@@ -619,8 +660,13 @@ import java.util.List;
       flutterView.getViewTreeObserver().removeOnPreDrawListener(activePreDrawListener);
       activePreDrawListener = null;
     }
-    flutterView.detachFromFlutterEngine();
-    flutterView.removeOnFirstFrameRenderedListener(flutterUiDisplayListener);
+
+    // flutterView can be null in instances where a delegate.onDestroyView is called without
+    // onCreateView being called. See https://github.com/flutter/engine/pull/41082 for more detail.
+    if (flutterView != null) {
+      flutterView.detachFromFlutterEngine();
+      flutterView.removeOnFirstFrameRenderedListener(flutterUiDisplayListener);
+    }
   }
 
   void onSaveInstanceState(@Nullable Bundle bundle) {
@@ -674,6 +720,10 @@ import java.util.List;
    * </ol>
    */
   void onDetach() {
+    if (!isAttached) {
+      // Already detached.
+      return;
+    }
     Log.v(TAG, "onDetach()");
     ensureAlive();
 
@@ -699,7 +749,7 @@ import java.util.List;
       platformPlugin = null;
     }
 
-    if (host.shouldDispatchAppLifecycleState()) {
+    if (host.shouldDispatchAppLifecycleState() && flutterEngine != null) {
       flutterEngine.getLifecycleChannel().appIsDetached();
     }
 
@@ -735,6 +785,100 @@ import java.util.List;
     }
   }
 
+  /**
+   * Invoke this from {@link OnBackAnimationCallback#onBackStarted(BackEvent)}.
+   *
+   * <p>This method should be called when the back gesture is initiated. It should be invoked as
+   * part of the implementation of {@link OnBackAnimationCallback}.
+   *
+   * <p>This method delegates the handling of the start of a back gesture to the Flutter framework,
+   * which is responsible for the appropriate response, such as initiating animations or preparing
+   * the UI for the back navigation process.
+   *
+   * @param backEvent The BackEvent object containing information about the touch.
+   */
+  @TargetApi(API_LEVELS.API_34)
+  @RequiresApi(API_LEVELS.API_34)
+  void startBackGesture(@NonNull BackEvent backEvent) {
+    ensureAlive();
+    if (flutterEngine != null) {
+      Log.v(TAG, "Forwarding startBackGesture() to FlutterEngine.");
+      flutterEngine.getBackGestureChannel().startBackGesture(backEvent);
+    } else {
+      Log.w(TAG, "Invoked startBackGesture() before FlutterFragment was attached to an Activity.");
+    }
+  }
+
+  /**
+   * Invoke this from {@link OnBackAnimationCallback#onBackProgressed(BackEvent)}.
+   *
+   * <p>This method should be called in response to progress in a back gesture, as part of the
+   * implementation of {@link OnBackAnimationCallback}.
+   *
+   * <p>This method delegates to the Flutter framework to update UI elements or animations based on
+   * the progression of the back gesture.
+   *
+   * @param backEvent An BackEvent object describing the progress event.
+   */
+  @TargetApi(API_LEVELS.API_34)
+  @RequiresApi(API_LEVELS.API_34)
+  void updateBackGestureProgress(@NonNull BackEvent backEvent) {
+    ensureAlive();
+    if (flutterEngine != null) {
+      Log.v(TAG, "Forwarding updateBackGestureProgress() to FlutterEngine.");
+      flutterEngine.getBackGestureChannel().updateBackGestureProgress(backEvent);
+    } else {
+      Log.w(
+          TAG,
+          "Invoked updateBackGestureProgress() before FlutterFragment was attached to an Activity.");
+    }
+  }
+
+  /**
+   * Invoke this from {@link OnBackAnimationCallback#onBackInvoked()}.
+   *
+   * <p>This method is called to signify the completion of a back gesture and commits the navigation
+   * action initiated by the gesture. It should be invoked as the final step in handling a back
+   * gesture.
+   *
+   * <p>This method indicates to the Flutter framework that it should proceed with the back
+   * navigation, including finalizing animations and updating the UI to reflect the navigation
+   * outcome.
+   */
+  @TargetApi(API_LEVELS.API_34)
+  @RequiresApi(API_LEVELS.API_34)
+  void commitBackGesture() {
+    ensureAlive();
+    if (flutterEngine != null) {
+      Log.v(TAG, "Forwarding commitBackGesture() to FlutterEngine.");
+      flutterEngine.getBackGestureChannel().commitBackGesture();
+    } else {
+      Log.w(TAG, "Invoked commitBackGesture() before FlutterFragment was attached to an Activity.");
+    }
+  }
+
+  /**
+   * Invoke this from {@link OnBackAnimationCallback#onBackCancelled()}.
+   *
+   * <p>This method should be called when a back gesture is cancelled or the back button is pressed.
+   * It informs the Flutter framework about the cancellation.
+   *
+   * <p>This method enables the Flutter framework to rollback any UI changes or animations initiated
+   * in response to the back gesture. This includes resetting UI elements to their state prior to
+   * the gesture's start.
+   */
+  @TargetApi(API_LEVELS.API_34)
+  @RequiresApi(API_LEVELS.API_34)
+  void cancelBackGesture() {
+    ensureAlive();
+    if (flutterEngine != null) {
+      Log.v(TAG, "Forwarding cancelBackGesture() to FlutterEngine.");
+      flutterEngine.getBackGestureChannel().cancelBackGesture();
+    } else {
+      Log.w(TAG, "Invoked cancelBackGesture() before FlutterFragment was attached to an Activity.");
+    }
+  }
+
   /**
    * Invoke this from {@link android.app.Activity#onRequestPermissionsResult(int, String[], int[])}
    * or {@code Fragment#onRequestPermissionsResult(int, String[], int[])}.
@@ -777,11 +921,13 @@ import java.util.List;
   void onNewIntent(@NonNull Intent intent) {
     ensureAlive();
     if (flutterEngine != null) {
-      Log.v(TAG, "Forwarding onNewIntent() to FlutterEngine and sending pushRoute message.");
+      Log.v(
+          TAG,
+          "Forwarding onNewIntent() to FlutterEngine and sending pushRouteInformation message.");
       flutterEngine.getActivityControlSurface().onNewIntent(intent);
       String initialRoute = maybeGetInitialRouteFromIntent(intent);
       if (initialRoute != null && !initialRoute.isEmpty()) {
-        flutterEngine.getNavigationChannel().pushRoute(initialRoute);
+        flutterEngine.getNavigationChannel().pushRouteInformation(initialRoute);
       }
     } else {
       Log.w(TAG, "onNewIntent() invoked before FlutterFragment was attached to an Activity.");
@@ -832,6 +978,27 @@ import java.util.List;
     }
   }
 
+  /**
+   * Invoke this from {@code Activity#onWindowFocusChanged()}.
+   *
+   * <p>A {@code Fragment} host must have its containing {@code Activity} forward this call so that
+   * the {@code Fragment} can then invoke this method.
+   */
+  void onWindowFocusChanged(boolean hasFocus) {
+    ensureAlive();
+    Log.v(TAG, "Received onWindowFocusChanged: " + (hasFocus ? "true" : "false"));
+    if (host.shouldDispatchAppLifecycleState() && flutterEngine != null) {
+      // TODO(gspencergoog): Once we have support for multiple windows/views,
+      // this code will need to consult the list of windows/views to determine if
+      // any windows in the app are focused and call the appropriate function.
+      if (hasFocus) {
+        flutterEngine.getLifecycleChannel().aWindowIsFocused();
+      } else {
+        flutterEngine.getLifecycleChannel().noWindowsAreFocused();
+      }
+    }
+  }
+
   /**
    * Invoke this from {@link android.app.Activity#onTrimMemory(int)}.
    *
@@ -854,6 +1021,7 @@ import java.util.List;
         flutterEngine.getSystemChannel().sendMemoryPressureWarning();
       }
       flutterEngine.getRenderer().onTrimMemory(level);
+      flutterEngine.getPlatformViewsController().onTrimMemory(level);
     }
   }
 
@@ -874,8 +1042,7 @@ import java.util.List;
    * FlutterActivityAndFragmentDelegate}.
    */
   /* package */ interface Host
-      extends SplashScreenProvider,
-          FlutterEngineProvider,
+      extends FlutterEngineProvider,
           FlutterEngineConfigurator,
           PlatformPlugin.PlatformPluginDelegate {
     /**
@@ -915,6 +1082,9 @@ import java.util.List;
     @Nullable
     String getCachedEngineId();
 
+    @Nullable
+    String getCachedEngineGroupId();
+
     /**
      * Returns true if the {@link io.flutter.embedding.engine.FlutterEngine} used in this delegate
      * should be destroyed when the host/delegate are destroyed.
@@ -989,9 +1159,6 @@ import java.util.List;
      */
     ExclusiveAppComponent<Activity> getExclusiveAppComponent();
 
-    @Nullable
-    SplashScreen provideSplashScreen();
-
     /**
      * Returns the {@link io.flutter.embedding.engine.FlutterEngine} that should be rendered to a
      * {@link FlutterView}.
@@ -1111,5 +1278,17 @@ import java.util.List;
      * while return {@code true} means the engine dispatches these events.
      */
     boolean shouldDispatchAppLifecycleState();
+
+    /**
+     * Whether to automatically attach the {@link FlutterView} to the engine.
+     *
+     * <p>In the add-to-app scenario where multiple {@link FlutterView} share the same {@link
+     * FlutterEngine}, the host application desires to determine the timing of attaching the {@link
+     * FlutterView} to the engine, for example, during the {@code onResume} instead of the {@code
+     * onCreateView}.
+     *
+     * <p>Defaults to {@code true}.
+     */
+    boolean attachToEngineAutomatically();
   }
 }
diff --git a/shell/platform/android/io/flutter/embedding/android/FlutterActivityLaunchConfigs.java b/shell/platform/android/io/flutter/embedding/android/FlutterActivityLaunchConfigs.java
index 87dd768a3df9158cb8ee75982c4a3b32092776fc..3f775af65d38bc335b5d978ad14f328b8b1dc404 100644
--- a/shell/platform/android/io/flutter/embedding/android/FlutterActivityLaunchConfigs.java
+++ b/shell/platform/android/io/flutter/embedding/android/FlutterActivityLaunchConfigs.java
@@ -13,17 +13,17 @@ public class FlutterActivityLaunchConfigs {
   /* package */ static final String DART_ENTRYPOINT_META_DATA_KEY = "io.flutter.Entrypoint";
   /* package */ static final String DART_ENTRYPOINT_URI_META_DATA_KEY = "io.flutter.EntrypointUri";
   /* package */ static final String INITIAL_ROUTE_META_DATA_KEY = "io.flutter.InitialRoute";
-  /* package */ static final String SPLASH_SCREEN_META_DATA_KEY =
-      "io.flutter.embedding.android.SplashScreenDrawable";
   /* package */ static final String NORMAL_THEME_META_DATA_KEY =
       "io.flutter.embedding.android.NormalTheme";
   /* package */ static final String HANDLE_DEEPLINKING_META_DATA_KEY =
       "flutter_deeplinking_enabled";
   // Intent extra arguments.
+  /* package */ static final String EXTRA_DART_ENTRYPOINT = "dart_entrypoint";
   /* package */ static final String EXTRA_INITIAL_ROUTE = "route";
   /* package */ static final String EXTRA_BACKGROUND_MODE = "background_mode";
   /* package */ static final String EXTRA_CACHED_ENGINE_ID = "cached_engine_id";
   /* package */ static final String EXTRA_DART_ENTRYPOINT_ARGS = "dart_entrypoint_args";
+  /* package */ static final String EXTRA_CACHED_ENGINE_GROUP_ID = "cached_engine_group_id";
   /* package */ static final String EXTRA_DESTROY_ENGINE_WITH_ACTIVITY =
       "destroy_engine_with_activity";
   /* package */ static final String EXTRA_ENABLE_STATE_RESTORATION = "enable_state_restoration";
diff --git a/shell/platform/android/io/flutter/embedding/android/FlutterFragment.java b/shell/platform/android/io/flutter/embedding/android/FlutterFragment.java
index 4b0b11e0b2bd038dce7010cfbcd1ea8d6a90f2c4..376142b9c7e558b2ea16c82d1b3d32976d99506c 100644
--- a/shell/platform/android/io/flutter/embedding/android/FlutterFragment.java
+++ b/shell/platform/android/io/flutter/embedding/android/FlutterFragment.java
@@ -12,6 +12,7 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewTreeObserver.OnWindowFocusChangeListener;
 import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -24,7 +25,6 @@ import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.embedding.engine.FlutterShellArgs;
 import io.flutter.embedding.engine.renderer.FlutterUiDisplayListener;
 import io.flutter.plugin.platform.PlatformPlugin;
-import io.flutter.util.ViewUtils;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -79,7 +79,8 @@ import java.util.List;
  *
  * <pre>{@code
  * // Create and pre-warm a FlutterEngine.
- * FlutterEngine flutterEngine = new FlutterEngine(context);
+ * FlutterEngineGroup group = new FlutterEngineGroup(context);
+ * FlutterEngine flutterEngine = group.createAndRunDefaultEngine(context);
  * flutterEngine
  *   .getDartExecutor()
  *   .executeDartEntrypoint(DartEntrypoint.createDefault());
@@ -103,7 +104,7 @@ public class FlutterFragment extends Fragment
    * <p>This ID can be used to lookup {@code FlutterView} in the Android view hierarchy. For more,
    * see {@link android.view.View#findViewById}.
    */
-  public static final int FLUTTER_VIEW_ID = ViewUtils.generateViewId(0xF1F2);
+  public static final int FLUTTER_VIEW_ID = View.generateViewId();
 
   private static final String TAG = "FlutterFragment";
 
@@ -144,6 +145,9 @@ public class FlutterFragment extends Fragment
    * FlutterFragment}.
    */
   protected static final String ARG_CACHED_ENGINE_ID = "cached_engine_id";
+
+  protected static final String ARG_CACHED_ENGINE_GROUP_ID = "cached_engine_group_id";
+
   /**
    * True if the {@link io.flutter.embedding.engine.FlutterEngine} in the created {@code
    * FlutterFragment} should be destroyed when the {@code FlutterFragment} is destroyed, false if
@@ -163,6 +167,16 @@ public class FlutterFragment extends Fragment
   protected static final String ARG_SHOULD_AUTOMATICALLY_HANDLE_ON_BACK_PRESSED =
       "should_automatically_handle_on_back_pressed";
 
+  private final OnWindowFocusChangeListener onWindowFocusChangeListener =
+      new OnWindowFocusChangeListener() {
+        @Override
+        public void onWindowFocusChanged(boolean hasFocus) {
+          if (stillAttachedForEvent("onWindowFocusChanged")) {
+            delegate.onWindowFocusChanged(hasFocus);
+          }
+        }
+      };
+
   /**
    * Creates a {@code FlutterFragment} with a default configuration.
    *
@@ -729,6 +743,259 @@ public class FlutterFragment extends Fragment
     }
   }
 
+  /**
+   * Returns a {@link NewEngineInGroupFragmentBuilder} to create a {@code FlutterFragment} with a
+   * cached {@link io.flutter.embedding.engine.FlutterEngineGroup} in {@link
+   * io.flutter.embedding.engine.FlutterEngineGroupCache}.
+   *
+   * <p>An {@code IllegalStateException} will be thrown during the lifecycle of the {@code
+   * FlutterFragment} if a cached {@link io.flutter.embedding.engine.FlutterEngineGroup} is
+   * requested but does not exist in the {@link
+   * io.flutter.embedding.engine.FlutterEngineGroupCache}.
+   */
+  @NonNull
+  public static NewEngineInGroupFragmentBuilder withNewEngineInGroup(
+      @NonNull String engineGroupId) {
+    return new NewEngineInGroupFragmentBuilder(engineGroupId);
+  }
+
+  /**
+   * Builder that creates a new {@code FlutterFragment} that uses a cached {@link
+   * io.flutter.embedding.engine.FlutterEngineGroup} to create a new {@link
+   * io.flutter.embedding.engine.FlutterEngine} with {@code arguments} that correspond to the values
+   * set on this {@code Builder}.
+   *
+   * <p>Subclasses of {@code FlutterFragment} that do not introduce any new arguments can use this
+   * {@code Builder} to construct instances of the subclass without subclassing this {@code
+   * Builder}. {@code MyFlutterFragment f = new
+   * FlutterFragment.NewEngineInGroupFragmentBuilder(MyFlutterFragment.class, engineGroupId)
+   * .someProperty(...) .someOtherProperty(...) .build<MyFlutterFragment>(); }
+   *
+   * <p>Subclasses of {@code FlutterFragment} that introduce new arguments should subclass this
+   * {@code NewEngineInGroupFragmentBuilder} to add the new properties:
+   *
+   * <ol>
+   *   <li>Ensure the {@code FlutterFragment} subclass has a no-arg constructor.
+   *   <li>Subclass this {@code NewEngineInGroupFragmentBuilder}.
+   *   <li>Override the new {@code NewEngineInGroupFragmentBuilder}'s no-arg constructor and invoke
+   *       the super constructor to set the {@code FlutterFragment} subclass: {@code public
+   *       MyBuilder() { super(MyFlutterFragment.class); } }
+   *   <li>Add appropriate property methods for the new properties.
+   *   <li>Override {@link NewEngineInGroupFragmentBuilder#createArgs()}, call through to the super
+   *       method, then add the new properties as arguments in the {@link Bundle}.
+   * </ol>
+   *
+   * Once a {@code NewEngineInGroupFragmentBuilder} subclass is defined, the {@code FlutterFragment}
+   * subclass can be instantiated as follows. {@code MyFlutterFragment f = new MyBuilder()
+   * .someExistingProperty(...) .someNewProperty(...) .build<MyFlutterFragment>(); }
+   */
+  public static class NewEngineInGroupFragmentBuilder {
+    private final Class<? extends FlutterFragment> fragmentClass;
+    private final String cachedEngineGroupId;
+    private @NonNull String dartEntrypoint = "main";
+    private @NonNull String initialRoute = "/";
+    private @NonNull boolean handleDeeplinking = false;
+    private @NonNull RenderMode renderMode = RenderMode.surface;
+    private @NonNull TransparencyMode transparencyMode = TransparencyMode.transparent;
+    private boolean shouldAttachEngineToActivity = true;
+    private boolean shouldAutomaticallyHandleOnBackPressed = false;
+    private boolean shouldDelayFirstAndroidViewDraw = false;
+
+    public NewEngineInGroupFragmentBuilder(@NonNull String engineGroupId) {
+      this(FlutterFragment.class, engineGroupId);
+    }
+
+    public NewEngineInGroupFragmentBuilder(
+        @NonNull Class<? extends FlutterFragment> fragmentClass, @NonNull String engineGroupId) {
+      this.fragmentClass = fragmentClass;
+      this.cachedEngineGroupId = engineGroupId;
+    }
+
+    /** The name of the initial Dart method to invoke, defaults to "main". */
+    @NonNull
+    public NewEngineInGroupFragmentBuilder dartEntrypoint(@NonNull String dartEntrypoint) {
+      this.dartEntrypoint = dartEntrypoint;
+      return this;
+    }
+
+    /**
+     * The initial route that a Flutter app will render in this {@link FlutterFragment}, defaults to
+     * "/".
+     */
+    @NonNull
+    public NewEngineInGroupFragmentBuilder initialRoute(@NonNull String initialRoute) {
+      this.initialRoute = initialRoute;
+      return this;
+    }
+
+    /**
+     * Whether to handle the deeplinking from the {@code Intent} automatically if the {@code
+     * getInitialRoute} returns null.
+     */
+    @NonNull
+    public NewEngineInGroupFragmentBuilder handleDeeplinking(@NonNull boolean handleDeeplinking) {
+      this.handleDeeplinking = handleDeeplinking;
+      return this;
+    }
+
+    /**
+     * Render Flutter either as a {@link RenderMode#surface} or a {@link RenderMode#texture}. You
+     * should use {@code surface} unless you have a specific reason to use {@code texture}. {@code
+     * texture} comes with a significant performance impact, but {@code texture} can be displayed
+     * beneath other Android {@code View}s and animated, whereas {@code surface} cannot.
+     */
+    @NonNull
+    public NewEngineInGroupFragmentBuilder renderMode(@NonNull RenderMode renderMode) {
+      this.renderMode = renderMode;
+      return this;
+    }
+
+    /**
+     * Support a {@link TransparencyMode#transparent} background within {@link
+     * io.flutter.embedding.android.FlutterView}, or force an {@link TransparencyMode#opaque}
+     * background.
+     *
+     * <p>See {@link TransparencyMode} for implications of this selection.
+     */
+    @NonNull
+    public NewEngineInGroupFragmentBuilder transparencyMode(
+        @NonNull TransparencyMode transparencyMode) {
+      this.transparencyMode = transparencyMode;
+      return this;
+    }
+
+    /**
+     * Whether or not this {@code FlutterFragment} should automatically attach its {@code Activity}
+     * as a control surface for its {@link io.flutter.embedding.engine.FlutterEngine}.
+     *
+     * <p>Control surfaces are used to provide Android resources and lifecycle events to plugins
+     * that are attached to the {@link io.flutter.embedding.engine.FlutterEngine}. If {@code
+     * shouldAttachEngineToActivity} is true then this {@code FlutterFragment} will connect its
+     * {@link io.flutter.embedding.engine.FlutterEngine} to the surrounding {@code Activity}, along
+     * with any plugins that are registered with that {@link FlutterEngine}. This allows plugins to
+     * access the {@code Activity}, as well as receive {@code Activity}-specific calls, e.g., {@link
+     * android.app.Activity#onNewIntent(Intent)}. If {@code shouldAttachEngineToActivity} is false,
+     * then this {@code FlutterFragment} will not automatically manage the connection between its
+     * {@link io.flutter.embedding.engine.FlutterEngine} and the surrounding {@code Activity}. The
+     * {@code Activity} will need to be manually connected to this {@code FlutterFragment}'s {@link
+     * io.flutter.embedding.engine.FlutterEngine} by the app developer. See {@link
+     * FlutterEngine#getActivityControlSurface()}.
+     *
+     * <p>One reason that a developer might choose to manually manage the relationship between the
+     * {@code Activity} and {@link io.flutter.embedding.engine.FlutterEngine} is if the developer
+     * wants to move the {@link FlutterEngine} somewhere else. For example, a developer might want
+     * the {@link io.flutter.embedding.engine.FlutterEngine} to outlive the surrounding {@code
+     * Activity} so that it can be used later in a different {@code Activity}. To accomplish this,
+     * the {@link io.flutter.embedding.engine.FlutterEngine} will need to be disconnected from the
+     * surrounding {@code Activity} at an unusual time, preventing this {@code FlutterFragment} from
+     * correctly managing the relationship between the {@link
+     * io.flutter.embedding.engine.FlutterEngine} and the surrounding {@code Activity}.
+     *
+     * <p>Another reason that a developer might choose to manually manage the relationship between
+     * the {@code Activity} and {@link io.flutter.embedding.engine.FlutterEngine} is if the
+     * developer wants to prevent, or explicitly control when the {@link
+     * io.flutter.embedding.engine.FlutterEngine}'s plugins have access to the surrounding {@code
+     * Activity}. For example, imagine that this {@code FlutterFragment} only takes up part of the
+     * screen and the app developer wants to ensure that none of the Flutter plugins are able to
+     * manipulate the surrounding {@code Activity}. In this case, the developer would not want the
+     * {@link io.flutter.embedding.engine.FlutterEngine} to have access to the {@code Activity},
+     * which can be accomplished by setting {@code shouldAttachEngineToActivity} to {@code false}.
+     */
+    @NonNull
+    public NewEngineInGroupFragmentBuilder shouldAttachEngineToActivity(
+        boolean shouldAttachEngineToActivity) {
+      this.shouldAttachEngineToActivity = shouldAttachEngineToActivity;
+      return this;
+    }
+
+    /**
+     * Whether or not this {@code FlutterFragment} should automatically receive {@link
+     * #onBackPressed()} events, rather than requiring an explicit activity call through. Disabled
+     * by default.
+     *
+     * <p>When enabled, the activity will automatically dispatch back-press events to the fragment's
+     * {@link OnBackPressedCallback}, instead of requiring the activity to manually call {@link
+     * #onBackPressed()} in client code. If enabled, do <b>not</b> invoke {@link #onBackPressed()}
+     * manually.
+     *
+     * <p>This behavior relies on the implementation of {@link #popSystemNavigator()}. It's not
+     * recommended to override that method when enabling this attribute, but if you do, you should
+     * always fall back to calling {@code super.popSystemNavigator()} when not relying on custom
+     * behavior.
+     */
+    @NonNull
+    public NewEngineInGroupFragmentBuilder shouldAutomaticallyHandleOnBackPressed(
+        boolean shouldAutomaticallyHandleOnBackPressed) {
+      this.shouldAutomaticallyHandleOnBackPressed = shouldAutomaticallyHandleOnBackPressed;
+      return this;
+    }
+
+    /**
+     * Whether to delay the Android drawing pass till after the Flutter UI has been displayed.
+     *
+     * <p>See {#link FlutterActivityAndFragmentDelegate#onCreateView} for more details.
+     */
+    @NonNull
+    public NewEngineInGroupFragmentBuilder shouldDelayFirstAndroidViewDraw(
+        @NonNull boolean shouldDelayFirstAndroidViewDraw) {
+      this.shouldDelayFirstAndroidViewDraw = shouldDelayFirstAndroidViewDraw;
+      return this;
+    }
+
+    /**
+     * Creates a {@link Bundle} of arguments that are assigned to the new {@code FlutterFragment}.
+     *
+     * <p>Subclasses should override this method to add new properties to the {@link Bundle}.
+     * Subclasses must call through to the super method to collect all existing property values.
+     */
+    @NonNull
+    protected Bundle createArgs() {
+      Bundle args = new Bundle();
+      args.putString(ARG_CACHED_ENGINE_GROUP_ID, cachedEngineGroupId);
+      args.putString(ARG_DART_ENTRYPOINT, dartEntrypoint);
+      args.putString(ARG_INITIAL_ROUTE, initialRoute);
+      args.putBoolean(ARG_HANDLE_DEEPLINKING, handleDeeplinking);
+      args.putString(
+          ARG_FLUTTERVIEW_RENDER_MODE,
+          renderMode != null ? renderMode.name() : RenderMode.surface.name());
+      args.putString(
+          ARG_FLUTTERVIEW_TRANSPARENCY_MODE,
+          transparencyMode != null ? transparencyMode.name() : TransparencyMode.transparent.name());
+      args.putBoolean(ARG_SHOULD_ATTACH_ENGINE_TO_ACTIVITY, shouldAttachEngineToActivity);
+      args.putBoolean(ARG_DESTROY_ENGINE_WITH_FRAGMENT, true);
+      args.putBoolean(
+          ARG_SHOULD_AUTOMATICALLY_HANDLE_ON_BACK_PRESSED, shouldAutomaticallyHandleOnBackPressed);
+      args.putBoolean(ARG_SHOULD_DELAY_FIRST_ANDROID_VIEW_DRAW, shouldDelayFirstAndroidViewDraw);
+      return args;
+    }
+
+    /**
+     * Constructs a new {@code FlutterFragment} (or a subclass) that is configured based on
+     * properties set on this {@code Builder}.
+     */
+    @NonNull
+    public <T extends FlutterFragment> T build() {
+      try {
+        @SuppressWarnings("unchecked")
+        T frag = (T) fragmentClass.getDeclaredConstructor().newInstance();
+        if (frag == null) {
+          throw new RuntimeException(
+              "The FlutterFragment subclass sent in the constructor ("
+                  + fragmentClass.getCanonicalName()
+                  + ") does not match the expected return type.");
+        }
+
+        Bundle args = createArgs();
+        frag.setArguments(args);
+
+        return frag;
+      } catch (Exception e) {
+        throw new RuntimeException(
+            "Could not instantiate FlutterFragment subclass (" + fragmentClass.getName() + ")", e);
+      }
+    }
+  }
+
   // Delegate that runs all lifecycle and OS hook logic that is common between
   // FlutterActivity and FlutterFragment. See the FlutterActivityAndFragmentDelegate
   // implementation for details about why it exists.
@@ -852,9 +1119,18 @@ public class FlutterFragment extends Fragment
     }
   }
 
+  @Override
+  public void onViewCreated(View view, Bundle savedInstanceState) {
+    super.onViewCreated(view, savedInstanceState);
+    view.getViewTreeObserver().addOnWindowFocusChangeListener(onWindowFocusChangeListener);
+  }
+
   @Override
   public void onDestroyView() {
     super.onDestroyView();
+    requireView()
+        .getViewTreeObserver()
+        .removeOnWindowFocusChangeListener(onWindowFocusChangeListener);
     if (stillAttachedForEvent("onDestroyView")) {
       delegate.onDestroyView();
     }
@@ -1018,6 +1294,17 @@ public class FlutterFragment extends Fragment
     return getArguments().getString(ARG_CACHED_ENGINE_ID, null);
   }
 
+  /**
+   * Returns the ID of a statically cached {@link io.flutter.embedding.engine.FlutterEngineGroup} to
+   * use within this {@code FlutterFragment}, or {@code null} if this {@code FlutterFragment} does
+   * not want to use a cached {@link io.flutter.embedding.engine.FlutterEngineGroup}.
+   */
+  @Override
+  @Nullable
+  public String getCachedEngineGroupId() {
+    return getArguments().getString(ARG_CACHED_ENGINE_GROUP_ID, null);
+  }
+
   /**
    * Returns true a {@code FlutterEngine} was explicitly created and injected into the {@code
    * FlutterFragment} rather than one that was created implicitly in the {@code FlutterFragment}.
@@ -1149,18 +1436,6 @@ public class FlutterFragment extends Fragment
     return TransparencyMode.valueOf(transparencyModeName);
   }
 
-  @Override
-  @Nullable
-  public SplashScreen provideSplashScreen() {
-    FragmentActivity parentActivity = getActivity();
-    if (parentActivity instanceof SplashScreenProvider) {
-      SplashScreenProvider splashScreenProvider = (SplashScreenProvider) parentActivity;
-      return splashScreenProvider.provideSplashScreen();
-    }
-
-    return null;
-  }
-
   /**
    * Hook for subclasses to return a {@link io.flutter.embedding.engine.FlutterEngine} with whatever
    * configuration is desired.
@@ -1359,6 +1634,19 @@ public class FlutterFragment extends Fragment
     return true;
   }
 
+  /**
+   * Whether to automatically attach the {@link FlutterView} to the engine.
+   *
+   * <p>Returning {@code false} means that the task of attaching the {@link FlutterView} to the
+   * engine will be taken over by the host application.
+   *
+   * <p>Defaults to {@code true}.
+   */
+  @Override
+  public boolean attachToEngineAutomatically() {
+    return true;
+  }
+
   /**
    * {@inheritDoc}
    *
diff --git a/shell/platform/android/io/flutter/embedding/android/FlutterFragmentActivity.java b/shell/platform/android/io/flutter/embedding/android/FlutterFragmentActivity.java
index d2034b12ac67a2f9c361e8c4b7c58a136f06ec65..65fb752f208161178ef7d55b846d607a65dc8fc9 100644
--- a/shell/platform/android/io/flutter/embedding/android/FlutterFragmentActivity.java
+++ b/shell/platform/android/io/flutter/embedding/android/FlutterFragmentActivity.java
@@ -10,25 +10,23 @@ import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.DEFAULT_
 import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.DEFAULT_DART_ENTRYPOINT;
 import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.DEFAULT_INITIAL_ROUTE;
 import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.EXTRA_BACKGROUND_MODE;
+import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.EXTRA_CACHED_ENGINE_GROUP_ID;
 import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.EXTRA_CACHED_ENGINE_ID;
+import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.EXTRA_DART_ENTRYPOINT;
 import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.EXTRA_DART_ENTRYPOINT_ARGS;
 import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.EXTRA_DESTROY_ENGINE_WITH_ACTIVITY;
 import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.EXTRA_INITIAL_ROUTE;
 import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.HANDLE_DEEPLINKING_META_DATA_KEY;
 import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.INITIAL_ROUTE_META_DATA_KEY;
 import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.NORMAL_THEME_META_DATA_KEY;
-import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.SPLASH_SCREEN_META_DATA_KEY;
 
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
-import android.content.res.Resources;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
@@ -38,7 +36,6 @@ import android.widget.FrameLayout;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
-import androidx.core.content.res.ResourcesCompat;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import io.flutter.Log;
@@ -47,7 +44,6 @@ import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.embedding.engine.FlutterShellArgs;
 import io.flutter.embedding.engine.plugins.util.GeneratedPluginRegister;
 import io.flutter.plugin.platform.PlatformPlugin;
-import io.flutter.util.ViewUtils;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -63,14 +59,13 @@ import java.util.List;
 // are duplicated for readability purposes. Be sure to replicate any change in this class in
 // FlutterActivity, too.
 public class FlutterFragmentActivity extends FragmentActivity
-    implements SplashScreenProvider, FlutterEngineProvider, FlutterEngineConfigurator {
+    implements FlutterEngineProvider, FlutterEngineConfigurator {
   private static final String TAG = "FlutterFragmentActivity";
 
   // FlutterFragment management.
   private static final String TAG_FLUTTER_FRAGMENT = "flutter_fragment";
   // TODO(mattcarroll): replace ID with R.id when build system supports R.java
-  public static final int FRAGMENT_CONTAINER_ID =
-      ViewUtils.generateViewId(609893468); // random number
+  public static final int FRAGMENT_CONTAINER_ID = View.generateViewId();
 
   /**
    * Creates an {@link Intent} that launches a {@code FlutterFragmentActivity}, which executes a
@@ -266,6 +261,112 @@ public class FlutterFragmentActivity extends FragmentActivity
     }
   }
 
+  /**
+   * Creates a {@link NewEngineInGroupIntentBuilder}, which can be used to configure an {@link
+   * Intent} to launch a {@code FlutterFragmentActivity} that internally uses an existing {@link
+   * io.flutter.embedding.engine.FlutterEngineGroup} that is cached in {@link
+   * io.flutter.embedding.engine.FlutterEngineGroupCache}.
+   *
+   * @param engineGroupId A cached engine group ID.
+   * @return The builder.
+   */
+  public static NewEngineInGroupIntentBuilder withNewEngineInGroup(@NonNull String engineGroupId) {
+    return new NewEngineInGroupIntentBuilder(FlutterFragmentActivity.class, engineGroupId);
+  }
+
+  /**
+   * Builder to create an {@code Intent} that launches a {@code FlutterFragmentActivity} with a new
+   * {@link FlutterEngine} by FlutterEngineGroup#createAndRunEngine.
+   */
+  public static class NewEngineInGroupIntentBuilder {
+    private final Class<? extends FlutterFragmentActivity> activityClass;
+    private final String cachedEngineGroupId;
+    private String dartEntrypoint = DEFAULT_DART_ENTRYPOINT;
+    private String initialRoute = DEFAULT_INITIAL_ROUTE;
+    private String backgroundMode = DEFAULT_BACKGROUND_MODE;
+
+    /**
+     * Constructor that allows this {@code NewEngineInGroupIntentBuilder} to be used by subclasses
+     * of {@code FlutterActivity}.
+     *
+     * <p>Subclasses of {@code FlutterFragmentActivity} should provide their own static version of
+     * {@link #withNewEngineInGroup}, which returns an instance of {@code
+     * NewEngineInGroupIntentBuilder} constructed with a {@code Class} reference to the {@code
+     * FlutterFragmentActivity} subclass, e.g.:
+     *
+     * <p>{@code return new NewEngineInGroupIntentBuilder(FlutterFragmentActivity.class,
+     * cacheedEngineGroupId); }
+     *
+     * @param activityClass A subclass of {@code FlutterFragmentActivity}.
+     * @param engineGroupId The engine group id.
+     */
+    public NewEngineInGroupIntentBuilder(
+        @NonNull Class<? extends FlutterFragmentActivity> activityClass,
+        @NonNull String engineGroupId) {
+      this.activityClass = activityClass;
+      this.cachedEngineGroupId = engineGroupId;
+    }
+
+    /**
+     * The Dart entrypoint that will be executed as soon as the Dart snapshot is loaded, default to
+     * "main".
+     *
+     * @param dartEntrypoint The dart entrypoint's name
+     * @return The engine group intent builder
+     */
+    @NonNull
+    public NewEngineInGroupIntentBuilder dartEntrypoint(@NonNull String dartEntrypoint) {
+      this.dartEntrypoint = dartEntrypoint;
+      return this;
+    }
+
+    /**
+     * The initial route that a Flutter app will render in this {@code FlutterFragmentActivity},
+     * defaults to "/".
+     */
+    @NonNull
+    public NewEngineInGroupIntentBuilder initialRoute(@NonNull String initialRoute) {
+      this.initialRoute = initialRoute;
+      return this;
+    }
+
+    /**
+     * The mode of {@code FlutterFragmentActivity}'s background, either {@link
+     * BackgroundMode#opaque} or {@link BackgroundMode#transparent}.
+     *
+     * <p>The default background mode is {@link BackgroundMode#opaque}.
+     *
+     * <p>Choosing a background mode of {@link BackgroundMode#transparent} will configure the inner
+     * {@link FlutterView} of this {@code FlutterFragmentActivity} to be configured with a {@link
+     * FlutterTextureView} to support transparency. This choice has a non-trivial performance
+     * impact. A transparent background should only be used if it is necessary for the app design
+     * being implemented.
+     *
+     * <p>A {@code FlutterFragmentActivity} that is configured with a background mode of {@link
+     * BackgroundMode#transparent} must have a theme applied to it that includes the following
+     * property: {@code <item name="android:windowIsTranslucent">true</item>}.
+     */
+    @NonNull
+    public NewEngineInGroupIntentBuilder backgroundMode(@NonNull BackgroundMode backgroundMode) {
+      this.backgroundMode = backgroundMode.name();
+      return this;
+    }
+
+    /**
+     * Creates and returns an {@link Intent} that will launch a {@code FlutterFragmentActivity} with
+     * the desired configuration.
+     */
+    @NonNull
+    public Intent build(@NonNull Context context) {
+      return new Intent(context, activityClass)
+          .putExtra(EXTRA_DART_ENTRYPOINT, dartEntrypoint)
+          .putExtra(EXTRA_INITIAL_ROUTE, initialRoute)
+          .putExtra(EXTRA_CACHED_ENGINE_GROUP_ID, cachedEngineGroupId)
+          .putExtra(EXTRA_BACKGROUND_MODE, backgroundMode)
+          .putExtra(EXTRA_DESTROY_ENGINE_WITH_ACTIVITY, true);
+    }
+  }
+
   @Nullable private FlutterFragment flutterFragment;
 
   @Override
@@ -331,41 +432,6 @@ public class FlutterFragmentActivity extends FragmentActivity
     }
   }
 
-  @Nullable
-  @Override
-  public SplashScreen provideSplashScreen() {
-    Drawable manifestSplashDrawable = getSplashScreenFromManifest();
-    if (manifestSplashDrawable != null) {
-      return new DrawableSplashScreen(manifestSplashDrawable);
-    } else {
-      return null;
-    }
-  }
-
-  /**
-   * Returns a {@link Drawable} to be used as a splash screen as requested by meta-data in the
-   * {@code AndroidManifest.xml} file, or null if no such splash screen is requested.
-   *
-   * <p>See {@link FlutterActivityLaunchConfigs#SPLASH_SCREEN_META_DATA_KEY} for the meta-data key
-   * to be used in a manifest file.
-   */
-  @Nullable
-  private Drawable getSplashScreenFromManifest() {
-    try {
-      Bundle metaData = getMetaData();
-      int splashScreenId = metaData != null ? metaData.getInt(SPLASH_SCREEN_META_DATA_KEY) : 0;
-      return splashScreenId != 0
-          ? ResourcesCompat.getDrawable(getResources(), splashScreenId, getTheme())
-          : null;
-    } catch (Resources.NotFoundException e) {
-      Log.e(TAG, "Splash screen not found. Ensure the drawable exists and that it's valid.");
-      throw e;
-    } catch (PackageManager.NameNotFoundException e) {
-      // This is never expected to happen.
-      return null;
-    }
-  }
-
   /**
    * Sets this {@code Activity}'s {@code Window} background to be transparent, and hides the status
    * bar, if this {@code Activity}'s desired {@link BackgroundMode} is {@link
@@ -481,6 +547,9 @@ public class FlutterFragmentActivity extends FragmentActivity
       Log.v(
           TAG,
           "Creating FlutterFragment with new engine:\n"
+              + "Cached engine group ID: "
+              + getCachedEngineGroupId()
+              + "\n"
               + "Background transparency mode: "
               + backgroundMode
               + "\n"
@@ -499,6 +568,18 @@ public class FlutterFragmentActivity extends FragmentActivity
               + "Will attach FlutterEngine to Activity: "
               + shouldAttachEngineToActivity());
 
+      if (getCachedEngineGroupId() != null) {
+        return FlutterFragment.withNewEngineInGroup(getCachedEngineGroupId())
+            .dartEntrypoint(getDartEntrypointFunctionName())
+            .initialRoute(getInitialRoute())
+            .handleDeeplinking(shouldHandleDeeplinking())
+            .renderMode(renderMode)
+            .transparencyMode(transparencyMode)
+            .shouldAttachEngineToActivity(shouldAttachEngineToActivity())
+            .shouldDelayFirstAndroidViewDraw(shouldDelayFirstAndroidViewDraw)
+            .build();
+      }
+
       return FlutterFragment.withNewEngine()
           .dartEntrypoint(getDartEntrypointFunctionName())
           .dartLibraryUri(getDartEntrypointLibraryUri())
@@ -516,12 +597,10 @@ public class FlutterFragmentActivity extends FragmentActivity
   }
 
   private void configureStatusBarForFullscreenFlutterExperience() {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      Window window = getWindow();
-      window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-      window.setStatusBarColor(0x40000000);
-      window.getDecorView().setSystemUiVisibility(PlatformPlugin.DEFAULT_SYSTEM_UI);
-    }
+    Window window = getWindow();
+    window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+    window.setStatusBarColor(0x40000000);
+    window.getDecorView().setSystemUiVisibility(PlatformPlugin.DEFAULT_SYSTEM_UI);
   }
 
   @Override
@@ -538,6 +617,7 @@ public class FlutterFragmentActivity extends FragmentActivity
   }
 
   @Override
+  @SuppressWarnings("MissingSuperCall")
   public void onBackPressed() {
     flutterFragment.onBackPressed();
   }
@@ -550,6 +630,7 @@ public class FlutterFragmentActivity extends FragmentActivity
   }
 
   @Override
+  @SuppressWarnings("MissingSuperCall")
   public void onUserLeaveHint() {
     flutterFragment.onUserLeaveHint();
   }
@@ -813,6 +894,11 @@ public class FlutterFragmentActivity extends FragmentActivity
     return getIntent().getStringExtra(EXTRA_CACHED_ENGINE_ID);
   }
 
+  @Nullable
+  protected String getCachedEngineGroupId() {
+    return getIntent().getStringExtra(EXTRA_CACHED_ENGINE_GROUP_ID);
+  }
+
   /**
    * The desired window background mode of this {@code Activity}, which defaults to {@link
    * BackgroundMode#opaque}.
diff --git a/shell/platform/android/io/flutter/embedding/android/FlutterImageView.java b/shell/platform/android/io/flutter/embedding/android/FlutterImageView.java
index 505400dd82e245581d4384c726daa7f576bffe08..df9d6b394dd7d8b0542841bca1555c54a6b18dbf 100644
--- a/shell/platform/android/io/flutter/embedding/android/FlutterImageView.java
+++ b/shell/platform/android/io/flutter/embedding/android/FlutterImageView.java
@@ -4,6 +4,8 @@
 
 package io.flutter.embedding.android;
 
+import static io.flutter.Build.API_LEVELS;
+
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -39,7 +41,6 @@ import java.util.Locale;
  * an {@link android.media.Image} and renders it to the {@link android.graphics.Canvas} in {@code
  * onDraw}.
  */
-@TargetApi(19)
 public class FlutterImageView extends View implements RenderSurface {
   private static final String TAG = "FlutterImageView";
 
@@ -99,7 +100,6 @@ public class FlutterImageView extends View implements RenderSurface {
     Log.w(TAG, String.format(Locale.US, format, args));
   }
 
-  @TargetApi(19)
   @SuppressLint("WrongConstant") // RGBA_8888 is a valid constant.
   @NonNull
   private static ImageReader createImageReader(int width, int height) {
@@ -111,7 +111,7 @@ public class FlutterImageView extends View implements RenderSurface {
       logW("ImageReader height must be greater than 0, but given height=%d, set height=1", height);
       height = 1;
     }
-    if (android.os.Build.VERSION.SDK_INT >= 29) {
+    if (android.os.Build.VERSION.SDK_INT >= API_LEVELS.API_29) {
       return ImageReader.newInstance(
           width,
           height,
@@ -179,11 +179,14 @@ public class FlutterImageView extends View implements RenderSurface {
     // Not supported.
   }
 
+  public void resume() {
+    // Not supported.
+  }
+
   /**
    * Acquires the next image to be drawn to the {@link android.graphics.Canvas}. Returns true if
    * there's an image available in the queue.
    */
-  @TargetApi(19)
   public boolean acquireLatestImage() {
     if (!isAttachedToFlutterRenderer) {
       return false;
@@ -250,9 +253,9 @@ public class FlutterImageView extends View implements RenderSurface {
     }
   }
 
-  @TargetApi(29)
+  @TargetApi(API_LEVELS.API_29)
   private void updateCurrentBitmap() {
-    if (android.os.Build.VERSION.SDK_INT >= 29) {
+    if (android.os.Build.VERSION.SDK_INT >= API_LEVELS.API_29) {
       final HardwareBuffer buffer = currentImage.getHardwareBuffer();
       currentBitmap = Bitmap.wrapHardwareBuffer(buffer, ColorSpace.get(ColorSpace.Named.SRGB));
       buffer.close();
diff --git a/shell/platform/android/io/flutter/embedding/android/FlutterSplashView.java b/shell/platform/android/io/flutter/embedding/android/FlutterSplashView.java
deleted file mode 100644
index 1f6e8d49d277bdd89d654f4f810a472735e87097..0000000000000000000000000000000000000000
--- a/shell/platform/android/io/flutter/embedding/android/FlutterSplashView.java
+++ /dev/null
@@ -1,295 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package io.flutter.embedding.android;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.FrameLayout;
-import androidx.annotation.Keep;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
-import io.flutter.Log;
-import io.flutter.embedding.engine.FlutterEngine;
-import io.flutter.embedding.engine.renderer.FlutterUiDisplayListener;
-
-/**
- * {@code View} that displays a {@link SplashScreen} until a given {@link FlutterView} renders its
- * first frame.
- */
-/* package */ final class FlutterSplashView extends FrameLayout {
-  private static String TAG = "FlutterSplashView";
-
-  @Nullable private SplashScreen splashScreen;
-  @Nullable private FlutterView flutterView;
-  @Nullable private View splashScreenView;
-  @VisibleForTesting @Nullable /* package */ Bundle splashScreenState;
-  @Nullable private String transitioningIsolateId;
-  @Nullable private String previousCompletedSplashIsolate;
-
-  @NonNull
-  private final FlutterView.FlutterEngineAttachmentListener flutterEngineAttachmentListener =
-      new FlutterView.FlutterEngineAttachmentListener() {
-        @Override
-        public void onFlutterEngineAttachedToFlutterView(@NonNull FlutterEngine engine) {
-          flutterView.removeFlutterEngineAttachmentListener(this);
-          displayFlutterViewWithSplash(flutterView, splashScreen);
-        }
-
-        @Override
-        public void onFlutterEngineDetachedFromFlutterView() {}
-      };
-
-  @NonNull
-  private final FlutterUiDisplayListener flutterUiDisplayListener =
-      new FlutterUiDisplayListener() {
-        @Override
-        public void onFlutterUiDisplayed() {
-          if (splashScreen != null) {
-            transitionToFlutter();
-          }
-        }
-
-        @Override
-        public void onFlutterUiNoLongerDisplayed() {
-          // no-op
-        }
-      };
-
-  @NonNull
-  private final Runnable onTransitionComplete =
-      new Runnable() {
-        @Override
-        public void run() {
-          removeView(splashScreenView);
-          previousCompletedSplashIsolate = transitioningIsolateId;
-        }
-      };
-
-  public FlutterSplashView(@NonNull Context context) {
-    this(context, null, 0);
-  }
-
-  public FlutterSplashView(@NonNull Context context, @Nullable AttributeSet attrs) {
-    this(context, attrs, 0);
-  }
-
-  public FlutterSplashView(
-      @NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
-    super(context, attrs, defStyleAttr);
-
-    setSaveEnabled(true);
-  }
-
-  @Nullable
-  @Override
-  protected Parcelable onSaveInstanceState() {
-    Parcelable superState = super.onSaveInstanceState();
-    SavedState savedState = new SavedState(superState);
-    savedState.previousCompletedSplashIsolate = previousCompletedSplashIsolate;
-    savedState.splashScreenState =
-        splashScreen != null ? splashScreen.saveSplashScreenState() : null;
-    return savedState;
-  }
-
-  @Override
-  protected void onRestoreInstanceState(Parcelable state) {
-    if (!(state instanceof SavedState)) {
-      super.onRestoreInstanceState(state);
-      return;
-    }
-    SavedState savedState = (SavedState) state;
-    super.onRestoreInstanceState(savedState.getSuperState());
-    previousCompletedSplashIsolate = savedState.previousCompletedSplashIsolate;
-    splashScreenState = savedState.splashScreenState;
-  }
-
-  /**
-   * Displays the given {@code splashScreen} on top of the given {@code flutterView} until Flutter
-   * has rendered its first frame, then the {@code splashScreen} is transitioned away.
-   *
-   * <p>If no {@code splashScreen} is provided, this {@code FlutterSplashView} displays the given
-   * {@code flutterView} on its own.
-   */
-  public void displayFlutterViewWithSplash(
-      @NonNull FlutterView flutterView, @Nullable SplashScreen splashScreen) {
-    // If we were displaying a previous FlutterView, remove it.
-    if (this.flutterView != null) {
-      this.flutterView.removeOnFirstFrameRenderedListener(flutterUiDisplayListener);
-      removeView(this.flutterView);
-    }
-    // If we were displaying a previous splash screen View, remove it.
-    if (splashScreenView != null) {
-      removeView(splashScreenView);
-    }
-
-    // Display the new FlutterView.
-    this.flutterView = flutterView;
-    addView(flutterView);
-
-    this.splashScreen = splashScreen;
-
-    // Display the new splash screen, if needed.
-    if (splashScreen != null) {
-      if (isSplashScreenNeededNow()) {
-        Log.v(TAG, "Showing splash screen UI.");
-        // This is the typical case. A FlutterEngine is attached to the FlutterView and we're
-        // waiting for the first frame to render. Show a splash UI until that happens.
-        splashScreenView = splashScreen.createSplashView(getContext(), splashScreenState);
-        addView(this.splashScreenView);
-        flutterView.addOnFirstFrameRenderedListener(flutterUiDisplayListener);
-      } else if (isSplashScreenTransitionNeededNow()) {
-        Log.v(
-            TAG,
-            "Showing an immediate splash transition to Flutter due to previously interrupted transition.");
-        splashScreenView = splashScreen.createSplashView(getContext(), splashScreenState);
-        addView(splashScreenView);
-        transitionToFlutter();
-      } else if (!flutterView.isAttachedToFlutterEngine()) {
-        Log.v(
-            TAG,
-            "FlutterView is not yet attached to a FlutterEngine. Showing nothing until a FlutterEngine is attached.");
-        flutterView.addFlutterEngineAttachmentListener(flutterEngineAttachmentListener);
-      }
-    }
-  }
-
-  /**
-   * Returns true if current conditions require a splash UI to be displayed.
-   *
-   * <p>This method does not evaluate whether a previously interrupted splash transition needs to
-   * resume. See {@link #isSplashScreenTransitionNeededNow()} to answer that question.
-   */
-  private boolean isSplashScreenNeededNow() {
-    return flutterView != null
-        && flutterView.isAttachedToFlutterEngine()
-        && !flutterView.hasRenderedFirstFrame()
-        && !hasSplashCompleted();
-  }
-
-  /**
-   * Returns true if a previous splash transition was interrupted by recreation, e.g., an
-   * orientation change, and that previous transition should be resumed.
-   *
-   * <p>Not all splash screens are capable of remembering their transition progress. In those cases,
-   * this method will return false even if a previous visual transition was interrupted.
-   */
-  private boolean isSplashScreenTransitionNeededNow() {
-    return flutterView != null
-        && flutterView.isAttachedToFlutterEngine()
-        && splashScreen != null
-        && splashScreen.doesSplashViewRememberItsTransition()
-        && wasPreviousSplashTransitionInterrupted();
-  }
-
-  /**
-   * Returns true if a splash screen was transitioning to a Flutter experience and was then
-   * interrupted, e.g., by an Android configuration change. Returns false otherwise.
-   *
-   * <p>Invoking this method expects that a {@code flutterView} exists and it is attached to a
-   * {@code FlutterEngine}.
-   */
-  private boolean wasPreviousSplashTransitionInterrupted() {
-    if (flutterView == null) {
-      throw new IllegalStateException(
-          "Cannot determine if previous splash transition was "
-              + "interrupted when no FlutterView is set.");
-    }
-    if (!flutterView.isAttachedToFlutterEngine()) {
-      throw new IllegalStateException(
-          "Cannot determine if previous splash transition was "
-              + "interrupted when no FlutterEngine is attached to our FlutterView. This question "
-              + "depends on an isolate ID to differentiate Flutter experiences.");
-    }
-    return flutterView.hasRenderedFirstFrame() && !hasSplashCompleted();
-  }
-
-  /**
-   * Returns true if a splash UI for a specific Flutter experience has already completed.
-   *
-   * <p>A "specific Flutter experience" is defined as any experience with the same Dart isolate ID.
-   * The purpose of this distinction is to prevent a situation where a user gets past a splash UI,
-   * rotates the device (or otherwise triggers a recreation) and the splash screen reappears.
-   *
-   * <p>An isolate ID is deemed reasonable as a key for a completion event because a Dart isolate
-   * cannot be entered twice. Therefore, a single Dart isolate cannot return to an "un-rendered"
-   * state after having previously rendered content.
-   */
-  private boolean hasSplashCompleted() {
-    if (flutterView == null) {
-      throw new IllegalStateException(
-          "Cannot determine if splash has completed when no FlutterView " + "is set.");
-    }
-    if (!flutterView.isAttachedToFlutterEngine()) {
-      throw new IllegalStateException(
-          "Cannot determine if splash has completed when no "
-              + "FlutterEngine is attached to our FlutterView. This question depends on an isolate ID "
-              + "to differentiate Flutter experiences.");
-    }
-
-    // A null isolate ID on a non-null FlutterEngine indicates that the Dart isolate has not
-    // been initialized. Therefore, no frame has been rendered for this engine, which means
-    // no splash screen could have completed yet.
-    return flutterView.getAttachedFlutterEngine().getDartExecutor().getIsolateServiceId() != null
-        && flutterView
-            .getAttachedFlutterEngine()
-            .getDartExecutor()
-            .getIsolateServiceId()
-            .equals(previousCompletedSplashIsolate);
-  }
-
-  /**
-   * Transitions a splash screen to the Flutter UI.
-   *
-   * <p>This method requires that our FlutterView be attached to an engine, and that engine have a
-   * Dart isolate ID. It also requires that a {@code splashScreen} exist.
-   */
-  private void transitionToFlutter() {
-    transitioningIsolateId =
-        flutterView.getAttachedFlutterEngine().getDartExecutor().getIsolateServiceId();
-    Log.v(TAG, "Transitioning splash screen to a Flutter UI. Isolate: " + transitioningIsolateId);
-    splashScreen.transitionToFlutter(onTransitionComplete);
-  }
-
-  @Keep
-  public static class SavedState extends BaseSavedState {
-    public static Creator<SavedState> CREATOR =
-        new Creator<SavedState>() {
-          @Override
-          public SavedState createFromParcel(Parcel source) {
-            return new SavedState(source);
-          }
-
-          @Override
-          public SavedState[] newArray(int size) {
-            return new SavedState[size];
-          }
-        };
-
-    private String previousCompletedSplashIsolate;
-    private Bundle splashScreenState;
-
-    SavedState(Parcelable superState) {
-      super(superState);
-    }
-
-    SavedState(Parcel source) {
-      super(source);
-      previousCompletedSplashIsolate = source.readString();
-      splashScreenState = source.readBundle(getClass().getClassLoader());
-    }
-
-    @Override
-    public void writeToParcel(Parcel out, int flags) {
-      super.writeToParcel(out, flags);
-      out.writeString(previousCompletedSplashIsolate);
-      out.writeBundle(splashScreenState);
-    }
-  }
-}
diff --git a/shell/platform/android/io/flutter/embedding/android/FlutterSurfaceView.java b/shell/platform/android/io/flutter/embedding/android/FlutterSurfaceView.java
index 5944aa0d635ee269162ca9ae9b3e8127886d8eb5..c5c6493494043907eef28471ffd48cb636eed66b 100644
--- a/shell/platform/android/io/flutter/embedding/android/FlutterSurfaceView.java
+++ b/shell/platform/android/io/flutter/embedding/android/FlutterSurfaceView.java
@@ -12,6 +12,7 @@ import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import io.flutter.Log;
 import io.flutter.embedding.engine.renderer.FlutterRenderer;
 import io.flutter.embedding.engine.renderer.FlutterUiDisplayListener;
@@ -38,9 +39,12 @@ public class FlutterSurfaceView extends SurfaceView implements RenderSurface {
   private final boolean renderTransparently;
   private boolean isSurfaceAvailableForRendering = false;
   private boolean isPaused = false;
-  private boolean isAttachedToFlutterRenderer = false;
   @Nullable private FlutterRenderer flutterRenderer;
 
+  private boolean shouldNotify() {
+    return flutterRenderer != null && !isPaused;
+  }
+
   // Connects the {@code Surface} beneath this {@code SurfaceView} with Flutter's native code.
   // Callbacks are received by this Object and then those messages are forwarded to our
   // FlutterRenderer, and then on to the JNI bridge over to native Flutter code.
@@ -51,7 +55,7 @@ public class FlutterSurfaceView extends SurfaceView implements RenderSurface {
           Log.v(TAG, "SurfaceHolder.Callback.startRenderingToSurface()");
           isSurfaceAvailableForRendering = true;
 
-          if (isAttachedToFlutterRenderer) {
+          if (shouldNotify()) {
             connectSurfaceToRenderer();
           }
         }
@@ -60,7 +64,7 @@ public class FlutterSurfaceView extends SurfaceView implements RenderSurface {
         public void surfaceChanged(
             @NonNull SurfaceHolder holder, int format, int width, int height) {
           Log.v(TAG, "SurfaceHolder.Callback.surfaceChanged()");
-          if (isAttachedToFlutterRenderer) {
+          if (shouldNotify()) {
             changeSurfaceSize(width, height);
           }
         }
@@ -70,7 +74,7 @@ public class FlutterSurfaceView extends SurfaceView implements RenderSurface {
           Log.v(TAG, "SurfaceHolder.Callback.stopRenderingToSurface()");
           isSurfaceAvailableForRendering = false;
 
-          if (isAttachedToFlutterRenderer) {
+          if (shouldNotify()) {
             disconnectSurfaceFromRenderer();
           }
         }
@@ -165,6 +169,10 @@ public class FlutterSurfaceView extends SurfaceView implements RenderSurface {
     return flutterRenderer;
   }
 
+  @VisibleForTesting
+  /* package */ boolean isSurfaceAvailableForRendering() {
+    return isSurfaceAvailableForRendering;
+  }
   /**
    * Invoked by the owner of this {@code FlutterSurfaceView} when it wants to begin rendering a
    * Flutter UI to this {@code FlutterSurfaceView}.
@@ -183,25 +191,15 @@ public class FlutterSurfaceView extends SurfaceView implements RenderSurface {
     if (this.flutterRenderer != null) {
       Log.v(
           TAG,
-          "Already connected to a FlutterRenderer. Detaching from old one and attaching to new one.");
+          "Already connected to a FlutterRenderer. Detaching from old one and attaching to new"
+              + " one.");
       this.flutterRenderer.stopRenderingToSurface();
       this.flutterRenderer.removeIsDisplayingFlutterUiListener(flutterUiDisplayListener);
     }
 
     this.flutterRenderer = flutterRenderer;
-    isAttachedToFlutterRenderer = true;
-
-    this.flutterRenderer.addIsDisplayingFlutterUiListener(flutterUiDisplayListener);
 
-    // If we're already attached to an Android window then we're now attached to both a renderer
-    // and the Android window. We can begin rendering now.
-    if (isSurfaceAvailableForRendering) {
-      Log.v(
-          TAG,
-          "Surface is available for rendering. Connecting FlutterRenderer to Android surface.");
-      connectSurfaceToRenderer();
-    }
-    isPaused = false;
+    resume();
   }
 
   /**
@@ -224,11 +222,9 @@ public class FlutterSurfaceView extends SurfaceView implements RenderSurface {
 
       // Make the SurfaceView invisible to avoid showing a black rectangle.
       setAlpha(0.0f);
-
       flutterRenderer.removeIsDisplayingFlutterUiListener(flutterUiDisplayListener);
-
       flutterRenderer = null;
-      isAttachedToFlutterRenderer = false;
+
     } else {
       Log.w(TAG, "detachFromRenderer() invoked when no FlutterRenderer was attached.");
     }
@@ -239,22 +235,37 @@ public class FlutterSurfaceView extends SurfaceView implements RenderSurface {
    * UI to this {@code FlutterSurfaceView}.
    */
   public void pause() {
-    if (flutterRenderer != null) {
-      // Don't remove the `flutterUiDisplayListener` as `onFlutterUiDisplayed()` will make
-      // the `FlutterSurfaceView` visible.
-      flutterRenderer = null;
-      isPaused = true;
-      isAttachedToFlutterRenderer = false;
-    } else {
+    if (flutterRenderer == null) {
       Log.w(TAG, "pause() invoked when no FlutterRenderer was attached.");
+      return;
     }
+    isPaused = true;
+  }
+
+  public void resume() {
+    if (flutterRenderer == null) {
+      Log.w(TAG, "resume() invoked when no FlutterRenderer was attached.");
+      return;
+    }
+    this.flutterRenderer.addIsDisplayingFlutterUiListener(flutterUiDisplayListener);
+
+    // If we're already attached to an Android window then we're now attached to both a renderer
+    // and the Android window. We can begin rendering now.
+    if (isSurfaceAvailableForRendering()) {
+      Log.v(
+          TAG,
+          "Surface is available for rendering. Connecting FlutterRenderer to Android surface.");
+      connectSurfaceToRenderer();
+    }
+    isPaused = false;
   }
 
   // FlutterRenderer and getSurfaceTexture() must both be non-null.
   private void connectSurfaceToRenderer() {
     if (flutterRenderer == null || getHolder() == null) {
       throw new IllegalStateException(
-          "connectSurfaceToRenderer() should only be called when flutterRenderer and getHolder() are non-null.");
+          "connectSurfaceToRenderer() should only be called when flutterRenderer and getHolder()"
+              + " are non-null.");
     }
     // When connecting the surface to the renderer, it's possible that the surface is currently
     // paused. For instance, when a platform view is displayed, the current FlutterSurfaceView
@@ -285,9 +296,10 @@ public class FlutterSurfaceView extends SurfaceView implements RenderSurface {
   private void disconnectSurfaceFromRenderer() {
     if (flutterRenderer == null) {
       throw new IllegalStateException(
-          "disconnectSurfaceFromRenderer() should only be called when flutterRenderer is non-null.");
+          "disconnectSurfaceFromRenderer() should only be called when flutterRenderer is"
+              + " non-null.");
     }
 
     flutterRenderer.stopRenderingToSurface();
   }
-}
+}
\ No newline at end of file
diff --git a/shell/platform/android/io/flutter/embedding/android/FlutterTextureView.java b/shell/platform/android/io/flutter/embedding/android/FlutterTextureView.java
index 5e2d8e03dfb67fb4ac8c92d9e84abcf06161731f..704509aae1e87217770714e08ed39144bef09a65 100644
--- a/shell/platform/android/io/flutter/embedding/android/FlutterTextureView.java
+++ b/shell/platform/android/io/flutter/embedding/android/FlutterTextureView.java
@@ -35,11 +35,14 @@ public class FlutterTextureView extends TextureView implements RenderSurface {
   private static final String TAG = "FlutterTextureView";
 
   private boolean isSurfaceAvailableForRendering = false;
-  private boolean isAttachedToFlutterRenderer = false;
   private boolean isPaused = false;
   @Nullable private FlutterRenderer flutterRenderer;
   @Nullable private Surface renderSurface;
 
+  private boolean shouldNotify() {
+    return flutterRenderer != null && !isPaused;
+  }
+
   // Connects the {@code SurfaceTexture} beneath this {@code TextureView} with Flutter's native
   // code.
   // Callbacks are received by this Object and then those messages are forwarded to our
@@ -55,7 +58,7 @@ public class FlutterTextureView extends TextureView implements RenderSurface {
           // If we're already attached to a FlutterRenderer then we're now attached to both a
           // renderer
           // and the Android window, so we can begin rendering now.
-          if (isAttachedToFlutterRenderer) {
+          if (shouldNotify()) {
             connectSurfaceToRenderer();
           }
         }
@@ -64,7 +67,7 @@ public class FlutterTextureView extends TextureView implements RenderSurface {
         public void onSurfaceTextureSizeChanged(
             @NonNull SurfaceTexture surface, int width, int height) {
           Log.v(TAG, "SurfaceTextureListener.onSurfaceTextureSizeChanged()");
-          if (isAttachedToFlutterRenderer) {
+          if (shouldNotify()) {
             changeSurfaceSize(width, height);
           }
         }
@@ -82,7 +85,7 @@ public class FlutterTextureView extends TextureView implements RenderSurface {
           // If we're attached to a FlutterRenderer then we need to notify it that our
           // SurfaceTexture
           // has been destroyed.
-          if (isAttachedToFlutterRenderer) {
+          if (shouldNotify()) {
             disconnectSurfaceFromRenderer();
           }
 
@@ -121,6 +124,11 @@ public class FlutterTextureView extends TextureView implements RenderSurface {
     return flutterRenderer;
   }
 
+  @VisibleForTesting
+  /* package */ boolean isSurfaceAvailableForRendering() {
+    return isSurfaceAvailableForRendering;
+  }
+
   /**
    * Invoked by the owner of this {@code FlutterTextureView} when it wants to begin rendering a
    * Flutter UI to this {@code FlutterTextureView}.
@@ -139,21 +147,14 @@ public class FlutterTextureView extends TextureView implements RenderSurface {
     if (this.flutterRenderer != null) {
       Log.v(
           TAG,
-          "Already connected to a FlutterRenderer. Detaching from old one and attaching to new one.");
+          "Already connected to a FlutterRenderer. Detaching from old one and attaching to new"
+              + " one.");
       this.flutterRenderer.stopRenderingToSurface();
     }
 
     this.flutterRenderer = flutterRenderer;
-    isAttachedToFlutterRenderer = true;
 
-    // If we're already attached to an Android window then we're now attached to both a renderer
-    // and the Android window. We can begin rendering now.
-    if (isSurfaceAvailableForRendering) {
-      Log.v(
-          TAG,
-          "Surface is available for rendering. Connecting FlutterRenderer to Android surface.");
-      connectSurfaceToRenderer();
-    }
+    resume();
   }
 
   /**
@@ -175,7 +176,6 @@ public class FlutterTextureView extends TextureView implements RenderSurface {
       }
 
       flutterRenderer = null;
-      isAttachedToFlutterRenderer = false;
     } else {
       Log.w(TAG, "detachFromRenderer() invoked when no FlutterRenderer was attached.");
     }
@@ -186,13 +186,28 @@ public class FlutterTextureView extends TextureView implements RenderSurface {
    * UI to this {@code FlutterTextureView}.
    */
   public void pause() {
-    if (flutterRenderer != null) {
-      flutterRenderer = null;
-      isPaused = true;
-      isAttachedToFlutterRenderer = false;
-    } else {
+    if (flutterRenderer == null) {
       Log.w(TAG, "pause() invoked when no FlutterRenderer was attached.");
+      return;
     }
+    isPaused = true;
+  }
+
+  public void resume() {
+    if (flutterRenderer == null) {
+      Log.w(TAG, "resume() invoked when no FlutterRenderer was attached.");
+      return;
+    }
+
+    // If we're already attached to an Android window then we're now attached to both a renderer
+    // and the Android window. We can begin rendering now.
+    if (isSurfaceAvailableForRendering()) {
+      Log.v(
+          TAG,
+          "Surface is available for rendering. Connecting FlutterRenderer to Android surface.");
+      connectSurfaceToRenderer();
+    }
+    isPaused = false;
   }
 
   /**
@@ -209,7 +224,8 @@ public class FlutterTextureView extends TextureView implements RenderSurface {
   private void connectSurfaceToRenderer() {
     if (flutterRenderer == null || getSurfaceTexture() == null) {
       throw new IllegalStateException(
-          "connectSurfaceToRenderer() should only be called when flutterRenderer and getSurfaceTexture() are non-null.");
+          "connectSurfaceToRenderer() should only be called when flutterRenderer and"
+              + " getSurfaceTexture() are non-null.");
     }
 
     // Definitively release the surface to avoid leaked closeables, just in case
@@ -220,7 +236,6 @@ public class FlutterTextureView extends TextureView implements RenderSurface {
 
     renderSurface = new Surface(getSurfaceTexture());
     flutterRenderer.startRenderingToSurface(renderSurface, isPaused);
-    isPaused = false;
   }
 
   // FlutterRenderer must be non-null.
@@ -243,7 +258,8 @@ public class FlutterTextureView extends TextureView implements RenderSurface {
   private void disconnectSurfaceFromRenderer() {
     if (flutterRenderer == null) {
       throw new IllegalStateException(
-          "disconnectSurfaceFromRenderer() should only be called when flutterRenderer is non-null.");
+          "disconnectSurfaceFromRenderer() should only be called when flutterRenderer is"
+              + " non-null.");
     }
 
     flutterRenderer.stopRenderingToSurface();
@@ -252,4 +268,4 @@ public class FlutterTextureView extends TextureView implements RenderSurface {
       renderSurface = null;
     }
   }
-}
+}
\ No newline at end of file
diff --git a/shell/platform/android/io/flutter/embedding/android/FlutterView.java b/shell/platform/android/io/flutter/embedding/android/FlutterView.java
index 28d908764c1a85f0566253b8659d2e70e97fcaaf..7272b5125ba05a64e94b1e2d91a10e86e30d1278 100644
--- a/shell/platform/android/io/flutter/embedding/android/FlutterView.java
+++ b/shell/platform/android/io/flutter/embedding/android/FlutterView.java
@@ -4,6 +4,8 @@
 
 package io.flutter.embedding.android;
 
+import static io.flutter.Build.API_LEVELS;
+
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -233,7 +235,7 @@ public class FlutterView extends FrameLayout
       renderSurface = flutterTextureView;
     } else {
       throw new IllegalArgumentException(
-          String.format("RenderMode not supported with this constructor: %s", renderMode));
+          "RenderMode not supported with this constructor: " + renderMode);
     }
 
     init();
@@ -290,7 +292,6 @@ public class FlutterView extends FrameLayout
    * <p>{@code FlutterView} requires an {@code Activity} instead of a generic {@code Context} to be
    * compatible with {@link PlatformViewsController}.
    */
-  @TargetApi(19)
   public FlutterView(@NonNull Context context, @NonNull FlutterImageView flutterImageView) {
     this(context, null, flutterImageView);
   }
@@ -327,7 +328,7 @@ public class FlutterView extends FrameLayout
       renderSurface = flutterTextureView;
     } else {
       throw new IllegalArgumentException(
-          String.format("RenderMode not supported with this constructor: %s", renderMode));
+          "RenderMode not supported with this constructor: " + renderMode);
     }
 
     init();
@@ -357,7 +358,6 @@ public class FlutterView extends FrameLayout
     init();
   }
 
-  @TargetApi(19)
   private FlutterView(
       @NonNull Context context,
       @Nullable AttributeSet attrs,
@@ -387,8 +387,8 @@ public class FlutterView extends FrameLayout
     // FlutterView needs to be focusable so that the InputMethodManager can interact with it.
     setFocusable(true);
     setFocusableInTouchMode(true);
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-      setImportantForAutofill(View.IMPORTANT_FOR_AUTOFILL_YES_EXCLUDE_DESCENDANTS);
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_26) {
+      setImportantForAutofill(View.IMPORTANT_FOR_AUTOFILL_YES);
     }
   }
 
@@ -451,6 +451,8 @@ public class FlutterView extends FrameLayout
       Log.v(TAG, "Configuration changed. Sending locales and user settings to Flutter.");
       localizationPlugin.sendLocalesToFlutter(newConfig);
       sendUserSettingsToFlutter();
+
+      ViewUtils.calculateMaximumDisplayMetrics(getContext(), flutterEngine);
     }
   }
 
@@ -532,7 +534,7 @@ public class FlutterView extends FrameLayout
    * Refresh {@link androidx.window.layout.WindowInfoTracker} and {@link android.view.DisplayCutout}
    * display features. Fold, hinge and cutout areas are populated here.
    */
-  @TargetApi(28)
+  @TargetApi(API_LEVELS.API_28)
   protected void setWindowInfoListenerDisplayFeatures(WindowLayoutInfo layoutInfo) {
     List<DisplayFeature> displayFeatures = layoutInfo.getDisplayFeatures();
     List<FlutterRenderer.DisplayFeature> result = new ArrayList<>();
@@ -574,7 +576,7 @@ public class FlutterView extends FrameLayout
 
     // Data from the DisplayCutout bounds. Cutouts for cameras and other sensors are
     // populated here. DisplayCutout was introduced in API 28.
-    if (Build.VERSION.SDK_INT >= 28) {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_28) {
       WindowInsets insets = getRootWindowInsets();
       if (insets != null) {
         DisplayCutout cutout = insets.getDisplayCutout();
@@ -619,7 +621,7 @@ public class FlutterView extends FrameLayout
         return ZeroSides.RIGHT;
       } else if (rotation == Surface.ROTATION_270) {
         // In android API >= 23, the nav bar always appears on the "bottom" (USB) side.
-        return Build.VERSION.SDK_INT >= 23 ? ZeroSides.LEFT : ZeroSides.RIGHT;
+        return Build.VERSION.SDK_INT >= API_LEVELS.API_23 ? ZeroSides.LEFT : ZeroSides.RIGHT;
       }
       // Ambiguous orientation due to landscape left/right default. Zero both sides.
       else if (rotation == Surface.ROTATION_0 || rotation == Surface.ROTATION_180) {
@@ -641,8 +643,7 @@ public class FlutterView extends FrameLayout
   //
   // This method is replaced by Android API 30 (R/11) getInsets() method which can take the
   // android.view.WindowInsets.Type.ime() flag to find the keyboard inset.
-  @TargetApi(20)
-  @RequiresApi(20)
+
   private int guessBottomKeyboardInset(WindowInsets insets) {
     int screenHeight = getRootView().getHeight();
     // Magic number due to this being a heuristic. This should be replaced, but we have not
@@ -668,8 +669,7 @@ public class FlutterView extends FrameLayout
    * wider than expected padding when the status and navigation bars are hidden.
    */
   @Override
-  @TargetApi(20)
-  @RequiresApi(20)
+
   // The annotations to suppress "InlinedApi" and "NewApi" lints prevent lint warnings
   // caused by usage of Android Q APIs. These calls are safe because they are
   // guarded.
@@ -679,7 +679,7 @@ public class FlutterView extends FrameLayout
     WindowInsets newInsets = super.onApplyWindowInsets(insets);
 
     // getSystemGestureInsets() was introduced in API 29 and immediately deprecated in 30.
-    if (Build.VERSION.SDK_INT == Build.VERSION_CODES.Q) {
+    if (Build.VERSION.SDK_INT == API_LEVELS.API_29) {
       Insets systemGestureInsets = insets.getSystemGestureInsets();
       viewportMetrics.systemGestureInsetTop = systemGestureInsets.top;
       viewportMetrics.systemGestureInsetRight = systemGestureInsets.right;
@@ -691,7 +691,7 @@ public class FlutterView extends FrameLayout
     boolean navigationBarVisible =
         (SYSTEM_UI_FLAG_HIDE_NAVIGATION & getWindowSystemUiVisibility()) == 0;
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_30) {
       int mask = 0;
       if (navigationBarVisible) {
         mask = mask | android.view.WindowInsets.Type.navigationBars();
@@ -800,53 +800,6 @@ public class FlutterView extends FrameLayout
     sendViewportMetricsToFlutter();
     return newInsets;
   }
-
-  /**
-   * Invoked when Android's desired window insets change, i.e., padding.
-   *
-   * <p>{@code fitSystemWindows} is an earlier version of {@link
-   * #onApplyWindowInsets(WindowInsets)}. See that method for more details about how window insets
-   * relate to Flutter.
-   */
-  @Override
-  @SuppressWarnings("deprecation")
-  protected boolean fitSystemWindows(@NonNull Rect insets) {
-    if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT) {
-      // Status bar, left/right system insets partially obscure content (padding).
-      viewportMetrics.viewPaddingTop = insets.top;
-      viewportMetrics.viewPaddingRight = insets.right;
-      viewportMetrics.viewPaddingBottom = 0;
-      viewportMetrics.viewPaddingLeft = insets.left;
-
-      // Bottom system inset (keyboard) should adjust scrollable bottom edge (inset).
-      viewportMetrics.viewInsetTop = 0;
-      viewportMetrics.viewInsetRight = 0;
-      viewportMetrics.viewInsetBottom = insets.bottom;
-      viewportMetrics.viewInsetLeft = 0;
-
-      Log.v(
-          TAG,
-          "Updating window insets (fitSystemWindows()):\n"
-              + "Status bar insets: Top: "
-              + viewportMetrics.viewPaddingTop
-              + ", Left: "
-              + viewportMetrics.viewPaddingLeft
-              + ", Right: "
-              + viewportMetrics.viewPaddingRight
-              + "\n"
-              + "Keyboard insets: Bottom: "
-              + viewportMetrics.viewInsetBottom
-              + ", Left: "
-              + viewportMetrics.viewInsetLeft
-              + ", Right: "
-              + viewportMetrics.viewInsetRight);
-
-      sendViewportMetricsToFlutter();
-      return true;
-    } else {
-      return super.fitSystemWindows(insets);
-    }
-  }
   // ------- End: Process View configuration that Flutter cares about. --------
 
   // -------- Start: Process UI I/O that Flutter cares about. -------
@@ -928,14 +881,7 @@ public class FlutterView extends FrameLayout
       return super.onTouchEvent(event);
     }
 
-    // TODO(abarth): This version check might not be effective in some
-    // versions of Android that statically compile code and will be upset
-    // at the lack of |requestUnbufferedDispatch|. Instead, we should factor
-    // version-dependent code into separate classes for each supported
-    // version and dispatch dynamically.
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      requestUnbufferedDispatch(event);
-    }
+    requestUnbufferedDispatch(event);
 
     return androidTouchProcessor.onTouchEvent(event);
   }
@@ -950,7 +896,8 @@ public class FlutterView extends FrameLayout
   @Override
   public boolean onGenericMotionEvent(@NonNull MotionEvent event) {
     boolean handled =
-        isAttachedToFlutterEngine() && androidTouchProcessor.onGenericMotionEvent(event);
+        isAttachedToFlutterEngine()
+            && androidTouchProcessor.onGenericMotionEvent(event, getContext());
     return handled ? true : super.onGenericMotionEvent(event);
   }
 
@@ -1011,7 +958,7 @@ public class FlutterView extends FrameLayout
   @SuppressLint("SoonBlockedPrivateApi")
   @Nullable
   public View findViewByAccessibilityIdTraversal(int accessibilityId) {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+    if (Build.VERSION.SDK_INT < API_LEVELS.API_29) {
       return findViewByAccessibilityIdRootedAtCurrentView(accessibilityId, this);
     }
     // Android Q or later doesn't call this method.
@@ -1087,8 +1034,8 @@ public class FlutterView extends FrameLayout
 
   // -------- Start: Mouse -------
   @Override
-  @TargetApi(Build.VERSION_CODES.N)
-  @RequiresApi(Build.VERSION_CODES.N)
+  @TargetApi(API_LEVELS.API_24)
+  @RequiresApi(API_LEVELS.API_24)
   @NonNull
   public PointerIcon getSystemPointerIcon(int type) {
     return PointerIcon.getSystemIcon(getContext(), type);
@@ -1153,7 +1100,7 @@ public class FlutterView extends FrameLayout
 
     // Initialize various components that know how to process Android View I/O
     // in a way that Flutter understands.
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_24) {
       mouseCursorPlugin = new MouseCursorPlugin(this, this.flutterEngine.getMouseCursorChannel());
     }
     textInputPlugin =
@@ -1289,6 +1236,13 @@ public class FlutterView extends FrameLayout
     }
     renderSurface.detachFromRenderer();
 
+    releaseImageView();
+
+    previousRenderSurface = null;
+    flutterEngine = null;
+  }
+
+  private void releaseImageView() {
     if (flutterImageView != null) {
       flutterImageView.closeImageReader();
       // Remove the FlutterImageView that was previously added by {@code convertToImageView} to
@@ -1297,8 +1251,6 @@ public class FlutterView extends FrameLayout
       removeView(flutterImageView);
       flutterImageView = null;
     }
-    previousRenderSurface = null;
-    flutterEngine = null;
   }
 
   @VisibleForTesting
@@ -1352,20 +1304,18 @@ public class FlutterView extends FrameLayout
     }
     renderSurface = previousRenderSurface;
     previousRenderSurface = null;
-    if (flutterEngine == null) {
-      flutterImageView.detachFromRenderer();
-      onDone.run();
-      return;
-    }
+
     final FlutterRenderer renderer = flutterEngine.getRenderer();
-    if (renderer == null) {
+
+    if (flutterEngine == null || renderer == null) {
       flutterImageView.detachFromRenderer();
+      releaseImageView();
       onDone.run();
       return;
     }
-    // Start rendering on the previous surface.
+    // Resume rendering to the previous surface.
     // This surface is typically `FlutterSurfaceView` or `FlutterTextureView`.
-    renderSurface.attachToRenderer(renderer);
+    renderSurface.resume();
 
     // Install a Flutter UI listener to wait until the first frame is rendered
     // in the new surface to call the `onDone` callback.
@@ -1377,6 +1327,7 @@ public class FlutterView extends FrameLayout
             onDone.run();
             if (!(renderSurface instanceof FlutterImageView) && flutterImageView != null) {
               flutterImageView.detachFromRenderer();
+              releaseImageView();
             }
           }
 
@@ -1463,7 +1414,7 @@ public class FlutterView extends FrameLayout
     boolean isNativeSpellCheckServiceDefined = false;
 
     if (textServicesManager != null) {
-      if (Build.VERSION.SDK_INT >= 31) {
+      if (Build.VERSION.SDK_INT >= API_LEVELS.API_31) {
         List<SpellCheckerInfo> enabledSpellCheckerInfos =
             textServicesManager.getEnabledSpellCheckerInfos();
         boolean gboardSpellCheckerEnabled =
@@ -1487,6 +1438,7 @@ public class FlutterView extends FrameLayout
         .getSettingsChannel()
         .startMessage()
         .setTextScaleFactor(getResources().getConfiguration().fontScale)
+        .setDisplayMetrics(getResources().getDisplayMetrics())
         .setNativeSpellCheckServiceDefined(isNativeSpellCheckServiceDefined)
         .setBrieflyShowPassword(
             Settings.System.getInt(
diff --git a/shell/platform/android/io/flutter/embedding/android/KeyData.java b/shell/platform/android/io/flutter/embedding/android/KeyData.java
index eb8a41767c576dbda2fcddd6294abff498f70cf1..ef3b8eb6d8e72b0dbd108c1158cca4437b3a7064 100644
--- a/shell/platform/android/io/flutter/embedding/android/KeyData.java
+++ b/shell/platform/android/io/flutter/embedding/android/KeyData.java
@@ -30,7 +30,11 @@ public class KeyData {
   public static final String CHANNEL = "flutter/keydata";
 
   // The number of fields except for `character`.
-  private static final int FIELD_COUNT = 5;
+  // If this value changes, update the code in the following files:
+  //
+  //  * key_data.h (kKeyDataFieldCount)
+  //  * platform_dispatcher.dart (_kKeyDataFieldCount)
+  private static final int FIELD_COUNT = 6;
   private static final int BYTES_PER_FIELD = 8;
 
   /** The action type of the key data. */
@@ -63,6 +67,42 @@ public class KeyData {
     }
   }
 
+  /** The device type of the key data. */
+  public enum DeviceType {
+    kKeyboard(0),
+    kDirectionalPad(1),
+    kGamepad(2),
+    kJoystick(3),
+    kHdmi(4);
+
+    private final long value;
+
+    private DeviceType(long value) {
+      this.value = value;
+    }
+
+    public long getValue() {
+      return value;
+    }
+
+    static DeviceType fromLong(long value) {
+      switch ((int) value) {
+        case 0:
+          return kKeyboard;
+        case 1:
+          return kDirectionalPad;
+        case 2:
+          return kGamepad;
+        case 3:
+          return kJoystick;
+        case 4:
+          return kHdmi;
+        default:
+          throw new AssertionError("Unexpected DeviceType value");
+      }
+    }
+  }
+
   /** Creates an empty {@link KeyData}. */
   public KeyData() {}
 
@@ -78,6 +118,7 @@ public class KeyData {
     this.physicalKey = buffer.getLong();
     this.logicalKey = buffer.getLong();
     this.synthesized = buffer.getLong() != 0;
+    this.deviceType = DeviceType.fromLong(buffer.getLong());
 
     if (buffer.remaining() != charSize) {
       throw new AssertionError(
@@ -102,6 +143,7 @@ public class KeyData {
   long physicalKey;
   long logicalKey;
   boolean synthesized;
+  DeviceType deviceType;
 
   /** The character of this key data encoded in UTF-8. */
   @Nullable String character;
@@ -131,6 +173,7 @@ public class KeyData {
     packet.putLong(physicalKey);
     packet.putLong(logicalKey);
     packet.putLong(synthesized ? 1L : 0L);
+    packet.putLong(deviceType.getValue());
     if (charBytes != null) {
       packet.put(charBytes);
     }
diff --git a/shell/platform/android/io/flutter/embedding/android/KeyEmbedderResponder.java b/shell/platform/android/io/flutter/embedding/android/KeyEmbedderResponder.java
index 2a5d5b1a87400db7a01c019da050cb1d271d7f98..eb42164d833adb81c1dd4b3d1630a8ff1c5e5601 100644
--- a/shell/platform/android/io/flutter/embedding/android/KeyEmbedderResponder.java
+++ b/shell/platform/android/io/flutter/embedding/android/KeyEmbedderResponder.java
@@ -4,14 +4,18 @@
 
 package io.flutter.embedding.android;
 
+import android.view.InputDevice;
 import android.view.KeyEvent;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import io.flutter.Log;
 import io.flutter.embedding.android.KeyboardMap.PressingGoal;
 import io.flutter.embedding.android.KeyboardMap.TogglingGoal;
 import io.flutter.plugin.common.BinaryMessenger;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.Map;
 
 /**
  * A {@link KeyboardManager.Responder} of {@link KeyboardManager} that handles events by sending
@@ -339,12 +343,33 @@ public class KeyEmbedderResponder implements KeyboardManager.Responder {
     }
 
     final KeyData output = new KeyData();
+
+    switch (event.getSource()) {
+      default:
+      case InputDevice.SOURCE_KEYBOARD:
+        output.deviceType = KeyData.DeviceType.kKeyboard;
+        break;
+      case InputDevice.SOURCE_DPAD:
+        output.deviceType = KeyData.DeviceType.kDirectionalPad;
+        break;
+      case InputDevice.SOURCE_GAMEPAD:
+        output.deviceType = KeyData.DeviceType.kGamepad;
+        break;
+      case InputDevice.SOURCE_JOYSTICK:
+        output.deviceType = KeyData.DeviceType.kJoystick;
+        break;
+      case InputDevice.SOURCE_HDMI:
+        output.deviceType = KeyData.DeviceType.kHdmi;
+        break;
+    }
+
     output.timestamp = event.getEventTime();
     output.type = type;
     output.logicalKey = logicalKey;
     output.physicalKey = physicalKey;
     output.character = character;
     output.synthesized = false;
+    output.deviceType = KeyData.DeviceType.kKeyboard;
 
     sendKeyEvent(output, onKeyEventHandledCallback);
     for (final Runnable postSyncEvent : postSynchronizeEvents) {
@@ -361,6 +386,7 @@ public class KeyEmbedderResponder implements KeyboardManager.Responder {
     output.physicalKey = physicalKey;
     output.character = null;
     output.synthesized = true;
+    output.deviceType = KeyData.DeviceType.kKeyboard;
     if (physicalKey != 0 && logicalKey != 0) {
       updatePressingState(physicalKey, isDown ? logicalKey : null);
     }
@@ -373,9 +399,13 @@ public class KeyEmbedderResponder implements KeyboardManager.Responder {
             ? null
             : message -> {
               Boolean handled = false;
-              message.rewind();
-              if (message.capacity() != 0) {
-                handled = message.get() != 0;
+              if (message != null) {
+                message.rewind();
+                if (message.capacity() != 0) {
+                  handled = message.get() != 0;
+                }
+              } else {
+                Log.w(TAG, "A null reply was received when sending a key event to the framework.");
               }
               onKeyEventHandledCallback.onKeyEventHandled(handled);
             };
@@ -405,4 +435,14 @@ public class KeyEmbedderResponder implements KeyboardManager.Responder {
       onKeyEventHandledCallback.onKeyEventHandled(true);
     }
   }
+
+  /**
+   * Returns an unmodifiable view of the pressed state.
+   *
+   * @return A map whose keys are physical keyboard key IDs and values are the corresponding logical
+   *     keyboard key IDs.
+   */
+  public Map<Long, Long> getPressedState() {
+    return Collections.unmodifiableMap(pressingRecords);
+  }
 }
diff --git a/shell/platform/android/io/flutter/embedding/android/KeyboardManager.java b/shell/platform/android/io/flutter/embedding/android/KeyboardManager.java
index 76e344a4e5d26f2c750cbe7b58b062830d492b77..ffafb7692e52d76f8dabb6f37a4a9b11f497b82e 100644
--- a/shell/platform/android/io/flutter/embedding/android/KeyboardManager.java
+++ b/shell/platform/android/io/flutter/embedding/android/KeyboardManager.java
@@ -9,10 +9,12 @@ import android.view.KeyEvent;
 import androidx.annotation.NonNull;
 import io.flutter.Log;
 import io.flutter.embedding.engine.systemchannels.KeyEventChannel;
+import io.flutter.embedding.engine.systemchannels.KeyboardChannel;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.editing.InputConnectionAdaptor;
 import io.flutter.plugin.editing.TextInputPlugin;
 import java.util.HashSet;
+import java.util.Map;
 
 /**
  * Processes keyboard events and cooperate with {@link TextInputPlugin}.
@@ -40,7 +42,8 @@ import java.util.HashSet;
  *       encounter.
  * </ul>
  */
-public class KeyboardManager implements InputConnectionAdaptor.KeyboardDelegate {
+public class KeyboardManager
+    implements InputConnectionAdaptor.KeyboardDelegate, KeyboardChannel.KeyboardMethodHandler {
   private static final String TAG = "KeyboardManager";
 
   /**
@@ -119,6 +122,8 @@ public class KeyboardManager implements InputConnectionAdaptor.KeyboardDelegate
           new KeyEmbedderResponder(viewDelegate.getBinaryMessenger()),
           new KeyChannelResponder(new KeyEventChannel(viewDelegate.getBinaryMessenger())),
         };
+    final KeyboardChannel keyboardChannel = new KeyboardChannel(viewDelegate.getBinaryMessenger());
+    keyboardChannel.setKeyboardMethodHandler(this);
   }
 
   /**
@@ -252,4 +257,15 @@ public class KeyboardManager implements InputConnectionAdaptor.KeyboardDelegate
       Log.w(TAG, "A redispatched key event was consumed before reaching KeyboardManager");
     }
   }
+
+  /**
+   * Returns an unmodifiable view of the pressed state.
+   *
+   * @return A map whose keys are physical keyboard key IDs and values are the corresponding logical
+   *     keyboard key IDs.
+   */
+  public Map<Long, Long> getKeyboardState() {
+    KeyEmbedderResponder embedderResponder = (KeyEmbedderResponder) responders[0];
+    return embedderResponder.getPressedState();
+  }
 }
diff --git a/shell/platform/android/io/flutter/embedding/android/MotionEventTracker.java b/shell/platform/android/io/flutter/embedding/android/MotionEventTracker.java
index 9ac225c83ae7f2ae0f513dbae628f85e20afccb6..e1685ae746903ec50e94bd6a43b32e247b49341b 100644
--- a/shell/platform/android/io/flutter/embedding/android/MotionEventTracker.java
+++ b/shell/platform/android/io/flutter/embedding/android/MotionEventTracker.java
@@ -9,7 +9,7 @@ import java.util.concurrent.atomic.AtomicLong;
 
 /** Tracks the motion events received by the FlutterView. */
 public final class MotionEventTracker {
-
+  private static final String TAG = "MotionEventTracker";
   /** Represents a unique identifier corresponding to a motion event. */
   public static class MotionEventId {
     private static final AtomicLong ID_COUNTER = new AtomicLong(0);
@@ -55,7 +55,14 @@ public final class MotionEventTracker {
   @NonNull
   public MotionEventId track(@NonNull MotionEvent event) {
     MotionEventId eventId = MotionEventId.createUnique();
-    eventById.put(eventId.id, MotionEvent.obtain(event));
+    // We copy event here because the original MotionEvent delivered to us
+    // will be automatically recycled (`MotionEvent.recycle`) by the RootView and we need
+    // access to it after the RootView code runs.
+    // The return value of `MotionEvent.obtain(event)` is still verifiable if the input
+    // event was verifiable. Other overloads of `MotionEvent.obtain` do not have this
+    // guarantee and should be avoided when possible.
+    MotionEvent eventCopy = MotionEvent.obtain(event);
+    eventById.put(eventId.id, eventCopy);
     unusedEvents.add(eventId.id);
     return eventId;
   }
diff --git a/shell/platform/android/io/flutter/embedding/android/SplashScreen.java b/shell/platform/android/io/flutter/embedding/android/SplashScreen.java
deleted file mode 100644
index c432d0458110166dbb54c65597cd4b3f2c64b234..0000000000000000000000000000000000000000
--- a/shell/platform/android/io/flutter/embedding/android/SplashScreen.java
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package io.flutter.embedding.android;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.os.Bundle;
-import android.view.View;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-/**
- * Splash screen configuration for a given Flutter experience.
- *
- * <p>Implementations provide a visual representation of a splash screen in {@link
- * #createSplashView(Context, Bundle)}, and implement a transition from the splash UI to Flutter's
- * UI in {@link #transitionToFlutter(Runnable)}.
- *
- * <p>Please use the new Splash screen API available on Android S. On lower versions of Android,
- * it's no longer necessary to display a splash screen to wait for the Flutter first frame.
- *
- * @deprecated
- */
-@Deprecated
-public interface SplashScreen {
-  /**
-   * Creates a {@code View} to be displayed as a splash screen before Flutter renders its first
-   * frame.
-   *
-   * <p>This method can be called at any time, and may be called multiple times depending on Android
-   * configuration changes that require recreation of a view hierarchy. Implementers that provide a
-   * stateful splash view, such as one with animations, should take care to migrate that animation
-   * state from the previously returned splash view to the newly created splash view.
-   *
-   * @param context The current context. e.g. The activity.
-   * @param savedInstanceState If the activity is being re-initialized after previously being shut
-   *     down then this Bundle contains the data it most recently supplied in {@code
-   *     onSaveInstanceState(Bundle)}.
-   * @return The splash screen view.
-   */
-  @Nullable
-  View createSplashView(@NonNull Context context, @Nullable Bundle savedInstanceState);
-
-  /**
-   * Invoked by Flutter when Flutter has rendered its first frame, and would like the {@code
-   * splashView} to disappear.
-   *
-   * <p>The provided {@code onTransitionComplete} callback must be invoked when the splash {@code
-   * View} has finished transitioning itself away. The splash {@code View} will be removed and
-   * destroyed when the callback is invoked.
-   *
-   * @param onTransitionComplete The callback after the transition has completed.
-   */
-  void transitionToFlutter(@NonNull Runnable onTransitionComplete);
-
-  /**
-   * Returns {@code true} if the splash {@code View} built by this {@code SplashScreen} remembers
-   * its transition progress across configuration changes by saving that progress to {@code View}
-   * state. Returns {@code false} otherwise.
-   *
-   * <p>The typical return value for this method is {@code false}. When the return value is {@code
-   * false}, the following can happen:
-   *
-   * <ol>
-   *   <li>Splash {@code View} begins transitioning to the Flutter UI.
-   *   <li>A configuration change occurs, like an orientation change, and the {@code Activity} is
-   *       re-created, along with the {@code View} hierarchy.
-   *   <li>The remainder of the splash transition is skipped and the Flutter UI is displayed.
-   * </ol>
-   *
-   * In the vast majority of cases, skipping a little bit of the splash transition should be
-   * acceptable. Most users will never experience such a situation, and those that do are unlikely
-   * to notice the visual artifact. However, a workaround is available for those developers who need
-   * it.
-   *
-   * <p>Returning {@code true} from this method will cause the given splash {@code View} to be
-   * displayed in the {@code View} hierarchy, even if Flutter has already rendered its first frame.
-   * It is then the responsibility of the splash {@code View} to remember its previous transition
-   * progress, restart any animations, and then trigger its completion callback when appropriate. It
-   * is also the responsibility of the splash {@code View} to immediately invoke the completion
-   * callback if it has already completed its transition. By meeting these requirements, and
-   * returning {@code true} from this method, the splash screen experience will be completely
-   * seamless, including configuration changes.
-   *
-   * @return True if the given splash {@code View} should be displayed in the {@code View}
-   *     hierarchy.
-   */
-  // We suppress NewApi because the CI linter thinks that "default" methods are unsupported.
-  @SuppressLint("NewApi")
-  default boolean doesSplashViewRememberItsTransition() {
-    return false;
-  }
-
-  /**
-   * Returns whatever state is necessary to restore a splash {@code View} after destruction and
-   * recreation, e.g., orientation change.
-   *
-   * @return Bundle used to restore a splash screen state.
-   */
-  // We suppress NewApi because the CI linter thinks that "default" methods are unsupported.
-  @SuppressLint("NewApi")
-  @Nullable
-  default Bundle saveSplashScreenState() {
-    return null;
-  }
-}
diff --git a/shell/platform/android/io/flutter/embedding/android/SplashScreenProvider.java b/shell/platform/android/io/flutter/embedding/android/SplashScreenProvider.java
deleted file mode 100644
index f048c9f8c9eaef60344ee9b1a9ae548b48311942..0000000000000000000000000000000000000000
--- a/shell/platform/android/io/flutter/embedding/android/SplashScreenProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package io.flutter.embedding.android;
-
-import androidx.annotation.Nullable;
-
-/**
- * Provides a {@link SplashScreen} to display while Flutter initializes and renders its first frame.
- *
- * <p>Flutter now automatically keeps the Android launch screen displayed until Flutter has drawn
- * the first frame, and thus, there is no longer a need to provide an implementation of this
- * interface.
- *
- * @deprecated
- */
-@Deprecated
-public interface SplashScreenProvider {
-  /**
-   * Provides a {@link SplashScreen} to display while Flutter initializes and renders its first
-   * frame.
-   *
-   * @return The splash screen.
-   */
-  @Nullable
-  SplashScreen provideSplashScreen();
-}
diff --git a/shell/platform/android/io/flutter/embedding/engine/FlutterEngine.java b/shell/platform/android/io/flutter/embedding/engine/FlutterEngine.java
index 8fb3bf2a6a37cc7f5dfbf2fc42299f52609fb8f8..4c80b90a603f73871c48dedd90bb0ef7718ec7ff 100644
--- a/shell/platform/android/io/flutter/embedding/engine/FlutterEngine.java
+++ b/shell/platform/android/io/flutter/embedding/engine/FlutterEngine.java
@@ -9,6 +9,7 @@ import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.AssetManager;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import io.flutter.FlutterInjector;
 import io.flutter.Log;
 import io.flutter.embedding.engine.dart.DartExecutor;
@@ -24,12 +25,14 @@ import io.flutter.embedding.engine.plugins.util.GeneratedPluginRegister;
 import io.flutter.embedding.engine.renderer.FlutterRenderer;
 import io.flutter.embedding.engine.renderer.RenderSurface;
 import io.flutter.embedding.engine.systemchannels.AccessibilityChannel;
+import io.flutter.embedding.engine.systemchannels.BackGestureChannel;
 import io.flutter.embedding.engine.systemchannels.DeferredComponentChannel;
 import io.flutter.embedding.engine.systemchannels.LifecycleChannel;
 import io.flutter.embedding.engine.systemchannels.LocalizationChannel;
 import io.flutter.embedding.engine.systemchannels.MouseCursorChannel;
 import io.flutter.embedding.engine.systemchannels.NavigationChannel;
 import io.flutter.embedding.engine.systemchannels.PlatformChannel;
+import io.flutter.embedding.engine.systemchannels.ProcessTextChannel;
 import io.flutter.embedding.engine.systemchannels.RestorationChannel;
 import io.flutter.embedding.engine.systemchannels.SettingsChannel;
 import io.flutter.embedding.engine.systemchannels.SpellCheckChannel;
@@ -37,6 +40,8 @@ import io.flutter.embedding.engine.systemchannels.SystemChannel;
 import io.flutter.embedding.engine.systemchannels.TextInputChannel;
 import io.flutter.plugin.localization.LocalizationPlugin;
 import io.flutter.plugin.platform.PlatformViewsController;
+import io.flutter.plugin.text.ProcessTextPlugin;
+import io.flutter.util.ViewUtils;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -75,7 +80,7 @@ import java.util.Set;
  * {@link DartExecutor} is run. Each Isolate is a self-contained Dart environment and cannot
  * communicate with each other except via Isolate ports.
  */
-public class FlutterEngine {
+public class FlutterEngine implements ViewUtils.DisplayUpdater {
   private static final String TAG = "FlutterEngine";
 
   @NonNull private final FlutterJNI flutterJNI;
@@ -91,8 +96,10 @@ public class FlutterEngine {
   @NonNull private final LocalizationChannel localizationChannel;
   @NonNull private final MouseCursorChannel mouseCursorChannel;
   @NonNull private final NavigationChannel navigationChannel;
+  @NonNull private final BackGestureChannel backGestureChannel;
   @NonNull private final RestorationChannel restorationChannel;
   @NonNull private final PlatformChannel platformChannel;
+  @NonNull private final ProcessTextChannel processTextChannel;
   @NonNull private final SettingsChannel settingsChannel;
   @NonNull private final SpellCheckChannel spellCheckChannel;
   @NonNull private final SystemChannel systemChannel;
@@ -279,6 +286,27 @@ public class FlutterEngine {
       @Nullable String[] dartVmArgs,
       boolean automaticallyRegisterPlugins,
       boolean waitForRestorationData) {
+    this(
+        context,
+        flutterLoader,
+        flutterJNI,
+        platformViewsController,
+        dartVmArgs,
+        automaticallyRegisterPlugins,
+        waitForRestorationData,
+        null);
+  }
+
+  @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
+  public FlutterEngine(
+      @NonNull Context context,
+      @Nullable FlutterLoader flutterLoader,
+      @NonNull FlutterJNI flutterJNI,
+      @NonNull PlatformViewsController platformViewsController,
+      @Nullable String[] dartVmArgs,
+      boolean automaticallyRegisterPlugins,
+      boolean waitForRestorationData,
+      @Nullable FlutterEngineGroup group) {
     AssetManager assetManager;
     try {
       assetManager = context.createPackageContext(context.getPackageName(), 0).getAssets();
@@ -305,7 +333,9 @@ public class FlutterEngine {
     localizationChannel = new LocalizationChannel(dartExecutor);
     mouseCursorChannel = new MouseCursorChannel(dartExecutor);
     navigationChannel = new NavigationChannel(dartExecutor);
+    backGestureChannel = new BackGestureChannel(dartExecutor);
     platformChannel = new PlatformChannel(dartExecutor);
+    processTextChannel = new ProcessTextChannel(dartExecutor, context.getPackageManager());
     restorationChannel = new RestorationChannel(dartExecutor, waitForRestorationData);
     settingsChannel = new SettingsChannel(dartExecutor);
     spellCheckChannel = new SpellCheckChannel(dartExecutor);
@@ -347,7 +377,8 @@ public class FlutterEngine {
     this.platformViewsController.onAttachedToJNI();
 
     this.pluginRegistry =
-        new FlutterEngineConnectionRegistry(context.getApplicationContext(), this, flutterLoader);
+        new FlutterEngineConnectionRegistry(
+            context.getApplicationContext(), this, flutterLoader, group);
 
     localizationPlugin.sendLocalesToFlutter(context.getResources().getConfiguration());
 
@@ -356,6 +387,11 @@ public class FlutterEngine {
     if (automaticallyRegisterPlugins && flutterLoader.automaticallyRegisterPlugins()) {
       GeneratedPluginRegister.registerGeneratedPlugins(this);
     }
+
+    ViewUtils.calculateMaximumDisplayMetrics(context, this);
+
+    ProcessTextPlugin processTextPlugin = new ProcessTextPlugin(this.getProcessTextChannel());
+    this.pluginRegistry.add(processTextPlugin);
   }
 
   private void attachToJni() {
@@ -508,6 +544,12 @@ public class FlutterEngine {
     return navigationChannel;
   }
 
+  /** System channel that sends back gesture commands from Android to Flutter. */
+  @NonNull
+  public BackGestureChannel getBackGestureChannel() {
+    return backGestureChannel;
+  }
+
   /**
    * System channel that sends platform-oriented requests and information to Flutter, e.g., requests
    * to play sounds, requests for haptics, system chrome settings, etc.
@@ -517,6 +559,12 @@ public class FlutterEngine {
     return platformChannel;
   }
 
+  /** System channel that sends text processing requests from Flutter to Android. */
+  @NonNull
+  public ProcessTextChannel getProcessTextChannel() {
+    return processTextChannel;
+  }
+
   /**
    * System channel to exchange restoration data between framework and engine.
    *
@@ -622,4 +670,9 @@ public class FlutterEngine {
      */
     void onEngineWillDestroy();
   }
+
+  @Override
+  public void updateDisplayMetrics(float width, float height, float density) {
+    flutterJNI.updateDisplayMetrics(0 /* display ID */, width, height, density);
+  }
 }
diff --git a/shell/platform/android/io/flutter/embedding/engine/FlutterEngineConnectionRegistry.java b/shell/platform/android/io/flutter/embedding/engine/FlutterEngineConnectionRegistry.java
index 80aab73e04959844cd861d96f593b4bfc0235b95..c0e269f19a346f68c4de4c14bf8358aa71463770 100644
--- a/shell/platform/android/io/flutter/embedding/engine/FlutterEngineConnectionRegistry.java
+++ b/shell/platform/android/io/flutter/embedding/engine/FlutterEngineConnectionRegistry.java
@@ -97,7 +97,8 @@ import java.util.Set;
   FlutterEngineConnectionRegistry(
       @NonNull Context appContext,
       @NonNull FlutterEngine flutterEngine,
-      @NonNull FlutterLoader flutterLoader) {
+      @NonNull FlutterLoader flutterLoader,
+      @Nullable FlutterEngineGroup group) {
     this.flutterEngine = flutterEngine;
     pluginBinding =
         new FlutterPlugin.FlutterPluginBinding(
@@ -106,7 +107,8 @@ import java.util.Set;
             flutterEngine.getDartExecutor(),
             flutterEngine.getRenderer(),
             flutterEngine.getPlatformViewsController().getRegistry(),
-            new DefaultFlutterAssets(flutterLoader));
+            new DefaultFlutterAssets(flutterLoader),
+            group);
   }
 
   public void destroy() {
@@ -123,8 +125,9 @@ import java.util.Set;
 
   @Override
   public void add(@NonNull FlutterPlugin plugin) {
-    TraceSection.begin("FlutterEngineConnectionRegistry#add " + plugin.getClass().getSimpleName());
-    try {
+    try (TraceSection e =
+        TraceSection.scoped(
+            "FlutterEngineConnectionRegistry#add " + plugin.getClass().getSimpleName())) {
       if (has(plugin.getClass())) {
         Log.w(
             TAG,
@@ -190,8 +193,6 @@ import java.util.Set;
           contentProviderAware.onAttachedToContentProvider(contentProviderPluginBinding);
         }
       }
-    } finally {
-      TraceSection.end();
     }
   }
 
@@ -219,8 +220,9 @@ import java.util.Set;
       return;
     }
 
-    TraceSection.begin("FlutterEngineConnectionRegistry#remove " + pluginClass.getSimpleName());
-    try {
+    try (TraceSection e =
+        TraceSection.scoped(
+            "FlutterEngineConnectionRegistry#remove " + pluginClass.getSimpleName())) {
       // For ActivityAware plugins, notify the plugin that it is detached from
       // an Activity if an Activity is currently attached to this engine. Then
       // remove the plugin from our set of ActivityAware plugins.
@@ -269,8 +271,6 @@ import java.util.Set;
       // it from our set of generic plugins.
       plugin.onDetachedFromEngine(pluginBinding);
       plugins.remove(pluginClass);
-    } finally {
-      TraceSection.end();
     }
   }
 
@@ -313,8 +313,7 @@ import java.util.Set;
   @Override
   public void attachToActivity(
       @NonNull ExclusiveAppComponent<Activity> exclusiveActivity, @NonNull Lifecycle lifecycle) {
-    TraceSection.begin("FlutterEngineConnectionRegistry#attachToActivity");
-    try {
+    try (TraceSection e = TraceSection.scoped("FlutterEngineConnectionRegistry#attachToActivity")) {
       if (this.exclusiveActivity != null) {
         this.exclusiveActivity.detachFromFlutterEngine();
       }
@@ -322,8 +321,6 @@ import java.util.Set;
       detachFromAppComponent();
       this.exclusiveActivity = exclusiveActivity;
       attachToActivityInternal(exclusiveActivity.getAppComponent(), lifecycle);
-    } finally {
-      TraceSection.end();
     }
   }
 
@@ -359,8 +356,9 @@ import java.util.Set;
   @Override
   public void detachFromActivityForConfigChanges() {
     if (isAttachedToActivity()) {
-      TraceSection.begin("FlutterEngineConnectionRegistry#detachFromActivityForConfigChanges");
-      try {
+      try (TraceSection e =
+          TraceSection.scoped(
+              "FlutterEngineConnectionRegistry#detachFromActivityForConfigChanges")) {
         isWaitingForActivityReattachment = true;
 
         for (ActivityAware activityAware : activityAwarePlugins.values()) {
@@ -368,8 +366,6 @@ import java.util.Set;
         }
 
         detachFromActivityInternal();
-      } finally {
-        TraceSection.end();
       }
     } else {
       Log.e(TAG, "Attempted to detach plugins from an Activity when no Activity was attached.");
@@ -379,15 +375,13 @@ import java.util.Set;
   @Override
   public void detachFromActivity() {
     if (isAttachedToActivity()) {
-      TraceSection.begin("FlutterEngineConnectionRegistry#detachFromActivity");
-      try {
+      try (TraceSection e =
+          TraceSection.scoped("FlutterEngineConnectionRegistry#detachFromActivity")) {
         for (ActivityAware activityAware : activityAwarePlugins.values()) {
           activityAware.onDetachedFromActivity();
         }
 
         detachFromActivityInternal();
-      } finally {
-        TraceSection.end();
       }
     } else {
       Log.e(TAG, "Attempted to detach plugins from an Activity when no Activity was attached.");
@@ -406,12 +400,10 @@ import java.util.Set;
   public boolean onRequestPermissionsResult(
       int requestCode, @NonNull String[] permissions, @NonNull int[] grantResult) {
     if (isAttachedToActivity()) {
-      TraceSection.begin("FlutterEngineConnectionRegistry#onRequestPermissionsResult");
-      try {
+      try (TraceSection e =
+          TraceSection.scoped("FlutterEngineConnectionRegistry#onRequestPermissionsResult")) {
         return activityPluginBinding.onRequestPermissionsResult(
             requestCode, permissions, grantResult);
-      } finally {
-        TraceSection.end();
       }
     } else {
       Log.e(
@@ -425,11 +417,9 @@ import java.util.Set;
   @Override
   public boolean onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
     if (isAttachedToActivity()) {
-      TraceSection.begin("FlutterEngineConnectionRegistry#onActivityResult");
-      try {
+      try (TraceSection e =
+          TraceSection.scoped("FlutterEngineConnectionRegistry#onActivityResult")) {
         return activityPluginBinding.onActivityResult(requestCode, resultCode, data);
-      } finally {
-        TraceSection.end();
       }
     } else {
       Log.e(
@@ -443,11 +433,8 @@ import java.util.Set;
   @Override
   public void onNewIntent(@NonNull Intent intent) {
     if (isAttachedToActivity()) {
-      TraceSection.begin("FlutterEngineConnectionRegistry#onNewIntent");
-      try {
+      try (TraceSection e = TraceSection.scoped("FlutterEngineConnectionRegistry#onNewIntent")) {
         activityPluginBinding.onNewIntent(intent);
-      } finally {
-        TraceSection.end();
       }
     } else {
       Log.e(
@@ -460,11 +447,9 @@ import java.util.Set;
   @Override
   public void onUserLeaveHint() {
     if (isAttachedToActivity()) {
-      TraceSection.begin("FlutterEngineConnectionRegistry#onUserLeaveHint");
-      try {
+      try (TraceSection e =
+          TraceSection.scoped("FlutterEngineConnectionRegistry#onUserLeaveHint")) {
         activityPluginBinding.onUserLeaveHint();
-      } finally {
-        TraceSection.end();
       }
     } else {
       Log.e(
@@ -477,11 +462,9 @@ import java.util.Set;
   @Override
   public void onSaveInstanceState(@NonNull Bundle bundle) {
     if (isAttachedToActivity()) {
-      TraceSection.begin("FlutterEngineConnectionRegistry#onSaveInstanceState");
-      try {
+      try (TraceSection e =
+          TraceSection.scoped("FlutterEngineConnectionRegistry#onSaveInstanceState")) {
         activityPluginBinding.onSaveInstanceState(bundle);
-      } finally {
-        TraceSection.end();
       }
     } else {
       Log.e(
@@ -494,11 +477,9 @@ import java.util.Set;
   @Override
   public void onRestoreInstanceState(@Nullable Bundle bundle) {
     if (isAttachedToActivity()) {
-      TraceSection.begin("FlutterEngineConnectionRegistry#onRestoreInstanceState");
-      try {
+      try (TraceSection e =
+          TraceSection.scoped("FlutterEngineConnectionRegistry#onRestoreInstanceState")) {
         activityPluginBinding.onRestoreInstanceState(bundle);
-      } finally {
-        TraceSection.end();
       }
     } else {
       Log.e(
@@ -517,8 +498,7 @@ import java.util.Set;
   @Override
   public void attachToService(
       @NonNull Service service, @Nullable Lifecycle lifecycle, boolean isForeground) {
-    TraceSection.begin("FlutterEngineConnectionRegistry#attachToService");
-    try {
+    try (TraceSection e = TraceSection.scoped("FlutterEngineConnectionRegistry#attachToService")) {
       // If we were already attached to an Android component, detach from it.
       detachFromAppComponent();
 
@@ -529,16 +509,14 @@ import java.util.Set;
       for (ServiceAware serviceAware : serviceAwarePlugins.values()) {
         serviceAware.onAttachedToService(servicePluginBinding);
       }
-    } finally {
-      TraceSection.end();
     }
   }
 
   @Override
   public void detachFromService() {
     if (isAttachedToService()) {
-      TraceSection.begin("FlutterEngineConnectionRegistry#detachFromService");
-      try {
+      try (TraceSection e =
+          TraceSection.scoped("FlutterEngineConnectionRegistry#detachFromService")) {
         // Notify all ServiceAware plugins that they are no longer attached to a Service.
         for (ServiceAware serviceAware : serviceAwarePlugins.values()) {
           serviceAware.onDetachedFromService();
@@ -546,8 +524,6 @@ import java.util.Set;
 
         service = null;
         servicePluginBinding = null;
-      } finally {
-        TraceSection.end();
       }
     } else {
       Log.e(TAG, "Attempted to detach plugins from a Service when no Service was attached.");
@@ -557,11 +533,9 @@ import java.util.Set;
   @Override
   public void onMoveToForeground() {
     if (isAttachedToService()) {
-      TraceSection.begin("FlutterEngineConnectionRegistry#onMoveToForeground");
-      try {
+      try (TraceSection e =
+          TraceSection.scoped("FlutterEngineConnectionRegistry#onMoveToForeground")) {
         servicePluginBinding.onMoveToForeground();
-      } finally {
-        TraceSection.end();
       }
     }
   }
@@ -569,12 +543,9 @@ import java.util.Set;
   @Override
   public void onMoveToBackground() {
     if (isAttachedToService()) {
-      TraceSection.begin("FlutterEngineConnectionRegistry#onMoveToBackground");
-      ;
-      try {
+      try (TraceSection e =
+          TraceSection.scoped("FlutterEngineConnectionRegistry#onMoveToBackground")) {
         servicePluginBinding.onMoveToBackground();
-      } finally {
-        TraceSection.end();
       }
     }
   }
@@ -588,8 +559,8 @@ import java.util.Set;
   @Override
   public void attachToBroadcastReceiver(
       @NonNull BroadcastReceiver broadcastReceiver, @NonNull Lifecycle lifecycle) {
-    TraceSection.begin("FlutterEngineConnectionRegistry#attachToBroadcastReceiver");
-    try {
+    try (TraceSection e =
+        TraceSection.scoped("FlutterEngineConnectionRegistry#attachToBroadcastReceiver")) {
       // If we were already attached to an Android component, detach from it.
       detachFromAppComponent();
 
@@ -604,24 +575,20 @@ import java.util.Set;
       for (BroadcastReceiverAware broadcastReceiverAware : broadcastReceiverAwarePlugins.values()) {
         broadcastReceiverAware.onAttachedToBroadcastReceiver(broadcastReceiverPluginBinding);
       }
-    } finally {
-      TraceSection.end();
     }
   }
 
   @Override
   public void detachFromBroadcastReceiver() {
     if (isAttachedToBroadcastReceiver()) {
-      TraceSection.begin("FlutterEngineConnectionRegistry#detachFromBroadcastReceiver");
-      try {
+      try (TraceSection e =
+          TraceSection.scoped("FlutterEngineConnectionRegistry#detachFromBroadcastReceiver")) {
         // Notify all BroadcastReceiverAware plugins that they are no longer attached to a
         // BroadcastReceiver.
         for (BroadcastReceiverAware broadcastReceiverAware :
             broadcastReceiverAwarePlugins.values()) {
           broadcastReceiverAware.onDetachedFromBroadcastReceiver();
         }
-      } finally {
-        TraceSection.end();
       }
     } else {
       Log.e(
@@ -641,8 +608,8 @@ import java.util.Set;
   public void attachToContentProvider(
       @NonNull ContentProvider contentProvider, @NonNull Lifecycle lifecycle) {
 
-    TraceSection.begin("FlutterEngineConnectionRegistry#attachToContentProvider");
-    try {
+    try (TraceSection e =
+        TraceSection.scoped("FlutterEngineConnectionRegistry#attachToContentProvider")) {
       // If we were already attached to an Android component, detach from it.
       detachFromAppComponent();
 
@@ -657,23 +624,19 @@ import java.util.Set;
       for (ContentProviderAware contentProviderAware : contentProviderAwarePlugins.values()) {
         contentProviderAware.onAttachedToContentProvider(contentProviderPluginBinding);
       }
-    } finally {
-      TraceSection.end();
     }
   }
 
   @Override
   public void detachFromContentProvider() {
     if (isAttachedToContentProvider()) {
-      TraceSection.begin("FlutterEngineConnectionRegistry#detachFromContentProvider");
-      try {
+      try (TraceSection e =
+          TraceSection.scoped("FlutterEngineConnectionRegistry#detachFromContentProvider")) {
         // Notify all ContentProviderAware plugins that they are no longer attached to a
         // ContentProvider.
         for (ContentProviderAware contentProviderAware : contentProviderAwarePlugins.values()) {
           contentProviderAware.onDetachedFromContentProvider();
         }
-      } finally {
-        TraceSection.end();
       }
     } else {
       Log.e(
@@ -730,6 +693,10 @@ import java.util.Set;
     private final Set<io.flutter.plugin.common.PluginRegistry.UserLeaveHintListener>
         onUserLeaveHintListeners = new HashSet<>();
 
+    @NonNull
+    private final Set<io.flutter.plugin.common.PluginRegistry.WindowFocusChangedListener>
+        onWindowFocusChangedListeners = new HashSet<>();
+
     @NonNull
     private final Set<OnSaveInstanceStateListener> onSaveInstanceStateListeners = new HashSet<>();
 
@@ -845,6 +812,25 @@ import java.util.Set;
       onUserLeaveHintListeners.remove(listener);
     }
 
+    @Override
+    public void addOnWindowFocusChangedListener(
+        @NonNull io.flutter.plugin.common.PluginRegistry.WindowFocusChangedListener listener) {
+      onWindowFocusChangedListeners.add(listener);
+    }
+
+    @Override
+    public void removeOnWindowFocusChangedListener(
+        @NonNull io.flutter.plugin.common.PluginRegistry.WindowFocusChangedListener listener) {
+      onWindowFocusChangedListeners.remove(listener);
+    }
+
+    void onWindowFocusChanged(boolean hasFocus) {
+      for (io.flutter.plugin.common.PluginRegistry.WindowFocusChangedListener listener :
+          onWindowFocusChangedListeners) {
+        listener.onWindowFocusChanged(hasFocus);
+      }
+    }
+
     @Override
     public void addOnSaveStateListener(@NonNull OnSaveInstanceStateListener listener) {
       onSaveInstanceStateListeners.add(listener);
diff --git a/shell/platform/android/io/flutter/embedding/engine/FlutterEngineGroup.java b/shell/platform/android/io/flutter/embedding/engine/FlutterEngineGroup.java
index fc9a95c2dd7bf1ab476c52b30409cf036b7736a6..c45210f4f1063a50b003e5ee7dc29518bebf0b17 100644
--- a/shell/platform/android/io/flutter/embedding/engine/FlutterEngineGroup.java
+++ b/shell/platform/android/io/flutter/embedding/engine/FlutterEngineGroup.java
@@ -210,7 +210,8 @@ public class FlutterEngineGroup {
         platformViewsController, // PlatformViewsController.
         null, // String[]. The Dart VM has already started, this arguments will have no effect.
         automaticallyRegisterPlugins, // boolean.
-        waitForRestorationData); // boolean.
+        waitForRestorationData, // boolean.
+        this);
   }
 
   /** Options that control how a FlutterEngine should be created. */
diff --git a/shell/platform/android/io/flutter/embedding/engine/FlutterEngineGroupCache.java b/shell/platform/android/io/flutter/embedding/engine/FlutterEngineGroupCache.java
new file mode 100644
index 0000000000000000000000000000000000000000..620794e97b0a1b05e2e2c7a1232384f014858427
--- /dev/null
+++ b/shell/platform/android/io/flutter/embedding/engine/FlutterEngineGroupCache.java
@@ -0,0 +1,100 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.embedding.engine;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Static singleton cache that holds {@link io.flutter.embedding.engine.FlutterEngineGroup}
+ * instances identified by {@code String}s.
+ *
+ * <p>The ID of a given {@link io.flutter.embedding.engine.FlutterEngineGroup} can be whatever
+ * {@code String} is desired.
+ *
+ * <p>{@link io.flutter.embedding.android.FlutterActivity} and {@link
+ * io.flutter.embedding.android.FlutterFragment} use the {@code FlutterEngineGroupCache} singleton
+ * internally when instructed to use a cached {@link io.flutter.embedding.engine.FlutterEngineGroup}
+ * based on a given ID. See {@link
+ * io.flutter.embedding.android.FlutterActivity.NewEngineInGroupIntentBuilder} and {@link
+ * io.flutter.embedding.android.FlutterFragment#withNewEngineInGroup(String)} for related APIs.
+ */
+public class FlutterEngineGroupCache {
+  private static volatile FlutterEngineGroupCache instance;
+
+  /**
+   * Returns the static singleton instance of {@code FlutterEngineGroupCache}.
+   *
+   * <p>Creates a new instance if one does not yet exist.
+   */
+  @NonNull
+  public static FlutterEngineGroupCache getInstance() {
+    if (instance == null) {
+      synchronized (FlutterEngineGroupCache.class) {
+        if (instance == null) {
+          instance = new FlutterEngineGroupCache();
+        }
+      }
+    }
+    return instance;
+  }
+
+  private final Map<String, FlutterEngineGroup> cachedEngineGroups = new HashMap<>();
+
+  @VisibleForTesting
+  /* package */ FlutterEngineGroupCache() {}
+
+  /**
+   * Returns {@code true} if a {@link io.flutter.embedding.engine.FlutterEngineGroup} in this cache
+   * is associated with the given {@code engineGroupId}.
+   */
+  public boolean contains(@NonNull String engineGroupId) {
+    return cachedEngineGroups.containsKey(engineGroupId);
+  }
+
+  /**
+   * Returns the {@link io.flutter.embedding.engine.FlutterEngineGroup} in this cache that is
+   * associated with the given {@code engineGroupId}, or {@code null} is no such {@link
+   * io.flutter.embedding.engine.FlutterEngineGroup} exists.
+   */
+  @Nullable
+  public FlutterEngineGroup get(@NonNull String engineGroupId) {
+    return cachedEngineGroups.get(engineGroupId);
+  }
+
+  /**
+   * Places the given {@link io.flutter.embedding.engine.FlutterEngineGroup} in this cache and
+   * associates it with the given {@code engineGroupId}.
+   *
+   * <p>If a {@link io.flutter.embedding.engine.FlutterEngineGroup} is null, that {@link
+   * io.flutter.embedding.engine.FlutterEngineGroup} is removed from this cache.
+   */
+  public void put(@NonNull String engineGroupId, @Nullable FlutterEngineGroup engineGroup) {
+    if (engineGroup != null) {
+      cachedEngineGroups.put(engineGroupId, engineGroup);
+    } else {
+      cachedEngineGroups.remove(engineGroupId);
+    }
+  }
+
+  /**
+   * Removes any {@link io.flutter.embedding.engine.FlutterEngineGroup} that is currently in the
+   * cache that is identified by the given {@code engineGroupId}.
+   */
+  public void remove(@NonNull String engineGroupId) {
+    put(engineGroupId, null);
+  }
+
+  /**
+   * Removes all {@link io.flutter.embedding.engine.FlutterEngineGroup}'s that are currently in the
+   * cache.
+   */
+  public void clear() {
+    cachedEngineGroups.clear();
+  }
+}
diff --git a/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java b/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java
index 799ad214b3601d676b50e7f8a5cf482de4b50ca6..e24953bd8ee1bf8ba53f58ca1d9b1f954331bca3 100644
--- a/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java
+++ b/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java
@@ -4,6 +4,8 @@
 
 package io.flutter.embedding.engine;
 
+import static io.flutter.Build.API_LEVELS;
+
 import android.content.Context;
 import android.content.res.AssetManager;
 import android.graphics.Bitmap;
@@ -12,7 +14,9 @@ import android.graphics.ImageDecoder;
 import android.graphics.SurfaceTexture;
 import android.os.Build;
 import android.os.Looper;
+import android.util.DisplayMetrics;
 import android.util.Size;
+import android.util.TypedValue;
 import android.view.Surface;
 import android.view.SurfaceHolder;
 import androidx.annotation.Keep;
@@ -27,12 +31,14 @@ import io.flutter.embedding.engine.deferredcomponents.DeferredComponentManager;
 import io.flutter.embedding.engine.mutatorsstack.FlutterMutatorsStack;
 import io.flutter.embedding.engine.renderer.FlutterUiDisplayListener;
 import io.flutter.embedding.engine.renderer.SurfaceTextureWrapper;
+import io.flutter.embedding.engine.systemchannels.SettingsChannel;
 import io.flutter.plugin.common.StandardMessageCodec;
 import io.flutter.plugin.localization.LocalizationPlugin;
 import io.flutter.plugin.platform.PlatformViewsController;
 import io.flutter.util.Preconditions;
 import io.flutter.view.AccessibilityBridge;
 import io.flutter.view.FlutterCallbackInformation;
+import io.flutter.view.TextureRegistry;
 import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.nio.ByteBuffer;
@@ -147,9 +153,10 @@ public class FlutterJNI {
   private static native void nativePrefetchDefaultFontManager();
 
   /**
-   * Prefetch the default font manager provided by SkFontMgr::RefDefault() which is a process-wide
-   * singleton owned by Skia. Note that, the first call to SkFontMgr::RefDefault() will take
-   * noticeable time, but later calls will return a reference to the preexisting font manager.
+   * Prefetch the default font manager provided by txt::GetDefaultFontManager() which is a
+   * process-wide singleton owned by Skia. Note that, the first call to txt::GetDefaultFontManager()
+   * will take noticeable time, but later calls will return a reference to the preexisting font
+   * manager.
    *
    * <p>This method should only be called once across all FlutterJNI instances.
    */
@@ -214,8 +221,12 @@ public class FlutterJNI {
    */
   private static float refreshRateFPS = 60.0f;
 
+  private static float displayWidth = -1.0f;
+  private static float displayHeight = -1.0f;
+  private static float displayDensity = -1.0f;
+
   // This is set from native code via JNI.
-  @Nullable private static String observatoryUri;
+  @Nullable private static String vmServiceUri;
 
   private native boolean nativeGetIsSoftwareRenderingEnabled();
 
@@ -230,14 +241,28 @@ public class FlutterJNI {
   }
 
   /**
-   * Observatory URI for the VM instance.
+   * VM Service URI for the VM instance.
+   *
+   * <p>Its value is set by the native engine once {@link #init(Context, String[], String, String,
+   * String, long)} is run.
+   */
+  @Nullable
+  public static String getVMServiceUri() {
+    return vmServiceUri;
+  }
+
+  /**
+   * VM Service URI for the VM instance.
    *
    * <p>Its value is set by the native engine once {@link #init(Context, String[], String, String,
    * String, long)} is run.
+   *
+   * @deprecated replaced by {@link #getVMServiceUri()}.
    */
+  @Deprecated
   @Nullable
   public static String getObservatoryUri() {
-    return observatoryUri;
+    return vmServiceUri;
   }
 
   /**
@@ -260,6 +285,18 @@ public class FlutterJNI {
     updateRefreshRate();
   }
 
+  public void updateDisplayMetrics(int displayId, float width, float height, float density) {
+    FlutterJNI.displayWidth = width;
+    FlutterJNI.displayHeight = height;
+    FlutterJNI.displayDensity = density;
+    if (!FlutterJNI.loadLibraryCalled) {
+      return;
+    }
+    nativeUpdateDisplayMetrics(nativeShellHolderId);
+  }
+
+  private native void nativeUpdateDisplayMetrics(long nativeShellHolderId);
+
   public void updateRefreshRate() {
     if (!FlutterJNI.loadLibraryCalled) {
       return;
@@ -518,7 +555,7 @@ public class FlutterJNI {
   @VisibleForTesting
   @Nullable
   public static Bitmap decodeImage(@NonNull ByteBuffer buffer, long imageGeneratorAddress) {
-    if (Build.VERSION.SDK_INT >= 28) {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_28) {
       ImageDecoder.Source source = ImageDecoder.createSource(buffer);
       try {
         return ImageDecoder.decodeBitmap(
@@ -706,6 +743,7 @@ public class FlutterJNI {
       int[] displayFeaturesBounds,
       int[] displayFeaturesType,
       int[] displayFeaturesState);
+
   // ----- End Render Surface Support -----
 
   // ------ Start Touch Interaction Support ---
@@ -787,13 +825,13 @@ public class FlutterJNI {
   }
 
   /** Sends a semantics action to Flutter's engine, without any additional arguments. */
-  public void dispatchSemanticsAction(int id, @NonNull AccessibilityBridge.Action action) {
-    dispatchSemanticsAction(id, action, null);
+  public void dispatchSemanticsAction(int nodeId, @NonNull AccessibilityBridge.Action action) {
+    dispatchSemanticsAction(nodeId, action, null);
   }
 
   /** Sends a semantics action to Flutter's engine, with additional arguments. */
   public void dispatchSemanticsAction(
-      int id, @NonNull AccessibilityBridge.Action action, @Nullable Object args) {
+      int nodeId, @NonNull AccessibilityBridge.Action action, @Nullable Object args) {
     ensureAttachedToNative();
 
     ByteBuffer encodedArgs = null;
@@ -802,7 +840,7 @@ public class FlutterJNI {
       encodedArgs = StandardMessageCodec.INSTANCE.encodeMessage(args);
       position = encodedArgs.position();
     }
-    dispatchSemanticsAction(id, action.value, encodedArgs, position);
+    dispatchSemanticsAction(nodeId, action.value, encodedArgs, position);
   }
 
   /**
@@ -815,14 +853,18 @@ public class FlutterJNI {
    */
   @UiThread
   public void dispatchSemanticsAction(
-      int id, int action, @Nullable ByteBuffer args, int argsPosition) {
+      int nodeId, int action, @Nullable ByteBuffer args, int argsPosition) {
     ensureRunningOnMainThread();
     ensureAttachedToNative();
-    nativeDispatchSemanticsAction(nativeShellHolderId, id, action, args, argsPosition);
+    nativeDispatchSemanticsAction(nativeShellHolderId, nodeId, action, args, argsPosition);
   }
 
   private native void nativeDispatchSemanticsAction(
-      long nativeShellHolderId, int id, int action, @Nullable ByteBuffer args, int argsPosition);
+      long nativeShellHolderId,
+      int nodeId,
+      int action,
+      @Nullable ByteBuffer args,
+      int argsPosition);
 
   /**
    * Instructs Flutter to enable/disable its semantics tree, which is used by Flutter to support
@@ -867,6 +909,27 @@ public class FlutterJNI {
       long textureId,
       @NonNull WeakReference<SurfaceTextureWrapper> textureWrapper);
 
+  /**
+   * Registers a ImageTexture with the given id.
+   *
+   * <p>REQUIRED: Callers should eventually unregisterTexture with the same id.
+   */
+  @UiThread
+  public void registerImageTexture(
+      long textureId, @NonNull TextureRegistry.ImageConsumer imageTexture) {
+    ensureRunningOnMainThread();
+    ensureAttachedToNative();
+    nativeRegisterImageTexture(
+        nativeShellHolderId,
+        textureId,
+        new WeakReference<TextureRegistry.ImageConsumer>(imageTexture));
+  }
+
+  private native void nativeRegisterImageTexture(
+      long nativeShellHolderId,
+      long textureId,
+      @NonNull WeakReference<TextureRegistry.ImageConsumer> imageTexture);
+
   /**
    * Call this method to inform Flutter that a texture previously registered with {@link
    * #registerTexture(long, SurfaceTextureWrapper)} has a new frame available.
@@ -883,6 +946,16 @@ public class FlutterJNI {
 
   private native void nativeMarkTextureFrameAvailable(long nativeShellHolderId, long textureId);
 
+  /** Schedule the engine to draw a frame but does not invalidate the layout tree. */
+  @UiThread
+  public void scheduleFrame() {
+    ensureRunningOnMainThread();
+    ensureAttachedToNative();
+    nativeScheduleFrame(nativeShellHolderId);
+  }
+
+  private native void nativeScheduleFrame(long nativeShellHolderId);
+
   /**
    * Unregisters a texture that was registered with {@link #registerTexture(long,
    * SurfaceTextureWrapper)}.
@@ -1213,22 +1286,17 @@ public class FlutterJNI {
       String countryCode = strings[i + 1];
       String scriptCode = strings[i + 2];
       // Convert to Locales via LocaleBuilder if available (API 21+) to include scriptCode.
-      if (Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
-        Locale.Builder localeBuilder = new Locale.Builder();
-        if (!languageCode.isEmpty()) {
-          localeBuilder.setLanguage(languageCode);
-        }
-        if (!countryCode.isEmpty()) {
-          localeBuilder.setRegion(countryCode);
-        }
-        if (!scriptCode.isEmpty()) {
-          localeBuilder.setScript(scriptCode);
-        }
-        supportedLocales.add(localeBuilder.build());
-      } else {
-        // Pre-API 21, we fall back on scriptCode-less locales.
-        supportedLocales.add(new Locale(languageCode, countryCode));
+      Locale.Builder localeBuilder = new Locale.Builder();
+      if (!languageCode.isEmpty()) {
+        localeBuilder.setLanguage(languageCode);
       }
+      if (!countryCode.isEmpty()) {
+        localeBuilder.setRegion(countryCode);
+      }
+      if (!scriptCode.isEmpty()) {
+        localeBuilder.setScript(scriptCode);
+      }
+      supportedLocales.add(localeBuilder.build());
     }
 
     Locale result = localizationPlugin.resolveNativeLocale(supportedLocales);
@@ -1239,15 +1307,25 @@ public class FlutterJNI {
     String[] output = new String[localeDataLength];
     output[0] = result.getLanguage();
     output[1] = result.getCountry();
-    if (Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
-      output[2] = result.getScript();
-    } else {
-      output[2] = "";
-    }
+    output[2] = result.getScript();
     return output;
   }
 
   // ----- End Localization Support ----
+  @Nullable
+  public float getScaledFontSize(float fontSize, int configurationId) {
+    final DisplayMetrics metrics = SettingsChannel.getPastDisplayMetrics(configurationId);
+    if (metrics == null) {
+      Log.e(
+          TAG,
+          "getScaledFontSize called with configurationId "
+              + String.valueOf(configurationId)
+              + ", which can't be found.");
+      return -1f;
+    }
+    return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, fontSize, metrics)
+        / metrics.density;
+  }
 
   // ----- Start Deferred Components Support ----
 
diff --git a/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java b/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java
index 83c522421ce4169c92f3daa738ae51f6c118998b..b3775217a86fe8ff7d3bea4931885ca2b0ddfa00 100644
--- a/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java
+++ b/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java
@@ -42,8 +42,12 @@ public class FlutterShellArgs {
   public static final String ARG_TRACE_SKIA_ALLOWLIST = "--trace-skia-allowlist=";
   public static final String ARG_KEY_TRACE_SYSTRACE = "trace-systrace";
   public static final String ARG_TRACE_SYSTRACE = "--trace-systrace";
+  public static final String ARG_KEY_TRACE_TO_FILE = "trace-to-file";
+  public static final String ARG_TRACE_TO_FILE = "--trace-to-file";
   public static final String ARG_KEY_ENABLE_IMPELLER = "enable-impeller";
   public static final String ARG_ENABLE_IMPELLER = "--enable-impeller";
+  public static final String ARG_KEY_ENABLE_VULKAN_VALIDATION = "enable-vulkan-validation";
+  public static final String ARG_ENABLE_VULKAN_VALIDATION = "--enable-vulkan-validation";
   public static final String ARG_KEY_DUMP_SHADER_SKP_ON_SHADER_COMPILATION =
       "dump-skp-on-shader-compilation";
   public static final String ARG_DUMP_SHADER_SKP_ON_SHADER_COMPILATION =
@@ -54,8 +58,11 @@ public class FlutterShellArgs {
   public static final String ARG_PURGE_PERSISTENT_CACHE = "--purge-persistent-cache";
   public static final String ARG_KEY_VERBOSE_LOGGING = "verbose-logging";
   public static final String ARG_VERBOSE_LOGGING = "--verbose-logging";
+  public static final String ARG_KEY_VM_SERVICE_PORT = "vm-service-port";
+  public static final String ARG_VM_SERVICE_PORT = "--vm-service-port=";
+  // TODO(bkonyi): remove once flutter_tools no longer uses this option.
+  // See https://github.com/dart-lang/sdk/issues/50233
   public static final String ARG_KEY_OBSERVATORY_PORT = "observatory-port";
-  public static final String ARG_OBSERVATORY_PORT = "--observatory-port=";
   public static final String ARG_KEY_DART_FLAGS = "dart-flags";
   public static final String ARG_DART_FLAGS = "--dart-flags";
   public static final String ARG_KEY_MSAA_SAMPLES = "msaa-samples";
@@ -76,9 +83,16 @@ public class FlutterShellArgs {
     if (intent.getBooleanExtra(ARG_KEY_START_PAUSED, false)) {
       args.add(ARG_START_PAUSED);
     }
-    final int observatoryPort = intent.getIntExtra(ARG_KEY_OBSERVATORY_PORT, 0);
-    if (observatoryPort > 0) {
-      args.add(ARG_OBSERVATORY_PORT + Integer.toString(observatoryPort));
+    int vmServicePort = intent.getIntExtra(ARG_KEY_VM_SERVICE_PORT, 0);
+    if (vmServicePort > 0) {
+      args.add(ARG_VM_SERVICE_PORT + Integer.toString(vmServicePort));
+    } else {
+      // TODO(bkonyi): remove once flutter_tools no longer uses this option.
+      // See https://github.com/dart-lang/sdk/issues/50233
+      vmServicePort = intent.getIntExtra(ARG_KEY_OBSERVATORY_PORT, 0);
+      if (vmServicePort > 0) {
+        args.add(ARG_VM_SERVICE_PORT + Integer.toString(vmServicePort));
+      }
     }
     if (intent.getBooleanExtra(ARG_KEY_DISABLE_SERVICE_AUTH_CODES, false)) {
       args.add(ARG_DISABLE_SERVICE_AUTH_CODES);
@@ -108,9 +122,15 @@ public class FlutterShellArgs {
     if (intent.getBooleanExtra(ARG_KEY_TRACE_SYSTRACE, false)) {
       args.add(ARG_TRACE_SYSTRACE);
     }
+    if (intent.hasExtra(ARG_KEY_TRACE_TO_FILE)) {
+      args.add(ARG_TRACE_TO_FILE + "=" + intent.getStringExtra(ARG_KEY_TRACE_TO_FILE));
+    }
     if (intent.getBooleanExtra(ARG_KEY_ENABLE_IMPELLER, false)) {
       args.add(ARG_ENABLE_IMPELLER);
     }
+    if (intent.getBooleanExtra(ARG_KEY_ENABLE_VULKAN_VALIDATION, false)) {
+      args.add(ARG_ENABLE_VULKAN_VALIDATION);
+    }
     if (intent.getBooleanExtra(ARG_KEY_DUMP_SHADER_SKP_ON_SHADER_COMPILATION, false)) {
       args.add(ARG_DUMP_SHADER_SKP_ON_SHADER_COMPILATION);
     }
@@ -129,7 +149,7 @@ public class FlutterShellArgs {
     }
 
     // NOTE: all flags provided with this argument are subject to filtering
-    // based on a a list of allowed flags in shell/common/switches.cc. If any
+    // based on a list of allowed flags in shell/common/switches.cc. If any
     // flag provided is not allowed, the process will immediately terminate.
     if (intent.hasExtra(ARG_KEY_DART_FLAGS)) {
       args.add(ARG_DART_FLAGS + "=" + intent.getStringExtra(ARG_KEY_DART_FLAGS));
diff --git a/shell/platform/android/io/flutter/embedding/engine/dart/DartExecutor.java b/shell/platform/android/io/flutter/embedding/engine/dart/DartExecutor.java
index e7fb3fc10d7280b8e3368ca0c722fd03f126a895..8f6b862c5a0cc6507e2a687b988506a079972b3a 100644
--- a/shell/platform/android/io/flutter/embedding/engine/dart/DartExecutor.java
+++ b/shell/platform/android/io/flutter/embedding/engine/dart/DartExecutor.java
@@ -141,8 +141,7 @@ public class DartExecutor implements BinaryMessenger {
       return;
     }
 
-    TraceSection.begin("DartExecutor#executeDartEntrypoint");
-    try {
+    try (TraceSection e = TraceSection.scoped("DartExecutor#executeDartEntrypoint")) {
       Log.v(TAG, "Executing Dart entrypoint: " + dartEntrypoint);
       flutterJNI.runBundleAndSnapshotFromLibrary(
           dartEntrypoint.pathToBundle,
@@ -152,8 +151,6 @@ public class DartExecutor implements BinaryMessenger {
           dartEntrypointArgs);
 
       isApplicationRunning = true;
-    } finally {
-      TraceSection.end();
     }
   }
 
@@ -170,8 +167,7 @@ public class DartExecutor implements BinaryMessenger {
       return;
     }
 
-    TraceSection.begin("DartExecutor#executeDartCallback");
-    try {
+    try (TraceSection e = TraceSection.scoped("DartExecutor#executeDartCallback")) {
       Log.v(TAG, "Executing Dart callback: " + dartCallback);
       flutterJNI.runBundleAndSnapshotFromLibrary(
           dartCallback.pathToBundle,
@@ -181,8 +177,6 @@ public class DartExecutor implements BinaryMessenger {
           null);
 
       isApplicationRunning = true;
-    } finally {
-      TraceSection.end();
     }
   }
 
diff --git a/shell/platform/android/io/flutter/embedding/engine/dart/DartMessenger.java b/shell/platform/android/io/flutter/embedding/engine/dart/DartMessenger.java
index 98cb37874cfc6d15b2b26dcb49f9787b3e55b728..6a7561d741bcb251b7fa657935650aeabb8dcfdd 100644
--- a/shell/platform/android/io/flutter/embedding/engine/dart/DartMessenger.java
+++ b/shell/platform/android/io/flutter/embedding/engine/dart/DartMessenger.java
@@ -269,8 +269,7 @@ class DartMessenger implements BinaryMessenger, PlatformMessageHandler {
       @NonNull String channel,
       @Nullable ByteBuffer message,
       @Nullable BinaryMessenger.BinaryReply callback) {
-    TraceSection.begin("DartMessenger#send on " + channel);
-    try {
+    try (TraceSection e = TraceSection.scoped("DartMessenger#send on " + channel)) {
       Log.v(TAG, "Sending message with callback over channel '" + channel + "'");
       int replyId = nextReplyId++;
       if (callback != null) {
@@ -281,8 +280,6 @@ class DartMessenger implements BinaryMessenger, PlatformMessageHandler {
       } else {
         flutterJNI.dispatchPlatformMessage(channel, message, message.position(), replyId);
       }
-    } finally {
-      TraceSection.end();
     }
   }
 
@@ -317,8 +314,8 @@ class DartMessenger implements BinaryMessenger, PlatformMessageHandler {
     Runnable myRunnable =
         () -> {
           TraceSection.endAsyncSection("PlatformChannel ScheduleHandler on " + channel, replyId);
-          TraceSection.begin("DartMessenger#handleMessageFromDart on " + channel);
-          try {
+          try (TraceSection e =
+              TraceSection.scoped("DartMessenger#handleMessageFromDart on " + channel)) {
             invokeHandler(handlerInfo, message, replyId);
             if (message != null && message.isDirect()) {
               // This ensures that if a user retains an instance to the ByteBuffer and it
@@ -328,7 +325,6 @@ class DartMessenger implements BinaryMessenger, PlatformMessageHandler {
           } finally {
             // This is deleting the data underneath the message object.
             flutterJNI.cleanupMessageData(messageData);
-            TraceSection.end();
           }
         };
     final DartMessengerTaskQueue nonnullTaskQueue =
diff --git a/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/DeferredComponentManager.java b/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/DeferredComponentManager.java
index f537622b31a69f8c226949a363c029c64894c3f0..e505feb8541ae5e8068244cce1c7e886a6b17c9e 100644
--- a/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/DeferredComponentManager.java
+++ b/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/DeferredComponentManager.java
@@ -114,12 +114,12 @@ public interface DeferredComponentManager {
    *     negative loadingUnitId is passed, then componentName must not be null. Passing a
    *     loadingUnitId larger than the highest valid loading unit's id will cause the Dart
    *     loadLibrary() to complete with a failure.
-   * @param componentName The deferred component component name as defined in bundle_config.yaml.
-   *     This may be null if the deferred component to be loaded is associated with a loading
-   *     unit/deferred dart library. In this case, it is this method's responsibility to map the
-   *     loadingUnitId to its corresponding componentName. When loading asset-only or other deferred
-   *     components without an associated Dart deferred library, loading unit id should a negative
-   *     value and componentName must be non-null.
+   * @param componentName The deferred component name as defined in bundle_config.yaml. This may be
+   *     null if the deferred component to be loaded is associated with a loading unit/deferred dart
+   *     library. In this case, it is this method's responsibility to map the loadingUnitId to its
+   *     corresponding componentName. When loading asset-only or other deferred components without
+   *     an associated Dart deferred library, loading unit id should a negative value and
+   *     componentName must be non-null.
    */
   public abstract void installDeferredComponent(int loadingUnitId, String componentName);
 
diff --git a/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/PlayStoreDeferredComponentManager.java b/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/PlayStoreDeferredComponentManager.java
index 989566872de04898c861436b6fe57c695726ff51..c1eb7ce9a0dc38f0a6237324c8181b285d3230aa 100644
--- a/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/PlayStoreDeferredComponentManager.java
+++ b/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/PlayStoreDeferredComponentManager.java
@@ -330,17 +330,17 @@ public class PlayStoreDeferredComponentManager implements DeferredComponentManag
                 case SplitInstallErrorCode.NETWORK_ERROR:
                   flutterJNI.deferredComponentInstallFailure(
                       loadingUnitId,
-                      String.format(
-                          "Install of deferred component module \"%s\" failed with a network error",
-                          componentName),
+                      "Install of deferred component module \""
+                          + componentName
+                          + "\" failed with a network error",
                       true);
                   break;
                 case SplitInstallErrorCode.MODULE_UNAVAILABLE:
                   flutterJNI.deferredComponentInstallFailure(
                       loadingUnitId,
-                      String.format(
-                          "Install of deferred component module \"%s\" failed as it is unavailable",
-                          componentName),
+                      "Install of deferred component module \""
+                          + componentName
+                          + "\" failed as it is unavailable",
                       false);
                   break;
                 default:
@@ -412,12 +412,7 @@ public class PlayStoreDeferredComponentManager implements DeferredComponentManag
     }
 
     // Possible values: armeabi, armeabi-v7a, arm64-v8a, x86, x86_64, mips, mips64
-    String abi;
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      abi = Build.SUPPORTED_ABIS[0];
-    } else {
-      abi = Build.CPU_ABI;
-    }
+    String abi = Build.SUPPORTED_ABIS[0];
     String pathAbi = abi.replace("-", "_"); // abis are represented with underscores in paths.
 
     // TODO(garyq): Optimize this apk/file discovery process to use less i/o and be more
@@ -431,14 +426,12 @@ public class PlayStoreDeferredComponentManager implements DeferredComponentManag
     Queue<File> searchFiles = new LinkedList<>();
     // Downloaded modules are stored here
     searchFiles.add(context.getFilesDir());
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      // The initial installed apks are provided by `sourceDirs` in ApplicationInfo.
-      // The jniLibs we want are in the splits not the baseDir. These
-      // APKs are only searched as a fallback, as base libs generally do not need
-      // to be fully path referenced.
-      for (String path : context.getApplicationInfo().splitSourceDirs) {
-        searchFiles.add(new File(path));
-      }
+    // The initial installed apks are provided by `sourceDirs` in ApplicationInfo.
+    // The jniLibs we want are in the splits not the baseDir. These
+    // APKs are only searched as a fallback, as base libs generally do not need
+    // to be fully path referenced.
+    for (String path : context.getApplicationInfo().splitSourceDirs) {
+      searchFiles.add(new File(path));
     }
 
     while (!searchFiles.isEmpty()) {
diff --git a/shell/platform/android/io/flutter/embedding/engine/loader/FlutterLoader.java b/shell/platform/android/io/flutter/embedding/engine/loader/FlutterLoader.java
index b09be89e4b57f4c9f18badb9c1bbb512bf1deaa4..5e800e80f327aa7c2cf6748432549e9bda9b5ae2 100644
--- a/shell/platform/android/io/flutter/embedding/engine/loader/FlutterLoader.java
+++ b/shell/platform/android/io/flutter/embedding/engine/loader/FlutterLoader.java
@@ -4,6 +4,8 @@
 
 package io.flutter.embedding.engine.loader;
 
+import static io.flutter.Build.API_LEVELS;
+
 import android.app.ActivityManager;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
@@ -16,7 +18,6 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.SystemClock;
 import android.util.DisplayMetrics;
-import android.view.WindowManager;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import io.flutter.BuildConfig;
@@ -39,10 +40,16 @@ public class FlutterLoader {
 
   private static final String OLD_GEN_HEAP_SIZE_META_DATA_KEY =
       "io.flutter.embedding.android.OldGenHeapSize";
-  private static final String ENABLE_SKPARAGRAPH_META_DATA_KEY =
-      "io.flutter.embedding.android.EnableSkParagraph";
   private static final String ENABLE_IMPELLER_META_DATA_KEY =
       "io.flutter.embedding.android.EnableImpeller";
+  private static final String ENABLE_VULKAN_VALIDATION_META_DATA_KEY =
+      "io.flutter.embedding.android.EnableVulkanValidation";
+  private static final String IMPELLER_BACKEND_META_DATA_KEY =
+      "io.flutter.embedding.android.ImpellerBackend";
+  private static final String IMPELLER_OPENGL_GPU_TRACING_DATA_KEY =
+      "io.flutter.embedding.android.EnableOpenGLGPUTracing";
+  private static final String IMPELLER_VULKAN_GPU_TRACING_DATA_KEY =
+      "io.flutter.embedding.android.EnableVulkanGPUTracing";
 
   /**
    * Set whether leave or clean up the VM after the last shell shuts down. It can be set from app's
@@ -153,8 +160,7 @@ public class FlutterLoader {
       throw new IllegalStateException("startInitialization must be called on the main thread");
     }
 
-    TraceSection.begin("FlutterLoader#startInitialization");
-    try {
+    try (TraceSection e = TraceSection.scoped("FlutterLoader#startInitialization")) {
       // Ensure that the context is actually the application context.
       final Context appContext = applicationContext.getApplicationContext();
 
@@ -163,18 +169,9 @@ public class FlutterLoader {
       initStartTimestampMillis = SystemClock.uptimeMillis();
       flutterApplicationInfo = ApplicationInfoLoader.load(appContext);
 
-      VsyncWaiter waiter;
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 /* 17 */) {
-        final DisplayManager dm =
-            (DisplayManager) appContext.getSystemService(Context.DISPLAY_SERVICE);
-        waiter = VsyncWaiter.getInstance(dm, flutterJNI);
-      } else {
-        float fps =
-            ((WindowManager) appContext.getSystemService(Context.WINDOW_SERVICE))
-                .getDefaultDisplay()
-                .getRefreshRate();
-        waiter = VsyncWaiter.getInstance(fps, flutterJNI);
-      }
+      final DisplayManager dm =
+          (DisplayManager) appContext.getSystemService(Context.DISPLAY_SERVICE);
+      VsyncWaiter waiter = VsyncWaiter.getInstance(dm, flutterJNI);
       waiter.init();
 
       // Use a background thread for initialization tasks that require disk access.
@@ -182,11 +179,43 @@ public class FlutterLoader {
           new Callable<InitResult>() {
             @Override
             public InitResult call() {
-              TraceSection.begin("FlutterLoader initTask");
-              try {
+              try (TraceSection e = TraceSection.scoped("FlutterLoader initTask")) {
                 ResourceExtractor resourceExtractor = initResources(appContext);
 
-                flutterJNI.loadLibrary();
+                try {
+                  flutterJNI.loadLibrary();
+                } catch (UnsatisfiedLinkError unsatisfiedLinkError) {
+                  String couldntFindVersion = "couldn't find \"libflutter.so\"";
+                  String notFoundVersion = "dlopen failed: library \"libflutter.so\" not found";
+
+                  if (unsatisfiedLinkError.toString().contains(couldntFindVersion)
+                      || unsatisfiedLinkError.toString().contains(notFoundVersion)) {
+                    // To gather more information for
+                    // https://github.com/flutter/flutter/issues/144291,
+                    // log the contents of the native libraries directory as well as the
+                    // cpu architecture.
+
+                    String cpuArch = System.getProperty("os.arch");
+                    File nativeLibsDir = new File(flutterApplicationInfo.nativeLibraryDir);
+                    String[] nativeLibsContents = nativeLibsDir.list();
+
+                    throw new UnsupportedOperationException(
+                        "Could not load libflutter.so this is possibly because the application"
+                            + " is running on an architecture that Flutter Android does not support (e.g. x86)"
+                            + " see https://docs.flutter.dev/deployment/android#what-are-the-supported-target-architectures"
+                            + " for more detail.\n"
+                            + "App is using cpu architecture: "
+                            + cpuArch
+                            + ", and the native libraries directory (with path "
+                            + nativeLibsDir.getAbsolutePath()
+                            + ") contains the following files: "
+                            + Arrays.toString(nativeLibsContents),
+                        unsatisfiedLinkError);
+                  }
+
+                  throw unsatisfiedLinkError;
+                }
+
                 flutterJNI.updateRefreshRate();
 
                 // Prefetch the default font manager as soon as possible on a background thread.
@@ -201,17 +230,20 @@ public class FlutterLoader {
                     PathUtils.getFilesDir(appContext),
                     PathUtils.getCacheDirectory(appContext),
                     PathUtils.getDataDirectory(appContext));
-              } finally {
-                TraceSection.end();
               }
             }
           };
       initResultFuture = executorService.submit(initTask);
-    } finally {
-      TraceSection.end();
     }
   }
 
+  private static boolean areValidationLayersOnByDefault() {
+    if (BuildConfig.DEBUG && Build.VERSION.SDK_INT >= API_LEVELS.API_26) {
+      return Build.SUPPORTED_ABIS[0].equals("arm64-v8a");
+    }
+    return false;
+  }
+
   /**
    * Blocks until initialization of the native system has completed.
    *
@@ -234,8 +266,7 @@ public class FlutterLoader {
           "ensureInitializationComplete must be called after startInitialization");
     }
 
-    TraceSection.begin("FlutterLoader#ensureInitializationComplete");
-    try {
+    try (TraceSection e = TraceSection.scoped("FlutterLoader#ensureInitializationComplete")) {
       InitResult result = initResultFuture.get();
 
       List<String> shellArgs = new ArrayList<>();
@@ -318,12 +349,24 @@ public class FlutterLoader {
 
       shellArgs.add("--prefetched-default-font-manager");
 
-      boolean enableSkParagraph =
-          metaData == null || metaData.getBoolean(ENABLE_SKPARAGRAPH_META_DATA_KEY, true);
-      shellArgs.add("--enable-skparagraph=" + enableSkParagraph);
-
-      if (metaData != null && metaData.getBoolean(ENABLE_IMPELLER_META_DATA_KEY, false)) {
-        shellArgs.add("--enable-impeller");
+      if (metaData != null) {
+        if (metaData.getBoolean(ENABLE_IMPELLER_META_DATA_KEY, false)) {
+          shellArgs.add("--enable-impeller");
+        }
+        if (metaData.getBoolean(
+            ENABLE_VULKAN_VALIDATION_META_DATA_KEY, areValidationLayersOnByDefault())) {
+          shellArgs.add("--enable-vulkan-validation");
+        }
+        if (metaData.getBoolean(IMPELLER_OPENGL_GPU_TRACING_DATA_KEY, false)) {
+          shellArgs.add("--enable-opengl-gpu-tracing");
+        }
+        if (metaData.getBoolean(IMPELLER_VULKAN_GPU_TRACING_DATA_KEY, false)) {
+          shellArgs.add("--enable-vulkan-gpu-tracing");
+        }
+        String backend = metaData.getString(IMPELLER_BACKEND_META_DATA_KEY);
+        if (backend != null) {
+          shellArgs.add("--impeller-backend=" + backend);
+        }
       }
 
       final String leakVM = isLeakVM(metaData) ? "true" : "false";
@@ -343,8 +386,6 @@ public class FlutterLoader {
     } catch (Exception e) {
       Log.e(TAG, "Flutter initialization failed.", e);
       throw new RuntimeException(e);
-    } finally {
-      TraceSection.end();
     }
   }
 
diff --git a/shell/platform/android/io/flutter/embedding/engine/loader/ResourceExtractor.java b/shell/platform/android/io/flutter/embedding/engine/loader/ResourceExtractor.java
index a0b7382edf3da09fa0cd22faf1657f0657b15214..13b153fff78004817bbd87c34349008c004f06a5 100644
--- a/shell/platform/android/io/flutter/embedding/engine/loader/ResourceExtractor.java
+++ b/shell/platform/android/io/flutter/embedding/engine/loader/ResourceExtractor.java
@@ -4,7 +4,7 @@
 
 package io.flutter.embedding.engine.loader;
 
-import static java.util.Arrays.asList;
+import static io.flutter.Build.API_LEVELS;
 
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
@@ -16,7 +16,6 @@ import androidx.annotation.WorkerThread;
 import io.flutter.BuildConfig;
 import io.flutter.Log;
 import java.io.*;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.concurrent.CancellationException;
@@ -26,12 +25,12 @@ import java.util.concurrent.ExecutionException;
 class ResourceExtractor {
   private static final String TAG = "ResourceExtractor";
   private static final String TIMESTAMP_PREFIX = "res_timestamp-";
-  private static final String[] SUPPORTED_ABIS = getSupportedAbis();
+  private static final String[] SUPPORTED_ABIS = Build.SUPPORTED_ABIS;
 
   @SuppressWarnings("deprecation")
   static long getVersionCode(@NonNull PackageInfo packageInfo) {
     // Linter needs P (28) hardcoded or else it will fail these lines.
-    if (Build.VERSION.SDK_INT >= 28) {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_28) {
       return packageInfo.getLongVersionCode();
     } else {
       return packageInfo.versionCode;
@@ -249,15 +248,4 @@ class ResourceExtractor {
       out.write(buf, 0, i);
     }
   }
-
-  @SuppressWarnings("deprecation")
-  private static String[] getSupportedAbis() {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      return Build.SUPPORTED_ABIS;
-    } else {
-      ArrayList<String> cpuAbis = new ArrayList<String>(asList(Build.CPU_ABI, Build.CPU_ABI2));
-      cpuAbis.removeAll(asList(null, ""));
-      return cpuAbis.toArray(new String[0]);
-    }
-  }
 }
diff --git a/shell/platform/android/io/flutter/embedding/engine/mutatorsstack/FlutterMutatorView.java b/shell/platform/android/io/flutter/embedding/engine/mutatorsstack/FlutterMutatorView.java
index c195b28728e9bec20ad812e84852a43cbd095616..b6eaa3d434725861b2a986a11956e819f800f90e 100644
--- a/shell/platform/android/io/flutter/embedding/engine/mutatorsstack/FlutterMutatorView.java
+++ b/shell/platform/android/io/flutter/embedding/engine/mutatorsstack/FlutterMutatorView.java
@@ -3,7 +3,6 @@ package io.flutter.embedding.engine.mutatorsstack;
 import static android.view.View.OnFocusChangeListener;
 
 import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Matrix;
@@ -23,7 +22,6 @@ import io.flutter.util.ViewUtils;
  * A view that applies the {@link io.flutter.embedding.engine.mutatorsstack.FlutterMutatorsStack} to
  * its children.
  */
-@TargetApi(19)
 public class FlutterMutatorView extends FrameLayout {
   private FlutterMutatorsStack mutatorsStack;
   private float screenDensity;
diff --git a/shell/platform/android/io/flutter/embedding/engine/plugins/FlutterPlugin.java b/shell/platform/android/io/flutter/embedding/engine/plugins/FlutterPlugin.java
index c9ed009a44ef181364bb045cb21ed6900bef292c..055126f0ff3c761cd7ab3309225ce7349e2944fb 100644
--- a/shell/platform/android/io/flutter/embedding/engine/plugins/FlutterPlugin.java
+++ b/shell/platform/android/io/flutter/embedding/engine/plugins/FlutterPlugin.java
@@ -6,8 +6,10 @@ package io.flutter.embedding.engine.plugins;
 
 import android.content.Context;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.lifecycle.Lifecycle;
 import io.flutter.embedding.engine.FlutterEngine;
+import io.flutter.embedding.engine.FlutterEngineGroup;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.platform.PlatformViewRegistry;
 import io.flutter.view.TextureRegistry;
@@ -107,6 +109,7 @@ public interface FlutterPlugin {
     private final TextureRegistry textureRegistry;
     private final PlatformViewRegistry platformViewRegistry;
     private final FlutterAssets flutterAssets;
+    private final FlutterEngineGroup group;
 
     public FlutterPluginBinding(
         @NonNull Context applicationContext,
@@ -114,13 +117,15 @@ public interface FlutterPlugin {
         @NonNull BinaryMessenger binaryMessenger,
         @NonNull TextureRegistry textureRegistry,
         @NonNull PlatformViewRegistry platformViewRegistry,
-        @NonNull FlutterAssets flutterAssets) {
+        @NonNull FlutterAssets flutterAssets,
+        @Nullable FlutterEngineGroup group) {
       this.applicationContext = applicationContext;
       this.flutterEngine = flutterEngine;
       this.binaryMessenger = binaryMessenger;
       this.textureRegistry = textureRegistry;
       this.platformViewRegistry = platformViewRegistry;
       this.flutterAssets = flutterAssets;
+      this.group = group;
     }
 
     @NonNull
@@ -157,6 +162,21 @@ public interface FlutterPlugin {
     public FlutterAssets getFlutterAssets() {
       return flutterAssets;
     }
+
+    /**
+     * Accessor for the {@link FlutterEngineGroup} used to create the {@link FlutterEngine} for the
+     * app.
+     *
+     * <p>This is useful in the rare case that a plugin has to spawn its own engine (for example,
+     * running an engine the background). The result is nullable since old versions of Flutter and
+     * custom setups may not have used a {@link FlutterEngineGroup}. Failing to use this when it is
+     * available will result in suboptimal performance and odd behaviors related to Dart isolate
+     * groups.
+     */
+    @Nullable
+    public FlutterEngineGroup getEngineGroup() {
+      return group;
+    }
   }
 
   /** Provides Flutter plugins with access to Flutter asset information. */
diff --git a/shell/platform/android/io/flutter/embedding/engine/plugins/activity/ActivityPluginBinding.java b/shell/platform/android/io/flutter/embedding/engine/plugins/activity/ActivityPluginBinding.java
index fc2deca721061408a26354d9653b182addd0ef76..8c5f84b453c8ae71a318abd8446b13c34b7d4886 100644
--- a/shell/platform/android/io/flutter/embedding/engine/plugins/activity/ActivityPluginBinding.java
+++ b/shell/platform/android/io/flutter/embedding/engine/plugins/activity/ActivityPluginBinding.java
@@ -91,6 +91,19 @@ public interface ActivityPluginBinding {
    */
   void removeOnUserLeaveHintListener(@NonNull PluginRegistry.UserLeaveHintListener listener);
 
+  /**
+   * Adds a listener that is invoked whenever the associated {@link android.app.Activity}'s {@code
+   * onWindowFocusChanged()} method is invoked.
+   */
+  void addOnWindowFocusChangedListener(@NonNull PluginRegistry.WindowFocusChangedListener listener);
+
+  /**
+   * Removes a listener that was added in {@link
+   * #addOnWindowFocusChangedListener(PluginRegistry.WindowFocusChangedListener)}.
+   */
+  void removeOnWindowFocusChangedListener(
+      @NonNull PluginRegistry.WindowFocusChangedListener listener);
+
   /**
    * Adds a listener that is invoked when the associated {@code Activity} or {@code Fragment} saves
    * and restores instance state.
diff --git a/shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimPluginRegistry.java b/shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimPluginRegistry.java
index b5db78ab35dd027aa4c696aa5c2e746698325f7d..ed41d1d65f3079a6413a8caa7b7812d68e37e1e4 100644
--- a/shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimPluginRegistry.java
+++ b/shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimPluginRegistry.java
@@ -25,7 +25,8 @@ import java.util.Set;
  *
  * <pre>
  * // Create the FlutterEngine that will back the Flutter UI.
- * FlutterEngine flutterEngine = new FlutterEngine(context);
+ * FlutterEngineGroup group = new FlutterEngineGroup(context);
+ * FlutterEngine flutterEngine = group.createAndRunDefaultEngine(context);
  *
  * // Create a ShimPluginRegistry and wrap the FlutterEngine with the shim.
  * ShimPluginRegistry shimPluginRegistry = new ShimPluginRegistry(flutterEngine, platformViewsController);
diff --git a/shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimRegistrar.java b/shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimRegistrar.java
index 9c40d0a016f2119cf916346b826117f7af432057..d27da01dae04b440e0f64147057c9efada5a109f 100644
--- a/shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimRegistrar.java
+++ b/shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimRegistrar.java
@@ -39,6 +39,8 @@ class ShimRegistrar implements PluginRegistry.Registrar, FlutterPlugin, Activity
       new HashSet<>();
   private final Set<PluginRegistry.NewIntentListener> newIntentListeners = new HashSet<>();
   private final Set<PluginRegistry.UserLeaveHintListener> userLeaveHintListeners = new HashSet<>();
+  private final Set<PluginRegistry.WindowFocusChangedListener> WindowFocusChangedListeners =
+      new HashSet<>();
   private FlutterPlugin.FlutterPluginBinding pluginBinding;
   private ActivityPluginBinding activityPluginBinding;
 
@@ -146,6 +148,18 @@ class ShimRegistrar implements PluginRegistry.Registrar, FlutterPlugin, Activity
     return this;
   }
 
+  @Override
+  public PluginRegistry.Registrar addWindowFocusChangedListener(
+      PluginRegistry.WindowFocusChangedListener listener) {
+    WindowFocusChangedListeners.add(listener);
+
+    if (activityPluginBinding != null) {
+      activityPluginBinding.addOnWindowFocusChangedListener(listener);
+    }
+
+    return this;
+  }
+
   @Override
   @NonNull
   public PluginRegistry.Registrar addViewDestroyListener(
@@ -213,5 +227,8 @@ class ShimRegistrar implements PluginRegistry.Registrar, FlutterPlugin, Activity
     for (PluginRegistry.UserLeaveHintListener listener : userLeaveHintListeners) {
       activityPluginBinding.addOnUserLeaveHintListener(listener);
     }
+    for (PluginRegistry.WindowFocusChangedListener listener : WindowFocusChangedListeners) {
+      activityPluginBinding.addOnWindowFocusChangedListener(listener);
+    }
   }
 }
diff --git a/shell/platform/android/io/flutter/embedding/engine/plugins/util/GeneratedPluginRegister.java b/shell/platform/android/io/flutter/embedding/engine/plugins/util/GeneratedPluginRegister.java
index 18316811d9974e74ae924a2af9c3064b39b41391..e9637f6d14d7f6bd270388a53d3bc4d2195e7e75 100644
--- a/shell/platform/android/io/flutter/embedding/engine/plugins/util/GeneratedPluginRegister.java
+++ b/shell/platform/android/io/flutter/embedding/engine/plugins/util/GeneratedPluginRegister.java
@@ -15,10 +15,10 @@ public class GeneratedPluginRegister {
    * Registers all plugins that an app lists in its pubspec.yaml.
    *
    * <p>In order to allow each plugin to listen to calls from Dart via Platform Channels, each
-   * plugin is given a chance to initialize and setup Platform Channel listeners in {@link
+   * plugin is given a chance to initialize and set up Platform Channel listeners in {@link
    * io.flutter.embedding.engine.plugins.FlutterPlugin#onAttachedToEngine(io.flutter.embedding.engine.plugins.FlutterPlugin.FlutterPluginBinding)}.
    *
-   * <p>The list of plugins that need to be setup is not known to the Flutter engine. The Flutter
+   * <p>The list of plugins that need to be set up is not known to the Flutter engine. The Flutter
    * tools generates it at build time based on the plugin dependencies specified in the Flutter
    * project's pubspec.yaml.
    *
diff --git a/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java b/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java
index 0d09e03f91619bc1358884bff2a5408742745fa1..ee1f633275b4649d9f689295ab60c426f47412ed 100644
--- a/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java
+++ b/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java
@@ -4,21 +4,35 @@
 
 package io.flutter.embedding.engine.renderer;
 
+import static io.flutter.Build.API_LEVELS;
+
+import android.annotation.TargetApi;
+import android.content.ComponentCallbacks2;
 import android.graphics.Bitmap;
+import android.graphics.ImageFormat;
 import android.graphics.Rect;
 import android.graphics.SurfaceTexture;
+import android.hardware.HardwareBuffer;
+import android.hardware.SyncFence;
+import android.media.Image;
+import android.media.ImageReader;
 import android.os.Build;
 import android.os.Handler;
+import android.os.Looper;
 import android.view.Surface;
+import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import io.flutter.Log;
 import io.flutter.embedding.engine.FlutterJNI;
 import io.flutter.view.TextureRegistry;
+import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.nio.ByteBuffer;
+import java.util.ArrayDeque;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -39,13 +53,23 @@ import java.util.concurrent.atomic.AtomicLong;
  * io.flutter.embedding.android.FlutterTextureView} are implementations of {@link RenderSurface}.
  */
 public class FlutterRenderer implements TextureRegistry {
+  /**
+   * Whether to always use GL textures for {@link FlutterRenderer#createSurfaceProducer()}.
+   *
+   * <p>This is a debug-only API intended for local development. For example, when using a newer
+   * Android device (that normally would use {@link ImageReaderSurfaceProducer}, but wanting to test
+   * the OpenGLES/{@link SurfaceTextureSurfaceProducer} code branch. This flag has undefined
+   * behavior if set to true while running in a Vulkan (Impeller) context.
+   */
+  @VisibleForTesting public static boolean debugForceSurfaceProducerGlTextures = false;
+
   private static final String TAG = "FlutterRenderer";
 
   @NonNull private final FlutterJNI flutterJNI;
   @NonNull private final AtomicLong nextTextureId = new AtomicLong(0L);
   @Nullable private Surface surface;
   private boolean isDisplayingFlutterUi = false;
-  private Handler handler = new Handler();
+  private final Handler handler = new Handler();
 
   @NonNull
   private final Set<WeakReference<TextureRegistry.OnTrimMemoryListener>> onTrimMemoryListeners =
@@ -132,10 +156,66 @@ public class FlutterRenderer implements TextureRegistry {
   }
 
   // ------ START TextureRegistry IMPLEMENTATION -----
+
+  /**
+   * Creates and returns a new external texture {@link SurfaceProducer} managed by the Flutter
+   * engine that is also made available to Flutter code.
+   */
+  @NonNull
+  @Override
+  public SurfaceProducer createSurfaceProducer() {
+    // Prior to Impeller, Flutter on Android *only* ran on OpenGLES (via Skia). That
+    // meant that
+    // plugins (i.e. end-users) either explicitly created a SurfaceTexture (via
+    // createX/registerX) or an ImageTexture (via createX/registerX).
+    //
+    // In an Impeller world, which for the first time uses (if available) a Vulkan
+    // rendering
+    // backend, it is no longer possible (at least not trivially) to render an
+    // OpenGLES-provided
+    // texture (SurfaceTexture) in a Vulkan context.
+    //
+    // This function picks the "best" rendering surface based on the Android
+    // runtime, and
+    // provides a consumer-agnostic SurfaceProducer (which in turn vends a Surface),
+    // and has
+    // plugins (i.e. end-users) use the Surface instead, letting us "hide" the
+    // consumer-side
+    // of the implementation.
+    //
+    // tl;dr: If ImageTexture is available, we use it, otherwise we use a
+    // SurfaceTexture.
+    // Coincidentally, if ImageTexture is available, we are also on an Android
+    // version that is
+    // running Vulkan, so we don't have to worry about it not being supported.
+    final SurfaceProducer entry;
+    if (!debugForceSurfaceProducerGlTextures && Build.VERSION.SDK_INT >= API_LEVELS.API_29) {
+      final long id = nextTextureId.getAndIncrement();
+      final ImageReaderSurfaceProducer producer = new ImageReaderSurfaceProducer(id);
+      registerImageTexture(id, producer);
+      addOnTrimMemoryListener(producer);
+      Log.v(TAG, "New ImageReaderSurfaceProducer ID: " + id);
+      entry = producer;
+    } else {
+      // TODO(matanlurey): Actually have the class named "*Producer" to well, produce
+      // something. This is a code smell, but does guarantee the paths for both
+      // createSurfaceTexture and createSurfaceProducer doesn't diverge. As we get more
+      // confident in this API and any possible bugs (and have tests to check we don't
+      // regress), reconsider this pattern.
+      final SurfaceTextureEntry texture = createSurfaceTexture();
+      final SurfaceTextureSurfaceProducer producer =
+          new SurfaceTextureSurfaceProducer(texture.id(), handler, flutterJNI, texture);
+      Log.v(TAG, "New SurfaceTextureSurfaceProducer ID: " + texture.id());
+      entry = producer;
+    }
+    return entry;
+  }
+
   /**
    * Creates and returns a new {@link SurfaceTexture} managed by the Flutter engine that is also
    * made available to Flutter code.
    */
+  @NonNull
   @Override
   public SurfaceTextureEntry createSurfaceTexture() {
     Log.v(TAG, "Creating a SurfaceTexture.");
@@ -147,17 +227,41 @@ public class FlutterRenderer implements TextureRegistry {
    * Registers and returns a {@link SurfaceTexture} managed by the Flutter engine that is also made
    * available to Flutter code.
    */
+  @NonNull
   @Override
   public SurfaceTextureEntry registerSurfaceTexture(@NonNull SurfaceTexture surfaceTexture) {
+    return registerSurfaceTexture(nextTextureId.getAndIncrement(), surfaceTexture);
+  }
+
+  /**
+   * Similar to {@link FlutterRenderer#registerSurfaceTexture} but with an existing @{code
+   * textureId}.
+   *
+   * @param surfaceTexture Surface texture to wrap.
+   * @param textureId A texture ID already created that should be assigned to the surface texture.
+   */
+  @NonNull
+  private SurfaceTextureEntry registerSurfaceTexture(
+      long textureId, @NonNull SurfaceTexture surfaceTexture) {
     surfaceTexture.detachFromGLContext();
     final SurfaceTextureRegistryEntry entry =
-        new SurfaceTextureRegistryEntry(nextTextureId.getAndIncrement(), surfaceTexture);
+        new SurfaceTextureRegistryEntry(textureId, surfaceTexture);
     Log.v(TAG, "New SurfaceTexture ID: " + entry.id());
     registerTexture(entry.id(), entry.textureWrapper());
     addOnTrimMemoryListener(entry);
     return entry;
   }
 
+  @NonNull
+  @Override
+  public ImageTextureEntry createImageTexture() {
+    final ImageTextureRegistryEntry entry =
+        new ImageTextureRegistryEntry(nextTextureId.getAndIncrement());
+    Log.v(TAG, "New ImageTextureEntry ID: " + entry.id());
+    registerImageTexture(entry.id(), entry);
+    return entry;
+  }
+
   @Override
   public void onTrimMemory(int level) {
     final Iterator<WeakReference<OnTrimMemoryListener>> iterator = onTrimMemoryListeners.iterator();
@@ -180,33 +284,38 @@ public class FlutterRenderer implements TextureRegistry {
     private boolean released;
     @Nullable private OnTrimMemoryListener trimMemoryListener;
     @Nullable private OnFrameConsumedListener frameConsumedListener;
-    private final Runnable onFrameConsumed =
-        new Runnable() {
-          @Override
-          public void run() {
-            if (frameConsumedListener != null) {
-              frameConsumedListener.onFrameConsumed();
-            }
-          }
-        };
 
     SurfaceTextureRegistryEntry(long id, @NonNull SurfaceTexture surfaceTexture) {
       this.id = id;
+      Runnable onFrameConsumed =
+          () -> {
+            if (frameConsumedListener != null) {
+              frameConsumedListener.onFrameConsumed();
+            }
+          };
       this.textureWrapper = new SurfaceTextureWrapper(surfaceTexture, onFrameConsumed);
 
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-        // The callback relies on being executed on the UI thread (unsynchronised read of
-        // mNativeView
-        // and also the engine code check for platform thread in
-        // Shell::OnPlatformViewMarkTextureFrameAvailable),
-        // so we explicitly pass a Handler for the current thread.
-        this.surfaceTexture().setOnFrameAvailableListener(onFrameListener, new Handler());
-      } else {
-        // Android documentation states that the listener can be called on an arbitrary thread.
-        // But in practice, versions of Android that predate the newer API will call the listener
-        // on the thread where the SurfaceTexture was constructed.
-        this.surfaceTexture().setOnFrameAvailableListener(onFrameListener);
-      }
+      // Even though we make sure to unregister the callback before releasing, as of
+      // Android O, SurfaceTexture has a data race when accessing the callback, so the
+      // callback may still be called by a stale reference after released==true and
+      // mNativeView==null.
+      SurfaceTexture.OnFrameAvailableListener onFrameListener =
+          texture -> {
+            if (released || !flutterJNI.isAttached()) {
+              // Even though we make sure to unregister the callback before releasing, as of
+              // Android O, SurfaceTexture has a data race when accessing the callback, so the
+              // callback may still be called by a stale reference after released==true and
+              // mNativeView==null.
+              return;
+            }
+            textureWrapper.markDirty();
+            scheduleEngineFrame();
+          };
+      // The callback relies on being executed on the UI thread (unsynchronised read of
+      // mNativeView and also the engine code check for platform thread in
+      // Shell::OnPlatformViewMarkTextureFrameAvailable), so we explicitly pass a Handler for the
+      // current thread.
+      this.surfaceTexture().setOnFrameAvailableListener(onFrameListener, new Handler());
     }
 
     @Override
@@ -216,21 +325,6 @@ public class FlutterRenderer implements TextureRegistry {
       }
     }
 
-    private SurfaceTexture.OnFrameAvailableListener onFrameListener =
-        new SurfaceTexture.OnFrameAvailableListener() {
-          @Override
-          public void onFrameAvailable(@NonNull SurfaceTexture texture) {
-            if (released || !flutterJNI.isAttached()) {
-              // Even though we make sure to unregister the callback before releasing, as of
-              // Android O, SurfaceTexture has a data race when accessing the callback, so the
-              // callback may still be called by a stale reference after released==true and
-              // mNativeView==null.
-              return;
-            }
-            markTextureFrameAvailable(id);
-          }
-        };
-
     private void removeListener() {
       removeOnTrimMemoryListener(this);
     }
@@ -270,7 +364,7 @@ public class FlutterRenderer implements TextureRegistry {
           return;
         }
 
-        handler.post(new SurfaceTextureFinalizerRunnable(id, flutterJNI));
+        handler.post(new TextureFinalizerRunnable(id, flutterJNI));
       } finally {
         super.finalize();
       }
@@ -287,11 +381,11 @@ public class FlutterRenderer implements TextureRegistry {
     }
   }
 
-  static final class SurfaceTextureFinalizerRunnable implements Runnable {
+  static final class TextureFinalizerRunnable implements Runnable {
     private final long id;
     private final FlutterJNI flutterJNI;
 
-    SurfaceTextureFinalizerRunnable(long id, @NonNull FlutterJNI flutterJNI) {
+    TextureFinalizerRunnable(long id, @NonNull FlutterJNI flutterJNI) {
       this.id = id;
       this.flutterJNI = flutterJNI;
     }
@@ -301,10 +395,623 @@ public class FlutterRenderer implements TextureRegistry {
       if (!flutterJNI.isAttached()) {
         return;
       }
-      Log.v(TAG, "Releasing a SurfaceTexture (" + id + ").");
+      Log.v(TAG, "Releasing a Texture (" + id + ").");
       flutterJNI.unregisterTexture(id);
     }
   }
+
+  // Keep a queue of ImageReaders.
+  // Each ImageReader holds acquired Images.
+  // When we acquire the next image, close any ImageReaders that don't have any
+  // more pending images.
+  @Keep
+  @TargetApi(API_LEVELS.API_29)
+  final class ImageReaderSurfaceProducer
+      implements TextureRegistry.SurfaceProducer,
+          TextureRegistry.ImageConsumer,
+          TextureRegistry.OnTrimMemoryListener {
+    private static final String TAG = "ImageReaderSurfaceProducer";
+    private static final int MAX_IMAGES = 5;
+
+    // Flip when debugging to see verbose logs.
+    private static final boolean VERBOSE_LOGS = false;
+
+    // We must always cleanup on memory pressure on Android 14 due to a bug in Android.
+    // It is safe to do on all versions so we unconditionally have this set to true.
+    private static final boolean CLEANUP_ON_MEMORY_PRESSURE = true;
+
+    private final long id;
+
+    private boolean released;
+    // Will be true in tests and on Android API < 33.
+    private boolean ignoringFence = false;
+
+    private boolean trimOnMemoryPressure = CLEANUP_ON_MEMORY_PRESSURE;
+
+    // The requested width and height are updated by setSize.
+    private int requestedWidth = 1;
+    private int requestedHeight = 1;
+    // Whenever the requested width and height change we set this to be true so we
+    // create a new ImageReader (inside getSurface) with the correct width and height.
+    // We use this flag so that we lazily create the ImageReader only when a frame
+    // will be produced at that size.
+    private boolean createNewReader = true;
+
+    // State held to track latency of various stages.
+    private long lastDequeueTime = 0;
+    private long lastQueueTime = 0;
+    private long lastScheduleTime = 0;
+    private int numTrims = 0;
+
+    private Object lock = new Object();
+    // REQUIRED: The following fields must only be accessed when lock is held.
+    private final ArrayDeque<PerImageReader> imageReaderQueue = new ArrayDeque<PerImageReader>();
+    private final HashMap<ImageReader, PerImageReader> perImageReaders =
+        new HashMap<ImageReader, PerImageReader>();
+    private PerImage lastDequeuedImage = null;
+    private PerImageReader lastReaderDequeuedFrom = null;
+
+    /** Internal class: state held per Image produced by ImageReaders. */
+    private class PerImage {
+      public final Image image;
+      public final long queuedTime;
+
+      public PerImage(Image image, long queuedTime) {
+        this.image = image;
+        this.queuedTime = queuedTime;
+      }
+    }
+
+    /** Internal class: state held per ImageReader. */
+    private class PerImageReader {
+      public final ImageReader reader;
+      private final ArrayDeque<PerImage> imageQueue = new ArrayDeque<PerImage>();
+      private boolean closed = false;
+
+      private final ImageReader.OnImageAvailableListener onImageAvailableListener =
+          reader -> {
+            Image image = null;
+            try {
+              image = reader.acquireLatestImage();
+            } catch (IllegalStateException e) {
+              Log.e(TAG, "onImageAvailable acquireLatestImage failed: " + e);
+            }
+            if (image == null) {
+              return;
+            }
+            if (released || closed) {
+              image.close();
+              return;
+            }
+            onImage(reader, image);
+          };
+
+      public PerImageReader(ImageReader reader) {
+        this.reader = reader;
+        reader.setOnImageAvailableListener(
+            onImageAvailableListener, new Handler(Looper.getMainLooper()));
+      }
+
+      PerImage queueImage(Image image) {
+        if (closed) {
+          return null;
+        }
+        PerImage perImage = new PerImage(image, System.nanoTime());
+        imageQueue.add(perImage);
+        // If we fall too far behind we will skip some frames.
+        while (imageQueue.size() > 2) {
+          PerImage r = imageQueue.removeFirst();
+          if (VERBOSE_LOGS) {
+            Log.i(TAG, "" + reader.hashCode() + " force closed image=" + r.image.hashCode());
+          }
+          r.image.close();
+        }
+        return perImage;
+      }
+
+      PerImage dequeueImage() {
+        if (imageQueue.size() == 0) {
+          return null;
+        }
+        PerImage r = imageQueue.removeFirst();
+        return r;
+      }
+
+      /** returns true if we can prune this reader */
+      boolean canPrune() {
+        return imageQueue.size() == 0 && lastReaderDequeuedFrom != this;
+      }
+
+      void close() {
+        closed = true;
+        if (VERBOSE_LOGS) {
+          Log.i(TAG, "Closing reader=" + reader.hashCode());
+        }
+        reader.close();
+        imageQueue.clear();
+      }
+    }
+
+    double deltaMillis(long deltaNanos) {
+      double ms = (double) deltaNanos / (double) 1000000.0;
+      return ms;
+    }
+
+    PerImageReader getOrCreatePerImageReader(ImageReader reader) {
+      PerImageReader r = perImageReaders.get(reader);
+      if (r == null) {
+        r = new PerImageReader(reader);
+        perImageReaders.put(reader, r);
+        imageReaderQueue.add(r);
+        if (VERBOSE_LOGS) {
+          Log.i(TAG, "imageReaderQueue#=" + imageReaderQueue.size());
+        }
+      }
+      return r;
+    }
+
+    void pruneImageReaderQueue() {
+      boolean change = false;
+      // Prune nodes from the head of the ImageReader queue.
+      while (imageReaderQueue.size() > 1) {
+        PerImageReader r = imageReaderQueue.peekFirst();
+        if (!r.canPrune()) {
+          // No more ImageReaders can be pruned this round.
+          break;
+        }
+        imageReaderQueue.removeFirst();
+        perImageReaders.remove(r.reader);
+        r.close();
+        change = true;
+      }
+      if (change && VERBOSE_LOGS) {
+        Log.i(TAG, "Pruned image reader queue length=" + imageReaderQueue.size());
+      }
+    }
+
+    void onImage(ImageReader reader, Image image) {
+      PerImage queuedImage = null;
+      synchronized (lock) {
+        PerImageReader perReader = getOrCreatePerImageReader(reader);
+        queuedImage = perReader.queueImage(image);
+      }
+      if (queuedImage == null) {
+        // We got a late image.
+        return;
+      }
+      if (VERBOSE_LOGS) {
+        if (lastQueueTime != 0) {
+          long now = System.nanoTime();
+          long queueDelta = now - lastQueueTime;
+          Log.i(
+              TAG,
+              ""
+                  + reader.hashCode()
+                  + " enqueued image="
+                  + queuedImage.image.hashCode()
+                  + " queueDelta="
+                  + deltaMillis(queueDelta));
+          lastQueueTime = now;
+        } else {
+          lastQueueTime = System.nanoTime();
+        }
+      }
+      scheduleEngineFrame();
+    }
+
+    PerImage dequeueImage() {
+      PerImage r = null;
+      synchronized (lock) {
+        for (PerImageReader reader : imageReaderQueue) {
+          r = reader.dequeueImage();
+          if (r == null) {
+            // This reader is probably about to get pruned.
+            continue;
+          }
+          if (VERBOSE_LOGS) {
+            if (lastDequeueTime != 0) {
+              long now = System.nanoTime();
+              long dequeueDelta = now - lastDequeueTime;
+              long queuedFor = now - r.queuedTime;
+              long scheduleDelay = now - lastScheduleTime;
+              Log.i(
+                  TAG,
+                  ""
+                      + reader.reader.hashCode()
+                      + " dequeued image="
+                      + r.image.hashCode()
+                      + " queuedFor= "
+                      + deltaMillis(queuedFor)
+                      + " dequeueDelta="
+                      + deltaMillis(dequeueDelta)
+                      + " scheduleDelay="
+                      + deltaMillis(scheduleDelay));
+              lastDequeueTime = now;
+            } else {
+              lastDequeueTime = System.nanoTime();
+            }
+          }
+          if (lastDequeuedImage != null) {
+            if (VERBOSE_LOGS) {
+              Log.i(
+                  TAG,
+                  ""
+                      + lastReaderDequeuedFrom.reader.hashCode()
+                      + " closing image="
+                      + lastDequeuedImage.image.hashCode());
+            }
+            // We must keep the last image dequeued open until we are done presenting
+            // it. We have just dequeued a new image (r). Close the previously dequeued
+            // image.
+            lastDequeuedImage.image.close();
+            lastDequeuedImage = null;
+          }
+          // Remember the last image and reader dequeued from. We do this because we must
+          // keep both of these alive until we are done presenting the image.
+          lastDequeuedImage = r;
+          lastReaderDequeuedFrom = reader;
+          break;
+        }
+        pruneImageReaderQueue();
+      }
+      return r;
+    }
+
+    @Override
+    public void onTrimMemory(int level) {
+      if (!trimOnMemoryPressure) {
+        return;
+      }
+      if (level < ComponentCallbacks2.TRIM_MEMORY_BACKGROUND) {
+        return;
+      }
+      synchronized (lock) {
+        numTrims++;
+      }
+      cleanup();
+      createNewReader = true;
+    }
+
+    private void releaseInternal() {
+      cleanup();
+      released = true;
+    }
+
+    private void cleanup() {
+      synchronized (lock) {
+        for (PerImageReader pir : perImageReaders.values()) {
+          if (lastReaderDequeuedFrom == pir) {
+            lastReaderDequeuedFrom = null;
+          }
+          pir.close();
+        }
+        perImageReaders.clear();
+        if (lastDequeuedImage != null) {
+          lastDequeuedImage.image.close();
+          lastDequeuedImage = null;
+        }
+        if (lastReaderDequeuedFrom != null) {
+          lastReaderDequeuedFrom.close();
+          lastReaderDequeuedFrom = null;
+        }
+        imageReaderQueue.clear();
+      }
+    }
+
+    @TargetApi(API_LEVELS.API_33)
+    private void waitOnFence(Image image) {
+      try {
+        SyncFence fence = image.getFence();
+        fence.awaitForever();
+      } catch (IOException e) {
+        // Drop.
+      }
+    }
+
+    private void maybeWaitOnFence(Image image) {
+      if (image == null) {
+        return;
+      }
+      if (ignoringFence) {
+        return;
+      }
+      if (Build.VERSION.SDK_INT >= API_LEVELS.API_33) {
+        // The fence API is only available on Android >= 33.
+        waitOnFence(image);
+        return;
+      }
+      // Log once per ImageTextureEntry.
+      ignoringFence = true;
+      Log.w(TAG, "ImageTextureEntry can't wait on the fence on Android < 33");
+    }
+
+    ImageReaderSurfaceProducer(long id) {
+      this.id = id;
+    }
+
+    @Override
+    public long id() {
+      return id;
+    }
+
+    @Override
+    public void release() {
+      if (released) {
+        return;
+      }
+      releaseInternal();
+      unregisterTexture(id);
+    }
+
+    @Override
+    public void setSize(int width, int height) {
+      // Clamp to a minimum of 1. A 0x0 texture is a runtime exception in ImageReader.
+      width = Math.max(1, width);
+      height = Math.max(1, height);
+
+      if (requestedWidth == width && requestedHeight == height) {
+        // No size change.
+        return;
+      }
+      this.createNewReader = true;
+      this.requestedHeight = height;
+      this.requestedWidth = width;
+    }
+
+    @Override
+    public int getWidth() {
+      return this.requestedWidth;
+    }
+
+    @Override
+    public int getHeight() {
+      return this.requestedHeight;
+    }
+
+    @Override
+    public Surface getSurface() {
+      PerImageReader pir = getActiveReader();
+      if (VERBOSE_LOGS) {
+        Log.i(TAG, "" + pir.reader.hashCode() + " returning surface to render a new frame.");
+      }
+      return pir.reader.getSurface();
+    }
+
+    @Override
+    public void scheduleFrame() {
+      if (VERBOSE_LOGS) {
+        long now = System.nanoTime();
+        if (lastScheduleTime != 0) {
+          long delta = now - lastScheduleTime;
+          Log.v(TAG, "scheduleFrame delta=" + deltaMillis(delta));
+        }
+        lastScheduleTime = now;
+      }
+      scheduleEngineFrame();
+    }
+
+    @Override
+    @TargetApi(API_LEVELS.API_29)
+    public Image acquireLatestImage() {
+      PerImage r = dequeueImage();
+      if (r == null) {
+        return null;
+      }
+      maybeWaitOnFence(r.image);
+      return r.image;
+    }
+
+    private PerImageReader getActiveReader() {
+      synchronized (lock) {
+        if (createNewReader) {
+          createNewReader = false;
+          // Create a new ImageReader and add it to the queue.
+          ImageReader reader = createImageReader();
+          if (VERBOSE_LOGS) {
+            Log.i(
+                TAG,
+                "" + reader.hashCode() + " created w=" + requestedWidth + " h=" + requestedHeight);
+          }
+          return getOrCreatePerImageReader(reader);
+        }
+        return imageReaderQueue.peekLast();
+      }
+    }
+
+    @Override
+    protected void finalize() throws Throwable {
+      try {
+        if (released) {
+          return;
+        }
+        releaseInternal();
+        handler.post(new TextureFinalizerRunnable(id, flutterJNI));
+      } finally {
+        super.finalize();
+      }
+    }
+
+    @TargetApi(API_LEVELS.API_33)
+    private ImageReader createImageReader33() {
+      final ImageReader.Builder builder = new ImageReader.Builder(requestedWidth, requestedHeight);
+      // Allow for double buffering.
+      builder.setMaxImages(MAX_IMAGES);
+      // Use PRIVATE image format so that we can support video decoding.
+      // TODO(johnmccutchan): Should we always use PRIVATE here? It may impact our ability to
+      // read back texture data. If we don't always want to use it, how do we decide when to
+      // use it or not? Perhaps PlatformViews can indicate if they may contain DRM'd content.
+      // I need to investigate how PRIVATE impacts our ability to take screenshots or capture
+      // the output of Flutter application.
+      builder.setImageFormat(ImageFormat.PRIVATE);
+      // Hint that consumed images will only be read by GPU.
+      builder.setUsage(HardwareBuffer.USAGE_GPU_SAMPLED_IMAGE);
+      final ImageReader reader = builder.build();
+      return reader;
+    }
+
+    @TargetApi(API_LEVELS.API_29)
+    private ImageReader createImageReader29() {
+      final ImageReader reader =
+          ImageReader.newInstance(
+              requestedWidth,
+              requestedHeight,
+              ImageFormat.PRIVATE,
+              MAX_IMAGES,
+              HardwareBuffer.USAGE_GPU_SAMPLED_IMAGE);
+      return reader;
+    }
+
+    private ImageReader createImageReader() {
+      if (Build.VERSION.SDK_INT >= API_LEVELS.API_33) {
+        return createImageReader33();
+      } else if (Build.VERSION.SDK_INT >= API_LEVELS.API_29) {
+        return createImageReader29();
+      }
+      throw new UnsupportedOperationException(
+          "ImageReaderPlatformViewRenderTarget requires API version 29+");
+    }
+
+    @VisibleForTesting
+    public void disableFenceForTest() {
+      // Roboelectric's implementation of SyncFence is borked.
+      ignoringFence = true;
+    }
+
+    @VisibleForTesting
+    public int numImageReaders() {
+      synchronized (lock) {
+        return imageReaderQueue.size();
+      }
+    }
+
+    @VisibleForTesting
+    public int numTrims() {
+      synchronized (lock) {
+        return numTrims;
+      }
+    }
+
+    @VisibleForTesting
+    public int numImages() {
+      int r = 0;
+      synchronized (lock) {
+        for (PerImageReader reader : imageReaderQueue) {
+          r += reader.imageQueue.size();
+        }
+      }
+      return r;
+    }
+  }
+
+  @Keep
+  final class ImageTextureRegistryEntry
+      implements TextureRegistry.ImageTextureEntry, TextureRegistry.ImageConsumer {
+    private static final String TAG = "ImageTextureRegistryEntry";
+    private final long id;
+    private boolean released;
+    private boolean ignoringFence = false;
+    private Image image;
+
+    ImageTextureRegistryEntry(long id) {
+      this.id = id;
+    }
+
+    @Override
+    public long id() {
+      return id;
+    }
+
+    @Override
+    public void release() {
+      if (released) {
+        return;
+      }
+      released = true;
+      if (image != null) {
+        image.close();
+        image = null;
+      }
+      unregisterTexture(id);
+    }
+
+    @Override
+    public void pushImage(Image image) {
+      if (released) {
+        return;
+      }
+      Image toClose;
+      synchronized (this) {
+        toClose = this.image;
+        this.image = image;
+      }
+      // Close the previously pushed buffer.
+      if (toClose != null) {
+        Log.e(TAG, "Dropping PlatformView Frame");
+        toClose.close();
+      }
+      if (image != null) {
+        scheduleEngineFrame();
+      }
+    }
+
+    @TargetApi(API_LEVELS.API_33)
+    private void waitOnFence(Image image) {
+      try {
+        SyncFence fence = image.getFence();
+        fence.awaitForever();
+      } catch (IOException e) {
+        // Drop.
+      }
+    }
+
+    @TargetApi(API_LEVELS.API_29)
+    private void maybeWaitOnFence(Image image) {
+      if (image == null) {
+        return;
+      }
+      if (ignoringFence) {
+        return;
+      }
+      if (Build.VERSION.SDK_INT >= API_LEVELS.API_33) {
+        // The fence API is only available on Android >= 33.
+        waitOnFence(image);
+        return;
+      }
+      // Log once per ImageTextureEntry.
+      ignoringFence = true;
+      Log.w(TAG, "ImageTextureEntry can't wait on the fence on Android < 33");
+    }
+
+    @Override
+    @TargetApi(API_LEVELS.API_29)
+    public Image acquireLatestImage() {
+      Image r;
+      synchronized (this) {
+        r = this.image;
+        this.image = null;
+      }
+      maybeWaitOnFence(r);
+      return r;
+    }
+
+    @Override
+    protected void finalize() throws Throwable {
+      try {
+        if (released) {
+          return;
+        }
+        if (image != null) {
+          // Be sure to finalize any cached image.
+          image.close();
+          image = null;
+        }
+        released = true;
+        handler.post(new TextureFinalizerRunnable(id, flutterJNI));
+      } finally {
+        super.finalize();
+      }
+    }
+  }
   // ------ END TextureRegistry IMPLEMENTATION ----
 
   /**
@@ -321,20 +1028,26 @@ public class FlutterRenderer implements TextureRegistry {
    * android.view.TextureView.SurfaceTextureListener}
    *
    * @param surface The render surface.
-   * @param keepCurrentSurface True if the current active surface should not be released.
+   * @param onlySwap True if the current active surface should not be detached.
    */
-  public void startRenderingToSurface(@NonNull Surface surface, boolean keepCurrentSurface) {
-    // Don't stop rendering the surface if it's currently paused.
-    // Stop rendering to the surface releases the associated native resources, which
-    // causes a glitch when showing platform views.
-    // For more, https://github.com/flutter/flutter/issues/95343
-    if (this.surface != null && !keepCurrentSurface) {
+  public void startRenderingToSurface(@NonNull Surface surface, boolean onlySwap) {
+    if (!onlySwap) {
+      // Stop rendering to the surface releases the associated native resources, which causes
+      // a glitch when toggling between rendering to an image view (hybrid composition) and
+      // rendering directly to a Surface or Texture view. For more,
+      // https://github.com/flutter/flutter/issues/95343
       stopRenderingToSurface();
     }
 
     this.surface = surface;
 
-    flutterJNI.onSurfaceCreated(surface);
+    if (onlySwap) {
+      // In the swap case we are just swapping the surface that we render to.
+      flutterJNI.onSurfaceWindowChanged(surface);
+    } else {
+      // In the non-swap case we are creating a new surface to render to.
+      flutterJNI.onSurfaceCreated(surface);
+    }
   }
 
   /**
@@ -370,19 +1083,20 @@ public class FlutterRenderer implements TextureRegistry {
    * android.view.TextureView.SurfaceTextureListener}
    */
   public void stopRenderingToSurface() {
-    flutterJNI.onSurfaceDestroyed();
-
-    surface = null;
+    if (surface != null) {
+      flutterJNI.onSurfaceDestroyed();
+
+      // TODO(mattcarroll): the source of truth for this call should be FlutterJNI, which is
+      // where the call to onFlutterUiDisplayed() comes from. However, no such native callback
+      // exists yet, so until the engine and FlutterJNI are configured to call us back when
+      // rendering stops, we will manually monitor that change here.
+      if (isDisplayingFlutterUi) {
+        flutterUiDisplayListener.onFlutterUiNoLongerDisplayed();
+      }
 
-    // TODO(mattcarroll): the source of truth for this call should be FlutterJNI, which is where
-    // the call to onFlutterUiDisplayed() comes from. However, no such native callback exists yet,
-    // so until the engine and FlutterJNI are configured to call us back when rendering stops,
-    // we will manually monitor that change here.
-    if (isDisplayingFlutterUi) {
-      flutterUiDisplayListener.onFlutterUiNoLongerDisplayed();
+      isDisplayingFlutterUi = false;
+      surface = null;
     }
-
-    isDisplayingFlutterUi = false;
   }
 
   /**
@@ -488,6 +1202,15 @@ public class FlutterRenderer implements TextureRegistry {
     flutterJNI.registerTexture(textureId, textureWrapper);
   }
 
+  private void registerImageTexture(
+      long textureId, @NonNull TextureRegistry.ImageConsumer imageTexture) {
+    flutterJNI.registerImageTexture(textureId, imageTexture);
+  }
+
+  private void scheduleEngineFrame() {
+    flutterJNI.scheduleFrame();
+  }
+
   // TODO(mattcarroll): describe the native behavior that this invokes
   private void markTextureFrameAvailable(long textureId) {
     flutterJNI.markTextureFrameAvailable(textureId);
@@ -515,8 +1238,8 @@ public class FlutterRenderer implements TextureRegistry {
 
   // TODO(mattcarroll): describe the native behavior that this invokes
   public void dispatchSemanticsAction(
-      int id, int action, @Nullable ByteBuffer args, int argsPosition) {
-    flutterJNI.dispatchSemanticsAction(id, action, args, argsPosition);
+      int nodeId, int action, @Nullable ByteBuffer args, int argsPosition) {
+    flutterJNI.dispatchSemanticsAction(nodeId, action, args, argsPosition);
   }
 
   /**
@@ -555,7 +1278,7 @@ public class FlutterRenderer implements TextureRegistry {
       return width > 0 && height > 0 && devicePixelRatio > 0;
     }
 
-    public List<DisplayFeature> displayFeatures = new ArrayList<DisplayFeature>();
+    public List<DisplayFeature> displayFeatures = new ArrayList<>();
   }
 
   /**
diff --git a/shell/platform/android/io/flutter/embedding/engine/renderer/RenderSurface.java b/shell/platform/android/io/flutter/embedding/engine/renderer/RenderSurface.java
index 58af9a49fd41805da2e44f604be53a7972b820e3..9051359dbb4587c838c8b9910126c4af4445e376 100644
--- a/shell/platform/android/io/flutter/embedding/engine/renderer/RenderSurface.java
+++ b/shell/platform/android/io/flutter/embedding/engine/renderer/RenderSurface.java
@@ -60,4 +60,11 @@ public interface RenderSurface {
    * #attachToRenderer(FlutterRenderer)}.
    */
   void pause();
+
+  /**
+   * Instructs this {@code RenderSurface} to resume forwarding {@code Surface} notifications to the
+   * {@code FlutterRenderer} that was previously connected with {@link
+   * #attachToRenderer(FlutterRenderer)}.
+   */
+  void resume();
 }
diff --git a/shell/platform/android/io/flutter/embedding/engine/renderer/SurfaceTextureSurfaceProducer.java b/shell/platform/android/io/flutter/embedding/engine/renderer/SurfaceTextureSurfaceProducer.java
new file mode 100644
index 0000000000000000000000000000000000000000..0592a0bab12991287a744384f8a50ed8515daff5
--- /dev/null
+++ b/shell/platform/android/io/flutter/embedding/engine/renderer/SurfaceTextureSurfaceProducer.java
@@ -0,0 +1,93 @@
+package io.flutter.embedding.engine.renderer;
+
+import android.graphics.SurfaceTexture;
+import android.os.Handler;
+import android.view.Surface;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import io.flutter.embedding.engine.FlutterJNI;
+import io.flutter.view.TextureRegistry;
+
+/** Uses a {@link android.graphics.SurfaceTexture} to populate the texture registry. */
+final class SurfaceTextureSurfaceProducer
+    implements TextureRegistry.SurfaceProducer, TextureRegistry.GLTextureConsumer {
+  private final long id;
+  private int requestBufferWidth;
+  private int requestedBufferHeight;
+  private boolean released;
+  @Nullable private Surface surface;
+  @NonNull private final TextureRegistry.SurfaceTextureEntry texture;
+  @NonNull private final Handler handler;
+  @NonNull private final FlutterJNI flutterJNI;
+
+  SurfaceTextureSurfaceProducer(
+      long id,
+      @NonNull Handler handler,
+      @NonNull FlutterJNI flutterJNI,
+      @NonNull TextureRegistry.SurfaceTextureEntry texture) {
+    this.id = id;
+    this.handler = handler;
+    this.flutterJNI = flutterJNI;
+    this.texture = texture;
+  }
+
+  @Override
+  protected void finalize() throws Throwable {
+    try {
+      if (released) {
+        return;
+      }
+      release();
+      handler.post(new FlutterRenderer.TextureFinalizerRunnable(id, flutterJNI));
+    } finally {
+      super.finalize();
+    }
+  }
+
+  @Override
+  public long id() {
+    return id;
+  }
+
+  @Override
+  public void release() {
+    texture.release();
+    released = true;
+  }
+
+  @Override
+  @NonNull
+  public SurfaceTexture getSurfaceTexture() {
+    return texture.surfaceTexture();
+  }
+
+  @Override
+  public void setSize(int width, int height) {
+    requestBufferWidth = width;
+    requestedBufferHeight = height;
+    getSurfaceTexture().setDefaultBufferSize(width, height);
+  }
+
+  @Override
+  public int getWidth() {
+    return requestBufferWidth;
+  }
+
+  @Override
+  public int getHeight() {
+    return requestedBufferHeight;
+  }
+
+  @Override
+  public Surface getSurface() {
+    if (surface == null) {
+      surface = new Surface(texture.surfaceTexture());
+    }
+    return surface;
+  }
+
+  @Override
+  public void scheduleFrame() {
+    flutterJNI.markTextureFrameAvailable(id);
+  }
+}
diff --git a/shell/platform/android/io/flutter/embedding/engine/renderer/SurfaceTextureWrapper.java b/shell/platform/android/io/flutter/embedding/engine/renderer/SurfaceTextureWrapper.java
index 655d0db865b4e30dc8df4f078b1cd50a312eff05..a4468a58d31ffe563b8ecafbe75aad3fa4ccdf70 100644
--- a/shell/platform/android/io/flutter/embedding/engine/renderer/SurfaceTextureWrapper.java
+++ b/shell/platform/android/io/flutter/embedding/engine/renderer/SurfaceTextureWrapper.java
@@ -22,6 +22,7 @@ public class SurfaceTextureWrapper {
   private boolean released;
   private boolean attached;
   private Runnable onFrameConsumed;
+  private boolean newFrameAvailable = false;
 
   public SurfaceTextureWrapper(@NonNull SurfaceTexture surfaceTexture) {
     this(surfaceTexture, null);
@@ -47,10 +48,23 @@ public class SurfaceTextureWrapper {
     return surfaceTexture;
   }
 
+  public void markDirty() {
+    synchronized (this) {
+      newFrameAvailable = true;
+    }
+  }
+
+  public boolean shouldUpdate() {
+    synchronized (this) {
+      return newFrameAvailable;
+    }
+  }
+
   // Called by native.
   @SuppressWarnings("unused")
   public void updateTexImage() {
     synchronized (this) {
+      newFrameAvailable = false;
       if (!released) {
         surfaceTexture.updateTexImage();
         if (onFrameConsumed != null) {
@@ -81,8 +95,8 @@ public class SurfaceTextureWrapper {
       // This causes the texture to be in an uninitialized state.
       // This should *not* be an issue once platform views are always rendered as TextureLayers
       // since thread merging will be always disabled on Android.
-      // For more see: AndroidExternalTextureGL::OnGrContextCreated in
-      // android_external_texture_gl.cc, and
+      // For more see: SurfaceTextureExternalTextureGL::OnGrContextCreated in
+      // surface_texture_external_texture_gl.cc, and
       // https://github.com/flutter/flutter/issues/98155
       if (attached) {
         surfaceTexture.detachFromGLContext();
diff --git a/shell/platform/android/io/flutter/embedding/engine/systemchannels/AccessibilityChannel.java b/shell/platform/android/io/flutter/embedding/engine/systemchannels/AccessibilityChannel.java
index 3fb32814f56b8d0787a8392df7f5b1436ed89287..f2d12b181af25eb6c89487ff6749d4a0636d0c34 100644
--- a/shell/platform/android/io/flutter/embedding/engine/systemchannels/AccessibilityChannel.java
+++ b/shell/platform/android/io/flutter/embedding/engine/systemchannels/AccessibilityChannel.java
@@ -24,8 +24,7 @@ public class AccessibilityChannel {
   @NonNull public final FlutterJNI flutterJNI;
   @Nullable private AccessibilityMessageHandler handler;
 
-  @VisibleForTesting
-  final BasicMessageChannel.MessageHandler<Object> parsingMessageHandler =
+  public final BasicMessageChannel.MessageHandler<Object> parsingMessageHandler =
       new BasicMessageChannel.MessageHandler<Object>() {
         @Override
         public void onMessage(
@@ -67,6 +66,14 @@ public class AccessibilityChannel {
                 }
                 break;
               }
+            case "focus":
+              {
+                Integer nodeId = (Integer) annotatedEvent.get("nodeId");
+                if (nodeId != null) {
+                  handler.onFocus(nodeId);
+                }
+                break;
+              }
             case "tooltip":
               {
                 String tooltipMessage = (String) data.get("message");
@@ -96,6 +103,13 @@ public class AccessibilityChannel {
     this.flutterJNI = flutterJNI;
   }
 
+  @VisibleForTesting
+  public AccessibilityChannel(
+      @NonNull BasicMessageChannel<Object> channel, @NonNull FlutterJNI flutterJNI) {
+    this.channel = channel;
+    this.flutterJNI = flutterJNI;
+  }
+
   /**
    * Informs Flutter that the Android OS currently has accessibility enabled.
    *
@@ -170,12 +184,15 @@ public class AccessibilityChannel {
     /** The Dart application would like the given {@code message} to be announced. */
     void announce(@NonNull String message);
 
-    /** The user has tapped on the widget with the given {@code nodeId}. */
+    /** The user has tapped on the semantics node with the given {@code nodeId}. */
     void onTap(int nodeId);
 
-    /** The user has long pressed on the widget with the given {@code nodeId}. */
+    /** The user has long pressed on the semantics node with the given {@code nodeId}. */
     void onLongPress(int nodeId);
 
+    /** The framework has requested focus on the semantics node with the given {@code nodeId}. */
+    void onFocus(int nodeId);
+
     /** The user has opened a tooltip. */
     void onTooltip(@NonNull String message);
   }
diff --git a/shell/platform/android/io/flutter/embedding/engine/systemchannels/BackGestureChannel.java b/shell/platform/android/io/flutter/embedding/engine/systemchannels/BackGestureChannel.java
new file mode 100644
index 0000000000000000000000000000000000000000..6fb8997d46b5488aeee89b42db8d28003754bc85
--- /dev/null
+++ b/shell/platform/android/io/flutter/embedding/engine/systemchannels/BackGestureChannel.java
@@ -0,0 +1,131 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.embedding.engine.systemchannels;
+
+import android.annotation.TargetApi;
+import android.window.BackEvent;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import io.flutter.Build.API_LEVELS;
+import io.flutter.Log;
+import io.flutter.embedding.engine.dart.DartExecutor;
+import io.flutter.plugin.common.MethodCall;
+import io.flutter.plugin.common.MethodChannel;
+import io.flutter.plugin.common.StandardMethodCodec;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A {@link MethodChannel} for communicating back gesture events to the Flutter framework.
+ *
+ * <p>The BackGestureChannel facilitates communication between the platform-specific Android back
+ * gesture handling code and the Flutter framework. It enables the dispatch of back gesture events
+ * such as start, progress, commit, and cancellation from the platform to the Flutter application.
+ */
+public class BackGestureChannel {
+  private static final String TAG = "BackGestureChannel";
+
+  @NonNull public final MethodChannel channel;
+
+  /**
+   * Constructs a BackGestureChannel.
+   *
+   * @param dartExecutor The DartExecutor used to establish communication with the Flutter
+   *     framework.
+   */
+  public BackGestureChannel(@NonNull DartExecutor dartExecutor) {
+    this.channel =
+        new MethodChannel(dartExecutor, "flutter/backgesture", StandardMethodCodec.INSTANCE);
+    channel.setMethodCallHandler(defaultHandler);
+  }
+
+  // Provide a default handler that returns an empty response to any messages
+  // on this channel.
+  private final MethodChannel.MethodCallHandler defaultHandler =
+      new MethodChannel.MethodCallHandler() {
+        @Override
+        public void onMethodCall(@NonNull MethodCall call, @NonNull MethodChannel.Result result) {
+          result.success(null);
+        }
+      };
+
+  /**
+   * Initiates a back gesture event.
+   *
+   * <p>This method should be called when the back gesture is initiated by the user.
+   *
+   * @param backEvent The BackEvent object containing information about the touch.
+   */
+  @TargetApi(API_LEVELS.API_34)
+  @RequiresApi(API_LEVELS.API_34)
+  public void startBackGesture(@NonNull BackEvent backEvent) {
+    Log.v(TAG, "Sending message to start back gesture");
+    channel.invokeMethod("startBackGesture", backEventToJsonMap(backEvent));
+  }
+
+  /**
+   * Updates the progress of a back gesture event.
+   *
+   * <p>This method should be called to update the progress of an ongoing back gesture event.
+   *
+   * @param backEvent An BackEvent object describing the progress event.
+   */
+  @TargetApi(API_LEVELS.API_34)
+  @RequiresApi(API_LEVELS.API_34)
+  public void updateBackGestureProgress(@NonNull BackEvent backEvent) {
+    Log.v(TAG, "Sending message to update back gesture progress");
+    channel.invokeMethod("updateBackGestureProgress", backEventToJsonMap(backEvent));
+  }
+
+  /**
+   * Commits the back gesture event.
+   *
+   * <p>This method should be called to signify the completion of a back gesture event and commit
+   * the navigation action initiated by the gesture.
+   */
+  @TargetApi(API_LEVELS.API_34)
+  @RequiresApi(API_LEVELS.API_34)
+  public void commitBackGesture() {
+    Log.v(TAG, "Sending message to commit back gesture");
+    channel.invokeMethod("commitBackGesture", null);
+  }
+
+  /**
+   * Cancels the back gesture event.
+   *
+   * <p>This method should be called when a back gesture is cancelled or the back button is pressed.
+   */
+  @TargetApi(API_LEVELS.API_34)
+  @RequiresApi(API_LEVELS.API_34)
+  public void cancelBackGesture() {
+    Log.v(TAG, "Sending message to cancel back gesture");
+    channel.invokeMethod("cancelBackGesture", null);
+  }
+
+  /**
+   * Sets a method call handler for the channel.
+   *
+   * @param handler The handler to set for the channel.
+   */
+  public void setMethodCallHandler(@Nullable MethodChannel.MethodCallHandler handler) {
+    channel.setMethodCallHandler(handler);
+  }
+
+  @TargetApi(API_LEVELS.API_34)
+  @RequiresApi(API_LEVELS.API_34)
+  private Map<String, Object> backEventToJsonMap(@NonNull BackEvent backEvent) {
+    Map<String, Object> message = new HashMap<>(3);
+    final float x = backEvent.getTouchX();
+    final float y = backEvent.getTouchY();
+    final Object touchOffset = (Float.isNaN(x) || Float.isNaN(y)) ? null : Arrays.asList(x, y);
+    message.put("touchOffset", touchOffset);
+    message.put("progress", backEvent.getProgress());
+    message.put("swipeEdge", backEvent.getSwipeEdge());
+
+    return message;
+  }
+}
diff --git a/shell/platform/android/io/flutter/embedding/engine/systemchannels/KeyboardChannel.java b/shell/platform/android/io/flutter/embedding/engine/systemchannels/KeyboardChannel.java
new file mode 100644
index 0000000000000000000000000000000000000000..a60e30885c246aab1edd27e23bafdd97a6222de6
--- /dev/null
+++ b/shell/platform/android/io/flutter/embedding/engine/systemchannels/KeyboardChannel.java
@@ -0,0 +1,75 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.embedding.engine.systemchannels;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import io.flutter.plugin.common.BinaryMessenger;
+import io.flutter.plugin.common.MethodCall;
+import io.flutter.plugin.common.MethodChannel;
+import io.flutter.plugin.common.StandardMethodCodec;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Event message channel for keyboard events to/from the Flutter framework.
+ *
+ * <p>Receives asynchronous messages from the framework to query the engine known pressed state.
+ */
+public class KeyboardChannel {
+  public final MethodChannel channel;
+  private KeyboardMethodHandler keyboardMethodHandler;
+
+  @NonNull
+  public final MethodChannel.MethodCallHandler parsingMethodHandler =
+      new MethodChannel.MethodCallHandler() {
+        Map<Long, Long> pressedState = new HashMap<>();
+
+        @Override
+        public void onMethodCall(@NonNull MethodCall call, @NonNull MethodChannel.Result result) {
+          if (keyboardMethodHandler == null) {
+            // Returns an empty pressed state when the engine did not get a chance to register
+            // a method handler for this channel.
+            result.success(pressedState);
+          } else {
+            switch (call.method) {
+              case "getKeyboardState":
+                try {
+                  pressedState = keyboardMethodHandler.getKeyboardState();
+                } catch (IllegalStateException exception) {
+                  result.error("error", exception.getMessage(), null);
+                }
+                result.success(pressedState);
+                break;
+              default:
+                result.notImplemented();
+                break;
+            }
+          }
+        }
+      };
+
+  public KeyboardChannel(@NonNull BinaryMessenger messenger) {
+    channel = new MethodChannel(messenger, "flutter/keyboard", StandardMethodCodec.INSTANCE);
+    channel.setMethodCallHandler(parsingMethodHandler);
+  }
+
+  /**
+   * Sets the {@link KeyboardMethodHandler} which receives all requests to query the keyboard state.
+   */
+  public void setKeyboardMethodHandler(@Nullable KeyboardMethodHandler keyboardMethodHandler) {
+    this.keyboardMethodHandler = keyboardMethodHandler;
+  }
+
+  public interface KeyboardMethodHandler {
+    /**
+     * Returns the keyboard pressed states.
+     *
+     * @return A map whose keys are physical keyboard key IDs and values are the corresponding
+     *     logical keyboard key IDs.
+     */
+    Map<Long, Long> getKeyboardState();
+  }
+}
diff --git a/shell/platform/android/io/flutter/embedding/engine/systemchannels/LifecycleChannel.java b/shell/platform/android/io/flutter/embedding/engine/systemchannels/LifecycleChannel.java
index 9e8c22bc909bed9a03a6498c14708e9d2b29eb40..0fefda5ce3cbaa4baa55469c6a8ba666621fead8 100644
--- a/shell/platform/android/io/flutter/embedding/engine/systemchannels/LifecycleChannel.java
+++ b/shell/platform/android/io/flutter/embedding/engine/systemchannels/LifecycleChannel.java
@@ -5,39 +5,134 @@
 package io.flutter.embedding.engine.systemchannels;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
 import io.flutter.Log;
 import io.flutter.embedding.engine.dart.DartExecutor;
 import io.flutter.plugin.common.BasicMessageChannel;
 import io.flutter.plugin.common.StringCodec;
+import java.util.Locale;
 
-/** TODO(mattcarroll): fill in javadoc for LifecycleChannel. */
+/**
+ * A {@link BasicMessageChannel} that communicates lifecycle events to the framework.
+ *
+ * <p>The activity listens to the Android lifecycle events, in addition to the focus events for
+ * windows, and this channel combines that information to decide if the application is the inactive,
+ * resumed, paused, or detached state.
+ */
 public class LifecycleChannel {
   private static final String TAG = "LifecycleChannel";
+  private static final String CHANNEL_NAME = "flutter/lifecycle";
 
-  @NonNull public final BasicMessageChannel<String> channel;
+  // This enum should match the Dart enum of the same name.
+  //
+  // HIDDEN isn't used on Android (it's synthesized in the Framework code). It's
+  // only listed here so that apicheck_test.dart can make sure that the states here
+  // match the Dart code.
+  private enum AppLifecycleState {
+    DETACHED,
+    RESUMED,
+    INACTIVE,
+    HIDDEN,
+    PAUSED,
+  };
+
+  private AppLifecycleState lastAndroidState = null;
+  private AppLifecycleState lastFlutterState = null;
+  private boolean lastFocus = true;
+
+  @NonNull private final BasicMessageChannel<String> channel;
 
   public LifecycleChannel(@NonNull DartExecutor dartExecutor) {
-    this.channel =
-        new BasicMessageChannel<>(dartExecutor, "flutter/lifecycle", StringCodec.INSTANCE);
+    this(new BasicMessageChannel<String>(dartExecutor, CHANNEL_NAME, StringCodec.INSTANCE));
   }
 
-  public void appIsInactive() {
-    Log.v(TAG, "Sending AppLifecycleState.inactive message.");
-    channel.send("AppLifecycleState.inactive");
+  @VisibleForTesting
+  public LifecycleChannel(@NonNull BasicMessageChannel<String> channel) {
+    this.channel = channel;
+  }
+
+  // Here's the state table this implements:
+  //
+  // | Android State | Window focused | Flutter state |
+  // |---------------|----------------|---------------|
+  // | Resumed       |     true       |    resumed    |
+  // | Resumed       |     false      |    inactive   |
+  // | Paused        |     true       |    inactive   |
+  // | Paused        |     false      |    inactive   |
+  // | Stopped       |     true       |    paused     |
+  // | Stopped       |     false      |    paused     |
+  // | Detached      |     true       |    detached   |
+  // | Detached      |     false      |    detached   |
+  //
+  // The hidden state isn't used on Android, it's synthesized in the Framework
+  // code when transitioning between paused and inactive in either direction.
+  private void sendState(AppLifecycleState state, boolean hasFocus) {
+    if (lastAndroidState == state && hasFocus == lastFocus) {
+      // No inputs changed, so Flutter state could not have changed.
+      return;
+    }
+    if (state == null && lastAndroidState == null) {
+      // If we're responding to a focus change before the state is set, just
+      // keep the last reported focus state and don't send anything to the
+      // framework. This could happen if focus events and lifecycle events are
+      // delivered out of the expected order.
+      lastFocus = hasFocus;
+      return;
+    }
+    AppLifecycleState newState = null;
+    switch (state) {
+      case RESUMED:
+        // Focus is only taken into account when the Android state is "Resumed".
+        // In all other states, focus is ignored, because we can't know what order
+        // Android lifecycle notifications and window focus notifications events
+        // will arrive in, and those states don't send input events anyhow.
+        newState = hasFocus ? AppLifecycleState.RESUMED : AppLifecycleState.INACTIVE;
+        break;
+      case INACTIVE:
+      case HIDDEN:
+      case PAUSED:
+      case DETACHED:
+        newState = state;
+        break;
+    }
+
+    // Keep the last reported values for future updates.
+    lastAndroidState = state;
+    lastFocus = hasFocus;
+    if (newState == lastFlutterState) {
+      // No change in the resulting Flutter state, so don't report anything.
+      return;
+    }
+    String message = "AppLifecycleState." + newState.name().toLowerCase(Locale.ROOT);
+    Log.v(TAG, "Sending " + message + " message.");
+    channel.send(message);
+    lastFlutterState = newState;
+  }
+
+  // Called if at least one window in the app has focus, even if the focused
+  // window doesn't contain a Flutter view.
+  public void aWindowIsFocused() {
+    sendState(lastAndroidState, true);
+  }
+
+  // Called if no windows in the app have focus.
+  public void noWindowsAreFocused() {
+    sendState(lastAndroidState, false);
   }
 
   public void appIsResumed() {
-    Log.v(TAG, "Sending AppLifecycleState.resumed message.");
-    channel.send("AppLifecycleState.resumed");
+    sendState(AppLifecycleState.RESUMED, lastFocus);
+  }
+
+  public void appIsInactive() {
+    sendState(AppLifecycleState.INACTIVE, lastFocus);
   }
 
   public void appIsPaused() {
-    Log.v(TAG, "Sending AppLifecycleState.paused message.");
-    channel.send("AppLifecycleState.paused");
+    sendState(AppLifecycleState.PAUSED, lastFocus);
   }
 
   public void appIsDetached() {
-    Log.v(TAG, "Sending AppLifecycleState.detached message.");
-    channel.send("AppLifecycleState.detached");
+    sendState(AppLifecycleState.DETACHED, lastFocus);
   }
 }
diff --git a/shell/platform/android/io/flutter/embedding/engine/systemchannels/LocalizationChannel.java b/shell/platform/android/io/flutter/embedding/engine/systemchannels/LocalizationChannel.java
index dbd94b719f074cd28b04656df74298923fd09484..ed6c56129c4ce436bca5f9c8507ec287961ed124 100644
--- a/shell/platform/android/io/flutter/embedding/engine/systemchannels/LocalizationChannel.java
+++ b/shell/platform/android/io/flutter/embedding/engine/systemchannels/LocalizationChannel.java
@@ -4,7 +4,6 @@
 
 package io.flutter.embedding.engine.systemchannels;
 
-import android.os.Build;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
@@ -91,8 +90,7 @@ public class LocalizationChannel {
               + ")");
       data.add(locale.getLanguage());
       data.add(locale.getCountry());
-      // locale.getScript() was added in API 21.
-      data.add(Build.VERSION.SDK_INT >= 21 ? locale.getScript() : "");
+      data.add(locale.getScript());
       data.add(locale.getVariant());
     }
     channel.invokeMethod("setLocale", data);
diff --git a/shell/platform/android/io/flutter/embedding/engine/systemchannels/NavigationChannel.java b/shell/platform/android/io/flutter/embedding/engine/systemchannels/NavigationChannel.java
index 87e7e36fe8d9ac17802f64c30d34779366ca70bb..36cac70125bf55f635ac9f03b8d8744ae2f802c3 100644
--- a/shell/platform/android/io/flutter/embedding/engine/systemchannels/NavigationChannel.java
+++ b/shell/platform/android/io/flutter/embedding/engine/systemchannels/NavigationChannel.java
@@ -11,6 +11,8 @@ import io.flutter.embedding.engine.dart.DartExecutor;
 import io.flutter.plugin.common.JSONMethodCodec;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
+import java.util.HashMap;
+import java.util.Map;
 
 /** TODO(mattcarroll): fill in javadoc for NavigationChannel. */
 public class NavigationChannel {
@@ -43,6 +45,13 @@ public class NavigationChannel {
     channel.invokeMethod("pushRoute", route);
   }
 
+  public void pushRouteInformation(@NonNull String route) {
+    Log.v(TAG, "Sending message to push route information '" + route + "'");
+    Map<String, String> message = new HashMap<>();
+    message.put("location", route);
+    channel.invokeMethod("pushRouteInformation", message);
+  }
+
   public void popRoute() {
     Log.v(TAG, "Sending message to pop route.");
     channel.invokeMethod("popRoute", null);
diff --git a/shell/platform/android/io/flutter/embedding/engine/systemchannels/PlatformChannel.java b/shell/platform/android/io/flutter/embedding/engine/systemchannels/PlatformChannel.java
index da08e499f1bb652d6480b76654cdea4109ae4c07..d3fd6774fa6f719867b1089953cf71e5d9ce3f2e 100644
--- a/shell/platform/android/io/flutter/embedding/engine/systemchannels/PlatformChannel.java
+++ b/shell/platform/android/io/flutter/embedding/engine/systemchannels/PlatformChannel.java
@@ -136,6 +136,13 @@ public class PlatformChannel {
                   result.error("error", exception.getMessage(), null);
                 }
                 break;
+              case "SystemNavigator.setFrameworkHandlesBack":
+                {
+                  boolean frameworkHandlesBack = (boolean) arguments;
+                  platformMessageHandler.setFrameworkHandlesBack(frameworkHandlesBack);
+                  result.success(null);
+                  break;
+                }
               case "SystemNavigator.pop":
                 platformMessageHandler.popSystemNavigator();
                 result.success(null);
@@ -180,6 +187,11 @@ public class PlatformChannel {
                   result.success(response);
                   break;
                 }
+              case "Share.invoke":
+                String text = (String) arguments;
+                platformMessageHandler.share(text);
+                result.success(null);
+                break;
               default:
                 result.notImplemented();
                 break;
@@ -509,6 +521,15 @@ public class PlatformChannel {
      */
     void setSystemUiOverlayStyle(@NonNull SystemChromeStyle systemUiOverlayStyle);
 
+    /**
+     * The Flutter application would or would not like to handle navigation pop events itself.
+     *
+     * <p>Relevant for registering and unregistering the app's OnBackInvokedCallback for the
+     * Predictive Back feature, for example as in {@link
+     * io.flutter.embedding.android.FlutterActivity}.
+     */
+    default void setFrameworkHandlesBack(boolean frameworkHandlesBack) {}
+
     /**
      * The Flutter application would like to pop the top item off of the Android app's navigation
      * back stack.
@@ -533,6 +554,13 @@ public class PlatformChannel {
      * can be pasted.
      */
     boolean clipboardHasStrings();
+
+    /**
+     * The Flutter application would like to share the given {@code text} using the Android standard
+     * intent action named {@code Intent.ACTION_SEND}. See:
+     * https://developer.android.com/reference/android/content/Intent.html#ACTION_SEND
+     */
+    void share(@NonNull String text);
   }
 
   /** Types of sounds the Android OS can play on behalf of an application. */
diff --git a/shell/platform/android/io/flutter/embedding/engine/systemchannels/ProcessTextChannel.java b/shell/platform/android/io/flutter/embedding/engine/systemchannels/ProcessTextChannel.java
new file mode 100644
index 0000000000000000000000000000000000000000..f1d12bc681111c7ba200bb11fbcd90fed3427c29
--- /dev/null
+++ b/shell/platform/android/io/flutter/embedding/engine/systemchannels/ProcessTextChannel.java
@@ -0,0 +1,122 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.embedding.engine.systemchannels;
+
+import android.content.pm.PackageManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import io.flutter.embedding.engine.dart.DartExecutor;
+import io.flutter.plugin.common.MethodCall;
+import io.flutter.plugin.common.MethodChannel;
+import io.flutter.plugin.common.StandardMethodCodec;
+import java.util.ArrayList;
+import java.util.Map;
+
+/**
+ * {@link ProcessTextChannel} is a platform channel that is used by the framework to initiate text
+ * processing feature in the embedding and for the embedding to send back the results.
+ *
+ * <p>When the framework needs to query the list of text processing actions (for instance to expose
+ * them in the selected text context menu), it will send to the embedding the message {@code
+ * ProcessText.queryTextActions}. In response, the {@link io.flutter.plugin.text.ProcessTextPlugin}
+ * will return a map of all activities that can process text. The map keys are generated IDs and the
+ * values are the activities labels. On the first request, the {@link
+ * io.flutter.plugin.text.ProcessTextPlugin} will make a call to Android's package manager to query
+ * all activities that can be performed for the {@code Intent.ACTION_PROCESS_TEXT} intent.
+ *
+ * <p>When a text processing action has to be executed, the framework will send to the embedding the
+ * message {@code ProcessText.processTextAction} with the {@code int id} of the choosen text action
+ * and the {@code String} of text to process as arguments. In response, the {@link
+ * io.flutter.plugin.text.ProcessTextPlugin} will make a call to the Android application activity to
+ * start the activity exposing the text action. The {@link io.flutter.plugin.text.ProcessTextPlugin}
+ * will return the processed text if there is one, or null if the activity did not return a
+ * transformed text.
+ *
+ * <p>{@link io.flutter.plugin.text.ProcessTextPlugin} implements {@link ProcessTextMethodHandler}
+ * that parses incoming messages from Flutter.
+ */
+public class ProcessTextChannel {
+  private static final String TAG = "ProcessTextChannel";
+  private static final String CHANNEL_NAME = "flutter/processtext";
+  private static final String METHOD_QUERY_TEXT_ACTIONS = "ProcessText.queryTextActions";
+  private static final String METHOD_PROCESS_TEXT_ACTION = "ProcessText.processTextAction";
+
+  public final MethodChannel channel;
+  public final PackageManager packageManager;
+  private ProcessTextMethodHandler processTextMethodHandler;
+
+  @NonNull
+  public final MethodChannel.MethodCallHandler parsingMethodHandler =
+      new MethodChannel.MethodCallHandler() {
+        @Override
+        public void onMethodCall(@NonNull MethodCall call, @NonNull MethodChannel.Result result) {
+          if (processTextMethodHandler == null) {
+            return;
+          }
+          String method = call.method;
+          Object args = call.arguments;
+          switch (method) {
+            case METHOD_QUERY_TEXT_ACTIONS:
+              try {
+                Map<String, String> actions = processTextMethodHandler.queryTextActions();
+                result.success(actions);
+              } catch (IllegalStateException exception) {
+                result.error("error", exception.getMessage(), null);
+              }
+              break;
+            case METHOD_PROCESS_TEXT_ACTION:
+              try {
+                final ArrayList<Object> argumentList = (ArrayList<Object>) args;
+                String id = (String) (argumentList.get(0));
+                String text = (String) (argumentList.get(1));
+                boolean readOnly = (boolean) (argumentList.get(2));
+                processTextMethodHandler.processTextAction(id, text, readOnly, result);
+              } catch (IllegalStateException exception) {
+                result.error("error", exception.getMessage(), null);
+              }
+              break;
+            default:
+              result.notImplemented();
+              break;
+          }
+        }
+      };
+
+  public ProcessTextChannel(
+      @NonNull DartExecutor dartExecutor, @NonNull PackageManager packageManager) {
+    this.packageManager = packageManager;
+    channel = new MethodChannel(dartExecutor, CHANNEL_NAME, StandardMethodCodec.INSTANCE);
+    channel.setMethodCallHandler(parsingMethodHandler);
+  }
+
+  /**
+   * Sets the {@link ProcessTextMethodHandler} which receives all requests to the text processing
+   * feature sent through this channel.
+   */
+  public void setMethodHandler(@Nullable ProcessTextMethodHandler processTextMethodHandler) {
+    this.processTextMethodHandler = processTextMethodHandler;
+  }
+
+  public interface ProcessTextMethodHandler {
+    /** Requests the map of text actions. Each text action has a unique id and a localized label. */
+    Map<String, String> queryTextActions();
+
+    /**
+     * Requests to run a text action on a given input text.
+     *
+     * @param id The ID of the text action returned by {@code ProcessText.queryTextActions}.
+     * @param input The text to be processed.
+     * @param readOnly Indicates to the activity if the processed text will be used as read-only.
+     *     see
+     *     https://developer.android.com/reference/android/content/Intent#EXTRA_PROCESS_TEXT_READONLY
+     * @param result The method channel result instance used to reply.
+     */
+    void processTextAction(
+        @NonNull String id,
+        @NonNull String input,
+        @NonNull boolean readOnly,
+        @NonNull MethodChannel.Result result);
+  }
+}
diff --git a/shell/platform/android/io/flutter/embedding/engine/systemchannels/SettingsChannel.java b/shell/platform/android/io/flutter/embedding/engine/systemchannels/SettingsChannel.java
index 46bf51190c147c7f74f89513d0ca72cca627596b..ec0dc28315f41b198f0f34faa43ac76582c2e03a 100644
--- a/shell/platform/android/io/flutter/embedding/engine/systemchannels/SettingsChannel.java
+++ b/shell/platform/android/io/flutter/embedding/engine/systemchannels/SettingsChannel.java
@@ -1,12 +1,21 @@
 package io.flutter.embedding.engine.systemchannels;
 
+import static io.flutter.Build.API_LEVELS;
+
+import android.annotation.SuppressLint;
+import android.os.Build;
+import android.util.DisplayMetrics;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
+import androidx.annotation.VisibleForTesting;
 import io.flutter.Log;
 import io.flutter.embedding.engine.dart.DartExecutor;
 import io.flutter.plugin.common.BasicMessageChannel;
 import io.flutter.plugin.common.JSONMessageCodec;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentLinkedQueue;
 
 public class SettingsChannel {
   private static final String TAG = "SettingsChannel";
@@ -17,6 +26,10 @@ public class SettingsChannel {
   private static final String BRIEFLY_SHOW_PASSWORD = "brieflyShowPassword";
   private static final String ALWAYS_USE_24_HOUR_FORMAT = "alwaysUse24HourFormat";
   private static final String PLATFORM_BRIGHTNESS = "platformBrightness";
+  private static final String CONFIGURATION_ID = "configurationId";
+
+  // When hasNonlinearTextScalingSupport() returns false, this will not be initialized.
+  private static final ConfigurationQueue CONFIGURATION_QUEUE = new ConfigurationQueue();
 
   @NonNull public final BasicMessageChannel<Object> channel;
 
@@ -24,6 +37,19 @@ public class SettingsChannel {
     this.channel = new BasicMessageChannel<>(dartExecutor, CHANNEL_NAME, JSONMessageCodec.INSTANCE);
   }
 
+  @SuppressLint("AnnotateVersionCheck")
+  public static boolean hasNonlinearTextScalingSupport() {
+    return Build.VERSION.SDK_INT >= API_LEVELS.API_34;
+  }
+
+  // This method will only be called on Flutter's UI thread.
+  public static DisplayMetrics getPastDisplayMetrics(int configId) {
+    assert hasNonlinearTextScalingSupport();
+    final ConfigurationQueue.SentConfiguration configuration =
+        CONFIGURATION_QUEUE.getConfiguration(configId);
+    return configuration == null ? null : configuration.displayMetrics;
+  }
+
   @NonNull
   public MessageBuilder startMessage() {
     return new MessageBuilder(channel);
@@ -32,11 +58,18 @@ public class SettingsChannel {
   public static class MessageBuilder {
     @NonNull private final BasicMessageChannel<Object> channel;
     @NonNull private Map<String, Object> message = new HashMap<>();
+    @Nullable private DisplayMetrics displayMetrics;
 
     MessageBuilder(@NonNull BasicMessageChannel<Object> channel) {
       this.channel = channel;
     }
 
+    @NonNull
+    public MessageBuilder setDisplayMetrics(@NonNull DisplayMetrics displayMetrics) {
+      this.displayMetrics = displayMetrics;
+      return this;
+    }
+
     @NonNull
     public MessageBuilder setTextScaleFactor(float textScaleFactor) {
       message.put(TEXT_SCALE_FACTOR, textScaleFactor);
@@ -80,7 +113,17 @@ public class SettingsChannel {
               + "\n"
               + "platformBrightness: "
               + message.get(PLATFORM_BRIGHTNESS));
-      channel.send(message);
+      final DisplayMetrics metrics = this.displayMetrics;
+      if (!hasNonlinearTextScalingSupport() || metrics == null) {
+        channel.send(message);
+        return;
+      }
+      final ConfigurationQueue.SentConfiguration sentConfiguration =
+          new ConfigurationQueue.SentConfiguration(metrics);
+      final BasicMessageChannel.Reply deleteCallback =
+          CONFIGURATION_QUEUE.enqueueConfiguration(sentConfiguration);
+      message.put(CONFIGURATION_ID, sentConfiguration.generationNumber);
+      channel.send(message, deleteCallback);
     }
   }
 
@@ -100,4 +143,127 @@ public class SettingsChannel {
       this.name = name;
     }
   }
+
+  /**
+   * A FIFO queue that maintains generations of configurations that are potentially used by the
+   * Flutter application.
+   *
+   * <p>Platform configurations needed by the Flutter app (for example, text scale factor) are
+   * retrived on the platform thread, serialized and sent to the Flutter application running on the
+   * Flutter UI thread. However, configurations exposed as functions that take parameters are
+   * typically not serializable. To allow the Flutter app to access these configurations, one
+   * possible solution is to create dart bindings that allow the Flutter framework to invoke these
+   * functions via JNI synchronously. To ensure the serialized configuration and these functions
+   * represent the same set of configurations at any given time, a "generation" id is used in these
+   * synchronous calls, to keep them consistent with the serialized configuration that the Flutter
+   * app most recently received and is currently using.
+   *
+   * <p>A unique generation identifier is generated by the {@link SettingsChannel} and associated
+   * with a configuration when it sends a serialized configuration to the Flutter framework. This
+   * queue keeps different generations of configurations that could be used by the Flutter
+   * framework, and cleans up old configurations that the Flutter framework no longer uses. When the
+   * Flutter framework invokes a function to access the configuration with a generation identifier,
+   * this queue finds the configuration with that identifier and also cleans up configurations that
+   * are no longer needed.
+   *
+   * <p>This mechanism is only needed because {@code TypedValue#applyDimension} does not take the
+   * current text scale factor as an input. Once the AndroidX API that allows us to query the scaled
+   * font size with a pure function is available, we can scrap this class and make the
+   * implementation much simpler.
+   */
+  @VisibleForTesting
+  public static class ConfigurationQueue {
+    private final ConcurrentLinkedQueue<SentConfiguration> sentQueue =
+        new ConcurrentLinkedQueue<>();
+
+    // The current SentConfiguration the Flutter application is using, according
+    // to the most recent getConfiguration call.
+    //
+    // This instance variable will only be accessed by getConfiguration, on
+    // Flutter's UI thread.
+    private SentConfiguration currentConfiguration;
+
+    /**
+     * Returns the {@link SentConfiguration} associated with the given {@code configGeneration}, and
+     * removes configurations older than the returned configurations from the queue as they are no
+     * longer needed.
+     */
+    public SentConfiguration getConfiguration(int configGeneration) {
+      if (currentConfiguration == null) {
+        currentConfiguration = sentQueue.poll();
+      }
+
+      // Remove the older entries, up to the entry associated with
+      // configGeneration. Here we assume the generationNumber never overflows.
+      while (currentConfiguration != null
+          && currentConfiguration.generationNumber < configGeneration) {
+        currentConfiguration = sentQueue.poll();
+      }
+
+      if (currentConfiguration == null) {
+        Log.e(
+            TAG,
+            "Cannot find config with generation: "
+                + String.valueOf(configGeneration)
+                + ", after exhausting the queue.");
+        return null;
+      } else if (currentConfiguration.generationNumber != configGeneration) {
+        Log.e(
+            TAG,
+            "Cannot find config with generation: "
+                + String.valueOf(configGeneration)
+                + ", the oldest config is now: "
+                + String.valueOf(currentConfiguration.generationNumber));
+        return null;
+      }
+      return currentConfiguration;
+    }
+
+    private SentConfiguration previousEnqueuedConfiguration;
+
+    /**
+     * Adds the most recently sent {@link SentConfiguration} to the queue.
+     *
+     * @return a {@link BasicMessageChannel.Reply} whose {@code reply} method must be called when
+     *     the embedder receives the reply for the sent configuration, to properly clean up older
+     *     configurations in the queue.
+     */
+    @UiThread
+    @Nullable
+    public BasicMessageChannel.Reply enqueueConfiguration(SentConfiguration config) {
+      sentQueue.add(config);
+      final SentConfiguration configurationToRemove = previousEnqueuedConfiguration;
+      previousEnqueuedConfiguration = config;
+      return configurationToRemove == null
+          ? null
+          : new BasicMessageChannel.Reply() {
+            @UiThread
+            @Override
+            public void reply(Object reply) {
+              // Removes the SentConfiguration sent right before `config`. Since
+              // platform messages are also FIFO older messages will be removed
+              // before newer ones.
+              sentQueue.remove(configurationToRemove);
+              if (!sentQueue.isEmpty()) {
+                Log.e(
+                    TAG,
+                    "The queue becomes empty after removing config generation "
+                        + String.valueOf(configurationToRemove.generationNumber));
+              }
+            }
+          };
+    }
+
+    public static class SentConfiguration {
+      private static int nextConfigGeneration = Integer.MIN_VALUE;
+
+      @NonNull public final int generationNumber;
+      @NonNull private final DisplayMetrics displayMetrics;
+
+      public SentConfiguration(@NonNull DisplayMetrics displayMetrics) {
+        this.generationNumber = nextConfigGeneration++;
+        this.displayMetrics = displayMetrics;
+      }
+    }
+  }
 }
diff --git a/shell/platform/android/io/flutter/embedding/engine/systemchannels/TextInputChannel.java b/shell/platform/android/io/flutter/embedding/engine/systemchannels/TextInputChannel.java
index e0f95681f3b9ce9be1a0f8b3ab6f98091f54295b..2c3cf3307b8639f1b1ce02732e1d97c8e9bc4062 100644
--- a/shell/platform/android/io/flutter/embedding/engine/systemchannels/TextInputChannel.java
+++ b/shell/platform/android/io/flutter/embedding/engine/systemchannels/TextInputChannel.java
@@ -1,5 +1,7 @@
 package io.flutter.embedding.engine.systemchannels;
 
+import static io.flutter.Build.API_LEVELS;
+
 import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
@@ -542,7 +544,7 @@ public class TextInputChannel {
 
       @NonNull
       private static String translateAutofillHint(@NonNull String hint) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+        if (Build.VERSION.SDK_INT < API_LEVELS.API_26) {
           return hint;
         }
         switch (hint) {
diff --git a/shell/platform/android/io/flutter/plugin/common/BasicMessageChannel.java b/shell/platform/android/io/flutter/plugin/common/BasicMessageChannel.java
index 284df4f03fe482b3d982f82e8766e65e7c5ae744..ea6612d782b36469afe002adb2a800c9e8990fdd 100644
--- a/shell/platform/android/io/flutter/plugin/common/BasicMessageChannel.java
+++ b/shell/platform/android/io/flutter/plugin/common/BasicMessageChannel.java
@@ -12,8 +12,7 @@ import io.flutter.Log;
 import io.flutter.plugin.common.BinaryMessenger.BinaryMessageHandler;
 import io.flutter.plugin.common.BinaryMessenger.BinaryReply;
 import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.util.Locale;
+import java.util.Arrays;
 
 /**
  * A named channel for communicating with the Flutter application using basic, asynchronous message
@@ -143,12 +142,57 @@ public final class BasicMessageChannel<T> {
     resizeChannelBuffer(messenger, name, newSize);
   }
 
-  static void resizeChannelBuffer(
+  /**
+   * Toggles whether the channel should show warning messages when discarding messages due to
+   * overflow. When 'warns' is false the channel is expected to overflow and warning messages will
+   * not be shown.
+   */
+  public void setWarnsOnChannelOverflow(boolean warns) {
+    setWarnsOnChannelOverflow(messenger, name, warns);
+  }
+
+  private static ByteBuffer packetFromEncodedMessage(ByteBuffer message) {
+    // Create a bytes array using the buffer content (messages.array() can not be used here).
+    message.flip();
+    final byte[] bytes = new byte[message.remaining()];
+    message.get(bytes);
+
+    // The current Android Java/JNI platform message implementation assumes
+    // that all buffers passed to native are direct buffers.
+    ByteBuffer packet = ByteBuffer.allocateDirect(bytes.length);
+    packet.put(bytes);
+
+    return packet;
+  }
+
+  /**
+   * Adjusts the number of messages that will get buffered when sending messages to channels that
+   * aren't fully set up yet. For example, the engine isn't running yet or the channel's message
+   * handler isn't set up on the Dart side yet.
+   */
+  public static void resizeChannelBuffer(
       @NonNull BinaryMessenger messenger, @NonNull String channel, int newSize) {
-    Charset charset = Charset.forName("UTF-8");
-    String messageString = String.format(Locale.US, "resize\r%s\r%d", channel, newSize);
-    ByteBuffer message = ByteBuffer.wrap(messageString.getBytes(charset));
-    messenger.send(CHANNEL_BUFFERS_CHANNEL, message);
+    final StandardMethodCodec codec = StandardMethodCodec.INSTANCE;
+    Object[] arguments = {channel, newSize};
+    MethodCall methodCall = new MethodCall("resize", Arrays.asList(arguments));
+    ByteBuffer message = codec.encodeMethodCall(methodCall);
+    ByteBuffer packet = packetFromEncodedMessage(message);
+    messenger.send(BasicMessageChannel.CHANNEL_BUFFERS_CHANNEL, packet);
+  }
+
+  /**
+   * Toggles whether the channel should show warning messages when discarding messages due to
+   * overflow. When 'warns' is false the channel is expected to overflow and warning messages will
+   * not be shown.
+   */
+  public static void setWarnsOnChannelOverflow(
+      @NonNull BinaryMessenger messenger, @NonNull String channel, boolean warns) {
+    final StandardMethodCodec codec = StandardMethodCodec.INSTANCE;
+    Object[] arguments = {channel, !warns};
+    MethodCall methodCall = new MethodCall("overflow", Arrays.asList(arguments));
+    ByteBuffer message = codec.encodeMethodCall(methodCall);
+    ByteBuffer packet = packetFromEncodedMessage(message);
+    messenger.send(BasicMessageChannel.CHANNEL_BUFFERS_CHANNEL, packet);
   }
 
   /** A handler of incoming messages. */
diff --git a/shell/platform/android/io/flutter/plugin/common/MethodChannel.java b/shell/platform/android/io/flutter/plugin/common/MethodChannel.java
index 2d646a2514784c9665c0b490fb914dbb7ad5a3a3..3191aa4e3ad66cc7affde3c1a69ad75507816de0 100644
--- a/shell/platform/android/io/flutter/plugin/common/MethodChannel.java
+++ b/shell/platform/android/io/flutter/plugin/common/MethodChannel.java
@@ -157,6 +157,15 @@ public class MethodChannel {
     BasicMessageChannel.resizeChannelBuffer(messenger, name, newSize);
   }
 
+  /**
+   * Toggles whether the channel should show warning messages when discarding messages due to
+   * overflow. When 'warns' is false the channel is expected to overflow and warning messages will
+   * not be shown.
+   */
+  public void setWarnsOnChannelOverflow(boolean warns) {
+    BasicMessageChannel.setWarnsOnChannelOverflow(messenger, name, warns);
+  }
+
   /** A handler of incoming method calls. */
   public interface MethodCallHandler {
     /**
diff --git a/shell/platform/android/io/flutter/plugin/common/PluginRegistry.java b/shell/platform/android/io/flutter/plugin/common/PluginRegistry.java
index 649bce820dbec698dac1679b01ba87246d375f93..4859617d93b29dc581757aa49ff48f11c710e3bf 100644
--- a/shell/platform/android/io/flutter/plugin/common/PluginRegistry.java
+++ b/shell/platform/android/io/flutter/plugin/common/PluginRegistry.java
@@ -309,6 +309,23 @@ public interface PluginRegistry {
     @NonNull
     Registrar addUserLeaveHintListener(@NonNull UserLeaveHintListener listener);
 
+    /**
+     * Adds a callback allowing the plugin to take part in handling incoming calls to {@link
+     * Activity#onWindowFocusChanged(boolean)}.
+     *
+     * <p>This registrar is for Flutter's v1 embedding. To listen for leave hints in the v2
+     * embedding, use {@link
+     * ActivityPluginBinding#addOnWindowFocusChangedListener(PluginRegistry.WindowFocusChangedListener)}.
+     *
+     * <p>For instructions on migrating a plugin from Flutter's v1 Android embedding to v2, visit
+     * http://flutter.dev/go/android-plugin-migration
+     *
+     * @param listener a {@link WindowFocusChangedListener} callback.
+     * @return this {@link Registrar}.
+     */
+    @NonNull
+    Registrar addWindowFocusChangedListener(@NonNull WindowFocusChangedListener listener);
+
     /**
      * Adds a callback allowing the plugin to take part in handling incoming calls to {@link
      * Activity#onDestroy()}.
@@ -388,6 +405,14 @@ public interface PluginRegistry {
     void onUserLeaveHint();
   }
 
+  /**
+   * Delegate interface for handling window focus changes on behalf of the main {@link
+   * android.app.Activity}.
+   */
+  interface WindowFocusChangedListener {
+    void onWindowFocusChanged(boolean hasFocus);
+  }
+
   /**
    * Delegate interface for handling an {@link android.app.Activity}'s onDestroy method being
    * called. A plugin that implements this interface can adopt the {@link FlutterNativeView} by
diff --git a/shell/platform/android/io/flutter/plugin/editing/ImeSyncDeferringInsetsCallback.java b/shell/platform/android/io/flutter/plugin/editing/ImeSyncDeferringInsetsCallback.java
index 0a6f0ef3f64db773b72807e33fb7dcae69279299..9aec85d1e1e5e56d3d7a7aa3d67c05fe473a0287 100644
--- a/shell/platform/android/io/flutter/plugin/editing/ImeSyncDeferringInsetsCallback.java
+++ b/shell/platform/android/io/flutter/plugin/editing/ImeSyncDeferringInsetsCallback.java
@@ -4,6 +4,8 @@
 
 package io.flutter.plugin.editing;
 
+import static io.flutter.Build.API_LEVELS;
+
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.graphics.Insets;
@@ -42,14 +44,12 @@ import java.util.List;
 // dispatched again, this time avoiding any flicker since the animation is now
 // complete.
 @VisibleForTesting
-@TargetApi(30)
-@RequiresApi(30)
+@TargetApi(API_LEVELS.API_30)
+@RequiresApi(API_LEVELS.API_30)
 @SuppressLint({"NewApi", "Override"})
 @Keep
 class ImeSyncDeferringInsetsCallback {
-  private int overlayInsetTypes;
-  private int deferredInsetTypes;
-
+  private final int deferredInsetTypes = WindowInsets.Type.ime();
   private View view;
   private WindowInsets lastWindowInsets;
   private AnimationCallback animationCallback;
@@ -65,12 +65,15 @@ class ImeSyncDeferringInsetsCallback {
   // When an animation begins, android sends a WindowInset with the final
   // state of the animation. When needsSave is true, we know to capture this
   // initial WindowInset.
+  //
+  // Certain actions, like dismissing the keyboard, can trigger multiple
+  // animations that are slightly offset in start time. To capture the
+  // correct final insets in these situations we update needsSave to true
+  // in each onPrepare callback, so that we save the latest final state
+  // to apply in onEnd.
   private boolean needsSave = false;
 
-  ImeSyncDeferringInsetsCallback(
-      @NonNull View view, int overlayInsetTypes, int deferredInsetTypes) {
-    this.overlayInsetTypes = overlayInsetTypes;
-    this.deferredInsetTypes = deferredInsetTypes;
+  ImeSyncDeferringInsetsCallback(@NonNull View view) {
     this.view = view;
     this.animationCallback = new AnimationCallback();
     this.insetsListener = new InsetsListener();
@@ -109,9 +112,9 @@ class ImeSyncDeferringInsetsCallback {
 
     @Override
     public void onPrepare(WindowInsetsAnimation animation) {
+      needsSave = true;
       if ((animation.getTypeMask() & deferredInsetTypes) != 0) {
         animating = true;
-        needsSave = true;
       }
     }
 
@@ -131,24 +134,24 @@ class ImeSyncDeferringInsetsCallback {
       if (!matching) {
         return insets;
       }
+
+      // The IME insets include the height of the navigation bar. If the app isn't laid out behind
+      // the navigation bar, this causes the IME insets to be too large during the animation.
+      // To fix this, we subtract the navigationBars bottom inset if the system UI flags for laying
+      // out behind the navigation bar aren't present.
+      int excludedInsets = 0;
+      int systemUiFlags = view.getWindowSystemUiVisibility();
+      if ((systemUiFlags & View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) == 0
+          && (systemUiFlags & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0) {
+        excludedInsets = insets.getInsets(WindowInsets.Type.navigationBars()).bottom;
+      }
+
       WindowInsets.Builder builder = new WindowInsets.Builder(lastWindowInsets);
-      // Overlay the ime-only insets with the full insets.
-      //
-      // The IME insets passed in by onProgress assumes that the entire animation
-      // occurs above any present navigation and status bars. This causes the
-      // IME inset to be too large for the animation. To remedy this, we merge the
-      // IME inset with other insets present via a subtract + reLu, which causes the
-      // IME inset to be overlaid with any bars present.
       Insets newImeInsets =
           Insets.of(
-              0,
-              0,
-              0,
-              Math.max(
-                  insets.getInsets(deferredInsetTypes).bottom
-                      - insets.getInsets(overlayInsetTypes).bottom,
-                  0));
+              0, 0, 0, Math.max(insets.getInsets(deferredInsetTypes).bottom - excludedInsets, 0));
       builder.setInsets(deferredInsetTypes, newImeInsets);
+
       // Directly call onApplyWindowInsets of the view as we do not want to pass through
       // the onApplyWindowInsets defined in this class, which would consume the insets
       // as if they were a non-animation inset change and cache it for re-dispatch in
diff --git a/shell/platform/android/io/flutter/plugin/editing/InputConnectionAdaptor.java b/shell/platform/android/io/flutter/plugin/editing/InputConnectionAdaptor.java
index 1a56a11201baf173953fc84ceb9645be9331f17f..1f688d7beb28104ffec2e369c7cd5058c90d995e 100644
--- a/shell/platform/android/io/flutter/plugin/editing/InputConnectionAdaptor.java
+++ b/shell/platform/android/io/flutter/plugin/editing/InputConnectionAdaptor.java
@@ -4,6 +4,8 @@
 
 package io.flutter.plugin.editing;
 
+import static io.flutter.Build.API_LEVELS;
+
 import android.annotation.TargetApi;
 import android.content.ClipData;
 import android.content.ClipboardManager;
@@ -118,9 +120,6 @@ public class InputConnectionAdaptor extends BaseInputConnection
   }
 
   private CursorAnchorInfo getCursorAnchorInfo() {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-      return null;
-    }
     if (mCursorAnchorInfoBuilder == null) {
       mCursorAnchorInfoBuilder = new CursorAnchorInfo.Builder();
     } else {
@@ -226,9 +225,6 @@ public class InputConnectionAdaptor extends BaseInputConnection
 
   @Override
   public boolean requestCursorUpdates(int cursorUpdateMode) {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-      return false;
-    }
     if ((cursorUpdateMode & CURSOR_UPDATE_IMMEDIATE) != 0) {
       mImm.updateCursorAnchorInfo(mFlutterView, getCursorAnchorInfo());
     }
@@ -326,13 +322,6 @@ public class InputConnectionAdaptor extends BaseInputConnection
         return true;
       }
     }
-    if (event.getAction() == KeyEvent.ACTION_UP
-        && (event.getKeyCode() == KeyEvent.KEYCODE_SHIFT_LEFT
-            || event.getKeyCode() == KeyEvent.KEYCODE_SHIFT_RIGHT)) {
-      int selEnd = Selection.getSelectionEnd(mEditable);
-      setSelection(selEnd, selEnd);
-      return true;
-    }
     return false;
   }
 
@@ -489,11 +478,11 @@ public class InputConnectionAdaptor extends BaseInputConnection
   }
 
   @Override
-  @TargetApi(25)
-  @RequiresApi(25)
+  @TargetApi(API_LEVELS.API_25)
+  @RequiresApi(API_LEVELS.API_25)
   public boolean commitContent(InputContentInfo inputContentInfo, int flags, Bundle opts) {
     // Ensure permission is granted.
-    if (Build.VERSION.SDK_INT >= 25
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_25
         && (flags & InputConnectionCompat.INPUT_CONTENT_GRANT_READ_URI_PERMISSION) != 0) {
       try {
         inputContentInfo.requestPermission();
@@ -576,9 +565,6 @@ public class InputConnectionAdaptor extends BaseInputConnection
         mEditable.getComposingStart(),
         mEditable.getComposingEnd());
 
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-      return;
-    }
     if (mExtractRequest != null) {
       mImm.updateExtractedText(
           mFlutterView, mExtractRequest.token, getExtractedText(mExtractRequest));
diff --git a/shell/platform/android/io/flutter/plugin/editing/SpellCheckPlugin.java b/shell/platform/android/io/flutter/plugin/editing/SpellCheckPlugin.java
index f74076c7af45bd344ba902aa9a74eb248f71b3c0..37ee23cfe6f2030cdca67791781af1110b18ad4c 100644
--- a/shell/platform/android/io/flutter/plugin/editing/SpellCheckPlugin.java
+++ b/shell/platform/android/io/flutter/plugin/editing/SpellCheckPlugin.java
@@ -132,6 +132,11 @@ public class SpellCheckPlugin
     ArrayList<HashMap<String, Object>> spellCheckerSuggestionSpans =
         new ArrayList<HashMap<String, Object>>();
     SentenceSuggestionsInfo spellCheckResults = results[0];
+    if (spellCheckResults == null) {
+      pendingResult.success(new ArrayList<HashMap<String, Object>>());
+      pendingResult = null;
+      return;
+    }
 
     for (int i = 0; i < spellCheckResults.getSuggestionsCount(); i++) {
       SuggestionsInfo suggestionsInfo = spellCheckResults.getSuggestionsInfoAt(i);
@@ -149,10 +154,20 @@ public class SpellCheckPlugin
       spellCheckerSuggestionSpan.put(END_INDEX_KEY, end);
 
       ArrayList<String> suggestions = new ArrayList<String>();
+      boolean validSuggestionsFound = false;
       for (int j = 0; j < suggestionsCount; j++) {
-        suggestions.add(suggestionsInfo.getSuggestionAt(j));
+        String suggestion = suggestionsInfo.getSuggestionAt(j);
+        // TODO(camsim99): Support spell check on Samsung by retrieving accurate spell check
+        // results, then remove this check: https://github.com/flutter/flutter/issues/120608.
+        if (!suggestion.equals("")) {
+          validSuggestionsFound = true;
+          suggestions.add(suggestion);
+        }
       }
 
+      if (!validSuggestionsFound) {
+        continue;
+      }
       spellCheckerSuggestionSpan.put(SUGGESTIONS_KEY, suggestions);
       spellCheckerSuggestionSpans.add(spellCheckerSuggestionSpan);
     }
diff --git a/shell/platform/android/io/flutter/plugin/editing/TextInputPlugin.java b/shell/platform/android/io/flutter/plugin/editing/TextInputPlugin.java
index 10cbc1b65cb61e29fd6efabc158d182cf632d182..d6c3c6f90d483426a549cc3a9ff87a909e335436 100644
--- a/shell/platform/android/io/flutter/plugin/editing/TextInputPlugin.java
+++ b/shell/platform/android/io/flutter/plugin/editing/TextInputPlugin.java
@@ -4,6 +4,8 @@
 
 package io.flutter.plugin.editing;
 
+import static io.flutter.Build.API_LEVELS;
+
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Rect;
@@ -15,7 +17,6 @@ import android.util.SparseArray;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewStructure;
-import android.view.WindowInsets;
 import android.view.autofill.AutofillId;
 import android.view.autofill.AutofillManager;
 import android.view.autofill.AutofillValue;
@@ -70,7 +71,7 @@ public class TextInputPlugin implements ListenableEditingState.EditingStateWatch
     // Create a default object.
     mEditable = new ListenableEditingState(null, mView);
     mImm = (InputMethodManager) view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_26) {
       afm = view.getContext().getSystemService(AutofillManager.class);
     } else {
       afm = null;
@@ -79,20 +80,8 @@ public class TextInputPlugin implements ListenableEditingState.EditingStateWatch
     // Sets up syncing ime insets with the framework, allowing
     // the Flutter view to grow and shrink to accommodate Android
     // controlled keyboard animations.
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-      int mask = 0;
-      if ((View.SYSTEM_UI_FLAG_HIDE_NAVIGATION & mView.getWindowSystemUiVisibility()) == 0) {
-        mask = mask | WindowInsets.Type.navigationBars();
-      }
-      if ((View.SYSTEM_UI_FLAG_FULLSCREEN & mView.getWindowSystemUiVisibility()) == 0) {
-        mask = mask | WindowInsets.Type.statusBars();
-      }
-      imeSyncCallback =
-          new ImeSyncDeferringInsetsCallback(
-              view,
-              mask, // Overlay, insets that should be merged with the deferred insets
-              WindowInsets.Type.ime() // Deferred, insets that will animate
-              );
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_30) {
+      imeSyncCallback = new ImeSyncDeferringInsetsCallback(view);
       imeSyncCallback.install();
     }
 
@@ -120,7 +109,7 @@ public class TextInputPlugin implements ListenableEditingState.EditingStateWatch
 
           @Override
           public void finishAutofillContext(boolean shouldSave) {
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O || afm == null) {
+            if (Build.VERSION.SDK_INT < API_LEVELS.API_26 || afm == null) {
               return;
             }
             if (shouldSave) {
@@ -274,7 +263,11 @@ public class TextInputPlugin implements ListenableEditingState.EditingStateWatch
       textType |= InputType.TYPE_TEXT_VARIATION_PASSWORD;
     } else {
       if (autocorrect) textType |= InputType.TYPE_TEXT_FLAG_AUTO_CORRECT;
-      if (!enableSuggestions) textType |= InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS;
+      if (!enableSuggestions) {
+        // Note: both required. Some devices ignore TYPE_TEXT_FLAG_NO_SUGGESTIONS.
+        textType |= InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS;
+        textType |= InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD;
+      }
     }
 
     if (textCapitalization == TextInputChannel.TextCapitalization.CHARACTERS) {
@@ -321,7 +314,7 @@ public class TextInputPlugin implements ListenableEditingState.EditingStateWatch
             configuration.textCapitalization);
     outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_FULLSCREEN;
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_26
         && !configuration.enableIMEPersonalizedLearning) {
       outAttrs.imeOptions |= EditorInfo.IME_FLAG_NO_PERSONALIZED_LEARNING;
     }
@@ -385,16 +378,11 @@ public class TextInputPlugin implements ListenableEditingState.EditingStateWatch
     mImm.sendAppPrivateCommand(mView, action, data);
   }
 
-  private boolean canShowTextInput() {
-    if (configuration == null || configuration.inputType == null) {
-      return true;
-    }
-    return configuration.inputType.type != TextInputChannel.TextInputType.NONE;
-  }
-
   @VisibleForTesting
   void showTextInput(View view) {
-    if (canShowTextInput()) {
+    if (configuration == null
+        || configuration.inputType == null
+        || configuration.inputType.type != TextInputChannel.TextInputType.NONE) {
       view.requestFocus();
       mImm.showSoftInput(view, 0);
     } else {
@@ -418,11 +406,7 @@ public class TextInputPlugin implements ListenableEditingState.EditingStateWatch
     // Call notifyViewExited on the previous field.
     notifyViewExited();
     this.configuration = configuration;
-    if (canShowTextInput()) {
-      inputTarget = new InputTarget(InputTarget.Type.FRAMEWORK_CLIENT, client);
-    } else {
-      inputTarget = new InputTarget(InputTarget.Type.NO_TARGET, client);
-    }
+    inputTarget = new InputTarget(InputTarget.Type.FRAMEWORK_CLIENT, client);
 
     mEditable.removeEditingStateListener(this);
     mEditable =
@@ -567,6 +551,10 @@ public class TextInputPlugin implements ListenableEditingState.EditingStateWatch
     inputTarget = new InputTarget(InputTarget.Type.NO_TARGET, 0);
     unlockPlatformViewInputConnection();
     lastClientRect = null;
+
+    // Call restartInput to reset IME internal states. Otherwise some IMEs (Gboard for instance)
+    // keep reacting based on the previous input configuration until a new configuration is set.
+    mImm.restartInput(mView);
   }
 
   private static class InputTarget {
@@ -690,7 +678,7 @@ public class TextInputPlugin implements ListenableEditingState.EditingStateWatch
   }
 
   private void notifyViewEntered() {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O || afm == null || !needsAutofill()) {
+    if (Build.VERSION.SDK_INT < API_LEVELS.API_26 || afm == null || !needsAutofill()) {
       return;
     }
 
@@ -703,7 +691,7 @@ public class TextInputPlugin implements ListenableEditingState.EditingStateWatch
   }
 
   private void notifyViewExited() {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O
+    if (Build.VERSION.SDK_INT < API_LEVELS.API_26
         || afm == null
         || configuration == null
         || configuration.autofill == null
@@ -716,7 +704,7 @@ public class TextInputPlugin implements ListenableEditingState.EditingStateWatch
   }
 
   private void notifyValueChanged(String newValue) {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O || afm == null || !needsAutofill()) {
+    if (Build.VERSION.SDK_INT < API_LEVELS.API_26 || afm == null || !needsAutofill()) {
       return;
     }
 
@@ -725,7 +713,7 @@ public class TextInputPlugin implements ListenableEditingState.EditingStateWatch
   }
 
   private void updateAutofillConfigurationIfNeeded(TextInputChannel.Configuration configuration) {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+    if (Build.VERSION.SDK_INT < API_LEVELS.API_26) {
       return;
     }
 
@@ -755,7 +743,7 @@ public class TextInputPlugin implements ListenableEditingState.EditingStateWatch
   }
 
   public void onProvideAutofillVirtualStructure(@NonNull ViewStructure structure, int flags) {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O || !needsAutofill()) {
+    if (Build.VERSION.SDK_INT < API_LEVELS.API_26 || !needsAutofill()) {
       return;
     }
 
@@ -803,7 +791,7 @@ public class TextInputPlugin implements ListenableEditingState.EditingStateWatch
   }
 
   public void autofill(@NonNull SparseArray<AutofillValue> values) {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+    if (Build.VERSION.SDK_INT < API_LEVELS.API_26) {
       return;
     }
 
diff --git a/shell/platform/android/io/flutter/plugin/localization/LocalizationPlugin.java b/shell/platform/android/io/flutter/plugin/localization/LocalizationPlugin.java
index acb1e904ca6293a3916328a088929adc73cd87b3..1b5d398a98231aaf2e2711d9fa5189cc732f37d4 100644
--- a/shell/platform/android/io/flutter/plugin/localization/LocalizationPlugin.java
+++ b/shell/platform/android/io/flutter/plugin/localization/LocalizationPlugin.java
@@ -4,10 +4,11 @@
 
 package io.flutter.plugin.localization;
 
+import static io.flutter.Build.API_LEVELS;
+
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.Configuration;
-import android.content.res.Resources;
 import android.os.Build;
 import android.os.LocaleList;
 import androidx.annotation.NonNull;
@@ -39,19 +40,9 @@ public class LocalizationPlugin {
           if (localeString != null) {
             Locale locale = localeFromString(localeString);
 
-            // setLocale and createConfigurationContext is only available on API >= 17
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-              Configuration config = new Configuration(context.getResources().getConfiguration());
-              config.setLocale(locale);
-              localContext = context.createConfigurationContext(config);
-            } else {
-              // In API < 17, we have to update the locale in Configuration.
-              Resources resources = context.getResources();
-              Configuration config = resources.getConfiguration();
-              savedLocale = config.locale;
-              config.locale = locale;
-              resources.updateConfiguration(config, null);
-            }
+            Configuration config = new Configuration(context.getResources().getConfiguration());
+            config.setLocale(locale);
+            localContext = context.createConfigurationContext(config);
           }
 
           String packageName = context.getPackageName();
@@ -61,14 +52,6 @@ public class LocalizationPlugin {
             stringToReturn = localContext.getResources().getString(resId);
           }
 
-          // In API < 17, we had to restore the original locale after using.
-          if (localeString != null && Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1) {
-            Resources resources = context.getResources();
-            Configuration config = resources.getConfiguration();
-            config.locale = savedLocale;
-            resources.updateConfiguration(config, null);
-          }
-
           return stringToReturn;
         }
       };
@@ -98,7 +81,7 @@ public class LocalizationPlugin {
     //
     // LanguageRange and Locale.lookup was added in API 26 and is the preferred way to
     // select a locale. Pre-API 26, we implement a manual locale resolution.
-    if (Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_26) {
       // Modern locale resolution using LanguageRange
       // https://developer.android.com/guide/topics/resources/multilingual-support#postN
       List<Locale.LanguageRange> languageRanges = new ArrayList<>();
@@ -123,7 +106,7 @@ public class LocalizationPlugin {
         return platformResolvedLocale;
       }
       return supportedLocales.get(0);
-    } else if (Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
+    } else if (Build.VERSION.SDK_INT >= API_LEVELS.API_24) {
       // Modern locale resolution without languageRange
       // https://developer.android.com/guide/topics/resources/multilingual-support#postN
       LocaleList localeList = context.getResources().getConfiguration().getLocales();
@@ -179,7 +162,7 @@ public class LocalizationPlugin {
   @SuppressWarnings("deprecation")
   public void sendLocalesToFlutter(@NonNull Configuration config) {
     List<Locale> locales = new ArrayList<>();
-    if (Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_24) {
       LocaleList localeList = config.getLocales();
       int localeCount = localeList.size();
       for (int index = 0; index < localeCount; ++index) {
@@ -200,31 +183,26 @@ public class LocalizationPlugin {
    */
   @NonNull
   public static Locale localeFromString(@NonNull String localeString) {
-    // Use Locale.forLanguageTag if available (API 21+).
-    if (false && Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
-      return Locale.forLanguageTag(localeString);
-    } else {
-      // Normalize the locale string, replace all underscores with hyphens.
-      localeString = localeString.replace('_', '-');
-
-      // Pre-API 21, we fall back to manually parsing the locale tag.
-      String parts[] = localeString.split("-", -1);
-
-      // Assume the first part is always the language code.
-      String languageCode = parts[0];
-      String scriptCode = "";
-      String countryCode = "";
-      int index = 1;
-      if (parts.length > index && parts[index].length() == 4) {
-        scriptCode = parts[index];
-        index++;
-      }
-      if (parts.length > index && parts[index].length() >= 2 && parts[index].length() <= 3) {
-        countryCode = parts[index];
-        index++;
-      }
-      // Ignore the rest of the locale for this purpose.
-      return new Locale(languageCode, countryCode, scriptCode);
+    // Normalize the locale string, replace all underscores with hyphens.
+    localeString = localeString.replace('_', '-');
+
+    // Pre-API 21, we fall back to manually parsing the locale tag.
+    String parts[] = localeString.split("-", -1);
+
+    // Assume the first part is always the language code.
+    String languageCode = parts[0];
+    String scriptCode = "";
+    String countryCode = "";
+    int index = 1;
+    if (parts.length > index && parts[index].length() == 4) {
+      scriptCode = parts[index];
+      index++;
+    }
+    if (parts.length > index && parts[index].length() >= 2 && parts[index].length() <= 3) {
+      countryCode = parts[index];
+      index++;
     }
+    // Ignore the rest of the locale for this purpose.
+    return new Locale(languageCode, countryCode, scriptCode);
   }
 }
diff --git a/shell/platform/android/io/flutter/plugin/mouse/MouseCursorPlugin.java b/shell/platform/android/io/flutter/plugin/mouse/MouseCursorPlugin.java
index f9c3a8e6f76f9feffca9adf6f7a4ba2783159712..e6a4f7083bfe162920cfd8be8e588aa7ffe1b4b5 100644
--- a/shell/platform/android/io/flutter/plugin/mouse/MouseCursorPlugin.java
+++ b/shell/platform/android/io/flutter/plugin/mouse/MouseCursorPlugin.java
@@ -4,8 +4,9 @@
 
 package io.flutter.plugin.mouse;
 
+import static io.flutter.Build.API_LEVELS;
+
 import android.annotation.TargetApi;
-import android.os.Build;
 import android.view.PointerIcon;
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
@@ -13,8 +14,8 @@ import io.flutter.embedding.engine.systemchannels.MouseCursorChannel;
 import java.util.HashMap;
 
 /** A mandatory plugin that handles mouse cursor requests. */
-@TargetApi(Build.VERSION_CODES.N)
-@RequiresApi(Build.VERSION_CODES.N)
+@TargetApi(API_LEVELS.API_24)
+@RequiresApi(API_LEVELS.API_24)
 public class MouseCursorPlugin {
   @NonNull private final MouseCursorViewDelegate mView;
   @NonNull private final MouseCursorChannel mouseCursorChannel;
diff --git a/shell/platform/android/io/flutter/plugin/platform/ImageReaderPlatformViewRenderTarget.java b/shell/platform/android/io/flutter/plugin/platform/ImageReaderPlatformViewRenderTarget.java
new file mode 100644
index 0000000000000000000000000000000000000000..4cf0cd01ed9b35e6fe6d8fb9f26e2cdea2dea1c5
--- /dev/null
+++ b/shell/platform/android/io/flutter/plugin/platform/ImageReaderPlatformViewRenderTarget.java
@@ -0,0 +1,139 @@
+package io.flutter.plugin.platform;
+
+import static io.flutter.Build.API_LEVELS;
+
+import android.annotation.TargetApi;
+import android.graphics.ImageFormat;
+import android.hardware.HardwareBuffer;
+import android.media.Image;
+import android.media.ImageReader;
+import android.os.Build;
+import android.os.Handler;
+import android.view.Surface;
+import io.flutter.Log;
+import io.flutter.view.TextureRegistry.ImageTextureEntry;
+
+@TargetApi(API_LEVELS.API_29)
+public class ImageReaderPlatformViewRenderTarget implements PlatformViewRenderTarget {
+  private ImageTextureEntry textureEntry;
+  private ImageReader reader;
+  private int bufferWidth = 0;
+  private int bufferHeight = 0;
+  private static final String TAG = "ImageReaderPlatformViewRenderTarget";
+  private static final int MAX_IMAGES = 4;
+
+  private void closeReader() {
+    if (this.reader != null) {
+      // Push a null image, forcing the texture entry to close any cached images.
+      textureEntry.pushImage(null);
+      // Close the reader, which also closes any produced images.
+      this.reader.close();
+      this.reader = null;
+    }
+  }
+
+  private final Handler onImageAvailableHandler = new Handler();
+  private final ImageReader.OnImageAvailableListener onImageAvailableListener =
+      new ImageReader.OnImageAvailableListener() {
+        @Override
+        public void onImageAvailable(ImageReader reader) {
+          Image image = null;
+          try {
+            image = reader.acquireLatestImage();
+          } catch (IllegalStateException e) {
+            Log.e(TAG, "onImageAvailable acquireLatestImage failed: " + e.toString());
+          }
+          if (image == null) {
+            return;
+          }
+          textureEntry.pushImage(image);
+        }
+      };
+
+  @TargetApi(API_LEVELS.API_33)
+  protected ImageReader createImageReader33() {
+    final ImageReader.Builder builder = new ImageReader.Builder(bufferWidth, bufferHeight);
+    // Allow for double buffering.
+    builder.setMaxImages(MAX_IMAGES);
+    // Use PRIVATE image format so that we can support video decoding.
+    // TODO(johnmccutchan): Should we always use PRIVATE here? It may impact our ability to read
+    // back texture data. If we don't always want to use it, how do we decide when to use it or not?
+    // Perhaps PlatformViews can indicate if they may contain DRM'd content. I need to investigate
+    // how PRIVATE impacts our ability to take screenshots or capture the output of Flutter
+    // application.
+    builder.setImageFormat(ImageFormat.PRIVATE);
+    // Hint that consumed images will only be read by GPU.
+    builder.setUsage(HardwareBuffer.USAGE_GPU_SAMPLED_IMAGE);
+    final ImageReader reader = builder.build();
+    reader.setOnImageAvailableListener(this.onImageAvailableListener, onImageAvailableHandler);
+    return reader;
+  }
+
+  @TargetApi(API_LEVELS.API_29)
+  protected ImageReader createImageReader29() {
+    final ImageReader reader =
+        ImageReader.newInstance(
+            bufferWidth,
+            bufferHeight,
+            ImageFormat.PRIVATE,
+            MAX_IMAGES,
+            HardwareBuffer.USAGE_GPU_SAMPLED_IMAGE);
+    reader.setOnImageAvailableListener(this.onImageAvailableListener, onImageAvailableHandler);
+    return reader;
+  }
+
+  protected ImageReader createImageReader() {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_33) {
+      return createImageReader33();
+    } else if (Build.VERSION.SDK_INT >= API_LEVELS.API_29) {
+      return createImageReader29();
+    }
+    throw new UnsupportedOperationException(
+        "ImageReaderPlatformViewRenderTarget requires API version 29+");
+  }
+
+  public ImageReaderPlatformViewRenderTarget(ImageTextureEntry textureEntry) {
+    if (Build.VERSION.SDK_INT < API_LEVELS.API_29) {
+      throw new UnsupportedOperationException(
+          "ImageReaderPlatformViewRenderTarget requires API version 29+");
+    }
+    this.textureEntry = textureEntry;
+  }
+
+  public void resize(int width, int height) {
+    if (this.reader != null && bufferWidth == width && bufferHeight == height) {
+      // No size change.
+      return;
+    }
+    closeReader();
+    bufferWidth = width;
+    bufferHeight = height;
+    this.reader = createImageReader();
+  }
+
+  public int getWidth() {
+    return this.bufferWidth;
+  }
+
+  public int getHeight() {
+    return this.bufferHeight;
+  }
+
+  public long getId() {
+    return this.textureEntry.id();
+  }
+
+  public void release() {
+    closeReader();
+    // textureEntry has a finalizer attached.
+    textureEntry = null;
+  }
+
+  public boolean isReleased() {
+    return this.textureEntry == null;
+  }
+
+  public Surface getSurface() {
+    return this.reader.getSurface();
+  }
+}
diff --git a/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java b/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java
index 55af0485bf1e62eef36d7bd756b4d0336b381baf..9810623f8560b3ab0c3118552c589868dc176d74 100644
--- a/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java
+++ b/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java
@@ -4,13 +4,17 @@
 
 package io.flutter.plugin.platform;
 
-import android.annotation.TargetApi;
+import static io.flutter.Build.API_LEVELS;
+
 import android.app.Activity;
 import android.app.ActivityManager.TaskDescription;
 import android.content.ClipData;
 import android.content.ClipDescription;
 import android.content.ClipboardManager;
 import android.content.Context;
+import android.content.Intent;
+import android.content.res.AssetFileDescriptor;
+import android.net.Uri;
 import android.os.Build;
 import android.view.HapticFeedbackConstants;
 import android.view.SoundEffectConstants;
@@ -25,6 +29,7 @@ import androidx.core.view.WindowInsetsControllerCompat;
 import io.flutter.Log;
 import io.flutter.embedding.engine.systemchannels.PlatformChannel;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.util.List;
 
 /** Android implementation of the platform plugin. */
@@ -34,7 +39,7 @@ public class PlatformPlugin {
 
   private final Activity activity;
   private final PlatformChannel platformChannel;
-  private final PlatformPluginDelegate platformPluginDelegate;
+  @Nullable private final PlatformPluginDelegate platformPluginDelegate;
   private PlatformChannel.SystemChromeStyle currentTheme;
   private int mEnabledOverlays;
   private static final String TAG = "PlatformPlugin";
@@ -56,6 +61,15 @@ public class PlatformPlugin {
      *     androidx.activity.OnBackPressedDispatcher} will be executed.
      */
     boolean popSystemNavigator();
+
+    /**
+     * The Flutter application would or would not like to handle navigation pop events itself.
+     *
+     * <p>Relevant for registering and unregistering the app's OnBackInvokedCallback for the
+     * Predictive Back feature, for example as in {@link
+     * io.flutter.embedding.android.FlutterActivity}.
+     */
+    default void setFrameworkHandlesBack(boolean frameworkHandlesBack) {}
   }
 
   @VisibleForTesting
@@ -109,6 +123,11 @@ public class PlatformPlugin {
           setSystemChromeSystemUIOverlayStyle(systemUiOverlayStyle);
         }
 
+        @Override
+        public void setFrameworkHandlesBack(boolean frameworkHandlesBack) {
+          PlatformPlugin.this.setFrameworkHandlesBack(frameworkHandlesBack);
+        }
+
         @Override
         public void popSystemNavigator() {
           PlatformPlugin.this.popSystemNavigator();
@@ -129,6 +148,11 @@ public class PlatformPlugin {
         public boolean clipboardHasStrings() {
           return PlatformPlugin.this.clipboardHasStrings();
         }
+
+        @Override
+        public void share(@NonNull String text) {
+          PlatformPlugin.this.share(text);
+        }
       };
 
   public PlatformPlugin(@NonNull Activity activity, @NonNull PlatformChannel platformChannel) {
@@ -138,7 +162,7 @@ public class PlatformPlugin {
   public PlatformPlugin(
       @NonNull Activity activity,
       @NonNull PlatformChannel platformChannel,
-      @NonNull PlatformPluginDelegate delegate) {
+      @Nullable PlatformPluginDelegate delegate) {
     this.activity = activity;
     this.platformChannel = platformChannel;
     this.platformChannel.setPlatformMessageHandler(mPlatformMessageHandler);
@@ -178,14 +202,12 @@ public class PlatformPlugin {
         view.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP);
         break;
       case HEAVY_IMPACT:
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        if (Build.VERSION.SDK_INT >= API_LEVELS.API_23) {
           view.performHapticFeedback(HapticFeedbackConstants.CONTEXT_CLICK);
         }
         break;
       case SELECTION_CLICK:
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-          view.performHapticFeedback(HapticFeedbackConstants.CLOCK_TICK);
-        }
+        view.performHapticFeedback(HapticFeedbackConstants.CLOCK_TICK);
         break;
     }
   }
@@ -197,20 +219,10 @@ public class PlatformPlugin {
   @SuppressWarnings("deprecation")
   private void setSystemChromeApplicationSwitcherDescription(
       PlatformChannel.AppSwitcherDescription description) {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-      return;
-    }
-
-    // Linter refuses to believe we're only executing this code in API 28 unless we
-    // use distinct if
-    // blocks and
-    // hardcode the API 28 constant.
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P
-        && Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
+    if (Build.VERSION.SDK_INT < API_LEVELS.API_28) {
       activity.setTaskDescription(
           new TaskDescription(description.label, /* icon= */ null, description.color));
-    }
-    if (Build.VERSION.SDK_INT >= 28) {
+    } else {
       TaskDescription taskDescription =
           new TaskDescription(description.label, 0, description.color);
       activity.setTaskDescription(taskDescription);
@@ -268,8 +280,7 @@ public class PlatformPlugin {
               | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
               | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
               | View.SYSTEM_UI_FLAG_FULLSCREEN;
-    } else if (systemUiMode == PlatformChannel.SystemUiMode.IMMERSIVE
-        && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+    } else if (systemUiMode == PlatformChannel.SystemUiMode.IMMERSIVE) {
       // IMMERSIVE
       // Available starting at 19
       // Should not show overlays, swipe from edges to reveal overlays, needs onChange callback
@@ -284,8 +295,7 @@ public class PlatformPlugin {
               | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
               | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
               | View.SYSTEM_UI_FLAG_FULLSCREEN;
-    } else if (systemUiMode == PlatformChannel.SystemUiMode.IMMERSIVE_STICKY
-        && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+    } else if (systemUiMode == PlatformChannel.SystemUiMode.IMMERSIVE_STICKY) {
       // STICKY IMMERSIVE
       // Available starting at 19
       // Should not show overlays, swipe from edges to reveal overlays. The app will also receive
@@ -300,7 +310,7 @@ public class PlatformPlugin {
               | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
               | View.SYSTEM_UI_FLAG_FULLSCREEN;
     } else if (systemUiMode == PlatformChannel.SystemUiMode.EDGE_TO_EDGE
-        && Build.VERSION.SDK_INT >= 29) {
+        && Build.VERSION.SDK_INT >= API_LEVELS.API_29) {
       // EDGE TO EDGE
       // Available starting at 29
       // SDK 29 and up will apply a translucent body scrim behind 2/3 button navigation bars
@@ -329,10 +339,7 @@ public class PlatformPlugin {
             | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
             | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION;
 
-    // The SYSTEM_UI_FLAG_IMMERSIVE_STICKY flag was introduced in API 19, so we
-    // apply it
-    // if desired, and if the current Android version is 19 or greater.
-    if (overlaysToShow.size() == 0 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+    if (overlaysToShow.size() == 0) {
       enabledOverlays |= View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
     }
 
@@ -374,7 +381,6 @@ public class PlatformPlugin {
   }
 
   @SuppressWarnings("deprecation")
-  @TargetApi(21)
   private void setSystemChromeSystemUIOverlayStyle(
       PlatformChannel.SystemChromeStyle systemChromeStyle) {
     Window window = activity.getWindow();
@@ -382,7 +388,7 @@ public class PlatformPlugin {
     WindowInsetsControllerCompat windowInsetsControllerCompat =
         new WindowInsetsControllerCompat(window, view);
 
-    if (Build.VERSION.SDK_INT < 30) {
+    if (Build.VERSION.SDK_INT < API_LEVELS.API_30) {
       // Flag set to specify that this window is responsible for drawing the background for the
       // system bars. Must be set for all operations on API < 30 excluding enforcing system
       // bar contrasts. Deprecated in API 30.
@@ -403,7 +409,7 @@ public class PlatformPlugin {
     // If transparent, SDK 29 and higher may apply a translucent scrim behind the bar to ensure
     // proper contrast. This can be overridden with
     // SystemChromeStyle.systemStatusBarContrastEnforced.
-    if (Build.VERSION.SDK_INT >= 23) {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_23) {
       if (systemChromeStyle.statusBarIconBrightness != null) {
         switch (systemChromeStyle.statusBarIconBrightness) {
           case DARK:
@@ -426,7 +432,8 @@ public class PlatformPlugin {
     // You can't override the enforced contrast for a transparent status bar until SDK 29.
     // This overrides the translucent scrim that may be placed behind the bar on SDK 29+ to ensure
     // contrast is appropriate when using full screen layout modes like Edge to Edge.
-    if (systemChromeStyle.systemStatusBarContrastEnforced != null && Build.VERSION.SDK_INT >= 29) {
+    if (systemChromeStyle.systemStatusBarContrastEnforced != null
+        && Build.VERSION.SDK_INT >= API_LEVELS.API_29) {
       window.setStatusBarContrastEnforced(systemChromeStyle.systemStatusBarContrastEnforced);
     }
 
@@ -437,7 +444,7 @@ public class PlatformPlugin {
     // If transparent, SDK 29 and higher may apply a translucent scrim behind 2/3 button navigation
     // bars to ensure proper contrast. This can be overridden with
     // SystemChromeStyle.systemNavigationBarContrastEnforced.
-    if (Build.VERSION.SDK_INT >= 26) {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_26) {
       if (systemChromeStyle.systemNavigationBarIconBrightness != null) {
         switch (systemChromeStyle.systemNavigationBarIconBrightness) {
           case DARK:
@@ -458,7 +465,8 @@ public class PlatformPlugin {
       }
     }
     // You can't change the color of the navigation bar divider color until SDK 28.
-    if (systemChromeStyle.systemNavigationBarDividerColor != null && Build.VERSION.SDK_INT >= 28) {
+    if (systemChromeStyle.systemNavigationBarDividerColor != null
+        && Build.VERSION.SDK_INT >= API_LEVELS.API_28) {
       window.setNavigationBarDividerColor(systemChromeStyle.systemNavigationBarDividerColor);
     }
 
@@ -467,7 +475,7 @@ public class PlatformPlugin {
     // SDK 29+ to ensure contrast is appropriate when using full screen layout modes like
     // Edge to Edge.
     if (systemChromeStyle.systemNavigationBarContrastEnforced != null
-        && Build.VERSION.SDK_INT >= 29) {
+        && Build.VERSION.SDK_INT >= API_LEVELS.API_29) {
       window.setNavigationBarContrastEnforced(
           systemChromeStyle.systemNavigationBarContrastEnforced);
     }
@@ -475,6 +483,12 @@ public class PlatformPlugin {
     currentTheme = systemChromeStyle;
   }
 
+  private void setFrameworkHandlesBack(boolean frameworkHandlesBack) {
+    if (platformPluginDelegate != null) {
+      platformPluginDelegate.setFrameworkHandlesBack(frameworkHandlesBack);
+    }
+  }
+
   private void popSystemNavigator() {
     if (platformPluginDelegate != null && platformPluginDelegate.popSystemNavigator()) {
       // A custom behavior was executed by the delegate. Don't execute default behavior.
@@ -494,14 +508,46 @@ public class PlatformPlugin {
 
     if (!clipboard.hasPrimaryClip()) return null;
 
+    CharSequence itemText = null;
     try {
       ClipData clip = clipboard.getPrimaryClip();
       if (clip == null) return null;
       if (format == null || format == PlatformChannel.ClipboardContentFormat.PLAIN_TEXT) {
         ClipData.Item item = clip.getItemAt(0);
-        if (item.getUri() != null)
-          activity.getContentResolver().openTypedAssetFileDescriptor(item.getUri(), "text/*", null);
-        return item.coerceToText(activity);
+        // First, try getting clipboard data as text; no further processing
+        // required if so.
+        itemText = item.getText();
+        if (itemText == null) {
+          // Clipboard data does not contain text, so check whether or not it
+          // contains a URI to extract text from.
+          Uri itemUri = item.getUri();
+
+          if (itemUri == null) {
+            Log.w(
+                TAG, "Clipboard item contained no textual content nor a URI to retrieve it from.");
+            return null;
+          }
+
+          // Will only try to extract text from URI if it has the content scheme.
+          String uriScheme = itemUri.getScheme();
+
+          if (!uriScheme.equals("content")) {
+            Log.w(
+                TAG,
+                "Clipboard item contains a Uri with scheme '" + uriScheme + "'that is unhandled.");
+            return null;
+          }
+
+          AssetFileDescriptor assetFileDescriptor =
+              activity.getContentResolver().openTypedAssetFileDescriptor(itemUri, "text/*", null);
+
+          // Safely return clipboard data coerced into text; will return either
+          // itemText or text retrieved from its URI.
+          itemText = item.coerceToText(activity);
+          if (assetFileDescriptor != null) assetFileDescriptor.close();
+        }
+
+        return itemText;
       }
     } catch (SecurityException e) {
       Log.w(
@@ -512,7 +558,11 @@ public class PlatformPlugin {
           e);
       return null;
     } catch (FileNotFoundException e) {
+      Log.w(TAG, "Clipboard text was unable to be received from content URI.");
       return null;
+    } catch (IOException e) {
+      Log.w(TAG, "Failed to close AssetFileDescriptor while trying to read text from URI.", e);
+      return itemText;
     }
 
     return null;
@@ -540,4 +590,13 @@ public class PlatformPlugin {
     }
     return description.hasMimeType("text/*");
   }
+
+  private void share(@NonNull String text) {
+    Intent intent = new Intent();
+    intent.setAction(Intent.ACTION_SEND);
+    intent.setType("text/plain");
+    intent.putExtra(Intent.EXTRA_TEXT, text);
+
+    activity.startActivity(Intent.createChooser(intent, null));
+  }
 }
diff --git a/shell/platform/android/io/flutter/plugin/platform/PlatformViewRenderTarget.java b/shell/platform/android/io/flutter/plugin/platform/PlatformViewRenderTarget.java
new file mode 100644
index 0000000000000000000000000000000000000000..7cb6c7a784065b4a2a190a445ee7ce7f50ad081a
--- /dev/null
+++ b/shell/platform/android/io/flutter/plugin/platform/PlatformViewRenderTarget.java
@@ -0,0 +1,38 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.plugin.platform;
+
+import android.view.Surface;
+
+/**
+ * A PlatformViewRenderTarget interface allows an Android Platform View to be rendered into an
+ * offscreen buffer (usually a texture is involved) that the engine can compose into the
+ * FlutterView.
+ */
+public interface PlatformViewRenderTarget {
+  // Called when the render target should be resized.
+  public void resize(int width, int height);
+
+  // Returns the currently specified width.
+  public int getWidth();
+
+  // Returns the currently specified height.
+  public int getHeight();
+
+  // The id of this render target.
+  public long getId();
+
+  // Releases backing resources.
+  public void release();
+
+  // Returns true in the case that backing resource have been released.
+  public boolean isReleased();
+
+  // Returns the Surface to be rendered on to.
+  public Surface getSurface();
+
+  // Schedules a frame to be drawn.
+  public default void scheduleFrame() {}
+}
diff --git a/shell/platform/android/io/flutter/plugin/platform/PlatformViewWrapper.java b/shell/platform/android/io/flutter/plugin/platform/PlatformViewWrapper.java
index d55b0a6b7ce7fba900d5f85752e1aa4bef4dc4aa..f1e91a99aaf52fd33de633589b325fd92ea5cac1 100644
--- a/shell/platform/android/io/flutter/plugin/platform/PlatformViewWrapper.java
+++ b/shell/platform/android/io/flutter/plugin/platform/PlatformViewWrapper.java
@@ -4,7 +4,7 @@
 
 package io.flutter.plugin.platform;
 
-import static android.content.ComponentCallbacks2.TRIM_MEMORY_COMPLETE;
+import static io.flutter.Build.API_LEVELS;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
@@ -14,8 +14,6 @@ import android.graphics.Color;
 import android.graphics.Matrix;
 import android.graphics.PorterDuff;
 import android.graphics.Rect;
-import android.graphics.SurfaceTexture;
-import android.os.Build;
 import android.view.MotionEvent;
 import android.view.Surface;
 import android.view.View;
@@ -29,86 +27,30 @@ import androidx.annotation.VisibleForTesting;
 import io.flutter.Log;
 import io.flutter.embedding.android.AndroidTouchProcessor;
 import io.flutter.util.ViewUtils;
-import io.flutter.view.TextureRegistry;
-import java.util.concurrent.atomic.AtomicLong;
 
 /**
- * Wraps a platform view to intercept gestures and project this view onto a {@link SurfaceTexture}.
+ * Wraps a platform view to intercept gestures and project this view onto a {@link
+ * PlatformViewRenderTarget}.
  *
  * <p>An Android platform view is composed by the engine using a {@code TextureLayer}. The view is
  * embeded to the Android view hierarchy like a normal view, but it's projected onto a {@link
- * SurfaceTexture}, so it can be efficiently composed by the engine.
+ * PlatformViewRenderTarget}, so it can be efficiently composed by the engine.
  *
  * <p>Since the view is in the Android view hierarchy, keyboard and accessibility interactions
  * behave normally.
  */
-@TargetApi(23)
-class PlatformViewWrapper extends FrameLayout {
+@TargetApi(API_LEVELS.API_23)
+public class PlatformViewWrapper extends FrameLayout {
   private static final String TAG = "PlatformViewWrapper";
 
   private int prevLeft;
   private int prevTop;
   private int left;
   private int top;
-  private int bufferWidth;
-  private int bufferHeight;
-  private SurfaceTexture tx;
-  private Surface surface;
   private AndroidTouchProcessor touchProcessor;
+  private PlatformViewRenderTarget renderTarget;
 
-  @Nullable @VisibleForTesting ViewTreeObserver.OnGlobalFocusChangeListener activeFocusListener;
-  private final AtomicLong pendingFramesCount = new AtomicLong(0L);
-
-  private final TextureRegistry.OnFrameConsumedListener frameConsumedListener =
-      new TextureRegistry.OnFrameConsumedListener() {
-        @Override
-        public void onFrameConsumed() {
-          if (Build.VERSION.SDK_INT == 29) {
-            pendingFramesCount.decrementAndGet();
-          }
-        }
-      };
-
-  private boolean shouldRecreateSurfaceForLowMemory = false;
-  private final TextureRegistry.OnTrimMemoryListener trimMemoryListener =
-      new TextureRegistry.OnTrimMemoryListener() {
-        @Override
-        public void onTrimMemory(int level) {
-          // When a memory pressure warning is received and the level equal {@code
-          // ComponentCallbacks2.TRIM_MEMORY_COMPLETE}, the Android system releases the underlying
-          // surface. If we continue to use the surface (e.g., call lockHardwareCanvas), a crash
-          // occurs, and we found that this crash appeared on Android10 and above.
-          // See https://github.com/flutter/flutter/issues/103870 for more details.
-          //
-          // Here our workaround is to recreate the surface before using it.
-          if (level == TRIM_MEMORY_COMPLETE && Build.VERSION.SDK_INT >= 29) {
-            shouldRecreateSurfaceForLowMemory = true;
-          }
-        }
-      };
-
-  private void onFrameProduced() {
-    if (Build.VERSION.SDK_INT == 29) {
-      pendingFramesCount.incrementAndGet();
-    }
-  }
-
-  private void recreateSurfaceIfNeeded() {
-    if (shouldRecreateSurfaceForLowMemory) {
-      if (surface != null) {
-        surface.release();
-      }
-      surface = createSurface(tx);
-      shouldRecreateSurfaceForLowMemory = false;
-    }
-  }
-
-  private boolean shouldDrawToSurfaceNow() {
-    if (Build.VERSION.SDK_INT == 29) {
-      return pendingFramesCount.get() <= 0L;
-    }
-    return true;
-  }
+  private ViewTreeObserver.OnGlobalFocusChangeListener activeFocusListener;
 
   public PlatformViewWrapper(@NonNull Context context) {
     super(context);
@@ -116,11 +58,9 @@ class PlatformViewWrapper extends FrameLayout {
   }
 
   public PlatformViewWrapper(
-      @NonNull Context context, @NonNull TextureRegistry.SurfaceTextureEntry textureEntry) {
+      @NonNull Context context, @NonNull PlatformViewRenderTarget renderTarget) {
     this(context);
-    textureEntry.setOnFrameConsumedListener(frameConsumedListener);
-    textureEntry.setOnTrimMemoryListener(trimMemoryListener);
-    setTexture(textureEntry.surfaceTexture());
+    this.renderTarget = renderTarget;
   }
 
   /**
@@ -132,62 +72,6 @@ class PlatformViewWrapper extends FrameLayout {
     touchProcessor = newTouchProcessor;
   }
 
-  /**
-   * Sets the texture where the view is projected onto.
-   *
-   * <p>{@link PlatformViewWrapper} doesn't take ownership of the {@link SurfaceTexture}. As a
-   * result, the caller is responsible for releasing the texture.
-   *
-   * <p>{@link io.flutter.view.TextureRegistry} is responsible for creating and registering textures
-   * in the engine. Therefore, the engine is responsible for also releasing the texture.
-   *
-   * @param newTx The texture where the view is projected onto.
-   */
-  @SuppressLint("NewApi")
-  public void setTexture(@Nullable SurfaceTexture newTx) {
-    if (Build.VERSION.SDK_INT < 23) {
-      Log.e(
-          TAG,
-          "Platform views cannot be displayed below API level 23. "
-              + "You can prevent this issue by setting `minSdkVersion: 23` in build.gradle.");
-      return;
-    }
-
-    tx = newTx;
-
-    if (bufferWidth > 0 && bufferHeight > 0) {
-      tx.setDefaultBufferSize(bufferWidth, bufferHeight);
-    }
-
-    if (surface != null) {
-      surface.release();
-    }
-    surface = createSurface(newTx);
-
-    // Fill the entire canvas with a transparent color.
-    // As a result, the background color of the platform view container is displayed
-    // to the user until the platform view draws its first frame.
-    final Canvas canvas = surface.lockHardwareCanvas();
-    try {
-      canvas.drawColor(Color.TRANSPARENT, PorterDuff.Mode.CLEAR);
-      onFrameProduced();
-    } finally {
-      surface.unlockCanvasAndPost(canvas);
-    }
-  }
-
-  @NonNull
-  @VisibleForTesting
-  protected Surface createSurface(@NonNull SurfaceTexture tx) {
-    return new Surface(tx);
-  }
-
-  /** Returns the texture where the view is projected. */
-  @Nullable
-  public SurfaceTexture getTexture() {
-    return tx;
-  }
-
   /**
    * Sets the layout parameters for this view.
    *
@@ -200,37 +84,31 @@ class PlatformViewWrapper extends FrameLayout {
     top = params.topMargin;
   }
 
-  /**
-   * Sets the size of the image buffer.
-   *
-   * @param width The width of the screen buffer.
-   * @param height The height of the screen buffer.
-   */
-  public void setBufferSize(int width, int height) {
-    bufferWidth = width;
-    bufferHeight = height;
-    if (tx != null) {
-      tx.setDefaultBufferSize(width, height);
+  public void resizeRenderTarget(int width, int height) {
+    if (renderTarget != null) {
+      renderTarget.resize(width, height);
     }
   }
 
-  /** Returns the image buffer width. */
-  public int getBufferWidth() {
-    return bufferWidth;
+  public int getRenderTargetWidth() {
+    if (renderTarget != null) {
+      return renderTarget.getWidth();
+    }
+    return 0;
   }
 
-  /** Returns the image buffer height. */
-  public int getBufferHeight() {
-    return bufferHeight;
+  public int getRenderTargetHeight() {
+    if (renderTarget != null) {
+      return renderTarget.getHeight();
+    }
+    return 0;
   }
 
-  /** Releases the surface. */
+  /** Releases resources. */
   public void release() {
-    // Don't release the texture.
-    tx = null;
-    if (surface != null) {
-      surface.release();
-      surface = null;
+    if (renderTarget != null) {
+      renderTarget.release();
+      renderTarget = null;
     }
   }
 
@@ -271,42 +149,28 @@ class PlatformViewWrapper extends FrameLayout {
   @Override
   @SuppressLint("NewApi")
   public void draw(Canvas canvas) {
-    if (surface == null) {
+    if (renderTarget == null) {
       super.draw(canvas);
-      Log.e(TAG, "Platform view cannot be composed without a surface.");
+      Log.e(TAG, "Platform view cannot be composed without a RenderTarget.");
       return;
     }
-    if (!surface.isValid()) {
-      Log.e(TAG, "Invalid surface. The platform view cannot be displayed.");
-      return;
-    }
-    if (tx == null || tx.isReleased()) {
-      Log.e(TAG, "Invalid texture. The platform view cannot be displayed.");
+    final Surface targetSurface = renderTarget.getSurface();
+    final Canvas targetCanvas = targetSurface.lockHardwareCanvas();
+    if (targetCanvas == null) {
+      // Cannot render right now.
+      invalidate();
       return;
     }
-    // We've observed on Android Q that we have to wait for the consumer of {@link SurfaceTexture}
-    // to consume the last image before continuing to draw, otherwise subsequent calls to
-    // {@code dequeueBuffer} to request a free buffer from the {@link BufferQueue} will fail.
-    // See https://github.com/flutter/flutter/issues/98722
-    if (!shouldDrawToSurfaceNow()) {
-      // If there are still frames that are not consumed, we will draw them next time.
-      invalidate();
-    } else {
-      // We try to recreate the surface before using it to avoid the crash:
-      // https://github.com/flutter/flutter/issues/103870
-      recreateSurfaceIfNeeded();
 
+    try {
+      // Fill the render target with transparent pixels. This is needed for platform views that
+      // expect a transparent background.
+      targetCanvas.drawColor(Color.TRANSPARENT, PorterDuff.Mode.CLEAR);
       // Override the canvas that this subtree of views will use to draw.
-      final Canvas surfaceCanvas = surface.lockHardwareCanvas();
-      try {
-        // Clear the current pixels in the canvas.
-        // This helps when a WebView renders an HTML document with transparent background.
-        surfaceCanvas.drawColor(Color.TRANSPARENT, PorterDuff.Mode.CLEAR);
-        super.draw(surfaceCanvas);
-        onFrameProduced();
-      } finally {
-        surface.unlockCanvasAndPost(surfaceCanvas);
-      }
+      super.draw(targetCanvas);
+    } finally {
+      renderTarget.scheduleFrame();
+      targetSurface.unlockCanvasAndPost(targetCanvas);
     }
   }
 
@@ -338,6 +202,11 @@ class PlatformViewWrapper extends FrameLayout {
     return touchProcessor.onTouchEvent(event, screenMatrix);
   }
 
+  @VisibleForTesting
+  public ViewTreeObserver.OnGlobalFocusChangeListener getActiveFocusListener() {
+    return this.activeFocusListener;
+  }
+
   public void setOnDescendantFocusChangeListener(@NonNull OnFocusChangeListener userFocusListener) {
     unsetOnDescendantFocusChangeListener();
     final ViewTreeObserver observer = getViewTreeObserver();
diff --git a/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java b/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java
index 68fc2f15990c1e753fd06adb762435920b6e1bcd..093be1566cb4e101e93800d31a773f046aa21c1e 100644
--- a/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java
+++ b/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java
@@ -6,13 +6,17 @@ package io.flutter.plugin.platform;
 
 import static android.view.MotionEvent.PointerCoords;
 import static android.view.MotionEvent.PointerProperties;
+import static io.flutter.Build.API_LEVELS;
 
 import android.annotation.TargetApi;
+import android.content.ComponentCallbacks2;
 import android.content.Context;
 import android.content.MutableContextWrapper;
 import android.os.Build;
 import android.util.SparseArray;
 import android.view.MotionEvent;
+import android.view.MotionEvent.PointerCoords;
+import android.view.MotionEvent.PointerProperties;
 import android.view.SurfaceView;
 import android.view.View;
 import android.view.ViewGroup;
@@ -147,17 +151,20 @@ public class PlatformViewsController implements PlatformViewsAccessibilityDelega
   // Whether software rendering is used.
   private boolean usesSoftwareRendering = false;
 
+  private static boolean enableImageRenderTarget = true;
+
+  private static boolean enableSurfaceProducerRenderTarget = true;
+
   private final PlatformViewsChannel.PlatformViewsHandler channelHandler =
       new PlatformViewsChannel.PlatformViewsHandler() {
 
-        @TargetApi(19)
         @Override
         // TODO(egarciad): Remove the need for this.
         // https://github.com/flutter/flutter/issues/96679
         public void createForPlatformViewLayer(
             @NonNull PlatformViewsChannel.PlatformViewCreationRequest request) {
           // API level 19 is required for `android.graphics.ImageReader`.
-          ensureValidAndroidVersion(19);
+          enforceMinimumAndroidApiVersion(19);
           ensureValidRequest(request);
 
           final PlatformView platformView = createPlatformView(request, false);
@@ -167,7 +174,6 @@ public class PlatformViewsController implements PlatformViewsAccessibilityDelega
           // not applicable to fallback from TLHC to HC.
         }
 
-        @TargetApi(20)
         @Override
         public long createForTextureLayer(
             @NonNull PlatformViewsChannel.PlatformViewCreationRequest request) {
@@ -179,12 +185,14 @@ public class PlatformViewsController implements PlatformViewsAccessibilityDelega
           }
           if (textureRegistry == null) {
             throw new IllegalStateException(
-                "Texture registry is null. This means that platform views controller was detached, view id: "
+                "Texture registry is null. This means that platform views controller was detached,"
+                    + " view id: "
                     + viewId);
           }
           if (flutterView == null) {
             throw new IllegalStateException(
-                "Flutter view is null. This means the platform views controller doesn't have an attached view, view id: "
+                "Flutter view is null. This means the platform views controller doesn't have an"
+                    + " attached view, view id: "
                     + viewId);
           }
 
@@ -193,7 +201,8 @@ public class PlatformViewsController implements PlatformViewsAccessibilityDelega
           final View embeddedView = platformView.getView();
           if (embeddedView.getParent() != null) {
             throw new IllegalStateException(
-                "The Android view returned from PlatformView#getView() was already added to a parent view.");
+                "The Android view returned from PlatformView#getView() was already added to a"
+                    + " parent view.");
           }
 
           // The newer Texture Layer Hybrid Composition mode isn't suppported if any of the
@@ -203,7 +212,7 @@ public class PlatformViewsController implements PlatformViewsAccessibilityDelega
           //   view hierarchy via callbacks such as ViewParent#onDescendantInvalidated().
           // - The API level is <23, due to TLHC implementation API requirements.
           final boolean supportsTextureLayerMode =
-              Build.VERSION.SDK_INT >= 23
+              Build.VERSION.SDK_INT >= API_LEVELS.API_23
                   && !ViewUtils.hasChildViewOfType(
                       embeddedView, VIEW_TYPES_REQUIRE_VIRTUAL_DISPLAY);
 
@@ -232,20 +241,29 @@ public class PlatformViewsController implements PlatformViewsAccessibilityDelega
             Log.e(TAG, "Disposing unknown platform view with id: " + viewId);
             return;
           }
+          if (platformView.getView() != null) {
+            final View embeddedView = platformView.getView();
+            final ViewGroup pvParent = (ViewGroup) embeddedView.getParent();
+            if (pvParent != null) {
+              // Eagerly remove the embedded view from the PlatformViewWrapper.
+              // Without this call, we see some crashes because removing the view
+              // is used as a signal to stop processing.
+              pvParent.removeView(embeddedView);
+            }
+          }
           platformViews.remove(viewId);
-
           try {
             platformView.dispose();
           } catch (RuntimeException exception) {
             Log.e(TAG, "Disposing platform view threw an exception", exception);
           }
-
           if (usesVirtualDisplay(viewId)) {
             final VirtualDisplayController vdController = vdControllers.get(viewId);
             final View embeddedView = vdController.getView();
             if (embeddedView != null) {
               contextToEmbeddedView.remove(embeddedView.getContext());
             }
+            vdController.dispose();
             vdControllers.remove(viewId);
             return;
           }
@@ -333,8 +351,8 @@ public class PlatformViewsController implements PlatformViewsAccessibilityDelega
                       context == null ? originalDisplayDensity : getDisplayDensity();
                   onComplete.run(
                       new PlatformViewsChannel.PlatformViewBufferSize(
-                          toLogicalPixels(vdController.getBufferWidth(), displayDensity),
-                          toLogicalPixels(vdController.getBufferHeight(), displayDensity)));
+                          toLogicalPixels(vdController.getRenderTargetWidth(), displayDensity),
+                          toLogicalPixels(vdController.getRenderTargetHeight(), displayDensity)));
                 });
             return;
           }
@@ -348,14 +366,13 @@ public class PlatformViewsController implements PlatformViewsAccessibilityDelega
           // Resize the buffer only when the current buffer size is smaller than the new size.
           // This is required to prevent a situation when smooth keyboard animation
           // resizes the texture too often, such that the GPU and the platform thread don't agree on
-          // the
-          // timing of the new size.
+          // the timing of the new size.
           // Resizing the texture causes pixel stretching since the size of the GL texture used in
-          // the engine
-          // is set by the framework, but the texture buffer size is set by the platform down below.
-          if (physicalWidth > viewWrapper.getBufferWidth()
-              || physicalHeight > viewWrapper.getBufferHeight()) {
-            viewWrapper.setBufferSize(physicalWidth, physicalHeight);
+          // the engine is set by the framework, but the texture buffer size is set by the
+          // platform down below.
+          if (physicalWidth > viewWrapper.getRenderTargetWidth()
+              || physicalHeight > viewWrapper.getRenderTargetHeight()) {
+            viewWrapper.resizeRenderTarget(physicalWidth, physicalHeight);
           }
 
           final ViewGroup.LayoutParams viewWrapperLayoutParams = viewWrapper.getLayoutParams();
@@ -372,8 +389,8 @@ public class PlatformViewsController implements PlatformViewsAccessibilityDelega
           }
           onComplete.run(
               new PlatformViewsChannel.PlatformViewBufferSize(
-                  toLogicalPixels(viewWrapper.getBufferWidth()),
-                  toLogicalPixels(viewWrapper.getBufferHeight())));
+                  toLogicalPixels(viewWrapper.getRenderTargetWidth()),
+                  toLogicalPixels(viewWrapper.getRenderTargetHeight())));
         }
 
         @Override
@@ -402,7 +419,6 @@ public class PlatformViewsController implements PlatformViewsAccessibilityDelega
           view.dispatchTouchEvent(event);
         }
 
-        @TargetApi(17)
         @Override
         public void setDirection(int viewId, int direction) {
           if (!validateDirection(direction)) {
@@ -456,204 +472,201 @@ public class PlatformViewsController implements PlatformViewsAccessibilityDelega
           embeddedView.clearFocus();
         }
 
-        private void ensureValidAndroidVersion(int minSdkVersion) {
-          if (Build.VERSION.SDK_INT < minSdkVersion) {
-            throw new IllegalStateException(
-                "Trying to use platform views with API "
-                    + Build.VERSION.SDK_INT
-                    + ", required API level is: "
-                    + minSdkVersion);
-          }
+        @Override
+        public void synchronizeToNativeViewHierarchy(boolean yes) {
+          synchronizeToNativeViewHierarchy = yes;
         }
+      };
 
-        private void ensureValidRequest(
-            @NonNull PlatformViewsChannel.PlatformViewCreationRequest request) {
-          if (!validateDirection(request.direction)) {
-            throw new IllegalStateException(
-                "Trying to create a view with unknown direction value: "
-                    + request.direction
-                    + "(view id: "
-                    + request.viewId
-                    + ")");
-          }
-        }
+  /// Throws an exception if the SDK version is below minSdkVersion.
+  private void enforceMinimumAndroidApiVersion(int minSdkVersion) {
+    if (Build.VERSION.SDK_INT < minSdkVersion) {
+      throw new IllegalStateException(
+          "Trying to use platform views with API "
+              + Build.VERSION.SDK_INT
+              + ", required API level is: "
+              + minSdkVersion);
+    }
+  }
 
-        // Creates a platform view based on `request`, performs configuration that's common to
-        // all display modes, and adds it to `platformViews`.
-        @TargetApi(19)
-        private PlatformView createPlatformView(
-            @NonNull PlatformViewsChannel.PlatformViewCreationRequest request,
-            boolean wrapContext) {
-          final PlatformViewFactory viewFactory = registry.getFactory(request.viewType);
-          if (viewFactory == null) {
-            throw new IllegalStateException(
-                "Trying to create a platform view of unregistered type: " + request.viewType);
-          }
+  private void ensureValidRequest(
+      @NonNull PlatformViewsChannel.PlatformViewCreationRequest request) {
+    if (!validateDirection(request.direction)) {
+      throw new IllegalStateException(
+          "Trying to create a view with unknown direction value: "
+              + request.direction
+              + "(view id: "
+              + request.viewId
+              + ")");
+    }
+  }
 
-          Object createParams = null;
-          if (request.params != null) {
-            createParams = viewFactory.getCreateArgsCodec().decodeMessage(request.params);
-          }
+  // Creates a platform view based on `request`, performs configuration that's common to
+  // all display modes, and adds it to `platformViews`.
+  @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
+  public PlatformView createPlatformView(
+      @NonNull PlatformViewsChannel.PlatformViewCreationRequest request, boolean wrapContext) {
+    final PlatformViewFactory viewFactory = registry.getFactory(request.viewType);
+    if (viewFactory == null) {
+      throw new IllegalStateException(
+          "Trying to create a platform view of unregistered type: " + request.viewType);
+    }
 
-          // In some display modes, the context needs to be modified during display.
-          // TODO(stuartmorgan): Make this wrapping unconditional if possible; for context see
-          // https://github.com/flutter/flutter/issues/113449
-          final Context mutableContext = wrapContext ? new MutableContextWrapper(context) : context;
-          final PlatformView platformView =
-              viewFactory.create(mutableContext, request.viewId, createParams);
+    Object createParams = null;
+    if (request.params != null) {
+      createParams = viewFactory.getCreateArgsCodec().decodeMessage(request.params);
+    }
 
-          // Configure the view to match the requested layout direction.
-          final View embeddedView = platformView.getView();
-          if (embeddedView == null) {
-            throw new IllegalStateException(
-                "PlatformView#getView() returned null, but an Android view reference was expected.");
-          }
-          embeddedView.setLayoutDirection(request.direction);
+    // In some display modes, the context needs to be modified during display.
+    // TODO(stuartmorgan): Make this wrapping unconditional if possible; for context see
+    // https://github.com/flutter/flutter/issues/113449
+    final Context mutableContext = wrapContext ? new MutableContextWrapper(context) : context;
+    final PlatformView platformView =
+        viewFactory.create(mutableContext, request.viewId, createParams);
 
-          platformViews.put(request.viewId, platformView);
-          return platformView;
-        }
+    // Configure the view to match the requested layout direction.
+    final View embeddedView = platformView.getView();
+    if (embeddedView == null) {
+      throw new IllegalStateException(
+          "PlatformView#getView() returned null, but an Android view reference was expected.");
+    }
+    embeddedView.setLayoutDirection(request.direction);
+    platformViews.put(request.viewId, platformView);
+    maybeInvokeOnFlutterViewAttached(platformView);
+    return platformView;
+  }
 
-        // Configures the view for Hybrid Composition mode.
-        private void configureForHybridComposition(
-            @NonNull PlatformView platformView,
-            @NonNull PlatformViewsChannel.PlatformViewCreationRequest request) {
-          Log.i(TAG, "Using hybrid composition for platform view: " + request.viewId);
-        }
+  // Configures the view for Hybrid Composition mode.
+  private void configureForHybridComposition(
+      @NonNull PlatformView platformView,
+      @NonNull PlatformViewsChannel.PlatformViewCreationRequest request) {
+    enforceMinimumAndroidApiVersion(19);
+    Log.i(TAG, "Using hybrid composition for platform view: " + request.viewId);
+  }
 
-        // Configures the view for Virtual Display mode, returning the associated texture ID.
-        private long configureForVirtualDisplay(
-            @NonNull PlatformView platformView,
-            @NonNull PlatformViewsChannel.PlatformViewCreationRequest request) {
-          // This mode adds the view to a virtual display, which is is wired up to a GL texture that
-          // is composed by the Flutter engine.
-
-          // API level 20 is required to use VirtualDisplay#setSurface.
-          ensureValidAndroidVersion(20);
-
-          Log.i(TAG, "Hosting view in a virtual display for platform view: " + request.viewId);
-
-          final TextureRegistry.SurfaceTextureEntry textureEntry =
-              textureRegistry.createSurfaceTexture();
-          final int physicalWidth = toPhysicalPixels(request.logicalWidth);
-          final int physicalHeight = toPhysicalPixels(request.logicalHeight);
-          final VirtualDisplayController vdController =
-              VirtualDisplayController.create(
-                  context,
-                  accessibilityEventsDelegate,
-                  platformView,
-                  textureEntry,
-                  physicalWidth,
-                  physicalHeight,
-                  request.viewId,
-                  null,
-                  (view, hasFocus) -> {
-                    if (hasFocus) {
-                      platformViewsChannel.invokeViewFocused(request.viewId);
-                    }
-                  });
-
-          if (vdController == null) {
-            throw new IllegalStateException(
-                "Failed creating virtual display for a "
-                    + request.viewType
-                    + " with id: "
-                    + request.viewId);
-          }
+  // Configures the view for Virtual Display mode, returning the associated texture ID.
+  private long configureForVirtualDisplay(
+      @NonNull PlatformView platformView,
+      @NonNull PlatformViewsChannel.PlatformViewCreationRequest request) {
+    // This mode adds the view to a virtual display, which is wired up to a GL texture that
+    // is composed by the Flutter engine.
+
+    // API level 20 is required to use VirtualDisplay#setSurface.
+    enforceMinimumAndroidApiVersion(20);
+
+    Log.i(TAG, "Hosting view in a virtual display for platform view: " + request.viewId);
+
+    final PlatformViewRenderTarget renderTarget = makePlatformViewRenderTarget(textureRegistry);
+    final int physicalWidth = toPhysicalPixels(request.logicalWidth);
+    final int physicalHeight = toPhysicalPixels(request.logicalHeight);
+    final VirtualDisplayController vdController =
+        VirtualDisplayController.create(
+            context,
+            accessibilityEventsDelegate,
+            platformView,
+            renderTarget,
+            physicalWidth,
+            physicalHeight,
+            request.viewId,
+            null,
+            (view, hasFocus) -> {
+              if (hasFocus) {
+                platformViewsChannel.invokeViewFocused(request.viewId);
+              }
+            });
+
+    if (vdController == null) {
+      throw new IllegalStateException(
+          "Failed creating virtual display for a "
+              + request.viewType
+              + " with id: "
+              + request.viewId);
+    }
 
-          // If our FlutterEngine is already attached to a Flutter UI, provide that Android
-          // View to this new platform view.
-          if (flutterView != null) {
-            vdController.onFlutterViewAttached(flutterView);
-          }
+    // The embedded view doesn't need to be sized in Virtual Display mode because the
+    // virtual display itself is sized.
 
-          // The embedded view doesn't need to be sized in Virtual Display mode because the
-          // virtual display itself is sized.
+    vdControllers.put(request.viewId, vdController);
+    final View embeddedView = platformView.getView();
+    contextToEmbeddedView.put(embeddedView.getContext(), embeddedView);
 
-          vdControllers.put(request.viewId, vdController);
-          final View embeddedView = platformView.getView();
-          contextToEmbeddedView.put(embeddedView.getContext(), embeddedView);
+    return renderTarget.getId();
+  }
 
-          return textureEntry.id();
-        }
+  // Configures the view for Texture Layer Hybrid Composition mode, returning the associated
+  // texture ID.
+  @TargetApi(API_LEVELS.API_23)
+  @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
+  public long configureForTextureLayerComposition(
+      @NonNull PlatformView platformView,
+      @NonNull PlatformViewsChannel.PlatformViewCreationRequest request) {
+    // This mode attaches the view to the Android view hierarchy and record its drawing
+    // operations, so they can be forwarded to a GL texture that is composed by the
+    // Flutter engine.
+
+    // API level 23 is required to use Surface#lockHardwareCanvas().
+    enforceMinimumAndroidApiVersion(23);
+    Log.i(TAG, "Hosting view in view hierarchy for platform view: " + request.viewId);
+
+    final int physicalWidth = toPhysicalPixels(request.logicalWidth);
+    final int physicalHeight = toPhysicalPixels(request.logicalHeight);
+    PlatformViewWrapper viewWrapper;
+    long textureId;
+    if (usesSoftwareRendering) {
+      viewWrapper = new PlatformViewWrapper(context);
+      textureId = -1;
+    } else {
+      final PlatformViewRenderTarget renderTarget = makePlatformViewRenderTarget(textureRegistry);
+      viewWrapper = new PlatformViewWrapper(context, renderTarget);
+      textureId = renderTarget.getId();
+    }
+    viewWrapper.setTouchProcessor(androidTouchProcessor);
+    viewWrapper.resizeRenderTarget(physicalWidth, physicalHeight);
 
-        // Configures the view for Texture Layer Hybrid Composition mode, returning the associated
-        // texture ID.
-        @TargetApi(23)
-        private long configureForTextureLayerComposition(
-            @NonNull PlatformView platformView,
-            @NonNull PlatformViewsChannel.PlatformViewCreationRequest request) {
-          // This mode attaches the view to the Android view hierarchy and record its drawing
-          // operations, so they can be forwarded to a GL texture that is composed by the
-          // Flutter engine.
-
-          // API level 23 is required to use Surface#lockHardwareCanvas().
-          ensureValidAndroidVersion(23);
-          Log.i(TAG, "Hosting view in view hierarchy for platform view: " + request.viewId);
-
-          final int physicalWidth = toPhysicalPixels(request.logicalWidth);
-          final int physicalHeight = toPhysicalPixels(request.logicalHeight);
-          PlatformViewWrapper viewWrapper;
-          long textureId;
-          if (usesSoftwareRendering) {
-            viewWrapper = new PlatformViewWrapper(context);
-            textureId = -1;
-          } else {
-            final TextureRegistry.SurfaceTextureEntry textureEntry =
-                textureRegistry.createSurfaceTexture();
-            viewWrapper = new PlatformViewWrapper(context, textureEntry);
-            textureId = textureEntry.id();
-          }
-          viewWrapper.setTouchProcessor(androidTouchProcessor);
-          viewWrapper.setBufferSize(physicalWidth, physicalHeight);
+    final FrameLayout.LayoutParams viewWrapperLayoutParams =
+        new FrameLayout.LayoutParams(physicalWidth, physicalHeight);
 
-          final FrameLayout.LayoutParams viewWrapperLayoutParams =
-              new FrameLayout.LayoutParams(physicalWidth, physicalHeight);
+    // Size and position the view wrapper.
+    final int physicalTop = toPhysicalPixels(request.logicalTop);
+    final int physicalLeft = toPhysicalPixels(request.logicalLeft);
+    viewWrapperLayoutParams.topMargin = physicalTop;
+    viewWrapperLayoutParams.leftMargin = physicalLeft;
+    viewWrapper.setLayoutParams(viewWrapperLayoutParams);
 
-          // Size and position the view wrapper.
-          final int physicalTop = toPhysicalPixels(request.logicalTop);
-          final int physicalLeft = toPhysicalPixels(request.logicalLeft);
-          viewWrapperLayoutParams.topMargin = physicalTop;
-          viewWrapperLayoutParams.leftMargin = physicalLeft;
-          viewWrapper.setLayoutParams(viewWrapperLayoutParams);
+    // Size the embedded view.
+    final View embeddedView = platformView.getView();
+    embeddedView.setLayoutParams(new FrameLayout.LayoutParams(physicalWidth, physicalHeight));
+
+    // Accessibility in the embedded view is initially disabled because if a Flutter app
+    // disabled accessibility in the first frame, the embedding won't receive an update to
+    // disable accessibility since the embedding never received an update to enable it.
+    // The AccessibilityBridge keeps track of the accessibility nodes, and handles the deltas
+    // when the framework sends a new a11y tree to the embedding.
+    // To prevent races, the framework populate the SemanticsNode after the platform view has
+    // been created.
+    embeddedView.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
 
-          // Size the embedded view.
-          final View embeddedView = platformView.getView();
-          embeddedView.setLayoutParams(new FrameLayout.LayoutParams(physicalWidth, physicalHeight));
-
-          // Accessibility in the embedded view is initially disabled because if a Flutter app
-          // disabled accessibility in the first frame, the embedding won't receive an update to
-          // disable accessibility since the embedding never received an update to enable it.
-          // The AccessibilityBridge keeps track of the accessibility nodes, and handles the deltas
-          // when the framework sends a new a11y tree to the embedding.
-          // To prevent races, the framework populate the SemanticsNode after the platform view has
-          // been created.
-          embeddedView.setImportantForAccessibility(
-              View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
-
-          // Add the embedded view to the wrapper.
-          viewWrapper.addView(embeddedView);
-
-          // Listen for focus changed in any subview, so the framework is notified when the platform
-          // view is focused.
-          viewWrapper.setOnDescendantFocusChangeListener(
-              (v, hasFocus) -> {
-                if (hasFocus) {
-                  platformViewsChannel.invokeViewFocused(request.viewId);
-                } else if (textInputPlugin != null) {
-                  textInputPlugin.clearPlatformViewClient(request.viewId);
-                }
-              });
-          flutterView.addView(viewWrapper);
-          viewWrappers.append(request.viewId, viewWrapper);
-          return textureId;
-        }
+    // Add the embedded view to the wrapper.
+    viewWrapper.addView(embeddedView);
 
-        @Override
-        public void synchronizeToNativeViewHierarchy(boolean yes) {
-          synchronizeToNativeViewHierarchy = yes;
-        }
-      };
+    // Listen for focus changed in any subview, so the framework is notified when the platform
+    // view is focused.
+    viewWrapper.setOnDescendantFocusChangeListener(
+        (v, hasFocus) -> {
+          if (hasFocus) {
+            platformViewsChannel.invokeViewFocused(request.viewId);
+          } else if (textInputPlugin != null) {
+            textInputPlugin.clearPlatformViewClient(request.viewId);
+          }
+        });
+
+    flutterView.addView(viewWrapper);
+    viewWrappers.append(request.viewId, viewWrapper);
+
+    maybeInvokeOnFlutterViewAttached(platformView);
+
+    return textureId;
+  }
 
   @VisibleForTesting
   public MotionEvent toMotionEvent(
@@ -662,6 +675,15 @@ public class PlatformViewsController implements PlatformViewsAccessibilityDelega
         MotionEventTracker.MotionEventId.from(touch.motionEventId);
     MotionEvent trackedEvent = motionEventTracker.pop(motionEventId);
 
+    if (!usingVirtualDiplay && trackedEvent != null) {
+      // We have the original event, deliver it as it will pass the verifiable
+      // input check.
+      return trackedEvent;
+    }
+    // We are in virtual display mode or don't have a reference to the original MotionEvent.
+    // In this case we manually recreate a MotionEvent to be delivered. This MotionEvent
+    // will fail the verifiable input check.
+
     // Pointer coordinates in the tracked events are global to FlutterView
     // framework converts them to be local to a widget, given that
     // motion events operate on local coords, we need to replace these in the tracked
@@ -673,24 +695,6 @@ public class PlatformViewsController implements PlatformViewsAccessibilityDelega
         parsePointerCoordsList(touch.rawPointerCoords, density)
             .toArray(new PointerCoords[touch.pointerCount]);
 
-    if (!usingVirtualDiplay && trackedEvent != null) {
-      return MotionEvent.obtain(
-          trackedEvent.getDownTime(),
-          trackedEvent.getEventTime(),
-          touch.action,
-          touch.pointerCount,
-          pointerProperties,
-          pointerCoords,
-          trackedEvent.getMetaState(),
-          trackedEvent.getButtonState(),
-          trackedEvent.getXPrecision(),
-          trackedEvent.getYPrecision(),
-          trackedEvent.getDeviceId(),
-          trackedEvent.getEdgeFlags(),
-          trackedEvent.getSource(),
-          trackedEvent.getFlags());
-    }
-
     // TODO (kaushikiska) : warn that we are potentially using an untracked
     // event in the platform views.
     return MotionEvent.obtain(
@@ -840,6 +844,15 @@ public class PlatformViewsController implements PlatformViewsAccessibilityDelega
     }
   }
 
+  private void maybeInvokeOnFlutterViewAttached(PlatformView view) {
+    if (flutterView == null) {
+      Log.i(TAG, "null flutterView");
+      // There is currently no FlutterView that we are attached to.
+      return;
+    }
+    view.onFlutterViewAttached(flutterView);
+  }
+
   @Override
   public void attachAccessibilityBridge(@NonNull AccessibilityBridge accessibilityBridge) {
     accessibilityEventsDelegate.setAccessibilityBridge(accessibilityBridge);
@@ -951,6 +964,23 @@ public class PlatformViewsController implements PlatformViewsAccessibilityDelega
     controller.onInputConnectionUnlocked();
   }
 
+  private static PlatformViewRenderTarget makePlatformViewRenderTarget(
+      TextureRegistry textureRegistry) {
+    if (enableSurfaceProducerRenderTarget && Build.VERSION.SDK_INT >= API_LEVELS.API_29) {
+      final TextureRegistry.SurfaceProducer textureEntry = textureRegistry.createSurfaceProducer();
+      Log.i(TAG, "PlatformView is using SurfaceProducer backend");
+      return new SurfaceProducerPlatformViewRenderTarget(textureEntry);
+    }
+    if (enableImageRenderTarget && Build.VERSION.SDK_INT >= API_LEVELS.API_29) {
+      final TextureRegistry.ImageTextureEntry textureEntry = textureRegistry.createImageTexture();
+      Log.i(TAG, "PlatformView is using ImageReader backend");
+      return new ImageReaderPlatformViewRenderTarget(textureEntry);
+    }
+    final TextureRegistry.SurfaceTextureEntry textureEntry = textureRegistry.createSurfaceTexture();
+    Log.i(TAG, "PlatformView is using SurfaceTexture backend");
+    return new SurfaceTexturePlatformViewRenderTarget(textureEntry);
+  }
+
   private static boolean validateDirection(int direction) {
     return direction == View.LAYOUT_DIRECTION_LTR || direction == View.LAYOUT_DIRECTION_RTL;
   }
@@ -991,12 +1021,12 @@ public class PlatformViewsController implements PlatformViewsAccessibilityDelega
     coords.orientation = (float) (double) coordsList.get(0);
     coords.pressure = (float) (double) coordsList.get(1);
     coords.size = (float) (double) coordsList.get(2);
-    coords.toolMajor = (float) (double) coordsList.get(3) * density;
-    coords.toolMinor = (float) (double) coordsList.get(4) * density;
-    coords.touchMajor = (float) (double) coordsList.get(5) * density;
-    coords.touchMinor = (float) (double) coordsList.get(6) * density;
-    coords.x = (float) (double) coordsList.get(7) * density;
-    coords.y = (float) (double) coordsList.get(8) * density;
+    coords.toolMajor = (float) ((double) coordsList.get(3) * density);
+    coords.toolMinor = (float) ((double) coordsList.get(4) * density);
+    coords.touchMajor = (float) ((double) coordsList.get(5) * density);
+    coords.touchMinor = (float) ((double) coordsList.get(6) * density);
+    coords.x = (float) ((double) coordsList.get(7) * density);
+    coords.y = (float) ((double) coordsList.get(8) * density);
     return coords;
   }
 
@@ -1024,6 +1054,34 @@ public class PlatformViewsController implements PlatformViewsAccessibilityDelega
     }
   }
 
+  // Invoked when the Android system is requesting we reduce memory usage.
+  public void onTrimMemory(int level) {
+    if (level < ComponentCallbacks2.TRIM_MEMORY_BACKGROUND) {
+      return;
+    }
+    for (VirtualDisplayController vdc : vdControllers.values()) {
+      vdc.clearSurface();
+    }
+  }
+
+  // Called after the application has been resumed.
+  // This is where we undo whatever may have been done in onTrimMemory.
+  public void onResume() {
+    for (VirtualDisplayController vdc : vdControllers.values()) {
+      vdc.resetSurface();
+    }
+  }
+
+  /**
+   * Disposes a single
+   *
+   * @param viewId the PlatformView ID.
+   */
+  @VisibleForTesting
+  public void disposePlatformView(int viewId) {
+    channelHandler.dispose(viewId);
+  }
+
   private void initializeRootImageViewIfNeeded() {
     if (synchronizeToNativeViewHierarchy && !flutterViewConvertedToImageView) {
       flutterView.convertToImageView();
@@ -1038,7 +1096,6 @@ public class PlatformViewsController implements PlatformViewsAccessibilityDelega
    *     testing.
    */
   @VisibleForTesting
-  @TargetApi(Build.VERSION_CODES.KITKAT)
   void initializePlatformViewIfNeeded(int viewId) {
     final PlatformView platformView = platformViews.get(viewId);
     if (platformView == null) {
@@ -1055,7 +1112,8 @@ public class PlatformViewsController implements PlatformViewsAccessibilityDelega
     }
     if (embeddedView.getParent() != null) {
       throw new IllegalStateException(
-          "The Android view returned from PlatformView#getView() was already added to a parent view.");
+          "The Android view returned from PlatformView#getView() was already added to a parent"
+              + " view.");
     }
     final FlutterMutatorView parentView =
         new FlutterMutatorView(
@@ -1215,6 +1273,7 @@ public class PlatformViewsController implements PlatformViewsAccessibilityDelega
         }
         // Hide overlay surfaces that aren't rendered in the current frame.
         overlayView.setVisibility(View.GONE);
+        flutterView.removeView(overlayView);
       }
     }
 
@@ -1248,7 +1307,6 @@ public class PlatformViewsController implements PlatformViewsAccessibilityDelega
    *     for public use, and is only visible for testing.
    */
   @VisibleForTesting
-  @TargetApi(19)
   @NonNull
   public FlutterOverlaySurface createOverlaySurface(@NonNull PlatformOverlayView imageView) {
     final int id = nextOverlayLayerId++;
@@ -1263,7 +1321,6 @@ public class PlatformViewsController implements PlatformViewsAccessibilityDelega
    *
    * <p>This member is not intended for public use, and is only visible for testing.
    */
-  @TargetApi(19)
   @NonNull
   public FlutterOverlaySurface createOverlaySurface() {
     // Overlay surfaces have the same size as the background surface.
@@ -1307,4 +1364,9 @@ public class PlatformViewsController implements PlatformViewsAccessibilityDelega
     }
     overlayLayerViews.clear();
   }
+
+  @VisibleForTesting
+  public SparseArray<PlatformOverlayView> getOverlayLayerViews() {
+    return overlayLayerViews;
+  }
 }
diff --git a/shell/platform/android/io/flutter/plugin/platform/SingleViewFakeWindowViewGroup.java b/shell/platform/android/io/flutter/plugin/platform/SingleViewFakeWindowViewGroup.java
new file mode 100644
index 0000000000000000000000000000000000000000..fa16b525435efb6c2326cb0d273841f25d064be0
--- /dev/null
+++ b/shell/platform/android/io/flutter/plugin/platform/SingleViewFakeWindowViewGroup.java
@@ -0,0 +1,65 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.plugin.platform;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+
+/*
+ * A view group that implements the same layout protocol that exist between the WindowManager and its direct
+ * children.
+ *
+ * Currently only a subset of the protocol is supported (gravity, x, and y).
+ */
+class SingleViewFakeWindowViewGroup extends ViewGroup {
+  // Used in onLayout to keep the bounds of the current view.
+  // We keep it as a member to avoid object allocations during onLayout which are discouraged.
+  private final Rect viewBounds;
+
+  // Used in onLayout to keep the bounds of the child views.
+  // We keep it as a member to avoid object allocations during onLayout which are discouraged.
+  private final Rect childRect;
+
+  public SingleViewFakeWindowViewGroup(Context context) {
+    super(context);
+    viewBounds = new Rect();
+    childRect = new Rect();
+  }
+
+  @Override
+  protected void onLayout(boolean changed, int l, int t, int r, int b) {
+    for (int i = 0; i < getChildCount(); i++) {
+      View child = getChildAt(i);
+      WindowManager.LayoutParams params = (WindowManager.LayoutParams) child.getLayoutParams();
+      viewBounds.set(l, t, r, b);
+      Gravity.apply(
+          params.gravity,
+          child.getMeasuredWidth(),
+          child.getMeasuredHeight(),
+          viewBounds,
+          params.x,
+          params.y,
+          childRect);
+      child.layout(childRect.left, childRect.top, childRect.right, childRect.bottom);
+    }
+  }
+
+  @Override
+  protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+    for (int i = 0; i < getChildCount(); i++) {
+      View child = getChildAt(i);
+      child.measure(atMost(widthMeasureSpec), atMost(heightMeasureSpec));
+    }
+    super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+  }
+
+  private static int atMost(int measureSpec) {
+    return MeasureSpec.makeMeasureSpec(MeasureSpec.getSize(measureSpec), MeasureSpec.AT_MOST);
+  }
+}
diff --git a/shell/platform/android/io/flutter/plugin/platform/SingleViewPresentation.java b/shell/platform/android/io/flutter/plugin/platform/SingleViewPresentation.java
index 78414523218785013e457f4c6cf9e0f789d3ba08..82a8013db30c413943b06da666de831c5cd6da50 100644
--- a/shell/platform/android/io/flutter/plugin/platform/SingleViewPresentation.java
+++ b/shell/platform/android/io/flutter/plugin/platform/SingleViewPresentation.java
@@ -7,20 +7,15 @@ package io.flutter.plugin.platform;
 import static android.content.Context.WINDOW_SERVICE;
 import static android.view.View.OnFocusChangeListener;
 
-import android.annotation.TargetApi;
 import android.app.AlertDialog;
 import android.app.Presentation;
 import android.content.Context;
 import android.content.ContextWrapper;
 import android.content.MutableContextWrapper;
-import android.graphics.Rect;
 import android.graphics.drawable.ColorDrawable;
-import android.os.Build;
 import android.os.Bundle;
 import android.view.Display;
-import android.view.Gravity;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.inputmethod.InputMethodManager;
@@ -29,10 +24,6 @@ import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import io.flutter.Log;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
 
 /*
  * A presentation used for hosting a single Android view in a virtual display.
@@ -51,7 +42,6 @@ import java.lang.reflect.Proxy;
  *   EmbeddedView
  */
 @Keep
-@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
 class SingleViewPresentation extends Presentation {
   private static final String TAG = "PlatformViewsController";
 
@@ -71,7 +61,7 @@ class SingleViewPresentation extends Presentation {
 
     // Contains views that were added directly to the window manager (e.g
     // android.widget.PopupWindow).
-    private FakeWindowViewGroup fakeWindowViewGroup;
+    private SingleViewFakeWindowViewGroup fakeWindowViewGroup;
   }
 
   // A reference to the current accessibility bridge to which accessibility events will be
@@ -123,9 +113,7 @@ class SingleViewPresentation extends Presentation {
         .setFlags(
             WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
             WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE);
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-      getWindow().setType(WindowManager.LayoutParams.TYPE_PRIVATE_PRESENTATION);
-    }
+    getWindow().setType(WindowManager.LayoutParams.TYPE_PRIVATE_PRESENTATION);
   }
 
   /**
@@ -158,7 +146,7 @@ class SingleViewPresentation extends Presentation {
     // This makes sure we preserve alpha for the VD's content.
     getWindow().setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT));
     if (state.fakeWindowViewGroup == null) {
-      state.fakeWindowViewGroup = new FakeWindowViewGroup(getContext());
+      state.fakeWindowViewGroup = new SingleViewFakeWindowViewGroup(getContext());
     }
     if (state.windowManagerHandler == null) {
       WindowManager windowManagerDelegate =
@@ -213,69 +201,21 @@ class SingleViewPresentation extends Presentation {
   }
 
   public PresentationState detachState() {
-    container.removeAllViews();
-    rootView.removeAllViews();
+    // These views can be null before onCreate() is called
+    if (container != null) {
+      container.removeAllViews();
+    }
+    if (rootView != null) {
+      rootView.removeAllViews();
+    }
     return state;
   }
 
+  @Nullable
   public PlatformView getView() {
-    if (state.platformView == null) return null;
     return state.platformView;
   }
 
-  /*
-   * A view group that implements the same layout protocol that exist between the WindowManager and its direct
-   * children.
-   *
-   * Currently only a subset of the protocol is supported (gravity, x, and y).
-   */
-  static class FakeWindowViewGroup extends ViewGroup {
-    // Used in onLayout to keep the bounds of the current view.
-    // We keep it as a member to avoid object allocations during onLayout which are discouraged.
-    private final Rect viewBounds;
-
-    // Used in onLayout to keep the bounds of the child views.
-    // We keep it as a member to avoid object allocations during onLayout which are discouraged.
-    private final Rect childRect;
-
-    public FakeWindowViewGroup(Context context) {
-      super(context);
-      viewBounds = new Rect();
-      childRect = new Rect();
-    }
-
-    @Override
-    protected void onLayout(boolean changed, int l, int t, int r, int b) {
-      for (int i = 0; i < getChildCount(); i++) {
-        View child = getChildAt(i);
-        WindowManager.LayoutParams params = (WindowManager.LayoutParams) child.getLayoutParams();
-        viewBounds.set(l, t, r, b);
-        Gravity.apply(
-            params.gravity,
-            child.getMeasuredWidth(),
-            child.getMeasuredHeight(),
-            viewBounds,
-            params.x,
-            params.y,
-            childRect);
-        child.layout(childRect.left, childRect.top, childRect.right, childRect.bottom);
-      }
-    }
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-      for (int i = 0; i < getChildCount(); i++) {
-        View child = getChildAt(i);
-        child.measure(atMost(widthMeasureSpec), atMost(heightMeasureSpec));
-      }
-      super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-    }
-
-    private static int atMost(int measureSpec) {
-      return MeasureSpec.makeMeasureSpec(MeasureSpec.getSize(measureSpec), MeasureSpec.AT_MOST);
-    }
-  }
-
   /** Answers calls for {@link InputMethodManager} with an instance cached at creation time. */
   // TODO(mklim): This caches the IMM at construction time and won't pick up any changes. In rare
   // cases where the FlutterView changes windows this will return an outdated instance. This
@@ -354,7 +294,7 @@ class SingleViewPresentation extends Presentation {
 
     private WindowManager getWindowManager() {
       if (windowManager == null) {
-        windowManager = windowManagerHandler.getWindowManager();
+        windowManager = windowManagerHandler;
       }
       return windowManager;
     }
@@ -371,101 +311,6 @@ class SingleViewPresentation extends Presentation {
     }
   }
 
-  /*
-   * A dynamic proxy handler for a WindowManager with custom overrides.
-   *
-   * The presentation's window manager delegates all calls to the default window manager.
-   * WindowManager#addView calls triggered by views that are attached to the virtual display are crashing
-   * (see: https://github.com/flutter/flutter/issues/20714). This was triggered when selecting text in an embedded
-   * WebView (as the selection handles are implemented as popup windows).
-   *
-   * This dynamic proxy overrides the addView, removeView, removeViewImmediate, and updateViewLayout methods
-   * to prevent these crashes.
-   *
-   * This will be more efficient as a static proxy that's not using reflection, but as the engine is currently
-   * not being built against the latest Android SDK we cannot override all relevant method.
-   * Tracking issue for upgrading the engine's Android sdk: https://github.com/flutter/flutter/issues/20717
-   */
-  static class WindowManagerHandler implements InvocationHandler {
-    private static final String TAG = "PlatformViewsController";
-
-    private final WindowManager delegate;
-    FakeWindowViewGroup fakeWindowRootView;
-
-    WindowManagerHandler(WindowManager delegate, FakeWindowViewGroup fakeWindowViewGroup) {
-      this.delegate = delegate;
-      fakeWindowRootView = fakeWindowViewGroup;
-    }
-
-    public WindowManager getWindowManager() {
-      return (WindowManager)
-          Proxy.newProxyInstance(
-              WindowManager.class.getClassLoader(), new Class<?>[] {WindowManager.class}, this);
-    }
-
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-      switch (method.getName()) {
-        case "addView":
-          addView(args);
-          return null;
-        case "removeView":
-          removeView(args);
-          return null;
-        case "removeViewImmediate":
-          removeViewImmediate(args);
-          return null;
-        case "updateViewLayout":
-          updateViewLayout(args);
-          return null;
-      }
-      try {
-        return method.invoke(delegate, args);
-      } catch (InvocationTargetException e) {
-        throw e.getCause();
-      }
-    }
-
-    private void addView(Object[] args) {
-      if (fakeWindowRootView == null) {
-        Log.w(TAG, "Embedded view called addView while detached from presentation");
-        return;
-      }
-      View view = (View) args[0];
-      WindowManager.LayoutParams layoutParams = (WindowManager.LayoutParams) args[1];
-      fakeWindowRootView.addView(view, layoutParams);
-    }
-
-    private void removeView(Object[] args) {
-      if (fakeWindowRootView == null) {
-        Log.w(TAG, "Embedded view called removeView while detached from presentation");
-        return;
-      }
-      View view = (View) args[0];
-      fakeWindowRootView.removeView(view);
-    }
-
-    private void removeViewImmediate(Object[] args) {
-      if (fakeWindowRootView == null) {
-        Log.w(TAG, "Embedded view called removeViewImmediate while detached from presentation");
-        return;
-      }
-      View view = (View) args[0];
-      view.clearAnimation();
-      fakeWindowRootView.removeView(view);
-    }
-
-    private void updateViewLayout(Object[] args) {
-      if (fakeWindowRootView == null) {
-        Log.w(TAG, "Embedded view called updateViewLayout while detached from presentation");
-        return;
-      }
-      View view = (View) args[0];
-      WindowManager.LayoutParams layoutParams = (WindowManager.LayoutParams) args[1];
-      fakeWindowRootView.updateViewLayout(view, layoutParams);
-    }
-  }
-
   private static class AccessibilityDelegatingFrameLayout extends FrameLayout {
     private final AccessibilityEventsDelegate accessibilityEventsDelegate;
     private final View embeddedView;
diff --git a/shell/platform/android/io/flutter/plugin/platform/SingleViewWindowManager.java b/shell/platform/android/io/flutter/plugin/platform/SingleViewWindowManager.java
new file mode 100644
index 0000000000000000000000000000000000000000..ffeb3871afc475d8524ed1e89860093e3353a3f9
--- /dev/null
+++ b/shell/platform/android/io/flutter/plugin/platform/SingleViewWindowManager.java
@@ -0,0 +1,128 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.plugin.platform;
+
+import static io.flutter.Build.API_LEVELS;
+
+import android.view.Display;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.view.WindowMetrics;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import io.flutter.Log;
+import java.util.concurrent.Executor;
+import java.util.function.Consumer;
+
+/**
+ * A static proxy handler for a WindowManager with custom overrides.
+ *
+ * <p>The presentation's window manager delegates all calls to the default window manager.
+ * WindowManager#addView calls triggered by views that are attached to the virtual display are
+ * crashing (see: https://github.com/flutter/flutter/issues/20714). This was triggered when
+ * selecting text in an embedded WebView (as the selection handles are implemented as popup
+ * windows).
+ *
+ * <p>This static proxy overrides the addView, removeView, removeViewImmediate, and updateViewLayout
+ * methods to prevent these crashes, and forwards all other calls to the delegate.
+ *
+ * <p>This is an abstract class because some clients of Flutter compile the Android embedding with
+ * the Android System SDK, which has additional abstract methods that need to be overriden.
+ */
+abstract class SingleViewWindowManager implements WindowManager {
+  private static final String TAG = "PlatformViewsController";
+
+  final WindowManager delegate;
+  SingleViewFakeWindowViewGroup fakeWindowRootView;
+
+  SingleViewWindowManager(
+      WindowManager delegate, SingleViewFakeWindowViewGroup fakeWindowViewGroup) {
+    this.delegate = delegate;
+    fakeWindowRootView = fakeWindowViewGroup;
+  }
+
+  @Override
+  @Deprecated
+  public Display getDefaultDisplay() {
+    return delegate.getDefaultDisplay();
+  }
+
+  @Override
+  public void removeViewImmediate(View view) {
+    if (fakeWindowRootView == null) {
+      Log.w(TAG, "Embedded view called removeViewImmediate while detached from presentation");
+      return;
+    }
+    view.clearAnimation();
+    fakeWindowRootView.removeView(view);
+  }
+
+  @Override
+  public void addView(View view, ViewGroup.LayoutParams params) {
+    if (fakeWindowRootView == null) {
+      Log.w(TAG, "Embedded view called addView while detached from presentation");
+      return;
+    }
+    fakeWindowRootView.addView(view, params);
+  }
+
+  @Override
+  public void updateViewLayout(View view, ViewGroup.LayoutParams params) {
+    if (fakeWindowRootView == null) {
+      Log.w(TAG, "Embedded view called updateViewLayout while detached from presentation");
+      return;
+    }
+    fakeWindowRootView.updateViewLayout(view, params);
+  }
+
+  @Override
+  public void removeView(View view) {
+    if (fakeWindowRootView == null) {
+      Log.w(TAG, "Embedded view called removeView while detached from presentation");
+      return;
+    }
+    fakeWindowRootView.removeView(view);
+  }
+
+  @RequiresApi(api = API_LEVELS.API_30)
+  @NonNull
+  @Override
+  public WindowMetrics getCurrentWindowMetrics() {
+    return delegate.getCurrentWindowMetrics();
+  }
+
+  @RequiresApi(api = API_LEVELS.API_30)
+  @NonNull
+  @Override
+  public WindowMetrics getMaximumWindowMetrics() {
+    return delegate.getMaximumWindowMetrics();
+  }
+
+  @RequiresApi(api = API_LEVELS.API_31)
+  @Override
+  public boolean isCrossWindowBlurEnabled() {
+    return delegate.isCrossWindowBlurEnabled();
+  }
+
+  @RequiresApi(api = API_LEVELS.API_31)
+  @Override
+  public void addCrossWindowBlurEnabledListener(@NonNull Consumer<Boolean> listener) {
+    delegate.addCrossWindowBlurEnabledListener(listener);
+  }
+
+  @RequiresApi(api = API_LEVELS.API_31)
+  @Override
+  public void addCrossWindowBlurEnabledListener(
+      @NonNull Executor executor, @NonNull Consumer<Boolean> listener) {
+    delegate.addCrossWindowBlurEnabledListener(executor, listener);
+  }
+
+  @RequiresApi(api = API_LEVELS.API_31)
+  @Override
+  public void removeCrossWindowBlurEnabledListener(@NonNull Consumer<Boolean> listener) {
+    delegate.removeCrossWindowBlurEnabledListener(listener);
+  }
+}
diff --git a/shell/platform/android/io/flutter/plugin/platform/SurfaceProducerPlatformViewRenderTarget.java b/shell/platform/android/io/flutter/plugin/platform/SurfaceProducerPlatformViewRenderTarget.java
new file mode 100644
index 0000000000000000000000000000000000000000..03e28d28806f4d0104ea51aa35d1df2894cf01e5
--- /dev/null
+++ b/shell/platform/android/io/flutter/plugin/platform/SurfaceProducerPlatformViewRenderTarget.java
@@ -0,0 +1,57 @@
+package io.flutter.plugin.platform;
+
+import static io.flutter.Build.API_LEVELS;
+
+import android.annotation.TargetApi;
+import android.view.Surface;
+import io.flutter.view.TextureRegistry.SurfaceProducer;
+
+@TargetApi(API_LEVELS.API_29)
+public class SurfaceProducerPlatformViewRenderTarget implements PlatformViewRenderTarget {
+  private static final String TAG = "SurfaceProducerRenderTarget";
+  private SurfaceProducer producer;
+
+  public SurfaceProducerPlatformViewRenderTarget(SurfaceProducer producer) {
+    this.producer = producer;
+  }
+
+  // Called when the render target should be resized.
+  public void resize(int width, int height) {
+    this.producer.setSize(width, height);
+  }
+
+  // Returns the currently specified width.
+  public int getWidth() {
+    return this.producer.getWidth();
+  }
+
+  // Returns the currently specified height.
+  public int getHeight() {
+    return this.producer.getHeight();
+  }
+
+  // The id of this render target.
+  public long getId() {
+    return this.producer.id();
+  }
+
+  // Releases backing resources.
+  public void release() {
+    this.producer.release();
+    this.producer = null;
+  }
+
+  // Returns true in the case that backing resource have been released.
+  public boolean isReleased() {
+    return this.producer == null;
+  }
+
+  // Returns the Surface to be rendered on to.
+  public Surface getSurface() {
+    return this.producer.getSurface();
+  }
+
+  public void scheduleFrame() {
+    this.producer.scheduleFrame();
+  }
+}
diff --git a/shell/platform/android/io/flutter/plugin/platform/SurfaceTexturePlatformViewRenderTarget.java b/shell/platform/android/io/flutter/plugin/platform/SurfaceTexturePlatformViewRenderTarget.java
new file mode 100644
index 0000000000000000000000000000000000000000..4f1bdd62b4e55590267c2b9cd3a4671c58c04ea1
--- /dev/null
+++ b/shell/platform/android/io/flutter/plugin/platform/SurfaceTexturePlatformViewRenderTarget.java
@@ -0,0 +1,111 @@
+package io.flutter.plugin.platform;
+
+import static android.content.ComponentCallbacks2.TRIM_MEMORY_COMPLETE;
+import static io.flutter.Build.API_LEVELS;
+
+import android.annotation.TargetApi;
+import android.graphics.SurfaceTexture;
+import android.os.Build;
+import android.view.Surface;
+import io.flutter.view.TextureRegistry;
+import io.flutter.view.TextureRegistry.SurfaceTextureEntry;
+
+@TargetApi(API_LEVELS.API_26)
+public class SurfaceTexturePlatformViewRenderTarget implements PlatformViewRenderTarget {
+  private static final String TAG = "SurfaceTexturePlatformViewRenderTarget";
+
+  private final SurfaceTextureEntry surfaceTextureEntry;
+
+  private SurfaceTexture surfaceTexture;
+  private Surface surface;
+  private int bufferWidth = 0;
+  private int bufferHeight = 0;
+
+  private boolean shouldRecreateSurfaceForLowMemory = false;
+  private final TextureRegistry.OnTrimMemoryListener trimMemoryListener =
+      new TextureRegistry.OnTrimMemoryListener() {
+        @Override
+        public void onTrimMemory(int level) {
+          // When a memory pressure warning is received and the level equal {@code
+          // ComponentCallbacks2.TRIM_MEMORY_COMPLETE}, the Android system releases the underlying
+          // surface. If we continue to use the surface (e.g., call lockHardwareCanvas), a crash
+          // occurs, and we found that this crash appeared on Android 10 and above.
+          // See https://github.com/flutter/flutter/issues/103870 for more details.
+          //
+          // Here our workaround is to recreate the surface before using it.
+          if (level == TRIM_MEMORY_COMPLETE && Build.VERSION.SDK_INT >= API_LEVELS.API_29) {
+            shouldRecreateSurfaceForLowMemory = true;
+          }
+        }
+      };
+
+  private void recreateSurfaceIfNeeded() {
+    if (surface != null && !shouldRecreateSurfaceForLowMemory) {
+      // No need to recreate the surface.
+      return;
+    }
+    if (surface != null) {
+      surface.release();
+      surface = null;
+    }
+    surface = createSurface();
+    shouldRecreateSurfaceForLowMemory = false;
+  }
+
+  protected Surface createSurface() {
+    return new Surface(surfaceTexture);
+  }
+
+  /** Implementation of PlatformViewRenderTarget */
+  public SurfaceTexturePlatformViewRenderTarget(SurfaceTextureEntry surfaceTextureEntry) {
+    if (Build.VERSION.SDK_INT < API_LEVELS.API_23) {
+      throw new UnsupportedOperationException(
+          "Platform views cannot be displayed below API level 23"
+              + "You can prevent this issue by setting `minSdkVersion: 23` in build.gradle.");
+    }
+    this.surfaceTextureEntry = surfaceTextureEntry;
+    this.surfaceTexture = surfaceTextureEntry.surfaceTexture();
+    surfaceTextureEntry.setOnTrimMemoryListener(trimMemoryListener);
+  }
+
+  public void resize(int width, int height) {
+    bufferWidth = width;
+    bufferHeight = height;
+    if (surfaceTexture != null) {
+      surfaceTexture.setDefaultBufferSize(bufferWidth, bufferHeight);
+    }
+  }
+
+  public int getWidth() {
+    return bufferWidth;
+  }
+
+  public int getHeight() {
+    return bufferHeight;
+  }
+
+  public long getId() {
+    return this.surfaceTextureEntry.id();
+  }
+
+  public boolean isReleased() {
+    return surfaceTexture == null;
+  }
+
+  public void release() {
+    // Don't release the texture, let the GC finalize it.
+    surfaceTexture = null;
+    if (surface != null) {
+      surface.release();
+      surface = null;
+    }
+  }
+
+  public Surface getSurface() {
+    recreateSurfaceIfNeeded();
+    if (surfaceTexture == null || surfaceTexture.isReleased()) {
+      return null;
+    }
+    return surface;
+  }
+}
diff --git a/shell/platform/android/io/flutter/plugin/platform/VirtualDisplayController.java b/shell/platform/android/io/flutter/plugin/platform/VirtualDisplayController.java
index f8125ea097b1365c0ddbf9cb21f7d575b4c9197d..cdde0687a4a999fd36580f322afbf1f3818b42eb 100644
--- a/shell/platform/android/io/flutter/plugin/platform/VirtualDisplayController.java
+++ b/shell/platform/android/io/flutter/plugin/platform/VirtualDisplayController.java
@@ -5,40 +5,51 @@
 package io.flutter.plugin.platform;
 
 import static android.view.View.OnFocusChangeListener;
+import static io.flutter.Build.API_LEVELS;
 
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.hardware.display.DisplayManager;
 import android.hardware.display.VirtualDisplay;
+import android.os.Build;
 import android.util.DisplayMetrics;
 import android.view.MotionEvent;
-import android.view.Surface;
 import android.view.View;
+import android.view.View.OnFocusChangeListener;
 import android.view.ViewTreeObserver;
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
-import io.flutter.view.TextureRegistry;
 
-@TargetApi(20)
 class VirtualDisplayController {
   private static String TAG = "VirtualDisplayController";
 
+  private static VirtualDisplay.Callback callback =
+      new VirtualDisplay.Callback() {
+        @Override
+        public void onPaused() {}
+
+        @Override
+        public void onResumed() {}
+      };
+
   public static VirtualDisplayController create(
       Context context,
       AccessibilityEventsDelegate accessibilityEventsDelegate,
       PlatformView view,
-      TextureRegistry.SurfaceTextureEntry textureEntry,
+      PlatformViewRenderTarget renderTarget,
       int width,
       int height,
       int viewId,
       Object createParams,
       OnFocusChangeListener focusChangeListener) {
-
-    DisplayMetrics metrics = context.getResources().getDisplayMetrics();
     if (width == 0 || height == 0) {
       return null;
     }
 
+    DisplayManager displayManager =
+        (DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE);
+    final DisplayMetrics metrics = context.getResources().getDisplayMetrics();
+
     // Virtual Display crashes for some PlatformViews if the width or height is bigger
     // than the physical screen size. We have tried to clamp or scale down the size to prevent
     // the crash, but both solutions lead to unwanted behavior because the
@@ -49,14 +60,18 @@ class VirtualDisplayController {
     // TODO(cyanglaz): find a way to prevent the crash without introducing size mistach betewen
     // virtual display and AndroidPlatformView widget.
     // https://github.com/flutter/flutter/issues/93115
-    textureEntry.surfaceTexture().setDefaultBufferSize(width, height);
-    Surface surface = new Surface(textureEntry.surfaceTexture());
-    DisplayManager displayManager =
-        (DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE);
-
-    int densityDpi = context.getResources().getDisplayMetrics().densityDpi;
+    renderTarget.resize(width, height);
+    int flags = 0;
     VirtualDisplay virtualDisplay =
-        displayManager.createVirtualDisplay("flutter-vd", width, height, densityDpi, surface, 0);
+        displayManager.createVirtualDisplay(
+            "flutter-vd#" + viewId,
+            width,
+            height,
+            metrics.densityDpi,
+            renderTarget.getSurface(),
+            flags,
+            callback,
+            null /* handler */);
 
     if (virtualDisplay == null) {
       return null;
@@ -67,13 +82,10 @@ class VirtualDisplayController {
             accessibilityEventsDelegate,
             virtualDisplay,
             view,
-            surface,
-            textureEntry,
+            renderTarget,
             focusChangeListener,
             viewId,
             createParams);
-    controller.bufferWidth = width;
-    controller.bufferHeight = height;
     return controller;
   }
 
@@ -82,31 +94,28 @@ class VirtualDisplayController {
   private final Context context;
   private final AccessibilityEventsDelegate accessibilityEventsDelegate;
   private final int densityDpi;
-  private final TextureRegistry.SurfaceTextureEntry textureEntry;
+  private final int viewId;
+  private final PlatformViewRenderTarget renderTarget;
   private final OnFocusChangeListener focusChangeListener;
-  private final Surface surface;
 
   private VirtualDisplay virtualDisplay;
-  private int bufferWidth;
-  private int bufferHeight;
 
   private VirtualDisplayController(
       Context context,
       AccessibilityEventsDelegate accessibilityEventsDelegate,
       VirtualDisplay virtualDisplay,
       PlatformView view,
-      Surface surface,
-      TextureRegistry.SurfaceTextureEntry textureEntry,
+      PlatformViewRenderTarget renderTarget,
       OnFocusChangeListener focusChangeListener,
       int viewId,
       Object createParams) {
     this.context = context;
     this.accessibilityEventsDelegate = accessibilityEventsDelegate;
-    this.textureEntry = textureEntry;
+    this.renderTarget = renderTarget;
     this.focusChangeListener = focusChangeListener;
-    this.surface = surface;
+    this.viewId = viewId;
     this.virtualDisplay = virtualDisplay;
-    densityDpi = context.getResources().getDisplayMetrics().densityDpi;
+    this.densityDpi = context.getResources().getDisplayMetrics().densityDpi;
     presentation =
         new SingleViewPresentation(
             context,
@@ -118,33 +127,51 @@ class VirtualDisplayController {
     presentation.show();
   }
 
-  public int getBufferWidth() {
-    return bufferWidth;
+  public int getRenderTargetWidth() {
+    if (renderTarget != null) {
+      return renderTarget.getWidth();
+    }
+    return 0;
   }
 
-  public int getBufferHeight() {
-    return bufferHeight;
+  public int getRenderTargetHeight() {
+    if (renderTarget != null) {
+      return renderTarget.getHeight();
+    }
+    return 0;
   }
 
   public void resize(final int width, final int height, final Runnable onNewSizeFrameAvailable) {
+    // When 'hot reload', although the resize method is triggered, the size of the native View has
+    // not changed.
+    if (width == getRenderTargetWidth() && height == getRenderTargetHeight()) {
+      getView().postDelayed(onNewSizeFrameAvailable, 0);
+      return;
+    }
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_31) {
+      resize31(getView(), width, height, onNewSizeFrameAvailable);
+      return;
+    }
     boolean isFocused = getView().isFocused();
     final SingleViewPresentation.PresentationState presentationState = presentation.detachState();
     // We detach the surface to prevent it being destroyed when releasing the vd.
-    //
-    // setSurface is only available starting API 20. We could support API 19 by re-creating a new
-    // SurfaceTexture here. This will require refactoring the TextureRegistry to allow recycling
-    // texture
-    // entry IDs.
     virtualDisplay.setSurface(null);
     virtualDisplay.release();
 
-    bufferWidth = width;
-    bufferHeight = height;
-    textureEntry.surfaceTexture().setDefaultBufferSize(width, height);
-    DisplayManager displayManager =
+    final DisplayManager displayManager =
         (DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE);
+    renderTarget.resize(width, height);
+    int flags = 0;
     virtualDisplay =
-        displayManager.createVirtualDisplay("flutter-vd", width, height, densityDpi, surface, 0);
+        displayManager.createVirtualDisplay(
+            "flutter-vd#" + viewId,
+            width,
+            height,
+            densityDpi,
+            renderTarget.getSurface(),
+            flags,
+            callback,
+            null /* handler */);
 
     final View embeddedView = getView();
     // There's a bug in Android version older than O where view tree observer onDrawListeners don't
@@ -161,7 +188,7 @@ class VirtualDisplayController {
                   @Override
                   public void run() {
                     // We need some delay here until the frame propagates through the vd surface to
-                    // to the texture,
+                    // the texture,
                     // 128ms was picked pretty arbitrarily based on trial and error.
                     // As long as we invoke the runnable after a new frame is available we avoid the
                     // scaling jank
@@ -201,7 +228,18 @@ class VirtualDisplayController {
     presentation.cancel();
     presentation.detachState();
     virtualDisplay.release();
-    textureEntry.release();
+    renderTarget.release();
+  }
+
+  // On Android versions 31+ resizing of a Virtual Display's Presentation is natively supported.
+  @TargetApi(API_LEVELS.API_31)
+  private void resize31(
+      View embeddedView, int width, int height, final Runnable onNewSizeFrameAvailable) {
+    renderTarget.resize(width, height);
+    virtualDisplay.resize(width, height, densityDpi);
+    // Must update the surface to match the renderTarget's current surface.
+    virtualDisplay.setSurface(renderTarget.getSurface());
+    embeddedView.postDelayed(onNewSizeFrameAvailable, 0);
   }
 
   /** See {@link PlatformView#onFlutterViewAttached(View)} */
@@ -246,6 +284,49 @@ class VirtualDisplayController {
     presentation.dispatchTouchEvent(event);
   }
 
+  public void clearSurface() {
+    virtualDisplay.setSurface(null);
+  }
+
+  public void resetSurface() {
+    final int width = getRenderTargetWidth();
+    final int height = getRenderTargetHeight();
+    final boolean isFocused = getView().isFocused();
+    final SingleViewPresentation.PresentationState presentationState = presentation.detachState();
+
+    // We detach the surface to prevent it being destroyed when releasing the vd.
+    virtualDisplay.setSurface(null);
+    virtualDisplay.release();
+    final DisplayManager displayManager =
+        (DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE);
+    int flags = 0;
+    virtualDisplay =
+        displayManager.createVirtualDisplay(
+            "flutter-vd#" + viewId,
+            width,
+            height,
+            densityDpi,
+            renderTarget.getSurface(),
+            flags,
+            callback,
+            null /* handler */);
+    // Create a new SingleViewPresentation and show() it before we cancel() the existing
+    // presentation. Calling show() and cancel() in this order fixes
+    // https://github.com/flutter/flutter/issues/26345 and maintains seamless transition
+    // of the contents of the presentation.
+    SingleViewPresentation newPresentation =
+        new SingleViewPresentation(
+            context,
+            virtualDisplay.getDisplay(),
+            accessibilityEventsDelegate,
+            presentationState,
+            focusChangeListener,
+            isFocused);
+    newPresentation.show();
+    presentation.cancel();
+    presentation = newPresentation;
+  }
+
   static class OneTimeOnDrawListener implements ViewTreeObserver.OnDrawListener {
     static void schedule(View view, Runnable runnable) {
       OneTimeOnDrawListener listener = new OneTimeOnDrawListener(view, runnable);
diff --git a/shell/platform/android/io/flutter/plugin/platform/WindowManagerHandler.java b/shell/platform/android/io/flutter/plugin/platform/WindowManagerHandler.java
new file mode 100644
index 0000000000000000000000000000000000000000..5072420b6ba54b1a59b9eda6d4524ef5c57c9d6e
--- /dev/null
+++ b/shell/platform/android/io/flutter/plugin/platform/WindowManagerHandler.java
@@ -0,0 +1,15 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.plugin.platform;
+
+import android.view.WindowManager;
+
+/** Default implementation when using the regular Android SDK. */
+final class WindowManagerHandler extends SingleViewWindowManager {
+
+  WindowManagerHandler(WindowManager delegate, SingleViewFakeWindowViewGroup fakeWindowViewGroup) {
+    super(delegate, fakeWindowViewGroup);
+  }
+}
diff --git a/shell/platform/android/io/flutter/plugin/text/ProcessTextPlugin.java b/shell/platform/android/io/flutter/plugin/text/ProcessTextPlugin.java
new file mode 100644
index 0000000000000000000000000000000000000000..ba56ff400768896f33c6de0ffa6e7ead916a7a98
--- /dev/null
+++ b/shell/platform/android/io/flutter/plugin/text/ProcessTextPlugin.java
@@ -0,0 +1,199 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.plugin.text;
+
+import static io.flutter.Build.API_LEVELS;
+
+import android.annotation.TargetApi;
+import android.app.Activity;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.Build;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import io.flutter.embedding.engine.plugins.FlutterPlugin;
+import io.flutter.embedding.engine.plugins.activity.ActivityAware;
+import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
+import io.flutter.embedding.engine.systemchannels.ProcessTextChannel;
+import io.flutter.plugin.common.MethodChannel;
+import io.flutter.plugin.common.PluginRegistry.ActivityResultListener;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class ProcessTextPlugin
+    implements FlutterPlugin,
+        ActivityAware,
+        ActivityResultListener,
+        ProcessTextChannel.ProcessTextMethodHandler {
+  private static final String TAG = "ProcessTextPlugin";
+
+  @NonNull private final ProcessTextChannel processTextChannel;
+  @NonNull private final PackageManager packageManager;
+  @Nullable private ActivityPluginBinding activityBinding;
+  private Map<String, ResolveInfo> resolveInfosById;
+
+  @NonNull
+  private Map<Integer, MethodChannel.Result> requestsByCode =
+      new HashMap<Integer, MethodChannel.Result>();
+
+  public ProcessTextPlugin(@NonNull ProcessTextChannel processTextChannel) {
+    this.processTextChannel = processTextChannel;
+    this.packageManager = processTextChannel.packageManager;
+
+    processTextChannel.setMethodHandler(this);
+  }
+
+  @Override
+  public Map<String, String> queryTextActions() {
+    if (resolveInfosById == null) {
+      cacheResolveInfos();
+    }
+    Map<String, String> result = new HashMap<String, String>();
+    for (String id : resolveInfosById.keySet()) {
+      final ResolveInfo info = resolveInfosById.get(id);
+      result.put(id, info.loadLabel(packageManager).toString());
+    }
+    return result;
+  }
+
+  @Override
+  public void processTextAction(
+      @NonNull String id,
+      @NonNull String text,
+      @NonNull boolean readOnly,
+      @NonNull MethodChannel.Result result) {
+    if (activityBinding == null) {
+      result.error("error", "Plugin not bound to an Activity", null);
+      return;
+    }
+
+    if (Build.VERSION.SDK_INT < API_LEVELS.API_23) {
+      result.error("error", "Android version not supported", null);
+      return;
+    }
+
+    if (resolveInfosById == null) {
+      result.error("error", "Can not process text actions before calling queryTextActions", null);
+      return;
+    }
+
+    final ResolveInfo info = resolveInfosById.get(id);
+    if (info == null) {
+      result.error("error", "Text processing activity not found", null);
+      return;
+    }
+
+    Integer requestCode = result.hashCode();
+    requestsByCode.put(requestCode, result);
+
+    Intent intent = new Intent();
+    intent.setClassName(info.activityInfo.packageName, info.activityInfo.name);
+    intent.setAction(Intent.ACTION_PROCESS_TEXT);
+    intent.setType("text/plain");
+    intent.putExtra(Intent.EXTRA_PROCESS_TEXT, text);
+    intent.putExtra(Intent.EXTRA_PROCESS_TEXT_READONLY, readOnly);
+
+    // Start the text processing activity. When the activity completes, the onActivityResult
+    // callback
+    // is called.
+    activityBinding.getActivity().startActivityForResult(intent, requestCode);
+  }
+
+  private void cacheResolveInfos() {
+    resolveInfosById = new HashMap<String, ResolveInfo>();
+
+    if (Build.VERSION.SDK_INT < API_LEVELS.API_23) {
+      return;
+    }
+
+    Intent intent = new Intent().setAction(Intent.ACTION_PROCESS_TEXT).setType("text/plain");
+
+    List<ResolveInfo> infos;
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_33) {
+      infos = packageManager.queryIntentActivities(intent, PackageManager.ResolveInfoFlags.of(0));
+    } else {
+      infos = packageManager.queryIntentActivities(intent, 0);
+    }
+
+    for (ResolveInfo info : infos) {
+      final String id = info.activityInfo.name;
+      final String label = info.loadLabel(packageManager).toString();
+      resolveInfosById.put(id, info);
+    }
+  }
+
+  /**
+   * Executed when a text processing activity terminates.
+   *
+   * <p>When an activity returns a value, the request is completed successfully and returns the
+   * processed text.
+   *
+   * <p>When an activity does not return a value. the request is completed successfully and returns
+   * null.
+   */
+  @TargetApi(API_LEVELS.API_23)
+  @RequiresApi(API_LEVELS.API_23)
+  public boolean onActivityResult(int requestCode, int resultCode, @Nullable Intent intent) {
+    // Return early if the result is not related to a request sent by this plugin.
+    if (!requestsByCode.containsKey(requestCode)) {
+      return false;
+    }
+
+    String result = null;
+    if (resultCode == Activity.RESULT_OK) {
+      result = intent.getStringExtra(Intent.EXTRA_PROCESS_TEXT);
+    }
+    requestsByCode.remove(requestCode).success(result);
+    return true;
+  }
+
+  /**
+   * Unregisters this {@code ProcessTextPlugin} as the {@code
+   * ProcessTextChannel.ProcessTextMethodHandler}, for the {@link
+   * io.flutter.embedding.engine.systemchannels.ProcessTextChannel}.
+   *
+   * <p>Do not invoke any methods on a {@code ProcessTextPlugin} after invoking this method.
+   */
+  public void destroy() {
+    processTextChannel.setMethodHandler(null);
+  }
+
+  // FlutterPlugin interface implementation.
+
+  public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) {
+    // Nothing to do because this plugin is instantiated by the engine.
+  }
+
+  public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
+    // Nothing to do because this plugin is instantiated by the engine.
+  }
+
+  // ActivityAware interface implementation.
+  //
+  // Store the binding and manage the activity result listener.
+
+  public void onAttachedToActivity(@NonNull ActivityPluginBinding binding) {
+    this.activityBinding = binding;
+    this.activityBinding.addActivityResultListener(this);
+  };
+
+  public void onDetachedFromActivityForConfigChanges() {
+    this.activityBinding.removeActivityResultListener(this);
+    this.activityBinding = null;
+  }
+
+  public void onReattachedToActivityForConfigChanges(@NonNull ActivityPluginBinding binding) {
+    this.activityBinding = binding;
+    this.activityBinding.addActivityResultListener(this);
+  }
+
+  public void onDetachedFromActivity() {
+    this.activityBinding.removeActivityResultListener(this);
+    this.activityBinding = null;
+  }
+}
diff --git a/shell/platform/android/io/flutter/util/HandlerCompat.java b/shell/platform/android/io/flutter/util/HandlerCompat.java
index de391419a9abd76144a2491773226d0446df6854..39a7f7d6ff6102b85f1eddf20230ad71b88bf832 100644
--- a/shell/platform/android/io/flutter/util/HandlerCompat.java
+++ b/shell/platform/android/io/flutter/util/HandlerCompat.java
@@ -4,6 +4,8 @@
 
 package io.flutter.util;
 
+import static io.flutter.Build.API_LEVELS;
+
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
@@ -27,7 +29,7 @@ public final class HandlerCompat {
    * @see Handler#createAsync(Looper)
    */
   public static Handler createAsyncHandler(Looper looper) {
-    if (Build.VERSION.SDK_INT >= 28) {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_28) {
       return Handler.createAsync(looper);
     }
     return new Handler(looper);
diff --git a/shell/platform/android/io/flutter/util/PathUtils.java b/shell/platform/android/io/flutter/util/PathUtils.java
index 5f3f7bd6845e45e5d5cb41def65960b301f3e708..15b6d1e752849ff87a5b848f3e47293c61ac4f1c 100644
--- a/shell/platform/android/io/flutter/util/PathUtils.java
+++ b/shell/platform/android/io/flutter/util/PathUtils.java
@@ -4,6 +4,8 @@
 
 package io.flutter.util;
 
+import static io.flutter.Build.API_LEVELS;
+
 import android.content.Context;
 import android.os.Build;
 import androidx.annotation.NonNull;
@@ -32,12 +34,8 @@ public final class PathUtils {
   @NonNull
   public static String getCacheDirectory(@NonNull Context applicationContext) {
     File cacheDir;
-    if (Build.VERSION.SDK_INT >= 21) {
-      cacheDir = applicationContext.getCodeCacheDir();
-      if (cacheDir == null) {
-        cacheDir = applicationContext.getCacheDir();
-      }
-    } else {
+    cacheDir = applicationContext.getCodeCacheDir();
+    if (cacheDir == null) {
       cacheDir = applicationContext.getCacheDir();
     }
     if (cacheDir == null) {
@@ -52,7 +50,7 @@ public final class PathUtils {
   }
 
   private static String getDataDirPath(Context applicationContext) {
-    if (Build.VERSION.SDK_INT >= 24) {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_24) {
       return applicationContext.getDataDir().getPath();
     } else {
       return applicationContext.getApplicationInfo().dataDir;
diff --git a/shell/platform/android/io/flutter/util/TraceSection.java b/shell/platform/android/io/flutter/util/TraceSection.java
index 53c2889678aac64eca8d0f5a05504378ca14a705..5ea2355d4d24358e3217ec713b4dda9ac270c5a9 100644
--- a/shell/platform/android/io/flutter/util/TraceSection.java
+++ b/shell/platform/android/io/flutter/util/TraceSection.java
@@ -7,7 +7,32 @@ package io.flutter.util;
 import androidx.annotation.NonNull;
 import androidx.tracing.Trace;
 
-public final class TraceSection {
+public final class TraceSection implements AutoCloseable {
+  /**
+   * Factory used to support the try-with-resource construct.
+   *
+   * <p>To get scoped trace events, use the try-with-resource construct, for instance:
+   *
+   * <pre>{@code
+   * try (TraceSection e = TraceSection.scoped("MyTraceEvent")) {
+   *   // code.
+   * }
+   * }</pre>
+   */
+  public static TraceSection scoped(String name) {
+    return new TraceSection(name);
+  }
+
+  /** Constructor used to support the try-with-resource construct. */
+  private TraceSection(String name) {
+    begin(name);
+  }
+
+  @Override
+  public void close() {
+    end();
+  }
+
   private static String cropSectionName(@NonNull String sectionName) {
     return sectionName.length() < 124 ? sectionName : sectionName.substring(0, 124) + "...";
   }
diff --git a/shell/platform/android/io/flutter/util/ViewUtils.java b/shell/platform/android/io/flutter/util/ViewUtils.java
index 5baaca2ba549d9b547d8d8029c179e319dcb76a5..d26039f814d5d7e6545db46f2281b0579652cd54 100644
--- a/shell/platform/android/io/flutter/util/ViewUtils.java
+++ b/shell/platform/android/io/flutter/util/ViewUtils.java
@@ -7,13 +7,36 @@ package io.flutter.util;
 import android.app.Activity;
 import android.content.Context;
 import android.content.ContextWrapper;
-import android.os.Build;
 import android.view.View;
 import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.window.layout.WindowMetrics;
+import androidx.window.layout.WindowMetricsCalculator;
 
 public final class ViewUtils {
+  public interface DisplayUpdater {
+    /** Publishes display metrics to Dart code in Flutter. */
+    public void updateDisplayMetrics(float width, float height, float density);
+  }
+
+  /**
+   * Calculates the maximum display metrics for the given context, and pushes the metric data to the
+   * updater.
+   */
+  public static void calculateMaximumDisplayMetrics(
+      @Nullable Context context, @NonNull DisplayUpdater updater) {
+    Activity activity = getActivity(context);
+    if (activity != null) {
+      WindowMetrics metrics =
+          WindowMetricsCalculator.getOrCreate().computeMaximumWindowMetrics(activity);
+      float width = metrics.getBounds().width();
+      float height = metrics.getBounds().height();
+      float density = context.getResources().getDisplayMetrics().density;
+      updater.updateDisplayMetrics(width, height, density);
+    }
+  }
+
   /**
    * Retrieves the {@link Activity} from a given {@link Context}.
    *
@@ -35,21 +58,6 @@ public final class ViewUtils {
     return null;
   }
 
-  /**
-   * Generates a view id.
-   *
-   * <p>In API level 17 and above, this ID is unique. Below 17, the fallback id is used instead.
-   *
-   * @param fallbackId the fallback id.
-   * @return the view id.
-   */
-  public static int generateViewId(int fallbackId) {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-      return View.generateViewId();
-    }
-    return fallbackId;
-  }
-
   /**
    * Determines if the current view or any descendant view has focus.
    *
diff --git a/shell/platform/android/io/flutter/view/AccessibilityBridge.java b/shell/platform/android/io/flutter/view/AccessibilityBridge.java
index 9b4bacee867993f9a27b8b9d7d0dbcb276a9ebdb..a0280322c06f9af6e24a84ac648744edab581c5d 100644
--- a/shell/platform/android/io/flutter/view/AccessibilityBridge.java
+++ b/shell/platform/android/io/flutter/view/AccessibilityBridge.java
@@ -4,6 +4,8 @@
 
 package io.flutter.view;
 
+import static io.flutter.Build.API_LEVELS;
+
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -309,6 +311,12 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
           sendAccessibilityEvent(nodeId, AccessibilityEvent.TYPE_VIEW_LONG_CLICKED);
         }
 
+        /** The framework has requested focus on the given {@code nodeId}. */
+        @Override
+        public void onFocus(int nodeId) {
+          sendAccessibilityEvent(nodeId, AccessibilityEvent.TYPE_VIEW_FOCUSED);
+        }
+
         /** The user has opened a tooltip. */
         @Override
         public void onTooltip(@NonNull String message) {
@@ -318,7 +326,7 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
           //
           // To reproduce native behavior, see
           // https://developer.android.com/guide/topics/ui/tooltips.
-          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+          if (Build.VERSION.SDK_INT >= API_LEVELS.API_28) {
             return;
           }
           AccessibilityEvent e =
@@ -373,8 +381,6 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
 
   // Listener that is notified when accessibility touch exploration is turned on/off.
   // This is guarded at instantiation time.
-  @TargetApi(19)
-  @RequiresApi(19)
   private final AccessibilityManager.TouchExplorationStateChangeListener
       touchExplorationStateChangeListener;
 
@@ -394,10 +400,8 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
           }
           // Retrieve the current value of TRANSITION_ANIMATION_SCALE from the OS.
           String value =
-              Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1
-                  ? null
-                  : Settings.Global.getString(
-                      contentResolver, Settings.Global.TRANSITION_ANIMATION_SCALE);
+              Settings.Global.getString(
+                  contentResolver, Settings.Global.TRANSITION_ANIMATION_SCALE);
 
           boolean shouldAnimationsBeDisabled = value != null && value.equals("0");
           if (shouldAnimationsBeDisabled) {
@@ -445,44 +449,38 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
 
     // Tell Flutter whether touch exploration is initially active or not. Then register a listener
     // to be notified of changes in the future.
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-      touchExplorationStateChangeListener =
-          new AccessibilityManager.TouchExplorationStateChangeListener() {
-            @Override
-            public void onTouchExplorationStateChanged(boolean isTouchExplorationEnabled) {
-              if (isReleased) {
-                return;
-              }
-              if (!isTouchExplorationEnabled) {
-                setAccessibleNavigation(false);
-                onTouchExplorationExit();
-              }
+    touchExplorationStateChangeListener =
+        new AccessibilityManager.TouchExplorationStateChangeListener() {
+          @Override
+          public void onTouchExplorationStateChanged(boolean isTouchExplorationEnabled) {
+            if (isReleased) {
+              return;
+            }
+            if (!isTouchExplorationEnabled) {
+              setAccessibleNavigation(false);
+              onTouchExplorationExit();
+            }
 
-              if (onAccessibilityChangeListener != null) {
-                onAccessibilityChangeListener.onAccessibilityChanged(
-                    accessibilityManager.isEnabled(), isTouchExplorationEnabled);
-              }
+            if (onAccessibilityChangeListener != null) {
+              onAccessibilityChangeListener.onAccessibilityChanged(
+                  accessibilityManager.isEnabled(), isTouchExplorationEnabled);
             }
-          };
-      touchExplorationStateChangeListener.onTouchExplorationStateChanged(
-          accessibilityManager.isTouchExplorationEnabled());
-      this.accessibilityManager.addTouchExplorationStateChangeListener(
-          touchExplorationStateChangeListener);
-    } else {
-      touchExplorationStateChangeListener = null;
-    }
+          }
+        };
+    touchExplorationStateChangeListener.onTouchExplorationStateChanged(
+        accessibilityManager.isTouchExplorationEnabled());
+    this.accessibilityManager.addTouchExplorationStateChangeListener(
+        touchExplorationStateChangeListener);
 
     // Tell Flutter whether animations should initially be enabled or disabled. Then register a
     // listener to be notified of changes in the future.
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-      animationScaleObserver.onChange(false);
-      Uri transitionUri = Settings.Global.getUriFor(Settings.Global.TRANSITION_ANIMATION_SCALE);
-      this.contentResolver.registerContentObserver(transitionUri, false, animationScaleObserver);
-    }
+    animationScaleObserver.onChange(false);
+    Uri transitionUri = Settings.Global.getUriFor(Settings.Global.TRANSITION_ANIMATION_SCALE);
+    this.contentResolver.registerContentObserver(transitionUri, false, animationScaleObserver);
 
     // Tells Flutter whether the text should be bolded or not. If the user changes bold text
     // setting, the configuration will change and trigger a re-build of the accesibiltyBridge.
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_31) {
       setBoldTextFlag();
     }
 
@@ -501,10 +499,8 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
     platformViewsAccessibilityDelegate.detachAccessibilityBridge();
     setOnAccessibilityChangeListener(null);
     accessibilityManager.removeAccessibilityStateChangeListener(accessibilityStateChangeListener);
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-      accessibilityManager.removeTouchExplorationStateChangeListener(
-          touchExplorationStateChangeListener);
-    }
+    accessibilityManager.removeTouchExplorationStateChangeListener(
+        touchExplorationStateChangeListener);
     contentResolver.unregisterContentObserver(animationScaleObserver);
     accessibilityChannel.setAccessibilityMessageHandler(null);
   }
@@ -549,8 +545,8 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
                 accessibilityFocusedSemanticsNode, o -> o.hasFlag(Flag.HAS_IMPLICIT_SCROLLING)));
   }
 
-  @TargetApi(31)
-  @RequiresApi(31)
+  @TargetApi(API_LEVELS.API_31)
+  @RequiresApi(API_LEVELS.API_31)
   private void setBoldTextFlag() {
     if (rootAccessibilityView == null || rootAccessibilityView.getResources() == null) {
       return;
@@ -569,6 +565,11 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
     sendLatestAccessibilityFlagsToFlutter();
   }
 
+  @VisibleForTesting
+  public AccessibilityNodeInfo obtainAccessibilityNodeInfo(View rootView) {
+    return AccessibilityNodeInfo.obtain(rootView);
+  }
+
   @VisibleForTesting
   public AccessibilityNodeInfo obtainAccessibilityNodeInfo(View rootView, int virtualViewId) {
     return AccessibilityNodeInfo.obtain(rootView, virtualViewId);
@@ -610,13 +611,16 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
     }
 
     if (virtualViewId == View.NO_ID) {
-      AccessibilityNodeInfo result = AccessibilityNodeInfo.obtain(rootAccessibilityView);
+      AccessibilityNodeInfo result = obtainAccessibilityNodeInfo(rootAccessibilityView);
       rootAccessibilityView.onInitializeAccessibilityNodeInfo(result);
       // TODO(mattcarroll): what does it mean for the semantics tree to contain or not contain
       //                    the root node ID?
       if (flutterSemanticsTree.containsKey(ROOT_NODE_ID)) {
         result.addChild(rootAccessibilityView, ROOT_NODE_ID);
       }
+      if (Build.VERSION.SDK_INT >= API_LEVELS.API_24) {
+        result.setImportantForAccessibility(false);
+      }
       return result;
     }
 
@@ -647,9 +651,17 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
 
     AccessibilityNodeInfo result =
         obtainAccessibilityNodeInfo(rootAccessibilityView, virtualViewId);
-    // Work around for https://github.com/flutter/flutter/issues/2101
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
-      result.setViewIdResourceName("");
+
+    // Accessibility Scanner uses isImportantForAccessibility to decide whether to check
+    // or skip this node.
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_24) {
+      result.setImportantForAccessibility(isImportant(semanticsNode));
+    }
+
+    // Work around for https://github.com/flutter/flutter/issues/21030
+    result.setViewIdResourceName("");
+    if (semanticsNode.identifier != null) {
+      result.setViewIdResourceName(semanticsNode.identifier);
     }
     result.setPackageName(rootAccessibilityView.getContext().getPackageName());
     result.setClassName("android.view.View");
@@ -668,20 +680,16 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
       if (!semanticsNode.hasFlag(Flag.IS_READ_ONLY)) {
         result.setClassName("android.widget.EditText");
       }
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
-        result.setEditable(!semanticsNode.hasFlag(Flag.IS_READ_ONLY));
-        if (semanticsNode.textSelectionBase != -1 && semanticsNode.textSelectionExtent != -1) {
-          result.setTextSelection(
-              semanticsNode.textSelectionBase, semanticsNode.textSelectionExtent);
-        }
-        // Text fields will always be created as a live region when they have input focus,
-        // so that updates to the label trigger polite announcements. This makes it easy to
-        // follow a11y guidelines for text fields on Android.
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.JELLY_BEAN_MR2
-            && accessibilityFocusedSemanticsNode != null
-            && accessibilityFocusedSemanticsNode.id == virtualViewId) {
-          result.setLiveRegion(View.ACCESSIBILITY_LIVE_REGION_POLITE);
-        }
+      result.setEditable(!semanticsNode.hasFlag(Flag.IS_READ_ONLY));
+      if (semanticsNode.textSelectionBase != -1 && semanticsNode.textSelectionExtent != -1) {
+        result.setTextSelection(semanticsNode.textSelectionBase, semanticsNode.textSelectionExtent);
+      }
+      // Text fields will always be created as a live region when they have input focus,
+      // so that updates to the label trigger polite announcements. This makes it easy to
+      // follow a11y guidelines for text fields on Android.
+      if (accessibilityFocusedSemanticsNode != null
+          && accessibilityFocusedSemanticsNode.id == virtualViewId) {
+        result.setLiveRegion(View.ACCESSIBILITY_LIVE_REGION_POLITE);
       }
 
       // Cursor movements
@@ -703,8 +711,7 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
         granularities |= AccessibilityNodeInfo.MOVEMENT_GRANULARITY_WORD;
       }
       result.setMovementGranularities(granularities);
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP
-          && semanticsNode.maxValueLength >= 0) {
+      if (semanticsNode.maxValueLength >= 0) {
         // Account for the fact that Flutter is counting Unicode scalar values and Android
         // is counting UTF16 words.
         final int length = semanticsNode.value == null ? 0 : semanticsNode.value.length();
@@ -716,26 +723,21 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
 
     // These are non-ops on older devices. Attempting to interact with the text will cause Talkback
     // to read the contents of the text box instead.
-    if (Build.VERSION.SDK_INT > Build.VERSION_CODES.JELLY_BEAN_MR2) {
-      if (semanticsNode.hasAction(Action.SET_SELECTION)) {
-        result.addAction(AccessibilityNodeInfo.ACTION_SET_SELECTION);
-      }
-      if (semanticsNode.hasAction(Action.COPY)) {
-        result.addAction(AccessibilityNodeInfo.ACTION_COPY);
-      }
-      if (semanticsNode.hasAction(Action.CUT)) {
-        result.addAction(AccessibilityNodeInfo.ACTION_CUT);
-      }
-      if (semanticsNode.hasAction(Action.PASTE)) {
-        result.addAction(AccessibilityNodeInfo.ACTION_PASTE);
-      }
+    if (semanticsNode.hasAction(Action.SET_SELECTION)) {
+      result.addAction(AccessibilityNodeInfo.ACTION_SET_SELECTION);
+    }
+    if (semanticsNode.hasAction(Action.COPY)) {
+      result.addAction(AccessibilityNodeInfo.ACTION_COPY);
+    }
+    if (semanticsNode.hasAction(Action.CUT)) {
+      result.addAction(AccessibilityNodeInfo.ACTION_CUT);
+    }
+    if (semanticsNode.hasAction(Action.PASTE)) {
+      result.addAction(AccessibilityNodeInfo.ACTION_PASTE);
     }
 
-    // Set text API isn't available until API 21.
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      if (semanticsNode.hasAction(Action.SET_TEXT)) {
-        result.addAction(AccessibilityNodeInfo.ACTION_SET_TEXT);
-      }
+    if (semanticsNode.hasAction(Action.SET_TEXT)) {
+      result.addAction(AccessibilityNodeInfo.ACTION_SET_TEXT);
     }
 
     if (semanticsNode.hasFlag(Flag.IS_BUTTON) || semanticsNode.hasFlag(Flag.IS_LINK)) {
@@ -746,8 +748,7 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
       // TODO(jonahwilliams): Figure out a way conform to the expected id from TalkBack's
       // CustomLabelManager. talkback/src/main/java/labeling/CustomLabelManager.java#L525
     }
-    if (Build.VERSION.SDK_INT > Build.VERSION_CODES.JELLY_BEAN_MR2
-        && semanticsNode.hasAction(Action.DISMISS)) {
+    if (semanticsNode.hasAction(Action.DISMISS)) {
       result.setDismissable(true);
       result.addAction(AccessibilityNodeInfo.ACTION_DISMISS);
     }
@@ -764,8 +765,7 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
       result.setParent(rootAccessibilityView);
     }
 
-    if (semanticsNode.previousNodeId != -1
-        && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+    if (semanticsNode.previousNodeId != -1 && Build.VERSION.SDK_INT >= API_LEVELS.API_22) {
       result.setTraversalAfter(rootAccessibilityView, semanticsNode.previousNodeId);
     }
 
@@ -785,7 +785,7 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
         !semanticsNode.hasFlag(Flag.HAS_ENABLED_STATE) || semanticsNode.hasFlag(Flag.IS_ENABLED));
 
     if (semanticsNode.hasAction(Action.TAP)) {
-      if (Build.VERSION.SDK_INT >= 21 && semanticsNode.onTapOverride != null) {
+      if (semanticsNode.onTapOverride != null) {
         result.addAction(
             new AccessibilityNodeInfo.AccessibilityAction(
                 AccessibilityNodeInfo.ACTION_CLICK, semanticsNode.onTapOverride.hint));
@@ -796,7 +796,7 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
       }
     }
     if (semanticsNode.hasAction(Action.LONG_PRESS)) {
-      if (Build.VERSION.SDK_INT >= 21 && semanticsNode.onLongPressOverride != null) {
+      if (semanticsNode.onLongPressOverride != null) {
         result.addAction(
             new AccessibilityNodeInfo.AccessibilityAction(
                 AccessibilityNodeInfo.ACTION_LONG_CLICK, semanticsNode.onLongPressOverride.hint));
@@ -829,8 +829,7 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
       if (semanticsNode.hasFlag(Flag.HAS_IMPLICIT_SCROLLING)) {
         if (semanticsNode.hasAction(Action.SCROLL_LEFT)
             || semanticsNode.hasAction(Action.SCROLL_RIGHT)) {
-          if (Build.VERSION.SDK_INT > Build.VERSION_CODES.KITKAT
-              && shouldSetCollectionInfo(semanticsNode)) {
+          if (shouldSetCollectionInfo(semanticsNode)) {
             result.setCollectionInfo(
                 AccessibilityNodeInfo.CollectionInfo.obtain(
                     0, // rows
@@ -841,8 +840,7 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
             result.setClassName("android.widget.HorizontalScrollView");
           }
         } else {
-          if (Build.VERSION.SDK_INT > Build.VERSION_CODES.JELLY_BEAN_MR2
-              && shouldSetCollectionInfo(semanticsNode)) {
+          if (shouldSetCollectionInfo(semanticsNode)) {
             result.setCollectionInfo(
                 AccessibilityNodeInfo.CollectionInfo.obtain(
                     semanticsNode.scrollChildren, // rows
@@ -877,8 +875,7 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
         result.addAction(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD);
       }
     }
-    if (semanticsNode.hasFlag(Flag.IS_LIVE_REGION)
-        && Build.VERSION.SDK_INT > Build.VERSION_CODES.JELLY_BEAN_MR2) {
+    if (semanticsNode.hasFlag(Flag.IS_LIVE_REGION)) {
       result.setLiveRegion(View.ACCESSIBILITY_LIVE_REGION_POLITE);
     }
 
@@ -886,12 +883,12 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
     // for non-scopes-routes semantics nodes.
     if (semanticsNode.hasFlag(Flag.IS_TEXT_FIELD)) {
       result.setText(semanticsNode.getValue());
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+      if (Build.VERSION.SDK_INT >= API_LEVELS.API_28) {
         result.setHintText(semanticsNode.getTextFieldHint());
       }
     } else if (!semanticsNode.hasFlag(Flag.SCOPES_ROUTE)) {
       CharSequence content = semanticsNode.getValueLabelHint();
-      if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
+      if (Build.VERSION.SDK_INT < API_LEVELS.API_28) {
         if (semanticsNode.tooltip != null) {
           // For backward compatibility with Flutter SDK before Android API
           // level 28, the tooltip is appended at the end of content description.
@@ -904,7 +901,7 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
       }
     }
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_28) {
       if (semanticsNode.tooltip != null) {
         result.setTooltipText(semanticsNode.tooltip);
       }
@@ -930,7 +927,7 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
     result.setSelected(semanticsNode.hasFlag(Flag.IS_SELECTED));
 
     // Heading support
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_28) {
       result.setHeading(semanticsNode.hasFlag(Flag.IS_HEADER));
     }
 
@@ -943,12 +940,10 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
     }
 
     // Actions on the local context menu
-    if (Build.VERSION.SDK_INT >= 21) {
-      if (semanticsNode.customAccessibilityActions != null) {
-        for (CustomAccessibilityAction action : semanticsNode.customAccessibilityActions) {
-          result.addAction(
-              new AccessibilityNodeInfo.AccessibilityAction(action.resourceId, action.label));
-        }
+    if (semanticsNode.customAccessibilityActions != null) {
+      for (CustomAccessibilityAction action : semanticsNode.customAccessibilityActions) {
+        result.addAction(
+            new AccessibilityNodeInfo.AccessibilityAction(action.resourceId, action.label));
       }
     }
 
@@ -977,6 +972,19 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
     return result;
   }
 
+  private boolean isImportant(SemanticsNode node) {
+    if (node.hasFlag(Flag.SCOPES_ROUTE)) {
+      return false;
+    }
+
+    if (node.getValueLabelHint() != null) {
+      return true;
+    }
+
+    // Return true if the node has had any user action (not including system actions)
+    return (node.actions & ~systemAction) != 0;
+  }
+
   /**
    * Get the bounds in screen with root FlutterView's offset.
    *
@@ -1077,26 +1085,10 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
         }
       case AccessibilityNodeInfo.ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY:
         {
-          // Text selection APIs aren't available until API 18. We can't handle the case here so
-          // return false
-          // instead. It's extremely unlikely that this case would ever be triggered in the first
-          // place in API <
-          // 18.
-          if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2) {
-            return false;
-          }
           return performCursorMoveAction(semanticsNode, virtualViewId, arguments, false);
         }
       case AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY:
         {
-          // Text selection APIs aren't available until API 18. We can't handle the case here so
-          // return false
-          // instead. It's extremely unlikely that this case would ever be triggered in the first
-          // place in API <
-          // 18.
-          if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2) {
-            return false;
-          }
           return performCursorMoveAction(semanticsNode, virtualViewId, arguments, true);
         }
       case AccessibilityNodeInfo.ACTION_CLEAR_ACCESSIBILITY_FOCUS:
@@ -1132,6 +1124,12 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
 
           accessibilityChannel.dispatchSemanticsAction(
               virtualViewId, Action.DID_GAIN_ACCESSIBILITY_FOCUS);
+
+          HashMap<String, Object> message = new HashMap<>();
+          message.put("type", "didGainFocus");
+          message.put("nodeId", semanticsNode.id);
+          accessibilityChannel.channel.send(message);
+
           sendAccessibilityEvent(virtualViewId, AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED);
 
           if (semanticsNode.hasAction(Action.INCREASE)
@@ -1149,14 +1147,6 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
         }
       case AccessibilityNodeInfo.ACTION_SET_SELECTION:
         {
-          // Text selection APIs aren't available until API 18. We can't handle the case here so
-          // return false
-          // instead. It's extremely unlikely that this case would ever be triggered in the first
-          // place in API <
-          // 18.
-          if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2) {
-            return false;
-          }
           final Map<String, Integer> selection = new HashMap<>();
           final boolean hasSelection =
               arguments != null
@@ -1207,12 +1197,6 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
         }
       case AccessibilityNodeInfo.ACTION_SET_TEXT:
         {
-          // Set text APIs aren't available until API 21. We can't handle the case here so
-          // return false instead. It's extremely unlikely that this case would ever be
-          // triggered in the first place in API < 21.
-          if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-            return false;
-          }
           return performSetText(semanticsNode, virtualViewId, arguments);
         }
       default:
@@ -1232,8 +1216,6 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
    * Handles the responsibilities of {@link #performAction(int, int, Bundle)} for the specific
    * scenario of cursor movement.
    */
-  @TargetApi(18)
-  @RequiresApi(18)
   private boolean performCursorMoveAction(
       @NonNull SemanticsNode semanticsNode,
       int virtualViewId,
@@ -1370,8 +1352,6 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
    * Handles the responsibilities of {@link #performAction(int, int, Bundle)} for the specific
    * scenario of cursor movement.
    */
-  @TargetApi(21)
-  @RequiresApi(21)
   private boolean performSetText(SemanticsNode node, int virtualViewId, @NonNull Bundle arguments) {
     String newText = "";
     if (arguments != null
@@ -1645,13 +1625,13 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
       // In Android devices API 23 and above, the system nav bar can be placed on the left side
       // of the screen in landscape mode. We must handle the translation ourselves for the
       // a11y nodes.
-      if (Build.VERSION.SDK_INT >= 23) {
+      if (Build.VERSION.SDK_INT >= API_LEVELS.API_23) {
         boolean needsToApplyLeftCutoutInset = true;
         // In Android devices API 28 and above, the `layoutInDisplayCutoutMode` window attribute
         // can be set to allow overlapping content within the cutout area. Query the attribute
         // to figure out whether the content overlaps with the cutout and decide whether to
         // apply cutout inset.
-        if (Build.VERSION.SDK_INT >= 28) {
+        if (Build.VERSION.SDK_INT >= API_LEVELS.API_28) {
           needsToApplyLeftCutoutInset = doesLayoutInDisplayCutoutModeRequireLeftInset();
         }
 
@@ -1883,7 +1863,8 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
    * <p>The given {@code viewId} may either belong to {@link #rootAccessibilityView}, or any Flutter
    * {@link SemanticsNode}.
    */
-  private void sendAccessibilityEvent(int viewId, int eventType) {
+  @VisibleForTesting
+  public void sendAccessibilityEvent(int viewId, int eventType) {
     if (!accessibilityManager.isEnabled()) {
       return;
     }
@@ -1932,7 +1913,7 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
       // next.
       routeName = " ";
     }
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_28) {
       setAccessibilityPaneTitle(routeName);
     } else {
       AccessibilityEvent event =
@@ -1942,8 +1923,8 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
     }
   }
 
-  @TargetApi(28)
-  @RequiresApi(28)
+  @TargetApi(API_LEVELS.API_28)
+  @RequiresApi(API_LEVELS.API_28)
   private void setAccessibilityPaneTitle(String title) {
     rootAccessibilityView.setAccessibilityPaneTitle(title);
   }
@@ -1961,9 +1942,7 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
   private void sendWindowContentChangeEvent(int virtualViewId) {
     AccessibilityEvent event =
         obtainAccessibilityEvent(virtualViewId, AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED);
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-      event.setContentChangeTypes(AccessibilityEvent.CONTENT_CHANGE_TYPE_SUBTREE);
-    }
+    event.setContentChangeTypes(AccessibilityEvent.CONTENT_CHANGE_TYPE_SUBTREE);
     sendAccessibilityEvent(event);
   }
 
@@ -1976,20 +1955,25 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
    * invoked to create an {@link AccessibilityEvent} for the {@link #rootAccessibilityView}.
    */
   private AccessibilityEvent obtainAccessibilityEvent(int virtualViewId, int eventType) {
-    AccessibilityEvent event = AccessibilityEvent.obtain(eventType);
+    AccessibilityEvent event = obtainAccessibilityEvent(eventType);
     event.setPackageName(rootAccessibilityView.getContext().getPackageName());
     event.setSource(rootAccessibilityView, virtualViewId);
     return event;
   }
 
+  @VisibleForTesting
+  public AccessibilityEvent obtainAccessibilityEvent(int eventType) {
+    return AccessibilityEvent.obtain(eventType);
+  }
+
   /**
    * Reads the {@code layoutInDisplayCutoutMode} value from the window attribute and returns whether
    * a left cutout inset is required.
    *
    * <p>The {@code layoutInDisplayCutoutMode} is added after API level 28.
    */
-  @TargetApi(28)
-  @RequiresApi(28)
+  @TargetApi(API_LEVELS.API_28)
+  @RequiresApi(API_LEVELS.API_28)
   private boolean doesLayoutInDisplayCutoutModeRequireLeftInset() {
     Context context = rootAccessibilityView.getContext();
     Activity activity = ViewUtils.getActivity(context);
@@ -2009,8 +1993,6 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
    * Hook called just before a {@link SemanticsNode} is removed from the Android cache of Flutter's
    * semantics tree.
    */
-  @TargetApi(19)
-  @RequiresApi(19)
   private void willRemoveSemanticsNode(SemanticsNode semanticsNodeToBeRemoved) {
     if (BuildConfig.DEBUG) {
       if (!flutterSemanticsTree.containsKey(semanticsNodeToBeRemoved.id)) {
@@ -2129,6 +2111,14 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
     }
   }
 
+  // Actions that are triggered by Android OS, as opposed to user-triggered actions.
+  //
+  // This int is intended to be use in a bitwise comparison.
+  static int systemAction =
+      Action.DID_GAIN_ACCESSIBILITY_FOCUS.value
+          & Action.DID_LOSE_ACCESSIBILITY_FOCUS.value
+          & Action.SHOW_ON_SCREEN.value;
+
   // Must match SemanticsFlag in semantics.dart
   // https://github.com/flutter/engine/blob/main/lib/ui/semantics.dart
   /* Package */ enum Flag {
@@ -2157,7 +2147,9 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
     IS_LINK(1 << 22),
     IS_SLIDER(1 << 23),
     IS_KEYBOARD_KEY(1 << 24),
-    IS_CHECK_STATE_MIXED(1 << 25);
+    IS_CHECK_STATE_MIXED(1 << 25),
+    HAS_EXPANDED_STATE(1 << 26),
+    IS_EXPANDED(1 << 27);
 
     final int value;
 
@@ -2299,6 +2291,7 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
     private float scrollPosition;
     private float scrollExtentMax;
     private float scrollExtentMin;
+    private String identifier;
     private String label;
     private List<StringAttribute> labelAttributes;
     private String value;
@@ -2312,7 +2305,7 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
 
     // The textual description of the backing widget's tooltip.
     //
-    // The tooltip is attached through AccessibilityNodInfo.setTooltipText if
+    // The tooltip is attached through AccessibilityNodeInfo.setTooltipText if
     // API level >= 28; otherwise, this is attached to the end of content description.
     @Nullable private String tooltip;
 
@@ -2431,6 +2424,8 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
             indent
                 + "SemanticsNode id="
                 + id
+                + " identifier="
+                + identifier
                 + " label="
                 + label
                 + " actions="
@@ -2494,6 +2489,10 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
       scrollExtentMin = buffer.getFloat();
 
       int stringIndex = buffer.getInt();
+
+      identifier = stringIndex == -1 ? null : strings[stringIndex];
+      stringIndex = buffer.getInt();
+
       label = stringIndex == -1 ? null : strings[stringIndex];
 
       labelAttributes = getStringAttributesFromBuffer(buffer, stringAttributeArgs);
@@ -2731,7 +2730,8 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
         }
         if (transform == null) {
           if (BuildConfig.DEBUG) {
-            throw new AssertionError("transform has not been initialized");
+            Log.e(TAG, "transform has not been initialized for id = " + id);
+            accessibilityBridge.getRootSemanticsNode().log("Semantics tree:", true);
           }
           transform = new float[16];
         }
@@ -2808,27 +2808,15 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
     }
 
     private CharSequence getValue() {
-      if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-        return value;
-      } else {
-        return createSpannableString(value, valueAttributes);
-      }
+      return createSpannableString(value, valueAttributes);
     }
 
     private CharSequence getLabel() {
-      if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-        return label;
-      } else {
-        return createSpannableString(label, labelAttributes);
-      }
+      return createSpannableString(label, labelAttributes);
     }
 
     private CharSequence getHint() {
-      if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-        return hint;
-      } else {
-        return createSpannableString(hint, hintAttributes);
-      }
+      return createSpannableString(hint, hintAttributes);
     }
 
     private CharSequence getValueLabelHint() {
@@ -2861,8 +2849,6 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
       return result;
     }
 
-    @TargetApi(21)
-    @RequiresApi(21)
     private SpannableString createSpannableString(String string, List<StringAttribute> attributes) {
       if (string == null) {
         return null;
diff --git a/shell/platform/android/io/flutter/view/AccessibilityViewEmbedder.java b/shell/platform/android/io/flutter/view/AccessibilityViewEmbedder.java
index 368e14ce5fc297dd4760fd0a6b2ab5ef03f25e67..7260d4a8681a50441e0c2d127248a5b39622009c 100644
--- a/shell/platform/android/io/flutter/view/AccessibilityViewEmbedder.java
+++ b/shell/platform/android/io/flutter/view/AccessibilityViewEmbedder.java
@@ -4,6 +4,8 @@
 
 package io.flutter.view;
 
+import static io.flutter.Build.API_LEVELS;
+
 import android.annotation.SuppressLint;
 import android.graphics.Rect;
 import android.os.Build;
@@ -230,34 +232,28 @@ class AccessibilityViewEmbedder {
     output.setText(input.getText());
     output.setVisibleToUser(input.isVisibleToUser());
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
-      output.setEditable(input.isEditable());
-    }
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-      output.setCanOpenPopup(input.canOpenPopup());
-      output.setCollectionInfo(input.getCollectionInfo());
-      output.setCollectionItemInfo(input.getCollectionItemInfo());
-      output.setContentInvalid(input.isContentInvalid());
-      output.setDismissable(input.isDismissable());
-      output.setInputType(input.getInputType());
-      output.setLiveRegion(input.getLiveRegion());
-      output.setMultiLine(input.isMultiLine());
-      output.setRangeInfo(input.getRangeInfo());
-    }
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      output.setError(input.getError());
-      output.setMaxTextLength(input.getMaxTextLength());
-    }
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+    output.setEditable(input.isEditable());
+    output.setCanOpenPopup(input.canOpenPopup());
+    output.setCollectionInfo(input.getCollectionInfo());
+    output.setCollectionItemInfo(input.getCollectionItemInfo());
+    output.setContentInvalid(input.isContentInvalid());
+    output.setDismissable(input.isDismissable());
+    output.setInputType(input.getInputType());
+    output.setLiveRegion(input.getLiveRegion());
+    output.setMultiLine(input.isMultiLine());
+    output.setRangeInfo(input.getRangeInfo());
+    output.setError(input.getError());
+    output.setMaxTextLength(input.getMaxTextLength());
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_23) {
       output.setContextClickable(input.isContextClickable());
       // TODO(amirh): copy traversal before and after.
       // https://github.com/flutter/flutter/issues/29718
     }
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_24) {
       output.setDrawingOrder(input.getDrawingOrder());
       output.setImportantForAccessibility(input.isImportantForAccessibility());
     }
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_26) {
       output.setAvailableExtraData(input.getAvailableExtraData());
       output.setHintText(input.getHintText());
       output.setShowingHintText(input.isShowingHintText());
@@ -453,7 +449,7 @@ class AccessibilityViewEmbedder {
         Log.w(TAG, "can't invoke AccessibiiltyRecord#getSourceNodeId with reflection");
       }
       // Reflection access is not allowed starting Android P on these methods.
-      if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.O) {
+      if (Build.VERSION.SDK_INT <= API_LEVELS.API_26) {
         try {
           getParentNodeId = AccessibilityNodeInfo.class.getMethod("getParentNodeId");
         } catch (NoSuchMethodException e) {
@@ -571,7 +567,7 @@ class AccessibilityViewEmbedder {
     // details change from our assumptions in this method, this will silently break.
     @Nullable
     private static Long yoinkParentIdFromParcel(AccessibilityNodeInfo node) {
-      if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+      if (Build.VERSION.SDK_INT < API_LEVELS.API_26) {
         Log.w(TAG, "Unexpected Android version. Unable to find the parent ID.");
         return null;
       }
diff --git a/shell/platform/android/io/flutter/view/FlutterNativeView.java b/shell/platform/android/io/flutter/view/FlutterNativeView.java
index 190a9ecbb160ee42b87ccf03955102545e262e62..2f027695b5ad318ca0bf58059f218a9ce50a788d 100644
--- a/shell/platform/android/io/flutter/view/FlutterNativeView.java
+++ b/shell/platform/android/io/flutter/view/FlutterNativeView.java
@@ -124,8 +124,13 @@ public class FlutterNativeView implements BinaryMessenger {
     return applicationIsRunning;
   }
 
+  @Deprecated
   public static String getObservatoryUri() {
-    return FlutterJNI.getObservatoryUri();
+    return FlutterJNI.getVMServiceUri();
+  }
+
+  public static String getVMServiceUri() {
+    return FlutterJNI.getVMServiceUri();
   }
 
   @Override
diff --git a/shell/platform/android/io/flutter/view/FlutterView.java b/shell/platform/android/io/flutter/view/FlutterView.java
index eb498a2335e96b5973bf05c1c3ab6ef07db5845f..62f2a17505174548e1af6229b366e2080a1f7c07 100644
--- a/shell/platform/android/io/flutter/view/FlutterView.java
+++ b/shell/platform/android/io/flutter/view/FlutterView.java
@@ -4,6 +4,8 @@
 
 package io.flutter.view;
 
+import static io.flutter.Build.API_LEVELS;
+
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -12,7 +14,6 @@ import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.Insets;
 import android.graphics.PixelFormat;
-import android.graphics.Rect;
 import android.graphics.SurfaceTexture;
 import android.os.Build;
 import android.os.Handler;
@@ -37,6 +38,7 @@ import android.view.autofill.AutofillValue;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputMethodManager;
+import android.window.BackEvent;
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.UiThread;
@@ -48,6 +50,7 @@ import io.flutter.embedding.engine.dart.DartExecutor;
 import io.flutter.embedding.engine.renderer.FlutterRenderer;
 import io.flutter.embedding.engine.renderer.SurfaceTextureWrapper;
 import io.flutter.embedding.engine.systemchannels.AccessibilityChannel;
+import io.flutter.embedding.engine.systemchannels.BackGestureChannel;
 import io.flutter.embedding.engine.systemchannels.LifecycleChannel;
 import io.flutter.embedding.engine.systemchannels.LocalizationChannel;
 import io.flutter.embedding.engine.systemchannels.MouseCursorChannel;
@@ -123,6 +126,7 @@ public class FlutterView extends SurfaceView
   private final DartExecutor dartExecutor;
   private final FlutterRenderer flutterRenderer;
   private final NavigationChannel navigationChannel;
+  private final BackGestureChannel backGestureChannel;
   private final LifecycleChannel lifecycleChannel;
   private final LocalizationChannel localizationChannel;
   private final PlatformChannel platformChannel;
@@ -213,6 +217,7 @@ public class FlutterView extends SurfaceView
 
     // Create all platform channels
     navigationChannel = new NavigationChannel(dartExecutor);
+    backGestureChannel = new BackGestureChannel(dartExecutor);
     lifecycleChannel = new LifecycleChannel(dartExecutor);
     localizationChannel = new LocalizationChannel(dartExecutor);
     platformChannel = new PlatformChannel(dartExecutor);
@@ -235,7 +240,7 @@ public class FlutterView extends SurfaceView
         new TextInputPlugin(this, new TextInputChannel(dartExecutor), platformViewsController);
     mKeyboardManager = new KeyboardManager(this);
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_24) {
       mMouseCursorPlugin = new MouseCursorPlugin(this, new MouseCursorChannel(dartExecutor));
     } else {
       mMouseCursorPlugin = null;
@@ -368,6 +373,30 @@ public class FlutterView extends SurfaceView
     navigationChannel.popRoute();
   }
 
+  @TargetApi(API_LEVELS.API_34)
+  @RequiresApi(API_LEVELS.API_34)
+  public void startBackGesture(@NonNull BackEvent backEvent) {
+    backGestureChannel.startBackGesture(backEvent);
+  }
+
+  @TargetApi(API_LEVELS.API_34)
+  @RequiresApi(API_LEVELS.API_34)
+  public void updateBackGestureProgress(@NonNull BackEvent backEvent) {
+    backGestureChannel.updateBackGestureProgress(backEvent);
+  }
+
+  @TargetApi(API_LEVELS.API_34)
+  @RequiresApi(API_LEVELS.API_34)
+  public void commitBackGesture() {
+    backGestureChannel.commitBackGesture();
+  }
+
+  @TargetApi(API_LEVELS.API_34)
+  @RequiresApi(API_LEVELS.API_34)
+  public void cancelBackGesture() {
+    backGestureChannel.cancelBackGesture();
+  }
+
   private void sendUserPlatformSettingsToDart() {
     // Lookup the current brightness of the Android OS.
     boolean isNightModeOn =
@@ -447,14 +476,7 @@ public class FlutterView extends SurfaceView
       return super.onTouchEvent(event);
     }
 
-    // TODO(abarth): This version check might not be effective in some
-    // versions of Android that statically compile code and will be upset
-    // at the lack of |requestUnbufferedDispatch|. Instead, we should factor
-    // version-dependent code into separate classes for each supported
-    // version and dispatch dynamically.
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      requestUnbufferedDispatch(event);
-    }
+    requestUnbufferedDispatch(event);
 
     return androidTouchProcessor.onTouchEvent(event);
   }
@@ -482,7 +504,8 @@ public class FlutterView extends SurfaceView
    */
   @Override
   public boolean onGenericMotionEvent(MotionEvent event) {
-    boolean handled = isAttached() && androidTouchProcessor.onGenericMotionEvent(event);
+    boolean handled =
+        isAttached() && androidTouchProcessor.onGenericMotionEvent(event, getContext());
     return handled ? true : super.onGenericMotionEvent(event);
   }
 
@@ -523,7 +546,7 @@ public class FlutterView extends SurfaceView
         return ZeroSides.RIGHT;
       } else if (rotation == Surface.ROTATION_270) {
         // In android API >= 23, the nav bar always appears on the "bottom" (USB) side.
-        return Build.VERSION.SDK_INT >= 23 ? ZeroSides.LEFT : ZeroSides.RIGHT;
+        return Build.VERSION.SDK_INT >= API_LEVELS.API_23 ? ZeroSides.LEFT : ZeroSides.RIGHT;
       }
       // Ambiguous orientation due to landscape left/right default. Zero both sides.
       else if (rotation == Surface.ROTATION_0 || rotation == Surface.ROTATION_180) {
@@ -543,8 +566,7 @@ public class FlutterView extends SurfaceView
   // be padded. When the on-screen keyboard is detected, we want to include the full inset
   // but when the inset is just the hidden nav bar, we want to provide a zero inset so the space
   // can be used.
-  @TargetApi(20)
-  @RequiresApi(20)
+
   private int guessBottomKeyboardInset(WindowInsets insets) {
     int screenHeight = getRootView().getHeight();
     // Magic number due to this being a heuristic. This should be replaced, but we have not
@@ -565,12 +587,10 @@ public class FlutterView extends SurfaceView
   // caused by usage of Android Q APIs. These calls are safe because they are
   // guarded.
   @Override
-  @TargetApi(20)
-  @RequiresApi(20)
   @SuppressLint({"InlinedApi", "NewApi"})
   public final WindowInsets onApplyWindowInsets(WindowInsets insets) {
     // getSystemGestureInsets() was introduced in API 29 and immediately deprecated in 30.
-    if (Build.VERSION.SDK_INT == Build.VERSION_CODES.Q) {
+    if (Build.VERSION.SDK_INT == API_LEVELS.API_29) {
       Insets systemGestureInsets = insets.getSystemGestureInsets();
       mMetrics.systemGestureInsetTop = systemGestureInsets.top;
       mMetrics.systemGestureInsetRight = systemGestureInsets.right;
@@ -582,7 +602,7 @@ public class FlutterView extends SurfaceView
     boolean navigationBarVisible =
         (SYSTEM_UI_FLAG_HIDE_NAVIGATION & getWindowSystemUiVisibility()) == 0;
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_30) {
       int mask = 0;
       if (navigationBarVisible) {
         mask = mask | android.view.WindowInsets.Type.navigationBars();
@@ -667,28 +687,6 @@ public class FlutterView extends SurfaceView
     return super.onApplyWindowInsets(insets);
   }
 
-  @Override
-  @SuppressWarnings("deprecation")
-  protected boolean fitSystemWindows(Rect insets) {
-    if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT) {
-      // Status bar, left/right system insets partially obscure content (padding).
-      mMetrics.physicalViewPaddingTop = insets.top;
-      mMetrics.physicalViewPaddingRight = insets.right;
-      mMetrics.physicalViewPaddingBottom = 0;
-      mMetrics.physicalViewPaddingLeft = insets.left;
-
-      // Bottom system inset (keyboard) should adjust scrollable bottom edge (inset).
-      mMetrics.physicalViewInsetTop = 0;
-      mMetrics.physicalViewInsetRight = 0;
-      mMetrics.physicalViewInsetBottom = insets.bottom;
-      mMetrics.physicalViewInsetLeft = 0;
-      updateViewportMetrics();
-      return true;
-    } else {
-      return super.fitSystemWindows(insets);
-    }
-  }
-
   private boolean isAttached() {
     return mNativeView != null && mNativeView.isAttached();
   }
@@ -821,8 +819,8 @@ public class FlutterView extends SurfaceView
   // -------- Start: Mouse -------
 
   @Override
-  @TargetApi(Build.VERSION_CODES.N)
-  @RequiresApi(Build.VERSION_CODES.N)
+  @TargetApi(API_LEVELS.API_24)
+  @RequiresApi(API_LEVELS.API_24)
   @NonNull
   public PointerIcon getSystemPointerIcon(int type) {
     return PointerIcon.getSystemIcon(getContext(), type);
@@ -898,6 +896,18 @@ public class FlutterView extends SurfaceView
     return registerSurfaceTexture(surfaceTexture);
   }
 
+  @Override
+  @NonNull
+  public ImageTextureEntry createImageTexture() {
+    throw new UnsupportedOperationException("Image textures are not supported in this mode.");
+  }
+
+  @Override
+  public SurfaceProducer createSurfaceProducer() {
+    throw new UnsupportedOperationException(
+        "SurfaceProducer textures are not supported in this mode.");
+  }
+
   @Override
   @NonNull
   public TextureRegistry.SurfaceTextureEntry registerSurfaceTexture(
@@ -918,19 +928,12 @@ public class FlutterView extends SurfaceView
       this.id = id;
       this.textureWrapper = new SurfaceTextureWrapper(surfaceTexture);
 
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-        // The callback relies on being executed on the UI thread (unsynchronised read of
-        // mNativeView
-        // and also the engine code check for platform thread in
-        // Shell::OnPlatformViewMarkTextureFrameAvailable),
-        // so we explicitly pass a Handler for the current thread.
-        this.surfaceTexture().setOnFrameAvailableListener(onFrameListener, new Handler());
-      } else {
-        // Android documentation states that the listener can be called on an arbitrary thread.
-        // But in practice, versions of Android that predate the newer API will call the listener
-        // on the thread where the SurfaceTexture was constructed.
-        this.surfaceTexture().setOnFrameAvailableListener(onFrameListener);
-      }
+      // The callback relies on being executed on the UI thread (unsynchronised read of
+      // mNativeView
+      // and also the engine code check for platform thread in
+      // Shell::OnPlatformViewMarkTextureFrameAvailable),
+      // so we explicitly pass a Handler for the current thread.
+      this.surfaceTexture().setOnFrameAvailableListener(onFrameListener, new Handler());
     }
 
     private SurfaceTexture.OnFrameAvailableListener onFrameListener =
@@ -955,6 +958,7 @@ public class FlutterView extends SurfaceView
       return textureWrapper;
     }
 
+    @NonNull
     @Override
     public SurfaceTexture surfaceTexture() {
       return textureWrapper.surfaceTexture();
diff --git a/shell/platform/android/io/flutter/view/TextureRegistry.java b/shell/platform/android/io/flutter/view/TextureRegistry.java
index 18dcbe100774ed764eee1f94f3421360507ec616..a8b5a52d0e6c54a9e00c0d6f21576d1f6fc36360 100644
--- a/shell/platform/android/io/flutter/view/TextureRegistry.java
+++ b/shell/platform/android/io/flutter/view/TextureRegistry.java
@@ -5,6 +5,9 @@
 package io.flutter.view;
 
 import android.graphics.SurfaceTexture;
+import android.media.Image;
+import android.view.Surface;
+import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
@@ -15,6 +18,14 @@ import androidx.annotation.Nullable;
  * href="https://api.flutter.dev/flutter/widgets/Texture-class.html">Texture</a> widget.
  */
 public interface TextureRegistry {
+  /**
+   * Creates and registers a SurfaceProducer texture managed by the Flutter engine.
+   *
+   * @return A SurfaceProducer.
+   */
+  @NonNull
+  SurfaceProducer createSurfaceProducer();
+
   /**
    * Creates and registers a SurfaceTexture managed by the Flutter engine.
    *
@@ -31,6 +42,14 @@ public interface TextureRegistry {
   @NonNull
   SurfaceTextureEntry registerSurfaceTexture(@NonNull SurfaceTexture surfaceTexture);
 
+  /**
+   * Creates and registers a texture managed by the Flutter engine.
+   *
+   * @return a ImageTextureEntry.
+   */
+  @NonNull
+  ImageTextureEntry createImageTexture();
+
   /**
    * Callback invoked when memory is low.
    *
@@ -38,18 +57,48 @@ public interface TextureRegistry {
    */
   default void onTrimMemory(int level) {}
 
+  /** An entry in the texture registry. */
+  interface TextureEntry {
+    /** @return The identity of this texture. */
+    long id();
+
+    /** Deregisters and releases all resources . */
+    void release();
+  }
+
+  /** Uses a Surface to populate the texture. */
+  @Keep
+  interface SurfaceProducer extends TextureEntry {
+    /** Specify the size of this texture in physical pixels */
+    void setSize(int width, int height);
+
+    /** @return The currently specified width (physical pixels) */
+    int getWidth();
+
+    /** @return The currently specified height (physical pixels) */
+    int getHeight();
+
+    /**
+     * Get a Surface that can be used to update the texture contents.
+     *
+     * <p>NOTE: You should not cache the returned surface but instead invoke getSurface each time
+     * you need to draw. The surface may change when the texture is resized or has its format
+     * changed.
+     *
+     * @return a Surface to use for a drawing target for various APIs.
+     */
+    Surface getSurface();
+
+    void scheduleFrame();
+  };
+
   /** A registry entry for a managed SurfaceTexture. */
-  interface SurfaceTextureEntry {
+  @Keep
+  interface SurfaceTextureEntry extends TextureEntry {
     /** @return The managed SurfaceTexture. */
     @NonNull
     SurfaceTexture surfaceTexture();
 
-    /** @return The identity of this SurfaceTexture. */
-    long id();
-
-    /** Deregisters and releases this SurfaceTexture. */
-    void release();
-
     /** Set a listener that will be notified when the most recent image has been consumed. */
     default void setOnFrameConsumedListener(@Nullable OnFrameConsumedListener listener) {}
 
@@ -57,6 +106,19 @@ public interface TextureRegistry {
     default void setOnTrimMemoryListener(@Nullable OnTrimMemoryListener listener) {}
   }
 
+  @Keep
+  interface ImageTextureEntry extends TextureEntry {
+    /**
+     * Next paint will update texture to use the contents of image.
+     *
+     * <p>NOTE: Caller should not call Image.close() on the pushed image.
+     *
+     * <p>NOTE: In the case that multiple calls to PushFrame occur before the next paint only the
+     * last frame pushed will be used (dropping the missed frames).
+     */
+    void pushImage(Image image);
+  }
+
   /** Listener invoked when the most recent image has been consumed. */
   interface OnFrameConsumedListener {
     /**
@@ -71,4 +133,28 @@ public interface TextureRegistry {
     /** This method will be invoked when a memory pressure warning was forward. */
     void onTrimMemory(int level);
   }
+
+  @Keep
+  interface ImageConsumer {
+    /**
+     * Retrieve the last Image produced. Drops all previously produced images.
+     *
+     * <p>NOTE: Caller must call Image.close() on returned image.
+     *
+     * @return Image or null.
+     */
+    @Nullable
+    public Image acquireLatestImage();
+  }
+
+  @Keep
+  interface GLTextureConsumer {
+    /**
+     * Retrieve the last GL texture produced.
+     *
+     * @return SurfaceTexture.
+     */
+    @NonNull
+    public SurfaceTexture getSurfaceTexture();
+  }
 }
diff --git a/shell/platform/android/io/flutter/view/VsyncWaiter.java b/shell/platform/android/io/flutter/view/VsyncWaiter.java
index 80f5658dea56926dc80f79e6a455ad02aa602a70..b99b089a5c55e5977385287f89b2e61459b4a94f 100644
--- a/shell/platform/android/io/flutter/view/VsyncWaiter.java
+++ b/shell/platform/android/io/flutter/view/VsyncWaiter.java
@@ -4,7 +4,6 @@
 
 package io.flutter.view;
 
-import android.annotation.TargetApi;
 import android.hardware.display.DisplayManager;
 import android.view.Choreographer;
 import android.view.Display;
@@ -14,7 +13,6 @@ import io.flutter.embedding.engine.FlutterJNI;
 
 // TODO(mattcarroll): add javadoc.
 public class VsyncWaiter {
-  @TargetApi(17)
   class DisplayListener implements DisplayManager.DisplayListener {
     DisplayListener(DisplayManager displayManager) {
       this.displayManager = displayManager;
@@ -59,7 +57,6 @@ public class VsyncWaiter {
     return instance;
   }
 
-  @TargetApi(17)
   @NonNull
   public static VsyncWaiter getInstance(
       @NonNull DisplayManager displayManager, @NonNull FlutterJNI flutterJNI) {
diff --git a/shell/platform/android/jni/BUILD.gn b/shell/platform/android/jni/BUILD.gn
index 7d95b56ad43991b36df05cf1958555bfde0cc871..7a05be011d2f72e7a55b2ad7f8eb1696207bc22c 100644
--- a/shell/platform/android/jni/BUILD.gn
+++ b/shell/platform/android/jni/BUILD.gn
@@ -18,7 +18,7 @@ source_set("jni") {
     "//flutter/fml",
     "//flutter/lib/ui",
     "//flutter/shell/platform/android/surface:native_window",
-    "//third_party/skia",
+    "//flutter/skia",
   ]
 }
 
diff --git a/shell/platform/android/jni/jni_mock.h b/shell/platform/android/jni/jni_mock.h
index aaa52b80d7bd4bbd6e14aa963622b18f621ced81..dd6c9737eae33da82212f20372a4870d8d44ba48 100644
--- a/shell/platform/android/jni/jni_mock.h
+++ b/shell/platform/android/jni/jni_mock.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_JNI_MOCK_H_
-#define FLUTTER_SHELL_PLATFORM_ANDROID_JNI_MOCK_H_
+#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_JNI_JNI_MOCK_H_
+#define FLUTTER_SHELL_PLATFORM_ANDROID_JNI_JNI_MOCK_H_
 
 #include "flutter/shell/platform/android/jni/platform_view_android_jni.h"
 #include "gmock/gmock.h"
@@ -49,6 +49,11 @@ class JNIMock final : public PlatformViewAndroidJNI {
               (JavaLocalRef surface_texture, int textureId),
               (override));
 
+  MOCK_METHOD(bool,
+              SurfaceTextureShouldUpdate,
+              (JavaLocalRef surface_texture),
+              (override));
+
   MOCK_METHOD(void,
               SurfaceTextureUpdateTexImage,
               (JavaLocalRef surface_texture),
@@ -59,6 +64,23 @@ class JNIMock final : public PlatformViewAndroidJNI {
               (JavaLocalRef surface_texture, SkMatrix& transform),
               (override));
 
+  MOCK_METHOD(JavaLocalRef,
+              ImageProducerTextureEntryAcquireLatestImage,
+              (JavaLocalRef image_texture_entry),
+              (override));
+
+  MOCK_METHOD(JavaLocalRef,
+              ImageGetHardwareBuffer,
+              (JavaLocalRef image),
+              (override));
+
+  MOCK_METHOD(void, ImageClose, (JavaLocalRef image), (override));
+
+  MOCK_METHOD(void,
+              HardwareBufferClose,
+              (JavaLocalRef hardware_buffer),
+              (override));
+
   MOCK_METHOD(void,
               SurfaceTextureDetachFromGLContext,
               (JavaLocalRef surface_texture),
@@ -98,13 +120,21 @@ class JNIMock final : public PlatformViewAndroidJNI {
               (override));
 
   MOCK_METHOD(double, GetDisplayRefreshRate, (), (override));
+  MOCK_METHOD(double, GetDisplayWidth, (), (override));
+  MOCK_METHOD(double, GetDisplayHeight, (), (override));
+  MOCK_METHOD(double, GetDisplayDensity, (), (override));
 
   MOCK_METHOD(bool,
               RequestDartDeferredLibrary,
               (int loading_unit_id),
               (override));
+
+  MOCK_METHOD(double,
+              FlutterViewGetScaledFontSize,
+              (double font_size, int configuration_id),
+              (const, override));
 };
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_JNI_MOCK_H_
+#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_JNI_JNI_MOCK_H_
diff --git a/shell/platform/android/jni/platform_view_android_jni.h b/shell/platform/android/jni/platform_view_android_jni.h
index 8e38a385fe771fce595a1c13128755d92d1abcbf..dcce4fd569ecc3320544b9e107fbef2b68b62333 100644
--- a/shell/platform/android/jni/platform_view_android_jni.h
+++ b/shell/platform/android/jni/platform_view_android_jni.h
@@ -5,6 +5,8 @@
 #ifndef FLUTTER_SHELL_PLATFORM_ANDROID_JNI_PLATFORM_VIEW_ANDROID_JNI_H_
 #define FLUTTER_SHELL_PLATFORM_ANDROID_JNI_PLATFORM_VIEW_ANDROID_JNI_H_
 
+#include <utility>
+
 #include "flutter/fml/macros.h"
 #include "flutter/fml/mapping.h"
 
@@ -89,6 +91,11 @@ class PlatformViewAndroidJNI {
   virtual void SurfaceTextureAttachToGLContext(JavaLocalRef surface_texture,
                                                int textureId) = 0;
 
+  //----------------------------------------------------------------------------
+  /// @brief      Returns true if surface_texture should be updated.
+  ///
+  virtual bool SurfaceTextureShouldUpdate(JavaLocalRef surface_texture) = 0;
+
   //----------------------------------------------------------------------------
   /// @brief      Updates the texture image to the most recent frame from the
   ///             image stream.
@@ -109,6 +116,27 @@ class PlatformViewAndroidJNI {
   virtual void SurfaceTextureDetachFromGLContext(
       JavaLocalRef surface_texture) = 0;
 
+  //----------------------------------------------------------------------------
+  /// @brief      Acquire the latest image available.
+  ///
+  virtual JavaLocalRef ImageProducerTextureEntryAcquireLatestImage(
+      JavaLocalRef image_texture_entry) = 0;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Grab the HardwareBuffer from image.
+  ///
+  virtual JavaLocalRef ImageGetHardwareBuffer(JavaLocalRef image) = 0;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Call close on image.
+  ///
+  virtual void ImageClose(JavaLocalRef image) = 0;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Call close on hardware_buffer.
+  ///
+  virtual void HardwareBufferClose(JavaLocalRef hardware_buffer) = 0;
+
   //----------------------------------------------------------------------------
   /// @brief      Positions and sizes a platform view if using hybrid
   ///             composition.
@@ -158,7 +186,7 @@ class PlatformViewAndroidJNI {
   ///
   struct OverlayMetadata {
     OverlayMetadata(int id, fml::RefPtr<AndroidNativeWindow> window)
-        : id(id), window(window){};
+        : id(id), window(std::move(window)){};
 
     ~OverlayMetadata() = default;
 
@@ -195,7 +223,16 @@ class PlatformViewAndroidJNI {
 
   virtual double GetDisplayRefreshRate() = 0;
 
+  virtual double GetDisplayWidth() = 0;
+
+  virtual double GetDisplayHeight() = 0;
+
+  virtual double GetDisplayDensity() = 0;
+
   virtual bool RequestDartDeferredLibrary(int loading_unit_id) = 0;
+
+  virtual double FlutterViewGetScaledFontSize(double unscaled_font_size,
+                                              int configuration_id) const = 0;
 };
 
 }  // namespace flutter
diff --git a/shell/platform/android/platform_message_handler_android.cc b/shell/platform/android/platform_message_handler_android.cc
index 937f0c95f588e7a729a63e738159978dc7358234..1f8f191ff2b0c468240591aec03d459e9d0349a6 100644
--- a/shell/platform/android/platform_message_handler_android.cc
+++ b/shell/platform/android/platform_message_handler_android.cc
@@ -1,3 +1,6 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
 
 #include "flutter/shell/platform/android/platform_message_handler_android.h"
 
diff --git a/shell/platform/android/platform_message_handler_android.h b/shell/platform/android/platform_message_handler_android.h
index e65c4148a7be0010dfe329ba38117280f34d13ab..2833e6cc56ea06e9318de677eab267a5cda94da0 100644
--- a/shell/platform/android/platform_message_handler_android.h
+++ b/shell/platform/android/platform_message_handler_android.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_PLATFORM_ANDROID_PLATFORM_MESSAGE_HANDLER_H_
-#define SHELL_PLATFORM_ANDROID_PLATFORM_MESSAGE_HANDLER_H_
+#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_PLATFORM_MESSAGE_HANDLER_ANDROID_H_
+#define FLUTTER_SHELL_PLATFORM_ANDROID_PLATFORM_MESSAGE_HANDLER_ANDROID_H_
 
 #include <jni.h>
 #include <memory>
@@ -38,4 +38,4 @@ class PlatformMessageHandlerAndroid : public PlatformMessageHandler {
 };
 }  // namespace flutter
 
-#endif
+#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_PLATFORM_MESSAGE_HANDLER_ANDROID_H_
diff --git a/shell/platform/android/platform_view_android.cc b/shell/platform/android/platform_view_android.cc
index 1b9d440a2d4bd02d24293767c61d0460f2530cb3..15abb985bb73a2dc1b21ca54a44d79b8d9568900 100644
--- a/shell/platform/android/platform_view_android.cc
+++ b/shell/platform/android/platform_view_android.cc
@@ -4,20 +4,26 @@
 
 #include "flutter/shell/platform/android/platform_view_android.h"
 
+#include <android/api-level.h>
 #include <memory>
 #include <utility>
 
+#include "flutter/common/graphics/texture.h"
 #include "flutter/fml/synchronization/waitable_event.h"
 #include "flutter/shell/common/shell_io_manager.h"
 #include "flutter/shell/gpu/gpu_surface_gl_delegate.h"
 #include "flutter/shell/platform/android/android_context_gl_impeller.h"
 #include "flutter/shell/platform/android/android_context_gl_skia.h"
-#include "flutter/shell/platform/android/android_external_texture_gl.h"
+#include "flutter/shell/platform/android/android_context_vulkan_impeller.h"
 #include "flutter/shell/platform/android/android_surface_gl_impeller.h"
 #include "flutter/shell/platform/android/android_surface_gl_skia.h"
 #include "flutter/shell/platform/android/android_surface_software.h"
+#include "flutter/shell/platform/android/image_external_texture_gl.h"
+#include "flutter/shell/platform/android/surface_texture_external_texture_gl.h"
+#include "fml/logging.h"
 #if IMPELLER_ENABLE_VULKAN  // b/258506856 for why this is behind an if
 #include "flutter/shell/platform/android/android_surface_vulkan_impeller.h"
+#include "flutter/shell/platform/android/image_external_texture_vk.h"
 #endif
 #include "flutter/shell/platform/android/context/android_context.h"
 #include "flutter/shell/platform/android/external_view_embedder/external_view_embedder.h"
@@ -31,57 +37,55 @@ namespace flutter {
 
 AndroidSurfaceFactoryImpl::AndroidSurfaceFactoryImpl(
     const std::shared_ptr<AndroidContext>& context,
-    std::shared_ptr<PlatformViewAndroidJNI> jni_facade,
     bool enable_impeller)
-    : android_context_(context),
-      jni_facade_(std::move(jni_facade)),
-      enable_impeller_(enable_impeller) {}
+    : android_context_(context), enable_impeller_(enable_impeller) {}
 
 AndroidSurfaceFactoryImpl::~AndroidSurfaceFactoryImpl() = default;
 
 std::unique_ptr<AndroidSurface> AndroidSurfaceFactoryImpl::CreateSurface() {
   switch (android_context_->RenderingApi()) {
     case AndroidRenderingAPI::kSoftware:
-      return std::make_unique<AndroidSurfaceSoftware>(android_context_,
-                                                      jni_facade_);
-    case AndroidRenderingAPI::kOpenGLES:
-      if (enable_impeller_) {
-// TODO(kaushikiska@): Enable this after wiring a preference for Vulkan backend.
-#if false
-        return std::make_unique<AndroidSurfaceVulkanImpeller>(android_context_,
-                                                              jni_facade_);
-
-#else
-        return std::make_unique<AndroidSurfaceGLImpeller>(android_context_,
-                                                          jni_facade_);
-#endif
-      } else {
-        return std::make_unique<AndroidSurfaceGLSkia>(android_context_,
-                                                      jni_facade_);
-      }
-    default:
-      FML_DCHECK(false);
-      return nullptr;
+      return std::make_unique<AndroidSurfaceSoftware>();
+    case AndroidRenderingAPI::kImpellerOpenGLES:
+      return std::make_unique<AndroidSurfaceGLImpeller>(
+          std::static_pointer_cast<AndroidContextGLImpeller>(android_context_));
+    case AndroidRenderingAPI::kSkiaOpenGLES:
+      return std::make_unique<AndroidSurfaceGLSkia>(
+          std::static_pointer_cast<AndroidContextGLSkia>(android_context_));
+    case AndroidRenderingAPI::kImpellerVulkan:
+      return std::make_unique<AndroidSurfaceVulkanImpeller>(
+          std::static_pointer_cast<AndroidContextVulkanImpeller>(
+              android_context_));
   }
+  FML_UNREACHABLE();
 }
 
 static std::shared_ptr<flutter::AndroidContext> CreateAndroidContext(
     bool use_software_rendering,
     const flutter::TaskRunners& task_runners,
     uint8_t msaa_samples,
-    bool enable_impeller) {
-  if (use_software_rendering) {
-    return std::make_shared<AndroidContext>(AndroidRenderingAPI::kSoftware);
-  }
-  if (enable_impeller) {
-    return std::make_unique<AndroidContextGLImpeller>();
+    AndroidRenderingAPI android_rendering_api,
+    bool enable_vulkan_validation,
+    bool enable_opengl_gpu_tracing,
+    bool enable_vulkan_gpu_tracing) {
+  switch (android_rendering_api) {
+    case AndroidRenderingAPI::kSoftware:
+      return std::make_shared<AndroidContext>(AndroidRenderingAPI::kSoftware);
+    case AndroidRenderingAPI::kImpellerOpenGLES:
+      return std::make_unique<AndroidContextGLImpeller>(
+          std::make_unique<impeller::egl::Display>(),
+          enable_opengl_gpu_tracing);
+    case AndroidRenderingAPI::kImpellerVulkan:
+      return std::make_unique<AndroidContextVulkanImpeller>(
+          enable_vulkan_validation, enable_vulkan_gpu_tracing);
+    case AndroidRenderingAPI::kSkiaOpenGLES:
+      return std::make_unique<AndroidContextGLSkia>(
+          fml::MakeRefCounted<AndroidEnvironmentGL>(),  //
+          task_runners,                                 //
+          msaa_samples                                  //
+      );
   }
-  return std::make_unique<AndroidContextGLSkia>(
-      AndroidRenderingAPI::kOpenGLES,               //
-      fml::MakeRefCounted<AndroidEnvironmentGL>(),  //
-      task_runners,                                 //
-      msaa_samples                                  //
-  );
+  FML_UNREACHABLE();
 }
 
 PlatformViewAndroid::PlatformViewAndroid(
@@ -98,7 +102,11 @@ PlatformViewAndroid::PlatformViewAndroid(
               use_software_rendering,
               task_runners,
               msaa_samples,
-              delegate.OnPlatformViewGetSettings().enable_impeller)) {}
+              delegate.OnPlatformViewGetSettings().android_rendering_api,
+              delegate.OnPlatformViewGetSettings().enable_vulkan_validation,
+              delegate.OnPlatformViewGetSettings().enable_opengl_gpu_tracing,
+              delegate.OnPlatformViewGetSettings().enable_vulkan_gpu_tracing)) {
+}
 
 PlatformViewAndroid::PlatformViewAndroid(
     PlatformView::Delegate& delegate,
@@ -114,10 +122,10 @@ PlatformViewAndroid::PlatformViewAndroid(
     FML_CHECK(android_context_->IsValid())
         << "Could not create surface from invalid Android context.";
     surface_factory_ = std::make_shared<AndroidSurfaceFactoryImpl>(
-        android_context_, jni_facade_,
-        delegate.OnPlatformViewGetSettings().enable_impeller);
+        android_context_,                                     //
+        delegate.OnPlatformViewGetSettings().enable_impeller  //
+    );
     android_surface_ = surface_factory_->CreateSurface();
-
     FML_CHECK(android_surface_ && android_surface_->IsValid())
         << "Could not create an OpenGL, Vulkan or Software surface to set up "
            "rendering.";
@@ -159,6 +167,8 @@ void PlatformViewAndroid::NotifySurfaceWindowChanged(
         });
     latch.Wait();
   }
+
+  PlatformView::ScheduleFrame();
 }
 
 void PlatformViewAndroid::NotifyDestroyed() {
@@ -267,11 +277,56 @@ void PlatformViewAndroid::UpdateSemantics(
 void PlatformViewAndroid::RegisterExternalTexture(
     int64_t texture_id,
     const fml::jni::ScopedJavaGlobalRef<jobject>& surface_texture) {
-  if (android_context_->RenderingApi() == AndroidRenderingAPI::kOpenGLES) {
-    RegisterTexture(std::make_shared<AndroidExternalTextureGL>(
-        texture_id, surface_texture, jni_facade_));
-  } else {
-    FML_LOG(INFO) << "Attempted to use a GL texture in a non GL context.";
+  switch (android_context_->RenderingApi()) {
+    case AndroidRenderingAPI::kImpellerOpenGLES:
+      // Impeller GLES.
+      RegisterTexture(std::make_shared<SurfaceTextureExternalTextureImpellerGL>(
+          std::static_pointer_cast<impeller::ContextGLES>(
+              android_context_->GetImpellerContext()),
+          texture_id, surface_texture, jni_facade_));
+      break;
+    case AndroidRenderingAPI::kSkiaOpenGLES:
+      // Legacy GL.
+      RegisterTexture(std::make_shared<SurfaceTextureExternalTextureGL>(
+          texture_id, surface_texture, jni_facade_));
+      break;
+    case AndroidRenderingAPI::kSoftware:
+    case AndroidRenderingAPI::kImpellerVulkan:
+      FML_LOG(INFO)
+          << "Attempted to use a SurfaceTextureExternalTexture with an "
+             "unsupported rendering API.";
+      break;
+  }
+}
+
+void PlatformViewAndroid::RegisterImageTexture(
+    int64_t texture_id,
+    const fml::jni::ScopedJavaGlobalRef<jobject>& image_texture_entry) {
+  switch (android_context_->RenderingApi()) {
+    case AndroidRenderingAPI::kImpellerOpenGLES:
+      // Impeller GLES.
+      RegisterTexture(std::make_shared<ImageExternalTextureGLImpeller>(
+          std::static_pointer_cast<impeller::ContextGLES>(
+              android_context_->GetImpellerContext()),
+          texture_id, image_texture_entry, jni_facade_));
+      break;
+    case AndroidRenderingAPI::kSkiaOpenGLES:
+      // Legacy GL.
+      RegisterTexture(std::make_shared<ImageExternalTextureGLSkia>(
+          std::static_pointer_cast<AndroidContextGLSkia>(android_context_),
+          texture_id, image_texture_entry, jni_facade_));
+      break;
+    case AndroidRenderingAPI::kImpellerVulkan:
+      RegisterTexture(std::make_shared<ImageExternalTextureVK>(
+          std::static_pointer_cast<impeller::ContextVK>(
+              android_context_->GetImpellerContext()),
+          texture_id, image_texture_entry, jni_facade_));
+      break;
+    case AndroidRenderingAPI::kSoftware:
+      FML_LOG(INFO)
+          << "Attempted to use a SurfaceTextureExternalTexture with an "
+             "unsupported rendering API.";
+      break;
   }
 }
 
@@ -316,7 +371,7 @@ sk_sp<GrDirectContext> PlatformViewAndroid::CreateResourceContext() const {
     // the OpenGL surface will be able to make a resource context current. If
     // this changes, this assumption breaks. Handle the same.
     resource_context = ShellIOManager::CreateCompatibleResourceLoadingContext(
-        GrBackend::kOpenGL_GrBackend,
+        GrBackendApi::kOpenGL,
         GPUSurfaceGLDelegate::GetDefaultPlatformGLInterface());
   } else {
     FML_DLOG(ERROR) << "Could not make the resource context current.";
@@ -402,4 +457,9 @@ void PlatformViewAndroid::FireFirstFrameCallback() {
   jni_facade_->FlutterViewOnFirstFrame();
 }
 
+double PlatformViewAndroid::GetScaledFontSize(double unscaled_font_size,
+                                              int configuration_id) const {
+  return jni_facade_->FlutterViewGetScaledFontSize(unscaled_font_size,
+                                                   configuration_id);
+}
 }  // namespace flutter
diff --git a/shell/platform/android/platform_view_android.h b/shell/platform/android/platform_view_android.h
index 536cb1d20f722e2eb724188466028c5f0fabb154..d5f34ffc777f7dcae4dc12d174fb0dd7a07d3e79 100644
--- a/shell/platform/android/platform_view_android.h
+++ b/shell/platform/android/platform_view_android.h
@@ -2,14 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_PLATFORM_ANDROID_PLATFORM_VIEW_ANDROID_H_
-#define SHELL_PLATFORM_ANDROID_PLATFORM_VIEW_ANDROID_H_
+#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_PLATFORM_VIEW_ANDROID_H_
+#define FLUTTER_SHELL_PLATFORM_ANDROID_PLATFORM_VIEW_ANDROID_H_
 
 #include <memory>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
+#include <android/hardware_buffer_jni.h>
 #include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/fml/platform/android/scoped_java_ref.h"
 #include "flutter/lib/ui/window/platform_message.h"
@@ -27,7 +28,6 @@ namespace flutter {
 class AndroidSurfaceFactoryImpl : public AndroidSurfaceFactory {
  public:
   AndroidSurfaceFactoryImpl(const std::shared_ptr<AndroidContext>& context,
-                            std::shared_ptr<PlatformViewAndroidJNI> jni_facade,
                             bool enable_impeller);
 
   ~AndroidSurfaceFactoryImpl() override;
@@ -36,7 +36,6 @@ class AndroidSurfaceFactoryImpl : public AndroidSurfaceFactory {
 
  private:
   const std::shared_ptr<AndroidContext>& android_context_;
-  std::shared_ptr<PlatformViewAndroidJNI> jni_facade_;
   const bool enable_impeller_;
 };
 
@@ -93,6 +92,10 @@ class PlatformViewAndroid final : public PlatformView {
       int64_t texture_id,
       const fml::jni::ScopedJavaGlobalRef<jobject>& surface_texture);
 
+  void RegisterImageTexture(
+      int64_t texture_id,
+      const fml::jni::ScopedJavaGlobalRef<jobject>& image_texture_entry);
+
   // |PlatformView|
   void LoadDartDeferredLibrary(
       intptr_t loading_unit_id,
@@ -172,8 +175,11 @@ class PlatformViewAndroid final : public PlatformView {
 
   void FireFirstFrameCallback();
 
+  double GetScaledFontSize(double unscaled_font_size,
+                           int configuration_id) const override;
+
   FML_DISALLOW_COPY_AND_ASSIGN(PlatformViewAndroid);
 };
 }  // namespace flutter
 
-#endif  // SHELL_PLATFORM_ANDROID_PLATFORM_VIEW_ANDROID_H_
+#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_PLATFORM_VIEW_ANDROID_H_
diff --git a/shell/platform/android/platform_view_android_delegate/BUILD.gn b/shell/platform/android/platform_view_android_delegate/BUILD.gn
index 89dc76f4f3ec9552e2fb1c1180e1353499798a6b..f01f6f8da46c167a3c9110aef908dae49720d4b2 100644
--- a/shell/platform/android/platform_view_android_delegate/BUILD.gn
+++ b/shell/platform/android/platform_view_android_delegate/BUILD.gn
@@ -19,7 +19,7 @@ source_set("platform_view_android_delegate") {
     "//flutter/lib/ui",
     "//flutter/shell/common",
     "//flutter/shell/platform/android/jni",
-    "//third_party/skia",
+    "//flutter/skia",
   ]
 }
 
diff --git a/shell/platform/android/platform_view_android_delegate/platform_view_android_delegate.cc b/shell/platform/android/platform_view_android_delegate/platform_view_android_delegate.cc
index aaebecc618c34ad03c95f1f647917e0982a6ab61..1639af639f3d0bf756cee246c7360f5547014bcd 100644
--- a/shell/platform/android/platform_view_android_delegate/platform_view_android_delegate.cc
+++ b/shell/platform/android/platform_view_android_delegate/platform_view_android_delegate.cc
@@ -44,7 +44,7 @@ PlatformViewAndroidDelegate::PlatformViewAndroidDelegate(
 void PlatformViewAndroidDelegate::UpdateSemantics(
     const flutter::SemanticsNodeUpdates& update,
     const flutter::CustomAccessibilityActionUpdates& actions) {
-  constexpr size_t kBytesPerNode = 47 * sizeof(int32_t);
+  constexpr size_t kBytesPerNode = 48 * sizeof(int32_t);
   constexpr size_t kBytesPerChild = sizeof(int32_t);
   constexpr size_t kBytesPerCustomAction = sizeof(int32_t);
   constexpr size_t kBytesPerAction = 4 * sizeof(int32_t);
@@ -103,6 +103,14 @@ void PlatformViewAndroidDelegate::UpdateSemantics(
       buffer_float32[position++] = static_cast<float>(node.scrollPosition);
       buffer_float32[position++] = static_cast<float>(node.scrollExtentMax);
       buffer_float32[position++] = static_cast<float>(node.scrollExtentMin);
+
+      if (node.identifier.empty()) {
+        buffer_int32[position++] = -1;
+      } else {
+        buffer_int32[position++] = strings.size();
+        strings.push_back(node.identifier);
+      }
+
       if (node.label.empty()) {
         buffer_int32[position++] = -1;
       } else {
diff --git a/shell/platform/android/platform_view_android_delegate/platform_view_android_delegate.h b/shell/platform/android/platform_view_android_delegate/platform_view_android_delegate.h
index 6e4b18de19ff02d96f4952aa57de89280c2a890f..0a9d2a39f807536cf52459c37a06aaa1dfdd490f 100644
--- a/shell/platform/android/platform_view_android_delegate/platform_view_android_delegate.h
+++ b/shell/platform/android/platform_view_android_delegate/platform_view_android_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_PLATFORM_ANDROID_PLATFORM_VIEW_ANDROID_DELEGATE_H_
-#define SHELL_PLATFORM_ANDROID_PLATFORM_VIEW_ANDROID_DELEGATE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_PLATFORM_VIEW_ANDROID_DELEGATE_PLATFORM_VIEW_ANDROID_DELEGATE_H_
+#define FLUTTER_SHELL_PLATFORM_ANDROID_PLATFORM_VIEW_ANDROID_DELEGATE_PLATFORM_VIEW_ANDROID_DELEGATE_H_
 
 #include <memory>
 #include <string>
@@ -27,4 +27,4 @@ class PlatformViewAndroidDelegate {
 };
 }  // namespace flutter
 
-#endif  // SHELL_PLATFORM_ANDROID_PLATFORM_VIEW_ANDROID_H_
+#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_PLATFORM_VIEW_ANDROID_DELEGATE_PLATFORM_VIEW_ANDROID_DELEGATE_H_
diff --git a/shell/platform/android/platform_view_android_delegate/platform_view_android_delegate_unittests.cc b/shell/platform/android/platform_view_android_delegate/platform_view_android_delegate_unittests.cc
index cb3b6f153533181bd2a4d57fcf12376cc19d0c3f..750ad66414b0b1c9eabf6576eaf9dc35d8d98f8d 100644
--- a/shell/platform/android/platform_view_android_delegate/platform_view_android_delegate_unittests.cc
+++ b/shell/platform/android/platform_view_android_delegate/platform_view_android_delegate_unittests.cc
@@ -18,11 +18,12 @@ TEST(PlatformViewShell, UpdateSemanticsDoesFlutterViewUpdateSemantics) {
   flutter::SemanticsNodeUpdates update;
   flutter::SemanticsNode node0;
   node0.id = 0;
+  node0.identifier = "identifier";
   node0.label = "label";
   node0.tooltip = "tooltip";
   update.insert(std::make_pair(0, node0));
 
-  std::vector<uint8_t> expected_buffer(188);
+  std::vector<uint8_t> expected_buffer(192);
   std::vector<std::vector<uint8_t>> expected_string_attribute_args(0);
   size_t position = 0;
   int32_t* buffer_int32 = reinterpret_cast<int32_t*>(&expected_buffer[0]);
@@ -41,6 +42,8 @@ TEST(PlatformViewShell, UpdateSemanticsDoesFlutterViewUpdateSemantics) {
   buffer_float32[position++] = static_cast<float>(node0.scrollPosition);
   buffer_float32[position++] = static_cast<float>(node0.scrollExtentMax);
   buffer_float32[position++] = static_cast<float>(node0.scrollExtentMin);
+  buffer_int32[position++] = expected_strings.size();  // node0.identifier
+  expected_strings.push_back(node0.identifier);
   buffer_int32[position++] = expected_strings.size();  // node0.label
   expected_strings.push_back(node0.label);
   buffer_int32[position++] = -1;  // node0.labelAttributes
@@ -90,13 +93,14 @@ TEST(PlatformViewShell,
   locale_attribute->type = flutter::StringAttributeType::kLocale;
   locale_attribute->locale = "en-US";
   node0.id = 0;
+  node0.identifier = "identifier";
   node0.label = "label";
   node0.labelAttributes.push_back(spell_out_attribute);
   node0.hint = "hint";
   node0.hintAttributes.push_back(locale_attribute);
   update.insert(std::make_pair(0, node0));
 
-  std::vector<uint8_t> expected_buffer(220);
+  std::vector<uint8_t> expected_buffer(224);
   std::vector<std::vector<uint8_t>> expected_string_attribute_args;
   size_t position = 0;
   int32_t* buffer_int32 = reinterpret_cast<int32_t*>(&expected_buffer[0]);
@@ -115,6 +119,8 @@ TEST(PlatformViewShell,
   buffer_float32[position++] = static_cast<float>(node0.scrollPosition);
   buffer_float32[position++] = static_cast<float>(node0.scrollExtentMax);
   buffer_float32[position++] = static_cast<float>(node0.scrollExtentMin);
+  buffer_int32[position++] = expected_strings.size();  // node0.identifier
+  expected_strings.push_back(node0.identifier);
   buffer_int32[position++] = expected_strings.size();  // node0.label
   expected_strings.push_back(node0.label);
   buffer_int32[position++] = 1;   // node0.labelAttributes
diff --git a/shell/platform/android/platform_view_android_jni_impl.cc b/shell/platform/android/platform_view_android_jni_impl.cc
index 031ec1057eb22ea8eccd439e65041f846f6f3faa..0b4ed2ca1fead0e38dec15b42fd3876d0191aa9f 100644
--- a/shell/platform/android/platform_view_android_jni_impl.cc
+++ b/shell/platform/android/platform_view_android_jni_impl.cc
@@ -4,6 +4,7 @@
 
 #include "flutter/shell/platform/android/platform_view_android_jni_impl.h"
 
+#include <android/hardware_buffer_jni.h>
 #include <android/native_window_jni.h>
 #include <dlfcn.h>
 #include <jni.h>
@@ -11,10 +12,11 @@
 #include <sstream>
 #include <utility>
 
+#include "include/android/SkImageAndroid.h"
 #include "unicode/uchar.h"
 
 #include "flutter/assets/directory_asset_bundle.h"
-#include "flutter/common/settings.h"
+#include "flutter/common/constants.h"
 #include "flutter/fml/file.h"
 #include "flutter/fml/mapping.h"
 #include "flutter/fml/native_library.h"
@@ -25,12 +27,13 @@
 #include "flutter/lib/ui/plugins/callback_cache.h"
 #include "flutter/runtime/dart_service_isolate.h"
 #include "flutter/shell/common/run_configuration.h"
-#include "flutter/shell/platform/android/android_external_texture_gl.h"
 #include "flutter/shell/platform/android/android_shell_holder.h"
 #include "flutter/shell/platform/android/apk_asset_provider.h"
 #include "flutter/shell/platform/android/flutter_main.h"
+#include "flutter/shell/platform/android/image_external_texture_gl.h"
 #include "flutter/shell/platform/android/jni/platform_view_android_jni.h"
 #include "flutter/shell/platform/android/platform_view_android.h"
+#include "flutter/shell/platform/android/surface_texture_external_texture_gl.h"
 
 #define ANDROID_SHELL_HOLDER \
   (reinterpret_cast<AndroidShellHolder*>(shell_holder))
@@ -47,6 +50,13 @@ static fml::jni::ScopedJavaGlobalRef<jclass>* g_java_weak_reference_class =
 
 static fml::jni::ScopedJavaGlobalRef<jclass>* g_texture_wrapper_class = nullptr;
 
+static fml::jni::ScopedJavaGlobalRef<jclass>*
+    g_image_consumer_texture_registry_interface = nullptr;
+
+static fml::jni::ScopedJavaGlobalRef<jclass>* g_image_class = nullptr;
+
+static fml::jni::ScopedJavaGlobalRef<jclass>* g_hardware_buffer_class = nullptr;
+
 static fml::jni::ScopedJavaGlobalRef<jclass>* g_java_long_class = nullptr;
 
 static fml::jni::ScopedJavaGlobalRef<jclass>* g_bitmap_class = nullptr;
@@ -82,6 +92,8 @@ static jmethodID g_update_semantics_method = nullptr;
 
 static jmethodID g_update_custom_accessibility_actions_method = nullptr;
 
+static jmethodID g_get_scaled_font_size_method = nullptr;
+
 static jmethodID g_on_first_frame_method = nullptr;
 
 static jmethodID g_on_engine_restart_method = nullptr;
@@ -98,12 +110,22 @@ static jmethodID g_java_weak_reference_get_method = nullptr;
 
 static jmethodID g_attach_to_gl_context_method = nullptr;
 
+static jmethodID g_surface_texture_wrapper_should_update = nullptr;
+
 static jmethodID g_update_tex_image_method = nullptr;
 
 static jmethodID g_get_transform_matrix_method = nullptr;
 
 static jmethodID g_detach_from_gl_context_method = nullptr;
 
+static jmethodID g_acquire_latest_image_method = nullptr;
+
+static jmethodID g_image_get_hardware_buffer_method = nullptr;
+
+static jmethodID g_image_close_method = nullptr;
+
+static jmethodID g_hardware_buffer_close_method = nullptr;
+
 static jmethodID g_compute_platform_resolved_locale_method = nullptr;
 
 static jmethodID g_request_dart_deferred_library_method = nullptr;
@@ -335,9 +357,17 @@ static void SetViewportMetrics(JNIEnv* env,
       displayFeaturesBounds,
       displayFeaturesType,
       displayFeaturesState,
+      0,  // Display ID
   };
 
-  ANDROID_SHELL_HOLDER->GetPlatformView()->SetViewportMetrics(metrics);
+  ANDROID_SHELL_HOLDER->GetPlatformView()->SetViewportMetrics(
+      kFlutterImplicitViewId, metrics);
+}
+
+static void UpdateDisplayMetrics(JNIEnv* env,
+                                 jobject jcaller,
+                                 jlong shell_holder) {
+  ANDROID_SHELL_HOLDER->UpdateDisplayMetrics();
 }
 
 static jobject GetBitmap(JNIEnv* env, jobject jcaller, jlong shell_holder) {
@@ -465,12 +495,15 @@ static void RegisterTexture(JNIEnv* env,
   );
 }
 
-static void MarkTextureFrameAvailable(JNIEnv* env,
-                                      jobject jcaller,
-                                      jlong shell_holder,
-                                      jlong texture_id) {
-  ANDROID_SHELL_HOLDER->GetPlatformView()->MarkTextureFrameAvailable(
-      static_cast<int64_t>(texture_id));
+static void RegisterImageTexture(JNIEnv* env,
+                                 jobject jcaller,
+                                 jlong shell_holder,
+                                 jlong texture_id,
+                                 jobject image_texture_entry) {
+  ANDROID_SHELL_HOLDER->GetPlatformView()->RegisterImageTexture(
+      static_cast<int64_t>(texture_id),                                 //
+      fml::jni::ScopedJavaGlobalRef<jobject>(env, image_texture_entry)  //
+  );
 }
 
 static void UnregisterTexture(JNIEnv* env,
@@ -481,6 +514,18 @@ static void UnregisterTexture(JNIEnv* env,
       static_cast<int64_t>(texture_id));
 }
 
+static void MarkTextureFrameAvailable(JNIEnv* env,
+                                      jobject jcaller,
+                                      jlong shell_holder,
+                                      jlong texture_id) {
+  ANDROID_SHELL_HOLDER->GetPlatformView()->MarkTextureFrameAvailable(
+      static_cast<int64_t>(texture_id));
+}
+
+static void ScheduleFrame(JNIEnv* env, jobject jcaller, jlong shell_holder) {
+  ANDROID_SHELL_HOLDER->GetPlatformView()->ScheduleFrame();
+}
+
 static void InvokePlatformMessageResponseCallback(JNIEnv* env,
                                                   jobject jcaller,
                                                   jlong shell_holder,
@@ -732,17 +777,27 @@ bool RegisterApi(JNIEnv* env) {
                        "WeakReference;)V",
           .fnPtr = reinterpret_cast<void*>(&RegisterTexture),
       },
+      {
+          .name = "nativeRegisterImageTexture",
+          .signature = "(JJLjava/lang/ref/"
+                       "WeakReference;)V",
+          .fnPtr = reinterpret_cast<void*>(&RegisterImageTexture),
+      },
       {
           .name = "nativeMarkTextureFrameAvailable",
           .signature = "(JJ)V",
           .fnPtr = reinterpret_cast<void*>(&MarkTextureFrameAvailable),
       },
+      {
+          .name = "nativeScheduleFrame",
+          .signature = "(J)V",
+          .fnPtr = reinterpret_cast<void*>(&ScheduleFrame),
+      },
       {
           .name = "nativeUnregisterTexture",
           .signature = "(JJ)V",
           .fnPtr = reinterpret_cast<void*>(&UnregisterTexture),
       },
-
       // Methods for Dart callback functionality.
       {
           .name = "nativeLookupCallbackInformation",
@@ -795,6 +850,11 @@ bool RegisterApi(JNIEnv* env) {
           .signature = "(ILjava/lang/String;Z)V",
           .fnPtr = reinterpret_cast<void*>(&DeferredComponentInstallFailure),
       },
+      {
+          .name = "nativeUpdateDisplayMetrics",
+          .signature = "(J)V",
+          .fnPtr = reinterpret_cast<void*>(&UpdateDisplayMetrics),
+      },
   };
 
   if (env->RegisterNatives(g_flutter_jni_class->obj(), flutter_jni_methods,
@@ -844,6 +904,14 @@ bool RegisterApi(JNIEnv* env) {
     return false;
   }
 
+  g_get_scaled_font_size_method = env->GetMethodID(
+      g_flutter_jni_class->obj(), "getScaledFontSize", "(FI)F");
+
+  if (g_get_scaled_font_size_method == nullptr) {
+    FML_LOG(ERROR) << "Could not locate FlutterJNI#getScaledFontSize method";
+    return false;
+  }
+
   g_update_semantics_method = env->GetMethodID(
       g_flutter_jni_class->obj(), "updateSemantics",
       "(Ljava/nio/ByteBuffer;[Ljava/lang/String;[Ljava/nio/ByteBuffer;)V");
@@ -1088,6 +1156,15 @@ bool PlatformViewAndroid::Register(JNIEnv* env) {
     return false;
   }
 
+  g_surface_texture_wrapper_should_update =
+      env->GetMethodID(g_texture_wrapper_class->obj(), "shouldUpdate", "()Z");
+
+  if (g_surface_texture_wrapper_should_update == nullptr) {
+    FML_LOG(ERROR)
+        << "Could not locate SurfaceTextureWrapper.shouldUpdate method";
+    return false;
+  }
+
   g_update_tex_image_method =
       env->GetMethodID(g_texture_wrapper_class->obj(), "updateTexImage", "()V");
 
@@ -1111,6 +1188,65 @@ bool PlatformViewAndroid::Register(JNIEnv* env) {
     FML_LOG(ERROR) << "Could not locate detachFromGlContext method";
     return false;
   }
+  g_image_consumer_texture_registry_interface =
+      new fml::jni::ScopedJavaGlobalRef<jclass>(
+          env, env->FindClass("io/flutter/view/TextureRegistry$ImageConsumer"));
+  if (g_image_consumer_texture_registry_interface->is_null()) {
+    FML_LOG(ERROR) << "Could not locate TextureRegistry.ImageConsumer class";
+    return false;
+  }
+
+  g_acquire_latest_image_method =
+      env->GetMethodID(g_image_consumer_texture_registry_interface->obj(),
+                       "acquireLatestImage", "()Landroid/media/Image;");
+  if (g_acquire_latest_image_method == nullptr) {
+    FML_LOG(ERROR) << "Could not locate acquireLatestImage on "
+                      "TextureRegistry.ImageConsumer class";
+    return false;
+  }
+
+  g_image_class = new fml::jni::ScopedJavaGlobalRef<jclass>(
+      env, env->FindClass("android/media/Image"));
+  if (g_image_class->is_null()) {
+    FML_LOG(ERROR) << "Could not locate Image class";
+    return false;
+  }
+
+  // Ensure we don't have any pending exceptions.
+  FML_CHECK(fml::jni::CheckException(env));
+
+  g_image_get_hardware_buffer_method =
+      env->GetMethodID(g_image_class->obj(), "getHardwareBuffer",
+                       "()Landroid/hardware/HardwareBuffer;");
+
+  if (g_image_get_hardware_buffer_method == nullptr) {
+    // Continue on as this method may not exist at API <= 29.
+    fml::jni::ClearException(env, true);
+  }
+
+  g_image_close_method = env->GetMethodID(g_image_class->obj(), "close", "()V");
+
+  if (g_image_close_method == nullptr) {
+    FML_LOG(ERROR) << "Could not locate close on Image class";
+    return false;
+  }
+
+  // Ensure we don't have any pending exceptions.
+  FML_CHECK(fml::jni::CheckException(env));
+  g_hardware_buffer_class = new fml::jni::ScopedJavaGlobalRef<jclass>(
+      env, env->FindClass("android/hardware/HardwareBuffer"));
+
+  if (!g_hardware_buffer_class->is_null()) {
+    g_hardware_buffer_close_method =
+        env->GetMethodID(g_hardware_buffer_class->obj(), "close", "()V");
+    if (g_hardware_buffer_close_method == nullptr) {
+      // Continue on as this class may not exist at API <= 26.
+      fml::jni::ClearException(env, true);
+    }
+  } else {
+    // Continue on as this class may not exist at API <= 26.
+    fml::jni::ClearException(env, true);
+  }
 
   g_compute_platform_resolved_locale_method = env->GetMethodID(
       g_flutter_jni_class->obj(), "computePlatformResolvedLocale",
@@ -1208,6 +1344,23 @@ void PlatformViewAndroidJNIImpl::FlutterViewHandlePlatformMessageResponse(
   FML_CHECK(fml::jni::CheckException(env));
 }
 
+double PlatformViewAndroidJNIImpl::FlutterViewGetScaledFontSize(
+    double font_size,
+    int configuration_id) const {
+  JNIEnv* env = fml::jni::AttachCurrentThread();
+
+  auto java_object = java_object_.get(env);
+  if (java_object.is_null()) {
+    return -3;
+  }
+
+  const jfloat scaledSize =
+      env->CallFloatMethod(java_object.obj(), g_get_scaled_font_size_method,
+                           (jfloat)font_size, (jint)configuration_id);
+  FML_CHECK(fml::jni::CheckException(env));
+  return (double)scaledSize;
+}
+
 void PlatformViewAndroidJNIImpl::FlutterViewUpdateSemantics(
     std::vector<uint8_t> buffer,
     std::vector<std::string> strings,
@@ -1306,6 +1459,29 @@ void PlatformViewAndroidJNIImpl::SurfaceTextureAttachToGLContext(
   FML_CHECK(fml::jni::CheckException(env));
 }
 
+bool PlatformViewAndroidJNIImpl::SurfaceTextureShouldUpdate(
+    JavaLocalRef surface_texture) {
+  JNIEnv* env = fml::jni::AttachCurrentThread();
+
+  if (surface_texture.is_null()) {
+    return false;
+  }
+
+  fml::jni::ScopedJavaLocalRef<jobject> surface_texture_local_ref(
+      env, env->CallObjectMethod(surface_texture.obj(),
+                                 g_java_weak_reference_get_method));
+  if (surface_texture_local_ref.is_null()) {
+    return false;
+  }
+
+  jboolean shouldUpdate = env->CallBooleanMethod(
+      surface_texture_local_ref.obj(), g_surface_texture_wrapper_should_update);
+
+  FML_CHECK(fml::jni::CheckException(env));
+
+  return shouldUpdate;
+}
+
 void PlatformViewAndroidJNIImpl::SurfaceTextureUpdateTexImage(
     JavaLocalRef surface_texture) {
   JNIEnv* env = fml::jni::AttachCurrentThread();
@@ -1405,6 +1581,69 @@ void PlatformViewAndroidJNIImpl::SurfaceTextureDetachFromGLContext(
   FML_CHECK(fml::jni::CheckException(env));
 }
 
+JavaLocalRef
+PlatformViewAndroidJNIImpl::ImageProducerTextureEntryAcquireLatestImage(
+    JavaLocalRef image_producer_texture_entry) {
+  JNIEnv* env = fml::jni::AttachCurrentThread();
+
+  if (image_producer_texture_entry.is_null()) {
+    // Return null.
+    return JavaLocalRef();
+  }
+
+  // Convert the weak reference to ImageTextureEntry into a strong local
+  // reference.
+  fml::jni::ScopedJavaLocalRef<jobject> image_producer_texture_entry_local_ref(
+      env, env->CallObjectMethod(image_producer_texture_entry.obj(),
+                                 g_java_weak_reference_get_method));
+
+  if (image_producer_texture_entry_local_ref.is_null()) {
+    // Return null.
+    return JavaLocalRef();
+  }
+
+  JavaLocalRef r = JavaLocalRef(
+      env, env->CallObjectMethod(image_producer_texture_entry_local_ref.obj(),
+                                 g_acquire_latest_image_method));
+  FML_CHECK(fml::jni::CheckException(env));
+  return r;
+}
+
+JavaLocalRef PlatformViewAndroidJNIImpl::ImageGetHardwareBuffer(
+    JavaLocalRef image) {
+  FML_CHECK(g_image_get_hardware_buffer_method != nullptr);
+  JNIEnv* env = fml::jni::AttachCurrentThread();
+  if (image.is_null()) {
+    // Return null.
+    return JavaLocalRef();
+  }
+  JavaLocalRef r = JavaLocalRef(
+      env,
+      env->CallObjectMethod(image.obj(), g_image_get_hardware_buffer_method));
+  FML_CHECK(fml::jni::CheckException(env));
+  return r;
+}
+
+void PlatformViewAndroidJNIImpl::ImageClose(JavaLocalRef image) {
+  JNIEnv* env = fml::jni::AttachCurrentThread();
+  if (image.is_null()) {
+    return;
+  }
+  env->CallVoidMethod(image.obj(), g_image_close_method);
+  FML_CHECK(fml::jni::CheckException(env));
+}
+
+void PlatformViewAndroidJNIImpl::HardwareBufferClose(
+    JavaLocalRef hardware_buffer) {
+  FML_CHECK(g_hardware_buffer_close_method != nullptr);
+  JNIEnv* env = fml::jni::AttachCurrentThread();
+  if (hardware_buffer.is_null()) {
+    return;
+  }
+  env->CallVoidMethod(hardware_buffer.obj(), g_hardware_buffer_close_method);
+  FML_CHECK(fml::jni::CheckException(env));
+}
+
 void PlatformViewAndroidJNIImpl::FlutterViewOnDisplayPlatformView(
     int view_id,
     int x,
@@ -1622,6 +1861,60 @@ double PlatformViewAndroidJNIImpl::GetDisplayRefreshRate() {
   return static_cast<double>(env->GetStaticFloatField(clazz.obj(), fid));
 }
 
+double PlatformViewAndroidJNIImpl::GetDisplayWidth() {
+  JNIEnv* env = fml::jni::AttachCurrentThread();
+
+  auto java_object = java_object_.get(env);
+  if (java_object.is_null()) {
+    return -1;
+  }
+
+  fml::jni::ScopedJavaLocalRef<jclass> clazz(
+      env, env->GetObjectClass(java_object.obj()));
+  if (clazz.is_null()) {
+    return -1;
+  }
+
+  jfieldID fid = env->GetStaticFieldID(clazz.obj(), "displayWidth", "F");
+  return static_cast<double>(env->GetStaticFloatField(clazz.obj(), fid));
+}
+
+double PlatformViewAndroidJNIImpl::GetDisplayHeight() {
+  JNIEnv* env = fml::jni::AttachCurrentThread();
+
+  auto java_object = java_object_.get(env);
+  if (java_object.is_null()) {
+    return -1;
+  }
+
+  fml::jni::ScopedJavaLocalRef<jclass> clazz(
+      env, env->GetObjectClass(java_object.obj()));
+  if (clazz.is_null()) {
+    return -1;
+  }
+
+  jfieldID fid = env->GetStaticFieldID(clazz.obj(), "displayHeight", "F");
+  return static_cast<double>(env->GetStaticFloatField(clazz.obj(), fid));
+}
+
+double PlatformViewAndroidJNIImpl::GetDisplayDensity() {
+  JNIEnv* env = fml::jni::AttachCurrentThread();
+
+  auto java_object = java_object_.get(env);
+  if (java_object.is_null()) {
+    return -1;
+  }
+
+  fml::jni::ScopedJavaLocalRef<jclass> clazz(
+      env, env->GetObjectClass(java_object.obj()));
+  if (clazz.is_null()) {
+    return -1;
+  }
+
+  jfieldID fid = env->GetStaticFieldID(clazz.obj(), "displayDensity", "F");
+  return static_cast<double>(env->GetStaticFloatField(clazz.obj(), fid));
+}
+
 bool PlatformViewAndroidJNIImpl::RequestDartDeferredLibrary(
     int loading_unit_id) {
   JNIEnv* env = fml::jni::AttachCurrentThread();
diff --git a/shell/platform/android/platform_view_android_jni_impl.h b/shell/platform/android/platform_view_android_jni_impl.h
index b3df5358291fad27cc57f4c1917cee0f98e55387..5cf432559f9809f2cdaf9dade86ec18602411007 100644
--- a/shell/platform/android/platform_view_android_jni_impl.h
+++ b/shell/platform/android/platform_view_android_jni_impl.h
@@ -45,6 +45,8 @@ class PlatformViewAndroidJNIImpl final : public PlatformViewAndroidJNI {
   void SurfaceTextureAttachToGLContext(JavaLocalRef surface_texture,
                                        int textureId) override;
 
+  bool SurfaceTextureShouldUpdate(JavaLocalRef surface_texture) override;
+
   void SurfaceTextureUpdateTexImage(JavaLocalRef surface_texture) override;
 
   void SurfaceTextureGetTransformMatrix(JavaLocalRef surface_texture,
@@ -52,6 +54,15 @@ class PlatformViewAndroidJNIImpl final : public PlatformViewAndroidJNI {
 
   void SurfaceTextureDetachFromGLContext(JavaLocalRef surface_texture) override;
 
+  JavaLocalRef ImageProducerTextureEntryAcquireLatestImage(
+      JavaLocalRef image_texture_entry) override;
+
+  JavaLocalRef ImageGetHardwareBuffer(JavaLocalRef image) override;
+
+  void ImageClose(JavaLocalRef image) override;
+
+  void HardwareBufferClose(JavaLocalRef hardware_buffer) override;
+
   void FlutterViewOnDisplayPlatformView(int view_id,
                                         int x,
                                         int y,
@@ -82,8 +93,17 @@ class PlatformViewAndroidJNIImpl final : public PlatformViewAndroidJNI {
 
   double GetDisplayRefreshRate() override;
 
+  double GetDisplayWidth() override;
+
+  double GetDisplayHeight() override;
+
+  double GetDisplayDensity() override;
+
   bool RequestDartDeferredLibrary(int loading_unit_id) override;
 
+  double FlutterViewGetScaledFontSize(double unscaled_font_size,
+                                      int configuration_id) const override;
+
  private:
   // Reference to FlutterJNI object.
   const fml::jni::JavaObjectWeakGlobalRef java_object_;
diff --git a/shell/platform/android/platform_view_android_unittests.cc b/shell/platform/android/platform_view_android_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..3d7ed4f49235590b41ae5d0e5d91d845a25b7de8
--- /dev/null
+++ b/shell/platform/android/platform_view_android_unittests.cc
@@ -0,0 +1,38 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+#include "shell/platform/android/flutter_main.h"
+#include "third_party/googletest/googlemock/include/gmock/gmock-nice-strict.h"
+
+namespace flutter {
+namespace testing {
+
+TEST(AndroidPlatformView, SelectsVulkanBasedOnApiLevel) {
+  Settings settings;
+  settings.enable_software_rendering = false;
+  settings.enable_impeller = true;
+
+  int api_level = android_get_device_api_level();
+  EXPECT_GT(api_level, 0);
+  if (api_level >= 29) {
+    EXPECT_EQ(FlutterMain::SelectedRenderingAPI(settings),
+              AndroidRenderingAPI::kImpellerVulkan);
+  } else {
+    EXPECT_EQ(FlutterMain::SelectedRenderingAPI(settings),
+              AndroidRenderingAPI::kSkiaOpenGLES);
+  }
+}
+
+TEST(AndroidPlatformView, SoftwareRenderingNotSupportedWithImpeller) {
+  Settings settings;
+  settings.enable_software_rendering = true;
+  settings.enable_impeller = true;
+
+  ASSERT_DEATH(FlutterMain::SelectedRenderingAPI(settings), "");
+}
+
+}  // namespace testing
+}  // namespace flutter
diff --git a/shell/platform/android/surface/BUILD.gn b/shell/platform/android/surface/BUILD.gn
index eb1f832980d3b4a4bb6145523acca86a4b3c14f1..ecc46d1145f6e5e581e2852e438c8b2f74863294 100644
--- a/shell/platform/android/surface/BUILD.gn
+++ b/shell/platform/android/surface/BUILD.gn
@@ -21,7 +21,7 @@ source_set("surface") {
     "//flutter/shell/common",
     "//flutter/shell/platform/android/context",
     "//flutter/shell/platform/android/jni",
-    "//third_party/skia",
+    "//flutter/skia",
   ]
 }
 
@@ -35,7 +35,7 @@ source_set("native_window") {
 
   deps = [
     "//flutter/fml",
-    "//third_party/skia",
+    "//flutter/skia",
   ]
 }
 
@@ -53,8 +53,8 @@ source_set("surface_mock") {
     ":surface",
     "//flutter/flow",
     "//flutter/shell/gpu:gpu_surface_gl",
-    "//third_party/googletest:gmock",
-    "//third_party/googletest:gtest",
+    "//flutter/third_party/googletest:gmock",
+    "//flutter/third_party/googletest:gtest",
   ]
 
   if (shell_enable_vulkan) {
diff --git a/shell/platform/android/surface/android_native_window.cc b/shell/platform/android/surface/android_native_window.cc
index 20e75f57aaf589167326c8af35ba6043041bf5e6..34e6d43827909898906326b7ba8b02311d4b177e 100644
--- a/shell/platform/android/surface/android_native_window.cc
+++ b/shell/platform/android/surface/android_native_window.cc
@@ -16,8 +16,8 @@ AndroidNativeWindow::~AndroidNativeWindow() {
   if (window_ != nullptr) {
 #if FML_OS_ANDROID
     ANativeWindow_release(window_);
-#endif  // FML_OS_ANDROID
     window_ = nullptr;
+#endif  // FML_OS_ANDROID
   }
 }
 
diff --git a/shell/platform/android/surface/android_native_window.h b/shell/platform/android/surface/android_native_window.h
index 633ee02fadc13e29f49c097023521e9f95ad2637..6b5a45f9f701fcda79383f6d26058a6e5b0298a9 100644
--- a/shell/platform/android/surface/android_native_window.h
+++ b/shell/platform/android/surface/android_native_window.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_NATIVE_WINDOW_H_
-#define FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_NATIVE_WINDOW_H_
+#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_SURFACE_ANDROID_NATIVE_WINDOW_H_
+#define FLUTTER_SHELL_PLATFORM_ANDROID_SURFACE_ANDROID_NATIVE_WINDOW_H_
 
 #include "flutter/fml/build_config.h"
 
@@ -55,4 +55,4 @@ class AndroidNativeWindow
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_NATIVE_WINDOW_H_
+#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_SURFACE_ANDROID_NATIVE_WINDOW_H_
diff --git a/shell/platform/android/surface/android_surface.cc b/shell/platform/android/surface/android_surface.cc
index ab96387edbd77774d5b23f9ba2d1d70db1ca7d7a..e301491b5fce074cde095a0b0dae33b653ef53ac 100644
--- a/shell/platform/android/surface/android_surface.cc
+++ b/shell/platform/android/surface/android_surface.cc
@@ -7,11 +7,7 @@
 
 namespace flutter {
 
-AndroidSurface::AndroidSurface(
-    const std::shared_ptr<AndroidContext>& android_context) {
-  FML_DCHECK(android_context->IsValid());
-  android_context_ = android_context;
-}
+AndroidSurface::AndroidSurface() = default;
 
 AndroidSurface::~AndroidSurface() = default;
 
diff --git a/shell/platform/android/surface/android_surface.h b/shell/platform/android/surface/android_surface.h
index 485f619e1a81beb3342238eca9eeadd07655871d..23636d39f87529bb2c80176747c70c252619c8fe 100644
--- a/shell/platform/android/surface/android_surface.h
+++ b/shell/platform/android/surface/android_surface.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_SURFACE_H_
-#define FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_SURFACE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_SURFACE_ANDROID_SURFACE_H_
+#define FLUTTER_SHELL_PLATFORM_ANDROID_SURFACE_ANDROID_SURFACE_H_
 
 #include <memory>
 #include "flutter/flow/embedded_views.h"
@@ -46,9 +46,7 @@ class AndroidSurface {
   virtual std::shared_ptr<impeller::Context> GetImpellerContext();
 
  protected:
-  explicit AndroidSurface(
-      const std::shared_ptr<AndroidContext>& android_context);
-  std::shared_ptr<AndroidContext> android_context_;
+  AndroidSurface();
 };
 
 class AndroidSurfaceFactory {
@@ -62,4 +60,4 @@ class AndroidSurfaceFactory {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_SURFACE_H_
+#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_SURFACE_ANDROID_SURFACE_H_
diff --git a/shell/platform/android/surface/android_surface_mock.cc b/shell/platform/android/surface/android_surface_mock.cc
index 8f718fcae667a1c318de0f2a20ee8118e622987d..0f7c6d1a6d80c7e154139d5469eacea7d3039381 100644
--- a/shell/platform/android/surface/android_surface_mock.cc
+++ b/shell/platform/android/surface/android_surface_mock.cc
@@ -6,10 +6,6 @@
 
 namespace flutter {
 
-AndroidSurfaceMock::AndroidSurfaceMock(
-    const std::shared_ptr<AndroidContext>& android_context)
-    : AndroidSurface(android_context) {}
-
 std::unique_ptr<GLContextResult> AndroidSurfaceMock::GLContextMakeCurrent() {
   return std::make_unique<GLContextDefaultResult>(/*static_result=*/true);
 }
diff --git a/shell/platform/android/surface/android_surface_mock.h b/shell/platform/android/surface/android_surface_mock.h
index 3f326a21920b7be68bf28bf17c0689acbf36eef1..6bb1628e7dd85609cf1815582ca473fdc9b4ee91 100644
--- a/shell/platform/android/surface/android_surface_mock.h
+++ b/shell/platform/android/surface/android_surface_mock.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_SURFACE_MOCK_H_
-#define FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_SURFACE_MOCK_H_
+#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_SURFACE_ANDROID_SURFACE_MOCK_H_
+#define FLUTTER_SHELL_PLATFORM_ANDROID_SURFACE_ANDROID_SURFACE_MOCK_H_
 
 #include "flutter/shell/gpu/gpu_surface_gl_skia.h"
 #include "flutter/shell/platform/android/surface/android_surface.h"
@@ -18,9 +18,6 @@ namespace flutter {
 class AndroidSurfaceMock final : public GPUSurfaceGLDelegate,
                                  public AndroidSurface {
  public:
-  explicit AndroidSurfaceMock(
-      const std::shared_ptr<AndroidContext>& android_context);
-
   MOCK_METHOD(bool, IsValid, (), (const, override));
 
   MOCK_METHOD(void, TeardownOnScreenContext, (), (override));
@@ -56,4 +53,4 @@ class AndroidSurfaceMock final : public GPUSurfaceGLDelegate,
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_SURFACE_MOCK_H_
+#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_SURFACE_ANDROID_SURFACE_MOCK_H_
diff --git a/shell/platform/android/surface/snapshot_surface_producer.h b/shell/platform/android/surface/snapshot_surface_producer.h
index 5ec8c68b2f457aa4a5bd4865fa0bad19acc1be7a..7fdbf63063a37464d0b577b80127c7f1e50feafe 100644
--- a/shell/platform/android/surface/snapshot_surface_producer.h
+++ b/shell/platform/android/surface/snapshot_surface_producer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_PLATFORM_ANDROID_SURFACE_SNAPSHOT_SURFACE_PRODUCER_H_
-#define SHELL_PLATFORM_ANDROID_SURFACE_SNAPSHOT_SURFACE_PRODUCER_H_
+#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_SURFACE_SNAPSHOT_SURFACE_PRODUCER_H_
+#define FLUTTER_SHELL_PLATFORM_ANDROID_SURFACE_SNAPSHOT_SURFACE_PRODUCER_H_
 
 #include "flutter/flow/surface.h"
 #include "flutter/shell/common/snapshot_surface_producer.h"
@@ -23,4 +23,4 @@ class AndroidSnapshotSurfaceProducer : public SnapshotSurfaceProducer {
 };
 
 }  // namespace flutter
-#endif  // SHELL_PLATFORM_ANDROID_SURFACE_SNAPSHOT_SURFACE_PRODUCER_H_
+#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_SURFACE_SNAPSHOT_SURFACE_PRODUCER_H_
diff --git a/shell/platform/android/android_external_texture_gl.cc b/shell/platform/android/surface_texture_external_texture.cc
similarity index 39%
rename from shell/platform/android/android_external_texture_gl.cc
rename to shell/platform/android/surface_texture_external_texture.cc
index 03c03a5c327ec639a1ff6627af7a0a1a958c2f7a..56dece61d644297e87698b806e953673b7dba587 100644
--- a/shell/platform/android/android_external_texture_gl.cc
+++ b/shell/platform/android/surface_texture_external_texture.cc
@@ -2,132 +2,131 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/android/android_external_texture_gl.h"
+#include "flutter/shell/platform/android/surface_texture_external_texture.h"
 
 #include <GLES/glext.h>
 
 #include <utility>
 
+#include "flutter/display_list/effects/dl_color_source.h"
 #include "third_party/skia/include/core/SkAlphaType.h"
 #include "third_party/skia/include/core/SkColorSpace.h"
 #include "third_party/skia/include/core/SkColorType.h"
 #include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/gpu/GrBackendSurface.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
+#include "third_party/skia/include/gpu/ganesh/SkImageGanesh.h"
+#include "third_party/skia/include/gpu/ganesh/gl/GrGLBackendSurface.h"
+#include "third_party/skia/include/gpu/gl/GrGLTypes.h"
 
 namespace flutter {
 
-AndroidExternalTextureGL::AndroidExternalTextureGL(
+SurfaceTextureExternalTexture::SurfaceTextureExternalTexture(
     int64_t id,
     const fml::jni::ScopedJavaGlobalRef<jobject>& surface_texture,
-    std::shared_ptr<PlatformViewAndroidJNI> jni_facade)
+    const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade)
     : Texture(id),
-      jni_facade_(std::move(jni_facade)),
+      jni_facade_(jni_facade),
       surface_texture_(surface_texture),
-      transform(SkMatrix::I()) {}
+      transform_(SkMatrix::I()) {}
 
-AndroidExternalTextureGL::~AndroidExternalTextureGL() {
-  if (state_ == AttachmentState::attached) {
-    glDeleteTextures(1, &texture_name_);
-  }
-}
+SurfaceTextureExternalTexture::~SurfaceTextureExternalTexture() {}
 
-void AndroidExternalTextureGL::OnGrContextCreated() {
-  state_ = AttachmentState::uninitialized;
+void SurfaceTextureExternalTexture::OnGrContextCreated() {
+  state_ = AttachmentState::kUninitialized;
 }
 
-void AndroidExternalTextureGL::MarkNewFrameAvailable() {
-  new_frame_ready_ = true;
+void SurfaceTextureExternalTexture::MarkNewFrameAvailable() {
+  // NOOP.
 }
 
-void AndroidExternalTextureGL::Paint(PaintContext& context,
-                                     const SkRect& bounds,
-                                     bool freeze,
-                                     const SkSamplingOptions& sampling) {
-  if (state_ == AttachmentState::detached) {
+void SurfaceTextureExternalTexture::Paint(PaintContext& context,
+                                          const SkRect& bounds,
+                                          bool freeze,
+                                          const DlImageSampling sampling) {
+  if (state_ == AttachmentState::kDetached) {
     return;
   }
-  if (state_ == AttachmentState::uninitialized) {
-    glGenTextures(1, &texture_name_);
-    Attach(static_cast<jint>(texture_name_));
-    state_ = AttachmentState::attached;
-  }
-  if (!freeze && new_frame_ready_) {
-    Update();
-    new_frame_ready_ = false;
+  const bool should_process_frame =
+      !freeze || ShouldUpdate() || dl_image_ == nullptr;
+  if (should_process_frame) {
+    ProcessFrame(context, bounds);
   }
-  GrGLTextureInfo textureInfo = {GL_TEXTURE_EXTERNAL_OES, texture_name_,
-                                 GL_RGBA8_OES};
-  GrBackendTexture backendTexture(1, 1, GrMipMapped::kNo, textureInfo);
-  sk_sp<SkImage> image = SkImage::MakeFromTexture(
-      context.gr_context, backendTexture, kTopLeft_GrSurfaceOrigin,
-      kRGBA_8888_SkColorType, kPremul_SkAlphaType, nullptr);
-  if (image) {
-    SkAutoCanvasRestore autoRestore(context.canvas, true);
+  FML_CHECK(state_ == AttachmentState::kAttached);
+
+  if (dl_image_) {
+    DlAutoCanvasRestore autoRestore(context.canvas, true);
 
     // The incoming texture is vertically flipped, so we flip it
     // back. OpenGL's coordinate system has Positive Y equivalent to up, while
     // Skia's coordinate system has Negative Y equvalent to up.
-    context.canvas->translate(bounds.x(), bounds.y() + bounds.height());
-    context.canvas->scale(bounds.width(), -bounds.height());
+    context.canvas->Translate(bounds.x(), bounds.y() + bounds.height());
+    context.canvas->Scale(bounds.width(), -bounds.height());
 
-    if (!transform.isIdentity()) {
-      sk_sp<SkShader> shader = image->makeShader(
-          SkTileMode::kRepeat, SkTileMode::kRepeat, sampling, transform);
+    if (!transform_.isIdentity()) {
+      DlImageColorSource source(dl_image_, DlTileMode::kClamp,
+                                DlTileMode::kClamp, sampling, &transform_);
 
-      SkPaint paintWithShader;
-      if (context.sk_paint) {
-        paintWithShader = *context.sk_paint;
+      DlPaint paintWithShader;
+      if (context.paint) {
+        paintWithShader = *context.paint;
       }
-      paintWithShader.setShader(shader);
-      context.canvas->drawRect(SkRect::MakeWH(1, 1), paintWithShader);
+      paintWithShader.setColorSource(&source);
+      context.canvas->DrawRect(SkRect::MakeWH(1, 1), paintWithShader);
     } else {
-      context.canvas->drawImage(image, 0, 0, sampling, context.sk_paint);
+      context.canvas->DrawImage(dl_image_, {0, 0}, sampling, context.paint);
     }
+  } else {
+    FML_LOG(WARNING)
+        << "No DlImage available for SurfaceTextureExternalTexture to paint.";
   }
 }
 
-void AndroidExternalTextureGL::UpdateTransform() {
-  jni_facade_->SurfaceTextureGetTransformMatrix(
-      fml::jni::ScopedJavaLocalRef<jobject>(surface_texture_), transform);
-
-  // Android's SurfaceTexture transform matrix works on texture coordinate
-  // lookups in the range 0.0-1.0, while Skia's Shader transform matrix works on
-  // the image itself, as if it were inscribed inside a clip rect.
-  // An Android transform that scales lookup by 0.5 (displaying 50% of the
-  // texture) is the same as a Skia transform by 2.0 (scaling 50% of the image
-  // outside of the virtual "clip rect"), so we invert the incoming matrix.
-  SkMatrix inverted;
-  if (!transform.invert(&inverted)) {
-    FML_LOG(FATAL) << "Invalid SurfaceTexture transformation matrix";
+void SurfaceTextureExternalTexture::OnGrContextDestroyed() {
+  if (state_ == AttachmentState::kAttached) {
+    Detach();
   }
-  transform = inverted;
+  state_ = AttachmentState::kDetached;
 }
 
-void AndroidExternalTextureGL::OnGrContextDestroyed() {
-  if (state_ == AttachmentState::attached) {
-    Detach();
-    glDeleteTextures(1, &texture_name_);
-  }
-  state_ = AttachmentState::detached;
+void SurfaceTextureExternalTexture::OnTextureUnregistered() {}
+
+void SurfaceTextureExternalTexture::Detach() {
+  jni_facade_->SurfaceTextureDetachFromGLContext(
+      fml::jni::ScopedJavaLocalRef<jobject>(surface_texture_));
+  dl_image_.reset();
 }
 
-void AndroidExternalTextureGL::Attach(jint textureName) {
+void SurfaceTextureExternalTexture::Attach(int gl_tex_id) {
   jni_facade_->SurfaceTextureAttachToGLContext(
-      fml::jni::ScopedJavaLocalRef<jobject>(surface_texture_), textureName);
+      fml::jni::ScopedJavaLocalRef<jobject>(surface_texture_), gl_tex_id);
+  state_ = AttachmentState::kAttached;
 }
 
-void AndroidExternalTextureGL::Update() {
-  jni_facade_->SurfaceTextureUpdateTexImage(
+bool SurfaceTextureExternalTexture::ShouldUpdate() {
+  return jni_facade_->SurfaceTextureShouldUpdate(
       fml::jni::ScopedJavaLocalRef<jobject>(surface_texture_));
-  UpdateTransform();
 }
 
-void AndroidExternalTextureGL::Detach() {
-  jni_facade_->SurfaceTextureDetachFromGLContext(
+void SurfaceTextureExternalTexture::Update() {
+  jni_facade_->SurfaceTextureUpdateTexImage(
       fml::jni::ScopedJavaLocalRef<jobject>(surface_texture_));
-}
 
-void AndroidExternalTextureGL::OnTextureUnregistered() {}
+  jni_facade_->SurfaceTextureGetTransformMatrix(
+      fml::jni::ScopedJavaLocalRef<jobject>(surface_texture_), transform_);
+
+  // Android's SurfaceTexture transform matrix works on texture coordinate
+  // lookups in the range 0.0-1.0, while Skia's Shader transform matrix works on
+  // the image itself, as if it were inscribed inside a clip rect.
+  // An Android transform that scales lookup by 0.5 (displaying 50% of the
+  // texture) is the same as a Skia transform by 2.0 (scaling 50% of the image
+  // outside of the virtual "clip rect"), so we invert the incoming matrix.
+  SkMatrix inverted;
+  if (!transform_.invert(&inverted)) {
+    FML_LOG(FATAL)
+        << "Invalid (not invertable) SurfaceTexture transformation matrix";
+  }
+  transform_ = inverted;
+}
 
 }  // namespace flutter
diff --git a/shell/platform/android/android_external_texture_gl.h b/shell/platform/android/surface_texture_external_texture.h
similarity index 46%
rename from shell/platform/android/android_external_texture_gl.h
rename to shell/platform/android/surface_texture_external_texture.h
index b2cc8d75f85f86da31dc1c055d2f12f57b9baed9..e3400a1a649575d99b66a71f60e3f955f5ee49f5 100644
--- a/shell/platform/android/android_external_texture_gl.h
+++ b/shell/platform/android/surface_texture_external_texture.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_EXTERNAL_TEXTURE_GL_H_
-#define FLUTTER_SHELL_PLATFORM_ANDROID_EXTERNAL_TEXTURE_GL_H_
+#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_SURFACE_TEXTURE_EXTERNAL_TEXTURE_H_
+#define FLUTTER_SHELL_PLATFORM_ANDROID_SURFACE_TEXTURE_EXTERNAL_TEXTURE_H_
 
 #include <GLES/gl.h>
 
@@ -12,19 +12,20 @@
 
 namespace flutter {
 
-class AndroidExternalTextureGL : public flutter::Texture {
+// External texture peered to an android.graphics.SurfaceTexture.
+class SurfaceTextureExternalTexture : public flutter::Texture {
  public:
-  AndroidExternalTextureGL(
+  SurfaceTextureExternalTexture(
       int64_t id,
       const fml::jni::ScopedJavaGlobalRef<jobject>& surface_texture,
-      std::shared_ptr<PlatformViewAndroidJNI> jni_facade);
+      const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade);
 
-  ~AndroidExternalTextureGL() override;
+  ~SurfaceTextureExternalTexture() override;
 
   void Paint(PaintContext& context,
              const SkRect& bounds,
              bool freeze,
-             const SkSamplingOptions& sampling) override;
+             const DlImageSampling sampling) override;
 
   void OnGrContextCreated() override;
 
@@ -34,32 +35,25 @@ class AndroidExternalTextureGL : public flutter::Texture {
 
   void OnTextureUnregistered() override;
 
- private:
-  void Attach(jint textureName);
+ protected:
+  virtual void ProcessFrame(PaintContext& context, const SkRect& bounds) = 0;
+  virtual void Detach();
 
+  void Attach(int gl_tex_id);
+  bool ShouldUpdate();
   void Update();
 
-  void Detach();
-
-  void UpdateTransform();
-
-  enum class AttachmentState { uninitialized, attached, detached };
+  enum class AttachmentState { kUninitialized, kAttached, kDetached };
 
   std::shared_ptr<PlatformViewAndroidJNI> jni_facade_;
-
   fml::jni::ScopedJavaGlobalRef<jobject> surface_texture_;
+  AttachmentState state_ = AttachmentState::kUninitialized;
+  SkMatrix transform_;
+  sk_sp<flutter::DlImage> dl_image_;
 
-  AttachmentState state_ = AttachmentState::uninitialized;
-
-  bool new_frame_ready_ = false;
-
-  GLuint texture_name_ = 0;
-
-  SkMatrix transform;
-
-  FML_DISALLOW_COPY_AND_ASSIGN(AndroidExternalTextureGL);
+  FML_DISALLOW_COPY_AND_ASSIGN(SurfaceTextureExternalTexture);
 };
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_EXTERNAL_TEXTURE_GL_H_
+#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_SURFACE_TEXTURE_EXTERNAL_TEXTURE_H_
diff --git a/shell/platform/android/surface_texture_external_texture_gl.cc b/shell/platform/android/surface_texture_external_texture_gl.cc
new file mode 100644
index 0000000000000000000000000000000000000000..b1cadee7f30814e140433043b5d519f36f441492
--- /dev/null
+++ b/shell/platform/android/surface_texture_external_texture_gl.cc
@@ -0,0 +1,115 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/platform/android/surface_texture_external_texture_gl.h"
+
+#include <utility>
+
+#include "flutter/display_list/effects/dl_color_source.h"
+#include "impeller/display_list/dl_image_impeller.h"
+#include "shell/platform/android/surface_texture_external_texture.h"
+#include "third_party/skia/include/core/SkAlphaType.h"
+#include "third_party/skia/include/core/SkColorSpace.h"
+#include "third_party/skia/include/core/SkColorType.h"
+#include "third_party/skia/include/core/SkImage.h"
+#include "third_party/skia/include/gpu/GrBackendSurface.h"
+#include "third_party/skia/include/gpu/GrDirectContext.h"
+#include "third_party/skia/include/gpu/ganesh/SkImageGanesh.h"
+#include "third_party/skia/include/gpu/ganesh/gl/GrGLBackendSurface.h"
+#include "third_party/skia/include/gpu/gl/GrGLTypes.h"
+
+namespace flutter {
+
+SurfaceTextureExternalTextureGL::SurfaceTextureExternalTextureGL(
+    int64_t id,
+    const fml::jni::ScopedJavaGlobalRef<jobject>& surface_texture,
+    const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade)
+    : SurfaceTextureExternalTexture(id, surface_texture, jni_facade) {}
+
+SurfaceTextureExternalTextureGL::~SurfaceTextureExternalTextureGL() {
+  if (texture_name_ != 0) {
+    glDeleteTextures(1, &texture_name_);
+  }
+}
+
+void SurfaceTextureExternalTextureGL::ProcessFrame(PaintContext& context,
+                                                   const SkRect& bounds) {
+  if (state_ == AttachmentState::kUninitialized) {
+    // Generate the texture handle.
+    glGenTextures(1, &texture_name_);
+    Attach(texture_name_);
+  }
+  FML_CHECK(state_ == AttachmentState::kAttached);
+
+  // Updates the texture contents and transformation matrix.
+  Update();
+
+  // Create a
+  GrGLTextureInfo textureInfo = {GL_TEXTURE_EXTERNAL_OES, texture_name_,
+                                 GL_RGBA8_OES};
+  auto backendTexture =
+      GrBackendTextures::MakeGL(1, 1, skgpu::Mipmapped::kNo, textureInfo);
+  dl_image_ = DlImage::Make(SkImages::BorrowTextureFrom(
+      context.gr_context, backendTexture, kTopLeft_GrSurfaceOrigin,
+      kRGBA_8888_SkColorType, kPremul_SkAlphaType, nullptr));
+}
+
+void SurfaceTextureExternalTextureGL::Detach() {
+  SurfaceTextureExternalTexture::Detach();
+  if (texture_name_ != 0) {
+    glDeleteTextures(1, &texture_name_);
+    texture_name_ = 0;
+  }
+}
+
+SurfaceTextureExternalTextureImpellerGL::
+    SurfaceTextureExternalTextureImpellerGL(
+        const std::shared_ptr<impeller::ContextGLES>& context,
+        int64_t id,
+        const fml::jni::ScopedJavaGlobalRef<jobject>& surface_texture,
+        const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade)
+    : SurfaceTextureExternalTexture(id, surface_texture, jni_facade),
+      impeller_context_(context) {}
+
+SurfaceTextureExternalTextureImpellerGL::
+    ~SurfaceTextureExternalTextureImpellerGL() {}
+
+void SurfaceTextureExternalTextureImpellerGL::ProcessFrame(
+    PaintContext& context,
+    const SkRect& bounds) {
+  if (state_ == AttachmentState::kUninitialized) {
+    // Generate the texture handle.
+    impeller::TextureDescriptor desc;
+    desc.type = impeller::TextureType::kTextureExternalOES;
+    desc.storage_mode = impeller::StorageMode::kDevicePrivate;
+    desc.format = impeller::PixelFormat::kR8G8B8A8UNormInt;
+    desc.size = {static_cast<int>(bounds.width()),
+                 static_cast<int>(bounds.height())};
+    desc.mip_count = 1;
+    texture_ = std::make_shared<impeller::TextureGLES>(
+        impeller_context_->GetReactor(), desc,
+        impeller::TextureGLES::IsWrapped::kWrapped);
+    texture_->SetCoordinateSystem(
+        impeller::TextureCoordinateSystem::kUploadFromHost);
+    auto maybe_handle = texture_->GetGLHandle();
+    if (!maybe_handle.has_value()) {
+      FML_LOG(ERROR) << "Could not get GL handle from impeller::TextureGLES!";
+      return;
+    }
+    Attach(maybe_handle.value());
+  }
+  FML_CHECK(state_ == AttachmentState::kAttached);
+
+  // Updates the texture contents and transformation matrix.
+  Update();
+
+  dl_image_ = impeller::DlImageImpeller::Make(texture_);
+}
+
+void SurfaceTextureExternalTextureImpellerGL::Detach() {
+  SurfaceTextureExternalTexture::Detach();
+  texture_.reset();
+}
+
+}  // namespace flutter
diff --git a/shell/platform/android/surface_texture_external_texture_gl.h b/shell/platform/android/surface_texture_external_texture_gl.h
new file mode 100644
index 0000000000000000000000000000000000000000..bbe50655a12f828a22dc58effd7da56ba374bd28
--- /dev/null
+++ b/shell/platform/android/surface_texture_external_texture_gl.h
@@ -0,0 +1,64 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_SURFACE_TEXTURE_EXTERNAL_TEXTURE_GL_H_
+#define FLUTTER_SHELL_PLATFORM_ANDROID_SURFACE_TEXTURE_EXTERNAL_TEXTURE_GL_H_
+
+#include "flutter/shell/platform/android/surface_texture_external_texture.h"
+
+#include "flutter/impeller/renderer/backend/gles/context_gles.h"
+#include "flutter/impeller/renderer/backend/gles/gles.h"
+#include "flutter/impeller/renderer/backend/gles/texture_gles.h"
+#include "flutter/impeller/toolkit/egl/egl.h"
+#include "flutter/impeller/toolkit/egl/image.h"
+#include "flutter/impeller/toolkit/gles/texture.h"
+
+#include "flutter/impeller/renderer/backend/gles/context_gles.h"
+
+namespace flutter {
+
+class SurfaceTextureExternalTextureGL : public SurfaceTextureExternalTexture {
+ public:
+  SurfaceTextureExternalTextureGL(
+      int64_t id,
+      const fml::jni::ScopedJavaGlobalRef<jobject>& surface_texture,
+      const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade);
+
+  ~SurfaceTextureExternalTextureGL() override;
+
+ private:
+  virtual void ProcessFrame(PaintContext& context,
+                            const SkRect& bounds) override;
+  virtual void Detach() override;
+
+  GLuint texture_name_ = 0;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(SurfaceTextureExternalTextureGL);
+};
+
+class SurfaceTextureExternalTextureImpellerGL
+    : public SurfaceTextureExternalTexture {
+ public:
+  SurfaceTextureExternalTextureImpellerGL(
+      const std::shared_ptr<impeller::ContextGLES>& context,
+      int64_t id,
+      const fml::jni::ScopedJavaGlobalRef<jobject>& surface_texture,
+      const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade);
+
+  ~SurfaceTextureExternalTextureImpellerGL() override;
+
+ private:
+  virtual void ProcessFrame(PaintContext& context,
+                            const SkRect& bounds) override;
+  virtual void Detach() override;
+
+  const std::shared_ptr<impeller::ContextGLES> impeller_context_;
+  std::shared_ptr<impeller::TextureGLES> texture_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(SurfaceTextureExternalTextureImpellerGL);
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_SURFACE_TEXTURE_EXTERNAL_TEXTURE_GL_H_
diff --git a/shell/platform/android/test/README.md b/shell/platform/android/test/README.md
index 794c9300a9fe4c2c31ece33ce86a41db1d9132e1..2200d47a0a3078a2e388baceed9984d02dacb578 100644
--- a/shell/platform/android/test/README.md
+++ b/shell/platform/android/test/README.md
@@ -1,6 +1,6 @@
 # Unit testing Java code
 
-All Java code in the engine should now be able to be tested with Robolectric 4.7.3
+All Java code in the engine should now be able to be tested with Robolectric 4.11.1
 and JUnit 4. The test suite has been added after the bulk of the Java code was
 first written, so most of these classes do not have existing tests. Ideally code
 after this point should be tested, either with unit tests here or with
diff --git a/shell/platform/android/test/io/flutter/FlutterInjectorTest.java b/shell/platform/android/test/io/flutter/FlutterInjectorTest.java
index 78c5431a0346e5025fa32b6dc29bcef0dbbefe74..1a72a0a56bb76efa9855fa463618fb11777f3806 100644
--- a/shell/platform/android/test/io/flutter/FlutterInjectorTest.java
+++ b/shell/platform/android/test/io/flutter/FlutterInjectorTest.java
@@ -8,6 +8,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import io.flutter.embedding.engine.deferredcomponents.PlayStoreDeferredComponentManager;
@@ -73,8 +74,9 @@ public class FlutterInjectorTest {
     threadNames = injector.executorService().invokeAll(callables);
 
     assertEquals(threadNames.size(), 2);
-    assertEquals(threadNames.get(0).get(), "flutter-worker-0");
-    assertEquals(threadNames.get(1).get(), "flutter-worker-1");
+    for (Future<String> name : threadNames) {
+      assertTrue(name.get().startsWith("flutter-worker-"));
+    }
   }
 
   @Test
diff --git a/shell/platform/android/test/io/flutter/embedding/android/AndroidTouchProcessorTest.java b/shell/platform/android/test/io/flutter/embedding/android/AndroidTouchProcessorTest.java
index dd3b896c37512972520741b73acdf16567cbcdcb..696b6daf85e529fa48f1c2bd8331752cdee42a3e 100644
--- a/shell/platform/android/test/io/flutter/embedding/android/AndroidTouchProcessorTest.java
+++ b/shell/platform/android/test/io/flutter/embedding/android/AndroidTouchProcessorTest.java
@@ -1,5 +1,6 @@
 package io.flutter.embedding.android;
 
+import static io.flutter.Build.API_LEVELS;
 import static junit.framework.TestCase.assertEquals;
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.mock;
@@ -8,11 +9,15 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.annotation.TargetApi;
+import android.content.Context;
 import android.view.InputDevice;
 import android.view.MotionEvent;
+import android.view.ViewConfiguration;
+import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import io.flutter.embedding.engine.renderer.FlutterRenderer;
 import java.nio.ByteBuffer;
+import java.util.concurrent.TimeUnit;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -25,12 +30,18 @@ import org.robolectric.annotation.Config;
 
 @Config(manifest = Config.NONE)
 @RunWith(AndroidJUnit4.class)
-@TargetApi(28)
+@TargetApi(API_LEVELS.API_28)
 public class AndroidTouchProcessorTest {
   @Mock FlutterRenderer mockRenderer;
   AndroidTouchProcessor touchProcessor;
   @Captor ArgumentCaptor<ByteBuffer> packetCaptor;
   @Captor ArgumentCaptor<Integer> packetSizeCaptor;
+  // Used for mock events in SystemClock.uptimeMillis() time base.
+  // 2 days in milliseconds
+  final long eventTimeMilliseconds = 172800000;
+  final float pressure = 0.8f;
+  // https://github.com/flutter/flutter/blob/master/packages/flutter/lib/src/gestures/events.dart
+  final int enginePrimaryStylusButton = 0x02;
 
   @Before
   public void setUp() {
@@ -38,6 +49,10 @@ public class AndroidTouchProcessorTest {
     touchProcessor = new AndroidTouchProcessor(mockRenderer, false);
   }
 
+  private long readTimeStamp(ByteBuffer buffer) {
+    return buffer.getLong(1 * AndroidTouchProcessor.BYTES_PER_FIELD);
+  }
+
   private long readPointerChange(ByteBuffer buffer) {
     return buffer.getLong(2 * AndroidTouchProcessor.BYTES_PER_FIELD);
   }
@@ -50,6 +65,10 @@ public class AndroidTouchProcessorTest {
     return buffer.getLong(4 * AndroidTouchProcessor.BYTES_PER_FIELD);
   }
 
+  private long readDevice(ByteBuffer buffer) {
+    return buffer.getLong(5 * AndroidTouchProcessor.BYTES_PER_FIELD);
+  }
+
   private double readPointerPhysicalX(ByteBuffer buffer) {
     return buffer.getDouble(7 * AndroidTouchProcessor.BYTES_PER_FIELD);
   }
@@ -58,6 +77,70 @@ public class AndroidTouchProcessorTest {
     return buffer.getDouble(8 * AndroidTouchProcessor.BYTES_PER_FIELD);
   }
 
+  private long readButtons(ByteBuffer buffer) {
+    return buffer.getLong(11 * AndroidTouchProcessor.BYTES_PER_FIELD);
+  }
+
+  private double readObscured(ByteBuffer buffer) {
+    return buffer.getDouble(12 * AndroidTouchProcessor.BYTES_PER_FIELD);
+  }
+
+  private double readSynthesized(ByteBuffer buffer) {
+    return buffer.getDouble(13 * AndroidTouchProcessor.BYTES_PER_FIELD);
+  }
+
+  private double readPressure(ByteBuffer buffer) {
+    return buffer.getDouble(14 * AndroidTouchProcessor.BYTES_PER_FIELD);
+  }
+
+  private double readPressureMin(ByteBuffer buffer) {
+    return buffer.getDouble(15 * AndroidTouchProcessor.BYTES_PER_FIELD);
+  }
+
+  private double readPressureMax(ByteBuffer buffer) {
+    return buffer.getDouble(16 * AndroidTouchProcessor.BYTES_PER_FIELD);
+  }
+
+  private double readDistance(ByteBuffer buffer) {
+    return buffer.getDouble(17 * AndroidTouchProcessor.BYTES_PER_FIELD);
+  }
+
+  private double readDistanceMax(ByteBuffer buffer) {
+    return buffer.getDouble(18 * AndroidTouchProcessor.BYTES_PER_FIELD);
+  }
+
+  private double readSize(ByteBuffer buffer) {
+    return buffer.getDouble(19 * AndroidTouchProcessor.BYTES_PER_FIELD);
+  }
+
+  private double readRadiusMajor(ByteBuffer buffer) {
+    return buffer.getDouble(20 * AndroidTouchProcessor.BYTES_PER_FIELD);
+  }
+
+  private double readRadiusMinor(ByteBuffer buffer) {
+    return buffer.getDouble(21 * AndroidTouchProcessor.BYTES_PER_FIELD);
+  }
+
+  private double readRadiusMin(ByteBuffer buffer) {
+    return buffer.getDouble(22 * AndroidTouchProcessor.BYTES_PER_FIELD);
+  }
+
+  private double readRadiusMax(ByteBuffer buffer) {
+    return buffer.getDouble(23 * AndroidTouchProcessor.BYTES_PER_FIELD);
+  }
+
+  private double readStylusTilt(ByteBuffer buffer) {
+    return buffer.getDouble(25 * AndroidTouchProcessor.BYTES_PER_FIELD);
+  }
+
+  private double readScrollDeltaX(ByteBuffer buffer) {
+    return buffer.getDouble(27 * AndroidTouchProcessor.BYTES_PER_FIELD);
+  }
+
+  private double readScrollDeltaY(ByteBuffer buffer) {
+    return buffer.getDouble(28 * AndroidTouchProcessor.BYTES_PER_FIELD);
+  }
+
   private double readPointerPanX(ByteBuffer buffer) {
     return buffer.getDouble(29 * AndroidTouchProcessor.BYTES_PER_FIELD);
   }
@@ -66,6 +149,22 @@ public class AndroidTouchProcessorTest {
     return buffer.getDouble(30 * AndroidTouchProcessor.BYTES_PER_FIELD);
   }
 
+  private double readPointerPanDeltaX(ByteBuffer buffer) {
+    return buffer.getDouble(31 * AndroidTouchProcessor.BYTES_PER_FIELD);
+  }
+
+  private double readPointerPanDeltaY(ByteBuffer buffer) {
+    return buffer.getDouble(32 * AndroidTouchProcessor.BYTES_PER_FIELD);
+  }
+
+  private double readScale(ByteBuffer buffer) {
+    return buffer.getDouble(33 * AndroidTouchProcessor.BYTES_PER_FIELD);
+  }
+
+  private double readRotation(ByteBuffer buffer) {
+    return buffer.getDouble(34 * AndroidTouchProcessor.BYTES_PER_FIELD);
+  }
+
   private class MotionEventMocker {
     int pointerId;
     int source;
@@ -78,17 +177,43 @@ public class AndroidTouchProcessorTest {
     }
 
     MotionEvent mockEvent(int action, float x, float y, int buttonState) {
+      return mockEvent(action, x, y, buttonState, x, y, x, y, x, x, y);
+    }
+
+    MotionEvent mockEvent(
+        int action,
+        float x,
+        float y,
+        int buttonState,
+        float hScroll,
+        float vScroll,
+        float axisDistance,
+        float axisTilt,
+        float size,
+        float toolMajor,
+        float toolMinor) {
       MotionEvent event = mock(MotionEvent.class);
       when(event.getDevice()).thenReturn(null);
       when(event.getSource()).thenReturn(source);
+      when(event.getEventTime()).thenReturn(eventTimeMilliseconds);
       when(event.getPointerCount()).thenReturn(1);
       when(event.getActionMasked()).thenReturn(action);
-      when(event.getActionIndex()).thenReturn(0);
+      final int actionIndex = 0;
+      when(event.getActionIndex()).thenReturn(actionIndex);
       when(event.getButtonState()).thenReturn(buttonState);
-      when(event.getPointerId(0)).thenReturn(pointerId);
-      when(event.getX(0)).thenReturn(x);
-      when(event.getY(0)).thenReturn(y);
-      when(event.getToolType(0)).thenReturn(toolType);
+      when(event.getPointerId(actionIndex)).thenReturn(pointerId);
+      when(event.getX(actionIndex)).thenReturn(x);
+      when(event.getY(actionIndex)).thenReturn(y);
+      when(event.getToolType(actionIndex)).thenReturn(toolType);
+      when(event.isFromSource(InputDevice.SOURCE_CLASS_POINTER)).thenReturn(true);
+      when(event.getAxisValue(MotionEvent.AXIS_HSCROLL, pointerId)).thenReturn(hScroll);
+      when(event.getAxisValue(MotionEvent.AXIS_VSCROLL, pointerId)).thenReturn(vScroll);
+      when(event.getAxisValue(MotionEvent.AXIS_DISTANCE, pointerId)).thenReturn(axisDistance);
+      when(event.getAxisValue(MotionEvent.AXIS_TILT, pointerId)).thenReturn(axisTilt);
+      when(event.getPressure(actionIndex)).thenReturn(pressure);
+      when(event.getSize(actionIndex)).thenReturn(size);
+      when(event.getToolMajor(actionIndex)).thenReturn(toolMajor);
+      when(event.getToolMinor(actionIndex)).thenReturn(toolMinor);
       return event;
     }
   }
@@ -158,6 +283,12 @@ public class AndroidTouchProcessorTest {
     assertEquals(0.0, readPointerPhysicalY(packet));
     assertEquals(10.0, readPointerPanX(packet));
     assertEquals(5.0, readPointerPanY(packet));
+    // Always zero.
+    assertEquals(0.0, readPointerPanDeltaX(packet));
+    assertEquals(0.0, readPointerPanDeltaY(packet));
+    assertEquals(0.0, readRotation(packet));
+    // Always 1.
+    assertEquals(1.0, readScale(packet));
     touchProcessor.onTouchEvent(mocker.mockEvent(MotionEvent.ACTION_UP, 10.0f, 5.0f, 0));
     inOrder
         .verify(mockRenderer)
@@ -218,4 +349,368 @@ public class AndroidTouchProcessorTest {
     touchProcessor.onTouchEvent(mocker.mockEvent(MotionEvent.ACTION_BUTTON_PRESS, 0.0f, 0.0f, 0));
     verify(mockRenderer, never()).dispatchPointerDataPacket(ByteBuffer.allocate(0), 0);
   }
+
+  @Test
+  @Config(minSdk = API_LEVELS.API_26)
+  public void scrollWheelAbove26() {
+    // Pointer id must be zero to match actionIndex in mocked event.
+    final int pointerId = 0;
+    MotionEventMocker mocker =
+        new MotionEventMocker(
+            pointerId, InputDevice.SOURCE_CLASS_POINTER, MotionEvent.TOOL_TYPE_MOUSE);
+    final float horizontalScrollValue = -1f;
+    final float verticalScrollValue = .5f;
+    final Context context = ApplicationProvider.getApplicationContext();
+    final double horizontalScaleFactor =
+        ViewConfiguration.get(context).getScaledHorizontalScrollFactor();
+    final double verticalScaleFactor =
+        ViewConfiguration.get(context).getScaledVerticalScrollFactor();
+    // Zero verticalScaleFactor will cause this test to miss bugs.
+    assertEquals("zero horizontal scale factor", true, horizontalScaleFactor != 0);
+    assertEquals("zero vertical scale factor", true, verticalScaleFactor != 0);
+
+    final MotionEvent event =
+        mocker.mockEvent(
+            MotionEvent.ACTION_SCROLL,
+            0.0f,
+            0.0f,
+            1,
+            horizontalScrollValue,
+            verticalScrollValue,
+            0.0f,
+            0.0f,
+            0.0f,
+            0.0f,
+            0.0f);
+    boolean handled = touchProcessor.onGenericMotionEvent(event, context);
+
+    InOrder inOrder = inOrder(mockRenderer);
+    inOrder
+        .verify(mockRenderer)
+        .dispatchPointerDataPacket(packetCaptor.capture(), packetSizeCaptor.capture());
+    ByteBuffer packet = packetCaptor.getValue();
+
+    assertEquals(-horizontalScrollValue * horizontalScaleFactor, readScrollDeltaX(packet));
+    assertEquals(-verticalScrollValue * verticalScaleFactor, readScrollDeltaY(packet));
+    verify(event).getAxisValue(MotionEvent.AXIS_HSCROLL, pointerId);
+    verify(event).getAxisValue(MotionEvent.AXIS_VSCROLL, pointerId);
+
+    inOrder.verifyNoMoreInteractions();
+  }
+
+  @Test
+  @Config(sdk = API_LEVELS.API_25)
+  public void scrollWheelBelow26() {
+    // Pointer id must be zero to match actionIndex in mocked event.
+    final int pointerId = 0;
+    MotionEventMocker mocker =
+        new MotionEventMocker(
+            pointerId, InputDevice.SOURCE_CLASS_POINTER, MotionEvent.TOOL_TYPE_MOUSE);
+    final float horizontalScrollValue = -1f;
+    final float verticalScrollValue = .5f;
+    final Context context = ApplicationProvider.getApplicationContext();
+
+    final MotionEvent event =
+        mocker.mockEvent(
+            MotionEvent.ACTION_SCROLL,
+            0.0f,
+            0.0f,
+            1,
+            horizontalScrollValue,
+            verticalScrollValue,
+            0.0f,
+            0.0f,
+            0.0f,
+            0.0f,
+            0.0f);
+    boolean handled = touchProcessor.onGenericMotionEvent(event, context);
+    assertEquals(true, handled);
+
+    InOrder inOrder = inOrder(mockRenderer);
+    inOrder
+        .verify(mockRenderer)
+        .dispatchPointerDataPacket(packetCaptor.capture(), packetSizeCaptor.capture());
+    ByteBuffer packet = packetCaptor.getValue();
+
+    // Magic number from roboletric's theme.
+    final double magicScrollFactor = 64;
+    assertEquals(-horizontalScrollValue * magicScrollFactor, readScrollDeltaX(packet));
+    assertEquals(-verticalScrollValue * magicScrollFactor, readScrollDeltaY(packet));
+    verify(event).getAxisValue(MotionEvent.AXIS_HSCROLL, pointerId);
+    verify(event).getAxisValue(MotionEvent.AXIS_VSCROLL, pointerId);
+
+    // Trigger default values.
+    touchProcessor.onGenericMotionEvent(event, null);
+    inOrder
+        .verify(mockRenderer)
+        .dispatchPointerDataPacket(packetCaptor.capture(), packetSizeCaptor.capture());
+    packet = packetCaptor.getValue();
+
+    assertEquals(
+        (double) -horizontalScrollValue * AndroidTouchProcessor.DEFAULT_HORIZONTAL_SCROLL_FACTOR,
+        readScrollDeltaX(packet));
+    assertEquals(
+        (double) -verticalScrollValue * AndroidTouchProcessor.DEFAULT_VERTICAL_SCROLL_FACTOR,
+        readScrollDeltaY(packet));
+
+    inOrder.verifyNoMoreInteractions();
+  }
+
+  @Test
+  public void timeStamp() {
+    final int pointerId = 0;
+    MotionEventMocker mocker =
+        new MotionEventMocker(
+            pointerId, InputDevice.SOURCE_CLASS_POINTER, MotionEvent.TOOL_TYPE_MOUSE);
+
+    final MotionEvent event = mocker.mockEvent(MotionEvent.ACTION_SCROLL, 1f, 1f, 1);
+    boolean handled = touchProcessor.onTouchEvent(event);
+
+    InOrder inOrder = inOrder(mockRenderer);
+    inOrder
+        .verify(mockRenderer)
+        .dispatchPointerDataPacket(packetCaptor.capture(), packetSizeCaptor.capture());
+    ByteBuffer packet = packetCaptor.getValue();
+
+    assertEquals(TimeUnit.MILLISECONDS.toMicros(eventTimeMilliseconds), readTimeStamp(packet));
+
+    inOrder.verifyNoMoreInteractions();
+  }
+
+  @Test
+  public void device() {
+    final int pointerId = 2;
+    MotionEventMocker mocker =
+        new MotionEventMocker(
+            pointerId, InputDevice.SOURCE_CLASS_POINTER, MotionEvent.TOOL_TYPE_MOUSE);
+
+    final MotionEvent event = mocker.mockEvent(MotionEvent.ACTION_SCROLL, 1f, 1f, 1);
+    boolean handled = touchProcessor.onTouchEvent(event);
+
+    InOrder inOrder = inOrder(mockRenderer);
+    inOrder
+        .verify(mockRenderer)
+        .dispatchPointerDataPacket(packetCaptor.capture(), packetSizeCaptor.capture());
+    ByteBuffer packet = packetCaptor.getValue();
+
+    assertEquals(pointerId, readDevice(packet));
+    verify(event).getPointerId(0);
+
+    inOrder.verifyNoMoreInteractions();
+  }
+
+  @Test
+  public void physicalXPhysicalY() {
+    MotionEventMocker mocker =
+        new MotionEventMocker(1, InputDevice.SOURCE_CLASS_POINTER, MotionEvent.TOOL_TYPE_MOUSE);
+    final float x = 10.0f;
+    final float y = 20.0f;
+    final MotionEvent event = mocker.mockEvent(MotionEvent.ACTION_DOWN, x, y, 0);
+    boolean handled = touchProcessor.onTouchEvent(event);
+
+    InOrder inOrder = inOrder(mockRenderer);
+    inOrder
+        .verify(mockRenderer)
+        .dispatchPointerDataPacket(packetCaptor.capture(), packetSizeCaptor.capture());
+    ByteBuffer packet = packetCaptor.getValue();
+
+    assertEquals((double) x, readPointerPhysicalX(packet));
+    assertEquals((double) y, readPointerPhysicalY(packet));
+
+    inOrder.verifyNoMoreInteractions();
+  }
+
+  @Test
+  public void obscured() {
+    MotionEventMocker mocker =
+        new MotionEventMocker(1, InputDevice.SOURCE_CLASS_POINTER, MotionEvent.TOOL_TYPE_MOUSE);
+    final MotionEvent event = mocker.mockEvent(MotionEvent.ACTION_DOWN, 10.0f, 20.0f, 0);
+    boolean handled = touchProcessor.onTouchEvent(event);
+
+    InOrder inOrder = inOrder(mockRenderer);
+    inOrder
+        .verify(mockRenderer)
+        .dispatchPointerDataPacket(packetCaptor.capture(), packetSizeCaptor.capture());
+    ByteBuffer packet = packetCaptor.getValue();
+
+    // Always zero.
+    assertEquals(0.0, readObscured(packet));
+
+    inOrder.verifyNoMoreInteractions();
+  }
+
+  @Test
+  public void synthesized() {
+    MotionEventMocker mocker =
+        new MotionEventMocker(1, InputDevice.SOURCE_CLASS_POINTER, MotionEvent.TOOL_TYPE_MOUSE);
+    final MotionEvent event = mocker.mockEvent(MotionEvent.ACTION_DOWN, 10.0f, 20.0f, 0);
+    boolean handled = touchProcessor.onTouchEvent(event);
+
+    InOrder inOrder = inOrder(mockRenderer);
+    inOrder
+        .verify(mockRenderer)
+        .dispatchPointerDataPacket(packetCaptor.capture(), packetSizeCaptor.capture());
+    ByteBuffer packet = packetCaptor.getValue();
+
+    // Always zero.
+    assertEquals(0.0, readSynthesized(packet));
+
+    inOrder.verifyNoMoreInteractions();
+  }
+
+  @Test
+  public void pressure() {
+    MotionEventMocker mocker =
+        new MotionEventMocker(1, InputDevice.SOURCE_CLASS_POINTER, MotionEvent.TOOL_TYPE_MOUSE);
+    final MotionEvent event = mocker.mockEvent(MotionEvent.ACTION_DOWN, 10.0f, 20.0f, 0);
+    boolean handled = touchProcessor.onTouchEvent(event);
+
+    InOrder inOrder = inOrder(mockRenderer);
+    inOrder
+        .verify(mockRenderer)
+        .dispatchPointerDataPacket(packetCaptor.capture(), packetSizeCaptor.capture());
+    ByteBuffer packet = packetCaptor.getValue();
+
+    // Always zero.
+    assertEquals((double) pressure, readPressure(packet));
+    // Verify default range with null device.
+    assertEquals(0.0, readPressureMin(packet));
+    assertEquals(1.0, readPressureMax(packet));
+
+    inOrder.verifyNoMoreInteractions();
+  }
+
+  @Test
+  public void stylusDistance() {
+    MotionEventMocker mocker =
+        new MotionEventMocker(0, InputDevice.SOURCE_STYLUS, MotionEvent.TOOL_TYPE_STYLUS);
+    final float distance = 10.0f;
+    final float tilt = 20.0f;
+    final MotionEvent event =
+        mocker.mockEvent(
+            MotionEvent.ACTION_DOWN,
+            0.0f,
+            0.0f,
+            MotionEvent.BUTTON_STYLUS_PRIMARY,
+            0.0f,
+            0.0f,
+            distance,
+            tilt,
+            0.0f,
+            0.0f,
+            0.0f);
+    boolean handled = touchProcessor.onTouchEvent(event);
+
+    InOrder inOrder = inOrder(mockRenderer);
+    inOrder
+        .verify(mockRenderer)
+        .dispatchPointerDataPacket(packetCaptor.capture(), packetSizeCaptor.capture());
+    ByteBuffer packet = packetCaptor.getValue();
+    assertEquals(AndroidTouchProcessor.PointerDeviceKind.STYLUS, readPointerDeviceKind(packet));
+    assertEquals((double) distance, readDistance(packet));
+    // Always zero.
+    assertEquals(0.0, readDistanceMax(packet));
+    assertEquals((double) tilt, readStylusTilt(packet));
+    assertEquals(enginePrimaryStylusButton, readButtons(packet));
+
+    inOrder.verifyNoMoreInteractions();
+  }
+
+  @Test
+  public void sizeAndRadius() {
+    MotionEventMocker mocker =
+        new MotionEventMocker(0, InputDevice.SOURCE_STYLUS, MotionEvent.TOOL_TYPE_STYLUS);
+    final float size = 10.0f;
+    final float radiusMajor = 20.0f;
+    final float radiusMinor = 30.0f;
+    final MotionEvent event =
+        mocker.mockEvent(
+            MotionEvent.ACTION_DOWN,
+            0.0f,
+            0.0f,
+            0,
+            0.0f,
+            0.0f,
+            0.0f,
+            0.0f,
+            size,
+            radiusMajor,
+            radiusMinor);
+    boolean handled = touchProcessor.onTouchEvent(event);
+
+    InOrder inOrder = inOrder(mockRenderer);
+    inOrder
+        .verify(mockRenderer)
+        .dispatchPointerDataPacket(packetCaptor.capture(), packetSizeCaptor.capture());
+    ByteBuffer packet = packetCaptor.getValue();
+
+    verify(event).getSize(0);
+    verify(event).getToolMajor(0);
+    verify(event).getToolMinor(0);
+
+    assertEquals((double) size, readSize(packet));
+    assertEquals((double) radiusMajor, readRadiusMajor(packet));
+    assertEquals((double) radiusMinor, readRadiusMinor(packet));
+    // Always zero.
+    assertEquals(0.0, readRadiusMin(packet));
+    assertEquals(0.0, readRadiusMax(packet));
+
+    inOrder.verifyNoMoreInteractions();
+  }
+
+  @Test
+  public void unexpectedPointerChange() {
+    // Regression test for https://github.com/flutter/flutter/issues/129765
+    MotionEventMocker mocker =
+        new MotionEventMocker(0, InputDevice.SOURCE_MOUSE, MotionEvent.TOOL_TYPE_MOUSE);
+
+    touchProcessor.onTouchEvent(mocker.mockEvent(MotionEvent.ACTION_DOWN, 0.0f, 0.0f, 0));
+    InOrder inOrder = inOrder(mockRenderer);
+    inOrder
+        .verify(mockRenderer)
+        .dispatchPointerDataPacket(packetCaptor.capture(), packetSizeCaptor.capture());
+    ByteBuffer packet = packetCaptor.getValue();
+    assertEquals(AndroidTouchProcessor.PointerChange.PAN_ZOOM_START, readPointerChange(packet));
+    assertEquals(AndroidTouchProcessor.PointerDeviceKind.TRACKPAD, readPointerDeviceKind(packet));
+    assertEquals(AndroidTouchProcessor.PointerSignalKind.NONE, readPointerSignalKind(packet));
+    assertEquals(0.0, readPointerPhysicalX(packet));
+    assertEquals(0.0, readPointerPhysicalY(packet));
+
+    touchProcessor.onTouchEvent(mocker.mockEvent(MotionEvent.ACTION_MOVE, 10.0f, 5.0f, 0));
+    inOrder
+        .verify(mockRenderer)
+        .dispatchPointerDataPacket(packetCaptor.capture(), packetSizeCaptor.capture());
+    packet = packetCaptor.getValue();
+    assertEquals(AndroidTouchProcessor.PointerChange.PAN_ZOOM_UPDATE, readPointerChange(packet));
+    assertEquals(AndroidTouchProcessor.PointerDeviceKind.TRACKPAD, readPointerDeviceKind(packet));
+    assertEquals(AndroidTouchProcessor.PointerSignalKind.NONE, readPointerSignalKind(packet));
+    assertEquals(0.0, readPointerPhysicalX(packet));
+    assertEquals(0.0, readPointerPhysicalY(packet));
+    assertEquals(10.0, readPointerPanX(packet));
+    assertEquals(5.0, readPointerPanY(packet));
+
+    touchProcessor.onGenericMotionEvent(
+        mocker.mockEvent(MotionEvent.ACTION_SCROLL, 0.0f, 0.0f, 0),
+        ApplicationProvider.getApplicationContext());
+    inOrder
+        .verify(mockRenderer)
+        .dispatchPointerDataPacket(packetCaptor.capture(), packetSizeCaptor.capture());
+    packet = packetCaptor.getValue();
+    packet.rewind();
+    while (packet.hasRemaining()) {
+      assertEquals(0, packet.get());
+    }
+
+    touchProcessor.onTouchEvent(mocker.mockEvent(MotionEvent.ACTION_UP, 10.0f, 5.0f, 0));
+    inOrder
+        .verify(mockRenderer)
+        .dispatchPointerDataPacket(packetCaptor.capture(), packetSizeCaptor.capture());
+    packet = packetCaptor.getValue();
+    assertEquals(AndroidTouchProcessor.PointerChange.PAN_ZOOM_END, readPointerChange(packet));
+    assertEquals(AndroidTouchProcessor.PointerDeviceKind.TRACKPAD, readPointerDeviceKind(packet));
+    assertEquals(AndroidTouchProcessor.PointerSignalKind.NONE, readPointerSignalKind(packet));
+    assertEquals(0.0, readPointerPhysicalX(packet));
+    assertEquals(0.0, readPointerPhysicalY(packet));
+    inOrder.verifyNoMoreInteractions();
+  }
 }
diff --git a/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityAndFragmentDelegateTest.java b/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityAndFragmentDelegateTest.java
index 9310b3ae654b6ebb2a4ea59f7f595275c4d5353f..7262eaf0c37a343440f1a8e68a8161d0d6c6f717 100644
--- a/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityAndFragmentDelegateTest.java
+++ b/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityAndFragmentDelegateTest.java
@@ -2,9 +2,11 @@ package io.flutter.embedding.android;
 
 import static android.content.ComponentCallbacks2.*;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.isNotNull;
@@ -18,10 +20,9 @@ import static org.mockito.Mockito.when;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
 import android.view.View;
+import android.window.BackEvent;
 import androidx.annotation.NonNull;
 import androidx.lifecycle.Lifecycle;
 import androidx.test.core.app.ApplicationProvider;
@@ -30,6 +31,8 @@ import io.flutter.FlutterInjector;
 import io.flutter.embedding.android.FlutterActivityAndFragmentDelegate.Host;
 import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.embedding.engine.FlutterEngineCache;
+import io.flutter.embedding.engine.FlutterEngineGroup;
+import io.flutter.embedding.engine.FlutterEngineGroupCache;
 import io.flutter.embedding.engine.FlutterShellArgs;
 import io.flutter.embedding.engine.dart.DartExecutor;
 import io.flutter.embedding.engine.loader.FlutterLoader;
@@ -37,6 +40,7 @@ import io.flutter.embedding.engine.plugins.activity.ActivityControlSurface;
 import io.flutter.embedding.engine.renderer.FlutterRenderer;
 import io.flutter.embedding.engine.renderer.FlutterUiDisplayListener;
 import io.flutter.embedding.engine.systemchannels.AccessibilityChannel;
+import io.flutter.embedding.engine.systemchannels.BackGestureChannel;
 import io.flutter.embedding.engine.systemchannels.LifecycleChannel;
 import io.flutter.embedding.engine.systemchannels.LocalizationChannel;
 import io.flutter.embedding.engine.systemchannels.MouseCursorChannel;
@@ -63,7 +67,11 @@ public class FlutterActivityAndFragmentDelegateTest {
   private final Context ctx = ApplicationProvider.getApplicationContext();
   private FlutterEngine mockFlutterEngine;
   private FlutterActivityAndFragmentDelegate.Host mockHost;
+  private FlutterActivityAndFragmentDelegate.Host mockHost2;
 
+  @SuppressWarnings("deprecation")
+  // Robolectric.setupActivity
+  // TODO(reidbaker): https://github.com/flutter/flutter/issues/133151
   @Before
   public void setup() {
     FlutterInjector.reset();
@@ -88,6 +96,25 @@ public class FlutterActivityAndFragmentDelegateTest {
     when(mockHost.shouldHandleDeeplinking()).thenReturn(false);
     when(mockHost.shouldDestroyEngineWithHost()).thenReturn(true);
     when(mockHost.shouldDispatchAppLifecycleState()).thenReturn(true);
+    when(mockHost.attachToEngineAutomatically()).thenReturn(true);
+
+    mockHost2 = mock(FlutterActivityAndFragmentDelegate.Host.class);
+    when(mockHost2.getContext()).thenReturn(ctx);
+    when(mockHost2.getActivity()).thenReturn(Robolectric.setupActivity(Activity.class));
+    when(mockHost2.getLifecycle()).thenReturn(mock(Lifecycle.class));
+    when(mockHost2.getFlutterShellArgs()).thenReturn(new FlutterShellArgs(new String[] {}));
+    when(mockHost2.getDartEntrypointFunctionName()).thenReturn("main");
+    when(mockHost2.getDartEntrypointArgs()).thenReturn(null);
+    when(mockHost2.getAppBundlePath()).thenReturn("/fake/path");
+    when(mockHost2.getInitialRoute()).thenReturn("/");
+    when(mockHost2.getRenderMode()).thenReturn(RenderMode.surface);
+    when(mockHost2.getTransparencyMode()).thenReturn(TransparencyMode.transparent);
+    when(mockHost2.provideFlutterEngine(any(Context.class))).thenReturn(mockFlutterEngine);
+    when(mockHost2.shouldAttachEngineToActivity()).thenReturn(true);
+    when(mockHost2.shouldHandleDeeplinking()).thenReturn(false);
+    when(mockHost2.shouldDestroyEngineWithHost()).thenReturn(true);
+    when(mockHost2.shouldDispatchAppLifecycleState()).thenReturn(true);
+    when(mockHost2.attachToEngineAutomatically()).thenReturn(true);
   }
 
   @Test
@@ -105,13 +132,36 @@ public class FlutterActivityAndFragmentDelegateTest {
     // By the time an Activity/Fragment is started, we don't expect any lifecycle messages
     // to have been sent to Flutter.
     delegate.onStart();
+    verify(mockFlutterEngine.getLifecycleChannel(), never()).aWindowIsFocused();
+    verify(mockFlutterEngine.getLifecycleChannel(), never()).noWindowsAreFocused();
     verify(mockFlutterEngine.getLifecycleChannel(), never()).appIsResumed();
-    verify(mockFlutterEngine.getLifecycleChannel(), never()).appIsPaused();
     verify(mockFlutterEngine.getLifecycleChannel(), never()).appIsInactive();
+    verify(mockFlutterEngine.getLifecycleChannel(), never()).appIsPaused();
     verify(mockFlutterEngine.getLifecycleChannel(), never()).appIsDetached();
 
     // When the Activity/Fragment is resumed, a resumed message should have been sent to Flutter.
     delegate.onResume();
+    verify(mockFlutterEngine.getLifecycleChannel(), never()).aWindowIsFocused();
+    verify(mockFlutterEngine.getLifecycleChannel(), never()).noWindowsAreFocused();
+    verify(mockFlutterEngine.getLifecycleChannel(), times(1)).appIsResumed();
+    verify(mockFlutterEngine.getLifecycleChannel(), never()).appIsInactive();
+    verify(mockFlutterEngine.getLifecycleChannel(), never()).appIsPaused();
+    verify(mockFlutterEngine.getLifecycleChannel(), never()).appIsDetached();
+
+    // When the app loses focus because something else has it (e.g. notification
+    // windowshade or app switcher), it should go to inactive.
+    delegate.onWindowFocusChanged(false);
+    verify(mockFlutterEngine.getLifecycleChannel(), never()).aWindowIsFocused();
+    verify(mockFlutterEngine.getLifecycleChannel(), times(1)).noWindowsAreFocused();
+    verify(mockFlutterEngine.getLifecycleChannel(), times(1)).appIsResumed();
+    verify(mockFlutterEngine.getLifecycleChannel(), never()).appIsInactive();
+    verify(mockFlutterEngine.getLifecycleChannel(), never()).appIsPaused();
+    verify(mockFlutterEngine.getLifecycleChannel(), never()).appIsDetached();
+
+    // When the app regains focus, it should go to resumed again.
+    delegate.onWindowFocusChanged(true);
+    verify(mockFlutterEngine.getLifecycleChannel(), times(1)).aWindowIsFocused();
+    verify(mockFlutterEngine.getLifecycleChannel(), times(1)).noWindowsAreFocused();
     verify(mockFlutterEngine.getLifecycleChannel(), times(1)).appIsResumed();
     verify(mockFlutterEngine.getLifecycleChannel(), never()).appIsInactive();
     verify(mockFlutterEngine.getLifecycleChannel(), never()).appIsPaused();
@@ -119,6 +169,8 @@ public class FlutterActivityAndFragmentDelegateTest {
 
     // When the Activity/Fragment is paused, an inactive message should have been sent to Flutter.
     delegate.onPause();
+    verify(mockFlutterEngine.getLifecycleChannel(), times(1)).aWindowIsFocused();
+    verify(mockFlutterEngine.getLifecycleChannel(), times(1)).noWindowsAreFocused();
     verify(mockFlutterEngine.getLifecycleChannel(), times(1)).appIsResumed();
     verify(mockFlutterEngine.getLifecycleChannel(), times(1)).appIsInactive();
     verify(mockFlutterEngine.getLifecycleChannel(), never()).appIsPaused();
@@ -128,6 +180,8 @@ public class FlutterActivityAndFragmentDelegateTest {
     // Notice that Flutter uses the term "paused" in a different way, and at a different time
     // than the Android OS.
     delegate.onStop();
+    verify(mockFlutterEngine.getLifecycleChannel(), times(1)).aWindowIsFocused();
+    verify(mockFlutterEngine.getLifecycleChannel(), times(1)).noWindowsAreFocused();
     verify(mockFlutterEngine.getLifecycleChannel(), times(1)).appIsResumed();
     verify(mockFlutterEngine.getLifecycleChannel(), times(1)).appIsInactive();
     verify(mockFlutterEngine.getLifecycleChannel(), times(1)).appIsPaused();
@@ -135,6 +189,8 @@ public class FlutterActivityAndFragmentDelegateTest {
 
     // When activity detaches, a detached message should have been sent to Flutter.
     delegate.onDetach();
+    verify(mockFlutterEngine.getLifecycleChannel(), times(1)).aWindowIsFocused();
+    verify(mockFlutterEngine.getLifecycleChannel(), times(1)).noWindowsAreFocused();
     verify(mockFlutterEngine.getLifecycleChannel(), times(1)).appIsResumed();
     verify(mockFlutterEngine.getLifecycleChannel(), times(1)).appIsInactive();
     verify(mockFlutterEngine.getLifecycleChannel(), times(1)).appIsPaused();
@@ -155,10 +211,14 @@ public class FlutterActivityAndFragmentDelegateTest {
     delegate.onCreateView(null, null, null, 0, true);
     delegate.onStart();
     delegate.onResume();
+    delegate.onWindowFocusChanged(false);
+    delegate.onWindowFocusChanged(true);
     delegate.onPause();
     delegate.onStop();
     delegate.onDetach();
 
+    verify(mockFlutterEngine.getLifecycleChannel(), never()).aWindowIsFocused();
+    verify(mockFlutterEngine.getLifecycleChannel(), never()).noWindowsAreFocused();
     verify(mockFlutterEngine.getLifecycleChannel(), never()).appIsResumed();
     verify(mockFlutterEngine.getLifecycleChannel(), never()).appIsPaused();
     verify(mockFlutterEngine.getLifecycleChannel(), never()).appIsInactive();
@@ -235,6 +295,109 @@ public class FlutterActivityAndFragmentDelegateTest {
     // Expect IllegalStateException.
   }
 
+  // Bug: b/271100292
+  @Test
+  public void flutterEngineGroupGetsInitialRouteFromIntent() {
+    // ---- Test setup ----
+    FlutterLoader mockFlutterLoader = mock(FlutterLoader.class);
+    Activity mockActivity = mock(Activity.class);
+    Intent mockIntent = mock(Intent.class);
+    when(mockFlutterLoader.findAppBundlePath()).thenReturn("default_flutter_assets/path");
+    FlutterInjector.setInstance(
+        new FlutterInjector.Builder().setFlutterLoader(mockFlutterLoader).build());
+    FlutterEngineGroup flutterEngineGroup = mock(FlutterEngineGroup.class);
+    FlutterEngineGroupCache.getInstance().put("my_flutter_engine_group", flutterEngineGroup);
+
+    List<String> entryPointArgs = new ArrayList<>();
+    entryPointArgs.add("entrypoint-arg");
+
+    // Adjust fake host to request cached engine group.
+    when(mockHost.getInitialRoute()).thenReturn(null);
+    when(mockHost.getCachedEngineGroupId()).thenReturn("my_flutter_engine_group");
+    when(mockHost.provideFlutterEngine(any(Context.class))).thenReturn(null);
+    when(mockHost.shouldAttachEngineToActivity()).thenReturn(false);
+    when(mockHost.getDartEntrypointArgs()).thenReturn(entryPointArgs);
+    when(mockHost.shouldHandleDeeplinking()).thenReturn(true);
+    when(mockHost.getActivity()).thenReturn(mockActivity);
+    when(mockActivity.getIntent()).thenReturn(mockIntent);
+    when(mockIntent.getData()).thenReturn(Uri.parse("foo://example.com/initial_route"));
+
+    // Create the real object that we're testing.
+    FlutterActivityAndFragmentDelegate delegate = new FlutterActivityAndFragmentDelegate(mockHost);
+
+    // --- Execute the behavior under test ---
+    // The FlutterEngine is obtained in onAttach().
+    delegate.onAttach(ctx);
+
+    DartExecutor.DartEntrypoint entrypoint = new DartExecutor.DartEntrypoint("/fake/path", "main");
+    ArgumentCaptor<FlutterEngineGroup.Options> optionsCaptor =
+        ArgumentCaptor.forClass(FlutterEngineGroup.Options.class);
+    verify(flutterEngineGroup, times(1)).createAndRunEngine(optionsCaptor.capture());
+    assertEquals("foo://example.com/initial_route", optionsCaptor.getValue().getInitialRoute());
+  }
+
+  @Test
+  public void itUsesNewEngineInGroupWhenProvided() {
+    // ---- Test setup ----
+    FlutterLoader mockFlutterLoader = mock(FlutterLoader.class);
+    when(mockFlutterLoader.findAppBundlePath()).thenReturn("default_flutter_assets/path");
+    FlutterInjector.setInstance(
+        new FlutterInjector.Builder().setFlutterLoader(mockFlutterLoader).build());
+    FlutterEngineGroup flutterEngineGroup = mock(FlutterEngineGroup.class);
+    FlutterEngineGroupCache.getInstance().put("my_flutter_engine_group", flutterEngineGroup);
+
+    List<String> entryPointArgs = new ArrayList<>();
+    entryPointArgs.add("entrypoint-arg");
+
+    // Adjust fake host to request cached engine group.
+    when(mockHost.getCachedEngineGroupId()).thenReturn("my_flutter_engine_group");
+    when(mockHost.provideFlutterEngine(any(Context.class))).thenReturn(null);
+    when(mockHost.shouldAttachEngineToActivity()).thenReturn(false);
+    when(mockHost.getDartEntrypointArgs()).thenReturn(entryPointArgs);
+
+    // Create the real object that we're testing.
+    FlutterActivityAndFragmentDelegate delegate = new FlutterActivityAndFragmentDelegate(mockHost);
+
+    // --- Execute the behavior under test ---
+    // The FlutterEngine is obtained in onAttach().
+    delegate.onAttach(ctx);
+
+    // If the engine in FlutterEngineGroup is being used, it should have sent a resumed lifecycle
+    // event.
+    // Note: "/fake/path" and "main" come from `setUp()`.
+    DartExecutor.DartEntrypoint entrypoint = new DartExecutor.DartEntrypoint("/fake/path", "main");
+    ArgumentCaptor<FlutterEngineGroup.Options> optionsCaptor =
+        ArgumentCaptor.forClass(FlutterEngineGroup.Options.class);
+    verify(flutterEngineGroup, times(1)).createAndRunEngine(optionsCaptor.capture());
+    assertEquals(mockHost.getContext(), optionsCaptor.getValue().getContext());
+    assertEquals(entrypoint, optionsCaptor.getValue().getDartEntrypoint());
+    assertEquals(mockHost.getInitialRoute(), optionsCaptor.getValue().getInitialRoute());
+    assertNotNull(optionsCaptor.getValue().getDartEntrypointArgs());
+    assertEquals(1, optionsCaptor.getValue().getDartEntrypointArgs().size());
+    assertEquals("entrypoint-arg", optionsCaptor.getValue().getDartEntrypointArgs().get(0));
+  }
+
+  @Test(expected = IllegalStateException.class)
+  public void itThrowsExceptionIfNewEngineInGroupNotExist() {
+    // ---- Test setup ----
+    FlutterEngineGroupCache.getInstance().clear();
+
+    // Adjust fake host to request cached engine group that does not exist.
+    when(mockHost.getCachedEngineGroupId()).thenReturn("my_flutter_engine_group");
+    when(mockHost.getCachedEngineId()).thenReturn(null);
+    when(mockHost.provideFlutterEngine(any(Context.class))).thenReturn(null);
+    when(mockHost.shouldAttachEngineToActivity()).thenReturn(false);
+
+    // Create the real object that we're testing.
+    FlutterActivityAndFragmentDelegate delegate = new FlutterActivityAndFragmentDelegate(mockHost);
+
+    // --- Execute the behavior under test ---
+    // The FlutterEngine existence is verified in onAttach()
+    delegate.onAttach(ctx);
+
+    // Expect IllegalStateException.
+  }
+
   @Test
   public void itGivesHostAnOpportunityToConfigureFlutterEngine() {
     // ---- Test setup ----
@@ -263,6 +426,9 @@ public class FlutterActivityAndFragmentDelegateTest {
     verify(mockHost, times(1)).onFlutterSurfaceViewCreated(isNotNull());
   }
 
+  @SuppressWarnings("deprecation")
+  // Robolectric.setupActivity
+  // TODO(reidbaker): https://github.com/flutter/flutter/issues/133151
   @Test
   public void itGivesHostAnOpportunityToConfigureFlutterTextureView() {
     // ---- Test setup ----
@@ -507,6 +673,73 @@ public class FlutterActivityAndFragmentDelegateTest {
     verify(mockFlutterEngine.getNavigationChannel(), times(1)).popRoute();
   }
 
+  @Test
+  public void itForwardsStartBackGestureToFlutter() {
+    // Create the real object that we're testing.
+    FlutterActivityAndFragmentDelegate delegate = new FlutterActivityAndFragmentDelegate(mockHost);
+
+    // --- Execute the behavior under test ---
+    // The FlutterEngine is set up in onAttach().
+    delegate.onAttach(ctx);
+
+    // Emulate the host and inform our delegate of the start back gesture with a mocked BackEvent
+    BackEvent backEvent = mock(BackEvent.class);
+    delegate.startBackGesture(backEvent);
+
+    // Verify that the back gesture tried to send a message to Flutter.
+    verify(mockFlutterEngine.getBackGestureChannel(), times(1)).startBackGesture(backEvent);
+  }
+
+  @Test
+  public void itForwardsUpdateBackGestureProgressToFlutter() {
+    // Create the real object that we're testing.
+    FlutterActivityAndFragmentDelegate delegate = new FlutterActivityAndFragmentDelegate(mockHost);
+
+    // --- Execute the behavior under test ---
+    // The FlutterEngine is set up in onAttach().
+    delegate.onAttach(ctx);
+
+    // Emulate the host and inform our delegate of the back gesture progress with a mocked BackEvent
+    BackEvent backEvent = mock(BackEvent.class);
+    delegate.updateBackGestureProgress(backEvent);
+
+    // Verify that the back gesture tried to send a message to Flutter.
+    verify(mockFlutterEngine.getBackGestureChannel(), times(1))
+        .updateBackGestureProgress(backEvent);
+  }
+
+  @Test
+  public void itForwardsCommitBackGestureToFlutter() {
+    // Create the real object that we're testing.
+    FlutterActivityAndFragmentDelegate delegate = new FlutterActivityAndFragmentDelegate(mockHost);
+
+    // --- Execute the behavior under test ---
+    // The FlutterEngine is set up in onAttach().
+    delegate.onAttach(ctx);
+
+    // Emulate the host and inform our delegate when the back gesture is committed
+    delegate.commitBackGesture();
+
+    // Verify that the back gesture tried to send a message to Flutter.
+    verify(mockFlutterEngine.getBackGestureChannel(), times(1)).commitBackGesture();
+  }
+
+  @Test
+  public void itForwardsCancelBackGestureToFlutter() {
+    // Create the real object that we're testing.
+    FlutterActivityAndFragmentDelegate delegate = new FlutterActivityAndFragmentDelegate(mockHost);
+
+    // --- Execute the behavior under test ---
+    // The FlutterEngine is set up in onAttach().
+    delegate.onAttach(ctx);
+
+    // Emulate the host and inform our delegate of the back gesture cancellation
+    delegate.cancelBackGesture();
+
+    // Verify that the back gesture tried to send a message to Flutter.
+    verify(mockFlutterEngine.getBackGestureChannel(), times(1)).cancelBackGesture();
+  }
+
   @Test
   public void itForwardsOnRequestPermissionsResultToFlutterEngine() {
     // Create the real object that we're testing.
@@ -549,7 +782,7 @@ public class FlutterActivityAndFragmentDelegateTest {
 
     // Verify that the navigation channel was given the initial route message.
     verify(mockFlutterEngine.getNavigationChannel(), times(1))
-        .setInitialRoute("/custom/route?query=test");
+        .setInitialRoute("http://myApp/custom/route?query=test");
   }
 
   @Test
@@ -577,7 +810,7 @@ public class FlutterActivityAndFragmentDelegateTest {
 
     // Verify that the navigation channel was given the initial route message.
     verify(mockFlutterEngine.getNavigationChannel(), times(1))
-        .setInitialRoute("/custom/route?query=test#fragment");
+        .setInitialRoute("http://myApp/custom/route?query=test#fragment");
   }
 
   @Test
@@ -605,7 +838,7 @@ public class FlutterActivityAndFragmentDelegateTest {
 
     // Verify that the navigation channel was given the initial route message.
     verify(mockFlutterEngine.getNavigationChannel(), times(1))
-        .setInitialRoute("/custom/route#fragment");
+        .setInitialRoute("http://myApp/custom/route#fragment");
   }
 
   @Test
@@ -632,7 +865,8 @@ public class FlutterActivityAndFragmentDelegateTest {
     delegate.onStart();
 
     // Verify that the navigation channel was given the initial route message.
-    verify(mockFlutterEngine.getNavigationChannel(), times(1)).setInitialRoute("/custom/route");
+    verify(mockFlutterEngine.getNavigationChannel(), times(1))
+        .setInitialRoute("http://myApp/custom/route");
   }
 
   @Test
@@ -662,7 +896,7 @@ public class FlutterActivityAndFragmentDelegateTest {
   }
 
   @Test
-  public void itSendsPushRouteMessageWhenOnNewIntent() {
+  public void itSendsPushRouteInformationMessageWhenOnNewIntent() {
     when(mockHost.shouldHandleDeeplinking()).thenReturn(true);
     // Create the real object that we're testing.
     FlutterActivityAndFragmentDelegate delegate = new FlutterActivityAndFragmentDelegate(mockHost);
@@ -670,19 +904,19 @@ public class FlutterActivityAndFragmentDelegateTest {
     // --- Execute the behavior under test ---
     // The FlutterEngine is set up in onAttach().
     delegate.onAttach(ctx);
+    String expected = "http://myApp/custom/route?query=test";
 
     Intent mockIntent = mock(Intent.class);
-    when(mockIntent.getData()).thenReturn(Uri.parse("http://myApp/custom/route?query=test"));
+    when(mockIntent.getData()).thenReturn(Uri.parse(expected));
     // Emulate the host and call the method that we expect to be forwarded.
     delegate.onNewIntent(mockIntent);
 
     // Verify that the navigation channel was given the push route message.
-    verify(mockFlutterEngine.getNavigationChannel(), times(1))
-        .pushRoute("/custom/route?query=test");
+    verify(mockFlutterEngine.getNavigationChannel(), times(1)).pushRouteInformation(expected);
   }
 
   @Test
-  public void itDoesNotSendPushRouteMessageWhenOnNewIntentIsNonHierarchicalUri() {
+  public void itDoesSendPushRouteInformationMessageWhenOnNewIntentIsNonHierarchicalUri() {
     when(mockHost.shouldHandleDeeplinking()).thenReturn(true);
     // Create the real object that we're testing.
     FlutterActivityAndFragmentDelegate delegate = new FlutterActivityAndFragmentDelegate(mockHost);
@@ -700,11 +934,12 @@ public class FlutterActivityAndFragmentDelegateTest {
     delegate.onNewIntent(mockIntent);
 
     // Verify that the navigation channel was not given a push route message.
-    verify(mockFlutterEngine.getNavigationChannel(), times(0)).pushRoute("mailto:test@test.com");
+    verify(mockFlutterEngine.getNavigationChannel(), times(1))
+        .pushRouteInformation("mailto:test@test.com");
   }
 
   @Test
-  public void itSendsPushRouteMessageWhenOnNewIntentWithQueryParameterAndFragment() {
+  public void itSendsPushRouteInformationMessageWhenOnNewIntentWithQueryParameterAndFragment() {
     when(mockHost.shouldHandleDeeplinking()).thenReturn(true);
     // Create the real object that we're testing.
     FlutterActivityAndFragmentDelegate delegate = new FlutterActivityAndFragmentDelegate(mockHost);
@@ -712,20 +947,19 @@ public class FlutterActivityAndFragmentDelegateTest {
     // --- Execute the behavior under test ---
     // The FlutterEngine is set up in onAttach().
     delegate.onAttach(ctx);
+    String expected = "http://myApp/custom/route?query=test#fragment";
 
     Intent mockIntent = mock(Intent.class);
-    when(mockIntent.getData())
-        .thenReturn(Uri.parse("http://myApp/custom/route?query=test#fragment"));
+    when(mockIntent.getData()).thenReturn(Uri.parse(expected));
     // Emulate the host and call the method that we expect to be forwarded.
     delegate.onNewIntent(mockIntent);
 
     // Verify that the navigation channel was given the push route message.
-    verify(mockFlutterEngine.getNavigationChannel(), times(1))
-        .pushRoute("/custom/route?query=test#fragment");
+    verify(mockFlutterEngine.getNavigationChannel(), times(1)).pushRouteInformation(expected);
   }
 
   @Test
-  public void itSendsPushRouteMessageWhenOnNewIntentWithFragmentNoQueryParameter() {
+  public void itSendsPushRouteInformationMessageWhenOnNewIntentWithFragmentNoQueryParameter() {
     when(mockHost.shouldHandleDeeplinking()).thenReturn(true);
     // Create the real object that we're testing.
     FlutterActivityAndFragmentDelegate delegate = new FlutterActivityAndFragmentDelegate(mockHost);
@@ -733,18 +967,19 @@ public class FlutterActivityAndFragmentDelegateTest {
     // --- Execute the behavior under test ---
     // The FlutterEngine is set up in onAttach().
     delegate.onAttach(ctx);
+    String expected = "http://myApp/custom/route#fragment";
 
     Intent mockIntent = mock(Intent.class);
-    when(mockIntent.getData()).thenReturn(Uri.parse("http://myApp/custom/route#fragment"));
+    when(mockIntent.getData()).thenReturn(Uri.parse(expected));
     // Emulate the host and call the method that we expect to be forwarded.
     delegate.onNewIntent(mockIntent);
 
     // Verify that the navigation channel was given the push route message.
-    verify(mockFlutterEngine.getNavigationChannel(), times(1)).pushRoute("/custom/route#fragment");
+    verify(mockFlutterEngine.getNavigationChannel(), times(1)).pushRouteInformation(expected);
   }
 
   @Test
-  public void itSendsPushRouteMessageWhenOnNewIntentNoQueryParameter() {
+  public void itSendsPushRouteInformationMessageWhenOnNewIntentNoQueryParameter() {
     when(mockHost.shouldHandleDeeplinking()).thenReturn(true);
     // Create the real object that we're testing.
     FlutterActivityAndFragmentDelegate delegate = new FlutterActivityAndFragmentDelegate(mockHost);
@@ -752,14 +987,15 @@ public class FlutterActivityAndFragmentDelegateTest {
     // --- Execute the behavior under test ---
     // The FlutterEngine is set up in onAttach().
     delegate.onAttach(ctx);
+    String expected = "http://myApp/custom/route#fragment";
 
     Intent mockIntent = mock(Intent.class);
-    when(mockIntent.getData()).thenReturn(Uri.parse("http://myApp/custom/route"));
+    when(mockIntent.getData()).thenReturn(Uri.parse(expected));
     // Emulate the host and call the method that we expect to be forwarded.
     delegate.onNewIntent(mockIntent);
 
     // Verify that the navigation channel was given the push route message.
-    verify(mockFlutterEngine.getNavigationChannel(), times(1)).pushRoute("/custom/route");
+    verify(mockFlutterEngine.getNavigationChannel(), times(1)).pushRouteInformation(expected);
   }
 
   @Test
@@ -1087,23 +1323,110 @@ public class FlutterActivityAndFragmentDelegateTest {
   }
 
   @Test
-  public void itDoesNotDelayTheFirstDrawWhenRequestedAndWithAProvidedSplashScreen() {
-    when(mockHost.provideSplashScreen())
-        .thenReturn(new DrawableSplashScreen(new ColorDrawable(Color.GRAY)));
+  public void usesFlutterEngineGroup() {
+    FlutterEngineGroup mockEngineGroup = mock(FlutterEngineGroup.class);
+    when(mockEngineGroup.createAndRunEngine(any(FlutterEngineGroup.Options.class)))
+        .thenReturn(mockFlutterEngine);
+    FlutterActivityAndFragmentDelegate.Host host =
+        mock(FlutterActivityAndFragmentDelegate.Host.class);
+    when(mockHost.getContext()).thenReturn(ctx);
 
+    FlutterActivityAndFragmentDelegate delegate =
+        new FlutterActivityAndFragmentDelegate(mockHost, mockEngineGroup);
+    delegate.onAttach(ctx);
+    FlutterEngine engineUnderTest = delegate.getFlutterEngine();
+    assertEquals(engineUnderTest, mockFlutterEngine);
+  }
+
+  @Test
+  public void itDoesAttachFlutterViewToEngine() {
     // ---- Test setup ----
     // Create the real object that we're testing.
     FlutterActivityAndFragmentDelegate delegate = new FlutterActivityAndFragmentDelegate(mockHost);
+    delegate.onAttach(ctx);
+    delegate.onCreateView(null, null, null, 0, true);
 
-    // We're testing lifecycle behaviors, which require/expect that certain methods have already
-    // been executed by the time they run. Therefore, we run those expected methods first.
+    // --- Execute the behavior under test ---
+    assertTrue(delegate.flutterView.isAttachedToFlutterEngine());
+  }
+
+  @Test
+  public void itDoesNotAttachFlutterViewToEngine() {
+    // ---- Test setup ----
+    // Create the real object that we're testing.
+    when(mockHost.attachToEngineAutomatically()).thenReturn(false);
+    FlutterActivityAndFragmentDelegate delegate = new FlutterActivityAndFragmentDelegate(mockHost);
     delegate.onAttach(ctx);
+    delegate.onCreateView(null, null, null, 0, true);
 
     // --- Execute the behavior under test ---
-    boolean shouldDelayFirstAndroidViewDraw = true;
-    delegate.onCreateView(null, null, null, 0, shouldDelayFirstAndroidViewDraw);
+    assertFalse(delegate.flutterView.isAttachedToFlutterEngine());
+  }
 
-    assertNull(delegate.activePreDrawListener);
+  @Test
+  public void itDoesNotDetachTwice() {
+    FlutterEngine cachedEngine = mockFlutterEngine();
+    FlutterEngineCache.getInstance().put("my_flutter_engine", cachedEngine);
+
+    // Engine is a cached singleton that isn't owned by either hosts.
+    when(mockHost.shouldDestroyEngineWithHost()).thenReturn(false);
+    when(mockHost2.shouldDestroyEngineWithHost()).thenReturn(false);
+
+    // Adjust fake hosts to request cached engine.
+    when(mockHost.getCachedEngineId()).thenReturn("my_flutter_engine");
+    when(mockHost2.getCachedEngineId()).thenReturn("my_flutter_engine");
+
+    // Create the real objects that we're testing.
+    FlutterActivityAndFragmentDelegate delegate = new FlutterActivityAndFragmentDelegate(mockHost);
+    FlutterActivityAndFragmentDelegate delegate2 =
+        new FlutterActivityAndFragmentDelegate(mockHost2);
+
+    // This test is written to recreate the following scenario:
+    // 1. We have a FlutterFragment_A attached to a singleton cached engine.
+    // 2. An intent arrives that spawns FlutterFragment_B.
+    // 3. FlutterFragment_B starts and steals the engine from FlutterFragment_A while attaching.
+    //    Via a call to FlutterActivityAndFragmentDelegate.detachFromFlutterEngine().
+    // 4. FlutterFragment_A is forcibly detached from the engine.
+    // 5. FlutterFragment_B is attached to the engine.
+    // 6. FlutterFragment_A is detached from the engine.
+    // Note that the second detach for FlutterFragment_A is done unconditionally when the Fragment
+    // is being
+    // torn down.
+
+    // At this point the engine's life cycle channel receives a message (triggered by
+    // FlutterFragment_A's second detach)
+    // that indicates the app is detached. This breaks FlutterFragment_B.
+
+    // Below is a sequence of calls that mimicks the calls that the above scenario would trigger
+    // without
+    // relying on an intent to trigger the behaviour.
+
+    // FlutterFragment_A is attached to the engine.
+    delegate.onAttach(ctx);
+
+    // NOTE: The following two calls happen in a slightly different order in reality. That is, via,
+    // a call to host.detachFromFlutterEngine, delegate2.onAttach ends up invoking
+    // delegate.onDetach.
+    // To keep this regression test simple, we call them directly.
+
+    // Detach FlutterFragment_A.
+    delegate.onDetach();
+
+    verify(cachedEngine.getLifecycleChannel(), times(1)).appIsDetached();
+
+    // Attaches to the engine FlutterFragment_B.
+    delegate2.onAttach(ctx);
+    delegate2.onResume();
+
+    verify(cachedEngine.getLifecycleChannel(), times(1)).appIsResumed();
+    verify(cachedEngine.getLifecycleChannel(), times(1)).appIsDetached();
+
+    // A second Detach of FlutterFragment_A happens when the Fragment is detached.
+    delegate.onDetach();
+
+    // IMPORTANT: The bug we fixed would have resulted in the engine thinking the app
+    // is detached twice instead of once.
+    verify(cachedEngine.getLifecycleChannel(), times(1)).appIsDetached();
   }
 
   /**
@@ -1124,6 +1447,7 @@ public class FlutterActivityAndFragmentDelegateTest {
     when(fakeMessageBuilder.setPlatformBrightness(any(SettingsChannel.PlatformBrightness.class)))
         .thenReturn(fakeMessageBuilder);
     when(fakeMessageBuilder.setTextScaleFactor(any(Float.class))).thenReturn(fakeMessageBuilder);
+    when(fakeMessageBuilder.setDisplayMetrics(any())).thenReturn(fakeMessageBuilder);
     when(fakeMessageBuilder.setNativeSpellCheckServiceDefined(any(Boolean.class)))
         .thenReturn(fakeMessageBuilder);
     when(fakeMessageBuilder.setBrieflyShowPassword(any(Boolean.class)))
@@ -1141,6 +1465,7 @@ public class FlutterActivityAndFragmentDelegateTest {
     when(engine.getLocalizationPlugin()).thenReturn(mock(LocalizationPlugin.class));
     when(engine.getMouseCursorChannel()).thenReturn(mock(MouseCursorChannel.class));
     when(engine.getNavigationChannel()).thenReturn(mock(NavigationChannel.class));
+    when(engine.getBackGestureChannel()).thenReturn(mock(BackGestureChannel.class));
     when(engine.getPlatformViewsController()).thenReturn(mock(PlatformViewsController.class));
 
     FlutterRenderer renderer = mock(FlutterRenderer.class);
diff --git a/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityTest.java b/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityTest.java
index 75d7abfcb4f036524449aa820d1361be46c929d0..f660e32ebabdf08637ba5777b76d736dc6e78f95 100644
--- a/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityTest.java
+++ b/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityTest.java
@@ -1,5 +1,6 @@
 package io.flutter.embedding.android;
 
+import static io.flutter.Build.API_LEVELS;
 import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.HANDLE_DEEPLINKING_META_DATA_KEY;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
@@ -14,18 +15,19 @@ import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.robolectric.Shadows.shadowOf;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
-import android.os.Build;
 import android.os.Bundle;
+import android.window.BackEvent;
+import android.window.OnBackAnimationCallback;
+import android.window.OnBackInvokedCallback;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import androidx.lifecycle.DefaultLifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.test.core.app.ApplicationProvider;
@@ -91,8 +93,8 @@ public class FlutterActivityTest {
   // TODO(garyq): Robolectric does not yet support android api 33 yet. Switch to a robolectric
   // test that directly exercises the OnBackInvoked APIs when API 33 is supported.
   @Test
-  @TargetApi(33)
-  public void itRegistersOnBackInvokedCallbackOnCreate() {
+  @TargetApi(API_LEVELS.API_33)
+  public void itRegistersOnBackInvokedCallbackOnChangingFrameworkHandlesBack() {
     Intent intent = FlutterActivityWithReportFullyDrawn.createDefaultIntent(ctx);
     ActivityController<FlutterActivityWithReportFullyDrawn> activityController =
         Robolectric.buildActivity(FlutterActivityWithReportFullyDrawn.class, intent);
@@ -100,13 +102,19 @@ public class FlutterActivityTest {
 
     activity.onCreate(null);
 
+    verify(activity, times(0)).registerOnBackInvokedCallback();
+
+    activity.setFrameworkHandlesBack(false);
+    verify(activity, times(0)).registerOnBackInvokedCallback();
+
+    activity.setFrameworkHandlesBack(true);
     verify(activity, times(1)).registerOnBackInvokedCallback();
   }
 
   // TODO(garyq): Robolectric does not yet support android api 33 yet. Switch to a robolectric
   // test that directly exercises the OnBackInvoked APIs when API 33 is supported.
   @Test
-  @TargetApi(33)
+  @TargetApi(API_LEVELS.API_33)
   public void itUnregistersOnBackInvokedCallbackOnRelease() {
     Intent intent = FlutterActivityWithReportFullyDrawn.createDefaultIntent(ctx);
     ActivityController<FlutterActivityWithReportFullyDrawn> activityController =
@@ -118,6 +126,71 @@ public class FlutterActivityTest {
     verify(activity, times(1)).unregisterOnBackInvokedCallback();
   }
 
+  @Test
+  @Config(sdk = API_LEVELS.API_32)
+  public void onBackInvokedCallbackIsNullForSdk32OrLower() {
+    Intent intent = FlutterActivity.createDefaultIntent(ctx);
+    ActivityController<FlutterActivity> activityController =
+        Robolectric.buildActivity(FlutterActivity.class, intent);
+    FlutterActivity flutterActivity = activityController.get();
+
+    assertNull(
+        "onBackInvokedCallback should be null for SDK 32 or lower",
+        flutterActivity.getOnBackInvokedCallback());
+  }
+
+  @Test
+  @Config(sdk = API_LEVELS.API_33)
+  @TargetApi(API_LEVELS.API_33)
+  public void onBackInvokedCallbackCallsOnBackPressedForSdk33() {
+    Intent intent = FlutterActivityWithMockBackInvokedHandling.createDefaultIntent(ctx);
+    ActivityController<FlutterActivityWithMockBackInvokedHandling> activityController =
+        Robolectric.buildActivity(FlutterActivityWithMockBackInvokedHandling.class, intent);
+    FlutterActivityWithMockBackInvokedHandling activity = activityController.get();
+
+    OnBackInvokedCallback callback = activity.getOnBackInvokedCallback();
+    assertNotNull("onBackInvokedCallback should not be null for SDK 33", callback);
+
+    callback.onBackInvoked();
+    assertEquals("Expected onBackPressed to be called 1 times", 1, activity.onBackPressedCounter);
+  }
+
+  @Test
+  @Config(sdk = API_LEVELS.API_34)
+  @TargetApi(API_LEVELS.API_34)
+  public void itHandlesOnBackAnimationCallbackAsExpectedForSdk34OrHigher() {
+    Intent intent = FlutterActivityWithMockBackInvokedHandling.createDefaultIntent(ctx);
+    ActivityController<FlutterActivityWithMockBackInvokedHandling> activityController =
+        Robolectric.buildActivity(FlutterActivityWithMockBackInvokedHandling.class, intent);
+    FlutterActivityWithMockBackInvokedHandling activity = activityController.get();
+
+    assertTrue(
+        "onBackInvokedCallback should be an instance of OnBackAnimationCallback for SDK 34 or higher",
+        activity.getOnBackInvokedCallback() instanceof OnBackAnimationCallback);
+
+    OnBackAnimationCallback callback =
+        (OnBackAnimationCallback) activity.getOnBackInvokedCallback();
+
+    BackEvent mockBackEvent = mock(BackEvent.class);
+    callback.onBackStarted(mockBackEvent);
+    assertEquals(
+        "Expected startBackGesture to be called 1 times", 1, activity.startBackGestureCounter);
+
+    callback.onBackProgressed(mockBackEvent);
+    assertEquals(
+        "Expected updateBackGestureProgress to be called 1 times",
+        1,
+        activity.updateBackGestureProgressCounter);
+
+    callback.onBackInvoked();
+    assertEquals(
+        "Expected commitBackGesture to be called 1 times", 1, activity.commitBackGestureCounter);
+
+    callback.onBackCancelled();
+    assertEquals(
+        "Expected cancelBackGesture to be called 1 times", 1, activity.cancelBackGestureCounter);
+  }
+
   @Test
   public void itCreatesDefaultIntentWithExpectedDefaults() {
     Intent intent = FlutterActivity.createDefaultIntent(ctx);
@@ -192,6 +265,31 @@ public class FlutterActivityTest {
     assertEquals(TransparencyMode.transparent, flutterActivity.getTransparencyMode());
   }
 
+  @Test
+  public void itCreatesNewEngineInGroupIntentWithRequestedSettings() {
+    Intent intent =
+        FlutterActivity.withNewEngineInGroup("my_cached_engine_group")
+            .dartEntrypoint("custom_entrypoint")
+            .initialRoute("/custom/route")
+            .backgroundMode(BackgroundMode.transparent)
+            .build(ctx);
+    ActivityController<FlutterActivity> activityController =
+        Robolectric.buildActivity(FlutterActivity.class, intent);
+    FlutterActivity flutterActivity = activityController.get();
+    flutterActivity.setDelegate(new FlutterActivityAndFragmentDelegate(flutterActivity));
+
+    assertEquals("my_cached_engine_group", flutterActivity.getCachedEngineGroupId());
+    assertEquals("custom_entrypoint", flutterActivity.getDartEntrypointFunctionName());
+    assertEquals("/custom/route", flutterActivity.getInitialRoute());
+    assertArrayEquals(new String[] {}, flutterActivity.getFlutterShellArgs().toArray());
+    assertTrue(flutterActivity.shouldAttachEngineToActivity());
+    assertTrue(flutterActivity.shouldDestroyEngineWithHost());
+    assertNull(flutterActivity.getCachedEngineId());
+    assertEquals(BackgroundMode.transparent, flutterActivity.getBackgroundMode());
+    assertEquals(RenderMode.texture, flutterActivity.getRenderMode());
+    assertEquals(TransparencyMode.transparent, flutterActivity.getTransparencyMode());
+  }
+
   @Test
   public void itReturnsValueFromMetaDataWhenCallsShouldHandleDeepLinkingCase1()
       throws PackageManager.NameNotFoundException {
@@ -401,19 +499,6 @@ public class FlutterActivityTest {
     assertEquals(1, registeredEngines.size());
   }
 
-  @Test
-  public void itDoesNotCrashWhenSplashScreenMetadataIsNotDefined() {
-    Intent intent = FlutterActivity.createDefaultIntent(ctx);
-    ActivityController<FlutterActivity> activityController =
-        Robolectric.buildActivity(FlutterActivity.class, intent);
-    FlutterActivity flutterActivity = activityController.get();
-
-    // We never supplied the metadata to the robolectric activity info so it doesn't exist.
-    SplashScreen splashScreen = flutterActivity.provideSplashScreen();
-    // It should quietly return a null and not crash.
-    assertNull(splashScreen);
-  }
-
   @Test
   public void itDoesNotReleaseEnginewhenDetachFromFlutterEngine() {
     FlutterActivityAndFragmentDelegate mockDelegate =
@@ -469,81 +554,7 @@ public class FlutterActivityTest {
   }
 
   @Test
-  @Config(
-      sdk = Build.VERSION_CODES.KITKAT,
-      shadows = {SplashShadowResources.class})
-  public void itLoadsSplashScreenDrawable() throws PackageManager.NameNotFoundException {
-    Intent intent = FlutterActivity.createDefaultIntent(ctx);
-    ActivityController<FlutterActivity> activityController =
-        Robolectric.buildActivity(FlutterActivity.class, intent);
-    FlutterActivity flutterActivity = activityController.get();
-
-    // Inject splash screen drawable resource id in the metadata.
-    PackageManager pm = ctx.getPackageManager();
-    ActivityInfo activityInfo =
-        pm.getActivityInfo(flutterActivity.getComponentName(), PackageManager.GET_META_DATA);
-    activityInfo.metaData = new Bundle();
-    activityInfo.metaData.putInt(
-        FlutterActivityLaunchConfigs.SPLASH_SCREEN_META_DATA_KEY,
-        SplashShadowResources.SPLASH_DRAWABLE_ID);
-    shadowOf(ctx.getPackageManager()).addOrUpdateActivity(activityInfo);
-
-    // It should load the drawable.
-    SplashScreen splashScreen = flutterActivity.provideSplashScreen();
-    assertNotNull(splashScreen);
-  }
-
-  @Test
-  @Config(
-      sdk = Build.VERSION_CODES.LOLLIPOP,
-      shadows = {SplashShadowResources.class})
-  @TargetApi(21) // Theme references in drawables requires API 21+
-  public void itLoadsThemedSplashScreenDrawable() throws PackageManager.NameNotFoundException {
-    // A drawable with theme references can be parsed only if the app theme is supplied
-    // in getDrawable methods. This test verifies it by fetching a (fake) themed drawable.
-    // On failure, a Resource.NotFoundException will ocurr.
-    Intent intent = FlutterActivity.createDefaultIntent(ctx);
-    ActivityController<FlutterActivity> activityController =
-        Robolectric.buildActivity(FlutterActivity.class, intent);
-    FlutterActivity flutterActivity = activityController.get();
-
-    // Inject themed splash screen drawable resource id in the metadata.
-    PackageManager pm = ctx.getPackageManager();
-    ActivityInfo activityInfo =
-        pm.getActivityInfo(flutterActivity.getComponentName(), PackageManager.GET_META_DATA);
-    activityInfo.metaData = new Bundle();
-    activityInfo.metaData.putInt(
-        FlutterActivityLaunchConfigs.SPLASH_SCREEN_META_DATA_KEY,
-        SplashShadowResources.THEMED_SPLASH_DRAWABLE_ID);
-    shadowOf(ctx.getPackageManager()).addOrUpdateActivity(activityInfo);
-
-    // It should load the drawable.
-    SplashScreen splashScreen = flutterActivity.provideSplashScreen();
-    assertNotNull(splashScreen);
-  }
-
-  @Test
-  public void itWithMetadataWithoutSplashScreenResourceKeyDoesNotProvideSplashScreen()
-      throws PackageManager.NameNotFoundException {
-    Intent intent = FlutterActivity.createDefaultIntent(ctx);
-    ActivityController<FlutterActivity> activityController =
-        Robolectric.buildActivity(FlutterActivity.class, intent);
-    FlutterActivity flutterActivity = activityController.get();
-
-    // Setup an empty metadata file.
-    PackageManager pm = ctx.getPackageManager();
-    ActivityInfo activityInfo =
-        pm.getActivityInfo(flutterActivity.getComponentName(), PackageManager.GET_META_DATA);
-    activityInfo.metaData = new Bundle();
-    shadowOf(ctx.getPackageManager()).addOrUpdateActivity(activityInfo);
-
-    // It should not load the drawable.
-    SplashScreen splashScreen = flutterActivity.provideSplashScreen();
-    assertNull(splashScreen);
-  }
-
-  @Test
-  @Config(minSdk = Build.VERSION_CODES.JELLY_BEAN, maxSdk = Build.VERSION_CODES.P)
+  @Config(minSdk = API_LEVELS.API_21, maxSdk = API_LEVELS.API_28)
   public void fullyDrawn_beforeAndroidQ() {
     Intent intent = FlutterActivityWithReportFullyDrawn.createDefaultIntent(ctx);
     ActivityController<FlutterActivityWithReportFullyDrawn> activityController =
@@ -557,7 +568,7 @@ public class FlutterActivityTest {
   }
 
   @Test
-  @Config(minSdk = Build.VERSION_CODES.Q)
+  @Config(minSdk = API_LEVELS.API_29)
   public void fullyDrawn_fromAndroidQ() {
     Intent intent = FlutterActivityWithReportFullyDrawn.createDefaultIntent(ctx);
     ActivityController<FlutterActivityWithReportFullyDrawn> activityController =
@@ -574,7 +585,7 @@ public class FlutterActivityTest {
     @SuppressLint("MissingSuperCall")
     protected void onCreate(@Nullable Bundle savedInstanceState) {
       super.delegate = new FlutterActivityAndFragmentDelegate(this);
-      super.delegate.setupFlutterEngine();
+      super.delegate.setUpFlutterEngine();
     }
 
     @Nullable
@@ -626,12 +637,46 @@ public class FlutterActivityTest {
     }
   }
 
-  private class FlutterActivityWithMockBackInvokedHandling extends FlutterActivity {
+  private static class FlutterActivityWithMockBackInvokedHandling extends FlutterActivity {
+
+    int onBackPressedCounter = 0;
+    int startBackGestureCounter = 0;
+    int updateBackGestureProgressCounter = 0;
+    int commitBackGestureCounter = 0;
+    int cancelBackGestureCounter = 0;
+
     @Override
-    public void registerOnBackInvokedCallback() {}
+    public void onBackPressed() {
+      onBackPressedCounter++;
+    }
+
+    @TargetApi(API_LEVELS.API_34)
+    @RequiresApi(API_LEVELS.API_34)
+    @Override
+    public void startBackGesture(@NonNull BackEvent backEvent) {
+      startBackGestureCounter++;
+    }
 
+    @TargetApi(API_LEVELS.API_34)
+    @RequiresApi(API_LEVELS.API_34)
     @Override
-    public void unregisterOnBackInvokedCallback() {}
+    public void updateBackGestureProgress(@NonNull BackEvent backEvent) {
+      updateBackGestureProgressCounter++;
+    }
+
+    @TargetApi(API_LEVELS.API_34)
+    @RequiresApi(API_LEVELS.API_34)
+    @Override
+    public void commitBackGesture() {
+      commitBackGestureCounter++;
+    }
+
+    @TargetApi(API_LEVELS.API_34)
+    @RequiresApi(API_LEVELS.API_34)
+    @Override
+    public void cancelBackGesture() {
+      cancelBackGestureCounter++;
+    }
   }
 
   private static final class FakeFlutterPlugin
diff --git a/shell/platform/android/test/io/flutter/embedding/android/FlutterAndroidComponentTest.java b/shell/platform/android/test/io/flutter/embedding/android/FlutterAndroidComponentTest.java
index ae4106ea5b608b9a0826e33d2d76b8b5aff6dfb0..9641739adbee8f83bb569497ddf716d20b86eff0 100644
--- a/shell/platform/android/test/io/flutter/embedding/android/FlutterAndroidComponentTest.java
+++ b/shell/platform/android/test/io/flutter/embedding/android/FlutterAndroidComponentTest.java
@@ -265,6 +265,9 @@ public class FlutterAndroidComponentTest {
       return ApplicationProvider.getApplicationContext();
     }
 
+    @SuppressWarnings("deprecation")
+    // Robolectric.setupActivity
+    // TODO(reidbaker): https://github.com/flutter/flutter/issues/133151
     @Nullable
     @Override
     public Activity getActivity() {
@@ -292,6 +295,12 @@ public class FlutterAndroidComponentTest {
       return "my_flutter_engine";
     }
 
+    @Nullable
+    @Override
+    public String getCachedEngineGroupId() {
+      return "my_flutter_engine_group";
+    }
+
     @Override
     public boolean shouldDestroyEngineWithHost() {
       return shouldDestroyEngineWithHost;
@@ -344,12 +353,6 @@ public class FlutterAndroidComponentTest {
       return null;
     }
 
-    @Nullable
-    @Override
-    public SplashScreen provideSplashScreen() {
-      return null;
-    }
-
     @Nullable
     @Override
     public FlutterEngine provideFlutterEngine(@NonNull Context context) {
@@ -389,6 +392,11 @@ public class FlutterAndroidComponentTest {
       return true;
     }
 
+    @Override
+    public boolean attachToEngineAutomatically() {
+      return true;
+    }
+
     @Override
     public void onFlutterSurfaceViewCreated(@NonNull FlutterSurfaceView flutterSurfaceView) {}
 
@@ -411,5 +419,8 @@ public class FlutterAndroidComponentTest {
     public boolean popSystemNavigator() {
       return false;
     }
+
+    @Override
+    public void setFrameworkHandlesBack(boolean frameworkHandlesBack) {}
   }
 }
diff --git a/shell/platform/android/test/io/flutter/embedding/android/FlutterFragmentActivityTest.java b/shell/platform/android/test/io/flutter/embedding/android/FlutterFragmentActivityTest.java
index 1325e068a90b61cf8d5d29dbbf3ead939bbbb510..17960263e996a82180888062168b78c514f9c105 100644
--- a/shell/platform/android/test/io/flutter/embedding/android/FlutterFragmentActivityTest.java
+++ b/shell/platform/android/test/io/flutter/embedding/android/FlutterFragmentActivityTest.java
@@ -4,19 +4,14 @@ import static io.flutter.embedding.android.FlutterActivityLaunchConfigs.HANDLE_D
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
-import static org.robolectric.Shadows.shadowOf;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
-import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
@@ -38,7 +33,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
-import org.robolectric.android.controller.ActivityController;
 import org.robolectric.annotation.Config;
 
 @Config(manifest = Config.NONE)
@@ -256,93 +250,6 @@ public class FlutterFragmentActivityTest {
     assertEquals(0, activity.numberOfEnginesCreated);
   }
 
-  @Test
-  public void itDoesNotCrashWhenSplashScreenMetadataIsNotDefined() {
-    Intent intent = FlutterFragmentActivity.createDefaultIntent(ctx);
-    ActivityController<FlutterFragmentActivity> activityController =
-        Robolectric.buildActivity(FlutterFragmentActivity.class, intent);
-    FlutterFragmentActivity fragmentActivity = activityController.get();
-
-    // We never supplied the resource key to robolectric so it doesn't exist.
-    SplashScreen splashScreen = fragmentActivity.provideSplashScreen();
-    // It should quietly return a null and not crash.
-    assertNull(splashScreen);
-  }
-
-  @Test
-  @Config(
-      sdk = Build.VERSION_CODES.KITKAT,
-      shadows = {SplashShadowResources.class})
-  public void itLoadsSplashScreenDrawable() throws PackageManager.NameNotFoundException {
-    Intent intent = FlutterFragmentActivity.createDefaultIntent(ctx);
-    ActivityController<FlutterFragmentActivity> activityController =
-        Robolectric.buildActivity(FlutterFragmentActivity.class, intent);
-    FlutterFragmentActivity activity = activityController.get();
-
-    // Inject splash screen drawable resource id in the metadata
-    PackageManager pm = ctx.getPackageManager();
-    ActivityInfo activityInfo =
-        pm.getActivityInfo(activity.getComponentName(), PackageManager.GET_META_DATA);
-    activityInfo.metaData = new Bundle();
-    activityInfo.metaData.putInt(
-        FlutterActivityLaunchConfigs.SPLASH_SCREEN_META_DATA_KEY,
-        SplashShadowResources.SPLASH_DRAWABLE_ID);
-    shadowOf(ctx.getPackageManager()).addOrUpdateActivity(activityInfo);
-
-    // It should load the drawable.
-    SplashScreen splashScreen = activity.provideSplashScreen();
-    assertNotNull(splashScreen);
-  }
-
-  @Test
-  @Config(
-      sdk = Build.VERSION_CODES.LOLLIPOP,
-      shadows = {SplashShadowResources.class})
-  @TargetApi(21) // Theme references in drawables requires API 21+
-  public void itLoadsThemedSplashScreenDrawable() throws PackageManager.NameNotFoundException {
-    // A drawable with theme references can be parsed only if the app theme is supplied
-    // in getDrawable methods. This test verifies it by fetching a (fake) themed drawable.
-    // On failure, a Resource.NotFoundException will ocurr.
-    Intent intent = FlutterFragmentActivity.createDefaultIntent(ctx);
-    ActivityController<FlutterFragmentActivity> activityController =
-        Robolectric.buildActivity(FlutterFragmentActivity.class, intent);
-    FlutterFragmentActivity activity = activityController.get();
-
-    // Inject themed splash screen drawable resource id in the metadata.
-    PackageManager pm = ctx.getPackageManager();
-    ActivityInfo activityInfo =
-        pm.getActivityInfo(activity.getComponentName(), PackageManager.GET_META_DATA);
-    activityInfo.metaData = new Bundle();
-    activityInfo.metaData.putInt(
-        FlutterActivityLaunchConfigs.SPLASH_SCREEN_META_DATA_KEY,
-        SplashShadowResources.THEMED_SPLASH_DRAWABLE_ID);
-    shadowOf(ctx.getPackageManager()).addOrUpdateActivity(activityInfo);
-
-    // It should load the drawable.
-    SplashScreen splashScreen = activity.provideSplashScreen();
-    assertNotNull(splashScreen);
-  }
-
-  @Test
-  public void itWithMetadataWithoutSplashScreenResourceKeyDoesNotProvideSplashScreen()
-      throws PackageManager.NameNotFoundException {
-    Intent intent = FlutterFragmentActivity.createDefaultIntent(ctx);
-    ActivityController<FlutterFragmentActivity> activityController =
-        Robolectric.buildActivity(FlutterFragmentActivity.class, intent);
-    FlutterFragmentActivity activity = activityController.get();
-
-    // Setup an empty metadata file.
-    PackageManager pm = ctx.getPackageManager();
-    ActivityInfo activityInfo =
-        pm.getActivityInfo(activity.getComponentName(), PackageManager.GET_META_DATA);
-    activityInfo.metaData = new Bundle();
-    shadowOf(ctx.getPackageManager()).addOrUpdateActivity(activityInfo);
-
-    // It should not load the drawable.
-    SplashScreen splashScreen = activity.provideSplashScreen();
-    assertNull(splashScreen);
-  }
-
   static class FlutterFragmentActivityWithProvidedEngine extends FlutterFragmentActivity {
     int numberOfEnginesCreated = 0;
 
@@ -422,5 +329,11 @@ public class FlutterFragmentActivityTest {
       return new CachedEngineIntentBuilder(
           FlutterFragmentActivityWithIntentBuilders.class, cachedEngineId);
     }
+
+    public static NewEngineInGroupIntentBuilder withNewEngineInGroup(
+        @NonNull String engineGroupId) {
+      return new NewEngineInGroupIntentBuilder(
+          FlutterFragmentActivityWithIntentBuilders.class, engineGroupId);
+    }
   }
 }
diff --git a/shell/platform/android/test/io/flutter/embedding/android/FlutterFragmentTest.java b/shell/platform/android/test/io/flutter/embedding/android/FlutterFragmentTest.java
index 33b7b25504c4f9f10196f8d435cdc93a432bf8dd..06b30a99e024e233132cd8c60301562ed47051f9 100644
--- a/shell/platform/android/test/io/flutter/embedding/android/FlutterFragmentTest.java
+++ b/shell/platform/android/test/io/flutter/embedding/android/FlutterFragmentTest.java
@@ -102,6 +102,35 @@ public class FlutterFragmentTest {
     assertEquals(TransparencyMode.opaque, fragment.getTransparencyMode());
   }
 
+  @Test
+  public void itCreatesNewEngineInGroupFragmentWithRequestedSettings() {
+    FlutterFragment fragment =
+        FlutterFragment.withNewEngineInGroup("my_cached_engine_group")
+            .dartEntrypoint("custom_entrypoint")
+            .initialRoute("/custom/route")
+            .shouldAttachEngineToActivity(false)
+            .handleDeeplinking(true)
+            .renderMode(RenderMode.texture)
+            .transparencyMode(TransparencyMode.opaque)
+            .build();
+
+    TestDelegateFactory delegateFactory =
+        new TestDelegateFactory(new FlutterActivityAndFragmentDelegate(fragment));
+
+    fragment.setDelegateFactory(delegateFactory);
+
+    assertEquals("my_cached_engine_group", fragment.getCachedEngineGroupId());
+    assertEquals("custom_entrypoint", fragment.getDartEntrypointFunctionName());
+    assertEquals("/custom/route", fragment.getInitialRoute());
+    assertArrayEquals(new String[] {}, fragment.getFlutterShellArgs().toArray());
+    assertFalse(fragment.shouldAttachEngineToActivity());
+    assertTrue(fragment.shouldHandleDeeplinking());
+    assertNull(fragment.getCachedEngineId());
+    assertTrue(fragment.shouldDestroyEngineWithHost());
+    assertEquals(RenderMode.texture, fragment.getRenderMode());
+    assertEquals(TransparencyMode.opaque, fragment.getTransparencyMode());
+  }
+
   @Test
   public void itCreatesNewEngineFragmentThatDelaysFirstDrawWhenRequested() {
     FlutterFragment fragment =
@@ -254,6 +283,12 @@ public class FlutterFragmentTest {
     assertEquals(fragment.getExclusiveAppComponent(), delegate);
   }
 
+  @SuppressWarnings("deprecation")
+  private FragmentActivity getMockFragmentActivity() {
+    // TODO(reidbaker): https://github.com/flutter/flutter/issues/133151
+    return Robolectric.setupActivity(FragmentActivity.class);
+  }
+
   @Test
   public void itDelegatesOnBackPressedAutomaticallyWhenEnabled() {
     // We need to mock FlutterJNI to avoid triggering native code.
@@ -268,7 +303,7 @@ public class FlutterFragmentTest {
         FlutterFragment.withCachedEngine("my_cached_engine")
             .shouldAutomaticallyHandleOnBackPressed(true)
             .build();
-    FragmentActivity activity = Robolectric.setupActivity(FragmentActivity.class);
+    FragmentActivity activity = getMockFragmentActivity();
     activity
         .getSupportFragmentManager()
         .beginTransaction()
@@ -288,6 +323,9 @@ public class FlutterFragmentTest {
     verify(mockDelegate, times(1)).onBackPressed();
   }
 
+  @SuppressWarnings("deprecation")
+  // Robolectric.setupActivity
+  // TODO(reidbaker): https://github.com/flutter/flutter/issues/133151
   @Test
   public void itHandlesPopSystemNavigationAutomaticallyWhenEnabled() {
     // We need to mock FlutterJNI to avoid triggering native code.
@@ -302,7 +340,7 @@ public class FlutterFragmentTest {
         FlutterFragment.withCachedEngine("my_cached_engine")
             .shouldAutomaticallyHandleOnBackPressed(true)
             .build();
-    FragmentActivity activity = Robolectric.setupActivity(FragmentActivity.class);
+    FragmentActivity activity = getMockFragmentActivity();
     activity
         .getSupportFragmentManager()
         .beginTransaction()
diff --git a/shell/platform/android/test/io/flutter/embedding/android/FlutterSurfaceViewTest.java b/shell/platform/android/test/io/flutter/embedding/android/FlutterSurfaceViewTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..33312dc7bf0c2c2d544d898103b9f35c1b8bcf82
--- /dev/null
+++ b/shell/platform/android/test/io/flutter/embedding/android/FlutterSurfaceViewTest.java
@@ -0,0 +1,72 @@
+package io.flutter.embedding.android;
+
+import static io.flutter.Build.API_LEVELS;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.annotation.TargetApi;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import io.flutter.embedding.engine.FlutterJNI;
+import io.flutter.embedding.engine.renderer.FlutterRenderer;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+@Config(manifest = Config.NONE)
+@RunWith(AndroidJUnit4.class)
+@TargetApi(API_LEVELS.API_30)
+public class FlutterSurfaceViewTest {
+  @Test
+  public void itShouldCreateANewSurfaceWhenReattachedAfterDetachingFromRenderer() {
+    // Consider this scenario: In an add-to-app context, where multiple Flutter activities share the
+    // same engine, a situation occurs. When navigating from FlutterActivity1 to FlutterActivity2,
+    // the Flutter view associated with FlutterActivity1 is detached from the engine. Then, the
+    // Flutter view of FlutterActivity2 is attached. Upon navigating back to FlutterActivity1, its
+    // Flutter view is re-attached to the shared engine.
+    //
+    // The expected behavior is: When a Flutter view detaches from the shared engine, the associated
+    // surface should be released. When the Flutter view re-attaches, a new surface should be
+    // created.
+
+    // Setup the test.
+    final FlutterSurfaceView surfaceView =
+        spy(new FlutterSurfaceView(ApplicationProvider.getApplicationContext()));
+
+    FlutterJNI fakeFlutterJNI = mock(FlutterJNI.class);
+    FlutterRenderer flutterRenderer = new FlutterRenderer(fakeFlutterJNI);
+
+    SurfaceHolder fakeSurfaceHolder = mock(SurfaceHolder.class);
+    Surface fakeSurface = mock(Surface.class);
+    when(surfaceView.getHolder()).thenReturn(fakeSurfaceHolder);
+    when(fakeSurfaceHolder.getSurface()).thenReturn(fakeSurface);
+    when(surfaceView.isSurfaceAvailableForRendering()).thenReturn(true);
+    when(surfaceView.getWindowToken()).thenReturn(mock(android.os.IBinder.class));
+
+    // Execute the behavior under test.
+    surfaceView.attachToRenderer(flutterRenderer);
+
+    // Verify the behavior under test.
+    verify(fakeFlutterJNI, times(1)).onSurfaceCreated(any(Surface.class));
+
+    // Execute the behavior under test.
+    surfaceView.detachFromRenderer();
+
+    // Verify the behavior under test.
+    verify(fakeFlutterJNI, times(1)).onSurfaceDestroyed();
+
+    // Execute the behavior under test.
+    surfaceView.attachToRenderer(flutterRenderer);
+
+    // Verify the behavior under test.
+    verify(fakeFlutterJNI, never()).onSurfaceWindowChanged(any(Surface.class));
+    verify(fakeFlutterJNI, times(2)).onSurfaceCreated(any(Surface.class));
+  }
+}
diff --git a/shell/platform/android/test/io/flutter/embedding/android/FlutterTextureViewTest.java b/shell/platform/android/test/io/flutter/embedding/android/FlutterTextureViewTest.java
index f6eccaa31b6f7fa2776dd644e4f5aa4cd530bddf..7711b1568c5533888d832211d56df26f87356ff8 100644
--- a/shell/platform/android/test/io/flutter/embedding/android/FlutterTextureViewTest.java
+++ b/shell/platform/android/test/io/flutter/embedding/android/FlutterTextureViewTest.java
@@ -1,7 +1,13 @@
 package io.flutter.embedding.android;
 
+import static io.flutter.Build.API_LEVELS;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import android.annotation.TargetApi;
 import android.graphics.SurfaceTexture;
@@ -9,13 +15,15 @@ import android.view.Surface;
 import android.view.TextureView;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+import io.flutter.embedding.engine.FlutterJNI;
+import io.flutter.embedding.engine.renderer.FlutterRenderer;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
 @Config(manifest = Config.NONE)
 @RunWith(AndroidJUnit4.class)
-@TargetApi(30)
+@TargetApi(API_LEVELS.API_30)
 public class FlutterTextureViewTest {
   @Test
   public void surfaceTextureListenerReleasesRenderer() {
@@ -30,4 +38,47 @@ public class FlutterTextureViewTest {
 
     verify(mockRenderSurface).release();
   }
+
+  @Test
+  public void itShouldCreateANewSurfaceWhenReattachedAfterDetachingFromRenderer() {
+    // Consider this scenario: In an add-to-app context, where multiple Flutter activities share the
+    // same engine, a situation occurs. When navigating from FlutterActivity1 to FlutterActivity2,
+    // the Flutter view associated with FlutterActivity1 is detached from the engine. Then, the
+    // Flutter view of FlutterActivity2 is attached. Upon navigating back to FlutterActivity1, its
+    // Flutter view is re-attached to the shared engine.
+    //
+    // The expected behavior is: When a Flutter view detaches from the shared engine, the associated
+    // surface should be released. When the Flutter view re-attaches, a new surface should be
+    // created.
+
+    // Setup the test.
+    final FlutterTextureView textureView =
+        spy(new FlutterTextureView(ApplicationProvider.getApplicationContext()));
+
+    FlutterJNI fakeFlutterJNI = mock(FlutterJNI.class);
+    FlutterRenderer flutterRenderer = new FlutterRenderer(fakeFlutterJNI);
+
+    when(textureView.isSurfaceAvailableForRendering()).thenReturn(true);
+    when(textureView.getSurfaceTexture()).thenReturn(mock(SurfaceTexture.class));
+    when(textureView.getWindowToken()).thenReturn(mock(android.os.IBinder.class));
+
+    // Execute the behavior under test.
+    textureView.attachToRenderer(flutterRenderer);
+
+    // Verify the behavior under test.
+    verify(fakeFlutterJNI, times(1)).onSurfaceCreated(any(Surface.class));
+
+    // Execute the behavior under test.
+    textureView.detachFromRenderer();
+
+    // Verify the behavior under test.
+    verify(fakeFlutterJNI, times(1)).onSurfaceDestroyed();
+
+    // Execute the behavior under test.
+    textureView.attachToRenderer(flutterRenderer);
+
+    // Verify the behavior under test.
+    verify(fakeFlutterJNI, never()).onSurfaceWindowChanged(any(Surface.class));
+    verify(fakeFlutterJNI, times(2)).onSurfaceCreated(any(Surface.class));
+  }
 }
diff --git a/shell/platform/android/test/io/flutter/embedding/android/FlutterViewTest.java b/shell/platform/android/test/io/flutter/embedding/android/FlutterViewTest.java
deleted file mode 100644
index beb05cc29e83ff157da6bc83ab024f4fad9a0e7d..0000000000000000000000000000000000000000
--- a/shell/platform/android/test/io/flutter/embedding/android/FlutterViewTest.java
+++ /dev/null
@@ -1,1081 +0,0 @@
-package io.flutter.embedding.android;
-
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertFalse;
-import static junit.framework.TestCase.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.app.Activity;
-import android.content.Context;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.graphics.Canvas;
-import android.graphics.Insets;
-import android.graphics.Rect;
-import android.graphics.Region;
-import android.hardware.HardwareBuffer;
-import android.media.Image;
-import android.media.Image.Plane;
-import android.media.ImageReader;
-import android.os.Build;
-import android.provider.Settings;
-import android.view.DisplayCutout;
-import android.view.Surface;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowInsets;
-import android.view.WindowManager;
-import android.widget.FrameLayout;
-import androidx.core.util.Consumer;
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.window.layout.FoldingFeature;
-import androidx.window.layout.WindowLayoutInfo;
-import io.flutter.embedding.engine.FlutterEngine;
-import io.flutter.embedding.engine.FlutterJNI;
-import io.flutter.embedding.engine.loader.FlutterLoader;
-import io.flutter.embedding.engine.renderer.FlutterRenderer;
-import io.flutter.embedding.engine.systemchannels.SettingsChannel;
-import io.flutter.plugin.platform.PlatformViewsController;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.concurrent.atomic.AtomicReference;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.mockito.Spy;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-import org.robolectric.Robolectric;
-import org.robolectric.Shadows;
-import org.robolectric.annotation.Config;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.shadows.ShadowDisplay;
-
-@Config(manifest = Config.NONE)
-@RunWith(AndroidJUnit4.class)
-@TargetApi(30)
-public class FlutterViewTest {
-  private final Context ctx = ApplicationProvider.getApplicationContext();
-  @Mock FlutterJNI mockFlutterJni;
-  @Mock FlutterLoader mockFlutterLoader;
-  @Spy PlatformViewsController platformViewsController;
-
-  @Before
-  public void setUp() {
-    MockitoAnnotations.openMocks(this);
-    when(mockFlutterJni.isAttached()).thenReturn(true);
-  }
-
-  @Test
-  public void attachToFlutterEngine_alertsPlatformViews() {
-    FlutterView flutterView = new FlutterView(Robolectric.setupActivity(Activity.class));
-    FlutterEngine flutterEngine = spy(new FlutterEngine(ctx, mockFlutterLoader, mockFlutterJni));
-    when(flutterEngine.getPlatformViewsController()).thenReturn(platformViewsController);
-
-    flutterView.attachToFlutterEngine(flutterEngine);
-
-    verify(platformViewsController, times(1)).attachToView(flutterView);
-  }
-
-  @Test
-  public void detachFromFlutterEngine_alertsPlatformViews() {
-    FlutterView flutterView = new FlutterView(Robolectric.setupActivity(Activity.class));
-    FlutterEngine flutterEngine = spy(new FlutterEngine(ctx, mockFlutterLoader, mockFlutterJni));
-    when(flutterEngine.getPlatformViewsController()).thenReturn(platformViewsController);
-
-    flutterView.attachToFlutterEngine(flutterEngine);
-    flutterView.detachFromFlutterEngine();
-
-    verify(platformViewsController, times(1)).detachFromView();
-  }
-
-  @Test
-  public void detachFromFlutterEngine_turnsOffA11y() {
-    FlutterView flutterView = new FlutterView(Robolectric.setupActivity(Activity.class));
-    FlutterEngine flutterEngine = spy(new FlutterEngine(ctx, mockFlutterLoader, mockFlutterJni));
-    FlutterRenderer flutterRenderer = spy(new FlutterRenderer(mockFlutterJni));
-    when(flutterEngine.getRenderer()).thenReturn(flutterRenderer);
-
-    flutterView.attachToFlutterEngine(flutterEngine);
-    flutterView.detachFromFlutterEngine();
-
-    verify(flutterRenderer, times(1)).setSemanticsEnabled(false);
-  }
-
-  @Test
-  public void detachFromFlutterEngine_revertImageView() {
-    FlutterView flutterView = new FlutterView(ctx);
-    FlutterEngine flutterEngine = spy(new FlutterEngine(ctx, mockFlutterLoader, mockFlutterJni));
-
-    flutterView.attachToFlutterEngine(flutterEngine);
-    assertFalse(flutterView.renderSurface instanceof FlutterImageView);
-
-    flutterView.convertToImageView();
-    assertTrue(flutterView.renderSurface instanceof FlutterImageView);
-
-    flutterView.detachFromFlutterEngine();
-    assertFalse(flutterView.renderSurface instanceof FlutterImageView);
-  }
-
-  @Test
-  public void detachFromFlutterEngine_removeImageView() {
-    FlutterView flutterView = new FlutterView(ctx);
-    FlutterEngine flutterEngine = spy(new FlutterEngine(ctx, mockFlutterLoader, mockFlutterJni));
-
-    flutterView.attachToFlutterEngine(flutterEngine);
-    flutterView.convertToImageView();
-    assertEquals(flutterView.getChildCount(), 2);
-    View view = flutterView.getChildAt(1);
-    assertTrue(view instanceof FlutterImageView);
-
-    flutterView.detachFromFlutterEngine();
-    assertEquals(flutterView.getChildCount(), 1);
-    view = flutterView.getChildAt(0);
-    assertFalse(view instanceof FlutterImageView);
-  }
-
-  @Test
-  public void detachFromFlutterEngine_closesImageView() {
-    FlutterEngine flutterEngine = spy(new FlutterEngine(ctx, mockFlutterLoader, mockFlutterJni));
-
-    FlutterRenderer flutterRenderer = spy(new FlutterRenderer(mockFlutterJni));
-    when(flutterEngine.getRenderer()).thenReturn(flutterRenderer);
-
-    FlutterImageView imageViewMock = mock(FlutterImageView.class);
-    when(imageViewMock.getAttachedRenderer()).thenReturn(flutterRenderer);
-
-    FlutterView flutterView = spy(new FlutterView(ctx));
-    when(flutterView.createImageView()).thenReturn(imageViewMock);
-
-    flutterView.attachToFlutterEngine(flutterEngine);
-
-    assertFalse(flutterView.renderSurface == imageViewMock);
-
-    flutterView.convertToImageView();
-    assertTrue(flutterView.renderSurface == imageViewMock);
-
-    flutterView.detachFromFlutterEngine();
-    assertFalse(flutterView.renderSurface == imageViewMock);
-    verify(imageViewMock, times(1)).closeImageReader();
-  }
-
-  @Test
-  public void flutterImageView_revertImageViewAndAvoidNPE() {
-    FlutterView flutterView = new FlutterView(ctx);
-    FlutterEngine flutterEngine = spy(new FlutterEngine(ctx, mockFlutterLoader, mockFlutterJni));
-    FlutterRenderer flutterRenderer = spy(new FlutterRenderer(mockFlutterJni));
-    when(flutterEngine.getRenderer()).thenReturn(flutterRenderer);
-
-    flutterView.attachToFlutterEngine(flutterEngine);
-    flutterView.convertToImageView();
-    assertTrue(flutterView.renderSurface instanceof FlutterImageView);
-
-    // Register a `FlutterUiDisplayListener` callback.
-    // During callback execution it will invoke `flutterImageView.detachFromRenderer()`.
-    flutterView.revertImageView(
-        () -> {
-          // No-op
-        });
-    assertFalse(flutterView.renderSurface instanceof FlutterImageView);
-
-    flutterView.detachFromFlutterEngine();
-    assertEquals(null, flutterView.getCurrentImageSurface());
-
-    // Invoke all registered `FlutterUiDisplayListener` callback
-    mockFlutterJni.onFirstFrame();
-  }
-
-  @Test
-  public void onConfigurationChanged_fizzlesWhenNullEngine() {
-    FlutterView flutterView = new FlutterView(Robolectric.setupActivity(Activity.class));
-    FlutterEngine flutterEngine = spy(new FlutterEngine(ctx, mockFlutterLoader, mockFlutterJni));
-
-    Configuration configuration = ctx.getResources().getConfiguration();
-    // 1 invocation of channels.
-    flutterView.attachToFlutterEngine(flutterEngine);
-    flutterView.onConfigurationChanged(configuration);
-    flutterView.detachFromFlutterEngine();
-
-    // Should fizzle.
-    flutterView.onConfigurationChanged(configuration);
-
-    verify(flutterEngine, times(1)).getLocalizationPlugin();
-    verify(flutterEngine, times(2)).getSettingsChannel();
-  }
-
-  // TODO(mattcarroll): turn this into an e2e test. GitHub #42990
-  @Test
-  public void itSendsLightPlatformBrightnessToFlutter() {
-    // Setup test.
-    AtomicReference<SettingsChannel.PlatformBrightness> reportedBrightness =
-        new AtomicReference<>();
-
-    // FYI - The default brightness is LIGHT, which is why we don't need to configure it.
-    FlutterView flutterView = new FlutterView(Robolectric.setupActivity(Activity.class));
-    FlutterEngine flutterEngine = spy(new FlutterEngine(ctx, mockFlutterLoader, mockFlutterJni));
-
-    SettingsChannel fakeSettingsChannel = mock(SettingsChannel.class);
-    SettingsChannel.MessageBuilder fakeMessageBuilder = mock(SettingsChannel.MessageBuilder.class);
-    when(fakeMessageBuilder.setTextScaleFactor(any(Float.class))).thenReturn(fakeMessageBuilder);
-    when(fakeMessageBuilder.setNativeSpellCheckServiceDefined(any(Boolean.class)))
-        .thenReturn(fakeMessageBuilder);
-    when(fakeMessageBuilder.setBrieflyShowPassword(any(Boolean.class)))
-        .thenReturn(fakeMessageBuilder);
-    when(fakeMessageBuilder.setUse24HourFormat(any(Boolean.class))).thenReturn(fakeMessageBuilder);
-    when(fakeMessageBuilder.setPlatformBrightness(any(SettingsChannel.PlatformBrightness.class)))
-        .thenAnswer(
-            new Answer<SettingsChannel.MessageBuilder>() {
-              @Override
-              public SettingsChannel.MessageBuilder answer(InvocationOnMock invocation)
-                  throws Throwable {
-                reportedBrightness.set(
-                    (SettingsChannel.PlatformBrightness) invocation.getArguments()[0]);
-                return fakeMessageBuilder;
-              }
-            });
-    when(fakeSettingsChannel.startMessage()).thenReturn(fakeMessageBuilder);
-    when(flutterEngine.getSettingsChannel()).thenReturn(fakeSettingsChannel);
-
-    flutterView.attachToFlutterEngine(flutterEngine);
-
-    // Execute behavior under test.
-    flutterView.sendUserSettingsToFlutter();
-
-    // Verify results.
-    assertEquals(SettingsChannel.PlatformBrightness.light, reportedBrightness.get());
-  }
-
-  // TODO(mattcarroll): turn this into an e2e test. GitHub #42990
-  @Test
-  public void itSendsDarkPlatformBrightnessToFlutter() {
-    // Setup test.
-    AtomicReference<SettingsChannel.PlatformBrightness> reportedBrightness =
-        new AtomicReference<>();
-
-    Context spiedContext = spy(Robolectric.setupActivity(Activity.class));
-
-    Resources spiedResources = spy(spiedContext.getResources());
-    when(spiedContext.getResources()).thenReturn(spiedResources);
-
-    Configuration spiedConfiguration = spy(spiedResources.getConfiguration());
-    spiedConfiguration.uiMode =
-        (spiedResources.getConfiguration().uiMode | Configuration.UI_MODE_NIGHT_YES)
-            & ~Configuration.UI_MODE_NIGHT_NO;
-    when(spiedResources.getConfiguration()).thenReturn(spiedConfiguration);
-
-    FlutterView flutterView = new FlutterView(spiedContext);
-    FlutterEngine flutterEngine = spy(new FlutterEngine(ctx, mockFlutterLoader, mockFlutterJni));
-
-    SettingsChannel fakeSettingsChannel = mock(SettingsChannel.class);
-    SettingsChannel.MessageBuilder fakeMessageBuilder = mock(SettingsChannel.MessageBuilder.class);
-    when(fakeMessageBuilder.setTextScaleFactor(any(Float.class))).thenReturn(fakeMessageBuilder);
-    when(fakeMessageBuilder.setNativeSpellCheckServiceDefined(any(Boolean.class)))
-        .thenReturn(fakeMessageBuilder);
-    when(fakeMessageBuilder.setBrieflyShowPassword(any(Boolean.class)))
-        .thenReturn(fakeMessageBuilder);
-    when(fakeMessageBuilder.setUse24HourFormat(any(Boolean.class))).thenReturn(fakeMessageBuilder);
-    when(fakeMessageBuilder.setPlatformBrightness(any(SettingsChannel.PlatformBrightness.class)))
-        .thenAnswer(
-            new Answer<SettingsChannel.MessageBuilder>() {
-              @Override
-              public SettingsChannel.MessageBuilder answer(InvocationOnMock invocation)
-                  throws Throwable {
-                reportedBrightness.set(
-                    (SettingsChannel.PlatformBrightness) invocation.getArguments()[0]);
-                return fakeMessageBuilder;
-              }
-            });
-    when(fakeSettingsChannel.startMessage()).thenReturn(fakeMessageBuilder);
-    when(flutterEngine.getSettingsChannel()).thenReturn(fakeSettingsChannel);
-
-    // Execute behavior under test.
-    flutterView.attachToFlutterEngine(flutterEngine);
-    flutterView.sendUserSettingsToFlutter();
-
-    // Verify results.
-    assertEquals(SettingsChannel.PlatformBrightness.dark, reportedBrightness.get());
-  }
-
-  @Test
-  public void itSendsTextShowPasswordToFrameworkOnAttach() {
-    // Setup test.
-    AtomicReference<Boolean> reportedShowPassword = new AtomicReference<>();
-
-    FlutterView flutterView = new FlutterView(Robolectric.setupActivity(Activity.class));
-    FlutterEngine flutterEngine = spy(new FlutterEngine(ctx, mockFlutterLoader, mockFlutterJni));
-    Settings.System.putInt(
-        flutterView.getContext().getContentResolver(), Settings.System.TEXT_SHOW_PASSWORD, 1);
-
-    SettingsChannel fakeSettingsChannel = mock(SettingsChannel.class);
-    SettingsChannel.MessageBuilder fakeMessageBuilder = mock(SettingsChannel.MessageBuilder.class);
-    when(fakeMessageBuilder.setTextScaleFactor(any(Float.class))).thenReturn(fakeMessageBuilder);
-    when(fakeMessageBuilder.setNativeSpellCheckServiceDefined(any(Boolean.class)))
-        .thenReturn(fakeMessageBuilder);
-    when(fakeMessageBuilder.setPlatformBrightness(any(SettingsChannel.PlatformBrightness.class)))
-        .thenReturn(fakeMessageBuilder);
-    when(fakeMessageBuilder.setUse24HourFormat(any(Boolean.class))).thenReturn(fakeMessageBuilder);
-    when(fakeMessageBuilder.setBrieflyShowPassword(any(Boolean.class)))
-        .thenAnswer(
-            new Answer<SettingsChannel.MessageBuilder>() {
-              @Override
-              public SettingsChannel.MessageBuilder answer(InvocationOnMock invocation)
-                  throws Throwable {
-                reportedShowPassword.set((Boolean) invocation.getArguments()[0]);
-                return fakeMessageBuilder;
-              }
-            });
-    when(fakeSettingsChannel.startMessage()).thenReturn(fakeMessageBuilder);
-    when(flutterEngine.getSettingsChannel()).thenReturn(fakeSettingsChannel);
-
-    flutterView.attachToFlutterEngine(flutterEngine);
-
-    // Verify results.
-    assertTrue(reportedShowPassword.get());
-  }
-
-  public void itSendsTextHidePasswordToFrameworkOnAttach() {
-    // Setup test.
-    AtomicReference<Boolean> reportedShowPassword = new AtomicReference<>();
-
-    FlutterView flutterView = new FlutterView(Robolectric.setupActivity(Activity.class));
-    FlutterEngine flutterEngine = spy(new FlutterEngine(ctx, mockFlutterLoader, mockFlutterJni));
-    Settings.System.putInt(
-        flutterView.getContext().getContentResolver(), Settings.System.TEXT_SHOW_PASSWORD, 0);
-
-    SettingsChannel fakeSettingsChannel = mock(SettingsChannel.class);
-    SettingsChannel.MessageBuilder fakeMessageBuilder = mock(SettingsChannel.MessageBuilder.class);
-    when(fakeMessageBuilder.setTextScaleFactor(any(Float.class))).thenReturn(fakeMessageBuilder);
-    when(fakeMessageBuilder.setPlatformBrightness(any(SettingsChannel.PlatformBrightness.class)))
-        .thenReturn(fakeMessageBuilder);
-    when(fakeMessageBuilder.setUse24HourFormat(any(Boolean.class))).thenReturn(fakeMessageBuilder);
-    when(fakeMessageBuilder.setBrieflyShowPassword(any(Boolean.class)))
-        .thenAnswer(
-            new Answer<SettingsChannel.MessageBuilder>() {
-              @Override
-              public SettingsChannel.MessageBuilder answer(InvocationOnMock invocation)
-                  throws Throwable {
-                reportedShowPassword.set((Boolean) invocation.getArguments()[0]);
-                return fakeMessageBuilder;
-              }
-            });
-    when(fakeSettingsChannel.startMessage()).thenReturn(fakeMessageBuilder);
-    when(flutterEngine.getSettingsChannel()).thenReturn(fakeSettingsChannel);
-
-    flutterView.attachToFlutterEngine(flutterEngine);
-
-    // Verify results.
-    assertFalse(reportedShowPassword.get());
-  }
-
-  // This test uses the API 30+ Algorithm for window insets. The legacy algorithm is
-  // set to -1 values, so it is clear if the wrong algorithm is used.
-  @Test
-  @TargetApi(30)
-  @Config(
-      sdk = 30,
-      shadows = {
-        FlutterViewTest.ShadowFullscreenView.class,
-        FlutterViewTest.ShadowFullscreenViewGroup.class
-      })
-  public void setPaddingTopToZeroForFullscreenMode() {
-    FlutterView flutterView = new FlutterView(Robolectric.setupActivity(Activity.class));
-    FlutterEngine flutterEngine = spy(new FlutterEngine(ctx, mockFlutterLoader, mockFlutterJni));
-    FlutterRenderer flutterRenderer = spy(new FlutterRenderer(mockFlutterJni));
-    when(flutterEngine.getRenderer()).thenReturn(flutterRenderer);
-
-    // When we attach a new FlutterView to the engine without any system insets, the viewport
-    // metrics
-    // default to 0.
-    flutterView.attachToFlutterEngine(flutterEngine);
-    ArgumentCaptor<FlutterRenderer.ViewportMetrics> viewportMetricsCaptor =
-        ArgumentCaptor.forClass(FlutterRenderer.ViewportMetrics.class);
-    verify(flutterRenderer).setViewportMetrics(viewportMetricsCaptor.capture());
-    assertEquals(0, viewportMetricsCaptor.getValue().viewPaddingTop);
-
-    // Then we simulate the system applying a window inset.
-    WindowInsets windowInsets =
-        new WindowInsets.Builder()
-            .setInsets(
-                android.view.WindowInsets.Type.navigationBars()
-                    | android.view.WindowInsets.Type.statusBars(),
-                Insets.of(100, 100, 100, 100))
-            .build();
-    flutterView.onApplyWindowInsets(windowInsets);
-
-    // Verify.
-    verify(flutterRenderer, times(3)).setViewportMetrics(viewportMetricsCaptor.capture());
-    validateViewportMetricPadding(viewportMetricsCaptor, 100, 100, 100, 100);
-  }
-
-  // This test uses the pre-API 30 Algorithm for window insets.
-  @Test
-  @TargetApi(28)
-  @Config(
-      sdk = 28,
-      shadows = {
-        FlutterViewTest.ShadowFullscreenView.class,
-        FlutterViewTest.ShadowFullscreenViewGroup.class
-      })
-  public void setPaddingTopToZeroForFullscreenModeLegacy() {
-    FlutterView flutterView = new FlutterView(Robolectric.setupActivity(Activity.class));
-    FlutterEngine flutterEngine = spy(new FlutterEngine(ctx, mockFlutterLoader, mockFlutterJni));
-    FlutterRenderer flutterRenderer = spy(new FlutterRenderer(mockFlutterJni));
-    when(flutterEngine.getRenderer()).thenReturn(flutterRenderer);
-
-    // When we attach a new FlutterView to the engine without any system insets, the viewport
-    // metrics
-    // default to 0.
-    flutterView.attachToFlutterEngine(flutterEngine);
-    ArgumentCaptor<FlutterRenderer.ViewportMetrics> viewportMetricsCaptor =
-        ArgumentCaptor.forClass(FlutterRenderer.ViewportMetrics.class);
-    verify(flutterRenderer).setViewportMetrics(viewportMetricsCaptor.capture());
-    assertEquals(0, viewportMetricsCaptor.getValue().viewPaddingTop);
-
-    // Then we simulate the system applying a window inset.
-    WindowInsets windowInsets = mock(WindowInsets.class);
-    mockSystemWindowInsets(windowInsets, 100, 100, 100, 100);
-    flutterView.onApplyWindowInsets(windowInsets);
-
-    // Verify.
-    verify(flutterRenderer, times(2)).setViewportMetrics(viewportMetricsCaptor.capture());
-    validateViewportMetricPadding(viewportMetricsCaptor, 100, 0, 100, 0);
-  }
-
-  // This test uses the API 30+ Algorithm for window insets. The legacy algorithm is
-  // set to -1 values, so it is clear if the wrong algorithm is used.
-  @Test
-  @TargetApi(30)
-  @Config(sdk = 30)
-  public void reportSystemInsetWhenNotFullscreen() {
-    // Without custom shadows, the default system ui visibility flags is 0.
-    FlutterView flutterView = new FlutterView(Robolectric.setupActivity(Activity.class));
-    assertEquals(0, flutterView.getSystemUiVisibility());
-
-    FlutterEngine flutterEngine = spy(new FlutterEngine(ctx, mockFlutterLoader, mockFlutterJni));
-    FlutterRenderer flutterRenderer = spy(new FlutterRenderer(mockFlutterJni));
-    when(flutterEngine.getRenderer()).thenReturn(flutterRenderer);
-
-    // When we attach a new FlutterView to the engine without any system insets, the viewport
-    // metrics
-    // default to 0.
-    flutterView.attachToFlutterEngine(flutterEngine);
-    ArgumentCaptor<FlutterRenderer.ViewportMetrics> viewportMetricsCaptor =
-        ArgumentCaptor.forClass(FlutterRenderer.ViewportMetrics.class);
-    verify(flutterRenderer).setViewportMetrics(viewportMetricsCaptor.capture());
-    assertEquals(0, viewportMetricsCaptor.getValue().viewPaddingTop);
-
-    // Then we simulate the system applying a window inset.
-    WindowInsets windowInsets =
-        new WindowInsets.Builder()
-            .setInsets(
-                android.view.WindowInsets.Type.navigationBars()
-                    | android.view.WindowInsets.Type.statusBars(),
-                Insets.of(100, 100, 100, 100))
-            .build();
-    flutterView.onApplyWindowInsets(windowInsets);
-
-    // Verify.
-    verify(flutterRenderer, times(3)).setViewportMetrics(viewportMetricsCaptor.capture());
-    // Top padding is reported as-is.
-    validateViewportMetricPadding(viewportMetricsCaptor, 100, 100, 100, 100);
-  }
-
-  // This test uses the pre-API 30 Algorithm for window insets.
-  @Test
-  @TargetApi(28)
-  @Config(sdk = 28)
-  public void reportSystemInsetWhenNotFullscreenLegacy() {
-    // Without custom shadows, the default system ui visibility flags is 0.
-    FlutterView flutterView = new FlutterView(Robolectric.setupActivity(Activity.class));
-    assertEquals(0, flutterView.getSystemUiVisibility());
-
-    FlutterEngine flutterEngine = spy(new FlutterEngine(ctx, mockFlutterLoader, mockFlutterJni));
-    FlutterRenderer flutterRenderer = spy(new FlutterRenderer(mockFlutterJni));
-    when(flutterEngine.getRenderer()).thenReturn(flutterRenderer);
-
-    // When we attach a new FlutterView to the engine without any system insets, the viewport
-    // metrics
-    // default to 0.
-    flutterView.attachToFlutterEngine(flutterEngine);
-    ArgumentCaptor<FlutterRenderer.ViewportMetrics> viewportMetricsCaptor =
-        ArgumentCaptor.forClass(FlutterRenderer.ViewportMetrics.class);
-    verify(flutterRenderer).setViewportMetrics(viewportMetricsCaptor.capture());
-    assertEquals(0, viewportMetricsCaptor.getValue().viewPaddingTop);
-
-    // Then we simulate the system applying a window inset.
-    WindowInsets windowInsets = mock(WindowInsets.class);
-    mockSystemWindowInsets(windowInsets, 100, 100, 100, 100);
-    flutterView.onApplyWindowInsets(windowInsets);
-
-    // Verify.
-    verify(flutterRenderer, times(2)).setViewportMetrics(viewportMetricsCaptor.capture());
-    // Top padding is reported as-is.
-    validateViewportMetricPadding(viewportMetricsCaptor, 100, 100, 100, 0);
-  }
-
-  @Test
-  @Config(minSdk = 23, maxSdk = 29, qualifiers = "land")
-  public void systemInsetHandlesFullscreenNavbarRight() {
-    FlutterView flutterView = spy(new FlutterView(ctx));
-    setExpectedDisplayRotation(Surface.ROTATION_90);
-    assertEquals(0, flutterView.getSystemUiVisibility());
-    when(flutterView.getWindowSystemUiVisibility())
-        .thenReturn(View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
-    when(flutterView.getContext()).thenReturn(ctx);
-
-    FlutterEngine flutterEngine = spy(new FlutterEngine(ctx, mockFlutterLoader, mockFlutterJni));
-    FlutterRenderer flutterRenderer = spy(new FlutterRenderer(mockFlutterJni));
-    when(flutterEngine.getRenderer()).thenReturn(flutterRenderer);
-
-    // When we attach a new FlutterView to the engine without any system insets,
-    // the viewport metrics default to 0.
-    flutterView.attachToFlutterEngine(flutterEngine);
-    ArgumentCaptor<FlutterRenderer.ViewportMetrics> viewportMetricsCaptor =
-        ArgumentCaptor.forClass(FlutterRenderer.ViewportMetrics.class);
-    verify(flutterRenderer).setViewportMetrics(viewportMetricsCaptor.capture());
-    assertEquals(0, viewportMetricsCaptor.getValue().viewPaddingTop);
-
-    // Then we simulate the system applying a window inset.
-    WindowInsets windowInsets = mock(WindowInsets.class);
-    mockSystemWindowInsets(windowInsets, 100, 100, 100, 100);
-    mockSystemGestureInsetsIfNeed(windowInsets);
-
-    flutterView.onApplyWindowInsets(windowInsets);
-
-    verify(flutterRenderer, times(2)).setViewportMetrics(viewportMetricsCaptor.capture());
-    // Top padding is removed due to full screen.
-    // Right padding is zero because the rotation is 90deg
-    // Bottom padding is removed due to hide navigation.
-    validateViewportMetricPadding(viewportMetricsCaptor, 100, 0, 0, 0);
-  }
-
-  @Test
-  @Config(minSdk = 20, maxSdk = 22, qualifiers = "land")
-  public void systemInsetHandlesFullscreenNavbarRightBelowSDK23() {
-    FlutterView flutterView = spy(new FlutterView(ctx));
-    setExpectedDisplayRotation(Surface.ROTATION_270);
-    assertEquals(0, flutterView.getSystemUiVisibility());
-    when(flutterView.getWindowSystemUiVisibility())
-        .thenReturn(View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
-    when(flutterView.getContext()).thenReturn(ctx);
-
-    FlutterEngine flutterEngine = spy(new FlutterEngine(ctx, mockFlutterLoader, mockFlutterJni));
-    FlutterRenderer flutterRenderer = spy(new FlutterRenderer(mockFlutterJni));
-    when(flutterEngine.getRenderer()).thenReturn(flutterRenderer);
-
-    // When we attach a new FlutterView to the engine without any system insets,
-    // the viewport metrics default to 0.
-    flutterView.attachToFlutterEngine(flutterEngine);
-    ArgumentCaptor<FlutterRenderer.ViewportMetrics> viewportMetricsCaptor =
-        ArgumentCaptor.forClass(FlutterRenderer.ViewportMetrics.class);
-    verify(flutterRenderer).setViewportMetrics(viewportMetricsCaptor.capture());
-    assertEquals(0, viewportMetricsCaptor.getValue().viewPaddingTop);
-
-    // Then we simulate the system applying a window inset.
-    WindowInsets windowInsets = mock(WindowInsets.class);
-    mockSystemWindowInsets(windowInsets, 100, 100, 100, 100);
-    mockSystemGestureInsetsIfNeed(windowInsets);
-
-    flutterView.onApplyWindowInsets(windowInsets);
-
-    verify(flutterRenderer, times(2)).setViewportMetrics(viewportMetricsCaptor.capture());
-    // Top padding is removed due to full screen.
-    // Right padding is zero because the rotation is 270deg under SDK 23
-    // Bottom padding is removed due to hide navigation.
-    validateViewportMetricPadding(viewportMetricsCaptor, 100, 0, 0, 0);
-  }
-
-  @Test
-  @Config(minSdk = 23, maxSdk = 29, qualifiers = "land")
-  public void systemInsetHandlesFullscreenNavbarLeft() {
-    FlutterView flutterView = spy(new FlutterView(ctx));
-    setExpectedDisplayRotation(Surface.ROTATION_270);
-    assertEquals(0, flutterView.getSystemUiVisibility());
-    when(flutterView.getWindowSystemUiVisibility())
-        .thenReturn(View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
-    when(flutterView.getContext()).thenReturn(ctx);
-
-    FlutterEngine flutterEngine = spy(new FlutterEngine(ctx, mockFlutterLoader, mockFlutterJni));
-    FlutterRenderer flutterRenderer = spy(new FlutterRenderer(mockFlutterJni));
-    when(flutterEngine.getRenderer()).thenReturn(flutterRenderer);
-
-    // When we attach a new FlutterView to the engine without any system insets,
-    // the viewport metrics default to 0.
-    flutterView.attachToFlutterEngine(flutterEngine);
-    ArgumentCaptor<FlutterRenderer.ViewportMetrics> viewportMetricsCaptor =
-        ArgumentCaptor.forClass(FlutterRenderer.ViewportMetrics.class);
-    verify(flutterRenderer).setViewportMetrics(viewportMetricsCaptor.capture());
-    assertEquals(0, viewportMetricsCaptor.getValue().viewPaddingTop);
-
-    // Then we simulate the system applying a window inset.
-    WindowInsets windowInsets = mock(WindowInsets.class);
-    mockSystemWindowInsets(windowInsets, 100, 100, 100, 100);
-    mockSystemGestureInsetsIfNeed(windowInsets);
-
-    flutterView.onApplyWindowInsets(windowInsets);
-
-    verify(flutterRenderer, times(2)).setViewportMetrics(viewportMetricsCaptor.capture());
-    // Left padding is zero because the rotation is 270deg
-    // Top padding is removed due to full screen.
-    // Bottom padding is removed due to hide navigation.
-    validateViewportMetricPadding(viewportMetricsCaptor, 0, 0, 100, 0);
-  }
-
-  // This test uses the API 30+ Algorithm for window insets. The legacy algorithm is
-  // set to -1 values, so it is clear if the wrong algorithm is used.
-  @Test
-  @TargetApi(30)
-  @Config(sdk = 30, qualifiers = "land")
-  public void systemInsetGetInsetsFullscreen() {
-    FlutterView flutterView = spy(new FlutterView(ctx));
-    setExpectedDisplayRotation(Surface.ROTATION_270);
-    assertEquals(0, flutterView.getSystemUiVisibility());
-    when(flutterView.getWindowSystemUiVisibility())
-        .thenReturn(View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
-    when(flutterView.getContext()).thenReturn(ctx);
-
-    FlutterEngine flutterEngine = spy(new FlutterEngine(ctx, mockFlutterLoader, mockFlutterJni));
-    FlutterRenderer flutterRenderer = spy(new FlutterRenderer(mockFlutterJni));
-    when(flutterEngine.getRenderer()).thenReturn(flutterRenderer);
-
-    // When we attach a new FlutterView to the engine without any system insets,
-    // the viewport metrics default to 0.
-    flutterView.attachToFlutterEngine(flutterEngine);
-    ArgumentCaptor<FlutterRenderer.ViewportMetrics> viewportMetricsCaptor =
-        ArgumentCaptor.forClass(FlutterRenderer.ViewportMetrics.class);
-    verify(flutterRenderer).setViewportMetrics(viewportMetricsCaptor.capture());
-    assertEquals(0, viewportMetricsCaptor.getValue().viewPaddingTop);
-
-    Insets insets = Insets.of(10, 20, 30, 40);
-    // Then we simulate the system applying a window inset.
-    WindowInsets windowInsets = mock(WindowInsets.class);
-    mockSystemWindowInsets(windowInsets, -1, -1, -1, -1);
-    when(windowInsets.getInsets(anyInt())).thenReturn(insets);
-
-    flutterView.onApplyWindowInsets(windowInsets);
-
-    verify(flutterRenderer, times(2)).setViewportMetrics(viewportMetricsCaptor.capture());
-    validateViewportMetricPadding(viewportMetricsCaptor, 10, 20, 30, 40);
-  }
-
-  // This test uses the pre-API 30 Algorithm for window insets.
-  @Test
-  @TargetApi(28)
-  @Config(sdk = 28, qualifiers = "land")
-  public void systemInsetGetInsetsFullscreenLegacy() {
-    FlutterView flutterView = spy(new FlutterView(ctx));
-    setExpectedDisplayRotation(Surface.ROTATION_270);
-    assertEquals(0, flutterView.getSystemUiVisibility());
-    when(flutterView.getWindowSystemUiVisibility())
-        .thenReturn(View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
-    when(flutterView.getContext()).thenReturn(ctx);
-
-    FlutterEngine flutterEngine = spy(new FlutterEngine(ctx, mockFlutterLoader, mockFlutterJni));
-    FlutterRenderer flutterRenderer = spy(new FlutterRenderer(mockFlutterJni));
-    when(flutterEngine.getRenderer()).thenReturn(flutterRenderer);
-
-    // When we attach a new FlutterView to the engine without any system insets,
-    // the viewport metrics default to 0.
-    flutterView.attachToFlutterEngine(flutterEngine);
-    ArgumentCaptor<FlutterRenderer.ViewportMetrics> viewportMetricsCaptor =
-        ArgumentCaptor.forClass(FlutterRenderer.ViewportMetrics.class);
-    verify(flutterRenderer).setViewportMetrics(viewportMetricsCaptor.capture());
-    assertEquals(0, viewportMetricsCaptor.getValue().viewPaddingTop);
-
-    // Then we simulate the system applying a window inset.
-    WindowInsets windowInsets = mock(WindowInsets.class);
-    mockSystemWindowInsets(windowInsets, 102, 100, 103, 101);
-
-    flutterView.onApplyWindowInsets(windowInsets);
-
-    verify(flutterRenderer, times(2)).setViewportMetrics(viewportMetricsCaptor.capture());
-    // Left padding is zero because the rotation is 270deg
-    // Top padding is removed due to full screen.
-    // Bottom padding is removed due to hide navigation.
-    validateViewportMetricPadding(viewportMetricsCaptor, 0, 0, 103, 0);
-  }
-
-  // This test uses the API 30+ Algorithm for window insets. The legacy algorithm is
-  // set to -1 values, so it is clear if the wrong algorithm is used.
-  @Test
-  @TargetApi(30)
-  @Config(sdk = 30, qualifiers = "land")
-  public void systemInsetDisplayCutoutSimple() {
-    FlutterView flutterView = spy(new FlutterView(ctx));
-    assertEquals(0, flutterView.getSystemUiVisibility());
-    when(flutterView.getWindowSystemUiVisibility()).thenReturn(0);
-    when(flutterView.getContext()).thenReturn(ctx);
-
-    FlutterEngine flutterEngine = spy(new FlutterEngine(ctx, mockFlutterLoader, mockFlutterJni));
-    FlutterRenderer flutterRenderer = spy(new FlutterRenderer(mockFlutterJni));
-    when(flutterEngine.getRenderer()).thenReturn(flutterRenderer);
-
-    // When we attach a new FlutterView to the engine without any system insets,
-    // the viewport metrics default to 0.
-    flutterView.attachToFlutterEngine(flutterEngine);
-    ArgumentCaptor<FlutterRenderer.ViewportMetrics> viewportMetricsCaptor =
-        ArgumentCaptor.forClass(FlutterRenderer.ViewportMetrics.class);
-    verify(flutterRenderer).setViewportMetrics(viewportMetricsCaptor.capture());
-    assertEquals(0, viewportMetricsCaptor.getValue().viewPaddingTop);
-
-    Insets insets = Insets.of(100, 100, 100, 100);
-    Insets systemGestureInsets = Insets.of(110, 110, 110, 110);
-    // Then we simulate the system applying a window inset.
-    WindowInsets windowInsets = mock(WindowInsets.class);
-    DisplayCutout displayCutout = mock(DisplayCutout.class);
-    mockSystemWindowInsets(windowInsets, -1, -1, -1, -1);
-    when(windowInsets.getInsets(anyInt())).thenReturn(insets);
-    when(windowInsets.getSystemGestureInsets()).thenReturn(systemGestureInsets);
-    when(windowInsets.getDisplayCutout()).thenReturn(displayCutout);
-
-    Insets waterfallInsets = Insets.of(200, 0, 200, 0);
-    when(displayCutout.getWaterfallInsets()).thenReturn(waterfallInsets);
-    when(displayCutout.getSafeInsetTop()).thenReturn(150);
-    when(displayCutout.getSafeInsetBottom()).thenReturn(150);
-    when(displayCutout.getSafeInsetLeft()).thenReturn(150);
-    when(displayCutout.getSafeInsetRight()).thenReturn(150);
-
-    flutterView.onApplyWindowInsets(windowInsets);
-
-    verify(flutterRenderer, times(2)).setViewportMetrics(viewportMetricsCaptor.capture());
-    validateViewportMetricPadding(viewportMetricsCaptor, 200, 150, 200, 150);
-
-    assertEquals(100, viewportMetricsCaptor.getValue().viewInsetTop);
-  }
-
-  @Test
-  public void itRegistersAndUnregistersToWindowManager() {
-    Context context = Robolectric.setupActivity(Activity.class);
-    FlutterView flutterView = spy(new FlutterView(context));
-    ShadowDisplay display =
-        Shadows.shadowOf(
-            ((WindowManager) ctx.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay());
-    WindowInfoRepositoryCallbackAdapterWrapper windowInfoRepo =
-        mock(WindowInfoRepositoryCallbackAdapterWrapper.class);
-    // For reasoning behing using doReturn instead of when, read "Important gotcha" at
-    // https://www.javadoc.io/doc/org.mockito/mockito-core/1.10.19/org/mockito/Mockito.html#13
-    doReturn(windowInfoRepo).when(flutterView).createWindowInfoRepo();
-
-    // When a new FlutterView is attached to the window
-    flutterView.onAttachedToWindow();
-
-    // Then the WindowManager callback is registered
-    verify(windowInfoRepo, times(1)).addWindowLayoutInfoListener(any(), any(), any());
-
-    // When the FlutterView is detached from the window
-    flutterView.onDetachedFromWindow();
-
-    // Then the WindowManager callback is unregistered
-    verify(windowInfoRepo, times(1)).removeWindowLayoutInfoListener(any());
-  }
-
-  @Test
-  public void itSendsHingeDisplayFeatureToFlutter() {
-    Context context = Robolectric.setupActivity(Activity.class);
-    FlutterView flutterView = spy(new FlutterView(context));
-    ShadowDisplay display =
-        Shadows.shadowOf(
-            ((WindowManager) ctx.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay());
-    when(flutterView.getContext()).thenReturn(context);
-    WindowInfoRepositoryCallbackAdapterWrapper windowInfoRepo =
-        mock(WindowInfoRepositoryCallbackAdapterWrapper.class);
-    doReturn(windowInfoRepo).when(flutterView).createWindowInfoRepo();
-    FlutterEngine flutterEngine = spy(new FlutterEngine(ctx, mockFlutterLoader, mockFlutterJni));
-    FlutterRenderer flutterRenderer = spy(new FlutterRenderer(mockFlutterJni));
-    when(flutterEngine.getRenderer()).thenReturn(flutterRenderer);
-
-    FoldingFeature displayFeature = mock(FoldingFeature.class);
-    when(displayFeature.getBounds()).thenReturn(new Rect(0, 0, 100, 100));
-    when(displayFeature.getOcclusionType()).thenReturn(FoldingFeature.OcclusionType.FULL);
-    when(displayFeature.getState()).thenReturn(FoldingFeature.State.FLAT);
-
-    WindowLayoutInfo testWindowLayout = new WindowLayoutInfo(Arrays.asList(displayFeature));
-
-    // When FlutterView is attached to the engine and window, and a hinge display feature exists
-    flutterView.attachToFlutterEngine(flutterEngine);
-    ArgumentCaptor<FlutterRenderer.ViewportMetrics> viewportMetricsCaptor =
-        ArgumentCaptor.forClass(FlutterRenderer.ViewportMetrics.class);
-    verify(flutterRenderer).setViewportMetrics(viewportMetricsCaptor.capture());
-    assertEquals(Arrays.asList(), viewportMetricsCaptor.getValue().displayFeatures);
-    flutterView.onAttachedToWindow();
-    ArgumentCaptor<Consumer<WindowLayoutInfo>> wmConsumerCaptor =
-        ArgumentCaptor.forClass((Class) Consumer.class);
-    verify(windowInfoRepo).addWindowLayoutInfoListener(any(), any(), wmConsumerCaptor.capture());
-    Consumer<WindowLayoutInfo> wmConsumer = wmConsumerCaptor.getValue();
-    wmConsumer.accept(testWindowLayout);
-
-    // Then the Renderer receives the display feature
-    verify(flutterRenderer).setViewportMetrics(viewportMetricsCaptor.capture());
-    assertEquals(
-        FlutterRenderer.DisplayFeatureType.HINGE,
-        viewportMetricsCaptor.getValue().displayFeatures.get(0).type);
-    assertEquals(
-        FlutterRenderer.DisplayFeatureState.POSTURE_FLAT,
-        viewportMetricsCaptor.getValue().displayFeatures.get(0).state);
-    assertEquals(
-        new Rect(0, 0, 100, 100), viewportMetricsCaptor.getValue().displayFeatures.get(0).bounds);
-  }
-
-  @Test
-  public void flutterImageView_acquiresImageAndInvalidates() {
-    final ImageReader mockReader = mock(ImageReader.class);
-    when(mockReader.getMaxImages()).thenReturn(2);
-
-    final FlutterImageView imageView =
-        spy(new FlutterImageView(ctx, mockReader, FlutterImageView.SurfaceKind.background));
-
-    final FlutterJNI jni = mock(FlutterJNI.class);
-    imageView.attachToRenderer(new FlutterRenderer(jni));
-
-    final Image mockImage = mock(Image.class);
-    when(mockReader.acquireLatestImage()).thenReturn(mockImage);
-
-    assertTrue(imageView.acquireLatestImage());
-    verify(mockReader, times(1)).acquireLatestImage();
-    verify(imageView, times(1)).invalidate();
-  }
-
-  @Test
-  @SuppressLint("WrongCall") /*View#onDraw*/
-  public void flutterImageView_acquiresImageClosesPreviousImageUnlessNoNewImage() {
-    final ImageReader mockReader = mock(ImageReader.class);
-    when(mockReader.getMaxImages()).thenReturn(3);
-
-    final Image mockImage = mock(Image.class);
-    when(mockImage.getPlanes()).thenReturn(new Plane[0]);
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-      final HardwareBuffer mockHardwareBuffer = mock(HardwareBuffer.class);
-      when(mockHardwareBuffer.getUsage()).thenReturn(HardwareBuffer.USAGE_GPU_SAMPLED_IMAGE);
-      when(mockImage.getHardwareBuffer()).thenReturn(mockHardwareBuffer);
-    }
-    // Mock no latest image on the second time
-    when(mockReader.acquireLatestImage())
-        .thenReturn(mockImage)
-        .thenReturn(null)
-        .thenReturn(mockImage);
-
-    final FlutterImageView imageView =
-        spy(new FlutterImageView(ctx, mockReader, FlutterImageView.SurfaceKind.background));
-
-    final FlutterJNI jni = mock(FlutterJNI.class);
-    imageView.attachToRenderer(new FlutterRenderer(jni));
-    doNothing().when(imageView).invalidate();
-
-    assertTrue(imageView.acquireLatestImage()); // No previous, acquire latest image
-    assertFalse(
-        imageView.acquireLatestImage()); // Mock no image when acquire, don't close, and assertFalse
-    assertTrue(imageView.acquireLatestImage()); // Acquire latest image and close previous
-    assertTrue(imageView.acquireLatestImage()); // Acquire latest image and close previous
-    assertTrue(imageView.acquireLatestImage()); // Acquire latest image and close previous
-    verify(mockImage, times(3)).close(); // Close 3 times
-
-    imageView.onDraw(mock(Canvas.class)); // Draw latest image
-
-    assertTrue(imageView.acquireLatestImage()); // acquire latest image and close previous
-
-    imageView.onDraw(mock(Canvas.class)); // Draw latest image
-    imageView.onDraw(mock(Canvas.class)); // Draw latest image
-    imageView.onDraw(mock(Canvas.class)); // Draw latest image
-
-    verify(mockReader, times(6)).acquireLatestImage();
-  }
-
-  @Test
-  public void flutterImageView_detachFromRendererClosesPreviousImage() {
-    final ImageReader mockReader = mock(ImageReader.class);
-    when(mockReader.getMaxImages()).thenReturn(2);
-
-    final Image mockImage = mock(Image.class);
-    when(mockReader.acquireLatestImage()).thenReturn(mockImage);
-
-    final FlutterImageView imageView =
-        spy(new FlutterImageView(ctx, mockReader, FlutterImageView.SurfaceKind.background));
-
-    final FlutterJNI jni = mock(FlutterJNI.class);
-    imageView.attachToRenderer(new FlutterRenderer(jni));
-
-    doNothing().when(imageView).invalidate();
-    imageView.acquireLatestImage();
-    imageView.acquireLatestImage();
-    verify(mockImage, times(1)).close();
-
-    imageView.detachFromRenderer();
-    // There's an acquireLatestImage() in detachFromRenderer(),
-    // so it will be 2 times called close() inside detachFromRenderer()
-    verify(mockImage, times(3)).close();
-  }
-
-  @Test
-  public void flutterImageView_workaroundWithOnePixelWhenResizeWithZero() {
-    final ImageReader mockReader = mock(ImageReader.class);
-    when(mockReader.getMaxImages()).thenReturn(2);
-
-    final FlutterImageView imageView =
-        spy(new FlutterImageView(ctx, mockReader, FlutterImageView.SurfaceKind.background));
-
-    final FlutterJNI jni = mock(FlutterJNI.class);
-    imageView.attachToRenderer(new FlutterRenderer(jni));
-
-    final Image mockImage = mock(Image.class);
-    when(mockReader.acquireLatestImage()).thenReturn(mockImage);
-
-    final int incorrectWidth = 0;
-    final int incorrectHeight = -100;
-    imageView.resizeIfNeeded(incorrectWidth, incorrectHeight);
-    assertEquals(1, imageView.getImageReader().getWidth());
-    assertEquals(1, imageView.getImageReader().getHeight());
-  }
-
-  @Test
-  public void flutterImageView_closesReader() {
-    final ImageReader mockReader = mock(ImageReader.class);
-    when(mockReader.getMaxImages()).thenReturn(1);
-
-    final FlutterImageView imageView =
-        spy(new FlutterImageView(ctx, mockReader, FlutterImageView.SurfaceKind.background));
-
-    imageView.closeImageReader();
-    verify(mockReader, times(1)).close();
-  }
-
-  @Test
-  public void flutterSurfaceView_GathersTransparentRegion() {
-    final Region mockRegion = mock(Region.class);
-    final FlutterSurfaceView surfaceView = new FlutterSurfaceView(ctx);
-
-    surfaceView.setAlpha(0.0f);
-    assertFalse(surfaceView.gatherTransparentRegion(mockRegion));
-    verify(mockRegion, times(0)).op(anyInt(), anyInt(), anyInt(), anyInt(), any());
-
-    surfaceView.setAlpha(1.0f);
-    assertTrue(surfaceView.gatherTransparentRegion(mockRegion));
-    verify(mockRegion, times(1)).op(0, 0, 0, 0, Region.Op.DIFFERENCE);
-  }
-
-  @Test
-  @SuppressLint("PrivateApi")
-  @Config(sdk = Build.VERSION_CODES.P)
-  public void findViewByAccessibilityIdTraversal_returnsRootViewOnAndroid28() throws Exception {
-    FlutterView flutterView = new FlutterView(ctx);
-
-    Method getAccessibilityViewIdMethod = View.class.getDeclaredMethod("getAccessibilityViewId");
-    Integer accessibilityViewId = (Integer) getAccessibilityViewIdMethod.invoke(flutterView);
-
-    assertEquals(flutterView, flutterView.findViewByAccessibilityIdTraversal(accessibilityViewId));
-  }
-
-  @Test
-  @Config(sdk = Build.VERSION_CODES.P)
-  @SuppressLint("PrivateApi")
-  public void findViewByAccessibilityIdTraversal_returnsChildViewOnAndroid28() throws Exception {
-    FlutterView flutterView = new FlutterView(ctx);
-    FrameLayout childView1 = new FrameLayout(ctx);
-    flutterView.addView(childView1);
-
-    FrameLayout childView2 = new FrameLayout(ctx);
-    childView1.addView(childView2);
-
-    Method getAccessibilityViewIdMethod = View.class.getDeclaredMethod("getAccessibilityViewId");
-    Integer accessibilityViewId = (Integer) getAccessibilityViewIdMethod.invoke(childView2);
-
-    assertEquals(childView2, flutterView.findViewByAccessibilityIdTraversal(accessibilityViewId));
-  }
-
-  @Test
-  @Config(sdk = Build.VERSION_CODES.Q)
-  @SuppressLint("PrivateApi")
-  public void findViewByAccessibilityIdTraversal_returnsRootViewOnAndroid29() throws Exception {
-    FlutterView flutterView = new FlutterView(ctx);
-
-    Method getAccessibilityViewIdMethod = View.class.getDeclaredMethod("getAccessibilityViewId");
-    Integer accessibilityViewId = (Integer) getAccessibilityViewIdMethod.invoke(flutterView);
-
-    assertEquals(null, flutterView.findViewByAccessibilityIdTraversal(accessibilityViewId));
-  }
-
-  @Test
-  public void flutterSplashView_itDoesNotCrashOnRestoreInstanceState() {
-    final FlutterSplashView splashView = new FlutterSplashView(ctx);
-    splashView.onRestoreInstanceState(View.BaseSavedState.EMPTY_STATE);
-    // It should not crash and "splashScreenState" should be null.
-    assertEquals(null, splashView.splashScreenState);
-  }
-
-  public void ViewportMetrics_initializedPhysicalTouchSlop() {
-    FlutterView flutterView = new FlutterView(ctx);
-    FlutterEngine flutterEngine = spy(new FlutterEngine(ctx, mockFlutterLoader, mockFlutterJni));
-    FlutterRenderer flutterRenderer = spy(new FlutterRenderer(mockFlutterJni));
-    when(flutterEngine.getRenderer()).thenReturn(flutterRenderer);
-
-    flutterView.attachToFlutterEngine(flutterEngine);
-    ArgumentCaptor<FlutterRenderer.ViewportMetrics> viewportMetricsCaptor =
-        ArgumentCaptor.forClass(FlutterRenderer.ViewportMetrics.class);
-    verify(flutterRenderer).setViewportMetrics(viewportMetricsCaptor.capture());
-
-    assertFalse(-1 == viewportMetricsCaptor.getValue().physicalTouchSlop);
-  }
-
-  private void setExpectedDisplayRotation(int rotation) {
-    ShadowDisplay display =
-        Shadows.shadowOf(
-            ((WindowManager) ctx.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay());
-    display.setRotation(rotation);
-  }
-
-  private void validateViewportMetricPadding(
-      ArgumentCaptor<FlutterRenderer.ViewportMetrics> viewportMetricsCaptor,
-      int left,
-      int top,
-      int right,
-      int bottom) {
-    assertEquals(left, viewportMetricsCaptor.getValue().viewPaddingLeft);
-    assertEquals(top, viewportMetricsCaptor.getValue().viewPaddingTop);
-    assertEquals(right, viewportMetricsCaptor.getValue().viewPaddingRight);
-    assertEquals(bottom, viewportMetricsCaptor.getValue().viewPaddingBottom);
-  }
-
-  private void mockSystemWindowInsets(
-      WindowInsets windowInsets, int left, int top, int right, int bottom) {
-    when(windowInsets.getSystemWindowInsetLeft()).thenReturn(left);
-    when(windowInsets.getSystemWindowInsetTop()).thenReturn(top);
-    when(windowInsets.getSystemWindowInsetRight()).thenReturn(right);
-    when(windowInsets.getSystemWindowInsetBottom()).thenReturn(bottom);
-  }
-
-  private void mockSystemGestureInsetsIfNeed(WindowInsets windowInsets) {
-    if (Build.VERSION.SDK_INT == Build.VERSION_CODES.Q) {
-      when(windowInsets.getSystemGestureInsets()).thenReturn(Insets.NONE);
-    }
-  }
-
-  /*
-   * A custom shadow that reports fullscreen flag for system UI visibility
-   */
-  @Implements(View.class)
-  public static class ShadowFullscreenView {
-    @Implementation
-    public int getWindowSystemUiVisibility() {
-      return View.SYSTEM_UI_FLAG_FULLSCREEN;
-    }
-  }
-
-  // ViewGroup is the first shadow in the type hierarchy for FlutterView. Shadows need to mimic
-  // production classes' view hierarchy.
-  @Implements(ViewGroup.class)
-  public static class ShadowFullscreenViewGroup extends ShadowFullscreenView {}
-}
diff --git a/shell/platform/android/test/io/flutter/embedding/android/KeyChannelResponderTest.java b/shell/platform/android/test/io/flutter/embedding/android/KeyChannelResponderTest.java
index 80379a21343b277ae6008716b83dc7ad96d6f97a..3528eb48f305040340f0163df3fdc16eb9d79ee2 100644
--- a/shell/platform/android/test/io/flutter/embedding/android/KeyChannelResponderTest.java
+++ b/shell/platform/android/test/io/flutter/embedding/android/KeyChannelResponderTest.java
@@ -1,5 +1,6 @@
 package io.flutter.embedding.android;
 
+import static io.flutter.Build.API_LEVELS;
 import static junit.framework.TestCase.assertEquals;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.doAnswer;
@@ -19,7 +20,7 @@ import org.robolectric.annotation.Config;
 
 @Config(manifest = Config.NONE)
 @RunWith(AndroidJUnit4.class)
-@TargetApi(28)
+@TargetApi(API_LEVELS.API_28)
 public class KeyChannelResponderTest {
 
   @Mock KeyEventChannel keyEventChannel;
diff --git a/shell/platform/android/test/io/flutter/embedding/android/KeyboardManagerTest.java b/shell/platform/android/test/io/flutter/embedding/android/KeyboardManagerTest.java
index 799ae861b235257a0c4dec249d4fd0265f4127ec..8cf0c7e4629ab72084831cfe21094e0795550cf0 100644
--- a/shell/platform/android/test/io/flutter/embedding/android/KeyboardManagerTest.java
+++ b/shell/platform/android/test/io/flutter/embedding/android/KeyboardManagerTest.java
@@ -19,16 +19,17 @@ import android.view.KeyEvent;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+import io.flutter.embedding.android.KeyData.DeviceType;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.JSONMessageCodec;
 import io.flutter.util.FakeKeyEvent;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
-import junit.framework.Assert;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.Before;
@@ -315,12 +316,14 @@ public class KeyboardManagerTest {
       long physicalKey,
       long logicalKey,
       String character,
-      boolean synthesized) {
+      boolean synthesized,
+      DeviceType deviceType) {
     assertEquals(type, data.type);
     assertEquals(physicalKey, data.physicalKey);
     assertEquals(logicalKey, data.logicalKey);
     assertEquals(character, data.character);
     assertEquals(synthesized, data.synthesized);
+    assertEquals(deviceType, data.deviceType);
   }
 
   static void verifyEmbedderEvents(List<CallRecord> receivedCalls, KeyData[] expectedData) {
@@ -333,7 +336,8 @@ public class KeyboardManagerTest {
           data.physicalKey,
           data.logicalKey,
           data.character,
-          data.synthesized);
+          data.synthesized,
+          data.deviceType);
     }
   }
 
@@ -342,7 +346,8 @@ public class KeyboardManagerTest {
       long physicalKey,
       long logicalKey,
       @Nullable String characters,
-      boolean synthesized) {
+      boolean synthesized,
+      DeviceType deviceType) {
     final KeyData result = new KeyData();
     result.physicalKey = physicalKey;
     result.logicalKey = logicalKey;
@@ -350,6 +355,7 @@ public class KeyboardManagerTest {
     result.type = type;
     result.character = characters;
     result.synthesized = synthesized;
+    result.deviceType = deviceType;
     return result;
   }
 
@@ -405,6 +411,7 @@ public class KeyboardManagerTest {
     data.physicalKey = isLeft ? PHYSICAL_SHIFT_LEFT : PHYSICAL_SHIFT_RIGHT;
     data.logicalKey = isLeft ? LOGICAL_SHIFT_LEFT : LOGICAL_SHIFT_RIGHT;
     data.synthesized = isSynthesized;
+    data.deviceType = KeyData.DeviceType.kKeyboard;
     return data;
   }
 
@@ -439,6 +446,7 @@ public class KeyboardManagerTest {
     data1.type = Type.kRepeat;
     data1.character = "A";
     data1.synthesized = true;
+    data1.deviceType = DeviceType.kKeyboard;
 
     final ByteBuffer data1Buffer = data1.toBytes();
 
@@ -450,10 +458,11 @@ public class KeyboardManagerTest {
             + "0a00000000000000"
             + "0b00000000000000"
             + "0100000000000000"
+            + "0000000000000000"
             + "41",
         printBufferBytes(data1Buffer));
     // `position` is considered as the message size.
-    assertEquals(49, data1Buffer.position());
+    assertEquals(57, data1Buffer.position());
 
     data1Buffer.rewind();
     final KeyData data1Loaded = new KeyData(data1Buffer);
@@ -467,6 +476,7 @@ public class KeyboardManagerTest {
     data2.type = Type.kUp;
     data2.character = null;
     data2.synthesized = false;
+    data2.deviceType = DeviceType.kDirectionalPad;
 
     final ByteBuffer data2Buffer = data2.toBytes();
 
@@ -477,7 +487,8 @@ public class KeyboardManagerTest {
             + "0100000000000000"
             + "ccccbbbbaaaa0000"
             + "8888777766660000"
-            + "0000000000000000",
+            + "0000000000000000"
+            + "0100000000000000",
         printBufferBytes(data2Buffer));
 
     data2Buffer.rewind();
@@ -488,25 +499,25 @@ public class KeyboardManagerTest {
   @Test
   public void basicCombingCharactersTest() {
     final KeyboardManager.CharacterCombiner combiner = new KeyboardManager.CharacterCombiner();
-    Assert.assertEquals(0, (int) combiner.applyCombiningCharacterToBaseCharacter(0));
-    Assert.assertEquals('A', (int) combiner.applyCombiningCharacterToBaseCharacter('A'));
-    Assert.assertEquals('B', (int) combiner.applyCombiningCharacterToBaseCharacter('B'));
-    Assert.assertEquals('B', (int) combiner.applyCombiningCharacterToBaseCharacter('B'));
-    Assert.assertEquals(0, (int) combiner.applyCombiningCharacterToBaseCharacter(0));
-    Assert.assertEquals(0, (int) combiner.applyCombiningCharacterToBaseCharacter(0));
-
-    Assert.assertEquals('`', (int) combiner.applyCombiningCharacterToBaseCharacter(DEAD_KEY));
-    Assert.assertEquals('`', (int) combiner.applyCombiningCharacterToBaseCharacter(DEAD_KEY));
-    Assert.assertEquals('À', (int) combiner.applyCombiningCharacterToBaseCharacter('A'));
-
-    Assert.assertEquals('`', (int) combiner.applyCombiningCharacterToBaseCharacter(DEAD_KEY));
-    Assert.assertEquals(0, (int) combiner.applyCombiningCharacterToBaseCharacter(0));
+    assertEquals(0, (int) combiner.applyCombiningCharacterToBaseCharacter(0));
+    assertEquals('B', (int) combiner.applyCombiningCharacterToBaseCharacter('B'));
+    assertEquals('B', (int) combiner.applyCombiningCharacterToBaseCharacter('B'));
+    assertEquals('A', (int) combiner.applyCombiningCharacterToBaseCharacter('A'));
+    assertEquals(0, (int) combiner.applyCombiningCharacterToBaseCharacter(0));
+    assertEquals(0, (int) combiner.applyCombiningCharacterToBaseCharacter(0));
+
+    assertEquals('`', (int) combiner.applyCombiningCharacterToBaseCharacter(DEAD_KEY));
+    assertEquals('`', (int) combiner.applyCombiningCharacterToBaseCharacter(DEAD_KEY));
+    assertEquals('À', (int) combiner.applyCombiningCharacterToBaseCharacter('A'));
+
+    assertEquals('`', (int) combiner.applyCombiningCharacterToBaseCharacter(DEAD_KEY));
+    assertEquals(0, (int) combiner.applyCombiningCharacterToBaseCharacter(0));
     // The 0 input should remove the combining state.
-    Assert.assertEquals('A', (int) combiner.applyCombiningCharacterToBaseCharacter('A'));
+    assertEquals('A', (int) combiner.applyCombiningCharacterToBaseCharacter('A'));
 
-    Assert.assertEquals(0, (int) combiner.applyCombiningCharacterToBaseCharacter(0));
-    Assert.assertEquals('`', (int) combiner.applyCombiningCharacterToBaseCharacter(DEAD_KEY));
-    Assert.assertEquals('À', (int) combiner.applyCombiningCharacterToBaseCharacter('A'));
+    assertEquals(0, (int) combiner.applyCombiningCharacterToBaseCharacter(0));
+    assertEquals('`', (int) combiner.applyCombiningCharacterToBaseCharacter(DEAD_KEY));
+    assertEquals('À', (int) combiner.applyCombiningCharacterToBaseCharacter('A'));
   }
 
   @Test
@@ -530,7 +541,7 @@ public class KeyboardManagerTest {
   }
 
   @Test
-  public void channelReponderHandlesEvents() {
+  public void channelResponderHandlesEvents() {
     final KeyboardTester tester = new KeyboardTester();
     final KeyEvent keyEvent = new FakeKeyEvent(ACTION_DOWN, 65);
     final ArrayList<CallRecord> calls = new ArrayList<>();
@@ -556,7 +567,7 @@ public class KeyboardManagerTest {
   }
 
   @Test
-  public void embedderReponderHandlesEvents() {
+  public void embedderResponderHandlesEvents() {
     final KeyboardTester tester = new KeyboardTester();
     final KeyEvent keyEvent = new FakeKeyEvent(ACTION_DOWN, SCAN_KEY_A, KEYCODE_A, 0, 'a', 0);
     final ArrayList<CallRecord> calls = new ArrayList<>();
@@ -568,7 +579,13 @@ public class KeyboardManagerTest {
     assertEquals(true, result);
     assertEquals(calls.size(), 1);
     assertEmbedderEventEquals(
-        calls.get(0).keyData, Type.kDown, PHYSICAL_KEY_A, LOGICAL_KEY_A, "a", false);
+        calls.get(0).keyData,
+        Type.kDown,
+        PHYSICAL_KEY_A,
+        LOGICAL_KEY_A,
+        "a",
+        false,
+        DeviceType.kKeyboard);
 
     // Don't send the key event to the text plugin if the only primary responder
     // hasn't responded.
@@ -582,6 +599,38 @@ public class KeyboardManagerTest {
     verify(tester.mockView, times(0)).redispatch(any(KeyEvent.class));
   }
 
+  @Test
+  public void embedderResponderHandlesNullReply() {
+    // Regression test for https://github.com/flutter/flutter/issues/141662.
+    final BinaryMessenger mockMessenger = mock(BinaryMessenger.class);
+    doAnswer(
+            invocation -> {
+              final BinaryMessenger.BinaryReply reply = invocation.getArgument(2);
+              // Simulate a null reply.
+              // In release mode, a null reply might happen when the engine sends a message
+              // before the framework has started.
+              reply.reply(null);
+              return null;
+            })
+        .when(mockMessenger)
+        .send(any(String.class), any(ByteBuffer.class), any(BinaryMessenger.BinaryReply.class));
+
+    final KeyboardManager.ViewDelegate mockView = mock(KeyboardManager.ViewDelegate.class);
+    doAnswer(invocation -> mockMessenger).when(mockView).getBinaryMessenger();
+
+    final KeyboardManager keyboardManager = new KeyboardManager(mockView);
+    final KeyEvent keyEvent = new FakeKeyEvent(ACTION_DOWN, SCAN_KEY_A, KEYCODE_A, 0, 'a', 0);
+
+    boolean exceptionThrown = false;
+    try {
+      final boolean result = keyboardManager.handleEvent(keyEvent);
+    } catch (Exception exception) {
+      exceptionThrown = true;
+    }
+
+    assertEquals(false, exceptionThrown);
+  }
+
   @Test
   public void bothRespondersHandlesEvents() {
     final KeyboardTester tester = new KeyboardTester();
@@ -598,7 +647,13 @@ public class KeyboardManagerTest {
     assertEquals(true, result);
     assertEquals(calls.size(), 2);
     assertEmbedderEventEquals(
-        calls.get(0).keyData, Type.kDown, PHYSICAL_KEY_A, LOGICAL_KEY_A, "a", false);
+        calls.get(0).keyData,
+        Type.kDown,
+        PHYSICAL_KEY_A,
+        LOGICAL_KEY_A,
+        "a",
+        false,
+        DeviceType.kKeyboard);
     assertChannelEventEquals(calls.get(1).channelObject, "keydown", KEYCODE_A);
 
     verify(tester.mockView, times(0)).onTextInputKeyEvent(any(KeyEvent.class));
@@ -716,7 +771,7 @@ public class KeyboardManagerTest {
     verifyEmbedderEvents(
         calls,
         new KeyData[] {
-          buildKeyData(Type.kDown, PHYSICAL_KEY_A, LOGICAL_KEY_A, "a", false),
+          buildKeyData(Type.kDown, PHYSICAL_KEY_A, LOGICAL_KEY_A, "a", false, DeviceType.kKeyboard),
         });
     calls.clear();
 
@@ -727,7 +782,8 @@ public class KeyboardManagerTest {
     verifyEmbedderEvents(
         calls,
         new KeyData[] {
-          buildKeyData(Type.kRepeat, PHYSICAL_KEY_A, LOGICAL_KEY_A, "a", false),
+          buildKeyData(
+              Type.kRepeat, PHYSICAL_KEY_A, LOGICAL_KEY_A, "a", false, DeviceType.kKeyboard),
         });
     calls.clear();
 
@@ -738,7 +794,7 @@ public class KeyboardManagerTest {
     verifyEmbedderEvents(
         calls,
         new KeyData[] {
-          buildKeyData(Type.kUp, PHYSICAL_KEY_A, LOGICAL_KEY_A, null, false),
+          buildKeyData(Type.kUp, PHYSICAL_KEY_A, LOGICAL_KEY_A, null, false, DeviceType.kKeyboard),
         });
     calls.clear();
   }
@@ -759,7 +815,13 @@ public class KeyboardManagerTest {
     verifyEmbedderEvents(
         calls,
         new KeyData[] {
-          buildKeyData(Type.kDown, PHYSICAL_SHIFT_LEFT, LOGICAL_SHIFT_LEFT, null, false),
+          buildKeyData(
+              Type.kDown,
+              PHYSICAL_SHIFT_LEFT,
+              LOGICAL_SHIFT_LEFT,
+              null,
+              false,
+              DeviceType.kKeyboard),
         });
     calls.clear();
 
@@ -770,7 +832,7 @@ public class KeyboardManagerTest {
     verifyEmbedderEvents(
         calls,
         new KeyData[] {
-          buildKeyData(Type.kDown, PHYSICAL_KEY_A, LOGICAL_KEY_A, "A", false),
+          buildKeyData(Type.kDown, PHYSICAL_KEY_A, LOGICAL_KEY_A, "A", false, DeviceType.kKeyboard),
         });
     calls.clear();
 
@@ -781,7 +843,7 @@ public class KeyboardManagerTest {
     verifyEmbedderEvents(
         calls,
         new KeyData[] {
-          buildKeyData(Type.kUp, PHYSICAL_KEY_A, LOGICAL_KEY_A, null, false),
+          buildKeyData(Type.kUp, PHYSICAL_KEY_A, LOGICAL_KEY_A, null, false, DeviceType.kKeyboard),
         });
     calls.clear();
 
@@ -793,7 +855,8 @@ public class KeyboardManagerTest {
     verifyEmbedderEvents(
         calls,
         new KeyData[] {
-          buildKeyData(Type.kUp, PHYSICAL_SHIFT_LEFT, LOGICAL_SHIFT_LEFT, null, false),
+          buildKeyData(
+              Type.kUp, PHYSICAL_SHIFT_LEFT, LOGICAL_SHIFT_LEFT, null, false, DeviceType.kKeyboard),
         });
     calls.clear();
   }
@@ -814,7 +877,7 @@ public class KeyboardManagerTest {
     verifyEmbedderEvents(
         calls,
         new KeyData[] {
-          buildKeyData(Type.kDown, 0x1100000042L, LOGICAL_ENTER, "\n", false),
+          buildKeyData(Type.kDown, 0x1100000042L, LOGICAL_ENTER, "\n", false, DeviceType.kKeyboard),
         });
     calls.clear();
 
@@ -824,7 +887,7 @@ public class KeyboardManagerTest {
     verifyEmbedderEvents(
         calls,
         new KeyData[] {
-          buildKeyData(Type.kDown, 0, 0, null, true),
+          buildKeyData(Type.kDown, 0, 0, null, true, DeviceType.kKeyboard),
         });
     calls.clear();
 
@@ -836,7 +899,7 @@ public class KeyboardManagerTest {
     verifyEmbedderEvents(
         calls,
         new KeyData[] {
-          buildKeyData(Type.kDown, 0x11DEADBEEFL, 0x1100000000L, null, false),
+          buildKeyData(Type.kDown, 0x11DEADBEEFL, 0x1100000000L, null, false, DeviceType.kKeyboard),
         });
     calls.clear();
 
@@ -848,7 +911,8 @@ public class KeyboardManagerTest {
     verifyEmbedderEvents(
         calls,
         new KeyData[] {
-          buildKeyData(Type.kDown, PHYSICAL_ARROW_LEFT, 0x1100000000L, null, false),
+          buildKeyData(
+              Type.kDown, PHYSICAL_ARROW_LEFT, 0x1100000000L, null, false, DeviceType.kKeyboard),
         });
     calls.clear();
 
@@ -860,7 +924,8 @@ public class KeyboardManagerTest {
     verifyEmbedderEvents(
         calls,
         new KeyData[] {
-          buildKeyData(Type.kDown, PHYSICAL_ARROW_RIGHT, 0x11DEADBEEFL, null, false),
+          buildKeyData(
+              Type.kDown, PHYSICAL_ARROW_RIGHT, 0x11DEADBEEFL, null, false, DeviceType.kKeyboard),
         });
     calls.clear();
   }
@@ -880,7 +945,7 @@ public class KeyboardManagerTest {
     verifyEmbedderEvents(
         calls,
         new KeyData[] {
-          buildKeyData(Type.kDown, PHYSICAL_KEY_A, LOGICAL_KEY_A, "a", false),
+          buildKeyData(Type.kDown, PHYSICAL_KEY_A, LOGICAL_KEY_A, "a", false, DeviceType.kKeyboard),
         });
     calls.clear();
 
@@ -890,9 +955,21 @@ public class KeyboardManagerTest {
             new FakeKeyEvent(ACTION_DOWN, SCAN_KEY_A, KEYCODE_A, 0, 'a', 0)));
     assertEquals(calls.size(), 2);
     assertEmbedderEventEquals(
-        calls.get(0).keyData, Type.kUp, PHYSICAL_KEY_A, LOGICAL_KEY_A, null, true);
+        calls.get(0).keyData,
+        Type.kUp,
+        PHYSICAL_KEY_A,
+        LOGICAL_KEY_A,
+        null,
+        true,
+        DeviceType.kKeyboard);
     assertEmbedderEventEquals(
-        calls.get(1).keyData, Type.kDown, PHYSICAL_KEY_A, LOGICAL_KEY_A, "a", false);
+        calls.get(1).keyData,
+        Type.kDown,
+        PHYSICAL_KEY_A,
+        LOGICAL_KEY_A,
+        "a",
+        false,
+        DeviceType.kKeyboard);
     calls.clear();
   }
 
@@ -911,7 +988,7 @@ public class KeyboardManagerTest {
     verifyEmbedderEvents(
         calls,
         new KeyData[] {
-          buildKeyData(Type.kDown, 0l, 0l, null, true),
+          buildKeyData(Type.kDown, 0l, 0l, null, true, DeviceType.kKeyboard),
         });
     calls.clear();
   }
@@ -930,7 +1007,13 @@ public class KeyboardManagerTest {
     verifyEmbedderEvents(
         calls,
         new KeyData[] {
-          buildKeyData(Type.kDown, PHYSICAL_SHIFT_LEFT, LOGICAL_SHIFT_LEFT, null, false),
+          buildKeyData(
+              Type.kDown,
+              PHYSICAL_SHIFT_LEFT,
+              LOGICAL_SHIFT_LEFT,
+              null,
+              false,
+              DeviceType.kKeyboard),
         });
     calls.clear();
 
@@ -939,7 +1022,8 @@ public class KeyboardManagerTest {
     verifyEmbedderEvents(
         calls,
         new KeyData[] {
-          buildKeyData(Type.kUp, PHYSICAL_SHIFT_LEFT, LOGICAL_SHIFT_LEFT, null, false),
+          buildKeyData(
+              Type.kUp, PHYSICAL_SHIFT_LEFT, LOGICAL_SHIFT_LEFT, null, false, DeviceType.kKeyboard),
         });
     calls.clear();
 
@@ -949,7 +1033,13 @@ public class KeyboardManagerTest {
     verifyEmbedderEvents(
         calls,
         new KeyData[] {
-          buildKeyData(Type.kDown, PHYSICAL_SHIFT_RIGHT, LOGICAL_SHIFT_RIGHT, null, false),
+          buildKeyData(
+              Type.kDown,
+              PHYSICAL_SHIFT_RIGHT,
+              LOGICAL_SHIFT_RIGHT,
+              null,
+              false,
+              DeviceType.kKeyboard),
         });
     calls.clear();
 
@@ -958,7 +1048,13 @@ public class KeyboardManagerTest {
     verifyEmbedderEvents(
         calls,
         new KeyData[] {
-          buildKeyData(Type.kUp, PHYSICAL_SHIFT_RIGHT, LOGICAL_SHIFT_RIGHT, null, false),
+          buildKeyData(
+              Type.kUp,
+              PHYSICAL_SHIFT_RIGHT,
+              LOGICAL_SHIFT_RIGHT,
+              null,
+              false,
+              DeviceType.kKeyboard),
         });
     calls.clear();
 
@@ -968,7 +1064,13 @@ public class KeyboardManagerTest {
     verifyEmbedderEvents(
         calls,
         new KeyData[] {
-          buildKeyData(Type.kDown, PHYSICAL_CONTROL_LEFT, LOGICAL_CONTROL_LEFT, null, false),
+          buildKeyData(
+              Type.kDown,
+              PHYSICAL_CONTROL_LEFT,
+              LOGICAL_CONTROL_LEFT,
+              null,
+              false,
+              DeviceType.kKeyboard),
         });
     calls.clear();
 
@@ -977,7 +1079,13 @@ public class KeyboardManagerTest {
     verifyEmbedderEvents(
         calls,
         new KeyData[] {
-          buildKeyData(Type.kUp, PHYSICAL_CONTROL_LEFT, LOGICAL_CONTROL_LEFT, null, false),
+          buildKeyData(
+              Type.kUp,
+              PHYSICAL_CONTROL_LEFT,
+              LOGICAL_CONTROL_LEFT,
+              null,
+              false,
+              DeviceType.kKeyboard),
         });
     calls.clear();
 
@@ -987,7 +1095,13 @@ public class KeyboardManagerTest {
     verifyEmbedderEvents(
         calls,
         new KeyData[] {
-          buildKeyData(Type.kDown, PHYSICAL_CONTROL_RIGHT, LOGICAL_CONTROL_RIGHT, null, false),
+          buildKeyData(
+              Type.kDown,
+              PHYSICAL_CONTROL_RIGHT,
+              LOGICAL_CONTROL_RIGHT,
+              null,
+              false,
+              DeviceType.kKeyboard),
         });
     calls.clear();
 
@@ -996,7 +1110,13 @@ public class KeyboardManagerTest {
     verifyEmbedderEvents(
         calls,
         new KeyData[] {
-          buildKeyData(Type.kUp, PHYSICAL_CONTROL_RIGHT, LOGICAL_CONTROL_RIGHT, null, false),
+          buildKeyData(
+              Type.kUp,
+              PHYSICAL_CONTROL_RIGHT,
+              LOGICAL_CONTROL_RIGHT,
+              null,
+              false,
+              DeviceType.kKeyboard),
         });
     calls.clear();
 
@@ -1006,7 +1126,8 @@ public class KeyboardManagerTest {
     verifyEmbedderEvents(
         calls,
         new KeyData[] {
-          buildKeyData(Type.kDown, PHYSICAL_ALT_LEFT, LOGICAL_ALT_LEFT, null, false),
+          buildKeyData(
+              Type.kDown, PHYSICAL_ALT_LEFT, LOGICAL_ALT_LEFT, null, false, DeviceType.kKeyboard),
         });
     calls.clear();
 
@@ -1015,7 +1136,8 @@ public class KeyboardManagerTest {
     verifyEmbedderEvents(
         calls,
         new KeyData[] {
-          buildKeyData(Type.kUp, PHYSICAL_ALT_LEFT, LOGICAL_ALT_LEFT, null, false),
+          buildKeyData(
+              Type.kUp, PHYSICAL_ALT_LEFT, LOGICAL_ALT_LEFT, null, false, DeviceType.kKeyboard),
         });
     calls.clear();
 
@@ -1025,7 +1147,8 @@ public class KeyboardManagerTest {
     verifyEmbedderEvents(
         calls,
         new KeyData[] {
-          buildKeyData(Type.kDown, PHYSICAL_ALT_RIGHT, LOGICAL_ALT_RIGHT, null, false),
+          buildKeyData(
+              Type.kDown, PHYSICAL_ALT_RIGHT, LOGICAL_ALT_RIGHT, null, false, DeviceType.kKeyboard),
         });
     calls.clear();
 
@@ -1034,7 +1157,8 @@ public class KeyboardManagerTest {
     verifyEmbedderEvents(
         calls,
         new KeyData[] {
-          buildKeyData(Type.kUp, PHYSICAL_ALT_RIGHT, LOGICAL_ALT_RIGHT, null, false),
+          buildKeyData(
+              Type.kUp, PHYSICAL_ALT_RIGHT, LOGICAL_ALT_RIGHT, null, false, DeviceType.kKeyboard),
         });
     calls.clear();
   }
@@ -1053,7 +1177,8 @@ public class KeyboardManagerTest {
     verifyEmbedderEvents(
         calls,
         new KeyData[] {
-          buildKeyData(Type.kDown, PHYSICAL_DIGIT1, LOGICAL_DIGIT1, "1", false),
+          buildKeyData(
+              Type.kDown, PHYSICAL_DIGIT1, LOGICAL_DIGIT1, "1", false, DeviceType.kKeyboard),
         });
     calls.clear();
 
@@ -1062,7 +1187,8 @@ public class KeyboardManagerTest {
     verifyEmbedderEvents(
         calls,
         new KeyData[] {
-          buildKeyData(Type.kUp, PHYSICAL_DIGIT1, LOGICAL_DIGIT1, null, false),
+          buildKeyData(
+              Type.kUp, PHYSICAL_DIGIT1, LOGICAL_DIGIT1, null, false, DeviceType.kKeyboard),
         });
     calls.clear();
 
@@ -1076,7 +1202,8 @@ public class KeyboardManagerTest {
     verifyEmbedderEvents(
         calls,
         new KeyData[] {
-          buildKeyData(Type.kDown, PHYSICAL_DIGIT1, LOGICAL_DIGIT1, "&", false),
+          buildKeyData(
+              Type.kDown, PHYSICAL_DIGIT1, LOGICAL_DIGIT1, "&", false, DeviceType.kKeyboard),
         });
     calls.clear();
 
@@ -1085,7 +1212,8 @@ public class KeyboardManagerTest {
     verifyEmbedderEvents(
         calls,
         new KeyData[] {
-          buildKeyData(Type.kUp, PHYSICAL_DIGIT1, LOGICAL_DIGIT1, null, false),
+          buildKeyData(
+              Type.kUp, PHYSICAL_DIGIT1, LOGICAL_DIGIT1, null, false, DeviceType.kKeyboard),
         });
     calls.clear();
 
@@ -1099,7 +1227,7 @@ public class KeyboardManagerTest {
     verifyEmbedderEvents(
         calls,
         new KeyData[] {
-          buildKeyData(Type.kDown, PHYSICAL_KEY_A, LOGICAL_KEY_A, "ф", false),
+          buildKeyData(Type.kDown, PHYSICAL_KEY_A, LOGICAL_KEY_A, "ф", false, DeviceType.kKeyboard),
         });
     calls.clear();
 
@@ -1108,7 +1236,7 @@ public class KeyboardManagerTest {
     verifyEmbedderEvents(
         calls,
         new KeyData[] {
-          buildKeyData(Type.kUp, PHYSICAL_KEY_A, LOGICAL_KEY_A, null, false),
+          buildKeyData(Type.kUp, PHYSICAL_KEY_A, LOGICAL_KEY_A, null, false, DeviceType.kKeyboard),
         });
     calls.clear();
   }
@@ -1131,7 +1259,13 @@ public class KeyboardManagerTest {
                 ACTION_DOWN, SCAN_ARROW_LEFT, KEYCODE_DPAD_LEFT, 0, '\0', SHIFT_LEFT_ON)));
     assertEquals(calls.size(), 2);
     assertEmbedderEventEquals(
-        calls.get(0).keyData, Type.kDown, PHYSICAL_SHIFT_LEFT, LOGICAL_SHIFT_LEFT, null, true);
+        calls.get(0).keyData,
+        Type.kDown,
+        PHYSICAL_SHIFT_LEFT,
+        LOGICAL_SHIFT_LEFT,
+        null,
+        true,
+        DeviceType.kKeyboard);
     calls.clear();
 
     assertEquals(
@@ -1140,7 +1274,13 @@ public class KeyboardManagerTest {
             new FakeKeyEvent(ACTION_UP, SCAN_ARROW_LEFT, KEYCODE_DPAD_LEFT, 0, '\0', 0)));
     assertEquals(calls.size(), 2);
     assertEmbedderEventEquals(
-        calls.get(0).keyData, Type.kUp, PHYSICAL_SHIFT_LEFT, LOGICAL_SHIFT_LEFT, null, true);
+        calls.get(0).keyData,
+        Type.kUp,
+        PHYSICAL_SHIFT_LEFT,
+        LOGICAL_SHIFT_LEFT,
+        null,
+        true,
+        DeviceType.kKeyboard);
     calls.clear();
   }
 
@@ -1165,7 +1305,13 @@ public class KeyboardManagerTest {
                 ACTION_DOWN, SCAN_SHIFT_LEFT, KEYCODE_SHIFT_LEFT, 1, '\0', SHIFT_LEFT_ON)));
     assertEquals(calls.size(), 1);
     assertEmbedderEventEquals(
-        calls.get(0).keyData, Type.kDown, PHYSICAL_SHIFT_LEFT, LOGICAL_SHIFT_LEFT, null, false);
+        calls.get(0).keyData,
+        Type.kDown,
+        PHYSICAL_SHIFT_LEFT,
+        LOGICAL_SHIFT_LEFT,
+        null,
+        false,
+        DeviceType.kKeyboard);
     calls.clear();
 
     // Down event when the current state is 1.
@@ -1176,9 +1322,21 @@ public class KeyboardManagerTest {
                 ACTION_DOWN, SCAN_SHIFT_LEFT, KEYCODE_SHIFT_LEFT, 0, '\0', SHIFT_LEFT_ON)));
     assertEquals(calls.size(), 2);
     assertEmbedderEventEquals(
-        calls.get(0).keyData, Type.kUp, PHYSICAL_SHIFT_LEFT, LOGICAL_SHIFT_LEFT, null, true);
+        calls.get(0).keyData,
+        Type.kUp,
+        PHYSICAL_SHIFT_LEFT,
+        LOGICAL_SHIFT_LEFT,
+        null,
+        true,
+        DeviceType.kKeyboard);
     assertEmbedderEventEquals(
-        calls.get(1).keyData, Type.kDown, PHYSICAL_SHIFT_LEFT, LOGICAL_SHIFT_LEFT, null, false);
+        calls.get(1).keyData,
+        Type.kDown,
+        PHYSICAL_SHIFT_LEFT,
+        LOGICAL_SHIFT_LEFT,
+        null,
+        false,
+        DeviceType.kKeyboard);
     calls.clear();
 
     // Up event when the current state is 1.
@@ -1188,7 +1346,13 @@ public class KeyboardManagerTest {
             new FakeKeyEvent(ACTION_UP, SCAN_SHIFT_LEFT, KEYCODE_SHIFT_LEFT, 0, '\0', 0)));
     assertEquals(calls.size(), 1);
     assertEmbedderEventEquals(
-        calls.get(0).keyData, Type.kUp, PHYSICAL_SHIFT_LEFT, LOGICAL_SHIFT_LEFT, null, false);
+        calls.get(0).keyData,
+        Type.kUp,
+        PHYSICAL_SHIFT_LEFT,
+        LOGICAL_SHIFT_LEFT,
+        null,
+        false,
+        DeviceType.kKeyboard);
     calls.clear();
 
     // Up event when the current state is 0.
@@ -1197,7 +1361,8 @@ public class KeyboardManagerTest {
         tester.keyboardManager.handleEvent(
             new FakeKeyEvent(ACTION_UP, SCAN_SHIFT_LEFT, KEYCODE_SHIFT_LEFT, 0, '\0', 0)));
     assertEquals(calls.size(), 1);
-    assertEmbedderEventEquals(calls.get(0).keyData, Type.kDown, 0l, 0l, null, true);
+    assertEmbedderEventEquals(
+        calls.get(0).keyData, Type.kDown, 0l, 0l, null, true, DeviceType.kKeyboard);
     calls.clear();
 
     // Down event when the current state is 0.
@@ -1208,7 +1373,13 @@ public class KeyboardManagerTest {
                 ACTION_DOWN, SCAN_SHIFT_LEFT, KEYCODE_SHIFT_LEFT, 0, '\0', SHIFT_LEFT_ON)));
     assertEquals(calls.size(), 1);
     assertEmbedderEventEquals(
-        calls.get(0).keyData, Type.kDown, PHYSICAL_SHIFT_LEFT, LOGICAL_SHIFT_LEFT, null, false);
+        calls.get(0).keyData,
+        Type.kDown,
+        PHYSICAL_SHIFT_LEFT,
+        LOGICAL_SHIFT_LEFT,
+        null,
+        false,
+        DeviceType.kKeyboard);
     calls.clear();
 
     // Repeat event when the current state is 1.
@@ -1219,7 +1390,13 @@ public class KeyboardManagerTest {
                 ACTION_DOWN, SCAN_SHIFT_LEFT, KEYCODE_SHIFT_LEFT, 1, '\0', SHIFT_LEFT_ON)));
     assertEquals(calls.size(), 1);
     assertEmbedderEventEquals(
-        calls.get(0).keyData, Type.kRepeat, PHYSICAL_SHIFT_LEFT, LOGICAL_SHIFT_LEFT, null, false);
+        calls.get(0).keyData,
+        Type.kRepeat,
+        PHYSICAL_SHIFT_LEFT,
+        LOGICAL_SHIFT_LEFT,
+        null,
+        false,
+        DeviceType.kKeyboard);
     calls.clear();
   }
 
@@ -1314,7 +1491,13 @@ public class KeyboardManagerTest {
                 ACTION_DOWN, SCAN_ARROW_LEFT, KEYCODE_DPAD_LEFT, 0, '\0', META_CTRL_ON)));
     assertEquals(calls.size(), 2);
     assertEmbedderEventEquals(
-        calls.get(0).keyData, Type.kDown, PHYSICAL_CONTROL_LEFT, LOGICAL_CONTROL_LEFT, null, true);
+        calls.get(0).keyData,
+        Type.kDown,
+        PHYSICAL_CONTROL_LEFT,
+        LOGICAL_CONTROL_LEFT,
+        null,
+        true,
+        DeviceType.kKeyboard);
     calls.clear();
 
     assertEquals(
@@ -1323,7 +1506,13 @@ public class KeyboardManagerTest {
             new FakeKeyEvent(ACTION_UP, SCAN_ARROW_LEFT, KEYCODE_DPAD_LEFT, 0, '\0', 0)));
     assertEquals(calls.size(), 2);
     assertEmbedderEventEquals(
-        calls.get(0).keyData, Type.kUp, PHYSICAL_CONTROL_LEFT, LOGICAL_CONTROL_LEFT, null, true);
+        calls.get(0).keyData,
+        Type.kUp,
+        PHYSICAL_CONTROL_LEFT,
+        LOGICAL_CONTROL_LEFT,
+        null,
+        true,
+        DeviceType.kKeyboard);
     calls.clear();
 
     assertEquals(
@@ -1333,7 +1522,13 @@ public class KeyboardManagerTest {
                 ACTION_DOWN, SCAN_ARROW_LEFT, KEYCODE_DPAD_LEFT, 0, '\0', META_ALT_ON)));
     assertEquals(calls.size(), 2);
     assertEmbedderEventEquals(
-        calls.get(0).keyData, Type.kDown, PHYSICAL_ALT_LEFT, LOGICAL_ALT_LEFT, null, true);
+        calls.get(0).keyData,
+        Type.kDown,
+        PHYSICAL_ALT_LEFT,
+        LOGICAL_ALT_LEFT,
+        null,
+        true,
+        DeviceType.kKeyboard);
     calls.clear();
 
     assertEquals(
@@ -1342,7 +1537,13 @@ public class KeyboardManagerTest {
             new FakeKeyEvent(ACTION_UP, SCAN_ARROW_LEFT, KEYCODE_DPAD_LEFT, 0, '\0', 0)));
     assertEquals(calls.size(), 2);
     assertEmbedderEventEquals(
-        calls.get(0).keyData, Type.kUp, PHYSICAL_ALT_LEFT, LOGICAL_ALT_LEFT, null, true);
+        calls.get(0).keyData,
+        Type.kUp,
+        PHYSICAL_ALT_LEFT,
+        LOGICAL_ALT_LEFT,
+        null,
+        true,
+        DeviceType.kKeyboard);
     calls.clear();
   }
 
@@ -1367,9 +1568,21 @@ public class KeyboardManagerTest {
             new FakeKeyEvent(ACTION_DOWN, SCAN_SHIFT_LEFT, KEYCODE_SHIFT_LEFT, 0, '\0', 0)));
     assertEquals(calls.size(), 2);
     assertEmbedderEventEquals(
-        calls.get(0).keyData, Type.kDown, PHYSICAL_SHIFT_LEFT, LOGICAL_SHIFT_LEFT, null, false);
+        calls.get(0).keyData,
+        Type.kDown,
+        PHYSICAL_SHIFT_LEFT,
+        LOGICAL_SHIFT_LEFT,
+        null,
+        false,
+        DeviceType.kKeyboard);
     assertEmbedderEventEquals(
-        calls.get(1).keyData, Type.kUp, PHYSICAL_SHIFT_LEFT, LOGICAL_SHIFT_LEFT, null, true);
+        calls.get(1).keyData,
+        Type.kUp,
+        PHYSICAL_SHIFT_LEFT,
+        LOGICAL_SHIFT_LEFT,
+        null,
+        true,
+        DeviceType.kKeyboard);
     calls.clear();
 
     // A normal down event.
@@ -1380,7 +1593,13 @@ public class KeyboardManagerTest {
                 ACTION_DOWN, SCAN_SHIFT_LEFT, KEYCODE_SHIFT_LEFT, 0, '\0', SHIFT_LEFT_ON)));
     assertEquals(calls.size(), 1);
     assertEmbedderEventEquals(
-        calls.get(0).keyData, Type.kDown, PHYSICAL_SHIFT_LEFT, LOGICAL_SHIFT_LEFT, null, false);
+        calls.get(0).keyData,
+        Type.kDown,
+        PHYSICAL_SHIFT_LEFT,
+        LOGICAL_SHIFT_LEFT,
+        null,
+        false,
+        DeviceType.kKeyboard);
     calls.clear();
 
     // Test: Repeat event when the current state is 0.
@@ -1390,9 +1609,21 @@ public class KeyboardManagerTest {
             new FakeKeyEvent(ACTION_DOWN, SCAN_SHIFT_LEFT, KEYCODE_SHIFT_LEFT, 1, '\0', 0)));
     assertEquals(calls.size(), 2);
     assertEmbedderEventEquals(
-        calls.get(0).keyData, Type.kRepeat, PHYSICAL_SHIFT_LEFT, LOGICAL_SHIFT_LEFT, null, false);
+        calls.get(0).keyData,
+        Type.kRepeat,
+        PHYSICAL_SHIFT_LEFT,
+        LOGICAL_SHIFT_LEFT,
+        null,
+        false,
+        DeviceType.kKeyboard);
     assertEmbedderEventEquals(
-        calls.get(1).keyData, Type.kUp, PHYSICAL_SHIFT_LEFT, LOGICAL_SHIFT_LEFT, null, true);
+        calls.get(1).keyData,
+        Type.kUp,
+        PHYSICAL_SHIFT_LEFT,
+        LOGICAL_SHIFT_LEFT,
+        null,
+        true,
+        DeviceType.kKeyboard);
     calls.clear();
   }
 
@@ -1415,9 +1646,21 @@ public class KeyboardManagerTest {
     assertEquals(tester.keyboardManager.handleEvent(keyEvent), true);
     assertEquals(calls.size(), 2);
     assertEmbedderEventEquals(
-        calls.get(0).keyData, Type.kDown, physicalKey, LOGICAL_SHIFT_LEFT, null, false);
+        calls.get(0).keyData,
+        Type.kDown,
+        physicalKey,
+        LOGICAL_SHIFT_LEFT,
+        null,
+        false,
+        DeviceType.kKeyboard);
     assertEmbedderEventEquals(
-        calls.get(1).keyData, Type.kUp, physicalKey, LOGICAL_SHIFT_LEFT, null, true);
+        calls.get(1).keyData,
+        Type.kUp,
+        physicalKey,
+        LOGICAL_SHIFT_LEFT,
+        null,
+        true,
+        DeviceType.kKeyboard);
     calls.clear();
   }
 
@@ -1439,7 +1682,13 @@ public class KeyboardManagerTest {
                 ACTION_DOWN, SCAN_CAPS_LOCK, KEYCODE_CAPS_LOCK, 0, '\0', META_CAPS_LOCK_ON)));
     assertEquals(calls.size(), 1);
     assertEmbedderEventEquals(
-        calls.get(0).keyData, Type.kDown, PHYSICAL_CAPS_LOCK, LOGICAL_CAPS_LOCK, null, false);
+        calls.get(0).keyData,
+        Type.kDown,
+        PHYSICAL_CAPS_LOCK,
+        LOGICAL_CAPS_LOCK,
+        null,
+        false,
+        DeviceType.kKeyboard);
     calls.clear();
 
     assertEquals(
@@ -1448,7 +1697,13 @@ public class KeyboardManagerTest {
             new FakeKeyEvent(ACTION_UP, SCAN_CAPS_LOCK, KEYCODE_CAPS_LOCK, 0, '\0', 0)));
     assertEquals(calls.size(), 1);
     assertEmbedderEventEquals(
-        calls.get(0).keyData, Type.kUp, PHYSICAL_CAPS_LOCK, LOGICAL_CAPS_LOCK, null, false);
+        calls.get(0).keyData,
+        Type.kUp,
+        PHYSICAL_CAPS_LOCK,
+        LOGICAL_CAPS_LOCK,
+        null,
+        false,
+        DeviceType.kKeyboard);
     calls.clear();
 
     assertEquals(
@@ -1458,7 +1713,13 @@ public class KeyboardManagerTest {
                 ACTION_DOWN, SCAN_ARROW_LEFT, KEYCODE_DPAD_LEFT, 0, '\0', META_CAPS_LOCK_ON)));
     assertEquals(calls.size(), 1);
     assertEmbedderEventEquals(
-        calls.get(0).keyData, Type.kDown, PHYSICAL_ARROW_LEFT, LOGICAL_ARROW_LEFT, null, false);
+        calls.get(0).keyData,
+        Type.kDown,
+        PHYSICAL_ARROW_LEFT,
+        LOGICAL_ARROW_LEFT,
+        null,
+        false,
+        DeviceType.kKeyboard);
     calls.clear();
 
     assertEquals(
@@ -1468,7 +1729,13 @@ public class KeyboardManagerTest {
                 ACTION_UP, SCAN_ARROW_LEFT, KEYCODE_DPAD_LEFT, 0, '\0', META_CAPS_LOCK_ON)));
     assertEquals(calls.size(), 1);
     assertEmbedderEventEquals(
-        calls.get(0).keyData, Type.kUp, PHYSICAL_ARROW_LEFT, LOGICAL_ARROW_LEFT, null, false);
+        calls.get(0).keyData,
+        Type.kUp,
+        PHYSICAL_ARROW_LEFT,
+        LOGICAL_ARROW_LEFT,
+        null,
+        false,
+        DeviceType.kKeyboard);
     calls.clear();
 
     assertEquals(
@@ -1478,7 +1745,13 @@ public class KeyboardManagerTest {
                 ACTION_DOWN, SCAN_CAPS_LOCK, KEYCODE_CAPS_LOCK, 0, '\0', META_CAPS_LOCK_ON)));
     assertEquals(calls.size(), 1);
     assertEmbedderEventEquals(
-        calls.get(0).keyData, Type.kDown, PHYSICAL_CAPS_LOCK, LOGICAL_CAPS_LOCK, null, false);
+        calls.get(0).keyData,
+        Type.kDown,
+        PHYSICAL_CAPS_LOCK,
+        LOGICAL_CAPS_LOCK,
+        null,
+        false,
+        DeviceType.kKeyboard);
     calls.clear();
 
     assertEquals(
@@ -1487,7 +1760,13 @@ public class KeyboardManagerTest {
             new FakeKeyEvent(ACTION_UP, SCAN_CAPS_LOCK, KEYCODE_CAPS_LOCK, 0, '\0', 0)));
     assertEquals(calls.size(), 1);
     assertEmbedderEventEquals(
-        calls.get(0).keyData, Type.kUp, PHYSICAL_CAPS_LOCK, LOGICAL_CAPS_LOCK, null, false);
+        calls.get(0).keyData,
+        Type.kUp,
+        PHYSICAL_CAPS_LOCK,
+        LOGICAL_CAPS_LOCK,
+        null,
+        false,
+        DeviceType.kKeyboard);
     calls.clear();
 
     assertEquals(
@@ -1496,7 +1775,13 @@ public class KeyboardManagerTest {
             new FakeKeyEvent(ACTION_DOWN, SCAN_ARROW_LEFT, KEYCODE_DPAD_LEFT, 0, '\0', 0)));
     assertEquals(calls.size(), 1);
     assertEmbedderEventEquals(
-        calls.get(0).keyData, Type.kDown, PHYSICAL_ARROW_LEFT, LOGICAL_ARROW_LEFT, null, false);
+        calls.get(0).keyData,
+        Type.kDown,
+        PHYSICAL_ARROW_LEFT,
+        LOGICAL_ARROW_LEFT,
+        null,
+        false,
+        DeviceType.kKeyboard);
     calls.clear();
 
     assertEquals(
@@ -1505,7 +1790,13 @@ public class KeyboardManagerTest {
             new FakeKeyEvent(ACTION_UP, SCAN_ARROW_LEFT, KEYCODE_DPAD_LEFT, 0, '\0', 0)));
     assertEquals(calls.size(), 1);
     assertEmbedderEventEquals(
-        calls.get(0).keyData, Type.kUp, PHYSICAL_ARROW_LEFT, LOGICAL_ARROW_LEFT, null, false);
+        calls.get(0).keyData,
+        Type.kUp,
+        PHYSICAL_ARROW_LEFT,
+        LOGICAL_ARROW_LEFT,
+        null,
+        false,
+        DeviceType.kKeyboard);
     calls.clear();
   }
 
@@ -1524,11 +1815,29 @@ public class KeyboardManagerTest {
                 ACTION_DOWN, SCAN_ARROW_LEFT, KEYCODE_DPAD_LEFT, 0, '\0', META_CAPS_LOCK_ON)));
     assertEquals(calls.size(), 3);
     assertEmbedderEventEquals(
-        calls.get(0).keyData, Type.kDown, PHYSICAL_CAPS_LOCK, LOGICAL_CAPS_LOCK, null, true);
+        calls.get(0).keyData,
+        Type.kDown,
+        PHYSICAL_CAPS_LOCK,
+        LOGICAL_CAPS_LOCK,
+        null,
+        true,
+        DeviceType.kKeyboard);
     assertEmbedderEventEquals(
-        calls.get(1).keyData, Type.kUp, PHYSICAL_CAPS_LOCK, LOGICAL_CAPS_LOCK, null, true);
+        calls.get(1).keyData,
+        Type.kUp,
+        PHYSICAL_CAPS_LOCK,
+        LOGICAL_CAPS_LOCK,
+        null,
+        true,
+        DeviceType.kKeyboard);
     assertEmbedderEventEquals(
-        calls.get(2).keyData, Type.kDown, PHYSICAL_ARROW_LEFT, LOGICAL_ARROW_LEFT, null, false);
+        calls.get(2).keyData,
+        Type.kDown,
+        PHYSICAL_ARROW_LEFT,
+        LOGICAL_ARROW_LEFT,
+        null,
+        false,
+        DeviceType.kKeyboard);
     calls.clear();
 
     assertEquals(
@@ -1538,7 +1847,13 @@ public class KeyboardManagerTest {
                 ACTION_DOWN, SCAN_CAPS_LOCK, KEYCODE_CAPS_LOCK, 0, '\0', META_CAPS_LOCK_ON)));
     assertEquals(calls.size(), 1);
     assertEmbedderEventEquals(
-        calls.get(0).keyData, Type.kDown, PHYSICAL_CAPS_LOCK, LOGICAL_CAPS_LOCK, null, false);
+        calls.get(0).keyData,
+        Type.kDown,
+        PHYSICAL_CAPS_LOCK,
+        LOGICAL_CAPS_LOCK,
+        null,
+        false,
+        DeviceType.kKeyboard);
     calls.clear();
 
     assertEquals(
@@ -1548,11 +1863,29 @@ public class KeyboardManagerTest {
                 ACTION_UP, SCAN_ARROW_LEFT, KEYCODE_DPAD_LEFT, 0, '\0', META_CAPS_LOCK_ON)));
     assertEquals(calls.size(), 3);
     assertEmbedderEventEquals(
-        calls.get(0).keyData, Type.kUp, PHYSICAL_CAPS_LOCK, LOGICAL_CAPS_LOCK, null, true);
+        calls.get(0).keyData,
+        Type.kUp,
+        PHYSICAL_CAPS_LOCK,
+        LOGICAL_CAPS_LOCK,
+        null,
+        true,
+        DeviceType.kKeyboard);
     assertEmbedderEventEquals(
-        calls.get(1).keyData, Type.kDown, PHYSICAL_CAPS_LOCK, LOGICAL_CAPS_LOCK, null, true);
+        calls.get(1).keyData,
+        Type.kDown,
+        PHYSICAL_CAPS_LOCK,
+        LOGICAL_CAPS_LOCK,
+        null,
+        true,
+        DeviceType.kKeyboard);
     assertEmbedderEventEquals(
-        calls.get(2).keyData, Type.kUp, PHYSICAL_ARROW_LEFT, LOGICAL_ARROW_LEFT, null, false);
+        calls.get(2).keyData,
+        Type.kUp,
+        PHYSICAL_ARROW_LEFT,
+        LOGICAL_ARROW_LEFT,
+        null,
+        false,
+        DeviceType.kKeyboard);
     calls.clear();
 
     assertEquals(
@@ -1561,7 +1894,31 @@ public class KeyboardManagerTest {
             new FakeKeyEvent(ACTION_UP, SCAN_CAPS_LOCK, KEYCODE_CAPS_LOCK, 0, '\0', 0)));
     assertEquals(calls.size(), 1);
     assertEmbedderEventEquals(
-        calls.get(0).keyData, Type.kUp, PHYSICAL_CAPS_LOCK, LOGICAL_CAPS_LOCK, null, false);
+        calls.get(0).keyData,
+        Type.kUp,
+        PHYSICAL_CAPS_LOCK,
+        LOGICAL_CAPS_LOCK,
+        null,
+        false,
+        DeviceType.kKeyboard);
     calls.clear();
   }
+
+  @Test
+  public void getKeyboardState() {
+    final KeyboardTester tester = new KeyboardTester();
+
+    tester.respondToTextInputWith(true); // Suppress redispatching.
+
+    // Initial pressed state is empty.
+    assertEquals(tester.keyboardManager.getKeyboardState(), Map.of());
+
+    tester.keyboardManager.handleEvent(
+        new FakeKeyEvent(ACTION_DOWN, SCAN_KEY_A, KEYCODE_A, 1, 'a', 0));
+    assertEquals(tester.keyboardManager.getKeyboardState(), Map.of(PHYSICAL_KEY_A, LOGICAL_KEY_A));
+
+    tester.keyboardManager.handleEvent(
+        new FakeKeyEvent(ACTION_UP, SCAN_KEY_A, KEYCODE_A, 0, 'a', 0));
+    assertEquals(tester.keyboardManager.getKeyboardState(), Map.of());
+  }
 }
diff --git a/shell/platform/android/test/io/flutter/embedding/android/SplashShadowResources.java b/shell/platform/android/test/io/flutter/embedding/android/SplashShadowResources.java
index eab89c6a4cf55d84066a3f7e13b31778f732125f..7c0bd96fec856ba2ffe3477409d73c5e35cd31fd 100644
--- a/shell/platform/android/test/io/flutter/embedding/android/SplashShadowResources.java
+++ b/shell/platform/android/test/io/flutter/embedding/android/SplashShadowResources.java
@@ -1,5 +1,7 @@
 package io.flutter.embedding.android;
 
+import static org.robolectric.util.reflector.Reflector.reflector;
+
 import android.content.res.Resources;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
@@ -8,21 +10,34 @@ import androidx.annotation.Nullable;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 import org.robolectric.annotation.RealObject;
-import org.robolectric.shadow.api.Shadow;
+import org.robolectric.shadows.ShadowResources;
+import org.robolectric.util.reflector.Direct;
+import org.robolectric.util.reflector.ForType;
 
+@SuppressWarnings("deprecation")
+// getDrawableInt
 @Implements(Resources.class)
-public class SplashShadowResources {
+public class SplashShadowResources extends ShadowResources {
   @RealObject private Resources resources;
 
   public static final int SPLASH_DRAWABLE_ID = 191919;
   public static final int THEMED_SPLASH_DRAWABLE_ID = 212121;
 
+  @ForType(Resources.class)
+  interface ResourcesReflector {
+    @Direct
+    Drawable getDrawable(int id, Resources.Theme theme);
+
+    @Direct
+    Drawable getDrawable(int id);
+  }
+
   @Implementation
   protected Drawable getDrawable(int id) {
     if (id == SPLASH_DRAWABLE_ID) {
       return new ColorDrawable(Color.BLUE);
     }
-    return Shadow.directlyOn(resources, Resources.class).getDrawable(id);
+    return reflector(Resources.class, resources).getDrawable(id);
   }
 
   @Implementation
@@ -36,6 +51,6 @@ public class SplashShadowResources {
       }
       return new ColorDrawable(Color.GRAY);
     }
-    return Shadow.directlyOn(resources, Resources.class).getDrawable(id, theme);
+    return reflector(Resources.class, resources).getDrawable(id, theme);
   }
 }
diff --git a/shell/platform/android/test/io/flutter/embedding/engine/FlutterEngineConnectionRegistryTest.java b/shell/platform/android/test/io/flutter/embedding/engine/FlutterEngineConnectionRegistryTest.java
index 975d6d052a5b1181dd16783d42c95f49f98effd8..8e5c21a98d5bea6e5ffd5badcc73b849506cf12c 100644
--- a/shell/platform/android/test/io/flutter/embedding/engine/FlutterEngineConnectionRegistryTest.java
+++ b/shell/platform/android/test/io/flutter/embedding/engine/FlutterEngineConnectionRegistryTest.java
@@ -40,7 +40,7 @@ public class FlutterEngineConnectionRegistryTest {
     FakeFlutterPlugin fakePlugin2 = new FakeFlutterPlugin();
 
     FlutterEngineConnectionRegistry registry =
-        new FlutterEngineConnectionRegistry(context, flutterEngine, flutterLoader);
+        new FlutterEngineConnectionRegistry(context, flutterEngine, flutterLoader, null);
 
     // Verify that the registry doesn't think it contains our plugin yet.
     assertFalse(registry.has(fakePlugin1.getClass()));
@@ -86,7 +86,7 @@ public class FlutterEngineConnectionRegistryTest {
 
     // Set up the environment to get the required internal data
     FlutterEngineConnectionRegistry registry =
-        new FlutterEngineConnectionRegistry(context, flutterEngine, flutterLoader);
+        new FlutterEngineConnectionRegistry(context, flutterEngine, flutterLoader, null);
     FakeActivityAwareFlutterPlugin fakePlugin = new FakeActivityAwareFlutterPlugin();
     registry.add(fakePlugin);
     registry.attachToActivity(appComponent, lifecycle);
@@ -129,7 +129,7 @@ public class FlutterEngineConnectionRegistryTest {
 
     // Test attachToActivity with an Activity that has no Intent.
     FlutterEngineConnectionRegistry registry =
-        new FlutterEngineConnectionRegistry(context, flutterEngine, flutterLoader);
+        new FlutterEngineConnectionRegistry(context, flutterEngine, flutterLoader, null);
     registry.attachToActivity(appComponent, mock(Lifecycle.class));
     verify(platformViewsController).setSoftwareRendering(false);
 
diff --git a/shell/platform/android/test/io/flutter/embedding/engine/FlutterEngineGroupCacheTest.java b/shell/platform/android/test/io/flutter/embedding/engine/FlutterEngineGroupCacheTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..efd8edc81649d58f4ba9a26b3a05e41f2987c6e2
--- /dev/null
+++ b/shell/platform/android/test/io/flutter/embedding/engine/FlutterEngineGroupCacheTest.java
@@ -0,0 +1,98 @@
+package io.flutter.embedding.engine;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import androidx.test.core.app.ApplicationProvider;
+import io.flutter.FlutterInjector;
+import io.flutter.embedding.engine.loader.FlutterLoader;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+@Config(manifest = Config.NONE)
+@RunWith(RobolectricTestRunner.class)
+public class FlutterEngineGroupCacheTest {
+
+  private FlutterEngineGroup flutterEngineGroup;
+
+  @Before
+  public void setup() {
+    // Create a mocked FlutterEngineGroup that provided to run this test case
+    FlutterInjector.reset();
+    FlutterLoader mockFlutterLoader = mock(FlutterLoader.class);
+    when(mockFlutterLoader.findAppBundlePath()).thenReturn("default_flutter_assets/path");
+    FlutterInjector.setInstance(
+        new FlutterInjector.Builder().setFlutterLoader(mockFlutterLoader).build());
+    flutterEngineGroup = mock(FlutterEngineGroup.class);
+  }
+
+  @Test
+  public void itHoldsFlutterEngineGroups() {
+    // --- Test Setup ---
+    FlutterEngineGroupCache cache = new FlutterEngineGroupCache();
+
+    // --- Execute Test ---
+    cache.put("my_flutter_engine_group", flutterEngineGroup);
+
+    // --- Verify Results ---
+    assertEquals(flutterEngineGroup, cache.get("my_flutter_engine_group"));
+  }
+
+  @Test
+  public void itQueriesFlutterEngineGroupExistence() {
+    // --- Test Setup ---
+    FlutterEngineGroupCache cache = new FlutterEngineGroupCache();
+
+    // --- Execute Test ---
+    assertFalse(cache.contains("my_flutter_engine_group"));
+
+    cache.put("my_flutter_engine_group", flutterEngineGroup);
+
+    // --- Verify Results ---
+    assertTrue(cache.contains("my_flutter_engine_group"));
+  }
+
+  @Test
+  public void itRemovesFlutterEngineGroups() {
+    // --- Test Setup ---
+    FlutterEngineGroupCache cache = new FlutterEngineGroupCache();
+
+    // --- Execute Test ---
+    cache.put("my_flutter_engine_group", flutterEngineGroup);
+    cache.remove("my_flutter_engine_group");
+
+    // --- Verify Results ---
+    assertNull(cache.get("my_flutter_engine_group"));
+  }
+
+  @Test
+  public void itRemovesAllFlutterEngineGroups() {
+    // --- Test Setup ---
+    FlutterEngineGroup flutterEngineGroup1 =
+        new FlutterEngineGroup(ApplicationProvider.getApplicationContext());
+    FlutterEngineGroup flutterEngineGroup2 =
+        new FlutterEngineGroup(ApplicationProvider.getApplicationContext());
+    FlutterEngineGroupCache cache = new FlutterEngineGroupCache();
+
+    // --- Execute Test ---
+    cache.put("my_flutter_engine_group", flutterEngineGroup1);
+    cache.put("my_flutter_engine_group_2", flutterEngineGroup2);
+
+    // --- Verify Results ---
+    assertEquals(flutterEngineGroup1, cache.get("my_flutter_engine_group"));
+    assertEquals(flutterEngineGroup2, cache.get("my_flutter_engine_group_2"));
+
+    cache.clear();
+
+    // --- Verify Results ---
+    assertNull(cache.get("my_flutter_engine_group"));
+    assertNull(cache.get("my_flutter_engine_group_2"));
+  }
+}
diff --git a/shell/platform/android/test/io/flutter/embedding/engine/FlutterEngineTest.java b/shell/platform/android/test/io/flutter/embedding/engine/FlutterEngineTest.java
index 308ab1d07cf5610bac066b88a00743f4f327ed1d..c1b049b89ecd5a7b8d7a480e432f4e08be6876fe 100644
--- a/shell/platform/android/test/io/flutter/embedding/engine/FlutterEngineTest.java
+++ b/shell/platform/android/test/io/flutter/embedding/engine/FlutterEngineTest.java
@@ -15,6 +15,7 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Configuration;
@@ -25,8 +26,11 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
 import io.flutter.FlutterInjector;
 import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.embedding.engine.FlutterEngine.EngineLifecycleListener;
+import io.flutter.embedding.engine.FlutterEngineGroup;
 import io.flutter.embedding.engine.FlutterJNI;
 import io.flutter.embedding.engine.loader.FlutterLoader;
+import io.flutter.embedding.engine.plugins.FlutterPlugin;
+import io.flutter.embedding.engine.plugins.PluginRegistry;
 import io.flutter.plugin.platform.PlatformViewsController;
 import io.flutter.plugins.GeneratedPluginRegistrant;
 import java.util.List;
@@ -39,6 +43,8 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
+import org.robolectric.Robolectric;
+import org.robolectric.android.controller.ActivityController;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLog;
 
@@ -95,6 +101,21 @@ public class FlutterEngineTest {
     assertEquals(flutterEngine, registeredEngines.get(0));
   }
 
+  @Test
+  public void itUpdatesDisplayMetricsOnConstructionWithActivityContext() {
+    // Needs an activity. ApplicationContext won't work for this.
+    ActivityController<Activity> activityController = Robolectric.buildActivity(Activity.class);
+    FlutterJNI mockFlutterJNI = mock(FlutterJNI.class);
+    when(mockFlutterJNI.isAttached()).thenReturn(true);
+
+    FlutterLoader mockFlutterLoader = mock(FlutterLoader.class);
+    FlutterEngine flutterEngine =
+        new FlutterEngine(activityController.get(), mockFlutterLoader, mockFlutterJNI);
+
+    verify(mockFlutterJNI, times(1))
+        .updateDisplayMetrics(eq(0), any(Float.class), any(Float.class), any(Float.class));
+  }
+
   @Test
   public void itSendLocalesOnEngineInit() {
     FlutterJNI mockFlutterJNI = mock(FlutterJNI.class);
@@ -323,4 +344,34 @@ public class FlutterEngineTest {
 
     assertTrue(engineUnderTest.getDartExecutor().isExecutingDart());
   }
+
+  @Test
+  public void passesEngineGroupToPlugins() throws NameNotFoundException {
+    Context packageContext = mock(Context.class);
+
+    when(mockContext.createPackageContext(any(), anyInt())).thenReturn(packageContext);
+    when(flutterJNI.isAttached()).thenReturn(true);
+
+    FlutterEngineGroup mockGroup = mock(FlutterEngineGroup.class);
+
+    FlutterEngine engineUnderTest =
+        new FlutterEngine(
+            mockContext,
+            mock(FlutterLoader.class),
+            flutterJNI,
+            new PlatformViewsController(),
+            /*dartVmArgs=*/ new String[] {},
+            /*automaticallyRegisterPlugins=*/ false,
+            /*waitForRestorationData=*/ false,
+            mockGroup);
+
+    PluginRegistry registry = engineUnderTest.getPlugins();
+    FlutterPlugin mockPlugin = mock(FlutterPlugin.class);
+    ArgumentCaptor<FlutterPlugin.FlutterPluginBinding> pluginBindingCaptor =
+        ArgumentCaptor.forClass(FlutterPlugin.FlutterPluginBinding.class);
+    registry.add(mockPlugin);
+    verify(mockPlugin).onAttachedToEngine(pluginBindingCaptor.capture());
+    assertNotNull(pluginBindingCaptor.getValue());
+    assertEquals(mockGroup, pluginBindingCaptor.getValue().getEngineGroup());
+  }
 }
diff --git a/shell/platform/android/test/io/flutter/embedding/engine/FlutterJNITest.java b/shell/platform/android/test/io/flutter/embedding/engine/FlutterJNITest.java
index e40096e7b01c6895c7f91a340ba77afec77c030d..26e53ba16836da5659242b94f8d948b9b0d79d4a 100644
--- a/shell/platform/android/test/io/flutter/embedding/engine/FlutterJNITest.java
+++ b/shell/platform/android/test/io/flutter/embedding/engine/FlutterJNITest.java
@@ -1,5 +1,6 @@
 package io.flutter.embedding.engine;
 
+import static io.flutter.Build.API_LEVELS;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -28,7 +29,7 @@ import org.robolectric.annotation.Config;
 
 @Config(manifest = Config.NONE)
 @RunWith(AndroidJUnit4.class)
-@TargetApi(24) // LocaleList and scriptCode are API 24+.
+@TargetApi(API_LEVELS.API_24) // LocaleList and scriptCode are API 24+.
 public class FlutterJNITest {
   @Test
   public void itAllowsFirstFrameListenersToRemoveThemselvesInline() {
diff --git a/shell/platform/android/test/io/flutter/embedding/engine/deferredcomponents/PlayStoreDeferredComponentManagerTest.java b/shell/platform/android/test/io/flutter/embedding/engine/deferredcomponents/PlayStoreDeferredComponentManagerTest.java
index d1af9fb59fd83056a52c42e8b0fca41f045b3fcc..735382b21cdb2085277b3745822fd2dbb4eaa888 100644
--- a/shell/platform/android/test/io/flutter/embedding/engine/deferredcomponents/PlayStoreDeferredComponentManagerTest.java
+++ b/shell/platform/android/test/io/flutter/embedding/engine/deferredcomponents/PlayStoreDeferredComponentManagerTest.java
@@ -14,7 +14,6 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
@@ -33,7 +32,6 @@ import org.robolectric.annotation.Config;
 
 @Config(manifest = Config.NONE)
 @RunWith(AndroidJUnit4.class)
-@TargetApi(21)
 public class PlayStoreDeferredComponentManagerTest {
   private class TestFlutterJNI extends FlutterJNI {
     public int loadDartDeferredLibraryCalled = 0;
@@ -83,6 +81,8 @@ public class PlayStoreDeferredComponentManagerTest {
     }
   }
 
+  @SuppressWarnings("deprecation")
+  // getApplicationInfo
   private Context createSpyContext(Bundle metadata) throws NameNotFoundException {
     Context spyContext = spy(ApplicationProvider.getApplicationContext());
     doReturn(spyContext).when(spyContext).createPackageContext(any(), anyInt());
diff --git a/shell/platform/android/test/io/flutter/embedding/engine/loader/ApplicationInfoLoaderTest.java b/shell/platform/android/test/io/flutter/embedding/engine/loader/ApplicationInfoLoaderTest.java
index e616eb627f6ac6c2ca32f250b074ea546552b3af..6a9e4424f31827df7734997f733f8928e8a4acdd 100644
--- a/shell/platform/android/test/io/flutter/embedding/engine/loader/ApplicationInfoLoaderTest.java
+++ b/shell/platform/android/test/io/flutter/embedding/engine/loader/ApplicationInfoLoaderTest.java
@@ -48,6 +48,8 @@ public class ApplicationInfoLoaderTest {
     assertNull(info.nativeLibraryDir);
   }
 
+  @SuppressWarnings("deprecation")
+  // getApplicationInfo
   private Context generateMockContext(Bundle metadata, String networkPolicyXml) throws Exception {
     Context context = mock(Context.class);
     PackageManager packageManager = mock(PackageManager.class);
diff --git a/shell/platform/android/test/io/flutter/embedding/engine/loader/FlutterLoaderTest.java b/shell/platform/android/test/io/flutter/embedding/engine/loader/FlutterLoaderTest.java
index 00518705ebef40abb2b122a96396647c383267ef..99ddf30acd31cbc834921f92b3d3d2a84c458461 100644
--- a/shell/platform/android/test/io/flutter/embedding/engine/loader/FlutterLoaderTest.java
+++ b/shell/platform/android/test/io/flutter/embedding/engine/loader/FlutterLoaderTest.java
@@ -5,6 +5,7 @@
 package io.flutter.embedding.engine.loader;
 
 import static android.os.Looper.getMainLooper;
+import static io.flutter.Build.API_LEVELS;
 import static junit.framework.TestCase.assertFalse;
 import static junit.framework.TestCase.assertTrue;
 import static org.mockito.Mockito.any;
@@ -176,68 +177,48 @@ public class FlutterLoaderTest {
   }
 
   @Test
-  public void itSetsEnableImpellerFromMetaData() {
+  public void itDoesNotSetEnableVulkanValidationByDefault() {
     FlutterJNI mockFlutterJNI = mock(FlutterJNI.class);
     FlutterLoader flutterLoader = new FlutterLoader(mockFlutterJNI);
-    Bundle metaData = new Bundle();
-    metaData.putBoolean("io.flutter.embedding.android.EnableImpeller", true);
-    ctx.getApplicationInfo().metaData = metaData;
 
-    FlutterLoader.Settings settings = new FlutterLoader.Settings();
     assertFalse(flutterLoader.initialized());
-    flutterLoader.startInitialization(ctx, settings);
-    flutterLoader.ensureInitializationComplete(ctx, null);
-    shadowOf(getMainLooper()).idle();
-
-    final String enableImpellerArg = "--enable-impeller";
-    ArgumentCaptor<String[]> shellArgsCaptor = ArgumentCaptor.forClass(String[].class);
-    verify(mockFlutterJNI, times(1))
-        .init(eq(ctx), shellArgsCaptor.capture(), anyString(), anyString(), anyString(), anyLong());
-    List<String> arguments = Arrays.asList(shellArgsCaptor.getValue());
-    assertTrue(arguments.contains(enableImpellerArg));
-  }
-
-  @Test
-  public void itSetsEnableSkParagraphByDefault() {
-    // SkParagraph is enabled by default
-    FlutterJNI mockFlutterJNI = mock(FlutterJNI.class);
-    FlutterLoader flutterLoader = new FlutterLoader(mockFlutterJNI);
-    FlutterLoader.Settings settings = new FlutterLoader.Settings();
-    flutterLoader.startInitialization(ctx, settings);
+    flutterLoader.startInitialization(ctx);
     flutterLoader.ensureInitializationComplete(ctx, null);
     shadowOf(getMainLooper()).idle();
 
+    final String enableVulkanValidationArg = "--enable-vulkan-validation";
     ArgumentCaptor<String[]> shellArgsCaptor = ArgumentCaptor.forClass(String[].class);
     verify(mockFlutterJNI, times(1))
         .init(eq(ctx), shellArgsCaptor.capture(), anyString(), anyString(), anyString(), anyLong());
     List<String> arguments = Arrays.asList(shellArgsCaptor.getValue());
-    assertTrue(arguments.contains("--enable-skparagraph=true"));
+    assertFalse(arguments.contains(enableVulkanValidationArg));
   }
 
   @Test
-  public void itSetsEnableSkParagraphFromMetaData() {
-    // SkParagraph can be disabled using metadata.
+  public void itSetsEnableImpellerFromMetaData() {
     FlutterJNI mockFlutterJNI = mock(FlutterJNI.class);
     FlutterLoader flutterLoader = new FlutterLoader(mockFlutterJNI);
     Bundle metaData = new Bundle();
-    metaData.putBoolean("io.flutter.embedding.android.EnableSkParagraph", false);
+    metaData.putBoolean("io.flutter.embedding.android.EnableImpeller", true);
     ctx.getApplicationInfo().metaData = metaData;
 
     FlutterLoader.Settings settings = new FlutterLoader.Settings();
+    assertFalse(flutterLoader.initialized());
     flutterLoader.startInitialization(ctx, settings);
     flutterLoader.ensureInitializationComplete(ctx, null);
     shadowOf(getMainLooper()).idle();
 
+    final String enableImpellerArg = "--enable-impeller";
     ArgumentCaptor<String[]> shellArgsCaptor = ArgumentCaptor.forClass(String[].class);
     verify(mockFlutterJNI, times(1))
         .init(eq(ctx), shellArgsCaptor.capture(), anyString(), anyString(), anyString(), anyLong());
     List<String> arguments = Arrays.asList(shellArgsCaptor.getValue());
-    assertTrue(arguments.contains("--enable-skparagraph=false"));
+    assertTrue(arguments.contains(enableImpellerArg));
   }
 
   @Test
-  @TargetApi(23)
-  @Config(sdk = 23)
+  @TargetApi(API_LEVELS.API_23)
+  @Config(sdk = API_LEVELS.API_23)
   public void itReportsFpsToVsyncWaiterAndroidM() {
     FlutterJNI mockFlutterJNI = mock(FlutterJNI.class);
     FlutterLoader flutterLoader = new FlutterLoader(mockFlutterJNI);
diff --git a/shell/platform/android/test/io/flutter/embedding/engine/mutatorsstack/FlutterMutatorViewTest.java b/shell/platform/android/test/io/flutter/embedding/engine/mutatorsstack/FlutterMutatorViewTest.java
index 47204fee28960f6e470d2b51d60306a5044e836f..02b0f2d9749b5c18f0f4396124b70c490ae66e2d 100644
--- a/shell/platform/android/test/io/flutter/embedding/engine/mutatorsstack/FlutterMutatorViewTest.java
+++ b/shell/platform/android/test/io/flutter/embedding/engine/mutatorsstack/FlutterMutatorViewTest.java
@@ -11,6 +11,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.view.accessibility.AccessibilityEvent;
+import android.widget.FrameLayout;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import io.flutter.embedding.android.AndroidTouchProcessor;
@@ -231,10 +232,14 @@ public class FlutterMutatorViewTest {
   }
 
   @Implements(ViewGroup.class)
-  public static class ShadowViewGroup extends org.robolectric.shadows.ShadowView {
+  public static class ShadowViewGroup extends org.robolectric.shadows.ShadowViewGroup {
     @Implementation
-    public boolean requestSendAccessibilityEvent(View child, AccessibilityEvent event) {
+    protected boolean requestSendAccessibilityEvent(View child, AccessibilityEvent event) {
       return true;
     }
   }
+
+  @Implements(FrameLayout.class)
+  public static class ShadowFrameLayout
+      extends io.flutter.plugin.platform.PlatformViewWrapperTest.ShadowViewGroup {}
 }
diff --git a/shell/platform/android/test/io/flutter/embedding/engine/plugins/shim/ShimPluginRegistryTest.java b/shell/platform/android/test/io/flutter/embedding/engine/plugins/shim/ShimPluginRegistryTest.java
index 18c9b5ae206a7f9f92b83aadba86a1a33a1024e2..95aad07402f12d456e253905620305ef3b47c191 100644
--- a/shell/platform/android/test/io/flutter/embedding/engine/plugins/shim/ShimPluginRegistryTest.java
+++ b/shell/platform/android/test/io/flutter/embedding/engine/plugins/shim/ShimPluginRegistryTest.java
@@ -15,7 +15,6 @@ import io.flutter.embedding.engine.plugins.FlutterPlugin.FlutterPluginBinding;
 import io.flutter.embedding.engine.plugins.PluginRegistry;
 import io.flutter.embedding.engine.plugins.activity.ActivityAware;
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -43,11 +42,15 @@ public class ShimPluginRegistryTest {
     when(mockActivityPluginBinding.getActivity()).thenReturn(mockActivity);
   }
 
+  @SuppressWarnings("deprecation")
+  // Test is intentionally verifying deprecated behavior.
   @Test
   public void itSuppliesOldAPIsViaTheNewFlutterPluginBinding() {
     ShimPluginRegistry registryUnderTest = new ShimPluginRegistry(mockFlutterEngine);
+    // Fully qualifed name because imports can not have deprecation supression.
     // This is the consumption side of the old plugins.
-    Registrar registrarUnderTest = registryUnderTest.registrarFor("test");
+    io.flutter.plugin.common.PluginRegistry.Registrar registrarUnderTest =
+        registryUnderTest.registrarFor("test");
 
     ArgumentCaptor<FlutterPlugin> shimAggregateCaptor =
         ArgumentCaptor.forClass(FlutterPlugin.class);
@@ -65,11 +68,16 @@ public class ShimPluginRegistryTest {
     verify(mockFlutterPluginBinding).getApplicationContext();
   }
 
+  @SuppressWarnings("deprecation")
+  // Test is intentionally verifying deprecated behavior.
   @Test
   public void itSuppliesMultipleOldPlugins() {
     ShimPluginRegistry registryUnderTest = new ShimPluginRegistry(mockFlutterEngine);
-    Registrar registrarUnderTest1 = registryUnderTest.registrarFor("test1");
-    Registrar registrarUnderTest2 = registryUnderTest.registrarFor("test2");
+    // Fully qualifed name because imports can not have deprecation supression.
+    io.flutter.plugin.common.PluginRegistry.Registrar registrarUnderTest1 =
+        registryUnderTest.registrarFor("test1");
+    io.flutter.plugin.common.PluginRegistry.Registrar registrarUnderTest2 =
+        registryUnderTest.registrarFor("test2");
 
     ArgumentCaptor<FlutterPlugin> shimAggregateCaptor =
         ArgumentCaptor.forClass(FlutterPlugin.class);
@@ -86,10 +94,13 @@ public class ShimPluginRegistryTest {
     verify(mockFlutterPluginBinding, times(2)).getApplicationContext();
   }
 
+  @SuppressWarnings("deprecation")
+  // Test is intentionally verifying deprecated behavior.
   @Test
   public void itCanOnlySupplyActivityBindingWhenUpstreamActivityIsAttached() {
     ShimPluginRegistry registryUnderTest = new ShimPluginRegistry(mockFlutterEngine);
-    Registrar registrarUnderTest = registryUnderTest.registrarFor("test");
+    io.flutter.plugin.common.PluginRegistry.Registrar registrarUnderTest =
+        registryUnderTest.registrarFor("test");
 
     ArgumentCaptor<FlutterPlugin> shimAggregateCaptor =
         ArgumentCaptor.forClass(FlutterPlugin.class);
diff --git a/shell/platform/android/test/io/flutter/embedding/engine/renderer/FlutterRendererTest.java b/shell/platform/android/test/io/flutter/embedding/engine/renderer/FlutterRendererTest.java
index e7b0d0daa1c03c1df1aa9353a64ae1516b9ded33..f19da788d3759fd80647249487ad3e28422739f0 100644
--- a/shell/platform/android/test/io/flutter/embedding/engine/renderer/FlutterRendererTest.java
+++ b/shell/platform/android/test/io/flutter/embedding/engine/renderer/FlutterRendererTest.java
@@ -3,6 +3,9 @@ package io.flutter.embedding.engine.renderer;
 import static android.content.ComponentCallbacks2.TRIM_MEMORY_COMPLETE;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyFloat;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.eq;
@@ -14,15 +17,16 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.robolectric.Shadows.shadowOf;
 
+import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.SurfaceTexture;
+import android.media.Image;
 import android.os.Looper;
 import android.view.Surface;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import io.flutter.embedding.engine.FlutterJNI;
 import io.flutter.view.TextureRegistry;
 import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.Before;
 import org.junit.Test;
@@ -36,11 +40,19 @@ public class FlutterRendererTest {
 
   private FlutterJNI fakeFlutterJNI;
   private Surface fakeSurface;
+  private Surface fakeSurface2;
+
+  @Before
+  public void init() {
+    // Uncomment the following line to enable logging output in test.
+    // ShadowLog.stream = System.out;
+  }
 
   @Before
   public void setup() {
     fakeFlutterJNI = mock(FlutterJNI.class);
     fakeSurface = mock(Surface.class);
+    fakeSurface2 = mock(Surface.class);
   }
 
   @Test
@@ -50,7 +62,7 @@ public class FlutterRendererTest {
     FlutterRenderer flutterRenderer = new FlutterRenderer(fakeFlutterJNI);
 
     // Execute the behavior under test.
-    flutterRenderer.startRenderingToSurface(fakeSurface, /*keepCurrentSurface=*/ false);
+    flutterRenderer.startRenderingToSurface(fakeSurface, false);
 
     // Verify the behavior under test.
     verify(fakeFlutterJNI, times(1)).onSurfaceCreated(eq(fakeSurface));
@@ -62,7 +74,7 @@ public class FlutterRendererTest {
     Surface fakeSurface = mock(Surface.class);
     FlutterRenderer flutterRenderer = new FlutterRenderer(fakeFlutterJNI);
 
-    flutterRenderer.startRenderingToSurface(fakeSurface, /*keepCurrentSurface=*/ false);
+    flutterRenderer.startRenderingToSurface(fakeSurface, false);
 
     // Execute the behavior under test.
     flutterRenderer.surfaceChanged(100, 50);
@@ -77,7 +89,7 @@ public class FlutterRendererTest {
     Surface fakeSurface = mock(Surface.class);
     FlutterRenderer flutterRenderer = new FlutterRenderer(fakeFlutterJNI);
 
-    flutterRenderer.startRenderingToSurface(fakeSurface, /*keepCurrentSurface=*/ false);
+    flutterRenderer.startRenderingToSurface(fakeSurface, false);
 
     // Execute the behavior under test.
     flutterRenderer.stopRenderingToSurface();
@@ -92,10 +104,10 @@ public class FlutterRendererTest {
     Surface fakeSurface2 = mock(Surface.class);
     FlutterRenderer flutterRenderer = new FlutterRenderer(fakeFlutterJNI);
 
-    flutterRenderer.startRenderingToSurface(fakeSurface, /*keepCurrentSurface=*/ false);
+    flutterRenderer.startRenderingToSurface(fakeSurface, false);
 
     // Execute behavior under test.
-    flutterRenderer.startRenderingToSurface(fakeSurface2, /*keepCurrentSurface=*/ false);
+    flutterRenderer.startRenderingToSurface(fakeSurface2, false);
 
     // Verify behavior under test.
     verify(fakeFlutterJNI, times(1)).onSurfaceDestroyed(); // notification of 1st surface's removal.
@@ -106,7 +118,7 @@ public class FlutterRendererTest {
     // Setup the test.
     FlutterRenderer flutterRenderer = new FlutterRenderer(fakeFlutterJNI);
 
-    flutterRenderer.startRenderingToSurface(fakeSurface, /*keepCurrentSurface=*/ false);
+    flutterRenderer.startRenderingToSurface(fakeSurface, false);
 
     // Execute the behavior under test.
     flutterRenderer.stopRenderingToSurface();
@@ -120,9 +132,9 @@ public class FlutterRendererTest {
     // Setup the test.
     FlutterRenderer flutterRenderer = new FlutterRenderer(fakeFlutterJNI);
 
-    flutterRenderer.startRenderingToSurface(fakeSurface, /*keepCurrentSurface=*/ false);
+    flutterRenderer.startRenderingToSurface(fakeSurface, false);
 
-    flutterRenderer.startRenderingToSurface(fakeSurface, /*keepCurrentSurface=*/ false);
+    flutterRenderer.startRenderingToSurface(fakeSurface, false);
 
     // Verify behavior under test.
     verify(fakeFlutterJNI, times(1)).onSurfaceDestroyed();
@@ -133,9 +145,9 @@ public class FlutterRendererTest {
     // Setup the test.
     FlutterRenderer flutterRenderer = new FlutterRenderer(fakeFlutterJNI);
 
-    flutterRenderer.startRenderingToSurface(fakeSurface, /*keepCurrentSurface=*/ false);
+    flutterRenderer.startRenderingToSurface(fakeSurface, false);
 
-    flutterRenderer.startRenderingToSurface(fakeSurface, /*keepCurrentSurface=*/ true);
+    flutterRenderer.startRenderingToSurface(fakeSurface, true);
 
     // Verify behavior under test.
     verify(fakeFlutterJNI, never()).onSurfaceDestroyed();
@@ -151,7 +163,7 @@ public class FlutterRendererTest {
     FlutterRenderer.SurfaceTextureRegistryEntry entry =
         (FlutterRenderer.SurfaceTextureRegistryEntry) flutterRenderer.createSurfaceTexture();
 
-    flutterRenderer.startRenderingToSurface(fakeSurface, /*keepCurrentSurface=*/ false);
+    flutterRenderer.startRenderingToSurface(fakeSurface, false);
 
     // Execute the behavior under test.
     flutterRenderer.stopRenderingToSurface();
@@ -174,7 +186,7 @@ public class FlutterRendererTest {
         (FlutterRenderer.SurfaceTextureRegistryEntry)
             flutterRenderer.registerSurfaceTexture(surfaceTexture);
 
-    flutterRenderer.startRenderingToSurface(fakeSurface, /*keepCurrentSurface=*/ false);
+    flutterRenderer.startRenderingToSurface(fakeSurface, false);
 
     // Verify behavior under test.
     assertEquals(surfaceTexture, entry.surfaceTexture());
@@ -195,7 +207,7 @@ public class FlutterRendererTest {
         (FlutterRenderer.SurfaceTextureRegistryEntry) flutterRenderer.createSurfaceTexture();
     long id = entry.id();
 
-    flutterRenderer.startRenderingToSurface(fakeSurface, /*keepCurrentSurface=*/ false);
+    flutterRenderer.startRenderingToSurface(fakeSurface, false);
 
     // Execute the behavior under test.
     runFinalization(entry);
@@ -221,7 +233,7 @@ public class FlutterRendererTest {
         (FlutterRenderer.SurfaceTextureRegistryEntry) flutterRenderer.createSurfaceTexture();
     long id = entry.id();
 
-    flutterRenderer.startRenderingToSurface(fakeSurface, /*keepCurrentSurface=*/ false);
+    flutterRenderer.startRenderingToSurface(fakeSurface, false);
 
     flutterRenderer.stopRenderingToSurface();
 
@@ -250,8 +262,8 @@ public class FlutterRendererTest {
             });
     fakeFinalizer.start();
     try {
-      latch.await(5L, TimeUnit.SECONDS);
-    } catch (Throwable e) {
+      latch.await();
+    } catch (InterruptedException e) {
       // do nothing
     }
   }
@@ -393,4 +405,319 @@ public class FlutterRendererTest {
     // Verify behavior under test.
     assertEquals(1, invocationCount.get());
   }
+
+  @Test
+  public void itDoesDispatchSurfaceDestructionNotificationOnlyOnce() {
+    // Setup the test.
+    FlutterRenderer flutterRenderer = new FlutterRenderer(fakeFlutterJNI);
+
+    flutterRenderer.startRenderingToSurface(fakeSurface, false);
+
+    // Execute the behavior under test.
+    // Simulate calling |FlutterRenderer#stopRenderingToSurface| twice with different code paths.
+    flutterRenderer.stopRenderingToSurface();
+    flutterRenderer.stopRenderingToSurface();
+
+    // Verify behavior under test.
+    verify(fakeFlutterJNI, times(1)).onSurfaceDestroyed();
+  }
+
+  @Test
+  public void itInvokesCreatesSurfaceWhenStartingRendering() {
+    FlutterRenderer flutterRenderer = new FlutterRenderer(fakeFlutterJNI);
+
+    flutterRenderer.startRenderingToSurface(fakeSurface, false);
+    verify(fakeFlutterJNI, times(1)).onSurfaceCreated(eq(fakeSurface));
+  }
+
+  @Test
+  public void itDoesNotInvokeCreatesSurfaceWhenResumingRendering() {
+    FlutterRenderer flutterRenderer = new FlutterRenderer(fakeFlutterJNI);
+
+    // The following call sequence mimics the behaviour of FlutterView when it exits from hybrid
+    // composition mode.
+
+    // Install initial rendering surface.
+    flutterRenderer.startRenderingToSurface(fakeSurface, false);
+    verify(fakeFlutterJNI, times(1)).onSurfaceCreated(eq(fakeSurface));
+    verify(fakeFlutterJNI, times(0)).onSurfaceWindowChanged(eq(fakeSurface));
+
+    // Install the image view.
+    flutterRenderer.startRenderingToSurface(fakeSurface2, true);
+    verify(fakeFlutterJNI, times(1)).onSurfaceCreated(eq(fakeSurface));
+    verify(fakeFlutterJNI, times(0)).onSurfaceWindowChanged(eq(fakeSurface));
+    verify(fakeFlutterJNI, times(0)).onSurfaceCreated(eq(fakeSurface2));
+    verify(fakeFlutterJNI, times(1)).onSurfaceWindowChanged(eq(fakeSurface2));
+
+    flutterRenderer.startRenderingToSurface(fakeSurface, true);
+    verify(fakeFlutterJNI, times(1)).onSurfaceCreated(eq(fakeSurface));
+    verify(fakeFlutterJNI, times(1)).onSurfaceWindowChanged(eq(fakeSurface));
+    verify(fakeFlutterJNI, times(0)).onSurfaceCreated(eq(fakeSurface2));
+    verify(fakeFlutterJNI, times(1)).onSurfaceWindowChanged(eq(fakeSurface2));
+  }
+
+  @Test
+  public void ImageReaderSurfaceProducerProducesImageOfCorrectSize() {
+    FlutterRenderer flutterRenderer = new FlutterRenderer(fakeFlutterJNI);
+    FlutterRenderer.ImageReaderSurfaceProducer texture =
+        flutterRenderer.new ImageReaderSurfaceProducer(0);
+    texture.disableFenceForTest();
+
+    // Returns a null image when one hasn't been produced.
+    assertNull(texture.acquireLatestImage());
+
+    // Give the texture an initial size.
+    texture.setSize(1, 1);
+
+    // Render a frame.
+    Surface surface = texture.getSurface();
+    assertNotNull(surface);
+    Canvas canvas = surface.lockHardwareCanvas();
+    canvas.drawARGB(255, 255, 0, 0);
+    surface.unlockCanvasAndPost(canvas);
+
+    // Let callbacks run.
+    shadowOf(Looper.getMainLooper()).idle();
+
+    // Extract the image and check its size.
+    Image image = texture.acquireLatestImage();
+    assertEquals(1, image.getWidth());
+    assertEquals(1, image.getHeight());
+    image.close();
+
+    // Resize the texture.
+    texture.setSize(5, 5);
+
+    // Render a frame.
+    surface = texture.getSurface();
+    assertNotNull(surface);
+    canvas = surface.lockHardwareCanvas();
+    canvas.drawARGB(255, 255, 0, 0);
+    surface.unlockCanvasAndPost(canvas);
+
+    // Let callbacks run.
+    shadowOf(Looper.getMainLooper()).idle();
+
+    // Extract the image and check its size.
+    image = texture.acquireLatestImage();
+    assertEquals(5, image.getWidth());
+    assertEquals(5, image.getHeight());
+    image.close();
+
+    assertNull(texture.acquireLatestImage());
+
+    texture.release();
+  }
+
+  @Test
+  public void ImageReaderSurfaceProducerDoesNotDropFramesWhenResizeInflight() {
+    FlutterRenderer flutterRenderer = new FlutterRenderer(fakeFlutterJNI);
+    FlutterRenderer.ImageReaderSurfaceProducer texture =
+        flutterRenderer.new ImageReaderSurfaceProducer(0);
+    texture.disableFenceForTest();
+
+    // Returns a null image when one hasn't been produced.
+    assertNull(texture.acquireLatestImage());
+
+    // Give the texture an initial size.
+    texture.setSize(1, 1);
+
+    // Render a frame.
+    Surface surface = texture.getSurface();
+    assertNotNull(surface);
+    Canvas canvas = surface.lockHardwareCanvas();
+    canvas.drawARGB(255, 255, 0, 0);
+    surface.unlockCanvasAndPost(canvas);
+
+    // Resize.
+    texture.setSize(4, 4);
+
+    // Let callbacks run. The rendered frame will manifest here.
+    shadowOf(Looper.getMainLooper()).idle();
+
+    // We acquired the frame produced above.
+    assertNotNull(texture.acquireLatestImage());
+  }
+
+  @Test
+  public void ImageReaderSurfaceProducerImageReadersAndImagesCount() {
+    FlutterRenderer flutterRenderer = new FlutterRenderer(fakeFlutterJNI);
+    FlutterRenderer.ImageReaderSurfaceProducer texture =
+        flutterRenderer.new ImageReaderSurfaceProducer(0);
+    texture.disableFenceForTest();
+
+    // Returns a null image when one hasn't been produced.
+    assertNull(texture.acquireLatestImage());
+
+    // Give the texture an initial size.
+    texture.setSize(1, 1);
+
+    // Grab the surface so we can render a frame at 1x1 after resizing.
+    Surface surface = texture.getSurface();
+    assertNotNull(surface);
+    Canvas canvas = surface.lockHardwareCanvas();
+    canvas.drawARGB(255, 255, 0, 0);
+    surface.unlockCanvasAndPost(canvas);
+
+    // Let callbacks run, this will produce a single frame.
+    shadowOf(Looper.getMainLooper()).idle();
+
+    assertEquals(1, texture.numImageReaders());
+    assertEquals(1, texture.numImages());
+
+    // Resize.
+    texture.setSize(4, 4);
+
+    // Render a frame at the old size (by using the pre-resized Surface)
+    canvas = surface.lockHardwareCanvas();
+    canvas.drawARGB(255, 255, 0, 0);
+    surface.unlockCanvasAndPost(canvas);
+
+    // Let callbacks run.
+    shadowOf(Looper.getMainLooper()).idle();
+
+    assertEquals(1, texture.numImageReaders());
+    assertEquals(2, texture.numImages());
+
+    // Render a new frame with the current size.
+    surface = texture.getSurface();
+    assertNotNull(surface);
+    canvas = surface.lockHardwareCanvas();
+    canvas.drawARGB(255, 255, 0, 0);
+    surface.unlockCanvasAndPost(canvas);
+
+    // Let callbacks run.
+    shadowOf(Looper.getMainLooper()).idle();
+
+    assertEquals(2, texture.numImageReaders());
+    assertEquals(3, texture.numImages());
+
+    // Acquire first frame.
+    Image produced = texture.acquireLatestImage();
+    assertNotNull(produced);
+    assertEquals(1, produced.getWidth());
+    assertEquals(1, produced.getHeight());
+    assertEquals(2, texture.numImageReaders());
+    assertEquals(2, texture.numImages());
+    // Acquire second frame. This won't result in the first reader being closed because it has
+    // an active image from it.
+    produced = texture.acquireLatestImage();
+    assertNotNull(produced);
+    assertEquals(1, produced.getWidth());
+    assertEquals(1, produced.getHeight());
+    assertEquals(2, texture.numImageReaders());
+    assertEquals(1, texture.numImages());
+    // Acquire third frame. We will now close the first reader.
+    produced = texture.acquireLatestImage();
+    assertNotNull(produced);
+    assertEquals(4, produced.getWidth());
+    assertEquals(4, produced.getHeight());
+    assertEquals(1, texture.numImageReaders());
+    assertEquals(0, texture.numImages());
+
+    // Returns null image when no more images are queued.
+    assertNull(texture.acquireLatestImage());
+    assertEquals(1, texture.numImageReaders());
+    assertEquals(0, texture.numImages());
+  }
+
+  @Test
+  public void ImageReaderSurfaceProducerTrimMemoryCallback() {
+    FlutterRenderer flutterRenderer = new FlutterRenderer(fakeFlutterJNI);
+    FlutterRenderer.ImageReaderSurfaceProducer texture =
+        flutterRenderer.new ImageReaderSurfaceProducer(0);
+    texture.disableFenceForTest();
+
+    // Returns a null image when one hasn't been produced.
+    assertNull(texture.acquireLatestImage());
+
+    // Give the texture an initial size.
+    texture.setSize(1, 1);
+
+    // Grab the surface so we can render a frame at 1x1 after resizing.
+    Surface surface = texture.getSurface();
+    assertNotNull(surface);
+    Canvas canvas = surface.lockHardwareCanvas();
+    canvas.drawARGB(255, 255, 0, 0);
+    surface.unlockCanvasAndPost(canvas);
+
+    // Let callbacks run, this will produce a single frame.
+    shadowOf(Looper.getMainLooper()).idle();
+
+    assertEquals(1, texture.numImageReaders());
+    assertEquals(1, texture.numImages());
+
+    // Invoke the onTrimMemory callback with level 0.
+    // This should do nothing.
+    texture.onTrimMemory(0);
+    shadowOf(Looper.getMainLooper()).idle();
+
+    assertEquals(1, texture.numImageReaders());
+    assertEquals(1, texture.numImages());
+    assertEquals(0, texture.numTrims());
+
+    // Invoke the onTrimMemory callback with level 40.
+    // This should result in a trim.
+    texture.onTrimMemory(40);
+    shadowOf(Looper.getMainLooper()).idle();
+
+    assertEquals(0, texture.numImageReaders());
+    assertEquals(0, texture.numImages());
+    assertEquals(1, texture.numTrims());
+
+    // Request the surface, this should result in a new image reader.
+    surface = texture.getSurface();
+    assertEquals(1, texture.numImageReaders());
+    assertEquals(0, texture.numImages());
+    assertEquals(1, texture.numTrims());
+
+    // Render an image.
+    canvas = surface.lockHardwareCanvas();
+    canvas.drawARGB(255, 255, 0, 0);
+    surface.unlockCanvasAndPost(canvas);
+
+    // Let callbacks run, this will produce a single frame.
+    shadowOf(Looper.getMainLooper()).idle();
+
+    assertEquals(1, texture.numImageReaders());
+    assertEquals(1, texture.numImages());
+    assertEquals(1, texture.numTrims());
+  }
+
+  // A 0x0 ImageReader is a runtime error.
+  @Test
+  public void ImageReaderSurfaceProducerClampsWidthAndHeightTo1() {
+    FlutterRenderer flutterRenderer = new FlutterRenderer(fakeFlutterJNI);
+    FlutterRenderer.ImageReaderSurfaceProducer texture =
+        flutterRenderer.new ImageReaderSurfaceProducer(0);
+
+    // Default values.
+    assertEquals(texture.getWidth(), 1);
+    assertEquals(texture.getHeight(), 1);
+
+    // Try setting width and height to 0.
+    texture.setSize(0, 0);
+
+    // Ensure we can still create/get a surface without an exception being raised.
+    assertNotNull(texture.getSurface());
+
+    // Expect clamp to 1.
+    assertEquals(texture.getWidth(), 1);
+    assertEquals(texture.getHeight(), 1);
+  }
+
+  @Test
+  public void SurfaceTextureSurfaceProducerCreatesAConnectedTexture() {
+    // Force creating a SurfaceTextureSurfaceProducer regardless of Android API version.
+    FlutterRenderer.debugForceSurfaceProducerGlTextures = true;
+
+    FlutterRenderer flutterRenderer = new FlutterRenderer(fakeFlutterJNI);
+    TextureRegistry.SurfaceProducer producer = flutterRenderer.createSurfaceProducer();
+
+    flutterRenderer.startRenderingToSurface(fakeSurface, false);
+
+    // Verify behavior under test.
+    assertEquals(producer.id(), 0);
+    verify(fakeFlutterJNI, times(1)).registerTexture(eq(producer.id()), any());
+  }
 }
diff --git a/shell/platform/android/test/io/flutter/embedding/engine/renderer/SurfaceTextureSurfaceProducerTest.java b/shell/platform/android/test/io/flutter/embedding/engine/renderer/SurfaceTextureSurfaceProducerTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..f0c2cfecef2d2a6ba58b0a965e550a7f385fd493
--- /dev/null
+++ b/shell/platform/android/test/io/flutter/embedding/engine/renderer/SurfaceTextureSurfaceProducerTest.java
@@ -0,0 +1,66 @@
+package io.flutter.embedding.engine.renderer;
+
+import static io.flutter.Build.API_LEVELS;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.annotation.TargetApi;
+import android.graphics.Canvas;
+import android.graphics.SurfaceTexture;
+import android.os.Handler;
+import android.os.Looper;
+import android.view.Surface;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import io.flutter.embedding.engine.FlutterJNI;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+@TargetApi(API_LEVELS.API_26)
+public final class SurfaceTextureSurfaceProducerTest {
+  private final FlutterJNI fakeJNI = mock(FlutterJNI.class);
+
+  @Test
+  public void createsSurfaceTextureOfGivenSizeAndResizesWhenRequested() {
+    final FlutterRenderer flutterRenderer = new FlutterRenderer(fakeJNI);
+
+    // Create a surface and set the initial size.
+    final Handler handler = new Handler(Looper.getMainLooper());
+    final SurfaceTextureSurfaceProducer producer =
+        new SurfaceTextureSurfaceProducer(
+            0, handler, fakeJNI, flutterRenderer.registerSurfaceTexture(new SurfaceTexture(0)));
+    final Surface surface = producer.getSurface();
+    AtomicInteger frames = new AtomicInteger();
+    producer
+        .getSurfaceTexture()
+        .setOnFrameAvailableListener(
+            (texture) -> {
+              if (texture.isReleased()) {
+                return;
+              }
+              frames.getAndIncrement();
+            });
+    producer.setSize(100, 200);
+
+    // Draw.
+    Canvas canvas = surface.lockHardwareCanvas();
+    canvas.drawARGB(255, 255, 0, 0);
+    surface.unlockCanvasAndPost(canvas);
+    shadowOf(Looper.getMainLooper()).idle();
+    assertEquals(frames.get(), 1);
+
+    // Resize and redraw.
+    producer.setSize(400, 800);
+    canvas = surface.lockHardwareCanvas();
+    canvas.drawARGB(255, 255, 0, 0);
+    surface.unlockCanvasAndPost(canvas);
+    shadowOf(Looper.getMainLooper()).idle();
+    assertEquals(frames.get(), 2);
+
+    // Done.
+    fakeJNI.detachFromNativeAndReleaseResources();
+    producer.release();
+  }
+}
diff --git a/shell/platform/android/test/io/flutter/embedding/engine/systemchannels/AccessibilityChannelTest.java b/shell/platform/android/test/io/flutter/embedding/engine/systemchannels/AccessibilityChannelTest.java
index adf121a99fdbb0dd0f2dc8a3b09018375fabc295..344f1557fc141cde59e29db09d6b107c349d9d00 100644
--- a/shell/platform/android/test/io/flutter/embedding/engine/systemchannels/AccessibilityChannelTest.java
+++ b/shell/platform/android/test/io/flutter/embedding/engine/systemchannels/AccessibilityChannelTest.java
@@ -1,5 +1,6 @@
 package io.flutter.embedding.engine.systemchannels;
 
+import static io.flutter.Build.API_LEVELS;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
@@ -7,6 +8,7 @@ import android.annotation.TargetApi;
 import io.flutter.embedding.engine.FlutterJNI;
 import io.flutter.embedding.engine.dart.DartExecutor;
 import io.flutter.plugin.common.BasicMessageChannel;
+import java.util.HashMap;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.Test;
@@ -18,7 +20,7 @@ import org.robolectric.annotation.Config;
     manifest = Config.NONE,
     shadows = {})
 @RunWith(RobolectricTestRunner.class)
-@TargetApi(24)
+@TargetApi(API_LEVELS.API_24)
 public class AccessibilityChannelTest {
   @Test
   public void repliesWhenNoAccessibilityHandler() throws JSONException {
@@ -30,4 +32,19 @@ public class AccessibilityChannelTest {
     accessibilityChannel.parsingMessageHandler.onMessage(arguments, reply);
     verify(reply).reply(null);
   }
+
+  @Test
+  public void handleFocus() throws JSONException {
+    AccessibilityChannel accessibilityChannel =
+        new AccessibilityChannel(mock(DartExecutor.class), mock(FlutterJNI.class));
+    HashMap<String, Object> arguments = new HashMap<>();
+    arguments.put("type", "focus");
+    arguments.put("nodeId", 123);
+    AccessibilityChannel.AccessibilityMessageHandler handler =
+        mock(AccessibilityChannel.AccessibilityMessageHandler.class);
+    accessibilityChannel.setAccessibilityMessageHandler(handler);
+    BasicMessageChannel.Reply reply = mock(BasicMessageChannel.Reply.class);
+    accessibilityChannel.parsingMessageHandler.onMessage(arguments, reply);
+    verify(handler).onFocus(123);
+  }
 }
diff --git a/shell/platform/android/test/io/flutter/embedding/engine/systemchannels/KeyEventChannelTest.java b/shell/platform/android/test/io/flutter/embedding/engine/systemchannels/KeyEventChannelTest.java
index 32b328e9307aa71344445585619d6e9611e02435..7dd4de7d42c0989f17092ac7bb46af04b4102284 100644
--- a/shell/platform/android/test/io/flutter/embedding/engine/systemchannels/KeyEventChannelTest.java
+++ b/shell/platform/android/test/io/flutter/embedding/engine/systemchannels/KeyEventChannelTest.java
@@ -1,5 +1,6 @@
 package io.flutter.embedding.engine.systemchannels;
 
+import static io.flutter.Build.API_LEVELS;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -35,7 +36,7 @@ import org.robolectric.shadow.api.Shadow;
 
 @Config(manifest = Config.NONE)
 @RunWith(AndroidJUnit4.class)
-@TargetApi(24)
+@TargetApi(API_LEVELS.API_24)
 public class KeyEventChannelTest {
 
   KeyEvent keyEvent;
diff --git a/shell/platform/android/test/io/flutter/embedding/engine/systemchannels/KeyboardChannelTest.java b/shell/platform/android/test/io/flutter/embedding/engine/systemchannels/KeyboardChannelTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..d0c436011e14d9d013fcdd5153e132ca300010a4
--- /dev/null
+++ b/shell/platform/android/test/io/flutter/embedding/engine/systemchannels/KeyboardChannelTest.java
@@ -0,0 +1,69 @@
+package io.flutter.embedding.android;
+
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import io.flutter.embedding.engine.dart.DartExecutor;
+import io.flutter.embedding.engine.systemchannels.KeyboardChannel;
+import io.flutter.plugin.common.BinaryMessenger;
+import io.flutter.plugin.common.MethodCall;
+import io.flutter.plugin.common.MethodChannel;
+import io.flutter.plugin.common.StandardMethodCodec;
+import java.nio.ByteBuffer;
+import java.util.HashMap;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.robolectric.annotation.Config;
+
+@Config(manifest = Config.NONE)
+@RunWith(AndroidJUnit4.class)
+public class KeyboardChannelTest {
+
+  private static BinaryMessenger.BinaryReply sendToBinaryMessageHandler(
+      BinaryMessenger.BinaryMessageHandler binaryMessageHandler, String method, Object args) {
+    MethodCall methodCall = new MethodCall(method, args);
+    ByteBuffer encodedMethodCall = StandardMethodCodec.INSTANCE.encodeMethodCall(methodCall);
+    BinaryMessenger.BinaryReply reply = mock(BinaryMessenger.BinaryReply.class);
+    binaryMessageHandler.onMessage((ByteBuffer) encodedMethodCall.flip(), reply);
+    return reply;
+  }
+
+  @SuppressWarnings("deprecation")
+  // setMessageHandler is deprecated.
+  @Test
+  public void respondsToGetKeyboardStateChannelMessage() {
+    ArgumentCaptor<BinaryMessenger.BinaryMessageHandler> binaryMessageHandlerCaptor =
+        ArgumentCaptor.forClass(BinaryMessenger.BinaryMessageHandler.class);
+    DartExecutor mockBinaryMessenger = mock(DartExecutor.class);
+    KeyboardChannel.KeyboardMethodHandler mockHandler =
+        mock(KeyboardChannel.KeyboardMethodHandler.class);
+    KeyboardChannel keyboardChannel = new KeyboardChannel(mockBinaryMessenger);
+
+    verify(mockBinaryMessenger, times(1))
+        .setMessageHandler(any(String.class), binaryMessageHandlerCaptor.capture());
+
+    BinaryMessenger.BinaryMessageHandler binaryMessageHandler =
+        binaryMessageHandlerCaptor.getValue();
+
+    keyboardChannel.setKeyboardMethodHandler(mockHandler);
+    sendToBinaryMessageHandler(binaryMessageHandler, "getKeyboardState", null);
+
+    verify(mockHandler, times(1)).getKeyboardState();
+  }
+
+  @Test
+  public void repliesWhenNoKeyboardChannelHandler() {
+    // Regression test for https://github.com/flutter/flutter/issues/122441#issuecomment-1582052616.
+
+    KeyboardChannel keyboardChannel = new KeyboardChannel(mock(DartExecutor.class));
+    MethodCall methodCall = new MethodCall("getKeyboardState", null);
+    MethodChannel.Result result = mock(MethodChannel.Result.class);
+    keyboardChannel.parsingMethodHandler.onMethodCall(methodCall, result);
+
+    verify(result).success(new HashMap());
+  }
+}
diff --git a/shell/platform/android/test/io/flutter/embedding/engine/systemchannels/LifecycleChannelTest.java b/shell/platform/android/test/io/flutter/embedding/engine/systemchannels/LifecycleChannelTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..3adc80212b2d7d04cc7517610001bfae580ce3e0
--- /dev/null
+++ b/shell/platform/android/test/io/flutter/embedding/engine/systemchannels/LifecycleChannelTest.java
@@ -0,0 +1,133 @@
+package io.flutter.embedding.engine.systemchannels;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import io.flutter.plugin.common.BasicMessageChannel;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.robolectric.annotation.Config;
+
+@Config(manifest = Config.NONE)
+@RunWith(AndroidJUnit4.class)
+public class LifecycleChannelTest {
+  LifecycleChannel lifecycleChannel;
+  BasicMessageChannel<String> mockChannel;
+
+  @Before
+  public void setUp() {
+    mockChannel = mock(BasicMessageChannel.class);
+    lifecycleChannel = new LifecycleChannel(mockChannel);
+  }
+
+  @Test
+  public void lifecycleChannel_handlesResumed() {
+    lifecycleChannel.appIsResumed();
+    ArgumentCaptor<String> stringArgumentCaptor = ArgumentCaptor.forClass(String.class);
+    verify(mockChannel, times(1)).send(stringArgumentCaptor.capture());
+    assertEquals("AppLifecycleState.resumed", stringArgumentCaptor.getValue());
+
+    lifecycleChannel.noWindowsAreFocused();
+    stringArgumentCaptor = ArgumentCaptor.forClass(String.class);
+    verify(mockChannel, times(2)).send(stringArgumentCaptor.capture());
+    assertEquals("AppLifecycleState.inactive", stringArgumentCaptor.getValue());
+
+    lifecycleChannel.aWindowIsFocused();
+    stringArgumentCaptor = ArgumentCaptor.forClass(String.class);
+    verify(mockChannel, times(3)).send(stringArgumentCaptor.capture());
+    assertEquals("AppLifecycleState.resumed", stringArgumentCaptor.getValue());
+
+    // Stays inactive, so no event is sent.
+    lifecycleChannel.appIsInactive();
+    verify(mockChannel, times(4)).send(any(String.class));
+
+    // Stays inactive, so no event is sent.
+    lifecycleChannel.appIsResumed();
+    verify(mockChannel, times(5)).send(any(String.class));
+
+    lifecycleChannel.aWindowIsFocused();
+    stringArgumentCaptor = ArgumentCaptor.forClass(String.class);
+    verify(mockChannel, times(5)).send(stringArgumentCaptor.capture());
+    assertEquals("AppLifecycleState.resumed", stringArgumentCaptor.getValue());
+  }
+
+  @Test
+  public void lifecycleChannel_handlesInactive() {
+    lifecycleChannel.appIsInactive();
+    ArgumentCaptor<String> stringArgumentCaptor = ArgumentCaptor.forClass(String.class);
+    verify(mockChannel, times(1)).send(stringArgumentCaptor.capture());
+    assertEquals("AppLifecycleState.inactive", stringArgumentCaptor.getValue());
+
+    // Stays inactive, so no event is sent.
+    lifecycleChannel.aWindowIsFocused();
+    verify(mockChannel, times(1)).send(any(String.class));
+
+    // Stays inactive, so no event is sent.
+    lifecycleChannel.noWindowsAreFocused();
+    verify(mockChannel, times(1)).send(any(String.class));
+
+    lifecycleChannel.appIsResumed();
+    lifecycleChannel.aWindowIsFocused();
+    stringArgumentCaptor = ArgumentCaptor.forClass(String.class);
+    verify(mockChannel, times(2)).send(stringArgumentCaptor.capture());
+    assertEquals("AppLifecycleState.resumed", stringArgumentCaptor.getValue());
+  }
+
+  @Test
+  public void lifecycleChannel_handlesPaused() {
+    // Stays inactive, so no event is sent.
+    lifecycleChannel.appIsPaused();
+    ArgumentCaptor<String> stringArgumentCaptor = ArgumentCaptor.forClass(String.class);
+    verify(mockChannel, times(1)).send(stringArgumentCaptor.capture());
+    assertEquals("AppLifecycleState.paused", stringArgumentCaptor.getValue());
+
+    // Stays paused, so no event is sent.
+    lifecycleChannel.aWindowIsFocused();
+    verify(mockChannel, times(1)).send(any(String.class));
+
+    lifecycleChannel.noWindowsAreFocused();
+    verify(mockChannel, times(1)).send(any(String.class));
+
+    lifecycleChannel.appIsResumed();
+    stringArgumentCaptor = ArgumentCaptor.forClass(String.class);
+    verify(mockChannel, times(2)).send(stringArgumentCaptor.capture());
+    assertEquals("AppLifecycleState.inactive", stringArgumentCaptor.getValue());
+
+    lifecycleChannel.aWindowIsFocused();
+    stringArgumentCaptor = ArgumentCaptor.forClass(String.class);
+    verify(mockChannel, times(3)).send(stringArgumentCaptor.capture());
+    assertEquals("AppLifecycleState.resumed", stringArgumentCaptor.getValue());
+  }
+
+  @Test
+  public void lifecycleChannel_handlesDetached() {
+    // Stays inactive, so no event is sent.
+    lifecycleChannel.appIsDetached();
+    ArgumentCaptor<String> stringArgumentCaptor = ArgumentCaptor.forClass(String.class);
+    verify(mockChannel, times(1)).send(stringArgumentCaptor.capture());
+    assertEquals("AppLifecycleState.detached", stringArgumentCaptor.getValue());
+
+    // Stays paused, so no event is sent.
+    lifecycleChannel.aWindowIsFocused();
+    verify(mockChannel, times(1)).send(any(String.class));
+
+    lifecycleChannel.noWindowsAreFocused();
+    verify(mockChannel, times(1)).send(any(String.class));
+
+    lifecycleChannel.appIsResumed();
+    stringArgumentCaptor = ArgumentCaptor.forClass(String.class);
+    verify(mockChannel, times(2)).send(stringArgumentCaptor.capture());
+    assertEquals("AppLifecycleState.inactive", stringArgumentCaptor.getValue());
+
+    lifecycleChannel.aWindowIsFocused();
+    stringArgumentCaptor = ArgumentCaptor.forClass(String.class);
+    verify(mockChannel, times(3)).send(stringArgumentCaptor.capture());
+    assertEquals("AppLifecycleState.resumed", stringArgumentCaptor.getValue());
+  }
+}
diff --git a/shell/platform/android/test/io/flutter/embedding/engine/systemchannels/PlatformChannelTest.java b/shell/platform/android/test/io/flutter/embedding/engine/systemchannels/PlatformChannelTest.java
index 85ebafd471ff8e9b1b3f99187a648c08f7544706..a8c203d917ffe133fdee4a1cc3c922c7518789f3 100644
--- a/shell/platform/android/test/io/flutter/embedding/engine/systemchannels/PlatformChannelTest.java
+++ b/shell/platform/android/test/io/flutter/embedding/engine/systemchannels/PlatformChannelTest.java
@@ -1,6 +1,8 @@
 package io.flutter.embedding.engine.systemchannels;
 
+import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.refEq;
+import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -15,6 +17,7 @@ import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
 import org.robolectric.annotation.Config;
 
 @Config(manifest = Config.NONE)
@@ -42,4 +45,26 @@ public class PlatformChannelTest {
     }
     verify(mockResult).success(refEq(expected));
   }
+
+  @Test
+  public void platformChannel_shareInvokeMessage() {
+    MethodChannel rawChannel = mock(MethodChannel.class);
+    FlutterJNI mockFlutterJNI = mock(FlutterJNI.class);
+    DartExecutor dartExecutor = new DartExecutor(mockFlutterJNI, mock(AssetManager.class));
+    PlatformChannel fakePlatformChannel = new PlatformChannel(dartExecutor);
+    PlatformChannel.PlatformMessageHandler mockMessageHandler =
+        mock(PlatformChannel.PlatformMessageHandler.class);
+    fakePlatformChannel.setPlatformMessageHandler(mockMessageHandler);
+
+    ArgumentCaptor<String> valueCapture = ArgumentCaptor.forClass(String.class);
+    doNothing().when(mockMessageHandler).share(valueCapture.capture());
+
+    final String expectedContent = "Flutter";
+    MethodCall methodCall = new MethodCall("Share.invoke", expectedContent);
+    MethodChannel.Result mockResult = mock(MethodChannel.Result.class);
+    fakePlatformChannel.parsingMethodCallHandler.onMethodCall(methodCall, mockResult);
+
+    assertEquals(valueCapture.getValue(), expectedContent);
+    verify(mockResult).success(null);
+  }
 }
diff --git a/shell/platform/android/test/io/flutter/embedding/engine/systemchannels/RestorationChannelTest.java b/shell/platform/android/test/io/flutter/embedding/engine/systemchannels/RestorationChannelTest.java
index a58c098990cf2113ef99888f4ca192caf818c765..88f928dcfc6ffb6230fe8e78cf2e04eaf546b4f8 100644
--- a/shell/platform/android/test/io/flutter/embedding/engine/systemchannels/RestorationChannelTest.java
+++ b/shell/platform/android/test/io/flutter/embedding/engine/systemchannels/RestorationChannelTest.java
@@ -1,5 +1,6 @@
 package io.flutter.embedding.engine.systemchannels;
 
+import static io.flutter.Build.API_LEVELS;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.eq;
@@ -24,7 +25,7 @@ import org.robolectric.annotation.Config;
     manifest = Config.NONE,
     shadows = {})
 @RunWith(AndroidJUnit4.class)
-@TargetApi(24)
+@TargetApi(API_LEVELS.API_24)
 public class RestorationChannelTest {
   @Test
   public void itDoesNotDoAnythingWhenRestorationDataIsSetBeforeFrameworkAsks()
diff --git a/shell/platform/android/test/io/flutter/embedding/engine/systemchannels/SettingsChannelTest.java b/shell/platform/android/test/io/flutter/embedding/engine/systemchannels/SettingsChannelTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..0831f9509fd0d4b961d7bdce84a3569b03bb1356
--- /dev/null
+++ b/shell/platform/android/test/io/flutter/embedding/engine/systemchannels/SettingsChannelTest.java
@@ -0,0 +1,76 @@
+package io.flutter.embedding.engine.systemchannels;
+
+import static io.flutter.Build.API_LEVELS;
+import static junit.framework.TestCase.assertEquals;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.isNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import android.annotation.TargetApi;
+import android.util.DisplayMetrics;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import io.flutter.embedding.engine.dart.DartExecutor;
+import io.flutter.plugin.common.BasicMessageChannel;
+import java.nio.ByteBuffer;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.robolectric.annotation.Config;
+
+@Config(manifest = Config.NONE)
+@RunWith(AndroidJUnit4.class)
+public class SettingsChannelTest {
+  @Test
+  @TargetApi(API_LEVELS.API_33)
+  @Config(sdk = API_LEVELS.API_33)
+  @SuppressWarnings("deprecation")
+  // DartExecutor.send is deprecated.
+  public void setDisplayMetricsDoesNothingOnAPILevel33() {
+    final DartExecutor executor = mock(DartExecutor.class);
+    executor.onAttachedToJNI();
+    final SettingsChannel settingsChannel = new SettingsChannel(executor);
+
+    final ArgumentCaptor<ByteBuffer> messageCaptor = ArgumentCaptor.forClass(ByteBuffer.class);
+
+    settingsChannel.startMessage().setDisplayMetrics(mock(DisplayMetrics.class)).send();
+
+    verify(executor).send(eq("flutter/settings"), messageCaptor.capture(), isNull());
+  }
+
+  @Test
+  public void configurationQueueWorks() {
+    final SettingsChannel.ConfigurationQueue queue = new SettingsChannel.ConfigurationQueue();
+    final int baseId = Integer.MIN_VALUE;
+
+    queue.enqueueConfiguration(
+        new SettingsChannel.ConfigurationQueue.SentConfiguration(mock(DisplayMetrics.class)));
+    queue.enqueueConfiguration(
+        new SettingsChannel.ConfigurationQueue.SentConfiguration(mock(DisplayMetrics.class)));
+    assertEquals(baseId + 0, queue.getConfiguration(baseId + 0).generationNumber);
+    assertEquals(baseId + 1, queue.getConfiguration(baseId + 1).generationNumber);
+    assertEquals(baseId + 1, queue.getConfiguration(baseId + 1).generationNumber);
+
+    queue.enqueueConfiguration(
+        new SettingsChannel.ConfigurationQueue.SentConfiguration(mock(DisplayMetrics.class)));
+    queue.enqueueConfiguration(
+        new SettingsChannel.ConfigurationQueue.SentConfiguration(mock(DisplayMetrics.class)));
+    assertEquals(baseId + 3, queue.getConfiguration(baseId + 3).generationNumber);
+    // Can get the same configuration more than once.
+    assertEquals(baseId + 3, queue.getConfiguration(baseId + 3).generationNumber);
+
+    final BasicMessageChannel.Reply replyFor4 =
+        queue.enqueueConfiguration(
+            new SettingsChannel.ConfigurationQueue.SentConfiguration(mock(DisplayMetrics.class)));
+    final BasicMessageChannel.Reply replyFor5 =
+        queue.enqueueConfiguration(
+            new SettingsChannel.ConfigurationQueue.SentConfiguration(mock(DisplayMetrics.class)));
+    replyFor4.reply(null);
+    replyFor5.reply(null);
+    assertEquals(baseId + 5, queue.getConfiguration(baseId + 5).generationNumber);
+    assertEquals(baseId + 5, queue.getConfiguration(baseId + 5).generationNumber);
+  }
+
+  // TODO(LongCatIsLooong): add tests for API 34 code path.
+  // https://github.com/flutter/flutter/issues/128825
+}
diff --git a/shell/platform/android/test/io/flutter/embedding/engine/systemchannels/TextInputChannelTest.java b/shell/platform/android/test/io/flutter/embedding/engine/systemchannels/TextInputChannelTest.java
index 067b5d183b54c181bbd028baab9322e0b20f86c4..0194ce0328795e5ad0b8ecfd01d41082b4f8cffe 100644
--- a/shell/platform/android/test/io/flutter/embedding/engine/systemchannels/TextInputChannelTest.java
+++ b/shell/platform/android/test/io/flutter/embedding/engine/systemchannels/TextInputChannelTest.java
@@ -1,5 +1,6 @@
 package io.flutter.embedding.engine.systemchannels;
 
+import static io.flutter.Build.API_LEVELS;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
@@ -19,7 +20,7 @@ import org.robolectric.annotation.Config;
     manifest = Config.NONE,
     shadows = {})
 @RunWith(AndroidJUnit4.class)
-@TargetApi(24)
+@TargetApi(API_LEVELS.API_24)
 public class TextInputChannelTest {
   @Test
   public void setEditableSizeAndTransformCompletes() throws JSONException {
diff --git a/shell/platform/android/test/io/flutter/plugin/common/MethodChannelTest.java b/shell/platform/android/test/io/flutter/plugin/common/MethodChannelTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..df1fa2108c296250fc429c1ac6f90e29d13d3dee
--- /dev/null
+++ b/shell/platform/android/test/io/flutter/plugin/common/MethodChannelTest.java
@@ -0,0 +1,97 @@
+package io.flutter.plugin.common;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import android.content.res.AssetManager;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import io.flutter.embedding.engine.FlutterJNI;
+import io.flutter.embedding.engine.dart.DartExecutor;
+import java.nio.ByteBuffer;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentMatcher;
+import org.robolectric.annotation.Config;
+
+@Config(manifest = Config.NONE)
+@RunWith(AndroidJUnit4.class)
+public class MethodChannelTest {
+  @Test
+  public void resizeChannelBufferMessageIsWellformed() {
+    FlutterJNI mockFlutterJNI = mock(FlutterJNI.class);
+    DartExecutor dartExecutor = new DartExecutor(mockFlutterJNI, mock(AssetManager.class));
+    String channel = "flutter/test";
+    MethodChannel rawChannel = new MethodChannel(dartExecutor, channel);
+
+    int newSize = 3;
+    rawChannel.resizeChannelBuffer(newSize);
+
+    // Created from the following Dart code:
+    //   MethodCall methodCall = const MethodCall('resize', ['flutter/test', 3]);
+    //   const StandardMethodCodec().encodeMethodCall(methodCall).buffer.asUint8List();
+    final byte[] expected = {
+      7, 6, 114, 101, 115, 105, 122, 101, 12, 2, 7, 12, 102, 108, 117, 116, 116, 101, 114, 47, 116,
+      101, 115, 116, 3, 3, 0, 0, 0
+    };
+
+    // Verify that the correct message was sent to FlutterJNI.
+    ArgumentMatcher<ByteBuffer> packetMatcher =
+        new ByteBufferContentMatcher(ByteBuffer.wrap(expected));
+    verify(mockFlutterJNI, times(1))
+        .dispatchPlatformMessage(
+            eq(BasicMessageChannel.CHANNEL_BUFFERS_CHANNEL),
+            argThat(packetMatcher),
+            anyInt(),
+            anyInt());
+  }
+
+  @Test
+  public void overflowChannelBufferMessageIsWellformed() {
+    FlutterJNI mockFlutterJNI = mock(FlutterJNI.class);
+    DartExecutor dartExecutor = new DartExecutor(mockFlutterJNI, mock(AssetManager.class));
+    String channel = "flutter/test";
+    MethodChannel rawChannel = new MethodChannel(dartExecutor, channel);
+
+    rawChannel.setWarnsOnChannelOverflow(false);
+
+    // Created from the following Dart code:
+    //   MethodCall methodCall = const MethodCall('overflow', ['flutter/test', true]);
+    //   const StandardMethodCodec().encodeMethodCall(methodCall).buffer.asUint8List();
+    final byte[] expected = {
+      7, 8, 111, 118, 101, 114, 102, 108, 111, 119, 12, 2, 7, 12, 102, 108, 117, 116, 116, 101, 114,
+      47, 116, 101, 115, 116, 1
+    };
+
+    // Verify that the correct message was sent to FlutterJNI.
+    ArgumentMatcher<ByteBuffer> packetMatcher =
+        new ByteBufferContentMatcher(ByteBuffer.wrap(expected));
+    verify(mockFlutterJNI, times(1))
+        .dispatchPlatformMessage(
+            eq(BasicMessageChannel.CHANNEL_BUFFERS_CHANNEL),
+            argThat(packetMatcher),
+            anyInt(),
+            anyInt());
+  }
+}
+
+// Custom ByteBuffer matcher which calls rewind on both buffers before calling equals.
+// ByteBuffer.equals might return true when comparing byte buffers with different content if
+// both have no remaining elements.
+class ByteBufferContentMatcher implements ArgumentMatcher<ByteBuffer> {
+  private ByteBuffer expected;
+
+  public ByteBufferContentMatcher(ByteBuffer expected) {
+    this.expected = expected;
+  }
+
+  @Override
+  public boolean matches(ByteBuffer received) {
+    expected.rewind();
+    received.rewind();
+    return received.equals(expected);
+  }
+}
diff --git a/shell/platform/android/test/io/flutter/plugin/editing/InputConnectionAdaptorTest.java b/shell/platform/android/test/io/flutter/plugin/editing/InputConnectionAdaptorTest.java
index fbb44da41bcb762a67626a44a7c1a6b906f13c6f..1158f1d33b0cf2bd23fb80aacc0e5a0a30452545 100644
--- a/shell/platform/android/test/io/flutter/plugin/editing/InputConnectionAdaptorTest.java
+++ b/shell/platform/android/test/io/flutter/plugin/editing/InputConnectionAdaptorTest.java
@@ -22,7 +22,6 @@ import android.content.ContentResolver;
 import android.content.Context;
 import android.content.res.AssetManager;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.text.InputType;
 import android.text.Selection;
@@ -135,6 +134,8 @@ public class InputConnectionAdaptorTest {
     assertEquals(editable.length(), Selection.getSelectionEnd(editable));
   }
 
+  @SuppressWarnings("deprecation")
+  // ClipboardManager.hasText is deprecated.
   @Test
   public void testPerformContextMenuAction_cut() {
     ClipboardManager clipboardManager = ctx.getSystemService(ClipboardManager.class);
@@ -152,6 +153,8 @@ public class InputConnectionAdaptorTest {
     assertFalse(editable.toString().contains(textToBeCut));
   }
 
+  @SuppressWarnings("deprecation")
+  // ClipboardManager.hasText is deprecated.
   @Test
   public void testPerformContextMenuAction_copy() {
     ClipboardManager clipboardManager = ctx.getSystemService(ClipboardManager.class);
@@ -171,6 +174,8 @@ public class InputConnectionAdaptorTest {
         clipboardManager.getPrimaryClip().getItemAt(0).getText());
   }
 
+  @SuppressWarnings("deprecation")
+  // ClipboardManager.setText is deprecated.
   @Test
   public void testPerformContextMenuAction_paste() {
     ClipboardManager clipboardManager = ctx.getSystemService(ClipboardManager.class);
@@ -185,6 +190,8 @@ public class InputConnectionAdaptorTest {
     assertTrue(editable.toString().startsWith(textToBePasted));
   }
 
+  @SuppressWarnings("deprecation")
+  // DartExecutor.send is deprecated.
   @Test
   public void testCommitContent() throws JSONException {
     View testView = new View(ctx);
@@ -244,6 +251,8 @@ public class InputConnectionAdaptorTest {
         });
   }
 
+  @SuppressWarnings("deprecation")
+  // DartExecutor.send is deprecated.
   @Test
   public void testPerformPrivateCommand_dataIsNull() throws JSONException {
     View testView = new View(ctx);
@@ -273,6 +282,8 @@ public class InputConnectionAdaptorTest {
         new String[] {"0", "{\"action\":\"actionCommand\"}"});
   }
 
+  @SuppressWarnings("deprecation")
+  // DartExecutor.send is deprecated.
   @Test
   public void testPerformPrivateCommand_dataIsByteArray() throws JSONException {
     View testView = new View(ctx);
@@ -308,6 +319,8 @@ public class InputConnectionAdaptorTest {
         });
   }
 
+  @SuppressWarnings("deprecation")
+  // DartExecutor.send is deprecated.
   @Test
   public void testPerformPrivateCommand_dataIsByte() throws JSONException {
     View testView = new View(ctx);
@@ -341,6 +354,8 @@ public class InputConnectionAdaptorTest {
         new String[] {"0", "{\"data\":{\"keyboard_layout\":3},\"action\":\"actionCommand\"}"});
   }
 
+  @SuppressWarnings("deprecation")
+  // DartExecutor.send is deprecated.
   @Test
   public void testPerformPrivateCommand_dataIsCharArray() throws JSONException {
     View testView = new View(ctx);
@@ -377,6 +392,8 @@ public class InputConnectionAdaptorTest {
         });
   }
 
+  @SuppressWarnings("deprecation")
+  // DartExecutor.send is deprecated.
   @Test
   public void testPerformPrivateCommand_dataIsChar() throws JSONException {
     View testView = new View(ctx);
@@ -410,6 +427,8 @@ public class InputConnectionAdaptorTest {
         new String[] {"0", "{\"data\":{\"keyboard_layout\":\"a\"},\"action\":\"actionCommand\"}"});
   }
 
+  @SuppressWarnings("deprecation")
+  // DartExecutor.send is deprecated.
   @Test
   public void testPerformPrivateCommand_dataIsCharSequenceArray() throws JSONException {
     View testView = new View(ctx);
@@ -447,6 +466,8 @@ public class InputConnectionAdaptorTest {
         });
   }
 
+  @SuppressWarnings("deprecation")
+  // DartExecutor.send is deprecated.
   @Test
   public void testPerformPrivateCommand_dataIsCharSequence() throws JSONException {
     View testView = new View(ctx);
@@ -482,6 +503,8 @@ public class InputConnectionAdaptorTest {
         });
   }
 
+  @SuppressWarnings("deprecation")
+  // DartExecutor.send is deprecated.
   @Test
   public void testPerformPrivateCommand_dataIsFloat() throws JSONException {
     View testView = new View(ctx);
@@ -515,6 +538,8 @@ public class InputConnectionAdaptorTest {
         new String[] {"0", "{\"data\":{\"keyboard_layout\":0.5},\"action\":\"actionCommand\"}"});
   }
 
+  @SuppressWarnings("deprecation")
+  // DartExecutor.send is deprecated.
   @Test
   public void testPerformPrivateCommand_dataIsFloatArray() throws JSONException {
     View testView = new View(ctx);
@@ -551,7 +576,8 @@ public class InputConnectionAdaptorTest {
   }
 
   @Test
-  public void testSendKeyEvent_shiftKeyUpCancelsSelection() {
+  public void testSendKeyEvent_shiftKeyUpDoesNotCancelSelection() {
+    // Regression test for https://github.com/flutter/flutter/issues/101569.
     int selStart = 5;
     int selEnd = 10;
     ListenableEditingState editable = sampleEditable(selStart, selEnd);
@@ -560,8 +586,8 @@ public class InputConnectionAdaptorTest {
     KeyEvent shiftKeyUp = new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_SHIFT_LEFT);
     boolean didConsume = adaptor.handleKeyEvent(shiftKeyUp);
 
-    assertTrue(didConsume);
-    assertEquals(selEnd, Selection.getSelectionStart(editable));
+    assertFalse(didConsume);
+    assertEquals(selStart, Selection.getSelectionStart(editable));
     assertEquals(selEnd, Selection.getSelectionEnd(editable));
   }
 
@@ -1047,9 +1073,6 @@ public class InputConnectionAdaptorTest {
 
   @Test
   public void testExtractedText_monitoring() {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-      return;
-    }
     ListenableEditingState editable = sampleEditable(5, 5);
     View testView = new View(ctx);
     InputConnectionAdaptor adaptor =
@@ -1101,10 +1124,6 @@ public class InputConnectionAdaptorTest {
 
   @Test
   public void testCursorAnchorInfo() {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-      return;
-    }
-
     ListenableEditingState editable = sampleEditable(5, 5);
     View testView = new View(ctx);
     InputConnectionAdaptor adaptor =
diff --git a/shell/platform/android/test/io/flutter/plugin/editing/SpellCheckPluginTest.java b/shell/platform/android/test/io/flutter/plugin/editing/SpellCheckPluginTest.java
index 559ebcbae2a7ace0f28ab6be0084b300bc3d5882..fd291b291ada0467dda039e2a6767384f4830979 100644
--- a/shell/platform/android/test/io/flutter/plugin/editing/SpellCheckPluginTest.java
+++ b/shell/platform/android/test/io/flutter/plugin/editing/SpellCheckPluginTest.java
@@ -44,6 +44,8 @@ public class SpellCheckPluginTest {
         (ByteBuffer) encodedMethodCall.flip(), mock(BinaryMessenger.BinaryReply.class));
   }
 
+  @SuppressWarnings("deprecation")
+  // setMessageHandler is deprecated.
   @Test
   public void respondsToSpellCheckChannelMessage() {
     ArgumentCaptor<BinaryMessenger.BinaryMessageHandler> binaryMessageHandlerCaptor =
@@ -222,4 +224,47 @@ public class SpellCheckPluginTest {
 
     verify(mockResult).success(expectedResults);
   }
+
+  @Test
+  public void onGetSentenceSuggestionsResultsWithSuccessAndNoResultsWhenSuggestionsAreInvalid() {
+    TextServicesManager fakeTextServicesManager = mock(TextServicesManager.class);
+    SpellCheckChannel fakeSpellCheckChannel = mock(SpellCheckChannel.class);
+    SpellCheckPlugin spellCheckPlugin =
+        spy(new SpellCheckPlugin(fakeTextServicesManager, fakeSpellCheckChannel));
+    MethodChannel.Result mockResult = mock(MethodChannel.Result.class);
+    spellCheckPlugin.pendingResult = mockResult;
+
+    spellCheckPlugin.onGetSentenceSuggestions(
+        new SentenceSuggestionsInfo[] {
+          new SentenceSuggestionsInfo(
+              (new SuggestionsInfo[] {
+                new SuggestionsInfo(
+                    SuggestionsInfo.RESULT_ATTR_LOOKS_LIKE_TYPO,
+                    // This is the suggestion that may be provided by the Samsung spell checker:
+                    new String[] {""})
+              }),
+              new int[] {7},
+              new int[] {5})
+        });
+
+    verify(mockResult).success(new ArrayList<HashMap<String, Object>>());
+  }
+
+  @Test
+  public void onGetSentenceSuggestionsResultsWithSuccessAndNoResultsWhenSuggestionsAreInvalid2() {
+    TextServicesManager fakeTextServicesManager = mock(TextServicesManager.class);
+    SpellCheckChannel fakeSpellCheckChannel = mock(SpellCheckChannel.class);
+    SpellCheckPlugin spellCheckPlugin =
+        spy(new SpellCheckPlugin(fakeTextServicesManager, fakeSpellCheckChannel));
+    MethodChannel.Result mockResult = mock(MethodChannel.Result.class);
+    spellCheckPlugin.pendingResult = mockResult;
+
+    spellCheckPlugin.onGetSentenceSuggestions(
+        new SentenceSuggestionsInfo[] {
+          // This "suggestion" may be provided by the Samsung spell checker:
+          null
+        });
+
+    verify(mockResult).success(new ArrayList<HashMap<String, Object>>());
+  }
 }
diff --git a/shell/platform/android/test/io/flutter/plugin/editing/TextInputPluginTest.java b/shell/platform/android/test/io/flutter/plugin/editing/TextInputPluginTest.java
index 462b6ec2ff808551e8e4a6a12ddbb4e726d89a6b..cc04befc45d9ef7aac6622d22af41dcb933d6c27 100644
--- a/shell/platform/android/test/io/flutter/plugin/editing/TextInputPluginTest.java
+++ b/shell/platform/android/test/io/flutter/plugin/editing/TextInputPluginTest.java
@@ -1,6 +1,8 @@
 package io.flutter.plugin.editing;
 
+import static io.flutter.Build.API_LEVELS;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.AdditionalMatchers.aryEq;
@@ -118,6 +120,8 @@ public class TextInputPluginTest {
         (ByteBuffer) encodedMethodCall.flip(), mock(BinaryMessenger.BinaryReply.class));
   }
 
+  @SuppressWarnings("deprecation")
+  // DartExecutor.send is deprecated.
   @Test
   public void textInputPlugin_RequestsReattachOnCreation() throws JSONException {
     // Initialize a general TextInputPlugin.
@@ -992,6 +996,7 @@ public class TextInputPluginTest {
   // need the restart.
   // Update: many other keyboards need this too:
   // https://github.com/flutter/flutter/issues/78827
+  @SuppressWarnings("deprecation") // InputMethodSubtype
   @Test
   public void setTextInputEditingState_restartsIMEOnlyWhenFrameworkChangesComposingRegion() {
     // Initialize a TextInputPlugin that needs to be always restarted.
@@ -1125,6 +1130,41 @@ public class TextInputPluginTest {
     assertEquals(1, testImm.getRestartCount(testView));
   }
 
+  @Test
+  public void clearTextInputClient_alwaysRestartsImm() {
+    // Initialize a general TextInputPlugin.
+    InputMethodSubtype inputMethodSubtype = mock(InputMethodSubtype.class);
+    TestImm testImm = Shadow.extract(ctx.getSystemService(Context.INPUT_METHOD_SERVICE));
+    testImm.setCurrentInputMethodSubtype(inputMethodSubtype);
+    View testView = new View(ctx);
+    TextInputChannel textInputChannel = new TextInputChannel(mock(DartExecutor.class));
+    TextInputPlugin textInputPlugin =
+        new TextInputPlugin(testView, textInputChannel, mock(PlatformViewsController.class));
+    textInputPlugin.setTextInputClient(
+        0,
+        new TextInputChannel.Configuration(
+            false,
+            false,
+            true,
+            true,
+            false,
+            TextInputChannel.TextCapitalization.NONE,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null));
+    // There's a pending restart since we initialized the text input client. Flush that now.
+    textInputPlugin.setTextInputEditingState(
+        testView, new TextInputChannel.TextEditState("", 0, 0, -1, -1));
+    assertEquals(1, testImm.getRestartCount(testView));
+
+    // A restart is always forced when calling clearTextInputClient().
+    textInputPlugin.clearTextInputClient();
+    assertEquals(2, testImm.getRestartCount(testView));
+  }
+
   @Test
   public void destroy_clearTextInputMethodHandler() {
     View testView = new View(ctx);
@@ -1136,8 +1176,10 @@ public class TextInputPluginTest {
     verify(textInputChannel, times(1)).setTextInputMethodHandler(isNull());
   }
 
-  @Test
-  public void inputConnection_createsActionFromEnter() throws JSONException {
+  @SuppressWarnings("deprecation")
+  // DartExecutor.send is deprecated.
+  private void verifyInputConnection(TextInputChannel.TextInputType textInputType)
+      throws JSONException {
     TestImm testImm = Shadow.extract(ctx.getSystemService(Context.INPUT_METHOD_SERVICE));
     FlutterJNI mockFlutterJni = mock(FlutterJNI.class);
     View testView = new View(ctx);
@@ -1154,7 +1196,7 @@ public class TextInputPluginTest {
             true,
             false,
             TextInputChannel.TextCapitalization.NONE,
-            new TextInputChannel.InputType(TextInputChannel.TextInputType.TEXT, false, false),
+            new TextInputChannel.InputType(textInputType, false, false),
             null,
             null,
             null,
@@ -1192,11 +1234,19 @@ public class TextInputPluginTest {
         new String[] {"0", "TextInputAction.done"});
   }
 
+  @Test
+  public void inputConnection_createsActionFromEnter() throws JSONException {
+    verifyInputConnection(TextInputChannel.TextInputType.TEXT);
+  }
+
+  @Test
+  public void inputConnection_respondsToKeyEvents_textInputTypeNone() throws JSONException {
+    verifyInputConnection(TextInputChannel.TextInputType.NONE);
+  }
+
+  @SuppressWarnings("deprecation") // InputMethodSubtype
   @Test
   public void inputConnection_finishComposingTextUpdatesIMM() throws JSONException {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-      return;
-    }
     ShadowBuild.setManufacturer("samsung");
     InputMethodSubtype inputMethodSubtype =
         new InputMethodSubtype(0, 0, /*locale=*/ "en", "", "", false, false);
@@ -1269,7 +1319,7 @@ public class TextInputPluginTest {
     InputConnection connection =
         textInputPlugin.createInputConnection(
             testView, mock(KeyboardManager.class), new EditorInfo());
-    assertEquals(connection, null);
+    assertNotNull(connection);
   }
 
   @Test
@@ -1300,10 +1350,46 @@ public class TextInputPluginTest {
     assertEquals(testImm.isSoftInputVisible(), false);
   }
 
+  @Test
+  public void inputConnection_textInputTypeMultilineAndSuggestionsDisabled() {
+    // Regression test for https://github.com/flutter/flutter/issues/71679.
+    View testView = new View(ctx);
+    DartExecutor dartExecutor = mock(DartExecutor.class);
+    TextInputChannel textInputChannel = new TextInputChannel(dartExecutor);
+    TextInputPlugin textInputPlugin =
+        new TextInputPlugin(testView, textInputChannel, mock(PlatformViewsController.class));
+    textInputPlugin.setTextInputClient(
+        0,
+        new TextInputChannel.Configuration(
+            false,
+            false,
+            false, // Disable suggestions.
+            true,
+            false,
+            TextInputChannel.TextCapitalization.NONE,
+            new TextInputChannel.InputType(TextInputChannel.TextInputType.MULTILINE, false, false),
+            null,
+            null,
+            null,
+            null,
+            null));
+
+    EditorInfo editorInfo = new EditorInfo();
+    InputConnection connection =
+        textInputPlugin.createInputConnection(testView, mock(KeyboardManager.class), editorInfo);
+
+    assertEquals(
+        editorInfo.inputType,
+        InputType.TYPE_CLASS_TEXT
+            | InputType.TYPE_TEXT_FLAG_MULTI_LINE
+            | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS
+            | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD);
+  }
+
   // -------- Start: Autofill Tests -------
   @Test
   public void autofill_enabledByDefault() {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+    if (Build.VERSION.SDK_INT < API_LEVELS.API_26) {
       return;
     }
     FlutterView testView = new FlutterView(ctx);
@@ -1363,7 +1449,7 @@ public class TextInputPluginTest {
 
   @Test
   public void autofill_canBeDisabled() {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+    if (Build.VERSION.SDK_INT < API_LEVELS.API_26) {
       return;
     }
     FlutterView testView = new FlutterView(ctx);
@@ -1400,7 +1486,7 @@ public class TextInputPluginTest {
 
   @Test
   public void autofill_hintText() {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+    if (Build.VERSION.SDK_INT < API_LEVELS.API_26) {
       return;
     }
     FlutterView testView = new FlutterView(ctx);
@@ -1441,13 +1527,14 @@ public class TextInputPluginTest {
     verify(children[0]).setHint("placeholder");
   }
 
+  @Config(minSdk = API_LEVELS.API_26)
+  @SuppressWarnings("deprecation")
   @Test
   public void autofill_onProvideVirtualViewStructure() {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+    if (Build.VERSION.SDK_INT < API_LEVELS.API_26) {
       return;
     }
-
-    FlutterView testView = new FlutterView(Robolectric.setupActivity(Activity.class));
+    FlutterView testView = getTestView();
     TextInputChannel textInputChannel = new TextInputChannel(mock(DartExecutor.class));
     TextInputPlugin textInputPlugin =
         new TextInputPlugin(testView, textInputChannel, mock(PlatformViewsController.class));
@@ -1531,13 +1618,15 @@ public class TextInputPluginTest {
     verify(children[1], times(0)).setHint(any());
   }
 
+  @SuppressWarnings("deprecation")
+  @Config(minSdk = API_LEVELS.API_26)
   @Test
   public void autofill_onProvideVirtualViewStructure_singular_textfield() {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+    if (Build.VERSION.SDK_INT < API_LEVELS.API_26) {
       return;
     }
-
-    FlutterView testView = new FlutterView(Robolectric.setupActivity(Activity.class));
+    // Migrate to ActivityScenario by following https://github.com/robolectric/robolectric/pull/4736
+    FlutterView testView = getTestView();
     TextInputChannel textInputChannel = new TextInputChannel(mock(DartExecutor.class));
     TextInputPlugin textInputPlugin =
         new TextInputPlugin(testView, textInputChannel, mock(PlatformViewsController.class));
@@ -1582,14 +1671,15 @@ public class TextInputPluginTest {
     verify(children[0]).setDimens(anyInt(), anyInt(), anyInt(), anyInt(), gt(0), gt(0));
   }
 
+  @Config(minSdk = API_LEVELS.API_26)
   @Test
   public void autofill_testLifeCycle() {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+    if (Build.VERSION.SDK_INT < API_LEVELS.API_26) {
       return;
     }
 
     TestAfm testAfm = Shadow.extract(ctx.getSystemService(AutofillManager.class));
-    FlutterView testView = new FlutterView(Robolectric.setupActivity(Activity.class));
+    FlutterView testView = getTestView();
     TextInputChannel textInputChannel = new TextInputChannel(mock(DartExecutor.class));
     TextInputPlugin textInputPlugin =
         new TextInputPlugin(testView, textInputChannel, mock(PlatformViewsController.class));
@@ -1716,14 +1806,16 @@ public class TextInputPluginTest {
     assertEquals("1".hashCode(), testAfm.exitId);
   }
 
+  @Config(minSdk = API_LEVELS.API_26)
+  @SuppressWarnings("deprecation")
   @Test
   public void autofill_testAutofillUpdatesTheFramework() {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+    if (Build.VERSION.SDK_INT < API_LEVELS.API_26) {
       return;
     }
 
     TestAfm testAfm = Shadow.extract(ctx.getSystemService(AutofillManager.class));
-    FlutterView testView = new FlutterView(Robolectric.setupActivity(Activity.class));
+    FlutterView testView = getTestView();
     TextInputChannel textInputChannel = spy(new TextInputChannel(mock(DartExecutor.class)));
     TextInputPlugin textInputPlugin =
         new TextInputPlugin(testView, textInputChannel, mock(PlatformViewsController.class));
@@ -1812,9 +1904,10 @@ public class TextInputPluginTest {
     assertEquals(editState.text, "unfocused field");
   }
 
+  @Config(minSdk = API_LEVELS.API_26)
   @Test
   public void autofill_doesNotCrashAfterClearClientCall() {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+    if (Build.VERSION.SDK_INT < API_LEVELS.API_26) {
       return;
     }
     FlutterView testView = new FlutterView(ctx);
@@ -1860,14 +1953,15 @@ public class TextInputPluginTest {
         .updateEditingState(anyInt(), any(), anyInt(), anyInt(), anyInt(), anyInt());
   }
 
+  @Config(minSdk = API_LEVELS.API_26)
   @Test
   public void autofill_testSetTextIpnutClientUpdatesSideFields() {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+    if (Build.VERSION.SDK_INT < API_LEVELS.API_26) {
       return;
     }
 
     TestAfm testAfm = Shadow.extract(ctx.getSystemService(AutofillManager.class));
-    FlutterView testView = new FlutterView(Robolectric.setupActivity(Activity.class));
+    FlutterView testView = getTestView();
     TextInputChannel textInputChannel = new TextInputChannel(mock(DartExecutor.class));
     TextInputPlugin textInputPlugin =
         new TextInputPlugin(testView, textInputChannel, mock(PlatformViewsController.class));
@@ -1939,6 +2033,14 @@ public class TextInputPluginTest {
   }
   // -------- End: Autofill Tests -------
 
+  @SuppressWarnings("deprecation")
+  private FlutterView getTestView() {
+    // TODO(reidbaker): https://github.com/flutter/flutter/issues/133151
+    return new FlutterView(Robolectric.setupActivity(Activity.class));
+  }
+
+  @SuppressWarnings("deprecation")
+  // setMessageHandler is deprecated.
   @Test
   public void respondsToInputChannelMessages() {
     ArgumentCaptor<BinaryMessenger.BinaryMessageHandler> binaryMessageHandlerCaptor =
@@ -1966,6 +2068,8 @@ public class TextInputPluginTest {
     verify(mockHandler, times(1)).finishAutofillContext(false);
   }
 
+  @SuppressWarnings("deprecation")
+  // setMessageHandler is deprecated.
   @Test
   public void sendAppPrivateCommand_dataIsEmpty() throws JSONException {
     ArgumentCaptor<BinaryMessenger.BinaryMessageHandler> binaryMessageHandlerCaptor =
@@ -1995,6 +2099,8 @@ public class TextInputPluginTest {
         .sendAppPrivateCommand(any(View.class), eq("actionCommand"), eq(null));
   }
 
+  @SuppressWarnings("deprecation")
+  // setMessageHandler is deprecated.
   @Test
   public void sendAppPrivateCommand_hasData() throws JSONException {
     ArgumentCaptor<BinaryMessenger.BinaryMessageHandler> binaryMessageHandlerCaptor =
@@ -2027,10 +2133,15 @@ public class TextInputPluginTest {
   }
 
   @Test
-  @TargetApi(30)
-  @Config(sdk = 30)
-  public void ime_windowInsetsSync() {
-    FlutterView testView = new FlutterView(Robolectric.setupActivity(Activity.class));
+  @TargetApi(API_LEVELS.API_30)
+  @Config(sdk = API_LEVELS.API_30)
+  @SuppressWarnings("deprecation")
+  // getWindowSystemUiVisibility, SYSTEM_UI_FLAG_LAYOUT_STABLE.
+  // flutter#133074 tracks migration work.
+  public void ime_windowInsetsSync_notLaidOutBehindNavigation_excludesNavigationBars() {
+    FlutterView testView = spy(getTestView());
+    when(testView.getWindowSystemUiVisibility()).thenReturn(View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+
     TextInputChannel textInputChannel = new TextInputChannel(mock(DartExecutor.class));
     TextInputPlugin textInputPlugin =
         new TextInputPlugin(testView, textInputChannel, mock(PlatformViewsController.class));
@@ -2046,76 +2157,223 @@ public class TextInputPluginTest {
     List<WindowInsetsAnimation> animationList = new ArrayList();
     animationList.add(animation);
 
+    ArgumentCaptor<FlutterRenderer.ViewportMetrics> viewportMetricsCaptor =
+        ArgumentCaptor.forClass(FlutterRenderer.ViewportMetrics.class);
+
     WindowInsets.Builder builder = new WindowInsets.Builder();
-    WindowInsets noneInsets = builder.build();
 
-    // imeInsets0, 1, and 2 contain unique IME bottom insets, and are used
-    // to distinguish which insets were sent at each stage.
+    // Set the initial insets and verify that they were set and the bottom view inset is correct
+    imeSyncCallback.getInsetsListener().onApplyWindowInsets(testView, builder.build());
+
+    verify(flutterRenderer, atLeast(1)).setViewportMetrics(viewportMetricsCaptor.capture());
+    assertEquals(0, viewportMetricsCaptor.getValue().viewInsetBottom);
+
+    // Call onPrepare and set the lastWindowInsets - these should be stored for the end of the
+    // animation instead of being applied immediately
+    imeSyncCallback.getAnimationCallback().onPrepare(animation);
     builder.setInsets(WindowInsets.Type.ime(), Insets.of(0, 0, 0, 100));
-    builder.setInsets(WindowInsets.Type.navigationBars(), Insets.of(10, 10, 10, 40));
-    WindowInsets imeInsets0 = builder.build();
+    builder.setInsets(WindowInsets.Type.navigationBars(), Insets.of(0, 0, 0, 0));
+    imeSyncCallback.getInsetsListener().onApplyWindowInsets(testView, builder.build());
+
+    verify(flutterRenderer, atLeast(1)).setViewportMetrics(viewportMetricsCaptor.capture());
+    assertEquals(0, viewportMetricsCaptor.getValue().viewInsetBottom);
+
+    // Call onStart and apply new insets - these should be ignored completely
+    imeSyncCallback.getAnimationCallback().onStart(animation, null);
+    builder.setInsets(WindowInsets.Type.ime(), Insets.of(0, 0, 0, 50));
+    builder.setInsets(WindowInsets.Type.navigationBars(), Insets.of(0, 0, 0, 40));
+    imeSyncCallback.getInsetsListener().onApplyWindowInsets(testView, builder.build());
 
-    builder.setInsets(WindowInsets.Type.ime(), Insets.of(0, 0, 0, 30));
-    builder.setInsets(WindowInsets.Type.navigationBars(), Insets.of(10, 10, 10, 40));
-    WindowInsets imeInsets1 = builder.build();
+    verify(flutterRenderer, atLeast(1)).setViewportMetrics(viewportMetricsCaptor.capture());
+    assertEquals(0, viewportMetricsCaptor.getValue().viewInsetBottom);
+
+    // Progress the animation and ensure that the navigation bar insets have been subtracted
+    // from the IME insets
+    builder.setInsets(WindowInsets.Type.ime(), Insets.of(0, 0, 0, 25));
+    builder.setInsets(WindowInsets.Type.navigationBars(), Insets.of(0, 0, 0, 40));
+    imeSyncCallback.getAnimationCallback().onProgress(builder.build(), animationList);
+
+    verify(flutterRenderer, atLeast(1)).setViewportMetrics(viewportMetricsCaptor.capture());
+    assertEquals(0, viewportMetricsCaptor.getValue().viewInsetBottom);
 
     builder.setInsets(WindowInsets.Type.ime(), Insets.of(0, 0, 0, 50));
-    builder.setInsets(WindowInsets.Type.navigationBars(), Insets.of(10, 10, 10, 40));
-    WindowInsets imeInsets2 = builder.build();
+    builder.setInsets(WindowInsets.Type.navigationBars(), Insets.of(0, 0, 0, 40));
+    imeSyncCallback.getAnimationCallback().onProgress(builder.build(), animationList);
 
-    builder.setInsets(WindowInsets.Type.ime(), Insets.of(0, 0, 0, 200));
-    builder.setInsets(WindowInsets.Type.navigationBars(), Insets.of(10, 10, 10, 0));
-    WindowInsets deferredInsets = builder.build();
+    verify(flutterRenderer, atLeast(1)).setViewportMetrics(viewportMetricsCaptor.capture());
+    assertEquals(10, viewportMetricsCaptor.getValue().viewInsetBottom);
+
+    // End the animation and ensure that the bottom insets match the lastWindowInsets that we set
+    // during onPrepare
+    imeSyncCallback.getAnimationCallback().onEnd(animation);
+
+    verify(flutterRenderer, atLeast(1)).setViewportMetrics(viewportMetricsCaptor.capture());
+    assertEquals(100, viewportMetricsCaptor.getValue().viewInsetBottom);
+  }
+
+  @Test
+  @TargetApi(API_LEVELS.API_30)
+  @Config(sdk = API_LEVELS.API_30)
+  @SuppressWarnings("deprecation")
+  // getWindowSystemUiVisibility
+  // flutter#133074 tracks migration work.
+  public void ime_windowInsetsSync_laidOutBehindNavigation_includesNavigationBars() {
+    FlutterView testView = spy(getTestView());
+    when(testView.getWindowSystemUiVisibility())
+        .thenReturn(
+            View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
+
+    TextInputChannel textInputChannel = new TextInputChannel(mock(DartExecutor.class));
+    TextInputPlugin textInputPlugin =
+        new TextInputPlugin(testView, textInputChannel, mock(PlatformViewsController.class));
+    ImeSyncDeferringInsetsCallback imeSyncCallback = textInputPlugin.getImeSyncCallback();
+    FlutterEngine flutterEngine = spy(new FlutterEngine(ctx, mockFlutterLoader, mockFlutterJni));
+    FlutterRenderer flutterRenderer = spy(new FlutterRenderer(mockFlutterJni));
+    when(flutterEngine.getRenderer()).thenReturn(flutterRenderer);
+    testView.attachToFlutterEngine(flutterEngine);
+
+    WindowInsetsAnimation animation = mock(WindowInsetsAnimation.class);
+    when(animation.getTypeMask()).thenReturn(WindowInsets.Type.ime());
+
+    List<WindowInsetsAnimation> animationList = new ArrayList();
+    animationList.add(animation);
 
     ArgumentCaptor<FlutterRenderer.ViewportMetrics> viewportMetricsCaptor =
         ArgumentCaptor.forClass(FlutterRenderer.ViewportMetrics.class);
 
-    imeSyncCallback.getInsetsListener().onApplyWindowInsets(testView, deferredInsets);
-    imeSyncCallback.getInsetsListener().onApplyWindowInsets(testView, noneInsets);
+    WindowInsets.Builder builder = new WindowInsets.Builder();
+
+    // Set the initial insets and verify that they were set and the bottom view inset is correct
+    imeSyncCallback.getInsetsListener().onApplyWindowInsets(testView, builder.build());
 
     verify(flutterRenderer, atLeast(1)).setViewportMetrics(viewportMetricsCaptor.capture());
-    assertEquals(0, viewportMetricsCaptor.getValue().viewPaddingBottom);
-    assertEquals(0, viewportMetricsCaptor.getValue().viewPaddingTop);
     assertEquals(0, viewportMetricsCaptor.getValue().viewInsetBottom);
-    assertEquals(0, viewportMetricsCaptor.getValue().viewInsetTop);
 
+    // Call onPrepare and set the lastWindowInsets - these should be stored for the end of the
+    // animation instead of being applied immediately
     imeSyncCallback.getAnimationCallback().onPrepare(animation);
-    imeSyncCallback.getInsetsListener().onApplyWindowInsets(testView, deferredInsets);
+    builder.setInsets(WindowInsets.Type.ime(), Insets.of(0, 0, 0, 100));
+    builder.setInsets(WindowInsets.Type.navigationBars(), Insets.of(0, 0, 0, 0));
+    imeSyncCallback.getInsetsListener().onApplyWindowInsets(testView, builder.build());
+
+    verify(flutterRenderer, atLeast(1)).setViewportMetrics(viewportMetricsCaptor.capture());
+    assertEquals(0, viewportMetricsCaptor.getValue().viewInsetBottom);
+
+    // Call onStart and apply new insets - these should be ignored completely
     imeSyncCallback.getAnimationCallback().onStart(animation, null);
-    // Only the final state call is saved, extra calls are passed on.
-    imeSyncCallback.getInsetsListener().onApplyWindowInsets(testView, imeInsets2);
+    builder.setInsets(WindowInsets.Type.ime(), Insets.of(0, 0, 0, 50));
+    builder.setInsets(WindowInsets.Type.navigationBars(), Insets.of(0, 0, 0, 40));
+    imeSyncCallback.getInsetsListener().onApplyWindowInsets(testView, builder.build());
 
     verify(flutterRenderer, atLeast(1)).setViewportMetrics(viewportMetricsCaptor.capture());
-    // No change, as deferredInset is stored to be passed in onEnd()
-    assertEquals(0, viewportMetricsCaptor.getValue().viewPaddingBottom);
-    assertEquals(0, viewportMetricsCaptor.getValue().viewPaddingTop);
     assertEquals(0, viewportMetricsCaptor.getValue().viewInsetBottom);
-    assertEquals(0, viewportMetricsCaptor.getValue().viewInsetTop);
 
-    imeSyncCallback.getAnimationCallback().onProgress(imeInsets0, animationList);
+    // Progress the animation and ensure that the navigation bar insets have not been
+    // subtracted from the IME insets
+    builder.setInsets(WindowInsets.Type.ime(), Insets.of(0, 0, 0, 25));
+    builder.setInsets(WindowInsets.Type.navigationBars(), Insets.of(0, 0, 0, 40));
+    imeSyncCallback.getAnimationCallback().onProgress(builder.build(), animationList);
+
+    verify(flutterRenderer, atLeast(1)).setViewportMetrics(viewportMetricsCaptor.capture());
+    assertEquals(25, viewportMetricsCaptor.getValue().viewInsetBottom);
+
+    builder.setInsets(WindowInsets.Type.ime(), Insets.of(0, 0, 0, 50));
+    builder.setInsets(WindowInsets.Type.navigationBars(), Insets.of(0, 0, 0, 40));
+    imeSyncCallback.getAnimationCallback().onProgress(builder.build(), animationList);
+
+    verify(flutterRenderer, atLeast(1)).setViewportMetrics(viewportMetricsCaptor.capture());
+    assertEquals(50, viewportMetricsCaptor.getValue().viewInsetBottom);
+
+    // End the animation and ensure that the bottom insets match the lastWindowInsets that we set
+    // during onPrepare
+    imeSyncCallback.getAnimationCallback().onEnd(animation);
+
+    verify(flutterRenderer, atLeast(1)).setViewportMetrics(viewportMetricsCaptor.capture());
+    assertEquals(100, viewportMetricsCaptor.getValue().viewInsetBottom);
+  }
+
+  @Test
+  @TargetApi(API_LEVELS.API_30)
+  @Config(sdk = API_LEVELS.API_30)
+  @SuppressWarnings("deprecation")
+  // getWindowSystemUiVisibility, SYSTEM_UI_FLAG_LAYOUT_STABLE
+  // flutter#133074 tracks migration work.
+  public void lastWindowInsets_updatedOnSecondOnProgressCall() {
+    FlutterView testView = spy(getTestView());
+    when(testView.getWindowSystemUiVisibility()).thenReturn(View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+
+    TextInputChannel textInputChannel = new TextInputChannel(mock(DartExecutor.class));
+    TextInputPlugin textInputPlugin =
+        new TextInputPlugin(testView, textInputChannel, mock(PlatformViewsController.class));
+    ImeSyncDeferringInsetsCallback imeSyncCallback = textInputPlugin.getImeSyncCallback();
+    FlutterEngine flutterEngine = spy(new FlutterEngine(ctx, mockFlutterLoader, mockFlutterJni));
+    FlutterRenderer flutterRenderer = spy(new FlutterRenderer(mockFlutterJni));
+    when(flutterEngine.getRenderer()).thenReturn(flutterRenderer);
+    testView.attachToFlutterEngine(flutterEngine);
+
+    WindowInsetsAnimation imeAnimation = mock(WindowInsetsAnimation.class);
+    when(imeAnimation.getTypeMask()).thenReturn(WindowInsets.Type.ime());
+    WindowInsetsAnimation navigationBarAnimation = mock(WindowInsetsAnimation.class);
+    when(navigationBarAnimation.getTypeMask()).thenReturn(WindowInsets.Type.navigationBars());
+
+    List<WindowInsetsAnimation> animationList = new ArrayList();
+    animationList.add(imeAnimation);
+    animationList.add(navigationBarAnimation);
+
+    ArgumentCaptor<FlutterRenderer.ViewportMetrics> viewportMetricsCaptor =
+        ArgumentCaptor.forClass(FlutterRenderer.ViewportMetrics.class);
+
+    WindowInsets.Builder builder = new WindowInsets.Builder();
+
+    // Set the initial insets and verify that they were set and the bottom view padding is correct
+    builder.setInsets(WindowInsets.Type.ime(), Insets.of(0, 0, 0, 1000));
+    builder.setInsets(WindowInsets.Type.navigationBars(), Insets.of(0, 0, 0, 100));
+    imeSyncCallback.getInsetsListener().onApplyWindowInsets(testView, builder.build());
+
+    verify(flutterRenderer, atLeast(1)).setViewportMetrics(viewportMetricsCaptor.capture());
+    assertEquals(100, viewportMetricsCaptor.getValue().viewPaddingBottom);
+
+    // Call onPrepare and set the lastWindowInsets - these should be stored for the end of the
+    // animation instead of being applied immediately
+    imeSyncCallback.getAnimationCallback().onPrepare(imeAnimation);
+    builder.setInsets(WindowInsets.Type.ime(), Insets.of(0, 0, 0, 0));
+    builder.setInsets(WindowInsets.Type.navigationBars(), Insets.of(0, 0, 0, 100));
+    imeSyncCallback.getInsetsListener().onApplyWindowInsets(testView, builder.build());
+
+    verify(flutterRenderer, atLeast(1)).setViewportMetrics(viewportMetricsCaptor.capture());
+    assertEquals(100, viewportMetricsCaptor.getValue().viewPaddingBottom);
+
+    // Call onPrepare again and apply new insets - these should overrite lastWindowInsets
+    imeSyncCallback.getAnimationCallback().onPrepare(navigationBarAnimation);
+    builder.setInsets(WindowInsets.Type.ime(), Insets.of(0, 0, 0, 0));
+    builder.setInsets(WindowInsets.Type.navigationBars(), Insets.of(0, 0, 0, 0));
+    imeSyncCallback.getInsetsListener().onApplyWindowInsets(testView, builder.build());
+
+    verify(flutterRenderer, atLeast(1)).setViewportMetrics(viewportMetricsCaptor.capture());
+    assertEquals(100, viewportMetricsCaptor.getValue().viewPaddingBottom);
+
+    // Progress the animation and ensure that the navigation bar insets have not been
+    // subtracted from the IME insets
+    builder.setInsets(WindowInsets.Type.ime(), Insets.of(0, 0, 0, 500));
+    builder.setInsets(WindowInsets.Type.navigationBars(), Insets.of(0, 0, 0, 0));
+    imeSyncCallback.getAnimationCallback().onProgress(builder.build(), animationList);
 
     verify(flutterRenderer, atLeast(1)).setViewportMetrics(viewportMetricsCaptor.capture());
     assertEquals(0, viewportMetricsCaptor.getValue().viewPaddingBottom);
-    assertEquals(10, viewportMetricsCaptor.getValue().viewPaddingTop);
-    assertEquals(60, viewportMetricsCaptor.getValue().viewInsetBottom);
-    assertEquals(0, viewportMetricsCaptor.getValue().viewInsetTop);
 
-    imeSyncCallback.getAnimationCallback().onProgress(imeInsets1, animationList);
+    builder.setInsets(WindowInsets.Type.ime(), Insets.of(0, 0, 0, 250));
+    builder.setInsets(WindowInsets.Type.navigationBars(), Insets.of(0, 0, 0, 0));
+    imeSyncCallback.getAnimationCallback().onProgress(builder.build(), animationList);
 
     verify(flutterRenderer, atLeast(1)).setViewportMetrics(viewportMetricsCaptor.capture());
     assertEquals(0, viewportMetricsCaptor.getValue().viewPaddingBottom);
-    assertEquals(10, viewportMetricsCaptor.getValue().viewPaddingTop);
-    assertEquals(0, viewportMetricsCaptor.getValue().viewInsetBottom); // Cannot be negative
-    assertEquals(0, viewportMetricsCaptor.getValue().viewInsetTop);
 
-    imeSyncCallback.getAnimationCallback().onEnd(animation);
+    // End the animation and ensure that the bottom insets match the lastWindowInsets that we set
+    // during onPrepare
+    imeSyncCallback.getAnimationCallback().onEnd(imeAnimation);
 
     verify(flutterRenderer, atLeast(1)).setViewportMetrics(viewportMetricsCaptor.capture());
-    // Values should be of deferredInsets, not imeInsets2
     assertEquals(0, viewportMetricsCaptor.getValue().viewPaddingBottom);
-    assertEquals(10, viewportMetricsCaptor.getValue().viewPaddingTop);
-    assertEquals(200, viewportMetricsCaptor.getValue().viewInsetBottom);
-    assertEquals(0, viewportMetricsCaptor.getValue().viewInsetTop);
   }
 
   interface EventHandler {
@@ -2224,7 +2482,7 @@ public class TextInputPluginTest {
     }
 
     public void notifyValueChanged(View view, int virtualId, AutofillValue value) {
-      if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+      if (Build.VERSION.SDK_INT < API_LEVELS.API_26) {
         return;
       }
       changeVirtualId = virtualId;
diff --git a/shell/platform/android/test/io/flutter/plugin/localization/LocalizationPluginTest.java b/shell/platform/android/test/io/flutter/plugin/localization/LocalizationPluginTest.java
index a1e8a127168168646451d772e8d90b496b2d16f9..ca81eddd66b1a350e17dc63f0efbfa6be6f9f683 100644
--- a/shell/platform/android/test/io/flutter/plugin/localization/LocalizationPluginTest.java
+++ b/shell/platform/android/test/io/flutter/plugin/localization/LocalizationPluginTest.java
@@ -1,5 +1,6 @@
 package io.flutter.plugin.localization;
 
+import static io.flutter.Build.API_LEVELS;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
@@ -10,7 +11,6 @@ import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.content.res.Resources;
-import android.os.Build;
 import android.os.LocaleList;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -28,13 +28,13 @@ import org.robolectric.annotation.Config;
 
 @Config(manifest = Config.NONE)
 @RunWith(AndroidJUnit4.class)
-@TargetApi(24) // LocaleList and scriptCode are API 24+.
+@TargetApi(API_LEVELS.API_24) // LocaleList and scriptCode are API 24+.
 public class LocalizationPluginTest {
   private final Context ctx = ApplicationProvider.getApplicationContext();
 
   // This test should be synced with the version for API 24.
   @Test
-  @Config(sdk = Build.VERSION_CODES.O)
+  @Config(sdk = API_LEVELS.API_26)
   public void computePlatformResolvedLocaleAPI26() {
     // --- Test Setup ---
     FlutterJNI flutterJNI = new FlutterJNI();
@@ -142,7 +142,7 @@ public class LocalizationPluginTest {
 
   // This test should be synced with the version for API 26.
   @Test
-  @Config(minSdk = Build.VERSION_CODES.N)
+  @Config(minSdk = API_LEVELS.API_24)
   public void computePlatformResolvedLocale_fromAndroidN() {
     // --- Test Setup ---
     FlutterJNI flutterJNI = new FlutterJNI();
@@ -237,10 +237,7 @@ public class LocalizationPluginTest {
 
   // Tests the legacy pre API 24 algorithm.
   @Test
-  @Config(
-      minSdk = Build.VERSION_CODES.JELLY_BEAN,
-      maxSdk = Build.VERSION_CODES.M,
-      qualifiers = "es-rMX")
+  @Config(minSdk = API_LEVELS.API_21, maxSdk = API_LEVELS.API_23, qualifiers = "es-rMX")
   public void computePlatformResolvedLocale_emptySupportedLocales_beforeAndroidN() {
     FlutterJNI flutterJNI = new FlutterJNI();
     DartExecutor dartExecutor = mock(DartExecutor.class);
@@ -252,7 +249,7 @@ public class LocalizationPluginTest {
   }
 
   @Test
-  @Config(minSdk = Build.VERSION_CODES.JELLY_BEAN, maxSdk = Build.VERSION_CODES.M, qualifiers = "")
+  @Config(minSdk = API_LEVELS.API_21, maxSdk = API_LEVELS.API_23, qualifiers = "")
   public void computePlatformResolvedLocale_selectFirstLocaleWhenNoUserSetting_beforeAndroidN() {
     FlutterJNI flutterJNI = new FlutterJNI();
     DartExecutor dartExecutor = mock(DartExecutor.class);
@@ -272,10 +269,7 @@ public class LocalizationPluginTest {
   }
 
   @Test
-  @Config(
-      minSdk = Build.VERSION_CODES.JELLY_BEAN,
-      maxSdk = Build.VERSION_CODES.M,
-      qualifiers = "fr-rCH")
+  @Config(minSdk = API_LEVELS.API_21, maxSdk = API_LEVELS.API_23, qualifiers = "fr-rCH")
   public void computePlatformResolvedLocale_selectFirstLocaleWhenNoExactMatch_beforeAndroidN() {
     FlutterJNI flutterJNI = new FlutterJNI();
     DartExecutor dartExecutor = mock(DartExecutor.class);
@@ -298,10 +292,7 @@ public class LocalizationPluginTest {
   }
 
   @Test
-  @Config(
-      minSdk = Build.VERSION_CODES.JELLY_BEAN,
-      maxSdk = Build.VERSION_CODES.M,
-      qualifiers = "it-rIT")
+  @Config(minSdk = API_LEVELS.API_21, maxSdk = API_LEVELS.API_23, qualifiers = "it-rIT")
   public void computePlatformResolvedLocale_selectExactMatchLocale_beforeAndroidN() {
     FlutterJNI flutterJNI = new FlutterJNI();
     DartExecutor dartExecutor = mock(DartExecutor.class);
@@ -324,10 +315,7 @@ public class LocalizationPluginTest {
   }
 
   @Test
-  @Config(
-      minSdk = Build.VERSION_CODES.JELLY_BEAN,
-      maxSdk = Build.VERSION_CODES.M,
-      qualifiers = "fr-rCH")
+  @Config(minSdk = API_LEVELS.API_21, maxSdk = API_LEVELS.API_23, qualifiers = "fr-rCH")
   public void computePlatformResolvedLocale_selectOnlyLanguageLocale_beforeAndroidN() {
     FlutterJNI flutterJNI = new FlutterJNI();
     DartExecutor dartExecutor = mock(DartExecutor.class);
@@ -350,36 +338,30 @@ public class LocalizationPluginTest {
     assertEquals(result[2], "");
   }
 
-  // Tests the legacy pre API 21 algorithm.
-  @Config(sdk = 16)
   @Test
   public void localeFromString_languageOnly() {
     Locale locale = LocalizationPlugin.localeFromString("en");
     assertEquals(locale, new Locale("en"));
   }
 
-  @Config(sdk = 16)
   @Test
   public void localeFromString_languageAndCountry() {
     Locale locale = LocalizationPlugin.localeFromString("en-US");
     assertEquals(locale, new Locale("en", "US"));
   }
 
-  @Config(sdk = 16)
   @Test
   public void localeFromString_languageCountryAndVariant() {
     Locale locale = LocalizationPlugin.localeFromString("zh-Hans-CN");
     assertEquals(locale, new Locale("zh", "CN", "Hans"));
   }
 
-  @Config(sdk = 16)
   @Test
   public void localeFromString_underscore() {
     Locale locale = LocalizationPlugin.localeFromString("zh_Hans_CN");
     assertEquals(locale, new Locale("zh", "CN", "Hans"));
   }
 
-  @Config(sdk = 16)
   @Test
   public void localeFromString_additionalVariantsAreIgnored() {
     Locale locale = LocalizationPlugin.localeFromString("de-DE-u-co-phonebk");
diff --git a/shell/platform/android/test/io/flutter/plugin/mouse/MouseCursorPluginTest.java b/shell/platform/android/test/io/flutter/plugin/mouse/MouseCursorPluginTest.java
index 26db240c88180c230dfaedbd71cce34f090a3356..11feb418538c42dd7d7681145bab35affcaea734 100644
--- a/shell/platform/android/test/io/flutter/plugin/mouse/MouseCursorPluginTest.java
+++ b/shell/platform/android/test/io/flutter/plugin/mouse/MouseCursorPluginTest.java
@@ -1,5 +1,6 @@
 package io.flutter.plugin.mouse;
 
+import static io.flutter.Build.API_LEVELS;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
@@ -25,12 +26,18 @@ import org.robolectric.annotation.Config;
 
 @Config(
     manifest = Config.NONE,
+    minSdk = API_LEVELS.API_24,
     shadows = {})
 @RunWith(AndroidJUnit4.class)
-@TargetApi(24)
+@TargetApi(API_LEVELS.API_24)
 public class MouseCursorPluginTest {
+
+  @SuppressWarnings("deprecation")
+  // Robolectric.setupActivity.
+  // TODO(reidbaker): https://github.com/flutter/flutter/issues/133151
   @Test
   public void mouseCursorPlugin_SetsSystemCursorOnRequest() throws JSONException {
+    // Migrate to ActivityScenario by following https://github.com/robolectric/robolectric/pull/4736
     // Initialize a general MouseCursorPlugin.
     FlutterView testView = spy(new FlutterView(Robolectric.setupActivity(Activity.class)));
     MouseCursorChannel mouseCursorChannel = new MouseCursorChannel(mock(DartExecutor.class));
diff --git a/shell/platform/android/test/io/flutter/plugin/platform/ImageReaderPlatformViewRenderTargetTest.java b/shell/platform/android/test/io/flutter/plugin/platform/ImageReaderPlatformViewRenderTargetTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..11df94d395ef92638b896a77f4b2d1e0e644154c
--- /dev/null
+++ b/shell/platform/android/test/io/flutter/plugin/platform/ImageReaderPlatformViewRenderTargetTest.java
@@ -0,0 +1,109 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.plugin.platform;
+
+import static android.os.Looper.getMainLooper;
+import static io.flutter.Build.API_LEVELS;
+import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
+import android.media.Image;
+import android.view.Surface;
+import android.view.View;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import io.flutter.view.TextureRegistry.ImageTextureEntry;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@TargetApi(API_LEVELS.API_29)
+@RunWith(AndroidJUnit4.class)
+public class ImageReaderPlatformViewRenderTargetTest {
+  private final Context ctx = ApplicationProvider.getApplicationContext();
+
+  class TestImageTextureEntry implements ImageTextureEntry {
+    private Image lastPushedImage;
+
+    public long id() {
+      return 1;
+    }
+
+    public void release() {
+      if (this.lastPushedImage != null) {
+        this.lastPushedImage.close();
+      }
+    }
+
+    public void pushImage(Image image) {
+      if (this.lastPushedImage != null) {
+        this.lastPushedImage.close();
+      }
+      this.lastPushedImage = image;
+    }
+
+    public Image acquireLatestImage() {
+      Image r = this.lastPushedImage;
+      this.lastPushedImage = null;
+      return r;
+    }
+  }
+
+  @Test
+  public void viewDraw_writesToBuffer() {
+    final TestImageTextureEntry textureEntry = new TestImageTextureEntry();
+    final ImageReaderPlatformViewRenderTarget renderTarget =
+        new ImageReaderPlatformViewRenderTarget(textureEntry);
+    // Custom view.
+    final View platformView =
+        new View(ctx) {
+          @Override
+          public void draw(Canvas canvas) {
+            super.draw(canvas);
+            canvas.drawColor(Color.RED);
+          }
+        };
+    final int size = 100;
+    platformView.measure(size, size);
+    platformView.layout(0, 0, size, size);
+    renderTarget.resize(size, size);
+
+    // We don't have an image in the texture entry.
+    assertNull(textureEntry.acquireLatestImage());
+
+    // Start rendering a frame.
+    final Surface s = renderTarget.getSurface();
+    assertNotNull(s);
+    final Canvas targetCanvas = s.lockHardwareCanvas();
+    assertNotNull(targetCanvas);
+
+    try {
+      // Fill the render target with transparent pixels. This is needed for platform views that
+      // expect a transparent background.
+      targetCanvas.drawColor(Color.TRANSPARENT, PorterDuff.Mode.CLEAR);
+      // Override the canvas that this subtree of views will use to draw.
+      platformView.draw(targetCanvas);
+    } finally {
+      // Finish rendering a frame.
+      s.unlockCanvasAndPost(targetCanvas);
+    }
+
+    // Pump the UI thread task loop. This is needed so that the OnImageAvailable callback
+    // gets invoked (resulting in textureEntry.pushImage being invoked).
+    shadowOf(getMainLooper()).idle();
+
+    // An image was pushed into the texture entry and it has the correct dimensions.
+    Image pushedImage = textureEntry.acquireLatestImage();
+    assertNotNull(pushedImage);
+    assertEquals(pushedImage.getWidth(), size);
+    assertEquals(pushedImage.getHeight(), size);
+  }
+}
diff --git a/shell/platform/android/test/io/flutter/plugin/platform/PlatformPluginTest.java b/shell/platform/android/test/io/flutter/plugin/platform/PlatformPluginTest.java
index 2aa09af6c83c1933976a15f33392363a49105bd2..36b497bc55f80c579be57f6913a8677dc5b4d54f 100644
--- a/shell/platform/android/test/io/flutter/plugin/platform/PlatformPluginTest.java
+++ b/shell/platform/android/test/io/flutter/plugin/platform/PlatformPluginTest.java
@@ -1,13 +1,23 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 package io.flutter.plugin.platform;
 
 import static android.view.WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS;
 import static android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS;
+import static io.flutter.Build.API_LEVELS;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.anyBoolean;
+import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
@@ -19,6 +29,8 @@ import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.ContentResolver;
 import android.content.Context;
+import android.content.Intent;
+import android.content.res.AssetFileDescriptor;
 import android.net.Uri;
 import android.os.Build;
 import android.view.View;
@@ -37,6 +49,8 @@ import java.io.IOException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.MockedStatic;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.android.controller.ActivityController;
@@ -47,66 +61,166 @@ import org.robolectric.shadows.ShadowLooper;
 @RunWith(RobolectricTestRunner.class)
 public class PlatformPluginTest {
   private final Context ctx = ApplicationProvider.getApplicationContext();
+  private final PlatformChannel mockPlatformChannel = mock(PlatformChannel.class);
+
+  private ClipboardManager clipboardManager;
+  private ClipboardContentFormat clipboardFormat;
+
+  public void setUpForTextClipboardTests(Activity mockActivity) {
+    clipboardManager = spy(ctx.getSystemService(ClipboardManager.class));
+    when(mockActivity.getSystemService(Context.CLIPBOARD_SERVICE)).thenReturn(clipboardManager);
+    clipboardFormat = ClipboardContentFormat.PLAIN_TEXT;
+  }
 
-  @Config(sdk = 16)
   @Test
-  public void itIgnoresNewHapticEventsOnOldAndroidPlatforms() {
+  public void platformPlugin_getClipboardDataIsNonNullWhenPlainTextCopied() throws IOException {
     View fakeDecorView = mock(View.class);
     Window fakeWindow = mock(Window.class);
+    Activity mockActivity = mock(Activity.class);
     when(fakeWindow.getDecorView()).thenReturn(fakeDecorView);
-    Activity fakeActivity = mock(Activity.class);
-    when(fakeActivity.getWindow()).thenReturn(fakeWindow);
-    PlatformChannel fakePlatformChannel = mock(PlatformChannel.class);
-    PlatformPlugin platformPlugin = new PlatformPlugin(fakeActivity, fakePlatformChannel);
-
-    // HEAVY_IMPACT haptic response is only available on "M" (23) and later.
-    platformPlugin.vibrateHapticFeedback(PlatformChannel.HapticFeedbackType.HEAVY_IMPACT);
+    when(mockActivity.getWindow()).thenReturn(fakeWindow);
+    PlatformPlugin platformPlugin = new PlatformPlugin(mockActivity, mockPlatformChannel);
+    setUpForTextClipboardTests(mockActivity);
 
-    // SELECTION_CLICK haptic response is only available on "LOLLIPOP" (21) and later.
-    platformPlugin.vibrateHapticFeedback(PlatformChannel.HapticFeedbackType.SELECTION_CLICK);
+    // Primary clip contains non-text media.
+    ClipData clip = ClipData.newPlainText("label", "Text");
+    assertNull(platformPlugin.mPlatformMessageHandler.getClipboardData(clipboardFormat));
+    clipboardManager.setPrimaryClip(clip);
+    assertNotNull(platformPlugin.mPlatformMessageHandler.getClipboardData(clipboardFormat));
   }
 
-  @Config(sdk = 29)
   @Test
-  public void platformPlugin_getClipboardData() throws IOException {
-    ClipboardManager clipboardManager = ctx.getSystemService(ClipboardManager.class);
+  public void platformPlugin_getClipboardDataIsNonNullWhenIOExceptionThrown() throws IOException {
+    View fakeDecorView = mock(View.class);
+    Window fakeWindow = mock(Window.class);
+    Activity mockActivity = mock(Activity.class);
+    when(fakeWindow.getDecorView()).thenReturn(fakeDecorView);
+    when(mockActivity.getWindow()).thenReturn(fakeWindow);
+    PlatformPlugin platformPlugin = new PlatformPlugin(mockActivity, mockPlatformChannel);
+    setUpForTextClipboardTests(mockActivity);
+    ContentResolver contentResolver = mock(ContentResolver.class);
+    ClipData.Item mockItem = mock(ClipData.Item.class);
+    Uri mockUri = mock(Uri.class);
+    AssetFileDescriptor mockAssetFileDescriptor = mock(AssetFileDescriptor.class);
+
+    when(mockActivity.getContentResolver()).thenReturn(contentResolver);
+    when(mockUri.getScheme()).thenReturn("content");
+    when(mockItem.getText()).thenReturn(null);
+    when(mockItem.getUri()).thenReturn(mockUri);
+    when(contentResolver.openTypedAssetFileDescriptor(any(Uri.class), any(), any()))
+        .thenReturn(mockAssetFileDescriptor);
+    when(mockItem.coerceToText(mockActivity)).thenReturn("something non-null");
+    doThrow(new IOException()).when(mockAssetFileDescriptor).close();
+
+    ClipData clip = new ClipData("label", new String[0], mockItem);
 
+    assertNull(platformPlugin.mPlatformMessageHandler.getClipboardData(clipboardFormat));
+    clipboardManager.setPrimaryClip(clip);
+    assertNotNull(platformPlugin.mPlatformMessageHandler.getClipboardData(clipboardFormat));
+  }
+
+  @Test
+  public void platformPlugin_getClipboardDataIsNonNullWhenContentUriWithTextProvided()
+      throws IOException {
     View fakeDecorView = mock(View.class);
     Window fakeWindow = mock(Window.class);
+    Activity mockActivity = mock(Activity.class);
     when(fakeWindow.getDecorView()).thenReturn(fakeDecorView);
-    Activity fakeActivity = mock(Activity.class);
-    when(fakeActivity.getWindow()).thenReturn(fakeWindow);
-    when(fakeActivity.getSystemService(Context.CLIPBOARD_SERVICE)).thenReturn(clipboardManager);
-    PlatformChannel fakePlatformChannel = mock(PlatformChannel.class);
-    PlatformPlugin platformPlugin = new PlatformPlugin(fakeActivity, fakePlatformChannel);
+    when(mockActivity.getWindow()).thenReturn(fakeWindow);
+    PlatformPlugin platformPlugin = new PlatformPlugin(mockActivity, mockPlatformChannel);
+    setUpForTextClipboardTests(mockActivity);
+    ContentResolver contentResolver = mock(ContentResolver.class);
+    ClipData.Item mockItem = mock(ClipData.Item.class);
+    Uri mockUri = mock(Uri.class);
+
+    when(mockActivity.getContentResolver()).thenReturn(contentResolver);
+    when(mockUri.getScheme()).thenReturn("content");
+    when(mockItem.getText()).thenReturn(null);
+    when(mockItem.getUri()).thenReturn(mockUri);
+    when(contentResolver.openTypedAssetFileDescriptor(any(Uri.class), any(), any()))
+        .thenReturn(mock(AssetFileDescriptor.class));
+    when(mockItem.coerceToText(mockActivity)).thenReturn("something non-null");
+
+    ClipData clip = new ClipData("label", new String[0], mockItem);
 
-    ClipboardContentFormat clipboardFormat = ClipboardContentFormat.PLAIN_TEXT;
     assertNull(platformPlugin.mPlatformMessageHandler.getClipboardData(clipboardFormat));
-    ClipData clip = ClipData.newPlainText("label", "Text");
     clipboardManager.setPrimaryClip(clip);
     assertNotNull(platformPlugin.mPlatformMessageHandler.getClipboardData(clipboardFormat));
+  }
 
+  @Test
+  public void platformPlugin_getClipboardDataIsNullWhenContentUriProvidedContainsNoText()
+      throws IOException {
+    View fakeDecorView = mock(View.class);
+    Window fakeWindow = mock(Window.class);
+    Activity mockActivity = mock(Activity.class);
+    when(fakeWindow.getDecorView()).thenReturn(fakeDecorView);
+    when(mockActivity.getWindow()).thenReturn(fakeWindow);
+    PlatformPlugin platformPlugin = new PlatformPlugin(mockActivity, mockPlatformChannel);
+    setUpForTextClipboardTests(mockActivity);
     ContentResolver contentResolver = ctx.getContentResolver();
-    when(fakeActivity.getContentResolver()).thenReturn(contentResolver);
+
+    when(mockActivity.getContentResolver()).thenReturn(contentResolver);
+
     Uri uri = Uri.parse("content://media/external_primary/images/media/");
-    clip = ClipData.newUri(contentResolver, "URI", uri);
+    ClipData clip = ClipData.newUri(contentResolver, "URI", uri);
+
     clipboardManager.setPrimaryClip(clip);
     assertNull(platformPlugin.mPlatformMessageHandler.getClipboardData(clipboardFormat));
   }
 
-  @Config(sdk = 28)
   @Test
-  public void platformPlugin_hasStrings() {
-    ClipboardManager clipboardManager = spy(ctx.getSystemService(ClipboardManager.class));
+  public void platformPlugin_getClipboardDataIsNullWhenNonContentUriProvided() throws IOException {
+    View fakeDecorView = mock(View.class);
+    Window fakeWindow = mock(Window.class);
+    Activity mockActivity = mock(Activity.class);
+    when(fakeWindow.getDecorView()).thenReturn(fakeDecorView);
+    when(mockActivity.getWindow()).thenReturn(fakeWindow);
+    PlatformPlugin platformPlugin = new PlatformPlugin(mockActivity, mockPlatformChannel);
+    setUpForTextClipboardTests(mockActivity);
+    ContentResolver contentResolver = ctx.getContentResolver();
+
+    when(mockActivity.getContentResolver()).thenReturn(contentResolver);
+
+    Uri uri = Uri.parse("file:///");
+    ClipData clip = ClipData.newUri(contentResolver, "URI", uri);
+
+    clipboardManager.setPrimaryClip(clip);
+    assertNull(platformPlugin.mPlatformMessageHandler.getClipboardData(clipboardFormat));
+  }
+
+  @Test
+  public void platformPlugin_getClipboardDataIsNullWhenItemHasNoTextNorUri() throws IOException {
+    View fakeDecorView = mock(View.class);
+    Window fakeWindow = mock(Window.class);
+    Activity mockActivity = mock(Activity.class);
+    when(fakeWindow.getDecorView()).thenReturn(fakeDecorView);
+    when(mockActivity.getWindow()).thenReturn(fakeWindow);
+    PlatformPlugin platformPlugin = new PlatformPlugin(mockActivity, mockPlatformChannel);
+    setUpForTextClipboardTests(mockActivity);
+    ClipData.Item mockItem = mock(ClipData.Item.class);
+
+    when(mockItem.getText()).thenReturn(null);
+    when(mockItem.getUri()).thenReturn(null);
+
+    ClipData clip = new ClipData("label", new String[0], mockItem);
+
+    clipboardManager.setPrimaryClip(clip);
+    assertNull(platformPlugin.mPlatformMessageHandler.getClipboardData(clipboardFormat));
+  }
 
+  @SuppressWarnings("deprecation")
+  // ClipboardManager.getText
+  @Config(sdk = API_LEVELS.API_28)
+  @Test
+  public void platformPlugin_hasStrings() {
     View fakeDecorView = mock(View.class);
     Window fakeWindow = mock(Window.class);
+    Activity mockActivity = mock(Activity.class);
     when(fakeWindow.getDecorView()).thenReturn(fakeDecorView);
-    Activity fakeActivity = mock(Activity.class);
-    when(fakeActivity.getWindow()).thenReturn(fakeWindow);
-    when(fakeActivity.getSystemService(Context.CLIPBOARD_SERVICE)).thenReturn(clipboardManager);
-    PlatformChannel fakePlatformChannel = mock(PlatformChannel.class);
-    PlatformPlugin platformPlugin = new PlatformPlugin(fakeActivity, fakePlatformChannel);
+    when(mockActivity.getWindow()).thenReturn(fakeWindow);
+    PlatformPlugin platformPlugin = new PlatformPlugin(mockActivity, mockPlatformChannel);
+    setUpForTextClipboardTests(mockActivity);
 
     // Plain text
     ClipData clip = ClipData.newPlainText("label", "Text");
@@ -137,7 +251,7 @@ public class PlatformPluginTest {
     clipboardManager.setPrimaryClip(clip);
     assertFalse(platformPlugin.mPlatformMessageHandler.clipboardHasStrings());
 
-    if (Build.VERSION.SDK_INT >= 28) {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_28) {
       // Empty clipboard
       clipboardManager.clearPrimaryClip();
       assertFalse(platformPlugin.mPlatformMessageHandler.clipboardHasStrings());
@@ -148,18 +262,17 @@ public class PlatformPluginTest {
     verify(clipboardManager, never()).getText();
   }
 
-  @Config(sdk = 29)
+  @Config(sdk = API_LEVELS.API_29)
   @Test
   public void setNavigationBarDividerColor() {
     View fakeDecorView = mock(View.class);
     Window fakeWindow = mock(Window.class);
+    Activity mockActivity = mock(Activity.class);
     when(fakeWindow.getDecorView()).thenReturn(fakeDecorView);
-    Activity fakeActivity = mock(Activity.class);
-    when(fakeActivity.getWindow()).thenReturn(fakeWindow);
-    PlatformChannel fakePlatformChannel = mock(PlatformChannel.class);
-    PlatformPlugin platformPlugin = new PlatformPlugin(fakeActivity, fakePlatformChannel);
+    when(mockActivity.getWindow()).thenReturn(fakeWindow);
+    PlatformPlugin platformPlugin = new PlatformPlugin(mockActivity, mockPlatformChannel);
 
-    if (Build.VERSION.SDK_INT >= 28) {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_28) {
       // Default style test
       SystemChromeStyle style =
           new SystemChromeStyle(
@@ -223,19 +336,19 @@ public class PlatformPluginTest {
     }
   }
 
-  @Config(sdk = 30)
+  @Config(sdk = API_LEVELS.API_30)
   @Test
   public void setNavigationBarIconBrightness() {
-    if (Build.VERSION.SDK_INT >= 30) {
-      View fakeDecorView = mock(View.class);
+    View fakeDecorView = mock(View.class);
+    Window fakeWindow = mock(Window.class);
+    Activity mockActivity = mock(Activity.class);
+    when(fakeWindow.getDecorView()).thenReturn(fakeDecorView);
+    when(mockActivity.getWindow()).thenReturn(fakeWindow);
+    PlatformPlugin platformPlugin = new PlatformPlugin(mockActivity, mockPlatformChannel);
+
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_30) {
       WindowInsetsController fakeWindowInsetsController = mock(WindowInsetsController.class);
-      Window fakeWindow = mock(Window.class);
-      when(fakeWindow.getDecorView()).thenReturn(fakeDecorView);
       when(fakeWindow.getInsetsController()).thenReturn(fakeWindowInsetsController);
-      Activity fakeActivity = mock(Activity.class);
-      when(fakeActivity.getWindow()).thenReturn(fakeWindow);
-      PlatformChannel fakePlatformChannel = mock(PlatformChannel.class);
-      PlatformPlugin platformPlugin = new PlatformPlugin(fakeActivity, fakePlatformChannel);
 
       SystemChromeStyle style =
           new SystemChromeStyle(
@@ -270,19 +383,19 @@ public class PlatformPluginTest {
     }
   }
 
-  @Config(sdk = 30)
+  @Config(sdk = API_LEVELS.API_30)
   @Test
   public void setStatusBarIconBrightness() {
-    if (Build.VERSION.SDK_INT >= 30) {
-      View fakeDecorView = mock(View.class);
+    View fakeDecorView = mock(View.class);
+    Window fakeWindow = mock(Window.class);
+    Activity mockActivity = mock(Activity.class);
+    when(fakeWindow.getDecorView()).thenReturn(fakeDecorView);
+    when(mockActivity.getWindow()).thenReturn(fakeWindow);
+    PlatformPlugin platformPlugin = new PlatformPlugin(mockActivity, mockPlatformChannel);
+
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_30) {
       WindowInsetsController fakeWindowInsetsController = mock(WindowInsetsController.class);
-      Window fakeWindow = mock(Window.class);
-      when(fakeWindow.getDecorView()).thenReturn(fakeDecorView);
       when(fakeWindow.getInsetsController()).thenReturn(fakeWindowInsetsController);
-      Activity fakeActivity = mock(Activity.class);
-      when(fakeActivity.getWindow()).thenReturn(fakeWindow);
-      PlatformChannel fakePlatformChannel = mock(PlatformChannel.class);
-      PlatformPlugin platformPlugin = new PlatformPlugin(fakeActivity, fakePlatformChannel);
 
       SystemChromeStyle style =
           new SystemChromeStyle(
@@ -315,18 +428,19 @@ public class PlatformPluginTest {
     }
   }
 
-  @Config(sdk = 29)
+  @SuppressWarnings("deprecation")
+  // SYSTEM_UI_FLAG_*, setSystemUiVisibility
+  @Config(sdk = API_LEVELS.API_29)
   @Test
   public void setSystemUiMode() {
     View fakeDecorView = mock(View.class);
     Window fakeWindow = mock(Window.class);
+    Activity mockActivity = mock(Activity.class);
     when(fakeWindow.getDecorView()).thenReturn(fakeDecorView);
-    Activity fakeActivity = mock(Activity.class);
-    when(fakeActivity.getWindow()).thenReturn(fakeWindow);
-    PlatformChannel fakePlatformChannel = mock(PlatformChannel.class);
-    PlatformPlugin platformPlugin = new PlatformPlugin(fakeActivity, fakePlatformChannel);
+    when(mockActivity.getWindow()).thenReturn(fakeWindow);
+    PlatformPlugin platformPlugin = new PlatformPlugin(mockActivity, mockPlatformChannel);
 
-    if (Build.VERSION.SDK_INT >= 28) {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_28) {
       platformPlugin.mPlatformMessageHandler.showSystemUiMode(
           PlatformChannel.SystemUiMode.LEAN_BACK);
       verify(fakeDecorView)
@@ -360,7 +474,7 @@ public class PlatformPluginTest {
                   | View.SYSTEM_UI_FLAG_FULLSCREEN);
     }
 
-    if (Build.VERSION.SDK_INT >= 29) {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_29) {
       platformPlugin.mPlatformMessageHandler.showSystemUiMode(
           PlatformChannel.SystemUiMode.EDGE_TO_EDGE);
       verify(fakeDecorView)
@@ -371,14 +485,15 @@ public class PlatformPluginTest {
     }
   }
 
+  @SuppressWarnings("deprecation")
+  // SYSTEM_UI_FLAG_FULLSCREEN
   @Test
   public void setSystemUiModeListener_overlaysAreHidden() {
     ActivityController<Activity> controller = Robolectric.buildActivity(Activity.class);
     controller.setup();
     Activity fakeActivity = controller.get();
 
-    PlatformChannel fakePlatformChannel = mock(PlatformChannel.class);
-    PlatformPlugin platformPlugin = new PlatformPlugin(fakeActivity, fakePlatformChannel);
+    PlatformPlugin platformPlugin = new PlatformPlugin(fakeActivity, mockPlatformChannel);
 
     // Subscribe to system UI visibility events.
     platformPlugin.mPlatformMessageHandler.setSystemUiChangeListener();
@@ -391,23 +506,23 @@ public class PlatformPluginTest {
 
     // No events should have been sent to the platform channel yet. They are scheduled for
     // the next frame.
-    verify(fakePlatformChannel, never()).systemChromeChanged(anyBoolean());
+    verify(mockPlatformChannel, never()).systemChromeChanged(anyBoolean());
 
     // Simulate the next frame.
     ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
 
     // Now the platform channel should receive the event.
-    verify(fakePlatformChannel).systemChromeChanged(false);
+    verify(mockPlatformChannel).systemChromeChanged(false);
   }
 
+  @SuppressWarnings("deprecation")
+  // dispatchSystemUiVisibilityChanged
   @Test
   public void setSystemUiModeListener_overlaysAreVisible() {
     ActivityController<Activity> controller = Robolectric.buildActivity(Activity.class);
     controller.setup();
     Activity fakeActivity = controller.get();
-
-    PlatformChannel fakePlatformChannel = mock(PlatformChannel.class);
-    PlatformPlugin platformPlugin = new PlatformPlugin(fakeActivity, fakePlatformChannel);
+    PlatformPlugin platformPlugin = new PlatformPlugin(fakeActivity, mockPlatformChannel);
 
     // Subscribe to system Ui visibility events.
     platformPlugin.mPlatformMessageHandler.setSystemUiChangeListener();
@@ -417,25 +532,26 @@ public class PlatformPluginTest {
 
     // No events should have been sent to the platform channel yet. They are scheduled for
     // the next frame.
-    verify(fakePlatformChannel, never()).systemChromeChanged(anyBoolean());
+    verify(mockPlatformChannel, never()).systemChromeChanged(anyBoolean());
 
     // Simulate the next frame.
     ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
 
     // Now the platform channel should receive the event.
-    verify(fakePlatformChannel).systemChromeChanged(true);
+    verify(mockPlatformChannel).systemChromeChanged(true);
   }
 
-  @Config(sdk = 28)
+  @SuppressWarnings("deprecation")
+  // SYSTEM_UI_FLAG_*, setSystemUiVisibility
+  @Config(sdk = API_LEVELS.API_28)
   @Test
   public void doNotEnableEdgeToEdgeOnOlderSdk() {
     View fakeDecorView = mock(View.class);
     Window fakeWindow = mock(Window.class);
+    Activity mockActivity = mock(Activity.class);
     when(fakeWindow.getDecorView()).thenReturn(fakeDecorView);
-    Activity fakeActivity = mock(Activity.class);
-    when(fakeActivity.getWindow()).thenReturn(fakeWindow);
-    PlatformChannel fakePlatformChannel = mock(PlatformChannel.class);
-    PlatformPlugin platformPlugin = new PlatformPlugin(fakeActivity, fakePlatformChannel);
+    when(mockActivity.getWindow()).thenReturn(fakeWindow);
+    PlatformPlugin platformPlugin = new PlatformPlugin(mockActivity, mockPlatformChannel);
 
     platformPlugin.mPlatformMessageHandler.showSystemUiMode(
         PlatformChannel.SystemUiMode.EDGE_TO_EDGE);
@@ -446,16 +562,17 @@ public class PlatformPluginTest {
                 | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
   }
 
-  @Config(sdk = 29)
+  @SuppressWarnings("deprecation")
+  // FLAG_TRANSLUCENT_STATUS, FLAG_TRANSLUCENT_NAVIGATION
+  @Config(sdk = API_LEVELS.API_29)
   @Test
   public void verifyWindowFlagsSetToStyleOverlays() {
     View fakeDecorView = mock(View.class);
     Window fakeWindow = mock(Window.class);
+    Activity mockActivity = mock(Activity.class);
     when(fakeWindow.getDecorView()).thenReturn(fakeDecorView);
-    Activity fakeActivity = mock(Activity.class);
-    when(fakeActivity.getWindow()).thenReturn(fakeWindow);
-    PlatformChannel fakePlatformChannel = mock(PlatformChannel.class);
-    PlatformPlugin platformPlugin = new PlatformPlugin(fakeActivity, fakePlatformChannel);
+    when(mockActivity.getWindow()).thenReturn(fakeWindow);
+    PlatformPlugin platformPlugin = new PlatformPlugin(mockActivity, mockPlatformChannel);
 
     SystemChromeStyle style =
         new SystemChromeStyle(
@@ -469,15 +586,41 @@ public class PlatformPluginTest {
                 | WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
   }
 
+  @Test
+  public void setFrameworkHandlesBackFlutterActivity() {
+    Activity mockActivity = mock(Activity.class);
+    PlatformPluginDelegate mockPlatformPluginDelegate = mock(PlatformPluginDelegate.class);
+    PlatformPlugin platformPlugin =
+        new PlatformPlugin(mockActivity, mockPlatformChannel, mockPlatformPluginDelegate);
+
+    platformPlugin.mPlatformMessageHandler.setFrameworkHandlesBack(true);
+
+    verify(mockPlatformPluginDelegate, times(1)).setFrameworkHandlesBack(true);
+  }
+
+  @Test
+  public void testPlatformPluginDelegateNull() throws Exception {
+    Activity mockActivity = mock(Activity.class);
+    PlatformPlugin platformPlugin =
+        new PlatformPlugin(mockActivity, mockPlatformChannel, null /*platformPluginDelegate*/);
+
+    try {
+      platformPlugin.mPlatformMessageHandler.setFrameworkHandlesBack(true);
+    } catch (NullPointerException e) {
+      // Not expected
+      fail("NullPointerException was thrown");
+    }
+  }
+
   @Test
   public void popSystemNavigatorFlutterActivity() {
     Activity mockActivity = mock(Activity.class);
-    PlatformChannel mockPlatformChannel = mock(PlatformChannel.class);
     PlatformPluginDelegate mockPlatformPluginDelegate = mock(PlatformPluginDelegate.class);
-    when(mockPlatformPluginDelegate.popSystemNavigator()).thenReturn(false);
     PlatformPlugin platformPlugin =
         new PlatformPlugin(mockActivity, mockPlatformChannel, mockPlatformPluginDelegate);
 
+    when(mockPlatformPluginDelegate.popSystemNavigator()).thenReturn(false);
+
     platformPlugin.mPlatformMessageHandler.popSystemNavigator();
 
     verify(mockPlatformPluginDelegate, times(1)).popSystemNavigator();
@@ -487,12 +630,12 @@ public class PlatformPluginTest {
   @Test
   public void doesNotDoAnythingByDefaultIfPopSystemNavigatorOverridden() {
     Activity mockActivity = mock(Activity.class);
-    PlatformChannel mockPlatformChannel = mock(PlatformChannel.class);
     PlatformPluginDelegate mockPlatformPluginDelegate = mock(PlatformPluginDelegate.class);
-    when(mockPlatformPluginDelegate.popSystemNavigator()).thenReturn(true);
     PlatformPlugin platformPlugin =
         new PlatformPlugin(mockActivity, mockPlatformChannel, mockPlatformPluginDelegate);
 
+    when(mockPlatformPluginDelegate.popSystemNavigator()).thenReturn(true);
+
     platformPlugin.mPlatformMessageHandler.popSystemNavigator();
 
     verify(mockPlatformPluginDelegate, times(1)).popSystemNavigator();
@@ -500,8 +643,12 @@ public class PlatformPluginTest {
     verify(mockActivity, never()).finish();
   }
 
+  @SuppressWarnings("deprecation")
+  // Robolectric.setupActivity.
+  // TODO(reidbaker): https://github.com/flutter/flutter/issues/133151
   @Test
   public void popSystemNavigatorFlutterFragment() {
+    // Migrate to ActivityScenario by following https://github.com/robolectric/robolectric/pull/4736
     FragmentActivity activity = spy(Robolectric.setupActivity(FragmentActivity.class));
     final AtomicBoolean onBackPressedCalled = new AtomicBoolean(false);
     OnBackPressedCallback backCallback =
@@ -513,7 +660,6 @@ public class PlatformPluginTest {
         };
     activity.getOnBackPressedDispatcher().addCallback(backCallback);
 
-    PlatformChannel mockPlatformChannel = mock(PlatformChannel.class);
     PlatformPluginDelegate mockPlatformPluginDelegate = mock(PlatformPluginDelegate.class);
     when(mockPlatformPluginDelegate.popSystemNavigator()).thenReturn(false);
     PlatformPlugin platformPlugin =
@@ -526,10 +672,12 @@ public class PlatformPluginTest {
     assertTrue(onBackPressedCalled.get());
   }
 
+  @SuppressWarnings("deprecation")
+  // Robolectric.setupActivity.
+  // TODO(reidbaker): https://github.com/flutter/flutter/issues/133151
   @Test
   public void doesNotDoAnythingByDefaultIfFragmentPopSystemNavigatorOverridden() {
     FragmentActivity activity = spy(Robolectric.setupActivity(FragmentActivity.class));
-    PlatformChannel mockPlatformChannel = mock(PlatformChannel.class);
     PlatformPluginDelegate mockPlatformPluginDelegate = mock(PlatformPluginDelegate.class);
     when(mockPlatformPluginDelegate.popSystemNavigator()).thenReturn(true);
     PlatformPlugin platformPlugin =
@@ -545,7 +693,6 @@ public class PlatformPluginTest {
   @Test
   public void setRequestedOrientationFlutterFragment() {
     FragmentActivity mockFragmentActivity = mock(FragmentActivity.class);
-    PlatformChannel mockPlatformChannel = mock(PlatformChannel.class);
     PlatformPluginDelegate mockPlatformPluginDelegate = mock(PlatformPluginDelegate.class);
     when(mockPlatformPluginDelegate.popSystemNavigator()).thenReturn(false);
     PlatformPlugin platformPlugin =
@@ -566,4 +713,35 @@ public class PlatformPluginTest {
 
     verify(mockActivity, times(1)).finish();
   }
+
+  @Test
+  public void startChoosenActivityWhenSharingText() {
+    Activity mockActivity = mock(Activity.class);
+    PlatformChannel mockPlatformChannel = mock(PlatformChannel.class);
+    PlatformPluginDelegate mockPlatformPluginDelegate = mock(PlatformPluginDelegate.class);
+    PlatformPlugin platformPlugin =
+        new PlatformPlugin(mockActivity, mockPlatformChannel, mockPlatformPluginDelegate);
+
+    // Mock Intent.createChooser (in real application it opens a chooser where the user can
+    // select which application will be used to share the selected text).
+    Intent choosenIntent = new Intent();
+    MockedStatic<Intent> intentClass = mockStatic(Intent.class);
+    ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
+    intentClass
+        .when(() -> Intent.createChooser(intentCaptor.capture(), any()))
+        .thenReturn(choosenIntent);
+
+    final String expectedContent = "Flutter";
+    platformPlugin.mPlatformMessageHandler.share(expectedContent);
+
+    // Activity.startActivity should have been called.
+    verify(mockActivity, times(1)).startActivity(choosenIntent);
+
+    // The intent action created by the plugin and passed to Intent.createChooser should be
+    // 'Intent.ACTION_SEND'.
+    Intent sendToIntent = intentCaptor.getValue();
+    assertEquals(sendToIntent.getAction(), Intent.ACTION_SEND);
+    assertEquals(sendToIntent.getType(), "text/plain");
+    assertEquals(sendToIntent.getStringExtra(Intent.EXTRA_TEXT), expectedContent);
+  }
 }
diff --git a/shell/platform/android/test/io/flutter/plugin/platform/PlatformViewWrapperTest.java b/shell/platform/android/test/io/flutter/plugin/platform/PlatformViewWrapperTest.java
index 630504f9aaeef28cafa02b2826653717ef8f7ade..64fd84f93743ba7e9ca002e384ff8042f70080f6 100644
--- a/shell/platform/android/test/io/flutter/plugin/platform/PlatformViewWrapperTest.java
+++ b/shell/platform/android/test/io/flutter/plugin/platform/PlatformViewWrapperTest.java
@@ -1,22 +1,26 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 package io.flutter.plugin.platform;
 
 import static android.view.View.OnFocusChangeListener;
+import static io.flutter.Build.API_LEVELS;
 import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.spy;
 
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
-import android.graphics.PorterDuff;
-import android.graphics.SurfaceTexture;
-import android.view.Surface;
 import android.view.View;
+import android.view.View.OnFocusChangeListener;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.view.accessibility.AccessibilityEvent;
-import androidx.annotation.NonNull;
+import android.widget.FrameLayout;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Test;
@@ -26,7 +30,7 @@ import org.robolectric.annotation.Config;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 
-@TargetApi(31)
+@TargetApi(API_LEVELS.API_31)
 @RunWith(AndroidJUnit4.class)
 public class PlatformViewWrapperTest {
   private final Context ctx = ApplicationProvider.getApplicationContext();
@@ -43,88 +47,6 @@ public class PlatformViewWrapperTest {
   }
 
   @Test
-  public void setTexture_writesToBuffer() {
-    final Surface surface = mock(Surface.class);
-    final PlatformViewWrapper wrapper =
-        new PlatformViewWrapper(ctx) {
-          @Override
-          protected Surface createSurface(@NonNull SurfaceTexture tx) {
-            return surface;
-          }
-        };
-
-    final SurfaceTexture tx = mock(SurfaceTexture.class);
-    when(tx.isReleased()).thenReturn(false);
-
-    final Canvas canvas = mock(Canvas.class);
-    when(surface.lockHardwareCanvas()).thenReturn(canvas);
-
-    // Test.
-    wrapper.setTexture(tx);
-
-    // Verify.
-    verify(surface, times(1)).lockHardwareCanvas();
-    verify(surface, times(1)).unlockCanvasAndPost(canvas);
-    verify(canvas, times(1)).drawColor(Color.TRANSPARENT, PorterDuff.Mode.CLEAR);
-    verifyNoMoreInteractions(surface);
-    verifyNoMoreInteractions(canvas);
-  }
-
-  @Test
-  public void draw_writesToBuffer() {
-    final Surface surface = mock(Surface.class);
-    final PlatformViewWrapper wrapper =
-        new PlatformViewWrapper(ctx) {
-          @Override
-          protected Surface createSurface(@NonNull SurfaceTexture tx) {
-            return surface;
-          }
-        };
-
-    wrapper.addView(
-        new View(ctx) {
-          @Override
-          public void draw(Canvas canvas) {
-            super.draw(canvas);
-            canvas.drawColor(Color.RED);
-          }
-        });
-
-    final int size = 100;
-    wrapper.measure(size, size);
-    wrapper.layout(0, 0, size, size);
-
-    final SurfaceTexture tx = mock(SurfaceTexture.class);
-    when(tx.isReleased()).thenReturn(false);
-
-    when(surface.lockHardwareCanvas()).thenReturn(mock(Canvas.class));
-
-    wrapper.setTexture(tx);
-
-    reset(surface);
-
-    final Canvas canvas = mock(Canvas.class);
-    when(surface.lockHardwareCanvas()).thenReturn(canvas);
-    when(surface.isValid()).thenReturn(true);
-
-    // Test.
-    wrapper.invalidate();
-    wrapper.draw(new Canvas());
-
-    // Verify.
-    verify(canvas, times(1)).drawColor(Color.TRANSPARENT, PorterDuff.Mode.CLEAR);
-    verify(surface, times(1)).isValid();
-    verify(surface, times(1)).lockHardwareCanvas();
-    verify(surface, times(1)).unlockCanvasAndPost(canvas);
-    verifyNoMoreInteractions(surface);
-    verifyNoMoreInteractions(canvas);
-  }
-
-  @Test
-  @Config(
-      shadows = {
-        ShadowView.class,
-      })
   public void draw_withoutSurface() {
     final PlatformViewWrapper wrapper =
         new PlatformViewWrapper(ctx) {
@@ -141,36 +63,6 @@ public class PlatformViewWrapperTest {
     verify(canvas, times(1)).drawColor(Color.RED);
   }
 
-  @Test
-  public void release() {
-    final Surface surface = mock(Surface.class);
-    final PlatformViewWrapper wrapper =
-        new PlatformViewWrapper(ctx) {
-          @Override
-          protected Surface createSurface(@NonNull SurfaceTexture tx) {
-            return surface;
-          }
-        };
-
-    final SurfaceTexture tx = mock(SurfaceTexture.class);
-    when(tx.isReleased()).thenReturn(false);
-
-    final Canvas canvas = mock(Canvas.class);
-    when(surface.lockHardwareCanvas()).thenReturn(canvas);
-
-    wrapper.setTexture(tx);
-    reset(surface);
-    reset(tx);
-
-    // Test.
-    wrapper.release();
-
-    // Verify.
-    verify(surface, times(1)).release();
-    verifyNoMoreInteractions(surface);
-    verifyNoMoreInteractions(tx);
-  }
-
   @Test
   public void focusChangeListener_hasFocus() {
     final ViewTreeObserver viewTreeObserver = mock(ViewTreeObserver.class);
@@ -256,16 +148,16 @@ public class PlatformViewWrapperTest {
           }
         };
 
-    assertNull(view.activeFocusListener);
+    assertNull(view.getActiveFocusListener());
 
     view.setOnDescendantFocusChangeListener(mock(OnFocusChangeListener.class));
-    assertNotNull(view.activeFocusListener);
+    assertNotNull(view.getActiveFocusListener());
 
     final ViewTreeObserver.OnGlobalFocusChangeListener activeFocusListener =
-        view.activeFocusListener;
+        view.getActiveFocusListener();
 
     view.setOnDescendantFocusChangeListener(mock(OnFocusChangeListener.class));
-    assertNotNull(view.activeFocusListener);
+    assertNotNull(view.getActiveFocusListener());
 
     verify(viewTreeObserver, times(1)).removeOnGlobalFocusChangeListener(activeFocusListener);
   }
@@ -283,16 +175,16 @@ public class PlatformViewWrapperTest {
           }
         };
 
-    assertNull(view.activeFocusListener);
+    assertNull(view.getActiveFocusListener());
 
     view.setOnDescendantFocusChangeListener(mock(OnFocusChangeListener.class));
-    assertNotNull(view.activeFocusListener);
+    assertNotNull(view.getActiveFocusListener());
 
     final ViewTreeObserver.OnGlobalFocusChangeListener activeFocusListener =
-        view.activeFocusListener;
+        view.getActiveFocusListener();
 
     view.unsetOnDescendantFocusChangeListener();
-    assertNull(view.activeFocusListener);
+    assertNull(view.getActiveFocusListener());
 
     view.unsetOnDescendantFocusChangeListener();
     verify(viewTreeObserver, times(1)).removeOnGlobalFocusChangeListener(activeFocusListener);
@@ -301,6 +193,7 @@ public class PlatformViewWrapperTest {
   @Test
   @Config(
       shadows = {
+        ShadowFrameLayout.class,
         ShadowViewGroup.class,
       })
   public void ignoreAccessibilityEvents() {
@@ -319,6 +212,7 @@ public class PlatformViewWrapperTest {
   @Test
   @Config(
       shadows = {
+        ShadowFrameLayout.class,
         ShadowViewGroup.class,
       })
   public void sendAccessibilityEvents() {
@@ -340,14 +234,15 @@ public class PlatformViewWrapperTest {
     assertTrue(eventSent);
   }
 
-  @Implements(View.class)
-  public static class ShadowView {}
-
   @Implements(ViewGroup.class)
-  public static class ShadowViewGroup extends org.robolectric.shadows.ShadowView {
+  public static class ShadowViewGroup extends org.robolectric.shadows.ShadowViewGroup {
     @Implementation
-    public boolean requestSendAccessibilityEvent(View child, AccessibilityEvent event) {
+    protected boolean requestSendAccessibilityEvent(View child, AccessibilityEvent event) {
       return true;
     }
   }
+
+  @Implements(FrameLayout.class)
+  public static class ShadowFrameLayout
+      extends io.flutter.plugin.platform.PlatformViewWrapperTest.ShadowViewGroup {}
 }
diff --git a/shell/platform/android/test/io/flutter/plugin/platform/PlatformViewsControllerTest.java b/shell/platform/android/test/io/flutter/plugin/platform/PlatformViewsControllerTest.java
index e896ecf0f7302a2963c485a0e68744e4b3a2458a..0b69e6a801880380f1df342d1b3d930c1b9a33f7 100644
--- a/shell/platform/android/test/io/flutter/plugin/platform/PlatformViewsControllerTest.java
+++ b/shell/platform/android/test/io/flutter/plugin/platform/PlatformViewsControllerTest.java
@@ -1,3 +1,7 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 package io.flutter.plugin.platform;
 
 import static android.os.Looper.getMainLooper;
@@ -7,10 +11,12 @@ import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 import static org.robolectric.Shadows.shadowOf;
 
+import android.app.Presentation;
 import android.content.Context;
 import android.content.MutableContextWrapper;
 import android.content.res.AssetManager;
 import android.graphics.SurfaceTexture;
+import android.media.Image;
 import android.util.SparseArray;
 import android.view.MotionEvent;
 import android.view.Surface;
@@ -20,12 +26,13 @@ import android.view.View;
 import android.view.ViewParent;
 import android.widget.FrameLayout;
 import android.widget.FrameLayout.LayoutParams;
+import androidx.annotation.NonNull;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import io.flutter.embedding.android.FlutterImageView;
+import io.flutter.embedding.android.FlutterSurfaceView;
 import io.flutter.embedding.android.FlutterView;
 import io.flutter.embedding.android.MotionEventTracker;
-import io.flutter.embedding.android.RenderMode;
 import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.embedding.engine.FlutterJNI;
 import io.flutter.embedding.engine.FlutterOverlaySurface;
@@ -35,9 +42,12 @@ import io.flutter.embedding.engine.mutatorsstack.FlutterMutatorsStack;
 import io.flutter.embedding.engine.renderer.FlutterRenderer;
 import io.flutter.embedding.engine.systemchannels.AccessibilityChannel;
 import io.flutter.embedding.engine.systemchannels.MouseCursorChannel;
+import io.flutter.embedding.engine.systemchannels.PlatformViewsChannel;
+import io.flutter.embedding.engine.systemchannels.PlatformViewsChannel.PlatformViewTouch;
 import io.flutter.embedding.engine.systemchannels.SettingsChannel;
 import io.flutter.embedding.engine.systemchannels.TextInputChannel;
 import io.flutter.plugin.common.MethodCall;
+import io.flutter.plugin.common.StandardMessageCodec;
 import io.flutter.plugin.common.StandardMethodCodec;
 import io.flutter.plugin.localization.LocalizationPlugin;
 import io.flutter.view.TextureRegistry;
@@ -53,52 +63,130 @@ import org.mockito.ArgumentCaptor;
 import org.robolectric.annotation.Config;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
+import org.robolectric.shadows.ShadowDialog;
 import org.robolectric.shadows.ShadowSurfaceView;
 
 @Config(manifest = Config.NONE)
 @RunWith(AndroidJUnit4.class)
 public class PlatformViewsControllerTest {
+  // An implementation of PlatformView that counts invocations of its lifecycle callbacks.
+  class CountingPlatformView implements PlatformView {
+    static final String VIEW_TYPE_ID = "CountingPlatformView";
+    private View view;
 
-  @Ignore
-  @Test
-  public void itNotifiesVirtualDisplayControllersOfViewAttachmentAndDetachment() {
-    // Setup test structure.
-    FlutterView fakeFlutterView = new FlutterView(ApplicationProvider.getApplicationContext());
+    public CountingPlatformView(Context context) {
+      view = new SurfaceView(context);
+    }
 
-    // Create fake VirtualDisplayControllers. This requires internal knowledge of
-    // PlatformViewsController. We know that all PlatformViewsController does is
-    // forward view attachment/detachment calls to it's VirtualDisplayControllers.
-    //
-    // TODO(mattcarroll): once PlatformViewsController is refactored into testable
-    // pieces, remove this test and avoid verifying private behavior.
-    VirtualDisplayController fakeVdController1 = mock(VirtualDisplayController.class);
-    VirtualDisplayController fakeVdController2 = mock(VirtualDisplayController.class);
+    public int disposeCalls = 0;
+    public int attachCalls = 0;
+    public int detachCalls = 0;
+
+    @Override
+    public void dispose() {
+      // We have been removed from the view hierarhy before the call to dispose.
+      assertNull(view.getParent());
+      disposeCalls++;
+    }
+
+    @Override
+    public View getView() {
+      return view;
+    }
+
+    @Override
+    public void onFlutterViewAttached(View flutterView) {
+      attachCalls++;
+    }
+
+    @Override
+    public void onFlutterViewDetached() {
+      detachCalls++;
+    }
+  }
 
-    // Create the PlatformViewsController that is under test.
+  @Test
+  @Config(shadows = {ShadowFlutterJNI.class, ShadowPlatformTaskQueue.class})
+  public void itRemovesPlatformViewBeforeDiposeIsCalled() {
     PlatformViewsController platformViewsController = new PlatformViewsController();
+    FlutterJNI jni = new FlutterJNI();
+    attach(jni, platformViewsController);
+    // Get the platform view registry.
+    PlatformViewRegistry registry = platformViewsController.getRegistry();
 
-    // Manually inject fake VirtualDisplayControllers into the PlatformViewsController.
-    platformViewsController.vdControllers.put(0, fakeVdController1);
-    platformViewsController.vdControllers.put(1, fakeVdController1);
+    // Register a factory for our platform view.
+    registry.registerViewFactory(
+        CountingPlatformView.VIEW_TYPE_ID,
+        new PlatformViewFactory(StandardMessageCodec.INSTANCE) {
+          @Override
+          public PlatformView create(Context context, int viewId, Object args) {
+            return new CountingPlatformView(context);
+          }
+        });
 
-    // Execute test & verify results.
-    // Attach PlatformViewsController to the fake Flutter View.
-    platformViewsController.attachToView(fakeFlutterView);
+    // Create the platform view.
+    int viewId = 0;
+    final PlatformViewsChannel.PlatformViewCreationRequest request =
+        new PlatformViewsChannel.PlatformViewCreationRequest(
+            viewId,
+            CountingPlatformView.VIEW_TYPE_ID,
+            0,
+            0,
+            128,
+            128,
+            View.LAYOUT_DIRECTION_LTR,
+            null);
+    PlatformView pView = platformViewsController.createPlatformView(request, true);
+    assertTrue(pView instanceof CountingPlatformView);
+    CountingPlatformView cpv = (CountingPlatformView) pView;
+    platformViewsController.configureForTextureLayerComposition(pView, request);
+    assertEquals(0, cpv.disposeCalls);
+    platformViewsController.disposePlatformView(viewId);
+    assertEquals(1, cpv.disposeCalls);
+  }
+
+  @Test
+  @Config(shadows = {ShadowFlutterJNI.class, ShadowPlatformTaskQueue.class})
+  public void itNotifiesPlatformViewsOfEngineAttachmentAndDetachment() {
+    PlatformViewsController platformViewsController = new PlatformViewsController();
+    FlutterJNI jni = new FlutterJNI();
+    attach(jni, platformViewsController);
+    // Get the platform view registry.
+    PlatformViewRegistry registry = platformViewsController.getRegistry();
 
-    // Verify that all virtual display controllers were notified of View attachment.
-    verify(fakeVdController1, times(1)).onFlutterViewAttached(eq(fakeFlutterView));
-    verify(fakeVdController1, never()).onFlutterViewDetached();
-    verify(fakeVdController2, times(1)).onFlutterViewAttached(eq(fakeFlutterView));
-    verify(fakeVdController2, never()).onFlutterViewDetached();
+    // Register a factory for our platform view.
+    registry.registerViewFactory(
+        CountingPlatformView.VIEW_TYPE_ID,
+        new PlatformViewFactory(StandardMessageCodec.INSTANCE) {
+          @Override
+          public PlatformView create(Context context, int viewId, Object args) {
+            return new CountingPlatformView(context);
+          }
+        });
 
-    // Detach PlatformViewsController from the fake Flutter View.
+    // Create the platform view.
+    int viewId = 0;
+    final PlatformViewsChannel.PlatformViewCreationRequest request =
+        new PlatformViewsChannel.PlatformViewCreationRequest(
+            viewId,
+            CountingPlatformView.VIEW_TYPE_ID,
+            0,
+            0,
+            128,
+            128,
+            View.LAYOUT_DIRECTION_LTR,
+            null);
+    PlatformView pView = platformViewsController.createPlatformView(request, true);
+    assertTrue(pView instanceof CountingPlatformView);
+    CountingPlatformView cpv = (CountingPlatformView) pView;
+    assertEquals(1, cpv.attachCalls);
+    assertEquals(0, cpv.detachCalls);
+    assertEquals(0, cpv.disposeCalls);
     platformViewsController.detachFromView();
-
-    // Verify that all virtual display controllers were notified of the View detachment.
-    verify(fakeVdController1, times(1)).onFlutterViewAttached(eq(fakeFlutterView));
-    verify(fakeVdController1, times(1)).onFlutterViewDetached();
-    verify(fakeVdController2, times(1)).onFlutterViewAttached(eq(fakeFlutterView));
-    verify(fakeVdController2, times(1)).onFlutterViewDetached();
+    assertEquals(1, cpv.attachCalls);
+    assertEquals(1, cpv.detachCalls);
+    assertEquals(0, cpv.disposeCalls);
+    platformViewsController.disposePlatformView(viewId);
   }
 
   @Ignore
@@ -150,6 +238,36 @@ public class PlatformViewsControllerTest {
     resizeCallbackCaptor.getValue().run();
   }
 
+  @Test
+  @Config(shadows = {ShadowFlutterJNI.class, ShadowPlatformTaskQueue.class})
+  public void virtualDisplay_ensureDisposeVirtualDisplayController() {
+    final int platformViewId = 0;
+    FlutterView fakeFlutterView = new FlutterView(ApplicationProvider.getApplicationContext());
+    VirtualDisplayController fakeVdController = mock(VirtualDisplayController.class);
+    PlatformViewsController platformViewsController = new PlatformViewsController();
+    FlutterJNI jni = new FlutterJNI();
+    attach(jni, platformViewsController);
+    platformViewsController.attachToView(fakeFlutterView);
+
+    PlatformViewFactory viewFactory = mock(PlatformViewFactory.class);
+    PlatformView platformView = mock(PlatformView.class);
+    Context context = ApplicationProvider.getApplicationContext();
+    View androidView = new View(context);
+    when(platformView.getView()).thenReturn(androidView);
+    when(viewFactory.create(any(), eq(platformViewId), any())).thenReturn(platformView);
+    platformViewsController.getRegistry().registerViewFactory("testType", viewFactory);
+    createPlatformView(
+        jni, platformViewsController, platformViewId, "testType", /* hybrid=*/ false);
+
+    platformViewsController.vdControllers.put(platformViewId, fakeVdController);
+
+    // Simulate dispose call from the framework.
+    disposePlatformView(jni, platformViewsController, platformViewId);
+
+    // Ensure VirtualDisplayController.dispose() is called
+    verify(fakeVdController, times(1)).dispose();
+  }
+
   @Test
   public void itUsesActionEventTypeFromFrameworkEventForVirtualDisplays() {
     MotionEventTracker motionEventTracker = MotionEventTracker.getInstance();
@@ -239,8 +357,8 @@ public class PlatformViewsControllerTest {
             frameWorkTouch,
             false // usingVirtualDisplays
             );
-    assertEquals(resolvedEvent.getAction(), frameWorkTouch.action);
-    assertNotEquals(resolvedEvent.getAction(), original.getAction());
+    assertEquals(resolvedEvent.getAction(), original.getAction());
+    assertNotEquals(resolvedEvent.getAction(), frameWorkTouch.action);
   }
 
   @Ignore
@@ -531,7 +649,8 @@ public class PlatformViewsControllerTest {
   }
 
   @Test
-  @Config(shadows = {ShadowFlutterJNI.class, ShadowPlatformTaskQueue.class})
+  @Config(
+      shadows = {ShadowFlutterJNI.class, ShadowPlatformTaskQueue.class, ShadowPresentation.class})
   public void onDetachedFromJNI_clearsPlatformViewContext() {
     PlatformViewsController platformViewsController = new PlatformViewsController();
 
@@ -562,7 +681,8 @@ public class PlatformViewsControllerTest {
   }
 
   @Test
-  @Config(shadows = {ShadowFlutterJNI.class, ShadowPlatformTaskQueue.class})
+  @Config(
+      shadows = {ShadowFlutterJNI.class, ShadowPlatformTaskQueue.class, ShadowPresentation.class})
   public void onPreEngineRestart_clearsPlatformViewContext() {
     PlatformViewsController platformViewsController = new PlatformViewsController();
 
@@ -776,8 +896,7 @@ public class PlatformViewsControllerTest {
     PlatformViewFactory viewFactory = mock(PlatformViewFactory.class);
     PlatformView platformView = mock(PlatformView.class);
 
-    Context context = ApplicationProvider.getApplicationContext();
-    View androidView = new View(context);
+    View androidView = mock(View.class);
     when(platformView.getView()).thenReturn(androidView);
     when(viewFactory.create(any(), eq(platformViewId), any())).thenReturn(platformView);
     platformViewsController.getRegistry().registerViewFactory("testType", viewFactory);
@@ -1240,6 +1359,74 @@ public class PlatformViewsControllerTest {
     verify(newFlutterView, times(1)).addView(any(PlatformViewWrapper.class));
   }
 
+  @Config(
+      shadows = {
+        ShadowFlutterSurfaceView.class,
+        ShadowFlutterJNI.class,
+        ShadowPlatformTaskQueue.class
+      })
+  public void revertImageViewAndRemoveImageView() {
+    final PlatformViewsController platformViewsController = new PlatformViewsController();
+
+    final int platformViewId = 0;
+    assertNull(platformViewsController.getPlatformViewById(platformViewId));
+
+    final PlatformViewFactory viewFactory = mock(PlatformViewFactory.class);
+    final PlatformView platformView = mock(PlatformView.class);
+    final View androidView = mock(View.class);
+    when(platformView.getView()).thenReturn(androidView);
+    when(viewFactory.create(any(), eq(platformViewId), any())).thenReturn(platformView);
+
+    platformViewsController.getRegistry().registerViewFactory("testType", viewFactory);
+
+    final FlutterJNI jni = new FlutterJNI();
+    jni.attachToNative();
+
+    final FlutterView flutterView = attach(jni, platformViewsController);
+
+    jni.onFirstFrame();
+
+    // Simulate create call from the framework.
+    createPlatformView(jni, platformViewsController, platformViewId, "testType", /* hybrid=*/ true);
+
+    // The simulation creates an Overlay on top of the PlatformView
+    // This is going to be called `flutterView.convertToImageView`
+    platformViewsController.createOverlaySurface();
+    platformViewsController.onDisplayOverlaySurface(platformViewId, 0, 0, 10, 10);
+
+    // This will contain three views: Background ImageView、PlatformView、Overlay ImageView
+    assertEquals(flutterView.getChildCount(), 3);
+
+    FlutterImageView imageView = flutterView.getCurrentImageSurface();
+
+    // Make sure the ImageView is inside the current FlutterView.
+    assertTrue(imageView != null);
+    assertTrue(flutterView.indexOfChild(imageView) != -1);
+
+    // Make sure the overlayView is inside the current FlutterView
+    assertTrue(platformViewsController.getOverlayLayerViews().size() != 0);
+    PlatformOverlayView overlayView = platformViewsController.getOverlayLayerViews().get(0);
+    assertTrue(overlayView != null);
+    assertTrue(flutterView.indexOfChild(overlayView) != -1);
+
+    // Simulate in a new frame, there's no PlatformView, which is called
+    // `flutterView.revertImageView`. And register a `FlutterUiDisplayListener` callback.
+    // During callback execution it will invoke `flutterImageView.detachFromRenderer()`.
+    platformViewsController.onBeginFrame();
+    platformViewsController.onEndFrame();
+
+    // Invoke all registered `FlutterUiDisplayListener` callback
+    jni.onFirstFrame();
+
+    assertEquals(null, flutterView.getCurrentImageSurface());
+
+    // Make sure the background ImageVIew is not in the FlutterView
+    assertTrue(flutterView.indexOfChild(imageView) == -1);
+
+    // Make sure the overlay ImageVIew is not in the FlutterView
+    assertTrue(flutterView.indexOfChild(overlayView) == -1);
+  }
+
   private static ByteBuffer encodeMethodCall(MethodCall call) {
     final ByteBuffer buffer = StandardMethodCodec.INSTANCE.encodeMethodCall(call);
     buffer.rewind();
@@ -1339,7 +1526,7 @@ public class PlatformViewsControllerTest {
       FlutterJNI jni, PlatformViewsController platformViewsController) {
     final Context context = ApplicationProvider.getApplicationContext();
     final FlutterView flutterView =
-        new FlutterView(context, RenderMode.surface) {
+        new FlutterView(context, new FlutterSurfaceView(context)) {
           @Override
           public FlutterImageView createImageView() {
             final FlutterImageView view = mock(FlutterImageView.class);
@@ -1369,6 +1556,7 @@ public class PlatformViewsControllerTest {
           @Override
           public SurfaceTextureEntry registerSurfaceTexture(SurfaceTexture surfaceTexture) {
             return new SurfaceTextureEntry() {
+              @NonNull
               @Override
               public SurfaceTexture surfaceTexture() {
                 return mock(SurfaceTexture.class);
@@ -1383,6 +1571,55 @@ public class PlatformViewsControllerTest {
               public void release() {}
             };
           }
+
+          @Override
+          public ImageTextureEntry createImageTexture() {
+            return new ImageTextureEntry() {
+              @Override
+              public long id() {
+                return 0;
+              }
+
+              @Override
+              public void release() {}
+
+              @Override
+              public void pushImage(Image image) {}
+            };
+          }
+
+          @Override
+          public SurfaceProducer createSurfaceProducer() {
+            return new SurfaceProducer() {
+              @Override
+              public long id() {
+                return 0;
+              }
+
+              @Override
+              public void release() {}
+
+              @Override
+              public int getWidth() {
+                return 0;
+              }
+
+              @Override
+              public int getHeight() {
+                return 0;
+              }
+
+              @Override
+              public void setSize(int width, int height) {}
+
+              @Override
+              public Surface getSurface() {
+                return null;
+              }
+
+              public void scheduleFrame() {}
+            };
+          }
         };
 
     platformViewsController.attach(context, registry, executor);
@@ -1395,6 +1632,7 @@ public class PlatformViewsControllerTest {
     when(engine.getPlatformViewsController()).thenReturn(platformViewsController);
     when(engine.getLocalizationPlugin()).thenReturn(mock(LocalizationPlugin.class));
     when(engine.getAccessibilityChannel()).thenReturn(mock(AccessibilityChannel.class));
+    when(engine.getDartExecutor()).thenReturn(executor);
 
     flutterView.attachToFlutterEngine(engine);
     platformViewsController.attachToView(flutterView);
@@ -1414,6 +1652,34 @@ public class PlatformViewsControllerTest {
     }
   }
 
+  /**
+   * The shadow class of {@link Presentation} to simulate Presentation showing logic.
+   *
+   * <p>Robolectric doesn't support VirtualDisplay creating correctly now, so this shadow class is
+   * used to simulate custom logic for Presentation.
+   */
+  @Implements(Presentation.class)
+  public static class ShadowPresentation extends ShadowDialog {
+    private boolean isShowing = false;
+
+    public ShadowPresentation() {}
+
+    @Implementation
+    protected void show() {
+      isShowing = true;
+    }
+
+    @Implementation
+    protected void dismiss() {
+      isShowing = false;
+    }
+
+    @Implementation
+    protected boolean isShowing() {
+      return isShowing;
+    }
+  }
+
   @Implements(FlutterJNI.class)
   public static class ShadowFlutterJNI {
     private static SparseArray<ByteBuffer> replies = new SparseArray<>();
diff --git a/shell/platform/android/test/io/flutter/plugin/platform/SingleViewPresentationTest.java b/shell/platform/android/test/io/flutter/plugin/platform/SingleViewPresentationTest.java
index 2cc177fd86648895b630249f5e61beed53c11242..592a9f22bbeec4093e4a7df365921d978115690b 100644
--- a/shell/platform/android/test/io/flutter/plugin/platform/SingleViewPresentationTest.java
+++ b/shell/platform/android/test/io/flutter/plugin/platform/SingleViewPresentationTest.java
@@ -1,9 +1,11 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 package io.flutter.plugin.platform;
 
-import static android.os.Build.VERSION_CODES.JELLY_BEAN_MR1;
-import static android.os.Build.VERSION_CODES.P;
-import static android.os.Build.VERSION_CODES.R;
-import static junit.framework.Assert.assertEquals;
+import static io.flutter.Build.API_LEVELS;
+import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
@@ -13,18 +15,18 @@ import android.content.Context;
 import android.hardware.display.DisplayManager;
 import android.view.Display;
 import android.view.inputmethod.InputMethodManager;
+import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 @Config(manifest = Config.NONE)
 @RunWith(AndroidJUnit4.class)
-@TargetApi(P)
+@TargetApi(API_LEVELS.API_28)
 public class SingleViewPresentationTest {
   @Test
-  @Config(minSdk = JELLY_BEAN_MR1, maxSdk = R)
+  @Config(minSdk = API_LEVELS.API_21, maxSdk = API_LEVELS.API_30)
   public void returnsOuterContextInputMethodManager() {
     // There's a bug in Android Q caused by the IMM being instanced per display.
     // https://github.com/flutter/flutter/issues/38375. We need the context returned by
@@ -38,7 +40,7 @@ public class SingleViewPresentationTest {
     // system service instead of the spy's and fails.
 
     // Create an SVP under test with a Context that returns a local IMM mock.
-    Context context = spy(RuntimeEnvironment.application);
+    Context context = spy(ApplicationProvider.getApplicationContext());
     InputMethodManager expected = mock(InputMethodManager.class);
     when(context.getSystemService(Context.INPUT_METHOD_SERVICE)).thenReturn(expected);
     DisplayManager dm = (DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE);
@@ -55,12 +57,12 @@ public class SingleViewPresentationTest {
   }
 
   @Test
-  @Config(minSdk = JELLY_BEAN_MR1, maxSdk = R)
+  @Config(minSdk = API_LEVELS.API_21, maxSdk = API_LEVELS.API_30)
   public void returnsOuterContextInputMethodManager_createDisplayContext() {
     // The IMM should also persist across display contexts created from the base context.
 
     // Create an SVP under test with a Context that returns a local IMM mock.
-    Context context = spy(RuntimeEnvironment.application);
+    Context context = spy(ApplicationProvider.getApplicationContext());
     InputMethodManager expected = mock(InputMethodManager.class);
     when(context.getSystemService(Context.INPUT_METHOD_SERVICE)).thenReturn(expected);
     Display display =
diff --git a/shell/platform/android/test/io/flutter/plugin/platform/SurfaceTexturePlatformViewRenderTargetTest.java b/shell/platform/android/test/io/flutter/plugin/platform/SurfaceTexturePlatformViewRenderTargetTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..1921c935b7a8ce1b1a6be13526d723ff0f8dfb98
--- /dev/null
+++ b/shell/platform/android/test/io/flutter/plugin/platform/SurfaceTexturePlatformViewRenderTargetTest.java
@@ -0,0 +1,108 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.plugin.platform;
+
+import static io.flutter.Build.API_LEVELS;
+import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.SurfaceTexture;
+import android.view.Surface;
+import android.view.View;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import io.flutter.view.TextureRegistry.SurfaceTextureEntry;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@TargetApi(API_LEVELS.API_31)
+@RunWith(AndroidJUnit4.class)
+public class SurfaceTexturePlatformViewRenderTargetTest {
+  private final Context ctx = ApplicationProvider.getApplicationContext();
+
+  @Test
+  public void viewDraw_writesToBuffer() {
+    final Canvas canvas = mock(Canvas.class);
+    final Surface surface = mock(Surface.class);
+    when(surface.lockHardwareCanvas()).thenReturn(canvas);
+    when(surface.isValid()).thenReturn(true);
+    final SurfaceTexture surfaceTexture = mock(SurfaceTexture.class);
+    final SurfaceTextureEntry surfaceTextureEntry = mock(SurfaceTextureEntry.class);
+    when(surfaceTextureEntry.surfaceTexture()).thenReturn(surfaceTexture);
+    when(surfaceTexture.isReleased()).thenReturn(false);
+
+    final SurfaceTexturePlatformViewRenderTarget renderTarget =
+        new SurfaceTexturePlatformViewRenderTarget(surfaceTextureEntry) {
+          @Override
+          protected Surface createSurface() {
+            return surface;
+          }
+        };
+
+    // Custom view.
+    final View platformView =
+        new View(ctx) {
+          @Override
+          public void draw(Canvas canvas) {
+            super.draw(canvas);
+            canvas.drawColor(Color.RED);
+          }
+        };
+    final int size = 100;
+    platformView.measure(size, size);
+    platformView.layout(0, 0, size, size);
+
+    // Test.
+    final Surface s = renderTarget.getSurface();
+    final Canvas c = s.lockHardwareCanvas();
+    platformView.draw(c);
+    s.unlockCanvasAndPost(c);
+
+    // Verify.
+    verify(canvas, times(1)).drawColor(Color.RED);
+    verify(surface, times(1)).lockHardwareCanvas();
+    verify(surface, times(1)).unlockCanvasAndPost(canvas);
+    verifyNoMoreInteractions(surface);
+  }
+
+  @Test
+  public void release() {
+    final Canvas canvas = mock(Canvas.class);
+    final Surface surface = mock(Surface.class);
+    when(surface.lockHardwareCanvas()).thenReturn(canvas);
+    when(surface.isValid()).thenReturn(true);
+    final SurfaceTexture surfaceTexture = mock(SurfaceTexture.class);
+    final SurfaceTextureEntry surfaceTextureEntry = mock(SurfaceTextureEntry.class);
+    when(surfaceTextureEntry.surfaceTexture()).thenReturn(surfaceTexture);
+    when(surfaceTexture.isReleased()).thenReturn(false);
+    final SurfaceTexturePlatformViewRenderTarget renderTarget =
+        new SurfaceTexturePlatformViewRenderTarget(surfaceTextureEntry) {
+          @Override
+          protected Surface createSurface() {
+            return surface;
+          }
+        };
+
+    final Surface s = renderTarget.getSurface();
+    final Canvas c = s.lockHardwareCanvas();
+    s.unlockCanvasAndPost(c);
+
+    reset(surface);
+    reset(surfaceTexture);
+
+    // Test.
+    renderTarget.release();
+
+    // Verify.
+    verify(surface, times(1)).release();
+    verifyNoMoreInteractions(surface);
+    verifyNoMoreInteractions(surfaceTexture);
+  }
+}
diff --git a/shell/platform/android/test/io/flutter/plugin/platform/WindowManagerHandlerTest.java b/shell/platform/android/test/io/flutter/plugin/platform/WindowManagerHandlerTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..7e37231774ca92bb0abbcbafa870daa8e62fafd4
--- /dev/null
+++ b/shell/platform/android/test/io/flutter/plugin/platform/WindowManagerHandlerTest.java
@@ -0,0 +1,133 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.plugin.platform;
+
+import static io.flutter.Build.API_LEVELS;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+
+import android.annotation.TargetApi;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import java.util.concurrent.Executor;
+import java.util.function.Consumer;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+@Config(manifest = Config.NONE)
+@RunWith(AndroidJUnit4.class)
+@TargetApi(API_LEVELS.API_28)
+public class WindowManagerHandlerTest {
+  @Test
+  @Config(minSdk = API_LEVELS.API_30)
+  public void windowManagerHandler_passesCorrectlyToFakeWindowViewGroup() {
+    // Mock the WindowManager and FakeWindowViewGroup that get used by the WindowManagerHandler.
+    WindowManager mockWindowManager = mock(WindowManager.class);
+    SingleViewFakeWindowViewGroup mockSingleViewFakeWindowViewGroup =
+        mock(SingleViewFakeWindowViewGroup.class);
+
+    View mockView = mock(View.class);
+    ViewGroup.LayoutParams mockLayoutParams = mock(ViewGroup.LayoutParams.class);
+
+    WindowManagerHandler windowManagerHandler =
+        new WindowManagerHandler(mockWindowManager, mockSingleViewFakeWindowViewGroup);
+
+    // removeViewImmediate
+    windowManagerHandler.removeViewImmediate(mockView);
+    verify(mockView).clearAnimation();
+    verify(mockSingleViewFakeWindowViewGroup).removeView(mockView);
+    verifyNoInteractions(mockWindowManager);
+
+    // addView
+    windowManagerHandler.addView(mockView, mockLayoutParams);
+    verify(mockSingleViewFakeWindowViewGroup).addView(mockView, mockLayoutParams);
+    verifyNoInteractions(mockWindowManager);
+
+    // updateViewLayout
+    windowManagerHandler.updateViewLayout(mockView, mockLayoutParams);
+    verify(mockSingleViewFakeWindowViewGroup).updateViewLayout(mockView, mockLayoutParams);
+    verifyNoInteractions(mockWindowManager);
+
+    // removeView
+    windowManagerHandler.updateViewLayout(mockView, mockLayoutParams);
+    verify(mockSingleViewFakeWindowViewGroup).removeView(mockView);
+    verifyNoInteractions(mockWindowManager);
+  }
+
+  @Test
+  @Config(minSdk = API_LEVELS.API_30)
+  public void windowManagerHandler_logAndReturnEarly_whenFakeWindowViewGroupIsNull() {
+    // Mock the WindowManager and FakeWindowViewGroup that get used by the WindowManagerHandler.
+    WindowManager mockWindowManager = mock(WindowManager.class);
+
+    View mockView = mock(View.class);
+    ViewGroup.LayoutParams mockLayoutParams = mock(ViewGroup.LayoutParams.class);
+
+    WindowManagerHandler windowManagerHandler = new WindowManagerHandler(mockWindowManager, null);
+
+    // removeViewImmediate
+    windowManagerHandler.removeViewImmediate(mockView);
+    verifyNoInteractions(mockView);
+    verifyNoInteractions(mockWindowManager);
+
+    // addView
+    windowManagerHandler.addView(mockView, mockLayoutParams);
+    verifyNoInteractions(mockWindowManager);
+
+    // updateViewLayout
+    windowManagerHandler.updateViewLayout(mockView, mockLayoutParams);
+    verifyNoInteractions(mockWindowManager);
+
+    // removeView
+    windowManagerHandler.updateViewLayout(mockView, mockLayoutParams);
+    verifyNoInteractions(mockWindowManager);
+  }
+
+  // This section tests that WindowManagerHandler forwards all of the non-special case calls to the
+  // delegate WindowManager. Because this must include some deprecated WindowManager method calls
+  // (because the proxy overrides every method), we suppress deprecation warnings here.
+  @Test
+  @Config(minSdk = API_LEVELS.API_31)
+  @SuppressWarnings("deprecation")
+  public void windowManagerHandler_forwardsAllOtherCallsToDelegate() {
+    // Mock the WindowManager and FakeWindowViewGroup that get used by the WindowManagerHandler.
+    WindowManager mockWindowManager = mock(WindowManager.class);
+    SingleViewFakeWindowViewGroup mockSingleViewFakeWindowViewGroup =
+        mock(SingleViewFakeWindowViewGroup.class);
+
+    WindowManagerHandler windowManagerHandler =
+        new WindowManagerHandler(mockWindowManager, mockSingleViewFakeWindowViewGroup);
+
+    // Verify that all other calls get forwarded to the delegate.
+    Executor mockExecutor = mock(Executor.class);
+    @SuppressWarnings("Unchecked cast")
+    Consumer<Boolean> mockListener = (Consumer<Boolean>) mock(Consumer.class);
+
+    windowManagerHandler.getDefaultDisplay();
+    verify(mockWindowManager).getDefaultDisplay();
+
+    windowManagerHandler.getCurrentWindowMetrics();
+    verify(mockWindowManager).getCurrentWindowMetrics();
+
+    windowManagerHandler.getMaximumWindowMetrics();
+    verify(mockWindowManager).getMaximumWindowMetrics();
+
+    windowManagerHandler.isCrossWindowBlurEnabled();
+    verify(mockWindowManager).isCrossWindowBlurEnabled();
+
+    windowManagerHandler.addCrossWindowBlurEnabledListener(mockListener);
+    verify(mockWindowManager).addCrossWindowBlurEnabledListener(mockListener);
+
+    windowManagerHandler.addCrossWindowBlurEnabledListener(mockExecutor, mockListener);
+    verify(mockWindowManager).addCrossWindowBlurEnabledListener(mockExecutor, mockListener);
+
+    windowManagerHandler.removeCrossWindowBlurEnabledListener(mockListener);
+    verify(mockWindowManager).removeCrossWindowBlurEnabledListener(mockListener);
+  }
+}
diff --git a/shell/platform/android/test/io/flutter/plugin/text/ProcessTextPluginTest.java b/shell/platform/android/test/io/flutter/plugin/text/ProcessTextPluginTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..8891e72cdbfcfc2d91fb8aff25de6ad9fbfe832c
--- /dev/null
+++ b/shell/platform/android/test/io/flutter/plugin/text/ProcessTextPluginTest.java
@@ -0,0 +1,280 @@
+package io.flutter.plugin.text;
+
+import static io.flutter.Build.API_LEVELS;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.annotation.TargetApi;
+import android.app.Activity;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageItemInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import androidx.annotation.RequiresApi;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import io.flutter.embedding.engine.dart.DartExecutor;
+import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
+import io.flutter.embedding.engine.systemchannels.ProcessTextChannel;
+import io.flutter.plugin.common.BinaryMessenger;
+import io.flutter.plugin.common.MethodCall;
+import io.flutter.plugin.common.MethodChannel;
+import io.flutter.plugin.common.StandardMethodCodec;
+import java.lang.reflect.Field;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+
+@RunWith(AndroidJUnit4.class)
+@TargetApi(API_LEVELS.API_24)
+@RequiresApi(API_LEVELS.API_24)
+public class ProcessTextPluginTest {
+
+  private static void sendToBinaryMessageHandler(
+      BinaryMessenger.BinaryMessageHandler binaryMessageHandler, String method, Object args) {
+    MethodCall methodCall = new MethodCall(method, args);
+    ByteBuffer encodedMethodCall = StandardMethodCodec.INSTANCE.encodeMethodCall(methodCall);
+    binaryMessageHandler.onMessage(
+        (ByteBuffer) encodedMethodCall.flip(), mock(BinaryMessenger.BinaryReply.class));
+  }
+
+  @SuppressWarnings("deprecation")
+  // setMessageHandler is deprecated.
+  @Test
+  public void respondsToProcessTextChannelMessage() {
+    ArgumentCaptor<BinaryMessenger.BinaryMessageHandler> binaryMessageHandlerCaptor =
+        ArgumentCaptor.forClass(BinaryMessenger.BinaryMessageHandler.class);
+    DartExecutor mockBinaryMessenger = mock(DartExecutor.class);
+    ProcessTextChannel.ProcessTextMethodHandler mockHandler =
+        mock(ProcessTextChannel.ProcessTextMethodHandler.class);
+    PackageManager mockPackageManager = mock(PackageManager.class);
+    ProcessTextChannel processTextChannel =
+        new ProcessTextChannel(mockBinaryMessenger, mockPackageManager);
+
+    processTextChannel.setMethodHandler(mockHandler);
+
+    verify(mockBinaryMessenger, times(1))
+        .setMessageHandler(any(String.class), binaryMessageHandlerCaptor.capture());
+
+    BinaryMessenger.BinaryMessageHandler binaryMessageHandler =
+        binaryMessageHandlerCaptor.getValue();
+
+    sendToBinaryMessageHandler(binaryMessageHandler, "ProcessText.queryTextActions", null);
+
+    verify(mockHandler).queryTextActions();
+  }
+
+  @SuppressWarnings("deprecation")
+  // setMessageHandler is deprecated.
+  @Test
+  public void performQueryTextActions() {
+    DartExecutor mockBinaryMessenger = mock(DartExecutor.class);
+    PackageManager mockPackageManager = mock(PackageManager.class);
+    ProcessTextChannel processTextChannel =
+        new ProcessTextChannel(mockBinaryMessenger, mockPackageManager);
+
+    // Set up mocked result for PackageManager.queryIntentActivities.
+    ResolveInfo action1 = createFakeResolveInfo("Action1", mockPackageManager);
+    ResolveInfo action2 = createFakeResolveInfo("Action2", mockPackageManager);
+    List<ResolveInfo> infos = new ArrayList<ResolveInfo>(Arrays.asList(action1, action2));
+    Intent intent = new Intent().setAction(Intent.ACTION_PROCESS_TEXT).setType("text/plain");
+    when(mockPackageManager.queryIntentActivities(
+            any(Intent.class), any(PackageManager.ResolveInfoFlags.class)))
+        .thenReturn(infos);
+
+    // ProcessTextPlugin should retrieve the mocked text actions.
+    ProcessTextPlugin processTextPlugin = new ProcessTextPlugin(processTextChannel);
+    Map<String, String> textActions = processTextPlugin.queryTextActions();
+    final String action1Id = "mockActivityName.Action1";
+    final String action2Id = "mockActivityName.Action2";
+    assertEquals(textActions, Map.of(action1Id, "Action1", action2Id, "Action2"));
+  }
+
+  @SuppressWarnings("deprecation")
+  // setMessageHandler is deprecated.
+  @Test
+  public void performProcessTextActionWithNoReturnedValue() {
+    DartExecutor mockBinaryMessenger = mock(DartExecutor.class);
+    PackageManager mockPackageManager = mock(PackageManager.class);
+    ProcessTextChannel processTextChannel =
+        new ProcessTextChannel(mockBinaryMessenger, mockPackageManager);
+
+    // Set up mocked result for PackageManager.queryIntentActivities.
+    ResolveInfo action1 = createFakeResolveInfo("Action1", mockPackageManager);
+    ResolveInfo action2 = createFakeResolveInfo("Action2", mockPackageManager);
+    List<ResolveInfo> infos = new ArrayList<ResolveInfo>(Arrays.asList(action1, action2));
+    when(mockPackageManager.queryIntentActivities(
+            any(Intent.class), any(PackageManager.ResolveInfoFlags.class)))
+        .thenReturn(infos);
+
+    // ProcessTextPlugin should retrieve the mocked text actions.
+    ProcessTextPlugin processTextPlugin = new ProcessTextPlugin(processTextChannel);
+    Map<String, String> textActions = processTextPlugin.queryTextActions();
+    final String action1Id = "mockActivityName.Action1";
+    final String action2Id = "mockActivityName.Action2";
+    assertEquals(textActions, Map.of(action1Id, "Action1", action2Id, "Action2"));
+
+    // Set up the activity binding.
+    ActivityPluginBinding mockActivityPluginBinding = mock(ActivityPluginBinding.class);
+    Activity mockActivity = mock(Activity.class);
+    when(mockActivityPluginBinding.getActivity()).thenReturn(mockActivity);
+    processTextPlugin.onAttachedToActivity(mockActivityPluginBinding);
+
+    // Execute th first action.
+    String textToBeProcessed = "Flutter!";
+    MethodChannel.Result result = mock(MethodChannel.Result.class);
+    processTextPlugin.processTextAction(action1Id, textToBeProcessed, false, result);
+
+    // Activity.startActivityForResult should have been called.
+    ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
+    verify(mockActivity, times(1)).startActivityForResult(intentCaptor.capture(), anyInt());
+    Intent intent = intentCaptor.getValue();
+    assertEquals(intent.getStringExtra(Intent.EXTRA_PROCESS_TEXT), textToBeProcessed);
+
+    // Simulate an Android activity answer which does not return a value.
+    Intent resultIntent = new Intent();
+    processTextPlugin.onActivityResult(result.hashCode(), Activity.RESULT_OK, resultIntent);
+
+    // Success with no returned value is expected.
+    verify(result).success(null);
+  }
+
+  @SuppressWarnings("deprecation")
+  // setMessageHandler is deprecated.
+  @Test
+  public void performProcessTextActionWithReturnedValue() {
+    DartExecutor mockBinaryMessenger = mock(DartExecutor.class);
+    PackageManager mockPackageManager = mock(PackageManager.class);
+    ProcessTextChannel processTextChannel =
+        new ProcessTextChannel(mockBinaryMessenger, mockPackageManager);
+
+    // Set up mocked result for PackageManager.queryIntentActivities.
+    ResolveInfo action1 = createFakeResolveInfo("Action1", mockPackageManager);
+    ResolveInfo action2 = createFakeResolveInfo("Action2", mockPackageManager);
+    List<ResolveInfo> infos = new ArrayList<ResolveInfo>(Arrays.asList(action1, action2));
+    when(mockPackageManager.queryIntentActivities(
+            any(Intent.class), any(PackageManager.ResolveInfoFlags.class)))
+        .thenReturn(infos);
+
+    // ProcessTextPlugin should retrieve the mocked text actions.
+    ProcessTextPlugin processTextPlugin = new ProcessTextPlugin(processTextChannel);
+    Map<String, String> textActions = processTextPlugin.queryTextActions();
+    final String action1Id = "mockActivityName.Action1";
+    final String action2Id = "mockActivityName.Action2";
+    assertEquals(textActions, Map.of(action1Id, "Action1", action2Id, "Action2"));
+
+    // Set up the activity binding.
+    ActivityPluginBinding mockActivityPluginBinding = mock(ActivityPluginBinding.class);
+    Activity mockActivity = mock(Activity.class);
+    when(mockActivityPluginBinding.getActivity()).thenReturn(mockActivity);
+    processTextPlugin.onAttachedToActivity(mockActivityPluginBinding);
+
+    // Execute the first action.
+    String textToBeProcessed = "Flutter!";
+    MethodChannel.Result result = mock(MethodChannel.Result.class);
+    processTextPlugin.processTextAction(action1Id, textToBeProcessed, false, result);
+
+    // Activity.startActivityForResult should have been called.
+    ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
+    verify(mockActivity, times(1)).startActivityForResult(intentCaptor.capture(), anyInt());
+    Intent intent = intentCaptor.getValue();
+    assertEquals(intent.getStringExtra(Intent.EXTRA_PROCESS_TEXT), textToBeProcessed);
+
+    // Simulate an Android activity answer which returns a transformed text.
+    String processedText = "Flutter!!!";
+    Intent resultIntent = new Intent();
+    resultIntent.putExtra(Intent.EXTRA_PROCESS_TEXT, processedText);
+    processTextPlugin.onActivityResult(result.hashCode(), Activity.RESULT_OK, resultIntent);
+
+    // Success with the transformed text is expected.
+    verify(result).success(processedText);
+  }
+
+  @SuppressWarnings("deprecation")
+  // setMessageHandler is deprecated.
+  @Test
+  public void doNotCrashOnNonRelatedActivityResult() {
+    DartExecutor mockBinaryMessenger = mock(DartExecutor.class);
+    PackageManager mockPackageManager = mock(PackageManager.class);
+    ProcessTextChannel processTextChannel =
+        new ProcessTextChannel(mockBinaryMessenger, mockPackageManager);
+
+    // Set up mocked result for PackageManager.queryIntentActivities.
+    ResolveInfo action1 = createFakeResolveInfo("Action1", mockPackageManager);
+    ResolveInfo action2 = createFakeResolveInfo("Action2", mockPackageManager);
+    List<ResolveInfo> infos = new ArrayList<ResolveInfo>(Arrays.asList(action1, action2));
+    when(mockPackageManager.queryIntentActivities(
+            any(Intent.class), any(PackageManager.ResolveInfoFlags.class)))
+        .thenReturn(infos);
+
+    // ProcessTextPlugin should retrieve the mocked text actions.
+    ProcessTextPlugin processTextPlugin = new ProcessTextPlugin(processTextChannel);
+    Map<String, String> textActions = processTextPlugin.queryTextActions();
+    final String action1Id = "mockActivityName.Action1";
+    final String action2Id = "mockActivityName.Action2";
+    assertEquals(textActions, Map.of(action1Id, "Action1", action2Id, "Action2"));
+
+    // Set up the activity binding.
+    ActivityPluginBinding mockActivityPluginBinding = mock(ActivityPluginBinding.class);
+    Activity mockActivity = mock(Activity.class);
+    when(mockActivityPluginBinding.getActivity()).thenReturn(mockActivity);
+    processTextPlugin.onAttachedToActivity(mockActivityPluginBinding);
+
+    // Execute the first action.
+    String textToBeProcessed = "Flutter!";
+    MethodChannel.Result result = mock(MethodChannel.Result.class);
+    processTextPlugin.processTextAction(action1Id, textToBeProcessed, false, result);
+
+    // Activity.startActivityForResult should have been called.
+    ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
+    verify(mockActivity, times(1)).startActivityForResult(intentCaptor.capture(), anyInt());
+    Intent intent = intentCaptor.getValue();
+    assertEquals(intent.getStringExtra(Intent.EXTRA_PROCESS_TEXT), textToBeProcessed);
+
+    // Result to a request not sent by this plugin should be ignored.
+    final int externalRequestCode = 42;
+    processTextPlugin.onActivityResult(externalRequestCode, Activity.RESULT_OK, new Intent());
+
+    // Simulate an Android activity answer which returns a transformed text.
+    String processedText = "Flutter!!!";
+    Intent resultIntent = new Intent();
+    resultIntent.putExtra(Intent.EXTRA_PROCESS_TEXT, processedText);
+    processTextPlugin.onActivityResult(result.hashCode(), Activity.RESULT_OK, resultIntent);
+
+    // Success with the transformed text is expected.
+    verify(result).success(processedText);
+  }
+
+  private ResolveInfo createFakeResolveInfo(String label, PackageManager mockPackageManager) {
+    ResolveInfo resolveInfo = mock(ResolveInfo.class);
+    ActivityInfo activityInfo = new ActivityInfo();
+    when(resolveInfo.loadLabel(mockPackageManager)).thenReturn(label);
+
+    // Use Java reflection to set required member variables.
+    try {
+      Field activityField = ResolveInfo.class.getDeclaredField("activityInfo");
+      activityField.setAccessible(true);
+      activityField.set(resolveInfo, activityInfo);
+      Field packageNameField = PackageItemInfo.class.getDeclaredField("packageName");
+      packageNameField.setAccessible(true);
+      packageNameField.set(activityInfo, "mockActivityPackageName");
+      Field nameField = PackageItemInfo.class.getDeclaredField("name");
+      nameField.setAccessible(true);
+      nameField.set(activityInfo, "mockActivityName." + label);
+    } catch (Exception ex) {
+      // Test will failed if reflection APIs throw.
+    }
+
+    return resolveInfo;
+  }
+}
diff --git a/shell/platform/android/test/io/flutter/util/HandlerCompatTest.java b/shell/platform/android/test/io/flutter/util/HandlerCompatTest.java
index df1352aee666fe7ba07206f61925fb5698dbfac9..9d4538d40565d98e17726fa8dac03b99e798cd88 100644
--- a/shell/platform/android/test/io/flutter/util/HandlerCompatTest.java
+++ b/shell/platform/android/test/io/flutter/util/HandlerCompatTest.java
@@ -4,6 +4,7 @@
 
 package io.flutter.util;
 
+import static io.flutter.Build.API_LEVELS;
 import static org.junit.Assert.assertTrue;
 
 import android.os.Handler;
@@ -17,7 +18,7 @@ import org.robolectric.annotation.Config;
 @RunWith(RobolectricTestRunner.class)
 public class HandlerCompatTest {
   @Test
-  @Config(sdk = 28)
+  @Config(sdk = API_LEVELS.API_28)
   public void createAsync_createsAnAsyncHandler() {
     Handler handler = Handler.createAsync(Looper.getMainLooper());
 
diff --git a/shell/platform/android/test/io/flutter/util/PathUtilsTest.java b/shell/platform/android/test/io/flutter/util/PathUtilsTest.java
index 47288f973a9c6424f3002e9a423eb04f14ab4660..08e5a1aaac990f06b62954c1327ce05d1acdc8cb 100644
--- a/shell/platform/android/test/io/flutter/util/PathUtilsTest.java
+++ b/shell/platform/android/test/io/flutter/util/PathUtilsTest.java
@@ -4,6 +4,7 @@
 
 package io.flutter.util;
 
+import static io.flutter.Build.API_LEVELS;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
@@ -34,7 +35,7 @@ public class PathUtilsTest {
   public void canOnlyGetFilesPathWhenDiskFullAndFilesDirNotCreated() {
     Context context = mock(Context.class);
     when(context.getFilesDir()).thenReturn(null);
-    if (Build.VERSION.SDK_INT >= 24) {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_24) {
       when(context.getDataDir()).thenReturn(new File(APP_DATA_PATH));
     } else {
       when(context.getApplicationInfo().dataDir).thenReturn(APP_DATA_PATH);
@@ -54,7 +55,7 @@ public class PathUtilsTest {
   public void canOnlyGetFlutterDataPathWhenDiskFullAndFlutterDataDirNotCreated() {
     Context context = mock(Context.class);
     when(context.getDir("flutter", Context.MODE_PRIVATE)).thenReturn(null);
-    if (Build.VERSION.SDK_INT >= 24) {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_24) {
       when(context.getDataDir()).thenReturn(new File(APP_DATA_PATH));
     } else {
       when(context.getApplicationInfo().dataDir).thenReturn(APP_DATA_PATH);
@@ -66,7 +67,7 @@ public class PathUtilsTest {
   public void canGetCacheDir() {
     Context context = mock(Context.class);
     when(context.getCacheDir()).thenReturn(new File(APP_DATA_PATH + "/cache"));
-    if (Build.VERSION.SDK_INT >= 21) {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_21) {
       when(context.getCodeCacheDir()).thenReturn(new File(APP_DATA_PATH + "/code_cache"));
     }
     assertTrue(PathUtils.getCacheDirectory(context).startsWith(APP_DATA_PATH));
@@ -76,10 +77,10 @@ public class PathUtilsTest {
   public void canOnlyGetCachePathWhenDiskFullAndCacheDirNotCreated() {
     Context context = mock(Context.class);
     when(context.getCacheDir()).thenReturn(null);
-    if (Build.VERSION.SDK_INT >= 21) {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_21) {
       when(context.getCodeCacheDir()).thenReturn(null);
     }
-    if (Build.VERSION.SDK_INT >= 24) {
+    if (Build.VERSION.SDK_INT >= API_LEVELS.API_24) {
       when(context.getDataDir()).thenReturn(new File(APP_DATA_PATH));
     } else {
       when(context.getApplicationInfo().dataDir).thenReturn(APP_DATA_PATH);
diff --git a/shell/platform/android/test/io/flutter/view/AccessibilityBridgeTest.java b/shell/platform/android/test/io/flutter/view/AccessibilityBridgeTest.java
index 105d8a7a984b63b228fd9ec97811719b4475fcd3..389c329f96c45aa78e39ae3bebe8e9d3991fa6e2 100644
--- a/shell/platform/android/test/io/flutter/view/AccessibilityBridgeTest.java
+++ b/shell/platform/android/test/io/flutter/view/AccessibilityBridgeTest.java
@@ -4,6 +4,7 @@
 
 package io.flutter.view;
 
+import static io.flutter.Build.API_LEVELS;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
@@ -44,12 +45,17 @@ import android.view.accessibility.AccessibilityManager;
 import android.view.accessibility.AccessibilityNodeInfo;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+import io.flutter.embedding.engine.FlutterJNI;
+import io.flutter.embedding.engine.dart.DartExecutor;
 import io.flutter.embedding.engine.systemchannels.AccessibilityChannel;
+import io.flutter.plugin.common.BasicMessageChannel;
 import io.flutter.plugin.platform.PlatformViewsAccessibilityDelegate;
+import io.flutter.view.AccessibilityBridge.Action;
 import io.flutter.view.AccessibilityBridge.Flag;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -59,7 +65,6 @@ import org.robolectric.annotation.Config;
 
 @Config(manifest = Config.NONE)
 @RunWith(AndroidJUnit4.class)
-@TargetApi(19)
 public class AccessibilityBridgeTest {
 
   @Test
@@ -76,7 +81,8 @@ public class AccessibilityBridgeTest {
     assertEquals(nodeInfo.getText(), null);
   }
 
-  @TargetApi(26)
+  @Config(sdk = API_LEVELS.API_28)
+  @TargetApi(API_LEVELS.API_28)
   @Test
   public void itDescribesTextFieldsWithTextAndHint() {
     AccessibilityBridge accessibilityBridge = setUpBridge();
@@ -317,7 +323,141 @@ public class AccessibilityBridgeTest {
     verify(mockNodeInfo2, times(1)).setTraversalAfter(eq(mockRootView), eq(1));
   }
 
-  @TargetApi(28)
+  @Config(sdk = API_LEVELS.API_24)
+  @TargetApi(API_LEVELS.API_24)
+  @Test
+  public void itSetsRootViewNotImportantForAccessibility() {
+    AccessibilityViewEmbedder mockViewEmbedder = mock(AccessibilityViewEmbedder.class);
+    AccessibilityManager mockManager = mock(AccessibilityManager.class);
+    View mockRootView = mock(View.class);
+    Context context = mock(Context.class);
+    when(mockRootView.getContext()).thenReturn(context);
+    when(context.getPackageName()).thenReturn("test");
+    AccessibilityBridge accessibilityBridge =
+        setUpBridge(mockRootView, mockManager, mockViewEmbedder);
+    ViewParent mockParent = mock(ViewParent.class);
+    when(mockRootView.getParent()).thenReturn(mockParent);
+    when(mockManager.isEnabled()).thenReturn(true);
+
+    TestSemanticsNode root = new TestSemanticsNode();
+    root.id = 0;
+    TestSemanticsUpdate testSemanticsUpdate = root.toUpdate();
+    testSemanticsUpdate.sendUpdateToBridge(accessibilityBridge);
+
+    AccessibilityBridge spyAccessibilityBridge = spy(accessibilityBridge);
+    AccessibilityNodeInfo mockNodeInfo = mock(AccessibilityNodeInfo.class);
+
+    when(spyAccessibilityBridge.obtainAccessibilityNodeInfo(mockRootView)).thenReturn(mockNodeInfo);
+    spyAccessibilityBridge.createAccessibilityNodeInfo(View.NO_ID);
+    verify(mockNodeInfo, times(1)).setImportantForAccessibility(eq(false));
+  }
+
+  @Config(sdk = API_LEVELS.API_24)
+  @TargetApi(API_LEVELS.API_24)
+  @Test
+  public void itSetsNodeImportantForAccessibilityIfItHasContent() {
+    AccessibilityViewEmbedder mockViewEmbedder = mock(AccessibilityViewEmbedder.class);
+    AccessibilityManager mockManager = mock(AccessibilityManager.class);
+    View mockRootView = mock(View.class);
+    Context context = mock(Context.class);
+    when(mockRootView.getContext()).thenReturn(context);
+    when(context.getPackageName()).thenReturn("test");
+    AccessibilityBridge accessibilityBridge =
+        setUpBridge(mockRootView, mockManager, mockViewEmbedder);
+    ViewParent mockParent = mock(ViewParent.class);
+    when(mockRootView.getParent()).thenReturn(mockParent);
+    when(mockManager.isEnabled()).thenReturn(true);
+
+    TestSemanticsNode root = new TestSemanticsNode();
+    root.id = 0;
+    root.label = "some label";
+    TestSemanticsUpdate testSemanticsUpdate = root.toUpdate();
+    testSemanticsUpdate.sendUpdateToBridge(accessibilityBridge);
+
+    AccessibilityBridge spyAccessibilityBridge = spy(accessibilityBridge);
+    AccessibilityNodeInfo mockNodeInfo = mock(AccessibilityNodeInfo.class);
+
+    when(spyAccessibilityBridge.obtainAccessibilityNodeInfo(mockRootView, 0))
+        .thenReturn(mockNodeInfo);
+    spyAccessibilityBridge.createAccessibilityNodeInfo(0);
+    verify(mockNodeInfo, times(1)).setImportantForAccessibility(eq(true));
+  }
+
+  @Config(sdk = API_LEVELS.API_24)
+  @TargetApi(API_LEVELS.API_24)
+  @Test
+  public void itSetsNodeImportantForAccessibilityIfItHasActions() {
+    AccessibilityViewEmbedder mockViewEmbedder = mock(AccessibilityViewEmbedder.class);
+    AccessibilityManager mockManager = mock(AccessibilityManager.class);
+    View mockRootView = mock(View.class);
+    Context context = mock(Context.class);
+    when(mockRootView.getContext()).thenReturn(context);
+    when(context.getPackageName()).thenReturn("test");
+    AccessibilityBridge accessibilityBridge =
+        setUpBridge(mockRootView, mockManager, mockViewEmbedder);
+    ViewParent mockParent = mock(ViewParent.class);
+    when(mockRootView.getParent()).thenReturn(mockParent);
+    when(mockManager.isEnabled()).thenReturn(true);
+
+    TestSemanticsNode root = new TestSemanticsNode();
+    root.id = 0;
+    root.addAction(Action.TAP);
+    TestSemanticsUpdate testSemanticsUpdate = root.toUpdate();
+    testSemanticsUpdate.sendUpdateToBridge(accessibilityBridge);
+
+    AccessibilityBridge spyAccessibilityBridge = spy(accessibilityBridge);
+    AccessibilityNodeInfo mockNodeInfo = mock(AccessibilityNodeInfo.class);
+
+    when(spyAccessibilityBridge.obtainAccessibilityNodeInfo(mockRootView, 0))
+        .thenReturn(mockNodeInfo);
+    spyAccessibilityBridge.createAccessibilityNodeInfo(0);
+    verify(mockNodeInfo, times(1)).setImportantForAccessibility(eq(true));
+  }
+
+  @Config(sdk = API_LEVELS.API_24)
+  @TargetApi(API_LEVELS.API_24)
+  @Test
+  public void itSetsNodeUnImportantForAccessibilityIfItIsEmpty() {
+    AccessibilityViewEmbedder mockViewEmbedder = mock(AccessibilityViewEmbedder.class);
+    AccessibilityManager mockManager = mock(AccessibilityManager.class);
+    View mockRootView = mock(View.class);
+    Context context = mock(Context.class);
+    when(mockRootView.getContext()).thenReturn(context);
+    when(context.getPackageName()).thenReturn("test");
+    AccessibilityBridge accessibilityBridge =
+        setUpBridge(mockRootView, mockManager, mockViewEmbedder);
+    ViewParent mockParent = mock(ViewParent.class);
+    when(mockRootView.getParent()).thenReturn(mockParent);
+    when(mockManager.isEnabled()).thenReturn(true);
+
+    TestSemanticsNode root = new TestSemanticsNode();
+    root.id = 0;
+    TestSemanticsNode node = new TestSemanticsNode();
+    node.id = 1;
+    root.children.add(node);
+    TestSemanticsUpdate testSemanticsUpdate = root.toUpdate();
+    testSemanticsUpdate.sendUpdateToBridge(accessibilityBridge);
+
+    AccessibilityBridge spyAccessibilityBridge = spy(accessibilityBridge);
+    AccessibilityNodeInfo mockNodeInfo = mock(AccessibilityNodeInfo.class);
+
+    when(spyAccessibilityBridge.obtainAccessibilityNodeInfo(mockRootView, 0))
+        .thenReturn(mockNodeInfo);
+    spyAccessibilityBridge.createAccessibilityNodeInfo(0);
+    verify(mockNodeInfo, times(1)).setImportantForAccessibility(eq(false));
+
+    AccessibilityNodeInfo mockNodeInfo1 = mock(AccessibilityNodeInfo.class);
+
+    when(spyAccessibilityBridge.obtainAccessibilityNodeInfo(mockRootView, 1))
+        .thenReturn(mockNodeInfo1);
+    spyAccessibilityBridge.createAccessibilityNodeInfo(1);
+    verify(mockNodeInfo1, times(1)).setImportantForAccessibility(eq(false));
+  }
+
+  @SuppressWarnings("deprecation")
+  // getSystemWindowInset* methods deprecated.
+  @Config(sdk = API_LEVELS.API_28)
+  @TargetApi(API_LEVELS.API_28)
   @Test
   public void itSetCutoutInsetBasedonLayoutModeNever() {
     int expectedInsetLeft = 5;
@@ -366,7 +506,10 @@ public class AccessibilityBridgeTest {
             new Rect(left + expectedInsetLeft, top, right + expectedInsetLeft, bottom));
   }
 
-  @TargetApi(28)
+  @SuppressWarnings("deprecation")
+  // getSystemWindowInset* methods deprecated.
+  @Config(sdk = API_LEVELS.API_28)
+  @TargetApi(API_LEVELS.API_28)
   @Test
   public void itSetCutoutInsetBasedonLayoutModeDefault() {
     int expectedInsetLeft = 5;
@@ -415,7 +558,10 @@ public class AccessibilityBridgeTest {
             new Rect(left + expectedInsetLeft, top, right + expectedInsetLeft, bottom));
   }
 
-  @TargetApi(28)
+  @SuppressWarnings("deprecation")
+  // getSystemWindowInset* methods deprecated.
+  @Config(sdk = API_LEVELS.API_28)
+  @TargetApi(API_LEVELS.API_28)
   @Test
   public void itSetCutoutInsetBasedonLayoutModeShortEdges() {
     int expectedInsetLeft = 5;
@@ -463,7 +609,11 @@ public class AccessibilityBridgeTest {
     verify(mockNodeInfo, times(1)).setBoundsInScreen(new Rect(left, top, right, bottom));
   }
 
-  @TargetApi(30)
+  @SuppressWarnings("deprecation")
+  // getSystemWindowInset* methods deprecated.
+  // fluter#133074 tracks post deprecation work.
+  @Config(sdk = API_LEVELS.API_30)
+  @TargetApi(API_LEVELS.API_30)
   @Test
   public void itSetCutoutInsetBasedonLayoutModeAlways() {
     int expectedInsetLeft = 5;
@@ -708,7 +858,7 @@ public class AccessibilityBridgeTest {
     verify(mockRootView, times(1)).setAccessibilityPaneTitle(eq("new_node2"));
   }
 
-  @TargetApi(21)
+  @Config(sdk = API_LEVELS.API_21)
   @Test
   public void itCanPerformSetText() {
     AccessibilityChannel mockChannel = mock(AccessibilityChannel.class);
@@ -747,7 +897,7 @@ public class AccessibilityBridgeTest {
         .dispatchSemanticsAction(1, AccessibilityBridge.Action.SET_TEXT, expectedText);
   }
 
-  @TargetApi(21)
+  @Config(sdk = API_LEVELS.API_21)
   @Test
   public void itCanPredictSetText() {
     AccessibilityChannel mockChannel = mock(AccessibilityChannel.class);
@@ -786,7 +936,7 @@ public class AccessibilityBridgeTest {
     assertEquals(nodeInfo.getText().toString(), expectedText);
   }
 
-  @TargetApi(21)
+  @Config(sdk = API_LEVELS.API_21)
   @Test
   public void itBuildsAttributedString() {
     AccessibilityChannel mockChannel = mock(AccessibilityChannel.class);
@@ -852,7 +1002,7 @@ public class AccessibilityBridgeTest {
     assertEquals(actual.getSpanEnd(spellOutSpan), 9);
   }
 
-  @TargetApi(21)
+  @Config(sdk = API_LEVELS.API_21)
   @Test
   public void itSetsTextCorrectly() {
     AccessibilityChannel mockChannel = mock(AccessibilityChannel.class);
@@ -911,7 +1061,8 @@ public class AccessibilityBridgeTest {
     assertEquals(objectSpans.length, 0);
   }
 
-  @TargetApi(28)
+  @Config(sdk = API_LEVELS.API_28)
+  @TargetApi(API_LEVELS.API_28)
   @Test
   public void itSetsTooltipCorrectly() {
     AccessibilityChannel mockChannel = mock(AccessibilityChannel.class);
@@ -948,7 +1099,45 @@ public class AccessibilityBridgeTest {
     assertEquals(actual.toString(), root.tooltip);
   }
 
-  @TargetApi(21)
+  @TargetApi(API_LEVELS.API_28)
+  @Test
+  public void itSetsIdentifierCorrectly() {
+    AccessibilityChannel mockChannel = mock(AccessibilityChannel.class);
+    AccessibilityViewEmbedder mockViewEmbedder = mock(AccessibilityViewEmbedder.class);
+    AccessibilityManager mockManager = mock(AccessibilityManager.class);
+    View mockRootView = mock(View.class);
+    Context context = mock(Context.class);
+    when(mockRootView.getContext()).thenReturn(context);
+    when(context.getPackageName()).thenReturn("test");
+    AccessibilityBridge accessibilityBridge =
+        setUpBridge(
+            /*rootAccessibilityView=*/ mockRootView,
+            /*accessibilityChannel=*/ mockChannel,
+            /*accessibilityManager=*/ mockManager,
+            /*contentResolver=*/ null,
+            /*accessibilityViewEmbedder=*/ mockViewEmbedder,
+            /*platformViewsAccessibilityDelegate=*/ null);
+
+    ViewParent mockParent = mock(ViewParent.class);
+    when(mockRootView.getParent()).thenReturn(mockParent);
+    when(mockManager.isEnabled()).thenReturn(true);
+    // Create a node with identifier.
+    TestSemanticsNode root = new TestSemanticsNode();
+    root.id = 0;
+    root.identifier = "identifier";
+
+    TestSemanticsUpdate testSemanticsUpdate = root.toUpdate();
+    testSemanticsUpdate.sendUpdateToBridge(accessibilityBridge);
+
+    // Test the generated AccessibilityNodeInfo for the node we created and
+    // verify it has correct identifier (i.e. resource-id per Android
+    // terminology).
+    AccessibilityNodeInfo nodeInfo = accessibilityBridge.createAccessibilityNodeInfo(0);
+    CharSequence actual = nodeInfo.getViewIdResourceName();
+    assertEquals(actual.toString(), root.identifier);
+  }
+
+  @Config(sdk = API_LEVELS.API_21)
   @Test
   public void itCanCreateAccessibilityNodeInfoWithSetText() {
     AccessibilityChannel mockChannel = mock(AccessibilityChannel.class);
@@ -1031,7 +1220,9 @@ public class AccessibilityBridgeTest {
 
   @Test
   public void itPerformsClearAccessibilityFocusCorrectly() {
-    AccessibilityChannel mockChannel = mock(AccessibilityChannel.class);
+    BasicMessageChannel mockChannel = mock(BasicMessageChannel.class);
+    AccessibilityChannel accessibilityChannel =
+        new AccessibilityChannel(mockChannel, mock(FlutterJNI.class));
     AccessibilityViewEmbedder mockViewEmbedder = mock(AccessibilityViewEmbedder.class);
     AccessibilityManager mockManager = mock(AccessibilityManager.class);
     View mockRootView = mock(View.class);
@@ -1041,7 +1232,7 @@ public class AccessibilityBridgeTest {
     AccessibilityBridge accessibilityBridge =
         setUpBridge(
             /*rootAccessibilityView=*/ mockRootView,
-            /*accessibilityChannel=*/ mockChannel,
+            /*accessibilityChannel=*/ accessibilityChannel,
             /*accessibilityManager=*/ mockManager,
             /*contentResolver=*/ null,
             /*accessibilityViewEmbedder=*/ mockViewEmbedder,
@@ -1064,6 +1255,11 @@ public class AccessibilityBridgeTest {
     accessibilityBridge.performAction(0, AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS, null);
     AccessibilityNodeInfo nodeInfo = accessibilityBridge.createAccessibilityNodeInfo(0);
     assertTrue(nodeInfo.isAccessibilityFocused());
+
+    HashMap<String, Object> message = new HashMap<>();
+    message.put("type", "didGainFocus");
+    message.put("nodeId", 0);
+    verify(mockChannel).send(message);
     // Clear focus on non-focused node shouldn't do anything
     accessibilityBridge.performAction(
         1, AccessibilityNodeInfo.ACTION_CLEAR_ACCESSIBILITY_FOCUS, null);
@@ -1123,7 +1319,8 @@ public class AccessibilityBridgeTest {
     assertTrue(node2Info.isFocusable());
   }
 
-  @TargetApi(31)
+  @Config(sdk = API_LEVELS.API_31)
+  @TargetApi(API_LEVELS.API_31)
   @Test
   public void itSetsBoldTextFlagCorrectly() {
     AccessibilityChannel mockChannel = mock(AccessibilityChannel.class);
@@ -1153,7 +1350,10 @@ public class AccessibilityBridgeTest {
 
   @Test
   public void itSetsFocusedNodeBeforeSendingEvent() {
-    AccessibilityChannel mockChannel = mock(AccessibilityChannel.class);
+    BasicMessageChannel mockChannel = mock(BasicMessageChannel.class);
+    AccessibilityChannel accessibilityChannel =
+        new AccessibilityChannel(mockChannel, mock(FlutterJNI.class));
+
     AccessibilityViewEmbedder mockViewEmbedder = mock(AccessibilityViewEmbedder.class);
     AccessibilityManager mockManager = mock(AccessibilityManager.class);
     View mockRootView = mock(View.class);
@@ -1163,7 +1363,7 @@ public class AccessibilityBridgeTest {
     AccessibilityBridge accessibilityBridge =
         setUpBridge(
             /*rootAccessibilityView=*/ mockRootView,
-            /*accessibilityChannel=*/ mockChannel,
+            /*accessibilityChannel=*/ accessibilityChannel,
             /*accessibilityManager=*/ mockManager,
             /*contentResolver=*/ null,
             /*accessibilityViewEmbedder=*/ mockViewEmbedder,
@@ -1204,11 +1404,18 @@ public class AccessibilityBridgeTest {
         .thenAnswer(invocation -> verifier.verify(invocation));
     accessibilityBridge.performAction(0, AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS, null);
     assertTrue(verifier.verified);
+
+    HashMap<String, Object> message = new HashMap<>();
+    message.put("type", "didGainFocus");
+    message.put("nodeId", 0);
+    verify(mockChannel).send(message);
   }
 
   @Test
   public void itClearsFocusedNodeBeforeSendingEvent() {
-    AccessibilityChannel mockChannel = mock(AccessibilityChannel.class);
+    BasicMessageChannel mockChannel = mock(BasicMessageChannel.class);
+    AccessibilityChannel accessibilityChannel =
+        new AccessibilityChannel(mockChannel, mock(FlutterJNI.class));
     AccessibilityViewEmbedder mockViewEmbedder = mock(AccessibilityViewEmbedder.class);
     AccessibilityManager mockManager = mock(AccessibilityManager.class);
     View mockRootView = mock(View.class);
@@ -1218,7 +1425,7 @@ public class AccessibilityBridgeTest {
     AccessibilityBridge accessibilityBridge =
         setUpBridge(
             /*rootAccessibilityView=*/ mockRootView,
-            /*accessibilityChannel=*/ mockChannel,
+            /*accessibilityChannel=*/ accessibilityChannel,
             /*accessibilityManager=*/ mockManager,
             /*contentResolver=*/ null,
             /*accessibilityViewEmbedder=*/ mockViewEmbedder,
@@ -1238,6 +1445,10 @@ public class AccessibilityBridgeTest {
     accessibilityBridge.performAction(0, AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS, null);
     AccessibilityNodeInfo nodeInfo = accessibilityBridge.createAccessibilityNodeInfo(0);
     assertTrue(nodeInfo.isAccessibilityFocused());
+    HashMap<String, Object> message = new HashMap<>();
+    message.put("type", "didGainFocus");
+    message.put("nodeId", 0);
+    verify(mockChannel).send(message);
 
     class Verifier {
       public Verifier(AccessibilityBridge accessibilityBridge) {
@@ -1827,6 +2038,66 @@ public class AccessibilityBridgeTest {
     verify(mockChannel, never()).setAccessibilityFeatures(anyInt());
   }
 
+  @Test
+  public void sendFocusAccessibilityEvent() {
+    AccessibilityManager mockManager = mock(AccessibilityManager.class);
+    AccessibilityChannel accessibilityChannel =
+        new AccessibilityChannel(mock(DartExecutor.class), mock(FlutterJNI.class));
+
+    ContentResolver mockContentResolver = mock(ContentResolver.class);
+    View mockRootView = mock(View.class);
+    Context context = mock(Context.class);
+    when(mockRootView.getContext()).thenReturn(context);
+    when(context.getPackageName()).thenReturn("test");
+    ViewParent mockParent = mock(ViewParent.class);
+    when(mockRootView.getParent()).thenReturn(mockParent);
+    when(mockManager.isEnabled()).thenReturn(true);
+
+    AccessibilityBridge accessibilityBridge =
+        setUpBridge(mockRootView, accessibilityChannel, mockManager, null, null, null);
+
+    HashMap<String, Object> arguments = new HashMap<>();
+    arguments.put("type", "focus");
+    arguments.put("nodeId", 123);
+    BasicMessageChannel.Reply reply = mock(BasicMessageChannel.Reply.class);
+    accessibilityChannel.parsingMessageHandler.onMessage(arguments, reply);
+
+    // Check that focus event was sent.
+    ArgumentCaptor<AccessibilityEvent> eventCaptor =
+        ArgumentCaptor.forClass(AccessibilityEvent.class);
+    verify(mockParent).requestSendAccessibilityEvent(eq(mockRootView), eventCaptor.capture());
+    AccessibilityEvent event = eventCaptor.getAllValues().get(0);
+    assertEquals(event.getEventType(), AccessibilityEvent.TYPE_VIEW_FOCUSED);
+    assertEquals(event.getSource(), null);
+  }
+
+  @Test
+  public void SetSourceAndPackageNameForAccessibilityEvent() {
+    AccessibilityManager mockManager = mock(AccessibilityManager.class);
+    ContentResolver mockContentResolver = mock(ContentResolver.class);
+    View mockRootView = mock(View.class);
+    Context context = mock(Context.class);
+    when(mockRootView.getContext()).thenReturn(context);
+    when(context.getPackageName()).thenReturn("test");
+    when(mockManager.isEnabled()).thenReturn(true);
+    ViewParent mockParent = mock(ViewParent.class);
+    when(mockRootView.getParent()).thenReturn(mockParent);
+    AccessibilityEvent mockEvent = mock(AccessibilityEvent.class);
+
+    AccessibilityBridge accessibilityBridge =
+        setUpBridge(mockRootView, null, mockManager, null, null, null);
+
+    AccessibilityBridge spyAccessibilityBridge = spy(accessibilityBridge);
+
+    when(spyAccessibilityBridge.obtainAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED))
+        .thenReturn(mockEvent);
+
+    spyAccessibilityBridge.sendAccessibilityEvent(123, AccessibilityEvent.TYPE_VIEW_FOCUSED);
+
+    verify(mockEvent).setPackageName("test");
+    verify(mockEvent).setSource(eq(mockRootView), eq(123));
+  }
+
   AccessibilityBridge setUpBridge() {
     return setUpBridge(null, null, null, null, null, null);
   }
@@ -1946,6 +2217,7 @@ public class AccessibilityBridgeTest {
     float scrollPosition = 0.0f;
     float scrollExtentMax = 0.0f;
     float scrollExtentMin = 0.0f;
+    String identifier = null;
     String label = null;
     List<TestStringAttribute> labelAttributes;
     String value = null;
@@ -2003,6 +2275,12 @@ public class AccessibilityBridgeTest {
       bytes.putFloat(scrollPosition);
       bytes.putFloat(scrollExtentMax);
       bytes.putFloat(scrollExtentMin);
+      if (identifier == null) {
+        bytes.putInt(-1);
+      } else {
+        strings.add(identifier);
+        bytes.putInt(strings.size() - 1);
+      }
       updateString(label, labelAttributes, bytes, strings, stringAttributeArgs);
       updateString(value, valueAttributes, bytes, strings, stringAttributeArgs);
       updateString(increasedValue, increasedValueAttributes, bytes, strings, stringAttributeArgs);
diff --git a/shell/platform/android/test/io/flutter/view/VsyncWaiterTest.java b/shell/platform/android/test/io/flutter/view/VsyncWaiterTest.java
index 9afeb9c5deebb9061a0cc0bc8f3889807c5a1f8b..ef56b9936b87bbab851dc822c375e236d6291076 100644
--- a/shell/platform/android/test/io/flutter/view/VsyncWaiterTest.java
+++ b/shell/platform/android/test/io/flutter/view/VsyncWaiterTest.java
@@ -14,7 +14,6 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.robolectric.Shadows.shadowOf;
 
-import android.annotation.TargetApi;
 import android.hardware.display.DisplayManager;
 import android.os.Looper;
 import android.view.Display;
@@ -50,7 +49,6 @@ public class VsyncWaiterTest {
     verify(mockFlutterJNI, times(1)).onVsync(anyLong(), eq(1000000000l / 10l), eq(1l));
   }
 
-  @TargetApi(17)
   @Test
   public void itSetsFpsWhenDisplayManagerUpdates() {
     FlutterJNI mockFlutterJNI = mock(FlutterJNI.class);
@@ -86,7 +84,6 @@ public class VsyncWaiterTest {
     verify(mockFlutterJNI, times(1)).onVsync(anyLong(), eq(1000000000l / 60l), eq(1l));
   }
 
-  @TargetApi(17)
   @Test
   public void itSetsFpsWhenDisplayManagerDoesNotUpdate() {
     FlutterJNI mockFlutterJNI = mock(FlutterJNI.class);
diff --git a/shell/platform/android/test_runner/.gitignore b/shell/platform/android/test_runner/.gitignore
index 08a55c09bdf375664017da9868ad13fd4338946f..f8ed7018916469da03e5db1f9e475f7264c83356 100644
--- a/shell/platform/android/test_runner/.gitignore
+++ b/shell/platform/android/test_runner/.gitignore
@@ -1 +1,2 @@
 .gradle
+local.properties
diff --git a/shell/platform/android/test_runner/build.gradle b/shell/platform/android/test_runner/build.gradle
index d1dfa4cc8d37b27a9fdeef34b4fcd46118774fb8..50e8e4f3f8912928c2d605286295df13372f4537 100644
--- a/shell/platform/android/test_runner/build.gradle
+++ b/shell/platform/android/test_runner/build.gradle
@@ -4,7 +4,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath "com.android.tools.build:gradle:7.0.0"
+    classpath "com.android.tools.build:gradle:8.0.1"
   }
 }
 
@@ -18,11 +18,10 @@ apply plugin: "com.android.library"
 rootProject.buildDir = project.property("build_dir")
 
 // Shows warnings for usage of deprecated API usages.
-// TODO(camsim99): Make deprecation warnings fatal and remove limit when all
-// 434 (at the time of this comment) deprecations are fixed.
+// TODO(reidbaker): Expand linter coverage https://github.com/flutter/flutter/issues/133154
 gradle.projectsEvaluated {
   tasks.withType(JavaCompile) {
-      options.compilerArgs << "-Xlint:deprecation" << "-Xmaxwarns" << "434"
+      options.compilerArgs << "-Xlint:deprecation" << "-Werror"
   }
 }
 
@@ -33,10 +32,11 @@ println "AVAILABLE PROCESSORS: $availableProcessors"
 println "=========================================="
 
 android {
-  compileSdkVersion 33
+  namespace 'io.flutter.app.test'
+  compileSdkVersion 34
 
   defaultConfig {
-    minSdkVersion 16
+    minSdkVersion 21
   }
 
   compileOptions {
@@ -57,6 +57,7 @@ android {
         events "passed", "skipped", "failed", "standardOut", "standardError"
         exceptionFormat "full"
         showStackTraces true
+        showStandardStreams true
       }
     }
   }
@@ -70,7 +71,7 @@ android {
     testImplementation "androidx.test:core:1.4.0"
     testImplementation "com.google.android.play:core:1.8.0"
     testImplementation "com.ibm.icu:icu4j:69.1"
-    testImplementation "org.robolectric:robolectric:4.7.3"
+    testImplementation "org.robolectric:robolectric:4.11.1"
     testImplementation "junit:junit:4.13.2"
     testImplementation "androidx.test.ext:junit:1.1.4-alpha07"
 
diff --git a/shell/platform/android/test_runner/src/main/AndroidManifest.xml b/shell/platform/android/test_runner/src/main/AndroidManifest.xml
index d67f4e576024195f8982dea786ebf53abd613c95..57bdeee85869553d97f2bea0de0f26d5ced971e5 100644
--- a/shell/platform/android/test_runner/src/main/AndroidManifest.xml
+++ b/shell/platform/android/test_runner/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="io.flutter.app.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <application>
 
diff --git a/shell/platform/android/test_runner/src/main/resources/robolectric.properties b/shell/platform/android/test_runner/src/main/resources/robolectric.properties
index ba72a7e57eb78353b0a02b16d4b31e6d5f00ce9f..ebf6f5b5a478df0ffd79e78d13c60049b721f45c 100644
--- a/shell/platform/android/test_runner/src/main/resources/robolectric.properties
+++ b/shell/platform/android/test_runner/src/main/resources/robolectric.properties
@@ -1,2 +1,2 @@
-sdk=31
+sdk=33
 shadows=io.flutter.CustomShadowContextImpl
diff --git a/shell/platform/android/vsync_waiter_android.cc b/shell/platform/android/vsync_waiter_android.cc
index 84e477e3ebac0af8a41662ca37e8616d3c503275..bfced030f5fe558e3bc657241423e6b820d02228 100644
--- a/shell/platform/android/vsync_waiter_android.cc
+++ b/shell/platform/android/vsync_waiter_android.cc
@@ -13,7 +13,7 @@
 #include "flutter/fml/platform/android/scoped_java_ref.h"
 #include "flutter/fml/size.h"
 #include "flutter/fml/trace_event.h"
-#include "flutter/shell/platform/android/android_choreographer.h"
+#include "impeller/toolkit/android/choreographer.h"
 
 namespace flutter {
 
@@ -22,22 +22,29 @@ static jmethodID g_async_wait_for_vsync_method_ = nullptr;
 static std::atomic_uint g_refresh_rate_ = 60;
 
 VsyncWaiterAndroid::VsyncWaiterAndroid(const flutter::TaskRunners& task_runners)
-    : VsyncWaiter(task_runners),
-      use_ndk_choreographer_(
-          AndroidChoreographer::ShouldUseNDKChoreographer()) {}
+    : VsyncWaiter(task_runners) {}
 
 VsyncWaiterAndroid::~VsyncWaiterAndroid() = default;
 
 // |VsyncWaiter|
 void VsyncWaiterAndroid::AwaitVSync() {
-  if (use_ndk_choreographer_) {
+  if (impeller::android::Choreographer::IsAvailableOnPlatform()) {
     auto* weak_this = new std::weak_ptr<VsyncWaiter>(shared_from_this());
     fml::TaskRunner::RunNowOrPostTask(
         task_runners_.GetUITaskRunner(), [weak_this]() {
-          AndroidChoreographer::PostFrameCallback(&OnVsyncFromNDK, weak_this);
+          const auto& choreographer =
+              impeller::android::Choreographer::GetInstance();
+          choreographer.PostFrameCallback([weak_this](auto time) {
+            auto time_ns =
+                std::chrono::time_point_cast<std::chrono::nanoseconds>(time)
+                    .time_since_epoch()
+                    .count();
+            OnVsyncFromNDK(time_ns, weak_this);
+          });
         });
   } else {
-    // TODO(99798): Remove it when we drop support for API level < 29.
+    // TODO(99798): Remove it when we drop support for API level < 29 and 32-bit
+    // devices.
     auto* weak_this = new std::weak_ptr<VsyncWaiter>(shared_from_this());
     jlong java_baton = reinterpret_cast<jlong>(weak_this);
     task_runners_.GetPlatformTaskRunner()->PostTask([java_baton]() {
@@ -52,8 +59,6 @@ void VsyncWaiterAndroid::AwaitVSync() {
 
 // static
 void VsyncWaiterAndroid::OnVsyncFromNDK(int64_t frame_nanos, void* data) {
-  TRACE_EVENT0("flutter", "VSYNC");
-
   auto frame_time = fml::TimePoint::FromEpochDelta(
       fml::TimeDelta::FromNanoseconds(frame_nanos));
   auto now = fml::TimePoint::Now();
@@ -62,6 +67,12 @@ void VsyncWaiterAndroid::OnVsyncFromNDK(int64_t frame_nanos, void* data) {
   }
   auto target_time = frame_time + fml::TimeDelta::FromNanoseconds(
                                       1000000000.0 / g_refresh_rate_);
+
+  TRACE_EVENT2_INT("flutter", "PlatformVsync", "frame_start_time",
+                   frame_time.ToEpochDelta().ToMicroseconds(),
+                   "frame_target_time",
+                   target_time.ToEpochDelta().ToMicroseconds());
+
   auto* weak_this = reinterpret_cast<std::weak_ptr<VsyncWaiter>*>(data);
   ConsumePendingCallback(weak_this, frame_time, target_time);
 }
@@ -72,13 +83,16 @@ void VsyncWaiterAndroid::OnVsyncFromJava(JNIEnv* env,
                                          jlong frameDelayNanos,
                                          jlong refreshPeriodNanos,
                                          jlong java_baton) {
-  TRACE_EVENT0("flutter", "VSYNC");
-
   auto frame_time =
       fml::TimePoint::Now() - fml::TimeDelta::FromNanoseconds(frameDelayNanos);
   auto target_time =
       frame_time + fml::TimeDelta::FromNanoseconds(refreshPeriodNanos);
 
+  TRACE_EVENT2_INT("flutter", "PlatformVsync", "frame_start_time",
+                   frame_time.ToEpochDelta().ToMicroseconds(),
+                   "frame_target_time",
+                   target_time.ToEpochDelta().ToMicroseconds());
+
   auto* weak_this = reinterpret_cast<std::weak_ptr<VsyncWaiter>*>(java_baton);
   ConsumePendingCallback(weak_this, frame_time, target_time);
 }
diff --git a/shell/platform/android/vsync_waiter_android.h b/shell/platform/android/vsync_waiter_android.h
index 0d7e383fd028622a019f08a87b954543d148d7e4..7129bb94305e2394bbb867b88448e5663bce4927 100644
--- a/shell/platform/android/vsync_waiter_android.h
+++ b/shell/platform/android/vsync_waiter_android.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_PLATFORM_ANDROID_VSYNC_WAITER_ANDROID_H_
-#define SHELL_PLATFORM_ANDROID_VSYNC_WAITER_ANDROID_H_
+#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_VSYNC_WAITER_ANDROID_H_
+#define FLUTTER_SHELL_PLATFORM_ANDROID_VSYNC_WAITER_ANDROID_H_
 
 #include <jni.h>
 
@@ -44,10 +44,9 @@ class VsyncWaiterAndroid final : public VsyncWaiter {
                                   jclass jcaller,
                                   jfloat refresh_rate);
 
-  const bool use_ndk_choreographer_;
   FML_DISALLOW_COPY_AND_ASSIGN(VsyncWaiterAndroid);
 };
 
 }  // namespace flutter
 
-#endif  // SHELL_PLATFORM_ANDROID_ASYNC_WAITER_ANDROID_H_
+#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_VSYNC_WAITER_ANDROID_H_
diff --git a/shell/platform/common/BUILD.gn b/shell/platform/common/BUILD.gn
index a1a1817939202e5fa6bf5a4640fe14460d8a9023..5ebfb2236d2c5ba202338ff9ce58ad7efcdb43d0 100644
--- a/shell/platform/common/BUILD.gn
+++ b/shell/platform/common/BUILD.gn
@@ -58,7 +58,10 @@ source_set("common_cpp_input") {
 }
 
 source_set("common_cpp_enums") {
-  public = [ "platform_provided_menu.h" ]
+  public = [
+    "app_lifecycle_state.h",
+    "platform_provided_menu.h",
+  ]
 
   public_configs = [
     "//flutter:config",
@@ -80,11 +83,13 @@ source_set("common_cpp_switches") {
 source_set("common_cpp_accessibility") {
   public = [
     "accessibility_bridge.h",
+    "alert_platform_node_delegate.h",
     "flutter_platform_node_delegate.h",
   ]
 
   sources = [
     "accessibility_bridge.cc",
+    "alert_platform_node_delegate.cc",
     "flutter_platform_node_delegate.cc",
   ]
 
@@ -125,7 +130,7 @@ source_set("common_cpp") {
 
   public_deps = [
     ":common_cpp_core",
-    "//third_party/rapidjson",
+    "//flutter/third_party/rapidjson",
   ]
 }
 
@@ -157,8 +162,8 @@ if (enable_unittests) {
     deps = [
       ":common_cpp_core",
       ":common_cpp_core_fixtures",
+      "$dart_src/runtime:libdart_jit",
       "//flutter/testing",
-      "//third_party/dart/runtime:libdart_jit",
     ]
 
     public_configs = [ "//flutter:config" ]
diff --git a/shell/platform/common/accessibility_bridge.cc b/shell/platform/common/accessibility_bridge.cc
index f95998d15b167acdd83d250697fa0edf52b956c1..9a6e02065ee64f7666357bad6d5ef69ab95d9c3e 100644
--- a/shell/platform/common/accessibility_bridge.cc
+++ b/shell/platform/common/accessibility_bridge.cc
@@ -7,6 +7,7 @@
 #include <functional>
 #include <utility>
 
+#include "flutter/third_party/accessibility/ax/ax_tree_manager_map.h"
 #include "flutter/third_party/accessibility/ax/ax_tree_update.h"
 #include "flutter/third_party/accessibility/base/logging.h"
 
@@ -19,24 +20,30 @@ constexpr int kHasScrollingAction =
     FlutterSemanticsAction::kFlutterSemanticsActionScrollDown;
 
 // AccessibilityBridge
-AccessibilityBridge::AccessibilityBridge() {
-  event_generator_.SetTree(&tree_);
-  tree_.AddObserver(static_cast<ui::AXTreeObserver*>(this));
+AccessibilityBridge::AccessibilityBridge()
+    : tree_(std::make_unique<ui::AXTree>()) {
+  event_generator_.SetTree(tree_.get());
+  tree_->AddObserver(static_cast<ui::AXTreeObserver*>(this));
+  ui::AXTreeData data = tree_->data();
+  data.tree_id = ui::AXTreeID::CreateNewAXTreeID();
+  tree_->UpdateData(data);
+  ui::AXTreeManagerMap::GetInstance().AddTreeManager(tree_->GetAXTreeID(),
+                                                     this);
 }
 
 AccessibilityBridge::~AccessibilityBridge() {
   event_generator_.ReleaseTree();
-  tree_.RemoveObserver(static_cast<ui::AXTreeObserver*>(this));
+  tree_->RemoveObserver(static_cast<ui::AXTreeObserver*>(this));
 }
 
 void AccessibilityBridge::AddFlutterSemanticsNodeUpdate(
-    const FlutterSemanticsNode* node) {
-  pending_semantics_node_updates_[node->id] = FromFlutterSemanticsNode(node);
+    const FlutterSemanticsNode2& node) {
+  pending_semantics_node_updates_[node.id] = FromFlutterSemanticsNode(node);
 }
 
 void AccessibilityBridge::AddFlutterSemanticsCustomActionUpdate(
-    const FlutterSemanticsCustomAction* action) {
-  pending_semantics_custom_action_updates_[action->id] =
+    const FlutterSemanticsCustomAction2& action) {
+  pending_semantics_custom_action_updates_[action.id] =
       FromFlutterSemanticsCustomAction(action);
 }
 
@@ -51,9 +58,9 @@ void AccessibilityBridge::CommitUpdates() {
   std::optional<ui::AXTreeUpdate> remove_reparented =
       CreateRemoveReparentedNodesUpdate();
   if (remove_reparented.has_value()) {
-    tree_.Unserialize(remove_reparented.value());
+    tree_->Unserialize(remove_reparented.value());
 
-    std::string error = tree_.error();
+    std::string error = tree_->error();
     if (!error.empty()) {
       FML_LOG(ERROR) << "Failed to update ui::AXTree, error: " << error;
       assert(false);
@@ -63,7 +70,7 @@ void AccessibilityBridge::CommitUpdates() {
 
   // Second, apply the pending node updates. This also moves reparented nodes to
   // their new parents if needed.
-  ui::AXTreeUpdate update{.tree_data = tree_.data()};
+  ui::AXTreeUpdate update{.tree_data = tree_->data()};
 
   // Figure out update order, ui::AXTree only accepts update in tree order,
   // where parent node must come before the child node in
@@ -71,7 +78,8 @@ void AccessibilityBridge::CommitUpdates() {
   // entire subtree into a list. We pick another node from the remaining update,
   // and keep doing so until the update map is empty. We then concatenate the
   // lists in the reversed order, this guarantees parent updates always come
-  // before child updates.
+  // before child updates. If the root is in the update, it is guaranteed to
+  // be the first node of the last list.
   std::vector<std::vector<SemanticsNode>> results;
   while (!pending_semantics_node_updates_.empty()) {
     auto begin = pending_semantics_node_updates_.begin();
@@ -83,16 +91,25 @@ void AccessibilityBridge::CommitUpdates() {
   }
 
   for (size_t i = results.size(); i > 0; i--) {
-    for (SemanticsNode node : results[i - 1]) {
+    for (const SemanticsNode& node : results[i - 1]) {
       ConvertFlutterUpdate(node, update);
     }
   }
 
-  tree_.Unserialize(update);
+  // The first update must set the tree's root, which is guaranteed to be the
+  // last list's first node. A tree's root node never changes, though it can be
+  // modified.
+  if (!results.empty() && GetRootAsAXNode()->id() == ui::AXNode::kInvalidAXID) {
+    FML_DCHECK(!results.back().empty());
+
+    update.root_id = results.back().front().id;
+  }
+
+  tree_->Unserialize(update);
   pending_semantics_node_updates_.clear();
   pending_semantics_custom_action_updates_.clear();
 
-  std::string error = tree_.error();
+  std::string error = tree_->error();
   if (!error.empty()) {
     FML_LOG(ERROR) << "Failed to update ui::AXTree, error: " << error;
     return;
@@ -122,7 +139,7 @@ AccessibilityBridge::GetFlutterPlatformNodeDelegateFromID(
 }
 
 const ui::AXTreeData& AccessibilityBridge::GetAXTreeData() const {
-  return tree_.data();
+  return tree_->data();
 }
 
 const std::vector<ui::AXEventGenerator::TargetedEvent>
@@ -132,18 +149,6 @@ AccessibilityBridge::GetPendingEvents() const {
   return result;
 }
 
-void AccessibilityBridge::RecreateNodeDelegates() {
-  for (const auto& [node_id, old_platform_node_delegate] : id_wrapper_map_) {
-    std::shared_ptr<FlutterPlatformNodeDelegate> platform_node_delegate =
-        CreateFlutterPlatformNodeDelegate();
-    platform_node_delegate->Init(
-        std::static_pointer_cast<FlutterPlatformNodeDelegate::OwnerBridge>(
-            shared_from_this()),
-        old_platform_node_delegate->GetAXNode());
-    id_wrapper_map_[node_id] = platform_node_delegate;
-  }
-}
-
 void AccessibilityBridge::OnNodeWillBeDeleted(ui::AXTree* tree,
                                               ui::AXNode* node) {}
 
@@ -198,10 +203,10 @@ std::optional<ui::AXTreeUpdate>
 AccessibilityBridge::CreateRemoveReparentedNodesUpdate() {
   std::unordered_map<int32_t, ui::AXNodeData> updates;
 
-  for (auto node_update : pending_semantics_node_updates_) {
+  for (const auto& node_update : pending_semantics_node_updates_) {
     for (int32_t child_id : node_update.second.children_in_traversal_order) {
       // Skip nodes that don't exist or have a parent in the current tree.
-      ui::AXNode* child = tree_.GetFromId(child_id);
+      ui::AXNode* child = tree_->GetFromId(child_id);
       if (!child) {
         continue;
       }
@@ -222,7 +227,7 @@ AccessibilityBridge::CreateRemoveReparentedNodesUpdate() {
       // Create an update to remove the child from its previous parent.
       int32_t parent_id = child->parent()->id();
       if (updates.find(parent_id) == updates.end()) {
-        updates[parent_id] = tree_.GetFromId(parent_id)->data();
+        updates[parent_id] = tree_->GetFromId(parent_id)->data();
       }
 
       ui::AXNodeData* parent = &updates[parent_id];
@@ -239,7 +244,7 @@ AccessibilityBridge::CreateRemoveReparentedNodesUpdate() {
   }
 
   ui::AXTreeUpdate update{
-      .tree_data = tree_.data(),
+      .tree_data = tree_->data(),
       .nodes = std::vector<ui::AXNodeData>(),
   };
 
@@ -328,7 +333,7 @@ void AccessibilityBridge::SetRoleFromFlutterUpdate(ui::AXNodeData& node_data,
     return;
   }
   if (flags & kFlutterSemanticsFlagHasToggledState) {
-    node_data.role = ax::mojom::Role::kToggleButton;
+    node_data.role = ax::mojom::Role::kSwitch;
     return;
   }
   if (flags & kFlutterSemanticsFlagIsSlider) {
@@ -348,6 +353,13 @@ void AccessibilityBridge::SetStateFromFlutterUpdate(ui::AXNodeData& node_data,
                                                     const SemanticsNode& node) {
   FlutterSemanticsFlag flags = node.flags;
   FlutterSemanticsAction actions = node.actions;
+  if (flags & FlutterSemanticsFlag::kFlutterSemanticsFlagHasExpandedState &&
+      flags & FlutterSemanticsFlag::kFlutterSemanticsFlagIsExpanded) {
+    node_data.AddState(ax::mojom::State::kExpanded);
+  } else if (flags &
+             FlutterSemanticsFlag::kFlutterSemanticsFlagHasExpandedState) {
+    node_data.AddState(ax::mojom::State::kCollapsed);
+  }
   if (flags & FlutterSemanticsFlag::kFlutterSemanticsFlagIsTextField &&
       (flags & FlutterSemanticsFlag::kFlutterSemanticsFlagIsReadOnly) == 0) {
     node_data.AddState(ax::mojom::State::kEditable);
@@ -428,6 +440,12 @@ void AccessibilityBridge::SetBooleanAttributesFromFlutterUpdate(
       ax::mojom::BoolAttribute::kEditableRoot,
       flags & FlutterSemanticsFlag::kFlutterSemanticsFlagIsTextField &&
           (flags & FlutterSemanticsFlag::kFlutterSemanticsFlagIsReadOnly) == 0);
+  // Mark nodes as line breaking so that screen readers don't
+  // merge all consecutive objects into one.
+  // TODO(schectman): When should a node have this attribute set?
+  // https://github.com/flutter/flutter/issues/118184
+  node_data.AddBoolAttribute(ax::mojom::BoolAttribute::kIsLineBreakingObject,
+                             true);
 }
 
 void AccessibilityBridge::SetIntAttributesFromFlutterUpdate(
@@ -459,7 +477,7 @@ void AccessibilityBridge::SetIntAttributesFromFlutterUpdate(
             : flags & FlutterSemanticsFlag::kFlutterSemanticsFlagIsChecked
                 ? ax::mojom::CheckedState::kTrue
                 : ax::mojom::CheckedState::kFalse));
-  } else if (node_data.role == ax::mojom::Role::kToggleButton) {
+  } else if (node_data.role == ax::mojom::Role::kSwitch) {
     node_data.AddIntAttribute(
         ax::mojom::IntAttribute::kCheckedState,
         static_cast<int32_t>(
@@ -520,11 +538,12 @@ void AccessibilityBridge::SetTooltipFromFlutterUpdate(
 void AccessibilityBridge::SetTreeData(const SemanticsNode& node,
                                       ui::AXTreeUpdate& tree_update) {
   FlutterSemanticsFlag flags = node.flags;
-  // Set selection if:
+  // Set selection of the focused node if:
   // 1. this text field has a valid selection
   // 2. this text field doesn't have a valid selection but had selection stored
   //    in the tree.
-  if (flags & FlutterSemanticsFlag::kFlutterSemanticsFlagIsTextField) {
+  if (flags & FlutterSemanticsFlag::kFlutterSemanticsFlagIsTextField &&
+      flags & FlutterSemanticsFlag::kFlutterSemanticsFlagIsFocused) {
     if (node.text_selection_base != -1) {
       tree_update.tree_data.sel_anchor_object_id = node.id;
       tree_update.tree_data.sel_anchor_offset = node.text_selection_base;
@@ -554,66 +573,66 @@ void AccessibilityBridge::SetTreeData(const SemanticsNode& node,
 
 AccessibilityBridge::SemanticsNode
 AccessibilityBridge::FromFlutterSemanticsNode(
-    const FlutterSemanticsNode* flutter_node) {
+    const FlutterSemanticsNode2& flutter_node) {
   SemanticsNode result;
-  result.id = flutter_node->id;
-  result.flags = flutter_node->flags;
-  result.actions = flutter_node->actions;
-  result.text_selection_base = flutter_node->text_selection_base;
-  result.text_selection_extent = flutter_node->text_selection_extent;
-  result.scroll_child_count = flutter_node->scroll_child_count;
-  result.scroll_index = flutter_node->scroll_index;
-  result.scroll_position = flutter_node->scroll_position;
-  result.scroll_extent_max = flutter_node->scroll_extent_max;
-  result.scroll_extent_min = flutter_node->scroll_extent_min;
-  result.elevation = flutter_node->elevation;
-  result.thickness = flutter_node->thickness;
-  if (flutter_node->label) {
-    result.label = std::string(flutter_node->label);
-  }
-  if (flutter_node->hint) {
-    result.hint = std::string(flutter_node->hint);
-  }
-  if (flutter_node->value) {
-    result.value = std::string(flutter_node->value);
-  }
-  if (flutter_node->increased_value) {
-    result.increased_value = std::string(flutter_node->increased_value);
-  }
-  if (flutter_node->decreased_value) {
-    result.decreased_value = std::string(flutter_node->decreased_value);
-  }
-  if (flutter_node->tooltip) {
-    result.tooltip = std::string(flutter_node->tooltip);
-  }
-  result.text_direction = flutter_node->text_direction;
-  result.rect = flutter_node->rect;
-  result.transform = flutter_node->transform;
-  if (flutter_node->child_count > 0) {
+  result.id = flutter_node.id;
+  result.flags = flutter_node.flags;
+  result.actions = flutter_node.actions;
+  result.text_selection_base = flutter_node.text_selection_base;
+  result.text_selection_extent = flutter_node.text_selection_extent;
+  result.scroll_child_count = flutter_node.scroll_child_count;
+  result.scroll_index = flutter_node.scroll_index;
+  result.scroll_position = flutter_node.scroll_position;
+  result.scroll_extent_max = flutter_node.scroll_extent_max;
+  result.scroll_extent_min = flutter_node.scroll_extent_min;
+  result.elevation = flutter_node.elevation;
+  result.thickness = flutter_node.thickness;
+  if (flutter_node.label) {
+    result.label = std::string(flutter_node.label);
+  }
+  if (flutter_node.hint) {
+    result.hint = std::string(flutter_node.hint);
+  }
+  if (flutter_node.value) {
+    result.value = std::string(flutter_node.value);
+  }
+  if (flutter_node.increased_value) {
+    result.increased_value = std::string(flutter_node.increased_value);
+  }
+  if (flutter_node.decreased_value) {
+    result.decreased_value = std::string(flutter_node.decreased_value);
+  }
+  if (flutter_node.tooltip) {
+    result.tooltip = std::string(flutter_node.tooltip);
+  }
+  result.text_direction = flutter_node.text_direction;
+  result.rect = flutter_node.rect;
+  result.transform = flutter_node.transform;
+  if (flutter_node.child_count > 0) {
     result.children_in_traversal_order = std::vector<int32_t>(
-        flutter_node->children_in_traversal_order,
-        flutter_node->children_in_traversal_order + flutter_node->child_count);
+        flutter_node.children_in_traversal_order,
+        flutter_node.children_in_traversal_order + flutter_node.child_count);
   }
-  if (flutter_node->custom_accessibility_actions_count > 0) {
+  if (flutter_node.custom_accessibility_actions_count > 0) {
     result.custom_accessibility_actions = std::vector<int32_t>(
-        flutter_node->custom_accessibility_actions,
-        flutter_node->custom_accessibility_actions +
-            flutter_node->custom_accessibility_actions_count);
+        flutter_node.custom_accessibility_actions,
+        flutter_node.custom_accessibility_actions +
+            flutter_node.custom_accessibility_actions_count);
   }
   return result;
 }
 
 AccessibilityBridge::SemanticsCustomAction
 AccessibilityBridge::FromFlutterSemanticsCustomAction(
-    const FlutterSemanticsCustomAction* flutter_custom_action) {
+    const FlutterSemanticsCustomAction2& flutter_custom_action) {
   SemanticsCustomAction result;
-  result.id = flutter_custom_action->id;
-  result.override_action = flutter_custom_action->override_action;
-  if (flutter_custom_action->label) {
-    result.label = std::string(flutter_custom_action->label);
+  result.id = flutter_custom_action.id;
+  result.override_action = flutter_custom_action.override_action;
+  if (flutter_custom_action.label) {
+    result.label = std::string(flutter_custom_action.label);
   }
-  if (flutter_custom_action->hint) {
-    result.hint = std::string(flutter_custom_action->hint);
+  if (flutter_custom_action.hint) {
+    result.hint = std::string(flutter_custom_action.hint);
   }
   return result;
 }
@@ -649,8 +668,60 @@ gfx::NativeViewAccessible AccessibilityBridge::GetNativeAccessibleFromId(
 gfx::RectF AccessibilityBridge::RelativeToGlobalBounds(const ui::AXNode* node,
                                                        bool& offscreen,
                                                        bool clip_bounds) {
-  return tree_.RelativeToTreeBounds(node, gfx::RectF(), &offscreen,
-                                    clip_bounds);
+  return tree_->RelativeToTreeBounds(node, gfx::RectF(), &offscreen,
+                                     clip_bounds);
+}
+
+ui::AXNode* AccessibilityBridge::GetNodeFromTree(
+    ui::AXTreeID tree_id,
+    ui::AXNode::AXID node_id) const {
+  return GetNodeFromTree(node_id);
+}
+
+ui::AXNode* AccessibilityBridge::GetNodeFromTree(
+    ui::AXNode::AXID node_id) const {
+  return tree_->GetFromId(node_id);
+}
+
+ui::AXTreeID AccessibilityBridge::GetTreeID() const {
+  return tree_->GetAXTreeID();
+}
+
+ui::AXTreeID AccessibilityBridge::GetParentTreeID() const {
+  return ui::AXTreeIDUnknown();
+}
+
+ui::AXNode* AccessibilityBridge::GetRootAsAXNode() const {
+  return tree_->root();
+}
+
+ui::AXNode* AccessibilityBridge::GetParentNodeFromParentTreeAsAXNode() const {
+  return nullptr;
+}
+
+ui::AXTree* AccessibilityBridge::GetTree() const {
+  return tree_.get();
+}
+
+ui::AXPlatformNode* AccessibilityBridge::GetPlatformNodeFromTree(
+    const ui::AXNode::AXID node_id) const {
+  auto platform_delegate_weak = GetFlutterPlatformNodeDelegateFromID(node_id);
+  auto platform_delegate = platform_delegate_weak.lock();
+  if (!platform_delegate) {
+    return nullptr;
+  }
+  return platform_delegate->GetPlatformNode();
+}
+
+ui::AXPlatformNode* AccessibilityBridge::GetPlatformNodeFromTree(
+    const ui::AXNode& node) const {
+  return GetPlatformNodeFromTree(node.id());
+}
+
+ui::AXPlatformNodeDelegate* AccessibilityBridge::RootDelegate() const {
+  return GetFlutterPlatformNodeDelegateFromID(GetRootAsAXNode()->id())
+      .lock()
+      .get();
 }
 
 }  // namespace flutter
diff --git a/shell/platform/common/accessibility_bridge.h b/shell/platform/common/accessibility_bridge.h
index fe88f27fa91e1a3a44bc5b23fc1ba67e04e3fb93..7e6698021b726befe1c100d0e0d910fd740abccd 100644
--- a/shell/platform/common/accessibility_bridge.h
+++ b/shell/platform/common/accessibility_bridge.h
@@ -14,6 +14,7 @@
 #include "flutter/third_party/accessibility/ax/ax_tree.h"
 #include "flutter/third_party/accessibility/ax/ax_tree_observer.h"
 #include "flutter/third_party/accessibility/ax/platform/ax_platform_node_delegate.h"
+#include "flutter/third_party/accessibility/ax/platform/ax_platform_tree_manager.h"
 
 #include "flutter_platform_node_delegate.h"
 
@@ -39,6 +40,7 @@ namespace flutter {
 class AccessibilityBridge
     : public std::enable_shared_from_this<AccessibilityBridge>,
       public FlutterPlatformNodeDelegate::OwnerBridge,
+      public ui::AXPlatformTreeManager,
       private ui::AXTreeObserver {
  public:
   //-----------------------------------------------------------------------------
@@ -46,18 +48,13 @@ class AccessibilityBridge
   AccessibilityBridge();
   virtual ~AccessibilityBridge();
 
-  //-----------------------------------------------------------------------------
-  /// @brief      The ID of the root node in the accessibility tree. In Flutter,
-  //              this is always 0.
-  static constexpr int32_t kRootNodeId = 0;
-
   //------------------------------------------------------------------------------
   /// @brief      Adds a semantics node update to the pending semantics update.
   ///             Calling this method alone will NOT update the semantics tree.
   ///             To flush the pending updates, call the CommitUpdates().
   ///
-  /// @param[in]  node           A pointer to the semantics node update.
-  void AddFlutterSemanticsNodeUpdate(const FlutterSemanticsNode* node);
+  /// @param[in]  node           A reference to the semantics node update.
+  void AddFlutterSemanticsNodeUpdate(const FlutterSemanticsNode2& node);
 
   //------------------------------------------------------------------------------
   /// @brief      Adds a custom semantics action update to the pending semantics
@@ -65,10 +62,10 @@ class AccessibilityBridge
   ///             semantics tree. To flush the pending updates, call the
   ///             CommitUpdates().
   ///
-  /// @param[in]  action           A pointer to the custom semantics action
+  /// @param[in]  action           A reference to the custom semantics action
   ///                              update.
   void AddFlutterSemanticsCustomActionUpdate(
-      const FlutterSemanticsCustomAction* action);
+      const FlutterSemanticsCustomAction2& action);
 
   //------------------------------------------------------------------------------
   /// @brief      Flushes the pending updates and applies them to this
@@ -106,6 +103,39 @@ class AccessibilityBridge
   const std::vector<ui::AXEventGenerator::TargetedEvent> GetPendingEvents()
       const;
 
+  // |AXTreeManager|
+  ui::AXNode* GetNodeFromTree(const ui::AXTreeID tree_id,
+                              const ui::AXNode::AXID node_id) const override;
+
+  // |AXTreeManager|
+  ui::AXNode* GetNodeFromTree(const ui::AXNode::AXID node_id) const override;
+
+  // |AXTreeManager|
+  ui::AXTreeID GetTreeID() const override;
+
+  // |AXTreeManager|
+  ui::AXTreeID GetParentTreeID() const override;
+
+  // |AXTreeManager|
+  ui::AXNode* GetRootAsAXNode() const override;
+
+  // |AXTreeManager|
+  ui::AXNode* GetParentNodeFromParentTreeAsAXNode() const override;
+
+  // |AXTreeManager|
+  ui::AXTree* GetTree() const override;
+
+  // |AXPlatformTreeManager|
+  ui::AXPlatformNode* GetPlatformNodeFromTree(
+      const ui::AXNode::AXID node_id) const override;
+
+  // |AXPlatformTreeManager|
+  ui::AXPlatformNode* GetPlatformNodeFromTree(
+      const ui::AXNode& node) const override;
+
+  // |AXPlatformTreeManager|
+  ui::AXPlatformNodeDelegate* RootDelegate() const override;
+
  protected:
   //---------------------------------------------------------------------------
   /// @brief      Handle accessibility events generated due to accessibility
@@ -127,16 +157,6 @@ class AccessibilityBridge
   virtual std::shared_ptr<FlutterPlatformNodeDelegate>
   CreateFlutterPlatformNodeDelegate() = 0;
 
-  //------------------------------------------------------------------------------
-  /// @brief      Recreate all FlutterPlatformNodeDelegates.
-  ///
-  ///             This can be useful for subclasses when updating some
-  ///             properties that are used by node delegates, such as views.
-  ///             Each node is recreated using
-  ///             CreateFlutterPlatformNodeDelegate, then initialized using
-  ///             AXNodes from their corresponding old one.
-  void RecreateNodeDelegates();
-
  private:
   // See FlutterSemanticsNode in embedder.h
   typedef struct {
@@ -176,7 +196,7 @@ class AccessibilityBridge
   std::unordered_map<AccessibilityNodeId,
                      std::shared_ptr<FlutterPlatformNodeDelegate>>
       id_wrapper_map_;
-  ui::AXTree tree_;
+  std::unique_ptr<ui::AXTree> tree_;
   ui::AXEventGenerator event_generator_;
   std::unordered_map<int32_t, SemanticsNode> pending_semantics_node_updates_;
   std::unordered_map<int32_t, SemanticsCustomAction>
@@ -215,9 +235,9 @@ class AccessibilityBridge
                                    const SemanticsNode& node);
   void SetTreeData(const SemanticsNode& node, ui::AXTreeUpdate& tree_update);
   SemanticsNode FromFlutterSemanticsNode(
-      const FlutterSemanticsNode* flutter_node);
+      const FlutterSemanticsNode2& flutter_node);
   SemanticsCustomAction FromFlutterSemanticsCustomAction(
-      const FlutterSemanticsCustomAction* flutter_custom_action);
+      const FlutterSemanticsCustomAction2& flutter_custom_action);
 
   // |AXTreeObserver|
   void OnNodeWillBeDeleted(ui::AXTree* tree, ui::AXNode* node) override;
diff --git a/shell/platform/common/accessibility_bridge_unittests.cc b/shell/platform/common/accessibility_bridge_unittests.cc
index 5dc52393ec737f341962a09bd7c8c8d04130e546..796670e3ab9b085f9b010ebc6dd8ec8fff2b9f6d 100644
--- a/shell/platform/common/accessibility_bridge_unittests.cc
+++ b/shell/platform/common/accessibility_bridge_unittests.cc
@@ -7,6 +7,7 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
+#include "flutter/third_party/accessibility/ax/ax_tree_manager_map.h"
 #include "test_accessibility_bridge.h"
 
 namespace flutter {
@@ -14,7 +15,7 @@ namespace testing {
 
 using ::testing::Contains;
 
-FlutterSemanticsNode CreateSemanticsNode(
+FlutterSemanticsNode2 CreateSemanticsNode(
     int32_t id,
     const char* label,
     const std::vector<int32_t>* children = nullptr) {
@@ -36,18 +37,18 @@ FlutterSemanticsNode CreateSemanticsNode(
   };
 }
 
-TEST(AccessibilityBridgeTest, basicTest) {
+TEST(AccessibilityBridgeTest, BasicTest) {
   std::shared_ptr<TestAccessibilityBridge> bridge =
       std::make_shared<TestAccessibilityBridge>();
 
   std::vector<int32_t> children{1, 2};
-  FlutterSemanticsNode root = CreateSemanticsNode(0, "root", &children);
-  FlutterSemanticsNode child1 = CreateSemanticsNode(1, "child 1");
-  FlutterSemanticsNode child2 = CreateSemanticsNode(2, "child 2");
+  FlutterSemanticsNode2 root = CreateSemanticsNode(0, "root", &children);
+  FlutterSemanticsNode2 child1 = CreateSemanticsNode(1, "child 1");
+  FlutterSemanticsNode2 child2 = CreateSemanticsNode(2, "child 2");
 
-  bridge->AddFlutterSemanticsNodeUpdate(&root);
-  bridge->AddFlutterSemanticsNodeUpdate(&child1);
-  bridge->AddFlutterSemanticsNodeUpdate(&child2);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
+  bridge->AddFlutterSemanticsNodeUpdate(child1);
+  bridge->AddFlutterSemanticsNodeUpdate(child2);
   bridge->CommitUpdates();
 
   auto root_node = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
@@ -65,16 +66,107 @@ TEST(AccessibilityBridgeTest, basicTest) {
   EXPECT_EQ(child2_node->GetName(), "child 2");
 }
 
-TEST(AccessibilityBridgeTest, canFireChildrenChangedCorrectly) {
+// Flutter used to assume that the accessibility root had ID 0.
+// In a multi-view world, each view has its own accessibility root
+// with a globally unique node ID.
+TEST(AccessibilityBridgeTest, AccessibilityRootId) {
+  std::shared_ptr<TestAccessibilityBridge> bridge =
+      std::make_shared<TestAccessibilityBridge>();
+
+  std::vector<int32_t> children{456, 789};
+  FlutterSemanticsNode2 root = CreateSemanticsNode(123, "root", &children);
+  FlutterSemanticsNode2 child1 = CreateSemanticsNode(456, "child 1");
+  FlutterSemanticsNode2 child2 = CreateSemanticsNode(789, "child 2");
+
+  bridge->AddFlutterSemanticsNodeUpdate(root);
+  bridge->AddFlutterSemanticsNodeUpdate(child1);
+  bridge->AddFlutterSemanticsNodeUpdate(child2);
+  bridge->CommitUpdates();
+
+  auto root_node = bridge->GetFlutterPlatformNodeDelegateFromID(123).lock();
+  auto child1_node = bridge->GetFlutterPlatformNodeDelegateFromID(456).lock();
+  auto child2_node = bridge->GetFlutterPlatformNodeDelegateFromID(789).lock();
+  auto fake_delegate = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
+
+  EXPECT_EQ(bridge->GetRootAsAXNode()->id(), 123);
+  EXPECT_EQ(bridge->RootDelegate()->GetName(), "root");
+
+  EXPECT_EQ(root_node->GetChildCount(), 2);
+  EXPECT_EQ(root_node->GetData().child_ids[0], 456);
+  EXPECT_EQ(root_node->GetData().child_ids[1], 789);
+  EXPECT_EQ(root_node->GetName(), "root");
+
+  EXPECT_EQ(child1_node->GetChildCount(), 0);
+  EXPECT_EQ(child1_node->GetName(), "child 1");
+
+  EXPECT_EQ(child2_node->GetChildCount(), 0);
+  EXPECT_EQ(child2_node->GetName(), "child 2");
+
+  ASSERT_FALSE(fake_delegate);
+}
+
+// Semantic nodes can be added in any order.
+TEST(AccessibilityBridgeTest, AddOrder) {
+  std::shared_ptr<TestAccessibilityBridge> bridge =
+      std::make_shared<TestAccessibilityBridge>();
+
+  std::vector<int32_t> root_children{34, 56};
+  std::vector<int32_t> child2_children{78};
+  std::vector<int32_t> child3_children{90};
+  FlutterSemanticsNode2 root = CreateSemanticsNode(12, "root", &root_children);
+  FlutterSemanticsNode2 child1 = CreateSemanticsNode(34, "child 1");
+  FlutterSemanticsNode2 child2 =
+      CreateSemanticsNode(56, "child 2", &child2_children);
+  FlutterSemanticsNode2 child3 =
+      CreateSemanticsNode(78, "child 3", &child3_children);
+  FlutterSemanticsNode2 child4 = CreateSemanticsNode(90, "child 4");
+
+  bridge->AddFlutterSemanticsNodeUpdate(child3);
+  bridge->AddFlutterSemanticsNodeUpdate(child2);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
+  bridge->AddFlutterSemanticsNodeUpdate(child1);
+  bridge->AddFlutterSemanticsNodeUpdate(child4);
+  bridge->CommitUpdates();
+
+  auto root_node = bridge->GetFlutterPlatformNodeDelegateFromID(12).lock();
+  auto child1_node = bridge->GetFlutterPlatformNodeDelegateFromID(34).lock();
+  auto child2_node = bridge->GetFlutterPlatformNodeDelegateFromID(56).lock();
+  auto child3_node = bridge->GetFlutterPlatformNodeDelegateFromID(78).lock();
+  auto child4_node = bridge->GetFlutterPlatformNodeDelegateFromID(90).lock();
+
+  EXPECT_EQ(bridge->GetRootAsAXNode()->id(), 12);
+  EXPECT_EQ(bridge->RootDelegate()->GetName(), "root");
+
+  EXPECT_EQ(root_node->GetChildCount(), 2);
+  EXPECT_EQ(root_node->GetData().child_ids[0], 34);
+  EXPECT_EQ(root_node->GetData().child_ids[1], 56);
+  EXPECT_EQ(root_node->GetName(), "root");
+
+  EXPECT_EQ(child1_node->GetChildCount(), 0);
+  EXPECT_EQ(child1_node->GetName(), "child 1");
+
+  EXPECT_EQ(child2_node->GetChildCount(), 1);
+  EXPECT_EQ(child2_node->GetData().child_ids[0], 78);
+  EXPECT_EQ(child2_node->GetName(), "child 2");
+
+  EXPECT_EQ(child3_node->GetChildCount(), 1);
+  EXPECT_EQ(child3_node->GetData().child_ids[0], 90);
+  EXPECT_EQ(child3_node->GetName(), "child 3");
+
+  EXPECT_EQ(child4_node->GetChildCount(), 0);
+  EXPECT_EQ(child4_node->GetName(), "child 4");
+}
+
+TEST(AccessibilityBridgeTest, CanFireChildrenChangedCorrectly) {
   std::shared_ptr<TestAccessibilityBridge> bridge =
       std::make_shared<TestAccessibilityBridge>();
 
   std::vector<int32_t> children{1};
-  FlutterSemanticsNode root = CreateSemanticsNode(0, "root", &children);
-  FlutterSemanticsNode child1 = CreateSemanticsNode(1, "child 1");
+  FlutterSemanticsNode2 root = CreateSemanticsNode(0, "root", &children);
+  FlutterSemanticsNode2 child1 = CreateSemanticsNode(1, "child 1");
 
-  bridge->AddFlutterSemanticsNodeUpdate(&root);
-  bridge->AddFlutterSemanticsNodeUpdate(&child1);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
+  bridge->AddFlutterSemanticsNodeUpdate(child1);
 
   bridge->CommitUpdates();
 
@@ -93,10 +185,10 @@ TEST(AccessibilityBridgeTest, canFireChildrenChangedCorrectly) {
   int32_t new_children[] = {1, 2};
   root.children_in_traversal_order = new_children;
 
-  FlutterSemanticsNode child2 = CreateSemanticsNode(2, "child 2");
+  FlutterSemanticsNode2 child2 = CreateSemanticsNode(2, "child 2");
 
-  bridge->AddFlutterSemanticsNodeUpdate(&root);
-  bridge->AddFlutterSemanticsNodeUpdate(&child2);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
+  bridge->AddFlutterSemanticsNodeUpdate(child2);
   bridge->CommitUpdates();
 
   root_node = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
@@ -113,46 +205,14 @@ TEST(AccessibilityBridgeTest, canFireChildrenChangedCorrectly) {
               Contains(ui::AXEventGenerator::Event::SUBTREE_CREATED));
 }
 
-TEST(AccessibilityBridgeTest, canRecreateNodeDelegates) {
+TEST(AccessibilityBridgeTest, CanHandleSelectionChangeCorrectly) {
   std::shared_ptr<TestAccessibilityBridge> bridge =
       std::make_shared<TestAccessibilityBridge>();
-
-  std::vector<int32_t> children{1};
-  FlutterSemanticsNode root = CreateSemanticsNode(0, "root", &children);
-  FlutterSemanticsNode child1 = CreateSemanticsNode(1, "child 1");
-
-  bridge->AddFlutterSemanticsNodeUpdate(&root);
-  bridge->AddFlutterSemanticsNodeUpdate(&child1);
-  bridge->CommitUpdates();
-
-  auto root_node = bridge->GetFlutterPlatformNodeDelegateFromID(0);
-  auto child1_node = bridge->GetFlutterPlatformNodeDelegateFromID(1);
-  EXPECT_FALSE(root_node.expired());
-  EXPECT_FALSE(child1_node.expired());
-
-  bridge->RecreateNodeDelegates();
-
-  // Old tree is destroyed.
-  EXPECT_TRUE(root_node.expired());
-  EXPECT_TRUE(child1_node.expired());
-
-  // New tree still has the data.
-  auto new_root_node = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
-  auto new_child1_node = bridge->GetFlutterPlatformNodeDelegateFromID(1).lock();
-  EXPECT_EQ(new_root_node->GetChildCount(), 1);
-  EXPECT_EQ(new_root_node->GetData().child_ids[0], 1);
-  EXPECT_EQ(new_root_node->GetName(), "root");
-
-  EXPECT_EQ(new_child1_node->GetChildCount(), 0);
-  EXPECT_EQ(new_child1_node->GetName(), "child 1");
-}
-
-TEST(AccessibilityBridgeTest, canHandleSelectionChangeCorrectly) {
-  std::shared_ptr<TestAccessibilityBridge> bridge =
-      std::make_shared<TestAccessibilityBridge>();
-  FlutterSemanticsNode root = CreateSemanticsNode(0, "root");
-  root.flags = FlutterSemanticsFlag::kFlutterSemanticsFlagIsTextField;
-  bridge->AddFlutterSemanticsNodeUpdate(&root);
+  FlutterSemanticsNode2 root = CreateSemanticsNode(0, "root");
+  root.flags = static_cast<FlutterSemanticsFlag>(
+      FlutterSemanticsFlag::kFlutterSemanticsFlagIsTextField |
+      FlutterSemanticsFlag::kFlutterSemanticsFlagIsFocused);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
   bridge->CommitUpdates();
 
   const ui::AXTreeData& tree = bridge->GetAXTreeData();
@@ -162,7 +222,7 @@ TEST(AccessibilityBridgeTest, canHandleSelectionChangeCorrectly) {
   // Update the selection.
   root.text_selection_base = 0;
   root.text_selection_extent = 5;
-  bridge->AddFlutterSemanticsNodeUpdate(&root);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
 
   bridge->CommitUpdates();
 
@@ -177,14 +237,14 @@ TEST(AccessibilityBridgeTest, canHandleSelectionChangeCorrectly) {
             ui::AXEventGenerator::Event::OTHER_ATTRIBUTE_CHANGED);
 }
 
-TEST(AccessibilityBridgeTest, doesNotAssignEditableRootToSelectableText) {
+TEST(AccessibilityBridgeTest, DoesNotAssignEditableRootToSelectableText) {
   std::shared_ptr<TestAccessibilityBridge> bridge =
       std::make_shared<TestAccessibilityBridge>();
-  FlutterSemanticsNode root = CreateSemanticsNode(0, "root");
+  FlutterSemanticsNode2 root = CreateSemanticsNode(0, "root");
   root.flags = static_cast<FlutterSemanticsFlag>(
       FlutterSemanticsFlag::kFlutterSemanticsFlagIsTextField |
       FlutterSemanticsFlag::kFlutterSemanticsFlagIsReadOnly);
-  bridge->AddFlutterSemanticsNodeUpdate(&root);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
   bridge->CommitUpdates();
 
   auto root_node = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
@@ -193,31 +253,31 @@ TEST(AccessibilityBridgeTest, doesNotAssignEditableRootToSelectableText) {
       ax::mojom::BoolAttribute::kEditableRoot));
 }
 
-TEST(AccessibilityBridgeTest, ToggleHasToggleButtonRole) {
+TEST(AccessibilityBridgeTest, SwitchHasSwitchRole) {
   std::shared_ptr<TestAccessibilityBridge> bridge =
       std::make_shared<TestAccessibilityBridge>();
-  FlutterSemanticsNode root = CreateSemanticsNode(0, "root");
+  FlutterSemanticsNode2 root = CreateSemanticsNode(0, "root");
   root.flags = static_cast<FlutterSemanticsFlag>(
       FlutterSemanticsFlag::kFlutterSemanticsFlagHasToggledState |
       FlutterSemanticsFlag::kFlutterSemanticsFlagHasEnabledState |
       FlutterSemanticsFlag::kFlutterSemanticsFlagIsEnabled);
-  bridge->AddFlutterSemanticsNodeUpdate(&root);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
   bridge->CommitUpdates();
 
   auto root_node = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
-  EXPECT_EQ(root_node->GetData().role, ax::mojom::Role::kToggleButton);
+  EXPECT_EQ(root_node->GetData().role, ax::mojom::Role::kSwitch);
 }
 
 TEST(AccessibilityBridgeTest, SliderHasSliderRole) {
   std::shared_ptr<TestAccessibilityBridge> bridge =
       std::make_shared<TestAccessibilityBridge>();
-  FlutterSemanticsNode root = CreateSemanticsNode(0, "root");
+  FlutterSemanticsNode2 root = CreateSemanticsNode(0, "root");
   root.flags = static_cast<FlutterSemanticsFlag>(
       FlutterSemanticsFlag::kFlutterSemanticsFlagIsSlider |
       FlutterSemanticsFlag::kFlutterSemanticsFlagHasEnabledState |
       FlutterSemanticsFlag::kFlutterSemanticsFlagIsEnabled |
       FlutterSemanticsFlag::kFlutterSemanticsFlagIsFocusable);
-  bridge->AddFlutterSemanticsNodeUpdate(&root);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
   bridge->CommitUpdates();
 
   auto root_node = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
@@ -232,11 +292,11 @@ TEST(AccessibilityBridgeTest, SliderHasSliderRole) {
 TEST(AccessibilityBridgeTest, CanSetCheckboxChecked) {
   std::shared_ptr<TestAccessibilityBridge> bridge =
       std::make_shared<TestAccessibilityBridge>();
-  FlutterSemanticsNode root = CreateSemanticsNode(0, "root");
+  FlutterSemanticsNode2 root = CreateSemanticsNode(0, "root");
   root.flags = static_cast<FlutterSemanticsFlag>(
       FlutterSemanticsFlag::kFlutterSemanticsFlagHasCheckedState |
       FlutterSemanticsFlag::kFlutterSemanticsFlagIsChecked);
-  bridge->AddFlutterSemanticsNodeUpdate(&root);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
   bridge->CommitUpdates();
 
   auto root_node = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
@@ -252,14 +312,14 @@ TEST(AccessibilityBridgeTest, CanReparentNode) {
 
   std::vector<int32_t> root_children{1};
   std::vector<int32_t> child1_children{2};
-  FlutterSemanticsNode root = CreateSemanticsNode(0, "root", &root_children);
-  FlutterSemanticsNode child1 =
+  FlutterSemanticsNode2 root = CreateSemanticsNode(0, "root", &root_children);
+  FlutterSemanticsNode2 child1 =
       CreateSemanticsNode(1, "child 1", &child1_children);
-  FlutterSemanticsNode child2 = CreateSemanticsNode(2, "child 2");
+  FlutterSemanticsNode2 child2 = CreateSemanticsNode(2, "child 2");
 
-  bridge->AddFlutterSemanticsNodeUpdate(&root);
-  bridge->AddFlutterSemanticsNodeUpdate(&child1);
-  bridge->AddFlutterSemanticsNodeUpdate(&child2);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
+  bridge->AddFlutterSemanticsNodeUpdate(child1);
+  bridge->AddFlutterSemanticsNodeUpdate(child2);
   bridge->CommitUpdates();
   bridge->accessibility_events.clear();
 
@@ -271,9 +331,9 @@ TEST(AccessibilityBridgeTest, CanReparentNode) {
   root.child_count = 2;
   root.children_in_traversal_order = new_root_children;
 
-  bridge->AddFlutterSemanticsNodeUpdate(&root);
-  bridge->AddFlutterSemanticsNodeUpdate(&child1);
-  bridge->AddFlutterSemanticsNodeUpdate(&child2);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
+  bridge->AddFlutterSemanticsNodeUpdate(child1);
+  bridge->AddFlutterSemanticsNodeUpdate(child2);
   bridge->CommitUpdates();
 
   auto root_node = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
@@ -323,22 +383,22 @@ TEST(AccessibilityBridgeTest, CanReparentMultipleNodes) {
   std::vector<int32_t> root_children{intermediary1_id, intermediary2_id};
   std::vector<int32_t> intermediary1_children{leaf1_id};
   std::vector<int32_t> intermediary2_children{leaf2_id, leaf3_id};
-  FlutterSemanticsNode root =
+  FlutterSemanticsNode2 root =
       CreateSemanticsNode(root_id, "root", &root_children);
-  FlutterSemanticsNode intermediary1 = CreateSemanticsNode(
+  FlutterSemanticsNode2 intermediary1 = CreateSemanticsNode(
       intermediary1_id, "intermediary 1", &intermediary1_children);
-  FlutterSemanticsNode intermediary2 = CreateSemanticsNode(
+  FlutterSemanticsNode2 intermediary2 = CreateSemanticsNode(
       intermediary2_id, "intermediary 2", &intermediary2_children);
-  FlutterSemanticsNode leaf1 = CreateSemanticsNode(leaf1_id, "leaf 1");
-  FlutterSemanticsNode leaf2 = CreateSemanticsNode(leaf2_id, "leaf 2");
-  FlutterSemanticsNode leaf3 = CreateSemanticsNode(leaf3_id, "leaf 3");
-
-  bridge->AddFlutterSemanticsNodeUpdate(&root);
-  bridge->AddFlutterSemanticsNodeUpdate(&intermediary1);
-  bridge->AddFlutterSemanticsNodeUpdate(&intermediary2);
-  bridge->AddFlutterSemanticsNodeUpdate(&leaf1);
-  bridge->AddFlutterSemanticsNodeUpdate(&leaf2);
-  bridge->AddFlutterSemanticsNodeUpdate(&leaf3);
+  FlutterSemanticsNode2 leaf1 = CreateSemanticsNode(leaf1_id, "leaf 1");
+  FlutterSemanticsNode2 leaf2 = CreateSemanticsNode(leaf2_id, "leaf 2");
+  FlutterSemanticsNode2 leaf3 = CreateSemanticsNode(leaf3_id, "leaf 3");
+
+  bridge->AddFlutterSemanticsNodeUpdate(root);
+  bridge->AddFlutterSemanticsNodeUpdate(intermediary1);
+  bridge->AddFlutterSemanticsNodeUpdate(intermediary2);
+  bridge->AddFlutterSemanticsNodeUpdate(leaf1);
+  bridge->AddFlutterSemanticsNodeUpdate(leaf2);
+  bridge->AddFlutterSemanticsNodeUpdate(leaf3);
   bridge->CommitUpdates();
   bridge->accessibility_events.clear();
 
@@ -351,11 +411,11 @@ TEST(AccessibilityBridgeTest, CanReparentMultipleNodes) {
   intermediary2.child_count = 1;
   intermediary2.children_in_traversal_order = new_intermediary2_children;
 
-  bridge->AddFlutterSemanticsNodeUpdate(&intermediary1);
-  bridge->AddFlutterSemanticsNodeUpdate(&intermediary2);
-  bridge->AddFlutterSemanticsNodeUpdate(&leaf1);
-  bridge->AddFlutterSemanticsNodeUpdate(&leaf2);
-  bridge->AddFlutterSemanticsNodeUpdate(&leaf3);
+  bridge->AddFlutterSemanticsNodeUpdate(intermediary1);
+  bridge->AddFlutterSemanticsNodeUpdate(intermediary2);
+  bridge->AddFlutterSemanticsNodeUpdate(leaf1);
+  bridge->AddFlutterSemanticsNodeUpdate(leaf2);
+  bridge->AddFlutterSemanticsNodeUpdate(leaf3);
   bridge->CommitUpdates();
 
   auto root_node = bridge->GetFlutterPlatformNodeDelegateFromID(root_id).lock();
@@ -414,18 +474,18 @@ TEST(AccessibilityBridgeTest, CanReparentNodeWithChild) {
 
   std::vector<int32_t> root_children{intermediary1_id, intermediary2_id};
   std::vector<int32_t> intermediary1_children{leaf1_id};
-  FlutterSemanticsNode root =
+  FlutterSemanticsNode2 root =
       CreateSemanticsNode(root_id, "root", &root_children);
-  FlutterSemanticsNode intermediary1 = CreateSemanticsNode(
+  FlutterSemanticsNode2 intermediary1 = CreateSemanticsNode(
       intermediary1_id, "intermediary 1", &intermediary1_children);
-  FlutterSemanticsNode intermediary2 =
+  FlutterSemanticsNode2 intermediary2 =
       CreateSemanticsNode(intermediary2_id, "intermediary 2");
-  FlutterSemanticsNode leaf1 = CreateSemanticsNode(leaf1_id, "leaf 1");
+  FlutterSemanticsNode2 leaf1 = CreateSemanticsNode(leaf1_id, "leaf 1");
 
-  bridge->AddFlutterSemanticsNodeUpdate(&root);
-  bridge->AddFlutterSemanticsNodeUpdate(&intermediary1);
-  bridge->AddFlutterSemanticsNodeUpdate(&intermediary2);
-  bridge->AddFlutterSemanticsNodeUpdate(&leaf1);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
+  bridge->AddFlutterSemanticsNodeUpdate(intermediary1);
+  bridge->AddFlutterSemanticsNodeUpdate(intermediary2);
+  bridge->AddFlutterSemanticsNodeUpdate(leaf1);
   bridge->CommitUpdates();
   bridge->accessibility_events.clear();
 
@@ -438,10 +498,10 @@ TEST(AccessibilityBridgeTest, CanReparentNodeWithChild) {
   intermediary2.child_count = 1;
   intermediary2.children_in_traversal_order = new_intermediary2_children;
 
-  bridge->AddFlutterSemanticsNodeUpdate(&root);
-  bridge->AddFlutterSemanticsNodeUpdate(&intermediary1);
-  bridge->AddFlutterSemanticsNodeUpdate(&intermediary2);
-  bridge->AddFlutterSemanticsNodeUpdate(&leaf1);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
+  bridge->AddFlutterSemanticsNodeUpdate(intermediary1);
+  bridge->AddFlutterSemanticsNodeUpdate(intermediary2);
+  bridge->AddFlutterSemanticsNodeUpdate(leaf1);
   bridge->CommitUpdates();
 
   auto root_node = bridge->GetFlutterPlatformNodeDelegateFromID(root_id).lock();
@@ -483,5 +543,34 @@ TEST(AccessibilityBridgeTest, CanReparentNodeWithChild) {
               Contains(ui::AXEventGenerator::Event::ROLE_CHANGED).Times(1));
 }
 
+TEST(AccessibilityBridgeTest, AXTreeManagerTest) {
+  std::shared_ptr<TestAccessibilityBridge> bridge =
+      std::make_shared<TestAccessibilityBridge>();
+
+  ui::AXTreeID tree_id = bridge->GetTreeID();
+  ui::AXTreeManager* manager =
+      ui::AXTreeManagerMap::GetInstance().GetManager(tree_id);
+  ASSERT_EQ(manager, static_cast<ui::AXTreeManager*>(bridge.get()));
+}
+
+TEST(AccessibilityBridgeTest, LineBreakingObjectTest) {
+  std::shared_ptr<TestAccessibilityBridge> bridge =
+      std::make_shared<TestAccessibilityBridge>();
+
+  const int32_t root_id = 0;
+
+  FlutterSemanticsNode2 root = CreateSemanticsNode(root_id, "root", {});
+
+  bridge->AddFlutterSemanticsNodeUpdate(root);
+  bridge->CommitUpdates();
+
+  auto root_node = bridge->GetFlutterPlatformNodeDelegateFromID(root_id).lock();
+  auto root_data = root_node->GetData();
+  EXPECT_TRUE(root_data.HasBoolAttribute(
+      ax::mojom::BoolAttribute::kIsLineBreakingObject));
+  EXPECT_TRUE(root_data.GetBoolAttribute(
+      ax::mojom::BoolAttribute::kIsLineBreakingObject));
+}
+
 }  // namespace testing
 }  // namespace flutter
diff --git a/shell/platform/common/alert_platform_node_delegate.cc b/shell/platform/common/alert_platform_node_delegate.cc
new file mode 100644
index 0000000000000000000000000000000000000000..3208737eba9569774399805cceb6aa5a85a12a36
--- /dev/null
+++ b/shell/platform/common/alert_platform_node_delegate.cc
@@ -0,0 +1,41 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "alert_platform_node_delegate.h"
+
+namespace flutter {
+
+AlertPlatformNodeDelegate::AlertPlatformNodeDelegate(
+    ui::AXPlatformNodeDelegate& parent_delegate)
+    : parent_delegate_(parent_delegate) {
+  data_.role = ax::mojom::Role::kAlert;
+  data_.id = id_.Get();
+}
+
+AlertPlatformNodeDelegate::~AlertPlatformNodeDelegate() {}
+
+gfx::AcceleratedWidget
+AlertPlatformNodeDelegate::GetTargetForNativeAccessibilityEvent() {
+  return parent_delegate_.GetTargetForNativeAccessibilityEvent();
+}
+
+gfx::NativeViewAccessible AlertPlatformNodeDelegate::GetParent() {
+  return parent_delegate_.GetNativeViewAccessible();
+}
+
+const ui::AXUniqueId& AlertPlatformNodeDelegate::GetUniqueId() const {
+  return id_;
+}
+
+const ui::AXNodeData& AlertPlatformNodeDelegate::GetData() const {
+  return data_;
+}
+
+void AlertPlatformNodeDelegate::SetText(const std::u16string& text) {
+  data_.SetName(text);
+  data_.SetDescription(text);
+  data_.SetValue(text);
+}
+
+}  // namespace flutter
diff --git a/shell/platform/common/alert_platform_node_delegate.h b/shell/platform/common/alert_platform_node_delegate.h
new file mode 100644
index 0000000000000000000000000000000000000000..135b1d13f7ed18236d495a7dfa7e3e397a29f1f3
--- /dev/null
+++ b/shell/platform/common/alert_platform_node_delegate.h
@@ -0,0 +1,50 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_COMMON_ALERT_PLATFORM_NODE_DELEGATE_H_
+#define FLUTTER_SHELL_PLATFORM_COMMON_ALERT_PLATFORM_NODE_DELEGATE_H_
+
+#include "flutter/fml/macros.h"
+#include "flutter/third_party/accessibility/ax/ax_node_data.h"
+#include "flutter/third_party/accessibility/ax/platform/ax_platform_node_delegate_base.h"
+
+namespace flutter {
+
+// A delegate for a node that holds the text of an a11y alert that a
+// screen-reader should announce. The delegate is used to construct an
+// AXPlatformNode, and in order to serve as an alert, only needs to be able to
+// hold a text announcement and make that text available to the platform node.
+class AlertPlatformNodeDelegate : public ui::AXPlatformNodeDelegateBase {
+ public:
+  explicit AlertPlatformNodeDelegate(
+      ui::AXPlatformNodeDelegate& parent_delegate);
+  ~AlertPlatformNodeDelegate();
+
+  // Set the alert text of the node for which this is the delegate.
+  void SetText(const std::u16string& text);
+
+  // |AXPlatformNodeDelegate|
+  gfx::NativeViewAccessible GetParent() override;
+
+ private:
+  // AXPlatformNodeDelegate overrides.
+  gfx::AcceleratedWidget GetTargetForNativeAccessibilityEvent() override;
+  const ui::AXUniqueId& GetUniqueId() const override;
+  const ui::AXNodeData& GetData() const override;
+
+  // Delegate of the parent of this node. Returned by GetParent.
+  ui::AXPlatformNodeDelegate& parent_delegate_;
+
+  // Node Data that contains the alert text. Returned by GetData.
+  ui::AXNodeData data_;
+
+  // A unique ID used to identify this node. Returned by GetUniqueId.
+  ui::AXUniqueId id_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(AlertPlatformNodeDelegate);
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_COMMON_ALERT_PLATFORM_NODE_DELEGATE_H_
diff --git a/shell/platform/common/app_lifecycle_state.h b/shell/platform/common/app_lifecycle_state.h
new file mode 100644
index 0000000000000000000000000000000000000000..fdce098b784781fb40856f2df7fe9dffb4b3c359
--- /dev/null
+++ b/shell/platform/common/app_lifecycle_state.h
@@ -0,0 +1,89 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_COMMON_APP_LIFECYCLE_STATE_H_
+#define FLUTTER_SHELL_PLATFORM_COMMON_APP_LIFECYCLE_STATE_H_
+
+namespace flutter {
+
+/**
+ * These constants describe the possible lifecycle states of the application.
+ * They must be kept up to date with changes in the framework's
+ * AppLifecycleState enum. They are passed to the embedder's |SetLifecycleState|
+ * function.
+ *
+ * States not supported on a platform will be synthesized by the framework when
+ * transitioning between states which are supported, so that all implementations
+ * share the same state machine.
+ *
+ * Here is the state machine:
+ *
+ *     +-----------+                               +-----------+
+ *     | detached  |------------------------------>|  resumed  |
+ *     +-----------+                               +-----------+
+ *          ^                                              ^
+ *          |                                              |
+ *          |                                              v
+ *     +-----------+        +--------------+       +-----------+
+ *     | paused    |<------>|    hidden    |<----->|  inactive |
+ *     +-----------+        +--------------+       +-----------+
+ */
+enum class AppLifecycleState {
+  /**
+   * Corresponds to the Framework's AppLifecycleState.detached: The initial
+   * state of the state machine. On Android, iOS, and web, also the final state
+   * of the state machine when all views are detached. Other platforms do not
+   * re-enter this state after initially leaving it.
+   */
+  kDetached,
+
+  /**
+   * Corresponds to the Framework's AppLifecycleState.resumed: The nominal
+   * "running" state of the application. The application is visible, has input
+   * focus, and is running.
+   */
+  kResumed,
+
+  /**
+   * Corresponds to the Framework's AppLifecycleState.inactive: At least one
+   * view of the application is visible, but none have input focus. The
+   * application is otherwise running normally.
+   */
+  kInactive,
+
+  /**
+   * Corresponds to the Framework's AppLifecycleState.hidden: All views of an
+   * application are hidden, either because the application is being stopped (on
+   * iOS and Android), or because it is being minimized or on a desktop that is
+   * no longer visible (on desktop), or on a tab that is no longer visible (on
+   * web).
+   */
+  kHidden,
+
+  /**
+   * Corresponds to the Framework's AppLifecycleState.paused: The application is
+   * not running, and can be detached or started again at any time. This state
+   * is typically only entered into on iOS and Android.
+   */
+  kPaused,
+};
+
+constexpr const char* AppLifecycleStateToString(AppLifecycleState state) {
+  switch (state) {
+    case AppLifecycleState::kDetached:
+      return "AppLifecycleState.detached";
+    case AppLifecycleState::kResumed:
+      return "AppLifecycleState.resumed";
+    case AppLifecycleState::kInactive:
+      return "AppLifecycleState.inactive";
+    case AppLifecycleState::kHidden:
+      return "AppLifecycleState.hidden";
+    case AppLifecycleState::kPaused:
+      return "AppLifecycleState.paused";
+  }
+}
+
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_COMMON_APP_LIFECYCLE_STATE_H_
diff --git a/shell/platform/common/client_wrapper/BUILD.gn b/shell/platform/common/client_wrapper/BUILD.gn
index 660f44403ef8da6d8d2ad7031e85a01ddf317090..91e7120b6573432d315d5c3795b658b79cc548b1 100644
--- a/shell/platform/common/client_wrapper/BUILD.gn
+++ b/shell/platform/common/client_wrapper/BUILD.gn
@@ -62,7 +62,7 @@ executable("client_wrapper_unittests") {
     # TODO(chunhtai): Consider refactoring flutter_root/testing so that there's a testing
     # target that doesn't require a Dart runtime to be linked in.
     # https://github.com/flutter/flutter/issues/41414.
-    "//third_party/dart/runtime:libdart_jit",
+    "$dart_src/runtime:libdart_jit",
   ]
 
   defines = [ "FLUTTER_DESKTOP_LIBRARY" ]
diff --git a/shell/platform/common/client_wrapper/basic_message_channel_unittests.cc b/shell/platform/common/client_wrapper/basic_message_channel_unittests.cc
index f38595c8c165a659a151de1cb8382f306d34c480..ba24f60b00f1cf8c44a43b4128e6887dee3aa558 100644
--- a/shell/platform/common/client_wrapper/basic_message_channel_unittests.cc
+++ b/shell/platform/common/client_wrapper/basic_message_channel_unittests.cc
@@ -9,6 +9,7 @@
 
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h"
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_message_codec.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_method_codec.h"
 #include "gtest/gtest.h"
 
 namespace flutter {
@@ -20,7 +21,12 @@ class TestBinaryMessenger : public BinaryMessenger {
   void Send(const std::string& channel,
             const uint8_t* message,
             const size_t message_size,
-            BinaryReply reply) const override {}
+            BinaryReply reply) const override {
+    send_called_ = true;
+    int length = static_cast<int>(message_size);
+    last_message_ =
+        std::vector<uint8_t>(message, message + length * sizeof(uint8_t));
+  }
 
   void SetMessageHandler(const std::string& channel,
                          BinaryMessageHandler handler) override {
@@ -28,15 +34,21 @@ class TestBinaryMessenger : public BinaryMessenger {
     last_message_handler_ = handler;
   }
 
+  bool send_called() { return send_called_; }
+
   std::string last_message_handler_channel() {
     return last_message_handler_channel_;
   }
 
   BinaryMessageHandler last_message_handler() { return last_message_handler_; }
 
+  std::vector<uint8_t> last_message() { return last_message_; }
+
  private:
+  mutable bool send_called_ = false;
   std::string last_message_handler_channel_;
   BinaryMessageHandler last_message_handler_;
+  mutable std::vector<uint8_t> last_message_;
 };
 
 }  // namespace
@@ -86,4 +98,68 @@ TEST(BasicMessageChannelTest, Unregistration) {
   EXPECT_EQ(messenger.last_message_handler(), nullptr);
 }
 
+// Tests that calling Resize generates the binary message expected by the Dart
+// implementation.
+TEST(BasicMessageChannelTest, Resize) {
+  TestBinaryMessenger messenger;
+  const std::string channel_name("flutter/test");
+  BasicMessageChannel channel(&messenger, channel_name,
+                              &flutter::StandardMessageCodec::GetInstance());
+
+  channel.Resize(3);
+
+  // Because the Dart implementation for the control channel implements its own
+  // custom deserialization logic, this test compares the generated bytes array
+  // to the expected one (for instance, the deserialization logic expects the
+  // size parameter of the resize method call to be an uint32).
+  //
+  // The expected content was created from the following Dart code:
+  //   MethodCall call = MethodCall('resize', ['flutter/test',3]);
+  //   StandardMethodCodec().encodeMethodCall(call).buffer.asUint8List();
+  const int expected_message_size = 29;
+
+  EXPECT_EQ(messenger.send_called(), true);
+  EXPECT_EQ(static_cast<int>(messenger.last_message().size()),
+            expected_message_size);
+
+  int expected[expected_message_size] = {
+      7,   6,   114, 101, 115, 105, 122, 101, 12,  2, 7, 12, 102, 108, 117,
+      116, 116, 101, 114, 47,  116, 101, 115, 116, 3, 3, 0,  0,   0};
+  for (int i = 0; i < expected_message_size; i++) {
+    EXPECT_EQ(messenger.last_message()[i], expected[i]);
+  }
+}
+
+// Tests that calling SetWarnsOnOverflow generates the binary message expected
+// by the Dart implementation.
+TEST(BasicMessageChannelTest, SetWarnsOnOverflow) {
+  TestBinaryMessenger messenger;
+
+  const std::string channel_name("flutter/test");
+  BasicMessageChannel channel(&messenger, channel_name,
+                              &flutter::StandardMessageCodec::GetInstance());
+
+  channel.SetWarnsOnOverflow(false);
+
+  // Because the Dart implementation for the control channel implements its own
+  // custom deserialization logic, this test compares the generated bytes array
+  // to the expected one.
+  //
+  // The expected content was created from the following Dart code:
+  //   MethodCall call = MethodCall('overflow',['flutter/test', true]);
+  //   StandardMethodCodec().encodeMethodCall(call).buffer.asUint8List();
+  const int expected_message_size = 27;
+
+  EXPECT_EQ(messenger.send_called(), true);
+  EXPECT_EQ(static_cast<int>(messenger.last_message().size()),
+            expected_message_size);
+
+  int expected[expected_message_size] = {
+      7,   8,   111, 118, 101, 114, 102, 108, 111, 119, 12,  2,   7, 12,
+      102, 108, 117, 116, 116, 101, 114, 47,  116, 101, 115, 116, 1};
+  for (int i = 0; i < expected_message_size; i++) {
+    EXPECT_EQ(messenger.last_message()[i], expected[i]);
+  }
+}
+
 }  // namespace flutter
diff --git a/shell/platform/common/client_wrapper/core_implementations.cc b/shell/platform/common/client_wrapper/core_implementations.cc
index 1eb5a5898117dadb1e15ffd2abf795788f120604..f682f1b22994eddb83c1161d857b94bb8df5705f 100644
--- a/shell/platform/common/client_wrapper/core_implementations.cc
+++ b/shell/platform/common/client_wrapper/core_implementations.cc
@@ -19,6 +19,8 @@
 
 #include "binary_messenger_impl.h"
 #include "include/flutter/engine_method_result.h"
+#include "include/flutter/method_channel.h"
+#include "include/flutter/standard_method_codec.h"
 #include "texture_registrar_impl.h"
 
 namespace flutter {
@@ -164,6 +166,46 @@ void ReplyManager::SendResponseData(const std::vector<uint8_t>* data) {
 
 }  // namespace internal
 
+// ========== method_channel.h ==========
+
+namespace {
+
+constexpr char kControlChannelName[] = "dev.flutter/channel-buffers";
+constexpr char kResizeMethod[] = "resize";
+constexpr char kOverflowMethod[] = "overflow";
+
+}  // namespace
+
+namespace internal {
+
+void ResizeChannel(BinaryMessenger* messenger, std::string name, int new_size) {
+  auto control_channel = std::make_unique<MethodChannel<EncodableValue>>(
+      messenger, kControlChannelName, &StandardMethodCodec::GetInstance());
+
+  // The deserialization logic handles only 32 bits values, see
+  // https://github.com/flutter/engine/blob/93e8901490e78c7ba7e319cce4470d9c6478c6dc/lib/ui/channel_buffers.dart#L495.
+  control_channel->InvokeMethod(
+      kResizeMethod, std::make_unique<EncodableValue>(EncodableList{
+                         EncodableValue(name),
+                         EncodableValue(static_cast<int32_t>(new_size)),
+                     }));
+}
+
+void SetChannelWarnsOnOverflow(BinaryMessenger* messenger,
+                               std::string name,
+                               bool warns) {
+  auto control_channel = std::make_unique<MethodChannel<EncodableValue>>(
+      messenger, kControlChannelName, &StandardMethodCodec::GetInstance());
+
+  control_channel->InvokeMethod(kOverflowMethod,
+                                std::make_unique<EncodableValue>(EncodableList{
+                                    EncodableValue(name),
+                                    EncodableValue(!warns),
+                                }));
+}
+
+}  // namespace internal
+
 // ========== texture_registrar_impl.h ==========
 
 TextureRegistrarImpl::TextureRegistrarImpl(
diff --git a/shell/platform/common/client_wrapper/event_channel_unittests.cc b/shell/platform/common/client_wrapper/event_channel_unittests.cc
index 58005fcffffcebfe9978ebb4de988655abc04ed5..0d68b10c83a5b421fd9ca4f75b4423a02533587c 100644
--- a/shell/platform/common/client_wrapper/event_channel_unittests.cc
+++ b/shell/platform/common/client_wrapper/event_channel_unittests.cc
@@ -274,4 +274,30 @@ TEST(EventChannelTest, HandlerOutlivesEventChannel) {
   EXPECT_EQ(on_cancel_called, true);
 }
 
+TEST(EventChannelTest, StreamHandlerErrorPassByValue) {
+  std::unique_ptr<StreamHandlerError<>> error = nullptr;
+
+  {
+    std::string code = "Code";
+    std::string msg = "Message";
+    std::unique_ptr<EncodableValue> details =
+        std::make_unique<EncodableValue>("Details");
+    error =
+        std::make_unique<StreamHandlerError<>>(code, msg, std::move(details));
+  }
+
+  ASSERT_NE(error.get(), nullptr);
+  EXPECT_EQ(error->error_code, "Code");
+  EXPECT_EQ(error->error_message, "Message");
+  EXPECT_EQ(std::get<std::string>(*error->error_details), "Details");
+}
+
+TEST(EventChannelTest, StreamHandlerErrorNullptr) {
+  std::unique_ptr<StreamHandlerError<>> error =
+      std::make_unique<StreamHandlerError<>>("Code", "Message", nullptr);
+
+  ASSERT_NE(error.get(), nullptr);
+  EXPECT_FALSE(error->error_details);
+}
+
 }  // namespace flutter
diff --git a/shell/platform/common/client_wrapper/include/flutter/basic_message_channel.h b/shell/platform/common/client_wrapper/include/flutter/basic_message_channel.h
index c0819465c5d79c6f67455006aec9c27229fa8b29..27c6cc93d6f50114ee6d1c16b33e3cf29da9719b 100644
--- a/shell/platform/common/client_wrapper/include/flutter/basic_message_channel.h
+++ b/shell/platform/common/client_wrapper/include/flutter/basic_message_channel.h
@@ -7,12 +7,33 @@
 
 #include <iostream>
 #include <string>
+#include <utility>
 
 #include "binary_messenger.h"
 #include "message_codec.h"
 
 namespace flutter {
 
+namespace internal {
+// Internal helper functions used by BasicMessageChannel and MethodChannel.
+
+// Adjusts the number of messages that will get buffered when sending messages
+// to channels that aren't fully set up yet. For example, the engine isn't
+// running yet or the channel's message handler isn't set up on the Dart side
+// yet.
+void ResizeChannel(BinaryMessenger* messenger, std::string name, int new_size);
+
+// Defines whether the channel should show warning messages when discarding
+// messages due to overflow.
+//
+// When |warns| is false, the channel is expected to overflow and warning
+// messages will not be shown.
+void SetChannelWarnsOnOverflow(BinaryMessenger* messenger,
+                               std::string name,
+                               bool warns);
+
+}  // namespace internal
+
 class EncodableValue;
 
 // A message reply callback.
@@ -58,7 +79,8 @@ class BasicMessageChannel {
   void Send(const T& message, BinaryReply reply) {
     std::unique_ptr<std::vector<uint8_t>> raw_message =
         codec_->EncodeMessage(message);
-    messenger_->Send(name_, raw_message->data(), raw_message->size(), reply);
+    messenger_->Send(name_, raw_message->data(), raw_message->size(),
+                     std::move(reply));
   }
 
   // Registers a handler that should be called any time a message is
@@ -77,7 +99,7 @@ class BasicMessageChannel {
     BinaryMessageHandler binary_handler = [handler, codec, channel_name](
                                               const uint8_t* binary_message,
                                               const size_t binary_message_size,
-                                              BinaryReply binary_reply) {
+                                              const BinaryReply& binary_reply) {
       // Use this channel's codec to decode the message and build a reply
       // handler.
       std::unique_ptr<T> message =
@@ -99,6 +121,23 @@ class BasicMessageChannel {
     messenger_->SetMessageHandler(name_, std::move(binary_handler));
   }
 
+  // Adjusts the number of messages that will get buffered when sending messages
+  // to channels that aren't fully set up yet. For example, the engine isn't
+  // running yet or the channel's message handler isn't set up on the Dart side
+  // yet.
+  void Resize(int new_size) {
+    internal::ResizeChannel(messenger_, name_, new_size);
+  }
+
+  // Defines whether the channel should show warning messages when discarding
+  // messages due to overflow.
+  //
+  // When |warns| is false, the channel is expected to overflow and warning
+  // messages will not be shown.
+  void SetWarnsOnOverflow(bool warns) {
+    internal::SetChannelWarnsOnOverflow(messenger_, name_, warns);
+  }
+
  private:
   BinaryMessenger* messenger_;
   std::string name_;
diff --git a/shell/platform/common/client_wrapper/include/flutter/encodable_value.h b/shell/platform/common/client_wrapper/include/flutter/encodable_value.h
index 3b46f99f63c331267c7f477ddf380ef379cb8688..3a191205bbef20769d02ae99eeb92128568e5bfa 100644
--- a/shell/platform/common/client_wrapper/include/flutter/encodable_value.h
+++ b/shell/platform/common/client_wrapper/include/flutter/encodable_value.h
@@ -215,6 +215,13 @@ class EncodableValue : public internal::EncodableValueVariant {
     }
     return std::get<int64_t>(*this);
   }
+
+  // Explicitly provide operator<, delegating to std::variant's operator<.
+  // There are issues with with the way the standard library-provided
+  // < and <=> comparisons interact with classes derived from variant.
+  friend bool operator<(const EncodableValue& lhs, const EncodableValue& rhs) {
+    return static_cast<const super&>(lhs) < static_cast<const super&>(rhs);
+  }
 };
 
 }  // namespace flutter
diff --git a/shell/platform/common/client_wrapper/include/flutter/event_channel.h b/shell/platform/common/client_wrapper/include/flutter/event_channel.h
index 08c242a2ff441c1d49f40deb12595d6fefad5a7c..1ff577a76d8c60154e1af61065dfb8c55e0247ab 100644
--- a/shell/platform/common/client_wrapper/include/flutter/event_channel.h
+++ b/shell/platform/common/client_wrapper/include/flutter/event_channel.h
@@ -69,7 +69,7 @@ class EventChannel {
          // Mutable state to track the handler's listening status.
          is_listening = bool(false)](const uint8_t* message,
                                      const size_t message_size,
-                                     BinaryReply reply) mutable {
+                                     const BinaryReply& reply) mutable {
           constexpr char kOnListenMethod[] = "listen";
           constexpr char kOnCancelMethod[] = "cancel";
 
@@ -106,7 +106,7 @@ class EventChannel {
             if (error) {
               result = codec->EncodeErrorEnvelope(error->error_code,
                                                   error->error_message,
-                                                  error->error_details);
+                                                  error->error_details.get());
             } else {
               result = codec->EncodeSuccessEnvelope();
             }
@@ -119,7 +119,7 @@ class EventChannel {
               if (error) {
                 result = codec->EncodeErrorEnvelope(error->error_code,
                                                     error->error_message,
-                                                    error->error_details);
+                                                    error->error_details.get());
               } else {
                 result = codec->EncodeSuccessEnvelope();
               }
diff --git a/shell/platform/common/client_wrapper/include/flutter/event_stream_handler.h b/shell/platform/common/client_wrapper/include/flutter/event_stream_handler.h
index 9eced6cf7061ed03578fca4872b46479371a4ebc..166733dd0661b95c82080ddf85d41d11f1e1e96f 100644
--- a/shell/platform/common/client_wrapper/include/flutter/event_stream_handler.h
+++ b/shell/platform/common/client_wrapper/include/flutter/event_stream_handler.h
@@ -5,6 +5,9 @@
 #ifndef FLUTTER_SHELL_PLATFORM_COMMON_CLIENT_WRAPPER_INCLUDE_FLUTTER_EVENT_STREAM_HANDLER_H_
 #define FLUTTER_SHELL_PLATFORM_COMMON_CLIENT_WRAPPER_INCLUDE_FLUTTER_EVENT_STREAM_HANDLER_H_
 
+#include <memory>
+#include <string>
+
 #include "event_sink.h"
 
 namespace flutter {
@@ -13,16 +16,16 @@ class EncodableValue;
 
 template <typename T = EncodableValue>
 struct StreamHandlerError {
-  const std::string& error_code;
-  const std::string& error_message;
-  const T* error_details;
+  const std::string error_code;
+  const std::string error_message;
+  const std::unique_ptr<T> error_details;
 
   StreamHandlerError(const std::string& error_code,
                      const std::string& error_message,
-                     const T* error_details)
+                     std::unique_ptr<T>&& error_details)
       : error_code(error_code),
         error_message(error_message),
-        error_details(error_details) {}
+        error_details(std::move(error_details)) {}
 };
 
 // Handler for stream setup and teardown requests.
diff --git a/shell/platform/common/client_wrapper/include/flutter/method_call.h b/shell/platform/common/client_wrapper/include/flutter/method_call.h
index f9a9c287edb7f3207154538f8f92a15fd17f762b..3ddf71cefa7f48964078cb927d5b0cec24e80240 100644
--- a/shell/platform/common/client_wrapper/include/flutter/method_call.h
+++ b/shell/platform/common/client_wrapper/include/flutter/method_call.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_COMMON_CLIENT_WRAPPER_INCLUDE_FLUTTER_TYPED_METHOD_CALL_H_
-#define FLUTTER_SHELL_PLATFORM_COMMON_CLIENT_WRAPPER_INCLUDE_FLUTTER_TYPED_METHOD_CALL_H_
+#ifndef FLUTTER_SHELL_PLATFORM_COMMON_CLIENT_WRAPPER_INCLUDE_FLUTTER_METHOD_CALL_H_
+#define FLUTTER_SHELL_PLATFORM_COMMON_CLIENT_WRAPPER_INCLUDE_FLUTTER_METHOD_CALL_H_
 
 #include <memory>
 #include <string>
@@ -40,4 +40,4 @@ class MethodCall {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_COMMON_CLIENT_WRAPPER_INCLUDE_FLUTTER_TYPED_METHOD_CALL_H_
+#endif  // FLUTTER_SHELL_PLATFORM_COMMON_CLIENT_WRAPPER_INCLUDE_FLUTTER_METHOD_CALL_H_
diff --git a/shell/platform/common/client_wrapper/include/flutter/method_channel.h b/shell/platform/common/client_wrapper/include/flutter/method_channel.h
index e9ed6161c4bc4e77e53c34cd8b4ad838d8c6edc6..a4029fccf7a5c1da51dcdabf13aacff0074428e7 100644
--- a/shell/platform/common/client_wrapper/include/flutter/method_channel.h
+++ b/shell/platform/common/client_wrapper/include/flutter/method_channel.h
@@ -8,6 +8,7 @@
 #include <iostream>
 #include <string>
 
+#include "basic_message_channel.h"
 #include "binary_messenger.h"
 #include "engine_method_result.h"
 #include "method_call.h"
@@ -91,9 +92,10 @@ class MethodChannel {
   // Registers a handler that should be called any time a method call is
   // received on this channel. A null handler will remove any previous handler.
   //
-  // Note that the MethodChannel does not own the handler, and will not
-  // unregister it on destruction, so the caller is responsible for
-  // unregistering explicitly if it should no longer be called.
+  // The handler will be owned by the underlying BinaryMessageHandler.
+  // Destroying the MethodChannel will not unregister the handler, so
+  // the caller is responsible for unregistering explicitly if the handler
+  // stops being valid before the engine is destroyed.
   void SetMethodCallHandler(MethodCallHandler<T> handler) const {
     if (!handler) {
       messenger_->SetMessageHandler(name_, nullptr);
@@ -121,6 +123,23 @@ class MethodChannel {
     messenger_->SetMessageHandler(name_, std::move(binary_handler));
   }
 
+  // Adjusts the number of messages that will get buffered when sending messages
+  // to channels that aren't fully set up yet. For example, the engine isn't
+  // running yet or the channel's message handler isn't set up on the Dart side
+  // yet.
+  void Resize(int new_size) {
+    internal::ResizeChannel(messenger_, name_, new_size);
+  }
+
+  // Defines whether the channel should show warning messages when discarding
+  // messages due to overflow.
+  //
+  // When |warns| is false, the channel is expected to overflow and warning
+  // messages will not be shown.
+  void SetWarnsOnOverflow(bool warns) {
+    internal::SetChannelWarnsOnOverflow(messenger_, name_, warns);
+  }
+
  private:
   BinaryMessenger* messenger_;
   std::string name_;
diff --git a/shell/platform/common/client_wrapper/include/flutter/method_result_functions.h b/shell/platform/common/client_wrapper/include/flutter/method_result_functions.h
index a19cc349d1911d389a0a7444a97b9a3306543dfe..57f6d0e9b88629ba3b4a25aadeb61c70faa1a788 100644
--- a/shell/platform/common/client_wrapper/include/flutter/method_result_functions.h
+++ b/shell/platform/common/client_wrapper/include/flutter/method_result_functions.h
@@ -7,6 +7,7 @@
 
 #include <functional>
 #include <string>
+#include <utility>
 
 #include "method_result.h"
 
@@ -36,7 +37,7 @@ class MethodResultFunctions : public MethodResult<T> {
                         ResultHandlerNotImplemented<T> on_not_implemented)
       : on_success_(on_success),
         on_error_(on_error),
-        on_not_implemented_(on_not_implemented) {}
+        on_not_implemented_(std::move(on_not_implemented)) {}
 
   virtual ~MethodResultFunctions() = default;
 
diff --git a/shell/platform/common/client_wrapper/include/flutter/plugin_registrar.h b/shell/platform/common/client_wrapper/include/flutter/plugin_registrar.h
index 858119e38b411ca96ae1fd913e0c31af1ec063e4..e21f472b6be0a5d5a64e057e05e845e26662699d 100644
--- a/shell/platform/common/client_wrapper/include/flutter/plugin_registrar.h
+++ b/shell/platform/common/client_wrapper/include/flutter/plugin_registrar.h
@@ -49,12 +49,12 @@ class PluginRegistrar {
   // Takes ownership of |plugin|.
   //
   // Plugins are not required to call this method if they have other lifetime
-  // management, but this is a convient place for plugins to be owned to ensure
-  // that they stay valid for any registered callbacks.
+  // management, but this is a convenient place for plugins to be owned to
+  // ensure that they stay valid for any registered callbacks.
   void AddPlugin(std::unique_ptr<Plugin> plugin);
 
  protected:
-  FlutterDesktopPluginRegistrarRef registrar() { return registrar_; }
+  FlutterDesktopPluginRegistrarRef registrar() const { return registrar_; }
 
   // Destroys all owned plugins. Subclasses should call this at the beginning of
   // their destructors to prevent the possibility of an owned plugin trying to
diff --git a/shell/platform/common/client_wrapper/include/flutter/texture_registrar.h b/shell/platform/common/client_wrapper/include/flutter/texture_registrar.h
index 47daf7c42fbcd55914bba5930e7e8ef59b148623..a536dcfa01b87068036741580922c95f1bd96646 100644
--- a/shell/platform/common/client_wrapper/include/flutter/texture_registrar.h
+++ b/shell/platform/common/client_wrapper/include/flutter/texture_registrar.h
@@ -10,6 +10,7 @@
 #include <cstdint>
 #include <functional>
 #include <memory>
+#include <utility>
 #include <variant>
 
 namespace flutter {
@@ -28,7 +29,7 @@ class PixelBufferTexture {
   // take care of proper synchronization. It also needs to be ensured that the
   // returned buffer isn't released prior to unregistering this texture.
   explicit PixelBufferTexture(CopyBufferCallback copy_buffer_callback)
-      : copy_buffer_callback_(copy_buffer_callback) {}
+      : copy_buffer_callback_(std::move(copy_buffer_callback)) {}
 
   // Returns the callback-provided FlutterDesktopPixelBuffer that contains the
   // actual pixel data. The intended surface size is specified by |width| and
@@ -53,7 +54,7 @@ class GpuSurfaceTexture {
   GpuSurfaceTexture(FlutterDesktopGpuSurfaceType surface_type,
                     ObtainDescriptorCallback obtain_descriptor_callback)
       : surface_type_(surface_type),
-        obtain_descriptor_callback_(obtain_descriptor_callback) {}
+        obtain_descriptor_callback_(std::move(obtain_descriptor_callback)) {}
 
   // Returns the callback-provided FlutterDesktopGpuSurfaceDescriptor that
   // contains the surface handle. The intended surface size is specified by
diff --git a/shell/platform/common/client_wrapper/method_channel_unittests.cc b/shell/platform/common/client_wrapper/method_channel_unittests.cc
index 55c4529edd581d243cbdbc41057ef74890850d93..2edce72a566c6aa2c47cbd07507ae232ed6fa59f 100644
--- a/shell/platform/common/client_wrapper/method_channel_unittests.cc
+++ b/shell/platform/common/client_wrapper/method_channel_unittests.cc
@@ -24,6 +24,9 @@ class TestBinaryMessenger : public BinaryMessenger {
             BinaryReply reply) const override {
     send_called_ = true;
     last_reply_handler_ = reply;
+    int length = static_cast<int>(message_size);
+    last_message_ =
+        std::vector<uint8_t>(message, message + length * sizeof(uint8_t));
   }
 
   void SetMessageHandler(const std::string& channel,
@@ -42,11 +45,14 @@ class TestBinaryMessenger : public BinaryMessenger {
 
   BinaryMessageHandler last_message_handler() { return last_message_handler_; }
 
+  std::vector<uint8_t> last_message() { return last_message_; }
+
  private:
   mutable bool send_called_ = false;
   mutable BinaryReply last_reply_handler_;
   std::string last_message_handler_channel_;
   BinaryMessageHandler last_message_handler_;
+  mutable std::vector<uint8_t> last_message_;
 };
 
 }  // namespace
@@ -156,4 +162,64 @@ TEST(MethodChannelTest, InvokeNotImplemented) {
   EXPECT_TRUE(received_not_implemented);
 }
 
+// Tests that calling Resize generates the binary message expected by the Dart
+// implementation.
+TEST(MethodChannelTest, Resize) {
+  TestBinaryMessenger messenger;
+  const std::string channel_name("flutter/test");
+  MethodChannel channel(&messenger, channel_name,
+                        &StandardMethodCodec::GetInstance());
+
+  channel.Resize(3);
+
+  // Because the Dart implementation for the control channel implements its own
+  // custom deserialization logic, this test compares the generated bytes array
+  // to the expected one (for instance, the deserialization logic expects the
+  // size parameter of the resize method call to be an uint32).
+  //
+  // The expected content was created from the following Dart code:
+  //   MethodCall call = MethodCall('resize', ['flutter/test',3]);
+  //   StandardMethodCodec().encodeMethodCall(call).buffer.asUint8List();
+  const int expected_message_size = 29;
+
+  EXPECT_EQ(messenger.send_called(), true);
+  EXPECT_EQ(static_cast<int>(messenger.last_message().size()),
+            expected_message_size);
+
+  int expected[expected_message_size] = {
+      7,   6,   114, 101, 115, 105, 122, 101, 12,  2, 7, 12, 102, 108, 117,
+      116, 116, 101, 114, 47,  116, 101, 115, 116, 3, 3, 0,  0,   0};
+  for (int i = 0; i < expected_message_size; i++) {
+    EXPECT_EQ(messenger.last_message()[i], expected[i]);
+  }
+}
+
+// Tests that calling SetWarnsOnOverflow generates the binary message expected
+// by the Dart implementation.
+TEST(MethodChannelTest, SetWarnsOnOverflow) {
+  TestBinaryMessenger messenger;
+
+  const std::string channel_name("flutter/test");
+  MethodChannel channel(&messenger, channel_name,
+                        &StandardMethodCodec::GetInstance());
+
+  channel.SetWarnsOnOverflow(false);
+
+  // The expected content was created from the following Dart code:
+  //   MethodCall call = MethodCall('overflow',['flutter/test', true]);
+  //   StandardMethodCodec().encodeMethodCall(call).buffer.asUint8List();
+  const int expected_message_size = 27;
+
+  EXPECT_EQ(messenger.send_called(), true);
+  EXPECT_EQ(static_cast<int>(messenger.last_message().size()),
+            expected_message_size);
+
+  int expected[expected_message_size] = {
+      7,   8,   111, 118, 101, 114, 102, 108, 111, 119, 12,  2,   7, 12,
+      102, 108, 117, 116, 116, 101, 114, 47,  116, 101, 115, 116, 1};
+  for (int i = 0; i < expected_message_size; i++) {
+    EXPECT_EQ(messenger.last_message()[i], expected[i]);
+  }
+}
+
 }  // namespace flutter
diff --git a/shell/platform/common/client_wrapper/standard_codec.cc b/shell/platform/common/client_wrapper/standard_codec.cc
index c5c80ae5c2f27353e554bbcdf169599118c05221..5e93d407c2c0eebf2afcabad33f14e9f9ef28217 100644
--- a/shell/platform/common/client_wrapper/standard_codec.cc
+++ b/shell/platform/common/client_wrapper/standard_codec.cc
@@ -98,7 +98,7 @@ EncodableValue StandardCodecSerializer::ReadValue(
 void StandardCodecSerializer::WriteValue(const EncodableValue& value,
                                          ByteStreamWriter* stream) const {
   stream->WriteByte(static_cast<uint8_t>(EncodedTypeForValue(value)));
-  // TODO(cbracken): Consider replacing this this with std::visit.
+  // TODO(cbracken): Consider replacing this with std::visit.
   switch (value.index()) {
     case 0:
     case 1:
diff --git a/shell/platform/common/client_wrapper/standard_message_codec_unittests.cc b/shell/platform/common/client_wrapper/standard_message_codec_unittests.cc
index df02aae2e77f93d013c14afaa974747d55c03b4d..afe7247025f58f9d989a868f442a0971e72b2e09 100644
--- a/shell/platform/common/client_wrapper/standard_message_codec_unittests.cc
+++ b/shell/platform/common/client_wrapper/standard_message_codec_unittests.cc
@@ -17,11 +17,14 @@ namespace {
 
 class MockStandardCodecSerializer : public StandardCodecSerializer {
  public:
-  MOCK_CONST_METHOD2(WriteValue,
-                     void(const EncodableValue& value,
-                          ByteStreamWriter* stream));
-  MOCK_CONST_METHOD2(ReadValueOfType,
-                     EncodableValue(uint8_t type, ByteStreamReader* stream));
+  MOCK_METHOD(void,
+              WriteValue,
+              (const EncodableValue& value, ByteStreamWriter* stream),
+              (const, override));
+  MOCK_METHOD(EncodableValue,
+              ReadValueOfType,
+              (uint8_t type, ByteStreamReader* stream),
+              (const, override));
 };
 }  // namespace
 
diff --git a/shell/platform/common/client_wrapper/testing/test_codec_extensions.h b/shell/platform/common/client_wrapper/testing/test_codec_extensions.h
index 29f81a4a82b9925b9c46e3de7d9929f4ad982bf3..7b10dd47fbe32a88a6d993e5fd81eb7e026c8ff0 100644
--- a/shell/platform/common/client_wrapper/testing/test_codec_extensions.h
+++ b/shell/platform/common/client_wrapper/testing/test_codec_extensions.h
@@ -32,7 +32,7 @@ class Point {
 // variable-length type that includes types handled by the core standard codec.
 class SomeData {
  public:
-  SomeData(const std::string label, const std::vector<uint8_t>& data)
+  SomeData(const std::string& label, const std::vector<uint8_t>& data)
       : label_(label), data_(data) {}
   ~SomeData() = default;
 
diff --git a/shell/platform/common/flutter_platform_node_delegate.cc b/shell/platform/common/flutter_platform_node_delegate.cc
index cf5464fc861baeb8d7eb4bad67d7ba428bce112d..9e4e8a4a2b1114626e40552432a19fb6c321e5b8 100644
--- a/shell/platform/common/flutter_platform_node_delegate.cc
+++ b/shell/platform/common/flutter_platform_node_delegate.cc
@@ -6,7 +6,9 @@
 
 #include <utility>
 
+#include "flutter/shell/platform/common/accessibility_bridge.h"
 #include "flutter/third_party/accessibility/ax/ax_action_data.h"
+#include "flutter/third_party/accessibility/ax/ax_tree_manager_map.h"
 #include "flutter/third_party/accessibility/gfx/geometry/rect_conversions.h"
 
 namespace flutter {
@@ -114,4 +116,50 @@ FlutterPlatformNodeDelegate::GetOwnerBridge() const {
   return bridge_;
 }
 
+ui::AXPlatformNode* FlutterPlatformNodeDelegate::GetPlatformNode() const {
+  return nullptr;
+}
+
+gfx::NativeViewAccessible
+FlutterPlatformNodeDelegate::GetLowestPlatformAncestor() const {
+  auto bridge_ptr = bridge_.lock();
+  BASE_DCHECK(bridge_ptr);
+  auto lowest_platform_ancestor = ax_node_->GetLowestPlatformAncestor();
+  if (lowest_platform_ancestor) {
+    return bridge_ptr->GetNativeAccessibleFromId(
+        ax_node_->GetLowestPlatformAncestor()->id());
+  }
+  return nullptr;
+}
+
+ui::AXNodePosition::AXPositionInstance
+FlutterPlatformNodeDelegate::CreateTextPositionAt(int offset) const {
+  return ui::AXNodePosition::CreatePosition(*ax_node_, offset);
+}
+
+ui::AXPlatformNode* FlutterPlatformNodeDelegate::GetFromNodeID(
+    int32_t node_id) {
+  ui::AXTreeManager* tree_manager =
+      ui::AXTreeManagerMap::GetInstance().GetManager(
+          ax_node_->tree()->GetAXTreeID());
+  AccessibilityBridge* platform_manager =
+      static_cast<AccessibilityBridge*>(tree_manager);
+  return platform_manager->GetPlatformNodeFromTree(node_id);
+}
+
+ui::AXPlatformNode* FlutterPlatformNodeDelegate::GetFromTreeIDAndNodeID(
+    const ui::AXTreeID& tree_id,
+    int32_t node_id) {
+  ui::AXTreeManager* tree_manager =
+      ui::AXTreeManagerMap::GetInstance().GetManager(tree_id);
+  AccessibilityBridge* platform_manager =
+      static_cast<AccessibilityBridge*>(tree_manager);
+  return platform_manager->GetPlatformNodeFromTree(node_id);
+}
+
+const ui::AXTree::Selection FlutterPlatformNodeDelegate::GetUnignoredSelection()
+    const {
+  return ax_node_->GetUnignoredSelection();
+}
+
 }  // namespace flutter
diff --git a/shell/platform/common/flutter_platform_node_delegate.h b/shell/platform/common/flutter_platform_node_delegate.h
index 2878fe45afe92fd6fa41ec4906f2cfebae8efd73..6172f4f86b9f2d033dbe758430f793b46cdbc0cb 100644
--- a/shell/platform/common/flutter_platform_node_delegate.h
+++ b/shell/platform/common/flutter_platform_node_delegate.h
@@ -125,6 +125,13 @@ class FlutterPlatformNodeDelegate : public ui::AXPlatformNodeDelegateBase {
       const ui::AXClippingBehavior clipping_behavior,
       ui::AXOffscreenResult* offscreen_result) const override;
 
+  // |ui::AXPlatformNodeDelegateBase|
+  gfx::NativeViewAccessible GetLowestPlatformAncestor() const override;
+
+  // |ui::AXPlatformNodeDelegateBase|
+  ui::AXNodePosition::AXPositionInstance CreateTextPositionAt(
+      int offset) const override;
+
   //------------------------------------------------------------------------------
   /// @brief      Called only once, immediately after construction. The
   ///             constructor doesn't take any arguments because in the Windows
@@ -144,6 +151,20 @@ class FlutterPlatformNodeDelegate : public ui::AXPlatformNodeDelegateBase {
   ///             platform thread.
   std::weak_ptr<OwnerBridge> GetOwnerBridge() const;
 
+  // Get the platform node represented by this delegate.
+  virtual ui::AXPlatformNode* GetPlatformNode() const;
+
+  // |ui::AXPlatformNodeDelegateBase|
+  virtual ui::AXPlatformNode* GetFromNodeID(int32_t id) override;
+
+  // |ui::AXPlatformNodeDelegateBase|
+  virtual ui::AXPlatformNode* GetFromTreeIDAndNodeID(
+      const ui::AXTreeID& tree_id,
+      int32_t node_id) override;
+
+  // |ui::AXPlatformNodeDelegateBase|
+  virtual const ui::AXTree::Selection GetUnignoredSelection() const override;
+
  private:
   ui::AXNode* ax_node_;
   std::weak_ptr<OwnerBridge> bridge_;
diff --git a/shell/platform/common/flutter_platform_node_delegate_unittests.cc b/shell/platform/common/flutter_platform_node_delegate_unittests.cc
index cc91ae050673631c87d84309035d66425727e39f..00e3240fa4f6c57c5f8225a9a315e3d36927ce79 100644
--- a/shell/platform/common/flutter_platform_node_delegate_unittests.cc
+++ b/shell/platform/common/flutter_platform_node_delegate_unittests.cc
@@ -17,19 +17,19 @@ TEST(FlutterPlatformNodeDelegateTest, NodeDelegateHasUniqueId) {
       std::make_shared<TestAccessibilityBridge>();
 
   // Add node 0: root.
-  FlutterSemanticsNode node0{sizeof(FlutterSemanticsNode), 0};
+  FlutterSemanticsNode2 node0{sizeof(FlutterSemanticsNode2), 0};
   std::vector<int32_t> node0_children{1};
   node0.child_count = node0_children.size();
   node0.children_in_traversal_order = node0_children.data();
   node0.children_in_hit_test_order = node0_children.data();
 
   // Add node 1: text child of node 0.
-  FlutterSemanticsNode node1{sizeof(FlutterSemanticsNode), 1};
+  FlutterSemanticsNode2 node1{sizeof(FlutterSemanticsNode2), 1};
   node1.label = "prefecture";
   node1.value = "Kyoto";
 
-  bridge->AddFlutterSemanticsNodeUpdate(&node0);
-  bridge->AddFlutterSemanticsNodeUpdate(&node1);
+  bridge->AddFlutterSemanticsNodeUpdate(node0);
+  bridge->AddFlutterSemanticsNodeUpdate(node1);
   bridge->CommitUpdates();
 
   auto node0_delegate = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
@@ -40,7 +40,7 @@ TEST(FlutterPlatformNodeDelegateTest, NodeDelegateHasUniqueId) {
 TEST(FlutterPlatformNodeDelegateTest, canPerfomActions) {
   std::shared_ptr<TestAccessibilityBridge> bridge =
       std::make_shared<TestAccessibilityBridge>();
-  FlutterSemanticsNode root;
+  FlutterSemanticsNode2 root;
   root.id = 0;
   root.flags = FlutterSemanticsFlag::kFlutterSemanticsFlagIsTextField;
   root.actions = static_cast<FlutterSemanticsAction>(0);
@@ -54,7 +54,7 @@ TEST(FlutterPlatformNodeDelegateTest, canPerfomActions) {
   root.tooltip = "";
   root.child_count = 0;
   root.custom_accessibility_actions_count = 0;
-  bridge->AddFlutterSemanticsNodeUpdate(&root);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
 
   bridge->CommitUpdates();
 
@@ -85,7 +85,7 @@ TEST(FlutterPlatformNodeDelegateTest, canGetAXNode) {
   // Set up a flutter accessibility node.
   std::shared_ptr<TestAccessibilityBridge> bridge =
       std::make_shared<TestAccessibilityBridge>();
-  FlutterSemanticsNode root;
+  FlutterSemanticsNode2 root;
   root.id = 0;
   root.flags = FlutterSemanticsFlag::kFlutterSemanticsFlagIsTextField;
   root.actions = static_cast<FlutterSemanticsAction>(0);
@@ -99,7 +99,7 @@ TEST(FlutterPlatformNodeDelegateTest, canGetAXNode) {
   root.tooltip = "";
   root.child_count = 0;
   root.custom_accessibility_actions_count = 0;
-  bridge->AddFlutterSemanticsNodeUpdate(&root);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
 
   bridge->CommitUpdates();
 
@@ -110,7 +110,7 @@ TEST(FlutterPlatformNodeDelegateTest, canGetAXNode) {
 TEST(FlutterPlatformNodeDelegateTest, canCalculateBoundsCorrectly) {
   std::shared_ptr<TestAccessibilityBridge> bridge =
       std::make_shared<TestAccessibilityBridge>();
-  FlutterSemanticsNode root;
+  FlutterSemanticsNode2 root;
   root.id = 0;
   root.label = "root";
   root.hint = "";
@@ -124,9 +124,9 @@ TEST(FlutterPlatformNodeDelegateTest, canCalculateBoundsCorrectly) {
   root.custom_accessibility_actions_count = 0;
   root.rect = {0, 0, 100, 100};  // LTRB
   root.transform = {1, 0, 0, 0, 1, 0, 0, 0, 1};
-  bridge->AddFlutterSemanticsNodeUpdate(&root);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
 
-  FlutterSemanticsNode child1;
+  FlutterSemanticsNode2 child1;
   child1.id = 1;
   child1.label = "child 1";
   child1.hint = "";
@@ -138,7 +138,7 @@ TEST(FlutterPlatformNodeDelegateTest, canCalculateBoundsCorrectly) {
   child1.custom_accessibility_actions_count = 0;
   child1.rect = {0, 0, 50, 50};  // LTRB
   child1.transform = {0.5, 0, 0, 0, 0.5, 0, 0, 0, 1};
-  bridge->AddFlutterSemanticsNodeUpdate(&child1);
+  bridge->AddFlutterSemanticsNodeUpdate(child1);
 
   bridge->CommitUpdates();
   auto child1_node = bridge->GetFlutterPlatformNodeDelegateFromID(1).lock();
@@ -156,7 +156,7 @@ TEST(FlutterPlatformNodeDelegateTest, canCalculateBoundsCorrectly) {
 TEST(FlutterPlatformNodeDelegateTest, canCalculateOffScreenBoundsCorrectly) {
   std::shared_ptr<TestAccessibilityBridge> bridge =
       std::make_shared<TestAccessibilityBridge>();
-  FlutterSemanticsNode root;
+  FlutterSemanticsNode2 root;
   root.id = 0;
   root.label = "root";
   root.hint = "";
@@ -170,9 +170,9 @@ TEST(FlutterPlatformNodeDelegateTest, canCalculateOffScreenBoundsCorrectly) {
   root.custom_accessibility_actions_count = 0;
   root.rect = {0, 0, 100, 100};  // LTRB
   root.transform = {1, 0, 0, 0, 1, 0, 0, 0, 1};
-  bridge->AddFlutterSemanticsNodeUpdate(&root);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
 
-  FlutterSemanticsNode child1;
+  FlutterSemanticsNode2 child1;
   child1.id = 1;
   child1.label = "child 1";
   child1.hint = "";
@@ -184,7 +184,7 @@ TEST(FlutterPlatformNodeDelegateTest, canCalculateOffScreenBoundsCorrectly) {
   child1.custom_accessibility_actions_count = 0;
   child1.rect = {90, 90, 100, 100};  // LTRB
   child1.transform = {2, 0, 0, 0, 2, 0, 0, 0, 1};
-  bridge->AddFlutterSemanticsNodeUpdate(&child1);
+  bridge->AddFlutterSemanticsNodeUpdate(child1);
 
   bridge->CommitUpdates();
   auto child1_node = bridge->GetFlutterPlatformNodeDelegateFromID(1).lock();
@@ -202,7 +202,7 @@ TEST(FlutterPlatformNodeDelegateTest, canCalculateOffScreenBoundsCorrectly) {
 TEST(FlutterPlatformNodeDelegateTest, canUseOwnerBridge) {
   std::shared_ptr<TestAccessibilityBridge> bridge =
       std::make_shared<TestAccessibilityBridge>();
-  FlutterSemanticsNode root;
+  FlutterSemanticsNode2 root;
   root.id = 0;
   root.label = "root";
   root.hint = "";
@@ -216,9 +216,9 @@ TEST(FlutterPlatformNodeDelegateTest, canUseOwnerBridge) {
   root.custom_accessibility_actions_count = 0;
   root.rect = {0, 0, 100, 100};  // LTRB
   root.transform = {1, 0, 0, 0, 1, 0, 0, 0, 1};
-  bridge->AddFlutterSemanticsNodeUpdate(&root);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
 
-  FlutterSemanticsNode child1;
+  FlutterSemanticsNode2 child1;
   child1.id = 1;
   child1.label = "child 1";
   child1.hint = "";
@@ -230,7 +230,7 @@ TEST(FlutterPlatformNodeDelegateTest, canUseOwnerBridge) {
   child1.custom_accessibility_actions_count = 0;
   child1.rect = {0, 0, 50, 50};  // LTRB
   child1.transform = {0.5, 0, 0, 0, 0.5, 0, 0, 0, 1};
-  bridge->AddFlutterSemanticsNodeUpdate(&child1);
+  bridge->AddFlutterSemanticsNodeUpdate(child1);
 
   bridge->CommitUpdates();
   auto child1_node = bridge->GetFlutterPlatformNodeDelegateFromID(1).lock();
@@ -246,5 +246,63 @@ TEST(FlutterPlatformNodeDelegateTest, canUseOwnerBridge) {
   EXPECT_EQ(result, false);
 }
 
+TEST(FlutterPlatformNodeDelegateTest, selfIsLowestPlatformAncestor) {
+  std::shared_ptr<TestAccessibilityBridge> bridge =
+      std::make_shared<TestAccessibilityBridge>();
+  FlutterSemanticsNode2 root;
+  root.id = 0;
+  root.label = "root";
+  root.hint = "";
+  root.value = "";
+  root.increased_value = "";
+  root.decreased_value = "";
+  root.tooltip = "";
+  root.child_count = 0;
+  root.children_in_traversal_order = nullptr;
+  root.custom_accessibility_actions_count = 0;
+  bridge->AddFlutterSemanticsNodeUpdate(root);
+
+  bridge->CommitUpdates();
+  auto root_node = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
+  auto lowest_platform_ancestor = root_node->GetLowestPlatformAncestor();
+  EXPECT_EQ(root_node->GetNativeViewAccessible(), lowest_platform_ancestor);
+}
+
+TEST(FlutterPlatformNodeDelegateTest, canGetFromNodeID) {
+  std::shared_ptr<TestAccessibilityBridge> bridge =
+      std::make_shared<TestAccessibilityBridge>();
+  FlutterSemanticsNode2 root;
+  root.id = 0;
+  root.label = "root";
+  root.hint = "";
+  root.value = "";
+  root.increased_value = "";
+  root.decreased_value = "";
+  root.tooltip = "";
+  root.child_count = 1;
+  int32_t children[] = {1};
+  root.children_in_traversal_order = children;
+  root.custom_accessibility_actions_count = 0;
+  bridge->AddFlutterSemanticsNodeUpdate(root);
+
+  FlutterSemanticsNode2 child1;
+  child1.id = 1;
+  child1.label = "child 1";
+  child1.hint = "";
+  child1.value = "";
+  child1.increased_value = "";
+  child1.decreased_value = "";
+  child1.tooltip = "";
+  child1.child_count = 0;
+  child1.custom_accessibility_actions_count = 0;
+  bridge->AddFlutterSemanticsNodeUpdate(child1);
+
+  bridge->CommitUpdates();
+  auto root_node = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
+  auto child1_node = bridge->GetFlutterPlatformNodeDelegateFromID(1).lock();
+  auto node_by_id = root_node->GetFromNodeID(1);
+  EXPECT_EQ(child1_node->GetPlatformNode(), node_by_id);
+}
+
 }  // namespace testing
 }  // namespace flutter
diff --git a/shell/platform/common/incoming_message_dispatcher.h b/shell/platform/common/incoming_message_dispatcher.h
index 6900654254958326d0c336b42c96b5a03e99c386..2152b05818da78afc0c8b3eb83866219e4dd2067 100644
--- a/shell/platform/common/incoming_message_dispatcher.h
+++ b/shell/platform/common/incoming_message_dispatcher.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_CPP_INCOMING_MESSAGE_DISPATCHER_H_
-#define FLUTTER_SHELL_PLATFORM_CPP_INCOMING_MESSAGE_DISPATCHER_H_
+#ifndef FLUTTER_SHELL_PLATFORM_COMMON_INCOMING_MESSAGE_DISPATCHER_H_
+#define FLUTTER_SHELL_PLATFORM_COMMON_INCOMING_MESSAGE_DISPATCHER_H_
 
 #include <functional>
 #include <map>
@@ -30,7 +30,7 @@ class IncomingMessageDispatcher {
   IncomingMessageDispatcher& operator=(IncomingMessageDispatcher const&) =
       delete;
 
-  // Routes |message| to to the registered handler for its channel, if any.
+  // Routes |message| to the registered handler for its channel, if any.
   //
   // If input blocking has been enabled on that channel, wraps the call to the
   // handler with calls to the given callbacks to block and then unblock input.
@@ -75,4 +75,4 @@ class IncomingMessageDispatcher {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_CPP_INCOMING_MESSAGE_DISPATCHER_H_
+#endif  // FLUTTER_SHELL_PLATFORM_COMMON_INCOMING_MESSAGE_DISPATCHER_H_
diff --git a/shell/platform/common/path_utils.h b/shell/platform/common/path_utils.h
index 62cd3fd840a9ea811f2e4d79315239dc5f3b0e54..e608430473162ffd91d06f5d33984b7c330eb850 100644
--- a/shell/platform/common/path_utils.h
+++ b/shell/platform/common/path_utils.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_GLFW_PATH_UTILS_H_
-#define FLUTTER_SHELL_PLATFORM_GLFW_PATH_UTILS_H_
+#ifndef FLUTTER_SHELL_PLATFORM_COMMON_PATH_UTILS_H_
+#define FLUTTER_SHELL_PLATFORM_COMMON_PATH_UTILS_H_
 
 #include <filesystem>
 
@@ -15,4 +15,4 @@ std::filesystem::path GetExecutableDirectory();
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_GLFW_PATH_UTILS_H_
+#endif  // FLUTTER_SHELL_PLATFORM_COMMON_PATH_UTILS_H_
diff --git a/shell/platform/common/platform_provided_menu.h b/shell/platform/common/platform_provided_menu.h
index 5c9b607968b33f28dd11ae429fc2713941e168de..ac23df33a65ec4f4bb39ac874d4b0af05bb2f35d 100644
--- a/shell/platform/common/platform_provided_menu.h
+++ b/shell/platform/common/platform_provided_menu.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PLATFORM_COMMON_PLATFORM_PROVIDED_MENU_H_
-#define PLATFORM_COMMON_PLATFORM_PROVIDED_MENU_H_
+#ifndef FLUTTER_SHELL_PLATFORM_COMMON_PLATFORM_PROVIDED_MENU_H_
+#define FLUTTER_SHELL_PLATFORM_COMMON_PLATFORM_PROVIDED_MENU_H_
 
 namespace flutter {
 
@@ -49,4 +49,4 @@ enum class PlatformProvidedMenu {
 
 }  // namespace flutter
 
-#endif  // PLATFORM_COMMON_PLATFORM_provided_MENU_H_
+#endif  // FLUTTER_SHELL_PLATFORM_COMMON_PLATFORM_PROVIDED_MENU_H_
diff --git a/shell/platform/common/public/flutter_messenger.h b/shell/platform/common/public/flutter_messenger.h
index 019267cbe7dfa8d0270e18687d0a5d5d482da3d7..ddf800a5cdf25b2cc865ac7336e02f42c451318e 100644
--- a/shell/platform/common/public/flutter_messenger.h
+++ b/shell/platform/common/public/flutter_messenger.h
@@ -58,6 +58,8 @@ FLUTTER_EXPORT bool FlutterDesktopMessengerSend(
     const uint8_t* message,
     const size_t message_size);
 
+// Sends a binary message to the Flutter side on the specified channel.
+// The |reply| callback will be executed when a response is received.
 FLUTTER_EXPORT bool FlutterDesktopMessengerSendWithReply(
     FlutterDesktopMessengerRef messenger,
     const char* channel,
@@ -93,8 +95,8 @@ FLUTTER_EXPORT void FlutterDesktopMessengerSetCallback(
 // Operation is thread-safe.
 //
 // See also: |FlutterDesktopMessengerRelease|
-FLUTTER_EXPORT FlutterDesktopMessengerRef
-FlutterDesktopMessengerAddRef(FlutterDesktopMessengerRef messenger);
+FLUTTER_EXPORT FlutterDesktopMessengerRef FlutterDesktopMessengerAddRef(
+    FlutterDesktopMessengerRef messenger);
 
 // Decrements the reference count for the |messenger|.
 //
@@ -124,8 +126,8 @@ FLUTTER_EXPORT bool FlutterDesktopMessengerIsAvailable(
 // Returns the |messenger| value.
 //
 // See also: |FlutterDesktopMessengerUnlock|
-FLUTTER_EXPORT FlutterDesktopMessengerRef
-FlutterDesktopMessengerLock(FlutterDesktopMessengerRef messenger);
+FLUTTER_EXPORT FlutterDesktopMessengerRef FlutterDesktopMessengerLock(
+    FlutterDesktopMessengerRef messenger);
 
 // Unlocks the `FlutterDesktopMessengerRef`.
 //
diff --git a/shell/platform/common/test_accessibility_bridge.h b/shell/platform/common/test_accessibility_bridge.h
index c81a3b59d1a14f76f22284a833addf4fd59d2ce8..a9ce43269dd8763482b2653a612591ec7a0b0391 100644
--- a/shell/platform/common/test_accessibility_bridge.h
+++ b/shell/platform/common/test_accessibility_bridge.h
@@ -11,8 +11,6 @@ namespace flutter {
 
 class TestAccessibilityBridge : public AccessibilityBridge {
  public:
-  using AccessibilityBridge::RecreateNodeDelegates;
-
   TestAccessibilityBridge() = default;
 
   void DispatchAccessibilityAction(AccessibilityNodeId target,
diff --git a/shell/platform/common/text_input_model.cc b/shell/platform/common/text_input_model.cc
index bfdc7c42e254783bfc22ad0044e188a7d35d9083..a21fe1ff3effa1d74f423806dcb2d56f076cece6 100644
--- a/shell/platform/common/text_input_model.cc
+++ b/shell/platform/common/text_input_model.cc
@@ -69,15 +69,22 @@ void TextInputModel::BeginComposing() {
   composing_range_ = TextRange(selection_.start());
 }
 
-void TextInputModel::UpdateComposingText(const std::u16string& text) {
+void TextInputModel::UpdateComposingText(const std::u16string& text,
+                                         const TextRange& selection) {
   // Preserve selection if we get a no-op update to the composing region.
   if (text.length() == 0 && composing_range_.collapsed()) {
     return;
   }
-  DeleteSelected();
-  text_.replace(composing_range_.start(), composing_range_.length(), text);
+  const TextRange& rangeToDelete =
+      composing_range_.collapsed() ? selection_ : composing_range_;
+  text_.replace(rangeToDelete.start(), rangeToDelete.length(), text);
   composing_range_.set_end(composing_range_.start() + text.length());
-  selection_ = TextRange(composing_range_.end());
+  selection_ = TextRange(selection.start() + composing_range_.start(),
+                         selection.extent() + composing_range_.start());
+}
+
+void TextInputModel::UpdateComposingText(const std::u16string& text) {
+  UpdateComposingText(text, TextRange(text.length()));
 }
 
 void TextInputModel::UpdateComposingText(const std::string& text) {
diff --git a/shell/platform/common/text_input_model.h b/shell/platform/common/text_input_model.h
index cd03e1fc864faf3fa2e9b096ed0498adcd6907f6..2546e56bbe84e67d4cfca7662bdff95ce44420cb 100644
--- a/shell/platform/common/text_input_model.h
+++ b/shell/platform/common/text_input_model.h
@@ -57,12 +57,17 @@ class TextInputModel {
   // are restricted to the composing range.
   void BeginComposing();
 
-  // Replaces the composing range with new UTF-16 text.
+  // Replaces the composing range with new UTF-16 text, and sets the selection.
   //
-  // If a selection of non-zero length exists, it is deleted if the composing
-  // text is non-empty. The composing range is adjusted to the length of
-  // |text| and the selection base and offset are set to the end of the
-  // composing range.
+  // The given |text| replaces text within the current composing range, or the
+  // current selection if the text wasn't composing. The composing range is
+  // adjusted to the length of |text|, and the |selection| describes the new
+  // selection range, relative to the start of the new composing range.
+  void UpdateComposingText(const std::u16string& text,
+                           const TextRange& selection);
+
+  // Replaces the composing range with new UTF-16 text and sets the selection to
+  // the end of the composing text.
   void UpdateComposingText(const std::u16string& text);
 
   // Replaces the composing range with new UTF-8 text.
diff --git a/shell/platform/common/text_input_model_unittests.cc b/shell/platform/common/text_input_model_unittests.cc
index c138fd1fac3b4cf820959317c1a61532eb7c27d4..9e8ed8f218a4ebda437c2ca636c8584acb71f1c2 100644
--- a/shell/platform/common/text_input_model_unittests.cc
+++ b/shell/platform/common/text_input_model_unittests.cc
@@ -403,6 +403,17 @@ TEST(TextInputModel, UpdateComposingRemovesLastComposingCharacter) {
   model->SetText("ACDE");
 }
 
+TEST(TextInputModel, UpdateSelectionWhileComposing) {
+  auto model = std::make_unique<TextInputModel>();
+  model->SetText("ABCDE");
+  model->BeginComposing();
+  model->SetComposingRange(TextRange(4, 5), 1);
+  model->UpdateComposingText(u"ぴょんぴょん", TextRange(3, 6));
+  EXPECT_STREQ(model->GetText().c_str(), "ABCDぴょんぴょん");
+  EXPECT_EQ(model->selection(), TextRange(7, 10));
+  EXPECT_EQ(model->composing_range(), TextRange(4, 10));
+}
+
 TEST(TextInputModel, AddCodePoint) {
   auto model = std::make_unique<TextInputModel>();
   model->AddCodePoint('A');
diff --git a/shell/platform/darwin/BUILD.gn b/shell/platform/darwin/BUILD.gn
index 23c8e4055acf7bb3b28187daa3e716fa0c290c09..c1db2da1341dc59237ec1f071138b1eaffd98880 100644
--- a/shell/platform/darwin/BUILD.gn
+++ b/shell/platform/darwin/BUILD.gn
@@ -5,7 +5,6 @@
 assert(is_mac || is_ios)
 
 import("//flutter/shell/platform/config.gni")
-import("//flutter/testing/testing.gni")
 
 group("darwin") {
   if (is_ios) {
@@ -18,54 +17,3 @@ group("darwin") {
     }
   }
 }
-
-source_set("flutter_channels") {
-  cflags_objc = flutter_cflags_objc
-  cflags_objcc = flutter_cflags_objcc
-
-  sources = [
-    "common/buffer_conversions.h",
-    "common/buffer_conversions.mm",
-    "common/framework/Headers/FlutterBinaryMessenger.h",
-    "common/framework/Headers/FlutterChannels.h",
-    "common/framework/Headers/FlutterCodecs.h",
-    "common/framework/Headers/FlutterMacros.h",
-    "common/framework/Source/FlutterChannels.mm",
-    "common/framework/Source/FlutterCodecs.mm",
-    "common/framework/Source/FlutterStandardCodec.mm",
-    "common/framework/Source/FlutterStandardCodec_Internal.h",
-  ]
-
-  deps = [
-    "//flutter/common",
-    "//flutter/flow",
-    "//flutter/fml",
-    "//flutter/runtime",
-    "//flutter/shell/common",
-    "//third_party/skia",
-  ]
-
-  public_configs = [ "//flutter:config" ]
-}
-
-test_fixtures("flutter_channels_fixtures") {
-  fixtures = []
-}
-
-executable("flutter_channels_unittests") {
-  testonly = true
-
-  sources = [
-    "common/framework/Source/flutter_codecs_unittest.mm",
-    "common/framework/Source/flutter_standard_codec_unittest.mm",
-  ]
-
-  deps = [
-    ":flutter_channels",
-    ":flutter_channels_fixtures",
-    "//flutter/testing",
-    "//third_party/dart/runtime:libdart_jit",
-  ]
-
-  public_configs = [ "//flutter:config" ]
-}
diff --git a/shell/platform/darwin/Doxyfile b/shell/platform/darwin/Doxyfile
index 6f9fb5ddbd453a12e3977ccb79070fe1d01eb213..b6ba3e0e330831a14ba12a650cf4b8812f91fc1e 100644
--- a/shell/platform/darwin/Doxyfile
+++ b/shell/platform/darwin/Doxyfile
@@ -727,7 +727,7 @@ SHOW_NAMESPACES        = YES
 # The FILE_VERSION_FILTER tag can be used to specify a program or script that
 # doxygen should invoke to get the current version for each file (typically from
 # the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command command input-file, where command is the value of the
+# popen()) the command input-file, where command is the value of the
 # FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
 # by doxygen. Whatever the program writes to standard output is used as the file
 # version. For an example see the documentation.
diff --git a/shell/platform/darwin/common/BUILD.gn b/shell/platform/darwin/common/BUILD.gn
index 45a9e3092b2bc00489dcfac6d71bf264af4176ae..f86af9017146cc4a5e81a7388fa199d664a46f11 100644
--- a/shell/platform/darwin/common/BUILD.gn
+++ b/shell/platform/darwin/common/BUILD.gn
@@ -2,8 +2,11 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+assert(is_mac || is_ios)
+
 import("//flutter/common/config.gni")
-import("framework_shared.gni")
+import("//flutter/testing/testing.gni")
+import("framework_common.gni")
 
 source_set("common") {
   cflags_objc = flutter_cflags_objc
@@ -17,13 +20,50 @@ source_set("common") {
   ]
 
   deps = [
-    "//flutter/common",
-    "//flutter/flow",
+    ":availability_version_check",
+    "//flutter/fml",
+  ]
+
+  public_configs = [ "//flutter:config" ]
+}
+
+# Provides an implementation for _availability_version_check.
+#
+# This is required due to an upstream compiler builtin (runtime) change
+# that marked this function as weakly-linked via __attribute__((weak import))
+# As such, no linking failure occurs when the function is unavailable at
+# link time. Since the symbol is no longer linked in, App Store review blocks
+# publishing due to relying on a private symbol. Instead we link in our own
+# implementation, which provides the exact implementation used in clang prior
+# to the upstream change.
+#
+# See: Upstream clang change: https://reviews.llvm.org/D150397
+# See: https://github.com/flutter/flutter/issues/133777
+source_set("availability_version_check") {
+  cflags_objc = flutter_cflags_objc
+  cflags_objcc = flutter_cflags_objcc
+
+  sources = [ "availability_version_check.cc" ]
+
+  deps = [ "//flutter/fml" ]
+
+  public_configs = [ "//flutter:config" ]
+}
+
+test_fixtures("availability_version_check_fixtures") {
+  fixtures = []
+}
+
+executable("availability_version_check_unittests") {
+  testonly = true
+
+  sources = [ "availability_version_check_unittests.cc" ]
+
+  deps = [
+    ":availability_version_check",
+    ":availability_version_check_fixtures",
     "//flutter/fml",
-    "//flutter/runtime",
-    "//flutter/shell/common",
-    "//third_party/dart/runtime:dart_api",
-    "//third_party/skia",
+    "//flutter/testing",
   ]
 
   public_configs = [ "//flutter:config" ]
@@ -37,18 +77,24 @@ config("framework_relative_headers") {
 }
 
 # Framework code shared between iOS and macOS.
-source_set("framework_shared") {
-  cflags_objc = flutter_cflags_objc
-  cflags_objcc = flutter_cflags_objcc
+source_set("framework_common") {
+  cflags_objc = flutter_cflags_objc_arc
+  cflags_objcc = flutter_cflags_objcc_arc
 
   sources = [
+    "framework/Source/FlutterBinaryMessengerRelay.mm",
     "framework/Source/FlutterChannels.mm",
     "framework/Source/FlutterCodecs.mm",
+    "framework/Source/FlutterNSBundleUtils.h",
+    "framework/Source/FlutterNSBundleUtils.mm",
     "framework/Source/FlutterStandardCodec.mm",
+    "framework/Source/FlutterStandardCodecHelper.cc",
     "framework/Source/FlutterStandardCodec_Internal.h",
   ]
 
-  public = framework_shared_headers
+  public = framework_common_headers
+
+  public += [ "framework/Source/FlutterNSBundleUtils.h" ]
 
   defines = [ "FLUTTER_FRAMEWORK" ]
 
@@ -56,4 +102,36 @@ source_set("framework_shared") {
     "//flutter:config",
     ":framework_relative_headers",
   ]
+
+  deps = [ "//flutter/fml" ]
+}
+
+test_fixtures("framework_common_fixtures") {
+  fixtures = []
+}
+
+# Unit tests for channels.
+executable("framework_common_unittests") {
+  testonly = true
+
+  sources = [
+    "framework/Source/FlutterBinaryMessengerRelayTest.mm",
+    "framework/Source/FlutterTestUtils.mm",
+    "framework/Source/flutter_codecs_unittest.mm",
+    "framework/Source/flutter_standard_codec_unittest.mm",
+  ]
+
+  cflags_objcc = flutter_cflags_objcc_arc
+
+  ldflags = [ "-ObjC" ]
+
+  deps = [
+    ":framework_common",
+    ":framework_common_fixtures",
+    "$dart_src/runtime:libdart_jit",
+    "//flutter/testing",
+    "//flutter/third_party/ocmock:ocmock",
+  ]
+
+  public_configs = [ "//flutter:config" ]
 }
diff --git a/shell/platform/darwin/common/availability_version_check.cc b/shell/platform/darwin/common/availability_version_check.cc
new file mode 100644
index 0000000000000000000000000000000000000000..1564bec4335f0e93421633c52f518a1bb1ab04fc
--- /dev/null
+++ b/shell/platform/darwin/common/availability_version_check.cc
@@ -0,0 +1,197 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/platform/darwin/common/availability_version_check.h"
+
+#include <cstdint>
+#include <optional>
+#include <tuple>
+
+#include <CoreFoundation/CoreFoundation.h>
+#include <dispatch/dispatch.h>
+#include <dlfcn.h>
+
+#include "flutter/fml/build_config.h"
+#include "flutter/fml/file.h"
+#include "flutter/fml/logging.h"
+#include "flutter/fml/mapping.h"
+#include "flutter/fml/platform/darwin/cf_utils.h"
+
+// The implementation of _availability_version_check defined in this file is
+// based on the code in the clang-rt library at:
+//
+// https://github.com/llvm/llvm-project/blob/e315bf25a843582de39257e1345408a10dc08224/compiler-rt/lib/builtins/os_version_check.c
+//
+// Flutter provides its own implementation due to an issue introduced in recent
+// versions of Clang following Clang 18 in which the clang-rt library declares
+// weak linkage against the _availability_version_check symbol. This declaration
+// causes apps to be rejected from the App Store. When Flutter statically links
+// the implementation below, the weak linkage is satisfied at Engine build time,
+// the symbol is no longer exposed from the Engine dylib, and apps will then
+// not be rejected from the App Store.
+//
+// The implementation of _availability_version_check can delegate to the
+// dynamically looked-up symbol on recent iOS versions, but the lookup will fail
+// on iOS 11 and 12. When the lookup fails, the current OS version must be
+// retrieved from a plist file at a well-known path. The logic for this below is
+// copied from the clang-rt implementation and adapted for the Engine.
+
+// See more context in https://github.com/flutter/flutter/issues/132130 and
+// https://github.com/flutter/engine/pull/44711.
+
+// TODO(zanderso): Remove this after Clang 18 rolls into Xcode.
+// https://github.com/flutter/flutter/issues/133203.
+
+#define CF_PROPERTY_LIST_IMMUTABLE 0
+
+namespace flutter {
+
+// This function parses the platform's version information out of a plist file
+// at a well-known path. It parses the plist file using CoreFoundation functions
+// to match the implementation in the clang-rt library.
+std::optional<ProductVersion> ProductVersionFromSystemVersionPList() {
+  std::string plist_path = "/System/Library/CoreServices/SystemVersion.plist";
+#if FML_OS_IOS_SIMULATOR
+  char* plist_path_prefix = getenv("IPHONE_SIMULATOR_ROOT");
+  if (!plist_path_prefix) {
+    FML_DLOG(ERROR) << "Failed to getenv IPHONE_SIMULATOR_ROOT";
+    return std::nullopt;
+  }
+  plist_path = std::string(plist_path_prefix) + plist_path;
+#endif  // FML_OS_IOS_SIMULATOR
+
+  auto plist_mapping = fml::FileMapping::CreateReadOnly(plist_path);
+
+  // Get the file buffer into CF's format. We pass in a null allocator here *
+  // because we free PListBuf ourselves
+  auto file_contents = fml::CFRef<CFDataRef>(CFDataCreateWithBytesNoCopy(
+      nullptr, plist_mapping->GetMapping(),
+      static_cast<CFIndex>(plist_mapping->GetSize()), kCFAllocatorNull));
+  if (!file_contents) {
+    FML_DLOG(ERROR) << "Failed to CFDataCreateWithBytesNoCopyFunc";
+    return std::nullopt;
+  }
+
+  auto plist = fml::CFRef<CFDictionaryRef>(
+      reinterpret_cast<CFDictionaryRef>(CFPropertyListCreateWithData(
+          nullptr, file_contents, CF_PROPERTY_LIST_IMMUTABLE, nullptr,
+          nullptr)));
+  if (!plist) {
+    FML_DLOG(ERROR) << "Failed to CFPropertyListCreateWithDataFunc or "
+                       "CFPropertyListCreateFromXMLDataFunc";
+    return std::nullopt;
+  }
+
+  auto product_version =
+      fml::CFRef<CFStringRef>(CFStringCreateWithCStringNoCopy(
+          nullptr, "ProductVersion", kCFStringEncodingASCII, kCFAllocatorNull));
+  if (!product_version) {
+    FML_DLOG(ERROR) << "Failed to CFStringCreateWithCStringNoCopyFunc";
+    return std::nullopt;
+  }
+  CFTypeRef opaque_value = CFDictionaryGetValue(plist, product_version);
+  if (!opaque_value || CFGetTypeID(opaque_value) != CFStringGetTypeID()) {
+    FML_DLOG(ERROR) << "Failed to CFDictionaryGetValueFunc";
+    return std::nullopt;
+  }
+
+  char version_str[32];
+  if (!CFStringGetCString(reinterpret_cast<CFStringRef>(opaque_value),
+                          version_str, sizeof(version_str),
+                          kCFStringEncodingUTF8)) {
+    FML_DLOG(ERROR) << "Failed to CFStringGetCStringFunc";
+    return std::nullopt;
+  }
+
+  int32_t major = 0;
+  int32_t minor = 0;
+  int32_t subminor = 0;
+  int matches = sscanf(version_str, "%d.%d.%d", &major, &minor, &subminor);
+  // A major version number is sufficient. The minor and subminor numbers might
+  // not be present.
+  if (matches < 1) {
+    FML_DLOG(ERROR) << "Failed to match product version string: "
+                    << version_str;
+    return std::nullopt;
+  }
+
+  return ProductVersion{major, minor, subminor};
+}
+
+bool IsEncodedVersionLessThanOrSame(uint32_t encoded_lhs, ProductVersion rhs) {
+  // Parse the values out of encoded_lhs, then compare against rhs.
+  const int32_t major = (encoded_lhs >> 16) & 0xffff;
+  const int32_t minor = (encoded_lhs >> 8) & 0xff;
+  const int32_t subminor = encoded_lhs & 0xff;
+  auto lhs = ProductVersion{major, minor, subminor};
+
+  return lhs <= rhs;
+}
+
+}  // namespace flutter
+
+namespace {
+
+// The host's OS version when the dynamic lookup of _availability_version_check
+// has failed.
+static flutter::ProductVersion g_version;
+
+typedef uint32_t dyld_platform_t;
+
+typedef struct {
+  dyld_platform_t platform;
+  uint32_t version;
+} dyld_build_version_t;
+
+typedef bool (*AvailabilityVersionCheckFn)(uint32_t count,
+                                           dyld_build_version_t versions[]);
+
+AvailabilityVersionCheckFn AvailabilityVersionCheck;
+
+dispatch_once_t DispatchOnceCounter;
+
+void InitializeAvailabilityCheck(void* unused) {
+  if (AvailabilityVersionCheck) {
+    return;
+  }
+  AvailabilityVersionCheck = reinterpret_cast<AvailabilityVersionCheckFn>(
+      dlsym(RTLD_DEFAULT, "_availability_version_check"));
+  if (AvailabilityVersionCheck) {
+    return;
+  }
+
+  // If _availability_version_check can't be dynamically loaded, then version
+  // information must be parsed out of a system plist file.
+  auto product_version = flutter::ProductVersionFromSystemVersionPList();
+  if (product_version.has_value()) {
+    g_version = product_version.value();
+  } else {
+    // If reading version info out of the system plist file fails, then
+    // fall back to the minimum version that Flutter supports.
+#if FML_OS_IOS || FML_OS_IOS_SIMULATOR
+    g_version = std::make_tuple(11, 0, 0);
+#elif FML_OS_MACOSX
+    g_version = std::make_tuple(10, 14, 0);
+#endif  // FML_OS_MACOSX
+  }
+}
+
+extern "C" bool _availability_version_check(uint32_t count,
+                                            dyld_build_version_t versions[]) {
+  dispatch_once_f(&DispatchOnceCounter, NULL, InitializeAvailabilityCheck);
+  if (AvailabilityVersionCheck) {
+    return AvailabilityVersionCheck(count, versions);
+  }
+
+  if (count == 0) {
+    return true;
+  }
+
+  // This function is called in only one place in the clang-rt implementation
+  // where there is only one element in the array.
+  return flutter::IsEncodedVersionLessThanOrSame(versions[0].version,
+                                                 g_version);
+}
+
+}  // namespace
diff --git a/shell/platform/darwin/common/availability_version_check.h b/shell/platform/darwin/common/availability_version_check.h
new file mode 100644
index 0000000000000000000000000000000000000000..97b2aab761a86df1c37114b2b54027bd8b88a7cd
--- /dev/null
+++ b/shell/platform/darwin/common/availability_version_check.h
@@ -0,0 +1,23 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_AVAILABILITY_VERSION_CHECK_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_AVAILABILITY_VERSION_CHECK_H_
+
+#include <cstdint>
+#include <optional>
+#include <tuple>
+
+namespace flutter {
+
+using ProductVersion =
+    std::tuple<int32_t /* major */, int32_t /* minor */, int32_t /* patch */>;
+
+std::optional<ProductVersion> ProductVersionFromSystemVersionPList();
+
+bool IsEncodedVersionLessThanOrSame(uint32_t encoded_lhs, ProductVersion rhs);
+
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_AVAILABILITY_VERSION_CHECK_H_
diff --git a/shell/platform/darwin/common/availability_version_check_unittests.cc b/shell/platform/darwin/common/availability_version_check_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..7753d1cfa522d3646d911519037313ff9db25a08
--- /dev/null
+++ b/shell/platform/darwin/common/availability_version_check_unittests.cc
@@ -0,0 +1,35 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <tuple>
+
+#include "flutter/shell/platform/darwin/common/availability_version_check.h"
+
+#include "gtest/gtest.h"
+
+TEST(AvailabilityVersionCheck, CanDecodeSystemPlist) {
+  auto maybe_product_version = flutter::ProductVersionFromSystemVersionPList();
+  ASSERT_TRUE(maybe_product_version.has_value());
+  if (maybe_product_version.has_value()) {
+    auto product_version = maybe_product_version.value();
+    ASSERT_GT(product_version, std::make_tuple(0, 0, 0));
+  }
+}
+
+static inline uint32_t ConstructVersion(uint32_t major,
+                                        uint32_t minor,
+                                        uint32_t subminor) {
+  return ((major & 0xffff) << 16) | ((minor & 0xff) << 8) | (subminor & 0xff);
+}
+
+TEST(AvailabilityVersionCheck, CanParseAndCompareVersions) {
+  auto rhs_version = std::make_tuple(17, 2, 0);
+  uint32_t encoded_lower_version = ConstructVersion(12, 3, 7);
+  ASSERT_TRUE(flutter::IsEncodedVersionLessThanOrSame(encoded_lower_version,
+                                                      rhs_version));
+
+  uint32_t encoded_higher_version = ConstructVersion(42, 0, 1);
+  ASSERT_FALSE(flutter::IsEncodedVersionLessThanOrSame(encoded_higher_version,
+                                                       rhs_version));
+}
diff --git a/shell/platform/darwin/common/buffer_conversions.mm b/shell/platform/darwin/common/buffer_conversions.mm
index 6ba9b1e4a53ab06e872c56c17fcc6ba92ba28799..1aa07df2653a873f88146f34bb73c4a07f8dd254 100644
--- a/shell/platform/darwin/common/buffer_conversions.mm
+++ b/shell/platform/darwin/common/buffer_conversions.mm
@@ -4,6 +4,7 @@
 
 #import "flutter/shell/platform/darwin/common/buffer_conversions.h"
 
+#include "flutter/fml/macros.h"
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
 
 namespace flutter {
diff --git a/shell/platform/darwin/common/command_line.h b/shell/platform/darwin/common/command_line.h
index 807b8faae12673e4a9478e76783a43401a54d861..43f3afac6d37f76fc9032f742aaa84961797bb65 100644
--- a/shell/platform/darwin/common/command_line.h
+++ b/shell/platform/darwin/common/command_line.h
@@ -5,13 +5,16 @@
 #ifndef FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_COMMAND_LINE_H_
 #define FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_COMMAND_LINE_H_
 
+#import <Foundation/Foundation.h>
+
 #include "flutter/fml/command_line.h"
 
 #include "flutter/fml/macros.h"
 
 namespace flutter {
 
-fml::CommandLine CommandLineFromNSProcessInfo();
+fml::CommandLine CommandLineFromNSProcessInfo(
+    NSProcessInfo* processInfoOrNil = nil);
 
 }  // namespace flutter
 
diff --git a/shell/platform/darwin/common/command_line.mm b/shell/platform/darwin/common/command_line.mm
index 55533103c3ce50cd43ba1f387b7035e298d54ee2..d9f42e634fde6dea092ccad8f825d02374f439c0 100644
--- a/shell/platform/darwin/common/command_line.mm
+++ b/shell/platform/darwin/common/command_line.mm
@@ -8,10 +8,11 @@
 
 namespace flutter {
 
-fml::CommandLine CommandLineFromNSProcessInfo() {
+fml::CommandLine CommandLineFromNSProcessInfo(NSProcessInfo* processInfoOrNil) {
   std::vector<std::string> args_vector;
+  auto processInfo = processInfoOrNil ? processInfoOrNil : [NSProcessInfo processInfo];
 
-  for (NSString* arg in [NSProcessInfo processInfo].arguments) {
+  for (NSString* arg in processInfo.arguments) {
     args_vector.emplace_back(arg.UTF8String);
   }
 
diff --git a/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h b/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h
index 9f59ec82a0ebfded3daeb4a2ac33dd56c9300352..eb0186fd223c56e45717e44c01932b4e88c510f3 100644
--- a/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h
+++ b/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLUTTERBINARYMESSENGER_H_
-#define FLUTTER_FLUTTERBINARYMESSENGER_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_HEADERS_FLUTTERBINARYMESSENGER_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_HEADERS_FLUTTERBINARYMESSENGER_H_
 
 #import <Foundation/Foundation.h>
 
@@ -31,7 +31,8 @@ typedef void (^FlutterBinaryMessageHandler)(NSData* _Nullable message, FlutterBi
 
 typedef int64_t FlutterBinaryMessengerConnection;
 
-@protocol FlutterTaskQueue;
+@protocol FlutterTaskQueue <NSObject>
+@end
 
 /**
  * A facility for communicating with the Flutter side using asynchronous message
@@ -102,4 +103,4 @@ FLUTTER_DARWIN_EXPORT
 - (void)cleanUpConnection:(FlutterBinaryMessengerConnection)connection;
 @end
 NS_ASSUME_NONNULL_END
-#endif  // FLUTTER_FLUTTERBINARYMESSENGER_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_HEADERS_FLUTTERBINARYMESSENGER_H_
diff --git a/shell/platform/darwin/common/framework/Headers/FlutterChannels.h b/shell/platform/darwin/common/framework/Headers/FlutterChannels.h
index 9b84cd64c71782b4360965075d5e7afe16e02e73..b88b78a901afa7aebdad42890aa360340949ed53 100644
--- a/shell/platform/darwin/common/framework/Headers/FlutterChannels.h
+++ b/shell/platform/darwin/common/framework/Headers/FlutterChannels.h
@@ -2,14 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLUTTERCHANNELS_H_
-#define FLUTTER_FLUTTERCHANNELS_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_HEADERS_FLUTTERCHANNELS_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_HEADERS_FLUTTERCHANNELS_H_
 
 #import "FlutterBinaryMessenger.h"
 #import "FlutterCodecs.h"
 
-@protocol FlutterTaskQueue;
-
 NS_ASSUME_NONNULL_BEGIN
 /**
  * A message reply callback.
@@ -143,9 +141,46 @@ FLUTTER_DARWIN_EXPORT
  * Adjusts the number of messages that will get buffered when sending messages to
  * channels that aren't fully set up yet.  For example, the engine isn't running
  * yet or the channel's message handler isn't set up on the Dart side yet.
+ *
+ * @param name The channel name.
+ * @param messenger The binary messenger.
+ * @param newSize The number of messages that will get buffered.
+ */
++ (void)resizeChannelWithName:(NSString*)name
+              binaryMessenger:(NSObject<FlutterBinaryMessenger>*)messenger
+                         size:(NSInteger)newSize;
+
+/**
+ * Adjusts the number of messages that will get buffered when sending messages to
+ * channels that aren't fully set up yet.  For example, the engine isn't running
+ * yet or the channel's message handler isn't set up on the Dart side yet.
+ *
+ * @param newSize The number of messages that will get buffered.
  */
 - (void)resizeChannelBuffer:(NSInteger)newSize;
 
+/**
+ * Defines whether the channel should show warning messages when discarding messages
+ * due to overflow.
+ *
+ * @param warns When false, the channel is expected to overflow and warning messages
+ *              will not be shown.
+ * @param name The channel name.
+ * @param messenger The binary messenger.
+ */
++ (void)setWarnsOnOverflow:(BOOL)warns
+        forChannelWithName:(NSString*)name
+           binaryMessenger:(NSObject<FlutterBinaryMessenger>*)messenger;
+
+/**
+ * Defines whether the channel should show warning messages when discarding messages
+ * due to overflow.
+ *
+ * @param warns When false, the channel is expected to overflow and warning messages
+ *              will not be shown.
+ */
+- (void)setWarnsOnOverflow:(BOOL)warns;
+
 @end
 
 /**
@@ -449,4 +484,4 @@ FLUTTER_DARWIN_EXPORT
 @end
 NS_ASSUME_NONNULL_END
 
-#endif  // FLUTTER_FLUTTERCHANNELS_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_HEADERS_FLUTTERCHANNELS_H_
diff --git a/shell/platform/darwin/common/framework/Headers/FlutterCodecs.h b/shell/platform/darwin/common/framework/Headers/FlutterCodecs.h
index 3ba5d4e9c258025800905c8f698a0db1b18fd610..93e1d32d93ebd605a6c7794b638f4642b820f31a 100644
--- a/shell/platform/darwin/common/framework/Headers/FlutterCodecs.h
+++ b/shell/platform/darwin/common/framework/Headers/FlutterCodecs.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLUTTERCODECS_H_
-#define FLUTTER_FLUTTERCODECS_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_HEADERS_FLUTTERCODECS_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_HEADERS_FLUTTERCODECS_H_
 
 #import <Foundation/Foundation.h>
 
@@ -279,11 +279,13 @@ FLUTTER_DARWIN_EXPORT
  * - FlutterStandardDataTypeFloat64: 64-bit floats
  */
 typedef NS_ENUM(NSInteger, FlutterStandardDataType) {
+  // NOLINTBEGIN(readability-identifier-naming)
   FlutterStandardDataTypeUInt8,
   FlutterStandardDataTypeInt32,
   FlutterStandardDataTypeInt64,
   FlutterStandardDataTypeFloat32,
   FlutterStandardDataTypeFloat64,
+  // NOLINTEND(readability-identifier-naming)
 };
 
 /**
@@ -344,17 +346,17 @@ FLUTTER_DARWIN_EXPORT
 /**
  * The type of the encoded values.
  */
-@property(readonly, nonatomic) FlutterStandardDataType type;
+@property(readonly, nonatomic, assign) FlutterStandardDataType type;
 
 /**
  * The number of value items encoded.
  */
-@property(readonly, nonatomic) UInt32 elementCount;
+@property(readonly, nonatomic, assign) UInt32 elementCount;
 
 /**
  * The number of bytes used by the encoding of a single value item.
  */
-@property(readonly, nonatomic) UInt8 elementSize;
+@property(readonly, nonatomic, assign) UInt8 elementSize;
 @end
 
 /**
@@ -473,4 +475,4 @@ FLUTTER_DARWIN_EXPORT
 
 NS_ASSUME_NONNULL_END
 
-#endif  // FLUTTER_FLUTTERCODECS_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_HEADERS_FLUTTERCODECS_H_
diff --git a/shell/platform/darwin/ios/framework/Headers/FlutterDartProject.h b/shell/platform/darwin/common/framework/Headers/FlutterDartProject.h
similarity index 69%
rename from shell/platform/darwin/ios/framework/Headers/FlutterDartProject.h
rename to shell/platform/darwin/common/framework/Headers/FlutterDartProject.h
index 8f64d124a69f3442e2aa6d3f657e050d6b04d514..5e03cb86cbfb2e695c6f8fad4cfb478ade577611 100644
--- a/shell/platform/darwin/ios/framework/Headers/FlutterDartProject.h
+++ b/shell/platform/darwin/common/framework/Headers/FlutterDartProject.h
@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLUTTERDARTPROJECT_H_
-#define FLUTTER_FLUTTERDARTPROJECT_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_HEADERS_FLUTTERDARTPROJECT_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_HEADERS_FLUTTERDARTPROJECT_H_
 
 #import <Foundation/Foundation.h>
+#import <TargetConditionals.h>
 
 #import "FlutterMacros.h"
 
@@ -13,25 +14,49 @@ NS_ASSUME_NONNULL_BEGIN
 
 /**
  * A set of Flutter and Dart assets used by a `FlutterEngine` to initialize execution.
+ *
  */
 FLUTTER_DARWIN_EXPORT
 @interface FlutterDartProject : NSObject
 
 /**
  * Initializes a Flutter Dart project from a bundle.
+ *
+ * The bundle must either contain a flutter_assets resource directory, or set the Info.plist key
+ * FLTAssetsPath to override that name (if you are doing a custom build using a different name).
+ *
+ * @param bundle The bundle containing the Flutter assets directory. If nil, the App framework
+ *               created by Flutter will be used.
  */
 - (instancetype)initWithPrecompiledDartBundle:(nullable NSBundle*)bundle NS_DESIGNATED_INITIALIZER;
-
 /**
  * Unavailable - use `init` instead.
  */
-- (instancetype)initFromDefaultSourceForConfiguration FLUTTER_UNAVAILABLE("Use -init instead.");
+- (instancetype)initFromDefaultSourceForConfiguration API_UNAVAILABLE(macos)
+    FLUTTER_UNAVAILABLE("Use -init instead.");
+
+/**
+ * Returns the default identifier for the bundle where we expect to find the Flutter Dart
+ * application.
+ */
++ (NSString*)defaultBundleIdentifier;
+
+/**
+ * An NSArray of NSStrings to be passed as command line arguments to the Dart entrypoint.
+ *
+ * If this is not explicitly set, this will default to the contents of
+ * [NSProcessInfo arguments], without the binary name.
+ *
+ * Set this to nil to pass no arguments to the Dart entrypoint.
+ */
+@property(nonatomic, nullable, copy)
+    NSArray<NSString*>* dartEntrypointArguments API_UNAVAILABLE(ios);
 
 /**
  * Returns the file name for the given asset. If the bundle with the identifier
  * "io.flutter.flutter.app" exists, it will try use that bundle; otherwise, it
  * will use the main bundle.  To specify a different bundle, use
- * `-lookupKeyForAsset:asset:fromBundle`.
+ * `+lookupKeyForAsset:fromBundle`.
  *
  * @param asset The name of the asset. The name can be hierarchical.
  * @return the file name to be used for lookup in the main bundle.
@@ -71,14 +96,8 @@ FLUTTER_DARWIN_EXPORT
                    fromPackage:(NSString*)package
                     fromBundle:(nullable NSBundle*)bundle;
 
-/**
- * Returns the default identifier for the bundle where we expect to find the Flutter Dart
- * application.
- */
-+ (NSString*)defaultBundleIdentifier;
-
 @end
 
 NS_ASSUME_NONNULL_END
 
-#endif  // FLUTTER_FLUTTERDARTPROJECT_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_HEADERS_FLUTTERDARTPROJECT_H_
diff --git a/shell/platform/darwin/common/framework/Headers/FlutterMacros.h b/shell/platform/darwin/common/framework/Headers/FlutterMacros.h
index da99e10219b76bbb818a1dc013485fac4bdc6cae..7f53b41334ab8d8299578b0aae9483074b9f05ef 100644
--- a/shell/platform/darwin/common/framework/Headers/FlutterMacros.h
+++ b/shell/platform/darwin/common/framework/Headers/FlutterMacros.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLUTTERMACROS_H_
-#define FLUTTER_FLUTTERMACROS_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_HEADERS_FLUTTERMACROS_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_HEADERS_FLUTTERMACROS_H_
 
 #if defined(FLUTTER_FRAMEWORK)
 
@@ -45,4 +45,4 @@
 #define FLUTTER_ASSERT_NOT_ARC
 #endif
 
-#endif  // FLUTTER_FLUTTERMACROS_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_HEADERS_FLUTTERMACROS_H_
diff --git a/shell/platform/darwin/common/framework/Headers/FlutterTexture.h b/shell/platform/darwin/common/framework/Headers/FlutterTexture.h
index 59d2ced808df19a546065bcdd404efd348d4bf9e..003b8650bb7756fde7de0a44e841e034d5db813b 100644
--- a/shell/platform/darwin/common/framework/Headers/FlutterTexture.h
+++ b/shell/platform/darwin/common/framework/Headers/FlutterTexture.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLUTTERTEXTURE_H_
-#define FLUTTER_FLUTTERTEXTURE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_HEADERS_FLUTTERTEXTURE_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_HEADERS_FLUTTERTEXTURE_H_
 
 #import <CoreMedia/CoreMedia.h>
 #import <Foundation/Foundation.h>
@@ -59,4 +59,4 @@ FLUTTER_DARWIN_EXPORT
 
 NS_ASSUME_NONNULL_END
 
-#endif  // FLUTTER_FLUTTERTEXTURE_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_HEADERS_FLUTTERTEXTURE_H_
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelay.h b/shell/platform/darwin/common/framework/Source/FlutterBinaryMessengerRelay.h
similarity index 61%
rename from shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelay.h
rename to shell/platform/darwin/common/framework/Source/FlutterBinaryMessengerRelay.h
index 79d098f95a8c571a1f98f96feb2c98398f6af499..48d91f88cd3b961272e99fa148e8117fbaa9c607 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelay.h
+++ b/shell/platform/darwin/common/framework/Source/FlutterBinaryMessengerRelay.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_SOURCE_FLUTTERBINARYMESSENGERRELAY_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_SOURCE_FLUTTERBINARYMESSENGERRELAY_H_
+
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h"
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
 
@@ -9,6 +12,8 @@
 FLUTTER_DARWIN_EXPORT
 #endif
 @interface FlutterBinaryMessengerRelay : NSObject <FlutterBinaryMessenger>
-@property(nonatomic, assign) NSObject<FlutterBinaryMessenger>* parent;
+@property(nonatomic, weak) NSObject<FlutterBinaryMessenger>* parent;
 - (instancetype)initWithParent:(NSObject<FlutterBinaryMessenger>*)parent;
 @end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_SOURCE_FLUTTERBINARYMESSENGERRELAY_H_
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelay.mm b/shell/platform/darwin/common/framework/Source/FlutterBinaryMessengerRelay.mm
similarity index 94%
rename from shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelay.mm
rename to shell/platform/darwin/common/framework/Source/FlutterBinaryMessengerRelay.mm
index 22d364b5e957c9d5a2c80e627998b31f608d37fb..4b13093666c8c5b9f8d7c8f12e9a47cc3d190c39 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelay.mm
+++ b/shell/platform/darwin/common/framework/Source/FlutterBinaryMessengerRelay.mm
@@ -2,17 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelay.h"
+#import "flutter/shell/platform/darwin/common/framework/Source/FlutterBinaryMessengerRelay.h"
 
 #include "flutter/fml/logging.h"
 
+FLUTTER_ASSERT_ARC
+
 @implementation FlutterBinaryMessengerRelay
 #pragma mark - FlutterBinaryMessenger
 
 - (instancetype)initWithParent:(NSObject<FlutterBinaryMessenger>*)parent {
   self = [super init];
   if (self != nil) {
-    self.parent = parent;
+    _parent = parent;
   }
   return self;
 }
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelayTest.mm b/shell/platform/darwin/common/framework/Source/FlutterBinaryMessengerRelayTest.mm
similarity index 65%
rename from shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelayTest.mm
rename to shell/platform/darwin/common/framework/Source/FlutterBinaryMessengerRelayTest.mm
index e50097f6d6dc03c1946731d9f159990125d2c9e7..b73989d581c96d1c2b27029498d9829324ea129c 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelayTest.mm
+++ b/shell/platform/darwin/common/framework/Source/FlutterBinaryMessengerRelayTest.mm
@@ -2,35 +2,29 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelay.h"
+#import "flutter/shell/platform/darwin/common/framework/Source/FlutterBinaryMessengerRelay.h"
 
 #import <OCMock/OCMock.h>
-#import <XCTest/XCTest.h>
 
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
+#import "flutter/shell/platform/darwin/common/framework/Source/FlutterTestUtils.h"
+#import "flutter/shell/platform/darwin/ios/flutter_task_queue_dispatch.h"
+#import "flutter/testing/testing.h"
+#include "gtest/gtest.h"
 
 FLUTTER_ASSERT_ARC
 
-@protocol FlutterTaskQueue <NSObject>
-@end
-
-@interface FlutterBinaryMessengerRelayTest : XCTestCase
+@interface FlutterBinaryMessengerRelayTest : NSObject
 @end
 
 @implementation FlutterBinaryMessengerRelayTest
 
-- (void)setUp {
-}
-
-- (void)tearDown {
-}
-
 - (void)testCreate {
   id messenger = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
   FlutterBinaryMessengerRelay* relay =
       [[FlutterBinaryMessengerRelay alloc] initWithParent:messenger];
-  XCTAssertNotNil(relay);
-  XCTAssertEqual(messenger, relay.parent);
+  EXPECT_NE(relay, nil);
+  EXPECT_EQ(messenger, relay.parent);
 }
 
 - (void)testPassesCallOn {
@@ -60,7 +54,7 @@ FLUTTER_ASSERT_ARC
   FlutterBinaryMessengerRelay* relay =
       [[FlutterBinaryMessengerRelay alloc] initWithParent:messenger];
   NSString* channel = @"foobar";
-  NSObject<FlutterTaskQueue>* taskQueue = OCMProtocolMock(@protocol(FlutterTaskQueue));
+  NSObject<FlutterTaskQueue>* taskQueue = OCMProtocolMock(@protocol(FlutterTaskQueueDispatch));
   FlutterBinaryMessageHandler handler = ^(NSData* _Nullable, FlutterBinaryReply _Nonnull) {
   };
   [relay setMessageHandlerOnChannel:channel binaryMessageHandler:handler taskQueue:taskQueue];
@@ -78,3 +72,33 @@ FLUTTER_ASSERT_ARC
 }
 
 @end
+
+TEST(FlutterBinaryMessengerRelayTest, Create) {
+  ASSERT_FALSE(FLTThrowsObjcException(^{
+    [[FlutterBinaryMessengerRelayTest alloc] testCreate];
+  }));
+}
+
+TEST(FlutterBinaryMessengerRelayTest, PassesCallOn) {
+  ASSERT_FALSE(FLTThrowsObjcException(^{
+    [[FlutterBinaryMessengerRelayTest alloc] testPassesCallOn];
+  }));
+}
+
+TEST(FlutterBinaryMessengerRelayTest, DoesntPassCallOn) {
+  ASSERT_FALSE(FLTThrowsObjcException(^{
+    [[FlutterBinaryMessengerRelayTest alloc] testDoesntPassCallOn];
+  }));
+}
+
+TEST(FlutterBinaryMessengerRelayTest, SetMessageHandlerWithTaskQueue) {
+  ASSERT_FALSE(FLTThrowsObjcException(^{
+    [[FlutterBinaryMessengerRelayTest alloc] testSetMessageHandlerWithTaskQueue];
+  }));
+}
+
+TEST(FlutterBinaryMessengerRelayTest, SetMakeBackgroundTaskQueue) {
+  ASSERT_FALSE(FLTThrowsObjcException(^{
+    [[FlutterBinaryMessengerRelayTest alloc] testMakeBackgroundTaskQueue];
+  }));
+}
diff --git a/shell/platform/darwin/common/framework/Source/FlutterChannels.mm b/shell/platform/darwin/common/framework/Source/FlutterChannels.mm
index 30b306a301f394622b4dac6a16d4dfd0435c409c..78d5c08404227d0068080b7b60e4b106a04b8696 100644
--- a/shell/platform/darwin/common/framework/Source/FlutterChannels.mm
+++ b/shell/platform/darwin/common/framework/Source/FlutterChannels.mm
@@ -4,15 +4,46 @@
 
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h"
 
+FLUTTER_ASSERT_ARC
+
 #pragma mark - Basic message channel
 
 static NSString* const kFlutterChannelBuffersChannel = @"dev.flutter/channel-buffers";
+static NSString* const kResizeMethod = @"resize";
+static NSString* const kOverflowMethod = @"overflow";
 
 static void ResizeChannelBuffer(NSObject<FlutterBinaryMessenger>* binaryMessenger,
                                 NSString* channel,
                                 NSInteger newSize) {
-  NSString* messageString = [NSString stringWithFormat:@"resize\r%@\r%@", channel, @(newSize)];
-  NSData* message = [messageString dataUsingEncoding:NSUTF8StringEncoding];
+  NSCAssert(newSize >= 0, @"Channel buffer size must be non-negative");
+  // Cast newSize to int because the deserialization logic handles only 32 bits values,
+  // see
+  // https://github.com/flutter/engine/blob/93e8901490e78c7ba7e319cce4470d9c6478c6dc/lib/ui/channel_buffers.dart#L495.
+  NSArray* args = @[ channel, @(static_cast<int>(newSize)) ];
+  FlutterMethodCall* resizeMethodCall = [FlutterMethodCall methodCallWithMethodName:kResizeMethod
+                                                                          arguments:args];
+  NSObject<FlutterMethodCodec>* codec = [FlutterStandardMethodCodec sharedInstance];
+  NSData* message = [codec encodeMethodCall:resizeMethodCall];
+  [binaryMessenger sendOnChannel:kFlutterChannelBuffersChannel message:message];
+}
+
+/**
+ * Defines whether a channel should show warning messages when discarding messages
+ * due to overflow.
+ *
+ * @param binaryMessenger The binary messenger.
+ * @param channel The channel name.
+ * @param warns When false, the channel is expected to overflow and warning messages
+ *              will not be shown.
+ */
+static void SetWarnsOnOverflow(NSObject<FlutterBinaryMessenger>* binaryMessenger,
+                               NSString* channel,
+                               BOOL warns) {
+  FlutterMethodCall* overflowMethodCall =
+      [FlutterMethodCall methodCallWithMethodName:kOverflowMethod
+                                        arguments:@[ channel, @(!warns) ]];
+  NSObject<FlutterMethodCodec>* codec = [FlutterStandardMethodCodec sharedInstance];
+  NSData* message = [codec encodeMethodCall:overflowMethodCall];
   [binaryMessenger sendOnChannel:kFlutterChannelBuffersChannel message:message];
 }
 
@@ -51,9 +82,9 @@ static FlutterBinaryMessengerConnection SetMessageHandler(
 + (instancetype)messageChannelWithName:(NSString*)name
                        binaryMessenger:(NSObject<FlutterBinaryMessenger>*)messenger
                                  codec:(NSObject<FlutterMessageCodec>*)codec {
-  return [[[FlutterBasicMessageChannel alloc] initWithName:name
-                                           binaryMessenger:messenger
-                                                     codec:codec] autorelease];
+  return [[FlutterBasicMessageChannel alloc] initWithName:name
+                                          binaryMessenger:messenger
+                                                    codec:codec];
 }
 
 - (instancetype)initWithName:(NSString*)name
@@ -69,21 +100,13 @@ static FlutterBinaryMessengerConnection SetMessageHandler(
                    taskQueue:(NSObject<FlutterTaskQueue>*)taskQueue {
   self = [super init];
   NSAssert(self, @"Super init cannot be nil");
-  _name = [name retain];
-  _messenger = [messenger retain];
-  _codec = [codec retain];
-  _taskQueue = [taskQueue retain];
+  _name = [name copy];
+  _messenger = messenger;
+  _codec = codec;
+  _taskQueue = taskQueue;
   return self;
 }
 
-- (void)dealloc {
-  [_name release];
-  [_messenger release];
-  [_codec release];
-  [_taskQueue release];
-  [super dealloc];
-}
-
 - (void)sendMessage:(id)message {
   [_messenger sendOnChannel:_name message:[_codec encode:message]];
 }
@@ -107,7 +130,10 @@ static FlutterBinaryMessengerConnection SetMessageHandler(
     }
     return;
   }
+
   // Grab reference to avoid retain on self.
+  // `self` might be released before the block, so the block needs to retain the codec to
+  // make sure it is not released with `self`
   NSObject<FlutterMessageCodec>* codec = _codec;
   FlutterBinaryMessageHandler messageHandler = ^(NSData* message, FlutterBinaryReply callback) {
     handler([codec decode:message], ^(id reply) {
@@ -117,10 +143,26 @@ static FlutterBinaryMessengerConnection SetMessageHandler(
   _connection = SetMessageHandler(_messenger, _name, messageHandler, _taskQueue);
 }
 
++ (void)resizeChannelWithName:(NSString*)name
+              binaryMessenger:(NSObject<FlutterBinaryMessenger>*)messenger
+                         size:(NSInteger)newSize {
+  ResizeChannelBuffer(messenger, name, newSize);
+}
+
 - (void)resizeChannelBuffer:(NSInteger)newSize {
   ResizeChannelBuffer(_messenger, _name, newSize);
 }
 
++ (void)setWarnsOnOverflow:(BOOL)warns
+        forChannelWithName:(NSString*)name
+           binaryMessenger:(NSObject<FlutterBinaryMessenger>*)messenger {
+  SetWarnsOnOverflow(messenger, name, warns);
+}
+
+- (void)setWarnsOnOverflow:(BOOL)warns {
+  SetWarnsOnOverflow(_messenger, _name, warns);
+}
+
 @end
 
 #pragma mark - Method channel
@@ -128,26 +170,19 @@ static FlutterBinaryMessengerConnection SetMessageHandler(
 ////////////////////////////////////////////////////////////////////////////////
 @implementation FlutterError
 + (instancetype)errorWithCode:(NSString*)code message:(NSString*)message details:(id)details {
-  return [[[FlutterError alloc] initWithCode:code message:message details:details] autorelease];
+  return [[FlutterError alloc] initWithCode:code message:message details:details];
 }
 
 - (instancetype)initWithCode:(NSString*)code message:(NSString*)message details:(id)details {
   NSAssert(code, @"Code cannot be nil");
   self = [super init];
   NSAssert(self, @"Super init cannot be nil");
-  _code = [code retain];
-  _message = [message retain];
-  _details = [details retain];
+  _code = [code copy];
+  _message = [message copy];
+  _details = details;
   return self;
 }
 
-- (void)dealloc {
-  [_code release];
-  [_message release];
-  [_details release];
-  [super dealloc];
-}
-
 - (BOOL)isEqual:(id)object {
   if (self == object) {
     return YES;
@@ -169,24 +204,18 @@ static FlutterBinaryMessengerConnection SetMessageHandler(
 ////////////////////////////////////////////////////////////////////////////////
 @implementation FlutterMethodCall
 + (instancetype)methodCallWithMethodName:(NSString*)method arguments:(id)arguments {
-  return [[[FlutterMethodCall alloc] initWithMethodName:method arguments:arguments] autorelease];
+  return [[FlutterMethodCall alloc] initWithMethodName:method arguments:arguments];
 }
 
 - (instancetype)initWithMethodName:(NSString*)method arguments:(id)arguments {
   NSAssert(method, @"Method name cannot be nil");
   self = [super init];
   NSAssert(self, @"Super init cannot be nil");
-  _method = [method retain];
-  _arguments = [arguments retain];
+  _method = [method copy];
+  _arguments = arguments;
   return self;
 }
 
-- (void)dealloc {
-  [_method release];
-  [_arguments release];
-  [super dealloc];
-}
-
 - (BOOL)isEqual:(id)object {
   if (self == object) {
     return YES;
@@ -224,8 +253,7 @@ NSObject const* FlutterMethodNotImplemented = [[NSObject alloc] init];
 + (instancetype)methodChannelWithName:(NSString*)name
                       binaryMessenger:(NSObject<FlutterBinaryMessenger>*)messenger
                                 codec:(NSObject<FlutterMethodCodec>*)codec {
-  return [[[FlutterMethodChannel alloc] initWithName:name binaryMessenger:messenger
-                                               codec:codec] autorelease];
+  return [[FlutterMethodChannel alloc] initWithName:name binaryMessenger:messenger codec:codec];
 }
 
 - (instancetype)initWithName:(NSString*)name
@@ -240,21 +268,13 @@ NSObject const* FlutterMethodNotImplemented = [[NSObject alloc] init];
                    taskQueue:(NSObject<FlutterTaskQueue>*)taskQueue {
   self = [super init];
   NSAssert(self, @"Super init cannot be nil");
-  _name = [name retain];
-  _messenger = [messenger retain];
-  _codec = [codec retain];
-  _taskQueue = [taskQueue retain];
+  _name = [name copy];
+  _messenger = messenger;
+  _codec = codec;
+  _taskQueue = taskQueue;
   return self;
 }
 
-- (void)dealloc {
-  [_name release];
-  [_messenger release];
-  [_codec release];
-  [_taskQueue release];
-  [super dealloc];
-}
-
 - (void)invokeMethod:(NSString*)method arguments:(id)arguments {
   FlutterMethodCall* methodCall = [FlutterMethodCall methodCallWithMethodName:method
                                                                     arguments:arguments];
@@ -285,6 +305,8 @@ NSObject const* FlutterMethodNotImplemented = [[NSObject alloc] init];
     return;
   }
   // Make sure the block captures the codec, not self.
+  // `self` might be released before the block, so the block needs to retain the codec to
+  // make sure it is not released with `self`
   NSObject<FlutterMethodCodec>* codec = _codec;
   FlutterBinaryMessageHandler messageHandler = ^(NSData* message, FlutterBinaryReply callback) {
     FlutterMethodCall* call = [codec decodeMethodCall:message];
@@ -328,8 +350,7 @@ NSObject const* FlutterEndOfEventStream = [[NSObject alloc] init];
 + (instancetype)eventChannelWithName:(NSString*)name
                      binaryMessenger:(NSObject<FlutterBinaryMessenger>*)messenger
                                codec:(NSObject<FlutterMethodCodec>*)codec {
-  return [[[FlutterEventChannel alloc] initWithName:name binaryMessenger:messenger
-                                              codec:codec] autorelease];
+  return [[FlutterEventChannel alloc] initWithName:name binaryMessenger:messenger codec:codec];
 }
 
 - (instancetype)initWithName:(NSString*)name
@@ -344,21 +365,13 @@ NSObject const* FlutterEndOfEventStream = [[NSObject alloc] init];
                    taskQueue:(NSObject<FlutterTaskQueue>* _Nullable)taskQueue {
   self = [super init];
   NSAssert(self, @"Super init cannot be nil");
-  _name = [name retain];
-  _messenger = [messenger retain];
-  _codec = [codec retain];
-  _taskQueue = [taskQueue retain];
+  _name = [name copy];
+  _messenger = messenger;
+  _codec = codec;
+  _taskQueue = taskQueue;
   return self;
 }
 
-- (void)dealloc {
-  [_name release];
-  [_codec release];
-  [_messenger release];
-  [_taskQueue release];
-  [super dealloc];
-}
-
 static FlutterBinaryMessengerConnection SetStreamHandlerMessageHandlerOnChannel(
     NSObject<FlutterStreamHandler>* handler,
     NSString* name,
diff --git a/shell/platform/darwin/common/framework/Source/FlutterChannelsTest.m b/shell/platform/darwin/common/framework/Source/FlutterChannelsTest.m
index a499fbea8f34d9c893114ae86922189eb39cc122..8ed96b7aa17cd6920c1c4bc3e687884f630d3c0e 100644
--- a/shell/platform/darwin/common/framework/Source/FlutterChannelsTest.m
+++ b/shell/platform/darwin/common/framework/Source/FlutterChannelsTest.m
@@ -2,15 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#if !__has_feature(objc_arc)
-#error ARC must be enabled!
-#endif
-
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h"
+#import "flutter/shell/platform/darwin/ios/flutter_task_queue_dispatch.h"
 
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
 
+FLUTTER_ASSERT_ARC
+
 @interface MockBinaryMessenger : NSObject <FlutterBinaryMessenger>
 @property(nonatomic, copy) NSString* channel;
 @property(nonatomic, strong) NSData* message;
@@ -146,7 +145,31 @@
 }
 
 - (void)testResize {
-  NSString* channelName = @"foo";
+  NSString* channelName = @"flutter/test";
+  id binaryMessenger = OCMStrictProtocolMock(@protocol(FlutterBinaryMessenger));
+  id codec = OCMProtocolMock(@protocol(FlutterMethodCodec));
+  FlutterBasicMessageChannel* channel =
+      [[FlutterBasicMessageChannel alloc] initWithName:channelName
+                                       binaryMessenger:binaryMessenger
+                                                 codec:codec];
+  XCTAssertNotNil(channel);
+
+  // The expected content was created from the following Dart code:
+  //   MethodCall call = MethodCall('resize', ['flutter/test',3]);
+  //   StandardMethodCodec().encodeMethodCall(call).buffer.asUint8List();
+  const unsigned char bytes[] = {7,   6,   114, 101, 115, 105, 122, 101, 12,  2,
+                                 7,   12,  102, 108, 117, 116, 116, 101, 114, 47,
+                                 116, 101, 115, 116, 3,   3,   0,   0,   0};
+  NSData* expectedMessage = [NSData dataWithBytes:bytes length:sizeof(bytes)];
+
+  OCMExpect([binaryMessenger sendOnChannel:@"dev.flutter/channel-buffers" message:expectedMessage]);
+  [channel resizeChannelBuffer:3];
+  OCMVerifyAll(binaryMessenger);
+  [binaryMessenger stopMocking];
+}
+
+- (bool)testSetWarnsOnOverflow {
+  NSString* channelName = @"flutter/test";
   id binaryMessenger = OCMStrictProtocolMock(@protocol(FlutterBinaryMessenger));
   id codec = OCMProtocolMock(@protocol(FlutterMethodCodec));
   FlutterBasicMessageChannel* channel =
@@ -155,11 +178,15 @@
                                                  codec:codec];
   XCTAssertNotNil(channel);
 
-  NSString* expectedMessageString =
-      [NSString stringWithFormat:@"resize\r%@\r%@", channelName, @100];
-  NSData* expectedMessage = [expectedMessageString dataUsingEncoding:NSUTF8StringEncoding];
+  // The expected content was created from the following Dart code:
+  //   MethodCall call = MethodCall('overflow',['flutter/test', true]);
+  //   StandardMethodCodec().encodeMethodCall(call).buffer.asUint8List();
+  const unsigned char bytes[] = {7,   8,   111, 118, 101, 114, 102, 108, 111, 119, 12,  2,   7, 12,
+                                 102, 108, 117, 116, 116, 101, 114, 47,  116, 101, 115, 116, 1};
+  NSData* expectedMessage = [NSData dataWithBytes:bytes length:sizeof(bytes)];
+
   OCMExpect([binaryMessenger sendOnChannel:@"dev.flutter/channel-buffers" message:expectedMessage]);
-  [channel resizeChannelBuffer:100];
+  [channel setWarnsOnOverflow:NO];
   OCMVerifyAll(binaryMessenger);
   [binaryMessenger stopMocking];
 }
@@ -214,7 +241,7 @@
   FlutterBinaryMessengerConnection connection = 123;
   id binaryMessenger = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
   id codec = OCMProtocolMock(@protocol(FlutterMethodCodec));
-  id taskQueue = OCMClassMock([NSObject class]);
+  id taskQueue = OCMProtocolMock(@protocol(FlutterTaskQueueDispatch));
   FlutterBasicMessageChannel* channel =
       [[FlutterBasicMessageChannel alloc] initWithName:channelName
                                        binaryMessenger:binaryMessenger
@@ -234,12 +261,84 @@
   OCMVerify([binaryMessenger cleanUpConnection:connection]);
 }
 
+- (void)testBasicMessageChannelInvokeHandlerAfterChannelReleased {
+  NSString* channelName = @"foo";
+  __block NSString* handlerMessage;
+  __block FlutterBinaryMessageHandler messageHandler;
+  @autoreleasepool {
+    FlutterBinaryMessengerConnection connection = 123;
+    id binaryMessenger = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
+    id codec = OCMProtocolMock(@protocol(FlutterMessageCodec));
+    id taskQueue = OCMProtocolMock(@protocol(FlutterTaskQueueDispatch));
+    FlutterBasicMessageChannel* channel =
+        [[FlutterBasicMessageChannel alloc] initWithName:channelName
+                                         binaryMessenger:binaryMessenger
+                                                   codec:codec
+                                               taskQueue:taskQueue];
+
+    FlutterMessageHandler handler = ^(id _Nullable message, FlutterReply callback) {
+      handlerMessage = message;
+    };
+    OCMStub([binaryMessenger
+                setMessageHandlerOnChannel:channelName
+                      binaryMessageHandler:[OCMArg checkWithBlock:^BOOL(
+                                                       FlutterBinaryMessageHandler handler) {
+                        messageHandler = handler;
+                        return YES;
+                      }]
+                                 taskQueue:taskQueue])
+        .andReturn(connection);
+    OCMStub([codec decode:[OCMArg any]]).andReturn(@"decoded message");
+    [channel setMessageHandler:handler];
+  }
+  // Channel is released, messageHandler should still retain the codec. The codec
+  // internally makes a `decode` call and updates the `handlerMessage` to "decoded message".
+  messageHandler([NSData data], ^(NSData* data){
+                 });
+  XCTAssertEqualObjects(handlerMessage, @"decoded message");
+}
+
+- (void)testMethodChannelInvokeHandlerAfterChannelReleased {
+  NSString* channelName = @"foo";
+  FlutterBinaryMessengerConnection connection = 123;
+  __block FlutterMethodCall* decodedMethodCall;
+  __block FlutterBinaryMessageHandler messageHandler;
+  @autoreleasepool {
+    id binaryMessenger = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
+    id codec = OCMProtocolMock(@protocol(FlutterMethodCodec));
+    id taskQueue = OCMProtocolMock(@protocol(FlutterTaskQueueDispatch));
+    FlutterMethodChannel* channel = [[FlutterMethodChannel alloc] initWithName:channelName
+                                                               binaryMessenger:binaryMessenger
+                                                                         codec:codec
+                                                                     taskQueue:taskQueue];
+    FlutterMethodCallHandler handler = ^(FlutterMethodCall* call, FlutterResult result) {
+      decodedMethodCall = call;
+    };
+    OCMStub([binaryMessenger
+                setMessageHandlerOnChannel:channelName
+                      binaryMessageHandler:[OCMArg checkWithBlock:^BOOL(
+                                                       FlutterBinaryMessageHandler handler) {
+                        messageHandler = handler;
+                        return YES;
+                      }]
+                                 taskQueue:taskQueue])
+        .andReturn(connection);
+    OCMStub([codec decodeMethodCall:[OCMArg any]])
+        .andReturn([FlutterMethodCall methodCallWithMethodName:@"decoded method call"
+                                                     arguments:nil]);
+    [channel setMethodCallHandler:handler];
+  }
+  messageHandler([NSData data], ^(NSData* data){
+                 });
+  XCTAssertEqualObjects(decodedMethodCall.method, @"decoded method call");
+}
+
 - (void)testMethodChannelTaskQueue {
   NSString* channelName = @"foo";
   FlutterBinaryMessengerConnection connection = 123;
   id binaryMessenger = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
   id codec = OCMProtocolMock(@protocol(FlutterMethodCodec));
-  id taskQueue = OCMClassMock([NSObject class]);
+  id taskQueue = OCMProtocolMock(@protocol(FlutterTaskQueueDispatch));
   FlutterMethodChannel* channel = [[FlutterMethodChannel alloc] initWithName:channelName
                                                              binaryMessenger:binaryMessenger
                                                                        codec:codec
@@ -264,7 +363,7 @@
   FlutterBinaryMessengerConnection connection = 123;
   id binaryMessenger = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
   id codec = OCMProtocolMock(@protocol(FlutterMethodCodec));
-  id taskQueue = OCMClassMock([NSObject class]);
+  id taskQueue = OCMProtocolMock(@protocol(FlutterTaskQueueDispatch));
   id handler = OCMProtocolMock(@protocol(FlutterStreamHandler));
   FlutterEventChannel* channel = [[FlutterEventChannel alloc] initWithName:channelName
                                                            binaryMessenger:binaryMessenger
diff --git a/shell/platform/darwin/common/framework/Source/FlutterCodecs.mm b/shell/platform/darwin/common/framework/Source/FlutterCodecs.mm
index 8ea26cc25806388d0c0b5476074b1491a7621920..a8653477e2c03868121714bcdb86513c56725171 100644
--- a/shell/platform/darwin/common/framework/Source/FlutterCodecs.mm
+++ b/shell/platform/darwin/common/framework/Source/FlutterCodecs.mm
@@ -6,6 +6,8 @@
 
 #include <cstring>
 
+FLUTTER_ASSERT_ARC
+
 @implementation FlutterBinaryCodec
 + (instancetype)sharedInstance {
   static id _sharedInstance = nil;
@@ -48,7 +50,7 @@
   if (message == nil) {
     return nil;
   }
-  return [[[NSString alloc] initWithData:message encoding:NSUTF8StringEncoding] autorelease];
+  return [[NSString alloc] initWithData:message encoding:NSUTF8StringEncoding];
 }
 @end
 
@@ -87,6 +89,7 @@
   }
   BOOL isSimpleValue = NO;
   id decoded = nil;
+  NSError* error;
   if (0 < message.length) {
     UInt8 first;
     [message getBytes:&first length:1];
@@ -103,9 +106,9 @@
       [expandedMessage replaceBytesInRange:NSMakeRange(message.length + 1, 1) withBytes:&end];
       message = expandedMessage;
     }
-    decoded = [NSJSONSerialization JSONObjectWithData:message options:0 error:nil];
+    decoded = [NSJSONSerialization JSONObjectWithData:message options:0 error:&error];
   }
-  NSAssert(decoded, @"Invalid JSON message, decoding failed");
+  NSAssert(decoded, @"Invalid JSON message, decoding failed: %@", error);
   return isSimpleValue ? ((NSArray*)decoded)[0] : decoded;
 }
 @end
diff --git a/shell/platform/darwin/common/framework/Source/FlutterNSBundleUtils.h b/shell/platform/darwin/common/framework/Source/FlutterNSBundleUtils.h
new file mode 100644
index 0000000000000000000000000000000000000000..93dfc77989b88c0b97a70de8735fbfe65d9b726a
--- /dev/null
+++ b/shell/platform/darwin/common/framework/Source/FlutterNSBundleUtils.h
@@ -0,0 +1,55 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_SOURCE_FLUTTERNSBUNDLEUTILS_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_SOURCE_FLUTTERNSBUNDLEUTILS_H_
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+extern const NSString* kDefaultAssetPath;
+
+// Finds a bundle with the named `flutterFrameworkBundleID` within `searchURL`.
+//
+// Returns `nil` if the bundle cannot be found or if errors are encountered.
+NSBundle* FLTFrameworkBundleInternal(NSString* flutterFrameworkBundleID, NSURL* searchURL);
+
+// Finds a bundle with the named `flutterFrameworkBundleID`.
+//
+// `+[NSBundle bundleWithIdentifier:]` is slow, and can take in the order of
+// tens of milliseconds in a minimal flutter app, and closer to 100 milliseconds
+// in a medium sized Flutter app on an iPhone 13. It is likely that the slowness
+// comes from having to traverse and load all bundles known to the process.
+// Using `+[NSBundle allframeworks]` and filtering also suffers from the same
+// problem.
+//
+// This implementation is an optimization to first limit the search space to
+// `+[NSBundle privateFrameworksURL]` of the main bundle, which is usually where
+// frameworks used by this file are placed. If the desired bundle cannot be
+// found here, the implementation falls back to
+// `+[NSBundle bundleWithIdentifier:]`.
+NSBundle* FLTFrameworkBundleWithIdentifier(NSString* flutterFrameworkBundleID);
+
+// Finds the bundle of the application.
+//
+// Returns [NSBundle mainBundle] if the current running process is the application.
+NSBundle* FLTGetApplicationBundle();
+
+// Gets the flutter assets path directory from `bundle`.
+//
+// Returns `kDefaultAssetPath` if unable to find asset path from info.plist in `bundle`.
+NSString* FLTAssetPath(NSBundle* bundle);
+
+// Finds the Flutter asset directory from `bundle`.
+//
+// The raw path can be set by the application via info.plist's `FLTAssetsPath` key.
+// If the key is not set, `flutter_assets` is used as the raw path value.
+//
+// If no valid asset is found under the raw path, returns nil.
+NSString* FLTAssetsPathFromBundle(NSBundle* bundle);
+
+NS_ASSUME_NONNULL_END
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_SOURCE_FLUTTERNSBUNDLEUTILS_H_
diff --git a/shell/platform/darwin/common/framework/Source/FlutterNSBundleUtils.mm b/shell/platform/darwin/common/framework/Source/FlutterNSBundleUtils.mm
new file mode 100644
index 0000000000000000000000000000000000000000..c96b1a9af181e4841cc5ea7c870ab3a717f7b86f
--- /dev/null
+++ b/shell/platform/darwin/common/framework/Source/FlutterNSBundleUtils.mm
@@ -0,0 +1,81 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <Foundation/Foundation.h>
+
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
+
+FLUTTER_ASSERT_ARC
+
+const NSString* kDefaultAssetPath = @"Frameworks/App.framework/flutter_assets";
+static NSString* GetFlutterAssetsPathFromBundle(NSBundle* bundle, NSString* relativeAssetsPath);
+
+NSBundle* FLTFrameworkBundleInternal(NSString* flutterFrameworkBundleID, NSURL* searchURL) {
+  NSDirectoryEnumerator<NSURL*>* frameworkEnumerator = [NSFileManager.defaultManager
+                 enumeratorAtURL:searchURL
+      includingPropertiesForKeys:nil
+                         options:NSDirectoryEnumerationSkipsSubdirectoryDescendants |
+                                 NSDirectoryEnumerationSkipsHiddenFiles
+                    // Skip directories where errors are encountered.
+                    errorHandler:nil];
+
+  for (NSURL* candidate in frameworkEnumerator) {
+    NSBundle* flutterFrameworkBundle = [NSBundle bundleWithURL:candidate];
+    if ([flutterFrameworkBundle.bundleIdentifier isEqualToString:flutterFrameworkBundleID]) {
+      return flutterFrameworkBundle;
+    }
+  }
+  return nil;
+}
+
+NSBundle* FLTGetApplicationBundle() {
+  NSBundle* mainBundle = NSBundle.mainBundle;
+  // App extension bundle is in <AppName>.app/PlugIns/Extension.appex.
+  if ([mainBundle.bundleURL.pathExtension isEqualToString:@"appex"]) {
+    // Up two levels.
+    return [NSBundle bundleWithURL:mainBundle.bundleURL.URLByDeletingLastPathComponent
+                                       .URLByDeletingLastPathComponent];
+  }
+  return mainBundle;
+}
+
+NSBundle* FLTFrameworkBundleWithIdentifier(NSString* flutterFrameworkBundleID) {
+  NSBundle* appBundle = FLTGetApplicationBundle();
+  NSBundle* flutterFrameworkBundle =
+      FLTFrameworkBundleInternal(flutterFrameworkBundleID, appBundle.privateFrameworksURL);
+  if (flutterFrameworkBundle == nil) {
+    // Fallback to slow implementation.
+    flutterFrameworkBundle = [NSBundle bundleWithIdentifier:flutterFrameworkBundleID];
+  }
+  if (flutterFrameworkBundle == nil) {
+    flutterFrameworkBundle = NSBundle.mainBundle;
+  }
+  return flutterFrameworkBundle;
+}
+
+NSString* FLTAssetPath(NSBundle* bundle) {
+  return [bundle objectForInfoDictionaryKey:@"FLTAssetsPath"] ?: kDefaultAssetPath;
+}
+
+NSString* FLTAssetsPathFromBundle(NSBundle* bundle) {
+  NSString* relativeAssetsPath = FLTAssetPath(bundle);
+  NSString* flutterAssetsPath = GetFlutterAssetsPathFromBundle(bundle, relativeAssetsPath);
+  if (flutterAssetsPath.length == 0) {
+    flutterAssetsPath = GetFlutterAssetsPathFromBundle(NSBundle.mainBundle, relativeAssetsPath);
+  }
+  return flutterAssetsPath;
+}
+
+static NSString* GetFlutterAssetsPathFromBundle(NSBundle* bundle, NSString* relativeAssetsPath) {
+  // Use the raw path solution so that asset path can be returned from unloaded bundles.
+  // See https://github.com/flutter/engine/pull/46073
+  NSString* assetsPath = [bundle pathForResource:relativeAssetsPath ofType:nil];
+  if (assetsPath.length == 0) {
+    // In app extension, using full relative path (kDefaultAssetPath)
+    // returns nil when the app bundle is not loaded. Try to use
+    // the sub folder name, which can successfully return a valid path.
+    assetsPath = [bundle pathForResource:@"flutter_assets" ofType:nil];
+  }
+  return assetsPath;
+}
diff --git a/shell/platform/darwin/common/framework/Source/FlutterStandardCodec.mm b/shell/platform/darwin/common/framework/Source/FlutterStandardCodec.mm
index eeb3ef918b0c3b564d38d458c47d2a5147600790..fc0fd0ca167073957df2d0a3b5787218ee76cfdf 100644
--- a/shell/platform/darwin/common/framework/Source/FlutterStandardCodec.mm
+++ b/shell/platform/darwin/common/framework/Source/FlutterStandardCodec.mm
@@ -2,8 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#import "flutter/shell/platform/darwin/common/framework/Source/FlutterStandardCodecHelper.h"
 #import "flutter/shell/platform/darwin/common/framework/Source/FlutterStandardCodec_Internal.h"
 
+FLUTTER_ASSERT_ARC
+
 #pragma mark - Codec for basic message channel
 
 @implementation FlutterStandardMessageCodec {
@@ -12,29 +15,23 @@
 + (instancetype)sharedInstance {
   static id _sharedInstance = nil;
   if (!_sharedInstance) {
-    FlutterStandardReaderWriter* readerWriter =
-        [[[FlutterStandardReaderWriter alloc] init] autorelease];
+    FlutterStandardReaderWriter* readerWriter = [[FlutterStandardReaderWriter alloc] init];
     _sharedInstance = [[FlutterStandardMessageCodec alloc] initWithReaderWriter:readerWriter];
   }
   return _sharedInstance;
 }
 
 + (instancetype)codecWithReaderWriter:(FlutterStandardReaderWriter*)readerWriter {
-  return [[[FlutterStandardMessageCodec alloc] initWithReaderWriter:readerWriter] autorelease];
+  return [[FlutterStandardMessageCodec alloc] initWithReaderWriter:readerWriter];
 }
 
 - (instancetype)initWithReaderWriter:(FlutterStandardReaderWriter*)readerWriter {
   self = [super init];
   NSAssert(self, @"Super init cannot be nil");
-  _readerWriter = [readerWriter retain];
+  _readerWriter = readerWriter;
   return self;
 }
 
-- (void)dealloc {
-  [_readerWriter release];
-  [super dealloc];
-}
-
 - (NSData*)encode:(id)message {
   if (message == nil) {
     return nil;
@@ -64,29 +61,23 @@
 + (instancetype)sharedInstance {
   static id _sharedInstance = nil;
   if (!_sharedInstance) {
-    FlutterStandardReaderWriter* readerWriter =
-        [[[FlutterStandardReaderWriter alloc] init] autorelease];
+    FlutterStandardReaderWriter* readerWriter = [[FlutterStandardReaderWriter alloc] init];
     _sharedInstance = [[FlutterStandardMethodCodec alloc] initWithReaderWriter:readerWriter];
   }
   return _sharedInstance;
 }
 
 + (instancetype)codecWithReaderWriter:(FlutterStandardReaderWriter*)readerWriter {
-  return [[[FlutterStandardMethodCodec alloc] initWithReaderWriter:readerWriter] autorelease];
+  return [[FlutterStandardMethodCodec alloc] initWithReaderWriter:readerWriter];
 }
 
 - (instancetype)initWithReaderWriter:(FlutterStandardReaderWriter*)readerWriter {
   self = [super init];
   NSAssert(self, @"Super init cannot be nil");
-  _readerWriter = [readerWriter retain];
+  _readerWriter = readerWriter;
   return self;
 }
 
-- (void)dealloc {
-  [_readerWriter release];
-  [super dealloc];
-}
-
 - (NSData*)encodeMethodCall:(FlutterMethodCall*)call {
   NSMutableData* data = [NSMutableData dataWithCapacity:32];
   FlutterStandardWriter* writer = [_readerWriter writerWithData:data];
@@ -173,7 +164,7 @@ using namespace flutter;
 }
 
 + (instancetype)typedDataWithData:(NSData*)data type:(FlutterStandardDataType)type {
-  return [[[FlutterStandardTypedData alloc] initWithData:data type:type] autorelease];
+  return [[FlutterStandardTypedData alloc] initWithData:data type:type];
 }
 
 - (instancetype)initWithData:(NSData*)data type:(FlutterStandardDataType)type {
@@ -182,18 +173,13 @@ using namespace flutter;
   NSAssert(data.length % elementSize == 0, @"Data must contain integral number of elements");
   self = [super init];
   NSAssert(self, @"Super init cannot be nil");
-  _data = [data retain];
+  _data = [data copy];
   _type = type;
   _elementSize = elementSize;
   _elementCount = data.length / elementSize;
   return self;
 }
 
-- (void)dealloc {
-  [_data release];
-  [super dealloc];
-}
-
 - (BOOL)isEqual:(id)object {
   if (self == object) {
     return YES;
@@ -220,124 +206,149 @@ using namespace flutter;
 - (instancetype)initWithData:(NSMutableData*)data {
   self = [super init];
   NSAssert(self, @"Super init cannot be nil");
-  _data = [data retain];
+  _data = data;
   return self;
 }
 
-- (void)dealloc {
-  [_data release];
-  [super dealloc];
-}
-
 - (void)writeByte:(UInt8)value {
-  [_data appendBytes:&value length:1];
+  FlutterStandardCodecHelperWriteByte((__bridge CFMutableDataRef)_data, value);
 }
 
 - (void)writeBytes:(const void*)bytes length:(NSUInteger)length {
-  [_data appendBytes:bytes length:length];
+  FlutterStandardCodecHelperWriteBytes((__bridge CFMutableDataRef)_data, bytes, length);
 }
 
 - (void)writeData:(NSData*)data {
-  [_data appendData:data];
+  FlutterStandardCodecHelperWriteData((__bridge CFMutableDataRef)_data, (__bridge CFDataRef)data);
 }
 
 - (void)writeSize:(UInt32)size {
-  if (size < 254) {
-    [self writeByte:(UInt8)size];
-  } else if (size <= 0xffff) {
-    [self writeByte:254];
-    UInt16 value = (UInt16)size;
-    [self writeBytes:&value length:2];
-  } else {
-    [self writeByte:255];
-    [self writeBytes:&size length:4];
-  }
+  FlutterStandardCodecHelperWriteSize((__bridge CFMutableDataRef)_data, size);
 }
 
 - (void)writeAlignment:(UInt8)alignment {
-  UInt8 mod = _data.length % alignment;
-  if (mod) {
-    for (int i = 0; i < (alignment - mod); i++) {
-      [self writeByte:0];
-    }
-  }
+  FlutterStandardCodecHelperWriteAlignment((__bridge CFMutableDataRef)_data, alignment);
 }
 
 - (void)writeUTF8:(NSString*)value {
-  UInt32 length = [value lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
-  [self writeSize:length];
-  [self writeBytes:value.UTF8String length:length];
+  FlutterStandardCodecHelperWriteUTF8((__bridge CFMutableDataRef)_data,
+                                      (__bridge CFStringRef)value);
 }
 
-- (void)writeValue:(id)value {
-  if (value == nil || value == [NSNull null]) {
-    [self writeByte:FlutterStandardFieldNil];
+static FlutterStandardCodecObjcType GetWriteType(id value) {
+  if (value == nil || (__bridge CFNullRef)value == kCFNull) {
+    return FlutterStandardCodecObjcTypeNil;
   } else if ([value isKindOfClass:[NSNumber class]]) {
-    CFNumberRef number = (CFNumberRef)value;
-    BOOL success = NO;
-    if (CFGetTypeID(number) == CFBooleanGetTypeID()) {
-      BOOL b = CFBooleanGetValue((CFBooleanRef)number);
-      [self writeByte:(b ? FlutterStandardFieldTrue : FlutterStandardFieldFalse)];
-      success = YES;
-    } else if (CFNumberIsFloatType(number)) {
-      Float64 f;
-      success = CFNumberGetValue(number, kCFNumberFloat64Type, &f);
-      if (success) {
-        [self writeByte:FlutterStandardFieldFloat64];
-        [self writeAlignment:8];
-        [self writeBytes:(UInt8*)&f length:8];
-      }
-    } else if (CFNumberGetByteSize(number) <= 4) {
-      SInt32 n;
-      success = CFNumberGetValue(number, kCFNumberSInt32Type, &n);
-      if (success) {
-        [self writeByte:FlutterStandardFieldInt32];
-        [self writeBytes:(UInt8*)&n length:4];
-      }
-    } else if (CFNumberGetByteSize(number) <= 8) {
-      SInt64 n;
-      success = CFNumberGetValue(number, kCFNumberSInt64Type, &n);
-      if (success) {
-        [self writeByte:FlutterStandardFieldInt64];
-        [self writeBytes:(UInt8*)&n length:8];
-      }
-    }
-    if (!success) {
-      NSLog(@"Unsupported value: %@ of number type %ld", value, CFNumberGetType(number));
-      NSAssert(NO, @"Unsupported value for standard codec");
-    }
+    return FlutterStandardCodecObjcTypeNSNumber;
   } else if ([value isKindOfClass:[NSString class]]) {
-    NSString* string = value;
-    [self writeByte:FlutterStandardFieldString];
-    [self writeUTF8:string];
+    return FlutterStandardCodecObjcTypeNSString;
   } else if ([value isKindOfClass:[FlutterStandardTypedData class]]) {
-    FlutterStandardTypedData* typedData = value;
-    [self writeByte:FlutterStandardFieldForDataType(typedData.type)];
-    [self writeSize:typedData.elementCount];
-    [self writeAlignment:typedData.elementSize];
-    [self writeData:typedData.data];
+    return FlutterStandardCodecObjcTypeFlutterStandardTypedData;
   } else if ([value isKindOfClass:[NSData class]]) {
-    [self writeValue:[FlutterStandardTypedData typedDataWithBytes:value]];
+    return FlutterStandardCodecObjcTypeNSData;
   } else if ([value isKindOfClass:[NSArray class]]) {
-    NSArray* array = value;
-    [self writeByte:FlutterStandardFieldList];
-    [self writeSize:array.count];
-    for (id object in array) {
-      [self writeValue:object];
-    }
+    return FlutterStandardCodecObjcTypeNSArray;
   } else if ([value isKindOfClass:[NSDictionary class]]) {
-    NSDictionary* dict = value;
-    [self writeByte:FlutterStandardFieldMap];
-    [self writeSize:dict.count];
-    for (id key in dict) {
-      [self writeValue:key];
-      [self writeValue:[dict objectForKey:key]];
-    }
+    return FlutterStandardCodecObjcTypeNSDictionary;
+  } else {
+    return FlutterStandardCodecObjcTypeUnknown;
+  }
+}
+
+struct WriteKeyValuesInfo {
+  CFTypeRef writer;
+  CFMutableDataRef data;
+};
+
+static void WriteKeyValues(CFTypeRef key, CFTypeRef value, void* context) {
+  WriteKeyValuesInfo* info = (WriteKeyValuesInfo*)context;
+  FastWriteValueOfType(info->writer, info->data, key);
+  FastWriteValueOfType(info->writer, info->data, value);
+}
+
+// Recurses into WriteValueOfType directly if it is writing a known type,
+// otherwise recurses with objc_msgSend.
+static void FastWriteValueOfType(CFTypeRef writer, CFMutableDataRef data, CFTypeRef value) {
+  FlutterStandardCodecObjcType type = GetWriteType((__bridge id)value);
+  if (type != FlutterStandardCodecObjcTypeUnknown) {
+    WriteValueOfType(writer, data, type, value);
   } else {
-    NSLog(@"Unsupported value: %@ of type %@", value, [value class]);
-    NSAssert(NO, @"Unsupported value for standard codec");
+    [(__bridge FlutterStandardWriter*)writer writeValue:(__bridge id)value];
+  }
+}
+
+static void WriteValueOfType(CFTypeRef writer,
+                             CFMutableDataRef data,
+                             FlutterStandardCodecObjcType type,
+                             CFTypeRef value) {
+  switch (type) {
+    case FlutterStandardCodecObjcTypeNil:
+      FlutterStandardCodecHelperWriteByte(data, FlutterStandardFieldNil);
+      break;
+    case FlutterStandardCodecObjcTypeNSNumber: {
+      CFNumberRef number = (CFNumberRef)value;
+      BOOL success = FlutterStandardCodecHelperWriteNumber(data, number);
+      if (!success) {
+        NSLog(@"Unsupported value: %@ of number type %ld", value, CFNumberGetType(number));
+        NSCAssert(NO, @"Unsupported value for standard codec");
+      }
+      break;
+    }
+    case FlutterStandardCodecObjcTypeNSString: {
+      CFStringRef string = (CFStringRef)value;
+      FlutterStandardCodecHelperWriteByte(data, FlutterStandardFieldString);
+      FlutterStandardCodecHelperWriteUTF8(data, string);
+      break;
+    }
+    case FlutterStandardCodecObjcTypeFlutterStandardTypedData: {
+      FlutterStandardTypedData* typedData = (__bridge FlutterStandardTypedData*)value;
+      FlutterStandardCodecHelperWriteByte(data, FlutterStandardFieldForDataType(typedData.type));
+      FlutterStandardCodecHelperWriteSize(data, typedData.elementCount);
+      FlutterStandardCodecHelperWriteAlignment(data, typedData.elementSize);
+      FlutterStandardCodecHelperWriteData(data, (__bridge CFDataRef)typedData.data);
+      break;
+    }
+    case FlutterStandardCodecObjcTypeNSData:
+      WriteValueOfType(writer, data, FlutterStandardCodecObjcTypeFlutterStandardTypedData,
+                       (__bridge CFTypeRef)
+                           [FlutterStandardTypedData typedDataWithBytes:(__bridge NSData*)value]);
+      break;
+    case FlutterStandardCodecObjcTypeNSArray: {
+      CFArrayRef array = (CFArrayRef)value;
+      FlutterStandardCodecHelperWriteByte(data, FlutterStandardFieldList);
+      CFIndex count = CFArrayGetCount(array);
+      FlutterStandardCodecHelperWriteSize(data, count);
+      for (CFIndex i = 0; i < count; ++i) {
+        FastWriteValueOfType(writer, data, CFArrayGetValueAtIndex(array, i));
+      }
+      break;
+    }
+    case FlutterStandardCodecObjcTypeNSDictionary: {
+      CFDictionaryRef dict = (CFDictionaryRef)value;
+      FlutterStandardCodecHelperWriteByte(data, FlutterStandardFieldMap);
+      CFIndex count = CFDictionaryGetCount(dict);
+      FlutterStandardCodecHelperWriteSize(data, count);
+      WriteKeyValuesInfo info = {
+          .writer = writer,
+          .data = data,
+      };
+      CFDictionaryApplyFunction(dict, WriteKeyValues, (void*)&info);
+      break;
+    }
+    case FlutterStandardCodecObjcTypeUnknown: {
+      id objc_value = (__bridge id)value;
+      NSLog(@"Unsupported value: %@ of type %@", objc_value, [objc_value class]);
+      NSCAssert(NO, @"Unsupported value for standard codec");
+      break;
+    }
   }
 }
+
+- (void)writeValue:(id)value {
+  FlutterStandardCodecObjcType type = GetWriteType(value);
+  WriteValueOfType((__bridge CFTypeRef)self, (__bridge CFMutableDataRef)self->_data, type,
+                   (__bridge CFTypeRef)value);
+}
 @end
 
 @implementation FlutterStandardReader {
@@ -348,45 +359,26 @@ using namespace flutter;
 - (instancetype)initWithData:(NSData*)data {
   self = [super init];
   NSAssert(self, @"Super init cannot be nil");
-  _data = [data retain];
+  _data = [data copy];
   _range = NSMakeRange(0, 0);
   return self;
 }
 
-- (void)dealloc {
-  [_data release];
-  [super dealloc];
-}
-
 - (BOOL)hasMore {
   return _range.location < _data.length;
 }
 
 - (void)readBytes:(void*)destination length:(NSUInteger)length {
-  _range.length = length;
-  [_data getBytes:destination range:_range];
-  _range.location += _range.length;
+  FlutterStandardCodecHelperReadBytes(&_range.location, length, destination,
+                                      (__bridge CFDataRef)_data);
 }
 
 - (UInt8)readByte {
-  UInt8 value;
-  [self readBytes:&value length:1];
-  return value;
+  return FlutterStandardCodecHelperReadByte(&_range.location, (__bridge CFDataRef)_data);
 }
 
 - (UInt32)readSize {
-  UInt8 byte = [self readByte];
-  if (byte < 254) {
-    return (UInt32)byte;
-  } else if (byte == 254) {
-    UInt16 value;
-    [self readBytes:&value length:2];
-    return value;
-  } else {
-    UInt32 value;
-    [self readBytes:&value length:4];
-    return value;
-  }
+  return FlutterStandardCodecHelperReadSize(&_range.location, (__bridge CFDataRef)_data);
 }
 
 - (NSData*)readData:(NSUInteger)length {
@@ -397,95 +389,56 @@ using namespace flutter;
 }
 
 - (NSString*)readUTF8 {
-  NSData* bytes = [self readData:[self readSize]];
-  return [[[NSString alloc] initWithData:bytes encoding:NSUTF8StringEncoding] autorelease];
+  return (__bridge NSString*)FlutterStandardCodecHelperReadUTF8(&_range.location,
+                                                                (__bridge CFDataRef)_data);
 }
 
 - (void)readAlignment:(UInt8)alignment {
-  UInt8 mod = _range.location % alignment;
-  if (mod) {
-    _range.location += (alignment - mod);
-  }
+  FlutterStandardCodecHelperReadAlignment(&_range.location, alignment);
 }
 
-- (FlutterStandardTypedData*)readTypedDataOfType:(FlutterStandardDataType)type {
-  UInt32 elementCount = [self readSize];
-  UInt8 elementSize = elementSizeForFlutterStandardDataType(type);
-  [self readAlignment:elementSize];
-  NSData* data = [self readData:elementCount * elementSize];
-  return [FlutterStandardTypedData typedDataWithData:data type:type];
+- (nullable id)readValue {
+  return (__bridge id)ReadValue((__bridge CFTypeRef)self);
 }
 
-- (nullable id)readValue {
-  return [self readValueOfType:[self readByte]];
+static CFTypeRef ReadValue(CFTypeRef user_data) {
+  FlutterStandardReader* reader = (__bridge FlutterStandardReader*)user_data;
+  uint8_t type = FlutterStandardCodecHelperReadByte(&reader->_range.location,
+                                                    (__bridge CFDataRef)reader->_data);
+  return (__bridge CFTypeRef)[reader readValueOfType:type];
+}
+
+static CFTypeRef ReadTypedDataOfType(FlutterStandardField field, CFTypeRef user_data) {
+  FlutterStandardReader* reader = (__bridge FlutterStandardReader*)user_data;
+  unsigned long* location = &reader->_range.location;
+  CFDataRef data = (__bridge CFDataRef)reader->_data;
+  FlutterStandardDataType type = FlutterStandardDataTypeForField(field);
+
+  UInt64 elementCount = FlutterStandardCodecHelperReadSize(location, data);
+  UInt64 elementSize = elementSizeForFlutterStandardDataType(type);
+  FlutterStandardCodecHelperReadAlignment(location, elementSize);
+  UInt64 length = elementCount * elementSize;
+  NSRange range = NSMakeRange(*location, length);
+  // Note: subdataWithRange performs better than CFDataCreate and
+  // CFDataCreateBytesNoCopy crashes.
+  NSData* bytes = [(__bridge NSData*)data subdataWithRange:range];
+  *location += length;
+  return (__bridge CFTypeRef)[FlutterStandardTypedData typedDataWithData:bytes type:type];
 }
 
 - (nullable id)readValueOfType:(UInt8)type {
-  FlutterStandardField field = (FlutterStandardField)type;
-  switch (field) {
-    case FlutterStandardFieldNil:
-      return nil;
-    case FlutterStandardFieldTrue:
-      return @YES;
-    case FlutterStandardFieldFalse:
-      return @NO;
-    case FlutterStandardFieldInt32: {
-      SInt32 value;
-      [self readBytes:&value length:4];
-      return @(value);
-    }
-    case FlutterStandardFieldInt64: {
-      SInt64 value;
-      [self readBytes:&value length:8];
-      return @(value);
-    }
-    case FlutterStandardFieldFloat64: {
-      Float64 value;
-      [self readAlignment:8];
-      [self readBytes:&value length:8];
-      return [NSNumber numberWithDouble:value];
-    }
-    case FlutterStandardFieldIntHex:
-    case FlutterStandardFieldString:
-      return [self readUTF8];
-    case FlutterStandardFieldUInt8Data:
-    case FlutterStandardFieldInt32Data:
-    case FlutterStandardFieldInt64Data:
-    case FlutterStandardFieldFloat32Data:
-    case FlutterStandardFieldFloat64Data:
-      return [self readTypedDataOfType:FlutterStandardDataTypeForField(field)];
-    case FlutterStandardFieldList: {
-      UInt32 length = [self readSize];
-      NSMutableArray* array = [NSMutableArray arrayWithCapacity:length];
-      for (UInt32 i = 0; i < length; i++) {
-        id value = [self readValue];
-        [array addObject:(value == nil ? [NSNull null] : value)];
-      }
-      return array;
-    }
-    case FlutterStandardFieldMap: {
-      UInt32 size = [self readSize];
-      NSMutableDictionary* dict = [NSMutableDictionary dictionaryWithCapacity:size];
-      for (UInt32 i = 0; i < size; i++) {
-        id key = [self readValue];
-        id val = [self readValue];
-        [dict setObject:(val == nil ? [NSNull null] : val)
-                 forKey:(key == nil ? [NSNull null] : key)];
-      }
-      return dict;
-    }
-    default:
-      NSAssert(NO, @"Corrupted standard message");
-  }
+  return (__bridge id)FlutterStandardCodecHelperReadValueOfType(
+      &_range.location, (__bridge CFDataRef)_data, type, ReadValue, ReadTypedDataOfType,
+      (__bridge CFTypeRef)self);
 }
 @end
 
 @implementation FlutterStandardReaderWriter
 - (FlutterStandardWriter*)writerWithData:(NSMutableData*)data {
-  return [[[FlutterStandardWriter alloc] initWithData:data] autorelease];
+  return [[FlutterStandardWriter alloc] initWithData:data];
 }
 
 - (FlutterStandardReader*)readerWithData:(NSData*)data {
-  return [[[FlutterStandardReader alloc] initWithData:data] autorelease];
+  return [[FlutterStandardReader alloc] initWithData:data];
 }
 @end
diff --git a/shell/platform/darwin/common/framework/Source/FlutterStandardCodecHelper.cc b/shell/platform/darwin/common/framework/Source/FlutterStandardCodecHelper.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ef872f249bd22c99e4ab81ade503b88aae2ac06a
--- /dev/null
+++ b/shell/platform/darwin/common/framework/Source/FlutterStandardCodecHelper.cc
@@ -0,0 +1,273 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/platform/darwin/common/framework/Source/FlutterStandardCodecHelper.h"
+#include <stdint.h>
+
+#include <vector>
+
+#include "flutter/fml/logging.h"
+
+// The google-runtime-int lint suggests uint64_t in place of unsigned long,
+// however these functions are frequently used with NSUInteger, which is
+// defined as an unsigned long.
+//
+// NOLINTBEGIN(google-runtime-int)
+
+void FlutterStandardCodecHelperReadAlignment(unsigned long* location,
+                                             uint8_t alignment) {
+  uint8_t mod = *location % alignment;
+  if (mod) {
+    *location += (alignment - mod);
+  }
+}
+
+static uint8_t PeekByte(unsigned long location, CFDataRef data) {
+  uint8_t result;
+  CFRange range = CFRangeMake(location, 1);
+  CFDataGetBytes(data, range, &result);
+  return result;
+}
+
+void FlutterStandardCodecHelperReadBytes(unsigned long* location,
+                                         unsigned long length,
+                                         void* destination,
+                                         CFDataRef data) {
+  CFRange range = CFRangeMake(*location, length);
+  CFDataGetBytes(data, range, static_cast<UInt8*>(destination));
+  *location += length;
+}
+
+uint8_t FlutterStandardCodecHelperReadByte(unsigned long* location,
+                                           CFDataRef data) {
+  uint8_t value;
+  FlutterStandardCodecHelperReadBytes(location, 1, &value, data);
+  return value;
+}
+
+uint32_t FlutterStandardCodecHelperReadSize(unsigned long* location,
+                                            CFDataRef data) {
+  uint8_t byte = FlutterStandardCodecHelperReadByte(location, data);
+  if (byte < 254) {
+    return (uint32_t)byte;
+  } else if (byte == 254) {
+    UInt16 value;
+    FlutterStandardCodecHelperReadBytes(location, 2, &value, data);
+    return value;
+  } else {
+    UInt32 value;
+    FlutterStandardCodecHelperReadBytes(location, 4, &value, data);
+    return value;
+  }
+}
+
+static CFDataRef ReadDataNoCopy(unsigned long* location,
+                                unsigned long length,
+                                CFDataRef data) {
+  CFDataRef result = CFDataCreateWithBytesNoCopy(
+      kCFAllocatorDefault, CFDataGetBytePtr(data) + *location, length,
+      kCFAllocatorNull);
+  *location += length;
+  return static_cast<CFDataRef>(CFAutorelease(result));
+}
+
+CFStringRef FlutterStandardCodecHelperReadUTF8(unsigned long* location,
+                                               CFDataRef data) {
+  uint32_t size = FlutterStandardCodecHelperReadSize(location, data);
+  CFDataRef bytes = ReadDataNoCopy(location, size, data);
+  CFStringRef result = CFStringCreateFromExternalRepresentation(
+      kCFAllocatorDefault, bytes, kCFStringEncodingUTF8);
+  return static_cast<CFStringRef>(CFAutorelease(result));
+}
+
+// Peeks ahead to see if we are reading a standard type.  If so, recurse
+// directly to FlutterStandardCodecHelperReadValueOfType, otherwise recurse to
+// objc.
+static inline CFTypeRef FastReadValue(
+    unsigned long* location,
+    CFDataRef data,
+    CFTypeRef (*ReadValue)(CFTypeRef),
+    CFTypeRef (*ReadTypedDataOfType)(FlutterStandardField, CFTypeRef),
+    CFTypeRef user_data) {
+  uint8_t type = PeekByte(*location, data);
+  if (FlutterStandardFieldIsStandardType(type)) {
+    *location += 1;
+    return FlutterStandardCodecHelperReadValueOfType(
+        location, data, type, ReadValue, ReadTypedDataOfType, user_data);
+  } else {
+    return ReadValue(user_data);
+  }
+}
+
+CFTypeRef FlutterStandardCodecHelperReadValueOfType(
+    unsigned long* location,
+    CFDataRef data,
+    uint8_t type,
+    CFTypeRef (*ReadValue)(CFTypeRef),
+    CFTypeRef (*ReadTypedDataOfType)(FlutterStandardField, CFTypeRef),
+    CFTypeRef user_data) {
+  FlutterStandardField field = (FlutterStandardField)type;
+  switch (field) {
+    case FlutterStandardFieldNil:
+      return nil;
+    case FlutterStandardFieldTrue:
+      return kCFBooleanTrue;
+    case FlutterStandardFieldFalse:
+      return kCFBooleanFalse;
+    case FlutterStandardFieldInt32: {
+      int32_t value;
+      FlutterStandardCodecHelperReadBytes(location, 4, &value, data);
+      return CFAutorelease(
+          CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &value));
+    }
+    case FlutterStandardFieldInt64: {
+      int64_t value;
+      FlutterStandardCodecHelperReadBytes(location, 8, &value, data);
+      return CFAutorelease(
+          CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt64Type, &value));
+    }
+    case FlutterStandardFieldFloat64: {
+      Float64 value;
+      FlutterStandardCodecHelperReadAlignment(location, 8);
+      FlutterStandardCodecHelperReadBytes(location, 8, &value, data);
+      return CFAutorelease(
+          CFNumberCreate(kCFAllocatorDefault, kCFNumberDoubleType, &value));
+    }
+    case FlutterStandardFieldIntHex:
+    case FlutterStandardFieldString:
+      return FlutterStandardCodecHelperReadUTF8(location, data);
+    case FlutterStandardFieldUInt8Data:
+    case FlutterStandardFieldInt32Data:
+    case FlutterStandardFieldInt64Data:
+    case FlutterStandardFieldFloat32Data:
+    case FlutterStandardFieldFloat64Data:
+      return ReadTypedDataOfType(field, user_data);
+    case FlutterStandardFieldList: {
+      UInt32 length = FlutterStandardCodecHelperReadSize(location, data);
+      CFMutableArrayRef array = CFArrayCreateMutable(
+          kCFAllocatorDefault, length, &kCFTypeArrayCallBacks);
+      for (UInt32 i = 0; i < length; i++) {
+        CFTypeRef value = FastReadValue(location, data, ReadValue,
+                                        ReadTypedDataOfType, user_data);
+        CFArrayAppendValue(array, (value == nil ? kCFNull : value));
+      }
+      return CFAutorelease(array);
+    }
+    case FlutterStandardFieldMap: {
+      UInt32 size = FlutterStandardCodecHelperReadSize(location, data);
+      CFMutableDictionaryRef dict = CFDictionaryCreateMutable(
+          kCFAllocatorDefault, size, &kCFTypeDictionaryKeyCallBacks,
+          &kCFTypeDictionaryValueCallBacks);
+      for (UInt32 i = 0; i < size; i++) {
+        CFTypeRef key = FastReadValue(location, data, ReadValue,
+                                      ReadTypedDataOfType, user_data);
+        CFTypeRef val = FastReadValue(location, data, ReadValue,
+                                      ReadTypedDataOfType, user_data);
+        CFDictionaryAddValue(dict, (key == nil ? kCFNull : key),
+                             (val == nil ? kCFNull : val));
+      }
+      return CFAutorelease(dict);
+    }
+    default:
+      // Malformed message.
+      FML_DCHECK(false);
+  }
+}
+
+void FlutterStandardCodecHelperWriteByte(CFMutableDataRef data, uint8_t value) {
+  CFDataAppendBytes(data, &value, 1);
+}
+
+void FlutterStandardCodecHelperWriteBytes(CFMutableDataRef data,
+                                          const void* bytes,
+                                          unsigned long length) {
+  CFDataAppendBytes(data, static_cast<const UInt8*>(bytes), length);
+}
+
+void FlutterStandardCodecHelperWriteSize(CFMutableDataRef data, uint32_t size) {
+  if (size < 254) {
+    FlutterStandardCodecHelperWriteByte(data, size);
+  } else if (size <= 0xffff) {
+    FlutterStandardCodecHelperWriteByte(data, 254);
+    UInt16 value = (UInt16)size;
+    FlutterStandardCodecHelperWriteBytes(data, &value, 2);
+  } else {
+    FlutterStandardCodecHelperWriteByte(data, 255);
+    FlutterStandardCodecHelperWriteBytes(data, &size, 4);
+  }
+}
+
+void FlutterStandardCodecHelperWriteAlignment(CFMutableDataRef data,
+                                              uint8_t alignment) {
+  uint8_t mod = CFDataGetLength(data) % alignment;
+  if (mod) {
+    for (int i = 0; i < (alignment - mod); i++) {
+      FlutterStandardCodecHelperWriteByte(data, 0);
+    }
+  }
+}
+
+void FlutterStandardCodecHelperWriteUTF8(CFMutableDataRef data,
+                                         CFStringRef value) {
+  const char* utf8 = CFStringGetCStringPtr(value, kCFStringEncodingUTF8);
+  if (utf8) {
+    size_t length = strlen(utf8);
+    FlutterStandardCodecHelperWriteSize(data, length);
+    FlutterStandardCodecHelperWriteBytes(data, utf8, length);
+  } else {
+    CFIndex length = CFStringGetLength(value);
+    CFIndex used_length = 0;
+    // UTF16 length times 3 will fit all UTF8.
+    CFIndex buffer_length = length * 3;
+    std::vector<UInt8> buffer;
+    buffer.resize(buffer_length);
+    CFStringGetBytes(value, CFRangeMake(0, length), kCFStringEncodingUTF8, 0,
+                     false, buffer.data(), buffer_length, &used_length);
+    FlutterStandardCodecHelperWriteSize(data, used_length);
+    FlutterStandardCodecHelperWriteBytes(data, buffer.data(), used_length);
+  }
+}
+
+void FlutterStandardCodecHelperWriteData(CFMutableDataRef data,
+                                         CFDataRef value) {
+  const UInt8* bytes = CFDataGetBytePtr(value);
+  CFIndex length = CFDataGetLength(value);
+  FlutterStandardCodecHelperWriteBytes(data, bytes, length);
+}
+
+bool FlutterStandardCodecHelperWriteNumber(CFMutableDataRef data,
+                                           CFNumberRef number) {
+  bool success = false;
+  if (CFGetTypeID(number) == CFBooleanGetTypeID()) {
+    bool b = CFBooleanGetValue((CFBooleanRef)number);
+    FlutterStandardCodecHelperWriteByte(
+        data, (b ? FlutterStandardFieldTrue : FlutterStandardFieldFalse));
+    success = true;
+  } else if (CFNumberIsFloatType(number)) {
+    Float64 f;
+    success = CFNumberGetValue(number, kCFNumberFloat64Type, &f);
+    if (success) {
+      FlutterStandardCodecHelperWriteByte(data, FlutterStandardFieldFloat64);
+      FlutterStandardCodecHelperWriteAlignment(data, 8);
+      FlutterStandardCodecHelperWriteBytes(data, &f, 8);
+    }
+  } else if (CFNumberGetByteSize(number) <= 4) {
+    SInt32 n;
+    success = CFNumberGetValue(number, kCFNumberSInt32Type, &n);
+    if (success) {
+      FlutterStandardCodecHelperWriteByte(data, FlutterStandardFieldInt32);
+      FlutterStandardCodecHelperWriteBytes(data, &n, 4);
+    }
+  } else if (CFNumberGetByteSize(number) <= 8) {
+    SInt64 n;
+    success = CFNumberGetValue(number, kCFNumberSInt64Type, &n);
+    if (success) {
+      FlutterStandardCodecHelperWriteByte(data, FlutterStandardFieldInt64);
+      FlutterStandardCodecHelperWriteBytes(data, &n, 8);
+    }
+  }
+  return success;
+}
+
+// NOLINTEND(google-runtime-int)
diff --git a/shell/platform/darwin/common/framework/Source/FlutterStandardCodecHelper.h b/shell/platform/darwin/common/framework/Source/FlutterStandardCodecHelper.h
new file mode 100644
index 0000000000000000000000000000000000000000..aebe3689fb4517d13211741f2c9a6efc4ed3fc89
--- /dev/null
+++ b/shell/platform/darwin/common/framework/Source/FlutterStandardCodecHelper.h
@@ -0,0 +1,123 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_SOURCE_FLUTTERSTANDARDCODECHELPER_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_SOURCE_FLUTTERSTANDARDCODECHELPER_H_
+
+#include <CoreFoundation/CoreFoundation.h>
+#include <stdbool.h>
+#include <stdint.h>
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+// NOLINTBEGIN(google-runtime-int)
+
+// Note: Update FlutterStandardFieldIsStandardType if this changes.
+typedef enum {
+  // NOLINTBEGIN(readability-identifier-naming)
+  FlutterStandardFieldNil,
+  FlutterStandardFieldTrue,
+  FlutterStandardFieldFalse,
+  FlutterStandardFieldInt32,
+  FlutterStandardFieldInt64,
+  FlutterStandardFieldIntHex,
+  FlutterStandardFieldFloat64,
+  FlutterStandardFieldString,
+  FlutterStandardFieldUInt8Data,
+  FlutterStandardFieldInt32Data,
+  FlutterStandardFieldInt64Data,
+  FlutterStandardFieldFloat64Data,
+  FlutterStandardFieldList,
+  FlutterStandardFieldMap,
+  FlutterStandardFieldFloat32Data,
+  // NOLINTEND(readability-identifier-naming)
+} FlutterStandardField;
+
+static inline bool FlutterStandardFieldIsStandardType(uint8_t field) {
+  return field <= FlutterStandardFieldFloat32Data &&
+         field >= FlutterStandardFieldNil;
+}
+
+typedef enum {
+  // NOLINTBEGIN(readability-identifier-naming)
+  FlutterStandardCodecObjcTypeNil,
+  FlutterStandardCodecObjcTypeNSNumber,
+  FlutterStandardCodecObjcTypeNSString,
+  FlutterStandardCodecObjcTypeFlutterStandardTypedData,
+  FlutterStandardCodecObjcTypeNSData,
+  FlutterStandardCodecObjcTypeNSArray,
+  FlutterStandardCodecObjcTypeNSDictionary,
+  FlutterStandardCodecObjcTypeUnknown,
+  // NOLINTEND(readability-identifier-naming)
+} FlutterStandardCodecObjcType;
+
+// NOLINTBEGIN(google-objc-function-naming)
+
+///////////////////////////////////////////////////////////////////////////////
+///\name Reader Helpers
+///@{
+
+void FlutterStandardCodecHelperReadAlignment(unsigned long* location,
+                                             uint8_t alignment);
+
+void FlutterStandardCodecHelperReadBytes(unsigned long* location,
+                                         unsigned long length,
+                                         void* destination,
+                                         CFDataRef data);
+
+uint8_t FlutterStandardCodecHelperReadByte(unsigned long* location,
+                                           CFDataRef data);
+
+uint32_t FlutterStandardCodecHelperReadSize(unsigned long* location,
+                                            CFDataRef data);
+
+CFStringRef FlutterStandardCodecHelperReadUTF8(unsigned long* location,
+                                               CFDataRef data);
+
+CFTypeRef FlutterStandardCodecHelperReadValueOfType(
+    unsigned long* location,
+    CFDataRef data,
+    uint8_t type,
+    CFTypeRef (*ReadValue)(CFTypeRef),
+    CFTypeRef (*ReadTypedDataOfType)(FlutterStandardField, CFTypeRef),
+    CFTypeRef user_data);
+
+///@}
+
+///////////////////////////////////////////////////////////////////////////////
+///\name Writer Helpers
+///@{
+
+void FlutterStandardCodecHelperWriteByte(CFMutableDataRef data, uint8_t value);
+
+void FlutterStandardCodecHelperWriteBytes(CFMutableDataRef data,
+                                          const void* bytes,
+                                          unsigned long length);
+
+void FlutterStandardCodecHelperWriteSize(CFMutableDataRef data, uint32_t size);
+
+void FlutterStandardCodecHelperWriteAlignment(CFMutableDataRef data,
+                                              uint8_t alignment);
+
+void FlutterStandardCodecHelperWriteUTF8(CFMutableDataRef data,
+                                         CFStringRef value);
+
+void FlutterStandardCodecHelperWriteData(CFMutableDataRef data,
+                                         CFDataRef value);
+
+bool FlutterStandardCodecHelperWriteNumber(CFMutableDataRef data,
+                                           CFNumberRef number);
+
+///@}
+
+// NOLINTEND(google-objc-function-naming)
+// NOLINTEND(google-runtime-int)
+
+#if defined(__cplusplus)
+}
+#endif
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_SOURCE_FLUTTERSTANDARDCODECHELPER_H_
diff --git a/shell/platform/darwin/common/framework/Source/FlutterStandardCodec_Internal.h b/shell/platform/darwin/common/framework/Source/FlutterStandardCodec_Internal.h
index 88d7f277476eaca10f98cf3071fc90a31b9d0d3b..c0a4a217b17e14103f8445e437a52dcffd95b642 100644
--- a/shell/platform/darwin/common/framework/Source/FlutterStandardCodec_Internal.h
+++ b/shell/platform/darwin/common/framework/Source/FlutterStandardCodec_Internal.h
@@ -2,31 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_SOURCE_FLUTTERSTANDARDCODECINTERNAL_H_
-#define SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_SOURCE_FLUTTERSTANDARDCODECINTERNAL_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_SOURCE_FLUTTERSTANDARDCODEC_INTERNAL_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_SOURCE_FLUTTERSTANDARDCODEC_INTERNAL_H_
 
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterCodecs.h"
-
-typedef NS_ENUM(NSInteger, FlutterStandardField) {
-  FlutterStandardFieldNil,
-  FlutterStandardFieldTrue,
-  FlutterStandardFieldFalse,
-  FlutterStandardFieldInt32,
-  FlutterStandardFieldInt64,
-  FlutterStandardFieldIntHex,
-  FlutterStandardFieldFloat64,
-  FlutterStandardFieldString,
-  FlutterStandardFieldUInt8Data,
-  FlutterStandardFieldInt32Data,
-  FlutterStandardFieldInt64Data,
-  FlutterStandardFieldFloat64Data,
-  FlutterStandardFieldList,
-  FlutterStandardFieldMap,
-  FlutterStandardFieldFloat32Data,
-};
+#import "flutter/shell/platform/darwin/common/framework/Source/FlutterStandardCodecHelper.h"
 
 namespace flutter {
-FlutterStandardField FlutterStandardFieldForDataType(FlutterStandardDataType type) {
+FlutterStandardField FlutterStandardFieldForDataType(
+    FlutterStandardDataType type) {
   switch (type) {
     case FlutterStandardDataTypeUInt8:
       return FlutterStandardFieldUInt8Data;
@@ -40,7 +24,8 @@ FlutterStandardField FlutterStandardFieldForDataType(FlutterStandardDataType typ
       return FlutterStandardFieldFloat64Data;
   }
 }
-FlutterStandardDataType FlutterStandardDataTypeForField(FlutterStandardField field) {
+FlutterStandardDataType FlutterStandardDataTypeForField(
+    FlutterStandardField field) {
   switch (field) {
     case FlutterStandardFieldUInt8Data:
       return FlutterStandardDataTypeUInt8;
@@ -73,4 +58,4 @@ UInt8 elementSizeForFlutterStandardDataType(FlutterStandardDataType type) {
 }
 }  // namespace flutter
 
-#endif  // SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERSTANDARDCODECINTERNAL_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_SOURCE_FLUTTERSTANDARDCODEC_INTERNAL_H_
diff --git a/shell/platform/darwin/common/framework/Source/FlutterTestUtils.h b/shell/platform/darwin/common/framework/Source/FlutterTestUtils.h
new file mode 100644
index 0000000000000000000000000000000000000000..29e5bb2d7e5f41cf45288b370f30e93c270c8d82
--- /dev/null
+++ b/shell/platform/darwin/common/framework/Source/FlutterTestUtils.h
@@ -0,0 +1,13 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_SOURCE_FLUTTERTESTUTILS_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_SOURCE_FLUTTERTESTUTILS_H_
+
+#import <Foundation/Foundation.h>
+
+/// Returns YES if the block throws an exception.
+BOOL FLTThrowsObjcException(dispatch_block_t block);
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_SOURCE_FLUTTERTESTUTILS_H_
diff --git a/shell/platform/darwin/common/framework/Source/FlutterTestUtils.mm b/shell/platform/darwin/common/framework/Source/FlutterTestUtils.mm
new file mode 100644
index 0000000000000000000000000000000000000000..3a562ccb6ce8a72d3e57fbe02da4e388cf0c6114
--- /dev/null
+++ b/shell/platform/darwin/common/framework/Source/FlutterTestUtils.mm
@@ -0,0 +1,18 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "flutter/shell/platform/darwin/common/framework/Source/FlutterTestUtils.h"
+
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
+
+FLUTTER_ASSERT_ARC
+
+BOOL FLTThrowsObjcException(dispatch_block_t block) {
+  @try {
+    block();
+  } @catch (...) {
+    return YES;
+  }
+  return NO;
+}
diff --git a/shell/platform/darwin/common/framework/Source/flutter_codecs_unittest.mm b/shell/platform/darwin/common/framework/Source/flutter_codecs_unittest.mm
index 226afbe82a3c0cddacfc93883cb1c2d5cdc591cd..c9ab8fdaaac520f0da8d6728d727bf09619ad21f 100644
--- a/shell/platform/darwin/common/framework/Source/flutter_codecs_unittest.mm
+++ b/shell/platform/darwin/common/framework/Source/flutter_codecs_unittest.mm
@@ -6,6 +6,8 @@
 
 #include "gtest/gtest.h"
 
+FLUTTER_ASSERT_ARC
+
 TEST(FlutterStringCodec, CanEncodeAndDecodeNil) {
   FlutterStringCodec* codec = [FlutterStringCodec sharedInstance];
   ASSERT_TRUE([codec encode:nil] == nil);
@@ -42,11 +44,26 @@ TEST(FlutterStringCodec, CanEncodeAndDecodeNonBMPString) {
   ASSERT_TRUE([value isEqualTo:decoded]);
 }
 
+TEST(FlutterJSONCodec, ThrowsOnInvalidEncode) {
+  NSString* value = [[NSString alloc] initWithBytes:"\xdf\xff"
+                                             length:2
+                                           encoding:NSUTF16StringEncoding];
+  FlutterJSONMessageCodec* codec = [FlutterJSONMessageCodec sharedInstance];
+  EXPECT_EXIT([codec encode:value], testing::KilledBySignal(SIGABRT), "failed to convert to UTF8");
+}
+
 TEST(FlutterJSONCodec, CanDecodeZeroLength) {
   FlutterJSONMessageCodec* codec = [FlutterJSONMessageCodec sharedInstance];
   ASSERT_TRUE([codec decode:[NSData data]] == nil);
 }
 
+TEST(FlutterJSONCodec, ThrowsOnInvalidDecode) {
+  NSString* value = @"{{{";
+  FlutterJSONMessageCodec* codec = [FlutterJSONMessageCodec sharedInstance];
+  EXPECT_EXIT([codec decode:[value dataUsingEncoding:value.fastestEncoding]],
+              testing::KilledBySignal(SIGABRT), "No string key for value in object around line 1");
+}
+
 TEST(FlutterJSONCodec, CanEncodeAndDecodeNil) {
   FlutterJSONMessageCodec* codec = [FlutterJSONMessageCodec sharedInstance];
   ASSERT_TRUE([codec encode:nil] == nil);
diff --git a/shell/platform/darwin/common/framework/Source/flutter_standard_codec_unittest.mm b/shell/platform/darwin/common/framework/Source/flutter_standard_codec_unittest.mm
index 946580eb3bf83c04d09f829e4f0c5bf7ab7174f4..3489cec7c0030fdf21b0e20bf5a9e2c5f9c294e5 100644
--- a/shell/platform/darwin/common/framework/Source/flutter_standard_codec_unittest.mm
+++ b/shell/platform/darwin/common/framework/Source/flutter_standard_codec_unittest.mm
@@ -4,8 +4,91 @@
 
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterCodecs.h"
 
+#include <CoreFoundation/CoreFoundation.h>
+
 #include "gtest/gtest.h"
 
+FLUTTER_ASSERT_ARC
+
+@interface Pair : NSObject
+@property(atomic, readonly, strong, nullable) NSObject* left;
+@property(atomic, readonly, strong, nullable) NSObject* right;
+- (instancetype)initWithLeft:(NSObject*)first right:(NSObject*)right;
+@end
+
+@implementation Pair
+- (instancetype)initWithLeft:(NSObject*)left right:(NSObject*)right {
+  self = [super init];
+  if (self) {
+    _left = left;
+    _right = right;
+  }
+  return self;
+}
+@end
+
+static const UInt8 kDATE = 128;
+static const UInt8 kPAIR = 129;
+
+@interface ExtendedWriter : FlutterStandardWriter
+- (void)writeValue:(id)value;
+@end
+
+@implementation ExtendedWriter
+- (void)writeValue:(id)value {
+  if ([value isKindOfClass:[NSDate class]]) {
+    [self writeByte:kDATE];
+    NSDate* date = value;
+    NSTimeInterval time = date.timeIntervalSince1970;
+    SInt64 ms = (SInt64)(time * 1000.0);
+    [self writeBytes:&ms length:8];
+  } else if ([value isKindOfClass:[Pair class]]) {
+    Pair* pair = value;
+    [self writeByte:kPAIR];
+    [self writeValue:pair.left];
+    [self writeValue:pair.right];
+  } else {
+    [super writeValue:value];
+  }
+}
+@end
+
+@interface ExtendedReader : FlutterStandardReader
+- (id)readValueOfType:(UInt8)type;
+@end
+
+@implementation ExtendedReader
+- (id)readValueOfType:(UInt8)type {
+  switch (type) {
+    case kDATE: {
+      SInt64 value;
+      [self readBytes:&value length:8];
+      NSTimeInterval time = [NSNumber numberWithLong:value].doubleValue / 1000.0;
+      return [NSDate dateWithTimeIntervalSince1970:time];
+    }
+    case kPAIR: {
+      return [[Pair alloc] initWithLeft:[self readValue] right:[self readValue]];
+    }
+    default:
+      return [super readValueOfType:type];
+  }
+}
+@end
+
+@interface ExtendedReaderWriter : FlutterStandardReaderWriter
+- (FlutterStandardWriter*)writerWithData:(NSMutableData*)data;
+- (FlutterStandardReader*)readerWithData:(NSData*)data;
+@end
+
+@implementation ExtendedReaderWriter
+- (FlutterStandardWriter*)writerWithData:(NSMutableData*)data {
+  return [[ExtendedWriter alloc] initWithData:data];
+}
+- (FlutterStandardReader*)readerWithData:(NSData*)data {
+  return [[ExtendedReader alloc] initWithData:data];
+}
+@end
+
 static void CheckEncodeDecode(id value, NSData* expectedEncoding) {
   FlutterStandardMessageCodec* codec = [FlutterStandardMessageCodec sharedInstance];
   NSData* encoded = [codec encode:value];
@@ -134,6 +217,19 @@ TEST(FlutterStandardCodec, CanEncodeAndDecodeStringWithNonBMPCodePoint) {
   CheckEncodeDecode(@"h\U0001F602w", [NSData dataWithBytes:bytes length:8]);
 }
 
+TEST(FlutterStandardCodec, CanEncodeAndDecodeIndirectString) {
+  // This test ensures that an indirect NSString, whose internal string buffer
+  // can't be simply returned by `CFStringGetCStringPtr`, can be encoded without
+  // violating the memory sanitizer. This test only works with `--asan` flag.
+  // See https://github.com/flutter/flutter/issues/142101
+  uint8_t bytes[7] = {0x07, 0x05, 0x68, 0xe2, 0x98, 0xba, 0x77};
+  NSString* target = @"h\u263Aw";
+  // Ensures that this is an indirect string so that this test makes sense.
+  ASSERT_TRUE(CFStringGetCStringPtr((__bridge CFStringRef)target, kCFStringEncodingUTF8) ==
+              nullptr);
+  CheckEncodeDecode(target, [NSData dataWithBytes:bytes length:7]);
+}
+
 TEST(FlutterStandardCodec, CanEncodeAndDecodeArray) {
   NSArray* value = @[ [NSNull null], @"hello", @3.14, @47, @{@42 : @"nested"} ];
   CheckEncodeDecode(value);
@@ -252,3 +348,14 @@ TEST(FlutterStandardCodec, HandlesErrorEnvelopes) {
   id decoded = [codec decodeEnvelope:encoded];
   ASSERT_TRUE([decoded isEqual:error]);
 }
+
+TEST(FlutterStandardCodec, HandlesSubclasses) {
+  ExtendedReaderWriter* extendedReaderWriter = [[ExtendedReaderWriter alloc] init];
+  FlutterStandardMessageCodec* codec =
+      [FlutterStandardMessageCodec codecWithReaderWriter:extendedReaderWriter];
+  Pair* pair = [[Pair alloc] initWithLeft:@1 right:@2];
+  NSData* encoded = [codec encode:pair];
+  Pair* decoded = [codec decode:encoded];
+  ASSERT_TRUE([pair.left isEqual:decoded.left]);
+  ASSERT_TRUE([pair.right isEqual:decoded.right]);
+}
diff --git a/shell/platform/darwin/common/framework_shared.gni b/shell/platform/darwin/common/framework_common.gni
similarity index 85%
rename from shell/platform/darwin/common/framework_shared.gni
rename to shell/platform/darwin/common/framework_common.gni
index 8a679c4d6fa25101dd3c870031f1faff833babe4..02bb8b7dfb52199796966ee6edd3127673dfcbbb 100644
--- a/shell/platform/darwin/common/framework_shared.gni
+++ b/shell/platform/darwin/common/framework_common.gni
@@ -2,12 +2,13 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-framework_shared_headers =
+framework_common_headers =
     get_path_info([
                     "framework/Headers/FlutterMacros.h",
                     "framework/Headers/FlutterBinaryMessenger.h",
                     "framework/Headers/FlutterChannels.h",
                     "framework/Headers/FlutterCodecs.h",
                     "framework/Headers/FlutterTexture.h",
+                    "framework/Headers/FlutterDartProject.h",
                   ],
                   "abspath")
diff --git a/shell/platform/darwin/graphics/BUILD.gn b/shell/platform/darwin/graphics/BUILD.gn
index fbb5a7a5b103593fdcc9b8dd383edd071e53cbe0..88ca95c51b5930e279a8a197c29eb3a15686c033 100644
--- a/shell/platform/darwin/graphics/BUILD.gn
+++ b/shell/platform/darwin/graphics/BUILD.gn
@@ -23,7 +23,7 @@ source_set("graphics") {
     "//flutter/display_list",
     "//flutter/fml",
     "//flutter/shell/common",
-    "//flutter/shell/platform/darwin/common:framework_shared",
+    "//flutter/shell/platform/darwin/common:framework_common",
   ]
 
   if (impeller_supports_rendering) {
@@ -36,7 +36,7 @@ source_set("graphics") {
 
   frameworks = [ "CoreVideo.framework" ]
 
-  public_deps = [ "//third_party/skia" ]
+  public_deps = [ "//flutter/skia" ]
 
   public_configs = [ "//flutter:config" ]
 }
diff --git a/shell/platform/darwin/graphics/FlutterDarwinContextMetalImpeller.h b/shell/platform/darwin/graphics/FlutterDarwinContextMetalImpeller.h
index 55fc5ac9b79c3a40f39ca0369958e9c6e42a9186..e4dba2102f59b2f6efc526f1307948110adbc0db 100644
--- a/shell/platform/darwin/graphics/FlutterDarwinContextMetalImpeller.h
+++ b/shell/platform/darwin/graphics/FlutterDarwinContextMetalImpeller.h
@@ -2,13 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_PLATFORM_DARWIN_GRAPHICS_DARWIN_CONTEXT_METAL_IMPELLER_H_
-#define SHELL_PLATFORM_DARWIN_GRAPHICS_DARWIN_CONTEXT_METAL_IMPELLER_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_GRAPHICS_FLUTTERDARWINCONTEXTMETALIMPELLER_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_GRAPHICS_FLUTTERDARWINCONTEXTMETALIMPELLER_H_
 
 #import <CoreVideo/CVMetalTextureCache.h>
 #import <Foundation/Foundation.h>
 #import <Metal/Metal.h>
 
+#include "flutter/fml/concurrent_message_loop.h"
 #include "flutter/fml/platform/darwin/cf_utils.h"
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterTexture.h"
 #import "flutter/shell/platform/darwin/graphics/FlutterDarwinExternalTextureMetal.h"
@@ -24,7 +25,7 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * Initializes a FlutterDarwinContextMetalImpeller.
  */
-- (instancetype)init;
+- (instancetype)init:(const std::shared_ptr<const fml::SyncSwitch>&)is_gpu_disabled_sync_switch;
 
 /**
  * Creates an external texture with the specified ID and contents.
@@ -34,7 +35,7 @@ NS_ASSUME_NONNULL_BEGIN
                                 texture:(NSObject<FlutterTexture>*)texture;
 
 /**
- * Impeller context;
+ * Impeller context.
  */
 @property(nonatomic, readonly) std::shared_ptr<impeller::ContextMTL> context;
 
@@ -47,4 +48,4 @@ NS_ASSUME_NONNULL_BEGIN
 
 NS_ASSUME_NONNULL_END
 
-#endif  // SHELL_PLATFORM_DARWIN_GRAPHICS_DARWIN_CONTEXT_METAL_IMPELLER_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_GRAPHICS_FLUTTERDARWINCONTEXTMETALIMPELLER_H_
diff --git a/shell/platform/darwin/graphics/FlutterDarwinContextMetalImpeller.mm b/shell/platform/darwin/graphics/FlutterDarwinContextMetalImpeller.mm
index 1ab7dcd51d3c450ec3caa86d6d79f2ec4e608bc7..76f710954c7dbe5b7dd9062f73a6f9eb933d8c9e 100644
--- a/shell/platform/darwin/graphics/FlutterDarwinContextMetalImpeller.mm
+++ b/shell/platform/darwin/graphics/FlutterDarwinContextMetalImpeller.mm
@@ -6,37 +6,49 @@
 
 #include "flutter/common/graphics/persistent_cache.h"
 #include "flutter/fml/logging.h"
-#include "flutter/impeller/entity/mtl/entity_shaders.h"
 #include "flutter/impeller/renderer/backend/metal/context_mtl.h"
 #include "flutter/shell/common/context_options.h"
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
+#include "impeller/entity/mtl/entity_shaders.h"
+#include "impeller/entity/mtl/framebuffer_blend_shaders.h"
 #include "impeller/entity/mtl/modern_shaders.h"
 
+#if IMPELLER_ENABLE_3D
+#include "impeller/scene/shaders/mtl/scene_shaders.h"  // nogncheck
+#endif                                                 // IMPELLER_ENABLE_3D
+
 FLUTTER_ASSERT_ARC
 
-static std::shared_ptr<impeller::ContextMTL> CreateImpellerContext() {
+static std::shared_ptr<impeller::ContextMTL> CreateImpellerContext(
+    const std::shared_ptr<const fml::SyncSwitch>& is_gpu_disabled_sync_switch) {
   std::vector<std::shared_ptr<fml::Mapping>> shader_mappings = {
       std::make_shared<fml::NonOwnedMapping>(impeller_entity_shaders_data,
                                              impeller_entity_shaders_length),
+#if IMPELLER_ENABLE_3D
+      std::make_shared<fml::NonOwnedMapping>(impeller_scene_shaders_data,
+                                             impeller_scene_shaders_length),
+#endif  // IMPELLER_ENABLE_3D
       std::make_shared<fml::NonOwnedMapping>(impeller_modern_shaders_data,
                                              impeller_modern_shaders_length),
+      std::make_shared<fml::NonOwnedMapping>(impeller_framebuffer_blend_shaders_data,
+                                             impeller_framebuffer_blend_shaders_length),
   };
-  auto context = impeller::ContextMTL::Create(shader_mappings, "Impeller Library");
+  auto context = impeller::ContextMTL::Create(shader_mappings, is_gpu_disabled_sync_switch,
+                                              "Impeller Library");
   if (!context) {
     FML_LOG(ERROR) << "Could not create Metal Impeller Context.";
     return nullptr;
   }
-  FML_LOG(ERROR) << "Using the Impeller rendering backend.";
 
   return context;
 }
 
 @implementation FlutterDarwinContextMetalImpeller
 
-- (instancetype)init {
+- (instancetype)init:(const std::shared_ptr<const fml::SyncSwitch>&)is_gpu_disabled_sync_switch {
   self = [super init];
   if (self != nil) {
-    _context = CreateImpellerContext();
+    _context = CreateImpellerContext(is_gpu_disabled_sync_switch);
     id<MTLDevice> device = _context->GetMTLDevice();
     if (!device) {
       FML_DLOG(ERROR) << "Could not acquire Metal device.";
diff --git a/shell/platform/darwin/graphics/FlutterDarwinContextMetalSkia.h b/shell/platform/darwin/graphics/FlutterDarwinContextMetalSkia.h
index 02eb2197332fe0708b0fb6a5e7e3f685aab05226..e1eed1df618695800f6c50fa0e8ba4d8494708d9 100644
--- a/shell/platform/darwin/graphics/FlutterDarwinContextMetalSkia.h
+++ b/shell/platform/darwin/graphics/FlutterDarwinContextMetalSkia.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_PLATFORM_DARWIN_GRAPHICS_DARWIN_CONTEXT_METAL_H_
-#define SHELL_PLATFORM_DARWIN_GRAPHICS_DARWIN_CONTEXT_METAL_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_GRAPHICS_FLUTTERDARWINCONTEXTMETALSKIA_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_GRAPHICS_FLUTTERDARWINCONTEXTMETALSKIA_H_
 
 #import <CoreVideo/CVMetalTextureCache.h>
 #import <Foundation/Foundation.h>
@@ -75,4 +75,4 @@ NS_ASSUME_NONNULL_BEGIN
 
 NS_ASSUME_NONNULL_END
 
-#endif  // SHELL_PLATFORM_DARWIN_GRAPHICS_DARWIN_CONTEXT_METAL_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_GRAPHICS_FLUTTERDARWINCONTEXTMETALSKIA_H_
diff --git a/shell/platform/darwin/graphics/FlutterDarwinContextMetalSkia.mm b/shell/platform/darwin/graphics/FlutterDarwinContextMetalSkia.mm
index c6e1321b19f8ce767086d2c45922f17f35555e3d..1f787455855332a6503388767e22e381a5c0f7fb 100644
--- a/shell/platform/darwin/graphics/FlutterDarwinContextMetalSkia.mm
+++ b/shell/platform/darwin/graphics/FlutterDarwinContextMetalSkia.mm
@@ -8,6 +8,9 @@
 #include "flutter/fml/logging.h"
 #include "flutter/shell/common/context_options.h"
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
+#include "third_party/skia/include/gpu/GrDirectContext.h"
+#include "third_party/skia/include/gpu/ganesh/mtl/GrMtlBackendContext.h"
+#include "third_party/skia/include/gpu/ganesh/mtl/GrMtlDirectContext.h"
 
 FLUTTER_ASSERT_ARC
 
@@ -60,6 +63,8 @@ FLUTTER_ASSERT_ARC
       return nil;
     }
 
+    FML_LOG(IMPORTANT) << "Using the Skia rendering backend (Metal).";
+
     _resourceContext->setResourceCacheLimit(0u);
   }
   return self;
@@ -77,10 +82,12 @@ FLUTTER_ASSERT_ARC
                              commandQueue:(id<MTLCommandQueue>)commandQueue {
   const auto contextOptions =
       flutter::MakeDefaultContextOptions(flutter::ContextType::kRender, GrBackendApi::kMetal);
+  GrMtlBackendContext backendContext = {};
   // Skia expect arguments to `MakeMetal` transfer ownership of the reference in for release later
   // when the GrDirectContext is collected.
-  return GrDirectContext::MakeMetal((__bridge_retained void*)device,
-                                    (__bridge_retained void*)commandQueue, contextOptions);
+  backendContext.fDevice.reset((__bridge_retained void*)device);
+  backendContext.fQueue.reset((__bridge_retained void*)commandQueue);
+  return GrDirectContexts::MakeMetal(backendContext, contextOptions);
 }
 
 - (void)dealloc {
diff --git a/shell/platform/darwin/graphics/FlutterDarwinExternalTextureMetal.h b/shell/platform/darwin/graphics/FlutterDarwinExternalTextureMetal.h
index 46fcf8d42ced635abc92607dce0f36ac0478c688..683d515dfc08793f4b57356ba1b0388c9ba42afa 100644
--- a/shell/platform/darwin/graphics/FlutterDarwinExternalTextureMetal.h
+++ b/shell/platform/darwin/graphics/FlutterDarwinExternalTextureMetal.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_GRAPHICS_FLUTTERDARWINEXTERNALTEXTUREMETAL_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_GRAPHICS_FLUTTERDARWINEXTERNALTEXTUREMETAL_H_
+
 #import <Foundation/Foundation.h>
 #import <Metal/Metal.h>
 
@@ -36,7 +39,7 @@
 - (void)paintContext:(flutter::Texture::PaintContext&)context
               bounds:(const SkRect&)bounds
               freeze:(BOOL)freeze
-            sampling:(const SkSamplingOptions&)sampling;
+            sampling:(const flutter::DlImageSampling)sampling;
 
 - (void)onGrContextCreated;
 
@@ -49,3 +52,5 @@
 @property(nonatomic, readonly) int64_t textureID;
 
 @end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_GRAPHICS_FLUTTERDARWINEXTERNALTEXTUREMETAL_H_
diff --git a/shell/platform/darwin/graphics/FlutterDarwinExternalTextureMetal.mm b/shell/platform/darwin/graphics/FlutterDarwinExternalTextureMetal.mm
index 63552ed4f8bf8fbed1209cc09aed34f6c693abed..79a7eadff3de64584551c624d8f49c111c2c3b6b 100644
--- a/shell/platform/darwin/graphics/FlutterDarwinExternalTextureMetal.mm
+++ b/shell/platform/darwin/graphics/FlutterDarwinExternalTextureMetal.mm
@@ -3,16 +3,19 @@
 // found in the LICENSE file.
 
 #import "flutter/shell/platform/darwin/graphics/FlutterDarwinExternalTextureMetal.h"
-#include "flutter/display_list/display_list_image.h"
+#include "flutter/display_list/image/dl_image.h"
 #include "impeller/base/validation.h"
-#include "impeller/display_list/display_list_image_impeller.h"
+#include "impeller/display_list/dl_image_impeller.h"
 #include "impeller/renderer/backend/metal/texture_mtl.h"
 #include "third_party/skia/include/core/SkColorSpace.h"
+#include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkYUVAInfo.h"
+#include "third_party/skia/include/gpu/GpuTypes.h"
 #include "third_party/skia/include/gpu/GrBackendSurface.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
 #include "third_party/skia/include/gpu/GrYUVABackendTextures.h"
-#include "third_party/skia/include/gpu/mtl/GrMtlTypes.h"
+#include "third_party/skia/include/gpu/ganesh/SkImageGanesh.h"
+#include "third_party/skia/include/ports/SkCFObject.h"
 
 FLUTTER_ASSERT_ARC
 
@@ -54,7 +57,7 @@ FLUTTER_ASSERT_ARC
 - (void)paintContext:(flutter::Texture::PaintContext&)context
               bounds:(const SkRect&)bounds
               freeze:(BOOL)freeze
-            sampling:(const SkSamplingOptions&)sampling {
+            sampling:(const flutter::DlImageSampling)sampling {
   const bool needsUpdatedTexture = (!freeze && _textureFrameAvailable) || !_externalImage;
 
   if (needsUpdatedTexture) {
@@ -62,25 +65,12 @@ FLUTTER_ASSERT_ARC
   }
 
   if (_externalImage) {
-    if (_enableImpeller) {
-      context.builder->drawImageRect(
-          _externalImage,                                       // image
-          SkRect::Make(_externalImage->bounds()),               // source rect
-          bounds,                                               // destination rect
-          flutter::ToDl(sampling),                              // sampling
-          context.dl_paint,                                     // paint
-          SkCanvas::SrcRectConstraint::kFast_SrcRectConstraint  // constraint
-      );
-      return;
-    }
-
-    context.canvas->drawImageRect(
-        _externalImage->skia_image(),                         // image
-        SkRect::Make(_externalImage->bounds()),               // source rect
-        bounds,                                               // destination rect
-        sampling,                                             // sampling
-        context.sk_paint,                                     // paint
-        SkCanvas::SrcRectConstraint::kFast_SrcRectConstraint  // constraint
+    context.canvas->DrawImageRect(_externalImage,                                // image
+                                  SkRect::Make(_externalImage->bounds()),        // source rect
+                                  bounds,                                        // destination rect
+                                  sampling,                                      // sampling
+                                  context.paint,                                 // paint
+                                  flutter::DlCanvas::SrcRectConstraint::kStrict  // enforce edges
     );
   }
 }
@@ -207,7 +197,7 @@ FLUTTER_ASSERT_ARC
     yDesc.size = {textureSize.width(), textureSize.height()};
     yDesc.mip_count = 1;
     auto yTexture = impeller::TextureMTL::Wrapper(yDesc, yTex);
-    yTexture->SetIntent(impeller::TextureIntent::kUploadFromHost);
+    yTexture->SetCoordinateSystem(impeller::TextureCoordinateSystem::kUploadFromHost);
 
     impeller::TextureDescriptor uvDesc;
     uvDesc.storage_mode = impeller::StorageMode::kHostVisible;
@@ -215,7 +205,7 @@ FLUTTER_ASSERT_ARC
     uvDesc.size = {textureSize.width() / 2, textureSize.height() / 2};
     uvDesc.mip_count = 1;
     auto uvTexture = impeller::TextureMTL::Wrapper(uvDesc, uvTex);
-    uvTexture->SetIntent(impeller::TextureIntent::kUploadFromHost);
+    uvTexture->SetCoordinateSystem(impeller::TextureCoordinateSystem::kUploadFromHost);
 
     impeller::YUVColorSpace yuvColorSpace =
         _pixelFormat == kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange
@@ -239,6 +229,7 @@ FLUTTER_ASSERT_ARC
     return nullptr;
   }
 
+  // This image should not escape local use by this flutter::Texture implementation
   return flutter::DlImage::Make(skImage);
 }
 
@@ -273,7 +264,7 @@ FLUTTER_ASSERT_ARC
     desc.size = {textureSize.width(), textureSize.height()};
     desc.mip_count = 1;
     auto texture = impeller::TextureMTL::Wrapper(desc, rgbaTex);
-    texture->SetIntent(impeller::TextureIntent::kUploadFromHost);
+    texture->SetCoordinateSystem(impeller::TextureCoordinateSystem::kUploadFromHost);
     return impeller::DlImageImpeller::Make(texture);
   }
 
@@ -284,6 +275,8 @@ FLUTTER_ASSERT_ARC
   if (!skImage) {
     return nullptr;
   }
+
+  // This image should not escape local use by this flutter::Texture implementation
   return flutter::DlImage::Make(skImage);
 }
 
@@ -303,23 +296,24 @@ FLUTTER_ASSERT_ARC
   GrBackendTexture skiaBackendTextures[2];
   skiaBackendTextures[0] = GrBackendTexture(/*width=*/width,
                                             /*height=*/height,
-                                            /*mipMapped=*/GrMipMapped::kNo,
-                                            /*textureInfo=*/ySkiaTextureInfo);
+                                            /*mipMapped=*/skgpu::Mipmapped::kNo,
+                                            /*mtlInfo=*/ySkiaTextureInfo);
 
   GrMtlTextureInfo uvSkiaTextureInfo;
   uvSkiaTextureInfo.fTexture = sk_cfp<const void*>{(__bridge_retained const void*)uvTex};
 
   skiaBackendTextures[1] = GrBackendTexture(/*width=*/width,
                                             /*height=*/height,
-                                            /*mipMapped=*/GrMipMapped::kNo,
-                                            /*textureInfo=*/uvSkiaTextureInfo);
+                                            /*mipMapped=*/skgpu::Mipmapped::kNo,
+                                            /*mtlInfo=*/uvSkiaTextureInfo);
   SkYUVAInfo yuvaInfo(skiaBackendTextures[0].dimensions(), SkYUVAInfo::PlaneConfig::kY_UV,
                       SkYUVAInfo::Subsampling::k444, colorSpace);
   GrYUVABackendTextures yuvaBackendTextures(yuvaInfo, skiaBackendTextures,
                                             kTopLeft_GrSurfaceOrigin);
 
-  return SkImage::MakeFromYUVATextures(grContext, yuvaBackendTextures, /*imageColorSpace=*/nullptr,
-                                       /*releaseProc*/ nullptr, /*releaseContext*/ nullptr);
+  return SkImages::TextureFromYUVATextures(grContext, yuvaBackendTextures,
+                                           /*imageColorSpace=*/nullptr,
+                                           /*releaseProc*/ nullptr, /*releaseContext*/ nullptr);
 }
 
 + (sk_sp<SkImage>)wrapRGBATexture:(id<MTLTexture>)rgbaTex
@@ -331,12 +325,12 @@ FLUTTER_ASSERT_ARC
 
   GrBackendTexture skiaBackendTexture(/*width=*/width,
                                       /*height=*/height,
-                                      /*mipMapped=*/GrMipMapped ::kNo,
-                                      /*textureInfo=*/skiaTextureInfo);
+                                      /*mipMapped=*/skgpu::Mipmapped ::kNo,
+                                      /*mtlInfo=*/skiaTextureInfo);
 
-  return SkImage::MakeFromTexture(grContext, skiaBackendTexture, kTopLeft_GrSurfaceOrigin,
-                                  kBGRA_8888_SkColorType, kPremul_SkAlphaType,
-                                  /*imageColorSpace=*/nullptr, /*releaseProc*/ nullptr,
-                                  /*releaseContext*/ nullptr);
+  return SkImages::BorrowTextureFrom(grContext, skiaBackendTexture, kTopLeft_GrSurfaceOrigin,
+                                     kBGRA_8888_SkColorType, kPremul_SkAlphaType,
+                                     /*colorSpace=*/nullptr, /*releaseProc*/ nullptr,
+                                     /*releaseContext*/ nullptr);
 }
 @end
diff --git a/shell/platform/darwin/ios/BUILD.gn b/shell/platform/darwin/ios/BUILD.gn
index 52e626188993c262f2d8a122ceefbea8be377641..2c8d038e9ccfed5bfc45851e18b71d17290e7c34 100644
--- a/shell/platform/darwin/ios/BUILD.gn
+++ b/shell/platform/darwin/ios/BUILD.gn
@@ -6,10 +6,11 @@ assert(is_ios)
 
 import("//build/config/ios/ios_sdk.gni")
 import("//build/toolchain/clang.gni")
+import("//build/toolchain/toolchain.gni")
 import("//flutter/common/config.gni")
 import("//flutter/shell/config.gni")
 import("//flutter/shell/gpu/gpu.gni")
-import("//flutter/shell/platform/darwin/common/framework_shared.gni")
+import("//flutter/shell/platform/darwin/common/framework_common.gni")
 import("//flutter/testing/testing.gni")
 
 _flutter_framework_dir = "$root_out_dir/Flutter.framework"
@@ -27,7 +28,6 @@ _flutter_framework_headers = [
   "framework/Headers/Flutter.h",
   "framework/Headers/FlutterAppDelegate.h",
   "framework/Headers/FlutterCallbackCache.h",
-  "framework/Headers/FlutterDartProject.h",
   "framework/Headers/FlutterEngine.h",
   "framework/Headers/FlutterEngineGroup.h",
   "framework/Headers/FlutterHeadlessDartRunner.h",
@@ -39,6 +39,39 @@ _flutter_framework_headers = [
 
 _flutter_framework_headers_copy_dir = "$_flutter_framework_dir/Headers"
 
+source_set("flutter_framework_source_arc") {
+  visibility = [ ":*" ]
+  cflags_objc = flutter_cflags_objc_arc
+  cflags_objcc = flutter_cflags_objcc_arc
+
+  defines = [ "FLUTTER_FRAMEWORK=1" ]
+  if (darwin_extension_safe) {
+    defines += [ "APPLICATION_EXTENSION_API_ONLY=1" ]
+  }
+  allow_circular_includes_from = [ ":flutter_framework_source" ]
+  deps = [
+    ":flutter_framework_source",
+    "//flutter/fml",
+    "//flutter/shell/platform/common:common_cpp_input",
+    "//flutter/shell/platform/darwin/common:framework_common",
+    "//flutter/third_party/icu",
+  ]
+  public_configs = [ "//flutter:config" ]
+
+  sources = [
+    "framework/Source/FlutterMetalLayer.h",
+    "framework/Source/FlutterMetalLayer.mm",
+    "framework/Source/FlutterTextInputDelegate.h",
+    "framework/Source/FlutterTextInputPlugin.h",
+    "framework/Source/FlutterTextInputPlugin.mm",
+  ]
+
+  frameworks = [
+    "UIKit.framework",
+    "IOSurface.framework",
+  ]
+}
+
 source_set("flutter_framework_source") {
   visibility = [ ":*" ]
   cflags_objc = flutter_cflags_objc
@@ -47,14 +80,18 @@ source_set("flutter_framework_source") {
   deps = []
 
   sources = [
+    # iOS embedder is migrating to ARC.
+    # New files are highly encouraged to be in ARC.
+    # To add new files in ARC, add them to the `flutter_framework_source_arc` target.
     "framework/Source/FlutterAppDelegate.mm",
-    "framework/Source/FlutterBinaryMessengerRelay.mm",
     "framework/Source/FlutterCallbackCache.mm",
     "framework/Source/FlutterCallbackCache_Internal.h",
     "framework/Source/FlutterChannelKeyResponder.h",
     "framework/Source/FlutterChannelKeyResponder.mm",
     "framework/Source/FlutterDartProject.mm",
     "framework/Source/FlutterDartProject_Internal.h",
+    "framework/Source/FlutterDartVMServicePublisher.h",
+    "framework/Source/FlutterDartVMServicePublisher.mm",
     "framework/Source/FlutterEmbedderKeyResponder.h",
     "framework/Source/FlutterEmbedderKeyResponder.mm",
     "framework/Source/FlutterEngine.mm",
@@ -65,8 +102,6 @@ source_set("flutter_framework_source") {
     "framework/Source/FlutterKeySecondaryResponder.h",
     "framework/Source/FlutterKeyboardManager.h",
     "framework/Source/FlutterKeyboardManager.mm",
-    "framework/Source/FlutterObservatoryPublisher.h",
-    "framework/Source/FlutterObservatoryPublisher.mm",
     "framework/Source/FlutterOverlayView.h",
     "framework/Source/FlutterOverlayView.mm",
     "framework/Source/FlutterPlatformPlugin.h",
@@ -81,9 +116,8 @@ source_set("flutter_framework_source") {
     "framework/Source/FlutterSemanticsScrollView.mm",
     "framework/Source/FlutterSpellCheckPlugin.h",
     "framework/Source/FlutterSpellCheckPlugin.mm",
-    "framework/Source/FlutterTextInputDelegate.h",
-    "framework/Source/FlutterTextInputPlugin.h",
-    "framework/Source/FlutterTextInputPlugin.mm",
+    "framework/Source/FlutterTextureRegistryRelay.h",
+    "framework/Source/FlutterTextureRegistryRelay.mm",
     "framework/Source/FlutterUIPressProxy.h",
     "framework/Source/FlutterUIPressProxy.mm",
     "framework/Source/FlutterUndoManagerDelegate.h",
@@ -97,6 +131,8 @@ source_set("flutter_framework_source") {
     "framework/Source/KeyCodeMap_Internal.h",
     "framework/Source/SemanticsObject.h",
     "framework/Source/SemanticsObject.mm",
+    "framework/Source/UIViewController+FlutterScreenAndSceneIfLoaded.h",
+    "framework/Source/UIViewController+FlutterScreenAndSceneIfLoaded.mm",
     "framework/Source/accessibility_bridge.h",
     "framework/Source/accessibility_bridge.mm",
     "framework/Source/accessibility_text_entry.h",
@@ -130,6 +166,9 @@ source_set("flutter_framework_source") {
   sources += _flutter_framework_headers
 
   defines = [ "FLUTTER_FRAMEWORK=1" ]
+  if (darwin_extension_safe) {
+    defines += [ "APPLICATION_EXTENSION_API_ONLY=1" ]
+  }
 
   if (shell_enable_metal) {
     sources += [
@@ -160,10 +199,11 @@ source_set("flutter_framework_source") {
     "//flutter/shell/common",
     "//flutter/shell/platform/common:common_cpp_input",
     "//flutter/shell/platform/darwin/common",
-    "//flutter/shell/platform/darwin/common:framework_shared",
+    "//flutter/shell/platform/darwin/common:framework_common",
     "//flutter/shell/platform/embedder:embedder_as_internal_library",
     "//flutter/shell/profiling:profiling",
-    "//third_party/skia",
+    "//flutter/skia",
+    "//flutter/third_party/spring_animation",
   ]
 
   public_configs = [
@@ -188,53 +228,21 @@ source_set("flutter_framework_source") {
 platform_frameworks_path =
     rebase_path("$ios_sdk_path/../../Library/Frameworks/")
 
-# For tests that rely on manual reference counting.
-source_set("ios_test_flutter_mrc") {
-  visibility = [ ":*" ]
-  cflags = [
-    "-fvisibility=default",
-    "-F$platform_frameworks_path",
-    "-mios-simulator-version-min=$ios_testing_deployment_target",
-  ]
-  sources = [
-    "framework/Source/FlutterEnginePlatformViewTest.mm",
-    "framework/Source/FlutterEngineTest_mrc.mm",
-    "framework/Source/FlutterPlatformPluginTest.mm",
-    "framework/Source/FlutterPlatformViewsTest.mm",
-    "framework/Source/FlutterViewControllerTest_mrc.mm",
-    "framework/Source/FlutterViewTest.mm",
-    "framework/Source/VsyncWaiterIosTest.mm",
-    "framework/Source/accessibility_bridge_test.mm",
-    "platform_message_handler_ios_test.mm",
-  ]
-  deps = [
-    ":flutter_framework_source",
-    "//flutter/common:common",
-    "//flutter/lib/ui:ui",
-    "//flutter/shell/common:common",
-    "//flutter/shell/platform/darwin/common:framework_shared",
-    "//flutter/shell/platform/embedder:embedder_as_internal_library",
-    "//flutter/third_party/tonic",
-    "//flutter/third_party/txt",
-    "//third_party/ocmock:ocmock_shared",
-    "//third_party/rapidjson",
-    "//third_party/skia",
-  ]
-
-  if (shell_enable_vulkan) {
-    deps += [ "//flutter/vulkan" ]
-  }
-}
-
 shared_library("ios_test_flutter") {
   testonly = true
-  visibility = [ ":*" ]
+  visibility = [ "*" ]
   cflags = [
     "-fvisibility=default",
     "-F$platform_frameworks_path",
     "-fobjc-arc",
     "-mios-simulator-version-min=$ios_testing_deployment_target",
   ]
+
+  # XCode 15 beta has a bug where iOS 17 API usage is not guarded.
+  # This bug results engine build failure since the engine treats warnings as errors.
+  # The `-Wno-unguarded-availability-new` can be removed when the XCode bug is fixed.
+  # See details in https://github.com/flutter/flutter/issues/128958.
+  cflags_objcc = [ "-Wno-unguarded-availability-new" ]
   ldflags = [
     "-F$platform_frameworks_path",
     "-Wl,-install_name,@rpath/Frameworks/libios_test_flutter.dylib",
@@ -246,44 +254,61 @@ shared_library("ios_test_flutter") {
   ]
   sources = [
     "framework/Source/FlutterAppDelegateTest.mm",
-    "framework/Source/FlutterBinaryMessengerRelayTest.mm",
     "framework/Source/FlutterChannelKeyResponderTest.mm",
     "framework/Source/FlutterDartProjectTest.mm",
     "framework/Source/FlutterEmbedderKeyResponderTest.mm",
     "framework/Source/FlutterEngineGroupTest.mm",
+    "framework/Source/FlutterEnginePlatformViewTest.mm",
     "framework/Source/FlutterEngineTest.mm",
     "framework/Source/FlutterFakeKeyEvents.h",
     "framework/Source/FlutterFakeKeyEvents.mm",
     "framework/Source/FlutterKeyboardManagerTest.mm",
+    "framework/Source/FlutterMetalLayerTest.mm",
+    "framework/Source/FlutterPlatformPluginTest.mm",
+    "framework/Source/FlutterPlatformViewsTest.mm",
     "framework/Source/FlutterPluginAppLifeCycleDelegateTest.mm",
     "framework/Source/FlutterRestorationPluginTest.mm",
     "framework/Source/FlutterSpellCheckPluginTest.mm",
     "framework/Source/FlutterTextInputPluginTest.mm",
+    "framework/Source/FlutterTextureRegistryRelayTest.mm",
+    "framework/Source/FlutterTouchInterceptingView_Test.h",
     "framework/Source/FlutterUndoManagerPluginTest.mm",
     "framework/Source/FlutterViewControllerTest.mm",
+    "framework/Source/FlutterViewTest.mm",
     "framework/Source/SemanticsObjectTest.mm",
+    "framework/Source/SemanticsObjectTestMocks.h",
+    "framework/Source/UIViewController_FlutterScreenAndSceneIfLoadedTest.mm",
+    "framework/Source/VsyncWaiterIosTest.mm",
+    "framework/Source/accessibility_bridge_test.mm",
+    "framework/Source/availability_version_check_test.mm",
     "framework/Source/connection_collection_test.mm",
+    "platform_message_handler_ios_test.mm",
   ]
   deps = [
     ":flutter_framework",
     ":flutter_framework_source",
+    ":flutter_framework_source_arc",
     ":ios_gpu_configuration",
-    ":ios_test_flutter_mrc",
     "//flutter/common:common",
     "//flutter/lib/ui:ui",
-    "//flutter/shell/platform/darwin/common:framework_shared",
+    "//flutter/shell/platform/darwin/common:framework_common",
     "//flutter/shell/platform/embedder:embedder_as_internal_library",
     "//flutter/shell/platform/embedder:embedder_test_utils",
+    "//flutter/skia",
+    "//flutter/third_party/ocmock:ocmock_shared",
+    "//flutter/third_party/rapidjson",
+    "//flutter/third_party/spring_animation",
     "//flutter/third_party/tonic",
     "//flutter/third_party/txt",
-    "//third_party/ocmock:ocmock_shared",
-    "//third_party/rapidjson",
-    "//third_party/skia",
   ]
   public_configs = [
     ":ios_gpu_configuration_config",
     "//flutter:config",
   ]
+
+  if (darwin_extension_safe) {
+    defines = [ "APPLICATION_EXTENSION_API_ONLY=1" ]
+  }
 }
 
 shared_library("create_flutter_framework_dylib") {
@@ -293,9 +318,16 @@ shared_library("create_flutter_framework_dylib") {
 
   ldflags = [ "-Wl,-install_name,@rpath/Flutter.framework/Flutter" ]
 
+  if (darwin_extension_safe) {
+    ldflags += [ "-fapplication-extension" ]
+  }
+
   public = _flutter_framework_headers
 
-  deps = [ ":flutter_framework_source" ]
+  deps = [
+    ":flutter_framework_source",
+    ":flutter_framework_source_arc",
+  ]
 
   public_configs = [ "//flutter:config" ]
 }
@@ -313,7 +345,7 @@ copy("copy_asan_runtime_dylib") {
   visibility = [ ":*" ]
 
   _libclang_base_path =
-      "//buildtools/mac-x64/clang/lib/clang/13.0.0/lib/darwin/"
+      "$buildtools_path/mac-x64/clang/lib/clang/13.0.0/lib/darwin/"
 
   if (defined(use_ios_simulator) && use_ios_simulator) {
     _dylib_name = "libclang_rt.asan_iossim_dynamic.dylib"
@@ -348,11 +380,20 @@ copy("copy_framework_module_map") {
   outputs = [ "$_flutter_framework_dir/Modules/module.modulemap" ]
 }
 
+# Copy privacy manifest. This file is required by Apple for third-party SDKs,
+# and documents engine and third_party usage of timestamps and boot time APIs.
+# See https://developer.apple.com/documentation/bundleresources/privacy_manifest_files
+copy("copy_framework_privacy_manifest") {
+  visibility = [ ":*" ]
+  sources = [ "framework/PrivacyInfo.xcprivacy" ]
+  outputs = [ "$_flutter_framework_dir/PrivacyInfo.xcprivacy" ]
+}
+
 action("copy_framework_headers") {
   script = "//flutter/sky/tools/install_framework_headers.py"
   visibility = [ ":*" ]
   sources = get_path_info(_flutter_framework_headers, "abspath") +
-            framework_shared_headers
+            framework_common_headers
   outputs = []
   foreach(header, sources) {
     header_basename = get_path_info(header, "file")
@@ -367,7 +408,7 @@ action("copy_framework_headers") {
 
 copy("copy_framework_icu") {
   visibility = [ ":*" ]
-  sources = [ "//third_party/icu/flutter/icudtl.dat" ]
+  sources = [ "//flutter/third_party/icu/flutter/icudtl.dat" ]
   outputs = [ "$_flutter_framework_dir/{{source_file_part}}" ]
 }
 
@@ -380,14 +421,29 @@ copy("copy_license") {
 shared_library("copy_and_verify_framework_module") {
   framework_search_path = rebase_path("$root_out_dir")
   visibility = [ ":*" ]
-  cflags_objc = [ "-F$framework_search_path" ]
+  cflags_objc = [
+    "-F$framework_search_path",
+    "-fapplication-extension",
+  ]
 
   sources = [ "framework/Source/FlutterUmbrellaImport.m" ]
   deps = [
     ":copy_framework_headers",
     ":copy_framework_info_plist",
     ":copy_framework_module_map",
+    ":copy_framework_privacy_manifest",
   ]
+
+  if (darwin_extension_safe) {
+    ldflags = [
+      "-F$framework_search_path",
+      "-fapplication-extension",
+      "-Xlinker",
+      "-fatal_warnings",
+    ]
+    deps += [ ":copy_dylib" ]
+    frameworks = [ "Flutter.framework" ]
+  }
 }
 
 group("universal_flutter_framework") {
@@ -398,6 +454,7 @@ group("universal_flutter_framework") {
     ":copy_framework_icu",
     ":copy_framework_info_plist",
     ":copy_framework_module_map",
+    ":copy_framework_privacy_manifest",
     ":copy_license",
   ]
 
diff --git a/shell/platform/darwin/ios/flutter_task_queue_dispatch.h b/shell/platform/darwin/ios/flutter_task_queue_dispatch.h
new file mode 100644
index 0000000000000000000000000000000000000000..18e476469879501ce61a8abcd96e35153d440f05
--- /dev/null
+++ b/shell/platform/darwin/ios/flutter_task_queue_dispatch.h
@@ -0,0 +1,20 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FLUTTER_TASK_QUEUE_DISPATCH_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FLUTTER_TASK_QUEUE_DISPATCH_H_
+
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h"
+
+/// The private implementation of `FlutterTaskQueue` that has method
+/// declarations.
+///
+/// `FlutterTaskQueue` doesn't have any methods publicly since it is supposed to
+/// be an opaque data structure. For Swift integration though `FlutterTaskQueue`
+/// is visible publicly with no methods.
+@protocol FlutterTaskQueueDispatch <FlutterTaskQueue>
+- (void)dispatch:(dispatch_block_t)block;
+@end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FLUTTER_TASK_QUEUE_DISPATCH_H_
diff --git a/shell/platform/darwin/ios/framework/Headers/Flutter.h b/shell/platform/darwin/ios/framework/Headers/Flutter.h
index cd59a82016d6fb01005a08d5a56c8eb0d70b1d7d..705dfcb028d2afe17b404c3d63d57c4e52ae3217 100644
--- a/shell/platform/darwin/ios/framework/Headers/Flutter.h
+++ b/shell/platform/darwin/ios/framework/Headers/Flutter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLUTTER_H_
-#define FLUTTER_FLUTTER_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_HEADERS_FLUTTER_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_HEADERS_FLUTTER_H_
 
 #import "FlutterAppDelegate.h"
 #import "FlutterBinaryMessenger.h"
@@ -21,4 +21,4 @@
 #import "FlutterTexture.h"
 #import "FlutterViewController.h"
 
-#endif  // FLUTTER_FLUTTER_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_HEADERS_FLUTTER_H_
diff --git a/shell/platform/darwin/ios/framework/Headers/FlutterAppDelegate.h b/shell/platform/darwin/ios/framework/Headers/FlutterAppDelegate.h
index ed7589a53c4ca1b4cb0eeb9ee6381d9c91b3164c..0c427c247d437d8097c11c2440e151fe12a20686 100644
--- a/shell/platform/darwin/ios/framework/Headers/FlutterAppDelegate.h
+++ b/shell/platform/darwin/ios/framework/Headers/FlutterAppDelegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLUTTERAPPDELEGATE_H_
-#define FLUTTER_FLUTTERAPPDELEGATE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_HEADERS_FLUTTERAPPDELEGATE_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_HEADERS_FLUTTERAPPDELEGATE_H_
 
 #import <UIKit/UIKit.h>
 
@@ -31,4 +31,4 @@ FLUTTER_DARWIN_EXPORT
 
 @end
 
-#endif  // FLUTTER_FLUTTERDARTPROJECT_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_HEADERS_FLUTTERAPPDELEGATE_H_
diff --git a/shell/platform/darwin/ios/framework/Headers/FlutterCallbackCache.h b/shell/platform/darwin/ios/framework/Headers/FlutterCallbackCache.h
index d2065586856add5f2cb610d6ea84a22818636c7f..b6e331d445b6a629ccefeb2ccc1923a3df9c12ab 100644
--- a/shell/platform/darwin/ios/framework/Headers/FlutterCallbackCache.h
+++ b/shell/platform/darwin/ios/framework/Headers/FlutterCallbackCache.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLUTTERCALLBACKCACHE_H_
-#define FLUTTER_FLUTTERCALLBACKCACHE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_HEADERS_FLUTTERCALLBACKCACHE_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_HEADERS_FLUTTERCALLBACKCACHE_H_
 
 #import <Foundation/Foundation.h>
 
@@ -51,4 +51,4 @@ FLUTTER_DARWIN_EXPORT
 
 @end
 
-#endif  // FLUTTER_FLUTTERCALLBACKCACHE_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_HEADERS_FLUTTERCALLBACKCACHE_H_
diff --git a/shell/platform/darwin/ios/framework/Headers/FlutterEngine.h b/shell/platform/darwin/ios/framework/Headers/FlutterEngine.h
index 5867ea36aa6c67cb92ab04d6629c55a21b5cc0ee..931c8de7b09d90c63840c1d89bc919405e6e581e 100644
--- a/shell/platform/darwin/ios/framework/Headers/FlutterEngine.h
+++ b/shell/platform/darwin/ios/framework/Headers/FlutterEngine.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLUTTERENGINE_H_
-#define FLUTTER_FLUTTERENGINE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_HEADERS_FLUTTERENGINE_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_HEADERS_FLUTTERENGINE_H_
 
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
@@ -22,11 +22,13 @@ NS_ASSUME_NONNULL_BEGIN
  * The dart entrypoint that is associated with `main()`.  This is to be used as an argument to the
  * `runWithEntrypoint*` methods.
  */
+// NOLINTNEXTLINE(readability-identifier-naming)
 extern NSString* const FlutterDefaultDartEntrypoint;
 
 /**
  * The default Flutter initial route ("/").
  */
+// NOLINTNEXTLINE(readability-identifier-naming)
 extern NSString* const FlutterDefaultInitialRoute;
 
 /**
@@ -56,7 +58,7 @@ extern NSString* const FlutterDefaultInitialRoute;
  * One of these methods must be invoked before calling `-setViewController:`.
  */
 FLUTTER_DARWIN_EXPORT
-@interface FlutterEngine : NSObject <FlutterTextureRegistry, FlutterPluginRegistry>
+@interface FlutterEngine : NSObject <FlutterPluginRegistry>
 
 /**
  * Default initializer for a FlutterEngine.
@@ -410,13 +412,23 @@ FLUTTER_DARWIN_EXPORT
 @property(nonatomic, readonly) FlutterBasicMessageChannel* keyEventChannel;
 
 /**
- * The `NSURL` of the observatory for the service isolate.
+ * The depcreated `NSURL` of the Dart VM Service for the service isolate.
  *
  * This is only set in debug and profile runtime modes, and only after the
- * observatory service is ready. In release mode or before the observatory has
+ * Dart VM Service is ready. In release mode or before the Dart VM Service has
  * started, it returns `nil`.
  */
-@property(nonatomic, readonly, nullable) NSURL* observatoryUrl;
+@property(nonatomic, readonly, nullable)
+    NSURL* observatoryUrl FLUTTER_DEPRECATED("Use vmServiceUrl instead");
+
+/**
+ * The `NSURL` of the Dart VM Service for the service isolate.
+ *
+ * This is only set in debug and profile runtime modes, and only after the
+ * Dart VM Service is ready. In release mode or before the Dart VM Service has
+ * started, it returns `nil`.
+ */
+@property(nonatomic, readonly, nullable) NSURL* vmServiceUrl;
 
 /**
  * The `FlutterBinaryMessenger` associated with this FlutterEngine (used for communicating with
@@ -424,6 +436,11 @@ FLUTTER_DARWIN_EXPORT
  */
 @property(nonatomic, readonly) NSObject<FlutterBinaryMessenger>* binaryMessenger;
 
+/**
+ * The `FlutterTextureRegistry` associated with this FlutterEngine (used to register textures).
+ */
+@property(nonatomic, readonly) NSObject<FlutterTextureRegistry>* textureRegistry;
+
 /**
  * The UI Isolate ID of the engine.
  *
@@ -442,4 +459,4 @@ FLUTTER_DARWIN_EXPORT
 
 NS_ASSUME_NONNULL_END
 
-#endif  // FLUTTER_FLUTTERENGINE_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_HEADERS_FLUTTERENGINE_H_
diff --git a/shell/platform/darwin/ios/framework/Headers/FlutterEngineGroup.h b/shell/platform/darwin/ios/framework/Headers/FlutterEngineGroup.h
index 097ffd6669feed515bb31cbcdc007fac17b84746..fe77b318fe95650bf16e41f2841ba51700187085 100644
--- a/shell/platform/darwin/ios/framework/Headers/FlutterEngineGroup.h
+++ b/shell/platform/darwin/ios/framework/Headers/FlutterEngineGroup.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_HEADERS_FLUTTERENGINEGROUP_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_HEADERS_FLUTTERENGINEGROUP_H_
+
 #import <Foundation/Foundation.h>
 
 #import "FlutterEngine.h"
@@ -108,3 +111,5 @@ FLUTTER_DARWIN_EXPORT
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_HEADERS_FLUTTERENGINEGROUP_H_
diff --git a/shell/platform/darwin/ios/framework/Headers/FlutterHeadlessDartRunner.h b/shell/platform/darwin/ios/framework/Headers/FlutterHeadlessDartRunner.h
index bc58dd80edbb085bfddb19a618bd8dd72222f2b7..08069ab5b86088d2d3ab42afcd761c44960fa3d9 100644
--- a/shell/platform/darwin/ios/framework/Headers/FlutterHeadlessDartRunner.h
+++ b/shell/platform/darwin/ios/framework/Headers/FlutterHeadlessDartRunner.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLUTTERHEADLESSDARTRUNNER_H_
-#define FLUTTER_FLUTTERHEADLESSDARTRUNNER_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_HEADERS_FLUTTERHEADLESSDARTRUNNER_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_HEADERS_FLUTTERHEADLESSDARTRUNNER_H_
 
 #import <Foundation/Foundation.h>
 
@@ -94,4 +94,4 @@ FLUTTER_DEPRECATED("FlutterEngine should be used rather than FlutterHeadlessDart
 
 @end
 
-#endif  // FLUTTER_FLUTTERHEADLESSDARTRUNNER_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_HEADERS_FLUTTERHEADLESSDARTRUNNER_H_
diff --git a/shell/platform/darwin/ios/framework/Headers/FlutterPlatformViews.h b/shell/platform/darwin/ios/framework/Headers/FlutterPlatformViews.h
index 18a5709d3ca8786b8aedc74ab549d72316c141c9..59ba4af616c1c9646645b63944e089f6e89f1e8e 100644
--- a/shell/platform/darwin/ios/framework/Headers/FlutterPlatformViews.h
+++ b/shell/platform/darwin/ios/framework/Headers/FlutterPlatformViews.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLUTTERPLATFORMVIEWS_H_
-#define FLUTTER_FLUTTERPLATFORMVIEWS_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_HEADERS_FLUTTERPLATFORMVIEWS_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_HEADERS_FLUTTERPLATFORMVIEWS_H_
 
 #import <UIKit/UIKit.h>
 
@@ -53,4 +53,4 @@ FLUTTER_DARWIN_EXPORT
 
 NS_ASSUME_NONNULL_END
 
-#endif  // FLUTTER_FLUTTERPLATFORMVIEWS_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_HEADERS_FLUTTERPLATFORMVIEWS_H_
diff --git a/shell/platform/darwin/ios/framework/Headers/FlutterPlugin.h b/shell/platform/darwin/ios/framework/Headers/FlutterPlugin.h
index e86ce58344b3d30974aeedd9a9ed511068a8b77c..8ab46cfe80ac9d30337c72a7f6426e7cd4934da4 100644
--- a/shell/platform/darwin/ios/framework/Headers/FlutterPlugin.h
+++ b/shell/platform/darwin/ios/framework/Headers/FlutterPlugin.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLUTTERPLUGIN_H_
-#define FLUTTER_FLUTTERPLUGIN_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_HEADERS_FLUTTERPLUGIN_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_HEADERS_FLUTTERPLUGIN_H_
 
 #import <UIKit/UIKit.h>
 #import <UserNotifications/UNUserNotificationCenter.h>
@@ -28,7 +28,7 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * Called if this has been registered for `UIApplicationDelegate` callbacks.
  *
- * @return `NO` if this vetoes application launch.
+ * @return `NO` if this vetos application launch.
  */
 - (BOOL)application:(UIApplication*)application
     didFinishLaunchingWithOptions:(NSDictionary*)launchOptions;
@@ -36,7 +36,7 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * Called if this has been registered for `UIApplicationDelegate` callbacks.
  *
- * @return `NO` if this vetoes application launch.
+ * @return `NO` if this vetos application launch.
  */
 - (BOOL)application:(UIApplication*)application
     willFinishLaunchingWithOptions:(NSDictionary*)launchOptions;
@@ -250,6 +250,7 @@ typedef void (*FlutterPluginRegistrantCallback)(NSObject<FlutterPluginRegistry>*
  * Flutter Framework (e.g. When an interact-able widget is covering the platform view).
  */
 typedef enum {
+  // NOLINTBEGIN(readability-identifier-naming)
   /**
    * Flutter blocks all the UIGestureRecognizers on the platform view as soon as it
    * decides they should be blocked.
@@ -266,6 +267,7 @@ typedef enum {
    * but never recognizing the gesture (and never invoking actions).
    */
   FlutterPlatformViewGestureRecognizersBlockingPolicyWaitUntilTouchesEnded,
+  // NOLINTEND(readability-identifier-naming)
 } FlutterPlatformViewGestureRecognizersBlockingPolicy;
 
 #pragma mark -
@@ -353,7 +355,8 @@ typedef enum {
  *
  * @param delegate The receiving object, such as the plugin's main class.
  */
-- (void)addApplicationDelegate:(NSObject<FlutterPlugin>*)delegate;
+- (void)addApplicationDelegate:(NSObject<FlutterPlugin>*)delegate
+    NS_EXTENSION_UNAVAILABLE_IOS("Disallowed in plugins used in app extensions");
 
 /**
  * Returns the file name for the given asset.
@@ -442,4 +445,4 @@ typedef enum {
 
 NS_ASSUME_NONNULL_END
 
-#endif  // FLUTTER_FLUTTERPLUGIN_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_HEADERS_FLUTTERPLUGIN_H_
diff --git a/shell/platform/darwin/ios/framework/Headers/FlutterPluginAppLifeCycleDelegate.h b/shell/platform/darwin/ios/framework/Headers/FlutterPluginAppLifeCycleDelegate.h
index 883dccb8673f3ae8b12a2aa3333cb611a22e4f90..95d1e611e495019aaf08c8a1f0126a1560b7f695 100644
--- a/shell/platform/darwin/ios/framework/Headers/FlutterPluginAppLifeCycleDelegate.h
+++ b/shell/platform/darwin/ios/framework/Headers/FlutterPluginAppLifeCycleDelegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLUTTERPLUGINAPPLIFECYCLEDELEGATE_H_
-#define FLUTTER_FLUTTERPLUGINAPPLIFECYCLEDELEGATE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_HEADERS_FLUTTERPLUGINAPPLIFECYCLEDELEGATE_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_HEADERS_FLUTTERPLUGINAPPLIFECYCLEDELEGATE_H_
 
 #import "FlutterPlugin.h"
 
@@ -16,17 +16,17 @@ FLUTTER_DARWIN_EXPORT
 @interface FlutterPluginAppLifeCycleDelegate : NSObject <UNUserNotificationCenterDelegate>
 
 /**
- * Registers `delegate` to receive life cycle callbacks via this FlutterPluginAppLifecycleDelegate
+ * Registers `delegate` to receive life cycle callbacks via this FlutterPluginAppLifeCycleDelegate
  * as long as it is alive.
  *
- * `delegate` will only referenced weakly.
+ * `delegate` will only be referenced weakly.
  */
 - (void)addDelegate:(NSObject<FlutterApplicationLifeCycleDelegate>*)delegate;
 
 /**
  * Calls all plugins registered for `UIApplicationDelegate` callbacks.
  *
- * @return `NO` if any plugin vetoes application launch.
+ * @return `NO` if any plugin vetos application launch.
  */
 - (BOOL)application:(UIApplication*)application
     didFinishLaunchingWithOptions:(NSDictionary*)launchOptions;
@@ -34,7 +34,7 @@ FLUTTER_DARWIN_EXPORT
 /**
  * Calls all plugins registered for `UIApplicationDelegate` callbacks.
  *
- * @return `NO` if any plugin vetoes application launch.
+ * @return `NO` if any plugin vetos application launch.
  */
 - (BOOL)application:(UIApplication*)application
     willFinishLaunchingWithOptions:(NSDictionary*)launchOptions;
@@ -145,4 +145,4 @@ FLUTTER_DARWIN_EXPORT
 
 NS_ASSUME_NONNULL_END
 
-#endif  // FLUTTER_FLUTTERPLUGINAPPLIFECYCLEDELEGATE_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_HEADERS_FLUTTERPLUGINAPPLIFECYCLEDELEGATE_H_
diff --git a/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h b/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h
index d33d989370d431ba3fdd19b8917c7ec32fd1b11a..a218fd3782e9e4b45a34eeeaced80de51e85b212 100644
--- a/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h
+++ b/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLUTTERVIEWCONTROLLER_H_
-#define FLUTTER_FLUTTERVIEWCONTROLLER_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_HEADERS_FLUTTERVIEWCONTROLLER_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_HEADERS_FLUTTERVIEWCONTROLLER_H_
 
 #import <UIKit/UIKit.h>
 #include <sys/cdefs.h>
@@ -26,6 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
  * with the update.
  */
 FLUTTER_DARWIN_EXPORT
+// NOLINTNEXTLINE(readability-identifier-naming)
 extern NSNotificationName const FlutterSemanticsUpdateNotification;
 
 /**
@@ -256,4 +257,4 @@ FLUTTER_DARWIN_EXPORT
 
 NS_ASSUME_NONNULL_END
 
-#endif  // FLUTTER_FLUTTERVIEWCONTROLLER_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_HEADERS_FLUTTERVIEWCONTROLLER_H_
diff --git a/shell/platform/darwin/ios/framework/PrivacyInfo.xcprivacy b/shell/platform/darwin/ios/framework/PrivacyInfo.xcprivacy
new file mode 100644
index 0000000000000000000000000000000000000000..d4bc7fc2eda844cd89eb1b4aaf04611e511912ed
--- /dev/null
+++ b/shell/platform/darwin/ios/framework/PrivacyInfo.xcprivacy
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyTracking</key>
+	<false/>
+	<key>NSPrivacyTrackingDomains</key>
+	<array/>
+	<key>NSPrivacyCollectedDataTypes</key>
+	<array/>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>0A2A.1</string>
+				<string>C617.1</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategorySystemBootTime</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>35F9.1</string>
+			</array>
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterAppDelegate.mm b/shell/platform/darwin/ios/framework/Source/FlutterAppDelegate.mm
index 9e0c86f8daddd6aa5f9a7d71e74abf1e4e7cbb58..67d2ee379124391643c80e02acae052011bceab6 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterAppDelegate.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterAppDelegate.mm
@@ -150,15 +150,11 @@ static NSString* const kRestorationStateAppModificationKey = @"mod-date";
                        FML_LOG(ERROR)
                            << "Timeout waiting for the first frame when launching an URL.";
                      } else {
-                       NSString* fullRoute = url.path;
-                       if ([url.query length] != 0) {
-                         fullRoute = [NSString stringWithFormat:@"%@?%@", fullRoute, url.query];
-                       }
-                       if ([url.fragment length] != 0) {
-                         fullRoute = [NSString stringWithFormat:@"%@#%@", fullRoute, url.fragment];
-                       }
-                       [flutterViewController.engine.navigationChannel invokeMethod:@"pushRoute"
-                                                                          arguments:fullRoute];
+                       [flutterViewController.engine.navigationChannel
+                           invokeMethod:@"pushRouteInformation"
+                              arguments:@{
+                                @"location" : url.absoluteString ?: [NSNull null],
+                              }];
                      }
                    }];
       return YES;
@@ -210,8 +206,9 @@ static NSString* const kRestorationStateAppModificationKey = @"mod-date";
 
 - (BOOL)application:(UIApplication*)application
     continueUserActivity:(NSUserActivity*)userActivity
-      restorationHandler:(void (^)(NSArray<id<UIUserActivityRestoring>>* __nullable
-                                       restorableObjects))restorationHandler {
+      restorationHandler:
+          (void (^)(NSArray<id<UIUserActivityRestoring>>* __nullable restorableObjects))
+              restorationHandler {
   if ([_lifeCycleDelegate application:application
                  continueUserActivity:userActivity
                    restorationHandler:restorationHandler]) {
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterAppDelegateTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterAppDelegateTest.mm
index 33b4e423ce3dd00f27708f300f656c22e5d17cac..81b93f0a8ff13f5caa3a0c11099dfefb2468b582 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterAppDelegateTest.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterAppDelegateTest.mm
@@ -67,8 +67,9 @@ FLUTTER_ASSERT_ARC
                             openURL:[NSURL URLWithString:@"http://myApp/custom/route?query=test"]
                             options:@{}];
   XCTAssertTrue(result);
-  OCMVerify([self.mockNavigationChannel invokeMethod:@"pushRoute"
-                                           arguments:@"/custom/route?query=test"]);
+  OCMVerify([self.mockNavigationChannel
+      invokeMethod:@"pushRouteInformation"
+         arguments:@{@"location" : @"http://myApp/custom/route?query=test"}]);
 }
 
 - (void)testLaunchUrlWithDeepLinkingNotSet {
@@ -104,8 +105,9 @@ FLUTTER_ASSERT_ARC
           openURL:[NSURL URLWithString:@"http://myApp/custom/route?query=test#fragment"]
           options:@{}];
   XCTAssertTrue(result);
-  OCMVerify([self.mockNavigationChannel invokeMethod:@"pushRoute"
-                                           arguments:@"/custom/route?query=test#fragment"]);
+  OCMVerify([self.mockNavigationChannel
+      invokeMethod:@"pushRouteInformation"
+         arguments:@{@"location" : @"http://myApp/custom/route?query=test#fragment"}]);
 }
 
 - (void)testLaunchUrlWithFragmentNoQueryParameter {
@@ -117,8 +119,9 @@ FLUTTER_ASSERT_ARC
                             openURL:[NSURL URLWithString:@"http://myApp/custom/route#fragment"]
                             options:@{}];
   XCTAssertTrue(result);
-  OCMVerify([self.mockNavigationChannel invokeMethod:@"pushRoute"
-                                           arguments:@"/custom/route#fragment"]);
+  OCMVerify([self.mockNavigationChannel
+      invokeMethod:@"pushRouteInformation"
+         arguments:@{@"location" : @"http://myApp/custom/route#fragment"}]);
 }
 
 - (void)testReleasesWindowOnDealloc {
@@ -139,7 +142,7 @@ FLUTTER_ASSERT_ARC
 
 #pragma mark - Deep linking
 
-- (void)testUniversalLinkPushRoute {
+- (void)testUniversalLinkPushRouteInformation {
   OCMStub([self.mockMainBundle objectForInfoDictionaryKey:@"FlutterDeepLinkingEnabled"])
       .andReturn(@YES);
 
@@ -151,8 +154,9 @@ FLUTTER_ASSERT_ARC
         restorationHandler:^(NSArray<id<UIUserActivityRestoring>>* __nullable restorableObjects){
         }];
   XCTAssertTrue(result);
-  OCMVerify([self.mockNavigationChannel invokeMethod:@"pushRoute"
-                                           arguments:@"/custom/route?query=test"]);
+  OCMVerify([self.mockNavigationChannel
+      invokeMethod:@"pushRouteInformation"
+         arguments:@{@"location" : @"http://myApp/custom/route?query=test"}]);
 }
 
 @end
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterAppDelegate_Test.h b/shell/platform/darwin/ios/framework/Source/FlutterAppDelegate_Test.h
index d56844a37d5cf89a33d20abc5058cf4be40e2686..405fb0279ef6e930ed5c7d957bbdf587002f9216 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterAppDelegate_Test.h
+++ b/shell/platform/darwin/ios/framework/Source/FlutterAppDelegate_Test.h
@@ -2,9 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERAPPDELEGATE_TEST_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERAPPDELEGATE_TEST_H_
+
 @class FlutterViewController;
 
 @interface FlutterAppDelegate (Test)
 @property(nonatomic, copy) FlutterViewController* (^rootFlutterViewControllerGetter)(void);
 
 @end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERAPPDELEGATE_TEST_H_
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterCallbackCache.mm b/shell/platform/darwin/ios/framework/Source/FlutterCallbackCache.mm
index 1aea364a58aa79ebb0d1e1665f7e420933d59826..624bc7b4ce795963855eaf2a2bacdc579f8dcfa8 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterCallbackCache.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterCallbackCache.mm
@@ -4,6 +4,7 @@
 
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterCallbackCache_Internal.h"
 
+#include "flutter/fml/logging.h"
 #include "flutter/lib/ui/plugins/callback_cache.h"
 
 @implementation FlutterCallbackInformation
@@ -32,7 +33,7 @@
 }
 
 + (void)setCachePath:(NSString*)path {
-  assert(path != nil);
+  FML_DCHECK(path != nil);
   flutter::DartCallbackCache::SetCachePath([path UTF8String]);
   NSString* cache_path =
       [NSString stringWithUTF8String:flutter::DartCallbackCache::GetCachePath().c_str()];
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterCallbackCache_Internal.h b/shell/platform/darwin/ios/framework/Source/FlutterCallbackCache_Internal.h
index bc4219c146c0de204cec28c86cf4765447990d42..1d05c7bb2305168b05f0ed0b17b7bbbb643f185b 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterCallbackCache_Internal.h
+++ b/shell/platform/darwin/ios/framework/Source/FlutterCallbackCache_Internal.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLUTTERCALLBACKCACHE_INTERNAL_H_
-#define FLUTTER_FLUTTERCALLBACKCACHE_INTERNAL_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERCALLBACKCACHE_INTERNAL_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERCALLBACKCACHE_INTERNAL_H_
 
 #import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterCallbackCache.h"
 
@@ -13,4 +13,4 @@
 
 @end
 
-#endif  // FLUTTER_FLUTTERCALLBACKCACHE_INTERNAL_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERCALLBACKCACHE_INTERNAL_H_
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterChannelKeyResponder.h b/shell/platform/darwin/ios/framework/Source/FlutterChannelKeyResponder.h
index 674b52378586bea6f7f026a3765327ddc94cc796..514d1c6b3e9b2d3be067194562f1892db8b70772 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterChannelKeyResponder.h
+++ b/shell/platform/darwin/ios/framework/Source/FlutterChannelKeyResponder.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTER_CHANNEL_KEY_RESPONDER_H_
-#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTER_CHANNEL_KEY_RESPONDER_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERCHANNELKEYRESPONDER_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERCHANNELKEYRESPONDER_H_
 
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterKeyPrimaryResponder.h"
 
@@ -26,4 +26,4 @@
 
 @end
 
-#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTER_CHANNEL_KEY_RESPONDER_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERCHANNELKEYRESPONDER_H_
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterChannelKeyResponderTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterChannelKeyResponderTest.mm
index fcdcb37cb0b0d198cc7d91ec80d0d08894361841..16b26ceabd6013c8e53852f086cc117443452118 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterChannelKeyResponderTest.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterChannelKeyResponderTest.mm
@@ -16,10 +16,7 @@ FLUTTER_ASSERT_ARC;
   XCTAssertTrue([value isEqualToString:expected], \
                 @"String \"%@\" not equal to the expected value of \"%@\"", value, expected)
 
-namespace {
-API_AVAILABLE(ios(13.4))
-constexpr UIKeyboardHIDUsage keyACode = (UIKeyboardHIDUsage)0x4;  // KeyA iOS scan code.
-}  // namespace
+using namespace flutter::testing;
 
 API_AVAILABLE(ios(13.4))
 @interface FlutterChannelKeyResponderTest : XCTestCase
@@ -35,8 +32,8 @@ API_AVAILABLE(ios(13.4))
   } else {
     XCTSkip(@"Required API not present for test.");
   }
-  _testKeyDownEvent = keyDownEvent(keyACode, 0x0, 0.0f, "a", "a");
-  _testKeyUpEvent = keyUpEvent(keyACode, 0x0, 0.0f);
+  _testKeyDownEvent = keyDownEvent(UIKeyboardHIDUsageKeyboardA, 0x0, 0.0f, "a", "a");
+  _testKeyUpEvent = keyUpEvent(UIKeyboardHIDUsageKeyboardA, 0x0, 0.0f);
 }
 
 - (void)tearDown API_AVAILABLE(ios(13.4)) {
@@ -76,7 +73,7 @@ API_AVAILABLE(ios(13.4))
   XCTAssertEqual([messages count], 1u);
   XCTAssertStrEqual([messages lastObject][@"keymap"], @"ios");
   XCTAssertStrEqual([messages lastObject][@"type"], @"keydown");
-  XCTAssertEqual([[messages lastObject][@"keyCode"] intValue], keyACode);
+  XCTAssertEqual([[messages lastObject][@"keyCode"] intValue], UIKeyboardHIDUsageKeyboardA);
   XCTAssertEqual([[messages lastObject][@"modifiers"] intValue], 0x0);
   XCTAssertStrEqual([messages lastObject][@"characters"], @"a");
   XCTAssertStrEqual([messages lastObject][@"charactersIgnoringModifiers"], @"a");
@@ -97,7 +94,7 @@ API_AVAILABLE(ios(13.4))
   XCTAssertEqual([messages count], 1u);
   XCTAssertStrEqual([messages lastObject][@"keymap"], @"ios");
   XCTAssertStrEqual([messages lastObject][@"type"], @"keyup");
-  XCTAssertEqual([[messages lastObject][@"keyCode"] intValue], keyACode);
+  XCTAssertEqual([[messages lastObject][@"keyCode"] intValue], UIKeyboardHIDUsageKeyboardA);
   XCTAssertEqual([[messages lastObject][@"modifiers"] intValue], 0x0);
 
   XCTAssertEqual([responses count], 1u);
@@ -134,7 +131,7 @@ API_AVAILABLE(ios(13.4))
   XCTAssertEqual([messages count], 1u);
   XCTAssertStrEqual([messages lastObject][@"keymap"], @"ios");
   XCTAssertStrEqual([messages lastObject][@"type"], @"keydown");
-  XCTAssertEqual([[messages lastObject][@"keyCode"] intValue], keyACode);
+  XCTAssertEqual([[messages lastObject][@"keyCode"] intValue], UIKeyboardHIDUsageKeyboardA);
   XCTAssertEqual([[messages lastObject][@"modifiers"] intValue], 0x0);
   XCTAssertStrEqual([messages lastObject][@"characters"], @"a");
   XCTAssertStrEqual([messages lastObject][@"charactersIgnoringModifiers"], @"a");
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm b/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm
index d57393db6bba41c52aef05ccc2f2b29a776f9371..2eaf9c359ce7d57fb9e4f01252aedeb215f51ef6 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm
@@ -8,6 +8,7 @@
 
 #include <syslog.h>
 
+#import <Metal/Metal.h>
 #include <sstream>
 #include <string>
 
@@ -22,6 +23,8 @@
 #import "flutter/shell/platform/darwin/common/command_line.h"
 #import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h"
 
+FLUTTER_ASSERT_NOT_ARC
+
 extern "C" {
 #if FLUTTER_RUNTIME_MODE == FLUTTER_RUNTIME_MODE_DEBUG
 // Used for debugging dart:* sources.
@@ -32,24 +35,38 @@ extern const intptr_t kPlatformStrongDillSize;
 
 static const char* kApplicationKernelSnapshotFileName = "kernel_blob.bin";
 
-flutter::Settings FLTDefaultSettingsForBundle(NSBundle* bundle) {
-  auto command_line = flutter::CommandLineFromNSProcessInfo();
+static BOOL DoesHardwareSupportWideGamut() {
+  static BOOL result = NO;
+  static dispatch_once_t once_token = 0;
+  dispatch_once(&once_token, ^{
+    id<MTLDevice> device = MTLCreateSystemDefaultDevice();
+    if (@available(iOS 13.0, *)) {
+      // MTLGPUFamilyApple2 = A9/A10
+      result = [device supportsFamily:MTLGPUFamilyApple2];
+    } else {
+      // A9/A10 on iOS 10+
+      result = [device supportsFeatureSet:MTLFeatureSet_iOS_GPUFamily3_v2];
+    }
+    [device release];
+  });
+  return result;
+}
+
+flutter::Settings FLTDefaultSettingsForBundle(NSBundle* bundle, NSProcessInfo* processInfoOrNil) {
+  auto command_line = flutter::CommandLineFromNSProcessInfo(processInfoOrNil);
 
   // Precedence:
-  // 1. Settings from the specified NSBundle.
+  // 1. Settings from the specified NSBundle (except for enable-impeller).
   // 2. Settings passed explicitly via command-line arguments.
   // 3. Settings from the NSBundle with the default bundle ID.
   // 4. Settings from the main NSBundle and default values.
 
-  NSBundle* mainBundle = [NSBundle mainBundle];
+  NSBundle* mainBundle = FLTGetApplicationBundle();
   NSBundle* engineBundle = [NSBundle bundleForClass:[FlutterViewController class]];
 
   bool hasExplicitBundle = bundle != nil;
   if (bundle == nil) {
-    bundle = [NSBundle bundleWithIdentifier:[FlutterDartProject defaultBundleIdentifier]];
-  }
-  if (bundle == nil) {
-    bundle = mainBundle;
+    bundle = FLTFrameworkBundleWithIdentifier([FlutterDartProject defaultBundleIdentifier]);
   }
 
   auto settings = flutter::SettingsFromCommandLine(command_line);
@@ -122,15 +139,10 @@ flutter::Settings FLTDefaultSettingsForBundle(NSBundle* bundle) {
 
   // Checks to see if the flutter assets directory is already present.
   if (settings.assets_path.empty()) {
-    NSString* assetsName = [FlutterDartProject flutterAssetsName:bundle];
-    NSString* assetsPath = [bundle pathForResource:assetsName ofType:@""];
+    NSString* assetsPath = FLTAssetsPathFromBundle(bundle);
 
     if (assetsPath.length == 0) {
-      assetsPath = [mainBundle pathForResource:assetsName ofType:@""];
-    }
-
-    if (assetsPath.length == 0) {
-      NSLog(@"Failed to find assets path for \"%@\"", assetsName);
+      NSLog(@"Failed to find assets path for \"%@\"", bundle);
     } else {
       settings.assets_path = assetsPath.UTF8String;
 
@@ -141,10 +153,11 @@ flutter::Settings FLTDefaultSettingsForBundle(NSBundle* bundle) {
         NSURL* applicationKernelSnapshotURL =
             [NSURL URLWithString:@(kApplicationKernelSnapshotFileName)
                    relativeToURL:[NSURL fileURLWithPath:assetsPath]];
-        if ([[NSFileManager defaultManager] fileExistsAtPath:applicationKernelSnapshotURL.path]) {
+        NSError* error;
+        if ([applicationKernelSnapshotURL checkResourceIsReachableAndReturnError:&error]) {
           settings.application_kernel_asset = applicationKernelSnapshotURL.path.UTF8String;
         } else {
-          NSLog(@"Failed to find snapshot: %@", applicationKernelSnapshotURL.path);
+          NSLog(@"Failed to find snapshot at %@: %@", applicationKernelSnapshotURL.path, error);
         }
       }
     }
@@ -156,17 +169,39 @@ flutter::Settings FLTDefaultSettingsForBundle(NSBundle* bundle) {
   settings.may_insecurely_connect_to_all_domains = true;
   settings.domain_network_policy = "";
 
-  // SkParagraph text layout library
-  NSNumber* enableSkParagraph = [mainBundle objectForInfoDictionaryKey:@"FLTEnableSkParagraph"];
-  settings.enable_skparagraph = (enableSkParagraph != nil) ? enableSkParagraph.boolValue : true;
+  // Whether to enable wide gamut colors.
+#if TARGET_OS_SIMULATOR
+  // As of Xcode 14.1, the wide gamut surface pixel formats are not supported by
+  // the simulator.
+  settings.enable_wide_gamut = false;
+  // Removes unused function warning.
+  (void)DoesHardwareSupportWideGamut;
+#else
+  NSNumber* nsEnableWideGamut = [mainBundle objectForInfoDictionaryKey:@"FLTEnableWideGamut"];
+  BOOL enableWideGamut =
+      (nsEnableWideGamut ? nsEnableWideGamut.boolValue : YES) && DoesHardwareSupportWideGamut();
+  settings.enable_wide_gamut = enableWideGamut;
+#endif
 
-  // Whether to enable Impeller.
-  NSNumber* enableImpeller = [mainBundle objectForInfoDictionaryKey:@"FLTEnableImpeller"];
-  // Change the default only if the option is present.
-  if (enableImpeller != nil) {
-    settings.enable_impeller = enableImpeller.boolValue;
+  // TODO(dnfield): We should reverse the order for all these settings so that command line options
+  // are preferred to plist settings. https://github.com/flutter/flutter/issues/124049
+  // Whether to enable Impeller. If the command line explicitly
+  // specified an option for this, ignore what's in the plist.
+  if (!command_line.HasOption("enable-impeller")) {
+    // Next, look in the app bundle.
+    NSNumber* enableImpeller = [bundle objectForInfoDictionaryKey:@"FLTEnableImpeller"];
+    if (enableImpeller == nil) {
+      // If it isn't in the app bundle, look in the main bundle.
+      enableImpeller = [mainBundle objectForInfoDictionaryKey:@"FLTEnableImpeller"];
+    }
+    // Change the default only if the option is present.
+    if (enableImpeller != nil) {
+      settings.enable_impeller = enableImpeller.boolValue;
+    }
   }
 
+  settings.warn_on_impeller_opt_out = true;
+
   NSNumber* enableTraceSystrace = [mainBundle objectForInfoDictionaryKey:@"FLTTraceSystrace"];
   // Change the default only if the option is present.
   if (enableTraceSystrace != nil) {
@@ -215,6 +250,14 @@ flutter::Settings FLTDefaultSettingsForBundle(NSBundle* bundle) {
   CGFloat screenHeight = [UIScreen mainScreen].bounds.size.height * scale;
   settings.resource_cache_max_bytes_threshold = screenWidth * screenHeight * 12 * 4;
 
+  // Whether to enable ios embedder api.
+  NSNumber* enable_embedder_api =
+      [mainBundle objectForInfoDictionaryKey:@"FLTEnableIOSEmbedderAPI"];
+  // Change the default only if the option is present.
+  if (enable_embedder_api) {
+    settings.enable_embedder_api = enable_embedder_api.boolValue;
+  }
+
   return settings;
 }
 
@@ -222,6 +265,11 @@ flutter::Settings FLTDefaultSettingsForBundle(NSBundle* bundle) {
   flutter::Settings _settings;
 }
 
+// This property is marked unavailable on iOS in the common header.
+// That doesn't seem to be enough to prevent this property from being synthesized.
+// Mark dynamic to avoid warnings.
+@dynamic dartEntrypointArguments;
+
 #pragma mark - Override base class designated initializers
 
 - (instancetype)init {
@@ -307,16 +355,9 @@ flutter::Settings FLTDefaultSettingsForBundle(NSBundle* bundle) {
 
 + (NSString*)flutterAssetsName:(NSBundle*)bundle {
   if (bundle == nil) {
-    bundle = [NSBundle bundleWithIdentifier:[FlutterDartProject defaultBundleIdentifier]];
+    bundle = FLTFrameworkBundleWithIdentifier([FlutterDartProject defaultBundleIdentifier]);
   }
-  if (bundle == nil) {
-    bundle = [NSBundle mainBundle];
-  }
-  NSString* flutterAssetsName = [bundle objectForInfoDictionaryKey:@"FLTAssetsPath"];
-  if (flutterAssetsName == nil) {
-    flutterAssetsName = @"Frameworks/App.framework/flutter_assets";
-  }
-  return flutterAssetsName;
+  return FLTAssetPath(bundle);
 }
 
 + (NSString*)domainNetworkPolicy:(NSDictionary*)appTransportSecurity {
@@ -371,4 +412,12 @@ flutter::Settings FLTDefaultSettingsForBundle(NSBundle* bundle) {
   return @"io.flutter.flutter.app";
 }
 
+- (BOOL)isWideGamutEnabled {
+  return _settings.enable_wide_gamut;
+}
+
+- (BOOL)isImpellerEnabled {
+  return _settings.enable_impeller;
+}
+
 @end
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterDartProjectTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterDartProjectTest.mm
index 3eb89543995fb364663e3a9bee5184195a6c4b75..c68018bbdeb5f770705cb95055e8ca51312916d5 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterDartProjectTest.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterDartProjectTest.mm
@@ -60,15 +60,250 @@ FLUTTER_ASSERT_ARC
   XCTAssertEqual(settings.leak_vm, NO);
 }
 
+- (void)testFLTFrameworkBundleInternalWhenBundleIsNotPresent {
+  NSBundle* found =
+      FLTFrameworkBundleInternal(@"doesNotExist", NSBundle.mainBundle.privateFrameworksURL);
+  XCTAssertNil(found);
+}
+
+- (void)testFLTFrameworkBundleInternalWhenBundleIsPresent {
+  NSString* presentBundleID = @"io.flutter.flutter";
+  NSBundle* found =
+      FLTFrameworkBundleInternal(presentBundleID, NSBundle.mainBundle.privateFrameworksURL);
+  XCTAssertNotNil(found);
+}
+
+- (void)testFLTGetApplicationBundleWhenCurrentTargetIsNotExtension {
+  NSBundle* bundle = FLTGetApplicationBundle();
+  XCTAssertEqual(bundle, [NSBundle mainBundle]);
+}
+
+- (void)testFLTGetApplicationBundleWhenCurrentTargetIsExtension {
+  id mockMainBundle = OCMPartialMock([NSBundle mainBundle]);
+  NSURL* url = [[NSBundle mainBundle].bundleURL URLByAppendingPathComponent:@"foo/ext.appex"];
+  OCMStub([mockMainBundle bundleURL]).andReturn(url);
+  NSBundle* bundle = FLTGetApplicationBundle();
+  [mockMainBundle stopMocking];
+  XCTAssertEqualObjects(bundle.bundleURL, [NSBundle mainBundle].bundleURL);
+}
+
+- (void)testFLTAssetsURLFromBundle {
+  {
+    // Found asset path in info.plist
+    id mockBundle = OCMClassMock([NSBundle class]);
+    OCMStub([mockBundle objectForInfoDictionaryKey:@"FLTAssetsPath"]).andReturn(@"foo/assets");
+    NSString* resultAssetsPath = @"path/to/foo/assets";
+    OCMStub([mockBundle pathForResource:@"foo/assets" ofType:nil]).andReturn(resultAssetsPath);
+    NSString* path = FLTAssetsPathFromBundle(mockBundle);
+    XCTAssertEqualObjects(path, @"path/to/foo/assets");
+  }
+  {
+    // Found asset path in info.plist, is not overriden by main bundle
+    id mockBundle = OCMClassMock([NSBundle class]);
+    id mockMainBundle = OCMPartialMock(NSBundle.mainBundle);
+    OCMStub([mockBundle objectForInfoDictionaryKey:@"FLTAssetsPath"]).andReturn(@"foo/assets");
+    OCMStub([mockMainBundle objectForInfoDictionaryKey:@"FLTAssetsPath"]).andReturn(nil);
+    NSString* resultAssetsPath = @"path/to/foo/assets";
+    OCMStub([mockBundle pathForResource:@"foo/assets" ofType:nil]).andReturn(resultAssetsPath);
+    NSString* path = FLTAssetsPathFromBundle(mockBundle);
+    XCTAssertEqualObjects(path, @"path/to/foo/assets");
+    [mockMainBundle stopMocking];
+  }
+  {
+    // No asset path in info.plist, defaults to main bundle
+    id mockBundle = OCMClassMock([NSBundle class]);
+    id mockMainBundle = OCMPartialMock([NSBundle mainBundle]);
+    NSString* resultAssetsPath = @"path/to/foo/assets";
+    OCMStub([mockBundle pathForResource:@"Frameworks/App.framework/flutter_assets" ofType:nil])
+        .andReturn(nil);
+    OCMStub([mockMainBundle pathForResource:@"Frameworks/App.framework/flutter_assets" ofType:nil])
+        .andReturn(resultAssetsPath);
+    NSString* path = FLTAssetsPathFromBundle(mockBundle);
+    XCTAssertEqualObjects(path, @"path/to/foo/assets");
+    [mockMainBundle stopMocking];
+  }
+}
+
+- (void)testFLTAssetPathReturnsTheCorrectValue {
+  {
+    // Found assets path in info.plist
+    id mockBundle = OCMClassMock([NSBundle class]);
+    OCMStub([mockBundle objectForInfoDictionaryKey:@"FLTAssetsPath"]).andReturn(@"foo/assets");
+    XCTAssertEqualObjects(FLTAssetPath(mockBundle), @"foo/assets");
+  }
+  {
+    // No assets path in info.plist, use default value
+    id mockBundle = OCMClassMock([NSBundle class]);
+    OCMStub([mockBundle objectForInfoDictionaryKey:@"FLTAssetsPath"]).andReturn(nil);
+    XCTAssertEqualObjects(FLTAssetPath(mockBundle), kDefaultAssetPath);
+  }
+}
+
+- (void)testLookUpForAssets {
+  {
+    id mockBundle = OCMPartialMock([NSBundle mainBundle]);
+    // Found assets path in info.plist
+    OCMStub([mockBundle objectForInfoDictionaryKey:@"FLTAssetsPath"]).andReturn(@"foo/assets");
+    NSString* assetsPath = [FlutterDartProject lookupKeyForAsset:@"bar"];
+    // This is testing public API, changing this assert is likely to break plugins.
+    XCTAssertEqualObjects(assetsPath, @"foo/assets/bar");
+    [mockBundle stopMocking];
+  }
+  {
+    id mockBundle = OCMPartialMock([NSBundle mainBundle]);
+    // No assets path in info.plist, use default value
+    OCMStub([mockBundle objectForInfoDictionaryKey:@"FLTAssetsPath"]).andReturn(nil);
+    NSString* assetsPath = [FlutterDartProject lookupKeyForAsset:@"bar"];
+    // This is testing public API, changing this assert is likely to break plugins.
+    XCTAssertEqualObjects(assetsPath, @"Frameworks/App.framework/flutter_assets/bar");
+    [mockBundle stopMocking];
+  }
+}
+
+- (void)testLookUpForAssetsFromBundle {
+  {
+    id mockBundle = OCMClassMock([NSBundle class]);
+    // Found assets path in info.plist
+    OCMStub([mockBundle objectForInfoDictionaryKey:@"FLTAssetsPath"]).andReturn(@"foo/assets");
+    NSString* assetsPath = [FlutterDartProject lookupKeyForAsset:@"bar" fromBundle:mockBundle];
+    // This is testing public API, changing this assert is likely to break plugins.
+    XCTAssertEqualObjects(assetsPath, @"foo/assets/bar");
+  }
+  {
+    // No assets path in info.plist, use default value
+    id mockBundle = OCMClassMock([NSBundle class]);
+    OCMStub([mockBundle objectForInfoDictionaryKey:@"FLTAssetsPath"]).andReturn(nil);
+    NSString* assetsPath = [FlutterDartProject lookupKeyForAsset:@"bar" fromBundle:mockBundle];
+    // This is testing public API, changing this assert is likely to break plugins.
+    XCTAssertEqualObjects(assetsPath, @"Frameworks/App.framework/flutter_assets/bar");
+  }
+}
+
+- (void)testLookUpForAssetsFromPackage {
+  {
+    id mockBundle = OCMPartialMock([NSBundle mainBundle]);
+    // Found assets path in info.plist
+    OCMStub([mockBundle objectForInfoDictionaryKey:@"FLTAssetsPath"]).andReturn(@"foo/assets");
+    NSString* assetsPath = [FlutterDartProject lookupKeyForAsset:@"bar" fromPackage:@"bar_package"];
+    // This is testing public API, changing this assert is likely to break plugins.
+    XCTAssertEqualObjects(assetsPath, @"foo/assets/packages/bar_package/bar");
+    [mockBundle stopMocking];
+  }
+  {
+    id mockBundle = OCMPartialMock([NSBundle mainBundle]);
+    // No assets path in info.plist, use default value
+    OCMStub([mockBundle objectForInfoDictionaryKey:@"FLTAssetsPath"]).andReturn(nil);
+    NSString* assetsPath = [FlutterDartProject lookupKeyForAsset:@"bar" fromPackage:@"bar_package"];
+    // This is testing public API, changing this assert is likely to break plugins.
+    XCTAssertEqualObjects(assetsPath,
+                          @"Frameworks/App.framework/flutter_assets/packages/bar_package/bar");
+    [mockBundle stopMocking];
+  }
+}
+
+- (void)testLookUpForAssetsFromPackageFromBundle {
+  {
+    id mockBundle = OCMClassMock([NSBundle class]);
+    // Found assets path in info.plist
+    OCMStub([mockBundle objectForInfoDictionaryKey:@"FLTAssetsPath"]).andReturn(@"foo/assets");
+    NSString* assetsPath = [FlutterDartProject lookupKeyForAsset:@"bar"
+                                                     fromPackage:@"bar_package"
+                                                      fromBundle:mockBundle];
+    // This is testing public API, changing this assert is likely to break plugins.
+    XCTAssertEqualObjects(assetsPath, @"foo/assets/packages/bar_package/bar");
+  }
+  {
+    id mockBundle = OCMClassMock([NSBundle class]);
+    // No assets path in info.plist, use default value
+    OCMStub([mockBundle objectForInfoDictionaryKey:@"FLTAssetsPath"]).andReturn(nil);
+    NSString* assetsPath = [FlutterDartProject lookupKeyForAsset:@"bar"
+                                                     fromPackage:@"bar_package"
+                                                      fromBundle:mockBundle];
+    // This is testing public API, changing this assert is likely to break plugins.
+    XCTAssertEqualObjects(assetsPath,
+                          @"Frameworks/App.framework/flutter_assets/packages/bar_package/bar");
+  }
+}
+
+- (void)testDisableImpellerSettingIsCorrectlyParsed {
+  id mockMainBundle = OCMPartialMock([NSBundle mainBundle]);
+  OCMStub([mockMainBundle objectForInfoDictionaryKey:@"FLTEnableImpeller"]).andReturn(@"NO");
+
+  auto settings = FLTDefaultSettingsForBundle();
+  // Check settings.enable_impeller value is same as the value defined in Info.plist.
+  XCTAssertEqual(settings.enable_impeller, NO);
+  [mockMainBundle stopMocking];
+}
+
+- (void)testRequestsWarningWhenImpellerOptOut {
+  auto settings = FLTDefaultSettingsForBundle();
+  XCTAssertEqual(settings.warn_on_impeller_opt_out, YES);
+}
+
 - (void)testEnableImpellerSettingIsCorrectlyParsed {
-  // The FLTEnableImpeller's value is defined in Info.plist
-  NSBundle* mainBundle = [NSBundle mainBundle];
-  NSNumber* enableImpeller = [mainBundle objectForInfoDictionaryKey:@"FLTEnableImpeller"];
-  XCTAssertEqual(enableImpeller.boolValue, NO);
+  id mockMainBundle = OCMPartialMock([NSBundle mainBundle]);
+  OCMStub([mockMainBundle objectForInfoDictionaryKey:@"FLTEnableImpeller"]).andReturn(@"YES");
 
   auto settings = FLTDefaultSettingsForBundle();
   // Check settings.enable_impeller value is same as the value defined in Info.plist.
+  XCTAssertEqual(settings.enable_impeller, YES);
+  [mockMainBundle stopMocking];
+}
+
+- (void)testEnableImpellerSettingIsCorrectlyOverriddenByCommandLine {
+  id mockMainBundle = OCMPartialMock([NSBundle mainBundle]);
+  OCMStub([mockMainBundle objectForInfoDictionaryKey:@"FLTEnableImpeller"]).andReturn(@"NO");
+  id mockProcessInfo = OCMPartialMock([NSProcessInfo processInfo]);
+  NSArray* arguments = @[ @"process_name", @"--enable-impeller" ];
+  OCMStub([mockProcessInfo arguments]).andReturn(arguments);
+
+  auto settings = FLTDefaultSettingsForBundle(nil, mockProcessInfo);
+  // Check settings.enable_impeller value is same as the value on command line.
+  XCTAssertEqual(settings.enable_impeller, YES);
+  [mockMainBundle stopMocking];
+}
+
+- (void)testDisableImpellerSettingIsCorrectlyOverriddenByCommandLine {
+  id mockMainBundle = OCMPartialMock([NSBundle mainBundle]);
+  OCMStub([mockMainBundle objectForInfoDictionaryKey:@"FLTEnableImpeller"]).andReturn(@"YES");
+  id mockProcessInfo = OCMPartialMock([NSProcessInfo processInfo]);
+  NSArray* arguments = @[ @"process_name", @"--enable-impeller=false" ];
+  OCMStub([mockProcessInfo arguments]).andReturn(arguments);
+
+  auto settings = FLTDefaultSettingsForBundle(nil, mockProcessInfo);
+  // Check settings.enable_impeller value is same as the value on command line.
   XCTAssertEqual(settings.enable_impeller, NO);
+  [mockMainBundle stopMocking];
+}
+
+- (void)testDisableImpellerAppBundleSettingIsCorrectlyParsed {
+  NSString* bundleId = [FlutterDartProject defaultBundleIdentifier];
+  id mockAppBundle = OCMClassMock([NSBundle class]);
+  OCMStub([mockAppBundle objectForInfoDictionaryKey:@"FLTEnableImpeller"]).andReturn(@"NO");
+  OCMStub([mockAppBundle bundleWithIdentifier:bundleId]).andReturn(mockAppBundle);
+
+  auto settings = FLTDefaultSettingsForBundle();
+  // Check settings.enable_impeller value is same as the value defined in Info.plist.
+  XCTAssertEqual(settings.enable_impeller, NO);
+
+  [mockAppBundle stopMocking];
+}
+
+- (void)testEnableImpellerAppBundleSettingIsCorrectlyParsed {
+  NSString* bundleId = [FlutterDartProject defaultBundleIdentifier];
+  id mockAppBundle = OCMClassMock([NSBundle class]);
+  OCMStub([mockAppBundle objectForInfoDictionaryKey:@"FLTEnableImpeller"]).andReturn(@"YES");
+  OCMStub([mockAppBundle bundleWithIdentifier:bundleId]).andReturn(mockAppBundle);
+
+  // Since FLTEnableImpeller is set to false in the main bundle, this is also
+  // testing that setting FLTEnableImpeller in the app bundle takes
+  // precedence over setting it in the root bundle.
+
+  auto settings = FLTDefaultSettingsForBundle();
+  // Check settings.enable_impeller value is same as the value defined in Info.plist.
+  XCTAssertEqual(settings.enable_impeller, YES);
+
+  [mockAppBundle stopMocking];
 }
 
 - (void)testEnableTraceSystraceSettingIsCorrectlyParsed {
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterDartProject_Internal.h b/shell/platform/darwin/ios/framework/Source/FlutterDartProject_Internal.h
index 0cd2cc95f256347c2bef8dd08edf5c8f85543833..f90d44e9005987e08e031b96baeae4cc55d8e134 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterDartProject_Internal.h
+++ b/shell/platform/darwin/ios/framework/Source/FlutterDartProject_Internal.h
@@ -2,20 +2,25 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERDARTPROJECT_INTERNAL_H_
-#define SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERDARTPROJECT_INTERNAL_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERDARTPROJECT_INTERNAL_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERDARTPROJECT_INTERNAL_H_
 
 #include "flutter/common/settings.h"
 #include "flutter/runtime/platform_data.h"
 #include "flutter/shell/common/engine.h"
-#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterDartProject.h"
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterDartProject.h"
+#import "flutter/shell/platform/darwin/common/framework/Source/FlutterNSBundleUtils.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-flutter::Settings FLTDefaultSettingsForBundle(NSBundle* bundle = nil);
+flutter::Settings FLTDefaultSettingsForBundle(NSBundle* _Nullable bundle = nil,
+                                              NSProcessInfo* _Nullable processInfoOrNil = nil);
 
 @interface FlutterDartProject ()
 
+@property(nonatomic, readonly) BOOL isWideGamutEnabled;
+@property(nonatomic, readonly) BOOL isImpellerEnabled;
+
 /**
  * This is currently used for *only for tests* to override settings.
  */
@@ -40,4 +45,4 @@ flutter::Settings FLTDefaultSettingsForBundle(NSBundle* bundle = nil);
 
 NS_ASSUME_NONNULL_END
 
-#endif  // SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERDARTPROJECT_INTERNAL_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERDARTPROJECT_INTERNAL_H_
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterObservatoryPublisher.h b/shell/platform/darwin/ios/framework/Source/FlutterDartVMServicePublisher.h
similarity index 46%
rename from shell/platform/darwin/ios/framework/Source/FlutterObservatoryPublisher.h
rename to shell/platform/darwin/ios/framework/Source/FlutterDartVMServicePublisher.h
index 0c3fe202c611653286627499a3233da603641a67..4feda093f5edc73aca43b4695b85c507499f554b 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterObservatoryPublisher.h
+++ b/shell/platform/darwin/ios/framework/Source/FlutterDartVMServicePublisher.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLUTTEROBSERVATORYPUBLISHER_H_
-#define FLUTTER_FLUTTEROBSERVATORYPUBLISHER_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERDARTVMSERVICEPUBLISHER_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERDARTVMSERVICEPUBLISHER_H_
 
 #import <Foundation/Foundation.h>
 
-@interface FlutterObservatoryPublisher : NSObject
+@interface FlutterDartVMServicePublisher : NSObject
 
-- (instancetype)initWithEnableObservatoryPublication:(BOOL)enableObservatoryPublication
+- (instancetype)initWithEnableVMServicePublication:(BOOL)enableVMServicePublication
     NS_DESIGNATED_INITIALIZER;
 - (instancetype)init NS_UNAVAILABLE;
 + (instancetype)new NS_UNAVAILABLE;
@@ -18,4 +18,4 @@
 
 @end
 
-#endif  // FLUTTER_FLUTTEROBSERVATORYPUBLISHER_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERDARTVMSERVICEPUBLISHER_H_
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterObservatoryPublisher.mm b/shell/platform/darwin/ios/framework/Source/FlutterDartVMServicePublisher.mm
similarity index 58%
rename from shell/platform/darwin/ios/framework/Source/FlutterObservatoryPublisher.mm
rename to shell/platform/darwin/ios/framework/Source/FlutterDartVMServicePublisher.mm
index 9b3c437856c6fb762fb2ae1d35b3fbbe82ff2f75..b9473566ca890eae377a53b1f794bef7b710ef15 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterObservatoryPublisher.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterDartVMServicePublisher.mm
@@ -4,12 +4,12 @@
 
 #define FML_USED_ON_EMBEDDER
 
-#import "FlutterObservatoryPublisher.h"
+#import "FlutterDartVMServicePublisher.h"
 
 #if FLUTTER_RELEASE
 
-@implementation FlutterObservatoryPublisher
-- (instancetype)initWithEnableObservatoryPublication:(BOOL)enableObservatoryPublication {
+@implementation FlutterDartVMServicePublisher
+- (instancetype)initWithEnableVMServicePublication:(BOOL)enableVMServicePublication {
   return [super init];
 }
 @end
@@ -23,9 +23,9 @@
 //
 // When debugging issues with this implementation, the following is helpful:
 //
-// 1) Running `dns-sd -Z _dartobservatory`. This is a built-in macOS tool that
+// 1) Running `dns-sd -Z _dartVmService`. This is a built-in macOS tool that
 //    can find advertized observatories using this method. If dns-sd can't find
-//    it, then the observatory is not getting advertized over any network
+//    it, then the VM service is not getting advertised over any network
 //    interface that the host machine has access to.
 // 2) The Python zeroconf package. The dns-sd tool can sometimes see things
 //    that aren't advertizing over a network interface - for example, simulators
@@ -45,26 +45,27 @@
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
 #include "flutter/runtime/dart_service_isolate.h"
 
-@protocol FlutterObservatoryPublisherDelegate
+@protocol FlutterDartVMServicePublisherDelegate
 - (void)publishServiceProtocolPort:(NSURL*)uri;
 - (void)stopService;
 @end
 
-@interface FlutterObservatoryPublisher ()
+@interface FlutterDartVMServicePublisher ()
 + (NSData*)createTxtData:(NSURL*)url;
 
 @property(readonly, class) NSString* serviceName;
-@property(readonly) fml::scoped_nsobject<NSObject<FlutterObservatoryPublisherDelegate>> delegate;
+@property(readonly) fml::scoped_nsobject<NSObject<FlutterDartVMServicePublisherDelegate>> delegate;
 @property(nonatomic, readwrite) NSURL* url;
-@property(readonly) BOOL enableObservatoryPublication;
+@property(readonly) BOOL enableVMServicePublication;
 
 @end
 
-@interface ObservatoryDNSServiceDelegate : NSObject <FlutterObservatoryPublisherDelegate>
+@interface DartVMServiceDNSServiceDelegate : NSObject <FlutterDartVMServicePublisherDelegate>
 @end
 
-@implementation ObservatoryDNSServiceDelegate {
+@implementation DartVMServiceDNSServiceDelegate {
   DNSServiceRef _dnsServiceRef;
+  DNSServiceRef _legacyDnsServiceRef;
 }
 
 - (void)stopService {
@@ -72,9 +73,15 @@
     DNSServiceRefDeallocate(_dnsServiceRef);
     _dnsServiceRef = NULL;
   }
+  if (_legacyDnsServiceRef) {
+    DNSServiceRefDeallocate(_legacyDnsServiceRef);
+    _legacyDnsServiceRef = NULL;
+  }
 }
 
 - (void)publishServiceProtocolPort:(NSURL*)url {
+  // TODO(vashworth): Remove once done debugging https://github.com/flutter/flutter/issues/129836
+  FML_LOG(INFO) << "Publish Service Protocol Port";
   DNSServiceFlags flags = kDNSServiceFlagsDefault;
 #if TARGET_IPHONE_SIMULATOR
   // Simulator needs to use local loopback explicitly to work.
@@ -83,32 +90,48 @@
   // Physical devices need to request all interfaces.
   uint32_t interfaceIndex = 0;
 #endif  // TARGET_IPHONE_SIMULATOR
-  const char* registrationType = "_dartobservatory._tcp";
+  const char* registrationType = "_dartVmService._tcp";
+  const char* legacyRegistrationType = "_dartobservatory._tcp";
+
   const char* domain = "local.";  // default domain
   uint16_t port = [[url port] unsignedShortValue];
 
-  NSData* txtData = [FlutterObservatoryPublisher createTxtData:url];
+  NSData* txtData = [FlutterDartVMServicePublisher createTxtData:url];
   int err = DNSServiceRegister(&_dnsServiceRef, flags, interfaceIndex,
-                               FlutterObservatoryPublisher.serviceName.UTF8String, registrationType,
-                               domain, NULL, htons(port), txtData.length, txtData.bytes,
-                               RegistrationCallback, NULL);
-
-  if (err != 0) {
-    FML_LOG(ERROR) << "Failed to register observatory port with mDNS with error " << err << ".";
-    if (@available(iOS 14.0, *)) {
-      FML_LOG(ERROR) << "On iOS 14+, local network broadcast in apps need to be declared in "
-                     << "the app's Info.plist. Debug and profile Flutter apps and modules host "
-                     << "VM services on the local network to support debugging features such "
-                     << "as hot reload and DevTools. To make your Flutter app or module "
-                     << "attachable and debuggable, add a '" << registrationType << "' value "
-                     << "to the 'NSBonjourServices' key in your Info.plist for the Debug/"
-                     << "Profile configurations. "
-                     << "For more information, see "
-                     << "https://flutter.dev/docs/development/add-to-app/ios/"
-                        "project-setup#local-network-privacy-permissions";
-    }
-  } else {
+                               FlutterDartVMServicePublisher.serviceName.UTF8String,
+                               registrationType, domain, NULL, htons(port), txtData.length,
+                               txtData.bytes, RegistrationCallback, NULL);
+
+  if (err == 0) {
     DNSServiceSetDispatchQueue(_dnsServiceRef, dispatch_get_main_queue());
+    return;
+  }
+
+  // TODO(bkonyi): remove once flutter_tools no longer looks for the legacy registration type.
+  // See https://github.com/dart-lang/sdk/issues/50233
+  //
+  // Try to fallback on the legacy registration type.
+  err = DNSServiceRegister(&_legacyDnsServiceRef, flags, interfaceIndex,
+                           FlutterDartVMServicePublisher.serviceName.UTF8String,
+                           legacyRegistrationType, domain, NULL, htons(port), txtData.length,
+                           txtData.bytes, RegistrationCallback, NULL);
+
+  if (err == 0) {
+    DNSServiceSetDispatchQueue(_legacyDnsServiceRef, dispatch_get_main_queue());
+    return;
+  }
+
+  FML_LOG(ERROR) << "Failed to register Dart VM Service port with mDNS with error " << err << ".";
+  if (@available(iOS 14.0, *)) {
+    FML_LOG(ERROR) << "On iOS 14+, local network broadcast in apps need to be declared in "
+                   << "the app's Info.plist. Debug and profile Flutter apps and modules host "
+                   << "VM services on the local network to support debugging features such "
+                   << "as hot reload and DevTools. To make your Flutter app or module "
+                   << "attachable and debuggable, add a '" << registrationType << "' value "
+                   << "to the 'NSBonjourServices' key in your Info.plist for the Debug/"
+                   << "Profile configurations. " << "For more information, see "
+                   << "https://flutter.dev/docs/development/add-to-app/ios/"
+                      "project-setup#local-network-privacy-permissions";
   }
 }
 
@@ -120,32 +143,32 @@ static void DNSSD_API RegistrationCallback(DNSServiceRef sdRef,
                                            const char* domain,
                                            void* context) {
   if (errorCode == kDNSServiceErr_NoError) {
-    FML_DLOG(INFO) << "FlutterObservatoryPublisher is ready!";
+    FML_DLOG(INFO) << "FlutterDartVMServicePublisher is ready!";
   } else if (errorCode == kDNSServiceErr_PolicyDenied) {
     FML_LOG(ERROR)
-        << "Could not register as server for FlutterObservatoryPublisher, permission "
+        << "Could not register as server for FlutterDartVMServicePublisher, permission "
         << "denied. Check your 'Local Network' permissions for this app in the Privacy section of "
         << "the system Settings.";
   } else {
-    FML_LOG(ERROR) << "Could not register as server for FlutterObservatoryPublisher. Check your "
+    FML_LOG(ERROR) << "Could not register as server for FlutterDartVMServicePublisher. Check your "
                       "network settings and relaunch the application.";
   }
 }
 
 @end
 
-@implementation FlutterObservatoryPublisher {
+@implementation FlutterDartVMServicePublisher {
   flutter::DartServiceIsolate::CallbackHandle _callbackHandle;
-  std::unique_ptr<fml::WeakPtrFactory<FlutterObservatoryPublisher>> _weakFactory;
+  std::unique_ptr<fml::WeakPtrFactory<FlutterDartVMServicePublisher>> _weakFactory;
 }
 
-- (instancetype)initWithEnableObservatoryPublication:(BOOL)enableObservatoryPublication {
+- (instancetype)initWithEnableVMServicePublication:(BOOL)enableVMServicePublication {
   self = [super init];
   NSAssert(self, @"Super must not return null on init.");
 
-  _delegate.reset([[ObservatoryDNSServiceDelegate alloc] init]);
-  _enableObservatoryPublication = enableObservatoryPublication;
-  _weakFactory = std::make_unique<fml::WeakPtrFactory<FlutterObservatoryPublisher>>(self);
+  _delegate.reset([[DartVMServiceDNSServiceDelegate alloc] init]);
+  _enableVMServicePublication = enableVMServicePublication;
+  _weakFactory = std::make_unique<fml::WeakPtrFactory<FlutterDartVMServicePublisher>>(self);
 
   fml::MessageLoop::EnsureInitializedForCurrentThread();
 
@@ -160,7 +183,7 @@ static void DNSSD_API RegistrationCallback(DNSServiceRef sdRef,
               NSURL* url = [[[NSURL alloc]
                   initWithString:[NSString stringWithUTF8String:uri.c_str()]] autorelease];
               weak.get().url = url;
-              if (weak.get().enableObservatoryPublication) {
+              if (weak.get().enableVMServicePublication) {
                 [[weak.get() delegate] publishServiceProtocolPort:url];
               }
             }
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterEmbedderKeyResponder.h b/shell/platform/darwin/ios/framework/Source/FlutterEmbedderKeyResponder.h
index 43bed3b6566a06c6cb3fe9ec8c0131b099d6e285..00a33f0a57c315114bf54299cc7b0e97eddb0eef 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterEmbedderKeyResponder.h
+++ b/shell/platform/darwin/ios/framework/Source/FlutterEmbedderKeyResponder.h
@@ -2,24 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTER_EMBEDDER_KEY_RESPONDER_H_
-#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTER_EMBEDDER_KEY_RESPONDER_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTEREMBEDDERKEYRESPONDER_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTEREMBEDDERKEYRESPONDER_H_
 
 #import <Foundation/NSObject.h>
 #import <UIKit/UIKit.h>
+
 #include "fml/memory/weak_ptr.h"
 
 #import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterKeyPrimaryResponder.h"
 #import "flutter/shell/platform/embedder/embedder.h"
 
-namespace {
-typedef void* _VoidPtr;
-}
-
 typedef void (^FlutterSendKeyEvent)(const FlutterKeyEvent& /* event */,
                                     _Nullable FlutterKeyEventCallback /* callback */,
-                                    _Nullable _VoidPtr /* user_data */);
+                                    void* _Nullable /* user_data */);
 
 /**
  * A primary responder of |FlutterKeyboardManager| that handles events by
@@ -38,4 +35,4 @@ typedef void (^FlutterSendKeyEvent)(const FlutterKeyEvent& /* event */,
 
 @end
 
-#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTER_EMBEDDER_KEY_RESPONDER_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTEREMBEDDERKEYRESPONDER_H_
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterEmbedderKeyResponder.mm b/shell/platform/darwin/ios/framework/Source/FlutterEmbedderKeyResponder.mm
index 2ba01e2d5917a1166db1873f42bd51b9cbfb89cb..f385c23b59c62403c7d601a85c8a7080817e31fd 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterEmbedderKeyResponder.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterEmbedderKeyResponder.mm
@@ -611,6 +611,7 @@ void HandleResponse(bool handled, void* user_data);
       .logical = kCapsLockLogicalKey,
       .character = nil,
       .synthesized = true,
+      .device_type = kFlutterKeyEventDeviceTypeKeyboard,
   };
   _sendEvent(flutterEvent, nullptr, nullptr);
 
@@ -645,6 +646,7 @@ void HandleResponse(bool handled, void* user_data);
       .logical = 0,
       .character = nil,
       .synthesized = false,
+      .device_type = kFlutterKeyEventDeviceTypeKeyboard,
   };
   _sendEvent(event, nil, nil);
 }
@@ -665,6 +667,7 @@ void HandleResponse(bool handled, void* user_data);
       .logical = logicalKey,
       .character = nil,
       .synthesized = true,
+      .device_type = kFlutterKeyEventDeviceTypeKeyboard,
   };
   [self updateKey:physicalKey asPressed:isDownEvent ? logicalKey : 0];
   _sendEvent(flutterEvent, nullptr, nullptr);
@@ -711,6 +714,7 @@ void HandleResponse(bool handled, void* user_data);
       .character =
           specialKey != nil ? nil : getEventCharacters(press.key.characters, press.key.keyCode),
       .synthesized = false,
+      .device_type = kFlutterKeyEventDeviceTypeKeyboard,
   };
   [self sendPrimaryFlutterEvent:flutterEvent callback:callback];
 }
@@ -744,6 +748,7 @@ void HandleResponse(bool handled, void* user_data);
       .logical = [pressedLogicalKey unsignedLongLongValue],
       .character = nil,
       .synthesized = false,
+      .device_type = kFlutterKeyEventDeviceTypeKeyboard,
   };
   [self sendPrimaryFlutterEvent:flutterEvent callback:callback];
 }
@@ -863,7 +868,7 @@ void HandleResponse(bool handled, void* user_data);
     // The caps lock modifier needs to be unset only if it was already on
     // and this is a key up. This is because it indicates the lock state, and
     // not the key press state. The caps lock state should be on between the
-    // first down, and the second up (i.e. while the lock in in effect), and
+    // first down, and the second up (i.e. while the lock in effect), and
     // this code turns it off at the second up event. The OS leaves it on still
     // because of iOS's weird late processing of modifier states. Synthesis of
     // the appropriate synthesized key events happens in synchronizeModifiers.
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterEmbedderKeyResponderTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterEmbedderKeyResponderTest.mm
index f29d3b2d13664933d3b638509f89a6c4632d300a..2d0beafe486965167ca09c3ac0b0810fb5254f6a 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterEmbedderKeyResponderTest.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterEmbedderKeyResponderTest.mm
@@ -15,6 +15,7 @@
 #include "flutter/shell/platform/embedder/test_utils/key_codes.g.h"
 
 using namespace flutter::testing::keycodes;
+using namespace flutter::testing;
 
 FLUTTER_ASSERT_ARC;
 
@@ -26,10 +27,10 @@ FLUTTER_ASSERT_ARC;
 @interface TestKeyEvent : NSObject
 @property(nonatomic) FlutterKeyEvent* data;
 @property(nonatomic) FlutterKeyEventCallback callback;
-@property(nonatomic) _VoidPtr userData;
+@property(nonatomic) void* _Nullable userData;
 - (nonnull instancetype)initWithEvent:(const FlutterKeyEvent*)event
                              callback:(nullable FlutterKeyEventCallback)callback
-                             userData:(nullable _VoidPtr)userData;
+                             userData:(void* _Nullable)userData;
 - (BOOL)hasCallback;
 - (void)respond:(BOOL)handled;
 @end
@@ -37,13 +38,13 @@ FLUTTER_ASSERT_ARC;
 @implementation TestKeyEvent
 - (instancetype)initWithEvent:(const FlutterKeyEvent*)event
                      callback:(nullable FlutterKeyEventCallback)callback
-                     userData:(nullable _VoidPtr)userData {
+                     userData:(void* _Nullable)userData {
   self = [super init];
   _data = new FlutterKeyEvent(*event);
   if (event->character != nullptr) {
     size_t len = strlen(event->character);
     char* character = new char[len + 1];
-    strcpy(character, event->character);
+    strlcpy(character, event->character, len + 1);
     _data->character = character;
   }
   _callback = callback;
@@ -63,8 +64,9 @@ FLUTTER_ASSERT_ARC;
 }
 
 - (void)dealloc {
-  if (_data->character != nullptr)
+  if (_data->character != nullptr) {
     delete[] _data->character;
+  }
   delete _data;
 }
 @end
@@ -130,7 +132,7 @@ typedef void (^ResponseCallback)(bool handled);
 
   FlutterEmbedderKeyResponder* responder = [[FlutterEmbedderKeyResponder alloc]
       initWithSendEvent:^(const FlutterKeyEvent& event, _Nullable FlutterKeyEventCallback callback,
-                          _Nullable _VoidPtr user_data) {
+                          void* _Nullable user_data) {
         [events addObject:[[TestKeyEvent alloc] initWithEvent:&event
                                                      callback:callback
                                                      userData:user_data]];
@@ -144,7 +146,9 @@ typedef void (^ResponseCallback)(bool handled);
 
   XCTAssertEqual([events count], 1u);
   event = [events lastObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->timestamp, 123000000.0f);
   XCTAssertEqual(event->physical, kPhysicalKeyA);
   XCTAssertEqual(event->logical, kLogicalKeyA);
@@ -166,7 +170,9 @@ typedef void (^ResponseCallback)(bool handled);
 
   XCTAssertEqual([events count], 1u);
   event = [events lastObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->timestamp, 123000000.0f);
   XCTAssertEqual(event->physical, kPhysicalKeyA);
   XCTAssertEqual(event->logical, kLogicalKeyA);
@@ -188,7 +194,7 @@ typedef void (^ResponseCallback)(bool handled);
 
   FlutterEmbedderKeyResponder* responder = [[FlutterEmbedderKeyResponder alloc]
       initWithSendEvent:^(const FlutterKeyEvent& event, _Nullable FlutterKeyEventCallback callback,
-                          _Nullable _VoidPtr user_data) {
+                          void* _Nullable user_data) {
         [events addObject:[[TestKeyEvent alloc] initWithEvent:&event
                                                      callback:callback
                                                      userData:user_data]];
@@ -204,7 +210,9 @@ typedef void (^ResponseCallback)(bool handled);
 
   XCTAssertEqual([events count], 1u);
   event = [events lastObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kKeyCodeEject | kIosPlane);
   XCTAssertEqual(event->logical, kKeyCodeEject | kIosPlane);
   XCTAssertEqual(event->character, nullptr);
@@ -225,7 +233,9 @@ typedef void (^ResponseCallback)(bool handled);
 
   XCTAssertEqual([events count], 1u);
   event = [events lastObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kKeyCodeEject | kIosPlane);
   XCTAssertEqual(event->logical, kKeyCodeEject | kIosPlane);
   XCTAssertEqual(event->character, nullptr);
@@ -245,7 +255,7 @@ typedef void (^ResponseCallback)(bool handled);
 
   FlutterEmbedderKeyResponder* responder = [[FlutterEmbedderKeyResponder alloc]
       initWithSendEvent:^(const FlutterKeyEvent& event, _Nullable FlutterKeyEventCallback callback,
-                          _Nullable _VoidPtr user_data) {
+                          void* _Nullable user_data) {
         [events addObject:[[TestKeyEvent alloc] initWithEvent:&event
                                                      callback:callback
                                                      userData:user_data]];
@@ -259,7 +269,9 @@ typedef void (^ResponseCallback)(bool handled);
 
   XCTAssertEqual([events count], 1u);
   event = [events lastObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalAltRight);
   XCTAssertEqual(event->logical, kLogicalAltRight);
   XCTAssertEqual(event->character, nullptr);
@@ -274,7 +286,9 @@ typedef void (^ResponseCallback)(bool handled);
 
   XCTAssertEqual([events count], 1u);
   event = [events lastObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalKeyW);
   XCTAssertEqual(event->logical, kLogicalKeyW);
   XCTAssertStrEqual(event->character, "∑");
@@ -290,7 +304,9 @@ typedef void (^ResponseCallback)(bool handled);
 
   XCTAssertEqual([events count], 1u);
   event = [events lastObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalAltRight);
   XCTAssertEqual(event->logical, kLogicalAltRight);
   XCTAssertEqual(event->character, nullptr);
@@ -309,7 +325,9 @@ typedef void (^ResponseCallback)(bool handled);
 
   XCTAssertEqual([events count], 1u);
   event = [events lastObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalKeyW);
   XCTAssertEqual(event->logical, kLogicalKeyW);
   XCTAssertEqual(event->character, nullptr);
@@ -325,7 +343,9 @@ typedef void (^ResponseCallback)(bool handled);
 
   XCTAssertEqual([events count], 1u);
   event = [events lastObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalKeyA);
   XCTAssertEqual(event->logical, kLogicalKeyA);
   XCTAssertStrEqual(event->character, "å");
@@ -339,7 +359,7 @@ typedef void (^ResponseCallback)(bool handled);
 
   FlutterEmbedderKeyResponder* responder = [[FlutterEmbedderKeyResponder alloc]
       initWithSendEvent:^(const FlutterKeyEvent& event, _Nullable FlutterKeyEventCallback callback,
-                          _Nullable _VoidPtr user_data) {
+                          void* _Nullable user_data) {
         [events addObject:[[TestKeyEvent alloc] initWithEvent:&event
                                                      callback:callback
                                                      userData:user_data]];
@@ -353,7 +373,9 @@ typedef void (^ResponseCallback)(bool handled);
 
   XCTAssertEqual([events count], 1u);
   event = [events lastObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalKeyA);
   XCTAssertEqual(event->logical, kLogicalKeyA);
   XCTAssertStrEqual(event->character, "a");
@@ -372,6 +394,7 @@ typedef void (^ResponseCallback)(bool handled);
 
   XCTAssertEqual([events count], 1u);
   event = [events lastObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->physical, 0ull);
   XCTAssertEqual(event->logical, 0ull);
   XCTAssertEqual(event->synthesized, false);
@@ -388,7 +411,9 @@ typedef void (^ResponseCallback)(bool handled);
 
   XCTAssertEqual([events count], 1u);
   event = [events lastObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalKeyA);
   XCTAssertEqual(event->logical, kLogicalKeyA);
   XCTAssertEqual(event->character, nullptr);
@@ -407,7 +432,7 @@ typedef void (^ResponseCallback)(bool handled);
 
   FlutterEmbedderKeyResponder* responder = [[FlutterEmbedderKeyResponder alloc]
       initWithSendEvent:^(const FlutterKeyEvent& event, _Nullable FlutterKeyEventCallback callback,
-                          _Nullable _VoidPtr user_data) {
+                          void* _Nullable user_data) {
         [events addObject:[[TestKeyEvent alloc] initWithEvent:&event
                                                      callback:callback
                                                      userData:user_data]];
@@ -421,6 +446,7 @@ typedef void (^ResponseCallback)(bool handled);
 
   XCTAssertEqual([events count], 1u);
   event = [events lastObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->physical, 0ull);
   XCTAssertEqual(event->logical, 0ull);
   XCTAssertEqual(event->synthesized, false);
@@ -440,7 +466,7 @@ typedef void (^ResponseCallback)(bool handled);
 
   FlutterEmbedderKeyResponder* responder = [[FlutterEmbedderKeyResponder alloc]
       initWithSendEvent:^(const FlutterKeyEvent& event, _Nullable FlutterKeyEventCallback callback,
-                          _Nullable _VoidPtr user_data) {
+                          void* _Nullable user_data) {
         [events addObject:[[TestKeyEvent alloc] initWithEvent:&event
                                                      callback:callback
                                                      userData:user_data]];
@@ -453,7 +479,9 @@ typedef void (^ResponseCallback)(bool handled);
   XCTAssertEqual([events count], 1u);
 
   event = [events lastObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->timestamp, 123000000.0f);
   XCTAssertEqual(event->physical, kPhysicalShiftRight);
   XCTAssertEqual(event->logical, kLogicalShiftRight);
@@ -469,7 +497,9 @@ typedef void (^ResponseCallback)(bool handled);
 
   XCTAssertEqual([events count], 1u);
   event = [events lastObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalKeyA);
   XCTAssertEqual(event->logical, kLogicalKeyA);
   XCTAssertStrEqual(event->character, "A");
@@ -484,7 +514,9 @@ typedef void (^ResponseCallback)(bool handled);
 
   XCTAssertEqual([events count], 1u);
   event = [events lastObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalShiftRight);
   XCTAssertEqual(event->logical, kLogicalShiftRight);
   XCTAssertEqual(event->character, nullptr);
@@ -499,7 +531,9 @@ typedef void (^ResponseCallback)(bool handled);
 
   XCTAssertEqual([events count], 1u);
   event = [events lastObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalKeyA);
   XCTAssertEqual(event->logical, kLogicalKeyA);
   XCTAssertEqual(event->character, nullptr);
@@ -524,7 +558,7 @@ typedef void (^ResponseCallback)(bool handled);
 
   FlutterEmbedderKeyResponder* responder = [[FlutterEmbedderKeyResponder alloc]
       initWithSendEvent:^(const FlutterKeyEvent& event, _Nullable FlutterKeyEventCallback callback,
-                          _Nullable _VoidPtr user_data) {
+                          void* _Nullable user_data) {
         [events addObject:[[TestKeyEvent alloc] initWithEvent:&event
                                                      callback:callback
                                                      userData:user_data]];
@@ -540,7 +574,9 @@ typedef void (^ResponseCallback)(bool handled);
 
   XCTAssertEqual([events count], 1u);
   event = [events lastObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalNumpad1);
   XCTAssertEqual(event->logical, kLogicalNumpad1);
   XCTAssertStrEqual(event->character, "1");
@@ -556,7 +592,9 @@ typedef void (^ResponseCallback)(bool handled);
 
   XCTAssertEqual([events count], 1u);
   event = [events lastObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalKeyUndefined);
   XCTAssertEqual(event->logical, kLogicalKeyUndefined);
   XCTAssertEqual(event->character, nullptr);
@@ -572,7 +610,9 @@ typedef void (^ResponseCallback)(bool handled);
 
   XCTAssertEqual([events count], 1u);
   event = [events lastObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalF1);
   XCTAssertEqual(event->logical, kLogicalF1);
   XCTAssertEqual(event->character, nullptr);
@@ -588,7 +628,9 @@ typedef void (^ResponseCallback)(bool handled);
 
   XCTAssertEqual([events count], 1u);
   event = [events lastObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalKeyA);
   XCTAssertEqual(event->logical, kLogicalKeyA);
   XCTAssertStrEqual(event->character, "a");
@@ -604,7 +646,9 @@ typedef void (^ResponseCallback)(bool handled);
 
   XCTAssertEqual([events count], 1u);
   event = [events lastObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalShiftLeft);
   XCTAssertEqual(event->logical, kLogicalShiftLeft);
   XCTAssertEqual(event->character, nullptr);
@@ -622,14 +666,18 @@ typedef void (^ResponseCallback)(bool handled);
   // Because the OS no longer provides the 0x20000 (kModifierFlagShiftAny), we
   // have to simulate a keyup.
   event = [events firstObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalShiftLeft);
   XCTAssertEqual(event->logical, kLogicalShiftLeft);
   XCTAssertEqual(event->character, nullptr);
   XCTAssertEqual(event->synthesized, true);
 
   event = [events lastObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalNumpad1);
   XCTAssertEqual(event->logical, kLogicalNumpad1);
   XCTAssertEqual(event->character, nullptr);
@@ -645,7 +693,9 @@ typedef void (^ResponseCallback)(bool handled);
 
   XCTAssertEqual([events count], 1u);
   event = [events lastObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalF1);
   XCTAssertEqual(event->logical, kLogicalF1);
   XCTAssertEqual(event->character, nullptr);
@@ -661,7 +711,9 @@ typedef void (^ResponseCallback)(bool handled);
 
   XCTAssertEqual([events count], 1u);
   event = [events lastObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalKeyUndefined);
   XCTAssertEqual(event->logical, kLogicalKeyUndefined);
   XCTAssertEqual(event->synthesized, false);
@@ -676,7 +728,9 @@ typedef void (^ResponseCallback)(bool handled);
 
   XCTAssertEqual([events count], 1u);
   event = [events lastObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalKeyA);
   XCTAssertEqual(event->logical, kLogicalKeyA);
   XCTAssertEqual(event->character, nullptr);
@@ -692,6 +746,7 @@ typedef void (^ResponseCallback)(bool handled);
 
   XCTAssertEqual([events count], 1u);
   event = [events lastObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->physical, 0ull);
   XCTAssertEqual(event->logical, 0ull);
   XCTAssertEqual(event->synthesized, false);
@@ -707,7 +762,7 @@ typedef void (^ResponseCallback)(bool handled);
 
   FlutterEmbedderKeyResponder* responder = [[FlutterEmbedderKeyResponder alloc]
       initWithSendEvent:^(const FlutterKeyEvent& event, _Nullable FlutterKeyEventCallback callback,
-                          _Nullable _VoidPtr user_data) {
+                          void* _Nullable user_data) {
         [events addObject:[[TestKeyEvent alloc] initWithEvent:&event
                                                      callback:callback
                                                      userData:user_data]];
@@ -719,7 +774,9 @@ typedef void (^ResponseCallback)(bool handled);
 
   XCTAssertEqual([events count], 1u);
   event = [events lastObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalShiftLeft);
   XCTAssertEqual(event->logical, kLogicalShiftLeft);
   XCTAssertEqual(event->character, nullptr);
@@ -734,7 +791,9 @@ typedef void (^ResponseCallback)(bool handled);
 
   XCTAssertEqual([events count], 1u);
   event = [events lastObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalShiftRight);
   XCTAssertEqual(event->logical, kLogicalShiftRight);
   XCTAssertEqual(event->character, nullptr);
@@ -749,7 +808,9 @@ typedef void (^ResponseCallback)(bool handled);
 
   XCTAssertEqual([events count], 1u);
   event = [events lastObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalShiftLeft);
   XCTAssertEqual(event->logical, kLogicalShiftLeft);
   XCTAssertEqual(event->character, nullptr);
@@ -764,7 +825,9 @@ typedef void (^ResponseCallback)(bool handled);
 
   XCTAssertEqual([events count], 1u);
   event = [events lastObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalShiftRight);
   XCTAssertEqual(event->logical, kLogicalShiftRight);
   XCTAssertEqual(event->character, nullptr);
@@ -785,7 +848,7 @@ typedef void (^ResponseCallback)(bool handled);
 
   FlutterEmbedderKeyResponder* responder = [[FlutterEmbedderKeyResponder alloc]
       initWithSendEvent:^(const FlutterKeyEvent& event, _Nullable FlutterKeyEventCallback callback,
-                          _Nullable _VoidPtr user_data) {
+                          void* _Nullable user_data) {
         [events addObject:[[TestKeyEvent alloc] initWithEvent:&event
                                                      callback:callback
                                                      userData:user_data]];
@@ -798,7 +861,9 @@ typedef void (^ResponseCallback)(bool handled);
   XCTAssertEqual([events count], 3u);
 
   event = events[0].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalCapsLock);
   XCTAssertEqual(event->logical, kLogicalCapsLock);
   XCTAssertEqual(event->character, nullptr);
@@ -806,7 +871,9 @@ typedef void (^ResponseCallback)(bool handled);
   XCTAssertFalse([events[0] hasCallback]);
 
   event = events[1].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalCapsLock);
   XCTAssertEqual(event->logical, kLogicalCapsLock);
   XCTAssertEqual(event->character, nullptr);
@@ -814,7 +881,9 @@ typedef void (^ResponseCallback)(bool handled);
   XCTAssertFalse([events[1] hasCallback]);
 
   event = events[2].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalKeyA);
   XCTAssertEqual(event->logical, kLogicalKeyA);
   XCTAssertStrEqual(event->character, "A");
@@ -832,7 +901,9 @@ typedef void (^ResponseCallback)(bool handled);
                 callback:keyEventCallback];
   XCTAssertEqual([events count], 1u);
   event = [events lastObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalKeyA);
   XCTAssertEqual(event->logical, kLogicalKeyA);
   XCTAssertEqual(event->synthesized, false);
@@ -847,7 +918,9 @@ typedef void (^ResponseCallback)(bool handled);
 
   XCTAssertEqual([events count], 1u);
   event = [events firstObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalCapsLock);
   XCTAssertEqual(event->logical, kLogicalCapsLock);
   XCTAssertEqual(event->character, nullptr);
@@ -866,7 +939,9 @@ typedef void (^ResponseCallback)(bool handled);
 
   XCTAssertEqual([events count], 1u);
   event = [events firstObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalCapsLock);
   XCTAssertEqual(event->logical, kLogicalCapsLock);
   XCTAssertEqual(event->character, nullptr);
@@ -883,7 +958,9 @@ typedef void (^ResponseCallback)(bool handled);
   // consistent, and should be off.
   XCTAssertEqual([events count], 1u);
   event = [events lastObject].data;
+  XCTAssertNotEqual(event, nullptr);
   XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalKeyA);
   XCTAssertEqual(event->logical, kLogicalKeyA);
   XCTAssertStrEqual(event->character, "a");
@@ -902,7 +979,7 @@ typedef void (^ResponseCallback)(bool handled);
 
   FlutterEmbedderKeyResponder* responder = [[FlutterEmbedderKeyResponder alloc]
       initWithSendEvent:^(const FlutterKeyEvent& event, _Nullable FlutterKeyEventCallback callback,
-                          _Nullable _VoidPtr user_data) {
+                          void* _Nullable user_data) {
         [events addObject:[[TestKeyEvent alloc] initWithEvent:&event
                                                      callback:callback
                                                      userData:user_data]];
@@ -916,6 +993,7 @@ typedef void (^ResponseCallback)(bool handled);
 
   event = events[0].data;
   XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalCapsLock);
   XCTAssertEqual(event->logical, kLogicalCapsLock);
   XCTAssertEqual(event->character, nullptr);
@@ -924,6 +1002,7 @@ typedef void (^ResponseCallback)(bool handled);
 
   event = events[1].data;
   XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalCapsLock);
   XCTAssertEqual(event->logical, kLogicalCapsLock);
   XCTAssertEqual(event->character, nullptr);
@@ -932,6 +1011,7 @@ typedef void (^ResponseCallback)(bool handled);
 
   event = events[2].data;
   XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalKeyA);
   XCTAssertEqual(event->logical, kLogicalKeyA);
   XCTAssertStrEqual(event->character, "A");
@@ -954,7 +1034,7 @@ typedef void (^ResponseCallback)(bool handled);
 
   FlutterEmbedderKeyResponder* responder = [[FlutterEmbedderKeyResponder alloc]
       initWithSendEvent:^(const FlutterKeyEvent& event, _Nullable FlutterKeyEventCallback callback,
-                          _Nullable _VoidPtr user_data) {
+                          void* _Nullable user_data) {
         [events addObject:[[TestKeyEvent alloc] initWithEvent:&event callback:nil userData:nil]];
         callback(true, user_data);
       }];
@@ -965,6 +1045,7 @@ typedef void (^ResponseCallback)(bool handled);
   XCTAssertEqual([events count], 1u);
   event = events[0].data;
   XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalMetaLeft);
   XCTAssertEqual(event->logical, kLogicalMetaLeft);
   XCTAssertEqual(event->character, nullptr);
@@ -978,6 +1059,7 @@ typedef void (^ResponseCallback)(bool handled);
   XCTAssertEqual([events count], 1u);
   event = events[0].data;
   XCTAssertEqual(event->type, kFlutterKeyEventTypeDown);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalPeriod);
   XCTAssertEqual(event->logical, kLogicalEscape);
   XCTAssertEqual(event->character, nullptr);
@@ -991,6 +1073,7 @@ typedef void (^ResponseCallback)(bool handled);
   XCTAssertEqual([events count], 1u);
   event = events[0].data;
   XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalPeriod);
   XCTAssertEqual(event->logical, kLogicalEscape);
   XCTAssertEqual(event->character, nullptr);
@@ -1003,6 +1086,7 @@ typedef void (^ResponseCallback)(bool handled);
   XCTAssertEqual([events count], 1u);
   event = events[0].data;
   XCTAssertEqual(event->type, kFlutterKeyEventTypeUp);
+  XCTAssertEqual(event->device_type, kFlutterKeyEventDeviceTypeKeyboard);
   XCTAssertEqual(event->physical, kPhysicalMetaLeft);
   XCTAssertEqual(event->logical, kLogicalMetaLeft);
   XCTAssertEqual(event->character, nullptr);
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterEngine.mm b/shell/platform/darwin/ios/framework/Source/FlutterEngine.mm
index b0da5f1c15a26fefc40cbb3e283ef8268fefd1ea..8fa12218b8633fa442319a53be8cc44dadf2164a 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterEngine.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterEngine.mm
@@ -8,8 +8,10 @@
 
 #include <memory>
 
+#include "flutter/common/constants.h"
 #include "flutter/fml/message_loop.h"
 #include "flutter/fml/platform/darwin/platform_version.h"
+#include "flutter/fml/platform/darwin/weak_nsobject.h"
 #include "flutter/fml/trace_event.h"
 #include "flutter/runtime/ptrace_check.h"
 #include "flutter/shell/common/engine.h"
@@ -19,16 +21,18 @@
 #include "flutter/shell/common/thread_host.h"
 #include "flutter/shell/common/variable_refresh_rate_display.h"
 #import "flutter/shell/platform/darwin/common/command_line.h"
-#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelay.h"
+#import "flutter/shell/platform/darwin/common/framework/Source/FlutterBinaryMessengerRelay.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterDartProject_Internal.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterDartVMServicePublisher.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterIndirectScribbleDelegate.h"
-#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterObservatoryPublisher.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterSpellCheckPlugin.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputDelegate.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextureRegistryRelay.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterUndoManagerDelegate.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterUndoManagerPlugin.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/UIViewController+FlutterScreenAndSceneIfLoaded.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/connection_collection.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/profiler_metrics_ios.h"
@@ -45,16 +49,19 @@ static void IOSPlatformThreadConfigSetter(const fml::Thread::ThreadConfig& confi
 
   // set thread priority
   switch (config.priority) {
-    case fml::Thread::ThreadPriority::BACKGROUND: {
+    case fml::Thread::ThreadPriority::kBackground: {
+      pthread_set_qos_class_self_np(QOS_CLASS_BACKGROUND, 0);
       [[NSThread currentThread] setThreadPriority:0];
       break;
     }
-    case fml::Thread::ThreadPriority::NORMAL: {
+    case fml::Thread::ThreadPriority::kNormal: {
+      pthread_set_qos_class_self_np(QOS_CLASS_DEFAULT, 0);
       [[NSThread currentThread] setThreadPriority:0.5];
       break;
     }
-    case fml::Thread::ThreadPriority::RASTER:
-    case fml::Thread::ThreadPriority::DISPLAY: {
+    case fml::Thread::ThreadPriority::kRaster:
+    case fml::Thread::ThreadPriority::kDisplay: {
+      pthread_set_qos_class_self_np(QOS_CLASS_USER_INTERACTIVE, 0);
       [[NSThread currentThread] setThreadPriority:1.0];
       sched_param param;
       int policy;
@@ -87,7 +94,8 @@ static constexpr int kNumProfilerSamplesPerSec = 5;
 @interface FlutterEngine () <FlutterIndirectScribbleDelegate,
                              FlutterUndoManagerDelegate,
                              FlutterTextInputDelegate,
-                             FlutterBinaryMessenger>
+                             FlutterBinaryMessenger,
+                             FlutterTextureRegistry>
 // Maintains a dictionary of plugin names that have registered with the engine.  Used by
 // FlutterEngineRegistrar to implement a FlutterPluginRegistrar.
 @property(nonatomic, readonly) NSMutableDictionary* pluginPublications;
@@ -96,6 +104,12 @@ static constexpr int kNumProfilerSamplesPerSec = 5;
 @property(nonatomic, readwrite, copy) NSString* isolateId;
 @property(nonatomic, copy) NSString* initialRoute;
 @property(nonatomic, retain) id<NSObject> flutterViewControllerWillDeallocObserver;
+
+#pragma mark - Embedder API properties
+
+@property(nonatomic, assign) BOOL enableEmbedderAPI;
+// Function pointers for interacting with the embedder.h API.
+@property(nonatomic) FlutterEngineProcTable& embedderAPI;
 @end
 
 @implementation FlutterEngine {
@@ -103,10 +117,10 @@ static constexpr int kNumProfilerSamplesPerSec = 5;
   std::shared_ptr<flutter::ThreadHost> _threadHost;
   std::unique_ptr<flutter::Shell> _shell;
   NSString* _labelPrefix;
-  std::unique_ptr<fml::WeakPtrFactory<FlutterEngine>> _weakFactory;
+  std::unique_ptr<fml::WeakNSObjectFactory<FlutterEngine>> _weakFactory;
 
-  fml::WeakPtr<FlutterViewController> _viewController;
-  fml::scoped_nsobject<FlutterObservatoryPublisher> _publisher;
+  fml::WeakNSObject<FlutterViewController> _viewController;
+  fml::scoped_nsobject<FlutterDartVMServicePublisher> _publisher;
 
   std::shared_ptr<flutter::FlutterPlatformViewsController> _platformViewsController;
   flutter::IOSRenderingAPI _renderingApi;
@@ -132,12 +146,14 @@ static constexpr int kNumProfilerSamplesPerSec = 5;
   fml::scoped_nsobject<FlutterBasicMessageChannel> _systemChannel;
   fml::scoped_nsobject<FlutterBasicMessageChannel> _settingsChannel;
   fml::scoped_nsobject<FlutterBasicMessageChannel> _keyEventChannel;
+  fml::scoped_nsobject<FlutterMethodChannel> _screenshotChannel;
 
   int64_t _nextTextureId;
 
   BOOL _allowHeadlessExecution;
   BOOL _restorationEnabled;
   FlutterBinaryMessengerRelay* _binaryMessenger;
+  FlutterTextureRegistryRelay* _textureRegistry;
   std::unique_ptr<flutter::ConnectionCollection> _connections;
 }
 
@@ -174,7 +190,7 @@ static constexpr int kNumProfilerSamplesPerSec = 5;
   _allowHeadlessExecution = allowHeadlessExecution;
   _labelPrefix = [labelPrefix copy];
 
-  _weakFactory = std::make_unique<fml::WeakPtrFactory<FlutterEngine>>(self);
+  _weakFactory = std::make_unique<fml::WeakNSObjectFactory<FlutterEngine>>(self);
 
   if (project == nil) {
     _dartProject.reset([[FlutterDartProject alloc] init]);
@@ -182,6 +198,13 @@ static constexpr int kNumProfilerSamplesPerSec = 5;
     _dartProject.reset([project retain]);
   }
 
+  _enableEmbedderAPI = _dartProject.get().settings.enable_embedder_api;
+  if (_enableEmbedderAPI) {
+    NSLog(@"============== iOS: enable_embedder_api is on ==============");
+    _embedderAPI.struct_size = sizeof(FlutterEngineProcTable);
+    FlutterEngineGetProcAddresses(&_embedderAPI);
+  }
+
   if (!EnableTracingIfNecessary([_dartProject.get() settings])) {
     NSLog(
         @"Cannot create a FlutterEngine instance in debug mode without Flutter tooling or "
@@ -197,6 +220,7 @@ static constexpr int kNumProfilerSamplesPerSec = 5;
   [self recreatePlatformViewController];
 
   _binaryMessenger = [[FlutterBinaryMessengerRelay alloc] initWithParent:self];
+  _textureRegistry = [[FlutterTextureRegistryRelay alloc] initWithParent:self];
   _connections.reset(new flutter::ConnectionCollection());
 
   NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
@@ -205,22 +229,44 @@ static constexpr int kNumProfilerSamplesPerSec = 5;
                  name:UIApplicationDidReceiveMemoryWarningNotification
                object:nil];
 
+#if APPLICATION_EXTENSION_API_ONLY
+  if (@available(iOS 13.0, *)) {
+    [self setUpSceneLifecycleNotifications:center];
+  } else {
+    [self setUpApplicationLifecycleNotifications:center];
+  }
+#else
+  [self setUpApplicationLifecycleNotifications:center];
+#endif
+
   [center addObserver:self
-             selector:@selector(applicationWillEnterForeground:)
-                 name:UIApplicationWillEnterForegroundNotification
+             selector:@selector(onLocaleUpdated:)
+                 name:NSCurrentLocaleDidChangeNotification
                object:nil];
 
+  return self;
+}
+
+- (void)setUpSceneLifecycleNotifications:(NSNotificationCenter*)center API_AVAILABLE(ios(13.0)) {
   [center addObserver:self
-             selector:@selector(applicationDidEnterBackground:)
-                 name:UIApplicationDidEnterBackgroundNotification
+             selector:@selector(sceneWillEnterForeground:)
+                 name:UISceneWillEnterForegroundNotification
                object:nil];
-
   [center addObserver:self
-             selector:@selector(onLocaleUpdated:)
-                 name:NSCurrentLocaleDidChangeNotification
+             selector:@selector(sceneDidEnterBackground:)
+                 name:UISceneDidEnterBackgroundNotification
                object:nil];
+}
 
-  return self;
+- (void)setUpApplicationLifecycleNotifications:(NSNotificationCenter*)center {
+  [center addObserver:self
+             selector:@selector(applicationWillEnterForeground:)
+                 name:UIApplicationWillEnterForegroundNotification
+               object:nil];
+  [center addObserver:self
+             selector:@selector(applicationDidEnterBackground:)
+                 name:UIApplicationDidEnterBackgroundNotification
+               object:nil];
 }
 
 - (void)recreatePlatformViewController {
@@ -261,7 +307,10 @@ static constexpr int kNumProfilerSamplesPerSec = 5;
   [_pluginPublications release];
   [_registrars release];
   _binaryMessenger.parent = nil;
+  _textureRegistry.parent = nil;
   [_binaryMessenger release];
+  [_textureRegistry release];
+  _textureRegistry = nil;
   [_isolateId release];
 
   NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
@@ -279,15 +328,15 @@ static constexpr int kNumProfilerSamplesPerSec = 5;
   return *_shell;
 }
 
-- (fml::WeakPtr<FlutterEngine>)getWeakPtr {
-  return _weakFactory->GetWeakPtr();
+- (fml::WeakNSObject<FlutterEngine>)getWeakNSObject {
+  return _weakFactory->GetWeakNSObject();
 }
 
 - (void)updateViewportMetrics:(flutter::ViewportMetrics)viewportMetrics {
   if (!self.platformView) {
     return;
   }
-  self.platformView->SetViewportMetrics(viewportMetrics);
+  self.platformView->SetViewportMetrics(flutter::kFlutterImplicitViewId, viewportMetrics);
 }
 
 - (void)dispatchPointerDataPacket:(std::unique_ptr<flutter::PointerDataPacket>)packet {
@@ -312,7 +361,12 @@ static constexpr int kNumProfilerSamplesPerSec = 5;
   return _shell->GetTaskRunners().GetPlatformTaskRunner();
 }
 
-- (fml::RefPtr<fml::TaskRunner>)RasterTaskRunner {
+- (fml::RefPtr<fml::TaskRunner>)uiTaskRunner {
+  FML_DCHECK(_shell);
+  return _shell->GetTaskRunners().GetUITaskRunner();
+}
+
+- (fml::RefPtr<fml::TaskRunner>)rasterTaskRunner {
   FML_DCHECK(_shell);
   return _shell->GetTaskRunners().GetRasterTaskRunner();
 }
@@ -370,10 +424,11 @@ static constexpr int kNumProfilerSamplesPerSec = 5;
 
 - (void)setViewController:(FlutterViewController*)viewController {
   FML_DCHECK(self.iosPlatformView);
-  _viewController =
-      viewController ? [viewController getWeakPtr] : fml::WeakPtr<FlutterViewController>();
+  _viewController = viewController ? [viewController getWeakNSObject]
+                                   : fml::WeakNSObject<FlutterViewController>();
   self.iosPlatformView->SetOwnerViewController(_viewController);
   [self maybeSetupPlatformViewChannels];
+  [self updateDisplays];
   _textInputPlugin.get().viewController = viewController;
   _undoManagerPlugin.get().viewController = viewController;
 
@@ -413,7 +468,7 @@ static constexpr int kNumProfilerSamplesPerSec = 5;
   _undoManagerPlugin.get().viewController = nil;
   if (!_allowHeadlessExecution) {
     [self destroyContext];
-  } else {
+  } else if (_shell) {
     flutter::PlatformViewIOS* platform_view = [self iosPlatformView];
     if (platform_view) {
       platform_view->SetOwnerViewController({});
@@ -495,6 +550,10 @@ static constexpr int kNumProfilerSamplesPerSec = 5;
   return [_publisher.get() url];
 }
 
+- (NSURL*)vmServiceUrl {
+  return [_publisher.get() url];
+}
+
 - (void)resetChannels {
   _localizationChannel.reset();
   _navigationChannel.reset();
@@ -523,10 +582,10 @@ static constexpr int kNumProfilerSamplesPerSec = 5;
 // If you add a channel, be sure to also update `resetChannels`.
 // Channels get a reference to the engine, and therefore need manual
 // cleanup for proper collection.
-- (void)setupChannels {
+- (void)setUpChannels {
   // This will be invoked once the shell is done setting up and the isolate ID
   // for the UI isolate is available.
-  fml::WeakPtr<FlutterEngine> weakSelf = [self getWeakPtr];
+  fml::WeakNSObject<FlutterEngine> weakSelf = [self getWeakNSObject];
   [_binaryMessenger setMessageHandlerOnChannel:@"flutter/isolate"
                           binaryMessageHandler:^(NSData* message, FlutterBinaryReply reply) {
                             if (weakSelf) {
@@ -610,18 +669,48 @@ static constexpr int kNumProfilerSamplesPerSec = 5;
   FlutterTextInputPlugin* textInputPlugin = [[FlutterTextInputPlugin alloc] initWithDelegate:self];
   _textInputPlugin.reset(textInputPlugin);
   textInputPlugin.indirectScribbleDelegate = self;
-  [textInputPlugin setupIndirectScribbleInteraction:self.viewController];
+  [textInputPlugin setUpIndirectScribbleInteraction:self.viewController];
 
   FlutterUndoManagerPlugin* undoManagerPlugin =
       [[FlutterUndoManagerPlugin alloc] initWithDelegate:self];
   _undoManagerPlugin.reset(undoManagerPlugin);
 
-  _platformPlugin.reset([[FlutterPlatformPlugin alloc] initWithEngine:[self getWeakPtr]]);
+  _platformPlugin.reset([[FlutterPlatformPlugin alloc] initWithEngine:[self getWeakNSObject]]);
 
   _restorationPlugin.reset([[FlutterRestorationPlugin alloc]
          initWithChannel:_restorationChannel.get()
       restorationEnabled:_restorationEnabled]);
   _spellCheckPlugin.reset([[FlutterSpellCheckPlugin alloc] init]);
+
+  _screenshotChannel.reset([[FlutterMethodChannel alloc]
+         initWithName:@"flutter/screenshot"
+      binaryMessenger:self.binaryMessenger
+                codec:[FlutterStandardMethodCodec sharedInstance]]);
+
+  [_screenshotChannel.get()
+      setMethodCallHandler:^(FlutterMethodCall* _Nonnull call, FlutterResult _Nonnull result) {
+        if (!(weakSelf.get() && weakSelf.get()->_shell && weakSelf.get()->_shell->IsSetup())) {
+          return result([FlutterError
+              errorWithCode:@"invalid_state"
+                    message:@"Requesting screenshot while engine is not running."
+                    details:nil]);
+        }
+        flutter::Rasterizer::Screenshot screenshot =
+            [weakSelf.get() screenshot:flutter::Rasterizer::ScreenshotType::SurfaceData
+                          base64Encode:NO];
+        if (!screenshot.data) {
+          return result([FlutterError errorWithCode:@"failure"
+                                            message:@"Unable to get screenshot."
+                                            details:nil]);
+        }
+        // TODO(gaaclarke): Find way to eliminate this data copy.
+        NSData* data = [NSData dataWithBytes:screenshot.data->writable_data()
+                                      length:screenshot.data->size()];
+        NSString* format = [NSString stringWithUTF8String:screenshot.format.c_str()];
+        NSNumber* width = @(screenshot.frame_size.fWidth);
+        NSNumber* height = @(screenshot.frame_size.fHeight);
+        return result(@[ width, height, format ?: [NSNull null], data ]);
+      }];
 }
 
 - (void)maybeSetupPlatformViewChannels {
@@ -631,7 +720,7 @@ static constexpr int kNumProfilerSamplesPerSec = 5;
       [platformPlugin handleMethodCall:call result:result];
     }];
 
-    fml::WeakPtr<FlutterEngine> weakSelf = [self getWeakPtr];
+    fml::WeakNSObject<FlutterEngine> weakSelf = [self getWeakNSObject];
     [_platformViewsChannel.get()
         setMethodCallHandler:^(FlutterMethodCall* call, FlutterResult result) {
           if (weakSelf) {
@@ -672,14 +761,14 @@ static constexpr int kNumProfilerSamplesPerSec = 5;
                                                           entrypointArgs:entrypointArgs]);
 }
 
-- (void)setupShell:(std::unique_ptr<flutter::Shell>)shell
-    withObservatoryPublication:(BOOL)doesObservatoryPublication {
+- (void)setUpShell:(std::unique_ptr<flutter::Shell>)shell
+    withVMServicePublication:(BOOL)doesVMServicePublication {
   _shell = std::move(shell);
-  [self setupChannels];
+  [self setUpChannels];
   [self onLocaleUpdated:nil];
-  [self initializeDisplays];
-  _publisher.reset([[FlutterObservatoryPublisher alloc]
-      initWithEnableObservatoryPublication:doesObservatoryPublication]);
+  [self updateDisplays];
+  _publisher.reset([[FlutterDartVMServicePublisher alloc]
+      initWithEnableVMServicePublication:doesVMServicePublication]);
   [self maybeSetupPlatformViewChannels];
   _shell->SetGpuAvailability(_isGpuDisabled ? flutter::GpuAvailability::kUnavailable
                                             : flutter::GpuAvailability::kAvailable);
@@ -704,11 +793,11 @@ static constexpr int kNumProfilerSamplesPerSec = 5;
   // initialized.
   fml::MessageLoop::EnsureInitializedForCurrentThread();
 
-  uint32_t threadHostType = flutter::ThreadHost::Type::UI | flutter::ThreadHost::Type::RASTER |
-                            flutter::ThreadHost::Type::IO;
+  uint32_t threadHostType = flutter::ThreadHost::Type::kUi | flutter::ThreadHost::Type::kRaster |
+                            flutter::ThreadHost::Type::kIo;
 
   if ([FlutterEngine isProfilerEnabled]) {
-    threadHostType = threadHostType | flutter::ThreadHost::Type::Profiler;
+    threadHostType = threadHostType | flutter::ThreadHost::Type::kProfiler;
   }
 
   flutter::ThreadHost::ThreadHostConfig host_config(threadLabel.UTF8String, threadHostType,
@@ -716,18 +805,18 @@ static constexpr int kNumProfilerSamplesPerSec = 5;
 
   host_config.ui_config =
       fml::Thread::ThreadConfig(flutter::ThreadHost::ThreadHostConfig::MakeThreadName(
-                                    flutter::ThreadHost::Type::UI, threadLabel.UTF8String),
-                                fml::Thread::ThreadPriority::DISPLAY);
+                                    flutter::ThreadHost::Type::kUi, threadLabel.UTF8String),
+                                fml::Thread::ThreadPriority::kDisplay);
 
   host_config.raster_config =
       fml::Thread::ThreadConfig(flutter::ThreadHost::ThreadHostConfig::MakeThreadName(
-                                    flutter::ThreadHost::Type::RASTER, threadLabel.UTF8String),
-                                fml::Thread::ThreadPriority::RASTER);
+                                    flutter::ThreadHost::Type::kRaster, threadLabel.UTF8String),
+                                fml::Thread::ThreadPriority::kRaster);
 
   host_config.io_config =
       fml::Thread::ThreadConfig(flutter::ThreadHost::ThreadHostConfig::MakeThreadName(
-                                    flutter::ThreadHost::Type::IO, threadLabel.UTF8String),
-                                fml::Thread::ThreadPriority::NORMAL);
+                                    flutter::ThreadHost::Type::kIo, threadLabel.UTF8String),
+                                fml::Thread::ThreadPriority::kNormal);
 
   return (flutter::ThreadHost){host_config};
 }
@@ -760,8 +849,7 @@ static void SetEntryPoint(flutter::Settings* settings, NSString* entrypoint, NSS
   if (initialRoute != nil) {
     self.initialRoute = initialRoute;
   } else if (settings.route.empty() == false) {
-    self.initialRoute = [NSString stringWithCString:settings.route.c_str()
-                                           encoding:NSUTF8StringEncoding];
+    self.initialRoute = [NSString stringWithUTF8String:settings.route.c_str()];
   }
 
   FlutterView.forceSoftwareRendering = settings.enable_software_rendering;
@@ -780,7 +868,8 @@ static void SetEntryPoint(flutter::Settings* settings, NSString* entrypoint, NSS
       [self](flutter::Shell& shell) {
         [self recreatePlatformViewController];
         return std::make_unique<flutter::PlatformViewIOS>(
-            shell, self->_renderingApi, self->_platformViewsController, shell.GetTaskRunners());
+            shell, self->_renderingApi, self->_platformViewsController, shell.GetTaskRunners(),
+            shell.GetConcurrentWorkerTaskRunner(), shell.GetIsGpuDisabledSyncSwitch());
       };
 
   flutter::Shell::CreateCallback<flutter::Rasterizer> on_create_rasterizer =
@@ -793,8 +882,20 @@ static void SetEntryPoint(flutter::Settings* settings, NSString* entrypoint, NSS
                                     _threadHost->io_thread->GetTaskRunner()          // io
   );
 
+#if APPLICATION_EXTENSION_API_ONLY
+  if (@available(iOS 13.0, *)) {
+    _isGpuDisabled = self.viewController.flutterWindowSceneIfViewLoaded.activationState ==
+                     UISceneActivationStateBackground;
+  } else {
+    // [UIApplication sharedApplication API is not available for app extension.
+    // We intialize the shell assuming the GPU is required.
+    _isGpuDisabled = NO;
+  }
+#else
   _isGpuDisabled =
       [UIApplication sharedApplication].applicationState == UIApplicationStateBackground;
+#endif
+
   // Create the shell. This is a blocking operation.
   std::unique_ptr<flutter::Shell> shell = flutter::Shell::Create(
       /*platform_data=*/platformData,
@@ -808,8 +909,10 @@ static void SetEntryPoint(flutter::Settings* settings, NSString* entrypoint, NSS
     FML_LOG(ERROR) << "Could not start a shell FlutterEngine with entrypoint: "
                    << entrypoint.UTF8String;
   } else {
-    [self setupShell:std::move(shell)
-        withObservatoryPublication:settings.enable_observatory_publication];
+    // TODO(vashworth): Remove once done debugging https://github.com/flutter/flutter/issues/129836
+    FML_LOG(INFO) << "Enabled VM Service Publication: " << settings.enable_vm_service_publication;
+    [self setUpShell:std::move(shell)
+        withVMServicePublication:settings.enable_vm_service_publication];
     if ([FlutterEngine isProfilerEnabled]) {
       [self startProfiler];
     }
@@ -818,12 +921,19 @@ static void SetEntryPoint(flutter::Settings* settings, NSString* entrypoint, NSS
   return _shell != nullptr;
 }
 
-- (void)initializeDisplays {
-  auto vsync_waiter = std::shared_ptr<flutter::VsyncWaiter>(_shell->GetVsyncWaiter().lock());
+- (void)updateDisplays {
+  if (!_shell) {
+    // Tests may do this.
+    return;
+  }
+  auto vsync_waiter = _shell->GetVsyncWaiter().lock();
   auto vsync_waiter_ios = std::static_pointer_cast<flutter::VsyncWaiterIOS>(vsync_waiter);
   std::vector<std::unique_ptr<flutter::Display>> displays;
-  displays.push_back(std::make_unique<flutter::VariableRefreshRateDisplay>(vsync_waiter_ios));
-  _shell->OnDisplayUpdates(flutter::DisplayUpdateType::kStartup, std::move(displays));
+  auto screen_size = UIScreen.mainScreen.nativeBounds.size;
+  auto scale = UIScreen.mainScreen.scale;
+  displays.push_back(std::make_unique<flutter::VariableRefreshRateDisplay>(
+      0, vsync_waiter_ios, screen_size.width, screen_size.height, scale));
+  _shell->OnDisplayUpdates(std::move(displays));
 }
 
 - (BOOL)run {
@@ -945,7 +1055,7 @@ static void SetEntryPoint(flutter::Settings* settings, NSString* entrypoint, NSS
       actionString = @"TextInputAction.next";
       break;
     case FlutterTextInputActionContinue:
-      actionString = @"TextInputAction.continue";
+      actionString = @"TextInputAction.continueAction";
       break;
     case FlutterTextInputActionJoin:
       actionString = @"TextInputAction.join";
@@ -1040,7 +1150,14 @@ static void SetEntryPoint(flutter::Settings* settings, NSString* entrypoint, NSS
                               arguments:@[ @(client) ]];
 }
 
-- (void)flutterTextInputViewDidResignFirstResponder:(FlutterTextInputView*)textInputView {
+- (void)flutterTextInputView:(FlutterTextInputView*)textInputView
+    didResignFirstResponderWithTextInputClient:(int)client {
+  // When flutter text input view resign first responder, send a message to
+  // framework to ensure the focus state is correct. This is useful when close
+  // keyboard from platform side.
+  [_textInputChannel.get() invokeMethod:@"TextInputClient.onConnectionClosed"
+                              arguments:@[ @(client) ]];
+
   // Platform view's first responder detection logic:
   //
   // All text input widgets (e.g. EditableText) are backed by a dummy UITextInput view
@@ -1096,13 +1213,19 @@ static void SetEntryPoint(flutter::Settings* settings, NSString* entrypoint, NSS
   return _binaryMessenger;
 }
 
+- (NSObject<FlutterTextureRegistry>*)textureRegistry {
+  return _textureRegistry;
+}
+
 // For test only. Ideally we should create a dependency injector for all dependencies and
 // remove this.
 - (void)setBinaryMessenger:(FlutterBinaryMessengerRelay*)binaryMessenger {
   // Discard the previous messenger and keep the new one.
-  _binaryMessenger.parent = nil;
-  [_binaryMessenger release];
-  _binaryMessenger = [binaryMessenger retain];
+  if (binaryMessenger != _binaryMessenger) {
+    _binaryMessenger.parent = nil;
+    [_binaryMessenger release];
+    _binaryMessenger = [binaryMessenger retain];
+  }
 }
 
 #pragma mark - FlutterBinaryMessenger
@@ -1219,11 +1342,29 @@ static void SetEntryPoint(flutter::Settings* settings, NSString* entrypoint, NSS
 
 #pragma mark - Notifications
 
+#if APPLICATION_EXTENSION_API_ONLY
+- (void)sceneWillEnterForeground:(NSNotification*)notification API_AVAILABLE(ios(13.0)) {
+  [self flutterWillEnterForeground:notification];
+}
+
+- (void)sceneDidEnterBackground:(NSNotification*)notification API_AVAILABLE(ios(13.0)) {
+  [self flutterDidEnterBackground:notification];
+}
+#else
 - (void)applicationWillEnterForeground:(NSNotification*)notification {
-  [self setIsGpuDisabled:NO];
+  [self flutterWillEnterForeground:notification];
 }
 
 - (void)applicationDidEnterBackground:(NSNotification*)notification {
+  [self flutterDidEnterBackground:notification];
+}
+#endif
+
+- (void)flutterWillEnterForeground:(NSNotification*)notification {
+  [self setIsGpuDisabled:NO];
+}
+
+- (void)flutterDidEnterBackground:(NSNotification*)notification {
   [self setIsGpuDisabled:YES];
   [self notifyLowMemory];
 }
@@ -1324,7 +1465,7 @@ static void SetEntryPoint(flutter::Settings* settings, NSString* entrypoint, NSS
   result->_profiler = _profiler;
   result->_profiler_metrics = _profiler_metrics;
   result->_isGpuDisabled = _isGpuDisabled;
-  [result setupShell:std::move(shell) withObservatoryPublication:NO];
+  [result setUpShell:std::move(shell) withVMServicePublication:NO];
   return [result autorelease];
 }
 
@@ -1332,6 +1473,14 @@ static void SetEntryPoint(flutter::Settings* settings, NSString* entrypoint, NSS
   return *_threadHost;
 }
 
+- (FlutterDartProject*)project {
+  return _dartProject.get();
+}
+
+- (BOOL)isUsingImpeller {
+  return self.project.isImpellerEnabled;
+}
+
 @end
 
 @implementation FlutterEngineRegistrar {
@@ -1356,7 +1505,7 @@ static void SetEntryPoint(flutter::Settings* settings, NSString* entrypoint, NSS
 }
 
 - (NSObject<FlutterTextureRegistry>*)textures {
-  return _flutterEngine;
+  return _flutterEngine.textureRegistry;
 }
 
 - (void)publish:(NSObject*)value {
@@ -1370,7 +1519,8 @@ static void SetEntryPoint(flutter::Settings* settings, NSString* entrypoint, NSS
   }];
 }
 
-- (void)addApplicationDelegate:(NSObject<FlutterPlugin>*)delegate {
+- (void)addApplicationDelegate:(NSObject<FlutterPlugin>*)delegate
+    NS_EXTENSION_UNAVAILABLE_IOS("Disallowed in plugins used in app extensions") {
   id<UIApplicationDelegate> appDelegate = [[UIApplication sharedApplication] delegate];
   if ([appDelegate conformsToProtocol:@protocol(FlutterAppLifeCycleProvider)]) {
     id<FlutterAppLifeCycleProvider> lifeCycleProvider =
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterEngineGroupTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterEngineGroupTest.mm
index db43205c051f85f6c6293cb482b864f3c833d1a9..77929ea6b4c2011d4c0be199ff61c3c1977c7961 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterEngineGroupTest.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterEngineGroupTest.mm
@@ -132,6 +132,7 @@ FLUTTER_ASSERT_ARC
     FlutterDartProject* mockProject = OCMClassMock([FlutterDartProject class]);
     FlutterEngineGroup* group = [[FlutterEngineGroup alloc] initWithName:@"foo"
                                                                  project:mockProject];
+    XCTAssertNotNil(group);
     weakProject = mockProject;
     XCTAssertNotNil(weakProject);
     group = nil;
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterEnginePlatformViewTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterEnginePlatformViewTest.mm
index 8245750b0f6bb5381d268d3aa3a77927e9c5ec90..1333ef3047045c10f45e6aa17c468748a60176ee 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterEnginePlatformViewTest.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterEnginePlatformViewTest.mm
@@ -13,7 +13,7 @@
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h"
 #import "flutter/shell/platform/darwin/ios/platform_view_ios.h"
 
-FLUTTER_ASSERT_NOT_ARC
+FLUTTER_ASSERT_ARC
 
 namespace flutter {
 namespace {
@@ -24,7 +24,7 @@ class FakeDelegate : public PlatformView::Delegate {
   void OnPlatformViewDestroyed() override {}
   void OnPlatformViewScheduleFrame() override {}
   void OnPlatformViewSetNextFrameCallback(const fml::closure& closure) override {}
-  void OnPlatformViewSetViewportMetrics(const ViewportMetrics& metrics) override {}
+  void OnPlatformViewSetViewportMetrics(int64_t view_id, const ViewportMetrics& metrics) override {}
   const flutter::Settings& OnPlatformViewGetSettings() const override { return settings_; }
   void OnPlatformViewDispatchPlatformMessage(std::unique_ptr<PlatformMessage> message) override {}
   void OnPlatformViewDispatchPointerDataPacket(std::unique_ptr<PointerDataPacket> packet) override {
@@ -65,6 +65,7 @@ flutter::FakeDelegate fake_delegate;
 - (void)setUp {
   fml::MessageLoop::EnsureInitializedForCurrentThread();
   auto thread_task_runner = fml::MessageLoop::GetCurrent().GetTaskRunner();
+  auto sync_switch = std::make_shared<fml::SyncSwitch>();
   flutter::TaskRunners runners(/*label=*/self.name.UTF8String,
                                /*platform=*/thread_task_runner,
                                /*raster=*/thread_task_runner,
@@ -72,9 +73,13 @@ flutter::FakeDelegate fake_delegate;
                                /*io=*/thread_task_runner);
   platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/fake_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/fake_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_sync_switch=*/sync_switch);
   weak_factory = std::make_unique<fml::WeakPtrFactory<flutter::PlatformView>>(platform_view.get());
 }
 
@@ -88,14 +93,20 @@ flutter::FakeDelegate fake_delegate;
 }
 
 - (void)testMsaaSampleCount {
-  // Default should be 1.
-  XCTAssertEqual(platform_view->GetIosContext()->GetMsaaSampleCount(), MsaaSampleCount::kNone);
+  if (fake_delegate.settings_.enable_impeller) {
+    // Default should be 4 for Impeller.
+    XCTAssertEqual(platform_view->GetIosContext()->GetMsaaSampleCount(), MsaaSampleCount::kFour);
+  } else {
+    // Default should be 1 for Skia.
+    XCTAssertEqual(platform_view->GetIosContext()->GetMsaaSampleCount(), MsaaSampleCount::kNone);
+  }
 
   // Verify the platform view creates a new context with updated msaa_samples.
   // Need to use Metal, since this is ignored for Software/GL.
   fake_delegate.settings_.msaa_samples = 4;
 
   auto thread_task_runner = fml::MessageLoop::GetCurrent().GetTaskRunner();
+  auto sync_switch = std::make_shared<fml::SyncSwitch>();
   flutter::TaskRunners runners(/*label=*/self.name.UTF8String,
                                /*platform=*/thread_task_runner,
                                /*raster=*/thread_task_runner,
@@ -105,15 +116,16 @@ flutter::FakeDelegate fake_delegate;
       /*delegate=*/fake_delegate,
       /*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
       /*platform_views_controller=*/nil,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_sync_switch=*/sync_switch);
 
   XCTAssertEqual(msaa_4x_platform_view->GetIosContext()->GetMsaaSampleCount(),
                  MsaaSampleCount::kFour);
 }
 
 - (void)testCallsNotifyLowMemory {
-  id project = OCMClassMock([FlutterDartProject class]);
-  FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"tester" project:project];
+  FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"tester"];
   XCTAssertNotNil(engine);
   id mockEngine = OCMPartialMock(engine);
   OCMStub([mockEngine notifyLowMemory]);
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterEngineTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterEngineTest.mm
index d03781cc482f0c2a08e8ce61db8a0b2194403537..e0153800ed7a40a1acf49736b087a1ef13db422d 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterEngineTest.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterEngineTest.mm
@@ -9,13 +9,49 @@
 #import <objc/runtime.h>
 
 #import "flutter/common/settings.h"
+#include "flutter/fml/synchronization/sync_switch.h"
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
-#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelay.h"
+#import "flutter/shell/platform/darwin/common/framework/Source/FlutterBinaryMessengerRelay.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterDartProject_Internal.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine_Test.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h"
+#import "flutter/shell/platform/darwin/ios/platform_view_ios.h"
 
 FLUTTER_ASSERT_ARC
 
+@interface FlutterEngineSpy : FlutterEngine
+@property(nonatomic) BOOL ensureSemanticsEnabledCalled;
+@end
+
+@implementation FlutterEngineSpy
+
+- (void)ensureSemanticsEnabled {
+  _ensureSemanticsEnabledCalled = YES;
+}
+
+@end
+
+@interface FlutterEngine () <FlutterTextInputDelegate>
+
+@end
+
+/// FlutterBinaryMessengerRelay used for testing that setting FlutterEngine.binaryMessenger to
+/// the current instance doesn't trigger a use-after-free bug.
+///
+/// See: testSetBinaryMessengerToSameBinaryMessenger
+@interface FakeBinaryMessengerRelay : FlutterBinaryMessengerRelay
+@property(nonatomic, assign) BOOL failOnDealloc;
+@end
+
+@implementation FakeBinaryMessengerRelay
+- (void)dealloc {
+  if (_failOnDealloc) {
+    XCTFail("FakeBinaryMessageRelay should not be deallocated");
+  }
+}
+@end
+
 @interface FlutterEngineTest : XCTestCase
 @end
 
@@ -28,7 +64,7 @@ FLUTTER_ASSERT_ARC
 }
 
 - (void)testCreate {
-  id project = OCMClassMock([FlutterDartProject class]);
+  FlutterDartProject* project = [[FlutterDartProject alloc] init];
   FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"foobar" project:project];
   XCTAssertNotNil(engine);
 }
@@ -91,7 +127,7 @@ FLUTTER_ASSERT_ARC
 
 - (void)testDeallocated {
   __weak FlutterEngine* weakEngine = nil;
-  {
+  @autoreleasepool {
     FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"foobar"];
     weakEngine = engine;
     [engine run];
@@ -101,7 +137,7 @@ FLUTTER_ASSERT_ARC
 }
 
 - (void)testSendMessageBeforeRun {
-  id project = OCMClassMock([FlutterDartProject class]);
+  FlutterDartProject* project = [[FlutterDartProject alloc] init];
   FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"foobar" project:project];
   XCTAssertNotNil(engine);
   XCTAssertThrows([engine.binaryMessenger
@@ -111,7 +147,7 @@ FLUTTER_ASSERT_ARC
 }
 
 - (void)testSetMessageHandlerBeforeRun {
-  id project = OCMClassMock([FlutterDartProject class]);
+  FlutterDartProject* project = [[FlutterDartProject alloc] init];
   FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"foobar" project:project];
   XCTAssertNotNil(engine);
   XCTAssertThrows([engine.binaryMessenger
@@ -122,7 +158,7 @@ FLUTTER_ASSERT_ARC
 }
 
 - (void)testNilSetMessageHandlerBeforeRun {
-  id project = OCMClassMock([FlutterDartProject class]);
+  FlutterDartProject* project = [[FlutterDartProject alloc] init];
   FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"foobar" project:project];
   XCTAssertNotNil(engine);
   XCTAssertNoThrow([engine.binaryMessenger setMessageHandlerOnChannel:@"foo"
@@ -133,7 +169,7 @@ FLUTTER_ASSERT_ARC
   id plugin = OCMProtocolMock(@protocol(FlutterPlugin));
   OCMStub([plugin detachFromEngineForRegistrar:[OCMArg any]]);
   {
-    id project = OCMClassMock([FlutterDartProject class]);
+    FlutterDartProject* project = [[FlutterDartProject alloc] init];
     FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"engine" project:project];
     NSObject<FlutterPluginRegistrar>* registrar = [engine registrarForPlugin:@"plugin"];
     [registrar publish:plugin];
@@ -142,6 +178,20 @@ FLUTTER_ASSERT_ARC
   OCMVerify([plugin detachFromEngineForRegistrar:[OCMArg any]]);
 }
 
+- (void)testSetBinaryMessengerToSameBinaryMessenger {
+  FakeBinaryMessengerRelay* fakeBinaryMessenger = [[FakeBinaryMessengerRelay alloc] init];
+
+  FlutterEngine* engine = [[FlutterEngine alloc] init];
+  [engine setBinaryMessenger:fakeBinaryMessenger];
+
+  // Verify that the setter doesn't free the old messenger before setting the new messenger.
+  fakeBinaryMessenger.failOnDealloc = YES;
+  [engine setBinaryMessenger:fakeBinaryMessenger];
+
+  // Don't fail when ARC releases the binary messenger.
+  fakeBinaryMessenger.failOnDealloc = NO;
+}
+
 - (void)testRunningInitialRouteSendsNavigationMessage {
   id mockBinaryMessenger = OCMClassMock([FlutterBinaryMessengerRelay class]);
 
@@ -210,7 +260,7 @@ FLUTTER_ASSERT_ARC
                        [timeoutFirstFrame fulfill];
                      }
                    }];
-  [self waitForExpectationsWithTimeout:1 handler:nil];
+  [self waitForExpectationsWithTimeout:5 handler:nil];
 }
 
 - (void)testSpawn {
@@ -291,4 +341,133 @@ FLUTTER_ASSERT_ARC
   method_setImplementation(method, originalSetThreadPriority);
 }
 
+- (void)testCanEnableDisableEmbedderAPIThroughInfoPlist {
+  {
+    // Not enable embedder API by default
+    auto settings = FLTDefaultSettingsForBundle();
+    settings.enable_software_rendering = true;
+    FlutterDartProject* project = [[FlutterDartProject alloc] initWithSettings:settings];
+    FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"foobar" project:project];
+    XCTAssertFalse(engine.enableEmbedderAPI);
+  }
+  {
+    // Enable embedder api
+    id mockMainBundle = OCMPartialMock([NSBundle mainBundle]);
+    OCMStub([mockMainBundle objectForInfoDictionaryKey:@"FLTEnableIOSEmbedderAPI"])
+        .andReturn(@"YES");
+    auto settings = FLTDefaultSettingsForBundle();
+    settings.enable_software_rendering = true;
+    FlutterDartProject* project = [[FlutterDartProject alloc] initWithSettings:settings];
+    FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"foobar" project:project];
+    XCTAssertTrue(engine.enableEmbedderAPI);
+  }
+}
+
+- (void)testFlutterTextInputViewDidResignFirstResponderWillCallTextInputClientConnectionClosed {
+  id mockBinaryMessenger = OCMClassMock([FlutterBinaryMessengerRelay class]);
+  FlutterEngine* engine = [[FlutterEngine alloc] init];
+  [engine setBinaryMessenger:mockBinaryMessenger];
+  [engine runWithEntrypoint:FlutterDefaultDartEntrypoint initialRoute:@"test"];
+  [engine flutterTextInputView:nil didResignFirstResponderWithTextInputClient:1];
+  FlutterMethodCall* methodCall =
+      [FlutterMethodCall methodCallWithMethodName:@"TextInputClient.onConnectionClosed"
+                                        arguments:@[ @(1) ]];
+  NSData* encodedMethodCall = [[FlutterJSONMethodCodec sharedInstance] encodeMethodCall:methodCall];
+  OCMVerify([mockBinaryMessenger sendOnChannel:@"flutter/textinput" message:encodedMethodCall]);
+}
+
+- (void)testFlutterEngineUpdatesDisplays {
+  FlutterEngine* engine = [[FlutterEngine alloc] init];
+  id mockEngine = OCMPartialMock(engine);
+
+  [engine run];
+  OCMVerify(times(1), [mockEngine updateDisplays]);
+  engine.viewController = nil;
+  OCMVerify(times(2), [mockEngine updateDisplays]);
+}
+
+- (void)testLifeCycleNotificationDidEnterBackground {
+  FlutterDartProject* project = [[FlutterDartProject alloc] init];
+  FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"foobar" project:project];
+  [engine run];
+  NSNotification* sceneNotification =
+      [NSNotification notificationWithName:UISceneDidEnterBackgroundNotification
+                                    object:nil
+                                  userInfo:nil];
+  NSNotification* applicationNotification =
+      [NSNotification notificationWithName:UIApplicationDidEnterBackgroundNotification
+                                    object:nil
+                                  userInfo:nil];
+  id mockEngine = OCMPartialMock(engine);
+  [[NSNotificationCenter defaultCenter] postNotification:sceneNotification];
+  [[NSNotificationCenter defaultCenter] postNotification:applicationNotification];
+#if APPLICATION_EXTENSION_API_ONLY
+  OCMVerify(times(1), [mockEngine sceneDidEnterBackground:[OCMArg any]]);
+#else
+  OCMVerify(times(1), [mockEngine applicationDidEnterBackground:[OCMArg any]]);
+#endif
+  XCTAssertTrue(engine.isGpuDisabled);
+  bool switch_value = false;
+  [engine shell].GetIsGpuDisabledSyncSwitch()->Execute(
+      fml::SyncSwitch::Handlers().SetIfTrue([&] { switch_value = true; }).SetIfFalse([&] {
+        switch_value = false;
+      }));
+  XCTAssertTrue(switch_value);
+}
+
+- (void)testLifeCycleNotificationWillEnterForeground {
+  FlutterDartProject* project = [[FlutterDartProject alloc] init];
+  FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"foobar" project:project];
+  [engine run];
+  NSNotification* sceneNotification =
+      [NSNotification notificationWithName:UISceneWillEnterForegroundNotification
+                                    object:nil
+                                  userInfo:nil];
+  NSNotification* applicationNotification =
+      [NSNotification notificationWithName:UIApplicationWillEnterForegroundNotification
+                                    object:nil
+                                  userInfo:nil];
+  id mockEngine = OCMPartialMock(engine);
+  [[NSNotificationCenter defaultCenter] postNotification:sceneNotification];
+  [[NSNotificationCenter defaultCenter] postNotification:applicationNotification];
+#if APPLICATION_EXTENSION_API_ONLY
+  OCMVerify(times(1), [mockEngine sceneWillEnterForeground:[OCMArg any]]);
+#else
+  OCMVerify(times(1), [mockEngine applicationWillEnterForeground:[OCMArg any]]);
+#endif
+  XCTAssertFalse(engine.isGpuDisabled);
+  bool switch_value = true;
+  [engine shell].GetIsGpuDisabledSyncSwitch()->Execute(
+      fml::SyncSwitch::Handlers().SetIfTrue([&] { switch_value = true; }).SetIfFalse([&] {
+        switch_value = false;
+      }));
+  XCTAssertFalse(switch_value);
+}
+
+- (void)testSpawnsShareGpuContext {
+  FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"foobar"];
+  [engine run];
+  FlutterEngine* spawn = [engine spawnWithEntrypoint:nil
+                                          libraryURI:nil
+                                        initialRoute:nil
+                                      entrypointArgs:nil];
+  XCTAssertNotNil(spawn);
+  XCTAssertTrue([engine iosPlatformView] != nullptr);
+  XCTAssertTrue([spawn iosPlatformView] != nullptr);
+  std::shared_ptr<flutter::IOSContext> engine_context = [engine iosPlatformView]->GetIosContext();
+  std::shared_ptr<flutter::IOSContext> spawn_context = [spawn iosPlatformView]->GetIosContext();
+  XCTAssertEqual(engine_context, spawn_context);
+  // If this assert fails it means we may be using the software.  For software rendering, this is
+  // expected to be nullptr.
+  XCTAssertTrue(engine_context->GetMainContext() != nullptr);
+  XCTAssertEqual(engine_context->GetMainContext(), spawn_context->GetMainContext());
+}
+
+- (void)testEnableSemanticsWhenFlutterViewAccessibilityDidCall {
+  FlutterEngineSpy* engine = [[FlutterEngineSpy alloc] initWithName:@"foobar"];
+  engine.ensureSemanticsEnabledCalled = NO;
+  [engine flutterViewAccessibilityDidCall];
+  XCTAssertTrue(engine.ensureSemanticsEnabledCalled);
+}
+
 @end
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterEngineTest_mrc.mm b/shell/platform/darwin/ios/framework/Source/FlutterEngineTest_mrc.mm
deleted file mode 100644
index 1acf3755f07b5088e16ee6d2eadb8193484c7405..0000000000000000000000000000000000000000
--- a/shell/platform/darwin/ios/framework/Source/FlutterEngineTest_mrc.mm
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import <OCMock/OCMock.h>
-#import <XCTest/XCTest.h>
-
-#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
-#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h"
-#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine_Test.h"
-#import "flutter/shell/platform/darwin/ios/platform_view_ios.h"
-
-FLUTTER_ASSERT_NOT_ARC
-
-@interface FlutterEngineSpy : FlutterEngine
-@property(nonatomic) BOOL ensureSemanticsEnabledCalled;
-@end
-
-@implementation FlutterEngineSpy
-
-- (void)ensureSemanticsEnabled {
-  _ensureSemanticsEnabledCalled = YES;
-}
-
-@end
-
-@interface FlutterEngineTest_mrc : XCTestCase
-@end
-
-@implementation FlutterEngineTest_mrc
-
-- (void)setUp {
-}
-
-- (void)tearDown {
-}
-
-- (void)testSpawnsShareGpuContext {
-  FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"foobar"];
-  [engine run];
-  FlutterEngine* spawn = [engine spawnWithEntrypoint:nil
-                                          libraryURI:nil
-                                        initialRoute:nil
-                                      entrypointArgs:nil];
-  XCTAssertNotNil(spawn);
-  XCTAssertTrue([engine iosPlatformView] != nullptr);
-  XCTAssertTrue([spawn iosPlatformView] != nullptr);
-  std::shared_ptr<flutter::IOSContext> engine_context = [engine iosPlatformView]->GetIosContext();
-  std::shared_ptr<flutter::IOSContext> spawn_context = [spawn iosPlatformView]->GetIosContext();
-  XCTAssertEqual(engine_context, spawn_context);
-  // If this assert fails it means we may be using the software.  For software rendering, this is
-  // expected to be nullptr.
-  XCTAssertTrue(engine_context->GetMainContext() != nullptr);
-  XCTAssertEqual(engine_context->GetMainContext(), spawn_context->GetMainContext());
-  [engine release];
-}
-
-- (void)testEnableSemanticsWhenFlutterViewAccessibilityDidCall {
-  FlutterEngineSpy* engine = [[FlutterEngineSpy alloc] initWithName:@"foobar"];
-  engine.ensureSemanticsEnabledCalled = NO;
-  [engine flutterViewAccessibilityDidCall];
-  XCTAssertTrue(engine.ensureSemanticsEnabledCalled);
-}
-
-@end
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h b/shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h
index 15eaa54854fe5837cbb4e19ea78163bc5debf3ef..03c1e6ef34d7eae5d7362ee54f1ec8854d1c240c 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h
+++ b/shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTER_ENGINE_INTERNAL_H_
-#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTER_ENGINE_INTERNAL_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERENGINE_INTERNAL_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERENGINE_INTERNAL_H_
 
 #import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterEngine.h"
 
@@ -15,8 +15,6 @@
 #include "flutter/shell/common/rasterizer.h"
 #include "flutter/shell/common/shell.h"
 
-// Embedder header included as an implementation detail (See BUILD.gn), iOS
-// doesn't use the embedding API, just some structures from it.
 #include "flutter/shell/platform/embedder/embedder.h"
 
 #import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterEngine.h"
@@ -29,7 +27,9 @@
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h"
 #import "flutter/shell/platform/darwin/ios/platform_view_ios.h"
 
-extern NSString* _Nonnull const kFlutterEngineWillDealloc;
+NS_ASSUME_NONNULL_BEGIN
+
+extern NSString* const kFlutterEngineWillDealloc;
 
 @interface FlutterEngine () <FlutterViewEngineDelegate>
 
@@ -39,17 +39,18 @@ extern NSString* _Nonnull const kFlutterEngineWillDealloc;
 - (void)dispatchPointerDataPacket:(std::unique_ptr<flutter::PointerDataPacket>)packet;
 
 - (fml::RefPtr<fml::TaskRunner>)platformTaskRunner;
-- (fml::RefPtr<fml::TaskRunner>)RasterTaskRunner;
+- (fml::RefPtr<fml::TaskRunner>)uiTaskRunner;
+- (fml::RefPtr<fml::TaskRunner>)rasterTaskRunner;
 
 - (fml::WeakPtr<flutter::PlatformView>)platformView;
 
 - (flutter::Rasterizer::Screenshot)screenshot:(flutter::Rasterizer::ScreenshotType)type
                                  base64Encode:(bool)base64Encode;
 
-- (nonnull FlutterPlatformPlugin*)platformPlugin;
+- (FlutterPlatformPlugin*)platformPlugin;
 - (std::shared_ptr<flutter::FlutterPlatformViewsController>&)platformViewsController;
-- (nonnull FlutterTextInputPlugin*)textInputPlugin;
-- (nonnull FlutterRestorationPlugin*)restorationPlugin;
+- (FlutterTextInputPlugin*)textInputPlugin;
+- (FlutterRestorationPlugin*)restorationPlugin;
 - (void)launchEngine:(nullable NSString*)entrypoint
           libraryURI:(nullable NSString*)libraryOrNil
       entrypointArgs:(nullable NSArray<NSString*>*)entrypointArgs;
@@ -58,10 +59,9 @@ extern NSString* _Nonnull const kFlutterEngineWillDealloc;
        initialRoute:(nullable NSString*)initialRoute;
 - (void)attachView;
 - (void)notifyLowMemory;
-- (nonnull flutter::PlatformViewIOS*)iosPlatformView;
+- (flutter::PlatformViewIOS*)iosPlatformView;
 
-- (void)waitForFirstFrame:(NSTimeInterval)timeout
-                 callback:(nonnull void (^)(BOOL didTimeout))callback;
+- (void)waitForFirstFrame:(NSTimeInterval)timeout callback:(void (^)(BOOL didTimeout))callback;
 
 /**
  * Creates one running FlutterEngine from another, sharing components between them.
@@ -69,10 +69,10 @@ extern NSString* _Nonnull const kFlutterEngineWillDealloc;
  * This results in a faster creation time and a smaller memory footprint engine.
  * This should only be called on a FlutterEngine that is running.
  */
-- (nonnull FlutterEngine*)spawnWithEntrypoint:(nullable NSString*)entrypoint
-                                   libraryURI:(nullable NSString*)libraryURI
-                                 initialRoute:(nullable NSString*)initialRoute
-                               entrypointArgs:(nullable NSArray<NSString*>*)entrypointArgs;
+- (FlutterEngine*)spawnWithEntrypoint:(nullable NSString*)entrypoint
+                           libraryURI:(nullable NSString*)libraryURI
+                         initialRoute:(nullable NSString*)initialRoute
+                       entrypointArgs:(nullable NSArray<NSString*>*)entrypointArgs;
 
 /**
  * Dispatches the given key event data to the framework through the engine.
@@ -81,6 +81,10 @@ extern NSString* _Nonnull const kFlutterEngineWillDealloc;
 - (void)sendKeyEvent:(const FlutterKeyEvent&)event
             callback:(nullable FlutterKeyEventCallback)callback
             userData:(nullable void*)userData;
+
+@property(nonatomic, readonly) FlutterDartProject* project;
 @end
 
-#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTER_ENGINE_INTERNAL_H_
+NS_ASSUME_NONNULL_END
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERENGINE_INTERNAL_H_
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterEngine_Test.h b/shell/platform/darwin/ios/framework/Source/FlutterEngine_Test.h
index 70ffc7a5a6b4d0bf5954e5e67e7dd9a8d605ec52..238f6528aaf26b44e63efedcc48434808a8be8f3 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterEngine_Test.h
+++ b/shell/platform/darwin/ios/framework/Source/FlutterEngine_Test.h
@@ -2,9 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERENGINE_TEST_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERENGINE_TEST_H_
+
 #import "flutter/shell/common/shell.h"
 #import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterEngine.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputDelegate.h"
 #import "flutter/shell/platform/darwin/ios/rendering_api_selection.h"
+#include "flutter/shell/platform/embedder/embedder.h"
 
 extern NSString* const kFlutterEngineWillDealloc;
 
@@ -16,6 +21,10 @@ class ThreadHost;
 
 // Category to add test-only visibility.
 @interface FlutterEngine (Test) <FlutterBinaryMessenger>
+
+@property(readonly, nonatomic) FlutterEngineProcTable& embedderAPI;
+@property(readonly, nonatomic) BOOL enableEmbedderAPI;
+
 - (flutter::Shell&)shell;
 - (void)setBinaryMessenger:(FlutterBinaryMessengerRelay*)binaryMessenger;
 - (flutter::IOSRenderingAPI)platformViewsRenderingAPI;
@@ -25,4 +34,15 @@ class ThreadHost;
                          initialRoute:(/*nullable*/ NSString*)initialRoute
                        entrypointArgs:(/*nullable*/ NSArray<NSString*>*)entrypointArgs;
 - (const flutter::ThreadHost&)threadHost;
+- (void)updateDisplays;
+- (void)flutterTextInputView:(FlutterTextInputView*)textInputView
+               performAction:(FlutterTextInputAction)action
+                  withClient:(int)client;
+- (void)sceneWillEnterForeground:(NSNotification*)notification API_AVAILABLE(ios(13.0));
+- (void)sceneDidEnterBackground:(NSNotification*)notification API_AVAILABLE(ios(13.0));
+- (void)applicationWillEnterForeground:(NSNotification*)notification;
+- (void)applicationDidEnterBackground:(NSNotification*)notification;
+
 @end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERENGINE_TEST_H_
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterFakeKeyEvents.h b/shell/platform/darwin/ios/framework/Source/FlutterFakeKeyEvents.h
index 387ec5a7bb6af24a5ee21dae18e20a322362da7e..42d4626fa37209686ff23d83ab9283fbd5c49b38 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterFakeKeyEvents.h
+++ b/shell/platform/darwin/ios/framework/Source/FlutterFakeKeyEvents.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTER_FAKE_KEY_EVENTS_H_
-#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTER_FAKE_KEY_EVENTS_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERFAKEKEYEVENTS_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERFAKEKEYEVENTS_H_
 
 #import <Foundation/Foundation.h>
 #import <OCMock/OCMock.h>
@@ -47,26 +47,29 @@ API_AVAILABLE(ios(13.4))
 @property(readwrite, nonatomic) NSString* dataCharactersIgnoringModifiers;
 @end
 
-FlutterUIPressProxy* keyDownEvent(UIKeyboardHIDUsage keyCode,
-                                  UIKeyModifierFlags modifierFlags = 0x0,
-                                  NSTimeInterval timestamp = 0.0f,
-                                  const char* characters = "",
-                                  const char* charactersIgnoringModifiers = "")
+namespace flutter {
+namespace testing {
+extern FlutterUIPressProxy* keyDownEvent(UIKeyboardHIDUsage keyCode,
+                                         UIKeyModifierFlags modifierFlags = 0x0,
+                                         NSTimeInterval timestamp = 0.0f,
+                                         const char* characters = "",
+                                         const char* charactersIgnoringModifiers = "")
     API_AVAILABLE(ios(13.4));
 
-FlutterUIPressProxy* keyUpEvent(UIKeyboardHIDUsage keyCode,
-                                UIKeyModifierFlags modifierFlags = 0x0,
-                                NSTimeInterval timestamp = 0.0f,
-                                const char* characters = "",
-                                const char* charactersIgnoringModifiers = "")
-    API_AVAILABLE(ios(13.4));
-
-FlutterUIPressProxy* keyEventWithPhase(UIPressPhase phase,
-                                       UIKeyboardHIDUsage keyCode,
+extern FlutterUIPressProxy* keyUpEvent(UIKeyboardHIDUsage keyCode,
                                        UIKeyModifierFlags modifierFlags = 0x0,
                                        NSTimeInterval timestamp = 0.0f,
                                        const char* characters = "",
                                        const char* charactersIgnoringModifiers = "")
     API_AVAILABLE(ios(13.4));
 
-#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTER_FAKE_KEY_EVENTS_H_
+extern FlutterUIPressProxy* keyEventWithPhase(UIPressPhase phase,
+                                              UIKeyboardHIDUsage keyCode,
+                                              UIKeyModifierFlags modifierFlags = 0x0,
+                                              NSTimeInterval timestamp = 0.0f,
+                                              const char* characters = "",
+                                              const char* charactersIgnoringModifiers = "")
+    API_AVAILABLE(ios(13.4));
+}  // namespace testing
+}  // namespace flutter
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERFAKEKEYEVENTS_H_
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterFakeKeyEvents.mm b/shell/platform/darwin/ios/framework/Source/FlutterFakeKeyEvents.mm
index 461c2c4662ac5ba4b4747a89e2a1d3b685069934..aaca2b898581aee350d1e2c5997ead761dfd6519 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterFakeKeyEvents.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterFakeKeyEvents.mm
@@ -3,6 +3,8 @@
 // found in the LICENSE file.
 
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterFakeKeyEvents.h"
+
+#include "flutter/fml/logging.h"
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/KeyCodeMap_Internal.h"
 
@@ -82,6 +84,9 @@ FLUTTER_ASSERT_ARC;
 }
 @end
 
+namespace flutter {
+namespace testing {
+
 FlutterUIPressProxy* keyDownEvent(UIKeyboardHIDUsage keyCode,
                                   UIKeyModifierFlags modifierFlags,
                                   NSTimeInterval timestamp,
@@ -108,8 +113,8 @@ FlutterUIPressProxy* keyEventWithPhase(UIPressPhase phase,
                                        const char* characters,
                                        const char* charactersIgnoringModifiers)
     API_AVAILABLE(ios(13.4)) {
-  assert(!(modifierFlags & kModifierFlagSidedMask) &&
-         "iOS doesn't supply modifier side flags, so don't create events with them.");
+  FML_DCHECK(!(modifierFlags & kModifierFlagSidedMask))
+      << "iOS doesn't supply modifier side flags, so don't create events with them.";
   UIKey* key =
       [[FakeUIKey alloc] initWithData:keyCode
                         modifierFlags:modifierFlags
@@ -121,3 +126,5 @@ FlutterUIPressProxy* keyEventWithPhase(UIPressPhase phase,
                                            type:UIEventTypePresses
                                       timestamp:timestamp];
 }
+}  // namespace testing
+}  // namespace flutter
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterIndirectScribbleDelegate.h b/shell/platform/darwin/ios/framework/Source/FlutterIndirectScribbleDelegate.h
index f5647e617338722b3a944b03dbb01817b1752c79..1611941e8c81e57f900ef9e9a1b94663aac8784b 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterIndirectScribbleDelegate.h
+++ b/shell/platform/darwin/ios/framework/Source/FlutterIndirectScribbleDelegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERINDIRECTSCRIBBLEDELEGATE_H_
-#define SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERINDIRECTSCRIBBLEDELEGATE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERINDIRECTSCRIBBLEDELEGATE_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERINDIRECTSCRIBBLEDELEGATE_H_
 
 #import <Foundation/Foundation.h>
 
@@ -21,4 +21,4 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 NS_ASSUME_NONNULL_END
 
-#endif  // SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERINDIRECTSCRIBBLEDELEGATE_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERINDIRECTSCRIBBLEDELEGATE_H_
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterKeyPrimaryResponder.h b/shell/platform/darwin/ios/framework/Source/FlutterKeyPrimaryResponder.h
index d89f3a9d5e66ecb80c10c187a6910fde9110d4dc..2843e5d5d35cf064782cf3aad1827f4431fe4aa5 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterKeyPrimaryResponder.h
+++ b/shell/platform/darwin/ios/framework/Source/FlutterKeyPrimaryResponder.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTER_KEY_PRIMARY_RESPONDER_H_
-#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTER_KEY_PRIMARY_RESPONDER_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERKEYPRIMARYRESPONDER_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERKEYPRIMARYRESPONDER_H_
 
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterUIPressProxy.h"
 
@@ -31,4 +31,4 @@ typedef void (^FlutterAsyncKeyCallback)(BOOL handled);
 
 @end
 
-#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTER_KEY_PRIMARY_RESPONDER_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERKEYPRIMARYRESPONDER_H_
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterKeySecondaryResponder.h b/shell/platform/darwin/ios/framework/Source/FlutterKeySecondaryResponder.h
index 7aaa0b7f315300487a1d5b4cae3d847e1682f798..7a23014fa8a9e77c67b9b1a5e7e0977554334c2f 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterKeySecondaryResponder.h
+++ b/shell/platform/darwin/ios/framework/Source/FlutterKeySecondaryResponder.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTER_KEY_SECONDARY_RESPONDER_H_
-#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTER_KEY_SECONDARY_RESPONDER_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERKEYSECONDARYRESPONDER_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERKEYSECONDARYRESPONDER_H_
 
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterUIPressProxy.h"
 
@@ -28,4 +28,4 @@
 - (BOOL)handlePress:(nonnull FlutterUIPressProxy*)press API_AVAILABLE(ios(13.4));
 @end
 
-#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTER_KEY_SECONDARY_RESPONDER_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERKEYSECONDARYRESPONDER_H_
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterKeyboardManager.h b/shell/platform/darwin/ios/framework/Source/FlutterKeyboardManager.h
index ebdcae1d2d2a7762cfc45c3212da9b3a645cb39d..33763f7499dccd7db08c370f6f316a3ed78997e9 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterKeyboardManager.h
+++ b/shell/platform/darwin/ios/framework/Source/FlutterKeyboardManager.h
@@ -2,15 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTER_KEYBOARD_MANAGER_H_
-#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTER_KEYBOARD_MANAGER_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERKEYBOARDMANAGER_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERKEYBOARDMANAGER_H_
 
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterKeyPrimaryResponder.h"
 
 #import <Foundation/NSObject.h>
 #import <UIKit/UIKit.h>
 
-#include "flutter/fml/memory/weak_ptr.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterKeyPrimaryResponder.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterKeySecondaryResponder.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterUIPressProxy.h"
@@ -72,4 +71,4 @@ typedef void (^KeyEventCompleteCallback)(bool, FlutterUIPressProxy* _Nonnull)
          nextAction:(nonnull void (^)())next API_AVAILABLE(ios(13.4));
 @end
 
-#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTER_KEYBOARD_MANAGER_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERKEYBOARDMANAGER_H_
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterKeyboardManager.mm b/shell/platform/darwin/ios/framework/Source/FlutterKeyboardManager.mm
index db6aeca077bac8f800928c63abcfbbb79428571f..524dc6f43f7917982f63721f4dcbd4b0511d7802 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterKeyboardManager.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterKeyboardManager.mm
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterKeyboardManager.h"
-#include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/fml/platform/darwin/message_loop_darwin.h"
+#include "flutter/fml/platform/darwin/weak_nsobject.h"
 
 static constexpr CFTimeInterval kDistantFuture = 1.0e10;
 
@@ -29,7 +29,7 @@ static constexpr CFTimeInterval kDistantFuture = 1.0e10;
 @end
 
 @implementation FlutterKeyboardManager {
-  std::unique_ptr<fml::WeakPtrFactory<FlutterKeyboardManager>> _weakFactory;
+  std::unique_ptr<fml::WeakNSObjectFactory<FlutterKeyboardManager>> _weakFactory;
 }
 
 - (nonnull instancetype)init {
@@ -37,7 +37,7 @@ static constexpr CFTimeInterval kDistantFuture = 1.0e10;
   if (self != nil) {
     _primaryResponders = [[NSMutableArray alloc] init];
     _secondaryResponders = [[NSMutableArray alloc] init];
-    _weakFactory = std::make_unique<fml::WeakPtrFactory<FlutterKeyboardManager>>(self);
+    _weakFactory = std::make_unique<fml::WeakNSObjectFactory<FlutterKeyboardManager>>(self);
   }
   return self;
 }
@@ -64,8 +64,8 @@ static constexpr CFTimeInterval kDistantFuture = 1.0e10;
   [super dealloc];
 }
 
-- (fml::WeakPtr<FlutterKeyboardManager>)getWeakPtr {
-  return _weakFactory->GetWeakPtr();
+- (fml::WeakNSObject<FlutterKeyboardManager>)getWeakNSObject {
+  return _weakFactory->GetWeakNSObject();
 }
 
 - (void)handlePress:(nonnull FlutterUIPressProxy*)press
@@ -89,7 +89,7 @@ static constexpr CFTimeInterval kDistantFuture = 1.0e10;
       // encounter.
       NSAssert([_primaryResponders count] >= 0, @"At least one primary responder must be added.");
 
-      __block auto weakSelf = [self getWeakPtr];
+      __block auto weakSelf = [self getWeakNSObject];
       __block NSUInteger unreplied = [self.primaryResponders count];
       __block BOOL anyHandled = false;
       FlutterAsyncKeyCallback replyCallback = ^(BOOL handled) {
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterKeyboardManagerTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterKeyboardManagerTest.mm
index 764a64b242cad43dffad6362ca4eed78a78a9bd5..5568c38016db9381bb3598eeb8451c0298f9cb5b 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterKeyboardManagerTest.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterKeyboardManagerTest.mm
@@ -21,6 +21,8 @@ namespace flutter {
 class PointerDataPacket {};
 }  // namespace flutter
 
+using namespace flutter::testing;
+
 /// Sometimes we have to use a custom mock to avoid retain cycles in ocmock.
 @interface FlutterEnginePartialMock : FlutterEngine
 @property(nonatomic, strong) FlutterBasicMessageChannel* lifecycleChannel;
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterMetalLayer.h b/shell/platform/darwin/ios/framework/Source/FlutterMetalLayer.h
new file mode 100644
index 0000000000000000000000000000000000000000..21b63b4a048acf48331b888c59df2f2672645d7d
--- /dev/null
+++ b/shell/platform/darwin/ios/framework/Source/FlutterMetalLayer.h
@@ -0,0 +1,43 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERMETALLAYER_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERMETALLAYER_H_
+
+#import <QuartzCore/QuartzCore.h>
+
+/// Drop-in replacement (as far as Flutter is concerned) for CAMetalLayer
+/// that can present with transaction from a background thread.
+@interface FlutterMetalLayer : CALayer
+
+@property(nullable, retain) id<MTLDevice> device;
+@property(nullable, readonly) id<MTLDevice> preferredDevice;
+@property MTLPixelFormat pixelFormat;
+@property BOOL framebufferOnly;
+@property CGSize drawableSize;
+@property BOOL presentsWithTransaction;
+@property(nullable) CGColorSpaceRef colorspace;
+@property BOOL wantsExtendedDynamicRangeContent;
+
+- (nullable id<CAMetalDrawable>)nextDrawable;
+
+/// Returns whether the Metal layer is enabled.
+/// This is controlled by FLTUseFlutterMetalLayer value in Info.plist.
++ (BOOL)enabled;
+
+@end
+
+@protocol MTLCommandBuffer;
+
+@protocol FlutterMetalDrawable <CAMetalDrawable>
+
+/// In order for FlutterMetalLayer to provide back pressure it must have access
+/// to the command buffer that is used to render into the drawable to schedule
+/// a completion handler.
+/// This method must be called before the command buffer is committed.
+- (void)flutterPrepareForPresent:(nonnull id<MTLCommandBuffer>)commandBuffer;
+
+@end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERMETALLAYER_H_
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterMetalLayer.mm b/shell/platform/darwin/ios/framework/Source/FlutterMetalLayer.mm
new file mode 100644
index 0000000000000000000000000000000000000000..f22dfefb52058252b243db9ee668ff3e17ac4d36
--- /dev/null
+++ b/shell/platform/darwin/ios/framework/Source/FlutterMetalLayer.mm
@@ -0,0 +1,438 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <IOSurface/IOSurfaceObjC.h>
+#include <Metal/Metal.h>
+#include <UIKit/UIKit.h>
+
+#include "flutter/fml/logging.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterMetalLayer.h"
+
+@interface DisplayLinkManager : NSObject
+@property(class, nonatomic, readonly) BOOL maxRefreshRateEnabledOnIPhone;
++ (double)displayRefreshRate;
+@end
+
+@class FlutterTexture;
+@class FlutterDrawable;
+
+extern CFTimeInterval display_link_target;
+
+@interface FlutterMetalLayer () {
+  id<MTLDevice> _preferredDevice;
+  CGSize _drawableSize;
+
+  NSUInteger _nextDrawableId;
+
+  NSMutableSet<FlutterTexture*>* _availableTextures;
+  NSUInteger _totalTextures;
+
+  FlutterTexture* _front;
+
+  // There must be a CADisplayLink scheduled *on main thread* otherwise
+  // core animation only updates layers 60 times a second.
+  CADisplayLink* _displayLink;
+  NSUInteger _displayLinkPauseCountdown;
+
+  // Used to track whether the content was set during this display link.
+  // When unlocking phone the layer (main thread) display link and raster thread
+  // display link get out of sync for several seconds. Even worse, layer display
+  // link does not seem to reflect actual vsync. Forcing the layer link
+  // to max rate (instead range) temporarily seems to fix the issue.
+  BOOL _didSetContentsDuringThisDisplayLinkPeriod;
+
+  // Whether layer displayLink is forced to max rate.
+  BOOL _displayLinkForcedMaxRate;
+}
+
+- (void)presentTexture:(FlutterTexture*)texture;
+- (void)returnTexture:(FlutterTexture*)texture;
+
+@end
+
+@interface FlutterTexture : NSObject {
+  id<MTLTexture> _texture;
+  IOSurface* _surface;
+  CFTimeInterval _presentedTime;
+}
+
+@property(readonly, nonatomic) id<MTLTexture> texture;
+@property(readonly, nonatomic) IOSurface* surface;
+@property(readwrite, nonatomic) CFTimeInterval presentedTime;
+@property(readwrite, atomic) BOOL waitingForCompletion;
+
+@end
+
+@implementation FlutterTexture
+
+@synthesize texture = _texture;
+@synthesize surface = _surface;
+@synthesize presentedTime = _presentedTime;
+@synthesize waitingForCompletion;
+
+- (instancetype)initWithTexture:(id<MTLTexture>)texture surface:(IOSurface*)surface {
+  if (self = [super init]) {
+    _texture = texture;
+    _surface = surface;
+  }
+  return self;
+}
+
+@end
+
+@interface FlutterDrawable : NSObject <FlutterMetalDrawable> {
+  FlutterTexture* _texture;
+  __weak FlutterMetalLayer* _layer;
+  NSUInteger _drawableId;
+  BOOL _presented;
+}
+
+- (instancetype)initWithTexture:(FlutterTexture*)texture
+                          layer:(FlutterMetalLayer*)layer
+                     drawableId:(NSUInteger)drawableId;
+
+@end
+
+@implementation FlutterDrawable
+
+- (instancetype)initWithTexture:(FlutterTexture*)texture
+                          layer:(FlutterMetalLayer*)layer
+                     drawableId:(NSUInteger)drawableId {
+  if (self = [super init]) {
+    _texture = texture;
+    _layer = layer;
+    _drawableId = drawableId;
+  }
+  return self;
+}
+
+- (id<MTLTexture>)texture {
+  return self->_texture.texture;
+}
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunguarded-availability-new"
+- (CAMetalLayer*)layer {
+  return (id)self->_layer;
+}
+#pragma clang diagnostic pop
+
+- (NSUInteger)drawableID {
+  return self->_drawableId;
+}
+
+- (CFTimeInterval)presentedTime {
+  return 0;
+}
+
+- (void)present {
+  [_layer presentTexture:self->_texture];
+  self->_presented = YES;
+}
+
+- (void)dealloc {
+  if (!_presented) {
+    [_layer returnTexture:self->_texture];
+  }
+}
+
+- (void)addPresentedHandler:(nonnull MTLDrawablePresentedHandler)block {
+  FML_LOG(WARNING) << "FlutterMetalLayer drawable does not implement addPresentedHandler:";
+}
+
+- (void)presentAtTime:(CFTimeInterval)presentationTime {
+  FML_LOG(WARNING) << "FlutterMetalLayer drawable does not implement presentAtTime:";
+}
+
+- (void)presentAfterMinimumDuration:(CFTimeInterval)duration {
+  FML_LOG(WARNING) << "FlutterMetalLayer drawable does not implement presentAfterMinimumDuration:";
+}
+
+- (void)flutterPrepareForPresent:(nonnull id<MTLCommandBuffer>)commandBuffer {
+  FlutterTexture* texture = _texture;
+  texture.waitingForCompletion = YES;
+  [commandBuffer addCompletedHandler:^(id<MTLCommandBuffer> buffer) {
+    texture.waitingForCompletion = NO;
+  }];
+}
+
+@end
+
+@implementation FlutterMetalLayer
+
+@synthesize preferredDevice = _preferredDevice;
+@synthesize device = _device;
+@synthesize pixelFormat = _pixelFormat;
+@synthesize framebufferOnly = _framebufferOnly;
+@synthesize colorspace = _colorspace;
+@synthesize wantsExtendedDynamicRangeContent = _wantsExtendedDynamicRangeContent;
+
+- (instancetype)init {
+  if (self = [super init]) {
+    _preferredDevice = MTLCreateSystemDefaultDevice();
+    self.device = self.preferredDevice;
+    self.pixelFormat = MTLPixelFormatBGRA8Unorm;
+    _availableTextures = [[NSMutableSet alloc] init];
+
+    _displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(onDisplayLink:)];
+    [self setMaxRefreshRate:[DisplayLinkManager displayRefreshRate] forceMax:NO];
+    [_displayLink addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSRunLoopCommonModes];
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(didEnterBackground:)
+                                                 name:UIApplicationDidEnterBackgroundNotification
+                                               object:nil];
+  }
+  return self;
+}
+
+- (void)dealloc {
+  [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+- (void)setMaxRefreshRate:(double)refreshRate forceMax:(BOOL)forceMax {
+  // This is copied from vsync_waiter_ios.mm. The vsync waiter has display link scheduled on UI
+  // thread which does not trigger actual core animation frame. As a workaround FlutterMetalLayer
+  // has it's own displaylink scheduled on main thread, which is used to trigger core animation
+  // frame allowing for 120hz updates.
+  if (!DisplayLinkManager.maxRefreshRateEnabledOnIPhone) {
+    return;
+  }
+  double maxFrameRate = fmax(refreshRate, 60);
+  double minFrameRate = fmax(maxFrameRate / 2, 60);
+  if (@available(iOS 15.0, *)) {
+    _displayLink.preferredFrameRateRange =
+        CAFrameRateRangeMake(forceMax ? maxFrameRate : minFrameRate, maxFrameRate, maxFrameRate);
+  } else {
+    _displayLink.preferredFramesPerSecond = maxFrameRate;
+  }
+}
+
+- (void)onDisplayLink:(CADisplayLink*)link {
+  _didSetContentsDuringThisDisplayLinkPeriod = NO;
+  // Do not pause immediately, this seems to prevent 120hz while touching.
+  if (_displayLinkPauseCountdown == 3) {
+    _displayLink.paused = YES;
+    if (_displayLinkForcedMaxRate) {
+      [self setMaxRefreshRate:[DisplayLinkManager displayRefreshRate] forceMax:NO];
+      _displayLinkForcedMaxRate = NO;
+    }
+  } else {
+    ++_displayLinkPauseCountdown;
+  }
+}
+
+- (BOOL)isKindOfClass:(Class)aClass {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunguarded-availability-new"
+  // Pretend that we're a CAMetalLayer so that the rest of Flutter plays along
+  if ([aClass isEqual:[CAMetalLayer class]]) {
+    return YES;
+  }
+#pragma clang diagnostic pop
+  return [super isKindOfClass:aClass];
+}
+
+- (void)setDrawableSize:(CGSize)drawableSize {
+  [_availableTextures removeAllObjects];
+  _front = nil;
+  _totalTextures = 0;
+  _drawableSize = drawableSize;
+}
+
+- (void)didEnterBackground:(id)notification {
+  [_availableTextures removeAllObjects];
+  _totalTextures = _front != nil ? 1 : 0;
+  _displayLink.paused = YES;
+}
+
+- (CGSize)drawableSize {
+  return _drawableSize;
+}
+
+- (IOSurface*)createIOSurface {
+  unsigned pixelFormat;
+  unsigned bytesPerElement;
+  if (self.pixelFormat == MTLPixelFormatRGBA16Float) {
+    pixelFormat = kCVPixelFormatType_64RGBAHalf;
+    bytesPerElement = 8;
+  } else if (self.pixelFormat == MTLPixelFormatBGRA8Unorm) {
+    pixelFormat = kCVPixelFormatType_32BGRA;
+    bytesPerElement = 4;
+  } else {
+    FML_LOG(ERROR) << "Unsupported pixel format: " << self.pixelFormat;
+    return nil;
+  }
+  size_t bytesPerRow =
+      IOSurfaceAlignProperty(kIOSurfaceBytesPerRow, _drawableSize.width * bytesPerElement);
+  size_t totalBytes =
+      IOSurfaceAlignProperty(kIOSurfaceAllocSize, _drawableSize.height * bytesPerRow);
+  NSDictionary* options = @{
+    (id)kIOSurfaceWidth : @(_drawableSize.width),
+    (id)kIOSurfaceHeight : @(_drawableSize.height),
+    (id)kIOSurfacePixelFormat : @(pixelFormat),
+    (id)kIOSurfaceBytesPerElement : @(bytesPerElement),
+    (id)kIOSurfaceBytesPerRow : @(bytesPerRow),
+    (id)kIOSurfaceAllocSize : @(totalBytes),
+  };
+
+  IOSurfaceRef res = IOSurfaceCreate((CFDictionaryRef)options);
+  if (res == nil) {
+    FML_LOG(ERROR) << "Failed to create IOSurface with options "
+                   << options.debugDescription.UTF8String;
+    return nil;
+  }
+
+  if (self.colorspace != nil) {
+    CFStringRef name = CGColorSpaceGetName(self.colorspace);
+    IOSurfaceSetValue(res, CFSTR("IOSurfaceColorSpace"), name);
+  } else {
+    IOSurfaceSetValue(res, CFSTR("IOSurfaceColorSpace"), kCGColorSpaceSRGB);
+  }
+  return (__bridge_transfer IOSurface*)res;
+}
+
+- (FlutterTexture*)nextTexture {
+  CFTimeInterval start = CACurrentMediaTime();
+  while (true) {
+    FlutterTexture* texture = [self tryNextTexture];
+    if (texture != nil) {
+      return texture;
+    }
+    CFTimeInterval elapsed = CACurrentMediaTime() - start;
+    if (elapsed > 1.0) {
+      NSLog(@"Waited %f seconds for a drawable, giving up.", elapsed);
+      return nil;
+    }
+  }
+}
+
+- (FlutterTexture*)tryNextTexture {
+  @synchronized(self) {
+    if (_front != nil && _front.waitingForCompletion) {
+      return nil;
+    }
+    if (_totalTextures < 3) {
+      ++_totalTextures;
+      IOSurface* surface = [self createIOSurface];
+      if (surface == nil) {
+        return nil;
+      }
+      MTLTextureDescriptor* textureDescriptor =
+          [MTLTextureDescriptor texture2DDescriptorWithPixelFormat:_pixelFormat
+                                                             width:_drawableSize.width
+                                                            height:_drawableSize.height
+                                                         mipmapped:NO];
+
+      if (_framebufferOnly) {
+        textureDescriptor.usage = MTLTextureUsageRenderTarget;
+      } else {
+        textureDescriptor.usage =
+            MTLTextureUsageRenderTarget | MTLTextureUsageShaderRead | MTLTextureUsageShaderWrite;
+      }
+      id<MTLTexture> texture = [self.device newTextureWithDescriptor:textureDescriptor
+                                                           iosurface:(__bridge IOSurfaceRef)surface
+                                                               plane:0];
+      FlutterTexture* flutterTexture = [[FlutterTexture alloc] initWithTexture:texture
+                                                                       surface:surface];
+      return flutterTexture;
+    } else {
+      // Prefer surface that is not in use and has been presented the longest
+      // time ago.
+      // When isInUse is false, the surface is definitely not used by the compositor.
+      // When isInUse is true, the surface may be used by the compositor.
+      // When both surfaces are in use, the one presented earlier will be returned.
+      // The assumption here is that the compositor is already aware of the
+      // newer texture and is unlikely to read from the older one, even though it
+      // has not decreased the use count yet (there seems to be certain latency).
+      FlutterTexture* res = nil;
+      for (FlutterTexture* texture in _availableTextures) {
+        if (res == nil) {
+          res = texture;
+        } else if (res.surface.isInUse && !texture.surface.isInUse) {
+          // prefer texture that is not in use.
+          res = texture;
+        } else if (res.surface.isInUse == texture.surface.isInUse &&
+                   texture.presentedTime < res.presentedTime) {
+          // prefer texture with older presented time.
+          res = texture;
+        }
+      }
+      if (res != nil) {
+        [_availableTextures removeObject:res];
+      }
+      return res;
+    }
+  }
+}
+
+- (id<CAMetalDrawable>)nextDrawable {
+  FlutterTexture* texture = [self nextTexture];
+  if (texture == nil) {
+    return nil;
+  }
+  FlutterDrawable* drawable = [[FlutterDrawable alloc] initWithTexture:texture
+                                                                 layer:self
+                                                            drawableId:_nextDrawableId++];
+  return drawable;
+}
+
+- (void)presentOnMainThread:(FlutterTexture*)texture {
+  // This is needed otherwise frame gets skipped on touch begin / end. Go figure.
+  // Might also be placebo
+  [self setNeedsDisplay];
+
+  [CATransaction begin];
+  [CATransaction setDisableActions:YES];
+  self.contents = texture.surface;
+  [CATransaction commit];
+  _displayLink.paused = NO;
+  _displayLinkPauseCountdown = 0;
+  if (!_didSetContentsDuringThisDisplayLinkPeriod) {
+    _didSetContentsDuringThisDisplayLinkPeriod = YES;
+  } else if (!_displayLinkForcedMaxRate) {
+    _displayLinkForcedMaxRate = YES;
+    [self setMaxRefreshRate:[DisplayLinkManager displayRefreshRate] forceMax:YES];
+  }
+}
+
+- (void)presentTexture:(FlutterTexture*)texture {
+  @synchronized(self) {
+    if (_front != nil) {
+      [_availableTextures addObject:_front];
+    }
+    _front = texture;
+    texture.presentedTime = CACurrentMediaTime();
+    if ([NSThread isMainThread]) {
+      [self presentOnMainThread:texture];
+    } else {
+      // Core animation layers can only be updated on main thread.
+      dispatch_async(dispatch_get_main_queue(), ^{
+        [self presentOnMainThread:texture];
+      });
+    }
+  }
+}
+
+- (void)returnTexture:(FlutterTexture*)texture {
+  @synchronized(self) {
+    [_availableTextures addObject:texture];
+  }
+}
+
++ (BOOL)enabled {
+  static BOOL enabled = NO;
+  static BOOL didCheckInfoPlist = NO;
+  if (!didCheckInfoPlist) {
+    didCheckInfoPlist = YES;
+    NSNumber* use_flutter_metal_layer =
+        [[NSBundle mainBundle] objectForInfoDictionaryKey:@"FLTUseFlutterMetalLayer"];
+    if (use_flutter_metal_layer != nil && [use_flutter_metal_layer boolValue]) {
+      enabled = YES;
+      FML_LOG(WARNING) << "Using FlutterMetalLayer. This is an experimental feature.";
+    }
+  }
+  return enabled;
+}
+
+@end
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterMetalLayerTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterMetalLayerTest.mm
new file mode 100644
index 0000000000000000000000000000000000000000..c877c41d9d9b052bf92d4edf0f3ecd917f7b55a5
--- /dev/null
+++ b/shell/platform/darwin/ios/framework/Source/FlutterMetalLayerTest.mm
@@ -0,0 +1,273 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import <Metal/Metal.h>
+#import <OCMock/OCMock.h>
+#import <QuartzCore/QuartzCore.h>
+#import <XCTest/XCTest.h>
+
+#include "flutter/fml/logging.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterMetalLayer.h"
+
+@interface FlutterMetalLayerTest : XCTestCase
+@end
+
+@interface TestFlutterMetalLayerView : UIView
+@end
+
+@implementation TestFlutterMetalLayerView
+
++ (Class)layerClass {
+  return [FlutterMetalLayer class];
+}
+
+@end
+
+/// A fake compositor that simulates presenting layer surface by increasing
+/// and decreasing IOSurface use count.
+@interface TestCompositor : NSObject {
+  FlutterMetalLayer* _layer;
+  IOSurfaceRef _presentedSurface;
+}
+@end
+
+@implementation TestCompositor
+
+- (instancetype)initWithLayer:(FlutterMetalLayer*)layer {
+  self = [super init];
+  if (self) {
+    self->_layer = layer;
+  }
+  return self;
+}
+
+/// Increment use count of currently presented surface and decrement use count
+/// of previously presented surface.
+- (void)commitTransaction {
+  IOSurfaceRef surface = (__bridge IOSurfaceRef)self->_layer.contents;
+  if (self->_presentedSurface) {
+    IOSurfaceDecrementUseCount(self->_presentedSurface);
+  }
+  IOSurfaceIncrementUseCount(surface);
+  self->_presentedSurface = surface;
+}
+
+- (void)dealloc {
+  if (self->_presentedSurface) {
+    IOSurfaceDecrementUseCount(self->_presentedSurface);
+  }
+}
+
+@end
+
+@implementation FlutterMetalLayerTest
+
+- (FlutterMetalLayer*)addMetalLayer {
+  TestFlutterMetalLayerView* view =
+      [[TestFlutterMetalLayerView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
+  FlutterMetalLayer* layer = (FlutterMetalLayer*)view.layer;
+  layer.drawableSize = CGSizeMake(100, 100);
+  return layer;
+}
+
+- (void)removeMetalLayer:(FlutterMetalLayer*)layer {
+}
+
+// For unknown reason sometimes CI fails to create IOSurface. Bail out
+// to prevent flakiness.
+#define BAIL_IF_NO_DRAWABLE(drawable)                \
+  if (drawable == nil) {                             \
+    FML_LOG(ERROR) << "Could not allocate drawable"; \
+    return;                                          \
+  }
+
+- (void)testFlip {
+  FlutterMetalLayer* layer = [self addMetalLayer];
+  TestCompositor* compositor = [[TestCompositor alloc] initWithLayer:layer];
+
+  id<MTLTexture> t1, t2, t3;
+
+  id<CAMetalDrawable> drawable = [layer nextDrawable];
+  BAIL_IF_NO_DRAWABLE(drawable);
+  t1 = drawable.texture;
+  [drawable present];
+  [compositor commitTransaction];
+
+  drawable = [layer nextDrawable];
+  BAIL_IF_NO_DRAWABLE(drawable);
+  t2 = drawable.texture;
+  [drawable present];
+  [compositor commitTransaction];
+
+  drawable = [layer nextDrawable];
+  BAIL_IF_NO_DRAWABLE(drawable);
+  t3 = drawable.texture;
+  [drawable present];
+  [compositor commitTransaction];
+
+  // If there was no frame drop, layer should return oldest presented
+  // texture.
+
+  drawable = [layer nextDrawable];
+  XCTAssertEqual(drawable.texture, t1);
+
+  [drawable present];
+  [compositor commitTransaction];
+
+  drawable = [layer nextDrawable];
+  XCTAssertEqual(drawable.texture, t2);
+  [drawable present];
+  [compositor commitTransaction];
+
+  drawable = [layer nextDrawable];
+  XCTAssertEqual(drawable.texture, t3);
+  [drawable present];
+  [compositor commitTransaction];
+
+  drawable = [layer nextDrawable];
+  XCTAssertEqual(drawable.texture, t1);
+  [drawable present];
+
+  [self removeMetalLayer:layer];
+}
+
+- (void)testFlipWithDroppedFrame {
+  FlutterMetalLayer* layer = [self addMetalLayer];
+  TestCompositor* compositor = [[TestCompositor alloc] initWithLayer:layer];
+
+  id<MTLTexture> t1, t2, t3;
+
+  id<CAMetalDrawable> drawable = [layer nextDrawable];
+  BAIL_IF_NO_DRAWABLE(drawable);
+  t1 = drawable.texture;
+  [drawable present];
+  [compositor commitTransaction];
+  XCTAssertTrue(IOSurfaceIsInUse(t1.iosurface));
+
+  drawable = [layer nextDrawable];
+  BAIL_IF_NO_DRAWABLE(drawable);
+  t2 = drawable.texture;
+  [drawable present];
+  [compositor commitTransaction];
+
+  drawable = [layer nextDrawable];
+  BAIL_IF_NO_DRAWABLE(drawable);
+  t3 = drawable.texture;
+  [drawable present];
+  [compositor commitTransaction];
+
+  // Simulate compositor holding on to t3 for a while.
+  IOSurfaceIncrementUseCount(t3.iosurface);
+
+  // Here the drawable is presented, but immediately replaced by another drawable
+  // (before the compositor has a chance to pick it up). This should result
+  // in same drawable returned in next call to nextDrawable.
+  drawable = [layer nextDrawable];
+  XCTAssertEqual(drawable.texture, t1);
+  XCTAssertFalse(IOSurfaceIsInUse(drawable.texture.iosurface));
+  [drawable present];
+
+  drawable = [layer nextDrawable];
+  XCTAssertEqual(drawable.texture, t2);
+  [drawable present];
+  [compositor commitTransaction];
+
+  // Next drawable should be t1, since it was never picked up by compositor.
+  drawable = [layer nextDrawable];
+  XCTAssertEqual(drawable.texture, t1);
+
+  IOSurfaceDecrementUseCount(t3.iosurface);
+
+  [self removeMetalLayer:layer];
+}
+
+- (void)testDroppedDrawableReturnsTextureToPool {
+  FlutterMetalLayer* layer = [self addMetalLayer];
+  // FlutterMetalLayer will keep creating new textures until it has 3.
+  @autoreleasepool {
+    for (int i = 0; i < 3; ++i) {
+      id<CAMetalDrawable> drawable = [layer nextDrawable];
+      BAIL_IF_NO_DRAWABLE(drawable);
+    }
+  }
+  id<MTLTexture> texture;
+  {
+    @autoreleasepool {
+      id<CAMetalDrawable> drawable = [layer nextDrawable];
+      XCTAssertNotNil(drawable);
+      texture = (id<MTLTexture>)drawable.texture;
+      // Dropping the drawable must return texture to pool, so
+      // next drawable should return the same texture.
+    }
+  }
+  {
+    id<CAMetalDrawable> drawable = [layer nextDrawable];
+    XCTAssertEqual(texture, drawable.texture);
+  }
+
+  [self removeMetalLayer:layer];
+}
+
+- (void)testLayerLimitsDrawableCount {
+  FlutterMetalLayer* layer = [self addMetalLayer];
+
+  id<CAMetalDrawable> d1 = [layer nextDrawable];
+  BAIL_IF_NO_DRAWABLE(d1);
+  id<CAMetalDrawable> d2 = [layer nextDrawable];
+  BAIL_IF_NO_DRAWABLE(d2);
+  id<CAMetalDrawable> d3 = [layer nextDrawable];
+  BAIL_IF_NO_DRAWABLE(d3);
+  XCTAssertNotNil(d3);
+
+  // Layer should not return more than 3 drawables.
+  id<CAMetalDrawable> d4 = [layer nextDrawable];
+  XCTAssertNil(d4);
+
+  [d1 present];
+
+  // Still no drawable, until the front buffer returns to pool
+  id<CAMetalDrawable> d5 = [layer nextDrawable];
+  XCTAssertNil(d5);
+
+  [d2 present];
+  id<CAMetalDrawable> d6 = [layer nextDrawable];
+  XCTAssertNotNil(d6);
+
+  [self removeMetalLayer:layer];
+}
+
+- (void)testTimeout {
+  FlutterMetalLayer* layer = [self addMetalLayer];
+  TestCompositor* compositor = [[TestCompositor alloc] initWithLayer:layer];
+
+  id<CAMetalDrawable> drawable = [layer nextDrawable];
+  BAIL_IF_NO_DRAWABLE(drawable);
+
+  __block MTLCommandBufferHandler handler;
+
+  id<MTLCommandBuffer> mockCommandBuffer = OCMProtocolMock(@protocol(MTLCommandBuffer));
+  OCMStub([mockCommandBuffer addCompletedHandler:OCMOCK_ANY]).andDo(^(NSInvocation* invocation) {
+    MTLCommandBufferHandler handlerOnStack;
+    [invocation getArgument:&handlerOnStack atIndex:2];
+    // Required to copy stack block to heap.
+    handler = handlerOnStack;
+  });
+
+  [(id<FlutterMetalDrawable>)drawable flutterPrepareForPresent:mockCommandBuffer];
+  [drawable present];
+  [compositor commitTransaction];
+
+  // Drawable will not be available until the command buffer completes.
+  drawable = [layer nextDrawable];
+  XCTAssertNil(drawable);
+
+  handler(mockCommandBuffer);
+
+  drawable = [layer nextDrawable];
+  XCTAssertNotNil(drawable);
+
+  [self removeMetalLayer:layer];
+}
+
+@end
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterOverlayView.h b/shell/platform/darwin/ios/framework/Source/FlutterOverlayView.h
index e21d5635dc82eda7959f9952781b4202cbde5bef..f94a0c40288885332f6920dc93a99aa5b807e9eb 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterOverlayView.h
+++ b/shell/platform/darwin/ios/framework/Source/FlutterOverlayView.h
@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTER_OVERLAY_VIEW_H_
-#define SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTER_OVERLAY_VIEW_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTEROVERLAYVIEW_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTEROVERLAYVIEW_H_
 
+#include <Metal/Metal.h>
 #include <UIKit/UIKit.h>
 
 #include <memory>
@@ -12,6 +13,7 @@
 #include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/shell/common/shell.h"
 #import "flutter/shell/platform/darwin/ios/ios_surface.h"
+#include "fml/platform/darwin/cf_utils.h"
 
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h"
 
@@ -27,13 +29,13 @@
 /// views also handle touch propagation and the like for touches that occurs
 /// either on overlays or otherwise may be intercepted by the platform views.
 @interface FlutterOverlayView : UIView
-
 - (instancetype)initWithFrame:(CGRect)frame NS_UNAVAILABLE;
 - (instancetype)initWithCoder:(NSCoder*)aDecoder NS_UNAVAILABLE;
 
 - (instancetype)init NS_DESIGNATED_INITIALIZER;
-- (instancetype)initWithContentsScale:(CGFloat)contentsScale;
+- (instancetype)initWithContentsScale:(CGFloat)contentsScale
+                          pixelFormat:(MTLPixelFormat)pixelFormat;
 
 @end
 
-#endif  // SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTER_OVERLAY_VIEW_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTEROVERLAYVIEW_H_
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterOverlayView.mm b/shell/platform/darwin/ios/framework/Source/FlutterOverlayView.mm
index 490efaf5162a1f6a06f6912dfb69130b8eec7bef..db1d13d8d37f848fc564d9816c6d42cc7dd2fe00 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterOverlayView.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterOverlayView.mm
@@ -3,6 +3,8 @@
 // found in the LICENSE file.
 
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterOverlayView.h"
+#include <CoreGraphics/CGColorSpace.h>
+#include <Metal/Metal.h>
 
 #include "flutter/common/settings.h"
 #include "flutter/common/task_runners.h"
@@ -18,7 +20,9 @@
 
 // This is mostly a duplication of FlutterView.
 // TODO(amirh): once GL support is in evaluate if we can merge this with FlutterView.
-@implementation FlutterOverlayView
+@implementation FlutterOverlayView {
+  fml::CFRef<CGColorSpaceRef> _colorSpaceRef;
+}
 
 - (instancetype)initWithFrame:(CGRect)frame {
   NSAssert(NO, @"FlutterOverlayView must init or initWithContentsScale");
@@ -42,15 +46,24 @@
   return self;
 }
 
-- (instancetype)initWithContentsScale:(CGFloat)contentsScale {
+- (instancetype)initWithContentsScale:(CGFloat)contentsScale
+                          pixelFormat:(MTLPixelFormat)pixelFormat {
   self = [self init];
 
   if ([self.layer isKindOfClass:NSClassFromString(@"CAMetalLayer")]) {
     self.layer.allowsGroupOpacity = NO;
     self.layer.contentsScale = contentsScale;
     self.layer.rasterizationScale = contentsScale;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunguarded-availability-new"
+    CAMetalLayer* layer = (CAMetalLayer*)self.layer;
+#pragma clang diagnostic pop
+    layer.pixelFormat = pixelFormat;
+    if (pixelFormat == MTLPixelFormatRGBA16Float) {
+      self->_colorSpaceRef = fml::CFRef(CGColorSpaceCreateWithName(kCGColorSpaceExtendedSRGB));
+      layer.colorspace = self->_colorSpaceRef;
+    }
   }
-
   return self;
 }
 
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.h b/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.h
index 41dd485dc2c41d3a5a2dac97a060019f50ecc4a7..d3252d27b2ecbd3d4b56802b65eb7cce2bfd34c9 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.h
+++ b/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.h
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERPLATFORMPLUGIN_H_
-#define SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERPLATFORMPLUGIN_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERPLATFORMPLUGIN_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERPLATFORMPLUGIN_H_
 
-#include "flutter/fml/memory/weak_ptr.h"
+#include "flutter/fml/platform/darwin/weak_nsobject.h"
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h"
 #import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterEngine.h"
 
 @interface FlutterPlatformPlugin : NSObject
 - (instancetype)init NS_UNAVAILABLE;
 + (instancetype)new NS_UNAVAILABLE;
-- (instancetype)initWithEngine:(fml::WeakPtr<FlutterEngine>)engine NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithEngine:(fml::WeakNSObject<FlutterEngine>)engine NS_DESIGNATED_INITIALIZER;
 - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result;
 
 @end
@@ -26,4 +26,4 @@ extern const char* const kOverlayStyleUpdateNotificationKey;
 
 }  // namespace flutter
 
-#endif  // SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERPLATFORMPLUGIN_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERPLATFORMPLUGIN_H_
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.mm b/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.mm
index 3e81a39f2c7797cf59bbbf223959e51d34500b2c..281ab64092ea89def3c9fa0593faa77ccbf62682 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.mm
@@ -10,13 +10,20 @@
 #import <UIKit/UIKit.h>
 
 #include "flutter/fml/logging.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/UIViewController+FlutterScreenAndSceneIfLoaded.h"
 
 namespace {
 
 constexpr char kTextPlainFormat[] = "text/plain";
 const UInt32 kKeyPressClickSoundId = 1306;
 
+#if not APPLICATION_EXTENSION_API_ONLY
+const NSString* searchURLPrefix = @"x-web-search://?";
+#endif
+
 }  // namespace
 
 namespace flutter {
@@ -35,18 +42,59 @@ const char* const kOverlayStyleUpdateNotificationKey =
 
 using namespace flutter;
 
+static void SetStatusBarHiddenForSharedApplication(BOOL hidden) {
+#if not APPLICATION_EXTENSION_API_ONLY
+  [UIApplication sharedApplication].statusBarHidden = hidden;
+#else
+  FML_LOG(WARNING) << "Application based status bar styling is not available in app extension.";
+#endif
+}
+
+static void SetStatusBarStyleForSharedApplication(UIStatusBarStyle style) {
+#if not APPLICATION_EXTENSION_API_ONLY
+  // Note: -[UIApplication setStatusBarStyle] is deprecated in iOS9
+  // in favor of delegating to the view controller.
+  [[UIApplication sharedApplication] setStatusBarStyle:style];
+#else
+  FML_LOG(WARNING) << "Application based status bar styling is not available in app extension.";
+#endif
+}
+
+@interface FlutterPlatformPlugin ()
+
+/**
+ * @brief Whether the status bar appearance is based on the style preferred for this ViewController.
+ *
+ *        The default value is YES.
+ *        Explicitly add `UIViewControllerBasedStatusBarAppearance` as `false` in
+ *        info.plist makes this value to be false.
+ */
+@property(nonatomic, assign) BOOL enableViewControllerBasedStatusBarAppearance;
+
+@end
+
 @implementation FlutterPlatformPlugin {
-  fml::WeakPtr<FlutterEngine> _engine;
+  fml::WeakNSObject<FlutterEngine> _engine;
   // Used to detect whether this device has live text input ability or not.
   UITextField* _textField;
 }
 
-- (instancetype)initWithEngine:(fml::WeakPtr<FlutterEngine>)engine {
+- (instancetype)initWithEngine:(fml::WeakNSObject<FlutterEngine>)engine {
   FML_DCHECK(engine) << "engine must be set";
   self = [super init];
 
   if (self) {
     _engine = engine;
+    NSObject* infoValue = [[NSBundle mainBundle]
+        objectForInfoDictionaryKey:@"UIViewControllerBasedStatusBarAppearance"];
+#if FLUTTER_RUNTIME_MODE == FLUTTER_RUNTIME_MODE_DEBUG
+    if (infoValue != nil && ![infoValue isKindOfClass:[NSNumber class]]) {
+      FML_LOG(ERROR) << "The value of UIViewControllerBasedStatusBarAppearance in info.plist must "
+                        "be a Boolean type.";
+    }
+#endif
+    _enableViewControllerBasedStatusBarAppearance =
+        (infoValue == nil || [(NSNumber*)infoValue boolValue]);
   }
 
   return self;
@@ -92,11 +140,72 @@ using namespace flutter;
     result([self clipboardHasStrings]);
   } else if ([method isEqualToString:@"LiveText.isLiveTextInputAvailable"]) {
     result(@([self isLiveTextInputAvailable]));
+  } else if ([method isEqualToString:@"SearchWeb.invoke"]) {
+    [self searchWeb:args];
+    result(nil);
+  } else if ([method isEqualToString:@"LookUp.invoke"]) {
+    [self showLookUpViewController:args];
+    result(nil);
+  } else if ([method isEqualToString:@"Share.invoke"]) {
+    [self showShareViewController:args];
+    result(nil);
   } else {
     result(FlutterMethodNotImplemented);
   }
 }
 
+- (void)showShareViewController:(NSString*)content {
+  UIViewController* engineViewController = [_engine.get() viewController];
+
+  NSArray* itemsToShare = @[ content ?: [NSNull null] ];
+  UIActivityViewController* activityViewController =
+      [[[UIActivityViewController alloc] initWithActivityItems:itemsToShare
+                                         applicationActivities:nil] autorelease];
+
+  if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+    // On iPad, the share screen is presented in a popover view, and requires a
+    // sourceView and sourceRect
+    FlutterTextInputPlugin* _textInputPlugin = [_engine.get() textInputPlugin];
+    UITextRange* range = _textInputPlugin.textInputView.selectedTextRange;
+
+    // firstRectForRange cannot be used here as it's current implementation does
+    // not always return the full rect of the range.
+    CGRect firstRect = [(FlutterTextInputView*)_textInputPlugin.textInputView
+        caretRectForPosition:(FlutterTextPosition*)range.start];
+    CGRect transformedFirstRect = [(FlutterTextInputView*)_textInputPlugin.textInputView
+        localRectFromFrameworkTransform:firstRect];
+    CGRect lastRect = [(FlutterTextInputView*)_textInputPlugin.textInputView
+        caretRectForPosition:(FlutterTextPosition*)range.end];
+    CGRect transformedLastRect = [(FlutterTextInputView*)_textInputPlugin.textInputView
+        localRectFromFrameworkTransform:lastRect];
+
+    activityViewController.popoverPresentationController.sourceView = engineViewController.view;
+    // In case of RTL Language, get the minimum x coordinate
+    activityViewController.popoverPresentationController.sourceRect =
+        CGRectMake(fmin(transformedFirstRect.origin.x, transformedLastRect.origin.x),
+                   transformedFirstRect.origin.y,
+                   abs(transformedLastRect.origin.x - transformedFirstRect.origin.x),
+                   transformedFirstRect.size.height);
+  }
+
+  [engineViewController presentViewController:activityViewController animated:YES completion:nil];
+}
+
+- (void)searchWeb:(NSString*)searchTerm {
+#if APPLICATION_EXTENSION_API_ONLY
+  FML_LOG(WARNING) << "SearchWeb.invoke is not availabe in app extension.";
+#else
+  NSString* escapedText = [searchTerm
+      stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet
+                                                             URLHostAllowedCharacterSet]];
+  NSString* searchURL = [NSString stringWithFormat:@"%@%@", searchURLPrefix, escapedText];
+
+  [[UIApplication sharedApplication] openURL:[NSURL URLWithString:searchURL]
+                                     options:@{}
+                           completionHandler:nil];
+#endif
+}
+
 - (void)playSystemSound:(NSString*)soundType {
   if ([soundType isEqualToString:@"SystemSoundType.click"]) {
     // All feedback types are specific to Android and are treated as equal on
@@ -158,14 +267,7 @@ using namespace flutter;
 }
 
 - (void)setSystemChromeEnabledSystemUIOverlays:(NSArray*)overlays {
-  // Checks if the top status bar should be visible. This platform ignores all
-  // other overlays
-
-  // We opt out of view controller based status bar visibility since we want
-  // to be able to modify this on the fly. The key used is
-  // UIViewControllerBasedStatusBarAppearance
-  [UIApplication sharedApplication].statusBarHidden =
-      ![overlays containsObject:@"SystemUiOverlay.top"];
+  BOOL statusBarShouldBeHidden = ![overlays containsObject:@"SystemUiOverlay.top"];
   if ([overlays containsObject:@"SystemUiOverlay.bottom"]) {
     [[NSNotificationCenter defaultCenter]
         postNotificationName:FlutterViewControllerShowHomeIndicator
@@ -175,26 +277,36 @@ using namespace flutter;
         postNotificationName:FlutterViewControllerHideHomeIndicator
                       object:nil];
   }
+  if (self.enableViewControllerBasedStatusBarAppearance) {
+    [_engine.get() viewController].prefersStatusBarHidden = statusBarShouldBeHidden;
+  } else {
+    // Checks if the top status bar should be visible. This platform ignores all
+    // other overlays
+
+    // We opt out of view controller based status bar visibility since we want
+    // to be able to modify this on the fly. The key used is
+    // UIViewControllerBasedStatusBarAppearance.
+    SetStatusBarHiddenForSharedApplication(statusBarShouldBeHidden);
+  }
 }
 
 - (void)setSystemChromeEnabledSystemUIMode:(NSString*)mode {
-  // Checks if the top status bar should be visible, reflected by edge to edge setting. This
-  // platform ignores all other system ui modes.
-
-  // We opt out of view controller based status bar visibility since we want
-  // to be able to modify this on the fly. The key used is
-  // UIViewControllerBasedStatusBarAppearance
-  [UIApplication sharedApplication].statusBarHidden =
-      ![mode isEqualToString:@"SystemUiMode.edgeToEdge"];
-  if ([mode isEqualToString:@"SystemUiMode.edgeToEdge"]) {
-    [[NSNotificationCenter defaultCenter]
-        postNotificationName:FlutterViewControllerShowHomeIndicator
-                      object:nil];
+  BOOL edgeToEdge = [mode isEqualToString:@"SystemUiMode.edgeToEdge"];
+  if (self.enableViewControllerBasedStatusBarAppearance) {
+    [_engine.get() viewController].prefersStatusBarHidden = !edgeToEdge;
   } else {
-    [[NSNotificationCenter defaultCenter]
-        postNotificationName:FlutterViewControllerHideHomeIndicator
-                      object:nil];
+    // Checks if the top status bar should be visible, reflected by edge to edge setting. This
+    // platform ignores all other system ui modes.
+
+    // We opt out of view controller based status bar visibility since we want
+    // to be able to modify this on the fly. The key used is
+    // UIViewControllerBasedStatusBarAppearance.
+    SetStatusBarHiddenForSharedApplication(!edgeToEdge);
   }
+  [[NSNotificationCenter defaultCenter]
+      postNotificationName:edgeToEdge ? FlutterViewControllerShowHomeIndicator
+                                      : FlutterViewControllerHideHomeIndicator
+                    object:nil];
 }
 
 - (void)restoreSystemChromeSystemUIOverlays {
@@ -220,20 +332,14 @@ using namespace flutter;
     return;
   }
 
-  NSNumber* infoValue = [[NSBundle mainBundle]
-      objectForInfoDictionaryKey:@"UIViewControllerBasedStatusBarAppearance"];
-  Boolean delegateToViewController = (infoValue == nil || [infoValue boolValue]);
-
-  if (delegateToViewController) {
-    // This notification is respected by the iOS embedder
+  if (self.enableViewControllerBasedStatusBarAppearance) {
+    // This notification is respected by the iOS embedder.
     [[NSNotificationCenter defaultCenter]
         postNotificationName:@(kOverlayStyleUpdateNotificationName)
                       object:nil
                     userInfo:@{@(kOverlayStyleUpdateNotificationKey) : @(statusBarStyle)}];
   } else {
-    // Note: -[UIApplication setStatusBarStyle] is deprecated in iOS9
-    // in favor of delegating to the view controller
-    [[UIApplication sharedApplication] setStatusBarStyle:statusBarStyle];
+    SetStatusBarStyleForSharedApplication(statusBarStyle);
   }
 }
 
@@ -244,13 +350,23 @@ using namespace flutter;
   // It's also possible in an Add2App scenario that the FlutterViewController was presented
   // outside the context of a UINavigationController, and still wants to be popped.
 
-  UIViewController* engineViewController = [_engine.get() viewController];
+  FlutterViewController* engineViewController = [_engine.get() viewController];
   UINavigationController* navigationController = [engineViewController navigationController];
   if (navigationController) {
     [navigationController popViewControllerAnimated:isAnimated];
   } else {
-    UIViewController* rootViewController =
-        [UIApplication sharedApplication].keyWindow.rootViewController;
+    UIViewController* rootViewController = nil;
+#if APPLICATION_EXTENSION_API_ONLY
+    if (@available(iOS 15.0, *)) {
+      rootViewController =
+          [engineViewController flutterWindowSceneIfViewLoaded].keyWindow.rootViewController;
+    } else {
+      FML_LOG(WARNING)
+          << "rootViewController is not available in application extension prior to iOS 15.0.";
+    }
+#else
+    rootViewController = [UIApplication sharedApplication].keyWindow.rootViewController;
+#endif
     if (engineViewController != rootViewController) {
       [engineViewController dismissViewControllerAnimated:isAnimated completion:nil];
     }
@@ -285,6 +401,15 @@ using namespace flutter;
   return [[self textField] canPerformAction:@selector(captureTextFromCamera:) withSender:nil];
 }
 
+- (void)showLookUpViewController:(NSString*)term {
+  UIViewController* engineViewController = [_engine.get() viewController];
+  UIReferenceLibraryViewController* referenceLibraryViewController =
+      [[[UIReferenceLibraryViewController alloc] initWithTerm:term] autorelease];
+  [engineViewController presentViewController:referenceLibraryViewController
+                                     animated:YES
+                                   completion:nil];
+}
+
 - (UITextField*)textField {
   if (_textField == nil) {
     _textField = [[UITextField alloc] init];
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterPlatformPluginTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterPlatformPluginTest.mm
index 94553aaf1fe345e88e123bec95942e914a501c09..38096e9cbf32061bbf0c7f849417dcbf2a9271d9 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterPlatformPluginTest.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterPlatformPluginTest.mm
@@ -5,28 +5,212 @@
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
 
+#import "flutter/fml/platform/darwin/weak_nsobject.h"
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h"
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
 #import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.h"
 #import "flutter/shell/platform/darwin/ios/platform_view_ios.h"
 
+FLUTTER_ASSERT_ARC
+
 @interface FlutterPlatformPluginTest : XCTestCase
 @end
 
 @interface FlutterPlatformPlugin ()
 - (BOOL)isLiveTextInputAvailable;
+- (void)searchWeb:(NSString*)searchTerm;
+- (void)showLookUpViewController:(NSString*)term;
+- (void)showShareViewController:(NSString*)content;
+@end
+
+@interface UIViewController ()
+- (void)presentViewController:(UIViewController*)viewControllerToPresent
+                     animated:(BOOL)flag
+                   completion:(void (^)(void))completion;
 @end
 
 @implementation FlutterPlatformPluginTest
+- (void)testSearchWebInvokedWithEscapedTerm {
+  id mockApplication = OCMClassMock([UIApplication class]);
+  OCMStub([mockApplication sharedApplication]).andReturn(mockApplication);
+
+  FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"test" project:nil];
+  std::unique_ptr<fml::WeakNSObjectFactory<FlutterEngine>> _weakFactory =
+      std::make_unique<fml::WeakNSObjectFactory<FlutterEngine>>(engine);
+  [engine runWithEntrypoint:nil];
+
+  XCTestExpectation* invokeExpectation =
+      [self expectationWithDescription:@"Web search launched with escaped search term"];
+
+  FlutterPlatformPlugin* plugin =
+      [[FlutterPlatformPlugin alloc] initWithEngine:_weakFactory->GetWeakNSObject()];
+  FlutterPlatformPlugin* mockPlugin = OCMPartialMock(plugin);
+
+  FlutterMethodCall* methodCall = [FlutterMethodCall methodCallWithMethodName:@"SearchWeb.invoke"
+                                                                    arguments:@"Testing Word!"];
+
+  FlutterResult result = ^(id result) {
+    OCMVerify([mockPlugin searchWeb:@"Testing Word!"]);
+#if not APPLICATION_EXTENSION_API_ONLY
+    OCMVerify([mockApplication openURL:[NSURL URLWithString:@"x-web-search://?Testing%20Word!"]
+                               options:@{}
+                     completionHandler:nil]);
+#endif
+    [invokeExpectation fulfill];
+  };
+
+  [mockPlugin handleMethodCall:methodCall result:result];
+  [self waitForExpectationsWithTimeout:1 handler:nil];
+  [mockApplication stopMocking];
+}
+
+- (void)testSearchWebInvokedWithNonEscapedTerm {
+  id mockApplication = OCMClassMock([UIApplication class]);
+  OCMStub([mockApplication sharedApplication]).andReturn(mockApplication);
+
+  FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"test" project:nil];
+  std::unique_ptr<fml::WeakNSObjectFactory<FlutterEngine>> _weakFactory =
+      std::make_unique<fml::WeakNSObjectFactory<FlutterEngine>>(engine);
+  [engine runWithEntrypoint:nil];
+
+  XCTestExpectation* invokeExpectation =
+      [self expectationWithDescription:@"Web search launched with non escaped search term"];
+
+  FlutterPlatformPlugin* plugin =
+      [[FlutterPlatformPlugin alloc] initWithEngine:_weakFactory->GetWeakNSObject()];
+  FlutterPlatformPlugin* mockPlugin = OCMPartialMock(plugin);
+
+  FlutterMethodCall* methodCall = [FlutterMethodCall methodCallWithMethodName:@"SearchWeb.invoke"
+                                                                    arguments:@"Test"];
+
+  FlutterResult result = ^(id result) {
+    OCMVerify([mockPlugin searchWeb:@"Test"]);
+#if not APPLICATION_EXTENSION_API_ONLY
+    OCMVerify([mockApplication openURL:[NSURL URLWithString:@"x-web-search://?Test"]
+                               options:@{}
+                     completionHandler:nil]);
+#endif
+    [invokeExpectation fulfill];
+  };
+
+  [mockPlugin handleMethodCall:methodCall result:result];
+  [self waitForExpectationsWithTimeout:1 handler:nil];
+  [mockApplication stopMocking];
+}
+
+- (void)testLookUpCallInitiated {
+  FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"test" project:nil];
+  [engine runWithEntrypoint:nil];
+  std::unique_ptr<fml::WeakNSObjectFactory<FlutterEngine>> _weakFactory =
+      std::make_unique<fml::WeakNSObjectFactory<FlutterEngine>>(engine);
+
+  XCTestExpectation* presentExpectation =
+      [self expectationWithDescription:@"Look Up view controller presented"];
+
+  FlutterViewController* engineViewController = [[FlutterViewController alloc] initWithEngine:engine
+                                                                                      nibName:nil
+                                                                                       bundle:nil];
+  FlutterViewController* mockEngineViewController = OCMPartialMock(engineViewController);
+
+  FlutterPlatformPlugin* plugin =
+      [[FlutterPlatformPlugin alloc] initWithEngine:_weakFactory->GetWeakNSObject()];
+  FlutterPlatformPlugin* mockPlugin = OCMPartialMock(plugin);
+
+  FlutterMethodCall* methodCall = [FlutterMethodCall methodCallWithMethodName:@"LookUp.invoke"
+                                                                    arguments:@"Test"];
+  FlutterResult result = ^(id result) {
+    OCMVerify([mockEngineViewController
+        presentViewController:[OCMArg isKindOfClass:[UIReferenceLibraryViewController class]]
+                     animated:YES
+                   completion:nil]);
+    [presentExpectation fulfill];
+  };
+  [mockPlugin handleMethodCall:methodCall result:result];
+  [self waitForExpectationsWithTimeout:2 handler:nil];
+}
+
+- (void)testShareScreenInvoked {
+  FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"test" project:nil];
+  [engine runWithEntrypoint:nil];
+  std::unique_ptr<fml::WeakNSObjectFactory<FlutterEngine>> _weakFactory =
+      std::make_unique<fml::WeakNSObjectFactory<FlutterEngine>>(engine);
+
+  XCTestExpectation* presentExpectation =
+      [self expectationWithDescription:@"Share view controller presented"];
+
+  FlutterViewController* engineViewController = [[FlutterViewController alloc] initWithEngine:engine
+                                                                                      nibName:nil
+                                                                                       bundle:nil];
+  FlutterViewController* mockEngineViewController = OCMPartialMock(engineViewController);
+  OCMStub([mockEngineViewController
+      presentViewController:[OCMArg isKindOfClass:[UIActivityViewController class]]
+                   animated:YES
+                 completion:nil]);
+
+  FlutterPlatformPlugin* plugin =
+      [[FlutterPlatformPlugin alloc] initWithEngine:_weakFactory->GetWeakNSObject()];
+  FlutterPlatformPlugin* mockPlugin = OCMPartialMock(plugin);
+
+  FlutterMethodCall* methodCall = [FlutterMethodCall methodCallWithMethodName:@"Share.invoke"
+                                                                    arguments:@"Test"];
+  FlutterResult result = ^(id result) {
+    OCMVerify([mockEngineViewController
+        presentViewController:[OCMArg isKindOfClass:[UIActivityViewController class]]
+                     animated:YES
+                   completion:nil]);
+    [presentExpectation fulfill];
+  };
+  [mockPlugin handleMethodCall:methodCall result:result];
+  [self waitForExpectationsWithTimeout:1 handler:nil];
+}
+
+- (void)testShareScreenInvokedOnIPad {
+  FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"test" project:nil];
+  [engine runWithEntrypoint:nil];
+  std::unique_ptr<fml::WeakNSObjectFactory<FlutterEngine>> _weakFactory =
+      std::make_unique<fml::WeakNSObjectFactory<FlutterEngine>>(engine);
+
+  XCTestExpectation* presentExpectation =
+      [self expectationWithDescription:@"Share view controller presented on iPad"];
+
+  FlutterViewController* engineViewController = [[FlutterViewController alloc] initWithEngine:engine
+                                                                                      nibName:nil
+                                                                                       bundle:nil];
+  FlutterViewController* mockEngineViewController = OCMPartialMock(engineViewController);
+  OCMStub([mockEngineViewController
+      presentViewController:[OCMArg isKindOfClass:[UIActivityViewController class]]
+                   animated:YES
+                 completion:nil]);
+
+  id mockTraitCollection = OCMClassMock([UITraitCollection class]);
+  OCMStub([mockTraitCollection userInterfaceIdiom]).andReturn(UIUserInterfaceIdiomPad);
+
+  FlutterPlatformPlugin* plugin =
+      [[FlutterPlatformPlugin alloc] initWithEngine:_weakFactory->GetWeakNSObject()];
+  FlutterPlatformPlugin* mockPlugin = OCMPartialMock(plugin);
+
+  FlutterMethodCall* methodCall = [FlutterMethodCall methodCallWithMethodName:@"Share.invoke"
+                                                                    arguments:@"Test"];
+  FlutterResult result = ^(id result) {
+    OCMVerify([mockEngineViewController
+        presentViewController:[OCMArg isKindOfClass:[UIActivityViewController class]]
+                     animated:YES
+                   completion:nil]);
+    [presentExpectation fulfill];
+  };
+  [mockPlugin handleMethodCall:methodCall result:result];
+  [self waitForExpectationsWithTimeout:1 handler:nil];
+}
 
 - (void)testClipboardHasCorrectStrings {
   [UIPasteboard generalPasteboard].string = nil;
   FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"test" project:nil];
-  std::unique_ptr<fml::WeakPtrFactory<FlutterEngine>> _weakFactory =
-      std::make_unique<fml::WeakPtrFactory<FlutterEngine>>(engine);
+  std::unique_ptr<fml::WeakNSObjectFactory<FlutterEngine>> _weakFactory =
+      std::make_unique<fml::WeakNSObjectFactory<FlutterEngine>>(engine);
   FlutterPlatformPlugin* plugin =
-      [[FlutterPlatformPlugin alloc] initWithEngine:_weakFactory->GetWeakPtr()];
+      [[FlutterPlatformPlugin alloc] initWithEngine:_weakFactory->GetWeakNSObject()];
 
   XCTestExpectation* setStringExpectation = [self expectationWithDescription:@"setString"];
   FlutterResult resultSet = ^(id result) {
@@ -62,10 +246,10 @@
 - (void)testClipboardSetDataToNullDoNotCrash {
   [UIPasteboard generalPasteboard].string = nil;
   FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"test" project:nil];
-  std::unique_ptr<fml::WeakPtrFactory<FlutterEngine>> _weakFactory =
-      std::make_unique<fml::WeakPtrFactory<FlutterEngine>>(engine);
+  std::unique_ptr<fml::WeakNSObjectFactory<FlutterEngine>> _weakFactory =
+      std::make_unique<fml::WeakNSObjectFactory<FlutterEngine>>(engine);
   FlutterPlatformPlugin* plugin =
-      [[FlutterPlatformPlugin alloc] initWithEngine:_weakFactory->GetWeakPtr()];
+      [[FlutterPlatformPlugin alloc] initWithEngine:_weakFactory->GetWeakNSObject()];
 
   XCTestExpectation* setStringExpectation = [self expectationWithDescription:@"setData"];
   FlutterResult resultSet = ^(id result) {
@@ -96,10 +280,10 @@
       [[UINavigationController alloc] initWithRootViewController:flutterViewController];
   UITabBarController* tabBarController = [[UITabBarController alloc] init];
   tabBarController.viewControllers = @[ navigationController ];
-  std::unique_ptr<fml::WeakPtrFactory<FlutterEngine>> _weakFactory =
-      std::make_unique<fml::WeakPtrFactory<FlutterEngine>>(engine);
+  std::unique_ptr<fml::WeakNSObjectFactory<FlutterEngine>> _weakFactory =
+      std::make_unique<fml::WeakNSObjectFactory<FlutterEngine>>(engine);
   FlutterPlatformPlugin* plugin =
-      [[FlutterPlatformPlugin alloc] initWithEngine:_weakFactory->GetWeakPtr()];
+      [[FlutterPlatformPlugin alloc] initWithEngine:_weakFactory->GetWeakNSObject()];
 
   id navigationControllerMock = OCMPartialMock(navigationController);
   OCMStub([navigationControllerMock popViewControllerAnimated:YES]);
@@ -113,16 +297,18 @@
   [plugin handleMethodCall:methodCallSet result:resultSet];
   [self waitForExpectationsWithTimeout:1 handler:nil];
   OCMVerify([navigationControllerMock popViewControllerAnimated:YES]);
+
+  [flutterViewController deregisterNotifications];
 }
 
 - (void)testWhetherDeviceHasLiveTextInputInvokeCorrectly {
   FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"test" project:nil];
-  std::unique_ptr<fml::WeakPtrFactory<FlutterEngine>> _weakFactory =
-      std::make_unique<fml::WeakPtrFactory<FlutterEngine>>(engine);
+  std::unique_ptr<fml::WeakNSObjectFactory<FlutterEngine>> _weakFactory =
+      std::make_unique<fml::WeakNSObjectFactory<FlutterEngine>>(engine);
   XCTestExpectation* invokeExpectation =
       [self expectationWithDescription:@"isLiveTextInputAvailableInvoke"];
   FlutterPlatformPlugin* plugin =
-      [[FlutterPlatformPlugin alloc] initWithEngine:_weakFactory->GetWeakPtr()];
+      [[FlutterPlatformPlugin alloc] initWithEngine:_weakFactory->GetWeakNSObject()];
   FlutterPlatformPlugin* mockPlugin = OCMPartialMock(plugin);
   FlutterMethodCall* methodCall =
       [FlutterMethodCall methodCallWithMethodName:@"LiveText.isLiveTextInputAvailable"
@@ -135,4 +321,180 @@
   [self waitForExpectationsWithTimeout:1 handler:nil];
 }
 
+- (void)testViewControllerBasedStatusBarHiddenUpdate {
+  id bundleMock = OCMPartialMock([NSBundle mainBundle]);
+  OCMStub([bundleMock objectForInfoDictionaryKey:@"UIViewControllerBasedStatusBarAppearance"])
+      .andReturn(@YES);
+  {
+    // Enabling system UI overlays to update status bar.
+    FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"test" project:nil];
+    [engine runWithEntrypoint:nil];
+    FlutterViewController* flutterViewController =
+        [[FlutterViewController alloc] initWithEngine:engine nibName:nil bundle:nil];
+    std::unique_ptr<fml::WeakNSObjectFactory<FlutterEngine>> _weakFactory =
+        std::make_unique<fml::WeakNSObjectFactory<FlutterEngine>>(engine);
+    XCTAssertFalse(flutterViewController.prefersStatusBarHidden);
+
+    // Update to hidden.
+    FlutterPlatformPlugin* plugin = [engine platformPlugin];
+
+    XCTestExpectation* enableSystemUIOverlaysCalled =
+        [self expectationWithDescription:@"setEnabledSystemUIOverlays"];
+    FlutterResult resultSet = ^(id result) {
+      [enableSystemUIOverlaysCalled fulfill];
+    };
+    FlutterMethodCall* methodCallSet =
+        [FlutterMethodCall methodCallWithMethodName:@"SystemChrome.setEnabledSystemUIOverlays"
+                                          arguments:@[ @"SystemUiOverlay.bottom" ]];
+    [plugin handleMethodCall:methodCallSet result:resultSet];
+    [self waitForExpectationsWithTimeout:1 handler:nil];
+    XCTAssertTrue(flutterViewController.prefersStatusBarHidden);
+
+    // Update to shown.
+    XCTestExpectation* enableSystemUIOverlaysCalled2 =
+        [self expectationWithDescription:@"setEnabledSystemUIOverlays"];
+    FlutterResult resultSet2 = ^(id result) {
+      [enableSystemUIOverlaysCalled2 fulfill];
+    };
+    FlutterMethodCall* methodCallSet2 =
+        [FlutterMethodCall methodCallWithMethodName:@"SystemChrome.setEnabledSystemUIOverlays"
+                                          arguments:@[ @"SystemUiOverlay.top" ]];
+    [plugin handleMethodCall:methodCallSet2 result:resultSet2];
+    [self waitForExpectationsWithTimeout:1 handler:nil];
+    XCTAssertFalse(flutterViewController.prefersStatusBarHidden);
+
+    [flutterViewController deregisterNotifications];
+  }
+  {
+    // Enable system UI mode to update status bar.
+    FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"test" project:nil];
+    [engine runWithEntrypoint:nil];
+    FlutterViewController* flutterViewController =
+        [[FlutterViewController alloc] initWithEngine:engine nibName:nil bundle:nil];
+    std::unique_ptr<fml::WeakNSObjectFactory<FlutterEngine>> _weakFactory =
+        std::make_unique<fml::WeakNSObjectFactory<FlutterEngine>>(engine);
+    XCTAssertFalse(flutterViewController.prefersStatusBarHidden);
+
+    // Update to hidden.
+    FlutterPlatformPlugin* plugin = [engine platformPlugin];
+
+    XCTestExpectation* enableSystemUIModeCalled =
+        [self expectationWithDescription:@"setEnabledSystemUIMode"];
+    FlutterResult resultSet = ^(id result) {
+      [enableSystemUIModeCalled fulfill];
+    };
+    FlutterMethodCall* methodCallSet =
+        [FlutterMethodCall methodCallWithMethodName:@"SystemChrome.setEnabledSystemUIMode"
+                                          arguments:@"SystemUiMode.immersive"];
+    [plugin handleMethodCall:methodCallSet result:resultSet];
+    [self waitForExpectationsWithTimeout:1 handler:nil];
+    XCTAssertTrue(flutterViewController.prefersStatusBarHidden);
+
+    // Update to shown.
+    XCTestExpectation* enableSystemUIModeCalled2 =
+        [self expectationWithDescription:@"setEnabledSystemUIMode"];
+    FlutterResult resultSet2 = ^(id result) {
+      [enableSystemUIModeCalled2 fulfill];
+    };
+    FlutterMethodCall* methodCallSet2 =
+        [FlutterMethodCall methodCallWithMethodName:@"SystemChrome.setEnabledSystemUIMode"
+                                          arguments:@"SystemUiMode.edgeToEdge"];
+    [plugin handleMethodCall:methodCallSet2 result:resultSet2];
+    [self waitForExpectationsWithTimeout:1 handler:nil];
+    XCTAssertFalse(flutterViewController.prefersStatusBarHidden);
+
+    [flutterViewController deregisterNotifications];
+  }
+  [bundleMock stopMocking];
+}
+
+- (void)testStatusBarHiddenUpdate {
+  id bundleMock = OCMPartialMock([NSBundle mainBundle]);
+  OCMStub([bundleMock objectForInfoDictionaryKey:@"UIViewControllerBasedStatusBarAppearance"])
+      .andReturn(@NO);
+  id mockApplication = OCMClassMock([UIApplication class]);
+  OCMStub([mockApplication sharedApplication]).andReturn(mockApplication);
+
+  // Enabling system UI overlays to update status bar.
+  FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"test" project:nil];
+  [engine runWithEntrypoint:nil];
+  FlutterViewController* flutterViewController =
+      [[FlutterViewController alloc] initWithEngine:engine nibName:nil bundle:nil];
+  std::unique_ptr<fml::WeakNSObjectFactory<FlutterEngine>> _weakFactory =
+      std::make_unique<fml::WeakNSObjectFactory<FlutterEngine>>(engine);
+
+  // Update to hidden.
+  FlutterPlatformPlugin* plugin = [engine platformPlugin];
+
+  XCTestExpectation* enableSystemUIOverlaysCalled =
+      [self expectationWithDescription:@"setEnabledSystemUIOverlays"];
+  FlutterResult resultSet = ^(id result) {
+    [enableSystemUIOverlaysCalled fulfill];
+  };
+  FlutterMethodCall* methodCallSet =
+      [FlutterMethodCall methodCallWithMethodName:@"SystemChrome.setEnabledSystemUIOverlays"
+                                        arguments:@[ @"SystemUiOverlay.bottom" ]];
+  [plugin handleMethodCall:methodCallSet result:resultSet];
+  [self waitForExpectationsWithTimeout:1 handler:nil];
+#if not APPLICATION_EXTENSION_API_ONLY
+  OCMVerify([mockApplication setStatusBarHidden:YES]);
+#endif
+
+  // Update to shown.
+  XCTestExpectation* enableSystemUIOverlaysCalled2 =
+      [self expectationWithDescription:@"setEnabledSystemUIOverlays"];
+  FlutterResult resultSet2 = ^(id result) {
+    [enableSystemUIOverlaysCalled2 fulfill];
+  };
+  FlutterMethodCall* methodCallSet2 =
+      [FlutterMethodCall methodCallWithMethodName:@"SystemChrome.setEnabledSystemUIOverlays"
+                                        arguments:@[ @"SystemUiOverlay.top" ]];
+  [plugin handleMethodCall:methodCallSet2 result:resultSet2];
+  [self waitForExpectationsWithTimeout:1 handler:nil];
+#if not APPLICATION_EXTENSION_API_ONLY
+  OCMVerify([mockApplication setStatusBarHidden:NO]);
+#endif
+
+  [flutterViewController deregisterNotifications];
+  [mockApplication stopMocking];
+  [bundleMock stopMocking];
+}
+
+- (void)testStatusBarStyle {
+  id bundleMock = OCMPartialMock([NSBundle mainBundle]);
+  OCMStub([bundleMock objectForInfoDictionaryKey:@"UIViewControllerBasedStatusBarAppearance"])
+      .andReturn(@NO);
+  id mockApplication = OCMClassMock([UIApplication class]);
+  OCMStub([mockApplication sharedApplication]).andReturn(mockApplication);
+
+  FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"test" project:nil];
+  [engine runWithEntrypoint:nil];
+  FlutterViewController* flutterViewController =
+      [[FlutterViewController alloc] initWithEngine:engine nibName:nil bundle:nil];
+  std::unique_ptr<fml::WeakNSObjectFactory<FlutterEngine>> _weakFactory =
+      std::make_unique<fml::WeakNSObjectFactory<FlutterEngine>>(engine);
+  XCTAssertFalse(flutterViewController.prefersStatusBarHidden);
+
+  FlutterPlatformPlugin* plugin = [engine platformPlugin];
+
+  XCTestExpectation* enableSystemUIModeCalled =
+      [self expectationWithDescription:@"setSystemUIOverlayStyle"];
+  FlutterResult resultSet = ^(id result) {
+    [enableSystemUIModeCalled fulfill];
+  };
+  FlutterMethodCall* methodCallSet =
+      [FlutterMethodCall methodCallWithMethodName:@"SystemChrome.setSystemUIOverlayStyle"
+                                        arguments:@{@"statusBarBrightness" : @"Brightness.dark"}];
+  [plugin handleMethodCall:methodCallSet result:resultSet];
+  [self waitForExpectationsWithTimeout:1 handler:nil];
+
+#if not APPLICATION_EXTENSION_API_ONLY
+  OCMVerify([mockApplication setStatusBarStyle:UIStatusBarStyleLightContent]);
+#endif
+
+  [flutterViewController deregisterNotifications];
+  [mockApplication stopMocking];
+  [bundleMock stopMocking];
+}
+
 @end
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm
index 69a96feeec1421c93f519aab3dd49bd569897e42..6d605414e5b4f32a5423e8d6751a4ace53b9f028 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <Metal/Metal.h>
 #import <UIKit/UIGestureRecognizerSubclass.h>
 
 #include <list>
@@ -10,11 +11,11 @@
 #include <string>
 
 #include "flutter/common/graphics/persistent_cache.h"
-#include "flutter/flow/rtree.h"
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterOverlayView.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterView.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h"
 #import "flutter/shell/platform/darwin/ios/ios_surface.h"
 
@@ -86,13 +87,15 @@ BOOL canApplyBlurBackdrop = YES;
 
 std::shared_ptr<FlutterPlatformViewLayer> FlutterPlatformViewLayerPool::GetLayer(
     GrDirectContext* gr_context,
-    const std::shared_ptr<IOSContext>& ios_context) {
+    const std::shared_ptr<IOSContext>& ios_context,
+    MTLPixelFormat pixel_format) {
   if (available_layer_index_ >= layers_.size()) {
     std::shared_ptr<FlutterPlatformViewLayer> layer;
-    fml::scoped_nsobject<FlutterOverlayView> overlay_view;
-    fml::scoped_nsobject<FlutterOverlayView> overlay_view_wrapper;
+    fml::scoped_nsobject<UIView> overlay_view;
+    fml::scoped_nsobject<UIView> overlay_view_wrapper;
 
-    if (!gr_context) {
+    bool impeller_enabled = !!ios_context->GetImpellerContext();
+    if (!gr_context && !impeller_enabled) {
       overlay_view.reset([[FlutterOverlayView alloc] init]);
       overlay_view_wrapper.reset([[FlutterOverlayView alloc] init]);
 
@@ -105,8 +108,10 @@ std::shared_ptr<FlutterPlatformViewLayer> FlutterPlatformViewLayerPool::GetLayer
           std::move(surface));
     } else {
       CGFloat screenScale = [UIScreen mainScreen].scale;
-      overlay_view.reset([[FlutterOverlayView alloc] initWithContentsScale:screenScale]);
-      overlay_view_wrapper.reset([[FlutterOverlayView alloc] initWithContentsScale:screenScale]);
+      overlay_view.reset([[FlutterOverlayView alloc] initWithContentsScale:screenScale
+                                                               pixelFormat:pixel_format]);
+      overlay_view_wrapper.reset([[FlutterOverlayView alloc] initWithContentsScale:screenScale
+                                                                       pixelFormat:pixel_format]);
 
       auto ca_layer = fml::scoped_nsobject<CALayer>{[[overlay_view.get() layer] retain]};
       std::unique_ptr<IOSSurface> ios_surface = IOSSurface::Create(ios_context, ca_layer);
@@ -174,7 +179,7 @@ UIViewController* FlutterPlatformViewsController::getFlutterViewController() {
   return flutter_view_controller_.get();
 }
 
-void FlutterPlatformViewsController::OnMethodCall(FlutterMethodCall* call, FlutterResult& result) {
+void FlutterPlatformViewsController::OnMethodCall(FlutterMethodCall* call, FlutterResult result) {
   if ([[call method] isEqualToString:@"create"]) {
     OnCreate(call, result);
   } else if ([[call method] isEqualToString:@"dispose"]) {
@@ -188,17 +193,17 @@ void FlutterPlatformViewsController::OnMethodCall(FlutterMethodCall* call, Flutt
   }
 }
 
-void FlutterPlatformViewsController::OnCreate(FlutterMethodCall* call, FlutterResult& result) {
+void FlutterPlatformViewsController::OnCreate(FlutterMethodCall* call, FlutterResult result) {
   NSDictionary<NSString*, id>* args = [call arguments];
 
-  long viewId = [args[@"id"] longValue];
+  int64_t viewId = [args[@"id"] longLongValue];
   NSString* viewTypeString = args[@"viewType"];
   std::string viewType(viewTypeString.UTF8String);
 
   if (views_.count(viewId) != 0) {
     result([FlutterError errorWithCode:@"recreating_view"
                                message:@"trying to create an already created view"
-                               details:[NSString stringWithFormat:@"view id: '%ld'", viewId]]);
+                               details:[NSString stringWithFormat:@"view id: '%lld'", viewId]]);
   }
 
   NSObject<FlutterPlatformViewFactory>* factory = factories_[viewType].get();
@@ -232,13 +237,14 @@ void FlutterPlatformViewsController::OnCreate(FlutterMethodCall* call, FlutterRe
                                                                 arguments:params];
   UIView* platform_view = [embedded_view view];
   // Set a unique view identifier, so the platform view can be identified in unit tests.
-  platform_view.accessibilityIdentifier = [NSString stringWithFormat:@"platform_view[%ld]", viewId];
+  platform_view.accessibilityIdentifier =
+      [NSString stringWithFormat:@"platform_view[%lld]", viewId];
   views_[viewId] = fml::scoped_nsobject<NSObject<FlutterPlatformView>>([embedded_view retain]);
 
   FlutterTouchInterceptingView* touch_interceptor = [[[FlutterTouchInterceptingView alloc]
                   initWithEmbeddedView:platform_view
                platformViewsController:GetWeakPtr()
-      gestureRecognizersBlockingPolicy:gesture_recognizers_blocking_policies[viewType]]
+      gestureRecognizersBlockingPolicy:gesture_recognizers_blocking_policies_[viewType]]
       autorelease];
 
   touch_interceptors_[viewId] =
@@ -252,7 +258,7 @@ void FlutterPlatformViewsController::OnCreate(FlutterMethodCall* call, FlutterRe
   result(nil);
 }
 
-void FlutterPlatformViewsController::OnDispose(FlutterMethodCall* call, FlutterResult& result) {
+void FlutterPlatformViewsController::OnDispose(FlutterMethodCall* call, FlutterResult result) {
   NSNumber* arg = [call arguments];
   int64_t viewId = [arg longLongValue];
 
@@ -268,7 +274,7 @@ void FlutterPlatformViewsController::OnDispose(FlutterMethodCall* call, FlutterR
 }
 
 void FlutterPlatformViewsController::OnAcceptGesture(FlutterMethodCall* call,
-                                                     FlutterResult& result) {
+                                                     FlutterResult result) {
   NSDictionary<NSString*, id>* args = [call arguments];
   int64_t viewId = [args[@"id"] longLongValue];
 
@@ -286,7 +292,7 @@ void FlutterPlatformViewsController::OnAcceptGesture(FlutterMethodCall* call,
 }
 
 void FlutterPlatformViewsController::OnRejectGesture(FlutterMethodCall* call,
-                                                     FlutterResult& result) {
+                                                     FlutterResult result) {
   NSDictionary<NSString*, id>* args = [call arguments];
   int64_t viewId = [args[@"id"] longLongValue];
 
@@ -311,7 +317,7 @@ void FlutterPlatformViewsController::RegisterViewFactory(
   FML_CHECK(factories_.count(idString) == 0);
   factories_[idString] =
       fml::scoped_nsobject<NSObject<FlutterPlatformViewFactory>>([factory retain]);
-  gesture_recognizers_blocking_policies[idString] = gestureRecognizerBlockingPolicy;
+  gesture_recognizers_blocking_policies_[idString] = gestureRecognizerBlockingPolicy;
 }
 
 void FlutterPlatformViewsController::BeginFrame(SkISize frame_size) {
@@ -379,7 +385,7 @@ void FlutterPlatformViewsController::PushFilterToVisitedPlatformViews(
 }
 
 void FlutterPlatformViewsController::PrerollCompositeEmbeddedView(
-    int view_id,
+    int64_t view_id,
     std::unique_ptr<EmbeddedViewParams> params) {
   // All the CATransactions should be committed by the end of the last frame,
   // so catransaction_added_ must be false.
@@ -387,11 +393,7 @@ void FlutterPlatformViewsController::PrerollCompositeEmbeddedView(
 
   SkRect view_bounds = SkRect::Make(frame_size_);
   std::unique_ptr<EmbedderViewSlice> view;
-  if (params->display_list_enabled()) {
-    view = std::make_unique<DisplayListEmbedderViewSlice>(view_bounds);
-  } else {
-    view = std::make_unique<SkPictureEmbedderViewSlice>(view_bounds);
-  }
+  view = std::make_unique<DisplayListEmbedderViewSlice>(view_bounds);
   slices_.insert_or_assign(view_id, std::move(view));
 
   composition_order_.push_back(view_id);
@@ -405,11 +407,20 @@ void FlutterPlatformViewsController::PrerollCompositeEmbeddedView(
   views_to_recomposite_.insert(view_id);
 }
 
-UIView* FlutterPlatformViewsController::GetPlatformViewByID(int view_id) {
+size_t FlutterPlatformViewsController::EmbeddedViewCount() {
+  return composition_order_.size();
+}
+
+UIView* FlutterPlatformViewsController::GetPlatformViewByID(int64_t view_id) {
+  return [GetFlutterTouchInterceptingViewByID(view_id) embeddedView];
+}
+
+FlutterTouchInterceptingView* FlutterPlatformViewsController::GetFlutterTouchInterceptingViewByID(
+    int64_t view_id) {
   if (views_.empty()) {
     return nil;
   }
-  return [touch_interceptors_[view_id].get() embeddedView];
+  return touch_interceptors_[view_id].get();
 }
 
 long FlutterPlatformViewsController::FindFirstResponderPlatformViewId() {
@@ -421,24 +432,6 @@ long FlutterPlatformViewsController::FindFirstResponderPlatformViewId() {
   return -1;
 }
 
-std::vector<SkCanvas*> FlutterPlatformViewsController::GetCurrentCanvases() {
-  std::vector<SkCanvas*> canvases;
-  for (size_t i = 0; i < composition_order_.size(); i++) {
-    int64_t view_id = composition_order_[i];
-    canvases.push_back(slices_[view_id]->canvas());
-  }
-  return canvases;
-}
-
-std::vector<DisplayListBuilder*> FlutterPlatformViewsController::GetCurrentBuilders() {
-  std::vector<DisplayListBuilder*> builders;
-  for (size_t i = 0; i < composition_order_.size(); i++) {
-    int64_t view_id = composition_order_[i];
-    builders.push_back(slices_[view_id]->builder());
-  }
-  return builders;
-}
-
 int FlutterPlatformViewsController::CountClips(const MutatorsStack& mutators_stack) {
   std::vector<std::shared_ptr<Mutator>>::const_reverse_iterator iter = mutators_stack.Bottom();
   int clipCount = 0;
@@ -451,6 +444,19 @@ int FlutterPlatformViewsController::CountClips(const MutatorsStack& mutators_sta
   return clipCount;
 }
 
+void FlutterPlatformViewsController::ClipViewSetMaskView(UIView* clipView) {
+  if (clipView.maskView) {
+    return;
+  }
+  UIView* flutterView = flutter_view_.get();
+  CGRect frame =
+      CGRectMake(-clipView.frame.origin.x, -clipView.frame.origin.y,
+                 CGRectGetWidth(flutterView.bounds), CGRectGetHeight(flutterView.bounds));
+  clipView.maskView = [mask_view_pool_.get() getMaskViewWithFrame:frame];
+}
+
+// This method is only called when the `embedded_view` needs to be re-composited at the current
+// frame. See: `CompositeWithParams` for details.
 void FlutterPlatformViewsController::ApplyMutators(const MutatorsStack& mutators_stack,
                                                    UIView* embedded_view,
                                                    const SkRect& bounding_rect) {
@@ -461,19 +467,15 @@ void FlutterPlatformViewsController::ApplyMutators(const MutatorsStack& mutators
   ResetAnchor(embedded_view.layer);
   ChildClippingView* clipView = (ChildClippingView*)embedded_view.superview;
 
-  CGFloat screenScale = [UIScreen mainScreen].scale;
-
-  UIView* flutter_view = flutter_view_.get();
-  FlutterClippingMaskView* maskView = [[[FlutterClippingMaskView alloc]
-      initWithFrame:CGRectMake(-clipView.frame.origin.x, -clipView.frame.origin.y,
-                               CGRectGetWidth(flutter_view.bounds),
-                               CGRectGetHeight(flutter_view.bounds))
-        screenScale:screenScale] autorelease];
-
   SkMatrix transformMatrix;
   NSMutableArray* blurFilters = [[[NSMutableArray alloc] init] autorelease];
-
-  clipView.maskView = nil;
+  FML_DCHECK(!clipView.maskView ||
+             [clipView.maskView isKindOfClass:[FlutterClippingMaskView class]]);
+  if (clipView.maskView) {
+    [mask_view_pool_.get() insertViewToPoolIfNeeded:(FlutterClippingMaskView*)(clipView.maskView)];
+    clipView.maskView = nil;
+  }
+  CGFloat screenScale = [UIScreen mainScreen].scale;
   auto iter = mutators_stack.Begin();
   while (iter != mutators_stack.End()) {
     switch ((*iter)->GetType()) {
@@ -486,8 +488,9 @@ void FlutterPlatformViewsController::ApplyMutators(const MutatorsStack& mutators
                                                      transformMatrix)) {
           break;
         }
-        [maskView clipRect:(*iter)->GetRect() matrix:transformMatrix];
-        clipView.maskView = maskView;
+        ClipViewSetMaskView(clipView);
+        [(FlutterClippingMaskView*)clipView.maskView clipRect:(*iter)->GetRect()
+                                                       matrix:transformMatrix];
         break;
       }
       case kClipRRect: {
@@ -495,16 +498,18 @@ void FlutterPlatformViewsController::ApplyMutators(const MutatorsStack& mutators
                                                       transformMatrix)) {
           break;
         }
-        [maskView clipRRect:(*iter)->GetRRect() matrix:transformMatrix];
-        clipView.maskView = maskView;
+        ClipViewSetMaskView(clipView);
+        [(FlutterClippingMaskView*)clipView.maskView clipRRect:(*iter)->GetRRect()
+                                                        matrix:transformMatrix];
         break;
       }
       case kClipPath: {
         // TODO(cyanglaz): Find a way to pre-determine if path contains the PlatformView boudning
         // rect. See `ClipRRectContainsPlatformViewBoundingRect`.
         // https://github.com/flutter/flutter/issues/118650
-        [maskView clipPath:(*iter)->GetPath() matrix:transformMatrix];
-        clipView.maskView = maskView;
+        ClipViewSetMaskView(clipView);
+        [(FlutterClippingMaskView*)clipView.maskView clipPath:(*iter)->GetPath()
+                                                       matrix:transformMatrix];
         break;
       }
       case kOpacity:
@@ -517,6 +522,9 @@ void FlutterPlatformViewsController::ApplyMutators(const MutatorsStack& mutators
         }
         CGRect filterRect =
             flutter::GetCGRectFromSkRect((*iter)->GetFilterMutation().GetFilterRect());
+        // `filterRect` is in global coordinates. We need to convert to local space.
+        filterRect = CGRectApplyAffineTransform(
+            filterRect, CGAffineTransformMakeScale(1 / screenScale, 1 / screenScale));
         // `filterRect` reprents the rect that should be filtered inside the `flutter_view_`.
         // The `PlatformViewFilter` needs the frame inside the `clipView` that needs to be
         // filtered.
@@ -570,7 +578,15 @@ void FlutterPlatformViewsController::ApplyMutators(const MutatorsStack& mutators
   embedded_view.layer.transform = flutter::GetCATransform3DFromSkMatrix(transformMatrix);
 }
 
-void FlutterPlatformViewsController::CompositeWithParams(int view_id,
+// Composite the PlatformView with `view_id`.
+//
+// Every frame, during the paint traversal of the layer tree, this method is called for all
+// the PlatformViews in `views_to_recomposite_`.
+//
+// Note that `views_to_recomposite_` does not represent all the views in the view hierarchy,
+// if a PlatformView does not change its composition parameter from last frame, it is not
+// included in the `views_to_recomposite_`.
+void FlutterPlatformViewsController::CompositeWithParams(int64_t view_id,
                                                          const EmbeddedViewParams& params) {
   CGRect frame = CGRectMake(0, 0, params.sizePoints().width(), params.sizePoints().height());
   FlutterTouchInterceptingView* touchInterceptor = touch_interceptors_[view_id].get();
@@ -609,21 +625,21 @@ void FlutterPlatformViewsController::CompositeWithParams(int view_id,
   ApplyMutators(mutatorStack, touchInterceptor, rect);
 }
 
-EmbedderPaintContext FlutterPlatformViewsController::CompositeEmbeddedView(int view_id) {
+DlCanvas* FlutterPlatformViewsController::CompositeEmbeddedView(int64_t view_id) {
   // Any UIKit related code has to run on main thread.
   FML_DCHECK([[NSThread currentThread] isMainThread]);
   // Do nothing if the view doesn't need to be composited.
   if (views_to_recomposite_.count(view_id) == 0) {
-    return {slices_[view_id]->canvas(), slices_[view_id]->builder()};
+    return slices_[view_id]->canvas();
   }
   CompositeWithParams(view_id, current_composition_params_[view_id]);
   views_to_recomposite_.erase(view_id);
-  return {slices_[view_id]->canvas(), slices_[view_id]->builder()};
+  return slices_[view_id]->canvas();
 }
 
 void FlutterPlatformViewsController::Reset() {
-  UIView* flutter_view = flutter_view_.get();
-  for (UIView* sub_view in [flutter_view subviews]) {
+  for (int64_t view_id : active_composition_order_) {
+    UIView* sub_view = root_views_[view_id].get();
     [sub_view removeFromSuperview];
   }
   root_views_.clear();
@@ -639,7 +655,7 @@ void FlutterPlatformViewsController::Reset() {
   visited_platform_views_.clear();
 }
 
-SkRect FlutterPlatformViewsController::GetPlatformViewRect(int view_id) {
+SkRect FlutterPlatformViewsController::GetPlatformViewRect(int64_t view_id) {
   UIView* platform_view = GetPlatformViewByID(view_id);
   UIScreen* screen = [UIScreen mainScreen];
   CGRect platform_view_cgrect = [platform_view convertRect:platform_view.bounds
@@ -664,15 +680,14 @@ bool FlutterPlatformViewsController::SubmitFrame(GrDirectContext* gr_context,
 
   DisposeViews();
 
-  SkCanvas* background_canvas = frame->SkiaCanvas();
-  DisplayListBuilder* background_builder = frame->GetDisplayListBuilder().get();
+  DlCanvas* background_canvas = frame->Canvas();
 
   // Resolve all pending GPU operations before allocating a new surface.
-  background_canvas->flush();
+  background_canvas->Flush();
 
   // Clipping the background canvas before drawing the picture recorders requires
   // saving and restoring the clip context.
-  SkAutoCanvasRestore save(background_canvas, /*doSave=*/true);
+  DlAutoCanvasRestore save(background_canvas, /*do_save=*/true);
 
   // Maps a platform view id to a vector of `FlutterPlatformViewLayer`.
   LayersMap platform_view_layers;
@@ -680,6 +695,8 @@ bool FlutterPlatformViewsController::SubmitFrame(GrDirectContext* gr_context,
   auto did_submit = true;
   auto num_platform_views = composition_order_.size();
 
+  // TODO(hellohuanlin) this double for-loop is expensive with wasted computations.
+  // See: https://github.com/flutter/flutter/issues/145802
   for (size_t i = 0; i < num_platform_views; i++) {
     int64_t platform_view_id = composition_order_[i];
     EmbedderViewSlice* slice = slices_[platform_view_id].get();
@@ -690,8 +707,28 @@ bool FlutterPlatformViewsController::SubmitFrame(GrDirectContext* gr_context,
     for (size_t j = i + 1; j > 0; j--) {
       int64_t current_platform_view_id = composition_order_[j - 1];
       SkRect platform_view_rect = GetPlatformViewRect(current_platform_view_id);
-      std::list<SkRect> intersection_rects =
-          slice->searchNonOverlappingDrawnRects(platform_view_rect);
+      std::vector<SkIRect> intersection_rects = slice->region(platform_view_rect).getRects();
+      const SkIRect rounded_in_platform_view_rect = platform_view_rect.roundIn();
+      // Ignore intersections of single width/height on the edge of the platform view.
+      // This is to address the following performance issue when interleaving adjacent
+      // platform views and layers:
+      // Since we `roundOut` both platform view rects and the layer rects, as long as
+      // the coordinate is fractional, there will be an intersection of a single pixel width
+      // (or height) after rounding out, even if they do not intersect before rounding out.
+      // We have to round out both platform view rect and the layer rect.
+      // Rounding in platform view rect will result in missing pixel on the intersection edge.
+      // Rounding in layer rect will result in missing pixel on the edge of the layer on top
+      // of the platform view.
+      for (auto it = intersection_rects.begin(); it != intersection_rects.end(); /*no-op*/) {
+        // If intersection_rect does not intersect with the *rounded in* platform
+        // view rect, then the intersection must be a single pixel width (or height) on edge.
+        if (!SkIRect::Intersects(*it, rounded_in_platform_view_rect)) {
+          it = intersection_rects.erase(it);
+        } else {
+          ++it;
+        }
+      }
+
       auto allocation_size = intersection_rects.size();
 
       // For testing purposes, the overlay id is used to find the overlay view.
@@ -704,8 +741,8 @@ bool FlutterPlatformViewsController::SubmitFrame(GrDirectContext* gr_context,
       // TODO(egarciad): Consider making this configurable.
       // https://github.com/flutter/flutter/issues/52510
       if (allocation_size > kMaxLayerAllocations) {
-        SkRect joined_rect;
-        for (const SkRect& rect : intersection_rects) {
+        SkIRect joined_rect = SkIRect::MakeEmpty();
+        for (const SkIRect& rect : intersection_rects) {
           joined_rect.join(rect);
         }
         // Replace the rects in the intersection rects list for a single rect that is
@@ -713,40 +750,33 @@ bool FlutterPlatformViewsController::SubmitFrame(GrDirectContext* gr_context,
         intersection_rects.clear();
         intersection_rects.push_back(joined_rect);
       }
-      for (SkRect& joined_rect : intersection_rects) {
+      for (SkIRect& joined_rect : intersection_rects) {
         // Get the intersection rect between the current rect
         // and the platform view rect.
-        joined_rect.intersect(platform_view_rect);
-        // Subpixels in the platform may not align with the canvas subpixels.
-        // To workaround it, round the floating point bounds and make the rect slightly larger.
-        // For example, {0.3, 0.5, 3.1, 4.7} becomes {0, 0, 4, 5}.
-        joined_rect.setLTRB(std::floor(joined_rect.left()), std::floor(joined_rect.top()),
-                            std::ceil(joined_rect.right()), std::ceil(joined_rect.bottom()));
+        joined_rect.intersect(platform_view_rect.roundOut());
         // Clip the background canvas, so it doesn't contain any of the pixels drawn
         // on the overlay layer.
-        background_canvas->clipRect(joined_rect, SkClipOp::kDifference);
+        background_canvas->ClipRect(SkRect::Make(joined_rect), DlCanvas::ClipOp::kDifference);
         // Get a new host layer.
-        std::shared_ptr<FlutterPlatformViewLayer> layer = GetLayer(gr_context,                //
-                                                                   ios_context,               //
-                                                                   slice,                     //
-                                                                   joined_rect,               //
-                                                                   current_platform_view_id,  //
-                                                                   overlay_id                 //
-        );
+        std::shared_ptr<FlutterPlatformViewLayer> layer =
+            GetLayer(gr_context,                                      //
+                     ios_context,                                     //
+                     slice,                                           //
+                     joined_rect,                                     //
+                     current_platform_view_id,                        //
+                     overlay_id,                                      //
+                     ((FlutterView*)flutter_view_.get()).pixelFormat  //
+            );
         did_submit &= layer->did_submit_last_frame;
         platform_view_layers[current_platform_view_id].push_back(layer);
         overlay_id++;
       }
     }
-    if (background_builder) {
-      slice->render_into(background_builder);
-    } else {
-      slice->render_into(background_canvas);
-    }
+    slice->render_into(background_canvas);
   }
 
   // Manually trigger the SkAutoCanvasRestore before we submit the frame
-  save.restore();
+  save.Restore();
 
   // If a layer was allocated in the previous frame, but it's not used in the current frame,
   // then it can be removed from the scene.
@@ -768,43 +798,49 @@ bool FlutterPlatformViewsController::SubmitFrame(GrDirectContext* gr_context,
 void FlutterPlatformViewsController::BringLayersIntoView(LayersMap layer_map) {
   FML_DCHECK(flutter_view_);
   UIView* flutter_view = flutter_view_.get();
-  auto zIndex = 0;
   // Clear the `active_composition_order_`, which will be populated down below.
   active_composition_order_.clear();
+  NSMutableArray* desired_platform_subviews = [NSMutableArray array];
   for (size_t i = 0; i < composition_order_.size(); i++) {
     int64_t platform_view_id = composition_order_[i];
     std::vector<std::shared_ptr<FlutterPlatformViewLayer>> layers = layer_map[platform_view_id];
     UIView* platform_view_root = root_views_[platform_view_id].get();
-
-    if (platform_view_root.superview != flutter_view) {
-      [flutter_view addSubview:platform_view_root];
-    }
-    // Make sure the platform_view_root is higher than the last platform_view_root in
-    // composition_order_.
-    platform_view_root.layer.zPosition = zIndex++;
-
+    [desired_platform_subviews addObject:platform_view_root];
     for (const std::shared_ptr<FlutterPlatformViewLayer>& layer : layers) {
-      if ([layer->overlay_view_wrapper.get() superview] != flutter_view) {
-        [flutter_view addSubview:layer->overlay_view_wrapper];
-      }
-      // Make sure all the overlays are higher than the platform view.
-      layer->overlay_view_wrapper.get().layer.zPosition = zIndex++;
-      FML_DCHECK(layer->overlay_view_wrapper.get().layer.zPosition >
-                 platform_view_root.layer.zPosition);
+      [desired_platform_subviews addObject:layer->overlay_view_wrapper];
     }
     active_composition_order_.push_back(platform_view_id);
   }
+
+  NSSet* desired_platform_subviews_set = [NSSet setWithArray:desired_platform_subviews];
+  NSArray* existing_platform_subviews = [flutter_view.subviews
+      filteredArrayUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(id object,
+                                                                        NSDictionary* bindings) {
+        return [desired_platform_subviews_set containsObject:object];
+      }]];
+  // Manipulate view hierarchy only if needed, to address a performance issue where
+  // `BringLayersIntoView` is called even when view hierarchy stays the same.
+  // See: https://github.com/flutter/flutter/issues/121833
+  // TODO(hellohuanlin): investigate if it is possible to skip unnecessary BringLayersIntoView.
+  if (![desired_platform_subviews isEqualToArray:existing_platform_subviews]) {
+    for (UIView* subview in desired_platform_subviews) {
+      // `addSubview` will automatically reorder subview if it is already added.
+      [flutter_view addSubview:subview];
+    }
+  }
 }
 
 std::shared_ptr<FlutterPlatformViewLayer> FlutterPlatformViewsController::GetLayer(
     GrDirectContext* gr_context,
     const std::shared_ptr<IOSContext>& ios_context,
     EmbedderViewSlice* slice,
-    SkRect rect,
+    SkIRect rect,
     int64_t view_id,
-    int64_t overlay_id) {
+    int64_t overlay_id,
+    MTLPixelFormat pixel_format) {
   FML_DCHECK(flutter_view_);
-  std::shared_ptr<FlutterPlatformViewLayer> layer = layer_pool_->GetLayer(gr_context, ios_context);
+  std::shared_ptr<FlutterPlatformViewLayer> layer =
+      layer_pool_->GetLayer(gr_context, ios_context, pixel_format);
 
   UIView* overlay_view_wrapper = layer->overlay_view_wrapper.get();
   auto screenScale = [UIScreen mainScreen].scale;
@@ -830,14 +866,13 @@ std::shared_ptr<FlutterPlatformViewLayer> FlutterPlatformViewsController::GetLay
   if (!frame) {
     return layer;
   }
-  SkCanvas* overlay_canvas = frame->SkiaCanvas();
-  overlay_canvas->clipRect(rect);
-  overlay_canvas->clear(SK_ColorTRANSPARENT);
-  if (frame->GetDisplayListBuilder()) {
-    slice->render_into(frame->GetDisplayListBuilder().get());
-  } else {
-    slice->render_into(overlay_canvas);
-  }
+  DlCanvas* overlay_canvas = frame->Canvas();
+  int restore_count = overlay_canvas->GetSaveCount();
+  overlay_canvas->Save();
+  overlay_canvas->ClipRect(SkRect::Make(rect));
+  overlay_canvas->Clear(DlColor::kTransparent());
+  slice->render_into(overlay_canvas);
+  overlay_canvas->RestoreToCount(restore_count);
 
   layer->did_submit_last_frame = frame->Submit();
   return layer;
@@ -869,7 +904,14 @@ void FlutterPlatformViewsController::DisposeViews() {
 
   FML_DCHECK([[NSThread currentThread] isMainThread]);
 
+  std::unordered_set<int64_t> views_to_composite(composition_order_.begin(),
+                                                 composition_order_.end());
+  std::unordered_set<int64_t> views_to_delay_dispose;
   for (int64_t viewId : views_to_dispose_) {
+    if (views_to_composite.count(viewId)) {
+      views_to_delay_dispose.insert(viewId);
+      continue;
+    }
     UIView* root_view = root_views_[viewId].get();
     [root_view removeFromSuperview];
     views_.erase(viewId);
@@ -879,7 +921,8 @@ void FlutterPlatformViewsController::DisposeViews() {
     clip_count_.erase(viewId);
     views_to_recomposite_.erase(viewId);
   }
-  views_to_dispose_.clear();
+
+  views_to_dispose_ = std::move(views_to_delay_dispose);
 }
 
 void FlutterPlatformViewsController::BeginCATransaction() {
@@ -946,6 +989,10 @@ void FlutterPlatformViewsController::ResetFrameState() {
   fml::scoped_nsobject<DelayingGestureRecognizer> _delayingRecognizer;
   FlutterPlatformViewGestureRecognizersBlockingPolicy _blockingPolicy;
   UIView* _embeddedView;
+  // The used as the accessiblityContainer.
+  // The `accessiblityContainer` is used in UIKit to determine the parent of this accessibility
+  // node.
+  NSObject* _flutterAccessibilityContainer;
 }
 - (instancetype)initWithEmbeddedView:(UIView*)embeddedView
              platformViewsController:
@@ -1024,6 +1071,14 @@ void FlutterPlatformViewsController::ResetFrameState() {
 - (void)touchesEnded:(NSSet*)touches withEvent:(UIEvent*)event {
 }
 
+- (void)setFlutterAccessibilityContainer:(NSObject*)flutterAccessibilityContainer {
+  _flutterAccessibilityContainer = flutterAccessibilityContainer;
+}
+
+- (id)accessibilityContainer {
+  return _flutterAccessibilityContainer;
+}
+
 @end
 
 @implementation DelayingGestureRecognizer {
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsTest.mm
index 9b8ee71ead7cd099fdac2ce6c05f6476fd1fa001..f64a4db8bc2843729612d57a4dbba0ab092c0def 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsTest.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsTest.mm
@@ -11,12 +11,14 @@
 #import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterPlatformViews.h"
 #import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterTouchInterceptingView_Test.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h"
 #import "flutter/shell/platform/darwin/ios/platform_view_ios.h"
 
-FLUTTER_ASSERT_NOT_ARC
+FLUTTER_ASSERT_ARC
+
 @class FlutterPlatformViewsTestMockPlatformView;
-static FlutterPlatformViewsTestMockPlatformView* gMockPlatformView = nil;
+__weak static FlutterPlatformViewsTestMockPlatformView* gMockPlatformView = nil;
 const float kFloatCompareEpsilon = 0.001;
 
 @interface FlutterPlatformViewsTestMockPlatformView : UIView
@@ -33,7 +35,6 @@ const float kFloatCompareEpsilon = 0.001;
 
 - (void)dealloc {
   gMockPlatformView = nil;
-  [super dealloc];
 }
 
 @end
@@ -65,12 +66,6 @@ const float kFloatCompareEpsilon = 0.001;
   self.viewCreated = YES;
 }
 
-- (void)dealloc {
-  [_view release];
-  _view = nil;
-  [super dealloc];
-}
-
 @end
 
 @interface FlutterPlatformViewsTestMockFlutterPlatformFactory
@@ -81,7 +76,7 @@ const float kFloatCompareEpsilon = 0.001;
 - (NSObject<FlutterPlatformView>*)createWithFrame:(CGRect)frame
                                    viewIdentifier:(int64_t)viewId
                                         arguments:(id _Nullable)args {
-  return [[[FlutterPlatformViewsTestMockFlutterPlatformView alloc] init] autorelease];
+  return [[FlutterPlatformViewsTestMockFlutterPlatformView alloc] init];
 }
 
 @end
@@ -89,11 +84,12 @@ const float kFloatCompareEpsilon = 0.001;
 namespace flutter {
 namespace {
 class FlutterPlatformViewsTestMockPlatformViewDelegate : public PlatformView::Delegate {
+ public:
   void OnPlatformViewCreated(std::unique_ptr<Surface> surface) override {}
   void OnPlatformViewDestroyed() override {}
   void OnPlatformViewScheduleFrame() override {}
   void OnPlatformViewSetNextFrameCallback(const fml::closure& closure) override {}
-  void OnPlatformViewSetViewportMetrics(const ViewportMetrics& metrics) override {}
+  void OnPlatformViewSetViewportMetrics(int64_t view_id, const ViewportMetrics& metrics) override {}
   const flutter::Settings& OnPlatformViewGetSettings() const override { return settings_; }
   void OnPlatformViewDispatchPlatformMessage(std::unique_ptr<PlatformMessage> message) override {}
   void OnPlatformViewDispatchPointerDataPacket(std::unique_ptr<PointerDataPacket> packet) override {
@@ -117,7 +113,6 @@ class FlutterPlatformViewsTestMockPlatformViewDelegate : public PlatformView::De
   void UpdateAssetResolverByType(std::unique_ptr<flutter::AssetResolver> updated_asset_resolver,
                                  flutter::AssetResolver::AssetResolverType type) override {}
 
- private:
   flutter::Settings settings_;
 };
 
@@ -125,7 +120,7 @@ class FlutterPlatformViewsTestMockPlatformViewDelegate : public PlatformView::De
 }  // namespace flutter
 
 namespace {
-fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
+fml::RefPtr<fml::TaskRunner> CreateNewThread(const std::string& name) {
   auto thread = std::make_unique<fml::Thread>(name);
   auto runner = thread->GetTaskRunner();
   return runner;
@@ -148,12 +143,16 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   auto flutterPlatformViewsController = std::make_shared<flutter::FlutterPlatformViewsController>();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/flutterPlatformViewsController,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
 
   FlutterPlatformViewsTestMockFlutterPlatformFactory* factory =
-      [[FlutterPlatformViewsTestMockFlutterPlatformFactory new] autorelease];
+      [[FlutterPlatformViewsTestMockFlutterPlatformFactory alloc] init];
   flutterPlatformViewsController->RegisterViewFactory(
       factory, @"MockFlutterPlatformView",
       FlutterPlatformViewGestureRecognizersBlockingPolicyEager);
@@ -164,7 +163,7 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
           methodCallWithMethodName:@"create"
                          arguments:@{@"id" : @2, @"viewType" : @"MockFlutterPlatformView"}],
       result);
-  UIView* mockFlutterView = [[[UIView alloc] initWithFrame:CGRectMake(0, 0, 500, 500)] autorelease];
+  UIView* mockFlutterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 500, 500)];
   flutterPlatformViewsController->SetFlutterView(mockFlutterView);
   // Create embedded view params
   flutter::MutatorsStack stack;
@@ -202,12 +201,16 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   auto flutterPlatformViewsController = std::make_shared<flutter::FlutterPlatformViewsController>();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/flutterPlatformViewsController,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
 
   FlutterPlatformViewsTestMockFlutterPlatformFactory* factory =
-      [[FlutterPlatformViewsTestMockFlutterPlatformFactory new] autorelease];
+      [[FlutterPlatformViewsTestMockFlutterPlatformFactory alloc] init];
   flutterPlatformViewsController->RegisterViewFactory(
       factory, @"MockFlutterPlatformView",
       FlutterPlatformViewGestureRecognizersBlockingPolicyEager);
@@ -224,8 +227,8 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
 
 - (void)testChildClippingViewHitTests {
   ChildClippingView* childClippingView =
-      [[[ChildClippingView alloc] initWithFrame:CGRectMake(0, 0, 500, 500)] autorelease];
-  UIView* childView = [[[UIView alloc] initWithFrame:CGRectMake(100, 100, 100, 100)] autorelease];
+      [[ChildClippingView alloc] initWithFrame:CGRectMake(0, 0, 500, 500)];
+  UIView* childView = [[UIView alloc] initWithFrame:CGRectMake(100, 100, 100, 100)];
   [childClippingView addSubview:childView];
 
   XCTAssertFalse([childClippingView pointInside:CGPointMake(50, 50) withEvent:nil]);
@@ -243,6 +246,17 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   XCTAssertTrue([childClippingView pointInside:CGPointMake(199, 199) withEvent:nil]);
 }
 
+- (void)testReleasesBackdropFilterSubviewsOnChildClippingViewDealloc {
+  __weak NSMutableArray<UIVisualEffectView*>* weakBackdropFilterSubviews = nil;
+  @autoreleasepool {
+    ChildClippingView* clipping_view = [[ChildClippingView alloc] initWithFrame:CGRectZero];
+    weakBackdropFilterSubviews = clipping_view.backdropFilterSubviews;
+    XCTAssertNotNil(weakBackdropFilterSubviews);
+    clipping_view = nil;
+  }
+  XCTAssertNil(weakBackdropFilterSubviews);
+}
+
 - (void)testApplyBackdropFilter {
   flutter::FlutterPlatformViewsTestMockPlatformViewDelegate mock_delegate;
   auto thread_task_runner = CreateNewThread("FlutterPlatformViewsTest");
@@ -254,12 +268,16 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   auto flutterPlatformViewsController = std::make_shared<flutter::FlutterPlatformViewsController>();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/flutterPlatformViewsController,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
 
   FlutterPlatformViewsTestMockFlutterPlatformFactory* factory =
-      [[FlutterPlatformViewsTestMockFlutterPlatformFactory new] autorelease];
+      [[FlutterPlatformViewsTestMockFlutterPlatformFactory alloc] init];
   flutterPlatformViewsController->RegisterViewFactory(
       factory, @"MockFlutterPlatformView",
       FlutterPlatformViewGestureRecognizersBlockingPolicyEager);
@@ -273,17 +291,17 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
 
   XCTAssertNotNil(gMockPlatformView);
 
-  UIView* mockFlutterView = [[[UIView alloc] initWithFrame:CGRectMake(0, 0, 10, 10)] autorelease];
+  UIView* mockFlutterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 10, 10)];
   flutterPlatformViewsController->SetFlutterView(mockFlutterView);
   // Create embedded view params
   flutter::MutatorsStack stack;
   // Layer tree always pushes a screen scale factor to the stack
-  SkMatrix screenScaleMatrix =
-      SkMatrix::Scale([UIScreen mainScreen].scale, [UIScreen mainScreen].scale);
+  CGFloat screenScale = [UIScreen mainScreen].scale;
+  SkMatrix screenScaleMatrix = SkMatrix::Scale(screenScale, screenScale);
   stack.PushTransform(screenScaleMatrix);
   // Push a backdrop filter
   auto filter = std::make_shared<flutter::DlBlurImageFilter>(5, 2, flutter::DlTileMode::kClamp);
-  stack.PushBackdropFilter(filter, SkRect::MakeXYWH(0, 0, 10, 10));
+  stack.PushBackdropFilter(filter, SkRect::MakeXYWH(0, 0, screenScale * 10, screenScale * 10));
 
   auto embeddedViewParams =
       std::make_unique<flutter::EmbeddedViewParams>(screenScaleMatrix, SkSize::Make(10, 10), stack);
@@ -324,12 +342,16 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   auto flutterPlatformViewsController = std::make_shared<flutter::FlutterPlatformViewsController>();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/flutterPlatformViewsController,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
 
   FlutterPlatformViewsTestMockFlutterPlatformFactory* factory =
-      [[FlutterPlatformViewsTestMockFlutterPlatformFactory new] autorelease];
+      [[FlutterPlatformViewsTestMockFlutterPlatformFactory alloc] init];
   flutterPlatformViewsController->RegisterViewFactory(
       factory, @"MockFlutterPlatformView",
       FlutterPlatformViewGestureRecognizersBlockingPolicyEager);
@@ -343,17 +365,17 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
 
   XCTAssertNotNil(gMockPlatformView);
 
-  UIView* mockFlutterView = [[[UIView alloc] initWithFrame:CGRectMake(0, 0, 10, 10)] autorelease];
+  UIView* mockFlutterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 10, 10)];
   flutterPlatformViewsController->SetFlutterView(mockFlutterView);
   // Create embedded view params
   flutter::MutatorsStack stack;
   // Layer tree always pushes a screen scale factor to the stack
-  SkMatrix screenScaleMatrix =
-      SkMatrix::Scale([UIScreen mainScreen].scale, [UIScreen mainScreen].scale);
+  CGFloat screenScale = [UIScreen mainScreen].scale;
+  SkMatrix screenScaleMatrix = SkMatrix::Scale(screenScale, screenScale);
   stack.PushTransform(screenScaleMatrix);
   // Push a backdrop filter
   auto filter = std::make_shared<flutter::DlBlurImageFilter>(5, 2, flutter::DlTileMode::kClamp);
-  stack.PushBackdropFilter(filter, SkRect::MakeXYWH(0, 0, 8, 8));
+  stack.PushBackdropFilter(filter, SkRect::MakeXYWH(0, 0, screenScale * 8, screenScale * 8));
 
   auto embeddedViewParams =
       std::make_unique<flutter::EmbeddedViewParams>(screenScaleMatrix, SkSize::Make(5, 10), stack);
@@ -394,12 +416,16 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   auto flutterPlatformViewsController = std::make_shared<flutter::FlutterPlatformViewsController>();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/flutterPlatformViewsController,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
 
   FlutterPlatformViewsTestMockFlutterPlatformFactory* factory =
-      [[FlutterPlatformViewsTestMockFlutterPlatformFactory new] autorelease];
+      [[FlutterPlatformViewsTestMockFlutterPlatformFactory alloc] init];
   flutterPlatformViewsController->RegisterViewFactory(
       factory, @"MockFlutterPlatformView",
       FlutterPlatformViewGestureRecognizersBlockingPolicyEager);
@@ -413,22 +439,22 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
 
   XCTAssertNotNil(gMockPlatformView);
 
-  UIView* mockFlutterView = [[[UIView alloc] initWithFrame:CGRectMake(0, 0, 10, 10)] autorelease];
+  UIView* mockFlutterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 10, 10)];
   flutterPlatformViewsController->SetFlutterView(mockFlutterView);
   // Create embedded view params
   flutter::MutatorsStack stack;
   // Layer tree always pushes a screen scale factor to the stack
-  SkMatrix screenScaleMatrix =
-      SkMatrix::Scale([UIScreen mainScreen].scale, [UIScreen mainScreen].scale);
+  CGFloat screenScale = [UIScreen mainScreen].scale;
+  SkMatrix screenScaleMatrix = SkMatrix::Scale(screenScale, screenScale);
   stack.PushTransform(screenScaleMatrix);
   // Push backdrop filters
   for (int i = 0; i < 50; i++) {
     auto filter = std::make_shared<flutter::DlBlurImageFilter>(i, 2, flutter::DlTileMode::kClamp);
-    stack.PushBackdropFilter(filter, SkRect::MakeXYWH(0, 0, 10, 10));
+    stack.PushBackdropFilter(filter, SkRect::MakeXYWH(0, 0, screenScale * 10, screenScale * 10));
   }
 
   auto embeddedViewParams =
-      std::make_unique<flutter::EmbeddedViewParams>(screenScaleMatrix, SkSize::Make(10, 10), stack);
+      std::make_unique<flutter::EmbeddedViewParams>(screenScaleMatrix, SkSize::Make(20, 20), stack);
 
   flutterPlatformViewsController->PrerollCompositeEmbeddedView(2, std::move(embeddedViewParams));
   flutterPlatformViewsController->CompositeEmbeddedView(2);
@@ -465,12 +491,16 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   auto flutterPlatformViewsController = std::make_shared<flutter::FlutterPlatformViewsController>();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/flutterPlatformViewsController,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
 
   FlutterPlatformViewsTestMockFlutterPlatformFactory* factory =
-      [[FlutterPlatformViewsTestMockFlutterPlatformFactory new] autorelease];
+      [[FlutterPlatformViewsTestMockFlutterPlatformFactory alloc] init];
   flutterPlatformViewsController->RegisterViewFactory(
       factory, @"MockFlutterPlatformView",
       FlutterPlatformViewGestureRecognizersBlockingPolicyEager);
@@ -484,17 +514,17 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
 
   XCTAssertNotNil(gMockPlatformView);
 
-  UIView* mockFlutterView = [[[UIView alloc] initWithFrame:CGRectMake(0, 0, 10, 10)] autorelease];
+  UIView* mockFlutterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 10, 10)];
   flutterPlatformViewsController->SetFlutterView(mockFlutterView);
   // Create embedded view params
   flutter::MutatorsStack stack;
   // Layer tree always pushes a screen scale factor to the stack
-  SkMatrix screenScaleMatrix =
-      SkMatrix::Scale([UIScreen mainScreen].scale, [UIScreen mainScreen].scale);
+  CGFloat screenScale = [UIScreen mainScreen].scale;
+  SkMatrix screenScaleMatrix = SkMatrix::Scale(screenScale, screenScale);
   stack.PushTransform(screenScaleMatrix);
   // Push a backdrop filter
   auto filter = std::make_shared<flutter::DlBlurImageFilter>(5, 2, flutter::DlTileMode::kClamp);
-  stack.PushBackdropFilter(filter, SkRect::MakeXYWH(0, 0, 10, 10));
+  stack.PushBackdropFilter(filter, SkRect::MakeXYWH(0, 0, screenScale * 10, screenScale * 10));
 
   auto embeddedViewParams =
       std::make_unique<flutter::EmbeddedViewParams>(screenScaleMatrix, SkSize::Make(10, 10), stack);
@@ -508,7 +538,7 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   [mockFlutterView setNeedsLayout];
   [mockFlutterView layoutIfNeeded];
 
-  NSMutableArray* originalVisualEffectViews = [[[NSMutableArray alloc] init] autorelease];
+  NSMutableArray* originalVisualEffectViews = [[NSMutableArray alloc] init];
   for (UIView* subview in childClippingView.subviews) {
     if (![subview isKindOfClass:[UIVisualEffectView class]]) {
       continue;
@@ -530,7 +560,7 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   stack2.PushTransform(screenScaleMatrix);
   // Push backdrop filters
   for (int i = 0; i < 2; i++) {
-    stack2.PushBackdropFilter(filter, SkRect::MakeXYWH(0, 0, 10, 10));
+    stack2.PushBackdropFilter(filter, SkRect::MakeXYWH(0, 0, screenScale * 10, screenScale * 10));
   }
 
   embeddedViewParams = std::make_unique<flutter::EmbeddedViewParams>(screenScaleMatrix,
@@ -541,7 +571,7 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   [mockFlutterView setNeedsLayout];
   [mockFlutterView layoutIfNeeded];
 
-  NSMutableArray* newVisualEffectViews = [[[NSMutableArray alloc] init] autorelease];
+  NSMutableArray* newVisualEffectViews = [[NSMutableArray alloc] init];
   for (UIView* subview in childClippingView.subviews) {
     if (![subview isKindOfClass:[UIVisualEffectView class]]) {
       continue;
@@ -576,12 +606,16 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   auto flutterPlatformViewsController = std::make_shared<flutter::FlutterPlatformViewsController>();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/flutterPlatformViewsController,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
 
   FlutterPlatformViewsTestMockFlutterPlatformFactory* factory =
-      [[FlutterPlatformViewsTestMockFlutterPlatformFactory new] autorelease];
+      [[FlutterPlatformViewsTestMockFlutterPlatformFactory alloc] init];
   flutterPlatformViewsController->RegisterViewFactory(
       factory, @"MockFlutterPlatformView",
       FlutterPlatformViewGestureRecognizersBlockingPolicyEager);
@@ -595,18 +629,18 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
 
   XCTAssertNotNil(gMockPlatformView);
 
-  UIView* mockFlutterView = [[[UIView alloc] initWithFrame:CGRectMake(0, 0, 10, 10)] autorelease];
+  UIView* mockFlutterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 10, 10)];
   flutterPlatformViewsController->SetFlutterView(mockFlutterView);
   // Create embedded view params
   flutter::MutatorsStack stack;
   // Layer tree always pushes a screen scale factor to the stack
-  SkMatrix screenScaleMatrix =
-      SkMatrix::Scale([UIScreen mainScreen].scale, [UIScreen mainScreen].scale);
+  CGFloat screenScale = [UIScreen mainScreen].scale;
+  SkMatrix screenScaleMatrix = SkMatrix::Scale(screenScale, screenScale);
   stack.PushTransform(screenScaleMatrix);
   // Push backdrop filters
   auto filter = std::make_shared<flutter::DlBlurImageFilter>(5, 2, flutter::DlTileMode::kClamp);
   for (int i = 0; i < 5; i++) {
-    stack.PushBackdropFilter(filter, SkRect::MakeXYWH(0, 0, 10, 10));
+    stack.PushBackdropFilter(filter, SkRect::MakeXYWH(0, 0, screenScale * 10, screenScale * 10));
   }
 
   auto embeddedViewParams =
@@ -621,7 +655,7 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   [mockFlutterView setNeedsLayout];
   [mockFlutterView layoutIfNeeded];
 
-  NSMutableArray* originalVisualEffectViews = [[[NSMutableArray alloc] init] autorelease];
+  NSMutableArray* originalVisualEffectViews = [[NSMutableArray alloc] init];
   for (UIView* subview in childClippingView.subviews) {
     if (![subview isKindOfClass:[UIVisualEffectView class]]) {
       continue;
@@ -641,7 +675,7 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   stack2.PushTransform(screenScaleMatrix);
   // Push backdrop filters
   for (int i = 0; i < 4; i++) {
-    stack2.PushBackdropFilter(filter, SkRect::MakeXYWH(0, 0, 10, 10));
+    stack2.PushBackdropFilter(filter, SkRect::MakeXYWH(0, 0, screenScale * 10, screenScale * 10));
   }
 
   embeddedViewParams = std::make_unique<flutter::EmbeddedViewParams>(screenScaleMatrix,
@@ -652,7 +686,7 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   [mockFlutterView setNeedsLayout];
   [mockFlutterView layoutIfNeeded];
 
-  NSMutableArray* newVisualEffectViews = [[[NSMutableArray alloc] init] autorelease];
+  NSMutableArray* newVisualEffectViews = [[NSMutableArray alloc] init];
   for (UIView* subview in childClippingView.subviews) {
     if (![subview isKindOfClass:[UIVisualEffectView class]]) {
       continue;
@@ -711,12 +745,16 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   auto flutterPlatformViewsController = std::make_shared<flutter::FlutterPlatformViewsController>();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/flutterPlatformViewsController,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
 
   FlutterPlatformViewsTestMockFlutterPlatformFactory* factory =
-      [[FlutterPlatformViewsTestMockFlutterPlatformFactory new] autorelease];
+      [[FlutterPlatformViewsTestMockFlutterPlatformFactory alloc] init];
   flutterPlatformViewsController->RegisterViewFactory(
       factory, @"MockFlutterPlatformView",
       FlutterPlatformViewGestureRecognizersBlockingPolicyEager);
@@ -730,18 +768,18 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
 
   XCTAssertNotNil(gMockPlatformView);
 
-  UIView* mockFlutterView = [[[UIView alloc] initWithFrame:CGRectMake(0, 0, 10, 10)] autorelease];
+  UIView* mockFlutterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 10, 10)];
   flutterPlatformViewsController->SetFlutterView(mockFlutterView);
   // Create embedded view params
   flutter::MutatorsStack stack;
   // Layer tree always pushes a screen scale factor to the stack
-  SkMatrix screenScaleMatrix =
-      SkMatrix::Scale([UIScreen mainScreen].scale, [UIScreen mainScreen].scale);
+  CGFloat screenScale = [UIScreen mainScreen].scale;
+  SkMatrix screenScaleMatrix = SkMatrix::Scale(screenScale, screenScale);
   stack.PushTransform(screenScaleMatrix);
   // Push backdrop filters
   auto filter = std::make_shared<flutter::DlBlurImageFilter>(5, 2, flutter::DlTileMode::kClamp);
   for (int i = 0; i < 5; i++) {
-    stack.PushBackdropFilter(filter, SkRect::MakeXYWH(0, 0, 10, 10));
+    stack.PushBackdropFilter(filter, SkRect::MakeXYWH(0, 0, screenScale * 10, screenScale * 10));
   }
 
   auto embeddedViewParams =
@@ -756,7 +794,7 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   [mockFlutterView setNeedsLayout];
   [mockFlutterView layoutIfNeeded];
 
-  NSMutableArray* originalVisualEffectViews = [[[NSMutableArray alloc] init] autorelease];
+  NSMutableArray* originalVisualEffectViews = [[NSMutableArray alloc] init];
   for (UIView* subview in childClippingView.subviews) {
     if (![subview isKindOfClass:[UIVisualEffectView class]]) {
       continue;
@@ -780,11 +818,12 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
       auto filter2 =
           std::make_shared<flutter::DlBlurImageFilter>(2, 5, flutter::DlTileMode::kClamp);
 
-      stack2.PushBackdropFilter(filter2, SkRect::MakeXYWH(0, 0, 10, 10));
+      stack2.PushBackdropFilter(filter2,
+                                SkRect::MakeXYWH(0, 0, screenScale * 10, screenScale * 10));
       continue;
     }
 
-    stack2.PushBackdropFilter(filter, SkRect::MakeXYWH(0, 0, 10, 10));
+    stack2.PushBackdropFilter(filter, SkRect::MakeXYWH(0, 0, screenScale * 10, screenScale * 10));
   }
 
   embeddedViewParams = std::make_unique<flutter::EmbeddedViewParams>(screenScaleMatrix,
@@ -795,7 +834,7 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   [mockFlutterView setNeedsLayout];
   [mockFlutterView layoutIfNeeded];
 
-  NSMutableArray* newVisualEffectViews = [[[NSMutableArray alloc] init] autorelease];
+  NSMutableArray* newVisualEffectViews = [[NSMutableArray alloc] init];
   for (UIView* subview in childClippingView.subviews) {
     if (![subview isKindOfClass:[UIVisualEffectView class]]) {
       continue;
@@ -833,11 +872,12 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
     if (i == 0) {
       auto filter2 =
           std::make_shared<flutter::DlBlurImageFilter>(2, 5, flutter::DlTileMode::kClamp);
-      stack2.PushBackdropFilter(filter2, SkRect::MakeXYWH(0, 0, 10, 10));
+      stack2.PushBackdropFilter(filter2,
+                                SkRect::MakeXYWH(0, 0, screenScale * 10, screenScale * 10));
       continue;
     }
 
-    stack2.PushBackdropFilter(filter, SkRect::MakeXYWH(0, 0, 10, 10));
+    stack2.PushBackdropFilter(filter, SkRect::MakeXYWH(0, 0, screenScale * 10, screenScale * 10));
   }
 
   embeddedViewParams = std::make_unique<flutter::EmbeddedViewParams>(screenScaleMatrix,
@@ -884,11 +924,12 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
     if (i == 4) {
       auto filter2 =
           std::make_shared<flutter::DlBlurImageFilter>(2, 5, flutter::DlTileMode::kClamp);
-      stack2.PushBackdropFilter(filter2, SkRect::MakeXYWH(0, 0, 10, 10));
+      stack2.PushBackdropFilter(filter2,
+                                SkRect::MakeXYWH(0, 0, screenScale * 10, screenScale * 10));
       continue;
     }
 
-    stack2.PushBackdropFilter(filter, SkRect::MakeXYWH(0, 0, 10, 10));
+    stack2.PushBackdropFilter(filter, SkRect::MakeXYWH(0, 0, screenScale * 10, screenScale * 10));
   }
 
   embeddedViewParams = std::make_unique<flutter::EmbeddedViewParams>(screenScaleMatrix,
@@ -936,7 +977,7 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   for (int i = 0; i < 5; i++) {
     auto filter2 = std::make_shared<flutter::DlBlurImageFilter>(i, 2, flutter::DlTileMode::kClamp);
 
-    stack2.PushBackdropFilter(filter2, SkRect::MakeXYWH(0, 0, 10, 10));
+    stack2.PushBackdropFilter(filter2, SkRect::MakeXYWH(0, 0, screenScale * 10, screenScale * 10));
   }
 
   embeddedViewParams = std::make_unique<flutter::EmbeddedViewParams>(screenScaleMatrix,
@@ -983,12 +1024,16 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   auto flutterPlatformViewsController = std::make_shared<flutter::FlutterPlatformViewsController>();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/flutterPlatformViewsController,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
 
   FlutterPlatformViewsTestMockFlutterPlatformFactory* factory =
-      [[FlutterPlatformViewsTestMockFlutterPlatformFactory new] autorelease];
+      [[FlutterPlatformViewsTestMockFlutterPlatformFactory alloc] init];
   flutterPlatformViewsController->RegisterViewFactory(
       factory, @"MockFlutterPlatformView",
       FlutterPlatformViewGestureRecognizersBlockingPolicyEager);
@@ -1002,13 +1047,13 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
 
   XCTAssertNotNil(gMockPlatformView);
 
-  UIView* mockFlutterView = [[[UIView alloc] initWithFrame:CGRectMake(0, 0, 10, 10)] autorelease];
+  UIView* mockFlutterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 10, 10)];
   flutterPlatformViewsController->SetFlutterView(mockFlutterView);
   // Create embedded view params
   flutter::MutatorsStack stack;
   // Layer tree always pushes a screen scale factor to the stack
-  SkMatrix screenScaleMatrix =
-      SkMatrix::Scale([UIScreen mainScreen].scale, [UIScreen mainScreen].scale);
+  CGFloat screenScale = [UIScreen mainScreen].scale;
+  SkMatrix screenScaleMatrix = SkMatrix::Scale(screenScale, screenScale);
   stack.PushTransform(screenScaleMatrix);
   // Push a dilate backdrop filter
   auto dilateFilter = std::make_shared<flutter::DlDilateImageFilter>(5, 2);
@@ -1045,11 +1090,13 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
 
   for (int i = 0; i < 5; i++) {
     if (i == 2) {
-      stack2.PushBackdropFilter(dilateFilter, SkRect::MakeXYWH(0, 0, 10, 10));
+      stack2.PushBackdropFilter(dilateFilter,
+                                SkRect::MakeXYWH(0, 0, screenScale * 10, screenScale * 10));
       continue;
     }
 
-    stack2.PushBackdropFilter(blurFilter, SkRect::MakeXYWH(0, 0, 10, 10));
+    stack2.PushBackdropFilter(blurFilter,
+                              SkRect::MakeXYWH(0, 0, screenScale * 10, screenScale * 10));
   }
 
   embeddedViewParams = std::make_unique<flutter::EmbeddedViewParams>(screenScaleMatrix,
@@ -1082,11 +1129,13 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   // Push backdrop filters and dilate filter
   for (int i = 0; i < 5; i++) {
     if (i == 0) {
-      stack2.PushBackdropFilter(dilateFilter, SkRect::MakeXYWH(0, 0, 10, 10));
+      stack2.PushBackdropFilter(dilateFilter,
+                                SkRect::MakeXYWH(0, 0, screenScale * 10, screenScale * 10));
       continue;
     }
 
-    stack2.PushBackdropFilter(blurFilter, SkRect::MakeXYWH(0, 0, 10, 10));
+    stack2.PushBackdropFilter(blurFilter,
+                              SkRect::MakeXYWH(0, 0, screenScale * 10, screenScale * 10));
   }
 
   embeddedViewParams = std::make_unique<flutter::EmbeddedViewParams>(screenScaleMatrix,
@@ -1119,11 +1168,13 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   // Push backdrop filters and dilate filter
   for (int i = 0; i < 5; i++) {
     if (i == 4) {
-      stack2.PushBackdropFilter(dilateFilter, SkRect::MakeXYWH(0, 0, 10, 10));
+      stack2.PushBackdropFilter(dilateFilter,
+                                SkRect::MakeXYWH(0, 0, screenScale * 10, screenScale * 10));
       continue;
     }
 
-    stack2.PushBackdropFilter(blurFilter, SkRect::MakeXYWH(0, 0, 10, 10));
+    stack2.PushBackdropFilter(blurFilter,
+                              SkRect::MakeXYWH(0, 0, screenScale * 10, screenScale * 10));
   }
 
   embeddedViewParams = std::make_unique<flutter::EmbeddedViewParams>(screenScaleMatrix,
@@ -1155,7 +1206,8 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   }
   // Push dilate filters
   for (int i = 0; i < 5; i++) {
-    stack2.PushBackdropFilter(dilateFilter, SkRect::MakeXYWH(0, 0, 10, 10));
+    stack2.PushBackdropFilter(dilateFilter,
+                              SkRect::MakeXYWH(0, 0, screenScale * 10, screenScale * 10));
   }
 
   embeddedViewParams = std::make_unique<flutter::EmbeddedViewParams>(screenScaleMatrix,
@@ -1205,7 +1257,7 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
       initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]];
   NSArray* subviews = editedUIVisualEffectView.subviews;
   for (UIView* view in subviews) {
-    if ([view isKindOfClass:NSClassFromString(@"_UIVisualEffectBackdropView")]) {
+    if ([NSStringFromClass([view class]) hasSuffix:@"BackdropView"]) {
       for (CIFilter* filter in view.layer.filters) {
         if ([[filter valueForKey:@"name"] isEqual:@"gaussianBlur"]) {
           [filter setValue:@"notGaussianBlur" forKey:@"name"];
@@ -1228,7 +1280,7 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
       initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]];
   NSArray* subviews = editedUIVisualEffectView.subviews;
   for (UIView* view in subviews) {
-    if ([view isKindOfClass:NSClassFromString(@"_UIVisualEffectBackdropView")]) {
+    if ([NSStringFromClass([view class]) hasSuffix:@"BackdropView"]) {
       for (CIFilter* filter in view.layer.filters) {
         if ([[filter valueForKey:@"name"] isEqual:@"gaussianBlur"]) {
           [filter setValue:@"invalidInputRadius" forKey:@"inputRadius"];
@@ -1253,9 +1305,9 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
       [[PlatformViewFilter alloc] initWithFrame:CGRectMake(0, 0, 10, 10)
                                      blurRadius:5
                                visualEffectView:visualEffectView];
-  CGColorRef visualEffectSubviewBackgroundColor;
+  CGColorRef visualEffectSubviewBackgroundColor = nil;
   for (UIView* view in [platformViewFilter backdropFilterView].subviews) {
-    if ([view isKindOfClass:NSClassFromString(@"_UIVisualEffectSubview")]) {
+    if ([NSStringFromClass([view class]) hasSuffix:@"VisualEffectSubview"]) {
       visualEffectSubviewBackgroundColor = view.layer.backgroundColor;
     }
   }
@@ -1274,12 +1326,16 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   auto flutterPlatformViewsController = std::make_shared<flutter::FlutterPlatformViewsController>();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/flutterPlatformViewsController,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
 
   FlutterPlatformViewsTestMockFlutterPlatformFactory* factory =
-      [[FlutterPlatformViewsTestMockFlutterPlatformFactory new] autorelease];
+      [[FlutterPlatformViewsTestMockFlutterPlatformFactory alloc] init];
   flutterPlatformViewsController->RegisterViewFactory(
       factory, @"MockFlutterPlatformView",
       FlutterPlatformViewGestureRecognizersBlockingPolicyEager);
@@ -1293,7 +1349,7 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
 
   XCTAssertNotNil(gMockPlatformView);
 
-  UIView* mockFlutterView = [[[UIView alloc] initWithFrame:CGRectMake(0, 0, 500, 500)] autorelease];
+  UIView* mockFlutterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 500, 500)];
   flutterPlatformViewsController->SetFlutterView(mockFlutterView);
   // Create embedded view params
   flutter::MutatorsStack stack;
@@ -1328,12 +1384,16 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   auto flutterPlatformViewsController = std::make_shared<flutter::FlutterPlatformViewsController>();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/flutterPlatformViewsController,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
 
   FlutterPlatformViewsTestMockFlutterPlatformFactory* factory =
-      [[FlutterPlatformViewsTestMockFlutterPlatformFactory new] autorelease];
+      [[FlutterPlatformViewsTestMockFlutterPlatformFactory alloc] init];
   flutterPlatformViewsController->RegisterViewFactory(
       factory, @"MockFlutterPlatformView",
       FlutterPlatformViewGestureRecognizersBlockingPolicyEager);
@@ -1347,13 +1407,13 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
 
   XCTAssertNotNil(gMockPlatformView);
 
-  UIView* mockFlutterView = [[[UIView alloc] initWithFrame:CGRectMake(0, 0, 10, 10)] autorelease];
+  UIView* mockFlutterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 10, 10)];
   flutterPlatformViewsController->SetFlutterView(mockFlutterView);
   // Create embedded view params
   flutter::MutatorsStack stack;
   // Layer tree always pushes a screen scale factor to the stack
-  SkMatrix screenScaleMatrix =
-      SkMatrix::Scale([UIScreen mainScreen].scale, [UIScreen mainScreen].scale);
+  CGFloat screenScale = [UIScreen mainScreen].scale;
+  SkMatrix screenScaleMatrix = SkMatrix::Scale(screenScale, screenScale);
   stack.PushTransform(screenScaleMatrix);
 
   auto embeddedViewParams =
@@ -1363,8 +1423,8 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   flutterPlatformViewsController->PrerollCompositeEmbeddedView(2, std::move(embeddedViewParams));
   flutterPlatformViewsController->PushVisitedPlatformView(2);
   auto filter = std::make_shared<flutter::DlBlurImageFilter>(5, 2, flutter::DlTileMode::kClamp);
-  flutterPlatformViewsController->PushFilterToVisitedPlatformViews(filter,
-                                                                   SkRect::MakeXYWH(0, 0, 10, 10));
+  flutterPlatformViewsController->PushFilterToVisitedPlatformViews(
+      filter, SkRect::MakeXYWH(0, 0, screenScale * 10, screenScale * 10));
   flutterPlatformViewsController->CompositeEmbeddedView(2);
   XCTAssertTrue([gMockPlatformView.superview.superview isKindOfClass:[ChildClippingView class]]);
   ChildClippingView* childClippingView = (ChildClippingView*)gMockPlatformView.superview.superview;
@@ -1420,12 +1480,16 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   auto flutterPlatformViewsController = std::make_shared<flutter::FlutterPlatformViewsController>();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/flutterPlatformViewsController,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
 
   FlutterPlatformViewsTestMockFlutterPlatformFactory* factory =
-      [[FlutterPlatformViewsTestMockFlutterPlatformFactory new] autorelease];
+      [[FlutterPlatformViewsTestMockFlutterPlatformFactory alloc] init];
   flutterPlatformViewsController->RegisterViewFactory(
       factory, @"MockFlutterPlatformView",
       FlutterPlatformViewGestureRecognizersBlockingPolicyEager);
@@ -1439,7 +1503,7 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
 
   XCTAssertNotNil(gMockPlatformView);
 
-  UIView* mockFlutterView = [[[UIView alloc] initWithFrame:CGRectMake(0, 0, 500, 500)] autorelease];
+  UIView* mockFlutterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 500, 500)];
   flutterPlatformViewsController->SetFlutterView(mockFlutterView);
   // Create embedded view params
   flutter::MutatorsStack stack;
@@ -1489,12 +1553,16 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   auto flutterPlatformViewsController = std::make_shared<flutter::FlutterPlatformViewsController>();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/flutterPlatformViewsController,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
 
   FlutterPlatformViewsTestMockFlutterPlatformFactory* factory =
-      [[FlutterPlatformViewsTestMockFlutterPlatformFactory new] autorelease];
+      [[FlutterPlatformViewsTestMockFlutterPlatformFactory alloc] init];
   flutterPlatformViewsController->RegisterViewFactory(
       factory, @"MockFlutterPlatformView",
       FlutterPlatformViewGestureRecognizersBlockingPolicyEager);
@@ -1508,7 +1576,7 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
 
   XCTAssertNotNil(gMockPlatformView);
 
-  UIView* mockFlutterView = [[[UIView alloc] initWithFrame:CGRectMake(0, 0, 30, 30)] autorelease];
+  UIView* mockFlutterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 30, 30)];
   flutterPlatformViewsController->SetFlutterView(mockFlutterView);
   // Create embedded view params.
   flutter::MutatorsStack stack;
@@ -1554,12 +1622,16 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   auto flutterPlatformViewsController = std::make_shared<flutter::FlutterPlatformViewsController>();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/flutterPlatformViewsController,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
 
   FlutterPlatformViewsTestMockFlutterPlatformFactory* factory =
-      [[FlutterPlatformViewsTestMockFlutterPlatformFactory new] autorelease];
+      [[FlutterPlatformViewsTestMockFlutterPlatformFactory alloc] init];
   flutterPlatformViewsController->RegisterViewFactory(
       factory, @"MockFlutterPlatformView",
       FlutterPlatformViewGestureRecognizersBlockingPolicyEager);
@@ -1573,7 +1645,7 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
 
   XCTAssertNotNil(gMockPlatformView);
 
-  UIView* mockFlutterView = [[[UIView alloc] initWithFrame:CGRectMake(0, 0, 30, 30)] autorelease];
+  UIView* mockFlutterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 30, 30)];
   flutterPlatformViewsController->SetFlutterView(mockFlutterView);
   // Create embedded view params
   flutter::MutatorsStack stack;
@@ -1618,12 +1690,16 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   auto flutterPlatformViewsController = std::make_shared<flutter::FlutterPlatformViewsController>();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/flutterPlatformViewsController,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
 
   FlutterPlatformViewsTestMockFlutterPlatformFactory* factory =
-      [[FlutterPlatformViewsTestMockFlutterPlatformFactory new] autorelease];
+      [[FlutterPlatformViewsTestMockFlutterPlatformFactory alloc] init];
   flutterPlatformViewsController->RegisterViewFactory(
       factory, @"MockFlutterPlatformView",
       FlutterPlatformViewGestureRecognizersBlockingPolicyEager);
@@ -1637,7 +1713,7 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
 
   XCTAssertNotNil(gMockPlatformView);
 
-  UIView* mockFlutterView = [[[UIView alloc] initWithFrame:CGRectMake(0, 0, 10, 10)] autorelease];
+  UIView* mockFlutterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 10, 10)];
   flutterPlatformViewsController->SetFlutterView(mockFlutterView);
   // Create embedded view params
   flutter::MutatorsStack stack;
@@ -1689,12 +1765,16 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   auto flutterPlatformViewsController = std::make_shared<flutter::FlutterPlatformViewsController>();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/flutterPlatformViewsController,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
 
   FlutterPlatformViewsTestMockFlutterPlatformFactory* factory =
-      [[FlutterPlatformViewsTestMockFlutterPlatformFactory new] autorelease];
+      [[FlutterPlatformViewsTestMockFlutterPlatformFactory alloc] init];
   flutterPlatformViewsController->RegisterViewFactory(
       factory, @"MockFlutterPlatformView",
       FlutterPlatformViewGestureRecognizersBlockingPolicyEager);
@@ -1708,7 +1788,7 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
 
   XCTAssertNotNil(gMockPlatformView);
 
-  UIView* mockFlutterView = [[[UIView alloc] initWithFrame:CGRectMake(0, 0, 10, 10)] autorelease];
+  UIView* mockFlutterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 10, 10)];
   flutterPlatformViewsController->SetFlutterView(mockFlutterView);
   // Create embedded view params
   flutter::MutatorsStack stack;
@@ -1760,12 +1840,16 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   auto flutterPlatformViewsController = std::make_shared<flutter::FlutterPlatformViewsController>();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/flutterPlatformViewsController,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
 
   FlutterPlatformViewsTestMockFlutterPlatformFactory* factory =
-      [[FlutterPlatformViewsTestMockFlutterPlatformFactory new] autorelease];
+      [[FlutterPlatformViewsTestMockFlutterPlatformFactory alloc] init];
   flutterPlatformViewsController->RegisterViewFactory(
       factory, @"MockFlutterPlatformView",
       FlutterPlatformViewGestureRecognizersBlockingPolicyEager);
@@ -1779,7 +1863,7 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
 
   XCTAssertNotNil(gMockPlatformView);
 
-  UIView* mockFlutterView = [[[UIView alloc] initWithFrame:CGRectMake(0, 0, 10, 10)] autorelease];
+  UIView* mockFlutterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 10, 10)];
   flutterPlatformViewsController->SetFlutterView(mockFlutterView);
   // Create embedded view params
   flutter::MutatorsStack stack;
@@ -1832,12 +1916,16 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   auto flutterPlatformViewsController = std::make_shared<flutter::FlutterPlatformViewsController>();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/flutterPlatformViewsController,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
 
   FlutterPlatformViewsTestMockFlutterPlatformFactory* factory =
-      [[FlutterPlatformViewsTestMockFlutterPlatformFactory new] autorelease];
+      [[FlutterPlatformViewsTestMockFlutterPlatformFactory alloc] init];
   flutterPlatformViewsController->RegisterViewFactory(
       factory, @"MockFlutterPlatformView",
       FlutterPlatformViewGestureRecognizersBlockingPolicyEager);
@@ -1869,14 +1957,14 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   }
 
   // Before setting flutter view controller, events are not dispatched.
-  NSSet* touches1 = [[[NSSet alloc] init] autorelease];
+  NSSet* touches1 = [[NSSet alloc] init];
   id event1 = OCMClassMock([UIEvent class]);
   id mockFlutterViewContoller = OCMClassMock([FlutterViewController class]);
   [forwardGectureRecognizer touchesBegan:touches1 withEvent:event1];
   OCMReject([mockFlutterViewContoller touchesBegan:touches1 withEvent:event1]);
 
   // Set flutter view controller allows events to be dispatched.
-  NSSet* touches2 = [[[NSSet alloc] init] autorelease];
+  NSSet* touches2 = [[NSSet alloc] init];
   id event2 = OCMClassMock([UIEvent class]);
   flutterPlatformViewsController->SetFlutterViewController(mockFlutterViewContoller);
   [forwardGectureRecognizer touchesBegan:touches2 withEvent:event2];
@@ -1894,12 +1982,16 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   auto flutterPlatformViewsController = std::make_shared<flutter::FlutterPlatformViewsController>();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/flutterPlatformViewsController,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
 
   FlutterPlatformViewsTestMockFlutterPlatformFactory* factory =
-      [[FlutterPlatformViewsTestMockFlutterPlatformFactory new] autorelease];
+      [[FlutterPlatformViewsTestMockFlutterPlatformFactory alloc] init];
   flutterPlatformViewsController->RegisterViewFactory(
       factory, @"MockFlutterPlatformView",
       FlutterPlatformViewGestureRecognizersBlockingPolicyEager);
@@ -1934,7 +2026,7 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
     // ***** Sequence 1, finishing touch event with touchEnded ***** //
     flutterPlatformViewsController->SetFlutterViewController(mockFlutterViewContoller);
 
-    NSSet* touches1 = [[[NSSet alloc] init] autorelease];
+    NSSet* touches1 = [[NSSet alloc] init];
     id event1 = OCMClassMock([UIEvent class]);
     [forwardGectureRecognizer touchesBegan:touches1 withEvent:event1];
     OCMVerify([mockFlutterViewContoller touchesBegan:touches1 withEvent:event1]);
@@ -1942,23 +2034,23 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
     flutterPlatformViewsController->SetFlutterViewController(nil);
 
     // Allow the touch events to finish
-    NSSet* touches2 = [[[NSSet alloc] init] autorelease];
+    NSSet* touches2 = [[NSSet alloc] init];
     id event2 = OCMClassMock([UIEvent class]);
     [forwardGectureRecognizer touchesMoved:touches2 withEvent:event2];
     OCMVerify([mockFlutterViewContoller touchesMoved:touches2 withEvent:event2]);
 
-    NSSet* touches3 = [[[NSSet alloc] init] autorelease];
+    NSSet* touches3 = [[NSSet alloc] init];
     id event3 = OCMClassMock([UIEvent class]);
     [forwardGectureRecognizer touchesEnded:touches3 withEvent:event3];
     OCMVerify([mockFlutterViewContoller touchesEnded:touches3 withEvent:event3]);
 
     // Now the 2nd touch sequence should not be allowed.
-    NSSet* touches4 = [[[NSSet alloc] init] autorelease];
+    NSSet* touches4 = [[NSSet alloc] init];
     id event4 = OCMClassMock([UIEvent class]);
     [forwardGectureRecognizer touchesBegan:touches4 withEvent:event4];
     OCMReject([mockFlutterViewContoller touchesBegan:touches4 withEvent:event4]);
 
-    NSSet* touches5 = [[[NSSet alloc] init] autorelease];
+    NSSet* touches5 = [[NSSet alloc] init];
     id event5 = OCMClassMock([UIEvent class]);
     [forwardGectureRecognizer touchesEnded:touches5 withEvent:event5];
     OCMReject([mockFlutterViewContoller touchesEnded:touches5 withEvent:event5]);
@@ -1968,7 +2060,7 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
     // ***** Sequence 2, finishing touch event with touchCancelled ***** //
     flutterPlatformViewsController->SetFlutterViewController(mockFlutterViewContoller);
 
-    NSSet* touches1 = [[[NSSet alloc] init] autorelease];
+    NSSet* touches1 = [[NSSet alloc] init];
     id event1 = OCMClassMock([UIEvent class]);
     [forwardGectureRecognizer touchesBegan:touches1 withEvent:event1];
     OCMVerify([mockFlutterViewContoller touchesBegan:touches1 withEvent:event1]);
@@ -1976,23 +2068,23 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
     flutterPlatformViewsController->SetFlutterViewController(nil);
 
     // Allow the touch events to finish
-    NSSet* touches2 = [[[NSSet alloc] init] autorelease];
+    NSSet* touches2 = [[NSSet alloc] init];
     id event2 = OCMClassMock([UIEvent class]);
     [forwardGectureRecognizer touchesMoved:touches2 withEvent:event2];
     OCMVerify([mockFlutterViewContoller touchesMoved:touches2 withEvent:event2]);
 
-    NSSet* touches3 = [[[NSSet alloc] init] autorelease];
+    NSSet* touches3 = [[NSSet alloc] init];
     id event3 = OCMClassMock([UIEvent class]);
     [forwardGectureRecognizer touchesCancelled:touches3 withEvent:event3];
     OCMVerify([mockFlutterViewContoller forceTouchesCancelled:touches3]);
 
     // Now the 2nd touch sequence should not be allowed.
-    NSSet* touches4 = [[[NSSet alloc] init] autorelease];
+    NSSet* touches4 = [[NSSet alloc] init];
     id event4 = OCMClassMock([UIEvent class]);
     [forwardGectureRecognizer touchesBegan:touches4 withEvent:event4];
     OCMReject([mockFlutterViewContoller touchesBegan:touches4 withEvent:event4]);
 
-    NSSet* touches5 = [[[NSSet alloc] init] autorelease];
+    NSSet* touches5 = [[NSSet alloc] init];
     id event5 = OCMClassMock([UIEvent class]);
     [forwardGectureRecognizer touchesEnded:touches5 withEvent:event5];
     OCMReject([mockFlutterViewContoller touchesEnded:touches5 withEvent:event5]);
@@ -2013,12 +2105,16 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   auto flutterPlatformViewsController = std::make_shared<flutter::FlutterPlatformViewsController>();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/flutterPlatformViewsController,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
 
   FlutterPlatformViewsTestMockFlutterPlatformFactory* factory =
-      [[FlutterPlatformViewsTestMockFlutterPlatformFactory new] autorelease];
+      [[FlutterPlatformViewsTestMockFlutterPlatformFactory alloc] init];
   flutterPlatformViewsController->RegisterViewFactory(
       factory, @"MockFlutterPlatformView",
       FlutterPlatformViewGestureRecognizersBlockingPolicyEager);
@@ -2122,12 +2218,16 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   auto flutterPlatformViewsController = std::make_shared<flutter::FlutterPlatformViewsController>();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/flutterPlatformViewsController,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
 
   FlutterPlatformViewsTestMockFlutterPlatformFactory* factory =
-      [[FlutterPlatformViewsTestMockFlutterPlatformFactory new] autorelease];
+      [[FlutterPlatformViewsTestMockFlutterPlatformFactory alloc] init];
   flutterPlatformViewsController->RegisterViewFactory(
       factory, @"MockFlutterPlatformView",
       FlutterPlatformViewGestureRecognizersBlockingPolicyEager);
@@ -2182,12 +2282,16 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   auto flutterPlatformViewsController = std::make_shared<flutter::FlutterPlatformViewsController>();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/flutterPlatformViewsController,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
 
   FlutterPlatformViewsTestMockFlutterPlatformFactory* factory =
-      [[FlutterPlatformViewsTestMockFlutterPlatformFactory new] autorelease];
+      [[FlutterPlatformViewsTestMockFlutterPlatformFactory alloc] init];
   flutterPlatformViewsController->RegisterViewFactory(
       factory, @"MockFlutterPlatformView",
       FlutterPlatformViewGestureRecognizersBlockingPolicyEager);
@@ -2213,7 +2317,7 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   flutter::SurfaceFrame::FramebufferInfo framebuffer_info;
   auto mock_surface = std::make_unique<flutter::SurfaceFrame>(
       nullptr, framebuffer_info,
-      [](const flutter::SurfaceFrame& surface_frame, SkCanvas* canvas) { return false; },
+      [](const flutter::SurfaceFrame& surface_frame, flutter::DlCanvas* canvas) { return false; },
       /*frame_size=*/SkISize::Make(800, 600));
   XCTAssertFalse(
       flutterPlatformViewsController->SubmitFrame(nullptr, nullptr, std::move(mock_surface)));
@@ -2224,7 +2328,7 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   flutterPlatformViewsController->CompositeEmbeddedView(2);
   auto mock_surface_submit_true = std::make_unique<flutter::SurfaceFrame>(
       nullptr, framebuffer_info,
-      [](const flutter::SurfaceFrame& surface_frame, SkCanvas* canvas) { return true; },
+      [](const flutter::SurfaceFrame& surface_frame, flutter::DlCanvas* canvas) { return true; },
       /*frame_size=*/SkISize::Make(800, 600));
   XCTAssertTrue(flutterPlatformViewsController->SubmitFrame(nullptr, nullptr,
                                                             std::move(mock_surface_submit_true)));
@@ -2242,15 +2346,19 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   auto flutterPlatformViewsController = std::make_shared<flutter::FlutterPlatformViewsController>();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/flutterPlatformViewsController,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
 
-  UIView* mockFlutterView = [[[UIView alloc] initWithFrame:CGRectMake(0, 0, 500, 500)] autorelease];
+  UIView* mockFlutterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 500, 500)];
   flutterPlatformViewsController->SetFlutterView(mockFlutterView);
 
   FlutterPlatformViewsTestMockFlutterPlatformFactory* factory =
-      [[FlutterPlatformViewsTestMockFlutterPlatformFactory new] autorelease];
+      [[FlutterPlatformViewsTestMockFlutterPlatformFactory alloc] init];
   flutterPlatformViewsController->RegisterViewFactory(
       factory, @"MockFlutterPlatformView",
       FlutterPlatformViewGestureRecognizersBlockingPolicyEager);
@@ -2290,15 +2398,19 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   auto flutterPlatformViewsController = std::make_shared<flutter::FlutterPlatformViewsController>();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/flutterPlatformViewsController,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
 
-  UIView* mockFlutterView = [[[UIView alloc] initWithFrame:CGRectMake(0, 0, 500, 500)] autorelease];
+  UIView* mockFlutterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 500, 500)];
   flutterPlatformViewsController->SetFlutterView(mockFlutterView);
 
   FlutterPlatformViewsTestMockFlutterPlatformFactory* factory =
-      [[FlutterPlatformViewsTestMockFlutterPlatformFactory new] autorelease];
+      [[FlutterPlatformViewsTestMockFlutterPlatformFactory alloc] init];
   flutterPlatformViewsController->RegisterViewFactory(
       factory, @"MockFlutterPlatformView",
       FlutterPlatformViewGestureRecognizersBlockingPolicyEager);
@@ -2311,7 +2423,7 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
                          arguments:@{@"id" : @0, @"viewType" : @"MockFlutterPlatformView"}],
       result);
 
-  // First frame, |GetCurrentCanvases| is not empty after composite.
+  // First frame, |EmbeddedViewCount| is not empty after composite.
   flutterPlatformViewsController->BeginFrame(SkISize::Make(300, 300));
   flutter::MutatorsStack stack;
   SkMatrix finalMatrix;
@@ -2319,20 +2431,217 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
       std::make_unique<flutter::EmbeddedViewParams>(finalMatrix, SkSize::Make(300, 300), stack);
   flutterPlatformViewsController->PrerollCompositeEmbeddedView(0, std::move(embeddedViewParams1));
   flutterPlatformViewsController->CompositeEmbeddedView(0);
-  XCTAssertEqual(flutterPlatformViewsController->GetCurrentCanvases().size(), 1UL);
-  XCTAssertEqual(flutterPlatformViewsController->GetCurrentBuilders().size(), 1UL);
+  XCTAssertEqual(flutterPlatformViewsController->EmbeddedViewCount(), 1UL);
 
-  // Second frame, |GetCurrentCanvases| should be empty at the start
+  // Second frame, |EmbeddedViewCount| should be empty at the start
   flutterPlatformViewsController->BeginFrame(SkISize::Make(300, 300));
-  XCTAssertTrue(flutterPlatformViewsController->GetCurrentCanvases().empty());
-  XCTAssertTrue(flutterPlatformViewsController->GetCurrentBuilders().empty());
+  XCTAssertEqual(flutterPlatformViewsController->EmbeddedViewCount(), 0UL);
 
   auto embeddedViewParams2 =
       std::make_unique<flutter::EmbeddedViewParams>(finalMatrix, SkSize::Make(300, 300), stack);
   flutterPlatformViewsController->PrerollCompositeEmbeddedView(0, std::move(embeddedViewParams2));
   flutterPlatformViewsController->CompositeEmbeddedView(0);
-  XCTAssertEqual(flutterPlatformViewsController->GetCurrentCanvases().size(), 1UL);
-  XCTAssertEqual(flutterPlatformViewsController->GetCurrentBuilders().size(), 1UL);
+  XCTAssertEqual(flutterPlatformViewsController->EmbeddedViewCount(), 1UL);
+}
+
+- (void)
+    testFlutterPlatformViewControllerSubmitFrameShouldOrderSubviewsCorrectlyWithDifferentViewHierarchy {
+  flutter::FlutterPlatformViewsTestMockPlatformViewDelegate mock_delegate;
+  auto thread_task_runner = CreateNewThread("FlutterPlatformViewsTest");
+  flutter::TaskRunners runners(/*label=*/self.name.UTF8String,
+                               /*platform=*/thread_task_runner,
+                               /*raster=*/thread_task_runner,
+                               /*ui=*/thread_task_runner,
+                               /*io=*/thread_task_runner);
+  auto flutterPlatformViewsController = std::make_shared<flutter::FlutterPlatformViewsController>();
+  auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
+      /*delegate=*/mock_delegate,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
+      /*platform_views_controller=*/flutterPlatformViewsController,
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
+
+  UIView* mockFlutterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 500, 500)];
+  flutterPlatformViewsController->SetFlutterView(mockFlutterView);
+
+  FlutterPlatformViewsTestMockFlutterPlatformFactory* factory =
+      [[FlutterPlatformViewsTestMockFlutterPlatformFactory alloc] init];
+  flutterPlatformViewsController->RegisterViewFactory(
+      factory, @"MockFlutterPlatformView",
+      FlutterPlatformViewGestureRecognizersBlockingPolicyEager);
+  FlutterResult result = ^(id result) {
+  };
+  flutterPlatformViewsController->OnMethodCall(
+      [FlutterMethodCall
+          methodCallWithMethodName:@"create"
+                         arguments:@{@"id" : @0, @"viewType" : @"MockFlutterPlatformView"}],
+      result);
+  UIView* view1 = gMockPlatformView;
+
+  // This overwrites `gMockPlatformView` to another view.
+  flutterPlatformViewsController->OnMethodCall(
+      [FlutterMethodCall
+          methodCallWithMethodName:@"create"
+                         arguments:@{@"id" : @1, @"viewType" : @"MockFlutterPlatformView"}],
+      result);
+  UIView* view2 = gMockPlatformView;
+
+  flutterPlatformViewsController->BeginFrame(SkISize::Make(300, 300));
+  flutter::MutatorsStack stack;
+  SkMatrix finalMatrix;
+  auto embeddedViewParams1 =
+      std::make_unique<flutter::EmbeddedViewParams>(finalMatrix, SkSize::Make(300, 300), stack);
+  flutterPlatformViewsController->PrerollCompositeEmbeddedView(0, std::move(embeddedViewParams1));
+  flutterPlatformViewsController->CompositeEmbeddedView(0);
+  auto embeddedViewParams2 =
+      std::make_unique<flutter::EmbeddedViewParams>(finalMatrix, SkSize::Make(500, 500), stack);
+  flutterPlatformViewsController->PrerollCompositeEmbeddedView(1, std::move(embeddedViewParams2));
+  flutterPlatformViewsController->CompositeEmbeddedView(1);
+
+  // SKSurface is required if the root FlutterView is present.
+  const SkImageInfo image_info = SkImageInfo::MakeN32Premul(1000, 1000);
+  sk_sp<SkSurface> mock_sk_surface = SkSurfaces::Raster(image_info);
+  flutter::SurfaceFrame::FramebufferInfo framebuffer_info;
+  auto mock_surface = std::make_unique<flutter::SurfaceFrame>(
+      std::move(mock_sk_surface), framebuffer_info,
+      [](const flutter::SurfaceFrame& surface_frame, flutter::DlCanvas* canvas) { return true; },
+      /*frame_size=*/SkISize::Make(800, 600));
+
+  XCTAssertTrue(
+      flutterPlatformViewsController->SubmitFrame(nullptr, nullptr, std::move(mock_surface)));
+  // platform view is wrapped by touch interceptor, which itself is wrapped by clipping view.
+  UIView* clippingView1 = view1.superview.superview;
+  UIView* clippingView2 = view2.superview.superview;
+  UIView* flutterView = clippingView1.superview;
+  XCTAssertTrue([flutterView.subviews indexOfObject:clippingView1] <
+                    [flutterView.subviews indexOfObject:clippingView2],
+                @"The first clipping view should be added before the second clipping view.");
+
+  // Need to recreate these params since they are `std::move`ed.
+  flutterPlatformViewsController->BeginFrame(SkISize::Make(300, 300));
+  // Process the second frame in the opposite order.
+  embeddedViewParams2 =
+      std::make_unique<flutter::EmbeddedViewParams>(finalMatrix, SkSize::Make(500, 500), stack);
+  flutterPlatformViewsController->PrerollCompositeEmbeddedView(1, std::move(embeddedViewParams2));
+  flutterPlatformViewsController->CompositeEmbeddedView(1);
+  embeddedViewParams1 =
+      std::make_unique<flutter::EmbeddedViewParams>(finalMatrix, SkSize::Make(300, 300), stack);
+  flutterPlatformViewsController->PrerollCompositeEmbeddedView(0, std::move(embeddedViewParams1));
+  flutterPlatformViewsController->CompositeEmbeddedView(0);
+
+  mock_sk_surface = SkSurfaces::Raster(image_info);
+  mock_surface = std::make_unique<flutter::SurfaceFrame>(
+      std::move(mock_sk_surface), framebuffer_info,
+      [](const flutter::SurfaceFrame& surface_frame, flutter::DlCanvas* canvas) { return true; },
+      /*frame_size=*/SkISize::Make(800, 600));
+  XCTAssertTrue(
+      flutterPlatformViewsController->SubmitFrame(nullptr, nullptr, std::move(mock_surface)));
+  XCTAssertTrue([flutterView.subviews indexOfObject:clippingView1] >
+                    [flutterView.subviews indexOfObject:clippingView2],
+                @"The first clipping view should be added after the second clipping view.");
+}
+
+- (void)
+    testFlutterPlatformViewControllerSubmitFrameShouldOrderSubviewsCorrectlyWithSameViewHierarchy {
+  flutter::FlutterPlatformViewsTestMockPlatformViewDelegate mock_delegate;
+  auto thread_task_runner = CreateNewThread("FlutterPlatformViewsTest");
+  flutter::TaskRunners runners(/*label=*/self.name.UTF8String,
+                               /*platform=*/thread_task_runner,
+                               /*raster=*/thread_task_runner,
+                               /*ui=*/thread_task_runner,
+                               /*io=*/thread_task_runner);
+  auto flutterPlatformViewsController = std::make_shared<flutter::FlutterPlatformViewsController>();
+  auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
+      /*delegate=*/mock_delegate,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
+      /*platform_views_controller=*/flutterPlatformViewsController,
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
+
+  UIView* mockFlutterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 500, 500)];
+  flutterPlatformViewsController->SetFlutterView(mockFlutterView);
+
+  FlutterPlatformViewsTestMockFlutterPlatformFactory* factory =
+      [[FlutterPlatformViewsTestMockFlutterPlatformFactory alloc] init];
+  flutterPlatformViewsController->RegisterViewFactory(
+      factory, @"MockFlutterPlatformView",
+      FlutterPlatformViewGestureRecognizersBlockingPolicyEager);
+  FlutterResult result = ^(id result) {
+  };
+  flutterPlatformViewsController->OnMethodCall(
+      [FlutterMethodCall
+          methodCallWithMethodName:@"create"
+                         arguments:@{@"id" : @0, @"viewType" : @"MockFlutterPlatformView"}],
+      result);
+  UIView* view1 = gMockPlatformView;
+
+  // This overwrites `gMockPlatformView` to another view.
+  flutterPlatformViewsController->OnMethodCall(
+      [FlutterMethodCall
+          methodCallWithMethodName:@"create"
+                         arguments:@{@"id" : @1, @"viewType" : @"MockFlutterPlatformView"}],
+      result);
+  UIView* view2 = gMockPlatformView;
+
+  flutterPlatformViewsController->BeginFrame(SkISize::Make(300, 300));
+  flutter::MutatorsStack stack;
+  SkMatrix finalMatrix;
+  auto embeddedViewParams1 =
+      std::make_unique<flutter::EmbeddedViewParams>(finalMatrix, SkSize::Make(300, 300), stack);
+  flutterPlatformViewsController->PrerollCompositeEmbeddedView(0, std::move(embeddedViewParams1));
+  flutterPlatformViewsController->CompositeEmbeddedView(0);
+  auto embeddedViewParams2 =
+      std::make_unique<flutter::EmbeddedViewParams>(finalMatrix, SkSize::Make(500, 500), stack);
+  flutterPlatformViewsController->PrerollCompositeEmbeddedView(1, std::move(embeddedViewParams2));
+  flutterPlatformViewsController->CompositeEmbeddedView(1);
+
+  // SKSurface is required if the root FlutterView is present.
+  const SkImageInfo image_info = SkImageInfo::MakeN32Premul(1000, 1000);
+  sk_sp<SkSurface> mock_sk_surface = SkSurfaces::Raster(image_info);
+  flutter::SurfaceFrame::FramebufferInfo framebuffer_info;
+  auto mock_surface = std::make_unique<flutter::SurfaceFrame>(
+      std::move(mock_sk_surface), framebuffer_info,
+      [](const flutter::SurfaceFrame& surface_frame, flutter::DlCanvas* canvas) { return true; },
+      /*frame_size=*/SkISize::Make(800, 600));
+
+  XCTAssertTrue(
+      flutterPlatformViewsController->SubmitFrame(nullptr, nullptr, std::move(mock_surface)));
+  // platform view is wrapped by touch interceptor, which itself is wrapped by clipping view.
+  UIView* clippingView1 = view1.superview.superview;
+  UIView* clippingView2 = view2.superview.superview;
+  UIView* flutterView = clippingView1.superview;
+  XCTAssertTrue([flutterView.subviews indexOfObject:clippingView1] <
+                    [flutterView.subviews indexOfObject:clippingView2],
+                @"The first clipping view should be added before the second clipping view.");
+
+  // Need to recreate these params since they are `std::move`ed.
+  flutterPlatformViewsController->BeginFrame(SkISize::Make(300, 300));
+  // Process the second frame in the same order.
+  embeddedViewParams1 =
+      std::make_unique<flutter::EmbeddedViewParams>(finalMatrix, SkSize::Make(300, 300), stack);
+  flutterPlatformViewsController->PrerollCompositeEmbeddedView(0, std::move(embeddedViewParams1));
+  flutterPlatformViewsController->CompositeEmbeddedView(0);
+  embeddedViewParams2 =
+      std::make_unique<flutter::EmbeddedViewParams>(finalMatrix, SkSize::Make(500, 500), stack);
+  flutterPlatformViewsController->PrerollCompositeEmbeddedView(1, std::move(embeddedViewParams2));
+  flutterPlatformViewsController->CompositeEmbeddedView(1);
+
+  mock_sk_surface = SkSurfaces::Raster(image_info);
+  mock_surface = std::make_unique<flutter::SurfaceFrame>(
+      std::move(mock_sk_surface), framebuffer_info,
+      [](const flutter::SurfaceFrame& surface_frame, flutter::DlCanvas* canvas) { return true; },
+      /*frame_size=*/SkISize::Make(800, 600));
+  XCTAssertTrue(
+      flutterPlatformViewsController->SubmitFrame(nullptr, nullptr, std::move(mock_surface)));
+  XCTAssertTrue([flutterView.subviews indexOfObject:clippingView1] <
+                    [flutterView.subviews indexOfObject:clippingView2],
+                @"The first clipping view should be added before the second clipping view.");
 }
 
 - (void)testThreadMergeAtEndFrame {
@@ -2347,15 +2656,19 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   auto flutterPlatformViewsController = std::make_shared<flutter::FlutterPlatformViewsController>();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/flutterPlatformViewsController,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
 
-  UIView* mockFlutterView = [[[UIView alloc] initWithFrame:CGRectMake(0, 0, 500, 500)] autorelease];
+  UIView* mockFlutterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 500, 500)];
   flutterPlatformViewsController->SetFlutterView(mockFlutterView);
 
   FlutterPlatformViewsTestMockFlutterPlatformFactory* factory =
-      [[FlutterPlatformViewsTestMockFlutterPlatformFactory new] autorelease];
+      [[FlutterPlatformViewsTestMockFlutterPlatformFactory alloc] init];
   flutterPlatformViewsController->RegisterViewFactory(
       factory, @"MockFlutterPlatformView",
       FlutterPlatformViewGestureRecognizersBlockingPolicyEager);
@@ -2392,8 +2705,8 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
 
   // Unmerge threads before the end of the test
   // TaskRunners are required to be unmerged before destruction.
-  while (raster_thread_merger->DecrementLease() != fml::RasterThreadStatus::kUnmergedNow)
-    ;
+  while (raster_thread_merger->DecrementLease() != fml::RasterThreadStatus::kUnmergedNow) {
+  }
 }
 
 - (int)alphaOfPoint:(CGPoint)point onView:(UIView*)view {
@@ -2445,6 +2758,202 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   XCTAssertFalse(view.flt_hasFirstResponderInViewHierarchySubtree);
 }
 
+- (void)testFlutterClippingMaskViewPoolReuseViewsAfterRecycle {
+  FlutterClippingMaskViewPool* pool = [[FlutterClippingMaskViewPool alloc] initWithCapacity:2];
+  FlutterClippingMaskView* view1 = [pool getMaskViewWithFrame:CGRectZero];
+  FlutterClippingMaskView* view2 = [pool getMaskViewWithFrame:CGRectZero];
+  [pool insertViewToPoolIfNeeded:view1];
+  [pool insertViewToPoolIfNeeded:view2];
+  CGRect newRect = CGRectMake(0, 0, 10, 10);
+  FlutterClippingMaskView* view3 = [pool getMaskViewWithFrame:newRect];
+  FlutterClippingMaskView* view4 = [pool getMaskViewWithFrame:newRect];
+  // view3 and view4 should randomly get either of view1 and view2.
+  NSSet* set1 = [NSSet setWithObjects:view1, view2, nil];
+  NSSet* set2 = [NSSet setWithObjects:view3, view4, nil];
+  XCTAssertEqualObjects(set1, set2);
+  XCTAssertTrue(CGRectEqualToRect(view3.frame, newRect));
+  XCTAssertTrue(CGRectEqualToRect(view4.frame, newRect));
+}
+
+- (void)testFlutterClippingMaskViewPoolAllocsNewMaskViewsAfterReachingCapacity {
+  FlutterClippingMaskViewPool* pool = [[FlutterClippingMaskViewPool alloc] initWithCapacity:2];
+  FlutterClippingMaskView* view1 = [pool getMaskViewWithFrame:CGRectZero];
+  FlutterClippingMaskView* view2 = [pool getMaskViewWithFrame:CGRectZero];
+  FlutterClippingMaskView* view3 = [pool getMaskViewWithFrame:CGRectZero];
+  XCTAssertNotEqual(view1, view3);
+  XCTAssertNotEqual(view2, view3);
+}
+
+- (void)testMaskViewsReleasedWhenPoolIsReleased {
+  __weak UIView* weakView;
+  @autoreleasepool {
+    FlutterClippingMaskViewPool* pool = [[FlutterClippingMaskViewPool alloc] initWithCapacity:2];
+    FlutterClippingMaskView* view = [pool getMaskViewWithFrame:CGRectZero];
+    weakView = view;
+    XCTAssertNotNil(weakView);
+  }
+  XCTAssertNil(weakView);
+}
+
+- (void)testClipMaskViewIsReused {
+  flutter::FlutterPlatformViewsTestMockPlatformViewDelegate mock_delegate;
+  auto thread_task_runner = CreateNewThread("FlutterPlatformViewsTest");
+  flutter::TaskRunners runners(/*label=*/self.name.UTF8String,
+                               /*platform=*/thread_task_runner,
+                               /*raster=*/thread_task_runner,
+                               /*ui=*/thread_task_runner,
+                               /*io=*/thread_task_runner);
+  auto flutterPlatformViewsController = std::make_shared<flutter::FlutterPlatformViewsController>();
+  auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
+      /*delegate=*/mock_delegate,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
+      /*platform_views_controller=*/flutterPlatformViewsController,
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
+
+  FlutterPlatformViewsTestMockFlutterPlatformFactory* factory =
+      [[FlutterPlatformViewsTestMockFlutterPlatformFactory alloc] init];
+  flutterPlatformViewsController->RegisterViewFactory(
+      factory, @"MockFlutterPlatformView",
+      FlutterPlatformViewGestureRecognizersBlockingPolicyEager);
+  FlutterResult result = ^(id result) {
+  };
+  flutterPlatformViewsController->OnMethodCall(
+      [FlutterMethodCall
+          methodCallWithMethodName:@"create"
+                         arguments:@{@"id" : @1, @"viewType" : @"MockFlutterPlatformView"}],
+      result);
+
+  XCTAssertNotNil(gMockPlatformView);
+  UIView* mockFlutterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 10, 10)];
+  flutterPlatformViewsController->SetFlutterView(mockFlutterView);
+  // Create embedded view params
+  flutter::MutatorsStack stack1;
+  // Layer tree always pushes a screen scale factor to the stack
+  SkMatrix screenScaleMatrix =
+      SkMatrix::Scale([UIScreen mainScreen].scale, [UIScreen mainScreen].scale);
+  stack1.PushTransform(screenScaleMatrix);
+  // Push a clip rect
+  SkRect rect = SkRect::MakeXYWH(2, 2, 3, 3);
+  stack1.PushClipRect(rect);
+
+  auto embeddedViewParams1 = std::make_unique<flutter::EmbeddedViewParams>(
+      screenScaleMatrix, SkSize::Make(10, 10), stack1);
+
+  flutterPlatformViewsController->PrerollCompositeEmbeddedView(1, std::move(embeddedViewParams1));
+  flutterPlatformViewsController->CompositeEmbeddedView(1);
+  UIView* childClippingView1 = gMockPlatformView.superview.superview;
+  UIView* maskView1 = childClippingView1.maskView;
+  XCTAssertNotNil(maskView1);
+
+  // Composite a new frame.
+  flutterPlatformViewsController->BeginFrame(SkISize::Make(100, 100));
+  flutter::MutatorsStack stack2;
+  auto embeddedViewParams2 = std::make_unique<flutter::EmbeddedViewParams>(
+      screenScaleMatrix, SkSize::Make(10, 10), stack2);
+  auto embeddedViewParams3 = std::make_unique<flutter::EmbeddedViewParams>(
+      screenScaleMatrix, SkSize::Make(10, 10), stack2);
+  flutterPlatformViewsController->PrerollCompositeEmbeddedView(1, std::move(embeddedViewParams3));
+  flutterPlatformViewsController->CompositeEmbeddedView(1);
+  childClippingView1 = gMockPlatformView.superview.superview;
+
+  // This overrides gMockPlatformView to point to the newly created platform view.
+  flutterPlatformViewsController->OnMethodCall(
+      [FlutterMethodCall
+          methodCallWithMethodName:@"create"
+                         arguments:@{@"id" : @2, @"viewType" : @"MockFlutterPlatformView"}],
+      result);
+
+  auto embeddedViewParams4 = std::make_unique<flutter::EmbeddedViewParams>(
+      screenScaleMatrix, SkSize::Make(10, 10), stack1);
+  flutterPlatformViewsController->PrerollCompositeEmbeddedView(2, std::move(embeddedViewParams4));
+  flutterPlatformViewsController->CompositeEmbeddedView(2);
+  UIView* childClippingView2 = gMockPlatformView.superview.superview;
+
+  UIView* maskView2 = childClippingView2.maskView;
+  XCTAssertEqual(maskView1, maskView2);
+  XCTAssertNotNil(childClippingView2.maskView);
+  XCTAssertNil(childClippingView1.maskView);
+}
+
+- (void)testDifferentClipMaskViewIsUsedForEachView {
+  flutter::FlutterPlatformViewsTestMockPlatformViewDelegate mock_delegate;
+  auto thread_task_runner = CreateNewThread("FlutterPlatformViewsTest");
+  flutter::TaskRunners runners(/*label=*/self.name.UTF8String,
+                               /*platform=*/thread_task_runner,
+                               /*raster=*/thread_task_runner,
+                               /*ui=*/thread_task_runner,
+                               /*io=*/thread_task_runner);
+  auto flutterPlatformViewsController = std::make_shared<flutter::FlutterPlatformViewsController>();
+  auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
+      /*delegate=*/mock_delegate,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
+      /*platform_views_controller=*/flutterPlatformViewsController,
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
+
+  FlutterPlatformViewsTestMockFlutterPlatformFactory* factory =
+      [[FlutterPlatformViewsTestMockFlutterPlatformFactory alloc] init];
+  flutterPlatformViewsController->RegisterViewFactory(
+      factory, @"MockFlutterPlatformView",
+      FlutterPlatformViewGestureRecognizersBlockingPolicyEager);
+  FlutterResult result = ^(id result) {
+  };
+
+  flutterPlatformViewsController->OnMethodCall(
+      [FlutterMethodCall
+          methodCallWithMethodName:@"create"
+                         arguments:@{@"id" : @1, @"viewType" : @"MockFlutterPlatformView"}],
+      result);
+  UIView* view1 = gMockPlatformView;
+
+  // This overwrites `gMockPlatformView` to another view.
+  flutterPlatformViewsController->OnMethodCall(
+      [FlutterMethodCall
+          methodCallWithMethodName:@"create"
+                         arguments:@{@"id" : @2, @"viewType" : @"MockFlutterPlatformView"}],
+      result);
+  UIView* view2 = gMockPlatformView;
+
+  XCTAssertNotNil(gMockPlatformView);
+  UIView* mockFlutterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 10, 10)];
+  flutterPlatformViewsController->SetFlutterView(mockFlutterView);
+  // Create embedded view params
+  flutter::MutatorsStack stack1;
+  // Layer tree always pushes a screen scale factor to the stack
+  SkMatrix screenScaleMatrix =
+      SkMatrix::Scale([UIScreen mainScreen].scale, [UIScreen mainScreen].scale);
+  stack1.PushTransform(screenScaleMatrix);
+  // Push a clip rect
+  SkRect rect = SkRect::MakeXYWH(2, 2, 3, 3);
+  stack1.PushClipRect(rect);
+
+  auto embeddedViewParams1 = std::make_unique<flutter::EmbeddedViewParams>(
+      screenScaleMatrix, SkSize::Make(10, 10), stack1);
+
+  flutter::MutatorsStack stack2;
+  stack2.PushClipRect(rect);
+  auto embeddedViewParams2 = std::make_unique<flutter::EmbeddedViewParams>(
+      screenScaleMatrix, SkSize::Make(10, 10), stack2);
+
+  flutterPlatformViewsController->PrerollCompositeEmbeddedView(1, std::move(embeddedViewParams1));
+  flutterPlatformViewsController->CompositeEmbeddedView(1);
+  UIView* childClippingView1 = view1.superview.superview;
+
+  flutterPlatformViewsController->PrerollCompositeEmbeddedView(2, std::move(embeddedViewParams2));
+  flutterPlatformViewsController->CompositeEmbeddedView(2);
+  UIView* childClippingView2 = view2.superview.superview;
+  UIView* maskView1 = childClippingView1.maskView;
+  UIView* maskView2 = childClippingView2.maskView;
+  XCTAssertNotEqual(maskView1, maskView2);
+}
+
 // Return true if a correct visual effect view is found. It also implies all the validation in this
 // method passes.
 //
@@ -2455,7 +2964,7 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
                         inputRadius:(CGFloat)inputRadius {
   XCTAssertTrue(CGRectEqualToRect(visualEffectView.frame, frame));
   for (UIView* view in visualEffectView.subviews) {
-    if (![view isKindOfClass:NSClassFromString(@"_UIVisualEffectBackdropView")]) {
+    if (![NSStringFromClass([view class]) hasSuffix:@"BackdropView"]) {
       continue;
     }
     XCTAssertEqual(view.layer.filters.count, 1u);
@@ -2472,4 +2981,191 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   return NO;
 }
 
+- (void)testDisposingViewInCompositionOrderDoNotCrash {
+  flutter::FlutterPlatformViewsTestMockPlatformViewDelegate mock_delegate;
+  auto thread_task_runner = CreateNewThread("FlutterPlatformViewsTest");
+  flutter::TaskRunners runners(/*label=*/self.name.UTF8String,
+                               /*platform=*/thread_task_runner,
+                               /*raster=*/thread_task_runner,
+                               /*ui=*/thread_task_runner,
+                               /*io=*/thread_task_runner);
+  auto flutterPlatformViewsController = std::make_shared<flutter::FlutterPlatformViewsController>();
+  auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
+      /*delegate=*/mock_delegate,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
+      /*platform_views_controller=*/flutterPlatformViewsController,
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
+
+  UIView* mockFlutterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 500, 500)];
+  flutterPlatformViewsController->SetFlutterView(mockFlutterView);
+
+  FlutterPlatformViewsTestMockFlutterPlatformFactory* factory =
+      [[FlutterPlatformViewsTestMockFlutterPlatformFactory alloc] init];
+  flutterPlatformViewsController->RegisterViewFactory(
+      factory, @"MockFlutterPlatformView",
+      FlutterPlatformViewGestureRecognizersBlockingPolicyEager);
+  FlutterResult result = ^(id result) {
+  };
+
+  flutterPlatformViewsController->OnMethodCall(
+      [FlutterMethodCall
+          methodCallWithMethodName:@"create"
+                         arguments:@{@"id" : @0, @"viewType" : @"MockFlutterPlatformView"}],
+      result);
+  flutterPlatformViewsController->OnMethodCall(
+      [FlutterMethodCall
+          methodCallWithMethodName:@"create"
+                         arguments:@{@"id" : @1, @"viewType" : @"MockFlutterPlatformView"}],
+      result);
+
+  {
+    // **** First frame, view id 0, 1 in the composition_order_, disposing view 0 is called. **** //
+    // No view should be disposed, or removed from the composition order.
+    flutterPlatformViewsController->BeginFrame(SkISize::Make(300, 300));
+    flutter::MutatorsStack stack;
+    SkMatrix finalMatrix;
+    auto embeddedViewParams0 =
+        std::make_unique<flutter::EmbeddedViewParams>(finalMatrix, SkSize::Make(300, 300), stack);
+    flutterPlatformViewsController->PrerollCompositeEmbeddedView(0, std::move(embeddedViewParams0));
+    flutterPlatformViewsController->CompositeEmbeddedView(0);
+
+    auto embeddedViewParams1 =
+        std::make_unique<flutter::EmbeddedViewParams>(finalMatrix, SkSize::Make(300, 300), stack);
+    flutterPlatformViewsController->PrerollCompositeEmbeddedView(1, std::move(embeddedViewParams1));
+    flutterPlatformViewsController->CompositeEmbeddedView(1);
+    XCTAssertEqual(flutterPlatformViewsController->EmbeddedViewCount(), 2UL);
+
+    XCTestExpectation* expectation = [self expectationWithDescription:@"dispose call ended."];
+    FlutterResult disposeResult = ^(id result) {
+      [expectation fulfill];
+    };
+
+    flutterPlatformViewsController->OnMethodCall(
+        [FlutterMethodCall methodCallWithMethodName:@"dispose" arguments:@0], disposeResult);
+    [self waitForExpectationsWithTimeout:30 handler:nil];
+
+    const SkImageInfo image_info = SkImageInfo::MakeN32Premul(1000, 1000);
+    sk_sp<SkSurface> mock_sk_surface = SkSurfaces::Raster(image_info);
+    flutter::SurfaceFrame::FramebufferInfo framebuffer_info;
+    auto mock_surface = std::make_unique<flutter::SurfaceFrame>(
+        std::move(mock_sk_surface), framebuffer_info,
+        [](const flutter::SurfaceFrame& surface_frame, flutter::DlCanvas* canvas) { return true; },
+        /*frame_size=*/SkISize::Make(800, 600));
+    XCTAssertTrue(
+        flutterPlatformViewsController->SubmitFrame(nullptr, nullptr, std::move(mock_surface)));
+
+    // Disposing won't remove embedded views until the view is removed from the composition_order_
+    XCTAssertEqual(flutterPlatformViewsController->EmbeddedViewCount(), 2UL);
+    XCTAssertNotNil(flutterPlatformViewsController->GetPlatformViewByID(0));
+    XCTAssertNotNil(flutterPlatformViewsController->GetPlatformViewByID(1));
+  }
+
+  {
+    // **** Second frame, view id 1 in the composition_order_, no disposing view is called,  **** //
+    // View 0 is removed from the composition order in this frame, hence also disposed.
+    flutterPlatformViewsController->BeginFrame(SkISize::Make(300, 300));
+    flutter::MutatorsStack stack;
+    SkMatrix finalMatrix;
+    auto embeddedViewParams1 =
+        std::make_unique<flutter::EmbeddedViewParams>(finalMatrix, SkSize::Make(300, 300), stack);
+    flutterPlatformViewsController->PrerollCompositeEmbeddedView(1, std::move(embeddedViewParams1));
+    flutterPlatformViewsController->CompositeEmbeddedView(1);
+
+    const SkImageInfo image_info = SkImageInfo::MakeN32Premul(1000, 1000);
+    sk_sp<SkSurface> mock_sk_surface = SkSurfaces::Raster(image_info);
+    flutter::SurfaceFrame::FramebufferInfo framebuffer_info;
+    auto mock_surface = std::make_unique<flutter::SurfaceFrame>(
+        std::move(mock_sk_surface), framebuffer_info,
+        [](const flutter::SurfaceFrame& surface_frame, flutter::DlCanvas* canvas) { return true; },
+        /*frame_size=*/SkISize::Make(800, 600));
+    XCTAssertTrue(
+        flutterPlatformViewsController->SubmitFrame(nullptr, nullptr, std::move(mock_surface)));
+
+    // Disposing won't remove embedded views until the view is removed from the composition_order_
+    XCTAssertEqual(flutterPlatformViewsController->EmbeddedViewCount(), 1UL);
+    XCTAssertNil(flutterPlatformViewsController->GetPlatformViewByID(0));
+    XCTAssertNotNil(flutterPlatformViewsController->GetPlatformViewByID(1));
+  }
+}
+- (void)testOnlyPlatformViewsAreRemovedWhenReset {
+  flutter::FlutterPlatformViewsTestMockPlatformViewDelegate mock_delegate;
+  auto thread_task_runner = CreateNewThread("FlutterPlatformViewsTest");
+  flutter::TaskRunners runners(/*label=*/self.name.UTF8String,
+                               /*platform=*/thread_task_runner,
+                               /*raster=*/thread_task_runner,
+                               /*ui=*/thread_task_runner,
+                               /*io=*/thread_task_runner);
+  auto flutterPlatformViewsController = std::make_shared<flutter::FlutterPlatformViewsController>();
+  auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
+      /*delegate=*/mock_delegate,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
+      /*platform_views_controller=*/flutterPlatformViewsController,
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_jsync_switch=*/std::make_shared<fml::SyncSwitch>());
+
+  FlutterPlatformViewsTestMockFlutterPlatformFactory* factory =
+      [[FlutterPlatformViewsTestMockFlutterPlatformFactory alloc] init];
+  flutterPlatformViewsController->RegisterViewFactory(
+      factory, @"MockFlutterPlatformView",
+      FlutterPlatformViewGestureRecognizersBlockingPolicyEager);
+  FlutterResult result = ^(id result) {
+  };
+  flutterPlatformViewsController->OnMethodCall(
+      [FlutterMethodCall
+          methodCallWithMethodName:@"create"
+                         arguments:@{@"id" : @2, @"viewType" : @"MockFlutterPlatformView"}],
+      result);
+  UIView* mockFlutterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 500, 500)];
+  flutterPlatformViewsController->SetFlutterView(mockFlutterView);
+  // Create embedded view params
+  flutter::MutatorsStack stack;
+  // Layer tree always pushes a screen scale factor to the stack
+  SkMatrix screenScaleMatrix =
+      SkMatrix::Scale([UIScreen mainScreen].scale, [UIScreen mainScreen].scale);
+  stack.PushTransform(screenScaleMatrix);
+  // Push a translate matrix
+  SkMatrix translateMatrix = SkMatrix::Translate(100, 100);
+  stack.PushTransform(translateMatrix);
+  SkMatrix finalMatrix;
+  finalMatrix.setConcat(screenScaleMatrix, translateMatrix);
+
+  auto embeddedViewParams =
+      std::make_unique<flutter::EmbeddedViewParams>(finalMatrix, SkSize::Make(300, 300), stack);
+
+  flutterPlatformViewsController->PrerollCompositeEmbeddedView(2, std::move(embeddedViewParams));
+  flutterPlatformViewsController->CompositeEmbeddedView(2);
+
+  // SKSurface is required if the root FlutterView is present.
+  const SkImageInfo image_info = SkImageInfo::MakeN32Premul(1000, 1000);
+  sk_sp<SkSurface> mock_sk_surface = SkSurfaces::Raster(image_info);
+  flutter::SurfaceFrame::FramebufferInfo framebuffer_info;
+  auto mock_surface = std::make_unique<flutter::SurfaceFrame>(
+      std::move(mock_sk_surface), framebuffer_info,
+      [](const flutter::SurfaceFrame& surface_frame, flutter::DlCanvas* canvas) { return true; },
+      /*frame_size=*/SkISize::Make(800, 600));
+
+  flutterPlatformViewsController->SubmitFrame(nullptr, nullptr, std::move(mock_surface));
+
+  UIView* someView = [[UIView alloc] init];
+  [mockFlutterView addSubview:someView];
+
+  flutterPlatformViewsController->Reset();
+  XCTAssertEqual(mockFlutterView.subviews.count, 1u);
+  XCTAssertEqual(mockFlutterView.subviews.firstObject, someView);
+}
+
+- (void)testFlutterTouchInterceptingViewLinksToAccessibilityContainer {
+  FlutterTouchInterceptingView* touchInteceptorView = [[FlutterTouchInterceptingView alloc] init];
+  NSObject* container = [[NSObject alloc] init];
+  [touchInteceptorView setFlutterAccessibilityContainer:container];
+  XCTAssertEqualObjects([touchInteceptorView accessibilityContainer], container);
+}
+
 @end
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h
index 7ec51e3b8ffcf6edc34ad529a06bb6172f57effa..6dba0efd89365090e6d055d71b683d0a1bcaad80 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h
+++ b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h
@@ -5,16 +5,16 @@
 #ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERPLATFORMVIEWS_INTERNAL_H_
 #define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERPLATFORMVIEWS_INTERNAL_H_
 
+#include <Metal/Metal.h>
 #include "flutter/flow/embedded_views.h"
-#include "flutter/flow/rtree.h"
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
 #include "flutter/shell/common/shell.h"
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h"
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h"
 #import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterPlatformViews.h"
 #import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterPlugin.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/SemanticsObject.h"
 #import "flutter/shell/platform/darwin/ios/ios_context.h"
-#include "third_party/skia/include/core/SkPictureRecorder.h"
 
 @class FlutterTouchInterceptingView;
 
@@ -30,6 +30,8 @@
 
 - (instancetype)initWithFrame:(CGRect)frame screenScale:(CGFloat)screenScale;
 
+- (void)reset;
+
 // Adds a clip rect operation to the queue.
 //
 // The `clipSkRect` is transformed with the `matrix` before adding to the queue.
@@ -47,6 +49,28 @@
 
 @end
 
+// A pool that provides |FlutterClippingMaskView|s.
+//
+// The pool has a capacity that can be set in the initializer.
+// When requesting a FlutterClippingMaskView, the pool will first try to reuse an available maskView
+// in the pool. If there are none available, a new FlutterClippingMaskView is constructed. If the
+// capacity is reached, the newly constructed FlutterClippingMaskView is not added to the pool.
+//
+// Call |insertViewToPoolIfNeeded:| to return a maskView to the pool.
+@interface FlutterClippingMaskViewPool : NSObject
+
+// Initialize the pool with `capacity`. When the `capacity` is reached, a FlutterClippingMaskView is
+// constructed when requested, and it is not added to the pool.
+- (instancetype)initWithCapacity:(NSInteger)capacity;
+
+// Reuse a maskView from the pool, or allocate a new one.
+- (FlutterClippingMaskView*)getMaskViewWithFrame:(CGRect)frame;
+
+// Insert the `maskView` into the pool.
+- (void)insertViewToPoolIfNeeded:(FlutterClippingMaskView*)maskView;
+
+@end
+
 // An object represents a blur filter.
 //
 // This object produces a `backdropFilterView`.
@@ -96,6 +120,8 @@
 // filters.
 - (void)applyBlurBackdropFilters:(NSArray<PlatformViewFilter*>*)filters;
 
+// For testing only.
+- (NSMutableArray*)backdropFilterSubviews;
 @end
 
 namespace flutter {
@@ -144,9 +170,9 @@ class FlutterPlatformViewLayerPool {
 
   // Gets a layer from the pool if available, or allocates a new one.
   // Finally, it marks the layer as used. That is, it increments `available_layer_index_`.
-  std::shared_ptr<FlutterPlatformViewLayer> GetLayer(
-      GrDirectContext* gr_context,
-      const std::shared_ptr<IOSContext>& ios_context);
+  std::shared_ptr<FlutterPlatformViewLayer> GetLayer(GrDirectContext* gr_context,
+                                                     const std::shared_ptr<IOSContext>& ios_context,
+                                                     MTLPixelFormat pixel_format);
 
   // Gets the layers in the pool that aren't currently used.
   // This method doesn't mark the layers as unused.
@@ -200,15 +226,24 @@ class FlutterPlatformViewsController {
   // Also reverts the composition_order_ to its original state at the beginning of the frame.
   void CancelFrame();
 
-  void PrerollCompositeEmbeddedView(int view_id,
+  void PrerollCompositeEmbeddedView(int64_t view_id,
                                     std::unique_ptr<flutter::EmbeddedViewParams> params);
 
+  size_t EmbeddedViewCount();
+
   // Returns the `FlutterPlatformView`'s `view` object associated with the view_id.
   //
   // If the `FlutterPlatformViewsController` does not contain any `FlutterPlatformView` object or
-  // a `FlutterPlatformView` object asscociated with the view_id cannot be found, the method
+  // a `FlutterPlatformView` object associated with the view_id cannot be found, the method
   // returns nil.
-  UIView* GetPlatformViewByID(int view_id);
+  UIView* GetPlatformViewByID(int64_t view_id);
+
+  // Returns the `FlutterTouchInterceptingView` with the view_id.
+  //
+  // If the `FlutterPlatformViewsController` does not contain any `FlutterPlatformView` object or
+  // a `FlutterPlatformView` object associated with the view_id cannot be found, the method
+  // returns nil.
+  FlutterTouchInterceptingView* GetFlutterTouchInterceptingViewByID(int64_t view_id);
 
   PostPrerollResult PostPrerollAction(
       const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger);
@@ -216,15 +251,11 @@ class FlutterPlatformViewsController {
   void EndFrame(bool should_resubmit_frame,
                 const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger);
 
-  std::vector<SkCanvas*> GetCurrentCanvases();
-
-  std::vector<DisplayListBuilder*> GetCurrentBuilders();
-
-  EmbedderPaintContext CompositeEmbeddedView(int view_id);
+  DlCanvas* CompositeEmbeddedView(int64_t view_id);
 
   // The rect of the platform view at index view_id. This rect has been translated into the
   // host view coordinate system. Units are device screen pixels.
-  SkRect GetPlatformViewRect(int view_id);
+  SkRect GetPlatformViewRect(int64_t view_id);
 
   // Discards all platform views instances and auxiliary resources.
   void Reset();
@@ -233,7 +264,7 @@ class FlutterPlatformViewsController {
                    const std::shared_ptr<IOSContext>& ios_context,
                    std::unique_ptr<SurfaceFrame> frame);
 
-  void OnMethodCall(FlutterMethodCall* call, FlutterResult& result);
+  void OnMethodCall(FlutterMethodCall* call, FlutterResult result);
 
   // Returns the platform view id if the platform view (or any of its descendant view) is the first
   // responder. Returns -1 if no such platform view is found.
@@ -251,10 +282,10 @@ class FlutterPlatformViewsController {
 
   using LayersMap = std::map<int64_t, std::vector<std::shared_ptr<FlutterPlatformViewLayer>>>;
 
-  void OnCreate(FlutterMethodCall* call, FlutterResult& result);
-  void OnDispose(FlutterMethodCall* call, FlutterResult& result);
-  void OnAcceptGesture(FlutterMethodCall* call, FlutterResult& result);
-  void OnRejectGesture(FlutterMethodCall* call, FlutterResult& result);
+  void OnCreate(FlutterMethodCall* call, FlutterResult result);
+  void OnDispose(FlutterMethodCall* call, FlutterResult result);
+  void OnAcceptGesture(FlutterMethodCall* call, FlutterResult result);
+  void OnRejectGesture(FlutterMethodCall* call, FlutterResult result);
   // Dispose the views in `views_to_dispose_`.
   void DisposeViews();
 
@@ -268,20 +299,13 @@ class FlutterPlatformViewsController {
   // Traverse the `mutators_stack` and return the number of clip operations.
   int CountClips(const MutatorsStack& mutators_stack);
 
+  void ClipViewSetMaskView(UIView* clipView);
+
   // Applies the mutators in the mutators_stack to the UIView chain that was constructed by
   // `ReconstructClipViewsChain`
   //
-  // Clips are applied to the super view with a CALayer mask. Transforms are applied to the
-  // current view that's at the head of the chain. For example the following mutators stack [T_1,
-  // C_2, T_3, T_4, C_5, T_6] where T denotes a transform and C denotes a clip, will result in the
-  // following UIView tree:
-  //
-  // C_2 -> C_5 -> PLATFORM_VIEW
-  // (PLATFORM_VIEW is a subview of C_5 which is a subview of C_2)
-  //
-  // T_1 is applied to C_2, T_3 and T_4 are applied to C_5, and T_6 is applied to PLATFORM_VIEW.
-  //
-  // After each clip operation, we update the head to the super view of the current head.
+  // Clips are applied to the `embedded_view`'s super view(|ChildClippingView|) using a
+  // |FlutterClippingMaskView|. Transforms are applied to `embedded_view`
   //
   // The `bounding_rect` is the final bounding rect of the PlatformView
   // (EmbeddedViewParams::finalBoundingRect). If a clip mutator's rect contains the final bounding
@@ -289,16 +313,18 @@ class FlutterPlatformViewsController {
   void ApplyMutators(const MutatorsStack& mutators_stack,
                      UIView* embedded_view,
                      const SkRect& bounding_rect);
-  void CompositeWithParams(int view_id, const EmbeddedViewParams& params);
+
+  void CompositeWithParams(int64_t view_id, const EmbeddedViewParams& params);
 
   // Allocates a new FlutterPlatformViewLayer if needed, draws the pixels within the rect from
   // the picture on the layer's canvas.
   std::shared_ptr<FlutterPlatformViewLayer> GetLayer(GrDirectContext* gr_context,
                                                      const std::shared_ptr<IOSContext>& ios_context,
                                                      EmbedderViewSlice* slice,
-                                                     SkRect rect,
+                                                     SkIRect rect,
                                                      int64_t view_id,
-                                                     int64_t overlay_id);
+                                                     int64_t overlay_id,
+                                                     MTLPixelFormat pixel_format);
   // Removes overlay views and platform views that aren't needed in the current frame.
   // Must run on the platform thread.
   void RemoveUnusedLayers();
@@ -328,6 +354,7 @@ class FlutterPlatformViewsController {
   fml::scoped_nsobject<FlutterMethodChannel> channel_;
   fml::scoped_nsobject<UIView> flutter_view_;
   fml::scoped_nsobject<UIViewController> flutter_view_controller_;
+  fml::scoped_nsobject<FlutterClippingMaskViewPool> mask_view_pool_;
   std::map<std::string, fml::scoped_nsobject<NSObject<FlutterPlatformViewFactory>>> factories_;
   std::map<int64_t, fml::scoped_nsobject<NSObject<FlutterPlatformView>>> views_;
   std::map<int64_t, fml::scoped_nsobject<FlutterTouchInterceptingView>> touch_interceptors_;
@@ -370,7 +397,7 @@ class FlutterPlatformViewsController {
 
   // The FlutterPlatformViewGestureRecognizersBlockingPolicy for each type of platform view.
   std::map<std::string, FlutterPlatformViewGestureRecognizersBlockingPolicy>
-      gesture_recognizers_blocking_policies;
+      gesture_recognizers_blocking_policies_;
 
   bool catransaction_added_ = false;
 
@@ -409,6 +436,9 @@ class FlutterPlatformViewsController {
 
 // Get embedded view
 - (UIView*)embeddedView;
+
+// Sets flutterAccessibilityContainer as this view's accessibilityContainer.
+- (void)setFlutterAccessibilityContainer:(NSObject*)flutterAccessibilityContainer;
 @end
 
 @interface UIView (FirstResponder)
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.mm b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.mm
index da7f156bafe952c4b8b746480d6f2fa8079edbdc..2aa13f5ae09f5e2da12810aa4420e07e203f0a07 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.mm
@@ -4,11 +4,12 @@
 
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h"
 
-#include "flutter/display_list/display_list_image_filter.h"
+#include "flutter/display_list/effects/dl_image_filter.h"
 #include "flutter/fml/platform/darwin/cf_utils.h"
 #import "flutter/shell/platform/darwin/ios/ios_surface.h"
 
-static int kMaxPointsInVerb = 4;
+static constexpr int kMaxPointsInVerb = 4;
+static constexpr NSUInteger kFlutterClippingMaskViewPoolCapacity = 5;
 
 namespace flutter {
 
@@ -26,7 +27,10 @@ FlutterPlatformViewLayer::~FlutterPlatformViewLayer() = default;
 
 FlutterPlatformViewsController::FlutterPlatformViewsController()
     : layer_pool_(std::make_unique<FlutterPlatformViewLayerPool>()),
-      weak_factory_(std::make_unique<fml::WeakPtrFactory<FlutterPlatformViewsController>>(this)){};
+      weak_factory_(std::make_unique<fml::WeakPtrFactory<FlutterPlatformViewsController>>(this)) {
+  mask_view_pool_.reset(
+      [[FlutterClippingMaskViewPool alloc] initWithCapacity:kFlutterClippingMaskViewPoolCapacity]);
+};
 
 FlutterPlatformViewsController::~FlutterPlatformViewsController() = default;
 
@@ -121,7 +125,7 @@ static BOOL _preparedOnce = NO;
   }
   for (NSUInteger i = 0; i < visualEffectView.subviews.count; i++) {
     UIView* view = visualEffectView.subviews[i];
-    if ([view isKindOfClass:NSClassFromString(@"_UIVisualEffectBackdropView")]) {
+    if ([NSStringFromClass([view class]) hasSuffix:@"BackdropView"]) {
       _indexOfBackdropView = i;
       for (NSObject* filter in view.layer.filters) {
         if ([[filter valueForKey:@"name"] isEqual:@"gaussianBlur"] &&
@@ -130,7 +134,7 @@ static BOOL _preparedOnce = NO;
           break;
         }
       }
-    } else if ([view isKindOfClass:NSClassFromString(@"_UIVisualEffectSubview")]) {
+    } else if ([NSStringFromClass([view class]) hasSuffix:@"VisualEffectSubview"]) {
       _indexOfVisualEffectSubview = i;
     }
   }
@@ -232,7 +236,7 @@ static BOOL _preparedOnce = NO;
 
 - (NSMutableArray*)backdropFilterSubviews {
   if (!_backdropFilterSubviews) {
-    _backdropFilterSubviews = [[[NSMutableArray alloc] init] retain];
+    _backdropFilterSubviews = [[NSMutableArray alloc] init];
   }
   return _backdropFilterSubviews;
 }
@@ -271,6 +275,11 @@ static BOOL _preparedOnce = NO;
   return self;
 }
 
+- (void)reset {
+  paths_.clear();
+  [self setNeedsDisplay];
+}
+
 // In some scenarios, when we add this view as a maskView of the ChildClippingView, iOS added
 // this view as a subview of the ChildClippingView.
 // This results this view blocking touch events on the ChildClippingView.
@@ -447,3 +456,59 @@ static BOOL _preparedOnce = NO;
 }
 
 @end
+
+@interface FlutterClippingMaskViewPool ()
+
+// The maximum number of `FlutterClippingMaskView` the pool can contain.
+// This prevents the pool to grow infinately and limits the maximum memory a pool can use.
+@property(assign, nonatomic) NSUInteger capacity;
+
+// The pool contains the views that are available to use.
+// The number of items in the pool must not excceds `capacity`.
+@property(retain, nonatomic) NSMutableSet<FlutterClippingMaskView*>* pool;
+
+@end
+
+@implementation FlutterClippingMaskViewPool : NSObject
+
+- (instancetype)initWithCapacity:(NSInteger)capacity {
+  if (self = [super init]) {
+    // Most of cases, there are only one PlatformView in the scene.
+    // Thus init with the capacity of 1.
+    _pool = [[NSMutableSet alloc] initWithCapacity:1];
+    _capacity = capacity;
+  }
+  return self;
+}
+
+- (FlutterClippingMaskView*)getMaskViewWithFrame:(CGRect)frame {
+  FML_DCHECK(self.pool.count <= self.capacity);
+  if (self.pool.count == 0) {
+    // The pool is empty, alloc a new one.
+    return
+        [[[FlutterClippingMaskView alloc] initWithFrame:frame
+                                            screenScale:[UIScreen mainScreen].scale] autorelease];
+  }
+  FlutterClippingMaskView* maskView = [[[self.pool anyObject] retain] autorelease];
+  maskView.frame = frame;
+  [maskView reset];
+  [self.pool removeObject:maskView];
+  return maskView;
+}
+
+- (void)insertViewToPoolIfNeeded:(FlutterClippingMaskView*)maskView {
+  FML_DCHECK(![self.pool containsObject:maskView]);
+  FML_DCHECK(self.pool.count <= self.capacity);
+  if (self.pool.count == self.capacity) {
+    return;
+  }
+  [self.pool addObject:maskView];
+}
+
+- (void)dealloc {
+  [_pool release];
+
+  [super dealloc];
+}
+
+@end
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegate.mm b/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegate.mm
index d493f30d11febd51861af7088bce12570231d87d..def41bbca43ccc463e81ba08178595122db5901a 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegate.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegate.mm
@@ -17,11 +17,16 @@ static const SEL kSelectorsHandledByPlugins[] = {
     @selector(application:performFetchWithCompletionHandler:)};
 
 @interface FlutterPluginAppLifeCycleDelegate ()
-- (void)handleDidEnterBackground:(NSNotification*)notification;
-- (void)handleWillEnterForeground:(NSNotification*)notification;
-- (void)handleWillResignActive:(NSNotification*)notification;
-- (void)handleDidBecomeActive:(NSNotification*)notification;
-- (void)handleWillTerminate:(NSNotification*)notification;
+- (void)handleDidEnterBackground:(NSNotification*)notification
+    NS_EXTENSION_UNAVAILABLE_IOS("Disallowed in app extensions");
+- (void)handleWillEnterForeground:(NSNotification*)notification
+    NS_EXTENSION_UNAVAILABLE_IOS("Disallowed in app extensions");
+- (void)handleWillResignActive:(NSNotification*)notification
+    NS_EXTENSION_UNAVAILABLE_IOS("Disallowed in app extensions");
+- (void)handleDidBecomeActive:(NSNotification*)notification
+    NS_EXTENSION_UNAVAILABLE_IOS("Disallowed in app extensions");
+- (void)handleWillTerminate:(NSNotification*)notification
+    NS_EXTENSION_UNAVAILABLE_IOS("Disallowed in app extensions");
 @end
 
 @implementation FlutterPluginAppLifeCycleDelegate {
@@ -46,6 +51,7 @@ static const SEL kSelectorsHandledByPlugins[] = {
     _notificationUnsubscribers = [[NSMutableArray alloc] init];
     std::string cachePath = fml::paths::JoinPaths({getenv("HOME"), kCallbackCacheSubDir});
     [FlutterCallbackCache setCachePath:[NSString stringWithUTF8String:cachePath.c_str()]];
+#if not APPLICATION_EXTENSION_API_ONLY
     [self addObserverFor:UIApplicationDidEnterBackgroundNotification
                 selector:@selector(handleDidEnterBackground:)];
     [self addObserverFor:UIApplicationWillEnterForegroundNotification
@@ -56,6 +62,7 @@ static const SEL kSelectorsHandledByPlugins[] = {
                 selector:@selector(handleDidBecomeActive:)];
     [self addObserverFor:UIApplicationWillTerminateNotification
                 selector:@selector(handleWillTerminate:)];
+#endif
     _delegates = [[NSPointerArray weakObjectsPointerArray] retain];
     _debugBackgroundTask = UIBackgroundTaskInvalid;
   }
@@ -134,7 +141,8 @@ static BOOL IsPowerOfTwo(NSUInteger x) {
   return YES;
 }
 
-- (void)handleDidEnterBackground:(NSNotification*)notification {
+- (void)handleDidEnterBackground:(NSNotification*)notification
+    NS_EXTENSION_UNAVAILABLE_IOS("Disallowed in app extensions") {
   UIApplication* application = [UIApplication sharedApplication];
 #if FLUTTER_RUNTIME_MODE == FLUTTER_RUNTIME_MODE_DEBUG
   // The following keeps the Flutter session alive when the device screen locks
@@ -166,7 +174,8 @@ static BOOL IsPowerOfTwo(NSUInteger x) {
   }
 }
 
-- (void)handleWillEnterForeground:(NSNotification*)notification {
+- (void)handleWillEnterForeground:(NSNotification*)notification
+    NS_EXTENSION_UNAVAILABLE_IOS("Disallowed in app extensions") {
   UIApplication* application = [UIApplication sharedApplication];
 #if FLUTTER_RUNTIME_MODE == FLUTTER_RUNTIME_MODE_DEBUG
   if (_debugBackgroundTask != UIBackgroundTaskInvalid) {
@@ -184,7 +193,8 @@ static BOOL IsPowerOfTwo(NSUInteger x) {
   }
 }
 
-- (void)handleWillResignActive:(NSNotification*)notification {
+- (void)handleWillResignActive:(NSNotification*)notification
+    NS_EXTENSION_UNAVAILABLE_IOS("Disallowed in app extensions") {
   UIApplication* application = [UIApplication sharedApplication];
   for (NSObject<FlutterApplicationLifeCycleDelegate>* delegate in _delegates) {
     if (!delegate) {
@@ -196,7 +206,8 @@ static BOOL IsPowerOfTwo(NSUInteger x) {
   }
 }
 
-- (void)handleDidBecomeActive:(NSNotification*)notification {
+- (void)handleDidBecomeActive:(NSNotification*)notification
+    NS_EXTENSION_UNAVAILABLE_IOS("Disallowed in app extensions") {
   UIApplication* application = [UIApplication sharedApplication];
   for (NSObject<FlutterApplicationLifeCycleDelegate>* delegate in _delegates) {
     if (!delegate) {
@@ -208,7 +219,8 @@ static BOOL IsPowerOfTwo(NSUInteger x) {
   }
 }
 
-- (void)handleWillTerminate:(NSNotification*)notification {
+- (void)handleWillTerminate:(NSNotification*)notification
+    NS_EXTENSION_UNAVAILABLE_IOS("Disallowed in app extensions") {
   UIApplication* application = [UIApplication sharedApplication];
   for (NSObject<FlutterApplicationLifeCycleDelegate>* delegate in _delegates) {
     if (!delegate) {
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegateTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegateTest.mm
index 9891f52cf8c0c8d607d7a6af028cea3dc2455e9f..9fcc645575f29209cfd6e4ad46af019a49d8f277 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegateTest.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegateTest.mm
@@ -20,6 +20,7 @@ FLUTTER_ASSERT_ARC
   XCTAssertNotNil(delegate);
 }
 
+#if not APPLICATION_EXTENSION_API_ONLY
 - (void)testDidEnterBackground {
   XCTNSNotificationExpectation* expectation = [[XCTNSNotificationExpectation alloc]
       initWithName:UIApplicationDidEnterBackgroundNotification];
@@ -88,5 +89,6 @@ FLUTTER_ASSERT_ARC
   [self waitForExpectations:@[ expectation ] timeout:5.0];
   OCMVerify([plugin applicationWillTerminate:[UIApplication sharedApplication]]);
 }
+#endif
 
 @end
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegate_internal.h b/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegate_internal.h
index 00e8696199842c6c1faa6f240d2d954b612c6b14..6f80221796fbcb960cb8f19638f42da450dacc1e 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegate_internal.h
+++ b/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegate_internal.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERPLUGINAPPLIFECYCLEDELEGATE_INTERNAL_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERPLUGINAPPLIFECYCLEDELEGATE_INTERNAL_H_
+
 @interface FlutterPluginAppLifeCycleDelegate ()
 
 /**
@@ -16,3 +19,5 @@
 
 @end
 ;
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERPLUGINAPPLIFECYCLEDELEGATE_INTERNAL_H_
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterRestorationPlugin.h b/shell/platform/darwin/ios/framework/Source/FlutterRestorationPlugin.h
index 36311be2340fcd96c1801cad8af577b44db4f9e3..dc437179c9e3dafaab565c0b7d8cc79be3eefcdb 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterRestorationPlugin.h
+++ b/shell/platform/darwin/ios/framework/Source/FlutterRestorationPlugin.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERRESTORATIONPLUGIN_H_
-#define SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERRESTORATIONPLUGIN_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERRESTORATIONPLUGIN_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERRESTORATIONPLUGIN_H_
 
 #import <UIKit/UIKit.h>
 
@@ -19,4 +19,4 @@
 - (void)markRestorationComplete;
 - (void)reset;
 @end
-#endif  // SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERRESTORATIONPLUGIN_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERRESTORATIONPLUGIN_H_
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterRestorationPluginTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterRestorationPluginTest.mm
index 36de96d451a8d1a51e5f537384afd4f3bf81ece3..d61a29e0f31fdfe4753102619a3a66467f2a644a 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterRestorationPluginTest.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterRestorationPluginTest.mm
@@ -80,7 +80,7 @@ FLUTTER_ASSERT_ARC
   [restorationPlugin setRestorationData:data];
   XCTAssertEqual([capturedResult count], 2u);
   XCTAssertEqual([capturedResult objectForKey:@"enabled"], @YES);
-  XCTAssertEqual([[capturedResult objectForKey:@"data"] data], data);
+  XCTAssertEqualObjects([[capturedResult objectForKey:@"data"] data], data);
 }
 
 - (void)testRestorationDisabledRespondsRightAway {
@@ -112,7 +112,7 @@ FLUTTER_ASSERT_ARC
                                }];
   XCTAssertEqual([capturedResult count], 2u);
   XCTAssertEqual([capturedResult objectForKey:@"enabled"], @YES);
-  XCTAssertEqual([[capturedResult objectForKey:@"data"] data], data);
+  XCTAssertEqualObjects([[capturedResult objectForKey:@"data"] data], data);
 }
 
 - (void)testRespondsWithNoDataWhenRestorationIsCompletedWithoutData {
@@ -161,7 +161,7 @@ FLUTTER_ASSERT_ARC
                                result:^(id _Nullable result) {
                                  XCTAssertNil(result);
                                }];
-  XCTAssertEqual([restorationPlugin restorationData], data);
+  XCTAssertEqualObjects([restorationPlugin restorationData], data);
 }
 
 - (void)testRespondsWithDataSetByFramework {
@@ -177,7 +177,7 @@ FLUTTER_ASSERT_ARC
                                result:^(id _Nullable result) {
                                  XCTAssertNil(result);
                                }];
-  XCTAssertEqual([restorationPlugin restorationData], data);
+  XCTAssertEqualObjects([restorationPlugin restorationData], data);
 
   __block id capturedResult;
   methodCall = [FlutterMethodCall methodCallWithMethodName:@"get" arguments:nil];
@@ -187,7 +187,7 @@ FLUTTER_ASSERT_ARC
                                }];
   XCTAssertEqual([capturedResult count], 2u);
   XCTAssertEqual([capturedResult objectForKey:@"enabled"], @YES);
-  XCTAssertEqual([[capturedResult objectForKey:@"data"] data], data);
+  XCTAssertEqualObjects([[capturedResult objectForKey:@"data"] data], data);
 }
 
 - (void)testResetClearsData {
@@ -203,7 +203,7 @@ FLUTTER_ASSERT_ARC
                                result:^(id _Nullable result) {
                                  XCTAssertNil(result);
                                }];
-  XCTAssertEqual([restorationPlugin restorationData], data);
+  XCTAssertEqualObjects([restorationPlugin restorationData], data);
 
   [restorationPlugin reset];
   XCTAssertNil([restorationPlugin restorationData]);
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterSemanticsScrollView.h b/shell/platform/darwin/ios/framework/Source/FlutterSemanticsScrollView.h
index 5a6a90f85bfd8a5e6eaaf972065d0fd4c4f611b3..f83047f28b562cb2206f74d3d46286fb50c8b2e8 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterSemanticsScrollView.h
+++ b/shell/platform/darwin/ios/framework/Source/FlutterSemanticsScrollView.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTER_SEMANTICS_SCROLL_VIEW_H_
-#define SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTER_SEMANTICS_SCROLL_VIEW_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERSEMANTICSSCROLLVIEW_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERSEMANTICSSCROLLVIEW_H_
 
 #import <UIKit/UIKit.h>
 
@@ -29,4 +29,4 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 NS_ASSUME_NONNULL_END
-#endif  // SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTER_SEMANTICS_SCROLL_VIEW_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERSEMANTICSSCROLLVIEW_H_
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterSpellCheckPlugin.h b/shell/platform/darwin/ios/framework/Source/FlutterSpellCheckPlugin.h
index 790e192362d1397442e25d411dddbc7ab760bfaa..1e3a4a73ccdfbed39d7d922b02650aaa6bf5998a 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterSpellCheckPlugin.h
+++ b/shell/platform/darwin/ios/framework/Source/FlutterSpellCheckPlugin.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERSPELLCHECKPLUGIN_H_
-#define SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERSPELLCHECKPLUGIN_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERSPELLCHECKPLUGIN_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERSPELLCHECKPLUGIN_H_
 
 #include "flutter/fml/memory/weak_ptr.h"
 
@@ -29,4 +29,4 @@
 
 @end
 
-#endif  // SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERSPELLCHECKPLUGIN_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERSPELLCHECKPLUGIN_H_
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterSpellCheckPlugin.mm b/shell/platform/darwin/ios/framework/Source/FlutterSpellCheckPlugin.mm
index 1b2038b5f63ea101cc040240384223a1caeb37c1..1b172b93347773c31a0ecd2f863238bc14332c62 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterSpellCheckPlugin.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterSpellCheckPlugin.mm
@@ -61,8 +61,14 @@ static NSString* const kInitiateSpellCheck = @"SpellCheck.initiateSpellCheck";
 // Returns an empty array if no spell check suggestions.
 - (NSArray<NSDictionary<NSString*, id>*>*)findAllSpellCheckSuggestionsForText:(NSString*)text
                                                                    inLanguage:(NSString*)language {
-  // Transform Dart Locale format to iOS language format.
-  language = [language stringByReplacingOccurrencesOfString:@"-" withString:@"_"];
+  // Transform Dart Locale format to iOS language format if necessary.
+  if ([language containsString:@"-"]) {
+    NSArray<NSString*>* languageCodes = [language componentsSeparatedByString:@"-"];
+    FML_DCHECK(languageCodes.count == 2);
+    NSString* lastCode = [[languageCodes lastObject] uppercaseString];
+    language = [NSString stringWithFormat:@"%@_%@", [languageCodes firstObject], lastCode];
+  }
+
   if (![UITextChecker.availableLanguages containsObject:language]) {
     return nil;
   }
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterSpellCheckPluginTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterSpellCheckPluginTest.mm
index 221050638efea11d5248dea7338f4d128c45bb28..d35d72f0154d80342a0b5bb11ffcc722ced0c789 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterSpellCheckPluginTest.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterSpellCheckPluginTest.mm
@@ -274,7 +274,7 @@
   self.partialMockPlugin = OCMPartialMock(self.plugin);
   OCMStub([self.partialMockPlugin textChecker]).andReturn(self.mockTextChecker);
   id textCheckerClassMock = OCMClassMock([UITextChecker class]);
-  [[[textCheckerClassMock stub] andReturn:@[ @"en_us" ]] availableLanguages];
+  [[[textCheckerClassMock stub] andReturn:@[ @"en_US" ]] availableLanguages];
   NSArray* suggestions1 = @[ @"suggestion 1", @"suggestion 2" ];
 
   [self mockUITextCheckerWithExpectedMisspelledWordRange:NSMakeRange(0, 5)
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterTextInputDelegate.h b/shell/platform/darwin/ios/framework/Source/FlutterTextInputDelegate.h
index 7ecda6a23bb93585057a7128f506d28a2e144735..2b5c76f77a7fbfe6f8d66cbfed83dd241ad6fe10 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterTextInputDelegate.h
+++ b/shell/platform/darwin/ios/framework/Source/FlutterTextInputDelegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERTEXTINPUTDELEGATE_H_
-#define SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERTEXTINPUTDELEGATE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERTEXTINPUTDELEGATE_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERTEXTINPUTDELEGATE_H_
 
 #import <Foundation/Foundation.h>
 
@@ -11,6 +11,7 @@
 @class FlutterTextInputView;
 
 typedef NS_ENUM(NSInteger, FlutterTextInputAction) {
+  // NOLINTBEGIN(readability-identifier-naming)
   FlutterTextInputActionUnspecified,
   FlutterTextInputActionDone,
   FlutterTextInputActionGo,
@@ -22,12 +23,15 @@ typedef NS_ENUM(NSInteger, FlutterTextInputAction) {
   FlutterTextInputActionRoute,
   FlutterTextInputActionEmergencyCall,
   FlutterTextInputActionNewline,
+  // NOLINTEND(readability-identifier-naming)
 };
 
 typedef NS_ENUM(NSInteger, FlutterFloatingCursorDragState) {
+  // NOLINTBEGIN(readability-identifier-naming)
   FlutterFloatingCursorDragStateStart,
   FlutterFloatingCursorDragStateUpdate,
   FlutterFloatingCursorDragStateEnd,
+  // NOLINTEND(readability-identifier-naming)
 };
 
 @protocol FlutterTextInputDelegate <NSObject>
@@ -59,8 +63,8 @@ typedef NS_ENUM(NSInteger, FlutterFloatingCursorDragState) {
     insertTextPlaceholderWithSize:(CGSize)size
                        withClient:(int)client;
 - (void)flutterTextInputView:(FlutterTextInputView*)textInputView removeTextPlaceholder:(int)client;
-- (void)flutterTextInputViewDidResignFirstResponder:(FlutterTextInputView*)textInputView;
-
+- (void)flutterTextInputView:(FlutterTextInputView*)textInputView
+    didResignFirstResponderWithTextInputClient:(int)client;
 @end
 
-#endif  // SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERTEXTINPUTDELEGATE_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERTEXTINPUTDELEGATE_H_
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h b/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h
index e4fc4e4a352f9f2912bed7254d797579353592df..dcf4f69010a4b3cb87bcb0db82313728dde3b741 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h
+++ b/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h
@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERTEXTINPUTPLUGIN_H_
-#define SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERTEXTINPUTPLUGIN_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERTEXTINPUTPLUGIN_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERTEXTINPUTPLUGIN_H_
 
 #import <UIKit/UIKit.h>
 
-#import "flutter/fml/memory/weak_ptr.h"
 #import "flutter/shell/platform/common/text_editing_delta.h"
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterIndirectScribbleDelegate.h"
@@ -16,22 +15,26 @@
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterViewResponder.h"
 
 typedef NS_ENUM(NSInteger, FlutterScribbleFocusStatus) {
+  // NOLINTBEGIN(readability-identifier-naming)
   FlutterScribbleFocusStatusUnfocused,
   FlutterScribbleFocusStatusFocusing,
   FlutterScribbleFocusStatusFocused,
+  // NOLINTEND(readability-identifier-naming)
 };
 
 typedef NS_ENUM(NSInteger, FlutterScribbleInteractionStatus) {
+  // NOLINTBEGIN(readability-identifier-naming)
   FlutterScribbleInteractionStatusNone,
   FlutterScribbleInteractionStatusStarted,
   FlutterScribbleInteractionStatusEnding,
+  // NOLINTEND(readability-identifier-naming)
 };
 
 @interface FlutterTextInputPlugin
     : NSObject <FlutterKeySecondaryResponder, UIIndirectScribbleInteractionDelegate>
 
-@property(nonatomic, assign) UIViewController* viewController;
-@property(nonatomic, assign) id<FlutterIndirectScribbleDelegate> indirectScribbleDelegate;
+@property(nonatomic, weak) UIViewController* viewController;
+@property(nonatomic, weak) id<FlutterIndirectScribbleDelegate> indirectScribbleDelegate;
 @property(nonatomic, strong)
     NSMutableDictionary<UIScribbleElementIdentifier, NSValue*>* scribbleElements;
 
@@ -55,7 +58,7 @@ typedef NS_ENUM(NSInteger, FlutterScribbleInteractionStatus) {
  * These are used by the UIIndirectScribbleInteractionDelegate methods to handle focusing on the
  * correct element.
  */
-- (void)setupIndirectScribbleInteraction:(id<FlutterViewResponder>)viewResponder;
+- (void)setUpIndirectScribbleInteraction:(id<FlutterViewResponder>)viewResponder;
 - (void)resetViewResponder;
 
 @end
@@ -64,9 +67,11 @@ typedef NS_ENUM(NSInteger, FlutterScribbleInteractionStatus) {
 @interface FlutterTextPosition : UITextPosition
 
 @property(nonatomic, readonly) NSUInteger index;
+@property(nonatomic, readonly) UITextStorageDirection affinity;
 
 + (instancetype)positionWithIndex:(NSUInteger)index;
-- (instancetype)initWithIndex:(NSUInteger)index;
++ (instancetype)positionWithIndex:(NSUInteger)index affinity:(UITextStorageDirection)affinity;
+- (instancetype)initWithIndex:(NSUInteger)index affinity:(UITextStorageDirection)affinity;
 
 @end
 
@@ -101,6 +106,10 @@ typedef NS_ENUM(NSInteger, FlutterScribbleInteractionStatus) {
 
 + (instancetype)selectionRectWithRect:(CGRect)rect position:(NSUInteger)position;
 
++ (instancetype)selectionRectWithRect:(CGRect)rect
+                             position:(NSUInteger)position
+                     writingDirection:(NSWritingDirection)writingDirection;
+
 - (instancetype)initWithRectAndInfo:(CGRect)rect
                            position:(NSUInteger)position
                    writingDirection:(NSWritingDirection)writingDirection
@@ -109,6 +118,8 @@ typedef NS_ENUM(NSInteger, FlutterScribbleInteractionStatus) {
                          isVertical:(BOOL)isVertical;
 
 - (instancetype)init NS_UNAVAILABLE;
+
+- (BOOL)isRTL;
 @end
 
 API_AVAILABLE(ios(13.0)) @interface FlutterTextPlaceholder : UITextPlaceholder
@@ -121,11 +132,11 @@ FLUTTER_DARWIN_EXPORT
 
 // UITextInput
 @property(nonatomic, readonly) NSMutableString* text;
-@property(nonatomic, readonly) NSMutableString* markedText;
 @property(readwrite, copy) UITextRange* selectedTextRange;
 @property(nonatomic, strong) UITextRange* markedTextRange;
 @property(nonatomic, copy) NSDictionary* markedTextStyle;
-@property(nonatomic, assign) id<UITextInputDelegate> inputDelegate;
+@property(nonatomic, weak) id<UITextInputDelegate> inputDelegate;
+@property(nonatomic, strong) NSMutableArray* pendingDeltas;
 
 // UITextInputTraits
 @property(nonatomic) UITextAutocapitalizationType autocapitalizationType;
@@ -141,10 +152,10 @@ FLUTTER_DARWIN_EXPORT
 @property(nonatomic) UITextSmartDashesType smartDashesType API_AVAILABLE(ios(11.0));
 @property(nonatomic, copy) UITextContentType textContentType API_AVAILABLE(ios(10.0));
 
-@property(nonatomic, assign) UIAccessibilityElement* backingTextInputAccessibilityObject;
+@property(nonatomic, weak) UIAccessibilityElement* backingTextInputAccessibilityObject;
 
 // Scribble Support
-@property(nonatomic, assign) id<FlutterViewResponder> viewResponder;
+@property(nonatomic, weak) id<FlutterViewResponder> viewResponder;
 @property(nonatomic) FlutterScribbleFocusStatus scribbleFocusStatus;
 @property(nonatomic, strong) NSArray<FlutterTextSelectionRect*>* selectionRects;
 - (void)resetScribbleInteractionStatusIfEnding;
@@ -156,5 +167,14 @@ FLUTTER_DARWIN_EXPORT
 - (instancetype)initWithFrame:(CGRect)frame NS_UNAVAILABLE;
 - (instancetype)initWithOwner:(FlutterTextInputPlugin*)textInputPlugin NS_DESIGNATED_INITIALIZER;
 
+// TODO(louisehsu): These are being exposed to support Share in FlutterPlatformPlugin
+// Consider moving that feature into FlutterTextInputPlugin to avoid exposing extra methods
+- (CGRect)localRectFromFrameworkTransform:(CGRect)incomingRect;
+- (CGRect)caretRectForPosition:(UITextPosition*)position;
 @end
-#endif  // SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERTEXTINPUTPLUGIN_H_
+
+@interface UIView (FindFirstResponder)
+@property(nonatomic, readonly) id flutterFirstResponder;
+@end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERTEXTINPUTPLUGIN_H_
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.mm b/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.mm
index 4ecdc6845e73ad23c17870c4f735d464a439654f..ea36de564d408b50ce8d02612904b842c912367f 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.mm
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/UIViewController+FlutterScreenAndSceneIfLoaded.h"
 
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
@@ -12,30 +13,27 @@
 #include "flutter/fml/logging.h"
 #include "flutter/fml/platform/darwin/string_range_sanitization.h"
 
+FLUTTER_ASSERT_ARC
+
 static const char kTextAffinityDownstream[] = "TextAffinity.downstream";
 static const char kTextAffinityUpstream[] = "TextAffinity.upstream";
 // A delay before enabling the accessibility of FlutterTextInputView after
 // it is activated.
 static constexpr double kUITextInputAccessibilityEnablingDelaySeconds = 0.5;
 
+// A delay before reenabling the UIView areAnimationsEnabled to YES
+// in order for becomeFirstResponder to receive the proper value.
+static const NSTimeInterval kKeyboardAnimationDelaySeconds = 0.1;
+
+// A time set for the screenshot to animate back to the assigned position.
+static const NSTimeInterval kKeyboardAnimationTimeToCompleteion = 0.3;
+
 // The "canonical" invalid CGRect, similar to CGRectNull, used to
 // indicate a CGRect involved in firstRectForRange calculation is
 // invalid. The specific value is chosen so that if firstRectForRange
 // returns kInvalidFirstRect, iOS will not show the IME candidates view.
 const CGRect kInvalidFirstRect = {{-1, -1}, {9999, 9999}};
 
-// The `bounds` value a FlutterTextInputView returns when the floating cursor
-// is activated in that view.
-//
-// DO NOT use extremely large values (such as CGFloat_MAX) in this rect, for that
-// will significantly reduce the precision of the floating cursor's coordinates.
-//
-// It is recommended for this CGRect to be roughly centered at caretRectForPosition
-// (which currently always return CGRectZero), so the initial floating cursor will
-// be placed at (0, 0).
-// See the comments in beginFloatingCursorAtPoint and caretRectForPosition.
-const CGRect kSpacePanBounds = {{-2500, -2500}, {5000, 5000}};
-
 #pragma mark - TextInput channel method names.
 // See https://api.flutter.dev/flutter/services/SystemChannels/textInput-constant.html
 static NSString* const kShowMethod = @"TextInput.show";
@@ -54,6 +52,11 @@ static NSString* const kFinishAutofillContextMethod = @"TextInput.finishAutofill
 static NSString* const kDeprecatedSetSelectionRectsMethod = @"TextInput.setSelectionRects";
 static NSString* const kSetSelectionRectsMethod = @"Scribble.setSelectionRects";
 static NSString* const kStartLiveTextInputMethod = @"TextInput.startLiveTextInput";
+static NSString* const kUpdateConfigMethod = @"TextInput.updateConfig";
+static NSString* const kOnInteractiveKeyboardPointerMoveMethod =
+    @"TextInput.onPointerMoveForInteractiveKeyboard";
+static NSString* const kOnInteractiveKeyboardPointerUpMethod =
+    @"TextInput.onPointerUpForInteractiveKeyboard";
 
 #pragma mark - TextInputConfiguration Field Names
 static NSString* const kSecureTextEntry = @"obscureText";
@@ -134,6 +137,9 @@ static UIKeyboardType ToUIKeyboardType(NSDictionary* type) {
   if ([inputType isEqualToString:@"TextInputType.url"]) {
     return UIKeyboardTypeURL;
   }
+  if ([inputType isEqualToString:@"TextInputType.visiblePassword"]) {
+    return UIKeyboardTypeASCIICapable;
+  }
   return UIKeyboardTypeDefault;
 }
 
@@ -301,14 +307,12 @@ static UITextContentType ToUITextContentType(NSArray<NSString*>* hints) {
     return UITextContentTypePassword;
   }
 
-  if (@available(iOS 12.0, *)) {
-    if ([hint isEqualToString:@"oneTimeCode"]) {
-      return UITextContentTypeOneTimeCode;
-    }
+  if ([hint isEqualToString:@"oneTimeCode"]) {
+    return UITextContentTypeOneTimeCode;
+  }
 
-    if ([hint isEqualToString:@"newPassword"]) {
-      return UITextContentTypeNewPassword;
-    }
+  if ([hint isEqualToString:@"newPassword"]) {
+    return UITextContentTypeNewPassword;
   }
 
   return hints[0];
@@ -404,11 +408,10 @@ static BOOL IsFieldPasswordRelated(NSDictionary* configuration) {
     return YES;
   }
 
-  if (@available(iOS 12.0, *)) {
-    if ([contentType isEqualToString:UITextContentTypeNewPassword]) {
-      return YES;
-    }
+  if ([contentType isEqualToString:UITextContentTypeNewPassword]) {
+    return YES;
   }
+
   return NO;
 }
 
@@ -433,47 +436,80 @@ static BOOL IsApproximatelyEqual(float x, float y, float delta) {
   return fabsf(x - y) <= delta;
 }
 
+// This is a helper function for floating cursor selection logic to determine which text
+// position is closer to a point.
 // Checks whether point should be considered closer to selectionRect compared to
 // otherSelectionRect.
 //
-// If checkRightBoundary is set, the right-center point on selectionRect and
-// otherSelectionRect will be used instead of the left-center point.
+// If `useTrailingBoundaryOfSelectionRect` is not set, it uses the leading-center point
+// on selectionRect and otherSelectionRect to compare.
+// For left-to-right text, this means the left-center point, and for right-to-left text,
+// this means the right-center point.
+//
+// If useTrailingBoundaryOfSelectionRect is set, the trailing-center point on selectionRect
+// will be used instead of the leading-center point, while leading-center point is still used
+// for otherSelectionRect.
 //
 // This uses special (empirically determined using a 1st gen iPad pro, 9.7" model running
 // iOS 14.7.1) logic for determining the closer rect, rather than a simple distance calculation.
-// First, the closer vertical distance is determined. Within the closest y distance, if the point is
-// above the bottom of the closest rect, the x distance will be minimized; however, if the point is
-// below the bottom of the rect, the x value will be maximized.
-static BOOL IsSelectionRectCloserToPoint(CGPoint point,
-                                         CGRect selectionRect,
-                                         CGRect otherSelectionRect,
-                                         BOOL checkRightBoundary) {
-  CGPoint pointForSelectionRect =
-      CGPointMake(selectionRect.origin.x + (checkRightBoundary ? selectionRect.size.width : 0),
-                  selectionRect.origin.y + selectionRect.size.height * 0.5);
+// - First, the rect with closer y distance wins.
+// - Otherwise (same y distance):
+//   - If the point is above bottom of the rect, the rect boundary with closer x distance wins.
+//   - Otherwise (point is below bottom of the rect), the rect boundary with farthest x wins.
+//     This is because when the point is below the bottom line of text, we want to select the
+//     whole line of text, so we mark the farthest rect as closest.
+static BOOL IsSelectionRectBoundaryCloserToPoint(CGPoint point,
+                                                 CGRect selectionRect,
+                                                 BOOL selectionRectIsRTL,
+                                                 BOOL useTrailingBoundaryOfSelectionRect,
+                                                 CGRect otherSelectionRect,
+                                                 BOOL otherSelectionRectIsRTL,
+                                                 CGFloat verticalPrecision) {
+  // The point is inside the selectionRect's corresponding half-rect area.
+  if (CGRectContainsPoint(
+          CGRectMake(
+              selectionRect.origin.x + ((useTrailingBoundaryOfSelectionRect ^ selectionRectIsRTL)
+                                            ? 0.5 * selectionRect.size.width
+                                            : 0),
+              selectionRect.origin.y, 0.5 * selectionRect.size.width, selectionRect.size.height),
+          point)) {
+    return YES;
+  }
+  // pointForSelectionRect is either leading-center or trailing-center point of selectionRect.
+  CGPoint pointForSelectionRect = CGPointMake(
+      selectionRect.origin.x +
+          (selectionRectIsRTL ^ useTrailingBoundaryOfSelectionRect ? selectionRect.size.width : 0),
+      selectionRect.origin.y + selectionRect.size.height * 0.5);
   float yDist = fabs(pointForSelectionRect.y - point.y);
   float xDist = fabs(pointForSelectionRect.x - point.x);
 
-  CGPoint pointForOtherSelectionRect =
-      CGPointMake(otherSelectionRect.origin.x + (checkRightBoundary ? selectionRect.size.width : 0),
-                  otherSelectionRect.origin.y + otherSelectionRect.size.height * 0.5);
+  // pointForOtherSelectionRect is the leading-center point of otherSelectionRect.
+  CGPoint pointForOtherSelectionRect = CGPointMake(
+      otherSelectionRect.origin.x + (otherSelectionRectIsRTL ? otherSelectionRect.size.width : 0),
+      otherSelectionRect.origin.y + otherSelectionRect.size.height * 0.5);
   float yDistOther = fabs(pointForOtherSelectionRect.y - point.y);
   float xDistOther = fabs(pointForOtherSelectionRect.x - point.x);
 
   // This serves a similar purpose to IsApproximatelyEqual, allowing a little buffer before
   // declaring something closer vertically to account for the small variations in size and position
   // of SelectionRects, especially when dealing with emoji.
-  BOOL isCloserVertically = yDist < yDistOther - 1;
-  BOOL isEqualVertically = IsApproximatelyEqual(yDist, yDistOther, 1);
+  BOOL isCloserVertically = yDist < yDistOther - verticalPrecision;
+  BOOL isEqualVertically = IsApproximatelyEqual(yDist, yDistOther, verticalPrecision);
   BOOL isAboveBottomOfLine = point.y <= selectionRect.origin.y + selectionRect.size.height;
-  BOOL isCloserHorizontally = xDist <= xDistOther;
+  BOOL isCloserHorizontally = xDist < xDistOther;
   BOOL isBelowBottomOfLine = point.y > selectionRect.origin.y + selectionRect.size.height;
-  BOOL isFartherToRight =
-      selectionRect.origin.x + (checkRightBoundary ? selectionRect.size.width : 0) >
-      otherSelectionRect.origin.x;
+  // Is "farther away", or is closer to the end of the text line.
+  BOOL isFarther;
+  if (selectionRectIsRTL) {
+    isFarther = selectionRect.origin.x < otherSelectionRect.origin.x;
+  } else {
+    isFarther = selectionRect.origin.x +
+                    (useTrailingBoundaryOfSelectionRect ? selectionRect.size.width : 0) >
+                otherSelectionRect.origin.x;
+  }
   return (isCloserVertically ||
-          (isEqualVertically && ((isAboveBottomOfLine && isCloserHorizontally) ||
-                                 (isBelowBottomOfLine && isFartherToRight))));
+          (isEqualVertically &&
+           ((isAboveBottomOfLine && isCloserHorizontally) || (isBelowBottomOfLine && isFarther))));
 }
 
 #pragma mark - FlutterTextPosition
@@ -481,13 +517,18 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
 @implementation FlutterTextPosition
 
 + (instancetype)positionWithIndex:(NSUInteger)index {
-  return [[[FlutterTextPosition alloc] initWithIndex:index] autorelease];
+  return [[FlutterTextPosition alloc] initWithIndex:index affinity:UITextStorageDirectionForward];
 }
 
-- (instancetype)initWithIndex:(NSUInteger)index {
++ (instancetype)positionWithIndex:(NSUInteger)index affinity:(UITextStorageDirection)affinity {
+  return [[FlutterTextPosition alloc] initWithIndex:index affinity:affinity];
+}
+
+- (instancetype)initWithIndex:(NSUInteger)index affinity:(UITextStorageDirection)affinity {
   self = [super init];
   if (self) {
     _index = index;
+    _affinity = affinity;
   }
   return self;
 }
@@ -499,7 +540,7 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
 @implementation FlutterTextRange
 
 + (instancetype)rangeWithNSRange:(NSRange)range {
-  return [[[FlutterTextRange alloc] initWithNSRange:range] autorelease];
+  return [[FlutterTextRange alloc] initWithNSRange:range];
 }
 
 - (instancetype)initWithNSRange:(NSRange)range {
@@ -511,11 +552,13 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
 }
 
 - (UITextPosition*)start {
-  return [FlutterTextPosition positionWithIndex:self.range.location];
+  return [FlutterTextPosition positionWithIndex:self.range.location
+                                       affinity:UITextStorageDirectionForward];
 }
 
 - (UITextPosition*)end {
-  return [FlutterTextPosition positionWithIndex:self.range.location + self.range.length];
+  return [FlutterTextPosition positionWithIndex:self.range.location + self.range.length
+                                       affinity:UITextStorageDirectionBackward];
 }
 
 - (BOOL)isEmpty {
@@ -535,7 +578,7 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
 
 @interface FlutterTokenizer ()
 
-@property(nonatomic, assign) FlutterTextInputView* textInputView;
+@property(nonatomic, weak) FlutterTextInputView* textInputView;
 
 @end
 
@@ -559,7 +602,7 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
     case UITextGranularityLine:
       // The default UITextInputStringTokenizer does not handle line granularity
       // correctly. We need to implement our own line tokenizer.
-      result = [self lineEnclosingPosition:position];
+      result = [self lineEnclosingPosition:position inDirection:direction];
       break;
     case UITextGranularityCharacter:
     case UITextGranularityWord:
@@ -575,7 +618,21 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
   return result;
 }
 
-- (UITextRange*)lineEnclosingPosition:(UITextPosition*)position {
+- (UITextRange*)lineEnclosingPosition:(UITextPosition*)position
+                          inDirection:(UITextDirection)direction {
+  // TODO(hellohuanlin): remove iOS 17 check. The same logic should apply to older iOS version.
+  if (@available(iOS 17.0, *)) {
+    // According to the API doc if the text position is at a text-unit boundary, it is considered
+    // enclosed only if the next position in the given direction is entirely enclosed. Link:
+    // https://developer.apple.com/documentation/uikit/uitextinputtokenizer/1614464-rangeenclosingposition?language=objc
+    FlutterTextPosition* flutterPosition = (FlutterTextPosition*)position;
+    if (flutterPosition.index > _textInputView.text.length ||
+        (flutterPosition.index == _textInputView.text.length &&
+         direction == UITextStorageDirectionForward)) {
+      return nil;
+    }
+  }
+
   // Gets the first line break position after the input position.
   NSString* textAfter = [_textInputView
       textInRange:[_textInputView textRangeFromPosition:position
@@ -614,21 +671,32 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
                                containsStart:(BOOL)containsStart
                                  containsEnd:(BOOL)containsEnd
                                   isVertical:(BOOL)isVertical {
-  return [[[FlutterTextSelectionRect alloc] initWithRectAndInfo:rect
-                                                       position:position
-                                               writingDirection:writingDirection
-                                                  containsStart:containsStart
-                                                    containsEnd:containsEnd
-                                                     isVertical:isVertical] autorelease];
+  return [[FlutterTextSelectionRect alloc] initWithRectAndInfo:rect
+                                                      position:position
+                                              writingDirection:writingDirection
+                                                 containsStart:containsStart
+                                                   containsEnd:containsEnd
+                                                    isVertical:isVertical];
 }
 
 + (instancetype)selectionRectWithRect:(CGRect)rect position:(NSUInteger)position {
-  return [[[FlutterTextSelectionRect alloc] initWithRectAndInfo:rect
-                                                       position:position
-                                               writingDirection:UITextWritingDirectionNatural
-                                                  containsStart:NO
-                                                    containsEnd:NO
-                                                     isVertical:NO] autorelease];
+  return [[FlutterTextSelectionRect alloc] initWithRectAndInfo:rect
+                                                      position:position
+                                              writingDirection:NSWritingDirectionNatural
+                                                 containsStart:NO
+                                                   containsEnd:NO
+                                                    isVertical:NO];
+}
+
++ (instancetype)selectionRectWithRect:(CGRect)rect
+                             position:(NSUInteger)position
+                     writingDirection:(NSWritingDirection)writingDirection {
+  return [[FlutterTextSelectionRect alloc] initWithRectAndInfo:rect
+                                                      position:position
+                                              writingDirection:writingDirection
+                                                 containsStart:NO
+                                                   containsEnd:NO
+                                                    isVertical:NO];
 }
 
 - (instancetype)initWithRectAndInfo:(CGRect)rect
@@ -649,6 +717,10 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
   return self;
 }
 
+- (BOOL)isRTL {
+  return _writingDirection == NSWritingDirectionRightToLeft;
+}
+
 @end
 
 #pragma mark - FlutterTextPlaceholder
@@ -664,7 +736,7 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
 @end
 
 // A FlutterTextInputView that masquerades as a UITextField, and forwards
-// selectors it can't respond to to a shared UITextField instance.
+// selectors it can't respond to a shared UITextField instance.
 //
 // Relevant API docs claim that password autofill supports any custom view
 // that adopts the UITextInput protocol, automatic strong password seems to
@@ -678,11 +750,6 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
   UITextField* _textField;
 }
 
-- (void)dealloc {
-  [_textField release];
-  [super dealloc];
-}
-
 - (UITextField*)textField {
   if (!_textField) {
     _textField = [[UITextField alloc] init];
@@ -709,17 +776,20 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
 @end
 
 @interface FlutterTextInputPlugin ()
-@property(nonatomic, readonly) fml::WeakPtr<FlutterTextInputPlugin> weakPtr;
-@property(nonatomic, readonly) id<FlutterTextInputDelegate> textInputDelegate;
+@property(nonatomic, readonly, weak) id<FlutterTextInputDelegate> textInputDelegate;
 @property(nonatomic, readonly) UIView* hostView;
 @end
 
 @interface FlutterTextInputView ()
+@property(nonatomic, readonly, weak) FlutterTextInputPlugin* textInputPlugin;
 @property(nonatomic, copy) NSString* autofillId;
 @property(nonatomic, readonly) CATransform3D editableTransform;
 @property(nonatomic, assign) CGRect markedRect;
+// Disables the cursor from dismissing when firstResponder is resigned
+@property(nonatomic, assign) BOOL preventCursorDismissWhenResignFirstResponder;
 @property(nonatomic) BOOL isVisibleToAutofill;
 @property(nonatomic, assign) BOOL accessibilityEnabled;
+@property(nonatomic, assign) int textInputClient;
 // The composed character that is temporarily removed by the keyboard API.
 // This is cleared at the start of each keyboard interaction. (Enter a character, delete a character
 // etc)
@@ -741,10 +811,7 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
   // when the app shows its own in-flutter keyboard.
   bool _isSystemKeyboardEnabled;
   bool _isFloatingCursorActive;
-  fml::WeakPtr<FlutterTextInputPlugin> _textInputPlugin;
-  // The view has reached end of life, and is no longer
-  // allowed to access its textInputDelegate.
-  BOOL _decommissioned;
+  CGPoint _floatingCursorOffset;
   bool _enableInteractiveSelection;
   UITextInteraction* _textInteraction API_AVAILABLE(ios(13.0));
 }
@@ -754,21 +821,21 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
 - (instancetype)initWithOwner:(FlutterTextInputPlugin*)textInputPlugin {
   self = [super initWithFrame:CGRectZero];
   if (self) {
-    _textInputPlugin = textInputPlugin.weakPtr;
+    _textInputPlugin = textInputPlugin;
     _textInputClient = 0;
     _selectionAffinity = kTextAffinityUpstream;
+    _preventCursorDismissWhenResignFirstResponder = NO;
 
     // UITextInput
     _text = [[NSMutableString alloc] init];
-    _markedText = [[NSMutableString alloc] init];
     _selectedTextRange = [[FlutterTextRange alloc] initWithNSRange:NSMakeRange(0, 0)];
     _markedRect = kInvalidFirstRect;
     _cachedFirstRect = kInvalidFirstRect;
     _scribbleInteractionStatus = FlutterScribbleInteractionStatusNone;
+    _pendingDeltas = [[NSMutableArray alloc] init];
     // Initialize with the zero matrix which is not
     // an affine transform.
     _editableTransform = CATransform3D();
-    _isFloatingCursorActive = false;
 
     // UITextInputTraits
     _autocapitalizationType = UITextAutocapitalizationTypeSentences;
@@ -782,14 +849,12 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
     _enableDeltaModel = NO;
     _enableInteractiveSelection = YES;
     _accessibilityEnabled = NO;
-    _decommissioned = NO;
     _smartQuotesType = UITextSmartQuotesTypeYes;
     _smartDashesType = UITextSmartDashesTypeYes;
     _selectionRects = [[NSArray alloc] init];
 
     if (@available(iOS 14.0, *)) {
-      UIScribbleInteraction* interaction =
-          [[[UIScribbleInteraction alloc] initWithDelegate:self] autorelease];
+      UIScribbleInteraction* interaction = [[UIScribbleInteraction alloc] initWithDelegate:self];
       [self addInteraction:interaction];
     }
   }
@@ -798,7 +863,6 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
 }
 
 - (void)configureWithDictionary:(NSDictionary*)configuration {
-  NSAssert(!_decommissioned, @"Attempt to reuse a decommissioned view, for %@", configuration);
   NSDictionary* inputType = configuration[kKeyboardType];
   NSString* keyboardAppearance = configuration[kKeyboardAppearance];
   NSDictionary* autofill = configuration[kAutofillProperties];
@@ -827,9 +891,11 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
     self.keyboardAppearance = UIKeyboardAppearanceDefault;
   }
   NSString* autocorrect = configuration[kAutocorrectionType];
-  self.autocorrectionType = autocorrect && ![autocorrect boolValue]
-                                ? UITextAutocorrectionTypeNo
-                                : UITextAutocorrectionTypeDefault;
+  bool autocorrectIsDisabled = autocorrect && ![autocorrect boolValue];
+  self.autocorrectionType =
+      autocorrectIsDisabled ? UITextAutocorrectionTypeNo : UITextAutocorrectionTypeDefault;
+  self.spellCheckingType =
+      autocorrectIsDisabled ? UITextSpellCheckingTypeNo : UITextSpellCheckingTypeDefault;
   self.autofillId = AutofillIdFromDictionary(configuration);
   if (autofill == nil) {
     self.textContentType = @"";
@@ -849,7 +915,14 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
 
 // Prevent UIKit from showing selection handles or highlights. This is needed
 // because Scribble interactions require the view to have it's actual frame on
-// the screen.
+// the screen. They're not needed on iOS 17 with the new
+// UITextSelectionDisplayInteraction API.
+//
+// These are undocumented methods. On iOS 17, the insertion point color is also
+// used as the highlighted background of the selected IME candidate:
+// https://github.com/flutter/flutter/issues/132548
+// So the respondsToSelector method is overridden to return NO for this method
+// on iOS 17+.
 - (UIColor*)insertionPointColor {
   return [UIColor clearColor];
 }
@@ -874,37 +947,17 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
 }
 
 - (id<FlutterTextInputDelegate>)textInputDelegate {
-  return _textInputPlugin.get().textInputDelegate;
+  return _textInputPlugin.textInputDelegate;
 }
 
-// Declares that the view has reached end of life, and
-// is no longer allowed to access its textInputDelegate.
-//
-// UIKit may retain this view (even after it's been removed
-// from the view hierarchy) so that it may outlive the plugin/engine,
-// in which case _textInputDelegate will become a dangling pointer.
-
-// The text input plugin needs to call decommission when it should
-// not have access to its FlutterTextInputDelegate any more.
-- (void)decommission {
-  _decommissioned = YES;
-}
-
-- (void)dealloc {
-  [_text release];
-  [_markedText release];
-  [_markedTextRange release];
-  [_selectedTextRange release];
-  [_tokenizer release];
-  [_autofillId release];
-  [_inputViewController release];
-  [_selectionRects release];
-  [_markedTextStyle release];
-  [_textContentType release];
-  [_textInteraction release];
-  [_temporarilyDeletedComposedCharacter release];
-  _temporarilyDeletedComposedCharacter = nil;
-  [super dealloc];
+- (BOOL)respondsToSelector:(SEL)selector {
+  if (@available(iOS 17.0, *)) {
+    // See the comment on this method.
+    if (selector == @selector(insertionPointColor)) {
+      return NO;
+    }
+  }
+  return [super respondsToSelector:selector];
 }
 
 - (void)setTextInputClient:(int)client {
@@ -914,8 +967,7 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
 
 - (UITextInteraction*)textInteraction API_AVAILABLE(ios(13.0)) {
   if (!_textInteraction) {
-    _textInteraction =
-        [[UITextInteraction textInteractionForMode:UITextInteractionModeEditable] retain];
+    _textInteraction = [UITextInteraction textInteractionForMode:UITextInteractionModeEditable];
     _textInteraction.textInput = self;
   }
   return _textInteraction;
@@ -1084,20 +1136,18 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
 - (BOOL)resignFirstResponder {
   BOOL success = [super resignFirstResponder];
   if (success) {
-    [self.textInputDelegate flutterTextInputViewDidResignFirstResponder:self];
+    if (!_preventCursorDismissWhenResignFirstResponder) {
+      [self.textInputDelegate flutterTextInputView:self
+          didResignFirstResponderWithTextInputClient:_textInputClient];
+    }
   }
   return success;
 }
 
 - (BOOL)canPerformAction:(SEL)action withSender:(id)sender {
-  // When scribble is available, the FlutterTextInputView will display the native toolbar unless
-  // these text editing actions are disabled.
-  if ([self isScribbleAvailable] && sender == NULL) {
-    return NO;
-  }
   if (action == @selector(paste:)) {
     // Forbid pasting images, memojis, or other non-string content.
-    return [UIPasteboard generalPasteboard].string != nil;
+    return [UIPasteboard generalPasteboard].hasStrings;
   }
 
   return [super canPerformAction:action withSender:sender];
@@ -1140,13 +1190,12 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
 }
 
 - (UITextRange*)selectedTextRange {
-  return [[_selectedTextRange copy] autorelease];
+  return [_selectedTextRange copy];
 }
 
 // Change the range of selected text, without notifying the framework.
 - (void)setSelectedTextRangeLocal:(UITextRange*)selectedTextRange {
   if (_selectedTextRange != selectedTextRange) {
-    UITextRange* oldSelectedRange = _selectedTextRange;
     if (self.hasText) {
       FlutterTextRange* flutterTextRange = (FlutterTextRange*)selectedTextRange;
       _selectedTextRange = [[FlutterTextRange
@@ -1154,7 +1203,6 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
     } else {
       _selectedTextRange = [selectedTextRange copy];
     }
-    [oldSelectedRange release];
   }
 }
 
@@ -1209,29 +1257,21 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
 // Replace the text within the specified range with the given text,
 // without notifying the framework.
 - (void)replaceRangeLocal:(NSRange)range withText:(NSString*)text {
-  NSRange selectedRange = _selectedTextRange.range;
-
-  // Adjust the text selection:
-  // * reduce the length by the intersection length
-  // * adjust the location by newLength - oldLength + intersectionLength
-  NSRange intersectionRange = NSIntersectionRange(range, selectedRange);
-  if (range.location <= selectedRange.location) {
-    selectedRange.location += text.length - range.length;
-  }
-  if (intersectionRange.location != NSNotFound) {
-    selectedRange.location += intersectionRange.length;
-    selectedRange.length -= intersectionRange.length;
-  }
-
   [self.text replaceCharactersInRange:[self clampSelection:range forText:self.text]
                            withString:text];
-  [self setSelectedTextRangeLocal:[FlutterTextRange
-                                      rangeWithNSRange:[self clampSelection:selectedRange
-                                                                    forText:self.text]]];
+
+  // Adjust the selected range and the marked text range. There's no
+  // documentation but UITextField always sets markedTextRange to nil,
+  // and collapses the selection to the end of the new replacement text.
+  const NSRange newSelectionRange =
+      [self clampSelection:NSMakeRange(range.location + text.length, 0) forText:self.text];
+
+  [self setSelectedTextRangeLocal:[FlutterTextRange rangeWithNSRange:newSelectionRange]];
+  self.markedTextRange = nil;
 }
 
 - (void)replaceRange:(UITextRange*)range withText:(NSString*)text {
-  NSString* textBeforeChange = [[self.text copy] autorelease];
+  NSString* textBeforeChange = [self.text copy];
   NSRange replaceRange = ((FlutterTextRange*)range).range;
   [self replaceRangeLocal:replaceRange withText:text];
   if (_enableDeltaModel) {
@@ -1249,7 +1289,7 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
 
 - (BOOL)shouldChangeTextInRange:(UITextRange*)range replacementText:(NSString*)text {
   // `temporarilyDeletedComposedCharacter` should only be used during a single text change session.
-  // So it needs to be cleared at the start of each text editting session.
+  // So it needs to be cleared at the start of each text editing session.
   self.temporarilyDeletedComposedCharacter = nil;
 
   if (self.returnKeyType == UIReturnKeyDefault && [text isEqualToString:@"\n"]) {
@@ -1305,11 +1345,10 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
   return YES;
 }
 
+// Either replaces the existing marked text or, if none is present, inserts it in
+// place of the current selection.
 - (void)setMarkedText:(NSString*)markedText selectedRange:(NSRange)markedSelectedRange {
-  NSString* textBeforeChange = [[self.text copy] autorelease];
-  NSRange selectedRange = _selectedTextRange.range;
-  NSRange markedTextRange = ((FlutterTextRange*)self.markedTextRange).range;
-  NSRange actualReplacedRange;
+  NSString* textBeforeChange = [self.text copy];
 
   if (_scribbleInteractionStatus != FlutterScribbleInteractionStatusNone ||
       _scribbleFocusStatus != FlutterScribbleFocusStatusUnfocused) {
@@ -1320,26 +1359,24 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
     markedText = @"";
   }
 
-  if (markedTextRange.length > 0) {
-    // Replace text in the marked range with the new text.
-    [self replaceRangeLocal:markedTextRange withText:markedText];
-    actualReplacedRange = markedTextRange;
-    markedTextRange.length = markedText.length;
-  } else {
-    // Replace text in the selected range with the new text.
-    actualReplacedRange = selectedRange;
-    [self replaceRangeLocal:selectedRange withText:markedText];
-    markedTextRange = NSMakeRange(selectedRange.location, markedText.length);
-  }
+  const FlutterTextRange* currentMarkedTextRange = (FlutterTextRange*)self.markedTextRange;
+  const NSRange& actualReplacedRange = currentMarkedTextRange && !currentMarkedTextRange.isEmpty
+                                           ? currentMarkedTextRange.range
+                                           : _selectedTextRange.range;
+  // No need to call replaceRangeLocal as this method always adjusts the
+  // selected/marked text ranges anyways.
+  [self.text replaceCharactersInRange:actualReplacedRange withString:markedText];
 
+  const NSRange newMarkedRange = NSMakeRange(actualReplacedRange.location, markedText.length);
   self.markedTextRange =
-      markedTextRange.length > 0 ? [FlutterTextRange rangeWithNSRange:markedTextRange] : nil;
-
-  NSUInteger selectionLocation = markedSelectedRange.location + markedTextRange.location;
-  selectedRange = NSMakeRange(selectionLocation, markedSelectedRange.length);
-  [self setSelectedTextRangeLocal:[FlutterTextRange
-                                      rangeWithNSRange:[self clampSelection:selectedRange
-                                                                    forText:self.text]]];
+      newMarkedRange.length > 0 ? [FlutterTextRange rangeWithNSRange:newMarkedRange] : nil;
+
+  [self setSelectedTextRangeLocal:
+            [FlutterTextRange
+                rangeWithNSRange:[self clampSelection:NSMakeRange(markedSelectedRange.location +
+                                                                      newMarkedRange.location,
+                                                                  markedSelectedRange.length)
+                                              forText:self.text]]];
   if (_enableDeltaModel) {
     NSRange nextReplaceRange = [self clampSelection:actualReplacedRange forText:textBeforeChange];
     [self updateEditingStateWithDelta:flutter::TextEditingDelta(
@@ -1430,11 +1467,12 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
 }
 
 - (UITextPosition*)beginningOfDocument {
-  return [FlutterTextPosition positionWithIndex:0];
+  return [FlutterTextPosition positionWithIndex:0 affinity:UITextStorageDirectionForward];
 }
 
 - (UITextPosition*)endOfDocument {
-  return [FlutterTextPosition positionWithIndex:self.text.length];
+  return [FlutterTextPosition positionWithIndex:self.text.length
+                                       affinity:UITextStorageDirectionBackward];
 }
 
 - (NSComparisonResult)comparePosition:(UITextPosition*)position toPosition:(UITextPosition*)other {
@@ -1446,7 +1484,17 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
   if (positionIndex > otherIndex) {
     return NSOrderedDescending;
   }
-  return NSOrderedSame;
+  UITextStorageDirection positionAffinity = ((FlutterTextPosition*)position).affinity;
+  UITextStorageDirection otherAffinity = ((FlutterTextPosition*)other).affinity;
+  if (positionAffinity == otherAffinity) {
+    return NSOrderedSame;
+  }
+  if (positionAffinity == UITextStorageDirectionBackward) {
+    // positionAffinity points backwards, otherAffinity points forwards
+    return NSOrderedAscending;
+  }
+  // positionAffinity points forwards, otherAffinity points backwards
+  return NSOrderedDescending;
 }
 
 - (NSInteger)offsetFromPosition:(UITextPosition*)from toPosition:(UITextPosition*)toPosition {
@@ -1456,17 +1504,20 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
 - (UITextPosition*)positionWithinRange:(UITextRange*)range
                    farthestInDirection:(UITextLayoutDirection)direction {
   NSUInteger index;
+  UITextStorageDirection affinity;
   switch (direction) {
     case UITextLayoutDirectionLeft:
     case UITextLayoutDirectionUp:
       index = ((FlutterTextPosition*)range.start).index;
+      affinity = UITextStorageDirectionForward;
       break;
     case UITextLayoutDirectionRight:
     case UITextLayoutDirectionDown:
       index = ((FlutterTextPosition*)range.end).index;
+      affinity = UITextStorageDirectionBackward;
       break;
   }
-  return [FlutterTextPosition positionWithIndex:index];
+  return [FlutterTextPosition positionWithIndex:index affinity:affinity];
 }
 
 - (UITextRange*)characterRangeByExtendingPosition:(UITextPosition*)position
@@ -1582,6 +1633,8 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
 // and to position the
 // candidates view for multi-stage input methods (e.g., Japanese) when using a
 // physical keyboard.
+// Returns the rect for the queried range, or a subrange through the end of line, if
+// the range encompasses multiple lines.
 - (CGRect)firstRectForRange:(UITextRange*)range {
   NSAssert([range.start isKindOfClass:[FlutterTextPosition class]],
            @"Expected a FlutterTextPosition for range.start (got %@).", [range.start class]);
@@ -1607,7 +1660,7 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
       _cachedFirstRect = [self localRectFromFrameworkTransform:rect];
     }
 
-    UIView* hostView = _textInputPlugin.get().hostView;
+    UIView* hostView = _textInputPlugin.hostView;
     NSAssert(hostView == nil || [self isDescendantOfView:hostView], @"%@ is not a descendant of %@",
              self, hostView);
     return hostView ? [hostView convertRect:_cachedFirstRect toView:self] : _cachedFirstRect;
@@ -1615,16 +1668,45 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
 
   if (_scribbleInteractionStatus == FlutterScribbleInteractionStatusNone &&
       _scribbleFocusStatus == FlutterScribbleFocusStatusUnfocused) {
-    [self.textInputDelegate flutterTextInputView:self
-            showAutocorrectionPromptRectForStart:start
-                                             end:end
-                                      withClient:_textInputClient];
+    if (@available(iOS 17.0, *)) {
+      // Disable auto-correction highlight feature for iOS 17+.
+      // In iOS 17+, whenever a character is inserted or deleted, the system will always query
+      // the rect for every single character of the current word.
+      // GitHub Issue: https://github.com/flutter/flutter/issues/128406
+    } else {
+      // This tells the framework to show the highlight for incorrectly spelled word that is
+      // about to be auto-corrected.
+      // There is no other UITextInput API that informs about the auto-correction highlight.
+      // So we simply add the call here as a workaround.
+      [self.textInputDelegate flutterTextInputView:self
+              showAutocorrectionPromptRectForStart:start
+                                               end:end
+                                        withClient:_textInputClient];
+    }
+  }
+
+  // The iOS 16 system highlight does not repect the height returned by `firstRectForRange`
+  // API (unlike iOS 17). So we return CGRectZero to hide it (unless if scribble is enabled).
+  // To support scribble's advanced gestures (e.g. insert a space with a vertical bar),
+  // at least 1 character's width is required.
+  if (@available(iOS 17, *)) {
+    // No-op
+  } else if (![self isScribbleAvailable]) {
+    return CGRectZero;
   }
 
   NSUInteger first = start;
   if (end < start) {
     first = end;
   }
+
+  CGRect startSelectionRect = CGRectNull;
+  CGRect endSelectionRect = CGRectNull;
+  // Selection rects from different langauges may have different minY/maxY.
+  // So we need to iterate through each rects to update minY/maxY.
+  CGFloat minY = CGFLOAT_MAX;
+  CGFloat maxY = CGFLOAT_MIN;
+
   FlutterTextRange* textRange = [FlutterTextRange
       rangeWithNSRange:fml::RangeForCharactersInRange(self.text, NSMakeRange(0, self.text.length))];
   for (NSUInteger i = 0; i < [_selectionRects count]; i++) {
@@ -1635,30 +1717,100 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
         !isLastSelectionRect && _selectionRects[i + 1].position > first;
     if (startsOnOrBeforeStartOfRange &&
         (endOfTextIsAfterStartOfRange || nextSelectionRectIsAfterStartOfRange)) {
-      return _selectionRects[i].rect;
+      // TODO(hellohaunlin): Remove iOS 17 check. The logic should also work for older versions.
+      if (@available(iOS 17, *)) {
+        startSelectionRect = _selectionRects[i].rect;
+      } else {
+        return _selectionRects[i].rect;
+      }
+    }
+    if (!CGRectIsNull(startSelectionRect)) {
+      minY = fmin(minY, CGRectGetMinY(_selectionRects[i].rect));
+      maxY = fmax(maxY, CGRectGetMaxY(_selectionRects[i].rect));
+      BOOL endsOnOrAfterEndOfRange = _selectionRects[i].position >= end - 1;  // end is exclusive
+      BOOL nextSelectionRectIsOnNextLine =
+          !isLastSelectionRect &&
+          // Selection rects from different langauges in 2 lines may overlap with each other.
+          // A good approximation is to check if the center of next rect is below the bottom of
+          // current rect.
+          // TODO(hellohuanlin): Consider passing the line break info from framework.
+          CGRectGetMidY(_selectionRects[i + 1].rect) > CGRectGetMaxY(_selectionRects[i].rect);
+      if (endsOnOrAfterEndOfRange || isLastSelectionRect || nextSelectionRectIsOnNextLine) {
+        endSelectionRect = _selectionRects[i].rect;
+        break;
+      }
     }
   }
-
-  return CGRectZero;
+  if (CGRectIsNull(startSelectionRect) || CGRectIsNull(endSelectionRect)) {
+    return CGRectZero;
+  } else {
+    // fmin/fmax to support both LTR and RTL languages.
+    CGFloat minX = fmin(CGRectGetMinX(startSelectionRect), CGRectGetMinX(endSelectionRect));
+    CGFloat maxX = fmax(CGRectGetMaxX(startSelectionRect), CGRectGetMaxX(endSelectionRect));
+    return CGRectMake(minX, minY, maxX - minX, maxY - minY);
+  }
 }
 
 - (CGRect)caretRectForPosition:(UITextPosition*)position {
-  // TODO(cbracken) Implement.
-
-  // As of iOS 14.4, this call is used by iOS's
-  // _UIKeyboardTextSelectionController to determine the position
-  // of the floating cursor when the user force touches the space
-  // bar to initiate floating cursor.
-  //
-  // It is recommended to return a value that's roughly the
-  // center of kSpacePanBounds to make sure the floating cursor
-  // has ample space in all directions and does not hit kSpacePanBounds.
-  // See the comments in beginFloatingCursorAtPoint.
-  return CGRectZero;
-}
+  NSInteger index = ((FlutterTextPosition*)position).index;
+  UITextStorageDirection affinity = ((FlutterTextPosition*)position).affinity;
+  // Get the selectionRect of the characters before and after the requested caret position.
+  NSArray<UITextSelectionRect*>* rects = [self
+      selectionRectsForRange:[FlutterTextRange
+                                 rangeWithNSRange:fml::RangeForCharactersInRange(
+                                                      self.text,
+                                                      NSMakeRange(
+                                                          MAX(0, index - 1),
+                                                          (index >= (NSInteger)self.text.length)
+                                                              ? 1
+                                                              : 2))]];
+  if (rects.count == 0) {
+    return CGRectZero;
+  }
+  if (index == 0) {
+    // There is no character before the caret, so this will be the bounds of the character after the
+    // caret position.
+    CGRect characterAfterCaret = rects[0].rect;
+    // Return a zero-width rectangle along the upstream edge of the character after the caret
+    // position.
+    if ([rects[0] isKindOfClass:[FlutterTextSelectionRect class]] &&
+        ((FlutterTextSelectionRect*)rects[0]).isRTL) {
+      return CGRectMake(characterAfterCaret.origin.x + characterAfterCaret.size.width,
+                        characterAfterCaret.origin.y, 0, characterAfterCaret.size.height);
+    } else {
+      return CGRectMake(characterAfterCaret.origin.x, characterAfterCaret.origin.y, 0,
+                        characterAfterCaret.size.height);
+    }
+  } else if (rects.count == 2 && affinity == UITextStorageDirectionForward) {
+    // There are characters before and after the caret, with forward direction affinity.
+    // It's better to use the character after the caret.
+    CGRect characterAfterCaret = rects[1].rect;
+    // Return a zero-width rectangle along the upstream edge of the character after the caret
+    // position.
+    if ([rects[1] isKindOfClass:[FlutterTextSelectionRect class]] &&
+        ((FlutterTextSelectionRect*)rects[1]).isRTL) {
+      return CGRectMake(characterAfterCaret.origin.x + characterAfterCaret.size.width,
+                        characterAfterCaret.origin.y, 0, characterAfterCaret.size.height);
+    } else {
+      return CGRectMake(characterAfterCaret.origin.x, characterAfterCaret.origin.y, 0,
+                        characterAfterCaret.size.height);
+    }
+  }
 
-- (CGRect)bounds {
-  return _isFloatingCursorActive ? kSpacePanBounds : super.bounds;
+  // Covers 2 remaining cases:
+  // 1. there are characters before and after the caret, with backward direction affinity.
+  // 2. there is only 1 character before the caret (caret is at the end of text).
+  // For both cases, return a zero-width rectangle along the downstream edge of the character
+  // before the caret position.
+  CGRect characterBeforeCaret = rects[0].rect;
+  if ([rects[0] isKindOfClass:[FlutterTextSelectionRect class]] &&
+      ((FlutterTextSelectionRect*)rects[0]).isRTL) {
+    return CGRectMake(characterBeforeCaret.origin.x, characterBeforeCaret.origin.y, 0,
+                      characterBeforeCaret.size.height);
+  } else {
+    return CGRectMake(characterBeforeCaret.origin.x + characterBeforeCaret.size.width,
+                      characterBeforeCaret.origin.y, 0, characterBeforeCaret.size.height);
+  }
 }
 
 - (UITextPosition*)closestPositionToPoint:(CGPoint)point {
@@ -1667,7 +1819,9 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
              @"Expected a FlutterTextPosition for position (got %@).",
              [_selectedTextRange.start class]);
     NSUInteger currentIndex = ((FlutterTextPosition*)_selectedTextRange.start).index;
-    return [FlutterTextPosition positionWithIndex:currentIndex];
+    UITextStorageDirection currentAffinity =
+        ((FlutterTextPosition*)_selectedTextRange.start).affinity;
+    return [FlutterTextPosition positionWithIndex:currentIndex affinity:currentAffinity];
   }
 
   FlutterTextRange* range = [FlutterTextRange
@@ -1688,9 +1842,11 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
            @"Expected a FlutterTextPosition for range.end (got %@).", [range.end class]);
   NSUInteger start = ((FlutterTextPosition*)range.start).index;
   NSUInteger end = ((FlutterTextPosition*)range.end).index;
-  NSMutableArray* rects = [[[NSMutableArray alloc] init] autorelease];
+  NSMutableArray* rects = [[NSMutableArray alloc] init];
   for (NSUInteger i = 0; i < [_selectionRects count]; i++) {
-    if (_selectionRects[i].position >= start && _selectionRects[i].position <= end) {
+    if (_selectionRects[i].position >= start &&
+        (_selectionRects[i].position < end ||
+         (start == end && _selectionRects[i].position <= end))) {
       float width = _selectionRects[i].rect.size.width;
       if (start == end) {
         width = 0;
@@ -1700,7 +1856,7 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
       FlutterTextSelectionRect* selectionRect = [FlutterTextSelectionRect
           selectionRectWithRectAndInfo:rect
                               position:_selectionRects[i].position
-                      writingDirection:UITextWritingDirectionNatural
+                      writingDirection:NSWritingDirectionNatural
                          containsStart:(i == 0)
                            containsEnd:(i == fml::RangeForCharactersInRange(
                                                  self.text, NSMakeRange(0, self.text.length))
@@ -1720,37 +1876,51 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
   NSUInteger start = ((FlutterTextPosition*)range.start).index;
   NSUInteger end = ((FlutterTextPosition*)range.end).index;
 
-  NSUInteger _closestIndex = 0;
-  CGRect _closestRect = CGRectZero;
-  NSUInteger _closestPosition = 0;
+  // Selecting text using the floating cursor is not as precise as the pencil.
+  // Allow further vertical deviation and base more of the decision on horizontal comparison.
+  CGFloat verticalPrecision = _isFloatingCursorActive ? 10 : 1;
+
+  // Find the selectionRect with a leading-center point that is closest to a given point.
+  BOOL isFirst = YES;
+  NSUInteger _closestRectIndex = 0;
   for (NSUInteger i = 0; i < [_selectionRects count]; i++) {
     NSUInteger position = _selectionRects[i].position;
     if (position >= start && position <= end) {
-      BOOL isFirst = _closestIndex == 0;
-      if (isFirst || IsSelectionRectCloserToPoint(point, _selectionRects[i].rect, _closestRect,
-                                                  /*checkRightBoundary=*/NO)) {
-        _closestIndex = i;
-        _closestRect = _selectionRects[i].rect;
-        _closestPosition = position;
+      if (isFirst ||
+          IsSelectionRectBoundaryCloserToPoint(
+              point, _selectionRects[i].rect, _selectionRects[i].isRTL,
+              /*useTrailingBoundaryOfSelectionRect=*/NO, _selectionRects[_closestRectIndex].rect,
+              _selectionRects[_closestRectIndex].isRTL, verticalPrecision)) {
+        isFirst = NO;
+        _closestRectIndex = i;
       }
     }
   }
 
-  FlutterTextRange* textRange = [FlutterTextRange
-      rangeWithNSRange:fml::RangeForCharactersInRange(self.text, NSMakeRange(0, self.text.length))];
+  FlutterTextPosition* closestPosition =
+      [FlutterTextPosition positionWithIndex:_selectionRects[_closestRectIndex].position
+                                    affinity:UITextStorageDirectionForward];
 
-  if ([_selectionRects count] > 0 && textRange.range.length == end) {
-    NSUInteger i = [_selectionRects count] - 1;
+  // Check if the far side of the closest rect is a better fit (e.g. tapping end of line)
+  // Cannot simply check the _closestRectIndex result from the previous for loop due to RTL
+  // writing direction and the gaps between selectionRects. So we also need to consider
+  // the adjacent selectionRects to refine _closestRectIndex.
+  for (NSUInteger i = MAX(0, _closestRectIndex - 1);
+       i < MIN(_closestRectIndex + 2, [_selectionRects count]); i++) {
     NSUInteger position = _selectionRects[i].position + 1;
-    if (position <= end) {
-      if (IsSelectionRectCloserToPoint(point, _selectionRects[i].rect, _closestRect,
-                                       /*checkRightBoundary=*/YES)) {
-        _closestPosition = position;
+    if (position >= start && position <= end) {
+      if (IsSelectionRectBoundaryCloserToPoint(
+              point, _selectionRects[i].rect, _selectionRects[i].isRTL,
+              /*useTrailingBoundaryOfSelectionRect=*/YES, _selectionRects[_closestRectIndex].rect,
+              _selectionRects[_closestRectIndex].isRTL, verticalPrecision)) {
+        // This is an upstream position
+        closestPosition = [FlutterTextPosition positionWithIndex:position
+                                                        affinity:UITextStorageDirectionBackward];
       }
     }
   }
 
-  return [FlutterTextPosition positionWithIndex:_closestPosition];
+  return closestPosition;
 }
 
 - (UITextRange*)characterRangeAtPoint:(CGPoint)point {
@@ -1759,6 +1929,34 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
   return [FlutterTextRange rangeWithNSRange:fml::RangeForCharacterAtIndex(self.text, currentIndex)];
 }
 
+// Overall logic for floating cursor's "move" gesture and "selection" gesture:
+//
+// Floating cursor's "move" gesture takes 1 finger to force press the space bar, and then move the
+// cursor. The process starts with `beginFloatingCursorAtPoint`. When the finger is moved,
+// `updateFloatingCursorAtPoint` will be called. When the finger is released, `endFloatingCursor`
+// will be called. In all cases, we send the point (relative to the initial point registered in
+// beginFloatingCursorAtPoint) to the framework, so that framework can animate the floating cursor.
+//
+// During the move gesture, the framework only animate the cursor visually. It's only
+// after the gesture is complete, will the framework update the selection to the cursor's
+// new position (with zero selection length). This means during the animation, the visual effect
+// of the cursor is temporarily out of sync with the selection state in both framework and engine.
+// But it will be in sync again after the animation is complete.
+//
+// Floating cursor's "selection" gesture also starts with 1 finger to force press the space bar,
+// so exactly the same functions as the "move gesture" discussed above will be called. When the
+// second finger is pressed, `setSelectedText` will be called. This mechanism requires
+// `closestPositionFromPoint` to be implemented, to allow UIKit to translate the finger touch
+// location displacement to the text range to select. When the selection is completed
+// (i.e. when both of the 2 fingers are released), similar to "move" gesture,
+// the `endFloatingCursor` will be called.
+//
+// When the 2nd finger is pressed, it does not trigger another startFloatingCursor call. So
+// floating cursor move/selection logic has to be implemented in iOS embedder rather than
+// just the framework side.
+//
+// Whenever a selection is updated, the engine sends the new selection to the framework. So unlike
+// the move gesture, the selections in the framework and the engine are always kept in sync.
 - (void)beginFloatingCursorAtPoint:(CGPoint)point {
   // For "beginFloatingCursorAtPoint" and "updateFloatingCursorAtPoint", "point" is roughly:
   //
@@ -1766,43 +1964,38 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
   //   width >= 0 ? point.x.clamp(boundingBox.left, boundingBox.right) : point.x,
   //   height >= 0 ? point.y.clamp(boundingBox.top, boundingBox.bottom) : point.y,
   // )
-  //   where
-  //     point = keyboardPanGestureRecognizer.translationInView(textInputView) +
-  //     caretRectForPosition boundingBox = self.convertRect(bounds, fromView:textInputView)
-  //     bounds = self._selectionClipRect ?? self.bounds
-  //
-  // It's tricky to provide accurate "bounds" and "caretRectForPosition" so it's preferred to
-  // bypass the clamping and implement the same clamping logic in the framework where we have easy
-  // access to the bounding box of the input field and the caret location.
-  //
-  // The current implementation returns kSpacePanBounds for "bounds" when
-  // "_isFloatingCursorActive" is true. kSpacePanBounds centers "caretRectForPosition" so the
-  // floating cursor has enough clearance in all directions to move around.
+  // where
+  //   point = keyboardPanGestureRecognizer.translationInView(textInputView) + caretRectForPosition
+  //   boundingBox = self.convertRect(bounds, fromView:textInputView)
+  //   bounds = self._selectionClipRect ?? self.bounds
   //
   // It seems impossible to use a negative "width" or "height", as the "convertRect"
   // call always turns a CGRect's negative dimensions into non-negative values, e.g.,
   // (1, 2, -3, -4) would become (-2, -2, 3, 4).
-  _isFloatingCursorActive = true;
+  _isFloatingCursorActive = YES;
+  _floatingCursorOffset = point;
   [self.textInputDelegate flutterTextInputView:self
                           updateFloatingCursor:FlutterFloatingCursorDragStateStart
                                     withClient:_textInputClient
-                                  withPosition:@{@"X" : @(point.x), @"Y" : @(point.y)}];
+                                  withPosition:@{@"X" : @0, @"Y" : @0}];
 }
 
 - (void)updateFloatingCursorAtPoint:(CGPoint)point {
-  _isFloatingCursorActive = true;
   [self.textInputDelegate flutterTextInputView:self
                           updateFloatingCursor:FlutterFloatingCursorDragStateUpdate
                                     withClient:_textInputClient
-                                  withPosition:@{@"X" : @(point.x), @"Y" : @(point.y)}];
+                                  withPosition:@{
+                                    @"X" : @(point.x - _floatingCursorOffset.x),
+                                    @"Y" : @(point.y - _floatingCursorOffset.y)
+                                  }];
 }
 
 - (void)endFloatingCursor {
-  _isFloatingCursorActive = false;
+  _isFloatingCursorActive = NO;
   [self.textInputDelegate flutterTextInputView:self
                           updateFloatingCursor:FlutterFloatingCursorDragStateEnd
                                     withClient:_textInputClient
-                                  withPosition:@{@"X" : @(0), @"Y" : @(0)}];
+                                  withPosition:@{@"X" : @0, @"Y" : @0}];
 }
 
 #pragma mark - UIKeyInput Overrides
@@ -1865,13 +2058,24 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
     @"composingExtent" : @(composingExtent),
   };
 
-  NSDictionary* deltas = @{
-    @"deltas" : @[ deltaToFramework ],
-  };
-
-  [self.textInputDelegate flutterTextInputView:self
-                           updateEditingClient:_textInputClient
-                                     withDelta:deltas];
+  [_pendingDeltas addObject:deltaToFramework];
+
+  if (_pendingDeltas.count == 1) {
+    __weak FlutterTextInputView* weakSelf = self;
+    dispatch_async(dispatch_get_main_queue(), ^{
+      __strong FlutterTextInputView* strongSelf = weakSelf;
+      if (strongSelf && strongSelf.pendingDeltas.count > 0) {
+        NSDictionary* deltas = @{
+          @"deltas" : strongSelf.pendingDeltas,
+        };
+
+        [strongSelf.textInputDelegate flutterTextInputView:strongSelf
+                                       updateEditingClient:strongSelf->_textInputClient
+                                                 withDelta:deltas];
+        [strongSelf.pendingDeltas removeAllObjects];
+      }
+    });
+  }
 }
 
 - (BOOL)hasText {
@@ -1898,23 +2102,25 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
     NSUInteger rectPosition = _selectionRects[i].position;
     if (rectPosition == insertPosition) {
       for (NSUInteger j = 0; j <= text.length; j++) {
-        [copiedRects
-            addObject:[FlutterTextSelectionRect selectionRectWithRect:_selectionRects[i].rect
-                                                             position:rectPosition + j]];
+        [copiedRects addObject:[FlutterTextSelectionRect
+                                   selectionRectWithRect:_selectionRects[i].rect
+                                                position:rectPosition + j
+                                        writingDirection:_selectionRects[i].writingDirection]];
       }
     } else {
       if (rectPosition > insertPosition) {
         rectPosition = rectPosition + text.length;
       }
-      [copiedRects addObject:[FlutterTextSelectionRect selectionRectWithRect:_selectionRects[i].rect
-                                                                    position:rectPosition]];
+      [copiedRects addObject:[FlutterTextSelectionRect
+                                 selectionRectWithRect:_selectionRects[i].rect
+                                              position:rectPosition
+                                      writingDirection:_selectionRects[i].writingDirection]];
     }
   }
 
   _scribbleFocusStatus = FlutterScribbleFocusStatusUnfocused;
   [self resetScribbleInteractionStatusIfEnding];
   self.selectionRects = copiedRects;
-  [copiedRects release];
   _selectionAffinity = kTextAffinityDownstream;
   [self replaceRange:_selectedTextRange withText:text];
 }
@@ -1924,7 +2130,7 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
                  insertTextPlaceholderWithSize:size
                                     withClient:_textInputClient];
   _hasPlaceholder = YES;
-  return [[[FlutterTextPlaceholder alloc] init] autorelease];
+  return [[FlutterTextPlaceholder alloc] init];
 }
 
 - (void)removeTextPlaceholder:(UITextPlaceholder*)textPlaceholder API_AVAILABLE(ios(13.0)) {
@@ -1963,7 +2169,6 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
       }
 
       _selectedTextRange = [[FlutterTextRange rangeWithNSRange:newRange] copy];
-      [oldSelectedRange release];
     }
   }
 
@@ -2009,22 +2214,22 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
 #pragma mark - Key Events Handling
 - (void)pressesBegan:(NSSet<UIPress*>*)presses
            withEvent:(UIPressesEvent*)event API_AVAILABLE(ios(9.0)) {
-  [_textInputPlugin.get().viewController pressesBegan:presses withEvent:event];
+  [_textInputPlugin.viewController pressesBegan:presses withEvent:event];
 }
 
 - (void)pressesChanged:(NSSet<UIPress*>*)presses
              withEvent:(UIPressesEvent*)event API_AVAILABLE(ios(9.0)) {
-  [_textInputPlugin.get().viewController pressesChanged:presses withEvent:event];
+  [_textInputPlugin.viewController pressesChanged:presses withEvent:event];
 }
 
 - (void)pressesEnded:(NSSet<UIPress*>*)presses
            withEvent:(UIPressesEvent*)event API_AVAILABLE(ios(9.0)) {
-  [_textInputPlugin.get().viewController pressesEnded:presses withEvent:event];
+  [_textInputPlugin.viewController pressesEnded:presses withEvent:event];
 }
 
 - (void)pressesCancelled:(NSSet<UIPress*>*)presses
                withEvent:(UIPressesEvent*)event API_AVAILABLE(ios(9.0)) {
-  [_textInputPlugin.get().viewController pressesCancelled:presses withEvent:event];
+  [_textInputPlugin.viewController pressesCancelled:presses withEvent:event];
 }
 
 @end
@@ -2064,13 +2269,13 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
 @end
 
 @interface FlutterTimerProxy : NSObject
-@property(nonatomic, assign) FlutterTextInputPlugin* target;
+@property(nonatomic, weak) FlutterTextInputPlugin* target;
 @end
 
 @implementation FlutterTimerProxy
 
 + (instancetype)proxyWithTarget:(FlutterTextInputPlugin*)target {
-  FlutterTimerProxy* proxy = [[self new] autorelease];
+  FlutterTimerProxy* proxy = [[self alloc] init];
   if (proxy) {
     proxy.target = target;
   }
@@ -2089,44 +2294,52 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
     NSMutableDictionary<NSString*, FlutterTextInputView*>* autofillContext;
 @property(nonatomic, retain) FlutterTextInputView* activeView;
 @property(nonatomic, retain) FlutterTextInputViewAccessibilityHider* inputHider;
-@property(nonatomic, readonly) id<FlutterViewResponder> viewResponder;
+@property(nonatomic, readonly, weak) id<FlutterViewResponder> viewResponder;
+
+@property(nonatomic, strong) UIView* keyboardViewContainer;
+@property(nonatomic, strong) UIView* keyboardView;
+@property(nonatomic, strong) UIView* cachedFirstResponder;
+@property(nonatomic, assign) CGRect keyboardRect;
+@property(nonatomic, assign) CGFloat previousPointerYPosition;
+@property(nonatomic, assign) CGFloat pointerYVelocity;
 @end
 
 @implementation FlutterTextInputPlugin {
   NSTimer* _enableFlutterTextInputViewAccessibilityTimer;
-  std::unique_ptr<fml::WeakPtrFactory<FlutterTextInputPlugin>> _weakFactory;
-  id<FlutterTextInputDelegate> _textInputDelegate;
 }
 
 - (instancetype)initWithDelegate:(id<FlutterTextInputDelegate>)textInputDelegate {
   self = [super init];
-
   if (self) {
     // `_textInputDelegate` is a weak reference because it should retain FlutterTextInputPlugin.
     _textInputDelegate = textInputDelegate;
-    _weakFactory = std::make_unique<fml::WeakPtrFactory<FlutterTextInputPlugin>>(self);
     _autofillContext = [[NSMutableDictionary alloc] init];
     _inputHider = [[FlutterTextInputViewAccessibilityHider alloc] init];
     _scribbleElements = [[NSMutableDictionary alloc] init];
+    _keyboardViewContainer = [[UIView alloc] init];
+
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(handleKeyboardWillShow:)
+                                                 name:UIKeyboardWillShowNotification
+                                               object:nil];
   }
 
   return self;
 }
 
+- (void)handleKeyboardWillShow:(NSNotification*)notification {
+  NSDictionary* keyboardInfo = [notification userInfo];
+  NSValue* keyboardFrameEnd = [keyboardInfo valueForKey:UIKeyboardFrameEndUserInfoKey];
+  _keyboardRect = [keyboardFrameEnd CGRectValue];
+}
+
 - (void)dealloc {
-  _weakFactory.reset();
   [self hideTextInput];
-  [_activeView release];
-  [_inputHider release];
-  [_autofillContext release];
-  [_scribbleElements release];
-  [super dealloc];
 }
 
 - (void)removeEnableFlutterTextInputViewAccessibilityTimer {
   if (_enableFlutterTextInputViewAccessibilityTimer) {
     [_enableFlutterTextInputViewAccessibilityTimer invalidate];
-    [_enableFlutterTextInputViewAccessibilityTimer release];
     _enableFlutterTextInputViewAccessibilityTimer = nil;
   }
 }
@@ -2135,14 +2348,6 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
   return _activeView;
 }
 
-- (id<FlutterTextInputDelegate>)textInputDelegate {
-  return _textInputDelegate;
-}
-
-- (fml::WeakPtr<FlutterTextInputPlugin>)weakPtr {
-  return _weakFactory->GetWeakPtr();
-}
-
 - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
   NSString* method = call.method;
   id args = call.arguments;
@@ -2186,24 +2391,153 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
   } else if ([method isEqualToString:kStartLiveTextInputMethod]) {
     [self startLiveTextInput];
     result(nil);
+  } else if ([method isEqualToString:kUpdateConfigMethod]) {
+    [self updateConfig:args];
+    result(nil);
+  } else if ([method isEqualToString:kOnInteractiveKeyboardPointerMoveMethod]) {
+    CGFloat pointerY = (CGFloat)[args[@"pointerY"] doubleValue];
+    [self handlePointerMove:pointerY];
+    result(nil);
+  } else if ([method isEqualToString:kOnInteractiveKeyboardPointerUpMethod]) {
+    CGFloat pointerY = (CGFloat)[args[@"pointerY"] doubleValue];
+    [self handlePointerUp:pointerY];
+    result(nil);
   } else {
     result(FlutterMethodNotImplemented);
   }
 }
 
+- (void)handlePointerUp:(CGFloat)pointerY {
+  if (_keyboardView.superview != nil) {
+    // Done to avoid the issue of a pointer up done without a screenshot
+    // View must be loaded at this point.
+    UIScreen* screen = _viewController.flutterScreenIfViewLoaded;
+    CGFloat screenHeight = screen.bounds.size.height;
+    CGFloat keyboardHeight = _keyboardRect.size.height;
+    // Negative velocity indicates a downward movement
+    BOOL shouldDismissKeyboardBasedOnVelocity = _pointerYVelocity < 0;
+    [UIView animateWithDuration:kKeyboardAnimationTimeToCompleteion
+        animations:^{
+          double keyboardDestination =
+              shouldDismissKeyboardBasedOnVelocity ? screenHeight : screenHeight - keyboardHeight;
+          _keyboardViewContainer.frame = CGRectMake(
+              0, keyboardDestination, _viewController.flutterScreenIfViewLoaded.bounds.size.width,
+              _keyboardViewContainer.frame.size.height);
+        }
+        completion:^(BOOL finished) {
+          if (shouldDismissKeyboardBasedOnVelocity) {
+            [self.textInputDelegate flutterTextInputView:self.activeView
+                didResignFirstResponderWithTextInputClient:self.activeView.textInputClient];
+            [self dismissKeyboardScreenshot];
+          } else {
+            [self showKeyboardAndRemoveScreenshot];
+          }
+        }];
+  }
+}
+
+- (void)dismissKeyboardScreenshot {
+  for (UIView* subView in _keyboardViewContainer.subviews) {
+    [subView removeFromSuperview];
+  }
+}
+
+- (void)showKeyboardAndRemoveScreenshot {
+  [UIView setAnimationsEnabled:NO];
+  [_cachedFirstResponder becomeFirstResponder];
+  // UIKit does not immediately access the areAnimationsEnabled Boolean so a delay is needed before
+  // returned
+  dispatch_after(dispatch_time(DISPATCH_TIME_NOW, kKeyboardAnimationDelaySeconds * NSEC_PER_SEC),
+                 dispatch_get_main_queue(), ^{
+                   [UIView setAnimationsEnabled:YES];
+                   [self dismissKeyboardScreenshot];
+                 });
+}
+
+- (void)handlePointerMove:(CGFloat)pointerY {
+  // View must be loaded at this point.
+  UIScreen* screen = _viewController.flutterScreenIfViewLoaded;
+  CGFloat screenHeight = screen.bounds.size.height;
+  CGFloat keyboardHeight = _keyboardRect.size.height;
+  if (screenHeight - keyboardHeight <= pointerY) {
+    // If the pointer is within the bounds of the keyboard.
+    if (_keyboardView.superview == nil) {
+      // If no screenshot has been taken.
+      [self takeKeyboardScreenshotAndDisplay];
+      [self hideKeyboardWithoutAnimationAndAvoidCursorDismissUpdate];
+    } else {
+      [self setKeyboardContainerHeight:pointerY];
+      _pointerYVelocity = _previousPointerYPosition - pointerY;
+    }
+  } else {
+    if (_keyboardView.superview != nil) {
+      // Keeps keyboard at proper height.
+      _keyboardViewContainer.frame = _keyboardRect;
+      _pointerYVelocity = _previousPointerYPosition - pointerY;
+    }
+  }
+  _previousPointerYPosition = pointerY;
+}
+
+- (void)setKeyboardContainerHeight:(CGFloat)pointerY {
+  CGRect frameRect = _keyboardRect;
+  frameRect.origin.y = pointerY;
+  _keyboardViewContainer.frame = frameRect;
+}
+
+- (void)hideKeyboardWithoutAnimationAndAvoidCursorDismissUpdate {
+  [UIView setAnimationsEnabled:NO];
+  _cachedFirstResponder = UIApplication.sharedApplication.keyWindow.flutterFirstResponder;
+  _activeView.preventCursorDismissWhenResignFirstResponder = YES;
+  [_cachedFirstResponder resignFirstResponder];
+  _activeView.preventCursorDismissWhenResignFirstResponder = NO;
+  [UIView setAnimationsEnabled:YES];
+}
+
+- (void)takeKeyboardScreenshotAndDisplay {
+  // View must be loaded at this point
+  UIScreen* screen = _viewController.flutterScreenIfViewLoaded;
+  UIView* keyboardSnap = [screen snapshotViewAfterScreenUpdates:YES];
+  keyboardSnap = [keyboardSnap resizableSnapshotViewFromRect:_keyboardRect
+                                          afterScreenUpdates:YES
+                                               withCapInsets:UIEdgeInsetsZero];
+  _keyboardView = keyboardSnap;
+  [_keyboardViewContainer addSubview:_keyboardView];
+  if (_keyboardViewContainer.superview == nil) {
+    [UIApplication.sharedApplication.delegate.window.rootViewController.view
+        addSubview:_keyboardViewContainer];
+  }
+  _keyboardViewContainer.layer.zPosition = NSIntegerMax;
+  _keyboardViewContainer.frame = _keyboardRect;
+}
+
 - (void)setEditableSizeAndTransform:(NSDictionary*)dictionary {
-  [_activeView setEditableTransform:dictionary[@"transform"]];
+  NSArray* transform = dictionary[@"transform"];
+  [_activeView setEditableTransform:transform];
+  const int leftIndex = 12;
+  const int topIndex = 13;
   if ([_activeView isScribbleAvailable]) {
     // This is necessary to set up where the scribble interactable element will be.
-    int leftIndex = 12;
-    int topIndex = 13;
     _inputHider.frame =
-        CGRectMake([dictionary[@"transform"][leftIndex] intValue],
-                   [dictionary[@"transform"][topIndex] intValue], [dictionary[@"width"] intValue],
-                   [dictionary[@"height"] intValue]);
+        CGRectMake([transform[leftIndex] intValue], [transform[topIndex] intValue],
+                   [dictionary[@"width"] intValue], [dictionary[@"height"] intValue]);
     _activeView.frame =
         CGRectMake(0, 0, [dictionary[@"width"] intValue], [dictionary[@"height"] intValue]);
     _activeView.tintColor = [UIColor clearColor];
+  } else {
+    // TODO(hellohuanlin): Also need to handle iOS 16 case, where the auto-correction highlight does
+    // not match the size of text.
+    // See https://github.com/flutter/flutter/issues/131695
+    if (@available(iOS 17, *)) {
+      // Move auto-correction highlight to overlap with the actual text.
+      // This is to fix an issue where the system auto-correction highlight is displayed at
+      // the top left corner of the screen on iOS 17+.
+      // This problem also happens on iOS 16, but the size of highlight does not match the text.
+      // See https://github.com/flutter/flutter/issues/131695
+      // TODO(hellohuanlin): Investigate if we can use non-zero size.
+      _inputHider.frame =
+          CGRectMake([transform[leftIndex] intValue], [transform[topIndex] intValue], 0, 0);
+    }
   }
 }
 
@@ -2216,17 +2550,25 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
   _activeView.markedRect = rect.size.width < 0 && rect.size.height < 0 ? kInvalidFirstRect : rect;
 }
 
-- (void)setSelectionRects:(NSArray*)rects {
+- (void)setSelectionRects:(NSArray*)encodedRects {
   NSMutableArray<FlutterTextSelectionRect*>* rectsAsRect =
-      [[[NSMutableArray alloc] initWithCapacity:[rects count]] autorelease];
-  for (NSUInteger i = 0; i < [rects count]; i++) {
-    NSArray<NSNumber*>* rect = rects[i];
-    [rectsAsRect
-        addObject:[FlutterTextSelectionRect
-                      selectionRectWithRect:CGRectMake([rect[0] floatValue], [rect[1] floatValue],
-                                                       [rect[2] floatValue], [rect[3] floatValue])
-                                   position:[rect[4] unsignedIntegerValue]]];
-  }
+      [[NSMutableArray alloc] initWithCapacity:[encodedRects count]];
+  for (NSUInteger i = 0; i < [encodedRects count]; i++) {
+    NSArray<NSNumber*>* encodedRect = encodedRects[i];
+    [rectsAsRect addObject:[FlutterTextSelectionRect
+                               selectionRectWithRect:CGRectMake([encodedRect[0] floatValue],
+                                                                [encodedRect[1] floatValue],
+                                                                [encodedRect[2] floatValue],
+                                                                [encodedRect[3] floatValue])
+                                            position:[encodedRect[4] unsignedIntegerValue]
+                                    writingDirection:[encodedRect[5] unsignedIntegerValue] == 1
+                                                         ? NSWritingDirectionLeftToRight
+                                                         : NSWritingDirectionRightToLeft]];
+  }
+
+  // TODO(hellohuanlin): Investigate why notifying the text input system about text changes (via
+  // textWillChange and textDidChange APIs) causes a bug where we cannot enter text with IME
+  // keyboards. Issue: https://github.com/flutter/flutter/issues/133908
   _activeView.selectionRects = rectsAsRect;
 }
 
@@ -2252,11 +2594,11 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
   // This results in accessibility focus stuck at the FlutterTextInputView.
   if (!_enableFlutterTextInputViewAccessibilityTimer) {
     _enableFlutterTextInputViewAccessibilityTimer =
-        [[NSTimer scheduledTimerWithTimeInterval:kUITextInputAccessibilityEnablingDelaySeconds
-                                          target:[FlutterTimerProxy proxyWithTarget:self]
-                                        selector:@selector(enableActiveViewAccessibility)
-                                        userInfo:nil
-                                         repeats:NO] retain];
+        [NSTimer scheduledTimerWithTimeInterval:kUITextInputAccessibilityEnablingDelaySeconds
+                                         target:[FlutterTimerProxy proxyWithTarget:self]
+                                       selector:@selector(enableActiveViewAccessibility)
+                                       userInfo:nil
+                                        repeats:NO];
   }
   [_activeView becomeFirstResponder];
 }
@@ -2363,7 +2705,7 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
       [_autofillContext removeObjectForKey:autofillId];
     }
   }
-  return [newView autorelease];
+  return newView;
 }
 
 - (FlutterTextInputView*)updateAndShowAutofillViews:(NSArray*)fields
@@ -2418,7 +2760,7 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
   if (!inputView) {
     inputView =
         needsPasswordAutofill ? [FlutterSecureTextInputView alloc] : [FlutterTextInputView alloc];
-    inputView = [[inputView initWithOwner:self] autorelease];
+    inputView = [inputView initWithOwner:self];
     [self addToInputParentViewIfNeeded:inputView];
   }
 
@@ -2441,11 +2783,9 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
   return _inputHider.subviews;
 }
 
-// Decommissions (See the "decommission" method on FlutterTextInputView) and removes
-// every installed input field, unless it's in the current autofill context.
+// Removes every installed input field, unless it's in the current autofill context.
 //
-// The active view will be decommissioned and removed from its superview too, if
-// includeActiveView is YES.
+// The active view will be removed from its superview too, if includeActiveView is YES.
 // When clearText is YES, the text on the input fields will be set to empty before
 // they are removed from the view hierarchy, to avoid triggering autofill save.
 // If delayRemoval is true, removeFromSuperview will be scheduled on the runloop and
@@ -2464,7 +2804,6 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
         if (clearText) {
           [inputView replaceRangeLocal:NSMakeRange(0, inputView.text.length) withText:@""];
         }
-        [inputView decommission];
         if (delayRemoval) {
           [inputView performSelector:@selector(removeFromSuperview) withObject:nil afterDelay:0.1];
         } else {
@@ -2506,6 +2845,13 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
   if (![inputView isDescendantOfView:_inputHider]) {
     [_inputHider addSubview:inputView];
   }
+
+  if (_viewController.view == nil) {
+    // If view controller's view has detached from flutter engine, we don't add _inputHider
+    // in parent view to fallback and avoid crash.
+    // https://github.com/flutter/flutter/issues/106404.
+    return;
+  }
   UIView* parentView = self.hostView;
   if (_inputHider.superview != parentView) {
     [parentView addSubview:_inputHider];
@@ -2521,6 +2867,23 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
   _activeView.frame = CGRectZero;
 }
 
+- (void)updateConfig:(NSDictionary*)dictionary {
+  BOOL isSecureTextEntry = [dictionary[kSecureTextEntry] boolValue];
+  for (UIView* view in self.textInputViews) {
+    if ([view isKindOfClass:[FlutterTextInputView class]]) {
+      FlutterTextInputView* inputView = (FlutterTextInputView*)view;
+      // The feature of holding and draging spacebar to move cursor is affected by
+      // secureTextEntry, so when obscureText is updated, we need to update secureTextEntry
+      // and call reloadInputViews.
+      // https://github.com/flutter/flutter/issues/122139
+      if (inputView.isSecureTextEntry != isSecureTextEntry) {
+        inputView.secureTextEntry = isSecureTextEntry;
+        [inputView reloadInputViews];
+      }
+    }
+  }
+}
+
 #pragma mark UIIndirectScribbleInteractionDelegate
 
 - (BOOL)indirectScribbleInteraction:(UIIndirectScribbleInteraction*)interaction
@@ -2581,7 +2944,7 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
        requestElementsInRect:rect
                       result:^(id _Nullable result) {
                         NSMutableArray<UIScribbleElementIdentifier>* elements =
-                            [[[NSMutableArray alloc] init] autorelease];
+                            [[NSMutableArray alloc] init];
                         if ([result isKindOfClass:[NSArray class]]) {
                           for (NSArray* elementArray in result) {
                             [elements addObject:elementArray[0]];
@@ -2601,13 +2964,13 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
 
 #pragma mark - Methods related to Scribble support
 
-- (void)setupIndirectScribbleInteraction:(id<FlutterViewResponder>)viewResponder {
+- (void)setUpIndirectScribbleInteraction:(id<FlutterViewResponder>)viewResponder {
   if (_viewResponder != viewResponder) {
     if (@available(iOS 14.0, *)) {
       UIView* parentView = viewResponder.view;
       if (parentView != nil) {
-        UIIndirectScribbleInteraction* scribbleInteraction = [[[UIIndirectScribbleInteraction alloc]
-            initWithDelegate:(id<UIIndirectScribbleInteractionDelegate>)self] autorelease];
+        UIIndirectScribbleInteraction* scribbleInteraction = [[UIIndirectScribbleInteraction alloc]
+            initWithDelegate:(id<UIIndirectScribbleInteractionDelegate>)self];
         [parentView addInteraction:scribbleInteraction];
       }
     }
@@ -2630,3 +2993,21 @@ static BOOL IsSelectionRectCloserToPoint(CGPoint point,
   return NO;
 }
 @end
+
+/**
+ * Recursively searches the UIView's subviews to locate the First Responder
+ */
+@implementation UIView (FindFirstResponder)
+- (id)flutterFirstResponder {
+  if (self.isFirstResponder) {
+    return self;
+  }
+  for (UIView* subView in self.subviews) {
+    UIView* firstResponder = subView.flutterFirstResponder;
+    if (firstResponder) {
+      return firstResponder;
+    }
+  }
+  return nil;
+}
+@end
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterTextInputPluginTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterTextInputPluginTest.mm
index 462ea9e8359af308d80b51da9d8fe6efa5259cb7..724def096d19cafd57dba289a9a395d2d4773a8f 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterTextInputPluginTest.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterTextInputPluginTest.mm
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#import "flutter/shell/platform/darwin/common/framework/Source/FlutterBinaryMessengerRelay.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine_Test.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h"
 
 #import <OCMock/OCMock.h>
@@ -10,6 +12,7 @@
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
 #import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterEngine.h"
 #import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/UIViewController+FlutterScreenAndSceneIfLoaded.h"
 
 FLUTTER_ASSERT_ARC
 
@@ -58,6 +61,11 @@ FLUTTER_ASSERT_ARC
 
 @interface FlutterTextInputPlugin ()
 @property(nonatomic, assign) FlutterTextInputView* activeView;
+@property(nonatomic, readonly) UIView* inputHider;
+@property(nonatomic, readonly) UIView* keyboardViewContainer;
+@property(nonatomic, readonly) UIView* keyboardView;
+@property(nonatomic, assign) UIView* cachedFirstResponder;
+@property(nonatomic, readonly) CGRect keyboardRect;
 @property(nonatomic, readonly)
     NSMutableDictionary<NSString*, FlutterTextInputView*>* autofillContext;
 
@@ -66,9 +74,10 @@ FLUTTER_ASSERT_ARC
                 delayRemoval:(BOOL)delayRemoval;
 - (NSArray<UIView*>*)textInputViews;
 - (UIView*)hostView;
-- (fml::WeakPtr<FlutterTextInputPlugin>)getWeakPtr;
 - (void)addToInputParentViewIfNeeded:(FlutterTextInputView*)inputView;
 - (void)startLiveTextInput;
+- (void)showKeyboardAndRemoveScreenshot;
+
 @end
 
 @interface FlutterTextInputPluginTest : XCTestCase
@@ -132,6 +141,20 @@ FLUTTER_ASSERT_ARC
                              }];
 }
 
+- (void)flushScheduledAsyncBlocks {
+  __block bool done = false;
+  XCTestExpectation* expectation =
+      [[XCTestExpectation alloc] initWithDescription:@"Testing on main queue"];
+  dispatch_async(dispatch_get_main_queue(), ^{
+    done = true;
+  });
+  dispatch_async(dispatch_get_main_queue(), ^{
+    XCTAssertTrue(done);
+    [expectation fulfill];
+  });
+  [self waitForExpectations:@[ expectation ] timeout:10];
+}
+
 - (NSMutableDictionary*)mutableTemplateCopy {
   if (!_template) {
     _template = @{
@@ -165,8 +188,34 @@ FLUTTER_ASSERT_ARC
   return (FlutterTextRange*)range;
 }
 
+- (void)updateConfig:(NSDictionary*)config {
+  FlutterMethodCall* updateConfigCall =
+      [FlutterMethodCall methodCallWithMethodName:@"TextInput.updateConfig" arguments:config];
+  [textInputPlugin handleMethodCall:updateConfigCall
+                             result:^(id _Nullable result){
+                             }];
+}
+
 #pragma mark - Tests
 
+- (void)testWillNotCrashWhenViewControllerIsNil {
+  FlutterEngine* flutterEngine = [[FlutterEngine alloc] init];
+  FlutterTextInputPlugin* inputPlugin =
+      [[FlutterTextInputPlugin alloc] initWithDelegate:(id<FlutterTextInputDelegate>)flutterEngine];
+  XCTAssertNil(inputPlugin.viewController);
+  FlutterMethodCall* methodCall = [FlutterMethodCall methodCallWithMethodName:@"TextInput.show"
+                                                                    arguments:nil];
+  XCTestExpectation* expectation = [[XCTestExpectation alloc] initWithDescription:@"result called"];
+
+  [inputPlugin handleMethodCall:methodCall
+                         result:^(id _Nullable result) {
+                           XCTAssertNil(result);
+                           [expectation fulfill];
+                         }];
+  XCTAssertNil(inputPlugin.activeView);
+  [self waitForExpectations:@[ expectation ] timeout:1.0];
+}
+
 - (void)testInvokeStartLiveTextInput {
   FlutterMethodCall* methodCall =
       [FlutterMethodCall methodCallWithMethodName:@"TextInput.startLiveTextInput" arguments:nil];
@@ -258,6 +307,20 @@ FLUTTER_ASSERT_ARC
   XCTAssertEqual(inputView.keyboardType, UIKeyboardTypeURL);
 }
 
+- (void)testVisiblePasswordUseAlphanumeric {
+  NSDictionary* config = self.mutableTemplateCopy;
+  [config setValue:@{@"name" : @"TextInputType.visiblePassword"} forKey:@"inputType"];
+  [self setClientId:123 configuration:config];
+
+  // Find all the FlutterTextInputViews we created.
+  NSArray<FlutterTextInputView*>* inputFields = self.installedInputViews;
+
+  FlutterTextInputView* inputView = inputFields[0];
+
+  // Verify keyboardType is set to the value specified in config.
+  XCTAssertEqual(inputView.keyboardType, UIKeyboardTypeASCIICapable);
+}
+
 - (void)testSettingKeyboardTypeNoneDisablesSystemKeyboard {
   NSDictionary* config = self.mutableTemplateCopy;
   [config setValue:@{@"name" : @"TextInputType.none"} forKey:@"inputType"];
@@ -272,18 +335,25 @@ FLUTTER_ASSERT_ARC
   XCTAssertNil(textInputPlugin.activeView.inputViewController);
 }
 
-- (void)testAutocorrectionPromptRectAppears {
+- (void)testAutocorrectionPromptRectAppearsBeforeIOS17AndDoesNotAppearAfterIOS17 {
   FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
   [inputView firstRectForRange:[FlutterTextRange rangeWithNSRange:NSMakeRange(0, 1)]];
 
-  // Verify behavior.
-  OCMVerify([engine flutterTextInputView:inputView
-      showAutocorrectionPromptRectForStart:0
-                                       end:1
-                                withClient:0]);
+  if (@available(iOS 17.0, *)) {
+    // Auto-correction prompt is disabled in iOS 17+.
+    OCMVerify(never(), [engine flutterTextInputView:inputView
+                           showAutocorrectionPromptRectForStart:0
+                                                            end:1
+                                                     withClient:0]);
+  } else {
+    OCMVerify([engine flutterTextInputView:inputView
+        showAutocorrectionPromptRectForStart:0
+                                         end:1
+                                  withClient:0]);
+  }
 }
 
-- (void)testIngoresSelectionChangeIfSelectionIsDisabled {
+- (void)testIgnoresSelectionChangeIfSelectionIsDisabled {
   FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
   __block int updateCount = 0;
   OCMStub([engine flutterTextInputView:inputView updateEditingClient:0 withState:[OCMArg isNotNil]])
@@ -312,6 +382,11 @@ FLUTTER_ASSERT_ARC
 }
 
 - (void)testAutocorrectionPromptRectDoesNotAppearDuringScribble {
+  // Auto-correction prompt is disabled in iOS 17+.
+  if (@available(iOS 17.0, *)) {
+    return;
+  }
+
   if (@available(iOS 14.0, *)) {
     FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
 
@@ -362,10 +437,44 @@ FLUTTER_ASSERT_ARC
   }
 }
 
+- (void)testInputHiderOverlapWithTextWhenScribbleIsDisabledAfterIOS17AndDoesNotOverlapBeforeIOS17 {
+  FlutterTextInputPlugin* myInputPlugin =
+      [[FlutterTextInputPlugin alloc] initWithDelegate:OCMClassMock([FlutterEngine class])];
+
+  FlutterMethodCall* setClientCall =
+      [FlutterMethodCall methodCallWithMethodName:@"TextInput.setClient"
+                                        arguments:@[ @(123), self.mutableTemplateCopy ]];
+  [myInputPlugin handleMethodCall:setClientCall
+                           result:^(id _Nullable result){
+                           }];
+
+  FlutterTextInputView* mockInputView = OCMPartialMock(myInputPlugin.activeView);
+  OCMStub([mockInputView isScribbleAvailable]).andReturn(NO);
+
+  // yOffset = 200.
+  NSArray* yOffsetMatrix = @[ @1, @0, @0, @0, @0, @1, @0, @0, @0, @0, @1, @0, @0, @200, @0, @1 ];
+
+  FlutterMethodCall* setPlatformViewClientCall =
+      [FlutterMethodCall methodCallWithMethodName:@"TextInput.setEditableSizeAndTransform"
+                                        arguments:@{@"transform" : yOffsetMatrix}];
+  [myInputPlugin handleMethodCall:setPlatformViewClientCall
+                           result:^(id _Nullable result){
+                           }];
+
+  if (@available(iOS 17, *)) {
+    XCTAssert(CGRectEqualToRect(myInputPlugin.inputHider.frame, CGRectMake(0, 200, 0, 0)),
+              @"The input hider should overlap with the text on and after iOS 17");
+
+  } else {
+    XCTAssert(CGRectEqualToRect(myInputPlugin.inputHider.frame, CGRectZero),
+              @"The input hider should be on the origin of screen on and before iOS 16.");
+  }
+}
+
 - (void)testTextRangeFromPositionMatchesUITextViewBehavior {
   FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
-  FlutterTextPosition* fromPosition = [[FlutterTextPosition alloc] initWithIndex:2];
-  FlutterTextPosition* toPosition = [[FlutterTextPosition alloc] initWithIndex:0];
+  FlutterTextPosition* fromPosition = [FlutterTextPosition positionWithIndex:2];
+  FlutterTextPosition* toPosition = [FlutterTextPosition positionWithIndex:0];
 
   FlutterTextRange* flutterRange = (FlutterTextRange*)[inputView textRangeFromPosition:fromPosition
                                                                             toPosition:toPosition];
@@ -630,108 +739,261 @@ FLUTTER_ASSERT_ARC
                                              withEvent:[OCMArg isNotNil]]);
 }
 
+- (void)testUpdateSecureTextEntry {
+  NSDictionary* config = self.mutableTemplateCopy;
+  [config setValue:@"YES" forKey:@"obscureText"];
+  [self setClientId:123 configuration:config];
+
+  NSArray<FlutterTextInputView*>* inputFields = self.installedInputViews;
+  FlutterTextInputView* inputView = OCMPartialMock(inputFields[0]);
+
+  __block int callCount = 0;
+  OCMStub([inputView reloadInputViews]).andDo(^(NSInvocation* invocation) {
+    callCount++;
+  });
+
+  XCTAssertTrue(inputView.isSecureTextEntry);
+
+  config = self.mutableTemplateCopy;
+  [config setValue:@"NO" forKey:@"obscureText"];
+  [self updateConfig:config];
+
+  XCTAssertEqual(callCount, 1);
+  XCTAssertFalse(inputView.isSecureTextEntry);
+}
+
+- (void)testInputActionContinueAction {
+  id mockBinaryMessenger = OCMClassMock([FlutterBinaryMessengerRelay class]);
+  FlutterEngine* testEngine = [[FlutterEngine alloc] init];
+  [testEngine setBinaryMessenger:mockBinaryMessenger];
+  [testEngine runWithEntrypoint:FlutterDefaultDartEntrypoint initialRoute:@"test"];
+
+  FlutterTextInputPlugin* inputPlugin =
+      [[FlutterTextInputPlugin alloc] initWithDelegate:(id<FlutterTextInputDelegate>)testEngine];
+  FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:inputPlugin];
+
+  [testEngine flutterTextInputView:inputView
+                     performAction:FlutterTextInputActionContinue
+                        withClient:123];
+
+  FlutterMethodCall* methodCall =
+      [FlutterMethodCall methodCallWithMethodName:@"TextInputClient.performAction"
+                                        arguments:@[ @(123), @"TextInputAction.continueAction" ]];
+  NSData* encodedMethodCall = [[FlutterJSONMethodCodec sharedInstance] encodeMethodCall:methodCall];
+  OCMVerify([mockBinaryMessenger sendOnChannel:@"flutter/textinput" message:encodedMethodCall]);
+}
+
+- (void)testDisablingAutocorrectDisablesSpellChecking {
+  FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
+
+  // Disable the interactive selection.
+  NSDictionary* config = self.mutableTemplateCopy;
+  [inputView configureWithDictionary:config];
+
+  XCTAssertEqual(inputView.autocorrectionType, UITextAutocorrectionTypeDefault);
+  XCTAssertEqual(inputView.spellCheckingType, UITextSpellCheckingTypeDefault);
+
+  [config setValue:@(NO) forKey:@"autocorrect"];
+  [inputView configureWithDictionary:config];
+
+  XCTAssertEqual(inputView.autocorrectionType, UITextAutocorrectionTypeNo);
+  XCTAssertEqual(inputView.spellCheckingType, UITextSpellCheckingTypeNo);
+}
+
+- (void)testReplaceTestLocalAdjustSelectionAndMarkedTextRange {
+  FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
+  [inputView setMarkedText:@"test text" selectedRange:NSMakeRange(0, 5)];
+  NSRange selectedTextRange = ((FlutterTextRange*)inputView.selectedTextRange).range;
+  const NSRange markedTextRange = ((FlutterTextRange*)inputView.markedTextRange).range;
+  XCTAssertEqual(selectedTextRange.location, 0ul);
+  XCTAssertEqual(selectedTextRange.length, 5ul);
+  XCTAssertEqual(markedTextRange.location, 0ul);
+  XCTAssertEqual(markedTextRange.length, 9ul);
+
+  // Replaces space with space.
+  [inputView replaceRange:[FlutterTextRange rangeWithNSRange:NSMakeRange(4, 1)] withText:@" "];
+  selectedTextRange = ((FlutterTextRange*)inputView.selectedTextRange).range;
+
+  XCTAssertEqual(selectedTextRange.location, 5ul);
+  XCTAssertEqual(selectedTextRange.length, 0ul);
+  XCTAssertEqual(inputView.markedTextRange, nil);
+}
+
+- (void)testFlutterTextInputViewOnlyRespondsToInsertionPointColorBelowIOS17 {
+  FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
+  BOOL respondsToInsertionPointColor =
+      [inputView respondsToSelector:@selector(insertionPointColor)];
+  if (@available(iOS 17, *)) {
+    XCTAssertFalse(respondsToInsertionPointColor);
+  } else {
+    XCTAssertTrue(respondsToInsertionPointColor);
+  }
+}
+
 #pragma mark - TextEditingDelta tests
 - (void)testTextEditingDeltasAreGeneratedOnTextInput {
   FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
   inputView.enableDeltaModel = YES;
 
   __block int updateCount = 0;
-  OCMStub([engine flutterTextInputView:inputView updateEditingClient:0 withDelta:[OCMArg isNotNil]])
+
+  [inputView insertText:@"text to insert"];
+  OCMExpect(
+      [engine
+          flutterTextInputView:inputView
+           updateEditingClient:0
+                     withDelta:[OCMArg checkWithBlock:^BOOL(NSDictionary* state) {
+                       return ([[state[@"deltas"] objectAtIndex:0][@"oldText"]
+                                  isEqualToString:@""]) &&
+                              ([[state[@"deltas"] objectAtIndex:0][@"deltaText"]
+                                  isEqualToString:@"text to insert"]) &&
+                              ([[state[@"deltas"] objectAtIndex:0][@"deltaStart"] intValue] == 0) &&
+                              ([[state[@"deltas"] objectAtIndex:0][@"deltaEnd"] intValue] == 0);
+                     }]])
       .andDo(^(NSInvocation* invocation) {
         updateCount++;
       });
+  XCTAssertEqual(updateCount, 0);
+
+  [self flushScheduledAsyncBlocks];
 
-  [inputView insertText:@"text to insert"];
   // Update the framework exactly once.
   XCTAssertEqual(updateCount, 1);
 
-  // Verify correct delta is generated.
-  OCMVerify([engine
-      flutterTextInputView:inputView
-       updateEditingClient:0
-                 withDelta:[OCMArg checkWithBlock:^BOOL(NSDictionary* state) {
-                   return ([[state[@"deltas"] objectAtIndex:0][@"oldText"] isEqualToString:@""]) &&
-                          ([[state[@"deltas"] objectAtIndex:0][@"deltaText"]
-                              isEqualToString:@"text to insert"]) &&
-                          ([[state[@"deltas"] objectAtIndex:0][@"deltaStart"] intValue] == 0) &&
-                          ([[state[@"deltas"] objectAtIndex:0][@"deltaEnd"] intValue] == 0);
-                 }]]);
-
   [inputView deleteBackward];
+  OCMExpect([engine flutterTextInputView:inputView
+                     updateEditingClient:0
+                               withDelta:[OCMArg checkWithBlock:^BOOL(NSDictionary* state) {
+                                 return ([[state[@"deltas"] objectAtIndex:0][@"oldText"]
+                                            isEqualToString:@"text to insert"]) &&
+                                        ([[state[@"deltas"] objectAtIndex:0][@"deltaText"]
+                                            isEqualToString:@""]) &&
+                                        ([[state[@"deltas"] objectAtIndex:0][@"deltaStart"]
+                                             intValue] == 13) &&
+                                        ([[state[@"deltas"] objectAtIndex:0][@"deltaEnd"]
+                                             intValue] == 14);
+                               }]])
+      .andDo(^(NSInvocation* invocation) {
+        updateCount++;
+      });
+  [self flushScheduledAsyncBlocks];
   XCTAssertEqual(updateCount, 2);
 
-  OCMVerify([engine
-      flutterTextInputView:inputView
-       updateEditingClient:0
-                 withDelta:[OCMArg checkWithBlock:^BOOL(NSDictionary* state) {
-                   return ([[state[@"deltas"] objectAtIndex:0][@"oldText"]
-                              isEqualToString:@"text to insert"]) &&
-                          ([[state[@"deltas"] objectAtIndex:0][@"deltaText"]
-                              isEqualToString:@""]) &&
-                          ([[state[@"deltas"] objectAtIndex:0][@"deltaStart"] intValue] == 13) &&
-                          ([[state[@"deltas"] objectAtIndex:0][@"deltaEnd"] intValue] == 14);
-                 }]]);
-
   inputView.selectedTextRange = [FlutterTextRange rangeWithNSRange:NSMakeRange(0, 1)];
+  OCMExpect([engine flutterTextInputView:inputView
+                     updateEditingClient:0
+                               withDelta:[OCMArg checkWithBlock:^BOOL(NSDictionary* state) {
+                                 return ([[state[@"deltas"] objectAtIndex:0][@"oldText"]
+                                            isEqualToString:@"text to inser"]) &&
+                                        ([[state[@"deltas"] objectAtIndex:0][@"deltaText"]
+                                            isEqualToString:@""]) &&
+                                        ([[state[@"deltas"] objectAtIndex:0][@"deltaStart"]
+                                             intValue] == -1) &&
+                                        ([[state[@"deltas"] objectAtIndex:0][@"deltaEnd"]
+                                             intValue] == -1);
+                               }]])
+      .andDo(^(NSInvocation* invocation) {
+        updateCount++;
+      });
+  [self flushScheduledAsyncBlocks];
   XCTAssertEqual(updateCount, 3);
 
-  OCMVerify([engine
-      flutterTextInputView:inputView
-       updateEditingClient:0
-                 withDelta:[OCMArg checkWithBlock:^BOOL(NSDictionary* state) {
-                   return ([[state[@"deltas"] objectAtIndex:0][@"oldText"]
-                              isEqualToString:@"text to inser"]) &&
-                          ([[state[@"deltas"] objectAtIndex:0][@"deltaText"]
-                              isEqualToString:@""]) &&
-                          ([[state[@"deltas"] objectAtIndex:0][@"deltaStart"] intValue] == -1) &&
-                          ([[state[@"deltas"] objectAtIndex:0][@"deltaEnd"] intValue] == -1);
-                 }]]);
-
   [inputView replaceRange:[FlutterTextRange rangeWithNSRange:NSMakeRange(0, 1)]
                  withText:@"replace text"];
+  OCMExpect(
+      [engine
+          flutterTextInputView:inputView
+           updateEditingClient:0
+                     withDelta:[OCMArg checkWithBlock:^BOOL(NSDictionary* state) {
+                       return ([[state[@"deltas"] objectAtIndex:0][@"oldText"]
+                                  isEqualToString:@"text to inser"]) &&
+                              ([[state[@"deltas"] objectAtIndex:0][@"deltaText"]
+                                  isEqualToString:@"replace text"]) &&
+                              ([[state[@"deltas"] objectAtIndex:0][@"deltaStart"] intValue] == 0) &&
+                              ([[state[@"deltas"] objectAtIndex:0][@"deltaEnd"] intValue] == 1);
+                     }]])
+      .andDo(^(NSInvocation* invocation) {
+        updateCount++;
+      });
+  [self flushScheduledAsyncBlocks];
   XCTAssertEqual(updateCount, 4);
 
-  OCMVerify([engine
-      flutterTextInputView:inputView
-       updateEditingClient:0
-                 withDelta:[OCMArg checkWithBlock:^BOOL(NSDictionary* state) {
-                   return ([[state[@"deltas"] objectAtIndex:0][@"oldText"]
-                              isEqualToString:@"text to inser"]) &&
-                          ([[state[@"deltas"] objectAtIndex:0][@"deltaText"]
-                              isEqualToString:@"replace text"]) &&
-                          ([[state[@"deltas"] objectAtIndex:0][@"deltaStart"] intValue] == 0) &&
-                          ([[state[@"deltas"] objectAtIndex:0][@"deltaEnd"] intValue] == 1);
-                 }]]);
-
   [inputView setMarkedText:@"marked text" selectedRange:NSMakeRange(0, 1)];
+  OCMExpect([engine flutterTextInputView:inputView
+                     updateEditingClient:0
+                               withDelta:[OCMArg checkWithBlock:^BOOL(NSDictionary* state) {
+                                 return ([[state[@"deltas"] objectAtIndex:0][@"oldText"]
+                                            isEqualToString:@"replace textext to inser"]) &&
+                                        ([[state[@"deltas"] objectAtIndex:0][@"deltaText"]
+                                            isEqualToString:@"marked text"]) &&
+                                        ([[state[@"deltas"] objectAtIndex:0][@"deltaStart"]
+                                             intValue] == 12) &&
+                                        ([[state[@"deltas"] objectAtIndex:0][@"deltaEnd"]
+                                             intValue] == 12);
+                               }]])
+      .andDo(^(NSInvocation* invocation) {
+        updateCount++;
+      });
+  [self flushScheduledAsyncBlocks];
   XCTAssertEqual(updateCount, 5);
 
-  OCMVerify([engine
-      flutterTextInputView:inputView
-       updateEditingClient:0
-                 withDelta:[OCMArg checkWithBlock:^BOOL(NSDictionary* state) {
-                   return ([[state[@"deltas"] objectAtIndex:0][@"oldText"]
-                              isEqualToString:@"replace textext to inser"]) &&
-                          ([[state[@"deltas"] objectAtIndex:0][@"deltaText"]
-                              isEqualToString:@"marked text"]) &&
-                          ([[state[@"deltas"] objectAtIndex:0][@"deltaStart"] intValue] == 12) &&
-                          ([[state[@"deltas"] objectAtIndex:0][@"deltaEnd"] intValue] == 12);
-                 }]]);
-
   [inputView unmarkText];
+  OCMExpect([engine
+                flutterTextInputView:inputView
+                 updateEditingClient:0
+                           withDelta:[OCMArg checkWithBlock:^BOOL(NSDictionary* state) {
+                             return ([[state[@"deltas"] objectAtIndex:0][@"oldText"]
+                                        isEqualToString:@"replace textmarked textext to inser"]) &&
+                                    ([[state[@"deltas"] objectAtIndex:0][@"deltaText"]
+                                        isEqualToString:@""]) &&
+                                    ([[state[@"deltas"] objectAtIndex:0][@"deltaStart"] intValue] ==
+                                     -1) &&
+                                    ([[state[@"deltas"] objectAtIndex:0][@"deltaEnd"] intValue] ==
+                                     -1);
+                           }]])
+      .andDo(^(NSInvocation* invocation) {
+        updateCount++;
+      });
+  [self flushScheduledAsyncBlocks];
+
   XCTAssertEqual(updateCount, 6);
+  OCMVerifyAll(engine);
+}
 
-  OCMVerify([engine
-      flutterTextInputView:inputView
-       updateEditingClient:0
-                 withDelta:[OCMArg checkWithBlock:^BOOL(NSDictionary* state) {
-                   return ([[state[@"deltas"] objectAtIndex:0][@"oldText"]
-                              isEqualToString:@"replace textmarked textext to inser"]) &&
-                          ([[state[@"deltas"] objectAtIndex:0][@"deltaText"]
-                              isEqualToString:@""]) &&
-                          ([[state[@"deltas"] objectAtIndex:0][@"deltaStart"] intValue] == -1) &&
-                          ([[state[@"deltas"] objectAtIndex:0][@"deltaEnd"] intValue] == -1);
-                 }]]);
+- (void)testTextEditingDeltasAreBatchedAndForwardedToFramework {
+  // Setup
+  FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
+  inputView.enableDeltaModel = YES;
+
+  // Expected call.
+  OCMExpect([engine flutterTextInputView:inputView
+                     updateEditingClient:0
+                               withDelta:[OCMArg checkWithBlock:^BOOL(NSDictionary* state) {
+                                 NSArray* deltas = state[@"deltas"];
+                                 NSDictionary* firstDelta = deltas[0];
+                                 NSDictionary* secondDelta = deltas[1];
+                                 NSDictionary* thirdDelta = deltas[2];
+                                 return [firstDelta[@"oldText"] isEqualToString:@""] &&
+                                        [firstDelta[@"deltaText"] isEqualToString:@"-"] &&
+                                        [firstDelta[@"deltaStart"] intValue] == 0 &&
+                                        [firstDelta[@"deltaEnd"] intValue] == 0 &&
+                                        [secondDelta[@"oldText"] isEqualToString:@"-"] &&
+                                        [secondDelta[@"deltaText"] isEqualToString:@""] &&
+                                        [secondDelta[@"deltaStart"] intValue] == 0 &&
+                                        [secondDelta[@"deltaEnd"] intValue] == 1 &&
+                                        [thirdDelta[@"oldText"] isEqualToString:@""] &&
+                                        [thirdDelta[@"deltaText"] isEqualToString:@"—"] &&
+                                        [thirdDelta[@"deltaStart"] intValue] == 0 &&
+                                        [thirdDelta[@"deltaEnd"] intValue] == 0;
+                               }]]);
+
+  // Simulate user input.
+  [inputView insertText:@"-"];
+  [inputView deleteBackward];
+  [inputView insertText:@"—"];
+
+  [self flushScheduledAsyncBlocks];
+  OCMVerifyAll(engine);
 }
 
 - (void)testTextEditingDeltasAreGeneratedOnSetMarkedTextReplacement {
@@ -750,11 +1012,10 @@ FLUTTER_ASSERT_ARC
   UITextRange* range = [FlutterTextRange rangeWithNSRange:NSMakeRange(13, 4)];
   inputView.markedTextRange = range;
   inputView.selectedTextRange = nil;
+  [self flushScheduledAsyncBlocks];
   XCTAssertEqual(updateCount, 1);
 
   [inputView setMarkedText:@"new marked text." selectedRange:NSMakeRange(0, 1)];
-  XCTAssertEqual(updateCount, 2);
-
   OCMVerify([engine
       flutterTextInputView:inputView
        updateEditingClient:0
@@ -766,6 +1027,8 @@ FLUTTER_ASSERT_ARC
                           ([[state[@"deltas"] objectAtIndex:0][@"deltaStart"] intValue] == 13) &&
                           ([[state[@"deltas"] objectAtIndex:0][@"deltaEnd"] intValue] == 17);
                  }]]);
+  [self flushScheduledAsyncBlocks];
+  XCTAssertEqual(updateCount, 2);
 }
 
 - (void)testTextEditingDeltasAreGeneratedOnSetMarkedTextInsertion {
@@ -779,16 +1042,16 @@ FLUTTER_ASSERT_ARC
       });
 
   [inputView.text setString:@"Some initial text"];
+  [self flushScheduledAsyncBlocks];
   XCTAssertEqual(updateCount, 0);
 
   UITextRange* range = [FlutterTextRange rangeWithNSRange:NSMakeRange(13, 4)];
   inputView.markedTextRange = range;
   inputView.selectedTextRange = nil;
+  [self flushScheduledAsyncBlocks];
   XCTAssertEqual(updateCount, 1);
 
   [inputView setMarkedText:@"text." selectedRange:NSMakeRange(0, 1)];
-  XCTAssertEqual(updateCount, 2);
-
   OCMVerify([engine
       flutterTextInputView:inputView
        updateEditingClient:0
@@ -800,6 +1063,8 @@ FLUTTER_ASSERT_ARC
                           ([[state[@"deltas"] objectAtIndex:0][@"deltaStart"] intValue] == 13) &&
                           ([[state[@"deltas"] objectAtIndex:0][@"deltaEnd"] intValue] == 17);
                  }]]);
+  [self flushScheduledAsyncBlocks];
+  XCTAssertEqual(updateCount, 2);
 }
 
 - (void)testTextEditingDeltasAreGeneratedOnSetMarkedTextDeletion {
@@ -813,16 +1078,16 @@ FLUTTER_ASSERT_ARC
       });
 
   [inputView.text setString:@"Some initial text"];
+  [self flushScheduledAsyncBlocks];
   XCTAssertEqual(updateCount, 0);
 
   UITextRange* range = [FlutterTextRange rangeWithNSRange:NSMakeRange(13, 4)];
   inputView.markedTextRange = range;
   inputView.selectedTextRange = nil;
+  [self flushScheduledAsyncBlocks];
   XCTAssertEqual(updateCount, 1);
 
   [inputView setMarkedText:@"tex" selectedRange:NSMakeRange(0, 1)];
-  XCTAssertEqual(updateCount, 2);
-
   OCMVerify([engine
       flutterTextInputView:inputView
        updateEditingClient:0
@@ -834,6 +1099,8 @@ FLUTTER_ASSERT_ARC
                           ([[state[@"deltas"] objectAtIndex:0][@"deltaStart"] intValue] == 13) &&
                           ([[state[@"deltas"] objectAtIndex:0][@"deltaEnd"] intValue] == 17);
                  }]]);
+  [self flushScheduledAsyncBlocks];
+  XCTAssertEqual(updateCount, 2);
 }
 
 #pragma mark - EditingState tests
@@ -879,23 +1146,29 @@ FLUTTER_ASSERT_ARC
       });
 
   [inputView insertText:@"text to insert"];
+  [self flushScheduledAsyncBlocks];
   // Update the framework exactly once.
   XCTAssertEqual(updateCount, 1);
 
   [inputView deleteBackward];
+  [self flushScheduledAsyncBlocks];
   XCTAssertEqual(updateCount, 2);
 
   inputView.selectedTextRange = [FlutterTextRange rangeWithNSRange:NSMakeRange(0, 1)];
+  [self flushScheduledAsyncBlocks];
   XCTAssertEqual(updateCount, 3);
 
   [inputView replaceRange:[FlutterTextRange rangeWithNSRange:NSMakeRange(0, 1)]
                  withText:@"replace text"];
+  [self flushScheduledAsyncBlocks];
   XCTAssertEqual(updateCount, 4);
 
   [inputView setMarkedText:@"marked text" selectedRange:NSMakeRange(0, 1)];
+  [self flushScheduledAsyncBlocks];
   XCTAssertEqual(updateCount, 5);
 
   [inputView unmarkText];
+  [self flushScheduledAsyncBlocks];
   XCTAssertEqual(updateCount, 6);
 }
 
@@ -950,33 +1223,44 @@ FLUTTER_ASSERT_ARC
       });
 
   [inputView.text setString:@"BEFORE"];
+  [self flushScheduledAsyncBlocks];
   XCTAssertEqual(updateCount, 0);
 
   inputView.markedTextRange = nil;
   inputView.selectedTextRange = nil;
+  [self flushScheduledAsyncBlocks];
   XCTAssertEqual(updateCount, 1);
 
   // Text changes don't trigger an update.
   XCTAssertEqual(updateCount, 1);
   [inputView setTextInputState:@{@"text" : @"AFTER"}];
+  [self flushScheduledAsyncBlocks];
   XCTAssertEqual(updateCount, 1);
+
   [inputView setTextInputState:@{@"text" : @"AFTER"}];
+  [self flushScheduledAsyncBlocks];
   XCTAssertEqual(updateCount, 1);
 
   // Selection changes don't trigger an update.
   [inputView
       setTextInputState:@{@"text" : @"SELECTION", @"selectionBase" : @0, @"selectionExtent" : @3}];
+  [self flushScheduledAsyncBlocks];
   XCTAssertEqual(updateCount, 1);
+
   [inputView
       setTextInputState:@{@"text" : @"SELECTION", @"selectionBase" : @1, @"selectionExtent" : @3}];
+  [self flushScheduledAsyncBlocks];
   XCTAssertEqual(updateCount, 1);
 
   // Composing region changes don't trigger an update.
   [inputView
       setTextInputState:@{@"text" : @"COMPOSING", @"composingBase" : @1, @"composingExtent" : @2}];
+  [self flushScheduledAsyncBlocks];
   XCTAssertEqual(updateCount, 1);
+
   [inputView
       setTextInputState:@{@"text" : @"COMPOSING", @"composingBase" : @1, @"composingExtent" : @3}];
+  [self flushScheduledAsyncBlocks];
   XCTAssertEqual(updateCount, 1);
 }
 
@@ -1015,15 +1299,15 @@ FLUTTER_ASSERT_ARC
     [mockInputView insertText:@"aaaa"];
     [mockInputView selectAll:nil];
 
-    XCTAssertFalse([mockInputView canPerformAction:@selector(copy:) withSender:NULL]);
+    XCTAssertTrue([mockInputView canPerformAction:@selector(copy:) withSender:NULL]);
     XCTAssertTrue([mockInputView canPerformAction:@selector(copy:) withSender:@"sender"]);
     XCTAssertFalse([mockInputView canPerformAction:@selector(paste:) withSender:NULL]);
     XCTAssertFalse([mockInputView canPerformAction:@selector(paste:) withSender:@"sender"]);
 
     [mockInputView copy:NULL];
-    XCTAssertFalse([mockInputView canPerformAction:@selector(copy:) withSender:NULL]);
+    XCTAssertTrue([mockInputView canPerformAction:@selector(copy:) withSender:NULL]);
     XCTAssertTrue([mockInputView canPerformAction:@selector(copy:) withSender:@"sender"]);
-    XCTAssertFalse([mockInputView canPerformAction:@selector(paste:) withSender:NULL]);
+    XCTAssertTrue([mockInputView canPerformAction:@selector(paste:) withSender:NULL]);
     XCTAssertTrue([mockInputView canPerformAction:@selector(paste:) withSender:@"sender"]);
   }
 }
@@ -1288,24 +1572,295 @@ FLUTTER_ASSERT_ARC
                                   [inputView firstRectForRange:range]));
 }
 
-- (void)testFirstRectForRangeReturnsCorrectSelectionRect {
+- (void)testFirstRectForRangeReturnsNoneZeroRectWhenScribbleIsEnabled {
+  FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
+  [inputView setTextInputState:@{@"text" : @"COMPOSING"}];
+
+  FlutterTextInputView* mockInputView = OCMPartialMock(inputView);
+  OCMStub([mockInputView isScribbleAvailable]).andReturn(YES);
+
+  [inputView setSelectionRects:@[
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(0, 0, 100, 100) position:0U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(100, 0, 100, 100) position:1U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(200, 0, 100, 100) position:2U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(300, 0, 100, 100) position:3U],
+  ]];
+
+  FlutterTextRange* multiRectRange = [FlutterTextRange rangeWithNSRange:NSMakeRange(1, 3)];
+
+  if (@available(iOS 17, *)) {
+    XCTAssertTrue(CGRectEqualToRect(CGRectMake(100, 0, 300, 100),
+                                    [inputView firstRectForRange:multiRectRange]));
+  } else {
+    XCTAssertTrue(CGRectEqualToRect(CGRectMake(100, 0, 100, 100),
+                                    [inputView firstRectForRange:multiRectRange]));
+  }
+}
+
+- (void)testFirstRectForRangeReturnsCorrectRectOnASingleLineLeftToRight {
   FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
   [inputView setTextInputState:@{@"text" : @"COMPOSING"}];
 
-  FlutterTextRange* range = [FlutterTextRange rangeWithNSRange:NSMakeRange(1, 1)];
-  CGRect testRect = CGRectMake(100, 100, 100, 100);
   [inputView setSelectionRects:@[
     [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(0, 0, 100, 100) position:0U],
-    [FlutterTextSelectionRect selectionRectWithRect:testRect position:1U],
-    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(200, 200, 100, 100) position:2U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(100, 0, 100, 100) position:1U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(200, 0, 100, 100) position:2U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(300, 0, 100, 100) position:3U],
+  ]];
+  FlutterTextRange* singleRectRange = [FlutterTextRange rangeWithNSRange:NSMakeRange(1, 1)];
+  if (@available(iOS 17, *)) {
+    XCTAssertTrue(CGRectEqualToRect(CGRectMake(100, 0, 100, 100),
+                                    [inputView firstRectForRange:singleRectRange]));
+  } else {
+    XCTAssertTrue(CGRectEqualToRect(CGRectZero, [inputView firstRectForRange:singleRectRange]));
+  }
+
+  FlutterTextRange* multiRectRange = [FlutterTextRange rangeWithNSRange:NSMakeRange(1, 3)];
+
+  if (@available(iOS 17, *)) {
+    XCTAssertTrue(CGRectEqualToRect(CGRectMake(100, 0, 300, 100),
+                                    [inputView firstRectForRange:multiRectRange]));
+  } else {
+    XCTAssertTrue(CGRectEqualToRect(CGRectZero, [inputView firstRectForRange:multiRectRange]));
+  }
+
+  [inputView setTextInputState:@{@"text" : @"COM"}];
+  FlutterTextRange* rangeOutsideBounds = [FlutterTextRange rangeWithNSRange:NSMakeRange(3, 1)];
+  XCTAssertTrue(CGRectEqualToRect(CGRectZero, [inputView firstRectForRange:rangeOutsideBounds]));
+}
+
+- (void)testFirstRectForRangeReturnsCorrectRectOnASingleLineRightToLeft {
+  FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
+  [inputView setTextInputState:@{@"text" : @"COMPOSING"}];
+
+  [inputView setSelectionRects:@[
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(300, 0, 100, 100) position:0U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(200, 0, 100, 100) position:1U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(100, 0, 100, 100) position:2U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(0, 0, 100, 100) position:3U],
   ]];
-  XCTAssertTrue(CGRectEqualToRect(testRect, [inputView firstRectForRange:range]));
+  FlutterTextRange* singleRectRange = [FlutterTextRange rangeWithNSRange:NSMakeRange(1, 1)];
+  if (@available(iOS 17, *)) {
+    XCTAssertTrue(CGRectEqualToRect(CGRectMake(200, 0, 100, 100),
+                                    [inputView firstRectForRange:singleRectRange]));
+  } else {
+    XCTAssertTrue(CGRectEqualToRect(CGRectZero, [inputView firstRectForRange:singleRectRange]));
+  }
+
+  FlutterTextRange* multiRectRange = [FlutterTextRange rangeWithNSRange:NSMakeRange(1, 3)];
+  if (@available(iOS 17, *)) {
+    XCTAssertTrue(CGRectEqualToRect(CGRectMake(0, 0, 300, 100),
+                                    [inputView firstRectForRange:multiRectRange]));
+  } else {
+    XCTAssertTrue(CGRectEqualToRect(CGRectZero, [inputView firstRectForRange:multiRectRange]));
+  }
 
   [inputView setTextInputState:@{@"text" : @"COM"}];
   FlutterTextRange* rangeOutsideBounds = [FlutterTextRange rangeWithNSRange:NSMakeRange(3, 1)];
   XCTAssertTrue(CGRectEqualToRect(CGRectZero, [inputView firstRectForRange:rangeOutsideBounds]));
 }
 
+- (void)testFirstRectForRangeReturnsCorrectRectOnMultipleLinesLeftToRight {
+  FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
+  [inputView setTextInputState:@{@"text" : @"COMPOSING"}];
+
+  [inputView setSelectionRects:@[
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(0, 0, 100, 100) position:0U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(100, 0, 100, 100) position:1U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(200, 0, 100, 100) position:2U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(300, 0, 100, 100) position:3U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(0, 100, 100, 100) position:4U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(100, 100, 100, 100) position:5U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(200, 100, 100, 100) position:6U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(300, 100, 100, 100) position:7U],
+  ]];
+  FlutterTextRange* singleRectRange = [FlutterTextRange rangeWithNSRange:NSMakeRange(1, 1)];
+  if (@available(iOS 17, *)) {
+    XCTAssertTrue(CGRectEqualToRect(CGRectMake(100, 0, 100, 100),
+                                    [inputView firstRectForRange:singleRectRange]));
+  } else {
+    XCTAssertTrue(CGRectEqualToRect(CGRectZero, [inputView firstRectForRange:singleRectRange]));
+  }
+
+  FlutterTextRange* multiRectRange = [FlutterTextRange rangeWithNSRange:NSMakeRange(1, 4)];
+
+  if (@available(iOS 17, *)) {
+    XCTAssertTrue(CGRectEqualToRect(CGRectMake(100, 0, 300, 100),
+                                    [inputView firstRectForRange:multiRectRange]));
+  } else {
+    XCTAssertTrue(CGRectEqualToRect(CGRectZero, [inputView firstRectForRange:multiRectRange]));
+  }
+}
+
+- (void)testFirstRectForRangeReturnsCorrectRectOnMultipleLinesRightToLeft {
+  FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
+  [inputView setTextInputState:@{@"text" : @"COMPOSING"}];
+
+  [inputView setSelectionRects:@[
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(300, 0, 100, 100) position:0U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(200, 0, 100, 100) position:1U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(100, 0, 100, 100) position:2U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(0, 0, 100, 100) position:3U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(300, 100, 100, 100) position:4U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(200, 100, 100, 100) position:5U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(100, 100, 100, 100) position:6U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(0, 100, 100, 100) position:7U],
+  ]];
+  FlutterTextRange* singleRectRange = [FlutterTextRange rangeWithNSRange:NSMakeRange(1, 1)];
+  if (@available(iOS 17, *)) {
+    XCTAssertTrue(CGRectEqualToRect(CGRectMake(200, 0, 100, 100),
+                                    [inputView firstRectForRange:singleRectRange]));
+  } else {
+    XCTAssertTrue(CGRectEqualToRect(CGRectZero, [inputView firstRectForRange:singleRectRange]));
+  }
+
+  FlutterTextRange* multiRectRange = [FlutterTextRange rangeWithNSRange:NSMakeRange(1, 4)];
+  if (@available(iOS 17, *)) {
+    XCTAssertTrue(CGRectEqualToRect(CGRectMake(0, 0, 300, 100),
+                                    [inputView firstRectForRange:multiRectRange]));
+  } else {
+    XCTAssertTrue(CGRectEqualToRect(CGRectZero, [inputView firstRectForRange:multiRectRange]));
+  }
+}
+
+- (void)testFirstRectForRangeReturnsCorrectRectOnSingleLineWithVaryingMinYAndMaxYLeftToRight {
+  FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
+  [inputView setTextInputState:@{@"text" : @"COMPOSING"}];
+
+  [inputView setSelectionRects:@[
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(0, 0, 100, 100) position:0U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(100, 10, 100, 80)
+                                           position:1U],  // shorter
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(200, -10, 100, 120)
+                                           position:2U],  // taller
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(300, 0, 100, 100) position:3U],
+  ]];
+
+  FlutterTextRange* multiRectRange = [FlutterTextRange rangeWithNSRange:NSMakeRange(1, 3)];
+
+  if (@available(iOS 17, *)) {
+    XCTAssertTrue(CGRectEqualToRect(CGRectMake(100, -10, 300, 120),
+                                    [inputView firstRectForRange:multiRectRange]));
+  } else {
+    XCTAssertTrue(CGRectEqualToRect(CGRectZero, [inputView firstRectForRange:multiRectRange]));
+  }
+}
+
+- (void)testFirstRectForRangeReturnsCorrectRectOnSingleLineWithVaryingMinYAndMaxYRightToLeft {
+  FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
+  [inputView setTextInputState:@{@"text" : @"COMPOSING"}];
+
+  [inputView setSelectionRects:@[
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(300, 0, 100, 100) position:0U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(200, -10, 100, 120)
+                                           position:1U],  // taller
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(100, 10, 100, 80)
+                                           position:2U],  // shorter
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(0, 0, 100, 100) position:3U],
+  ]];
+
+  FlutterTextRange* multiRectRange = [FlutterTextRange rangeWithNSRange:NSMakeRange(1, 3)];
+
+  if (@available(iOS 17, *)) {
+    XCTAssertTrue(CGRectEqualToRect(CGRectMake(0, -10, 300, 120),
+                                    [inputView firstRectForRange:multiRectRange]));
+  } else {
+    XCTAssertTrue(CGRectEqualToRect(CGRectZero, [inputView firstRectForRange:multiRectRange]));
+  }
+}
+
+- (void)testFirstRectForRangeReturnsCorrectRectWithOverlappingRectsExceedingThresholdLeftToRight {
+  FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
+  [inputView setTextInputState:@{@"text" : @"COMPOSING"}];
+
+  [inputView setSelectionRects:@[
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(0, 0, 100, 100) position:0U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(100, 0, 100, 100) position:1U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(200, 0, 100, 100) position:2U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(300, 0, 100, 100) position:3U],
+    // y=60 exceeds threshold, so treat it as a new line.
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(0, 60, 100, 100) position:4U],
+  ]];
+
+  FlutterTextRange* multiRectRange = [FlutterTextRange rangeWithNSRange:NSMakeRange(1, 4)];
+
+  if (@available(iOS 17, *)) {
+    XCTAssertTrue(CGRectEqualToRect(CGRectMake(100, 0, 300, 100),
+                                    [inputView firstRectForRange:multiRectRange]));
+  } else {
+    XCTAssertTrue(CGRectEqualToRect(CGRectZero, [inputView firstRectForRange:multiRectRange]));
+  }
+}
+
+- (void)testFirstRectForRangeReturnsCorrectRectWithOverlappingRectsExceedingThresholdRightToLeft {
+  FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
+  [inputView setTextInputState:@{@"text" : @"COMPOSING"}];
+
+  [inputView setSelectionRects:@[
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(300, 0, 100, 100) position:0U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(200, 0, 100, 100) position:1U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(100, 0, 100, 100) position:2U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(0, 0, 100, 100) position:3U],
+    // y=60 exceeds threshold, so treat it as a new line.
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(300, 60, 100, 100) position:4U],
+  ]];
+
+  FlutterTextRange* multiRectRange = [FlutterTextRange rangeWithNSRange:NSMakeRange(1, 4)];
+
+  if (@available(iOS 17, *)) {
+    XCTAssertTrue(CGRectEqualToRect(CGRectMake(0, 0, 300, 100),
+                                    [inputView firstRectForRange:multiRectRange]));
+  } else {
+    XCTAssertTrue(CGRectEqualToRect(CGRectZero, [inputView firstRectForRange:multiRectRange]));
+  }
+}
+
+- (void)testFirstRectForRangeReturnsCorrectRectWithOverlappingRectsWithinThresholdLeftToRight {
+  FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
+  [inputView setTextInputState:@{@"text" : @"COMPOSING"}];
+
+  [inputView setSelectionRects:@[
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(0, 0, 100, 100) position:0U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(100, 0, 100, 100) position:1U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(200, 0, 100, 100) position:2U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(300, 0, 100, 100) position:3U],
+    // y=40 is within line threshold, so treat it as the same line
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(400, 40, 100, 100) position:4U],
+  ]];
+
+  FlutterTextRange* multiRectRange = [FlutterTextRange rangeWithNSRange:NSMakeRange(1, 4)];
+
+  if (@available(iOS 17, *)) {
+    XCTAssertTrue(CGRectEqualToRect(CGRectMake(100, 0, 400, 140),
+                                    [inputView firstRectForRange:multiRectRange]));
+  } else {
+    XCTAssertTrue(CGRectEqualToRect(CGRectZero, [inputView firstRectForRange:multiRectRange]));
+  }
+}
+
+- (void)testFirstRectForRangeReturnsCorrectRectWithOverlappingRectsWithinThresholdRightToLeft {
+  FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
+  [inputView setTextInputState:@{@"text" : @"COMPOSING"}];
+
+  [inputView setSelectionRects:@[
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(400, 0, 100, 100) position:0U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(300, 0, 100, 100) position:1U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(200, 0, 100, 100) position:2U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(100, 0, 100, 100) position:3U],
+    // y=40 is within line threshold, so treat it as the same line
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(0, 40, 100, 100) position:4U],
+  ]];
+
+  FlutterTextRange* multiRectRange = [FlutterTextRange rangeWithNSRange:NSMakeRange(1, 4)];
+
+  if (@available(iOS 17, *)) {
+    XCTAssertTrue(CGRectEqualToRect(CGRectMake(0, 0, 400, 140),
+                                    [inputView firstRectForRange:multiRectRange]));
+  } else {
+    XCTAssertTrue(CGRectEqualToRect(CGRectZero, [inputView firstRectForRange:multiRectRange]));
+  }
+}
+
 - (void)testClosestPositionToPoint {
   FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
   [inputView setTextInputState:@{@"text" : @"COMPOSING"}];
@@ -1317,7 +1872,9 @@ FLUTTER_ASSERT_ARC
     [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(0, 200, 100, 100) position:2U],
   ]];
   CGPoint point = CGPointMake(150, 150);
-  XCTAssertEqual(1U, ((FlutterTextPosition*)[inputView closestPositionToPoint:point]).index);
+  XCTAssertEqual(2U, ((FlutterTextPosition*)[inputView closestPositionToPoint:point]).index);
+  XCTAssertEqual(UITextStorageDirectionBackward,
+                 ((FlutterTextPosition*)[inputView closestPositionToPoint:point]).affinity);
 
   // Then, if the point is above the bottom of the closest rects vertically, get the closest x
   // origin
@@ -1330,6 +1887,8 @@ FLUTTER_ASSERT_ARC
   ]];
   point = CGPointMake(125, 150);
   XCTAssertEqual(2U, ((FlutterTextPosition*)[inputView closestPositionToPoint:point]).index);
+  XCTAssertEqual(UITextStorageDirectionForward,
+                 ((FlutterTextPosition*)[inputView closestPositionToPoint:point]).affinity);
 
   // However, if the point is below the bottom of the closest rects vertically, get the position
   // farthest to the right
@@ -1341,7 +1900,9 @@ FLUTTER_ASSERT_ARC
     [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(0, 300, 100, 100) position:4U],
   ]];
   point = CGPointMake(125, 201);
-  XCTAssertEqual(3U, ((FlutterTextPosition*)[inputView closestPositionToPoint:point]).index);
+  XCTAssertEqual(4U, ((FlutterTextPosition*)[inputView closestPositionToPoint:point]).index);
+  XCTAssertEqual(UITextStorageDirectionBackward,
+                 ((FlutterTextPosition*)[inputView closestPositionToPoint:point]).affinity);
 
   // Also check a point at the right edge of the last selection rect
   [inputView setSelectionRects:@[
@@ -1352,6 +1913,69 @@ FLUTTER_ASSERT_ARC
   ]];
   point = CGPointMake(125, 250);
   XCTAssertEqual(4U, ((FlutterTextPosition*)[inputView closestPositionToPoint:point]).index);
+  XCTAssertEqual(UITextStorageDirectionBackward,
+                 ((FlutterTextPosition*)[inputView closestPositionToPoint:point]).affinity);
+
+  // Minimize vertical distance if the difference is more than 1 point.
+  [inputView setSelectionRects:@[
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(0, 2, 100, 100) position:0U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(100, 2, 100, 100) position:1U],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(200, 0, 100, 100) position:2U],
+  ]];
+  point = CGPointMake(110, 50);
+  XCTAssertEqual(2U, ((FlutterTextPosition*)[inputView closestPositionToPoint:point]).index);
+  XCTAssertEqual(UITextStorageDirectionForward,
+                 ((FlutterTextPosition*)[inputView closestPositionToPoint:point]).affinity);
+
+  // In floating cursor mode, the vertical difference is allowed to be 10 points.
+  // The closest horizontal position will now win.
+  [inputView beginFloatingCursorAtPoint:CGPointZero];
+  XCTAssertEqual(1U, ((FlutterTextPosition*)[inputView closestPositionToPoint:point]).index);
+  XCTAssertEqual(UITextStorageDirectionForward,
+                 ((FlutterTextPosition*)[inputView closestPositionToPoint:point]).affinity);
+  [inputView endFloatingCursor];
+}
+
+- (void)testClosestPositionToPointRTL {
+  FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
+  [inputView setTextInputState:@{@"text" : @"COMPOSING"}];
+
+  [inputView setSelectionRects:@[
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(200, 0, 100, 100)
+                                           position:0U
+                                   writingDirection:NSWritingDirectionRightToLeft],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(100, 0, 100, 100)
+                                           position:1U
+                                   writingDirection:NSWritingDirectionRightToLeft],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(0, 0, 100, 100)
+                                           position:2U
+                                   writingDirection:NSWritingDirectionRightToLeft],
+    [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(0, 100, 100, 100)
+                                           position:3U
+                                   writingDirection:NSWritingDirectionRightToLeft],
+  ]];
+  FlutterTextPosition* position =
+      (FlutterTextPosition*)[inputView closestPositionToPoint:CGPointMake(275, 50)];
+  XCTAssertEqual(0U, position.index);
+  XCTAssertEqual(UITextStorageDirectionForward, position.affinity);
+  position = (FlutterTextPosition*)[inputView closestPositionToPoint:CGPointMake(225, 50)];
+  XCTAssertEqual(1U, position.index);
+  XCTAssertEqual(UITextStorageDirectionBackward, position.affinity);
+  position = (FlutterTextPosition*)[inputView closestPositionToPoint:CGPointMake(175, 50)];
+  XCTAssertEqual(1U, position.index);
+  XCTAssertEqual(UITextStorageDirectionForward, position.affinity);
+  position = (FlutterTextPosition*)[inputView closestPositionToPoint:CGPointMake(125, 50)];
+  XCTAssertEqual(2U, position.index);
+  XCTAssertEqual(UITextStorageDirectionBackward, position.affinity);
+  position = (FlutterTextPosition*)[inputView closestPositionToPoint:CGPointMake(75, 50)];
+  XCTAssertEqual(2U, position.index);
+  XCTAssertEqual(UITextStorageDirectionForward, position.affinity);
+  position = (FlutterTextPosition*)[inputView closestPositionToPoint:CGPointMake(25, 50)];
+  XCTAssertEqual(3U, position.index);
+  XCTAssertEqual(UITextStorageDirectionBackward, position.affinity);
+  position = (FlutterTextPosition*)[inputView closestPositionToPoint:CGPointMake(-25, 50)];
+  XCTAssertEqual(3U, position.index);
+  XCTAssertEqual(UITextStorageDirectionBackward, position.affinity);
 }
 
 - (void)testSelectionRectsForRange {
@@ -1368,7 +1992,7 @@ FLUTTER_ASSERT_ARC
   ]];
 
   // Returns the matching rects within a range
-  FlutterTextRange* range = [FlutterTextRange rangeWithNSRange:NSMakeRange(1, 1)];
+  FlutterTextRange* range = [FlutterTextRange rangeWithNSRange:NSMakeRange(1, 2)];
   XCTAssertTrue(CGRectEqualToRect(testRect0, [inputView selectionRectsForRange:range][0].rect));
   XCTAssertTrue(CGRectEqualToRect(testRect1, [inputView selectionRectsForRange:range][1].rect));
   XCTAssertEqual(2U, [[inputView selectionRectsForRange:range] count]);
@@ -1397,6 +2021,9 @@ FLUTTER_ASSERT_ARC
   FlutterTextRange* range = [[FlutterTextRange rangeWithNSRange:NSMakeRange(3, 2)] copy];
   XCTAssertEqual(
       3U, ((FlutterTextPosition*)[inputView closestPositionToPoint:point withinRange:range]).index);
+  XCTAssertEqual(
+      UITextStorageDirectionForward,
+      ((FlutterTextPosition*)[inputView closestPositionToPoint:point withinRange:range]).affinity);
 
   // Do not return a position after the end of the range
   [inputView setSelectionRects:@[
@@ -1410,6 +2037,32 @@ FLUTTER_ASSERT_ARC
   range = [[FlutterTextRange rangeWithNSRange:NSMakeRange(0, 1)] copy];
   XCTAssertEqual(
       1U, ((FlutterTextPosition*)[inputView closestPositionToPoint:point withinRange:range]).index);
+  XCTAssertEqual(
+      UITextStorageDirectionForward,
+      ((FlutterTextPosition*)[inputView closestPositionToPoint:point withinRange:range]).affinity);
+}
+
+- (void)testClosestPositionToPointWithPartialSelectionRects {
+  FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
+  [inputView setTextInputState:@{@"text" : @"COMPOSING"}];
+
+  [inputView setSelectionRects:@[ [FlutterTextSelectionRect
+                                   selectionRectWithRect:CGRectMake(0, 0, 100, 100)
+                                                position:0U] ]];
+  // Asking with a position at the end of selection rects should give you the trailing edge of
+  // the last rect.
+  XCTAssertTrue(CGRectEqualToRect(
+      [inputView caretRectForPosition:[FlutterTextPosition
+                                          positionWithIndex:1
+                                                   affinity:UITextStorageDirectionForward]],
+      CGRectMake(100, 0, 0, 100)));
+  // Asking with a position beyond the end of selection rects should return CGRectZero without
+  // crashing.
+  XCTAssertTrue(CGRectEqualToRect(
+      [inputView caretRectForPosition:[FlutterTextPosition
+                                          positionWithIndex:2
+                                                   affinity:UITextStorageDirectionForward]],
+      CGRectZero));
 }
 
 #pragma mark - Floating Cursor - Tests
@@ -1424,42 +2077,134 @@ FLUTTER_ASSERT_ARC
   [inputView endFloatingCursor];
 }
 
-- (void)testBoundsForFloatingCursor {
+- (void)testFloatingCursor {
   FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
+  [inputView setTextInputState:@{
+    @"text" : @"test",
+    @"selectionBase" : @1,
+    @"selectionExtent" : @1,
+  }];
 
-  CGRect initialBounds = inputView.bounds;
-  // Make sure the initial bounds.size is not as large.
-  XCTAssertLessThan(inputView.bounds.size.width, 100);
-  XCTAssertLessThan(inputView.bounds.size.height, 100);
+  FlutterTextSelectionRect* first =
+      [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(0, 0, 100, 100) position:0U];
+  FlutterTextSelectionRect* second =
+      [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(100, 100, 100, 100) position:1U];
+  FlutterTextSelectionRect* third =
+      [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(200, 200, 100, 100) position:2U];
+  FlutterTextSelectionRect* fourth =
+      [FlutterTextSelectionRect selectionRectWithRect:CGRectMake(300, 300, 100, 100) position:3U];
+  [inputView setSelectionRects:@[ first, second, third, fourth ]];
 
-  [inputView beginFloatingCursorAtPoint:CGPointMake(123, 321)];
-  CGRect bounds = inputView.bounds;
-  XCTAssertGreaterThan(bounds.size.width, 1000);
-  XCTAssertGreaterThan(bounds.size.height, 1000);
+  // Verify zeroth caret rect is based on left edge of first character.
+  XCTAssertTrue(CGRectEqualToRect(
+      [inputView caretRectForPosition:[FlutterTextPosition
+                                          positionWithIndex:0
+                                                   affinity:UITextStorageDirectionForward]],
+      CGRectMake(0, 0, 0, 100)));
+  // Since the textAffinity is downstream, the caret rect will be based on the
+  // left edge of the succeeding character.
+  XCTAssertTrue(CGRectEqualToRect(
+      [inputView caretRectForPosition:[FlutterTextPosition
+                                          positionWithIndex:1
+                                                   affinity:UITextStorageDirectionForward]],
+      CGRectMake(100, 100, 0, 100)));
+  XCTAssertTrue(CGRectEqualToRect(
+      [inputView caretRectForPosition:[FlutterTextPosition
+                                          positionWithIndex:2
+                                                   affinity:UITextStorageDirectionForward]],
+      CGRectMake(200, 200, 0, 100)));
+  XCTAssertTrue(CGRectEqualToRect(
+      [inputView caretRectForPosition:[FlutterTextPosition
+                                          positionWithIndex:3
+                                                   affinity:UITextStorageDirectionForward]],
+      CGRectMake(300, 300, 0, 100)));
+  // There is no subsequent character for the last position, so the caret rect
+  // will be based on the right edge of the preceding character.
+  XCTAssertTrue(CGRectEqualToRect(
+      [inputView caretRectForPosition:[FlutterTextPosition
+                                          positionWithIndex:4
+                                                   affinity:UITextStorageDirectionForward]],
+      CGRectMake(400, 300, 0, 100)));
+  // Verify no caret rect for out-of-range character.
+  XCTAssertTrue(CGRectEqualToRect(
+      [inputView caretRectForPosition:[FlutterTextPosition
+                                          positionWithIndex:5
+                                                   affinity:UITextStorageDirectionForward]],
+      CGRectZero));
 
-  // Verify the caret is centered.
-  XCTAssertEqual(
-      CGRectGetMidX(bounds),
-      CGRectGetMidX([inputView caretRectForPosition:[FlutterTextPosition positionWithIndex:1235]]));
-  XCTAssertEqual(
-      CGRectGetMidY(bounds),
-      CGRectGetMidY([inputView caretRectForPosition:[FlutterTextPosition positionWithIndex:4567]]));
+  // Check caret rects again again when text affinity is upstream.
+  [inputView setTextInputState:@{
+    @"text" : @"test",
+    @"selectionBase" : @2,
+    @"selectionExtent" : @2,
+  }];
+  // Verify zeroth caret rect is based on left edge of first character.
+  XCTAssertTrue(CGRectEqualToRect(
+      [inputView caretRectForPosition:[FlutterTextPosition
+                                          positionWithIndex:0
+                                                   affinity:UITextStorageDirectionBackward]],
+      CGRectMake(0, 0, 0, 100)));
+  // Since the textAffinity is upstream, all below caret rects will be based on
+  // the right edge of the preceding character.
+  XCTAssertTrue(CGRectEqualToRect(
+      [inputView caretRectForPosition:[FlutterTextPosition
+                                          positionWithIndex:1
+                                                   affinity:UITextStorageDirectionBackward]],
+      CGRectMake(100, 0, 0, 100)));
+  XCTAssertTrue(CGRectEqualToRect(
+      [inputView caretRectForPosition:[FlutterTextPosition
+                                          positionWithIndex:2
+                                                   affinity:UITextStorageDirectionBackward]],
+      CGRectMake(200, 100, 0, 100)));
+  XCTAssertTrue(CGRectEqualToRect(
+      [inputView caretRectForPosition:[FlutterTextPosition
+                                          positionWithIndex:3
+                                                   affinity:UITextStorageDirectionBackward]],
+      CGRectMake(300, 200, 0, 100)));
+  XCTAssertTrue(CGRectEqualToRect(
+      [inputView caretRectForPosition:[FlutterTextPosition
+                                          positionWithIndex:4
+                                                   affinity:UITextStorageDirectionBackward]],
+      CGRectMake(400, 300, 0, 100)));
+  // Verify no caret rect for out-of-range character.
+  XCTAssertTrue(CGRectEqualToRect(
+      [inputView caretRectForPosition:[FlutterTextPosition
+                                          positionWithIndex:5
+                                                   affinity:UITextStorageDirectionBackward]],
+      CGRectZero));
 
-  [inputView updateFloatingCursorAtPoint:CGPointMake(456, 654)];
-  bounds = inputView.bounds;
-  XCTAssertGreaterThan(bounds.size.width, 1000);
-  XCTAssertGreaterThan(bounds.size.height, 1000);
+  // Verify floating cursor updates are relative to original position, and that there is no bounds
+  // change.
+  CGRect initialBounds = inputView.bounds;
+  [inputView beginFloatingCursorAtPoint:CGPointMake(123, 321)];
+  XCTAssertTrue(CGRectEqualToRect(initialBounds, inputView.bounds));
+  OCMVerify([engine flutterTextInputView:inputView
+                    updateFloatingCursor:FlutterFloatingCursorDragStateStart
+                              withClient:0
+                            withPosition:[OCMArg checkWithBlock:^BOOL(NSDictionary* state) {
+                              return ([state[@"X"] isEqualToNumber:@(0)]) &&
+                                     ([state[@"Y"] isEqualToNumber:@(0)]);
+                            }]]);
 
-  // Verify the caret is centered.
-  XCTAssertEqual(
-      CGRectGetMidX(bounds),
-      CGRectGetMidX([inputView caretRectForPosition:[FlutterTextPosition positionWithIndex:21]]));
-  XCTAssertEqual(
-      CGRectGetMidY(bounds),
-      CGRectGetMidY([inputView caretRectForPosition:[FlutterTextPosition positionWithIndex:42]]));
+  [inputView updateFloatingCursorAtPoint:CGPointMake(456, 654)];
+  XCTAssertTrue(CGRectEqualToRect(initialBounds, inputView.bounds));
+  OCMVerify([engine flutterTextInputView:inputView
+                    updateFloatingCursor:FlutterFloatingCursorDragStateUpdate
+                              withClient:0
+                            withPosition:[OCMArg checkWithBlock:^BOOL(NSDictionary* state) {
+                              return ([state[@"X"] isEqualToNumber:@(333)]) &&
+                                     ([state[@"Y"] isEqualToNumber:@(333)]);
+                            }]]);
 
   [inputView endFloatingCursor];
   XCTAssertTrue(CGRectEqualToRect(initialBounds, inputView.bounds));
+  OCMVerify([engine flutterTextInputView:inputView
+                    updateFloatingCursor:FlutterFloatingCursorDragStateEnd
+                              withClient:0
+                            withPosition:[OCMArg checkWithBlock:^BOOL(NSDictionary* state) {
+                              return ([state[@"X"] isEqualToNumber:@(0)]) &&
+                                     ([state[@"Y"] isEqualToNumber:@(0)]);
+                            }]]);
 }
 
 #pragma mark - UIKeyInput Overrides - Tests
@@ -1874,7 +2619,7 @@ FLUTTER_ASSERT_ARC
   XCTAssertEqual(self.installedInputViews.count, 1ul);
   XCTAssertEqual([textInputPlugin.activeView.selectionRects count], 0u);
 
-  NSArray<NSNumber*>* selectionRect = [NSArray arrayWithObjects:@0, @0, @100, @100, @0, nil];
+  NSArray<NSNumber*>* selectionRect = [NSArray arrayWithObjects:@0, @0, @100, @100, @0, @1, nil];
   NSArray* selectionRects = [NSArray arrayWithObjects:selectionRect, nil];
   FlutterMethodCall* methodCall =
       [FlutterMethodCall methodCallWithMethodName:@"Scribble.setSelectionRects"
@@ -1990,6 +2735,54 @@ FLUTTER_ASSERT_ARC
   XCTAssertEqual(range.range.length, 20u);
 }
 
+- (void)testFlutterTokenizerLineEnclosingEndOfDocumentInBackwardDirectionShouldNotReturnNil {
+  FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
+  [inputView insertText:@"0123456789\n012345"];
+  id<UITextInputTokenizer> tokenizer = [inputView tokenizer];
+
+  FlutterTextRange* range =
+      (FlutterTextRange*)[tokenizer rangeEnclosingPosition:[inputView endOfDocument]
+                                           withGranularity:UITextGranularityLine
+                                               inDirection:UITextStorageDirectionBackward];
+  XCTAssertEqual(range.range.location, 11u);
+  XCTAssertEqual(range.range.length, 6u);
+}
+
+- (void)testFlutterTokenizerLineEnclosingEndOfDocumentInForwardDirectionShouldReturnNilOnIOS17 {
+  FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
+  [inputView insertText:@"0123456789\n012345"];
+  id<UITextInputTokenizer> tokenizer = [inputView tokenizer];
+
+  FlutterTextRange* range =
+      (FlutterTextRange*)[tokenizer rangeEnclosingPosition:[inputView endOfDocument]
+                                           withGranularity:UITextGranularityLine
+                                               inDirection:UITextStorageDirectionForward];
+  if (@available(iOS 17.0, *)) {
+    XCTAssertNil(range);
+  } else {
+    XCTAssertEqual(range.range.location, 11u);
+    XCTAssertEqual(range.range.length, 6u);
+  }
+}
+
+- (void)testFlutterTokenizerLineEnclosingOutOfRangePositionShouldReturnNilOnIOS17 {
+  FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
+  [inputView insertText:@"0123456789\n012345"];
+  id<UITextInputTokenizer> tokenizer = [inputView tokenizer];
+
+  FlutterTextPosition* position = [FlutterTextPosition positionWithIndex:100];
+  FlutterTextRange* range =
+      (FlutterTextRange*)[tokenizer rangeEnclosingPosition:position
+                                           withGranularity:UITextGranularityLine
+                                               inDirection:UITextStorageDirectionForward];
+  if (@available(iOS 17.0, *)) {
+    XCTAssertNil(range);
+  } else {
+    XCTAssertEqual(range.range.location, 0u);
+    XCTAssertEqual(range.range.length, 0u);
+  }
+}
+
 - (void)testFlutterTextInputPluginRetainsFlutterTextInputView {
   FlutterViewController* flutterViewController = [[FlutterViewController alloc] init];
   FlutterTextInputPlugin* myInputPlugin = [[FlutterTextInputPlugin alloc] initWithDelegate:engine];
@@ -2054,4 +2847,502 @@ FLUTTER_ASSERT_ARC
   XCTAssertNil(activeView.superview, @"activeView must be removed from view hierarchy.");
 }
 
+- (void)testInteractiveKeyboardAfterUserScrollWillResignFirstResponder {
+  FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
+  [UIApplication.sharedApplication.keyWindow addSubview:inputView];
+
+  [inputView setTextInputClient:123];
+  [inputView reloadInputViews];
+  [inputView becomeFirstResponder];
+  XCTAssert(inputView.isFirstResponder);
+
+  CGRect keyboardFrame = CGRectMake(0, 500, 500, 500);
+  [NSNotificationCenter.defaultCenter
+      postNotificationName:UIKeyboardWillShowNotification
+                    object:nil
+                  userInfo:@{UIKeyboardFrameEndUserInfoKey : @(keyboardFrame)}];
+  FlutterMethodCall* onPointerMoveCall =
+      [FlutterMethodCall methodCallWithMethodName:@"TextInput.onPointerMoveForInteractiveKeyboard"
+                                        arguments:@{@"pointerY" : @(500)}];
+  [textInputPlugin handleMethodCall:onPointerMoveCall
+                             result:^(id _Nullable result){
+                             }];
+  XCTAssertFalse(inputView.isFirstResponder);
+  textInputPlugin.cachedFirstResponder = nil;
+}
+
+- (void)testInteractiveKeyboardAfterUserScrollToTopOfKeyboardWillTakeScreenshot {
+  NSSet<UIScene*>* scenes = UIApplication.sharedApplication.connectedScenes;
+  XCTAssertEqual(scenes.count, 1UL, @"There must only be 1 scene for test");
+  UIScene* scene = scenes.anyObject;
+  XCTAssert([scene isKindOfClass:[UIWindowScene class]], @"Must be a window scene for test");
+  UIWindowScene* windowScene = (UIWindowScene*)scene;
+  XCTAssert(windowScene.windows.count > 0, @"There must be at least 1 window for test");
+  UIWindow* window = windowScene.windows[0];
+  [window addSubview:viewController.view];
+
+  [viewController loadView];
+
+  FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
+  [UIApplication.sharedApplication.keyWindow addSubview:inputView];
+
+  [inputView setTextInputClient:123];
+  [inputView reloadInputViews];
+  [inputView becomeFirstResponder];
+
+  if (textInputPlugin.keyboardView.superview != nil) {
+    for (UIView* subView in textInputPlugin.keyboardViewContainer.subviews) {
+      [subView removeFromSuperview];
+    }
+  }
+  XCTAssert(textInputPlugin.keyboardView.superview == nil);
+  CGRect keyboardFrame = CGRectMake(0, 500, 500, 500);
+  [NSNotificationCenter.defaultCenter
+      postNotificationName:UIKeyboardWillShowNotification
+                    object:nil
+                  userInfo:@{UIKeyboardFrameEndUserInfoKey : @(keyboardFrame)}];
+  FlutterMethodCall* onPointerMoveCall =
+      [FlutterMethodCall methodCallWithMethodName:@"TextInput.onPointerMoveForInteractiveKeyboard"
+                                        arguments:@{@"pointerY" : @(510)}];
+  [textInputPlugin handleMethodCall:onPointerMoveCall
+                             result:^(id _Nullable result){
+                             }];
+  XCTAssertFalse(textInputPlugin.keyboardView.superview == nil);
+  for (UIView* subView in textInputPlugin.keyboardViewContainer.subviews) {
+    [subView removeFromSuperview];
+  }
+  textInputPlugin.cachedFirstResponder = nil;
+}
+
+- (void)testInteractiveKeyboardScreenshotWillBeMovedDownAfterUserScroll {
+  NSSet<UIScene*>* scenes = UIApplication.sharedApplication.connectedScenes;
+  XCTAssertEqual(scenes.count, 1UL, @"There must only be 1 scene for test");
+  UIScene* scene = scenes.anyObject;
+  XCTAssert([scene isKindOfClass:[UIWindowScene class]], @"Must be a window scene for test");
+  UIWindowScene* windowScene = (UIWindowScene*)scene;
+  XCTAssert(windowScene.windows.count > 0, @"There must be at least 1 window for test");
+  UIWindow* window = windowScene.windows[0];
+  [window addSubview:viewController.view];
+
+  [viewController loadView];
+
+  FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
+  [UIApplication.sharedApplication.keyWindow addSubview:inputView];
+
+  [inputView setTextInputClient:123];
+  [inputView reloadInputViews];
+  [inputView becomeFirstResponder];
+
+  CGRect keyboardFrame = CGRectMake(0, 500, 500, 500);
+  [NSNotificationCenter.defaultCenter
+      postNotificationName:UIKeyboardWillShowNotification
+                    object:nil
+                  userInfo:@{UIKeyboardFrameEndUserInfoKey : @(keyboardFrame)}];
+  FlutterMethodCall* onPointerMoveCall =
+      [FlutterMethodCall methodCallWithMethodName:@"TextInput.onPointerMoveForInteractiveKeyboard"
+                                        arguments:@{@"pointerY" : @(510)}];
+  [textInputPlugin handleMethodCall:onPointerMoveCall
+                             result:^(id _Nullable result){
+                             }];
+  XCTAssert(textInputPlugin.keyboardView.superview != nil);
+
+  XCTAssertEqual(textInputPlugin.keyboardViewContainer.frame.origin.y, keyboardFrame.origin.y);
+
+  FlutterMethodCall* onPointerMoveCallMove =
+      [FlutterMethodCall methodCallWithMethodName:@"TextInput.onPointerMoveForInteractiveKeyboard"
+                                        arguments:@{@"pointerY" : @(600)}];
+  [textInputPlugin handleMethodCall:onPointerMoveCallMove
+                             result:^(id _Nullable result){
+                             }];
+  XCTAssert(textInputPlugin.keyboardView.superview != nil);
+
+  XCTAssertEqual(textInputPlugin.keyboardViewContainer.frame.origin.y, 600.0);
+
+  for (UIView* subView in textInputPlugin.keyboardViewContainer.subviews) {
+    [subView removeFromSuperview];
+  }
+  textInputPlugin.cachedFirstResponder = nil;
+}
+
+- (void)testInteractiveKeyboardScreenshotWillBeMovedToOrginalPositionAfterUserScroll {
+  NSSet<UIScene*>* scenes = UIApplication.sharedApplication.connectedScenes;
+  XCTAssertEqual(scenes.count, 1UL, @"There must only be 1 scene for test");
+  UIScene* scene = scenes.anyObject;
+  XCTAssert([scene isKindOfClass:[UIWindowScene class]], @"Must be a window scene for test");
+  UIWindowScene* windowScene = (UIWindowScene*)scene;
+  XCTAssert(windowScene.windows.count > 0, @"There must be at least 1 window for test");
+  UIWindow* window = windowScene.windows[0];
+  [window addSubview:viewController.view];
+
+  [viewController loadView];
+
+  FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
+  [UIApplication.sharedApplication.keyWindow addSubview:inputView];
+
+  [inputView setTextInputClient:123];
+  [inputView reloadInputViews];
+  [inputView becomeFirstResponder];
+
+  CGRect keyboardFrame = CGRectMake(0, 500, 500, 500);
+  [NSNotificationCenter.defaultCenter
+      postNotificationName:UIKeyboardWillShowNotification
+                    object:nil
+                  userInfo:@{UIKeyboardFrameEndUserInfoKey : @(keyboardFrame)}];
+  FlutterMethodCall* onPointerMoveCall =
+      [FlutterMethodCall methodCallWithMethodName:@"TextInput.onPointerMoveForInteractiveKeyboard"
+                                        arguments:@{@"pointerY" : @(500)}];
+  [textInputPlugin handleMethodCall:onPointerMoveCall
+                             result:^(id _Nullable result){
+                             }];
+  XCTAssert(textInputPlugin.keyboardView.superview != nil);
+  XCTAssertEqual(textInputPlugin.keyboardViewContainer.frame.origin.y, keyboardFrame.origin.y);
+
+  FlutterMethodCall* onPointerMoveCallMove =
+      [FlutterMethodCall methodCallWithMethodName:@"TextInput.onPointerMoveForInteractiveKeyboard"
+                                        arguments:@{@"pointerY" : @(600)}];
+  [textInputPlugin handleMethodCall:onPointerMoveCallMove
+                             result:^(id _Nullable result){
+                             }];
+  XCTAssert(textInputPlugin.keyboardView.superview != nil);
+  XCTAssertEqual(textInputPlugin.keyboardViewContainer.frame.origin.y, 600.0);
+
+  FlutterMethodCall* onPointerMoveCallBackUp =
+      [FlutterMethodCall methodCallWithMethodName:@"TextInput.onPointerMoveForInteractiveKeyboard"
+                                        arguments:@{@"pointerY" : @(10)}];
+  [textInputPlugin handleMethodCall:onPointerMoveCallBackUp
+                             result:^(id _Nullable result){
+                             }];
+  XCTAssert(textInputPlugin.keyboardView.superview != nil);
+  XCTAssertEqual(textInputPlugin.keyboardViewContainer.frame.origin.y, keyboardFrame.origin.y);
+  for (UIView* subView in textInputPlugin.keyboardViewContainer.subviews) {
+    [subView removeFromSuperview];
+  }
+  textInputPlugin.cachedFirstResponder = nil;
+}
+
+- (void)testInteractiveKeyboardFindFirstResponderRecursive {
+  FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
+  [UIApplication.sharedApplication.keyWindow addSubview:inputView];
+  [inputView setTextInputClient:123];
+  [inputView reloadInputViews];
+  [inputView becomeFirstResponder];
+
+  UIView* firstResponder = UIApplication.sharedApplication.keyWindow.flutterFirstResponder;
+  XCTAssertEqualObjects(inputView, firstResponder);
+  textInputPlugin.cachedFirstResponder = nil;
+}
+
+- (void)testInteractiveKeyboardFindFirstResponderRecursiveInMultipleSubviews {
+  FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
+  FlutterTextInputView* subInputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
+  FlutterTextInputView* otherSubInputView =
+      [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
+  FlutterTextInputView* subFirstResponderInputView =
+      [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
+  [subInputView addSubview:subFirstResponderInputView];
+  [inputView addSubview:subInputView];
+  [inputView addSubview:otherSubInputView];
+  [UIApplication.sharedApplication.keyWindow addSubview:inputView];
+  [inputView setTextInputClient:123];
+  [inputView reloadInputViews];
+  [subInputView setTextInputClient:123];
+  [subInputView reloadInputViews];
+  [otherSubInputView setTextInputClient:123];
+  [otherSubInputView reloadInputViews];
+  [subFirstResponderInputView setTextInputClient:123];
+  [subFirstResponderInputView reloadInputViews];
+  [subFirstResponderInputView becomeFirstResponder];
+
+  UIView* firstResponder = UIApplication.sharedApplication.keyWindow.flutterFirstResponder;
+  XCTAssertEqualObjects(subFirstResponderInputView, firstResponder);
+  textInputPlugin.cachedFirstResponder = nil;
+}
+
+- (void)testInteractiveKeyboardFindFirstResponderIsNilRecursive {
+  FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
+  [UIApplication.sharedApplication.keyWindow addSubview:inputView];
+  [inputView setTextInputClient:123];
+  [inputView reloadInputViews];
+
+  UIView* firstResponder = UIApplication.sharedApplication.keyWindow.flutterFirstResponder;
+  XCTAssertNil(firstResponder);
+  textInputPlugin.cachedFirstResponder = nil;
+}
+
+- (void)testInteractiveKeyboardDidResignFirstResponderDelegateisCalledAfterDismissedKeyboard {
+  NSSet<UIScene*>* scenes = UIApplication.sharedApplication.connectedScenes;
+  XCTAssertEqual(scenes.count, 1UL, @"There must only be 1 scene for test");
+  UIScene* scene = scenes.anyObject;
+  XCTAssert([scene isKindOfClass:[UIWindowScene class]], @"Must be a window scene for test");
+  UIWindowScene* windowScene = (UIWindowScene*)scene;
+  XCTAssert(windowScene.windows.count > 0, @"There must be at least 1 window for test");
+  UIWindow* window = windowScene.windows[0];
+  [window addSubview:viewController.view];
+
+  [viewController loadView];
+
+  XCTestExpectation* expectation = [[XCTestExpectation alloc]
+      initWithDescription:
+          @"didResignFirstResponder is called after screenshot keyboard dismissed."];
+  OCMStub([engine flutterTextInputView:[OCMArg any] didResignFirstResponderWithTextInputClient:0])
+      .andDo(^(NSInvocation* invocation) {
+        [expectation fulfill];
+      });
+  CGRect keyboardFrame = CGRectMake(0, 500, 500, 500);
+  [NSNotificationCenter.defaultCenter
+      postNotificationName:UIKeyboardWillShowNotification
+                    object:nil
+                  userInfo:@{UIKeyboardFrameEndUserInfoKey : @(keyboardFrame)}];
+  FlutterMethodCall* initialMoveCall =
+      [FlutterMethodCall methodCallWithMethodName:@"TextInput.onPointerMoveForInteractiveKeyboard"
+                                        arguments:@{@"pointerY" : @(500)}];
+  [textInputPlugin handleMethodCall:initialMoveCall
+                             result:^(id _Nullable result){
+                             }];
+  FlutterMethodCall* subsequentMoveCall =
+      [FlutterMethodCall methodCallWithMethodName:@"TextInput.onPointerMoveForInteractiveKeyboard"
+                                        arguments:@{@"pointerY" : @(1000)}];
+  [textInputPlugin handleMethodCall:subsequentMoveCall
+                             result:^(id _Nullable result){
+                             }];
+
+  FlutterMethodCall* pointerUpCall =
+      [FlutterMethodCall methodCallWithMethodName:@"TextInput.onPointerUpForInteractiveKeyboard"
+                                        arguments:@{@"pointerY" : @(1000)}];
+  [textInputPlugin handleMethodCall:pointerUpCall
+                             result:^(id _Nullable result){
+                             }];
+
+  [self waitForExpectations:@[ expectation ] timeout:2.0];
+  textInputPlugin.cachedFirstResponder = nil;
+}
+
+- (void)testInteractiveKeyboardScreenshotDismissedAfterPointerLiftedAboveMiddleYOfKeyboard {
+  NSSet<UIScene*>* scenes = UIApplication.sharedApplication.connectedScenes;
+  XCTAssertEqual(scenes.count, 1UL, @"There must only be 1 scene for test");
+  UIScene* scene = scenes.anyObject;
+  XCTAssert([scene isKindOfClass:[UIWindowScene class]], @"Must be a window scene for test");
+  UIWindowScene* windowScene = (UIWindowScene*)scene;
+  XCTAssert(windowScene.windows.count > 0, @"There must be at least 1 window for test");
+  UIWindow* window = windowScene.windows[0];
+  [window addSubview:viewController.view];
+
+  [viewController loadView];
+
+  CGRect keyboardFrame = CGRectMake(0, 500, 500, 500);
+  [NSNotificationCenter.defaultCenter
+      postNotificationName:UIKeyboardWillShowNotification
+                    object:nil
+                  userInfo:@{UIKeyboardFrameEndUserInfoKey : @(keyboardFrame)}];
+  FlutterMethodCall* initialMoveCall =
+      [FlutterMethodCall methodCallWithMethodName:@"TextInput.onPointerMoveForInteractiveKeyboard"
+                                        arguments:@{@"pointerY" : @(500)}];
+  [textInputPlugin handleMethodCall:initialMoveCall
+                             result:^(id _Nullable result){
+                             }];
+  FlutterMethodCall* subsequentMoveCall =
+      [FlutterMethodCall methodCallWithMethodName:@"TextInput.onPointerMoveForInteractiveKeyboard"
+                                        arguments:@{@"pointerY" : @(1000)}];
+  [textInputPlugin handleMethodCall:subsequentMoveCall
+                             result:^(id _Nullable result){
+                             }];
+
+  FlutterMethodCall* subsequentMoveBackUpCall =
+      [FlutterMethodCall methodCallWithMethodName:@"TextInput.onPointerMoveForInteractiveKeyboard"
+                                        arguments:@{@"pointerY" : @(0)}];
+  [textInputPlugin handleMethodCall:subsequentMoveBackUpCall
+                             result:^(id _Nullable result){
+                             }];
+
+  FlutterMethodCall* pointerUpCall =
+      [FlutterMethodCall methodCallWithMethodName:@"TextInput.onPointerUpForInteractiveKeyboard"
+                                        arguments:@{@"pointerY" : @(0)}];
+  [textInputPlugin handleMethodCall:pointerUpCall
+                             result:^(id _Nullable result){
+                             }];
+  NSPredicate* predicate = [NSPredicate predicateWithBlock:^BOOL(id item, NSDictionary* bindings) {
+    return textInputPlugin.keyboardViewContainer.subviews.count == 0;
+  }];
+  XCTNSPredicateExpectation* expectation =
+      [[XCTNSPredicateExpectation alloc] initWithPredicate:predicate object:nil];
+  [self waitForExpectations:@[ expectation ] timeout:10.0];
+  textInputPlugin.cachedFirstResponder = nil;
+}
+
+- (void)testInteractiveKeyboardKeyboardReappearsAfterPointerLiftedAboveMiddleYOfKeyboard {
+  NSSet<UIScene*>* scenes = UIApplication.sharedApplication.connectedScenes;
+  XCTAssertEqual(scenes.count, 1UL, @"There must only be 1 scene for test");
+  UIScene* scene = scenes.anyObject;
+  XCTAssert([scene isKindOfClass:[UIWindowScene class]], @"Must be a window scene for test");
+  UIWindowScene* windowScene = (UIWindowScene*)scene;
+  XCTAssert(windowScene.windows.count > 0, @"There must be at least 1 window for test");
+  UIWindow* window = windowScene.windows[0];
+  [window addSubview:viewController.view];
+
+  [viewController loadView];
+
+  FlutterTextInputView* inputView = [[FlutterTextInputView alloc] initWithOwner:textInputPlugin];
+  [UIApplication.sharedApplication.keyWindow addSubview:inputView];
+
+  [inputView setTextInputClient:123];
+  [inputView reloadInputViews];
+  [inputView becomeFirstResponder];
+
+  CGRect keyboardFrame = CGRectMake(0, 500, 500, 500);
+  [NSNotificationCenter.defaultCenter
+      postNotificationName:UIKeyboardWillShowNotification
+                    object:nil
+                  userInfo:@{UIKeyboardFrameEndUserInfoKey : @(keyboardFrame)}];
+  FlutterMethodCall* initialMoveCall =
+      [FlutterMethodCall methodCallWithMethodName:@"TextInput.onPointerMoveForInteractiveKeyboard"
+                                        arguments:@{@"pointerY" : @(500)}];
+  [textInputPlugin handleMethodCall:initialMoveCall
+                             result:^(id _Nullable result){
+                             }];
+  FlutterMethodCall* subsequentMoveCall =
+      [FlutterMethodCall methodCallWithMethodName:@"TextInput.onPointerMoveForInteractiveKeyboard"
+                                        arguments:@{@"pointerY" : @(1000)}];
+  [textInputPlugin handleMethodCall:subsequentMoveCall
+                             result:^(id _Nullable result){
+                             }];
+
+  FlutterMethodCall* subsequentMoveBackUpCall =
+      [FlutterMethodCall methodCallWithMethodName:@"TextInput.onPointerMoveForInteractiveKeyboard"
+                                        arguments:@{@"pointerY" : @(0)}];
+  [textInputPlugin handleMethodCall:subsequentMoveBackUpCall
+                             result:^(id _Nullable result){
+                             }];
+
+  FlutterMethodCall* pointerUpCall =
+      [FlutterMethodCall methodCallWithMethodName:@"TextInput.onPointerUpForInteractiveKeyboard"
+                                        arguments:@{@"pointerY" : @(0)}];
+  [textInputPlugin handleMethodCall:pointerUpCall
+                             result:^(id _Nullable result){
+                             }];
+  NSPredicate* predicate = [NSPredicate predicateWithBlock:^BOOL(id item, NSDictionary* bindings) {
+    return textInputPlugin.cachedFirstResponder.isFirstResponder;
+  }];
+  XCTNSPredicateExpectation* expectation =
+      [[XCTNSPredicateExpectation alloc] initWithPredicate:predicate object:nil];
+  [self waitForExpectations:@[ expectation ] timeout:10.0];
+  textInputPlugin.cachedFirstResponder = nil;
+}
+
+- (void)testInteractiveKeyboardKeyboardAnimatesToOriginalPositionalOnPointerUp {
+  NSSet<UIScene*>* scenes = UIApplication.sharedApplication.connectedScenes;
+  XCTAssertEqual(scenes.count, 1UL, @"There must only be 1 scene for test");
+  UIScene* scene = scenes.anyObject;
+  XCTAssert([scene isKindOfClass:[UIWindowScene class]], @"Must be a window scene for test");
+  UIWindowScene* windowScene = (UIWindowScene*)scene;
+  XCTAssert(windowScene.windows.count > 0, @"There must be at least 1 window for test");
+  UIWindow* window = windowScene.windows[0];
+  [window addSubview:viewController.view];
+
+  [viewController loadView];
+
+  XCTestExpectation* expectation =
+      [[XCTestExpectation alloc] initWithDescription:@"Keyboard animates to proper position."];
+  CGRect keyboardFrame = CGRectMake(0, 500, 500, 500);
+  [NSNotificationCenter.defaultCenter
+      postNotificationName:UIKeyboardWillShowNotification
+                    object:nil
+                  userInfo:@{UIKeyboardFrameEndUserInfoKey : @(keyboardFrame)}];
+  FlutterMethodCall* initialMoveCall =
+      [FlutterMethodCall methodCallWithMethodName:@"TextInput.onPointerMoveForInteractiveKeyboard"
+                                        arguments:@{@"pointerY" : @(500)}];
+  [textInputPlugin handleMethodCall:initialMoveCall
+                             result:^(id _Nullable result){
+                             }];
+  FlutterMethodCall* subsequentMoveCall =
+      [FlutterMethodCall methodCallWithMethodName:@"TextInput.onPointerMoveForInteractiveKeyboard"
+                                        arguments:@{@"pointerY" : @(1000)}];
+  [textInputPlugin handleMethodCall:subsequentMoveCall
+                             result:^(id _Nullable result){
+                             }];
+  FlutterMethodCall* upwardVelocityMoveCall =
+      [FlutterMethodCall methodCallWithMethodName:@"TextInput.onPointerMoveForInteractiveKeyboard"
+                                        arguments:@{@"pointerY" : @(500)}];
+  [textInputPlugin handleMethodCall:upwardVelocityMoveCall
+                             result:^(id _Nullable result){
+                             }];
+
+  FlutterMethodCall* pointerUpCall =
+      [FlutterMethodCall methodCallWithMethodName:@"TextInput.onPointerUpForInteractiveKeyboard"
+                                        arguments:@{@"pointerY" : @(0)}];
+  [textInputPlugin
+      handleMethodCall:pointerUpCall
+                result:^(id _Nullable result) {
+                  XCTAssertEqual(textInputPlugin.keyboardViewContainer.frame.origin.y,
+                                 viewController.flutterScreenIfViewLoaded.bounds.size.height -
+                                     keyboardFrame.origin.y);
+                  [expectation fulfill];
+                }];
+  textInputPlugin.cachedFirstResponder = nil;
+}
+
+- (void)testInteractiveKeyboardKeyboardAnimatesToDismissalPositionalOnPointerUp {
+  NSSet<UIScene*>* scenes = UIApplication.sharedApplication.connectedScenes;
+  XCTAssertEqual(scenes.count, 1UL, @"There must only be 1 scene for test");
+  UIScene* scene = scenes.anyObject;
+  XCTAssert([scene isKindOfClass:[UIWindowScene class]], @"Must be a window scene for test");
+  UIWindowScene* windowScene = (UIWindowScene*)scene;
+  XCTAssert(windowScene.windows.count > 0, @"There must be at least 1 window for test");
+  UIWindow* window = windowScene.windows[0];
+  [window addSubview:viewController.view];
+
+  [viewController loadView];
+
+  XCTestExpectation* expectation =
+      [[XCTestExpectation alloc] initWithDescription:@"Keyboard animates to proper position."];
+  CGRect keyboardFrame = CGRectMake(0, 500, 500, 500);
+  [NSNotificationCenter.defaultCenter
+      postNotificationName:UIKeyboardWillShowNotification
+                    object:nil
+                  userInfo:@{UIKeyboardFrameEndUserInfoKey : @(keyboardFrame)}];
+  FlutterMethodCall* initialMoveCall =
+      [FlutterMethodCall methodCallWithMethodName:@"TextInput.onPointerMoveForInteractiveKeyboard"
+                                        arguments:@{@"pointerY" : @(500)}];
+  [textInputPlugin handleMethodCall:initialMoveCall
+                             result:^(id _Nullable result){
+                             }];
+  FlutterMethodCall* subsequentMoveCall =
+      [FlutterMethodCall methodCallWithMethodName:@"TextInput.onPointerMoveForInteractiveKeyboard"
+                                        arguments:@{@"pointerY" : @(1000)}];
+  [textInputPlugin handleMethodCall:subsequentMoveCall
+                             result:^(id _Nullable result){
+                             }];
+
+  FlutterMethodCall* pointerUpCall =
+      [FlutterMethodCall methodCallWithMethodName:@"TextInput.onPointerUpForInteractiveKeyboard"
+                                        arguments:@{@"pointerY" : @(1000)}];
+  [textInputPlugin
+      handleMethodCall:pointerUpCall
+                result:^(id _Nullable result) {
+                  XCTAssertEqual(textInputPlugin.keyboardViewContainer.frame.origin.y,
+                                 viewController.flutterScreenIfViewLoaded.bounds.size.height);
+                  [expectation fulfill];
+                }];
+  textInputPlugin.cachedFirstResponder = nil;
+}
+- (void)testInteractiveKeyboardShowKeyboardAndRemoveScreenshotAnimationIsNotImmediatelyEnable {
+  [UIView setAnimationsEnabled:YES];
+  [textInputPlugin showKeyboardAndRemoveScreenshot];
+  XCTAssertFalse(
+      UIView.areAnimationsEnabled,
+      @"The animation should still be disabled following showKeyboardAndRemoveScreenshot");
+}
+
+- (void)testInteractiveKeyboardShowKeyboardAndRemoveScreenshotAnimationIsReenabledAfterDelay {
+  [UIView setAnimationsEnabled:YES];
+  [textInputPlugin showKeyboardAndRemoveScreenshot];
+
+  NSPredicate* predicate = [NSPredicate predicateWithBlock:^BOOL(id item, NSDictionary* bindings) {
+    // This will be enabled after a delay
+    return UIView.areAnimationsEnabled;
+  }];
+  XCTNSPredicateExpectation* expectation =
+      [[XCTNSPredicateExpectation alloc] initWithPredicate:predicate object:nil];
+  [self waitForExpectations:@[ expectation ] timeout:10.0];
+}
+
 @end
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterTextureRegistryRelay.h b/shell/platform/darwin/ios/framework/Source/FlutterTextureRegistryRelay.h
new file mode 100644
index 0000000000000000000000000000000000000000..26c19621fce97db506c34d06d382107107d7f7d8
--- /dev/null
+++ b/shell/platform/darwin/ios/framework/Source/FlutterTextureRegistryRelay.h
@@ -0,0 +1,29 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERTEXTUREREGISTRYRELAY_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERTEXTUREREGISTRYRELAY_H_
+
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterTexture.h"
+
+#if FLUTTER_RUNTIME_MODE == FLUTTER_RUNTIME_MODE_DEBUG
+FLUTTER_DARWIN_EXPORT
+#endif
+
+/**
+ * Wrapper around a weakly held collection of registered textures.
+ *
+ * Avoids a retain cycle between plugins and the engine.
+ */
+@interface FlutterTextureRegistryRelay : NSObject <FlutterTextureRegistry>
+
+/**
+ * A weak reference to a FlutterEngine that will be passed texture registration.
+ */
+@property(nonatomic, assign) NSObject<FlutterTextureRegistry>* parent;
+- (instancetype)initWithParent:(NSObject<FlutterTextureRegistry>*)parent;
+@end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERTEXTUREREGISTRYRELAY_H_
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterTextureRegistryRelay.mm b/shell/platform/darwin/ios/framework/Source/FlutterTextureRegistryRelay.mm
new file mode 100644
index 0000000000000000000000000000000000000000..89377f0b4b5618d7a0c9f3c7ef01cbe1f0d2bdec
--- /dev/null
+++ b/shell/platform/darwin/ios/framework/Source/FlutterTextureRegistryRelay.mm
@@ -0,0 +1,42 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextureRegistryRelay.h"
+
+#include "flutter/fml/logging.h"
+
+@implementation FlutterTextureRegistryRelay : NSObject
+
+#pragma mark - FlutterTextureRegistry
+
+- (instancetype)initWithParent:(NSObject<FlutterTextureRegistry>*)parent {
+  if (self = [super init]) {
+    _parent = parent;
+  }
+  return self;
+}
+
+- (int64_t)registerTexture:(NSObject<FlutterTexture>*)texture {
+  if (!self.parent) {
+    FML_LOG(WARNING) << "Using on an empty registry.";
+    return 0;
+  }
+  return [self.parent registerTexture:texture];
+}
+
+- (void)textureFrameAvailable:(int64_t)textureId {
+  if (!self.parent) {
+    FML_LOG(WARNING) << "Using on an empty registry.";
+  }
+  return [self.parent textureFrameAvailable:textureId];
+}
+
+- (void)unregisterTexture:(int64_t)textureId {
+  if (!self.parent) {
+    FML_LOG(WARNING) << "Using on an empty registry.";
+  }
+  return [self.parent unregisterTexture:textureId];
+}
+
+@end
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterTextureRegistryRelayTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterTextureRegistryRelayTest.mm
new file mode 100644
index 0000000000000000000000000000000000000000..790b484075e3fa5651a76142493bec6a2f6a1fa9
--- /dev/null
+++ b/shell/platform/darwin/ios/framework/Source/FlutterTextureRegistryRelayTest.mm
@@ -0,0 +1,67 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterEngine.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextureRegistryRelay.h"
+
+#import <OCMock/OCMock.h>
+#import <XCTest/XCTest.h>
+
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterTexture.h"
+
+FLUTTER_ASSERT_ARC
+
+@interface FlutterTextureRegistryRelayTest : XCTestCase
+@end
+
+@implementation FlutterTextureRegistryRelayTest
+
+- (void)testCreate {
+  id textureRegistry = OCMProtocolMock(@protocol(FlutterTextureRegistry));
+  FlutterTextureRegistryRelay* relay =
+      [[FlutterTextureRegistryRelay alloc] initWithParent:textureRegistry];
+  XCTAssertNotNil(relay);
+  XCTAssertEqual(textureRegistry, relay.parent);
+}
+
+- (void)testRegisterTexture {
+  id textureRegistry = OCMProtocolMock(@protocol(FlutterTextureRegistry));
+  FlutterTextureRegistryRelay* relay =
+      [[FlutterTextureRegistryRelay alloc] initWithParent:textureRegistry];
+  id texture = OCMProtocolMock(@protocol(FlutterTexture));
+  [relay registerTexture:texture];
+  OCMVerify([textureRegistry registerTexture:texture]);
+}
+
+- (void)testTextureFrameAvailable {
+  id textureRegistry = OCMProtocolMock(@protocol(FlutterTextureRegistry));
+  FlutterTextureRegistryRelay* relay =
+      [[FlutterTextureRegistryRelay alloc] initWithParent:textureRegistry];
+  [relay textureFrameAvailable:0];
+  OCMVerify([textureRegistry textureFrameAvailable:0]);
+}
+
+- (void)testUnregisterTexture {
+  id textureRegistry = OCMProtocolMock(@protocol(FlutterTextureRegistry));
+  FlutterTextureRegistryRelay* relay =
+      [[FlutterTextureRegistryRelay alloc] initWithParent:textureRegistry];
+  [relay unregisterTexture:0];
+  OCMVerify([textureRegistry unregisterTexture:0]);
+}
+
+- (void)testRetainCycle {
+  __weak FlutterEngine* weakEngine;
+  NSObject<FlutterTextureRegistry>* strongRelay;
+  @autoreleasepool {
+    FlutterDartProject* project = [[FlutterDartProject alloc] init];
+    FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"foobar" project:project];
+    strongRelay = [engine textureRegistry];
+    weakEngine = engine;
+  }
+  XCTAssertNil(weakEngine);
+  XCTAssertNotNil(strongRelay);
+}
+
+@end
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterTouchInterceptingView_Test.h b/shell/platform/darwin/ios/framework/Source/FlutterTouchInterceptingView_Test.h
new file mode 100644
index 0000000000000000000000000000000000000000..5d0eae76aedcacb85cde4da302ea89ac90e4cd15
--- /dev/null
+++ b/shell/platform/darwin/ios/framework/Source/FlutterTouchInterceptingView_Test.h
@@ -0,0 +1,14 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h"
+
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERTOUCHINTERCEPTINGVIEW_TEST_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERTOUCHINTERCEPTINGVIEW_TEST_H_
+
+@interface FlutterTouchInterceptingView (Tests)
+- (id)accessibilityContainer;
+@end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERTOUCHINTERCEPTINGVIEW_TEST_H_
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterUIPressProxy.h b/shell/platform/darwin/ios/framework/Source/FlutterUIPressProxy.h
index b5c568670a28c24c51c7fc7af6efd8a12599b6d3..9aeb4d7a517cb165d91a34c4069742c89836ff75 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterUIPressProxy.h
+++ b/shell/platform/darwin/ios/framework/Source/FlutterUIPressProxy.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTER_UI_PRESS_PROXY_H_
-#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTER_UI_PRESS_PROXY_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERUIPRESSPROXY_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERUIPRESSPROXY_H_
 
 #import <UIKit/UIKit.h>
 #include <functional>
@@ -25,4 +25,4 @@ API_AVAILABLE(ios(13.4))
 
 @end
 
-#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTER_UI_PRESS_PROXY_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERUIPRESSPROXY_H_
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterUndoManagerDelegate.h b/shell/platform/darwin/ios/framework/Source/FlutterUndoManagerDelegate.h
index 2157820c85e72e844a1accf218a197d2c9f923f6..b81e7510d0114264e0fde6d68ae22bd72406a0d8 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterUndoManagerDelegate.h
+++ b/shell/platform/darwin/ios/framework/Source/FlutterUndoManagerDelegate.h
@@ -2,16 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERUNDOMANAGERDELEGATE_H_
-#define SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERUNDOMANAGERDELEGATE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERUNDOMANAGERDELEGATE_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERUNDOMANAGERDELEGATE_H_
 
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
 typedef NS_ENUM(NSInteger, FlutterUndoRedoDirection) {
+  // NOLINTBEGIN(readability-identifier-naming)
   FlutterUndoRedoDirectionUndo,
   FlutterUndoRedoDirectionRedo,
+  // NOLINTEND(readability-identifier-naming)
 };
 
 @class FlutterUndoManagerPlugin;
@@ -22,4 +24,4 @@ typedef NS_ENUM(NSInteger, FlutterUndoRedoDirection) {
 @end
 NS_ASSUME_NONNULL_END
 
-#endif  // SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERUNDOMANAGERDELEGATE_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERUNDOMANAGERDELEGATE_H_
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterUndoManagerPlugin.h b/shell/platform/darwin/ios/framework/Source/FlutterUndoManagerPlugin.h
index 8e38f76e5c0904af7f30eb94b862c4b7d7d74d56..c2dac66f87d471fc4f59cdf160a577e97f58f648 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterUndoManagerPlugin.h
+++ b/shell/platform/darwin/ios/framework/Source/FlutterUndoManagerPlugin.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERUNDOMANAGERPLUGIN_H_
-#define SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERUNDOMANAGERPLUGIN_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERUNDOMANAGERPLUGIN_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERUNDOMANAGERPLUGIN_H_
 
 #import <UIKit/UIKit.h>
 
@@ -26,4 +26,4 @@
 
 @end
 
-#endif  // SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERUNDOMANAGERPLUGIN_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERUNDOMANAGERPLUGIN_H_
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterUndoManagerPlugin.mm b/shell/platform/darwin/ios/framework/Source/FlutterUndoManagerPlugin.mm
index 488704ea4aeb9ea452bf50846bec62d490d958e1..b8f4b65f0f561a671ba1a3db744b6abc79106765 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterUndoManagerPlugin.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterUndoManagerPlugin.mm
@@ -104,9 +104,9 @@ static NSString* const kCanRedo = @"canRedo";
     // This is needed to notify the iPadOS keyboard that it needs to update the
     // state of the UIBarButtons. Otherwise, the state changes to NSUndoManager
     // will not show up until the next keystroke (or other trigger).
-    id<UITextInputDelegate> inputDelegate =
-        _viewController.engine.textInputPlugin.textInputView.inputDelegate;
-    [inputDelegate selectionDidChange:_viewController.engine.textInputPlugin.textInputView];
+    UITextInputAssistantItem* assistantItem =
+        _viewController.engine.textInputPlugin.textInputView.inputAssistantItem;
+    assistantItem.leadingBarButtonGroups = assistantItem.leadingBarButtonGroups;
   }
   [self undoManager].groupsByEvent = groupsByEvent;
 }
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterUndoManagerPluginTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterUndoManagerPluginTest.mm
index 0a30cb1dfb871ddc3c51a63f772618bdbfcd2af5..c9edad986370e103f4cafeda941ea779f194bc37 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterUndoManagerPluginTest.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterUndoManagerPluginTest.mm
@@ -10,11 +10,13 @@
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
 #import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterEngine.h"
 #import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h"
 
 FLUTTER_ASSERT_ARC
 
 @interface FlutterEngine ()
 - (nonnull FlutterUndoManagerPlugin*)undoManagerPlugin;
+- (nonnull FlutterTextInputPlugin*)textInputPlugin;
 @end
 
 @interface FlutterUndoManagerPluginForTest : FlutterUndoManagerPlugin
@@ -41,7 +43,7 @@ FLUTTER_ASSERT_ARC
 
   self.undoManagerPlugin = [[FlutterUndoManagerPluginForTest alloc] initWithDelegate:self.engine];
 
-  self.viewController = [FlutterViewController new];
+  self.viewController = [[FlutterViewController alloc] init];
   self.undoManagerPlugin.viewController = self.viewController;
 
   self.undoManager = OCMClassMock([NSUndoManager class]);
@@ -50,7 +52,6 @@ FLUTTER_ASSERT_ARC
 
 - (void)tearDown {
   [self.undoManager removeAllActionsWithTarget:self.undoManagerPlugin];
-  self.undoManagerPlugin = nil;
   self.engine = nil;
   self.viewController = nil;
   self.undoManager = nil;
@@ -140,4 +141,26 @@ FLUTTER_ASSERT_ARC
   XCTAssertEqual(2, delegateRedoCount);
 }
 
+- (void)testSetUndoStateDoesInteractWithInputDelegate {
+  // Regression test for https://github.com/flutter/flutter/issues/133424
+  FlutterViewController* viewController = OCMPartialMock(self.viewController);
+  self.undoManagerPlugin.viewController = self.viewController;
+
+  FlutterTextInputPlugin* textInputPlugin = OCMClassMock([FlutterTextInputPlugin class]);
+  FlutterTextInputView* textInputView = OCMClassMock([FlutterTextInputView class]);
+
+  OCMStub([viewController engine]).andReturn(self.engine);
+  OCMStub([self.engine textInputPlugin]).andReturn(textInputPlugin);
+  OCMStub([textInputPlugin textInputView]).andReturn(textInputView);
+
+  FlutterMethodCall* setUndoStateCall =
+      [FlutterMethodCall methodCallWithMethodName:@"UndoManager.setUndoState"
+                                        arguments:@{@"canUndo" : @NO, @"canRedo" : @NO}];
+  [self.undoManagerPlugin handleMethodCall:setUndoStateCall
+                                    result:^(id _Nullable result){
+                                    }];
+
+  OCMVerify(never(), [textInputView inputDelegate]);
+}
+
 @end
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterView.h b/shell/platform/darwin/ios/framework/Source/FlutterView.h
index a795953c823f424888027b853de93755ccdf7289..83d101dba13cb1524bb9712a9daca0db1285e9e5 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterView.h
+++ b/shell/platform/darwin/ios/framework/Source/FlutterView.h
@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTER_VIEW_H_
-#define SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTER_VIEW_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERVIEW_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERVIEW_H_
 
+#include <Metal/Metal.h>
 #import <UIKit/UIKit.h>
 
 #include <memory>
@@ -17,6 +18,8 @@
 
 @protocol FlutterViewEngineDelegate <NSObject>
 
+@property(nonatomic, readonly) BOOL isUsingImpeller;
+
 - (flutter::Rasterizer::Screenshot)takeScreenshot:(flutter::Rasterizer::ScreenshotType)type
                                   asBase64Encoded:(BOOL)base64Encode;
 
@@ -41,10 +44,14 @@
 - (instancetype)initWithCoder:(NSCoder*)aDecoder NS_UNAVAILABLE;
 
 - (instancetype)initWithDelegate:(id<FlutterViewEngineDelegate>)delegate
-                          opaque:(BOOL)opaque NS_DESIGNATED_INITIALIZER;
+                          opaque:(BOOL)opaque
+                 enableWideGamut:(BOOL)isWideGamutEnabled NS_DESIGNATED_INITIALIZER;
+
+- (UIScreen*)screen;
+- (MTLPixelFormat)pixelFormat;
 
 // Set by FlutterEngine or FlutterViewController to override software rendering.
 @property(class, nonatomic) BOOL forceSoftwareRendering;
 @end
 
-#endif  // SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTER_VIEW_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERVIEW_H_
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterView.mm b/shell/platform/darwin/ios/framework/Source/FlutterView.mm
index dcab55d404c34c26d959baadb86438025b9e7b4c..337dc7d277f46cd817cfad836cc7d29d68de77a5 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterView.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterView.mm
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterView.h"
+#include <Metal/Metal.h>
 
 #include "flutter/common/settings.h"
 #include "flutter/common/task_runners.h"
@@ -18,6 +19,7 @@
 
 @implementation FlutterView {
   id<FlutterViewEngineDelegate> _delegate;
+  BOOL _isWideGamutEnabled;
 }
 
 - (instancetype)init {
@@ -35,7 +37,40 @@
   return nil;
 }
 
-- (instancetype)initWithDelegate:(id<FlutterViewEngineDelegate>)delegate opaque:(BOOL)opaque {
+- (UIScreen*)screen {
+  if (@available(iOS 13.0, *)) {
+    return self.window.windowScene.screen;
+  }
+  return UIScreen.mainScreen;
+}
+
+- (MTLPixelFormat)pixelFormat {
+  if ([self.layer isKindOfClass:NSClassFromString(@"CAMetalLayer")]) {
+// It is a known Apple bug that CAMetalLayer incorrectly reports its supported
+// SDKs. It is, in fact, available since iOS 8.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunguarded-availability-new"
+    CAMetalLayer* layer = (CAMetalLayer*)self.layer;
+    return layer.pixelFormat;
+  }
+  return MTLPixelFormatBGRA8Unorm;
+}
+- (BOOL)isWideGamutSupported {
+  if (![_delegate isUsingImpeller]) {
+    return NO;
+  }
+
+  FML_DCHECK(self.screen);
+
+  // This predicates the decision on the capabilities of the iOS device's
+  // display.  This means external displays will not support wide gamut if the
+  // device's display doesn't support it.  It practice that should be never.
+  return self.screen.traitCollection.displayGamut != UIDisplayGamutSRGB;
+}
+
+- (instancetype)initWithDelegate:(id<FlutterViewEngineDelegate>)delegate
+                          opaque:(BOOL)opaque
+                 enableWideGamut:(BOOL)isWideGamutEnabled {
   if (delegate == nil) {
     NSLog(@"FlutterView delegate was nil.");
     [self release];
@@ -46,6 +81,7 @@
 
   if (self) {
     _delegate = delegate;
+    _isWideGamutEnabled = isWideGamutEnabled;
     self.layer.opaque = opaque;
 
     // This line is necessary. CoreAnimation(or UIKit) may take this to do
@@ -58,12 +94,42 @@
   return self;
 }
 
+static void PrintWideGamutWarningOnce() {
+  static BOOL did_print = NO;
+  if (did_print) {
+    return;
+  }
+  FML_DLOG(WARNING) << "Rendering wide gamut colors is turned on but isn't "
+                       "supported, downgrading the color gamut to sRGB.";
+  did_print = YES;
+}
+
 - (void)layoutSubviews {
   if ([self.layer isKindOfClass:NSClassFromString(@"CAMetalLayer")]) {
-    CGFloat screenScale = [UIScreen mainScreen].scale;
-    self.layer.allowsGroupOpacity = YES;
-    self.layer.contentsScale = screenScale;
-    self.layer.rasterizationScale = screenScale;
+// It is a known Apple bug that CAMetalLayer incorrectly reports its supported
+// SDKs. It is, in fact, available since iOS 8.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunguarded-availability-new"
+    CAMetalLayer* layer = (CAMetalLayer*)self.layer;
+#pragma clang diagnostic pop
+    CGFloat screenScale = self.screen.scale;
+    layer.allowsGroupOpacity = YES;
+    layer.contentsScale = screenScale;
+    layer.rasterizationScale = screenScale;
+    layer.framebufferOnly = flutter::Settings::kSurfaceDataAccessible ? NO : YES;
+    BOOL isWideGamutSupported = self.isWideGamutSupported;
+    if (_isWideGamutEnabled && isWideGamutSupported) {
+      CGColorSpaceRef srgb = CGColorSpaceCreateWithName(kCGColorSpaceExtendedSRGB);
+      layer.colorspace = srgb;
+      CFRelease(srgb);
+      // MTLPixelFormatRGBA16Float was chosen since it is compatible with
+      // impeller's offscreen buffers which need to have transparency.  Also,
+      // F16 was chosen over BGRA10_XR since Skia does not support decoding
+      // BGRA10_XR.
+      layer.pixelFormat = MTLPixelFormatRGBA16Float;
+    } else if (_isWideGamutEnabled && !isWideGamutSupported) {
+      PrintWideGamutWarningOnce();
+    }
   }
 
   [super layoutSubviews];
@@ -106,26 +172,59 @@ static BOOL _forceSoftwareRendering;
 
   fml::CFRef<CGColorSpaceRef> colorspace(CGColorSpaceCreateDeviceRGB());
 
+  // Defaults for RGBA8888.
+  size_t bits_per_component = 8u;
+  size_t bits_per_pixel = 32u;
+  size_t bytes_per_row_multiplier = 4u;
+  CGBitmapInfo bitmap_info =
+      static_cast<CGBitmapInfo>(static_cast<uint32_t>(kCGImageAlphaPremultipliedLast) |
+                                static_cast<uint32_t>(kCGBitmapByteOrder32Big));
+
+  switch (screenshot.pixel_format) {
+    case flutter::Rasterizer::ScreenshotFormat::kUnknown:
+    case flutter::Rasterizer::ScreenshotFormat::kR8G8B8A8UNormInt:
+      // Assume unknown is Skia and is RGBA8888. Keep defaults.
+      break;
+    case flutter::Rasterizer::ScreenshotFormat::kB8G8R8A8UNormInt:
+      // Treat this as little endian with the alpha first so that it's read backwards.
+      bitmap_info =
+          static_cast<CGBitmapInfo>(static_cast<uint32_t>(kCGImageAlphaPremultipliedFirst) |
+                                    static_cast<uint32_t>(kCGBitmapByteOrder32Little));
+      break;
+    case flutter::Rasterizer::ScreenshotFormat::kR16G16B16A16Float:
+      bits_per_component = 16u;
+      bits_per_pixel = 64u;
+      bytes_per_row_multiplier = 8u;
+      bitmap_info =
+          static_cast<CGBitmapInfo>(static_cast<uint32_t>(kCGImageAlphaPremultipliedLast) |
+                                    static_cast<uint32_t>(kCGBitmapFloatComponents) |
+                                    static_cast<uint32_t>(kCGBitmapByteOrder16Little));
+      break;
+  }
+
   fml::CFRef<CGImageRef> image(CGImageCreate(
-      screenshot.frame_size.width(),      // size_t width
-      screenshot.frame_size.height(),     // size_t height
-      8,                                  // size_t bitsPerComponent
-      32,                                 // size_t bitsPerPixel,
-      4 * screenshot.frame_size.width(),  // size_t bytesPerRow
-      colorspace,                         // CGColorSpaceRef space
-      static_cast<CGBitmapInfo>(kCGImageAlphaPremultipliedLast |
-                                kCGBitmapByteOrder32Big),  // CGBitmapInfo bitmapInfo
-      image_data_provider,                                 // CGDataProviderRef provider
-      nullptr,                                             // const CGFloat* decode
-      false,                                               // bool shouldInterpolate
-      kCGRenderingIntentDefault                            // CGColorRenderingIntent intent
+      screenshot.frame_size.width(),                             // size_t width
+      screenshot.frame_size.height(),                            // size_t height
+      bits_per_component,                                        // size_t bitsPerComponent
+      bits_per_pixel,                                            // size_t bitsPerPixel,
+      bytes_per_row_multiplier * screenshot.frame_size.width(),  // size_t bytesPerRow
+      colorspace,                                                // CGColorSpaceRef space
+      bitmap_info,                                               // CGBitmapInfo bitmapInfo
+      image_data_provider,                                       // CGDataProviderRef provider
+      nullptr,                                                   // const CGFloat* decode
+      false,                                                     // bool shouldInterpolate
+      kCGRenderingIntentDefault                                  // CGColorRenderingIntent intent
       ));
 
   const CGRect frame_rect =
       CGRectMake(0.0, 0.0, screenshot.frame_size.width(), screenshot.frame_size.height());
-
   CGContextSaveGState(context);
-  CGContextTranslateCTM(context, 0.0, CGBitmapContextGetHeight(context));
+  // If the CGContext is not a bitmap based context, this returns zero.
+  CGFloat height = CGBitmapContextGetHeight(context);
+  if (height == 0) {
+    height = CGFloat(screenshot.frame_size.height());
+  }
+  CGContextTranslateCTM(context, 0.0, height);
   CGContextScaleCTM(context, 1.0, -1.0);
   CGContextDrawImage(context, frame_rect, image);
   CGContextRestoreGState(context);
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm b/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm
index 37b7c1dbb50d5a0e6dd5c2d8db627edee345a2fd..1134b735c68feb8206efa3e45d23b16d98bf1a82 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm
@@ -9,13 +9,14 @@
 #import <os/log.h>
 #include <memory>
 
+#include "flutter/common/constants.h"
 #include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/fml/message_loop.h"
 #include "flutter/fml/platform/darwin/platform_version.h"
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
 #include "flutter/runtime/ptrace_check.h"
 #include "flutter/shell/common/thread_host.h"
-#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelay.h"
+#import "flutter/shell/platform/darwin/common/framework/Source/FlutterBinaryMessengerRelay.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterChannelKeyResponder.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterEmbedderKeyResponder.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h"
@@ -26,10 +27,12 @@
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputDelegate.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterView.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/UIViewController+FlutterScreenAndSceneIfLoaded.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.h"
 #import "flutter/shell/platform/darwin/ios/platform_view_ios.h"
 #import "flutter/shell/platform/embedder/embedder.h"
+#import "flutter/third_party/spring_animation/spring_animation.h"
 
 static constexpr int kMicrosecondsPerSecond = 1000 * 1000;
 static constexpr CGFloat kScrollViewContentSize = 2.0;
@@ -56,15 +59,29 @@ typedef struct MouseState {
 // change. Unfortunately unless you have Werror turned on, incompatible pointers as arguments are
 // just a warning.
 @interface FlutterViewController () <FlutterBinaryMessenger, UIScrollViewDelegate>
+// TODO(dkwingsmt): Make the view ID property public once the iOS shell
+// supports multiple views.
+// https://github.com/flutter/flutter/issues/138168
+@property(nonatomic, readonly) int64_t viewIdentifier;
+
 @property(nonatomic, readwrite, getter=isDisplayingFlutterUI) BOOL displayingFlutterUI;
 @property(nonatomic, assign) BOOL isHomeIndicatorHidden;
 @property(nonatomic, assign) BOOL isPresentingViewControllerAnimating;
 
+/**
+ * Whether we should ignore viewport metrics updates during rotation transition.
+ */
+@property(nonatomic, assign) BOOL shouldIgnoreViewportMetricsUpdatesDuringRotation;
+
 /**
  * Keyboard animation properties
  */
-@property(nonatomic, assign) double targetViewInsetBottom;
+@property(nonatomic, assign) CGFloat targetViewInsetBottom;
+@property(nonatomic, assign) CGFloat originalViewInsetBottom;
 @property(nonatomic, retain) VSyncClient* keyboardAnimationVSyncClient;
+@property(nonatomic, assign) BOOL keyboardAnimationIsShowing;
+@property(nonatomic, assign) fml::TimePoint keyboardAnimationStartTime;
+@property(nonatomic, assign) BOOL isKeyboardInOrTransitioningFromBackground;
 
 /// VSyncClient for touch events delivery frame rate correction.
 ///
@@ -101,7 +118,7 @@ typedef struct MouseState {
 @end
 
 @implementation FlutterViewController {
-  std::unique_ptr<fml::WeakPtrFactory<FlutterViewController>> _weakFactory;
+  std::unique_ptr<fml::WeakNSObjectFactory<FlutterViewController>> _weakFactory;
   fml::scoped_nsobject<FlutterEngine> _engine;
 
   // We keep a separate reference to this and create it ahead of time because we want to be able to
@@ -122,6 +139,7 @@ typedef struct MouseState {
   // https://github.com/flutter/flutter/issues/35050
   fml::scoped_nsobject<UIScrollView> _scrollView;
   fml::scoped_nsobject<UIView> _keyboardAnimationView;
+  fml::scoped_nsobject<SpringAnimation> _keyboardSpringAnimation;
   MouseState _mouseState;
   // Timestamp after which a scroll inertia cancel event should be inferred.
   NSTimeInterval _scrollInertiaEventStartline;
@@ -135,6 +153,8 @@ typedef struct MouseState {
 }
 
 @synthesize displayingFlutterUI = _displayingFlutterUI;
+@synthesize prefersStatusBarHidden = _flutterPrefersStatusBarHidden;
+@dynamic viewIdentifier;
 
 #pragma mark - Manage and override all designated initializers
 
@@ -155,8 +175,10 @@ typedef struct MouseState {
     }
     _engine.reset([engine retain]);
     _engineNeedsLaunch = NO;
-    _flutterView.reset([[FlutterView alloc] initWithDelegate:_engine opaque:self.isViewOpaque]);
-    _weakFactory = std::make_unique<fml::WeakPtrFactory<FlutterViewController>>(self);
+    _flutterView.reset([[FlutterView alloc] initWithDelegate:_engine
+                                                      opaque:self.isViewOpaque
+                                             enableWideGamut:engine.project.isWideGamutEnabled]);
+    _weakFactory = std::make_unique<fml::WeakNSObjectFactory<FlutterViewController>>(self);
     _ongoingTouches.reset([[NSMutableSet alloc] init]);
 
     [self performCommonViewControllerInitialization];
@@ -217,7 +239,7 @@ typedef struct MouseState {
     project = [[[FlutterDartProject alloc] init] autorelease];
   }
   FlutterView.forceSoftwareRendering = project.settings.enable_software_rendering;
-  _weakFactory = std::make_unique<fml::WeakPtrFactory<FlutterViewController>>(self);
+  _weakFactory = std::make_unique<fml::WeakNSObjectFactory<FlutterViewController>>(self);
   auto engine = fml::scoped_nsobject<FlutterEngine>{[[FlutterEngine alloc]
                 initWithName:@"io.flutter"
                      project:project
@@ -230,7 +252,9 @@ typedef struct MouseState {
 
   _viewOpaque = YES;
   _engine = engine;
-  _flutterView.reset([[FlutterView alloc] initWithDelegate:_engine opaque:self.isViewOpaque]);
+  _flutterView.reset([[FlutterView alloc] initWithDelegate:_engine
+                                                    opaque:self.isViewOpaque
+                                           enableWideGamut:project.isWideGamutEnabled]);
   [_engine.get() createShell:nil libraryURI:nil initialRoute:initialRoute];
   _engineNeedsLaunch = YES;
   _ongoingTouches.reset([[NSMutableSet alloc] init]);
@@ -262,18 +286,18 @@ typedef struct MouseState {
   _orientationPreferences = UIInterfaceOrientationMaskAll;
   _statusBarStyle = UIStatusBarStyleDefault;
 
-  [self setupNotificationCenterObservers];
+  [self setUpNotificationCenterObservers];
 }
 
 - (FlutterEngine*)engine {
   return _engine.get();
 }
 
-- (fml::WeakPtr<FlutterViewController>)getWeakPtr {
-  return _weakFactory->GetWeakPtr();
+- (fml::WeakNSObject<FlutterViewController>)getWeakNSObject {
+  return _weakFactory->GetWeakNSObject();
 }
 
-- (void)setupNotificationCenterObservers {
+- (void)setUpNotificationCenterObservers {
   NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
   [center addObserver:self
              selector:@selector(onOrientationPreferencesUpdated:)
@@ -285,34 +309,24 @@ typedef struct MouseState {
                  name:@(flutter::kOverlayStyleUpdateNotificationName)
                object:nil];
 
-  [center addObserver:self
-             selector:@selector(applicationBecameActive:)
-                 name:UIApplicationDidBecomeActiveNotification
-               object:nil];
-
-  [center addObserver:self
-             selector:@selector(applicationWillResignActive:)
-                 name:UIApplicationWillResignActiveNotification
-               object:nil];
-
-  [center addObserver:self
-             selector:@selector(applicationWillTerminate:)
-                 name:UIApplicationWillTerminateNotification
-               object:nil];
-
-  [center addObserver:self
-             selector:@selector(applicationDidEnterBackground:)
-                 name:UIApplicationDidEnterBackgroundNotification
-               object:nil];
+#if APPLICATION_EXTENSION_API_ONLY
+  if (@available(iOS 13.0, *)) {
+    [self setUpSceneLifecycleNotifications:center];
+  } else {
+    [self setUpApplicationLifecycleNotifications:center];
+  }
+#else
+  [self setUpApplicationLifecycleNotifications:center];
+#endif
 
   [center addObserver:self
-             selector:@selector(applicationWillEnterForeground:)
-                 name:UIApplicationWillEnterForegroundNotification
+             selector:@selector(keyboardWillChangeFrame:)
+                 name:UIKeyboardWillChangeFrameNotification
                object:nil];
 
   [center addObserver:self
-             selector:@selector(keyboardWillChangeFrame:)
-                 name:UIKeyboardWillChangeFrameNotification
+             selector:@selector(keyboardWillShowNotification:)
+                 name:UIKeyboardWillShowNotification
                object:nil];
 
   [center addObserver:self
@@ -322,7 +336,7 @@ typedef struct MouseState {
 
   [center addObserver:self
              selector:@selector(onAccessibilityStatusChanged:)
-                 name:UIAccessibilityVoiceOverStatusChanged
+                 name:UIAccessibilityVoiceOverStatusDidChangeNotification
                object:nil];
 
   [center addObserver:self
@@ -378,6 +392,60 @@ typedef struct MouseState {
                object:nil];
 }
 
+- (void)setUpSceneLifecycleNotifications:(NSNotificationCenter*)center API_AVAILABLE(ios(13.0)) {
+  [center addObserver:self
+             selector:@selector(sceneBecameActive:)
+                 name:UISceneDidActivateNotification
+               object:nil];
+
+  [center addObserver:self
+             selector:@selector(sceneWillResignActive:)
+                 name:UISceneWillDeactivateNotification
+               object:nil];
+
+  [center addObserver:self
+             selector:@selector(sceneWillDisconnect:)
+                 name:UISceneDidDisconnectNotification
+               object:nil];
+
+  [center addObserver:self
+             selector:@selector(sceneDidEnterBackground:)
+                 name:UISceneDidEnterBackgroundNotification
+               object:nil];
+
+  [center addObserver:self
+             selector:@selector(sceneWillEnterForeground:)
+                 name:UISceneWillEnterForegroundNotification
+               object:nil];
+}
+
+- (void)setUpApplicationLifecycleNotifications:(NSNotificationCenter*)center {
+  [center addObserver:self
+             selector:@selector(applicationBecameActive:)
+                 name:UIApplicationDidBecomeActiveNotification
+               object:nil];
+
+  [center addObserver:self
+             selector:@selector(applicationWillResignActive:)
+                 name:UIApplicationWillResignActiveNotification
+               object:nil];
+
+  [center addObserver:self
+             selector:@selector(applicationWillTerminate:)
+                 name:UIApplicationWillTerminateNotification
+               object:nil];
+
+  [center addObserver:self
+             selector:@selector(applicationDidEnterBackground:)
+                 name:UIApplicationDidEnterBackgroundNotification
+               object:nil];
+
+  [center addObserver:self
+             selector:@selector(applicationWillEnterForeground:)
+                 name:UIApplicationWillEnterForegroundNotification
+               object:nil];
+}
+
 - (void)setInitialRoute:(NSString*)route {
   [[_engine.get() navigationChannel] invokeMethod:@"setInitialRoute" arguments:route];
 }
@@ -456,10 +524,11 @@ static UIView* GetViewOrPlaceholder(UIView* existing_view) {
   return pointer_data;
 }
 
-static void SendFakeTouchEvent(FlutterEngine* engine,
+static void SendFakeTouchEvent(UIScreen* screen,
+                               FlutterEngine* engine,
                                CGPoint location,
                                flutter::PointerData::Change change) {
-  const CGFloat scale = [UIScreen mainScreen].scale;
+  const CGFloat scale = screen.scale;
   flutter::PointerData pointer_data = [[engine viewController] generatePointerDataForFake];
   pointer_data.physical_x = location.x * scale;
   pointer_data.physical_y = location.y * scale;
@@ -474,8 +543,11 @@ static void SendFakeTouchEvent(FlutterEngine* engine,
     return NO;
   }
   CGPoint statusBarPoint = CGPointZero;
-  SendFakeTouchEvent(_engine.get(), statusBarPoint, flutter::PointerData::Change::kDown);
-  SendFakeTouchEvent(_engine.get(), statusBarPoint, flutter::PointerData::Change::kUp);
+  UIScreen* screen = [self flutterScreenIfViewLoaded];
+  if (screen) {
+    SendFakeTouchEvent(screen, _engine.get(), statusBarPoint, flutter::PointerData::Change::kDown);
+    SendFakeTouchEvent(screen, _engine.get(), statusBarPoint, flutter::PointerData::Change::kUp);
+  }
   return NO;
 }
 
@@ -552,10 +624,10 @@ static void SendFakeTouchEvent(FlutterEngine* engine,
   }
 
   // Start on the platform thread.
-  weakPlatformView->SetNextFrameCallback([weakSelf = [self getWeakPtr],
+  weakPlatformView->SetNextFrameCallback([weakSelf = [self getWeakNSObject],
                                           platformTaskRunner = [_engine.get() platformTaskRunner],
-                                          RasterTaskRunner = [_engine.get() RasterTaskRunner]]() {
-    FML_DCHECK(RasterTaskRunner->RunsTasksOnCurrentThread());
+                                          rasterTaskRunner = [_engine.get() rasterTaskRunner]]() {
+    FML_DCHECK(rasterTaskRunner->RunsTasksOnCurrentThread());
     // Get callback on raster thread and jump back to platform thread.
     platformTaskRunner->PostTask([weakSelf]() {
       if (weakSelf) {
@@ -577,6 +649,12 @@ static void SendFakeTouchEvent(FlutterEngine* engine,
 
 #pragma mark - Properties
 
+- (int64_t)viewIdentifier {
+  // TODO(dkwingsmt): Fill the view ID property with the correct value once the
+  // iOS shell supports multiple views.
+  return flutter::kFlutterImplicitViewId;
+}
+
 - (UIView*)splashScreenView {
   if (!_splashScreenView) {
     return nil;
@@ -588,6 +666,10 @@ static void SendFakeTouchEvent(FlutterEngine* engine,
   return _keyboardAnimationView.get();
 }
 
+- (SpringAnimation*)keyboardSpringAnimation {
+  return _keyboardSpringAnimation.get();
+}
+
 - (BOOL)loadDefaultSplashScreenView {
   NSString* launchscreenName =
       [[[NSBundle mainBundle] infoDictionary] objectForKey:@"UILaunchStoryboardName"];
@@ -648,7 +730,7 @@ static void SendFakeTouchEvent(FlutterEngine* engine,
 }
 
 - (void)setFlutterViewDidRenderCallback:(void (^)(void))callback {
-  _flutterViewRenderedCallback.reset(callback, fml::OwnershipPolicy::Retain);
+  _flutterViewRenderedCallback.reset(callback, fml::scoped_policy::OwnershipPolicy::kRetain);
 }
 
 #pragma mark - Surface creation and teardown updates
@@ -731,7 +813,7 @@ static void SendFakeTouchEvent(FlutterEngine* engine,
 
 - (void)addInternalPlugins {
   self.keyboardManager = [[[FlutterKeyboardManager alloc] init] autorelease];
-  fml::WeakPtr<FlutterViewController> weakSelf = [self getWeakPtr];
+  fml::WeakNSObject<FlutterViewController> weakSelf = [self getWeakNSObject];
   FlutterSendKeyEvent sendEvent =
       ^(const FlutterKeyEvent& event, FlutterKeyEventCallback callback, void* userData) {
         if (weakSelf) {
@@ -748,7 +830,7 @@ static void SendFakeTouchEvent(FlutterEngine* engine,
     [self.keyboardManager addSecondaryResponder:textInputPlugin];
   }
   if ([_engine.get() viewController] == self) {
-    [textInputPlugin setupIndirectScribbleInteraction:self];
+    [textInputPlugin setUpIndirectScribbleInteraction:self];
   }
 }
 
@@ -779,7 +861,16 @@ static void SendFakeTouchEvent(FlutterEngine* engine,
   if ([_engine.get() viewController] == self) {
     [self onUserSettingsChanged:nil];
     [self onAccessibilityStatusChanged:nil];
-    if (UIApplication.sharedApplication.applicationState == UIApplicationStateActive) {
+    BOOL stateIsActive = YES;
+#if APPLICATION_EXTENSION_API_ONLY
+    if (@available(iOS 13.0, *)) {
+      stateIsActive = self.flutterWindowSceneIfViewLoaded.activationState ==
+                      UISceneActivationStateForegroundActive;
+    }
+#else
+    stateIsActive = UIApplication.sharedApplication.applicationState == UIApplicationStateActive;
+#endif
+    if (stateIsActive) {
       [[_engine.get() lifecycleChannel] sendMessage:@"AppLifecycleState.resumed"];
     }
   }
@@ -808,6 +899,35 @@ static void SendFakeTouchEvent(FlutterEngine* engine,
   [super viewDidDisappear:animated];
 }
 
+- (void)viewWillTransitionToSize:(CGSize)size
+       withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator {
+  [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
+
+  // We delay the viewport metrics update for half of rotation transition duration, to address
+  // a bug with distorted aspect ratio.
+  // See: https://github.com/flutter/flutter/issues/16322
+  //
+  // This approach does not fully resolve all distortion problem. But instead, it reduces the
+  // rotation distortion roughly from 4x to 2x. The most distorted frames occur in the middle
+  // of the transition when it is rotating the fastest, making it hard to notice.
+
+  NSTimeInterval transitionDuration = coordinator.transitionDuration;
+  // Do not delay viewport metrics update if zero transition duration.
+  if (transitionDuration == 0) {
+    return;
+  }
+
+  _shouldIgnoreViewportMetricsUpdatesDuringRotation = YES;
+  dispatch_after(dispatch_time(DISPATCH_TIME_NOW,
+                               static_cast<int64_t>(transitionDuration / 2.0 * NSEC_PER_SEC)),
+                 dispatch_get_main_queue(), ^{
+                   // `viewWillTransitionToSize` is only called after the previous rotation is
+                   // complete. So there won't be race condition for this flag.
+                   _shouldIgnoreViewportMetricsUpdatesDuringRotation = NO;
+                   [self updateViewportMetricsIfNeeded];
+                 });
+}
+
 - (void)flushOngoingTouches {
   if (_engine && _ongoingTouches.get().count > 0) {
     auto packet = std::make_unique<flutter::PointerDataPacket>(_ongoingTouches.get().count);
@@ -821,6 +941,7 @@ static void SendFakeTouchEvent(FlutterEngine* engine,
       pointer_data.change = flutter::PointerData::Change::kCancel;
       pointer_data.device = device.longLongValue;
       pointer_data.pointer_identifier = 0;
+      pointer_data.view_id = self.viewIdentifier;
 
       // Anything we put here will be arbitrary since there are no touches.
       pointer_data.physical_x = 0;
@@ -873,30 +994,85 @@ static void SendFakeTouchEvent(FlutterEngine* engine,
 
 - (void)applicationBecameActive:(NSNotification*)notification {
   TRACE_EVENT0("flutter", "applicationBecameActive");
+  [self appOrSceneBecameActive];
+}
+
+- (void)applicationWillResignActive:(NSNotification*)notification {
+  TRACE_EVENT0("flutter", "applicationWillResignActive");
+  [self appOrSceneWillResignActive];
+}
+
+- (void)applicationWillTerminate:(NSNotification*)notification {
+  [self appOrSceneWillTerminate];
+}
+
+- (void)applicationDidEnterBackground:(NSNotification*)notification {
+  TRACE_EVENT0("flutter", "applicationDidEnterBackground");
+  [self appOrSceneDidEnterBackground];
+}
+
+- (void)applicationWillEnterForeground:(NSNotification*)notification {
+  TRACE_EVENT0("flutter", "applicationWillEnterForeground");
+  [self appOrSceneWillEnterForeground];
+}
+
+#pragma mark - Scene lifecycle notifications
+
+- (void)sceneBecameActive:(NSNotification*)notification API_AVAILABLE(ios(13.0)) {
+  TRACE_EVENT0("flutter", "sceneBecameActive");
+  [self appOrSceneBecameActive];
+}
+
+- (void)sceneWillResignActive:(NSNotification*)notification API_AVAILABLE(ios(13.0)) {
+  TRACE_EVENT0("flutter", "sceneWillResignActive");
+  [self appOrSceneWillResignActive];
+}
+
+- (void)sceneWillDisconnect:(NSNotification*)notification API_AVAILABLE(ios(13.0)) {
+  [self appOrSceneWillTerminate];
+}
+
+- (void)sceneDidEnterBackground:(NSNotification*)notification API_AVAILABLE(ios(13.0)) {
+  TRACE_EVENT0("flutter", "sceneDidEnterBackground");
+  [self appOrSceneDidEnterBackground];
+}
+
+- (void)sceneWillEnterForeground:(NSNotification*)notification API_AVAILABLE(ios(13.0)) {
+  TRACE_EVENT0("flutter", "sceneWillEnterForeground");
+  [self appOrSceneWillEnterForeground];
+}
+
+#pragma mark - Lifecycle shared
+
+- (void)appOrSceneBecameActive {
+  self.isKeyboardInOrTransitioningFromBackground = NO;
   if (_viewportMetrics.physical_width) {
     [self surfaceUpdated:YES];
   }
-  [self goToApplicationLifecycle:@"AppLifecycleState.resumed"];
+  [self performSelector:@selector(goToApplicationLifecycle:)
+             withObject:@"AppLifecycleState.resumed"
+             afterDelay:0.0f];
 }
 
-- (void)applicationWillResignActive:(NSNotification*)notification {
-  TRACE_EVENT0("flutter", "applicationWillResignActive");
+- (void)appOrSceneWillResignActive {
+  [NSObject cancelPreviousPerformRequestsWithTarget:self
+                                           selector:@selector(goToApplicationLifecycle:)
+                                             object:@"AppLifecycleState.resumed"];
   [self goToApplicationLifecycle:@"AppLifecycleState.inactive"];
 }
 
-- (void)applicationWillTerminate:(NSNotification*)notification {
+- (void)appOrSceneWillTerminate {
   [self goToApplicationLifecycle:@"AppLifecycleState.detached"];
   [self.engine destroyContext];
 }
 
-- (void)applicationDidEnterBackground:(NSNotification*)notification {
-  TRACE_EVENT0("flutter", "applicationDidEnterBackground");
+- (void)appOrSceneDidEnterBackground {
+  self.isKeyboardInOrTransitioningFromBackground = YES;
   [self surfaceUpdated:NO];
   [self goToApplicationLifecycle:@"AppLifecycleState.paused"];
 }
 
-- (void)applicationWillEnterForeground:(NSNotification*)notification {
-  TRACE_EVENT0("flutter", "applicationWillEnterForeground");
+- (void)appOrSceneWillEnterForeground {
   [self goToApplicationLifecycle:@"AppLifecycleState.inactive"];
 }
 
@@ -991,7 +1167,7 @@ static flutter::PointerData::DeviceKind DeviceKindFromTouchType(UITouch* touch)
   // Activate or pause the correction of delivery frame rate of touch events.
   [self triggerTouchRateCorrectionIfNeeded:touches];
 
-  const CGFloat scale = [UIScreen mainScreen].scale;
+  const CGFloat scale = [self flutterScreenIfViewLoaded].scale;
   auto packet =
       std::make_unique<flutter::PointerDataPacket>(touches.count + touches_to_remove_count);
 
@@ -1014,6 +1190,8 @@ static flutter::PointerData::DeviceKind DeviceKindFromTouchType(UITouch* touch)
 
     pointer_data.device = reinterpret_cast<int64_t>(touch);
 
+    pointer_data.view_id = self.viewIdentifier;
+
     // Pointer will be generated in pointer_data_packet_converter.cc.
     pointer_data.pointer_identifier = 0;
 
@@ -1195,24 +1373,18 @@ static flutter::PointerData::DeviceKind DeviceKindFromTouchType(UITouch* touch)
 
 #pragma mark - Handle view resizing
 
-- (void)updateViewportMetrics {
+- (void)updateViewportMetricsIfNeeded {
+  if (_shouldIgnoreViewportMetricsUpdatesDuringRotation) {
+    return;
+  }
   if ([_engine.get() viewController] == self) {
     [_engine.get() updateViewportMetrics:_viewportMetrics];
   }
 }
 
-- (CGFloat)statusBarPadding {
-  UIScreen* screen = self.view.window.screen;
-  CGRect statusFrame = [UIApplication sharedApplication].statusBarFrame;
-  CGRect viewFrame = [self.view convertRect:self.view.bounds
-                          toCoordinateSpace:screen.coordinateSpace];
-  CGRect intersection = CGRectIntersection(statusFrame, viewFrame);
-  return CGRectIsNull(intersection) ? 0.0 : intersection.size.height;
-}
-
 - (void)viewDidLayoutSubviews {
   CGRect viewBounds = self.view.bounds;
-  CGFloat scale = [UIScreen mainScreen].scale;
+  CGFloat scale = [self flutterScreenIfViewLoaded].scale;
 
   // Purposefully place this not visible.
   _scrollView.get().frame = CGRectMake(0.0, 0.0, viewBounds.size.width, 0.0);
@@ -1221,21 +1393,27 @@ static flutter::PointerData::DeviceKind DeviceKindFromTouchType(UITouch* touch)
   // First time since creation that the dimensions of its view is known.
   bool firstViewBoundsUpdate = !_viewportMetrics.physical_width;
   _viewportMetrics.device_pixel_ratio = scale;
-  _viewportMetrics.physical_width = viewBounds.size.width * scale;
-  _viewportMetrics.physical_height = viewBounds.size.height * scale;
-
-  [self updateViewportPadding];
-  [self updateViewportMetrics];
-
-  // There is no guarantee that UIKit will layout subviews when the application is active. Creating
-  // the surface when inactive will cause GPU accesses from the background. Only wait for the first
-  // frame to render when the application is actually active.
-  bool applicationIsActive =
+  [self setViewportMetricsSize];
+  [self setViewportMetricsPaddings];
+  [self updateViewportMetricsIfNeeded];
+
+  // There is no guarantee that UIKit will layout subviews when the application/scene is active.
+  // Creating the surface when inactive will cause GPU accesses from the background. Only wait for
+  // the first frame to render when the application/scene is actually active.
+  bool applicationOrSceneIsActive = YES;
+#if APPLICATION_EXTENSION_API_ONLY
+  if (@available(iOS 13.0, *)) {
+    applicationOrSceneIsActive = self.flutterWindowSceneIfViewLoaded.activationState ==
+                                 UISceneActivationStateForegroundActive;
+  }
+#else
+  applicationOrSceneIsActive =
       [UIApplication sharedApplication].applicationState == UIApplicationStateActive;
+#endif
 
   // This must run after updateViewportMetrics so that the surface creation tasks are queued after
   // the viewport metrics update tasks.
-  if (firstViewBoundsUpdate && applicationIsActive && _engine) {
+  if (firstViewBoundsUpdate && applicationOrSceneIsActive && _engine) {
     [self surfaceUpdated:YES];
 
     flutter::Shell& shell = [_engine.get() shell];
@@ -1254,16 +1432,33 @@ static flutter::PointerData::DeviceKind DeviceKindFromTouchType(UITouch* touch)
 }
 
 - (void)viewSafeAreaInsetsDidChange {
-  [self updateViewportPadding];
-  [self updateViewportMetrics];
+  [self setViewportMetricsPaddings];
+  [self updateViewportMetricsIfNeeded];
   [super viewSafeAreaInsetsDidChange];
 }
 
-// Updates _viewportMetrics physical padding.
+// Set _viewportMetrics physical size.
+- (void)setViewportMetricsSize {
+  UIScreen* screen = [self flutterScreenIfViewLoaded];
+  if (!screen) {
+    return;
+  }
+
+  CGFloat scale = screen.scale;
+  _viewportMetrics.physical_width = self.view.bounds.size.width * scale;
+  _viewportMetrics.physical_height = self.view.bounds.size.height * scale;
+}
+
+// Set _viewportMetrics physical paddings.
 //
-// Viewport padding represents the iOS safe area insets.
-- (void)updateViewportPadding {
-  CGFloat scale = [UIScreen mainScreen].scale;
+// Viewport paddings represent the iOS safe area insets.
+- (void)setViewportMetricsPaddings {
+  UIScreen* screen = [self flutterScreenIfViewLoaded];
+  if (!screen) {
+    return;
+  }
+
+  CGFloat scale = screen.scale;
   _viewportMetrics.physical_padding_top = self.view.safeAreaInsets.top * scale;
   _viewportMetrics.physical_padding_left = self.view.safeAreaInsets.left * scale;
   _viewportMetrics.physical_padding_right = self.view.safeAreaInsets.right * scale;
@@ -1272,74 +1467,234 @@ static flutter::PointerData::DeviceKind DeviceKindFromTouchType(UITouch* touch)
 
 #pragma mark - Keyboard events
 
+- (void)keyboardWillShowNotification:(NSNotification*)notification {
+  // Immediately prior to a docked keyboard being shown or when a keyboard goes from
+  // undocked/floating to docked, this notification is triggered. This notification also happens
+  // when Minimized/Expanded Shortcuts bar is dropped after dragging (the keyboard's end frame will
+  // be CGRectZero).
+  [self handleKeyboardNotification:notification];
+}
+
 - (void)keyboardWillChangeFrame:(NSNotification*)notification {
-  NSDictionary* info = [notification userInfo];
+  // Immediately prior to a change in keyboard frame, this notification is triggered.
+  // Sometimes when the keyboard is being hidden or undocked, this notification's keyboard's end
+  // frame is not yet entirely out of screen, which is why we also use
+  // UIKeyboardWillHideNotification.
+  [self handleKeyboardNotification:notification];
+}
 
-  // Ignore keyboard notifications related to other apps.
-  id isLocal = info[UIKeyboardIsLocalUserInfoKey];
-  if (isLocal && ![isLocal boolValue]) {
+- (void)keyboardWillBeHidden:(NSNotification*)notification {
+  // When keyboard is hidden or undocked, this notification will be triggered.
+  // This notification might not occur when the keyboard is changed from docked to floating, which
+  // is why we also use UIKeyboardWillChangeFrameNotification.
+  [self handleKeyboardNotification:notification];
+}
+
+- (void)handleKeyboardNotification:(NSNotification*)notification {
+  // See https://flutter.dev/go/ios-keyboard-calculating-inset for more details
+  // on why notifications are used and how things are calculated.
+  if ([self shouldIgnoreKeyboardNotification:notification]) {
     return;
   }
 
-  // Ignore keyboard notifications if engine’s viewController is not current viewController.
-  if ([_engine.get() viewController] != self) {
+  NSDictionary* info = notification.userInfo;
+  CGRect beginKeyboardFrame = [info[UIKeyboardFrameBeginUserInfoKey] CGRectValue];
+  CGRect keyboardFrame = [info[UIKeyboardFrameEndUserInfoKey] CGRectValue];
+  FlutterKeyboardMode keyboardMode = [self calculateKeyboardAttachMode:notification];
+  CGFloat calculatedInset = [self calculateKeyboardInset:keyboardFrame keyboardMode:keyboardMode];
+
+  // Avoid double triggering startKeyBoardAnimation.
+  if (self.targetViewInsetBottom == calculatedInset) {
     return;
   }
 
-  CGRect keyboardFrame = [[info objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue];
-  CGRect screenRect = [[UIScreen mainScreen] bounds];
+  self.targetViewInsetBottom = calculatedInset;
+  NSTimeInterval duration = [info[UIKeyboardAnimationDurationUserInfoKey] doubleValue];
 
-  // Get the animation duration
-  NSTimeInterval duration =
-      [[info objectForKey:UIKeyboardAnimationDurationUserInfoKey] doubleValue];
+  // Flag for simultaneous compounding animation calls.
+  // This captures animation calls made while the keyboard animation is currently animating. If the
+  // new animation is in the same direction as the current animation, this flag lets the current
+  // animation continue with an updated targetViewInsetBottom instead of starting a new keyboard
+  // animation. This allows for smoother keyboard animation interpolation.
+  BOOL keyboardWillShow = beginKeyboardFrame.origin.y > keyboardFrame.origin.y;
+  BOOL keyboardAnimationIsCompounding =
+      self.keyboardAnimationIsShowing == keyboardWillShow && _keyboardAnimationVSyncClient != nil;
 
-  // Considering the iPad's split keyboard, Flutter needs to check if the keyboard frame is present
-  // in the screen to see if the keyboard is visible.
-  if (CGRectIntersectsRect(keyboardFrame, screenRect)) {
-    CGFloat bottom = CGRectGetHeight(keyboardFrame);
-    CGFloat scale = [UIScreen mainScreen].scale;
-    // The keyboard is treated as an inset since we want to effectively reduce the window size by
-    // the keyboard height. The Dart side will compute a value accounting for the keyboard-consuming
-    // bottom padding.
-    self.targetViewInsetBottom = bottom * scale;
-  } else {
-    self.targetViewInsetBottom = 0;
+  // Mark keyboard as showing or hiding.
+  self.keyboardAnimationIsShowing = keyboardWillShow;
+
+  if (!keyboardAnimationIsCompounding) {
+    [self startKeyBoardAnimation:duration];
+  } else if ([self keyboardSpringAnimation]) {
+    [self keyboardSpringAnimation].toValue = self.targetViewInsetBottom;
   }
-  [self startKeyBoardAnimation:duration];
 }
 
-- (void)keyboardWillBeHidden:(NSNotification*)notification {
-  NSDictionary* info = [notification userInfo];
+- (BOOL)shouldIgnoreKeyboardNotification:(NSNotification*)notification {
+  // Don't ignore UIKeyboardWillHideNotification notifications.
+  // Even if the notification is triggered in the background or by a different app/view controller,
+  // we want to always handle this notification to avoid inaccurate inset when in a mulitasking mode
+  // or when switching between apps.
+  if (notification.name == UIKeyboardWillHideNotification) {
+    return NO;
+  }
+
+  // Ignore notification when keyboard's dimensions and position are all zeroes for
+  // UIKeyboardWillChangeFrameNotification. This happens when keyboard is dragged. Do not ignore if
+  // the notification is UIKeyboardWillShowNotification, as CGRectZero for that notfication only
+  // occurs when Minimized/Expanded Shortcuts Bar is dropped after dragging, which we later use to
+  // categorize it as floating.
+  NSDictionary* info = notification.userInfo;
+  CGRect keyboardFrame = [info[UIKeyboardFrameEndUserInfoKey] CGRectValue];
+  if (notification.name == UIKeyboardWillChangeFrameNotification &&
+      CGRectEqualToRect(keyboardFrame, CGRectZero)) {
+    return YES;
+  }
+
+  // When keyboard's height or width is set to 0, don't ignore. This does not happen
+  // often but can happen sometimes when switching between multitasking modes.
+  if (CGRectIsEmpty(keyboardFrame)) {
+    return NO;
+  }
+
+  // Ignore keyboard notifications related to other apps or view controllers.
+  if ([self isKeyboardNotificationForDifferentView:notification]) {
+    return YES;
+  }
 
-  // Ignore keyboard notifications related to other apps.
+  if (@available(iOS 13.0, *)) {
+    // noop
+  } else {
+    // If OS version is less than 13, ignore notification if the app is in the background
+    // or is transitioning from the background. In older versions, when switching between
+    // apps with the keyboard open in the secondary app, notifications are sent when
+    // the app is in the background/transitioning from background as if they belong
+    // to the app and as if the keyboard is showing even though it is not.
+    if (self.isKeyboardInOrTransitioningFromBackground) {
+      return YES;
+    }
+  }
+
+  return NO;
+}
+
+- (BOOL)isKeyboardNotificationForDifferentView:(NSNotification*)notification {
+  NSDictionary* info = notification.userInfo;
+  // Keyboard notifications related to other apps.
+  // If the UIKeyboardIsLocalUserInfoKey key doesn't exist (this should not happen after iOS 8),
+  // proceed as if it was local so that the notification is not ignored.
   id isLocal = info[UIKeyboardIsLocalUserInfoKey];
   if (isLocal && ![isLocal boolValue]) {
-    return;
+    return YES;
   }
-
-  // Ignore keyboard notifications if engine’s viewController is not current viewController.
+  // Engine’s viewController is not current viewController.
   if ([_engine.get() viewController] != self) {
-    return;
+    return YES;
   }
+  return NO;
+}
 
-  if (self.targetViewInsetBottom != 0) {
-    // Ensure the keyboard will be dismissed. Just like the keyboardWillChangeFrame,
-    // keyboardWillBeHidden is also in an animation block in iOS sdk, so we don't need to set the
-    // animation curve. Related issue: https://github.com/flutter/flutter/issues/99951
-    self.targetViewInsetBottom = 0;
-    NSTimeInterval duration =
-        [[info objectForKey:UIKeyboardAnimationDurationUserInfoKey] doubleValue];
-    [self startKeyBoardAnimation:duration];
+- (FlutterKeyboardMode)calculateKeyboardAttachMode:(NSNotification*)notification {
+  // There are multiple types of keyboard: docked, undocked, split, split docked,
+  // floating, expanded shortcuts bar, minimized shortcuts bar. This function will categorize
+  // the keyboard as one of the following modes: docked, floating, or hidden.
+  // Docked mode includes docked, split docked, expanded shortcuts bar (when opening via click),
+  // and minimized shortcuts bar (when opened via click).
+  // Floating includes undocked, split, floating, expanded shortcuts bar (when dragged and dropped),
+  // and minimized shortcuts bar (when dragged and dropped).
+  NSDictionary* info = notification.userInfo;
+  CGRect keyboardFrame = [info[UIKeyboardFrameEndUserInfoKey] CGRectValue];
+
+  if (notification.name == UIKeyboardWillHideNotification) {
+    return FlutterKeyboardModeHidden;
+  }
+
+  // If keyboard's dimensions and position are all zeroes, that means it's a Minimized/Expanded
+  // Shortcuts Bar that has been dropped after dragging, which we categorize as floating.
+  if (CGRectEqualToRect(keyboardFrame, CGRectZero)) {
+    return FlutterKeyboardModeFloating;
+  }
+  // If keyboard's width or height are 0, it's hidden.
+  if (CGRectIsEmpty(keyboardFrame)) {
+    return FlutterKeyboardModeHidden;
+  }
+
+  CGRect screenRect = [self flutterScreenIfViewLoaded].bounds;
+  CGRect adjustedKeyboardFrame = keyboardFrame;
+  adjustedKeyboardFrame.origin.y += [self calculateMultitaskingAdjustment:screenRect
+                                                            keyboardFrame:keyboardFrame];
+
+  // If the keyboard is partially or fully showing within the screen, it's either docked or
+  // floating. Sometimes with custom keyboard extensions, the keyboard's position may be off by a
+  // small decimal amount (which is why CGRectIntersectRect can't be used). Round to compare.
+  CGRect intersection = CGRectIntersection(adjustedKeyboardFrame, screenRect);
+  CGFloat intersectionHeight = CGRectGetHeight(intersection);
+  CGFloat intersectionWidth = CGRectGetWidth(intersection);
+  if (round(intersectionHeight) > 0 && intersectionWidth > 0) {
+    // If the keyboard is above the bottom of the screen, it's floating.
+    CGFloat screenHeight = CGRectGetHeight(screenRect);
+    CGFloat adjustedKeyboardBottom = CGRectGetMaxY(adjustedKeyboardFrame);
+    if (round(adjustedKeyboardBottom) < screenHeight) {
+      return FlutterKeyboardModeFloating;
+    }
+    return FlutterKeyboardModeDocked;
+  }
+  return FlutterKeyboardModeHidden;
+}
+
+- (CGFloat)calculateMultitaskingAdjustment:(CGRect)screenRect keyboardFrame:(CGRect)keyboardFrame {
+  // In Slide Over mode, the keyboard's frame does not include the space
+  // below the app, even though the keyboard may be at the bottom of the screen.
+  // To handle, shift the Y origin by the amount of space below the app.
+  if (self.viewIfLoaded.traitCollection.userInterfaceIdiom == UIUserInterfaceIdiomPad &&
+      self.viewIfLoaded.traitCollection.horizontalSizeClass == UIUserInterfaceSizeClassCompact &&
+      self.viewIfLoaded.traitCollection.verticalSizeClass == UIUserInterfaceSizeClassRegular) {
+    CGFloat screenHeight = CGRectGetHeight(screenRect);
+    CGFloat keyboardBottom = CGRectGetMaxY(keyboardFrame);
+
+    // Stage Manager mode will also meet the above parameters, but it does not handle
+    // the keyboard positioning the same way, so skip if keyboard is at bottom of page.
+    if (screenHeight == keyboardBottom) {
+      return 0;
+    }
+    CGRect viewRectRelativeToScreen =
+        [self.viewIfLoaded convertRect:self.viewIfLoaded.frame
+                     toCoordinateSpace:[self flutterScreenIfViewLoaded].coordinateSpace];
+    CGFloat viewBottom = CGRectGetMaxY(viewRectRelativeToScreen);
+    CGFloat offset = screenHeight - viewBottom;
+    if (offset > 0) {
+      return offset;
+    }
   }
+  return 0;
+}
+
+- (CGFloat)calculateKeyboardInset:(CGRect)keyboardFrame keyboardMode:(NSInteger)keyboardMode {
+  // Only docked keyboards will have an inset.
+  if (keyboardMode == FlutterKeyboardModeDocked) {
+    // Calculate how much of the keyboard intersects with the view.
+    CGRect viewRectRelativeToScreen =
+        [self.viewIfLoaded convertRect:self.viewIfLoaded.frame
+                     toCoordinateSpace:[self flutterScreenIfViewLoaded].coordinateSpace];
+    CGRect intersection = CGRectIntersection(keyboardFrame, viewRectRelativeToScreen);
+    CGFloat portionOfKeyboardInView = CGRectGetHeight(intersection);
+
+    // The keyboard is treated as an inset since we want to effectively reduce the window size by
+    // the keyboard height. The Dart side will compute a value accounting for the keyboard-consuming
+    // bottom padding.
+    CGFloat scale = [self flutterScreenIfViewLoaded].scale;
+    return portionOfKeyboardInView * scale;
+  }
+  return 0;
 }
 
 - (void)startKeyBoardAnimation:(NSTimeInterval)duration {
-  // If current physical_view_inset_bottom == targetViewInsetBottom,do nothing.
+  // If current physical_view_inset_bottom == targetViewInsetBottom, do nothing.
   if (_viewportMetrics.physical_view_inset_bottom == self.targetViewInsetBottom) {
     return;
   }
 
-  // When call this method first time,
+  // When this method is called for the first time,
   // initialize the keyboardAnimationView to get animation interpolation during animation.
   if ([self keyboardAnimationView] == nil) {
     UIView* keyboardAnimationView = [[UIView alloc] init];
@@ -1354,19 +1709,74 @@ static flutter::PointerData::DeviceKind DeviceKindFromTouchType(UITouch* touch)
   // Remove running animation when start another animation.
   [[self keyboardAnimationView].layer removeAllAnimations];
 
-  // Set animation begin value.
+  // Set animation begin value and DisplayLink tracking values.
   [self keyboardAnimationView].frame =
       CGRectMake(0, _viewportMetrics.physical_view_inset_bottom, 0, 0);
+  self.keyboardAnimationStartTime = fml::TimePoint().Now();
+  self.originalViewInsetBottom = _viewportMetrics.physical_view_inset_bottom;
 
   // Invalidate old vsync client if old animation is not completed.
   [self invalidateKeyboardAnimationVSyncClient];
-  [self setupKeyboardAnimationVsyncClient];
+
+  fml::WeakNSObject<FlutterViewController> weakSelf = [self getWeakNSObject];
+  FlutterKeyboardAnimationCallback keyboardAnimationCallback = ^(
+      fml::TimePoint keyboardAnimationTargetTime) {
+    if (!weakSelf) {
+      return;
+    }
+    fml::scoped_nsobject<FlutterViewController> flutterViewController(
+        [(FlutterViewController*)weakSelf.get() retain]);
+    if (!flutterViewController) {
+      return;
+    }
+
+    // If the view controller's view is not loaded, bail out.
+    if (!flutterViewController.get().isViewLoaded) {
+      return;
+    }
+    // If the view for tracking keyboard animation is nil, means it is not
+    // created, bail out.
+    if ([flutterViewController keyboardAnimationView] == nil) {
+      return;
+    }
+    // If keyboardAnimationVSyncClient is nil, means the animation ends.
+    // And should bail out.
+    if (flutterViewController.get().keyboardAnimationVSyncClient == nil) {
+      return;
+    }
+
+    if ([flutterViewController keyboardAnimationView].superview == nil) {
+      // Ensure the keyboardAnimationView is in view hierarchy when animation running.
+      [flutterViewController.get().view addSubview:[flutterViewController keyboardAnimationView]];
+    }
+
+    if ([flutterViewController keyboardSpringAnimation] == nil) {
+      if (flutterViewController.get().keyboardAnimationView.layer.presentationLayer) {
+        flutterViewController.get()->_viewportMetrics.physical_view_inset_bottom =
+            flutterViewController.get()
+                .keyboardAnimationView.layer.presentationLayer.frame.origin.y;
+        [flutterViewController updateViewportMetricsIfNeeded];
+      }
+    } else {
+      fml::TimeDelta timeElapsed =
+          keyboardAnimationTargetTime - flutterViewController.get().keyboardAnimationStartTime;
+      flutterViewController.get()->_viewportMetrics.physical_view_inset_bottom =
+          [[flutterViewController keyboardSpringAnimation] curveFunction:timeElapsed.ToSecondsF()];
+      [flutterViewController updateViewportMetricsIfNeeded];
+    }
+  };
+  [self setUpKeyboardAnimationVsyncClient:keyboardAnimationCallback];
   VSyncClient* currentVsyncClient = _keyboardAnimationVSyncClient;
 
   [UIView animateWithDuration:duration
       animations:^{
         // Set end value.
         [self keyboardAnimationView].frame = CGRectMake(0, self.targetViewInsetBottom, 0, 0);
+
+        // Setup keyboard animation interpolation.
+        CAAnimation* keyboardAnimation =
+            [[self keyboardAnimationView].layer animationForKey:@"position"];
+        [self setUpKeyboardSpringAnimationIfNeeded:keyboardAnimation];
       }
       completion:^(BOOL finished) {
         if (_keyboardAnimationVSyncClient == currentVsyncClient) {
@@ -1380,35 +1790,45 @@ static flutter::PointerData::DeviceKind DeviceKindFromTouchType(UITouch* touch)
       }];
 }
 
-- (void)setupKeyboardAnimationVsyncClient {
-  auto callback = [weakSelf =
-                       [self getWeakPtr]](std::unique_ptr<flutter::FrameTimingsRecorder> recorder) {
-    if (!weakSelf) {
-      return;
-    }
-    fml::scoped_nsobject<FlutterViewController> flutterViewController(
-        [(FlutterViewController*)weakSelf.get() retain]);
-    if (!flutterViewController) {
-      return;
-    }
+- (void)setUpKeyboardSpringAnimationIfNeeded:(CAAnimation*)keyboardAnimation {
+  // If keyboard animation is null or not a spring animation, fallback to DisplayLink tracking.
+  if (keyboardAnimation == nil || ![keyboardAnimation isKindOfClass:[CASpringAnimation class]]) {
+    _keyboardSpringAnimation.reset();
+    return;
+  }
 
-    if ([flutterViewController keyboardAnimationView].superview == nil) {
-      // Ensure the keyboardAnimationView is in view hierarchy when animation running.
-      [flutterViewController.get().view addSubview:[flutterViewController keyboardAnimationView]];
-    }
-    if ([flutterViewController keyboardAnimationView].layer.presentationLayer) {
-      CGFloat value =
-          [flutterViewController keyboardAnimationView].layer.presentationLayer.frame.origin.y;
-      flutterViewController.get()->_viewportMetrics.physical_view_inset_bottom = value;
-      [flutterViewController updateViewportMetrics];
-    }
-  };
-  flutter::Shell& shell = [_engine.get() shell];
+  // Setup keyboard spring animation details for spring curve animation calculation.
+  CASpringAnimation* keyboardCASpringAnimation = (CASpringAnimation*)keyboardAnimation;
+  _keyboardSpringAnimation.reset([[SpringAnimation alloc]
+      initWithStiffness:keyboardCASpringAnimation.stiffness
+                damping:keyboardCASpringAnimation.damping
+                   mass:keyboardCASpringAnimation.mass
+        initialVelocity:keyboardCASpringAnimation.initialVelocity
+              fromValue:self.originalViewInsetBottom
+                toValue:self.targetViewInsetBottom]);
+}
+
+- (void)setUpKeyboardAnimationVsyncClient:
+    (FlutterKeyboardAnimationCallback)keyboardAnimationCallback {
+  if (!keyboardAnimationCallback) {
+    return;
+  }
   NSAssert(_keyboardAnimationVSyncClient == nil,
-           @"_keyboardAnimationVSyncClient must be nil when setup");
-  _keyboardAnimationVSyncClient =
-      [[VSyncClient alloc] initWithTaskRunner:shell.GetTaskRunners().GetPlatformTaskRunner()
-                                     callback:callback];
+           @"_keyboardAnimationVSyncClient must be nil when setting up.");
+
+  // Make sure the new viewport metrics get sent after the begin frame event has processed.
+  fml::scoped_nsprotocol<FlutterKeyboardAnimationCallback> animationCallback(
+      [keyboardAnimationCallback copy]);
+  auto uiCallback = [animationCallback](std::unique_ptr<flutter::FrameTimingsRecorder> recorder) {
+    fml::TimeDelta frameInterval = recorder->GetVsyncTargetTime() - recorder->GetVsyncStartTime();
+    fml::TimePoint keyboardAnimationTargetTime = recorder->GetVsyncTargetTime() + frameInterval;
+    dispatch_async(dispatch_get_main_queue(), ^(void) {
+      animationCallback.get()(keyboardAnimationTargetTime);
+    });
+  };
+
+  _keyboardAnimationVSyncClient = [[VSyncClient alloc] initWithTaskRunner:[_engine uiTaskRunner]
+                                                                 callback:uiCallback];
   _keyboardAnimationVSyncClient.allowPauseAfterVsync = NO;
   [_keyboardAnimationVSyncClient await];
 }
@@ -1429,7 +1849,7 @@ static flutter::PointerData::DeviceKind DeviceKindFromTouchType(UITouch* touch)
   if (_viewportMetrics.physical_view_inset_bottom != self.targetViewInsetBottom) {
     // Make sure the `physical_view_inset_bottom` is the target value.
     _viewportMetrics.physical_view_inset_bottom = self.targetViewInsetBottom;
-    [self updateViewportMetrics];
+    [self updateViewportMetricsIfNeeded];
   }
 }
 
@@ -1534,31 +1954,59 @@ static flutter::PointerData::DeviceKind DeviceKindFromTouchType(UITouch* touch)
   });
 }
 
+- (void)requestGeometryUpdateForWindowScenes:(NSSet<UIScene*>*)windowScenes
+    API_AVAILABLE(ios(16.0)) {
+  for (UIScene* windowScene in windowScenes) {
+    FML_DCHECK([windowScene isKindOfClass:[UIWindowScene class]]);
+    UIWindowSceneGeometryPreferencesIOS* preference = [[[UIWindowSceneGeometryPreferencesIOS alloc]
+        initWithInterfaceOrientations:_orientationPreferences] autorelease];
+    [(UIWindowScene*)windowScene
+        requestGeometryUpdateWithPreferences:preference
+                                errorHandler:^(NSError* error) {
+                                  os_log_error(OS_LOG_DEFAULT,
+                                               "Failed to change device orientation: %@", error);
+                                }];
+    [self setNeedsUpdateOfSupportedInterfaceOrientations];
+  }
+}
+
 - (void)performOrientationUpdate:(UIInterfaceOrientationMask)new_preferences {
   if (new_preferences != _orientationPreferences) {
     _orientationPreferences = new_preferences;
 
     if (@available(iOS 16.0, *)) {
-      for (UIScene* scene in UIApplication.sharedApplication.connectedScenes) {
-        if (![scene isKindOfClass:[UIWindowScene class]]) {
-          continue;
+      NSSet<UIScene*>* scenes =
+#if APPLICATION_EXTENSION_API_ONLY
+          self.flutterWindowSceneIfViewLoaded
+              ? [NSSet setWithObject:self.flutterWindowSceneIfViewLoaded]
+              : [NSSet set];
+#else
+          [UIApplication.sharedApplication.connectedScenes
+              filteredSetUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(
+                                                         id scene, NSDictionary* bindings) {
+                return [scene isKindOfClass:[UIWindowScene class]];
+              }]];
+#endif
+      [self requestGeometryUpdateForWindowScenes:scenes];
+    } else {
+      UIInterfaceOrientationMask currentInterfaceOrientation = 0;
+      if (@available(iOS 13.0, *)) {
+        UIWindowScene* windowScene = [self flutterWindowSceneIfViewLoaded];
+        if (!windowScene) {
+          FML_LOG(WARNING)
+              << "Accessing the interface orientation when the window scene is unavailable.";
+          return;
         }
-        UIWindowScene* windowScene = (UIWindowScene*)scene;
-        UIWindowSceneGeometryPreferencesIOS* preference =
-            [[UIWindowSceneGeometryPreferencesIOS alloc]
-                initWithInterfaceOrientations:_orientationPreferences];
-        [windowScene
-            requestGeometryUpdateWithPreferences:preference
-                                    errorHandler:^(NSError* error) {
-                                      os_log_error(OS_LOG_DEFAULT,
-                                                   "Failed to change device orientation: %@",
-                                                   error);
-                                    }];
-        [self setNeedsUpdateOfSupportedInterfaceOrientations];
+        currentInterfaceOrientation = 1 << windowScene.interfaceOrientation;
+      } else {
+#if APPLICATION_EXTENSION_API_ONLY
+        FML_LOG(ERROR) << "Application based status bar orentiation update is not supported in "
+                          "app extension. Orientation: "
+                       << currentInterfaceOrientation;
+#else
+        currentInterfaceOrientation = 1 << [[UIApplication sharedApplication] statusBarOrientation];
+#endif
       }
-    } else {
-      UIInterfaceOrientationMask currentInterfaceOrientation =
-          1 << [[UIApplication sharedApplication] statusBarOrientation];
       if (!(_orientationPreferences & currentInterfaceOrientation)) {
         [UIViewController attemptRotationToDeviceOrientation];
         // Force orientation switch if the current orientation is not allowed
@@ -1656,6 +2104,15 @@ static flutter::PointerData::DeviceKind DeviceKindFromTouchType(UITouch* touch)
   return flags;
 }
 
+- (BOOL)accessibilityPerformEscape {
+  FlutterMethodChannel* navigationChannel = [_engine.get() navigationChannel];
+  if (navigationChannel) {
+    [self popRoute];
+    return YES;
+  }
+  return NO;
+}
+
 + (BOOL)accessibilityIsOnOffSwitchLabelsEnabled {
   if (@available(iOS 13, *)) {
     return UIAccessibilityIsOnOffSwitchLabelsEnabled();
@@ -1682,6 +2139,10 @@ static flutter::PointerData::DeviceKind DeviceKindFromTouchType(UITouch* touch)
 }
 
 - (CGFloat)textScaleFactor {
+#if APPLICATION_EXTENSION_API_ONLY
+  FML_LOG(WARNING) << "Dynamic content size update is not supported in app extension.";
+  return 1.0;
+#else
   UIContentSizeCategory category = [UIApplication sharedApplication].preferredContentSizeCategory;
   // The delta is computed by approximating Apple's typography guidelines:
   // https://developer.apple.com/ios/human-interface-guidelines/visual-design/typography/
@@ -1732,6 +2193,7 @@ static flutter::PointerData::DeviceKind DeviceKindFromTouchType(UITouch* touch)
   } else {
     return 1.0;
   }
+#endif
 }
 
 - (BOOL)isAlwaysUse24HourFormat {
@@ -1753,8 +2215,8 @@ static flutter::PointerData::DeviceKind DeviceKindFromTouchType(UITouch* touch)
 }
 
 // The brightness mode of the platform, e.g., light or dark, expressed as a string that
-// is understood by the Flutter framework. See the settings system channel for more
-// information.
+// is understood by the Flutter framework. See the settings
+// system channel for more information.
 - (NSString*)brightnessMode {
   if (@available(iOS 13, *)) {
     UIUserInterfaceStyle style = self.traitCollection.userInterfaceStyle;
@@ -1812,6 +2274,17 @@ static flutter::PointerData::DeviceKind DeviceKindFromTouchType(UITouch* touch)
   });
 }
 
+- (void)setPrefersStatusBarHidden:(BOOL)hidden {
+  if (hidden != _flutterPrefersStatusBarHidden) {
+    _flutterPrefersStatusBarHidden = hidden;
+    [self setNeedsStatusBarAppearanceUpdate];
+  }
+}
+
+- (BOOL)prefersStatusBarHidden {
+  return _flutterPrefersStatusBarHidden;
+}
+
 #pragma mark - Platform views
 
 - (std::shared_ptr<flutter::FlutterPlatformViewsController>&)platformViewsController {
@@ -1862,15 +2335,15 @@ static flutter::PointerData::DeviceKind DeviceKindFromTouchType(UITouch* touch)
 #pragma mark - FlutterTextureRegistry
 
 - (int64_t)registerTexture:(NSObject<FlutterTexture>*)texture {
-  return [_engine.get() registerTexture:texture];
+  return [_engine.get().textureRegistry registerTexture:texture];
 }
 
 - (void)unregisterTexture:(int64_t)textureId {
-  [_engine.get() unregisterTexture:textureId];
+  [_engine.get().textureRegistry unregisterTexture:textureId];
 }
 
 - (void)textureFrameAvailable:(int64_t)textureId {
-  [_engine.get() textureFrameAvailable:textureId];
+  [_engine.get().textureRegistry textureFrameAvailable:textureId];
 }
 
 - (NSString*)lookupKeyForAsset:(NSString*)asset {
@@ -1945,12 +2418,13 @@ static flutter::PointerData::DeviceKind DeviceKindFromTouchType(UITouch* touch)
     pointer_data.device = reinterpret_cast<int64_t>(_continuousScrollingPanGestureRecognizer);
     pointer_data.kind = flutter::PointerData::DeviceKind::kTrackpad;
     pointer_data.signal_kind = flutter::PointerData::SignalKind::kScrollInertiaCancel;
+    pointer_data.view_id = self.viewIdentifier;
 
     if (event.timestamp < _scrollInertiaEventAppKitDeadline) {
       // Only send the event if it occured before the expected natural end of gesture momentum.
       // If received after the deadline, it's not likely the event is from a user-initiated cancel.
       auto packet = std::make_unique<flutter::PointerDataPacket>(1);
-      packet->SetPointerData(/*index=*/0, pointer_data);
+      packet->SetPointerData(/*i=*/0, pointer_data);
       [_engine.get() dispatchPointerDataPacket:std::move(packet)];
       _scrollInertiaEventAppKitDeadline = 0;
     }
@@ -1961,13 +2435,14 @@ static flutter::PointerData::DeviceKind DeviceKindFromTouchType(UITouch* touch)
 
 - (void)hoverEvent:(UIPanGestureRecognizer*)recognizer API_AVAILABLE(ios(13.4)) {
   CGPoint location = [recognizer locationInView:self.view];
-  CGFloat scale = [UIScreen mainScreen].scale;
+  CGFloat scale = [self flutterScreenIfViewLoaded].scale;
   CGPoint oldLocation = _mouseState.location;
   _mouseState.location = {location.x * scale, location.y * scale};
 
   flutter::PointerData pointer_data = [self generatePointerDataAtLastMouseLocation];
   pointer_data.device = reinterpret_cast<int64_t>(recognizer);
   pointer_data.kind = flutter::PointerData::DeviceKind::kMouse;
+  pointer_data.view_id = self.viewIdentifier;
 
   switch (_hoverGestureRecognizer.state) {
     case UIGestureRecognizerStateBegan:
@@ -2001,24 +2476,25 @@ static flutter::PointerData::DeviceKind DeviceKindFromTouchType(UITouch* touch)
     // is received with the same position as the previous one, it can only be from a finger
     // making or breaking contact with the trackpad surface.
     auto packet = std::make_unique<flutter::PointerDataPacket>(2);
-    packet->SetPointerData(/*index=*/0, pointer_data);
+    packet->SetPointerData(/*i=*/0, pointer_data);
     flutter::PointerData inertia_cancel = pointer_data;
     inertia_cancel.device = reinterpret_cast<int64_t>(_continuousScrollingPanGestureRecognizer);
     inertia_cancel.kind = flutter::PointerData::DeviceKind::kTrackpad;
     inertia_cancel.signal_kind = flutter::PointerData::SignalKind::kScrollInertiaCancel;
-    packet->SetPointerData(/*index=*/1, inertia_cancel);
+    inertia_cancel.view_id = self.viewIdentifier;
+    packet->SetPointerData(/*i=*/1, inertia_cancel);
     [_engine.get() dispatchPointerDataPacket:std::move(packet)];
     _scrollInertiaEventStartline = DBL_MAX;
   } else {
     auto packet = std::make_unique<flutter::PointerDataPacket>(1);
-    packet->SetPointerData(/*index=*/0, pointer_data);
+    packet->SetPointerData(/*i=*/0, pointer_data);
     [_engine.get() dispatchPointerDataPacket:std::move(packet)];
   }
 }
 
 - (void)discreteScrollEvent:(UIPanGestureRecognizer*)recognizer API_AVAILABLE(ios(13.4)) {
   CGPoint translation = [recognizer translationInView:self.view];
-  const CGFloat scale = [UIScreen mainScreen].scale;
+  const CGFloat scale = [self flutterScreenIfViewLoaded].scale;
 
   translation.x *= scale;
   translation.y *= scale;
@@ -2029,6 +2505,7 @@ static flutter::PointerData::DeviceKind DeviceKindFromTouchType(UITouch* touch)
   pointer_data.signal_kind = flutter::PointerData::SignalKind::kScroll;
   pointer_data.scroll_delta_x = (translation.x - _mouseState.last_translation.x);
   pointer_data.scroll_delta_y = -(translation.y - _mouseState.last_translation.y);
+  pointer_data.view_id = self.viewIdentifier;
 
   // The translation reported by UIPanGestureRecognizer is the total translation
   // generated by the pan gesture since the gesture began. We need to be able
@@ -2041,17 +2518,18 @@ static flutter::PointerData::DeviceKind DeviceKindFromTouchType(UITouch* touch)
   }
 
   auto packet = std::make_unique<flutter::PointerDataPacket>(1);
-  packet->SetPointerData(/*index=*/0, pointer_data);
+  packet->SetPointerData(/*i=*/0, pointer_data);
   [_engine.get() dispatchPointerDataPacket:std::move(packet)];
 }
 
 - (void)continuousScrollEvent:(UIPanGestureRecognizer*)recognizer API_AVAILABLE(ios(13.4)) {
   CGPoint translation = [recognizer translationInView:self.view];
-  const CGFloat scale = [UIScreen mainScreen].scale;
+  const CGFloat scale = [self flutterScreenIfViewLoaded].scale;
 
   flutter::PointerData pointer_data = [self generatePointerDataAtLastMouseLocation];
   pointer_data.device = reinterpret_cast<int64_t>(recognizer);
   pointer_data.kind = flutter::PointerData::DeviceKind::kTrackpad;
+  pointer_data.view_id = self.viewIdentifier;
   switch (recognizer.state) {
     case UIGestureRecognizerStateBegan:
       pointer_data.change = flutter::PointerData::Change::kPanZoomStart;
@@ -2092,7 +2570,7 @@ static flutter::PointerData::DeviceKind DeviceKindFromTouchType(UITouch* touch)
   }
 
   auto packet = std::make_unique<flutter::PointerDataPacket>(1);
-  packet->SetPointerData(/*index=*/0, pointer_data);
+  packet->SetPointerData(/*i=*/0, pointer_data);
   [_engine.get() dispatchPointerDataPacket:std::move(packet)];
 }
 
@@ -2100,6 +2578,7 @@ static flutter::PointerData::DeviceKind DeviceKindFromTouchType(UITouch* touch)
   flutter::PointerData pointer_data = [self generatePointerDataAtLastMouseLocation];
   pointer_data.device = reinterpret_cast<int64_t>(recognizer);
   pointer_data.kind = flutter::PointerData::DeviceKind::kTrackpad;
+  pointer_data.view_id = self.viewIdentifier;
   switch (recognizer.state) {
     case UIGestureRecognizerStateBegan:
       pointer_data.change = flutter::PointerData::Change::kPanZoomStart;
@@ -2121,7 +2600,7 @@ static flutter::PointerData::DeviceKind DeviceKindFromTouchType(UITouch* touch)
   }
 
   auto packet = std::make_unique<flutter::PointerDataPacket>(1);
-  packet->SetPointerData(/*index=*/0, pointer_data);
+  packet->SetPointerData(/*i=*/0, pointer_data);
   [_engine.get() dispatchPointerDataPacket:std::move(packet)];
 }
 
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterViewControllerTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterViewControllerTest.mm
index 5cbd2aa81d1d18a51eb8426c2cb9c10f62fa1f60..c0c66796dc63cbd73a4577c8e1db655627d242cb 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterViewControllerTest.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterViewControllerTest.mm
@@ -16,15 +16,21 @@
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterFakeKeyEvents.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/UIViewController+FlutterScreenAndSceneIfLoaded.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.h"
 #import "flutter/shell/platform/embedder/embedder.h"
+#import "flutter/third_party/spring_animation/spring_animation.h"
 
 FLUTTER_ASSERT_ARC
 
+using namespace flutter::testing;
+
 @interface FlutterEngine ()
 - (FlutterTextInputPlugin*)textInputPlugin;
 - (void)sendKeyEvent:(const FlutterKeyEvent&)event
             callback:(nullable FlutterKeyEventCallback)callback
             userData:(nullable void*)userData;
+- (fml::RefPtr<fml::TaskRunner>)uiTaskRunner;
 @end
 
 /// Sometimes we have to use a custom mock to avoid retain cycles in OCMock.
@@ -54,8 +60,9 @@ FLUTTER_ASSERT_ARC
 - (void)sendKeyEvent:(const FlutterKeyEvent&)event
             callback:(FlutterKeyEventCallback)callback
             userData:(void*)userData API_AVAILABLE(ios(9.0)) {
-  if (callback == nil)
+  if (callback == nil) {
     return;
+  }
   // NSAssert(callback != nullptr, @"Invalid callback");
   // Response is async, so we have to post it to the run loop instead of calling
   // it directly.
@@ -90,6 +97,7 @@ extern NSNotificationName const FlutterViewControllerWillDealloc;
 ///
 /// Used for testing deallocation.
 @interface MockEngine : NSObject
+@property(nonatomic, strong) FlutterDartProject* project;
 @end
 
 @implementation MockEngine
@@ -113,6 +121,10 @@ extern NSNotificationName const FlutterViewControllerWillDealloc;
 @interface FlutterViewController (Tests)
 
 @property(nonatomic, assign) double targetViewInsetBottom;
+@property(nonatomic, assign) BOOL isKeyboardInOrTransitioningFromBackground;
+@property(nonatomic, assign) BOOL keyboardAnimationIsShowing;
+@property(nonatomic, strong) VSyncClient* keyboardAnimationVSyncClient;
+@property(nonatomic, strong) VSyncClient* touchRateCorrectionVSyncClient;
 
 - (void)createTouchRateCorrectionVSyncClientIfNeeded;
 - (void)surfaceUpdated:(BOOL)appeared;
@@ -120,20 +132,38 @@ extern NSNotificationName const FlutterViewControllerWillDealloc;
 - (void)handlePressEvent:(FlutterUIPressProxy*)press
               nextAction:(void (^)())next API_AVAILABLE(ios(13.4));
 - (void)discreteScrollEvent:(UIPanGestureRecognizer*)recognizer;
-- (void)updateViewportMetrics;
+- (void)updateViewportMetricsIfNeeded;
 - (void)onUserSettingsChanged:(NSNotification*)notification;
 - (void)applicationWillTerminate:(NSNotification*)notification;
 - (void)goToApplicationLifecycle:(nonnull NSString*)state;
-- (void)keyboardWillChangeFrame:(NSNotification*)notification;
-- (void)keyboardWillBeHidden:(NSNotification*)notification;
+- (void)handleKeyboardNotification:(NSNotification*)notification;
+- (CGFloat)calculateKeyboardInset:(CGRect)keyboardFrame keyboardMode:(int)keyboardMode;
+- (BOOL)shouldIgnoreKeyboardNotification:(NSNotification*)notification;
+- (FlutterKeyboardMode)calculateKeyboardAttachMode:(NSNotification*)notification;
+- (CGFloat)calculateMultitaskingAdjustment:(CGRect)screenRect keyboardFrame:(CGRect)keyboardFrame;
 - (void)startKeyBoardAnimation:(NSTimeInterval)duration;
-- (void)setupKeyboardAnimationVsyncClient;
+- (UIView*)keyboardAnimationView;
+- (SpringAnimation*)keyboardSpringAnimation;
+- (void)setUpKeyboardSpringAnimationIfNeeded:(CAAnimation*)keyboardAnimation;
+- (void)setUpKeyboardAnimationVsyncClient:
+    (FlutterKeyboardAnimationCallback)keyboardAnimationCallback;
 - (void)ensureViewportMetricsIsCorrect;
 - (void)invalidateKeyboardAnimationVSyncClient;
 - (void)addInternalPlugins;
 - (flutter::PointerData)generatePointerDataForFake;
 - (void)sharedSetupWithProject:(nullable FlutterDartProject*)project
                   initialRoute:(nullable NSString*)initialRoute;
+- (void)applicationBecameActive:(NSNotification*)notification;
+- (void)applicationWillResignActive:(NSNotification*)notification;
+- (void)applicationWillTerminate:(NSNotification*)notification;
+- (void)applicationDidEnterBackground:(NSNotification*)notification;
+- (void)applicationWillEnterForeground:(NSNotification*)notification;
+- (void)sceneBecameActive:(NSNotification*)notification API_AVAILABLE(ios(13.0));
+- (void)sceneWillResignActive:(NSNotification*)notification API_AVAILABLE(ios(13.0));
+- (void)sceneWillDisconnect:(NSNotification*)notification API_AVAILABLE(ios(13.0));
+- (void)sceneDidEnterBackground:(NSNotification*)notification API_AVAILABLE(ios(13.0));
+- (void)sceneWillEnterForeground:(NSNotification*)notification API_AVAILABLE(ios(13.0));
+- (void)triggerTouchRateCorrectionIfNeeded:(NSSet*)touches;
 @end
 
 @interface FlutterViewControllerTest : XCTestCase
@@ -143,6 +173,18 @@ extern NSNotificationName const FlutterViewControllerWillDealloc;
 - (void)sendMessage:(id _Nullable)message reply:(FlutterReply _Nullable)callback;
 @end
 
+@interface UITouch ()
+
+@property(nonatomic, readwrite) UITouchPhase phase;
+
+@end
+
+@interface VSyncClient (Testing)
+
+- (CADisplayLink*)getDisplayLink;
+
+@end
+
 @implementation FlutterViewControllerTest
 
 - (void)setUp {
@@ -161,6 +203,31 @@ extern NSNotificationName const FlutterViewControllerWillDealloc;
   self.messageSent = nil;
 }
 
+- (id)setUpMockScreen {
+  UIScreen* mockScreen = OCMClassMock([UIScreen class]);
+  // iPhone 14 pixels
+  CGRect screenBounds = CGRectMake(0, 0, 1170, 2532);
+  OCMStub([mockScreen bounds]).andReturn(screenBounds);
+  CGFloat screenScale = 1;
+  OCMStub([mockScreen scale]).andReturn(screenScale);
+
+  return mockScreen;
+}
+
+- (id)setUpMockView:(FlutterViewController*)viewControllerMock
+             screen:(UIScreen*)screen
+          viewFrame:(CGRect)viewFrame
+     convertedFrame:(CGRect)convertedFrame {
+  OCMStub([viewControllerMock flutterScreenIfViewLoaded]).andReturn(screen);
+  id mockView = OCMClassMock([UIView class]);
+  OCMStub([mockView frame]).andReturn(viewFrame);
+  OCMStub([mockView convertRect:viewFrame toCoordinateSpace:[OCMArg any]])
+      .andReturn(convertedFrame);
+  OCMStub([viewControllerMock viewIfLoaded]).andReturn(mockView);
+
+  return mockView;
+}
+
 - (void)testViewDidLoadWillInvokeCreateTouchRateCorrectionVSyncClient {
   FlutterEngine* engine = [[FlutterEngine alloc] init];
   [engine runWithEntrypoint:nil];
@@ -173,7 +240,7 @@ extern NSNotificationName const FlutterViewControllerWillDealloc;
   OCMVerify([viewControllerMock createTouchRateCorrectionVSyncClientIfNeeded]);
 }
 
-- (void)testStartKeyboardAnimationWillInvokeSetupKeyboardAnimationVsyncClient {
+- (void)testStartKeyboardAnimationWillInvokeSetupKeyboardSpringAnimationIfNeeded {
   FlutterEngine* engine = [[FlutterEngine alloc] init];
   [engine runWithEntrypoint:nil];
   FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
@@ -182,36 +249,508 @@ extern NSNotificationName const FlutterViewControllerWillDealloc;
   FlutterViewController* viewControllerMock = OCMPartialMock(viewController);
   viewControllerMock.targetViewInsetBottom = 100;
   [viewControllerMock startKeyBoardAnimation:0.25];
-  OCMVerify([viewControllerMock setupKeyboardAnimationVsyncClient]);
+
+  CAAnimation* keyboardAnimation =
+      [[viewControllerMock keyboardAnimationView].layer animationForKey:@"position"];
+
+  OCMVerify([viewControllerMock setUpKeyboardSpringAnimationIfNeeded:keyboardAnimation]);
 }
 
-- (void)testkeyboardWillChangeFrameWillStartKeyboardAnimation {
-  FlutterEngine* mockEngine = OCMPartialMock([[FlutterEngine alloc] init]);
-  [mockEngine createShell:@"" libraryURI:@"" initialRoute:nil];
-  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:mockEngine
+- (void)testSetupKeyboardSpringAnimationIfNeeded {
+  FlutterEngine* engine = [[FlutterEngine alloc] init];
+  [engine runWithEntrypoint:nil];
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
+                                                                                nibName:nil
+                                                                                 bundle:nil];
+  FlutterViewController* viewControllerMock = OCMPartialMock(viewController);
+  UIScreen* screen = [self setUpMockScreen];
+  CGRect viewFrame = screen.bounds;
+  [self setUpMockView:viewControllerMock
+               screen:screen
+            viewFrame:viewFrame
+       convertedFrame:viewFrame];
+
+  // Null check.
+  [viewControllerMock setUpKeyboardSpringAnimationIfNeeded:nil];
+  SpringAnimation* keyboardSpringAnimation = [viewControllerMock keyboardSpringAnimation];
+  XCTAssertTrue(keyboardSpringAnimation == nil);
+
+  // CAAnimation that is not a CASpringAnimation.
+  CABasicAnimation* nonSpringAnimation = [CABasicAnimation animation];
+  nonSpringAnimation.duration = 1.0;
+  nonSpringAnimation.fromValue = [NSNumber numberWithFloat:0.0];
+  nonSpringAnimation.toValue = [NSNumber numberWithFloat:1.0];
+  nonSpringAnimation.keyPath = @"position";
+  [viewControllerMock setUpKeyboardSpringAnimationIfNeeded:nonSpringAnimation];
+  keyboardSpringAnimation = [viewControllerMock keyboardSpringAnimation];
+
+  XCTAssertTrue(keyboardSpringAnimation == nil);
+
+  // CASpringAnimation.
+  CASpringAnimation* springAnimation = [CASpringAnimation animation];
+  springAnimation.mass = 1.0;
+  springAnimation.stiffness = 100.0;
+  springAnimation.damping = 10.0;
+  springAnimation.keyPath = @"position";
+  springAnimation.fromValue = [NSValue valueWithCGPoint:CGPointMake(0, 0)];
+  springAnimation.toValue = [NSValue valueWithCGPoint:CGPointMake(100, 100)];
+  [viewControllerMock setUpKeyboardSpringAnimationIfNeeded:springAnimation];
+  keyboardSpringAnimation = [viewControllerMock keyboardSpringAnimation];
+  XCTAssertTrue(keyboardSpringAnimation != nil);
+}
+
+- (void)testKeyboardAnimationIsShowingAndCompounding {
+  FlutterEngine* engine = [[FlutterEngine alloc] init];
+  [engine runWithEntrypoint:nil];
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
                                                                                 nibName:nil
                                                                                  bundle:nil];
+  FlutterViewController* viewControllerMock = OCMPartialMock(viewController);
+  UIScreen* screen = [self setUpMockScreen];
+  CGRect viewFrame = screen.bounds;
+  [self setUpMockView:viewControllerMock
+               screen:screen
+            viewFrame:viewFrame
+       convertedFrame:viewFrame];
 
-  CGFloat width = UIScreen.mainScreen.bounds.size.width;
-  CGRect keyboardFrame = CGRectMake(0, 100, width, 400);
   BOOL isLocal = YES;
-  NSNotification* notification = [NSNotification
-      notificationWithName:@""
+  CGFloat screenHeight = screen.bounds.size.height;
+  CGFloat screenWidth = screen.bounds.size.height;
+
+  // Start show keyboard animation.
+  CGRect initialShowKeyboardBeginFrame = CGRectMake(0, screenHeight, screenWidth, 250);
+  CGRect initialShowKeyboardEndFrame = CGRectMake(0, screenHeight - 250, screenWidth, 500);
+  NSNotification* fakeNotification = [NSNotification
+      notificationWithName:UIKeyboardWillChangeFrameNotification
                     object:nil
                   userInfo:@{
-                    @"UIKeyboardFrameEndUserInfoKey" : [NSValue valueWithCGRect:keyboardFrame],
-                    @"UIKeyboardAnimationDurationUserInfoKey" : [NSNumber numberWithDouble:0.25],
-                    @"UIKeyboardIsLocalUserInfoKey" : [NSNumber numberWithBool:isLocal]
+                    @"UIKeyboardFrameBeginUserInfoKey" : @(initialShowKeyboardBeginFrame),
+                    @"UIKeyboardFrameEndUserInfoKey" : @(initialShowKeyboardEndFrame),
+                    @"UIKeyboardAnimationDurationUserInfoKey" : @(0.25),
+                    @"UIKeyboardIsLocalUserInfoKey" : @(isLocal)
                   }];
+  viewControllerMock.targetViewInsetBottom = 0;
+  [viewControllerMock handleKeyboardNotification:fakeNotification];
+  BOOL isShowingAnimation1 = viewControllerMock.keyboardAnimationIsShowing;
+  XCTAssertTrue(isShowingAnimation1);
+
+  // Start compounding show keyboard animation.
+  CGRect compoundingShowKeyboardBeginFrame = CGRectMake(0, screenHeight - 250, screenWidth, 250);
+  CGRect compoundingShowKeyboardEndFrame = CGRectMake(0, screenHeight - 500, screenWidth, 500);
+  fakeNotification = [NSNotification
+      notificationWithName:UIKeyboardWillChangeFrameNotification
+                    object:nil
+                  userInfo:@{
+                    @"UIKeyboardFrameBeginUserInfoKey" : @(compoundingShowKeyboardBeginFrame),
+                    @"UIKeyboardFrameEndUserInfoKey" : @(compoundingShowKeyboardEndFrame),
+                    @"UIKeyboardAnimationDurationUserInfoKey" : @(0.25),
+                    @"UIKeyboardIsLocalUserInfoKey" : @(isLocal)
+                  }];
+
+  [viewControllerMock handleKeyboardNotification:fakeNotification];
+  BOOL isShowingAnimation2 = viewControllerMock.keyboardAnimationIsShowing;
+  XCTAssertTrue(isShowingAnimation2);
+  XCTAssertTrue(isShowingAnimation1 == isShowingAnimation2);
+
+  // Start hide keyboard animation.
+  CGRect initialHideKeyboardBeginFrame = CGRectMake(0, screenHeight - 500, screenWidth, 250);
+  CGRect initialHideKeyboardEndFrame = CGRectMake(0, screenHeight - 250, screenWidth, 500);
+  fakeNotification = [NSNotification
+      notificationWithName:UIKeyboardWillChangeFrameNotification
+                    object:nil
+                  userInfo:@{
+                    @"UIKeyboardFrameBeginUserInfoKey" : @(initialHideKeyboardBeginFrame),
+                    @"UIKeyboardFrameEndUserInfoKey" : @(initialHideKeyboardEndFrame),
+                    @"UIKeyboardAnimationDurationUserInfoKey" : @(0.25),
+                    @"UIKeyboardIsLocalUserInfoKey" : @(isLocal)
+                  }];
+
+  [viewControllerMock handleKeyboardNotification:fakeNotification];
+  BOOL isShowingAnimation3 = viewControllerMock.keyboardAnimationIsShowing;
+  XCTAssertFalse(isShowingAnimation3);
+  XCTAssertTrue(isShowingAnimation2 != isShowingAnimation3);
+
+  // Start compounding hide keyboard animation.
+  CGRect compoundingHideKeyboardBeginFrame = CGRectMake(0, screenHeight - 250, screenWidth, 250);
+  CGRect compoundingHideKeyboardEndFrame = CGRectMake(0, screenHeight, screenWidth, 500);
+  fakeNotification = [NSNotification
+      notificationWithName:UIKeyboardWillChangeFrameNotification
+                    object:nil
+                  userInfo:@{
+                    @"UIKeyboardFrameBeginUserInfoKey" : @(compoundingHideKeyboardBeginFrame),
+                    @"UIKeyboardFrameEndUserInfoKey" : @(compoundingHideKeyboardEndFrame),
+                    @"UIKeyboardAnimationDurationUserInfoKey" : @(0.25),
+                    @"UIKeyboardIsLocalUserInfoKey" : @(isLocal)
+                  }];
+
+  [viewControllerMock handleKeyboardNotification:fakeNotification];
+  BOOL isShowingAnimation4 = viewControllerMock.keyboardAnimationIsShowing;
+  XCTAssertFalse(isShowingAnimation4);
+  XCTAssertTrue(isShowingAnimation3 == isShowingAnimation4);
+}
+
+- (void)testShouldIgnoreKeyboardNotification {
+  FlutterEngine* mockEngine = OCMPartialMock([[FlutterEngine alloc] init]);
+  [mockEngine createShell:@"" libraryURI:@"" initialRoute:nil];
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:mockEngine
+                                                                                nibName:nil
+                                                                                 bundle:nil];
+  FlutterViewController* viewControllerMock = OCMPartialMock(viewController);
+  UIScreen* screen = [self setUpMockScreen];
+  CGRect viewFrame = screen.bounds;
+  [self setUpMockView:viewControllerMock
+               screen:screen
+            viewFrame:viewFrame
+       convertedFrame:viewFrame];
+
+  CGFloat screenWidth = screen.bounds.size.width;
+  CGFloat screenHeight = screen.bounds.size.height;
+  CGRect emptyKeyboard = CGRectZero;
+  CGRect zeroHeightKeyboard = CGRectMake(0, 0, screenWidth, 0);
+  CGRect validKeyboardEndFrame = CGRectMake(0, screenHeight - 320, screenWidth, 320);
+  BOOL isLocal = NO;
+
+  // Hide notification, valid keyboard
+  NSNotification* notification =
+      [NSNotification notificationWithName:UIKeyboardWillHideNotification
+                                    object:nil
+                                  userInfo:@{
+                                    @"UIKeyboardFrameEndUserInfoKey" : @(validKeyboardEndFrame),
+                                    @"UIKeyboardAnimationDurationUserInfoKey" : @0.25,
+                                    @"UIKeyboardIsLocalUserInfoKey" : @(isLocal)
+                                  }];
+
+  BOOL shouldIgnore = [viewControllerMock shouldIgnoreKeyboardNotification:notification];
+  XCTAssertTrue(shouldIgnore == NO);
+
+  // All zero keyboard
+  isLocal = YES;
+  notification = [NSNotification notificationWithName:UIKeyboardWillChangeFrameNotification
+                                               object:nil
+                                             userInfo:@{
+                                               @"UIKeyboardFrameEndUserInfoKey" : @(emptyKeyboard),
+                                               @"UIKeyboardAnimationDurationUserInfoKey" : @0.25,
+                                               @"UIKeyboardIsLocalUserInfoKey" : @(isLocal)
+                                             }];
+  shouldIgnore = [viewControllerMock shouldIgnoreKeyboardNotification:notification];
+  XCTAssertTrue(shouldIgnore == YES);
+
+  // Zero height keyboard
+  isLocal = NO;
+  notification =
+      [NSNotification notificationWithName:UIKeyboardWillChangeFrameNotification
+                                    object:nil
+                                  userInfo:@{
+                                    @"UIKeyboardFrameEndUserInfoKey" : @(zeroHeightKeyboard),
+                                    @"UIKeyboardAnimationDurationUserInfoKey" : @0.25,
+                                    @"UIKeyboardIsLocalUserInfoKey" : @(isLocal)
+                                  }];
+  shouldIgnore = [viewControllerMock shouldIgnoreKeyboardNotification:notification];
+  XCTAssertTrue(shouldIgnore == NO);
+
+  // Valid keyboard, triggered from another app
+  isLocal = NO;
+  notification =
+      [NSNotification notificationWithName:UIKeyboardWillChangeFrameNotification
+                                    object:nil
+                                  userInfo:@{
+                                    @"UIKeyboardFrameEndUserInfoKey" : @(validKeyboardEndFrame),
+                                    @"UIKeyboardAnimationDurationUserInfoKey" : @0.25,
+                                    @"UIKeyboardIsLocalUserInfoKey" : @(isLocal)
+                                  }];
+  shouldIgnore = [viewControllerMock shouldIgnoreKeyboardNotification:notification];
+  XCTAssertTrue(shouldIgnore == YES);
+
+  // Valid keyboard
+  isLocal = YES;
+  notification =
+      [NSNotification notificationWithName:UIKeyboardWillChangeFrameNotification
+                                    object:nil
+                                  userInfo:@{
+                                    @"UIKeyboardFrameEndUserInfoKey" : @(validKeyboardEndFrame),
+                                    @"UIKeyboardAnimationDurationUserInfoKey" : @0.25,
+                                    @"UIKeyboardIsLocalUserInfoKey" : @(isLocal)
+                                  }];
+  shouldIgnore = [viewControllerMock shouldIgnoreKeyboardNotification:notification];
+  XCTAssertTrue(shouldIgnore == NO);
+
+  if (@available(iOS 13.0, *)) {
+    // noop
+  } else {
+    // Valid keyboard, keyboard is in background
+    OCMStub([viewControllerMock isKeyboardInOrTransitioningFromBackground]).andReturn(YES);
+
+    isLocal = YES;
+    notification =
+        [NSNotification notificationWithName:UIKeyboardWillChangeFrameNotification
+                                      object:nil
+                                    userInfo:@{
+                                      @"UIKeyboardFrameEndUserInfoKey" : @(validKeyboardEndFrame),
+                                      @"UIKeyboardAnimationDurationUserInfoKey" : @0.25,
+                                      @"UIKeyboardIsLocalUserInfoKey" : @(isLocal)
+                                    }];
+    shouldIgnore = [viewControllerMock shouldIgnoreKeyboardNotification:notification];
+    XCTAssertTrue(shouldIgnore == YES);
+  }
+}
+- (void)testKeyboardAnimationWillNotCrashWhenEngineDestroyed {
+  FlutterEngine* engine = [[FlutterEngine alloc] init];
+  [engine runWithEntrypoint:nil];
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
+                                                                                nibName:nil
+                                                                                 bundle:nil];
+  [viewController setUpKeyboardAnimationVsyncClient:^(fml::TimePoint){
+  }];
+  [engine destroyContext];
+}
+
+- (void)testKeyboardAnimationWillWaitUIThreadVsync {
+  // We need to make sure the new viewport metrics get sent after the
+  // begin frame event has processed. And this test is to expect that the callback
+  // will sync with UI thread. So just simulate a lot of works on UI thread and
+  // test the keyboard animation callback will execute until UI task completed.
+  // Related issue: https://github.com/flutter/flutter/issues/120555.
+
+  FlutterEngine* engine = [[FlutterEngine alloc] init];
+  [engine runWithEntrypoint:nil];
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
+                                                                                nibName:nil
+                                                                                 bundle:nil];
+  // Post a task to UI thread to block the thread.
+  const int delayTime = 1;
+  [engine uiTaskRunner]->PostTask([] { sleep(delayTime); });
+  XCTestExpectation* expectation = [self expectationWithDescription:@"keyboard animation callback"];
+
+  __block CFTimeInterval fulfillTime;
+  FlutterKeyboardAnimationCallback callback = ^(fml::TimePoint targetTime) {
+    fulfillTime = CACurrentMediaTime();
+    [expectation fulfill];
+  };
+  CFTimeInterval startTime = CACurrentMediaTime();
+  [viewController setUpKeyboardAnimationVsyncClient:callback];
+  [self waitForExpectationsWithTimeout:5.0 handler:nil];
+  XCTAssertTrue(fulfillTime - startTime > delayTime);
+}
+
+- (void)testCalculateKeyboardAttachMode {
+  FlutterEngine* mockEngine = OCMPartialMock([[FlutterEngine alloc] init]);
+  [mockEngine createShell:@"" libraryURI:@"" initialRoute:nil];
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:mockEngine
+                                                                                nibName:nil
+                                                                                 bundle:nil];
+
+  FlutterViewController* viewControllerMock = OCMPartialMock(viewController);
+  UIScreen* screen = [self setUpMockScreen];
+  CGRect viewFrame = screen.bounds;
+  [self setUpMockView:viewControllerMock
+               screen:screen
+            viewFrame:viewFrame
+       convertedFrame:viewFrame];
+
+  CGFloat screenWidth = screen.bounds.size.width;
+  CGFloat screenHeight = screen.bounds.size.height;
+
+  // hide notification
+  CGRect keyboardFrame = CGRectZero;
+  NSNotification* notification =
+      [NSNotification notificationWithName:UIKeyboardWillHideNotification
+                                    object:nil
+                                  userInfo:@{
+                                    @"UIKeyboardFrameEndUserInfoKey" : @(keyboardFrame),
+                                    @"UIKeyboardAnimationDurationUserInfoKey" : @0.25,
+                                    @"UIKeyboardIsLocalUserInfoKey" : @(YES)
+                                  }];
+  FlutterKeyboardMode keyboardMode = [viewControllerMock calculateKeyboardAttachMode:notification];
+  XCTAssertTrue(keyboardMode == FlutterKeyboardModeHidden);
+
+  // all zeros
+  keyboardFrame = CGRectZero;
+  notification = [NSNotification notificationWithName:UIKeyboardWillChangeFrameNotification
+                                               object:nil
+                                             userInfo:@{
+                                               @"UIKeyboardFrameEndUserInfoKey" : @(keyboardFrame),
+                                               @"UIKeyboardAnimationDurationUserInfoKey" : @0.25,
+                                               @"UIKeyboardIsLocalUserInfoKey" : @(YES)
+                                             }];
+  keyboardMode = [viewControllerMock calculateKeyboardAttachMode:notification];
+  XCTAssertTrue(keyboardMode == FlutterKeyboardModeFloating);
+
+  // 0 height
+  keyboardFrame = CGRectMake(0, 0, screenWidth, 0);
+  notification = [NSNotification notificationWithName:UIKeyboardWillChangeFrameNotification
+                                               object:nil
+                                             userInfo:@{
+                                               @"UIKeyboardFrameEndUserInfoKey" : @(keyboardFrame),
+                                               @"UIKeyboardAnimationDurationUserInfoKey" : @0.25,
+                                               @"UIKeyboardIsLocalUserInfoKey" : @(YES)
+                                             }];
+  keyboardMode = [viewControllerMock calculateKeyboardAttachMode:notification];
+  XCTAssertTrue(keyboardMode == FlutterKeyboardModeHidden);
+
+  // floating
+  keyboardFrame = CGRectMake(0, 0, 320, 320);
+  notification = [NSNotification notificationWithName:UIKeyboardWillChangeFrameNotification
+                                               object:nil
+                                             userInfo:@{
+                                               @"UIKeyboardFrameEndUserInfoKey" : @(keyboardFrame),
+                                               @"UIKeyboardAnimationDurationUserInfoKey" : @0.25,
+                                               @"UIKeyboardIsLocalUserInfoKey" : @(YES)
+                                             }];
+  keyboardMode = [viewControllerMock calculateKeyboardAttachMode:notification];
+  XCTAssertTrue(keyboardMode == FlutterKeyboardModeFloating);
+
+  // undocked
+  keyboardFrame = CGRectMake(0, 0, screenWidth, 320);
+  notification = [NSNotification notificationWithName:UIKeyboardWillChangeFrameNotification
+                                               object:nil
+                                             userInfo:@{
+                                               @"UIKeyboardFrameEndUserInfoKey" : @(keyboardFrame),
+                                               @"UIKeyboardAnimationDurationUserInfoKey" : @0.25,
+                                               @"UIKeyboardIsLocalUserInfoKey" : @(YES)
+                                             }];
+  keyboardMode = [viewControllerMock calculateKeyboardAttachMode:notification];
+  XCTAssertTrue(keyboardMode == FlutterKeyboardModeFloating);
+
+  // docked
+  keyboardFrame = CGRectMake(0, screenHeight - 320, screenWidth, 320);
+  notification = [NSNotification notificationWithName:UIKeyboardWillChangeFrameNotification
+                                               object:nil
+                                             userInfo:@{
+                                               @"UIKeyboardFrameEndUserInfoKey" : @(keyboardFrame),
+                                               @"UIKeyboardAnimationDurationUserInfoKey" : @0.25,
+                                               @"UIKeyboardIsLocalUserInfoKey" : @(YES)
+                                             }];
+  keyboardMode = [viewControllerMock calculateKeyboardAttachMode:notification];
+  XCTAssertTrue(keyboardMode == FlutterKeyboardModeDocked);
+
+  // docked - rounded values
+  CGFloat longDecimalHeight = 320.666666666666666;
+  keyboardFrame = CGRectMake(0, screenHeight - longDecimalHeight, screenWidth, longDecimalHeight);
+  notification = [NSNotification notificationWithName:UIKeyboardWillChangeFrameNotification
+                                               object:nil
+                                             userInfo:@{
+                                               @"UIKeyboardFrameEndUserInfoKey" : @(keyboardFrame),
+                                               @"UIKeyboardAnimationDurationUserInfoKey" : @0.25,
+                                               @"UIKeyboardIsLocalUserInfoKey" : @(YES)
+                                             }];
+  keyboardMode = [viewControllerMock calculateKeyboardAttachMode:notification];
+  XCTAssertTrue(keyboardMode == FlutterKeyboardModeDocked);
+
+  // hidden - rounded values
+  keyboardFrame = CGRectMake(0, screenHeight - .0000001, screenWidth, longDecimalHeight);
+  notification = [NSNotification notificationWithName:UIKeyboardWillChangeFrameNotification
+                                               object:nil
+                                             userInfo:@{
+                                               @"UIKeyboardFrameEndUserInfoKey" : @(keyboardFrame),
+                                               @"UIKeyboardAnimationDurationUserInfoKey" : @0.25,
+                                               @"UIKeyboardIsLocalUserInfoKey" : @(YES)
+                                             }];
+  keyboardMode = [viewControllerMock calculateKeyboardAttachMode:notification];
+  XCTAssertTrue(keyboardMode == FlutterKeyboardModeHidden);
+
+  // hidden
+  keyboardFrame = CGRectMake(0, screenHeight, screenWidth, 320);
+  notification = [NSNotification notificationWithName:UIKeyboardWillChangeFrameNotification
+                                               object:nil
+                                             userInfo:@{
+                                               @"UIKeyboardFrameEndUserInfoKey" : @(keyboardFrame),
+                                               @"UIKeyboardAnimationDurationUserInfoKey" : @0.25,
+                                               @"UIKeyboardIsLocalUserInfoKey" : @(YES)
+                                             }];
+  keyboardMode = [viewControllerMock calculateKeyboardAttachMode:notification];
+  XCTAssertTrue(keyboardMode == FlutterKeyboardModeHidden);
+}
+
+- (void)testCalculateMultitaskingAdjustment {
+  FlutterEngine* mockEngine = OCMPartialMock([[FlutterEngine alloc] init]);
+  [mockEngine createShell:@"" libraryURI:@"" initialRoute:nil];
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:mockEngine
+                                                                                nibName:nil
+                                                                                 bundle:nil];
+  FlutterViewController* viewControllerMock = OCMPartialMock(viewController);
+
+  UIScreen* screen = [self setUpMockScreen];
+  CGFloat screenWidth = screen.bounds.size.width;
+  CGFloat screenHeight = screen.bounds.size.height;
+  CGRect screenRect = screen.bounds;
+  CGRect viewOrigFrame = CGRectMake(0, 0, 320, screenHeight - 40);
+  CGRect convertedViewFrame = CGRectMake(20, 20, 320, screenHeight - 40);
+  CGRect keyboardFrame = CGRectMake(20, screenHeight - 320, screenWidth, 300);
+  id mockView = [self setUpMockView:viewControllerMock
+                             screen:screen
+                          viewFrame:viewOrigFrame
+                     convertedFrame:convertedViewFrame];
+  id mockTraitCollection = OCMClassMock([UITraitCollection class]);
+  OCMStub([mockTraitCollection userInterfaceIdiom]).andReturn(UIUserInterfaceIdiomPad);
+  OCMStub([mockTraitCollection horizontalSizeClass]).andReturn(UIUserInterfaceSizeClassCompact);
+  OCMStub([mockTraitCollection verticalSizeClass]).andReturn(UIUserInterfaceSizeClassRegular);
+  OCMStub([mockView traitCollection]).andReturn(mockTraitCollection);
+
+  CGFloat adjustment = [viewControllerMock calculateMultitaskingAdjustment:screenRect
+                                                             keyboardFrame:keyboardFrame];
+  XCTAssertTrue(adjustment == 20);
+}
+
+- (void)testCalculateKeyboardInset {
+  FlutterEngine* mockEngine = OCMPartialMock([[FlutterEngine alloc] init]);
+  [mockEngine createShell:@"" libraryURI:@"" initialRoute:nil];
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:mockEngine
+                                                                                nibName:nil
+                                                                                 bundle:nil];
+  FlutterViewController* viewControllerMock = OCMPartialMock(viewController);
+  UIScreen* screen = [self setUpMockScreen];
+  OCMStub([viewControllerMock flutterScreenIfViewLoaded]).andReturn(screen);
+
+  CGFloat screenWidth = screen.bounds.size.width;
+  CGFloat screenHeight = screen.bounds.size.height;
+  CGRect viewOrigFrame = CGRectMake(0, 0, 320, screenHeight - 40);
+  CGRect convertedViewFrame = CGRectMake(20, 20, 320, screenHeight - 40);
+  CGRect keyboardFrame = CGRectMake(20, screenHeight - 320, screenWidth, 300);
+
+  [self setUpMockView:viewControllerMock
+               screen:screen
+            viewFrame:viewOrigFrame
+       convertedFrame:convertedViewFrame];
+
+  CGFloat inset = [viewControllerMock calculateKeyboardInset:keyboardFrame
+                                                keyboardMode:FlutterKeyboardModeDocked];
+  XCTAssertTrue(inset == 300 * screen.scale);
+}
 
+- (void)testHandleKeyboardNotification {
+  FlutterEngine* engine = [[FlutterEngine alloc] init];
+  [engine runWithEntrypoint:nil];
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
+                                                                                nibName:nil
+                                                                                 bundle:nil];
+  // keyboard is empty
+  UIScreen* screen = [self setUpMockScreen];
+  CGFloat screenWidth = screen.bounds.size.width;
+  CGFloat screenHeight = screen.bounds.size.height;
+  CGRect keyboardFrame = CGRectMake(0, screenHeight - 320, screenWidth, 320);
+  CGRect viewFrame = screen.bounds;
+  BOOL isLocal = YES;
+  NSNotification* notification =
+      [NSNotification notificationWithName:UIKeyboardWillShowNotification
+                                    object:nil
+                                  userInfo:@{
+                                    @"UIKeyboardFrameEndUserInfoKey" : @(keyboardFrame),
+                                    @"UIKeyboardAnimationDurationUserInfoKey" : @0.25,
+                                    @"UIKeyboardIsLocalUserInfoKey" : @(isLocal)
+                                  }];
+  FlutterViewController* viewControllerMock = OCMPartialMock(viewController);
+  [self setUpMockView:viewControllerMock
+               screen:screen
+            viewFrame:viewFrame
+       convertedFrame:viewFrame];
+  viewControllerMock.targetViewInsetBottom = 0;
   XCTestExpectation* expectation = [self expectationWithDescription:@"update viewport"];
-  OCMStub([mockEngine updateViewportMetrics:flutter::ViewportMetrics()])
-      .ignoringNonObjectArgs()
-      .andDo(^(NSInvocation* invocation) {
-        [expectation fulfill];
-      });
-  id viewControllerMock = OCMPartialMock(viewController);
-  [viewControllerMock keyboardWillChangeFrame:notification];
+  OCMStub([viewControllerMock updateViewportMetricsIfNeeded]).andDo(^(NSInvocation* invocation) {
+    [expectation fulfill];
+  });
+
+  [viewControllerMock handleKeyboardNotification:notification];
+  XCTAssertTrue(viewControllerMock.targetViewInsetBottom == 320 * screen.scale);
   OCMVerify([viewControllerMock startKeyBoardAnimation:0.25]);
   [self waitForExpectationsWithTimeout:5.0 handler:nil];
 }
@@ -224,19 +763,19 @@ extern NSNotificationName const FlutterViewControllerWillDealloc;
                                                                                  bundle:nil];
 
   FlutterViewController* viewControllerMock = OCMPartialMock(viewController);
-  CGRect keyboardFrame = CGRectMake(0, 0, 0, 0);
+  CGRect keyboardFrame = CGRectZero;
   BOOL isLocal = YES;
-  NSNotification* fakeNotification = [NSNotification
-      notificationWithName:@""
-                    object:nil
-                  userInfo:@{
-                    @"UIKeyboardFrameEndUserInfoKey" : [NSValue valueWithCGRect:keyboardFrame],
-                    @"UIKeyboardAnimationDurationUserInfoKey" : @(0.25),
-                    @"UIKeyboardIsLocalUserInfoKey" : @(isLocal)
-                  }];
+  NSNotification* fakeNotification =
+      [NSNotification notificationWithName:UIKeyboardWillHideNotification
+                                    object:nil
+                                  userInfo:@{
+                                    @"UIKeyboardFrameEndUserInfoKey" : @(keyboardFrame),
+                                    @"UIKeyboardAnimationDurationUserInfoKey" : @(0.25),
+                                    @"UIKeyboardIsLocalUserInfoKey" : @(isLocal)
+                                  }];
 
   viewControllerMock.targetViewInsetBottom = 10;
-  [viewControllerMock keyboardWillBeHidden:fakeNotification];
+  [viewControllerMock handleKeyboardNotification:fakeNotification];
   XCTAssertTrue(viewControllerMock.targetViewInsetBottom == 0);
 }
 
@@ -386,7 +925,7 @@ extern NSNotificationName const FlutterViewControllerWillDealloc;
   OCMReject([lifecycleChannel sendMessage:@"AppLifecycleState.inactive"]);
 }
 
-- (void)testUpdateViewportMetricsDoesntInvokeEngineWhenNotTheViewController {
+- (void)testUpdateViewportMetricsIfNeeded_DoesntInvokeEngineWhenNotTheViewController {
   FlutterEngine* mockEngine = OCMPartialMock([[FlutterEngine alloc] init]);
   [mockEngine createShell:@"" libraryURI:@"" initialRoute:nil];
   FlutterViewController* viewControllerA = [[FlutterViewController alloc] initWithEngine:mockEngine
@@ -397,21 +936,102 @@ extern NSNotificationName const FlutterViewControllerWillDealloc;
                                                                                  nibName:nil
                                                                                   bundle:nil];
   mockEngine.viewController = viewControllerB;
-  [viewControllerA updateViewportMetrics];
+  [viewControllerA updateViewportMetricsIfNeeded];
   flutter::ViewportMetrics viewportMetrics;
   OCMVerify(never(), [mockEngine updateViewportMetrics:viewportMetrics]);
 }
 
-- (void)testUpdateViewportMetricsDoesInvokeEngineWhenIsTheViewController {
+- (void)testUpdateViewportMetricsIfNeeded_DoesInvokeEngineWhenIsTheViewController {
+  FlutterEngine* mockEngine = OCMPartialMock([[FlutterEngine alloc] init]);
+  [mockEngine createShell:@"" libraryURI:@"" initialRoute:nil];
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:mockEngine
+                                                                                nibName:nil
+                                                                                 bundle:nil];
+  mockEngine.viewController = viewController;
+  flutter::ViewportMetrics viewportMetrics;
+  OCMExpect([mockEngine updateViewportMetrics:viewportMetrics]).ignoringNonObjectArgs();
+  [viewController updateViewportMetricsIfNeeded];
+  OCMVerifyAll(mockEngine);
+}
+
+- (void)testUpdateViewportMetricsIfNeeded_DoesNotInvokeEngineWhenShouldBeIgnoredDuringRotation {
+  FlutterEngine* mockEngine = OCMPartialMock([[FlutterEngine alloc] init]);
+  [mockEngine createShell:@"" libraryURI:@"" initialRoute:nil];
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:mockEngine
+                                                                                nibName:nil
+                                                                                 bundle:nil];
+  FlutterViewController* viewControllerMock = OCMPartialMock(viewController);
+  UIScreen* screen = [self setUpMockScreen];
+  OCMStub([viewControllerMock flutterScreenIfViewLoaded]).andReturn(screen);
+  mockEngine.viewController = viewController;
+
+  id mockCoordinator = OCMProtocolMock(@protocol(UIViewControllerTransitionCoordinator));
+  OCMStub([mockCoordinator transitionDuration]).andReturn(0.5);
+
+  // Mimic the device rotation.
+  [viewController viewWillTransitionToSize:CGSizeZero withTransitionCoordinator:mockCoordinator];
+  // Should not trigger the engine call when during rotation.
+  [viewController updateViewportMetricsIfNeeded];
+
+  OCMVerify(never(), [mockEngine updateViewportMetrics:flutter::ViewportMetrics()]);
+}
+
+- (void)testViewWillTransitionToSize_DoesDelayEngineCallIfNonZeroDuration {
+  FlutterEngine* mockEngine = OCMPartialMock([[FlutterEngine alloc] init]);
+  [mockEngine createShell:@"" libraryURI:@"" initialRoute:nil];
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:mockEngine
+                                                                                nibName:nil
+                                                                                 bundle:nil];
+  FlutterViewController* viewControllerMock = OCMPartialMock(viewController);
+  UIScreen* screen = [self setUpMockScreen];
+  OCMStub([viewControllerMock flutterScreenIfViewLoaded]).andReturn(screen);
+  mockEngine.viewController = viewController;
+
+  // Mimic the device rotation with non-zero transition duration.
+  NSTimeInterval transitionDuration = 0.5;
+  id mockCoordinator = OCMProtocolMock(@protocol(UIViewControllerTransitionCoordinator));
+  OCMStub([mockCoordinator transitionDuration]).andReturn(transitionDuration);
+
+  flutter::ViewportMetrics viewportMetrics;
+  OCMExpect([mockEngine updateViewportMetrics:viewportMetrics]).ignoringNonObjectArgs();
+
+  [viewController viewWillTransitionToSize:CGSizeZero withTransitionCoordinator:mockCoordinator];
+  // Should not immediately call the engine (this request should be ignored).
+  [viewController updateViewportMetricsIfNeeded];
+  OCMVerify(never(), [mockEngine updateViewportMetrics:flutter::ViewportMetrics()]);
+
+  // Should delay the engine call for half of the transition duration.
+  // Wait for additional transitionDuration to allow updateViewportMetrics calls if any.
+  XCTWaiterResult result = [XCTWaiter
+      waitForExpectations:@[ [self expectationWithDescription:@"Waiting for rotation duration"] ]
+                  timeout:transitionDuration];
+  XCTAssertEqual(result, XCTWaiterResultTimedOut);
+
+  OCMVerifyAll(mockEngine);
+}
+
+- (void)testViewWillTransitionToSize_DoesNotDelayEngineCallIfZeroDuration {
   FlutterEngine* mockEngine = OCMPartialMock([[FlutterEngine alloc] init]);
   [mockEngine createShell:@"" libraryURI:@"" initialRoute:nil];
   FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:mockEngine
                                                                                 nibName:nil
                                                                                  bundle:nil];
+  FlutterViewController* viewControllerMock = OCMPartialMock(viewController);
+  UIScreen* screen = [self setUpMockScreen];
+  OCMStub([viewControllerMock flutterScreenIfViewLoaded]).andReturn(screen);
   mockEngine.viewController = viewController;
+
+  // Mimic the device rotation with zero transition duration.
+  id mockCoordinator = OCMProtocolMock(@protocol(UIViewControllerTransitionCoordinator));
+  OCMStub([mockCoordinator transitionDuration]).andReturn(0);
+
   flutter::ViewportMetrics viewportMetrics;
   OCMExpect([mockEngine updateViewportMetrics:viewportMetrics]).ignoringNonObjectArgs();
-  [viewController updateViewportMetrics];
+
+  // Should immediately trigger the engine call, without delay.
+  [viewController viewWillTransitionToSize:CGSizeZero withTransitionCoordinator:mockCoordinator];
+  [viewController updateViewportMetricsIfNeeded];
+
   OCMVerifyAll(mockEngine);
 }
 
@@ -513,6 +1133,16 @@ extern NSNotificationName const FlutterViewControllerWillDealloc;
   OCMVerify([self.mockEngine binaryMessenger]);
 }
 
+- (void)testViewControllerIsReleased {
+  __weak FlutterViewController* weakViewController;
+  @autoreleasepool {
+    FlutterViewController* viewController = [[FlutterViewController alloc] init];
+    weakViewController = viewController;
+    [viewController viewDidLoad];
+  }
+  XCTAssertNil(weakViewController);
+}
+
 #pragma mark - Platform Brightness
 
 - (void)testItReportsLightPlatformBrightnessByDefault {
@@ -568,10 +1198,6 @@ extern NSNotificationName const FlutterViewControllerWillDealloc;
   // Setup test.
   id settingsChannel = OCMClassMock([FlutterBasicMessageChannel class]);
   OCMStub([self.mockEngine settingsChannel]).andReturn(settingsChannel);
-
-  FlutterViewController* realVC = [[FlutterViewController alloc] initWithEngine:self.mockEngine
-                                                                        nibName:nil
-                                                                         bundle:nil];
   id mockTraitCollection =
       [self fakeTraitCollectionWithUserInterfaceStyle:UIUserInterfaceStyleDark];
 
@@ -579,7 +1205,9 @@ extern NSNotificationName const FlutterViewControllerWillDealloc;
   // the UITraitCollection of our choice. Mocking the object under test is not
   // desirable, but given that the OS does not offer a DI approach to providing
   // our own UITraitCollection, this seems to be the least bad option.
-  id partialMockVC = OCMPartialMock(realVC);
+  id partialMockVC = OCMPartialMock([[FlutterViewController alloc] initWithEngine:self.mockEngine
+                                                                          nibName:nil
+                                                                           bundle:nil]);
   OCMStub([partialMockVC traitCollection]).andReturn(mockTraitCollection);
 
   // Exercise behavior under test.
@@ -672,16 +1300,15 @@ extern NSNotificationName const FlutterViewControllerWillDealloc;
   id settingsChannel = OCMClassMock([FlutterBasicMessageChannel class]);
   OCMStub([self.mockEngine settingsChannel]).andReturn(settingsChannel);
 
-  FlutterViewController* realVC = [[FlutterViewController alloc] initWithEngine:self.mockEngine
-                                                                        nibName:nil
-                                                                         bundle:nil];
   id mockTraitCollection = [self fakeTraitCollectionWithContrast:UIAccessibilityContrastHigh];
 
   // We partially mock the real FlutterViewController to act as the OS and report
   // the UITraitCollection of our choice. Mocking the object under test is not
   // desirable, but given that the OS does not offer a DI approach to providing
   // our own UITraitCollection, this seems to be the least bad option.
-  id partialMockVC = OCMPartialMock(realVC);
+  id partialMockVC = OCMPartialMock([[FlutterViewController alloc] initWithEngine:self.mockEngine
+                                                                          nibName:nil
+                                                                           bundle:nil]);
   OCMStub([partialMockVC traitCollection]).andReturn(mockTraitCollection);
 
   // Exercise behavior under test.
@@ -738,6 +1365,22 @@ extern NSNotificationName const FlutterViewControllerWillDealloc;
   XCTAssert((flags & (int32_t)flutter::AccessibilityFeatureFlag::kOnOffSwitchLabels) != 0);
 }
 
+- (void)testAccessibilityPerformEscapePopsRoute {
+  FlutterEngine* mockEngine = OCMPartialMock([[FlutterEngine alloc] init]);
+  [mockEngine createShell:@"" libraryURI:@"" initialRoute:nil];
+  id mockNavigationChannel = OCMClassMock([FlutterMethodChannel class]);
+  OCMStub([mockEngine navigationChannel]).andReturn(mockNavigationChannel);
+
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:mockEngine
+                                                                                nibName:nil
+                                                                                 bundle:nil];
+  XCTAssertTrue([viewController accessibilityPerformEscape]);
+
+  OCMVerify([mockNavigationChannel invokeMethod:@"popRoute" arguments:nil]);
+
+  [mockNavigationChannel stopMocking];
+}
+
 - (void)testPerformOrientationUpdateForcesOrientationChange {
   [self orientationTestWithOrientationUpdate:UIInterfaceOrientationMaskPortrait
                           currentOrientation:UIInterfaceOrientationLandscapeLeft
@@ -891,47 +1534,64 @@ extern NSNotificationName const FlutterViewControllerWillDealloc;
   id mockApplication = OCMClassMock([UIApplication class]);
   id mockWindowScene;
   id deviceMock;
-  FlutterViewController* realVC = [[FlutterViewController alloc] initWithEngine:self.mockEngine
-                                                                        nibName:nil
-                                                                         bundle:nil];
-  if (@available(iOS 16.0, *)) {
-    mockWindowScene = OCMClassMock([UIWindowScene class]);
-    if (realVC.supportedInterfaceOrientations == mask) {
-      OCMReject([mockWindowScene requestGeometryUpdateWithPreferences:[OCMArg any]
-                                                         errorHandler:[OCMArg any]]);
+  id mockVC;
+  __block __weak id weakPreferences;
+  @autoreleasepool {
+    FlutterViewController* realVC = [[FlutterViewController alloc] initWithEngine:self.mockEngine
+                                                                          nibName:nil
+                                                                           bundle:nil];
+
+    if (@available(iOS 16.0, *)) {
+      mockWindowScene = OCMClassMock([UIWindowScene class]);
+      mockVC = OCMPartialMock(realVC);
+      OCMStub([mockVC flutterWindowSceneIfViewLoaded]).andReturn(mockWindowScene);
+      if (realVC.supportedInterfaceOrientations == mask) {
+        OCMReject([mockWindowScene requestGeometryUpdateWithPreferences:[OCMArg any]
+                                                           errorHandler:[OCMArg any]]);
+      } else {
+        // iOS 16 will decide whether to rotate based on the new preference, so always set it
+        // when it changes.
+        OCMExpect([mockWindowScene
+            requestGeometryUpdateWithPreferences:[OCMArg checkWithBlock:^BOOL(
+                                                             UIWindowSceneGeometryPreferencesIOS*
+                                                                 preferences) {
+              weakPreferences = preferences;
+              return preferences.interfaceOrientations == mask;
+            }]
+                                    errorHandler:[OCMArg any]]);
+      }
+      OCMStub([mockApplication sharedApplication]).andReturn(mockApplication);
+      OCMStub([mockApplication connectedScenes]).andReturn([NSSet setWithObject:mockWindowScene]);
     } else {
-      // iOS 16 will decide whether to rotate based on the new preference, so always set it
-      // when it changes.
-      OCMExpect([mockWindowScene
-          requestGeometryUpdateWithPreferences:[OCMArg checkWithBlock:^BOOL(
-                                                           UIWindowSceneGeometryPreferencesIOS*
-                                                               preferences) {
-            return preferences.interfaceOrientations == mask;
-          }]
-                                  errorHandler:[OCMArg any]]);
+      deviceMock = OCMPartialMock([UIDevice currentDevice]);
+      if (!didChange) {
+        OCMReject([deviceMock setValue:[OCMArg any] forKey:@"orientation"]);
+      } else {
+        OCMExpect([deviceMock setValue:@(resultingOrientation) forKey:@"orientation"]);
+      }
+      if (@available(iOS 13.0, *)) {
+        mockWindowScene = OCMClassMock([UIWindowScene class]);
+        mockVC = OCMPartialMock(realVC);
+        OCMStub([mockVC flutterWindowSceneIfViewLoaded]).andReturn(mockWindowScene);
+        OCMStub(((UIWindowScene*)mockWindowScene).interfaceOrientation)
+            .andReturn(currentOrientation);
+      } else {
+        OCMStub([mockApplication sharedApplication]).andReturn(mockApplication);
+        OCMStub([mockApplication statusBarOrientation]).andReturn(currentOrientation);
+      }
     }
-    OCMStub([mockApplication sharedApplication]).andReturn(mockApplication);
-    OCMStub([mockApplication connectedScenes]).andReturn([NSSet setWithObject:mockWindowScene]);
-  } else {
-    deviceMock = OCMPartialMock([UIDevice currentDevice]);
-    if (!didChange) {
-      OCMReject([deviceMock setValue:[OCMArg any] forKey:@"orientation"]);
+
+    [realVC performOrientationUpdate:mask];
+    if (@available(iOS 16.0, *)) {
+      OCMVerifyAll(mockWindowScene);
     } else {
-      OCMExpect([deviceMock setValue:@(resultingOrientation) forKey:@"orientation"]);
+      OCMVerifyAll(deviceMock);
     }
-
-    OCMStub([mockApplication sharedApplication]).andReturn(mockApplication);
-    OCMStub([mockApplication statusBarOrientation]).andReturn(currentOrientation);
-  }
-
-  [realVC performOrientationUpdate:mask];
-  if (@available(iOS 16.0, *)) {
-    OCMVerifyAll(mockWindowScene);
-  } else {
-    OCMVerifyAll(deviceMock);
   }
+  [mockWindowScene stopMocking];
   [deviceMock stopMocking];
   [mockApplication stopMocking];
+  XCTAssertNil(weakPreferences);
 }
 
 // Creates a mocked UITraitCollection with nil values for everything except accessibilityContrast,
@@ -947,6 +1607,7 @@ extern NSNotificationName const FlutterViewControllerWillDealloc;
       [[XCTestExpectation alloc] initWithDescription:@"notification called"];
   id engine = [[MockEngine alloc] init];
   @autoreleasepool {
+    // NOLINTNEXTLINE(clang-analyzer-deadcode.DeadStores)
     FlutterViewController* realVC = [[FlutterViewController alloc] initWithEngine:engine
                                                                           nibName:nil
                                                                            bundle:nil];
@@ -956,6 +1617,7 @@ extern NSNotificationName const FlutterViewControllerWillDealloc;
                                                   usingBlock:^(NSNotification* _Nonnull note) {
                                                     [expectation fulfill];
                                                   }];
+    XCTAssertNotNil(realVC);
     realVC = nil;
   }
   [self waitForExpectations:@[ expectation ] timeout:1.0];
@@ -1203,4 +1865,343 @@ extern NSNotificationName const FlutterViewControllerWillDealloc;
   [flutterViewController setSplashScreenView:nil];
 }
 
+- (void)testLifeCycleNotificationBecameActive {
+  FlutterEngine* engine = [[FlutterEngine alloc] init];
+  [engine runWithEntrypoint:nil];
+  FlutterViewController* flutterViewController =
+      [[FlutterViewController alloc] initWithEngine:engine nibName:nil bundle:nil];
+  UIWindow* window = [[UIWindow alloc] init];
+  [window addSubview:flutterViewController.view];
+  flutterViewController.view.bounds = CGRectMake(0, 0, 100, 100);
+  [flutterViewController viewDidLayoutSubviews];
+  NSNotification* sceneNotification =
+      [NSNotification notificationWithName:UISceneDidActivateNotification object:nil userInfo:nil];
+  NSNotification* applicationNotification =
+      [NSNotification notificationWithName:UIApplicationDidBecomeActiveNotification
+                                    object:nil
+                                  userInfo:nil];
+  id mockVC = OCMPartialMock(flutterViewController);
+  [[NSNotificationCenter defaultCenter] postNotification:sceneNotification];
+  [[NSNotificationCenter defaultCenter] postNotification:applicationNotification];
+#if APPLICATION_EXTENSION_API_ONLY
+  OCMVerify([mockVC sceneBecameActive:[OCMArg any]]);
+  OCMReject([mockVC applicationBecameActive:[OCMArg any]]);
+#else
+  OCMReject([mockVC sceneBecameActive:[OCMArg any]]);
+  OCMVerify([mockVC applicationBecameActive:[OCMArg any]]);
+#endif
+  XCTAssertFalse(flutterViewController.isKeyboardInOrTransitioningFromBackground);
+  OCMVerify([mockVC surfaceUpdated:YES]);
+  XCTestExpectation* timeoutApplicationLifeCycle =
+      [self expectationWithDescription:@"timeoutApplicationLifeCycle"];
+  dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)),
+                 dispatch_get_main_queue(), ^{
+                   [timeoutApplicationLifeCycle fulfill];
+                   OCMVerify([mockVC goToApplicationLifecycle:@"AppLifecycleState.resumed"]);
+                   [flutterViewController deregisterNotifications];
+                 });
+  [self waitForExpectationsWithTimeout:5.0 handler:nil];
+}
+
+- (void)testLifeCycleNotificationWillResignActive {
+  FlutterEngine* engine = [[FlutterEngine alloc] init];
+  [engine runWithEntrypoint:nil];
+  FlutterViewController* flutterViewController =
+      [[FlutterViewController alloc] initWithEngine:engine nibName:nil bundle:nil];
+  NSNotification* sceneNotification =
+      [NSNotification notificationWithName:UISceneWillDeactivateNotification
+                                    object:nil
+                                  userInfo:nil];
+  NSNotification* applicationNotification =
+      [NSNotification notificationWithName:UIApplicationWillResignActiveNotification
+                                    object:nil
+                                  userInfo:nil];
+  id mockVC = OCMPartialMock(flutterViewController);
+  [[NSNotificationCenter defaultCenter] postNotification:sceneNotification];
+  [[NSNotificationCenter defaultCenter] postNotification:applicationNotification];
+#if APPLICATION_EXTENSION_API_ONLY
+  OCMVerify([mockVC sceneWillResignActive:[OCMArg any]]);
+  OCMReject([mockVC applicationWillResignActive:[OCMArg any]]);
+#else
+  OCMReject([mockVC sceneWillResignActive:[OCMArg any]]);
+  OCMVerify([mockVC applicationWillResignActive:[OCMArg any]]);
+#endif
+  OCMVerify([mockVC goToApplicationLifecycle:@"AppLifecycleState.inactive"]);
+  [flutterViewController deregisterNotifications];
+}
+
+- (void)testLifeCycleNotificationWillTerminate {
+  FlutterEngine* engine = [[FlutterEngine alloc] init];
+  [engine runWithEntrypoint:nil];
+  FlutterViewController* flutterViewController =
+      [[FlutterViewController alloc] initWithEngine:engine nibName:nil bundle:nil];
+  NSNotification* sceneNotification =
+      [NSNotification notificationWithName:UISceneDidDisconnectNotification
+                                    object:nil
+                                  userInfo:nil];
+  NSNotification* applicationNotification =
+      [NSNotification notificationWithName:UIApplicationWillTerminateNotification
+                                    object:nil
+                                  userInfo:nil];
+  id mockVC = OCMPartialMock(flutterViewController);
+  id mockEngine = OCMPartialMock(engine);
+  OCMStub([mockVC engine]).andReturn(mockEngine);
+  [[NSNotificationCenter defaultCenter] postNotification:sceneNotification];
+  [[NSNotificationCenter defaultCenter] postNotification:applicationNotification];
+#if APPLICATION_EXTENSION_API_ONLY
+  OCMVerify([mockVC sceneWillDisconnect:[OCMArg any]]);
+  OCMReject([mockVC applicationWillTerminate:[OCMArg any]]);
+#else
+  OCMReject([mockVC sceneWillDisconnect:[OCMArg any]]);
+  OCMVerify([mockVC applicationWillTerminate:[OCMArg any]]);
+#endif
+  OCMVerify([mockVC goToApplicationLifecycle:@"AppLifecycleState.detached"]);
+  OCMVerify([mockEngine destroyContext]);
+  [flutterViewController deregisterNotifications];
+}
+
+- (void)testLifeCycleNotificationDidEnterBackground {
+  FlutterEngine* engine = [[FlutterEngine alloc] init];
+  [engine runWithEntrypoint:nil];
+  FlutterViewController* flutterViewController =
+      [[FlutterViewController alloc] initWithEngine:engine nibName:nil bundle:nil];
+  NSNotification* sceneNotification =
+      [NSNotification notificationWithName:UISceneDidEnterBackgroundNotification
+                                    object:nil
+                                  userInfo:nil];
+  NSNotification* applicationNotification =
+      [NSNotification notificationWithName:UIApplicationDidEnterBackgroundNotification
+                                    object:nil
+                                  userInfo:nil];
+  id mockVC = OCMPartialMock(flutterViewController);
+  [[NSNotificationCenter defaultCenter] postNotification:sceneNotification];
+  [[NSNotificationCenter defaultCenter] postNotification:applicationNotification];
+#if APPLICATION_EXTENSION_API_ONLY
+  OCMVerify([mockVC sceneDidEnterBackground:[OCMArg any]]);
+  OCMReject([mockVC applicationDidEnterBackground:[OCMArg any]]);
+#else
+  OCMReject([mockVC sceneDidEnterBackground:[OCMArg any]]);
+  OCMVerify([mockVC applicationDidEnterBackground:[OCMArg any]]);
+#endif
+  XCTAssertTrue(flutterViewController.isKeyboardInOrTransitioningFromBackground);
+  OCMVerify([mockVC surfaceUpdated:NO]);
+  OCMVerify([mockVC goToApplicationLifecycle:@"AppLifecycleState.paused"]);
+  [flutterViewController deregisterNotifications];
+}
+
+- (void)testLifeCycleNotificationWillEnterForeground {
+  FlutterEngine* engine = [[FlutterEngine alloc] init];
+  [engine runWithEntrypoint:nil];
+  FlutterViewController* flutterViewController =
+      [[FlutterViewController alloc] initWithEngine:engine nibName:nil bundle:nil];
+  NSNotification* sceneNotification =
+      [NSNotification notificationWithName:UISceneWillEnterForegroundNotification
+                                    object:nil
+                                  userInfo:nil];
+  NSNotification* applicationNotification =
+      [NSNotification notificationWithName:UIApplicationWillEnterForegroundNotification
+                                    object:nil
+                                  userInfo:nil];
+  id mockVC = OCMPartialMock(flutterViewController);
+  [[NSNotificationCenter defaultCenter] postNotification:sceneNotification];
+  [[NSNotificationCenter defaultCenter] postNotification:applicationNotification];
+#if APPLICATION_EXTENSION_API_ONLY
+  OCMVerify([mockVC sceneWillEnterForeground:[OCMArg any]]);
+  OCMReject([mockVC applicationWillEnterForeground:[OCMArg any]]);
+#else
+  OCMReject([mockVC sceneWillEnterForeground:[OCMArg any]]);
+  OCMVerify([mockVC applicationWillEnterForeground:[OCMArg any]]);
+#endif
+  OCMVerify([mockVC goToApplicationLifecycle:@"AppLifecycleState.inactive"]);
+  [flutterViewController deregisterNotifications];
+}
+
+- (void)testLifeCycleNotificationCancelledInvalidResumed {
+  FlutterEngine* engine = [[FlutterEngine alloc] init];
+  [engine runWithEntrypoint:nil];
+  FlutterViewController* flutterViewController =
+      [[FlutterViewController alloc] initWithEngine:engine nibName:nil bundle:nil];
+  NSNotification* applicationDidBecomeActiveNotification =
+      [NSNotification notificationWithName:UIApplicationDidBecomeActiveNotification
+                                    object:nil
+                                  userInfo:nil];
+  NSNotification* applicationWillResignActiveNotification =
+      [NSNotification notificationWithName:UIApplicationWillResignActiveNotification
+                                    object:nil
+                                  userInfo:nil];
+  id mockVC = OCMPartialMock(flutterViewController);
+  [[NSNotificationCenter defaultCenter] postNotification:applicationDidBecomeActiveNotification];
+  [[NSNotificationCenter defaultCenter] postNotification:applicationWillResignActiveNotification];
+#if APPLICATION_EXTENSION_API_ONLY
+#else
+  OCMVerify([mockVC goToApplicationLifecycle:@"AppLifecycleState.inactive"]);
+#endif
+
+  XCTestExpectation* timeoutApplicationLifeCycle =
+      [self expectationWithDescription:@"timeoutApplicationLifeCycle"];
+  dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)),
+                 dispatch_get_main_queue(), ^{
+                   OCMReject([mockVC goToApplicationLifecycle:@"AppLifecycleState.resumed"]);
+                   [timeoutApplicationLifeCycle fulfill];
+                   [flutterViewController deregisterNotifications];
+                 });
+  [self waitForExpectationsWithTimeout:5.0 handler:nil];
+}
+
+- (void)testSetupKeyboardAnimationVsyncClientWillCreateNewVsyncClientForFlutterViewController {
+  id bundleMock = OCMPartialMock([NSBundle mainBundle]);
+  OCMStub([bundleMock objectForInfoDictionaryKey:@"CADisableMinimumFrameDurationOnPhone"])
+      .andReturn(@YES);
+  id mockDisplayLinkManager = [OCMockObject mockForClass:[DisplayLinkManager class]];
+  double maxFrameRate = 120;
+  [[[mockDisplayLinkManager stub] andReturnValue:@(maxFrameRate)] displayRefreshRate];
+  FlutterEngine* engine = [[FlutterEngine alloc] init];
+  [engine runWithEntrypoint:nil];
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
+                                                                                nibName:nil
+                                                                                 bundle:nil];
+  FlutterKeyboardAnimationCallback callback = ^(fml::TimePoint targetTime) {
+  };
+  [viewController setUpKeyboardAnimationVsyncClient:callback];
+  XCTAssertNotNil(viewController.keyboardAnimationVSyncClient);
+  CADisplayLink* link = [viewController.keyboardAnimationVSyncClient getDisplayLink];
+  XCTAssertNotNil(link);
+  if (@available(iOS 15.0, *)) {
+    XCTAssertEqual(link.preferredFrameRateRange.maximum, maxFrameRate);
+    XCTAssertEqual(link.preferredFrameRateRange.preferred, maxFrameRate);
+    XCTAssertEqual(link.preferredFrameRateRange.minimum, maxFrameRate / 2);
+  } else {
+    XCTAssertEqual(link.preferredFramesPerSecond, maxFrameRate);
+  }
+}
+
+- (void)
+    testCreateTouchRateCorrectionVSyncClientWillCreateVsyncClientWhenRefreshRateIsLargerThan60HZ {
+  id mockDisplayLinkManager = [OCMockObject mockForClass:[DisplayLinkManager class]];
+  double maxFrameRate = 120;
+  [[[mockDisplayLinkManager stub] andReturnValue:@(maxFrameRate)] displayRefreshRate];
+  FlutterEngine* engine = [[FlutterEngine alloc] init];
+  [engine runWithEntrypoint:nil];
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
+                                                                                nibName:nil
+                                                                                 bundle:nil];
+  [viewController createTouchRateCorrectionVSyncClientIfNeeded];
+  XCTAssertNotNil(viewController.touchRateCorrectionVSyncClient);
+}
+
+- (void)testCreateTouchRateCorrectionVSyncClientWillNotCreateNewVSyncClientWhenClientAlreadyExists {
+  id mockDisplayLinkManager = [OCMockObject mockForClass:[DisplayLinkManager class]];
+  double maxFrameRate = 120;
+  [[[mockDisplayLinkManager stub] andReturnValue:@(maxFrameRate)] displayRefreshRate];
+
+  FlutterEngine* engine = [[FlutterEngine alloc] init];
+  [engine runWithEntrypoint:nil];
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
+                                                                                nibName:nil
+                                                                                 bundle:nil];
+  [viewController createTouchRateCorrectionVSyncClientIfNeeded];
+  VSyncClient* clientBefore = viewController.touchRateCorrectionVSyncClient;
+  XCTAssertNotNil(clientBefore);
+
+  [viewController createTouchRateCorrectionVSyncClientIfNeeded];
+  VSyncClient* clientAfter = viewController.touchRateCorrectionVSyncClient;
+  XCTAssertNotNil(clientAfter);
+
+  XCTAssertTrue(clientBefore == clientAfter);
+}
+
+- (void)testCreateTouchRateCorrectionVSyncClientWillNotCreateVsyncClientWhenRefreshRateIs60HZ {
+  id mockDisplayLinkManager = [OCMockObject mockForClass:[DisplayLinkManager class]];
+  double maxFrameRate = 60;
+  [[[mockDisplayLinkManager stub] andReturnValue:@(maxFrameRate)] displayRefreshRate];
+  FlutterEngine* engine = [[FlutterEngine alloc] init];
+  [engine runWithEntrypoint:nil];
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
+                                                                                nibName:nil
+                                                                                 bundle:nil];
+  [viewController createTouchRateCorrectionVSyncClientIfNeeded];
+  XCTAssertNil(viewController.touchRateCorrectionVSyncClient);
+}
+
+- (void)testTriggerTouchRateCorrectionVSyncClientCorrectly {
+  id mockDisplayLinkManager = [OCMockObject mockForClass:[DisplayLinkManager class]];
+  double maxFrameRate = 120;
+  [[[mockDisplayLinkManager stub] andReturnValue:@(maxFrameRate)] displayRefreshRate];
+  FlutterEngine* engine = [[FlutterEngine alloc] init];
+  [engine runWithEntrypoint:nil];
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
+                                                                                nibName:nil
+                                                                                 bundle:nil];
+  [viewController loadView];
+  [viewController viewDidLoad];
+
+  VSyncClient* client = viewController.touchRateCorrectionVSyncClient;
+  CADisplayLink* link = [client getDisplayLink];
+
+  UITouch* fakeTouchBegan = [[UITouch alloc] init];
+  fakeTouchBegan.phase = UITouchPhaseBegan;
+
+  UITouch* fakeTouchMove = [[UITouch alloc] init];
+  fakeTouchMove.phase = UITouchPhaseMoved;
+
+  UITouch* fakeTouchEnd = [[UITouch alloc] init];
+  fakeTouchEnd.phase = UITouchPhaseEnded;
+
+  UITouch* fakeTouchCancelled = [[UITouch alloc] init];
+  fakeTouchCancelled.phase = UITouchPhaseCancelled;
+
+  [viewController
+      triggerTouchRateCorrectionIfNeeded:[[NSSet alloc] initWithObjects:fakeTouchBegan, nil]];
+  XCTAssertFalse(link.isPaused);
+
+  [viewController
+      triggerTouchRateCorrectionIfNeeded:[[NSSet alloc] initWithObjects:fakeTouchEnd, nil]];
+  XCTAssertTrue(link.isPaused);
+
+  [viewController
+      triggerTouchRateCorrectionIfNeeded:[[NSSet alloc] initWithObjects:fakeTouchMove, nil]];
+  XCTAssertFalse(link.isPaused);
+
+  [viewController
+      triggerTouchRateCorrectionIfNeeded:[[NSSet alloc] initWithObjects:fakeTouchCancelled, nil]];
+  XCTAssertTrue(link.isPaused);
+
+  [viewController
+      triggerTouchRateCorrectionIfNeeded:[[NSSet alloc]
+                                             initWithObjects:fakeTouchBegan, fakeTouchEnd, nil]];
+  XCTAssertFalse(link.isPaused);
+
+  [viewController
+      triggerTouchRateCorrectionIfNeeded:[[NSSet alloc] initWithObjects:fakeTouchEnd,
+                                                                        fakeTouchCancelled, nil]];
+  XCTAssertTrue(link.isPaused);
+
+  [viewController
+      triggerTouchRateCorrectionIfNeeded:[[NSSet alloc]
+                                             initWithObjects:fakeTouchMove, fakeTouchEnd, nil]];
+  XCTAssertFalse(link.isPaused);
+}
+
+- (void)testFlutterViewControllerStartKeyboardAnimationWillCreateVsyncClientCorrectly {
+  FlutterEngine* engine = [[FlutterEngine alloc] init];
+  [engine runWithEntrypoint:nil];
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
+                                                                                nibName:nil
+                                                                                 bundle:nil];
+  viewController.targetViewInsetBottom = 100;
+  [viewController startKeyBoardAnimation:0.25];
+  XCTAssertNotNil(viewController.keyboardAnimationVSyncClient);
+}
+
+- (void)
+    testSetupKeyboardAnimationVsyncClientWillNotCreateNewVsyncClientWhenKeyboardAnimationCallbackIsNil {
+  FlutterEngine* engine = [[FlutterEngine alloc] init];
+  [engine runWithEntrypoint:nil];
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
+                                                                                nibName:nil
+                                                                                 bundle:nil];
+  [viewController setUpKeyboardAnimationVsyncClient:nil];
+  XCTAssertNil(viewController.keyboardAnimationVSyncClient);
+}
+
 @end
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterViewControllerTest_mrc.mm b/shell/platform/darwin/ios/framework/Source/FlutterViewControllerTest_mrc.mm
deleted file mode 100644
index e18b0b55c93357964007cef5b19890da0b156983..0000000000000000000000000000000000000000
--- a/shell/platform/darwin/ios/framework/Source/FlutterViewControllerTest_mrc.mm
+++ /dev/null
@@ -1,176 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import <OCMock/OCMock.h>
-#import <XCTest/XCTest.h>
-
-#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
-#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h"
-#import "flutter/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.h"
-
-FLUTTER_ASSERT_NOT_ARC
-
-@interface UITouch ()
-
-@property(nonatomic, readwrite) UITouchPhase phase;
-
-@end
-
-@interface VSyncClient (Testing)
-
-- (CADisplayLink*)getDisplayLink;
-
-@end
-
-@interface FlutterViewController (Testing)
-
-@property(nonatomic, assign) double targetViewInsetBottom;
-@property(nonatomic, retain) VSyncClient* keyboardAnimationVSyncClient;
-
-@property(nonatomic, retain) VSyncClient* touchRateCorrectionVSyncClient;
-
-- (void)createTouchRateCorrectionVSyncClientIfNeeded;
-- (void)setupKeyboardAnimationVsyncClient;
-- (void)triggerTouchRateCorrectionIfNeeded:(NSSet*)touches;
-
-@end
-
-@interface FlutterViewControllerTest_mrc : XCTestCase
-@end
-
-@implementation FlutterViewControllerTest_mrc
-
-- (void)testSetupKeyboardAnimationVsyncClientWillCreateNewVsyncClientForFlutterViewController {
-  id bundleMock = OCMPartialMock([NSBundle mainBundle]);
-  OCMStub([bundleMock objectForInfoDictionaryKey:@"CADisableMinimumFrameDurationOnPhone"])
-      .andReturn(@YES);
-  id mockDisplayLinkManager = [OCMockObject mockForClass:[DisplayLinkManager class]];
-  double maxFrameRate = 120;
-  [[[mockDisplayLinkManager stub] andReturnValue:@(maxFrameRate)] displayRefreshRate];
-  FlutterEngine* engine = [[FlutterEngine alloc] init];
-  [engine runWithEntrypoint:nil];
-  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
-                                                                                nibName:nil
-                                                                                 bundle:nil];
-  [viewController setupKeyboardAnimationVsyncClient];
-  XCTAssertNotNil(viewController.keyboardAnimationVSyncClient);
-  CADisplayLink* link = [viewController.keyboardAnimationVSyncClient getDisplayLink];
-  XCTAssertNotNil(link);
-  if (@available(iOS 15.0, *)) {
-    XCTAssertEqual(link.preferredFrameRateRange.maximum, maxFrameRate);
-    XCTAssertEqual(link.preferredFrameRateRange.preferred, maxFrameRate);
-    XCTAssertEqual(link.preferredFrameRateRange.minimum, maxFrameRate / 2);
-  } else {
-    XCTAssertEqual(link.preferredFramesPerSecond, maxFrameRate);
-  }
-}
-
-- (void)
-    testCreateTouchRateCorrectionVSyncClientWillCreateVsyncClientWhenRefreshRateIsLargerThan60HZ {
-  id mockDisplayLinkManager = [OCMockObject mockForClass:[DisplayLinkManager class]];
-  double maxFrameRate = 120;
-  [[[mockDisplayLinkManager stub] andReturnValue:@(maxFrameRate)] displayRefreshRate];
-  FlutterEngine* engine = [[FlutterEngine alloc] init];
-  [engine runWithEntrypoint:nil];
-  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
-                                                                                nibName:nil
-                                                                                 bundle:nil];
-  [viewController createTouchRateCorrectionVSyncClientIfNeeded];
-  XCTAssertNotNil(viewController.touchRateCorrectionVSyncClient);
-}
-
-- (void)testCreateTouchRateCorrectionVSyncClientWillNotCreateNewVSyncClientWhenClientAlreadyExists {
-  id mockDisplayLinkManager = [OCMockObject mockForClass:[DisplayLinkManager class]];
-  double maxFrameRate = 120;
-  [[[mockDisplayLinkManager stub] andReturnValue:@(maxFrameRate)] displayRefreshRate];
-
-  FlutterEngine* engine = [[FlutterEngine alloc] init];
-  [engine runWithEntrypoint:nil];
-  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
-                                                                                nibName:nil
-                                                                                 bundle:nil];
-  [viewController createTouchRateCorrectionVSyncClientIfNeeded];
-  VSyncClient* clientBefore = viewController.touchRateCorrectionVSyncClient;
-  XCTAssertNotNil(clientBefore);
-
-  [viewController createTouchRateCorrectionVSyncClientIfNeeded];
-  VSyncClient* clientAfter = viewController.touchRateCorrectionVSyncClient;
-  XCTAssertNotNil(clientAfter);
-
-  XCTAssertTrue(clientBefore == clientAfter);
-}
-
-- (void)testCreateTouchRateCorrectionVSyncClientWillNotCreateVsyncClientWhenRefreshRateIs60HZ {
-  id mockDisplayLinkManager = [OCMockObject mockForClass:[DisplayLinkManager class]];
-  double maxFrameRate = 60;
-  [[[mockDisplayLinkManager stub] andReturnValue:@(maxFrameRate)] displayRefreshRate];
-  FlutterEngine* engine = [[FlutterEngine alloc] init];
-  [engine runWithEntrypoint:nil];
-  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
-                                                                                nibName:nil
-                                                                                 bundle:nil];
-  [viewController createTouchRateCorrectionVSyncClientIfNeeded];
-  XCTAssertNil(viewController.touchRateCorrectionVSyncClient);
-}
-
-- (void)testTriggerTouchRateCorrectionVSyncClientCorrectly {
-  id mockDisplayLinkManager = [OCMockObject mockForClass:[DisplayLinkManager class]];
-  double maxFrameRate = 120;
-  [[[mockDisplayLinkManager stub] andReturnValue:@(maxFrameRate)] displayRefreshRate];
-  FlutterEngine* engine = [[FlutterEngine alloc] init];
-  [engine runWithEntrypoint:nil];
-  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
-                                                                                nibName:nil
-                                                                                 bundle:nil];
-  [viewController loadView];
-  [viewController viewDidLoad];
-
-  VSyncClient* client = viewController.touchRateCorrectionVSyncClient;
-  CADisplayLink* link = [client getDisplayLink];
-
-  UITouch* fakeTouchBegan = [[UITouch alloc] init];
-  fakeTouchBegan.phase = UITouchPhaseBegan;
-
-  UITouch* fakeTouchMove = [[UITouch alloc] init];
-  fakeTouchMove.phase = UITouchPhaseMoved;
-
-  UITouch* fakeTouchEnd = [[UITouch alloc] init];
-  fakeTouchEnd.phase = UITouchPhaseEnded;
-
-  UITouch* fakeTouchCancelled = [[UITouch alloc] init];
-  fakeTouchCancelled.phase = UITouchPhaseCancelled;
-
-  [viewController
-      triggerTouchRateCorrectionIfNeeded:[[NSSet alloc] initWithObjects:fakeTouchBegan, nil]];
-  XCTAssertFalse(link.isPaused);
-
-  [viewController
-      triggerTouchRateCorrectionIfNeeded:[[NSSet alloc] initWithObjects:fakeTouchEnd, nil]];
-  XCTAssertTrue(link.isPaused);
-
-  [viewController
-      triggerTouchRateCorrectionIfNeeded:[[NSSet alloc] initWithObjects:fakeTouchMove, nil]];
-  XCTAssertFalse(link.isPaused);
-
-  [viewController
-      triggerTouchRateCorrectionIfNeeded:[[NSSet alloc] initWithObjects:fakeTouchCancelled, nil]];
-  XCTAssertTrue(link.isPaused);
-
-  [viewController
-      triggerTouchRateCorrectionIfNeeded:[[NSSet alloc]
-                                             initWithObjects:fakeTouchBegan, fakeTouchEnd, nil]];
-  XCTAssertFalse(link.isPaused);
-
-  [viewController
-      triggerTouchRateCorrectionIfNeeded:[[NSSet alloc] initWithObjects:fakeTouchEnd,
-                                                                        fakeTouchCancelled, nil]];
-  XCTAssertTrue(link.isPaused);
-
-  [viewController
-      triggerTouchRateCorrectionIfNeeded:[[NSSet alloc]
-                                             initWithObjects:fakeTouchMove, fakeTouchEnd, nil]];
-  XCTAssertFalse(link.isPaused);
-}
-
-@end
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h b/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h
index 1b4af46a68b3644bc87dbb3b62aefe148320fc33..ed99a3339b6170786ecdf3f26964b29bd2e86f1a 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h
+++ b/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h
@@ -5,7 +5,8 @@
 #ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERVIEWCONTROLLER_INTERNAL_H_
 #define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERVIEWCONTROLLER_INTERNAL_H_
 
-#include "flutter/fml/memory/weak_ptr.h"
+#include "flutter/fml/platform/darwin/weak_nsobject.h"
+#include "flutter/fml/time/time_point.h"
 
 #import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterKeySecondaryResponder.h"
@@ -19,21 +20,44 @@ class FlutterPlatformViewsController;
 }
 
 FLUTTER_DARWIN_EXPORT
+// NOLINTNEXTLINE(readability-identifier-naming)
 extern NSNotificationName const FlutterViewControllerWillDealloc;
 
 FLUTTER_DARWIN_EXPORT
+// NOLINTNEXTLINE(readability-identifier-naming)
 extern NSNotificationName const FlutterViewControllerHideHomeIndicator;
 
 FLUTTER_DARWIN_EXPORT
+// NOLINTNEXTLINE(readability-identifier-naming)
 extern NSNotificationName const FlutterViewControllerShowHomeIndicator;
 
+typedef NS_ENUM(NSInteger, FlutterKeyboardMode) {
+  // NOLINTBEGIN(readability-identifier-naming)
+  FlutterKeyboardModeHidden = 0,
+  FlutterKeyboardModeDocked = 1,
+  FlutterKeyboardModeFloating = 2,
+  // NOLINTEND(readability-identifier-naming)
+};
+
+typedef void (^FlutterKeyboardAnimationCallback)(fml::TimePoint);
+
 @interface FlutterViewController () <FlutterViewResponder>
 
 @property(class, nonatomic, readonly) BOOL accessibilityIsOnOffSwitchLabelsEnabled;
 @property(nonatomic, readonly) BOOL isPresentingViewController;
 @property(nonatomic, readonly) BOOL isVoiceOverRunning;
 @property(nonatomic, retain) FlutterKeyboardManager* keyboardManager;
-- (fml::WeakPtr<FlutterViewController>)getWeakPtr;
+
+/**
+ * @brief Whether the status bar is preferred hidden.
+ *
+ *        This overrides the |UIViewController:prefersStatusBarHidden|.
+ *        This is ignored when `UIViewControllerBasedStatusBarAppearance` in info.plist
+ *        of the app project is `false`.
+ */
+@property(nonatomic, assign, readwrite) BOOL prefersStatusBarHidden;
+
+- (fml::WeakNSObject<FlutterViewController>)getWeakNSObject;
 - (std::shared_ptr<flutter::FlutterPlatformViewsController>&)platformViewsController;
 - (FlutterRestorationPlugin*)restorationPlugin;
 // Send touches to the Flutter Engine while forcing the change type to be cancelled.
@@ -47,6 +71,7 @@ extern NSNotificationName const FlutterViewControllerShowHomeIndicator;
 - (void)addInternalPlugins;
 - (void)deregisterNotifications;
 - (int32_t)accessibilityFlags;
+
 @end
 
 #endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERVIEWCONTROLLER_INTERNAL_H_
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterViewResponder.h b/shell/platform/darwin/ios/framework/Source/FlutterViewResponder.h
index a9bf602e86fefae6aa1bca0c2d22a4db80eebea6..5cb25ca05d9f1ae3fc088c04aef36d4d8e6c3314 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterViewResponder.h
+++ b/shell/platform/darwin/ios/framework/Source/FlutterViewResponder.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERVIEWRESPONDER_H_
-#define SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERVIEWRESPONDER_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERVIEWRESPONDER_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERVIEWRESPONDER_H_
 
 #import <Foundation/Foundation.h>
 
@@ -21,4 +21,4 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 NS_ASSUME_NONNULL_END
 
-#endif  // SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERVIEWRESPONDER_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERVIEWRESPONDER_H_
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterViewTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterViewTest.mm
index d264933b0bf430b0620f68c555c9e12166afe409..e1c1846873facc34d3471e79109fb33ea506962a 100644
--- a/shell/platform/darwin/ios/framework/Source/FlutterViewTest.mm
+++ b/shell/platform/darwin/ios/framework/Source/FlutterViewTest.mm
@@ -4,11 +4,15 @@
 
 #import <XCTest/XCTest.h>
 
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterView.h"
 
+FLUTTER_ASSERT_ARC
+
 @interface FakeDelegate : NSObject <FlutterViewEngineDelegate>
 @property(nonatomic) BOOL callbackCalled;
+@property(nonatomic, assign) BOOL isUsingImpeller;
 @end
 
 @implementation FakeDelegate {
@@ -43,7 +47,7 @@
 
 - (void)testFlutterViewEnableSemanticsWhenIsAccessibilityElementIsCalled {
   FakeDelegate* delegate = [[FakeDelegate alloc] init];
-  FlutterView* view = [[FlutterView alloc] initWithDelegate:delegate opaque:NO];
+  FlutterView* view = [[FlutterView alloc] initWithDelegate:delegate opaque:NO enableWideGamut:NO];
   delegate.callbackCalled = NO;
   XCTAssertFalse(view.isAccessibilityElement);
   XCTAssertTrue(delegate.callbackCalled);
@@ -51,8 +55,31 @@
 
 - (void)testFlutterViewBackgroundColorIsNotNil {
   FakeDelegate* delegate = [[FakeDelegate alloc] init];
-  FlutterView* view = [[FlutterView alloc] initWithDelegate:delegate opaque:NO];
+  FlutterView* view = [[FlutterView alloc] initWithDelegate:delegate opaque:NO enableWideGamut:NO];
   XCTAssertNotNil(view.backgroundColor);
 }
 
+- (void)testIgnoreWideColorWithoutImpeller {
+  FakeDelegate* delegate = [[FakeDelegate alloc] init];
+  delegate.isUsingImpeller = NO;
+  FlutterView* view = [[FlutterView alloc] initWithDelegate:delegate opaque:NO enableWideGamut:YES];
+  [view layoutSubviews];
+  XCTAssertTrue([view.layer isKindOfClass:NSClassFromString(@"CAMetalLayer")]);
+  CAMetalLayer* layer = (CAMetalLayer*)view.layer;
+  XCTAssertEqual(layer.pixelFormat, MTLPixelFormatBGRA8Unorm);
+}
+
+- (void)testLayerScalesMatchScreenAfterLayoutSubviews {
+  FakeDelegate* delegate = [[FakeDelegate alloc] init];
+  FlutterView* view = [[FlutterView alloc] initWithDelegate:delegate opaque:NO enableWideGamut:NO];
+  view.layer.contentsScale = CGFloat(-99.0);
+  view.layer.rasterizationScale = CGFloat(-99.0);
+  UIScreen* screen = [view screen];
+  XCTAssertNotEqual(view.layer.contentsScale, screen.scale);
+  XCTAssertNotEqual(view.layer.rasterizationScale, screen.scale);
+  [view layoutSubviews];
+  XCTAssertEqual(view.layer.contentsScale, screen.scale);
+  XCTAssertEqual(view.layer.rasterizationScale, screen.scale);
+}
+
 @end
diff --git a/shell/platform/darwin/ios/framework/Source/IOKit.h b/shell/platform/darwin/ios/framework/Source/IOKit.h
index 6b177a8e2b1cf68523b0ddb33730bdace36519ef..53e8fe1b35eb437043e4a054ff7b02e7147f4699 100644
--- a/shell/platform/darwin/ios/framework/Source/IOKit.h
+++ b/shell/platform/darwin/ios/framework/Source/IOKit.h
@@ -91,18 +91,18 @@ void IOIteratorReset(io_iterator_t it);
 CFMutableDictionaryRef IOServiceMatching(const char* name) CF_RETURNS_RETAINED;
 CFMutableDictionaryRef IOServiceNameMatching(const char* name)
     CF_RETURNS_RETAINED;
-io_service_t IOServiceGetMatchingService(mach_port_t master,
-                                         CFDictionaryRef matching
-                                             CF_RELEASES_ARGUMENT);
-kern_return_t IOServiceGetMatchingServices(mach_port_t master,
-                                           CFDictionaryRef matching
-                                               CF_RELEASES_ARGUMENT,
-                                           io_iterator_t* it);
+io_service_t IOServiceGetMatchingService(
+    mach_port_t master,
+    CFDictionaryRef matching CF_RELEASES_ARGUMENT);
+kern_return_t IOServiceGetMatchingServices(
+    mach_port_t master,
+    CFDictionaryRef matching CF_RELEASES_ARGUMENT,
+    io_iterator_t* it);
 
 #if __cplusplus
 }
 #endif  // __cplusplus
 
 #endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_IOKIT_H_
-#endif  // defined(FLUTTER_RUNTIME_MODE_DEBUG) ||
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_IOKIT_H_
         // defined(FLUTTER_RUNTIME_MODE_PROFILE)
diff --git a/shell/platform/darwin/ios/framework/Source/KeyCodeMap_Internal.h b/shell/platform/darwin/ios/framework/Source/KeyCodeMap_Internal.h
index f6e98dd4d84f25db7d5bf98b717f4c6780954cb7..f01fc43e213166ade59f500d0d33e7dfb5796362 100644
--- a/shell/platform/darwin/ios/framework/Source/KeyCodeMap_Internal.h
+++ b/shell/platform/darwin/ios/framework/Source/KeyCodeMap_Internal.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_KEY_CODE_MAP_INTERNAL_H_
-#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_KEY_CODE_MAP_INTERNAL_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_KEYCODEMAP_INTERNAL_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_KEYCODEMAP_INTERNAL_H_
 
 #import <UIKit/UIKit.h>
 #include <map>
@@ -15,6 +15,7 @@
  * MacOS doesn't provide a scan code, but a virtual keycode to represent a
  * physical key.
  */
+// NOLINTNEXTLINE(readability-identifier-naming)
 extern const std::map<uint32_t, uint64_t> keyCodeToPhysicalKey;
 
 /**
@@ -23,6 +24,7 @@ extern const std::map<uint32_t, uint64_t> keyCodeToPhysicalKey;
  * This is used to derive logical keys that can't or shouldn't be derived from
  * |charactersIgnoringModifiers|.
  */
+// NOLINTNEXTLINE(readability-identifier-naming)
 extern const std::map<uint32_t, uint64_t> keyCodeToLogicalKey;
 
 /**
@@ -96,29 +98,34 @@ constexpr uint32_t kModifierFlagSidedMask = kModifierFlagControlLeft | kModifier
 /**
  * Map |UIKey.keyCode| to the matching sided modifier in UIEventModifierFlags.
  */
+// NOLINTNEXTLINE(readability-identifier-naming)
 extern const std::map<uint32_t, ModifierFlag> keyCodeToModifierFlag;
 
 /**
  * Map a bit of bitmask of sided modifiers in UIEventModifierFlags to their
  * corresponding |UIKey.keyCode|.
  */
+// NOLINTNEXTLINE(readability-identifier-naming)
 extern const std::map<ModifierFlag, uint32_t> modifierFlagToKeyCode;
 
 /**
  * Maps a sided modifier key to the corresponding flag matching either side of
  * that type of modifier.
  */
+// NOLINTNEXTLINE(readability-identifier-naming)
 extern const std::map<ModifierFlag, ModifierFlag> sidedModifierToAny;
 
 /**
  * Maps a non-sided modifier key to the corresponding flag matching the left key
  * of that type of modifier.
  */
+// NOLINTNEXTLINE(readability-identifier-naming)
 extern const std::map<ModifierFlag, ModifierFlag> anyModifierToLeft;
 
 /**
  * A set of keycodes corresponding to function keys.
  */
+// NOLINTNEXTLINE(readability-identifier-naming)
 extern const std::set<uint32_t> functionKeyCodes;
 
-#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_KEY_CODE_MAP_INTERNAL_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_KEYCODEMAP_INTERNAL_H_
diff --git a/shell/platform/darwin/ios/framework/Source/SemanticsObject.h b/shell/platform/darwin/ios/framework/Source/SemanticsObject.h
index ce9347c7c44e92cb36b6a013bfdf1f860949d0a5..5298d5fabac6ecb44764a5e19cfc2df6a9165c9c 100644
--- a/shell/platform/darwin/ios/framework/Source/SemanticsObject.h
+++ b/shell/platform/darwin/ios/framework/Source/SemanticsObject.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_SEMANTICS_OBJECT_H_
-#define SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_SEMANTICS_OBJECT_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_SEMANTICSOBJECT_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_SEMANTICSOBJECT_H_
 
 #import <UIKit/UIKit.h>
 
@@ -18,6 +18,7 @@ constexpr float kScrollExtentMaxForInf = 1000;
 
 @class FlutterCustomAccessibilityAction;
 @class FlutterPlatformViewSemanticsContainer;
+@class FlutterTouchInterceptingView;
 
 /**
  * A node in the iOS semantics tree. This object is a wrapper over a native accessibiliy
@@ -65,6 +66,12 @@ constexpr float kScrollExtentMaxForInf = 1000;
  */
 @property(nonatomic, strong) NSArray<SemanticsObject*>* children;
 
+/**
+ * Direct children of this semantics object in hit test order. Each child's `parent` property
+ * must be equal to this object.
+ */
+@property(nonatomic, strong) NSArray<SemanticsObject*>* childrenInHitTestOrder;
+
 /**
  * The UIAccessibility that represents this object.
  *
@@ -165,7 +172,8 @@ constexpr float kScrollExtentMaxForInf = 1000;
 
 - (instancetype)initWithBridge:(fml::WeakPtr<flutter::AccessibilityBridgeIos>)bridge
                            uid:(int32_t)uid
-                  platformView:(UIView*)platformView NS_DESIGNATED_INITIALIZER;
+                  platformView:(FlutterTouchInterceptingView*)platformView
+    NS_DESIGNATED_INITIALIZER;
 
 @end
 
@@ -227,4 +235,4 @@ constexpr float kScrollExtentMaxForInf = 1000;
 
 @end
 
-#endif  // SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_SEMANTICS_OBJECT_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_SEMANTICSOBJECT_H_
diff --git a/shell/platform/darwin/ios/framework/Source/SemanticsObject.mm b/shell/platform/darwin/ios/framework/Source/SemanticsObject.mm
index ff4ab7dc94704dd8ec922de0f39368adf431cad7..7eb0c2384fe5b1c8b5bc4d949cd58cdb977b57e8 100644
--- a/shell/platform/darwin/ios/framework/Source/SemanticsObject.mm
+++ b/shell/platform/darwin/ios/framework/Source/SemanticsObject.mm
@@ -157,9 +157,7 @@ CGRect ConvertRectToGlobal(SemanticsObject* reference, CGRect local_rect) {
 @property(nonatomic, retain) FlutterSemanticsScrollView* scrollView;
 @end
 
-@implementation FlutterScrollableSemanticsObject {
-  fml::scoped_nsobject<SemanticsObjectContainer> _container;
-}
+@implementation FlutterScrollableSemanticsObject
 
 - (instancetype)initWithBridge:(fml::WeakPtr<flutter::AccessibilityBridgeIos>)bridge
                            uid:(int32_t)uid {
@@ -267,6 +265,7 @@ CGRect ConvertRectToGlobal(SemanticsObject* reference, CGRect local_rect) {
 @implementation SemanticsObject {
   fml::scoped_nsobject<SemanticsObjectContainer> _container;
   NSMutableArray<SemanticsObject*>* _children;
+  NSMutableArray<SemanticsObject*>* _childrenInHitTestOrder;
   BOOL _inDealloc;
 }
 
@@ -295,6 +294,7 @@ CGRect ConvertRectToGlobal(SemanticsObject* reference, CGRect local_rect) {
     _bridge = bridge;
     _uid = uid;
     _children = [[NSMutableArray alloc] init];
+    _childrenInHitTestOrder = [[NSMutableArray alloc] init];
   }
 
   return self;
@@ -305,7 +305,10 @@ CGRect ConvertRectToGlobal(SemanticsObject* reference, CGRect local_rect) {
     [child privateSetParent:nil];
   }
   [_children removeAllObjects];
+  [_childrenInHitTestOrder removeAllObjects];
   [_children release];
+  [_childrenInHitTestOrder release];
+
   _parent = nil;
   _container.get().semanticsObject = nil;
   _inDealloc = YES;
@@ -325,6 +328,17 @@ CGRect ConvertRectToGlobal(SemanticsObject* reference, CGRect local_rect) {
   }
 }
 
+- (void)setChildrenInHitTestOrder:(NSArray<SemanticsObject*>*)childrenInHitTestOrder {
+  for (SemanticsObject* child in _childrenInHitTestOrder) {
+    [child privateSetParent:nil];
+  }
+  [_childrenInHitTestOrder release];
+  _childrenInHitTestOrder = [[NSMutableArray alloc] initWithArray:childrenInHitTestOrder];
+  for (SemanticsObject* child in _childrenInHitTestOrder) {
+    [child privateSetParent:self];
+  }
+}
+
 - (BOOL)hasChildren {
   return [self.children count] != 0;
 }
@@ -444,6 +458,10 @@ CGRect ConvertRectToGlobal(SemanticsObject* reference, CGRect local_rect) {
   return attributedString;
 }
 
+- (void)showOnScreen {
+  [self bridge]->DispatchSemanticsAction([self uid], flutter::SemanticsAction::kShowOnScreen);
+}
+
 #pragma mark - UIAccessibility overrides
 
 - (BOOL)isAccessibilityElement {
@@ -460,6 +478,10 @@ CGRect ConvertRectToGlobal(SemanticsObject* reference, CGRect local_rect) {
     return false;
   }
 
+  return [self isFocusable];
+}
+
+- (bool)isFocusable {
   // If the node is scrollable AND hidden OR
   // The node has a label, value, or hint OR
   // The node has non-scrolling related actions.
@@ -502,6 +524,17 @@ CGRect ConvertRectToGlobal(SemanticsObject* reference, CGRect local_rect) {
   return YES;
 }
 
+- (NSString*)accessibilityIdentifier {
+  if (![self isAccessibilityBridgeAlive]) {
+    return nil;
+  }
+
+  if ([self node].identifier.empty()) {
+    return nil;
+  }
+  return @([self node].identifier.data());
+}
+
 - (NSString*)accessibilityLabel {
   if (![self isAccessibilityBridgeAlive]) {
     return nil;
@@ -517,6 +550,55 @@ CGRect ConvertRectToGlobal(SemanticsObject* reference, CGRect local_rect) {
   return label;
 }
 
+- (bool)containsPoint:(CGPoint)point {
+  // The point is in global coordinates, so use the global rect here.
+  return CGRectContainsPoint([self globalRect], point);
+}
+
+// Finds the first eligiable semantics object in hit test order.
+- (id)search:(CGPoint)point {
+  // Search children in hit test order.
+  for (SemanticsObject* child in [self childrenInHitTestOrder]) {
+    if ([child containsPoint:point]) {
+      id childSearchResult = [child search:point];
+      if (childSearchResult != nil) {
+        return childSearchResult;
+      }
+    }
+  }
+  // Check if the current semantic object should be returned.
+  if ([self containsPoint:point] && [self isFocusable]) {
+    return self.nativeAccessibility;
+  }
+  return nil;
+}
+
+// iOS uses this method to determine the hittest results when users touch
+// explore in VoiceOver.
+//
+// For overlapping UIAccessibilityElements (e.g. a stack) in IOS, the focus
+// goes to the smallest object before IOS 16, but to the top-left object in
+// IOS 16. Overrides this method to focus the first eligiable semantics
+// object in hit test order.
+- (id)_accessibilityHitTest:(CGPoint)point withEvent:(UIEvent*)event {
+  return [self search:point];
+}
+
+// iOS calls this method when this item is swipe-to-focusd in VoiceOver.
+- (BOOL)accessibilityScrollToVisible {
+  [self showOnScreen];
+  return YES;
+}
+
+// iOS calls this method when this item is swipe-to-focusd in VoiceOver.
+- (BOOL)accessibilityScrollToVisibleWithChild:(id)child {
+  if ([child isKindOfClass:[SemanticsObject class]]) {
+    [child showOnScreen];
+    return YES;
+  }
+  return NO;
+}
+
 - (NSAttributedString*)accessibilityAttributedLabel {
   NSString* label = [self accessibilityLabel];
   if (label.length == 0) {
@@ -553,6 +635,11 @@ CGRect ConvertRectToGlobal(SemanticsObject* reference, CGRect local_rect) {
     return @([self node].value.data());
   }
 
+  // iOS does not announce values of native radio buttons.
+  if ([self node].HasFlag(flutter::SemanticsFlags::kIsInMutuallyExclusiveGroup)) {
+    return nil;
+  }
+
   // FlutterSwitchSemanticsObject should supercede these conditionals.
   if ([self node].HasFlag(flutter::SemanticsFlags::kHasToggledState) ||
       [self node].HasFlag(flutter::SemanticsFlags::kHasCheckedState)) {
@@ -693,7 +780,7 @@ CGRect ConvertRectToGlobal(SemanticsObject* reference, CGRect local_rect) {
   [self bridge]->AccessibilityObjectDidBecomeFocused([self uid]);
   if ([self node].HasFlag(flutter::SemanticsFlags::kIsHidden) ||
       [self node].HasFlag(flutter::SemanticsFlags::kIsHeader)) {
-    [self bridge]->DispatchSemanticsAction([self uid], flutter::SemanticsAction::kShowOnScreen);
+    [self showOnScreen];
   }
   if ([self node].HasAction(flutter::SemanticsAction::kDidGainAccessibilityFocus)) {
     [self bridge]->DispatchSemanticsAction([self uid],
@@ -742,7 +829,7 @@ CGRect ConvertRectToGlobal(SemanticsObject* reference, CGRect local_rect) {
       [self node].HasAction(flutter::SemanticsAction::kDecrease)) {
     traits |= UIAccessibilityTraitAdjustable;
   }
-  // FlutterSwitchSemanticsObject should supercede these conditionals.
+  // This should also capture radio buttons.
   if ([self node].HasFlag(flutter::SemanticsFlags::kHasToggledState) ||
       [self node].HasFlag(flutter::SemanticsFlags::kHasCheckedState)) {
     traits |= UIAccessibilityTraitButton;
@@ -787,9 +874,10 @@ CGRect ConvertRectToGlobal(SemanticsObject* reference, CGRect local_rect) {
 
 - (instancetype)initWithBridge:(fml::WeakPtr<flutter::AccessibilityBridgeIos>)bridge
                            uid:(int32_t)uid
-                  platformView:(nonnull UIView*)platformView {
+                  platformView:(nonnull FlutterTouchInterceptingView*)platformView {
   if (self = [super initWithBridge:bridge uid:uid]) {
     _platformView = [platformView retain];
+    [platformView setFlutterAccessibilityContainer:self];
   }
   return self;
 }
@@ -800,10 +888,8 @@ CGRect ConvertRectToGlobal(SemanticsObject* reference, CGRect local_rect) {
   [super dealloc];
 }
 
-#pragma mark - UIAccessibilityContainer overrides
-
-- (NSArray*)accessibilityElements {
-  return @[ _platformView ];
+- (id)nativeAccessibility {
+  return _platformView;
 }
 
 @end
diff --git a/shell/platform/darwin/ios/framework/Source/SemanticsObjectTest.mm b/shell/platform/darwin/ios/framework/Source/SemanticsObjectTest.mm
index bd9878772ce197337cfb56a724284eb905ef01f8..02430aad16b4b2015f692a816a83e489e69b38ed 100644
--- a/shell/platform/darwin/ios/framework/Source/SemanticsObjectTest.mm
+++ b/shell/platform/darwin/ios/framework/Source/SemanticsObjectTest.mm
@@ -6,89 +6,13 @@
 #import <XCTest/XCTest.h>
 
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterTouchInterceptingView_Test.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/SemanticsObject.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/SemanticsObjectTestMocks.h"
 
 FLUTTER_ASSERT_ARC
 
-const CGRect kScreenSize = CGRectMake(0, 0, 600, 800);
-
-namespace flutter {
-namespace {
-
-class SemanticsActionObservation {
- public:
-  SemanticsActionObservation(int32_t observed_id, SemanticsAction observed_action)
-      : id(observed_id), action(observed_action) {}
-
-  int32_t id;
-  SemanticsAction action;
-};
-
-class MockAccessibilityBridge : public AccessibilityBridgeIos {
- public:
-  MockAccessibilityBridge() : observations({}) {
-    view_ = [[UIView alloc] initWithFrame:kScreenSize];
-    window_ = [[UIWindow alloc] initWithFrame:kScreenSize];
-    [window_ addSubview:view_];
-  }
-  bool isVoiceOverRunning() const override { return isVoiceOverRunningValue; }
-  UIView* view() const override { return view_; }
-  UIView<UITextInput>* textInputView() override { return nil; }
-  void DispatchSemanticsAction(int32_t id, SemanticsAction action) override {
-    SemanticsActionObservation observation(id, action);
-    observations.push_back(observation);
-  }
-  void DispatchSemanticsAction(int32_t id,
-                               SemanticsAction action,
-                               fml::MallocMapping args) override {
-    SemanticsActionObservation observation(id, action);
-    observations.push_back(observation);
-  }
-  void AccessibilityObjectDidBecomeFocused(int32_t id) override {}
-  void AccessibilityObjectDidLoseFocus(int32_t id) override {}
-  std::shared_ptr<FlutterPlatformViewsController> GetPlatformViewsController() const override {
-    return nil;
-  }
-  std::vector<SemanticsActionObservation> observations;
-  bool isVoiceOverRunningValue;
-
- private:
-  UIView* view_;
-  UIWindow* window_;
-};
-
-class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
- public:
-  MockAccessibilityBridgeNoWindow() : observations({}) {
-    view_ = [[UIView alloc] initWithFrame:kScreenSize];
-  }
-  bool isVoiceOverRunning() const override { return isVoiceOverRunningValue; }
-  UIView* view() const override { return view_; }
-  UIView<UITextInput>* textInputView() override { return nil; }
-  void DispatchSemanticsAction(int32_t id, SemanticsAction action) override {
-    SemanticsActionObservation observation(id, action);
-    observations.push_back(observation);
-  }
-  void DispatchSemanticsAction(int32_t id,
-                               SemanticsAction action,
-                               fml::MallocMapping args) override {
-    SemanticsActionObservation observation(id, action);
-    observations.push_back(observation);
-  }
-  void AccessibilityObjectDidBecomeFocused(int32_t id) override {}
-  void AccessibilityObjectDidLoseFocus(int32_t id) override {}
-  std::shared_ptr<FlutterPlatformViewsController> GetPlatformViewsController() const override {
-    return nil;
-  }
-  std::vector<SemanticsActionObservation> observations;
-  bool isVoiceOverRunningValue;
-
- private:
-  UIView* view_;
-};
-}  // namespace
-}  // namespace flutter
-
 @interface SemanticsObjectTest : XCTestCase
 @end
 
@@ -96,7 +20,7 @@ class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
 
 - (void)testCreate {
   fml::WeakPtrFactory<flutter::AccessibilityBridgeIos> factory(
-      new flutter::MockAccessibilityBridge());
+      new flutter::testing::MockAccessibilityBridge());
   fml::WeakPtr<flutter::AccessibilityBridgeIos> bridge = factory.GetWeakPtr();
   SemanticsObject* object = [[SemanticsObject alloc] initWithBridge:bridge uid:0];
   XCTAssertNotNil(object);
@@ -104,7 +28,7 @@ class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
 
 - (void)testSetChildren {
   fml::WeakPtrFactory<flutter::AccessibilityBridgeIos> factory(
-      new flutter::MockAccessibilityBridge());
+      new flutter::testing::MockAccessibilityBridge());
   fml::WeakPtr<flutter::AccessibilityBridgeIos> bridge = factory.GetWeakPtr();
   SemanticsObject* parent = [[SemanticsObject alloc] initWithBridge:bridge uid:0];
   SemanticsObject* child = [[SemanticsObject alloc] initWithBridge:bridge uid:1];
@@ -114,9 +38,171 @@ class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
   XCTAssertNil(child.parent);
 }
 
+- (void)testAccessibilityHitTestFocusAtLeaf {
+  fml::WeakPtrFactory<flutter::AccessibilityBridgeIos> factory(
+      new flutter::testing::MockAccessibilityBridge());
+  fml::WeakPtr<flutter::AccessibilityBridgeIos> bridge = factory.GetWeakPtr();
+  SemanticsObject* object0 = [[SemanticsObject alloc] initWithBridge:bridge uid:0];
+  SemanticsObject* object1 = [[SemanticsObject alloc] initWithBridge:bridge uid:1];
+  SemanticsObject* object2 = [[SemanticsObject alloc] initWithBridge:bridge uid:2];
+  SemanticsObject* object3 = [[SemanticsObject alloc] initWithBridge:bridge uid:3];
+  object0.children = @[ object1 ];
+  object0.childrenInHitTestOrder = @[ object1 ];
+  object1.children = @[ object2, object3 ];
+  object1.childrenInHitTestOrder = @[ object2, object3 ];
+
+  flutter::SemanticsNode node0;
+  node0.id = 0;
+  node0.rect = SkRect::MakeXYWH(0, 0, 200, 200);
+  node0.label = "0";
+  [object0 setSemanticsNode:&node0];
+
+  flutter::SemanticsNode node1;
+  node1.id = 1;
+  node1.rect = SkRect::MakeXYWH(0, 0, 200, 200);
+  node1.label = "1";
+  [object1 setSemanticsNode:&node1];
+
+  flutter::SemanticsNode node2;
+  node2.id = 2;
+  node2.rect = SkRect::MakeXYWH(0, 0, 100, 100);
+  node2.label = "2";
+  [object2 setSemanticsNode:&node2];
+
+  flutter::SemanticsNode node3;
+  node3.id = 3;
+  node3.rect = SkRect::MakeXYWH(0, 0, 200, 200);
+  node3.label = "3";
+  [object3 setSemanticsNode:&node3];
+
+  CGPoint point = CGPointMake(10, 10);
+  id hitTestResult = [object0 _accessibilityHitTest:point withEvent:nil];
+
+  // Focus to object2 because it's the first object in hit test order
+  XCTAssertEqual(hitTestResult, object2);
+}
+
+- (void)testAccessibilityHitTestNoFocusableItem {
+  fml::WeakPtrFactory<flutter::AccessibilityBridgeIos> factory(
+      new flutter::testing::MockAccessibilityBridge());
+  fml::WeakPtr<flutter::AccessibilityBridgeIos> bridge = factory.GetWeakPtr();
+  SemanticsObject* object0 = [[SemanticsObject alloc] initWithBridge:bridge uid:0];
+  SemanticsObject* object1 = [[SemanticsObject alloc] initWithBridge:bridge uid:1];
+  SemanticsObject* object2 = [[SemanticsObject alloc] initWithBridge:bridge uid:2];
+  SemanticsObject* object3 = [[SemanticsObject alloc] initWithBridge:bridge uid:3];
+  object0.children = @[ object1 ];
+  object0.childrenInHitTestOrder = @[ object1 ];
+  object1.children = @[ object2, object3 ];
+  object1.childrenInHitTestOrder = @[ object2, object3 ];
+
+  flutter::SemanticsNode node0;
+  node0.id = 0;
+  node0.rect = SkRect::MakeXYWH(0, 0, 200, 200);
+  [object0 setSemanticsNode:&node0];
+
+  flutter::SemanticsNode node1;
+  node1.id = 1;
+  node1.rect = SkRect::MakeXYWH(0, 0, 200, 200);
+  [object1 setSemanticsNode:&node1];
+
+  flutter::SemanticsNode node2;
+  node2.id = 2;
+  node2.rect = SkRect::MakeXYWH(0, 0, 100, 100);
+  [object2 setSemanticsNode:&node2];
+
+  flutter::SemanticsNode node3;
+  node3.id = 3;
+  node3.rect = SkRect::MakeXYWH(0, 0, 200, 200);
+  [object3 setSemanticsNode:&node3];
+
+  CGPoint point = CGPointMake(10, 10);
+  id hitTestResult = [object0 _accessibilityHitTest:point withEvent:nil];
+
+  XCTAssertNil(hitTestResult);
+}
+
+- (void)testAccessibilityScrollToVisible {
+  fml::WeakPtrFactory<flutter::testing::MockAccessibilityBridge> factory(
+      new flutter::testing::MockAccessibilityBridge());
+  fml::WeakPtr<flutter::testing::MockAccessibilityBridge> bridge = factory.GetWeakPtr();
+  SemanticsObject* object3 = [[SemanticsObject alloc] initWithBridge:bridge uid:3];
+
+  flutter::SemanticsNode node3;
+  node3.id = 3;
+  node3.rect = SkRect::MakeXYWH(0, 0, 200, 200);
+  [object3 setSemanticsNode:&node3];
+
+  [object3 accessibilityScrollToVisible];
+
+  XCTAssertTrue(bridge->observations.size() == 1);
+  XCTAssertTrue(bridge->observations[0].id == 3);
+  XCTAssertTrue(bridge->observations[0].action == flutter::SemanticsAction::kShowOnScreen);
+}
+
+- (void)testAccessibilityScrollToVisibleWithChild {
+  fml::WeakPtrFactory<flutter::testing::MockAccessibilityBridge> factory(
+      new flutter::testing::MockAccessibilityBridge());
+  fml::WeakPtr<flutter::testing::MockAccessibilityBridge> bridge = factory.GetWeakPtr();
+  SemanticsObject* object3 = [[SemanticsObject alloc] initWithBridge:bridge uid:3];
+
+  flutter::SemanticsNode node3;
+  node3.id = 3;
+  node3.rect = SkRect::MakeXYWH(0, 0, 200, 200);
+  [object3 setSemanticsNode:&node3];
+
+  [object3 accessibilityScrollToVisibleWithChild:object3];
+
+  XCTAssertTrue(bridge->observations.size() == 1);
+  XCTAssertTrue(bridge->observations[0].id == 3);
+  XCTAssertTrue(bridge->observations[0].action == flutter::SemanticsAction::kShowOnScreen);
+}
+
+- (void)testAccessibilityHitTestOutOfRect {
+  fml::WeakPtrFactory<flutter::AccessibilityBridgeIos> factory(
+      new flutter::testing::MockAccessibilityBridge());
+  fml::WeakPtr<flutter::AccessibilityBridgeIos> bridge = factory.GetWeakPtr();
+  SemanticsObject* object0 = [[SemanticsObject alloc] initWithBridge:bridge uid:0];
+  SemanticsObject* object1 = [[SemanticsObject alloc] initWithBridge:bridge uid:1];
+  SemanticsObject* object2 = [[SemanticsObject alloc] initWithBridge:bridge uid:2];
+  SemanticsObject* object3 = [[SemanticsObject alloc] initWithBridge:bridge uid:3];
+  object0.children = @[ object1 ];
+  object0.childrenInHitTestOrder = @[ object1 ];
+  object1.children = @[ object2, object3 ];
+  object1.childrenInHitTestOrder = @[ object2, object3 ];
+
+  flutter::SemanticsNode node0;
+  node0.id = 0;
+  node0.rect = SkRect::MakeXYWH(0, 0, 200, 200);
+  node0.label = "0";
+  [object0 setSemanticsNode:&node0];
+
+  flutter::SemanticsNode node1;
+  node1.id = 1;
+  node1.rect = SkRect::MakeXYWH(0, 0, 200, 200);
+  node1.label = "1";
+  [object1 setSemanticsNode:&node1];
+
+  flutter::SemanticsNode node2;
+  node2.id = 2;
+  node2.rect = SkRect::MakeXYWH(0, 0, 100, 100);
+  node2.label = "2";
+  [object2 setSemanticsNode:&node2];
+
+  flutter::SemanticsNode node3;
+  node3.id = 3;
+  node3.rect = SkRect::MakeXYWH(0, 0, 200, 200);
+  node3.label = "3";
+  [object3 setSemanticsNode:&node3];
+
+  CGPoint point = CGPointMake(300, 300);
+  id hitTestResult = [object0 _accessibilityHitTest:point withEvent:nil];
+
+  XCTAssertNil(hitTestResult);
+}
+
 - (void)testReplaceChildAtIndex {
   fml::WeakPtrFactory<flutter::AccessibilityBridgeIos> factory(
-      new flutter::MockAccessibilityBridge());
+      new flutter::testing::MockAccessibilityBridge());
   fml::WeakPtr<flutter::AccessibilityBridgeIos> bridge = factory.GetWeakPtr();
   SemanticsObject* parent = [[SemanticsObject alloc] initWithBridge:bridge uid:0];
   SemanticsObject* child1 = [[SemanticsObject alloc] initWithBridge:bridge uid:1];
@@ -130,7 +216,7 @@ class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
 
 - (void)testPlainSemanticsObjectWithLabelHasStaticTextTrait {
   fml::WeakPtrFactory<flutter::AccessibilityBridgeIos> factory(
-      new flutter::MockAccessibilityBridge());
+      new flutter::testing::MockAccessibilityBridge());
   fml::WeakPtr<flutter::AccessibilityBridgeIos> bridge = factory.GetWeakPtr();
   flutter::SemanticsNode node;
   node.label = "foo";
@@ -141,7 +227,7 @@ class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
 
 - (void)testNodeWithImplicitScrollIsAnAccessibilityElementWhenItisHidden {
   fml::WeakPtrFactory<flutter::AccessibilityBridgeIos> factory(
-      new flutter::MockAccessibilityBridge());
+      new flutter::testing::MockAccessibilityBridge());
   fml::WeakPtr<flutter::AccessibilityBridgeIos> bridge = factory.GetWeakPtr();
   flutter::SemanticsNode node;
   node.flags = static_cast<int32_t>(flutter::SemanticsFlags::kHasImplicitScrolling) |
@@ -153,7 +239,7 @@ class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
 
 - (void)testNodeWithImplicitScrollIsNotAnAccessibilityElementWhenItisNotHidden {
   fml::WeakPtrFactory<flutter::AccessibilityBridgeIos> factory(
-      new flutter::MockAccessibilityBridge());
+      new flutter::testing::MockAccessibilityBridge());
   fml::WeakPtr<flutter::AccessibilityBridgeIos> bridge = factory.GetWeakPtr();
   flutter::SemanticsNode node;
   node.flags = static_cast<int32_t>(flutter::SemanticsFlags::kHasImplicitScrolling);
@@ -164,7 +250,7 @@ class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
 
 - (void)testIntresetingSemanticsObjectWithLabelHasStaticTextTrait {
   fml::WeakPtrFactory<flutter::AccessibilityBridgeIos> factory(
-      new flutter::MockAccessibilityBridge());
+      new flutter::testing::MockAccessibilityBridge());
   fml::WeakPtr<flutter::AccessibilityBridgeIos> bridge = factory.GetWeakPtr();
   flutter::SemanticsNode node;
   node.label = "foo";
@@ -177,7 +263,7 @@ class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
 
 - (void)testIntresetingSemanticsObjectWithLabelHasStaticTextTrait1 {
   fml::WeakPtrFactory<flutter::AccessibilityBridgeIos> factory(
-      new flutter::MockAccessibilityBridge());
+      new flutter::testing::MockAccessibilityBridge());
   fml::WeakPtr<flutter::AccessibilityBridgeIos> bridge = factory.GetWeakPtr();
   flutter::SemanticsNode node;
   node.label = "foo";
@@ -189,7 +275,7 @@ class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
 
 - (void)testIntresetingSemanticsObjectWithLabelHasStaticTextTrait2 {
   fml::WeakPtrFactory<flutter::AccessibilityBridgeIos> factory(
-      new flutter::MockAccessibilityBridge());
+      new flutter::testing::MockAccessibilityBridge());
   fml::WeakPtr<flutter::AccessibilityBridgeIos> bridge = factory.GetWeakPtr();
   flutter::SemanticsNode node;
   node.label = "foo";
@@ -201,7 +287,7 @@ class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
 
 - (void)testVerticalFlutterScrollableSemanticsObject {
   fml::WeakPtrFactory<flutter::AccessibilityBridgeIos> factory(
-      new flutter::MockAccessibilityBridge());
+      new flutter::testing::MockAccessibilityBridge());
   fml::WeakPtr<flutter::AccessibilityBridgeIos> bridge = factory.GetWeakPtr();
 
   float transformScale = 0.5f;
@@ -239,7 +325,7 @@ class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
 
 - (void)testVerticalFlutterScrollableSemanticsObjectNoWindowDoesNotCrash {
   fml::WeakPtrFactory<flutter::AccessibilityBridgeIos> factory(
-      new flutter::MockAccessibilityBridgeNoWindow());
+      new flutter::testing::MockAccessibilityBridgeNoWindow());
   fml::WeakPtr<flutter::AccessibilityBridgeIos> bridge = factory.GetWeakPtr();
 
   float transformScale = 0.5f;
@@ -267,7 +353,7 @@ class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
 
 - (void)testHorizontalFlutterScrollableSemanticsObject {
   fml::WeakPtrFactory<flutter::AccessibilityBridgeIos> factory(
-      new flutter::MockAccessibilityBridge());
+      new flutter::testing::MockAccessibilityBridge());
   fml::WeakPtr<flutter::AccessibilityBridgeIos> bridge = factory.GetWeakPtr();
 
   float transformScale = 0.5f;
@@ -305,7 +391,7 @@ class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
 
 - (void)testCanHandleInfiniteScrollExtent {
   fml::WeakPtrFactory<flutter::AccessibilityBridgeIos> factory(
-      new flutter::MockAccessibilityBridge());
+      new flutter::testing::MockAccessibilityBridge());
   fml::WeakPtr<flutter::AccessibilityBridgeIos> bridge = factory.GetWeakPtr();
 
   float transformScale = 0.5f;
@@ -344,7 +430,7 @@ class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
 
 - (void)testCanHandleNaNScrollExtentAndScrollPoisition {
   fml::WeakPtrFactory<flutter::AccessibilityBridgeIos> factory(
-      new flutter::MockAccessibilityBridge());
+      new flutter::testing::MockAccessibilityBridge());
   fml::WeakPtr<flutter::AccessibilityBridgeIos> bridge = factory.GetWeakPtr();
 
   float transformScale = 0.5f;
@@ -381,7 +467,7 @@ class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
 
 - (void)testFlutterScrollableSemanticsObjectIsNotHittestable {
   fml::WeakPtrFactory<flutter::AccessibilityBridgeIos> factory(
-      new flutter::MockAccessibilityBridge());
+      new flutter::testing::MockAccessibilityBridge());
   fml::WeakPtr<flutter::AccessibilityBridgeIos> bridge = factory.GetWeakPtr();
 
   flutter::SemanticsNode node;
@@ -400,7 +486,7 @@ class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
 }
 
 - (void)testFlutterScrollableSemanticsObjectIsHiddenWhenVoiceOverIsRunning {
-  flutter::MockAccessibilityBridge* mock = new flutter::MockAccessibilityBridge();
+  flutter::testing::MockAccessibilityBridge* mock = new flutter::testing::MockAccessibilityBridge();
   mock->isVoiceOverRunningValue = false;
   fml::WeakPtrFactory<flutter::AccessibilityBridgeIos> factory(mock);
   fml::WeakPtr<flutter::AccessibilityBridgeIos> bridge = factory.GetWeakPtr();
@@ -422,8 +508,22 @@ class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
   XCTAssertFalse(scrollView.isAccessibilityElement);
 }
 
+- (void)testFlutterSemanticsObjectHasIdentifier {
+  flutter::testing::MockAccessibilityBridge* mock = new flutter::testing::MockAccessibilityBridge();
+  mock->isVoiceOverRunningValue = true;
+  fml::WeakPtrFactory<flutter::AccessibilityBridgeIos> factory(mock);
+  fml::WeakPtr<flutter::AccessibilityBridgeIos> bridge = factory.GetWeakPtr();
+
+  flutter::SemanticsNode node;
+  node.identifier = "identifier";
+
+  FlutterSemanticsObject* object = [[FlutterSemanticsObject alloc] initWithBridge:bridge uid:0];
+  [object setSemanticsNode:&node];
+  XCTAssertTrue([object.accessibilityIdentifier isEqualToString:@"identifier"]);
+}
+
 - (void)testFlutterScrollableSemanticsObjectWithLabelValueHintIsNotHiddenWhenVoiceOverIsRunning {
-  flutter::MockAccessibilityBridge* mock = new flutter::MockAccessibilityBridge();
+  flutter::testing::MockAccessibilityBridge* mock = new flutter::testing::MockAccessibilityBridge();
   mock->isVoiceOverRunningValue = true;
   fml::WeakPtrFactory<flutter::AccessibilityBridgeIos> factory(mock);
   fml::WeakPtr<flutter::AccessibilityBridgeIos> bridge = factory.GetWeakPtr();
@@ -444,13 +544,15 @@ class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
   [scrollable accessibilityBridgeDidFinishUpdate];
   UIScrollView* scrollView = [scrollable nativeAccessibility];
   XCTAssertTrue(scrollView.isAccessibilityElement);
-  XCTAssertTrue([scrollView.accessibilityLabel isEqualToString:@"label"]);
-  XCTAssertTrue([scrollView.accessibilityValue isEqualToString:@"value"]);
-  XCTAssertTrue([scrollView.accessibilityHint isEqualToString:@"hint"]);
+  XCTAssertTrue(
+      [scrollView.accessibilityLabel isEqualToString:NSLocalizedString(@"label", @"test")]);
+  XCTAssertTrue(
+      [scrollView.accessibilityValue isEqualToString:NSLocalizedString(@"value", @"test")]);
+  XCTAssertTrue([scrollView.accessibilityHint isEqualToString:NSLocalizedString(@"hint", @"test")]);
 }
 
 - (void)testFlutterSemanticsObjectMergeTooltipToLabel {
-  flutter::MockAccessibilityBridge* mock = new flutter::MockAccessibilityBridge();
+  flutter::testing::MockAccessibilityBridge* mock = new flutter::testing::MockAccessibilityBridge();
   mock->isVoiceOverRunningValue = true;
   fml::WeakPtrFactory<flutter::AccessibilityBridgeIos> factory(mock);
   fml::WeakPtr<flutter::AccessibilityBridgeIos> bridge = factory.GetWeakPtr();
@@ -466,7 +568,7 @@ class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
 }
 
 - (void)testFlutterSemanticsObjectAttributedStringsDoNotCrashWhenEmpty {
-  flutter::MockAccessibilityBridge* mock = new flutter::MockAccessibilityBridge();
+  flutter::testing::MockAccessibilityBridge* mock = new flutter::testing::MockAccessibilityBridge();
   mock->isVoiceOverRunningValue = true;
   fml::WeakPtrFactory<flutter::AccessibilityBridgeIos> factory(mock);
   fml::WeakPtr<flutter::AccessibilityBridgeIos> bridge = factory.GetWeakPtr();
@@ -479,7 +581,7 @@ class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
 }
 
 - (void)testFlutterScrollableSemanticsObjectReturnsParentContainerIfNoChildren {
-  flutter::MockAccessibilityBridge* mock = new flutter::MockAccessibilityBridge();
+  flutter::testing::MockAccessibilityBridge* mock = new flutter::testing::MockAccessibilityBridge();
   mock->isVoiceOverRunningValue = true;
   fml::WeakPtrFactory<flutter::AccessibilityBridgeIos> factory(mock);
   fml::WeakPtr<flutter::AccessibilityBridgeIos> bridge = factory.GetWeakPtr();
@@ -523,7 +625,7 @@ class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
 
 - (void)testFlutterScrollableSemanticsObjectHidesScrollBar {
   fml::WeakPtrFactory<flutter::AccessibilityBridgeIos> factory(
-      new flutter::MockAccessibilityBridge());
+      new flutter::testing::MockAccessibilityBridge());
   fml::WeakPtr<flutter::AccessibilityBridgeIos> bridge = factory.GetWeakPtr();
 
   flutter::SemanticsNode node;
@@ -545,7 +647,7 @@ class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
 
 - (void)testSemanticsObjectBuildsAttributedString {
   fml::WeakPtrFactory<flutter::AccessibilityBridgeIos> factory(
-      new flutter::MockAccessibilityBridge());
+      new flutter::testing::MockAccessibilityBridge());
   fml::WeakPtr<flutter::AccessibilityBridgeIos> bridge = factory.GetWeakPtr();
   flutter::SemanticsNode node;
   node.label = "label";
@@ -572,7 +674,7 @@ class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
   FlutterSemanticsObject* object = [[FlutterSemanticsObject alloc] initWithBridge:bridge uid:0];
   [object setSemanticsNode:&node];
   NSMutableAttributedString* expectedAttributedLabel =
-      [[NSMutableAttributedString alloc] initWithString:@"label"];
+      [[NSMutableAttributedString alloc] initWithString:NSLocalizedString(@"label", @"test")];
   NSDictionary* attributeDict = @{
     UIAccessibilitySpeechAttributeSpellOut : @YES,
   };
@@ -581,7 +683,7 @@ class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
       [object.accessibilityAttributedLabel isEqualToAttributedString:expectedAttributedLabel]);
 
   NSMutableAttributedString* expectedAttributedValue =
-      [[NSMutableAttributedString alloc] initWithString:@"value"];
+      [[NSMutableAttributedString alloc] initWithString:NSLocalizedString(@"value", @"test")];
   attributeDict = @{
     UIAccessibilitySpeechAttributeSpellOut : @YES,
   };
@@ -590,7 +692,7 @@ class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
       [object.accessibilityAttributedValue isEqualToAttributedString:expectedAttributedValue]);
 
   NSMutableAttributedString* expectedAttributedHint =
-      [[NSMutableAttributedString alloc] initWithString:@"hint"];
+      [[NSMutableAttributedString alloc] initWithString:NSLocalizedString(@"hint", @"test")];
   attributeDict = @{
     UIAccessibilitySpeechAttributeLanguage : @"en-MX",
   };
@@ -601,7 +703,7 @@ class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
 
 - (void)testShouldTriggerAnnouncement {
   fml::WeakPtrFactory<flutter::AccessibilityBridgeIos> factory(
-      new flutter::MockAccessibilityBridge());
+      new flutter::testing::MockAccessibilityBridge());
   fml::WeakPtr<flutter::AccessibilityBridgeIos> bridge = factory.GetWeakPtr();
   SemanticsObject* object = [[SemanticsObject alloc] initWithBridge:bridge uid:0];
 
@@ -638,9 +740,9 @@ class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
 }
 
 - (void)testShouldDispatchShowOnScreenActionForHeader {
-  fml::WeakPtrFactory<flutter::MockAccessibilityBridge> factory(
-      new flutter::MockAccessibilityBridge());
-  fml::WeakPtr<flutter::MockAccessibilityBridge> bridge = factory.GetWeakPtr();
+  fml::WeakPtrFactory<flutter::testing::MockAccessibilityBridge> factory(
+      new flutter::testing::MockAccessibilityBridge());
+  fml::WeakPtr<flutter::testing::MockAccessibilityBridge> bridge = factory.GetWeakPtr();
   SemanticsObject* object = [[SemanticsObject alloc] initWithBridge:bridge uid:1];
 
   // Handle initial setting of node with header.
@@ -659,9 +761,9 @@ class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
 }
 
 - (void)testShouldDispatchShowOnScreenActionForHidden {
-  fml::WeakPtrFactory<flutter::MockAccessibilityBridge> factory(
-      new flutter::MockAccessibilityBridge());
-  fml::WeakPtr<flutter::MockAccessibilityBridge> bridge = factory.GetWeakPtr();
+  fml::WeakPtrFactory<flutter::testing::MockAccessibilityBridge> factory(
+      new flutter::testing::MockAccessibilityBridge());
+  fml::WeakPtr<flutter::testing::MockAccessibilityBridge> bridge = factory.GetWeakPtr();
   SemanticsObject* object = [[SemanticsObject alloc] initWithBridge:bridge uid:1];
 
   // Handle initial setting of node with hidden.
@@ -679,31 +781,10 @@ class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
   XCTAssertTrue(bridge->observations[0].action == flutter::SemanticsAction::kShowOnScreen);
 }
 
-- (void)testFlutterPlatformViewSemanticsContainer {
-  fml::WeakPtrFactory<flutter::MockAccessibilityBridge> factory(
-      new flutter::MockAccessibilityBridge());
-  fml::WeakPtr<flutter::MockAccessibilityBridge> bridge = factory.GetWeakPtr();
-  __weak UIView* weakPlatformView;
-  @autoreleasepool {
-    UIView* platformView = [[UIView alloc] init];
-
-    FlutterPlatformViewSemanticsContainer* container =
-        [[FlutterPlatformViewSemanticsContainer alloc] initWithBridge:bridge
-                                                                  uid:1
-                                                         platformView:platformView];
-    XCTAssertEqualObjects(container.accessibilityElements, @[ platformView ]);
-    weakPlatformView = platformView;
-    XCTAssertNotNil(weakPlatformView);
-  }
-  // Check if there's no more strong references to `platformView` after container and platformView
-  // are released.
-  XCTAssertNil(weakPlatformView);
-}
-
 - (void)testFlutterSwitchSemanticsObjectMatchesUISwitch {
-  fml::WeakPtrFactory<flutter::MockAccessibilityBridge> factory(
-      new flutter::MockAccessibilityBridge());
-  fml::WeakPtr<flutter::MockAccessibilityBridge> bridge = factory.GetWeakPtr();
+  fml::WeakPtrFactory<flutter::testing::MockAccessibilityBridge> factory(
+      new flutter::testing::MockAccessibilityBridge());
+  fml::WeakPtr<flutter::testing::MockAccessibilityBridge> bridge = factory.GetWeakPtr();
   FlutterSwitchSemanticsObject* object = [[FlutterSwitchSemanticsObject alloc] initWithBridge:bridge
                                                                                           uid:1];
 
@@ -719,7 +800,7 @@ class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
   nativeSwitch.on = YES;
 
   XCTAssertEqual(object.accessibilityTraits, nativeSwitch.accessibilityTraits);
-  XCTAssertEqual(object.accessibilityValue, nativeSwitch.accessibilityValue);
+  XCTAssertEqualObjects(object.accessibilityValue, nativeSwitch.accessibilityValue);
 
   // Set the toggled to false;
   flutter::SemanticsNode update;
@@ -731,13 +812,31 @@ class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
   nativeSwitch.on = NO;
 
   XCTAssertEqual(object.accessibilityTraits, nativeSwitch.accessibilityTraits);
-  XCTAssertEqual(object.accessibilityValue, nativeSwitch.accessibilityValue);
+  XCTAssertEqualObjects(object.accessibilityValue, nativeSwitch.accessibilityValue);
+}
+
+- (void)testFlutterSemanticsObjectOfRadioButton {
+  fml::WeakPtrFactory<flutter::testing::MockAccessibilityBridge> factory(
+      new flutter::testing::MockAccessibilityBridge());
+  fml::WeakPtr<flutter::testing::MockAccessibilityBridge> bridge = factory.GetWeakPtr();
+  FlutterSemanticsObject* object = [[FlutterSemanticsObject alloc] initWithBridge:bridge uid:0];
+
+  // Handle initial setting of node with header.
+  flutter::SemanticsNode node;
+  node.flags = static_cast<int32_t>(flutter::SemanticsFlags::kIsInMutuallyExclusiveGroup) |
+               static_cast<int32_t>(flutter::SemanticsFlags::kHasCheckedState) |
+               static_cast<int32_t>(flutter::SemanticsFlags::kHasEnabledState) |
+               static_cast<int32_t>(flutter::SemanticsFlags::kIsEnabled);
+  node.label = "foo";
+  [object setSemanticsNode:&node];
+  XCTAssertTrue((object.accessibilityTraits & UIAccessibilityTraitButton) > 0);
+  XCTAssertNil(object.accessibilityValue);
 }
 
 - (void)testFlutterSwitchSemanticsObjectMatchesUISwitchDisabled {
-  fml::WeakPtrFactory<flutter::MockAccessibilityBridge> factory(
-      new flutter::MockAccessibilityBridge());
-  fml::WeakPtr<flutter::MockAccessibilityBridge> bridge = factory.GetWeakPtr();
+  fml::WeakPtrFactory<flutter::testing::MockAccessibilityBridge> factory(
+      new flutter::testing::MockAccessibilityBridge());
+  fml::WeakPtr<flutter::testing::MockAccessibilityBridge> bridge = factory.GetWeakPtr();
   FlutterSwitchSemanticsObject* object = [[FlutterSwitchSemanticsObject alloc] initWithBridge:bridge
                                                                                           uid:1];
 
@@ -753,12 +852,12 @@ class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
   nativeSwitch.enabled = NO;
 
   XCTAssertEqual(object.accessibilityTraits, nativeSwitch.accessibilityTraits);
-  XCTAssertEqual(object.accessibilityValue, nativeSwitch.accessibilityValue);
+  XCTAssertEqualObjects(object.accessibilityValue, nativeSwitch.accessibilityValue);
 }
 
 - (void)testSemanticsObjectDeallocated {
   fml::WeakPtrFactory<flutter::AccessibilityBridgeIos> factory(
-      new flutter::MockAccessibilityBridge());
+      new flutter::testing::MockAccessibilityBridge());
   fml::WeakPtr<flutter::AccessibilityBridgeIos> bridge = factory.GetWeakPtr();
   SemanticsObject* parent = [[SemanticsObject alloc] initWithBridge:bridge uid:0];
   SemanticsObject* child = [[SemanticsObject alloc] initWithBridge:bridge uid:1];
@@ -805,7 +904,8 @@ class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
   parent.childrenInTraversalOrder.push_back(2);
 
   {
-    flutter::MockAccessibilityBridge* mock = new flutter::MockAccessibilityBridge();
+    flutter::testing::MockAccessibilityBridge* mock =
+        new flutter::testing::MockAccessibilityBridge();
     mock->isVoiceOverRunningValue = true;
     fml::WeakPtrFactory<flutter::AccessibilityBridgeIos> factory(mock);
     fml::WeakPtr<flutter::AccessibilityBridgeIos> bridge = factory.GetWeakPtr();
@@ -839,4 +939,73 @@ class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
   XCTAssertNil(object2.accessibilityContainer);
 }
 
+- (void)testAccessibilityHitTestSearchCanReturnPlatformView {
+  fml::WeakPtrFactory<flutter::AccessibilityBridgeIos> factory(
+      new flutter::testing::MockAccessibilityBridge());
+  fml::WeakPtr<flutter::AccessibilityBridgeIos> bridge = factory.GetWeakPtr();
+  SemanticsObject* object0 = [[SemanticsObject alloc] initWithBridge:bridge uid:0];
+  SemanticsObject* object1 = [[SemanticsObject alloc] initWithBridge:bridge uid:1];
+  SemanticsObject* object3 = [[SemanticsObject alloc] initWithBridge:bridge uid:3];
+  FlutterTouchInterceptingView* platformView =
+      [[FlutterTouchInterceptingView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
+  FlutterPlatformViewSemanticsContainer* platformViewSemanticsContainer =
+      [[FlutterPlatformViewSemanticsContainer alloc] initWithBridge:bridge
+                                                                uid:1
+                                                       platformView:platformView];
+
+  object0.children = @[ object1 ];
+  object0.childrenInHitTestOrder = @[ object1 ];
+  object1.children = @[ platformViewSemanticsContainer, object3 ];
+  object1.childrenInHitTestOrder = @[ platformViewSemanticsContainer, object3 ];
+
+  flutter::SemanticsNode node0;
+  node0.id = 0;
+  node0.rect = SkRect::MakeXYWH(0, 0, 200, 200);
+  node0.label = "0";
+  [object0 setSemanticsNode:&node0];
+
+  flutter::SemanticsNode node1;
+  node1.id = 1;
+  node1.rect = SkRect::MakeXYWH(0, 0, 200, 200);
+  node1.label = "1";
+  [object1 setSemanticsNode:&node1];
+
+  flutter::SemanticsNode node2;
+  node2.id = 2;
+  node2.rect = SkRect::MakeXYWH(0, 0, 100, 100);
+  node2.label = "2";
+  [platformViewSemanticsContainer setSemanticsNode:&node2];
+
+  flutter::SemanticsNode node3;
+  node3.id = 3;
+  node3.rect = SkRect::MakeXYWH(0, 0, 200, 200);
+  node3.label = "3";
+  [object3 setSemanticsNode:&node3];
+
+  CGPoint point = CGPointMake(10, 10);
+  id hitTestResult = [object0 _accessibilityHitTest:point withEvent:nil];
+
+  XCTAssertEqual(hitTestResult, platformView);
+}
+
+- (void)testFlutterPlatformViewSemanticsContainer {
+  fml::WeakPtrFactory<flutter::testing::MockAccessibilityBridge> factory(
+      new flutter::testing::MockAccessibilityBridge());
+  fml::WeakPtr<flutter::testing::MockAccessibilityBridge> bridge = factory.GetWeakPtr();
+  __weak FlutterTouchInterceptingView* weakPlatformView;
+  @autoreleasepool {
+    FlutterTouchInterceptingView* platformView = [[FlutterTouchInterceptingView alloc] init];
+    weakPlatformView = platformView;
+    FlutterPlatformViewSemanticsContainer* container =
+        [[FlutterPlatformViewSemanticsContainer alloc] initWithBridge:bridge
+                                                                  uid:1
+                                                         platformView:platformView];
+    XCTAssertEqualObjects(platformView.accessibilityContainer, container);
+    XCTAssertNotNil(weakPlatformView);
+  }
+  // Check if there's no more strong references to `platformView` after container and platformView
+  // are released.
+  XCTAssertNil(weakPlatformView);
+}
+
 @end
diff --git a/shell/platform/darwin/ios/framework/Source/SemanticsObjectTestMocks.h b/shell/platform/darwin/ios/framework/Source/SemanticsObjectTestMocks.h
new file mode 100644
index 0000000000000000000000000000000000000000..9813d435a1f8322c648cc29f3909e503d5b7f05a
--- /dev/null
+++ b/shell/platform/darwin/ios/framework/Source/SemanticsObjectTestMocks.h
@@ -0,0 +1,95 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_SEMANTICSOBJECTTESTMOCKS_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_SEMANTICSOBJECTTESTMOCKS_H_
+
+#import "flutter/shell/platform/darwin/ios/framework/Source/SemanticsObject.h"
+
+const CGRect kScreenSize = CGRectMake(0, 0, 600, 800);
+
+namespace flutter {
+namespace testing {
+
+class SemanticsActionObservation {
+ public:
+  SemanticsActionObservation(int32_t observed_id, SemanticsAction observed_action)
+      : id(observed_id), action(observed_action) {}
+
+  int32_t id;
+  SemanticsAction action;
+};
+
+class MockAccessibilityBridge : public AccessibilityBridgeIos {
+ public:
+  MockAccessibilityBridge() : observations({}) {
+    view_ = [[UIView alloc] initWithFrame:kScreenSize];
+    window_ = [[UIWindow alloc] initWithFrame:kScreenSize];
+    [window_ addSubview:view_];
+  }
+  bool isVoiceOverRunning() const override { return isVoiceOverRunningValue; }
+  UIView* view() const override { return view_; }
+  UIView<UITextInput>* textInputView() override { return nil; }
+  void DispatchSemanticsAction(int32_t id, SemanticsAction action) override {
+    SemanticsActionObservation observation(id, action);
+    observations.push_back(observation);
+  }
+  void DispatchSemanticsAction(int32_t id,
+                               SemanticsAction action,
+                               fml::MallocMapping args) override {
+    SemanticsActionObservation observation(id, action);
+    observations.push_back(observation);
+  }
+  void AccessibilityObjectDidBecomeFocused(int32_t id) override {}
+  void AccessibilityObjectDidLoseFocus(int32_t id) override {}
+  std::shared_ptr<FlutterPlatformViewsController> GetPlatformViewsController() const override {
+    return nil;
+  }
+  std::vector<SemanticsActionObservation> observations;
+  bool isVoiceOverRunningValue;
+
+ private:
+  UIView* view_;
+  UIWindow* window_;
+};
+
+class MockAccessibilityBridgeNoWindow : public AccessibilityBridgeIos {
+ public:
+  MockAccessibilityBridgeNoWindow() : observations({}) {
+    view_ = [[UIView alloc] initWithFrame:kScreenSize];
+  }
+  bool isVoiceOverRunning() const override { return isVoiceOverRunningValue; }
+  UIView* view() const override { return view_; }
+  UIView<UITextInput>* textInputView() override { return nil; }
+  void DispatchSemanticsAction(int32_t id, SemanticsAction action) override {
+    SemanticsActionObservation observation(id, action);
+    observations.push_back(observation);
+  }
+  void DispatchSemanticsAction(int32_t id,
+                               SemanticsAction action,
+                               fml::MallocMapping args) override {
+    SemanticsActionObservation observation(id, action);
+    observations.push_back(observation);
+  }
+  void AccessibilityObjectDidBecomeFocused(int32_t id) override {}
+  void AccessibilityObjectDidLoseFocus(int32_t id) override {}
+  std::shared_ptr<FlutterPlatformViewsController> GetPlatformViewsController() const override {
+    return nil;
+  }
+  std::vector<SemanticsActionObservation> observations;
+  bool isVoiceOverRunningValue;
+
+ private:
+  UIView* view_;
+};
+}  // namespace testing
+}  // namespace flutter
+
+@interface SemanticsObject (Tests)
+- (BOOL)accessibilityScrollToVisible;
+- (BOOL)accessibilityScrollToVisibleWithChild:(id)child;
+- (id)_accessibilityHitTest:(CGPoint)point withEvent:(UIEvent*)event;
+@end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_SEMANTICSOBJECTTESTMOCKS_H_
diff --git a/shell/platform/darwin/ios/framework/Source/UIViewController+FlutterScreenAndSceneIfLoaded.h b/shell/platform/darwin/ios/framework/Source/UIViewController+FlutterScreenAndSceneIfLoaded.h
new file mode 100644
index 0000000000000000000000000000000000000000..d8ef23dcde98e446817e324e78266d1afffebe62
--- /dev/null
+++ b/shell/platform/darwin/ios/framework/Source/UIViewController+FlutterScreenAndSceneIfLoaded.h
@@ -0,0 +1,21 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_UIVIEWCONTROLLER_FLUTTERSCREENANDSCENEIFLOADED_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_UIVIEWCONTROLLER_FLUTTERSCREENANDSCENEIFLOADED_H_
+
+#import <UIKit/UIKit.h>
+
+@interface UIViewController (FlutterScreenAndSceneIfLoaded)
+
+/// Returns a UIWindowScene if the UIViewController's view is loaded, and nil otherwise.
+- (UIWindowScene*)flutterWindowSceneIfViewLoaded API_AVAILABLE(ios(13.0));
+
+/// Before iOS 13, returns the main screen; After iOS 13, returns the screen the UIViewController is
+/// attached to if its view is loaded, and nil otherwise.
+- (UIScreen*)flutterScreenIfViewLoaded;
+
+@end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_UIVIEWCONTROLLER_FLUTTERSCREENANDSCENEIFLOADED_H_
diff --git a/shell/platform/darwin/ios/framework/Source/UIViewController+FlutterScreenAndSceneIfLoaded.mm b/shell/platform/darwin/ios/framework/Source/UIViewController+FlutterScreenAndSceneIfLoaded.mm
new file mode 100644
index 0000000000000000000000000000000000000000..5eb4f7110305644a50cf4a2b841c15d843f03b6b
--- /dev/null
+++ b/shell/platform/darwin/ios/framework/Source/UIViewController+FlutterScreenAndSceneIfLoaded.mm
@@ -0,0 +1,30 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "flutter/shell/platform/darwin/ios/framework/Source/UIViewController+FlutterScreenAndSceneIfLoaded.h"
+
+#include "flutter/fml/logging.h"
+
+@implementation UIViewController (FlutterScreenAndSceneIfLoaded)
+
+- (UIWindowScene*)flutterWindowSceneIfViewLoaded {
+  if (self.viewIfLoaded == nil) {
+    FML_LOG(WARNING) << "Trying to access the window scene before the view is loaded.";
+    return nil;
+  }
+  return self.viewIfLoaded.window.windowScene;
+}
+
+- (UIScreen*)flutterScreenIfViewLoaded {
+  if (@available(iOS 13.0, *)) {
+    if (self.viewIfLoaded == nil) {
+      FML_LOG(WARNING) << "Trying to access the screen before the view is loaded.";
+      return nil;
+    }
+    return [self flutterWindowSceneIfViewLoaded].screen;
+  }
+  return UIScreen.mainScreen;
+}
+
+@end
diff --git a/shell/platform/darwin/ios/framework/Source/UIViewController_FlutterScreenAndSceneIfLoadedTest.mm b/shell/platform/darwin/ios/framework/Source/UIViewController_FlutterScreenAndSceneIfLoadedTest.mm
new file mode 100644
index 0000000000000000000000000000000000000000..c68e22da6bcac8c985a7efb684754f7b55cc26ff
--- /dev/null
+++ b/shell/platform/darwin/ios/framework/Source/UIViewController_FlutterScreenAndSceneIfLoadedTest.mm
@@ -0,0 +1,81 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import <XCTest/XCTest.h>
+
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/UIViewController+FlutterScreenAndSceneIfLoaded.h"
+
+FLUTTER_ASSERT_ARC
+
+@interface UIViewController_FlutterViewAndSceneIfLoadedTest : XCTestCase
+@end
+
+@implementation UIViewController_FlutterViewAndSceneIfLoadedTest
+
+- (void)testWindowSceneIfViewLoadedReturnsWindowSceneIfViewLoaded {
+  if (@available(iOS 13.0, *)) {
+    UIViewController* viewController = [[UIViewController alloc] initWithNibName:nil bundle:nil];
+
+    NSSet<UIScene*>* scenes = UIApplication.sharedApplication.connectedScenes;
+    XCTAssertEqual(scenes.count, 1UL, @"There must only be 1 scene for test");
+    UIScene* scene = scenes.anyObject;
+    XCTAssert([scene isKindOfClass:[UIWindowScene class]], @"Must be a window scene for test");
+    UIWindowScene* windowScene = (UIWindowScene*)scene;
+    XCTAssert(windowScene.windows.count > 0, @"There must be at least 1 window for test");
+    UIWindow* window = windowScene.windows[0];
+    [window addSubview:viewController.view];
+
+    [viewController loadView];
+    XCTAssertEqual(viewController.flutterWindowSceneIfViewLoaded, windowScene,
+                   @"Must return the correct window scene when view loaded");
+  }
+}
+
+- (void)testWindowSceneIfViewLoadedReturnsNilIfViewNotLoaded {
+  if (@available(iOS 13.0, *)) {
+    UIViewController* viewController = [[UIViewController alloc] initWithNibName:nil bundle:nil];
+    XCTAssertNil(viewController.flutterWindowSceneIfViewLoaded,
+                 @"Must return nil window scene when view not loaded");
+  }
+}
+
+- (void)testScreenIfViewLoadedReturnsMainScreenBeforeIOS13 {
+  if (@available(iOS 13.0, *)) {
+    return;
+  }
+
+  UIViewController* viewController = [[UIViewController alloc] initWithNibName:nil bundle:nil];
+  XCTAssertEqual(viewController.flutterScreenIfViewLoaded, UIScreen.mainScreen,
+                 @"Must return UIScreen.mainScreen before iOS 13");
+}
+
+- (void)testScreenIfViewLoadedReturnsScreenIfViewLoadedAfterIOS13 {
+  if (@available(iOS 13.0, *)) {
+    UIViewController* viewController = [[UIViewController alloc] initWithNibName:nil bundle:nil];
+
+    NSSet<UIScene*>* scenes = UIApplication.sharedApplication.connectedScenes;
+    XCTAssertEqual(scenes.count, 1UL, @"There must only be 1 scene for test");
+    UIScene* scene = scenes.anyObject;
+    XCTAssert([scene isKindOfClass:[UIWindowScene class]], @"Must be a window scene for test");
+    UIWindowScene* windowScene = (UIWindowScene*)scene;
+    XCTAssert(windowScene.windows.count > 0, @"There must be at least 1 window for test");
+    UIWindow* window = windowScene.windows[0];
+    [window addSubview:viewController.view];
+
+    [viewController loadView];
+    XCTAssertEqual(viewController.flutterScreenIfViewLoaded, windowScene.screen,
+                   @"Must return the correct screen when view loaded");
+  }
+}
+
+- (void)testScreenIfViewLoadedReturnsNilIfViewNotLoadedAfterIOS13 {
+  if (@available(iOS 13.0, *)) {
+    UIViewController* viewController = [[UIViewController alloc] initWithNibName:nil bundle:nil];
+    XCTAssertNil(viewController.flutterScreenIfViewLoaded,
+                 @"Must return nil screen when view not loaded");
+  }
+}
+
+@end
diff --git a/shell/platform/darwin/ios/framework/Source/VsyncWaiterIosTest.mm b/shell/platform/darwin/ios/framework/Source/VsyncWaiterIosTest.mm
index 15d3f6df652bac633d43f5aacc2e3e523b840132..c4a98258b8fbb7c4b668477f3567933abc3c8d20 100644
--- a/shell/platform/darwin/ios/framework/Source/VsyncWaiterIosTest.mm
+++ b/shell/platform/darwin/ios/framework/Source/VsyncWaiterIosTest.mm
@@ -5,14 +5,15 @@
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
 
+#include "flutter/fml/raster_thread_merger.h"
 #include "flutter/fml/thread.h"
 
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.h"
 
-FLUTTER_ASSERT_NOT_ARC
+FLUTTER_ASSERT_ARC
 namespace {
-fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
+fml::RefPtr<fml::TaskRunner> CreateNewThread(const std::string& name) {
   auto thread = std::make_unique<fml::Thread>(name);
   auto runner = thread->GetTaskRunner();
   return runner;
@@ -33,10 +34,9 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
 
 - (void)testSetAllowPauseAfterVsyncCorrect {
   auto thread_task_runner = CreateNewThread("VsyncWaiterIosTest");
-  VSyncClient* vsyncClient = [[[VSyncClient alloc]
+  VSyncClient* vsyncClient = [[VSyncClient alloc]
       initWithTaskRunner:thread_task_runner
-                callback:[](std::unique_ptr<flutter::FrameTimingsRecorder> recorder) {}]
-      autorelease];
+                callback:[](std::unique_ptr<flutter::FrameTimingsRecorder> recorder) {}];
   CADisplayLink* link = [vsyncClient getDisplayLink];
   vsyncClient.allowPauseAfterVsync = NO;
   [vsyncClient await];
@@ -47,8 +47,6 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   [vsyncClient await];
   [vsyncClient onDisplayLink:link];
   XCTAssertTrue(link.isPaused);
-
-  [vsyncClient release];
 }
 
 - (void)testSetCorrectVariableRefreshRates {
@@ -61,17 +59,16 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   double maxFrameRate = 120;
   [[[mockDisplayLinkManager stub] andReturnValue:@(maxFrameRate)] displayRefreshRate];
 
-  VSyncClient* vsyncClient = [[[VSyncClient alloc] initWithTaskRunner:thread_task_runner
-                                                             callback:callback] autorelease];
+  VSyncClient* vsyncClient = [[VSyncClient alloc] initWithTaskRunner:thread_task_runner
+                                                            callback:callback];
   CADisplayLink* link = [vsyncClient getDisplayLink];
   if (@available(iOS 15.0, *)) {
-    XCTAssertEqual(link.preferredFrameRateRange.maximum, maxFrameRate);
-    XCTAssertEqual(link.preferredFrameRateRange.preferred, maxFrameRate);
-    XCTAssertEqual(link.preferredFrameRateRange.minimum, maxFrameRate / 2);
+    XCTAssertEqualWithAccuracy(link.preferredFrameRateRange.maximum, maxFrameRate, 0.1);
+    XCTAssertEqualWithAccuracy(link.preferredFrameRateRange.preferred, maxFrameRate, 0.1);
+    XCTAssertEqualWithAccuracy(link.preferredFrameRateRange.minimum, maxFrameRate / 2, 0.1);
   } else {
-    XCTAssertEqual(link.preferredFramesPerSecond, maxFrameRate);
+    XCTAssertEqualWithAccuracy(link.preferredFramesPerSecond, maxFrameRate, 0.1);
   }
-  [vsyncClient release];
 }
 
 - (void)testDoNotSetVariableRefreshRatesIfCADisableMinimumFrameDurationOnPhoneIsNotOn {
@@ -84,17 +81,16 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   double maxFrameRate = 120;
   [[[mockDisplayLinkManager stub] andReturnValue:@(maxFrameRate)] displayRefreshRate];
 
-  VSyncClient* vsyncClient = [[[VSyncClient alloc] initWithTaskRunner:thread_task_runner
-                                                             callback:callback] autorelease];
+  VSyncClient* vsyncClient = [[VSyncClient alloc] initWithTaskRunner:thread_task_runner
+                                                            callback:callback];
   CADisplayLink* link = [vsyncClient getDisplayLink];
   if (@available(iOS 15.0, *)) {
-    XCTAssertEqual(link.preferredFrameRateRange.maximum, 0);
-    XCTAssertEqual(link.preferredFrameRateRange.preferred, 0);
-    XCTAssertEqual(link.preferredFrameRateRange.minimum, 0);
+    XCTAssertEqualWithAccuracy(link.preferredFrameRateRange.maximum, 0, 0.1);
+    XCTAssertEqualWithAccuracy(link.preferredFrameRateRange.preferred, 0, 0.1);
+    XCTAssertEqualWithAccuracy(link.preferredFrameRateRange.minimum, 0, 0.1);
   } else {
-    XCTAssertEqual(link.preferredFramesPerSecond, 0);
+    XCTAssertEqualWithAccuracy(link.preferredFramesPerSecond, 0, 0.1);
   }
-  [vsyncClient release];
 }
 
 - (void)testDoNotSetVariableRefreshRatesIfCADisableMinimumFrameDurationOnPhoneIsNotSet {
@@ -103,25 +99,23 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   id mockDisplayLinkManager = [OCMockObject mockForClass:[DisplayLinkManager class]];
   double maxFrameRate = 120;
   [[[mockDisplayLinkManager stub] andReturnValue:@(maxFrameRate)] displayRefreshRate];
-  VSyncClient* vsyncClient = [[[VSyncClient alloc] initWithTaskRunner:thread_task_runner
-                                                             callback:callback] autorelease];
+  VSyncClient* vsyncClient = [[VSyncClient alloc] initWithTaskRunner:thread_task_runner
+                                                            callback:callback];
   CADisplayLink* link = [vsyncClient getDisplayLink];
   if (@available(iOS 15.0, *)) {
-    XCTAssertEqual(link.preferredFrameRateRange.maximum, 0);
-    XCTAssertEqual(link.preferredFrameRateRange.preferred, 0);
-    XCTAssertEqual(link.preferredFrameRateRange.minimum, 0);
+    XCTAssertEqualWithAccuracy(link.preferredFrameRateRange.maximum, 0, 0.1);
+    XCTAssertEqualWithAccuracy(link.preferredFrameRateRange.preferred, 0, 0.1);
+    XCTAssertEqualWithAccuracy(link.preferredFrameRateRange.minimum, 0, 0.1);
   } else {
-    XCTAssertEqual(link.preferredFramesPerSecond, 0);
+    XCTAssertEqualWithAccuracy(link.preferredFramesPerSecond, 0, 0.1);
   }
-  [vsyncClient release];
 }
 
 - (void)testAwaitAndPauseWillWorkCorrectly {
   auto thread_task_runner = CreateNewThread("VsyncWaiterIosTest");
-  VSyncClient* vsyncClient = [[[VSyncClient alloc]
+  VSyncClient* vsyncClient = [[VSyncClient alloc]
       initWithTaskRunner:thread_task_runner
-                callback:[](std::unique_ptr<flutter::FrameTimingsRecorder> recorder) {}]
-      autorelease];
+                callback:[](std::unique_ptr<flutter::FrameTimingsRecorder> recorder) {}];
 
   CADisplayLink* link = [vsyncClient getDisplayLink];
   XCTAssertTrue(link.isPaused);
@@ -131,8 +125,6 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
 
   [vsyncClient pause];
   XCTAssertTrue(link.isPaused);
-
-  [vsyncClient release];
 }
 
 @end
diff --git a/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h b/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h
index bebb2e7e699c1266723044a75ffab74aaf09766c..c117b83593f105688af266f45149f7bb6d7150c6 100644
--- a/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h
+++ b/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_ACCESSIBILITY_BRIDGE_H_
-#define SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_ACCESSIBILITY_BRIDGE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_ACCESSIBILITY_BRIDGE_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_ACCESSIBILITY_BRIDGE_H_
 
 #import <UIKit/UIKit.h>
 
@@ -57,6 +57,7 @@ class AccessibilityBridge final : public AccessibilityBridgeIos {
 
   void UpdateSemantics(flutter::SemanticsNodeUpdates nodes,
                        const flutter::CustomAccessibilityActionUpdates& actions);
+  void HandleEvent(NSDictionary<NSString*, id>* annotatedEvent);
   void DispatchSemanticsAction(int32_t id, flutter::SemanticsAction action) override;
   void DispatchSemanticsAction(int32_t id,
                                flutter::SemanticsAction action,
@@ -88,7 +89,6 @@ class AccessibilityBridge final : public AccessibilityBridgeIos {
   SemanticsObject* FindFirstFocusable(SemanticsObject* parent);
   void VisitObjectsRecursivelyAndRemove(SemanticsObject* object,
                                         NSMutableArray<NSNumber*>* doomed_uids);
-  void HandleEvent(NSDictionary<NSString*, id>* annotatedEvent);
 
   FlutterViewController* view_controller_;
   PlatformViewIOS* platform_view_;
@@ -99,7 +99,7 @@ class AccessibilityBridge final : public AccessibilityBridgeIos {
   int32_t last_focused_semantics_object_id_;
   fml::scoped_nsobject<NSMutableDictionary<NSNumber*, SemanticsObject*>> objects_;
   fml::scoped_nsprotocol<FlutterBasicMessageChannel*> accessibility_channel_;
-  int32_t previous_route_id_;
+  int32_t previous_route_id_ = 0;
   std::unordered_map<int32_t, flutter::CustomAccessibilityAction> actions_;
   std::vector<int32_t> previous_routes_;
   std::unique_ptr<IosDelegate> ios_delegate_;
@@ -109,4 +109,4 @@ class AccessibilityBridge final : public AccessibilityBridgeIos {
 
 }  // namespace flutter
 
-#endif  // SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_ACCESSIBILITY_BRIDGE_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_ACCESSIBILITY_BRIDGE_H_
diff --git a/shell/platform/darwin/ios/framework/Source/accessibility_bridge.mm b/shell/platform/darwin/ios/framework/Source/accessibility_bridge.mm
index 92b73b187ee78dd2afd52233850b5ca9292495c0..54f5dd4ff7acf8b70ec02e6fdcdb0066509a0e74 100644
--- a/shell/platform/darwin/ios/framework/Source/accessibility_bridge.mm
+++ b/shell/platform/darwin/ios/framework/Source/accessibility_bridge.mm
@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <utility>
-
 #import "flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h"
 
+#include <utility>
+
+#include "flutter/fml/logging.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/accessibility_text_entry.h"
@@ -48,7 +49,6 @@ AccessibilityBridge::AccessibilityBridge(
       platform_views_controller_(std::move(platform_views_controller)),
       last_focused_semantics_object_id_(kSemanticObjectIdInvalid),
       objects_([[NSMutableDictionary alloc] init]),
-      previous_route_id_(0),
       previous_routes_({}),
       ios_delegate_(ios_delegate ? std::move(ios_delegate)
                                  : std::make_unique<DefaultIosDelegate>()),
@@ -74,6 +74,7 @@ UIView<UITextInput>* AccessibilityBridge::textInputView() {
 
 void AccessibilityBridge::AccessibilityObjectDidBecomeFocused(int32_t id) {
   last_focused_semantics_object_id_ = id;
+  [accessibility_channel_.get() sendMessage:@{@"type" : @"didGainFocus", @"nodeId" : @(id)}];
 }
 
 void AccessibilityBridge::AccessibilityObjectDidLoseFocus(int32_t id) {
@@ -106,7 +107,14 @@ void AccessibilityBridge::UpdateSemantics(
       SemanticsObject* child = GetOrCreateObject(node.childrenInTraversalOrder[i], nodes);
       [newChildren addObject:child];
     }
+    NSMutableArray* newChildrenInHitTestOrder =
+        [[[NSMutableArray alloc] initWithCapacity:newChildCount] autorelease];
+    for (NSUInteger i = 0; i < newChildCount; ++i) {
+      SemanticsObject* child = GetOrCreateObject(node.childrenInHitTestOrder[i], nodes);
+      [newChildrenInHitTestOrder addObject:child];
+    }
     object.children = newChildren;
+    object.childrenInHitTestOrder = newChildrenInHitTestOrder;
     if (!node.customAccessibilityActions.empty()) {
       NSMutableArray<FlutterCustomAccessibilityAction*>* accessibilityCustomActions =
           [[[NSMutableArray alloc] init] autorelease];
@@ -153,7 +161,8 @@ void AccessibilityBridge::UpdateSemantics(
 
   if (root) {
     if (!view_controller_.view.accessibilityElements) {
-      view_controller_.view.accessibilityElements = @[ [root accessibilityContainer] ];
+      view_controller_.view.accessibilityElements =
+          @[ [root accessibilityContainer] ?: [NSNull null] ];
     }
     NSMutableArray<SemanticsObject*>* newRoutes = [[[NSMutableArray alloc] init] autorelease];
     [root collectRoutes:newRoutes];
@@ -243,7 +252,7 @@ static void ReplaceSemanticsObject(SemanticsObject* oldObject,
                                    SemanticsObject* newObject,
                                    NSMutableDictionary<NSNumber*, SemanticsObject*>* objects) {
   // `newObject` should represent the same id as `oldObject`.
-  assert(oldObject.node.id == newObject.uid);
+  FML_DCHECK(oldObject.node.id == newObject.uid);
   NSNumber* nodeId = @(oldObject.node.id);
   NSUInteger positionInChildlist = [oldObject.parent.children indexOfObject:oldObject];
   [[oldObject retain] autorelease];
@@ -259,8 +268,9 @@ static SemanticsObject* CreateObject(const flutter::SemanticsNode& node,
       !node.HasFlag(flutter::SemanticsFlags::kIsReadOnly)) {
     // Text fields are backed by objects that implement UITextInput.
     return [[[TextInputSemanticsObject alloc] initWithBridge:weak_ptr uid:node.id] autorelease];
-  } else if (node.HasFlag(flutter::SemanticsFlags::kHasToggledState) ||
-             node.HasFlag(flutter::SemanticsFlags::kHasCheckedState)) {
+  } else if (!node.HasFlag(flutter::SemanticsFlags::kIsInMutuallyExclusiveGroup) &&
+             (node.HasFlag(flutter::SemanticsFlags::kHasToggledState) ||
+              node.HasFlag(flutter::SemanticsFlags::kHasCheckedState))) {
     return [[[FlutterSwitchSemanticsObject alloc] initWithBridge:weak_ptr uid:node.id] autorelease];
   } else if (node.HasFlag(flutter::SemanticsFlags::kHasImplicitScrolling)) {
     return [[[FlutterScrollableSemanticsObject alloc] initWithBridge:weak_ptr
@@ -269,7 +279,7 @@ static SemanticsObject* CreateObject(const flutter::SemanticsNode& node,
     return [[[FlutterPlatformViewSemanticsContainer alloc]
         initWithBridge:weak_ptr
                    uid:node.id
-          platformView:weak_ptr->GetPlatformViewsController()->GetPlatformViewByID(
+          platformView:weak_ptr->GetPlatformViewsController()->GetFlutterTouchInterceptingViewByID(
                            node.platformViewId)] autorelease];
   } else {
     return [[[FlutterSemanticsObject alloc] initWithBridge:weak_ptr uid:node.id] autorelease];
@@ -353,6 +363,10 @@ void AccessibilityBridge::HandleEvent(NSDictionary<NSString*, id>* annotatedEven
     NSString* message = annotatedEvent[@"data"][@"message"];
     ios_delegate_->PostAccessibilityNotification(UIAccessibilityAnnouncementNotification, message);
   }
+  if ([type isEqualToString:@"focus"]) {
+    SemanticsObject* node = objects_.get()[annotatedEvent[@"nodeId"]];
+    ios_delegate_->PostAccessibilityNotification(UIAccessibilityLayoutChangedNotification, node);
+  }
 }
 
 fml::WeakPtr<AccessibilityBridge> AccessibilityBridge::GetWeakPtr() {
diff --git a/shell/platform/darwin/ios/framework/Source/accessibility_bridge_ios.h b/shell/platform/darwin/ios/framework/Source/accessibility_bridge_ios.h
index f91defbf9681f09fcd9405238cd565bccdcd3919..9b6d5ef0a192289301ae1bdef017a835534f9de9 100644
--- a/shell/platform/darwin/ios/framework/Source/accessibility_bridge_ios.h
+++ b/shell/platform/darwin/ios/framework/Source/accessibility_bridge_ios.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_ACCESSIBILITY_BRIDGE_IOS_H_
-#define SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_ACCESSIBILITY_BRIDGE_IOS_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_ACCESSIBILITY_BRIDGE_IOS_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_ACCESSIBILITY_BRIDGE_IOS_H_
 
 #include <memory>
 #include <vector>
@@ -44,4 +44,4 @@ class AccessibilityBridgeIos {
 
 }  // namespace flutter
 
-#endif  // SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_ACCESSIBILITY_BRIDGE_IOS_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_ACCESSIBILITY_BRIDGE_IOS_H_
diff --git a/shell/platform/darwin/ios/framework/Source/accessibility_bridge_test.mm b/shell/platform/darwin/ios/framework/Source/accessibility_bridge_test.mm
index 4a8a3479288d73bb4206d316032268949a0542f0..dfffa7b56a07a1f41da48f55bdf4e29a37c0ad55 100644
--- a/shell/platform/darwin/ios/framework/Source/accessibility_bridge_test.mm
+++ b/shell/platform/darwin/ios/framework/Source/accessibility_bridge_test.mm
@@ -14,9 +14,10 @@
 #import "flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h"
 #import "flutter/shell/platform/darwin/ios/platform_view_ios.h"
 
-FLUTTER_ASSERT_NOT_ARC
+FLUTTER_ASSERT_ARC
+
 @class MockPlatformView;
-static MockPlatformView* gMockPlatformView = nil;
+__weak static MockPlatformView* gMockPlatformView = nil;
 
 @interface MockPlatformView : UIView
 @end
@@ -32,7 +33,6 @@ static MockPlatformView* gMockPlatformView = nil;
 
 - (void)dealloc {
   gMockPlatformView = nil;
-  [super dealloc];
 }
 
 @end
@@ -50,12 +50,6 @@ static MockPlatformView* gMockPlatformView = nil;
   return self;
 }
 
-- (void)dealloc {
-  [_view release];
-  _view = nil;
-  [super dealloc];
-}
-
 @end
 
 @interface MockFlutterPlatformFactory : NSObject <FlutterPlatformViewFactory>
@@ -65,7 +59,7 @@ static MockPlatformView* gMockPlatformView = nil;
 - (NSObject<FlutterPlatformView>*)createWithFrame:(CGRect)frame
                                    viewIdentifier:(int64_t)viewId
                                         arguments:(id _Nullable)args {
-  return [[[MockFlutterPlatformView alloc] init] autorelease];
+  return [[MockFlutterPlatformView alloc] init];
 }
 
 @end
@@ -73,11 +67,12 @@ static MockPlatformView* gMockPlatformView = nil;
 namespace flutter {
 namespace {
 class MockDelegate : public PlatformView::Delegate {
+ public:
   void OnPlatformViewCreated(std::unique_ptr<Surface> surface) override {}
   void OnPlatformViewDestroyed() override {}
   void OnPlatformViewScheduleFrame() override {}
   void OnPlatformViewSetNextFrameCallback(const fml::closure& closure) override {}
-  void OnPlatformViewSetViewportMetrics(const ViewportMetrics& metrics) override {}
+  void OnPlatformViewSetViewportMetrics(int64_t view_id, const ViewportMetrics& metrics) override {}
   const flutter::Settings& OnPlatformViewGetSettings() const override { return settings_; }
   void OnPlatformViewDispatchPlatformMessage(std::unique_ptr<PlatformMessage> message) override {}
   void OnPlatformViewDispatchPointerDataPacket(std::unique_ptr<PointerDataPacket> packet) override {
@@ -101,7 +96,6 @@ class MockDelegate : public PlatformView::Delegate {
   void UpdateAssetResolverByType(std::unique_ptr<flutter::AssetResolver> updated_asset_resolver,
                                  flutter::AssetResolver::AssetResolverType type) override {}
 
- private:
   flutter::Settings settings_;
 };
 
@@ -125,7 +119,7 @@ class MockIosDelegate : public AccessibilityBridge::IosDelegate {
 }  // namespace flutter
 
 namespace {
-fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
+fml::RefPtr<fml::TaskRunner> CreateNewThread(const std::string& name) {
   auto thread = std::make_unique<fml::Thread>(name);
   auto runner = thread->GetTaskRunner();
   return runner;
@@ -147,9 +141,13 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
   auto bridge =
       std::make_unique<flutter::AccessibilityBridge>(/*view=*/nil,
                                                      /*platform_view=*/platform_view.get(),
@@ -167,9 +165,13 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
   id mockFlutterView = OCMClassMock([FlutterView class]);
   id mockFlutterViewController = OCMClassMock([FlutterViewController class]);
   OCMStub([mockFlutterViewController viewIfLoaded]).andReturn(mockFlutterView);
@@ -194,9 +196,13 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
   id mockFlutterView = OCMClassMock([FlutterView class]);
   id mockFlutterViewController = OCMClassMock([FlutterViewController class]);
   OCMStub([mockFlutterViewController view]).andReturn(mockFlutterView);
@@ -239,9 +245,13 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
   id mockFlutterView = OCMClassMock([FlutterView class]);
   id mockFlutterViewController = OCMClassMock([FlutterViewController class]);
   OCMStub([mockFlutterViewController view]).andReturn(mockFlutterView);
@@ -269,16 +279,20 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
         std::make_shared<flutter::FlutterPlatformViewsController>();
     auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
         /*delegate=*/mock_delegate,
-        /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+        /*rendering_api=*/mock_delegate.settings_.enable_impeller
+            ? flutter::IOSRenderingAPI::kMetal
+            : flutter::IOSRenderingAPI::kSoftware,
         /*platform_views_controller=*/flutterPlatformViewsController,
-        /*task_runners=*/runners);
+        /*task_runners=*/runners,
+        /*worker_task_runner=*/nil,
+        /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
     id mockFlutterView = OCMClassMock([FlutterView class]);
     id mockFlutterViewController = OCMClassMock([FlutterViewController class]);
     OCMStub([mockFlutterViewController view]).andReturn(mockFlutterView);
     std::string label = "some label";
     flutterPlatformViewsController->SetFlutterView(mockFlutterView);
 
-    MockFlutterPlatformFactory* factory = [[MockFlutterPlatformFactory new] autorelease];
+    MockFlutterPlatformFactory* factory = [[MockFlutterPlatformFactory alloc] init];
     flutterPlatformViewsController->RegisterViewFactory(
         factory, @"MockFlutterPlatformView",
         FlutterPlatformViewGestureRecognizersBlockingPolicyEager);
@@ -326,11 +340,15 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
         std::make_shared<flutter::FlutterPlatformViewsController>();
     auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
         /*delegate=*/mock_delegate,
-        /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+        /*rendering_api=*/mock_delegate.settings_.enable_impeller
+            ? flutter::IOSRenderingAPI::kMetal
+            : flutter::IOSRenderingAPI::kSoftware,
         /*platform_views_controller=*/flutterPlatformViewsController,
-        /*task_runners=*/runners);
+        /*task_runners=*/runners,
+        /*worker_task_runner=*/nil,
+        /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
 
-    MockFlutterPlatformFactory* factory = [[MockFlutterPlatformFactory new] autorelease];
+    MockFlutterPlatformFactory* factory = [[MockFlutterPlatformFactory alloc] init];
     flutterPlatformViewsController->RegisterViewFactory(
         factory, @"MockFlutterPlatformView",
         FlutterPlatformViewGestureRecognizersBlockingPolicyEager);
@@ -354,7 +372,6 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   XCTAssertNil(gMockPlatformView);
   XCTAssertNil(flutterViewController.viewIfLoaded);
   [flutterViewController deregisterNotifications];
-  [flutterViewController release];
 }
 
 - (void)testReplacedSemanticsDoesNotCleanupChildren {
@@ -369,12 +386,18 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   auto flutterPlatformViewsController = std::make_shared<flutter::FlutterPlatformViewsController>();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/flutterPlatformViewsController,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
   id engine = OCMClassMock([FlutterEngine class]);
   id mockFlutterViewController = OCMClassMock([FlutterViewController class]);
-  FlutterView* flutterView = [[FlutterView alloc] initWithDelegate:engine opaque:YES];
+  FlutterView* flutterView = [[FlutterView alloc] initWithDelegate:engine
+                                                            opaque:YES
+                                                   enableWideGamut:NO];
   OCMStub([mockFlutterViewController view]).andReturn(flutterView);
   std::string label = "some label";
   auto bridge = std::make_unique<flutter::AccessibilityBridge>(
@@ -399,6 +422,7 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
     node.scrollExtentMax = 100.0;
     node.scrollPosition = 0.0;
     parent.childrenInTraversalOrder.push_back(1);
+    parent.childrenInHitTestOrder.push_back(1);
 
     flutter::SemanticsNode child;
     child.id = 2;
@@ -407,6 +431,7 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
     child.value = "value";
     child.hint = "hint";
     node.childrenInTraversalOrder.push_back(2);
+    node.childrenInHitTestOrder.push_back(2);
 
     nodes[0] = parent;
     nodes[1] = node;
@@ -427,6 +452,7 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
     new_node.scrollExtentMax = 100.0;
     new_node.scrollPosition = 0.0;
     new_node.childrenInTraversalOrder.push_back(2);
+    new_node.childrenInHitTestOrder.push_back(2);
 
     new_nodes[1] = new_node;
     bridge->UpdateSemantics(/*nodes=*/new_nodes, /*actions=*/actions);
@@ -456,12 +482,18 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   auto flutterPlatformViewsController = std::make_shared<flutter::FlutterPlatformViewsController>();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/flutterPlatformViewsController,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
   id engine = OCMClassMock([FlutterEngine class]);
   id mockFlutterViewController = OCMClassMock([FlutterViewController class]);
-  FlutterView* flutterView = [[FlutterView alloc] initWithDelegate:engine opaque:YES];
+  FlutterView* flutterView = [[FlutterView alloc] initWithDelegate:engine
+                                                            opaque:YES
+                                                   enableWideGamut:NO];
   OCMStub([mockFlutterViewController view]).andReturn(flutterView);
   std::string label = "some label";
   @autoreleasepool {
@@ -489,6 +521,7 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
     node.scrollExtentMax = 100.0;
     node.scrollPosition = 0.0;
     parent.childrenInTraversalOrder.push_back(1);
+    parent.childrenInHitTestOrder.push_back(1);
     nodes[0] = parent;
     nodes[1] = node;
     flutter::CustomAccessibilityActionUpdates actions;
@@ -523,12 +556,18 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   auto flutterPlatformViewsController = std::make_shared<flutter::FlutterPlatformViewsController>();
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/flutterPlatformViewsController,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
   id engine = OCMClassMock([FlutterEngine class]);
   id mockFlutterViewController = OCMClassMock([FlutterViewController class]);
-  FlutterView* flutterView = [[FlutterView alloc] initWithDelegate:engine opaque:YES];
+  FlutterView* flutterView = [[FlutterView alloc] initWithDelegate:engine
+                                                            opaque:YES
+                                                   enableWideGamut:NO];
   OCMStub([mockFlutterViewController view]).andReturn(flutterView);
   std::string label = "some label";
   @autoreleasepool {
@@ -556,6 +595,7 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
     node.scrollExtentMax = 100.0;
     node.scrollPosition = 0.0;
     parent.childrenInTraversalOrder.push_back(1);
+    parent.childrenInHitTestOrder.push_back(1);
     nodes[0] = parent;
     nodes[1] = node;
     flutter::CustomAccessibilityActionUpdates actions;
@@ -590,15 +630,19 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
   id mockFlutterView = OCMClassMock([FlutterView class]);
   id mockFlutterViewController = OCMClassMock([FlutterViewController class]);
   OCMStub([mockFlutterViewController view]).andReturn(mockFlutterView);
 
   NSMutableArray<NSDictionary<NSString*, id>*>* accessibility_notifications =
-      [[[NSMutableArray alloc] init] autorelease];
+      [[NSMutableArray alloc] init];
   auto ios_delegate = std::make_unique<flutter::MockIosDelegate>();
   ios_delegate->on_PostAccessibilityNotification_ =
       [accessibility_notifications](UIAccessibilityNotifications notification, id argument) {
@@ -646,6 +690,55 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
                  UIAccessibilityScreenChangedNotification);
 }
 
+- (void)testRadioButtonIsNotSwitchButton {
+  flutter::MockDelegate mock_delegate;
+  auto thread_task_runner = CreateNewThread("AccessibilityBridgeTest");
+  flutter::TaskRunners runners(/*label=*/self.name.UTF8String,
+                               /*platform=*/thread_task_runner,
+                               /*raster=*/thread_task_runner,
+                               /*ui=*/thread_task_runner,
+                               /*io=*/thread_task_runner);
+  auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
+      /*delegate=*/mock_delegate,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
+      /*platform_views_controller=*/nil,
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
+  id engine = OCMClassMock([FlutterEngine class]);
+  id mockFlutterViewController = OCMClassMock([FlutterViewController class]);
+  FlutterView* flutterView = [[FlutterView alloc] initWithDelegate:engine
+                                                            opaque:YES
+                                                   enableWideGamut:NO];
+  OCMStub([mockFlutterViewController view]).andReturn(flutterView);
+  auto ios_delegate = std::make_unique<flutter::MockIosDelegate>();
+  __block auto bridge =
+      std::make_unique<flutter::AccessibilityBridge>(/*view_controller=*/mockFlutterViewController,
+                                                     /*platform_view=*/platform_view.get(),
+                                                     /*platform_views_controller=*/nil,
+                                                     /*ios_delegate=*/std::move(ios_delegate));
+
+  flutter::CustomAccessibilityActionUpdates actions;
+  flutter::SemanticsNodeUpdates nodes;
+
+  flutter::SemanticsNode root_node;
+  root_node.id = kRootNodeId;
+  root_node.flags = static_cast<int32_t>(flutter::SemanticsFlags::kIsInMutuallyExclusiveGroup) |
+                    static_cast<int32_t>(flutter::SemanticsFlags::kIsEnabled) |
+                    static_cast<int32_t>(flutter::SemanticsFlags::kHasCheckedState) |
+                    static_cast<int32_t>(flutter::SemanticsFlags::kHasEnabledState);
+  nodes[root_node.id] = root_node;
+  bridge->UpdateSemantics(/*nodes=*/nodes, /*actions=*/actions);
+
+  SemanticsObjectContainer* rootContainer = flutterView.accessibilityElements[0];
+  FlutterSemanticsObject* rootNode = [rootContainer accessibilityElementAtIndex:0];
+
+  XCTAssertTrue((rootNode.accessibilityTraits & UIAccessibilityTraitButton) > 0);
+  XCTAssertNil(rootNode.accessibilityValue);
+}
+
 - (void)testLayoutChangeWithNonAccessibilityElement {
   flutter::MockDelegate mock_delegate;
   auto thread_task_runner = CreateNewThread("AccessibilityBridgeTest");
@@ -656,15 +749,19 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
   id mockFlutterView = OCMClassMock([FlutterView class]);
   id mockFlutterViewController = OCMClassMock([FlutterViewController class]);
   OCMStub([mockFlutterViewController view]).andReturn(mockFlutterView);
 
   NSMutableArray<NSDictionary<NSString*, id>*>* accessibility_notifications =
-      [[[NSMutableArray alloc] init] autorelease];
+      [[NSMutableArray alloc] init];
   auto ios_delegate = std::make_unique<flutter::MockIosDelegate>();
   ios_delegate->on_PostAccessibilityNotification_ =
       [accessibility_notifications](UIAccessibilityNotifications notification, id argument) {
@@ -738,15 +835,19 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
   id mockFlutterView = OCMClassMock([FlutterView class]);
   id mockFlutterViewController = OCMClassMock([FlutterViewController class]);
   OCMStub([mockFlutterViewController view]).andReturn(mockFlutterView);
 
   NSMutableArray<NSDictionary<NSString*, id>*>* accessibility_notifications =
-      [[[NSMutableArray alloc] init] autorelease];
+      [[NSMutableArray alloc] init];
   auto ios_delegate = std::make_unique<flutter::MockIosDelegate>();
   ios_delegate->on_PostAccessibilityNotification_ =
       [accessibility_notifications](UIAccessibilityNotifications notification, id argument) {
@@ -811,15 +912,19 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
   id mockFlutterView = OCMClassMock([FlutterView class]);
   id mockFlutterViewController = OCMClassMock([FlutterViewController class]);
   OCMStub([mockFlutterViewController view]).andReturn(mockFlutterView);
 
   NSMutableArray<NSDictionary<NSString*, id>*>* accessibility_notifications =
-      [[[NSMutableArray alloc] init] autorelease];
+      [[NSMutableArray alloc] init];
   auto ios_delegate = std::make_unique<flutter::MockIosDelegate>();
   ios_delegate->on_PostAccessibilityNotification_ =
       [accessibility_notifications](UIAccessibilityNotifications notification, id argument) {
@@ -883,9 +988,13 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
   id mockFlutterView = OCMClassMock([FlutterView class]);
   id mockFlutterViewController = OCMClassMock([FlutterViewController class]);
   OCMStub([mockFlutterViewController view]).andReturn(mockFlutterView);
@@ -938,15 +1047,19 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
   id mockFlutterView = OCMClassMock([FlutterView class]);
   id mockFlutterViewController = OCMClassMock([FlutterViewController class]);
   OCMStub([mockFlutterViewController view]).andReturn(mockFlutterView);
 
   NSMutableArray<NSDictionary<NSString*, id>*>* accessibility_notifications =
-      [[[NSMutableArray alloc] init] autorelease];
+      [[NSMutableArray alloc] init];
   auto ios_delegate = std::make_unique<flutter::MockIosDelegate>();
   ios_delegate->on_PostAccessibilityNotification_ =
       [accessibility_notifications](UIAccessibilityNotifications notification, id argument) {
@@ -1033,15 +1146,19 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
   id mockFlutterView = OCMClassMock([FlutterView class]);
   id mockFlutterViewController = OCMClassMock([FlutterViewController class]);
   OCMStub([mockFlutterViewController view]).andReturn(mockFlutterView);
 
   NSMutableArray<NSDictionary<NSString*, id>*>* accessibility_notifications =
-      [[[NSMutableArray alloc] init] autorelease];
+      [[NSMutableArray alloc] init];
   auto ios_delegate = std::make_unique<flutter::MockIosDelegate>();
   ios_delegate->on_PostAccessibilityNotification_ =
       [accessibility_notifications](UIAccessibilityNotifications notification, id argument) {
@@ -1117,15 +1234,19 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
   id mockFlutterView = OCMClassMock([FlutterView class]);
   id mockFlutterViewController = OCMClassMock([FlutterViewController class]);
   OCMStub([mockFlutterViewController view]).andReturn(mockFlutterView);
 
   NSMutableArray<NSDictionary<NSString*, id>*>* accessibility_notifications =
-      [[[NSMutableArray alloc] init] autorelease];
+      [[NSMutableArray alloc] init];
   auto ios_delegate = std::make_unique<flutter::MockIosDelegate>();
   ios_delegate->on_PostAccessibilityNotification_ =
       [accessibility_notifications](UIAccessibilityNotifications notification, id argument) {
@@ -1197,6 +1318,107 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
                  UIAccessibilityScreenChangedNotification);
 }
 
+- (void)testHandleEvent {
+  flutter::MockDelegate mock_delegate;
+  auto thread_task_runner = CreateNewThread("AccessibilityBridgeTest");
+  flutter::TaskRunners runners(/*label=*/self.name.UTF8String,
+                               /*platform=*/thread_task_runner,
+                               /*raster=*/thread_task_runner,
+                               /*ui=*/thread_task_runner,
+                               /*io=*/thread_task_runner);
+  auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
+      /*delegate=*/mock_delegate,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
+      /*platform_views_controller=*/nil,
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
+  id mockFlutterView = OCMClassMock([FlutterView class]);
+  id mockFlutterViewController = OCMClassMock([FlutterViewController class]);
+  OCMStub([mockFlutterViewController view]).andReturn(mockFlutterView);
+
+  NSMutableArray<NSDictionary<NSString*, id>*>* accessibility_notifications =
+      [[NSMutableArray alloc] init];
+  auto ios_delegate = std::make_unique<flutter::MockIosDelegate>();
+  ios_delegate->on_PostAccessibilityNotification_ =
+      [accessibility_notifications](UIAccessibilityNotifications notification, id argument) {
+        [accessibility_notifications addObject:@{
+          @"notification" : @(notification),
+          @"argument" : argument ? argument : [NSNull null],
+        }];
+      };
+  __block auto bridge =
+      std::make_unique<flutter::AccessibilityBridge>(/*view_controller=*/mockFlutterViewController,
+                                                     /*platform_view=*/platform_view.get(),
+                                                     /*platform_views_controller=*/nil,
+                                                     /*ios_delegate=*/std::move(ios_delegate));
+
+  NSDictionary<NSString*, id>* annotatedEvent = @{@"type" : @"focus", @"nodeId" : @123};
+
+  bridge->HandleEvent(annotatedEvent);
+
+  XCTAssertEqual([accessibility_notifications count], 1ul);
+  XCTAssertEqual([accessibility_notifications[0][@"notification"] unsignedIntValue],
+                 UIAccessibilityLayoutChangedNotification);
+}
+
+- (void)testAccessibilityObjectDidBecomeFocused {
+  flutter::MockDelegate mock_delegate;
+  auto thread = std::make_unique<fml::Thread>("AccessibilityBridgeTest");
+  auto thread_task_runner = thread->GetTaskRunner();
+  flutter::TaskRunners runners(/*label=*/self.name.UTF8String,
+                               /*platform=*/thread_task_runner,
+                               /*raster=*/thread_task_runner,
+                               /*ui=*/thread_task_runner,
+                               /*io=*/thread_task_runner);
+  id messenger = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
+  id engine = OCMClassMock([FlutterEngine class]);
+  id flutterViewController = OCMClassMock([FlutterViewController class]);
+
+  OCMStub([flutterViewController engine]).andReturn(engine);
+  OCMStub([engine binaryMessenger]).andReturn(messenger);
+  FlutterBinaryMessengerConnection connection = 123;
+  OCMStub([messenger setMessageHandlerOnChannel:@"flutter/accessibility"
+                           binaryMessageHandler:[OCMArg any]])
+      .andReturn(connection);
+
+  auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
+      /*delegate=*/mock_delegate,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
+      /*platform_views_controller=*/nil,
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
+  fml::AutoResetWaitableEvent latch;
+  thread_task_runner->PostTask([&] {
+    auto weakFactory =
+        std::make_unique<fml::WeakNSObjectFactory<FlutterViewController>>(flutterViewController);
+    platform_view->SetOwnerViewController(weakFactory->GetWeakNSObject());
+    auto bridge =
+        std::make_unique<flutter::AccessibilityBridge>(/*view=*/nil,
+                                                       /*platform_view=*/platform_view.get(),
+                                                       /*platform_views_controller=*/nil);
+    XCTAssertTrue(bridge.get());
+    OCMVerify([messenger setMessageHandlerOnChannel:@"flutter/accessibility"
+                               binaryMessageHandler:[OCMArg isNotNil]]);
+
+    bridge->AccessibilityObjectDidBecomeFocused(123);
+
+    NSDictionary<NSString*, id>* annotatedEvent = @{@"type" : @"didGainFocus", @"nodeId" : @123};
+    NSData* encodedMessage = [[FlutterStandardMessageCodec sharedInstance] encode:annotatedEvent];
+
+    OCMVerify([messenger sendOnChannel:@"flutter/accessibility" message:encodedMessage]);
+    latch.Signal();
+  });
+  latch.Wait();
+
+  [engine stopMocking];
+}
+
 - (void)testAnnouncesRouteChangesWhenNoNamesRoute {
   flutter::MockDelegate mock_delegate;
   auto thread_task_runner = CreateNewThread("AccessibilityBridgeTest");
@@ -1207,15 +1429,19 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
   id mockFlutterView = OCMClassMock([FlutterView class]);
   id mockFlutterViewController = OCMClassMock([FlutterViewController class]);
   OCMStub([mockFlutterViewController view]).andReturn(mockFlutterView);
 
   NSMutableArray<NSDictionary<NSString*, id>*>* accessibility_notifications =
-      [[[NSMutableArray alloc] init] autorelease];
+      [[NSMutableArray alloc] init];
   auto ios_delegate = std::make_unique<flutter::MockIosDelegate>();
   ios_delegate->on_PostAccessibilityNotification_ =
       [accessibility_notifications](UIAccessibilityNotifications notification, id argument) {
@@ -1275,15 +1501,19 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
   id mockFlutterViewController = OCMClassMock([FlutterViewController class]);
   id mockFlutterView = OCMClassMock([FlutterView class]);
   OCMStub([mockFlutterViewController view]).andReturn(mockFlutterView);
 
   NSMutableArray<NSDictionary<NSString*, id>*>* accessibility_notifications =
-      [[[NSMutableArray alloc] init] autorelease];
+      [[NSMutableArray alloc] init];
   auto ios_delegate = std::make_unique<flutter::MockIosDelegate>();
   ios_delegate->on_PostAccessibilityNotification_ =
       [accessibility_notifications](UIAccessibilityNotifications notification, id argument) {
@@ -1342,15 +1572,19 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
   id mockFlutterViewController = OCMClassMock([FlutterViewController class]);
   id mockFlutterView = OCMClassMock([FlutterView class]);
   OCMStub([mockFlutterViewController view]).andReturn(mockFlutterView);
 
   NSMutableArray<NSDictionary<NSString*, id>*>* accessibility_notifications =
-      [[[NSMutableArray alloc] init] autorelease];
+      [[NSMutableArray alloc] init];
   auto ios_delegate = std::make_unique<flutter::MockIosDelegate>();
   ios_delegate->on_PostAccessibilityNotification_ =
       [accessibility_notifications](UIAccessibilityNotifications notification, id argument) {
@@ -1415,15 +1649,19 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
   id mockFlutterViewController = OCMClassMock([FlutterViewController class]);
   id mockFlutterView = OCMClassMock([FlutterView class]);
   OCMStub([mockFlutterViewController view]).andReturn(mockFlutterView);
 
   NSMutableArray<NSDictionary<NSString*, id>*>* accessibility_notifications =
-      [[[NSMutableArray alloc] init] autorelease];
+      [[NSMutableArray alloc] init];
   auto ios_delegate = std::make_unique<flutter::MockIosDelegate>();
   ios_delegate->on_PostAccessibilityNotification_ =
       [accessibility_notifications](UIAccessibilityNotifications notification, id argument) {
@@ -1490,15 +1728,19 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
   id mockFlutterViewController = OCMClassMock([FlutterViewController class]);
   id mockFlutterView = OCMClassMock([FlutterView class]);
   OCMStub([mockFlutterViewController view]).andReturn(mockFlutterView);
 
   NSMutableArray<NSDictionary<NSString*, id>*>* accessibility_notifications =
-      [[[NSMutableArray alloc] init] autorelease];
+      [[NSMutableArray alloc] init];
   auto ios_delegate = std::make_unique<flutter::MockIosDelegate>();
   ios_delegate->on_PostAccessibilityNotification_ =
       [accessibility_notifications](UIAccessibilityNotifications notification, id argument) {
@@ -1561,15 +1803,19 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
   id mockFlutterViewController = OCMClassMock([FlutterViewController class]);
   id mockFlutterView = OCMClassMock([FlutterView class]);
   OCMStub([mockFlutterViewController view]).andReturn(mockFlutterView);
 
   NSMutableArray<NSDictionary<NSString*, id>*>* accessibility_notifications =
-      [[[NSMutableArray alloc] init] autorelease];
+      [[NSMutableArray alloc] init];
   auto ios_delegate = std::make_unique<flutter::MockIosDelegate>();
   ios_delegate->on_PostAccessibilityNotification_ =
       [accessibility_notifications](UIAccessibilityNotifications notification, id argument) {
@@ -1634,16 +1880,20 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
   id mockFlutterView = OCMClassMock([FlutterView class]);
   id mockFlutterViewController = OCMClassMock([FlutterViewController class]);
   OCMStub([mockFlutterViewController view]).andReturn(mockFlutterView);
   std::string label = "some label";
 
   NSMutableArray<NSDictionary<NSString*, id>*>* accessibility_notifications =
-      [[[NSMutableArray alloc] init] autorelease];
+      [[NSMutableArray alloc] init];
   auto ios_delegate = std::make_unique<flutter::MockIosDelegate>();
   ios_delegate->on_PostAccessibilityNotification_ =
       [accessibility_notifications](UIAccessibilityNotifications notification, id argument) {
@@ -1689,15 +1939,19 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
   id mockFlutterView = OCMClassMock([FlutterView class]);
   id mockFlutterViewController = OCMClassMock([FlutterViewController class]);
   OCMStub([mockFlutterViewController view]).andReturn(mockFlutterView);
 
   NSMutableArray<NSDictionary<NSString*, id>*>* accessibility_notifications =
-      [[[NSMutableArray alloc] init] autorelease];
+      [[NSMutableArray alloc] init];
   auto ios_delegate = std::make_unique<flutter::MockIosDelegate>();
   ios_delegate->on_PostAccessibilityNotification_ =
       [accessibility_notifications](UIAccessibilityNotifications notification, id argument) {
@@ -1749,15 +2003,19 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
   id mockFlutterView = OCMClassMock([FlutterView class]);
   id mockFlutterViewController = OCMClassMock([FlutterViewController class]);
   OCMStub([mockFlutterViewController view]).andReturn(mockFlutterView);
 
   NSMutableArray<NSDictionary<NSString*, id>*>* accessibility_notifications =
-      [[[NSMutableArray alloc] init] autorelease];
+      [[NSMutableArray alloc] init];
   auto ios_delegate = std::make_unique<flutter::MockIosDelegate>();
   ios_delegate->on_PostAccessibilityNotification_ =
       [accessibility_notifications](UIAccessibilityNotifications notification, id argument) {
@@ -1817,14 +2075,18 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
 
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
   fml::AutoResetWaitableEvent latch;
   thread_task_runner->PostTask([&] {
     auto weakFactory =
-        std::make_unique<fml::WeakPtrFactory<FlutterViewController>>(flutterViewController);
-    platform_view->SetOwnerViewController(weakFactory->GetWeakPtr());
+        std::make_unique<fml::WeakNSObjectFactory<FlutterViewController>>(flutterViewController);
+    platform_view->SetOwnerViewController(weakFactory->GetWeakNSObject());
     auto bridge =
         std::make_unique<flutter::AccessibilityBridge>(/*view=*/nil,
                                                        /*platform_view=*/platform_view.get(),
@@ -1850,9 +2112,13 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
                                /*io=*/thread_task_runner);
   auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
       /*delegate=*/mock_delegate,
-      /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+      /*rendering_api=*/mock_delegate.settings_.enable_impeller
+          ? flutter::IOSRenderingAPI::kMetal
+          : flutter::IOSRenderingAPI::kSoftware,
       /*platform_views_controller=*/nil,
-      /*task_runners=*/runners);
+      /*task_runners=*/runners,
+      /*worker_task_runner=*/nil,
+      /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
   id mockFlutterView = OCMClassMock([FlutterView class]);
   id mockFlutterViewController = OCMClassMock([FlutterViewController class]);
   OCMStub([mockFlutterViewController view]).andReturn(mockFlutterView);
@@ -1867,8 +2133,7 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   FlutterSemanticsScrollView* flutterSemanticsScrollView;
   @autoreleasepool {
     FlutterScrollableSemanticsObject* semanticsObject =
-        [[[FlutterScrollableSemanticsObject alloc] initWithBridge:bridge->GetWeakPtr()
-                                                              uid:1234] autorelease];
+        [[FlutterScrollableSemanticsObject alloc] initWithBridge:bridge->GetWeakPtr() uid:1234];
 
     flutterSemanticsScrollView = semanticsObject.nativeAccessibility;
   }
@@ -1898,18 +2163,22 @@ fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
   thread_task_runner->PostTask([&] {
     auto platform_view = std::make_unique<flutter::PlatformViewIOS>(
         /*delegate=*/test_delegate,
-        /*rendering_api=*/flutter::IOSRenderingAPI::kSoftware,
+        /*rendering_api=*/test_delegate.settings_.enable_impeller
+            ? flutter::IOSRenderingAPI::kMetal
+            : flutter::IOSRenderingAPI::kSoftware,
         /*platform_views_controller=*/nil,
-        /*task_runners=*/runners);
+        /*task_runners=*/runners,
+        /*worker_task_runner=*/nil,
+        /*is_gpu_disabled_sync_switch=*/std::make_shared<fml::SyncSwitch>());
 
     id mockFlutterViewController = OCMClassMock([FlutterViewController class]);
     auto flutterPlatformViewsController =
         std::make_shared<flutter::FlutterPlatformViewsController>();
     OCMStub([mockFlutterViewController platformViewsController])
         .andReturn(flutterPlatformViewsController.get());
-    auto weakFactory =
-        std::make_unique<fml::WeakPtrFactory<FlutterViewController>>(mockFlutterViewController);
-    platform_view->SetOwnerViewController(weakFactory->GetWeakPtr());
+    auto weakFactory = std::make_unique<fml::WeakNSObjectFactory<FlutterViewController>>(
+        mockFlutterViewController);
+    platform_view->SetOwnerViewController(weakFactory->GetWeakNSObject());
 
     platform_view->SetSemanticsEnabled(true);
     XCTAssertNotEqual(test_delegate.set_semantics_enabled_calls, 0);
diff --git a/shell/platform/darwin/ios/framework/Source/accessibility_text_entry.h b/shell/platform/darwin/ios/framework/Source/accessibility_text_entry.h
index 9df47186ccf73439ab933f11dbb768f438889d5d..ee97385f6f0641be46aebceec8d4a47325cdd6a6 100644
--- a/shell/platform/darwin/ios/framework/Source/accessibility_text_entry.h
+++ b/shell/platform/darwin/ios/framework/Source/accessibility_text_entry.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_ACCESSIBILITY_TEXT_ENTRY_H_
-#define SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_ACCESSIBILITY_TEXT_ENTRY_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_ACCESSIBILITY_TEXT_ENTRY_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_ACCESSIBILITY_TEXT_ENTRY_H_
 
 /**
  * An implementation of `UITextInput` used for text fields that do not currently
@@ -33,4 +33,4 @@
 @interface TextInputSemanticsObject : SemanticsObject <UITextInput>
 @end
 
-#endif  // SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_ACCESSIBILITY_TEXT_ENTRY_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_ACCESSIBILITY_TEXT_ENTRY_H_
diff --git a/shell/platform/darwin/ios/framework/Source/availability_version_check_test.mm b/shell/platform/darwin/ios/framework/Source/availability_version_check_test.mm
new file mode 100644
index 0000000000000000000000000000000000000000..c843893c216e811b520012f72c9821385904d102
--- /dev/null
+++ b/shell/platform/darwin/ios/framework/Source/availability_version_check_test.mm
@@ -0,0 +1,26 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import <tuple>
+
+#import <OCMock/OCMock.h>
+#import <XCTest/XCTest.h>
+
+#import "flutter/shell/platform/darwin/common/availability_version_check.h"
+
+@interface AvailabilityVersionCheckTest : XCTestCase
+@end
+
+@implementation AvailabilityVersionCheckTest
+
+- (void)testSimple {
+  auto maybe_product_version = flutter::ProductVersionFromSystemVersionPList();
+  XCTAssertTrue(maybe_product_version.has_value());
+  if (maybe_product_version.has_value()) {
+    auto product_version = maybe_product_version.value();
+    XCTAssertTrue(product_version > std::make_tuple(0, 0, 0));
+  }
+}
+
+@end
diff --git a/shell/platform/darwin/ios/framework/Source/connection_collection.h b/shell/platform/darwin/ios/framework/Source/connection_collection.h
index 3f93435b83ca988b1486966f2b9a44fa3c66ff61..1269edad17a30e9009f36c07d5b05a8e8b7695e5 100644
--- a/shell/platform/darwin/ios/framework/Source/connection_collection.h
+++ b/shell/platform/darwin/ios/framework/Source/connection_collection.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_CONNECTION_COLLECTION_H_
-#define SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_CONNECTION_COLLECTION_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_CONNECTION_COLLECTION_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_CONNECTION_COLLECTION_H_
 
 #include <cstdint>
 #include <map>
@@ -33,4 +33,4 @@ class ConnectionCollection {
 
 }  // namespace flutter
 
-#endif  // SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_CONNECTION_COLLECTION_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_CONNECTION_COLLECTION_H_
diff --git a/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.mm b/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.mm
index 53b04e484d6fb80f63823321df56a44136e1a7f1..c823cf3f39bc2f192cdc4bbe89233f75f717bdf6 100644
--- a/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.mm
+++ b/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.mm
@@ -9,7 +9,7 @@ namespace flutter {
 PlatformMessageResponseDarwin::PlatformMessageResponseDarwin(
     PlatformMessageResponseCallback callback,
     fml::RefPtr<fml::TaskRunner> platform_task_runner)
-    : callback_(callback, fml::OwnershipPolicy::Retain),
+    : callback_(callback, fml::scoped_policy::OwnershipPolicy::kRetain),
       platform_task_runner_(std::move(platform_task_runner)) {}
 
 PlatformMessageResponseDarwin::~PlatformMessageResponseDarwin() = default;
diff --git a/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.h b/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.h
index 14beef5401a9ffe52bcfed1b658ace61a617c7fb..36a608db7deca64806e0ab6098a844d87f4b6dde 100644
--- a/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.h
+++ b/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.h
@@ -15,6 +15,13 @@
 
 @interface DisplayLinkManager : NSObject
 
+// Whether the max refresh rate on iPhone Pro-motion devices are enabled.
+// This reflects the value of `CADisableMinimumFrameDurationOnPhone` in the
+// info.plist file.
+//
+// Note on iPads that support Pro-motion, the max refresh rate is always enabled.
+@property(class, nonatomic, readonly) BOOL maxRefreshRateEnabledOnIPhone;
+
 //------------------------------------------------------------------------------
 /// @brief      The display refresh rate used for reporting purposes. The engine does not care
 ///             about this for frame scheduling. It is only used by tools for instrumentation. The
@@ -51,6 +58,8 @@
 
 - (double)getRefreshRate;
 
+- (void)setMaxRefreshRate:(double)refreshRate;
+
 @end
 
 namespace flutter {
@@ -64,12 +73,17 @@ class VsyncWaiterIOS final : public VsyncWaiter, public VariableRefreshRateRepor
   // |VariableRefreshRateReporter|
   double GetRefreshRate() const override;
 
- private:
-  fml::scoped_nsobject<VSyncClient> client_;
+  // Made public for testing.
+  fml::scoped_nsobject<VSyncClient> GetVsyncClient() const;
 
   // |VsyncWaiter|
+  // Made public for testing.
   void AwaitVSync() override;
 
+ private:
+  fml::scoped_nsobject<VSyncClient> client_;
+  double max_refresh_rate_;
+
   FML_DISALLOW_COPY_AND_ASSIGN(VsyncWaiterIOS);
 };
 
diff --git a/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.mm b/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.mm
index 6c6a45477858a5dcfde7c49c881e0ff1b904d152..5171bf9153981a0b993b304f83e08d1be5879f5b 100644
--- a/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.mm
+++ b/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.mm
@@ -12,8 +12,12 @@
 
 #include "flutter/common/task_runners.h"
 #include "flutter/fml/logging.h"
+#include "flutter/fml/memory/task_runner_checker.h"
 #include "flutter/fml/trace_event.h"
 
+// When calculating refresh rate diffrence, anything within 0.1 fps is ignored.
+const static double kRefreshRateDiffToIgnore = 0.1;
+
 namespace flutter {
 
 VsyncWaiterIOS::VsyncWaiterIOS(const flutter::TaskRunners& task_runners)
@@ -26,6 +30,7 @@ VsyncWaiterIOS::VsyncWaiterIOS(const flutter::TaskRunners& task_runners)
   client_ =
       fml::scoped_nsobject{[[VSyncClient alloc] initWithTaskRunner:task_runners_.GetUITaskRunner()
                                                           callback:callback]};
+  max_refresh_rate_ = [DisplayLinkManager displayRefreshRate];
 }
 
 VsyncWaiterIOS::~VsyncWaiterIOS() {
@@ -35,6 +40,11 @@ VsyncWaiterIOS::~VsyncWaiterIOS() {
 }
 
 void VsyncWaiterIOS::AwaitVSync() {
+  double new_max_refresh_rate = [DisplayLinkManager displayRefreshRate];
+  if (fabs(new_max_refresh_rate - max_refresh_rate_) > kRefreshRateDiffToIgnore) {
+    max_refresh_rate_ = new_max_refresh_rate;
+    [client_.get() setMaxRefreshRate:max_refresh_rate_];
+  }
   [client_.get() await];
 }
 
@@ -43,6 +53,10 @@ double VsyncWaiterIOS::GetRefreshRate() const {
   return [client_.get() getRefreshRate];
 }
 
+fml::scoped_nsobject<VSyncClient> VsyncWaiterIOS::GetVsyncClient() const {
+  return client_;
+}
+
 }  // namespace flutter
 
 @implementation VSyncClient {
@@ -64,7 +78,7 @@ double VsyncWaiterIOS::GetRefreshRate() const {
     };
     display_link_.get().paused = YES;
 
-    [self setMaxRefreshRateIfEnabled];
+    [self setMaxRefreshRate:[DisplayLinkManager displayRefreshRate]];
 
     task_runner->PostTask([client = [self retain]]() {
       [client->display_link_.get() addToRunLoop:[NSRunLoop currentRunLoop]
@@ -76,15 +90,12 @@ double VsyncWaiterIOS::GetRefreshRate() const {
   return self;
 }
 
-- (void)setMaxRefreshRateIfEnabled {
-  NSNumber* minimumFrameRateDisabled =
-      [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CADisableMinimumFrameDurationOnPhone"];
-  if (![minimumFrameRateDisabled boolValue]) {
+- (void)setMaxRefreshRate:(double)refreshRate {
+  if (!DisplayLinkManager.maxRefreshRateEnabledOnIPhone) {
     return;
   }
-  double maxFrameRate = fmax([DisplayLinkManager displayRefreshRate], 60);
+  double maxFrameRate = fmax(refreshRate, 60);
   double minFrameRate = fmax(maxFrameRate / 2, 60);
-
   if (@available(iOS 15.0, *)) {
     display_link_.get().preferredFrameRateRange =
         CAFrameRateRangeMake(minFrameRate, maxFrameRate, maxFrameRate);
@@ -102,14 +113,16 @@ double VsyncWaiterIOS::GetRefreshRate() const {
 }
 
 - (void)onDisplayLink:(CADisplayLink*)link {
-  TRACE_EVENT0("flutter", "VSYNC");
-
   CFTimeInterval delay = CACurrentMediaTime() - link.timestamp;
   fml::TimePoint frame_start_time = fml::TimePoint::Now() - fml::TimeDelta::FromSecondsF(delay);
 
   CFTimeInterval duration = link.targetTimestamp - link.timestamp;
   fml::TimePoint frame_target_time = frame_start_time + fml::TimeDelta::FromSecondsF(duration);
 
+  TRACE_EVENT2_INT("flutter", "PlatformVsync", "frame_start_time",
+                   frame_start_time.ToEpochDelta().ToMicroseconds(), "frame_target_time",
+                   frame_target_time.ToEpochDelta().ToMicroseconds());
+
   std::unique_ptr<flutter::FrameTimingsRecorder> recorder =
       std::make_unique<flutter::FrameTimingsRecorder>();
 
@@ -168,4 +181,9 @@ double VsyncWaiterIOS::GetRefreshRate() const {
   // no-op.
 }
 
++ (BOOL)maxRefreshRateEnabledOnIPhone {
+  return [[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CADisableMinimumFrameDurationOnPhone"]
+      boolValue];
+}
+
 @end
diff --git a/shell/platform/darwin/ios/ios_context.h b/shell/platform/darwin/ios/ios_context.h
index db14fd37e23de6983e88068f189c32ef538b3b5e..04743b4c3a63bec4eda7ab1ee200041c854df777 100644
--- a/shell/platform/darwin/ios/ios_context.h
+++ b/shell/platform/darwin/ios/ios_context.h
@@ -2,16 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_IOS_RESOURCE_CONTEXT_H_
-#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_IOS_RESOURCE_CONTEXT_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_IOS_CONTEXT_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_IOS_CONTEXT_H_
 
 #include <memory>
 
 #include "flutter/common/graphics/gl_context_switch.h"
 #include "flutter/common/graphics/msaa_sample_count.h"
 #include "flutter/common/graphics/texture.h"
+#include "flutter/fml/concurrent_message_loop.h"
 #include "flutter/fml/macros.h"
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
+#include "flutter/fml/synchronization/sync_switch.h"
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterTexture.h"
 #import "flutter/shell/platform/darwin/ios/rendering_api_selection.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
@@ -54,9 +56,11 @@ class IOSContext {
   ///
   /// @return     A valid context on success. `nullptr` on failure.
   ///
-  static std::unique_ptr<IOSContext> Create(IOSRenderingAPI api,
-                                            IOSRenderingBackend backend,
-                                            MsaaSampleCount msaa_samples);
+  static std::unique_ptr<IOSContext> Create(
+      IOSRenderingAPI api,
+      IOSRenderingBackend backend,
+      MsaaSampleCount msaa_samples,
+      const std::shared_ptr<const fml::SyncSwitch>& is_gpu_disabled_sync_switch);
 
   //----------------------------------------------------------------------------
   /// @brief      Collects the context object. This must happen on the thread on
@@ -153,4 +157,4 @@ class IOSContext {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_IOS_RESOURCE_CONTEXT_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_IOS_CONTEXT_H_
diff --git a/shell/platform/darwin/ios/ios_context.mm b/shell/platform/darwin/ios/ios_context.mm
index f861e10e3ff6b6a52247ed93826312b92af3c968..0f74ded917fe4cd499fa845d044236ecfb1be6b0 100644
--- a/shell/platform/darwin/ios/ios_context.mm
+++ b/shell/platform/darwin/ios/ios_context.mm
@@ -2,14 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "flutter/shell/platform/darwin/ios/ios_context.h"
+#include "flutter/shell/platform/darwin/ios/ios_context.h"
+#include "flutter/shell/platform/darwin/ios/rendering_api_selection.h"
 
 #include "flutter/fml/logging.h"
-#import "flutter/shell/platform/darwin/ios/ios_context_software.h"
+#include "flutter/shell/platform/darwin/ios/ios_context_software.h"
 
 #if SHELL_ENABLE_METAL
-#import "flutter/shell/platform/darwin/ios/ios_context_metal_impeller.h"
-#import "flutter/shell/platform/darwin/ios/ios_context_metal_skia.h"
+#include "flutter/shell/platform/darwin/ios/ios_context_metal_impeller.h"
+#include "flutter/shell/platform/darwin/ios/ios_context_metal_skia.h"
 #endif  // SHELL_ENABLE_METAL
 
 namespace flutter {
@@ -18,11 +19,18 @@ IOSContext::IOSContext(MsaaSampleCount msaa_samples) : msaa_samples_(msaa_sample
 
 IOSContext::~IOSContext() = default;
 
-std::unique_ptr<IOSContext> IOSContext::Create(IOSRenderingAPI api,
-                                               IOSRenderingBackend backend,
-                                               MsaaSampleCount msaa_samples) {
+std::unique_ptr<IOSContext> IOSContext::Create(
+    IOSRenderingAPI api,
+    IOSRenderingBackend backend,
+    MsaaSampleCount msaa_samples,
+    const std::shared_ptr<const fml::SyncSwitch>& is_gpu_disabled_sync_switch) {
   switch (api) {
     case IOSRenderingAPI::kSoftware:
+      FML_CHECK(backend != IOSRenderingBackend::kImpeller)
+          << "Software rendering is incompatible with Impeller.\n"
+             "Software rendering may have been automatically selected when running on a simulator "
+             "in an environment that does not support Metal. Enabling GPU pass through in your "
+             "environment may fix this. If that is not possible, then disable Impeller.";
       return std::make_unique<IOSContextSoftware>();
 #if SHELL_ENABLE_METAL
     case IOSRenderingAPI::kMetal:
@@ -30,7 +38,7 @@ std::unique_ptr<IOSContext> IOSContext::Create(IOSRenderingAPI api,
         case IOSRenderingBackend::kSkia:
           return std::make_unique<IOSContextMetalSkia>(msaa_samples);
         case IOSRenderingBackend::kImpeller:
-          return std::make_unique<IOSContextMetalImpeller>();
+          return std::make_unique<IOSContextMetalImpeller>(is_gpu_disabled_sync_switch);
       }
 #endif  // SHELL_ENABLE_METAL
     default:
diff --git a/shell/platform/darwin/ios/ios_context_metal_impeller.h b/shell/platform/darwin/ios/ios_context_metal_impeller.h
index a46dc81cfed9c3c7a4cfd63fb75ee4c80c30ff57..10d9ca0c0ae2826f637a1bf00f07e8cab2cf47ae 100644
--- a/shell/platform/darwin/ios/ios_context_metal_impeller.h
+++ b/shell/platform/darwin/ios/ios_context_metal_impeller.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_IOS_CONTEXT_METAL_IMPELER_H_
-#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_IOS_CONTEXT_METAL_IMPELER_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_IOS_CONTEXT_METAL_IMPELLER_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_IOS_CONTEXT_METAL_IMPELLER_H_
 
 #include "flutter/fml/macros.h"
 #include "flutter/shell/platform/darwin/graphics/FlutterDarwinContextMetalImpeller.h"
@@ -20,7 +20,8 @@ namespace flutter {
 
 class IOSContextMetalImpeller final : public IOSContext {
  public:
-  IOSContextMetalImpeller();
+  explicit IOSContextMetalImpeller(
+      const std::shared_ptr<const fml::SyncSwitch>& is_gpu_disabled_sync_switch);
 
   ~IOSContextMetalImpeller();
 
@@ -55,4 +56,4 @@ class IOSContextMetalImpeller final : public IOSContext {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_IOS_CONTEXT_METAL_IMPELER_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_IOS_CONTEXT_METAL_IMPELLER_H_
diff --git a/shell/platform/darwin/ios/ios_context_metal_impeller.mm b/shell/platform/darwin/ios/ios_context_metal_impeller.mm
index fc011f652c4cf6cae2f64d1f8f12d5de28adcc98..6d4cfdddb76e4ce697feb7ee515c3ee2507264af 100644
--- a/shell/platform/darwin/ios/ios_context_metal_impeller.mm
+++ b/shell/platform/darwin/ios/ios_context_metal_impeller.mm
@@ -8,10 +8,11 @@
 
 namespace flutter {
 
-IOSContextMetalImpeller::IOSContextMetalImpeller()
+IOSContextMetalImpeller::IOSContextMetalImpeller(
+    const std::shared_ptr<const fml::SyncSwitch>& is_gpu_disabled_sync_switch)
     : IOSContext(MsaaSampleCount::kFour),
       darwin_context_metal_impeller_(fml::scoped_nsobject<FlutterDarwinContextMetalImpeller>{
-          [[FlutterDarwinContextMetalImpeller alloc] init]}) {}
+          [[FlutterDarwinContextMetalImpeller alloc] init:is_gpu_disabled_sync_switch]}) {}
 
 IOSContextMetalImpeller::~IOSContextMetalImpeller() = default;
 
diff --git a/shell/platform/darwin/ios/ios_external_texture_metal.h b/shell/platform/darwin/ios/ios_external_texture_metal.h
index 41e6c95b05d4170998c6ead66f2e32f4ccc3cac9..5a6dfd2973c6b39b67ff870a5d330008f7164e78 100644
--- a/shell/platform/darwin/ios/ios_external_texture_metal.h
+++ b/shell/platform/darwin/ios/ios_external_texture_metal.h
@@ -29,7 +29,7 @@ class IOSExternalTextureMetal final : public Texture {
   void Paint(PaintContext& context,
              const SkRect& bounds,
              bool freeze,
-             const SkSamplingOptions& sampling) override;
+             const DlImageSampling sampling) override;
 
   // |Texture|
   void OnGrContextCreated() override;
diff --git a/shell/platform/darwin/ios/ios_external_texture_metal.mm b/shell/platform/darwin/ios/ios_external_texture_metal.mm
index 4f3f812ee0d4d1e6089bb99e80e251affbb0e856..65171b9186907c845b5d705cddf7db63107187dc 100644
--- a/shell/platform/darwin/ios/ios_external_texture_metal.mm
+++ b/shell/platform/darwin/ios/ios_external_texture_metal.mm
@@ -17,7 +17,7 @@ IOSExternalTextureMetal::~IOSExternalTextureMetal() = default;
 void IOSExternalTextureMetal::Paint(PaintContext& context,
                                     const SkRect& bounds,
                                     bool freeze,
-                                    const SkSamplingOptions& sampling) {
+                                    const DlImageSampling sampling) {
   [darwin_external_texture_metal_ paintContext:context
                                         bounds:bounds
                                         freeze:freeze
diff --git a/shell/platform/darwin/ios/ios_external_view_embedder.h b/shell/platform/darwin/ios/ios_external_view_embedder.h
index 8779f936db8387e5b0f05a80cefb950f5073714e..953966378b15a72eb6b2c66fad61c457974b8b12 100644
--- a/shell/platform/darwin/ios/ios_external_view_embedder.h
+++ b/shell/platform/darwin/ios/ios_external_view_embedder.h
@@ -25,51 +25,51 @@ class IOSExternalViewEmbedder : public ExternalViewEmbedder {
   std::shared_ptr<IOSContext> ios_context_;
 
   // |ExternalViewEmbedder|
-  SkCanvas* GetRootCanvas() override;
+  DlCanvas* GetRootCanvas() override;
 
   // |ExternalViewEmbedder|
   void CancelFrame() override;
 
   // |ExternalViewEmbedder|
-  void BeginFrame(
-      SkISize frame_size,
-      GrDirectContext* context,
-      double device_pixel_ratio,
-      fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) override;
+  void BeginFrame(GrDirectContext* context,
+                  const fml::RefPtr<fml::RasterThreadMerger>&
+                      raster_thread_merger) override;
+
+  // |ExternalViewEmbedder|
+  void PrepareFlutterView(SkISize frame_size,
+                          double device_pixel_ratio) override;
 
   // |ExternalViewEmbedder|
   void PrerollCompositeEmbeddedView(
-      int view_id,
+      int64_t view_id,
       std::unique_ptr<flutter::EmbeddedViewParams> params) override;
 
   // |ExternalViewEmbedder|
   PostPrerollResult PostPrerollAction(
-      fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) override;
-
-  // |ExternalViewEmbedder|
-  std::vector<SkCanvas*> GetCurrentCanvases() override;
-
-  // |ExternalViewEmbedder|
-  std::vector<DisplayListBuilder*> GetCurrentBuilders() override;
+      const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger)
+      override;
 
   // |ExternalViewEmbedder|
-  EmbedderPaintContext CompositeEmbeddedView(int view_id) override;
+  DlCanvas* CompositeEmbeddedView(int64_t view_id) override;
 
   // |ExternalViewEmbedder|
-  void SubmitFrame(GrDirectContext* context,
-                   std::unique_ptr<SurfaceFrame> frame) override;
+  void SubmitFlutterView(
+      int64_t flutter_view_id,
+      GrDirectContext* context,
+      const std::shared_ptr<impeller::AiksContext>& aiks_context,
+      std::unique_ptr<SurfaceFrame> frame) override;
 
   // |ExternalViewEmbedder|
-  void EndFrame(
-      bool should_resubmit_frame,
-      fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) override;
+  void EndFrame(bool should_resubmit_frame,
+                const fml::RefPtr<fml::RasterThreadMerger>&
+                    raster_thread_merger) override;
 
   // |ExternalViewEmbedder|
   bool SupportsDynamicThreadMerging() override;
 
   // |ExternalViewEmbedder|
   void PushFilterToVisitedPlatformViews(
-      std::shared_ptr<const DlImageFilter> filter,
+      const std::shared_ptr<const DlImageFilter>& filter,
       const SkRect& filter_rect) override;
 
   // |ExternalViewEmbedder|
diff --git a/shell/platform/darwin/ios/ios_external_view_embedder.mm b/shell/platform/darwin/ios/ios_external_view_embedder.mm
index 61fc7dc5bacd47b68e51822cb60e9aa96e59def6..9af5904a4e09249766160b75df6860d22e984a78 100644
--- a/shell/platform/darwin/ios/ios_external_view_embedder.mm
+++ b/shell/platform/darwin/ios/ios_external_view_embedder.mm
@@ -4,6 +4,8 @@
 
 #import "flutter/shell/platform/darwin/ios/ios_external_view_embedder.h"
 
+#include "flutter/common/constants.h"
+
 namespace flutter {
 
 IOSExternalViewEmbedder::IOSExternalViewEmbedder(
@@ -16,7 +18,7 @@ IOSExternalViewEmbedder::IOSExternalViewEmbedder(
 IOSExternalViewEmbedder::~IOSExternalViewEmbedder() = default;
 
 // |ExternalViewEmbedder|
-SkCanvas* IOSExternalViewEmbedder::GetRootCanvas() {
+DlCanvas* IOSExternalViewEmbedder::GetRootCanvas() {
   // On iOS, the root surface is created from the on-screen render target. Only the surfaces for the
   // various overlays are controlled by this class.
   return nullptr;
@@ -31,18 +33,18 @@ void IOSExternalViewEmbedder::CancelFrame() {
 
 // |ExternalViewEmbedder|
 void IOSExternalViewEmbedder::BeginFrame(
-    SkISize frame_size,
     GrDirectContext* context,
-    double device_pixel_ratio,
-    fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
-  TRACE_EVENT0("flutter", "IOSExternalViewEmbedder::BeginFrame");
+    const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {}
+
+// |ExternalViewEmbedder|
+void IOSExternalViewEmbedder::PrepareFlutterView(SkISize frame_size, double device_pixel_ratio) {
   FML_CHECK(platform_views_controller_);
   platform_views_controller_->BeginFrame(frame_size);
 }
 
 // |ExternalViewEmbedder|
 void IOSExternalViewEmbedder::PrerollCompositeEmbeddedView(
-    int view_id,
+    int64_t view_id,
     std::unique_ptr<EmbeddedViewParams> params) {
   TRACE_EVENT0("flutter", "IOSExternalViewEmbedder::PrerollCompositeEmbeddedView");
   FML_CHECK(platform_views_controller_);
@@ -51,7 +53,7 @@ void IOSExternalViewEmbedder::PrerollCompositeEmbeddedView(
 
 // |ExternalViewEmbedder|
 PostPrerollResult IOSExternalViewEmbedder::PostPrerollAction(
-    fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
+    const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {
   TRACE_EVENT0("flutter", "IOSExternalViewEmbedder::PostPrerollAction");
   FML_CHECK(platform_views_controller_);
   PostPrerollResult result = platform_views_controller_->PostPrerollAction(raster_thread_merger);
@@ -59,36 +61,31 @@ PostPrerollResult IOSExternalViewEmbedder::PostPrerollAction(
 }
 
 // |ExternalViewEmbedder|
-std::vector<SkCanvas*> IOSExternalViewEmbedder::GetCurrentCanvases() {
-  FML_CHECK(platform_views_controller_);
-  return platform_views_controller_->GetCurrentCanvases();
-}
-
-// |ExternalViewEmbedder|
-std::vector<DisplayListBuilder*> IOSExternalViewEmbedder::GetCurrentBuilders() {
-  FML_CHECK(platform_views_controller_);
-  return platform_views_controller_->GetCurrentBuilders();
-}
-
-// |ExternalViewEmbedder|
-EmbedderPaintContext IOSExternalViewEmbedder::CompositeEmbeddedView(int view_id) {
+DlCanvas* IOSExternalViewEmbedder::CompositeEmbeddedView(int64_t view_id) {
   TRACE_EVENT0("flutter", "IOSExternalViewEmbedder::CompositeEmbeddedView");
   FML_CHECK(platform_views_controller_);
   return platform_views_controller_->CompositeEmbeddedView(view_id);
 }
 
 // |ExternalViewEmbedder|
-void IOSExternalViewEmbedder::SubmitFrame(GrDirectContext* context,
-                                          std::unique_ptr<SurfaceFrame> frame) {
-  TRACE_EVENT0("flutter", "IOSExternalViewEmbedder::SubmitFrame");
+void IOSExternalViewEmbedder::SubmitFlutterView(
+    int64_t flutter_view_id,
+    GrDirectContext* context,
+    const std::shared_ptr<impeller::AiksContext>& aiks_context,
+    std::unique_ptr<SurfaceFrame> frame) {
+  TRACE_EVENT0("flutter", "IOSExternalViewEmbedder::SubmitFlutterView");
+  // TODO(dkwingsmt): This class only supports rendering into the implicit view.
+  // Properly support multi-view in the future.
+  FML_DCHECK(flutter_view_id == kFlutterImplicitViewId);
   FML_CHECK(platform_views_controller_);
   platform_views_controller_->SubmitFrame(context, ios_context_, std::move(frame));
   TRACE_EVENT0("flutter", "IOSExternalViewEmbedder::DidSubmitFrame");
 }
 
 // |ExternalViewEmbedder|
-void IOSExternalViewEmbedder::EndFrame(bool should_resubmit_frame,
-                                       fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
+void IOSExternalViewEmbedder::EndFrame(
+    bool should_resubmit_frame,
+    const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {
   TRACE_EVENT0("flutter", "IOSExternalViewEmbedder::EndFrame");
   platform_views_controller_->EndFrame(should_resubmit_frame, raster_thread_merger);
 }
@@ -100,7 +97,7 @@ bool IOSExternalViewEmbedder::SupportsDynamicThreadMerging() {
 
 // |ExternalViewEmbedder|
 void IOSExternalViewEmbedder::PushFilterToVisitedPlatformViews(
-    std::shared_ptr<const DlImageFilter> filter,
+    const std::shared_ptr<const DlImageFilter>& filter,
     const SkRect& filter_rect) {
   platform_views_controller_->PushFilterToVisitedPlatformViews(filter, filter_rect);
 }
diff --git a/shell/platform/darwin/ios/ios_surface_metal_impeller.mm b/shell/platform/darwin/ios/ios_surface_metal_impeller.mm
index 31dcd7a5e99aaf02b02465a946b483cad4125dff..3800646e7b14c44b630c9178b9c3efd2ee3a525f 100644
--- a/shell/platform/darwin/ios/ios_surface_metal_impeller.mm
+++ b/shell/platform/darwin/ios/ios_surface_metal_impeller.mm
@@ -4,6 +4,8 @@
 
 #import "flutter/shell/platform/darwin/ios/ios_surface_metal_impeller.h"
 
+#include "flutter/impeller/renderer/backend/metal/formats_mtl.h"
+#include "flutter/impeller/renderer/context.h"
 #include "flutter/shell/gpu/gpu_surface_metal_impeller.h"
 
 namespace flutter {
@@ -35,9 +37,10 @@ void IOSSurfaceMetalImpeller::UpdateStorageSizeIfNecessary() {
 
 // |IOSSurface|
 std::unique_ptr<Surface> IOSSurfaceMetalImpeller::CreateGPUSurface(GrDirectContext*) {
+  impeller_context_->UpdateOffscreenLayerPixelFormat(
+      impeller::FromMTLPixelFormat(layer_.get().pixelFormat));
   return std::make_unique<GPUSurfaceMetalImpeller>(this,              //
                                                    impeller_context_  //
-
   );
 }
 
@@ -49,9 +52,16 @@ GPUCAMetalLayerHandle IOSSurfaceMetalImpeller::GetCAMetalLayer(const SkISize& fr
     layer.drawableSize = drawable_size;
   }
 
+  // Flutter needs to read from the color attachment in cases where there are effects such as
+  // backdrop filters. Flutter plugins that create platform views may also read from the layer.
+  layer.framebufferOnly = NO;
+
   // When there are platform views in the scene, the drawable needs to be presented in the same
   // transaction as the one created for platform views. When the drawable are being presented from
-  // the raster thread, there is no such transaction.
+  // the raster thread, we may not be able to use a transaction as it will dirty the UIViews being
+  // presented. If there is a non-Flutter UIView active, such as in add2app or a
+  // presentViewController page transition, then this will cause CoreAnimation assertion errors and
+  // exit the app.
   layer.presentsWithTransaction = [[NSThread currentThread] isMainThread];
 
   return layer;
diff --git a/shell/platform/darwin/ios/ios_surface_metal_skia.h b/shell/platform/darwin/ios/ios_surface_metal_skia.h
index efd174b07e09d6c05aa7ecc5efdc2093f104f928..ed2468654abfc2b696ae4e3ac72b76da5e2b2c24 100644
--- a/shell/platform/darwin/ios/ios_surface_metal_skia.h
+++ b/shell/platform/darwin/ios/ios_surface_metal_skia.h
@@ -8,7 +8,7 @@
 #include "flutter/fml/macros.h"
 #include "flutter/shell/gpu/gpu_surface_metal_delegate.h"
 #import "flutter/shell/platform/darwin/ios/ios_surface.h"
-#include "third_party/skia/include/gpu/mtl/GrMtlTypes.h"
+#include "third_party/skia/include/gpu/ganesh/mtl/GrMtlTypes.h"
 
 @class CAMetalLayer;
 
diff --git a/shell/platform/darwin/ios/ios_surface_metal_skia.mm b/shell/platform/darwin/ios/ios_surface_metal_skia.mm
index 13ac639a2fe0cbce95dfe2cd4efc317981a78926..f33788deb59ba03efbd286d1da4b1bf3a1702d71 100644
--- a/shell/platform/darwin/ios/ios_surface_metal_skia.mm
+++ b/shell/platform/darwin/ios/ios_surface_metal_skia.mm
@@ -8,6 +8,10 @@
 #include "flutter/shell/gpu/gpu_surface_metal_skia.h"
 #include "flutter/shell/platform/darwin/ios/ios_context_metal_skia.h"
 
+@protocol FlutterMetalDrawable <MTLDrawable>
+- (void)flutterPrepareForPresent:(nonnull id<MTLCommandBuffer>)commandBuffer;
+@end
+
 namespace flutter {
 
 static IOSContextMetalSkia* CastToMetalContext(const std::shared_ptr<IOSContext>& context) {
@@ -55,7 +59,7 @@ GPUCAMetalLayerHandle IOSSurfaceMetalSkia::GetCAMetalLayer(const SkISize& frame_
 
   layer.pixelFormat = MTLPixelFormatBGRA8Unorm;
   // Flutter needs to read from the color attachment in cases where there are effects such as
-  // backdrop filters.
+  // backdrop filters. Flutter plugins that create platform views may also read from the layer.
   layer.framebufferOnly = NO;
 
   const auto drawable_size = CGSizeMake(frame_info.width(), frame_info.height());
@@ -80,10 +84,16 @@ bool IOSSurfaceMetalSkia::PresentDrawable(GrMTLHandle drawable) const {
 
   auto command_buffer =
       fml::scoped_nsprotocol<id<MTLCommandBuffer>>([[command_queue_ commandBuffer] retain]);
+
+  id<CAMetalDrawable> metal_drawable = reinterpret_cast<id<CAMetalDrawable>>(drawable);
+  if ([metal_drawable conformsToProtocol:@protocol(FlutterMetalDrawable)]) {
+    [(id<FlutterMetalDrawable>)metal_drawable flutterPrepareForPresent:command_buffer.get()];
+  }
+
   [command_buffer.get() commit];
   [command_buffer.get() waitUntilScheduled];
 
-  [reinterpret_cast<id<CAMetalDrawable>>(drawable) present];
+  [metal_drawable present];
   return true;
 }
 
diff --git a/shell/platform/darwin/ios/ios_surface_software.h b/shell/platform/darwin/ios/ios_surface_software.h
index 2d649bd80a6defdcfcd48d8b74bcf12602b68938..e1ed6b69518c04cfb62e0f12da2a56d925022317 100644
--- a/shell/platform/darwin/ios/ios_surface_software.h
+++ b/shell/platform/darwin/ios/ios_surface_software.h
@@ -12,6 +12,8 @@
 #import "flutter/shell/platform/darwin/ios/ios_context.h"
 #import "flutter/shell/platform/darwin/ios/ios_surface.h"
 
+#include "third_party/skia/include/core/SkSurface.h"
+
 @class CALayer;
 
 namespace flutter {
diff --git a/shell/platform/darwin/ios/ios_surface_software.mm b/shell/platform/darwin/ios/ios_surface_software.mm
index f60f9e95b0e9a695562aa117f1de707470229200..736d8dc488127a2331ee9b0f33c9b4167d4f526d 100644
--- a/shell/platform/darwin/ios/ios_surface_software.mm
+++ b/shell/platform/darwin/ios/ios_surface_software.mm
@@ -11,6 +11,8 @@
 #include "flutter/fml/logging.h"
 #include "flutter/fml/platform/darwin/cf_utils.h"
 #include "flutter/fml/trace_event.h"
+
+#include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/utils/mac/SkCGUtils.h"
 
 namespace flutter {
@@ -60,7 +62,7 @@ sk_sp<SkSurface> IOSSurfaceSoftware::AcquireBackingStore(const SkISize& size) {
 
   SkImageInfo info = SkImageInfo::MakeN32(size.fWidth, size.fHeight, kPremul_SkAlphaType,
                                           SkColorSpace::MakeSRGB());
-  sk_surface_ = SkSurface::MakeRaster(info, nullptr);
+  sk_surface_ = SkSurfaces::Raster(info, nullptr);
   return sk_surface_;
 }
 
diff --git a/shell/platform/darwin/ios/platform_message_handler_ios.h b/shell/platform/darwin/ios/platform_message_handler_ios.h
index 09ef281daa51767b4903b38b2b8cb2774528aff1..6d49ae506f40f4ca4d0b91328956a5615f2c9d2a 100644
--- a/shell/platform/darwin/ios/platform_message_handler_ios.h
+++ b/shell/platform/darwin/ios/platform_message_handler_ios.h
@@ -12,8 +12,7 @@
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
 #include "flutter/shell/common/platform_message_handler.h"
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h"
-
-@protocol FlutterTaskQueue;
+#import "flutter/shell/platform/darwin/ios/flutter_task_queue_dispatch.h"
 
 namespace flutter {
 
@@ -21,11 +20,11 @@ class PlatformMessageHandlerIos : public PlatformMessageHandler {
  public:
   static NSObject<FlutterTaskQueue>* MakeBackgroundTaskQueue();
 
-  PlatformMessageHandlerIos(const TaskRunners& task_runners);
+  explicit PlatformMessageHandlerIos(fml::RefPtr<fml::TaskRunner> platform_task_runner);
 
   void HandlePlatformMessage(std::unique_ptr<PlatformMessage> message) override;
 
-  bool DoesHandlePlatformMessageOnPlatformThread() const override { return false; }
+  bool DoesHandlePlatformMessageOnPlatformThread() const override;
 
   void InvokePlatformMessageResponseCallback(int response_id,
                                              std::unique_ptr<fml::Mapping> mapping) override;
@@ -37,17 +36,17 @@ class PlatformMessageHandlerIos : public PlatformMessageHandler {
                          NSObject<FlutterTaskQueue>* task_queue);
 
   struct HandlerInfo {
-    fml::scoped_nsprotocol<NSObject<FlutterTaskQueue>*> task_queue;
+    fml::scoped_nsprotocol<NSObject<FlutterTaskQueueDispatch>*> task_queue;
     fml::ScopedBlock<FlutterBinaryMessageHandler> handler;
   };
 
  private:
   std::unordered_map<std::string, HandlerInfo> message_handlers_;
-  TaskRunners task_runners_;
+  const fml::RefPtr<fml::TaskRunner> platform_task_runner_;
   std::mutex message_handlers_mutex_;
   FML_DISALLOW_COPY_AND_ASSIGN(PlatformMessageHandlerIos);
 };
 
 }  // namespace flutter
 
-#endif
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_PLATFORM_MESSAGE_HANDLER_IOS_H_
diff --git a/shell/platform/darwin/ios/platform_message_handler_ios.mm b/shell/platform/darwin/ios/platform_message_handler_ios.mm
index a5a2b151690ac3e402d6965074417c8d1ddd1740..38706459e00c39a1014dfcff779538c30d031590 100644
--- a/shell/platform/darwin/ios/platform_message_handler_ios.mm
+++ b/shell/platform/darwin/ios/platform_message_handler_ios.mm
@@ -11,12 +11,8 @@
 
 static uint64_t platform_message_counter = 1;
 
-@protocol FlutterTaskQueue
-- (void)dispatch:(dispatch_block_t)block;
-@end
-
-@interface FLTSerialTaskQueue : NSObject <FlutterTaskQueue>
-@property(nonatomic, assign) dispatch_queue_t queue;
+@interface FLTSerialTaskQueue : NSObject <FlutterTaskQueueDispatch>
+@property(nonatomic, strong) dispatch_queue_t queue;
 @end
 
 @implementation FLTSerialTaskQueue
@@ -44,59 +40,66 @@ NSObject<FlutterTaskQueue>* PlatformMessageHandlerIos::MakeBackgroundTaskQueue()
   return [[[FLTSerialTaskQueue alloc] init] autorelease];
 }
 
-PlatformMessageHandlerIos::PlatformMessageHandlerIos(const TaskRunners& task_runners)
-    : task_runners_(task_runners) {}
+PlatformMessageHandlerIos::PlatformMessageHandlerIos(
+    fml::RefPtr<fml::TaskRunner> platform_task_runner)
+    : platform_task_runner_(std::move(platform_task_runner)) {}
 
 void PlatformMessageHandlerIos::HandlePlatformMessage(std::unique_ptr<PlatformMessage> message) {
   // This can be called from any isolate's thread.
-  fml::RefPtr<flutter::PlatformMessageResponse> completer = message->response();
-  HandlerInfo handler_info;
-  {
-    // TODO(gaaclarke): This mutex is a bottleneck for multiple isolates sending
-    // messages at the same time. This could be potentially changed to a
-    // read-write lock.
-    std::lock_guard lock(message_handlers_mutex_);
-    auto it = message_handlers_.find(message->channel());
-    if (it != message_handlers_.end()) {
-      handler_info = it->second;
+  @autoreleasepool {
+    fml::RefPtr<flutter::PlatformMessageResponse> completer = message->response();
+    HandlerInfo handler_info;
+    {
+      // TODO(gaaclarke): This mutex is a bottleneck for multiple isolates sending
+      // messages at the same time. This could be potentially changed to a
+      // read-write lock.
+      std::lock_guard lock(message_handlers_mutex_);
+      auto it = message_handlers_.find(message->channel());
+      if (it != message_handlers_.end()) {
+        handler_info = it->second;
+      }
     }
-  }
-  if (handler_info.handler) {
-    FlutterBinaryMessageHandler handler = handler_info.handler;
-    NSData* data = nil;
-    if (message->hasData()) {
-      data = ConvertMappingToNSData(message->releaseData());
-    }
-
-    uint64_t platform_message_id = platform_message_counter++;
-    TRACE_EVENT_ASYNC_BEGIN1("flutter", "PlatformChannel ScheduleHandler", platform_message_id,
-                             "channel", message->channel().c_str());
-    dispatch_block_t run_handler = ^{
-      handler(data, ^(NSData* reply) {
-        TRACE_EVENT_ASYNC_END0("flutter", "PlatformChannel ScheduleHandler", platform_message_id);
-        // Called from any thread.
-        if (completer) {
-          if (reply) {
-            completer->Complete(ConvertNSDataToMappingPtr(reply));
-          } else {
-            completer->CompleteEmpty();
+    if (handler_info.handler) {
+      FlutterBinaryMessageHandler handler = handler_info.handler;
+      NSData* data = nil;
+      if (message->hasData()) {
+        data = ConvertMappingToNSData(message->releaseData());
+      }
+
+      uint64_t platform_message_id = platform_message_counter++;
+      TRACE_EVENT_ASYNC_BEGIN1("flutter", "PlatformChannel ScheduleHandler", platform_message_id,
+                               "channel", message->channel().c_str());
+      dispatch_block_t run_handler = ^{
+        handler(data, ^(NSData* reply) {
+          TRACE_EVENT_ASYNC_END0("flutter", "PlatformChannel ScheduleHandler", platform_message_id);
+          // Called from any thread.
+          if (completer) {
+            if (reply) {
+              completer->Complete(ConvertNSDataToMappingPtr(reply));
+            } else {
+              completer->CompleteEmpty();
+            }
           }
-        }
-      });
-    };
-
-    if (handler_info.task_queue.get()) {
-      [handler_info.task_queue.get() dispatch:run_handler];
+        });
+      };
+
+      if (handler_info.task_queue.get()) {
+        [handler_info.task_queue.get() dispatch:run_handler];
+      } else {
+        dispatch_async(dispatch_get_main_queue(), run_handler);
+      }
     } else {
-      dispatch_async(dispatch_get_main_queue(), run_handler);
-    }
-  } else {
-    if (completer) {
-      completer->CompleteEmpty();
+      if (completer) {
+        completer->CompleteEmpty();
+      }
     }
   }
 }
 
+bool PlatformMessageHandlerIos::DoesHandlePlatformMessageOnPlatformThread() const {
+  return false;
+}
+
 void PlatformMessageHandlerIos::InvokePlatformMessageResponseCallback(
     int response_id,
     std::unique_ptr<fml::Mapping> mapping) {
@@ -114,15 +117,21 @@ void PlatformMessageHandlerIos::InvokePlatformMessageEmptyResponseCallback(int r
 void PlatformMessageHandlerIos::SetMessageHandler(const std::string& channel,
                                                   FlutterBinaryMessageHandler handler,
                                                   NSObject<FlutterTaskQueue>* task_queue) {
-  FML_CHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
+  FML_CHECK(platform_task_runner_->RunsTasksOnCurrentThread());
+  // Use `respondsToSelector` instead of `conformsToProtocol` to accomodate
+  // injecting your own `FlutterTaskQueue`. This is not a supported usage but
+  // not one worth breaking.
+  FML_CHECK(!task_queue || [task_queue respondsToSelector:@selector(dispatch:)]);
   /// TODO(gaaclarke): This should be migrated to a lockfree datastructure.
   std::lock_guard lock(message_handlers_mutex_);
   message_handlers_.erase(channel);
   if (handler) {
     message_handlers_[channel] = {
-        .task_queue = fml::scoped_nsprotocol([task_queue retain]),
+        .task_queue = fml::scoped_nsprotocol(
+            [static_cast<NSObject<FlutterTaskQueueDispatch>*>(task_queue) retain]),
         .handler =
-            fml::ScopedBlock<FlutterBinaryMessageHandler>{handler, fml::OwnershipPolicy::Retain},
+            fml::ScopedBlock<FlutterBinaryMessageHandler>{
+                handler, fml::scoped_policy::OwnershipPolicy::kRetain},
     };
   }
 }
diff --git a/shell/platform/darwin/ios/platform_message_handler_ios_test.mm b/shell/platform/darwin/ios/platform_message_handler_ios_test.mm
index 7249722c8062488c418296becffc18fd77ff3e94..b1e59dd4ad157dc80b5afb2140acc1b8a5d1d1ca 100644
--- a/shell/platform/darwin/ios/platform_message_handler_ios_test.mm
+++ b/shell/platform/darwin/ios/platform_message_handler_ios_test.mm
@@ -14,11 +14,11 @@
 #import "flutter/shell/common/thread_host.h"
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
 
-FLUTTER_ASSERT_NOT_ARC
+FLUTTER_ASSERT_ARC
 
 namespace {
 using namespace flutter;
-fml::RefPtr<fml::TaskRunner> CreateNewThread(std::string name) {
+fml::RefPtr<fml::TaskRunner> CreateNewThread(const std::string& name) {
   auto thread = std::make_unique<fml::Thread>(name);
   auto runner = thread->GetTaskRunner();
   return runner;
@@ -44,20 +44,20 @@ class MockPlatformMessageResponse : public PlatformMessageResponse {
 
 @implementation PlatformMessageHandlerIosTest
 - (void)testCreate {
-  flutter::TaskRunners task_runners("test", GetCurrentTaskRunner(), CreateNewThread("raster"),
-                                    CreateNewThread("ui"), CreateNewThread("io"));
-  auto handler = std::make_unique<PlatformMessageHandlerIos>(task_runners);
+  TaskRunners task_runners("test", GetCurrentTaskRunner(), CreateNewThread("raster"),
+                           CreateNewThread("ui"), CreateNewThread("io"));
+  auto handler = std::make_unique<PlatformMessageHandlerIos>(task_runners.GetPlatformTaskRunner());
   XCTAssertTrue(handler);
 }
 
 - (void)testSetAndCallHandler {
   ThreadHost thread_host("io.flutter.test." + std::string(self.name.UTF8String),
-                         ThreadHost::Type::RASTER | ThreadHost::Type::IO | ThreadHost::Type::UI);
+                         ThreadHost::Type::kRaster | ThreadHost::Type::kIo | ThreadHost::Type::kUi);
   TaskRunners task_runners(
       "test", GetCurrentTaskRunner(), thread_host.raster_thread->GetTaskRunner(),
       thread_host.ui_thread->GetTaskRunner(), thread_host.io_thread->GetTaskRunner());
 
-  auto handler = std::make_unique<PlatformMessageHandlerIos>(task_runners);
+  auto handler = std::make_unique<PlatformMessageHandlerIos>(task_runners.GetPlatformTaskRunner());
   std::string channel = "foo";
   XCTestExpectation* didCallReply = [self expectationWithDescription:@"didCallReply"];
   handler->SetMessageHandler(
@@ -78,12 +78,12 @@ class MockPlatformMessageResponse : public PlatformMessageResponse {
 
 - (void)testSetClearAndCallHandler {
   ThreadHost thread_host("io.flutter.test." + std::string(self.name.UTF8String),
-                         ThreadHost::Type::RASTER | ThreadHost::Type::IO | ThreadHost::Type::UI);
+                         ThreadHost::Type::kRaster | ThreadHost::Type::kIo | ThreadHost::Type::kUi);
   TaskRunners task_runners(
       "test", GetCurrentTaskRunner(), thread_host.raster_thread->GetTaskRunner(),
       thread_host.ui_thread->GetTaskRunner(), thread_host.io_thread->GetTaskRunner());
 
-  auto handler = std::make_unique<PlatformMessageHandlerIos>(task_runners);
+  auto handler = std::make_unique<PlatformMessageHandlerIos>(task_runners.GetPlatformTaskRunner());
   std::string channel = "foo";
   XCTestExpectation* didCallMessage = [self expectationWithDescription:@"didCallMessage"];
   handler->SetMessageHandler(
@@ -106,12 +106,12 @@ class MockPlatformMessageResponse : public PlatformMessageResponse {
 
 - (void)testSetAndCallHandlerTaskQueue {
   ThreadHost thread_host("io.flutter.test." + std::string(self.name.UTF8String),
-                         ThreadHost::Type::RASTER | ThreadHost::Type::IO | ThreadHost::Type::UI);
+                         ThreadHost::Type::kRaster | ThreadHost::Type::kIo | ThreadHost::Type::kUi);
   TaskRunners task_runners(
       "test", GetCurrentTaskRunner(), thread_host.raster_thread->GetTaskRunner(),
       thread_host.ui_thread->GetTaskRunner(), thread_host.io_thread->GetTaskRunner());
 
-  auto handler = std::make_unique<PlatformMessageHandlerIos>(task_runners);
+  auto handler = std::make_unique<PlatformMessageHandlerIos>(task_runners.GetPlatformTaskRunner());
   std::string channel = "foo";
   XCTestExpectation* didCallReply = [self expectationWithDescription:@"didCallReply"];
   NSObject<FlutterTaskQueue>* taskQueue = PlatformMessageHandlerIos::MakeBackgroundTaskQueue();
diff --git a/shell/platform/darwin/ios/platform_view_ios.h b/shell/platform/darwin/ios/platform_view_ios.h
index e9129350a4277c69915d59b88e6492abcc4c707b..fed1adfba189910823827a07d74203af1de5d952 100644
--- a/shell/platform/darwin/ios/platform_view_ios.h
+++ b/shell/platform/darwin/ios/platform_view_ios.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_PLATFORM_IOS_PLATFORM_VIEW_IOS_H_
-#define SHELL_PLATFORM_IOS_PLATFORM_VIEW_IOS_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_PLATFORM_VIEW_IOS_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_PLATFORM_VIEW_IOS_H_
 
 #include <memory>
 
 #include "flutter/fml/closure.h"
 #include "flutter/fml/macros.h"
-#include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
+#include "flutter/fml/platform/darwin/weak_nsobject.h"
 #include "flutter/shell/common/platform_view.h"
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterTexture.h"
 #import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h"
@@ -49,7 +49,9 @@ class PlatformViewIOS final : public PlatformView {
       PlatformView::Delegate& delegate,
       IOSRenderingAPI rendering_api,
       const std::shared_ptr<FlutterPlatformViewsController>& platform_views_controller,
-      const flutter::TaskRunners& task_runners);
+      const flutter::TaskRunners& task_runners,
+      const std::shared_ptr<fml::ConcurrentTaskRunner>& worker_task_runner,
+      const std::shared_ptr<const fml::SyncSwitch>& is_gpu_disabled_sync_switch);
 
   ~PlatformViewIOS() override;
 
@@ -57,14 +59,14 @@ class PlatformViewIOS final : public PlatformView {
    * Returns the `FlutterViewController` currently attached to the `FlutterEngine` owning
    * this PlatformViewIOS.
    */
-  fml::WeakPtr<FlutterViewController> GetOwnerViewController() const;
+  fml::WeakNSObject<FlutterViewController> GetOwnerViewController() const;
 
   /**
    * Updates the `FlutterViewController` currently attached to the `FlutterEngine` owning
    * this PlatformViewIOS. This should be updated when the `FlutterEngine`
    * is given a new `FlutterViewController`.
    */
-  void SetOwnerViewController(const fml::WeakPtr<FlutterViewController>& owner_controller);
+  void SetOwnerViewController(const fml::WeakNSObject<FlutterViewController>& owner_controller);
 
   /**
    * Called one time per `FlutterViewController` when the `FlutterViewController`'s
@@ -110,7 +112,7 @@ class PlatformViewIOS final : public PlatformView {
     ScopedObserver& operator=(const ScopedObserver&) = delete;
 
    private:
-    id<NSObject> observer_;
+    id<NSObject> observer_ = nil;
   };
 
   /// Wrapper that guarantees we communicate clearing Accessibility
@@ -131,7 +133,7 @@ class PlatformViewIOS final : public PlatformView {
     std::function<void(bool)> set_semantics_enabled_;
   };
 
-  fml::WeakPtr<FlutterViewController> owner_controller_;
+  fml::WeakNSObject<FlutterViewController> owner_controller_;
   // Since the `ios_surface_` is created on the platform thread but
   // used on the raster thread we need to protect it with a mutex.
   std::mutex ios_surface_mutex_;
@@ -140,7 +142,6 @@ class PlatformViewIOS final : public PlatformView {
   const std::shared_ptr<FlutterPlatformViewsController>& platform_views_controller_;
   AccessibilityBridgeManager accessibility_bridge_;
   fml::scoped_nsprotocol<FlutterTextInputPlugin*> text_input_plugin_;
-  fml::closure firstFrameCallback_;
   ScopedObserver dealloc_view_controller_observer_;
   std::vector<std::string> platform_resolved_locale_;
   std::shared_ptr<PlatformMessageHandlerIos> platform_message_handler_;
@@ -182,4 +183,4 @@ class PlatformViewIOS final : public PlatformView {
 
 }  // namespace flutter
 
-#endif  // SHELL_PLATFORM_IOS_PLATFORM_VIEW_IOS_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_PLATFORM_VIEW_IOS_H_
diff --git a/shell/platform/darwin/ios/platform_view_ios.mm b/shell/platform/darwin/ios/platform_view_ios.mm
index 7e054fcb803092db5e0d2060ee2c8b53615e169a..262df21d3c07eb6c54c1ec2cbe0a7cc9ba6f1ba2 100644
--- a/shell/platform/darwin/ios/platform_view_ios.mm
+++ b/shell/platform/darwin/ios/platform_view_ios.mm
@@ -48,20 +48,24 @@ PlatformViewIOS::PlatformViewIOS(
       ios_context_(context),
       platform_views_controller_(platform_views_controller),
       accessibility_bridge_([this](bool enabled) { PlatformView::SetSemanticsEnabled(enabled); }),
-      platform_message_handler_(new PlatformMessageHandlerIos(task_runners)) {}
+      platform_message_handler_(
+          new PlatformMessageHandlerIos(task_runners.GetPlatformTaskRunner())) {}
 
 PlatformViewIOS::PlatformViewIOS(
     PlatformView::Delegate& delegate,
     IOSRenderingAPI rendering_api,
     const std::shared_ptr<FlutterPlatformViewsController>& platform_views_controller,
-    const flutter::TaskRunners& task_runners)
+    const flutter::TaskRunners& task_runners,
+    const std::shared_ptr<fml::ConcurrentTaskRunner>& worker_task_runner,
+    const std::shared_ptr<const fml::SyncSwitch>& is_gpu_disabled_sync_switch)
     : PlatformViewIOS(
           delegate,
           IOSContext::Create(
               rendering_api,
               delegate.OnPlatformViewGetSettings().enable_impeller ? IOSRenderingBackend::kImpeller
                                                                    : IOSRenderingBackend::kSkia,
-              static_cast<MsaaSampleCount>(delegate.OnPlatformViewGetSettings().msaa_samples)),
+              static_cast<MsaaSampleCount>(delegate.OnPlatformViewGetSettings().msaa_samples),
+              is_gpu_disabled_sync_switch),
           platform_views_controller,
           task_runners) {}
 
@@ -72,12 +76,12 @@ void PlatformViewIOS::HandlePlatformMessage(std::unique_ptr<flutter::PlatformMes
   platform_message_handler_->HandlePlatformMessage(std::move(message));
 }
 
-fml::WeakPtr<FlutterViewController> PlatformViewIOS::GetOwnerViewController() const {
+fml::WeakNSObject<FlutterViewController> PlatformViewIOS::GetOwnerViewController() const {
   return owner_controller_;
 }
 
 void PlatformViewIOS::SetOwnerViewController(
-    const fml::WeakPtr<FlutterViewController>& owner_controller) {
+    const fml::WeakNSObject<FlutterViewController>& owner_controller) {
   FML_DCHECK(task_runners_.GetPlatformTaskRunner()->RunsTasksOnCurrentThread());
   std::lock_guard<std::mutex> guard(ios_surface_mutex_);
   if (ios_surface_ || !owner_controller) {
@@ -219,9 +223,12 @@ std::unique_ptr<std::vector<std::string>> PlatformViewIOS::ComputePlatformResolv
       [NSMutableArray arrayWithCapacity:supported_locale_data.size() / localeDataLength];
   for (size_t i = 0; i < supported_locale_data.size(); i += localeDataLength) {
     NSDictionary<NSString*, NSString*>* dict = @{
-      NSLocaleLanguageCode : [NSString stringWithUTF8String:supported_locale_data[i].c_str()],
-      NSLocaleCountryCode : [NSString stringWithUTF8String:supported_locale_data[i + 1].c_str()],
+      NSLocaleLanguageCode : [NSString stringWithUTF8String:supported_locale_data[i].c_str()]
+          ?: @"",
+      NSLocaleCountryCode : [NSString stringWithUTF8String:supported_locale_data[i + 1].c_str()]
+          ?: @"",
       NSLocaleScriptCode : [NSString stringWithUTF8String:supported_locale_data[i + 2].c_str()]
+          ?: @""
     };
     [supported_locale_identifiers addObject:[NSLocale localeIdentifierFromComponents:dict]];
   }
@@ -243,7 +250,7 @@ std::unique_ptr<std::vector<std::string>> PlatformViewIOS::ComputePlatformResolv
   return out;
 }
 
-PlatformViewIOS::ScopedObserver::ScopedObserver() : observer_(nil) {}
+PlatformViewIOS::ScopedObserver::ScopedObserver() {}
 
 PlatformViewIOS::ScopedObserver::~ScopedObserver() {
   if (observer_) {
diff --git a/shell/platform/darwin/ios/rendering_api_selection.mm b/shell/platform/darwin/ios/rendering_api_selection.mm
index 73cf47abc54448e2bdd1e91366073a1eebabd15a..f7b969066ff0d38f5e5a52358c8293b7c0f669f7 100644
--- a/shell/platform/darwin/ios/rendering_api_selection.mm
+++ b/shell/platform/darwin/ios/rendering_api_selection.mm
@@ -14,6 +14,8 @@
 
 #include "flutter/fml/logging.h"
 
+#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterMetalLayer.h"
+
 namespace flutter {
 
 #if SHELL_ENABLE_METAL
@@ -64,7 +66,11 @@ Class GetCoreAnimationLayerClassForRenderingAPI(IOSRenderingAPI rendering_api) {
       return [CALayer class];
     case IOSRenderingAPI::kMetal:
       if (@available(iOS METAL_IOS_VERSION_BASELINE, *)) {
-        return [CAMetalLayer class];
+        if ([FlutterMetalLayer enabled]) {
+          return [FlutterMetalLayer class];
+        } else {
+          return [CAMetalLayer class];
+        }
       }
       FML_CHECK(false) << "Metal availability should already have been checked";
       break;
diff --git a/shell/platform/darwin/macos/BUILD.gn b/shell/platform/darwin/macos/BUILD.gn
index 935a3c3591978b0080bb156d0e6cdfd899495520..b56bb449bd3ff187d17d1cce14f03723e9d2d903 100644
--- a/shell/platform/darwin/macos/BUILD.gn
+++ b/shell/platform/darwin/macos/BUILD.gn
@@ -7,7 +7,7 @@ assert(is_mac)
 import("//build/config/mac/mac_sdk.gni")
 import("//flutter/build/zip_bundle.gni")
 import("//flutter/shell/gpu/gpu.gni")
-import("//flutter/shell/platform/darwin/common/framework_shared.gni")
+import("//flutter/shell/platform/darwin/common/framework_common.gni")
 import("//flutter/shell/platform/glfw/config.gni")
 import("//flutter/testing/testing.gni")
 
@@ -38,7 +38,7 @@ _framework_binary_subpath = "Versions/A/$_flutter_framework_name"
 # the Flutter engine source root.
 _flutter_framework_headers = [
   "framework/Headers/FlutterAppDelegate.h",
-  "framework/Headers/FlutterDartProject.h",
+  "framework/Headers/FlutterAppLifecycleDelegate.h",
   "framework/Headers/FlutterEngine.h",
   "framework/Headers/FlutterMacOS.h",
   "framework/Headers/FlutterPlatformViews.h",
@@ -57,6 +57,7 @@ source_set("flutter_framework_source") {
     "framework/Source/AccessibilityBridgeMac.h",
     "framework/Source/AccessibilityBridgeMac.mm",
     "framework/Source/FlutterAppDelegate.mm",
+    "framework/Source/FlutterAppLifecycleDelegate.mm",
     "framework/Source/FlutterBackingStore.h",
     "framework/Source/FlutterBackingStore.mm",
     "framework/Source/FlutterChannelKeyResponder.h",
@@ -65,14 +66,14 @@ source_set("flutter_framework_source") {
     "framework/Source/FlutterCompositor.mm",
     "framework/Source/FlutterDartProject.mm",
     "framework/Source/FlutterDartProject_Internal.h",
+    "framework/Source/FlutterDisplayLink.h",
+    "framework/Source/FlutterDisplayLink.mm",
     "framework/Source/FlutterEmbedderKeyResponder.h",
     "framework/Source/FlutterEmbedderKeyResponder.mm",
     "framework/Source/FlutterEngine.mm",
     "framework/Source/FlutterEngine_Internal.h",
     "framework/Source/FlutterExternalTexture.h",
     "framework/Source/FlutterExternalTexture.mm",
-    "framework/Source/FlutterIOSurfaceHolder.h",
-    "framework/Source/FlutterIOSurfaceHolder.mm",
     "framework/Source/FlutterKeyPrimaryResponder.h",
     "framework/Source/FlutterKeyboardManager.h",
     "framework/Source/FlutterKeyboardManager.mm",
@@ -82,16 +83,16 @@ source_set("flutter_framework_source") {
     "framework/Source/FlutterMenuPlugin_Internal.h",
     "framework/Source/FlutterMouseCursorPlugin.h",
     "framework/Source/FlutterMouseCursorPlugin.mm",
+    "framework/Source/FlutterMutatorView.h",
+    "framework/Source/FlutterMutatorView.mm",
     "framework/Source/FlutterPlatformNodeDelegateMac.h",
     "framework/Source/FlutterPlatformNodeDelegateMac.mm",
     "framework/Source/FlutterPlatformViewController.h",
     "framework/Source/FlutterPlatformViewController.mm",
     "framework/Source/FlutterRenderer.h",
     "framework/Source/FlutterRenderer.mm",
-    "framework/Source/FlutterResizableBackingStoreProvider.h",
-    "framework/Source/FlutterResizableBackingStoreProvider.mm",
-    "framework/Source/FlutterResizeSynchronizer.h",
-    "framework/Source/FlutterResizeSynchronizer.mm",
+    "framework/Source/FlutterSurface.h",
+    "framework/Source/FlutterSurface.mm",
     "framework/Source/FlutterSurfaceManager.h",
     "framework/Source/FlutterSurfaceManager.mm",
     "framework/Source/FlutterTextInputPlugin.h",
@@ -100,6 +101,12 @@ source_set("flutter_framework_source") {
     "framework/Source/FlutterTextInputSemanticsObject.mm",
     "framework/Source/FlutterTextureRegistrar.h",
     "framework/Source/FlutterTextureRegistrar.mm",
+    "framework/Source/FlutterThreadSynchronizer.h",
+    "framework/Source/FlutterThreadSynchronizer.mm",
+    "framework/Source/FlutterTimeConverter.h",
+    "framework/Source/FlutterTimeConverter.mm",
+    "framework/Source/FlutterVSyncWaiter.h",
+    "framework/Source/FlutterVSyncWaiter.mm",
     "framework/Source/FlutterView.h",
     "framework/Source/FlutterView.mm",
     "framework/Source/FlutterViewController.mm",
@@ -120,10 +127,11 @@ source_set("flutter_framework_source") {
     "//flutter/shell/platform/common:common_cpp_enums",
     "//flutter/shell/platform/common:common_cpp_input",
     "//flutter/shell/platform/common:common_cpp_switches",
-    "//flutter/shell/platform/darwin/common:framework_shared",
+    "//flutter/shell/platform/darwin/common:availability_version_check",
+    "//flutter/shell/platform/darwin/common:framework_common",
     "//flutter/shell/platform/darwin/graphics:graphics",
     "//flutter/shell/platform/embedder:embedder_as_internal_library",
-    "//third_party/skia",
+    "//flutter/skia",
   ]
 
   public_configs = [ "//flutter:config" ]
@@ -149,7 +157,10 @@ shared_library("flutter_framework_dylib") {
   visibility = [ ":*" ]
   output_name = "$_flutter_framework_name"
 
-  ldflags = [ "-Wl,-install_name,@rpath/$_flutter_framework_filename/$_framework_binary_subpath" ]
+  ldflags = [
+    "-Wl,-install_name,@rpath/$_flutter_framework_filename/$_framework_binary_subpath",
+    "-fapplication-extension",
+  ]
 
   deps = [ ":flutter_framework_source" ]
 }
@@ -157,7 +168,7 @@ shared_library("flutter_framework_dylib") {
 test_fixtures("flutter_desktop_darwin_fixtures") {
   dart_main = "framework/Source/fixtures/flutter_desktop_test.dart"
 
-  fixtures = [ "//third_party/icu/common/icudtl.dat" ]
+  fixtures = [ "//flutter/third_party/icu/common/icudtl.dat" ]
 }
 
 executable("flutter_desktop_darwin_unittests") {
@@ -165,8 +176,10 @@ executable("flutter_desktop_darwin_unittests") {
 
   sources = [
     "framework/Source/AccessibilityBridgeMacTest.mm",
+    "framework/Source/FlutterAppDelegateTest.mm",
+    "framework/Source/FlutterAppLifecycleDelegateTest.mm",
     "framework/Source/FlutterChannelKeyResponderTest.mm",
-    "framework/Source/FlutterCompositorTest.mm",
+    "framework/Source/FlutterDisplayLinkTest.mm",
     "framework/Source/FlutterEmbedderExternalTextureTest.mm",
     "framework/Source/FlutterEmbedderKeyResponderTest.mm",
     "framework/Source/FlutterEngineTest.mm",
@@ -174,16 +187,20 @@ executable("flutter_desktop_darwin_unittests") {
     "framework/Source/FlutterEngineTestUtils.mm",
     "framework/Source/FlutterKeyboardManagerTest.mm",
     "framework/Source/FlutterMenuPluginTest.mm",
+    "framework/Source/FlutterMutatorViewTest.mm",
     "framework/Source/FlutterPlatformNodeDelegateMacTest.mm",
     "framework/Source/FlutterPlatformViewControllerTest.mm",
-    "framework/Source/FlutterRendererTest.mm",
     "framework/Source/FlutterSurfaceManagerTest.mm",
     "framework/Source/FlutterTextInputPluginTest.mm",
     "framework/Source/FlutterTextInputSemanticsObjectTest.mm",
+    "framework/Source/FlutterThreadSynchronizerTest.mm",
+    "framework/Source/FlutterVSyncWaiterTest.mm",
     "framework/Source/FlutterViewControllerTest.mm",
     "framework/Source/FlutterViewControllerTestUtils.h",
     "framework/Source/FlutterViewControllerTestUtils.mm",
     "framework/Source/FlutterViewEngineProviderTest.mm",
+    "framework/Source/FlutterViewTest.mm",
+    "framework/Source/KeyCodeMapTest.mm",
     "framework/Source/TestFlutterPlatformView.h",
     "framework/Source/TestFlutterPlatformView.mm",
   ]
@@ -197,15 +214,16 @@ executable("flutter_desktop_darwin_unittests") {
     ":flutter_framework_source",
     "//flutter/shell/platform/common:common_cpp_accessibility",
     "//flutter/shell/platform/common:common_cpp_enums",
-    "//flutter/shell/platform/darwin/common:framework_shared",
+    "//flutter/shell/platform/darwin/common:framework_common",
     "//flutter/shell/platform/darwin/graphics",
     "//flutter/shell/platform/embedder:embedder_as_internal_library",
     "//flutter/shell/platform/embedder:embedder_test_utils",
     "//flutter/testing",
+    "//flutter/testing:autoreleasepool_test",
     "//flutter/testing:dart",
     "//flutter/testing:skia",
     "//flutter/testing:testing_lib",
-    "//third_party/ocmock:ocmock",
+    "//flutter/third_party/ocmock:ocmock",
   ]
 }
 
@@ -234,7 +252,7 @@ action("copy_framework_headers") {
   script = "//flutter/sky/tools/install_framework_headers.py"
   visibility = [ ":*" ]
   sources = get_path_info(_flutter_framework_headers, "abspath") +
-            framework_shared_headers
+            framework_common_headers
   outputs = []
   foreach(header, sources) {
     header_basename = get_path_info(header, "file")
@@ -249,7 +267,7 @@ action("copy_framework_headers") {
 
 copy("copy_framework_icu") {
   visibility = [ ":*" ]
-  sources = [ "//third_party/icu/flutter/icudtl.dat" ]
+  sources = [ "//flutter/third_party/icu/flutter/icudtl.dat" ]
   outputs =
       [ "$_flutter_framework_dir/Versions/A/Resources/{{source_file_part}}" ]
 }
@@ -294,8 +312,26 @@ action("_generate_symlinks") {
   }
 }
 
-group("flutter_framework") {
-  deps = [ ":_generate_symlinks" ]
+group("universal_flutter_framework") {
+  visibility = [ ":*" ]
+  deps = [
+    ":_generate_symlinks",
+    ":_generate_symlinks_and_verify_framework_module",
+  ]
+}
+
+action("flutter_framework") {
+  script = "//flutter/sky/tools/create_xcframework.py"
+  outputs = [ "$root_out_dir/FlutterMacOS.xcframework" ]
+  args = [
+    "--frameworks",
+    rebase_path(_flutter_framework_dir),
+    "--name",
+    "FlutterMacOS",
+    "--location",
+    rebase_path(root_out_dir),
+  ]
+  deps = [ ":universal_flutter_framework" ]
 }
 
 if (build_glfw_shell) {
@@ -332,3 +368,21 @@ generated_file("macos_framework_without_entitlement_config") {
 
   deps = [ ":_generate_symlinks" ]
 }
+
+shared_library("_generate_symlinks_and_verify_framework_module") {
+  framework_search_path = rebase_path("$root_out_dir")
+  visibility = [ ":*" ]
+  cflags_objc = [ "-F$framework_search_path" ]
+
+  ldflags = [
+    "-F$framework_search_path",
+    "-fapplication-extension",
+    "-Xlinker",
+    "-fatal_warnings",
+  ]
+  frameworks = [ "FlutterMacOS.framework" ]
+
+  sources = [ "framework/Source/FlutterUmbrellaImportTests.m" ]
+
+  deps = [ ":_generate_symlinks" ]
+}
diff --git a/shell/platform/darwin/macos/README.md b/shell/platform/darwin/macos/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..fb582924d6f1a7f1568f1647c0ee92c9a6e0ae34
--- /dev/null
+++ b/shell/platform/darwin/macos/README.md
@@ -0,0 +1,58 @@
+# Flutter macOS Embedder
+
+This directory contains files specific to the Flutter macOS embedder. The
+embedder is built as a macOS framework that is linked into the target
+application. The framework is composed both of macOS-specific code and code
+shared with the iOS embedder. These can be found in:
+```
+flutter/shell/platform/darwin/common/framework
+flutter/shell/platform/darwin/macos/framework
+```
+
+Additionally, the framework relies on utility code shared across all embedders,
+which is found in:
+```
+flutter/shell/platform/common
+```
+
+To learn more, see the [Engine architecture wiki][wiki_arch].
+
+## Building
+
+Building all artifacts required for macOS occurs in two steps:
+* Host binary build: Builds tooling used by the Flutter tool to build Flutter
+  applications targeting macOS.
+* macOS Target build: Builds the framework that implements the macOS Flutter
+  embedder and exposes public API such as `FlutterViewController` used by
+  Flutter applications.
+
+Once you've [prepared your environment for engine development][wiki_engine_env],
+you can build the macOS embedder from the `src/flutter` directory using the
+following commands:
+```sh
+# Perform the host build.
+./tools/gn --unopt --no-goma
+autoninja -C ../out/host_debug_unopt      
+
+# Perform the macOS target build.
+./tools/gn --unopt --mac --no-goma
+autoninja -C ../out/mac_debug_unopt
+```
+Builds are architecture-specific, and can be controlled by specifying
+`--mac-cpu=arm64` or `--mac-cpu=x64` (default) when invoking `gn`.
+
+Googlers can remove `--no-goma` to make use of the Goma distributed compile
+service.
+
+## Testing
+
+The macOS-specific embedder tests are built as the
+`flutter_desktop_darwin_unittests` binary. Like all gtest-based test binaries, a
+subset of tests can be run by applying a filter such as
+`--gtest_filter='FlutterViewControllerTest.*Key*'`.
+
+More general details on testing can be found on the [Wiki][wiki_engine_testing].
+
+[wiki_arch]: https://github.com/flutter/flutter/wiki/The-Engine-architecture
+[wiki_engine_env]: https://github.com/flutter/flutter/wiki/Setting-up-the-Engine-development-environment
+[wiki_engine_testing]: https://github.com/flutter/flutter/wiki/Testing-the-engine
diff --git a/shell/platform/darwin/macos/framework/Headers/FlutterAppDelegate.h b/shell/platform/darwin/macos/framework/Headers/FlutterAppDelegate.h
index 092c0115d077f77c0e17a39b734272f61980f384..9390a011655dd21ec90588ff5ba95547a7463eea 100644
--- a/shell/platform/darwin/macos/framework/Headers/FlutterAppDelegate.h
+++ b/shell/platform/darwin/macos/framework/Headers/FlutterAppDelegate.h
@@ -2,15 +2,40 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLUTTERAPPDELEGATE_H_
-#define FLUTTER_FLUTTERAPPDELEGATE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_HEADERS_FLUTTERAPPDELEGATE_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_HEADERS_FLUTTERAPPDELEGATE_H_
 
 #import <Cocoa/Cocoa.h>
 
+#import "FlutterAppLifecycleDelegate.h"
 #import "FlutterMacros.h"
 
 /**
- * `NSApplicationDelegate` subclass for simple apps that want default behavior.
+ * A protocol to be implemented by the `NSApplicationDelegate` of an application to enable the
+ * Flutter framework and any Flutter plugins to register to receive application life cycle events.
+ *
+ * Implementers should forward all of the `NSApplicationDelegate` methods corresponding to the
+ * handlers in FlutterAppLifecycleDelegate to any registered delegates.
+ */
+FLUTTER_DARWIN_EXPORT
+@protocol FlutterAppLifecycleProvider <NSObject>
+
+/**
+ * Adds an object implementing |FlutterAppLifecycleDelegate| to the list of
+ * delegates to be informed of application lifecycle events.
+ */
+- (void)addApplicationLifecycleDelegate:(nonnull NSObject<FlutterAppLifecycleDelegate>*)delegate;
+
+/**
+ * Removes an object implementing |FlutterAppLifecycleDelegate| to the list of
+ * delegates to be informed of application lifecycle events.
+ */
+- (void)removeApplicationLifecycleDelegate:(nonnull NSObject<FlutterAppLifecycleDelegate>*)delegate;
+
+@end
+
+/**
+ * |NSApplicationDelegate| subclass for simple apps that want default behavior.
  *
  * This class implements the following behaviors:
  *   * Updates the application name of items in the application menu to match the name in
@@ -19,25 +44,26 @@
  *   * Updates the main Flutter window's title to match the name in the app's Info.plist.
  *     |mainFlutterWindow| must be set before the application finishes launching for this to take
  *     effect.
+ *   * Forwards `NSApplicationDelegate` callbacks to plugins that register for them.
  *
  * App delegates for Flutter applications are *not* required to inherit from
  * this class. Developers of custom app delegate classes should copy and paste
  * code as necessary from FlutterAppDelegate.mm.
  */
 FLUTTER_DARWIN_EXPORT
-@interface FlutterAppDelegate : NSObject <NSApplicationDelegate>
+@interface FlutterAppDelegate : NSObject <NSApplicationDelegate, FlutterAppLifecycleProvider>
 
 /**
  * The application menu in the menu bar.
  */
-@property(weak, nonatomic) IBOutlet NSMenu* applicationMenu;
+@property(weak, nonatomic, nullable) IBOutlet NSMenu* applicationMenu;
 
 /**
- * The primary application window containing a FlutterViewController. This is primarily intended
- * for use in single-window applications.
+ * The primary application window containing a FlutterViewController. This is
+ * primarily intended for use in single-window applications.
  */
-@property(weak, nonatomic) IBOutlet NSWindow* mainFlutterWindow;
+@property(weak, nonatomic, nullable) IBOutlet NSWindow* mainFlutterWindow;
 
 @end
 
-#endif  // FLUTTER_FLUTTERAPPDELEGATE_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_HEADERS_FLUTTERAPPDELEGATE_H_
diff --git a/shell/platform/darwin/macos/framework/Headers/FlutterAppLifecycleDelegate.h b/shell/platform/darwin/macos/framework/Headers/FlutterAppLifecycleDelegate.h
new file mode 100644
index 0000000000000000000000000000000000000000..85ce96aa65c517aabaeb5309fba73171911c40ff
--- /dev/null
+++ b/shell/platform/darwin/macos/framework/Headers/FlutterAppLifecycleDelegate.h
@@ -0,0 +1,147 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_HEADERS_FLUTTERAPPLIFECYCLEDELEGATE_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_HEADERS_FLUTTERAPPLIFECYCLEDELEGATE_H_
+
+#import <Cocoa/Cocoa.h>
+#include <Foundation/Foundation.h>
+
+#import "FlutterMacros.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+#pragma mark -
+/**
+ * Protocol for listener of lifecycle events from the NSApplication, typically a
+ * FlutterPlugin.
+ */
+FLUTTER_DARWIN_EXPORT
+@protocol FlutterAppLifecycleDelegate <NSObject>
+
+@optional
+/**
+ * Called when the |FlutterAppDelegate| gets the applicationWillFinishLaunching
+ * notification.
+ */
+- (void)handleWillFinishLaunching:(NSNotification*)notification;
+
+/**
+ * Called when the |FlutterAppDelegate| gets the applicationDidFinishLaunching
+ * notification.
+ */
+- (void)handleDidFinishLaunching:(NSNotification*)notification;
+
+/**
+ * Called when the |FlutterAppDelegate| gets the applicationWillBecomeActive
+ * notification.
+ */
+- (void)handleWillBecomeActive:(NSNotification*)notification;
+
+/**
+ * Called when the |FlutterAppDelegate| gets the applicationDidBecomeActive
+ * notification.
+ */
+- (void)handleDidBecomeActive:(NSNotification*)notification;
+
+/**
+ * Called when the |FlutterAppDelegate| gets the applicationWillResignActive
+ * notification.
+ */
+- (void)handleWillResignActive:(NSNotification*)notification;
+
+/**
+ * Called when the |FlutterAppDelegate| gets the applicationWillResignActive
+ * notification.
+ */
+- (void)handleDidResignActive:(NSNotification*)notification;
+
+/**
+ * Called when the |FlutterAppDelegate| gets the applicationWillHide
+ * notification.
+ */
+- (void)handleWillHide:(NSNotification*)notification;
+
+/**
+ * Called when the |FlutterAppDelegate| gets the applicationDidHide
+ * notification.
+ */
+- (void)handleDidHide:(NSNotification*)notification;
+
+/**
+ * Called when the |FlutterAppDelegate| gets the applicationWillUnhide
+ * notification.
+ */
+- (void)handleWillUnhide:(NSNotification*)notification;
+
+/**
+ * Called when the |FlutterAppDelegate| gets the applicationDidUnhide
+ * notification.
+ */
+- (void)handleDidUnhide:(NSNotification*)notification;
+
+/**
+ * Called when the |FlutterAppDelegate| gets the applicationDidUnhide
+ * notification.
+ */
+- (void)handleDidChangeScreenParameters:(NSNotification*)notification;
+
+/**
+ * Called when the |FlutterAppDelegate| gets the applicationDidUnhide
+ * notification.
+ */
+- (void)handleDidChangeOcclusionState:(NSNotification*)notification;
+
+/**
+ * Called when the |FlutterAppDelegate| gets the application:openURLs:
+ * callback.
+ *
+ * Implementers should return YES if they handle the URLs, otherwise NO.
+ * Delegates will be called in order of registration, and once a delegate
+ * returns YES, no further delegates will reiceve this callback.
+ */
+- (BOOL)handleOpenURLs:(NSArray<NSURL*>*)urls;
+
+/**
+ * Called when the |FlutterAppDelegate| gets the applicationWillTerminate
+ * notification.
+ *
+ * Applications should not rely on always receiving all possible notifications.
+ *
+ * For example, if the application is killed with a task manager, a kill signal,
+ * the user pulls the power from the device, or there is a rapid unscheduled
+ * disassembly of the device, no notification will be sent before the
+ * application is suddenly terminated, and this notification may be skipped.
+ */
+- (void)handleWillTerminate:(NSNotification*)notification;
+@end
+
+#pragma mark -
+
+/**
+ * Propagates `NSAppDelegate` callbacks to registered delegates.
+ */
+FLUTTER_DARWIN_EXPORT
+@interface FlutterAppLifecycleRegistrar : NSObject <FlutterAppLifecycleDelegate>
+
+/**
+ * Registers `delegate` to receive lifecycle callbacks via this
+ * FlutterAppLifecycleDelegate as long as it is alive.
+ *
+ * `delegate` will only be referenced weakly.
+ */
+- (void)addDelegate:(NSObject<FlutterAppLifecycleDelegate>*)delegate;
+
+/**
+ * Unregisters `delegate` so that it will no longer receive life cycle callbacks
+ * via this FlutterAppLifecycleDelegate.
+ *
+ * `delegate` will only be referenced weakly.
+ */
+- (void)removeDelegate:(NSObject<FlutterAppLifecycleDelegate>*)delegate;
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_HEADERS_FLUTTERAPPLIFECYCLEDELEGATE_H_
diff --git a/shell/platform/darwin/macos/framework/Headers/FlutterDartProject.h b/shell/platform/darwin/macos/framework/Headers/FlutterDartProject.h
deleted file mode 100644
index 4a83e4d3e6062447125e6b9d8f525ddf8d9cc1e9..0000000000000000000000000000000000000000
--- a/shell/platform/darwin/macos/framework/Headers/FlutterDartProject.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_FLUTTERDARTPROJECT_H_
-#define FLUTTER_FLUTTERDARTPROJECT_H_
-
-#import <Foundation/Foundation.h>
-
-#import "FlutterMacros.h"
-
-/**
- * A set of Flutter and Dart assets used by a `FlutterEngine` to initialize execution.
- *
- * TODO(stuartmorgan): Align API with FlutterDartProject, and combine.
- */
-FLUTTER_DARWIN_EXPORT
-@interface FlutterDartProject : NSObject
-
-/**
- * Initializes a Flutter Dart project from a bundle.
- *
- * The bundle must either contain a flutter_assets resource directory, or set the Info.plist key
- * FLTAssetsPath to override that name (if you are doing a custom build using a different name).
- *
- * @param bundle The bundle containing the Flutter assets directory. If nil, the App framework
- *               created by Flutter will be used.
- */
-- (nonnull instancetype)initWithPrecompiledDartBundle:(nullable NSBundle*)bundle
-    NS_DESIGNATED_INITIALIZER;
-
-/**
- * If set, allows the Flutter project to use the dart:mirrors library.
- *
- * Deprecated: This function is temporary and will be removed in a future release.
- */
-@property(nonatomic) bool enableMirrors;
-
-/**
- * An NSArray of NSStrings to be passed as command line arguments to the Dart entrypoint.
- *
- * If this is not explicitly set, this will default to the contents of
- * [NSProcessInfo arguments], without the binary name.
- *
- * Set this to nil to pass no arguments to the Dart entrypoint.
- */
-@property(nonatomic, nullable, copy) NSArray<NSString*>* dartEntrypointArguments;
-
-@end
-
-#endif  // FLUTTER_FLUTTERDARTPROJECT_H_
diff --git a/shell/platform/darwin/macos/framework/Headers/FlutterEngine.h b/shell/platform/darwin/macos/framework/Headers/FlutterEngine.h
index 49032f87d3a91516fb56903a1ef78a731added25..cebdf9005eb80a1122a1cc6b3cc30891449401ba 100644
--- a/shell/platform/darwin/macos/framework/Headers/FlutterEngine.h
+++ b/shell/platform/darwin/macos/framework/Headers/FlutterEngine.h
@@ -2,26 +2,33 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLUTTERENGINE_H_
-#define FLUTTER_FLUTTERENGINE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_HEADERS_FLUTTERENGINE_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_HEADERS_FLUTTERENGINE_H_
 
 #import <Foundation/Foundation.h>
 
+#include <stdint.h>
+
+#import "FlutterAppLifecycleDelegate.h"
 #import "FlutterBinaryMessenger.h"
 #import "FlutterDartProject.h"
 #import "FlutterMacros.h"
 #import "FlutterPluginRegistrarMacOS.h"
 #import "FlutterTexture.h"
 
-// TODO: Merge this file with the iOS FlutterEngine.h.
+// TODO(stuartmorgan): Merge this file with the iOS FlutterEngine.h.
 
 @class FlutterViewController;
 
 /**
  * Coordinates a single instance of execution of a Flutter engine.
+ *
+ * A FlutterEngine can only be attached with one controller from the native
+ * code.
  */
 FLUTTER_DARWIN_EXPORT
-@interface FlutterEngine : NSObject <FlutterTextureRegistry, FlutterPluginRegistry>
+@interface FlutterEngine
+    : NSObject <FlutterTextureRegistry, FlutterPluginRegistry, FlutterAppLifecycleDelegate>
 
 /**
  * Initializes an engine with the given project.
@@ -63,10 +70,18 @@ FLUTTER_DARWIN_EXPORT
 - (BOOL)runWithEntrypoint:(nullable NSString*)entrypoint;
 
 /**
- * The default `FlutterViewController` associated with this engine, if any.
+ * The `FlutterViewController` of this engine, if any.
+ *
+ * This view is used by legacy APIs that assume a single view.
+ *
+ * Setting this field from nil to a non-nil view controller also updates
+ * the view controller's engine and ID.
+ *
+ * Setting this field from non-nil to nil will terminate the engine if
+ * allowHeadlessExecution is NO.
  *
- * The default view always has ID kFlutterDefaultViewId, and is the view
- * operated by the APIs that do not have a view ID specified.
+ * Setting this field from non-nil to a different non-nil FlutterViewController
+ * is prohibited and will throw an assertion error.
  */
 @property(nonatomic, nullable, weak) FlutterViewController* viewController;
 
@@ -84,4 +99,4 @@ FLUTTER_DARWIN_EXPORT
 
 @end
 
-#endif  // FLUTTER_FLUTTERENGINE_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_HEADERS_FLUTTERENGINE_H_
diff --git a/shell/platform/darwin/macos/framework/Headers/FlutterMacOS.h b/shell/platform/darwin/macos/framework/Headers/FlutterMacOS.h
index 5fc794b92995d7995347523f29d111e91e87da25..f79332512f8b5e85c6e89e72c674e50a0dc07cb2 100644
--- a/shell/platform/darwin/macos/framework/Headers/FlutterMacOS.h
+++ b/shell/platform/darwin/macos/framework/Headers/FlutterMacOS.h
@@ -2,7 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_HEADERS_FLUTTERMACOS_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_HEADERS_FLUTTERMACOS_H_
+
 #import "FlutterAppDelegate.h"
+#import "FlutterAppLifecycleDelegate.h"
 #import "FlutterBinaryMessenger.h"
 #import "FlutterChannels.h"
 #import "FlutterCodecs.h"
@@ -13,3 +17,5 @@
 #import "FlutterPluginRegistrarMacOS.h"
 #import "FlutterTexture.h"
 #import "FlutterViewController.h"
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_HEADERS_FLUTTERMACOS_H_
diff --git a/shell/platform/darwin/macos/framework/Headers/FlutterPlatformViews.h b/shell/platform/darwin/macos/framework/Headers/FlutterPlatformViews.h
index 4287a34785cdc09d4702e107277256fd4cf47bf2..2f35b898c3df3fecf499f4e16e47e96a019f8a00 100644
--- a/shell/platform/darwin/macos/framework/Headers/FlutterPlatformViews.h
+++ b/shell/platform/darwin/macos/framework/Headers/FlutterPlatformViews.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLUTTERPLATFORMVIEWS_H_
-#define FLUTTER_FLUTTERPLATFORMVIEWS_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_HEADERS_FLUTTERPLATFORMVIEWS_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_HEADERS_FLUTTERPLATFORMVIEWS_H_
 
 #import <AppKit/AppKit.h>
 
@@ -37,4 +37,4 @@
 - (nullable NSObject<FlutterMessageCodec>*)createArgsCodec;
 @end
 
-#endif  // FLUTTER_FLUTTERPLATFORMVIEWS_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_HEADERS_FLUTTERPLATFORMVIEWS_H_
diff --git a/shell/platform/darwin/macos/framework/Headers/FlutterPluginMacOS.h b/shell/platform/darwin/macos/framework/Headers/FlutterPluginMacOS.h
index cbedb0566a767ef5187a8d6ea368fe1a665ca990..8cc14928e1f8858cfc6bd4c07d0cafa09a7bfbb1 100644
--- a/shell/platform/darwin/macos/framework/Headers/FlutterPluginMacOS.h
+++ b/shell/platform/darwin/macos/framework/Headers/FlutterPluginMacOS.h
@@ -2,14 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_HEADERS_FLUTTERPLUGINMACOS_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_HEADERS_FLUTTERPLUGINMACOS_H_
+
 #import <Foundation/Foundation.h>
 
+#import "FlutterAppLifecycleDelegate.h"
 #import "FlutterChannels.h"
 #import "FlutterCodecs.h"
 #import "FlutterMacros.h"
 
-// TODO: Merge this file and FlutterPluginRegistrarMacOS.h with the iOS FlutterPlugin.h, sharing
-// all but the platform-specific methods.
+NS_ASSUME_NONNULL_BEGIN
 
 @protocol FlutterPluginRegistrar;
 
@@ -23,13 +26,13 @@
  * expand over time to more closely match the functionality of the iOS FlutterPlugin.
  */
 FLUTTER_DARWIN_EXPORT
-@protocol FlutterPlugin <NSObject>
+@protocol FlutterPlugin <NSObject, FlutterAppLifecycleDelegate>
 
 /**
  * Creates an instance of the plugin to register with |registrar| using the desired
  * FlutterPluginRegistrar methods.
  */
-+ (void)registerWithRegistrar:(nonnull id<FlutterPluginRegistrar>)registrar;
++ (void)registerWithRegistrar:(id<FlutterPluginRegistrar>)registrar;
 
 @optional
 
@@ -44,6 +47,10 @@ FLUTTER_DARWIN_EXPORT
  * - Any other value (including nil) to indicate success. The value will
  *   be returned to the Flutter caller, and must be serializable to JSON.
  */
-- (void)handleMethodCall:(nonnull FlutterMethodCall*)call result:(nonnull FlutterResult)result;
+- (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result;
+
+NS_ASSUME_NONNULL_END
 
 @end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_HEADERS_FLUTTERPLUGINMACOS_H_
diff --git a/shell/platform/darwin/macos/framework/Headers/FlutterPluginRegistrarMacOS.h b/shell/platform/darwin/macos/framework/Headers/FlutterPluginRegistrarMacOS.h
index 12c7f618a38e897825de96ad24c1fa4f2255cadc..5b990dd84da18f8a7e4416a33c40a2301d4c8858 100644
--- a/shell/platform/darwin/macos/framework/Headers/FlutterPluginRegistrarMacOS.h
+++ b/shell/platform/darwin/macos/framework/Headers/FlutterPluginRegistrarMacOS.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_HEADERS_FLUTTERPLUGINREGISTRARMACOS_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_HEADERS_FLUTTERPLUGINREGISTRARMACOS_H_
+
 #import <Cocoa/Cocoa.h>
 
 #import "FlutterBinaryMessenger.h"
@@ -11,12 +14,12 @@
 #import "FlutterPluginMacOS.h"
 #import "FlutterTexture.h"
 
-// TODO: Merge this file and FlutterPluginMacOS.h with the iOS FlutterPlugin.h, sharing all but
-// the platform-specific methods.
+// TODO(stuartmorgan): Merge this file and FlutterPluginMacOS.h with the iOS FlutterPlugin.h,
+// sharing all but the platform-specific methods.
 
 /**
  * The protocol for an object managing registration for a plugin. It provides access to application
- * context, as as allowing registering for callbacks for handling various conditions.
+ * context, as allowing registering for callbacks for handling various conditions.
  *
  * Currently the macOS PluginRegistrar has very limited functionality, but is expected to expand
  * over time to more closely match the functionality of FlutterPluginRegistrar.
@@ -36,10 +39,13 @@ FLUTTER_DARWIN_EXPORT
 @property(nonnull, readonly) id<FlutterTextureRegistry> textures;
 
 /**
- * The view displaying Flutter content. May return |nil|, for instance in a headless environment.
+ * The view displaying Flutter content.
+ *
+ * This property is provided for backwards compatibility for apps
+ * that assume a single view. This will eventually be replaced by
+ * a multi-view API variant.
  *
- * WARNING: If/when multiple Flutter views within the same application are supported (#30701), this
- * API will change.
+ * This method may return |nil|, for instance in a headless environment.
  */
 @property(nullable, readonly) NSView* view;
 
@@ -49,6 +55,13 @@ FLUTTER_DARWIN_EXPORT
 - (void)addMethodCallDelegate:(nonnull id<FlutterPlugin>)delegate
                       channel:(nonnull FlutterMethodChannel*)channel;
 
+/**
+ * Registers the plugin as a receiver of `NSApplicationDelegate` calls.
+ *
+ * @param delegate The receiving object, such as the plugin's main class.
+ */
+- (void)addApplicationDelegate:(nonnull NSObject<FlutterAppLifecycleDelegate>*)delegate;
+
 /**
  * Registers a `FlutterPlatformViewFactory` for creation of platform views.
  *
@@ -61,6 +74,41 @@ FLUTTER_DARWIN_EXPORT
 - (void)registerViewFactory:(nonnull NSObject<FlutterPlatformViewFactory>*)factory
                      withId:(nonnull NSString*)factoryId;
 
+/**
+ * Publishes a value for external use of the plugin.
+ *
+ * Plugins may publish a single value, such as an instance of the
+ * plugin's main class, for situations where external control or
+ * interaction is needed.
+ *
+ * The published value will be available from the `FlutterPluginRegistry`.
+ * Repeated calls overwrite any previous publication.
+ *
+ * @param value The value to be published.
+ */
+- (void)publish:(nonnull NSObject*)value;
+
+/**
+ * Returns the file name for the given asset.
+ * The returned file name can be used to access the asset in the application's main bundle.
+ *
+ * @param asset The name of the asset. The name can be hierarchical.
+ * @return the file name to be used for lookup in the main bundle.
+ */
+- (nonnull NSString*)lookupKeyForAsset:(nonnull NSString*)asset;
+
+/**
+ * Returns the file name for the given asset which originates from the specified package.
+ * The returned file name can be used to access the asset in the application's main bundle.
+ *
+ *
+ * @param asset The name of the asset. The name can be hierarchical.
+ * @param package The name of the package from which the asset originates.
+ * @return the file name to be used for lookup in the main bundle.
+ */
+- (nonnull NSString*)lookupKeyForAsset:(nonnull NSString*)asset
+                           fromPackage:(nonnull NSString*)package;
+
 @end
 
 /**
@@ -88,4 +136,16 @@ FLUTTER_DARWIN_EXPORT
  */
 - (nonnull id<FlutterPluginRegistrar>)registrarForPlugin:(nonnull NSString*)pluginKey;
 
+/**
+ * Returns a value published by the specified plugin.
+ *
+ * @param pluginKey The unique key identifying the plugin.
+ * @return An object published by the plugin, if any. Will be `NSNull` if
+ *   nothing has been published. Will be `nil` if the plugin has not been
+ *   registered.
+ */
+- (nullable NSObject*)valuePublishedByPlugin:(nonnull NSString*)pluginKey;
+
 @end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_HEADERS_FLUTTERPLUGINREGISTRARMACOS_H_
diff --git a/shell/platform/darwin/macos/framework/Headers/FlutterViewController.h b/shell/platform/darwin/macos/framework/Headers/FlutterViewController.h
index 4dea666e1262ce2c6f82861a218607ed9ae692df..5d8a0d08f45b6804c5b087c485f90de250479f06 100644
--- a/shell/platform/darwin/macos/framework/Headers/FlutterViewController.h
+++ b/shell/platform/darwin/macos/framework/Headers/FlutterViewController.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_HEADERS_FLUTTERVIEWCONTROLLER_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_HEADERS_FLUTTERVIEWCONTROLLER_H_
+
 #import <Cocoa/Cocoa.h>
 
 #import "FlutterEngine.h"
@@ -14,17 +17,49 @@
  */
 typedef NS_ENUM(NSInteger, FlutterMouseTrackingMode) {
   // Hover events will never be sent to Flutter.
-  FlutterMouseTrackingModeNone = 0,
+  kFlutterMouseTrackingModeNone = 0,
+  // NOLINTNEXTLINE(readability-identifier-naming)
+  FlutterMouseTrackingModeNone __attribute__((deprecated)) = kFlutterMouseTrackingModeNone,
+
   // Hover events will be sent to Flutter when the view is in the key window.
-  FlutterMouseTrackingModeInKeyWindow,
+  kFlutterMouseTrackingModeInKeyWindow = 1,
+  // NOLINTNEXTLINE(readability-identifier-naming)
+  FlutterMouseTrackingModeInKeyWindow
+  __attribute__((deprecated)) = kFlutterMouseTrackingModeInKeyWindow,
+
   // Hover events will be sent to Flutter when the view is in the active app.
-  FlutterMouseTrackingModeInActiveApp,
+  kFlutterMouseTrackingModeInActiveApp = 2,
+  // NOLINTNEXTLINE(readability-identifier-naming)
+  FlutterMouseTrackingModeInActiveApp
+  __attribute__((deprecated)) = kFlutterMouseTrackingModeInActiveApp,
+
   // Hover events will be sent to Flutter regardless of window and app focus.
-  FlutterMouseTrackingModeAlways,
+  kFlutterMouseTrackingModeAlways = 3,
+  // NOLINTNEXTLINE(readability-identifier-naming)
+  FlutterMouseTrackingModeAlways __attribute__((deprecated)) = kFlutterMouseTrackingModeAlways,
 };
 
 /**
  * Controls a view that displays Flutter content and manages input.
+ *
+ * A FlutterViewController works with a FlutterEngine. Upon creation, the view
+ * controller is always added to an engine, either a given engine, or it implicitly
+ * creates an engine and add itself to that engine.
+ *
+ * The FlutterEngine assigns each view controller attached to it a unique ID.
+ * Each view controller corresponds to a view, and the ID is used by the framework
+ * to specify which view to operate.
+ *
+ * A FlutterViewController can also be unattached to an engine after it is manually
+ * unset from the engine, or transiently during the initialization process.
+ * An unattached view controller is invalid. Whether the view controller is attached
+ * can be queried using FlutterViewController#attached.
+ *
+ * The FlutterViewController strongly references the FlutterEngine, while
+ * the engine weakly the view controller. When a FlutterViewController is deallocated,
+ * it automatically removes itself from its attached engine. When a FlutterEngine
+ * has no FlutterViewControllers attached, it might shut down itself or not depending
+ * on its configuration.
  */
 FLUTTER_DARWIN_EXPORT
 @interface FlutterViewController : NSViewController <FlutterPluginRegistry>
@@ -43,6 +78,12 @@ FLUTTER_DARWIN_EXPORT
 /**
  * Initializes a controller that will run the given project.
  *
+ * In this initializer, this controller creates an engine, and is attached to
+ * that engine as the default controller. In this way, this controller can not
+ * be set to other engines. This initializer is suitable for the first Flutter
+ * view controller of the app. To use the controller with an existing engine,
+ * use initWithEngine:nibName:bundle: instead.
+ *
  * @param project The project to run in this view controller. If nil, a default `FlutterDartProject`
  *                will be used.
  */
@@ -54,9 +95,12 @@ FLUTTER_DARWIN_EXPORT
     NS_DESIGNATED_INITIALIZER;
 - (nonnull instancetype)initWithCoder:(nonnull NSCoder*)nibNameOrNil NS_DESIGNATED_INITIALIZER;
 /**
- * Initializes this FlutterViewController with the specified `FlutterEngine`.
+ * Initializes this FlutterViewController with an existing `FlutterEngine`.
  *
- * The initialized viewcontroller will attach itself to the engine as part of this process.
+ * The initialized view controller will add itself to the engine as part of this process.
+ *
+ * This initializer is suitable for both the first Flutter view controller and
+ * the following ones of the app.
  *
  * @param engine The `FlutterEngine` instance to attach to. Cannot be nil.
  * @param nibName The NIB name to initialize this controller with.
@@ -65,6 +109,12 @@ FLUTTER_DARWIN_EXPORT
 - (nonnull instancetype)initWithEngine:(nonnull FlutterEngine*)engine
                                nibName:(nullable NSString*)nibName
                                 bundle:(nullable NSBundle*)nibBundle NS_DESIGNATED_INITIALIZER;
+
+/**
+ * Return YES if the view controller is attached to an engine.
+ */
+- (BOOL)attached;
+
 /**
  * Invoked by the engine right before the engine is restarted.
  *
@@ -73,6 +123,29 @@ FLUTTER_DARWIN_EXPORT
  */
 - (void)onPreEngineRestart;
 
+/**
+ * Returns the file name for the given asset.
+ * The returned file name can be used to access the asset in the application's
+ * main bundle.
+ *
+ * @param asset The name of the asset. The name can be hierarchical.
+ * @return The file name to be used for lookup in the main bundle.
+ */
+- (nonnull NSString*)lookupKeyForAsset:(nonnull NSString*)asset;
+
+/**
+ * Returns the file name for the given asset which originates from the specified
+ * package.
+ * The returned file name can be used to access the asset in the application's
+ * main bundle.
+ *
+ * @param asset The name of the asset. The name can be hierarchical.
+ * @param package The name of the package from which the asset originates.
+ * @return The file name to be used for lookup in the main bundle.
+ */
+- (nonnull NSString*)lookupKeyForAsset:(nonnull NSString*)asset
+                           fromPackage:(nonnull NSString*)package;
+
 /**
  * The contentView (FlutterView)'s background color is set to black during
  * its instantiation.
@@ -87,7 +160,7 @@ FLUTTER_DARWIN_EXPORT
  *
  * class MainFlutterWindow: NSWindow {
  *   override func awakeFromNib() {
- *     let flutterViewController = FlutterViewController.init()
+ *     let flutterViewController = FlutterViewController()
  *
  *     // The background color of the window and `FlutterViewController`
  *     // are retained separately.
@@ -118,3 +191,5 @@ FLUTTER_DARWIN_EXPORT
 @property(readwrite, nonatomic, nullable, copy) NSColor* backgroundColor;
 
 @end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_HEADERS_FLUTTERVIEWCONTROLLER_H_
diff --git a/shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMac.h b/shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMac.h
index 0d7689fbc91fc3e9829330d429e80224551fe863..9d983a6ae3f0f3f907b13c39863ed1fa535adee5 100644
--- a/shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMac.h
+++ b/shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMac.h
@@ -2,11 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_ACCESSIBILITY_BRIDGE_MAC_H_
-#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_ACCESSIBILITY_BRIDGE_MAC_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_ACCESSIBILITYBRIDGEMAC_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_ACCESSIBILITYBRIDGEMAC_H_
 
 #import <Cocoa/Cocoa.h>
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/common/accessibility_bridge.h"
 
 @class FlutterEngine;
@@ -39,12 +40,6 @@ class AccessibilityBridgeMac : public AccessibilityBridge {
                                    FlutterSemanticsAction action,
                                    fml::MallocMapping data) override;
 
-  // Update the default view controller, and recreate the corresponding
-  // accessibility node delegate.
-  //
-  // This is called by the engine when the default view controller is updated.
-  void UpdateDefaultViewController(__weak FlutterViewController* view_controller);
-
  protected:
   // |AccessibilityBridge|
   void OnAccessibilityEvent(ui::AXEventGenerator::TargetedEvent targeted_event) override;
@@ -94,8 +89,10 @@ class AccessibilityBridgeMac : public AccessibilityBridge {
 
   __weak FlutterEngine* flutter_engine_;
   __weak FlutterViewController* view_controller_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(AccessibilityBridgeMac);
 };
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_ACCESSIBILITY_BRIDGE_MAC_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_ACCESSIBILITYBRIDGEMAC_H_
diff --git a/shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMac.mm b/shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMac.mm
index d124bcfe348266640e904f01ff6bf2374373f321..fc624b8a9ee32b40949463ec9221384cd18cd7c1 100644
--- a/shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMac.mm
+++ b/shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMac.mm
@@ -24,12 +24,6 @@ AccessibilityBridgeMac::AccessibilityBridgeMac(__weak FlutterEngine* flutter_eng
                                                __weak FlutterViewController* view_controller)
     : flutter_engine_(flutter_engine), view_controller_(view_controller) {}
 
-void AccessibilityBridgeMac::UpdateDefaultViewController(
-    __weak FlutterViewController* view_controller) {
-  view_controller_ = view_controller;
-  RecreateNodeDelegates();
-}
-
 void AccessibilityBridgeMac::OnAccessibilityEvent(
     ui::AXEventGenerator::TargetedEvent targeted_event) {
   if (!view_controller_.viewLoaded || !view_controller_.view.window) {
@@ -39,7 +33,7 @@ void AccessibilityBridgeMac::OnAccessibilityEvent(
   ui::AXNode* ax_node = targeted_event.node;
   std::vector<AccessibilityBridgeMac::NSAccessibilityEvent> events =
       MacOSEventsFromAXEvent(targeted_event.event_params.event, *ax_node);
-  for (AccessibilityBridgeMac::NSAccessibilityEvent event : events) {
+  for (const AccessibilityBridgeMac::NSAccessibilityEvent& event : events) {
     if (event.user_info != nil) {
       DispatchMacOSNotificationWithUserInfo(event.target, event.name, event.user_info);
     } else {
@@ -187,9 +181,7 @@ AccessibilityBridgeMac::MacOSEventsFromAXEvent(ui::AXEventGenerator::Event event
       if (ax_node.data().HasState(ax::mojom::State::kEditable)) {
         events.push_back({
             .name = NSAccessibilityValueChangedNotification,
-            .target = GetFlutterPlatformNodeDelegateFromID(AccessibilityBridge::kRootNodeId)
-                          .lock()
-                          ->GetNativeViewAccessible(),
+            .target = RootDelegate()->GetNativeViewAccessible(),
             .user_info = nil,
         });
       }
diff --git a/shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMacTest.mm b/shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMacTest.mm
index 0ad11af0e3e8f66cd249067e16d9c471708b0c46..12a83ec030dc92eb60db3765b377eddd55400243 100644
--- a/shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMacTest.mm
+++ b/shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMacTest.mm
@@ -1,12 +1,14 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-#include "flutter/testing/testing.h"
 
 #import "flutter/shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMac.h"
+
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterDartProject_Internal.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterViewController_Internal.h"
+#include "flutter/testing/autoreleasepool_test.h"
+#include "flutter/testing/testing.h"
 
 namespace flutter::testing {
 
@@ -32,17 +34,15 @@ class AccessibilityBridgeMacSpy : public AccessibilityBridgeMac {
 }  // namespace
 }  // namespace flutter::testing
 
-@interface AccessibilityBridgeTestEngine : FlutterEngine
-- (std::shared_ptr<flutter::AccessibilityBridgeMac>)
-    createAccessibilityBridge:(nonnull FlutterEngine*)engine
-               viewController:(nonnull FlutterViewController*)viewController;
+@interface AccessibilityBridgeTestViewController : FlutterViewController
+- (std::shared_ptr<flutter::AccessibilityBridgeMac>)createAccessibilityBridgeWithEngine:
+    (nonnull FlutterEngine*)engine;
 @end
 
-@implementation AccessibilityBridgeTestEngine
-- (std::shared_ptr<flutter::AccessibilityBridgeMac>)
-    createAccessibilityBridge:(nonnull FlutterEngine*)engine
-               viewController:(nonnull FlutterViewController*)viewController {
-  return std::make_shared<flutter::testing::AccessibilityBridgeMacSpy>(engine, viewController);
+@implementation AccessibilityBridgeTestViewController
+- (std::shared_ptr<flutter::AccessibilityBridgeMac>)createAccessibilityBridgeWithEngine:
+    (nonnull FlutterEngine*)engine {
+  return std::make_shared<flutter::testing::AccessibilityBridgeMacSpy>(engine, self);
 }
 @end
 
@@ -51,38 +51,54 @@ namespace flutter::testing {
 namespace {
 
 // Returns an engine configured for the text fixture resource configuration.
-FlutterEngine* CreateTestEngine() {
+FlutterViewController* CreateTestViewController() {
   NSString* fixtures = @(testing::GetFixturesPath());
   FlutterDartProject* project = [[FlutterDartProject alloc]
       initWithAssetsPath:fixtures
              ICUDataPath:[fixtures stringByAppendingString:@"/icudtl.dat"]];
-  return [[AccessibilityBridgeTestEngine alloc] initWithName:@"test"
-                                                     project:project
-                                      allowHeadlessExecution:true];
+  return [[AccessibilityBridgeTestViewController alloc] initWithProject:project];
 }
+
+// Test fixture that instantiates and re-uses a single NSWindow across multiple tests.
+//
+// Works around: http://www.openradar.me/FB13291861
+class AccessibilityBridgeMacWindowTest : public AutoreleasePoolTest {
+ public:
+  AccessibilityBridgeMacWindowTest() {
+    if (!gWindow_) {
+      gWindow_ = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 800, 600)
+                                             styleMask:NSBorderlessWindowMask
+                                               backing:NSBackingStoreBuffered
+                                                 defer:NO];
+    }
+  }
+
+  NSWindow* GetWindow() const { return gWindow_; }
+
+ private:
+  static NSWindow* gWindow_;
+  FML_DISALLOW_COPY_AND_ASSIGN(AccessibilityBridgeMacWindowTest);
+};
+
+NSWindow* AccessibilityBridgeMacWindowTest::gWindow_ = nil;
+
+// Test-specific name for AutoreleasePoolTest fixture.
+using AccessibilityBridgeMacTest = AutoreleasePoolTest;
+
 }  // namespace
 
-TEST(AccessibilityBridgeMacTest, sendsAccessibilityCreateNotificationToWindowOfFlutterView) {
-  FlutterEngine* engine = CreateTestEngine();
-  NSString* fixtures = @(testing::GetFixturesPath());
-  FlutterDartProject* project = [[FlutterDartProject alloc]
-      initWithAssetsPath:fixtures
-             ICUDataPath:[fixtures stringByAppendingString:@"/icudtl.dat"]];
-  FlutterViewController* viewController = [[FlutterViewController alloc] initWithProject:project];
-  [viewController loadView];
-  [engine setViewController:viewController];
-
-  NSWindow* expectedTarget = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 800, 600)
-                                                         styleMask:NSBorderlessWindowMask
-                                                           backing:NSBackingStoreBuffered
-                                                             defer:NO];
+TEST_F(AccessibilityBridgeMacWindowTest, SendsAccessibilityCreateNotificationFlutterViewWindow) {
+  FlutterViewController* viewController = CreateTestViewController();
+  FlutterEngine* engine = viewController.engine;
+  NSWindow* expectedTarget = GetWindow();
   expectedTarget.contentView = viewController.view;
+
   // Setting up bridge so that the AccessibilityBridgeMacDelegateSpy
   // can query semantics information from.
   engine.semanticsEnabled = YES;
-  auto bridge =
-      std::reinterpret_pointer_cast<AccessibilityBridgeMacSpy>(engine.accessibilityBridge.lock());
-  FlutterSemanticsNode root;
+  auto bridge = std::static_pointer_cast<AccessibilityBridgeMacSpy>(
+      viewController.accessibilityBridge.lock());
+  FlutterSemanticsNode2 root;
   root.id = 0;
   root.flags = static_cast<FlutterSemanticsFlag>(0);
   root.actions = static_cast<FlutterSemanticsAction>(0);
@@ -96,7 +112,7 @@ TEST(AccessibilityBridgeMacTest, sendsAccessibilityCreateNotificationToWindowOfF
   root.tooltip = "";
   root.child_count = 0;
   root.custom_accessibility_actions_count = 0;
-  bridge->AddFlutterSemanticsNodeUpdate(&root);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
 
   bridge->CommitUpdates();
   auto platform_node_delegate = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
@@ -114,28 +130,96 @@ TEST(AccessibilityBridgeMacTest, sendsAccessibilityCreateNotificationToWindowOfF
 
   bridge->OnAccessibilityEvent(targeted_event);
 
-  EXPECT_EQ(bridge->actual_notifications.size(), 1u);
-  EXPECT_EQ(
-      bridge->actual_notifications.find([NSAccessibilityCreatedNotification UTF8String])->second,
-      expectedTarget);
+  ASSERT_EQ(bridge->actual_notifications.size(), 1u);
+  auto target = bridge->actual_notifications.find([NSAccessibilityCreatedNotification UTF8String]);
+  ASSERT_NE(target, bridge->actual_notifications.end());
+  EXPECT_EQ(target->second, expectedTarget);
   [engine shutDownEngine];
 }
 
-TEST(AccessibilityBridgeMacTest, doesNotSendAccessibilityCreateNotificationWhenHeadless) {
-  FlutterEngine* engine = CreateTestEngine();
-  NSString* fixtures = @(testing::GetFixturesPath());
-  FlutterDartProject* project = [[FlutterDartProject alloc]
-      initWithAssetsPath:fixtures
-             ICUDataPath:[fixtures stringByAppendingString:@"/icudtl.dat"]];
-  FlutterViewController* viewController = [[FlutterViewController alloc] initWithProject:project];
-  [viewController loadView];
-  [engine setViewController:viewController];
+// Flutter used to assume that the accessibility root had ID 0.
+// In a multi-view world, each view has its own accessibility root
+// with a globally unique node ID.
+//
+//        node1
+//          |
+//        node2
+TEST_F(AccessibilityBridgeMacWindowTest, NonZeroRootNodeId) {
+  FlutterViewController* viewController = CreateTestViewController();
+  FlutterEngine* engine = viewController.engine;
+  NSWindow* expectedTarget = GetWindow();
+  expectedTarget.contentView = viewController.view;
+
   // Setting up bridge so that the AccessibilityBridgeMacDelegateSpy
   // can query semantics information from.
   engine.semanticsEnabled = YES;
-  auto bridge =
-      std::reinterpret_pointer_cast<AccessibilityBridgeMacSpy>(engine.accessibilityBridge.lock());
-  FlutterSemanticsNode root;
+  auto bridge = std::static_pointer_cast<AccessibilityBridgeMacSpy>(
+      viewController.accessibilityBridge.lock());
+
+  FlutterSemanticsNode2 node1;
+  std::vector<int32_t> node1_children{2};
+  node1.id = 1;
+  node1.flags = static_cast<FlutterSemanticsFlag>(0);
+  node1.actions = static_cast<FlutterSemanticsAction>(0);
+  node1.text_selection_base = -1;
+  node1.text_selection_extent = -1;
+  node1.label = "node1";
+  node1.hint = "";
+  node1.value = "";
+  node1.increased_value = "";
+  node1.decreased_value = "";
+  node1.tooltip = "";
+  node1.child_count = node1_children.size();
+  node1.children_in_traversal_order = node1_children.data();
+  node1.children_in_hit_test_order = node1_children.data();
+  node1.custom_accessibility_actions_count = 0;
+
+  FlutterSemanticsNode2 node2;
+  node2.id = 2;
+  node2.flags = static_cast<FlutterSemanticsFlag>(0);
+  node2.actions = static_cast<FlutterSemanticsAction>(0);
+  node2.text_selection_base = -1;
+  node2.text_selection_extent = -1;
+  node2.label = "node2";
+  node2.hint = "";
+  node2.value = "";
+  node2.increased_value = "";
+  node2.decreased_value = "";
+  node2.tooltip = "";
+  node2.child_count = 0;
+  node2.custom_accessibility_actions_count = 0;
+
+  bridge->AddFlutterSemanticsNodeUpdate(node1);
+  bridge->AddFlutterSemanticsNodeUpdate(node2);
+  bridge->CommitUpdates();
+
+  // Look up the root node delegate.
+  auto root_delegate = bridge->GetFlutterPlatformNodeDelegateFromID(1).lock();
+  ASSERT_TRUE(root_delegate);
+  ASSERT_EQ(root_delegate->GetChildCount(), 1);
+
+  // Look up the child node delegate.
+  auto child_delegate = bridge->GetFlutterPlatformNodeDelegateFromID(2).lock();
+  ASSERT_TRUE(child_delegate);
+  ASSERT_EQ(child_delegate->GetChildCount(), 0);
+
+  // Ensure a node with ID 0 does not exist.
+  auto invalid_delegate = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
+  ASSERT_FALSE(invalid_delegate);
+
+  [engine shutDownEngine];
+}
+
+TEST_F(AccessibilityBridgeMacTest, DoesNotSendAccessibilityCreateNotificationWhenHeadless) {
+  FlutterViewController* viewController = CreateTestViewController();
+  FlutterEngine* engine = viewController.engine;
+
+  // Setting up bridge so that the AccessibilityBridgeMacDelegateSpy
+  // can query semantics information from.
+  engine.semanticsEnabled = YES;
+  auto bridge = std::static_pointer_cast<AccessibilityBridgeMacSpy>(
+      viewController.accessibilityBridge.lock());
+  FlutterSemanticsNode2 root;
   root.id = 0;
   root.flags = static_cast<FlutterSemanticsFlag>(0);
   root.actions = static_cast<FlutterSemanticsAction>(0);
@@ -149,7 +233,7 @@ TEST(AccessibilityBridgeMacTest, doesNotSendAccessibilityCreateNotificationWhenH
   root.tooltip = "";
   root.child_count = 0;
   root.custom_accessibility_actions_count = 0;
-  bridge->AddFlutterSemanticsNodeUpdate(&root);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
 
   bridge->CommitUpdates();
   auto platform_node_delegate = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
@@ -172,23 +256,16 @@ TEST(AccessibilityBridgeMacTest, doesNotSendAccessibilityCreateNotificationWhenH
   [engine shutDownEngine];
 }
 
-TEST(AccessibilityBridgeMacTest, doesNotSendAccessibilityCreateNotificationWhenNoWindow) {
-  FlutterEngine* engine = CreateTestEngine();
-  // Create a view controller without attaching it to a window.
-  NSString* fixtures = @(testing::GetFixturesPath());
-  FlutterDartProject* project = [[FlutterDartProject alloc]
-      initWithAssetsPath:fixtures
-             ICUDataPath:[fixtures stringByAppendingString:@"/icudtl.dat"]];
-  FlutterViewController* viewController = [[FlutterViewController alloc] initWithProject:project];
-  [viewController loadView];
-  [engine setViewController:viewController];
+TEST_F(AccessibilityBridgeMacTest, DoesNotSendAccessibilityCreateNotificationWhenNoWindow) {
+  FlutterViewController* viewController = CreateTestViewController();
+  FlutterEngine* engine = viewController.engine;
 
   // Setting up bridge so that the AccessibilityBridgeMacDelegateSpy
   // can query semantics information from.
   engine.semanticsEnabled = YES;
-  auto bridge =
-      std::reinterpret_pointer_cast<AccessibilityBridgeMacSpy>(engine.accessibilityBridge.lock());
-  FlutterSemanticsNode root;
+  auto bridge = std::static_pointer_cast<AccessibilityBridgeMacSpy>(
+      viewController.accessibilityBridge.lock());
+  FlutterSemanticsNode2 root;
   root.id = 0;
   root.flags = static_cast<FlutterSemanticsFlag>(0);
   root.actions = static_cast<FlutterSemanticsAction>(0);
@@ -202,7 +279,7 @@ TEST(AccessibilityBridgeMacTest, doesNotSendAccessibilityCreateNotificationWhenN
   root.tooltip = "";
   root.child_count = 0;
   root.custom_accessibility_actions_count = 0;
-  bridge->AddFlutterSemanticsNodeUpdate(&root);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
 
   bridge->CommitUpdates();
   auto platform_node_delegate = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterAppDelegate.mm b/shell/platform/darwin/macos/framework/Source/FlutterAppDelegate.mm
index 0442fdd70232d9cebef0e33c96da33aafb05e7fc..02ab46b29829cde64c9ee3d89fe18b6088a22592 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterAppDelegate.mm
+++ b/shell/platform/darwin/macos/framework/Source/FlutterAppDelegate.mm
@@ -3,6 +3,14 @@
 // found in the LICENSE file.
 
 #import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterAppDelegate.h"
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterAppDelegate_Internal.h"
+
+#import <AppKit/AppKit.h>
+
+#include "flutter/fml/logging.h"
+#import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterAppLifecycleDelegate.h"
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterAppLifecycleDelegate_Internal.h"
+#include "flutter/shell/platform/embedder/embedder.h"
 
 @interface FlutterAppDelegate ()
 
@@ -11,12 +19,18 @@
  */
 - (NSString*)applicationName;
 
+@property(nonatomic) FlutterAppLifecycleRegistrar* lifecycleRegistrar;
 @end
 
 @implementation FlutterAppDelegate
 
-// TODO(stuartmorgan): Implement application lifecycle forwarding to plugins here, as is done
-// on iOS. Currently macOS plugins don't have access to lifecycle messages.
+- (instancetype)init {
+  if (self = [super init]) {
+    _terminationHandler = nil;
+    _lifecycleRegistrar = [[FlutterAppLifecycleRegistrar alloc] init];
+  }
+  return self;
+}
 
 - (void)applicationWillFinishLaunching:(NSNotification*)notification {
   // Update UI elements to match the application name.
@@ -28,6 +42,16 @@
   }
 }
 
+#pragma mark - Delegate handling
+
+- (void)addApplicationLifecycleDelegate:(NSObject<FlutterAppLifecycleDelegate>*)delegate {
+  [self.lifecycleRegistrar addDelegate:delegate];
+}
+
+- (void)removeApplicationLifecycleDelegate:(NSObject<FlutterAppLifecycleDelegate>*)delegate {
+  [self.lifecycleRegistrar removeDelegate:delegate];
+}
+
 #pragma mark Private Methods
 
 - (NSString*)applicationName {
@@ -39,4 +63,33 @@
   return applicationName;
 }
 
+#pragma mark NSApplicationDelegate
+
+- (void)application:(NSApplication*)application openURLs:(NSArray<NSURL*>*)urls {
+  for (NSObject<FlutterAppLifecycleDelegate>* delegate in self.lifecycleRegistrar.delegates) {
+    if ([delegate respondsToSelector:@selector(handleOpenURLs:)] &&
+        [delegate handleOpenURLs:urls]) {
+      return;
+    }
+  }
+}
+
+- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication* _Nonnull)sender {
+  // If the framework has already told us to terminate, terminate immediately.
+  if ([self terminationHandler] == nil || [[self terminationHandler] shouldTerminate]) {
+    return NSTerminateNow;
+  }
+
+  // Send a termination request to the framework.
+  FlutterEngineTerminationHandler* terminationHandler = [self terminationHandler];
+  [terminationHandler requestApplicationTermination:sender
+                                           exitType:kFlutterAppExitTypeCancelable
+                                             result:nil];
+
+  // Cancel termination to allow the framework to handle the request asynchronously. When the
+  // termination request returns from the app, if termination is desired, this method will be
+  // reinvoked with self.terminationHandler.shouldTerminate set to YES.
+  return NSTerminateCancel;
+}
+
 @end
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterAppDelegateTest.mm b/shell/platform/darwin/macos/framework/Source/FlutterAppDelegateTest.mm
new file mode 100644
index 0000000000000000000000000000000000000000..6b13959bde9060fd5231889ce04f0d04903e98ef
--- /dev/null
+++ b/shell/platform/darwin/macos/framework/Source/FlutterAppDelegateTest.mm
@@ -0,0 +1,75 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterAppDelegate.h"
+
+#import "flutter/testing/testing.h"
+#include "third_party/googletest/googletest/include/gtest/gtest.h"
+
+@interface AppDelegateNoopFlutterAppLifecycleDelegate : NSObject <FlutterAppLifecycleDelegate>
+@property(nonatomic, copy, nullable) NSArray<NSURL*>* receivedURLs;
+@end
+
+@implementation AppDelegateNoopFlutterAppLifecycleDelegate
+@end
+
+@interface AppDelegateTestFlutterAppLifecycleDelegate : NSObject <FlutterAppLifecycleDelegate>
+@property(nonatomic, copy, nullable) NSArray<NSURL*>* receivedURLs;
+@end
+
+@implementation AppDelegateTestFlutterAppLifecycleDelegate
+
+- (BOOL)handleOpenURLs:(NSArray<NSURL*>*)urls {
+  self.receivedURLs = [urls copy];
+  return YES;
+}
+
+@end
+
+namespace flutter::testing {
+
+TEST(FlutterAppDelegateTest, DoesNotCallDelegatesWithoutHandler) {
+  FlutterAppDelegate* appDelegate = [[FlutterAppDelegate alloc] init];
+  AppDelegateNoopFlutterAppLifecycleDelegate* noopDelegate =
+      [[AppDelegateNoopFlutterAppLifecycleDelegate alloc] init];
+  [appDelegate addApplicationLifecycleDelegate:noopDelegate];
+
+  [appDelegate application:NSApplication.sharedApplication openURLs:@[]];
+  // No EXPECT, since the test is that the call doesn't throw due to calling without checking that
+  // the method is implemented.
+}
+
+TEST(FlutterAppDelegateTest, ReceivesOpenURLs) {
+  FlutterAppDelegate* appDelegate = [[FlutterAppDelegate alloc] init];
+  AppDelegateTestFlutterAppLifecycleDelegate* delegate =
+      [[AppDelegateTestFlutterAppLifecycleDelegate alloc] init];
+  [appDelegate addApplicationLifecycleDelegate:delegate];
+
+  NSURL* URL = [NSURL URLWithString:@"https://flutter.dev"];
+  EXPECT_NE(URL, nil);
+  NSArray<NSURL*>* URLs = @[ URL ];
+  [appDelegate application:NSApplication.sharedApplication openURLs:URLs];
+
+  EXPECT_EQ([delegate receivedURLs], URLs);
+}
+
+TEST(FlutterAppDelegateTest, OperURLsStopsAfterHandled) {
+  FlutterAppDelegate* appDelegate = [[FlutterAppDelegate alloc] init];
+  AppDelegateTestFlutterAppLifecycleDelegate* firstDelegate =
+      [[AppDelegateTestFlutterAppLifecycleDelegate alloc] init];
+  AppDelegateTestFlutterAppLifecycleDelegate* secondDelegate =
+      [[AppDelegateTestFlutterAppLifecycleDelegate alloc] init];
+  [appDelegate addApplicationLifecycleDelegate:firstDelegate];
+  [appDelegate addApplicationLifecycleDelegate:secondDelegate];
+
+  NSURL* URL = [NSURL URLWithString:@"https://flutter.dev"];
+  EXPECT_NE(URL, nil);
+  NSArray<NSURL*>* URLs = @[ URL ];
+  [appDelegate application:NSApplication.sharedApplication openURLs:URLs];
+
+  EXPECT_EQ([firstDelegate receivedURLs], URLs);
+  EXPECT_EQ([secondDelegate receivedURLs], nil);
+}
+
+}  // namespace flutter::testing
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterAppDelegate_Internal.h b/shell/platform/darwin/macos/framework/Source/FlutterAppDelegate_Internal.h
new file mode 100644
index 0000000000000000000000000000000000000000..83176f3acdea9526ec870331cdc4bb5388a8c075
--- /dev/null
+++ b/shell/platform/darwin/macos/framework/Source/FlutterAppDelegate_Internal.h
@@ -0,0 +1,21 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERAPPDELEGATE_INTERNAL_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERAPPDELEGATE_INTERNAL_H_
+
+#import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterAppDelegate.h"
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h"
+
+@interface FlutterAppDelegate ()
+
+/**
+ * Holds a weak reference to the termination handler owned by the engine.
+ * Called by the |FlutterApplication| when termination is requested by the OS.
+ */
+@property(readwrite, nullable, weak) FlutterEngineTerminationHandler* terminationHandler;
+
+@end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERAPPDELEGATE_INTERNAL_H_
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterAppLifecycleDelegate.mm b/shell/platform/darwin/macos/framework/Source/FlutterAppLifecycleDelegate.mm
new file mode 100644
index 0000000000000000000000000000000000000000..ba53217544e2229998632cf9c8ad6f190c1318d8
--- /dev/null
+++ b/shell/platform/darwin/macos/framework/Source/FlutterAppLifecycleDelegate.mm
@@ -0,0 +1,122 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterAppLifecycleDelegate.h"
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterAppLifecycleDelegate_Internal.h"
+
+#include <AppKit/AppKit.h>
+#include <AppKit/NSApplication.h>
+#include <Foundation/Foundation.h>
+#include <objc/message.h>
+
+#include "flutter/fml/logging.h"
+#include "flutter/fml/paths.h"
+
+@implementation FlutterAppLifecycleRegistrar {
+  NSMutableArray* _notificationUnsubscribers;
+}
+
+- (void)addObserverFor:(NSString*)name selector:(SEL)selector {
+  [[NSNotificationCenter defaultCenter] addObserver:self selector:selector name:name object:nil];
+  __block NSObject* blockSelf = self;
+  dispatch_block_t unsubscribe = ^{
+    [[NSNotificationCenter defaultCenter] removeObserver:blockSelf name:name object:nil];
+  };
+  [_notificationUnsubscribers addObject:[unsubscribe copy]];
+}
+
+- (instancetype)init {
+  if (self = [super init]) {
+    _notificationUnsubscribers = [[NSMutableArray alloc] init];
+
+// Using a macro to avoid errors where the notification doesn't match the
+// selector.
+#ifdef OBSERVE_NOTIFICATION
+#error OBSERVE_NOTIFICATION ALREADY DEFINED!
+#else
+#define OBSERVE_NOTIFICATION(SELECTOR) \
+  [self addObserverFor:NSApplication##SELECTOR##Notification selector:@selector(handle##SELECTOR:)]
+#endif
+
+    OBSERVE_NOTIFICATION(WillFinishLaunching);
+    OBSERVE_NOTIFICATION(DidFinishLaunching);
+    OBSERVE_NOTIFICATION(WillBecomeActive);
+    OBSERVE_NOTIFICATION(DidBecomeActive);
+    OBSERVE_NOTIFICATION(WillResignActive);
+    OBSERVE_NOTIFICATION(DidResignActive);
+    OBSERVE_NOTIFICATION(WillTerminate);
+    OBSERVE_NOTIFICATION(WillHide);
+    OBSERVE_NOTIFICATION(DidHide);
+    OBSERVE_NOTIFICATION(WillUnhide);
+    OBSERVE_NOTIFICATION(DidUnhide);
+    OBSERVE_NOTIFICATION(DidChangeScreenParameters);
+    OBSERVE_NOTIFICATION(DidChangeOcclusionState);
+
+#undef OBSERVE_NOTIFICATION
+
+    _delegates = [NSPointerArray weakObjectsPointerArray];
+  }
+  return self;
+}
+
+- (void)dealloc {
+  for (dispatch_block_t unsubscribe in _notificationUnsubscribers) {
+    unsubscribe();
+  }
+  [_notificationUnsubscribers removeAllObjects];
+  _delegates = nil;
+  _notificationUnsubscribers = nil;
+}
+
+static BOOL IsPowerOfTwo(NSUInteger x) {
+  return x != 0 && (x & (x - 1)) == 0;
+}
+
+- (void)addDelegate:(NSObject<FlutterAppLifecycleDelegate>*)delegate {
+  [_delegates addPointer:(__bridge void*)delegate];
+  if (IsPowerOfTwo([_delegates count])) {
+    [_delegates compact];
+  }
+}
+
+- (void)removeDelegate:(NSObject<FlutterAppLifecycleDelegate>*)delegate {
+  NSUInteger index = [[_delegates allObjects] indexOfObject:delegate];
+  if (index != NSNotFound) {
+    [_delegates removePointerAtIndex:index];
+  }
+}
+
+// This isn't done via performSelector because that can cause leaks due to the
+// selector not being known. Using a macro to avoid mismatch errors between the
+// notification and the selector.
+#ifdef DISTRIBUTE_NOTIFICATION
+#error DISTRIBUTE_NOTIFICATION ALREADY DEFINED!
+#else
+#define DISTRIBUTE_NOTIFICATION(SELECTOR)                                  \
+  -(void)handle##SELECTOR : (NSNotification*)notification {                \
+    for (NSObject<FlutterAppLifecycleDelegate> * delegate in _delegates) { \
+      if ([delegate respondsToSelector:@selector(handle##SELECTOR:)]) {    \
+        [delegate handle##SELECTOR:notification];                          \
+      }                                                                    \
+    }                                                                      \
+  }
+#endif
+
+DISTRIBUTE_NOTIFICATION(WillFinishLaunching)
+DISTRIBUTE_NOTIFICATION(DidFinishLaunching)
+DISTRIBUTE_NOTIFICATION(WillBecomeActive)
+DISTRIBUTE_NOTIFICATION(DidBecomeActive)
+DISTRIBUTE_NOTIFICATION(WillResignActive)
+DISTRIBUTE_NOTIFICATION(DidResignActive)
+DISTRIBUTE_NOTIFICATION(WillTerminate)
+DISTRIBUTE_NOTIFICATION(WillHide)
+DISTRIBUTE_NOTIFICATION(WillUnhide)
+DISTRIBUTE_NOTIFICATION(DidHide)
+DISTRIBUTE_NOTIFICATION(DidUnhide)
+DISTRIBUTE_NOTIFICATION(DidChangeScreenParameters)
+DISTRIBUTE_NOTIFICATION(DidChangeOcclusionState)
+
+#undef DISTRIBUTE_NOTIFICATION
+
+@end
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterAppLifecycleDelegateTest.mm b/shell/platform/darwin/macos/framework/Source/FlutterAppLifecycleDelegateTest.mm
new file mode 100644
index 0000000000000000000000000000000000000000..079ddbb7ff26b8a4a29d06e2a534278387615533
--- /dev/null
+++ b/shell/platform/darwin/macos/framework/Source/FlutterAppLifecycleDelegateTest.mm
@@ -0,0 +1,223 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterAppLifecycleDelegate.h"
+
+#import "flutter/testing/testing.h"
+#include "third_party/googletest/googletest/include/gtest/gtest.h"
+
+@interface TestFlutterAppLifecycleDelegate : NSObject <FlutterAppLifecycleDelegate>
+@property(nonatomic, readwrite, nullable) NSNotification* lastNotification;
+@end
+
+@implementation TestFlutterAppLifecycleDelegate
+
+- (void)setNotification:(NSNotification*)notification {
+  self.lastNotification = notification;
+}
+
+- (void)handleWillFinishLaunching:(NSNotification*)notification {
+  [self setNotification:notification];
+}
+
+- (void)handleDidFinishLaunching:(NSNotification*)notification {
+  [self setNotification:notification];
+}
+
+- (void)handleWillBecomeActive:(NSNotification*)notification {
+  [self setNotification:notification];
+}
+
+- (void)handleDidBecomeActive:(NSNotification*)notification {
+  [self setNotification:notification];
+}
+
+- (void)handleWillResignActive:(NSNotification*)notification {
+  [self setNotification:notification];
+}
+
+- (void)handleDidResignActive:(NSNotification*)notification {
+  [self setNotification:notification];
+}
+
+- (void)handleWillHide:(NSNotification*)notification {
+  [self setNotification:notification];
+}
+
+- (void)handleDidHide:(NSNotification*)notification {
+  [self setNotification:notification];
+}
+
+- (void)handleWillUnhide:(NSNotification*)notification {
+  [self setNotification:notification];
+}
+
+- (void)handleDidUnhide:(NSNotification*)notification {
+  [self setNotification:notification];
+}
+
+- (void)handleDidChangeScreenParameters:(NSNotification*)notification {
+  [self setNotification:notification];
+}
+
+- (void)handleDidChangeOcclusionState:(NSNotification*)notification API_AVAILABLE(macos(10.9)) {
+  [self setNotification:notification];
+}
+
+- (void)handleWillTerminate:(NSNotification*)notification {
+  [self setNotification:notification];
+}
+
+@end
+
+namespace flutter::testing {
+
+TEST(FlutterAppLifecycleDelegateTest, RespondsToWillFinishLaunching) {
+  FlutterAppLifecycleRegistrar* registrar = [[FlutterAppLifecycleRegistrar alloc] init];
+  TestFlutterAppLifecycleDelegate* delegate = [[TestFlutterAppLifecycleDelegate alloc] init];
+  [registrar addDelegate:delegate];
+
+  NSNotification* willFinishLaunching =
+      [NSNotification notificationWithName:NSApplicationWillFinishLaunchingNotification object:nil];
+  [registrar handleWillFinishLaunching:willFinishLaunching];
+  EXPECT_EQ([delegate lastNotification], willFinishLaunching);
+}
+
+TEST(FlutterAppLifecycleDelegateTest, RespondsToDidFinishLaunching) {
+  FlutterAppLifecycleRegistrar* registrar = [[FlutterAppLifecycleRegistrar alloc] init];
+  TestFlutterAppLifecycleDelegate* delegate = [[TestFlutterAppLifecycleDelegate alloc] init];
+  [registrar addDelegate:delegate];
+
+  NSNotification* didFinishLaunching =
+      [NSNotification notificationWithName:NSApplicationDidFinishLaunchingNotification object:nil];
+  [registrar handleDidFinishLaunching:didFinishLaunching];
+  EXPECT_EQ([delegate lastNotification], didFinishLaunching);
+}
+
+TEST(FlutterAppLifecycleDelegateTest, RespondsToWillBecomeActive) {
+  FlutterAppLifecycleRegistrar* registrar = [[FlutterAppLifecycleRegistrar alloc] init];
+  TestFlutterAppLifecycleDelegate* delegate = [[TestFlutterAppLifecycleDelegate alloc] init];
+  [registrar addDelegate:delegate];
+
+  NSNotification* willBecomeActive =
+      [NSNotification notificationWithName:NSApplicationWillBecomeActiveNotification object:nil];
+  [registrar handleWillBecomeActive:willBecomeActive];
+  EXPECT_EQ([delegate lastNotification], willBecomeActive);
+}
+
+TEST(FlutterAppLifecycleDelegateTest, RespondsToDidBecomeActive) {
+  FlutterAppLifecycleRegistrar* registrar = [[FlutterAppLifecycleRegistrar alloc] init];
+  TestFlutterAppLifecycleDelegate* delegate = [[TestFlutterAppLifecycleDelegate alloc] init];
+  [registrar addDelegate:delegate];
+
+  NSNotification* didBecomeActive =
+      [NSNotification notificationWithName:NSApplicationDidBecomeActiveNotification object:nil];
+  [registrar handleDidBecomeActive:didBecomeActive];
+  EXPECT_EQ([delegate lastNotification], didBecomeActive);
+}
+
+TEST(FlutterAppLifecycleDelegateTest, RespondsToWillResignActive) {
+  FlutterAppLifecycleRegistrar* registrar = [[FlutterAppLifecycleRegistrar alloc] init];
+  TestFlutterAppLifecycleDelegate* delegate = [[TestFlutterAppLifecycleDelegate alloc] init];
+  [registrar addDelegate:delegate];
+
+  NSNotification* willResignActive =
+      [NSNotification notificationWithName:NSApplicationWillResignActiveNotification object:nil];
+  [registrar handleWillResignActive:willResignActive];
+  EXPECT_EQ([delegate lastNotification], willResignActive);
+}
+
+TEST(FlutterAppLifecycleDelegateTest, RespondsToDidResignActive) {
+  FlutterAppLifecycleRegistrar* registrar = [[FlutterAppLifecycleRegistrar alloc] init];
+  TestFlutterAppLifecycleDelegate* delegate = [[TestFlutterAppLifecycleDelegate alloc] init];
+  [registrar addDelegate:delegate];
+
+  NSNotification* didResignActive =
+      [NSNotification notificationWithName:NSApplicationDidResignActiveNotification object:nil];
+  [registrar handleDidResignActive:didResignActive];
+  EXPECT_EQ([delegate lastNotification], didResignActive);
+}
+
+TEST(FlutterAppLifecycleDelegateTest, RespondsToWillTerminate) {
+  FlutterAppLifecycleRegistrar* registrar = [[FlutterAppLifecycleRegistrar alloc] init];
+  TestFlutterAppLifecycleDelegate* delegate = [[TestFlutterAppLifecycleDelegate alloc] init];
+  [registrar addDelegate:delegate];
+
+  NSNotification* applicationWillTerminate =
+      [NSNotification notificationWithName:NSApplicationWillTerminateNotification object:nil];
+  [registrar handleWillTerminate:applicationWillTerminate];
+  EXPECT_EQ([delegate lastNotification], applicationWillTerminate);
+}
+
+TEST(FlutterAppLifecycleDelegateTest, RespondsToWillHide) {
+  FlutterAppLifecycleRegistrar* registrar = [[FlutterAppLifecycleRegistrar alloc] init];
+  TestFlutterAppLifecycleDelegate* delegate = [[TestFlutterAppLifecycleDelegate alloc] init];
+  [registrar addDelegate:delegate];
+
+  NSNotification* willHide = [NSNotification notificationWithName:NSApplicationWillHideNotification
+                                                           object:nil];
+  [registrar handleWillHide:willHide];
+  EXPECT_EQ([delegate lastNotification], willHide);
+}
+
+TEST(FlutterAppLifecycleDelegateTest, RespondsToWillUnhide) {
+  FlutterAppLifecycleRegistrar* registrar = [[FlutterAppLifecycleRegistrar alloc] init];
+  TestFlutterAppLifecycleDelegate* delegate = [[TestFlutterAppLifecycleDelegate alloc] init];
+  [registrar addDelegate:delegate];
+
+  NSNotification* willUnhide =
+      [NSNotification notificationWithName:NSApplicationWillUnhideNotification object:nil];
+  [registrar handleWillUnhide:willUnhide];
+  EXPECT_EQ([delegate lastNotification], willUnhide);
+}
+
+TEST(FlutterAppLifecycleDelegateTest, RespondsToDidHide) {
+  FlutterAppLifecycleRegistrar* registrar = [[FlutterAppLifecycleRegistrar alloc] init];
+  TestFlutterAppLifecycleDelegate* delegate = [[TestFlutterAppLifecycleDelegate alloc] init];
+  [registrar addDelegate:delegate];
+
+  NSNotification* didHide = [NSNotification notificationWithName:NSApplicationDidHideNotification
+                                                          object:nil];
+  [registrar handleDidHide:didHide];
+  EXPECT_EQ([delegate lastNotification], didHide);
+}
+
+TEST(FlutterAppLifecycleDelegateTest, RespondsToDidUnhide) {
+  FlutterAppLifecycleRegistrar* registrar = [[FlutterAppLifecycleRegistrar alloc] init];
+  TestFlutterAppLifecycleDelegate* delegate = [[TestFlutterAppLifecycleDelegate alloc] init];
+  [registrar addDelegate:delegate];
+
+  NSNotification* didUnhide =
+      [NSNotification notificationWithName:NSApplicationDidUnhideNotification object:nil];
+  [registrar handleDidUnhide:didUnhide];
+  EXPECT_EQ([delegate lastNotification], didUnhide);
+}
+
+TEST(FlutterAppLifecycleDelegateTest, RespondsToDidChangeScreenParameters) {
+  FlutterAppLifecycleRegistrar* registrar = [[FlutterAppLifecycleRegistrar alloc] init];
+  TestFlutterAppLifecycleDelegate* delegate = [[TestFlutterAppLifecycleDelegate alloc] init];
+  [registrar addDelegate:delegate];
+
+  NSNotification* didChangeScreenParameters =
+      [NSNotification notificationWithName:NSApplicationDidChangeScreenParametersNotification
+                                    object:nil];
+  [registrar handleDidChangeScreenParameters:didChangeScreenParameters];
+  EXPECT_EQ([delegate lastNotification], didChangeScreenParameters);
+}
+
+TEST(FlutterAppLifecycleDelegateTest, RespondsToDidChangeOcclusionState) {
+  FlutterAppLifecycleRegistrar* registrar = [[FlutterAppLifecycleRegistrar alloc] init];
+  TestFlutterAppLifecycleDelegate* delegate = [[TestFlutterAppLifecycleDelegate alloc] init];
+  [registrar addDelegate:delegate];
+
+  NSNotification* didChangeOcclusionState =
+      [NSNotification notificationWithName:NSApplicationDidChangeOcclusionStateNotification
+                                    object:nil];
+  if ([registrar respondsToSelector:@selector(handleDidChangeOcclusionState:)]) {
+    [registrar handleDidChangeOcclusionState:didChangeOcclusionState];
+    EXPECT_EQ([delegate lastNotification], didChangeOcclusionState);
+  }
+}
+
+}  // namespace flutter::testing
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterAppLifecycleDelegate_Internal.h b/shell/platform/darwin/macos/framework/Source/FlutterAppLifecycleDelegate_Internal.h
new file mode 100644
index 0000000000000000000000000000000000000000..de55dddbade97487fdb7617ed1d9a18afa9262f1
--- /dev/null
+++ b/shell/platform/darwin/macos/framework/Source/FlutterAppLifecycleDelegate_Internal.h
@@ -0,0 +1,18 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERAPPLIFECYCLEDELEGATE_INTERNAL_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERAPPLIFECYCLEDELEGATE_INTERNAL_H_
+
+#import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterAppLifecycleDelegate.h"
+
+@interface FlutterAppLifecycleRegistrar ()
+/**
+ * Registered delegates. Exposed to allow FlutterAppDelegate to share the delegate list for
+ * handling non-notification delegation.
+ */
+@property(nonatomic, strong) NSPointerArray* delegates;
+@end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERAPPLIFECYCLEDELEGATE_INTERNAL_H_
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterBackingStore.h b/shell/platform/darwin/macos/framework/Source/FlutterBackingStore.h
index 809c174c3734337c1dab4bf26cec65bef28c17f6..80f8bfe1c75cd53893f18b222bff77ee2d2b38ad 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterBackingStore.h
+++ b/shell/platform/darwin/macos/framework/Source/FlutterBackingStore.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERBACKINGSTORE_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERBACKINGSTORE_H_
+
 #import <Cocoa/Cocoa.h>
 #import <Metal/Metal.h>
 
@@ -22,3 +25,5 @@
 - (nonnull instancetype)initWithTexture:(nonnull id<MTLTexture>)texture;
 
 @end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERBACKINGSTORE_H_
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponder.h b/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponder.h
index 911695e7adaa8b948da03974776a6198154c12bd..beccb9de78a9b94b8d6c2866c37f32c2ed4246f1 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponder.h
+++ b/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponder.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERCHANNELKEYRESPONDER_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERCHANNELKEYRESPONDER_H_
+
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterKeyPrimaryResponder.h"
 
 #import <Cocoa/Cocoa.h>
@@ -22,3 +25,5 @@
 - (nonnull instancetype)initWithChannel:(nonnull FlutterBasicMessageChannel*)channel;
 
 @end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERCHANNELKEYRESPONDER_H_
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponder.mm b/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponder.mm
index bcb7aa370ea767405973ad9fab195899f384c8ff..98abd505d4d9be5fcc1de10429897951a4a8731b 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponder.mm
+++ b/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponder.mm
@@ -40,6 +40,74 @@
   return self;
 }
 
+/// Checks single modifier flag from event flags and sends appropriate key event
+/// if it is different from the previous state.
+- (void)checkModifierFlag:(NSUInteger)targetMask
+            forEventFlags:(NSEventModifierFlags)eventFlags
+                  keyCode:(NSUInteger)keyCode
+                timestamp:(NSTimeInterval)timestamp {
+  NSAssert((targetMask & (targetMask - 1)) == 0, @"targetMask must only have one bit set");
+  if ((eventFlags & targetMask) != (_previouslyPressedFlags & targetMask)) {
+    uint64_t newFlags = (_previouslyPressedFlags & ~targetMask) | (eventFlags & targetMask);
+
+    // Sets combined flag if either left or right modifier is pressed, unsets otherwise.
+    auto updateCombinedFlag = [&](uint64_t side1, uint64_t side2, NSEventModifierFlags flag) {
+      if (newFlags & (side1 | side2)) {
+        newFlags |= flag;
+      } else {
+        newFlags &= ~flag;
+      }
+    };
+    updateCombinedFlag(flutter::kModifierFlagShiftLeft, flutter::kModifierFlagShiftRight,
+                       NSEventModifierFlagShift);
+    updateCombinedFlag(flutter::kModifierFlagControlLeft, flutter::kModifierFlagControlRight,
+                       NSEventModifierFlagControl);
+    updateCombinedFlag(flutter::kModifierFlagAltLeft, flutter::kModifierFlagAltRight,
+                       NSEventModifierFlagOption);
+    updateCombinedFlag(flutter::kModifierFlagMetaLeft, flutter::kModifierFlagMetaRight,
+                       NSEventModifierFlagCommand);
+
+    NSEvent* event = [NSEvent keyEventWithType:NSEventTypeFlagsChanged
+                                      location:NSZeroPoint
+                                 modifierFlags:newFlags
+                                     timestamp:timestamp
+                                  windowNumber:0
+                                       context:nil
+                                    characters:@""
+                   charactersIgnoringModifiers:@""
+                                     isARepeat:NO
+                                       keyCode:keyCode];
+    [self handleEvent:event
+             callback:^(BOOL){
+             }];
+  };
+}
+
+- (void)syncModifiersIfNeeded:(NSEventModifierFlags)modifierFlags
+                    timestamp:(NSTimeInterval)timestamp {
+  modifierFlags = modifierFlags & ~0x100;
+  if (_previouslyPressedFlags == modifierFlags) {
+    return;
+  }
+
+  [flutter::modifierFlagToKeyCode
+      enumerateKeysAndObjectsUsingBlock:^(NSNumber* flag, NSNumber* keyCode, BOOL* stop) {
+        [self checkModifierFlag:[flag unsignedShortValue]
+                  forEventFlags:modifierFlags
+                        keyCode:[keyCode unsignedShortValue]
+                      timestamp:timestamp];
+      }];
+
+  // Caps lock is not included in the modifierFlagToKeyCode map.
+  [self checkModifierFlag:NSEventModifierFlagCapsLock
+            forEventFlags:modifierFlags
+                  keyCode:0x00000039  // kVK_CapsLock
+                timestamp:timestamp];
+
+  // At the end we should end up with the same modifier flags as the event.
+  FML_DCHECK(_previouslyPressedFlags == modifierFlags);
+}
+
 - (void)handleEvent:(NSEvent*)event callback:(FlutterAsyncKeyCallback)callback {
   // Remove the modifier bits that Flutter is not interested in.
   NSEventModifierFlags modifierFlags = event.modifierFlags & ~0x100;
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponderTest.mm b/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponderTest.mm
index fc8de0aa88c2ab071bd2ceee4f33df4001d4dc57..004f00799d21d1c3a6818f87005ba3235fb05f87 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponderTest.mm
+++ b/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponderTest.mm
@@ -2,26 +2,61 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponder.h"
+
 #include <Carbon/Carbon.h>
 #import <Foundation/Foundation.h>
-#import <OCMock/OCMock.h>
 
-#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponder.h"
 #include "flutter/shell/platform/embedder/test_utils/key_codes.g.h"
-#import "flutter/testing/testing.h"
+#include "flutter/testing/autoreleasepool_test.h"
+#include "flutter/testing/testing.h"
 #include "third_party/googletest/googletest/include/gtest/gtest.h"
 
+// FlutterBasicMessageChannel fake instance that records Flutter key event messages.
+//
+// When a sendMessage:reply: callback is specified, it is invoked with the value stored in the
+// nextResponse property.
+@interface FakeMessageChannel : FlutterBasicMessageChannel
+@property(nonatomic, readonly) NSMutableArray<id>* messages;
+@property(nonatomic) NSDictionary* nextResponse;
+
+- (instancetype)init;
+- (void)sendMessage:(id _Nullable)message;
+- (void)sendMessage:(id _Nullable)message reply:(FlutterReply _Nullable)callback;
+@end
+
+@implementation FakeMessageChannel
+- (instancetype)init {
+  self = [super init];
+  if (self != nil) {
+    _messages = [[NSMutableArray<id> alloc] init];
+  }
+  return self;
+}
+
+- (void)sendMessage:(id _Nullable)message {
+  [self sendMessage:message reply:nil];
+}
+
+- (void)sendMessage:(id _Nullable)message reply:(FlutterReply _Nullable)callback {
+  [_messages addObject:message];
+  if (callback) {
+    callback(_nextResponse);
+  }
+}
+@end
+
 namespace flutter::testing {
 
 namespace {
 using flutter::testing::keycodes::kLogicalKeyQ;
 
-NSEvent* keyEvent(NSEventType type,
-                  NSEventModifierFlags modifierFlags,
-                  NSString* characters,
-                  NSString* charactersIgnoringModifiers,
-                  BOOL isARepeat,
-                  unsigned short keyCode) {
+NSEvent* CreateKeyEvent(NSEventType type,
+                        NSEventModifierFlags modifierFlags,
+                        NSString* characters,
+                        NSString* charactersIgnoringModifiers,
+                        BOOL isARepeat,
+                        unsigned short keyCode) {
   return [NSEvent keyEventWithType:type
                           location:NSZeroPoint
                      modifierFlags:modifierFlags
@@ -35,233 +70,190 @@ NSEvent* keyEvent(NSEventType type,
 }
 }  // namespace
 
-TEST(FlutterChannelKeyResponderUnittests, BasicKeyEvent) {
-  __block NSMutableArray<id>* messages = [[NSMutableArray<id> alloc] init];
-  __block BOOL next_response = TRUE;
-  __block NSMutableArray<NSNumber*>* responses = [[NSMutableArray<NSNumber*> alloc] init];
-
-  id mockKeyEventChannel = OCMStrictClassMock([FlutterBasicMessageChannel class]);
-  OCMStub([mockKeyEventChannel sendMessage:[OCMArg any] reply:[OCMArg any]])
-      .andDo((^(NSInvocation* invocation) {
-        [invocation retainArguments];
-        NSDictionary* message;
-        [invocation getArgument:&message atIndex:2];
-        [messages addObject:message];
-
-        FlutterReply callback;
-        [invocation getArgument:&callback atIndex:3];
-        NSDictionary* keyMessage = @{
-          @"handled" : @(next_response),
-        };
-        callback(keyMessage);
-      }));
+using FlutterChannelKeyResponderTest = AutoreleasePoolTest;
 
+TEST_F(FlutterChannelKeyResponderTest, BasicKeyEvent) {
+  __block NSMutableArray<NSNumber*>* responses = [[NSMutableArray<NSNumber*> alloc] init];
+  FakeMessageChannel* channel = [[FakeMessageChannel alloc] init];
   FlutterChannelKeyResponder* responder =
-      [[FlutterChannelKeyResponder alloc] initWithChannel:mockKeyEventChannel];
+      [[FlutterChannelKeyResponder alloc] initWithChannel:channel];
 
-  // Initial empty modifiers. This can happen when user opens window while modifier key is pressed
-  // and then releases the modifier. No events should be sent, but the callback
-  // should still be called.
+  // Initial empty modifiers.
+  //
+  // This can happen when user opens window while modifier key is pressed and then releases the
+  // modifier. No events should be sent, but the callback should still be called.
   // Regression test for https://github.com/flutter/flutter/issues/87339.
-  [responder handleEvent:keyEvent(NSEventTypeFlagsChanged, 0x100, @"", @"", FALSE, 60)
+  channel.nextResponse = @{@"handled" : @YES};
+  [responder handleEvent:CreateKeyEvent(NSEventTypeFlagsChanged, 0x100, @"", @"", NO, 60)
                 callback:^(BOOL handled) {
                   [responses addObject:@(handled)];
                 }];
 
-  EXPECT_EQ([messages count], 0u);
-  EXPECT_EQ([responses count], 1u);
-  EXPECT_EQ([responses[0] boolValue], TRUE);
+  EXPECT_EQ([channel.messages count], 0u);
+  ASSERT_EQ([responses count], 1u);
+  EXPECT_EQ([responses[0] boolValue], YES);
   [responses removeAllObjects];
 
   // Key down
-  [responder handleEvent:keyEvent(NSEventTypeKeyDown, 0x100, @"a", @"a", FALSE, 0)
+  channel.nextResponse = @{@"handled" : @YES};
+  [responder handleEvent:CreateKeyEvent(NSEventTypeKeyDown, 0x100, @"a", @"a", NO, 0)
                 callback:^(BOOL handled) {
                   [responses addObject:@(handled)];
                 }];
 
-  EXPECT_EQ([messages count], 1u);
-  EXPECT_STREQ([[messages lastObject][@"keymap"] UTF8String], "macos");
-  EXPECT_STREQ([[messages lastObject][@"type"] UTF8String], "keydown");
-  EXPECT_EQ([[messages lastObject][@"keyCode"] intValue], 0);
-  EXPECT_EQ([[messages lastObject][@"modifiers"] intValue], 0x0);
-  EXPECT_STREQ([[messages lastObject][@"characters"] UTF8String], "a");
-  EXPECT_STREQ([[messages lastObject][@"charactersIgnoringModifiers"] UTF8String], "a");
+  ASSERT_EQ([channel.messages count], 1u);
+  EXPECT_STREQ([[channel.messages lastObject][@"keymap"] UTF8String], "macos");
+  EXPECT_STREQ([[channel.messages lastObject][@"type"] UTF8String], "keydown");
+  EXPECT_EQ([[channel.messages lastObject][@"keyCode"] intValue], 0);
+  EXPECT_EQ([[channel.messages lastObject][@"modifiers"] intValue], 0x0);
+  EXPECT_STREQ([[channel.messages lastObject][@"characters"] UTF8String], "a");
+  EXPECT_STREQ([[channel.messages lastObject][@"charactersIgnoringModifiers"] UTF8String], "a");
 
-  EXPECT_EQ([responses count], 1u);
-  EXPECT_EQ([[responses lastObject] boolValue], TRUE);
+  ASSERT_EQ([responses count], 1u);
+  EXPECT_EQ([[responses lastObject] boolValue], YES);
 
-  [messages removeAllObjects];
+  [channel.messages removeAllObjects];
   [responses removeAllObjects];
 
   // Key up
-  next_response = FALSE;
-  [responder handleEvent:keyEvent(NSEventTypeKeyUp, 0x100, @"a", @"a", FALSE, 0)
+  channel.nextResponse = @{@"handled" : @NO};
+  [responder handleEvent:CreateKeyEvent(NSEventTypeKeyUp, 0x100, @"a", @"a", NO, 0)
                 callback:^(BOOL handled) {
                   [responses addObject:@(handled)];
                 }];
 
-  EXPECT_EQ([messages count], 1u);
-  EXPECT_STREQ([[messages lastObject][@"keymap"] UTF8String], "macos");
-  EXPECT_STREQ([[messages lastObject][@"type"] UTF8String], "keyup");
-  EXPECT_EQ([[messages lastObject][@"keyCode"] intValue], 0);
-  EXPECT_EQ([[messages lastObject][@"modifiers"] intValue], 0);
-  EXPECT_STREQ([[messages lastObject][@"characters"] UTF8String], "a");
-  EXPECT_STREQ([[messages lastObject][@"charactersIgnoringModifiers"] UTF8String], "a");
+  ASSERT_EQ([channel.messages count], 1u);
+  EXPECT_STREQ([[channel.messages lastObject][@"keymap"] UTF8String], "macos");
+  EXPECT_STREQ([[channel.messages lastObject][@"type"] UTF8String], "keyup");
+  EXPECT_EQ([[channel.messages lastObject][@"keyCode"] intValue], 0);
+  EXPECT_EQ([[channel.messages lastObject][@"modifiers"] intValue], 0);
+  EXPECT_STREQ([[channel.messages lastObject][@"characters"] UTF8String], "a");
+  EXPECT_STREQ([[channel.messages lastObject][@"charactersIgnoringModifiers"] UTF8String], "a");
 
-  EXPECT_EQ([responses count], 1u);
-  EXPECT_EQ([[responses lastObject] boolValue], FALSE);
+  ASSERT_EQ([responses count], 1u);
+  EXPECT_EQ([[responses lastObject] boolValue], NO);
 
-  [messages removeAllObjects];
+  [channel.messages removeAllObjects];
   [responses removeAllObjects];
 
   // LShift down
-  next_response = TRUE;
-  [responder handleEvent:keyEvent(NSEventTypeFlagsChanged, 0x20102, @"", @"", FALSE, 56)
+  channel.nextResponse = @{@"handled" : @YES};
+  [responder handleEvent:CreateKeyEvent(NSEventTypeFlagsChanged, 0x20102, @"", @"", NO, 56)
                 callback:^(BOOL handled) {
                   [responses addObject:@(handled)];
                 }];
 
-  EXPECT_EQ([messages count], 1u);
-  EXPECT_STREQ([[messages lastObject][@"keymap"] UTF8String], "macos");
-  EXPECT_STREQ([[messages lastObject][@"type"] UTF8String], "keydown");
-  EXPECT_EQ([[messages lastObject][@"keyCode"] intValue], 56);
-  EXPECT_EQ([[messages lastObject][@"modifiers"] intValue], 0x20002);
+  ASSERT_EQ([channel.messages count], 1u);
+  EXPECT_STREQ([[channel.messages lastObject][@"keymap"] UTF8String], "macos");
+  EXPECT_STREQ([[channel.messages lastObject][@"type"] UTF8String], "keydown");
+  EXPECT_EQ([[channel.messages lastObject][@"keyCode"] intValue], 56);
+  EXPECT_EQ([[channel.messages lastObject][@"modifiers"] intValue], 0x20002);
 
-  EXPECT_EQ([responses count], 1u);
-  EXPECT_EQ([[responses lastObject] boolValue], TRUE);
+  ASSERT_EQ([responses count], 1u);
+  EXPECT_EQ([[responses lastObject] boolValue], YES);
 
-  [messages removeAllObjects];
+  [channel.messages removeAllObjects];
   [responses removeAllObjects];
 
   // RShift down
-  next_response = false;
-  [responder handleEvent:keyEvent(NSEventTypeFlagsChanged, 0x20006, @"", @"", FALSE, 60)
+  channel.nextResponse = @{@"handled" : @NO};
+  [responder handleEvent:CreateKeyEvent(NSEventTypeFlagsChanged, 0x20006, @"", @"", NO, 60)
                 callback:^(BOOL handled) {
                   [responses addObject:@(handled)];
                 }];
 
-  EXPECT_EQ([messages count], 1u);
-  EXPECT_STREQ([[messages lastObject][@"keymap"] UTF8String], "macos");
-  EXPECT_STREQ([[messages lastObject][@"type"] UTF8String], "keydown");
-  EXPECT_EQ([[messages lastObject][@"keyCode"] intValue], 60);
-  EXPECT_EQ([[messages lastObject][@"modifiers"] intValue], 0x20006);
+  ASSERT_EQ([channel.messages count], 1u);
+  EXPECT_STREQ([[channel.messages lastObject][@"keymap"] UTF8String], "macos");
+  EXPECT_STREQ([[channel.messages lastObject][@"type"] UTF8String], "keydown");
+  EXPECT_EQ([[channel.messages lastObject][@"keyCode"] intValue], 60);
+  EXPECT_EQ([[channel.messages lastObject][@"modifiers"] intValue], 0x20006);
 
-  EXPECT_EQ([responses count], 1u);
-  EXPECT_EQ([[responses lastObject] boolValue], FALSE);
+  ASSERT_EQ([responses count], 1u);
+  EXPECT_EQ([[responses lastObject] boolValue], NO);
 
-  [messages removeAllObjects];
+  [channel.messages removeAllObjects];
   [responses removeAllObjects];
 
   // LShift up
-  next_response = false;
-  [responder handleEvent:keyEvent(NSEventTypeFlagsChanged, 0x20104, @"", @"", FALSE, 56)
+  channel.nextResponse = @{@"handled" : @NO};
+  [responder handleEvent:CreateKeyEvent(NSEventTypeFlagsChanged, 0x20104, @"", @"", NO, 56)
                 callback:^(BOOL handled) {
                   [responses addObject:@(handled)];
                 }];
 
-  EXPECT_EQ([messages count], 1u);
-  EXPECT_STREQ([[messages lastObject][@"keymap"] UTF8String], "macos");
-  EXPECT_STREQ([[messages lastObject][@"type"] UTF8String], "keyup");
-  EXPECT_EQ([[messages lastObject][@"keyCode"] intValue], 56);
-  EXPECT_EQ([[messages lastObject][@"modifiers"] intValue], 0x20004);
+  ASSERT_EQ([channel.messages count], 1u);
+  EXPECT_STREQ([[channel.messages lastObject][@"keymap"] UTF8String], "macos");
+  EXPECT_STREQ([[channel.messages lastObject][@"type"] UTF8String], "keyup");
+  EXPECT_EQ([[channel.messages lastObject][@"keyCode"] intValue], 56);
+  EXPECT_EQ([[channel.messages lastObject][@"modifiers"] intValue], 0x20004);
 
-  EXPECT_EQ([responses count], 1u);
-  EXPECT_EQ([[responses lastObject] boolValue], FALSE);
+  ASSERT_EQ([responses count], 1u);
+  EXPECT_EQ([[responses lastObject] boolValue], NO);
 
-  [messages removeAllObjects];
+  [channel.messages removeAllObjects];
   [responses removeAllObjects];
 
   // RShift up
-  next_response = false;
-  [responder handleEvent:keyEvent(NSEventTypeFlagsChanged, 0, @"", @"", FALSE, 60)
+  channel.nextResponse = @{@"handled" : @NO};
+  [responder handleEvent:CreateKeyEvent(NSEventTypeFlagsChanged, 0, @"", @"", NO, 60)
                 callback:^(BOOL handled) {
                   [responses addObject:@(handled)];
                 }];
 
-  EXPECT_EQ([messages count], 1u);
-  EXPECT_STREQ([[messages lastObject][@"keymap"] UTF8String], "macos");
-  EXPECT_STREQ([[messages lastObject][@"type"] UTF8String], "keyup");
-  EXPECT_EQ([[messages lastObject][@"keyCode"] intValue], 60);
-  EXPECT_EQ([[messages lastObject][@"modifiers"] intValue], 0);
+  ASSERT_EQ([channel.messages count], 1u);
+  EXPECT_STREQ([[channel.messages lastObject][@"keymap"] UTF8String], "macos");
+  EXPECT_STREQ([[channel.messages lastObject][@"type"] UTF8String], "keyup");
+  EXPECT_EQ([[channel.messages lastObject][@"keyCode"] intValue], 60);
+  EXPECT_EQ([[channel.messages lastObject][@"modifiers"] intValue], 0);
 
-  EXPECT_EQ([responses count], 1u);
-  EXPECT_EQ([[responses lastObject] boolValue], FALSE);
+  ASSERT_EQ([responses count], 1u);
+  EXPECT_EQ([[responses lastObject] boolValue], NO);
 
-  [messages removeAllObjects];
+  [channel.messages removeAllObjects];
   [responses removeAllObjects];
 
   // RShift up again, should be ignored and not produce a keydown event, but the
   // callback should be called.
-  next_response = false;
-  [responder handleEvent:keyEvent(NSEventTypeFlagsChanged, 0x100, @"", @"", FALSE, 60)
+  channel.nextResponse = @{@"handled" : @NO};
+  [responder handleEvent:CreateKeyEvent(NSEventTypeFlagsChanged, 0x100, @"", @"", NO, 60)
                 callback:^(BOOL handled) {
                   [responses addObject:@(handled)];
                 }];
 
-  EXPECT_EQ([messages count], 0u);
-  EXPECT_EQ([responses count], 1u);
-  EXPECT_EQ([responses[0] boolValue], TRUE);
+  EXPECT_EQ([channel.messages count], 0u);
+  ASSERT_EQ([responses count], 1u);
+  EXPECT_EQ([responses[0] boolValue], YES);
 }
 
-TEST(FlutterChannelKeyResponderUnittests, EmptyResponseIsTakenAsHandled) {
-  __block NSMutableArray<id>* messages = [[NSMutableArray<id> alloc] init];
+TEST_F(FlutterChannelKeyResponderTest, EmptyResponseIsTakenAsHandled) {
   __block NSMutableArray<NSNumber*>* responses = [[NSMutableArray<NSNumber*> alloc] init];
-
-  id mockKeyEventChannel = OCMStrictClassMock([FlutterBasicMessageChannel class]);
-  OCMStub([mockKeyEventChannel sendMessage:[OCMArg any] reply:[OCMArg any]])
-      .andDo((^(NSInvocation* invocation) {
-        [invocation retainArguments];
-        NSDictionary* message;
-        [invocation getArgument:&message atIndex:2];
-        [messages addObject:message];
-
-        FlutterReply callback;
-        [invocation getArgument:&callback atIndex:3];
-        callback(nullptr);
-      }));
-
+  FakeMessageChannel* channel = [[FakeMessageChannel alloc] init];
   FlutterChannelKeyResponder* responder =
-      [[FlutterChannelKeyResponder alloc] initWithChannel:mockKeyEventChannel];
-  [responder handleEvent:keyEvent(NSEventTypeKeyDown, 0x100, @"a", @"a", FALSE, 0)
+      [[FlutterChannelKeyResponder alloc] initWithChannel:channel];
+
+  channel.nextResponse = nil;
+  [responder handleEvent:CreateKeyEvent(NSEventTypeKeyDown, 0x100, @"a", @"a", NO, 0)
                 callback:^(BOOL handled) {
                   [responses addObject:@(handled)];
                 }];
 
-  EXPECT_EQ([messages count], 1u);
-  EXPECT_STREQ([[messages lastObject][@"keymap"] UTF8String], "macos");
-  EXPECT_STREQ([[messages lastObject][@"type"] UTF8String], "keydown");
-  EXPECT_EQ([[messages lastObject][@"keyCode"] intValue], 0);
-  EXPECT_EQ([[messages lastObject][@"modifiers"] intValue], 0);
-  EXPECT_STREQ([[messages lastObject][@"characters"] UTF8String], "a");
-  EXPECT_STREQ([[messages lastObject][@"charactersIgnoringModifiers"] UTF8String], "a");
+  ASSERT_EQ([channel.messages count], 1u);
+  EXPECT_STREQ([[channel.messages lastObject][@"keymap"] UTF8String], "macos");
+  EXPECT_STREQ([[channel.messages lastObject][@"type"] UTF8String], "keydown");
+  EXPECT_EQ([[channel.messages lastObject][@"keyCode"] intValue], 0);
+  EXPECT_EQ([[channel.messages lastObject][@"modifiers"] intValue], 0);
+  EXPECT_STREQ([[channel.messages lastObject][@"characters"] UTF8String], "a");
+  EXPECT_STREQ([[channel.messages lastObject][@"charactersIgnoringModifiers"] UTF8String], "a");
 
-  EXPECT_EQ([responses count], 1u);
-  EXPECT_EQ([[responses lastObject] boolValue], TRUE);
+  ASSERT_EQ([responses count], 1u);
+  EXPECT_EQ([[responses lastObject] boolValue], YES);
 }
 
-TEST(FlutterChannelKeyResponderUnittests, FollowsLayoutMap) {
-  __block NSMutableArray<id>* messages = [[NSMutableArray<id> alloc] init];
-  __block BOOL next_response = TRUE;
+TEST_F(FlutterChannelKeyResponderTest, FollowsLayoutMap) {
   __block NSMutableArray<NSNumber*>* responses = [[NSMutableArray<NSNumber*> alloc] init];
-
-  id mockKeyEventChannel = OCMStrictClassMock([FlutterBasicMessageChannel class]);
-  OCMStub([mockKeyEventChannel sendMessage:[OCMArg any] reply:[OCMArg any]])
-      .andDo((^(NSInvocation* invocation) {
-        [invocation retainArguments];
-        NSDictionary* message;
-        [invocation getArgument:&message atIndex:2];
-        [messages addObject:message];
-
-        FlutterReply callback;
-        [invocation getArgument:&callback atIndex:3];
-        NSDictionary* keyMessage = @{
-          @"handled" : @(next_response),
-        };
-        callback(keyMessage);
-      }));
-
+  FakeMessageChannel* channel = [[FakeMessageChannel alloc] init];
   FlutterChannelKeyResponder* responder =
-      [[FlutterChannelKeyResponder alloc] initWithChannel:mockKeyEventChannel];
+      [[FlutterChannelKeyResponder alloc] initWithChannel:channel];
 
   NSMutableDictionary<NSNumber*, NSNumber*>* layoutMap =
       [NSMutableDictionary<NSNumber*, NSNumber*> dictionary];
@@ -269,24 +261,25 @@ TEST(FlutterChannelKeyResponderUnittests, FollowsLayoutMap) {
   // French layout
   layoutMap[@(kVK_ANSI_A)] = @(kLogicalKeyQ);
 
-  [responder handleEvent:keyEvent(NSEventTypeKeyDown, kVK_ANSI_A, @"q", @"q", FALSE, 0)
+  channel.nextResponse = @{@"handled" : @YES};
+  [responder handleEvent:CreateKeyEvent(NSEventTypeKeyDown, kVK_ANSI_A, @"q", @"q", NO, 0)
                 callback:^(BOOL handled) {
                   [responses addObject:@(handled)];
                 }];
 
-  EXPECT_EQ([messages count], 1u);
-  EXPECT_STREQ([[messages lastObject][@"keymap"] UTF8String], "macos");
-  EXPECT_STREQ([[messages lastObject][@"type"] UTF8String], "keydown");
-  EXPECT_EQ([[messages lastObject][@"keyCode"] intValue], 0);
-  EXPECT_EQ([[messages lastObject][@"modifiers"] intValue], 0x0);
-  EXPECT_STREQ([[messages lastObject][@"characters"] UTF8String], "q");
-  EXPECT_STREQ([[messages lastObject][@"charactersIgnoringModifiers"] UTF8String], "q");
-  EXPECT_EQ([messages lastObject][@"specifiedLogicalKey"], @(kLogicalKeyQ));
+  ASSERT_EQ([channel.messages count], 1u);
+  EXPECT_STREQ([[channel.messages lastObject][@"keymap"] UTF8String], "macos");
+  EXPECT_STREQ([[channel.messages lastObject][@"type"] UTF8String], "keydown");
+  EXPECT_EQ([[channel.messages lastObject][@"keyCode"] intValue], 0);
+  EXPECT_EQ([[channel.messages lastObject][@"modifiers"] intValue], 0x0);
+  EXPECT_STREQ([[channel.messages lastObject][@"characters"] UTF8String], "q");
+  EXPECT_STREQ([[channel.messages lastObject][@"charactersIgnoringModifiers"] UTF8String], "q");
+  EXPECT_EQ([channel.messages lastObject][@"specifiedLogicalKey"], @(kLogicalKeyQ));
 
-  EXPECT_EQ([responses count], 1u);
-  EXPECT_EQ([[responses lastObject] boolValue], TRUE);
+  ASSERT_EQ([responses count], 1u);
+  EXPECT_EQ([[responses lastObject] boolValue], YES);
 
-  [messages removeAllObjects];
+  [channel.messages removeAllObjects];
   [responses removeAllObjects];
 }
 
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterCompositor.h b/shell/platform/darwin/macos/framework/Source/FlutterCompositor.h
index 66cf7b8939d37eedcab626232e169bdc638728bc..aad527a3785df416ed2b0f3c15b382434d6e4f60 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterCompositor.h
+++ b/shell/platform/darwin/macos/framework/Source/FlutterCompositor.h
@@ -2,23 +2,31 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_COMPOSITOR_H_
-#define FLUTTER_COMPOSITOR_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERCOMPOSITOR_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERCOMPOSITOR_H_
 
 #include <functional>
 #include <list>
 
 #include "flutter/fml/macros.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterPlatformViewController.h"
-#include "flutter/shell/platform/darwin/macos/framework/Source/FlutterView.h"
-#include "flutter/shell/platform/darwin/macos/framework/Source/FlutterViewProvider.h"
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterTimeConverter.h"
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterViewProvider.h"
 #include "flutter/shell/platform/embedder/embedder.h"
 
+@class FlutterMutatorView;
+
 namespace flutter {
 
+class PlatformViewLayer;
+
+typedef std::pair<PlatformViewLayer, size_t> PlatformViewLayerWithIndex;
+
 // FlutterCompositor creates and manages the backing stores used for
 // rendering Flutter content and presents Flutter content and Platform views.
 // Platform views are not yet supported.
+//
+// TODO(cbracken): refactor for testability. https://github.com/flutter/flutter/issues/137648
 class FlutterCompositor {
  public:
   // Create a FlutterCompositor with a view provider.
@@ -26,10 +34,9 @@ class FlutterCompositor {
   // The view_provider is used to query FlutterViews from view IDs,
   // which are used for presenting and creating backing stores.
   // It must not be null, and is typically FlutterViewEngineProvider.
-  explicit FlutterCompositor(
-      id<FlutterViewProvider> view_provider,
-      FlutterPlatformViewController* platform_views_controller,
-      id<MTLDevice> mtl_device);
+  explicit FlutterCompositor(id<FlutterViewProvider> view_provider,
+                             FlutterTimeConverter* time_converter,
+                             FlutterPlatformViewController* platform_views_controller);
 
   ~FlutterCompositor() = default;
 
@@ -48,87 +55,36 @@ class FlutterCompositor {
   bool CreateBackingStore(const FlutterBackingStoreConfig* config,
                           FlutterBackingStore* backing_store_out);
 
-  // Releases the memory for any resources that were allocated for the
-  // specified backing store.
-  bool CollectBackingStore(const FlutterBackingStore* backing_store);
-
   // Presents the FlutterLayers by updating the FlutterView specified by
   // `view_id` using the layer content. Sets frame_started_ to false.
-  bool Present(uint64_t view_id,
-               const FlutterLayer** layers,
-               size_t layers_count);
-
-  // Callback triggered at the end of the Present function. has_flutter_content
-  // is true when Flutter content was rendered, otherwise false.
-  using PresentCallback = std::function<bool(bool has_flutter_content)>;
-
-  // Registers a callback to be triggered at the end of the Present function.
-  // If a callback was previously registered, it will be replaced.
-  void SetPresentCallback(const PresentCallback& present_callback);
-
-  // The status of the frame being composited.
-  // Started: A new frame has begun and we have cleared the old layer tree and
-  //     are now creating backingstore(s) for the embedder to use.
-  // Presenting: the embedder has finished rendering into the provided
-  //     backingstore(s) and we are creating the layer tree for the system
-  //     compositor to present with.
-  // Ended: The frame has been presented and we are no longer processing it.
-  typedef enum { kStarted, kPresenting, kEnded } FrameStatus;
-
- protected:
-  // Returns the view associated with the view ID.
-  //
-  // Returns nil if the ID is invalid.
-  FlutterView* GetView(uint64_t view_id);
-
-  // Gets and sets the FrameStatus for the current frame.
-  void SetFrameStatus(FrameStatus frame_status);
-  FrameStatus GetFrameStatus();
-
-  // Clears the previous CALayers and updates the frame status to frame started.
-  void StartFrame();
-
-  // Calls the present callback and ensures the frame status is updated
-  // to frame ended, returning whether the present was successful or not.
-  bool EndFrame(bool has_flutter_content);
-
-  // Creates a CALayer object which is backed by the supplied IOSurface, and
-  // adds it to the root CALayer for the given view.
-  void InsertCALayerForIOSurface(
-      FlutterView* view,
-      const IOSurfaceRef& io_surface,
-      CATransform3D transform = CATransform3DIdentity);
+  bool Present(FlutterViewId view_id, const FlutterLayer** layers, size_t layers_count);
 
  private:
+  void PresentPlatformViews(FlutterView* default_base_view,
+                            const std::vector<PlatformViewLayerWithIndex>& platform_views_layers);
+
   // Presents the platform view layer represented by `layer`. `layer_index` is
   // used to position the layer in the z-axis. If the layer does not have a
   // superview, it will become subview of `default_base_view`.
-  void PresentPlatformView(FlutterView* default_base_view,
-                           const FlutterLayer* layer,
-                           size_t layer_position);
-
-  // A list of the active CALayer objects for the frame that need to be removed.
-  std::list<CALayer*> active_ca_layers_;
+  FlutterMutatorView* PresentPlatformView(FlutterView* default_base_view,
+                                          const PlatformViewLayer& layer,
+                                          size_t index);
 
   // Where the compositor can query FlutterViews. Must not be null.
   id<FlutterViewProvider> const view_provider_;
 
+  // Converts between engine time and core animation media time.
+  FlutterTimeConverter* const time_converter_;
+
   // The controller used to manage creation and deletion of platform views.
   const FlutterPlatformViewController* platform_view_controller_;
 
-  // The Metal device used to draw graphics.
-  const id<MTLDevice> mtl_device_;
-
-  // Callback set by the embedder to be called when the layer tree has been
-  // correctly set up for this frame.
-  PresentCallback present_callback_;
-
-  // Current frame status.
-  FrameStatus frame_status_ = kEnded;
+  // Platform view to FlutterMutatorView that contains it.
+  NSMapTable<NSView*, FlutterMutatorView*>* mutator_views_;
 
   FML_DISALLOW_COPY_AND_ASSIGN(FlutterCompositor);
 };
 
 }  // namespace flutter
 
-#endif  // FLUTTER_COMPOSITOR_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERCOMPOSITOR_H_
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterCompositor.mm b/shell/platform/darwin/macos/framework/Source/FlutterCompositor.mm
index ccdfaec180c2a677a7089588e682ad7a86ac450b..890a4c0cfca3b6ea7ae9c05e9c271c29944c0522 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterCompositor.mm
+++ b/shell/platform/darwin/macos/framework/Source/FlutterCompositor.mm
@@ -3,18 +3,32 @@
 // found in the LICENSE file.
 
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterCompositor.h"
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterMutatorView.h"
 
 #include "flutter/fml/logging.h"
-#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterIOSurfaceHolder.h"
 
 namespace flutter {
 
+namespace {
+std::vector<PlatformViewLayerWithIndex> CopyPlatformViewLayers(const FlutterLayer** layers,
+                                                               size_t layer_count) {
+  std::vector<PlatformViewLayerWithIndex> platform_views;
+  for (size_t i = 0; i < layer_count; i++) {
+    if (layers[i]->type == kFlutterLayerContentTypePlatformView) {
+      platform_views.push_back(std::make_pair(PlatformViewLayer(layers[i]), i));
+    }
+  }
+  return platform_views;
+}
+}  // namespace
+
 FlutterCompositor::FlutterCompositor(id<FlutterViewProvider> view_provider,
-                                     FlutterPlatformViewController* platform_view_controller,
-                                     id<MTLDevice> mtl_device)
+                                     FlutterTimeConverter* time_converter,
+                                     FlutterPlatformViewController* platform_view_controller)
     : view_provider_(view_provider),
+      time_converter_(time_converter),
       platform_view_controller_(platform_view_controller),
-      mtl_device_(mtl_device) {
+      mutator_views_([NSMapTable strongToStrongObjectsMapTable]) {
   FML_CHECK(view_provider != nullptr) << "view_provider cannot be nullptr";
 }
 
@@ -23,165 +37,122 @@ bool FlutterCompositor::CreateBackingStore(const FlutterBackingStoreConfig* conf
   // TODO(dkwingsmt): This class only supports single-view for now. As more
   // classes are gradually converted to multi-view, it should get the view ID
   // from somewhere.
-  FlutterView* view = GetView(kFlutterDefaultViewId);
+  FlutterView* view = [view_provider_ viewForId:kFlutterImplicitViewId];
   if (!view) {
     return false;
   }
 
   CGSize size = CGSizeMake(config->size.width, config->size.height);
-
-  backing_store_out->metal.struct_size = sizeof(FlutterMetalBackingStore);
-  backing_store_out->metal.texture.struct_size = sizeof(FlutterMetalTexture);
-
-  if (GetFrameStatus() != FrameStatus::kStarted) {
-    StartFrame();
-    // If the backing store is for the first layer, return the MTLTexture for the
-    // FlutterView.
-    FlutterRenderBackingStore* backingStore = [view backingStoreForSize:size];
-    backing_store_out->metal.texture.texture =
-        (__bridge FlutterMetalTextureHandle)backingStore.texture;
-  } else {
-    FlutterIOSurfaceHolder* io_surface_holder = [[FlutterIOSurfaceHolder alloc] init];
-    [io_surface_holder recreateIOSurfaceWithSize:size];
-    auto texture_descriptor =
-        [MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatBGRA8Unorm
-                                                           width:size.width
-                                                          height:size.height
-                                                       mipmapped:NO];
-    texture_descriptor.usage =
-        MTLTextureUsageShaderRead | MTLTextureUsageRenderTarget | MTLTextureUsageShaderWrite;
-
-    backing_store_out->metal.texture.texture = (__bridge_retained FlutterMetalTextureHandle)
-        [mtl_device_ newTextureWithDescriptor:texture_descriptor
-                                    iosurface:[io_surface_holder ioSurface]
-                                        plane:0];
-
-    backing_store_out->metal.texture.user_data = (__bridge_retained void*)io_surface_holder;
-  }
-
+  FlutterSurface* surface = [view.surfaceManager surfaceForSize:size];
+  memset(backing_store_out, 0, sizeof(FlutterBackingStore));
+  backing_store_out->struct_size = sizeof(FlutterBackingStore);
   backing_store_out->type = kFlutterBackingStoreTypeMetal;
-  backing_store_out->metal.texture.destruction_callback = [](void* user_data) {
-    if (user_data != nullptr) {
-      CFRelease(user_data);
-    }
-  };
-
-  return true;
-}
-
-bool FlutterCompositor::CollectBackingStore(const FlutterBackingStore* backing_store) {
-  // If we allocated this MTLTexture ourselves, user_data is not null, and we will need
-  // to release it manually.
-  if (backing_store->metal.texture.user_data != nullptr &&
-      backing_store->metal.texture.texture != nullptr) {
-    CFRelease(backing_store->metal.texture.texture);
-  }
+  backing_store_out->metal.struct_size = sizeof(FlutterMetalBackingStore);
+  backing_store_out->metal.texture = surface.asFlutterMetalTexture;
   return true;
 }
 
-bool FlutterCompositor::Present(uint64_t view_id,
+bool FlutterCompositor::Present(FlutterViewId view_id,
                                 const FlutterLayer** layers,
                                 size_t layers_count) {
-  FlutterView* view = GetView(view_id);
+  FlutterView* view = [view_provider_ viewForId:view_id];
   if (!view) {
     return false;
   }
 
-  SetFrameStatus(FrameStatus::kPresenting);
-
-  bool has_flutter_content = false;
-  for (size_t i = 0; i < layers_count; ++i) {
-    const auto* layer = layers[i];
-    FlutterBackingStore* backing_store = const_cast<FlutterBackingStore*>(layer->backing_store);
-
-    switch (layer->type) {
-      case kFlutterLayerContentTypeBackingStore: {
-        if (backing_store->metal.texture.user_data) {
-          FlutterIOSurfaceHolder* io_surface_holder =
-              (__bridge FlutterIOSurfaceHolder*)backing_store->metal.texture.user_data;
-          IOSurfaceRef io_surface = [io_surface_holder ioSurface];
-          InsertCALayerForIOSurface(view, io_surface);
+  NSMutableArray* surfaces = [NSMutableArray array];
+  for (size_t i = 0; i < layers_count; i++) {
+    const FlutterLayer* layer = layers[i];
+    if (layer->type == kFlutterLayerContentTypeBackingStore) {
+      FlutterSurface* surface =
+          [FlutterSurface fromFlutterMetalTexture:&layer->backing_store->metal.texture];
+
+      if (surface) {
+        FlutterSurfacePresentInfo* info = [[FlutterSurfacePresentInfo alloc] init];
+        info.surface = surface;
+        info.offset = CGPointMake(layer->offset.x, layer->offset.y);
+        info.zIndex = i;
+        FlutterBackingStorePresentInfo* present_info = layer->backing_store_present_info;
+        if (present_info != nullptr && present_info->paint_region != nullptr) {
+          auto paint_region = present_info->paint_region;
+          // Safe because the size of FlutterRect is not expected to change.
+          info.paintRegion = std::vector<FlutterRect>(
+              paint_region->rects, paint_region->rects + paint_region->rects_count);
         }
-        has_flutter_content = true;
-        break;
-      }
-      case kFlutterLayerContentTypePlatformView: {
-        PresentPlatformView(view, layer, i);
-        break;
+        [surfaces addObject:info];
       }
-    };
+    }
   }
 
-  return EndFrame(has_flutter_content);
+  CFTimeInterval presentation_time = 0;
+
+  if (layers_count > 0 && layers[0]->presentation_time != 0) {
+    presentation_time = [time_converter_ engineTimeToCAMediaTime:layers[0]->presentation_time];
+  }
+
+  // Notify block below may be called asynchronously, hence the need to copy
+  // the layer information instead of passing the original pointers from embedder.
+  auto platform_views_layers = std::make_shared<std::vector<PlatformViewLayerWithIndex>>(
+      CopyPlatformViewLayers(layers, layers_count));
+
+  [view.surfaceManager presentSurfaces:surfaces
+                                atTime:presentation_time
+                                notify:^{
+                                  PresentPlatformViews(view, *platform_views_layers);
+                                }];
+
+  return true;
 }
 
-void FlutterCompositor::PresentPlatformView(FlutterView* default_base_view,
-                                            const FlutterLayer* layer,
-                                            size_t layer_position) {
-  // TODO (https://github.com/flutter/flutter/issues/96668)
-  // once the issue is fixed, this check will pass.
+void FlutterCompositor::PresentPlatformViews(
+    FlutterView* default_base_view,
+    const std::vector<PlatformViewLayerWithIndex>& platform_views) {
   FML_DCHECK([[NSThread currentThread] isMainThread])
       << "Must be on the main thread to present platform views";
 
-  int64_t platform_view_id = layer->platform_view->identifier;
-  NSView* platform_view = [platform_view_controller_ platformViewWithID:platform_view_id];
-
-  FML_DCHECK(platform_view) << "Platform view not found for id: " << platform_view_id;
+  // Active mutator views for this frame.
+  NSMutableArray<FlutterMutatorView*>* present_mutators = [NSMutableArray array];
 
-  CGFloat scale = [[NSScreen mainScreen] backingScaleFactor];
-  platform_view.frame = CGRectMake(layer->offset.x / scale, layer->offset.y / scale,
-                                   layer->size.width / scale, layer->size.height / scale);
-  if (platform_view.superview == nil) {
-    [default_base_view addSubview:platform_view];
+  for (const auto& platform_view : platform_views) {
+    [present_mutators addObject:PresentPlatformView(default_base_view, platform_view.first,
+                                                    platform_view.second)];
   }
-  platform_view.layer.zPosition = layer_position;
-}
 
-void FlutterCompositor::SetPresentCallback(
-    const FlutterCompositor::PresentCallback& present_callback) {
-  present_callback_ = present_callback;
-}
+  NSMutableArray<FlutterMutatorView*>* obsolete_mutators =
+      [NSMutableArray arrayWithArray:[mutator_views_ objectEnumerator].allObjects];
+  [obsolete_mutators removeObjectsInArray:present_mutators];
 
-void FlutterCompositor::StartFrame() {
-  // First remove all CALayers from the superlayer.
-  for (auto layer : active_ca_layers_) {
-    [layer removeFromSuperlayer];
+  for (FlutterMutatorView* mutator in obsolete_mutators) {
+    [mutator_views_ removeObjectForKey:mutator.platformView];
+    [mutator removeFromSuperview];
   }
 
-  // Reset active layers.
-  active_ca_layers_.clear();
-  SetFrameStatus(FrameStatus::kStarted);
+  [platform_view_controller_ disposePlatformViews];
 }
 
-bool FlutterCompositor::EndFrame(bool has_flutter_content) {
-  bool status = present_callback_(has_flutter_content);
-  SetFrameStatus(FrameStatus::kEnded);
-  return status;
-}
+FlutterMutatorView* FlutterCompositor::PresentPlatformView(FlutterView* default_base_view,
+                                                           const PlatformViewLayer& layer,
+                                                           size_t index) {
+  FML_DCHECK([[NSThread currentThread] isMainThread])
+      << "Must be on the main thread to present platform views";
 
-FlutterView* FlutterCompositor::GetView(uint64_t view_id) {
-  return [view_provider_ getView:view_id];
-}
+  int64_t platform_view_id = layer.identifier();
+  NSView* platform_view = [platform_view_controller_ platformViewWithID:platform_view_id];
 
-void FlutterCompositor::SetFrameStatus(FlutterCompositor::FrameStatus frame_status) {
-  frame_status_ = frame_status;
-}
+  FML_DCHECK(platform_view) << "Platform view not found for id: " << platform_view_id;
 
-FlutterCompositor::FrameStatus FlutterCompositor::GetFrameStatus() {
-  return frame_status_;
-}
+  FlutterMutatorView* container = [mutator_views_ objectForKey:platform_view];
+
+  if (!container) {
+    container = [[FlutterMutatorView alloc] initWithPlatformView:platform_view];
+    [mutator_views_ setObject:container forKey:platform_view];
+    [default_base_view addSubview:container];
+  }
+
+  container.layer.zPosition = index;
+  [container applyFlutterLayer:&layer];
 
-void FlutterCompositor::InsertCALayerForIOSurface(FlutterView* view,
-                                                  const IOSurfaceRef& io_surface,
-                                                  CATransform3D transform) {
-  // FlutterCompositor manages the lifecycle of CALayers.
-  CALayer* content_layer = [[CALayer alloc] init];
-  content_layer.transform = transform;
-  content_layer.frame = view.layer.bounds;
-  [content_layer setContents:(__bridge id)io_surface];
-  [view.layer addSublayer:content_layer];
-
-  active_ca_layers_.push_back(content_layer);
+  return container;
 }
 
 }  // namespace flutter
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterCompositorTest.mm b/shell/platform/darwin/macos/framework/Source/FlutterCompositorTest.mm
deleted file mode 100644
index 576af2bbac1526d41ed4968f33e13f61e866bcae..0000000000000000000000000000000000000000
--- a/shell/platform/darwin/macos/framework/Source/FlutterCompositorTest.mm
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import <Foundation/Foundation.h>
-#import <OCMock/OCMock.h>
-
-#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterCompositor.h"
-#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterView.h"
-#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterViewProvider.h"
-#import "flutter/testing/testing.h"
-
-@interface FlutterViewMockProvider : NSObject <FlutterViewProvider> {
-  FlutterView* _defaultView;
-}
-/**
- * Create a FlutterViewMockProvider with the provided view as the default view.
- */
-- (nonnull instancetype)initWithDefaultView:(nonnull FlutterView*)view;
-@end
-
-@implementation FlutterViewMockProvider
-
-- (nonnull instancetype)initWithDefaultView:(nonnull FlutterView*)view {
-  self = [super init];
-  if (self != nil) {
-    _defaultView = view;
-  }
-  return self;
-}
-
-- (nullable FlutterView*)getView:(uint64_t)viewId {
-  if (viewId == kFlutterDefaultViewId) {
-    return _defaultView;
-  }
-  return nil;
-}
-
-@end
-
-namespace flutter::testing {
-namespace {
-
-id<FlutterViewProvider> MockViewProvider() {
-  FlutterView* viewMock = OCMClassMock([FlutterView class]);
-  FlutterRenderBackingStore* backingStoreMock = OCMClassMock([FlutterRenderBackingStore class]);
-  __block id<MTLTexture> textureMock = OCMProtocolMock(@protocol(MTLTexture));
-  OCMStub([backingStoreMock texture]).andReturn(textureMock);
-
-  OCMStub([viewMock backingStoreForSize:CGSize{}])
-      .ignoringNonObjectArgs()
-      .andDo(^(NSInvocation* invocation) {
-        CGSize size;
-        [invocation getArgument:&size atIndex:2];
-        OCMStub([textureMock width]).andReturn(size.width);
-        OCMStub([textureMock height]).andReturn(size.height);
-      })
-      .andReturn(backingStoreMock);
-
-  return [[FlutterViewMockProvider alloc] initWithDefaultView:viewMock];
-}
-}  // namespace
-
-TEST(FlutterCompositorTest, TestPresent) {
-  std::unique_ptr<flutter::FlutterCompositor> macos_compositor =
-      std::make_unique<FlutterCompositor>(MockViewProvider(), /*platform_view_controller*/ nullptr,
-                                          /*mtl_device*/ nullptr);
-
-  bool flag = false;
-  macos_compositor->SetPresentCallback([f = &flag](bool has_flutter_content) {
-    *f = true;
-    return true;
-  });
-
-  ASSERT_TRUE(macos_compositor->Present(0, nil, 0));
-  ASSERT_TRUE(flag);
-}
-
-TEST(FlutterCompositorTest, TestCreate) {
-  std::unique_ptr<flutter::FlutterCompositor> macos_compositor =
-      std::make_unique<FlutterCompositor>(MockViewProvider(), /*platform_view_controller*/ nullptr,
-                                          /*mtl_device*/ nullptr);
-
-  FlutterBackingStore backing_store;
-  FlutterBackingStoreConfig config;
-  config.struct_size = sizeof(FlutterBackingStoreConfig);
-  config.size.width = 800;
-  config.size.height = 600;
-  macos_compositor->CreateBackingStore(&config, &backing_store);
-
-  ASSERT_EQ(backing_store.type, kFlutterBackingStoreTypeMetal);
-  ASSERT_NE(backing_store.metal.texture.texture, nil);
-  id<MTLTexture> texture = (__bridge id<MTLTexture>)backing_store.metal.texture.texture;
-  ASSERT_EQ(texture.width, 800ul);
-  ASSERT_EQ(texture.height, 600ul);
-}
-
-TEST(FlutterCompositorTest, TestCompositing) {
-  std::unique_ptr<flutter::FlutterCompositor> macos_compositor =
-      std::make_unique<FlutterCompositor>(MockViewProvider(), /*platform_view_controller*/ nullptr,
-                                          /*mtl_device*/ nullptr);
-
-  FlutterBackingStore backing_store;
-  FlutterBackingStoreConfig config;
-  config.struct_size = sizeof(FlutterBackingStoreConfig);
-  config.size.width = 800;
-  config.size.height = 600;
-  macos_compositor->CreateBackingStore(&config, &backing_store);
-
-  ASSERT_EQ(backing_store.type, kFlutterBackingStoreTypeMetal);
-  ASSERT_NE(backing_store.metal.texture.texture, nil);
-  id<MTLTexture> texture = (__bridge id<MTLTexture>)backing_store.metal.texture.texture;
-  ASSERT_EQ(texture.width, 800u);
-  ASSERT_EQ(texture.height, 600u);
-}
-
-}  // namespace flutter::testing
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterDartProject.mm b/shell/platform/darwin/macos/framework/Source/FlutterDartProject.mm
index a18690772cf2bdf0a6770146235c8766389710c1..7d1c06122f34e8b9764035774b380a697d10c746 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterDartProject.mm
+++ b/shell/platform/darwin/macos/framework/Source/FlutterDartProject.mm
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterDartProject.h"
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterDartProject.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterDartProject_Internal.h"
 
 #include <vector>
@@ -12,6 +12,15 @@
 static NSString* const kICUBundlePath = @"icudtl.dat";
 static NSString* const kAppBundleIdentifier = @"io.flutter.flutter.app";
 
+#pragma mark - Private interface declaration.
+@interface FlutterDartProject ()
+/**
+ Get the Flutter assets name path by pass the bundle. If bundle is nil, we use the main bundle as
+ default.
+ */
++ (NSString*)flutterAssetsNameWithBundle:(NSBundle*)bundle;
+@end
+
 @implementation FlutterDartProject {
   NSBundle* _dartBundle;
   NSString* _assetsPath;
@@ -26,7 +35,7 @@ static NSString* const kAppBundleIdentifier = @"io.flutter.flutter.app";
   self = [super init];
   NSAssert(self, @"Super init cannot be nil");
 
-  _dartBundle = bundle ?: [NSBundle bundleWithIdentifier:kAppBundleIdentifier];
+  _dartBundle = bundle ?: FLTFrameworkBundleWithIdentifier(kAppBundleIdentifier);
   if (_dartBundle == nil) {
     // The bundle isn't loaded and can't be found by bundle ID. Find it by path.
     _dartBundle = [NSBundle bundleWithURL:[NSBundle.mainBundle.privateFrameworksURL
@@ -50,6 +59,15 @@ static NSString* const kAppBundleIdentifier = @"io.flutter.flutter.app";
   return self;
 }
 
+- (BOOL)enableImpeller {
+  NSNumber* enableImpeller =
+      [[NSBundle mainBundle] objectForInfoDictionaryKey:@"FLTEnableImpeller"];
+  if (enableImpeller != nil) {
+    return enableImpeller.boolValue;
+  }
+  return NO;
+}
+
 - (NSString*)assetsPath {
   if (_assetsPath) {
     return _assetsPath;
@@ -81,12 +99,42 @@ static NSString* const kAppBundleIdentifier = @"io.flutter.flutter.app";
   return path;
 }
 
-- (std::vector<std::string>)switches {
-  std::vector<std::string> arguments = flutter::GetSwitchesFromEnvironment();
-  if (self.enableMirrors) {
-    arguments.push_back("--dart-flags=--enable_mirrors=true");
++ (NSString*)flutterAssetsNameWithBundle:(NSBundle*)bundle {
+  if (bundle == nil) {
+    bundle = FLTFrameworkBundleWithIdentifier(kAppBundleIdentifier);
   }
-  return arguments;
+  if (bundle == nil) {
+    bundle = [NSBundle mainBundle];
+  }
+  NSString* flutterAssetsName = [bundle objectForInfoDictionaryKey:@"FLTAssetsPath"];
+  if (flutterAssetsName == nil) {
+    flutterAssetsName = @"Contents/Frameworks/App.framework/Resources/flutter_assets";
+  }
+  return flutterAssetsName;
+}
+
++ (NSString*)lookupKeyForAsset:(NSString*)asset {
+  return [self lookupKeyForAsset:asset fromBundle:nil];
+}
+
++ (NSString*)lookupKeyForAsset:(NSString*)asset fromBundle:(nullable NSBundle*)bundle {
+  NSString* flutterAssetsName = [FlutterDartProject flutterAssetsNameWithBundle:bundle];
+  return [NSString stringWithFormat:@"%@/%@", flutterAssetsName, asset];
+}
+
++ (NSString*)lookupKeyForAsset:(NSString*)asset fromPackage:(NSString*)package {
+  return [self lookupKeyForAsset:asset fromPackage:package fromBundle:nil];
+}
+
++ (NSString*)lookupKeyForAsset:(NSString*)asset
+                   fromPackage:(NSString*)package
+                    fromBundle:(nullable NSBundle*)bundle {
+  return [self lookupKeyForAsset:[NSString stringWithFormat:@"packages/%@/%@", package, asset]
+                      fromBundle:bundle];
+}
+
++ (NSString*)defaultBundleIdentifier {
+  return kAppBundleIdentifier;
 }
 
 @end
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterDartProject_Internal.h b/shell/platform/darwin/macos/framework/Source/FlutterDartProject_Internal.h
index d19589b6ce60a569991094128b7b71b141c0fb65..a629f5556019a3f87f58d9600cb3309ab112c2bc 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterDartProject_Internal.h
+++ b/shell/platform/darwin/macos/framework/Source/FlutterDartProject_Internal.h
@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERDARTPROJECT_INTERNAL_H_
-#define SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERDARTPROJECT_INTERNAL_H_
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERDARTPROJECT_INTERNAL_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERDARTPROJECT_INTERNAL_H_
 
-#import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterDartProject.h"
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterDartProject.h"
+#import "flutter/shell/platform/darwin/common/framework/Source/FlutterNSBundleUtils.h"
 
 #include <string>
 #include <vector>
@@ -26,14 +27,14 @@
 @property(nonatomic, readonly, nullable) NSString* ICUDataPath;
 
 /**
- * The command line arguments array for the engine.
+ * The callback invoked by the engine in root isolate scope.
  */
-@property(nonatomic, readonly) std::vector<std::string> switches;
+@property(nonatomic, nullable) void (*rootIsolateCreateCallback)(void* _Nullable);
 
 /**
- * The callback invoked by the engine in root isolate scope.
+ * Whether the Impeller rendering backend is enabled
  */
-@property(nonatomic, nullable) void (*rootIsolateCreateCallback)(void* _Nullable);
+@property(nonatomic, readonly) BOOL enableImpeller;
 
 /**
  * Instead of looking up the assets and ICU data path in the application bundle, this initializer
@@ -44,4 +45,4 @@
 
 @end
 
-#endif  // SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERDARTPROJECT_INTERNAL_H_
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERDARTPROJECT_INTERNAL_H_
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterDisplayLink.h b/shell/platform/darwin/macos/framework/Source/FlutterDisplayLink.h
new file mode 100644
index 0000000000000000000000000000000000000000..fa3c0925a7dff137271e0c3c1976c9e1a8fbd2cd
--- /dev/null
+++ b/shell/platform/darwin/macos/framework/Source/FlutterDisplayLink.h
@@ -0,0 +1,40 @@
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERDISPLAYLINK_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERDISPLAYLINK_H_
+
+#import <AppKit/AppKit.h>
+
+@protocol FlutterDisplayLinkDelegate <NSObject>
+- (void)onDisplayLink:(CFTimeInterval)timestamp targetTimestamp:(CFTimeInterval)targetTimestamp;
+@end
+
+/// Provides notifications of display refresh.
+///
+/// Internally FlutterDisplayLink will use at most one CVDisplayLink per
+/// screen shared for all views belonging to that screen. This is necessary
+/// because each CVDisplayLink comes with its own thread.
+@interface FlutterDisplayLink : NSObject
+
+/// Creates new instance tied to provided NSView. FlutterDisplayLink
+/// will track view display changes transparently to synchronize
+/// update with display refresh.
+/// This function must be called on the main thread.
++ (instancetype)displayLinkWithView:(NSView*)view;
+
+/// Delegate must be set on main thread. Delegate method will be called on
+/// on display link thread.
+@property(nonatomic, weak) id<FlutterDisplayLinkDelegate> delegate;
+
+/// Pauses and resumes the display link. May be called from any thread.
+@property(readwrite) BOOL paused;
+
+/// Returns the nominal refresh period of the display to which the view
+/// currently belongs (in seconds). If view does not belong to any display,
+/// returns 0. Can be called from any thread.
+@property(readonly) CFTimeInterval nominalOutputRefreshPeriod;
+
+/// Invalidates the display link. Must be called on the main thread.
+- (void)invalidate;
+
+@end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERDISPLAYLINK_H_
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterDisplayLink.mm b/shell/platform/darwin/macos/framework/Source/FlutterDisplayLink.mm
new file mode 100644
index 0000000000000000000000000000000000000000..ba07304292098b248397ed6e2406f50cb1560218
--- /dev/null
+++ b/shell/platform/darwin/macos/framework/Source/FlutterDisplayLink.mm
@@ -0,0 +1,358 @@
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterDisplayLink.h"
+
+#include "flutter/fml/logging.h"
+
+#include <algorithm>
+#include <optional>
+#include <thread>
+#include <vector>
+
+// Note on thread safety and locking:
+//
+// There are three mutexes used within the scope of this file:
+// - CVDisplayLink internal mutex. This is locked during every CVDisplayLink method
+//   and is also held while display link calls the output handler.
+// - DisplayLinkManager mutex.
+// - _FlutterDisplayLink mutex (through @synchronized blocks).
+//
+// Special care must be taken to avoid deadlocks. Because CVDisplayLink holds the
+// mutex for the entire duration of the output handler, it is necessary for
+// DisplayLinkManager to not call any CVDisplayLink methods while holding its
+// mutex. Instead it must retain the display link instance and then call the
+// appropriate method with the mutex unlocked.
+//
+// Similarly _FlutterDisplayLink must not call any DisplayLinkManager methods
+// within the @synchronized block.
+
+@class _FlutterDisplayLinkView;
+
+@interface _FlutterDisplayLink : FlutterDisplayLink {
+  _FlutterDisplayLinkView* _view;
+  std::optional<CGDirectDisplayID> _display_id;
+  BOOL _paused;
+}
+
+- (void)didFireWithTimestamp:(CFTimeInterval)timestamp
+             targetTimestamp:(CFTimeInterval)targetTimestamp;
+
+@end
+
+namespace {
+class DisplayLinkManager {
+ public:
+  static DisplayLinkManager& Instance() {
+    static DisplayLinkManager instance;
+    return instance;
+  }
+
+  void UnregisterDisplayLink(_FlutterDisplayLink* display_link);
+  void RegisterDisplayLink(_FlutterDisplayLink* display_link, CGDirectDisplayID display_id);
+  void PausedDidChange(_FlutterDisplayLink* display_link);
+  CFTimeInterval GetNominalOutputPeriod(CGDirectDisplayID display_id);
+
+ private:
+  void OnDisplayLink(CVDisplayLinkRef display_link,
+                     const CVTimeStamp* in_now,
+                     const CVTimeStamp* in_output_time,
+                     CVOptionFlags flags_in,
+                     CVOptionFlags* flags_out);
+
+  struct ScreenEntry {
+    CGDirectDisplayID display_id;
+    std::vector<_FlutterDisplayLink*> clients;
+
+    /// Display link for this screen. It is not safe to call display link methods
+    /// on this object while holding the mutex. Instead the instance should be
+    /// retained, mutex unlocked and then released.
+    CVDisplayLinkRef display_link_locked;
+
+    bool ShouldBeRunning() {
+      return std::any_of(clients.begin(), clients.end(),
+                         [](FlutterDisplayLink* link) { return !link.paused; });
+    }
+  };
+  std::vector<ScreenEntry> entries_;
+  std::mutex mutex_;
+};
+
+void RunOrStopDisplayLink(CVDisplayLinkRef display_link, bool should_be_running) {
+  bool is_running = CVDisplayLinkIsRunning(display_link);
+  if (should_be_running && !is_running) {
+    if (CVDisplayLinkStart(display_link) == kCVReturnError) {
+      // CVDisplayLinkStart will fail if it was called from the display link thread.
+      // The problem is that it CVDisplayLinkStop doesn't clean the pthread_t value in the display
+      // link itself. If the display link is started and stopped before before the UI thread is
+      // started (*), pthread_self() of the UI thread may have same value as the one stored in
+      // CVDisplayLink. Because this can happen at most once starting the display link from a
+      // temporary thread is a reasonable workaround.
+      //
+      // (*) Display link is started before UI thread because FlutterVSyncWaiter will run display
+      // link for one tick at the beginning to determine vsync phase.
+      //
+      // http://www.openradar.me/radar?id=5520107644125184
+      CVDisplayLinkRef retained = CVDisplayLinkRetain(display_link);
+      [NSThread detachNewThreadWithBlock:^{
+        CVDisplayLinkStart(retained);
+        CVDisplayLinkRelease(retained);
+      }];
+    }
+  } else if (!should_be_running && is_running) {
+    CVDisplayLinkStop(display_link);
+  }
+}
+
+void DisplayLinkManager::UnregisterDisplayLink(_FlutterDisplayLink* display_link) {
+  std::unique_lock<std::mutex> lock(mutex_);
+  for (auto entry = entries_.begin(); entry != entries_.end(); ++entry) {
+    auto it = std::find(entry->clients.begin(), entry->clients.end(), display_link);
+    if (it != entry->clients.end()) {
+      entry->clients.erase(it);
+      if (entry->clients.empty()) {
+        // Erasing the entry - take the display link instance and stop / release it
+        // outside of the mutex.
+        CVDisplayLinkRef display_link = entry->display_link_locked;
+        entries_.erase(entry);
+        lock.unlock();
+        CVDisplayLinkStop(display_link);
+        CVDisplayLinkRelease(display_link);
+      } else {
+        // Update the display link state outside of the mutex.
+        bool should_be_running = entry->ShouldBeRunning();
+        CVDisplayLinkRef display_link = CVDisplayLinkRetain(entry->display_link_locked);
+        lock.unlock();
+        RunOrStopDisplayLink(display_link, should_be_running);
+        CVDisplayLinkRelease(display_link);
+      }
+      return;
+    }
+  }
+}
+
+void DisplayLinkManager::RegisterDisplayLink(_FlutterDisplayLink* display_link,
+                                             CGDirectDisplayID display_id) {
+  std::unique_lock<std::mutex> lock(mutex_);
+  for (ScreenEntry& entry : entries_) {
+    if (entry.display_id == display_id) {
+      entry.clients.push_back(display_link);
+      bool should_be_running = entry.ShouldBeRunning();
+      CVDisplayLinkRef display_link = CVDisplayLinkRetain(entry.display_link_locked);
+      lock.unlock();
+      RunOrStopDisplayLink(display_link, should_be_running);
+      CVDisplayLinkRelease(display_link);
+      return;
+    }
+  }
+
+  ScreenEntry entry;
+  entry.display_id = display_id;
+  entry.clients.push_back(display_link);
+  CVDisplayLinkCreateWithCGDisplay(display_id, &entry.display_link_locked);
+
+  CVDisplayLinkSetOutputHandler(
+      entry.display_link_locked,
+      ^(CVDisplayLinkRef display_link, const CVTimeStamp* in_now, const CVTimeStamp* in_output_time,
+        CVOptionFlags flags_in, CVOptionFlags* flags_out) {
+        OnDisplayLink(display_link, in_now, in_output_time, flags_in, flags_out);
+        return 0;
+      });
+
+  // This is a new display link so it is safe to start it with mutex held.
+  bool should_be_running = entry.ShouldBeRunning();
+  RunOrStopDisplayLink(entry.display_link_locked, should_be_running);
+  entries_.push_back(entry);
+}
+
+void DisplayLinkManager::PausedDidChange(_FlutterDisplayLink* display_link) {
+  std::unique_lock<std::mutex> lock(mutex_);
+  for (ScreenEntry& entry : entries_) {
+    auto it = std::find(entry.clients.begin(), entry.clients.end(), display_link);
+    if (it != entry.clients.end()) {
+      bool running = entry.ShouldBeRunning();
+      CVDisplayLinkRef display_link = CVDisplayLinkRetain(entry.display_link_locked);
+      lock.unlock();
+      RunOrStopDisplayLink(display_link, running);
+      CVDisplayLinkRelease(display_link);
+      return;
+    }
+  }
+}
+
+CFTimeInterval DisplayLinkManager::GetNominalOutputPeriod(CGDirectDisplayID display_id) {
+  std::unique_lock<std::mutex> lock(mutex_);
+  for (ScreenEntry& entry : entries_) {
+    if (entry.display_id == display_id) {
+      CVDisplayLinkRef display_link = CVDisplayLinkRetain(entry.display_link_locked);
+      lock.unlock();
+      CVTime latency = CVDisplayLinkGetNominalOutputVideoRefreshPeriod(display_link);
+      CVDisplayLinkRelease(display_link);
+      return (CFTimeInterval)latency.timeValue / (CFTimeInterval)latency.timeScale;
+    }
+  }
+  return 0;
+}
+
+void DisplayLinkManager::OnDisplayLink(CVDisplayLinkRef display_link,
+                                       const CVTimeStamp* in_now,
+                                       const CVTimeStamp* in_output_time,
+                                       CVOptionFlags flags_in,
+                                       CVOptionFlags* flags_out) {
+  // Hold the mutex only while copying clients.
+  std::vector<_FlutterDisplayLink*> clients;
+  {
+    std::lock_guard<std::mutex> lock(mutex_);
+    for (ScreenEntry& entry : entries_) {
+      if (entry.display_link_locked == display_link) {
+        clients = entry.clients;
+        break;
+      }
+    }
+  }
+
+  CFTimeInterval timestamp = (CFTimeInterval)in_now->hostTime / CVGetHostClockFrequency();
+  CFTimeInterval target_timestamp =
+      (CFTimeInterval)in_output_time->hostTime / CVGetHostClockFrequency();
+
+  for (_FlutterDisplayLink* client : clients) {
+    [client didFireWithTimestamp:timestamp targetTimestamp:target_timestamp];
+  }
+}
+}  // namespace
+
+@interface _FlutterDisplayLinkView : NSView {
+}
+
+@end
+
+static NSString* const kFlutterDisplayLinkViewDidMoveToWindow =
+    @"FlutterDisplayLinkViewDidMoveToWindow";
+
+@implementation _FlutterDisplayLinkView
+
+- (void)viewDidMoveToWindow {
+  [super viewDidMoveToWindow];
+  [[NSNotificationCenter defaultCenter] postNotificationName:kFlutterDisplayLinkViewDidMoveToWindow
+                                                      object:self];
+}
+
+@end
+
+@implementation _FlutterDisplayLink
+
+@synthesize delegate = _delegate;
+
+- (instancetype)initWithView:(NSView*)view {
+  FML_DCHECK([NSThread isMainThread]);
+  if (self = [super init]) {
+    self->_view = [[_FlutterDisplayLinkView alloc] initWithFrame:CGRectZero];
+    [view addSubview:self->_view];
+    _paused = YES;
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(viewDidChangeWindow:)
+                                                 name:kFlutterDisplayLinkViewDidMoveToWindow
+                                               object:self->_view];
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(windowDidChangeScreen:)
+                                                 name:NSWindowDidChangeScreenNotification
+                                               object:nil];
+    [self updateScreen];
+  }
+  return self;
+}
+
+- (void)invalidate {
+  @synchronized(self) {
+    FML_DCHECK([NSThread isMainThread]);
+    // Unregister observer before removing the view to ensure
+    // that the viewDidChangeWindow notification is not received
+    // while in @synchronized block.
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    [_view removeFromSuperview];
+    _view = nil;
+    _delegate = nil;
+  }
+  DisplayLinkManager::Instance().UnregisterDisplayLink(self);
+}
+
+- (void)updateScreen {
+  DisplayLinkManager::Instance().UnregisterDisplayLink(self);
+  std::optional<CGDirectDisplayID> displayId;
+  @synchronized(self) {
+    NSScreen* screen = _view.window.screen;
+    if (screen != nil) {
+      // https://developer.apple.com/documentation/appkit/nsscreen/1388360-devicedescription?language=objc
+      _display_id = (CGDirectDisplayID)[
+          [[screen deviceDescription] objectForKey:@"NSScreenNumber"] unsignedIntValue];
+    } else {
+      _display_id = std::nullopt;
+    }
+    displayId = _display_id;
+  }
+  if (displayId.has_value()) {
+    DisplayLinkManager::Instance().RegisterDisplayLink(self, *displayId);
+  }
+}
+
+- (void)viewDidChangeWindow:(NSNotification*)notification {
+  NSView* view = notification.object;
+  if (_view == view) {
+    [self updateScreen];
+  }
+}
+
+- (void)windowDidChangeScreen:(NSNotification*)notification {
+  NSWindow* window = notification.object;
+  if (_view.window == window) {
+    [self updateScreen];
+  }
+}
+
+- (void)didFireWithTimestamp:(CFTimeInterval)timestamp
+             targetTimestamp:(CFTimeInterval)targetTimestamp {
+  @synchronized(self) {
+    if (!_paused) {
+      id<FlutterDisplayLinkDelegate> delegate = _delegate;
+      [delegate onDisplayLink:timestamp targetTimestamp:targetTimestamp];
+    }
+  }
+}
+
+- (BOOL)paused {
+  @synchronized(self) {
+    return _paused;
+  }
+}
+
+- (void)setPaused:(BOOL)paused {
+  @synchronized(self) {
+    if (_paused == paused) {
+      return;
+    }
+    _paused = paused;
+  }
+  DisplayLinkManager::Instance().PausedDidChange(self);
+}
+
+- (CFTimeInterval)nominalOutputRefreshPeriod {
+  CGDirectDisplayID display_id;
+  @synchronized(self) {
+    if (_display_id.has_value()) {
+      display_id = *_display_id;
+    } else {
+      return 0;
+    }
+  }
+  return DisplayLinkManager::Instance().GetNominalOutputPeriod(display_id);
+}
+
+@end
+
+@implementation FlutterDisplayLink
++ (instancetype)displayLinkWithView:(NSView*)view {
+  return [[_FlutterDisplayLink alloc] initWithView:view];
+}
+
+- (void)invalidate {
+  [self doesNotRecognizeSelector:_cmd];
+}
+
+@end
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterDisplayLinkTest.mm b/shell/platform/darwin/macos/framework/Source/FlutterDisplayLinkTest.mm
new file mode 100644
index 0000000000000000000000000000000000000000..8357e2e97327cbb47a3e1d9e7b23a718592cf7df
--- /dev/null
+++ b/shell/platform/darwin/macos/framework/Source/FlutterDisplayLinkTest.mm
@@ -0,0 +1,180 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterDisplayLink.h"
+
+#import <AppKit/AppKit.h>
+#include <numeric>
+
+#include "flutter/fml/synchronization/waitable_event.h"
+#include "flutter/testing/testing.h"
+
+@interface TestDisplayLinkDelegate : NSObject <FlutterDisplayLinkDelegate> {
+  void (^_block)(CFTimeInterval timestamp, CFTimeInterval targetTimestamp);
+}
+
+- (instancetype)initWithBlock:(void (^)(CFTimeInterval timestamp,
+                                        CFTimeInterval targetTimestamp))block;
+
+@end
+
+@implementation TestDisplayLinkDelegate
+- (instancetype)initWithBlock:(void (^__strong)(CFTimeInterval, CFTimeInterval))block {
+  if (self = [super init]) {
+    _block = block;
+  }
+  return self;
+}
+
+- (void)onDisplayLink:(CFTimeInterval)timestamp targetTimestamp:(CFTimeInterval)targetTimestamp {
+  _block(timestamp, targetTimestamp);
+}
+
+@end
+
+TEST(FlutterDisplayLinkTest, ViewAddedToWindowFirst) {
+  NSWindow* window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 100, 100)
+                                                 styleMask:NSWindowStyleMaskTitled
+                                                   backing:NSBackingStoreNonretained
+                                                     defer:NO];
+  NSView* view = [[NSView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)];
+  [window setContentView:view];
+
+  auto event = std::make_shared<fml::AutoResetWaitableEvent>();
+
+  TestDisplayLinkDelegate* delegate = [[TestDisplayLinkDelegate alloc]
+      initWithBlock:^(CFTimeInterval timestamp, CFTimeInterval targetTimestamp) {
+        event->Signal();
+      }];
+
+  FlutterDisplayLink* displayLink = [FlutterDisplayLink displayLinkWithView:view];
+  displayLink.delegate = delegate;
+  displayLink.paused = NO;
+
+  event->Wait();
+
+  [displayLink invalidate];
+}
+
+TEST(FlutterDisplayLinkTest, ViewAddedToWindowLater) {
+  NSView* view = [[NSView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)];
+
+  auto event = std::make_shared<fml::AutoResetWaitableEvent>();
+
+  TestDisplayLinkDelegate* delegate = [[TestDisplayLinkDelegate alloc]
+      initWithBlock:^(CFTimeInterval timestamp, CFTimeInterval targetTimestamp) {
+        event->Signal();
+      }];
+
+  FlutterDisplayLink* displayLink = [FlutterDisplayLink displayLinkWithView:view];
+  displayLink.delegate = delegate;
+  displayLink.paused = NO;
+
+  NSWindow* window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 100, 100)
+                                                 styleMask:NSWindowStyleMaskTitled
+                                                   backing:NSBackingStoreNonretained
+                                                     defer:NO];
+  [window setContentView:view];
+
+  event->Wait();
+
+  [displayLink invalidate];
+}
+
+TEST(FlutterDisplayLinkTest, ViewRemovedFromWindow) {
+  NSWindow* window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 100, 100)
+                                                 styleMask:NSWindowStyleMaskTitled
+                                                   backing:NSBackingStoreNonretained
+                                                     defer:NO];
+  NSView* view = [[NSView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)];
+  [window setContentView:view];
+
+  auto event = std::make_shared<fml::AutoResetWaitableEvent>();
+
+  TestDisplayLinkDelegate* delegate = [[TestDisplayLinkDelegate alloc]
+      initWithBlock:^(CFTimeInterval timestamp, CFTimeInterval targetTimestamp) {
+        event->Signal();
+      }];
+
+  FlutterDisplayLink* displayLink = [FlutterDisplayLink displayLinkWithView:view];
+  displayLink.delegate = delegate;
+  displayLink.paused = NO;
+
+  event->Wait();
+  displayLink.paused = YES;
+
+  event->Reset();
+
+  displayLink.paused = NO;
+
+  [window setContentView:nil];
+
+  EXPECT_TRUE(event->WaitWithTimeout(fml::TimeDelta::FromMilliseconds(100)));
+  EXPECT_FALSE(event->IsSignaledForTest());
+
+  [displayLink invalidate];
+}
+
+TEST(FlutterDisplayLinkTest, WorkaroundForFB13482573) {
+  NSWindow* window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 100, 100)
+                                                 styleMask:NSWindowStyleMaskTitled
+                                                   backing:NSBackingStoreNonretained
+                                                     defer:NO];
+  NSView* view = [[NSView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)];
+  [window setContentView:view];
+
+  auto event = std::make_shared<fml::AutoResetWaitableEvent>();
+
+  TestDisplayLinkDelegate* delegate = [[TestDisplayLinkDelegate alloc]
+      initWithBlock:^(CFTimeInterval timestamp, CFTimeInterval targetTimestamp) {
+        event->Signal();
+      }];
+
+  FlutterDisplayLink* displayLink = [FlutterDisplayLink displayLinkWithView:view];
+  displayLink.delegate = delegate;
+  displayLink.paused = NO;
+
+  event->Wait();
+  displayLink.paused = YES;
+
+  event->Reset();
+  [NSThread detachNewThreadWithBlock:^{
+    // Here pthread_self() will be same as pthread_self inside first invocation of
+    // display link callback, causing CVDisplayLinkStart to return error.
+    displayLink.paused = NO;
+  }];
+
+  event->Wait();
+
+  [displayLink invalidate];
+}
+
+TEST(FlutterDisplayLinkTest, CVDisplayLinkInterval) {
+  CVDisplayLinkRef link;
+  CVDisplayLinkCreateWithCGDisplay(CGMainDisplayID(), &link);
+  __block CFTimeInterval last = 0;
+  auto intervals = std::make_shared<std::vector<CFTimeInterval>>();
+  auto event = std::make_shared<fml::AutoResetWaitableEvent>();
+  CVDisplayLinkSetOutputHandler(
+      link, ^(CVDisplayLinkRef displayLink, const CVTimeStamp* inNow,
+              const CVTimeStamp* inOutputTime, CVOptionFlags flagsIn, CVOptionFlags* flagsOut) {
+        if (last != 0) {
+          intervals->push_back(CACurrentMediaTime() - last);
+        }
+        last = CACurrentMediaTime();
+        if (intervals->size() == 10) {
+          event->Signal();
+        }
+        return 0;
+      });
+
+  CVDisplayLinkStart(link);
+  event->Wait();
+  CVDisplayLinkStop(link);
+  CVDisplayLinkRelease(link);
+  CFTimeInterval average = std::reduce(intervals->begin(), intervals->end()) / intervals->size();
+  CFTimeInterval max = *std::max_element(intervals->begin(), intervals->end());
+  CFTimeInterval min = *std::min_element(intervals->begin(), intervals->end());
+  NSLog(@"CVDisplayLink Interval: Average: %fs, Max: %fs, Min: %fs", average, max, min);
+}
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterEmbedderExternalTextureTest.mm b/shell/platform/darwin/macos/framework/Source/FlutterEmbedderExternalTextureTest.mm
index c4c1f8f08410ae6acd4f9f4f4a007d165fdb3df7..47ba5ee32328a698eb089a17d6ad29d7a9c93680 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterEmbedderExternalTextureTest.mm
+++ b/shell/platform/darwin/macos/framework/Source/FlutterEmbedderExternalTextureTest.mm
@@ -8,16 +8,19 @@
 #include <memory>
 #include <vector>
 
+#import "flutter/display_list/skia/dl_sk_canvas.h"
 #import "flutter/shell/platform/darwin/graphics/FlutterDarwinContextMetalSkia.h"
 #import "flutter/shell/platform/darwin/graphics/FlutterDarwinExternalTextureMetal.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterExternalTexture.h"
 #include "flutter/shell/platform/embedder/embedder.h"
 #include "flutter/shell/platform/embedder/embedder_external_texture_metal.h"
-#import "flutter/testing/testing.h"
+#include "flutter/testing/autoreleasepool_test.h"
+#include "flutter/testing/testing.h"
 #include "third_party/googletest/googletest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkSamplingOptions.h"
 #include "third_party/skia/include/core/SkSurface.h"
+#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
 
 @interface TestExternalTexture : NSObject <FlutterTexture>
 
@@ -64,7 +67,10 @@
 
 namespace flutter::testing {
 
-TEST(FlutterEmbedderExternalTextureUnittests, TestTextureResolution) {
+// Test-specific name for AutoreleasePoolTest fixture.
+using FlutterEmbedderExternalTextureTest = AutoreleasePoolTest;
+
+TEST_F(FlutterEmbedderExternalTextureTest, TestTextureResolution) {
   // Constants.
   const size_t width = 100;
   const size_t height = 100;
@@ -75,7 +81,7 @@ TEST(FlutterEmbedderExternalTextureUnittests, TestTextureResolution) {
       [[FlutterDarwinContextMetalSkia alloc] initWithDefaultMTLDevice];
   SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
   GrDirectContext* grContext = darwinContextMetal.mainContext.get();
-  sk_sp<SkSurface> gpuSurface(SkSurface::MakeRenderTarget(grContext, SkBudgeted::kNo, info));
+  sk_sp<SkSurface> gpuSurface(SkSurfaces::RenderTarget(grContext, skgpu::Budgeted::kNo, info));
 
   // Create a texture.
   MTLTextureDescriptor* textureDescriptor = [[MTLTextureDescriptor alloc] init];
@@ -95,24 +101,24 @@ TEST(FlutterEmbedderExternalTextureUnittests, TestTextureResolution) {
     EXPECT_TRUE(w == width);
     EXPECT_TRUE(h == height);
 
-    FlutterMetalExternalTexture* texture = new FlutterMetalExternalTexture();
+    auto texture = std::make_unique<FlutterMetalExternalTexture>();
     texture->struct_size = sizeof(FlutterMetalExternalTexture);
     texture->num_textures = 1;
     texture->height = h;
     texture->width = w;
     texture->pixel_format = FlutterMetalExternalTexturePixelFormat::kRGBA;
     texture->textures = textures.data();
-
-    return std::unique_ptr<FlutterMetalExternalTexture>(texture);
+    return texture;
   };
 
   // Render the texture.
   std::unique_ptr<flutter::Texture> texture =
       std::make_unique<EmbedderExternalTextureMetal>(texture_id, callback);
   SkRect bounds = SkRect::MakeWH(info.width(), info.height());
-  SkSamplingOptions sampling = SkSamplingOptions(SkFilterMode::kNearest);
+  DlImageSampling sampling = DlImageSampling::kNearestNeighbor;
+  DlSkCanvasAdapter canvas(gpuSurface->getCanvas());
   flutter::Texture::PaintContext context{
-      .canvas = gpuSurface->getCanvas(),
+      .canvas = &canvas,
       .gr_context = grContext,
   };
   texture->Paint(context, bounds, /*freeze=*/false, sampling);
@@ -122,7 +128,7 @@ TEST(FlutterEmbedderExternalTextureUnittests, TestTextureResolution) {
   gpuSurface->makeImageSnapshot();
 }
 
-TEST(FlutterEmbedderExternalTextureUnittests, TestPopulateExternalTexture) {
+TEST_F(FlutterEmbedderExternalTextureTest, TestPopulateExternalTexture) {
   // Constants.
   const size_t width = 100;
   const size_t height = 100;
@@ -133,7 +139,7 @@ TEST(FlutterEmbedderExternalTextureUnittests, TestPopulateExternalTexture) {
       [[FlutterDarwinContextMetalSkia alloc] initWithDefaultMTLDevice];
   SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
   GrDirectContext* grContext = darwinContextMetal.mainContext.get();
-  sk_sp<SkSurface> gpuSurface(SkSurface::MakeRenderTarget(grContext, SkBudgeted::kNo, info));
+  sk_sp<SkSurface> gpuSurface(SkSurfaces::RenderTarget(grContext, skgpu::Budgeted::kNo, info));
 
   // Create a texture.
   TestExternalTexture* testExternalTexture =
@@ -150,23 +156,23 @@ TEST(FlutterEmbedderExternalTextureUnittests, TestPopulateExternalTexture) {
     EXPECT_TRUE(w == width);
     EXPECT_TRUE(h == height);
 
-    FlutterMetalExternalTexture* texture = new FlutterMetalExternalTexture();
-    [textureHolder populateTexture:texture];
+    auto texture = std::make_unique<FlutterMetalExternalTexture>();
+    [textureHolder populateTexture:texture.get()];
 
     EXPECT_TRUE(texture->num_textures == 1);
     EXPECT_TRUE(texture->textures != nullptr);
     EXPECT_TRUE(texture->pixel_format == FlutterMetalExternalTexturePixelFormat::kRGBA);
-
-    return std::unique_ptr<FlutterMetalExternalTexture>(texture);
+    return texture;
   };
 
   // Render the texture.
   std::unique_ptr<flutter::Texture> texture =
       std::make_unique<EmbedderExternalTextureMetal>(texture_id, callback);
   SkRect bounds = SkRect::MakeWH(info.width(), info.height());
-  SkSamplingOptions sampling = SkSamplingOptions(SkFilterMode::kNearest);
+  DlImageSampling sampling = DlImageSampling::kNearestNeighbor;
+  DlSkCanvasAdapter canvas(gpuSurface->getCanvas());
   flutter::Texture::PaintContext context{
-      .canvas = gpuSurface->getCanvas(),
+      .canvas = &canvas,
       .gr_context = grContext,
   };
   texture->Paint(context, bounds, /*freeze=*/false, sampling);
@@ -174,7 +180,7 @@ TEST(FlutterEmbedderExternalTextureUnittests, TestPopulateExternalTexture) {
   gpuSurface->makeImageSnapshot();
 }
 
-TEST(FlutterEmbedderExternalTextureUnittests, TestPopulateExternalTextureYUVA) {
+TEST_F(FlutterEmbedderExternalTextureTest, TestPopulateExternalTextureYUVA) {
   // Constants.
   const size_t width = 100;
   const size_t height = 100;
@@ -185,7 +191,7 @@ TEST(FlutterEmbedderExternalTextureUnittests, TestPopulateExternalTextureYUVA) {
       [[FlutterDarwinContextMetalSkia alloc] initWithDefaultMTLDevice];
   SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
   GrDirectContext* grContext = darwinContextMetal.mainContext.get();
-  sk_sp<SkSurface> gpuSurface(SkSurface::MakeRenderTarget(grContext, SkBudgeted::kNo, info));
+  sk_sp<SkSurface> gpuSurface(SkSurfaces::RenderTarget(grContext, skgpu::Budgeted::kNo, info));
 
   // Create a texture.
   TestExternalTexture* testExternalTexture =
@@ -202,25 +208,25 @@ TEST(FlutterEmbedderExternalTextureUnittests, TestPopulateExternalTextureYUVA) {
     EXPECT_TRUE(w == width);
     EXPECT_TRUE(h == height);
 
-    FlutterMetalExternalTexture* texture = new FlutterMetalExternalTexture();
-    [textureHolder populateTexture:texture];
+    auto texture = std::make_unique<FlutterMetalExternalTexture>();
+    [textureHolder populateTexture:texture.get()];
 
     EXPECT_TRUE(texture->num_textures == 2);
     EXPECT_TRUE(texture->textures != nullptr);
     EXPECT_TRUE(texture->pixel_format == FlutterMetalExternalTexturePixelFormat::kYUVA);
     EXPECT_TRUE(texture->yuv_color_space ==
                 FlutterMetalExternalTextureYUVColorSpace::kBT601LimitedRange);
-
-    return std::unique_ptr<FlutterMetalExternalTexture>(texture);
+    return texture;
   };
 
   // Render the texture.
   std::unique_ptr<flutter::Texture> texture =
       std::make_unique<EmbedderExternalTextureMetal>(texture_id, callback);
   SkRect bounds = SkRect::MakeWH(info.width(), info.height());
-  SkSamplingOptions sampling = SkSamplingOptions(SkFilterMode::kNearest);
+  DlImageSampling sampling = DlImageSampling::kNearestNeighbor;
+  DlSkCanvasAdapter canvas(gpuSurface->getCanvas());
   flutter::Texture::PaintContext context{
-      .canvas = gpuSurface->getCanvas(),
+      .canvas = &canvas,
       .gr_context = grContext,
   };
   texture->Paint(context, bounds, /*freeze=*/false, sampling);
@@ -228,7 +234,7 @@ TEST(FlutterEmbedderExternalTextureUnittests, TestPopulateExternalTextureYUVA) {
   gpuSurface->makeImageSnapshot();
 }
 
-TEST(FlutterEmbedderExternalTextureUnittests, TestPopulateExternalTextureYUVA2) {
+TEST_F(FlutterEmbedderExternalTextureTest, TestPopulateExternalTextureYUVA2) {
   // Constants.
   const size_t width = 100;
   const size_t height = 100;
@@ -239,7 +245,7 @@ TEST(FlutterEmbedderExternalTextureUnittests, TestPopulateExternalTextureYUVA2)
       [[FlutterDarwinContextMetalSkia alloc] initWithDefaultMTLDevice];
   SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
   GrDirectContext* grContext = darwinContextMetal.mainContext.get();
-  sk_sp<SkSurface> gpuSurface(SkSurface::MakeRenderTarget(grContext, SkBudgeted::kNo, info));
+  sk_sp<SkSurface> gpuSurface(SkSurfaces::RenderTarget(grContext, skgpu::Budgeted::kNo, info));
 
   // Create a texture.
   TestExternalTexture* testExternalTexture =
@@ -256,25 +262,25 @@ TEST(FlutterEmbedderExternalTextureUnittests, TestPopulateExternalTextureYUVA2)
     EXPECT_TRUE(w == width);
     EXPECT_TRUE(h == height);
 
-    FlutterMetalExternalTexture* texture = new FlutterMetalExternalTexture();
-    [textureHolder populateTexture:texture];
+    auto texture = std::make_unique<FlutterMetalExternalTexture>();
+    [textureHolder populateTexture:texture.get()];
 
     EXPECT_TRUE(texture->num_textures == 2);
     EXPECT_TRUE(texture->textures != nullptr);
     EXPECT_TRUE(texture->pixel_format == FlutterMetalExternalTexturePixelFormat::kYUVA);
     EXPECT_TRUE(texture->yuv_color_space ==
                 FlutterMetalExternalTextureYUVColorSpace::kBT601FullRange);
-
-    return std::unique_ptr<FlutterMetalExternalTexture>(texture);
+    return texture;
   };
 
   // Render the texture.
   std::unique_ptr<flutter::Texture> texture =
       std::make_unique<EmbedderExternalTextureMetal>(texture_id, callback);
   SkRect bounds = SkRect::MakeWH(info.width(), info.height());
-  SkSamplingOptions sampling = SkSamplingOptions(SkFilterMode::kNearest);
+  DlImageSampling sampling = DlImageSampling::kNearestNeighbor;
+  DlSkCanvasAdapter canvas(gpuSurface->getCanvas());
   flutter::Texture::PaintContext context{
-      .canvas = gpuSurface->getCanvas(),
+      .canvas = &canvas,
       .gr_context = grContext,
   };
   texture->Paint(context, bounds, /*freeze=*/false, sampling);
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterEmbedderKeyResponder.h b/shell/platform/darwin/macos/framework/Source/FlutterEmbedderKeyResponder.h
index ab2b1c107d7852fbb32fbcef551ca4ce96924690..8600780d675a5e8c17113728432dca15fcec25a1 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterEmbedderKeyResponder.h
+++ b/shell/platform/darwin/macos/framework/Source/FlutterEmbedderKeyResponder.h
@@ -2,18 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTEREMBEDDERKEYRESPONDER_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTEREMBEDDERKEYRESPONDER_H_
+
 #import <Cocoa/Cocoa.h>
 
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterKeyPrimaryResponder.h"
 #include "flutter/shell/platform/embedder/embedder.h"
 
-namespace {
-typedef void* _VoidPtr;
-}
-
 typedef void (^FlutterSendEmbedderKeyEvent)(const FlutterKeyEvent& /* event */,
                                             _Nullable FlutterKeyEventCallback /* callback */,
-                                            _Nullable _VoidPtr /* user_data */);
+                                            void* _Nullable /* user_data */);
 
 /**
  * A primary responder of |FlutterKeyboardManager| that handles events by
@@ -30,4 +29,23 @@ typedef void (^FlutterSendEmbedderKeyEvent)(const FlutterKeyEvent& /* event */,
  */
 - (nonnull instancetype)initWithSendEvent:(_Nonnull FlutterSendEmbedderKeyEvent)sendEvent;
 
+/**
+ * Synthesize modifier keys events.
+ *
+ * If needed, synthesize modifier keys up and down events by comparing their
+ * current pressing states with the given modifier flags.
+ */
+- (void)syncModifiersIfNeeded:(NSEventModifierFlags)modifierFlags
+                    timestamp:(NSTimeInterval)timestamp;
+
+/**
+ * Returns the keyboard pressed state.
+ *
+ * Returns the keyboard pressed state. The dictionary contains one entry per
+ * pressed keys, mapping from the logical key to the physical key.
+ */
+- (nonnull NSDictionary*)getPressedState;
+
 @end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTEREMBEDDERKEYRESPONDER_H_
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterEmbedderKeyResponder.mm b/shell/platform/darwin/macos/framework/Source/FlutterEmbedderKeyResponder.mm
index 5854bb02f35f69d0890c9bca7f34e19af8d81995..37f67f94ee8f4182a6921c7591450b8ebe3bc01b 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterEmbedderKeyResponder.mm
+++ b/shell/platform/darwin/macos/framework/Source/FlutterEmbedderKeyResponder.mm
@@ -780,6 +780,22 @@ struct FlutterKeyPendingResponse {
   [_pendingResponses removeObjectForKey:@(responseId)];
 }
 
+- (void)syncModifiersIfNeeded:(NSEventModifierFlags)modifierFlags
+                    timestamp:(NSTimeInterval)timestamp {
+  FlutterAsyncKeyCallback replyCallback = ^(BOOL handled) {
+    // Do nothing.
+  };
+  FlutterKeyCallbackGuard* guardedCallback =
+      [[FlutterKeyCallbackGuard alloc] initWithCallback:replyCallback];
+  [self synchronizeModifiers:modifierFlags
+               ignoringFlags:0
+                   timestamp:timestamp
+                       guard:guardedCallback];
+}
+
+- (nonnull NSDictionary*)getPressedState {
+  return [NSDictionary dictionaryWithDictionary:_pressingRecords];
+}
 @end
 
 namespace {
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterEmbedderKeyResponderTest.mm b/shell/platform/darwin/macos/framework/Source/FlutterEmbedderKeyResponderTest.mm
index faa6703b050ab1c71a81204d774d3862f3b1948a..2443c80db37c9bdd1f2de12c010c8eeefb8112bc 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterEmbedderKeyResponderTest.mm
+++ b/shell/platform/darwin/macos/framework/Source/FlutterEmbedderKeyResponderTest.mm
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #import <Foundation/Foundation.h>
-#import <OCMock/OCMock.h>
 
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterEmbedderKeyResponder.h"
 #include "flutter/shell/platform/embedder/test_utils/key_codes.g.h"
@@ -14,10 +13,10 @@
 @interface TestKeyEvent : NSObject
 @property(nonatomic) FlutterKeyEvent* data;
 @property(nonatomic) FlutterKeyEventCallback callback;
-@property(nonatomic) _VoidPtr userData;
+@property(nonatomic) void* userData;
 - (nonnull instancetype)initWithEvent:(const FlutterKeyEvent*)event
                              callback:(nullable FlutterKeyEventCallback)callback
-                             userData:(nullable _VoidPtr)userData;
+                             userData:(nullable void*)userData;
 - (BOOL)hasCallback;
 - (void)respond:(BOOL)handled;
 @end
@@ -25,7 +24,7 @@
 @implementation TestKeyEvent
 - (instancetype)initWithEvent:(const FlutterKeyEvent*)event
                      callback:(nullable FlutterKeyEventCallback)callback
-                     userData:(nullable _VoidPtr)userData {
+                     userData:(nullable void*)userData {
   self = [super init];
   _data = new FlutterKeyEvent(*event);
   if (event->character != nullptr) {
@@ -123,7 +122,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, BasicKeyEvent) {
 
   FlutterEmbedderKeyResponder* responder = [[FlutterEmbedderKeyResponder alloc]
       initWithSendEvent:^(const FlutterKeyEvent& event, _Nullable FlutterKeyEventCallback callback,
-                          _Nullable _VoidPtr user_data) {
+                          void* _Nullable user_data) {
         [events addObject:[[TestKeyEvent alloc] initWithEvent:&event
                                                      callback:callback
                                                      userData:user_data]];
@@ -137,6 +136,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, BasicKeyEvent) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeDown);
   EXPECT_EQ(event->timestamp, 123000000.0f);
   EXPECT_EQ(event->physical, kPhysicalKeyA);
@@ -159,6 +159,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, BasicKeyEvent) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeRepeat);
   EXPECT_EQ(event->physical, kPhysicalKeyA);
   EXPECT_EQ(event->logical, kLogicalKeyA);
@@ -180,6 +181,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, BasicKeyEvent) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeUp);
   EXPECT_EQ(event->timestamp, 124000000.0f);
   EXPECT_EQ(event->physical, kPhysicalKeyA);
@@ -201,7 +203,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, NonAsciiCharacters) {
 
   FlutterEmbedderKeyResponder* responder = [[FlutterEmbedderKeyResponder alloc]
       initWithSendEvent:^(const FlutterKeyEvent& event, _Nullable FlutterKeyEventCallback callback,
-                          _Nullable _VoidPtr user_data) {
+                          void* _Nullable user_data) {
         [events addObject:[[TestKeyEvent alloc] initWithEvent:&event
                                                      callback:callback
                                                      userData:user_data]];
@@ -214,6 +216,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, NonAsciiCharacters) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeDown);
   EXPECT_EQ(event->physical, kPhysicalAltRight);
   EXPECT_EQ(event->logical, kLogicalAltRight);
@@ -228,6 +231,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, NonAsciiCharacters) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeDown);
   EXPECT_EQ(event->physical, kPhysicalKeyW);
   EXPECT_EQ(event->logical, kLogicalKeyW);
@@ -242,6 +246,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, NonAsciiCharacters) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeUp);
   EXPECT_EQ(event->physical, kPhysicalAltRight);
   EXPECT_EQ(event->logical, kLogicalAltRight);
@@ -256,6 +261,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, NonAsciiCharacters) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeUp);
   EXPECT_EQ(event->physical, kPhysicalKeyW);
   EXPECT_EQ(event->logical, kLogicalKeyW);
@@ -271,7 +277,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, MultipleCharacters) {
 
   FlutterEmbedderKeyResponder* responder = [[FlutterEmbedderKeyResponder alloc]
       initWithSendEvent:^(const FlutterKeyEvent& event, _Nullable FlutterKeyEventCallback callback,
-                          _Nullable _VoidPtr user_data) {
+                          void* _Nullable user_data) {
         [events addObject:[[TestKeyEvent alloc] initWithEvent:&event
                                                      callback:callback
                                                      userData:user_data]];
@@ -283,6 +289,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, MultipleCharacters) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeDown);
   EXPECT_EQ(event->physical, kPhysicalKeyA);
   EXPECT_EQ(event->logical, 0x1400000000ull);
@@ -297,6 +304,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, MultipleCharacters) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeUp);
   EXPECT_EQ(event->physical, kPhysicalKeyA);
   EXPECT_EQ(event->logical, 0x1400000000ull);
@@ -313,7 +321,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, SynthesizeForDuplicateDownEvent) {
 
   FlutterEmbedderKeyResponder* responder = [[FlutterEmbedderKeyResponder alloc]
       initWithSendEvent:^(const FlutterKeyEvent& event, _Nullable FlutterKeyEventCallback callback,
-                          _Nullable _VoidPtr user_data) {
+                          void* _Nullable user_data) {
         [events addObject:[[TestKeyEvent alloc] initWithEvent:&event
                                                      callback:callback
                                                      userData:user_data]];
@@ -327,6 +335,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, SynthesizeForDuplicateDownEvent) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeDown);
   EXPECT_EQ(event->physical, kPhysicalKeyA);
   EXPECT_EQ(event->logical, kLogicalKeyA);
@@ -347,6 +356,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, SynthesizeForDuplicateDownEvent) {
   EXPECT_EQ([events count], 2u);
 
   event = [events firstObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeUp);
   EXPECT_EQ(event->physical, kPhysicalKeyA);
   EXPECT_EQ(event->logical, kLogicalKeyA);
@@ -354,6 +364,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, SynthesizeForDuplicateDownEvent) {
   EXPECT_EQ(event->synthesized, true);
 
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeDown);
   EXPECT_EQ(event->physical, kPhysicalKeyA);
   EXPECT_EQ(event->logical, 0xE0ull /* à */);
@@ -372,7 +383,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, IgnoreDuplicateUpEvent) {
 
   FlutterEmbedderKeyResponder* responder = [[FlutterEmbedderKeyResponder alloc]
       initWithSendEvent:^(const FlutterKeyEvent& event, _Nullable FlutterKeyEventCallback callback,
-                          _Nullable _VoidPtr user_data) {
+                          void* _Nullable user_data) {
         [events addObject:[[TestKeyEvent alloc] initWithEvent:&event
                                                      callback:callback
                                                      userData:user_data]];
@@ -387,6 +398,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, IgnoreDuplicateUpEvent) {
   EXPECT_EQ([events count], 1u);
   EXPECT_EQ(last_handled, TRUE);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->physical, 0ull);
   EXPECT_EQ(event->logical, 0ull);
   EXPECT_FALSE([[events lastObject] hasCallback]);
@@ -402,7 +414,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, ConvertAbruptRepeatEventsToDown) {
 
   FlutterEmbedderKeyResponder* responder = [[FlutterEmbedderKeyResponder alloc]
       initWithSendEvent:^(const FlutterKeyEvent& event, _Nullable FlutterKeyEventCallback callback,
-                          _Nullable _VoidPtr user_data) {
+                          void* _Nullable user_data) {
         [events addObject:[[TestKeyEvent alloc] initWithEvent:&event
                                                      callback:callback
                                                      userData:user_data]];
@@ -416,6 +428,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, ConvertAbruptRepeatEventsToDown) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeDown);
   EXPECT_EQ(event->physical, kPhysicalKeyA);
   EXPECT_EQ(event->logical, kLogicalKeyA);
@@ -438,7 +451,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, ToggleModifiersDuringKeyTap) {
 
   FlutterEmbedderKeyResponder* responder = [[FlutterEmbedderKeyResponder alloc]
       initWithSendEvent:^(const FlutterKeyEvent& event, _Nullable FlutterKeyEventCallback callback,
-                          _Nullable _VoidPtr user_data) {
+                          void* _Nullable user_data) {
         [events addObject:[[TestKeyEvent alloc] initWithEvent:&event
                                                      callback:callback
                                                      userData:user_data]];
@@ -451,6 +464,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, ToggleModifiersDuringKeyTap) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeDown);
   EXPECT_EQ(event->timestamp, 123000000.0f);
   EXPECT_EQ(event->physical, kPhysicalShiftRight);
@@ -467,6 +481,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, ToggleModifiersDuringKeyTap) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeDown);
   EXPECT_EQ(event->physical, kPhysicalKeyA);
   EXPECT_EQ(event->logical, kLogicalKeyA);
@@ -482,6 +497,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, ToggleModifiersDuringKeyTap) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeRepeat);
   EXPECT_EQ(event->physical, kPhysicalKeyA);
   EXPECT_EQ(event->logical, kLogicalKeyA);
@@ -498,6 +514,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, ToggleModifiersDuringKeyTap) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeUp);
   EXPECT_EQ(event->physical, kPhysicalShiftRight);
   EXPECT_EQ(event->logical, kLogicalShiftRight);
@@ -513,6 +530,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, ToggleModifiersDuringKeyTap) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeRepeat);
   EXPECT_EQ(event->physical, kPhysicalKeyA);
   EXPECT_EQ(event->logical, kLogicalKeyA);
@@ -527,6 +545,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, ToggleModifiersDuringKeyTap) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeUp);
   EXPECT_EQ(event->physical, kPhysicalKeyA);
   EXPECT_EQ(event->logical, kLogicalKeyA);
@@ -548,7 +567,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, SpecialModiferFlags) {
 
   FlutterEmbedderKeyResponder* responder = [[FlutterEmbedderKeyResponder alloc]
       initWithSendEvent:^(const FlutterKeyEvent& event, _Nullable FlutterKeyEventCallback callback,
-                          _Nullable _VoidPtr user_data) {
+                          void* _Nullable user_data) {
         [events addObject:[[TestKeyEvent alloc] initWithEvent:&event
                                                      callback:callback
                                                      userData:user_data]];
@@ -564,6 +583,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, SpecialModiferFlags) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeDown);
   EXPECT_EQ(event->physical, kPhysicalNumpad1);
   EXPECT_EQ(event->logical, kLogicalNumpad1);
@@ -581,6 +601,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, SpecialModiferFlags) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeDown);
   EXPECT_EQ(event->physical, kPhysicalF1);
   EXPECT_EQ(event->logical, kLogicalF1);
@@ -597,6 +618,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, SpecialModiferFlags) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeDown);
   EXPECT_EQ(event->physical, kPhysicalKeyA);
   EXPECT_EQ(event->logical, kLogicalKeyA);
@@ -614,6 +636,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, SpecialModiferFlags) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeDown);
   EXPECT_EQ(event->physical, kPhysicalShiftLeft);
   EXPECT_EQ(event->logical, kLogicalShiftLeft);
@@ -630,6 +653,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, SpecialModiferFlags) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeUp);
   EXPECT_EQ(event->physical, kPhysicalNumpad1);
   EXPECT_EQ(event->logical, kLogicalNumpad1);
@@ -647,6 +671,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, SpecialModiferFlags) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeUp);
   EXPECT_EQ(event->physical, kPhysicalF1);
   EXPECT_EQ(event->logical, kLogicalF1);
@@ -663,6 +688,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, SpecialModiferFlags) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeUp);
   EXPECT_EQ(event->physical, kPhysicalKeyA);
   EXPECT_EQ(event->logical, kLogicalKeyA);
@@ -680,6 +706,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, SpecialModiferFlags) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeUp);
   EXPECT_EQ(event->physical, kPhysicalShiftLeft);
   EXPECT_EQ(event->logical, kLogicalShiftLeft);
@@ -696,7 +723,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, IdentifyLeftAndRightModifiers) {
 
   FlutterEmbedderKeyResponder* responder = [[FlutterEmbedderKeyResponder alloc]
       initWithSendEvent:^(const FlutterKeyEvent& event, _Nullable FlutterKeyEventCallback callback,
-                          _Nullable _VoidPtr user_data) {
+                          void* _Nullable user_data) {
         [events addObject:[[TestKeyEvent alloc] initWithEvent:&event
                                                      callback:callback
                                                      userData:user_data]];
@@ -709,6 +736,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, IdentifyLeftAndRightModifiers) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeDown);
   EXPECT_EQ(event->physical, kPhysicalShiftLeft);
   EXPECT_EQ(event->logical, kLogicalShiftLeft);
@@ -725,6 +753,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, IdentifyLeftAndRightModifiers) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeDown);
   EXPECT_EQ(event->physical, kPhysicalShiftRight);
   EXPECT_EQ(event->logical, kLogicalShiftRight);
@@ -741,6 +770,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, IdentifyLeftAndRightModifiers) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeUp);
   EXPECT_EQ(event->physical, kPhysicalShiftLeft);
   EXPECT_EQ(event->logical, kLogicalShiftLeft);
@@ -757,6 +787,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, IdentifyLeftAndRightModifiers) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeUp);
   EXPECT_EQ(event->physical, kPhysicalShiftRight);
   EXPECT_EQ(event->logical, kLogicalShiftRight);
@@ -782,7 +813,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, SynthesizeMissedModifierEvents) {
 
   FlutterEmbedderKeyResponder* responder = [[FlutterEmbedderKeyResponder alloc]
       initWithSendEvent:^(const FlutterKeyEvent& event, _Nullable FlutterKeyEventCallback callback,
-                          _Nullable _VoidPtr user_data) {
+                          void* _Nullable user_data) {
         [events addObject:[[TestKeyEvent alloc] initWithEvent:&event
                                                      callback:callback
                                                      userData:user_data]];
@@ -798,6 +829,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, SynthesizeMissedModifierEvents) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeDown);
   EXPECT_EQ(event->physical, kPhysicalShiftLeft);
   EXPECT_EQ(event->logical, kLogicalShiftLeft);
@@ -817,8 +849,10 @@ TEST(FlutterEmbedderKeyResponderUnittests, SynthesizeMissedModifierEvents) {
          callback:keyEventCallback];
 
   EXPECT_EQ([events count], 1u);
-  EXPECT_EQ([events lastObject].data->physical, 0u);
-  EXPECT_EQ([events lastObject].data->logical, 0u);
+  event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
+  EXPECT_EQ(event->physical, 0u);
+  EXPECT_EQ(event->logical, 0u);
   EXPECT_FALSE([[events lastObject] hasCallback]);
   EXPECT_EQ(last_handled, TRUE);
   [events removeAllObjects];
@@ -830,6 +864,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, SynthesizeMissedModifierEvents) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeUp);
   EXPECT_EQ(event->physical, kPhysicalShiftLeft);
   EXPECT_EQ(event->logical, kLogicalShiftLeft);
@@ -853,8 +888,10 @@ TEST(FlutterEmbedderKeyResponderUnittests, SynthesizeMissedModifierEvents) {
          callback:keyEventCallback];
 
   EXPECT_EQ([events count], 1u);
-  EXPECT_EQ([events lastObject].data->physical, 0u);
-  EXPECT_EQ([events lastObject].data->logical, 0u);
+  event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
+  EXPECT_EQ(event->physical, 0u);
+  EXPECT_EQ(event->logical, 0u);
   EXPECT_FALSE([[events lastObject] hasCallback]);
   EXPECT_EQ(last_handled, TRUE);
   [events removeAllObjects];
@@ -870,6 +907,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, SynthesizeMissedModifierEvents) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeDown);
   EXPECT_EQ(event->physical, kPhysicalShiftLeft);
   EXPECT_EQ(event->logical, kLogicalShiftLeft);
@@ -890,6 +928,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, SynthesizeMissedModifierEvents) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeUp);
   EXPECT_EQ(event->physical, kPhysicalShiftLeft);
   EXPECT_EQ(event->logical, kLogicalShiftLeft);
@@ -913,6 +952,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, SynthesizeMissedModifierEvents) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeDown);
   EXPECT_EQ(event->physical, kPhysicalShiftLeft);
   EXPECT_EQ(event->logical, kLogicalShiftLeft);
@@ -933,6 +973,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, SynthesizeMissedModifierEvents) {
 
   EXPECT_EQ([events count], 1u);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeDown);
   EXPECT_EQ(event->physical, kPhysicalShiftRight);
   EXPECT_EQ(event->logical, kLogicalShiftRight);
@@ -953,6 +994,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, SynthesizeMissedModifierEvents) {
 
   EXPECT_EQ([events count], 2u);
   event = [events firstObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeUp);
   EXPECT_EQ(event->physical, kPhysicalShiftLeft);
   EXPECT_EQ(event->logical, kLogicalShiftLeft);
@@ -962,6 +1004,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, SynthesizeMissedModifierEvents) {
   EXPECT_FALSE([[events firstObject] hasCallback]);
 
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeUp);
   EXPECT_EQ(event->physical, kPhysicalShiftRight);
   EXPECT_EQ(event->logical, kLogicalShiftRight);
@@ -986,7 +1029,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, SynthesizeMissedModifierEventsInNorma
 
   FlutterEmbedderKeyResponder* responder = [[FlutterEmbedderKeyResponder alloc]
       initWithSendEvent:^(const FlutterKeyEvent& event, _Nullable FlutterKeyEventCallback callback,
-                          _Nullable _VoidPtr user_data) {
+                          void* _Nullable user_data) {
         [events addObject:[[TestKeyEvent alloc] initWithEvent:&event
                                                      callback:callback
                                                      userData:user_data]];
@@ -1001,6 +1044,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, SynthesizeMissedModifierEventsInNorma
 
   EXPECT_EQ([events count], 2u);
   event = [events firstObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeDown);
   EXPECT_EQ(event->physical, kPhysicalShiftLeft);
   EXPECT_EQ(event->logical, kLogicalShiftLeft);
@@ -1009,6 +1053,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, SynthesizeMissedModifierEventsInNorma
   EXPECT_FALSE([[events firstObject] hasCallback]);
 
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeDown);
   EXPECT_EQ(event->physical, kPhysicalKeyA);
   EXPECT_EQ(event->logical, kLogicalKeyA);
@@ -1028,6 +1073,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, SynthesizeMissedModifierEventsInNorma
 
   EXPECT_EQ([events count], 2u);
   event = [events firstObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeUp);
   EXPECT_EQ(event->physical, kPhysicalShiftLeft);
   EXPECT_EQ(event->logical, kLogicalShiftLeft);
@@ -1036,6 +1082,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, SynthesizeMissedModifierEventsInNorma
   EXPECT_FALSE([[events firstObject] hasCallback]);
 
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeUp);
   EXPECT_EQ(event->physical, kPhysicalKeyA);
   EXPECT_EQ(event->logical, kLogicalKeyA);
@@ -1060,7 +1107,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, ConvertCapsLockEvents) {
 
   FlutterEmbedderKeyResponder* responder = [[FlutterEmbedderKeyResponder alloc]
       initWithSendEvent:^(const FlutterKeyEvent& event, _Nullable FlutterKeyEventCallback callback,
-                          _Nullable _VoidPtr user_data) {
+                          void* _Nullable user_data) {
         [events addObject:[[TestKeyEvent alloc] initWithEvent:&event
                                                      callback:callback
                                                      userData:user_data]];
@@ -1076,6 +1123,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, ConvertCapsLockEvents) {
   EXPECT_EQ([events count], 2u);
 
   event = [events firstObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeDown);
   EXPECT_EQ(event->physical, kPhysicalCapsLock);
   EXPECT_EQ(event->logical, kLogicalCapsLock);
@@ -1084,6 +1132,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, ConvertCapsLockEvents) {
   EXPECT_TRUE([[events firstObject] hasCallback]);
 
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeUp);
   EXPECT_EQ(event->physical, kPhysicalCapsLock);
   EXPECT_EQ(event->logical, kLogicalCapsLock);
@@ -1106,6 +1155,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, ConvertCapsLockEvents) {
   EXPECT_EQ([events count], 2u);
 
   event = [events firstObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeDown);
   EXPECT_EQ(event->physical, kPhysicalCapsLock);
   EXPECT_EQ(event->logical, kLogicalCapsLock);
@@ -1114,6 +1164,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, ConvertCapsLockEvents) {
   EXPECT_TRUE([[events firstObject] hasCallback]);
 
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeUp);
   EXPECT_EQ(event->physical, kPhysicalCapsLock);
   EXPECT_EQ(event->logical, kLogicalCapsLock);
@@ -1139,7 +1190,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, SynchronizeCapsLockStateOnCapsLock) {
 
   FlutterEmbedderKeyResponder* responder = [[FlutterEmbedderKeyResponder alloc]
       initWithSendEvent:^(const FlutterKeyEvent& event, _Nullable FlutterKeyEventCallback callback,
-                          _Nullable _VoidPtr user_data) {
+                          void* _Nullable user_data) {
         [events addObject:[[TestKeyEvent alloc] initWithEvent:&event
                                                      callback:callback
                                                      userData:user_data]];
@@ -1154,6 +1205,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, SynchronizeCapsLockStateOnCapsLock) {
   EXPECT_EQ([events count], 1u);
   EXPECT_EQ(last_handled, TRUE);
   event = [events lastObject].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->physical, 0ull);
   EXPECT_EQ(event->logical, 0ull);
   EXPECT_FALSE([[events lastObject] hasCallback]);
@@ -1173,7 +1225,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, SynchronizeCapsLockStateOnNormalKey)
 
   FlutterEmbedderKeyResponder* responder = [[FlutterEmbedderKeyResponder alloc]
       initWithSendEvent:^(const FlutterKeyEvent& event, _Nullable FlutterKeyEventCallback callback,
-                          _Nullable _VoidPtr user_data) {
+                          void* _Nullable user_data) {
         [events addObject:[[TestKeyEvent alloc] initWithEvent:&event
                                                      callback:callback
                                                      userData:user_data]];
@@ -1186,6 +1238,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, SynchronizeCapsLockStateOnNormalKey)
   EXPECT_EQ([events count], 3u);
 
   event = events[0].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeDown);
   EXPECT_EQ(event->physical, kPhysicalCapsLock);
   EXPECT_EQ(event->logical, kLogicalCapsLock);
@@ -1194,6 +1247,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, SynchronizeCapsLockStateOnNormalKey)
   EXPECT_FALSE([events[0] hasCallback]);
 
   event = events[1].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeUp);
   EXPECT_EQ(event->physical, kPhysicalCapsLock);
   EXPECT_EQ(event->logical, kLogicalCapsLock);
@@ -1202,6 +1256,7 @@ TEST(FlutterEmbedderKeyResponderUnittests, SynchronizeCapsLockStateOnNormalKey)
   EXPECT_FALSE([events[1] hasCallback]);
 
   event = events[2].data;
+  ASSERT_NE(event, nullptr);
   EXPECT_EQ(event->type, kFlutterKeyEventTypeDown);
   EXPECT_EQ(event->physical, kPhysicalKeyA);
   EXPECT_EQ(event->logical, kLogicalKeyA);
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterEngine.mm b/shell/platform/darwin/macos/framework/Source/FlutterEngine.mm
index 19ed29aa1171ca70f8c8510605eb681563c40b3a..56419b18a661c44b217e3543247199500c896685 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterEngine.mm
+++ b/shell/platform/darwin/macos/framework/Source/FlutterEngine.mm
@@ -9,15 +9,30 @@
 #include <iostream>
 #include <vector>
 
+#include "flutter/shell/platform/common/app_lifecycle_state.h"
+#include "flutter/shell/platform/common/engine_switches.h"
+#include "flutter/shell/platform/embedder/embedder.h"
+
+#import "flutter/shell/platform/darwin/common/framework/Source/FlutterBinaryMessengerRelay.h"
+#import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterAppDelegate.h"
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterAppDelegate_Internal.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterCompositor.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterDartProject_Internal.h"
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterDisplayLink.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterMenuPlugin.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterMouseCursorPlugin.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterPlatformViewController.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterRenderer.h"
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterTimeConverter.h"
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterVSyncWaiter.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterViewController_Internal.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterViewEngineProvider.h"
-#include "flutter/shell/platform/embedder/embedder.h"
+
+@class FlutterEngineRegistrar;
+
+NSString* const kFlutterPlatformChannel = @"flutter/platform";
+NSString* const kFlutterSettingsChannel = @"flutter/settings";
+NSString* const kFlutterLifecycleChannel = @"flutter/lifecycle";
 
 /**
  * Constructs and returns a FlutterLocale struct corresponding to |locale|, which must outlive
@@ -80,6 +95,42 @@ constexpr char kTextPlainFormat[] = "text/plain";
  */
 @property(nonatomic, strong) NSMutableArray<NSNumber*>* isResponseValid;
 
+/**
+ * All delegates added via plugin calls to addApplicationDelegate.
+ */
+@property(nonatomic, strong) NSPointerArray* pluginAppDelegates;
+
+/**
+ * All registrars returned from registrarForPlugin:
+ */
+@property(nonatomic, readonly)
+    NSMutableDictionary<NSString*, FlutterEngineRegistrar*>* pluginRegistrars;
+
+- (nullable FlutterViewController*)viewControllerForId:(FlutterViewId)viewId;
+
+/**
+ * An internal method that adds the view controller with the given ID.
+ *
+ * This method assigns the controller with the ID, puts the controller into the
+ * map, and does assertions related to the implicit view ID.
+ */
+- (void)registerViewController:(FlutterViewController*)controller forId:(FlutterViewId)viewId;
+
+/**
+ * An internal method that removes the view controller with the given ID.
+ *
+ * This method clears the ID of the controller, removes the controller from the
+ * map. This is an no-op if the view ID is not associated with any view
+ * controllers.
+ */
+- (void)deregisterViewControllerForId:(FlutterViewId)viewId;
+
+/**
+ * Shuts down the engine if view requirement is not met, and headless execution
+ * is not allowed.
+ */
+- (void)shutDownIfNeeded;
+
 /**
  * Sends the list of user-preferred locales to the Flutter engine.
  */
@@ -115,6 +166,11 @@ constexpr char kTextPlainFormat[] = "text/plain";
  */
 - (void)setUpPlatformViewChannel;
 
+/**
+ * Creates an accessibility channel and sets up the message handler.
+ */
+- (void)setUpAccessibilityChannel;
+
 /**
  * Handles messages received from the Flutter engine on the _*Channel channels.
  */
@@ -124,24 +180,152 @@ constexpr char kTextPlainFormat[] = "text/plain";
 
 #pragma mark -
 
+@implementation FlutterEngineTerminationHandler {
+  __weak FlutterEngine* _engine;
+  FlutterTerminationCallback _terminator;
+}
+
+- (instancetype)initWithEngine:(FlutterEngine*)engine
+                    terminator:(FlutterTerminationCallback)terminator {
+  self = [super init];
+  _acceptingRequests = NO;
+  _engine = engine;
+  _terminator = terminator ? terminator : ^(id sender) {
+    // Default to actually terminating the application. The terminator exists to
+    // allow tests to override it so that an actual exit doesn't occur.
+    [[NSApplication sharedApplication] terminate:sender];
+  };
+  id<NSApplicationDelegate> appDelegate = [[NSApplication sharedApplication] delegate];
+  if ([appDelegate respondsToSelector:@selector(setTerminationHandler:)]) {
+    FlutterAppDelegate* flutterAppDelegate = reinterpret_cast<FlutterAppDelegate*>(appDelegate);
+    flutterAppDelegate.terminationHandler = self;
+  }
+  return self;
+}
+
+// This is called by the method call handler in the engine when the application
+// requests termination itself.
+- (void)handleRequestAppExitMethodCall:(NSDictionary<NSString*, id>*)arguments
+                                result:(FlutterResult)result {
+  NSString* type = arguments[@"type"];
+  // Ignore the "exitCode" value in the arguments because AppKit doesn't have
+  // any good way to set the process exit code other than calling exit(), and
+  // that bypasses all of the native applicationShouldExit shutdown events,
+  // etc., which we don't want to skip.
+
+  FlutterAppExitType exitType =
+      [type isEqualTo:@"cancelable"] ? kFlutterAppExitTypeCancelable : kFlutterAppExitTypeRequired;
+
+  [self requestApplicationTermination:[NSApplication sharedApplication]
+                             exitType:exitType
+                               result:result];
+}
+
+// This is called by the FlutterAppDelegate whenever any termination request is
+// received.
+- (void)requestApplicationTermination:(id)sender
+                             exitType:(FlutterAppExitType)type
+                               result:(nullable FlutterResult)result {
+  _shouldTerminate = YES;
+  if (![self acceptingRequests]) {
+    // Until the Dart application has signaled that it is ready to handle
+    // termination requests, the app will just terminate when asked.
+    type = kFlutterAppExitTypeRequired;
+  }
+  switch (type) {
+    case kFlutterAppExitTypeCancelable: {
+      FlutterJSONMethodCodec* codec = [FlutterJSONMethodCodec sharedInstance];
+      FlutterMethodCall* methodCall =
+          [FlutterMethodCall methodCallWithMethodName:@"System.requestAppExit" arguments:nil];
+      [_engine sendOnChannel:kFlutterPlatformChannel
+                     message:[codec encodeMethodCall:methodCall]
+                 binaryReply:^(NSData* _Nullable reply) {
+                   NSAssert(_terminator, @"terminator shouldn't be nil");
+                   id decoded_reply = [codec decodeEnvelope:reply];
+                   if ([decoded_reply isKindOfClass:[FlutterError class]]) {
+                     FlutterError* error = (FlutterError*)decoded_reply;
+                     NSLog(@"Method call returned error[%@]: %@ %@", [error code], [error message],
+                           [error details]);
+                     _terminator(sender);
+                     return;
+                   }
+                   if (![decoded_reply isKindOfClass:[NSDictionary class]]) {
+                     NSLog(@"Call to System.requestAppExit returned an unexpected object: %@",
+                           decoded_reply);
+                     _terminator(sender);
+                     return;
+                   }
+                   NSDictionary* replyArgs = (NSDictionary*)decoded_reply;
+                   if ([replyArgs[@"response"] isEqual:@"exit"]) {
+                     _terminator(sender);
+                   } else if ([replyArgs[@"response"] isEqual:@"cancel"]) {
+                     _shouldTerminate = NO;
+                   }
+                   if (result != nil) {
+                     result(replyArgs);
+                   }
+                 }];
+      break;
+    }
+    case kFlutterAppExitTypeRequired:
+      NSAssert(_terminator, @"terminator shouldn't be nil");
+      _terminator(sender);
+      break;
+  }
+}
+
+@end
+
+#pragma mark -
+
+@implementation FlutterPasteboard
+
+- (NSInteger)clearContents {
+  return [[NSPasteboard generalPasteboard] clearContents];
+}
+
+- (NSString*)stringForType:(NSPasteboardType)dataType {
+  return [[NSPasteboard generalPasteboard] stringForType:dataType];
+}
+
+- (BOOL)setString:(nonnull NSString*)string forType:(nonnull NSPasteboardType)dataType {
+  return [[NSPasteboard generalPasteboard] setString:string forType:dataType];
+}
+
+@end
+
+#pragma mark -
+
 /**
  * `FlutterPluginRegistrar` implementation handling a single plugin.
  */
 @interface FlutterEngineRegistrar : NSObject <FlutterPluginRegistrar>
 - (instancetype)initWithPlugin:(nonnull NSString*)pluginKey
                  flutterEngine:(nonnull FlutterEngine*)flutterEngine;
+
+- (nullable NSView*)viewForId:(FlutterViewId)viewId;
+
+/**
+ * The value published by this plugin, or NSNull if nothing has been published.
+ *
+ * The unusual NSNull is for the documented behavior of valuePublishedByPlugin:.
+ */
+@property(nonatomic, readonly, nonnull) NSObject* publishedValue;
 @end
 
 @implementation FlutterEngineRegistrar {
   NSString* _pluginKey;
-  FlutterEngine* _flutterEngine;
+  __weak FlutterEngine* _flutterEngine;
 }
 
+@dynamic view;
+
 - (instancetype)initWithPlugin:(NSString*)pluginKey flutterEngine:(FlutterEngine*)flutterEngine {
   self = [super init];
   if (self) {
     _pluginKey = [pluginKey copy];
     _flutterEngine = flutterEngine;
+    _publishedValue = [NSNull null];
   }
   return self;
 }
@@ -157,10 +341,18 @@ constexpr char kTextPlainFormat[] = "text/plain";
 }
 
 - (NSView*)view {
-  if (!_flutterEngine.viewController.viewLoaded) {
-    [_flutterEngine.viewController loadView];
+  return [self viewForId:kFlutterImplicitViewId];
+}
+
+- (NSView*)viewForId:(FlutterViewId)viewId {
+  FlutterViewController* controller = [_flutterEngine viewControllerForId:viewId];
+  if (controller == nil) {
+    return nil;
+  }
+  if (!controller.viewLoaded) {
+    [controller loadView];
   }
-  return _flutterEngine.viewController.flutterView;
+  return controller.flutterView;
 }
 
 - (void)addMethodCallDelegate:(nonnull id<FlutterPlugin>)delegate
@@ -170,11 +362,33 @@ constexpr char kTextPlainFormat[] = "text/plain";
   }];
 }
 
+- (void)addApplicationDelegate:(NSObject<FlutterAppLifecycleDelegate>*)delegate {
+  id<NSApplicationDelegate> appDelegate = [[NSApplication sharedApplication] delegate];
+  if ([appDelegate conformsToProtocol:@protocol(FlutterAppLifecycleProvider)]) {
+    id<FlutterAppLifecycleProvider> lifeCycleProvider =
+        static_cast<id<FlutterAppLifecycleProvider>>(appDelegate);
+    [lifeCycleProvider addApplicationLifecycleDelegate:delegate];
+    [_flutterEngine.pluginAppDelegates addPointer:(__bridge void*)delegate];
+  }
+}
+
 - (void)registerViewFactory:(nonnull NSObject<FlutterPlatformViewFactory>*)factory
                      withId:(nonnull NSString*)factoryId {
   [[_flutterEngine platformViewController] registerViewFactory:factory withId:factoryId];
 }
 
+- (void)publish:(NSObject*)value {
+  _publishedValue = value;
+}
+
+- (NSString*)lookupKeyForAsset:(NSString*)asset {
+  return [FlutterDartProject lookupKeyForAsset:asset];
+}
+
+- (NSString*)lookupKeyForAsset:(NSString*)asset fromPackage:(NSString*)package {
+  return [FlutterDartProject lookupKeyForAsset:asset fromPackage:package];
+}
+
 @end
 
 // Callbacks provided to the engine. See the called methods for documentation.
@@ -190,9 +404,6 @@ static void OnPlatformMessage(const FlutterPlatformMessage* message, FlutterEngi
   // The embedding-API-level engine object.
   FLUTTER_API_SYMBOL(FlutterEngine) _engine;
 
-  // The private member for accessibility.
-  std::shared_ptr<flutter::AccessibilityBridgeMac> _bridge;
-
   // The project being run by this engine.
   FlutterDartProject* _project;
 
@@ -213,7 +424,10 @@ static void OnPlatformMessage(const FlutterPlatformMessage* message, FlutterEngi
   // when the engine is destroyed.
   std::unique_ptr<flutter::FlutterCompositor> _macOSCompositor;
 
-  FlutterViewEngineProvider* _viewProvider;
+  // The information of all views attached to this engine mapped from IDs.
+  //
+  // It can't use NSDictionary, because the values need to be weak references.
+  NSMapTable* _viewControllers;
 
   // FlutterCompositor is copied and used in embedder.cc.
   FlutterCompositor _compositor;
@@ -229,32 +443,76 @@ static void OnPlatformMessage(const FlutterPlatformMessage* message, FlutterEngi
   // A message channel for sending user settings to the flutter engine.
   FlutterBasicMessageChannel* _settingsChannel;
 
+  // A message channel for accessibility.
+  FlutterBasicMessageChannel* _accessibilityChannel;
+
   // A method channel for miscellaneous platform functionality.
   FlutterMethodChannel* _platformChannel;
+
+  FlutterThreadSynchronizer* _threadSynchronizer;
+
+  // The next available view ID.
+  int _nextViewId;
+
+  // Whether the application is currently the active application.
+  BOOL _active;
+
+  // Whether any portion of the application is currently visible.
+  BOOL _visible;
+
+  // Proxy to allow plugins, channels to hold a weak reference to the binary messenger (self).
+  FlutterBinaryMessengerRelay* _binaryMessenger;
+
+  // Map from ViewId to vsync waiter. Note that this is modified on main thread
+  // but accessed on UI thread, so access must be @synchronized.
+  NSMapTable<NSNumber*, FlutterVSyncWaiter*>* _vsyncWaiters;
 }
 
 - (instancetype)initWithName:(NSString*)labelPrefix project:(FlutterDartProject*)project {
   return [self initWithName:labelPrefix project:project allowHeadlessExecution:YES];
 }
 
+static const int kMainThreadPriority = 47;
+
+static void SetThreadPriority(FlutterThreadPriority priority) {
+  if (priority == kDisplay || priority == kRaster) {
+    pthread_t thread = pthread_self();
+    sched_param param;
+    int policy;
+    if (!pthread_getschedparam(thread, &policy, &param)) {
+      param.sched_priority = kMainThreadPriority;
+      pthread_setschedparam(thread, policy, &param);
+    }
+    pthread_set_qos_class_self_np(QOS_CLASS_USER_INTERACTIVE, 0);
+  }
+}
+
 - (instancetype)initWithName:(NSString*)labelPrefix
                      project:(FlutterDartProject*)project
       allowHeadlessExecution:(BOOL)allowHeadlessExecution {
   self = [super init];
   NSAssert(self, @"Super init cannot be nil");
-
+  _pasteboard = [[FlutterPasteboard alloc] init];
+  _active = NO;
+  _visible = NO;
   _project = project ?: [[FlutterDartProject alloc] init];
   _messengerHandlers = [[NSMutableDictionary alloc] init];
+  _binaryMessenger = [[FlutterBinaryMessengerRelay alloc] initWithParent:self];
+  _pluginAppDelegates = [NSPointerArray weakObjectsPointerArray];
+  _pluginRegistrars = [[NSMutableDictionary alloc] init];
   _currentMessengerConnection = 1;
   _allowHeadlessExecution = allowHeadlessExecution;
   _semanticsEnabled = NO;
-  _viewProvider = [[FlutterViewEngineProvider alloc] initWithEngine:self];
+  _binaryMessenger = [[FlutterBinaryMessengerRelay alloc] initWithParent:self];
   _isResponseValid = [[NSMutableArray alloc] initWithCapacity:1];
   [_isResponseValid addObject:@YES];
+  // kFlutterImplicitViewId is reserved for the implicit view.
+  _nextViewId = kFlutterImplicitViewId + 1;
 
   _embedderAPI.struct_size = sizeof(FlutterEngineProcTable);
   FlutterEngineGetProcAddresses(&_embedderAPI);
 
+  _viewControllers = [NSMapTable weakToWeakObjectsMapTable];
   _renderer = [[FlutterRenderer alloc] initWithFlutterEngine:self];
 
   NSNotificationCenter* notificationCenter = [NSNotificationCenter defaultCenter];
@@ -264,13 +522,47 @@ static void OnPlatformMessage(const FlutterPlatformMessage* message, FlutterEngi
                            object:nil];
 
   _platformViewController = [[FlutterPlatformViewController alloc] init];
+  _threadSynchronizer = [[FlutterThreadSynchronizer alloc] init];
   [self setUpPlatformViewChannel];
+  [self setUpAccessibilityChannel];
   [self setUpNotificationCenterListeners];
+  id<NSApplicationDelegate> appDelegate = [[NSApplication sharedApplication] delegate];
+  if ([appDelegate conformsToProtocol:@protocol(FlutterAppLifecycleProvider)]) {
+    _terminationHandler = [[FlutterEngineTerminationHandler alloc] initWithEngine:self
+                                                                       terminator:nil];
+    id<FlutterAppLifecycleProvider> lifecycleProvider =
+        static_cast<id<FlutterAppLifecycleProvider>>(appDelegate);
+    [lifecycleProvider addApplicationLifecycleDelegate:self];
+  } else {
+    _terminationHandler = nil;
+  }
+
+  _vsyncWaiters = [NSMapTable strongToStrongObjectsMapTable];
 
   return self;
 }
 
 - (void)dealloc {
+  id<NSApplicationDelegate> appDelegate = [[NSApplication sharedApplication] delegate];
+  if ([appDelegate conformsToProtocol:@protocol(FlutterAppLifecycleProvider)]) {
+    id<FlutterAppLifecycleProvider> lifecycleProvider =
+        static_cast<id<FlutterAppLifecycleProvider>>(appDelegate);
+    [lifecycleProvider removeApplicationLifecycleDelegate:self];
+
+    // Unregister any plugins that registered as app delegates, since they are not guaranteed to
+    // live after the engine is destroyed, and their delegation registration is intended to be bound
+    // to the engine and its lifetime.
+    for (id<FlutterAppLifecycleDelegate> delegate in _pluginAppDelegates) {
+      if (delegate) {
+        [lifecycleProvider removeApplicationLifecycleDelegate:delegate];
+      }
+    }
+  }
+  // Clear any published values, just in case a plugin has created a retain cycle with the
+  // registrar.
+  for (NSString* pluginName in _pluginRegistrars) {
+    [_pluginRegistrars[pluginName] publish:[NSNull null]];
+  }
   @synchronized(_isResponseValid) {
     [_isResponseValid removeAllObjects];
     [_isResponseValid addObject:@NO];
@@ -286,7 +578,7 @@ static void OnPlatformMessage(const FlutterPlatformMessage* message, FlutterEngi
     return NO;
   }
 
-  if (!_allowHeadlessExecution && !_viewController) {
+  if (!_allowHeadlessExecution && [_viewControllers count] == 0) {
     NSLog(@"Attempted to run an engine with no view controller without headless mode enabled.");
     return NO;
   }
@@ -295,7 +587,14 @@ static void OnPlatformMessage(const FlutterPlatformMessage* message, FlutterEngi
 
   // The first argument of argv is required to be the executable name.
   std::vector<const char*> argv = {[self.executableName UTF8String]};
-  std::vector<std::string> switches = _project.switches;
+  std::vector<std::string> switches = self.switches;
+
+  // Enable Impeller only if specifically asked for from the project or cmdline arguments.
+  if (_project.enableImpeller ||
+      std::find(switches.begin(), switches.end(), "--enable-impeller=true") != switches.end()) {
+    switches.push_back("--enable-impeller=true");
+  }
+
   std::transform(switches.begin(), switches.end(), std::back_inserter(argv),
                  [](const std::string& arg) -> const char* { return arg.c_str(); });
 
@@ -311,10 +610,13 @@ static void OnPlatformMessage(const FlutterPlatformMessage* message, FlutterEngi
   flutterArguments.command_line_argc = static_cast<int>(argv.size());
   flutterArguments.command_line_argv = argv.empty() ? nullptr : argv.data();
   flutterArguments.platform_message_callback = (FlutterPlatformMessageCallback)OnPlatformMessage;
-  flutterArguments.update_semantics_callback = [](const FlutterSemanticsUpdate* update,
-                                                  void* user_data) {
+  flutterArguments.update_semantics_callback2 = [](const FlutterSemanticsUpdate2* update,
+                                                   void* user_data) {
+    // TODO(dkwingsmt): This callback only supports single-view, therefore it
+    // only operates on the implicit view. To support multi-view, we need a
+    // way to pass in the ID (probably through FlutterSemanticsUpdate).
     FlutterEngine* engine = (__bridge FlutterEngine*)user_data;
-    [engine updateSemantics:update];
+    [[engine viewControllerForId:kFlutterImplicitViewId] updateSemantics:update];
   };
   flutterArguments.custom_dart_entrypoint = entrypoint.UTF8String;
   flutterArguments.shutdown_dart_vm_when_done = true;
@@ -346,7 +648,7 @@ static void OnPlatformMessage(const FlutterPlatformMessage* message, FlutterEngi
   const FlutterCustomTaskRunners custom_task_runners = {
       .struct_size = sizeof(FlutterCustomTaskRunners),
       .platform_task_runner = &cocoa_task_runner_description,
-  };
+      .thread_priority_setter = SetThreadPriority};
   flutterArguments.custom_task_runners = &custom_task_runners;
 
   [self loadAOTData:_project.assetsPath];
@@ -361,6 +663,11 @@ static void OnPlatformMessage(const FlutterPlatformMessage* message, FlutterEngi
     [engine engineCallbackOnPreEngineRestart];
   };
 
+  flutterArguments.vsync_callback = [](void* user_data, intptr_t baton) {
+    FlutterEngine* engine = (__bridge FlutterEngine*)user_data;
+    [engine onVSync:baton];
+  };
+
   FlutterRendererConfig rendererConfig = [_renderer createRendererConfig];
   FlutterEngineResult result = _embedderAPI.Initialize(
       FLUTTER_ENGINE_VERSION, &rendererConfig, &flutterArguments, (__bridge void*)(self), &_engine);
@@ -376,7 +683,14 @@ static void OnPlatformMessage(const FlutterPlatformMessage* message, FlutterEngi
   }
 
   [self sendUserLocales];
-  [self updateWindowMetrics];
+
+  // Update window metric for all view controllers.
+  NSEnumerator* viewControllerEnumerator = [_viewControllers objectEnumerator];
+  FlutterViewController* nextViewController;
+  while ((nextViewController = [viewControllerEnumerator nextObject])) {
+    [self updateWindowMetricsForViewController:nextViewController];
+  }
+
   [self updateDisplayConfig];
   // Send the initial user settings such as brightness and text scale factor
   // to the engine.
@@ -410,44 +724,112 @@ static void OnPlatformMessage(const FlutterPlatformMessage* message, FlutterEngi
   }
 }
 
-- (void)setViewController:(FlutterViewController*)controller {
-  if (_viewController != controller) {
-    _viewController = controller;
+- (void)registerViewController:(FlutterViewController*)controller forId:(FlutterViewId)viewId {
+  NSAssert(controller != nil, @"The controller must not be nil.");
+  NSAssert(![controller attached],
+           @"The incoming view controller is already attached to an engine.");
+  NSAssert([_viewControllers objectForKey:@(viewId)] == nil, @"The requested view ID is occupied.");
+  [controller setUpWithEngine:self viewId:viewId threadSynchronizer:_threadSynchronizer];
+  NSAssert(controller.viewId == viewId, @"Failed to assign view ID.");
+  [_viewControllers setObject:controller forKey:@(viewId)];
+
+  if (controller.viewLoaded) {
+    [self viewControllerViewDidLoad:controller];
+  }
+}
 
-    if (_semanticsEnabled && _bridge) {
-      _bridge->UpdateDefaultViewController(_viewController);
-    }
+- (void)viewControllerViewDidLoad:(FlutterViewController*)viewController {
+  __weak FlutterEngine* weakSelf = self;
+  FlutterTimeConverter* timeConverter = [[FlutterTimeConverter alloc] initWithEngine:self];
+  FlutterVSyncWaiter* waiter = [[FlutterVSyncWaiter alloc]
+      initWithDisplayLink:[FlutterDisplayLink displayLinkWithView:viewController.view]
+                    block:^(CFTimeInterval timestamp, CFTimeInterval targetTimestamp,
+                            uintptr_t baton) {
+                      uint64_t timeNanos = [timeConverter CAMediaTimeToEngineTime:timestamp];
+                      uint64_t targetTimeNanos =
+                          [timeConverter CAMediaTimeToEngineTime:targetTimestamp];
+                      FlutterEngine* engine = weakSelf;
+                      if (engine) {
+                        // It is a bit unfortunate that embedder requires OnVSync call on
+                        // platform thread just to immediately redispatch it to UI thread.
+                        // We are already on UI thread right now, but have to do the
+                        // extra hop to main thread.
+                        [engine->_threadSynchronizer performOnPlatformThread:^{
+                          engine->_embedderAPI.OnVsync(_engine, baton, timeNanos, targetTimeNanos);
+                        }];
+                      }
+                    }];
+  FML_DCHECK([_vsyncWaiters objectForKey:@(viewController.viewId)] == nil);
+  @synchronized(_vsyncWaiters) {
+    [_vsyncWaiters setObject:waiter forKey:@(viewController.viewId)];
+  }
+}
 
-    if (!controller && !_allowHeadlessExecution) {
-      [self shutDownEngine];
-    }
+- (void)deregisterViewControllerForId:(FlutterViewId)viewId {
+  FlutterViewController* oldController = [self viewControllerForId:viewId];
+  if (oldController != nil) {
+    [oldController detachFromEngine];
+    [_viewControllers removeObjectForKey:@(viewId)];
+  }
+  @synchronized(_vsyncWaiters) {
+    [_vsyncWaiters removeObjectForKey:@(viewId)];
   }
 }
 
-- (FlutterCompositor*)createFlutterCompositor {
-  // TODO(richardjcai): Add support for creating a FlutterCompositor
-  // with a nil _viewController for headless engines.
-  // https://github.com/flutter/flutter/issues/71606
-  if (!_viewController) {
-    return nil;
+- (void)shutDownIfNeeded {
+  if ([_viewControllers count] == 0 && !_allowHeadlessExecution) {
+    [self shutDownEngine];
   }
+}
 
-  __weak FlutterEngine* weakSelf = self;
+- (FlutterViewController*)viewControllerForId:(FlutterViewId)viewId {
+  FlutterViewController* controller = [_viewControllers objectForKey:@(viewId)];
+  NSAssert(controller == nil || controller.viewId == viewId,
+           @"The stored controller has unexpected view ID.");
+  return controller;
+}
+
+- (void)setViewController:(FlutterViewController*)controller {
+  FlutterViewController* currentController =
+      [_viewControllers objectForKey:@(kFlutterImplicitViewId)];
+  if (currentController == controller) {
+    // From nil to nil, or from non-nil to the same controller.
+    return;
+  }
+  if (currentController == nil && controller != nil) {
+    // From nil to non-nil.
+    NSAssert(controller.engine == nil,
+             @"Failed to set view controller to the engine: "
+             @"The given FlutterViewController is already attached to an engine %@. "
+             @"If you wanted to create an FlutterViewController and set it to an existing engine, "
+             @"you should use FlutterViewController#init(engine:, nibName, bundle:) instead.",
+             controller.engine);
+    [self registerViewController:controller forId:kFlutterImplicitViewId];
+  } else if (currentController != nil && controller == nil) {
+    NSAssert(currentController.viewId == kFlutterImplicitViewId,
+             @"The default controller has an unexpected ID %llu", currentController.viewId);
+    // From non-nil to nil.
+    [self deregisterViewControllerForId:kFlutterImplicitViewId];
+    [self shutDownIfNeeded];
+  } else {
+    // From non-nil to a different non-nil view controller.
+    NSAssert(NO,
+             @"Failed to set view controller to the engine: "
+             @"The engine already has an implicit view controller %@. "
+             @"If you wanted to make the implicit view render in a different window, "
+             @"you should attach the current view controller to the window instead.",
+             [_viewControllers objectForKey:@(kFlutterImplicitViewId)]);
+  }
+}
 
+- (FlutterViewController*)viewController {
+  return [self viewControllerForId:kFlutterImplicitViewId];
+}
+
+- (FlutterCompositor*)createFlutterCompositor {
   _macOSCompositor = std::make_unique<flutter::FlutterCompositor>(
-      _viewProvider, _platformViewController, _renderer.device);
-  _macOSCompositor->SetPresentCallback([weakSelf](bool has_flutter_content) {
-    // TODO(dkwingsmt): The compositor only supports single-view for now. As
-    // more classes are gradually converted to multi-view, it should get the
-    // view ID from somewhere.
-    uint64_t viewId = kFlutterDefaultViewId;
-    if (has_flutter_content) {
-      return [weakSelf.renderer present:viewId] == YES;
-    } else {
-      [weakSelf.renderer presentWithoutContent:viewId];
-      return true;
-    }
-  });
+      [[FlutterViewEngineProvider alloc] initWithEngine:self],
+      [[FlutterTimeConverter alloc] initWithEngine:self], _platformViewController);
 
   _compositor = {};
   _compositor.struct_size = sizeof(FlutterCompositor);
@@ -463,19 +845,16 @@ static void OnPlatformMessage(const FlutterPlatformMessage* message, FlutterEngi
 
   _compositor.collect_backing_store_callback = [](const FlutterBackingStore* backing_store,  //
                                                   void* user_data                            //
-                                               ) {
-    return reinterpret_cast<flutter::FlutterCompositor*>(user_data)->CollectBackingStore(
-        backing_store);
-  };
+                                               ) { return true; };
 
   _compositor.present_layers_callback = [](const FlutterLayer** layers,  //
                                            size_t layers_count,          //
                                            void* user_data               //
                                         ) {
     // TODO(dkwingsmt): This callback only supports single-view, therefore it
-    // only operates on the default view. To support multi-view, we need a new
+    // only operates on the implicit view. To support multi-view, we need a new
     // callback that also receives a view ID.
-    return reinterpret_cast<flutter::FlutterCompositor*>(user_data)->Present(kFlutterDefaultViewId,
+    return reinterpret_cast<flutter::FlutterCompositor*>(user_data)->Present(kFlutterImplicitViewId,
                                                                              layers, layers_count);
   };
 
@@ -485,40 +864,71 @@ static void OnPlatformMessage(const FlutterPlatformMessage* message, FlutterEngi
 }
 
 - (id<FlutterBinaryMessenger>)binaryMessenger {
-  // TODO(stuartmorgan): Switch to FlutterBinaryMessengerRelay to avoid plugins
-  // keeping the engine alive.
-  return self;
+  return _binaryMessenger;
 }
 
 #pragma mark - Framework-internal methods
 
+- (void)addViewController:(FlutterViewController*)controller {
+  [self registerViewController:controller forId:kFlutterImplicitViewId];
+}
+
+- (void)removeViewController:(nonnull FlutterViewController*)viewController {
+  NSAssert([viewController attached] && viewController.engine == self,
+           @"The given view controller is not associated with this engine.");
+  [self deregisterViewControllerForId:viewController.viewId];
+  [self shutDownIfNeeded];
+}
+
 - (BOOL)running {
   return _engine != nullptr;
 }
 
+- (void)updateDisplayConfig:(NSNotification*)notification {
+  [self updateDisplayConfig];
+}
+
+- (NSArray<NSScreen*>*)screens {
+  return [NSScreen screens];
+}
+
 - (void)updateDisplayConfig {
   if (!_engine) {
     return;
   }
 
-  CVDisplayLinkRef displayLinkRef;
-  CGDirectDisplayID mainDisplayID = CGMainDisplayID();
-  CVDisplayLinkCreateWithCGDisplay(mainDisplayID, &displayLinkRef);
-  CVTime nominal = CVDisplayLinkGetNominalOutputVideoRefreshPeriod(displayLinkRef);
-  if (!(nominal.flags & kCVTimeIsIndefinite)) {
-    double refreshRate = static_cast<double>(nominal.timeScale) / nominal.timeValue;
+  std::vector<FlutterEngineDisplay> displays;
+  for (NSScreen* screen : [self screens]) {
+    CGDirectDisplayID displayID =
+        static_cast<CGDirectDisplayID>([screen.deviceDescription[@"NSScreenNumber"] integerValue]);
 
+    double devicePixelRatio = screen.backingScaleFactor;
     FlutterEngineDisplay display;
     display.struct_size = sizeof(display);
-    display.display_id = mainDisplayID;
-    display.refresh_rate = round(refreshRate);
+    display.display_id = displayID;
+    display.single_display = false;
+    display.width = static_cast<size_t>(screen.frame.size.width) * devicePixelRatio;
+    display.height = static_cast<size_t>(screen.frame.size.height) * devicePixelRatio;
+    display.device_pixel_ratio = devicePixelRatio;
+
+    CVDisplayLinkRef displayLinkRef = nil;
+    CVReturn error = CVDisplayLinkCreateWithCGDisplay(displayID, &displayLinkRef);
+
+    if (error == 0) {
+      CVTime nominal = CVDisplayLinkGetNominalOutputVideoRefreshPeriod(displayLinkRef);
+      if (!(nominal.flags & kCVTimeIsIndefinite)) {
+        double refreshRate = static_cast<double>(nominal.timeScale) / nominal.timeValue;
+        display.refresh_rate = round(refreshRate);
+      }
+      CVDisplayLinkRelease(displayLinkRef);
+    } else {
+      display.refresh_rate = 0;
+    }
 
-    std::vector<FlutterEngineDisplay> displays = {display};
-    _embedderAPI.NotifyDisplayUpdate(_engine, kFlutterEngineDisplaysUpdateTypeStartup,
-                                     displays.data(), displays.size());
+    displays.push_back(display);
   }
-
-  CVDisplayLinkRelease(displayLinkRef);
+  _embedderAPI.NotifyDisplayUpdate(_engine, kFlutterEngineDisplaysUpdateTypeStartup,
+                                   displays.data(), displays.size());
 }
 
 - (void)onSettingsChanged:(NSNotification*)notification {
@@ -547,23 +957,21 @@ static void OnPlatformMessage(const FlutterPlatformMessage* message, FlutterEngi
   return _embedderAPI;
 }
 
-- (std::weak_ptr<flutter::AccessibilityBridgeMac>)accessibilityBridge {
-  return _bridge;
-}
-
 - (nonnull NSString*)executableName {
   return [[[NSProcessInfo processInfo] arguments] firstObject] ?: @"Flutter";
 }
 
-- (void)updateWindowMetrics {
-  if (!_engine || !_viewController.viewLoaded) {
+- (void)updateWindowMetricsForViewController:(FlutterViewController*)viewController {
+  if (!_engine || !viewController || !viewController.viewLoaded) {
     return;
   }
-  NSView* view = _viewController.flutterView;
+  NSAssert([self viewControllerForId:viewController.viewId] == viewController,
+           @"The provided view controller is not attached to this engine.");
+  NSView* view = viewController.flutterView;
   CGRect scaledBounds = [view convertRectToBacking:view.bounds];
   CGSize scaledSize = scaledBounds.size;
   double pixelRatio = view.bounds.size.width == 0 ? 1 : scaledSize.width / view.bounds.size.width;
-
+  auto displayId = [view.window.screen.deviceDescription[@"NSScreenNumber"] integerValue];
   const FlutterWindowMetricsEvent windowMetricsEvent = {
       .struct_size = sizeof(windowMetricsEvent),
       .width = static_cast<size_t>(scaledSize.width),
@@ -571,6 +979,8 @@ static void OnPlatformMessage(const FlutterPlatformMessage* message, FlutterEngi
       .pixel_ratio = pixelRatio,
       .left = static_cast<size_t>(scaledBounds.origin.x),
       .top = static_cast<size_t>(scaledBounds.origin.y),
+      .display_id = static_cast<uint64_t>(displayId),
+      .view_id = viewController.viewId,
   };
   _embedderAPI.SendWindowMetricsEvent(_engine, &windowMetricsEvent);
 }
@@ -590,22 +1000,15 @@ static void OnPlatformMessage(const FlutterPlatformMessage* message, FlutterEngi
     return;
   }
   _semanticsEnabled = enabled;
-  // Remove the accessibility children from flutter view before reseting the bridge.
-  if (!_semanticsEnabled && self.viewController.viewLoaded) {
-    self.viewController.flutterView.accessibilityChildren = nil;
-  }
-  if (!_semanticsEnabled && _bridge) {
-    _bridge.reset();
-  } else if (_semanticsEnabled && !_bridge) {
-    _bridge = [self createAccessibilityBridge:self viewController:self.viewController];
+
+  // Update all view controllers' bridges.
+  NSEnumerator* viewControllerEnumerator = [_viewControllers objectEnumerator];
+  FlutterViewController* nextViewController;
+  while ((nextViewController = [viewControllerEnumerator nextObject])) {
+    [nextViewController notifySemanticsEnabledChanged];
   }
-  _embedderAPI.UpdateSemanticsEnabled(_engine, _semanticsEnabled);
-}
 
-- (std::shared_ptr<flutter::AccessibilityBridgeMac>)
-    createAccessibilityBridge:(nonnull FlutterEngine*)engine
-               viewController:(nonnull FlutterViewController*)viewController {
-  return std::make_shared<flutter::AccessibilityBridgeMac>(engine, _viewController);
+  _embedderAPI.UpdateSemanticsEnabled(_engine, _semanticsEnabled);
 }
 
 - (void)dispatchSemanticsAction:(FlutterSemanticsAction)action
@@ -683,8 +1086,19 @@ static void OnPlatformMessage(const FlutterPlatformMessage* message, FlutterEngi
 }
 
 - (void)engineCallbackOnPreEngineRestart {
-  if (_viewController) {
-    [_viewController onPreEngineRestart];
+  NSEnumerator* viewControllerEnumerator = [_viewControllers objectEnumerator];
+  FlutterViewController* nextViewController;
+  while ((nextViewController = [viewControllerEnumerator nextObject])) {
+    [nextViewController onPreEngineRestart];
+  }
+}
+
+- (void)onVSync:(uintptr_t)baton {
+  @synchronized(_vsyncWaiters) {
+    // TODO(knopp): Use vsync waiter for correct view.
+    // https://github.com/flutter/flutter/issues/142845
+    FlutterVSyncWaiter* waiter = [_vsyncWaiters objectForKey:@(kFlutterImplicitViewId)];
+    [waiter waitForVSync:baton];
   }
 }
 
@@ -696,9 +1110,8 @@ static void OnPlatformMessage(const FlutterPlatformMessage* message, FlutterEngi
     return;
   }
 
-  if (_viewController && _viewController.flutterView) {
-    [_viewController.flutterView shutdown];
-  }
+  [_threadSynchronizer shutdown];
+  _threadSynchronizer = nil;
 
   FlutterEngineResult result = _embedderAPI.Deinitialize(_engine);
   if (result != kSuccess) {
@@ -727,6 +1140,16 @@ static void OnPlatformMessage(const FlutterPlatformMessage* message, FlutterEngi
   }];
 }
 
+- (void)setUpAccessibilityChannel {
+  _accessibilityChannel = [FlutterBasicMessageChannel
+      messageChannelWithName:@"flutter/accessibility"
+             binaryMessenger:self.binaryMessenger
+                       codec:[FlutterStandardMessageCodec sharedInstance]];
+  __weak FlutterEngine* weakSelf = self;
+  [_accessibilityChannel setMessageHandler:^(id message, FlutterReply reply) {
+    [weakSelf handleAccessibilityEvent:message];
+  }];
+}
 - (void)setUpNotificationCenterListeners {
   NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
   // macOS fires this private message when VoiceOver turns on or off.
@@ -738,6 +1161,14 @@ static void OnPlatformMessage(const FlutterPlatformMessage* message, FlutterEngi
              selector:@selector(applicationWillTerminate:)
                  name:NSApplicationWillTerminateNotification
                object:nil];
+  [center addObserver:self
+             selector:@selector(windowDidChangeScreen:)
+                 name:NSWindowDidChangeScreenNotification
+               object:nil];
+  [center addObserver:self
+             selector:@selector(updateDisplayConfig:)
+                 name:NSApplicationDidChangeScreenParametersNotification
+               object:nil];
 }
 
 - (void)addInternalPlugins {
@@ -745,11 +1176,11 @@ static void OnPlatformMessage(const FlutterPlatformMessage* message, FlutterEngi
   [FlutterMouseCursorPlugin registerWithRegistrar:[self registrarForPlugin:@"mousecursor"]];
   [FlutterMenuPlugin registerWithRegistrar:[self registrarForPlugin:@"menu"]];
   _settingsChannel =
-      [FlutterBasicMessageChannel messageChannelWithName:@"flutter/settings"
+      [FlutterBasicMessageChannel messageChannelWithName:kFlutterSettingsChannel
                                          binaryMessenger:self.binaryMessenger
                                                    codec:[FlutterJSONMessageCodec sharedInstance]];
   _platformChannel =
-      [FlutterMethodChannel methodChannelWithName:@"flutter/platform"
+      [FlutterMethodChannel methodChannelWithName:kFlutterPlatformChannel
                                   binaryMessenger:self.binaryMessenger
                                             codec:[FlutterJSONMethodCodec sharedInstance]];
   [_platformChannel setMethodCallHandler:^(FlutterMethodCall* call, FlutterResult result) {
@@ -761,15 +1192,53 @@ static void OnPlatformMessage(const FlutterPlatformMessage* message, FlutterEngi
   [self shutDownEngine];
 }
 
+- (void)windowDidChangeScreen:(NSNotification*)notification {
+  // Update window metric for all view controllers since the display_id has
+  // changed.
+  NSEnumerator* viewControllerEnumerator = [_viewControllers objectEnumerator];
+  FlutterViewController* nextViewController;
+  while ((nextViewController = [viewControllerEnumerator nextObject])) {
+    [self updateWindowMetricsForViewController:nextViewController];
+  }
+}
+
 - (void)onAccessibilityStatusChanged:(NSNotification*)notification {
   BOOL enabled = [notification.userInfo[kEnhancedUserInterfaceKey] boolValue];
-  [self.viewController onAccessibilityStatusChanged:enabled];
+  NSEnumerator* viewControllerEnumerator = [_viewControllers objectEnumerator];
+  FlutterViewController* nextViewController;
+  while ((nextViewController = [viewControllerEnumerator nextObject])) {
+    [nextViewController onAccessibilityStatusChanged:enabled];
+  }
+
   self.semanticsEnabled = enabled;
 }
+- (void)handleAccessibilityEvent:(NSDictionary<NSString*, id>*)annotatedEvent {
+  NSString* type = annotatedEvent[@"type"];
+  if ([type isEqualToString:@"announce"]) {
+    NSString* message = annotatedEvent[@"data"][@"message"];
+    NSNumber* assertiveness = annotatedEvent[@"data"][@"assertiveness"];
+    if (message == nil) {
+      return;
+    }
+
+    NSAccessibilityPriorityLevel priority = [assertiveness isEqualToNumber:@1]
+                                                ? NSAccessibilityPriorityHigh
+                                                : NSAccessibilityPriorityMedium;
+
+    [self announceAccessibilityMessage:message withPriority:priority];
+  }
+}
 
+- (void)announceAccessibilityMessage:(NSString*)message
+                        withPriority:(NSAccessibilityPriorityLevel)priority {
+  NSAccessibilityPostNotificationWithUserInfo(
+      [self viewControllerForId:kFlutterImplicitViewId].flutterView,
+      NSAccessibilityAnnouncementRequestedNotification,
+      @{NSAccessibilityAnnouncementKey : message, NSAccessibilityPriorityKey : @(priority)});
+}
 - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
   if ([call.method isEqualToString:@"SystemNavigator.pop"]) {
-    [NSApp terminate:self];
+    [[NSApplication sharedApplication] terminate:self];
     result(nil);
   } else if ([call.method isEqualToString:@"SystemSound.play"]) {
     [self playSystemSound:call.arguments];
@@ -781,6 +1250,22 @@ static void OnPlatformMessage(const FlutterPlatformMessage* message, FlutterEngi
     result(nil);
   } else if ([call.method isEqualToString:@"Clipboard.hasStrings"]) {
     result(@{@"value" : @([self clipboardHasStrings])});
+  } else if ([call.method isEqualToString:@"System.exitApplication"]) {
+    if ([self terminationHandler] == nil) {
+      // If the termination handler isn't set, then either we haven't
+      // initialized it yet, or (more likely) the NSApp delegate isn't a
+      // FlutterAppDelegate, so it can't cancel requests to exit. So, in that
+      // case, just terminate when requested.
+      [NSApp terminate:self];
+      result(nil);
+    } else {
+      [[self terminationHandler] handleRequestAppExitMethodCall:call.arguments result:result];
+    }
+  } else if ([call.method isEqualToString:@"System.initializationComplete"]) {
+    if ([self terminationHandler] != nil) {
+      [self terminationHandler].acceptingRequests = YES;
+    }
+    result(nil);
   } else {
     result(FlutterMethodNotImplemented);
   }
@@ -793,20 +1278,18 @@ static void OnPlatformMessage(const FlutterPlatformMessage* message, FlutterEngi
 }
 
 - (NSDictionary*)getClipboardData:(NSString*)format {
-  NSPasteboard* pasteboard = self.pasteboard;
   if ([format isEqualToString:@(kTextPlainFormat)]) {
-    NSString* stringInPasteboard = [pasteboard stringForType:NSPasteboardTypeString];
+    NSString* stringInPasteboard = [self.pasteboard stringForType:NSPasteboardTypeString];
     return stringInPasteboard == nil ? nil : @{@"text" : stringInPasteboard};
   }
   return nil;
 }
 
 - (void)setClipboardData:(NSDictionary*)data {
-  NSPasteboard* pasteboard = self.pasteboard;
   NSString* text = data[@"text"];
-  [pasteboard clearContents];
+  [self.pasteboard clearContents];
   if (text && ![text isEqual:[NSNull null]]) {
-    [pasteboard setString:text forType:NSPasteboardTypeString];
+    [self.pasteboard setString:text forType:NSPasteboardTypeString];
   }
 }
 
@@ -814,8 +1297,66 @@ static void OnPlatformMessage(const FlutterPlatformMessage* message, FlutterEngi
   return [self.pasteboard stringForType:NSPasteboardTypeString].length > 0;
 }
 
-- (NSPasteboard*)pasteboard {
-  return [NSPasteboard generalPasteboard];
+- (std::vector<std::string>)switches {
+  return flutter::GetSwitchesFromEnvironment();
+}
+
+- (FlutterThreadSynchronizer*)testThreadSynchronizer {
+  return _threadSynchronizer;
+}
+
+#pragma mark - FlutterAppLifecycleDelegate
+
+- (void)setApplicationState:(flutter::AppLifecycleState)state {
+  NSString* nextState =
+      [[NSString alloc] initWithCString:flutter::AppLifecycleStateToString(state)];
+  [self sendOnChannel:kFlutterLifecycleChannel
+              message:[nextState dataUsingEncoding:NSUTF8StringEncoding]];
+}
+
+/**
+ * Called when the |FlutterAppDelegate| gets the applicationWillBecomeActive
+ * notification.
+ */
+- (void)handleWillBecomeActive:(NSNotification*)notification {
+  _active = YES;
+  if (!_visible) {
+    [self setApplicationState:flutter::AppLifecycleState::kHidden];
+  } else {
+    [self setApplicationState:flutter::AppLifecycleState::kResumed];
+  }
+}
+
+/**
+ * Called when the |FlutterAppDelegate| gets the applicationWillResignActive
+ * notification.
+ */
+- (void)handleWillResignActive:(NSNotification*)notification {
+  _active = NO;
+  if (!_visible) {
+    [self setApplicationState:flutter::AppLifecycleState::kHidden];
+  } else {
+    [self setApplicationState:flutter::AppLifecycleState::kInactive];
+  }
+}
+
+/**
+ * Called when the |FlutterAppDelegate| gets the applicationDidUnhide
+ * notification.
+ */
+- (void)handleDidChangeOcclusionState:(NSNotification*)notification {
+  NSApplicationOcclusionState occlusionState = [[NSApplication sharedApplication] occlusionState];
+  if (occlusionState & NSApplicationOcclusionStateVisible) {
+    _visible = YES;
+    if (_active) {
+      [self setApplicationState:flutter::AppLifecycleState::kResumed];
+    } else {
+      [self setApplicationState:flutter::AppLifecycleState::kInactive];
+    }
+  } else {
+    _visible = NO;
+    [self setApplicationState:flutter::AppLifecycleState::kHidden];
+  }
 }
 
 #pragma mark - FlutterBinaryMessenger
@@ -905,7 +1446,18 @@ static void OnPlatformMessage(const FlutterPlatformMessage* message, FlutterEngi
 #pragma mark - FlutterPluginRegistry
 
 - (id<FlutterPluginRegistrar>)registrarForPlugin:(NSString*)pluginName {
-  return [[FlutterEngineRegistrar alloc] initWithPlugin:pluginName flutterEngine:self];
+  id<FlutterPluginRegistrar> registrar = self.pluginRegistrars[pluginName];
+  if (!registrar) {
+    FlutterEngineRegistrar* registrarImpl =
+        [[FlutterEngineRegistrar alloc] initWithPlugin:pluginName flutterEngine:self];
+    self.pluginRegistrars[pluginName] = registrarImpl;
+    registrar = registrarImpl;
+  }
+  return registrar;
+}
+
+- (nullable NSObject*)valuePublishedByPlugin:(NSString*)pluginName {
+  return self.pluginRegistrars[pluginName].publishedValue;
 }
 
 #pragma mark - FlutterTextureRegistrar
@@ -934,36 +1486,6 @@ static void OnPlatformMessage(const FlutterPlatformMessage* message, FlutterEngi
   return _embedderAPI.UnregisterExternalTexture(_engine, textureID) == kSuccess;
 }
 
-- (void)updateSemantics:(const FlutterSemanticsUpdate*)update {
-  NSAssert(_bridge, @"The accessibility bridge must be initialized.");
-  for (size_t i = 0; i < update->nodes_count; i++) {
-    const FlutterSemanticsNode* node = &update->nodes[i];
-    _bridge->AddFlutterSemanticsNodeUpdate(node);
-  }
-
-  for (size_t i = 0; i < update->custom_actions_count; i++) {
-    const FlutterSemanticsCustomAction* action = &update->custom_actions[i];
-    _bridge->AddFlutterSemanticsCustomActionUpdate(action);
-  }
-
-  _bridge->CommitUpdates();
-
-  // Accessibility tree can only be used when the view is loaded.
-  if (!self.viewController.viewLoaded) {
-    return;
-  }
-  // Attaches the accessibility root to the flutter view.
-  auto root = _bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
-  if (root) {
-    if ([self.viewController.flutterView.accessibilityChildren count] == 0) {
-      NSAccessibilityElement* native_root = root->GetNativeViewAccessible();
-      self.viewController.flutterView.accessibilityChildren = @[ native_root ];
-    }
-  } else {
-    self.viewController.flutterView.accessibilityChildren = nil;
-  }
-}
-
 #pragma mark - Task runner integration
 
 - (void)runTaskOnEmbedder:(FlutterTask)task {
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterEngineTest.mm b/shell/platform/darwin/macos/framework/Source/FlutterEngineTest.mm
index 143b05b7ced8ebdbc33ff09a39c676cd398ade41..7b081318148d88865e3457ebaa8dda95d7e0ba97 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterEngineTest.mm
+++ b/shell/platform/darwin/macos/framework/Source/FlutterEngineTest.mm
@@ -5,22 +5,35 @@
 #import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterEngine.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h"
 
+#include <objc/objc.h>
+
+#include <algorithm>
 #include <functional>
+#include <thread>
+#include <vector>
 
 #include "flutter/fml/synchronization/waitable_event.h"
 #include "flutter/lib/ui/window/platform_message.h"
 #include "flutter/shell/platform/common/accessibility_bridge.h"
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h"
+#import "flutter/shell/platform/darwin/common/framework/Source/FlutterBinaryMessengerRelay.h"
 #import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterAppDelegate.h"
+#import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterAppLifecycleDelegate.h"
+#import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterPluginMacOS.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterEngineTestUtils.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterViewControllerTestUtils.h"
 #include "flutter/shell/platform/embedder/embedder.h"
 #include "flutter/shell/platform/embedder/embedder_engine.h"
 #include "flutter/shell/platform/embedder/test_utils/proc_table_replacement.h"
+#include "flutter/testing/stream_capture.h"
 #include "flutter/testing/test_dart_native_resolver.h"
+#include "gtest/gtest.h"
 
 // CREATE_NATIVE_ENTRY and MOCK_ENGINE_PROC are leaky by design
 // NOLINTBEGIN(clang-analyzer-core.StackAddressEscape)
 
+constexpr int64_t kImplicitViewId = 0ll;
+
 @interface FlutterEngine (Test)
 /**
  * The FlutterCompositor object currently in use by the FlutterEngine.
@@ -28,14 +41,106 @@
  * May be nil if the compositor has not been initialized yet.
  */
 @property(nonatomic, readonly, nullable) flutter::FlutterCompositor* macOSCompositor;
+
+@end
+
+@interface TestPlatformViewFactory : NSObject <FlutterPlatformViewFactory>
+@end
+
+@implementation TestPlatformViewFactory
+- (nonnull NSView*)createWithViewIdentifier:(int64_t)viewId arguments:(nullable id)args {
+  return viewId == 42 ? [[NSView alloc] init] : nil;
+}
+
+@end
+
+@interface PlainAppDelegate : NSObject <NSApplicationDelegate>
+@end
+
+@implementation PlainAppDelegate
+- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication* _Nonnull)sender {
+  // Always cancel, so that the test doesn't exit.
+  return NSTerminateCancel;
+}
+@end
+
+#pragma mark -
+
+@interface FakeLifecycleProvider : NSObject <FlutterAppLifecycleProvider, NSApplicationDelegate>
+
+@property(nonatomic, strong, readonly) NSPointerArray* registeredDelegates;
+
+// True if the given delegate is currently registered.
+- (BOOL)hasDelegate:(nonnull NSObject<FlutterAppLifecycleDelegate>*)delegate;
+@end
+
+@implementation FakeLifecycleProvider {
+  /**
+   * All currently registered delegates.
+   *
+   * This does not use NSPointerArray or any other weak-pointer
+   * system, because a weak pointer will be nil'd out at the start of dealloc, which will break
+   * queries. E.g., if a delegate is dealloc'd without being unregistered, a weak pointer array
+   * would no longer contain that pointer even though removeApplicationLifecycleDelegate: was never
+   * called, causing tests to pass incorrectly.
+   */
+  std::vector<void*> _delegates;
+}
+
+- (void)addApplicationLifecycleDelegate:(nonnull NSObject<FlutterAppLifecycleDelegate>*)delegate {
+  _delegates.push_back((__bridge void*)delegate);
+}
+
+- (void)removeApplicationLifecycleDelegate:
+    (nonnull NSObject<FlutterAppLifecycleDelegate>*)delegate {
+  auto delegateIndex = std::find(_delegates.begin(), _delegates.end(), (__bridge void*)delegate);
+  NSAssert(delegateIndex != _delegates.end(),
+           @"Attempting to unregister a delegate that was not registered.");
+  _delegates.erase(delegateIndex);
+}
+
+- (BOOL)hasDelegate:(nonnull NSObject<FlutterAppLifecycleDelegate>*)delegate {
+  return std::find(_delegates.begin(), _delegates.end(), (__bridge void*)delegate) !=
+         _delegates.end();
+}
+
+@end
+
+#pragma mark -
+
+@interface FakeAppDelegatePlugin : NSObject <FlutterPlugin>
 @end
 
+@implementation FakeAppDelegatePlugin
++ (void)registerWithRegistrar:(id<FlutterPluginRegistrar>)registrar {
+}
+@end
+
+#pragma mark -
+
+@interface MockableFlutterEngine : FlutterEngine
+@end
+
+@implementation MockableFlutterEngine
+- (NSArray<NSScreen*>*)screens {
+  id mockScreen = OCMClassMock([NSScreen class]);
+  OCMStub([mockScreen backingScaleFactor]).andReturn(2.0);
+  OCMStub([mockScreen deviceDescription]).andReturn(@{
+    @"NSScreenNumber" : [NSNumber numberWithInt:10]
+  });
+  OCMStub([mockScreen frame]).andReturn(NSMakeRect(10, 20, 30, 40));
+  return [NSArray arrayWithObject:mockScreen];
+}
+@end
+
+#pragma mark -
+
 namespace flutter::testing {
 
 TEST_F(FlutterEngineTest, CanLaunch) {
   FlutterEngine* engine = GetFlutterEngine();
   EXPECT_TRUE([engine runWithEntrypoint:@"main"]);
-  EXPECT_TRUE(engine.running);
+  ASSERT_TRUE(engine.running);
 }
 
 TEST_F(FlutterEngineTest, HasNonNullExecutableName) {
@@ -58,6 +163,24 @@ TEST_F(FlutterEngineTest, HasNonNullExecutableName) {
   latch.Wait();
 }
 
+#ifndef FLUTTER_RELEASE
+TEST_F(FlutterEngineTest, Switches) {
+  setenv("FLUTTER_ENGINE_SWITCHES", "2", 1);
+  setenv("FLUTTER_ENGINE_SWITCH_1", "abc", 1);
+  setenv("FLUTTER_ENGINE_SWITCH_2", "foo=\"bar, baz\"", 1);
+
+  FlutterEngine* engine = GetFlutterEngine();
+  std::vector<std::string> switches = engine.switches;
+  ASSERT_EQ(switches.size(), 2UL);
+  EXPECT_EQ(switches[0], "--abc");
+  EXPECT_EQ(switches[1], "--foo=\"bar, baz\"");
+
+  unsetenv("FLUTTER_ENGINE_SWITCHES");
+  unsetenv("FLUTTER_ENGINE_SWITCH_1");
+  unsetenv("FLUTTER_ENGINE_SWITCH_2");
+}
+#endif  // !FLUTTER_RELEASE
+
 TEST_F(FlutterEngineTest, MessengerSend) {
   FlutterEngine* engine = GetFlutterEngine();
   EXPECT_TRUE([engine runWithEntrypoint:@"main"]);
@@ -84,23 +207,19 @@ TEST_F(FlutterEngineTest, CanLogToStdout) {
                     CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) { latch.Signal(); }));
 
   // Replace stdout stream buffer with our own.
-  std::stringstream buffer;
-  std::streambuf* old_buffer = std::cout.rdbuf();
-  std::cout.rdbuf(buffer.rdbuf());
+  StreamCapture stdout_capture(&std::cout);
 
   // Launch the test entrypoint.
   FlutterEngine* engine = GetFlutterEngine();
   EXPECT_TRUE([engine runWithEntrypoint:@"canLogToStdout"]);
-  EXPECT_TRUE(engine.running);
+  ASSERT_TRUE(engine.running);
 
   latch.Wait();
 
-  // Restore old stdout stream buffer.
-  std::cout.rdbuf(old_buffer);
+  stdout_capture.Stop();
 
   // Verify hello world was written to stdout.
-  std::string logs = buffer.str();
-  EXPECT_TRUE(logs.find("Hello logging") != std::string::npos);
+  EXPECT_TRUE(stdout_capture.GetOutput().find("Hello logging") != std::string::npos);
 }
 
 TEST_F(FlutterEngineTest, BackgroundIsBlack) {
@@ -121,21 +240,18 @@ TEST_F(FlutterEngineTest, BackgroundIsBlack) {
 
   // Launch the test entrypoint.
   EXPECT_TRUE([engine runWithEntrypoint:@"backgroundTest"]);
-  EXPECT_TRUE(engine.running);
+  ASSERT_TRUE(engine.running);
 
-  NSString* fixtures = @(flutter::testing::GetFixturesPath());
-  FlutterDartProject* project = [[FlutterDartProject alloc]
-      initWithAssetsPath:fixtures
-             ICUDataPath:[fixtures stringByAppendingString:@"/icudtl.dat"]];
-  FlutterViewController* viewController = [[FlutterViewController alloc] initWithProject:project];
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
+                                                                                nibName:nil
+                                                                                 bundle:nil];
   [viewController loadView];
   viewController.flutterView.frame = CGRectMake(0, 0, 800, 600);
-  [engine setViewController:viewController];
 
   latch.Wait();
 }
 
-TEST_F(FlutterEngineTest, CanOverrideBackgroundColor) {
+TEST_F(FlutterEngineTest, DISABLED_CanOverrideBackgroundColor) {
   FlutterEngine* engine = GetFlutterEngine();
 
   // Latch to ensure the entire layer tree has been generated and presented.
@@ -153,16 +269,13 @@ TEST_F(FlutterEngineTest, CanOverrideBackgroundColor) {
 
   // Launch the test entrypoint.
   EXPECT_TRUE([engine runWithEntrypoint:@"backgroundTest"]);
-  EXPECT_TRUE(engine.running);
+  ASSERT_TRUE(engine.running);
 
-  NSString* fixtures = @(flutter::testing::GetFixturesPath());
-  FlutterDartProject* project = [[FlutterDartProject alloc]
-      initWithAssetsPath:fixtures
-             ICUDataPath:[fixtures stringByAppendingString:@"/icudtl.dat"]];
-  FlutterViewController* viewController = [[FlutterViewController alloc] initWithProject:project];
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
+                                                                                nibName:nil
+                                                                                 bundle:nil];
   [viewController loadView];
   viewController.flutterView.frame = CGRectMake(0, 0, 800, 600);
-  [engine setViewController:viewController];
   viewController.flutterView.backgroundColor = [NSColor whiteColor];
 
   latch.Wait();
@@ -172,23 +285,20 @@ TEST_F(FlutterEngineTest, CanToggleAccessibility) {
   FlutterEngine* engine = GetFlutterEngine();
   // Capture the update callbacks before the embedder API initializes.
   auto original_init = engine.embedderAPI.Initialize;
-  std::function<void(const FlutterSemanticsUpdate*, void*)> update_semantics_callback;
+  std::function<void(const FlutterSemanticsUpdate2*, void*)> update_semantics_callback;
   engine.embedderAPI.Initialize = MOCK_ENGINE_PROC(
       Initialize, ([&update_semantics_callback, &original_init](
                        size_t version, const FlutterRendererConfig* config,
                        const FlutterProjectArgs* args, void* user_data, auto engine_out) {
-        update_semantics_callback = args->update_semantics_callback;
+        update_semantics_callback = args->update_semantics_callback2;
         return original_init(version, config, args, user_data, engine_out);
       }));
   EXPECT_TRUE([engine runWithEntrypoint:@"main"]);
   // Set up view controller.
-  NSString* fixtures = @(testing::GetFixturesPath());
-  FlutterDartProject* project = [[FlutterDartProject alloc]
-      initWithAssetsPath:fixtures
-             ICUDataPath:[fixtures stringByAppendingString:@"/icudtl.dat"]];
-  FlutterViewController* viewController = [[FlutterViewController alloc] initWithProject:project];
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
+                                                                                nibName:nil
+                                                                                 bundle:nil];
   [viewController loadView];
-  [engine setViewController:viewController];
   // Enable the semantics.
   bool enabled_called = false;
   engine.embedderAPI.UpdateSemanticsEnabled =
@@ -199,7 +309,7 @@ TEST_F(FlutterEngineTest, CanToggleAccessibility) {
   engine.semanticsEnabled = YES;
   EXPECT_TRUE(enabled_called);
   // Send flutter semantics updates.
-  FlutterSemanticsNode root;
+  FlutterSemanticsNode2 root;
   root.id = 0;
   root.flags = static_cast<FlutterSemanticsFlag>(0);
   root.actions = static_cast<FlutterSemanticsAction>(0);
@@ -216,7 +326,7 @@ TEST_F(FlutterEngineTest, CanToggleAccessibility) {
   root.children_in_traversal_order = children;
   root.custom_accessibility_actions_count = 0;
 
-  FlutterSemanticsNode child1;
+  FlutterSemanticsNode2 child1;
   child1.id = 1;
   child1.flags = static_cast<FlutterSemanticsFlag>(0);
   child1.actions = static_cast<FlutterSemanticsAction>(0);
@@ -231,11 +341,11 @@ TEST_F(FlutterEngineTest, CanToggleAccessibility) {
   child1.child_count = 0;
   child1.custom_accessibility_actions_count = 0;
 
-  FlutterSemanticsUpdate update;
-  update.nodes_count = 2;
-  FlutterSemanticsNode nodes[] = {root, child1};
+  FlutterSemanticsUpdate2 update;
+  update.node_count = 2;
+  FlutterSemanticsNode2* nodes[] = {&root, &child1};
   update.nodes = nodes;
-  update.custom_actions_count = 0;
+  update.custom_action_count = 0;
   update_semantics_callback(&update, (__bridge void*)engine);
 
   // Verify the accessibility tree is attached to the flutter view.
@@ -269,12 +379,12 @@ TEST_F(FlutterEngineTest, CanToggleAccessibilityWhenHeadless) {
   FlutterEngine* engine = GetFlutterEngine();
   // Capture the update callbacks before the embedder API initializes.
   auto original_init = engine.embedderAPI.Initialize;
-  std::function<void(const FlutterSemanticsUpdate*, void*)> update_semantics_callback;
+  std::function<void(const FlutterSemanticsUpdate2*, void*)> update_semantics_callback;
   engine.embedderAPI.Initialize = MOCK_ENGINE_PROC(
       Initialize, ([&update_semantics_callback, &original_init](
                        size_t version, const FlutterRendererConfig* config,
                        const FlutterProjectArgs* args, void* user_data, auto engine_out) {
-        update_semantics_callback = args->update_semantics_callback;
+        update_semantics_callback = args->update_semantics_callback2;
         return original_init(version, config, args, user_data, engine_out);
       }));
   EXPECT_TRUE([engine runWithEntrypoint:@"main"]);
@@ -289,7 +399,7 @@ TEST_F(FlutterEngineTest, CanToggleAccessibilityWhenHeadless) {
   engine.semanticsEnabled = YES;
   EXPECT_TRUE(enabled_called);
   // Send flutter semantics updates.
-  FlutterSemanticsNode root;
+  FlutterSemanticsNode2 root;
   root.id = 0;
   root.flags = static_cast<FlutterSemanticsFlag>(0);
   root.actions = static_cast<FlutterSemanticsAction>(0);
@@ -306,7 +416,7 @@ TEST_F(FlutterEngineTest, CanToggleAccessibilityWhenHeadless) {
   root.children_in_traversal_order = children;
   root.custom_accessibility_actions_count = 0;
 
-  FlutterSemanticsNode child1;
+  FlutterSemanticsNode2 child1;
   child1.id = 1;
   child1.flags = static_cast<FlutterSemanticsFlag>(0);
   child1.actions = static_cast<FlutterSemanticsAction>(0);
@@ -321,11 +431,13 @@ TEST_F(FlutterEngineTest, CanToggleAccessibilityWhenHeadless) {
   child1.child_count = 0;
   child1.custom_accessibility_actions_count = 0;
 
-  FlutterSemanticsUpdate update;
-  update.nodes_count = 2;
-  FlutterSemanticsNode nodes[] = {root, child1};
+  FlutterSemanticsUpdate2 update;
+  update.node_count = 2;
+  FlutterSemanticsNode2* nodes[] = {&root, &child1};
   update.nodes = nodes;
-  update.custom_actions_count = 0;
+  update.custom_action_count = 0;
+  // This call updates semantics for the implicit view, which does not exist,
+  // and therefore this call is invalid. But the engine should not crash.
   update_semantics_callback(&update, (__bridge void*)engine);
 
   // No crashes.
@@ -344,28 +456,11 @@ TEST_F(FlutterEngineTest, CanToggleAccessibilityWhenHeadless) {
   EXPECT_EQ(engine.viewController, nil);
 }
 
-TEST_F(FlutterEngineTest, ResetsAccessibilityBridgeWhenSetsNewViewController) {
+TEST_F(FlutterEngineTest, ProducesAccessibilityTreeWhenAddingViews) {
   FlutterEngine* engine = GetFlutterEngine();
-  // Capture the update callbacks before the embedder API initializes.
-  auto original_init = engine.embedderAPI.Initialize;
-  std::function<void(const FlutterSemanticsUpdate*, void*)> update_semantics_callback;
-  engine.embedderAPI.Initialize = MOCK_ENGINE_PROC(
-      Initialize, ([&update_semantics_callback, &original_init](
-                       size_t version, const FlutterRendererConfig* config,
-                       const FlutterProjectArgs* args, void* user_data, auto engine_out) {
-        update_semantics_callback = args->update_semantics_callback;
-        return original_init(version, config, args, user_data, engine_out);
-      }));
   EXPECT_TRUE([engine runWithEntrypoint:@"main"]);
-  // Set up view controller.
-  NSString* fixtures = @(testing::GetFixturesPath());
-  FlutterDartProject* project = [[FlutterDartProject alloc]
-      initWithAssetsPath:fixtures
-             ICUDataPath:[fixtures stringByAppendingString:@"/icudtl.dat"]];
-  FlutterViewController* viewController = [[FlutterViewController alloc] initWithProject:project];
-  [viewController loadView];
-  [engine setViewController:viewController];
-  // Enable the semantics.
+
+  // Enable the semantics without attaching a view controller.
   bool enabled_called = false;
   engine.embedderAPI.UpdateSemanticsEnabled =
       MOCK_ENGINE_PROC(UpdateSemanticsEnabled, ([&enabled_called](auto engine, bool enabled) {
@@ -374,61 +469,16 @@ TEST_F(FlutterEngineTest, ResetsAccessibilityBridgeWhenSetsNewViewController) {
                        }));
   engine.semanticsEnabled = YES;
   EXPECT_TRUE(enabled_called);
-  // Send flutter semantics updates.
-  FlutterSemanticsNode root;
-  root.id = 0;
-  root.flags = static_cast<FlutterSemanticsFlag>(0);
-  root.actions = static_cast<FlutterSemanticsAction>(0);
-  root.text_selection_base = -1;
-  root.text_selection_extent = -1;
-  root.label = "root";
-  root.hint = "";
-  root.value = "";
-  root.increased_value = "";
-  root.decreased_value = "";
-  root.tooltip = "";
-  root.child_count = 1;
-  int32_t children[] = {1};
-  root.children_in_traversal_order = children;
-  root.custom_accessibility_actions_count = 0;
-
-  FlutterSemanticsNode child1;
-  child1.id = 1;
-  child1.flags = static_cast<FlutterSemanticsFlag>(0);
-  child1.actions = static_cast<FlutterSemanticsAction>(0);
-  child1.text_selection_base = -1;
-  child1.text_selection_extent = -1;
-  child1.label = "child 1";
-  child1.hint = "";
-  child1.value = "";
-  child1.increased_value = "";
-  child1.decreased_value = "";
-  child1.tooltip = "";
-  child1.child_count = 0;
-  child1.custom_accessibility_actions_count = 0;
-
-  FlutterSemanticsUpdate update;
-  update.nodes_count = 2;
-  FlutterSemanticsNode nodes[] = {root, child1};
-  update.nodes = nodes;
-  update.custom_actions_count = 0;
-  update_semantics_callback(&update, (__bridge void*)engine);
-
-  auto native_root = engine.accessibilityBridge.lock()->GetFlutterPlatformNodeDelegateFromID(0);
-  EXPECT_FALSE(native_root.expired());
 
-  // Set up a new view controller.
-  FlutterViewController* newViewController =
-      [[FlutterViewController alloc] initWithProject:project];
-  [newViewController loadView];
-  [engine setViewController:newViewController];
+  EXPECT_EQ(engine.viewController, nil);
 
-  auto new_native_root = engine.accessibilityBridge.lock()->GetFlutterPlatformNodeDelegateFromID(0);
-  // The tree is recreated and the old tree will be destroyed.
-  EXPECT_FALSE(new_native_root.expired());
-  EXPECT_TRUE(native_root.expired());
+  // Assign the view controller after enabling semantics
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
+                                                                                nibName:nil
+                                                                                 bundle:nil];
+  engine.viewController = viewController;
 
-  [engine setViewController:nil];
+  EXPECT_NE(viewController.accessibilityBridge.lock(), nullptr);
 }
 
 TEST_F(FlutterEngineTest, NativeCallbacks) {
@@ -441,49 +491,53 @@ TEST_F(FlutterEngineTest, NativeCallbacks) {
 
   FlutterEngine* engine = GetFlutterEngine();
   EXPECT_TRUE([engine runWithEntrypoint:@"nativeCallback"]);
-  EXPECT_TRUE(engine.running);
+  ASSERT_TRUE(engine.running);
 
   latch.Wait();
   ASSERT_TRUE(latch_called);
 }
 
-// TODO(iskakaushik): Enable after https://github.com/flutter/flutter/issues/96668 is fixed.
-TEST(FlutterEngine, DISABLED_Compositor) {
+TEST_F(FlutterEngineTest, Compositor) {
   NSString* fixtures = @(flutter::testing::GetFixturesPath());
   FlutterDartProject* project = [[FlutterDartProject alloc]
       initWithAssetsPath:fixtures
              ICUDataPath:[fixtures stringByAppendingString:@"/icudtl.dat"]];
   FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"test" project:project];
 
-  FlutterViewController* viewController = [[FlutterViewController alloc] initWithProject:project];
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
+                                                                                nibName:nil
+                                                                                 bundle:nil];
   [viewController loadView];
+  [viewController viewDidLoad];
   viewController.flutterView.frame = CGRectMake(0, 0, 800, 600);
-  [engine setViewController:viewController];
 
   EXPECT_TRUE([engine runWithEntrypoint:@"canCompositePlatformViews"]);
 
-  // Latch to ensure the entire layer tree has been generated and presented.
-  fml::AutoResetWaitableEvent latch;
-  auto compositor = engine.macOSCompositor;
-  compositor->SetPresentCallback([&](bool has_flutter_content) {
-    latch.Signal();
-    return true;
-  });
-  latch.Wait();
+  [engine.platformViewController registerViewFactory:[[TestPlatformViewFactory alloc] init]
+                                              withId:@"factory_id"];
+  [engine.platformViewController
+      handleMethodCall:[FlutterMethodCall methodCallWithMethodName:@"create"
+                                                         arguments:@{
+                                                           @"id" : @(42),
+                                                           @"viewType" : @"factory_id",
+                                                         }]
+                result:^(id result){
+                }];
+
+  [engine.testThreadSynchronizer blockUntilFrameAvailable];
 
   CALayer* rootLayer = viewController.flutterView.layer;
 
-  // There are three layers total - the root layer and two sublayers.
-  // This test will need to be updated when PlatformViews are supported, as
-  // there are two PlatformView layers in this test.
+  // There are two layers with Flutter contents and one view
   EXPECT_EQ(rootLayer.sublayers.count, 2u);
+  EXPECT_EQ(viewController.flutterView.subviews.count, 1u);
 
   // TODO(gw280): add support for screenshot tests in this test harness
 
   [engine shutDownEngine];
-}
+}  // namespace flutter::testing
 
-TEST(FlutterEngine, DartEntrypointArguments) {
+TEST_F(FlutterEngineTest, DartEntrypointArguments) {
   NSString* fixtures = @(flutter::testing::GetFixturesPath());
   FlutterDartProject* project = [[FlutterDartProject alloc]
       initWithAssetsPath:fixtures
@@ -515,6 +569,108 @@ TEST(FlutterEngine, DartEntrypointArguments) {
   EXPECT_TRUE(called);
 }
 
+// Verify that the engine is not retained indirectly via the binary messenger held by channels and
+// plugins. Previously, FlutterEngine.binaryMessenger returned the engine itself, and thus plugins
+// could cause a retain cycle, preventing the engine from being deallocated.
+// FlutterEngine.binaryMessenger now returns a FlutterBinaryMessengerRelay whose weak pointer back
+// to the engine is cleared when the engine is deallocated.
+// Issue: https://github.com/flutter/flutter/issues/116445
+TEST_F(FlutterEngineTest, FlutterBinaryMessengerDoesNotRetainEngine) {
+  __weak FlutterEngine* weakEngine;
+  id<FlutterBinaryMessenger> binaryMessenger = nil;
+  @autoreleasepool {
+    // Create a test engine.
+    NSString* fixtures = @(flutter::testing::GetFixturesPath());
+    FlutterDartProject* project = [[FlutterDartProject alloc]
+        initWithAssetsPath:fixtures
+               ICUDataPath:[fixtures stringByAppendingString:@"/icudtl.dat"]];
+    FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"test"
+                                                        project:project
+                                         allowHeadlessExecution:YES];
+    weakEngine = engine;
+    binaryMessenger = engine.binaryMessenger;
+  }
+
+  // Once the engine has been deallocated, verify the weak engine pointer is nil, and thus not
+  // retained by the relay.
+  EXPECT_NE(binaryMessenger, nil);
+  EXPECT_EQ(weakEngine, nil);
+}
+
+// Verify that the engine is not retained indirectly via the texture registry held by plugins.
+// Issue: https://github.com/flutter/flutter/issues/116445
+TEST_F(FlutterEngineTest, FlutterTextureRegistryDoesNotReturnEngine) {
+  __weak FlutterEngine* weakEngine;
+  id<FlutterTextureRegistry> textureRegistry;
+  @autoreleasepool {
+    // Create a test engine.
+    NSString* fixtures = @(flutter::testing::GetFixturesPath());
+    FlutterDartProject* project = [[FlutterDartProject alloc]
+        initWithAssetsPath:fixtures
+               ICUDataPath:[fixtures stringByAppendingString:@"/icudtl.dat"]];
+    FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"test"
+                                                        project:project
+                                         allowHeadlessExecution:YES];
+    id<FlutterPluginRegistrar> registrar = [engine registrarForPlugin:@"MyPlugin"];
+    textureRegistry = registrar.textures;
+  }
+
+  // Once the engine has been deallocated, verify the weak engine pointer is nil, and thus not
+  // retained via the texture registry.
+  EXPECT_NE(textureRegistry, nil);
+  EXPECT_EQ(weakEngine, nil);
+}
+
+TEST_F(FlutterEngineTest, PublishedValueNilForUnknownPlugin) {
+  NSString* fixtures = @(flutter::testing::GetFixturesPath());
+  FlutterDartProject* project = [[FlutterDartProject alloc]
+      initWithAssetsPath:fixtures
+             ICUDataPath:[fixtures stringByAppendingString:@"/icudtl.dat"]];
+  FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"test"
+                                                      project:project
+                                       allowHeadlessExecution:YES];
+
+  EXPECT_EQ([engine valuePublishedByPlugin:@"NoSuchPlugin"], nil);
+}
+
+TEST_F(FlutterEngineTest, PublishedValueNSNullIfNoPublishedValue) {
+  NSString* fixtures = @(flutter::testing::GetFixturesPath());
+  FlutterDartProject* project = [[FlutterDartProject alloc]
+      initWithAssetsPath:fixtures
+             ICUDataPath:[fixtures stringByAppendingString:@"/icudtl.dat"]];
+  FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"test"
+                                                      project:project
+                                       allowHeadlessExecution:YES];
+  NSString* pluginName = @"MyPlugin";
+  // Request the registarar to register the plugin as existing.
+  [engine registrarForPlugin:pluginName];
+
+  // The documented behavior is that a plugin that exists but hasn't published
+  // anything returns NSNull, rather than nil, as on iOS.
+  EXPECT_EQ([engine valuePublishedByPlugin:pluginName], [NSNull null]);
+}
+
+TEST_F(FlutterEngineTest, PublishedValueReturnsLastPublished) {
+  NSString* fixtures = @(flutter::testing::GetFixturesPath());
+  FlutterDartProject* project = [[FlutterDartProject alloc]
+      initWithAssetsPath:fixtures
+             ICUDataPath:[fixtures stringByAppendingString:@"/icudtl.dat"]];
+  FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"test"
+                                                      project:project
+                                       allowHeadlessExecution:YES];
+  NSString* pluginName = @"MyPlugin";
+  id<FlutterPluginRegistrar> registrar = [engine registrarForPlugin:pluginName];
+
+  NSString* firstValue = @"A published value";
+  NSArray* secondValue = @[ @"A different published value" ];
+
+  [registrar publish:firstValue];
+  EXPECT_EQ([engine valuePublishedByPlugin:pluginName], firstValue);
+
+  [registrar publish:secondValue];
+  EXPECT_EQ([engine valuePublishedByPlugin:pluginName], secondValue);
+}
+
 // If a channel overrides a previous channel with the same name, cleaning
 // the previous channel should not affect the new channel.
 //
@@ -578,7 +734,7 @@ TEST_F(FlutterEngineTest, MessengerCleanupConnectionWorks) {
   EXPECT_EQ(record, 21);
 }
 
-TEST(FlutterEngine, HasStringsWhenPasteboardEmpty) {
+TEST_F(FlutterEngineTest, HasStringsWhenPasteboardEmpty) {
   id engineMock = CreateMockFlutterEngine(nil);
 
   // Call hasStrings and expect it to be false.
@@ -596,7 +752,7 @@ TEST(FlutterEngine, HasStringsWhenPasteboardEmpty) {
   EXPECT_FALSE(valueAfterClear);
 }
 
-TEST(FlutterEngine, HasStringsWhenPasteboardFull) {
+TEST_F(FlutterEngineTest, HasStringsWhenPasteboardFull) {
   id engineMock = CreateMockFlutterEngine(@"some string");
 
   // Call hasStrings and expect it to be true.
@@ -656,6 +812,386 @@ TEST_F(FlutterEngineTest, ResponseFromBackgroundThread) {
   }
 }
 
+TEST_F(FlutterEngineTest, ThreadSynchronizerNotBlockingRasterThreadAfterShutdown) {
+  FlutterThreadSynchronizer* threadSynchronizer = [[FlutterThreadSynchronizer alloc] init];
+  [threadSynchronizer shutdown];
+
+  std::thread rasterThread([&threadSynchronizer] {
+    [threadSynchronizer performCommitForView:kImplicitViewId
+                                        size:CGSizeMake(100, 100)
+                                      notify:^{
+                                      }];
+  });
+
+  rasterThread.join();
+}
+
+TEST_F(FlutterEngineTest, ManageControllersIfInitiatedByController) {
+  NSString* fixtures = @(flutter::testing::GetFixturesPath());
+  FlutterDartProject* project = [[FlutterDartProject alloc]
+      initWithAssetsPath:fixtures
+             ICUDataPath:[fixtures stringByAppendingString:@"/icudtl.dat"]];
+
+  FlutterEngine* engine;
+  FlutterViewController* viewController1;
+
+  @autoreleasepool {
+    // Create FVC1.
+    viewController1 = [[FlutterViewController alloc] initWithProject:project];
+    EXPECT_EQ(viewController1.viewId, 0ll);
+
+    engine = viewController1.engine;
+    engine.viewController = nil;
+
+    // Create FVC2 based on the same engine.
+    FlutterViewController* viewController2 = [[FlutterViewController alloc] initWithEngine:engine
+                                                                                   nibName:nil
+                                                                                    bundle:nil];
+    EXPECT_EQ(engine.viewController, viewController2);
+  }
+  // FVC2 is deallocated but FVC1 is retained.
+
+  EXPECT_EQ(engine.viewController, nil);
+
+  engine.viewController = viewController1;
+  EXPECT_EQ(engine.viewController, viewController1);
+  EXPECT_EQ(viewController1.viewId, 0ll);
+}
+
+TEST_F(FlutterEngineTest, ManageControllersIfInitiatedByEngine) {
+  // Don't create the engine with `CreateMockFlutterEngine`, because it adds
+  // additional references to FlutterViewControllers, which is crucial to this
+  // test case.
+  FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"io.flutter"
+                                                      project:nil
+                                       allowHeadlessExecution:NO];
+  FlutterViewController* viewController1;
+
+  @autoreleasepool {
+    viewController1 = [[FlutterViewController alloc] initWithEngine:engine nibName:nil bundle:nil];
+    EXPECT_EQ(viewController1.viewId, 0ll);
+    EXPECT_EQ(engine.viewController, viewController1);
+
+    engine.viewController = nil;
+
+    FlutterViewController* viewController2 = [[FlutterViewController alloc] initWithEngine:engine
+                                                                                   nibName:nil
+                                                                                    bundle:nil];
+    EXPECT_EQ(viewController2.viewId, 0ll);
+    EXPECT_EQ(engine.viewController, viewController2);
+  }
+  // FVC2 is deallocated but FVC1 is retained.
+
+  EXPECT_EQ(engine.viewController, nil);
+
+  engine.viewController = viewController1;
+  EXPECT_EQ(engine.viewController, viewController1);
+  EXPECT_EQ(viewController1.viewId, 0ll);
+}
+
+TEST_F(FlutterEngineTest, HandlesTerminationRequest) {
+  id engineMock = CreateMockFlutterEngine(nil);
+  __block NSString* nextResponse = @"exit";
+  __block BOOL triedToTerminate = NO;
+  FlutterEngineTerminationHandler* terminationHandler =
+      [[FlutterEngineTerminationHandler alloc] initWithEngine:engineMock
+                                                   terminator:^(id sender) {
+                                                     triedToTerminate = TRUE;
+                                                     // Don't actually terminate, of course.
+                                                   }];
+  OCMStub([engineMock terminationHandler]).andReturn(terminationHandler);
+  id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
+  OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
+      [engineMock binaryMessenger])
+      .andReturn(binaryMessengerMock);
+  OCMStub([engineMock sendOnChannel:@"flutter/platform"
+                            message:[OCMArg any]
+                        binaryReply:[OCMArg any]])
+      .andDo((^(NSInvocation* invocation) {
+        [invocation retainArguments];
+        FlutterBinaryReply callback;
+        NSData* returnedMessage;
+        [invocation getArgument:&callback atIndex:4];
+        if ([nextResponse isEqualToString:@"error"]) {
+          FlutterError* errorResponse = [FlutterError errorWithCode:@"Error"
+                                                            message:@"Failed"
+                                                            details:@"Details"];
+          returnedMessage =
+              [[FlutterJSONMethodCodec sharedInstance] encodeErrorEnvelope:errorResponse];
+        } else {
+          NSDictionary* responseDict = @{@"response" : nextResponse};
+          returnedMessage =
+              [[FlutterJSONMethodCodec sharedInstance] encodeSuccessEnvelope:responseDict];
+        }
+        callback(returnedMessage);
+      }));
+  __block NSString* calledAfterTerminate = @"";
+  FlutterResult appExitResult = ^(id result) {
+    NSDictionary* resultDict = result;
+    calledAfterTerminate = resultDict[@"response"];
+  };
+  FlutterMethodCall* methodExitApplication =
+      [FlutterMethodCall methodCallWithMethodName:@"System.exitApplication"
+                                        arguments:@{@"type" : @"cancelable"}];
+
+  // Always terminate when the binding isn't ready (which is the default).
+  triedToTerminate = NO;
+  calledAfterTerminate = @"";
+  nextResponse = @"cancel";
+  [engineMock handleMethodCall:methodExitApplication result:appExitResult];
+  EXPECT_STREQ([calledAfterTerminate UTF8String], "");
+  EXPECT_TRUE(triedToTerminate);
+
+  // Once the binding is ready, handle the request.
+  terminationHandler.acceptingRequests = YES;
+  triedToTerminate = NO;
+  calledAfterTerminate = @"";
+  nextResponse = @"exit";
+  [engineMock handleMethodCall:methodExitApplication result:appExitResult];
+  EXPECT_STREQ([calledAfterTerminate UTF8String], "exit");
+  EXPECT_TRUE(triedToTerminate);
+
+  triedToTerminate = NO;
+  calledAfterTerminate = @"";
+  nextResponse = @"cancel";
+  [engineMock handleMethodCall:methodExitApplication result:appExitResult];
+  EXPECT_STREQ([calledAfterTerminate UTF8String], "cancel");
+  EXPECT_FALSE(triedToTerminate);
+
+  // Check that it doesn't crash on error.
+  triedToTerminate = NO;
+  calledAfterTerminate = @"";
+  nextResponse = @"error";
+  [engineMock handleMethodCall:methodExitApplication result:appExitResult];
+  EXPECT_STREQ([calledAfterTerminate UTF8String], "");
+  EXPECT_TRUE(triedToTerminate);
+}
+
+TEST_F(FlutterEngineTest, IgnoresTerminationRequestIfNotFlutterAppDelegate) {
+  id<NSApplicationDelegate> previousDelegate = [[NSApplication sharedApplication] delegate];
+  id<NSApplicationDelegate> plainDelegate = [[PlainAppDelegate alloc] init];
+  [NSApplication sharedApplication].delegate = plainDelegate;
+
+  // Creating the engine shouldn't fail here, even though the delegate isn't a
+  // FlutterAppDelegate.
+  CreateMockFlutterEngine(nil);
+
+  // Asking to terminate the app should cancel.
+  EXPECT_EQ([[[NSApplication sharedApplication] delegate] applicationShouldTerminate:NSApp],
+            NSTerminateCancel);
+
+  [NSApplication sharedApplication].delegate = previousDelegate;
+}
+
+TEST_F(FlutterEngineTest, HandleAccessibilityEvent) {
+  __block BOOL announced = NO;
+  id engineMock = CreateMockFlutterEngine(nil);
+
+  OCMStub([engineMock announceAccessibilityMessage:[OCMArg any]
+                                      withPriority:NSAccessibilityPriorityMedium])
+      .andDo((^(NSInvocation* invocation) {
+        announced = TRUE;
+        [invocation retainArguments];
+        NSString* message;
+        [invocation getArgument:&message atIndex:2];
+        EXPECT_EQ(message, @"error message");
+      }));
+
+  NSDictionary<NSString*, id>* annotatedEvent =
+      @{@"type" : @"announce",
+        @"data" : @{@"message" : @"error message"}};
+
+  [engineMock handleAccessibilityEvent:annotatedEvent];
+
+  EXPECT_TRUE(announced);
+}
+
+TEST_F(FlutterEngineTest, HandleLifecycleStates) API_AVAILABLE(macos(10.9)) {
+  __block flutter::AppLifecycleState sentState;
+  id engineMock = CreateMockFlutterEngine(nil);
+
+  // Have to enumerate all the values because OCMStub can't capture
+  // non-Objective-C object arguments.
+  OCMStub([engineMock setApplicationState:flutter::AppLifecycleState::kDetached])
+      .andDo((^(NSInvocation* invocation) {
+        sentState = flutter::AppLifecycleState::kDetached;
+      }));
+  OCMStub([engineMock setApplicationState:flutter::AppLifecycleState::kResumed])
+      .andDo((^(NSInvocation* invocation) {
+        sentState = flutter::AppLifecycleState::kResumed;
+      }));
+  OCMStub([engineMock setApplicationState:flutter::AppLifecycleState::kInactive])
+      .andDo((^(NSInvocation* invocation) {
+        sentState = flutter::AppLifecycleState::kInactive;
+      }));
+  OCMStub([engineMock setApplicationState:flutter::AppLifecycleState::kHidden])
+      .andDo((^(NSInvocation* invocation) {
+        sentState = flutter::AppLifecycleState::kHidden;
+      }));
+  OCMStub([engineMock setApplicationState:flutter::AppLifecycleState::kPaused])
+      .andDo((^(NSInvocation* invocation) {
+        sentState = flutter::AppLifecycleState::kPaused;
+      }));
+
+  __block NSApplicationOcclusionState visibility = NSApplicationOcclusionStateVisible;
+  id mockApplication = OCMPartialMock([NSApplication sharedApplication]);
+  OCMStub((NSApplicationOcclusionState)[mockApplication occlusionState])
+      .andDo(^(NSInvocation* invocation) {
+        [invocation setReturnValue:&visibility];
+      });
+
+  NSNotification* willBecomeActive =
+      [[NSNotification alloc] initWithName:NSApplicationWillBecomeActiveNotification
+                                    object:nil
+                                  userInfo:nil];
+  NSNotification* willResignActive =
+      [[NSNotification alloc] initWithName:NSApplicationWillResignActiveNotification
+                                    object:nil
+                                  userInfo:nil];
+
+  NSNotification* didChangeOcclusionState;
+  didChangeOcclusionState =
+      [[NSNotification alloc] initWithName:NSApplicationDidChangeOcclusionStateNotification
+                                    object:nil
+                                  userInfo:nil];
+
+  [engineMock handleDidChangeOcclusionState:didChangeOcclusionState];
+  EXPECT_EQ(sentState, flutter::AppLifecycleState::kInactive);
+
+  [engineMock handleWillBecomeActive:willBecomeActive];
+  EXPECT_EQ(sentState, flutter::AppLifecycleState::kResumed);
+
+  [engineMock handleWillResignActive:willResignActive];
+  EXPECT_EQ(sentState, flutter::AppLifecycleState::kInactive);
+
+  visibility = 0;
+  [engineMock handleDidChangeOcclusionState:didChangeOcclusionState];
+  EXPECT_EQ(sentState, flutter::AppLifecycleState::kHidden);
+
+  [engineMock handleWillBecomeActive:willBecomeActive];
+  EXPECT_EQ(sentState, flutter::AppLifecycleState::kHidden);
+
+  [engineMock handleWillResignActive:willResignActive];
+  EXPECT_EQ(sentState, flutter::AppLifecycleState::kHidden);
+
+  [mockApplication stopMocking];
+}
+
+TEST_F(FlutterEngineTest, ForwardsPluginDelegateRegistration) {
+  id<NSApplicationDelegate> previousDelegate = [[NSApplication sharedApplication] delegate];
+  FakeLifecycleProvider* fakeAppDelegate = [[FakeLifecycleProvider alloc] init];
+  [NSApplication sharedApplication].delegate = fakeAppDelegate;
+
+  FakeAppDelegatePlugin* plugin = [[FakeAppDelegatePlugin alloc] init];
+  FlutterEngine* engine = CreateMockFlutterEngine(nil);
+
+  [[engine registrarForPlugin:@"TestPlugin"] addApplicationDelegate:plugin];
+
+  EXPECT_TRUE([fakeAppDelegate hasDelegate:plugin]);
+
+  [NSApplication sharedApplication].delegate = previousDelegate;
+}
+
+TEST_F(FlutterEngineTest, UnregistersPluginsOnEngineDestruction) {
+  id<NSApplicationDelegate> previousDelegate = [[NSApplication sharedApplication] delegate];
+  FakeLifecycleProvider* fakeAppDelegate = [[FakeLifecycleProvider alloc] init];
+  [NSApplication sharedApplication].delegate = fakeAppDelegate;
+
+  FakeAppDelegatePlugin* plugin = [[FakeAppDelegatePlugin alloc] init];
+
+  @autoreleasepool {
+    FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"test" project:nil];
+
+    [[engine registrarForPlugin:@"TestPlugin"] addApplicationDelegate:plugin];
+    EXPECT_TRUE([fakeAppDelegate hasDelegate:plugin]);
+  }
+
+  // When the engine is released, it should unregister any plugins it had
+  // registered on its behalf.
+  EXPECT_FALSE([fakeAppDelegate hasDelegate:plugin]);
+
+  [NSApplication sharedApplication].delegate = previousDelegate;
+}
+
+TEST_F(FlutterEngineTest, RunWithEntrypointUpdatesDisplayConfig) {
+  BOOL updated = NO;
+  FlutterEngine* engine = GetFlutterEngine();
+  auto original_update_displays = engine.embedderAPI.NotifyDisplayUpdate;
+  engine.embedderAPI.NotifyDisplayUpdate = MOCK_ENGINE_PROC(
+      NotifyDisplayUpdate, ([&updated, &original_update_displays](
+                                auto engine, auto update_type, auto* displays, auto display_count) {
+        updated = YES;
+        return original_update_displays(engine, update_type, displays, display_count);
+      }));
+
+  EXPECT_TRUE([engine runWithEntrypoint:@"main"]);
+  EXPECT_TRUE(updated);
+
+  updated = NO;
+  [[NSNotificationCenter defaultCenter]
+      postNotificationName:NSApplicationDidChangeScreenParametersNotification
+                    object:nil];
+  EXPECT_TRUE(updated);
+}
+
+TEST_F(FlutterEngineTest, NotificationsUpdateDisplays) {
+  BOOL updated = NO;
+  FlutterEngine* engine = GetFlutterEngine();
+  auto original_set_viewport_metrics = engine.embedderAPI.SendWindowMetricsEvent;
+  engine.embedderAPI.SendWindowMetricsEvent = MOCK_ENGINE_PROC(
+      SendWindowMetricsEvent,
+      ([&updated, &original_set_viewport_metrics](auto engine, auto* window_metrics) {
+        updated = YES;
+        return original_set_viewport_metrics(engine, window_metrics);
+      }));
+
+  EXPECT_TRUE([engine runWithEntrypoint:@"main"]);
+
+  updated = NO;
+  [[NSNotificationCenter defaultCenter] postNotificationName:NSWindowDidChangeScreenNotification
+                                                      object:nil];
+  // No VC.
+  EXPECT_FALSE(updated);
+
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
+                                                                                nibName:nil
+                                                                                 bundle:nil];
+  [viewController loadView];
+  viewController.flutterView.frame = CGRectMake(0, 0, 800, 600);
+
+  [[NSNotificationCenter defaultCenter] postNotificationName:NSWindowDidChangeScreenNotification
+                                                      object:nil];
+  EXPECT_TRUE(updated);
+}
+
+TEST_F(FlutterEngineTest, DisplaySizeIsInPhysicalPixel) {
+  NSString* fixtures = @(testing::GetFixturesPath());
+  FlutterDartProject* project = [[FlutterDartProject alloc]
+      initWithAssetsPath:fixtures
+             ICUDataPath:[fixtures stringByAppendingString:@"/icudtl.dat"]];
+  project.rootIsolateCreateCallback = FlutterEngineTest::IsolateCreateCallback;
+  MockableFlutterEngine* engine = [[MockableFlutterEngine alloc] initWithName:@"foobar"
+                                                                      project:project
+                                                       allowHeadlessExecution:true];
+  BOOL updated = NO;
+  auto original_update_displays = engine.embedderAPI.NotifyDisplayUpdate;
+  engine.embedderAPI.NotifyDisplayUpdate = MOCK_ENGINE_PROC(
+      NotifyDisplayUpdate, ([&updated, &original_update_displays](
+                                auto engine, auto update_type, auto* displays, auto display_count) {
+        EXPECT_EQ(display_count, 1UL);
+        EXPECT_EQ(displays->display_id, 10UL);
+        EXPECT_EQ(displays->width, 60UL);
+        EXPECT_EQ(displays->height, 80UL);
+        EXPECT_EQ(displays->device_pixel_ratio, 2UL);
+        updated = YES;
+        return original_update_displays(engine, update_type, displays, display_count);
+      }));
+  EXPECT_TRUE([engine runWithEntrypoint:@"main"]);
+  EXPECT_TRUE(updated);
+  [engine shutDownEngine];
+  engine = nil;
+}
+
 }  // namespace flutter::testing
 
 // NOLINTEND(clang-analyzer-core.StackAddressEscape)
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterEngineTestUtils.h b/shell/platform/darwin/macos/framework/Source/FlutterEngineTestUtils.h
index b52524cd9dec5c7aefcf8b15c1ccdcb191a59cf4..d9d78f88d10720f41674858dfbe817ff8eae0856 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterEngineTestUtils.h
+++ b/shell/platform/darwin/macos/framework/Source/FlutterEngineTestUtils.h
@@ -2,15 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERENGINETESTUTILS_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERENGINETESTUTILS_H_
+
 #import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterEngine.h"
 
 #import <OCMock/OCMock.h>
+
+#include "flutter/testing/autoreleasepool_test.h"
 #include "flutter/testing/test_dart_native_resolver.h"
 #include "gtest/gtest.h"
 
 namespace flutter::testing {
 
-class FlutterEngineTest : public ::testing::Test {
+class FlutterEngineTest : public AutoreleasePoolTest {
  public:
   FlutterEngineTest();
 
@@ -36,6 +41,32 @@ class FlutterEngineTest : public ::testing::Test {
 
 // Returns a mock FlutterEngine that is able to work in environments
 // without a real pasteboard.
+//
+// Callers MUST call [mockEngine shutDownEngine] when finished with the returned engine.
 id CreateMockFlutterEngine(NSString* pasteboardString);
 
+class MockFlutterEngineTest : public AutoreleasePoolTest {
+ public:
+  MockFlutterEngineTest();
+
+  void SetUp() override;
+  void TearDown() override;
+
+  id GetMockEngine() { return engine_mock_; }
+
+  void ShutDownEngine();
+
+  ~MockFlutterEngineTest() {
+    [engine_mock_ shutDownEngine];
+    [engine_mock_ stopMocking];
+  }
+
+ private:
+  id engine_mock_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(MockFlutterEngineTest);
+};
+
 }  // namespace flutter::testing
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERENGINETESTUTILS_H_
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterEngineTestUtils.mm b/shell/platform/darwin/macos/framework/Source/FlutterEngineTestUtils.mm
index 8a535aa5e22e1ed11f9f25ec8290313dbf5d42f9..b2ff26cab0d607c080ee9e411045febb9bb2e391 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterEngineTestUtils.mm
+++ b/shell/platform/darwin/macos/framework/Source/FlutterEngineTestUtils.mm
@@ -4,11 +4,40 @@
 // found in the LICENSE file.
 
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterEngineTestUtils.h"
+
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterDartProject_Internal.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h"
 
 #include "flutter/testing/testing.h"
 
+/**
+ * Fake pasteboard implementation to allow tests to work in environments without a real
+ * pasteboard.
+ */
+@interface FakePasteboard : FlutterPasteboard
+@end
+
+@implementation FakePasteboard {
+  NSString* _result;
+}
+
+- (NSInteger)clearContents {
+  size_t changeCount = (_result != nil) ? 1 : 0;
+  _result = nil;
+  return changeCount;
+}
+
+- (NSString*)stringForType:(NSPasteboardType)dataType {
+  return _result;
+}
+
+- (BOOL)setString:(NSString*)string forType:(NSPasteboardType)dataType {
+  _result = string;
+  return YES;
+}
+
+@end
+
 namespace flutter::testing {
 
 FlutterEngineTest::FlutterEngineTest() = default;
@@ -45,26 +74,36 @@ void FlutterEngineTest::AddNativeCallback(const char* name, Dart_NativeFunction
 }
 
 id CreateMockFlutterEngine(NSString* pasteboardString) {
-  {
-    NSString* fixtures = @(testing::GetFixturesPath());
-    FlutterDartProject* project = [[FlutterDartProject alloc]
-        initWithAssetsPath:fixtures
-               ICUDataPath:[fixtures stringByAppendingString:@"/icudtl.dat"]];
-    FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"test"
-                                                        project:project
-                                         allowHeadlessExecution:true];
-
-    // Mock pasteboard so that this test will work in environments without a
-    // real pasteboard.
-    id pasteboardMock = OCMClassMock([NSPasteboard class]);
-    OCMExpect([pasteboardMock stringForType:[OCMArg any]]).andDo(^(NSInvocation* invocation) {
-      NSString* returnValue = pasteboardString.length > 0 ? pasteboardString : nil;
-      [invocation setReturnValue:&returnValue];
-    });
-    id engineMock = OCMPartialMock(engine);
-    OCMStub([engineMock pasteboard]).andReturn(pasteboardMock);
-    return engineMock;
-  }
+  NSString* fixtures = @(testing::GetFixturesPath());
+  FlutterDartProject* project = [[FlutterDartProject alloc]
+      initWithAssetsPath:fixtures
+             ICUDataPath:[fixtures stringByAppendingString:@"/icudtl.dat"]];
+  FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"test"
+                                                      project:project
+                                       allowHeadlessExecution:true];
+
+  FakePasteboard* pasteboardMock = [[FakePasteboard alloc] init];
+  [pasteboardMock setString:pasteboardString forType:NSPasteboardTypeString];
+  engine.pasteboard = pasteboardMock;
+  id engineMock = OCMPartialMock(engine);
+  return engineMock;
+}
+
+MockFlutterEngineTest::MockFlutterEngineTest() = default;
+
+void MockFlutterEngineTest::SetUp() {
+  engine_mock_ = CreateMockFlutterEngine(@"");
+}
+
+void MockFlutterEngineTest::TearDown() {
+  [engine_mock_ shutDownEngine];
+  [engine_mock_ stopMocking];
+  engine_mock_ = nil;
+}
+
+void MockFlutterEngineTest::ShutDownEngine() {
+  [engine_mock_ shutDownEngine];
+  engine_mock_ = nil;
 }
 
 }  // namespace flutter::testing
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h b/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h
index 3181e24077e4597fa52f5987b7e75c5439820d10..bcaca946a1203eb9b52109ef23d295ddd00e090a 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h
+++ b/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h
@@ -2,17 +2,82 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERENGINE_INTERNAL_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERENGINE_INTERNAL_H_
+
 #import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterEngine.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include <memory>
 
+#include "flutter/shell/platform/common/app_lifecycle_state.h"
+
 #import "flutter/shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMac.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterCompositor.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterPlatformViewController.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterRenderer.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
+#pragma mark - Typedefs
+
+typedef void (^FlutterTerminationCallback)(id _Nullable sender);
+
+#pragma mark - Enumerations
+
+/**
+ * An enum for defining the different request types allowed when requesting an
+ * application exit.
+ *
+ * Must match the entries in the `AppExitType` enum in the Dart code.
+ */
+typedef NS_ENUM(NSInteger, FlutterAppExitType) {
+  kFlutterAppExitTypeCancelable = 0,
+  kFlutterAppExitTypeRequired = 1,
+};
+
+/**
+ * An enum for defining the different responses the framework can give to an
+ * application exit request from the engine.
+ *
+ * Must match the entries in the `AppExitResponse` enum in the Dart code.
+ */
+typedef NS_ENUM(NSInteger, FlutterAppExitResponse) {
+  kFlutterAppExitResponseCancel = 0,
+  kFlutterAppExitResponseExit = 1,
+};
+
+#pragma mark - FlutterEngineTerminationHandler
+
+/**
+ * A handler interface for handling application termination that the
+ * FlutterAppDelegate can use to coordinate an application exit by sending
+ * messages through the platform channel managed by the engine.
+ */
+@interface FlutterEngineTerminationHandler : NSObject
+
+@property(nonatomic, readonly) BOOL shouldTerminate;
+@property(nonatomic, readwrite) BOOL acceptingRequests;
+
+- (instancetype)initWithEngine:(FlutterEngine*)engine
+                    terminator:(nullable FlutterTerminationCallback)terminator;
+- (void)handleRequestAppExitMethodCall:(NSDictionary<NSString*, id>*)data
+                                result:(FlutterResult)result;
+- (void)requestApplicationTermination:(NSApplication*)sender
+                             exitType:(FlutterAppExitType)type
+                               result:(nullable FlutterResult)result;
+@end
+
+/**
+ * An NSPasteboard wrapper object to allow for substitution of a fake in unit tests.
+ */
+@interface FlutterPasteboard : NSObject
+- (NSInteger)clearContents;
+- (NSString*)stringForType:(NSPasteboardType)dataType;
+- (BOOL)setString:(NSString*)string forType:(NSPasteboardType)dataType;
+@end
+
 @interface FlutterEngine ()
 
 /**
@@ -31,8 +96,6 @@
  */
 @property(nonatomic) FlutterEngineProcTable& embedderAPI;
 
-@property(nonatomic, readonly) std::weak_ptr<flutter::AccessibilityBridgeMac> accessibilityBridge;
-
 /**
  * True if the semantics is enabled. The Flutter framework starts sending
  * semantics update through the embedder as soon as it is set to YES.
@@ -47,12 +110,57 @@
 /**
  * This just returns the NSPasteboard so that it can be mocked in the tests.
  */
-@property(nonatomic, readonly, nonnull) NSPasteboard* pasteboard;
+@property(nonatomic, nonnull) FlutterPasteboard* pasteboard;
 
 /**
- * Informs the engine that the associated view controller's view size has changed.
+ * The command line arguments array for the engine.
  */
-- (void)updateWindowMetrics;
+@property(nonatomic, readonly) std::vector<std::string> switches;
+
+/**
+ * Provides the |FlutterEngineTerminationHandler| to be used for this engine.
+ */
+@property(nonatomic, readonly) FlutterEngineTerminationHandler* terminationHandler;
+
+/**
+ * Attach a view controller to the engine as its default controller.
+ *
+ * Practically, since FlutterEngine can only be attached with one controller,
+ * the given controller, if successfully attached, will always have the default
+ * view ID kFlutterImplicitViewId.
+ *
+ * The engine holds a weak reference to the attached view controller.
+ *
+ * If the given view controller is already attached to an engine, this call
+ * throws an assertion.
+ */
+- (void)addViewController:(FlutterViewController*)viewController;
+
+/**
+ * Notify the engine that a view for the given view controller has been loaded.
+ */
+- (void)viewControllerViewDidLoad:(FlutterViewController*)viewController;
+
+/**
+ * Dissociate the given view controller from this engine.
+ *
+ * If the view controller is not associated with this engine, this call throws an
+ * assertion.
+ *
+ * Practically, since FlutterEngine can only be attached with one controller for
+ * now, the given controller must be the current view controller.
+ */
+- (void)removeViewController:(FlutterViewController*)viewController;
+
+/**
+ * The |FlutterViewController| associated with the given view ID, if any.
+ */
+- (nullable FlutterViewController*)viewControllerForId:(FlutterViewId)viewId;
+
+/**
+ * Informs the engine that the specified view controller's window metrics have changed.
+ */
+- (void)updateWindowMetricsForViewController:(FlutterViewController*)viewController;
 
 /**
  * Dispatches the given pointer event data to engine.
@@ -83,6 +191,14 @@
 
 - (nonnull FlutterPlatformViewController*)platformViewController;
 
+/**
+ * Handles changes to the application state, sending them to the framework.
+ *
+ * @param state One of the lifecycle constants in app_lifecycle_state.h,
+ *              corresponding to the Dart enum AppLifecycleState.
+ */
+- (void)setApplicationState:(flutter::AppLifecycleState)state;
+
 // Accessibility API.
 
 /**
@@ -93,15 +209,27 @@
                        toTarget:(uint16_t)target
                        withData:(fml::MallocMapping)data;
 
-@end
+/**
+ * Handles accessibility events.
+ */
+- (void)handleAccessibilityEvent:(NSDictionary<NSString*, id>*)annotatedEvent;
 
-@interface FlutterEngine (TestMethods)
-/* Creates an accessibility bridge with the provided parameters.
- *
- * By default this method calls AccessibilityBridgeMac's initializer. Exposing
- * this method allows unit tests to override in order to capture information.
+/**
+ * Announces accessibility messages.
  */
-- (std::shared_ptr<flutter::AccessibilityBridgeMac>)
-    createAccessibilityBridge:(nonnull FlutterEngine*)engine
-               viewController:(nonnull FlutterViewController*)viewController;
+- (void)announceAccessibilityMessage:(NSString*)message
+                        withPriority:(NSAccessibilityPriorityLevel)priority;
+
+/**
+ * Returns an array of screen objects representing all of the screens available on the system.
+ */
+- (NSArray<NSScreen*>*)screens;
 @end
+
+@interface FlutterEngine (Tests)
+- (nonnull FlutterThreadSynchronizer*)testThreadSynchronizer;
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERENGINE_INTERNAL_H_
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterExternalTexture.h b/shell/platform/darwin/macos/framework/Source/FlutterExternalTexture.h
index 79d222a392050bcc19070ab763c8799792f7cf33..b2aa481aade140c74e69137bb4fd0ac65054c8f3 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterExternalTexture.h
+++ b/shell/platform/darwin/macos/framework/Source/FlutterExternalTexture.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTEREXTERNALTEXTURE_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTEREXTERNALTEXTURE_H_
+
 #import <Foundation/Foundation.h>
 
 #import "flutter/shell/platform/darwin/graphics/FlutterDarwinContextMetalSkia.h"
@@ -34,3 +37,5 @@
 - (BOOL)populateTexture:(nonnull FlutterMetalExternalTexture*)metalTexture;
 
 @end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTEREXTERNALTEXTURE_H_
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterIOSurfaceHolder.mm b/shell/platform/darwin/macos/framework/Source/FlutterIOSurfaceHolder.mm
deleted file mode 100644
index d8553507442f90cabb003b711c2cc8fc5c9dc86a..0000000000000000000000000000000000000000
--- a/shell/platform/darwin/macos/framework/Source/FlutterIOSurfaceHolder.mm
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterIOSurfaceHolder.h"
-
-@interface FlutterIOSurfaceHolder () {
-  IOSurfaceRef _ioSurface;
-}
-@end
-
-@implementation FlutterIOSurfaceHolder
-
-- (void)recreateIOSurfaceWithSize:(CGSize)size {
-  if (_ioSurface) {
-    CFRelease(_ioSurface);
-  }
-
-  unsigned pixelFormat = 'BGRA';
-  unsigned bytesPerElement = 4;
-
-  size_t bytesPerRow = IOSurfaceAlignProperty(kIOSurfaceBytesPerRow, size.width * bytesPerElement);
-  size_t totalBytes = IOSurfaceAlignProperty(kIOSurfaceAllocSize, size.height * bytesPerRow);
-  NSDictionary* options = @{
-    (id)kIOSurfaceWidth : @(size.width),
-    (id)kIOSurfaceHeight : @(size.height),
-    (id)kIOSurfacePixelFormat : @(pixelFormat),
-    (id)kIOSurfaceBytesPerElement : @(bytesPerElement),
-    (id)kIOSurfaceBytesPerRow : @(bytesPerRow),
-    (id)kIOSurfaceAllocSize : @(totalBytes),
-  };
-
-  _ioSurface = IOSurfaceCreate((CFDictionaryRef)options);
-  IOSurfaceSetValue(_ioSurface, CFSTR("IOSurfaceColorSpace"), kCGColorSpaceSRGB);
-}
-
-- (const IOSurfaceRef&)ioSurface {
-  return _ioSurface;
-}
-
-- (void)dealloc {
-  if (_ioSurface) {
-    CFRelease(_ioSurface);
-  }
-}
-
-@end
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterKeyPrimaryResponder.h b/shell/platform/darwin/macos/framework/Source/FlutterKeyPrimaryResponder.h
index b61c790028a3b38cdfb0602ff3bae8b9d320cf22..5a2e18d3a4ab363a9c1602c76ca8f2179f573d61 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterKeyPrimaryResponder.h
+++ b/shell/platform/darwin/macos/framework/Source/FlutterKeyPrimaryResponder.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERKEYPRIMARYRESPONDER_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERKEYPRIMARYRESPONDER_H_
+
 #import <Cocoa/Cocoa.h>
 
 typedef void (^FlutterAsyncKeyCallback)(BOOL handled);
@@ -24,6 +27,15 @@ typedef void (^FlutterAsyncKeyCallback)(BOOL handled);
 @required
 - (void)handleEvent:(nonnull NSEvent*)event callback:(nonnull FlutterAsyncKeyCallback)callback;
 
+/**
+ * Synchronize the modifier flags if necessary. The new modifier flag would usually come from mouse
+ * event and may be out of sync with current keyboard state if the modifier flags have changed while
+ * window was not key.
+ */
+@required
+- (void)syncModifiersIfNeeded:(NSEventModifierFlags)modifierFlags
+                    timestamp:(NSTimeInterval)timestamp;
+
 /* A map from macOS key code to logical keyboard.
  *
  * The map is assigned on initialization, and updated when the user changes
@@ -34,3 +46,5 @@ typedef void (^FlutterAsyncKeyCallback)(BOOL handled);
 @property(nonatomic, nullable, strong) NSMutableDictionary<NSNumber*, NSNumber*>* layoutMap;
 
 @end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERKEYPRIMARYRESPONDER_H_
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterKeyboardManager.h b/shell/platform/darwin/macos/framework/Source/FlutterKeyboardManager.h
index c8ba5058aabfbfde9b33494d75fa44c9ab9c44ae..dc96cf72ed86dd2090accac48f68eae2cb7675ad 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterKeyboardManager.h
+++ b/shell/platform/darwin/macos/framework/Source/FlutterKeyboardManager.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERKEYBOARDMANAGER_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERKEYBOARDMANAGER_H_
+
 #import <Cocoa/Cocoa.h>
 
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterKeyboardViewDelegate.h"
@@ -48,4 +51,23 @@
  */
 - (BOOL)isDispatchingKeyEvent:(nonnull NSEvent*)event;
 
+/**
+ * Synthesize modifier keys events.
+ *
+ * If needed, synthesize modifier keys up and down events by comparing their
+ * current pressing states with the given modifier flags.
+ */
+- (void)syncModifiersIfNeeded:(NSEventModifierFlags)modifierFlags
+                    timestamp:(NSTimeInterval)timestamp;
+
+/**
+ * Returns the keyboard pressed state.
+ *
+ * Returns the keyboard pressed state. The dictionary contains one entry per
+ * pressed keys, mapping from the logical key to the physical key.
+ */
+- (nonnull NSDictionary*)getPressedState;
+
 @end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERKEYBOARDMANAGER_H_
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterKeyboardManager.mm b/shell/platform/darwin/macos/framework/Source/FlutterKeyboardManager.mm
index 116c94537d9be901d46b75f1f0c1f291e9ac6372..fc0e5db075713cb19048210015d3757b280cc376 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterKeyboardManager.mm
+++ b/shell/platform/darwin/macos/framework/Source/FlutterKeyboardManager.mm
@@ -57,7 +57,7 @@ typedef _Nullable _NSResponderPtr (^NextResponderProvider)();
 /**
  * The text input plugin set by initialization.
  */
-@property(nonatomic) id<FlutterKeyboardViewDelegate> viewDelegate;
+@property(nonatomic, weak) id<FlutterKeyboardViewDelegate> viewDelegate;
 
 /**
  * The primary responders added by addPrimaryResponder.
@@ -119,15 +119,28 @@ typedef _Nullable _NSResponderPtr (^NextResponderProvider)();
     _processingEvent = FALSE;
     _viewDelegate = viewDelegate;
 
+    FlutterMethodChannel* keyboardChannel =
+        [FlutterMethodChannel methodChannelWithName:@"flutter/keyboard"
+                                    binaryMessenger:[_viewDelegate getBinaryMessenger]
+                                              codec:[FlutterStandardMethodCodec sharedInstance]];
+
+    [keyboardChannel setMethodCallHandler:^(FlutterMethodCall* call, FlutterResult result) {
+      [self handleKeyboardMethodCall:call result:result];
+    }];
+
     _primaryResponders = [[NSMutableArray alloc] init];
+
+    __weak __typeof__(self) weakSelf = self;
     [self addPrimaryResponder:[[FlutterEmbedderKeyResponder alloc]
                                   initWithSendEvent:^(const FlutterKeyEvent& event,
                                                       FlutterKeyEventCallback callback,
                                                       void* userData) {
-                                    [_viewDelegate sendKeyEvent:event
-                                                       callback:callback
-                                                       userData:userData];
+                                    __strong __typeof__(weakSelf) strongSelf = weakSelf;
+                                    [strongSelf.viewDelegate sendKeyEvent:event
+                                                                 callback:callback
+                                                                 userData:userData];
                                   }]];
+
     [self
         addPrimaryResponder:[[FlutterChannelKeyResponder alloc]
                                 initWithChannel:[FlutterBasicMessageChannel
@@ -136,6 +149,7 @@ typedef _Nullable _NSResponderPtr (^NextResponderProvider)();
                                                                                getBinaryMessenger]
                                                                      codec:[FlutterJSONMessageCodec
                                                                                sharedInstance]]]];
+
     _pendingEvents = [[NSMutableArray alloc] init];
     _layoutMap = [NSMutableDictionary<NSNumber*, NSNumber*> dictionary];
     [self buildLayout];
@@ -143,7 +157,6 @@ typedef _Nullable _NSResponderPtr (^NextResponderProvider)();
       responder.layoutMap = _layoutMap;
     }
 
-    __weak __typeof__(self) weakSelf = self;
     [_viewDelegate subscribeToKeyboardLayoutChange:^() {
       [weakSelf buildLayout];
     }];
@@ -151,6 +164,14 @@ typedef _Nullable _NSResponderPtr (^NextResponderProvider)();
   return self;
 }
 
+- (void)handleKeyboardMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
+  if ([[call method] isEqualToString:@"getKeyboardState"]) {
+    result([self getPressedState]);
+  } else {
+    result(FlutterMethodNotImplemented);
+  }
+}
+
 - (void)addPrimaryResponder:(nonnull id<FlutterKeyPrimaryResponder>)responder {
   [_primaryResponders addObject:responder];
 }
@@ -260,7 +281,7 @@ typedef _Nullable _NSResponderPtr (^NextResponderProvider)();
 
   std::map<uint32_t, LayoutGoal> mandatoryGoalsByChar;
   std::map<uint32_t, LayoutGoal> usLayoutGoalsByKeyCode;
-  for (const LayoutGoal& goal : flutter::layoutGoals) {
+  for (const LayoutGoal& goal : flutter::kLayoutGoals) {
     if (goal.mandatory) {
       mandatoryGoalsByChar[goal.keyChar] = goal;
     } else {
@@ -320,4 +341,24 @@ typedef _Nullable _NSResponderPtr (^NextResponderProvider)();
   }
 }
 
+- (void)syncModifiersIfNeeded:(NSEventModifierFlags)modifierFlags
+                    timestamp:(NSTimeInterval)timestamp {
+  for (id<FlutterKeyPrimaryResponder> responder in _primaryResponders) {
+    [responder syncModifiersIfNeeded:modifierFlags timestamp:timestamp];
+  }
+}
+
+/**
+ * Returns the keyboard pressed state.
+ *
+ * Returns the keyboard pressed state. The dictionary contains one entry per
+ * pressed keys, mapping from the logical key to the physical key.
+ */
+- (nonnull NSDictionary*)getPressedState {
+  // The embedder responder is the first element in _primaryResponders.
+  FlutterEmbedderKeyResponder* embedderResponder =
+      (FlutterEmbedderKeyResponder*)_primaryResponders[0];
+  return [embedderResponder getPressedState];
+}
+
 @end
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterKeyboardManagerTest.mm b/shell/platform/darwin/macos/framework/Source/FlutterKeyboardManagerTest.mm
index d9b2ba994d7f290d4ccf7f88b0eaa7ed54b1b55e..53e314480335e1f97649e816d30aed5f5ccbf49d 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterKeyboardManagerTest.mm
+++ b/shell/platform/darwin/macos/framework/Source/FlutterKeyboardManagerTest.mm
@@ -22,6 +22,7 @@ using flutter::testing::keycodes::kLogicalKeyA;
 using flutter::testing::keycodes::kLogicalKeyM;
 using flutter::testing::keycodes::kLogicalKeyQ;
 using flutter::testing::keycodes::kLogicalKeyT;
+using flutter::testing::keycodes::kPhysicalKeyA;
 
 using flutter::LayoutClue;
 
@@ -211,6 +212,10 @@ void clearEvents(std::vector<FlutterKeyEvent>& events) {
 - (void)recordCallTypesTo:(nonnull NSMutableArray<NSNumber*>*)typeStorage
                  forTypes:(uint32_t)typeMask;
 
+- (id)lastKeyboardChannelResult;
+
+- (void)sendKeyboardChannelMessage:(NSData* _Nullable)message;
+
 @property(readonly, nonatomic, strong) FlutterKeyboardManager* manager;
 @property(nonatomic, nullable, strong) NSResponder* nextResponder;
 
@@ -237,6 +242,10 @@ void clearEvents(std::vector<FlutterKeyEvent>& events) {
 
   flutter::KeyboardLayoutNotifier _keyboardLayoutNotifier;
   const MockLayoutData* _currentLayout;
+
+  id _keyboardChannelResult;
+  NSObject<FlutterBinaryMessenger>* _messengerMock;
+  FlutterBinaryMessageHandler _keyboardHandler;
 }
 
 - (nonnull instancetype)init {
@@ -252,18 +261,24 @@ void clearEvents(std::vector<FlutterKeyEvent>& events) {
 
   _currentLayout = &kUsLayout;
 
-  id messengerMock = OCMStrictProtocolMock(@protocol(FlutterBinaryMessenger));
-  OCMStub([messengerMock sendOnChannel:@"flutter/keyevent"
-                               message:[OCMArg any]
-                           binaryReply:[OCMArg any]])
+  _messengerMock = OCMStrictProtocolMock(@protocol(FlutterBinaryMessenger));
+  OCMStub([_messengerMock sendOnChannel:@"flutter/keyevent"
+                                message:[OCMArg any]
+                            binaryReply:[OCMArg any]])
       .andCall(self, @selector(handleChannelMessage:message:binaryReply:));
-
+  OCMStub([_messengerMock setMessageHandlerOnChannel:@"flutter/keyboard"
+                                binaryMessageHandler:[OCMArg any]])
+      .andCall(self, @selector(setKeyboardChannelHandler:handler:));
+  OCMStub([_messengerMock sendOnChannel:@"flutter/keyboard" message:[OCMArg any]])
+      .andCall(self, @selector(handleKeyboardChannelMessage:message:));
   id viewDelegateMock = OCMStrictProtocolMock(@protocol(FlutterKeyboardViewDelegate));
   OCMStub([viewDelegateMock nextResponder]).andReturn(_nextResponder);
   OCMStub([viewDelegateMock onTextInputKeyEvent:[OCMArg any]])
       .andCall(self, @selector(handleTextInputKeyEvent:));
-  OCMStub([viewDelegateMock getBinaryMessenger]).andReturn(messengerMock);
-  OCMStub([viewDelegateMock sendKeyEvent:FlutterKeyEvent {} callback:nil userData:nil])
+  OCMStub([viewDelegateMock getBinaryMessenger]).andReturn(_messengerMock);
+  OCMStub([viewDelegateMock sendKeyEvent:*(const FlutterKeyEvent*)[OCMArg anyPointer]
+                                callback:nil
+                                userData:nil])
       .ignoringNonObjectArgs()
       .andCall(self, @selector(handleEmbedderEvent:callback:userData:));
   OCMStub([viewDelegateMock subscribeToKeyboardLayoutChange:[OCMArg any]])
@@ -276,6 +291,10 @@ void clearEvents(std::vector<FlutterKeyEvent>& events) {
   return self;
 }
 
+- (id)lastKeyboardChannelResult {
+  return _keyboardChannelResult;
+}
+
 - (void)respondEmbedderCallsWith:(BOOL)response {
   _embedderHandler = ^(const FlutterKeyEvent* event, FlutterAsyncKeyCallback callback) {
     callback(response);
@@ -327,6 +346,10 @@ void clearEvents(std::vector<FlutterKeyEvent>& events) {
   _typeStorageMask = typeMask;
 }
 
+- (void)sendKeyboardChannelMessage:(NSData* _Nullable)message {
+  [_messengerMock sendOnChannel:@"flutter/keyboard" message:message];
+}
+
 - (void)setLayout:(const MockLayoutData&)layout {
   _currentLayout = &layout;
   if (_keyboardLayoutNotifier != nil) {
@@ -364,6 +387,12 @@ void clearEvents(std::vector<FlutterKeyEvent>& events) {
   });
 }
 
+- (void)handleKeyboardChannelMessage:(NSString*)channel message:(NSData* _Nullable)message {
+  _keyboardHandler(message, ^(id result) {
+    _keyboardChannelResult = result;
+  });
+}
+
 - (BOOL)handleTextInputKeyEvent:(NSEvent*)event {
   if (_typeStorage != nil && (_typeStorageMask & kTextCall) != 0) {
     [_typeStorage addObject:@(kTextCall)];
@@ -382,6 +411,10 @@ void clearEvents(std::vector<FlutterKeyEvent>& events) {
   return LayoutClue{cluePair & kCharMask, (cluePair & kDeadKeyMask) != 0};
 }
 
+- (void)setKeyboardChannelHandler:(NSString*)channel handler:(FlutterBinaryMessageHandler)handler {
+  _keyboardHandler = handler;
+}
+
 @end
 
 @interface FlutterKeyboardManagerUnittestsObjC : NSObject
@@ -389,11 +422,15 @@ void clearEvents(std::vector<FlutterKeyEvent>& events) {
 - (bool)doublePrimaryResponder;
 - (bool)textInputPlugin;
 - (bool)emptyNextResponder;
+- (bool)getPressedState;
+- (bool)keyboardChannelGetPressedState;
 - (bool)racingConditionBetweenKeyAndText;
 - (bool)correctLogicalKeyForLayouts;
+- (bool)shouldNotHoldStrongReferenceToViewDelegate;
 @end
 
 namespace flutter::testing {
+
 TEST(FlutterKeyboardManagerUnittests, SinglePrimaryResponder) {
   ASSERT_TRUE([[FlutterKeyboardManagerUnittestsObjC alloc] singlePrimaryResponder]);
 }
@@ -410,6 +447,14 @@ TEST(FlutterKeyboardManagerUnittests, EmptyNextResponder) {
   ASSERT_TRUE([[FlutterKeyboardManagerUnittestsObjC alloc] emptyNextResponder]);
 }
 
+TEST(FlutterKeyboardManagerUnittests, GetPressedState) {
+  ASSERT_TRUE([[FlutterKeyboardManagerUnittestsObjC alloc] getPressedState]);
+}
+
+TEST(FlutterKeyboardManagerUnittests, KeyboardChannelGetPressedState) {
+  ASSERT_TRUE([[FlutterKeyboardManagerUnittestsObjC alloc] keyboardChannelGetPressedState]);
+}
+
 TEST(FlutterKeyboardManagerUnittests, RacingConditionBetweenKeyAndText) {
   ASSERT_TRUE([[FlutterKeyboardManagerUnittestsObjC alloc] racingConditionBetweenKeyAndText]);
 }
@@ -418,6 +463,11 @@ TEST(FlutterKeyboardManagerUnittests, CorrectLogicalKeyForLayouts) {
   ASSERT_TRUE([[FlutterKeyboardManagerUnittestsObjC alloc] correctLogicalKeyForLayouts]);
 }
 
+TEST(FlutterKeyboardManagerUnittests, ShouldNotHoldStrongReferenceToViewDelegate) {
+  ASSERT_TRUE(
+      [[FlutterKeyboardManagerUnittestsObjC alloc] shouldNotHoldStrongReferenceToViewDelegate]);
+}
+
 }  // namespace flutter::testing
 
 @implementation FlutterKeyboardManagerUnittestsObjC
@@ -563,6 +613,44 @@ TEST(FlutterKeyboardManagerUnittests, CorrectLogicalKeyForLayouts) {
   return true;
 }
 
+- (bool)getPressedState {
+  KeyboardTester* tester = [[KeyboardTester alloc] init];
+
+  [tester respondEmbedderCallsWith:false];
+  [tester respondChannelCallsWith:false];
+  [tester respondTextInputWith:false];
+  [tester.manager handleEvent:keyDownEvent(kVK_ANSI_A)];
+
+  NSDictionary* pressingRecords = [tester.manager getPressedState];
+  EXPECT_EQ([pressingRecords count], 1u);
+  EXPECT_EQ(pressingRecords[@(kPhysicalKeyA)], @(kLogicalKeyA));
+
+  return true;
+}
+
+- (bool)keyboardChannelGetPressedState {
+  KeyboardTester* tester = [[KeyboardTester alloc] init];
+
+  [tester respondEmbedderCallsWith:false];
+  [tester respondChannelCallsWith:false];
+  [tester respondTextInputWith:false];
+  [tester.manager handleEvent:keyDownEvent(kVK_ANSI_A)];
+
+  FlutterMethodCall* getKeyboardStateMethodCall =
+      [FlutterMethodCall methodCallWithMethodName:@"getKeyboardState" arguments:nil];
+  NSData* getKeyboardStateMessage =
+      [[FlutterStandardMethodCodec sharedInstance] encodeMethodCall:getKeyboardStateMethodCall];
+  [tester sendKeyboardChannelMessage:getKeyboardStateMessage];
+
+  id encodedResult = [tester lastKeyboardChannelResult];
+  id decoded = [[FlutterStandardMethodCodec sharedInstance] decodeEnvelope:encodedResult];
+
+  EXPECT_EQ([decoded count], 1u);
+  EXPECT_EQ(decoded[@(kPhysicalKeyA)], @(kLogicalKeyA));
+
+  return true;
+}
+
 // Regression test for https://github.com/flutter/flutter/issues/82673.
 - (bool)racingConditionBetweenKeyAndText {
   KeyboardTester* tester = [[KeyboardTester alloc] init];
@@ -728,4 +816,30 @@ TEST(FlutterKeyboardManagerUnittests, CorrectLogicalKeyForLayouts) {
   return TRUE;
 }
 
+- (bool)shouldNotHoldStrongReferenceToViewDelegate {
+  __strong FlutterKeyboardManager* strongKeyboardManager;
+  __weak id weakViewDelegate;
+
+  @autoreleasepool {
+    id binaryMessengerMock = OCMStrictProtocolMock(@protocol(FlutterBinaryMessenger));
+    OCMStub([binaryMessengerMock setMessageHandlerOnChannel:[OCMArg any]
+                                       binaryMessageHandler:[OCMArg any]]);
+
+    id viewDelegateMock = OCMStrictProtocolMock(@protocol(FlutterKeyboardViewDelegate));
+    OCMStub([viewDelegateMock getBinaryMessenger]).andReturn(binaryMessengerMock);
+    OCMStub([viewDelegateMock subscribeToKeyboardLayoutChange:[OCMArg any]]);
+
+    LayoutClue layoutClue;
+    OCMStub([viewDelegateMock lookUpLayoutForKeyCode:0 shift:NO])
+        .ignoringNonObjectArgs()
+        .andReturn(layoutClue);
+    FlutterKeyboardManager* keyboardManager =
+        [[FlutterKeyboardManager alloc] initWithViewDelegate:viewDelegateMock];
+    strongKeyboardManager = keyboardManager;
+    weakViewDelegate = viewDelegateMock;
+  }
+
+  return weakViewDelegate == nil;
+}
+
 @end
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterKeyboardViewDelegate.h b/shell/platform/darwin/macos/framework/Source/FlutterKeyboardViewDelegate.h
index cc559fe3f063ef098bcd47f187504b4041c9d58e..c081e8b1447ab316ee39f9f85692b6b0dd993642 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterKeyboardViewDelegate.h
+++ b/shell/platform/darwin/macos/framework/Source/FlutterKeyboardViewDelegate.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERKEYBOARDVIEWDELEGATE_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERKEYBOARDVIEWDELEGATE_H_
+
 #import <Cocoa/Cocoa.h>
 
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h"
@@ -86,4 +89,14 @@ typedef struct {
  */
 - (flutter::LayoutClue)lookUpLayoutForKeyCode:(uint16_t)keyCode shift:(BOOL)shift;
 
+/**
+ * Returns the keyboard pressed state.
+ *
+ * Returns the keyboard pressed state. The dictionary contains one entry per
+ * pressed keys, mapping from the logical key to the physical key.
+ */
+- (nonnull NSDictionary*)getPressedState;
+
 @end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERKEYBOARDVIEWDELEGATE_H_
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterMenuPlugin.h b/shell/platform/darwin/macos/framework/Source/FlutterMenuPlugin.h
index 151754d52a7d3cec17565cdbd1f5133adc55bbae..d4f3df4264ba17f8391ec4d96730e918b79e89f9 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterMenuPlugin.h
+++ b/shell/platform/darwin/macos/framework/Source/FlutterMenuPlugin.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERMENUPLUGIN_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERMENUPLUGIN_H_
+
 #import <AppKit/AppKit.h>
 
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h"
@@ -21,3 +24,5 @@
  */
 + (void)registerWithRegistrar:(nonnull id<FlutterPluginRegistrar>)registrar;
 @end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERMENUPLUGIN_H_
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterMenuPluginTest.mm b/shell/platform/darwin/macos/framework/Source/FlutterMenuPluginTest.mm
index 915df002c3d1291e378f3c617ec72b8f6bcf1018..7d32208d93e3f03e63bbf4b8d9d82ed30406512d 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterMenuPluginTest.mm
+++ b/shell/platform/darwin/macos/framework/Source/FlutterMenuPluginTest.mm
@@ -2,67 +2,103 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterMenuPlugin.h"
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterMenuPlugin_Internal.h"
+
+#import "flutter/shell/platform/common/platform_provided_menu.h"
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h"
 #import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterPluginMacOS.h"
 #import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterPluginRegistrarMacOS.h"
 #import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterViewController.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterDartProject_Internal.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h"
-#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterMenuPlugin.h"
-#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterMenuPlugin_Internal.h"
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputPlugin.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputSemanticsObject.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterViewController_Internal.h"
-
-#include "flutter/shell/platform/common/platform_provided_menu.h"
+#include "flutter/testing/autoreleasepool_test.h"
+#include "flutter/testing/testing.h"
 #include "gtest/gtest.h"
 
-#import <OCMock/OCMock.h>
-#import "flutter/testing/testing.h"
+@interface FakePluginRegistrar : NSObject <FlutterPluginRegistrar>
+@property(nonatomic, readonly) id<FlutterPlugin> plugin;
+@property(nonatomic, readonly) FlutterMethodChannel* channel;
+@end
+
+@implementation FakePluginRegistrar
+@synthesize messenger;
+@synthesize textures;
+@synthesize view;
+
+- (void)addMethodCallDelegate:(nonnull id<FlutterPlugin>)delegate
+                      channel:(nonnull FlutterMethodChannel*)channel {
+  _plugin = delegate;
+  _channel = channel;
+  [_channel setMethodCallHandler:^(FlutterMethodCall* call, FlutterResult result) {
+    [delegate handleMethodCall:call result:result];
+  }];
+}
+
+- (void)addApplicationDelegate:(nonnull NSObject<FlutterAppLifecycleDelegate>*)delegate {
+}
+
+- (void)registerViewFactory:(nonnull NSObject<FlutterPlatformViewFactory>*)factory
+                     withId:(nonnull NSString*)factoryId {
+}
 
-@interface FlutterMenuPluginTestObjc : NSObject
-- (bool)testSetMenu;
+- (void)publish:(nonnull NSObject*)value {
+}
+
+- (nonnull NSString*)lookupKeyForAsset:(nonnull NSString*)asset {
+  return @"";
+}
+
+- (nonnull NSString*)lookupKeyForAsset:(nonnull NSString*)asset
+                           fromPackage:(nonnull NSString*)package {
+  return @"";
+}
 @end
 
-@implementation FlutterMenuPluginTestObjc
+namespace flutter::testing {
 
-- (bool)testSetMenu {
-  // Workaround to deflake the test.
-  // See: https://github.com/flutter/flutter/issues/104748#issuecomment-1159336728
-  NSView* view = [[NSView alloc] initWithFrame:NSZeroRect];
-  view.wantsLayer = YES;
+// FlutterMenuPluginTest is an AutoreleasePoolTest that allocates an NSView.
+//
+// This supports the use of NSApplication features that rely on the assumption of a view, such as
+// when modifying the application menu bar, or even accessing the NSApplication.localizedName
+// property.
+//
+// See: https://github.com/flutter/flutter/issues/104748#issuecomment-1159336728
+class FlutterMenuPluginTest : public AutoreleasePoolTest {
+ public:
+  FlutterMenuPluginTest();
+  ~FlutterMenuPluginTest() = default;
+
+ private:
+  NSView* view_;
+};
+
+FlutterMenuPluginTest::FlutterMenuPluginTest() {
+  view_ = [[NSView alloc] initWithFrame:NSZeroRect];
+  view_.wantsLayer = YES;
+}
 
+TEST_F(FlutterMenuPluginTest, TestSetMenu) {
   // Build a simulation of the default main menu.
   NSMenu* mainMenu = [[NSMenu alloc] init];
-  NSMenuItem* appNameMenu = [[NSMenuItem alloc] initWithTitle:@"APP_NAME"
+  NSMenuItem* appNameMenu = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"APP_NAME", nil)
                                                        action:nil
                                                 keyEquivalent:@""];
-  NSMenu* submenu = [[NSMenu alloc] initWithTitle:@"Prexisting APP_NAME menu"];
-  [submenu addItem:[[NSMenuItem alloc] initWithTitle:@"About APP_NAME"
+  NSMenu* submenu =
+      [[NSMenu alloc] initWithTitle:NSLocalizedString(@"Prexisting APP_NAME menu", nil)];
+  [submenu addItem:[[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"About APP_NAME", nil)
                                               action:nil
                                        keyEquivalent:@""]];
   appNameMenu.submenu = submenu;
   [mainMenu addItem:appNameMenu];
   [NSApp setMainMenu:mainMenu];
 
-  id<FlutterPluginRegistrar> pluginRegistrarMock =
-      OCMProtocolMock(@protocol(FlutterPluginRegistrar));
-  __block FlutterMethodChannel* pluginChannel;
-  __block FlutterMenuPlugin* plugin;
-  id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
-  OCMStub([pluginRegistrarMock messenger]).andReturn(binaryMessengerMock);
-  OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
-      [pluginRegistrarMock addMethodCallDelegate:[OCMArg any] channel:[OCMArg any]])
-      .andDo(^(NSInvocation* invocation) {
-        id<FlutterPlugin> delegate;
-        FlutterMethodChannel* channel;
-        [invocation getArgument:&delegate atIndex:2];
-        [invocation getArgument:&channel atIndex:3];
-        pluginChannel = channel;
-        plugin = delegate;
-        [channel setMethodCallHandler:^(FlutterMethodCall* call, FlutterResult result) {
-          [delegate handleMethodCall:call result:result];
-        }];
-      });
-  [FlutterMenuPlugin registerWithRegistrar:pluginRegistrarMock];
+  FakePluginRegistrar* registrar = [[FakePluginRegistrar alloc] init];
+  [FlutterMenuPlugin registerWithRegistrar:registrar];
+  FlutterMenuPlugin* plugin = [registrar plugin];
 
   NSDictionary* testMenus = @{
     @"0" : @[
@@ -173,14 +209,6 @@
   EXPECT_TRUE(
       [NSStringFromSelector([secondMenuLast action]) isEqualToString:@"flutterMenuItemSelected:"]);
   EXPECT_EQ([secondMenuLast tag], 7);
-
-  return true;
 }
 
-@end
-
-namespace flutter::testing {
-TEST(FlutterMenuPluginTest, TestSetMenu) {
-  ASSERT_TRUE([[FlutterMenuPluginTestObjc alloc] testSetMenu]);
-}
 }  // namespace flutter::testing
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterMenuPlugin_Internal.h b/shell/platform/darwin/macos/framework/Source/FlutterMenuPlugin_Internal.h
index 415b39398249eb0cd1ae184c31cfe47192c46ffe..f7dfdd87c96191fc5e851173a875865e58ca7652 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterMenuPlugin_Internal.h
+++ b/shell/platform/darwin/macos/framework/Source/FlutterMenuPlugin_Internal.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERMENUPLUGIN_INTERNAL_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERMENUPLUGIN_INTERNAL_H_
+
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterMenuPlugin.h"
 
 /**
@@ -13,3 +16,5 @@
 - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result;
 
 @end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERMENUPLUGIN_INTERNAL_H_
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterMouseCursorPlugin.h b/shell/platform/darwin/macos/framework/Source/FlutterMouseCursorPlugin.h
index 73b1d63e87d92ca0876547304c1e0c7276cd5772..ac986d6fb81c44712236fba69803a223455a944b 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterMouseCursorPlugin.h
+++ b/shell/platform/darwin/macos/framework/Source/FlutterMouseCursorPlugin.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERMOUSECURSORPLUGIN_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERMOUSECURSORPLUGIN_H_
+
 #import <Cocoa/Cocoa.h>
 
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h"
@@ -16,3 +19,5 @@
 @interface FlutterMouseCursorPlugin : NSObject <FlutterPlugin>
 
 @end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERMOUSECURSORPLUGIN_H_
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterMutatorView.h b/shell/platform/darwin/macos/framework/Source/FlutterMutatorView.h
new file mode 100644
index 0000000000000000000000000000000000000000..d970a66e055b38839c53aed76ac27824de4c6c67
--- /dev/null
+++ b/shell/platform/darwin/macos/framework/Source/FlutterMutatorView.h
@@ -0,0 +1,57 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERMUTATORVIEW_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERMUTATORVIEW_H_
+
+#import <Cocoa/Cocoa.h>
+#include <vector>
+
+#include "flutter/shell/platform/embedder/embedder.h"
+
+namespace flutter {
+
+/// Represents a platform view layer, including all mutations.
+class PlatformViewLayer {
+ public:
+  /// Creates platform view from provided FlutterLayer, which must be
+  /// of type kFlutterLayerContentTypePlatformView.
+  explicit PlatformViewLayer(const FlutterLayer* _Nonnull layer);
+
+  PlatformViewLayer(FlutterPlatformViewIdentifier identifier,
+                    const std::vector<FlutterPlatformViewMutation>& mutations,
+                    FlutterPoint offset,
+                    FlutterSize size);
+
+  FlutterPlatformViewIdentifier identifier() const { return identifier_; }
+  const std::vector<FlutterPlatformViewMutation>& mutations() const { return mutations_; }
+  FlutterPoint offset() const { return offset_; }
+  FlutterSize size() const { return size_; }
+
+ private:
+  FlutterPlatformViewIdentifier identifier_;
+  std::vector<FlutterPlatformViewMutation> mutations_;
+  FlutterPoint offset_;
+  FlutterSize size_;
+};
+}  // namespace flutter
+
+/// FlutterMutatorView contains platform view and is responsible for applying
+/// FlutterLayer mutations to it.
+@interface FlutterMutatorView : NSView
+
+/// Designated initializer.
+- (nonnull instancetype)initWithPlatformView:(nonnull NSView*)platformView;
+
+/// Returns wrapped platform view.
+@property(readonly, nonnull) NSView* platformView;
+
+/// Applies mutations from FlutterLayer to the platform view. This may involve
+/// creating or removing intermediate subviews depending on current state and
+/// requested mutations.
+- (void)applyFlutterLayer:(nonnull const flutter::PlatformViewLayer*)layer;
+
+@end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERMUTATORVIEW_H_
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterMutatorView.mm b/shell/platform/darwin/macos/framework/Source/FlutterMutatorView.mm
new file mode 100644
index 0000000000000000000000000000000000000000..9e5a3e5fe084e88462e726753deb8a4e33def3e3
--- /dev/null
+++ b/shell/platform/darwin/macos/framework/Source/FlutterMutatorView.mm
@@ -0,0 +1,540 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterMutatorView.h"
+
+#include <QuartzCore/QuartzCore.h>
+#include <vector>
+
+#include "flutter/fml/logging.h"
+#include "flutter/shell/platform/embedder/embedder.h"
+
+#import "flutter/shell/platform/darwin/macos/framework/Source/NSView+ClipsToBounds.h"
+
+namespace flutter {
+PlatformViewLayer::PlatformViewLayer(const FlutterLayer* layer) {
+  FML_CHECK(layer->type == kFlutterLayerContentTypePlatformView);
+  const auto* platform_view = layer->platform_view;
+  identifier_ = platform_view->identifier;
+  for (size_t i = 0; i < platform_view->mutations_count; i++) {
+    mutations_.push_back(*platform_view->mutations[i]);
+  }
+  offset_ = layer->offset;
+  size_ = layer->size;
+}
+PlatformViewLayer::PlatformViewLayer(FlutterPlatformViewIdentifier identifier,
+                                     const std::vector<FlutterPlatformViewMutation>& mutations,
+                                     FlutterPoint offset,
+                                     FlutterSize size)
+    : identifier_(identifier), mutations_(mutations), offset_(offset), size_(size) {}
+}  // namespace flutter
+
+@interface FlutterMutatorView () {
+  // Each of these views clips to a CGPathRef. These views, if present,
+  // are nested (first is child of FlutterMutatorView and last is parent of
+  // _platformView).
+  NSMutableArray* _pathClipViews;
+
+  // View right above the platform view. Used to apply the final transform
+  // (sans the translation) to the platform view.
+  NSView* _platformViewContainer;
+
+  NSView* _platformView;
+}
+
+@end
+
+/// Superview container for platform views, to which sublayer transforms are applied.
+@interface FlutterPlatformViewContainer : NSView
+@end
+
+@implementation FlutterPlatformViewContainer
+
+- (BOOL)isFlipped {
+  // Flutter transforms assume a coordinate system with an upper-left corner origin, with y
+  // coordinate values increasing downwards. This affects the view, view transforms, and
+  // sublayerTransforms.
+  return YES;
+}
+
+@end
+
+/// View that clips that content to a specific CGPathRef.
+/// Clipping is done through a CAShapeLayer mask, which avoids the need to
+/// rasterize the mask.
+@interface FlutterPathClipView : NSView
+
+@end
+
+@implementation FlutterPathClipView
+
+- (instancetype)initWithFrame:(NSRect)frameRect {
+  if (self = [super initWithFrame:frameRect]) {
+    self.wantsLayer = YES;
+  }
+  return self;
+}
+
+- (BOOL)isFlipped {
+  // Flutter transforms assume a coordinate system with an upper-left corner origin, with y
+  // coordinate values increasing downwards. This affects the view, view transforms, and
+  // sublayerTransforms.
+  return YES;
+}
+
+/// Clip the view to the given path. Offset top left corner of platform view
+/// in global logical coordinates.
+- (void)maskToPath:(CGPathRef)path withOrigin:(CGPoint)origin {
+  CAShapeLayer* maskLayer = self.layer.mask;
+  if (maskLayer == nil) {
+    maskLayer = [CAShapeLayer layer];
+    self.layer.mask = maskLayer;
+  }
+  maskLayer.path = path;
+  maskLayer.transform = CATransform3DMakeTranslation(-origin.x, -origin.y, 0);
+}
+
+@end
+
+namespace {
+CATransform3D ToCATransform3D(const FlutterTransformation& t) {
+  CATransform3D transform = CATransform3DIdentity;
+  transform.m11 = t.scaleX;
+  transform.m21 = t.skewX;
+  transform.m41 = t.transX;
+  transform.m14 = t.pers0;
+  transform.m12 = t.skewY;
+  transform.m22 = t.scaleY;
+  transform.m42 = t.transY;
+  transform.m24 = t.pers1;
+  return transform;
+}
+
+bool AffineTransformIsOnlyScaleOrTranslate(const CGAffineTransform& transform) {
+  return transform.b == 0 && transform.c == 0;
+}
+
+bool IsZeroSize(const FlutterSize size) {
+  return size.width == 0 && size.height == 0;
+}
+
+CGRect FromFlutterRect(const FlutterRect& rect) {
+  return CGRectMake(rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top);
+}
+
+FlutterRect ToFlutterRect(const CGRect& rect) {
+  return FlutterRect{
+      .left = rect.origin.x,
+      .top = rect.origin.y,
+      .right = rect.origin.x + rect.size.width,
+      .bottom = rect.origin.y + rect.size.height,
+
+  };
+}
+
+/// Returns whether the point is inside ellipse with given radius (centered at 0, 0).
+bool PointInsideEllipse(const CGPoint& point, const FlutterSize& radius) {
+  return (point.x * point.x) / (radius.width * radius.width) +
+             (point.y * point.y) / (radius.height * radius.height) <
+         1.0;
+}
+
+bool RoundRectCornerIntersects(const FlutterRoundedRect& roundRect, const FlutterRect& rect) {
+  // Inner coordinate of the top left corner of the round rect.
+  CGPoint inner_top_left =
+      CGPointMake(roundRect.rect.left + roundRect.upper_left_corner_radius.width,
+                  roundRect.rect.top + roundRect.upper_left_corner_radius.height);
+
+  // Position of `rect` corner relative to inner_top_left.
+  CGPoint relative_top_left =
+      CGPointMake(rect.left - inner_top_left.x, rect.top - inner_top_left.y);
+
+  // `relative_top_left` is in upper left quadrant.
+  if (relative_top_left.x < 0 && relative_top_left.y < 0) {
+    if (!PointInsideEllipse(relative_top_left, roundRect.upper_left_corner_radius)) {
+      return true;
+    }
+  }
+
+  // Inner coordinate of the top right corner of the round rect.
+  CGPoint inner_top_right =
+      CGPointMake(roundRect.rect.right - roundRect.upper_right_corner_radius.width,
+                  roundRect.rect.top + roundRect.upper_right_corner_radius.height);
+
+  // Positon of `rect` corner relative to inner_top_right.
+  CGPoint relative_top_right =
+      CGPointMake(rect.right - inner_top_right.x, rect.top - inner_top_right.y);
+
+  // `relative_top_right` is in top right quadrant.
+  if (relative_top_right.x > 0 && relative_top_right.y < 0) {
+    if (!PointInsideEllipse(relative_top_right, roundRect.upper_right_corner_radius)) {
+      return true;
+    }
+  }
+
+  // Inner coordinate of the bottom left corner of the round rect.
+  CGPoint inner_bottom_left =
+      CGPointMake(roundRect.rect.left + roundRect.lower_left_corner_radius.width,
+                  roundRect.rect.bottom - roundRect.lower_left_corner_radius.height);
+
+  // Position of `rect` corner relative to inner_bottom_left.
+  CGPoint relative_bottom_left =
+      CGPointMake(rect.left - inner_bottom_left.x, rect.bottom - inner_bottom_left.y);
+
+  // `relative_bottom_left` is in bottom left quadrant.
+  if (relative_bottom_left.x < 0 && relative_bottom_left.y > 0) {
+    if (!PointInsideEllipse(relative_bottom_left, roundRect.lower_left_corner_radius)) {
+      return true;
+    }
+  }
+
+  // Inner coordinate of the bottom right corner of the round rect.
+  CGPoint inner_bottom_right =
+      CGPointMake(roundRect.rect.right - roundRect.lower_right_corner_radius.width,
+                  roundRect.rect.bottom - roundRect.lower_right_corner_radius.height);
+
+  // Position of `rect` corner relative to inner_bottom_right.
+  CGPoint relative_bottom_right =
+      CGPointMake(rect.right - inner_bottom_right.x, rect.bottom - inner_bottom_right.y);
+
+  // `relative_bottom_right` is in bottom right quadrant.
+  if (relative_bottom_right.x > 0 && relative_bottom_right.y > 0) {
+    if (!PointInsideEllipse(relative_bottom_right, roundRect.lower_right_corner_radius)) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+CGPathRef PathFromRoundedRect(const FlutterRoundedRect& roundedRect) {
+  if (IsZeroSize(roundedRect.lower_left_corner_radius) &&
+      IsZeroSize(roundedRect.lower_right_corner_radius) &&
+      IsZeroSize(roundedRect.upper_left_corner_radius) &&
+      IsZeroSize(roundedRect.upper_right_corner_radius)) {
+    return CGPathCreateWithRect(FromFlutterRect(roundedRect.rect), nullptr);
+  }
+
+  CGMutablePathRef path = CGPathCreateMutable();
+
+  const auto& rect = roundedRect.rect;
+  const auto& topLeft = roundedRect.upper_left_corner_radius;
+  const auto& topRight = roundedRect.upper_right_corner_radius;
+  const auto& bottomLeft = roundedRect.lower_left_corner_radius;
+  const auto& bottomRight = roundedRect.lower_right_corner_radius;
+
+  CGPathMoveToPoint(path, nullptr, rect.left + topLeft.width, rect.top);
+  CGPathAddLineToPoint(path, nullptr, rect.right - topRight.width, rect.top);
+  CGPathAddCurveToPoint(path, nullptr, rect.right, rect.top, rect.right, rect.top + topRight.height,
+                        rect.right, rect.top + topRight.height);
+  CGPathAddLineToPoint(path, nullptr, rect.right, rect.bottom - bottomRight.height);
+  CGPathAddCurveToPoint(path, nullptr, rect.right, rect.bottom, rect.right - bottomRight.width,
+                        rect.bottom, rect.right - bottomRight.width, rect.bottom);
+  CGPathAddLineToPoint(path, nullptr, rect.left + bottomLeft.width, rect.bottom);
+  CGPathAddCurveToPoint(path, nullptr, rect.left, rect.bottom, rect.left,
+                        rect.bottom - bottomLeft.height, rect.left,
+                        rect.bottom - bottomLeft.height);
+  CGPathAddLineToPoint(path, nullptr, rect.left, rect.top + topLeft.height);
+  CGPathAddCurveToPoint(path, nullptr, rect.left, rect.top, rect.left + topLeft.width, rect.top,
+                        rect.left + topLeft.width, rect.top);
+  CGPathCloseSubpath(path);
+  return path;
+}
+
+using MutationVector = std::vector<FlutterPlatformViewMutation>;
+
+/// Returns a vector of FlutterPlatformViewMutation object pointers associated with a platform view.
+/// The transforms sent from the engine include a transform from logical to physical coordinates.
+/// Since Cocoa deals only in logical points, this function prepends a scale transform that scales
+/// back from physical to logical coordinates to compensate.
+MutationVector MutationsForPlatformView(const MutationVector& mutationsIn, float scale) {
+  MutationVector mutations(mutationsIn);
+
+  mutations.insert(mutations.begin(), {
+                                          .type = kFlutterPlatformViewMutationTypeTransformation,
+                                          .transformation{
+                                              .scaleX = 1.0 / scale,
+                                              .scaleY = 1.0 / scale,
+                                          },
+                                      });
+  return mutations;
+}
+
+/// Returns the composition of all transformation mutations in the mutations vector.
+CATransform3D CATransformFromMutations(const MutationVector& mutations) {
+  CATransform3D transform = CATransform3DIdentity;
+  for (auto mutation : mutations) {
+    switch (mutation.type) {
+      case kFlutterPlatformViewMutationTypeTransformation: {
+        CATransform3D mutationTransform = ToCATransform3D(mutation.transformation);
+        transform = CATransform3DConcat(mutationTransform, transform);
+        break;
+      }
+      case kFlutterPlatformViewMutationTypeClipRect:
+      case kFlutterPlatformViewMutationTypeClipRoundedRect:
+      case kFlutterPlatformViewMutationTypeOpacity:
+        break;
+    }
+  }
+  return transform;
+}
+
+/// Returns the opacity for all opacity mutations in the mutations vector.
+float OpacityFromMutations(const MutationVector& mutations) {
+  float opacity = 1.0;
+  for (auto mutation : mutations) {
+    switch (mutation.type) {
+      case kFlutterPlatformViewMutationTypeOpacity:
+        opacity *= mutation.opacity;
+        break;
+      case kFlutterPlatformViewMutationTypeClipRect:
+      case kFlutterPlatformViewMutationTypeClipRoundedRect:
+      case kFlutterPlatformViewMutationTypeTransformation:
+        break;
+    }
+  }
+  return opacity;
+}
+
+/// Returns the clip rect generated by the intersection of clips in the mutations vector.
+CGRect MasterClipFromMutations(CGRect bounds, const MutationVector& mutations) {
+  // Master clip in global logical coordinates. This is intersection of all clip rectangles
+  // present in mutators.
+  CGRect master_clip = bounds;
+
+  // Create the initial transform.
+  CATransform3D transform = CATransform3DIdentity;
+  for (auto mutation : mutations) {
+    switch (mutation.type) {
+      case kFlutterPlatformViewMutationTypeClipRect: {
+        CGRect rect = CGRectApplyAffineTransform(FromFlutterRect(mutation.clip_rect),
+                                                 CATransform3DGetAffineTransform(transform));
+        master_clip = CGRectIntersection(rect, master_clip);
+        break;
+      }
+      case kFlutterPlatformViewMutationTypeClipRoundedRect: {
+        CGAffineTransform affineTransform = CATransform3DGetAffineTransform(transform);
+        CGRect rect = CGRectApplyAffineTransform(FromFlutterRect(mutation.clip_rounded_rect.rect),
+                                                 affineTransform);
+        master_clip = CGRectIntersection(rect, master_clip);
+        break;
+      }
+      case kFlutterPlatformViewMutationTypeTransformation:
+        transform = CATransform3DConcat(ToCATransform3D(mutation.transformation), transform);
+        break;
+      case kFlutterPlatformViewMutationTypeOpacity:
+        break;
+    }
+  }
+  return master_clip;
+}
+
+/// A rounded rectangle and transform associated with it.
+typedef struct {
+  FlutterRoundedRect rrect;
+  CGAffineTransform transform;
+} ClipRoundedRect;
+
+/// Returns the set of all rounded rect paths generated by clips in the mutations vector.
+NSMutableArray* ClipPathFromMutations(CGRect master_clip, const MutationVector& mutations) {
+  std::vector<ClipRoundedRect> rounded_rects;
+
+  CATransform3D transform = CATransform3DIdentity;
+  for (auto mutation : mutations) {
+    switch (mutation.type) {
+      case kFlutterPlatformViewMutationTypeClipRoundedRect: {
+        CGAffineTransform affineTransform = CATransform3DGetAffineTransform(transform);
+        rounded_rects.push_back({mutation.clip_rounded_rect, affineTransform});
+        break;
+      }
+      case kFlutterPlatformViewMutationTypeTransformation:
+        transform = CATransform3DConcat(ToCATransform3D(mutation.transformation), transform);
+        break;
+      case kFlutterPlatformViewMutationTypeClipRect: {
+        CGAffineTransform affineTransform = CATransform3DGetAffineTransform(transform);
+        // Shearing or rotation requires path clipping.
+        if (!AffineTransformIsOnlyScaleOrTranslate(affineTransform)) {
+          rounded_rects.push_back(
+              {FlutterRoundedRect{mutation.clip_rect, FlutterSize{0, 0}, FlutterSize{0, 0},
+                                  FlutterSize{0, 0}, FlutterSize{0, 0}},
+               affineTransform});
+        }
+        break;
+      }
+      case kFlutterPlatformViewMutationTypeOpacity:
+        break;
+    }
+  }
+
+  NSMutableArray* paths = [NSMutableArray array];
+  for (const auto& r : rounded_rects) {
+    bool requiresPath = !AffineTransformIsOnlyScaleOrTranslate(r.transform);
+    if (!requiresPath) {
+      CGAffineTransform inverse = CGAffineTransformInvert(r.transform);
+      // Transform master clip to clip rect coordinates and check if this view intersects one of the
+      // corners, which means we need to use path clipping.
+      CGRect localMasterClip = CGRectApplyAffineTransform(master_clip, inverse);
+      requiresPath = RoundRectCornerIntersects(r.rrect, ToFlutterRect(localMasterClip));
+    }
+
+    // Only clip to rounded rectangle path if the view intersects some of the round corners. If
+    // not, clipping to masterClip is enough.
+    if (requiresPath) {
+      CGPathRef path = PathFromRoundedRect(r.rrect);
+      CGPathRef transformedPath = CGPathCreateCopyByTransformingPath(path, &r.transform);
+      [paths addObject:(__bridge id)transformedPath];
+      CGPathRelease(transformedPath);
+      CGPathRelease(path);
+    }
+  }
+  return paths;
+}
+}  // namespace
+
+@implementation FlutterMutatorView
+
+- (NSView*)platformView {
+  return _platformView;
+}
+
+- (NSMutableArray*)pathClipViews {
+  return _pathClipViews;
+}
+
+- (NSView*)platformViewContainer {
+  return _platformViewContainer;
+}
+
+- (instancetype)initWithPlatformView:(NSView*)platformView {
+  if (self = [super initWithFrame:NSZeroRect]) {
+    _platformView = platformView;
+    _pathClipViews = [NSMutableArray array];
+    self.wantsLayer = YES;
+    self.clipsToBounds = YES;
+  }
+  return self;
+}
+
+- (NSView*)hitTest:(NSPoint)point {
+  return nil;
+}
+
+- (BOOL)isFlipped {
+  return YES;
+}
+
+/// Returns the scale factor to translate logical pixels to physical pixels for this view.
+- (CGFloat)contentsScale {
+  return self.superview != nil ? self.superview.layer.contentsScale : 1.0;
+}
+
+/// Updates the nested stack of clip views that host the platform view.
+- (void)updatePathClipViewsWithPaths:(NSArray*)paths {
+  // Remove path clip views depending on the number of paths.
+  while (_pathClipViews.count > paths.count) {
+    NSView* view = _pathClipViews.lastObject;
+    [view removeFromSuperview];
+    [_pathClipViews removeLastObject];
+  }
+  // Otherwise, add path clip views to the end.
+  for (size_t i = _pathClipViews.count; i < paths.count; ++i) {
+    NSView* superView = _pathClipViews.count == 0 ? self : _pathClipViews.lastObject;
+    FlutterPathClipView* pathClipView = [[FlutterPathClipView alloc] initWithFrame:self.bounds];
+    [_pathClipViews addObject:pathClipView];
+    [superView addSubview:pathClipView];
+  }
+  // Update bounds and apply clip paths.
+  for (size_t i = 0; i < _pathClipViews.count; ++i) {
+    FlutterPathClipView* pathClipView = _pathClipViews[i];
+    pathClipView.frame = self.bounds;
+    [pathClipView maskToPath:(__bridge CGPathRef)[paths objectAtIndex:i]
+                  withOrigin:self.frame.origin];
+  }
+}
+
+/// Updates the PlatformView and PlatformView container views.
+///
+/// Re-nests _platformViewContainer in the innermost clip view, applies transforms to the underlying
+/// CALayer, adds the platform view as a subview of the container, and sets the axis-aligned clip
+/// rect around the tranformed view.
+- (void)updatePlatformViewWithBounds:(CGRect)untransformedBounds
+                   transformedBounds:(CGRect)transformedBounds
+                           transform:(CATransform3D)transform
+                            clipRect:(CGRect)clipRect {
+  // Create the PlatformViewContainer view if necessary.
+  if (_platformViewContainer == nil) {
+    _platformViewContainer = [[FlutterPlatformViewContainer alloc] initWithFrame:self.bounds];
+    _platformViewContainer.wantsLayer = YES;
+  }
+
+  // Nest the PlatformViewContainer view in the innermost path clip view.
+  NSView* containerSuperview = _pathClipViews.count == 0 ? self : _pathClipViews.lastObject;
+  [containerSuperview addSubview:_platformViewContainer];
+  _platformViewContainer.frame = self.bounds;
+
+  // Nest the platform view in the PlatformViewContainer.
+  [_platformViewContainer addSubview:_platformView];
+  _platformView.frame = untransformedBounds;
+
+  // Transform for the platform view is finalTransform adjusted for bounding rect origin.
+  CATransform3D translation =
+      CATransform3DMakeTranslation(-transformedBounds.origin.x, -transformedBounds.origin.y, 0);
+  transform = CATransform3DConcat(transform, translation);
+  _platformViewContainer.layer.sublayerTransform = transform;
+
+  // By default NSView clips children to frame. If masterClip is tighter than mutator view frame,
+  // the frame is set to masterClip and child offset adjusted to compensate for the difference.
+  if (!CGRectEqualToRect(clipRect, transformedBounds)) {
+    FML_DCHECK(self.subviews.count == 1);
+    auto subview = self.subviews.firstObject;
+    FML_DCHECK(subview.frame.origin.x == 0 && subview.frame.origin.y == 0);
+    subview.frame = CGRectMake(transformedBounds.origin.x - clipRect.origin.x,
+                               transformedBounds.origin.y - clipRect.origin.y,
+                               subview.frame.size.width, subview.frame.size.height);
+    self.frame = clipRect;
+  }
+}
+
+/// Whenever possible view will be clipped using layer bounds.
+/// If clipping to path is needed, CAShapeLayer(s) will be used as mask.
+/// Clipping to round rect only clips to path if round corners are intersected.
+- (void)applyFlutterLayer:(const flutter::PlatformViewLayer*)layer {
+  // Compute the untransformed bounding rect for the platform view in logical pixels.
+  // FlutterLayer.size is in physical pixels but Cocoa uses logical points.
+  CGFloat scale = [self contentsScale];
+  MutationVector mutations = MutationsForPlatformView(layer->mutations(), scale);
+
+  CATransform3D finalTransform = CATransformFromMutations(mutations);
+
+  // Compute the untransformed bounding rect for the platform view in logical pixels.
+  // FlutterLayer.size is in physical pixels but Cocoa uses logical points.
+  CGRect untransformedBoundingRect =
+      CGRectMake(0, 0, layer->size().width / scale, layer->size().height / scale);
+  CGRect finalBoundingRect = CGRectApplyAffineTransform(
+      untransformedBoundingRect, CATransform3DGetAffineTransform(finalTransform));
+  self.frame = finalBoundingRect;
+
+  // Compute the layer opacity.
+  self.layer.opacity = OpacityFromMutations(mutations);
+
+  // Compute the master clip in global logical coordinates.
+  CGRect masterClip = MasterClipFromMutations(finalBoundingRect, mutations);
+  if (CGRectIsNull(masterClip)) {
+    self.hidden = YES;
+    return;
+  }
+  self.hidden = NO;
+
+  /// Paths in global logical coordinates that need to be clipped to.
+  NSMutableArray* paths = ClipPathFromMutations(masterClip, mutations);
+  [self updatePathClipViewsWithPaths:paths];
+
+  /// Update PlatformViewContainer, PlatformView, and apply transforms and axis-aligned clip rect.
+  [self updatePlatformViewWithBounds:untransformedBoundingRect
+                   transformedBounds:finalBoundingRect
+                           transform:finalTransform
+                            clipRect:masterClip];
+}
+
+@end
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterMutatorViewTest.mm b/shell/platform/darwin/macos/framework/Source/FlutterMutatorViewTest.mm
new file mode 100644
index 0000000000000000000000000000000000000000..6d6b6b21c40249cc3e9b97a5c41b066a87774b3b
--- /dev/null
+++ b/shell/platform/darwin/macos/framework/Source/FlutterMutatorViewTest.mm
@@ -0,0 +1,534 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterMutatorView.h"
+
+#include "third_party/googletest/googletest/include/gtest/gtest.h"
+
+#import "flutter/shell/platform/darwin/macos/framework/Source/NSView+ClipsToBounds.h"
+
+@interface FlutterMutatorView (Private)
+
+@property(readonly, nonatomic, nonnull) NSMutableArray<NSView*>* pathClipViews;
+@property(readonly, nonatomic, nullable) NSView* platformViewContainer;
+
+@end
+
+static constexpr float kMaxErr = 1e-10;
+
+namespace {
+void ApplyFlutterLayer(FlutterMutatorView* view,
+                       FlutterSize size,
+                       const std::vector<FlutterPlatformViewMutation>& mutations) {
+  flutter::PlatformViewLayer layer(0,  // identifier
+                                   mutations,
+                                   // Offset is ignored by mutator view, the bounding rect is
+                                   // determined by width and transform.
+                                   FlutterPoint{0, 0},  // offset
+                                   size);
+
+  [view applyFlutterLayer:&layer];
+}
+
+// Expect that each element within two CATransform3Ds is within an error bound.
+//
+// In order to avoid architecture-specific floating point differences we don't check for exact
+// equality using, for example, CATransform3DEqualToTransform.
+void ExpectTransform3DEqual(const CATransform3D& t, const CATransform3D& u) {
+  EXPECT_NEAR(t.m11, u.m11, kMaxErr);
+  EXPECT_NEAR(t.m12, u.m12, kMaxErr);
+  EXPECT_NEAR(t.m13, u.m13, kMaxErr);
+  EXPECT_NEAR(t.m14, u.m14, kMaxErr);
+
+  EXPECT_NEAR(t.m21, u.m21, kMaxErr);
+  EXPECT_NEAR(t.m22, u.m22, kMaxErr);
+  EXPECT_NEAR(t.m23, u.m23, kMaxErr);
+  EXPECT_NEAR(t.m24, u.m24, kMaxErr);
+
+  EXPECT_NEAR(t.m31, u.m31, kMaxErr);
+  EXPECT_NEAR(t.m32, u.m32, kMaxErr);
+  EXPECT_NEAR(t.m33, u.m33, kMaxErr);
+  EXPECT_NEAR(t.m34, u.m34, kMaxErr);
+
+  EXPECT_NEAR(t.m41, u.m41, kMaxErr);
+  EXPECT_NEAR(t.m42, u.m42, kMaxErr);
+  EXPECT_NEAR(t.m43, u.m43, kMaxErr);
+  EXPECT_NEAR(t.m44, u.m44, kMaxErr);
+}
+}  // namespace
+
+TEST(FlutterMutatorViewTest, BasicFrameIsCorrect) {
+  NSView* platformView = [[NSView alloc] init];
+  FlutterMutatorView* mutatorView = [[FlutterMutatorView alloc] initWithPlatformView:platformView];
+
+  EXPECT_EQ(mutatorView.platformView, platformView);
+
+  std::vector<FlutterPlatformViewMutation> mutations{
+      {
+          .type = kFlutterPlatformViewMutationTypeTransformation,
+          .transformation =
+              FlutterTransformation{
+                  .scaleX = 1,
+                  .transX = 100,
+                  .scaleY = 1,
+                  .transY = 50,
+              },
+      },
+  };
+
+  ApplyFlutterLayer(mutatorView, FlutterSize{30, 20}, mutations);
+
+  EXPECT_TRUE(CGRectEqualToRect(mutatorView.frame, CGRectMake(100, 50, 30, 20)));
+  EXPECT_TRUE(CGRectEqualToRect(platformView.frame, CGRectMake(0, 0, 30, 20)));
+  EXPECT_EQ(mutatorView.pathClipViews.count, 0ull);
+  EXPECT_NE(mutatorView.platformViewContainer, nil);
+}
+
+TEST(FlutterMutatorViewTest, ClipsToBounds) {
+  NSView* platformView = [[NSView alloc] init];
+  FlutterMutatorView* mutatorView = [[FlutterMutatorView alloc] initWithPlatformView:platformView];
+  EXPECT_TRUE(mutatorView.clipsToBounds);
+}
+
+TEST(FlutterMutatorViewTest, TransformedFrameIsCorrect) {
+  NSView* platformView = [[NSView alloc] init];
+  FlutterMutatorView* mutatorView = [[FlutterMutatorView alloc] initWithPlatformView:platformView];
+  NSView* mutatorViewParent = [[NSView alloc] init];
+  mutatorViewParent.wantsLayer = YES;
+  mutatorViewParent.layer.contentsScale = 2.0;
+  [mutatorViewParent addSubview:mutatorView];
+
+  std::vector<FlutterPlatformViewMutation> mutations{
+      {
+          .type = kFlutterPlatformViewMutationTypeTransformation,
+          .transformation =
+              FlutterTransformation{
+                  .scaleX = 2,
+                  .scaleY = 2,
+              },
+      },
+      {
+          .type = kFlutterPlatformViewMutationTypeTransformation,
+          .transformation =
+              FlutterTransformation{
+                  .scaleX = 1,
+                  .transX = 100,
+                  .scaleY = 1,
+                  .transY = 50,
+              },
+      },
+      {
+          .type = kFlutterPlatformViewMutationTypeTransformation,
+          .transformation =
+              FlutterTransformation{
+                  .scaleX = 1.5,
+                  .transX = -7.5,
+                  .scaleY = 1.5,
+                  .transY = -5,
+              },
+      },
+  };
+
+  // PlatformView size form engine comes in physical pixels
+  ApplyFlutterLayer(mutatorView, FlutterSize{30 * 2, 20 * 2}, mutations);
+  EXPECT_TRUE(CGRectEqualToRect(mutatorView.frame, CGRectMake(92.5, 45, 45, 30)));
+  EXPECT_TRUE(CGRectEqualToRect(platformView.frame, CGRectMake(0, 0, 30, 20)));
+
+  ExpectTransform3DEqual(mutatorView.platformViewContainer.layer.sublayerTransform,
+                         CATransform3DMakeScale(1.5, 1.5, 1));
+}
+
+TEST(FlutterMutatorViewTest, FrameWithLooseClipIsCorrect) {
+  NSView* platformView = [[NSView alloc] init];
+  FlutterMutatorView* mutatorView = [[FlutterMutatorView alloc] initWithPlatformView:platformView];
+
+  EXPECT_EQ(mutatorView.platformView, platformView);
+
+  std::vector<FlutterPlatformViewMutation> mutations{
+      {
+          .type = kFlutterPlatformViewMutationTypeClipRect,
+          .clip_rect = FlutterRect{80, 40, 200, 100},
+      },
+      {
+          .type = kFlutterPlatformViewMutationTypeTransformation,
+          .transformation =
+              FlutterTransformation{
+                  .scaleX = 1,
+                  .transX = 100,
+                  .scaleY = 1,
+                  .transY = 50,
+              },
+      },
+  };
+
+  ApplyFlutterLayer(mutatorView, FlutterSize{30, 20}, mutations);
+
+  EXPECT_TRUE(CGRectEqualToRect(mutatorView.frame, CGRectMake(100, 50, 30, 20)));
+  EXPECT_TRUE(CGRectEqualToRect(platformView.frame, CGRectMake(0, 0, 30, 20)));
+}
+
+TEST(FlutterMutatorViewTest, FrameWithTightClipIsCorrect) {
+  NSView* platformView = [[NSView alloc] init];
+  FlutterMutatorView* mutatorView = [[FlutterMutatorView alloc] initWithPlatformView:platformView];
+
+  EXPECT_EQ(mutatorView.platformView, platformView);
+
+  std::vector<FlutterPlatformViewMutation> mutations{
+      {
+          .type = kFlutterPlatformViewMutationTypeClipRect,
+          .clip_rect = FlutterRect{80, 40, 200, 100},
+      },
+      {
+          .type = kFlutterPlatformViewMutationTypeClipRect,
+          .clip_rect = FlutterRect{110, 55, 120, 65},
+      },
+      {
+          .type = kFlutterPlatformViewMutationTypeTransformation,
+          .transformation =
+              FlutterTransformation{
+                  .scaleX = 1,
+                  .transX = 100,
+                  .scaleY = 1,
+                  .transY = 50,
+              },
+      },
+  };
+
+  ApplyFlutterLayer(mutatorView, FlutterSize{30, 20}, mutations);
+
+  EXPECT_TRUE(CGRectEqualToRect(mutatorView.frame, CGRectMake(110, 55, 10, 10)));
+  EXPECT_TRUE(
+      CGRectEqualToRect(mutatorView.subviews.firstObject.frame, CGRectMake(-10, -5, 30, 20)));
+  EXPECT_TRUE(CGRectEqualToRect(platformView.frame, CGRectMake(0, 0, 30, 20)));
+}
+
+TEST(FlutterMutatorViewTest, FrameWithTightClipAndTransformIsCorrect) {
+  NSView* platformView = [[NSView alloc] init];
+  FlutterMutatorView* mutatorView = [[FlutterMutatorView alloc] initWithPlatformView:platformView];
+  NSView* mutatorViewParent = [[NSView alloc] init];
+  mutatorViewParent.wantsLayer = YES;
+  mutatorViewParent.layer.contentsScale = 2.0;
+  [mutatorViewParent addSubview:mutatorView];
+
+  std::vector<FlutterPlatformViewMutation> mutations{
+      {
+          .type = kFlutterPlatformViewMutationTypeTransformation,
+          .transformation =
+              FlutterTransformation{
+                  .scaleX = 2,
+                  .scaleY = 2,
+              },
+      },
+      {
+          .type = kFlutterPlatformViewMutationTypeClipRect,
+          .clip_rect = FlutterRect{80, 40, 200, 100},
+      },
+      {
+          .type = kFlutterPlatformViewMutationTypeClipRect,
+          .clip_rect = FlutterRect{110, 55, 120, 65},
+      },
+      {
+          .type = kFlutterPlatformViewMutationTypeTransformation,
+          .transformation =
+              FlutterTransformation{
+                  .scaleX = 1,
+                  .transX = 100,
+                  .scaleY = 1,
+                  .transY = 50,
+              },
+      },
+      {
+          .type = kFlutterPlatformViewMutationTypeTransformation,
+          .transformation =
+              FlutterTransformation{
+                  .scaleX = 1.5,
+                  .transX = -7.5,
+                  .scaleY = 1.5,
+                  .transY = -5,
+              },
+      },
+  };
+
+  ApplyFlutterLayer(mutatorView, FlutterSize{30 * 2, 20 * 2}, mutations);
+
+  EXPECT_TRUE(CGRectEqualToRect(mutatorView.frame, CGRectMake(110, 55, 10, 10)));
+  EXPECT_TRUE(
+      CGRectEqualToRect(mutatorView.subviews.firstObject.frame, CGRectMake(-17.5, -10, 45, 30)));
+  EXPECT_TRUE(CGRectEqualToRect(platformView.frame, CGRectMake(0, 0, 30, 20)));
+}
+
+// Rounded rectangle without hitting the corner
+TEST(FlutterMutatorViewTest, RoundRectClipsToSimpleRectangle) {
+  NSView* platformView = [[NSView alloc] init];
+  FlutterMutatorView* mutatorView = [[FlutterMutatorView alloc] initWithPlatformView:platformView];
+
+  std::vector<FlutterPlatformViewMutation> mutations{
+      {
+          .type = kFlutterPlatformViewMutationTypeClipRoundedRect,
+          .clip_rounded_rect =
+              FlutterRoundedRect{
+                  .rect = FlutterRect{110, 30, 120, 90},
+                  .upper_left_corner_radius = FlutterSize{10, 10},
+                  .upper_right_corner_radius = FlutterSize{10, 10},
+                  .lower_right_corner_radius = FlutterSize{10, 10},
+                  .lower_left_corner_radius = FlutterSize{10, 10},
+              },
+      },
+      {
+          .type = kFlutterPlatformViewMutationTypeTransformation,
+          .transformation =
+              FlutterTransformation{
+                  .scaleX = 1,
+                  .transX = 100,
+                  .scaleY = 1,
+                  .transY = 50,
+              },
+      },
+  };
+
+  ApplyFlutterLayer(mutatorView, FlutterSize{30, 20}, mutations);
+
+  EXPECT_TRUE(CGRectEqualToRect(mutatorView.frame, CGRectMake(110, 50, 10, 20)));
+  EXPECT_TRUE(
+      CGRectEqualToRect(mutatorView.subviews.firstObject.frame, CGRectMake(-10, 0, 30, 20)));
+  EXPECT_TRUE(CGRectEqualToRect(platformView.frame, CGRectMake(0, 0, 30, 20)));
+  EXPECT_EQ(mutatorView.pathClipViews.count, 0ul);
+}
+
+// Ensure that the mutator view, clip views, and container all use a flipped y axis. The transforms
+// sent from the framework assume this, and so aside from the consistency with every other embedder,
+// we can avoid a lot of extra math.
+TEST(FlutterMutatorViewTest, ViewsSetIsFlipped) {
+  NSView* platformView = [[NSView alloc] init];
+  FlutterMutatorView* mutatorView = [[FlutterMutatorView alloc] initWithPlatformView:platformView];
+
+  std::vector<FlutterPlatformViewMutation> mutations{
+      {
+          .type = kFlutterPlatformViewMutationTypeClipRoundedRect,
+          .clip_rounded_rect =
+              FlutterRoundedRect{
+                  .rect = FlutterRect{110, 60, 150, 150},
+                  .upper_left_corner_radius = FlutterSize{10, 10},
+                  .upper_right_corner_radius = FlutterSize{10, 10},
+                  .lower_right_corner_radius = FlutterSize{10, 10},
+                  .lower_left_corner_radius = FlutterSize{10, 10},
+              },
+      },
+      {
+          .type = kFlutterPlatformViewMutationTypeTransformation,
+          .transformation =
+              FlutterTransformation{
+                  .scaleX = 1,
+                  .transX = 100,
+                  .scaleY = 1,
+                  .transY = 50,
+              },
+      },
+  };
+
+  ApplyFlutterLayer(mutatorView, FlutterSize{30, 20}, mutations);
+
+  EXPECT_TRUE(mutatorView.isFlipped);
+  ASSERT_EQ(mutatorView.pathClipViews.count, 1ul);
+  EXPECT_TRUE(mutatorView.pathClipViews.firstObject.isFlipped);
+  EXPECT_TRUE(mutatorView.platformViewContainer.isFlipped);
+}
+
+TEST(FlutterMutatorViewTest, RectsClipsToPathWhenRotated) {
+  NSView* platformView = [[NSView alloc] init];
+  FlutterMutatorView* mutatorView = [[FlutterMutatorView alloc] initWithPlatformView:platformView];
+  std::vector<FlutterPlatformViewMutation> mutations{
+      {
+          .type = kFlutterPlatformViewMutationTypeTransformation,
+          // Roation M_PI / 8
+          .transformation =
+              FlutterTransformation{
+                  .scaleX = 0.9238795325112867,
+                  .skewX = -0.3826834323650898,
+                  .skewY = 0.3826834323650898,
+                  .scaleY = 0.9238795325112867,
+              },
+      },
+      {
+          .type = kFlutterPlatformViewMutationTypeClipRect,
+          .clip_rect = FlutterRect{110, 60, 150, 150},
+      },
+      {
+          .type = kFlutterPlatformViewMutationTypeTransformation,
+          .transformation =
+              FlutterTransformation{
+                  .scaleX = 1,
+                  .transX = 100,
+                  .scaleY = 1,
+                  .transY = 50,
+              },
+      },
+  };
+  ApplyFlutterLayer(mutatorView, FlutterSize{30, 20}, mutations);
+  EXPECT_EQ(mutatorView.pathClipViews.count, 1ul);
+  EXPECT_NEAR(mutatorView.platformViewContainer.frame.size.width, 35.370054622640396, kMaxErr);
+  EXPECT_NEAR(mutatorView.platformViewContainer.frame.size.height, 29.958093621178421, kMaxErr);
+}
+
+TEST(FlutterMutatorViewTest, RoundRectClipsToPath) {
+  NSView* platformView = [[NSView alloc] init];
+  FlutterMutatorView* mutatorView = [[FlutterMutatorView alloc] initWithPlatformView:platformView];
+
+  std::vector<FlutterPlatformViewMutation> mutations{
+      {
+          .type = kFlutterPlatformViewMutationTypeClipRoundedRect,
+          .clip_rounded_rect =
+              FlutterRoundedRect{
+                  .rect = FlutterRect{110, 60, 150, 150},
+                  .upper_left_corner_radius = FlutterSize{10, 10},
+                  .upper_right_corner_radius = FlutterSize{10, 10},
+                  .lower_right_corner_radius = FlutterSize{10, 10},
+                  .lower_left_corner_radius = FlutterSize{10, 10},
+              },
+      },
+      {
+          .type = kFlutterPlatformViewMutationTypeTransformation,
+          .transformation =
+              FlutterTransformation{
+                  .scaleX = 1,
+                  .transX = 100,
+                  .scaleY = 1,
+                  .transY = 50,
+              },
+      },
+  };
+
+  ApplyFlutterLayer(mutatorView, FlutterSize{30, 20}, mutations);
+
+  EXPECT_TRUE(CGRectEqualToRect(mutatorView.frame, CGRectMake(110, 60, 20, 10)));
+  EXPECT_TRUE(
+      CGRectEqualToRect(mutatorView.subviews.firstObject.frame, CGRectMake(-10, -10, 30, 20)));
+  EXPECT_TRUE(CGRectEqualToRect(platformView.frame, CGRectMake(0, 0, 30, 20)));
+  EXPECT_EQ(mutatorView.pathClipViews.count, 1ul);
+  ExpectTransform3DEqual(mutatorView.pathClipViews.firstObject.layer.mask.transform,
+                         CATransform3DMakeTranslation(-100, -50, 0));
+}
+
+TEST(FlutterMutatorViewTest, PathClipViewsAreAddedAndRemoved) {
+  NSView* platformView = [[NSView alloc] init];
+  FlutterMutatorView* mutatorView = [[FlutterMutatorView alloc] initWithPlatformView:platformView];
+
+  std::vector<FlutterPlatformViewMutation> mutations{
+      {
+          .type = kFlutterPlatformViewMutationTypeTransformation,
+          .transformation =
+              FlutterTransformation{
+                  .scaleX = 1,
+                  .transX = 100,
+                  .scaleY = 1,
+                  .transY = 50,
+              },
+      },
+  };
+
+  ApplyFlutterLayer(mutatorView, FlutterSize{30, 20}, mutations);
+
+  EXPECT_TRUE(CGRectEqualToRect(mutatorView.frame, CGRectMake(100, 50, 30, 20)));
+  EXPECT_EQ(mutatorView.pathClipViews.count, 0ull);
+
+  std::vector<FlutterPlatformViewMutation> mutations2{
+      {
+          .type = kFlutterPlatformViewMutationTypeClipRoundedRect,
+          .clip_rounded_rect =
+              FlutterRoundedRect{
+                  .rect = FlutterRect{110, 60, 150, 150},
+                  .upper_left_corner_radius = FlutterSize{10, 10},
+                  .upper_right_corner_radius = FlutterSize{10, 10},
+                  .lower_right_corner_radius = FlutterSize{10, 10},
+                  .lower_left_corner_radius = FlutterSize{10, 10},
+              },
+      },
+      {
+          .type = kFlutterPlatformViewMutationTypeTransformation,
+          .transformation =
+              FlutterTransformation{
+                  .scaleX = 1,
+                  .transX = 100,
+                  .scaleY = 1,
+                  .transY = 50,
+              },
+      },
+  };
+
+  ApplyFlutterLayer(mutatorView, FlutterSize{30, 20}, mutations2);
+
+  EXPECT_TRUE(CGRectEqualToRect(mutatorView.frame, CGRectMake(110, 60, 20, 10)));
+  EXPECT_TRUE(
+      CGRectEqualToRect(mutatorView.subviews.firstObject.frame, CGRectMake(-10, -10, 30, 20)));
+  EXPECT_TRUE(CGRectEqualToRect(platformView.frame, CGRectMake(0, 0, 30, 20)));
+  EXPECT_EQ(mutatorView.pathClipViews.count, 1ul);
+
+  EXPECT_EQ(platformView.superview, mutatorView.platformViewContainer);
+  EXPECT_EQ(mutatorView.platformViewContainer.superview, mutatorView.pathClipViews[0]);
+  EXPECT_EQ(mutatorView.pathClipViews[0].superview, mutatorView);
+
+  std::vector<FlutterPlatformViewMutation> mutations3{
+      {
+          .type = kFlutterPlatformViewMutationTypeClipRoundedRect,
+          .clip_rounded_rect =
+              FlutterRoundedRect{
+                  .rect = FlutterRect{110, 55, 150, 150},
+                  .upper_left_corner_radius = FlutterSize{10, 10},
+                  .upper_right_corner_radius = FlutterSize{10, 10},
+                  .lower_right_corner_radius = FlutterSize{10, 10},
+                  .lower_left_corner_radius = FlutterSize{10, 10},
+              },
+      },
+      {
+          .type = kFlutterPlatformViewMutationTypeClipRoundedRect,
+          .clip_rounded_rect =
+              FlutterRoundedRect{
+                  .rect = FlutterRect{30, 30, 120, 65},
+                  .upper_left_corner_radius = FlutterSize{10, 10},
+                  .upper_right_corner_radius = FlutterSize{10, 10},
+                  .lower_right_corner_radius = FlutterSize{10, 10},
+                  .lower_left_corner_radius = FlutterSize{10, 10},
+              },
+      },
+      {
+          .type = kFlutterPlatformViewMutationTypeTransformation,
+          .transformation =
+              FlutterTransformation{
+                  .scaleX = 1,
+                  .transX = 100,
+                  .scaleY = 1,
+                  .transY = 50,
+              },
+      },
+  };
+
+  ApplyFlutterLayer(mutatorView, FlutterSize{30, 20}, mutations3);
+
+  EXPECT_TRUE(CGRectEqualToRect(mutatorView.frame, CGRectMake(110, 55, 10, 10)));
+  EXPECT_TRUE(
+      CGRectEqualToRect(mutatorView.subviews.firstObject.frame, CGRectMake(-10, -5, 30, 20)));
+  EXPECT_EQ(mutatorView.pathClipViews.count, 2ul);
+
+  EXPECT_EQ(platformView.superview, mutatorView.platformViewContainer);
+  EXPECT_EQ(mutatorView.platformViewContainer.superview, mutatorView.pathClipViews[1]);
+  EXPECT_EQ(mutatorView.pathClipViews[1].superview, mutatorView.pathClipViews[0]);
+  EXPECT_EQ(mutatorView.pathClipViews[0].superview, mutatorView);
+
+  ApplyFlutterLayer(mutatorView, FlutterSize{30, 20}, mutations2);
+
+  EXPECT_TRUE(CGRectEqualToRect(mutatorView.frame, CGRectMake(110, 60, 20, 10)));
+  EXPECT_TRUE(
+      CGRectEqualToRect(mutatorView.subviews.firstObject.frame, CGRectMake(-10, -10, 30, 20)));
+  EXPECT_TRUE(CGRectEqualToRect(platformView.frame, CGRectMake(0, 0, 30, 20)));
+  EXPECT_EQ(mutatorView.pathClipViews.count, 1ul);
+
+  EXPECT_EQ(platformView.superview, mutatorView.platformViewContainer);
+  EXPECT_EQ(mutatorView.platformViewContainer.superview, mutatorView.pathClipViews[0]);
+  EXPECT_EQ(mutatorView.pathClipViews[0].superview, mutatorView);
+
+  ApplyFlutterLayer(mutatorView, FlutterSize{30, 20}, mutations);
+
+  EXPECT_TRUE(CGRectEqualToRect(mutatorView.frame, CGRectMake(100, 50, 30, 20)));
+  EXPECT_EQ(mutatorView.pathClipViews.count, 0ull);
+}
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterPlatformNodeDelegateMac.h b/shell/platform/darwin/macos/framework/Source/FlutterPlatformNodeDelegateMac.h
index 3c394efd0c97ab093c11cb30c2adca92fcd851a8..71fb34e4627ba5ce6faf90f2c4bff89114c8e2b7 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterPlatformNodeDelegateMac.h
+++ b/shell/platform/darwin/macos/framework/Source/FlutterPlatformNodeDelegateMac.h
@@ -9,6 +9,7 @@
 
 #import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterViewController.h"
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/common/accessibility_bridge.h"
 #include "flutter/shell/platform/common/flutter_platform_node_delegate.h"
 #include "flutter/shell/platform/embedder/embedder.h"
@@ -56,6 +57,8 @@ class FlutterPlatformNodeDelegateMac : public FlutterPlatformNodeDelegate {
       const gfx::RectF& local_bounds) const;
   gfx::RectF ConvertBoundsFromScreenToGlobal(
       const gfx::RectF& window_bounds) const;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(FlutterPlatformNodeDelegateMac);
 };
 
 }  // namespace flutter
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterPlatformNodeDelegateMacTest.mm b/shell/platform/darwin/macos/framework/Source/FlutterPlatformNodeDelegateMacTest.mm
index a5809bef78d924e56be855378a95b34d2e04a598..d7c12689fe7290becb4ab3742eeec73569ff19b5 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterPlatformNodeDelegateMacTest.mm
+++ b/shell/platform/darwin/macos/framework/Source/FlutterPlatformNodeDelegateMacTest.mm
@@ -19,22 +19,23 @@
 namespace flutter::testing {
 
 namespace {
-// Returns an engine configured for the text fixture resource configuration.
-FlutterEngine* CreateTestEngine() {
+// Returns a view controller configured for the text fixture resource configuration.
+FlutterViewController* CreateTestViewController() {
   NSString* fixtures = @(testing::GetFixturesPath());
   FlutterDartProject* project = [[FlutterDartProject alloc]
       initWithAssetsPath:fixtures
              ICUDataPath:[fixtures stringByAppendingString:@"/icudtl.dat"]];
-  return [[FlutterEngine alloc] initWithName:@"test" project:project allowHeadlessExecution:true];
+  return [[FlutterViewController alloc] initWithProject:project];
 }
 }  // namespace
 
 TEST(FlutterPlatformNodeDelegateMac, Basics) {
-  FlutterEngine* engine = CreateTestEngine();
+  FlutterViewController* viewController = CreateTestViewController();
+  FlutterEngine* engine = viewController.engine;
   engine.semanticsEnabled = YES;
-  auto bridge = engine.accessibilityBridge.lock();
+  auto bridge = viewController.accessibilityBridge.lock();
   // Initialize ax node data.
-  FlutterSemanticsNode root;
+  FlutterSemanticsNode2 root;
   root.id = 0;
   root.flags = static_cast<FlutterSemanticsFlag>(0);
   ;
@@ -49,7 +50,7 @@ TEST(FlutterPlatformNodeDelegateMac, Basics) {
   root.tooltip = "";
   root.child_count = 0;
   root.custom_accessibility_actions_count = 0;
-  bridge->AddFlutterSemanticsNodeUpdate(&root);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
 
   bridge->CommitUpdates();
 
@@ -65,11 +66,12 @@ TEST(FlutterPlatformNodeDelegateMac, Basics) {
 }
 
 TEST(FlutterPlatformNodeDelegateMac, SelectableTextHasCorrectSemantics) {
-  FlutterEngine* engine = CreateTestEngine();
+  FlutterViewController* viewController = CreateTestViewController();
+  FlutterEngine* engine = viewController.engine;
   engine.semanticsEnabled = YES;
-  auto bridge = engine.accessibilityBridge.lock();
+  auto bridge = viewController.accessibilityBridge.lock();
   // Initialize ax node data.
-  FlutterSemanticsNode root;
+  FlutterSemanticsNode2 root;
   root.id = 0;
   root.flags =
       static_cast<FlutterSemanticsFlag>(FlutterSemanticsFlag::kFlutterSemanticsFlagIsTextField |
@@ -86,7 +88,7 @@ TEST(FlutterPlatformNodeDelegateMac, SelectableTextHasCorrectSemantics) {
   root.tooltip = "";
   root.child_count = 0;
   root.custom_accessibility_actions_count = 0;
-  bridge->AddFlutterSemanticsNodeUpdate(&root);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
 
   bridge->CommitUpdates();
 
@@ -106,11 +108,12 @@ TEST(FlutterPlatformNodeDelegateMac, SelectableTextHasCorrectSemantics) {
 }
 
 TEST(FlutterPlatformNodeDelegateMac, SelectableTextWithoutSelectionReturnZeroRange) {
-  FlutterEngine* engine = CreateTestEngine();
+  FlutterViewController* viewController = CreateTestViewController();
+  FlutterEngine* engine = viewController.engine;
   engine.semanticsEnabled = YES;
-  auto bridge = engine.accessibilityBridge.lock();
+  auto bridge = viewController.accessibilityBridge.lock();
   // Initialize ax node data.
-  FlutterSemanticsNode root;
+  FlutterSemanticsNode2 root;
   root.id = 0;
   root.flags =
       static_cast<FlutterSemanticsFlag>(FlutterSemanticsFlag::kFlutterSemanticsFlagIsTextField |
@@ -127,7 +130,7 @@ TEST(FlutterPlatformNodeDelegateMac, SelectableTextWithoutSelectionReturnZeroRan
   root.tooltip = "";
   root.child_count = 0;
   root.custom_accessibility_actions_count = 0;
-  bridge->AddFlutterSemanticsNodeUpdate(&root);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
 
   bridge->CommitUpdates();
 
@@ -144,15 +147,8 @@ TEST(FlutterPlatformNodeDelegateMac, SelectableTextWithoutSelectionReturnZeroRan
 // NOLINTBEGIN(clang-analyzer-core.StackAddressEscape)
 
 TEST(FlutterPlatformNodeDelegateMac, CanPerformAction) {
-  FlutterEngine* engine = CreateTestEngine();
-
-  // Set up view controller.
-  NSString* fixtures = @(testing::GetFixturesPath());
-  FlutterDartProject* project = [[FlutterDartProject alloc]
-      initWithAssetsPath:fixtures
-             ICUDataPath:[fixtures stringByAppendingString:@"/icudtl.dat"]];
-  FlutterViewController* viewController = [[FlutterViewController alloc] initWithProject:project];
-  [engine setViewController:viewController];
+  FlutterViewController* viewController = CreateTestViewController();
+  FlutterEngine* engine = viewController.engine;
 
   // Attach the view to a NSWindow.
   NSWindow* window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 800, 600)
@@ -162,9 +158,9 @@ TEST(FlutterPlatformNodeDelegateMac, CanPerformAction) {
   window.contentView = viewController.view;
 
   engine.semanticsEnabled = YES;
-  auto bridge = engine.accessibilityBridge.lock();
+  auto bridge = viewController.accessibilityBridge.lock();
   // Initialize ax node data.
-  FlutterSemanticsNode root;
+  FlutterSemanticsNode2 root;
   root.id = 0;
   root.label = "root";
   root.hint = "";
@@ -176,9 +172,9 @@ TEST(FlutterPlatformNodeDelegateMac, CanPerformAction) {
   int32_t children[] = {1};
   root.children_in_traversal_order = children;
   root.custom_accessibility_actions_count = 0;
-  bridge->AddFlutterSemanticsNodeUpdate(&root);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
 
-  FlutterSemanticsNode child1;
+  FlutterSemanticsNode2 child1;
   child1.id = 1;
   child1.label = "child 1";
   child1.hint = "";
@@ -188,7 +184,7 @@ TEST(FlutterPlatformNodeDelegateMac, CanPerformAction) {
   child1.tooltip = "";
   child1.child_count = 0;
   child1.custom_accessibility_actions_count = 0;
-  bridge->AddFlutterSemanticsNodeUpdate(&child1);
+  bridge->AddFlutterSemanticsNodeUpdate(child1);
 
   bridge->CommitUpdates();
 
@@ -222,14 +218,9 @@ TEST(FlutterPlatformNodeDelegateMac, CanPerformAction) {
 // NOLINTEND(clang-analyzer-core.StackAddressEscape)
 
 TEST(FlutterPlatformNodeDelegateMac, TextFieldUsesFlutterTextField) {
-  FlutterEngine* engine = CreateTestEngine();
-  NSString* fixtures = @(testing::GetFixturesPath());
-  FlutterDartProject* project = [[FlutterDartProject alloc]
-      initWithAssetsPath:fixtures
-             ICUDataPath:[fixtures stringByAppendingString:@"/icudtl.dat"]];
-  FlutterViewController* viewController = [[FlutterViewController alloc] initWithProject:project];
+  FlutterViewController* viewController = CreateTestViewController();
+  FlutterEngine* engine = viewController.engine;
   [viewController loadView];
-  [engine setViewController:viewController];
 
   // Unit test localization is unnecessary.
   // NOLINTNEXTLINE(clang-analyzer-optin.osx.cocoa.localizability.NonLocalizedStringChecker)
@@ -242,9 +233,9 @@ TEST(FlutterPlatformNodeDelegateMac, TextFieldUsesFlutterTextField) {
   window.contentView = viewController.view;
   engine.semanticsEnabled = YES;
 
-  auto bridge = engine.accessibilityBridge.lock();
+  auto bridge = viewController.accessibilityBridge.lock();
   // Initialize ax node data.
-  FlutterSemanticsNode root;
+  FlutterSemanticsNode2 root;
   root.id = 0;
   root.flags = static_cast<FlutterSemanticsFlag>(0);
   root.actions = static_cast<FlutterSemanticsAction>(0);
@@ -260,12 +251,12 @@ TEST(FlutterPlatformNodeDelegateMac, TextFieldUsesFlutterTextField) {
   root.custom_accessibility_actions_count = 0;
   root.rect = {0, 0, 100, 100};  // LTRB
   root.transform = {1, 0, 0, 0, 1, 0, 0, 0, 1};
-  bridge->AddFlutterSemanticsNodeUpdate(&root);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
 
   double rectSize = 50;
   double transformFactor = 0.5;
 
-  FlutterSemanticsNode child1;
+  FlutterSemanticsNode2 child1;
   child1.id = 1;
   child1.flags = FlutterSemanticsFlag::kFlutterSemanticsFlagIsTextField;
   child1.actions = static_cast<FlutterSemanticsAction>(0);
@@ -281,7 +272,7 @@ TEST(FlutterPlatformNodeDelegateMac, TextFieldUsesFlutterTextField) {
   child1.custom_accessibility_actions_count = 0;
   child1.rect = {0, 0, rectSize, rectSize};  // LTRB
   child1.transform = {transformFactor, 0, 0, 0, transformFactor, 0, 0, 0, 1};
-  bridge->AddFlutterSemanticsNodeUpdate(&child1);
+  bridge->AddFlutterSemanticsNodeUpdate(child1);
 
   bridge->CommitUpdates();
 
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterPlatformViewController.h b/shell/platform/darwin/macos/framework/Source/FlutterPlatformViewController.h
index d0969e1f1a443fcbcb20de7fd3bac5ec0508fbe1..4123d8208fccd065346bd5ea71df2dc8f209724e 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterPlatformViewController.h
+++ b/shell/platform/darwin/macos/framework/Source/FlutterPlatformViewController.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERPLATFORMVIEWCONTROLLER_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERPLATFORMVIEWCONTROLLER_H_
+
 #import <Cocoa/Cocoa.h>
 
 #import "FlutterChannels.h"
@@ -17,13 +20,15 @@
 @interface FlutterPlatformViewController ()
 
 /**
- * Creates a platform view of viewType with viewId.
+ * Creates a platform view of viewType with viewId and arguments passed from
+ * the framework's creationParams constructor parameter.
  * FlutterResult is updated to contain nil for success or to contain
  * a FlutterError if there is an error.
  */
-- (void)onCreateWithViewID:(int64_t)viewId
-                  viewType:(nonnull NSString*)viewType
-                    result:(nonnull FlutterResult)result;
+- (void)onCreateWithViewIdentifier:(int64_t)viewId
+                          viewType:(nonnull NSString*)viewType
+                         arguments:(nullable id)args
+                            result:(nonnull FlutterResult)result;
 
 /**
  * Disposes the platform view with `viewId`.
@@ -54,3 +59,5 @@
 - (void)disposePlatformViews;
 
 @end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERPLATFORMVIEWCONTROLLER_H_
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterPlatformViewController.mm b/shell/platform/darwin/macos/framework/Source/FlutterPlatformViewController.mm
index b15b1ca5ebd423b5d87d5b415f65057e52c243c2..64b83cd80d348dea1c4861ef554e64a6bee8e4f2 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterPlatformViewController.mm
+++ b/shell/platform/darwin/macos/framework/Source/FlutterPlatformViewController.mm
@@ -25,9 +25,10 @@
   return self;
 }
 
-- (void)onCreateWithViewID:(int64_t)viewId
-                  viewType:(nonnull NSString*)viewType
-                    result:(nonnull FlutterResult)result {
+- (void)onCreateWithViewIdentifier:(int64_t)viewId
+                          viewType:(nonnull NSString*)viewType
+                         arguments:(nullable id)args
+                            result:(nonnull FlutterResult)result {
   if (_platformViews.count(viewId) != 0) {
     result([FlutterError errorWithCode:@"recreating_view"
                                message:@"trying to create an already created view"
@@ -52,7 +53,10 @@
     return;
   }
 
-  NSView* platform_view = [factory createWithViewIdentifier:viewId arguments:nil];
+  NSView* platform_view = [factory createWithViewIdentifier:viewId arguments:args];
+  // Flutter compositing requires CALayer-backed platform views.
+  // Force the platform view to be backed by a CALayer.
+  [platform_view setWantsLayer:YES];
   _platformViews[viewId] = platform_view;
   result(nil);
 }
@@ -87,9 +91,22 @@
   if ([[call method] isEqualToString:@"create"]) {
     NSMutableDictionary<NSString*, id>* args = [call arguments];
     if ([args objectForKey:@"id"]) {
-      int64_t viewId = [args[@"id"] longValue];
+      int64_t viewId = [args[@"id"] longLongValue];
       NSString* viewType = [NSString stringWithUTF8String:([args[@"viewType"] UTF8String])];
-      [self onCreateWithViewID:viewId viewType:viewType result:result];
+
+      id creationArgs = nil;
+      NSObject<FlutterPlatformViewFactory>* factory = _platformViewFactories[viewType];
+      if ([factory respondsToSelector:@selector(createArgsCodec)]) {
+        NSObject<FlutterMessageCodec>* codec = [factory createArgsCodec];
+        if (codec != nil && args[@"params"] != nil) {
+          FlutterStandardTypedData* creationArgsData = args[@"params"];
+          creationArgs = [codec decode:creationArgsData.data];
+        }
+      }
+      [self onCreateWithViewIdentifier:viewId
+                              viewType:viewType
+                             arguments:creationArgs
+                                result:result];
     } else {
       result([FlutterError errorWithCode:@"unknown_view"
                                  message:@"'id' argument must be passed to create a platform view."
@@ -97,13 +114,47 @@
     }
   } else if ([[call method] isEqualToString:@"dispose"]) {
     NSNumber* arg = [call arguments];
-    int64_t viewId = [arg longValue];
+    int64_t viewId = [arg longLongValue];
     [self onDisposeWithViewID:viewId result:result];
+  } else if ([[call method] isEqualToString:@"acceptGesture"]) {
+    [self handleAcceptGesture:call result:result];
+  } else if ([[call method] isEqualToString:@"rejectGesture"]) {
+    [self handleRejectGesture:call result:result];
   } else {
     result(FlutterMethodNotImplemented);
   }
 }
 
+- (void)handleAcceptGesture:(FlutterMethodCall*)call result:(FlutterResult)result {
+  NSDictionary<NSString*, id>* args = [call arguments];
+  NSAssert(args && args[@"id"], @"id argument is required");
+  int64_t viewId = [args[@"id"] longLongValue];
+  if (_platformViews.count(viewId) == 0) {
+    result([FlutterError errorWithCode:@"unknown_view"
+                               message:@"trying to set gesture state for an unknown view"
+                               details:[NSString stringWithFormat:@"view id: '%lld'", viewId]]);
+    return;
+  }
+
+  // TODO(cbracken): Implement. https://github.com/flutter/flutter/issues/124492
+  result(nil);
+}
+
+- (void)handleRejectGesture:(FlutterMethodCall*)call result:(FlutterResult)result {
+  NSDictionary<NSString*, id>* args = [call arguments];
+  NSAssert(args && args[@"id"], @"id argument is required");
+  int64_t viewId = [args[@"id"] longLongValue];
+  if (_platformViews.count(viewId) == 0) {
+    result([FlutterError errorWithCode:@"unknown_view"
+                               message:@"trying to set gesture state for an unknown view"
+                               details:[NSString stringWithFormat:@"view id: '%lld'", viewId]]);
+    return;
+  }
+
+  // TODO(cbracken): Implement. https://github.com/flutter/flutter/issues/124492
+  result(nil);
+}
+
 - (void)disposePlatformViews {
   if (_platformViewsToDispose.empty()) {
     return;
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterPlatformViewControllerTest.mm b/shell/platform/darwin/macos/framework/Source/FlutterPlatformViewControllerTest.mm
index 03c435ec0b369214f32e3ce27593c4d0b686006d..65f59ddaf216782c4f84082ffdc252cd04395b25 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterPlatformViewControllerTest.mm
+++ b/shell/platform/darwin/macos/framework/Source/FlutterPlatformViewControllerTest.mm
@@ -43,11 +43,22 @@ TEST(FlutterPlatformViewController, TestRegisterPlatformViewFactoryAndCreate) {
 
   [platformViewController registerViewFactory:factory withId:@"MockPlatformView"];
 
+  NSDictionary* creationArgs = @{
+    @"album" : @"スコットとリバース",
+    @"releaseYear" : @2013,
+    @"artists" : @[ @"Scott Murphy", @"Rivers Cuomo" ],
+    @"playlist" : @[ @"おかしいやつ", @"ほどけていたんだ" ],
+  };
+  NSObject<FlutterMessageCodec>* codec = [factory createArgsCodec];
+  FlutterStandardTypedData* creationArgsData =
+      [FlutterStandardTypedData typedDataWithBytes:[codec encode:creationArgs]];
+
   FlutterMethodCall* methodCall =
       [FlutterMethodCall methodCallWithMethodName:@"create"
                                         arguments:@{
                                           @"id" : @2,
-                                          @"viewType" : @"MockPlatformView"
+                                          @"viewType" : @"MockPlatformView",
+                                          @"params" : creationArgsData,
                                         }];
 
   __block bool success = false;
@@ -58,8 +69,33 @@ TEST(FlutterPlatformViewController, TestRegisterPlatformViewFactoryAndCreate) {
     }
   };
   [platformViewController handleMethodCall:methodCall result:result];
-
   EXPECT_TRUE(success);
+
+  // Verify PlatformView parameters are decoded correctly.
+  TestFlutterPlatformView* view =
+      (TestFlutterPlatformView*)[platformViewController platformViewWithID:2];
+  ASSERT_TRUE(view != nil);
+  ASSERT_TRUE(view.args != nil);
+
+  // Verify string type.
+  NSString* album = [view.args objectForKey:@"album"];
+  EXPECT_TRUE([album isEqualToString:@"スコットとリバース"]);
+
+  // Verify int type.
+  NSNumber* releaseYear = [view.args objectForKey:@"releaseYear"];
+  EXPECT_EQ(releaseYear.intValue, 2013);
+
+  // Verify list/array types.
+  NSArray* artists = [view.args objectForKey:@"artists"];
+  ASSERT_TRUE(artists != nil);
+  ASSERT_EQ(artists.count, 2ul);
+  EXPECT_TRUE([artists[0] isEqualToString:@"Scott Murphy"]);
+  EXPECT_TRUE([artists[1] isEqualToString:@"Rivers Cuomo"]);
+
+  NSArray* playlist = [view.args objectForKey:@"playlist"];
+  ASSERT_EQ(playlist.count, 2ul);
+  EXPECT_TRUE([playlist[0] isEqualToString:@"おかしいやつ"]);
+  EXPECT_TRUE([playlist[1] isEqualToString:@"ほどけていたんだ"]);
 }
 
 TEST(FlutterPlatformViewController, TestCreateAndDispose) {
@@ -125,4 +161,120 @@ TEST(FlutterPlatformViewController, TestDisposeOnMissingViewId) {
   EXPECT_TRUE(errored);
 }
 
+TEST(FlutterPlatformViewController, TestAcceptGesture) {
+  FlutterPlatformViewController* platformViewController =
+      [[FlutterPlatformViewController alloc] init];
+  [platformViewController registerViewFactory:[TestFlutterPlatformViewFactory alloc]
+                                       withId:@"MockPlatformView"];
+
+  // Create the PlatformView.
+  const NSNumber* viewId = [NSNumber numberWithLongLong:2];
+  FlutterMethodCall* methodCallOnCreate = [FlutterMethodCall
+      methodCallWithMethodName:@"create"
+                     arguments:@{@"id" : viewId, @"viewType" : @"MockPlatformView"}];
+  __block bool created = false;
+  FlutterResult resultOnCreate = ^(id result) {
+    // If a platform view is successfully created, the result is nil.
+    if (result == nil) {
+      created = true;
+    }
+  };
+  [platformViewController handleMethodCall:methodCallOnCreate result:resultOnCreate];
+
+  // Call acceptGesture.
+  FlutterMethodCall* methodCallAcceptGesture =
+      [FlutterMethodCall methodCallWithMethodName:@"acceptGesture" arguments:@{@"id" : viewId}];
+  __block bool acceptGestureCalled = false;
+  FlutterResult resultAcceptGesture = ^(id result) {
+    // If a acceptGesture is successful, the result is nil.
+    if (result == nil) {
+      acceptGestureCalled = true;
+    }
+  };
+  [platformViewController handleMethodCall:methodCallAcceptGesture result:resultAcceptGesture];
+
+  EXPECT_TRUE(created);
+  EXPECT_TRUE(acceptGestureCalled);
+}
+
+TEST(FlutterPlatformViewController, TestAcceptGestureOnMissingViewId) {
+  FlutterPlatformViewController* platformViewController =
+      [[FlutterPlatformViewController alloc] init];
+  [platformViewController registerViewFactory:[TestFlutterPlatformViewFactory alloc]
+                                       withId:@"MockPlatformView"];
+
+  // Call rejectGesture.
+  FlutterMethodCall* methodCallAcceptGesture =
+      [FlutterMethodCall methodCallWithMethodName:@"acceptGesture" arguments:@{
+        @"id" : @20
+      }];
+  __block bool errored = false;
+  FlutterResult result = ^(id result) {
+    if ([result isKindOfClass:[FlutterError class]]) {
+      errored = true;
+    }
+  };
+  [platformViewController handleMethodCall:methodCallAcceptGesture result:result];
+
+  EXPECT_TRUE(errored);
+}
+
+TEST(FlutterPlatformViewController, TestRejectGesture) {
+  FlutterPlatformViewController* platformViewController =
+      [[FlutterPlatformViewController alloc] init];
+  [platformViewController registerViewFactory:[TestFlutterPlatformViewFactory alloc]
+                                       withId:@"MockPlatformView"];
+
+  // Create the PlatformView.
+  const NSNumber* viewId = [NSNumber numberWithLongLong:2];
+  FlutterMethodCall* methodCallOnCreate = [FlutterMethodCall
+      methodCallWithMethodName:@"create"
+                     arguments:@{@"id" : viewId, @"viewType" : @"MockPlatformView"}];
+  __block bool created = false;
+  FlutterResult resultOnCreate = ^(id result) {
+    // If a platform view is successfully created, the result is nil.
+    if (result == nil) {
+      created = true;
+    }
+  };
+  [platformViewController handleMethodCall:methodCallOnCreate result:resultOnCreate];
+
+  // Call rejectGesture.
+  FlutterMethodCall* methodCallRejectGesture =
+      [FlutterMethodCall methodCallWithMethodName:@"rejectGesture" arguments:@{@"id" : viewId}];
+  __block bool rejectGestureCalled = false;
+  FlutterResult resultRejectGesture = ^(id result) {
+    // If a rejectGesture is successful, the result is nil.
+    if (result == nil) {
+      rejectGestureCalled = true;
+    }
+  };
+  [platformViewController handleMethodCall:methodCallRejectGesture result:resultRejectGesture];
+
+  EXPECT_TRUE(created);
+  EXPECT_TRUE(rejectGestureCalled);
+}
+
+TEST(FlutterPlatformViewController, TestRejectGestureOnMissingViewId) {
+  FlutterPlatformViewController* platformViewController =
+      [[FlutterPlatformViewController alloc] init];
+  [platformViewController registerViewFactory:[TestFlutterPlatformViewFactory alloc]
+                                       withId:@"MockPlatformView"];
+
+  // Call rejectGesture.
+  FlutterMethodCall* methodCallRejectGesture =
+      [FlutterMethodCall methodCallWithMethodName:@"rejectGesture" arguments:@{
+        @"id" : @20
+      }];
+  __block bool errored = false;
+  FlutterResult result = ^(id result) {
+    if ([result isKindOfClass:[FlutterError class]]) {
+      errored = true;
+    }
+  };
+  [platformViewController handleMethodCall:methodCallRejectGesture result:result];
+
+  EXPECT_TRUE(errored);
+}
+
 }  // namespace flutter::testing
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterRenderer.h b/shell/platform/darwin/macos/framework/Source/FlutterRenderer.h
index d9cbe1da5abb0df3a5c727c921edd1074258c4c4..b2f82e3d927a49678a14a0cda6d23487a0ac71bb 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterRenderer.h
+++ b/shell/platform/darwin/macos/framework/Source/FlutterRenderer.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERRENDERER_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERRENDERER_H_
+
 #import <Cocoa/Cocoa.h>
 
 #import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterEngine.h"
@@ -35,21 +38,6 @@
  */
 - (FlutterRendererConfig)createRendererConfig;
 
-/**
- * Called by the engine when the given view's buffers should be swapped.
- */
-- (BOOL)present:(uint64_t)viewId;
-
-/**
- * Tells the renderer that there is no Flutter content available for this frame.
- */
-- (void)presentWithoutContent:(uint64_t)viewId;
-
-/**
- * Creates a Metal texture for the given view with the given size.
- */
-- (FlutterMetalTexture)createTextureForView:(uint64_t)viewId size:(CGSize)size;
-
 /**
  * Populates the texture registry with the provided metalTexture.
  */
@@ -57,3 +45,5 @@
                          metalTexture:(nonnull FlutterMetalExternalTexture*)metalTexture;
 
 @end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERRENDERER_H_
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterRenderer.mm b/shell/platform/darwin/macos/framework/Source/FlutterRenderer.mm
index 996e613dba9266495be01fa0572bff2fd3d94dcb..815336227f39c7211107cfce1e4118beb62507cd 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterRenderer.mm
+++ b/shell/platform/darwin/macos/framework/Source/FlutterRenderer.mm
@@ -12,23 +12,15 @@
 
 #pragma mark - Static callbacks that require the engine.
 
-static FlutterMetalTexture OnGetNextDrawableForDefaultView(FlutterEngine* engine,
-                                                           const FlutterFrameInfo* frameInfo) {
-  // TODO(dkwingsmt): This callback only supports single-view, therefore it only
-  // operates on the default view. To support multi-view, we need a new callback
-  // that also receives a view ID, or pass the ID via FlutterFrameInfo.
-  uint64_t viewId = kFlutterDefaultViewId;
-  CGSize size = CGSizeMake(frameInfo->size.width, frameInfo->size.height);
-  return [engine.renderer createTextureForView:viewId size:size];
+static FlutterMetalTexture OnGetNextDrawable(FlutterEngine* engine,
+                                             const FlutterFrameInfo* frameInfo) {
+  NSCAssert(NO, @"The renderer config should not be used to get the next drawable.");
+  return FlutterMetalTexture{};
 }
 
-static bool OnPresentDrawableOfDefaultView(FlutterEngine* engine,
-                                           const FlutterMetalTexture* texture) {
-  // TODO(dkwingsmt): This callback only supports single-view, therefore it only
-  // operates on the default view. To support multi-view, we need a new callback
-  // that also receives a view ID.
-  uint64_t viewId = kFlutterDefaultViewId;
-  return [engine.renderer present:viewId];
+static bool OnPresentDrawable(FlutterEngine* engine, const FlutterMetalTexture* texture) {
+  NSCAssert(NO, @"The renderer config should not be used to present drawable.");
+  return false;
 }
 
 static bool OnAcquireExternalTexture(FlutterEngine* engine,
@@ -43,15 +35,12 @@ static bool OnAcquireExternalTexture(FlutterEngine* engine,
 #pragma mark - FlutterRenderer implementation
 
 @implementation FlutterRenderer {
-  FlutterViewEngineProvider* _viewProvider;
-
   FlutterDarwinContextMetalSkia* _darwinMetalContext;
 }
 
 - (instancetype)initWithFlutterEngine:(nonnull FlutterEngine*)flutterEngine {
   self = [super initWithDelegate:self engine:flutterEngine];
   if (self) {
-    _viewProvider = [[FlutterViewEngineProvider alloc] initWithEngine:flutterEngine];
     _device = MTLCreateSystemDefaultDevice();
     if (!_device) {
       NSLog(@"Could not acquire Metal device.");
@@ -73,62 +62,30 @@ static bool OnAcquireExternalTexture(FlutterEngine* engine,
 - (FlutterRendererConfig)createRendererConfig {
   FlutterRendererConfig config = {
       .type = FlutterRendererType::kMetal,
-      .metal.struct_size = sizeof(FlutterMetalRendererConfig),
-      .metal.device = (__bridge FlutterMetalDeviceHandle)_device,
-      .metal.present_command_queue = (__bridge FlutterMetalCommandQueueHandle)_commandQueue,
-      .metal.get_next_drawable_callback =
-          reinterpret_cast<FlutterMetalTextureCallback>(OnGetNextDrawableForDefaultView),
-      .metal.present_drawable_callback =
-          reinterpret_cast<FlutterMetalPresentCallback>(OnPresentDrawableOfDefaultView),
-      .metal.external_texture_frame_callback =
-          reinterpret_cast<FlutterMetalTextureFrameCallback>(OnAcquireExternalTexture),
-  };
+      .metal = {
+          .struct_size = sizeof(FlutterMetalRendererConfig),
+          .device = (__bridge FlutterMetalDeviceHandle)_device,
+          .present_command_queue = (__bridge FlutterMetalCommandQueueHandle)_commandQueue,
+          .get_next_drawable_callback =
+              reinterpret_cast<FlutterMetalTextureCallback>(OnGetNextDrawable),
+          .present_drawable_callback =
+              reinterpret_cast<FlutterMetalPresentCallback>(OnPresentDrawable),
+          .external_texture_frame_callback =
+              reinterpret_cast<FlutterMetalTextureFrameCallback>(OnAcquireExternalTexture),
+      }};
   return config;
 }
 
 #pragma mark - Embedder callback implementations.
 
-- (FlutterMetalTexture)createTextureForView:(uint64_t)viewId size:(CGSize)size {
-  FlutterView* view = [_viewProvider getView:viewId];
-  NSAssert(view != nil, @"Can't create texture on a non-existent view 0x%llx.", viewId);
-  if (view == nil) {
-    // FlutterMetalTexture has texture `null`, therefore is discarded.
-    return FlutterMetalTexture{};
-  }
-  FlutterRenderBackingStore* backingStore = [view backingStoreForSize:size];
-  id<MTLTexture> texture = backingStore.texture;
-  FlutterMetalTexture embedderTexture;
-  embedderTexture.struct_size = sizeof(FlutterMetalTexture);
-  embedderTexture.texture = (__bridge void*)texture;
-  embedderTexture.texture_id = reinterpret_cast<int64_t>(texture);
-  return embedderTexture;
-}
-
-- (BOOL)present:(uint64_t)viewId {
-  FlutterView* view = [_viewProvider getView:viewId];
-  if (view == nil) {
-    return NO;
-  }
-  [view present];
-  return YES;
-}
-
-- (void)presentWithoutContent:(uint64_t)viewId {
-  FlutterView* view = [_viewProvider getView:viewId];
-  if (view == nil) {
-    return;
-  }
-  [view presentWithoutContent];
-}
-
-#pragma mark - FlutterTextureRegistrar methods.
-
 - (BOOL)populateTextureWithIdentifier:(int64_t)textureID
                          metalTexture:(FlutterMetalExternalTexture*)textureOut {
   FlutterExternalTexture* texture = [self getTextureWithID:textureID];
   return [texture populateTexture:textureOut];
 }
 
+#pragma mark - FlutterTextureRegistrar methods.
+
 - (FlutterExternalTexture*)onRegisterTexture:(id<FlutterTexture>)texture {
   return [[FlutterExternalTexture alloc] initWithFlutterTexture:texture
                                              darwinMetalContext:_darwinMetalContext];
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterRendererTest.mm b/shell/platform/darwin/macos/framework/Source/FlutterRendererTest.mm
deleted file mode 100644
index 6cd57e33d48f9451af2287a0ba2afa88884e4289..0000000000000000000000000000000000000000
--- a/shell/platform/darwin/macos/framework/Source/FlutterRendererTest.mm
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import <OCMock/OCMock.h>
-
-#import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterEngine.h"
-#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterDartProject_Internal.h"
-#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h"
-#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterRenderer.h"
-#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterView.h"
-#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterViewController_Internal.h"
-#include "flutter/shell/platform/embedder/embedder.h"
-#include "flutter/shell/platform/embedder/test_utils/proc_table_replacement.h"
-#include "flutter/testing/testing.h"
-
-namespace flutter::testing {
-
-namespace {
-// Returns an engine configured for the test fixture resource configuration.
-FlutterEngine* CreateTestEngine() {
-  NSString* fixtures = @(testing::GetFixturesPath());
-  FlutterDartProject* project = [[FlutterDartProject alloc]
-      initWithAssetsPath:fixtures
-             ICUDataPath:[fixtures stringByAppendingString:@"/icudtl.dat"]];
-  return [[FlutterEngine alloc] initWithName:@"test" project:project allowHeadlessExecution:true];
-}
-
-void SetEngineDefaultView(FlutterEngine* engine, id flutterView) {
-  id mockFlutterViewController = OCMClassMock([FlutterViewController class]);
-  OCMStub([mockFlutterViewController flutterView]).andReturn(flutterView);
-  [engine setViewController:mockFlutterViewController];
-}
-
-}  // namespace
-
-TEST(FlutterRenderer, PresentDelegatesToFlutterView) {
-  FlutterEngine* engine = CreateTestEngine();
-  FlutterRenderer* renderer = [[FlutterRenderer alloc] initWithFlutterEngine:engine];
-  id mockFlutterView = OCMClassMock([FlutterView class]);
-  SetEngineDefaultView(engine, mockFlutterView);
-  [(FlutterView*)[mockFlutterView expect] present];
-  [renderer present:kFlutterDefaultViewId];
-}
-
-TEST(FlutterRenderer, TextureReturnedByFlutterView) {
-  FlutterEngine* engine = CreateTestEngine();
-  FlutterRenderer* renderer = [[FlutterRenderer alloc] initWithFlutterEngine:engine];
-  id mockFlutterView = OCMClassMock([FlutterView class]);
-  SetEngineDefaultView(engine, mockFlutterView);
-  FlutterFrameInfo frameInfo;
-  frameInfo.struct_size = sizeof(FlutterFrameInfo);
-  FlutterUIntSize dimensions;
-  dimensions.width = 100;
-  dimensions.height = 200;
-  frameInfo.size = dimensions;
-  CGSize size = CGSizeMake(dimensions.width, dimensions.height);
-  [[mockFlutterView expect] backingStoreForSize:size];
-  [renderer createTextureForView:kFlutterDefaultViewId size:size];
-}
-
-}  // namespace flutter::testing
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterResizableBackingStoreProvider.h b/shell/platform/darwin/macos/framework/Source/FlutterResizableBackingStoreProvider.h
deleted file mode 100644
index 00a93ac2130783140e2dd6efa60e697a5a6c13e9..0000000000000000000000000000000000000000
--- a/shell/platform/darwin/macos/framework/Source/FlutterResizableBackingStoreProvider.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import <Cocoa/Cocoa.h>
-#import <Metal/Metal.h>
-#import <QuartzCore/CAMetalLayer.h>
-
-#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterBackingStore.h"
-#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterResizeSynchronizer.h"
-
-/**
- * Provides resizable buffers backed by a MTLTexture.
- */
-@interface FlutterResizableBackingStoreProvider : NSObject <FlutterResizeSynchronizerDelegate>
-
-/**
- * Creates a resizable backing store provider for the given CAMetalLayer.
- */
-- (nonnull instancetype)initWithDevice:(nonnull id<MTLDevice>)device
-                          commandQueue:(nonnull id<MTLCommandQueue>)commandQueue
-                                 layer:(nonnull CALayer*)layer;
-/**
- * Notify of the required backing store size updates. Called during window resize.
- */
-- (void)onBackingStoreResized:(CGSize)size;
-
-/**
- * Returns the FlutterBackingStore corresponding to the latest size.
- */
-- (nonnull FlutterRenderBackingStore*)backingStore;
-
-@end
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterResizableBackingStoreProvider.mm b/shell/platform/darwin/macos/framework/Source/FlutterResizableBackingStoreProvider.mm
deleted file mode 100644
index 436d41af68f156242b50aa825194d3366616bc38..0000000000000000000000000000000000000000
--- a/shell/platform/darwin/macos/framework/Source/FlutterResizableBackingStoreProvider.mm
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterResizableBackingStoreProvider.h"
-
-#import <QuartzCore/QuartzCore.h>
-
-#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterSurfaceManager.h"
-
-@implementation FlutterResizableBackingStoreProvider {
-  id<MTLDevice> _device;
-  id<MTLCommandQueue> _commandQueue;
-  FlutterSurfaceManager* _surfaceManager;
-}
-
-- (instancetype)initWithDevice:(id<MTLDevice>)device
-                  commandQueue:(id<MTLCommandQueue>)commandQueue
-                         layer:(CALayer*)layer {
-  self = [super init];
-  if (self) {
-    _device = device;
-    _commandQueue = commandQueue;
-    _surfaceManager = [[FlutterSurfaceManager alloc] initWithDevice:device
-                                                       commandQueue:commandQueue
-                                                              layer:layer];
-  }
-  return self;
-}
-
-- (void)onBackingStoreResized:(CGSize)size {
-  [_surfaceManager ensureSurfaceSize:size];
-}
-
-- (FlutterRenderBackingStore*)backingStore {
-  return [_surfaceManager renderBuffer];
-}
-
-- (void)resizeSynchronizerFlush:(nonnull FlutterResizeSynchronizer*)synchronizer {
-  id<MTLCommandBuffer> commandBuffer = [_commandQueue commandBuffer];
-  [commandBuffer commit];
-  [commandBuffer waitUntilScheduled];
-}
-
-- (void)resizeSynchronizerCommit:(nonnull FlutterResizeSynchronizer*)synchronizer {
-  [CATransaction begin];
-  [CATransaction setDisableActions:YES];
-
-  [_surfaceManager swapBuffers];
-
-  [CATransaction commit];
-}
-
-@end
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterResizeSynchronizer.h b/shell/platform/darwin/macos/framework/Source/FlutterResizeSynchronizer.h
deleted file mode 100644
index 556856ed3684db27a65a81d9195e7ccfa31e7627..0000000000000000000000000000000000000000
--- a/shell/platform/darwin/macos/framework/Source/FlutterResizeSynchronizer.h
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import <Cocoa/Cocoa.h>
-
-@class FlutterResizeSynchronizer;
-
-/**
- * Implemented by FlutterView.
- */
-@protocol FlutterResizeSynchronizerDelegate
-
-/**
- * Invoked on raster thread; Delegate should flush the graphics context.
- */
-- (void)resizeSynchronizerFlush:(nonnull FlutterResizeSynchronizer*)synchronizer;
-
-/**
- * Invoked on platform thread; Delegate should flip the surfaces.
- */
-- (void)resizeSynchronizerCommit:(nonnull FlutterResizeSynchronizer*)synchronizer;
-
-@end
-
-/**
- * Encapsulates the logic for blocking platform thread during window resize as
- * well as synchronizing the raster and platform thread during commit (presenting frame).
- *
- * Flow during window resize
- *
- * 1. Platform thread calls [synchronizer beginResize:notify:]
- *    This will hold the platform thread until the raster thread is ready to display contents.
- * 2. Raster thread calls [synchronizer shouldEnsureSurfaceForSize:] with target size
- *    This will return false for any size other than target size
- * 3. Raster thread calls [synchronizer requestCommit]
- *    Any commit calls before shouldEnsureSurfaceForSize: is called with the right
- *    size are simply ignored; There's no point rasterizing and displaying frames
- *    with wrong size.
- * Both delegate methods (flush/commit) will be invoked before beginResize returns
- *
- * Flow during regular operation (no resizing)
- *
- * 1. Raster thread calls [synchronizer requestCommit]
- *    This will invoke [delegate flush:] on raster thread and
- *    [delegate commit:] on platform thread. The requestCommit call will be blocked
- *    until this is done. This is necessary to ensure that rasterizer won't start
- *    rasterizing next frame before the FlutterSurfaceManager flipped the surface,
- *    which must be performed on platform thread.
- */
-@interface FlutterResizeSynchronizer : NSObject
-
-- (nullable instancetype)initWithDelegate:(nonnull id<FlutterResizeSynchronizerDelegate>)delegate;
-
-/**
- * Blocks the platform thread until
- * - shouldEnsureSurfaceForSize is called with proper size and
- * - requestCommit is called
- * All requestCommit calls before `shouldEnsureSurfaceForSize` is called with
- * expected size are ignored;
- * The notify block is invoked immediately after synchronizer mutex is acquired.
- */
-- (void)beginResize:(CGSize)size notify:(nonnull dispatch_block_t)notify;
-
-/**
- * Returns whether the view should ensure surfaces with given size;
- * This will be false during resizing for any size other than size specified
- * during beginResize.
- */
-- (BOOL)shouldEnsureSurfaceForSize:(CGSize)size;
-
-/**
- * Called from rasterizer thread, will block until delegate resizeSynchronizerCommit:
- * method is called (on platform thread).
- */
-- (void)requestCommit;
-
-/**
- * Called from view to notify the synchronizer that there are no Flutter frames
- * coming. Synchronizer must unblock main thread and not block until another
- * frame is available.
- */
-- (void)noFlutterContent;
-
-/**
- * Called when shutting down. Unblocks everything and prevents any further synchronization.
- */
-- (void)shutdown;
-
-@end
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterResizeSynchronizer.mm b/shell/platform/darwin/macos/framework/Source/FlutterResizeSynchronizer.mm
deleted file mode 100644
index 7681aa33857796846a4e73cf935222e0ea46b6c4..0000000000000000000000000000000000000000
--- a/shell/platform/darwin/macos/framework/Source/FlutterResizeSynchronizer.mm
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterResizeSynchronizer.h"
-
-#include <mutex>
-
-@interface FlutterResizeSynchronizer () {
-  // Counter to detect stale callbacks.
-  uint32_t _cookie;
-
-  std::mutex _mutex;
-
-  // Used to block [beginResize:].
-  std::condition_variable _condBlockBeginResize;
-  // Used to block [requestCommit].
-  std::condition_variable _condBlockRequestCommit;
-
-  // Whether a frame was received; the synchronizer doesn't block platform thread during resize
-  // until it knows that framework is running and producing frames
-  BOOL _hasFlutterContent;
-
-  // If NO, requestCommit calls are ignored until shouldEnsureSurfaceForSize is called with
-  // proper size.
-  BOOL _acceptingCommit;
-
-  // Waiting for resize to finish.
-  BOOL _waiting;
-
-  // RequestCommit was called and [delegate commit:] must be performed on platform thread.
-  BOOL _pendingCommit;
-
-  // Target size for resizing.
-  CGSize _newSize;
-
-  // if YES prevents all synchronization
-  BOOL _shuttingDown;
-
-  __weak id<FlutterResizeSynchronizerDelegate> _delegate;
-}
-@end
-
-@implementation FlutterResizeSynchronizer
-
-- (instancetype)initWithDelegate:(id<FlutterResizeSynchronizerDelegate>)delegate {
-  if (self = [super init]) {
-    _acceptingCommit = YES;
-    _delegate = delegate;
-  }
-  return self;
-}
-
-- (void)beginResize:(CGSize)size notify:(dispatch_block_t)notify {
-  std::unique_lock<std::mutex> lock(_mutex);
-  if (!_delegate) {
-    return;
-  }
-
-  if (!_hasFlutterContent || _shuttingDown) {
-    // No blocking until framework produces at least one frame
-    notify();
-    return;
-  }
-
-  ++_cookie;
-
-  // from now on, ignore all incoming commits until the block below gets
-  // scheduled on raster thread
-  _acceptingCommit = NO;
-
-  // let pending commits finish to unblock the raster thread
-  _pendingCommit = NO;
-  _condBlockBeginResize.notify_all();
-
-  // let the engine send resize notification
-  notify();
-
-  _newSize = size;
-
-  _waiting = YES;
-
-  _condBlockRequestCommit.wait(lock, [&] { return _pendingCommit || _shuttingDown; });
-
-  [_delegate resizeSynchronizerFlush:self];
-  [_delegate resizeSynchronizerCommit:self];
-  _pendingCommit = NO;
-  _condBlockBeginResize.notify_all();
-
-  _waiting = NO;
-}
-
-- (BOOL)shouldEnsureSurfaceForSize:(CGSize)size {
-  std::unique_lock<std::mutex> lock(_mutex);
-
-  if (!_hasFlutterContent) {
-    return YES;
-  }
-
-  if (!_acceptingCommit) {
-    if (CGSizeEqualToSize(_newSize, size)) {
-      _acceptingCommit = YES;
-    }
-  }
-  return _acceptingCommit;
-}
-
-- (void)requestCommit {
-  std::unique_lock<std::mutex> lock(_mutex);
-
-  if (!_acceptingCommit || _shuttingDown) {
-    return;
-  }
-
-  _hasFlutterContent = YES;
-
-  _pendingCommit = YES;
-  if (_waiting) {  // BeginResize is in progress, interrupt it and schedule commit call
-    _condBlockRequestCommit.notify_all();
-    _condBlockBeginResize.wait(lock, [&]() { return !_pendingCommit || _shuttingDown; });
-  } else {
-    // No resize, schedule commit on platform thread and wait until either done
-    // or interrupted by incoming BeginResize
-    [_delegate resizeSynchronizerFlush:self];
-    dispatch_async(dispatch_get_main_queue(), [self, cookie = _cookie] {
-      std::unique_lock<std::mutex> lock(_mutex);
-      if (cookie == _cookie) {
-        if (_delegate) {
-          [_delegate resizeSynchronizerCommit:self];
-        }
-        _pendingCommit = NO;
-        _condBlockBeginResize.notify_all();
-      }
-    });
-    _condBlockBeginResize.wait(lock, [&]() { return !_pendingCommit || _shuttingDown; });
-  }
-}
-
-- (void)noFlutterContent {
-  std::unique_lock<std::mutex> lock(_mutex);
-  _hasFlutterContent = NO;
-  _acceptingCommit = YES;
-  _condBlockBeginResize.notify_all();
-}
-
-- (void)shutdown {
-  std::unique_lock<std::mutex> lock(_mutex);
-  _shuttingDown = YES;
-  _condBlockBeginResize.notify_all();
-  _condBlockRequestCommit.notify_all();
-}
-
-@end
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterSurface.h b/shell/platform/darwin/macos/framework/Source/FlutterSurface.h
new file mode 100644
index 0000000000000000000000000000000000000000..b566e68092dd3b3526dfef2f959875bf7464a2a0
--- /dev/null
+++ b/shell/platform/darwin/macos/framework/Source/FlutterSurface.h
@@ -0,0 +1,38 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERSURFACE_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERSURFACE_H_
+
+#import <Cocoa/Cocoa.h>
+
+#import "flutter/shell/platform/embedder/embedder.h"
+
+/**
+ * Opaque surface type.
+ * Can be represented as FlutterMetalTexture to cross the embedder API boundary.
+ */
+@interface FlutterSurface : NSObject
+
+- (FlutterMetalTexture)asFlutterMetalTexture;
+
++ (nullable FlutterSurface*)fromFlutterMetalTexture:(nonnull const FlutterMetalTexture*)texture;
+
+@end
+
+/**
+ * Internal FlutterSurface interface used by FlutterSurfaceManager.
+ * Wraps an IOSurface framebuffer and metadata related to the surface.
+ */
+@interface FlutterSurface (Private)
+
+- (nonnull instancetype)initWithSize:(CGSize)size device:(nonnull id<MTLDevice>)device;
+
+@property(readonly, nonatomic, nonnull) IOSurfaceRef ioSurface;
+@property(readonly, nonatomic) CGSize size;
+@property(readonly, nonatomic) int64_t textureId;
+
+@end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERSURFACE_H_
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterSurface.mm b/shell/platform/darwin/macos/framework/Source/FlutterSurface.mm
new file mode 100644
index 0000000000000000000000000000000000000000..4b65f2553c31551fa5c489062d72733dc10c5278
--- /dev/null
+++ b/shell/platform/darwin/macos/framework/Source/FlutterSurface.mm
@@ -0,0 +1,98 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterSurface.h"
+
+#import <Metal/Metal.h>
+
+@interface FlutterSurface () {
+  CGSize _size;
+  IOSurfaceRef _ioSurface;
+  id<MTLTexture> _texture;
+}
+@end
+
+@implementation FlutterSurface
+
+- (IOSurfaceRef)ioSurface {
+  return _ioSurface;
+}
+
+- (CGSize)size {
+  return _size;
+}
+
+- (int64_t)textureId {
+  return reinterpret_cast<int64_t>(_texture);
+}
+
+- (instancetype)initWithSize:(CGSize)size device:(id<MTLDevice>)device {
+  if (self = [super init]) {
+    self->_size = size;
+    self->_ioSurface = [FlutterSurface createIOSurfaceWithSize:size];
+    self->_texture = [FlutterSurface createTextureForIOSurface:_ioSurface size:size device:device];
+  }
+  return self;
+}
+
+static void ReleaseSurface(void* surface) {
+  if (surface != nullptr) {
+    CFBridgingRelease(surface);
+  }
+}
+
+- (FlutterMetalTexture)asFlutterMetalTexture {
+  FlutterMetalTexture res;
+  memset(&res, 0, sizeof(FlutterMetalTexture));
+  res.struct_size = sizeof(FlutterMetalTexture);
+  res.texture = (__bridge void*)_texture;
+  res.texture_id = self.textureId;
+  res.user_data = (void*)CFBridgingRetain(self);
+  res.destruction_callback = ReleaseSurface;
+  return res;
+}
+
++ (FlutterSurface*)fromFlutterMetalTexture:(const FlutterMetalTexture*)texture {
+  return (__bridge FlutterSurface*)texture->user_data;
+}
+
+- (void)dealloc {
+  CFRelease(_ioSurface);
+}
+
++ (IOSurfaceRef)createIOSurfaceWithSize:(CGSize)size {
+  unsigned pixelFormat = 'BGRA';
+  unsigned bytesPerElement = 4;
+
+  size_t bytesPerRow = IOSurfaceAlignProperty(kIOSurfaceBytesPerRow, size.width * bytesPerElement);
+  size_t totalBytes = IOSurfaceAlignProperty(kIOSurfaceAllocSize, size.height * bytesPerRow);
+  NSDictionary* options = @{
+    (id)kIOSurfaceWidth : @(size.width),
+    (id)kIOSurfaceHeight : @(size.height),
+    (id)kIOSurfacePixelFormat : @(pixelFormat),
+    (id)kIOSurfaceBytesPerElement : @(bytesPerElement),
+    (id)kIOSurfaceBytesPerRow : @(bytesPerRow),
+    (id)kIOSurfaceAllocSize : @(totalBytes),
+  };
+
+  IOSurfaceRef res = IOSurfaceCreate((CFDictionaryRef)options);
+  IOSurfaceSetValue(res, CFSTR("IOSurfaceColorSpace"), kCGColorSpaceSRGB);
+  return res;
+}
+
++ (id<MTLTexture>)createTextureForIOSurface:(IOSurfaceRef)surface
+                                       size:(CGSize)size
+                                     device:(id<MTLDevice>)device {
+  MTLTextureDescriptor* textureDescriptor =
+      [MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatBGRA8Unorm
+                                                         width:size.width
+                                                        height:size.height
+                                                     mipmapped:NO];
+  textureDescriptor.usage =
+      MTLTextureUsageShaderRead | MTLTextureUsageRenderTarget | MTLTextureUsageShaderWrite;
+  // plane = 0 for BGRA.
+  return [device newTextureWithDescriptor:textureDescriptor iosurface:surface plane:0];
+}
+
+@end
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterSurfaceManager.h b/shell/platform/darwin/macos/framework/Source/FlutterSurfaceManager.h
index 2f6a0974e416452c4cbcbc64b0d1a87354c1839e..279d580e2f4cdc18963cb58e62327553624f42db 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterSurfaceManager.h
+++ b/shell/platform/darwin/macos/framework/Source/FlutterSurfaceManager.h
@@ -2,43 +2,110 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERSURFACEMANAGER_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERSURFACEMANAGER_H_
+
 #import <Cocoa/Cocoa.h>
-#import <QuartzCore/CAMetalLayer.h>
+#import <QuartzCore/QuartzCore.h>
+
+#include <vector>
 
-#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterBackingStore.h"
-#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterIOSurfaceHolder.h"
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterSurface.h"
 
 /**
- * Manages render surfaces and corresponding backing stores used by the engine.
+ * Surface with additional properties needed for presenting.
+ */
+@interface FlutterSurfacePresentInfo : NSObject
+
+@property(readwrite, strong, nonatomic, nonnull) FlutterSurface* surface;
+@property(readwrite, nonatomic) CGPoint offset;
+@property(readwrite, nonatomic) size_t zIndex;
+@property(readwrite, nonatomic) std::vector<FlutterRect> paintRegion;
+
+@end
+
+@protocol FlutterSurfaceManagerDelegate <NSObject>
+
+/*
+ * Schedules the block on the platform thread and blocks until the block is executed.
+ * Provided `frameSize` is used to unblock the platform thread if it waits for
+ * a certain frame size during resizing.
+ */
+- (void)onPresent:(CGSize)frameSize withBlock:(nonnull dispatch_block_t)block;
+
+@end
+
+/**
+ * FlutterSurfaceManager is responsible for providing and presenting Core Animation render
+ * surfaces and managing sublayers.
  *
- * The backing store when rendering with on Metal is a Metal texture. There are two IOSurfaces
- * created during initialization, FlutterSurfaceManager manages the lifecycle of these.
+ * Owned by `FlutterView`.
  */
 @interface FlutterSurfaceManager : NSObject
 
 /**
  * Initializes and returns a surface manager that renders to a child layer (referred to as the
- * content layer) of the containing layer and applies the transform to the contents of the content
- * layer.
+ * content layer) of the containing layer.
  */
 - (nullable instancetype)initWithDevice:(nonnull id<MTLDevice>)device
                            commandQueue:(nonnull id<MTLCommandQueue>)commandQueue
-                                  layer:(nonnull CALayer*)containingLayer;
+                                  layer:(nonnull CALayer*)containingLayer
+                               delegate:(nonnull id<FlutterSurfaceManagerDelegate>)delegate;
 
 /**
- * Updates the backing store size of the managed IOSurfaces the specified size. If the surfaces are
- * already of this size, this is a no-op.
+ * Returns a back buffer surface of the given size to which Flutter can render content.
+ * A cached surface will be returned if available; otherwise a new one will be created.
+ *
+ * Must be called on raster thread.
  */
-- (void)ensureSurfaceSize:(CGSize)size;
+- (nonnull FlutterSurface*)surfaceForSize:(CGSize)size;
 
 /**
- * Swaps the front and the back buffer.
+ * Sets the provided surfaces as contents of FlutterView. Will create, update and
+ * remove sublayers as needed.
+ *
+ * Must be called on raster thread. This will schedule a commit on the platform thread and block the
+ * raster thread until the commit is done. The `notify` block will be invoked on the platform thread
+ * and can be used to perform additional work, such as mutating platform views. It is guaranteed be
+ * called in the same CATransaction.
  */
-- (void)swapBuffers;
+- (void)presentSurfaces:(nonnull NSArray<FlutterSurfacePresentInfo*>*)surfaces
+                 atTime:(CFTimeInterval)presentationTime
+                 notify:(nullable dispatch_block_t)notify;
+
+@end
 
 /**
- * Returns the backing store for the back buffer.
+ * Cache of back buffers to prevent unnecessary IOSurface allocations.
  */
-- (nonnull FlutterRenderBackingStore*)renderBuffer;
+@interface FlutterBackBufferCache : NSObject
+
+/**
+ * Removes surface with given size from cache (if available) and returns it.
+ */
+- (nullable FlutterSurface*)removeSurfaceForSize:(CGSize)size;
+
+/**
+ * Removes all cached surfaces replacing them with new ones.
+ */
+- (void)replaceSurfaces:(nonnull NSArray<FlutterSurface*>*)surfaces;
+
+/**
+ * Returns number of surfaces currently in cache. Used for tests.
+ */
+- (NSUInteger)count;
+
+@end
+
+/**
+ * Interface to internal properties used for testing.
+ */
+@interface FlutterSurfaceManager (Private)
+
+@property(readonly, nonatomic, nonnull) FlutterBackBufferCache* backBufferCache;
+@property(readonly, nonatomic, nonnull) NSArray<FlutterSurface*>* frontSurfaces;
+@property(readonly, nonatomic, nonnull) NSArray<CALayer*>* layers;
 
 @end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERSURFACEMANAGER_H_
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterSurfaceManager.mm b/shell/platform/darwin/macos/framework/Source/FlutterSurfaceManager.mm
index d3d612fd294c80b3b2bb3fe7b867801d02e2b502..bed88bf5810829aced0e3cbdc38438f227a14e6b 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterSurfaceManager.mm
+++ b/shell/platform/darwin/macos/framework/Source/FlutterSurfaceManager.mm
@@ -8,154 +8,323 @@
 
 #include <algorithm>
 
-#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterIOSurfaceHolder.h"
+#include "flutter/fml/logging.h"
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterSurface.h"
 
-enum {
-  kFlutterSurfaceManagerFrontBuffer = 0,
-  kFlutterSurfaceManagerBackBuffer = 1,
-  kFlutterSurfaceManagerBufferCount,
-};
+@implementation FlutterSurfacePresentInfo
+@end
 
-// BackBuffer will be released after kIdleDelay if there is no activity.
-static const double kIdleDelay = 1.0;
+@interface FlutterSurfaceManager () {
+  id<MTLDevice> _device;
+  id<MTLCommandQueue> _commandQueue;
+  CALayer* _containingLayer;
+  __weak id<FlutterSurfaceManagerDelegate> _delegate;
 
-@interface FlutterSurfaceManager ()
+  // Available (cached) back buffer surfaces. These will be cleared during
+  // present and replaced by current frong surfaces.
+  FlutterBackBufferCache* _backBufferCache;
 
-/**
- * Cancels any previously-scheduled onIdle requests.
- */
-- (void)cancelIdle;
+  // Surfaces currently used to back visible layers.
+  NSMutableArray<FlutterSurface*>* _frontSurfaces;
+
+  // Currently visible layers.
+  NSMutableArray<CALayer*>* _layers;
+
+  // Whether to highlight borders of overlay surfaces. Determined by
+  // FLTEnableSurfaceDebugInfo value in main bundle Info.plist.
+  NSNumber* _enableSurfaceDebugInfo;
+  CATextLayer* _infoLayer;
+
+  CFTimeInterval _lastPresentationTime;
+}
 
 /**
- * Creates a backing textures for the specified surface with the specified size.
+ * Updates underlying CALayers with the contents of the surfaces to present.
  */
-- (id<MTLTexture>)createTextureForSurface:(FlutterIOSurfaceHolder*)surface size:(CGSize)size;
+- (void)commit:(NSArray<FlutterSurfacePresentInfo*>*)surfaces;
 
 @end
 
-@implementation FlutterSurfaceManager {
-  CALayer* _containingLayer;  // provided (parent layer)
-  CALayer* _contentLayer;
-  CATransform3D _contentTransform;
+static NSColor* GetBorderColorForLayer(int layer) {
+  NSArray* colors = @[
+    [NSColor yellowColor],
+    [NSColor cyanColor],
+    [NSColor magentaColor],
+    [NSColor greenColor],
+    [NSColor purpleColor],
+    [NSColor orangeColor],
+    [NSColor blueColor],
+  ];
+  return colors[layer % colors.count];
+}
+
+/// Creates sublayers for given layer, each one displaying a portion of the
+/// of the surface determined by a rectangle in the provided paint region.
+static void UpdateContentSubLayers(CALayer* layer,
+                                   IOSurfaceRef surface,
+                                   CGFloat scale,
+                                   CGSize surfaceSize,
+                                   NSColor* borderColor,
+                                   const std::vector<FlutterRect>& paintRegion) {
+  // Adjust sublayer count to paintRegion count.
+  while (layer.sublayers.count > paintRegion.size()) {
+    [layer.sublayers.lastObject removeFromSuperlayer];
+  }
 
-  CGSize _surfaceSize;
-  FlutterIOSurfaceHolder* _ioSurfaces[kFlutterSurfaceManagerBufferCount];
-  BOOL _frameInProgress;
+  while (layer.sublayers.count < paintRegion.size()) {
+    CALayer* newLayer = [CALayer layer];
+    [layer addSublayer:newLayer];
+  }
 
-  id<MTLDevice> _device;
-  id<MTLCommandQueue> _commandQueue;
-  id<MTLTexture> _textures[kFlutterSurfaceManagerBufferCount];
-}
+  for (size_t i = 0; i < paintRegion.size(); i++) {
+    CALayer* subLayer = [layer.sublayers objectAtIndex:i];
+    const auto& rect = paintRegion[i];
+    subLayer.frame = CGRectMake(rect.left / scale, rect.top / scale,
+                                (rect.right - rect.left) / scale, (rect.bottom - rect.top) / scale);
 
-- (nullable instancetype)initWithDevice:(nonnull id<MTLDevice>)device
-                           commandQueue:(nonnull id<MTLCommandQueue>)commandQueue
-                                  layer:(nonnull CALayer*)containingLayer {
-  self = [super init];
-  if (self) {
-    _containingLayer = containingLayer;
-    _contentTransform = CATransform3DIdentity;
-    _contentLayer = [[CALayer alloc] init];
-    [_containingLayer addSublayer:_contentLayer];
+    double width = surfaceSize.width;
+    double height = surfaceSize.height;
+
+    subLayer.contentsRect =
+        CGRectMake(rect.left / width, rect.top / height, (rect.right - rect.left) / width,
+                   (rect.bottom - rect.top) / height);
+
+    if (borderColor != nil) {
+      // Visualize sublayer
+      subLayer.borderColor = borderColor.CGColor;
+      subLayer.borderWidth = 1.0;
+    }
+
+    subLayer.contents = (__bridge id)surface;
+  }
+}
 
-    _ioSurfaces[0] = [[FlutterIOSurfaceHolder alloc] init];
-    _ioSurfaces[1] = [[FlutterIOSurfaceHolder alloc] init];
+@implementation FlutterSurfaceManager
 
+- (instancetype)initWithDevice:(id<MTLDevice>)device
+                  commandQueue:(id<MTLCommandQueue>)commandQueue
+                         layer:(CALayer*)containingLayer
+                      delegate:(__weak id<FlutterSurfaceManagerDelegate>)delegate {
+  if (self = [super init]) {
     _device = device;
     _commandQueue = commandQueue;
+    _containingLayer = containingLayer;
+    _delegate = delegate;
+
+    _backBufferCache = [[FlutterBackBufferCache alloc] init];
+    _frontSurfaces = [NSMutableArray array];
+    _layers = [NSMutableArray array];
   }
   return self;
 }
 
-- (void)ensureSurfaceSize:(CGSize)size {
-  if (CGSizeEqualToSize(size, _surfaceSize)) {
-    return;
+- (FlutterBackBufferCache*)backBufferCache {
+  return _backBufferCache;
+}
+
+- (NSArray*)frontSurfaces {
+  return _frontSurfaces;
+}
+
+- (NSArray*)layers {
+  return _layers;
+}
+
+- (FlutterSurface*)surfaceForSize:(CGSize)size {
+  FlutterSurface* surface = [_backBufferCache removeSurfaceForSize:size];
+  if (surface == nil) {
+    surface = [[FlutterSurface alloc] initWithSize:size device:_device];
   }
-  _surfaceSize = size;
-  for (int i = 0; i < kFlutterSurfaceManagerBufferCount; ++i) {
-    if (_ioSurfaces[i] != nil) {
-      [_ioSurfaces[i] recreateIOSurfaceWithSize:size];
-      _textures[i] = [self createTextureForSurface:_ioSurfaces[i] size:size];
+  return surface;
+}
+
+- (BOOL)enableSurfaceDebugInfo {
+  if (_enableSurfaceDebugInfo == nil) {
+    _enableSurfaceDebugInfo =
+        [[NSBundle mainBundle] objectForInfoDictionaryKey:@"FLTEnableSurfaceDebugInfo"];
+    if (_enableSurfaceDebugInfo == nil) {
+      _enableSurfaceDebugInfo = @NO;
     }
   }
+  return [_enableSurfaceDebugInfo boolValue];
 }
 
-- (void)swapBuffers {
-#ifndef NDEBUG
-  // swapBuffers should not be called unless a frame was drawn
-  @synchronized(self) {
-    assert(_frameInProgress);
+- (void)commit:(NSArray<FlutterSurfacePresentInfo*>*)surfaces {
+  FML_DCHECK([NSThread isMainThread]);
+
+  // Release all unused back buffer surfaces and replace them with front surfaces.
+  [_backBufferCache replaceSurfaces:_frontSurfaces];
+
+  // Front surfaces will be replaced by currently presented surfaces.
+  [_frontSurfaces removeAllObjects];
+  for (FlutterSurfacePresentInfo* info in surfaces) {
+    [_frontSurfaces addObject:info.surface];
   }
-#endif
 
-  _contentLayer.frame = _containingLayer.bounds;
-  _contentLayer.transform = _contentTransform;
-  IOSurfaceRef contentIOSurface = [_ioSurfaces[kFlutterSurfaceManagerBackBuffer] ioSurface];
-  [_contentLayer setContents:(__bridge id)contentIOSurface];
+  // Add or remove layers to match the count of surfaces to present.
+  while (_layers.count > _frontSurfaces.count) {
+    [_layers.lastObject removeFromSuperlayer];
+    [_layers removeLastObject];
+  }
+  while (_layers.count < _frontSurfaces.count) {
+    CALayer* layer = [CALayer layer];
+    [_containingLayer addSublayer:layer];
+    [_layers addObject:layer];
+  }
 
-  std::swap(_ioSurfaces[kFlutterSurfaceManagerBackBuffer],
-            _ioSurfaces[kFlutterSurfaceManagerFrontBuffer]);
-  std::swap(_textures[kFlutterSurfaceManagerBackBuffer],
-            _textures[kFlutterSurfaceManagerFrontBuffer]);
+  bool enableSurfaceDebugInfo = self.enableSurfaceDebugInfo;
 
-  // performSelector:withObject:afterDelay needs to be performed on RunLoop thread
-  [self performSelectorOnMainThread:@selector(reschedule) withObject:nil waitUntilDone:NO];
+  // Update contents of surfaces.
+  for (size_t i = 0; i < surfaces.count; ++i) {
+    FlutterSurfacePresentInfo* info = surfaces[i];
+    CALayer* layer = _layers[i];
+    CGFloat scale = _containingLayer.contentsScale;
+    if (i == 0) {
+      layer.frame = CGRectMake(info.offset.x / scale, info.offset.y / scale,
+                               info.surface.size.width / scale, info.surface.size.height / scale);
+      layer.contents = (__bridge id)info.surface.ioSurface;
+    } else {
+      layer.frame = CGRectZero;
+      NSColor* borderColor = enableSurfaceDebugInfo ? GetBorderColorForLayer(i - 1) : nil;
+      UpdateContentSubLayers(layer, info.surface.ioSurface, scale, info.surface.size, borderColor,
+                             info.paintRegion);
+    }
+    layer.zPosition = info.zIndex;
+  }
 
-  @synchronized(self) {
-    _frameInProgress = NO;
+  if (enableSurfaceDebugInfo) {
+    if (_infoLayer == nil) {
+      _infoLayer = [[CATextLayer alloc] init];
+      [_containingLayer addSublayer:_infoLayer];
+      _infoLayer.fontSize = 15;
+      _infoLayer.foregroundColor = [NSColor yellowColor].CGColor;
+      _infoLayer.frame = CGRectMake(15, 15, 300, 100);
+      _infoLayer.contentsScale = _containingLayer.contentsScale;
+      _infoLayer.zPosition = 100000;
+    }
+    _infoLayer.string = [NSString stringWithFormat:@"Surface count: %li", _layers.count];
   }
 }
 
-- (void)reschedule {
-  [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(onIdle) object:nil];
-  [self performSelector:@selector(onIdle) withObject:nil afterDelay:kIdleDelay];
+static CGSize GetRequiredFrameSize(NSArray<FlutterSurfacePresentInfo*>* surfaces) {
+  CGSize size = CGSizeZero;
+  for (FlutterSurfacePresentInfo* info in surfaces) {
+    size = CGSizeMake(std::max(size.width, info.offset.x + info.surface.size.width),
+                      std::max(size.height, info.offset.y + info.surface.size.height));
+  }
+  return size;
 }
 
-- (void)onIdle {
-  @synchronized(self) {
-    if (!_frameInProgress) {
-      // Release the back buffer and notify delegate. The buffer will be restored
-      // on demand in ensureBackBuffer
-      _ioSurfaces[kFlutterSurfaceManagerBackBuffer] = nil;
-      _textures[kFlutterSurfaceManagerBackBuffer] = nil;
+- (void)presentSurfaces:(NSArray<FlutterSurfacePresentInfo*>*)surfaces
+                 atTime:(CFTimeInterval)presentationTime
+                 notify:(dispatch_block_t)notify {
+  id<MTLCommandBuffer> commandBuffer = [_commandQueue commandBuffer];
+  [commandBuffer commit];
+  [commandBuffer waitUntilScheduled];
+
+  dispatch_block_t presentBlock = ^{
+    // Get the actual dimensions of the frame (relevant for thread synchronizer).
+    CGSize size = GetRequiredFrameSize(surfaces);
+    [_delegate onPresent:size
+               withBlock:^{
+                 _lastPresentationTime = presentationTime;
+                 [self commit:surfaces];
+                 if (notify != nil) {
+                   notify();
+                 }
+               }];
+  };
+
+  if (presentationTime > 0) {
+    // Enforce frame pacing. It seems that the target timestamp of CVDisplayLink does not
+    // exactly correspond to core animation deadline. Especially with 120hz, setting the frame
+    // contents too close after previous target timestamp will result in uneven frame pacing.
+    // Empirically setting the content in the second half of frame interval seems to work
+    // well for both 60hz and 120hz.
+    //
+    // This schedules a timer on current (raster) thread runloop. Raster thread at
+    // this point should be idle (the next frame vsync has not been signalled yet).
+    //
+    // Alternative could be simply blocking the raster thread, but that would show
+    // as a average_frame_rasterizer_time_millis regresson.
+    CFTimeInterval minPresentationTime = (presentationTime + _lastPresentationTime) / 2.0;
+    CFTimeInterval now = CACurrentMediaTime();
+    if (now < minPresentationTime) {
+      NSTimer* timer = [NSTimer timerWithTimeInterval:minPresentationTime - now
+                                              repeats:NO
+                                                block:^(NSTimer* timer) {
+                                                  presentBlock();
+                                                }];
+      [[NSRunLoop currentRunLoop] addTimer:timer forMode:NSDefaultRunLoopMode];
+      return;
     }
   }
+  presentBlock();
+}
+
+@end
+
+// Cached back buffers will be released after kIdleDelay if there is no activity.
+static const double kIdleDelay = 1.0;
+
+@interface FlutterBackBufferCache () {
+  NSMutableArray<FlutterSurface*>* _surfaces;
+}
+
+@end
+
+@implementation FlutterBackBufferCache
+
+- (instancetype)init {
+  if (self = [super init]) {
+    self->_surfaces = [[NSMutableArray alloc] init];
+  }
+  return self;
 }
 
-- (void)ensureBackBuffer {
+- (nullable FlutterSurface*)removeSurfaceForSize:(CGSize)size {
   @synchronized(self) {
-    _frameInProgress = YES;
-    if (_ioSurfaces[kFlutterSurfaceManagerBackBuffer] == nil) {
-      // Restore previously released backbuffer
-      _ioSurfaces[kFlutterSurfaceManagerBackBuffer] = [[FlutterIOSurfaceHolder alloc] init];
-      [_ioSurfaces[kFlutterSurfaceManagerBackBuffer] recreateIOSurfaceWithSize:_surfaceSize];
-      _textures[kFlutterSurfaceManagerBackBuffer] =
-          [self createTextureForSurface:_ioSurfaces[kFlutterSurfaceManagerBackBuffer]
-                                   size:_surfaceSize];
+    for (FlutterSurface* surface in _surfaces) {
+      if (CGSizeEqualToSize(surface.size, size)) {
+        // By default ARC doesn't retain enumeration iteration variables.
+        FlutterSurface* res = surface;
+        [_surfaces removeObject:surface];
+        return res;
+      }
     }
-  };
-  [self performSelectorOnMainThread:@selector(cancelIdle) withObject:nil waitUntilDone:NO];
+    return nil;
+  }
 }
 
-- (void)cancelIdle {
-  [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(onIdle) object:nil];
+- (void)replaceSurfaces:(nonnull NSArray<FlutterSurface*>*)surfaces {
+  @synchronized(self) {
+    [_surfaces removeAllObjects];
+    [_surfaces addObjectsFromArray:surfaces];
+  }
+
+  // performSelector:withObject:afterDelay needs to be performed on RunLoop thread
+  [self performSelectorOnMainThread:@selector(reschedule) withObject:nil waitUntilDone:NO];
+}
+
+- (NSUInteger)count {
+  @synchronized(self) {
+    return _surfaces.count;
+  }
 }
 
-- (nonnull FlutterRenderBackingStore*)renderBuffer {
-  [self ensureBackBuffer];
-  id<MTLTexture> texture = _textures[kFlutterSurfaceManagerBackBuffer];
-  return [[FlutterRenderBackingStore alloc] initWithTexture:texture];
+- (void)onIdle {
+  @synchronized(self) {
+    [_surfaces removeAllObjects];
+  }
 }
 
-- (id<MTLTexture>)createTextureForSurface:(FlutterIOSurfaceHolder*)surface size:(CGSize)size {
-  MTLTextureDescriptor* textureDescriptor =
-      [MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatBGRA8Unorm
-                                                         width:size.width
-                                                        height:size.height
-                                                     mipmapped:NO];
-  textureDescriptor.usage =
-      MTLTextureUsageShaderRead | MTLTextureUsageRenderTarget | MTLTextureUsageShaderWrite;
-  // plane = 0 for BGRA.
-  return [_device newTextureWithDescriptor:textureDescriptor iosurface:[surface ioSurface] plane:0];
+- (void)reschedule {
+  [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(onIdle) object:nil];
+  [self performSelector:@selector(onIdle) withObject:nil afterDelay:kIdleDelay];
+}
+
+- (void)dealloc {
+  [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(onIdle) object:nil];
 }
 
 @end
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterSurfaceManagerTest.mm b/shell/platform/darwin/macos/framework/Source/FlutterSurfaceManagerTest.mm
index b9e1742abd5471cc3a671006bbbca1cad2be0278..04471eb914863f786b0b3c027ab6982ec2d7c4c4 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterSurfaceManagerTest.mm
+++ b/shell/platform/darwin/macos/framework/Source/FlutterSurfaceManagerTest.mm
@@ -3,14 +3,17 @@
 // found in the LICENSE file.
 
 #import <Cocoa/Cocoa.h>
-#import <OCMock/OCMock.h>
+#import <Metal/Metal.h>
 
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterSurface.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterSurfaceManager.h"
+
 #include "flutter/testing/testing.h"
 #include "gtest/gtest.h"
 
-@interface TestView : NSView
+@interface TestView : NSView <FlutterSurfaceManagerDelegate>
 
+@property(readwrite, nonatomic) CGSize presentedFrameSize;
 - (nonnull instancetype)init;
 
 @end
@@ -21,42 +24,244 @@
   self = [super initWithFrame:NSZeroRect];
   if (self) {
     [self setWantsLayer:YES];
+    self.layer.contentsScale = 2.0;
   }
   return self;
 }
 
+- (void)onPresent:(CGSize)frameSize withBlock:(nonnull dispatch_block_t)block {
+  self.presentedFrameSize = frameSize;
+  block();
+}
+
 @end
 
 namespace flutter::testing {
 
-static FlutterSurfaceManager* CreateSurfaceManager() {
+static FlutterSurfaceManager* CreateSurfaceManager(TestView* testView) {
   id<MTLDevice> device = MTLCreateSystemDefaultDevice();
   id<MTLCommandQueue> commandQueue = [device newCommandQueue];
-  TestView* metalView = [[TestView alloc] init];
-  CALayer* layer = reinterpret_cast<CALayer*>(metalView.layer);
+  CALayer* layer = reinterpret_cast<CALayer*>(testView.layer);
   return [[FlutterSurfaceManager alloc] initWithDevice:device
                                           commandQueue:commandQueue
-                                                 layer:layer];
-}
-
-TEST(FlutterSurfaceManager, EnsureSizeUpdatesSize) {
-  FlutterSurfaceManager* surfaceManager = CreateSurfaceManager();
-  CGSize size = CGSizeMake(100, 50);
-  [surfaceManager ensureSurfaceSize:size];
-  id<MTLTexture> texture = [surfaceManager renderBuffer].texture;
-  CGSize textureSize = CGSizeMake(texture.width, texture.height);
-  ASSERT_TRUE(CGSizeEqualToSize(size, textureSize));
-}
-
-TEST(FlutterSurfaceManager, EnsureSizeUpdatesSizeForBackBuffer) {
-  FlutterSurfaceManager* surfaceManager = CreateSurfaceManager();
-  CGSize size = CGSizeMake(100, 50);
-  [surfaceManager ensureSurfaceSize:size];
-  [surfaceManager renderBuffer];  // make sure we have back buffer
-  [surfaceManager swapBuffers];
-  id<MTLTexture> texture = [surfaceManager renderBuffer].texture;
-  CGSize textureSize = CGSizeMake(texture.width, texture.height);
-  ASSERT_TRUE(CGSizeEqualToSize(size, textureSize));
+                                                 layer:layer
+                                              delegate:testView];
+}
+
+static FlutterSurfacePresentInfo* CreatePresentInfo(
+    FlutterSurface* surface,
+    CGPoint offset = CGPointZero,
+    size_t index = 0,
+    const std::vector<FlutterRect>& paintRegion = {}) {
+  FlutterSurfacePresentInfo* res = [[FlutterSurfacePresentInfo alloc] init];
+  res.surface = surface;
+  res.offset = offset;
+  res.zIndex = index;
+  res.paintRegion = paintRegion;
+  return res;
+}
+
+TEST(FlutterSurfaceManager, MetalTextureSizeMatchesSurfaceSize) {
+  TestView* testView = [[TestView alloc] init];
+  FlutterSurfaceManager* surfaceManager = CreateSurfaceManager(testView);
+
+  // Get back buffer, lookup should work for borrowed surfaces util present.
+  auto surface = [surfaceManager surfaceForSize:CGSizeMake(100, 50)];
+  auto texture = surface.asFlutterMetalTexture;
+  id<MTLTexture> metalTexture = (__bridge id)texture.texture;
+  EXPECT_EQ(metalTexture.width, 100ul);
+  EXPECT_EQ(metalTexture.height, 50ul);
+  texture.destruction_callback(texture.user_data);
+}
+
+TEST(FlutterSurfaceManager, TestSurfaceLookupFromTexture) {
+  TestView* testView = [[TestView alloc] init];
+  FlutterSurfaceManager* surfaceManager = CreateSurfaceManager(testView);
+
+  // Get back buffer, lookup should work for borrowed surfaces util present.
+  auto surface = [surfaceManager surfaceForSize:CGSizeMake(100, 50)];
+
+  // SurfaceManager should keep texture alive while borrowed.
+  auto texture = surface.asFlutterMetalTexture;
+  texture.destruction_callback(texture.user_data);
+
+  FlutterMetalTexture dummyTexture{.texture_id = 1, .texture = nullptr, .user_data = nullptr};
+  auto surface1 = [FlutterSurface fromFlutterMetalTexture:&dummyTexture];
+  EXPECT_EQ(surface1, nil);
+
+  auto surface2 = [FlutterSurface fromFlutterMetalTexture:&texture];
+  EXPECT_EQ(surface2, surface);
+}
+
+TEST(FlutterSurfaceManager, BackBufferCacheDoesNotLeak) {
+  TestView* testView = [[TestView alloc] init];
+  FlutterSurfaceManager* surfaceManager = CreateSurfaceManager(testView);
+  EXPECT_EQ(surfaceManager.backBufferCache.count, 0ul);
+
+  auto surface1 = [surfaceManager surfaceForSize:CGSizeMake(100, 100)];
+  [surfaceManager presentSurfaces:@[ CreatePresentInfo(surface1) ] atTime:0 notify:nil];
+
+  EXPECT_EQ(surfaceManager.backBufferCache.count, 0ul);
+
+  auto surface2 = [surfaceManager surfaceForSize:CGSizeMake(110, 110)];
+  [surfaceManager presentSurfaces:@[ CreatePresentInfo(surface2) ] atTime:0 notify:nil];
+
+  EXPECT_EQ(surfaceManager.backBufferCache.count, 1ul);
+
+  auto surface3 = [surfaceManager surfaceForSize:CGSizeMake(120, 120)];
+  [surfaceManager presentSurfaces:@[ CreatePresentInfo(surface3) ] atTime:0 notify:nil];
+
+  // Cache should be cleaned during present and only contain the last visible
+  // surface(s).
+  EXPECT_EQ(surfaceManager.backBufferCache.count, 1ul);
+  auto surfaceFromCache = [surfaceManager surfaceForSize:CGSizeMake(110, 110)];
+  EXPECT_EQ(surfaceFromCache, surface2);
+
+  [surfaceManager presentSurfaces:@[] atTime:0 notify:nil];
+  EXPECT_EQ(surfaceManager.backBufferCache.count, 1ul);
+
+  [surfaceManager presentSurfaces:@[] atTime:0 notify:nil];
+  EXPECT_EQ(surfaceManager.backBufferCache.count, 0ul);
+}
+
+TEST(FlutterSurfaceManager, SurfacesAreRecycled) {
+  TestView* testView = [[TestView alloc] init];
+  FlutterSurfaceManager* surfaceManager = CreateSurfaceManager(testView);
+
+  EXPECT_EQ(surfaceManager.frontSurfaces.count, 0ul);
+
+  // Get first surface and present it.
+
+  auto surface1 = [surfaceManager surfaceForSize:CGSizeMake(100, 100)];
+  EXPECT_TRUE(CGSizeEqualToSize(surface1.size, CGSizeMake(100, 100)));
+
+  EXPECT_EQ(surfaceManager.backBufferCache.count, 0ul);
+  EXPECT_EQ(surfaceManager.frontSurfaces.count, 0ul);
+
+  [surfaceManager presentSurfaces:@[ CreatePresentInfo(surface1) ] atTime:0 notify:nil];
+
+  EXPECT_EQ(surfaceManager.backBufferCache.count, 0ul);
+  EXPECT_EQ(surfaceManager.frontSurfaces.count, 1ul);
+  EXPECT_EQ(testView.layer.sublayers.count, 1ul);
+
+  // Get second surface and present it.
+
+  auto surface2 = [surfaceManager surfaceForSize:CGSizeMake(100, 100)];
+  EXPECT_TRUE(CGSizeEqualToSize(surface2.size, CGSizeMake(100, 100)));
+
+  EXPECT_EQ(surfaceManager.backBufferCache.count, 0ul);
+
+  [surfaceManager presentSurfaces:@[ CreatePresentInfo(surface2) ] atTime:0 notify:nil];
+
+  // Check that current front surface returns to cache.
+  EXPECT_EQ(surfaceManager.backBufferCache.count, 1ul);
+  EXPECT_EQ(surfaceManager.frontSurfaces.count, 1ul);
+  EXPECT_EQ(testView.layer.sublayers.count, 1ull);
+
+  // Check that surface is properly reused.
+  auto surface3 = [surfaceManager surfaceForSize:CGSizeMake(100, 100)];
+  EXPECT_EQ(surface3, surface1);
+}
+
+inline bool operator==(const CGRect& lhs, const CGRect& rhs) {
+  return CGRectEqualToRect(lhs, rhs);
+}
+
+TEST(FlutterSurfaceManager, LayerManagement) {
+  TestView* testView = [[TestView alloc] init];
+  FlutterSurfaceManager* surfaceManager = CreateSurfaceManager(testView);
+
+  EXPECT_EQ(testView.layer.sublayers.count, 0ul);
+
+  auto surface1_1 = [surfaceManager surfaceForSize:CGSizeMake(50, 30)];
+  [surfaceManager presentSurfaces:@[ CreatePresentInfo(surface1_1, CGPointMake(20, 10)) ]
+                           atTime:0
+                           notify:nil];
+
+  EXPECT_EQ(testView.layer.sublayers.count, 1ul);
+  EXPECT_TRUE(CGSizeEqualToSize(testView.presentedFrameSize, CGSizeMake(70, 40)));
+
+  auto surface2_1 = [surfaceManager surfaceForSize:CGSizeMake(50, 30)];
+  auto surface2_2 = [surfaceManager surfaceForSize:CGSizeMake(20, 20)];
+  [surfaceManager presentSurfaces:@[
+    CreatePresentInfo(surface2_1, CGPointMake(20, 10), 1),
+    CreatePresentInfo(surface2_2, CGPointMake(40, 50), 2,
+                      {
+                          FlutterRect{0, 0, 20, 20},
+                          FlutterRect{40, 0, 60, 20},
+                      })
+  ]
+                           atTime:0
+                           notify:nil];
+
+  EXPECT_EQ(testView.layer.sublayers.count, 2ul);
+  EXPECT_EQ(testView.layer.sublayers[0].zPosition, 1.0);
+  EXPECT_EQ(testView.layer.sublayers[1].zPosition, 2.0);
+  CALayer* firstOverlaySublayer;
+  {
+    NSArray<CALayer*>* sublayers = testView.layer.sublayers[1].sublayers;
+    EXPECT_EQ(sublayers.count, 2ul);
+    EXPECT_TRUE(CGRectEqualToRect(sublayers[0].frame, CGRectMake(0, 0, 10, 10)));
+    EXPECT_TRUE(CGRectEqualToRect(sublayers[1].frame, CGRectMake(20, 0, 10, 10)));
+    EXPECT_TRUE(CGRectEqualToRect(sublayers[0].contentsRect, CGRectMake(0, 0, 1, 1)));
+    EXPECT_TRUE(CGRectEqualToRect(sublayers[1].contentsRect, CGRectMake(2, 0, 1, 1)));
+    EXPECT_EQ(sublayers[0].contents, sublayers[1].contents);
+    firstOverlaySublayer = sublayers[0];
+  }
+  EXPECT_TRUE(CGSizeEqualToSize(testView.presentedFrameSize, CGSizeMake(70, 70)));
+
+  // Check second overlay sublayer is removed while first is reused and updated
+  [surfaceManager presentSurfaces:@[
+    CreatePresentInfo(surface2_1, CGPointMake(20, 10), 1),
+    CreatePresentInfo(surface2_2, CGPointMake(40, 50), 2,
+                      {
+                          FlutterRect{0, 10, 20, 20},
+                      })
+  ]
+                           atTime:0
+                           notify:nil];
+  EXPECT_EQ(testView.layer.sublayers.count, 2ul);
+  {
+    NSArray<CALayer*>* sublayers = testView.layer.sublayers[1].sublayers;
+    EXPECT_EQ(sublayers.count, 1ul);
+    EXPECT_EQ(sublayers[0], firstOverlaySublayer);
+    EXPECT_TRUE(CGRectEqualToRect(sublayers[0].frame, CGRectMake(0, 5, 10, 5)));
+  }
+
+  // Check that second overlay sublayer is added back while first is reused and updated
+  [surfaceManager presentSurfaces:@[
+    CreatePresentInfo(surface2_1, CGPointMake(20, 10), 1),
+    CreatePresentInfo(surface2_2, CGPointMake(40, 50), 2,
+                      {
+                          FlutterRect{0, 0, 20, 20},
+                          FlutterRect{40, 0, 60, 20},
+                      })
+  ]
+                           atTime:0
+                           notify:nil];
+
+  EXPECT_EQ(testView.layer.sublayers.count, 2ul);
+  {
+    NSArray<CALayer*>* sublayers = testView.layer.sublayers[1].sublayers;
+    EXPECT_EQ(sublayers.count, 2ul);
+    EXPECT_EQ(sublayers[0], firstOverlaySublayer);
+    EXPECT_TRUE(CGRectEqualToRect(sublayers[0].frame, CGRectMake(0, 0, 10, 10)));
+    EXPECT_TRUE(CGRectEqualToRect(sublayers[1].frame, CGRectMake(20, 0, 10, 10)));
+    EXPECT_EQ(sublayers[0].contents, sublayers[1].contents);
+  }
+
+  auto surface3_1 = [surfaceManager surfaceForSize:CGSizeMake(50, 30)];
+  [surfaceManager presentSurfaces:@[ CreatePresentInfo(surface3_1, CGPointMake(20, 10)) ]
+                           atTime:0
+                           notify:nil];
+
+  EXPECT_EQ(testView.layer.sublayers.count, 1ul);
+  EXPECT_TRUE(CGSizeEqualToSize(testView.presentedFrameSize, CGSizeMake(70, 40)));
+
+  // Check removal of all surfaces.
+  [surfaceManager presentSurfaces:@[] atTime:0 notify:nil];
+  EXPECT_EQ(testView.layer.sublayers.count, 0ul);
+  EXPECT_TRUE(CGSizeEqualToSize(testView.presentedFrameSize, CGSizeMake(0, 0)));
 }
 
 }  // namespace flutter::testing
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterTextInputPlugin.h b/shell/platform/darwin/macos/framework/Source/FlutterTextInputPlugin.h
index dedfc661884f604b4c295a9b4a93fe55ef569063..dbfe75b3211145a96efda6a6babbb7620464267f 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterTextInputPlugin.h
+++ b/shell/platform/darwin/macos/framework/Source/FlutterTextInputPlugin.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERTEXTINPUTPLUGIN_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERTEXTINPUTPLUGIN_H_
+
 #import <Cocoa/Cocoa.h>
 
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h"
@@ -64,5 +67,8 @@
 - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result;
 - (NSRect)firstRectForCharacterRange:(NSRange)range actualRange:(NSRangePointer)actualRange;
 - (NSDictionary*)editingState;
+@property(nonatomic) NSTextInputContext* textInputContext;
 @property(readwrite, nonatomic) NSString* customRunLoopMode;
 @end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERTEXTINPUTPLUGIN_H_
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterTextInputPlugin.mm b/shell/platform/darwin/macos/framework/Source/FlutterTextInputPlugin.mm
index d6687772bc7f500de32af2c1c90c04266e058e63..33adfa909dc6525dbf81dc97d621a50f07067238 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterTextInputPlugin.mm
+++ b/shell/platform/darwin/macos/framework/Source/FlutterTextInputPlugin.mm
@@ -14,12 +14,13 @@
 #include "flutter/shell/platform/common/text_editing_delta.h"
 #include "flutter/shell/platform/common/text_input_model.h"
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterCodecs.h"
-#import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterAppDelegate.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputSemanticsObject.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterViewController_Internal.h"
+#import "flutter/shell/platform/darwin/macos/framework/Source/NSView+ClipsToBounds.h"
 
 static NSString* const kTextInputChannel = @"flutter/textinput";
 
+#pragma mark - TextInput channel method names
 // See https://api.flutter.dev/flutter/services/SystemChannels/textInput-constant.html
 static NSString* const kSetClientMethod = @"TextInput.setClient";
 static NSString* const kShowMethod = @"TextInput.show";
@@ -35,14 +36,12 @@ static NSString* const kPerformAction = @"TextInputClient.performAction";
 static NSString* const kPerformSelectors = @"TextInputClient.performSelectors";
 static NSString* const kMultilineInputType = @"TextInputType.multiline";
 
-static NSString* const kTextAffinityDownstream = @"TextAffinity.downstream";
-static NSString* const kTextAffinityUpstream = @"TextAffinity.upstream";
-
+#pragma mark - TextInputConfiguration field names
+static NSString* const kSecureTextEntry = @"obscureText";
 static NSString* const kTextInputAction = @"inputAction";
 static NSString* const kEnableDeltaModel = @"enableDeltaModel";
 static NSString* const kTextInputType = @"inputType";
 static NSString* const kTextInputTypeName = @"name";
-
 static NSString* const kSelectionBaseKey = @"selectionBase";
 static NSString* const kSelectionExtentKey = @"selectionExtent";
 static NSString* const kSelectionAffinityKey = @"selectionAffinity";
@@ -51,17 +50,34 @@ static NSString* const kComposingBaseKey = @"composingBase";
 static NSString* const kComposingExtentKey = @"composingExtent";
 static NSString* const kTextKey = @"text";
 static NSString* const kTransformKey = @"transform";
+static NSString* const kAssociatedAutofillFields = @"fields";
+
+// TextInputConfiguration.autofill and sub-field names
+static NSString* const kAutofillProperties = @"autofill";
+static NSString* const kAutofillId = @"uniqueIdentifier";
+static NSString* const kAutofillEditingValue = @"editingValue";
+static NSString* const kAutofillHints = @"hints";
+
+// TextAffinity types
+static NSString* const kTextAffinityDownstream = @"TextAffinity.downstream";
+static NSString* const kTextAffinityUpstream = @"TextAffinity.upstream";
+
+// TextInputAction types
+static NSString* const kInputActionNewline = @"TextInputAction.newline";
 
+#pragma mark - Enums
 /**
- * The affinity of the current cursor position. If the cursor is at a position representing
- * a line break, the cursor may be drawn either at the end of the current line (upstream)
- * or at the beginning of the next (downstream).
+ * The affinity of the current cursor position. If the cursor is at a position
+ * representing a soft line break, the cursor may be drawn either at the end of
+ * the current line (upstream) or at the beginning of the next (downstream).
  */
 typedef NS_ENUM(NSUInteger, FlutterTextAffinity) {
   kFlutterTextAffinityUpstream,
   kFlutterTextAffinityDownstream
 };
 
+#pragma mark - Static functions
+
 /*
  * Updates a range given base and extent fields.
  */
@@ -77,6 +93,81 @@ static flutter::TextRange RangeFromBaseExtent(NSNumber* base,
   return flutter::TextRange([base unsignedLongValue], [extent unsignedLongValue]);
 }
 
+// Returns the autofill hint content type, if specified; otherwise nil.
+static NSString* GetAutofillHint(NSDictionary* autofill) {
+  NSArray<NSString*>* hints = autofill[kAutofillHints];
+  return hints.count > 0 ? hints[0] : nil;
+}
+
+// Returns the text content type for the specified TextInputConfiguration.
+// NSTextContentType is only available for macOS 11.0 and later.
+static NSTextContentType GetTextContentType(NSDictionary* configuration)
+    API_AVAILABLE(macos(11.0)) {
+  // Check autofill hints.
+  NSDictionary* autofill = configuration[kAutofillProperties];
+  if (autofill) {
+    NSString* hint = GetAutofillHint(autofill);
+    if ([hint isEqualToString:@"username"]) {
+      return NSTextContentTypeUsername;
+    }
+    if ([hint isEqualToString:@"password"]) {
+      return NSTextContentTypePassword;
+    }
+    if ([hint isEqualToString:@"oneTimeCode"]) {
+      return NSTextContentTypeOneTimeCode;
+    }
+  }
+  // If no autofill hints, guess based on other attributes.
+  if ([configuration[kSecureTextEntry] boolValue]) {
+    return NSTextContentTypePassword;
+  }
+  return nil;
+}
+
+// Returns YES if configuration describes a field for which autocomplete should be enabled for
+// the specified TextInputConfiguration. Autocomplete is enabled by default, but will be disabled
+// if the field is password-related, or if the configuration contains no autofill settings.
+static BOOL EnableAutocompleteForTextInputConfiguration(NSDictionary* configuration) {
+  // Disable if obscureText is set.
+  if ([configuration[kSecureTextEntry] boolValue]) {
+    return NO;
+  }
+
+  // Disable if autofill properties are not set.
+  NSDictionary* autofill = configuration[kAutofillProperties];
+  if (autofill == nil) {
+    return NO;
+  }
+
+  // Disable if autofill properties indicate a username/password.
+  // See: https://github.com/flutter/flutter/issues/119824
+  NSString* hint = GetAutofillHint(autofill);
+  if ([hint isEqualToString:@"password"] || [hint isEqualToString:@"username"]) {
+    return NO;
+  }
+  return YES;
+}
+
+// Returns YES if configuration describes a field for which autocomplete should be enabled.
+// Autocomplete is enabled by default, but will be disabled if the field is password-related, or if
+// the configuration contains no autofill settings.
+//
+// In the case where the current field is part of an AutofillGroup, the configuration will have
+// a fields attribute with a list of TextInputConfigurations, one for each field. In the case where
+// any field in the group disables autocomplete, we disable it for all.
+static BOOL EnableAutocomplete(NSDictionary* configuration) {
+  for (NSDictionary* field in configuration[kAssociatedAutofillFields]) {
+    if (!EnableAutocompleteForTextInputConfiguration(field)) {
+      return NO;
+    }
+  }
+
+  // Check the top-level TextInputConfiguration.
+  return EnableAutocompleteForTextInputConfiguration(configuration);
+}
+
+#pragma mark - NSEvent (KeyEquivalentMarker) protocol
+
 @interface NSEvent (KeyEquivalentMarker)
 
 // Internally marks that the event was received through performKeyEquivalent:.
@@ -106,6 +197,8 @@ static char markerKey;
 
 @end
 
+#pragma mark - FlutterTextInputPlugin private interface
+
 /**
  * Private properties of FlutterTextInputPlugin.
  */
@@ -227,6 +320,8 @@ static char markerKey;
 
 @end
 
+#pragma mark - FlutterTextInputPlugin
+
 @implementation FlutterTextInputPlugin {
   /**
    * The currently active text input model.
@@ -245,8 +340,10 @@ static char markerKey;
 }
 
 - (instancetype)initWithViewController:(FlutterViewController*)viewController {
-  // The view needs a non-zero frame.
-  self = [super initWithFrame:NSMakeRect(0, 0, 1, 1)];
+  // The view needs an empty frame otherwise it is visible on dark background.
+  // https://github.com/flutter/flutter/issues/118504
+  self = [super initWithFrame:NSZeroRect];
+  self.clipsToBounds = YES;
   if (self != nil) {
     _flutterViewController = viewController;
     _channel = [FlutterMethodChannel methodChannelWithName:kTextInputChannel
@@ -288,10 +385,7 @@ static char markerKey;
 
 - (void)resignAndRemoveFromSuperview {
   if (self.superview != nil) {
-    // With accessiblity enabled TextInputPlugin is inside _client, so take the
-    // nextResponder from the _client.
-    NSResponder* nextResponder = _client != nil ? _client.nextResponder : self.nextResponder;
-    [self.window makeFirstResponder:nextResponder];
+    [self.window makeFirstResponder:_flutterViewController.flutterView];
     [self removeFromSuperview];
   }
 }
@@ -317,6 +411,10 @@ static char markerKey;
       NSDictionary* inputTypeInfo = config[kTextInputType];
       _inputType = inputTypeInfo[kTextInputTypeName];
       self.textAffinity = kFlutterTextAffinityUpstream;
+      self.automaticTextCompletionEnabled = EnableAutocomplete(config);
+      if (@available(macOS 11.0, *)) {
+        self.contentType = GetTextContentType(config);
+      }
 
       _activeModel = std::make_unique<flutter::TextInputModel>();
     }
@@ -349,19 +447,6 @@ static char markerKey;
   } else if ([method isEqualToString:kSetEditingStateMethod]) {
     NSDictionary* state = call.arguments;
     [self setEditingState:state];
-
-    // Close the loop, since the framework state could have been updated by the
-    // engine since it sent this update, and needs to now be made to match the
-    // engine's version of the state.
-    if (!_enableDeltaModel) {
-      [self updateEditState];
-    } else {
-      // Send an "empty" delta. The client can compare the old_text with their
-      // current text and update with that if the race condition described above
-      // occurs.
-      [self updateEditStateWithDelta:flutter::TextEditingDelta(_activeModel->GetText().c_str(),
-                                                               flutter::TextRange(0, 0), "")];
-    }
   } else if ([method isEqualToString:kSetEditableSizeAndTransform]) {
     NSDictionary* state = call.arguments;
     [self setEditableTransform:state[kTransformKey]];
@@ -450,7 +535,7 @@ static char markerKey;
     kSelectionIsDirectionalKey : @NO,
     kComposingBaseKey : @(composingBase),
     kComposingExtentKey : @(composingExtent),
-    kTextKey : [NSString stringWithUTF8String:_activeModel->GetText().c_str()]
+    kTextKey : [NSString stringWithUTF8String:_activeModel->GetText().c_str()] ?: [NSNull null],
   };
 }
 
@@ -534,7 +619,15 @@ static char markerKey;
   // text command (indicated by calling doCommandBySelector) or might not (for example, Cmd+Q). In
   // the latter case, this command somehow has not been executed yet and Flutter must dispatch it to
   // the next responder. See https://github.com/flutter/flutter/issues/106354 .
-  if (event.isKeyEquivalent && !_eventProducedOutput) {
+  // The event is also not redispatched if there is IME composition active, because it might be
+  // handled by the IME. See https://github.com/flutter/flutter/issues/134699
+
+  // both NSEventModifierFlagNumericPad and NSEventModifierFlagFunction are set for arrow keys.
+  bool is_navigation = event.modifierFlags & NSEventModifierFlagFunction &&
+                       event.modifierFlags & NSEventModifierFlagNumericPad;
+  bool is_navigation_in_ime = is_navigation && self.hasMarkedText;
+
+  if (event.isKeyEquivalent && !is_navigation_in_ime && !_eventProducedOutput) {
     return NO;
   }
   return res;
@@ -554,7 +647,7 @@ static char markerKey;
 - (BOOL)performKeyEquivalent:(NSEvent*)event {
   if ([_flutterViewController isDispatchingKeyEvent:event]) {
     // When NSWindow is nextResponder, keyboard manager will send to it
-    // unhandled events (through [NSWindow keyDown:]). If event has has both
+    // unhandled events (through [NSWindow keyDown:]). If event has both
     // control and cmd modifiers set (i.e. cmd+control+space - emoji picker)
     // NSWindow will then send this event as performKeyEquivalent: to first
     // responder, which is FlutterTextInputPlugin. If that's the case, the
@@ -724,7 +817,8 @@ static char markerKey;
     _activeModel->CommitComposing();
     _activeModel->EndComposing();
   }
-  if ([self.inputType isEqualToString:kMultilineInputType]) {
+  if ([self.inputType isEqualToString:kMultilineInputType] &&
+      [self.inputAction isEqualToString:kInputActionNewline]) {
     [self insertText:@"\n" replacementRange:self.selectedRange];
   }
   [_channel invokeMethod:kPerformAction arguments:@[ self.clientID, self.inputAction ]];
@@ -758,19 +852,13 @@ static char markerKey;
 
   // Input string may be NSString or NSAttributedString.
   BOOL isAttributedString = [string isKindOfClass:[NSAttributedString class]];
-  std::string marked_text = isAttributedString ? [[string string] UTF8String] : [string UTF8String];
-  _activeModel->UpdateComposingText(marked_text);
-
-  // Update the selection within the marked text.
-  long signedLength = static_cast<long>(selectedRange.length);
-  long location = selectedRange.location + _activeModel->composing_range().base();
-  long textLength = _activeModel->text_range().end();
-
-  size_t base = std::clamp(location, 0L, textLength);
-  size_t extent = std::clamp(location + signedLength, 0L, textLength);
-  _activeModel->SetSelection(flutter::TextRange(base, extent));
+  const NSString* rawString = isAttributedString ? [string string] : string;
+  _activeModel->UpdateComposingText(
+      (const char16_t*)[rawString cStringUsingEncoding:NSUTF16StringEncoding],
+      flutter::TextRange(selectedRange.location, selectedRange.location + selectedRange.length));
 
   if (_enableDeltaModel) {
+    std::string marked_text = [rawString UTF8String];
     [self updateEditStateWithDelta:flutter::TextEditingDelta(textBeforeChange,
                                                              selectionBeforeChange.collapsed()
                                                                  ? composingBeforeChange
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterTextInputPluginTest.mm b/shell/platform/darwin/macos/framework/Source/FlutterTextInputPluginTest.mm
index 9f4a39d4b3818a440e2d2152fe00e23f0144d83b..e3a203803d48966b5759d83e6c15b14810e2a720 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterTextInputPluginTest.mm
+++ b/shell/platform/darwin/macos/framework/Source/FlutterTextInputPluginTest.mm
@@ -4,10 +4,12 @@
 
 #import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterViewController.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterDartProject_Internal.h"
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterEngineTestUtils.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputPlugin.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputSemanticsObject.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterViewController_Internal.h"
+#import "flutter/shell/platform/darwin/macos/framework/Source/NSView+ClipsToBounds.h"
 
 #import <OCMock/OCMock.h>
 #import "flutter/testing/testing.h"
@@ -37,6 +39,16 @@
 - (BOOL)isActive;
 @end
 
+@interface TextInputTestViewController : FlutterViewController
+@end
+
+@implementation TextInputTestViewController
+- (nonnull FlutterView*)createFlutterViewWithMTLDevice:(id<MTLDevice>)device
+                                          commandQueue:(id<MTLCommandQueue>)commandQueue {
+  return OCMClassMock([NSView class]);
+}
+@end
+
 @interface FlutterInputPluginTestObjc : NSObject
 - (bool)testEmptyCompositionRange;
 - (bool)testClearClientDuringComposing;
@@ -45,7 +57,7 @@
 @implementation FlutterInputPluginTestObjc
 
 - (bool)testEmptyCompositionRange {
-  id engineMock = OCMClassMock([FlutterEngine class]);
+  id engineMock = flutter::testing::CreateMockFlutterEngine(@"");
   id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
   OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
       [engineMock binaryMessenger])
@@ -58,14 +70,12 @@
   FlutterTextInputPlugin* plugin =
       [[FlutterTextInputPlugin alloc] initWithViewController:viewController];
 
-  [plugin handleMethodCall:[FlutterMethodCall
-                               methodCallWithMethodName:@"TextInput.setClient"
-                                              arguments:@[
-                                                @(1), @{
-                                                  @"inputAction" : @"action",
-                                                  @"inputType" : @{@"name" : @"inputName"},
-                                                }
-                                              ]]
+  NSDictionary* setClientConfig = @{
+    @"inputAction" : @"action",
+    @"inputType" : @{@"name" : @"inputName"},
+  };
+  [plugin handleMethodCall:[FlutterMethodCall methodCallWithMethodName:@"TextInput.setClient"
+                                                             arguments:@[ @(1), setClientConfig ]]
                     result:^(id){
                     }];
 
@@ -78,39 +88,24 @@
                                                                 @"composingExtent" : @(-1),
                                                               }];
 
-  NSDictionary* expectedState = @{
-    @"selectionBase" : @(0),
-    @"selectionExtent" : @(0),
-    @"selectionAffinity" : @"TextAffinity.upstream",
-    @"selectionIsDirectional" : @(NO),
-    @"composingBase" : @(-1),
-    @"composingExtent" : @(-1),
-    @"text" : @"Text",
-  };
-
-  NSData* updateCall = [[FlutterJSONMethodCodec sharedInstance]
-      encodeMethodCall:[FlutterMethodCall
-                           methodCallWithMethodName:@"TextInputClient.updateEditingState"
-                                          arguments:@[ @(1), expectedState ]]];
-
-  OCMExpect(  // NOLINT(google-objc-avoid-throwing-exception)
-      [binaryMessengerMock sendOnChannel:@"flutter/textinput" message:updateCall]);
-
   [plugin handleMethodCall:call
                     result:^(id){
                     }];
 
-  @try {
-    OCMVerify(  // NOLINT(google-objc-avoid-throwing-exception)
-        [binaryMessengerMock sendOnChannel:@"flutter/textinput" message:updateCall]);
-  } @catch (...) {
-    return false;
-  }
+  // Verify editing state was set.
+  NSDictionary* editingState = [plugin editingState];
+  EXPECT_STREQ([editingState[@"text"] UTF8String], "Text");
+  EXPECT_STREQ([editingState[@"selectionAffinity"] UTF8String], "TextAffinity.upstream");
+  EXPECT_FALSE([editingState[@"selectionIsDirectional"] boolValue]);
+  EXPECT_EQ([editingState[@"selectionBase"] intValue], 0);
+  EXPECT_EQ([editingState[@"selectionExtent"] intValue], 0);
+  EXPECT_EQ([editingState[@"composingBase"] intValue], -1);
+  EXPECT_EQ([editingState[@"composingExtent"] intValue], -1);
   return true;
 }
 
 - (bool)testSetMarkedTextWithSelectionChange {
-  id engineMock = OCMClassMock([FlutterEngine class]);
+  id engineMock = flutter::testing::CreateMockFlutterEngine(@"");
   id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
   OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
       [engineMock binaryMessenger])
@@ -123,14 +118,12 @@
   FlutterTextInputPlugin* plugin =
       [[FlutterTextInputPlugin alloc] initWithViewController:viewController];
 
-  [plugin handleMethodCall:[FlutterMethodCall
-                               methodCallWithMethodName:@"TextInput.setClient"
-                                              arguments:@[
-                                                @(1), @{
-                                                  @"inputAction" : @"action",
-                                                  @"inputType" : @{@"name" : @"inputName"},
-                                                }
-                                              ]]
+  NSDictionary* setClientConfig = @{
+    @"inputAction" : @"action",
+    @"inputType" : @{@"name" : @"inputName"},
+  };
+  [plugin handleMethodCall:[FlutterMethodCall methodCallWithMethodName:@"TextInput.setClient"
+                                                             arguments:@[ @(1), setClientConfig ]]
                     result:^(id){
                     }];
 
@@ -178,7 +171,7 @@
 }
 
 - (bool)testSetMarkedTextWithReplacementRange {
-  id engineMock = OCMClassMock([FlutterEngine class]);
+  id engineMock = flutter::testing::CreateMockFlutterEngine(@"");
   id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
   OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
       [engineMock binaryMessenger])
@@ -191,14 +184,12 @@
   FlutterTextInputPlugin* plugin =
       [[FlutterTextInputPlugin alloc] initWithViewController:viewController];
 
-  [plugin handleMethodCall:[FlutterMethodCall
-                               methodCallWithMethodName:@"TextInput.setClient"
-                                              arguments:@[
-                                                @(1), @{
-                                                  @"inputAction" : @"action",
-                                                  @"inputType" : @{@"name" : @"inputName"},
-                                                }
-                                              ]]
+  NSDictionary* setClientConfig = @{
+    @"inputAction" : @"action",
+    @"inputType" : @{@"name" : @"inputName"},
+  };
+  [plugin handleMethodCall:[FlutterMethodCall methodCallWithMethodName:@"TextInput.setClient"
+                                                             arguments:@[ @(1), setClientConfig ]]
                     result:^(id){
                     }];
 
@@ -246,7 +237,7 @@
 }
 
 - (bool)testComposingRegionRemovedByFramework {
-  id engineMock = OCMClassMock([FlutterEngine class]);
+  id engineMock = flutter::testing::CreateMockFlutterEngine(@"");
   id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
   OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
       [engineMock binaryMessenger])
@@ -259,14 +250,12 @@
   FlutterTextInputPlugin* plugin =
       [[FlutterTextInputPlugin alloc] initWithViewController:viewController];
 
-  [plugin handleMethodCall:[FlutterMethodCall
-                               methodCallWithMethodName:@"TextInput.setClient"
-                                              arguments:@[
-                                                @(1), @{
-                                                  @"inputAction" : @"action",
-                                                  @"inputType" : @{@"name" : @"inputName"},
-                                                }
-                                              ]]
+  NSDictionary* setClientConfig = @{
+    @"inputAction" : @"action",
+    @"inputType" : @{@"name" : @"inputName"},
+  };
+  [plugin handleMethodCall:[FlutterMethodCall methodCallWithMethodName:@"TextInput.setClient"
+                                                             arguments:@[ @(1), setClientConfig ]]
                     result:^(id){
                     }];
 
@@ -295,36 +284,21 @@
                     result:^(id){
                     }];
 
-  NSDictionary* expectedState = @{
-    @"selectionBase" : @(2),
-    @"selectionExtent" : @(2),
-    @"selectionAffinity" : @"TextAffinity.upstream",
-    @"selectionIsDirectional" : @(NO),
-    @"composingBase" : @(-1),
-    @"composingExtent" : @(-1),
-    @"text" : @"Te",
-  };
-
-  NSData* updateCall = [[FlutterJSONMethodCodec sharedInstance]
-      encodeMethodCall:[FlutterMethodCall
-                           methodCallWithMethodName:@"TextInputClient.updateEditingState"
-                                          arguments:@[ @(1), expectedState ]]];
-
-  OCMExpect(  // NOLINT(google-objc-avoid-throwing-exception)
-      [binaryMessengerMock sendOnChannel:@"flutter/textinput" message:updateCall]);
-
-  @try {
-    OCMVerify(  // NOLINT(google-objc-avoid-throwing-exception)
-        [binaryMessengerMock sendOnChannel:@"flutter/textinput" message:updateCall]);
-  } @catch (...) {
-    return false;
-  }
+  // Verify editing state was set.
+  NSDictionary* editingState = [plugin editingState];
+  EXPECT_STREQ([editingState[@"text"] UTF8String], "Te");
+  EXPECT_STREQ([editingState[@"selectionAffinity"] UTF8String], "TextAffinity.upstream");
+  EXPECT_FALSE([editingState[@"selectionIsDirectional"] boolValue]);
+  EXPECT_EQ([editingState[@"selectionBase"] intValue], 2);
+  EXPECT_EQ([editingState[@"selectionExtent"] intValue], 2);
+  EXPECT_EQ([editingState[@"composingBase"] intValue], -1);
+  EXPECT_EQ([editingState[@"composingExtent"] intValue], -1);
   return true;
 }
 
 - (bool)testClearClientDuringComposing {
   // Set up FlutterTextInputPlugin.
-  id engineMock = OCMClassMock([FlutterEngine class]);
+  id engineMock = flutter::testing::CreateMockFlutterEngine(@"");
   id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
   OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
       [engineMock binaryMessenger])
@@ -336,14 +310,12 @@
       [[FlutterTextInputPlugin alloc] initWithViewController:viewController];
 
   // Set input client 1.
-  [plugin handleMethodCall:[FlutterMethodCall
-                               methodCallWithMethodName:@"TextInput.setClient"
-                                              arguments:@[
-                                                @(1), @{
-                                                  @"inputAction" : @"action",
-                                                  @"inputType" : @{@"name" : @"inputName"},
-                                                }
-                                              ]]
+  NSDictionary* setClientConfig = @{
+    @"inputAction" : @"action",
+    @"inputType" : @{@"name" : @"inputName"},
+  };
+  [plugin handleMethodCall:[FlutterMethodCall methodCallWithMethodName:@"TextInput.setClient"
+                                                             arguments:@[ @(1), setClientConfig ]]
                     result:^(id){
                     }];
 
@@ -376,27 +348,313 @@
   return true;
 }
 
-- (bool)testFirstRectForCharacterRange {
-  id engineMock = OCMClassMock([FlutterEngine class]);
+- (bool)testAutocompleteDisabledWhenAutofillNotSet {
+  // Set up FlutterTextInputPlugin.
+  id engineMock = flutter::testing::CreateMockFlutterEngine(@"");
+  id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
+  OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
+      [engineMock binaryMessenger])
+      .andReturn(binaryMessengerMock);
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engineMock
+                                                                                nibName:@""
+                                                                                 bundle:nil];
+  FlutterTextInputPlugin* plugin =
+      [[FlutterTextInputPlugin alloc] initWithViewController:viewController];
+
+  // Set input client 1.
+  NSDictionary* setClientConfig = @{
+    @"inputAction" : @"action",
+    @"inputType" : @{@"name" : @"inputName"},
+  };
+  [plugin handleMethodCall:[FlutterMethodCall methodCallWithMethodName:@"TextInput.setClient"
+                                                             arguments:@[ @(1), setClientConfig ]]
+                    result:^(id){
+                    }];
+
+  // Verify autocomplete is disabled.
+  EXPECT_FALSE([plugin isAutomaticTextCompletionEnabled]);
+  return true;
+}
+
+- (bool)testAutocompleteEnabledWhenAutofillSet {
+  // Set up FlutterTextInputPlugin.
+  id engineMock = flutter::testing::CreateMockFlutterEngine(@"");
   id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
   OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
       [engineMock binaryMessenger])
       .andReturn(binaryMessengerMock);
-  FlutterViewController* controllerMock = OCMClassMock([FlutterViewController class]);
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engineMock
+                                                                                nibName:@""
+                                                                                 bundle:nil];
+  FlutterTextInputPlugin* plugin =
+      [[FlutterTextInputPlugin alloc] initWithViewController:viewController];
+
+  // Set input client 1.
+  NSDictionary* setClientConfig = @{
+    @"inputAction" : @"action",
+    @"inputType" : @{@"name" : @"inputName"},
+    @"autofill" : @{
+      @"uniqueIdentifier" : @"field1",
+      @"hints" : @[ @"name" ],
+      @"editingValue" : @{@"text" : @""},
+    }
+  };
+  [plugin handleMethodCall:[FlutterMethodCall methodCallWithMethodName:@"TextInput.setClient"
+                                                             arguments:@[ @(1), setClientConfig ]]
+                    result:^(id){
+                    }];
+
+  // Verify autocomplete is enabled.
+  EXPECT_TRUE([plugin isAutomaticTextCompletionEnabled]);
+
+  // Verify content type is nil for unsupported content types.
+  if (@available(macOS 11.0, *)) {
+    EXPECT_EQ([plugin contentType], nil);
+  }
+  return true;
+}
+
+- (bool)testAutocompleteEnabledWhenAutofillSetNoHint {
+  // Set up FlutterTextInputPlugin.
+  id engineMock = flutter::testing::CreateMockFlutterEngine(@"");
+  id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
   OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
-      [controllerMock engine])
-      .andReturn(engineMock);
+      [engineMock binaryMessenger])
+      .andReturn(binaryMessengerMock);
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engineMock
+                                                                                nibName:@""
+                                                                                 bundle:nil];
+  FlutterTextInputPlugin* plugin =
+      [[FlutterTextInputPlugin alloc] initWithViewController:viewController];
+
+  // Set input client 1.
+  NSDictionary* setClientConfig = @{
+    @"inputAction" : @"action",
+    @"inputType" : @{@"name" : @"inputName"},
+    @"autofill" : @{
+      @"uniqueIdentifier" : @"field1",
+      @"hints" : @[],
+      @"editingValue" : @{@"text" : @""},
+    }
+  };
+  [plugin handleMethodCall:[FlutterMethodCall methodCallWithMethodName:@"TextInput.setClient"
+                                                             arguments:@[ @(1), setClientConfig ]]
+                    result:^(id){
+                    }];
+
+  // Verify autocomplete is enabled.
+  EXPECT_TRUE([plugin isAutomaticTextCompletionEnabled]);
+  return true;
+}
 
-  id viewMock = OCMClassMock([NSView class]);
+- (bool)testAutocompleteDisabledWhenObscureTextSet {
+  // Set up FlutterTextInputPlugin.
+  id engineMock = flutter::testing::CreateMockFlutterEngine(@"");
+  id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
   OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
-      [viewMock bounds])
-      .andReturn(NSMakeRect(0, 0, 200, 200));
+      [engineMock binaryMessenger])
+      .andReturn(binaryMessengerMock);
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engineMock
+                                                                                nibName:@""
+                                                                                 bundle:nil];
+  FlutterTextInputPlugin* plugin =
+      [[FlutterTextInputPlugin alloc] initWithViewController:viewController];
+
+  // Set input client 1.
+  NSDictionary* setClientConfig = @{
+    @"inputAction" : @"action",
+    @"inputType" : @{@"name" : @"inputName"},
+    @"obscureText" : @YES,
+    @"autofill" : @{
+      @"uniqueIdentifier" : @"field1",
+      @"editingValue" : @{@"text" : @""},
+    }
+  };
+  [plugin handleMethodCall:[FlutterMethodCall methodCallWithMethodName:@"TextInput.setClient"
+                                                             arguments:@[ @(1), setClientConfig ]]
+                    result:^(id){
+                    }];
+
+  // Verify autocomplete is disabled.
+  EXPECT_FALSE([plugin isAutomaticTextCompletionEnabled]);
+  return true;
+}
+
+- (bool)testAutocompleteDisabledWhenPasswordAutofillSet {
+  // Set up FlutterTextInputPlugin.
+  id engineMock = flutter::testing::CreateMockFlutterEngine(@"");
+  id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
+  OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
+      [engineMock binaryMessenger])
+      .andReturn(binaryMessengerMock);
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engineMock
+                                                                                nibName:@""
+                                                                                 bundle:nil];
+  FlutterTextInputPlugin* plugin =
+      [[FlutterTextInputPlugin alloc] initWithViewController:viewController];
+
+  // Set input client 1.
+  NSDictionary* setClientConfig = @{
+    @"inputAction" : @"action",
+    @"inputType" : @{@"name" : @"inputName"},
+    @"autofill" : @{
+      @"uniqueIdentifier" : @"field1",
+      @"hints" : @[ @"password" ],
+      @"editingValue" : @{@"text" : @""},
+    }
+  };
+  [plugin handleMethodCall:[FlutterMethodCall methodCallWithMethodName:@"TextInput.setClient"
+                                                             arguments:@[ @(1), setClientConfig ]]
+                    result:^(id){
+                    }];
+
+  // Verify autocomplete is disabled.
+  EXPECT_FALSE([plugin isAutomaticTextCompletionEnabled]);
+
+  // Verify content type is password.
+  if (@available(macOS 11.0, *)) {
+    EXPECT_EQ([plugin contentType], NSTextContentTypePassword);
+  }
+  return true;
+}
+
+- (bool)testAutocompleteDisabledWhenAutofillGroupIncludesPassword {
+  // Set up FlutterTextInputPlugin.
+  id engineMock = flutter::testing::CreateMockFlutterEngine(@"");
+  id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
+  OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
+      [engineMock binaryMessenger])
+      .andReturn(binaryMessengerMock);
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engineMock
+                                                                                nibName:@""
+                                                                                 bundle:nil];
+  FlutterTextInputPlugin* plugin =
+      [[FlutterTextInputPlugin alloc] initWithViewController:viewController];
+
+  // Set input client 1.
+  NSDictionary* setClientConfig = @{
+    @"inputAction" : @"action",
+    @"inputType" : @{@"name" : @"inputName"},
+    @"fields" : @[
+      @{
+        @"inputAction" : @"action",
+        @"inputType" : @{@"name" : @"inputName"},
+        @"autofill" : @{
+          @"uniqueIdentifier" : @"field1",
+          @"hints" : @[ @"password" ],
+          @"editingValue" : @{@"text" : @""},
+        }
+      },
+      @{
+        @"inputAction" : @"action",
+        @"inputType" : @{@"name" : @"inputName"},
+        @"autofill" : @{
+          @"uniqueIdentifier" : @"field2",
+          @"hints" : @[ @"name" ],
+          @"editingValue" : @{@"text" : @""},
+        }
+      }
+    ]
+  };
+  [plugin handleMethodCall:[FlutterMethodCall methodCallWithMethodName:@"TextInput.setClient"
+                                                             arguments:@[ @(1), setClientConfig ]]
+                    result:^(id){
+                    }];
+
+  // Verify autocomplete is disabled.
+  EXPECT_FALSE([plugin isAutomaticTextCompletionEnabled]);
+  return true;
+}
+
+- (bool)testContentTypeWhenAutofillTypeIsUsername {
+  // Set up FlutterTextInputPlugin.
+  id engineMock = flutter::testing::CreateMockFlutterEngine(@"");
+  id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
+  OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
+      [engineMock binaryMessenger])
+      .andReturn(binaryMessengerMock);
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engineMock
+                                                                                nibName:@""
+                                                                                 bundle:nil];
+  FlutterTextInputPlugin* plugin =
+      [[FlutterTextInputPlugin alloc] initWithViewController:viewController];
+
+  // Set input client 1.
+  NSDictionary* setClientConfig = @{
+    @"inputAction" : @"action",
+    @"inputType" : @{@"name" : @"inputName"},
+    @"autofill" : @{
+      @"uniqueIdentifier" : @"field1",
+      @"hints" : @[ @"name" ],
+      @"editingValue" : @{@"text" : @""},
+    }
+  };
+  [plugin handleMethodCall:[FlutterMethodCall methodCallWithMethodName:@"TextInput.setClient"
+                                                             arguments:@[ @(1), setClientConfig ]]
+                    result:^(id){
+                    }];
+
+  // Verify autocomplete is disabled.
+  EXPECT_FALSE([plugin isAutomaticTextCompletionEnabled]);
+
+  // Verify content type is username.
+  if (@available(macOS 11.0, *)) {
+    EXPECT_EQ([plugin contentType], NSTextContentTypeUsername);
+  }
+  return true;
+}
+
+- (bool)testContentTypeWhenAutofillTypeIsOneTimeCode {
+  // Set up FlutterTextInputPlugin.
+  id engineMock = flutter::testing::CreateMockFlutterEngine(@"");
+  id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
+  OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
+      [engineMock binaryMessenger])
+      .andReturn(binaryMessengerMock);
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engineMock
+                                                                                nibName:@""
+                                                                                 bundle:nil];
+  FlutterTextInputPlugin* plugin =
+      [[FlutterTextInputPlugin alloc] initWithViewController:viewController];
+
+  // Set input client 1.
+  NSDictionary* setClientConfig = @{
+    @"inputAction" : @"action",
+    @"inputType" : @{@"name" : @"inputName"},
+    @"autofill" : @{
+      @"uniqueIdentifier" : @"field1",
+      @"hints" : @[ @"oneTimeCode" ],
+      @"editingValue" : @{@"text" : @""},
+    }
+  };
+  [plugin handleMethodCall:[FlutterMethodCall methodCallWithMethodName:@"TextInput.setClient"
+                                                             arguments:@[ @(1), setClientConfig ]]
+                    result:^(id){
+                    }];
+
+  // Verify autocomplete is disabled.
+  EXPECT_FALSE([plugin isAutomaticTextCompletionEnabled]);
+
+  // Verify content type is username.
+  if (@available(macOS 11.0, *)) {
+    EXPECT_EQ([plugin contentType], NSTextContentTypeOneTimeCode);
+  }
+  return true;
+}
+
+- (bool)testFirstRectForCharacterRange {
+  id engineMock = flutter::testing::CreateMockFlutterEngine(@"");
+  id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
   OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
-      controllerMock.viewLoaded)
-      .andReturn(YES);
+      [engineMock binaryMessenger])
+      .andReturn(binaryMessengerMock);
+  FlutterViewController* controllerMock =
+      [[TextInputTestViewController alloc] initWithEngine:engineMock nibName:nil bundle:nil];
+  [controllerMock loadView];
+  id viewMock = controllerMock.flutterView;
   OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
-      [controllerMock flutterView])
-      .andReturn(viewMock);
+      [viewMock bounds])
+      .andReturn(NSMakeRect(0, 0, 200, 200));
 
   id windowMock = OCMClassMock([NSWindow class]);
   OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
@@ -453,26 +711,18 @@
 }
 
 - (bool)testFirstRectForCharacterRangeAtInfinity {
-  id engineMock = OCMClassMock([FlutterEngine class]);
+  id engineMock = flutter::testing::CreateMockFlutterEngine(@"");
   id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
   OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
       [engineMock binaryMessenger])
       .andReturn(binaryMessengerMock);
-  FlutterViewController* controllerMock = OCMClassMock([FlutterViewController class]);
-  OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
-      [controllerMock engine])
-      .andReturn(engineMock);
-
-  id viewMock = OCMClassMock([NSView class]);
+  FlutterViewController* controllerMock =
+      [[TextInputTestViewController alloc] initWithEngine:engineMock nibName:nil bundle:nil];
+  [controllerMock loadView];
+  id viewMock = controllerMock.flutterView;
   OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
       [viewMock bounds])
       .andReturn(NSMakeRect(0, 0, 200, 200));
-  OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
-      controllerMock.viewLoaded)
-      .andReturn(YES);
-  OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
-      [controllerMock flutterView])
-      .andReturn(viewMock);
 
   id windowMock = OCMClassMock([NSWindow class]);
   OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
@@ -515,26 +765,18 @@
 }
 
 - (bool)testFirstRectForCharacterRangeWithEsotericAffineTransform {
-  id engineMock = OCMClassMock([FlutterEngine class]);
+  id engineMock = flutter::testing::CreateMockFlutterEngine(@"");
   id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
   OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
       [engineMock binaryMessenger])
       .andReturn(binaryMessengerMock);
-  FlutterViewController* controllerMock = OCMClassMock([FlutterViewController class]);
-  OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
-      [controllerMock engine])
-      .andReturn(engineMock);
-
-  id viewMock = OCMClassMock([NSView class]);
+  FlutterViewController* controllerMock =
+      [[TextInputTestViewController alloc] initWithEngine:engineMock nibName:nil bundle:nil];
+  [controllerMock loadView];
+  id viewMock = controllerMock.flutterView;
   OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
       [viewMock bounds])
       .andReturn(NSMakeRect(0, 0, 200, 200));
-  OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
-      controllerMock.viewLoaded)
-      .andReturn(YES);
-  OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
-      [controllerMock flutterView])
-      .andReturn(viewMock);
 
   id windowMock = OCMClassMock([NSWindow class]);
   OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
@@ -595,7 +837,7 @@
 }
 
 - (bool)testSetEditingStateWithTextEditingDelta {
-  id engineMock = OCMClassMock([FlutterEngine class]);
+  id engineMock = flutter::testing::CreateMockFlutterEngine(@"");
   id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
   OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
       [engineMock binaryMessenger])
@@ -608,15 +850,13 @@
   FlutterTextInputPlugin* plugin =
       [[FlutterTextInputPlugin alloc] initWithViewController:viewController];
 
-  [plugin handleMethodCall:[FlutterMethodCall
-                               methodCallWithMethodName:@"TextInput.setClient"
-                                              arguments:@[
-                                                @(1), @{
-                                                  @"inputAction" : @"action",
-                                                  @"enableDeltaModel" : @"true",
-                                                  @"inputType" : @{@"name" : @"inputName"},
-                                                }
-                                              ]]
+  NSDictionary* setClientConfig = @{
+    @"inputAction" : @"action",
+    @"enableDeltaModel" : @"true",
+    @"inputType" : @{@"name" : @"inputName"},
+  };
+  [plugin handleMethodCall:[FlutterMethodCall methodCallWithMethodName:@"TextInput.setClient"
+                                                             arguments:@[ @(1), setClientConfig ]]
                     result:^(id){
                     }];
 
@@ -633,25 +873,20 @@
                     result:^(id){
                     }];
 
-  // The setEditingState call is ACKed back to the framework.
-  @try {
-    OCMVerify(  // NOLINT(google-objc-avoid-throwing-exception)
-        [binaryMessengerMock
-            sendOnChannel:@"flutter/textinput"
-                  message:[OCMArg checkWithBlock:^BOOL(NSData* callData) {
-                    FlutterMethodCall* call =
-                        [[FlutterJSONMethodCodec sharedInstance] decodeMethodCall:callData];
-                    return [[call method]
-                        isEqualToString:@"TextInputClient.updateEditingStateWithDeltas"];
-                  }]]);
-  } @catch (...) {
-    return false;
-  }
+  // Verify editing state was set.
+  NSDictionary* editingState = [plugin editingState];
+  EXPECT_STREQ([editingState[@"text"] UTF8String], "Text");
+  EXPECT_STREQ([editingState[@"selectionAffinity"] UTF8String], "TextAffinity.upstream");
+  EXPECT_FALSE([editingState[@"selectionIsDirectional"] boolValue]);
+  EXPECT_EQ([editingState[@"selectionBase"] intValue], 0);
+  EXPECT_EQ([editingState[@"selectionExtent"] intValue], 0);
+  EXPECT_EQ([editingState[@"composingBase"] intValue], -1);
+  EXPECT_EQ([editingState[@"composingExtent"] intValue], -1);
   return true;
 }
 
 - (bool)testOperationsThatTriggerDelta {
-  id engineMock = OCMClassMock([FlutterEngine class]);
+  id engineMock = flutter::testing::CreateMockFlutterEngine(@"");
   id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
   OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
       [engineMock binaryMessenger])
@@ -664,15 +899,13 @@
   FlutterTextInputPlugin* plugin =
       [[FlutterTextInputPlugin alloc] initWithViewController:viewController];
 
-  [plugin handleMethodCall:[FlutterMethodCall
-                               methodCallWithMethodName:@"TextInput.setClient"
-                                              arguments:@[
-                                                @(1), @{
-                                                  @"inputAction" : @"action",
-                                                  @"enableDeltaModel" : @"true",
-                                                  @"inputType" : @{@"name" : @"inputName"},
-                                                }
-                                              ]]
+  NSDictionary* setClientConfig = @{
+    @"inputAction" : @"action",
+    @"enableDeltaModel" : @"true",
+    @"inputType" : @{@"name" : @"inputName"},
+  };
+  [plugin handleMethodCall:[FlutterMethodCall methodCallWithMethodName:@"TextInput.setClient"
+                                                             arguments:@[ @(1), setClientConfig ]]
                     result:^(id){
                     }];
   [plugin insertText:@"text to insert"];
@@ -712,8 +945,8 @@
     @"deltaText" : @"marked text",
     @"deltaStart" : @(14),
     @"deltaEnd" : @(14),
-    @"selectionBase" : @(25),
-    @"selectionExtent" : @(25),
+    @"selectionBase" : @(14),
+    @"selectionExtent" : @(15),
     @"selectionAffinity" : @"TextAffinity.upstream",
     @"selectionIsDirectional" : @(false),
     @"composingBase" : @(14),
@@ -768,7 +1001,7 @@
 }
 
 - (bool)testComposingWithDelta {
-  id engineMock = OCMClassMock([FlutterEngine class]);
+  id engineMock = flutter::testing::CreateMockFlutterEngine(@"");
   id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
   OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
       [engineMock binaryMessenger])
@@ -781,15 +1014,13 @@
   FlutterTextInputPlugin* plugin =
       [[FlutterTextInputPlugin alloc] initWithViewController:viewController];
 
-  [plugin handleMethodCall:[FlutterMethodCall
-                               methodCallWithMethodName:@"TextInput.setClient"
-                                              arguments:@[
-                                                @(1), @{
-                                                  @"inputAction" : @"action",
-                                                  @"enableDeltaModel" : @"true",
-                                                  @"inputType" : @{@"name" : @"inputName"},
-                                                }
-                                              ]]
+  NSDictionary* setClientConfig = @{
+    @"inputAction" : @"action",
+    @"enableDeltaModel" : @"true",
+    @"inputType" : @{@"name" : @"inputName"},
+  };
+  [plugin handleMethodCall:[FlutterMethodCall methodCallWithMethodName:@"TextInput.setClient"
+                                                             arguments:@[ @(1), setClientConfig ]]
                     result:^(id){
                     }];
   [plugin setMarkedText:@"m" selectedRange:NSMakeRange(0, 1)];
@@ -799,7 +1030,7 @@
     @"deltaText" : @"m",
     @"deltaStart" : @(0),
     @"deltaEnd" : @(0),
-    @"selectionBase" : @(1),
+    @"selectionBase" : @(0),
     @"selectionExtent" : @(1),
     @"selectionAffinity" : @"TextAffinity.upstream",
     @"selectionIsDirectional" : @(false),
@@ -829,8 +1060,8 @@
     @"deltaText" : @"ma",
     @"deltaStart" : @(0),
     @"deltaEnd" : @(1),
-    @"selectionBase" : @(2),
-    @"selectionExtent" : @(2),
+    @"selectionBase" : @(0),
+    @"selectionExtent" : @(1),
     @"selectionAffinity" : @"TextAffinity.upstream",
     @"selectionIsDirectional" : @(false),
     @"composingBase" : @(0),
@@ -859,8 +1090,8 @@
     @"deltaText" : @"mar",
     @"deltaStart" : @(0),
     @"deltaEnd" : @(2),
-    @"selectionBase" : @(3),
-    @"selectionExtent" : @(3),
+    @"selectionBase" : @(0),
+    @"selectionExtent" : @(1),
     @"selectionAffinity" : @"TextAffinity.upstream",
     @"selectionIsDirectional" : @(false),
     @"composingBase" : @(0),
@@ -889,8 +1120,8 @@
     @"deltaText" : @"mark",
     @"deltaStart" : @(0),
     @"deltaEnd" : @(3),
-    @"selectionBase" : @(4),
-    @"selectionExtent" : @(4),
+    @"selectionBase" : @(0),
+    @"selectionExtent" : @(1),
     @"selectionAffinity" : @"TextAffinity.upstream",
     @"selectionIsDirectional" : @(false),
     @"composingBase" : @(0),
@@ -919,8 +1150,8 @@
     @"deltaText" : @"marke",
     @"deltaStart" : @(0),
     @"deltaEnd" : @(4),
-    @"selectionBase" : @(5),
-    @"selectionExtent" : @(5),
+    @"selectionBase" : @(0),
+    @"selectionExtent" : @(1),
     @"selectionAffinity" : @"TextAffinity.upstream",
     @"selectionIsDirectional" : @(false),
     @"composingBase" : @(0),
@@ -949,8 +1180,8 @@
     @"deltaText" : @"marked",
     @"deltaStart" : @(0),
     @"deltaEnd" : @(5),
-    @"selectionBase" : @(6),
-    @"selectionExtent" : @(6),
+    @"selectionBase" : @(0),
+    @"selectionExtent" : @(1),
     @"selectionAffinity" : @"TextAffinity.upstream",
     @"selectionIsDirectional" : @(false),
     @"composingBase" : @(0),
@@ -1005,7 +1236,7 @@
 }
 
 - (bool)testComposingWithDeltasWhenSelectionIsActive {
-  id engineMock = OCMClassMock([FlutterEngine class]);
+  id engineMock = flutter::testing::CreateMockFlutterEngine(@"");
   id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
   OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
       [engineMock binaryMessenger])
@@ -1018,15 +1249,13 @@
   FlutterTextInputPlugin* plugin =
       [[FlutterTextInputPlugin alloc] initWithViewController:viewController];
 
-  [plugin handleMethodCall:[FlutterMethodCall
-                               methodCallWithMethodName:@"TextInput.setClient"
-                                              arguments:@[
-                                                @(1), @{
-                                                  @"inputAction" : @"action",
-                                                  @"enableDeltaModel" : @"true",
-                                                  @"inputType" : @{@"name" : @"inputName"},
-                                                }
-                                              ]]
+  NSDictionary* setClientConfig = @{
+    @"inputAction" : @"action",
+    @"enableDeltaModel" : @"true",
+    @"inputType" : @{@"name" : @"inputName"},
+  };
+  [plugin handleMethodCall:[FlutterMethodCall methodCallWithMethodName:@"TextInput.setClient"
+                                                             arguments:@[ @(1), setClientConfig ]]
                     result:^(id){
                     }];
 
@@ -1133,8 +1362,91 @@
   return true;
 }
 
+- (bool)handleArrowKeyWhenImePopoverIsActive {
+  id engineMock = flutter::testing::CreateMockFlutterEngine(@"");
+  id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
+  OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
+      [engineMock binaryMessenger])
+      .andReturn(binaryMessengerMock);
+  OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:FlutterKeyEvent {}
+                                                  callback:nil
+                                                  userData:nil]);
+
+  NSTextInputContext* textInputContext = OCMClassMock([NSTextInputContext class]);
+  OCMStub([textInputContext handleEvent:[OCMArg any]]).andReturn(YES);
+
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engineMock
+                                                                                nibName:@""
+                                                                                 bundle:nil];
+
+  FlutterTextInputPlugin* plugin =
+      [[FlutterTextInputPlugin alloc] initWithViewController:viewController];
+
+  plugin.textInputContext = textInputContext;
+
+  NSDictionary* setClientConfig = @{
+    @"inputAction" : @"action",
+    @"enableDeltaModel" : @"true",
+    @"inputType" : @{@"name" : @"inputName"},
+  };
+  [plugin handleMethodCall:[FlutterMethodCall methodCallWithMethodName:@"TextInput.setClient"
+                                                             arguments:@[ @(1), setClientConfig ]]
+                    result:^(id){
+                    }];
+
+  [plugin handleMethodCall:[FlutterMethodCall methodCallWithMethodName:@"TextInput.show"
+                                                             arguments:@[]]
+                    result:^(id){
+                    }];
+
+  // Set marked text, simulate active IME popover.
+  [plugin setMarkedText:@"m"
+          selectedRange:NSMakeRange(0, 1)
+       replacementRange:NSMakeRange(NSNotFound, 0)];
+
+  // Right arrow key. This, unlike the key below should be handled by the plugin.
+  NSEvent* event = [NSEvent keyEventWithType:NSEventTypeKeyDown
+                                    location:NSZeroPoint
+                               modifierFlags:0xa00100
+                                   timestamp:0
+                                windowNumber:0
+                                     context:nil
+                                  characters:@"\uF702"
+                 charactersIgnoringModifiers:@"\uF702"
+                                   isARepeat:NO
+                                     keyCode:0x4];
+
+  // Plugin should mark the event as key equivalent.
+  [plugin performKeyEquivalent:event];
+
+  if ([plugin handleKeyEvent:event] != true) {
+    return false;
+  }
+
+  // CTRL+H (delete backwards)
+  event = [NSEvent keyEventWithType:NSEventTypeKeyDown
+                           location:NSZeroPoint
+                      modifierFlags:0x40101
+                          timestamp:0
+                       windowNumber:0
+                            context:nil
+                         characters:@"\uF702"
+        charactersIgnoringModifiers:@"\uF702"
+                          isARepeat:NO
+                            keyCode:0x4];
+
+  // Plugin should mark the event as key equivalent.
+  [plugin performKeyEquivalent:event];
+
+  if ([plugin handleKeyEvent:event] != false) {
+    return false;
+  }
+
+  return true;
+}
+
 - (bool)unhandledKeyEquivalent {
-  id engineMock = OCMClassMock([FlutterEngine class]);
+  id engineMock = flutter::testing::CreateMockFlutterEngine(@"");
   id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
   OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
       [engineMock binaryMessenger])
@@ -1147,15 +1459,13 @@
   FlutterTextInputPlugin* plugin =
       [[FlutterTextInputPlugin alloc] initWithViewController:viewController];
 
-  [plugin handleMethodCall:[FlutterMethodCall
-                               methodCallWithMethodName:@"TextInput.setClient"
-                                              arguments:@[
-                                                @(1), @{
-                                                  @"inputAction" : @"action",
-                                                  @"enableDeltaModel" : @"true",
-                                                  @"inputType" : @{@"name" : @"inputName"},
-                                                }
-                                              ]]
+  NSDictionary* setClientConfig = @{
+    @"inputAction" : @"action",
+    @"enableDeltaModel" : @"true",
+    @"inputType" : @{@"name" : @"inputName"},
+  };
+  [plugin handleMethodCall:[FlutterMethodCall methodCallWithMethodName:@"TextInput.setClient"
+                                                             arguments:@[ @(1), setClientConfig ]]
                     result:^(id){
                     }];
 
@@ -1209,8 +1519,171 @@
   return true;
 }
 
+- (bool)testInsertNewLine {
+  id engineMock = flutter::testing::CreateMockFlutterEngine(@"");
+  id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
+  OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
+      [engineMock binaryMessenger])
+      .andReturn(binaryMessengerMock);
+  OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:FlutterKeyEvent {}
+                                                  callback:nil
+                                                  userData:nil]);
+
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engineMock
+                                                                                nibName:@""
+                                                                                 bundle:nil];
+
+  FlutterTextInputPlugin* plugin =
+      [[FlutterTextInputPlugin alloc] initWithViewController:viewController];
+
+  NSDictionary* setClientConfig = @{
+    @"inputType" : @{@"name" : @"TextInputType.multiline"},
+    @"inputAction" : @"TextInputAction.newline",
+  };
+  [plugin handleMethodCall:[FlutterMethodCall methodCallWithMethodName:@"TextInput.setClient"
+                                                             arguments:@[ @(1), setClientConfig ]]
+                    result:^(id){
+                    }];
+
+  FlutterMethodCall* call = [FlutterMethodCall methodCallWithMethodName:@"TextInput.setEditingState"
+                                                              arguments:@{
+                                                                @"text" : @"Text",
+                                                                @"selectionBase" : @(4),
+                                                                @"selectionExtent" : @(4),
+                                                                @"composingBase" : @(-1),
+                                                                @"composingExtent" : @(-1),
+                                                              }];
+
+  [plugin handleMethodCall:call
+                    result:^(id){
+                    }];
+
+  // Verify editing state was set.
+  NSDictionary* editingState = [plugin editingState];
+  EXPECT_STREQ([editingState[@"text"] UTF8String], "Text");
+  EXPECT_STREQ([editingState[@"selectionAffinity"] UTF8String], "TextAffinity.upstream");
+  EXPECT_FALSE([editingState[@"selectionIsDirectional"] boolValue]);
+  EXPECT_EQ([editingState[@"selectionBase"] intValue], 4);
+  EXPECT_EQ([editingState[@"selectionExtent"] intValue], 4);
+  EXPECT_EQ([editingState[@"composingBase"] intValue], -1);
+  EXPECT_EQ([editingState[@"composingExtent"] intValue], -1);
+
+  [plugin doCommandBySelector:@selector(insertNewline:)];
+
+  // Verify editing state was set.
+  editingState = [plugin editingState];
+  EXPECT_STREQ([editingState[@"text"] UTF8String], "Text\n");
+  EXPECT_STREQ([editingState[@"selectionAffinity"] UTF8String], "TextAffinity.upstream");
+  EXPECT_FALSE([editingState[@"selectionIsDirectional"] boolValue]);
+  EXPECT_EQ([editingState[@"selectionBase"] intValue], 5);
+  EXPECT_EQ([editingState[@"selectionExtent"] intValue], 5);
+  EXPECT_EQ([editingState[@"composingBase"] intValue], -1);
+  EXPECT_EQ([editingState[@"composingExtent"] intValue], -1);
+
+  return true;
+}
+
+- (bool)testSendActionDoNotInsertNewLine {
+  id engineMock = flutter::testing::CreateMockFlutterEngine(@"");
+  id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
+  OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
+      [engineMock binaryMessenger])
+      .andReturn(binaryMessengerMock);
+  OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:FlutterKeyEvent {}
+                                                  callback:nil
+                                                  userData:nil]);
+
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engineMock
+                                                                                nibName:@""
+                                                                                 bundle:nil];
+
+  FlutterTextInputPlugin* plugin =
+      [[FlutterTextInputPlugin alloc] initWithViewController:viewController];
+
+  NSDictionary* setClientConfig = @{
+    @"inputType" : @{@"name" : @"TextInputType.multiline"},
+    @"inputAction" : @"TextInputAction.send",
+  };
+  [plugin handleMethodCall:[FlutterMethodCall methodCallWithMethodName:@"TextInput.setClient"
+                                                             arguments:@[ @(1), setClientConfig ]]
+                    result:^(id){
+                    }];
+
+  FlutterMethodCall* call = [FlutterMethodCall methodCallWithMethodName:@"TextInput.setEditingState"
+                                                              arguments:@{
+                                                                @"text" : @"Text",
+                                                                @"selectionBase" : @(4),
+                                                                @"selectionExtent" : @(4),
+                                                                @"composingBase" : @(-1),
+                                                                @"composingExtent" : @(-1),
+                                                              }];
+
+  NSDictionary* expectedState = @{
+    @"selectionBase" : @(4),
+    @"selectionExtent" : @(4),
+    @"selectionAffinity" : @"TextAffinity.upstream",
+    @"selectionIsDirectional" : @(NO),
+    @"composingBase" : @(-1),
+    @"composingExtent" : @(-1),
+    @"text" : @"Text",
+  };
+
+  NSData* updateCall = [[FlutterJSONMethodCodec sharedInstance]
+      encodeMethodCall:[FlutterMethodCall
+                           methodCallWithMethodName:@"TextInputClient.updateEditingState"
+                                          arguments:@[ @(1), expectedState ]]];
+
+  OCMExpect(  // NOLINT(google-objc-avoid-throwing-exception)
+      [binaryMessengerMock sendOnChannel:@"flutter/textinput" message:updateCall]);
+
+  [plugin handleMethodCall:call
+                    result:^(id){
+                    }];
+
+  [plugin doCommandBySelector:@selector(insertNewline:)];
+
+  NSData* performActionCall = [[FlutterJSONMethodCodec sharedInstance]
+      encodeMethodCall:[FlutterMethodCall
+                           methodCallWithMethodName:@"TextInputClient.performAction"
+                                          arguments:@[ @(1), @"TextInputAction.send" ]]];
+
+  // Input action should be notified.
+  @try {
+    OCMVerify(  // NOLINT(google-objc-avoid-throwing-exception)
+        [binaryMessengerMock sendOnChannel:@"flutter/textinput" message:performActionCall]);
+  } @catch (...) {
+    return false;
+  }
+
+  NSDictionary* updatedState = @{
+    @"selectionBase" : @(5),
+    @"selectionExtent" : @(5),
+    @"selectionAffinity" : @"TextAffinity.upstream",
+    @"selectionIsDirectional" : @(NO),
+    @"composingBase" : @(-1),
+    @"composingExtent" : @(-1),
+    @"text" : @"Text\n",
+  };
+
+  updateCall = [[FlutterJSONMethodCodec sharedInstance]
+      encodeMethodCall:[FlutterMethodCall
+                           methodCallWithMethodName:@"TextInputClient.updateEditingState"
+                                          arguments:@[ @(1), updatedState ]]];
+
+  // Verify that editing state was not be updated.
+  @try {
+    OCMVerify(  // NOLINT(google-objc-avoid-throwing-exception)
+        [binaryMessengerMock sendOnChannel:@"flutter/textinput" message:updateCall]);
+    return false;
+  } @catch (...) {
+    // Expected.
+  }
+
+  return true;
+}
+
 - (bool)testLocalTextAndSelectionUpdateAfterDelta {
-  id engineMock = OCMClassMock([FlutterEngine class]);
+  id engineMock = flutter::testing::CreateMockFlutterEngine(@"");
   id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
   OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
       [engineMock binaryMessenger])
@@ -1223,15 +1696,13 @@
   FlutterTextInputPlugin* plugin =
       [[FlutterTextInputPlugin alloc] initWithViewController:viewController];
 
-  [plugin handleMethodCall:[FlutterMethodCall
-                               methodCallWithMethodName:@"TextInput.setClient"
-                                              arguments:@[
-                                                @(1), @{
-                                                  @"inputAction" : @"action",
-                                                  @"enableDeltaModel" : @"true",
-                                                  @"inputType" : @{@"name" : @"inputName"},
-                                                }
-                                              ]]
+  NSDictionary* setClientConfig = @{
+    @"inputAction" : @"action",
+    @"enableDeltaModel" : @"true",
+    @"inputType" : @{@"name" : @"inputName"},
+  };
+  [plugin handleMethodCall:[FlutterMethodCall methodCallWithMethodName:@"TextInput.setClient"
+                                                             arguments:@[ @(1), setClientConfig ]]
                     result:^(id){
                     }];
   [plugin insertText:@"text to insert"];
@@ -1271,7 +1742,7 @@
 }
 
 - (bool)testSelectorsAreForwardedToFramework {
-  id engineMock = OCMClassMock([FlutterEngine class]);
+  id engineMock = flutter::testing::CreateMockFlutterEngine(@"");
   id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
   OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
       [engineMock binaryMessenger])
@@ -1284,15 +1755,13 @@
   FlutterTextInputPlugin* plugin =
       [[FlutterTextInputPlugin alloc] initWithViewController:viewController];
 
-  [plugin handleMethodCall:[FlutterMethodCall
-                               methodCallWithMethodName:@"TextInput.setClient"
-                                              arguments:@[
-                                                @(1), @{
-                                                  @"inputAction" : @"action",
-                                                  @"enableDeltaModel" : @"true",
-                                                  @"inputType" : @{@"name" : @"inputName"},
-                                                }
-                                              ]]
+  NSDictionary* setClientConfig = @{
+    @"inputAction" : @"action",
+    @"enableDeltaModel" : @"true",
+    @"inputType" : @{@"name" : @"inputName"},
+  };
+  [plugin handleMethodCall:[FlutterMethodCall methodCallWithMethodName:@"TextInput.setClient"
+                                                             arguments:@[ @(1), setClientConfig ]]
                     result:^(id){
                     }];
 
@@ -1367,6 +1836,31 @@ TEST(FlutterTextInputPluginTest, TestClearClientDuringComposing) {
   ASSERT_TRUE([[FlutterInputPluginTestObjc alloc] testClearClientDuringComposing]);
 }
 
+TEST(FlutterTextInputPluginTest, TestAutocompleteDisabledWhenAutofillNotSet) {
+  ASSERT_TRUE([[FlutterInputPluginTestObjc alloc] testAutocompleteDisabledWhenAutofillNotSet]);
+}
+
+TEST(FlutterTextInputPluginTest, TestAutocompleteEnabledWhenAutofillSet) {
+  ASSERT_TRUE([[FlutterInputPluginTestObjc alloc] testAutocompleteEnabledWhenAutofillSet]);
+}
+
+TEST(FlutterTextInputPluginTest, TestAutocompleteEnabledWhenAutofillSetNoHint) {
+  ASSERT_TRUE([[FlutterInputPluginTestObjc alloc] testAutocompleteEnabledWhenAutofillSetNoHint]);
+}
+
+TEST(FlutterTextInputPluginTest, TestAutocompleteDisabledWhenObscureTextSet) {
+  ASSERT_TRUE([[FlutterInputPluginTestObjc alloc] testAutocompleteDisabledWhenObscureTextSet]);
+}
+
+TEST(FlutterTextInputPluginTest, TestAutocompleteDisabledWhenPasswordAutofillSet) {
+  ASSERT_TRUE([[FlutterInputPluginTestObjc alloc] testAutocompleteDisabledWhenPasswordAutofillSet]);
+}
+
+TEST(FlutterTextInputPluginTest, TestAutocompleteDisabledWhenAutofillGroupIncludesPassword) {
+  ASSERT_TRUE([[FlutterInputPluginTestObjc alloc]
+      testAutocompleteDisabledWhenAutofillGroupIncludesPassword]);
+}
+
 TEST(FlutterTextInputPluginTest, TestFirstRectForCharacterRange) {
   ASSERT_TRUE([[FlutterInputPluginTestObjc alloc] testFirstRectForCharacterRange]);
 }
@@ -1404,6 +1898,10 @@ TEST(FlutterTextInputPluginTest, TestPerformKeyEquivalent) {
   ASSERT_TRUE([[FlutterInputPluginTestObjc alloc] testPerformKeyEquivalent]);
 }
 
+TEST(FlutterTextInputPluginTest, HandleArrowKeyWhenImePopoverIsActive) {
+  ASSERT_TRUE([[FlutterInputPluginTestObjc alloc] handleArrowKeyWhenImePopoverIsActive]);
+}
+
 TEST(FlutterTextInputPluginTest, UnhandledKeyEquivalent) {
   ASSERT_TRUE([[FlutterInputPluginTestObjc alloc] unhandledKeyEquivalent]);
 }
@@ -1412,15 +1910,20 @@ TEST(FlutterTextInputPluginTest, TestSelectorsAreForwardedToFramework) {
   ASSERT_TRUE([[FlutterInputPluginTestObjc alloc] testSelectorsAreForwardedToFramework]);
 }
 
+TEST(FlutterTextInputPluginTest, TestInsertNewLine) {
+  ASSERT_TRUE([[FlutterInputPluginTestObjc alloc] testInsertNewLine]);
+}
+
+TEST(FlutterTextInputPluginTest, TestSendActionDoNotInsertNewLine) {
+  ASSERT_TRUE([[FlutterInputPluginTestObjc alloc] testSendActionDoNotInsertNewLine]);
+}
+
 TEST(FlutterTextInputPluginTest, CanWorkWithFlutterTextField) {
   FlutterEngine* engine = CreateTestEngine();
-  NSString* fixtures = @(testing::GetFixturesPath());
-  FlutterDartProject* project = [[FlutterDartProject alloc]
-      initWithAssetsPath:fixtures
-             ICUDataPath:[fixtures stringByAppendingString:@"/icudtl.dat"]];
-  FlutterViewController* viewController = [[FlutterViewController alloc] initWithProject:project];
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
+                                                                                nibName:nil
+                                                                                 bundle:nil];
   [viewController loadView];
-  [engine setViewController:viewController];
   // Create a NSWindow so that the native text field can become first responder.
   NSWindow* window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 800, 600)
                                                  styleMask:NSBorderlessWindowMask
@@ -1430,14 +1933,14 @@ TEST(FlutterTextInputPluginTest, CanWorkWithFlutterTextField) {
 
   engine.semanticsEnabled = YES;
 
-  auto bridge = engine.accessibilityBridge.lock();
+  auto bridge = viewController.accessibilityBridge.lock();
   FlutterPlatformNodeDelegateMac delegate(bridge, viewController);
   ui::AXTree tree;
   ui::AXNode ax_node(&tree, nullptr, 0, 0);
   ui::AXNodeData node_data;
   node_data.SetValue("initial text");
   ax_node.SetData(node_data);
-  delegate.Init(engine.accessibilityBridge, &ax_node);
+  delegate.Init(viewController.accessibilityBridge, &ax_node);
   {
     FlutterTextPlatformNode text_platform_node(&delegate, viewController);
 
@@ -1447,25 +1950,24 @@ TEST(FlutterTextInputPluginTest, CanWorkWithFlutterTextField) {
     [viewController.view addSubview:mockTextField];
     [mockTextField startEditing];
 
-    NSDictionary* arguments = @{
+    NSDictionary* setClientConfig = @{
       @"inputAction" : @"action",
       @"inputType" : @{@"name" : @"inputName"},
     };
     FlutterMethodCall* methodCall =
         [FlutterMethodCall methodCallWithMethodName:@"TextInput.setClient"
-                                          arguments:@[ @(1), arguments ]];
+                                          arguments:@[ @(1), setClientConfig ]];
     FlutterResult result = ^(id result) {
     };
     [viewController.textInputPlugin handleMethodCall:methodCall result:result];
 
-    arguments = @{
+    NSDictionary* arguments = @{
       @"text" : @"new text",
       @"selectionBase" : @(1),
       @"selectionExtent" : @(2),
       @"composingBase" : @(-1),
       @"composingExtent" : @(-1),
     };
-
     methodCall = [FlutterMethodCall methodCallWithMethodName:@"TextInput.setEditingState"
                                                    arguments:arguments];
     [viewController.textInputPlugin handleMethodCall:methodCall result:result];
@@ -1483,13 +1985,10 @@ TEST(FlutterTextInputPluginTest, CanWorkWithFlutterTextField) {
 
 TEST(FlutterTextInputPluginTest, CanNotBecomeResponderIfNoViewController) {
   FlutterEngine* engine = CreateTestEngine();
-  NSString* fixtures = @(testing::GetFixturesPath());
-  FlutterDartProject* project = [[FlutterDartProject alloc]
-      initWithAssetsPath:fixtures
-             ICUDataPath:[fixtures stringByAppendingString:@"/icudtl.dat"]];
-  FlutterViewController* viewController = [[FlutterViewController alloc] initWithProject:project];
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
+                                                                                nibName:nil
+                                                                                 bundle:nil];
   [viewController loadView];
-  [engine setViewController:viewController];
   // Creates a NSWindow so that the native text field can become first responder.
   NSWindow* window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 800, 600)
                                                  styleMask:NSBorderlessWindowMask
@@ -1499,14 +1998,14 @@ TEST(FlutterTextInputPluginTest, CanNotBecomeResponderIfNoViewController) {
 
   engine.semanticsEnabled = YES;
 
-  auto bridge = engine.accessibilityBridge.lock();
+  auto bridge = viewController.accessibilityBridge.lock();
   FlutterPlatformNodeDelegateMac delegate(bridge, viewController);
   ui::AXTree tree;
   ui::AXNode ax_node(&tree, nullptr, 0, 0);
   ui::AXNodeData node_data;
   node_data.SetValue("initial text");
   ax_node.SetData(node_data);
-  delegate.Init(engine.accessibilityBridge, &ax_node);
+  delegate.Init(viewController.accessibilityBridge, &ax_node);
   FlutterTextPlatformNode text_platform_node(&delegate, viewController);
 
   FlutterTextField* textField = text_platform_node.GetNativeViewAccessible();
@@ -1520,13 +2019,10 @@ TEST(FlutterTextInputPluginTest, CanNotBecomeResponderIfNoViewController) {
 
 TEST(FlutterTextInputPluginTest, IsAddedAndRemovedFromViewHierarchy) {
   FlutterEngine* engine = CreateTestEngine();
-  NSString* fixtures = @(testing::GetFixturesPath());
-  FlutterDartProject* project = [[FlutterDartProject alloc]
-      initWithAssetsPath:fixtures
-             ICUDataPath:[fixtures stringByAppendingString:@"/icudtl.dat"]];
-  FlutterViewController* viewController = [[FlutterViewController alloc] initWithProject:project];
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
+                                                                                nibName:nil
+                                                                                 bundle:nil];
   [viewController loadView];
-  [engine setViewController:viewController];
 
   NSWindow* window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 800, 600)
                                                  styleMask:NSBorderlessWindowMask
@@ -1554,4 +2050,57 @@ TEST(FlutterTextInputPluginTest, IsAddedAndRemovedFromViewHierarchy) {
   ASSERT_FALSE(window.firstResponder == viewController.textInputPlugin);
 }
 
+TEST(FlutterTextInputPluginTest, FirstResponderIsCorrect) {
+  FlutterEngine* engine = CreateTestEngine();
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
+                                                                                nibName:nil
+                                                                                 bundle:nil];
+  [viewController loadView];
+
+  NSWindow* window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 800, 600)
+                                                 styleMask:NSBorderlessWindowMask
+                                                   backing:NSBackingStoreBuffered
+                                                     defer:NO];
+  window.contentView = viewController.view;
+
+  ASSERT_TRUE(viewController.flutterView.acceptsFirstResponder);
+
+  [window makeFirstResponder:viewController.flutterView];
+
+  [viewController.textInputPlugin
+      handleMethodCall:[FlutterMethodCall methodCallWithMethodName:@"TextInput.show" arguments:@[]]
+                result:^(id){
+                }];
+
+  ASSERT_TRUE(window.firstResponder == viewController.textInputPlugin);
+
+  ASSERT_FALSE(viewController.flutterView.acceptsFirstResponder);
+
+  [viewController.textInputPlugin
+      handleMethodCall:[FlutterMethodCall methodCallWithMethodName:@"TextInput.hide" arguments:@[]]
+                result:^(id){
+                }];
+
+  ASSERT_TRUE(viewController.flutterView.acceptsFirstResponder);
+  ASSERT_TRUE(window.firstResponder == viewController.flutterView);
+}
+
+TEST(FlutterTextInputPluginTest, HasZeroSizeAndClipsToBounds) {
+  id engineMock = flutter::testing::CreateMockFlutterEngine(@"");
+  id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
+  OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
+      [engineMock binaryMessenger])
+      .andReturn(binaryMessengerMock);
+
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engineMock
+                                                                                nibName:@""
+                                                                                 bundle:nil];
+
+  FlutterTextInputPlugin* plugin =
+      [[FlutterTextInputPlugin alloc] initWithViewController:viewController];
+
+  ASSERT_TRUE(NSIsEmptyRect(plugin.frame));
+  ASSERT_TRUE(plugin.clipsToBounds);
+}
+
 }  // namespace flutter::testing
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterTextInputSemanticsObject.h b/shell/platform/darwin/macos/framework/Source/FlutterTextInputSemanticsObject.h
index e3e4ef490169157aa06a860e20094fae98267dba..82e0e1ad816b1cdc6e7cc07ae5f432a6fd1993ff 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterTextInputSemanticsObject.h
+++ b/shell/platform/darwin/macos/framework/Source/FlutterTextInputSemanticsObject.h
@@ -2,10 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERTEXTINPUTSEMANTICSOBJECT_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERTEXTINPUTSEMANTICSOBJECT_H_
+
 #import <Cocoa/Cocoa.h>
 
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterPlatformNodeDelegateMac.h"
 
+#include "flutter/fml/macros.h"
 #include "flutter/third_party/accessibility/ax/platform/ax_platform_node_base.h"
 
 @class FlutterTextField;
@@ -56,6 +60,8 @@ class FlutterTextPlatformNode : public ui::AXPlatformNodeBase {
   /// @brief Detaches the FlutterTextField from the FlutterView if it is not
   ///        already detached.
   void EnsureDetachedFromView();
+
+  FML_DISALLOW_COPY_AND_ASSIGN(FlutterTextPlatformNode);
 };
 
 }  // namespace flutter
@@ -96,3 +102,5 @@ class FlutterTextPlatformNode : public ui::AXPlatformNodeBase {
 - (void)startEditing;
 
 @end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERTEXTINPUTSEMANTICSOBJECT_H_
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterTextInputSemanticsObjectTest.mm b/shell/platform/darwin/macos/framework/Source/FlutterTextInputSemanticsObjectTest.mm
index 287b12713c24a0c1c839f4e8f9901b8ffba3febb..fcba538dc11dd16a3b6e10d206f980ed36be9814 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterTextInputSemanticsObjectTest.mm
+++ b/shell/platform/darwin/macos/framework/Source/FlutterTextInputSemanticsObjectTest.mm
@@ -9,7 +9,6 @@
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputSemanticsObject.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterViewController_Internal.h"
 
-#import <OCMock/OCMock.h>
 #import "flutter/testing/testing.h"
 
 namespace flutter::testing {
@@ -28,13 +27,10 @@ FlutterEngine* CreateTestEngine() {
 TEST(FlutterTextInputSemanticsObjectTest, DoesInitialize) {
   FlutterEngine* engine = CreateTestEngine();
   {
-    NSString* fixtures = @(testing::GetFixturesPath());
-    FlutterDartProject* project = [[FlutterDartProject alloc]
-        initWithAssetsPath:fixtures
-               ICUDataPath:[fixtures stringByAppendingString:@"/icudtl.dat"]];
-    FlutterViewController* viewController = [[FlutterViewController alloc] initWithProject:project];
+    FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
+                                                                                  nibName:nil
+                                                                                   bundle:nil];
     [viewController loadView];
-    [engine setViewController:viewController];
     // Create a NSWindow so that the native text field can become first responder.
     NSWindow* window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 800, 600)
                                                    styleMask:NSBorderlessWindowMask
@@ -44,14 +40,14 @@ TEST(FlutterTextInputSemanticsObjectTest, DoesInitialize) {
 
     engine.semanticsEnabled = YES;
 
-    auto bridge = engine.accessibilityBridge.lock();
+    auto bridge = viewController.accessibilityBridge.lock();
     FlutterPlatformNodeDelegateMac delegate(bridge, viewController);
     ui::AXTree tree;
     ui::AXNode ax_node(&tree, nullptr, 0, 0);
     ui::AXNodeData node_data;
     node_data.SetValue("initial text");
     ax_node.SetData(node_data);
-    delegate.Init(engine.accessibilityBridge, &ax_node);
+    delegate.Init(viewController.accessibilityBridge, &ax_node);
     // Verify that a FlutterTextField is attached to the view.
     FlutterTextPlatformNode text_platform_node(&delegate, viewController);
     id native_accessibility = text_platform_node.GetNativeViewAccessible();
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterTextureRegistrar.h b/shell/platform/darwin/macos/framework/Source/FlutterTextureRegistrar.h
index cc9ddfdd9c81ae3fb6e4da953abbdb7ddfab3e5a..d95aab90e1a1dad14af2b86926465de22b6fd4e5 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterTextureRegistrar.h
+++ b/shell/platform/darwin/macos/framework/Source/FlutterTextureRegistrar.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERTEXTUREREGISTRAR_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERTEXTUREREGISTRAR_H_
+
 #import <Cocoa/Cocoa.h>
 
 #import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterEngine.h"
@@ -46,3 +49,5 @@
 - (nullable FlutterExternalTexture*)getTextureWithID:(int64_t)textureID;
 
 @end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERTEXTUREREGISTRAR_H_
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterThreadSynchronizer.h b/shell/platform/darwin/macos/framework/Source/FlutterThreadSynchronizer.h
new file mode 100644
index 0000000000000000000000000000000000000000..1144f50221843a470ec8cd42e07dd048cb4a4798
--- /dev/null
+++ b/shell/platform/darwin/macos/framework/Source/FlutterThreadSynchronizer.h
@@ -0,0 +1,110 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERTHREADSYNCHRONIZER_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERTHREADSYNCHRONIZER_H_
+
+#import <Cocoa/Cocoa.h>
+
+/**
+ * Takes care of synchronization between raster and platform thread.
+ *
+ * All methods of this class must be called from the platform thread,
+ * except for performCommitForView:size:notify:.
+ */
+@interface FlutterThreadSynchronizer : NSObject
+
+/**
+ * Creates a FlutterThreadSynchronizer that uses the OS main thread as the
+ * platform thread.
+ */
+- (nullable instancetype)init;
+
+/**
+ * Blocks until all views have a commit with their given sizes (or empty) is requested.
+ */
+- (void)beginResizeForView:(int64_t)viewId
+                      size:(CGSize)size
+                    notify:(nonnull dispatch_block_t)notify;
+
+/**
+ * Called from raster thread. Schedules the given block on platform thread
+ * and blocks until it is performed.
+ *
+ * If platform thread is blocked in `beginResize:` for given size (or size is empty),
+ * unblocks platform thread.
+ *
+ * The notify block is guaranteed to be called within a core animation transaction.
+ */
+- (void)performCommitForView:(int64_t)viewId
+                        size:(CGSize)size
+                      notify:(nonnull dispatch_block_t)notify;
+
+/**
+ * Schedules the given block to be performed on the platform thread.
+ * The block will be performed even if the platform thread is blocked waiting
+ * for a commit.
+ */
+- (void)performOnPlatformThread:(nonnull dispatch_block_t)block;
+
+/**
+ * Requests the synchronizer to track another view.
+ *
+ * A view must be registered before calling begineResizeForView: or
+ * performCommitForView:. It is typically done when the view controller is
+ * created.
+ */
+- (void)registerView:(int64_t)viewId;
+
+/**
+ * Requests the synchronizer to no longer track a view.
+ *
+ * It is typically done when the view controller is destroyed.
+ */
+- (void)deregisterView:(int64_t)viewId;
+
+/**
+ * Called when the engine shuts down.
+ *
+ * Prevents any further synchronization and no longer blocks any threads.
+ */
+- (void)shutdown;
+
+@end
+
+@interface FlutterThreadSynchronizer (TestUtils)
+
+/**
+ * Creates a FlutterThreadSynchronizer that uses the specified queue as the
+ * platform thread.
+ */
+- (nullable instancetype)initWithMainQueue:(nonnull dispatch_queue_t)queue;
+
+/**
+ * Blocks current thread until the mutex is available, then return whether the
+ * synchronizer is waiting for a correct commit during resizing.
+ *
+ * After calling an operation of the thread synchronizer, call this method,
+ * and when it returns, the thread synchronizer can be at one of the following 3
+ * states:
+ *
+ *  1. The operation has not started at all (with a return value FALSE.)
+ *  2. The operation has ended (with a return value FALSE.)
+ *  3. beginResizeForView: is in progress, waiting (with a return value TRUE.)
+ *
+ * By eliminating the 1st case (such as using the notify callback), we can use
+ * this return value to decide whether the synchronizer is in case 2 or case 3,
+ * that is whether the resizing is blocked by a mismatching commit.
+ */
+- (BOOL)isWaitingWhenMutexIsAvailable;
+
+/**
+ * Blocks current thread until there is frame available.
+ * Used in FlutterEngineTest.
+ */
+- (void)blockUntilFrameAvailable;
+
+@end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERTHREADSYNCHRONIZER_H_
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterThreadSynchronizer.mm b/shell/platform/darwin/macos/framework/Source/FlutterThreadSynchronizer.mm
new file mode 100644
index 0000000000000000000000000000000000000000..3eb332fac56636a93e3e991472df505017c42701
--- /dev/null
+++ b/shell/platform/darwin/macos/framework/Source/FlutterThreadSynchronizer.mm
@@ -0,0 +1,205 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterThreadSynchronizer.h"
+
+#import <QuartzCore/QuartzCore.h>
+
+#include <mutex>
+#include <unordered_map>
+#include <vector>
+
+#import "flutter/fml/logging.h"
+#import "flutter/fml/synchronization/waitable_event.h"
+
+@interface FlutterThreadSynchronizer () {
+  dispatch_queue_t _mainQueue;
+  std::mutex _mutex;
+  BOOL _shuttingDown;
+  std::unordered_map<int64_t, CGSize> _contentSizes;
+  std::vector<dispatch_block_t> _scheduledBlocks;
+
+  BOOL _beginResizeWaiting;
+
+  // Used to block [beginResize:].
+  std::condition_variable _condBlockBeginResize;
+}
+
+/**
+ * Returns true if all existing views have a non-zero size.
+ *
+ * If there are no views, still returns true.
+ */
+- (BOOL)allViewsHaveFrame;
+
+/**
+ * Returns true if there are any views that have a non-zero size.
+ *
+ * If there are no views, returns false.
+ */
+- (BOOL)someViewsHaveFrame;
+
+@end
+
+@implementation FlutterThreadSynchronizer
+
+- (instancetype)init {
+  return [self initWithMainQueue:dispatch_get_main_queue()];
+}
+
+- (instancetype)initWithMainQueue:(dispatch_queue_t)queue {
+  self = [super init];
+  if (self != nil) {
+    _mainQueue = queue;
+  }
+  return self;
+}
+
+- (BOOL)allViewsHaveFrame {
+  for (auto const& [viewId, contentSize] : _contentSizes) {
+    if (CGSizeEqualToSize(contentSize, CGSizeZero)) {
+      return NO;
+    }
+  }
+  return YES;
+}
+
+- (BOOL)someViewsHaveFrame {
+  for (auto const& [viewId, contentSize] : _contentSizes) {
+    if (!CGSizeEqualToSize(contentSize, CGSizeZero)) {
+      return YES;
+    }
+  }
+  return NO;
+}
+
+- (void)drain {
+  dispatch_assert_queue(_mainQueue);
+
+  [CATransaction begin];
+  [CATransaction setDisableActions:YES];
+  for (dispatch_block_t block : _scheduledBlocks) {
+    block();
+  }
+  [CATransaction commit];
+  _scheduledBlocks.clear();
+}
+
+- (void)blockUntilFrameAvailable {
+  std::unique_lock<std::mutex> lock(_mutex);
+  [self drain];
+
+  _beginResizeWaiting = YES;
+  while (![self someViewsHaveFrame] && !_shuttingDown) {
+    _condBlockBeginResize.wait(lock);
+    [self drain];
+  }
+
+  _beginResizeWaiting = NO;
+}
+
+- (void)beginResizeForView:(int64_t)viewId
+                      size:(CGSize)size
+                    notify:(nonnull dispatch_block_t)notify {
+  dispatch_assert_queue(_mainQueue);
+  std::unique_lock<std::mutex> lock(_mutex);
+
+  if (![self allViewsHaveFrame] || _shuttingDown) {
+    // No blocking until framework produces at least one frame
+    notify();
+    return;
+  }
+
+  [self drain];
+
+  notify();
+
+  _contentSizes[viewId] = CGSizeMake(-1, -1);
+
+  _beginResizeWaiting = YES;
+
+  while (true) {
+    if (_shuttingDown) {
+      break;
+    }
+    const CGSize& contentSize = _contentSizes[viewId];
+    if (CGSizeEqualToSize(contentSize, size) || CGSizeEqualToSize(contentSize, CGSizeZero)) {
+      break;
+    }
+    _condBlockBeginResize.wait(lock);
+    [self drain];
+  }
+
+  _beginResizeWaiting = NO;
+}
+
+- (void)performCommitForView:(int64_t)viewId
+                        size:(CGSize)size
+                      notify:(nonnull dispatch_block_t)notify {
+  dispatch_assert_queue_not(_mainQueue);
+  fml::AutoResetWaitableEvent event;
+  {
+    std::unique_lock<std::mutex> lock(_mutex);
+    if (_shuttingDown) {
+      // Engine is shutting down, main thread may be blocked by the engine
+      // waiting for raster thread to finish.
+      return;
+    }
+    fml::AutoResetWaitableEvent& e = event;
+    _scheduledBlocks.push_back(^{
+      notify();
+      _contentSizes[viewId] = size;
+      e.Signal();
+    });
+    if (_beginResizeWaiting) {
+      _condBlockBeginResize.notify_all();
+    } else {
+      dispatch_async(_mainQueue, ^{
+        std::unique_lock<std::mutex> lock(_mutex);
+        [self drain];
+      });
+    }
+  }
+  event.Wait();
+}
+
+- (void)performOnPlatformThread:(nonnull dispatch_block_t)block {
+  std::unique_lock<std::mutex> lock(_mutex);
+  _scheduledBlocks.push_back(block);
+  if (_beginResizeWaiting) {
+    _condBlockBeginResize.notify_all();
+  } else {
+    dispatch_async(_mainQueue, ^{
+      std::unique_lock<std::mutex> lock(_mutex);
+      [self drain];
+    });
+  }
+}
+
+- (void)registerView:(int64_t)viewId {
+  dispatch_assert_queue(_mainQueue);
+  std::unique_lock<std::mutex> lock(_mutex);
+  _contentSizes[viewId] = CGSizeZero;
+}
+
+- (void)deregisterView:(int64_t)viewId {
+  dispatch_assert_queue(_mainQueue);
+  std::unique_lock<std::mutex> lock(_mutex);
+  _contentSizes.erase(viewId);
+}
+
+- (void)shutdown {
+  dispatch_assert_queue(_mainQueue);
+  std::unique_lock<std::mutex> lock(_mutex);
+  _shuttingDown = YES;
+  _condBlockBeginResize.notify_all();
+  [self drain];
+}
+
+- (BOOL)isWaitingWhenMutexIsAvailable {
+  std::unique_lock<std::mutex> lock(_mutex);
+  return _beginResizeWaiting;
+}
+
+@end
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterThreadSynchronizerTest.mm b/shell/platform/darwin/macos/framework/Source/FlutterThreadSynchronizerTest.mm
new file mode 100644
index 0000000000000000000000000000000000000000..a9fafe947f562f6c63b83a4831788a939397e20f
--- /dev/null
+++ b/shell/platform/darwin/macos/framework/Source/FlutterThreadSynchronizerTest.mm
@@ -0,0 +1,376 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterThreadSynchronizer.h"
+
+#import "flutter/fml/synchronization/waitable_event.h"
+#import "flutter/testing/testing.h"
+
+@interface FlutterThreadSynchronizerTestScaffold : NSObject
+
+@property(nonatomic, readonly, nonnull) FlutterThreadSynchronizer* synchronizer;
+
+- (nullable instancetype)init;
+- (void)dispatchMainTask:(nonnull void (^)())task;
+- (void)dispatchRenderTask:(nonnull void (^)())task;
+- (void)joinMain;
+- (void)joinRender;
+@end
+
+@implementation FlutterThreadSynchronizerTestScaffold {
+  dispatch_queue_t _mainQueue;
+  std::shared_ptr<fml::AutoResetWaitableEvent> _mainLatch;
+
+  dispatch_queue_t _renderQueue;
+  std::shared_ptr<fml::AutoResetWaitableEvent> _renderLatch;
+
+  FlutterThreadSynchronizer* _synchronizer;
+}
+
+@synthesize synchronizer = _synchronizer;
+
+- (nullable instancetype)init {
+  self = [super init];
+  if (self != nil) {
+    _mainQueue = dispatch_queue_create("MAIN", DISPATCH_QUEUE_SERIAL);
+    _renderQueue = dispatch_queue_create("RENDER", DISPATCH_QUEUE_SERIAL);
+    _synchronizer = [[FlutterThreadSynchronizer alloc] initWithMainQueue:_mainQueue];
+  }
+  return self;
+}
+
+- (void)dispatchMainTask:(nonnull void (^)())task {
+  dispatch_async(_mainQueue, task);
+}
+
+- (void)dispatchRenderTask:(nonnull void (^)())task {
+  dispatch_async(_renderQueue, task);
+}
+
+- (void)joinMain {
+  fml::AutoResetWaitableEvent latch;
+  fml::AutoResetWaitableEvent* pLatch = &latch;
+  dispatch_async(_mainQueue, ^{
+    pLatch->Signal();
+  });
+  latch.Wait();
+}
+
+- (void)joinRender {
+  fml::AutoResetWaitableEvent latch;
+  fml::AutoResetWaitableEvent* pLatch = &latch;
+  dispatch_async(_renderQueue, ^{
+    pLatch->Signal();
+  });
+  latch.Wait();
+}
+
+@end
+
+TEST(FlutterThreadSynchronizerTest, RegularCommit) {
+  FlutterThreadSynchronizerTestScaffold* scaffold =
+      [[FlutterThreadSynchronizerTestScaffold alloc] init];
+  FlutterThreadSynchronizer* synchronizer = scaffold.synchronizer;
+
+  // Initial resize: does not block until the first frame.
+  __block int notifiedResize = 0;
+  [scaffold dispatchMainTask:^{
+    [synchronizer registerView:1];
+    [synchronizer beginResizeForView:1
+                                size:CGSize{5, 5}
+                              notify:^{
+                                notifiedResize += 1;
+                              }];
+  }];
+  EXPECT_FALSE([synchronizer isWaitingWhenMutexIsAvailable]);
+  [scaffold joinMain];
+  EXPECT_EQ(notifiedResize, 1);
+
+  // Still does not block.
+  [scaffold dispatchMainTask:^{
+    [synchronizer beginResizeForView:1
+                                size:CGSize{7, 7}
+                              notify:^{
+                                notifiedResize += 1;
+                              }];
+  }];
+  EXPECT_FALSE([synchronizer isWaitingWhenMutexIsAvailable]);
+  [scaffold joinMain];
+  EXPECT_EQ(notifiedResize, 2);
+
+  // First frame
+  __block int notifiedCommit = 0;
+  [scaffold dispatchRenderTask:^{
+    [synchronizer performCommitForView:1
+                                  size:CGSize{7, 7}
+                                notify:^{
+                                  notifiedCommit += 1;
+                                }];
+  }];
+  EXPECT_FALSE([synchronizer isWaitingWhenMutexIsAvailable]);
+  [scaffold joinRender];
+  EXPECT_EQ(notifiedCommit, 1);
+}
+
+TEST(FlutterThreadSynchronizerTest, ResizingBlocksRenderingUntilSizeMatches) {
+  FlutterThreadSynchronizerTestScaffold* scaffold =
+      [[FlutterThreadSynchronizerTestScaffold alloc] init];
+  FlutterThreadSynchronizer* synchronizer = scaffold.synchronizer;
+  // A latch to ensure that a beginResizeForView: call has at least executed
+  // something, so that the isWaitingWhenMutexIsAvailable: call correctly stops
+  // at either when beginResizeForView: finishes or waits half way.
+  fml::AutoResetWaitableEvent begunResizingLatch;
+  fml::AutoResetWaitableEvent* begunResizing = &begunResizingLatch;
+
+  // Initial resize: does not block until the first frame.
+  [scaffold dispatchMainTask:^{
+    [synchronizer registerView:1];
+    [synchronizer beginResizeForView:1
+                                size:CGSize{5, 5}
+                              notify:^{
+                              }];
+  }];
+  [scaffold joinMain];
+  EXPECT_FALSE([synchronizer isWaitingWhenMutexIsAvailable]);
+
+  // First frame.
+  [scaffold dispatchRenderTask:^{
+    [synchronizer performCommitForView:1
+                                  size:CGSize{5, 5}
+                                notify:^{
+                                }];
+  }];
+  [scaffold joinRender];
+  EXPECT_FALSE([synchronizer isWaitingWhenMutexIsAvailable]);
+
+  // Resize to (7, 7): blocks until the next frame.
+  [scaffold dispatchMainTask:^{
+    [synchronizer beginResizeForView:1
+                                size:CGSize{7, 7}
+                              notify:^{
+                                begunResizing->Signal();
+                              }];
+  }];
+  begunResizing->Wait();
+  EXPECT_TRUE([synchronizer isWaitingWhenMutexIsAvailable]);
+
+  // Render with old size.
+  [scaffold dispatchRenderTask:^{
+    [synchronizer performCommitForView:1
+                                  size:CGSize{5, 5}
+                                notify:^{
+                                }];
+  }];
+  [scaffold joinRender];
+  EXPECT_TRUE([synchronizer isWaitingWhenMutexIsAvailable]);
+
+  // Render with new size.
+  [scaffold dispatchRenderTask:^{
+    [synchronizer performCommitForView:1
+                                  size:CGSize{7, 7}
+                                notify:^{
+                                }];
+  }];
+  [scaffold joinRender];
+  EXPECT_FALSE([synchronizer isWaitingWhenMutexIsAvailable]);
+
+  [scaffold joinMain];
+}
+
+TEST(FlutterThreadSynchronizerTest, ShutdownMakesEverythingNonBlocking) {
+  FlutterThreadSynchronizerTestScaffold* scaffold =
+      [[FlutterThreadSynchronizerTestScaffold alloc] init];
+  FlutterThreadSynchronizer* synchronizer = scaffold.synchronizer;
+  fml::AutoResetWaitableEvent begunResizingLatch;
+  fml::AutoResetWaitableEvent* begunResizing = &begunResizingLatch;
+
+  // Initial resize
+  [scaffold dispatchMainTask:^{
+    [synchronizer registerView:1];
+    [synchronizer beginResizeForView:1
+                                size:CGSize{5, 5}
+                              notify:^{
+                              }];
+  }];
+  [scaffold joinMain];
+  EXPECT_FALSE([synchronizer isWaitingWhenMutexIsAvailable]);
+
+  // Push a frame.
+  [scaffold dispatchRenderTask:^{
+    [synchronizer performCommitForView:1
+                                  size:CGSize{5, 5}
+                                notify:^{
+                                }];
+  }];
+  [scaffold joinRender];
+  EXPECT_FALSE([synchronizer isWaitingWhenMutexIsAvailable]);
+
+  [scaffold dispatchMainTask:^{
+    [synchronizer shutdown];
+  }];
+
+  // Resize to (7, 7). Should not block any frames since it has shut down.
+  [scaffold dispatchMainTask:^{
+    [synchronizer beginResizeForView:1
+                                size:CGSize{7, 7}
+                              notify:^{
+                                begunResizing->Signal();
+                              }];
+  }];
+  begunResizing->Wait();
+  EXPECT_FALSE([synchronizer isWaitingWhenMutexIsAvailable]);
+  [scaffold joinMain];
+
+  // All further calls should be unblocking.
+  [scaffold dispatchRenderTask:^{
+    [synchronizer performCommitForView:1
+                                  size:CGSize{9, 9}
+                                notify:^{
+                                }];
+  }];
+  [scaffold joinRender];
+  EXPECT_FALSE([synchronizer isWaitingWhenMutexIsAvailable]);
+}
+
+TEST(FlutterThreadSynchronizerTest, RegularCommitForMultipleViews) {
+  FlutterThreadSynchronizerTestScaffold* scaffold =
+      [[FlutterThreadSynchronizerTestScaffold alloc] init];
+  FlutterThreadSynchronizer* synchronizer = scaffold.synchronizer;
+  fml::AutoResetWaitableEvent begunResizingLatch;
+  fml::AutoResetWaitableEvent* begunResizing = &begunResizingLatch;
+
+  // Initial resize: does not block until the first frame.
+  [scaffold dispatchMainTask:^{
+    [synchronizer registerView:1];
+    [synchronizer registerView:2];
+    [synchronizer beginResizeForView:1
+                                size:CGSize{5, 5}
+                              notify:^{
+                              }];
+    [synchronizer beginResizeForView:2
+                                size:CGSize{15, 15}
+                              notify:^{
+                                begunResizing->Signal();
+                              }];
+  }];
+  begunResizing->Wait();
+  EXPECT_FALSE([synchronizer isWaitingWhenMutexIsAvailable]);
+  [scaffold joinMain];
+
+  // Still does not block.
+  [scaffold dispatchMainTask:^{
+    [synchronizer beginResizeForView:1
+                                size:CGSize{7, 7}
+                              notify:^{
+                                begunResizing->Signal();
+                              }];
+  }];
+  begunResizing->Signal();
+  EXPECT_FALSE([synchronizer isWaitingWhenMutexIsAvailable]);
+  [scaffold joinMain];
+
+  // First frame
+  [scaffold dispatchRenderTask:^{
+    [synchronizer performCommitForView:1
+                                  size:CGSize{7, 7}
+                                notify:^{
+                                }];
+    [synchronizer performCommitForView:2
+                                  size:CGSize{15, 15}
+                                notify:^{
+                                }];
+  }];
+  [scaffold joinRender];
+  EXPECT_FALSE([synchronizer isWaitingWhenMutexIsAvailable]);
+}
+
+TEST(FlutterThreadSynchronizerTest, ResizingForMultipleViews) {
+  FlutterThreadSynchronizerTestScaffold* scaffold =
+      [[FlutterThreadSynchronizerTestScaffold alloc] init];
+  FlutterThreadSynchronizer* synchronizer = scaffold.synchronizer;
+  fml::AutoResetWaitableEvent begunResizingLatch;
+  fml::AutoResetWaitableEvent* begunResizing = &begunResizingLatch;
+
+  // Initial resize: does not block until the first frame.
+  [scaffold dispatchMainTask:^{
+    [synchronizer registerView:1];
+    [synchronizer registerView:2];
+    [synchronizer beginResizeForView:1
+                                size:CGSize{5, 5}
+                              notify:^{
+                              }];
+    [synchronizer beginResizeForView:2
+                                size:CGSize{15, 15}
+                              notify:^{
+                              }];
+  }];
+  [scaffold joinMain];
+  EXPECT_FALSE([synchronizer isWaitingWhenMutexIsAvailable]);
+
+  // First frame.
+  [scaffold dispatchRenderTask:^{
+    [synchronizer performCommitForView:1
+                                  size:CGSize{5, 5}
+                                notify:^{
+                                }];
+    [synchronizer performCommitForView:2
+                                  size:CGSize{15, 15}
+                                notify:^{
+                                }];
+  }];
+  [scaffold joinRender];
+  EXPECT_FALSE([synchronizer isWaitingWhenMutexIsAvailable]);
+
+  // Resize view 2 to (17, 17): blocks until the next frame.
+  [scaffold dispatchMainTask:^{
+    [synchronizer beginResizeForView:2
+                                size:CGSize{17, 17}
+                              notify:^{
+                                begunResizing->Signal();
+                              }];
+  }];
+  begunResizing->Wait();
+  EXPECT_TRUE([synchronizer isWaitingWhenMutexIsAvailable]);
+
+  // Render view 1 with the size. Still blocking.
+  [scaffold dispatchRenderTask:^{
+    [synchronizer performCommitForView:1
+                                  size:CGSize{5, 5}
+                                notify:^{
+                                }];
+  }];
+  [scaffold joinRender];
+  EXPECT_TRUE([synchronizer isWaitingWhenMutexIsAvailable]);
+
+  // Render view 2 with the old size. Still blocking.
+  [scaffold dispatchRenderTask:^{
+    [synchronizer performCommitForView:1
+                                  size:CGSize{15, 15}
+                                notify:^{
+                                }];
+  }];
+  [scaffold joinRender];
+  EXPECT_TRUE([synchronizer isWaitingWhenMutexIsAvailable]);
+
+  // Render view 1 with the size.
+  [scaffold dispatchRenderTask:^{
+    [synchronizer performCommitForView:1
+                                  size:CGSize{5, 5}
+                                notify:^{
+                                }];
+  }];
+  [scaffold joinRender];
+  EXPECT_TRUE([synchronizer isWaitingWhenMutexIsAvailable]);
+
+  // Render view 2 with the new size. Unblocks.
+  [scaffold dispatchRenderTask:^{
+    [synchronizer performCommitForView:2
+                                  size:CGSize{17, 17}
+                                notify:^{
+                                }];
+  }];
+  [scaffold joinRender];
+  [scaffold joinMain];
+  EXPECT_FALSE([synchronizer isWaitingWhenMutexIsAvailable]);
+}
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterTimeConverter.h b/shell/platform/darwin/macos/framework/Source/FlutterTimeConverter.h
new file mode 100644
index 0000000000000000000000000000000000000000..c7e94b109920a4f5a7f0c5e7b6c2d88da8ccaa94
--- /dev/null
+++ b/shell/platform/darwin/macos/framework/Source/FlutterTimeConverter.h
@@ -0,0 +1,22 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERTIMECONVERTER_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERTIMECONVERTER_H_
+
+#import <CoreGraphics/CoreGraphics.h>
+
+@class FlutterEngine;
+
+/// Converts between the time representation used by Flutter Engine and CAMediaTime.
+@interface FlutterTimeConverter : NSObject
+
+- (instancetype)initWithEngine:(FlutterEngine*)engine;
+
+- (uint64_t)CAMediaTimeToEngineTime:(CFTimeInterval)time;
+- (CFTimeInterval)engineTimeToCAMediaTime:(uint64_t)time;
+
+@end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERTIMECONVERTER_H_
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterTimeConverter.mm b/shell/platform/darwin/macos/framework/Source/FlutterTimeConverter.mm
new file mode 100644
index 0000000000000000000000000000000000000000..e8f7ef042b8fd6303c409ee0f0ffc5940169ccd3
--- /dev/null
+++ b/shell/platform/darwin/macos/framework/Source/FlutterTimeConverter.mm
@@ -0,0 +1,46 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTER_TIME_CONVERTER_MM_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTER_TIME_CONVERTER_MM_
+
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterTimeConverter.h"
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h"
+
+@interface FlutterTimeConverter () {
+  __weak FlutterEngine* _engine;
+}
+@end
+
+@implementation FlutterTimeConverter
+
+- (instancetype)initWithEngine:(FlutterEngine*)engine {
+  self = [super init];
+  if (self) {
+    _engine = engine;
+  }
+  return self;
+}
+
+- (uint64_t)CAMediaTimeToEngineTime:(CFTimeInterval)time {
+  FlutterEngine* engine = _engine;
+  if (!engine) {
+    return 0;
+  }
+  return (time - CACurrentMediaTime()) * NSEC_PER_SEC + engine.embedderAPI.GetCurrentTime();
+}
+
+- (CFTimeInterval)engineTimeToCAMediaTime:(uint64_t)time {
+  FlutterEngine* engine = _engine;
+  if (!engine) {
+    return 0;
+  }
+  return (static_cast<int64_t>(time) - static_cast<int64_t>(engine.embedderAPI.GetCurrentTime())) /
+             static_cast<double>(NSEC_PER_SEC) +
+         CACurrentMediaTime();
+}
+
+@end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTER_TIME_CONVERTER_MM_-
diff --git a/lib/web_ui/test/canvaskit/canvas_test.dart b/shell/platform/darwin/macos/framework/Source/FlutterUmbrellaImportTests.m
similarity index 30%
rename from lib/web_ui/test/canvaskit/canvas_test.dart
rename to shell/platform/darwin/macos/framework/Source/FlutterUmbrellaImportTests.m
index cacb5ed4c6c3ffdbccf71db4bd433ac47b019c27..b81280d464c19c522886820644353dac6561c8a2 100644
--- a/lib/web_ui/test/canvaskit/canvas_test.dart
+++ b/shell/platform/darwin/macos/framework/Source/FlutterUmbrellaImportTests.m
@@ -2,27 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-@TestOn('chrome || safari || firefox')
+// FLUTTER_NOLINT: https://github.com/flutter/flutter/issues/93360
 
-import 'dart:async';
-
-import 'package:test/bootstrap/browser.dart';
-import 'package:test/test.dart';
-
-import '../engine/canvas_test.dart';
-import 'common.dart';
-
-void main() {
-  internalBootstrapBrowserTest(() => testMain);
-}
-
-// Run the same semantics tests in CanvasKit mode because as of today we do not
-// yet share platform view logic with the HTML renderer, which affects
-// semantics.
-Future<void> testMain() async {
-  group('CanvasKit semantics', () {
-    setUpCanvasKitTest();
-
-    runCanvasTests(deviceClipRoundsOut: true);
-  });
-}
+// The only point of this file is to ensure that the Flutter framework umbrella header can be
+// cleanly imported from an Objective-C translation unit. The target that uses this file copies the
+// headers to a path that simulates how users would actually import the framework outside of the
+// engine source root.
+#import <FlutterMacOS/FlutterMacOS.h>
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterVSyncWaiter.h b/shell/platform/darwin/macos/framework/Source/FlutterVSyncWaiter.h
new file mode 100644
index 0000000000000000000000000000000000000000..2bb574f775fc5203b5744fb4a087222be79364e7
--- /dev/null
+++ b/shell/platform/darwin/macos/framework/Source/FlutterVSyncWaiter.h
@@ -0,0 +1,26 @@
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERVSYNCWAITER_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERVSYNCWAITER_H_
+
+#import <AppKit/AppKit.h>
+
+@class FlutterDisplayLink;
+
+@interface FlutterVSyncWaiter : NSObject
+
+/// Creates new waiter instance tied to provided NSView.
+/// This function must be called on the main thread.
+///
+/// Provided |block| will be invoked on same thread as -waitForVSync:.
+- (instancetype)initWithDisplayLink:(FlutterDisplayLink*)displayLink
+                              block:(void (^)(CFTimeInterval timestamp,
+                                              CFTimeInterval targetTimestamp,
+                                              uintptr_t baton))block;
+
+/// Schedules |baton| to be signaled on next display refresh.
+/// The block provided in the initializer will be invoked on same thread
+/// as this method (there must be a run loop associated with current thread).
+- (void)waitForVSync:(uintptr_t)baton;
+
+@end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERVSYNCWAITER_H_
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterVSyncWaiter.mm b/shell/platform/darwin/macos/framework/Source/FlutterVSyncWaiter.mm
new file mode 100644
index 0000000000000000000000000000000000000000..eb4d6fb9b3558e9d7d418de2a581299cf00d143a
--- /dev/null
+++ b/shell/platform/darwin/macos/framework/Source/FlutterVSyncWaiter.mm
@@ -0,0 +1,186 @@
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterVSyncWaiter.h"
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterDisplayLink.h"
+
+#include "flutter/fml/logging.h"
+
+#include <optional>
+#include <vector>
+
+#if (FLUTTER_RUNTIME_MODE == FLUTTER_RUNTIME_MODE_PROFILE)
+#define VSYNC_TRACING_ENABLED 1
+#endif
+
+#if VSYNC_TRACING_ENABLED
+#include <OSLog/OSLog.h>
+
+// Trace vsync events using os_signpost so that they can be seen in Instruments "Points of
+// Interest".
+#define TRACE_VSYNC(event_type, baton)                                                     \
+  do {                                                                                     \
+    os_log_t log = os_log_create("FlutterVSync", "PointsOfInterest");                      \
+    os_signpost_event_emit(log, OS_SIGNPOST_ID_EXCLUSIVE, event_type, "baton %lx", baton); \
+  } while (0)
+#else
+#define TRACE_VSYNC(event_type, baton) \
+  do {                                 \
+  } while (0)
+#endif
+
+@interface FlutterVSyncWaiter () <FlutterDisplayLinkDelegate>
+@end
+
+// It's preferable to fire the timers slightly early than too late due to scheduling latency.
+// 1ms before vsync should be late enough for all events to be processed.
+static const CFTimeInterval kTimerLatencyCompensation = 0.001;
+
+@implementation FlutterVSyncWaiter {
+  std::optional<std::uintptr_t> _pendingBaton;
+  FlutterDisplayLink* _displayLink;
+  void (^_block)(CFTimeInterval, CFTimeInterval, uintptr_t);
+  NSRunLoop* _runLoop;
+  CFTimeInterval _lastTargetTimestamp;
+  BOOL _warmUpFrame;
+}
+
+- (instancetype)initWithDisplayLink:(FlutterDisplayLink*)displayLink
+                              block:(void (^)(CFTimeInterval timestamp,
+                                              CFTimeInterval targetTimestamp,
+                                              uintptr_t baton))block {
+  FML_DCHECK([NSThread isMainThread]);
+  if (self = [super init]) {
+    _block = block;
+
+    _displayLink = displayLink;
+    _displayLink.delegate = self;
+    // Get at least one callback to initialize _lastTargetTimestamp.
+    _displayLink.paused = NO;
+    _warmUpFrame = YES;
+  }
+  return self;
+}
+
+// Called on same thread as the vsync request (UI thread).
+- (void)processDisplayLink:(CFTimeInterval)timestamp
+           targetTimestamp:(CFTimeInterval)targetTimestamp {
+  FML_DCHECK([NSRunLoop currentRunLoop] == _runLoop);
+
+  _lastTargetTimestamp = targetTimestamp;
+
+  // CVDisplayLink callback is called one and a half frame before the target
+  // timestamp. That can cause frame-pacing issues if the frame is rendered too early,
+  // it may also trigger frame start before events are processed.
+  CFTimeInterval minStart = targetTimestamp - _displayLink.nominalOutputRefreshPeriod;
+  CFTimeInterval current = CACurrentMediaTime();
+  CFTimeInterval remaining = std::max(minStart - current - kTimerLatencyCompensation, 0.0);
+
+  TRACE_VSYNC("DisplayLinkCallback-Original", _pendingBaton.value_or(0));
+
+  NSTimer* timer = [NSTimer
+      timerWithTimeInterval:remaining
+                    repeats:NO
+                      block:^(NSTimer* _Nonnull timer) {
+                        if (!_pendingBaton.has_value()) {
+                          TRACE_VSYNC("DisplayLinkPaused", size_t(0));
+                          _displayLink.paused = YES;
+                          return;
+                        }
+                        TRACE_VSYNC("DisplayLinkCallback-Delayed", _pendingBaton.value_or(0));
+                        _block(minStart, targetTimestamp, *_pendingBaton);
+                        _pendingBaton = std::nullopt;
+                      }];
+  [_runLoop addTimer:timer forMode:NSRunLoopCommonModes];
+}
+
+// Called from display link thread.
+- (void)onDisplayLink:(CFTimeInterval)timestamp targetTimestamp:(CFTimeInterval)targetTimestamp {
+  @synchronized(self) {
+    if (_runLoop == nil) {
+      // Initial vsync - timestamp will be used to determine vsync phase.
+      _lastTargetTimestamp = targetTimestamp;
+      _displayLink.paused = YES;
+    } else {
+      [_runLoop performBlock:^{
+        [self processDisplayLink:timestamp targetTimestamp:targetTimestamp];
+      }];
+    }
+  }
+}
+
+// Called from UI thread.
+- (void)waitForVSync:(uintptr_t)baton {
+  // CVDisplayLink start -> callback latency is two frames, there is
+  // no need to delay the warm-up frame.
+  if (_warmUpFrame) {
+    _warmUpFrame = NO;
+    TRACE_VSYNC("WarmUpFrame", baton);
+    [[NSRunLoop currentRunLoop] performBlock:^{
+      CFTimeInterval now = CACurrentMediaTime();
+      _block(now, now, baton);
+    }];
+    return;
+  }
+
+  // RunLoop is accessed both from main thread and from the display link thread.
+  @synchronized(self) {
+    if (_runLoop == nil) {
+      _runLoop = [NSRunLoop currentRunLoop];
+    }
+  }
+
+  FML_DCHECK(_runLoop == [NSRunLoop currentRunLoop]);
+  if (_pendingBaton.has_value()) {
+    FML_LOG(WARNING) << "Engine requested vsync while another was pending";
+    _block(0, 0, *_pendingBaton);
+    _pendingBaton = std::nullopt;
+  }
+
+  TRACE_VSYNC("VSyncRequest", _pendingBaton.value_or(0));
+
+  CFTimeInterval tick_interval = _displayLink.nominalOutputRefreshPeriod;
+  if (_displayLink.paused || tick_interval == 0) {
+    // When starting display link the first notification will come in the middle
+    // of next frame, which would incur a whole frame period of latency.
+    // To avoid that, first vsync notification will be fired using a timer
+    // scheduled to fire where the next frame is expected to start.
+    // Also use a timer if display link does not belong to any display
+    // (nominalOutputRefreshPeriod being 0)
+
+    // Start of the vsync interval.
+    CFTimeInterval start = CACurrentMediaTime();
+
+    // Timer delay is calculated as the time to the next frame start.
+    CFTimeInterval delay = 0;
+
+    if (tick_interval != 0 && _lastTargetTimestamp != 0) {
+      CFTimeInterval phase = fmod(_lastTargetTimestamp, tick_interval);
+      CFTimeInterval now = start;
+      start = now - (fmod(now, tick_interval)) + phase;
+      if (start < now) {
+        start += tick_interval;
+      }
+      delay = std::max(start - now - kTimerLatencyCompensation, 0.0);
+    }
+
+    NSTimer* timer = [NSTimer timerWithTimeInterval:delay
+                                            repeats:NO
+                                              block:^(NSTimer* timer) {
+                                                CFTimeInterval targetTimestamp =
+                                                    start + tick_interval;
+                                                TRACE_VSYNC("SynthesizedInitialVSync", baton);
+                                                _block(start, targetTimestamp, baton);
+                                              }];
+    [_runLoop addTimer:timer forMode:NSRunLoopCommonModes];
+    _displayLink.paused = NO;
+  } else {
+    _pendingBaton = baton;
+  }
+}
+
+- (void)dealloc {
+  if (_pendingBaton.has_value()) {
+    FML_LOG(WARNING) << "Deallocating FlutterVSyncWaiter with a pending vsync";
+  }
+  [_displayLink invalidate];
+}
+
+@end
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterVSyncWaiterTest.mm b/shell/platform/darwin/macos/framework/Source/FlutterVSyncWaiterTest.mm
new file mode 100644
index 0000000000000000000000000000000000000000..02448549627adcfba00c894624dcbc7cb2f6c898
--- /dev/null
+++ b/shell/platform/darwin/macos/framework/Source/FlutterVSyncWaiterTest.mm
@@ -0,0 +1,203 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterDisplayLink.h"
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterVSyncWaiter.h"
+
+#import "flutter/testing/testing.h"
+
+@interface TestDisplayLink : FlutterDisplayLink {
+}
+
+@property(nonatomic) CFTimeInterval nominalOutputRefreshPeriod;
+
+@end
+
+@implementation TestDisplayLink
+
+@synthesize nominalOutputRefreshPeriod = _nominalOutputRefreshPeriod;
+@synthesize delegate = _delegate;
+@synthesize paused = _paused;
+
+- (instancetype)init {
+  if (self = [super init]) {
+    _paused = YES;
+  }
+  return self;
+}
+
+- (void)tickWithTimestamp:(CFTimeInterval)timestamp
+          targetTimestamp:(CFTimeInterval)targetTimestamp {
+  [_delegate onDisplayLink:timestamp targetTimestamp:targetTimestamp];
+}
+
+- (void)invalidate {
+}
+
+@end
+
+TEST(FlutterVSyncWaiterTest, RequestsInitialVSync) {
+  TestDisplayLink* displayLink = [[TestDisplayLink alloc] init];
+  EXPECT_TRUE(displayLink.paused);
+  // When created waiter requests a reference vsync to determine vsync phase.
+  FlutterVSyncWaiter* waiter = [[FlutterVSyncWaiter alloc]
+      initWithDisplayLink:displayLink
+                    block:^(CFTimeInterval timestamp, CFTimeInterval targetTimestamp,
+                            uintptr_t baton){
+                    }];
+  (void)waiter;
+  EXPECT_FALSE(displayLink.paused);
+  [displayLink tickWithTimestamp:CACurrentMediaTime()
+                 targetTimestamp:CACurrentMediaTime() + 1.0 / 60.0];
+  EXPECT_TRUE(displayLink.paused);
+}
+
+static void BusyWait(CFTimeInterval duration) {
+  CFTimeInterval start = CACurrentMediaTime();
+  while (CACurrentMediaTime() < start + duration) {
+  }
+}
+
+// See FlutterVSyncWaiter.mm for the original definition.
+static const CFTimeInterval kTimerLatencyCompensation = 0.001;
+
+TEST(FlutterVSyncWaiterTest, FirstVSyncIsSynthesized) {
+  TestDisplayLink* displayLink = [[TestDisplayLink alloc] init];
+  displayLink.nominalOutputRefreshPeriod = 1.0 / 60.0;
+
+  auto test = [&](CFTimeInterval waitDuration, CFTimeInterval expectedDelay) {
+    __block CFTimeInterval timestamp = 0;
+    __block CFTimeInterval targetTimestamp = 0;
+    __block size_t baton = 0;
+    const uintptr_t kWarmUpBaton = 0xFFFFFFFF;
+    FlutterVSyncWaiter* waiter = [[FlutterVSyncWaiter alloc]
+        initWithDisplayLink:displayLink
+                      block:^(CFTimeInterval _timestamp, CFTimeInterval _targetTimestamp,
+                              uintptr_t _baton) {
+                        if (_baton == kWarmUpBaton) {
+                          return;
+                        }
+                        timestamp = _timestamp;
+                        targetTimestamp = _targetTimestamp;
+                        baton = _baton;
+                        EXPECT_TRUE(CACurrentMediaTime() >= _timestamp - kTimerLatencyCompensation);
+                        CFRunLoopStop(CFRunLoopGetCurrent());
+                      }];
+
+    [waiter waitForVSync:kWarmUpBaton];
+
+    // Reference vsync to setup phase.
+    CFTimeInterval now = CACurrentMediaTime();
+    // CVDisplayLink callback is called one and a half frame before the target.
+    [displayLink tickWithTimestamp:now + 0.5 * displayLink.nominalOutputRefreshPeriod
+                   targetTimestamp:now + 2 * displayLink.nominalOutputRefreshPeriod];
+    EXPECT_EQ(displayLink.paused, YES);
+    // Vsync was not requested yet, block should not have been called.
+    EXPECT_EQ(timestamp, 0);
+
+    BusyWait(waitDuration);
+
+    // Synthesized vsync should come in 1/60th of a second after the first.
+    CFTimeInterval expectedTimestamp = now + expectedDelay;
+    [waiter waitForVSync:1];
+
+    CFRunLoopRun();
+
+    EXPECT_DOUBLE_EQ(timestamp, expectedTimestamp);
+    EXPECT_DOUBLE_EQ(targetTimestamp, expectedTimestamp + displayLink.nominalOutputRefreshPeriod);
+    EXPECT_EQ(baton, size_t(1));
+  };
+
+  // First argument if the wait duration after reference vsync.
+  // Second argument is the expected delay between reference vsync and synthesized vsync.
+  test(0.005, displayLink.nominalOutputRefreshPeriod);
+  test(0.025, 2 * displayLink.nominalOutputRefreshPeriod);
+  test(0.040, 3 * displayLink.nominalOutputRefreshPeriod);
+}
+
+TEST(FlutterVSyncWaiterTest, VSyncWorks) {
+  TestDisplayLink* displayLink = [[TestDisplayLink alloc] init];
+  displayLink.nominalOutputRefreshPeriod = 1.0 / 60.0;
+  const uintptr_t kWarmUpBaton = 0xFFFFFFFF;
+
+  struct Entry {
+    CFTimeInterval timestamp;
+    CFTimeInterval targetTimestamp;
+    size_t baton;
+  };
+  __block std::vector<Entry> entries;
+
+  FlutterVSyncWaiter* waiter = [[FlutterVSyncWaiter alloc]
+      initWithDisplayLink:displayLink
+                    block:^(CFTimeInterval timestamp, CFTimeInterval targetTimestamp,
+                            uintptr_t baton) {
+                      entries.push_back({timestamp, targetTimestamp, baton});
+                      if (baton == kWarmUpBaton) {
+                        return;
+                      }
+                      EXPECT_TRUE(CACurrentMediaTime() >= timestamp - kTimerLatencyCompensation);
+                      CFRunLoopStop(CFRunLoopGetCurrent());
+                    }];
+
+  __block CFTimeInterval expectedStartUntil;
+  // Warm up tick is scheduled immediately in a scheduled block. Schedule another
+  // block here to determine the maximum time when the warm up tick should be
+  // scheduled.
+  [waiter waitForVSync:kWarmUpBaton];
+  [[NSRunLoop currentRunLoop] performBlock:^{
+    expectedStartUntil = CACurrentMediaTime();
+  }];
+
+  // Reference vsync to setup phase.
+  CFTimeInterval now = CACurrentMediaTime();
+  // CVDisplayLink callback is called one and a half frame before the target.
+  [displayLink tickWithTimestamp:now + 0.5 * displayLink.nominalOutputRefreshPeriod
+                 targetTimestamp:now + 2 * displayLink.nominalOutputRefreshPeriod];
+  EXPECT_EQ(displayLink.paused, YES);
+
+  [waiter waitForVSync:1];
+  CFRunLoopRun();
+
+  [waiter waitForVSync:2];
+  [displayLink tickWithTimestamp:now + 1.5 * displayLink.nominalOutputRefreshPeriod
+                 targetTimestamp:now + 3 * displayLink.nominalOutputRefreshPeriod];
+  CFRunLoopRun();
+
+  [waiter waitForVSync:3];
+  [displayLink tickWithTimestamp:now + 2.5 * displayLink.nominalOutputRefreshPeriod
+                 targetTimestamp:now + 4 * displayLink.nominalOutputRefreshPeriod];
+  CFRunLoopRun();
+
+  EXPECT_FALSE(displayLink.paused);
+  // Vsync without baton should pause the display link.
+  [displayLink tickWithTimestamp:now + 3.5 * displayLink.nominalOutputRefreshPeriod
+                 targetTimestamp:now + 5 * displayLink.nominalOutputRefreshPeriod];
+
+  CFTimeInterval start = CACurrentMediaTime();
+  while (!displayLink.paused) {
+    // Make sure to run the timer scheduled in display link callback.
+    CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.02, NO);
+    if (CACurrentMediaTime() - start > 1.0) {
+      break;
+    }
+  }
+  ASSERT_TRUE(displayLink.paused);
+
+  EXPECT_EQ(entries.size(), size_t(4));
+
+  // Warm up frame should be presented as soon as possible.
+  EXPECT_TRUE(entries[0].timestamp <= expectedStartUntil);
+  EXPECT_TRUE(entries[0].targetTimestamp <= expectedStartUntil);
+  EXPECT_EQ(entries[0].baton, kWarmUpBaton);
+
+  EXPECT_DOUBLE_EQ(entries[1].timestamp, now + displayLink.nominalOutputRefreshPeriod);
+  EXPECT_DOUBLE_EQ(entries[1].targetTimestamp, now + 2 * displayLink.nominalOutputRefreshPeriod);
+  EXPECT_EQ(entries[1].baton, size_t(1));
+  EXPECT_DOUBLE_EQ(entries[2].timestamp, now + 2 * displayLink.nominalOutputRefreshPeriod);
+  EXPECT_DOUBLE_EQ(entries[2].targetTimestamp, now + 3 * displayLink.nominalOutputRefreshPeriod);
+  EXPECT_EQ(entries[2].baton, size_t(2));
+  EXPECT_DOUBLE_EQ(entries[3].timestamp, now + 3 * displayLink.nominalOutputRefreshPeriod);
+  EXPECT_DOUBLE_EQ(entries[3].targetTimestamp, now + 4 * displayLink.nominalOutputRefreshPeriod);
+  EXPECT_EQ(entries[3].baton, size_t(3));
+}
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterView.h b/shell/platform/darwin/macos/framework/Source/FlutterView.h
index 2da2f48f34963b4ea3bfdfd7158097a26fce1eaf..add613193079558698e76b42b17814a94082317a 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterView.h
+++ b/shell/platform/darwin/macos/framework/Source/FlutterView.h
@@ -2,10 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERVIEW_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERVIEW_H_
+
 #import <Cocoa/Cocoa.h>
+
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterSurfaceManager.h"
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterThreadSynchronizer.h"
+
 #include <stdint.h>
 
-#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterResizableBackingStoreProvider.h"
+typedef int64_t FlutterViewId;
 
 /**
  * The view ID for APIs that don't support multi-view.
@@ -13,19 +20,25 @@
  * Some single-view APIs will eventually be replaced by their multi-view
  * variant. During the deprecation period, the single-view APIs will coexist with
  * and work with the multi-view APIs as if the other views don't exist.  For
- * backward compatibility, single-view APIs will always operate the view with
+ * backward compatibility, single-view APIs will always operate on the view with
  * this ID. Also, the first view assigned to the engine will also have this ID.
  */
-constexpr uint64_t kFlutterDefaultViewId = 0;
+constexpr FlutterViewId kFlutterImplicitViewId = 0ll;
 
 /**
- * Listener for view resizing.
+ * Delegate for FlutterView.
  */
-@protocol FlutterViewReshapeListener <NSObject>
+@protocol FlutterViewDelegate <NSObject>
 /**
  * Called when the view's backing store changes size.
  */
 - (void)viewDidReshape:(nonnull NSView*)view;
+
+/**
+ * Called to determine whether the view should accept first responder status.
+ */
+- (BOOL)viewShouldAcceptFirstResponder:(nonnull NSView*)view;
+
 @end
 
 /**
@@ -39,8 +52,9 @@ constexpr uint64_t kFlutterDefaultViewId = 0;
  */
 - (nullable instancetype)initWithMTLDevice:(nonnull id<MTLDevice>)device
                               commandQueue:(nonnull id<MTLCommandQueue>)commandQueue
-                           reshapeListener:(nonnull id<FlutterViewReshapeListener>)reshapeListener
-    NS_DESIGNATED_INITIALIZER;
+                                  delegate:(nonnull id<FlutterViewDelegate>)delegate
+                        threadSynchronizer:(nonnull FlutterThreadSynchronizer*)threadSynchronizer
+                                    viewId:(int64_t)viewId NS_DESIGNATED_INITIALIZER;
 
 - (nullable instancetype)initWithFrame:(NSRect)frameRect
                            pixelFormat:(nullable NSOpenGLPixelFormat*)format NS_UNAVAILABLE;
@@ -49,27 +63,10 @@ constexpr uint64_t kFlutterDefaultViewId = 0;
 - (nonnull instancetype)init NS_UNAVAILABLE;
 
 /**
- * Flushes the graphics context and flips the surfaces. Expected to be called on raster thread.
+ * Returns SurfaceManager for this view. SurfaceManager is responsible for
+ * providing and presenting render surfaces.
  */
-- (void)present;
-
-/**
- * Called when there is no Flutter content available to render. This must be passed to resize
- * synchronizer.
- */
-- (void)presentWithoutContent;
-
-/**
- * Ensures that a backing store with requested size exists and returns the descriptor. Expected to
- * be called on raster thread.
- */
-- (nonnull FlutterRenderBackingStore*)backingStoreForSize:(CGSize)size;
-
-/**
- * Must be called when shutting down. Unblocks raster thread and prevents any further
- * synchronization.
- */
-- (void)shutdown;
+@property(readonly, nonatomic, nonnull) FlutterSurfaceManager* surfaceManager;
 
 /**
  * By default, the `FlutterSurfaceManager` creates two layers to manage Flutter
@@ -81,3 +78,5 @@ constexpr uint64_t kFlutterDefaultViewId = 0;
 - (void)setBackgroundColor:(nonnull NSColor*)color;
 
 @end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERVIEW_H_
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterView.mm b/shell/platform/darwin/macos/framework/Source/FlutterView.mm
index 8a92b9f5fbb59f613889ce84b7606fc3d1b8f1af..79607d0f759e80a463a6fc0be1f5960b699d5332 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterView.mm
+++ b/shell/platform/darwin/macos/framework/Source/FlutterView.mm
@@ -4,15 +4,16 @@
 
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterView.h"
 
-#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterResizeSynchronizer.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterSurfaceManager.h"
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterThreadSynchronizer.h"
 
 #import <QuartzCore/QuartzCore.h>
 
-@interface FlutterView () {
-  __weak id<FlutterViewReshapeListener> _reshapeListener;
-  FlutterResizeSynchronizer* _resizeSynchronizer;
-  FlutterResizableBackingStoreProvider* _resizableBackingStoreProvider;
+@interface FlutterView () <FlutterSurfaceManagerDelegate> {
+  int64_t _viewId;
+  __weak id<FlutterViewDelegate> _viewDelegate;
+  FlutterThreadSynchronizer* _threadSynchronizer;
+  FlutterSurfaceManager* _surfaceManager;
 }
 
 @end
@@ -21,44 +22,40 @@
 
 - (instancetype)initWithMTLDevice:(id<MTLDevice>)device
                      commandQueue:(id<MTLCommandQueue>)commandQueue
-                  reshapeListener:(id<FlutterViewReshapeListener>)reshapeListener {
+                         delegate:(id<FlutterViewDelegate>)delegate
+               threadSynchronizer:(FlutterThreadSynchronizer*)threadSynchronizer
+                           viewId:(int64_t)viewId {
   self = [super initWithFrame:NSZeroRect];
   if (self) {
     [self setWantsLayer:YES];
     [self setBackgroundColor:[NSColor blackColor]];
     [self setLayerContentsRedrawPolicy:NSViewLayerContentsRedrawDuringViewResize];
-    _reshapeListener = reshapeListener;
-    _resizableBackingStoreProvider =
-        [[FlutterResizableBackingStoreProvider alloc] initWithDevice:device
-                                                        commandQueue:commandQueue
-                                                               layer:self.layer];
-    _resizeSynchronizer =
-        [[FlutterResizeSynchronizer alloc] initWithDelegate:_resizableBackingStoreProvider];
+    _viewId = viewId;
+    _viewDelegate = delegate;
+    _threadSynchronizer = threadSynchronizer;
+    _surfaceManager = [[FlutterSurfaceManager alloc] initWithDevice:device
+                                                       commandQueue:commandQueue
+                                                              layer:self.layer
+                                                           delegate:self];
   }
   return self;
 }
 
-- (FlutterRenderBackingStore*)backingStoreForSize:(CGSize)size {
-  if ([_resizeSynchronizer shouldEnsureSurfaceForSize:size]) {
-    [_resizableBackingStoreProvider onBackingStoreResized:size];
-  }
-  return [_resizableBackingStoreProvider backingStore];
-}
-
-- (void)present {
-  [_resizeSynchronizer requestCommit];
+- (void)onPresent:(CGSize)frameSize withBlock:(dispatch_block_t)block {
+  [_threadSynchronizer performCommitForView:_viewId size:frameSize notify:block];
 }
 
-- (void)presentWithoutContent {
-  [_resizeSynchronizer noFlutterContent];
+- (FlutterSurfaceManager*)surfaceManager {
+  return _surfaceManager;
 }
 
 - (void)reshaped {
   CGSize scaledSize = [self convertSizeToBacking:self.bounds.size];
-  [_resizeSynchronizer beginResize:scaledSize
-                            notify:^{
-                              [_reshapeListener viewDidReshape:self];
-                            }];
+  [_threadSynchronizer beginResizeForView:_viewId
+                                     size:scaledSize
+                                   notify:^{
+                                     [_viewDelegate viewDidReshape:self];
+                                   }];
 }
 
 - (void)setBackgroundColor:(NSColor*)color {
@@ -92,7 +89,9 @@
 }
 
 - (BOOL)acceptsFirstResponder {
-  return YES;
+  // This is to ensure that FlutterView does not take first responder status from TextInputPlugin
+  // on mouse clicks.
+  return [_viewDelegate viewShouldAcceptFirstResponder:self];
 }
 
 - (void)cursorUpdate:(NSEvent*)event {
@@ -107,12 +106,15 @@
 - (void)viewDidChangeBackingProperties {
   [super viewDidChangeBackingProperties];
   // Force redraw
-  [_reshapeListener viewDidReshape:self];
+  [_viewDelegate viewDidReshape:self];
 }
 
-- (void)shutdown {
-  [_resizeSynchronizer shutdown];
+- (BOOL)layer:(CALayer*)layer
+    shouldInheritContentsScale:(CGFloat)newScale
+                    fromWindow:(NSWindow*)window {
+  return YES;
 }
+
 #pragma mark - NSAccessibility overrides
 
 - (BOOL)isAccessibilityElement {
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterViewController.mm b/shell/platform/darwin/macos/framework/Source/FlutterViewController.mm
index 995b75e9011b8e194aff68652e05b121e0529de7..291340b3764ac7d8aa9aad1b9b5b1d693cca4abf 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterViewController.mm
+++ b/shell/platform/darwin/macos/framework/Source/FlutterViewController.mm
@@ -6,10 +6,10 @@
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterViewController_Internal.h"
 
 #include <Carbon/Carbon.h>
+#import <objc/message.h>
 
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h"
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterCodecs.h"
-#import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterAppDelegate.h"
 #import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterEngine.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterKeyPrimaryResponder.h"
@@ -19,6 +19,8 @@
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterView.h"
 #import "flutter/shell/platform/embedder/embedder.h"
 
+#pragma mark - Static types and data.
+
 namespace {
 using flutter::KeyboardLayoutNotifier;
 using flutter::LayoutClue;
@@ -80,20 +82,25 @@ struct MouseState {
    */
   bool has_pending_exit = false;
 
+  /*
+   * Whether or not a kPanZoomStart has been sent since the last kAdd/kPanZoomEnd.
+   */
+  bool flutter_state_is_pan_zoom_started = false;
+
   /**
-   * Pan gesture is currently sending us events.
+   * State of pan gesture.
    */
-  bool pan_gesture_active = false;
+  NSEventPhase pan_gesture_phase = NSEventPhaseNone;
 
   /**
-   * Scale gesture is currently sending us events.
+   * State of scale gesture.
    */
-  bool scale_gesture_active = false;
+  NSEventPhase scale_gesture_phase = NSEventPhaseNone;
 
   /**
-   * Rotate gesture is currently sending use events.
+   * State of rotate gesture.
    */
-  bool rotate_gesture_active = false;
+  NSEventPhase rotate_gesture_phase = NSEventPhaseNone;
 
   /**
    * Time of last scroll momentum event.
@@ -108,6 +115,10 @@ struct MouseState {
     delta_y = 0;
     scale = 0;
     rotation = 0;
+    flutter_state_is_pan_zoom_started = false;
+    pan_gesture_phase = NSEventPhaseNone;
+    scale_gesture_phase = NSEventPhaseNone;
+    rotate_gesture_phase = NSEventPhaseNone;
   }
 
   /**
@@ -122,27 +133,6 @@ struct MouseState {
   }
 };
 
-/**
- * Returns the current Unicode layout data (kTISPropertyUnicodeKeyLayoutData).
- *
- * To use the returned data, convert it to CFDataRef first, finds its bytes
- * with CFDataGetBytePtr, then reinterpret it into const UCKeyboardLayout*.
- * It's returned in NSData* to enable auto reference count.
- */
-NSData* currentKeyboardLayoutData() {
-  TISInputSourceRef source = TISCopyCurrentKeyboardInputSource();
-  CFTypeRef layout_data = TISGetInputSourceProperty(source, kTISPropertyUnicodeKeyLayoutData);
-  if (layout_data == nil) {
-    CFRelease(source);
-    // TISGetInputSourceProperty returns null with Japanese keyboard layout.
-    // Using TISCopyCurrentKeyboardLayoutInputSource to fix NULL return.
-    // https://github.com/microsoft/node-native-keymap/blob/5f0699ded00179410a14c0e1b0e089fe4df8e130/src/keyboard_mac.mm#L91
-    source = TISCopyCurrentKeyboardLayoutInputSource();
-    layout_data = TISGetInputSourceProperty(source, kTISPropertyUnicodeKeyLayoutData);
-  }
-  return (__bridge_transfer NSData*)CFRetain(layout_data);
-}
-
 }  // namespace
 
 #pragma mark - Private interface declaration.
@@ -169,7 +159,7 @@ NSData* currentKeyboardLayoutData() {
 /**
  * Private interface declaration for FlutterViewController.
  */
-@interface FlutterViewController () <FlutterViewReshapeListener>
+@interface FlutterViewController () <FlutterViewDelegate>
 
 /**
  * The tracking area used to generate hover events, if enabled.
@@ -240,31 +230,33 @@ NSData* currentKeyboardLayoutData() {
 
 @end
 
-#pragma mark - Private dependant functions
+#pragma mark - FlutterViewWrapper implementation.
 
-namespace {
-void OnKeyboardLayoutChanged(CFNotificationCenterRef center,
-                             void* observer,
-                             CFStringRef name,
-                             const void* object,
-                             CFDictionaryRef userInfo) {
+/**
+ * NotificationCenter callback invoked on kTISNotifySelectedKeyboardInputSourceChanged events.
+ */
+static void OnKeyboardLayoutChanged(CFNotificationCenterRef center,
+                                    void* observer,
+                                    CFStringRef name,
+                                    const void* object,
+                                    CFDictionaryRef userInfo) {
   FlutterViewController* controller = (__bridge FlutterViewController*)observer;
   if (controller != nil) {
     [controller onKeyboardLayoutChanged];
   }
 }
-}  // namespace
-
-#pragma mark - FlutterViewWrapper implementation.
 
 @implementation FlutterViewWrapper {
   FlutterView* _flutterView;
+  __weak FlutterViewController* _controller;
 }
 
-- (instancetype)initWithFlutterView:(FlutterView*)view {
+- (instancetype)initWithFlutterView:(FlutterView*)view
+                         controller:(FlutterViewController*)controller {
   self = [super initWithFrame:NSZeroRect];
   if (self) {
     _flutterView = view;
+    _controller = controller;
     view.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
     [self addSubview:view];
   }
@@ -275,10 +267,52 @@ void OnKeyboardLayoutChanged(CFNotificationCenterRef center,
   [_flutterView setBackgroundColor:color];
 }
 
+- (BOOL)performKeyEquivalent:(NSEvent*)event {
+  // Do not intercept the event if flutterView is not first responder, otherwise this would
+  // interfere with TextInputPlugin, which also handles key equivalents.
+  //
+  // Also do not intercept the event if key equivalent is a product of an event being
+  // redispatched by the TextInputPlugin, in which case it needs to bubble up so that menus
+  // can handle key equivalents.
+  if (self.window.firstResponder != _flutterView || [_controller isDispatchingKeyEvent:event]) {
+    return [super performKeyEquivalent:event];
+  }
+  [_flutterView keyDown:event];
+  return YES;
+}
+
 - (NSArray*)accessibilityChildren {
   return @[ _flutterView ];
 }
 
+- (void)mouseDown:(NSEvent*)event {
+  // Work around an AppKit bug where mouseDown/mouseUp are not called on the view controller if the
+  // view is the content view of an NSPopover AND macOS's Reduced Transparency accessibility setting
+  // is enabled.
+  //
+  // This simply calls mouseDown on the next responder in the responder chain as the default
+  // implementation on NSResponder is documented to do.
+  //
+  // See: https://github.com/flutter/flutter/issues/115015
+  // See: http://www.openradar.me/FB12050037
+  // See: https://developer.apple.com/documentation/appkit/nsresponder/1524634-mousedown
+  [self.nextResponder mouseDown:event];
+}
+
+- (void)mouseUp:(NSEvent*)event {
+  // Work around an AppKit bug where mouseDown/mouseUp are not called on the view controller if the
+  // view is the content view of an NSPopover AND macOS's Reduced Transparency accessibility setting
+  // is enabled.
+  //
+  // This simply calls mouseUp on the next responder in the responder chain as the default
+  // implementation on NSResponder is documented to do.
+  //
+  // See: https://github.com/flutter/flutter/issues/115015
+  // See: http://www.openradar.me/FB12050037
+  // See: https://developer.apple.com/documentation/appkit/nsresponder/1535349-mouseup
+  [self.nextResponder mouseUp:event];
+}
+
 @end
 
 #pragma mark - FlutterViewController implementation.
@@ -286,21 +320,42 @@ void OnKeyboardLayoutChanged(CFNotificationCenterRef center,
 @implementation FlutterViewController {
   // The project to run in this controller's engine.
   FlutterDartProject* _project;
+
+  std::shared_ptr<flutter::AccessibilityBridgeMac> _bridge;
+
+  FlutterViewId _id;
+
+  // FlutterViewController does not actually uses the synchronizer, but only
+  // passes it to FlutterView.
+  FlutterThreadSynchronizer* _threadSynchronizer;
 }
 
-@dynamic view;
+@synthesize viewId = _viewId;
+@dynamic accessibilityBridge;
 
 /**
  * Performs initialization that's common between the different init paths.
  */
-static void CommonInit(FlutterViewController* controller) {
-  if (!controller->_engine) {
-    controller->_engine = [[FlutterEngine alloc] initWithName:@"io.flutter"
-                                                      project:controller->_project
-                                       allowHeadlessExecution:NO];
+static void CommonInit(FlutterViewController* controller, FlutterEngine* engine) {
+  if (!engine) {
+    engine = [[FlutterEngine alloc] initWithName:@"io.flutter"
+                                         project:controller->_project
+                          allowHeadlessExecution:NO];
   }
-  controller->_mouseTrackingMode = FlutterMouseTrackingModeInKeyWindow;
+  NSCAssert(controller.engine == nil,
+            @"The FlutterViewController is unexpectedly attached to "
+            @"engine %@ before initialization.",
+            controller.engine);
+  [engine addViewController:controller];
+  NSCAssert(controller.engine != nil,
+            @"The FlutterViewController unexpectedly stays unattached after initialization. "
+            @"In unit tests, this is likely because either the FlutterViewController or "
+            @"the FlutterEngine is mocked. Please subclass these classes instead.",
+            controller.engine, controller.viewId);
+  controller->_mouseTrackingMode = kFlutterMouseTrackingModeInKeyWindow;
   controller->_textInputPlugin = [[FlutterTextInputPlugin alloc] initWithViewController:controller];
+  [controller initializeKeyboard];
+  [controller notifySemanticsEnabledChanged];
   // macOS fires this message when changing IMEs.
   CFNotificationCenterRef cfCenter = CFNotificationCenterGetDistributedCenter();
   __weak FlutterViewController* weakSelf = controller;
@@ -313,7 +368,7 @@ static void CommonInit(FlutterViewController* controller) {
   self = [super initWithCoder:coder];
   NSAssert(self, @"Super init cannot be nil");
 
-  CommonInit(self);
+  CommonInit(self, nil);
   return self;
 }
 
@@ -321,7 +376,7 @@ static void CommonInit(FlutterViewController* controller) {
   self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
   NSAssert(self, @"Super init cannot be nil");
 
-  CommonInit(self);
+  CommonInit(self, nil);
   return self;
 }
 
@@ -330,7 +385,7 @@ static void CommonInit(FlutterViewController* controller) {
   NSAssert(self, @"Super init cannot be nil");
 
   _project = project;
-  CommonInit(self);
+  CommonInit(self, nil);
   return self;
 }
 
@@ -338,21 +393,10 @@ static void CommonInit(FlutterViewController* controller) {
                        nibName:(nullable NSString*)nibName
                         bundle:(nullable NSBundle*)nibBundle {
   NSAssert(engine != nil, @"Engine is required");
-  NSAssert(engine.viewController == nil,
-           @"The supplied FlutterEngine is already used with FlutterViewController "
-            "instance. One instance of the FlutterEngine can only be attached to one "
-            "FlutterViewController at a time. Set FlutterEngine.viewController "
-            "to nil before attaching it to another FlutterViewController.");
 
   self = [super initWithNibName:nibName bundle:nibBundle];
   if (self) {
-    _engine = engine;
-    CommonInit(self);
-    if (engine.running) {
-      [self loadView];
-      engine.viewController = self;
-      [self initializeKeyboard];
-    }
+    CommonInit(self, engine);
   }
 
   return self;
@@ -370,13 +414,12 @@ static void CommonInit(FlutterViewController* controller) {
     NSLog(@"Unable to create FlutterView; no MTLDevice or MTLCommandQueue available.");
     return;
   }
-  flutterView = [[FlutterView alloc] initWithMTLDevice:device
-                                          commandQueue:commandQueue
-                                       reshapeListener:self];
+  flutterView = [self createFlutterViewWithMTLDevice:device commandQueue:commandQueue];
   if (_backgroundColor != nil) {
     [flutterView setBackgroundColor:_backgroundColor];
   }
-  FlutterViewWrapper* wrapperView = [[FlutterViewWrapper alloc] initWithFlutterView:flutterView];
+  FlutterViewWrapper* wrapperView = [[FlutterViewWrapper alloc] initWithFlutterView:flutterView
+                                                                         controller:self];
   self.view = wrapperView;
   _flutterView = flutterView;
 }
@@ -385,6 +428,7 @@ static void CommonInit(FlutterViewController* controller) {
   [self configureTrackingArea];
   [self.view setAllowedTouchTypes:NSTouchTypeMaskIndirect];
   [self.view setWantsRestingTouches:YES];
+  [_engine viewControllerViewDidLoad:self];
 }
 
 - (void)viewWillAppear {
@@ -403,7 +447,9 @@ static void CommonInit(FlutterViewController* controller) {
 }
 
 - (void)dealloc {
-  _engine.viewController = nil;
+  if ([self attached]) {
+    [_engine removeViewController:self];
+  }
   CFNotificationCenterRef cfCenter = CFNotificationCenterGetDistributedCenter();
   CFNotificationCenterRemoveEveryObserver(cfCenter, (__bridge void*)self);
 }
@@ -423,16 +469,92 @@ static void CommonInit(FlutterViewController* controller) {
   [_flutterView setBackgroundColor:_backgroundColor];
 }
 
+- (FlutterViewId)viewId {
+  NSAssert([self attached], @"This view controller is not attached.");
+  return _viewId;
+}
+
 - (void)onPreEngineRestart {
   [self initializeKeyboard];
 }
 
+- (void)notifySemanticsEnabledChanged {
+  BOOL mySemanticsEnabled = !!_bridge;
+  BOOL newSemanticsEnabled = _engine.semanticsEnabled;
+  if (newSemanticsEnabled == mySemanticsEnabled) {
+    return;
+  }
+  if (newSemanticsEnabled) {
+    _bridge = [self createAccessibilityBridgeWithEngine:_engine];
+  } else {
+    // Remove the accessibility children from flutter view before resetting the bridge.
+    _flutterView.accessibilityChildren = nil;
+    _bridge.reset();
+  }
+  NSAssert(newSemanticsEnabled == !!_bridge, @"Failed to update semantics for the view.");
+}
+
+- (std::weak_ptr<flutter::AccessibilityBridgeMac>)accessibilityBridge {
+  return _bridge;
+}
+
+- (void)setUpWithEngine:(FlutterEngine*)engine
+                 viewId:(FlutterViewId)viewId
+     threadSynchronizer:(FlutterThreadSynchronizer*)threadSynchronizer {
+  NSAssert(_engine == nil, @"Already attached to an engine %@.", _engine);
+  _engine = engine;
+  _viewId = viewId;
+  _threadSynchronizer = threadSynchronizer;
+  [_threadSynchronizer registerView:_viewId];
+}
+
+- (void)detachFromEngine {
+  NSAssert(_engine != nil, @"Not attached to any engine.");
+  [_threadSynchronizer deregisterView:_viewId];
+  _threadSynchronizer = nil;
+  _engine = nil;
+}
+
+- (BOOL)attached {
+  return _engine != nil;
+}
+
+- (void)updateSemantics:(const FlutterSemanticsUpdate2*)update {
+  NSAssert(_engine.semanticsEnabled, @"Semantics must be enabled.");
+  if (!_engine.semanticsEnabled) {
+    return;
+  }
+  for (size_t i = 0; i < update->node_count; i++) {
+    const FlutterSemanticsNode2* node = update->nodes[i];
+    _bridge->AddFlutterSemanticsNodeUpdate(*node);
+  }
+
+  for (size_t i = 0; i < update->custom_action_count; i++) {
+    const FlutterSemanticsCustomAction2* action = update->custom_actions[i];
+    _bridge->AddFlutterSemanticsCustomActionUpdate(*action);
+  }
+
+  _bridge->CommitUpdates();
+
+  // Accessibility tree can only be used when the view is loaded.
+  if (!self.viewLoaded) {
+    return;
+  }
+  // Attaches the accessibility root to the flutter view.
+  auto root = _bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
+  if (root) {
+    if ([self.flutterView.accessibilityChildren count] == 0) {
+      NSAccessibilityElement* native_root = root->GetNativeViewAccessible();
+      self.flutterView.accessibilityChildren = @[ native_root ];
+    }
+  } else {
+    self.flutterView.accessibilityChildren = nil;
+  }
+}
+
 #pragma mark - Private methods
 
 - (BOOL)launchEngine {
-  [self initializeKeyboard];
-
-  _engine.viewController = self;
   if (![_engine runWithEntrypoint:nil]) {
     return NO;
   }
@@ -473,17 +595,17 @@ static void CommonInit(FlutterViewController* controller) {
     // the view is actually loaded.
     return;
   }
-  if (_mouseTrackingMode != FlutterMouseTrackingModeNone && self.flutterView) {
+  if (_mouseTrackingMode != kFlutterMouseTrackingModeNone && self.flutterView) {
     NSTrackingAreaOptions options = NSTrackingMouseEnteredAndExited | NSTrackingMouseMoved |
                                     NSTrackingInVisibleRect | NSTrackingEnabledDuringMouseDrag;
     switch (_mouseTrackingMode) {
-      case FlutterMouseTrackingModeInKeyWindow:
+      case kFlutterMouseTrackingModeInKeyWindow:
         options |= NSTrackingActiveInKeyWindow;
         break;
-      case FlutterMouseTrackingModeInActiveApp:
+      case kFlutterMouseTrackingModeInActiveApp:
         options |= NSTrackingActiveInActiveApp;
         break;
-      case FlutterMouseTrackingModeAlways:
+      case kFlutterMouseTrackingModeAlways:
         options |= NSTrackingActiveAlways;
         break;
       default:
@@ -504,8 +626,7 @@ static void CommonInit(FlutterViewController* controller) {
 - (void)initializeKeyboard {
   // TODO(goderbauer): Seperate keyboard/textinput stuff into ViewController specific and Engine
   // global parts. Move the global parts to FlutterEngine.
-  __weak FlutterViewController* weakSelf = self;
-  _keyboardManager = [[FlutterKeyboardManager alloc] initWithViewDelegate:weakSelf];
+  _keyboardManager = [[FlutterKeyboardManager alloc] initWithViewDelegate:self];
 }
 
 - (void)dispatchMouseEvent:(nonnull NSEvent*)event {
@@ -548,32 +669,42 @@ static void CommonInit(FlutterViewController* controller) {
 
   // Multiple gesture recognizers could be active at once, we can't send multiple kPanZoomStart.
   // For example: rotation and magnification.
+  if (phase == kPanZoomStart || phase == kPanZoomEnd) {
+    if (event.type == NSEventTypeScrollWheel) {
+      _mouseState.pan_gesture_phase = event.phase;
+    } else if (event.type == NSEventTypeMagnify) {
+      _mouseState.scale_gesture_phase = event.phase;
+    } else if (event.type == NSEventTypeRotate) {
+      _mouseState.rotate_gesture_phase = event.phase;
+    }
+  }
   if (phase == kPanZoomStart) {
-    bool gestureAlreadyDown = _mouseState.pan_gesture_active || _mouseState.scale_gesture_active ||
-                              _mouseState.rotate_gesture_active;
     if (event.type == NSEventTypeScrollWheel) {
-      _mouseState.pan_gesture_active = true;
       // Ensure scroll inertia cancel event is not sent afterwards.
       _mouseState.last_scroll_momentum_changed_time = 0;
-    } else if (event.type == NSEventTypeMagnify) {
-      _mouseState.scale_gesture_active = true;
-    } else if (event.type == NSEventTypeRotate) {
-      _mouseState.rotate_gesture_active = true;
     }
-    if (gestureAlreadyDown) {
+    if (_mouseState.flutter_state_is_pan_zoom_started) {
+      // Already started on a previous gesture type
       return;
     }
+    _mouseState.flutter_state_is_pan_zoom_started = true;
   }
   if (phase == kPanZoomEnd) {
-    if (event.type == NSEventTypeScrollWheel) {
-      _mouseState.pan_gesture_active = false;
-    } else if (event.type == NSEventTypeMagnify) {
-      _mouseState.scale_gesture_active = false;
-    } else if (event.type == NSEventTypeRotate) {
-      _mouseState.rotate_gesture_active = false;
+    if (!_mouseState.flutter_state_is_pan_zoom_started) {
+      // NSEventPhaseCancelled is sometimes received at incorrect times in the state
+      // machine, just ignore it here if it doesn't make sense
+      // (we have no active gesture to cancel).
+      NSAssert(event.phase == NSEventPhaseCancelled,
+               @"Received gesture event with unexpected phase");
+      return;
     }
-    if (_mouseState.pan_gesture_active || _mouseState.scale_gesture_active ||
-        _mouseState.rotate_gesture_active) {
+    // NSEventPhase values are powers of two, we can use this to inspect merged phases.
+    NSEventPhase all_gestures_fields = _mouseState.pan_gesture_phase |
+                                       _mouseState.scale_gesture_phase |
+                                       _mouseState.rotate_gesture_phase;
+    NSEventPhase active_mask = NSEventPhaseBegan | NSEventPhaseChanged;
+    if ((all_gestures_fields & active_mask) != 0) {
+      // Even though this gesture type ended, a different type is still active.
       return;
     }
   }
@@ -612,6 +743,7 @@ static void CommonInit(FlutterViewController* controller) {
       .device_kind = deviceKind,
       // If a click triggered a synthesized kAdd, don't pass the buttons in that event.
       .buttons = phase == kAdd ? 0 : _mouseState.buttons,
+      .view_id = static_cast<FlutterViewId>(_viewId),
   };
 
   if (phase == kPanZoomUpdate) {
@@ -643,9 +775,26 @@ static void CommonInit(FlutterViewController* controller) {
       pixelsPerLine = 40.0;
     }
     double scaleFactor = self.flutterView.layer.contentsScale;
-    flutterEvent.scroll_delta_x = -event.scrollingDeltaX * pixelsPerLine * scaleFactor;
-    flutterEvent.scroll_delta_y = -event.scrollingDeltaY * pixelsPerLine * scaleFactor;
+    // When mouse input is received while shift is pressed (regardless of
+    // any other pressed keys), Mac automatically flips the axis. Other
+    // platforms do not do this, so we flip it back to normalize the input
+    // received by the framework. The keyboard+mouse-scroll mechanism is exposed
+    // in the ScrollBehavior of the framework so developers can customize the
+    // behavior.
+    // At time of change, Apple does not expose any other type of API or signal
+    // that the X/Y axes have been flipped.
+    double scaledDeltaX = -event.scrollingDeltaX * pixelsPerLine * scaleFactor;
+    double scaledDeltaY = -event.scrollingDeltaY * pixelsPerLine * scaleFactor;
+    if (event.modifierFlags & NSShiftKeyMask) {
+      flutterEvent.scroll_delta_x = scaledDeltaY;
+      flutterEvent.scroll_delta_y = scaledDeltaX;
+    } else {
+      flutterEvent.scroll_delta_x = scaledDeltaX;
+      flutterEvent.scroll_delta_y = scaledDeltaY;
+    }
   }
+
+  [_keyboardManager syncModifiersIfNeeded:event.modifierFlags timestamp:event.timestamp];
   [_engine sendPointerEvent:flutterEvent];
 
   // Update tracking of state as reported to Flutter.
@@ -674,6 +823,20 @@ static void CommonInit(FlutterViewController* controller) {
   }
 }
 
+- (std::shared_ptr<flutter::AccessibilityBridgeMac>)createAccessibilityBridgeWithEngine:
+    (nonnull FlutterEngine*)engine {
+  return std::make_shared<flutter::AccessibilityBridgeMac>(engine, self);
+}
+
+- (nonnull FlutterView*)createFlutterViewWithMTLDevice:(id<MTLDevice>)device
+                                          commandQueue:(id<MTLCommandQueue>)commandQueue {
+  return [[FlutterView alloc] initWithMTLDevice:device
+                                   commandQueue:commandQueue
+                                       delegate:self
+                             threadSynchronizer:_threadSynchronizer
+                                         viewId:_viewId];
+}
+
 - (void)onKeyboardLayoutChanged {
   _keyboardLayoutData = nil;
   if (_keyboardLayoutNotifier != nil) {
@@ -681,13 +844,30 @@ static void CommonInit(FlutterViewController* controller) {
   }
 }
 
-#pragma mark - FlutterViewReshapeListener
+- (NSString*)lookupKeyForAsset:(NSString*)asset {
+  return [FlutterDartProject lookupKeyForAsset:asset];
+}
+
+- (NSString*)lookupKeyForAsset:(NSString*)asset fromPackage:(NSString*)package {
+  return [FlutterDartProject lookupKeyForAsset:asset fromPackage:package];
+}
+
+#pragma mark - FlutterViewDelegate
 
 /**
  * Responds to view reshape by notifying the engine of the change in dimensions.
  */
 - (void)viewDidReshape:(NSView*)view {
-  [_engine updateWindowMetrics];
+  FML_DCHECK(view == _flutterView);
+  [_engine updateWindowMetricsForViewController:self];
+}
+
+- (BOOL)viewShouldAcceptFirstResponder:(NSView*)view {
+  FML_DCHECK(view == _flutterView);
+  // Only allow FlutterView to become first responder if TextInputPlugin is
+  // not active. Otherwise a mouse event inside FlutterView would cause the
+  // TextInputPlugin to lose first responder status.
+  return !_textInputPlugin.isFirstResponder;
 }
 
 #pragma mark - FlutterPluginRegistry
@@ -696,8 +876,33 @@ static void CommonInit(FlutterViewController* controller) {
   return [_engine registrarForPlugin:pluginName];
 }
 
+- (NSObject*)valuePublishedByPlugin:(NSString*)pluginKey {
+  return [_engine valuePublishedByPlugin:pluginKey];
+}
+
 #pragma mark - FlutterKeyboardViewDelegate
 
+/**
+ * Returns the current Unicode layout data (kTISPropertyUnicodeKeyLayoutData).
+ *
+ * To use the returned data, convert it to CFDataRef first, finds its bytes
+ * with CFDataGetBytePtr, then reinterpret it into const UCKeyboardLayout*.
+ * It's returned in NSData* to enable auto reference count.
+ */
+static NSData* CurrentKeyboardLayoutData() {
+  TISInputSourceRef source = TISCopyCurrentKeyboardInputSource();
+  CFTypeRef layout_data = TISGetInputSourceProperty(source, kTISPropertyUnicodeKeyLayoutData);
+  if (layout_data == nil) {
+    CFRelease(source);
+    // TISGetInputSourceProperty returns null with Japanese keyboard layout.
+    // Using TISCopyCurrentKeyboardLayoutInputSource to fix NULL return.
+    // https://github.com/microsoft/node-native-keymap/blob/5f0699ded00179410a14c0e1b0e089fe4df8e130/src/keyboard_mac.mm#L91
+    source = TISCopyCurrentKeyboardLayoutInputSource();
+    layout_data = TISGetInputSourceProperty(source, kTISPropertyUnicodeKeyLayoutData);
+  }
+  return (__bridge_transfer NSData*)CFRetain(layout_data);
+}
+
 - (void)sendKeyEvent:(const FlutterKeyEvent&)event
             callback:(nullable FlutterKeyEventCallback)callback
             userData:(nullable void*)userData {
@@ -718,7 +923,7 @@ static void CommonInit(FlutterViewController* controller) {
 
 - (LayoutClue)lookUpLayoutForKeyCode:(uint16_t)keyCode shift:(BOOL)shift {
   if (_keyboardLayoutData == nil) {
-    _keyboardLayoutData = currentKeyboardLayoutData();
+    _keyboardLayoutData = CurrentKeyboardLayoutData();
   }
   const UCKeyboardLayout* layout = reinterpret_cast<const UCKeyboardLayout*>(
       CFDataGetBytePtr((__bridge CFDataRef)_keyboardLayoutData));
@@ -748,6 +953,10 @@ static void CommonInit(FlutterViewController* controller) {
   return LayoutClue{0, false};
 }
 
+- (nonnull NSDictionary*)getPressedState {
+  return [_keyboardManager getPressedState];
+}
+
 #pragma mark - NSResponder
 
 - (BOOL)acceptsFirstResponder {
@@ -862,6 +1071,7 @@ static void CommonInit(FlutterViewController* controller) {
           .device = kPointerPanZoomDeviceId,
           .signal_kind = kFlutterPointerSignalKindScrollInertiaCancel,
           .device_kind = kFlutterPointerDeviceKindTrackpad,
+          .view_id = static_cast<FlutterViewId>(_viewId),
       };
 
       [_engine sendPointerEvent:flutterEvent];
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterViewControllerTest.mm b/shell/platform/darwin/macos/framework/Source/FlutterViewControllerTest.mm
index bc7c18739043b81e2bd7642bebf7630a8e9ecead..aa0a729b8983c4635eeb5e82fae48a603159e2d5 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterViewControllerTest.mm
+++ b/shell/platform/darwin/macos/framework/Source/FlutterViewControllerTest.mm
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#import "KeyCodeMap_Internal.h"
 #import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterViewController.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterViewController_Internal.h"
 
@@ -10,26 +11,113 @@
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h"
 #import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterEngine.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterDartProject_Internal.h"
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterEngineTestUtils.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterRenderer.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterViewControllerTestUtils.h"
-#import "flutter/testing/testing.h"
+#include "flutter/shell/platform/embedder/test_utils/key_codes.g.h"
+#include "flutter/testing/autoreleasepool_test.h"
+#include "flutter/testing/testing.h"
+
+#pragma mark - Test Helper Classes
+
+// A wrap to convert FlutterKeyEvent to a ObjC class.
+@interface KeyEventWrapper : NSObject
+@property(nonatomic) FlutterKeyEvent* data;
+- (nonnull instancetype)initWithEvent:(const FlutterKeyEvent*)event;
+@end
+
+@implementation KeyEventWrapper
+- (instancetype)initWithEvent:(const FlutterKeyEvent*)event {
+  self = [super init];
+  _data = new FlutterKeyEvent(*event);
+  return self;
+}
+
+- (void)dealloc {
+  delete _data;
+}
+@end
+
+/// Responder wrapper that forwards key events to another responder. This is a necessary middle step
+/// for mocking responder because when setting the responder to controller AppKit will access ivars
+/// of the objects, which means it must extend NSResponder instead of just implementing the
+/// selectors.
+@interface FlutterResponderWrapper : NSResponder {
+  NSResponder* _responder;
+}
+@end
+
+@implementation FlutterResponderWrapper
+
+- (instancetype)initWithResponder:(NSResponder*)responder {
+  if (self = [super init]) {
+    _responder = responder;
+  }
+  return self;
+}
+
+- (void)keyDown:(NSEvent*)event {
+  [_responder keyDown:event];
+}
+
+- (void)keyUp:(NSEvent*)event {
+  [_responder keyUp:event];
+}
+
+- (BOOL)performKeyEquivalent:(NSEvent*)event {
+  return [_responder performKeyEquivalent:event];
+}
+
+- (void)flagsChanged:(NSEvent*)event {
+  [_responder flagsChanged:event];
+}
+
+@end
+
+// A FlutterViewController subclass for testing that mouseDown/mouseUp get called when
+// mouse events are sent to the associated view.
+@interface MouseEventFlutterViewController : FlutterViewController
+@property(nonatomic, assign) BOOL mouseDownCalled;
+@property(nonatomic, assign) BOOL mouseUpCalled;
+@end
+
+@implementation MouseEventFlutterViewController
+- (void)mouseDown:(NSEvent*)event {
+  self.mouseDownCalled = YES;
+}
+
+- (void)mouseUp:(NSEvent*)event {
+  self.mouseUpCalled = YES;
+}
+@end
 
 @interface FlutterViewControllerTestObjC : NSObject
-- (bool)testKeyEventsAreSentToFramework;
-- (bool)testKeyEventsArePropagatedIfNotHandled;
-- (bool)testKeyEventsAreNotPropagatedIfHandled;
-- (bool)testFlagsChangedEventsArePropagatedIfNotHandled;
-- (bool)testKeyboardIsRestartedOnEngineRestart;
-- (bool)testTrackpadGesturesAreSentToFramework;
-- (bool)testViewWillAppearCalledMultipleTimes;
-- (bool)testFlutterViewIsConfigured;
+- (bool)testKeyEventsAreSentToFramework:(id)mockEngine;
+- (bool)testKeyEventsArePropagatedIfNotHandled:(id)mockEngine;
+- (bool)testKeyEventsAreNotPropagatedIfHandled:(id)mockEngine;
+- (bool)testCtrlTabKeyEventIsPropagated:(id)mockEngine;
+- (bool)testKeyEquivalentIsPassedToTextInputPlugin:(id)mockEngine;
+- (bool)testFlagsChangedEventsArePropagatedIfNotHandled:(id)mockEngine;
+- (bool)testKeyboardIsRestartedOnEngineRestart:(id)mockEngine;
+- (bool)testTrackpadGesturesAreSentToFramework:(id)mockEngine;
+- (bool)testMouseDownUpEventsSentToNextResponder:(id)mockEngine;
+- (bool)testModifierKeysAreSynthesizedOnMouseMove:(id)mockEngine;
+- (bool)testViewWillAppearCalledMultipleTimes:(id)mockEngine;
+- (bool)testFlutterViewIsConfigured:(id)mockEngine;
+- (bool)testLookupKeyAssets;
+- (bool)testLookupKeyAssetsWithPackage;
+- (bool)testViewControllerIsReleased;
 
 + (void)respondFalseForSendEvent:(const FlutterKeyEvent&)event
                         callback:(nullable FlutterKeyEventCallback)callback
                         userData:(nullable void*)userData;
 @end
 
+#pragma mark - Static helper functions
+
+using namespace ::flutter::testing::keycodes;
+
 namespace flutter::testing {
 
 namespace {
@@ -69,9 +157,28 @@ NSResponder* mockResponder() {
   OCMStub([mock flagsChanged:[OCMArg any]]).andDo(nil);
   return mock;
 }
+
+NSEvent* CreateMouseEvent(NSEventModifierFlags modifierFlags) {
+  return [NSEvent mouseEventWithType:NSEventTypeMouseMoved
+                            location:NSZeroPoint
+                       modifierFlags:modifierFlags
+                           timestamp:0
+                        windowNumber:0
+                             context:nil
+                         eventNumber:0
+                          clickCount:1
+                            pressure:1.0];
+}
+
 }  // namespace
 
-TEST(FlutterViewController, HasViewThatHidesOtherViewsInAccessibility) {
+#pragma mark - gtest tests
+
+// Test-specific names for AutoreleasePoolTest, MockFlutterEngineTest fixtures.
+using FlutterViewControllerTest = AutoreleasePoolTest;
+using FlutterViewControllerMockEngineTest = MockFlutterEngineTest;
+
+TEST_F(FlutterViewControllerTest, HasViewThatHidesOtherViewsInAccessibility) {
   FlutterViewController* viewControllerMock = CreateMockViewController();
 
   [viewControllerMock loadView];
@@ -92,19 +199,17 @@ TEST(FlutterViewController, HasViewThatHidesOtherViewsInAccessibility) {
   EXPECT_EQ(accessibilityChildren[0], viewControllerMock.flutterView);
 }
 
-TEST(FlutterViewController, FlutterViewAcceptsFirstMouse) {
+TEST_F(FlutterViewControllerTest, FlutterViewAcceptsFirstMouse) {
   FlutterViewController* viewControllerMock = CreateMockViewController();
   [viewControllerMock loadView];
   EXPECT_EQ([viewControllerMock.flutterView acceptsFirstMouse:nil], YES);
 }
 
-TEST(FlutterViewController, ReparentsPluginWhenAccessibilityDisabled) {
+TEST_F(FlutterViewControllerTest, ReparentsPluginWhenAccessibilityDisabled) {
   FlutterEngine* engine = CreateTestEngine();
-  NSString* fixtures = @(testing::GetFixturesPath());
-  FlutterDartProject* project = [[FlutterDartProject alloc]
-      initWithAssetsPath:fixtures
-             ICUDataPath:[fixtures stringByAppendingString:@"/icudtl.dat"]];
-  FlutterViewController* viewController = [[FlutterViewController alloc] initWithProject:project];
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
+                                                                                nibName:nil
+                                                                                 bundle:nil];
   [viewController loadView];
   [engine setViewController:viewController];
   // Creates a NSWindow so that sub view can be first responder.
@@ -126,55 +231,104 @@ TEST(FlutterViewController, ReparentsPluginWhenAccessibilityDisabled) {
   EXPECT_TRUE(viewController.textInputPlugin.superview == viewController.view);
 }
 
-TEST(FlutterViewController, CanSetMouseTrackingModeBeforeViewLoaded) {
+TEST_F(FlutterViewControllerTest, CanSetMouseTrackingModeBeforeViewLoaded) {
   NSString* fixtures = @(testing::GetFixturesPath());
   FlutterDartProject* project = [[FlutterDartProject alloc]
       initWithAssetsPath:fixtures
              ICUDataPath:[fixtures stringByAppendingString:@"/icudtl.dat"]];
   FlutterViewController* viewController = [[FlutterViewController alloc] initWithProject:project];
-  viewController.mouseTrackingMode = FlutterMouseTrackingModeInActiveApp;
-  ASSERT_EQ(viewController.mouseTrackingMode, FlutterMouseTrackingModeInActiveApp);
+  viewController.mouseTrackingMode = kFlutterMouseTrackingModeInActiveApp;
+  ASSERT_EQ(viewController.mouseTrackingMode, kFlutterMouseTrackingModeInActiveApp);
+}
+
+TEST_F(FlutterViewControllerMockEngineTest, TestKeyEventsAreSentToFramework) {
+  id mockEngine = GetMockEngine();
+  ASSERT_TRUE([[FlutterViewControllerTestObjC alloc] testKeyEventsAreSentToFramework:mockEngine]);
+}
+
+TEST_F(FlutterViewControllerMockEngineTest, TestKeyEventsArePropagatedIfNotHandled) {
+  id mockEngine = GetMockEngine();
+  ASSERT_TRUE(
+      [[FlutterViewControllerTestObjC alloc] testKeyEventsArePropagatedIfNotHandled:mockEngine]);
+}
+
+TEST_F(FlutterViewControllerMockEngineTest, TestKeyEventsAreNotPropagatedIfHandled) {
+  id mockEngine = GetMockEngine();
+  ASSERT_TRUE(
+      [[FlutterViewControllerTestObjC alloc] testKeyEventsAreNotPropagatedIfHandled:mockEngine]);
 }
 
-TEST(FlutterViewControllerTest, TestKeyEventsAreSentToFramework) {
-  ASSERT_TRUE([[FlutterViewControllerTestObjC alloc] testKeyEventsAreSentToFramework]);
+TEST_F(FlutterViewControllerMockEngineTest, TestCtrlTabKeyEventIsPropagated) {
+  id mockEngine = GetMockEngine();
+  ASSERT_TRUE([[FlutterViewControllerTestObjC alloc] testCtrlTabKeyEventIsPropagated:mockEngine]);
 }
 
-TEST(FlutterViewControllerTest, TestKeyEventsArePropagatedIfNotHandled) {
-  ASSERT_TRUE([[FlutterViewControllerTestObjC alloc] testKeyEventsArePropagatedIfNotHandled]);
+TEST_F(FlutterViewControllerMockEngineTest, TestKeyEquivalentIsPassedToTextInputPlugin) {
+  id mockEngine = GetMockEngine();
+  ASSERT_TRUE([[FlutterViewControllerTestObjC alloc]
+      testKeyEquivalentIsPassedToTextInputPlugin:mockEngine]);
 }
 
-TEST(FlutterViewControllerTest, TestKeyEventsAreNotPropagatedIfHandled) {
-  ASSERT_TRUE([[FlutterViewControllerTestObjC alloc] testKeyEventsAreNotPropagatedIfHandled]);
+TEST_F(FlutterViewControllerMockEngineTest, TestFlagsChangedEventsArePropagatedIfNotHandled) {
+  id mockEngine = GetMockEngine();
+  ASSERT_TRUE([[FlutterViewControllerTestObjC alloc]
+      testFlagsChangedEventsArePropagatedIfNotHandled:mockEngine]);
 }
 
-TEST(FlutterViewControllerTest, TestFlagsChangedEventsArePropagatedIfNotHandled) {
+TEST_F(FlutterViewControllerMockEngineTest, TestKeyboardIsRestartedOnEngineRestart) {
+  id mockEngine = GetMockEngine();
   ASSERT_TRUE(
-      [[FlutterViewControllerTestObjC alloc] testFlagsChangedEventsArePropagatedIfNotHandled]);
+      [[FlutterViewControllerTestObjC alloc] testKeyboardIsRestartedOnEngineRestart:mockEngine]);
 }
 
-TEST(FlutterViewControllerTest, TestKeyboardIsRestartedOnEngineRestart) {
-  ASSERT_TRUE([[FlutterViewControllerTestObjC alloc] testKeyboardIsRestartedOnEngineRestart]);
+TEST_F(FlutterViewControllerMockEngineTest, TestTrackpadGesturesAreSentToFramework) {
+  id mockEngine = GetMockEngine();
+  ASSERT_TRUE(
+      [[FlutterViewControllerTestObjC alloc] testTrackpadGesturesAreSentToFramework:mockEngine]);
 }
 
-TEST(FlutterViewControllerTest, TestTrackpadGesturesAreSentToFramework) {
-  ASSERT_TRUE([[FlutterViewControllerTestObjC alloc] testTrackpadGesturesAreSentToFramework]);
+TEST_F(FlutterViewControllerMockEngineTest, TestMouseDownUpEventsSentToNextResponder) {
+  id mockEngine = GetMockEngine();
+  ASSERT_TRUE(
+      [[FlutterViewControllerTestObjC alloc] testMouseDownUpEventsSentToNextResponder:mockEngine]);
 }
 
-TEST(FlutterViewControllerTest, testViewWillAppearCalledMultipleTimes) {
-  ASSERT_TRUE([[FlutterViewControllerTestObjC alloc] testViewWillAppearCalledMultipleTimes]);
+TEST_F(FlutterViewControllerMockEngineTest, TestModifierKeysAreSynthesizedOnMouseMove) {
+  id mockEngine = GetMockEngine();
+  ASSERT_TRUE(
+      [[FlutterViewControllerTestObjC alloc] testModifierKeysAreSynthesizedOnMouseMove:mockEngine]);
 }
 
-TEST(FlutterViewControllerTest, testFlutterViewIsConfigured) {
-  ASSERT_TRUE([[FlutterViewControllerTestObjC alloc] testFlutterViewIsConfigured]);
+TEST_F(FlutterViewControllerMockEngineTest, testViewWillAppearCalledMultipleTimes) {
+  id mockEngine = GetMockEngine();
+  ASSERT_TRUE(
+      [[FlutterViewControllerTestObjC alloc] testViewWillAppearCalledMultipleTimes:mockEngine]);
+}
+
+TEST_F(FlutterViewControllerMockEngineTest, testFlutterViewIsConfigured) {
+  id mockEngine = GetMockEngine();
+  ASSERT_TRUE([[FlutterViewControllerTestObjC alloc] testFlutterViewIsConfigured:mockEngine]);
+}
+
+TEST_F(FlutterViewControllerTest, testLookupKeyAssets) {
+  ASSERT_TRUE([[FlutterViewControllerTestObjC alloc] testLookupKeyAssets]);
+}
+
+TEST_F(FlutterViewControllerTest, testLookupKeyAssetsWithPackage) {
+  ASSERT_TRUE([[FlutterViewControllerTestObjC alloc] testLookupKeyAssetsWithPackage]);
+}
+
+TEST_F(FlutterViewControllerTest, testViewControllerIsReleased) {
+  ASSERT_TRUE([[FlutterViewControllerTestObjC alloc] testViewControllerIsReleased]);
 }
 
 }  // namespace flutter::testing
 
+#pragma mark - FlutterViewControllerTestObjC
+
 @implementation FlutterViewControllerTestObjC
 
-- (bool)testKeyEventsAreSentToFramework {
-  id engineMock = OCMClassMock([FlutterEngine class]);
+- (bool)testKeyEventsAreSentToFramework:(id)engineMock {
   id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
   OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
       [engineMock binaryMessenger])
@@ -211,8 +365,102 @@ TEST(FlutterViewControllerTest, testFlutterViewIsConfigured) {
   return true;
 }
 
-- (bool)testKeyEventsArePropagatedIfNotHandled {
-  id engineMock = OCMClassMock([FlutterEngine class]);
+// Regression test for https://github.com/flutter/flutter/issues/122084.
+- (bool)testCtrlTabKeyEventIsPropagated:(id)engineMock {
+  __block bool called = false;
+  __block FlutterKeyEvent last_event;
+  OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:FlutterKeyEvent {}
+                                                  callback:nil
+                                                  userData:nil])
+      .andDo((^(NSInvocation* invocation) {
+        FlutterKeyEvent* event;
+        [invocation getArgument:&event atIndex:2];
+        called = true;
+        last_event = *event;
+      }));
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engineMock
+                                                                                nibName:@""
+                                                                                 bundle:nil];
+  // Ctrl+tab
+  NSEvent* event = [NSEvent keyEventWithType:NSEventTypeKeyDown
+                                    location:NSZeroPoint
+                               modifierFlags:0x40101
+                                   timestamp:0
+                                windowNumber:0
+                                     context:nil
+                                  characters:@""
+                 charactersIgnoringModifiers:@""
+                                   isARepeat:NO
+                                     keyCode:48];
+  const uint64_t kPhysicalKeyTab = 0x7002b;
+
+  [viewController viewWillAppear];  // Initializes the event channel.
+  // Creates a NSWindow so that FlutterView view can be first responder.
+  NSWindow* window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 800, 600)
+                                                 styleMask:NSBorderlessWindowMask
+                                                   backing:NSBackingStoreBuffered
+                                                     defer:NO];
+  window.contentView = viewController.view;
+  [window makeFirstResponder:viewController.flutterView];
+  [viewController.view performKeyEquivalent:event];
+
+  EXPECT_TRUE(called);
+  EXPECT_EQ(last_event.type, kFlutterKeyEventTypeDown);
+  EXPECT_EQ(last_event.physical, kPhysicalKeyTab);
+  return true;
+}
+
+- (bool)testKeyEquivalentIsPassedToTextInputPlugin:(id)engineMock {
+  __block bool called = false;
+  __block FlutterKeyEvent last_event;
+  OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:FlutterKeyEvent {}
+                                                  callback:nil
+                                                  userData:nil])
+      .andDo((^(NSInvocation* invocation) {
+        FlutterKeyEvent* event;
+        [invocation getArgument:&event atIndex:2];
+        called = true;
+        last_event = *event;
+      }));
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engineMock
+                                                                                nibName:@""
+                                                                                 bundle:nil];
+  // Ctrl+tab
+  NSEvent* event = [NSEvent keyEventWithType:NSEventTypeKeyDown
+                                    location:NSZeroPoint
+                               modifierFlags:0x40101
+                                   timestamp:0
+                                windowNumber:0
+                                     context:nil
+                                  characters:@""
+                 charactersIgnoringModifiers:@""
+                                   isARepeat:NO
+                                     keyCode:48];
+  const uint64_t kPhysicalKeyTab = 0x7002b;
+
+  [viewController viewWillAppear];  // Initializes the event channel.
+
+  NSWindow* window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 800, 600)
+                                                 styleMask:NSBorderlessWindowMask
+                                                   backing:NSBackingStoreBuffered
+                                                     defer:NO];
+  window.contentView = viewController.view;
+
+  [viewController.view addSubview:viewController.textInputPlugin];
+
+  // Make the textInputPlugin first responder. This should still result in
+  // view controller reporting the key event.
+  [window makeFirstResponder:viewController.textInputPlugin];
+
+  [viewController.view performKeyEquivalent:event];
+
+  EXPECT_TRUE(called);
+  EXPECT_EQ(last_event.type, kFlutterKeyEventTypeDown);
+  EXPECT_EQ(last_event.physical, kPhysicalKeyTab);
+  return true;
+}
+
+- (bool)testKeyEventsArePropagatedIfNotHandled:(id)engineMock {
   id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
   OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
       [engineMock binaryMessenger])
@@ -226,7 +474,8 @@ TEST(FlutterViewControllerTest, testFlutterViewIsConfigured) {
                                                                                 nibName:@""
                                                                                  bundle:nil];
   id responderMock = flutter::testing::mockResponder();
-  viewController.nextResponder = responderMock;
+  id responderWrapper = [[FlutterResponderWrapper alloc] initWithResponder:responderMock];
+  viewController.nextResponder = responderWrapper;
   NSDictionary* expectedEvent = @{
     @"keymap" : @"macos",
     @"type" : @"keydown",
@@ -266,9 +515,7 @@ TEST(FlutterViewControllerTest, testFlutterViewIsConfigured) {
   return true;
 }
 
-- (bool)testFlutterViewIsConfigured {
-  id engineMock = OCMClassMock([FlutterEngine class]);
-
+- (bool)testFlutterViewIsConfigured:(id)engineMock {
   FlutterRenderer* renderer_ = [[FlutterRenderer alloc] initWithFlutterEngine:engineMock];
   OCMStub([engineMock renderer]).andReturn(renderer_);
 
@@ -287,8 +534,7 @@ TEST(FlutterViewControllerTest, testFlutterViewIsConfigured) {
   return true;
 }
 
-- (bool)testFlagsChangedEventsArePropagatedIfNotHandled {
-  id engineMock = OCMClassMock([FlutterEngine class]);
+- (bool)testFlagsChangedEventsArePropagatedIfNotHandled:(id)engineMock {
   id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
   OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
       [engineMock binaryMessenger])
@@ -302,7 +548,8 @@ TEST(FlutterViewControllerTest, testFlutterViewIsConfigured) {
                                                                                 nibName:@""
                                                                                  bundle:nil];
   id responderMock = flutter::testing::mockResponder();
-  viewController.nextResponder = responderMock;
+  id responderWrapper = [[FlutterResponderWrapper alloc] initWithResponder:responderMock];
+  viewController.nextResponder = responderWrapper;
   NSDictionary* expectedEvent = @{
     @"keymap" : @"macos",
     @"type" : @"keydown",
@@ -340,8 +587,7 @@ TEST(FlutterViewControllerTest, testFlutterViewIsConfigured) {
   return true;
 }
 
-- (bool)testKeyEventsAreNotPropagatedIfHandled {
-  id engineMock = OCMClassMock([FlutterEngine class]);
+- (bool)testKeyEventsAreNotPropagatedIfHandled:(id)engineMock {
   id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
   OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
       [engineMock binaryMessenger])
@@ -355,7 +601,8 @@ TEST(FlutterViewControllerTest, testFlutterViewIsConfigured) {
                                                                                 nibName:@""
                                                                                  bundle:nil];
   id responderMock = flutter::testing::mockResponder();
-  viewController.nextResponder = responderMock;
+  id responderWrapper = [[FlutterResponderWrapper alloc] initWithResponder:responderMock];
+  viewController.nextResponder = responderWrapper;
   NSDictionary* expectedEvent = @{
     @"keymap" : @"macos",
     @"type" : @"keydown",
@@ -395,8 +642,7 @@ TEST(FlutterViewControllerTest, testFlutterViewIsConfigured) {
   return true;
 }
 
-- (bool)testKeyboardIsRestartedOnEngineRestart {
-  id engineMock = OCMClassMock([FlutterEngine class]);
+- (bool)testKeyboardIsRestartedOnEngineRestart:(id)engineMock {
   id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
   OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
       [engineMock binaryMessenger])
@@ -457,8 +703,7 @@ TEST(FlutterViewControllerTest, testFlutterViewIsConfigured) {
   }
 }
 
-- (bool)testTrackpadGesturesAreSentToFramework {
-  id engineMock = OCMClassMock([FlutterEngine class]);
+- (bool)testTrackpadGesturesAreSentToFramework:(id)engineMock {
   // Need to return a real renderer to allow view controller to load.
   FlutterRenderer* renderer_ = [[FlutterRenderer alloc] initWithFlutterEngine:engineMock];
   OCMStub([engineMock renderer]).andReturn(renderer_);
@@ -629,6 +874,27 @@ TEST(FlutterViewControllerTest, testFlutterViewIsConfigured) {
   EXPECT_EQ(last_event.scroll_delta_x, -40 * viewController.flutterView.layer.contentsScale);
   EXPECT_EQ(last_event.scroll_delta_y, -80 * viewController.flutterView.layer.contentsScale);
 
+  // A discrete scroll event should use the PointerSignal system, and flip the
+  // direction when shift is pressed.
+  CGEventRef cgEventDiscreteShift =
+      CGEventCreateScrollWheelEvent(NULL, kCGScrollEventUnitPixel, 1, 0);
+  CGEventSetType(cgEventDiscreteShift, kCGEventScrollWheel);
+  CGEventSetFlags(cgEventDiscreteShift, kCGEventFlagMaskShift | flutter::kModifierFlagShiftLeft);
+  CGEventSetIntegerValueField(cgEventDiscreteShift, kCGScrollWheelEventIsContinuous, 0);
+  CGEventSetIntegerValueField(cgEventDiscreteShift, kCGScrollWheelEventDeltaAxis2,
+                              0);  // scroll_delta_x
+  CGEventSetIntegerValueField(cgEventDiscreteShift, kCGScrollWheelEventDeltaAxis1,
+                              2);  // scroll_delta_y
+
+  called = false;
+  [viewController scrollWheel:[NSEvent eventWithCGEvent:cgEventDiscreteShift]];
+  EXPECT_TRUE(called);
+  EXPECT_EQ(last_event.signal_kind, kFlutterPointerSignalKindScroll);
+  // pixelsPerLine is 40.0, direction is reversed and axes have been flipped back.
+  EXPECT_FLOAT_EQ(last_event.scroll_delta_x, 0.0 * viewController.flutterView.layer.contentsScale);
+  EXPECT_FLOAT_EQ(last_event.scroll_delta_y,
+                  -80.0 * viewController.flutterView.layer.contentsScale);
+
   // Test for scale events.
   // Start gesture.
   called = false;
@@ -729,11 +995,16 @@ TEST(FlutterViewControllerTest, testFlutterViewIsConfigured) {
   EXPECT_EQ(last_event.device_kind, kFlutterPointerDeviceKindTrackpad);
   EXPECT_EQ(last_event.signal_kind, kFlutterPointerSignalKindNone);
 
+  // Test that stray NSEventPhaseCancelled event does not crash
+  called = false;
+  [viewController rotateWithEvent:flutter::testing::MockGestureEvent(NSEventTypeRotate,
+                                                                     NSEventPhaseCancelled, 0, 0)];
+  EXPECT_FALSE(called);
+
   return true;
 }
 
-- (bool)testViewWillAppearCalledMultipleTimes {
-  id engineMock = OCMClassMock([FlutterEngine class]);
+- (bool)testViewWillAppearCalledMultipleTimes:(id)engineMock {
   FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engineMock
                                                                                 nibName:@""
                                                                                  bundle:nil];
@@ -742,4 +1013,194 @@ TEST(FlutterViewControllerTest, testFlutterViewIsConfigured) {
   return true;
 }
 
+- (bool)testLookupKeyAssets {
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithProject:nil];
+  NSString* key = [viewController lookupKeyForAsset:@"test.png"];
+  EXPECT_TRUE(
+      [key isEqualToString:@"Contents/Frameworks/App.framework/Resources/flutter_assets/test.png"]);
+  return true;
+}
+
+- (bool)testLookupKeyAssetsWithPackage {
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithProject:nil];
+
+  NSString* packageKey = [viewController lookupKeyForAsset:@"test.png" fromPackage:@"test"];
+  EXPECT_TRUE([packageKey
+      isEqualToString:
+          @"Contents/Frameworks/App.framework/Resources/flutter_assets/packages/test/test.png"]);
+  return true;
+}
+
+static void SwizzledNoop(id self, SEL _cmd) {}
+
+// Verify workaround an AppKit bug where mouseDown/mouseUp are not called on the view controller if
+// the view is the content view of an NSPopover AND macOS's Reduced Transparency accessibility
+// setting is enabled.
+//
+// See: https://github.com/flutter/flutter/issues/115015
+// See: http://www.openradar.me/FB12050037
+// See: https://developer.apple.com/documentation/appkit/nsresponder/1524634-mousedown
+- (bool)testMouseDownUpEventsSentToNextResponder:(id)engineMock {
+  // The root cause of the above bug is NSResponder mouseDown/mouseUp methods that don't correctly
+  // walk the responder chain calling the appropriate method on the next responder under certain
+  // conditions. Simulate this by swizzling out the default implementations and replacing them with
+  // no-ops.
+  Method mouseDown = class_getInstanceMethod([NSResponder class], @selector(mouseDown:));
+  Method mouseUp = class_getInstanceMethod([NSResponder class], @selector(mouseUp:));
+  IMP noopImp = (IMP)SwizzledNoop;
+  IMP origMouseDown = method_setImplementation(mouseDown, noopImp);
+  IMP origMouseUp = method_setImplementation(mouseUp, noopImp);
+
+  // Verify that mouseDown/mouseUp trigger mouseDown/mouseUp calls on FlutterViewController.
+  MouseEventFlutterViewController* viewController =
+      [[MouseEventFlutterViewController alloc] initWithEngine:engineMock nibName:@"" bundle:nil];
+  FlutterView* view = (FlutterView*)[viewController view];
+
+  EXPECT_FALSE(viewController.mouseDownCalled);
+  EXPECT_FALSE(viewController.mouseUpCalled);
+
+  NSEvent* mouseEvent = flutter::testing::CreateMouseEvent(0x00);
+  [view mouseDown:mouseEvent];
+  EXPECT_TRUE(viewController.mouseDownCalled);
+  EXPECT_FALSE(viewController.mouseUpCalled);
+
+  viewController.mouseDownCalled = NO;
+  [view mouseUp:mouseEvent];
+  EXPECT_FALSE(viewController.mouseDownCalled);
+  EXPECT_TRUE(viewController.mouseUpCalled);
+
+  // Restore the original NSResponder mouseDown/mouseUp implementations.
+  method_setImplementation(mouseDown, origMouseDown);
+  method_setImplementation(mouseUp, origMouseUp);
+
+  return true;
+}
+
+- (bool)testModifierKeysAreSynthesizedOnMouseMove:(id)engineMock {
+  id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
+  OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
+      [engineMock binaryMessenger])
+      .andReturn(binaryMessengerMock);
+
+  // Need to return a real renderer to allow view controller to load.
+  FlutterRenderer* renderer_ = [[FlutterRenderer alloc] initWithFlutterEngine:engineMock];
+  OCMStub([engineMock renderer]).andReturn(renderer_);
+
+  // Capture calls to sendKeyEvent
+  __block NSMutableArray<KeyEventWrapper*>* events = [NSMutableArray array];
+  OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:FlutterKeyEvent {}
+                                                  callback:nil
+                                                  userData:nil])
+      .andDo((^(NSInvocation* invocation) {
+        FlutterKeyEvent* event;
+        [invocation getArgument:&event atIndex:2];
+        [events addObject:[[KeyEventWrapper alloc] initWithEvent:event]];
+      }));
+
+  __block NSMutableArray<NSDictionary*>* channelEvents = [NSMutableArray array];
+  OCMStub([binaryMessengerMock sendOnChannel:@"flutter/keyevent"
+                                     message:[OCMArg any]
+                                 binaryReply:[OCMArg any]])
+      .andDo((^(NSInvocation* invocation) {
+        NSData* data;
+        [invocation getArgument:&data atIndex:3];
+        id event = [[FlutterJSONMessageCodec sharedInstance] decode:data];
+        [channelEvents addObject:event];
+      }));
+
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engineMock
+                                                                                nibName:@""
+                                                                                 bundle:nil];
+  [viewController loadView];
+  [viewController viewWillAppear];
+
+  // Zeroed modifier flag should not synthesize events.
+  NSEvent* mouseEvent = flutter::testing::CreateMouseEvent(0x00);
+  [viewController mouseMoved:mouseEvent];
+  EXPECT_EQ([events count], 0u);
+
+  // For each modifier key, check that key events are synthesized.
+  for (NSNumber* keyCode in flutter::keyCodeToModifierFlag) {
+    FlutterKeyEvent* event;
+    NSDictionary* channelEvent;
+    NSNumber* logicalKey;
+    NSNumber* physicalKey;
+    NSEventModifierFlags flag = [flutter::keyCodeToModifierFlag[keyCode] unsignedLongValue];
+
+    // Cocoa event always contain combined flags.
+    if (flag & (flutter::kModifierFlagShiftLeft | flutter::kModifierFlagShiftRight)) {
+      flag |= NSEventModifierFlagShift;
+    }
+    if (flag & (flutter::kModifierFlagControlLeft | flutter::kModifierFlagControlRight)) {
+      flag |= NSEventModifierFlagControl;
+    }
+    if (flag & (flutter::kModifierFlagAltLeft | flutter::kModifierFlagAltRight)) {
+      flag |= NSEventModifierFlagOption;
+    }
+    if (flag & (flutter::kModifierFlagMetaLeft | flutter::kModifierFlagMetaRight)) {
+      flag |= NSEventModifierFlagCommand;
+    }
+
+    // Should synthesize down event.
+    NSEvent* mouseEvent = flutter::testing::CreateMouseEvent(flag);
+    [viewController mouseMoved:mouseEvent];
+    EXPECT_EQ([events count], 1u);
+    event = events[0].data;
+    logicalKey = [flutter::keyCodeToLogicalKey objectForKey:keyCode];
+    physicalKey = [flutter::keyCodeToPhysicalKey objectForKey:keyCode];
+    EXPECT_EQ(event->type, kFlutterKeyEventTypeDown);
+    EXPECT_EQ(event->logical, logicalKey.unsignedLongLongValue);
+    EXPECT_EQ(event->physical, physicalKey.unsignedLongLongValue);
+    EXPECT_EQ(event->synthesized, true);
+
+    channelEvent = channelEvents[0];
+    EXPECT_TRUE([channelEvent[@"type"] isEqual:@"keydown"]);
+    EXPECT_TRUE([channelEvent[@"keyCode"] isEqual:keyCode]);
+    EXPECT_TRUE([channelEvent[@"modifiers"] isEqual:@(flag)]);
+
+    // Should synthesize up event.
+    mouseEvent = flutter::testing::CreateMouseEvent(0x00);
+    [viewController mouseMoved:mouseEvent];
+    EXPECT_EQ([events count], 2u);
+    event = events[1].data;
+    logicalKey = [flutter::keyCodeToLogicalKey objectForKey:keyCode];
+    physicalKey = [flutter::keyCodeToPhysicalKey objectForKey:keyCode];
+    EXPECT_EQ(event->type, kFlutterKeyEventTypeUp);
+    EXPECT_EQ(event->logical, logicalKey.unsignedLongLongValue);
+    EXPECT_EQ(event->physical, physicalKey.unsignedLongLongValue);
+    EXPECT_EQ(event->synthesized, true);
+
+    channelEvent = channelEvents[1];
+    EXPECT_TRUE([channelEvent[@"type"] isEqual:@"keyup"]);
+    EXPECT_TRUE([channelEvent[@"keyCode"] isEqual:keyCode]);
+    EXPECT_TRUE([channelEvent[@"modifiers"] isEqual:@(0)]);
+
+    [events removeAllObjects];
+    [channelEvents removeAllObjects];
+  };
+
+  return true;
+}
+
+- (bool)testViewControllerIsReleased {
+  __weak FlutterViewController* weakController;
+  @autoreleasepool {
+    id engineMock = flutter::testing::CreateMockFlutterEngine(@"");
+
+    FlutterRenderer* renderer_ = [[FlutterRenderer alloc] initWithFlutterEngine:engineMock];
+    OCMStub([engineMock renderer]).andReturn(renderer_);
+
+    FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engineMock
+                                                                                  nibName:@""
+                                                                                   bundle:nil];
+    [viewController loadView];
+    weakController = viewController;
+
+    [engineMock shutDownEngine];
+  }
+
+  EXPECT_EQ(weakController, nil);
+  return true;
+}
+
 @end
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterViewControllerTestUtils.h b/shell/platform/darwin/macos/framework/Source/FlutterViewControllerTestUtils.h
index a86002f4db9ca3eead8df7cafd9485ad9334f692..6cfb45e0969c20fb246f33593a0b7aaa175b34a0 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterViewControllerTestUtils.h
+++ b/shell/platform/darwin/macos/framework/Source/FlutterViewControllerTestUtils.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERVIEWCONTROLLERTESTUTILS_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERVIEWCONTROLLERTESTUTILS_H_
+
 #import <Foundation/NSString.h>
 #import <OCMock/OCMock.h>
 
@@ -15,3 +18,5 @@ namespace flutter::testing {
 id CreateMockViewController();
 
 }  // namespace flutter::testing
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERVIEWCONTROLLERTESTUTILS_H_
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterViewController_Internal.h b/shell/platform/darwin/macos/framework/Source/FlutterViewController_Internal.h
index 19870cf5b183bcfa80ccde890ea37adca6db8688..8f9492f30dd51d5e8c210224aeef21f351284894 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterViewController_Internal.h
+++ b/shell/platform/darwin/macos/framework/Source/FlutterViewController_Internal.h
@@ -2,14 +2,30 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERVIEWCONTROLLER_INTERNAL_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERVIEWCONTROLLER_INTERNAL_H_
+
 #import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterViewController.h"
 
+#include <memory>
+
+#import "flutter/shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMac.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterKeyboardViewDelegate.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputPlugin.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterView.h"
 
 @interface FlutterViewController () <FlutterKeyboardViewDelegate>
 
+/**
+ * The identifier for this view controller.
+ *
+ * The ID is assigned by FlutterEngine when the view controller is attached.
+ *
+ * If the view controller is unattached (see FlutterViewController#attached),
+ * reading this property throws an assertion.
+ */
+@property(nonatomic, readonly) FlutterViewId viewId;
+
 // The FlutterView for this view controller.
 @property(nonatomic, readonly, nullable) FlutterView* flutterView;
 
@@ -18,14 +34,59 @@
  */
 @property(nonatomic, readonly, nonnull) FlutterTextInputPlugin* textInputPlugin;
 
+@property(nonatomic, readonly) std::weak_ptr<flutter::AccessibilityBridgeMac> accessibilityBridge;
+
 /**
  * Returns YES if provided event is being currently redispatched by keyboard manager.
  */
 - (BOOL)isDispatchingKeyEvent:(nonnull NSEvent*)event;
 
+/**
+ * Set up the controller with `engine` and `id`, and other engine-level classes.
+ *
+ * This method is called by FlutterEngine. A view controller must be set up
+ * before being used, and must be set up only once until detachFromEngine:.
+ */
+- (void)setUpWithEngine:(nonnull FlutterEngine*)engine
+                 viewId:(FlutterViewId)viewId
+     threadSynchronizer:(nonnull FlutterThreadSynchronizer*)threadSynchronizer;
+
+/**
+ * Reset the `engine` and `id` of this controller.
+ *
+ * This method is called by FlutterEngine.
+ */
+- (void)detachFromEngine;
+
+/**
+ * Called by the associated FlutterEngine when FlutterEngine#semanticsEnabled
+ * has changed.
+ */
+- (void)notifySemanticsEnabledChanged;
+
+/**
+ * Notify from the framework that the semantics for this view needs to be
+ * updated.
+ */
+- (void)updateSemantics:(nonnull const FlutterSemanticsUpdate2*)update;
+
 @end
 
 // Private methods made visible for testing
 @interface FlutterViewController (TestMethods)
 - (void)onAccessibilityStatusChanged:(BOOL)enabled;
+
+/* Creates an accessibility bridge with the provided parameters.
+ *
+ * By default this method calls AccessibilityBridgeMac's initializer. Exposing
+ * this method allows unit tests to override.
+ */
+- (std::shared_ptr<flutter::AccessibilityBridgeMac>)createAccessibilityBridgeWithEngine:
+    (nonnull FlutterEngine*)engine;
+
+- (nonnull FlutterView*)createFlutterViewWithMTLDevice:(nonnull id<MTLDevice>)device
+                                          commandQueue:(nonnull id<MTLCommandQueue>)commandQueue;
+
 @end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERVIEWCONTROLLER_INTERNAL_H_
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterViewEngineProvider.h b/shell/platform/darwin/macos/framework/Source/FlutterViewEngineProvider.h
index feafa708be803d9af4af03c2763325ad5e6c3719..d8e0b19aab3f15fac0596efd0951ead79d16b5c9 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterViewEngineProvider.h
+++ b/shell/platform/darwin/macos/framework/Source/FlutterViewEngineProvider.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERVIEWENGINEPROVIDER_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERVIEWENGINEPROVIDER_H_
+
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterViewProvider.h"
 
 @class FlutterEngine;
@@ -20,3 +23,5 @@
 - (nonnull instancetype)initWithEngine:(nonnull __weak FlutterEngine*)engine;
 
 @end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERVIEWENGINEPROVIDER_H_
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterViewEngineProvider.mm b/shell/platform/darwin/macos/framework/Source/FlutterViewEngineProvider.mm
index a063784b5e2c91cef2f73421f9214f600b893951..eabf7e13d938bf773fafc5f852b965679b7e009c 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterViewEngineProvider.mm
+++ b/shell/platform/darwin/macos/framework/Source/FlutterViewEngineProvider.mm
@@ -22,14 +22,8 @@
   return self;
 }
 
-- (nullable FlutterView*)getView:(uint64_t)viewId {
-  // TODO(dkwingsmt): This class only supports the first view for now. After
-  // FlutterEngine supports multi-view, it should get the view associated to the
-  // ID.
-  if (viewId == kFlutterDefaultViewId) {
-    return _engine.viewController.flutterView;
-  }
-  return nil;
+- (nullable FlutterView*)viewForId:(FlutterViewId)viewId {
+  return [_engine viewControllerForId:viewId].flutterView;
 }
 
 @end
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterViewEngineProviderTest.mm b/shell/platform/darwin/macos/framework/Source/FlutterViewEngineProviderTest.mm
index 6a1aa66b69c590e7e90d84e44d40d3ba32f9e935..aa14b70fc4b2bafb711393f74cd3a6b0f5add4b1 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterViewEngineProviderTest.mm
+++ b/shell/platform/darwin/macos/framework/Source/FlutterViewEngineProviderTest.mm
@@ -6,6 +6,7 @@
 #import <Foundation/Foundation.h>
 #import <OCMock/OCMock.h>
 
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterEngineTestUtils.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterViewController_Internal.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterViewEngineProvider.h"
@@ -19,23 +20,29 @@ namespace flutter::testing {
 
 TEST(FlutterViewEngineProviderUnittests, GetViewReturnsTheCorrectView) {
   FlutterViewEngineProvider* viewProvider;
-  id mockEngine = OCMClassMock([FlutterEngine class]);
+  id mockEngine = CreateMockFlutterEngine(@"");
   __block id mockFlutterViewController;
-  OCMStub([mockEngine viewController]).andDo(^(NSInvocation* invocation) {
-    if (mockFlutterViewController != nil) {
-      [invocation setReturnValue:&mockFlutterViewController];
-    }
-  });
+  OCMStub([mockEngine viewControllerForId:0])
+      .ignoringNonObjectArgs()
+      .andDo(^(NSInvocation* invocation) {
+        FlutterViewId viewId;
+        [invocation getArgument:&viewId atIndex:2];
+        if (viewId == kFlutterImplicitViewId) {
+          if (mockFlutterViewController != nil) {
+            [invocation setReturnValue:&mockFlutterViewController];
+          }
+        }
+      });
   viewProvider = [[FlutterViewEngineProvider alloc] initWithEngine:mockEngine];
 
   // When the view controller is not set, the returned view is nil.
-  EXPECT_EQ([viewProvider getView:0], nil);
+  EXPECT_EQ([viewProvider viewForId:0], nil);
 
   // When the view controller is set, the returned view is the controller's view.
   mockFlutterViewController = OCMStrictClassMock([FlutterViewController class]);
   id mockView = OCMStrictClassMock([FlutterView class]);
   OCMStub([mockFlutterViewController flutterView]).andReturn(mockView);
-  EXPECT_EQ([viewProvider getView:0], mockView);
+  EXPECT_EQ([viewProvider viewForId:0], mockView);
 }
 
 }  // namespace flutter::testing
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterViewProvider.h b/shell/platform/darwin/macos/framework/Source/FlutterViewProvider.h
index 98aca04055d5bc361ed6cc2da6f676fc3963c0b7..8261f94cd70c28bc53869db2257b84d18ce74301 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterViewProvider.h
+++ b/shell/platform/darwin/macos/framework/Source/FlutterViewProvider.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERVIEWPROVIDER_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERVIEWPROVIDER_H_
+
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterView.h"
 
 /**
@@ -18,6 +21,8 @@
  *
  * Returns nil if the ID is invalid.
  */
-- (nullable FlutterView*)getView:(uint64_t)id;
+- (nullable FlutterView*)viewForId:(FlutterViewId)id;
 
 @end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_FLUTTERVIEWPROVIDER_H_
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterViewTest.mm b/shell/platform/darwin/macos/framework/Source/FlutterViewTest.mm
new file mode 100644
index 0000000000000000000000000000000000000000..65620a53824e4b3c9e1eb79165d79d16bc46c0bc
--- /dev/null
+++ b/shell/platform/darwin/macos/framework/Source/FlutterViewTest.mm
@@ -0,0 +1,39 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterView.h"
+
+#import <Metal/Metal.h>
+
+#import "flutter/testing/testing.h"
+
+constexpr int64_t kImplicitViewId = 0ll;
+
+@interface TestFlutterViewDelegate : NSObject <FlutterViewDelegate>
+
+@end
+
+@implementation TestFlutterViewDelegate
+
+- (void)viewDidReshape:(nonnull NSView*)view {
+}
+
+- (BOOL)viewShouldAcceptFirstResponder:(NSView*)view {
+  return YES;
+}
+
+@end
+
+TEST(FlutterView, ShouldInheritContentsScaleReturnsYes) {
+  id<MTLDevice> device = MTLCreateSystemDefaultDevice();
+  id<MTLCommandQueue> queue = [device newCommandQueue];
+  TestFlutterViewDelegate* delegate = [[TestFlutterViewDelegate alloc] init];
+  FlutterThreadSynchronizer* threadSynchronizer = [[FlutterThreadSynchronizer alloc] init];
+  FlutterView* view = [[FlutterView alloc] initWithMTLDevice:device
+                                                commandQueue:queue
+                                                    delegate:delegate
+                                          threadSynchronizer:threadSynchronizer
+                                                      viewId:kImplicitViewId];
+  EXPECT_EQ([view layer:view.layer shouldInheritContentsScale:3.0 fromWindow:view.window], YES);
+}
diff --git a/shell/platform/darwin/macos/framework/Source/KeyCodeMap.g.mm b/shell/platform/darwin/macos/framework/Source/KeyCodeMap.g.mm
index 52229d518b0ab7eec34e04acf0d88787e37b0be9..0704ad2406cdbeb3d50237b7e93f18543b99e3cc 100644
--- a/shell/platform/darwin/macos/framework/Source/KeyCodeMap.g.mm
+++ b/shell/platform/darwin/macos/framework/Source/KeyCodeMap.g.mm
@@ -245,55 +245,56 @@ const NSDictionary* modifierFlagToKeyCode = @{
 const uint64_t kCapsLockPhysicalKey = 0x00070039;
 const uint64_t kCapsLockLogicalKey = 0x100000104;
 
-const std::vector<LayoutGoal> layoutGoals = {
-    LayoutGoal{0x31, 0x20, false},  // Space
-    LayoutGoal{0x27, 0x22, false},  // Quote
-    LayoutGoal{0x2b, 0x2c, false},  // Comma
-    LayoutGoal{0x1b, 0x2d, false},  // Minus
-    LayoutGoal{0x2f, 0x2e, false},  // Period
-    LayoutGoal{0x2c, 0x2f, false},  // Slash
-    LayoutGoal{0x1d, 0x30, true},   // Digit0
-    LayoutGoal{0x12, 0x31, true},   // Digit1
-    LayoutGoal{0x13, 0x32, true},   // Digit2
-    LayoutGoal{0x14, 0x33, true},   // Digit3
-    LayoutGoal{0x15, 0x34, true},   // Digit4
-    LayoutGoal{0x17, 0x35, true},   // Digit5
-    LayoutGoal{0x16, 0x36, true},   // Digit6
-    LayoutGoal{0x1a, 0x37, true},   // Digit7
-    LayoutGoal{0x1c, 0x38, true},   // Digit8
-    LayoutGoal{0x19, 0x39, true},   // Digit9
-    LayoutGoal{0x29, 0x3b, false},  // Semicolon
-    LayoutGoal{0x18, 0x3d, false},  // Equal
-    LayoutGoal{0x21, 0x5b, false},  // BracketLeft
-    LayoutGoal{0x2a, 0x5c, false},  // Backslash
-    LayoutGoal{0x1e, 0x5d, false},  // BracketRight
-    LayoutGoal{0x32, 0x60, false},  // Backquote
-    LayoutGoal{0x00, 0x61, true},   // KeyA
-    LayoutGoal{0x0b, 0x62, true},   // KeyB
-    LayoutGoal{0x08, 0x63, true},   // KeyC
-    LayoutGoal{0x02, 0x64, true},   // KeyD
-    LayoutGoal{0x0e, 0x65, true},   // KeyE
-    LayoutGoal{0x03, 0x66, true},   // KeyF
-    LayoutGoal{0x05, 0x67, true},   // KeyG
-    LayoutGoal{0x04, 0x68, true},   // KeyH
-    LayoutGoal{0x22, 0x69, true},   // KeyI
-    LayoutGoal{0x26, 0x6a, true},   // KeyJ
-    LayoutGoal{0x28, 0x6b, true},   // KeyK
-    LayoutGoal{0x25, 0x6c, true},   // KeyL
-    LayoutGoal{0x2e, 0x6d, true},   // KeyM
-    LayoutGoal{0x2d, 0x6e, true},   // KeyN
-    LayoutGoal{0x1f, 0x6f, true},   // KeyO
-    LayoutGoal{0x23, 0x70, true},   // KeyP
-    LayoutGoal{0x0c, 0x71, true},   // KeyQ
-    LayoutGoal{0x0f, 0x72, true},   // KeyR
-    LayoutGoal{0x01, 0x73, true},   // KeyS
-    LayoutGoal{0x11, 0x74, true},   // KeyT
-    LayoutGoal{0x20, 0x75, true},   // KeyU
-    LayoutGoal{0x09, 0x76, true},   // KeyV
-    LayoutGoal{0x0d, 0x77, true},   // KeyW
-    LayoutGoal{0x07, 0x78, true},   // KeyX
-    LayoutGoal{0x10, 0x79, true},   // KeyY
-    LayoutGoal{0x06, 0x7a, true},   // KeyZ
+const std::vector<LayoutGoal> kLayoutGoals = {
+    LayoutGoal{0x31, 0x20, false},         // Space
+    LayoutGoal{0x27, 0x22, false},         // Quote
+    LayoutGoal{0x2b, 0x2c, false},         // Comma
+    LayoutGoal{0x1b, 0x2d, false},         // Minus
+    LayoutGoal{0x2f, 0x2e, false},         // Period
+    LayoutGoal{0x2c, 0x2f, false},         // Slash
+    LayoutGoal{0x1d, 0x30, true},          // Digit0
+    LayoutGoal{0x12, 0x31, true},          // Digit1
+    LayoutGoal{0x13, 0x32, true},          // Digit2
+    LayoutGoal{0x14, 0x33, true},          // Digit3
+    LayoutGoal{0x15, 0x34, true},          // Digit4
+    LayoutGoal{0x17, 0x35, true},          // Digit5
+    LayoutGoal{0x16, 0x36, true},          // Digit6
+    LayoutGoal{0x1a, 0x37, true},          // Digit7
+    LayoutGoal{0x1c, 0x38, true},          // Digit8
+    LayoutGoal{0x19, 0x39, true},          // Digit9
+    LayoutGoal{0x29, 0x3b, false},         // Semicolon
+    LayoutGoal{0x18, 0x3d, false},         // Equal
+    LayoutGoal{0x21, 0x5b, false},         // BracketLeft
+    LayoutGoal{0x2a, 0x5c, false},         // Backslash
+    LayoutGoal{0x1e, 0x5d, false},         // BracketRight
+    LayoutGoal{0x32, 0x60, false},         // Backquote
+    LayoutGoal{0x00, 0x61, true},          // KeyA
+    LayoutGoal{0x0b, 0x62, true},          // KeyB
+    LayoutGoal{0x08, 0x63, true},          // KeyC
+    LayoutGoal{0x02, 0x64, true},          // KeyD
+    LayoutGoal{0x0e, 0x65, true},          // KeyE
+    LayoutGoal{0x03, 0x66, true},          // KeyF
+    LayoutGoal{0x05, 0x67, true},          // KeyG
+    LayoutGoal{0x04, 0x68, true},          // KeyH
+    LayoutGoal{0x22, 0x69, true},          // KeyI
+    LayoutGoal{0x26, 0x6a, true},          // KeyJ
+    LayoutGoal{0x28, 0x6b, true},          // KeyK
+    LayoutGoal{0x25, 0x6c, true},          // KeyL
+    LayoutGoal{0x2e, 0x6d, true},          // KeyM
+    LayoutGoal{0x2d, 0x6e, true},          // KeyN
+    LayoutGoal{0x1f, 0x6f, true},          // KeyO
+    LayoutGoal{0x23, 0x70, true},          // KeyP
+    LayoutGoal{0x0c, 0x71, true},          // KeyQ
+    LayoutGoal{0x0f, 0x72, true},          // KeyR
+    LayoutGoal{0x01, 0x73, true},          // KeyS
+    LayoutGoal{0x11, 0x74, true},          // KeyT
+    LayoutGoal{0x20, 0x75, true},          // KeyU
+    LayoutGoal{0x09, 0x76, true},          // KeyV
+    LayoutGoal{0x0d, 0x77, true},          // KeyW
+    LayoutGoal{0x07, 0x78, true},          // KeyX
+    LayoutGoal{0x10, 0x79, true},          // KeyY
+    LayoutGoal{0x06, 0x7a, true},          // KeyZ
+    LayoutGoal{0x0a, 0x200000020, false},  // IntlBackslash
 };
 
 }  // namespace flutter
diff --git a/shell/platform/darwin/macos/framework/Source/KeyCodeMapTest.mm b/shell/platform/darwin/macos/framework/Source/KeyCodeMapTest.mm
new file mode 100644
index 0000000000000000000000000000000000000000..aebacdfd9da3a825b8126f8d9b59f99e7a6c405a
--- /dev/null
+++ b/shell/platform/darwin/macos/framework/Source/KeyCodeMapTest.mm
@@ -0,0 +1,39 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "KeyCodeMap_Internal.h"
+
+#import "flutter/testing/testing.h"
+#include "third_party/googletest/googletest/include/gtest/gtest.h"
+
+namespace flutter {
+
+bool operator==(const LayoutGoal& a, const LayoutGoal& b) {
+  return a.keyCode == b.keyCode && a.keyChar == b.keyChar && a.mandatory == b.mandatory;
+}
+
+namespace testing {
+
+// Spot check some expected values so that we know that some classes of key
+// aren't excluded.
+TEST(KeyMappingTest, HasExpectedValues) {
+  // Has Space
+  EXPECT_NE(std::find(kLayoutGoals.begin(), kLayoutGoals.end(), LayoutGoal{0x31, 0x20, false}),
+            kLayoutGoals.end());
+  // Has Digit0
+  EXPECT_NE(std::find(kLayoutGoals.begin(), kLayoutGoals.end(), LayoutGoal{0x1d, 0x30, true}),
+            kLayoutGoals.end());
+  // Has KeyA
+  EXPECT_NE(std::find(kLayoutGoals.begin(), kLayoutGoals.end(), LayoutGoal{0x00, 0x61, true}),
+            kLayoutGoals.end());
+  // Has Equal
+  EXPECT_NE(std::find(kLayoutGoals.begin(), kLayoutGoals.end(), LayoutGoal{0x18, 0x3d, false}),
+            kLayoutGoals.end());
+  // Has IntlBackslash
+  EXPECT_NE(
+      std::find(kLayoutGoals.begin(), kLayoutGoals.end(), LayoutGoal{0x0a, 0x200000020, false}),
+      kLayoutGoals.end());
+}
+}  // namespace testing
+}  // namespace flutter
diff --git a/shell/platform/darwin/macos/framework/Source/KeyCodeMap_Internal.h b/shell/platform/darwin/macos/framework/Source/KeyCodeMap_Internal.h
index 9a7e38659ff4e7043a23dcf3a013e9b773286af7..a612d06190655351132d7c9704d5d9bd17c9c5c0 100644
--- a/shell/platform/darwin/macos/framework/Source/KeyCodeMap_Internal.h
+++ b/shell/platform/darwin/macos/framework/Source/KeyCodeMap_Internal.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_KEYCODEMAP_INTERNAL_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_KEYCODEMAP_INTERNAL_H_
+
 #import <Cocoa/Cocoa.h>
 #include <cinttypes>
 #include <vector>
@@ -93,7 +96,7 @@ typedef struct {
   uint16_t keyCode;
 
   // The printable string to derive logical key for.
-  uint8_t keyChar;
+  uint64_t keyChar;
 
   // If the goal is mandatory, the keyboard manager will make sure to find a
   // logical key for this character, falling back to the US keyboard layout.
@@ -104,6 +107,8 @@ typedef struct {
  * All keys that Flutter wants to derive layout for, and guides on how to derive
  * them.
  */
-extern const std::vector<LayoutGoal> layoutGoals;
+extern const std::vector<LayoutGoal> kLayoutGoals;
 
 }  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_KEYCODEMAP_INTERNAL_H_
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterIOSurfaceHolder.h b/shell/platform/darwin/macos/framework/Source/NSView+ClipsToBounds.h
similarity index 31%
rename from shell/platform/darwin/macos/framework/Source/FlutterIOSurfaceHolder.h
rename to shell/platform/darwin/macos/framework/Source/NSView+ClipsToBounds.h
index e3a1f8a7113dd0992fbbdfc367ddf2a4ca46fae4..49f332247d2e397c0721e1a1bc3795a004b321cd 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterIOSurfaceHolder.h
+++ b/shell/platform/darwin/macos/framework/Source/NSView+ClipsToBounds.h
@@ -2,23 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import <Cocoa/Cocoa.h>
-
-/**
- * FlutterIOSurfaceHolder maintains an IOSurface
- * and provides an interface to bind the IOSurface to a texture.
- */
-@interface FlutterIOSurfaceHolder : NSObject
-
-/**
- * Releases the current IOSurface if one exists
- * and creates a new IOSurface with the specified size.
- */
-- (void)recreateIOSurfaceWithSize:(CGSize)size;
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_NSVIEW_CLIPSTOBOUNDS_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_NSVIEW_CLIPSTOBOUNDS_H_
 
-/**
- * Returns a reference to the underlying IOSurface.
- */
-- (const IOSurfaceRef&)ioSurface;
+#import <Cocoa/Cocoa.h>
 
+@interface NSView (ClipsToBounds)
+// This property is available since macOS 10.9 but only declared in macOS 14 SDK.
+@property BOOL clipsToBounds API_AVAILABLE(macos(10.9));
 @end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_NSVIEW_CLIPSTOBOUNDS_H_
diff --git a/shell/platform/darwin/macos/framework/Source/TestFlutterPlatformView.h b/shell/platform/darwin/macos/framework/Source/TestFlutterPlatformView.h
index 719000ae66f08fdbe8576082861957f68d2fe4cc..3f256ea3af3a004f4d0b8162e1eef52e4050786c 100644
--- a/shell/platform/darwin/macos/framework/Source/TestFlutterPlatformView.h
+++ b/shell/platform/darwin/macos/framework/Source/TestFlutterPlatformView.h
@@ -2,12 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_TESTFLUTTERPLATFORMVIEW_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_TESTFLUTTERPLATFORMVIEW_H_
+
 #import <Foundation/Foundation.h>
 
 #import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterEngine.h"
 
 @interface TestFlutterPlatformView : NSView
+
+/// Arguments passed via the params value in the create method call.
+@property(nonatomic, copy) id args;
+
 @end
 
 @interface TestFlutterPlatformViewFactory : NSObject <FlutterPlatformViewFactory>
 @end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_MACOS_FRAMEWORK_SOURCE_TESTFLUTTERPLATFORMVIEW_H_
diff --git a/shell/platform/darwin/macos/framework/Source/TestFlutterPlatformView.mm b/shell/platform/darwin/macos/framework/Source/TestFlutterPlatformView.mm
index 9c486e25650e886b22e1c2c495663c965f688d74..b1bd763b25c4ac7416a5d2ef823471e866bb2432 100644
--- a/shell/platform/darwin/macos/framework/Source/TestFlutterPlatformView.mm
+++ b/shell/platform/darwin/macos/framework/Source/TestFlutterPlatformView.mm
@@ -9,8 +9,9 @@
 
 @implementation TestFlutterPlatformView
 
-- (instancetype)initWithFrame:(CGRect)frame {
+- (instancetype)initWithFrame:(CGRect)frame arguments:(nullable NSDictionary*)args {
   self = [super initWithFrame:frame];
+  _args = args;
   return self;
 }
 
@@ -18,7 +19,7 @@
 
 @implementation TestFlutterPlatformViewFactory
 - (NSView*)createWithViewIdentifier:(int64_t)viewId arguments:(nullable id)args {
-  return [[TestFlutterPlatformView alloc] initWithFrame:CGRectZero];
+  return [[TestFlutterPlatformView alloc] initWithFrame:CGRectZero arguments:args];
 }
 
 - (NSObject<FlutterMessageCodec>*)createArgsCodec {
diff --git a/shell/platform/embedder/BUILD.gn b/shell/platform/embedder/BUILD.gn
index 56335f45afd715add78c6f571d03c3d1239f4886..20d7d3970d6757bdd572b72f94eb774b80b339cf 100644
--- a/shell/platform/embedder/BUILD.gn
+++ b/shell/platform/embedder/BUILD.gn
@@ -5,6 +5,7 @@
 import("//build/toolchain/clang.gni")
 import("//flutter/build/zip_bundle.gni")
 import("//flutter/common/config.gni")
+import("//flutter/impeller/tools/impeller.gni")
 import("//flutter/shell/gpu/gpu.gni")
 import("//flutter/shell/platform/embedder/embedder.gni")
 import("//flutter/testing/testing.gni")
@@ -75,6 +76,10 @@ template("embedder_source_set") {
       "embedder_render_target.h",
       "embedder_render_target_cache.cc",
       "embedder_render_target_cache.h",
+      "embedder_render_target_skia.cc",
+      "embedder_render_target_skia.h",
+      "embedder_semantics_update.cc",
+      "embedder_semantics_update.h",
       "embedder_struct_macros.h",
       "embedder_surface.cc",
       "embedder_surface.h",
@@ -85,23 +90,18 @@ template("embedder_source_set") {
       "embedder_thread_host.cc",
       "embedder_thread_host.h",
       "pixel_formats.cc",
+      "pixel_formats.h",
       "platform_view_embedder.cc",
       "platform_view_embedder.h",
       "vsync_waiter_embedder.cc",
       "vsync_waiter_embedder.h",
     ]
 
-    if (embedder_enable_gl) {
-      sources += [
-        "embedder_external_texture_gl.cc",
-        "embedder_external_texture_gl.h",
-        "embedder_surface_gl.cc",
-        "embedder_surface_gl.h",
-      ]
-    }
-
+    public_deps = [ ":embedder_headers" ]
     deps = [
       ":embedder_gpu_configuration",
+      "$dart_src/runtime/bin:dart_io_api",
+      "$dart_src/runtime/bin:elf_loader",
       "//flutter/assets",
       "//flutter/common",
       "//flutter/common/graphics",
@@ -110,13 +110,37 @@ template("embedder_source_set") {
       "//flutter/lib/ui",
       "//flutter/runtime:libdart",
       "//flutter/shell/common",
+      "//flutter/skia",
       "//flutter/third_party/tonic",
-      "//third_party/dart/runtime/bin:dart_io_api",
-      "//third_party/dart/runtime/bin:elf_loader",
-      "//third_party/skia",
     ]
-    if( is_ohos ){
-       #libs +=["hilog_ndk.z"]
+
+    if (embedder_enable_gl) {
+      sources += [
+        "embedder_external_texture_gl.cc",
+        "embedder_external_texture_gl.h",
+        "embedder_surface_gl.cc",
+        "embedder_surface_gl.h",
+      ]
+
+      if (impeller_supports_rendering) {
+        sources += [
+          "embedder_surface_gl_impeller.cc",
+          "embedder_surface_gl_impeller.h",
+        ]
+        deps += [ "//flutter/impeller/renderer/backend/gles" ]
+      }
+    }
+
+    if (impeller_supports_rendering) {
+      sources += [
+        "embedder_render_target_impeller.cc",
+        "embedder_render_target_impeller.h",
+      ]
+
+      deps += [
+        "//flutter/impeller",
+        "//flutter/impeller/renderer",
+      ]
     }
 
     if (embedder_enable_metal) {
@@ -127,6 +151,14 @@ template("embedder_source_set") {
         "embedder_surface_metal.mm",
       ]
 
+      if (impeller_supports_rendering) {
+        sources += [
+          "embedder_surface_metal_impeller.h",
+          "embedder_surface_metal_impeller.mm",
+        ]
+        deps += [ "//flutter/impeller/renderer/backend/metal" ]
+      }
+
       cflags_objc = flutter_cflags_objc
       cflags_objcc = flutter_cflags_objcc
 
@@ -145,12 +177,17 @@ template("embedder_source_set") {
       ]
     }
 
-    public_deps = [ ":embedder_headers" ]
+    # Depend on 'icudtl.dat.S' to avoid dynamic lookups of engine library symbols.
+    if (is_android) {
+      deps += [ "//flutter/shell/platform/android:icudtl_asm" ]
+      sources += [ "$root_build_dir/gen/flutter/shell/platform/android/flutter/third_party/icu/flutter/icudtl.dat.S" ]
+    }
 
     public_configs += [
       ":embedder_gpu_configuration_config",
       ":embedder_header_config",
       "//flutter:config",
+      "//flutter/impeller:impeller_public_config",
     ]
   }
 }
@@ -201,9 +238,11 @@ test_fixtures("fixtures") {
     "fixtures/compositor_software.png",
     "fixtures/compositor_with_platform_layer_on_bottom.png",
     "fixtures/compositor_with_root_layer_only.png",
+    "fixtures/compositor_platform_layer_with_no_overlay.png",
     "fixtures/dpr_noxform.png",
     "fixtures/dpr_xform.png",
     "fixtures/gradient.png",
+    "fixtures/impeller_gl_test.png",
     "fixtures/vk_dpr_noxform.png",
     "fixtures/vk_gradient.png",
     "fixtures/gradient_metal.png",
@@ -232,6 +271,7 @@ if (enable_unittests) {
       "platform_view_embedder_unittests.cc",
       "tests/embedder_config_builder.cc",
       "tests/embedder_config_builder.h",
+      "tests/embedder_frozen.h",
       "tests/embedder_test.cc",
       "tests/embedder_test.h",
       "tests/embedder_test_backingstore_producer.cc",
@@ -251,16 +291,16 @@ if (enable_unittests) {
       ":embedder",
       ":embedder_gpu_configuration",
       ":fixtures",
+      "$dart_src/runtime/bin:elf_loader",
       "//flutter/flow",
       "//flutter/lib/snapshot",
       "//flutter/lib/ui",
       "//flutter/runtime",
+      "//flutter/skia",
       "//flutter/testing",
       "//flutter/testing:dart",
       "//flutter/testing:skia",
       "//flutter/third_party/tonic",
-      "//third_party/dart/runtime/bin:elf_loader",
-      "//third_party/skia",
     ]
 
     if (test_enable_gl) {
@@ -273,7 +313,7 @@ if (enable_unittests) {
 
       public_deps += [
         "//flutter/testing:opengl",
-        "//third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
+        "//flutter/third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
       ]
     }
 
@@ -315,16 +355,23 @@ if (enable_unittests) {
 
     include_dirs = [ "." ]
 
-    sources = [ "tests/embedder_unittests.cc" ]
+    sources = [
+      "tests/embedder_frozen_unittests.cc",
+      "tests/embedder_unittests.cc",
+    ]
 
     deps = [ ":embedder_unittests_library" ]
 
     if (test_enable_gl) {
-      sources += [ "tests/embedder_unittests_gl.cc" ]
+      sources += [ "tests/embedder_gl_unittests.cc" ]
     }
 
     if (test_enable_metal) {
-      sources += [ "tests/embedder_unittests_metal.mm" ]
+      sources += [ "tests/embedder_metal_unittests.mm" ]
+    }
+
+    if (test_enable_vulkan) {
+      sources += [ "tests/embedder_vk_unittests.cc" ]
     }
   }
 
@@ -369,8 +416,8 @@ if (enable_unittests) {
       #"//flutter/testing:dart",
       #"//flutter/testing:skia",
       #"//flutter/third_party/tonic",
-      #"//third_party/dart/runtime/bin:elf_loader",
-      #"//third_party/skia",
+      #"$dart_src/runtime/bin:elf_loader",
+      #"//flutter/skia",
     ]
   }
 }
@@ -412,7 +459,7 @@ if (is_mac && !embedder_for_target) {
 
   copy("copy_icu") {
     visibility = [ ":*" ]
-    sources = [ "//third_party/icu/flutter/icudtl.dat" ]
+    sources = [ "//flutter/third_party/icu/flutter/icudtl.dat" ]
     outputs =
         [ "$_flutter_embedder_framework_dir/Versions/A/Resources/icudtl.dat" ]
   }
@@ -533,7 +580,8 @@ if (is_mac) {
 
 if (host_os == "linux" || host_os == "win") {
   zip_bundle("embedder-archive") {
-    output = "$full_platform_name/$full_platform_name-embedder.zip"
+    output =
+        "$full_target_platform_name/$full_target_platform_name-embedder.zip"
     deps = [
       "//flutter/shell/platform/embedder:copy_headers",
       "//flutter/shell/platform/embedder:flutter_engine_library",
diff --git a/shell/platform/embedder/embedder.cc b/shell/platform/embedder/embedder.cc
index 2161b4a8b8ae3e2297dd5f42162f3d98f2a87fd3..af8e259c83a03e3d5dc6a6458119b43338cefa25 100644
--- a/shell/platform/embedder/embedder.cc
+++ b/shell/platform/embedder/embedder.cc
@@ -19,6 +19,10 @@
 #include "flutter/fml/thread.h"
 #include "third_party/dart/runtime/bin/elf_loader.h"
 #include "third_party/dart/runtime/include/dart_native_api.h"
+#include "third_party/skia/include/core/SkSurface.h"
+#include "third_party/skia/include/gpu/GpuTypes.h"
+#include "third_party/skia/include/gpu/GrBackendSurface.h"
+#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
 
 #if !defined(FLUTTER_NO_EXPORT)
 #if FML_OS_WIN
@@ -52,6 +56,8 @@ extern const intptr_t kPlatformStrongDillSize;
 #include "flutter/shell/platform/embedder/embedder_external_texture_resolver.h"
 #include "flutter/shell/platform/embedder/embedder_platform_message_response.h"
 #include "flutter/shell/platform/embedder/embedder_render_target.h"
+#include "flutter/shell/platform/embedder/embedder_render_target_skia.h"
+#include "flutter/shell/platform/embedder/embedder_semantics_update.h"
 #include "flutter/shell/platform/embedder/embedder_struct_macros.h"
 #include "flutter/shell/platform/embedder/embedder_task_runner.h"
 #include "flutter/shell/platform/embedder/embedder_thread_host.h"
@@ -60,13 +66,38 @@ extern const intptr_t kPlatformStrongDillSize;
 #include "rapidjson/rapidjson.h"
 #include "rapidjson/writer.h"
 
+// Note: the IMPELLER_SUPPORTS_RENDERING may be defined even when the
+// embedder/BUILD.gn variable impeller_supports_rendering is disabled.
 #ifdef SHELL_ENABLE_GL
 #include "flutter/shell/platform/embedder/embedder_external_texture_gl.h"
-#endif
+#include "third_party/skia/include/gpu/ganesh/gl/GrGLBackendSurface.h"
+#include "third_party/skia/include/gpu/gl/GrGLTypes.h"
+#ifdef IMPELLER_SUPPORTS_RENDERING
+#include "flutter/shell/platform/embedder/embedder_render_target_impeller.h"  // nogncheck
+#include "flutter/shell/platform/embedder/embedder_surface_gl_impeller.h"  // nogncheck
+#include "impeller/core/texture.h"                        // nogncheck
+#include "impeller/renderer/backend/gles/context_gles.h"  // nogncheck
+#include "impeller/renderer/backend/gles/texture_gles.h"  // nogncheck
+#include "impeller/renderer/context.h"                    // nogncheck
+#include "impeller/renderer/render_target.h"              // nogncheck
+#endif  // IMPELLER_SUPPORTS_RENDERING
+#endif  // SHELL_ENABLE_GL
 
 #ifdef SHELL_ENABLE_METAL
 #include "flutter/shell/platform/embedder/embedder_surface_metal.h"
-#endif
+#include "third_party/skia/include/ports/SkCFObject.h"
+#ifdef IMPELLER_SUPPORTS_RENDERING
+#include "flutter/shell/platform/embedder/embedder_render_target_impeller.h"  // nogncheck
+#include "flutter/shell/platform/embedder/embedder_surface_metal_impeller.h"  // nogncheck
+#include "impeller/core/texture.h"                                // nogncheck
+#include "impeller/renderer/backend/metal/texture_wrapper_mtl.h"  // nogncheck
+#include "impeller/renderer/render_target.h"                      // nogncheck
+#endif  // IMPELLER_SUPPORTS_RENDERING
+#endif  // SHELL_ENABLE_METAL
+
+#ifdef SHELL_ENABLE_VULKAN
+#include "third_party/skia/include/gpu/ganesh/vk/GrVkBackendSurface.h"
+#endif  // SHELL_ENABLE_VULKAN
 
 #ifdef FML_OS_OHOS
 extern "C"{
@@ -89,6 +120,8 @@ int OH_LOG_Print(int type, HiLog_LogLevel level, unsigned int domain, const char
 const int32_t kFlutterSemanticsNodeIdBatchEnd = -1;
 const int32_t kFlutterSemanticsCustomActionIdBatchEnd = -1;
 
+static constexpr FlutterViewId kFlutterImplicitViewId = 0;
+
 // A message channel to send platform-independent FlutterKeyData to the
 // framework.
 //
@@ -278,7 +311,8 @@ InferOpenGLPlatformViewCreationCallback(
     const flutter::PlatformViewEmbedder::PlatformDispatchTable&
         platform_dispatch_table,
     std::unique_ptr<flutter::EmbedderExternalViewEmbedder>
-        external_view_embedder) {
+        external_view_embedder,
+    bool enable_impeller) {
 #ifdef SHELL_ENABLE_GL
   if (config->type != kOpenGL) {
     return nullptr;
@@ -303,22 +337,27 @@ InferOpenGLPlatformViewCreationCallback(
       // damage are always 1. Once the function that computes damage implements
       // support for multiple damage rectangles, GLPresentInfo should also
       // contain the number of damage rectangles.
-      const size_t num_rects = 1;
 
-      std::array<FlutterRect, num_rects> frame_damage_rect = {
-          SkIRectToFlutterRect(*(gl_present_info.frame_damage))};
-      std::array<FlutterRect, num_rects> buffer_damage_rect = {
-          SkIRectToFlutterRect(*(gl_present_info.buffer_damage))};
+      std::optional<FlutterRect> frame_damage_rect;
+      if (gl_present_info.frame_damage) {
+        frame_damage_rect =
+            SkIRectToFlutterRect(*(gl_present_info.frame_damage));
+      }
+      std::optional<FlutterRect> buffer_damage_rect;
+      if (gl_present_info.buffer_damage) {
+        buffer_damage_rect =
+            SkIRectToFlutterRect(*(gl_present_info.buffer_damage));
+      }
 
       FlutterDamage frame_damage{
           .struct_size = sizeof(FlutterDamage),
-          .num_rects = frame_damage_rect.size(),
-          .damage = frame_damage_rect.data(),
+          .num_rects = frame_damage_rect ? size_t{1} : size_t{0},
+          .damage = frame_damage_rect ? &frame_damage_rect.value() : nullptr,
       };
       FlutterDamage buffer_damage{
           .struct_size = sizeof(FlutterDamage),
-          .num_rects = buffer_damage_rect.size(),
-          .damage = buffer_damage_rect.data(),
+          .num_rects = buffer_damage_rect ? size_t{1} : size_t{0},
+          .damage = buffer_damage_rect ? &buffer_damage_rect.value() : nullptr,
       };
 
       // Construct the present information concerning the frame being rendered.
@@ -356,8 +395,7 @@ InferOpenGLPlatformViewCreationCallback(
     if (!populate_existing_damage) {
       return flutter::GLFBOInfo{
           .fbo_id = static_cast<uint32_t>(id),
-          .partial_repaint_enabled = false,
-          .existing_damage = SkIRect::MakeEmpty(),
+          .existing_damage = std::nullopt,
       };
     }
 
@@ -365,29 +403,22 @@ InferOpenGLPlatformViewCreationCallback(
     FlutterDamage existing_damage;
     populate_existing_damage(user_data, id, &existing_damage);
 
-    bool partial_repaint_enabled = true;
-    SkIRect existing_damage_rect;
+    std::optional<SkIRect> existing_damage_rect = std::nullopt;
 
     // Verify that at least one damage rectangle was provided.
     if (existing_damage.num_rects <= 0 || existing_damage.damage == nullptr) {
       FML_LOG(INFO) << "No damage was provided. Forcing full repaint.";
-      existing_damage_rect = SkIRect::MakeEmpty();
-      partial_repaint_enabled = false;
-    } else if (existing_damage.num_rects > 1) {
-      // Log message notifying users that multi-damage is not yet available in
-      // case they try to make use of it.
-      FML_LOG(INFO) << "Damage with multiple rectangles not yet supported. "
-                       "Repainting the whole frame.";
-      existing_damage_rect = SkIRect::MakeEmpty();
-      partial_repaint_enabled = false;
     } else {
-      existing_damage_rect = FlutterRectToSkIRect(*(existing_damage.damage));
+      existing_damage_rect = SkIRect::MakeEmpty();
+      for (size_t i = 0; i < existing_damage.num_rects; i++) {
+        existing_damage_rect->join(
+            FlutterRectToSkIRect(existing_damage.damage[i]));
+      }
     }
 
     // Pass the information about this FBO to the rendering backend.
     return flutter::GLFBOInfo{
         .fbo_id = static_cast<uint32_t>(id),
-        .partial_repaint_enabled = partial_repaint_enabled,
         .existing_damage = existing_damage_rect,
     };
   };
@@ -454,15 +485,30 @@ InferOpenGLPlatformViewCreationCallback(
 
   return fml::MakeCopyable(
       [gl_dispatch_table, fbo_reset_after_present, platform_dispatch_table,
+       enable_impeller,
        external_view_embedder =
            std::move(external_view_embedder)](flutter::Shell& shell) mutable {
+        std::shared_ptr<flutter::EmbedderExternalViewEmbedder> view_embedder =
+            std::move(external_view_embedder);
+        if (enable_impeller) {
+          return std::make_unique<flutter::PlatformViewEmbedder>(
+              shell,                   // delegate
+              shell.GetTaskRunners(),  // task runners
+              std::make_unique<flutter::EmbedderSurfaceGLImpeller>(
+                  gl_dispatch_table, fbo_reset_after_present,
+                  view_embedder),       // embedder_surface
+              platform_dispatch_table,  // embedder platform dispatch table
+              view_embedder             // external view embedder
+          );
+        }
         return std::make_unique<flutter::PlatformViewEmbedder>(
-            shell,                    // delegate
-            shell.GetTaskRunners(),   // task runners
-            gl_dispatch_table,        // embedder GL dispatch table
-            fbo_reset_after_present,  // fbo reset after present
+            shell,                   // delegate
+            shell.GetTaskRunners(),  // task runners
+            std::make_unique<flutter::EmbedderSurfaceGL>(
+                gl_dispatch_table, fbo_reset_after_present,
+                view_embedder),       // embedder_surface
             platform_dispatch_table,  // embedder platform dispatch table
-            std::move(external_view_embedder)  // external view embedder
+            view_embedder             // external view embedder
         );
       });
 #else
@@ -477,7 +523,8 @@ InferMetalPlatformViewCreationCallback(
     const flutter::PlatformViewEmbedder::PlatformDispatchTable&
         platform_dispatch_table,
     std::unique_ptr<flutter::EmbedderExternalViewEmbedder>
-        external_view_embedder) {
+        external_view_embedder,
+    bool enable_impeller) {
   if (config->type != kMetal) {
     return nullptr;
   }
@@ -490,6 +537,8 @@ InferMetalPlatformViewCreationCallback(
         embedder_texture.struct_size = sizeof(FlutterMetalTexture);
         embedder_texture.texture = texture.texture;
         embedder_texture.texture_id = texture.texture_id;
+        embedder_texture.user_data = texture.destruction_context;
+        embedder_texture.destruction_callback = texture.destruction_callback;
         return ptr(user_data, &embedder_texture);
       };
   auto metal_get_texture =
@@ -504,23 +553,38 @@ InferMetalPlatformViewCreationCallback(
     FlutterMetalTexture metal_texture = ptr(user_data, &frame_info);
     texture_info.texture_id = metal_texture.texture_id;
     texture_info.texture = metal_texture.texture;
+    texture_info.destruction_callback = metal_texture.destruction_callback;
+    texture_info.destruction_context = metal_texture.user_data;
     return texture_info;
   };
 
-  flutter::EmbedderSurfaceMetal::MetalDispatchTable metal_dispatch_table = {
-      .present = metal_present,
-      .get_texture = metal_get_texture,
-  };
-
   std::shared_ptr<flutter::EmbedderExternalViewEmbedder> view_embedder =
       std::move(external_view_embedder);
 
-  std::unique_ptr<flutter::EmbedderSurfaceMetal> embedder_surface =
-      std::make_unique<flutter::EmbedderSurfaceMetal>(
-          const_cast<flutter::GPUMTLDeviceHandle>(config->metal.device),
-          const_cast<flutter::GPUMTLCommandQueueHandle>(
-              config->metal.present_command_queue),
-          metal_dispatch_table, view_embedder);
+  std::unique_ptr<flutter::EmbedderSurface> embedder_surface;
+
+  if (enable_impeller) {
+    flutter::EmbedderSurfaceMetalImpeller::MetalDispatchTable
+        metal_dispatch_table = {
+            .present = metal_present,
+            .get_texture = metal_get_texture,
+        };
+    embedder_surface = std::make_unique<flutter::EmbedderSurfaceMetalImpeller>(
+        const_cast<flutter::GPUMTLDeviceHandle>(config->metal.device),
+        const_cast<flutter::GPUMTLCommandQueueHandle>(
+            config->metal.present_command_queue),
+        metal_dispatch_table, view_embedder);
+  } else {
+    flutter::EmbedderSurfaceMetal::MetalDispatchTable metal_dispatch_table = {
+        .present = metal_present,
+        .get_texture = metal_get_texture,
+    };
+    embedder_surface = std::make_unique<flutter::EmbedderSurfaceMetal>(
+        const_cast<flutter::GPUMTLDeviceHandle>(config->metal.device),
+        const_cast<flutter::GPUMTLCommandQueueHandle>(
+            config->metal.present_command_queue),
+        metal_dispatch_table, view_embedder);
+  }
 
   // The static leak checker gets confused by the use of fml::MakeCopyable.
   // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks)
@@ -585,7 +649,7 @@ InferVulkanPlatformViewCreationCallback(
 
   auto vk_instance = static_cast<VkInstance>(config->vulkan.instance);
   auto proc_addr =
-      vulkan_get_instance_proc_address(vk_instance, "GetInstanceProcAddr");
+      vulkan_get_instance_proc_address(vk_instance, "vkGetInstanceProcAddr");
 
   flutter::EmbedderSurfaceVulkan::VulkanDispatchTable vulkan_dispatch_table = {
       .get_instance_proc_address =
@@ -671,7 +735,8 @@ InferPlatformViewCreationCallback(
     const flutter::PlatformViewEmbedder::PlatformDispatchTable&
         platform_dispatch_table,
     std::unique_ptr<flutter::EmbedderExternalViewEmbedder>
-        external_view_embedder) {
+        external_view_embedder,
+    bool enable_impeller) {
   if (config == nullptr) {
     return nullptr;
   }
@@ -680,7 +745,7 @@ InferPlatformViewCreationCallback(
     case kOpenGL:
       return InferOpenGLPlatformViewCreationCallback(
           config, user_data, platform_dispatch_table,
-          std::move(external_view_embedder));
+          std::move(external_view_embedder), enable_impeller);
     case kSoftware:
       return InferSoftwarePlatformViewCreationCallback(
           config, user_data, platform_dispatch_table,
@@ -688,7 +753,7 @@ InferPlatformViewCreationCallback(
     case kMetal:
       return InferMetalPlatformViewCreationCallback(
           config, user_data, platform_dispatch_table,
-          std::move(external_view_embedder));
+          std::move(external_view_embedder), enable_impeller);
     case kVulkan:
       return InferVulkanPlatformViewCreationCallback(
           config, user_data, platform_dispatch_table,
@@ -709,15 +774,15 @@ static sk_sp<SkSurface> MakeSkSurfaceFromBackingStore(
   texture_info.fID = texture->name;
   texture_info.fFormat = texture->format;
 
-  GrBackendTexture backend_texture(config.size.width,   //
-                                   config.size.height,  //
-                                   GrMipMapped::kNo,    //
-                                   texture_info         //
+  auto backend_texture = GrBackendTextures::MakeGL(config.size.width,      //
+                                                   config.size.height,     //
+                                                   skgpu::Mipmapped::kNo,  //
+                                                   texture_info            //
   );
 
   SkSurfaceProps surface_properties(0, kUnknown_SkPixelGeometry);
 
-  auto surface = SkSurface::MakeFromBackendTexture(
+  auto surface = SkSurfaces::WrapBackendTexture(
       context,                      // context
       backend_texture,              // back-end texture
       kBottomLeft_GrSurfaceOrigin,  // surface origin
@@ -725,7 +790,7 @@ static sk_sp<SkSurface> MakeSkSurfaceFromBackingStore(
       kN32_SkColorType,             // color type
       SkColorSpace::MakeSRGB(),     // color space
       &surface_properties,          // surface properties
-      static_cast<SkSurface::TextureReleaseProc>(
+      static_cast<SkSurfaces::TextureReleaseProc>(
           texture->destruction_callback),  // release proc
       texture->user_data                   // release context
   );
@@ -750,24 +815,24 @@ static sk_sp<SkSurface> MakeSkSurfaceFromBackingStore(
   framebuffer_info.fFormat = framebuffer->target;
   framebuffer_info.fFBOID = framebuffer->name;
 
-  GrBackendRenderTarget backend_render_target(
-      config.size.width,   // width
-      config.size.height,  // height
-      1,                   // sample count
-      0,                   // stencil bits
-      framebuffer_info     // framebuffer info
-  );
+  auto backend_render_target =
+      GrBackendRenderTargets::MakeGL(config.size.width,   // width
+                                     config.size.height,  // height
+                                     1,                   // sample count
+                                     0,                   // stencil bits
+                                     framebuffer_info     // framebuffer info
+      );
 
   SkSurfaceProps surface_properties(0, kUnknown_SkPixelGeometry);
 
-  auto surface = SkSurface::MakeFromBackendRenderTarget(
+  auto surface = SkSurfaces::WrapBackendRenderTarget(
       context,                      //  context
       backend_render_target,        // backend render target
       kBottomLeft_GrSurfaceOrigin,  // surface origin
       kN32_SkColorType,             // color type
       SkColorSpace::MakeSRGB(),     // color space
       &surface_properties,          // surface properties
-      static_cast<SkSurface::RenderTargetReleaseProc>(
+      static_cast<SkSurfaces::RenderTargetReleaseProc>(
           framebuffer->destruction_callback),  // release proc
       framebuffer->user_data                   // release context
   );
@@ -804,13 +869,13 @@ static sk_sp<SkSurface> MakeSkSurfaceFromBackingStore(
     delete captures;
   };
 
-  auto surface = SkSurface::MakeRasterDirectReleaseProc(
-      image_info,                               // image info
-      const_cast<void*>(software->allocation),  // pixels
-      software->row_bytes,                      // row bytes
-      release_proc,                             // release proc
-      captures.get()                            // get context
-  );
+  auto surface =
+      SkSurfaces::WrapPixels(image_info,  // image info
+                             const_cast<void*>(software->allocation),  // pixels
+                             software->row_bytes,  // row bytes
+                             release_proc,         // release proc
+                             captures.get()        // get context
+      );
 
   if (!surface) {
     FML_LOG(ERROR)
@@ -852,13 +917,13 @@ static sk_sp<SkSurface> MakeSkSurfaceFromBackingStore(
     }
   };
 
-  auto surface = SkSurface::MakeRasterDirectReleaseProc(
-      image_info,                               // image info
-      const_cast<void*>(software->allocation),  // pixels
-      software->row_bytes,                      // row bytes
-      release_proc,                             // release proc
-      captures.release()                        // release context
-  );
+  auto surface =
+      SkSurfaces::WrapPixels(image_info,  // image info
+                             const_cast<void*>(software->allocation),  // pixels
+                             software->row_bytes,  // row bytes
+                             release_proc,         // release proc
+                             captures.release()    // release context
+      );
 
   if (!surface) {
     FML_LOG(ERROR)
@@ -884,15 +949,15 @@ static sk_sp<SkSurface> MakeSkSurfaceFromBackingStore(
   sk_cfp<FlutterMetalTextureHandle> mtl_texture;
   mtl_texture.retain(metal->texture.texture);
   texture_info.fTexture = mtl_texture;
-  GrBackendTexture backend_texture(config.size.width,   //
-                                   config.size.height,  //
-                                   GrMipMapped::kNo,    //
-                                   texture_info         //
+  GrBackendTexture backend_texture(config.size.width,      //
+                                   config.size.height,     //
+                                   skgpu::Mipmapped::kNo,  //
+                                   texture_info            //
   );
 
   SkSurfaceProps surface_properties(0, kUnknown_SkPixelGeometry);
 
-  auto surface = SkSurface::MakeFromBackendTexture(
+  auto surface = SkSurfaces::WrapBackendTexture(
       context,                   // context
       backend_texture,           // back-end texture
       kTopLeft_GrSurfaceOrigin,  // surface origin
@@ -902,7 +967,7 @@ static sk_sp<SkSurface> MakeSkSurfaceFromBackingStore(
       kBGRA_8888_SkColorType,  // color type
       nullptr,                 // color space
       &surface_properties,     // surface properties
-      static_cast<SkSurface::TextureReleaseProc>(
+      static_cast<SkSurfaces::TextureReleaseProc>(
           metal->texture.destruction_callback),  // release proc
       metal->texture.user_data                   // release context
   );
@@ -918,6 +983,147 @@ static sk_sp<SkSurface> MakeSkSurfaceFromBackingStore(
 #endif
 }
 
+static std::unique_ptr<flutter::EmbedderRenderTarget>
+MakeRenderTargetFromBackingStoreImpeller(
+    FlutterBackingStore backing_store,
+    const fml::closure& on_release,
+    const std::shared_ptr<impeller::AiksContext>& aiks_context,
+    const FlutterBackingStoreConfig& config,
+    const FlutterOpenGLFramebuffer* framebuffer) {
+#if defined(SHELL_ENABLE_GL) && defined(IMPELLER_SUPPORTS_RENDERING)
+
+  const auto& gl_context =
+      impeller::ContextGLES::Cast(*aiks_context->GetContext());
+  const auto size = impeller::ISize(config.size.width, config.size.height);
+
+  impeller::TextureDescriptor color0_tex;
+  color0_tex.type = impeller::TextureType::kTexture2D;
+  color0_tex.format = impeller::PixelFormat::kR8G8B8A8UNormInt;
+  color0_tex.size = size;
+  color0_tex.usage = static_cast<impeller::TextureUsageMask>(
+      impeller::TextureUsage::kRenderTarget);
+  color0_tex.sample_count = impeller::SampleCount::kCount1;
+  color0_tex.storage_mode = impeller::StorageMode::kDevicePrivate;
+
+  impeller::ColorAttachment color0;
+  color0.texture = std::make_shared<impeller::TextureGLES>(
+      gl_context.GetReactor(), color0_tex,
+      impeller::TextureGLES::IsWrapped::kWrapped);
+  color0.clear_color = impeller::Color::DarkSlateGray();
+  color0.load_action = impeller::LoadAction::kClear;
+  color0.store_action = impeller::StoreAction::kStore;
+
+  impeller::TextureDescriptor depth_stencil_texture_desc;
+  depth_stencil_texture_desc.type = impeller::TextureType::kTexture2D;
+  depth_stencil_texture_desc.format = impeller::PixelFormat::kR8G8B8A8UNormInt;
+  depth_stencil_texture_desc.size = size;
+  depth_stencil_texture_desc.usage = static_cast<impeller::TextureUsageMask>(
+      impeller::TextureUsage::kRenderTarget);
+  depth_stencil_texture_desc.sample_count = impeller::SampleCount::kCount1;
+
+  auto depth_stencil_tex = std::make_shared<impeller::TextureGLES>(
+      gl_context.GetReactor(), depth_stencil_texture_desc,
+      impeller::TextureGLES::IsWrapped::kWrapped);
+
+  impeller::DepthAttachment depth0;
+  depth0.clear_depth = 0;
+  depth0.texture = depth_stencil_tex;
+  depth0.load_action = impeller::LoadAction::kClear;
+  depth0.store_action = impeller::StoreAction::kDontCare;
+
+  impeller::StencilAttachment stencil0;
+  stencil0.clear_stencil = 0;
+  stencil0.texture = depth_stencil_tex;
+  stencil0.load_action = impeller::LoadAction::kClear;
+  stencil0.store_action = impeller::StoreAction::kDontCare;
+
+  impeller::RenderTarget render_target_desc;
+
+  render_target_desc.SetColorAttachment(color0, 0u);
+  render_target_desc.SetDepthAttachment(depth0);
+  render_target_desc.SetStencilAttachment(stencil0);
+
+  fml::closure framebuffer_destruct =
+      [callback = framebuffer->destruction_callback,
+       user_data = framebuffer->user_data]() { callback(user_data); };
+
+  return std::make_unique<flutter::EmbedderRenderTargetImpeller>(
+      backing_store, aiks_context,
+      std::make_unique<impeller::RenderTarget>(std::move(render_target_desc)),
+      on_release, framebuffer_destruct);
+#else
+  return nullptr;
+#endif
+}
+
+static std::unique_ptr<flutter::EmbedderRenderTarget>
+MakeRenderTargetFromBackingStoreImpeller(
+    FlutterBackingStore backing_store,
+    const fml::closure& on_release,
+    const std::shared_ptr<impeller::AiksContext>& aiks_context,
+    const FlutterBackingStoreConfig& config,
+    const FlutterMetalBackingStore* metal) {
+#if defined(SHELL_ENABLE_METAL) && defined(IMPELLER_SUPPORTS_RENDERING)
+  if (!metal->texture.texture) {
+    FML_LOG(ERROR) << "Embedder supplied null Metal texture.";
+    return nullptr;
+  }
+
+  const auto size = impeller::ISize(config.size.width, config.size.height);
+
+  impeller::TextureDescriptor resolve_tex_desc;
+  resolve_tex_desc.size = size;
+  resolve_tex_desc.sample_count = impeller::SampleCount::kCount1;
+  resolve_tex_desc.storage_mode = impeller::StorageMode::kDevicePrivate;
+  resolve_tex_desc.usage = impeller::TextureUsage::kRenderTarget |
+                           impeller::TextureUsage::kShaderRead;
+
+  auto resolve_tex = impeller::WrapTextureMTL(
+      resolve_tex_desc, metal->texture.texture,
+      [callback = metal->texture.destruction_callback,
+       user_data = metal->texture.user_data]() { callback(user_data); });
+  if (!resolve_tex) {
+    FML_LOG(ERROR) << "Could not wrap embedder supplied Metal render texture.";
+    return nullptr;
+  }
+  resolve_tex->SetLabel("ImpellerBackingStoreResolve");
+
+  impeller::TextureDescriptor msaa_tex_desc;
+  msaa_tex_desc.storage_mode = impeller::StorageMode::kDeviceTransient;
+  msaa_tex_desc.type = impeller::TextureType::kTexture2DMultisample;
+  msaa_tex_desc.sample_count = impeller::SampleCount::kCount4;
+  msaa_tex_desc.format = resolve_tex->GetTextureDescriptor().format;
+  msaa_tex_desc.size = size;
+  msaa_tex_desc.usage = impeller::TextureUsage::kRenderTarget;
+
+  auto msaa_tex =
+      aiks_context->GetContext()->GetResourceAllocator()->CreateTexture(
+          msaa_tex_desc);
+  if (!msaa_tex) {
+    FML_LOG(ERROR) << "Could not allocate MSAA color texture.";
+    return nullptr;
+  }
+  msaa_tex->SetLabel("ImpellerBackingStoreColorMSAA");
+
+  impeller::ColorAttachment color0;
+  color0.texture = msaa_tex;
+  color0.clear_color = impeller::Color::DarkSlateGray();
+  color0.load_action = impeller::LoadAction::kClear;
+  color0.store_action = impeller::StoreAction::kMultisampleResolve;
+  color0.resolve_texture = resolve_tex;
+
+  impeller::RenderTarget render_target_desc;
+  render_target_desc.SetColorAttachment(color0, 0u);
+
+  return std::make_unique<flutter::EmbedderRenderTargetImpeller>(
+      backing_store, aiks_context,
+      std::make_unique<impeller::RenderTarget>(std::move(render_target_desc)),
+      on_release, fml::closure());
+#else
+  return nullptr;
+#endif
+}
+
 static sk_sp<SkSurface> MakeSkSurfaceFromBackingStore(
     GrDirectContext* context,
     const FlutterBackingStoreConfig& config,
@@ -939,14 +1145,12 @@ static sk_sp<SkSurface> MakeSkSurfaceFromBackingStore(
       .fSampleCount = 1,
       .fLevelCount = 1,
   };
-  GrBackendTexture backend_texture(config.size.width,   //
-                                   config.size.height,  //
-                                   image_info           //
-  );
+  auto backend_texture = GrBackendTextures::MakeVk(
+      config.size.width, config.size.height, image_info);
 
   SkSurfaceProps surface_properties(0, kUnknown_SkPixelGeometry);
 
-  auto surface = SkSurface::MakeFromBackendTexture(
+  auto surface = SkSurfaces::WrapBackendTexture(
       context,                   // context
       backend_texture,           // back-end texture
       kTopLeft_GrSurfaceOrigin,  // surface origin
@@ -955,7 +1159,7 @@ static sk_sp<SkSurface> MakeSkSurfaceFromBackingStore(
           static_cast<VkFormat>(vulkan->image->format)),  // color type
       SkColorSpace::MakeSRGB(),                           // color space
       &surface_properties,                                // surface properties
-      static_cast<SkSurface::TextureReleaseProc>(
+      static_cast<SkSurfaces::TextureReleaseProc>(
           vulkan->destruction_callback),  // release proc
       vulkan->user_data                   // release context
   );
@@ -972,9 +1176,23 @@ static sk_sp<SkSurface> MakeSkSurfaceFromBackingStore(
 }
 
 static std::unique_ptr<flutter::EmbedderRenderTarget>
-CreateEmbedderRenderTarget(const FlutterCompositor* compositor,
-                           const FlutterBackingStoreConfig& config,
-                           GrDirectContext* context) {
+MakeRenderTargetFromSkSurface(FlutterBackingStore backing_store,
+                              sk_sp<SkSurface> skia_surface,
+                              fml::closure on_release) {
+  if (!skia_surface) {
+    return nullptr;
+  }
+  return std::make_unique<flutter::EmbedderRenderTargetSkia>(
+      backing_store, std::move(skia_surface), std::move(on_release));
+}
+
+static std::unique_ptr<flutter::EmbedderRenderTarget>
+CreateEmbedderRenderTarget(
+    const FlutterCompositor* compositor,
+    const FlutterBackingStoreConfig& config,
+    GrDirectContext* context,
+    const std::shared_ptr<impeller::AiksContext>& aiks_context,
+    bool enable_impeller) {
   FlutterBackingStore backing_store = {};
   backing_store.struct_size = sizeof(backing_store);
 
@@ -1009,53 +1227,84 @@ CreateEmbedderRenderTarget(const FlutterCompositor* compositor,
   // No safe access checks on the renderer are necessary since we allocated
   // the struct.
 
-  sk_sp<SkSurface> render_surface;
+  std::unique_ptr<flutter::EmbedderRenderTarget> render_target;
 
   switch (backing_store.type) {
-    case kFlutterBackingStoreTypeOpenGL:
+    case kFlutterBackingStoreTypeOpenGL: {
       switch (backing_store.open_gl.type) {
-        case kFlutterOpenGLTargetTypeTexture:
-          render_surface = MakeSkSurfaceFromBackingStore(
+        case kFlutterOpenGLTargetTypeTexture: {
+          auto skia_surface = MakeSkSurfaceFromBackingStore(
               context, config, &backing_store.open_gl.texture);
+          render_target = MakeRenderTargetFromSkSurface(
+              backing_store, std::move(skia_surface),
+              collect_callback.Release());
           break;
-        case kFlutterOpenGLTargetTypeFramebuffer:
-          render_surface = MakeSkSurfaceFromBackingStore(
-              context, config, &backing_store.open_gl.framebuffer);
-          break;
+        }
+        case kFlutterOpenGLTargetTypeFramebuffer: {
+          if (enable_impeller) {
+            render_target = MakeRenderTargetFromBackingStoreImpeller(
+                backing_store, collect_callback.Release(), aiks_context, config,
+                &backing_store.open_gl.framebuffer);
+            break;
+          } else {
+            auto skia_surface = MakeSkSurfaceFromBackingStore(
+                context, config, &backing_store.open_gl.framebuffer);
+            render_target = MakeRenderTargetFromSkSurface(
+                backing_store, std::move(skia_surface),
+                collect_callback.Release());
+            break;
+          }
+        }
       }
       break;
-    case kFlutterBackingStoreTypeSoftware:
-      render_surface = MakeSkSurfaceFromBackingStore(context, config,
-                                                     &backing_store.software);
+    }
+    case kFlutterBackingStoreTypeSoftware: {
+      auto skia_surface = MakeSkSurfaceFromBackingStore(
+          context, config, &backing_store.software);
+      render_target = MakeRenderTargetFromSkSurface(
+          backing_store, std::move(skia_surface), collect_callback.Release());
       break;
-    case kFlutterBackingStoreTypeSoftware2:
-      render_surface = MakeSkSurfaceFromBackingStore(context, config,
-                                                     &backing_store.software2);
+    }
+    case kFlutterBackingStoreTypeSoftware2: {
+      auto skia_surface = MakeSkSurfaceFromBackingStore(
+          context, config, &backing_store.software2);
+      render_target = MakeRenderTargetFromSkSurface(
+          backing_store, std::move(skia_surface), collect_callback.Release());
       break;
-    case kFlutterBackingStoreTypeMetal:
-      render_surface =
-          MakeSkSurfaceFromBackingStore(context, config, &backing_store.metal);
+    }
+    case kFlutterBackingStoreTypeMetal: {
+      if (enable_impeller) {
+        render_target = MakeRenderTargetFromBackingStoreImpeller(
+            backing_store, collect_callback.Release(), aiks_context, config,
+            &backing_store.metal);
+      } else {
+        auto skia_surface = MakeSkSurfaceFromBackingStore(context, config,
+                                                          &backing_store.metal);
+        render_target = MakeRenderTargetFromSkSurface(
+            backing_store, std::move(skia_surface), collect_callback.Release());
+      }
       break;
-
-    case kFlutterBackingStoreTypeVulkan:
-      render_surface =
+    }
+    case kFlutterBackingStoreTypeVulkan: {
+      auto skia_surface =
           MakeSkSurfaceFromBackingStore(context, config, &backing_store.vulkan);
+      render_target = MakeRenderTargetFromSkSurface(
+          backing_store, std::move(skia_surface), collect_callback.Release());
       break;
+    }
   };
 
-  if (!render_surface) {
+  if (!render_target) {
     FML_LOG(ERROR) << "Could not create a surface from an embedder provided "
                       "render target.";
-    return nullptr;
   }
-
-  return std::make_unique<flutter::EmbedderRenderTarget>(
-      backing_store, std::move(render_surface), collect_callback.Release());
+  return render_target;
 }
 
 static std::pair<std::unique_ptr<flutter::EmbedderExternalViewEmbedder>,
                  bool /* halt engine launch if true */>
-InferExternalViewEmbedderFromArgs(const FlutterCompositor* compositor) {
+InferExternalViewEmbedderFromArgs(const FlutterCompositor* compositor,
+                                  bool enable_impeller) {
   if (compositor == nullptr) {
     return {nullptr, false};
   }
@@ -1066,39 +1315,115 @@ InferExternalViewEmbedderFromArgs(const FlutterCompositor* compositor) {
       SAFE_ACCESS(compositor, collect_backing_store_callback, nullptr);
   auto c_present_callback =
       SAFE_ACCESS(compositor, present_layers_callback, nullptr);
+  auto c_present_view_callback =
+      SAFE_ACCESS(compositor, present_view_callback, nullptr);
   bool avoid_backing_store_cache =
       SAFE_ACCESS(compositor, avoid_backing_store_cache, false);
 
   // Make sure the required callbacks are present
-  if (!c_create_callback || !c_collect_callback || !c_present_callback) {
+  if (!c_create_callback || !c_collect_callback) {
     FML_LOG(ERROR) << "Required compositor callbacks absent.";
     return {nullptr, true};
   }
+  // Either the present view or the present layers callback must be provided.
+  if ((!c_present_view_callback && !c_present_callback) ||
+      (c_present_view_callback && c_present_callback)) {
+    FML_LOG(ERROR) << "Either present_layers_callback or present_view_callback "
+                      "must be provided but not both.";
+    return {nullptr, true};
+  }
 
   FlutterCompositor captured_compositor = *compositor;
 
   flutter::EmbedderExternalViewEmbedder::CreateRenderTargetCallback
       create_render_target_callback =
-          [captured_compositor](GrDirectContext* context, const auto& config) {
+          [captured_compositor, enable_impeller](
+              GrDirectContext* context,
+              const std::shared_ptr<impeller::AiksContext>& aiks_context,
+              const auto& config) {
             return CreateEmbedderRenderTarget(&captured_compositor, config,
-                                              context);
+                                              context, aiks_context,
+                                              enable_impeller);
           };
 
-  flutter::EmbedderExternalViewEmbedder::PresentCallback present_callback =
-      [c_present_callback,
-       user_data = compositor->user_data](const auto& layers) {
-        TRACE_EVENT0("flutter", "FlutterCompositorPresentLayers");
-        return c_present_callback(
-            const_cast<const FlutterLayer**>(layers.data()), layers.size(),
-            user_data);
+  flutter::EmbedderExternalViewEmbedder::PresentCallback present_callback;
+  if (c_present_callback) {
+    present_callback = [c_present_callback, user_data = compositor->user_data](
+                           FlutterViewId view_id, const auto& layers) {
+      TRACE_EVENT0("flutter", "FlutterCompositorPresentLayers");
+      return c_present_callback(const_cast<const FlutterLayer**>(layers.data()),
+                                layers.size(), user_data);
+    };
+  } else {
+    FML_DCHECK(c_present_view_callback != nullptr);
+    present_callback = [c_present_view_callback,
+                        user_data = compositor->user_data](
+                           FlutterViewId view_id, const auto& layers) {
+      TRACE_EVENT0("flutter", "FlutterCompositorPresentLayers");
+
+      FlutterPresentViewInfo info = {
+          .struct_size = sizeof(FlutterPresentViewInfo),
+          .view_id = view_id,
+          .layers = const_cast<const FlutterLayer**>(layers.data()),
+          .layers_count = layers.size(),
+          .user_data = user_data,
       };
 
+      return c_present_view_callback(&info);
+    };
+  }
+
   return {std::make_unique<flutter::EmbedderExternalViewEmbedder>(
               avoid_backing_store_cache, create_render_target_callback,
               present_callback),
           false};
 }
 
+// Translates embedder metrics to engine metrics, or returns a string on error.
+static std::variant<flutter::ViewportMetrics, std::string>
+MakeViewportMetricsFromWindowMetrics(
+    const FlutterWindowMetricsEvent* flutter_metrics) {
+  if (flutter_metrics == nullptr) {
+    return "Invalid metrics handle.";
+  }
+
+  flutter::ViewportMetrics metrics;
+
+  metrics.physical_width = SAFE_ACCESS(flutter_metrics, width, 0.0);
+  metrics.physical_height = SAFE_ACCESS(flutter_metrics, height, 0.0);
+  metrics.device_pixel_ratio = SAFE_ACCESS(flutter_metrics, pixel_ratio, 1.0);
+  metrics.physical_view_inset_top =
+      SAFE_ACCESS(flutter_metrics, physical_view_inset_top, 0.0);
+  metrics.physical_view_inset_right =
+      SAFE_ACCESS(flutter_metrics, physical_view_inset_right, 0.0);
+  metrics.physical_view_inset_bottom =
+      SAFE_ACCESS(flutter_metrics, physical_view_inset_bottom, 0.0);
+  metrics.physical_view_inset_left =
+      SAFE_ACCESS(flutter_metrics, physical_view_inset_left, 0.0);
+  metrics.display_id = SAFE_ACCESS(flutter_metrics, display_id, 0);
+
+  if (metrics.device_pixel_ratio <= 0.0) {
+    return "Device pixel ratio was invalid. It must be greater than zero.";
+  }
+
+  if (metrics.physical_view_inset_top < 0 ||
+      metrics.physical_view_inset_right < 0 ||
+      metrics.physical_view_inset_bottom < 0 ||
+      metrics.physical_view_inset_left < 0) {
+    return "Physical view insets are invalid. They must be non-negative.";
+  }
+
+  if (metrics.physical_view_inset_top > metrics.physical_height ||
+      metrics.physical_view_inset_right > metrics.physical_width ||
+      metrics.physical_view_inset_bottom > metrics.physical_height ||
+      metrics.physical_view_inset_left > metrics.physical_width) {
+    return "Physical view insets are invalid. They cannot be greater than "
+           "physical height or width.";
+  }
+
+  return metrics;
+}
+
 struct _FlutterPlatformMessageResponseHandle {
   std::unique_ptr<flutter::PlatformMessage> message;
 };
@@ -1280,99 +1605,11 @@ void PopulateAOTSnapshotMappingCallbacks(
   }
 }
 
-// Translates engine semantic nodes to embedder semantic nodes.
-FlutterSemanticsNode CreateEmbedderSemanticsNode(
-    const flutter::SemanticsNode& node) {
-  SkMatrix transform = node.transform.asM33();
-  FlutterTransformation flutter_transform{
-      transform.get(SkMatrix::kMScaleX), transform.get(SkMatrix::kMSkewX),
-      transform.get(SkMatrix::kMTransX), transform.get(SkMatrix::kMSkewY),
-      transform.get(SkMatrix::kMScaleY), transform.get(SkMatrix::kMTransY),
-      transform.get(SkMatrix::kMPersp0), transform.get(SkMatrix::kMPersp1),
-      transform.get(SkMatrix::kMPersp2)};
-  return {
-      sizeof(FlutterSemanticsNode),
-      node.id,
-      static_cast<FlutterSemanticsFlag>(node.flags),
-      static_cast<FlutterSemanticsAction>(node.actions),
-      node.textSelectionBase,
-      node.textSelectionExtent,
-      node.scrollChildren,
-      node.scrollIndex,
-      node.scrollPosition,
-      node.scrollExtentMax,
-      node.scrollExtentMin,
-      node.elevation,
-      node.thickness,
-      node.label.c_str(),
-      node.hint.c_str(),
-      node.value.c_str(),
-      node.increasedValue.c_str(),
-      node.decreasedValue.c_str(),
-      static_cast<FlutterTextDirection>(node.textDirection),
-      FlutterRect{node.rect.fLeft, node.rect.fTop, node.rect.fRight,
-                  node.rect.fBottom},
-      flutter_transform,
-      node.childrenInTraversalOrder.size(),
-      node.childrenInTraversalOrder.data(),
-      node.childrenInHitTestOrder.data(),
-      node.customAccessibilityActions.size(),
-      node.customAccessibilityActions.data(),
-      node.platformViewId,
-      node.tooltip.c_str(),
-  };
-}
-
-// Translates engine semantic custom actions to embedder semantic custom
-// actions.
-FlutterSemanticsCustomAction CreateEmbedderSemanticsCustomAction(
-    const flutter::CustomAccessibilityAction& action) {
-  return {
-      sizeof(FlutterSemanticsCustomAction),
-      action.id,
-      static_cast<FlutterSemanticsAction>(action.overrideId),
-      action.label.c_str(),
-      action.hint.c_str(),
-  };
-}
-
-// Create a callback to notify the embedder of semantic updates
-// using the new embedder callback 'update_semantics_callback'.
-flutter::PlatformViewEmbedder::UpdateSemanticsCallback
-CreateNewEmbedderSemanticsUpdateCallback(
-    FlutterUpdateSemanticsCallback update_semantics_callback,
-    void* user_data) {
-  return [update_semantics_callback, user_data](
-             const flutter::SemanticsNodeUpdates& nodes,
-             const flutter::CustomAccessibilityActionUpdates& actions) {
-    std::vector<FlutterSemanticsNode> embedder_nodes;
-    for (const auto& value : nodes) {
-      embedder_nodes.push_back(CreateEmbedderSemanticsNode(value.second));
-    }
-
-    std::vector<FlutterSemanticsCustomAction> embedder_custom_actions;
-    for (const auto& value : actions) {
-      embedder_custom_actions.push_back(
-          CreateEmbedderSemanticsCustomAction(value.second));
-    }
-
-    FlutterSemanticsUpdate update{
-        .struct_size = sizeof(FlutterSemanticsUpdate),
-        .nodes_count = embedder_nodes.size(),
-        .nodes = embedder_nodes.data(),
-        .custom_actions_count = embedder_custom_actions.size(),
-        .custom_actions = embedder_custom_actions.data(),
-    };
-
-    update_semantics_callback(&update, user_data);
-  };
-}
-
 // Create a callback to notify the embedder of semantic updates
 // using the legacy embedder callbacks 'update_semantics_node_callback' and
 // 'update_semantics_custom_action_callback'.
 flutter::PlatformViewEmbedder::UpdateSemanticsCallback
-CreateLegacyEmbedderSemanticsUpdateCallback(
+CreateEmbedderSemanticsUpdateCallbackV1(
     FlutterUpdateSemanticsNodeCallback update_semantics_node_callback,
     FlutterUpdateSemanticsCustomActionCallback
         update_semantics_custom_action_callback,
@@ -1381,20 +1618,20 @@ CreateLegacyEmbedderSemanticsUpdateCallback(
           update_semantics_custom_action_callback,
           user_data](const flutter::SemanticsNodeUpdates& nodes,
                      const flutter::CustomAccessibilityActionUpdates& actions) {
+    flutter::EmbedderSemanticsUpdate update{nodes, actions};
+    FlutterSemanticsUpdate* update_ptr = update.get();
+
     // First, queue all node and custom action updates.
     if (update_semantics_node_callback != nullptr) {
-      for (const auto& value : nodes) {
-        const FlutterSemanticsNode embedder_node =
-            CreateEmbedderSemanticsNode(value.second);
-        update_semantics_node_callback(&embedder_node, user_data);
+      for (size_t i = 0; i < update_ptr->nodes_count; i++) {
+        update_semantics_node_callback(&update_ptr->nodes[i], user_data);
       }
     }
 
     if (update_semantics_custom_action_callback != nullptr) {
-      for (const auto& value : actions) {
-        const FlutterSemanticsCustomAction embedder_action =
-            CreateEmbedderSemanticsCustomAction(value.second);
-        update_semantics_custom_action_callback(&embedder_action, user_data);
+      for (size_t i = 0; i < update_ptr->custom_actions_count; i++) {
+        update_semantics_custom_action_callback(&update_ptr->custom_actions[i],
+                                                user_data);
       }
     }
 
@@ -1418,21 +1655,62 @@ CreateLegacyEmbedderSemanticsUpdateCallback(
   };
 }
 
+// Create a callback to notify the embedder of semantic updates
+// using the deprecated embedder callback 'update_semantics_callback'.
+flutter::PlatformViewEmbedder::UpdateSemanticsCallback
+CreateEmbedderSemanticsUpdateCallbackV2(
+    FlutterUpdateSemanticsCallback update_semantics_callback,
+    void* user_data) {
+  return [update_semantics_callback, user_data](
+             const flutter::SemanticsNodeUpdates& nodes,
+             const flutter::CustomAccessibilityActionUpdates& actions) {
+    flutter::EmbedderSemanticsUpdate update{nodes, actions};
+
+    update_semantics_callback(update.get(), user_data);
+  };
+}
+
+// Create a callback to notify the embedder of semantic updates
+// using the new embedder callback 'update_semantics_callback2'.
+flutter::PlatformViewEmbedder::UpdateSemanticsCallback
+CreateEmbedderSemanticsUpdateCallbackV3(
+    FlutterUpdateSemanticsCallback2 update_semantics_callback,
+    void* user_data) {
+  return [update_semantics_callback, user_data](
+             const flutter::SemanticsNodeUpdates& nodes,
+             const flutter::CustomAccessibilityActionUpdates& actions) {
+    flutter::EmbedderSemanticsUpdate2 update{nodes, actions};
+
+    update_semantics_callback(update.get(), user_data);
+  };
+}
+
 // Creates a callback that receives semantic updates from the engine
 // and notifies the embedder's callback(s). Returns null if the embedder
 // did not register any callbacks.
 flutter::PlatformViewEmbedder::UpdateSemanticsCallback
 CreateEmbedderSemanticsUpdateCallback(const FlutterProjectArgs* args,
                                       void* user_data) {
-  // The embedder can register the new callback, or the legacy callbacks, or
-  // nothing at all. Handle the case where the embedder registered the 'new'
-  // callback.
+  // There are three variants for the embedder API's semantic update callbacks.
+  // Create a callback that maps to the embedder's desired semantic update API.
+  //
+  // Handle the case where the embedder registered the callback
+  // 'updated_semantics_callback2'
+  if (SAFE_ACCESS(args, update_semantics_callback2, nullptr) != nullptr) {
+    return CreateEmbedderSemanticsUpdateCallbackV3(
+        args->update_semantics_callback2, user_data);
+  }
+
+  // Handle the case where the embedder registered the deprecated callback
+  // 'update_semantics_callback'.
   if (SAFE_ACCESS(args, update_semantics_callback, nullptr) != nullptr) {
-    return CreateNewEmbedderSemanticsUpdateCallback(
+    return CreateEmbedderSemanticsUpdateCallbackV2(
         args->update_semantics_callback, user_data);
   }
 
-  // Handle the case where the embedder registered 'legacy' callbacks.
+  // Handle the case where the embedder registered the deprecated callbacks
+  // 'update_semantics_node_callback' and
+  // 'update_semantics_custom_action_callback'.
   FlutterUpdateSemanticsNodeCallback update_semantics_node_callback = nullptr;
   if (SAFE_ACCESS(args, update_semantics_node_callback, nullptr) != nullptr) {
     update_semantics_node_callback = args->update_semantics_node_callback;
@@ -1448,7 +1726,7 @@ CreateEmbedderSemanticsUpdateCallback(const FlutterProjectArgs* args,
 
   if (update_semantics_node_callback != nullptr ||
       update_semantics_custom_action_callback != nullptr) {
-    return CreateLegacyEmbedderSemanticsUpdateCallback(
+    return CreateEmbedderSemanticsUpdateCallbackV1(
         update_semantics_node_callback, update_semantics_custom_action_callback,
         user_data);
   }
@@ -1604,15 +1882,27 @@ FlutterEngineResult FlutterEngineInitialize(size_t version,
     settings.log_tag = SAFE_ACCESS(args, log_tag, nullptr);
   }
 
-  if (args->update_semantics_callback != nullptr &&
-      (args->update_semantics_node_callback != nullptr ||
-       args->update_semantics_custom_action_callback != nullptr)) {
+  bool has_update_semantics_2_callback =
+      SAFE_ACCESS(args, update_semantics_callback2, nullptr) != nullptr;
+  bool has_update_semantics_callback =
+      SAFE_ACCESS(args, update_semantics_callback, nullptr) != nullptr;
+  bool has_legacy_update_semantics_callback =
+      SAFE_ACCESS(args, update_semantics_node_callback, nullptr) != nullptr ||
+      SAFE_ACCESS(args, update_semantics_custom_action_callback, nullptr) !=
+          nullptr;
+
+  int semantic_callback_count = (has_update_semantics_2_callback ? 1 : 0) +
+                                (has_update_semantics_callback ? 1 : 0) +
+                                (has_legacy_update_semantics_callback ? 1 : 0);
+
+  if (semantic_callback_count > 1) {
     return LOG_EMBEDDER_ERROR(
         kInvalidArguments,
         "Multiple semantics update callbacks provided. "
-        "Embedders should provide either `update_semantics_callback` "
-        "or both `update_semantics_nodes_callback` and "
-        "`update_semantics_custom_actions_callback`.");
+        "Embedders should provide either `update_semantics_callback2`, "
+        "`update_semantics_callback`, or both "
+        "`update_semantics_node_callback` and "
+        "`update_semantics_custom_action_callback`.");
   }
 
   flutter::PlatformViewEmbedder::UpdateSemanticsCallback
@@ -1701,8 +1991,19 @@ FlutterEngineResult FlutterEngineInitialize(size_t version,
                                       user_data]() { return ptr(user_data); };
   }
 
-  auto external_view_embedder_result =
-      InferExternalViewEmbedderFromArgs(SAFE_ACCESS(args, compositor, nullptr));
+  flutter::PlatformViewEmbedder::ChanneUpdateCallback channel_update_callback =
+      nullptr;
+  if (SAFE_ACCESS(args, channel_update_callback, nullptr) != nullptr) {
+    channel_update_callback = [ptr = args->channel_update_callback, user_data](
+                                  const std::string& name, bool listening) {
+      FlutterChannelUpdate update{sizeof(FlutterChannelUpdate), name.c_str(),
+                                  listening};
+      ptr(&update, user_data);
+    };
+  }
+
+  auto external_view_embedder_result = InferExternalViewEmbedderFromArgs(
+      SAFE_ACCESS(args, compositor, nullptr), settings.enable_impeller);
   if (external_view_embedder_result.second) {
     return LOG_EMBEDDER_ERROR(kInvalidArguments,
                               "Compositor arguments were invalid.");
@@ -1715,11 +2016,12 @@ FlutterEngineResult FlutterEngineInitialize(size_t version,
           vsync_callback,                             //
           compute_platform_resolved_locale_callback,  //
           on_pre_engine_restart_callback,             //
+          channel_update_callback,                    //
       };
 
   auto on_create_platform_view = InferPlatformViewCreationCallback(
       config, user_data, platform_dispatch_table,
-      std::move(external_view_embedder_result.first));
+      std::move(external_view_embedder_result.first), settings.enable_impeller);
 
   if (!on_create_platform_view) {
     return LOG_EMBEDDER_ERROR(
@@ -1791,16 +2093,16 @@ FlutterEngineResult FlutterEngineInitialize(size_t version,
     }
     FlutterThreadPriority priority = FlutterThreadPriority::kNormal;
     switch (config.priority) {
-      case fml::Thread::ThreadPriority::BACKGROUND:
+      case fml::Thread::ThreadPriority::kBackground:
         priority = FlutterThreadPriority::kBackground;
         break;
-      case fml::Thread::ThreadPriority::NORMAL:
+      case fml::Thread::ThreadPriority::kNormal:
         priority = FlutterThreadPriority::kNormal;
         break;
-      case fml::Thread::ThreadPriority::DISPLAY:
+      case fml::Thread::ThreadPriority::kDisplay:
         priority = FlutterThreadPriority::kDisplay;
         break;
-      case fml::Thread::ThreadPriority::RASTER:
+      case fml::Thread::ThreadPriority::kRaster:
         priority = FlutterThreadPriority::kRaster;
         break;
     }
@@ -1908,6 +2210,44 @@ FlutterEngineResult FlutterEngineRunInitialized(
   return kSuccess;
 }
 
+FLUTTER_EXPORT
+FlutterEngineResult FlutterEngineRemoveView(FLUTTER_API_SYMBOL(FlutterEngine)
+                                                engine,
+                                            const FlutterRemoveViewInfo* info) {
+  if (!engine) {
+    return LOG_EMBEDDER_ERROR(kInvalidArguments, "Engine handle was invalid.");
+  }
+  if (!info || !info->remove_view_callback) {
+    return LOG_EMBEDDER_ERROR(kInvalidArguments,
+                              "Remove view info handle was invalid.");
+  }
+
+  if (info->view_id == kFlutterImplicitViewId) {
+    return LOG_EMBEDDER_ERROR(
+        kInvalidArguments,
+        "Remove view info was invalid. The implicit view cannot be removed.");
+  }
+
+  // The engine must be running to remove a view.
+  auto embedder_engine = reinterpret_cast<flutter::EmbedderEngine*>(engine);
+  if (!embedder_engine->IsValid()) {
+    return LOG_EMBEDDER_ERROR(kInvalidArguments, "Engine handle was invalid.");
+  }
+
+  flutter::Shell::RemoveViewCallback callback =
+      [c_callback = info->remove_view_callback,
+       user_data = info->user_data](bool removed) {
+        FlutterRemoveViewResult result = {};
+        result.struct_size = sizeof(FlutterRemoveViewResult);
+        result.removed = removed;
+        result.user_data = user_data;
+        c_callback(&result);
+      };
+
+  embedder_engine->GetShell().RemoveView(info->view_id, callback);
+  return kSuccess;
+}
+
 FLUTTER_EXPORT
 FlutterEngineResult FlutterEngineDeinitialize(FLUTTER_API_SYMBOL(FlutterEngine)
                                                   engine) {
@@ -1938,47 +2278,19 @@ FlutterEngineResult FlutterEngineSendWindowMetricsEvent(
   if (engine == nullptr || flutter_metrics == nullptr) {
     return LOG_EMBEDDER_ERROR(kInvalidArguments, "Engine handle was invalid.");
   }
+  FlutterViewId view_id =
+      SAFE_ACCESS(flutter_metrics, view_id, kFlutterImplicitViewId);
 
-  flutter::ViewportMetrics metrics;
-
-  metrics.physical_width = SAFE_ACCESS(flutter_metrics, width, 0.0);
-  metrics.physical_height = SAFE_ACCESS(flutter_metrics, height, 0.0);
-  metrics.device_pixel_ratio = SAFE_ACCESS(flutter_metrics, pixel_ratio, 1.0);
-  metrics.physical_view_inset_top =
-      SAFE_ACCESS(flutter_metrics, physical_view_inset_top, 0.0);
-  metrics.physical_view_inset_right =
-      SAFE_ACCESS(flutter_metrics, physical_view_inset_right, 0.0);
-  metrics.physical_view_inset_bottom =
-      SAFE_ACCESS(flutter_metrics, physical_view_inset_bottom, 0.0);
-  metrics.physical_view_inset_left =
-      SAFE_ACCESS(flutter_metrics, physical_view_inset_left, 0.0);
-
-  if (metrics.device_pixel_ratio <= 0.0) {
-    return LOG_EMBEDDER_ERROR(
-        kInvalidArguments,
-        "Device pixel ratio was invalid. It must be greater than zero.");
-  }
-
-  if (metrics.physical_view_inset_top < 0 ||
-      metrics.physical_view_inset_right < 0 ||
-      metrics.physical_view_inset_bottom < 0 ||
-      metrics.physical_view_inset_left < 0) {
-    return LOG_EMBEDDER_ERROR(
-        kInvalidArguments,
-        "Physical view insets are invalid. They must be non-negative.");
+  std::variant<flutter::ViewportMetrics, std::string> metrics_or_error =
+      MakeViewportMetricsFromWindowMetrics(flutter_metrics);
+  if (const std::string* error = std::get_if<std::string>(&metrics_or_error)) {
+    return LOG_EMBEDDER_ERROR(kInvalidArguments, error->c_str());
   }
 
-  if (metrics.physical_view_inset_top > metrics.physical_height ||
-      metrics.physical_view_inset_right > metrics.physical_width ||
-      metrics.physical_view_inset_bottom > metrics.physical_height ||
-      metrics.physical_view_inset_left > metrics.physical_width) {
-    return LOG_EMBEDDER_ERROR(kInvalidArguments,
-                              "Physical view insets are invalid. They cannot "
-                              "be greater than physical height or width.");
-  }
+  auto metrics = std::get<flutter::ViewportMetrics>(metrics_or_error);
 
   return reinterpret_cast<flutter::EmbedderEngine*>(engine)->SetViewportMetrics(
-             metrics)
+             view_id, metrics)
              ? kSuccess
              : LOG_EMBEDDER_ERROR(kInvalidArguments,
                                   "Viewport metrics were invalid.");
@@ -2136,6 +2448,8 @@ FlutterEngineResult FlutterEngineSendPointerEvent(
     pointer_data.pan_delta_y = 0.0;
     pointer_data.scale = SAFE_ACCESS(current, scale, 0.0);
     pointer_data.rotation = SAFE_ACCESS(current, rotation, 0.0);
+    pointer_data.view_id =
+        SAFE_ACCESS(current, view_id, kFlutterImplicitViewId);
     packet->SetPointerData(i, pointer_data);
     current = reinterpret_cast<const FlutterPointerEvent*>(
         reinterpret_cast<const uint8_t*>(current) + current->struct_size);
@@ -2162,6 +2476,23 @@ static inline flutter::KeyEventType MapKeyEventType(
   return flutter::KeyEventType::kUp;
 }
 
+static inline flutter::KeyEventDeviceType MapKeyEventDeviceType(
+    FlutterKeyEventDeviceType event_kind) {
+  switch (event_kind) {
+    case kFlutterKeyEventDeviceTypeKeyboard:
+      return flutter::KeyEventDeviceType::kKeyboard;
+    case kFlutterKeyEventDeviceTypeDirectionalPad:
+      return flutter::KeyEventDeviceType::kDirectionalPad;
+    case kFlutterKeyEventDeviceTypeGamepad:
+      return flutter::KeyEventDeviceType::kGamepad;
+    case kFlutterKeyEventDeviceTypeJoystick:
+      return flutter::KeyEventDeviceType::kJoystick;
+    case kFlutterKeyEventDeviceTypeHdmi:
+      return flutter::KeyEventDeviceType::kHdmi;
+  }
+  return flutter::KeyEventDeviceType::kKeyboard;
+}
+
 // Send a platform message to the framework.
 //
 // The `data_callback` will be invoked with `user_data`, and must not be empty.
@@ -2224,6 +2555,9 @@ FlutterEngineResult FlutterEngineSendKeyEvent(FLUTTER_API_SYMBOL(FlutterEngine)
   key_data.physical = SAFE_ACCESS(event, physical, 0);
   key_data.logical = SAFE_ACCESS(event, logical, 0);
   key_data.synthesized = SAFE_ACCESS(event, synthesized, false);
+  key_data.device_type = MapKeyEventDeviceType(SAFE_ACCESS(
+      event, device_type,
+      FlutterKeyEventDeviceType::kFlutterKeyEventDeviceTypeKeyboard));
 
   auto packet = std::make_unique<flutter::KeyDataPacket>(key_data, character);
 
@@ -2474,7 +2808,7 @@ FlutterEngineResult FlutterEngineUpdateAccessibilityFeatures(
 
 FlutterEngineResult FlutterEngineDispatchSemanticsAction(
     FLUTTER_API_SYMBOL(FlutterEngine) engine,
-    uint64_t id,
+    uint64_t node_id,
     FlutterSemanticsAction action,
     const uint8_t* data,
     size_t data_length) {
@@ -2484,7 +2818,7 @@ FlutterEngineResult FlutterEngineDispatchSemanticsAction(
   auto engine_action = static_cast<flutter::SemanticsAction>(action);
   if (!reinterpret_cast<flutter::EmbedderEngine*>(engine)
            ->DispatchSemanticsAction(
-               id, engine_action,
+               node_id, engine_action,
                fml::MallocMapping::Copy(data, data_length))) {
     return LOG_EMBEDDER_ERROR(kInternalInconsistency,
                               "Could not dispatch semantics action.");
@@ -2537,7 +2871,8 @@ FlutterEngineResult FlutterEngineReloadSystemFonts(
 }
 
 void FlutterEngineTraceEventDurationBegin(const char* name) {
-  fml::tracing::TraceEvent0("flutter", name);
+  fml::tracing::TraceEvent0("flutter", name, /*flow_id_count=*/0,
+                            /*flow_ids=*/nullptr);
 }
 
 void FlutterEngineTraceEventDurationEnd(const char* name) {
@@ -2545,7 +2880,8 @@ void FlutterEngineTraceEventDurationEnd(const char* name) {
 }
 
 void FlutterEngineTraceEventInstant(const char* name) {
-  fml::tracing::TraceEventInstant0("flutter", name);
+  fml::tracing::TraceEventInstant0("flutter", name, /*flow_id_count=*/0,
+                                   /*flow_ids=*/nullptr);
 }
 
 FlutterEngineResult FlutterEnginePostRenderThreadTask(
@@ -2887,18 +3223,18 @@ FlutterEngineResult FlutterEngineNotifyDisplayUpdate(
   switch (update_type) {
     case kFlutterEngineDisplaysUpdateTypeStartup: {
       std::vector<std::unique_ptr<flutter::Display>> displays;
+      const auto* display = embedder_displays;
       for (size_t i = 0; i < display_count; i++) {
-        if (embedder_displays[i].single_display) {
-          displays.push_back(std::make_unique<flutter::Display>(
-              embedder_displays[i].refresh_rate));
-        } else {
-          displays.push_back(std::make_unique<flutter::Display>(
-              embedder_displays[i].display_id,
-              embedder_displays[i].refresh_rate));
-        }
+        displays.push_back(std::make_unique<flutter::Display>(
+            SAFE_ACCESS(display, display_id, i),    //
+            SAFE_ACCESS(display, refresh_rate, 0),  //
+            SAFE_ACCESS(display, width, 0),         //
+            SAFE_ACCESS(display, height, 0),        //
+            SAFE_ACCESS(display, device_pixel_ratio, 1)));
+        display = reinterpret_cast<const FlutterEngineDisplay*>(
+            reinterpret_cast<const uint8_t*>(display) + display->struct_size);
       }
-      engine->GetShell().OnDisplayUpdates(flutter::DisplayUpdateType::kStartup,
-                                          std::move(displays));
+      engine->GetShell().OnDisplayUpdates(std::move(displays));
       return kSuccess;
     }
     default:
diff --git a/shell/platform/embedder/embedder.h b/shell/platform/embedder/embedder.h
index e4fd8cc21749014d5cd991132bf90b9cb0ab1539..d26e2215adf3a54fca3736c58fb2c5952cec6977 100644
--- a/shell/platform/embedder/embedder.h
+++ b/shell/platform/embedder/embedder.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_EMBEDDER_H_
-#define FLUTTER_EMBEDDER_H_
+#ifndef FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_H_
+#define FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_H_
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -25,9 +25,16 @@
 // - Function signatures (names, argument counts, argument order, and argument
 //   type) cannot change.
 // - The core behavior of existing functions cannot change.
+// - Instead of nesting structures by value within another structure/union,
+//   prefer nesting by pointer. This ensures that adding members to the nested
+//   struct does not break the ABI of the parent struct/union.
+// - Instead of array of structures, prefer array of pointers to structures.
+//   This ensures that array indexing does not break if members are added
+//   to the structure.
 //
 // These changes are allowed:
-// - Adding new struct members at the end of a structure.
+// - Adding new struct members at the end of a structure as long as the struct
+//   is not nested within another struct by value.
 // - Adding new enum members with a new value.
 // - Renaming a struct member as long as its type, size, and intent remain the
 //   same.
@@ -229,6 +236,11 @@ typedef enum {
   kFlutterSemanticsFlagIsKeyboardKey = 1 << 24,
   /// Whether the semantics node represents a tristate checkbox in mixed state.
   kFlutterSemanticsFlagIsCheckStateMixed = 1 << 25,
+  /// The semantics node has the quality of either being "expanded" or
+  /// "collapsed".
+  kFlutterSemanticsFlagHasExpandedState = 1 << 26,
+  /// Whether a semantic node that hasExpandedState is currently expanded.
+  kFlutterSemanticsFlagIsExpanded = 1 << 27,
 } FlutterSemanticsFlag;
 
 typedef enum {
@@ -254,6 +266,12 @@ typedef enum {
 
 typedef struct _FlutterEngine* FLUTTER_API_SYMBOL(FlutterEngine);
 
+/// Unique identifier for views.
+///
+/// View IDs are generated by the embedder and are
+/// opaque to the engine; the engine does not interpret view IDs in any way.
+typedef int64_t FlutterViewId;
+
 typedef struct {
   /// horizontal scale factor
   double scaleX;
@@ -299,8 +317,8 @@ typedef enum {
 ///
 ///   - all other formats are called packed formats, and the component order
 ///     as specified in the format name refers to the order in the native type.
-///     for example, for kRGB565, the R component uses the 5 least significant
-///     bits of the uint16_t pixel value.
+///     for example, for kFlutterSoftwarePixelFormatRGB565, the R component
+///     uses the 5 least significant bits of the uint16_t pixel value.
 ///
 /// Each pixel format in this list is documented with an example on how to get
 /// the color components from the pixel.
@@ -316,30 +334,31 @@ typedef enum {
   /// pixel with 8 bit grayscale value.
   /// The grayscale value is the luma value calculated from r, g, b
   /// according to BT.709. (gray = r*0.2126 + g*0.7152 + b*0.0722)
-  kGray8,
+  kFlutterSoftwarePixelFormatGray8,
 
   /// pixel with 5 bits red, 6 bits green, 5 bits blue, in 16-bit word.
   ///   r = p & 0x3F; g = (p>>5) & 0x3F; b = p>>11;
-  kRGB565,
+  kFlutterSoftwarePixelFormatRGB565,
 
   /// pixel with 4 bits for alpha, red, green, blue; in 16-bit word.
   ///   r = p & 0xF;  g = (p>>4) & 0xF;  b = (p>>8) & 0xF;   a = p>>12;
-  kRGBA4444,
+  kFlutterSoftwarePixelFormatRGBA4444,
 
   /// pixel with 8 bits for red, green, blue, alpha.
   ///   r = p[0]; g = p[1]; b = p[2]; a = p[3];
-  kRGBA8888,
+  kFlutterSoftwarePixelFormatRGBA8888,
 
   /// pixel with 8 bits for red, green and blue and 8 unused bits.
   ///   r = p[0]; g = p[1]; b = p[2];
-  kRGBX8888,
+  kFlutterSoftwarePixelFormatRGBX8888,
 
   /// pixel with 8 bits for blue, green, red and alpha.
   ///   r = p[2]; g = p[1]; b = p[0]; a = p[3];
-  kBGRA8888,
+  kFlutterSoftwarePixelFormatBGRA8888,
 
-  /// either kBGRA8888 or kRGBA8888 depending on CPU endianess and OS
-  kNative32,
+  /// either kFlutterSoftwarePixelFormatBGRA8888 or
+  /// kFlutterSoftwarePixelFormatRGBA8888 depending on CPU endianess and OS
+  kFlutterSoftwarePixelFormatNative32,
 } FlutterSoftwarePixelFormat;
 
 typedef struct {
@@ -668,9 +687,13 @@ typedef struct {
   FlutterMetalCommandQueueHandle present_command_queue;
   /// The callback that gets invoked when the engine requests the embedder for a
   /// texture to render to.
+  ///
+  /// Not used if a FlutterCompositor is supplied in FlutterProjectArgs.
   FlutterMetalTextureCallback get_next_drawable_callback;
   /// The callback presented to the embedder to present a fully populated metal
   /// texture to the user.
+  ///
+  /// Not used if a FlutterCompositor is supplied in FlutterProjectArgs.
   FlutterMetalPresentCallback present_drawable_callback;
   /// When the embedder specifies that a texture has a frame available, the
   /// engine will call this method (on an internal engine managed thread) so
@@ -740,6 +763,11 @@ typedef struct {
   /// The queue family index of the VkQueue supplied in the next field.
   uint32_t queue_family_index;
   /// VkQueue handle.
+  /// The queue should not be used without protection from a mutex to make sure
+  /// it is not used simultaneously with other threads. That mutex should match
+  /// the one injected via the |get_instance_proc_address_callback|.
+  /// There is a proposal to remove the need for the mutex at
+  /// https://github.com/flutter/flutter/issues/134573.
   FlutterVulkanQueueHandle queue;
   /// The number of instance extensions available for enumerating in the next
   /// field.
@@ -763,6 +791,12 @@ typedef struct {
   /// For example: VK_KHR_GET_MEMORY_REQUIREMENTS_2_EXTENSION_NAME
   const char** enabled_device_extensions;
   /// The callback invoked when resolving Vulkan function pointers.
+  /// At a bare minimum this should be used to swap out any calls that operate
+  /// on vkQueue's for threadsafe variants that obtain locks for their duration.
+  /// The functions to swap out are "vkQueueSubmit" and "vkQueueWaitIdle".  An
+  /// example of how to do that can be found in the test
+  /// "EmbedderTest.CanSwapOutVulkanCalls" unit-test in
+  /// //shell/platform/embedder/tests/embedder_vk_unittests.cc.
   FlutterVulkanInstanceProcAddressCallback get_instance_proc_address_callback;
   /// The callback invoked when the engine requests a VkImage from the embedder
   /// for rendering the next frame.
@@ -797,6 +831,58 @@ typedef struct {
   };
 } FlutterRendererConfig;
 
+typedef struct {
+  /// The size of this struct.
+  /// Must be sizeof(FlutterRemoveViewResult).
+  size_t struct_size;
+
+  /// True if the remove view operation succeeded.
+  bool removed;
+
+  /// The |FlutterRemoveViewInfo.user_data|.
+  void* user_data;
+} FlutterRemoveViewResult;
+
+/// The callback invoked by the engine when the engine has attempted to remove
+/// a view.
+///
+/// The |FlutterRemoveViewResult| will be deallocated once the callback returns.
+typedef void (*FlutterRemoveViewCallback)(
+    const FlutterRemoveViewResult* /* result */);
+
+typedef struct {
+  /// The size of this struct.
+  /// Must be sizeof(FlutterRemoveViewInfo).
+  size_t struct_size;
+
+  /// The identifier for the view to remove.
+  ///
+  /// The implicit view cannot be removed if it is enabled.
+  FlutterViewId view_id;
+
+  /// A baton that is not interpreted by the engine in any way.
+  /// It will be given back to the embedder in |remove_view_callback|.
+  /// Embedder resources may be associated with this baton.
+  void* user_data;
+
+  /// Called once the engine has attempted to remove the view.
+  /// This callback is required.
+  ///
+  /// The embedder must not destroy the underlying surface until the callback is
+  /// invoked with a `removed` value of `true`.
+  ///
+  /// This callback is invoked on an internal engine managed thread.
+  /// Embedders must re-thread if necessary.
+  ///
+  /// The |result| argument will be deallocated when the callback returns.
+  FlutterRemoveViewCallback remove_view_callback;
+} FlutterRemoveViewInfo;
+
+/// Display refers to a graphics hardware system consisting of a framebuffer,
+/// typically a monitor or a screen. This ID is unique per display and is
+/// stable until the Flutter application restarts.
+typedef uint64_t FlutterEngineDisplayId;
+
 typedef struct {
   /// The size of this struct. Must be sizeof(FlutterWindowMetricsEvent).
   size_t struct_size;
@@ -818,6 +904,10 @@ typedef struct {
   double physical_view_inset_bottom;
   /// Left inset of window.
   double physical_view_inset_left;
+  /// The identifier of the display the view is rendering on.
+  FlutterEngineDisplayId display_id;
+  /// The view that this event is describing.
+  int64_t view_id;
 } FlutterWindowMetricsEvent;
 
 /// The phase of the pointer event.
@@ -830,7 +920,7 @@ typedef enum {
   /// any other buttons are still pressed when one button is released, that
   /// should be sent as a kMove rather than a kUp.
   kUp,
-  /// The pointer, which must have been been up, is now down.
+  /// The pointer, which must have been up, is now down.
   ///
   /// For touch, this means that the pointer has come into contact with the
   /// screen. For a mouse, it means a button is now pressed. Note that if any
@@ -926,6 +1016,8 @@ typedef struct {
   double scale;
   /// The rotation of the pan/zoom in radians, where 0.0 is the initial angle.
   double rotation;
+  /// The identifier of the view that received the pointer event.
+  FlutterViewId view_id;
 } FlutterPointerEvent;
 
 typedef enum {
@@ -934,6 +1026,14 @@ typedef enum {
   kFlutterKeyEventTypeRepeat,
 } FlutterKeyEventType;
 
+typedef enum {
+  kFlutterKeyEventDeviceTypeKeyboard = 1,
+  kFlutterKeyEventDeviceTypeDirectionalPad,
+  kFlutterKeyEventDeviceTypeGamepad,
+  kFlutterKeyEventDeviceTypeJoystick,
+  kFlutterKeyEventDeviceTypeHdmi,
+} FlutterKeyEventDeviceType;
+
 /// A structure to represent a key event.
 ///
 /// Sending `FlutterKeyEvent` via `FlutterEngineSendKeyEvent` results in a
@@ -997,6 +1097,8 @@ typedef struct {
   /// An event being synthesized means that the `timestamp` might greatly
   /// deviate from the actual time when the event occurs physically.
   bool synthesized;
+  /// The source device for the key event.
+  FlutterKeyEventDeviceType device_type;
 } FlutterKeyEvent;
 
 typedef void (*FlutterKeyEventCallback)(bool /* handled */,
@@ -1036,16 +1138,72 @@ typedef int64_t FlutterPlatformViewIdentifier;
 
 /// `FlutterSemanticsNode` ID used as a sentinel to signal the end of a batch of
 /// semantics node updates. This is unused if using
-/// `FlutterUpdateSemanticsCallback`.
+/// `FlutterUpdateSemanticsCallback2`.
 FLUTTER_EXPORT
 extern const int32_t kFlutterSemanticsNodeIdBatchEnd;
 
+// The enumeration of possible string attributes that affect how assistive
+// technologies announce a string.
+//
+// See dart:ui's implementers of the StringAttribute abstract class.
+typedef enum {
+  // Indicates the string should be announced character by character.
+  kSpellOut,
+  // Indicates the string should be announced using the specified locale.
+  kLocale,
+} FlutterStringAttributeType;
+
+// Indicates the assistive technology should announce out the string character
+// by character.
+//
+// See dart:ui's SpellOutStringAttribute.
+typedef struct {
+  /// The size of this struct. Must be sizeof(FlutterSpellOutStringAttribute).
+  size_t struct_size;
+} FlutterSpellOutStringAttribute;
+
+// Indicates the assistive technology should announce the string using the
+// specified locale.
+//
+// See dart:ui's LocaleStringAttribute.
+typedef struct {
+  /// The size of this struct. Must be sizeof(FlutterLocaleStringAttribute).
+  size_t struct_size;
+  // The locale of this attribute.
+  const char* locale;
+} FlutterLocaleStringAttribute;
+
+// Indicates how the assistive technology should treat the string.
+//
+// See dart:ui's StringAttribute.
+typedef struct {
+  /// The size of this struct. Must be sizeof(FlutterStringAttribute).
+  size_t struct_size;
+  // The position this attribute starts.
+  size_t start;
+  // The next position after the attribute ends.
+  size_t end;
+  /// The type of the attribute described by the subsequent union.
+  FlutterStringAttributeType type;
+  union {
+    // Indicates the string should be announced character by character.
+    const FlutterSpellOutStringAttribute* spell_out;
+    // Indicates the string should be announced using the specified locale.
+    const FlutterLocaleStringAttribute* locale;
+  };
+} FlutterStringAttribute;
+
 /// A node that represents some semantic data.
 ///
 /// The semantics tree is maintained during the semantics phase of the pipeline
 /// (i.e., during PipelineOwner.flushSemantics), which happens after
 /// compositing. Updates are then pushed to embedders via the registered
 /// `FlutterUpdateSemanticsCallback`.
+///
+/// @deprecated     Use `FlutterSemanticsNode2` instead. In order to preserve
+///                 ABI compatibility for existing users, no new fields will be
+///                 added to this struct. New fields will continue to be added
+///                 to `FlutterSemanticsNode2`.
 typedef struct {
   /// The size of this struct. Must be sizeof(FlutterSemanticsNode).
   size_t struct_size;
@@ -1113,9 +1271,109 @@ typedef struct {
   const char* tooltip;
 } FlutterSemanticsNode;
 
+/// A node in the Flutter semantics tree.
+///
+/// The semantics tree is maintained during the semantics phase of the pipeline
+/// (i.e., during PipelineOwner.flushSemantics), which happens after
+/// compositing. Updates are then pushed to embedders via the registered
+/// `FlutterUpdateSemanticsCallback2`.
+///
+/// @see https://api.flutter.dev/flutter/semantics/SemanticsNode-class.html
+typedef struct {
+  /// The size of this struct. Must be sizeof(FlutterSemanticsNode).
+  size_t struct_size;
+  /// The unique identifier for this node.
+  int32_t id;
+  /// The set of semantics flags associated with this node.
+  FlutterSemanticsFlag flags;
+  /// The set of semantics actions applicable to this node.
+  FlutterSemanticsAction actions;
+  /// The position at which the text selection originates.
+  int32_t text_selection_base;
+  /// The position at which the text selection terminates.
+  int32_t text_selection_extent;
+  /// The total number of scrollable children that contribute to semantics.
+  int32_t scroll_child_count;
+  /// The index of the first visible semantic child of a scroll node.
+  int32_t scroll_index;
+  /// The current scrolling position in logical pixels if the node is
+  /// scrollable.
+  double scroll_position;
+  /// The maximum in-range value for `scrollPosition` if the node is scrollable.
+  double scroll_extent_max;
+  /// The minimum in-range value for `scrollPosition` if the node is scrollable.
+  double scroll_extent_min;
+  /// The elevation along the z-axis at which the rect of this semantics node is
+  /// located above its parent.
+  double elevation;
+  /// Describes how much space the semantics node takes up along the z-axis.
+  double thickness;
+  /// A textual description of the node.
+  const char* label;
+  /// A brief description of the result of performing an action on the node.
+  const char* hint;
+  /// A textual description of the current value of the node.
+  const char* value;
+  /// A value that `value` will have after a kFlutterSemanticsActionIncrease`
+  /// action has been performed.
+  const char* increased_value;
+  /// A value that `value` will have after a kFlutterSemanticsActionDecrease`
+  /// action has been performed.
+  const char* decreased_value;
+  /// The reading direction for `label`, `value`, `hint`, `increasedValue`,
+  /// `decreasedValue`, and `tooltip`.
+  FlutterTextDirection text_direction;
+  /// The bounding box for this node in its coordinate system.
+  FlutterRect rect;
+  /// The transform from this node's coordinate system to its parent's
+  /// coordinate system.
+  FlutterTransformation transform;
+  /// The number of children this node has.
+  size_t child_count;
+  /// Array of child node IDs in traversal order. Has length `child_count`.
+  const int32_t* children_in_traversal_order;
+  /// Array of child node IDs in hit test order. Has length `child_count`.
+  const int32_t* children_in_hit_test_order;
+  /// The number of custom accessibility action associated with this node.
+  size_t custom_accessibility_actions_count;
+  /// Array of `FlutterSemanticsCustomAction` IDs associated with this node.
+  /// Has length `custom_accessibility_actions_count`.
+  const int32_t* custom_accessibility_actions;
+  /// Identifier of the platform view associated with this semantics node, or
+  /// -1 if none.
+  FlutterPlatformViewIdentifier platform_view_id;
+  /// A textual tooltip attached to the node.
+  const char* tooltip;
+  // The number of string attributes associated with the `label`.
+  size_t label_attribute_count;
+  // Array of string attributes associated with the `label`.
+  // Has length `label_attribute_count`.
+  const FlutterStringAttribute** label_attributes;
+  // The number of string attributes associated with the `hint`.
+  size_t hint_attribute_count;
+  // Array of string attributes associated with the `hint`.
+  // Has length `hint_attribute_count`.
+  const FlutterStringAttribute** hint_attributes;
+  // The number of string attributes associated with the `value`.
+  size_t value_attribute_count;
+  // Array of string attributes associated with the `value`.
+  // Has length `value_attribute_count`.
+  const FlutterStringAttribute** value_attributes;
+  // The number of string attributes associated with the `increased_value`.
+  size_t increased_value_attribute_count;
+  // Array of string attributes associated with the `increased_value`.
+  // Has length `increased_value_attribute_count`.
+  const FlutterStringAttribute** increased_value_attributes;
+  // The number of string attributes associated with the `decreased_value`.
+  size_t decreased_value_attribute_count;
+  // Array of string attributes associated with the `decreased_value`.
+  // Has length `decreased_value_attribute_count`.
+  const FlutterStringAttribute** decreased_value_attributes;
+} FlutterSemanticsNode2;
+
 /// `FlutterSemanticsCustomAction` ID used as a sentinel to signal the end of a
 /// batch of semantics custom action updates. This is unused if using
-/// `FlutterUpdateSemanticsCallback`.
+/// `FlutterUpdateSemanticsCallback2`.
 FLUTTER_EXPORT
 extern const int32_t kFlutterSemanticsCustomActionIdBatchEnd;
 
@@ -1128,6 +1386,11 @@ extern const int32_t kFlutterSemanticsCustomActionIdBatchEnd;
 /// Action overrides are custom actions that the application developer requests
 /// to be used in place of the standard actions in the `FlutterSemanticsAction`
 /// enum.
+///
+/// @deprecated     Use `FlutterSemanticsCustomAction2` instead. In order to
+///                 preserve ABI compatility for existing users, no new fields
+///                 will be added to this struct. New fields will continue to
+///                 be added to `FlutterSemanticsCustomAction2`.
 typedef struct {
   /// The size of the struct. Must be sizeof(FlutterSemanticsCustomAction).
   size_t struct_size;
@@ -1142,7 +1405,37 @@ typedef struct {
   const char* hint;
 } FlutterSemanticsCustomAction;
 
+/// A custom semantics action, or action override.
+///
+/// Custom actions can be registered by applications in order to provide
+/// semantic actions other than the standard actions available through the
+/// `FlutterSemanticsAction` enum.
+///
+/// Action overrides are custom actions that the application developer requests
+/// to be used in place of the standard actions in the `FlutterSemanticsAction`
+/// enum.
+///
+/// @see
+/// https://api.flutter.dev/flutter/semantics/CustomSemanticsAction-class.html
+typedef struct {
+  /// The size of the struct. Must be sizeof(FlutterSemanticsCustomAction).
+  size_t struct_size;
+  /// The unique custom action or action override ID.
+  int32_t id;
+  /// For overridden standard actions, corresponds to the
+  /// `FlutterSemanticsAction` to override.
+  FlutterSemanticsAction override_action;
+  /// The user-readable name of this custom semantics action.
+  const char* label;
+  /// The hint description of this custom semantics action.
+  const char* hint;
+} FlutterSemanticsCustomAction2;
+
 /// A batch of updates to semantics nodes and custom actions.
+///
+/// @deprecated     Use `FlutterSemanticsUpdate2` instead. Adding members
+///                 to `FlutterSemanticsNode` or `FlutterSemanticsCustomAction`
+///                 breaks the ABI of this struct.
 typedef struct {
   /// The size of the struct. Must be sizeof(FlutterSemanticsUpdate).
   size_t struct_size;
@@ -1156,6 +1449,21 @@ typedef struct {
   FlutterSemanticsCustomAction* custom_actions;
 } FlutterSemanticsUpdate;
 
+/// A batch of updates to semantics nodes and custom actions.
+typedef struct {
+  /// The size of the struct. Must be sizeof(FlutterSemanticsUpdate2).
+  size_t struct_size;
+  /// The number of semantics node updates.
+  size_t node_count;
+  // Array of semantics node pointers. Has length `node_count`.
+  FlutterSemanticsNode2** nodes;
+  /// The number of semantics custom action updates.
+  size_t custom_action_count;
+  /// Array of semantics custom action pointers. Has length
+  /// `custom_action_count`.
+  FlutterSemanticsCustomAction2** custom_actions;
+} FlutterSemanticsUpdate2;
+
 typedef void (*FlutterUpdateSemanticsNodeCallback)(
     const FlutterSemanticsNode* /* semantics node */,
     void* /* user data */);
@@ -1168,6 +1476,24 @@ typedef void (*FlutterUpdateSemanticsCallback)(
     const FlutterSemanticsUpdate* /* semantics update */,
     void* /* user data*/);
 
+typedef void (*FlutterUpdateSemanticsCallback2)(
+    const FlutterSemanticsUpdate2* /* semantics update */,
+    void* /* user data*/);
+
+/// An update to whether a message channel has a listener set or not.
+typedef struct {
+  // The size of the struct. Must be sizeof(FlutterChannelUpdate).
+  size_t struct_size;
+  /// The name of the channel.
+  const char* channel;
+  /// True if a listener has been set, false if one has been cleared.
+  bool listening;
+} FlutterChannelUpdate;
+
+typedef void (*FlutterChannelUpdateCallback)(
+    const FlutterChannelUpdate* /* channel update */,
+    void* /* user data */);
+
 typedef struct _FlutterTaskRunner* FlutterTaskRunner;
 
 typedef struct {
@@ -1415,6 +1741,27 @@ typedef enum {
   kFlutterLayerContentTypePlatformView,
 } FlutterLayerContentType;
 
+/// A region represented by a collection of non-overlapping rectangles.
+typedef struct {
+  /// The size of this struct. Must be sizeof(FlutterRegion).
+  size_t struct_size;
+  /// Number of rectangles in the region.
+  size_t rects_count;
+  /// The rectangles that make up the region.
+  FlutterRect* rects;
+} FlutterRegion;
+
+/// Contains additional information about the backing store provided
+/// during presentation to the embedder.
+typedef struct {
+  size_t struct_size;
+
+  /// The area of the backing store that contains Flutter contents. Pixels
+  /// outside of this area are transparent and the embedder may choose not
+  /// to render them. Coordinates are in physical pixels.
+  FlutterRegion* paint_region;
+} FlutterBackingStorePresentInfo;
+
 typedef struct {
   /// This size of this struct. Must be sizeof(FlutterLayer).
   size_t struct_size;
@@ -1434,8 +1781,34 @@ typedef struct {
   FlutterPoint offset;
   /// The size of the layer (in physical pixels).
   FlutterSize size;
+
+  /// Extra information for the backing store that the embedder may
+  /// use during presentation.
+  FlutterBackingStorePresentInfo* backing_store_present_info;
+
+  // Time in nanoseconds at which this frame is scheduled to be presented. 0 if
+  // not known. See FlutterEngineGetCurrentTime().
+  uint64_t presentation_time;
 } FlutterLayer;
 
+typedef struct {
+  /// The size of this struct.
+  /// Must be sizeof(FlutterPresentViewInfo).
+  size_t struct_size;
+
+  /// The identifier of the target view.
+  FlutterViewId view_id;
+
+  /// The layers that should be composited onto the view.
+  const FlutterLayer** layers;
+
+  /// The count of layers.
+  size_t layers_count;
+
+  /// The |FlutterCompositor.user_data|.
+  void* user_data;
+} FlutterPresentViewInfo;
+
 typedef bool (*FlutterBackingStoreCreateCallback)(
     const FlutterBackingStoreConfig* config,
     FlutterBackingStore* backing_store_out,
@@ -1449,13 +1822,20 @@ typedef bool (*FlutterLayersPresentCallback)(const FlutterLayer** layers,
                                              size_t layers_count,
                                              void* user_data);
 
+/// The callback invoked when the embedder should present to a view.
+///
+/// The |FlutterPresentViewInfo| will be deallocated once the callback returns.
+typedef bool (*FlutterPresentViewCallback)(
+    const FlutterPresentViewInfo* /* present info */);
+
 typedef struct {
   /// This size of this struct. Must be sizeof(FlutterCompositor).
   size_t struct_size;
   /// A baton that in not interpreted by the engine in any way. If it passed
   /// back to the embedder in `FlutterCompositor.create_backing_store_callback`,
-  /// `FlutterCompositor.collect_backing_store_callback` and
-  /// `FlutterCompositor.present_layers_callback`
+  /// `FlutterCompositor.collect_backing_store_callback`,
+  /// `FlutterCompositor.present_layers_callback`, and
+  /// `FlutterCompositor.present_view_callback`.
   void* user_data;
   /// A callback invoked by the engine to obtain a backing store for a specific
   /// `FlutterLayer`.
@@ -1469,10 +1849,23 @@ typedef struct {
   /// embedder may collect any resources associated with the backing store.
   FlutterBackingStoreCollectCallback collect_backing_store_callback;
   /// Callback invoked by the engine to composite the contents of each layer
-  /// onto the screen.
+  /// onto the implicit view.
+  ///
+  /// DEPRECATED: Use |present_view_callback| to support multiple views.
+  ///
+  /// Only one of `present_layers_callback` and `present_view_callback` may be
+  /// provided. Providing both is an error and engine initialization will
+  /// terminate.
   FlutterLayersPresentCallback present_layers_callback;
   /// Avoid caching backing stores provided by this compositor.
   bool avoid_backing_store_cache;
+  /// Callback invoked by the engine to composite the contents of each layer
+  /// onto the specified view.
+  ///
+  /// Only one of `present_layers_callback` and `present_view_callback` may be
+  /// provided. Providing both is an error and engine initialization will
+  /// terminate.
+  FlutterPresentViewCallback present_view_callback;
 } FlutterCompositor;
 
 typedef struct {
@@ -1511,11 +1904,6 @@ typedef const FlutterLocale* (*FlutterComputePlatformResolvedLocaleCallback)(
     const FlutterLocale** /* supported_locales*/,
     size_t /* Number of locales*/);
 
-/// Display refers to a graphics hardware system consisting of a framebuffer,
-/// typically a monitor or a screen. This ID is unique per display and is
-/// stable until the Flutter application restarts.
-typedef uint64_t FlutterEngineDisplayId;
-
 typedef struct {
   /// This size of this struct. Must be sizeof(FlutterDisplay).
   size_t struct_size;
@@ -1531,6 +1919,16 @@ typedef struct {
   /// This represents the refresh period in frames per second. This value may be
   /// zero if the device is not running or unavailable or unknown.
   double refresh_rate;
+
+  /// The width of the display, in physical pixels.
+  size_t width;
+
+  /// The height of the display, in physical pixels.
+  size_t height;
+
+  /// The pixel ratio of the display, which is used to convert physical pixels
+  /// to logical pixels.
+  double device_pixel_ratio;
 } FlutterEngineDisplay;
 
 /// The update type parameter that is passed to
@@ -1772,9 +2170,11 @@ typedef struct {
   /// The callback will be invoked on the thread on which the `FlutterEngineRun`
   /// call is made.
   ///
-  /// @deprecated    Prefer using `update_semantics_callback` instead. If this
-  ///                calback is provided, `update_semantics_callback` must not
-  ///                be provided.
+  /// @deprecated    Use `update_semantics_callback2` instead. Only one of
+  ///                `update_semantics_node_callback`,
+  ///                `update_semantics_callback`, and
+  ///                `update_semantics_callback2` may be provided; the others
+  ///                should be set to null.
   FlutterUpdateSemanticsNodeCallback update_semantics_node_callback;
   /// The legacy callback invoked by the engine in order to give the embedder
   /// the chance to respond to updates to semantics custom actions from the Dart
@@ -1786,9 +2186,11 @@ typedef struct {
   /// The callback will be invoked on the thread on which the `FlutterEngineRun`
   /// call is made.
   ///
-  /// @deprecated    Prefer using `update_semantics_callback` instead. If this
-  ///                calback is provided, `update_semantics_callback` must not
-  ///                be provided.
+  /// @deprecated    Use `update_semantics_callback2` instead. Only one of
+  ///                `update_semantics_node_callback`,
+  ///                `update_semantics_callback`, and
+  ///                `update_semantics_callback2` may be provided; the others
+  ///                should be set to null.
   FlutterUpdateSemanticsCustomActionCallback
       update_semantics_custom_action_callback;
   /// Path to a directory used to store data that is cached across runs of a
@@ -1933,13 +2335,35 @@ typedef struct {
   /// The callback will be invoked on the thread on which the `FlutterEngineRun`
   /// call is made.
   ///
-  /// If this callback is provided, update_semantics_node_callback and
-  /// update_semantics_custom_action_callback must not be provided.
+  /// @deprecated    Use `update_semantics_callback2` instead. Only one of
+  ///                `update_semantics_node_callback`,
+  ///                `update_semantics_callback`, and
+  ///                `update_semantics_callback2` may be provided; the others
+  ///                must be set to null.
   FlutterUpdateSemanticsCallback update_semantics_callback;
+
+  /// The callback invoked by the engine in order to give the embedder the
+  /// chance to respond to updates to semantics nodes and custom actions from
+  /// the Dart application.
+  ///
+  /// The callback will be invoked on the thread on which the `FlutterEngineRun`
+  /// call is made.
+  ///
+  /// Only one of `update_semantics_node_callback`, `update_semantics_callback`,
+  /// and `update_semantics_callback2` may be provided; the others must be set
+  /// to null.
+  FlutterUpdateSemanticsCallback2 update_semantics_callback2;
+
+  /// The callback invoked by the engine in response to a channel listener
+  /// being registered on the framework side. The callback is invoked from
+  /// a task posted to the platform thread.
+  FlutterChannelUpdateCallback channel_update_callback;
 } FlutterProjectArgs;
 
 #ifndef FLUTTER_ENGINE_NO_PROTOTYPES
 
+// NOLINTBEGIN(google-objc-function-naming)
+
 //------------------------------------------------------------------------------
 /// @brief      Creates the necessary data structures to launch a Flutter Dart
 ///             application in AOT mode. The data may only be collected after
@@ -2081,6 +2505,25 @@ FLUTTER_EXPORT
 FlutterEngineResult FlutterEngineRunInitialized(
     FLUTTER_API_SYMBOL(FlutterEngine) engine);
 
+//------------------------------------------------------------------------------
+/// @brief      Removes a view.
+///
+///             This is an asynchronous operation. The view's resources must not
+///             be cleaned up until the |remove_view_callback| is invoked with
+///             a |removed| value of `true`.
+///
+/// @param[in]  engine  A running engine instance.
+/// @param[in]  info    The remove view arguments. This can be deallocated
+///                     once |FlutterEngineRemoveView| returns, before
+///                     |remove_view_callback| is invoked.
+///
+/// @return     The result of *starting* the asynchronous operation. If
+///             `kSuccess`, the |remove_view_callback| will be invoked.
+FLUTTER_EXPORT
+FlutterEngineResult FlutterEngineRemoveView(FLUTTER_API_SYMBOL(FlutterEngine)
+                                                engine,
+                                            const FlutterRemoveViewInfo* info);
+
 FLUTTER_EXPORT
 FlutterEngineResult FlutterEngineSendWindowMetricsEvent(
     FLUTTER_API_SYMBOL(FlutterEngine) engine,
@@ -2277,8 +2720,8 @@ FlutterEngineResult FlutterEngineMarkExternalTextureFrameAvailable(
 /// @param[in]  engine     A running engine instance.
 /// @param[in]  enabled    When enabled, changes to the semantic contents of the
 ///                        window are sent via the
-///                        `FlutterUpdateSemanticsCallback` registered to
-///                        `update_semantics_callback` in
+///                        `FlutterUpdateSemanticsCallback2` registered to
+///                        `update_semantics_callback2` in
 ///                        `FlutterProjectArgs`.
 ///
 /// @return     The result of the call.
@@ -2305,7 +2748,7 @@ FlutterEngineResult FlutterEngineUpdateAccessibilityFeatures(
 /// @brief      Dispatch a semantics action to the specified semantics node.
 ///
 /// @param[in]  engine       A running engine instance.
-/// @param[in]  identifier   The semantics action identifier.
+/// @param[in]  node_id      The semantics node identifier.
 /// @param[in]  action       The semantics action.
 /// @param[in]  data         Data associated with the action.
 /// @param[in]  data_length  The data length.
@@ -2315,7 +2758,7 @@ FlutterEngineResult FlutterEngineUpdateAccessibilityFeatures(
 FLUTTER_EXPORT
 FlutterEngineResult FlutterEngineDispatchSemanticsAction(
     FLUTTER_API_SYMBOL(FlutterEngine) engine,
-    uint64_t id,
+    uint64_t node_id,
     FlutterSemanticsAction action,
     const uint8_t* data,
     size_t data_length);
@@ -2811,8 +3254,10 @@ FLUTTER_EXPORT
 FlutterEngineResult FlutterEngineGetProcAddresses(
     FlutterEngineProcTable* table);
 
+// NOLINTEND(google-objc-function-naming)
+
 #if defined(__cplusplus)
 }  // extern "C"
 #endif
 
-#endif  // FLUTTER_EMBEDDER_H_
+#endif  // FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_H_
diff --git a/shell/platform/embedder/embedder_engine.cc b/shell/platform/embedder/embedder_engine.cc
index 498546c0892203157c15a366fc0afda98fe5920e..b34da8a287f4e0e788f30ad6c8ab7a13c9b04f19 100644
--- a/shell/platform/embedder/embedder_engine.cc
+++ b/shell/platform/embedder/embedder_engine.cc
@@ -100,6 +100,7 @@ bool EmbedderEngine::NotifyDestroyed() {
 }
 
 bool EmbedderEngine::SetViewportMetrics(
+    int64_t view_id,
     const flutter::ViewportMetrics& metrics) {
   if (!IsValid()) {
     return false;
@@ -109,7 +110,7 @@ bool EmbedderEngine::SetViewportMetrics(
   if (!platform_view) {
     return false;
   }
-  platform_view->SetViewportMetrics(metrics);
+  platform_view->SetViewportMetrics(view_id, metrics);
   return true;
 }
 
@@ -193,7 +194,7 @@ bool EmbedderEngine::SetAccessibilityFeatures(int32_t flags) {
   return true;
 }
 
-bool EmbedderEngine::DispatchSemanticsAction(int id,
+bool EmbedderEngine::DispatchSemanticsAction(int node_id,
                                              flutter::SemanticsAction action,
                                              fml::MallocMapping args) {
   if (!IsValid()) {
@@ -203,7 +204,7 @@ bool EmbedderEngine::DispatchSemanticsAction(int id,
   if (!platform_view) {
     return false;
   }
-  platform_view->DispatchSemanticsAction(id, action, std::move(args));
+  platform_view->DispatchSemanticsAction(node_id, action, std::move(args));
   return true;
 }
 
diff --git a/shell/platform/embedder/embedder_engine.h b/shell/platform/embedder/embedder_engine.h
index 80d2cbeffa8d006dc00483f5c2331ffa9b2224f0..a587eeb3eaa7453292596f52a5b250f1841f0c2f 100644
--- a/shell/platform/embedder/embedder_engine.h
+++ b/shell/platform/embedder/embedder_engine.h
@@ -48,7 +48,8 @@ class EmbedderEngine {
 
   bool IsValid() const;
 
-  bool SetViewportMetrics(const flutter::ViewportMetrics& metrics);
+  bool SetViewportMetrics(int64_t view_id,
+                          const flutter::ViewportMetrics& metrics);
 
   bool DispatchPointerDataPacket(
       std::unique_ptr<flutter::PointerDataPacket> packet);
@@ -65,7 +66,7 @@ class EmbedderEngine {
 
   bool SetAccessibilityFeatures(int32_t flags);
 
-  bool DispatchSemanticsAction(int id,
+  bool DispatchSemanticsAction(int node_id,
                                flutter::SemanticsAction action,
                                fml::MallocMapping args);
 
diff --git a/shell/platform/embedder/embedder_external_texture_gl.cc b/shell/platform/embedder/embedder_external_texture_gl.cc
index 2454ce8782ba46e567cd194aaf829c48ff08b863..bbf30d143d13300dcb8ebebfb42f98e6d99e5479 100644
--- a/shell/platform/embedder/embedder_external_texture_gl.cc
+++ b/shell/platform/embedder/embedder_external_texture_gl.cc
@@ -14,6 +14,9 @@
 #include "third_party/skia/include/core/SkSize.h"
 #include "third_party/skia/include/gpu/GrBackendSurface.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
+#include "third_party/skia/include/gpu/ganesh/SkImageGanesh.h"
+#include "third_party/skia/include/gpu/ganesh/gl/GrGLBackendSurface.h"
+#include "third_party/skia/include/gpu/gl/GrGLTypes.h"
 
 namespace flutter {
 
@@ -30,7 +33,7 @@ EmbedderExternalTextureGL::~EmbedderExternalTextureGL() = default;
 void EmbedderExternalTextureGL::Paint(PaintContext& context,
                                       const SkRect& bounds,
                                       bool freeze,
-                                      const SkSamplingOptions& sampling) {
+                                      const DlImageSampling sampling) {
   if (last_image_ == nullptr) {
     last_image_ =
         ResolveTexture(Id(),                                           //
@@ -39,19 +42,20 @@ void EmbedderExternalTextureGL::Paint(PaintContext& context,
         );
   }
 
-  SkCanvas& canvas = *context.canvas;
-  const SkPaint* paint = context.sk_paint;
+  DlCanvas* canvas = context.canvas;
+  const DlPaint* paint = context.paint;
 
   if (last_image_) {
-    if (bounds != SkRect::Make(last_image_->bounds())) {
-      canvas.drawImageRect(last_image_, bounds, sampling, paint);
+    SkRect image_bounds = SkRect::Make(last_image_->bounds());
+    if (bounds != image_bounds) {
+      canvas->DrawImageRect(last_image_, image_bounds, bounds, sampling, paint);
     } else {
-      canvas.drawImage(last_image_, bounds.x(), bounds.y(), sampling, paint);
+      canvas->DrawImage(last_image_, {bounds.x(), bounds.y()}, sampling, paint);
     }
   }
 }
 
-sk_sp<SkImage> EmbedderExternalTextureGL::ResolveTexture(
+sk_sp<DlImage> EmbedderExternalTextureGL::ResolveTexture(
     int64_t texture_id,
     GrDirectContext* context,
     const SkISize& size) {
@@ -75,18 +79,18 @@ sk_sp<SkImage> EmbedderExternalTextureGL::ResolveTexture(
     height = texture->height;
   }
 
-  GrBackendTexture gr_backend_texture(width, height, GrMipMapped::kNo,
-                                      gr_texture_info);
-  SkImage::TextureReleaseProc release_proc = texture->destruction_callback;
+  auto gr_backend_texture = GrBackendTextures::MakeGL(
+      width, height, skgpu::Mipmapped::kNo, gr_texture_info);
+  SkImages::TextureReleaseProc release_proc = texture->destruction_callback;
   auto image =
-      SkImage::MakeFromTexture(context,                   // context
-                               gr_backend_texture,        // texture handle
-                               kTopLeft_GrSurfaceOrigin,  // origin
-                               kRGBA_8888_SkColorType,    // color type
-                               kPremul_SkAlphaType,       // alpha type
-                               nullptr,                   // colorspace
-                               release_proc,       // texture release proc
-                               texture->user_data  // texture release context
+      SkImages::BorrowTextureFrom(context,                   // context
+                                  gr_backend_texture,        // texture handle
+                                  kTopLeft_GrSurfaceOrigin,  // origin
+                                  kRGBA_8888_SkColorType,    // color type
+                                  kPremul_SkAlphaType,       // alpha type
+                                  nullptr,                   // colorspace
+                                  release_proc,       // texture release proc
+                                  texture->user_data  // texture release context
       );
 
   if (!image) {
@@ -99,7 +103,8 @@ sk_sp<SkImage> EmbedderExternalTextureGL::ResolveTexture(
     return nullptr;
   }
 
-  return image;
+  // This image should not escape local use by EmbedderExternalTextureGL
+  return DlImage::Make(std::move(image));
 }
 
 // |flutter::Texture|
diff --git a/shell/platform/embedder/embedder_external_texture_gl.h b/shell/platform/embedder/embedder_external_texture_gl.h
index 6d5585f352493f14c530ef1bc7a696845d56df2e..b01991d0cf1dffe1c18f3e9ed8f3853aab5deb0d 100644
--- a/shell/platform/embedder/embedder_external_texture_gl.h
+++ b/shell/platform/embedder/embedder_external_texture_gl.h
@@ -8,7 +8,6 @@
 #include "flutter/common/graphics/texture.h"
 #include "flutter/fml/macros.h"
 #include "flutter/shell/platform/embedder/embedder.h"
-#include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkSize.h"
 
 namespace flutter {
@@ -25,9 +24,9 @@ class EmbedderExternalTextureGL : public flutter::Texture {
 
  private:
   const ExternalTextureCallback& external_texture_callback_;
-  sk_sp<SkImage> last_image_;
+  sk_sp<DlImage> last_image_;
 
-  sk_sp<SkImage> ResolveTexture(int64_t texture_id,
+  sk_sp<DlImage> ResolveTexture(int64_t texture_id,
                                 GrDirectContext* context,
                                 const SkISize& size);
 
@@ -35,7 +34,7 @@ class EmbedderExternalTextureGL : public flutter::Texture {
   void Paint(PaintContext& context,
              const SkRect& bounds,
              bool freeze,
-             const SkSamplingOptions& sampling) override;
+             const DlImageSampling sampling) override;
 
   // |flutter::Texture|
   void OnGrContextCreated() override;
diff --git a/shell/platform/embedder/embedder_external_texture_metal.h b/shell/platform/embedder/embedder_external_texture_metal.h
index 6aa0908aeda755f0aeda58ded4c85c0cbd0e867f..ac72fb28b9ccc73459817541144d460dfb817f16 100644
--- a/shell/platform/embedder/embedder_external_texture_metal.h
+++ b/shell/platform/embedder/embedder_external_texture_metal.h
@@ -25,9 +25,9 @@ class EmbedderExternalTextureMetal : public flutter::Texture {
 
  private:
   const ExternalTextureCallback& external_texture_callback_;
-  sk_sp<SkImage> last_image_;
+  sk_sp<DlImage> last_image_;
 
-  sk_sp<SkImage> ResolveTexture(int64_t texture_id,
+  sk_sp<DlImage> ResolveTexture(int64_t texture_id,
                                 GrDirectContext* context,
                                 const SkISize& size);
 
@@ -35,7 +35,7 @@ class EmbedderExternalTextureMetal : public flutter::Texture {
   void Paint(PaintContext& context,
              const SkRect& bounds,
              bool freeze,
-             const SkSamplingOptions& sampling) override;
+             const DlImageSampling sampling) override;
 
   // |flutter::Texture|
   void OnGrContextCreated() override;
diff --git a/shell/platform/embedder/embedder_external_texture_metal.mm b/shell/platform/embedder/embedder_external_texture_metal.mm
index e71e1ab77e9d108caf8cf5d74a5bd6e244def641..4e825e8cacde25a864d69daf689d150649bbff55 100644
--- a/shell/platform/embedder/embedder_external_texture_metal.mm
+++ b/shell/platform/embedder/embedder_external_texture_metal.mm
@@ -35,25 +35,26 @@ EmbedderExternalTextureMetal::~EmbedderExternalTextureMetal() = default;
 void EmbedderExternalTextureMetal::Paint(PaintContext& context,
                                          const SkRect& bounds,
                                          bool freeze,
-                                         const SkSamplingOptions& sampling) {
+                                         const DlImageSampling sampling) {
   if (last_image_ == nullptr) {
     last_image_ =
         ResolveTexture(Id(), context.gr_context, SkISize::Make(bounds.width(), bounds.height()));
   }
 
-  SkCanvas& canvas = *context.canvas;
-  const SkPaint* paint = context.sk_paint;
+  DlCanvas* canvas = context.canvas;
+  const DlPaint* paint = context.paint;
 
   if (last_image_) {
-    if (bounds != SkRect::Make(last_image_->bounds())) {
-      canvas.drawImageRect(last_image_, bounds, sampling, paint);
+    SkRect image_bounds = SkRect::Make(last_image_->bounds());
+    if (bounds != image_bounds) {
+      canvas->DrawImageRect(last_image_, image_bounds, bounds, sampling, paint);
     } else {
-      canvas.drawImage(last_image_, bounds.x(), bounds.y(), sampling, paint);
+      canvas->DrawImage(last_image_, {bounds.x(), bounds.y()}, sampling, paint);
     }
   }
 }
 
-sk_sp<SkImage> EmbedderExternalTextureMetal::ResolveTexture(int64_t texture_id,
+sk_sp<DlImage> EmbedderExternalTextureMetal::ResolveTexture(int64_t texture_id,
                                                             GrDirectContext* context,
                                                             const SkISize& size) {
   std::unique_ptr<FlutterMetalExternalTexture> texture =
@@ -99,7 +100,8 @@ sk_sp<SkImage> EmbedderExternalTextureMetal::ResolveTexture(int64_t texture_id,
     FML_LOG(ERROR) << "Could not create external texture: " << texture_id;
   }
 
-  return image;
+  // This image should not escape local use by EmbedderExternalTextureMetal
+  return DlImage::Make(std::move(image));
 }
 
 // |flutter::Texture|
diff --git a/shell/platform/embedder/embedder_external_view.cc b/shell/platform/embedder/embedder_external_view.cc
index e5ca23d0fb130a7d2a1ab371023831733990eb94..592b89f9fdba2426e88ddbe1f82722b52365022f 100644
--- a/shell/platform/embedder/embedder_external_view.cc
+++ b/shell/platform/embedder/embedder_external_view.cc
@@ -3,8 +3,14 @@
 // found in the LICENSE file.
 
 #include "flutter/shell/platform/embedder/embedder_external_view.h"
+
+#include "flutter/display_list/dl_builder.h"
 #include "flutter/fml/trace_event.h"
-#include "flutter/shell/common/canvas_spy.h"
+#include "flutter/shell/common/dl_op_spy.h"
+
+#ifdef IMPELLER_SUPPORTS_RENDERING
+#include "impeller/display_list/dl_dispatcher.h"  // nogncheck
+#endif                                            // IMPELLER_SUPPORTS_RENDERING
 
 namespace flutter {
 
@@ -30,20 +36,18 @@ EmbedderExternalView::EmbedderExternalView(
       surface_transformation_(surface_transformation),
       view_identifier_(view_identifier),
       embedded_view_params_(std::move(params)),
-      recorder_(std::make_unique<SkPictureRecorder>()),
-      canvas_spy_(std::make_unique<CanvasSpy>(
-          recorder_->beginRecording(frame_size.width(), frame_size.height()))) {
-}
+      slice_(std::make_unique<DisplayListEmbedderViewSlice>(
+          SkRect::Make(frame_size))) {}
 
 EmbedderExternalView::~EmbedderExternalView() = default;
 
 EmbedderExternalView::RenderTargetDescriptor
 EmbedderExternalView::CreateRenderTargetDescriptor() const {
-  return {view_identifier_, render_surface_size_};
+  return RenderTargetDescriptor(render_surface_size_);
 }
 
-SkCanvas* EmbedderExternalView::GetCanvas() const {
-  return canvas_spy_->GetSpyingCanvas();
+DlCanvas* EmbedderExternalView::GetCanvas() {
+  return slice_->canvas();
 }
 
 SkISize EmbedderExternalView::GetRenderSurfaceSize() const {
@@ -58,8 +62,20 @@ bool EmbedderExternalView::HasPlatformView() const {
   return view_identifier_.platform_view_id.has_value();
 }
 
-bool EmbedderExternalView::HasEngineRenderedContents() const {
-  return canvas_spy_->DidDrawIntoCanvas();
+const DlRegion& EmbedderExternalView::GetDlRegion() const {
+  return slice_->getRegion();
+}
+
+bool EmbedderExternalView::HasEngineRenderedContents() {
+  if (has_engine_rendered_contents_.has_value()) {
+    return has_engine_rendered_contents_.value();
+  }
+  TryEndRecording();
+  DlOpSpy dl_op_spy;
+  slice_->dispatch(dl_op_spy);
+  has_engine_rendered_contents_ = dl_op_spy.did_draw() && !slice_->is_empty();
+  // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
+  return has_engine_rendered_contents_.value();
 }
 
 EmbedderExternalView::ViewIdentifier EmbedderExternalView::GetViewIdentifier()
@@ -71,37 +87,59 @@ const EmbeddedViewParams* EmbedderExternalView::GetEmbeddedViewParams() const {
   return embedded_view_params_.get();
 }
 
-bool EmbedderExternalView::Render(const EmbedderRenderTarget& render_target) {
+bool EmbedderExternalView::Render(const EmbedderRenderTarget& render_target,
+                                  bool clear_surface) {
   TRACE_EVENT0("flutter", "EmbedderExternalView::Render");
-
+  TryEndRecording();
   FML_DCHECK(HasEngineRenderedContents())
       << "Unnecessarily asked to render into a render target when there was "
          "nothing to render.";
 
-  auto picture = recorder_->finishRecordingAsPicture();
-  if (!picture) {
-    return false;
+#ifdef IMPELLER_SUPPORTS_RENDERING
+  auto* impeller_target = render_target.GetImpellerRenderTarget();
+  if (impeller_target) {
+    auto aiks_context = render_target.GetAiksContext();
+
+    auto dl_builder = DisplayListBuilder();
+    dl_builder.SetTransform(&surface_transformation_);
+    slice_->render_into(&dl_builder);
+
+    auto dispatcher = impeller::DlDispatcher();
+    dispatcher.drawDisplayList(dl_builder.Build(), 1);
+    return aiks_context->Render(dispatcher.EndRecordingAsPicture(),
+                                *impeller_target, /*reset_host_buffer=*/true);
   }
+#endif  // IMPELLER_SUPPORTS_RENDERING
 
-  auto surface = render_target.GetRenderSurface();
-  if (!surface) {
+  auto skia_surface = render_target.GetSkiaSurface();
+  if (!skia_surface) {
     return false;
   }
 
-  FML_DCHECK(SkISize::Make(surface->width(), surface->height()) ==
-             render_surface_size_);
+  FML_DCHECK(render_target.GetRenderTargetSize() == render_surface_size_);
 
-  auto canvas = surface->getCanvas();
+  auto canvas = skia_surface->getCanvas();
   if (!canvas) {
     return false;
   }
-
-  canvas->setMatrix(surface_transformation_);
-  canvas->clear(SK_ColorTRANSPARENT);
-  canvas->drawPicture(picture);
-  canvas->flush();
+  DlSkCanvasAdapter dl_canvas(canvas);
+  int restore_count = dl_canvas.GetSaveCount();
+  dl_canvas.SetTransform(surface_transformation_);
+  if (clear_surface) {
+    dl_canvas.Clear(DlColor::kTransparent());
+  }
+  slice_->render_into(&dl_canvas);
+  dl_canvas.RestoreToCount(restore_count);
+  dl_canvas.Flush();
 
   return true;
 }
 
+void EmbedderExternalView::TryEndRecording() const {
+  if (slice_->recording_ended()) {
+    return;
+  }
+  slice_->end_recording();
+}
+
 }  // namespace flutter
diff --git a/shell/platform/embedder/embedder_external_view.h b/shell/platform/embedder/embedder_external_view.h
index 59fcf4260b2cf40538335429d5e5f5a516a780a5..f2557cb508d822ca89b71206c2cc9e3ac4968387 100644
--- a/shell/platform/embedder/embedder_external_view.h
+++ b/shell/platform/embedder/embedder_external_view.h
@@ -12,9 +12,7 @@
 #include "flutter/flow/embedded_views.h"
 #include "flutter/fml/hash_combine.h"
 #include "flutter/fml/macros.h"
-#include "flutter/shell/common/canvas_spy.h"
 #include "flutter/shell/platform/embedder/embedder_render_target.h"
-#include "third_party/skia/include/core/SkPictureRecorder.h"
 
 namespace flutter {
 
@@ -48,28 +46,23 @@ class EmbedderExternalView {
   };
 
   struct RenderTargetDescriptor {
-    ViewIdentifier view_identifier;
     SkISize surface_size;
 
-    RenderTargetDescriptor(ViewIdentifier p_view_identifier,
-                           SkISize p_surface_size)
-        : view_identifier(p_view_identifier), surface_size(p_surface_size) {}
+    explicit RenderTargetDescriptor(const SkISize& p_surface_size)
+        : surface_size(p_surface_size) {}
 
     struct Hash {
       constexpr std::size_t operator()(
           const RenderTargetDescriptor& desc) const {
         return fml::HashCombine(desc.surface_size.width(),
-                                desc.surface_size.height(),
-                                ViewIdentifier::Hash{}(desc.view_identifier));
+                                desc.surface_size.height());
       }
     };
 
     struct Equal {
       bool operator()(const RenderTargetDescriptor& lhs,
                       const RenderTargetDescriptor& rhs) const {
-        return lhs.surface_size == rhs.surface_size &&
-               ViewIdentifier::Equal{}(lhs.view_identifier,
-                                       rhs.view_identifier);
+        return lhs.surface_size == rhs.surface_size;
       }
     };
   };
@@ -97,7 +90,7 @@ class EmbedderExternalView {
 
   bool HasPlatformView() const;
 
-  bool HasEngineRenderedContents() const;
+  bool HasEngineRenderedContents();
 
   ViewIdentifier GetViewIdentifier() const;
 
@@ -105,19 +98,26 @@ class EmbedderExternalView {
 
   RenderTargetDescriptor CreateRenderTargetDescriptor() const;
 
-  SkCanvas* GetCanvas() const;
+  DlCanvas* GetCanvas();
 
   SkISize GetRenderSurfaceSize() const;
 
-  bool Render(const EmbedderRenderTarget& render_target);
+  bool Render(const EmbedderRenderTarget& render_target,
+              bool clear_surface = true);
+
+  const DlRegion& GetDlRegion() const;
 
  private:
+  // End the recording of the slice.
+  // Noop if the slice's recording has already ended.
+  void TryEndRecording() const;
+
   const SkISize render_surface_size_;
   const SkMatrix surface_transformation_;
   ViewIdentifier view_identifier_;
   std::unique_ptr<EmbeddedViewParams> embedded_view_params_;
-  std::unique_ptr<SkPictureRecorder> recorder_;
-  std::unique_ptr<CanvasSpy> canvas_spy_;
+  std::unique_ptr<DisplayListEmbedderViewSlice> slice_;
+  std::optional<bool> has_engine_rendered_contents_;
 
   FML_DISALLOW_COPY_AND_ASSIGN(EmbedderExternalView);
 };
diff --git a/shell/platform/embedder/embedder_external_view_embedder.cc b/shell/platform/embedder/embedder_external_view_embedder.cc
index 0e61db48ce8d8e622234d57dc117e4c1c4518651..1e9ddf90c4390a69c65a1e2ab12c84633d4fffb6 100644
--- a/shell/platform/embedder/embedder_external_view_embedder.cc
+++ b/shell/platform/embedder/embedder_external_view_embedder.cc
@@ -4,15 +4,18 @@
 
 #include "flutter/shell/platform/embedder/embedder_external_view_embedder.h"
 
-#include <algorithm>
+#include <cassert>
 #include <utility>
 
+#include "flutter/common/constants.h"
 #include "flutter/shell/platform/embedder/embedder_layers.h"
 #include "flutter/shell/platform/embedder/embedder_render_target.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
 
 namespace flutter {
 
+static const auto kRootViewIdentifier = EmbedderExternalView::ViewIdentifier{};
+
 EmbedderExternalViewEmbedder::EmbedderExternalViewEmbedder(
     bool avoid_backing_store_cache,
     const CreateRenderTargetCallback& create_render_target_callback,
@@ -51,19 +54,19 @@ void EmbedderExternalViewEmbedder::CancelFrame() {
 
 // |ExternalViewEmbedder|
 void EmbedderExternalViewEmbedder::BeginFrame(
-    SkISize frame_size,
     GrDirectContext* context,
-    double device_pixel_ratio,
-    fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
+    const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {}
+
+// |ExternalViewEmbedder|
+void EmbedderExternalViewEmbedder::PrepareFlutterView(
+    SkISize frame_size,
+    double device_pixel_ratio) {
   Reset();
 
   pending_frame_size_ = frame_size;
   pending_device_pixel_ratio_ = device_pixel_ratio;
   pending_surface_transformation_ = GetSurfaceTransformation();
 
-  static const auto kRootViewIdentifier =
-      EmbedderExternalView::ViewIdentifier{};
-
   pending_views_[kRootViewIdentifier] = std::make_unique<EmbedderExternalView>(
       pending_frame_size_, pending_surface_transformation_);
   composition_order_.push_back(kRootViewIdentifier);
@@ -71,7 +74,7 @@ void EmbedderExternalViewEmbedder::BeginFrame(
 
 // |ExternalViewEmbedder|
 void EmbedderExternalViewEmbedder::PrerollCompositeEmbeddedView(
-    int view_id,
+    int64_t view_id,
     std::unique_ptr<EmbeddedViewParams> params) {
   auto vid = EmbedderExternalView::ViewIdentifier(view_id);
   FML_DCHECK(pending_views_.count(vid) == 0);
@@ -86,8 +89,8 @@ void EmbedderExternalViewEmbedder::PrerollCompositeEmbeddedView(
 }
 
 // |ExternalViewEmbedder|
-SkCanvas* EmbedderExternalViewEmbedder::GetRootCanvas() {
-  auto found = pending_views_.find(EmbedderExternalView::ViewIdentifier{});
+DlCanvas* EmbedderExternalViewEmbedder::GetRootCanvas() {
+  auto found = pending_views_.find(kRootViewIdentifier);
   if (found == pending_views_.end()) {
     FML_DLOG(WARNING)
         << "No root canvas could be found. This is extremely unlikely and "
@@ -99,35 +102,15 @@ SkCanvas* EmbedderExternalViewEmbedder::GetRootCanvas() {
 }
 
 // |ExternalViewEmbedder|
-std::vector<SkCanvas*> EmbedderExternalViewEmbedder::GetCurrentCanvases() {
-  std::vector<SkCanvas*> canvases;
-  for (const auto& view : pending_views_) {
-    const auto& external_view = view.second;
-    // This method (for legacy reasons) expects non-root current canvases.
-    if (!external_view->IsRootView()) {
-      canvases.push_back(external_view->GetCanvas());
-    }
-  }
-  return canvases;
-}
-
-// |ExternalViewEmbedder|
-std::vector<DisplayListBuilder*>
-EmbedderExternalViewEmbedder::GetCurrentBuilders() {
-  return std::vector<DisplayListBuilder*>({});
-}
-
-// |ExternalViewEmbedder|
-EmbedderPaintContext EmbedderExternalViewEmbedder::CompositeEmbeddedView(
-    int view_id) {
+DlCanvas* EmbedderExternalViewEmbedder::CompositeEmbeddedView(int64_t view_id) {
   auto vid = EmbedderExternalView::ViewIdentifier(view_id);
   auto found = pending_views_.find(vid);
   if (found == pending_views_.end()) {
     FML_DCHECK(false) << "Attempted to composite a view that was not "
                          "pre-rolled.";
-    return {nullptr, nullptr};
+    return nullptr;
   }
-  return {found->second->GetCanvas(), nullptr};
+  return found->second->GetCanvas();
 }
 
 static FlutterBackingStoreConfig MakeBackingStoreConfig(
@@ -142,66 +125,337 @@ static FlutterBackingStoreConfig MakeBackingStoreConfig(
   return config;
 }
 
-// |ExternalViewEmbedder|
-void EmbedderExternalViewEmbedder::SubmitFrame(
+namespace {
+
+struct PlatformView {
+  EmbedderExternalView::ViewIdentifier view_identifier;
+  const EmbeddedViewParams* params;
+
+  // The frame of the platform view, after clipping, in screen coordinates.
+  SkRect clipped_frame;
+
+  explicit PlatformView(const EmbedderExternalView* view) {
+    FML_DCHECK(view->HasPlatformView());
+    view_identifier = view->GetViewIdentifier();
+    params = view->GetEmbeddedViewParams();
+
+    clipped_frame = view->GetEmbeddedViewParams()->finalBoundingRect();
+    SkMatrix transform;
+    for (auto i = params->mutatorsStack().Begin();
+         i != params->mutatorsStack().End(); ++i) {
+      const auto& m = *i;
+      switch (m->GetType()) {
+        case kClipRect: {
+          auto rect = transform.mapRect(m->GetRect());
+          if (!clipped_frame.intersect(rect)) {
+            clipped_frame = SkRect::MakeEmpty();
+          }
+          break;
+        }
+        case kClipRRect: {
+          auto rect = transform.mapRect(m->GetRRect().getBounds());
+          if (!clipped_frame.intersect(rect)) {
+            clipped_frame = SkRect::MakeEmpty();
+          }
+          break;
+        }
+        case kClipPath: {
+          auto rect = transform.mapRect(m->GetPath().getBounds());
+          if (!clipped_frame.intersect(rect)) {
+            clipped_frame = SkRect::MakeEmpty();
+          }
+          break;
+        }
+        case kTransform: {
+          transform.preConcat(m->GetMatrix());
+          break;
+        }
+        case kOpacity:
+        case kBackdropFilter:
+          break;
+      }
+    }
+  }
+};
+
+/// Each layer will result in a single physical surface that contains Flutter
+/// contents. It may contain multiple platform views and the slices
+/// that would be otherwise rendered between these platform views will be
+/// collapsed into this layer, as long as they do not intersect any of the
+/// platform views.
+/// In Z order the Flutter contents of Layer is above the platform views.
+class Layer {
+ public:
+  /// Returns whether the rectangle intersects any of the platform views of
+  /// this layer.
+  bool IntersectsPlatformView(const SkRect& rect) {
+    for (auto& platform_view : platform_views_) {
+      if (platform_view.clipped_frame.intersects(rect)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /// Returns whether the region intersects any of the platform views of this
+  /// layer.
+  bool IntersectsPlatformView(const DlRegion& region) {
+    for (auto& platform_view : platform_views_) {
+      if (region.intersects(platform_view.clipped_frame.roundOut())) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /// Returns whether the rectangle intersects any of the Flutter contents of
+  /// this layer.
+  bool IntersectsFlutterContents(const SkRect& rect) {
+    return flutter_contents_region_.intersects(rect.roundOut());
+  }
+
+  /// Returns whether the region intersects any of the Flutter contents of this
+  /// layer.
+  bool IntersectsFlutterContents(const DlRegion& region) {
+    return flutter_contents_region_.intersects(region);
+  }
+
+  /// Adds a platform view to this layer.
+  void AddPlatformView(const PlatformView& platform_view) {
+    platform_views_.push_back(platform_view);
+  }
+
+  /// Adds Flutter contents to this layer.
+  void AddFlutterContents(EmbedderExternalView* contents,
+                          const DlRegion& contents_region) {
+    flutter_contents_.push_back(contents);
+    flutter_contents_region_ =
+        DlRegion::MakeUnion(flutter_contents_region_, contents_region);
+  }
+
+  bool has_flutter_contents() const { return !flutter_contents_.empty(); }
+
+  void SetRenderTarget(std::unique_ptr<EmbedderRenderTarget> target) {
+    FML_DCHECK(render_target_ == nullptr);
+    FML_DCHECK(has_flutter_contents());
+    render_target_ = std::move(target);
+  }
+
+  /// Renders this layer Flutter contents to the render target previously
+  /// assigned with SetRenderTarget.
+  void RenderFlutterContents() {
+    FML_DCHECK(has_flutter_contents());
+    if (render_target_) {
+      bool clear_surface = true;
+      for (auto c : flutter_contents_) {
+        c->Render(*render_target_, clear_surface);
+        clear_surface = false;
+      }
+    }
+  }
+
+  /// Returns platform views for this layer. In Z-order the platform views are
+  /// positioned *below* this layer's Flutter contents.
+  const std::vector<PlatformView>& platform_views() const {
+    return platform_views_;
+  }
+
+  EmbedderRenderTarget* render_target() { return render_target_.get(); }
+
+  std::vector<SkIRect> coverage() {
+    return flutter_contents_region_.getRects();
+  }
+
+ private:
+  std::vector<PlatformView> platform_views_;
+  std::vector<EmbedderExternalView*> flutter_contents_;
+  DlRegion flutter_contents_region_;
+  std::unique_ptr<EmbedderRenderTarget> render_target_;
+  friend class LayerBuilder;
+};
+
+/// A layout builder is responsible for building an optimized list of Layers
+/// from a list of `EmbedderExternalView`s. Single EmbedderExternalView contains
+/// at most one platform view and at most one layer of Flutter contents
+/// ('slice'). LayerBuilder is responsible for producing as few Layers from the
+/// list of EmbedderExternalViews as possible while maintaining identical visual
+/// result.
+///
+/// Implements https://flutter.dev/go/optimized-platform-view-layers
+class LayerBuilder {
+ public:
+  explicit LayerBuilder(SkISize frame_size) : frame_size_(frame_size) {
+    layers_.push_back(Layer());
+  }
+
+  /// Adds the platform view and/or flutter contents from the
+  /// EmbedderExternalView instance.
+  ///
+  /// This will try to add the content and platform view to an existing layer
+  /// if possible. If not, a new layer will be created.
+  void AddExternalView(EmbedderExternalView* view) {
+    if (view->HasPlatformView()) {
+      PlatformView platform_view(view);
+      AddPlatformView(platform_view);
+    }
+    if (view->HasEngineRenderedContents()) {
+      AddFlutterContents(view);
+    }
+  }
+
+  /// Prepares the render targets for all layers that have Flutter contents.
+  void PrepareBackingStore(
+      const std::function<std::unique_ptr<EmbedderRenderTarget>(
+          FlutterBackingStoreConfig)>& target_provider) {
+    auto config = MakeBackingStoreConfig(frame_size_);
+    for (auto& layer : layers_) {
+      if (layer.has_flutter_contents()) {
+        layer.SetRenderTarget(target_provider(config));
+      }
+    }
+  }
+
+  /// Renders all layers with Flutter contents to their respective render
+  /// targets.
+  void Render() {
+    for (auto& layer : layers_) {
+      if (layer.has_flutter_contents()) {
+        layer.RenderFlutterContents();
+      }
+    }
+  }
+
+  /// Populates EmbedderLayers from layer builder's layers.
+  void PushLayers(EmbedderLayers& layers) {
+    for (auto& layer : layers_) {
+      for (auto& view : layer.platform_views()) {
+        auto platform_view_id = view.view_identifier.platform_view_id;
+        if (platform_view_id.has_value()) {
+          layers.PushPlatformViewLayer(platform_view_id.value(), *view.params);
+        }
+      }
+      if (layer.render_target() != nullptr) {
+        layers.PushBackingStoreLayer(layer.render_target()->GetBackingStore(),
+                                     layer.coverage());
+      }
+    }
+  }
+
+  /// Removes the render targets from layers and returns them for collection.
+  std::vector<std::unique_ptr<EmbedderRenderTarget>>
+  ClearAndCollectRenderTargets() {
+    std::vector<std::unique_ptr<EmbedderRenderTarget>> result;
+    for (auto& layer : layers_) {
+      if (layer.render_target() != nullptr) {
+        result.push_back(std::move(layer.render_target_));
+      }
+    }
+    layers_.clear();
+    return result;
+  }
+
+ private:
+  void AddPlatformView(PlatformView view) {
+    GetLayerForPlatformView(view).AddPlatformView(view);
+  }
+
+  void AddFlutterContents(EmbedderExternalView* contents) {
+    FML_DCHECK(contents->HasEngineRenderedContents());
+
+    DlRegion region = contents->GetDlRegion();
+    GetLayerForFlutterContentsRegion(region).AddFlutterContents(contents,
+                                                                region);
+  }
+
+  /// Returns the deepest layer to which the platform view can be added. That
+  /// would be (whichever comes first):
+  /// - First layer from back that has platform view that intersects with this
+  ///   view
+  /// - Very last layer from back that has surface that doesn't intersect with
+  ///   this. That is because layer content renders on top of the platform view.
+  Layer& GetLayerForPlatformView(PlatformView view) {
+    for (auto iter = layers_.rbegin(); iter != layers_.rend(); ++iter) {
+      // This layer has surface that intersects with this view. That means we
+      // went one too far and need the layer before this.
+      if (iter->IntersectsFlutterContents(view.clipped_frame)) {
+        if (iter == layers_.rbegin()) {
+          layers_.emplace_back();
+          return layers_.back();
+        } else {
+          --iter;
+          return *iter;
+        }
+      }
+      if (iter->IntersectsPlatformView(view.clipped_frame)) {
+        return *iter;
+      }
+    }
+    return layers_.front();
+  }
+
+  /// Finds layer to which the Flutter content can be added. That would
+  /// be first layer from back that has any intersection with this region.
+  Layer& GetLayerForFlutterContentsRegion(const DlRegion& region) {
+    for (auto iter = layers_.rbegin(); iter != layers_.rend(); ++iter) {
+      if (iter->IntersectsPlatformView(region) ||
+          iter->IntersectsFlutterContents(region)) {
+        return *iter;
+      }
+    }
+    return layers_.front();
+  }
+
+  std::vector<Layer> layers_;
+  SkISize frame_size_;
+};
+
+};  // namespace
+
+void EmbedderExternalViewEmbedder::SubmitFlutterView(
+    int64_t flutter_view_id,
     GrDirectContext* context,
+    const std::shared_ptr<impeller::AiksContext>& aiks_context,
     std::unique_ptr<SurfaceFrame> frame) {
-  auto [matched_render_targets, pending_keys] =
-      render_target_cache_.GetExistingTargetsInCache(pending_views_);
+  SkRect _rect = SkRect::MakeIWH(pending_frame_size_.width(),
+                                 pending_frame_size_.height());
+  pending_surface_transformation_.mapRect(&_rect);
+
+  LayerBuilder builder(SkISize::Make(_rect.width(), _rect.height()));
+
+  for (auto view_id : composition_order_) {
+    auto& view = pending_views_[view_id];
+    builder.AddExternalView(view.get());
+  }
+
+  builder.PrepareBackingStore([&](FlutterBackingStoreConfig config) {
+    std::unique_ptr<EmbedderRenderTarget> target;
+    if (!avoid_backing_store_cache_) {
+      target = render_target_cache_.GetRenderTarget(
+          EmbedderExternalView::RenderTargetDescriptor(
+              SkISize{static_cast<int32_t>(config.size.width),
+                      static_cast<int32_t>(config.size.height)}));
+    }
+    if (target != nullptr) {
+      return target;
+    }
+    return create_render_target_callback_(context, aiks_context, config);
+  });
 
-  // This is where unused render targets will be collected. Control may flow to
-  // the embedder. Here, the embedder has the opportunity to trample on the
+  // This is where unused render targets will be collected. Control may flow
+  // to the embedder. Here, the embedder has the opportunity to trample on the
   // OpenGL context.
   //
   // For optimum performance, we should tell the render target cache to clear
-  // its unused entries before allocating new ones. This collection step before
-  // allocating new render targets ameliorates peak memory usage within the
-  // frame. But, this causes an issue in a known internal embedder. To work
-  // around this issue while that embedder migrates, collection of render
+  // its unused entries before allocating new ones. This collection step
+  // before allocating new render targets ameliorates peak memory usage within
+  // the frame. But, this causes an issue in a known internal embedder. To
+  // work around this issue while that embedder migrates, collection of render
   // targets is deferred after the presentation.
   //
   // @warning: Embedder may trample on our OpenGL context here.
   auto deferred_cleanup_render_targets =
       render_target_cache_.ClearAllRenderTargetsInCache();
 
-  for (const auto& pending_key : pending_keys) {
-    const auto& external_view = pending_views_.at(pending_key);
-
-    // If the external view does not have engine rendered contents, it makes no
-    // sense to ask to embedder to create a render target for us as we don't
-    // intend to render into it and ask the embedder for presentation anyway.
-    // Save some memory.
-    if (!external_view->HasEngineRenderedContents()) {
-      continue;
-    }
-
-    // This is the size of render surface we want the embedder to create for
-    // us. As or right now, this is going to always be equal to the frame size
-    // post transformation. But, in case optimizations are applied that make
-    // it so that embedder rendered into surfaces that aren't full screen,
-    // this assumption will break. So it's just best to ask view for its size
-    // directly.
-    const auto render_surface_size = external_view->GetRenderSurfaceSize();
-
-    const auto backing_store_config =
-        MakeBackingStoreConfig(render_surface_size);
-
-    // This is where the embedder will create render targets for us. Control
-    // flow to the embedder makes the engine susceptible to having the embedder
-    // trample on the OpenGL context. Before any Skia operations are performed,
-    // the context must be reset.
-    //
-    // @warning: Embedder may trample on our OpenGL context here.
-    auto render_target =
-        create_render_target_callback_(context, backing_store_config);
-
-    if (!render_target) {
-      FML_LOG(ERROR) << "Embedder did not return a valid render target.";
-      return;
-    }
-    matched_render_targets[pending_key] = std::move(render_target);
-  }
-
   // The OpenGL context could have been trampled by the embedder at this point
   // as it attempted to collect old render targets and create new ones. Tell
   // Skia to not rely on existing bindings.
@@ -209,74 +463,46 @@ void EmbedderExternalViewEmbedder::SubmitFrame(
     context->resetContext(kAll_GrBackendState);
   }
 
-  // Scribble embedder provide render targets. The order in which we scribble
-  // into the buffers is irrelevant to the presentation order.
-  for (const auto& render_target : matched_render_targets) {
-    if (!pending_views_.at(render_target.first)
-             ->Render(*render_target.second)) {
-      FML_LOG(ERROR)
-          << "Could not render into the embedder supplied render target.";
-      return;
-    }
-  }
+  builder.Render();
 
-  // We are going to be transferring control back over to the embedder there the
-  // context may be trampled upon again. Flush all operations to the underlying
-  // rendering API.
+  // We are going to be transferring control back over to the embedder there
+  // the context may be trampled upon again. Flush all operations to the
+  // underlying rendering API.
   //
   // @warning: Embedder may trample on our OpenGL context here.
   if (context) {
     context->flushAndSubmit();
   }
 
-  // Submit the scribbled layer to the embedder for presentation.
-  //
-  // @warning: Embedder may trample on our OpenGL context here.
   {
-    EmbedderLayers presented_layers(pending_frame_size_,
-                                    pending_device_pixel_ratio_,
-                                    pending_surface_transformation_);
-    // In composition order, submit backing stores and platform views to the
-    // embedder.
-    for (const auto& view_id : composition_order_) {
-      // If the external view has a platform view, ask the emebdder to place it
-      // before the Flutter rendered contents for that interleaving level.
-      const auto& external_view = pending_views_.at(view_id);
-      if (external_view->HasPlatformView()) {
-        presented_layers.PushPlatformViewLayer(
-            external_view->GetViewIdentifier()
-                .platform_view_id.value(),           // view id
-            *external_view->GetEmbeddedViewParams()  // view params
-        );
-      }
+    auto presentation_time_optional = frame->submit_info().presentation_time;
+    uint64_t presentation_time =
+        presentation_time_optional.has_value()
+            ? presentation_time_optional->ToEpochDelta().ToNanoseconds()
+            : 0;
 
-      // If the view has engine rendered contents, ask the embedder to place
-      // Flutter rendered contents for this interleaving level on top of a
-      // platform view.
-      if (external_view->HasEngineRenderedContents()) {
-        const auto& exteral_render_target = matched_render_targets.at(view_id);
-        presented_layers.PushBackingStoreLayer(
-            exteral_render_target->GetBackingStore());
-      }
-    }
-
-    // Flush the layer description down to the embedder for presentation.
+    // Submit the scribbled layer to the embedder for presentation.
     //
     // @warning: Embedder may trample on our OpenGL context here.
-    presented_layers.InvokePresentCallback(present_callback_);
+    EmbedderLayers presented_layers(
+        pending_frame_size_, pending_device_pixel_ratio_,
+        pending_surface_transformation_, presentation_time);
+
+    builder.PushLayers(presented_layers);
+
+    presented_layers.InvokePresentCallback(flutter_view_id, present_callback_);
   }
 
-  // See why this is necessary in the comment where this collection in realized.
+  // See why this is necessary in the comment where this collection in
+  // realized.
   //
   // @warning: Embedder may trample on our OpenGL context here.
   deferred_cleanup_render_targets.clear();
 
-  // Hold all rendered layers in the render target cache for one frame to
-  // see if they may be reused next frame.
-  for (auto& render_target : matched_render_targets) {
+  auto render_targets = builder.ClearAndCollectRenderTargets();
+  for (auto& render_target : render_targets) {
     if (!avoid_backing_store_cache_) {
-      render_target_cache_.CacheRenderTarget(render_target.first,
-                                             std::move(render_target.second));
+      render_target_cache_.CacheRenderTarget(std::move(render_target));
     }
   }
 
diff --git a/shell/platform/embedder/embedder_external_view_embedder.h b/shell/platform/embedder/embedder_external_view_embedder.h
index 906e5d6c59007436cc855db7a4c6a6302a27b930..ef51cc1b245ab70884b9a6f483756d1e67202779 100644
--- a/shell/platform/embedder/embedder_external_view_embedder.h
+++ b/shell/platform/embedder/embedder_external_view_embedder.h
@@ -6,6 +6,7 @@
 #define FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_EXTERNAL_VIEW_EMBEDDER_H_
 
 #include <map>
+#include <memory>
 #include <unordered_map>
 
 #include "flutter/flow/embedded_views.h"
@@ -31,9 +32,11 @@ class EmbedderExternalViewEmbedder final : public ExternalViewEmbedder {
   using CreateRenderTargetCallback =
       std::function<std::unique_ptr<EmbedderRenderTarget>(
           GrDirectContext* context,
+          const std::shared_ptr<impeller::AiksContext>& aiks_context,
           const FlutterBackingStoreConfig& config)>;
   using PresentCallback =
-      std::function<bool(const std::vector<const FlutterLayer*>& layers)>;
+      std::function<bool(FlutterViewId view_id,
+                         const std::vector<const FlutterLayer*>& layers)>;
   using SurfaceTransformationCallback = std::function<SkMatrix(void)>;
 
   //----------------------------------------------------------------------------
@@ -79,32 +82,31 @@ class EmbedderExternalViewEmbedder final : public ExternalViewEmbedder {
   void CancelFrame() override;
 
   // |ExternalViewEmbedder|
-  void BeginFrame(
-      SkISize frame_size,
-      GrDirectContext* context,
-      double device_pixel_ratio,
-      fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) override;
-
-  // |ExternalViewEmbedder|
-  void PrerollCompositeEmbeddedView(
-      int view_id,
-      std::unique_ptr<EmbeddedViewParams> params) override;
+  void BeginFrame(GrDirectContext* context,
+                  const fml::RefPtr<fml::RasterThreadMerger>&
+                      raster_thread_merger) override;
 
   // |ExternalViewEmbedder|
-  std::vector<SkCanvas*> GetCurrentCanvases() override;
+  void PrepareFlutterView(SkISize frame_size,
+                          double device_pixel_ratio) override;
 
   // |ExternalViewEmbedder|
-  std::vector<DisplayListBuilder*> GetCurrentBuilders() override;
+  void PrerollCompositeEmbeddedView(
+      int64_t view_id,
+      std::unique_ptr<EmbeddedViewParams> params) override;
 
   // |ExternalViewEmbedder|
-  EmbedderPaintContext CompositeEmbeddedView(int view_id) override;
+  DlCanvas* CompositeEmbeddedView(int64_t view_id) override;
 
   // |ExternalViewEmbedder|
-  void SubmitFrame(GrDirectContext* context,
-                   std::unique_ptr<SurfaceFrame> frame) override;
+  void SubmitFlutterView(
+      int64_t flutter_view_id,
+      GrDirectContext* context,
+      const std::shared_ptr<impeller::AiksContext>& aiks_context,
+      std::unique_ptr<SurfaceFrame> frame) override;
 
   // |ExternalViewEmbedder|
-  SkCanvas* GetRootCanvas() override;
+  DlCanvas* GetRootCanvas() override;
 
  private:
   const bool avoid_backing_store_cache_;
diff --git a/shell/platform/embedder/embedder_layers.cc b/shell/platform/embedder/embedder_layers.cc
index 6465293748f9f14190bee0d28639b556fe4bfae1..6759350cfe8d76e84b6af64c81644ec7265e4b92 100644
--- a/shell/platform/embedder/embedder_layers.cc
+++ b/shell/platform/embedder/embedder_layers.cc
@@ -10,14 +10,18 @@ namespace flutter {
 
 EmbedderLayers::EmbedderLayers(SkISize frame_size,
                                double device_pixel_ratio,
-                               SkMatrix root_surface_transformation)
+                               SkMatrix root_surface_transformation,
+                               uint64_t presentation_time)
     : frame_size_(frame_size),
       device_pixel_ratio_(device_pixel_ratio),
-      root_surface_transformation_(root_surface_transformation) {}
+      root_surface_transformation_(root_surface_transformation),
+      presentation_time_(presentation_time) {}
 
 EmbedderLayers::~EmbedderLayers() = default;
 
-void EmbedderLayers::PushBackingStoreLayer(const FlutterBackingStore* store) {
+void EmbedderLayers::PushBackingStoreLayer(
+    const FlutterBackingStore* store,
+    const std::vector<SkIRect>& paint_region_vec) {
   FlutterLayer layer = {};
 
   layer.struct_size = sizeof(FlutterLayer);
@@ -35,6 +39,34 @@ void EmbedderLayers::PushBackingStoreLayer(const FlutterBackingStore* store) {
   layer.size.width = transformed_layer_bounds.width();
   layer.size.height = transformed_layer_bounds.height();
 
+  auto paint_region_rects = std::make_unique<std::vector<FlutterRect>>();
+  paint_region_rects->reserve(paint_region_vec.size());
+
+  for (const auto& rect : paint_region_vec) {
+    auto transformed_rect =
+        root_surface_transformation_.mapRect(SkRect::Make(rect));
+    paint_region_rects->push_back(FlutterRect{
+        transformed_rect.x(),
+        transformed_rect.y(),
+        transformed_rect.right(),
+        transformed_rect.bottom(),
+    });
+  }
+
+  auto paint_region = std::make_unique<FlutterRegion>();
+  paint_region->struct_size = sizeof(FlutterRegion);
+  paint_region->rects = paint_region_rects->data();
+  paint_region->rects_count = paint_region_rects->size();
+  rects_referenced_.push_back(std::move(paint_region_rects));
+
+  auto present_info = std::make_unique<FlutterBackingStorePresentInfo>();
+  present_info->struct_size = sizeof(FlutterBackingStorePresentInfo);
+  present_info->paint_region = paint_region.get();
+  regions_referenced_.push_back(std::move(paint_region));
+  layer.backing_store_present_info = present_info.get();
+  layer.presentation_time = presentation_time_;
+
+  present_info_referenced_.push_back(std::move(present_info));
   presented_layers_.push_back(layer);
 }
 
@@ -196,17 +228,20 @@ void EmbedderLayers::PushPlatformViewLayer(
   layer.size.width = transformed_layer_bounds.width();
   layer.size.height = transformed_layer_bounds.height();
 
+  layer.presentation_time = presentation_time_;
+
   presented_layers_.push_back(layer);
 }
 
 void EmbedderLayers::InvokePresentCallback(
+    FlutterViewId view_id,
     const PresentCallback& callback) const {
   std::vector<const FlutterLayer*> presented_layers_pointers;
   presented_layers_pointers.reserve(presented_layers_.size());
   for (const auto& layer : presented_layers_) {
     presented_layers_pointers.push_back(&layer);
   }
-  callback(presented_layers_pointers);
+  callback(view_id, presented_layers_pointers);
 }
 
 }  // namespace flutter
diff --git a/shell/platform/embedder/embedder_layers.h b/shell/platform/embedder/embedder_layers.h
index c1cb2907588c91890b959f6222ab4bd0e36b4f0f..49fd9204f582fa2b3338f96fed4470900c8802cc 100644
--- a/shell/platform/embedder/embedder_layers.h
+++ b/shell/platform/embedder/embedder_layers.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_FLUTTER_LAYERS_H_
-#define FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_FLUTTER_LAYERS_H_
+#ifndef FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_LAYERS_H_
+#define FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_LAYERS_H_
 
 #include <memory>
 #include <vector>
@@ -20,18 +20,22 @@ class EmbedderLayers {
  public:
   EmbedderLayers(SkISize frame_size,
                  double device_pixel_ratio,
-                 SkMatrix root_surface_transformation);
+                 SkMatrix root_surface_transformation,
+                 uint64_t presentation_time);
 
   ~EmbedderLayers();
 
-  void PushBackingStoreLayer(const FlutterBackingStore* store);
+  void PushBackingStoreLayer(const FlutterBackingStore* store,
+                             const std::vector<SkIRect>& drawn_region);
 
   void PushPlatformViewLayer(FlutterPlatformViewIdentifier identifier,
                              const EmbeddedViewParams& params);
 
   using PresentCallback =
-      std::function<bool(const std::vector<const FlutterLayer*>& layers)>;
-  void InvokePresentCallback(const PresentCallback& callback) const;
+      std::function<bool(FlutterViewId view_id,
+                         const std::vector<const FlutterLayer*>& layers)>;
+  void InvokePresentCallback(FlutterViewId view_id,
+                             const PresentCallback& callback) const;
 
  private:
   const SkISize frame_size_;
@@ -42,11 +46,16 @@ class EmbedderLayers {
       mutations_referenced_;
   std::vector<std::unique_ptr<std::vector<const FlutterPlatformViewMutation*>>>
       mutations_arrays_referenced_;
+  std::vector<std::unique_ptr<FlutterBackingStorePresentInfo>>
+      present_info_referenced_;
+  std::vector<std::unique_ptr<FlutterRegion>> regions_referenced_;
+  std::vector<std::unique_ptr<std::vector<FlutterRect>>> rects_referenced_;
   std::vector<FlutterLayer> presented_layers_;
+  uint64_t presentation_time_;
 
   FML_DISALLOW_COPY_AND_ASSIGN(EmbedderLayers);
 };
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_FLUTTER_LAYERS_H_
+#endif  // FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_LAYERS_H_
diff --git a/shell/platform/embedder/embedder_render_target.cc b/shell/platform/embedder/embedder_render_target.cc
index c9ef521d6302bcd4ba678c0521e3770bfb694088..69259e3ab206d2b6e423292c3c3c636fbb8add0c 100644
--- a/shell/platform/embedder/embedder_render_target.cc
+++ b/shell/platform/embedder/embedder_render_target.cc
@@ -4,22 +4,17 @@
 
 #include "flutter/shell/platform/embedder/embedder_render_target.h"
 
+#include <optional>
 #include <utility>
 
-#include "flutter/fml/logging.h"
-
 namespace flutter {
 
 EmbedderRenderTarget::EmbedderRenderTarget(FlutterBackingStore backing_store,
-                                           sk_sp<SkSurface> render_surface,
                                            fml::closure on_release)
-    : backing_store_(backing_store),
-      render_surface_(std::move(render_surface)),
-      on_release_(std::move(on_release)) {
+    : backing_store_(backing_store), on_release_(std::move(on_release)) {
   // TODO(38468): The optimization to elide backing store updates between frames
   // has not been implemented yet.
   backing_store_.did_update = true;
-  FML_DCHECK(render_surface_);
 }
 
 EmbedderRenderTarget::~EmbedderRenderTarget() {
@@ -32,8 +27,4 @@ const FlutterBackingStore* EmbedderRenderTarget::GetBackingStore() const {
   return &backing_store_;
 }
 
-sk_sp<SkSurface> EmbedderRenderTarget::GetRenderSurface() const {
-  return render_surface_;
-}
-
 }  // namespace flutter
diff --git a/shell/platform/embedder/embedder_render_target.h b/shell/platform/embedder/embedder_render_target.h
index 8afbed31e30f0b3ade60b14244016b909e560853..cfbb67c07f5f3fa4e5b0024f7b9af28005f2a35a 100644
--- a/shell/platform/embedder/embedder_render_target.h
+++ b/shell/platform/embedder/embedder_render_target.h
@@ -5,12 +5,18 @@
 #ifndef FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_RENDER_TARGET_H_
 #define FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_RENDER_TARGET_H_
 
+#include <memory>
 #include "flutter/fml/closure.h"
 #include "flutter/fml/macros.h"
 #include "flutter/shell/platform/embedder/embedder.h"
-#include "third_party/skia/include/core/SkCanvas.h"
+#include "third_party/skia/include/core/SkSize.h"
 #include "third_party/skia/include/core/SkSurface.h"
 
+namespace impeller {
+class RenderTarget;
+class AiksContext;
+}  // namespace impeller
+
 namespace flutter {
 
 //------------------------------------------------------------------------------
@@ -21,29 +27,12 @@ namespace flutter {
 ///
 class EmbedderRenderTarget {
  public:
-  //----------------------------------------------------------------------------
-  /// @brief      Creates a render target whose backing store is managed by the
-  ///             embedder. The way this render target is exposed to the engine
-  ///             is via an SkSurface and a callback that is invoked by this
-  ///             object in its destructor.
-  ///
-  /// @param[in]  backing_store   The backing store describing this render
-  ///                             target.
-  /// @param[in]  render_surface  The surface for this target.
-  /// @param[in]  on_release      The callback to invoke (eventually forwarded
-  ///                             to the embedder) when the backing store is no
-  ///                             longer required by the engine.
-  ///
-  EmbedderRenderTarget(FlutterBackingStore backing_store,
-                       sk_sp<SkSurface> render_surface,
-                       fml::closure on_release);
-
   //----------------------------------------------------------------------------
   /// @brief      Destroys this instance of the render target and invokes the
   ///             callback for the embedder to release its resource associated
   ///             with the particular backing store.
   ///
-  ~EmbedderRenderTarget();
+  virtual ~EmbedderRenderTarget();
 
   //----------------------------------------------------------------------------
   /// @brief      A render surface the rasterizer can use to draw into the
@@ -51,7 +40,30 @@ class EmbedderRenderTarget {
   ///
   /// @return     The render surface.
   ///
-  sk_sp<SkSurface> GetRenderSurface() const;
+  virtual sk_sp<SkSurface> GetSkiaSurface() const = 0;
+
+  //----------------------------------------------------------------------------
+  /// @brief      An impeller render target the rasterizer can use to draw into
+  ///             the backing store.
+  ///
+  /// @return     The Impeller render target.
+  ///
+  virtual impeller::RenderTarget* GetImpellerRenderTarget() const = 0;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Returns the AiksContext that should be used for rendering, if
+  ///             this render target is backed by Impeller.
+  ///
+  /// @return     The Impeller Aiks context.
+  ///
+  virtual std::shared_ptr<impeller::AiksContext> GetAiksContext() const = 0;
+
+  //----------------------------------------------------------------------------
+  /// @brief      Returns the size of the render target.
+  ///
+  /// @return     The size of the render target.
+  ///
+  virtual SkISize GetRenderTargetSize() const = 0;
 
   //----------------------------------------------------------------------------
   /// @brief      The embedder backing store descriptor. This is the descriptor
@@ -65,9 +77,25 @@ class EmbedderRenderTarget {
   ///
   const FlutterBackingStore* GetBackingStore() const;
 
+ protected:
+  //----------------------------------------------------------------------------
+  /// @brief      Creates a render target whose backing store is managed by the
+  ///             embedder. The way this render target is exposed to the engine
+  ///             is via an SkSurface and a callback that is invoked by this
+  ///             object in its destructor.
+  ///
+  /// @param[in]  backing_store   The backing store describing this render
+  ///                             target.
+  /// @param[in]  on_release      The callback to invoke (eventually forwarded
+  ///                             to the embedder) when the backing store is no
+  ///                             longer required by the engine.
+  ///
+  EmbedderRenderTarget(FlutterBackingStore backing_store,
+                       fml::closure on_release);
+
  private:
   FlutterBackingStore backing_store_;
-  sk_sp<SkSurface> render_surface_;
+
   fml::closure on_release_;
 
   FML_DISALLOW_COPY_AND_ASSIGN(EmbedderRenderTarget);
diff --git a/shell/platform/embedder/embedder_render_target_cache.cc b/shell/platform/embedder/embedder_render_target_cache.cc
index 1347b032791d152ad042350daf69fdb17b43b94f..ac0da63959c2f46c5f63e7a33e4c3ecab78f02dc 100644
--- a/shell/platform/embedder/embedder_render_target_cache.cc
+++ b/shell/platform/embedder/embedder_render_target_cache.cc
@@ -10,64 +10,40 @@ EmbedderRenderTargetCache::EmbedderRenderTargetCache() = default;
 
 EmbedderRenderTargetCache::~EmbedderRenderTargetCache() = default;
 
-std::pair<EmbedderRenderTargetCache::RenderTargets,
-          EmbedderExternalView::ViewIdentifierSet>
-EmbedderRenderTargetCache::GetExistingTargetsInCache(
-    const EmbedderExternalView::PendingViews& pending_views) {
-  RenderTargets resolved_render_targets;
-  EmbedderExternalView::ViewIdentifierSet unmatched_identifiers;
-
-  for (const auto& view : pending_views) {
-    const auto& external_view = view.second;
-    if (!external_view->HasEngineRenderedContents()) {
-      continue;
-    }
-    auto& compatible_targets =
-        cached_render_targets_[external_view->CreateRenderTargetDescriptor()];
-    if (compatible_targets.empty()) {
-      unmatched_identifiers.insert(view.first);
-    } else {
-      std::unique_ptr<EmbedderRenderTarget> target =
-          std::move(compatible_targets.top());
-      compatible_targets.pop();
-      resolved_render_targets[view.first] = std::move(target);
-    }
+std::unique_ptr<EmbedderRenderTarget>
+EmbedderRenderTargetCache::GetRenderTarget(
+    const EmbedderExternalView::RenderTargetDescriptor& descriptor) {
+  auto compatible_target = cached_render_targets_.find(descriptor);
+  if (compatible_target == cached_render_targets_.end()) {
+    return nullptr;
   }
-  return {std::move(resolved_render_targets), std::move(unmatched_identifiers)};
+  auto target = std::move(compatible_target->second);
+  cached_render_targets_.erase(compatible_target);
+  return target;
 }
 
 std::set<std::unique_ptr<EmbedderRenderTarget>>
 EmbedderRenderTargetCache::ClearAllRenderTargetsInCache() {
   std::set<std::unique_ptr<EmbedderRenderTarget>> cleared_targets;
   for (auto& targets : cached_render_targets_) {
-    auto& targets_stack = targets.second;
-    while (!targets_stack.empty()) {
-      cleared_targets.emplace(std::move(targets_stack.top()));
-      targets_stack.pop();
-    }
+    cleared_targets.insert(std::move(targets.second));
   }
   cached_render_targets_.clear();
   return cleared_targets;
 }
 
 void EmbedderRenderTargetCache::CacheRenderTarget(
-    EmbedderExternalView::ViewIdentifier view_identifier,
     std::unique_ptr<EmbedderRenderTarget> target) {
   if (target == nullptr) {
     return;
   }
-  auto surface = target->GetRenderSurface();
   auto desc = EmbedderExternalView::RenderTargetDescriptor{
-      view_identifier, SkISize::Make(surface->width(), surface->height())};
-  cached_render_targets_[desc].push(std::move(target));
+      target->GetRenderTargetSize()};
+  cached_render_targets_.insert(std::make_pair(desc, std::move(target)));
 }
 
 size_t EmbedderRenderTargetCache::GetCachedTargetsCount() const {
-  size_t count = 0;
-  for (const auto& targets : cached_render_targets_) {
-    count += targets.second.size();
-  }
-  return count;
+  return cached_render_targets_.size();
 }
 
 }  // namespace flutter
diff --git a/shell/platform/embedder/embedder_render_target_cache.h b/shell/platform/embedder/embedder_render_target_cache.h
index 3c595da9bdb172064be0c86107179d8cfb557a0d..fb3251a5b9fdfba972ef0b55687c796e067e4089 100644
--- a/shell/platform/embedder/embedder_render_target_cache.h
+++ b/shell/platform/embedder/embedder_render_target_cache.h
@@ -25,30 +25,22 @@ class EmbedderRenderTargetCache {
 
   ~EmbedderRenderTargetCache();
 
-  using RenderTargets =
-      std::unordered_map<EmbedderExternalView::ViewIdentifier,
-                         std::unique_ptr<EmbedderRenderTarget>,
-                         EmbedderExternalView::ViewIdentifier::Hash,
-                         EmbedderExternalView::ViewIdentifier::Equal>;
-
-  std::pair<RenderTargets, EmbedderExternalView::ViewIdentifierSet>
-  GetExistingTargetsInCache(
-      const EmbedderExternalView::PendingViews& pending_views);
+  std::unique_ptr<EmbedderRenderTarget> GetRenderTarget(
+      const EmbedderExternalView::RenderTargetDescriptor& descriptor);
 
   std::set<std::unique_ptr<EmbedderRenderTarget>>
   ClearAllRenderTargetsInCache();
 
-  void CacheRenderTarget(EmbedderExternalView::ViewIdentifier view_identifier,
-                         std::unique_ptr<EmbedderRenderTarget> target);
+  void CacheRenderTarget(std::unique_ptr<EmbedderRenderTarget> target);
 
   size_t GetCachedTargetsCount() const;
 
  private:
-  using CachedRenderTargets =
-      std::unordered_map<EmbedderExternalView::RenderTargetDescriptor,
-                         std::stack<std::unique_ptr<EmbedderRenderTarget>>,
-                         EmbedderExternalView::RenderTargetDescriptor::Hash,
-                         EmbedderExternalView::RenderTargetDescriptor::Equal>;
+  using CachedRenderTargets = std::unordered_multimap<
+      EmbedderExternalView::RenderTargetDescriptor,
+      std::unique_ptr<EmbedderRenderTarget>,
+      EmbedderExternalView::RenderTargetDescriptor::Hash,
+      EmbedderExternalView::RenderTargetDescriptor::Equal>;
 
   CachedRenderTargets cached_render_targets_;
 
diff --git a/shell/platform/embedder/embedder_render_target_impeller.cc b/shell/platform/embedder/embedder_render_target_impeller.cc
new file mode 100644
index 0000000000000000000000000000000000000000..52d520fdf0b789dccd39d171b46d78df4a5d3f05
--- /dev/null
+++ b/shell/platform/embedder/embedder_render_target_impeller.cc
@@ -0,0 +1,52 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/platform/embedder/embedder_render_target_impeller.h"
+
+#include "flutter/fml/logging.h"
+#include "flutter/impeller/renderer/render_target.h"
+
+namespace flutter {
+
+EmbedderRenderTargetImpeller::EmbedderRenderTargetImpeller(
+    FlutterBackingStore backing_store,
+    std::shared_ptr<impeller::AiksContext> aiks_context,
+    std::unique_ptr<impeller::RenderTarget> impeller_target,
+    fml::closure on_release,
+    fml::closure framebuffer_destruction_callback)
+    : EmbedderRenderTarget(backing_store, std::move(on_release)),
+      aiks_context_(std::move(aiks_context)),
+      impeller_target_(std::move(impeller_target)),
+      framebuffer_destruction_callback_(
+          std::move(framebuffer_destruction_callback)) {
+  FML_DCHECK(aiks_context_);
+  FML_DCHECK(impeller_target_);
+}
+
+EmbedderRenderTargetImpeller::~EmbedderRenderTargetImpeller() {
+  if (framebuffer_destruction_callback_) {
+    framebuffer_destruction_callback_();
+  }
+}
+
+sk_sp<SkSurface> EmbedderRenderTargetImpeller::GetSkiaSurface() const {
+  return nullptr;
+}
+
+impeller::RenderTarget* EmbedderRenderTargetImpeller::GetImpellerRenderTarget()
+    const {
+  return impeller_target_.get();
+}
+
+std::shared_ptr<impeller::AiksContext>
+EmbedderRenderTargetImpeller::GetAiksContext() const {
+  return aiks_context_;
+}
+
+SkISize EmbedderRenderTargetImpeller::GetRenderTargetSize() const {
+  auto size = impeller_target_->GetRenderTargetSize();
+  return SkISize::Make(size.width, size.height);
+}
+
+}  // namespace flutter
diff --git a/shell/platform/embedder/embedder_render_target_impeller.h b/shell/platform/embedder/embedder_render_target_impeller.h
new file mode 100644
index 0000000000000000000000000000000000000000..4e7a2b7d88e12d583d2a2daf5591614eb7ccb7c9
--- /dev/null
+++ b/shell/platform/embedder/embedder_render_target_impeller.h
@@ -0,0 +1,46 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_RENDER_TARGET_IMPELLER_H_
+#define FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_RENDER_TARGET_IMPELLER_H_
+
+#include "flutter/shell/platform/embedder/embedder_render_target.h"
+
+namespace flutter {
+
+class EmbedderRenderTargetImpeller final : public EmbedderRenderTarget {
+ public:
+  EmbedderRenderTargetImpeller(
+      FlutterBackingStore backing_store,
+      std::shared_ptr<impeller::AiksContext> aiks_context,
+      std::unique_ptr<impeller::RenderTarget> impeller_target,
+      fml::closure on_release,
+      fml::closure framebuffer_destruction_callback);
+
+  // |EmbedderRenderTarget|
+  ~EmbedderRenderTargetImpeller() override;
+
+  // |EmbedderRenderTarget|
+  sk_sp<SkSurface> GetSkiaSurface() const override;
+
+  // |EmbedderRenderTarget|
+  impeller::RenderTarget* GetImpellerRenderTarget() const override;
+
+  // |EmbedderRenderTarget|
+  std::shared_ptr<impeller::AiksContext> GetAiksContext() const override;
+
+  // |EmbedderRenderTarget|
+  SkISize GetRenderTargetSize() const override;
+
+ private:
+  std::shared_ptr<impeller::AiksContext> aiks_context_;
+  std::unique_ptr<impeller::RenderTarget> impeller_target_;
+  fml::closure framebuffer_destruction_callback_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(EmbedderRenderTargetImpeller);
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_RENDER_TARGET_IMPELLER_H_
diff --git a/shell/platform/embedder/embedder_render_target_skia.cc b/shell/platform/embedder/embedder_render_target_skia.cc
new file mode 100644
index 0000000000000000000000000000000000000000..e8d60ca60890f9d174cd138619b054da497cf201
--- /dev/null
+++ b/shell/platform/embedder/embedder_render_target_skia.cc
@@ -0,0 +1,40 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/platform/embedder/embedder_render_target_skia.h"
+
+#include "flutter/fml/logging.h"
+
+namespace flutter {
+
+EmbedderRenderTargetSkia::EmbedderRenderTargetSkia(
+    FlutterBackingStore backing_store,
+    sk_sp<SkSurface> render_surface,
+    fml::closure on_release)
+    : EmbedderRenderTarget(backing_store, std::move(on_release)),
+      render_surface_(std::move(render_surface)) {
+  FML_DCHECK(render_surface_);
+}
+
+EmbedderRenderTargetSkia::~EmbedderRenderTargetSkia() = default;
+
+sk_sp<SkSurface> EmbedderRenderTargetSkia::GetSkiaSurface() const {
+  return render_surface_;
+}
+
+impeller::RenderTarget* EmbedderRenderTargetSkia::GetImpellerRenderTarget()
+    const {
+  return nullptr;
+}
+
+std::shared_ptr<impeller::AiksContext>
+EmbedderRenderTargetSkia::GetAiksContext() const {
+  return nullptr;
+}
+
+SkISize EmbedderRenderTargetSkia::GetRenderTargetSize() const {
+  return SkISize::Make(render_surface_->width(), render_surface_->height());
+}
+
+}  // namespace flutter
diff --git a/shell/platform/embedder/embedder_render_target_skia.h b/shell/platform/embedder/embedder_render_target_skia.h
new file mode 100644
index 0000000000000000000000000000000000000000..2ccacfee33a2e91ea1b1aee7f3728c9fe0867d4e
--- /dev/null
+++ b/shell/platform/embedder/embedder_render_target_skia.h
@@ -0,0 +1,41 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_RENDER_TARGET_SKIA_H_
+#define FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_RENDER_TARGET_SKIA_H_
+
+#include "flutter/shell/platform/embedder/embedder_render_target.h"
+
+namespace flutter {
+
+class EmbedderRenderTargetSkia final : public EmbedderRenderTarget {
+ public:
+  EmbedderRenderTargetSkia(FlutterBackingStore backing_store,
+                           sk_sp<SkSurface> render_surface,
+                           fml::closure on_release);
+
+  // |EmbedderRenderTarget|
+  ~EmbedderRenderTargetSkia() override;
+
+  // |EmbedderRenderTarget|
+  sk_sp<SkSurface> GetSkiaSurface() const override;
+
+  // |EmbedderRenderTarget|
+  impeller::RenderTarget* GetImpellerRenderTarget() const override;
+
+  // |EmbedderRenderTarget|
+  std::shared_ptr<impeller::AiksContext> GetAiksContext() const override;
+
+  // |EmbedderRenderTarget|
+  SkISize GetRenderTargetSize() const override;
+
+ private:
+  sk_sp<SkSurface> render_surface_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(EmbedderRenderTargetSkia);
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_RENDER_TARGET_SKIA_H_
diff --git a/shell/platform/embedder/embedder_semantics_update.cc b/shell/platform/embedder/embedder_semantics_update.cc
new file mode 100644
index 0000000000000000000000000000000000000000..1670d7c7341e6b5fd3d7cee4b33ef286bd13b7db
--- /dev/null
+++ b/shell/platform/embedder/embedder_semantics_update.cc
@@ -0,0 +1,261 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/platform/embedder/embedder_semantics_update.h"
+
+namespace flutter {
+
+EmbedderSemanticsUpdate::EmbedderSemanticsUpdate(
+    const SemanticsNodeUpdates& nodes,
+    const CustomAccessibilityActionUpdates& actions) {
+  for (const auto& value : nodes) {
+    AddNode(value.second);
+  }
+
+  for (const auto& value : actions) {
+    AddAction(value.second);
+  }
+
+  update_ = {
+      .struct_size = sizeof(FlutterSemanticsUpdate),
+      .nodes_count = nodes_.size(),
+      .nodes = nodes_.data(),
+      .custom_actions_count = actions_.size(),
+      .custom_actions = actions_.data(),
+  };
+}
+
+void EmbedderSemanticsUpdate::AddNode(const SemanticsNode& node) {
+  SkMatrix transform = node.transform.asM33();
+  FlutterTransformation flutter_transform{
+      transform.get(SkMatrix::kMScaleX), transform.get(SkMatrix::kMSkewX),
+      transform.get(SkMatrix::kMTransX), transform.get(SkMatrix::kMSkewY),
+      transform.get(SkMatrix::kMScaleY), transform.get(SkMatrix::kMTransY),
+      transform.get(SkMatrix::kMPersp0), transform.get(SkMatrix::kMPersp1),
+      transform.get(SkMatrix::kMPersp2)};
+
+  // Do not add new members to FlutterSemanticsNode.
+  // This would break the forward compatibility of FlutterSemanticsUpdate.
+  // All new members must be added to FlutterSemanticsNode2 instead.
+  nodes_.push_back({
+      sizeof(FlutterSemanticsNode),
+      node.id,
+      static_cast<FlutterSemanticsFlag>(node.flags),
+      static_cast<FlutterSemanticsAction>(node.actions),
+      node.textSelectionBase,
+      node.textSelectionExtent,
+      node.scrollChildren,
+      node.scrollIndex,
+      node.scrollPosition,
+      node.scrollExtentMax,
+      node.scrollExtentMin,
+      node.elevation,
+      node.thickness,
+      node.label.c_str(),
+      node.hint.c_str(),
+      node.value.c_str(),
+      node.increasedValue.c_str(),
+      node.decreasedValue.c_str(),
+      static_cast<FlutterTextDirection>(node.textDirection),
+      FlutterRect{node.rect.fLeft, node.rect.fTop, node.rect.fRight,
+                  node.rect.fBottom},
+      flutter_transform,
+      node.childrenInTraversalOrder.size(),
+      node.childrenInTraversalOrder.data(),
+      node.childrenInHitTestOrder.data(),
+      node.customAccessibilityActions.size(),
+      node.customAccessibilityActions.data(),
+      node.platformViewId,
+      node.tooltip.c_str(),
+  });
+}
+
+void EmbedderSemanticsUpdate::AddAction(
+    const CustomAccessibilityAction& action) {
+  // Do not add new members to FlutterSemanticsCustomAction.
+  // This would break the forward compatibility of FlutterSemanticsUpdate.
+  // All new members must be added to FlutterSemanticsCustomAction2 instead.
+  actions_.push_back({
+      sizeof(FlutterSemanticsCustomAction),
+      action.id,
+      static_cast<FlutterSemanticsAction>(action.overrideId),
+      action.label.c_str(),
+      action.hint.c_str(),
+  });
+}
+
+EmbedderSemanticsUpdate::~EmbedderSemanticsUpdate() {}
+
+EmbedderSemanticsUpdate2::EmbedderSemanticsUpdate2(
+    const SemanticsNodeUpdates& nodes,
+    const CustomAccessibilityActionUpdates& actions) {
+  nodes_.reserve(nodes.size());
+  node_pointers_.reserve(nodes.size());
+  actions_.reserve(actions.size());
+  action_pointers_.reserve(actions.size());
+
+  for (const auto& value : nodes) {
+    AddNode(value.second);
+  }
+
+  for (const auto& value : actions) {
+    AddAction(value.second);
+  }
+
+  for (size_t i = 0; i < nodes_.size(); i++) {
+    node_pointers_.push_back(&nodes_[i]);
+  }
+
+  for (size_t i = 0; i < actions_.size(); i++) {
+    action_pointers_.push_back(&actions_[i]);
+  }
+
+  update_ = {
+      .struct_size = sizeof(FlutterSemanticsUpdate2),
+      .node_count = node_pointers_.size(),
+      .nodes = node_pointers_.data(),
+      .custom_action_count = action_pointers_.size(),
+      .custom_actions = action_pointers_.data(),
+  };
+}
+
+EmbedderSemanticsUpdate2::~EmbedderSemanticsUpdate2() {}
+
+void EmbedderSemanticsUpdate2::AddNode(const SemanticsNode& node) {
+  SkMatrix transform = node.transform.asM33();
+  FlutterTransformation flutter_transform{
+      transform.get(SkMatrix::kMScaleX), transform.get(SkMatrix::kMSkewX),
+      transform.get(SkMatrix::kMTransX), transform.get(SkMatrix::kMSkewY),
+      transform.get(SkMatrix::kMScaleY), transform.get(SkMatrix::kMTransY),
+      transform.get(SkMatrix::kMPersp0), transform.get(SkMatrix::kMPersp1),
+      transform.get(SkMatrix::kMPersp2)};
+
+  auto label_attributes = CreateStringAttributes(node.labelAttributes);
+  auto hint_attributes = CreateStringAttributes(node.hintAttributes);
+  auto value_attributes = CreateStringAttributes(node.valueAttributes);
+  auto increased_value_attributes =
+      CreateStringAttributes(node.increasedValueAttributes);
+  auto decreased_value_attributes =
+      CreateStringAttributes(node.decreasedValueAttributes);
+
+  nodes_.push_back({
+      sizeof(FlutterSemanticsNode2),
+      node.id,
+      static_cast<FlutterSemanticsFlag>(node.flags),
+      static_cast<FlutterSemanticsAction>(node.actions),
+      node.textSelectionBase,
+      node.textSelectionExtent,
+      node.scrollChildren,
+      node.scrollIndex,
+      node.scrollPosition,
+      node.scrollExtentMax,
+      node.scrollExtentMin,
+      node.elevation,
+      node.thickness,
+      node.label.c_str(),
+      node.hint.c_str(),
+      node.value.c_str(),
+      node.increasedValue.c_str(),
+      node.decreasedValue.c_str(),
+      static_cast<FlutterTextDirection>(node.textDirection),
+      FlutterRect{node.rect.fLeft, node.rect.fTop, node.rect.fRight,
+                  node.rect.fBottom},
+      flutter_transform,
+      node.childrenInTraversalOrder.size(),
+      node.childrenInTraversalOrder.data(),
+      node.childrenInHitTestOrder.data(),
+      node.customAccessibilityActions.size(),
+      node.customAccessibilityActions.data(),
+      node.platformViewId,
+      node.tooltip.c_str(),
+      label_attributes.count,
+      label_attributes.attributes,
+      hint_attributes.count,
+      hint_attributes.attributes,
+      value_attributes.count,
+      value_attributes.attributes,
+      increased_value_attributes.count,
+      increased_value_attributes.attributes,
+      decreased_value_attributes.count,
+      decreased_value_attributes.attributes,
+  });
+}
+
+void EmbedderSemanticsUpdate2::AddAction(
+    const CustomAccessibilityAction& action) {
+  actions_.push_back({
+      sizeof(FlutterSemanticsCustomAction2),
+      action.id,
+      static_cast<FlutterSemanticsAction>(action.overrideId),
+      action.label.c_str(),
+      action.hint.c_str(),
+  });
+}
+
+EmbedderSemanticsUpdate2::EmbedderStringAttributes
+EmbedderSemanticsUpdate2::CreateStringAttributes(
+    const StringAttributes& attributes) {
+  // Minimize allocations if attributes are empty.
+  if (attributes.empty()) {
+    return {.count = 0, .attributes = nullptr};
+  }
+
+  // Translate the engine attributes to embedder attributes.
+  // The result vector's data is returned by this method.
+  // The result vector will be owned by |node_string_attributes_|
+  // so that the embedder attributes are cleaned up at the end of the
+  // semantics update callback when when the |EmbedderSemanticsUpdate2|
+  // is destroyed.
+  auto result = std::make_unique<std::vector<const FlutterStringAttribute*>>();
+  result->reserve(attributes.size());
+
+  for (const auto& attribute : attributes) {
+    auto embedder_attribute = std::make_unique<FlutterStringAttribute>();
+    embedder_attribute->struct_size = sizeof(FlutterStringAttribute);
+    embedder_attribute->start = attribute->start;
+    embedder_attribute->end = attribute->end;
+
+    switch (attribute->type) {
+      case StringAttributeType::kLocale: {
+        std::shared_ptr<flutter::LocaleStringAttribute> locale_attribute =
+            std::static_pointer_cast<flutter::LocaleStringAttribute>(attribute);
+
+        auto embedder_locale = std::make_unique<FlutterLocaleStringAttribute>();
+        embedder_locale->struct_size = sizeof(FlutterLocaleStringAttribute);
+        embedder_locale->locale = locale_attribute->locale.c_str();
+        locale_attributes_.push_back(std::move(embedder_locale));
+
+        embedder_attribute->type = FlutterStringAttributeType::kLocale;
+        embedder_attribute->locale = locale_attributes_.back().get();
+        break;
+      }
+      case flutter::StringAttributeType::kSpellOut: {
+        // All spell out attributes are identical and share a lazily created
+        // instance.
+        if (!spell_out_attribute_) {
+          auto spell_out_attribute_ =
+              std::make_unique<FlutterSpellOutStringAttribute>();
+          spell_out_attribute_->struct_size =
+              sizeof(FlutterSpellOutStringAttribute);
+        }
+
+        embedder_attribute->type = FlutterStringAttributeType::kSpellOut;
+        embedder_attribute->spell_out = spell_out_attribute_.get();
+        break;
+      }
+    }
+
+    string_attributes_.push_back(std::move(embedder_attribute));
+    result->push_back(string_attributes_.back().get());
+  }
+
+  node_string_attributes_.push_back(std::move(result));
+
+  return {
+      .count = node_string_attributes_.back()->size(),
+      .attributes = node_string_attributes_.back()->data(),
+  };
+}
+
+}  // namespace flutter
diff --git a/shell/platform/embedder/embedder_semantics_update.h b/shell/platform/embedder/embedder_semantics_update.h
new file mode 100644
index 0000000000000000000000000000000000000000..1e628e41ad555ff18f09b086b7d2d7831edb954a
--- /dev/null
+++ b/shell/platform/embedder/embedder_semantics_update.h
@@ -0,0 +1,100 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_SEMANTICS_UPDATE_H_
+#define FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_SEMANTICS_UPDATE_H_
+
+#include "flutter/lib/ui/semantics/custom_accessibility_action.h"
+#include "flutter/lib/ui/semantics/semantics_node.h"
+#include "flutter/shell/platform/embedder/embedder.h"
+
+namespace flutter {
+
+// A semantic update, used by the embedder API's v1 and v2 semantic update
+// callbacks.
+class EmbedderSemanticsUpdate {
+ public:
+  EmbedderSemanticsUpdate(const SemanticsNodeUpdates& nodes,
+                          const CustomAccessibilityActionUpdates& actions);
+
+  ~EmbedderSemanticsUpdate();
+
+  // Get the semantic update. The pointer is only valid while
+  // |EmbedderSemanticsUpdate| exists.
+  FlutterSemanticsUpdate* get() { return &update_; }
+
+ private:
+  FlutterSemanticsUpdate update_;
+  std::vector<FlutterSemanticsNode> nodes_;
+  std::vector<FlutterSemanticsCustomAction> actions_;
+
+  // Translates engine semantic nodes to embedder semantic nodes.
+  void AddNode(const SemanticsNode& node);
+
+  // Translates engine semantic custom actions to embedder semantic custom
+  // actions.
+  void AddAction(const CustomAccessibilityAction& action);
+
+  FML_DISALLOW_COPY_AND_ASSIGN(EmbedderSemanticsUpdate);
+};
+
+// A semantic update, used by the embedder API's v3 semantic update callback.
+//
+// This holds temporary embedder-specific objects that are translated from
+// the engine's internal representation and passed back to the semantics
+// update callback. Once the callback finishes, this object is destroyed
+// and the temporary embedder-specific objects are automatically cleaned up.
+class EmbedderSemanticsUpdate2 {
+ public:
+  EmbedderSemanticsUpdate2(const SemanticsNodeUpdates& nodes,
+                           const CustomAccessibilityActionUpdates& actions);
+
+  ~EmbedderSemanticsUpdate2();
+
+  // Get the semantic update. The pointer is only valid while
+  // |EmbedderSemanticsUpdate2| exists.
+  FlutterSemanticsUpdate2* get() { return &update_; }
+
+ private:
+  // These fields hold temporary embedder-specific objects that
+  // must remain valid for the duration of the semantics update callback.
+  // They are automatically cleaned up when |EmbedderSemanticsUpdate2| is
+  // destroyed.
+  FlutterSemanticsUpdate2 update_;
+  std::vector<FlutterSemanticsNode2> nodes_;
+  std::vector<FlutterSemanticsNode2*> node_pointers_;
+  std::vector<FlutterSemanticsCustomAction2> actions_;
+  std::vector<FlutterSemanticsCustomAction2*> action_pointers_;
+
+  std::vector<std::unique_ptr<std::vector<const FlutterStringAttribute*>>>
+      node_string_attributes_;
+  std::vector<std::unique_ptr<FlutterStringAttribute>> string_attributes_;
+  std::vector<std::unique_ptr<FlutterLocaleStringAttribute>> locale_attributes_;
+  std::unique_ptr<FlutterSpellOutStringAttribute> spell_out_attribute_;
+
+  // Translates engine semantic nodes to embedder semantic nodes.
+  void AddNode(const SemanticsNode& node);
+
+  // Translates engine semantic custom actions to embedder semantic custom
+  // actions.
+  void AddAction(const CustomAccessibilityAction& action);
+
+  // A helper struct for |CreateStringAttributes|.
+  struct EmbedderStringAttributes {
+    // The number of string attribute pointers in |attributes|.
+    size_t count;
+    // An array of string attribute pointers.
+    const FlutterStringAttribute** attributes;
+  };
+
+  // Translates engine string attributes to embedder string attributes.
+  EmbedderStringAttributes CreateStringAttributes(
+      const StringAttributes& attribute);
+
+  FML_DISALLOW_COPY_AND_ASSIGN(EmbedderSemanticsUpdate2);
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_SEMANTICS_UPDATE_H_
diff --git a/shell/platform/embedder/embedder_struct_macros.h b/shell/platform/embedder/embedder_struct_macros.h
index 8bd30979512866a737413945915b195cf9f0fa6d..483fd2ab5c07de740256d8af698ab0fa36c2077d 100644
--- a/shell/platform/embedder/embedder_struct_macros.h
+++ b/shell/platform/embedder/embedder_struct_macros.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_SAFE_ACCESS_H_
-#define FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_SAFE_ACCESS_H_
+#ifndef FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_STRUCT_MACROS_H_
+#define FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_STRUCT_MACROS_H_
 
 #include <type_traits>
 
@@ -29,4 +29,4 @@
 #define SAFE_EXISTS_ONE_OF(pointer, member1, member2) \
   (SAFE_EXISTS(pointer, member1) != SAFE_EXISTS(pointer, member2))
 
-#endif  // FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_SAFE_ACCESS_H_
+#endif  // FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_STRUCT_MACROS_H_
diff --git a/shell/platform/embedder/embedder_surface.cc b/shell/platform/embedder/embedder_surface.cc
index dbe619b8e0fa78b0159a75ff2cb0dbd681212faa..029833f7434baf020e92832e6b3a722ea7005e0d 100644
--- a/shell/platform/embedder/embedder_surface.cc
+++ b/shell/platform/embedder/embedder_surface.cc
@@ -10,4 +10,13 @@ EmbedderSurface::EmbedderSurface() = default;
 
 EmbedderSurface::~EmbedderSurface() = default;
 
+std::shared_ptr<impeller::Context> EmbedderSurface::CreateImpellerContext()
+    const {
+  return nullptr;
+}
+
+sk_sp<GrDirectContext> EmbedderSurface::CreateResourceContext() const {
+  return nullptr;
+}
+
 }  // namespace flutter
diff --git a/shell/platform/embedder/embedder_surface.h b/shell/platform/embedder/embedder_surface.h
index ed8dbff74b8d050dd0ffc67d51eb504376d5924b..32873f1a944a5857e5b3b051ff22e182eb1d0a8f 100644
--- a/shell/platform/embedder/embedder_surface.h
+++ b/shell/platform/embedder/embedder_surface.h
@@ -5,6 +5,7 @@
 #ifndef FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_SURFACE_H_
 #define FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_SURFACE_H_
 
+#include <memory>
 #include "flutter/flow/embedded_views.h"
 #include "flutter/flow/surface.h"
 #include "flutter/fml/macros.h"
@@ -21,7 +22,9 @@ class EmbedderSurface {
 
   virtual std::unique_ptr<Surface> CreateGPUSurface() = 0;
 
-  virtual sk_sp<GrDirectContext> CreateResourceContext() const = 0;
+  virtual std::shared_ptr<impeller::Context> CreateImpellerContext() const;
+
+  virtual sk_sp<GrDirectContext> CreateResourceContext() const;
 
  private:
   FML_DISALLOW_COPY_AND_ASSIGN(EmbedderSurface);
diff --git a/shell/platform/embedder/embedder_surface_gl.cc b/shell/platform/embedder/embedder_surface_gl.cc
index 44b1fddf808fb4eca746e72a3e09636a08ec8685..cd32348e10306554d20ff0e78318be168bb951eb 100644
--- a/shell/platform/embedder/embedder_surface_gl.cc
+++ b/shell/platform/embedder/embedder_surface_gl.cc
@@ -107,7 +107,7 @@ sk_sp<GrDirectContext> EmbedderSurfaceGL::CreateResourceContext() const {
   auto callback = gl_dispatch_table_.gl_make_resource_current_callback;
   if (callback && callback()) {
     if (auto context = ShellIOManager::CreateCompatibleResourceLoadingContext(
-            GrBackend::kOpenGL_GrBackend, GetGLInterface())) {
+            GrBackendApi::kOpenGL, GetGLInterface())) {
       return context;
     } else {
       FML_LOG(ERROR)
diff --git a/shell/platform/embedder/embedder_surface_gl_impeller.cc b/shell/platform/embedder/embedder_surface_gl_impeller.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c7efa86de8168d07bbde57558df48ac980a56dab
--- /dev/null
+++ b/shell/platform/embedder/embedder_surface_gl_impeller.cc
@@ -0,0 +1,211 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/platform/embedder/embedder_surface_gl_impeller.h"
+
+#include <utility>
+
+#include "impeller/entity/gles/entity_shaders_gles.h"
+#include "impeller/entity/gles/framebuffer_blend_shaders_gles.h"
+#include "impeller/entity/gles/modern_shaders_gles.h"
+#include "impeller/renderer/backend/gles/context_gles.h"
+#include "impeller/renderer/backend/gles/proc_table_gles.h"
+
+#if IMPELLER_ENABLE_3D
+#include "impeller/scene/shaders/gles/scene_shaders_gles.h"  // nogncheck
+#endif  // IMPELLER_ENABLE_3D
+
+namespace flutter {
+
+class ReactorWorker final : public impeller::ReactorGLES::Worker {
+ public:
+  ReactorWorker() = default;
+
+  // |ReactorGLES::Worker|
+  bool CanReactorReactOnCurrentThreadNow(
+      const impeller::ReactorGLES& reactor) const override {
+    impeller::ReaderLock lock(mutex_);
+    auto found = reactions_allowed_.find(std::this_thread::get_id());
+    if (found == reactions_allowed_.end()) {
+      return false;
+    }
+    return found->second;
+  }
+
+  void SetReactionsAllowedOnCurrentThread(bool allowed) {
+    impeller::WriterLock lock(mutex_);
+    reactions_allowed_[std::this_thread::get_id()] = allowed;
+  }
+
+ private:
+  mutable impeller::RWMutex mutex_;
+  std::map<std::thread::id, bool> reactions_allowed_ IPLR_GUARDED_BY(mutex_);
+
+  FML_DISALLOW_COPY_AND_ASSIGN(ReactorWorker);
+};
+
+EmbedderSurfaceGLImpeller::EmbedderSurfaceGLImpeller(
+    EmbedderSurfaceGL::GLDispatchTable gl_dispatch_table,
+    bool fbo_reset_after_present,
+    std::shared_ptr<EmbedderExternalViewEmbedder> external_view_embedder)
+    : gl_dispatch_table_(std::move(gl_dispatch_table)),
+      fbo_reset_after_present_(fbo_reset_after_present),
+      external_view_embedder_(std::move(external_view_embedder)),
+      worker_(std::make_shared<ReactorWorker>()) {
+  // Make sure all required members of the dispatch table are checked.
+  if (!gl_dispatch_table_.gl_make_current_callback ||
+      !gl_dispatch_table_.gl_clear_current_callback ||
+      !gl_dispatch_table_.gl_present_callback ||
+      !gl_dispatch_table_.gl_fbo_callback ||
+      !gl_dispatch_table_.gl_populate_existing_damage ||
+      !gl_dispatch_table_.gl_proc_resolver) {
+    return;
+  }
+  // Certain GL backends need to made current before any GL
+  // state can be accessed.
+  gl_dispatch_table_.gl_make_current_callback();
+
+  std::vector<std::shared_ptr<fml::Mapping>> shader_mappings = {
+      std::make_shared<fml::NonOwnedMapping>(
+          impeller_entity_shaders_gles_data,
+          impeller_entity_shaders_gles_length),
+      std::make_shared<fml::NonOwnedMapping>(
+          impeller_modern_shaders_gles_data,
+          impeller_modern_shaders_gles_length),
+      std::make_shared<fml::NonOwnedMapping>(
+          impeller_framebuffer_blend_shaders_gles_data,
+          impeller_framebuffer_blend_shaders_gles_length),
+#if IMPELLER_ENABLE_3D
+      std::make_shared<fml::NonOwnedMapping>(
+          impeller_scene_shaders_gles_data, impeller_scene_shaders_gles_length),
+#endif  // IMPELLER_ENABLE_3D
+  };
+  auto gl = std::make_unique<impeller::ProcTableGLES>(
+      gl_dispatch_table_.gl_proc_resolver);
+  if (!gl->IsValid()) {
+    return;
+  }
+
+  impeller_context_ = impeller::ContextGLES::Create(
+      std::move(gl), shader_mappings, /*enable_gpu_tracing=*/false);
+
+  if (!impeller_context_) {
+    FML_LOG(ERROR) << "Could not create Impeller context.";
+    return;
+  }
+
+  auto worker_id = impeller_context_->AddReactorWorker(worker_);
+  if (!worker_id.has_value()) {
+    FML_LOG(ERROR) << "Could not add reactor worker.";
+    return;
+  }
+
+  gl_dispatch_table_.gl_clear_current_callback();
+  FML_LOG(IMPORTANT) << "Using the Impeller rendering backend (OpenGL).";
+  valid_ = true;
+}
+
+EmbedderSurfaceGLImpeller::~EmbedderSurfaceGLImpeller() = default;
+
+// |EmbedderSurface|
+bool EmbedderSurfaceGLImpeller::IsValid() const {
+  return valid_;
+}
+
+// |GPUSurfaceGLDelegate|
+std::unique_ptr<GLContextResult>
+EmbedderSurfaceGLImpeller::GLContextMakeCurrent() {
+  worker_->SetReactionsAllowedOnCurrentThread(true);
+  return std::make_unique<GLContextDefaultResult>(
+      gl_dispatch_table_.gl_make_current_callback());
+}
+
+// |GPUSurfaceGLDelegate|
+bool EmbedderSurfaceGLImpeller::GLContextClearCurrent() {
+  worker_->SetReactionsAllowedOnCurrentThread(false);
+  return gl_dispatch_table_.gl_clear_current_callback();
+}
+
+// |GPUSurfaceGLDelegate|
+bool EmbedderSurfaceGLImpeller::GLContextPresent(
+    const GLPresentInfo& present_info) {
+  // Pass the present information to the embedder present callback.
+  return gl_dispatch_table_.gl_present_callback(present_info);
+}
+
+// |GPUSurfaceGLDelegate|
+GLFBOInfo EmbedderSurfaceGLImpeller::GLContextFBO(
+    GLFrameInfo frame_info) const {
+  // Get the FBO ID using the gl_fbo_callback and then get exiting damage by
+  // passing that ID to the gl_populate_existing_damage.
+  return gl_dispatch_table_.gl_populate_existing_damage(
+      gl_dispatch_table_.gl_fbo_callback(frame_info));
+}
+
+// |GPUSurfaceGLDelegate|
+bool EmbedderSurfaceGLImpeller::GLContextFBOResetAfterPresent() const {
+  return fbo_reset_after_present_;
+}
+
+// |GPUSurfaceGLDelegate|
+SkMatrix EmbedderSurfaceGLImpeller::GLContextSurfaceTransformation() const {
+  auto callback = gl_dispatch_table_.gl_surface_transformation_callback;
+  if (!callback) {
+    SkMatrix matrix;
+    matrix.setIdentity();
+    return matrix;
+  }
+  return callback();
+}
+
+// |GPUSurfaceGLDelegate|
+EmbedderSurfaceGL::GLProcResolver EmbedderSurfaceGLImpeller::GetGLProcResolver()
+    const {
+  return gl_dispatch_table_.gl_proc_resolver;
+}
+
+// |GPUSurfaceGLDelegate|
+SurfaceFrame::FramebufferInfo
+EmbedderSurfaceGLImpeller::GLContextFramebufferInfo() const {
+  // Enable partial repaint by default on the embedders.
+  auto info = SurfaceFrame::FramebufferInfo{};
+  info.supports_readback = true;
+  info.supports_partial_repaint =
+      gl_dispatch_table_.gl_populate_existing_damage != nullptr;
+  return info;
+}
+
+// |EmbedderSurface|
+std::unique_ptr<Surface> EmbedderSurfaceGLImpeller::CreateGPUSurface() {
+  // Ensure that the GL context is current before creating the GPU surface.
+  // GPUSurfaceGLImpeller initialization will set up shader pipelines, and the
+  // current thread needs to be able to execute reactor operations.
+  GLContextMakeCurrent();
+
+  return std::make_unique<GPUSurfaceGLImpeller>(
+      this,                     // GPU surface GL delegate
+      impeller_context_,        // Impeller context
+      !external_view_embedder_  // render to surface
+  );
+}
+
+// |EmbedderSurface|
+std::shared_ptr<impeller::Context>
+EmbedderSurfaceGLImpeller::CreateImpellerContext() const {
+  return impeller_context_;
+}
+
+// |EmbedderSurface|
+sk_sp<GrDirectContext> EmbedderSurfaceGLImpeller::CreateResourceContext()
+    const {
+  if (gl_dispatch_table_.gl_make_resource_current_callback()) {
+    worker_->SetReactionsAllowedOnCurrentThread(true);
+  } else {
+    FML_DLOG(ERROR) << "Could not make the resource context current.";
+    worker_->SetReactionsAllowedOnCurrentThread(false);
+  }
+  return nullptr;
+}
+
+}  // namespace flutter
diff --git a/shell/platform/embedder/embedder_surface_gl_impeller.h b/shell/platform/embedder/embedder_surface_gl_impeller.h
new file mode 100644
index 0000000000000000000000000000000000000000..6d19272102bf3dcd424d9d662cbda9d143bf064d
--- /dev/null
+++ b/shell/platform/embedder/embedder_surface_gl_impeller.h
@@ -0,0 +1,81 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_SURFACE_GL_IMPELLER_H_
+#define FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_SURFACE_GL_IMPELLER_H_
+
+#include "flutter/fml/macros.h"
+#include "flutter/shell/gpu/gpu_surface_gl_impeller.h"
+#include "flutter/shell/platform/embedder/embedder_external_view_embedder.h"
+#include "flutter/shell/platform/embedder/embedder_surface.h"
+#include "flutter/shell/platform/embedder/embedder_surface_gl.h"
+
+namespace impeller {
+class ContextGLES;
+}  // namespace impeller
+
+namespace flutter {
+
+class ReactorWorker;
+
+class EmbedderSurfaceGLImpeller final : public EmbedderSurface,
+                                        public GPUSurfaceGLDelegate {
+ public:
+  EmbedderSurfaceGLImpeller(
+      EmbedderSurfaceGL::GLDispatchTable gl_dispatch_table,
+      bool fbo_reset_after_present,
+      std::shared_ptr<EmbedderExternalViewEmbedder> external_view_embedder);
+
+  ~EmbedderSurfaceGLImpeller() override;
+
+ private:
+  bool valid_ = false;
+  EmbedderSurfaceGL::GLDispatchTable gl_dispatch_table_;
+  bool fbo_reset_after_present_;
+  std::shared_ptr<impeller::ContextGLES> impeller_context_;
+  std::shared_ptr<EmbedderExternalViewEmbedder> external_view_embedder_;
+  std::shared_ptr<ReactorWorker> worker_;
+
+  // |EmbedderSurface|
+  bool IsValid() const override;
+
+  // |EmbedderSurface|
+  std::unique_ptr<Surface> CreateGPUSurface() override;
+
+  // |EmbedderSurface|
+  std::shared_ptr<impeller::Context> CreateImpellerContext() const override;
+
+  // |GPUSurfaceGLDelegate|
+  std::unique_ptr<GLContextResult> GLContextMakeCurrent() override;
+
+  // |GPUSurfaceGLDelegate|
+  bool GLContextClearCurrent() override;
+
+  // |GPUSurfaceGLDelegate|
+  bool GLContextPresent(const GLPresentInfo& present_info) override;
+
+  // |GPUSurfaceGLDelegate|
+  GLFBOInfo GLContextFBO(GLFrameInfo frame_info) const override;
+
+  // |GPUSurfaceGLDelegate|
+  bool GLContextFBOResetAfterPresent() const override;
+
+  // |GPUSurfaceGLDelegate|
+  SkMatrix GLContextSurfaceTransformation() const override;
+
+  // |GPUSurfaceGLDelegate|
+  GLProcResolver GetGLProcResolver() const override;
+
+  // |GPUSurfaceGLDelegate|
+  SurfaceFrame::FramebufferInfo GLContextFramebufferInfo() const override;
+
+  // |EmbedderSurface|
+  sk_sp<GrDirectContext> CreateResourceContext() const override;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(EmbedderSurfaceGLImpeller);
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_SURFACE_GL_IMPELLER_H_
diff --git a/shell/platform/embedder/embedder_surface_metal.h b/shell/platform/embedder/embedder_surface_metal.h
index bb4c8579e20e10019598a1e08fd5440d6be03d12..d835218103e02df6ccb51813a4f3ff50d6d96366 100644
--- a/shell/platform/embedder/embedder_surface_metal.h
+++ b/shell/platform/embedder/embedder_surface_metal.h
@@ -11,6 +11,8 @@
 #include "flutter/shell/platform/embedder/embedder_external_view_embedder.h"
 #include "flutter/shell/platform/embedder/embedder_surface.h"
 
+#include "third_party/skia/include/core/SkSurface.h"
+
 namespace flutter {
 
 class EmbedderSurfaceMetal final : public EmbedderSurface,
diff --git a/shell/platform/embedder/embedder_surface_metal_impeller.h b/shell/platform/embedder/embedder_surface_metal_impeller.h
new file mode 100644
index 0000000000000000000000000000000000000000..109870aa6f1291030251282d73c941eeaaa2b195
--- /dev/null
+++ b/shell/platform/embedder/embedder_surface_metal_impeller.h
@@ -0,0 +1,72 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_SURFACE_METAL_IMPELLER_H_
+#define FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_SURFACE_METAL_IMPELLER_H_
+
+#include <memory>
+#include "flutter/fml/macros.h"
+#include "flutter/shell/gpu/gpu_surface_metal_delegate.h"
+#include "flutter/shell/gpu/gpu_surface_metal_skia.h"
+#include "flutter/shell/platform/embedder/embedder_external_view_embedder.h"
+#include "flutter/shell/platform/embedder/embedder_surface.h"
+#include "fml/concurrent_message_loop.h"
+
+namespace impeller {
+class Context;
+}
+
+namespace flutter {
+
+class EmbedderSurfaceMetalImpeller final : public EmbedderSurface,
+                                           public GPUSurfaceMetalDelegate {
+ public:
+  struct MetalDispatchTable {
+    std::function<bool(GPUMTLTextureInfo texture)> present;  // required
+    std::function<GPUMTLTextureInfo(const SkISize& frame_size)>
+        get_texture;  // required
+  };
+
+  EmbedderSurfaceMetalImpeller(
+      GPUMTLDeviceHandle device,
+      GPUMTLCommandQueueHandle command_queue,
+      MetalDispatchTable dispatch_table,
+      std::shared_ptr<EmbedderExternalViewEmbedder> external_view_embedder);
+
+  ~EmbedderSurfaceMetalImpeller() override;
+
+ private:
+  bool valid_ = false;
+  MetalDispatchTable metal_dispatch_table_;
+  std::shared_ptr<EmbedderExternalViewEmbedder> external_view_embedder_;
+  std::shared_ptr<impeller::Context> context_;
+
+  // |EmbedderSurface|
+  bool IsValid() const override;
+
+  // |EmbedderSurface|
+  std::unique_ptr<Surface> CreateGPUSurface() override;
+
+  // |GPUSurfaceMetalDelegate|
+  GPUCAMetalLayerHandle GetCAMetalLayer(
+      const SkISize& frame_size) const override;
+
+  // |GPUSurfaceMetalDelegate|
+  bool PresentDrawable(GrMTLHandle drawable) const override;
+
+  // |GPUSurfaceMetalDelegate|
+  GPUMTLTextureInfo GetMTLTexture(const SkISize& frame_size) const override;
+
+  // |GPUSurfaceMetalDelegate|
+  bool PresentTexture(GPUMTLTextureInfo texture) const override;
+
+  // |EmbedderSurface|
+  std::shared_ptr<impeller::Context> CreateImpellerContext() const override;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(EmbedderSurfaceMetalImpeller);
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_SURFACE_METAL_IMPELLER_H_
diff --git a/shell/platform/embedder/embedder_surface_metal_impeller.mm b/shell/platform/embedder/embedder_surface_metal_impeller.mm
new file mode 100644
index 0000000000000000000000000000000000000000..c36199a2a3fc07469c325d9af4a103430c75f181
--- /dev/null
+++ b/shell/platform/embedder/embedder_surface_metal_impeller.mm
@@ -0,0 +1,105 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <memory>
+#include <utility>
+
+#include "flutter/shell/platform/embedder/embedder_surface_metal_impeller.h"
+
+#include "flutter/fml/logging.h"
+#include "flutter/fml/synchronization/sync_switch.h"
+#include "flutter/shell/gpu/gpu_surface_metal_delegate.h"
+#include "flutter/shell/gpu/gpu_surface_metal_impeller.h"
+#import "flutter/shell/platform/darwin/graphics/FlutterDarwinContextMetalImpeller.h"
+#include "impeller/entity/mtl/entity_shaders.h"
+#include "impeller/entity/mtl/framebuffer_blend_shaders.h"
+#include "impeller/entity/mtl/modern_shaders.h"
+#include "impeller/renderer/backend/metal/context_mtl.h"
+
+#if IMPELLER_ENABLE_3D
+#include "impeller/scene/shaders/mtl/scene_shaders.h"  // nogncheck
+#endif                                                 // IMPELLER_ENABLE_3D
+
+FLUTTER_ASSERT_NOT_ARC
+
+namespace flutter {
+
+EmbedderSurfaceMetalImpeller::EmbedderSurfaceMetalImpeller(
+    GPUMTLDeviceHandle device,
+    GPUMTLCommandQueueHandle command_queue,
+    MetalDispatchTable metal_dispatch_table,
+    std::shared_ptr<EmbedderExternalViewEmbedder> external_view_embedder)
+    : GPUSurfaceMetalDelegate(MTLRenderTargetType::kMTLTexture),
+      metal_dispatch_table_(std::move(metal_dispatch_table)),
+      external_view_embedder_(std::move(external_view_embedder)) {
+  std::vector<std::shared_ptr<fml::Mapping>> shader_mappings = {
+      std::make_shared<fml::NonOwnedMapping>(impeller_entity_shaders_data,
+                                             impeller_entity_shaders_length),
+#if IMPELLER_ENABLE_3D
+      std::make_shared<fml::NonOwnedMapping>(impeller_scene_shaders_data,
+                                             impeller_scene_shaders_length),
+#endif  // IMPELLER_ENABLE_3D
+      std::make_shared<fml::NonOwnedMapping>(impeller_modern_shaders_data,
+                                             impeller_modern_shaders_length),
+      std::make_shared<fml::NonOwnedMapping>(impeller_framebuffer_blend_shaders_data,
+                                             impeller_framebuffer_blend_shaders_length),
+  };
+  context_ = impeller::ContextMTL::Create(
+      (id<MTLDevice>)device,                     // device
+      (id<MTLCommandQueue>)command_queue,        // command_queue
+      shader_mappings,                           // shader_libraries_data
+      std::make_shared<fml::SyncSwitch>(false),  // is_gpu_disabled_sync_switch
+      "Impeller Library"                         // library_label
+  );
+  FML_LOG(IMPORTANT) << "Using the Impeller rendering backend (Metal).";
+
+  valid_ = !!context_;
+}
+
+EmbedderSurfaceMetalImpeller::~EmbedderSurfaceMetalImpeller() = default;
+
+bool EmbedderSurfaceMetalImpeller::IsValid() const {
+  return valid_;
+}
+
+std::unique_ptr<Surface> EmbedderSurfaceMetalImpeller::CreateGPUSurface()
+    IMPELLER_CA_METAL_LAYER_AVAILABLE {
+  if (!IsValid()) {
+    return nullptr;
+  }
+
+  const bool render_to_surface = !external_view_embedder_;
+  auto surface = std::make_unique<GPUSurfaceMetalImpeller>(this, context_, render_to_surface);
+
+  if (!surface->IsValid()) {
+    return nullptr;
+  }
+
+  return surface;
+}
+
+std::shared_ptr<impeller::Context> EmbedderSurfaceMetalImpeller::CreateImpellerContext() const {
+  return context_;
+}
+
+GPUCAMetalLayerHandle EmbedderSurfaceMetalImpeller::GetCAMetalLayer(
+    const SkISize& frame_info) const {
+  FML_CHECK(false) << "Only rendering to MTLTexture is supported.";
+  return nullptr;
+}
+
+bool EmbedderSurfaceMetalImpeller::PresentDrawable(GrMTLHandle drawable) const {
+  FML_CHECK(false) << "Only rendering to MTLTexture is supported.";
+  return false;
+}
+
+GPUMTLTextureInfo EmbedderSurfaceMetalImpeller::GetMTLTexture(const SkISize& frame_info) const {
+  return metal_dispatch_table_.get_texture(frame_info);
+}
+
+bool EmbedderSurfaceMetalImpeller::PresentTexture(GPUMTLTextureInfo texture) const {
+  return metal_dispatch_table_.present(texture);
+}
+
+}  // namespace flutter
diff --git a/shell/platform/embedder/embedder_surface_software.cc b/shell/platform/embedder/embedder_surface_software.cc
index f507e25e66646ab533c4e65ae2bf9f3e05ee54ec..7f6d445aa054c19f8382d61c60a66b8eb12535bd 100644
--- a/shell/platform/embedder/embedder_surface_software.cc
+++ b/shell/platform/embedder/embedder_surface_software.cc
@@ -7,8 +7,10 @@
 #include <utility>
 
 #include "flutter/fml/trace_event.h"
+
 #include "third_party/skia/include/core/SkColorSpace.h"
 #include "third_party/skia/include/core/SkImageInfo.h"
+#include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
 
 namespace flutter {
@@ -69,7 +71,7 @@ sk_sp<SkSurface> EmbedderSurfaceSoftware::AcquireBackingStore(
 
   SkImageInfo info = SkImageInfo::MakeN32(
       size.fWidth, size.fHeight, kPremul_SkAlphaType, SkColorSpace::MakeSRGB());
-  sk_surface_ = SkSurface::MakeRaster(info, nullptr);
+  sk_surface_ = SkSurfaces::Raster(info, nullptr);
 
   if (sk_surface_ == nullptr) {
     FML_LOG(ERROR) << "Could not create backing store for software rendering.";
diff --git a/shell/platform/embedder/embedder_surface_software.h b/shell/platform/embedder/embedder_surface_software.h
index 21c60cfae208eba3f4b9ffdf968d810c513885d6..5d52e63d76528fa927f8f8b5272160e77e48701d 100644
--- a/shell/platform/embedder/embedder_surface_software.h
+++ b/shell/platform/embedder/embedder_surface_software.h
@@ -10,6 +10,8 @@
 #include "flutter/shell/platform/embedder/embedder_external_view_embedder.h"
 #include "flutter/shell/platform/embedder/embedder_surface.h"
 
+#include "third_party/skia/include/core/SkSurface.h"
+
 namespace flutter {
 
 class EmbedderSurfaceSoftware final : public EmbedderSurface,
diff --git a/shell/platform/embedder/embedder_surface_vulkan.cc b/shell/platform/embedder/embedder_surface_vulkan.cc
index 8fe32f17e6755325063b7d660a7da5834ab0c4cc..1ab4ca92942c3c9a9eea9f168688297f6f04936b 100644
--- a/shell/platform/embedder/embedder_surface_vulkan.cc
+++ b/shell/platform/embedder/embedder_surface_vulkan.cc
@@ -8,12 +8,13 @@
 
 #include "flutter/flutter_vma/flutter_skia_vma.h"
 #include "flutter/shell/common/shell_io_manager.h"
+#include "flutter/shell/gpu/gpu_surface_vulkan.h"
+#include "flutter/shell/gpu/gpu_surface_vulkan_delegate.h"
 #include "flutter/vulkan/vulkan_skia_proc_table.h"
 #include "include/gpu/GrDirectContext.h"
 #include "include/gpu/vk/GrVkBackendContext.h"
 #include "include/gpu/vk/GrVkExtensions.h"
-#include "shell/gpu/gpu_surface_vulkan.h"
-#include "shell/gpu/gpu_surface_vulkan_delegate.h"
+#include "third_party/skia/include/gpu/ganesh/vk/GrVkDirectContext.h"
 
 namespace flutter {
 
@@ -171,7 +172,7 @@ sk_sp<GrDirectContext> EmbedderSurfaceVulkan::CreateGrContext(
   GrContextOptions options =
       MakeDefaultContextOptions(context_type, GrBackendApi::kVulkan);
   options.fReduceOpsTaskSplitting = GrContextOptions::Enable::kNo;
-  return GrDirectContext::MakeVulkan(backend_context, options);
+  return GrDirectContexts::MakeVulkan(backend_context, options);
 }
 
 }  // namespace flutter
diff --git a/shell/platform/embedder/embedder_surface_vulkan.h b/shell/platform/embedder/embedder_surface_vulkan.h
index 8c44e3ddd99e6414d36928eafc52027663b2baa8..0e972d3723b74962b7ac96e8effee7e5dea44372 100644
--- a/shell/platform/embedder/embedder_surface_vulkan.h
+++ b/shell/platform/embedder/embedder_surface_vulkan.h
@@ -6,13 +6,13 @@
 #define FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_SURFACE_VULKAN_H_
 
 #include "flutter/fml/macros.h"
+#include "flutter/shell/common/context_options.h"
 #include "flutter/shell/gpu/gpu_surface_vulkan.h"
+#include "flutter/shell/gpu/gpu_surface_vulkan_delegate.h"
+#include "flutter/shell/platform/embedder/embedder.h"
 #include "flutter/shell/platform/embedder/embedder_external_view_embedder.h"
 #include "flutter/shell/platform/embedder/embedder_surface.h"
 #include "flutter/vulkan/procs/vulkan_proc_table.h"
-#include "shell/common/context_options.h"
-#include "shell/gpu/gpu_surface_vulkan_delegate.h"
-#include "shell/platform/embedder/embedder.h"
 
 namespace flutter {
 
diff --git a/shell/platform/embedder/embedder_task_runner.h b/shell/platform/embedder/embedder_task_runner.h
index be11912f2b841d0b49e529bec88bbd687853d39c..5c0e1e845d43b3ad8795cec37dbaaaa220b00599 100644
--- a/shell/platform/embedder/embedder_task_runner.h
+++ b/shell/platform/embedder/embedder_task_runner.h
@@ -34,7 +34,7 @@ class EmbedderTaskRunner final : public fml::TaskRunner {
                        fml::TimePoint target_time)>
         post_task_callback;
     //--------------------------------------------------------------------------
-    /// Asks the embedder if tasks posted to it on this task task runner via the
+    /// Asks the embedder if tasks posted to it on this task runner via the
     /// `post_task_callback` will be executed (after task expiry) on the calling
     /// thread.
     ///
diff --git a/shell/platform/embedder/embedder_thread_host.cc b/shell/platform/embedder/embedder_thread_host.cc
index 73646cfc0cb0951b785bfdaf414ef648f9985e03..7cca136462ed516f6e35b11df0aed9b097d62ab4 100644
--- a/shell/platform/embedder/embedder_thread_host.cc
+++ b/shell/platform/embedder/embedder_thread_host.cc
@@ -137,9 +137,9 @@ EmbedderThreadHost::CreateEmbedderManagedThreadHost(
   //
   // If/when more task runners are exposed, this mask will need to be updated.
   thread_host_config.SetUIConfig(MakeThreadConfig(
-      ThreadHost::Type::UI, fml::Thread::ThreadPriority::DISPLAY));
+      ThreadHost::Type::kUi, fml::Thread::ThreadPriority::kDisplay));
   thread_host_config.SetIOConfig(MakeThreadConfig(
-      ThreadHost::Type::IO, fml::Thread::ThreadPriority::BACKGROUND));
+      ThreadHost::Type::kIo, fml::Thread::ThreadPriority::kBackground));
 
   auto platform_task_runner_pair = CreateEmbedderTaskRunner(
       SAFE_ACCESS(custom_task_runners, platform_task_runner, nullptr));
@@ -157,7 +157,7 @@ EmbedderThreadHost::CreateEmbedderManagedThreadHost(
   // created.
   if (!render_task_runner_pair.second) {
     thread_host_config.SetRasterConfig(MakeThreadConfig(
-        ThreadHost::Type::RASTER, fml::Thread::ThreadPriority::RASTER));
+        ThreadHost::Type::kRaster, fml::Thread::ThreadPriority::kRaster));
   }
 
   // If both the platform task runner and the raster task runner are specified
@@ -227,11 +227,11 @@ EmbedderThreadHost::CreateEngineManagedThreadHost(
   // Crate a thraed host config, and specified the thread name and priority.
   auto thread_host_config = ThreadHost::ThreadHostConfig(config_setter);
   thread_host_config.SetUIConfig(MakeThreadConfig(
-      flutter::ThreadHost::UI, fml::Thread::ThreadPriority::DISPLAY));
+      flutter::ThreadHost::kUi, fml::Thread::ThreadPriority::kDisplay));
   thread_host_config.SetRasterConfig(MakeThreadConfig(
-      flutter::ThreadHost::RASTER, fml::Thread::ThreadPriority::RASTER));
+      flutter::ThreadHost::kRaster, fml::Thread::ThreadPriority::kRaster));
   thread_host_config.SetIOConfig(MakeThreadConfig(
-      flutter::ThreadHost::IO, fml::Thread::ThreadPriority::BACKGROUND));
+      flutter::ThreadHost::kIo, fml::Thread::ThreadPriority::kBackground));
 
   // Create a thread host with the current thread as the platform thread and all
   // other threads managed.
diff --git a/shell/platform/embedder/fixtures/README.md b/shell/platform/embedder/fixtures/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..b68fc603cd73d9e248d3fd29f424f7f9f3c7e1c8
--- /dev/null
+++ b/shell/platform/embedder/fixtures/README.md
@@ -0,0 +1,83 @@
+# `platform/embedder/fixtures`
+
+The files in this directory are golden-file outputss of [`tests`](../tests),
+but lack a simple way to be re-generated.
+
+For example, here is what a failure might look like on CI:
+
+```txt
+[0;32m[ RUN      ] EmbedderTest.VerifyB143464703WithSoftwareBackend
+[ERROR:flutter/shell/platform/embedder/tests/embedder_unittests_util.cc(199)] Image did not match expectation.
+Expected:/b/s/w/ir/cache/builder/src/out/host_debug_unopt/gen/flutter/shell/platform/embedder/assets/expectation_verifyb143464703_soft_noxform.png
+Got:/b/s/w/ir/cache/builder/src/out/host_debug_unopt/gen/flutter/shell/platform/embedder/assets/actual_verifyb143464703_soft_noxform.png
+
+../../flutter/shell/platform/embedder/tests/embedder_unittests.cc:1335: Failure
+Value of: ImageMatchesFixture("verifyb143464703_soft_noxform.png", rendered_scene)
+  Actual: false
+Expected: true
+[  FAILED  ] EmbedderTest.VerifyB143464703WithSoftwareBackend (8077 ms)
+[----------] 1 test from EmbedderTest (8080 ms total)
+
+[----------] Global test environment tear-down
+[==========] 1 test from 1 test suite ran. (8080 ms total)
+[  PASSED  ] 0 tests.
+[  FAILED  ] 1 test, listed below:
+[  FAILED  ] EmbedderTest.VerifyB143464703WithSoftwareBackend
+
+ 1 FAILED TEST
+[13/296] EmbedderTest.VerifyB143464703WithSoftwareBackend returned/aborted with exit code 1 (8226 ms)
+[14/296] EmbedderTest.VerifyB143464703WithSoftwareBackend (8484 ms)
+[INFO:test_timeout_listener.cc(76)] Test timeout of 300 seconds per test case will be enforced.
+Note: Google Test filter = EmbedderTest.VerifyB143464703WithSoftwareBackend
+[==========] Running 1 test from 1 test suite.
+[----------] Global test environment set-up.
+[----------] 1 test from EmbedderTest
+[ DISABLED ] EmbedderTest.DISABLED_CanLaunchAndShutdownMultipleTimes
+[ RUN      ] EmbedderTest.VerifyB143464703WithSoftwareBackend
+[ERROR:flutter/shell/platform/embedder/tests/embedder_unittests_util.cc(199)] Image did not match expectation.
+Expected:/b/s/w/ir/cache/builder/src/out/host_debug_unopt/gen/flutter/shell/platform/embedder/assets/expectation_verifyb143464703_soft_noxform.png
+Got:/b/s/w/ir/cache/builder/src/out/host_debug_unopt/gen/flutter/shell/platform/embedder/assets/actual_verifyb143464703_soft_noxform.png
+
+../../flutter/shell/platform/embedder/tests/embedder_unittests.cc:1335: Failure
+Value of: ImageMatchesFixture("verifyb143464703_soft_noxform.png", rendered_scene)
+  Actual: false
+Expected: true
+[  FAILED  ] EmbedderTest.VerifyB143464703WithSoftwareBackend (8348 ms)
+[----------] 1 test from EmbedderTest (8350 ms total)
+
+[----------] Global test environment tear-down
+[==========] 1 test from 1 test suite ran. (8350 ms total)
+[  PASSED  ] 0 tests.
+[  FAILED  ] 1 test, listed below:
+[  FAILED  ] EmbedderTest.VerifyB143464703WithSoftwareBackend
+```
+
+In order to update `verifyb143464703_soft_noxform.png`:
+
+```shell
+# The examples below assume:
+#   $ENGINE = /path/to/engine/src
+#   $TARGET = /path/to/engine/src/out/{{host_you_want_to_build}}
+
+# 1. Make sure you have built the engine:
+$ ninja -j1000 -C $ENGINE/out/$TARGET
+
+# 2. Run the test locally (assuming you have built the engine).
+$ $ENGINE/out/$TARGET/embedder_unittests*
+
+# Or, to run just a single test:
+$ $ENGINE/out/$TARGET/embedder_unittests --gtest_filter="EmbedderTest.VerifyB143464703WithSoftwareBackend"
+
+# Or, a suite of tests:
+$ $ENGINE/out/$TARGET/embedder_unittests --gtest_filter="EmbedderTest.*"
+
+# 3. Now, copy the output to the golden file:
+$ cp \
+  $ENGINE/out/$TARGET/gen/flutter/shell/platform/embedder/assets/expectation_verifyb143464703_soft_noxform.png \
+  $ENGINE/flutter/shell/platform/embedder/fixtures/verifyb143464703_soft_noxform.png
+```
+
+⚠️ **WARNING**: Some of the golden tests do not run on non-Linux OSes, which
+means its not currently possible to re-generate them on non-Linux OSes
+(<https://github.com/flutter/flutter/issues/53784>). So uh, setup a Linux VM
+or find a friend with a Linux machine.
diff --git a/shell/platform/embedder/fixtures/compositor_platform_layer_with_no_overlay.png b/shell/platform/embedder/fixtures/compositor_platform_layer_with_no_overlay.png
new file mode 100644
index 0000000000000000000000000000000000000000..20109dfd893d43cbfb373abb4496677d87e58c97
Binary files /dev/null and b/shell/platform/embedder/fixtures/compositor_platform_layer_with_no_overlay.png differ
diff --git a/shell/platform/embedder/fixtures/impeller_gl_test.png b/shell/platform/embedder/fixtures/impeller_gl_test.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed1fdb37ef1518e8bf88abd2696b1eb570abb4ba
Binary files /dev/null and b/shell/platform/embedder/fixtures/impeller_gl_test.png differ
diff --git a/shell/platform/embedder/fixtures/main.dart b/shell/platform/embedder/fixtures/main.dart
index 1726c5637389b5d036797b15856588183b758a20..d5758ffd92756603606841005d97ee36d592e2cc 100644
--- a/shell/platform/embedder/fixtures/main.dart
+++ b/shell/platform/embedder/fixtures/main.dart
@@ -45,14 +45,27 @@ void executableNameNotNull() {
   notifyStringValue(Platform.executable);
 }
 
+@pragma('vm:entry-point')
+void implicitViewNotNull() {
+  notifyBoolValue(PlatformDispatcher.instance.implicitView != null);
+}
+
 @pragma('vm:external-name', 'NotifyStringValue')
 external void notifyStringValue(String value);
+@pragma('vm:external-name', 'NotifyBoolValue')
+external void notifyBoolValue(bool value);
 
 @pragma('vm:entry-point')
 void invokePlatformTaskRunner() {
   PlatformDispatcher.instance.sendPlatformMessage('OhHi', null, null);
 }
 
+@pragma('vm:entry-point')
+void invokePlatformThreadIsolate() {
+  signalNativeTest();
+  runOnPlatformThread(ffiSignalNativeTest);
+}
+
 Float64List kTestTransform = () {
   final Float64List values = Float64List(16);
   values[0] = 1.0; // scaleX
@@ -80,6 +93,9 @@ external void notifyAccessibilityFeatures(bool reduceMotion);
 @pragma('vm:external-name', 'NotifySemanticsAction')
 external void notifySemanticsAction(int nodeId, int action, List<int> data);
 
+@ffi.Native<ffi.Void Function()>(symbol: 'FFISignalNativeTest')
+external void ffiSignalNativeTest();
+
 /// Returns a future that completes when
 /// `PlatformDispatcher.instance.onSemanticsEnabledChanged` fires.
 Future<void> get semanticsChanged {
@@ -98,45 +114,39 @@ Future<void> get accessibilityFeaturesChanged {
   return featuresChanged.future;
 }
 
-class SemanticsActionData {
-  const SemanticsActionData(this.id, this.action, this.args);
-  final int id;
-  final SemanticsAction action;
-  final ByteData? args;
-}
-
-Future<SemanticsActionData> get semanticsAction {
-  final Completer<SemanticsActionData> actionReceived =
-      Completer<SemanticsActionData>();
-  PlatformDispatcher.instance.onSemanticsAction =
-      (int id, SemanticsAction action, ByteData? args) {
-    actionReceived.complete(SemanticsActionData(id, action, args));
+Future<SemanticsActionEvent> get semanticsActionEvent {
+  final Completer<SemanticsActionEvent> actionReceived =
+      Completer<SemanticsActionEvent>();
+  PlatformDispatcher.instance.onSemanticsActionEvent =
+      (SemanticsActionEvent action) {
+    actionReceived.complete(action);
   };
   return actionReceived.future;
 }
 
 @pragma('vm:entry-point')
-void a11y_main() async {
-  // Return initial state (semantics disabled).
+Future<void> a11y_main() async {
+  // 1: Return initial state (semantics disabled).
   notifySemanticsEnabled(PlatformDispatcher.instance.semanticsEnabled);
 
-  // Await semantics enabled from embedder.
+  // 2: Await semantics enabled from embedder.
   await semanticsChanged;
   notifySemanticsEnabled(PlatformDispatcher.instance.semanticsEnabled);
 
-  // Return initial state of accessibility features.
+  // 3: Return initial state of accessibility features.
   notifyAccessibilityFeatures(
       PlatformDispatcher.instance.accessibilityFeatures.reduceMotion);
 
-  // Await accessibility features changed from embedder.
+  // 4: Await accessibility features changed from embedder.
   await accessibilityFeaturesChanged;
   notifyAccessibilityFeatures(
       PlatformDispatcher.instance.accessibilityFeatures.reduceMotion);
 
-  // Fire semantics update.
+  // 5: Fire semantics update.
   final SemanticsUpdateBuilder builder = SemanticsUpdateBuilder()
     ..updateNode(
       id: 42,
+      identifier: '',
       label: 'A: root',
       labelAttributes: <StringAttribute>[],
       rect: Rect.fromLTRB(0.0, 0.0, 10.0, 10.0),
@@ -166,10 +176,12 @@ void a11y_main() async {
       decreasedValue: '',
       decreasedValueAttributes: <StringAttribute>[],
       tooltip: 'tooltip',
+      textDirection: TextDirection.ltr,
       additionalActions: Int32List(0),
     )
     ..updateNode(
       id: 84,
+      identifier: '',
       label: 'B: leaf',
       labelAttributes: <StringAttribute>[],
       rect: Rect.fromLTRB(40.0, 40.0, 80.0, 80.0),
@@ -197,12 +209,14 @@ void a11y_main() async {
       decreasedValue: '',
       decreasedValueAttributes: <StringAttribute>[],
       tooltip: 'tooltip',
+      textDirection: TextDirection.ltr,
       additionalActions: Int32List(0),
       childrenInHitTestOrder: Int32List(0),
       childrenInTraversalOrder: Int32List(0),
     )
     ..updateNode(
       id: 96,
+      identifier: '',
       label: 'C: branch',
       labelAttributes: <StringAttribute>[],
       rect: Rect.fromLTRB(40.0, 40.0, 80.0, 80.0),
@@ -232,10 +246,12 @@ void a11y_main() async {
       decreasedValue: '',
       decreasedValueAttributes: <StringAttribute>[],
       tooltip: 'tooltip',
+      textDirection: TextDirection.ltr,
       additionalActions: Int32List(0),
     )
     ..updateNode(
       id: 128,
+      identifier: '',
       label: 'D: leaf',
       labelAttributes: <StringAttribute>[],
       rect: Rect.fromLTRB(40.0, 40.0, 80.0, 80.0),
@@ -264,6 +280,7 @@ void a11y_main() async {
       decreasedValue: '',
       decreasedValueAttributes: <StringAttribute>[],
       tooltip: 'tooltip',
+      textDirection: TextDirection.ltr,
       childrenInHitTestOrder: Int32List(0),
       childrenInTraversalOrder: Int32List(0),
     )
@@ -277,19 +294,97 @@ void a11y_main() async {
 
   signalNativeTest();
 
-  // Await semantics action from embedder.
-  final SemanticsActionData data = await semanticsAction;
+  // 6: Await semantics action from embedder.
+  final SemanticsActionEvent data = await semanticsActionEvent;
   final List<int> actionArgs = <int>[
-    data.args!.getInt8(0),
-    data.args!.getInt8(1)
+    (data.arguments! as ByteData).getInt8(0),
+    (data.arguments! as ByteData).getInt8(1)
   ];
-  notifySemanticsAction(data.id, data.action.index, actionArgs);
+  notifySemanticsAction(data.nodeId, data.type.index, actionArgs);
 
-  // Await semantics disabled from embedder.
+  // 7: Await semantics disabled from embedder.
   await semanticsChanged;
   notifySemanticsEnabled(PlatformDispatcher.instance.semanticsEnabled);
 }
 
+@pragma('vm:entry-point')
+Future<void> a11y_string_attributes() async {
+  // 1: Wait until semantics are enabled.
+  if (!PlatformDispatcher.instance.semanticsEnabled) {
+    await semanticsChanged;
+  }
+
+  // 2: Update semantics with string attributes.
+  final SemanticsUpdateBuilder builder = SemanticsUpdateBuilder()
+    ..updateNode(
+      id: 42,
+      identifier: 'identifier',
+      label: 'What is the meaning of life?',
+      labelAttributes: <StringAttribute>[
+        LocaleStringAttribute(
+          range: TextRange(start: 0, end: 'What is the meaning of life?'.length),
+          locale: Locale('en'),
+        ),
+        SpellOutStringAttribute(
+          range: TextRange(start: 0, end: 1),
+        ),
+      ],
+      rect: Rect.fromLTRB(0.0, 0.0, 10.0, 10.0),
+      transform: kTestTransform,
+      childrenInTraversalOrder: Int32List.fromList(<int>[84, 96]),
+      childrenInHitTestOrder: Int32List.fromList(<int>[96, 84]),
+      actions: 0,
+      flags: 0,
+      maxValueLength: 0,
+      currentValueLength: 0,
+      textSelectionBase: 0,
+      textSelectionExtent: 0,
+      platformViewId: 0,
+      scrollChildren: 0,
+      scrollIndex: 0,
+      scrollPosition: 0.0,
+      scrollExtentMax: 0.0,
+      scrollExtentMin: 0.0,
+      elevation: 0.0,
+      thickness: 0.0,
+      hint: "It's a number",
+      hintAttributes: <StringAttribute>[
+        LocaleStringAttribute(
+          range: TextRange(start: 0, end: 1),
+          locale: Locale('en'),
+        ),
+        LocaleStringAttribute(
+          range: TextRange(start: 2, end: 3),
+          locale: Locale('fr'),
+        ),
+      ],
+      value: '42',
+      valueAttributes: <StringAttribute>[
+        LocaleStringAttribute(
+          range: TextRange(start: 0, end: '42'.length),
+          locale: Locale('en', 'US'),
+        ),
+      ],
+      increasedValue: '43',
+      increasedValueAttributes: <StringAttribute>[
+        SpellOutStringAttribute(
+          range: TextRange(start: 0, end: 1),
+        ),
+        SpellOutStringAttribute(
+          range: TextRange(start: 1, end: 2),
+        ),
+      ],
+      decreasedValue: '41',
+      decreasedValueAttributes: <StringAttribute>[],
+      tooltip: 'tooltip',
+      textDirection: TextDirection.ltr,
+      additionalActions: Int32List(0),
+    );
+
+  PlatformDispatcher.instance.views.first.updateSemantics(builder.build());
+  signalNativeTest();
+}
+
 @pragma('vm:entry-point')
 void platform_messages_response() {
   PlatformDispatcher.instance.onPlatformMessage =
@@ -303,7 +398,7 @@ void platform_messages_response() {
 void platform_messages_no_response() {
   PlatformDispatcher.instance.onPlatformMessage =
       (String name, ByteData? data, PlatformMessageResponseCallback? callback) {
-    var list = data!.buffer.asUint8List(data.offsetInBytes, data.lengthInBytes);
+    final Uint8List list = data!.buffer.asUint8List(data.offsetInBytes, data.lengthInBytes);
     signalNativeMessage(utf8.decode(list));
     // This does nothing because no one is listening on the other side. But complete the loop anyway
     // to make sure all null checking on response handles in the engine is in place.
@@ -324,10 +419,10 @@ void null_platform_messages() {
 }
 
 Picture CreateSimplePicture() {
-  Paint blackPaint = Paint();
-  Paint whitePaint = Paint()..color = Color.fromARGB(255, 255, 255, 255);
-  PictureRecorder baseRecorder = PictureRecorder();
-  Canvas canvas = Canvas(baseRecorder);
+  final Paint blackPaint = Paint();
+  final Paint whitePaint = Paint()..color = Color.fromARGB(255, 255, 255, 255);
+  final PictureRecorder baseRecorder = PictureRecorder();
+  final Canvas canvas = Canvas(baseRecorder);
   canvas.drawRect(Rect.fromLTRB(0.0, 0.0, 1000.0, 1000.0), blackPaint);
   canvas.drawRect(Rect.fromLTRB(10.0, 10.0, 990.0, 990.0), whitePaint);
   return baseRecorder.endRecording();
@@ -336,7 +431,7 @@ Picture CreateSimplePicture() {
 @pragma('vm:entry-point')
 void can_composite_platform_views() {
   PlatformDispatcher.instance.onBeginFrame = (Duration duration) {
-    SceneBuilder builder = SceneBuilder();
+    final SceneBuilder builder = SceneBuilder();
     builder.addPicture(Offset(1.0, 1.0), CreateSimplePicture());
     builder.pushOffset(1.0, 2.0);
     builder.addPlatformView(42, width: 123.0, height: 456.0);
@@ -352,7 +447,7 @@ void can_composite_platform_views() {
 @pragma('vm:entry-point')
 void can_composite_platform_views_with_opacity() {
   PlatformDispatcher.instance.onBeginFrame = (Duration duration) {
-    SceneBuilder builder = SceneBuilder();
+    final SceneBuilder builder = SceneBuilder();
 
     // Root node
     builder.pushOffset(1.0, 2.0);
@@ -382,7 +477,7 @@ void can_composite_platform_views_with_opacity() {
 @pragma('vm:entry-point')
 void can_composite_with_opacity() {
   PlatformDispatcher.instance.onBeginFrame = (Duration duration) {
-    SceneBuilder builder = SceneBuilder();
+    final SceneBuilder builder = SceneBuilder();
     builder.pushOpacity(127);
     builder.addPicture(Offset(1.0, 1.0), CreateSimplePicture());
     builder.pop(); // offset
@@ -394,10 +489,10 @@ void can_composite_with_opacity() {
 }
 
 Picture CreateColoredBox(Color color, Size size) {
-  Paint paint = Paint();
+  final Paint paint = Paint();
   paint.color = color;
-  PictureRecorder baseRecorder = PictureRecorder();
-  Canvas canvas = Canvas(baseRecorder);
+  final PictureRecorder baseRecorder = PictureRecorder();
+  final Canvas canvas = Canvas(baseRecorder);
   canvas.drawRect(Rect.fromLTRB(0.0, 0.0, size.width, size.height), paint);
   return baseRecorder.endRecording();
 }
@@ -405,13 +500,13 @@ Picture CreateColoredBox(Color color, Size size) {
 @pragma('vm:entry-point')
 void can_composite_platform_views_with_known_scene() {
   PlatformDispatcher.instance.onBeginFrame = (Duration duration) {
-    Color red = Color.fromARGB(127, 255, 0, 0);
-    Color blue = Color.fromARGB(127, 0, 0, 255);
-    Color gray = Color.fromARGB(127, 127, 127, 127);
+    final Color red = Color.fromARGB(127, 255, 0, 0);
+    final Color blue = Color.fromARGB(127, 0, 0, 255);
+    final Color gray = Color.fromARGB(127, 127, 127, 127);
 
-    Size size = Size(50.0, 150.0);
+    final Size size = Size(50.0, 150.0);
 
-    SceneBuilder builder = SceneBuilder();
+    final SceneBuilder builder = SceneBuilder();
     builder.pushOffset(0.0, 0.0);
 
     // 10 (Index 0)
@@ -448,13 +543,80 @@ void can_composite_platform_views_with_known_scene() {
   PlatformDispatcher.instance.scheduleFrame();
 }
 
+@pragma('vm:entry-point')
+void can_composite_platform_views_transparent_overlay() {
+  PlatformDispatcher.instance.onBeginFrame = (Duration duration) {
+    final Color red = Color.fromARGB(127, 255, 0, 0);
+    final Color blue = Color.fromARGB(127, 0, 0, 255);
+    final Color transparent = Color(0xFFFFFF);
+
+    final Size size = Size(50.0, 150.0);
+
+    final SceneBuilder builder = SceneBuilder();
+    builder.pushOffset(0.0, 0.0);
+
+    // 10 (Index 0)
+    builder.addPicture(
+        Offset(10.0, 10.0), CreateColoredBox(red, size)); // red - flutter
+
+    builder.pushOffset(20.0, 20.0);
+    // 20 (Index 1)
+    builder.addPlatformView(1,
+        width: size.width, height: size.height); // green - platform
+    builder.pop();
+
+    // 30 (Index 2)
+    builder.addPicture(
+        Offset(30.0, 30.0), CreateColoredBox(transparent, size)); // transparent picture, no layer should be created.
+
+    builder.pop();
+
+    PlatformDispatcher.instance.views.first.render(builder.build());
+
+    signalNativeTest(); // Signal 2
+  };
+  signalNativeTest(); // Signal 1
+  PlatformDispatcher.instance.scheduleFrame();
+}
+
+@pragma('vm:entry-point')
+void can_composite_platform_views_no_overlay() {
+  PlatformDispatcher.instance.onBeginFrame = (Duration duration) {
+    final Color red = Color.fromARGB(127, 255, 0, 0);
+    final Color blue = Color.fromARGB(127, 0, 0, 255);
+
+    final Size size = Size(50.0, 150.0);
+
+    final SceneBuilder builder = SceneBuilder();
+    builder.pushOffset(0.0, 0.0);
+
+    // 10 (Index 0)
+    builder.addPicture(
+        Offset(10.0, 10.0), CreateColoredBox(red, size)); // red - flutter
+
+    builder.pushOffset(20.0, 20.0);
+    // 20 (Index 1)
+    builder.addPlatformView(1,
+        width: size.width, height: size.height); // green - platform
+    builder.pop();
+    builder.pop();
+
+    PlatformDispatcher.instance.views.first.render(builder.build());
+
+    signalNativeTest(); // Signal 2
+  };
+  signalNativeTest(); // Signal 1
+  PlatformDispatcher.instance.scheduleFrame();
+}
+
+
 @pragma('vm:entry-point')
 void can_composite_platform_views_with_root_layer_only() {
   PlatformDispatcher.instance.onBeginFrame = (Duration duration) {
-    Color red = Color.fromARGB(127, 255, 0, 0);
-    Size size = Size(50.0, 150.0);
+    final Color red = Color.fromARGB(127, 255, 0, 0);
+    final Size size = Size(50.0, 150.0);
 
-    SceneBuilder builder = SceneBuilder();
+    final SceneBuilder builder = SceneBuilder();
     builder.pushOffset(0.0, 0.0);
 
     // 10 (Index 0)
@@ -473,10 +635,10 @@ void can_composite_platform_views_with_root_layer_only() {
 @pragma('vm:entry-point')
 void can_composite_platform_views_with_platform_layer_on_bottom() {
   PlatformDispatcher.instance.onBeginFrame = (Duration duration) {
-    Color red = Color.fromARGB(127, 255, 0, 0);
-    Size size = Size(50.0, 150.0);
+    final Color red = Color.fromARGB(127, 255, 0, 0);
+    final Size size = Size(50.0, 150.0);
 
-    SceneBuilder builder = SceneBuilder();
+    final SceneBuilder builder = SceneBuilder();
     builder.pushOffset(0.0, 0.0);
 
     // 10 (Index 0)
@@ -498,18 +660,37 @@ void can_composite_platform_views_with_platform_layer_on_bottom() {
   PlatformDispatcher.instance.scheduleFrame();
 }
 
+@pragma('vm:external-name', 'SignalBeginFrame')
+external void signalBeginFrame();
+
+@pragma('vm:entry-point')
+Future<void> texture_destruction_callback_called_without_custom_compositor() async {
+  PlatformDispatcher.instance.onBeginFrame = (Duration duration) {
+    final Color red = Color.fromARGB(127, 255, 0, 0);
+    final Size size = Size(50.0, 150.0);
+    final SceneBuilder builder = SceneBuilder();
+    builder.pushOffset(0.0, 0.0);
+    builder.addPicture(
+        Offset(10.0, 10.0), CreateColoredBox(red, size)); // red - flutter
+    builder.pop();
+    PlatformDispatcher.instance.views.first.render(builder.build());
+  };
+  PlatformDispatcher.instance.scheduleFrame();
+}
+
+
 @pragma('vm:entry-point')
 void can_render_scene_without_custom_compositor() {
   PlatformDispatcher.instance.onBeginFrame = (Duration duration) {
-    Color red = Color.fromARGB(127, 255, 0, 0);
-    Color green = Color.fromARGB(127, 0, 255, 0);
-    Color blue = Color.fromARGB(127, 0, 0, 255);
-    Color magenta = Color.fromARGB(127, 255, 0, 255);
-    Color gray = Color.fromARGB(127, 127, 127, 127);
+    final Color red = Color.fromARGB(127, 255, 0, 0);
+    final Color green = Color.fromARGB(127, 0, 255, 0);
+    final Color blue = Color.fromARGB(127, 0, 0, 255);
+    final Color magenta = Color.fromARGB(127, 255, 0, 255);
+    final Color gray = Color.fromARGB(127, 127, 127, 127);
 
-    Size size = Size(50.0, 150.0);
+    final Size size = Size(50.0, 150.0);
 
-    SceneBuilder builder = SceneBuilder();
+    final SceneBuilder builder = SceneBuilder();
 
     builder.pushOffset(0.0, 0.0);
 
@@ -536,8 +717,8 @@ void can_render_scene_without_custom_compositor() {
 }
 
 Picture CreateGradientBox(Size size) {
-  Paint paint = Paint();
-  List<Color> rainbow = [
+  final Paint paint = Paint();
+  final List<Color> rainbow = <Color>[
     Color.fromARGB(255, 255, 0, 0), // red
     Color.fromARGB(255, 255, 165, 0), // orange
     Color.fromARGB(255, 255, 255, 0), // yellow
@@ -546,7 +727,7 @@ Picture CreateGradientBox(Size size) {
     Color.fromARGB(255, 75, 0, 130), // indigo
     Color.fromARGB(255, 238, 130, 238), // violet
   ];
-  List<double> stops = [
+  final List<double> stops = <double>[
     (1.0 / 7.0),
     (2.0 / 7.0),
     (3.0 / 7.0),
@@ -557,19 +738,19 @@ Picture CreateGradientBox(Size size) {
   ];
   paint.shader = Gradient.linear(
       Offset(0.0, 0.0), Offset(size.width, size.height), rainbow, stops);
-  PictureRecorder baseRecorder = PictureRecorder();
-  Canvas canvas = Canvas(baseRecorder);
+  final PictureRecorder baseRecorder = PictureRecorder();
+  final Canvas canvas = Canvas(baseRecorder);
   canvas.drawRect(Rect.fromLTRB(0.0, 0.0, size.width, size.height), paint);
   return baseRecorder.endRecording();
 }
 
 @pragma('vm:external-name', 'EchoKeyEvent')
 external void _echoKeyEvent(int change, int timestamp, int physical,
-    int logical, int charCode, bool synthesized);
+    int logical, int charCode, bool synthesized, int deviceType);
 
 // Convert `kind` in enum form to its integer form.
 //
-// It performs a reversed mapping from `unserializeKeyEventKind`
+// It performs a reversed mapping from `UnserializeKeyEventType`
 // in shell/platform/embedder/tests/embedder_unittests.cc.
 int _serializeKeyEventType(KeyEventType change) {
   switch (change) {
@@ -582,9 +763,28 @@ int _serializeKeyEventType(KeyEventType change) {
   }
 }
 
+// Convert `deviceType` in enum form to its integer form.
+//
+// It performs a reversed mapping from `UnserializeKeyEventDeviceType`
+// in shell/platform/embedder/tests/embedder_unittests.cc.
+int _serializeKeyEventDeviceType(KeyEventDeviceType deviceType) {
+  switch (deviceType) {
+    case KeyEventDeviceType.keyboard:
+      return 1;
+    case KeyEventDeviceType.directionalPad:
+      return 2;
+    case KeyEventDeviceType.gamepad:
+      return 3;
+    case KeyEventDeviceType.joystick:
+      return 4;
+    case KeyEventDeviceType.hdmi:
+      return 5;
+  }
+}
+
 // Echo the event data with `_echoKeyEvent`, and returns synthesized as handled.
 @pragma('vm:entry-point')
-void key_data_echo() async {
+Future<void> key_data_echo() async {
   PlatformDispatcher.instance.onKeyData = (KeyData data) {
     _echoKeyEvent(
       _serializeKeyEventType(data.type),
@@ -593,6 +793,7 @@ void key_data_echo() async {
       data.logical,
       data.character == null ? 0 : data.character!.codeUnitAt(0),
       data.synthesized,
+      _serializeKeyEventDeviceType(data.deviceType),
     );
     return data.synthesized;
   };
@@ -602,7 +803,7 @@ void key_data_echo() async {
 // After platform channel 'test/starts_echo' receives a message, starts echoing
 // the event data with `_echoKeyEvent`, and returns synthesized as handled.
 @pragma('vm:entry-point')
-void key_data_late_echo() async {
+Future<void> key_data_late_echo() async {
   channelBuffers.setListener('test/starts_echo',
       (ByteData? data, PlatformMessageResponseCallback callback) {
     PlatformDispatcher.instance.onKeyData = (KeyData data) {
@@ -613,6 +814,7 @@ void key_data_late_echo() async {
         data.logical,
         data.character == null ? 0 : data.character!.codeUnitAt(0),
         data.synthesized,
+        _serializeKeyEventDeviceType(data.deviceType),
       );
       return data.synthesized;
     };
@@ -621,12 +823,32 @@ void key_data_late_echo() async {
   signalNativeTest();
 }
 
+@pragma('vm:entry-point')
+void render_implicit_view() {
+  PlatformDispatcher.instance.onBeginFrame = (Duration duration) {
+    final Size size = Size(800.0, 600.0);
+    final Color red = Color.fromARGB(127, 255, 0, 0);
+
+    final SceneBuilder builder = SceneBuilder();
+
+    builder.pushOffset(0.0, 0.0);
+
+    builder.addPicture(
+        Offset(0.0, 0.0), CreateColoredBox(red, size));
+
+    builder.pop();
+
+    PlatformDispatcher.instance.implicitView?.render(builder.build());
+  };
+  PlatformDispatcher.instance.scheduleFrame();
+}
+
 @pragma('vm:entry-point')
 void render_gradient() {
   PlatformDispatcher.instance.onBeginFrame = (Duration duration) {
-    Size size = Size(800.0, 600.0);
+    final Size size = Size(800.0, 600.0);
 
-    SceneBuilder builder = SceneBuilder();
+    final SceneBuilder builder = SceneBuilder();
 
     builder.pushOffset(0.0, 0.0);
 
@@ -643,9 +865,9 @@ void render_gradient() {
 @pragma('vm:entry-point')
 void render_texture() {
   PlatformDispatcher.instance.onBeginFrame = (Duration duration) {
-    Size size = Size(800.0, 600.0);
+    final Size size = Size(800.0, 600.0);
 
-    SceneBuilder builder = SceneBuilder();
+    final SceneBuilder builder = SceneBuilder();
 
     builder.pushOffset(0.0, 0.0);
 
@@ -661,10 +883,10 @@ void render_texture() {
 @pragma('vm:entry-point')
 void render_gradient_on_non_root_backing_store() {
   PlatformDispatcher.instance.onBeginFrame = (Duration duration) {
-    Size size = Size(800.0, 600.0);
-    Color red = Color.fromARGB(127, 255, 0, 0);
+    final Size size = Size(800.0, 600.0);
+    final Color red = Color.fromARGB(127, 255, 0, 0);
 
-    SceneBuilder builder = SceneBuilder();
+    final SceneBuilder builder = SceneBuilder();
 
     builder.pushOffset(0.0, 0.0);
 
@@ -689,20 +911,20 @@ void verify_b141980393() {
   PlatformDispatcher.instance.onBeginFrame = (Duration duration) {
     // The platform view in the test case is screen sized but with margins of 31
     // and 37 points from the top and bottom.
-    double top_margin = 31.0;
-    double bottom_margin = 37.0;
-    Size platform_view_size = Size(800.0, 600.0 - top_margin - bottom_margin);
+    const double topMargin = 31.0;
+    const double bottomMargin = 37.0;
+    final Size platformViewSize = Size(800.0, 600.0 - topMargin - bottomMargin);
 
-    SceneBuilder builder = SceneBuilder();
+    final SceneBuilder builder = SceneBuilder();
 
     builder.pushOffset(
         0.0, // x
-        top_margin // y
+        topMargin // y
         );
 
     // The web view in example.
     builder.addPlatformView(1337,
-        width: platform_view_size.width, height: platform_view_size.height);
+        width: platformViewSize.width, height: platformViewSize.height);
 
     builder.pop();
 
@@ -714,8 +936,8 @@ void verify_b141980393() {
 @pragma('vm:entry-point')
 void can_display_platform_view_with_pixel_ratio() {
   PlatformDispatcher.instance.onBeginFrame = (Duration duration) {
-    SceneBuilder builder = SceneBuilder();
-    builder.pushTransform(Float64List.fromList([
+    final SceneBuilder builder = SceneBuilder();
+    builder.pushTransform(Float64List.fromList(<double>[
       2.0,
       0.0,
       0.0,
@@ -757,7 +979,7 @@ void can_receive_locale_updates() {
 @pragma('vm:entry-point')
 void verify_b143464703() {
   PlatformDispatcher.instance.onBeginFrame = (Duration duration) {
-    SceneBuilder builder = SceneBuilder();
+    final SceneBuilder builder = SceneBuilder();
     builder.pushOffset(0.0, 0.0); // base
 
     // Background
@@ -795,7 +1017,7 @@ void verify_b143464703() {
 @pragma('vm:entry-point')
 void push_frames_over_and_over() {
   PlatformDispatcher.instance.onBeginFrame = (Duration duration) {
-    SceneBuilder builder = SceneBuilder();
+    final SceneBuilder builder = SceneBuilder();
     builder.pushOffset(0.0, 0.0);
     builder.addPicture(
         Offset(0.0, 0.0),
@@ -815,7 +1037,7 @@ void push_frames_over_and_over() {
 @pragma('vm:entry-point')
 void platform_view_mutators() {
   PlatformDispatcher.instance.onBeginFrame = (Duration duration) {
-    SceneBuilder builder = SceneBuilder();
+    final SceneBuilder builder = SceneBuilder();
     builder.pushOffset(0.0, 0.0); // base
     builder.addPicture(Offset(0.0, 0.0), CreateGradientBox(Size(800.0, 600.0)));
 
@@ -837,7 +1059,7 @@ void platform_view_mutators() {
 @pragma('vm:entry-point')
 void platform_view_mutators_with_pixel_ratio() {
   PlatformDispatcher.instance.onBeginFrame = (Duration duration) {
-    SceneBuilder builder = SceneBuilder();
+    final SceneBuilder builder = SceneBuilder();
     builder.pushOffset(0.0, 0.0); // base
     builder.addPicture(Offset(0.0, 0.0), CreateGradientBox(Size(400.0, 300.0)));
 
@@ -868,7 +1090,7 @@ void empty_scene() {
 @pragma('vm:entry-point')
 void scene_with_no_container() {
   PlatformDispatcher.instance.onBeginFrame = (Duration duration) {
-    SceneBuilder builder = SceneBuilder();
+    final SceneBuilder builder = SceneBuilder();
     builder.addPicture(Offset(0.0, 0.0), CreateGradientBox(Size(400.0, 300.0)));
     PlatformDispatcher.instance.views.first.render(builder.build());
     signalNativeTest();
@@ -877,10 +1099,10 @@ void scene_with_no_container() {
 }
 
 Picture CreateArcEndCapsPicture() {
-  PictureRecorder baseRecorder = PictureRecorder();
-  Canvas canvas = Canvas(baseRecorder);
+  final PictureRecorder baseRecorder = PictureRecorder();
+  final Canvas canvas = Canvas(baseRecorder);
 
-  var style = Paint()
+  final style = Paint()
     ..strokeWidth = 12.0
     ..style = PaintingStyle.stroke
     ..strokeCap = StrokeCap.round
@@ -896,7 +1118,7 @@ Picture CreateArcEndCapsPicture() {
 @pragma('vm:entry-point')
 void arc_end_caps_correct() {
   PlatformDispatcher.instance.onBeginFrame = (Duration duration) {
-    SceneBuilder builder = SceneBuilder();
+    final SceneBuilder builder = SceneBuilder();
     builder.addPicture(Offset(0.0, 0.0), CreateArcEndCapsPicture());
     PlatformDispatcher.instance.views.first.render(builder.build());
   };
@@ -906,7 +1128,7 @@ void arc_end_caps_correct() {
 @pragma('vm:entry-point')
 void scene_builder_with_clips() {
   PlatformDispatcher.instance.onBeginFrame = (Duration duration) {
-    SceneBuilder builder = SceneBuilder();
+    final SceneBuilder builder = SceneBuilder();
     builder.pushClipRect(Rect.fromLTRB(10.0, 10.0, 390.0, 290.0));
     builder.addPlatformView(42, width: 400.0, height: 300.0);
     builder.addPicture(Offset(0.0, 0.0), CreateGradientBox(Size(400.0, 300.0)));
@@ -918,7 +1140,7 @@ void scene_builder_with_clips() {
 @pragma('vm:entry-point')
 void scene_builder_with_complex_clips() {
   PlatformDispatcher.instance.onBeginFrame = (Duration duration) {
-    SceneBuilder builder = SceneBuilder();
+    final SceneBuilder builder = SceneBuilder();
 
     builder.pushClipRect(Rect.fromLTRB(0.0, 0.0, 1024.0, 600.0));
     builder.pushOffset(512.0, 0.0);
@@ -939,7 +1161,7 @@ external void sendObjectToNativeCode(dynamic object);
 
 @pragma('vm:entry-point')
 void objects_can_be_posted() {
-  ReceivePort port = ReceivePort();
+  final ReceivePort port = ReceivePort();
   port.listen((dynamic message) {
     sendObjectToNativeCode(message);
   });
@@ -949,7 +1171,7 @@ void objects_can_be_posted() {
 @pragma('vm:entry-point')
 void empty_scene_posts_zero_layers_to_compositor() {
   PlatformDispatcher.instance.onBeginFrame = (Duration duration) {
-    SceneBuilder builder = SceneBuilder();
+    final SceneBuilder builder = SceneBuilder();
     // Should not render anything.
     builder.pushClipRect(Rect.fromLTRB(0.0, 0.0, 300.0, 200.0));
     PlatformDispatcher.instance.views.first.render(builder.build());
@@ -960,7 +1182,7 @@ void empty_scene_posts_zero_layers_to_compositor() {
 @pragma('vm:entry-point')
 void compositor_can_post_only_platform_views() {
   PlatformDispatcher.instance.onBeginFrame = (Duration duration) {
-    SceneBuilder builder = SceneBuilder();
+    final SceneBuilder builder = SceneBuilder();
     builder.addPlatformView(42, width: 300.0, height: 200.0);
     builder.addPlatformView(24, width: 300.0, height: 200.0);
     PlatformDispatcher.instance.views.first.render(builder.build());
@@ -970,17 +1192,37 @@ void compositor_can_post_only_platform_views() {
 
 @pragma('vm:entry-point')
 void render_targets_are_recycled() {
-  int frame_count = 0;
+  int frameCount = 0;
+  PlatformDispatcher.instance.onBeginFrame = (Duration duration) {
+    final SceneBuilder builder = SceneBuilder();
+    for (int i = 0; i < 10; i++) {
+      builder.addPicture(Offset(0.0, 0.0), CreateGradientBox(Size(30.0, 20.0)));
+      builder.addPlatformView(42 + i, width: 30.0, height: 20.0);
+    }
+    PlatformDispatcher.instance.views.first.render(builder.build());
+    frameCount++;
+    if (frameCount == 8) {
+      signalNativeTest();
+    } else {
+      PlatformDispatcher.instance.scheduleFrame();
+    }
+  };
+  PlatformDispatcher.instance.scheduleFrame();
+}
+
+@pragma('vm:entry-point')
+void render_targets_are_in_stable_order() {
+  int frameCount = 0;
   PlatformDispatcher.instance.onBeginFrame = (Duration duration) {
-    SceneBuilder builder = SceneBuilder();
+    final SceneBuilder builder = SceneBuilder();
     for (int i = 0; i < 10; i++) {
       builder.addPicture(Offset(0.0, 0.0), CreateGradientBox(Size(30.0, 20.0)));
       builder.addPlatformView(42 + i, width: 30.0, height: 20.0);
     }
     PlatformDispatcher.instance.views.first.render(builder.build());
     PlatformDispatcher.instance.scheduleFrame();
-    frame_count++;
-    if (frame_count == 8) {
+    frameCount++;
+    if (frameCount == 8) {
       signalNativeTest();
     }
   };
@@ -992,7 +1234,7 @@ external void nativeArgumentsCallback(List<String> args);
 
 @pragma('vm:entry-point')
 void custom_logger(List<String> args) {
-  print("hello world");
+  print('hello world');
 }
 
 @pragma('vm:entry-point')
@@ -1001,17 +1243,17 @@ void dart_entrypoint_args(List<String> args) {
 }
 
 @pragma('vm:external-name', 'SnapshotsCallback')
-external void snapshotsCallback(Image big_image, Image small_image);
+external void snapshotsCallback(Image bigImage, Image smallImage);
 
 @pragma('vm:entry-point')
-void snapshot_large_scene(int max_size) async {
+Future<void> snapshot_large_scene(int maxSize) async {
   // Set width to double the max size, which will result in height being half the max size after scaling.
-  double width = max_size * 2.0, height = max_size.toDouble();
+  double width = maxSize * 2.0, height = maxSize.toDouble();
 
   PictureRecorder recorder = PictureRecorder();
   {
-    Canvas canvas = Canvas(recorder, Rect.fromLTWH(0, 0, width, height));
-    Paint paint = Paint();
+    final Canvas canvas = Canvas(recorder, Rect.fromLTWH(0, 0, width, height));
+    final Paint paint = Paint();
     // Bottom left
     paint.color = Color.fromARGB(255, 100, 255, 100);
     canvas.drawRect(Rect.fromLTWH(0, height / 2, width / 2, height / 2), paint);
@@ -1020,31 +1262,31 @@ void snapshot_large_scene(int max_size) async {
     canvas.drawRect(Rect.fromLTWH(width / 2, 0, width / 2, height / 2), paint);
   }
   Picture picture = recorder.endRecording();
-  Image big_image = await picture.toImage(width.toInt(), height.toInt());
+  final Image bigImage = await picture.toImage(width.toInt(), height.toInt());
 
   // The max size varies across hardware/drivers, so normalize the result to a smaller target size in
   // order to reliably test against an image fixture.
-  double small_width = 128, small_height = 64;
+  double smallWidth = 128, smallHeight = 64;
   recorder = PictureRecorder();
   {
-    Canvas canvas =
-        Canvas(recorder, Rect.fromLTWH(0, 0, small_width, small_height));
-    canvas.scale(small_width / big_image.width);
-    canvas.drawImage(big_image, Offset.zero, Paint());
+    final Canvas canvas =
+        Canvas(recorder, Rect.fromLTWH(0, 0, smallWidth, smallHeight));
+    canvas.scale(smallWidth / bigImage.width);
+    canvas.drawImage(bigImage, Offset.zero, Paint());
   }
   picture = recorder.endRecording();
-  Image small_image =
-      await picture.toImage(small_width.toInt(), small_height.toInt());
+  final Image smallImage =
+      await picture.toImage(smallWidth.toInt(), smallHeight.toInt());
 
-  snapshotsCallback(big_image, small_image);
+  snapshotsCallback(bigImage, smallImage);
 }
 
 @pragma('vm:entry-point')
 void invalid_backingstore() {
   PlatformDispatcher.instance.onBeginFrame = (Duration duration) {
-    Color red = Color.fromARGB(127, 255, 0, 0);
-    Size size = Size(50.0, 150.0);
-    SceneBuilder builder = SceneBuilder();
+    final Color red = Color.fromARGB(127, 255, 0, 0);
+    final Size size = Size(50.0, 150.0);
+    final SceneBuilder builder = SceneBuilder();
     builder.pushOffset(0.0, 0.0);
     builder.addPicture(
         Offset(10.0, 10.0), CreateColoredBox(red, size)); // red - flutter
@@ -1093,3 +1335,115 @@ void draw_solid_green() {
 void draw_solid_blue() {
   drawSolidColor(const Color.fromARGB(255, 0, 0, 255));
 }
+
+@pragma('vm:entry-point')
+void pointer_data_packet() {
+  PlatformDispatcher.instance.onPointerDataPacket =
+    (PointerDataPacket packet) {
+    signalNativeCount(packet.data.length);
+
+    for (final PointerData pointerData in packet.data) {
+      signalNativeMessage(pointerData.toString());
+    }
+  };
+
+  signalNativeTest();
+}
+
+@pragma('vm:entry-point')
+void pointer_data_packet_view_id() {
+  PlatformDispatcher.instance.onPointerDataPacket = (PointerDataPacket packet) {
+    assert(packet.data.length == 1);
+
+    for (final PointerData pointerData in packet.data) {
+      signalNativeMessage('ViewID: ${pointerData.viewId}');
+    }
+  };
+
+  signalNativeTest();
+}
+
+Map<int, Size> _getAllViewSizes() {
+  final Map<int, Size> result = <int, Size>{};
+  for (final FlutterView view in PlatformDispatcher.instance.views) {
+    result[view.viewId] = view.physicalSize;
+  }
+  return result;
+}
+
+List<int> _findDifferences(Map<int, Size> a, Map<int, Size> b) {
+  final Set<int> result = <int>{};
+  a.forEach((int viewId, Size sizeA) {
+    if (!b.containsKey(viewId) || b[viewId] != sizeA) {
+      result.add(viewId);
+    }
+  });
+  b.forEach((int viewId, Size sizeB) {
+    if (!a.containsKey(viewId)) {
+      result.add(viewId);
+    }
+  });
+  return result.toList()..sort();
+}
+
+@pragma('vm:entry-point')
+void window_metrics_event_view_id() {
+  Map<int, Size> sizes = _getAllViewSizes();
+  PlatformDispatcher.instance.onMetricsChanged = () {
+    final Map<int, Size> newSizes = _getAllViewSizes();
+    final List<int> differences = _findDifferences(sizes, newSizes);
+    sizes = newSizes;
+    signalNativeMessage('Changed: $differences');
+  };
+
+  signalNativeTest();
+}
+
+@pragma('vm:entry-point')
+Future<void> channel_listener_response() async {
+  channelBuffers.setListener('test/listen',
+      (ByteData? data, PlatformMessageResponseCallback callback) {
+    callback(null);
+  });
+  signalNativeTest();
+}
+
+@pragma('vm:entry-point')
+void render_gradient_retained() {
+  OffsetEngineLayer? offsetLayer; // Retain the offset layer.
+  PlatformDispatcher.instance.onBeginFrame = (Duration duration) {
+    final Size size = Size(800.0, 600.0);
+
+    final SceneBuilder builder = SceneBuilder();
+
+    offsetLayer = builder.pushOffset(0.0, 0.0, oldLayer: offsetLayer);
+
+    // display_list_layer will comparing the display_list
+    // no need to retain the picture
+    builder.addPicture(
+        Offset(0.0, 0.0), CreateGradientBox(size)); // gradient - flutter
+
+    builder.pop();
+
+    PlatformDispatcher.instance.views.first.render(builder.build());
+  };
+  PlatformDispatcher.instance.scheduleFrame();
+}
+
+@pragma('vm:entry-point')
+void render_impeller_gl_test() {
+  PlatformDispatcher.instance.onBeginFrame = (Duration duration) {
+    final SceneBuilder builder = SceneBuilder();
+    builder.pushOffset(0.0, 0.0);
+    final Paint paint = Paint();
+    paint.color = Color.fromARGB(255, 0, 0, 255);
+    final PictureRecorder baseRecorder = PictureRecorder();
+    final Canvas canvas = Canvas(baseRecorder);
+    canvas.drawPaint(Paint()..color = Color.fromARGB(255, 255, 0, 0));
+    canvas.drawRect(Rect.fromLTRB(20.0, 20.0, 200.0, 150.0), paint);
+    builder.addPicture(Offset.zero, baseRecorder.endRecording());
+    builder.pop();
+    PlatformDispatcher.instance.views.first.render(builder.build());
+  };
+  PlatformDispatcher.instance.scheduleFrame();
+}
diff --git a/shell/platform/embedder/pixel_formats.cc b/shell/platform/embedder/pixel_formats.cc
index a97a9aaceb1917cffed5dee61738d318cbeab6ad..611ac5624c231f420b54f9ec63432f1a965e138b 100644
--- a/shell/platform/embedder/pixel_formats.cc
+++ b/shell/platform/embedder/pixel_formats.cc
@@ -5,21 +5,25 @@
 #include "flutter/shell/platform/embedder/pixel_formats.h"
 #include "flutter/shell/platform/embedder/embedder.h"
 
+#include "third_party/skia/include/core/SkColorSpace.h"
+#include "third_party/skia/include/core/SkColorType.h"
+#include "third_party/skia/include/core/SkImageInfo.h"
+
 std::optional<SkColorType> getSkColorType(FlutterSoftwarePixelFormat pixfmt) {
   switch (pixfmt) {
-    case kGray8:
+    case kFlutterSoftwarePixelFormatGray8:
       return kGray_8_SkColorType;
-    case kRGB565:
+    case kFlutterSoftwarePixelFormatRGB565:
       return kRGB_565_SkColorType;
-    case kRGBA4444:
+    case kFlutterSoftwarePixelFormatRGBA4444:
       return kARGB_4444_SkColorType;
-    case kRGBA8888:
+    case kFlutterSoftwarePixelFormatRGBA8888:
       return kRGBA_8888_SkColorType;
-    case kRGBX8888:
+    case kFlutterSoftwarePixelFormatRGBX8888:
       return kRGB_888x_SkColorType;
-    case kBGRA8888:
+    case kFlutterSoftwarePixelFormatBGRA8888:
       return kBGRA_8888_SkColorType;
-    case kNative32:
+    case kFlutterSoftwarePixelFormatNative32:
       return kN32_SkColorType;
     default:
       FML_LOG(ERROR) << "Invalid software rendering pixel format";
diff --git a/shell/platform/embedder/pixel_formats.h b/shell/platform/embedder/pixel_formats.h
index 12af860c6415abd4a04e6ba36001661187cca9e6..21ae90053062bfbf73ac3db4340aa1ffbf56fcd7 100644
--- a/shell/platform/embedder/pixel_formats.h
+++ b/shell/platform/embedder/pixel_formats.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_COMMON_H_
-#define FLUTTER_SHELL_PLATFORM_EMBEDDER_EMBEDDER_COMMON_H_
+#ifndef FLUTTER_SHELL_PLATFORM_EMBEDDER_PIXEL_FORMATS_H_
+#define FLUTTER_SHELL_PLATFORM_EMBEDDER_PIXEL_FORMATS_H_
 
 #include <optional>
 #include "flutter/shell/common/rasterizer.h"
@@ -13,4 +13,4 @@ std::optional<SkColorType> getSkColorType(FlutterSoftwarePixelFormat pixfmt);
 
 std::optional<SkColorInfo> getSkColorInfo(FlutterSoftwarePixelFormat pixfmt);
 
-#endif
+#endif  // FLUTTER_SHELL_PLATFORM_EMBEDDER_PIXEL_FORMATS_H_
diff --git a/shell/platform/embedder/platform_view_embedder.cc b/shell/platform/embedder/platform_view_embedder.cc
index 1cedc22810a50e5495f3580ccf56502269ee4765..01bfbe97cb8eb252410f1934c242e1861ecf37cd 100644
--- a/shell/platform/embedder/platform_view_embedder.cc
+++ b/shell/platform/embedder/platform_view_embedder.cc
@@ -66,16 +66,12 @@ PlatformViewEmbedder::PlatformViewEmbedder(
 PlatformViewEmbedder::PlatformViewEmbedder(
     PlatformView::Delegate& delegate,
     const flutter::TaskRunners& task_runners,
-    const EmbedderSurfaceGL::GLDispatchTable& gl_dispatch_table,
-    bool fbo_reset_after_present,
+    std::unique_ptr<EmbedderSurface> embedder_surface,
     PlatformDispatchTable platform_dispatch_table,
     std::shared_ptr<EmbedderExternalViewEmbedder> external_view_embedder)
     : PlatformView(delegate, task_runners),
       external_view_embedder_(std::move(external_view_embedder)),
-      embedder_surface_(
-          std::make_unique<EmbedderSurfaceGL>(gl_dispatch_table,
-                                              fbo_reset_after_present,
-                                              external_view_embedder_)),
+      embedder_surface_(std::move(embedder_surface)),
       platform_message_handler_(new EmbedderPlatformMessageHandler(
           GetWeakPtr(),
           task_runners.GetPlatformTaskRunner())),
@@ -86,7 +82,7 @@ PlatformViewEmbedder::PlatformViewEmbedder(
 PlatformViewEmbedder::PlatformViewEmbedder(
     PlatformView::Delegate& delegate,
     const flutter::TaskRunners& task_runners,
-    std::unique_ptr<EmbedderSurfaceMetal> embedder_surface,
+    std::unique_ptr<EmbedderSurface> embedder_surface,
     PlatformDispatchTable platform_dispatch_table,
     std::shared_ptr<EmbedderExternalViewEmbedder> external_view_embedder)
     : PlatformView(delegate, task_runners),
@@ -157,6 +153,11 @@ PlatformViewEmbedder::CreateExternalViewEmbedder() {
   return external_view_embedder_;
 }
 
+std::shared_ptr<impeller::Context> PlatformViewEmbedder::GetImpellerContext()
+    const {
+  return embedder_surface_->CreateImpellerContext();
+}
+
 // |PlatformView|
 sk_sp<GrDirectContext> PlatformViewEmbedder::CreateResourceContext() const {
   if (embedder_surface_ == nullptr) {
@@ -198,6 +199,14 @@ void PlatformViewEmbedder::OnPreEngineRestart() const {
   }
 }
 
+// |PlatformView|
+void PlatformViewEmbedder::SendChannelUpdate(const std::string& name,
+                                             bool listening) {
+  if (platform_dispatch_table_.on_channel_update != nullptr) {
+    platform_dispatch_table_.on_channel_update(name, listening);
+  }
+}
+
 std::shared_ptr<PlatformMessageHandler>
 PlatformViewEmbedder::GetPlatformMessageHandler() const {
   return platform_message_handler_;
diff --git a/shell/platform/embedder/platform_view_embedder.h b/shell/platform/embedder/platform_view_embedder.h
index 20f4dc139875b219b4138ad9d0915d1cf9347b34..a6452c6b7e18c2d6cc338ee35a6479ec8be47d54 100644
--- a/shell/platform/embedder/platform_view_embedder.h
+++ b/shell/platform/embedder/platform_view_embedder.h
@@ -17,6 +17,7 @@
 
 #ifdef SHELL_ENABLE_GL
 #include "flutter/shell/platform/embedder/embedder_surface_gl.h"
+#include "flutter/shell/platform/embedder/embedder_surface_gl_impeller.h"
 #endif
 
 #ifdef SHELL_ENABLE_METAL
@@ -40,6 +41,7 @@ class PlatformViewEmbedder final : public PlatformView {
       std::function<std::unique_ptr<std::vector<std::string>>(
           const std::vector<std::string>& supported_locale_data)>;
   using OnPreEngineRestartCallback = std::function<void()>;
+  using ChanneUpdateCallback = std::function<void(const std::string&, bool)>;
 
   struct PlatformDispatchTable {
     UpdateSemanticsCallback update_semantics_callback;  // optional
@@ -49,6 +51,7 @@ class PlatformViewEmbedder final : public PlatformView {
     ComputePlatformResolvedLocaleCallback
         compute_platform_resolved_locale_callback;
     OnPreEngineRestartCallback on_pre_engine_restart_callback;  // optional
+    ChanneUpdateCallback on_channel_update;                     // optional
   };
 
   // Create a platform view that sets up a software rasterizer.
@@ -65,8 +68,7 @@ class PlatformViewEmbedder final : public PlatformView {
   PlatformViewEmbedder(
       PlatformView::Delegate& delegate,
       const flutter::TaskRunners& task_runners,
-      const EmbedderSurfaceGL::GLDispatchTable& gl_dispatch_table,
-      bool fbo_reset_after_present,
+      std::unique_ptr<EmbedderSurface> embedder_surface,
       PlatformDispatchTable platform_dispatch_table,
       std::shared_ptr<EmbedderExternalViewEmbedder> external_view_embedder);
 #endif
@@ -76,7 +78,7 @@ class PlatformViewEmbedder final : public PlatformView {
   PlatformViewEmbedder(
       PlatformView::Delegate& delegate,
       const flutter::TaskRunners& task_runners,
-      std::unique_ptr<EmbedderSurfaceMetal> embedder_surface,
+      std::unique_ptr<EmbedderSurface> embedder_surface,
       PlatformDispatchTable platform_dispatch_table,
       std::shared_ptr<EmbedderExternalViewEmbedder> external_view_embedder);
 #endif
@@ -118,6 +120,9 @@ class PlatformViewEmbedder final : public PlatformView {
   // |PlatformView|
   std::shared_ptr<ExternalViewEmbedder> CreateExternalViewEmbedder() override;
 
+  // |PlatformView|
+  std::shared_ptr<impeller::Context> GetImpellerContext() const override;
+
   // |PlatformView|
   sk_sp<GrDirectContext> CreateResourceContext() const override;
 
@@ -131,6 +136,9 @@ class PlatformViewEmbedder final : public PlatformView {
   std::unique_ptr<std::vector<std::string>> ComputePlatformResolvedLocales(
       const std::vector<std::string>& supported_locale_data) override;
 
+  // |PlatformView|
+  void SendChannelUpdate(const std::string& name, bool listening) override;
+
   FML_DISALLOW_COPY_AND_ASSIGN(PlatformViewEmbedder);
 };
 
diff --git a/shell/platform/embedder/platform_view_embedder_unittests.cc b/shell/platform/embedder/platform_view_embedder_unittests.cc
index 3e795f1fb530f127db4ecd199db6c410603cc174..6f0e923e86043d4cd97995076ad4d849363f9f5f 100644
--- a/shell/platform/embedder/platform_view_embedder_unittests.cc
+++ b/shell/platform/embedder/platform_view_embedder_unittests.cc
@@ -16,52 +16,85 @@ namespace flutter {
 namespace testing {
 namespace {
 class MockDelegate : public PlatformView::Delegate {
-  MOCK_METHOD1(OnPlatformViewCreated, void(std::unique_ptr<Surface>));
-  MOCK_METHOD0(OnPlatformViewDestroyed, void());
-  MOCK_METHOD0(OnPlatformViewScheduleFrame, void());
-  MOCK_METHOD1(OnPlatformViewSetNextFrameCallback,
-               void(const fml::closure& closure));
-  MOCK_METHOD1(OnPlatformViewSetViewportMetrics,
-               void(const ViewportMetrics& metrics));
-  MOCK_METHOD1(OnPlatformViewDispatchPlatformMessage,
-               void(std::unique_ptr<PlatformMessage> message));
-  MOCK_METHOD1(OnPlatformViewDispatchPointerDataPacket,
-               void(std::unique_ptr<PointerDataPacket> packet));
-  MOCK_METHOD3(OnPlatformViewDispatchSemanticsAction,
-               void(int32_t id,
-                    SemanticsAction action,
-                    fml::MallocMapping args));
-  MOCK_METHOD1(OnPlatformViewSetSemanticsEnabled, void(bool enabled));
-  MOCK_METHOD1(OnPlatformViewSetAccessibilityFeatures, void(int32_t flags));
-  MOCK_METHOD1(OnPlatformViewRegisterTexture,
-               void(std::shared_ptr<Texture> texture));
-  MOCK_METHOD1(OnPlatformViewUnregisterTexture, void(int64_t texture_id));
-  MOCK_METHOD1(OnPlatformViewMarkTextureFrameAvailable,
-               void(int64_t texture_id));
-  MOCK_METHOD3(LoadDartDeferredLibrary,
-               void(intptr_t loading_unit_id,
-                    std::unique_ptr<const fml::Mapping> snapshot_data,
-                    std::unique_ptr<const fml::Mapping> snapshot_instructions));
-  MOCK_METHOD3(LoadDartDeferredLibraryError,
-               void(intptr_t loading_unit_id,
-                    const std::string error_message,
-                    bool transient));
-  MOCK_METHOD2(UpdateAssetResolverByType,
-               void(std::unique_ptr<AssetResolver> updated_asset_resolver,
-                    AssetResolver::AssetResolverType type));
-  MOCK_CONST_METHOD0(OnPlatformViewGetSettings, const Settings&());
+  MOCK_METHOD(void,
+              OnPlatformViewCreated,
+              (std::unique_ptr<Surface>),
+              (override));
+  MOCK_METHOD(void, OnPlatformViewDestroyed, (), (override));
+  MOCK_METHOD(void, OnPlatformViewScheduleFrame, (), (override));
+  MOCK_METHOD(void,
+              OnPlatformViewSetNextFrameCallback,
+              (const fml::closure& closure),
+              (override));
+  MOCK_METHOD(void,
+              OnPlatformViewSetViewportMetrics,
+              (int64_t view_id, const ViewportMetrics& metrics),
+              (override));
+  MOCK_METHOD(void,
+              OnPlatformViewDispatchPlatformMessage,
+              (std::unique_ptr<PlatformMessage> message),
+              (override));
+  MOCK_METHOD(void,
+              OnPlatformViewDispatchPointerDataPacket,
+              (std::unique_ptr<PointerDataPacket> packet),
+              (override));
+  MOCK_METHOD(void,
+              OnPlatformViewDispatchSemanticsAction,
+              (int32_t id, SemanticsAction action, fml::MallocMapping args),
+              (override));
+  MOCK_METHOD(void,
+              OnPlatformViewSetSemanticsEnabled,
+              (bool enabled),
+              (override));
+  MOCK_METHOD(void,
+              OnPlatformViewSetAccessibilityFeatures,
+              (int32_t flags),
+              (override));
+  MOCK_METHOD(void,
+              OnPlatformViewRegisterTexture,
+              (std::shared_ptr<Texture> texture),
+              (override));
+  MOCK_METHOD(void,
+              OnPlatformViewUnregisterTexture,
+              (int64_t texture_id),
+              (override));
+  MOCK_METHOD(void,
+              OnPlatformViewMarkTextureFrameAvailable,
+              (int64_t texture_id),
+              (override));
+  MOCK_METHOD(void,
+              LoadDartDeferredLibrary,
+              (intptr_t loading_unit_id,
+               std::unique_ptr<const fml::Mapping> snapshot_data,
+               std::unique_ptr<const fml::Mapping> snapshot_instructions),
+              (override));
+  MOCK_METHOD(void,
+              LoadDartDeferredLibraryError,
+              (intptr_t loading_unit_id,
+               const std::string error_message,
+               bool transient),
+              (override));
+  MOCK_METHOD(void,
+              UpdateAssetResolverByType,
+              (std::unique_ptr<AssetResolver> updated_asset_resolver,
+               AssetResolver::AssetResolverType type),
+              (override));
+  MOCK_METHOD(const Settings&,
+              OnPlatformViewGetSettings,
+              (),
+              (const, override));
 };
 
 class MockResponse : public PlatformMessageResponse {
  public:
-  MOCK_METHOD1(Complete, void(std::unique_ptr<fml::Mapping> data));
-  MOCK_METHOD0(CompleteEmpty, void());
+  MOCK_METHOD(void, Complete, (std::unique_ptr<fml::Mapping> data), (override));
+  MOCK_METHOD(void, CompleteEmpty, (), (override));
 };
 }  // namespace
 
 TEST(PlatformViewEmbedderTest, HasPlatformMessageHandler) {
   ThreadHost thread_host("io.flutter.test." + GetCurrentTestName() + ".",
-                         ThreadHost::Type::Platform);
+                         ThreadHost::Type::kPlatform);
   flutter::TaskRunners task_runners = flutter::TaskRunners(
       "HasPlatformMessageHandler", thread_host.platform_thread->GetTaskRunner(),
       nullptr, nullptr, nullptr);
@@ -83,7 +116,7 @@ TEST(PlatformViewEmbedderTest, HasPlatformMessageHandler) {
 
 TEST(PlatformViewEmbedderTest, Dispatches) {
   ThreadHost thread_host("io.flutter.test." + GetCurrentTestName() + ".",
-                         ThreadHost::Type::Platform);
+                         ThreadHost::Type::kPlatform);
   flutter::TaskRunners task_runners = flutter::TaskRunners(
       "HasPlatformMessageHandler", thread_host.platform_thread->GetTaskRunner(),
       nullptr, nullptr, nullptr);
@@ -128,7 +161,7 @@ TEST(PlatformViewEmbedderTest, Dispatches) {
 
 TEST(PlatformViewEmbedderTest, DeletionDisabledDispatch) {
   ThreadHost thread_host("io.flutter.test." + GetCurrentTestName() + ".",
-                         ThreadHost::Type::Platform);
+                         ThreadHost::Type::kPlatform);
   flutter::TaskRunners task_runners = flutter::TaskRunners(
       "HasPlatformMessageHandler", thread_host.platform_thread->GetTaskRunner(),
       nullptr, nullptr, nullptr);
diff --git a/shell/platform/embedder/test_utils/key_codes.g.h b/shell/platform/embedder/test_utils/key_codes.g.h
index 1694781d5fc67dd5d0d9bfee1f110e12a9d37ec8..9a7ae0e96cf0adc7ea355fc0bb19a95efd32de39 100644
--- a/shell/platform/embedder/test_utils/key_codes.g.h
+++ b/shell/platform/embedder/test_utils/key_codes.g.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_COMMON_TESTING_KEY_CODES_H_
-#define FLUTTER_SHELL_PLATFORM_COMMON_TESTING_KEY_CODES_H_
+#ifndef FLUTTER_SHELL_PLATFORM_EMBEDDER_TEST_UTILS_KEY_CODES_G_H_
+#define FLUTTER_SHELL_PLATFORM_EMBEDDER_TEST_UTILS_KEY_CODES_G_H_
 
 #include <cinttypes>
 
@@ -748,4 +748,4 @@ constexpr uint64_t kLogicalGameButtonZ = 0x0020000031f;
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_COMMON_TESTING_KEY_CODES_H_
+#endif  // FLUTTER_SHELL_PLATFORM_EMBEDDER_TEST_UTILS_KEY_CODES_G_H_
diff --git a/shell/platform/embedder/test_utils/proc_table_replacement.h b/shell/platform/embedder/test_utils/proc_table_replacement.h
index 711557ab8c4f1e4973b30a5e6a0c82d58eca4d7a..b05b1bb963e52dad8a21aa26b7d0b282eeaea720 100644
--- a/shell/platform/embedder/test_utils/proc_table_replacement.h
+++ b/shell/platform/embedder/test_utils/proc_table_replacement.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_EMBEDDER_TEST_UTILS_PROC_TABLE_REPLACEMENT_H_
+#define FLUTTER_SHELL_PLATFORM_EMBEDDER_TEST_UTILS_PROC_TABLE_REPLACEMENT_H_
+
 #include "flutter/shell/platform/embedder/embedder.h"
 
 // Wraps capturing lambas with non-capturing version that can be assigned to
@@ -22,3 +25,5 @@
     static auto non_capturing = [](auto... args) { return closure(args...); }; \
     return non_capturing;                                                      \
   })()
+
+#endif  // FLUTTER_SHELL_PLATFORM_EMBEDDER_TEST_UTILS_PROC_TABLE_REPLACEMENT_H_
diff --git a/shell/platform/embedder/tests/embedder_a11y_unittests.cc b/shell/platform/embedder/tests/embedder_a11y_unittests.cc
index 4007bb9e0c23c3421b409498b860c32c125e6a5a..01cfff7cac37420afcd6384c2062648662101999 100644
--- a/shell/platform/embedder/tests/embedder_a11y_unittests.cc
+++ b/shell/platform/embedder/tests/embedder_a11y_unittests.cc
@@ -15,6 +15,10 @@
 #include "flutter/shell/platform/embedder/embedder.h"
 #include "flutter/shell/platform/embedder/tests/embedder_config_builder.h"
 #include "flutter/testing/testing.h"
+#include "third_party/tonic/converter/dart_converter.h"
+
+#include "gmock/gmock.h"  // For EXPECT_THAT and matchers
+#include "gtest/gtest.h"
 
 // CREATE_NATIVE_ENTRY is leaky by design
 // NOLINTBEGIN(clang-analyzer-core.StackAddressEscape)
@@ -23,30 +27,377 @@ namespace flutter {
 namespace testing {
 
 using EmbedderA11yTest = testing::EmbedderTest;
+using ::testing::ElementsAre;
 
 constexpr static char kTooltip[] = "tooltip";
 
-TEST_F(EmbedderTest, CannotProvideNewAndLegacySemanticsCallback) {
-  EmbedderConfigBuilder builder(
-      GetEmbedderContext(EmbedderTestContextType::kSoftwareContext));
+TEST_F(EmbedderTest, CannotProvideMultipleSemanticsCallbacks) {
+  {
+    EmbedderConfigBuilder builder(
+        GetEmbedderContext(EmbedderTestContextType::kSoftwareContext));
+    builder.SetSoftwareRendererConfig();
+    builder.GetProjectArgs().update_semantics_callback =
+        [](const FlutterSemanticsUpdate* update, void* user_data) {};
+    builder.GetProjectArgs().update_semantics_callback2 =
+        [](const FlutterSemanticsUpdate2* update, void* user_data) {};
+    auto engine = builder.InitializeEngine();
+    ASSERT_FALSE(engine.is_valid());
+    engine.reset();
+  }
+
+  {
+    EmbedderConfigBuilder builder(
+        GetEmbedderContext(EmbedderTestContextType::kSoftwareContext));
+    builder.SetSoftwareRendererConfig();
+    builder.GetProjectArgs().update_semantics_callback2 =
+        [](const FlutterSemanticsUpdate2* update, void* user_data) {};
+    builder.GetProjectArgs().update_semantics_node_callback =
+        [](const FlutterSemanticsNode* update, void* user_data) {};
+    builder.GetProjectArgs().update_semantics_custom_action_callback =
+        [](const FlutterSemanticsCustomAction* update, void* user_data) {};
+    auto engine = builder.InitializeEngine();
+    ASSERT_FALSE(engine.is_valid());
+    engine.reset();
+  }
+
+  {
+    EmbedderConfigBuilder builder(
+        GetEmbedderContext(EmbedderTestContextType::kSoftwareContext));
+    builder.SetSoftwareRendererConfig();
+    builder.GetProjectArgs().update_semantics_callback =
+        [](const FlutterSemanticsUpdate* update, void* user_data) {};
+    builder.GetProjectArgs().update_semantics_node_callback =
+        [](const FlutterSemanticsNode* update, void* user_data) {};
+    builder.GetProjectArgs().update_semantics_custom_action_callback =
+        [](const FlutterSemanticsCustomAction* update, void* user_data) {};
+    auto engine = builder.InitializeEngine();
+    ASSERT_FALSE(engine.is_valid());
+    engine.reset();
+  }
+
+  {
+    EmbedderConfigBuilder builder(
+        GetEmbedderContext(EmbedderTestContextType::kSoftwareContext));
+    builder.SetSoftwareRendererConfig();
+    builder.GetProjectArgs().update_semantics_callback2 =
+        [](const FlutterSemanticsUpdate2* update, void* user_data) {};
+    builder.GetProjectArgs().update_semantics_callback =
+        [](const FlutterSemanticsUpdate* update, void* user_data) {};
+    builder.GetProjectArgs().update_semantics_node_callback =
+        [](const FlutterSemanticsNode* update, void* user_data) {};
+    builder.GetProjectArgs().update_semantics_custom_action_callback =
+        [](const FlutterSemanticsCustomAction* update, void* user_data) {};
+    auto engine = builder.InitializeEngine();
+    ASSERT_FALSE(engine.is_valid());
+    engine.reset();
+  }
+}
+
+TEST_F(EmbedderA11yTest, A11yTreeIsConsistentUsingV3Callbacks) {
+#if defined(OS_FUCHSIA)
+  GTEST_SKIP() << "This test crashes on Fuchsia. https://fxbug.dev/87493 ";
+#else
+
+  auto& context = GetEmbedderContext(EmbedderTestContextType::kSoftwareContext);
+
+  fml::AutoResetWaitableEvent signal_native_latch;
+
+  // Called by the Dart text fixture on the UI thread to signal that the C++
+  // unittest should resume.
+  context.AddNativeCallback(
+      "SignalNativeTest",
+      CREATE_NATIVE_ENTRY(([&signal_native_latch](Dart_NativeArguments) {
+        signal_native_latch.Signal();
+      })));
+
+  // Called by test fixture on UI thread to pass data back to this test.
+  NativeEntry notify_semantics_enabled_callback;
+  context.AddNativeCallback(
+      "NotifySemanticsEnabled",
+      CREATE_NATIVE_ENTRY(
+          ([&notify_semantics_enabled_callback](Dart_NativeArguments args) {
+            ASSERT_NE(notify_semantics_enabled_callback, nullptr);
+            notify_semantics_enabled_callback(args);
+          })));
+
+  NativeEntry notify_accessibility_features_callback;
+  context.AddNativeCallback(
+      "NotifyAccessibilityFeatures",
+      CREATE_NATIVE_ENTRY((
+          [&notify_accessibility_features_callback](Dart_NativeArguments args) {
+            ASSERT_NE(notify_accessibility_features_callback, nullptr);
+            notify_accessibility_features_callback(args);
+          })));
+
+  NativeEntry notify_semantics_action_callback;
+  context.AddNativeCallback(
+      "NotifySemanticsAction",
+      CREATE_NATIVE_ENTRY(
+          ([&notify_semantics_action_callback](Dart_NativeArguments args) {
+            ASSERT_NE(notify_semantics_action_callback, nullptr);
+            notify_semantics_action_callback(args);
+          })));
+
+  fml::AutoResetWaitableEvent semantics_update_latch;
+  context.SetSemanticsUpdateCallback2(
+      [&](const FlutterSemanticsUpdate2* update) {
+        ASSERT_EQ(size_t(4), update->node_count);
+        ASSERT_EQ(size_t(1), update->custom_action_count);
+
+        for (size_t i = 0; i < update->node_count; i++) {
+          const FlutterSemanticsNode2* node = update->nodes[i];
+
+          ASSERT_EQ(1.0, node->transform.scaleX);
+          ASSERT_EQ(2.0, node->transform.skewX);
+          ASSERT_EQ(3.0, node->transform.transX);
+          ASSERT_EQ(4.0, node->transform.skewY);
+          ASSERT_EQ(5.0, node->transform.scaleY);
+          ASSERT_EQ(6.0, node->transform.transY);
+          ASSERT_EQ(7.0, node->transform.pers0);
+          ASSERT_EQ(8.0, node->transform.pers1);
+          ASSERT_EQ(9.0, node->transform.pers2);
+          ASSERT_EQ(std::strncmp(kTooltip, node->tooltip, sizeof(kTooltip) - 1),
+                    0);
+
+          if (node->id == 128) {
+            ASSERT_EQ(0x3f3, node->platform_view_id);
+          } else {
+            ASSERT_NE(kFlutterSemanticsNodeIdBatchEnd, node->id);
+            ASSERT_EQ(0, node->platform_view_id);
+          }
+        }
+
+        semantics_update_latch.Signal();
+      });
+
+  EmbedderConfigBuilder builder(context);
   builder.SetSoftwareRendererConfig();
-  builder.GetProjectArgs().update_semantics_callback =
-      [](const FlutterSemanticsUpdate* update, void* user_data) {};
-  builder.GetProjectArgs().update_semantics_node_callback =
-      [](const FlutterSemanticsNode* update, void* user_data) {};
-  builder.GetProjectArgs().update_semantics_custom_action_callback =
-      [](const FlutterSemanticsCustomAction* update, void* user_data) {};
-  auto engine = builder.InitializeEngine();
-  ASSERT_FALSE(engine.is_valid());
-  engine.reset();
+  builder.SetDartEntrypoint("a11y_main");
+
+  auto engine = builder.LaunchEngine();
+  ASSERT_TRUE(engine.is_valid());
+
+  // 1: Wait for initial notifySemanticsEnabled(false).
+  fml::AutoResetWaitableEvent notify_semantics_enabled_latch;
+  notify_semantics_enabled_callback = [&](Dart_NativeArguments args) {
+    Dart_Handle exception = nullptr;
+    bool enabled =
+        ::tonic::DartConverter<bool>::FromArguments(args, 0, exception);
+    ASSERT_FALSE(enabled);
+    notify_semantics_enabled_latch.Signal();
+  };
+  notify_semantics_enabled_latch.Wait();
+
+  // Prepare notifyAccessibilityFeatures callback.
+  fml::AutoResetWaitableEvent notify_features_latch;
+  notify_accessibility_features_callback = [&](Dart_NativeArguments args) {
+    Dart_Handle exception = nullptr;
+    bool enabled =
+        ::tonic::DartConverter<bool>::FromArguments(args, 0, exception);
+    ASSERT_FALSE(enabled);
+    notify_features_latch.Signal();
+  };
+
+  // 2: Enable semantics. Wait for notifySemanticsEnabled(true).
+  fml::AutoResetWaitableEvent notify_semantics_enabled_latch_2;
+  notify_semantics_enabled_callback = [&](Dart_NativeArguments args) {
+    Dart_Handle exception = nullptr;
+    bool enabled =
+        ::tonic::DartConverter<bool>::FromArguments(args, 0, exception);
+    ASSERT_TRUE(enabled);
+    notify_semantics_enabled_latch_2.Signal();
+  };
+  auto result = FlutterEngineUpdateSemanticsEnabled(engine.get(), true);
+  ASSERT_EQ(result, FlutterEngineResult::kSuccess);
+  notify_semantics_enabled_latch_2.Wait();
+
+  // 3: Wait for notifyAccessibilityFeatures (reduce_motion == false)
+  notify_features_latch.Wait();
+
+  // 4: Wait for notifyAccessibilityFeatures (reduce_motion == true)
+  fml::AutoResetWaitableEvent notify_features_latch_2;
+  notify_accessibility_features_callback = [&](Dart_NativeArguments args) {
+    Dart_Handle exception = nullptr;
+    bool enabled =
+        ::tonic::DartConverter<bool>::FromArguments(args, 0, exception);
+    ASSERT_TRUE(enabled);
+    notify_features_latch_2.Signal();
+  };
+  result = FlutterEngineUpdateAccessibilityFeatures(
+      engine.get(), kFlutterAccessibilityFeatureReduceMotion);
+  ASSERT_EQ(result, FlutterEngineResult::kSuccess);
+  notify_features_latch_2.Wait();
+
+  // 5: Wait for UpdateSemantics callback on platform (current) thread.
+  signal_native_latch.Wait();
+  fml::MessageLoop::GetCurrent().RunExpiredTasksNow();
+  semantics_update_latch.Wait();
+
+  // 6: Dispatch a tap to semantics node 42. Wait for NotifySemanticsAction.
+  fml::AutoResetWaitableEvent notify_semantics_action_latch;
+  notify_semantics_action_callback = [&](Dart_NativeArguments args) {
+    Dart_Handle exception = nullptr;
+    int64_t node_id =
+        ::tonic::DartConverter<int64_t>::FromArguments(args, 0, exception);
+    ASSERT_EQ(42, node_id);
+
+    int64_t action_id =
+        ::tonic::DartConverter<int64_t>::FromArguments(args, 1, exception);
+    ASSERT_EQ(static_cast<int32_t>(flutter::SemanticsAction::kTap), action_id);
+
+    std::vector<int64_t> semantic_args =
+        ::tonic::DartConverter<std::vector<int64_t>>::FromArguments(args, 2,
+                                                                    exception);
+    ASSERT_THAT(semantic_args, ElementsAre(2, 1));
+    notify_semantics_action_latch.Signal();
+  };
+  std::vector<uint8_t> bytes({2, 1});
+  result = FlutterEngineDispatchSemanticsAction(
+      engine.get(), 42, kFlutterSemanticsActionTap, &bytes[0], bytes.size());
+  ASSERT_EQ(result, FlutterEngineResult::kSuccess);
+  notify_semantics_action_latch.Wait();
+
+  // 7: Disable semantics. Wait for NotifySemanticsEnabled(false).
+  fml::AutoResetWaitableEvent notify_semantics_enabled_latch_3;
+  notify_semantics_enabled_callback = [&](Dart_NativeArguments args) {
+    Dart_Handle exception = nullptr;
+    bool enabled =
+        ::tonic::DartConverter<bool>::FromArguments(args, 0, exception);
+    ASSERT_FALSE(enabled);
+    notify_semantics_enabled_latch_3.Signal();
+  };
+  result = FlutterEngineUpdateSemanticsEnabled(engine.get(), false);
+  ASSERT_EQ(result, FlutterEngineResult::kSuccess);
+  notify_semantics_enabled_latch_3.Wait();
+#endif  // OS_FUCHSIA
 }
 
-TEST_F(EmbedderA11yTest, A11yTreeIsConsistent) {
+TEST_F(EmbedderA11yTest, A11yStringAttributes) {
 #if defined(OS_FUCHSIA)
   GTEST_SKIP() << "This test crashes on Fuchsia. https://fxbug.dev/87493 ";
+#else
+
+  auto& context = GetEmbedderContext(EmbedderTestContextType::kSoftwareContext);
+
+  fml::AutoResetWaitableEvent signal_native_latch;
+
+  // Called by the Dart text fixture on the UI thread to signal that the C++
+  // unittest should resume.
+  context.AddNativeCallback(
+      "SignalNativeTest",
+      CREATE_NATIVE_ENTRY(([&signal_native_latch](Dart_NativeArguments) {
+        signal_native_latch.Signal();
+      })));
+
+  fml::AutoResetWaitableEvent semantics_update_latch;
+  context.SetSemanticsUpdateCallback2(
+      [&](const FlutterSemanticsUpdate2* update) {
+        ASSERT_EQ(update->node_count, size_t(1));
+        ASSERT_EQ(update->custom_action_count, size_t(0));
+
+        auto node = update->nodes[0];
+
+        // Verify label
+        {
+          ASSERT_EQ(std::string(node->label), "What is the meaning of life?");
+          ASSERT_EQ(node->label_attribute_count, size_t(2));
+
+          ASSERT_EQ(node->label_attributes[0]->start, size_t(0));
+          ASSERT_EQ(node->label_attributes[0]->end, size_t(28));
+          ASSERT_EQ(node->label_attributes[0]->type,
+                    FlutterStringAttributeType::kLocale);
+          ASSERT_EQ(std::string(node->label_attributes[0]->locale->locale),
+                    "en");
+
+          ASSERT_EQ(node->label_attributes[1]->start, size_t(0));
+          ASSERT_EQ(node->label_attributes[1]->end, size_t(1));
+          ASSERT_EQ(node->label_attributes[1]->type,
+                    FlutterStringAttributeType::kSpellOut);
+        }
+
+        // Verify hint
+        {
+          ASSERT_EQ(std::string(node->hint), "It's a number");
+          ASSERT_EQ(node->hint_attribute_count, size_t(2));
+
+          ASSERT_EQ(node->hint_attributes[0]->start, size_t(0));
+          ASSERT_EQ(node->hint_attributes[0]->end, size_t(1));
+          ASSERT_EQ(node->hint_attributes[0]->type,
+                    FlutterStringAttributeType::kLocale);
+          ASSERT_EQ(std::string(node->hint_attributes[0]->locale->locale),
+                    "en");
+
+          ASSERT_EQ(node->hint_attributes[1]->start, size_t(2));
+          ASSERT_EQ(node->hint_attributes[1]->end, size_t(3));
+          ASSERT_EQ(node->hint_attributes[1]->type,
+                    FlutterStringAttributeType::kLocale);
+          ASSERT_EQ(std::string(node->hint_attributes[1]->locale->locale),
+                    "fr");
+        }
+
+        // Verify value
+        {
+          ASSERT_EQ(std::string(node->value), "42");
+          ASSERT_EQ(node->value_attribute_count, size_t(1));
+
+          ASSERT_EQ(node->value_attributes[0]->start, size_t(0));
+          ASSERT_EQ(node->value_attributes[0]->end, size_t(2));
+          ASSERT_EQ(node->value_attributes[0]->type,
+                    FlutterStringAttributeType::kLocale);
+          ASSERT_EQ(std::string(node->value_attributes[0]->locale->locale),
+                    "en-US");
+        }
+
+        // Verify increased value
+        {
+          ASSERT_EQ(std::string(node->increased_value), "43");
+          ASSERT_EQ(node->increased_value_attribute_count, size_t(2));
+
+          ASSERT_EQ(node->increased_value_attributes[0]->start, size_t(0));
+          ASSERT_EQ(node->increased_value_attributes[0]->end, size_t(1));
+          ASSERT_EQ(node->increased_value_attributes[0]->type,
+                    FlutterStringAttributeType::kSpellOut);
+
+          ASSERT_EQ(node->increased_value_attributes[1]->start, size_t(1));
+          ASSERT_EQ(node->increased_value_attributes[1]->end, size_t(2));
+          ASSERT_EQ(node->increased_value_attributes[1]->type,
+                    FlutterStringAttributeType::kSpellOut);
+        }
+
+        // Verify decreased value
+        {
+          ASSERT_EQ(std::string(node->decreased_value), "41");
+          ASSERT_EQ(node->decreased_value_attribute_count, size_t(0));
+          ASSERT_EQ(node->decreased_value_attributes, nullptr);
+        }
+
+        semantics_update_latch.Signal();
+      });
+
+  EmbedderConfigBuilder builder(context);
+  builder.SetSoftwareRendererConfig();
+  builder.SetDartEntrypoint("a11y_string_attributes");
+
+  auto engine = builder.LaunchEngine();
+  ASSERT_TRUE(engine.is_valid());
+
+  // 1: Enable semantics.
+  auto result = FlutterEngineUpdateSemanticsEnabled(engine.get(), true);
+  ASSERT_EQ(result, FlutterEngineResult::kSuccess);
+
+  // 2: Wait for semantics update callback on platform (current) thread.
+  signal_native_latch.Wait();
+  fml::MessageLoop::GetCurrent().RunExpiredTasksNow();
+  semantics_update_latch.Wait();
 #endif  // OS_FUCHSIA
+}
+
+TEST_F(EmbedderA11yTest, A11yTreeIsConsistentUsingV2Callbacks) {
+#if defined(OS_FUCHSIA)
+  GTEST_SKIP() << "This test crashes on Fuchsia. https://fxbug.dev/87493 ";
+#else
 
-  auto& context = GetEmbedderContext(EmbedderTestContextType::kOpenGLContext);
+  auto& context = GetEmbedderContext(EmbedderTestContextType::kSoftwareContext);
 
   fml::AutoResetWaitableEvent signal_native_latch;
 
@@ -123,33 +474,33 @@ TEST_F(EmbedderA11yTest, A11yTreeIsConsistent) {
   auto engine = builder.LaunchEngine();
   ASSERT_TRUE(engine.is_valid());
 
-  // Wait for initial NotifySemanticsEnabled(false).
+  // 1: Wait for initial notifySemanticsEnabled(false).
   fml::AutoResetWaitableEvent notify_semantics_enabled_latch;
   notify_semantics_enabled_callback = [&](Dart_NativeArguments args) {
-    bool enabled = true;
-    auto handle = Dart_GetNativeBooleanArgument(args, 0, &enabled);
-    ASSERT_FALSE(Dart_IsError(handle));
+    Dart_Handle exception = nullptr;
+    bool enabled =
+        ::tonic::DartConverter<bool>::FromArguments(args, 0, exception);
     ASSERT_FALSE(enabled);
     notify_semantics_enabled_latch.Signal();
   };
   notify_semantics_enabled_latch.Wait();
 
-  // Prepare to NotifyAccessibilityFeatures call
+  // Prepare notifyAccessibilityFeatures callback.
   fml::AutoResetWaitableEvent notify_features_latch;
   notify_accessibility_features_callback = [&](Dart_NativeArguments args) {
-    bool enabled = true;
-    auto handle = Dart_GetNativeBooleanArgument(args, 0, &enabled);
-    ASSERT_FALSE(Dart_IsError(handle));
+    Dart_Handle exception = nullptr;
+    bool enabled =
+        ::tonic::DartConverter<bool>::FromArguments(args, 0, exception);
     ASSERT_FALSE(enabled);
     notify_features_latch.Signal();
   };
 
-  // Enable semantics. Wait for NotifySemanticsEnabled(true).
+  // 2: Enable semantics. Wait for notifySemanticsEnabled(true).
   fml::AutoResetWaitableEvent notify_semantics_enabled_latch_2;
   notify_semantics_enabled_callback = [&](Dart_NativeArguments args) {
-    bool enabled = false;
-    auto handle = Dart_GetNativeBooleanArgument(args, 0, &enabled);
-    ASSERT_FALSE(Dart_IsError(handle));
+    Dart_Handle exception = nullptr;
+    bool enabled =
+        ::tonic::DartConverter<bool>::FromArguments(args, 0, exception);
     ASSERT_TRUE(enabled);
     notify_semantics_enabled_latch_2.Signal();
   };
@@ -157,15 +508,15 @@ TEST_F(EmbedderA11yTest, A11yTreeIsConsistent) {
   ASSERT_EQ(result, FlutterEngineResult::kSuccess);
   notify_semantics_enabled_latch_2.Wait();
 
-  // Wait for initial accessibility features (reduce_motion == false)
+  // 3: Wait for notifyAccessibilityFeatures (reduce_motion == false)
   notify_features_latch.Wait();
 
-  // Set accessibility features: (reduce_motion == true)
+  // 4: Wait for notifyAccessibilityFeatures (reduce_motion == true)
   fml::AutoResetWaitableEvent notify_features_latch_2;
   notify_accessibility_features_callback = [&](Dart_NativeArguments args) {
-    bool enabled = false;
-    auto handle = Dart_GetNativeBooleanArgument(args, 0, &enabled);
-    ASSERT_FALSE(Dart_IsError(handle));
+    Dart_Handle exception = nullptr;
+    bool enabled =
+        ::tonic::DartConverter<bool>::FromArguments(args, 0, exception);
     ASSERT_TRUE(enabled);
     notify_features_latch_2.Signal();
   };
@@ -174,32 +525,27 @@ TEST_F(EmbedderA11yTest, A11yTreeIsConsistent) {
   ASSERT_EQ(result, FlutterEngineResult::kSuccess);
   notify_features_latch_2.Wait();
 
-  // Wait for UpdateSemantics callback on platform (current) thread.
+  // 5: Wait for UpdateSemantics callback on platform (current) thread.
   signal_native_latch.Wait();
   fml::MessageLoop::GetCurrent().RunExpiredTasksNow();
   semantics_update_latch.Wait();
 
-  // Dispatch a tap to semantics node 42. Wait for NotifySemanticsAction.
+  // 6: Dispatch a tap to semantics node 42. Wait for NotifySemanticsAction.
   fml::AutoResetWaitableEvent notify_semantics_action_latch;
   notify_semantics_action_callback = [&](Dart_NativeArguments args) {
-    int64_t node_id = 0;
-    Dart_GetNativeIntegerArgument(args, 0, &node_id);
+    Dart_Handle exception = nullptr;
+    int64_t node_id =
+        ::tonic::DartConverter<int64_t>::FromArguments(args, 0, exception);
     ASSERT_EQ(42, node_id);
 
-    int64_t action_id;
-    auto handle = Dart_GetNativeIntegerArgument(args, 1, &action_id);
-    ASSERT_FALSE(Dart_IsError(handle));
+    int64_t action_id =
+        ::tonic::DartConverter<int64_t>::FromArguments(args, 1, exception);
     ASSERT_EQ(static_cast<int32_t>(flutter::SemanticsAction::kTap), action_id);
 
-    Dart_Handle semantic_args = Dart_GetNativeArgument(args, 2);
-    int64_t data;
-    Dart_Handle dart_int = Dart_ListGetAt(semantic_args, 0);
-    Dart_IntegerToInt64(dart_int, &data);
-    ASSERT_EQ(2, data);
-
-    dart_int = Dart_ListGetAt(semantic_args, 1);
-    Dart_IntegerToInt64(dart_int, &data);
-    ASSERT_EQ(1, data);
+    std::vector<int64_t> semantic_args =
+        ::tonic::DartConverter<std::vector<int64_t>>::FromArguments(args, 2,
+                                                                    exception);
+    ASSERT_THAT(semantic_args, ElementsAre(2, 1));
     notify_semantics_action_latch.Signal();
   };
   std::vector<uint8_t> bytes({2, 1});
@@ -208,21 +554,23 @@ TEST_F(EmbedderA11yTest, A11yTreeIsConsistent) {
   ASSERT_EQ(result, FlutterEngineResult::kSuccess);
   notify_semantics_action_latch.Wait();
 
-  // Disable semantics. Wait for NotifySemanticsEnabled(false).
+  // 7: Disable semantics. Wait for NotifySemanticsEnabled(false).
   fml::AutoResetWaitableEvent notify_semantics_enabled_latch_3;
   notify_semantics_enabled_callback = [&](Dart_NativeArguments args) {
-    bool enabled = true;
-    Dart_GetNativeBooleanArgument(args, 0, &enabled);
+    Dart_Handle exception = nullptr;
+    bool enabled =
+        ::tonic::DartConverter<bool>::FromArguments(args, 0, exception);
     ASSERT_FALSE(enabled);
     notify_semantics_enabled_latch_3.Signal();
   };
   result = FlutterEngineUpdateSemanticsEnabled(engine.get(), false);
   ASSERT_EQ(result, FlutterEngineResult::kSuccess);
   notify_semantics_enabled_latch_3.Wait();
+#endif  // OS_FUCHSIA
 }
 
-TEST_F(EmbedderA11yTest, A11yTreeIsConsistentUsingLegacyCallbacks) {
-  auto& context = GetEmbedderContext(EmbedderTestContextType::kOpenGLContext);
+TEST_F(EmbedderA11yTest, A11yTreeIsConsistentUsingV1Callbacks) {
+  auto& context = GetEmbedderContext(EmbedderTestContextType::kSoftwareContext);
 
   fml::AutoResetWaitableEvent signal_native_latch;
 
@@ -320,33 +668,33 @@ TEST_F(EmbedderA11yTest, A11yTreeIsConsistentUsingLegacyCallbacks) {
   auto engine = builder.LaunchEngine();
   ASSERT_TRUE(engine.is_valid());
 
-  // Wait for initial NotifySemanticsEnabled(false).
+  // 1: Wait for initial notifySemanticsEnabled(false).
   fml::AutoResetWaitableEvent notify_semantics_enabled_latch;
   notify_semantics_enabled_callback = [&](Dart_NativeArguments args) {
-    bool enabled = true;
-    auto handle = Dart_GetNativeBooleanArgument(args, 0, &enabled);
-    ASSERT_FALSE(Dart_IsError(handle));
+    Dart_Handle exception = nullptr;
+    bool enabled =
+        ::tonic::DartConverter<bool>::FromArguments(args, 0, exception);
     ASSERT_FALSE(enabled);
     notify_semantics_enabled_latch.Signal();
   };
   notify_semantics_enabled_latch.Wait();
 
-  // Prepare to NotifyAccessibilityFeatures call
+  // Prepare notifyAccessibilityFeatures callback.
   fml::AutoResetWaitableEvent notify_features_latch;
   notify_accessibility_features_callback = [&](Dart_NativeArguments args) {
-    bool enabled = true;
-    auto handle = Dart_GetNativeBooleanArgument(args, 0, &enabled);
-    ASSERT_FALSE(Dart_IsError(handle));
+    Dart_Handle exception = nullptr;
+    bool enabled =
+        ::tonic::DartConverter<bool>::FromArguments(args, 0, exception);
     ASSERT_FALSE(enabled);
     notify_features_latch.Signal();
   };
 
-  // Enable semantics. Wait for NotifySemanticsEnabled(true).
+  // 2: Enable semantics. Wait for notifySemanticsEnabled(true).
   fml::AutoResetWaitableEvent notify_semantics_enabled_latch_2;
   notify_semantics_enabled_callback = [&](Dart_NativeArguments args) {
-    bool enabled = false;
-    auto handle = Dart_GetNativeBooleanArgument(args, 0, &enabled);
-    ASSERT_FALSE(Dart_IsError(handle));
+    Dart_Handle exception = nullptr;
+    bool enabled =
+        ::tonic::DartConverter<bool>::FromArguments(args, 0, exception);
     ASSERT_TRUE(enabled);
     notify_semantics_enabled_latch_2.Signal();
   };
@@ -354,15 +702,15 @@ TEST_F(EmbedderA11yTest, A11yTreeIsConsistentUsingLegacyCallbacks) {
   ASSERT_EQ(result, FlutterEngineResult::kSuccess);
   notify_semantics_enabled_latch_2.Wait();
 
-  // Wait for initial accessibility features (reduce_motion == false)
+  // 3: Wait for notifyAccessibilityFeatures (reduce_motion == false)
   notify_features_latch.Wait();
 
-  // Set accessibility features: (reduce_motion == true)
+  // 4: Wait for notifyAccessibilityFeatures (reduce_motion == true)
   fml::AutoResetWaitableEvent notify_features_latch_2;
   notify_accessibility_features_callback = [&](Dart_NativeArguments args) {
-    bool enabled = false;
-    auto handle = Dart_GetNativeBooleanArgument(args, 0, &enabled);
-    ASSERT_FALSE(Dart_IsError(handle));
+    Dart_Handle exception = nullptr;
+    bool enabled =
+        ::tonic::DartConverter<bool>::FromArguments(args, 0, exception);
     ASSERT_TRUE(enabled);
     notify_features_latch_2.Signal();
   };
@@ -371,7 +719,7 @@ TEST_F(EmbedderA11yTest, A11yTreeIsConsistentUsingLegacyCallbacks) {
   ASSERT_EQ(result, FlutterEngineResult::kSuccess);
   notify_features_latch_2.Wait();
 
-  // Wait for UpdateSemantics callback on platform (current) thread.
+  // 5: Wait for UpdateSemantics callback on platform (current) thread.
   signal_native_latch.Wait();
   fml::MessageLoop::GetCurrent().RunExpiredTasksNow();
   semantics_node_latch.Wait();
@@ -381,27 +729,22 @@ TEST_F(EmbedderA11yTest, A11yTreeIsConsistentUsingLegacyCallbacks) {
   ASSERT_EQ(1, action_count);
   ASSERT_EQ(1, action_batch_end_count);
 
-  // Dispatch a tap to semantics node 42. Wait for NotifySemanticsAction.
+  // 6: Dispatch a tap to semantics node 42. Wait for NotifySemanticsAction.
   fml::AutoResetWaitableEvent notify_semantics_action_latch;
   notify_semantics_action_callback = [&](Dart_NativeArguments args) {
-    int64_t node_id = 0;
-    Dart_GetNativeIntegerArgument(args, 0, &node_id);
+    Dart_Handle exception = nullptr;
+    int64_t node_id =
+        ::tonic::DartConverter<int64_t>::FromArguments(args, 0, exception);
     ASSERT_EQ(42, node_id);
 
-    int64_t action_id;
-    auto handle = Dart_GetNativeIntegerArgument(args, 1, &action_id);
-    ASSERT_FALSE(Dart_IsError(handle));
+    int64_t action_id =
+        ::tonic::DartConverter<int64_t>::FromArguments(args, 1, exception);
     ASSERT_EQ(static_cast<int32_t>(flutter::SemanticsAction::kTap), action_id);
 
-    Dart_Handle semantic_args = Dart_GetNativeArgument(args, 2);
-    int64_t data;
-    Dart_Handle dart_int = Dart_ListGetAt(semantic_args, 0);
-    Dart_IntegerToInt64(dart_int, &data);
-    ASSERT_EQ(2, data);
-
-    dart_int = Dart_ListGetAt(semantic_args, 1);
-    Dart_IntegerToInt64(dart_int, &data);
-    ASSERT_EQ(1, data);
+    std::vector<int64_t> semantic_args =
+        ::tonic::DartConverter<std::vector<int64_t>>::FromArguments(args, 2,
+                                                                    exception);
+    ASSERT_THAT(semantic_args, ElementsAre(2, 1));
     notify_semantics_action_latch.Signal();
   };
   std::vector<uint8_t> bytes({2, 1});
@@ -410,11 +753,12 @@ TEST_F(EmbedderA11yTest, A11yTreeIsConsistentUsingLegacyCallbacks) {
   ASSERT_EQ(result, FlutterEngineResult::kSuccess);
   notify_semantics_action_latch.Wait();
 
-  // Disable semantics. Wait for NotifySemanticsEnabled(false).
+  // 7: Disable semantics. Wait for NotifySemanticsEnabled(false).
   fml::AutoResetWaitableEvent notify_semantics_enabled_latch_3;
   notify_semantics_enabled_callback = [&](Dart_NativeArguments args) {
-    bool enabled = true;
-    Dart_GetNativeBooleanArgument(args, 0, &enabled);
+    Dart_Handle exception = nullptr;
+    bool enabled =
+        ::tonic::DartConverter<bool>::FromArguments(args, 0, exception);
     ASSERT_FALSE(enabled);
     notify_semantics_enabled_latch_3.Signal();
   };
diff --git a/shell/platform/embedder/tests/embedder_assertions.h b/shell/platform/embedder/tests/embedder_assertions.h
index 2c267e139211780ed6b1471e71ea1d43f8b4b878..09b0d48bd0830d9916d059758d37797cddd1afe6 100644
--- a/shell/platform/embedder/tests/embedder_assertions.h
+++ b/shell/platform/embedder/tests/embedder_assertions.h
@@ -15,6 +15,8 @@
 #include "third_party/skia/include/core/SkPoint.h"
 #include "third_party/skia/include/core/SkSize.h"
 
+// NOLINTBEGIN(google-objc-function-naming)
+
 //------------------------------------------------------------------------------
 // Equality
 //------------------------------------------------------------------------------
@@ -116,6 +118,23 @@ inline bool operator==(const FlutterSoftwareBackingStore2& a,
          a.pixel_format == b.pixel_format;
 }
 
+inline bool operator==(const FlutterRegion& a, const FlutterRegion& b) {
+  if (a.struct_size != b.struct_size || a.rects_count != b.rects_count) {
+    return false;
+  }
+  for (size_t i = 0; i < a.rects_count; i++) {
+    if (!(a.rects[i] == b.rects[i])) {
+      return false;
+    }
+  }
+  return true;
+}
+
+inline bool operator==(const FlutterBackingStorePresentInfo& a,
+                       const FlutterBackingStorePresentInfo& b) {
+  return a.struct_size == b.struct_size && *a.paint_region == *b.paint_region;
+}
+
 inline bool operator==(const FlutterBackingStore& a,
                        const FlutterBackingStore& b) {
   if (!(a.struct_size == b.struct_size && a.user_data == b.user_data &&
@@ -183,7 +202,8 @@ inline bool operator==(const FlutterLayer& a, const FlutterLayer& b) {
 
   switch (a.type) {
     case kFlutterLayerContentTypeBackingStore:
-      return *a.backing_store == *b.backing_store;
+      return *a.backing_store == *b.backing_store &&
+             *a.backing_store_present_info == *b.backing_store_present_info;
     case kFlutterLayerContentTypePlatformView:
       return *a.platform_view == *b.platform_view;
   }
@@ -355,20 +375,20 @@ inline std::string FlutterOpenGLTargetTypeToString(
 inline std::string FlutterSoftwarePixelFormatToString(
     FlutterSoftwarePixelFormat pixfmt) {
   switch (pixfmt) {
-    case kGray8:
-      return "kGray8";
-    case kRGB565:
-      return "kRGB565";
-    case kRGBA4444:
-      return "kRGBA4444";
-    case kRGBA8888:
-      return "kRGBA8888";
-    case kRGBX8888:
-      return "kRGBX8888";
-    case kBGRA8888:
-      return "kBGRA8888";
-    case kNative32:
-      return "kNative32";
+    case kFlutterSoftwarePixelFormatGray8:
+      return "kFlutterSoftwarePixelFormatGray8";
+    case kFlutterSoftwarePixelFormatRGB565:
+      return "kFlutterSoftwarePixelFormatRGB565";
+    case kFlutterSoftwarePixelFormatRGBA4444:
+      return "kFlutterSoftwarePixelFormatRGBA4444";
+    case kFlutterSoftwarePixelFormatRGBA8888:
+      return "kFlutterSoftwarePixelFormatRGBA8888";
+    case kFlutterSoftwarePixelFormatRGBX8888:
+      return "kFlutterSoftwarePixelFormatRGBX8888";
+    case kFlutterSoftwarePixelFormatBGRA8888:
+      return "kFlutterSoftwarePixelFormatBGRA8888";
+    case kFlutterSoftwarePixelFormatNative32:
+      return "kFlutterSoftwarePixelFormatNative32";
     default:
       FML_LOG(ERROR) << "Invalid software rendering pixel format";
   }
@@ -558,4 +578,6 @@ inline FlutterRoundedRect FlutterRoundedRectMake(const SkRRect& rect) {
   return r;
 }
 
+// NOLINTEND(google-objc-function-naming)
+
 #endif  // FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_ASSERTIONS_H_
diff --git a/shell/platform/embedder/tests/embedder_config_builder.cc b/shell/platform/embedder/tests/embedder_config_builder.cc
index d61b5ffb633708564a3dde7af2350f27ab6aeb70..fa89c66e65b5d09f34bef48d6132fe6c9819b297 100644
--- a/shell/platform/embedder/tests/embedder_config_builder.cc
+++ b/shell/platform/embedder/tests/embedder_config_builder.cc
@@ -4,11 +4,12 @@
 
 #include "flutter/shell/platform/embedder/tests/embedder_config_builder.h"
 
+#include "flutter/common/constants.h"
 #include "flutter/runtime/dart_vm.h"
 #include "flutter/shell/platform/embedder/embedder.h"
 #include "tests/embedder_test_context.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "vulkan/vulkan_core.h"
+#include "third_party/skia/include/core/SkImage.h"
 
 #ifdef SHELL_ENABLE_GL
 #include "flutter/shell/platform/embedder/tests/embedder_test_compositor_gl.h"
@@ -17,7 +18,8 @@
 
 #ifdef SHELL_ENABLE_VULKAN
 #include "flutter/shell/platform/embedder/tests/embedder_test_context_vulkan.h"
-#include "flutter/vulkan/vulkan_device.h"
+#include "flutter/vulkan/vulkan_device.h"  // nogncheck
+#include "vulkan/vulkan_core.h"            // nogncheck
 #endif
 
 #ifdef SHELL_ENABLE_METAL
@@ -100,7 +102,7 @@ EmbedderConfigBuilder::EmbedderConfigBuilder(
         }
         bitmap.setImmutable();
         return reinterpret_cast<EmbedderTestContextSoftware*>(context)->Present(
-            SkImage::MakeFromBitmap(bitmap));
+            SkImages::RasterFromBitmap(bitmap));
       };
 
   // The first argument is always the executable name. Don't make tests have to
@@ -113,7 +115,8 @@ EmbedderConfigBuilder::EmbedderConfigBuilder(
     SetSemanticsCallbackHooks();
     SetLogMessageCallbackHook();
     SetLocalizationCallbackHooks();
-    AddCommandLineArgument("--disable-observatory");
+    SetChannelUpdateCallbackHook();
+    AddCommandLineArgument("--disable-vm-service");
 
     if (preference == InitializationPreference::kSnapshotsInitialize ||
         preference == InitializationPreference::kMultiAOTInitialize) {
@@ -203,10 +206,18 @@ void EmbedderConfigBuilder::SetMetalRendererConfig(SkISize surface_size) {
 #endif
 }
 
-void EmbedderConfigBuilder::SetVulkanRendererConfig(SkISize surface_size) {
+void EmbedderConfigBuilder::SetVulkanRendererConfig(
+    SkISize surface_size,
+    std::optional<FlutterVulkanInstanceProcAddressCallback>
+        instance_proc_address_callback) {
 #ifdef SHELL_ENABLE_VULKAN
   renderer_config_.type = FlutterRendererType::kVulkan;
-  renderer_config_.vulkan = vulkan_renderer_config_;
+  FlutterVulkanRendererConfig vulkan_renderer_config = vulkan_renderer_config_;
+  if (instance_proc_address_callback.has_value()) {
+    vulkan_renderer_config.get_instance_proc_address_callback =
+        instance_proc_address_callback.value();
+  }
+  renderer_config_.vulkan = vulkan_renderer_config;
   context_.SetupSurface(surface_size);
 #endif
 }
@@ -247,6 +258,8 @@ void EmbedderConfigBuilder::SetIsolateCreateCallbackHook() {
 }
 
 void EmbedderConfigBuilder::SetSemanticsCallbackHooks() {
+  project_args_.update_semantics_callback2 =
+      context_.GetUpdateSemanticsCallback2Hook();
   project_args_.update_semantics_callback =
       context_.GetUpdateSemanticsCallbackHook();
   project_args_.update_semantics_node_callback =
@@ -260,6 +273,11 @@ void EmbedderConfigBuilder::SetLogMessageCallbackHook() {
       EmbedderTestContext::GetLogMessageCallbackHook();
 }
 
+void EmbedderConfigBuilder::SetChannelUpdateCallbackHook() {
+  project_args_.channel_update_callback =
+      context_.GetChannelUpdateCallbackHook();
+}
+
 void EmbedderConfigBuilder::SetLogTag(std::string tag) {
   log_tag_ = std::move(tag);
   project_args_.log_tag = log_tag_.c_str();
@@ -337,7 +355,8 @@ void EmbedderConfigBuilder::SetPlatformMessageCallback(
   context_.SetPlatformMessageCallback(callback);
 }
 
-void EmbedderConfigBuilder::SetCompositor(bool avoid_backing_store_cache) {
+void EmbedderConfigBuilder::SetCompositor(bool avoid_backing_store_cache,
+                                          bool use_present_layers_callback) {
   context_.SetupCompositor();
   auto& compositor = context_.GetCompositor();
   compositor_.struct_size = sizeof(compositor_);
@@ -357,16 +376,25 @@ void EmbedderConfigBuilder::SetCompositor(bool avoid_backing_store_cache) {
         return reinterpret_cast<EmbedderTestCompositor*>(user_data)
             ->CollectBackingStore(backing_store);
       };
-  compositor_.present_layers_callback = [](const FlutterLayer** layers,  //
-                                           size_t layers_count,          //
-                                           void* user_data               //
-                                        ) {
-    return reinterpret_cast<EmbedderTestCompositor*>(user_data)->Present(
-        layers,       //
-        layers_count  //
-
-    );
-  };
+  if (use_present_layers_callback) {
+    compositor_.present_layers_callback = [](const FlutterLayer** layers,
+                                             size_t layers_count,
+                                             void* user_data) {
+      auto compositor = reinterpret_cast<EmbedderTestCompositor*>(user_data);
+
+      // The present layers callback is incompatible with multiple views;
+      // it can only be used to render the implicit view.
+      return compositor->Present(kFlutterImplicitViewId, layers, layers_count);
+    };
+  } else {
+    compositor_.present_view_callback = [](const FlutterPresentViewInfo* info) {
+      auto compositor =
+          reinterpret_cast<EmbedderTestCompositor*>(info->user_data);
+
+      return compositor->Present(info->view_id, info->layers,
+                                 info->layers_count);
+    };
+  }
   compositor_.avoid_backing_store_cache = avoid_backing_store_cache;
   project_args_.compositor = &compositor_;
 }
@@ -510,12 +538,7 @@ void EmbedderConfigBuilder::InitializeVulkanRendererConfig() {
       static_cast<EmbedderTestContextVulkan&>(context_)
           .vulkan_context_->device_->GetQueueHandle();
   vulkan_renderer_config_.get_instance_proc_address_callback =
-      [](void* context, FlutterVulkanInstanceHandle instance,
-         const char* name) -> void* {
-    auto proc_addr = reinterpret_cast<EmbedderTestContextVulkan*>(context)
-                         ->vulkan_context_->vk_->GetInstanceProcAddr;
-    return reinterpret_cast<void*>(proc_addr);
-  };
+      EmbedderTestContextVulkan::InstanceProcAddr;
   vulkan_renderer_config_.get_next_image_callback =
       [](void* context,
          const FlutterFrameInfo* frame_info) -> FlutterVulkanImage {
diff --git a/shell/platform/embedder/tests/embedder_config_builder.h b/shell/platform/embedder/tests/embedder_config_builder.h
index 2727c85fdadbd0956509be412fb700605ab3a723..82498ac06b17bb407780c76a633c83dc5eba54fb 100644
--- a/shell/platform/embedder/tests/embedder_config_builder.h
+++ b/shell/platform/embedder/tests/embedder_config_builder.h
@@ -53,7 +53,10 @@ class EmbedderConfigBuilder {
 
   void SetMetalRendererConfig(SkISize surface_size);
 
-  void SetVulkanRendererConfig(SkISize surface_size);
+  void SetVulkanRendererConfig(
+      SkISize surface_size,
+      std::optional<FlutterVulkanInstanceProcAddressCallback>
+          instance_proc_address_callback = {});
 
   // Used to explicitly set an `open_gl.fbo_callback`. Using this method will
   // cause your test to fail since the ctor for this class sets
@@ -80,6 +83,8 @@ class EmbedderConfigBuilder {
   // Used to set a custom log message handler.
   void SetLogMessageCallbackHook();
 
+  void SetChannelUpdateCallbackHook();
+
   // Used to set a custom log tag.
   void SetLogTag(std::string tag);
 
@@ -100,7 +105,8 @@ class EmbedderConfigBuilder {
   void SetPlatformMessageCallback(
       const std::function<void(const FlutterPlatformMessage*)>& callback);
 
-  void SetCompositor(bool avoid_backing_store_cache = false);
+  void SetCompositor(bool avoid_backing_store_cache = false,
+                     bool use_present_layers_callback = false);
 
   FlutterCompositor& GetCompositor();
 
@@ -108,7 +114,8 @@ class EmbedderConfigBuilder {
 
   void SetRenderTargetType(
       EmbedderTestBackingStoreProducer::RenderTargetType type,
-      FlutterSoftwarePixelFormat software_pixfmt = kNative32);
+      FlutterSoftwarePixelFormat software_pixfmt =
+          kFlutterSoftwarePixelFormatNative32);
 
   UniqueEngine LaunchEngine() const;
 
diff --git a/shell/platform/embedder/tests/embedder_frozen.h b/shell/platform/embedder/tests/embedder_frozen.h
new file mode 100644
index 0000000000000000000000000000000000000000..afd66372fdeab2035f8164c53c24b19d98db15d0
--- /dev/null
+++ b/shell/platform/embedder/tests/embedder_frozen.h
@@ -0,0 +1,114 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_FROZEN_H_
+#define FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_FROZEN_H_
+
+#include "flutter/shell/platform/embedder/embedder.h"
+
+// NO CHANGES ARE PERMITTED TO THE STRUCTS IN THIS FILE.
+//
+// This file contains the subset of the embedder API that is "frozen".
+// "Frozen" APIs are locked and must not be modified to guarantee
+// forward and backward ABI compatibility. The order, type, and size
+// of the struct members below must remain the same, and members must
+// not be added nor removed.
+//
+// This file serves as a "golden test" for structs in embedder.h
+// and contains a snapshot of the expected "frozen" API. Tests
+// then verify that these structs match the actual embedder API.
+
+namespace flutter {
+namespace testing {
+
+// New members must not be added to `FlutterTransformation`
+// as it would break the ABI of `FlutterSemanticsNode`.
+// See: https://github.com/flutter/flutter/issues/121176
+typedef struct {
+  double scaleX;
+  double skewX;
+  double transX;
+  double skewY;
+  double scaleY;
+  double transY;
+  double pers0;
+  double pers1;
+  double pers2;
+} FrozenFlutterTransformation;
+
+// New members must not be added to `FlutterRect` as it would
+// break the ABI of `FlutterSemanticsNode` and `FlutterDamage`.
+// See: https://github.com/flutter/flutter/issues/121176
+// See: https://github.com/flutter/flutter/issues/121347
+typedef struct {
+  double left;
+  double top;
+  double right;
+  double bottom;
+} FrozenFlutterRect;
+
+// New members must not be added to `FlutterPoint` as it would
+// break the ABI of `FlutterLayer`.
+typedef struct {
+  double x;
+  double y;
+} FrozenFlutterPoint;
+
+// New members must not be added to `FlutterDamage` as it would
+// break the ABI of `FlutterPresentInfo`.
+typedef struct {
+  size_t struct_size;
+  size_t num_rects;
+  FrozenFlutterRect* damage;
+} FrozenFlutterDamage;
+
+// New members must not be added to `FlutterSemanticsNode`
+// as it would break the ABI of `FlutterSemanticsUpdate`.
+// See: https://github.com/flutter/flutter/issues/121176
+typedef struct {
+  size_t struct_size;
+  int32_t id;
+  FlutterSemanticsFlag flags;
+  FlutterSemanticsAction actions;
+  int32_t text_selection_base;
+  int32_t text_selection_extent;
+  int32_t scroll_child_count;
+  int32_t scroll_index;
+  double scroll_position;
+  double scroll_extent_max;
+  double scroll_extent_min;
+  double elevation;
+  double thickness;
+  const char* label;
+  const char* hint;
+  const char* value;
+  const char* increased_value;
+  const char* decreased_value;
+  FlutterTextDirection text_direction;
+  FrozenFlutterRect rect;
+  FrozenFlutterTransformation transform;
+  size_t child_count;
+  const int32_t* children_in_traversal_order;
+  const int32_t* children_in_hit_test_order;
+  size_t custom_accessibility_actions_count;
+  const int32_t* custom_accessibility_actions;
+  FlutterPlatformViewIdentifier platform_view_id;
+  const char* tooltip;
+} FrozenFlutterSemanticsNode;
+
+// New members must not be added to `FlutterSemanticsCustomAction`
+// as it would break the ABI of `FlutterSemanticsUpdate`.
+// See: https://github.com/flutter/flutter/issues/121176
+typedef struct {
+  size_t struct_size;
+  int32_t id;
+  FlutterSemanticsAction override_action;
+  const char* label;
+  const char* hint;
+} FrozenFlutterSemanticsCustomAction;
+
+}  // namespace testing
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_FROZEN_H_
diff --git a/shell/platform/embedder/tests/embedder_frozen_unittests.cc b/shell/platform/embedder/tests/embedder_frozen_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..4235547e831a9147a97ca763cf27ff03a00e99f2
--- /dev/null
+++ b/shell/platform/embedder/tests/embedder_frozen_unittests.cc
@@ -0,0 +1,131 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/platform/embedder/embedder.h"
+#include "flutter/shell/platform/embedder/tests/embedder_frozen.h"
+#include "flutter/testing/testing.h"
+
+namespace flutter {
+namespace testing {
+
+// Assert that both types have the same member with the same offset.
+// This prevents reordering of "frozen" embedder API struct members.
+#define ASSERT_EQ_OFFSET(type1, type2, member) \
+  ASSERT_EQ(offsetof(type1, member), offsetof(type2, member))
+
+// New members must not be added to `FlutterTransformation`
+// as it would break the ABI of `FlutterSemanticsNode`.
+// See: https://github.com/flutter/flutter/issues/121176
+TEST(EmbedderFrozen, FlutterTransformationIsFrozen) {
+  ASSERT_EQ_OFFSET(FlutterTransformation, FrozenFlutterTransformation, scaleX);
+  ASSERT_EQ_OFFSET(FlutterTransformation, FrozenFlutterTransformation, skewX);
+  ASSERT_EQ_OFFSET(FlutterTransformation, FrozenFlutterTransformation, transX);
+  ASSERT_EQ_OFFSET(FlutterTransformation, FrozenFlutterTransformation, skewY);
+  ASSERT_EQ_OFFSET(FlutterTransformation, FrozenFlutterTransformation, scaleY);
+  ASSERT_EQ_OFFSET(FlutterTransformation, FrozenFlutterTransformation, transY);
+  ASSERT_EQ_OFFSET(FlutterTransformation, FrozenFlutterTransformation, pers0);
+  ASSERT_EQ_OFFSET(FlutterTransformation, FrozenFlutterTransformation, pers1);
+  ASSERT_EQ_OFFSET(FlutterTransformation, FrozenFlutterTransformation, pers2);
+}
+
+// New members must not be added to `FlutterRect` as it would
+// break the ABI of `FlutterSemanticsNode` and `FlutterDamage`.
+// See: https://github.com/flutter/flutter/issues/121176
+// See: https://github.com/flutter/flutter/issues/121347
+TEST(EmbedderFrozen, FlutterRectIsFrozen) {
+  ASSERT_EQ_OFFSET(FlutterRect, FrozenFlutterRect, left);
+  ASSERT_EQ_OFFSET(FlutterRect, FrozenFlutterRect, top);
+  ASSERT_EQ_OFFSET(FlutterRect, FrozenFlutterRect, right);
+  ASSERT_EQ_OFFSET(FlutterRect, FrozenFlutterRect, bottom);
+}
+
+// New members must not be added to `FlutterPoint` as it would
+// break the ABI of `FlutterLayer`.
+TEST(EmbedderFrozen, FlutterPointIsFrozen) {
+  ASSERT_EQ_OFFSET(FlutterPoint, FrozenFlutterPoint, x);
+  ASSERT_EQ_OFFSET(FlutterPoint, FrozenFlutterPoint, y);
+}
+
+// New members must not be added to `FlutterDamage` as it would
+// break the ABI of `FlutterPresentInfo`.
+TEST(EmbedderFrozen, FlutterDamageIsFrozen) {
+  ASSERT_EQ_OFFSET(FlutterDamage, FrozenFlutterDamage, struct_size);
+  ASSERT_EQ_OFFSET(FlutterDamage, FrozenFlutterDamage, num_rects);
+  ASSERT_EQ_OFFSET(FlutterDamage, FrozenFlutterDamage, damage);
+}
+
+// New members must not be added to `FlutterSemanticsNode`
+// as it would break the ABI of `FlutterSemanticsUpdate`.
+// See: https://github.com/flutter/flutter/issues/121176
+TEST(EmbedderFrozen, FlutterSemanticsNodeIsFrozen) {
+  ASSERT_EQ(sizeof(FlutterSemanticsNode), sizeof(FrozenFlutterSemanticsNode));
+
+  ASSERT_EQ_OFFSET(FlutterSemanticsNode, FrozenFlutterSemanticsNode,
+                   struct_size);
+  ASSERT_EQ_OFFSET(FlutterSemanticsNode, FrozenFlutterSemanticsNode, id);
+  ASSERT_EQ_OFFSET(FlutterSemanticsNode, FrozenFlutterSemanticsNode, flags);
+  ASSERT_EQ_OFFSET(FlutterSemanticsNode, FrozenFlutterSemanticsNode, actions);
+  ASSERT_EQ_OFFSET(FlutterSemanticsNode, FrozenFlutterSemanticsNode,
+                   text_selection_base);
+  ASSERT_EQ_OFFSET(FlutterSemanticsNode, FrozenFlutterSemanticsNode,
+                   text_selection_extent);
+  ASSERT_EQ_OFFSET(FlutterSemanticsNode, FrozenFlutterSemanticsNode,
+                   scroll_child_count);
+  ASSERT_EQ_OFFSET(FlutterSemanticsNode, FrozenFlutterSemanticsNode,
+                   scroll_index);
+  ASSERT_EQ_OFFSET(FlutterSemanticsNode, FrozenFlutterSemanticsNode,
+                   scroll_position);
+  ASSERT_EQ_OFFSET(FlutterSemanticsNode, FrozenFlutterSemanticsNode,
+                   scroll_extent_max);
+  ASSERT_EQ_OFFSET(FlutterSemanticsNode, FrozenFlutterSemanticsNode,
+                   scroll_extent_min);
+  ASSERT_EQ_OFFSET(FlutterSemanticsNode, FrozenFlutterSemanticsNode, elevation);
+  ASSERT_EQ_OFFSET(FlutterSemanticsNode, FrozenFlutterSemanticsNode, thickness);
+  ASSERT_EQ_OFFSET(FlutterSemanticsNode, FrozenFlutterSemanticsNode, label);
+  ASSERT_EQ_OFFSET(FlutterSemanticsNode, FrozenFlutterSemanticsNode, hint);
+  ASSERT_EQ_OFFSET(FlutterSemanticsNode, FrozenFlutterSemanticsNode, value);
+  ASSERT_EQ_OFFSET(FlutterSemanticsNode, FrozenFlutterSemanticsNode,
+                   increased_value);
+  ASSERT_EQ_OFFSET(FlutterSemanticsNode, FrozenFlutterSemanticsNode,
+                   decreased_value);
+  ASSERT_EQ_OFFSET(FlutterSemanticsNode, FrozenFlutterSemanticsNode,
+                   text_direction);
+  ASSERT_EQ_OFFSET(FlutterSemanticsNode, FrozenFlutterSemanticsNode, rect);
+  ASSERT_EQ_OFFSET(FlutterSemanticsNode, FrozenFlutterSemanticsNode, transform);
+  ASSERT_EQ_OFFSET(FlutterSemanticsNode, FrozenFlutterSemanticsNode,
+                   child_count);
+  ASSERT_EQ_OFFSET(FlutterSemanticsNode, FrozenFlutterSemanticsNode,
+                   children_in_traversal_order);
+  ASSERT_EQ_OFFSET(FlutterSemanticsNode, FrozenFlutterSemanticsNode,
+                   children_in_hit_test_order);
+  ASSERT_EQ_OFFSET(FlutterSemanticsNode, FrozenFlutterSemanticsNode,
+                   custom_accessibility_actions_count);
+  ASSERT_EQ_OFFSET(FlutterSemanticsNode, FrozenFlutterSemanticsNode,
+                   custom_accessibility_actions);
+  ASSERT_EQ_OFFSET(FlutterSemanticsNode, FrozenFlutterSemanticsNode,
+                   platform_view_id);
+  ASSERT_EQ_OFFSET(FlutterSemanticsNode, FrozenFlutterSemanticsNode, tooltip);
+}
+
+// New members must not be added to `FlutterSemanticsCustomAction`
+// as it would break the ABI of `FlutterSemanticsUpdate`.
+// See: https://github.com/flutter/flutter/issues/121176
+TEST(EmbedderFrozen, FlutterSemanticsCustomActionIsFrozen) {
+  ASSERT_EQ(sizeof(FlutterSemanticsCustomAction),
+            sizeof(FrozenFlutterSemanticsCustomAction));
+
+  ASSERT_EQ_OFFSET(FlutterSemanticsCustomAction,
+                   FrozenFlutterSemanticsCustomAction, struct_size);
+  ASSERT_EQ_OFFSET(FlutterSemanticsCustomAction,
+                   FrozenFlutterSemanticsCustomAction, id);
+  ASSERT_EQ_OFFSET(FlutterSemanticsCustomAction,
+                   FrozenFlutterSemanticsCustomAction, override_action);
+  ASSERT_EQ_OFFSET(FlutterSemanticsCustomAction,
+                   FrozenFlutterSemanticsCustomAction, label);
+  ASSERT_EQ_OFFSET(FlutterSemanticsCustomAction,
+                   FrozenFlutterSemanticsCustomAction, hint);
+}
+
+}  // namespace testing
+}  // namespace flutter
diff --git a/shell/platform/embedder/tests/embedder_unittests_gl.cc b/shell/platform/embedder/tests/embedder_gl_unittests.cc
similarity index 82%
rename from shell/platform/embedder/tests/embedder_unittests_gl.cc
rename to shell/platform/embedder/tests/embedder_gl_unittests.cc
index a7018859d1d47d07d702c52cdaa7e78496f55656..0720e54a458dedf32e2aa54fe769c5afa1502832 100644
--- a/shell/platform/embedder/tests/embedder_unittests_gl.cc
+++ b/shell/platform/embedder/tests/embedder_gl_unittests.cc
@@ -11,6 +11,7 @@
 
 #include "vulkan/vulkan.h"
 
+#include "GLES3/gl3.h"
 #include "flutter/flow/raster_cache.h"
 #include "flutter/fml/file.h"
 #include "flutter/fml/make_copyable.h"
@@ -25,6 +26,7 @@
 #include "flutter/fml/thread.h"
 #include "flutter/lib/ui/painting/image.h"
 #include "flutter/runtime/dart_vm.h"
+#include "flutter/shell/platform/embedder/embedder_surface_gl_impeller.h"
 #include "flutter/shell/platform/embedder/tests/embedder_assertions.h"
 #include "flutter/shell/platform/embedder/tests/embedder_config_builder.h"
 #include "flutter/shell/platform/embedder/tests/embedder_test.h"
@@ -34,7 +36,6 @@
 #include "flutter/testing/test_gl_surface.h"
 #include "flutter/testing/testing.h"
 #include "third_party/skia/include/core/SkSurface.h"
-#include "third_party/skia/src/gpu/gl/GrGLDefines.h"
 #include "third_party/tonic/converter/dart_converter.h"
 
 // CREATE_NATIVE_ENTRY is leaky by design
@@ -72,6 +73,27 @@ TEST_F(EmbedderTest,
   builder.GetCompositor().create_backing_store_callback = nullptr;
   builder.GetCompositor().collect_backing_store_callback = nullptr;
   builder.GetCompositor().present_layers_callback = nullptr;
+  builder.GetCompositor().present_view_callback = nullptr;
+  auto engine = builder.LaunchEngine();
+  ASSERT_FALSE(engine.is_valid());
+}
+
+//------------------------------------------------------------------------------
+/// Either present_layers_callback or present_view_callback must be provided,
+/// but not both, otherwise the engine must fail to launch instead of failing to
+/// render a frame at a later point in time.
+///
+TEST_F(EmbedderTest, LaunchFailsWhenMultiplePresentCallbacks) {
+  auto& context = GetEmbedderContext(EmbedderTestContextType::kSoftwareContext);
+  EmbedderConfigBuilder builder(context);
+  builder.SetOpenGLRendererConfig(SkISize::Make(1, 1));
+  builder.SetCompositor();
+  builder.GetCompositor().present_layers_callback =
+      [](const FlutterLayer** layers, size_t layers_count, void* user_data) {
+        return true;
+      };
+  builder.GetCompositor().present_view_callback =
+      [](const FlutterPresentViewInfo* info) { return true; };
   auto engine = builder.LaunchEngine();
   ASSERT_FALSE(engine.is_valid());
 }
@@ -93,7 +115,8 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderToOpenGLFramebuffer) {
 
   fml::CountDownLatch latch(3);
   context.GetCompositor().SetNextPresentCallback(
-      [&](const FlutterLayer** layers, size_t layers_count) {
+      [&](FlutterViewId view_id, const FlutterLayer** layers,
+          size_t layers_count) {
         ASSERT_EQ(layers_count, 3u);
 
         {
@@ -103,12 +126,26 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderToOpenGLFramebuffer) {
           backing_store.did_update = true;
           backing_store.open_gl.type = kFlutterOpenGLTargetTypeFramebuffer;
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(0, 0, 800, 600),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(800.0, 600.0);
           layer.offset = FlutterPointMake(0, 0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[0], layer);
         }
@@ -135,12 +172,26 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderToOpenGLFramebuffer) {
           backing_store.did_update = true;
           backing_store.open_gl.type = kFlutterOpenGLTargetTypeFramebuffer;
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(2, 3, 800, 600),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(800.0, 600.0);
           layer.offset = FlutterPointMake(0.0, 0.0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[2], layer);
         }
@@ -186,7 +237,8 @@ TEST_F(EmbedderTest, RasterCacheDisabledWithPlatformViews) {
   fml::CountDownLatch verify(1);
 
   context.GetCompositor().SetNextPresentCallback(
-      [&](const FlutterLayer** layers, size_t layers_count) {
+      [&](FlutterViewId view_id, const FlutterLayer** layers,
+          size_t layers_count) {
         ASSERT_EQ(layers_count, 3u);
 
         {
@@ -196,12 +248,26 @@ TEST_F(EmbedderTest, RasterCacheDisabledWithPlatformViews) {
           backing_store.did_update = true;
           backing_store.open_gl.type = kFlutterOpenGLTargetTypeFramebuffer;
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(0, 0, 800, 600),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(800.0, 600.0);
           layer.offset = FlutterPointMake(0, 0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[0], layer);
         }
@@ -228,12 +294,26 @@ TEST_F(EmbedderTest, RasterCacheDisabledWithPlatformViews) {
           backing_store.did_update = true;
           backing_store.open_gl.type = kFlutterOpenGLTargetTypeFramebuffer;
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(3, 3, 800, 600),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(800.0, 600.0);
           layer.offset = FlutterPointMake(0.0, 0.0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[2], layer);
         }
@@ -290,7 +370,8 @@ TEST_F(EmbedderTest, RasterCacheEnabled) {
   fml::CountDownLatch verify(1);
 
   context.GetCompositor().SetNextPresentCallback(
-      [&](const FlutterLayer** layers, size_t layers_count) {
+      [&](FlutterViewId view_id, const FlutterLayer** layers,
+          size_t layers_count) {
         ASSERT_EQ(layers_count, 1u);
 
         {
@@ -300,12 +381,26 @@ TEST_F(EmbedderTest, RasterCacheEnabled) {
           backing_store.did_update = true;
           backing_store.open_gl.type = kFlutterOpenGLTargetTypeFramebuffer;
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(0, 0, 800, 600),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(800.0, 600.0);
           layer.offset = FlutterPointMake(0, 0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[0], layer);
         }
@@ -359,7 +454,8 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderToOpenGLTexture) {
 
   fml::CountDownLatch latch(3);
   context.GetCompositor().SetNextPresentCallback(
-      [&](const FlutterLayer** layers, size_t layers_count) {
+      [&](FlutterViewId view_id, const FlutterLayer** layers,
+          size_t layers_count) {
         ASSERT_EQ(layers_count, 3u);
 
         {
@@ -369,12 +465,26 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderToOpenGLTexture) {
           backing_store.did_update = true;
           backing_store.open_gl.type = kFlutterOpenGLTargetTypeTexture;
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(0, 0, 800, 600),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(800.0, 600.0);
           layer.offset = FlutterPointMake(0, 0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[0], layer);
         }
@@ -401,12 +511,26 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderToOpenGLTexture) {
           backing_store.did_update = true;
           backing_store.open_gl.type = kFlutterOpenGLTargetTypeTexture;
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(2, 3, 800, 600),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(800.0, 600.0);
           layer.offset = FlutterPointMake(0.0, 0.0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[2], layer);
         }
@@ -451,7 +575,8 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderToSoftwareBuffer) {
 
   fml::CountDownLatch latch(3);
   context.GetCompositor().SetNextPresentCallback(
-      [&](const FlutterLayer** layers, size_t layers_count) {
+      [&](FlutterViewId view_id, const FlutterLayer** layers,
+          size_t layers_count) {
         ASSERT_EQ(layers_count, 3u);
 
         {
@@ -463,12 +588,26 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderToSoftwareBuffer) {
               backing_store.software.row_bytes * backing_store.software.height,
               800 * 4 * 600.0);
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(0, 0, 800, 600),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(800.0, 600.0);
           layer.offset = FlutterPointMake(0, 0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[0], layer);
         }
@@ -493,12 +632,27 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderToSoftwareBuffer) {
           backing_store.struct_size = sizeof(backing_store);
           backing_store.type = kFlutterBackingStoreTypeSoftware;
           backing_store.did_update = true;
+
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(2, 3, 800, 600),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(800.0, 600.0);
           layer.offset = FlutterPointMake(0.0, 0.0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[2], layer);
         }
@@ -545,7 +699,8 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderKnownScene) {
   auto scene_image = context.GetNextSceneImage();
 
   context.GetCompositor().SetNextPresentCallback(
-      [&](const FlutterLayer** layers, size_t layers_count) {
+      [&](FlutterViewId view_id, const FlutterLayer** layers,
+          size_t layers_count) {
         ASSERT_EQ(layers_count, 5u);
 
         // Layer Root
@@ -555,12 +710,26 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderKnownScene) {
           backing_store.did_update = true;
           backing_store.open_gl.type = kFlutterOpenGLTargetTypeTexture;
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(0, 0, 800, 600),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(800.0, 600.0);
           layer.offset = FlutterPointMake(0.0, 0.0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[0], layer);
         }
@@ -588,12 +757,26 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderKnownScene) {
           backing_store.did_update = true;
           backing_store.open_gl.type = kFlutterOpenGLTargetTypeTexture;
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(30, 30, 80, 180),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(800.0, 600.0);
           layer.offset = FlutterPointMake(0.0, 0.0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[2], layer);
         }
@@ -621,12 +804,26 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderKnownScene) {
           backing_store.did_update = true;
           backing_store.open_gl.type = kFlutterOpenGLTargetTypeTexture;
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(50, 50, 100, 200),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(800.0, 600.0);
           layer.offset = FlutterPointMake(0.0, 0.0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[4], layer);
         }
@@ -728,7 +925,8 @@ TEST_F(EmbedderTest, CustomCompositorMustWorkWithCustomTaskRunner) {
 
   fml::CountDownLatch latch(3);
   context.GetCompositor().SetNextPresentCallback(
-      [&](const FlutterLayer** layers, size_t layers_count) {
+      [&](FlutterViewId view_id, const FlutterLayer** layers,
+          size_t layers_count) {
         ASSERT_EQ(layers_count, 3u);
 
         {
@@ -738,12 +936,26 @@ TEST_F(EmbedderTest, CustomCompositorMustWorkWithCustomTaskRunner) {
           backing_store.did_update = true;
           backing_store.open_gl.type = kFlutterOpenGLTargetTypeTexture;
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(0, 0, 800, 600),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(800.0, 600.0);
           layer.offset = FlutterPointMake(0, 0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[0], layer);
         }
@@ -753,12 +965,26 @@ TEST_F(EmbedderTest, CustomCompositorMustWorkWithCustomTaskRunner) {
           platform_view.struct_size = sizeof(platform_view);
           platform_view.identifier = 42;
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(2, 3, 800, 600),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypePlatformView;
           layer.platform_view = &platform_view;
           layer.size = FlutterSizeMake(123.0, 456.0);
           layer.offset = FlutterPointMake(1.0, 2.0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[1], layer);
         }
@@ -770,12 +996,26 @@ TEST_F(EmbedderTest, CustomCompositorMustWorkWithCustomTaskRunner) {
           backing_store.did_update = true;
           backing_store.open_gl.type = kFlutterOpenGLTargetTypeTexture;
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(2, 3, 800, 600),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(800.0, 600.0);
           layer.offset = FlutterPointMake(0.0, 0.0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[2], layer);
         }
@@ -842,7 +1082,8 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderWithRootLayerOnly) {
   auto scene_image = context.GetNextSceneImage();
 
   context.GetCompositor().SetNextPresentCallback(
-      [&](const FlutterLayer** layers, size_t layers_count) {
+      [&](FlutterViewId view_id, const FlutterLayer** layers,
+          size_t layers_count) {
         ASSERT_EQ(layers_count, 1u);
 
         // Layer Root
@@ -852,12 +1093,26 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderWithRootLayerOnly) {
           backing_store.did_update = true;
           backing_store.open_gl.type = kFlutterOpenGLTargetTypeTexture;
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(0, 0, 800, 600),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(800.0, 600.0);
           layer.offset = FlutterPointMake(0.0, 0.0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[0], layer);
         }
@@ -909,7 +1164,8 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderWithPlatformLayerOnBottom) {
   auto scene_image = context.GetNextSceneImage();
 
   context.GetCompositor().SetNextPresentCallback(
-      [&](const FlutterLayer** layers, size_t layers_count) {
+      [&](FlutterViewId view_id, const FlutterLayer** layers,
+          size_t layers_count) {
         ASSERT_EQ(layers_count, 2u);
 
         // Layer Root
@@ -919,12 +1175,26 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderWithPlatformLayerOnBottom) {
           backing_store.did_update = true;
           backing_store.open_gl.type = kFlutterOpenGLTargetTypeTexture;
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(0, 0, 800, 600),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(800.0, 600.0);
           layer.offset = FlutterPointMake(0.0, 0.0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[0], layer);
         }
@@ -1029,7 +1299,8 @@ TEST_F(EmbedderTest,
   auto scene_image = context.GetNextSceneImage();
 
   context.GetCompositor().SetNextPresentCallback(
-      [&](const FlutterLayer** layers, size_t layers_count) {
+      [&](FlutterViewId view_id, const FlutterLayer** layers,
+          size_t layers_count) {
         ASSERT_EQ(layers_count, 5u);
 
         // Layer Root
@@ -1039,12 +1310,26 @@ TEST_F(EmbedderTest,
           backing_store.did_update = true;
           backing_store.open_gl.type = kFlutterOpenGLTargetTypeTexture;
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(0, 0, 600, 800),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(600.0, 800.0);
           layer.offset = FlutterPointMake(0.0, 0.0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[0], layer);
         }
@@ -1072,12 +1357,26 @@ TEST_F(EmbedderTest,
           backing_store.did_update = true;
           backing_store.open_gl.type = kFlutterOpenGLTargetTypeTexture;
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(30, 720, 180, 770),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(600.0, 800.0);
           layer.offset = FlutterPointMake(0.0, 0.0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[2], layer);
         }
@@ -1105,12 +1404,26 @@ TEST_F(EmbedderTest,
           backing_store.did_update = true;
           backing_store.open_gl.type = kFlutterOpenGLTargetTypeTexture;
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(50, 700, 200, 750),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(600.0, 800.0);
           layer.offset = FlutterPointMake(0.0, 0.0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[4], layer);
         }
@@ -1377,7 +1690,8 @@ TEST_P(EmbedderTestMultiBackend,
   builder.SetRenderTargetType(GetRenderTargetFromBackend(backend, true));
 
   context.GetCompositor().SetNextPresentCallback(
-      [&](const FlutterLayer** layers, size_t layers_count) {
+      [&](FlutterViewId view_id, const FlutterLayer** layers,
+          size_t layers_count) {
         ASSERT_EQ(layers_count, 3u);
 
         // Layer Root
@@ -1386,12 +1700,26 @@ TEST_P(EmbedderTestMultiBackend,
           backing_store.did_update = true;
           ConfigureBackingStore(backing_store, backend, true);
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(0, 0, 800, 600),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(800.0, 600.0);
           layer.offset = FlutterPointMake(0.0, 0.0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[0], layer);
         }
@@ -1418,12 +1746,26 @@ TEST_P(EmbedderTestMultiBackend,
           backing_store.did_update = true;
           ConfigureBackingStore(backing_store, backend, true);
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(0, 0, 800, 600),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(800.0, 600.0);
           layer.offset = FlutterPointMake(0.0, 0.0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[2], layer);
         }
@@ -1489,7 +1831,8 @@ TEST_F(EmbedderTest, CanRenderGradientWithCompositorOnNonRootLayerWithXform) {
       EmbedderTestBackingStoreProducer::RenderTargetType::kOpenGLFramebuffer);
 
   context.GetCompositor().SetNextPresentCallback(
-      [&](const FlutterLayer** layers, size_t layers_count) {
+      [&](FlutterViewId view_id, const FlutterLayer** layers,
+          size_t layers_count) {
         ASSERT_EQ(layers_count, 3u);
 
         // Layer Root
@@ -1499,12 +1842,26 @@ TEST_F(EmbedderTest, CanRenderGradientWithCompositorOnNonRootLayerWithXform) {
           backing_store.did_update = true;
           backing_store.open_gl.type = kFlutterOpenGLTargetTypeFramebuffer;
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(0, 0, 600, 800),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(600.0, 800.0);
           layer.offset = FlutterPointMake(0.0, 0.0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[0], layer);
         }
@@ -1532,12 +1889,26 @@ TEST_F(EmbedderTest, CanRenderGradientWithCompositorOnNonRootLayerWithXform) {
           backing_store.did_update = true;
           backing_store.open_gl.type = kFlutterOpenGLTargetTypeFramebuffer;
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(0, 0, 600, 800),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(600.0, 800.0);
           layer.offset = FlutterPointMake(0.0, 0.0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[2], layer);
         }
@@ -1616,7 +1987,8 @@ TEST_F(EmbedderTest, VerifyB141980393) {
   fml::AutoResetWaitableEvent latch;
 
   context.GetCompositor().SetNextPresentCallback(
-      [&](const FlutterLayer** layers, size_t layers_count) {
+      [&](FlutterViewId view_id, const FlutterLayer** layers,
+          size_t layers_count) {
         ASSERT_EQ(layers_count, 1u);
 
         // Layer Root
@@ -1833,7 +2205,8 @@ TEST_P(EmbedderTestMultiBackend,
   auto rendered_scene = context.GetNextSceneImage();
 
   context.GetCompositor().SetNextPresentCallback(
-      [&](const FlutterLayer** layers, size_t layers_count) {
+      [&](FlutterViewId view_id, const FlutterLayer** layers,
+          size_t layers_count) {
         ASSERT_EQ(layers_count, 3u);
 
         // Layer 0 (Root)
@@ -1842,12 +2215,26 @@ TEST_P(EmbedderTestMultiBackend,
           backing_store.did_update = true;
           ConfigureBackingStore(backing_store, backend, false);
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(0, 0, 800, 600),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(800.0, 600.0);
           layer.offset = FlutterPointMake(0.0, 0.0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[0], layer);
         }
@@ -1874,12 +2261,26 @@ TEST_P(EmbedderTestMultiBackend,
           backing_store.did_update = true;
           ConfigureBackingStore(backing_store, backend, false);
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(0, 0, 800, 600),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(800.0, 600.0);
           layer.offset = FlutterPointMake(0.0, 0.0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[2], layer);
         }
@@ -1927,7 +2328,8 @@ TEST_F(
   fml::CountDownLatch latch(1);
 
   context.GetCompositor().SetNextPresentCallback(
-      [&](const FlutterLayer** layers, size_t layers_count) {
+      [&](FlutterViewId view_id, const FlutterLayer** layers,
+          size_t layers_count) {
         ASSERT_EQ(layers_count, 3u);
 
         // Layer 0 (Root)
@@ -1937,12 +2339,26 @@ TEST_F(
           backing_store.did_update = true;
           backing_store.open_gl.type = kFlutterOpenGLTargetTypeTexture;
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(0, 0, 600, 800),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(600.0, 800.0);
           layer.offset = FlutterPointMake(0.0, 0.0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[0], layer);
         }
@@ -1970,12 +2386,26 @@ TEST_F(
           backing_store.did_update = true;
           backing_store.open_gl.type = kFlutterOpenGLTargetTypeTexture;
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(0, 0, 600, 800),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(600.0, 800.0);
           layer.offset = FlutterPointMake(0.0, 0.0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[2], layer);
         }
@@ -2097,7 +2527,8 @@ TEST_P(EmbedderTestMultiBackend, PlatformViewMutatorsAreValid) {
 
   fml::CountDownLatch latch(1);
   context.GetCompositor().SetNextPresentCallback(
-      [&](const FlutterLayer** layers, size_t layers_count) {
+      [&](FlutterViewId view_id, const FlutterLayer** layers,
+          size_t layers_count) {
         ASSERT_EQ(layers_count, 2u);
 
         // Layer 0 (Root)
@@ -2106,12 +2537,26 @@ TEST_P(EmbedderTestMultiBackend, PlatformViewMutatorsAreValid) {
           backing_store.did_update = true;
           ConfigureBackingStore(backing_store, backend, false);
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(0, 0, 800, 600),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(800.0, 600.0);
           layer.offset = FlutterPointMake(0.0, 0.0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[0], layer);
         }
@@ -2192,7 +2637,8 @@ TEST_F(EmbedderTest, PlatformViewMutatorsAreValidWithPixelRatio) {
 
   fml::CountDownLatch latch(1);
   context.GetCompositor().SetNextPresentCallback(
-      [&](const FlutterLayer** layers, size_t layers_count) {
+      [&](FlutterViewId view_id, const FlutterLayer** layers,
+          size_t layers_count) {
         ASSERT_EQ(layers_count, 2u);
 
         // Layer 0 (Root)
@@ -2202,12 +2648,26 @@ TEST_F(EmbedderTest, PlatformViewMutatorsAreValidWithPixelRatio) {
           backing_store.did_update = true;
           backing_store.open_gl.type = kFlutterOpenGLTargetTypeTexture;
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(0, 0, 800, 600),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(800.0, 600.0);
           layer.offset = FlutterPointMake(0.0, 0.0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[0], layer);
         }
@@ -2294,7 +2754,8 @@ TEST_F(EmbedderTest,
 
   fml::CountDownLatch latch(1);
   context.GetCompositor().SetNextPresentCallback(
-      [&](const FlutterLayer** layers, size_t layers_count) {
+      [&](FlutterViewId view_id, const FlutterLayer** layers,
+          size_t layers_count) {
         ASSERT_EQ(layers_count, 2u);
 
         // Layer 0 (Root)
@@ -2304,12 +2765,26 @@ TEST_F(EmbedderTest,
           backing_store.did_update = true;
           backing_store.open_gl.type = kFlutterOpenGLTargetTypeTexture;
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(0, 0, 600, 800),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(600.0, 800.0);
           layer.offset = FlutterPointMake(0.0, 0.0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[0], layer);
         }
@@ -2485,7 +2960,8 @@ TEST_F(EmbedderTest, ClipsAreCorrectlyCalculated) {
 
   fml::AutoResetWaitableEvent latch;
   context.GetCompositor().SetNextPresentCallback(
-      [&](const FlutterLayer** layers, size_t layers_count) {
+      [&](FlutterViewId view_id, const FlutterLayer** layers,
+          size_t layers_count) {
         ASSERT_EQ(layers_count, 2u);
 
         {
@@ -2564,7 +3040,8 @@ TEST_F(EmbedderTest, ComplexClipsAreCorrectlyCalculated) {
 
   fml::AutoResetWaitableEvent latch;
   context.GetCompositor().SetNextPresentCallback(
-      [&](const FlutterLayer** layers, size_t layers_count) {
+      [&](FlutterViewId view_id, const FlutterLayer** layers,
+          size_t layers_count) {
         ASSERT_EQ(layers_count, 2u);
 
         {
@@ -2843,7 +3320,8 @@ TEST_F(EmbedderTest, CompositorCanPostZeroLayersForPresentation) {
   fml::AutoResetWaitableEvent latch;
 
   context.GetCompositor().SetNextPresentCallback(
-      [&](const FlutterLayer** layers, size_t layers_count) {
+      [&](FlutterViewId view_id, const FlutterLayer** layers,
+          size_t layers_count) {
         ASSERT_EQ(layers_count, 0u);
         latch.Signal();
       });
@@ -2876,7 +3354,8 @@ TEST_F(EmbedderTest, CompositorCanPostOnlyPlatformViews) {
   fml::AutoResetWaitableEvent latch;
 
   context.GetCompositor().SetNextPresentCallback(
-      [&](const FlutterLayer** layers, size_t layers_count) {
+      [&](FlutterViewId view_id, const FlutterLayer** layers,
+          size_t layers_count) {
         ASSERT_EQ(layers_count, 2u);
 
         // Layer 0
@@ -2944,7 +3423,8 @@ TEST_F(EmbedderTest, CompositorRenderTargetsAreRecycled) {
                             }));
 
   context.GetCompositor().SetNextPresentCallback(
-      [&](const FlutterLayer** layers, size_t layers_count) {
+      [&](FlutterViewId view_id, const FlutterLayer** layers,
+          size_t layers_count) {
         ASSERT_EQ(layers_count, 20u);
         latch.CountDown();
       });
@@ -2977,7 +3457,7 @@ TEST_F(EmbedderTest, CompositorRenderTargetsAreInStableOrder) {
   EmbedderConfigBuilder builder(context);
   builder.SetOpenGLRendererConfig(SkISize::Make(300, 200));
   builder.SetCompositor();
-  builder.SetDartEntrypoint("render_targets_are_recycled");
+  builder.SetDartEntrypoint("render_targets_are_in_stable_order");
   builder.SetRenderTargetType(
       EmbedderTestBackingStoreProducer::RenderTargetType::kOpenGLTexture);
 
@@ -2991,7 +3471,8 @@ TEST_F(EmbedderTest, CompositorRenderTargetsAreInStableOrder) {
   size_t frame_count = 0;
   std::vector<void*> first_frame_backing_store_user_data;
   context.GetCompositor().SetPresentCallback(
-      [&](const FlutterLayer** layers, size_t layers_count) {
+      [&](FlutterViewId view_id, const FlutterLayer** layers,
+          size_t layers_count) {
         ASSERT_EQ(layers_count, 20u);
 
         if (first_frame_backing_store_user_data.empty()) {
@@ -3220,7 +3701,7 @@ TEST_F(EmbedderTest,
 
   EmbedderConfigBuilder builder(context);
   builder.SetOpenGLRendererConfig(SkISize::Make(800, 600));
-  builder.SetDartEntrypoint("render_gradient");
+  builder.SetDartEntrypoint("render_gradient_retained");
   builder.GetRendererConfig().open_gl.populate_existing_damage =
       [](void* context, const intptr_t id,
          FlutterDamage* existing_damage) -> void {
@@ -3233,7 +3714,8 @@ TEST_F(EmbedderTest,
       .SetGLPopulateExistingDamageCallback(
           [](const intptr_t id, FlutterDamage* existing_damage_ptr) {
             const size_t num_rects = 1;
-            FlutterRect existing_damage_rects[num_rects] = {
+            // The array must be valid after the callback returns.
+            static FlutterRect existing_damage_rects[num_rects] = {
                 FlutterRect{0, 0, 800, 600}};
             existing_damage_ptr->num_rects = num_rects;
             existing_damage_ptr->damage = existing_damage_rects;
@@ -3242,9 +3724,11 @@ TEST_F(EmbedderTest,
   auto engine = builder.LaunchEngine();
   ASSERT_TRUE(engine.is_valid());
 
+  fml::AutoResetWaitableEvent latch;
+
   // First frame should be entirely rerendered.
   static_cast<EmbedderTestContextGL&>(context).SetGLPresentCallback(
-      [](FlutterPresentInfo present_info) {
+      [&](FlutterPresentInfo present_info) {
         const size_t num_rects = 1;
         ASSERT_EQ(present_info.frame_damage.num_rects, num_rects);
         ASSERT_EQ(present_info.frame_damage.damage->left, 0);
@@ -3257,6 +3741,8 @@ TEST_F(EmbedderTest,
         ASSERT_EQ(present_info.buffer_damage.damage->top, 0);
         ASSERT_EQ(present_info.buffer_damage.damage->right, 800);
         ASSERT_EQ(present_info.buffer_damage.damage->bottom, 600);
+
+        latch.Signal();
       });
 
   // Send a window metrics events so frames may be scheduled.
@@ -3267,12 +3753,13 @@ TEST_F(EmbedderTest,
   event.pixel_ratio = 1.0;
   ASSERT_EQ(FlutterEngineSendWindowMetricsEvent(engine.get(), &event),
             kSuccess);
+  latch.Wait();
 
   // Because it's the same as the first frame, the second frame damage should
   // be empty but, because there was a full existing buffer damage, the buffer
   // damage should be the entire screen.
   static_cast<EmbedderTestContextGL&>(context).SetGLPresentCallback(
-      [](FlutterPresentInfo present_info) {
+      [&](FlutterPresentInfo present_info) {
         const size_t num_rects = 1;
         ASSERT_EQ(present_info.frame_damage.num_rects, num_rects);
         ASSERT_EQ(present_info.frame_damage.damage->left, 0);
@@ -3285,10 +3772,13 @@ TEST_F(EmbedderTest,
         ASSERT_EQ(present_info.buffer_damage.damage->top, 0);
         ASSERT_EQ(present_info.buffer_damage.damage->right, 800);
         ASSERT_EQ(present_info.buffer_damage.damage->bottom, 600);
+
+        latch.Signal();
       });
 
   ASSERT_EQ(FlutterEngineSendWindowMetricsEvent(engine.get(), &event),
             kSuccess);
+  latch.Wait();
 }
 
 TEST_F(EmbedderTest, PresentInfoReceivesEmptyDamage) {
@@ -3296,7 +3786,7 @@ TEST_F(EmbedderTest, PresentInfoReceivesEmptyDamage) {
 
   EmbedderConfigBuilder builder(context);
   builder.SetOpenGLRendererConfig(SkISize::Make(800, 600));
-  builder.SetDartEntrypoint("render_gradient");
+  builder.SetDartEntrypoint("render_gradient_retained");
   builder.GetRendererConfig().open_gl.populate_existing_damage =
       [](void* context, const intptr_t id,
          FlutterDamage* existing_damage) -> void {
@@ -3309,7 +3799,8 @@ TEST_F(EmbedderTest, PresentInfoReceivesEmptyDamage) {
       .SetGLPopulateExistingDamageCallback(
           [](const intptr_t id, FlutterDamage* existing_damage_ptr) {
             const size_t num_rects = 1;
-            FlutterRect existing_damage_rects[num_rects] = {
+            // The array must be valid after the callback returns.
+            static FlutterRect existing_damage_rects[num_rects] = {
                 FlutterRect{0, 0, 0, 0}};
             existing_damage_ptr->num_rects = num_rects;
             existing_damage_ptr->damage = existing_damage_rects;
@@ -3318,9 +3809,11 @@ TEST_F(EmbedderTest, PresentInfoReceivesEmptyDamage) {
   auto engine = builder.LaunchEngine();
   ASSERT_TRUE(engine.is_valid());
 
+  fml::AutoResetWaitableEvent latch;
+
   // First frame should be entirely rerendered.
   static_cast<EmbedderTestContextGL&>(context).SetGLPresentCallback(
-      [](FlutterPresentInfo present_info) {
+      [&](FlutterPresentInfo present_info) {
         const size_t num_rects = 1;
         ASSERT_EQ(present_info.frame_damage.num_rects, num_rects);
         ASSERT_EQ(present_info.frame_damage.damage->left, 0);
@@ -3333,6 +3826,8 @@ TEST_F(EmbedderTest, PresentInfoReceivesEmptyDamage) {
         ASSERT_EQ(present_info.buffer_damage.damage->top, 0);
         ASSERT_EQ(present_info.buffer_damage.damage->right, 800);
         ASSERT_EQ(present_info.buffer_damage.damage->bottom, 600);
+
+        latch.Signal();
       });
 
   // Send a window metrics events so frames may be scheduled.
@@ -3343,11 +3838,12 @@ TEST_F(EmbedderTest, PresentInfoReceivesEmptyDamage) {
   event.pixel_ratio = 1.0;
   ASSERT_EQ(FlutterEngineSendWindowMetricsEvent(engine.get(), &event),
             kSuccess);
+  latch.Wait();
 
   // Because it's the same as the first frame, the second frame should not be
   // rerendered assuming there is no existing damage.
   static_cast<EmbedderTestContextGL&>(context).SetGLPresentCallback(
-      [](FlutterPresentInfo present_info) {
+      [&](FlutterPresentInfo present_info) {
         const size_t num_rects = 1;
         ASSERT_EQ(present_info.frame_damage.num_rects, num_rects);
         ASSERT_EQ(present_info.frame_damage.damage->left, 0);
@@ -3360,10 +3856,13 @@ TEST_F(EmbedderTest, PresentInfoReceivesEmptyDamage) {
         ASSERT_EQ(present_info.buffer_damage.damage->top, 0);
         ASSERT_EQ(present_info.buffer_damage.damage->right, 0);
         ASSERT_EQ(present_info.buffer_damage.damage->bottom, 0);
+
+        latch.Signal();
       });
 
   ASSERT_EQ(FlutterEngineSendWindowMetricsEvent(engine.get(), &event),
             kSuccess);
+  latch.Wait();
 }
 
 TEST_F(EmbedderTest, PresentInfoReceivesPartialDamage) {
@@ -3371,7 +3870,7 @@ TEST_F(EmbedderTest, PresentInfoReceivesPartialDamage) {
 
   EmbedderConfigBuilder builder(context);
   builder.SetOpenGLRendererConfig(SkISize::Make(800, 600));
-  builder.SetDartEntrypoint("render_gradient");
+  builder.SetDartEntrypoint("render_gradient_retained");
   builder.GetRendererConfig().open_gl.populate_existing_damage =
       [](void* context, const intptr_t id,
          FlutterDamage* existing_damage) -> void {
@@ -3382,9 +3881,10 @@ TEST_F(EmbedderTest, PresentInfoReceivesPartialDamage) {
   // Return existing damage as only part of the screen on purpose.
   static_cast<EmbedderTestContextGL&>(context)
       .SetGLPopulateExistingDamageCallback(
-          [](const intptr_t id, FlutterDamage* existing_damage_ptr) {
+          [&](const intptr_t id, FlutterDamage* existing_damage_ptr) {
             const size_t num_rects = 1;
-            FlutterRect existing_damage_rects[num_rects] = {
+            // The array must be valid after the callback returns.
+            static FlutterRect existing_damage_rects[num_rects] = {
                 FlutterRect{200, 150, 400, 300}};
             existing_damage_ptr->num_rects = num_rects;
             existing_damage_ptr->damage = existing_damage_rects;
@@ -3393,9 +3893,11 @@ TEST_F(EmbedderTest, PresentInfoReceivesPartialDamage) {
   auto engine = builder.LaunchEngine();
   ASSERT_TRUE(engine.is_valid());
 
+  fml::AutoResetWaitableEvent latch;
+
   // First frame should be entirely rerendered.
   static_cast<EmbedderTestContextGL&>(context).SetGLPresentCallback(
-      [](FlutterPresentInfo present_info) {
+      [&](FlutterPresentInfo present_info) {
         const size_t num_rects = 1;
         ASSERT_EQ(present_info.frame_damage.num_rects, num_rects);
         ASSERT_EQ(present_info.frame_damage.damage->left, 0);
@@ -3408,6 +3910,8 @@ TEST_F(EmbedderTest, PresentInfoReceivesPartialDamage) {
         ASSERT_EQ(present_info.buffer_damage.damage->top, 0);
         ASSERT_EQ(present_info.buffer_damage.damage->right, 800);
         ASSERT_EQ(present_info.buffer_damage.damage->bottom, 600);
+
+        latch.Signal();
       });
 
   // Send a window metrics events so frames may be scheduled.
@@ -3418,12 +3922,13 @@ TEST_F(EmbedderTest, PresentInfoReceivesPartialDamage) {
   event.pixel_ratio = 1.0;
   ASSERT_EQ(FlutterEngineSendWindowMetricsEvent(engine.get(), &event),
             kSuccess);
+  latch.Wait();
 
   // Because it's the same as the first frame, the second frame damage should be
   // empty but, because there was a partial existing damage, the buffer damage
   // should represent that partial damage area.
   static_cast<EmbedderTestContextGL&>(context).SetGLPresentCallback(
-      [](FlutterPresentInfo present_info) {
+      [&](FlutterPresentInfo present_info) {
         const size_t num_rects = 1;
         ASSERT_EQ(present_info.frame_damage.num_rects, num_rects);
         ASSERT_EQ(present_info.frame_damage.damage->left, 0);
@@ -3436,10 +3941,13 @@ TEST_F(EmbedderTest, PresentInfoReceivesPartialDamage) {
         ASSERT_EQ(present_info.buffer_damage.damage->top, 150);
         ASSERT_EQ(present_info.buffer_damage.damage->right, 400);
         ASSERT_EQ(present_info.buffer_damage.damage->bottom, 300);
+
+        latch.Signal();
       });
 
   ASSERT_EQ(FlutterEngineSendWindowMetricsEvent(engine.get(), &event),
             kSuccess);
+  latch.Wait();
 }
 
 TEST_F(EmbedderTest, PopulateExistingDamageReceivesValidID) {
@@ -3447,7 +3955,7 @@ TEST_F(EmbedderTest, PopulateExistingDamageReceivesValidID) {
 
   EmbedderConfigBuilder builder(context);
   builder.SetOpenGLRendererConfig(SkISize::Make(800, 600));
-  builder.SetDartEntrypoint("render_gradient");
+  builder.SetDartEntrypoint("render_gradient_retained");
   builder.GetRendererConfig().open_gl.populate_existing_damage =
       [](void* context, const intptr_t id,
          FlutterDamage* existing_damage) -> void {
@@ -3465,6 +3973,8 @@ TEST_F(EmbedderTest, PopulateExistingDamageReceivesValidID) {
           [window_fbo_id = window_fbo_id](intptr_t id,
                                           FlutterDamage* existing_damage) {
             ASSERT_EQ(id, window_fbo_id);
+            existing_damage->num_rects = 0;
+            existing_damage->damage = nullptr;
           });
 
   // Send a window metrics events so frames may be scheduled.
@@ -3482,7 +3992,7 @@ TEST_F(EmbedderTest, PopulateExistingDamageReceivesInvalidID) {
 
   EmbedderConfigBuilder builder(context);
   builder.SetOpenGLRendererConfig(SkISize::Make(800, 600));
-  builder.SetDartEntrypoint("render_gradient");
+  builder.SetDartEntrypoint("render_gradient_retained");
   builder.GetRendererConfig().open_gl.populate_existing_damage =
       [](void* context, const intptr_t id,
          FlutterDamage* existing_damage) -> void {
@@ -3511,6 +4021,8 @@ TEST_F(EmbedderTest, PopulateExistingDamageReceivesInvalidID) {
           [window_fbo_id = window_fbo_id](intptr_t id,
                                           FlutterDamage* existing_damage) {
             ASSERT_NE(id, window_fbo_id);
+            existing_damage->num_rects = 0;
+            existing_damage->damage = nullptr;
           });
 
   // Send a window metrics events so frames may be scheduled.
@@ -3769,7 +4281,8 @@ TEST_F(EmbedderTest, CompositorRenderTargetsNotRecycledWhenAvoidsCacheSet) {
                             }));
 
   context.GetCompositor().SetPresentCallback(
-      [&](const FlutterLayer** layers, size_t layers_count) {
+      [&](FlutterViewId view_id, const FlutterLayer** layers,
+          size_t layers_count) {
         ASSERT_EQ(layers_count, 20u);
         latch.CountDown();
       },
@@ -3879,7 +4392,7 @@ TEST_F(EmbedderTest, ObjectsPostedViaPortsServicedOnSecondaryTaskHeap) {
     trampoline = [&](Dart_Handle handle) {
       ASSERT_TRUE(tonic::DartConverter<bool>::FromDart(handle));
       auto task_grade = fml::MessageLoopTaskQueues::GetCurrentTaskSourceGrade();
-      EXPECT_EQ(task_grade, fml::TaskSourceGrade::kDartMicroTasks);
+      EXPECT_EQ(task_grade, fml::TaskSourceGrade::kDartEventLoop);
       event.Signal();
     };
     ASSERT_EQ(FlutterEnginePostDartObject(engine.get(), port, &object),
@@ -4018,11 +4531,15 @@ TEST_F(EmbedderTest, ExternalTextureGLRefreshedTooOften) {
   TestGLSurface surface(SkISize::Make(100, 100));
   auto context = surface.GetGrContext();
 
-  typedef void (*glGenTexturesProc)(uint32_t n, uint32_t * textures);
+  typedef void (*glGenTexturesProc)(uint32_t n, uint32_t* textures);
+  typedef void (*glFinishProc)();
+
   glGenTexturesProc glGenTextures;
+  glFinishProc glFinish;
 
   glGenTextures = reinterpret_cast<glGenTexturesProc>(
       surface.GetProcAddress("glGenTextures"));
+  glFinish = reinterpret_cast<glFinishProc>(surface.GetProcAddress("glFinish"));
 
   uint32_t name;
   glGenTextures(1, &name);
@@ -4033,9 +4550,9 @@ TEST_F(EmbedderTest, ExternalTextureGLRefreshedTooOften) {
       [&](int64_t, size_t, size_t) {
         resolve_called = true;
         auto res = std::make_unique<FlutterOpenGLTexture>();
-        res->target = GR_GL_TEXTURE_2D;
+        res->target = GL_TEXTURE_2D;
         res->name = name;
-        res->format = GR_GL_RGBA8;
+        res->format = GL_RGBA8;
         res->user_data = nullptr;
         res->destruction_callback = [](void*) {};
         res->width = res->height = 100;
@@ -4044,49 +4561,230 @@ TEST_F(EmbedderTest, ExternalTextureGLRefreshedTooOften) {
   EmbedderExternalTextureGL texture(1, callback);
 
   auto skia_surface = surface.GetOnscreenSurface();
-  auto canvas = skia_surface->getCanvas();
+  DlSkCanvasAdapter canvas(skia_surface->getCanvas());
 
   Texture* texture_ = &texture;
   Texture::PaintContext ctx{
-      .canvas = canvas,
+      .canvas = &canvas,
       .gr_context = context.get(),
   };
   texture_->Paint(ctx, SkRect::MakeXYWH(0, 0, 100, 100), false,
-                  SkSamplingOptions(SkFilterMode::kLinear));
+                  DlImageSampling::kLinear);
 
   EXPECT_TRUE(resolve_called);
   resolve_called = false;
 
   texture_->Paint(ctx, SkRect::MakeXYWH(0, 0, 100, 100), false,
-                  SkSamplingOptions(SkFilterMode::kLinear));
+                  DlImageSampling::kLinear);
 
   EXPECT_FALSE(resolve_called);
 
   texture_->MarkNewFrameAvailable();
   texture_->Paint(ctx, SkRect::MakeXYWH(0, 0, 100, 100), false,
-                  SkSamplingOptions(SkFilterMode::kLinear));
+                  DlImageSampling::kLinear);
 
   EXPECT_TRUE(resolve_called);
+
+  glFinish();
 }
 
-TEST_F(EmbedderTest,
-       PresentInfoReceivesNoDamageWhenPopulateExistingDamageIsUndefined) {
+TEST_F(
+    EmbedderTest,
+    PresentInfoReceivesFullScreenDamageWhenPopulateExistingDamageIsNotProvided) {
   auto& context = GetEmbedderContext(EmbedderTestContextType::kOpenGLContext);
 
   EmbedderConfigBuilder builder(context);
   builder.SetOpenGLRendererConfig(SkISize::Make(800, 600));
-  builder.SetDartEntrypoint("render_gradient");
+  builder.SetDartEntrypoint("render_gradient_retained");
   builder.GetRendererConfig().open_gl.populate_existing_damage = nullptr;
 
   auto engine = builder.LaunchEngine();
   ASSERT_TRUE(engine.is_valid());
 
-  // No damage should be passed.
+  fml::AutoResetWaitableEvent latch;
+
+  // First frame should be entirely rerendered.
+  static_cast<EmbedderTestContextGL&>(context).SetGLPresentCallback(
+      [&](FlutterPresentInfo present_info) {
+        const size_t num_rects = 1;
+        ASSERT_EQ(present_info.frame_damage.num_rects, num_rects);
+        ASSERT_EQ(present_info.frame_damage.damage->left, 0);
+        ASSERT_EQ(present_info.frame_damage.damage->top, 0);
+        ASSERT_EQ(present_info.frame_damage.damage->right, 800);
+        ASSERT_EQ(present_info.frame_damage.damage->bottom, 600);
+
+        ASSERT_EQ(present_info.buffer_damage.num_rects, num_rects);
+        ASSERT_EQ(present_info.buffer_damage.damage->left, 0);
+        ASSERT_EQ(present_info.buffer_damage.damage->top, 0);
+        ASSERT_EQ(present_info.buffer_damage.damage->right, 800);
+        ASSERT_EQ(present_info.buffer_damage.damage->bottom, 600);
+
+        latch.Signal();
+      });
+
+  // Send a window metrics events so frames may be scheduled.
+  FlutterWindowMetricsEvent event = {};
+  event.struct_size = sizeof(event);
+  event.width = 800;
+  event.height = 600;
+  event.pixel_ratio = 1.0;
+  ASSERT_EQ(FlutterEngineSendWindowMetricsEvent(engine.get(), &event),
+            kSuccess);
+  latch.Wait();
+
+  // Since populate_existing_damage is not provided, the partial repaint
+  // functionality is actually disabled. So, the next frame should be entirely
+  // new frame.
+  static_cast<EmbedderTestContextGL&>(context).SetGLPresentCallback(
+      [&](FlutterPresentInfo present_info) {
+        const size_t num_rects = 1;
+        ASSERT_EQ(present_info.frame_damage.num_rects, num_rects);
+        ASSERT_EQ(present_info.frame_damage.damage->left, 0);
+        ASSERT_EQ(present_info.frame_damage.damage->top, 0);
+        ASSERT_EQ(present_info.frame_damage.damage->right, 800);
+        ASSERT_EQ(present_info.frame_damage.damage->bottom, 600);
+
+        ASSERT_EQ(present_info.buffer_damage.num_rects, num_rects);
+        ASSERT_EQ(present_info.buffer_damage.damage->left, 0);
+        ASSERT_EQ(present_info.buffer_damage.damage->top, 0);
+        ASSERT_EQ(present_info.buffer_damage.damage->right, 800);
+        ASSERT_EQ(present_info.buffer_damage.damage->bottom, 600);
+
+        latch.Signal();
+      });
+
+  ASSERT_EQ(FlutterEngineSendWindowMetricsEvent(engine.get(), &event),
+            kSuccess);
+  latch.Wait();
+}
+
+TEST_F(EmbedderTest,
+       PresentInfoReceivesJoinedDamageWhenExistingDamageContainsMultipleRects) {
+  auto& context = GetEmbedderContext(EmbedderTestContextType::kOpenGLContext);
+
+  EmbedderConfigBuilder builder(context);
+  builder.SetOpenGLRendererConfig(SkISize::Make(800, 600));
+  builder.SetDartEntrypoint("render_gradient_retained");
+  builder.GetRendererConfig().open_gl.populate_existing_damage =
+      [](void* context, const intptr_t id,
+         FlutterDamage* existing_damage) -> void {
+    return reinterpret_cast<EmbedderTestContextGL*>(context)
+        ->GLPopulateExistingDamage(id, existing_damage);
+  };
+
+  // Return existing damage as the entire screen on purpose.
+  static_cast<EmbedderTestContextGL&>(context)
+      .SetGLPopulateExistingDamageCallback(
+          [](const intptr_t id, FlutterDamage* existing_damage_ptr) {
+            const size_t num_rects = 2;
+            // The array must be valid after the callback returns.
+            static FlutterRect existing_damage_rects[num_rects] = {
+                FlutterRect{100, 150, 200, 250},
+                FlutterRect{200, 250, 300, 350},
+            };
+            existing_damage_ptr->num_rects = num_rects;
+            existing_damage_ptr->damage = existing_damage_rects;
+          });
+
+  auto engine = builder.LaunchEngine();
+  ASSERT_TRUE(engine.is_valid());
+
+  fml::AutoResetWaitableEvent latch;
+
+  // First frame should be entirely rerendered.
   static_cast<EmbedderTestContextGL&>(context).SetGLPresentCallback(
-      [](FlutterPresentInfo present_info) {
-        ASSERT_EQ(present_info.frame_damage.damage, nullptr);
-        ASSERT_EQ(present_info.buffer_damage.damage, nullptr);
+      [&](FlutterPresentInfo present_info) {
+        const size_t num_rects = 1;
+        ASSERT_EQ(present_info.frame_damage.num_rects, num_rects);
+        ASSERT_EQ(present_info.frame_damage.damage->left, 0);
+        ASSERT_EQ(present_info.frame_damage.damage->top, 0);
+        ASSERT_EQ(present_info.frame_damage.damage->right, 800);
+        ASSERT_EQ(present_info.frame_damage.damage->bottom, 600);
+
+        ASSERT_EQ(present_info.buffer_damage.num_rects, num_rects);
+        ASSERT_EQ(present_info.buffer_damage.damage->left, 0);
+        ASSERT_EQ(present_info.buffer_damage.damage->top, 0);
+        ASSERT_EQ(present_info.buffer_damage.damage->right, 800);
+        ASSERT_EQ(present_info.buffer_damage.damage->bottom, 600);
+
+        latch.Signal();
       });
+
+  // Send a window metrics events so frames may be scheduled.
+  FlutterWindowMetricsEvent event = {};
+  event.struct_size = sizeof(event);
+  event.width = 800;
+  event.height = 600;
+  event.pixel_ratio = 1.0;
+  ASSERT_EQ(FlutterEngineSendWindowMetricsEvent(engine.get(), &event),
+            kSuccess);
+  latch.Wait();
+
+  // Because it's the same as the first frame, the second frame damage should
+  // be empty but, because there was a full existing buffer damage, the buffer
+  // damage should be the entire screen.
+  static_cast<EmbedderTestContextGL&>(context).SetGLPresentCallback(
+      [&](FlutterPresentInfo present_info) {
+        const size_t num_rects = 1;
+        ASSERT_EQ(present_info.frame_damage.num_rects, num_rects);
+        ASSERT_EQ(present_info.frame_damage.damage->left, 0);
+        ASSERT_EQ(present_info.frame_damage.damage->top, 0);
+        ASSERT_EQ(present_info.frame_damage.damage->right, 0);
+        ASSERT_EQ(present_info.frame_damage.damage->bottom, 0);
+
+        ASSERT_EQ(present_info.buffer_damage.num_rects, num_rects);
+        ASSERT_EQ(present_info.buffer_damage.damage->left, 100);
+        ASSERT_EQ(present_info.buffer_damage.damage->top, 150);
+        ASSERT_EQ(present_info.buffer_damage.damage->right, 300);
+        ASSERT_EQ(present_info.buffer_damage.damage->bottom, 350);
+
+        latch.Signal();
+      });
+
+  ASSERT_EQ(FlutterEngineSendWindowMetricsEvent(engine.get(), &event),
+            kSuccess);
+  latch.Wait();
+}
+
+TEST_F(EmbedderTest, CanRenderWithImpellerOpenGL) {
+  auto& context = GetEmbedderContext(EmbedderTestContextType::kOpenGLContext);
+  EmbedderConfigBuilder builder(context);
+
+  bool present_called = false;
+  static_cast<EmbedderTestContextGL&>(context).SetGLPresentCallback(
+      [&present_called](FlutterPresentInfo present_info) {
+        present_called = true;
+      });
+
+  builder.AddCommandLineArgument("--enable-impeller");
+  builder.SetDartEntrypoint("render_impeller_gl_test");
+  builder.SetOpenGLRendererConfig(SkISize::Make(800, 600));
+  builder.SetCompositor();
+  builder.SetRenderTargetType(
+      EmbedderTestBackingStoreProducer::RenderTargetType::kOpenGLFramebuffer);
+
+  auto rendered_scene = context.GetNextSceneImage();
+
+  auto engine = builder.LaunchEngine();
+  ASSERT_TRUE(engine.is_valid());
+
+  // Send a window metrics events so frames may be scheduled.
+  FlutterWindowMetricsEvent event = {};
+  event.struct_size = sizeof(event);
+  event.width = 800;
+  event.height = 600;
+  event.pixel_ratio = 1.0;
+  ASSERT_EQ(FlutterEngineSendWindowMetricsEvent(engine.get(), &event),
+            kSuccess);
+
+  ASSERT_TRUE(ImageMatchesFixture(
+      FixtureNameForBackend(EmbedderTestContextType::kOpenGLContext,
+                            "impeller_gl_test.png"),
+      rendered_scene));
+
+  // The scene will be rendered by the compositor, and the surface present
+  // callback should not be invoked.
+  ASSERT_FALSE(present_called);
 }
 
 INSTANTIATE_TEST_SUITE_P(
diff --git a/shell/platform/embedder/tests/embedder_unittests_metal.mm b/shell/platform/embedder/tests/embedder_metal_unittests.mm
similarity index 74%
rename from shell/platform/embedder/tests/embedder_unittests_metal.mm
rename to shell/platform/embedder/tests/embedder_metal_unittests.mm
index 296edf7b5723e237cb79ae22841fb1f3c2037511..13a9d49f552f026fbeda57e7e22e278497bd6505 100644
--- a/shell/platform/embedder/tests/embedder_unittests_metal.mm
+++ b/shell/platform/embedder/tests/embedder_metal_unittests.mm
@@ -10,6 +10,7 @@
 #import <Metal/Metal.h>
 
 #include "embedder.h"
+#include "flutter/display_list/skia/dl_sk_canvas.h"
 #include "flutter/fml/synchronization/count_down_latch.h"
 #include "flutter/shell/platform/embedder/tests/embedder_assertions.h"
 #include "flutter/shell/platform/embedder/tests/embedder_config_builder.h"
@@ -19,6 +20,11 @@
 #include "flutter/testing/assertions_skia.h"
 #include "flutter/testing/testing.h"
 
+#include "third_party/skia/include/core/SkSurface.h"
+#include "third_party/skia/include/gpu/GpuTypes.h"
+#include "third_party/skia/include/gpu/GrBackendSurface.h"
+#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
+
 // CREATE_NATIVE_ENTRY is leaky by design
 // NOLINTBEGIN(clang-analyzer-core.StackAddressEscape)
 
@@ -58,12 +64,12 @@ static sk_sp<SkSurface> GetSurfaceFromTexture(const sk_sp<GrDirectContext>& skia
                                               void* texture) {
   GrMtlTextureInfo info;
   info.fTexture.reset([(id<MTLTexture>)texture retain]);
-  GrBackendTexture backend_texture(texture_size.width(), texture_size.height(), GrMipmapped::kNo,
-                                   info);
+  GrBackendTexture backend_texture(texture_size.width(), texture_size.height(),
+                                   skgpu::Mipmapped::kNo, info);
 
-  return SkSurface::MakeFromBackendTexture(skia_context.get(), backend_texture,
-                                           kTopLeft_GrSurfaceOrigin, 1, kBGRA_8888_SkColorType,
-                                           nullptr, nullptr);
+  return SkSurfaces::WrapBackendTexture(skia_context.get(), backend_texture,
+                                        kTopLeft_GrSurfaceOrigin, 1, kBGRA_8888_SkColorType,
+                                        nullptr, nullptr);
 }
 
 TEST_F(EmbedderTest, ExternalTextureMetal) {
@@ -132,7 +138,7 @@ TEST_F(EmbedderTest, MetalCompositorMustBeAbleToRenderPlatformViews) {
 
   fml::CountDownLatch latch(3);
   context.GetCompositor().SetNextPresentCallback(
-      [&](const FlutterLayer** layers, size_t layers_count) {
+      [&](FlutterViewId view_id, const FlutterLayer** layers, size_t layers_count) {
         ASSERT_EQ(layers_count, 3u);
 
         {
@@ -141,12 +147,26 @@ TEST_F(EmbedderTest, MetalCompositorMustBeAbleToRenderPlatformViews) {
           backing_store.type = kFlutterBackingStoreTypeMetal;
           backing_store.did_update = true;
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(0, 0, 800, 600),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(800.0, 600.0);
           layer.offset = FlutterPointMake(0, 0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[0], layer);
         }
@@ -172,12 +192,26 @@ TEST_F(EmbedderTest, MetalCompositorMustBeAbleToRenderPlatformViews) {
           backing_store.type = kFlutterBackingStoreTypeMetal;
           backing_store.did_update = true;
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(2, 3, 800, 600),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(800.0, 600.0);
           layer.offset = FlutterPointMake(0.0, 0.0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[2], layer);
         }
@@ -227,6 +261,56 @@ TEST_F(EmbedderTest, CanRenderSceneWithoutCustomCompositorMetal) {
   ASSERT_TRUE(ImageMatchesFixture("scene_without_custom_compositor.png", rendered_scene));
 }
 
+TEST_F(EmbedderTest, TextureDestructionCallbackCalledWithoutCustomCompositorMetal) {
+  EmbedderTestContextMetal& context = reinterpret_cast<EmbedderTestContextMetal&>(
+      GetEmbedderContext(EmbedderTestContextType::kMetalContext));
+  EmbedderConfigBuilder builder(context);
+  builder.SetMetalRendererConfig(SkISize::Make(800, 600));
+  builder.SetDartEntrypoint("texture_destruction_callback_called_without_custom_compositor");
+
+  struct CollectContext {
+    int present_count = 0;
+    int collect_count = 0;
+    fml::AutoResetWaitableEvent latch;
+  };
+
+  auto collect_context = std::make_unique<CollectContext>();
+  context.SetNextDrawableCallback([&context, &collect_context](const FlutterFrameInfo* frame_info) {
+    auto texture_info = context.GetTestMetalSurface()->GetTextureInfo();
+
+    FlutterMetalTexture texture;
+    texture.struct_size = sizeof(FlutterMetalTexture);
+    texture.texture_id = texture_info.texture_id;
+    texture.texture = reinterpret_cast<FlutterMetalTextureHandle>(texture_info.texture);
+    texture.user_data = collect_context.get();
+    texture.destruction_callback = [](void* user_data) {
+      CollectContext* callback_collect_context = reinterpret_cast<CollectContext*>(user_data);
+      ASSERT_TRUE(callback_collect_context->present_count > 0);
+      callback_collect_context->collect_count++;
+      callback_collect_context->latch.Signal();
+    };
+    return texture;
+  });
+  context.SetPresentCallback([&context, &collect_context](int64_t texture_id) {
+    collect_context->present_count++;
+    return context.GetTestMetalContext()->Present(texture_id);
+  });
+
+  auto engine = builder.LaunchEngine();
+
+  // Send a window metrics events so frames may be scheduled.
+  FlutterWindowMetricsEvent event = {};
+  event.struct_size = sizeof(event);
+  event.width = 800;
+  event.height = 600;
+  event.pixel_ratio = 1.0;
+  ASSERT_EQ(FlutterEngineSendWindowMetricsEvent(engine.get(), &event), kSuccess);
+  ASSERT_TRUE(engine.is_valid());
+
+  collect_context->latch.Wait();
+  EXPECT_EQ(collect_context->collect_count, 1);
+}
+
 TEST_F(EmbedderTest, CompositorMustBeAbleToRenderKnownSceneMetal) {
   auto& context = GetEmbedderContext(EmbedderTestContextType::kMetalContext);
 
@@ -242,7 +326,7 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderKnownSceneMetal) {
   auto scene_image = context.GetNextSceneImage();
 
   context.GetCompositor().SetNextPresentCallback(
-      [&](const FlutterLayer** layers, size_t layers_count) {
+      [&](FlutterViewId view_id, const FlutterLayer** layers, size_t layers_count) {
         ASSERT_EQ(layers_count, 5u);
 
         // Layer Root
@@ -251,12 +335,26 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderKnownSceneMetal) {
           backing_store.type = kFlutterBackingStoreTypeMetal;
           backing_store.did_update = true;
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(0, 0, 800, 600),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(800.0, 600.0);
           layer.offset = FlutterPointMake(0.0, 0.0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[0], layer);
         }
@@ -283,12 +381,26 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderKnownSceneMetal) {
           backing_store.type = kFlutterBackingStoreTypeMetal;
           backing_store.did_update = true;
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(30, 30, 80, 180),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(800.0, 600.0);
           layer.offset = FlutterPointMake(0.0, 0.0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[2], layer);
         }
@@ -315,12 +427,26 @@ TEST_F(EmbedderTest, CompositorMustBeAbleToRenderKnownSceneMetal) {
           backing_store.type = kFlutterBackingStoreTypeMetal;
           backing_store.did_update = true;
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(50, 50, 100, 200),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(800.0, 600.0);
           layer.offset = FlutterPointMake(0.0, 0.0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[4], layer);
         }
@@ -462,28 +588,26 @@ TEST_F(EmbedderTest, ExternalTextureMetalRefreshedTooOften) {
 
   auto surface = TestMetalSurface::Create(*metal_context, SkISize::Make(100, 100));
   auto skia_surface = surface->GetSurface();
-  auto canvas = skia_surface->getCanvas();
+  DlSkCanvasAdapter canvas(skia_surface->getCanvas());
 
   Texture* texture_ = &texture;
+  DlImageSampling sampling = DlImageSampling::kLinear;
   Texture::PaintContext ctx{
-      .canvas = canvas,
+      .canvas = &canvas,
       .gr_context = surface->GetGrContext().get(),
   };
-  texture_->Paint(ctx, SkRect::MakeXYWH(0, 0, 100, 100), false,
-                  SkSamplingOptions(SkFilterMode::kLinear));
+  texture_->Paint(ctx, SkRect::MakeXYWH(0, 0, 100, 100), false, sampling);
 
   EXPECT_TRUE(resolve_called);
   resolve_called = false;
 
-  texture_->Paint(ctx, SkRect::MakeXYWH(0, 0, 100, 100), false,
-                  SkSamplingOptions(SkFilterMode::kLinear));
+  texture_->Paint(ctx, SkRect::MakeXYWH(0, 0, 100, 100), false, sampling);
 
   EXPECT_FALSE(resolve_called);
 
   texture_->MarkNewFrameAvailable();
 
-  texture_->Paint(ctx, SkRect::MakeXYWH(0, 0, 100, 100), false,
-                  SkSamplingOptions(SkFilterMode::kLinear));
+  texture_->Paint(ctx, SkRect::MakeXYWH(0, 0, 100, 100), false, sampling);
 
   EXPECT_TRUE(resolve_called);
 }
diff --git a/shell/platform/embedder/tests/embedder_test.cc b/shell/platform/embedder/tests/embedder_test.cc
index 9a315dec3c4154d26ce8d0a41183b799f06c51d8..0b557d318e1ee4c6dae4eadf775b3f37440ec944 100644
--- a/shell/platform/embedder/tests/embedder_test.cc
+++ b/shell/platform/embedder/tests/embedder_test.cc
@@ -4,7 +4,6 @@
 
 #include "flutter/shell/platform/embedder/tests/embedder_test.h"
 #include "flutter/shell/platform/embedder/tests/embedder_test_context_software.h"
-#include "flutter/shell/platform/embedder/tests/embedder_test_context_vulkan.h"
 
 #ifdef SHELL_ENABLE_GL
 #include "flutter/shell/platform/embedder/tests/embedder_test_context_gl.h"
@@ -14,6 +13,10 @@
 #include "flutter/shell/platform/embedder/tests/embedder_test_context_metal.h"
 #endif
 
+#ifdef SHELL_ENABLE_VULKAN
+#include "flutter/shell/platform/embedder/tests/embedder_test_context_vulkan.h"
+#endif
+
 namespace flutter {
 namespace testing {
 
diff --git a/shell/platform/embedder/tests/embedder_test_backingstore_producer.cc b/shell/platform/embedder/tests/embedder_test_backingstore_producer.cc
index 8511864d5fc721741c592febb5acbc870bcfc664..0c67e3dccea2de6f7b3d32325aa5faa3c001a183 100644
--- a/shell/platform/embedder/tests/embedder_test_backingstore_producer.cc
+++ b/shell/platform/embedder/tests/embedder_test_backingstore_producer.cc
@@ -11,11 +11,24 @@
 #include "third_party/skia/include/core/SkImageInfo.h"
 #include "third_party/skia/include/core/SkSize.h"
 #include "third_party/skia/include/core/SkSurface.h"
+#include "third_party/skia/include/gpu/GpuTypes.h"
+#include "third_party/skia/include/gpu/GrBackendSurface.h"
+#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
+#include "third_party/skia/include/gpu/ganesh/gl/GrGLBackendSurface.h"
+#include "third_party/skia/include/gpu/gl/GrGLTypes.h"
+#include "third_party/skia/include/gpu/vk/GrVkTypes.h"
 
 #include <cstdlib>
 #include <memory>
 #include <utility>
 
+#ifdef SHELL_ENABLE_VULKAN
+#include "third_party/skia/include/gpu/ganesh/vk/GrVkBackendSurface.h"
+#endif  // SHELL_ENABLE_VULKAN
+
+// TODO(zanderso): https://github.com/flutter/flutter/issues/127701
+// NOLINTBEGIN(bugprone-unchecked-optional-access)
+
 namespace flutter {
 namespace testing {
 
@@ -36,8 +49,9 @@ EmbedderTestBackingStoreProducer::EmbedderTestBackingStoreProducer(
 #endif
 {
   if (type == RenderTargetType::kSoftwareBuffer &&
-      software_pixfmt_ != kNative32) {
-    FML_LOG(ERROR) << "Expected pixel format to be the default (kNative32) when"
+      software_pixfmt_ != kFlutterSoftwarePixelFormatNative32) {
+    FML_LOG(ERROR) << "Expected pixel format to be the default "
+                      "(kFlutterSoftwarePixelFormatNative32) when"
                       "backing store producer should produce deprecated v1 "
                       "software backing "
                       "stores.";
@@ -81,23 +95,23 @@ bool EmbedderTestBackingStoreProducer::CreateFramebuffer(
   const auto image_info =
       SkImageInfo::MakeN32Premul(config->size.width, config->size.height);
 
-  auto surface = SkSurface::MakeRenderTarget(
-      context_.get(),               // context
-      SkBudgeted::kNo,              // budgeted
-      image_info,                   // image info
-      1,                            // sample count
-      kBottomLeft_GrSurfaceOrigin,  // surface origin
-      nullptr,                      // surface properties
-      false                         // mipmaps
-  );
+  auto surface =
+      SkSurfaces::RenderTarget(context_.get(),               // context
+                               skgpu::Budgeted::kNo,         // budgeted
+                               image_info,                   // image info
+                               1,                            // sample count
+                               kBottomLeft_GrSurfaceOrigin,  // surface origin
+                               nullptr,  // surface properties
+                               false     // mipmaps
+      );
 
   if (!surface) {
     FML_LOG(ERROR) << "Could not create render target for compositor layer.";
     return false;
   }
 
-  GrBackendRenderTarget render_target = surface->getBackendRenderTarget(
-      SkSurface::BackendHandleAccess::kDiscardWrite_BackendHandleAccess);
+  GrBackendRenderTarget render_target = SkSurfaces::GetBackendRenderTarget(
+      surface.get(), SkSurfaces::BackendHandleAccess::kDiscardWrite);
 
   if (!render_target.isValid()) {
     FML_LOG(ERROR) << "Backend render target was invalid.";
@@ -105,7 +119,8 @@ bool EmbedderTestBackingStoreProducer::CreateFramebuffer(
   }
 
   GrGLFramebufferInfo framebuffer_info = {};
-  if (!render_target.getGLFramebufferInfo(&framebuffer_info)) {
+  if (!GrBackendRenderTargets::GetGLFramebufferInfo(render_target,
+                                                    &framebuffer_info)) {
     FML_LOG(ERROR) << "Could not access backend framebuffer info.";
     return false;
   }
@@ -134,23 +149,23 @@ bool EmbedderTestBackingStoreProducer::CreateTexture(
   const auto image_info =
       SkImageInfo::MakeN32Premul(config->size.width, config->size.height);
 
-  auto surface = SkSurface::MakeRenderTarget(
-      context_.get(),               // context
-      SkBudgeted::kNo,              // budgeted
-      image_info,                   // image info
-      1,                            // sample count
-      kBottomLeft_GrSurfaceOrigin,  // surface origin
-      nullptr,                      // surface properties
-      false                         // mipmaps
-  );
+  auto surface =
+      SkSurfaces::RenderTarget(context_.get(),               // context
+                               skgpu::Budgeted::kNo,         // budgeted
+                               image_info,                   // image info
+                               1,                            // sample count
+                               kBottomLeft_GrSurfaceOrigin,  // surface origin
+                               nullptr,  // surface properties
+                               false     // mipmaps
+      );
 
   if (!surface) {
     FML_LOG(ERROR) << "Could not create render target for compositor layer.";
     return false;
   }
 
-  GrBackendTexture render_texture = surface->getBackendTexture(
-      SkSurface::BackendHandleAccess::kDiscardWrite_BackendHandleAccess);
+  GrBackendTexture render_texture = SkSurfaces::GetBackendTexture(
+      surface.get(), SkSurfaces::BackendHandleAccess::kDiscardWrite);
 
   if (!render_texture.isValid()) {
     FML_LOG(ERROR) << "Backend render texture was invalid.";
@@ -158,7 +173,7 @@ bool EmbedderTestBackingStoreProducer::CreateTexture(
   }
 
   GrGLTextureInfo texture_info = {};
-  if (!render_texture.getGLTextureInfo(&texture_info)) {
+  if (!GrBackendTextures::GetGLTextureInfo(render_texture, &texture_info)) {
     FML_LOG(ERROR) << "Could not access backend texture info.";
     return false;
   }
@@ -184,7 +199,7 @@ bool EmbedderTestBackingStoreProducer::CreateTexture(
 bool EmbedderTestBackingStoreProducer::CreateSoftware(
     const FlutterBackingStoreConfig* config,
     FlutterBackingStore* backing_store_out) {
-  auto surface = SkSurface::MakeRaster(
+  auto surface = SkSurfaces::Raster(
       SkImageInfo::MakeN32Premul(config->size.width, config->size.height));
 
   if (!surface) {
@@ -222,7 +237,7 @@ bool EmbedderTestBackingStoreProducer::CreateSoftware2(
     return false;
   }
 
-  auto surface = SkSurface::MakeRaster(SkImageInfo::Make(
+  auto surface = SkSurfaces::Raster(SkImageInfo::Make(
       SkISize::Make(config->size.width, config->size.height), *color_info));
   if (!surface) {
     FML_LOG(ERROR)
@@ -259,7 +274,7 @@ bool EmbedderTestBackingStoreProducer::CreateMTLTexture(
     const FlutterBackingStoreConfig* config,
     FlutterBackingStore* backing_store_out) {
 #ifdef SHELL_ENABLE_METAL
-  // TODO(gw280): Use SkSurface::MakeRenderTarget instead of generating our
+  // TODO(gw280): Use SkSurfaces::RenderTarget instead of generating our
   // own MTLTexture and wrapping it.
   auto surface_size = SkISize::Make(config->size.width, config->size.height);
   auto texture_info = test_metal_context_->CreateMetalTexture(surface_size);
@@ -267,9 +282,9 @@ bool EmbedderTestBackingStoreProducer::CreateMTLTexture(
   GrMtlTextureInfo skia_texture_info;
   skia_texture_info.fTexture.reset(SkCFSafeRetain(texture_info.texture));
   GrBackendTexture backend_texture(surface_size.width(), surface_size.height(),
-                                   GrMipmapped::kNo, skia_texture_info);
+                                   skgpu::Mipmapped::kNo, skia_texture_info);
 
-  sk_sp<SkSurface> surface = SkSurface::MakeFromBackendTexture(
+  sk_sp<SkSurface> surface = SkSurfaces::WrapBackendTexture(
       context_.get(), backend_texture, kTopLeft_GrSurfaceOrigin, 1,
       kBGRA_8888_SkColorType, nullptr, nullptr);
 
@@ -319,16 +334,16 @@ bool EmbedderTestBackingStoreProducer::CreateVulkanImage(
       .fSampleCount = 1,
       .fLevelCount = 1,
   };
-  GrBackendTexture backend_texture(surface_size.width(), surface_size.height(),
-                                   image_info);
+  auto backend_texture = GrBackendTextures::MakeVk(
+      surface_size.width(), surface_size.height(), image_info);
 
   SkSurfaceProps surface_properties(0, kUnknown_SkPixelGeometry);
 
-  SkSurface::TextureReleaseProc release_vktexture = [](void* user_data) {
+  SkSurfaces::TextureReleaseProc release_vktexture = [](void* user_data) {
     delete reinterpret_cast<TestVulkanImage*>(user_data);
   };
 
-  sk_sp<SkSurface> surface = SkSurface::MakeFromBackendTexture(
+  sk_sp<SkSurface> surface = SkSurfaces::WrapBackendTexture(
       context_.get(),            // context
       backend_texture,           // back-end texture
       kTopLeft_GrSurfaceOrigin,  // surface origin
@@ -378,3 +393,5 @@ bool EmbedderTestBackingStoreProducer::CreateVulkanImage(
 
 }  // namespace testing
 }  // namespace flutter
+
+// NOLINTEND(bugprone-unchecked-optional-access)
diff --git a/shell/platform/embedder/tests/embedder_test_backingstore_producer.h b/shell/platform/embedder/tests/embedder_test_backingstore_producer.h
index aea4b0732d5d603556b66be317a5a10a33d3fdd3..51b15f791bc95f99f380eec4d34405e70d4d412a 100644
--- a/shell/platform/embedder/tests/embedder_test_backingstore_producer.h
+++ b/shell/platform/embedder/tests/embedder_test_backingstore_producer.h
@@ -9,6 +9,8 @@
 #include "flutter/fml/macros.h"
 #include "flutter/fml/memory/ref_ptr_internal.h"
 #include "flutter/shell/platform/embedder/embedder.h"
+
+#include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
 
 #ifdef SHELL_ENABLE_METAL
@@ -16,7 +18,7 @@
 #endif
 
 #ifdef SHELL_ENABLE_VULKAN
-#include "flutter/testing/test_vulkan_context.h"
+#include "flutter/testing/test_vulkan_context.h"  // nogncheck
 #endif
 
 namespace flutter {
@@ -38,10 +40,10 @@ class EmbedderTestBackingStoreProducer {
     kVulkanImage,
   };
 
-  EmbedderTestBackingStoreProducer(
-      sk_sp<GrDirectContext> context,
-      RenderTargetType type,
-      FlutterSoftwarePixelFormat software_pixfmt = kNative32);
+  EmbedderTestBackingStoreProducer(sk_sp<GrDirectContext> context,
+                                   RenderTargetType type,
+                                   FlutterSoftwarePixelFormat software_pixfmt =
+                                       kFlutterSoftwarePixelFormatNative32);
   ~EmbedderTestBackingStoreProducer();
 
   bool Create(const FlutterBackingStoreConfig* config,
diff --git a/shell/platform/embedder/tests/embedder_test_compositor.cc b/shell/platform/embedder/tests/embedder_test_compositor.cc
index 4bbcf2ac83cacc7428689a1345aa44c50894ed9d..66f6d55af0c7fec49aa1fec28a87577c9372578b 100644
--- a/shell/platform/embedder/tests/embedder_test_compositor.cc
+++ b/shell/platform/embedder/tests/embedder_test_compositor.cc
@@ -60,7 +60,8 @@ sk_sp<SkImage> EmbedderTestCompositor::GetLastComposition() {
   return last_composition_;
 }
 
-bool EmbedderTestCompositor::Present(const FlutterLayer** layers,
+bool EmbedderTestCompositor::Present(FlutterViewId view_id,
+                                     const FlutterLayer** layers,
                                      size_t layers_count) {
   if (!UpdateOffscrenComposition(layers, layers_count)) {
     FML_LOG(ERROR)
@@ -75,7 +76,7 @@ bool EmbedderTestCompositor::Present(const FlutterLayer** layers,
     if (present_callback_is_one_shot_) {
       present_callback_ = nullptr;
     }
-    callback(layers, layers_count);
+    callback(view_id, layers, layers_count);
   }
 
   InvokeAllCallbacks(on_present_callbacks_);
diff --git a/shell/platform/embedder/tests/embedder_test_compositor.h b/shell/platform/embedder/tests/embedder_test_compositor.h
index 2578445c7ba6dd695204b9dec4236f72a6af4de7..705579d76e08b1fd8453461613f354d8a2266a61 100644
--- a/shell/platform/embedder/tests/embedder_test_compositor.h
+++ b/shell/platform/embedder/tests/embedder_test_compositor.h
@@ -21,8 +21,9 @@ class EmbedderTestCompositor {
   using PlatformViewRendererCallback =
       std::function<sk_sp<SkImage>(const FlutterLayer& layer,
                                    GrDirectContext* context)>;
-  using PresentCallback =
-      std::function<void(const FlutterLayer** layers, size_t layers_count)>;
+  using PresentCallback = std::function<void(FlutterViewId view_id,
+                                             const FlutterLayer** layers,
+                                             size_t layers_count)>;
 
   EmbedderTestCompositor(SkISize surface_size, sk_sp<GrDirectContext> context);
 
@@ -36,7 +37,9 @@ class EmbedderTestCompositor {
 
   bool CollectBackingStore(const FlutterBackingStore* backing_store);
 
-  bool Present(const FlutterLayer** layers, size_t layers_count);
+  bool Present(FlutterViewId view_id,
+               const FlutterLayer** layers,
+               size_t layers_count);
 
   void SetPlatformViewRendererCallback(
       const PlatformViewRendererCallback& callback);
@@ -98,4 +101,4 @@ class EmbedderTestCompositor {
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_TEST_COMPOSITOR_GL_H_
+#endif  // FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_TEST_COMPOSITOR_H_
diff --git a/shell/platform/embedder/tests/embedder_test_compositor_gl.cc b/shell/platform/embedder/tests/embedder_test_compositor_gl.cc
index 35cdf42828a6321332d71875597b727d7ed80470..50b4da39593a9e7f5ccff030751be2819ab8cf76 100644
--- a/shell/platform/embedder/tests/embedder_test_compositor_gl.cc
+++ b/shell/platform/embedder/tests/embedder_test_compositor_gl.cc
@@ -9,6 +9,7 @@
 #include "flutter/fml/logging.h"
 #include "flutter/shell/platform/embedder/tests/embedder_assertions.h"
 #include "third_party/skia/include/core/SkSurface.h"
+#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
 
 namespace flutter {
 namespace testing {
@@ -28,13 +29,13 @@ bool EmbedderTestCompositorGL::UpdateOffscrenComposition(
   const auto image_info = SkImageInfo::MakeN32Premul(surface_size_);
 
   auto surface =
-      SkSurface::MakeRenderTarget(context_.get(),            // context
-                                  SkBudgeted::kNo,           // budgeted
-                                  image_info,                // image info
-                                  1,                         // sample count
-                                  kTopLeft_GrSurfaceOrigin,  // surface origin
-                                  nullptr,  // surface properties
-                                  false     // create mipmaps
+      SkSurfaces::RenderTarget(context_.get(),            // context
+                               skgpu::Budgeted::kNo,      // budgeted
+                               image_info,                // image info
+                               1,                         // sample count
+                               kTopLeft_GrSurfaceOrigin,  // surface origin
+                               nullptr,                   // surface properties
+                               false                      // create mipmaps
       );
 
   if (!surface) {
diff --git a/shell/platform/embedder/tests/embedder_test_compositor_metal.cc b/shell/platform/embedder/tests/embedder_test_compositor_metal.cc
index f92b7cc21e4d0257dbe7ad1df4bd89d97f9c2268..594be6ab94ce7aee146e6705f45e647cd7ee5284 100644
--- a/shell/platform/embedder/tests/embedder_test_compositor_metal.cc
+++ b/shell/platform/embedder/tests/embedder_test_compositor_metal.cc
@@ -9,6 +9,7 @@
 #include "flutter/fml/logging.h"
 #include "flutter/shell/platform/embedder/tests/embedder_assertions.h"
 #include "third_party/skia/include/core/SkSurface.h"
+#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
 
 namespace flutter {
 namespace testing {
@@ -28,13 +29,13 @@ bool EmbedderTestCompositorMetal::UpdateOffscrenComposition(
   const auto image_info = SkImageInfo::MakeN32Premul(surface_size_);
 
   auto surface =
-      SkSurface::MakeRenderTarget(context_.get(),            // context
-                                  SkBudgeted::kNo,           // budgeted
-                                  image_info,                // image info
-                                  1,                         // sample count
-                                  kTopLeft_GrSurfaceOrigin,  // surface origin
-                                  nullptr,  // surface properties
-                                  false     // create mipmaps
+      SkSurfaces::RenderTarget(context_.get(),            // context
+                               skgpu::Budgeted::kNo,      // budgeted
+                               image_info,                // image info
+                               1,                         // sample count
+                               kTopLeft_GrSurfaceOrigin,  // surface origin
+                               nullptr,                   // surface properties
+                               false                      // create mipmaps
       );
 
   if (!surface) {
diff --git a/shell/platform/embedder/tests/embedder_test_compositor_software.cc b/shell/platform/embedder/tests/embedder_test_compositor_software.cc
index ce7cc1c2113369217ba4481909f0ea6834535054..0a9143fc76ce53724da57c73faa746302dd43e8b 100644
--- a/shell/platform/embedder/tests/embedder_test_compositor_software.cc
+++ b/shell/platform/embedder/tests/embedder_test_compositor_software.cc
@@ -24,7 +24,7 @@ bool EmbedderTestCompositorSoftware::UpdateOffscrenComposition(
 
   const auto image_info = SkImageInfo::MakeN32Premul(surface_size_);
 
-  auto surface = SkSurface::MakeRaster(image_info);
+  auto surface = SkSurfaces::Raster(image_info);
 
   if (!surface) {
     FML_LOG(ERROR) << "Could not update the off-screen composition.";
diff --git a/shell/platform/embedder/tests/embedder_test_compositor_vulkan.cc b/shell/platform/embedder/tests/embedder_test_compositor_vulkan.cc
index c0df97a5f606cafd5cf0aa5538a04f4908e41382..18a0fafabd465a225c24c3a66471a5d70127c11e 100644
--- a/shell/platform/embedder/tests/embedder_test_compositor_vulkan.cc
+++ b/shell/platform/embedder/tests/embedder_test_compositor_vulkan.cc
@@ -10,6 +10,7 @@
 #include "flutter/shell/platform/embedder/tests/embedder_assertions.h"
 #include "flutter/shell/platform/embedder/tests/embedder_test_backingstore_producer.h"
 #include "third_party/skia/include/core/SkSurface.h"
+#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
 
 namespace flutter {
 namespace testing {
@@ -29,13 +30,13 @@ bool EmbedderTestCompositorVulkan::UpdateOffscrenComposition(
   const auto image_info = SkImageInfo::MakeN32Premul(surface_size_);
 
   sk_sp<SkSurface> surface =
-      SkSurface::MakeRenderTarget(context_.get(),            // context
-                                  SkBudgeted::kNo,           // budgeted
-                                  image_info,                // image info
-                                  1,                         // sample count
-                                  kTopLeft_GrSurfaceOrigin,  // surface origin
-                                  nullptr,  // surface properties
-                                  false     // create mipmaps
+      SkSurfaces::RenderTarget(context_.get(),            // context
+                               skgpu::Budgeted::kNo,      // budgeted
+                               image_info,                // image info
+                               1,                         // sample count
+                               kTopLeft_GrSurfaceOrigin,  // surface origin
+                               nullptr,                   // surface properties
+                               false                      // create mipmaps
       );
 
   if (!surface) {
diff --git a/shell/platform/embedder/tests/embedder_test_context.cc b/shell/platform/embedder/tests/embedder_test_context.cc
index 904eed9cb77c59d52e37b6de115f6049124cd88f..0f5e3dcf9afe5cb493710767e76e8f0138eedad9 100644
--- a/shell/platform/embedder/tests/embedder_test_context.cc
+++ b/shell/platform/embedder/tests/embedder_test_context.cc
@@ -111,7 +111,7 @@ VoidCallback EmbedderTestContext::GetIsolateCreateCallbackHook() {
 }
 
 void EmbedderTestContext::FireIsolateCreateCallbacks() {
-  for (auto closure : isolate_create_callbacks_) {
+  for (const auto& closure : isolate_create_callbacks_) {
     closure();
   }
 }
@@ -121,6 +121,11 @@ void EmbedderTestContext::AddNativeCallback(const char* name,
   native_resolver_->AddNativeCallback({name}, function);
 }
 
+void EmbedderTestContext::SetSemanticsUpdateCallback2(
+    SemanticsUpdateCallback2 update_semantics_callback) {
+  update_semantics_callback2_ = std::move(update_semantics_callback);
+}
+
 void EmbedderTestContext::SetSemanticsUpdateCallback(
     SemanticsUpdateCallback update_semantics_callback) {
   update_semantics_callback_ = std::move(update_semantics_callback);
@@ -142,6 +147,11 @@ void EmbedderTestContext::SetPlatformMessageCallback(
   platform_message_callback_ = callback;
 }
 
+void EmbedderTestContext::SetChannelUpdateCallback(
+    const ChannelUpdateCallback& callback) {
+  channel_update_callback_ = callback;
+}
+
 void EmbedderTestContext::PlatformMessageCallback(
     const FlutterPlatformMessage* message) {
   if (platform_message_callback_) {
@@ -154,6 +164,20 @@ void EmbedderTestContext::SetLogMessageCallback(
   log_message_callback_ = callback;
 }
 
+FlutterUpdateSemanticsCallback2
+EmbedderTestContext::GetUpdateSemanticsCallback2Hook() {
+  if (update_semantics_callback2_ == nullptr) {
+    return nullptr;
+  }
+
+  return [](const FlutterSemanticsUpdate2* update, void* user_data) {
+    auto context = reinterpret_cast<EmbedderTestContext*>(user_data);
+    if (context->update_semantics_callback2_) {
+      context->update_semantics_callback2_(update);
+    }
+  };
+}
+
 FlutterUpdateSemanticsCallback
 EmbedderTestContext::GetUpdateSemanticsCallbackHook() {
   if (update_semantics_callback_ == nullptr) {
@@ -213,6 +237,20 @@ EmbedderTestContext::GetComputePlatformResolvedLocaleCallbackHook() {
   };
 }
 
+FlutterChannelUpdateCallback
+EmbedderTestContext::GetChannelUpdateCallbackHook() {
+  if (channel_update_callback_ == nullptr) {
+    return nullptr;
+  }
+
+  return [](const FlutterChannelUpdate* update, void* user_data) {
+    auto context = reinterpret_cast<EmbedderTestContext*>(user_data);
+    if (context->channel_update_callback_) {
+      context->channel_update_callback_(update);
+    }
+  };
+}
+
 FlutterTransformation EmbedderTestContext::GetRootSurfaceTransformation() {
   return FlutterTransformationMake(root_surface_transformation_);
 }
diff --git a/shell/platform/embedder/tests/embedder_test_context.h b/shell/platform/embedder/tests/embedder_test_context.h
index 53c117447e467167bb38ef7d6b835ae7a563e82a..6f1a1568232d67ed4680031fec780e5f36c2caeb 100644
--- a/shell/platform/embedder/tests/embedder_test_context.h
+++ b/shell/platform/embedder/tests/embedder_test_context.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_CONTEXT_H_
-#define FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_CONTEXT_H_
+#ifndef FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_TEST_CONTEXT_H_
+#define FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_TEST_CONTEXT_H_
 
 #include <future>
 #include <map>
@@ -24,6 +24,8 @@
 namespace flutter {
 namespace testing {
 
+using SemanticsUpdateCallback2 =
+    std::function<void(const FlutterSemanticsUpdate2*)>;
 using SemanticsUpdateCallback =
     std::function<void(const FlutterSemanticsUpdate*)>;
 using SemanticsNodeCallback = std::function<void(const FlutterSemanticsNode*)>;
@@ -31,6 +33,7 @@ using SemanticsActionCallback =
     std::function<void(const FlutterSemanticsCustomAction*)>;
 using LogMessageCallback =
     std::function<void(const char* tag, const char* message)>;
+using ChannelUpdateCallback = std::function<void(const FlutterChannelUpdate*)>;
 
 struct AOTDataDeleter {
   void operator()(FlutterEngineAOTData aot_data) {
@@ -71,6 +74,8 @@ class EmbedderTestContext {
 
   void AddIsolateCreateCallback(const fml::closure& closure);
 
+  void SetSemanticsUpdateCallback2(SemanticsUpdateCallback2 update_semantics);
+
   void SetSemanticsUpdateCallback(SemanticsUpdateCallback update_semantics);
 
   void AddNativeCallback(const char* name, Dart_NativeFunction function);
@@ -85,6 +90,8 @@ class EmbedderTestContext {
 
   void SetLogMessageCallback(const LogMessageCallback& log_message_callback);
 
+  void SetChannelUpdateCallback(const ChannelUpdateCallback& callback);
+
   std::future<sk_sp<SkImage>> GetNextSceneImage();
 
   EmbedderTestCompositor& GetCompositor();
@@ -124,9 +131,11 @@ class EmbedderTestContext {
   UniqueAOTData aot_data_;
   std::vector<fml::closure> isolate_create_callbacks_;
   std::shared_ptr<TestDartNativeResolver> native_resolver_;
+  SemanticsUpdateCallback2 update_semantics_callback2_;
   SemanticsUpdateCallback update_semantics_callback_;
   SemanticsNodeCallback update_semantics_node_callback_;
   SemanticsActionCallback update_semantics_custom_action_callback_;
+  ChannelUpdateCallback channel_update_callback_;
   std::function<void(const FlutterPlatformMessage*)> platform_message_callback_;
   LogMessageCallback log_message_callback_;
   std::unique_ptr<EmbedderTestCompositor> compositor_;
@@ -136,6 +145,8 @@ class EmbedderTestContext {
 
   static VoidCallback GetIsolateCreateCallbackHook();
 
+  FlutterUpdateSemanticsCallback2 GetUpdateSemanticsCallback2Hook();
+
   FlutterUpdateSemanticsCallback GetUpdateSemanticsCallbackHook();
 
   FlutterUpdateSemanticsNodeCallback GetUpdateSemanticsNodeCallbackHook();
@@ -148,6 +159,8 @@ class EmbedderTestContext {
   static FlutterComputePlatformResolvedLocaleCallback
   GetComputePlatformResolvedLocaleCallbackHook();
 
+  FlutterChannelUpdateCallback GetChannelUpdateCallbackHook();
+
   void SetupAOTMappingsIfNecessary();
 
   void SetupAOTDataIfNecessary();
@@ -175,4 +188,4 @@ class EmbedderTestContext {
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_CONTEXT_H_
+#endif  // FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_TEST_CONTEXT_H_
diff --git a/shell/platform/embedder/tests/embedder_test_context_gl.h b/shell/platform/embedder/tests/embedder_test_context_gl.h
index 9b91ef5868868787a4fc1130f8bc56e65c8d3005..3241b318d8d4506b05ce17b6df778520c5b2e9f6 100644
--- a/shell/platform/embedder/tests/embedder_test_context_gl.h
+++ b/shell/platform/embedder/tests/embedder_test_context_gl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_CONTEXT_GL_H_
-#define FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_CONTEXT_GL_H_
+#ifndef FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_TEST_CONTEXT_GL_H_
+#define FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_TEST_CONTEXT_GL_H_
 
 #include "flutter/shell/platform/embedder/tests/embedder_test_context.h"
 #include "flutter/testing/test_gl_surface.h"
@@ -96,4 +96,4 @@ class EmbedderTestContextGL : public EmbedderTestContext {
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_CONTEXT_GL_H_
+#endif  // FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_TEST_CONTEXT_GL_H_
diff --git a/shell/platform/embedder/tests/embedder_test_context_metal.cc b/shell/platform/embedder/tests/embedder_test_context_metal.cc
index c649227b54800c36dfa76d4167c9b3d8a13175a1..ec16446e07100ffa44808bd8eb4cbec1db404e4a 100644
--- a/shell/platform/embedder/tests/embedder_test_context_metal.cc
+++ b/shell/platform/embedder/tests/embedder_test_context_metal.cc
@@ -47,10 +47,22 @@ TestMetalContext* EmbedderTestContextMetal::GetTestMetalContext() {
   return metal_context_.get();
 }
 
+TestMetalSurface* EmbedderTestContextMetal::GetTestMetalSurface() {
+  return metal_surface_.get();
+}
+
+void EmbedderTestContextMetal::SetPresentCallback(
+    PresentCallback present_callback) {
+  present_callback_ = std::move(present_callback);
+}
+
 bool EmbedderTestContextMetal::Present(int64_t texture_id) {
   FireRootSurfacePresentCallbackIfPresent(
       [&]() { return metal_surface_->GetRasterSurfaceSnapshot(); });
   present_count_++;
+  if (present_callback_ != nullptr) {
+    return present_callback_(texture_id);
+  }
   return metal_context_->Present(texture_id);
 }
 
@@ -71,11 +83,19 @@ bool EmbedderTestContextMetal::PopulateExternalTexture(
   }
 }
 
+void EmbedderTestContextMetal::SetNextDrawableCallback(
+    NextDrawableCallback next_drawable_callback) {
+  next_drawable_callback_ = std::move(next_drawable_callback);
+}
+
 FlutterMetalTexture EmbedderTestContextMetal::GetNextDrawable(
     const FlutterFrameInfo* frame_info) {
-  auto texture_info = metal_surface_->GetTextureInfo();
+  if (next_drawable_callback_ != nullptr) {
+    return next_drawable_callback_(frame_info);
+  }
 
-  FlutterMetalTexture texture;
+  auto texture_info = metal_surface_->GetTextureInfo();
+  FlutterMetalTexture texture = {};
   texture.struct_size = sizeof(FlutterMetalTexture);
   texture.texture_id = texture_info.texture_id;
   texture.texture =
diff --git a/shell/platform/embedder/tests/embedder_test_context_metal.h b/shell/platform/embedder/tests/embedder_test_context_metal.h
index eae23eb252d7e1497b8b16a78c9ee88f1b9e4de5..eea599fe0c07cabd62b290f5a85f7322af92f788 100644
--- a/shell/platform/embedder/tests/embedder_test_context_metal.h
+++ b/shell/platform/embedder/tests/embedder_test_context_metal.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_CONTEXT_METAL_H_
-#define FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_CONTEXT_METAL_H_
+#ifndef FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_TEST_CONTEXT_METAL_H_
+#define FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_TEST_CONTEXT_METAL_H_
 
 #include "flutter/shell/platform/embedder/tests/embedder_test_context.h"
 #include "flutter/testing/test_metal_context.h"
@@ -20,6 +20,11 @@ class EmbedderTestContextMetal : public EmbedderTestContext {
                          size_t h,
                          FlutterMetalExternalTexture* output)>;
 
+  using NextDrawableCallback =
+      std::function<FlutterMetalTexture(const FlutterFrameInfo* frame_info)>;
+
+  using PresentCallback = std::function<bool(int64_t texture_id)>;
+
   explicit EmbedderTestContextMetal(std::string assets_path = "");
 
   ~EmbedderTestContextMetal() override;
@@ -36,6 +41,9 @@ class EmbedderTestContextMetal : public EmbedderTestContext {
   void SetExternalTextureCallback(
       TestExternalTextureCallback external_texture_frame_callback);
 
+  // Override the default handling for Present.
+  void SetPresentCallback(PresentCallback present_callback);
+
   bool Present(int64_t texture_id);
 
   bool PopulateExternalTexture(int64_t texture_id,
@@ -45,6 +53,11 @@ class EmbedderTestContextMetal : public EmbedderTestContext {
 
   TestMetalContext* GetTestMetalContext();
 
+  TestMetalSurface* GetTestMetalSurface();
+
+  // Override the default handling for GetNextDrawable.
+  void SetNextDrawableCallback(NextDrawableCallback next_drawable_callback);
+
   FlutterMetalTexture GetNextDrawable(const FlutterFrameInfo* frame_info);
 
  private:
@@ -56,6 +69,8 @@ class EmbedderTestContextMetal : public EmbedderTestContext {
   std::unique_ptr<TestMetalContext> metal_context_;
   std::unique_ptr<TestMetalSurface> metal_surface_;
   size_t present_count_ = 0;
+  PresentCallback present_callback_ = nullptr;
+  NextDrawableCallback next_drawable_callback_ = nullptr;
 
   void SetupSurface(SkISize surface_size) override;
 
@@ -65,4 +80,4 @@ class EmbedderTestContextMetal : public EmbedderTestContext {
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_CONTEXT_METAL_H_
+#endif  // FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_TEST_CONTEXT_METAL_H_
diff --git a/shell/platform/embedder/tests/embedder_test_context_software.h b/shell/platform/embedder/tests/embedder_test_context_software.h
index d4708e91825be2689f7b2bc83eb3444db53f0422..25c0ce52c92e5cc045156495f9a3e9b331f90c82 100644
--- a/shell/platform/embedder/tests/embedder_test_context_software.h
+++ b/shell/platform/embedder/tests/embedder_test_context_software.h
@@ -2,11 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_CONTEXT_SOFTWARE_H_
-#define FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_CONTEXT_SOFTWARE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_TEST_CONTEXT_SOFTWARE_H_
+#define FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_TEST_CONTEXT_SOFTWARE_H_
 
 #include "flutter/shell/platform/embedder/tests/embedder_test_context.h"
 
+#include "third_party/skia/include/core/SkSurface.h"
+
 namespace flutter {
 namespace testing {
 
@@ -38,4 +40,4 @@ class EmbedderTestContextSoftware : public EmbedderTestContext {
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_CONTEXT_SOFTWARE_H_
+#endif  // FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_TEST_CONTEXT_SOFTWARE_H_
diff --git a/shell/platform/embedder/tests/embedder_test_context_vulkan.cc b/shell/platform/embedder/tests/embedder_test_context_vulkan.cc
index c5f821a8088cc0d4bf4ce9d399e0134534b51847..4f3678597dda188d7d2ba4ce99bbc7c47197445a 100644
--- a/shell/platform/embedder/tests/embedder_test_context_vulkan.cc
+++ b/shell/platform/embedder/tests/embedder_test_context_vulkan.cc
@@ -58,5 +58,15 @@ void EmbedderTestContextVulkan::SetupCompositor() {
       surface_size_, vulkan_context_->GetGrDirectContext());
 }
 
+void* EmbedderTestContextVulkan::InstanceProcAddr(
+    void* user_data,
+    FlutterVulkanInstanceHandle instance,
+    const char* name) {
+  auto proc_addr = reinterpret_cast<EmbedderTestContextVulkan*>(user_data)
+                       ->vulkan_context_->vk_->GetInstanceProcAddr(
+                           reinterpret_cast<VkInstance>(instance), name);
+  return reinterpret_cast<void*>(proc_addr);
+}
+
 }  // namespace testing
 }  // namespace flutter
diff --git a/shell/platform/embedder/tests/embedder_test_context_vulkan.h b/shell/platform/embedder/tests/embedder_test_context_vulkan.h
index b08aa43941708fee07f6a243c8a05269fe820bd7..e7eb6906d9d160ae1d03276e116de4a6e35c3d3f 100644
--- a/shell/platform/embedder/tests/embedder_test_context_vulkan.h
+++ b/shell/platform/embedder/tests/embedder_test_context_vulkan.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_CONTEXT_VULKAN_H_
-#define FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_CONTEXT_VULKAN_H_
+#ifndef FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_TEST_CONTEXT_VULKAN_H_
+#define FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_TEST_CONTEXT_VULKAN_H_
 
 #include <memory>
 #include "flutter/shell/platform/embedder/tests/embedder_test_context.h"
@@ -33,6 +33,10 @@ class EmbedderTestContextVulkan : public EmbedderTestContext {
 
   bool PresentImage(VkImage image);
 
+  static void* InstanceProcAddr(void* user_data,
+                                FlutterVulkanInstanceHandle instance,
+                                const char* name);
+
  private:
   std::unique_ptr<TestVulkanSurface> surface_;
 
@@ -49,4 +53,4 @@ class EmbedderTestContextVulkan : public EmbedderTestContext {
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_CONTEXT_VULKAN_H_
+#endif  // FLUTTER_SHELL_PLATFORM_EMBEDDER_TESTS_EMBEDDER_TEST_CONTEXT_VULKAN_H_
diff --git a/shell/platform/embedder/tests/embedder_unittests.cc b/shell/platform/embedder/tests/embedder_unittests.cc
index e9616336a598a05b95114d90a2287c79a9909c3c..b573b1db6cd9e125bb759d41e0afaee018283014 100644
--- a/shell/platform/embedder/tests/embedder_unittests.cc
+++ b/shell/platform/embedder/tests/embedder_unittests.cc
@@ -10,6 +10,7 @@
 
 #include "embedder.h"
 #include "embedder_engine.h"
+#include "flutter/common/constants.h"
 #include "flutter/flow/raster_cache.h"
 #include "flutter/fml/file.h"
 #include "flutter/fml/make_copyable.h"
@@ -117,7 +118,7 @@ TEST_F(EmbedderTest, CanInvokeCustomEntrypointMacro) {
   auto native_entry1 = CREATE_NATIVE_ENTRY(entry1);
   context.AddNativeCallback("SayHiFromCustomEntrypoint1", native_entry1);
 
-  // Can be wrapped in in the args.
+  // Can be wrapped in the args.
   auto entry2 = [&latch2](Dart_NativeArguments args) {
     FML_LOG(INFO) << "In Callback 2";
     latch2.Signal();
@@ -174,6 +175,30 @@ TEST_F(EmbedderTest, ExecutableNameNotNull) {
   latch.Wait();
 }
 
+TEST_F(EmbedderTest, ImplicitViewNotNull) {
+  // TODO(loicsharma): Update this test when embedders can opt-out
+  // of the implicit view.
+  // See: https://github.com/flutter/flutter/issues/120306
+  auto& context = GetEmbedderContext(EmbedderTestContextType::kSoftwareContext);
+
+  bool implicitViewNotNull = false;
+  fml::AutoResetWaitableEvent latch;
+  context.AddNativeCallback(
+      "NotifyBoolValue", CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
+        implicitViewNotNull = tonic::DartConverter<bool>::FromDart(
+            Dart_GetNativeArgument(args, 0));
+        latch.Signal();
+      }));
+
+  EmbedderConfigBuilder builder(context);
+  builder.SetSoftwareRendererConfig();
+  builder.SetDartEntrypoint("implicitViewNotNull");
+  auto engine = builder.LaunchEngine();
+  latch.Wait();
+
+  EXPECT_TRUE(implicitViewNotNull);
+}
+
 std::atomic_size_t EmbedderTestTaskRunner::sEmbedderTaskRunnerIdentifiers = {};
 
 TEST_F(EmbedderTest, CanSpecifyCustomPlatformTaskRunner) {
@@ -616,12 +641,84 @@ TEST_F(EmbedderTest, VMAndIsolateSnapshotSizesAreRedundantInAOTMode) {
   ASSERT_TRUE(engine.is_valid());
 }
 
+TEST_F(EmbedderTest, CanRenderImplicitView) {
+  auto& context = GetEmbedderContext(EmbedderTestContextType::kSoftwareContext);
+
+  EmbedderConfigBuilder builder(context);
+  builder.SetSoftwareRendererConfig(SkISize::Make(800, 600));
+  builder.SetCompositor();
+  builder.SetDartEntrypoint("render_implicit_view");
+  builder.SetRenderTargetType(
+      EmbedderTestBackingStoreProducer::RenderTargetType::kSoftwareBuffer);
+
+  fml::AutoResetWaitableEvent latch;
+
+  context.GetCompositor().SetNextPresentCallback(
+      [&](FlutterViewId view_id, const FlutterLayer** layers,
+          size_t layers_count) {
+        ASSERT_EQ(view_id, kFlutterImplicitViewId);
+        latch.Signal();
+      });
+
+  auto engine = builder.LaunchEngine();
+
+  FlutterWindowMetricsEvent event = {};
+  event.struct_size = sizeof(event);
+  event.width = 300;
+  event.height = 200;
+  event.pixel_ratio = 1.0;
+  ASSERT_EQ(FlutterEngineSendWindowMetricsEvent(engine.get(), &event),
+            kSuccess);
+  ASSERT_TRUE(engine.is_valid());
+  latch.Wait();
+}
+
+TEST_F(EmbedderTest, CanRenderImplicitViewUsingPresentLayersCallback) {
+  auto& context = GetEmbedderContext(EmbedderTestContextType::kSoftwareContext);
+
+  EmbedderConfigBuilder builder(context);
+  builder.SetSoftwareRendererConfig(SkISize::Make(800, 600));
+  builder.SetCompositor(/* avoid_backing_store_cache = */ false,
+                        /* use_present_layers_callback = */ true);
+  builder.SetDartEntrypoint("render_implicit_view");
+  builder.SetRenderTargetType(
+      EmbedderTestBackingStoreProducer::RenderTargetType::kSoftwareBuffer);
+
+  fml::AutoResetWaitableEvent latch;
+
+  context.GetCompositor().SetNextPresentCallback(
+      [&](FlutterViewId view_id, const FlutterLayer** layers,
+          size_t layers_count) {
+        ASSERT_EQ(view_id, kFlutterImplicitViewId);
+        latch.Signal();
+      });
+
+  auto engine = builder.LaunchEngine();
+
+  FlutterWindowMetricsEvent event = {};
+  event.struct_size = sizeof(event);
+  event.width = 300;
+  event.height = 200;
+  event.pixel_ratio = 1.0;
+  ASSERT_EQ(FlutterEngineSendWindowMetricsEvent(engine.get(), &event),
+            kSuccess);
+  ASSERT_TRUE(engine.is_valid());
+  latch.Wait();
+}
+
 //------------------------------------------------------------------------------
 /// Test the layer structure and pixels rendered when using a custom software
 /// compositor.
 ///
+// TODO(143940): Convert this test to use SkiaGold.
+#if FML_OS_MACOSX && FML_ARCH_CPU_ARM64
+TEST_F(EmbedderTest,
+       DISABLED_CompositorMustBeAbleToRenderKnownSceneWithSoftwareCompositor) {
+#else
 TEST_F(EmbedderTest,
        CompositorMustBeAbleToRenderKnownSceneWithSoftwareCompositor) {
+#endif  // FML_OS_MACOSX && FML_ARCH_CPU_ARM64
+
   auto& context = GetEmbedderContext(EmbedderTestContextType::kSoftwareContext);
 
   EmbedderConfigBuilder builder(context);
@@ -637,7 +734,8 @@ TEST_F(EmbedderTest,
   auto scene_image = context.GetNextSceneImage();
 
   context.GetCompositor().SetNextPresentCallback(
-      [&](const FlutterLayer** layers, size_t layers_count) {
+      [&](FlutterViewId view_id, const FlutterLayer** layers,
+          size_t layers_count) {
         ASSERT_EQ(layers_count, 5u);
 
         // Layer Root
@@ -647,12 +745,26 @@ TEST_F(EmbedderTest,
           backing_store.did_update = true;
           backing_store.software.height = 600;
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(0, 0, 800, 600),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(800.0, 600.0);
           layer.offset = FlutterPointMake(0.0, 0.0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[0], layer);
         }
@@ -680,12 +792,26 @@ TEST_F(EmbedderTest,
           backing_store.did_update = true;
           backing_store.software.height = 600;
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(30, 30, 80, 180),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(800.0, 600.0);
           layer.offset = FlutterPointMake(0.0, 0.0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[2], layer);
         }
@@ -713,12 +839,26 @@ TEST_F(EmbedderTest,
           backing_store.did_update = true;
           backing_store.software.height = 600;
 
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(50, 50, 100, 200),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
           layer.size = FlutterSizeMake(800.0, 600.0);
           layer.offset = FlutterPointMake(0.0, 0.0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[4], layer);
         }
@@ -794,185 +934,56 @@ TEST_F(EmbedderTest,
 }
 
 //------------------------------------------------------------------------------
-/// Test that an engine can be initialized but not run.
-///
-TEST_F(EmbedderTest, CanCreateInitializedEngine) {
-  EmbedderConfigBuilder builder(
-      GetEmbedderContext(EmbedderTestContextType::kSoftwareContext));
-  builder.SetSoftwareRendererConfig();
-  auto engine = builder.InitializeEngine();
-  ASSERT_TRUE(engine.is_valid());
-  engine.reset();
-}
-
-//------------------------------------------------------------------------------
-/// Test that an initialized engine can be run exactly once.
-///
-TEST_F(EmbedderTest, CanRunInitializedEngine) {
-  EmbedderConfigBuilder builder(
-      GetEmbedderContext(EmbedderTestContextType::kSoftwareContext));
-  builder.SetSoftwareRendererConfig();
-  auto engine = builder.InitializeEngine();
-  ASSERT_TRUE(engine.is_valid());
-  ASSERT_EQ(FlutterEngineRunInitialized(engine.get()), kSuccess);
-  // Cannot re-run an already running engine.
-  ASSERT_EQ(FlutterEngineRunInitialized(engine.get()), kInvalidArguments);
-  engine.reset();
-}
-
-//------------------------------------------------------------------------------
-/// Test that an engine can be deinitialized.
+/// Test the layer structure and pixels rendered when using a custom software
+/// compositor, with a transparent overlay
 ///
-TEST_F(EmbedderTest, CanDeinitializeAnEngine) {
-  EmbedderConfigBuilder builder(
-      GetEmbedderContext(EmbedderTestContextType::kSoftwareContext));
-  builder.SetSoftwareRendererConfig();
-  auto engine = builder.InitializeEngine();
-  ASSERT_TRUE(engine.is_valid());
-  ASSERT_EQ(FlutterEngineRunInitialized(engine.get()), kSuccess);
-  // Cannot re-run an already running engine.
-  ASSERT_EQ(FlutterEngineRunInitialized(engine.get()), kInvalidArguments);
-  ASSERT_EQ(FlutterEngineDeinitialize(engine.get()), kSuccess);
-  // It is ok to deinitialize an engine multiple times.
-  ASSERT_EQ(FlutterEngineDeinitialize(engine.get()), kSuccess);
-
-  // Sending events to a deinitialized engine fails.
-  FlutterWindowMetricsEvent event = {};
-  event.struct_size = sizeof(event);
-  event.width = 800;
-  event.height = 600;
-  event.pixel_ratio = 1.0;
-  event.physical_view_inset_top = 0.0;
-  event.physical_view_inset_right = 0.0;
-  event.physical_view_inset_bottom = 0.0;
-  event.physical_view_inset_left = 0.0;
-  ASSERT_EQ(FlutterEngineSendWindowMetricsEvent(engine.get(), &event),
-            kInvalidArguments);
-  engine.reset();
-}
-
-TEST_F(EmbedderTest, CanUpdateLocales) {
-  auto& context = GetEmbedderContext(EmbedderTestContextType::kSoftwareContext);
-  EmbedderConfigBuilder builder(context);
-  builder.SetSoftwareRendererConfig();
-  builder.SetDartEntrypoint("can_receive_locale_updates");
-  fml::AutoResetWaitableEvent latch;
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&latch](Dart_NativeArguments args) { latch.Signal(); }));
-
-  fml::AutoResetWaitableEvent check_latch;
-  context.AddNativeCallback(
-      "SignalNativeCount",
-      CREATE_NATIVE_ENTRY([&check_latch](Dart_NativeArguments args) {
-        ASSERT_EQ(tonic::DartConverter<int>::FromDart(
-                      Dart_GetNativeArgument(args, 0)),
-                  2);
-        check_latch.Signal();
-      }));
-
-  auto engine = builder.LaunchEngine();
-  ASSERT_TRUE(engine.is_valid());
-
-  // Wait for the application to attach the listener.
-  latch.Wait();
-
-  FlutterLocale locale1 = {};
-  locale1.struct_size = sizeof(locale1);
-  locale1.language_code = "";  // invalid
-  locale1.country_code = "US";
-  locale1.script_code = "";
-  locale1.variant_code = nullptr;
-
-  FlutterLocale locale2 = {};
-  locale2.struct_size = sizeof(locale2);
-  locale2.language_code = "zh";
-  locale2.country_code = "CN";
-  locale2.script_code = "Hans";
-  locale2.variant_code = nullptr;
-
-  std::vector<const FlutterLocale*> locales;
-  locales.push_back(&locale1);
-  locales.push_back(&locale2);
-
-  ASSERT_EQ(
-      FlutterEngineUpdateLocales(engine.get(), locales.data(), locales.size()),
-      kInvalidArguments);
-
-  // Fix the invalid code.
-  locale1.language_code = "en";
-
-  ASSERT_EQ(
-      FlutterEngineUpdateLocales(engine.get(), locales.data(), locales.size()),
-      kSuccess);
-
-  check_latch.Wait();
-}
-
-TEST_F(EmbedderTest, LocalizationCallbacksCalled) {
-  auto& context = GetEmbedderContext(EmbedderTestContextType::kSoftwareContext);
-  fml::AutoResetWaitableEvent latch;
-  context.AddIsolateCreateCallback([&latch]() { latch.Signal(); });
-  EmbedderConfigBuilder builder(context);
-  builder.SetSoftwareRendererConfig();
-  auto engine = builder.LaunchEngine();
-  ASSERT_TRUE(engine.is_valid());
-  // Wait for the root isolate to launch.
-  latch.Wait();
-
-  flutter::Shell& shell = ToEmbedderEngine(engine.get())->GetShell();
-  std::vector<std::string> supported_locales;
-  supported_locales.push_back("es");
-  supported_locales.push_back("MX");
-  supported_locales.push_back("");
-  auto result = shell.GetPlatformView()->ComputePlatformResolvedLocales(
-      supported_locales);
-
-  ASSERT_EQ((*result).size(), supported_locales.size());  // 3
-  ASSERT_EQ((*result)[0], supported_locales[0]);
-  ASSERT_EQ((*result)[1], supported_locales[1]);
-  ASSERT_EQ((*result)[2], supported_locales[2]);
-
-  engine.reset();
-}
-
-TEST_F(EmbedderTest, CanQueryDartAOTMode) {
-  ASSERT_EQ(FlutterEngineRunsAOTCompiledDartCode(),
-            flutter::DartVM::IsRunningPrecompiledCode());
-}
-
-TEST_F(EmbedderTest, VerifyB143464703WithSoftwareBackend) {
+TEST_F(EmbedderTest, NoLayerCreatedForTransparentOverlayOnTopOfPlatformLayer) {
   auto& context = GetEmbedderContext(EmbedderTestContextType::kSoftwareContext);
 
   EmbedderConfigBuilder builder(context);
-  builder.SetSoftwareRendererConfig(SkISize::Make(1024, 600));
+  builder.SetSoftwareRendererConfig(SkISize::Make(800, 600));
   builder.SetCompositor();
-  builder.SetDartEntrypoint("verify_b143464703");
+  builder.SetDartEntrypoint("can_composite_platform_views_transparent_overlay");
 
   builder.SetRenderTargetType(
       EmbedderTestBackingStoreProducer::RenderTargetType::kSoftwareBuffer);
 
-  // setup the screenshot promise.
-  auto rendered_scene = context.GetNextSceneImage();
+  fml::CountDownLatch latch(4);
+
+  auto scene_image = context.GetNextSceneImage();
 
-  fml::CountDownLatch latch(1);
   context.GetCompositor().SetNextPresentCallback(
-      [&](const FlutterLayer** layers, size_t layers_count) {
-        ASSERT_EQ(layers_count, 3u);
+      [&](FlutterViewId view_id, const FlutterLayer** layers,
+          size_t layers_count) {
+        ASSERT_EQ(layers_count, 2u);
 
-        // Layer 0 (Root)
+        // Layer Root
         {
           FlutterBackingStore backing_store = *layers[0]->backing_store;
           backing_store.type = kFlutterBackingStoreTypeSoftware;
           backing_store.did_update = true;
+          backing_store.software.height = 600;
+
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(0, 0, 800, 600),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
 
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypeBackingStore;
           layer.backing_store = &backing_store;
-          layer.size = FlutterSizeMake(1024.0, 600.0);
+          layer.size = FlutterSizeMake(800.0, 600.0);
           layer.offset = FlutterPointMake(0.0, 0.0);
+          layer.backing_store_present_info = &present_info;
 
           ASSERT_EQ(*layers[0], layer);
         }
@@ -981,40 +992,485 @@ TEST_F(EmbedderTest, VerifyB143464703WithSoftwareBackend) {
         {
           FlutterPlatformView platform_view = *layers[1]->platform_view;
           platform_view.struct_size = sizeof(platform_view);
-          platform_view.identifier = 42;
+          platform_view.identifier = 1;
 
           FlutterLayer layer = {};
           layer.struct_size = sizeof(layer);
           layer.type = kFlutterLayerContentTypePlatformView;
           layer.platform_view = &platform_view;
-          layer.size = FlutterSizeMake(1024.0, 540.0);
-          layer.offset = FlutterPointMake(135.0, 60.0);
+          layer.size = FlutterSizeMake(50.0, 150.0);
+          layer.offset = FlutterPointMake(20.0, 20.0);
 
           ASSERT_EQ(*layers[1], layer);
         }
 
-        // Layer 2
-        {
-          FlutterBackingStore backing_store = *layers[2]->backing_store;
-          backing_store.type = kFlutterBackingStoreTypeSoftware;
-          backing_store.did_update = true;
-
-          FlutterLayer layer = {};
-          layer.struct_size = sizeof(layer);
-          layer.type = kFlutterLayerContentTypeBackingStore;
-          layer.backing_store = &backing_store;
-          layer.size = FlutterSizeMake(1024.0, 600.0);
-          layer.offset = FlutterPointMake(0.0, 0.0);
-
-          ASSERT_EQ(*layers[2], layer);
-        }
-
         latch.CountDown();
       });
 
   context.GetCompositor().SetPlatformViewRendererCallback(
-      [](const FlutterLayer& layer,
-         GrDirectContext* context) -> sk_sp<SkImage> {
+      [&](const FlutterLayer& layer, GrDirectContext*
+          /* don't use because software compositor */) -> sk_sp<SkImage> {
+        auto surface = CreateRenderSurface(
+            layer, nullptr /* null because software compositor */);
+        auto canvas = surface->getCanvas();
+        FML_CHECK(canvas != nullptr);
+
+        switch (layer.platform_view->identifier) {
+          case 1: {
+            SkPaint paint;
+            // See dart test for total order.
+            paint.setColor(SK_ColorGREEN);
+            paint.setAlpha(127);
+            const auto& rect =
+                SkRect::MakeWH(layer.size.width, layer.size.height);
+            canvas->drawRect(rect, paint);
+            latch.CountDown();
+          } break;
+          default:
+            // Asked to render an unknown platform view.
+            FML_CHECK(false)
+                << "Test was asked to composite an unknown platform view.";
+        }
+
+        return surface->makeImageSnapshot();
+      });
+
+  context.AddNativeCallback(
+      "SignalNativeTest",
+      CREATE_NATIVE_ENTRY(
+          [&latch](Dart_NativeArguments args) { latch.CountDown(); }));
+
+  auto engine = builder.LaunchEngine();
+
+  // Send a window metrics events so frames may be scheduled.
+  FlutterWindowMetricsEvent event = {};
+  event.struct_size = sizeof(event);
+  event.width = 800;
+  event.height = 600;
+  event.pixel_ratio = 1.0;
+  event.physical_view_inset_top = 0.0;
+  event.physical_view_inset_right = 0.0;
+  event.physical_view_inset_bottom = 0.0;
+  event.physical_view_inset_left = 0.0;
+  ASSERT_EQ(FlutterEngineSendWindowMetricsEvent(engine.get(), &event),
+            kSuccess);
+  ASSERT_TRUE(engine.is_valid());
+
+  latch.Wait();
+
+  // TODO(https://github.com/flutter/flutter/issues/53784): enable this on all
+  // platforms.
+#if !defined(FML_OS_LINUX)
+  GTEST_SKIP() << "Skipping golden tests on non-Linux OSes";
+#endif  // FML_OS_LINUX
+  ASSERT_TRUE(ImageMatchesFixture(
+      "compositor_platform_layer_with_no_overlay.png", scene_image));
+
+  // There should no present calls on the root surface.
+  ASSERT_EQ(context.GetSurfacePresentCount(), 0u);
+}
+
+//------------------------------------------------------------------------------
+/// Test the layer structure and pixels rendered when using a custom software
+/// compositor, with a no overlay
+///
+TEST_F(EmbedderTest, NoLayerCreatedForNoOverlayOnTopOfPlatformLayer) {
+  auto& context = GetEmbedderContext(EmbedderTestContextType::kSoftwareContext);
+
+  EmbedderConfigBuilder builder(context);
+  builder.SetSoftwareRendererConfig(SkISize::Make(800, 600));
+  builder.SetCompositor();
+  builder.SetDartEntrypoint("can_composite_platform_views_no_overlay");
+
+  builder.SetRenderTargetType(
+      EmbedderTestBackingStoreProducer::RenderTargetType::kSoftwareBuffer);
+
+  fml::CountDownLatch latch(4);
+
+  auto scene_image = context.GetNextSceneImage();
+
+  context.GetCompositor().SetNextPresentCallback(
+      [&](FlutterViewId view_id, const FlutterLayer** layers,
+          size_t layers_count) {
+        ASSERT_EQ(layers_count, 2u);
+
+        // Layer Root
+        {
+          FlutterBackingStore backing_store = *layers[0]->backing_store;
+          backing_store.type = kFlutterBackingStoreTypeSoftware;
+          backing_store.did_update = true;
+          backing_store.software.height = 600;
+
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(0, 0, 800, 600),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
+          FlutterLayer layer = {};
+          layer.struct_size = sizeof(layer);
+          layer.type = kFlutterLayerContentTypeBackingStore;
+          layer.backing_store = &backing_store;
+          layer.size = FlutterSizeMake(800.0, 600.0);
+          layer.offset = FlutterPointMake(0.0, 0.0);
+          layer.backing_store_present_info = &present_info;
+
+          ASSERT_EQ(*layers[0], layer);
+        }
+
+        // Layer 1
+        {
+          FlutterPlatformView platform_view = *layers[1]->platform_view;
+          platform_view.struct_size = sizeof(platform_view);
+          platform_view.identifier = 1;
+
+          FlutterLayer layer = {};
+          layer.struct_size = sizeof(layer);
+          layer.type = kFlutterLayerContentTypePlatformView;
+          layer.platform_view = &platform_view;
+          layer.size = FlutterSizeMake(50.0, 150.0);
+          layer.offset = FlutterPointMake(20.0, 20.0);
+
+          ASSERT_EQ(*layers[1], layer);
+        }
+
+        latch.CountDown();
+      });
+
+  context.GetCompositor().SetPlatformViewRendererCallback(
+      [&](const FlutterLayer& layer, GrDirectContext*
+          /* don't use because software compositor */) -> sk_sp<SkImage> {
+        auto surface = CreateRenderSurface(
+            layer, nullptr /* null because software compositor */);
+        auto canvas = surface->getCanvas();
+        FML_CHECK(canvas != nullptr);
+
+        switch (layer.platform_view->identifier) {
+          case 1: {
+            SkPaint paint;
+            // See dart test for total order.
+            paint.setColor(SK_ColorGREEN);
+            paint.setAlpha(127);
+            const auto& rect =
+                SkRect::MakeWH(layer.size.width, layer.size.height);
+            canvas->drawRect(rect, paint);
+            latch.CountDown();
+          } break;
+          default:
+            // Asked to render an unknown platform view.
+            FML_CHECK(false)
+                << "Test was asked to composite an unknown platform view.";
+        }
+
+        return surface->makeImageSnapshot();
+      });
+
+  context.AddNativeCallback(
+      "SignalNativeTest",
+      CREATE_NATIVE_ENTRY(
+          [&latch](Dart_NativeArguments args) { latch.CountDown(); }));
+
+  auto engine = builder.LaunchEngine();
+
+  // Send a window metrics events so frames may be scheduled.
+  FlutterWindowMetricsEvent event = {};
+  event.struct_size = sizeof(event);
+  event.width = 800;
+  event.height = 600;
+  event.pixel_ratio = 1.0;
+  event.physical_view_inset_top = 0.0;
+  event.physical_view_inset_right = 0.0;
+  event.physical_view_inset_bottom = 0.0;
+  event.physical_view_inset_left = 0.0;
+  ASSERT_EQ(FlutterEngineSendWindowMetricsEvent(engine.get(), &event),
+            kSuccess);
+  ASSERT_TRUE(engine.is_valid());
+
+  latch.Wait();
+
+  // TODO(https://github.com/flutter/flutter/issues/53784): enable this on all
+  // platforms.
+#if !defined(FML_OS_LINUX)
+  GTEST_SKIP() << "Skipping golden tests on non-Linux OSes";
+#endif  // FML_OS_LINUX
+  ASSERT_TRUE(ImageMatchesFixture(
+      "compositor_platform_layer_with_no_overlay.png", scene_image));
+
+  // There should no present calls on the root surface.
+  ASSERT_EQ(context.GetSurfacePresentCount(), 0u);
+}
+
+//------------------------------------------------------------------------------
+/// Test that an engine can be initialized but not run.
+///
+TEST_F(EmbedderTest, CanCreateInitializedEngine) {
+  EmbedderConfigBuilder builder(
+      GetEmbedderContext(EmbedderTestContextType::kSoftwareContext));
+  builder.SetSoftwareRendererConfig();
+  auto engine = builder.InitializeEngine();
+  ASSERT_TRUE(engine.is_valid());
+  engine.reset();
+}
+
+//------------------------------------------------------------------------------
+/// Test that an initialized engine can be run exactly once.
+///
+TEST_F(EmbedderTest, CanRunInitializedEngine) {
+  EmbedderConfigBuilder builder(
+      GetEmbedderContext(EmbedderTestContextType::kSoftwareContext));
+  builder.SetSoftwareRendererConfig();
+  auto engine = builder.InitializeEngine();
+  ASSERT_TRUE(engine.is_valid());
+  ASSERT_EQ(FlutterEngineRunInitialized(engine.get()), kSuccess);
+  // Cannot re-run an already running engine.
+  ASSERT_EQ(FlutterEngineRunInitialized(engine.get()), kInvalidArguments);
+  engine.reset();
+}
+
+//------------------------------------------------------------------------------
+/// Test that an engine can be deinitialized.
+///
+TEST_F(EmbedderTest, CanDeinitializeAnEngine) {
+  EmbedderConfigBuilder builder(
+      GetEmbedderContext(EmbedderTestContextType::kSoftwareContext));
+  builder.SetSoftwareRendererConfig();
+  auto engine = builder.InitializeEngine();
+  ASSERT_TRUE(engine.is_valid());
+  ASSERT_EQ(FlutterEngineRunInitialized(engine.get()), kSuccess);
+  // Cannot re-run an already running engine.
+  ASSERT_EQ(FlutterEngineRunInitialized(engine.get()), kInvalidArguments);
+  ASSERT_EQ(FlutterEngineDeinitialize(engine.get()), kSuccess);
+  // It is ok to deinitialize an engine multiple times.
+  ASSERT_EQ(FlutterEngineDeinitialize(engine.get()), kSuccess);
+
+  // Sending events to a deinitialized engine fails.
+  FlutterWindowMetricsEvent event = {};
+  event.struct_size = sizeof(event);
+  event.width = 800;
+  event.height = 600;
+  event.pixel_ratio = 1.0;
+  event.physical_view_inset_top = 0.0;
+  event.physical_view_inset_right = 0.0;
+  event.physical_view_inset_bottom = 0.0;
+  event.physical_view_inset_left = 0.0;
+  ASSERT_EQ(FlutterEngineSendWindowMetricsEvent(engine.get(), &event),
+            kInvalidArguments);
+  engine.reset();
+}
+
+TEST_F(EmbedderTest, CanRemoveView) {
+  // TODO(loicsharma): We can't test this until views can be added!
+  // https://github.com/flutter/flutter/issues/144806
+}
+
+TEST_F(EmbedderTest, CannotRemoveImplicitView) {
+  auto& context = GetEmbedderContext(EmbedderTestContextType::kSoftwareContext);
+  EmbedderConfigBuilder builder(context);
+  builder.SetSoftwareRendererConfig();
+
+  auto engine = builder.LaunchEngine();
+  ASSERT_TRUE(engine.is_valid());
+
+  FlutterRemoveViewInfo info = {};
+  info.struct_size = sizeof(FlutterRemoveViewInfo);
+  info.view_id = kFlutterImplicitViewId;
+  info.remove_view_callback = [](const FlutterRemoveViewResult* result) {
+    FAIL();
+  };
+  ASSERT_EQ(FlutterEngineRemoveView(engine.get(), &info), kInvalidArguments);
+}
+
+TEST_F(EmbedderTest, CannotRemoveUnknownView) {
+  auto& context = GetEmbedderContext(EmbedderTestContextType::kSoftwareContext);
+  EmbedderConfigBuilder builder(context);
+  builder.SetSoftwareRendererConfig();
+
+  auto engine = builder.LaunchEngine();
+  ASSERT_TRUE(engine.is_valid());
+
+  fml::AutoResetWaitableEvent latch;
+  FlutterRemoveViewInfo info = {};
+  info.struct_size = sizeof(FlutterRemoveViewInfo);
+  info.view_id = 123;
+  info.user_data = &latch;
+  info.remove_view_callback = [](const FlutterRemoveViewResult* result) {
+    ASSERT_FALSE(result->removed);
+    reinterpret_cast<fml::AutoResetWaitableEvent*>(result->user_data)->Signal();
+  };
+  ASSERT_EQ(FlutterEngineRemoveView(engine.get(), &info), kSuccess);
+  latch.Wait();
+}
+
+TEST_F(EmbedderTest, CanUpdateLocales) {
+  auto& context = GetEmbedderContext(EmbedderTestContextType::kSoftwareContext);
+  EmbedderConfigBuilder builder(context);
+  builder.SetSoftwareRendererConfig();
+  builder.SetDartEntrypoint("can_receive_locale_updates");
+  fml::AutoResetWaitableEvent latch;
+  context.AddNativeCallback(
+      "SignalNativeTest",
+      CREATE_NATIVE_ENTRY(
+          [&latch](Dart_NativeArguments args) { latch.Signal(); }));
+
+  fml::AutoResetWaitableEvent check_latch;
+  context.AddNativeCallback(
+      "SignalNativeCount",
+      CREATE_NATIVE_ENTRY([&check_latch](Dart_NativeArguments args) {
+        ASSERT_EQ(tonic::DartConverter<int>::FromDart(
+                      Dart_GetNativeArgument(args, 0)),
+                  2);
+        check_latch.Signal();
+      }));
+
+  auto engine = builder.LaunchEngine();
+  ASSERT_TRUE(engine.is_valid());
+
+  // Wait for the application to attach the listener.
+  latch.Wait();
+
+  FlutterLocale locale1 = {};
+  locale1.struct_size = sizeof(locale1);
+  locale1.language_code = "";  // invalid
+  locale1.country_code = "US";
+  locale1.script_code = "";
+  locale1.variant_code = nullptr;
+
+  FlutterLocale locale2 = {};
+  locale2.struct_size = sizeof(locale2);
+  locale2.language_code = "zh";
+  locale2.country_code = "CN";
+  locale2.script_code = "Hans";
+  locale2.variant_code = nullptr;
+
+  std::vector<const FlutterLocale*> locales;
+  locales.push_back(&locale1);
+  locales.push_back(&locale2);
+
+  ASSERT_EQ(
+      FlutterEngineUpdateLocales(engine.get(), locales.data(), locales.size()),
+      kInvalidArguments);
+
+  // Fix the invalid code.
+  locale1.language_code = "en";
+
+  ASSERT_EQ(
+      FlutterEngineUpdateLocales(engine.get(), locales.data(), locales.size()),
+      kSuccess);
+
+  check_latch.Wait();
+}
+
+TEST_F(EmbedderTest, LocalizationCallbacksCalled) {
+  auto& context = GetEmbedderContext(EmbedderTestContextType::kSoftwareContext);
+  fml::AutoResetWaitableEvent latch;
+  context.AddIsolateCreateCallback([&latch]() { latch.Signal(); });
+  EmbedderConfigBuilder builder(context);
+  builder.SetSoftwareRendererConfig();
+  auto engine = builder.LaunchEngine();
+  ASSERT_TRUE(engine.is_valid());
+  // Wait for the root isolate to launch.
+  latch.Wait();
+
+  flutter::Shell& shell = ToEmbedderEngine(engine.get())->GetShell();
+  std::vector<std::string> supported_locales;
+  supported_locales.push_back("es");
+  supported_locales.push_back("MX");
+  supported_locales.push_back("");
+  auto result = shell.GetPlatformView()->ComputePlatformResolvedLocales(
+      supported_locales);
+
+  ASSERT_EQ((*result).size(), supported_locales.size());  // 3
+  ASSERT_EQ((*result)[0], supported_locales[0]);
+  ASSERT_EQ((*result)[1], supported_locales[1]);
+  ASSERT_EQ((*result)[2], supported_locales[2]);
+
+  engine.reset();
+}
+
+TEST_F(EmbedderTest, CanQueryDartAOTMode) {
+  ASSERT_EQ(FlutterEngineRunsAOTCompiledDartCode(),
+            flutter::DartVM::IsRunningPrecompiledCode());
+}
+
+TEST_F(EmbedderTest, VerifyB143464703WithSoftwareBackend) {
+  auto& context = GetEmbedderContext(EmbedderTestContextType::kSoftwareContext);
+
+  EmbedderConfigBuilder builder(context);
+  builder.SetSoftwareRendererConfig(SkISize::Make(1024, 600));
+  builder.SetCompositor();
+  builder.SetDartEntrypoint("verify_b143464703");
+
+  builder.SetRenderTargetType(
+      EmbedderTestBackingStoreProducer::RenderTargetType::kSoftwareBuffer);
+
+  // setup the screenshot promise.
+  auto rendered_scene = context.GetNextSceneImage();
+
+  fml::CountDownLatch latch(1);
+  context.GetCompositor().SetNextPresentCallback(
+      [&](FlutterViewId view_id, const FlutterLayer** layers,
+          size_t layers_count) {
+        ASSERT_EQ(layers_count, 2u);
+
+        // Layer 0 (Root)
+        {
+          FlutterBackingStore backing_store = *layers[0]->backing_store;
+          backing_store.type = kFlutterBackingStoreTypeSoftware;
+          backing_store.did_update = true;
+
+          FlutterRect paint_region_rects[] = {
+              FlutterRectMakeLTRB(0, 0, 1024, 600),
+          };
+          FlutterRegion paint_region = {
+              .struct_size = sizeof(FlutterRegion),
+              .rects_count = 1,
+              .rects = paint_region_rects,
+          };
+          FlutterBackingStorePresentInfo present_info = {
+              .struct_size = sizeof(FlutterBackingStorePresentInfo),
+              .paint_region = &paint_region,
+          };
+
+          FlutterLayer layer = {};
+          layer.struct_size = sizeof(layer);
+          layer.type = kFlutterLayerContentTypeBackingStore;
+          layer.backing_store = &backing_store;
+          layer.size = FlutterSizeMake(1024.0, 600.0);
+          layer.offset = FlutterPointMake(0.0, 0.0);
+          layer.backing_store_present_info = &present_info;
+
+          ASSERT_EQ(*layers[0], layer);
+        }
+
+        // Layer 1
+        {
+          FlutterPlatformView platform_view = *layers[1]->platform_view;
+          platform_view.struct_size = sizeof(platform_view);
+          platform_view.identifier = 42;
+
+          FlutterLayer layer = {};
+          layer.struct_size = sizeof(layer);
+          layer.type = kFlutterLayerContentTypePlatformView;
+          layer.platform_view = &platform_view;
+          layer.size = FlutterSizeMake(1024.0, 540.0);
+          layer.offset = FlutterPointMake(135.0, 60.0);
+
+          ASSERT_EQ(*layers[1], layer);
+        }
+
+        latch.CountDown();
+      });
+
+  context.GetCompositor().SetPlatformViewRendererCallback(
+      [](const FlutterLayer& layer,
+         GrDirectContext* context) -> sk_sp<SkImage> {
         auto surface = CreateRenderSurface(
             layer, nullptr /* null because software compositor */);
         auto canvas = surface->getCanvas();
@@ -1313,7 +1769,7 @@ TEST_F(EmbedderTest, CanSuccessfullyPopulateSpecificJITSnapshotCallbacks) {
 // TODO(#107263): Inconsistent snapshot paths in the Linux Fuchsia FEMU test.
 #if defined(OS_FUCHSIA)
   GTEST_SKIP() << "Inconsistent paths in Fuchsia.";
-#endif  // OS_FUCHSIA
+#else
 
   // This test is only relevant in JIT mode.
   if (DartVM::IsRunningPrecompiledCode()) {
@@ -1356,6 +1812,7 @@ TEST_F(EmbedderTest, CanSuccessfullyPopulateSpecificJITSnapshotCallbacks) {
   ASSERT_NE(settings.isolate_snapshot_data(), nullptr);
   ASSERT_NE(settings.isolate_snapshot_instr(), nullptr);
   ASSERT_NE(settings.dart_library_sources_kernel(), nullptr);
+#endif  // OS_FUCHSIA
 }
 
 //------------------------------------------------------------------------------
@@ -1368,7 +1825,7 @@ TEST_F(EmbedderTest, JITSnapshotCallbacksFailWithInvalidLocation) {
 // TODO(#107263): Inconsistent snapshot paths in the Linux Fuchsia FEMU test.
 #if defined(OS_FUCHSIA)
   GTEST_SKIP() << "Inconsistent paths in Fuchsia.";
-#endif  // OS_FUCHSIA
+#else
 
   // This test is only relevant in JIT mode.
   if (DartVM::IsRunningPrecompiledCode()) {
@@ -1399,6 +1856,7 @@ TEST_F(EmbedderTest, JITSnapshotCallbacksFailWithInvalidLocation) {
   ASSERT_EQ(settings.vm_snapshot_instr(), nullptr);
   ASSERT_EQ(settings.isolate_snapshot_data(), nullptr);
   ASSERT_EQ(settings.isolate_snapshot_instr(), nullptr);
+#endif  // OS_FUCHSIA
 }
 
 //------------------------------------------------------------------------------
@@ -1590,7 +2048,8 @@ static void expectSoftwareRenderingOutputMatches(
   ASSERT_TRUE(engine.is_valid());
 
   context.GetCompositor().SetNextPresentCallback(
-      [&matches, &bytes, &latch](const FlutterLayer** layers,
+      [&matches, &bytes, &latch](FlutterViewId view_id,
+                                 const FlutterLayer** layers,
                                  size_t layers_count) {
         ASSERT_EQ(layers[0]->type, kFlutterLayerContentTypeBackingStore);
         ASSERT_EQ(layers[0]->backing_store->type,
@@ -1635,49 +2094,71 @@ static void expectSoftwareRenderingOutputMatches(
                                          matcher);                        \
   }
 
-// Don't test the pixel formats that contain padding (so an X) and the kNative32
-// pixel format here, so we don't add any flakiness.
-SW_PIXFMT_TEST_F(RedRGBA565xF800, draw_solid_red, kRGB565, (uint16_t)0xF800);
-SW_PIXFMT_TEST_F(RedRGBA4444xF00F, draw_solid_red, kRGBA4444, (uint16_t)0xF00F);
+// Don't test the pixel formats that contain padding (so an X) and the
+// kFlutterSoftwarePixelFormatNative32 pixel format here, so we don't add any
+// flakiness.
+SW_PIXFMT_TEST_F(RedRGBA565xF800,
+                 draw_solid_red,
+                 kFlutterSoftwarePixelFormatRGB565,
+                 (uint16_t)0xF800);
+SW_PIXFMT_TEST_F(RedRGBA4444xF00F,
+                 draw_solid_red,
+                 kFlutterSoftwarePixelFormatRGBA4444,
+                 (uint16_t)0xF00F);
 SW_PIXFMT_TEST_F(RedRGBA8888xFFx00x00xFF,
                  draw_solid_red,
-                 kRGBA8888,
+                 kFlutterSoftwarePixelFormatRGBA8888,
                  (std::vector<uint8_t>{0xFF, 0x00, 0x00, 0xFF}));
 SW_PIXFMT_TEST_F(RedBGRA8888x00x00xFFxFF,
                  draw_solid_red,
-                 kBGRA8888,
+                 kFlutterSoftwarePixelFormatBGRA8888,
                  (std::vector<uint8_t>{0x00, 0x00, 0xFF, 0xFF}));
-SW_PIXFMT_TEST_F(RedGray8x36, draw_solid_red, kGray8, (uint8_t)0x36);
+SW_PIXFMT_TEST_F(RedGray8x36,
+                 draw_solid_red,
+                 kFlutterSoftwarePixelFormatGray8,
+                 (uint8_t)0x36);
 
-SW_PIXFMT_TEST_F(GreenRGB565x07E0, draw_solid_green, kRGB565, (uint16_t)0x07E0);
+SW_PIXFMT_TEST_F(GreenRGB565x07E0,
+                 draw_solid_green,
+                 kFlutterSoftwarePixelFormatRGB565,
+                 (uint16_t)0x07E0);
 SW_PIXFMT_TEST_F(GreenRGBA4444x0F0F,
                  draw_solid_green,
-                 kRGBA4444,
+                 kFlutterSoftwarePixelFormatRGBA4444,
                  (uint16_t)0x0F0F);
 SW_PIXFMT_TEST_F(GreenRGBA8888x00xFFx00xFF,
                  draw_solid_green,
-                 kRGBA8888,
+                 kFlutterSoftwarePixelFormatRGBA8888,
                  (std::vector<uint8_t>{0x00, 0xFF, 0x00, 0xFF}));
 SW_PIXFMT_TEST_F(GreenBGRA8888x00xFFx00xFF,
                  draw_solid_green,
-                 kBGRA8888,
+                 kFlutterSoftwarePixelFormatBGRA8888,
                  (std::vector<uint8_t>{0x00, 0xFF, 0x00, 0xFF}));
-SW_PIXFMT_TEST_F(GreenGray8xB6, draw_solid_green, kGray8, (uint8_t)0xB6);
+SW_PIXFMT_TEST_F(GreenGray8xB6,
+                 draw_solid_green,
+                 kFlutterSoftwarePixelFormatGray8,
+                 (uint8_t)0xB6);
 
-SW_PIXFMT_TEST_F(BlueRGB565x001F, draw_solid_blue, kRGB565, (uint16_t)0x001F);
+SW_PIXFMT_TEST_F(BlueRGB565x001F,
+                 draw_solid_blue,
+                 kFlutterSoftwarePixelFormatRGB565,
+                 (uint16_t)0x001F);
 SW_PIXFMT_TEST_F(BlueRGBA4444x00FF,
                  draw_solid_blue,
-                 kRGBA4444,
+                 kFlutterSoftwarePixelFormatRGBA4444,
                  (uint16_t)0x00FF);
 SW_PIXFMT_TEST_F(BlueRGBA8888x00x00xFFxFF,
                  draw_solid_blue,
-                 kRGBA8888,
+                 kFlutterSoftwarePixelFormatRGBA8888,
                  (std::vector<uint8_t>{0x00, 0x00, 0xFF, 0xFF}));
 SW_PIXFMT_TEST_F(BlueBGRA8888xFFx00x00xFF,
                  draw_solid_blue,
-                 kBGRA8888,
+                 kFlutterSoftwarePixelFormatBGRA8888,
                  (std::vector<uint8_t>{0xFF, 0x00, 0x00, 0xFF}));
-SW_PIXFMT_TEST_F(BlueGray8x12, draw_solid_blue, kGray8, (uint8_t)0x12);
+SW_PIXFMT_TEST_F(BlueGray8x12,
+                 draw_solid_blue,
+                 kFlutterSoftwarePixelFormatGray8,
+                 (uint8_t)0x12);
 
 //------------------------------------------------------------------------------
 // Key Data
@@ -1690,19 +2171,41 @@ typedef struct {
 
 // Convert `kind` in integer form to its enum form.
 //
-// It performs a revesed mapping from `_serializeKeyEventType`
+// It performs a revesed mapping from `_serializeKeyEventType`
+// in shell/platform/embedder/fixtures/main.dart.
+FlutterKeyEventType UnserializeKeyEventType(uint64_t kind) {
+  switch (kind) {
+    case 1:
+      return kFlutterKeyEventTypeUp;
+    case 2:
+      return kFlutterKeyEventTypeDown;
+    case 3:
+      return kFlutterKeyEventTypeRepeat;
+    default:
+      FML_UNREACHABLE();
+      return kFlutterKeyEventTypeUp;
+  }
+}
+
+// Convert `source` in integer form to its enum form.
+//
+// It performs a revesed mapping from `_serializeKeyEventDeviceType`
 // in shell/platform/embedder/fixtures/main.dart.
-FlutterKeyEventType UnserializeKeyEventKind(uint64_t kind) {
-  switch (kind) {
+FlutterKeyEventDeviceType UnserializeKeyEventDeviceType(uint64_t source) {
+  switch (source) {
     case 1:
-      return kFlutterKeyEventTypeUp;
+      return kFlutterKeyEventDeviceTypeKeyboard;
     case 2:
-      return kFlutterKeyEventTypeDown;
+      return kFlutterKeyEventDeviceTypeDirectionalPad;
     case 3:
-      return kFlutterKeyEventTypeRepeat;
+      return kFlutterKeyEventDeviceTypeGamepad;
+    case 4:
+      return kFlutterKeyEventDeviceTypeJoystick;
+    case 5:
+      return kFlutterKeyEventDeviceTypeHdmi;
     default:
       FML_UNREACHABLE();
-      return kFlutterKeyEventTypeUp;
+      return kFlutterKeyEventDeviceTypeKeyboard;
   }
 }
 
@@ -1715,16 +2218,18 @@ void ExpectKeyEventEq(const FlutterKeyEvent& subject,
   EXPECT_EQ(subject.physical, baseline.physical);
   EXPECT_EQ(subject.logical, baseline.logical);
   EXPECT_EQ(subject.synthesized, baseline.synthesized);
+  EXPECT_EQ(subject.device_type, baseline.device_type);
 }
 
 TEST_F(EmbedderTest, KeyDataIsCorrectlySerialized) {
   auto message_latch = std::make_shared<fml::AutoResetWaitableEvent>();
   uint64_t echoed_char;
   FlutterKeyEvent echoed_event;
+  echoed_event.struct_size = sizeof(FlutterKeyEvent);
 
   auto native_echo_event = [&](Dart_NativeArguments args) {
     echoed_event.type =
-        UnserializeKeyEventKind(tonic::DartConverter<uint64_t>::FromDart(
+        UnserializeKeyEventType(tonic::DartConverter<uint64_t>::FromDart(
             Dart_GetNativeArgument(args, 0)));
     echoed_event.timestamp =
         static_cast<double>(tonic::DartConverter<uint64_t>::FromDart(
@@ -1737,25 +2242,40 @@ TEST_F(EmbedderTest, KeyDataIsCorrectlySerialized) {
         Dart_GetNativeArgument(args, 4));
     echoed_event.synthesized =
         tonic::DartConverter<bool>::FromDart(Dart_GetNativeArgument(args, 5));
+    echoed_event.device_type =
+        UnserializeKeyEventDeviceType(tonic::DartConverter<uint64_t>::FromDart(
+            Dart_GetNativeArgument(args, 6)));
 
     message_latch->Signal();
   };
 
-  auto& context = GetEmbedderContext(EmbedderTestContextType::kSoftwareContext);
-  EmbedderConfigBuilder builder(context);
-  builder.SetSoftwareRendererConfig();
-  builder.SetDartEntrypoint("key_data_echo");
+  auto platform_task_runner = CreateNewThread("platform_thread");
+
+  UniqueEngine engine;
   fml::AutoResetWaitableEvent ready;
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&ready](Dart_NativeArguments args) { ready.Signal(); }));
+  platform_task_runner->PostTask([&]() {
+    auto& context =
+        GetEmbedderContext(EmbedderTestContextType::kSoftwareContext);
+    EmbedderConfigBuilder builder(context);
+    builder.SetSoftwareRendererConfig();
+    builder.SetDartEntrypoint("key_data_echo");
+    builder.SetPlatformMessageCallback(
+        [&](const FlutterPlatformMessage* message) {
+          FlutterEngineSendPlatformMessageResponse(
+              engine.get(), message->response_handle, nullptr, 0);
+        });
+    context.AddNativeCallback(
+        "SignalNativeTest",
+        CREATE_NATIVE_ENTRY(
+            [&ready](Dart_NativeArguments args) { ready.Signal(); }));
 
-  context.AddNativeCallback("EchoKeyEvent",
-                            CREATE_NATIVE_ENTRY(native_echo_event));
+    context.AddNativeCallback("EchoKeyEvent",
+                              CREATE_NATIVE_ENTRY(native_echo_event));
+
+    engine = builder.LaunchEngine();
+    ASSERT_TRUE(engine.is_valid());
+  });
 
-  auto engine = builder.LaunchEngine();
-  ASSERT_TRUE(engine.is_valid());
   ready.Wait();
 
   // A normal down event
@@ -1767,9 +2287,12 @@ TEST_F(EmbedderTest, KeyDataIsCorrectlySerialized) {
       .logical = 0x00000000061,
       .character = "A",
       .synthesized = false,
+      .device_type = kFlutterKeyEventDeviceTypeKeyboard,
   };
-  FlutterEngineSendKeyEvent(engine.get(), &down_event_upper_a, nullptr,
-                            nullptr);
+  platform_task_runner->PostTask([&]() {
+    FlutterEngineSendKeyEvent(engine.get(), &down_event_upper_a, nullptr,
+                              nullptr);
+  });
   message_latch->Wait();
 
   ExpectKeyEventEq(echoed_event, down_event_upper_a);
@@ -1784,9 +2307,12 @@ TEST_F(EmbedderTest, KeyDataIsCorrectlySerialized) {
       .logical = 0x00000000062,
       .character = "∆",
       .synthesized = false,
+      .device_type = kFlutterKeyEventDeviceTypeKeyboard,
   };
-  FlutterEngineSendKeyEvent(engine.get(), &repeat_event_wide_char, nullptr,
-                            nullptr);
+  platform_task_runner->PostTask([&]() {
+    FlutterEngineSendKeyEvent(engine.get(), &repeat_event_wide_char, nullptr,
+                              nullptr);
+  });
   message_latch->Wait();
 
   ExpectKeyEventEq(echoed_event, repeat_event_wide_char);
@@ -1801,12 +2327,22 @@ TEST_F(EmbedderTest, KeyDataIsCorrectlySerialized) {
       .logical = 0x00000000063,
       .character = nullptr,
       .synthesized = true,
+      .device_type = kFlutterKeyEventDeviceTypeKeyboard,
   };
-  FlutterEngineSendKeyEvent(engine.get(), &up_event, nullptr, nullptr);
+  platform_task_runner->PostTask([&]() {
+    FlutterEngineSendKeyEvent(engine.get(), &up_event, nullptr, nullptr);
+  });
   message_latch->Wait();
 
   ExpectKeyEventEq(echoed_event, up_event);
   EXPECT_EQ(echoed_char, 0llu);
+
+  fml::AutoResetWaitableEvent shutdown_latch;
+  platform_task_runner->PostTask([&]() {
+    engine.reset();
+    shutdown_latch.Signal();
+  });
+  shutdown_latch.Wait();
 }
 
 TEST_F(EmbedderTest, KeyDataAreBuffered) {
@@ -1819,7 +2355,7 @@ TEST_F(EmbedderTest, KeyDataAreBuffered) {
             static_cast<double>(tonic::DartConverter<uint64_t>::FromDart(
                 Dart_GetNativeArgument(args, 1))),
         .type =
-            UnserializeKeyEventKind(tonic::DartConverter<uint64_t>::FromDart(
+            UnserializeKeyEventType(tonic::DartConverter<uint64_t>::FromDart(
                 Dart_GetNativeArgument(args, 0))),
         .physical = tonic::DartConverter<uint64_t>::FromDart(
             Dart_GetNativeArgument(args, 2)),
@@ -1827,26 +2363,40 @@ TEST_F(EmbedderTest, KeyDataAreBuffered) {
             Dart_GetNativeArgument(args, 3)),
         .synthesized = tonic::DartConverter<bool>::FromDart(
             Dart_GetNativeArgument(args, 5)),
+        .device_type = UnserializeKeyEventDeviceType(
+            tonic::DartConverter<uint64_t>::FromDart(
+                Dart_GetNativeArgument(args, 6))),
     });
 
     message_latch->Signal();
   };
 
-  auto& context = GetEmbedderContext(EmbedderTestContextType::kSoftwareContext);
-  EmbedderConfigBuilder builder(context);
-  builder.SetSoftwareRendererConfig();
-  builder.SetDartEntrypoint("key_data_late_echo");
+  auto platform_task_runner = CreateNewThread("platform_thread");
+
+  UniqueEngine engine;
   fml::AutoResetWaitableEvent ready;
-  context.AddNativeCallback(
-      "SignalNativeTest",
-      CREATE_NATIVE_ENTRY(
-          [&ready](Dart_NativeArguments args) { ready.Signal(); }));
+  platform_task_runner->PostTask([&]() {
+    auto& context =
+        GetEmbedderContext(EmbedderTestContextType::kSoftwareContext);
+    EmbedderConfigBuilder builder(context);
+    builder.SetSoftwareRendererConfig();
+    builder.SetDartEntrypoint("key_data_late_echo");
+    builder.SetPlatformMessageCallback(
+        [&](const FlutterPlatformMessage* message) {
+          FlutterEngineSendPlatformMessageResponse(
+              engine.get(), message->response_handle, nullptr, 0);
+        });
+    context.AddNativeCallback(
+        "SignalNativeTest",
+        CREATE_NATIVE_ENTRY(
+            [&ready](Dart_NativeArguments args) { ready.Signal(); }));
 
-  context.AddNativeCallback("EchoKeyEvent",
-                            CREATE_NATIVE_ENTRY(native_echo_event));
+    context.AddNativeCallback("EchoKeyEvent",
+                              CREATE_NATIVE_ENTRY(native_echo_event));
 
-  auto engine = builder.LaunchEngine();
-  ASSERT_TRUE(engine.is_valid());
+    engine = builder.LaunchEngine();
+    ASSERT_TRUE(engine.is_valid());
+  });
   ready.Wait();
 
   FlutterKeyEvent sample_event{
@@ -1856,11 +2406,16 @@ TEST_F(EmbedderTest, KeyDataAreBuffered) {
       .logical = 0x00000000061,
       .character = "A",
       .synthesized = false,
+      .device_type = kFlutterKeyEventDeviceTypeKeyboard,
   };
 
   // Send an event.
   sample_event.timestamp = 1.0l;
-  FlutterEngineSendKeyEvent(engine.get(), &sample_event, nullptr, nullptr);
+  platform_task_runner->PostTask([&]() {
+    FlutterEngineSendKeyEvent(engine.get(), &sample_event, nullptr, nullptr);
+    message_latch->Signal();
+  });
+  message_latch->Wait();
 
   // Should not receive echos because the callback is not set yet.
   EXPECT_EQ(echoed_events.size(), 0u);
@@ -1879,11 +2434,13 @@ TEST_F(EmbedderTest, KeyDataAreBuffered) {
       .response_handle = response_handle,
   };
 
-  FlutterEngineResult result =
-      FlutterEngineSendPlatformMessage(engine.get(), &message);
-  ASSERT_EQ(result, kSuccess);
+  platform_task_runner->PostTask([&]() {
+    FlutterEngineResult result =
+        FlutterEngineSendPlatformMessage(engine.get(), &message);
+    ASSERT_EQ(result, kSuccess);
 
-  FlutterPlatformMessageReleaseResponseHandle(engine.get(), response_handle);
+    FlutterPlatformMessageReleaseResponseHandle(engine.get(), response_handle);
+  });
 
   // message_latch->Wait();
   message_latch->Wait();
@@ -1892,11 +2449,20 @@ TEST_F(EmbedderTest, KeyDataAreBuffered) {
 
   // Send a second event.
   sample_event.timestamp = 10.0l;
-  FlutterEngineSendKeyEvent(engine.get(), &sample_event, nullptr, nullptr);
+  platform_task_runner->PostTask([&]() {
+    FlutterEngineSendKeyEvent(engine.get(), &sample_event, nullptr, nullptr);
+  });
   message_latch->Wait();
 
   // The event should be echoed, too.
   EXPECT_EQ(echoed_events.size(), 2u);
+
+  fml::AutoResetWaitableEvent shutdown_latch;
+  platform_task_runner->PostTask([&]() {
+    engine.reset();
+    shutdown_latch.Signal();
+  });
+  shutdown_latch.Wait();
 }
 
 TEST_F(EmbedderTest, KeyDataResponseIsCorrectlyInvoked) {
@@ -1939,6 +2505,7 @@ TEST_F(EmbedderTest, KeyDataResponseIsCorrectlyInvoked) {
       .physical = 0x00070005,
       .logical = 0x00000000062,
       .character = nullptr,
+      .device_type = kFlutterKeyEventDeviceTypeKeyboard,
   };
 
   KeyEventUserData user_data1{
@@ -2015,6 +2582,7 @@ TEST_F(EmbedderTest, BackToBackKeyEventResponsesCorrectlyInvoked) {
       .logical = 0x00000000062,
       .character = nullptr,
       .synthesized = false,
+      .device_type = kFlutterKeyEventDeviceTypeKeyboard,
   };
 
   // Dispatch two events back to back, using the same callback on different
@@ -2187,7 +2755,7 @@ static void MockThreadConfigSetter(const fml::Thread::ThreadConfig& config) {
   struct sched_param param;
   int policy = SCHED_OTHER;
   switch (config.priority) {
-    case fml::Thread::ThreadPriority::DISPLAY:
+    case fml::Thread::ThreadPriority::kDisplay:
       param.sched_priority = 10;
       break;
     default:
@@ -2220,6 +2788,293 @@ TEST_F(EmbedderTest, EmbedderThreadHostUseCustomThreadConfig) {
 }
 #endif
 
+/// Send a pointer event to Dart and wait until the Dart code signals
+/// it received the event.
+TEST_F(EmbedderTest, CanSendPointer) {
+  auto& context = GetEmbedderContext(EmbedderTestContextType::kSoftwareContext);
+  EmbedderConfigBuilder builder(context);
+  builder.SetSoftwareRendererConfig();
+  builder.SetDartEntrypoint("pointer_data_packet");
+
+  fml::AutoResetWaitableEvent ready_latch, count_latch, message_latch;
+  context.AddNativeCallback(
+      "SignalNativeTest",
+      CREATE_NATIVE_ENTRY(
+          [&ready_latch](Dart_NativeArguments args) { ready_latch.Signal(); }));
+  context.AddNativeCallback(
+      "SignalNativeCount",
+      CREATE_NATIVE_ENTRY([&count_latch](Dart_NativeArguments args) {
+        int count = tonic::DartConverter<int>::FromDart(
+            Dart_GetNativeArgument(args, 0));
+        ASSERT_EQ(count, 1);
+        count_latch.Signal();
+      }));
+  context.AddNativeCallback(
+      "SignalNativeMessage",
+      CREATE_NATIVE_ENTRY([&message_latch](Dart_NativeArguments args) {
+        auto message = tonic::DartConverter<std::string>::FromDart(
+            Dart_GetNativeArgument(args, 0));
+        ASSERT_EQ("PointerData(viewId: 0, x: 123.0, y: 456.0)", message);
+        message_latch.Signal();
+      }));
+
+  auto engine = builder.LaunchEngine();
+  ASSERT_TRUE(engine.is_valid());
+
+  ready_latch.Wait();
+
+  FlutterPointerEvent pointer_event = {};
+  pointer_event.struct_size = sizeof(FlutterPointerEvent);
+  pointer_event.phase = FlutterPointerPhase::kAdd;
+  pointer_event.x = 123;
+  pointer_event.y = 456;
+  pointer_event.timestamp = static_cast<size_t>(1234567890);
+  pointer_event.view_id = 0;
+
+  FlutterEngineResult result =
+      FlutterEngineSendPointerEvent(engine.get(), &pointer_event, 1);
+  ASSERT_EQ(result, kSuccess);
+
+  count_latch.Wait();
+  message_latch.Wait();
+}
+
+/// Send a pointer event to Dart and wait until the Dart code echos with the
+/// view ID.
+TEST_F(EmbedderTest, CanSendPointerEventWithViewId) {
+  auto& context = GetEmbedderContext(EmbedderTestContextType::kSoftwareContext);
+  EmbedderConfigBuilder builder(context);
+  builder.SetSoftwareRendererConfig();
+  builder.SetDartEntrypoint("pointer_data_packet_view_id");
+
+  fml::AutoResetWaitableEvent ready_latch, count_latch, message_latch;
+  context.AddNativeCallback(
+      "SignalNativeTest",
+      CREATE_NATIVE_ENTRY(
+          [&ready_latch](Dart_NativeArguments args) { ready_latch.Signal(); }));
+  context.AddNativeCallback(
+      "SignalNativeMessage",
+      CREATE_NATIVE_ENTRY([&message_latch](Dart_NativeArguments args) {
+        auto message = tonic::DartConverter<std::string>::FromDart(
+            Dart_GetNativeArgument(args, 0));
+        ASSERT_EQ("ViewID: 2", message);
+        message_latch.Signal();
+      }));
+
+  auto engine = builder.LaunchEngine();
+  ASSERT_TRUE(engine.is_valid());
+
+  ready_latch.Wait();
+
+  FlutterPointerEvent pointer_event = {};
+  pointer_event.struct_size = sizeof(FlutterPointerEvent);
+  pointer_event.phase = FlutterPointerPhase::kAdd;
+  pointer_event.x = 123;
+  pointer_event.y = 456;
+  pointer_event.timestamp = static_cast<size_t>(1234567890);
+  pointer_event.view_id = 2;
+
+  FlutterEngineResult result =
+      FlutterEngineSendPointerEvent(engine.get(), &pointer_event, 1);
+  ASSERT_EQ(result, kSuccess);
+
+  message_latch.Wait();
+}
+
+TEST_F(EmbedderTest, WindowMetricsEventDefaultsToImplicitView) {
+  auto& context = GetEmbedderContext(EmbedderTestContextType::kSoftwareContext);
+  EmbedderConfigBuilder builder(context);
+  builder.SetSoftwareRendererConfig();
+  builder.SetDartEntrypoint("window_metrics_event_view_id");
+
+  fml::AutoResetWaitableEvent ready_latch, message_latch;
+  context.AddNativeCallback(
+      "SignalNativeTest",
+      CREATE_NATIVE_ENTRY(
+          [&ready_latch](Dart_NativeArguments args) { ready_latch.Signal(); }));
+  context.AddNativeCallback(
+      "SignalNativeMessage",
+      CREATE_NATIVE_ENTRY([&message_latch](Dart_NativeArguments args) {
+        auto message = tonic::DartConverter<std::string>::FromDart(
+            Dart_GetNativeArgument(args, 0));
+        ASSERT_EQ("Changed: [0]", message);
+        message_latch.Signal();
+      }));
+
+  auto engine = builder.LaunchEngine();
+  ASSERT_TRUE(engine.is_valid());
+
+  ready_latch.Wait();
+
+  FlutterWindowMetricsEvent event = {};
+  // Simulate an event that comes from an old version of embedder.h that doesn't
+  // have the view_id field.
+  event.struct_size = offsetof(FlutterWindowMetricsEvent, view_id);
+  event.width = 200;
+  event.height = 300;
+  event.pixel_ratio = 1.5;
+  // Skip assigning event.view_id here to test the default behavior.
+
+  FlutterEngineResult result =
+      FlutterEngineSendWindowMetricsEvent(engine.get(), &event);
+  ASSERT_EQ(result, kSuccess);
+
+  message_latch.Wait();
+}
+
+TEST_F(EmbedderTest, IgnoresWindowMetricsEventForUnknownView) {
+  auto& context = GetEmbedderContext(EmbedderTestContextType::kSoftwareContext);
+  EmbedderConfigBuilder builder(context);
+  builder.SetSoftwareRendererConfig();
+  builder.SetDartEntrypoint("window_metrics_event_view_id");
+
+  fml::AutoResetWaitableEvent ready_latch, message_latch;
+  context.AddNativeCallback(
+      "SignalNativeTest",
+      CREATE_NATIVE_ENTRY(
+          [&ready_latch](Dart_NativeArguments args) { ready_latch.Signal(); }));
+
+  context.AddNativeCallback(
+      "SignalNativeMessage",
+      CREATE_NATIVE_ENTRY([&message_latch](Dart_NativeArguments args) {
+        auto message = tonic::DartConverter<std::string>::FromDart(
+            Dart_GetNativeArgument(args, 0));
+        // Message latch should only be signaled once as the bad
+        // view metric should be dropped by the engine.
+        ASSERT_FALSE(message_latch.IsSignaledForTest());
+        ASSERT_EQ("Changed: [0]", message);
+        message_latch.Signal();
+      }));
+
+  auto engine = builder.LaunchEngine();
+  ASSERT_TRUE(engine.is_valid());
+
+  ready_latch.Wait();
+
+  // Send a window metric for a nonexistent view, which should be dropped by the
+  // engine.
+  FlutterWindowMetricsEvent bad_event = {};
+  bad_event.struct_size = sizeof(FlutterWindowMetricsEvent);
+  bad_event.width = 200;
+  bad_event.height = 300;
+  bad_event.pixel_ratio = 1.5;
+  bad_event.view_id = 100;
+
+  FlutterEngineResult result =
+      FlutterEngineSendWindowMetricsEvent(engine.get(), &bad_event);
+  ASSERT_EQ(result, kSuccess);
+
+  // Send a window metric for a valid view. The engine notifies the Dart app.
+  FlutterWindowMetricsEvent event = {};
+  event.struct_size = sizeof(FlutterWindowMetricsEvent);
+  event.width = 200;
+  event.height = 300;
+  event.pixel_ratio = 1.5;
+  event.view_id = 0;
+
+  result = FlutterEngineSendWindowMetricsEvent(engine.get(), &event);
+  ASSERT_EQ(result, kSuccess);
+
+  message_latch.Wait();
+}
+
+TEST_F(EmbedderTest, RegisterChannelListener) {
+  auto& context = GetEmbedderContext(EmbedderTestContextType::kSoftwareContext);
+
+  fml::AutoResetWaitableEvent latch;
+  fml::AutoResetWaitableEvent latch2;
+  bool listening = false;
+  context.AddNativeCallback(
+      "SignalNativeTest",
+      CREATE_NATIVE_ENTRY([&](Dart_NativeArguments) { latch.Signal(); }));
+  context.SetChannelUpdateCallback([&](const FlutterChannelUpdate* update) {
+    EXPECT_STREQ(update->channel, "test/listen");
+    EXPECT_TRUE(update->listening);
+    listening = true;
+    latch2.Signal();
+  });
+
+  EmbedderConfigBuilder builder(context);
+  builder.SetSoftwareRendererConfig();
+  builder.SetDartEntrypoint("channel_listener_response");
+
+  auto engine = builder.LaunchEngine();
+  ASSERT_TRUE(engine.is_valid());
+
+  latch.Wait();
+  // Drain tasks posted to platform thread task runner.
+  fml::MessageLoop::GetCurrent().RunExpiredTasksNow();
+  latch2.Wait();
+
+  ASSERT_TRUE(listening);
+}
+
+TEST_F(EmbedderTest, PlatformThreadIsolatesWithCustomPlatformTaskRunner) {
+  auto& context = GetEmbedderContext(EmbedderTestContextType::kSoftwareContext);
+  static fml::AutoResetWaitableEvent latch;
+
+  static std::thread::id ffi_call_thread_id;
+  static void (*ffi_signal_native_test)() = []() -> void {
+    ffi_call_thread_id = std::this_thread::get_id();
+    latch.Signal();
+  };
+
+  Dart_FfiNativeResolver ffi_resolver = [](const char* name,
+                                           uintptr_t args_n) -> void* {
+    if (std::string_view(name) == "FFISignalNativeTest") {
+      return reinterpret_cast<void*>(ffi_signal_native_test);
+    }
+    return nullptr;
+  };
+
+  // The test's Dart code will call this native function which overrides the
+  // FFI resolver.  After that, the Dart code will invoke the FFI function
+  // using runOnPlatformThread.
+  context.AddNativeCallback(
+      "SignalNativeTest", CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) {
+        Dart_SetFfiNativeResolver(Dart_RootLibrary(), ffi_resolver);
+      }));
+
+  auto platform_task_runner = CreateNewThread("test_platform_thread");
+
+  UniqueEngine engine;
+
+  EmbedderTestTaskRunner test_task_runner(
+      platform_task_runner, [&](FlutterTask task) {
+        if (!engine.is_valid()) {
+          return;
+        }
+        FlutterEngineRunTask(engine.get(), &task);
+      });
+
+  std::thread::id platform_thread_id;
+  platform_task_runner->PostTask([&]() {
+    platform_thread_id = std::this_thread::get_id();
+
+    EmbedderConfigBuilder builder(context);
+    const auto task_runner_description =
+        test_task_runner.GetFlutterTaskRunnerDescription();
+    builder.SetSoftwareRendererConfig();
+    builder.SetPlatformTaskRunner(&task_runner_description);
+    builder.SetDartEntrypoint("invokePlatformThreadIsolate");
+    engine = builder.LaunchEngine();
+    ASSERT_TRUE(engine.is_valid());
+  });
+
+  latch.Wait();
+
+  fml::AutoResetWaitableEvent kill_latch;
+  platform_task_runner->PostTask(fml::MakeCopyable([&]() mutable {
+    engine.reset();
+
+    platform_task_runner->PostTask([&kill_latch] { kill_latch.Signal(); });
+  }));
+  kill_latch.Wait();
+
+  // Check that the FFI call was executed on the platform thread.
+  ASSERT_EQ(platform_thread_id, ffi_call_thread_id);
+}
+
 }  // namespace testing
 }  // namespace flutter
 
diff --git a/shell/platform/embedder/tests/embedder_unittests_util.cc b/shell/platform/embedder/tests/embedder_unittests_util.cc
index d6e923637928086071437ce69c87c22dfd00a02e..a29bf166a3ae54a9b3b4a9b4f17165671beecd8c 100644
--- a/shell/platform/embedder/tests/embedder_unittests_util.cc
+++ b/shell/platform/embedder/tests/embedder_unittests_util.cc
@@ -10,6 +10,11 @@
 #include "flutter/shell/platform/embedder/tests/embedder_test_backingstore_producer.h"
 #include "flutter/shell/platform/embedder/tests/embedder_unittests_util.h"
 
+#include "third_party/skia/include/core/SkImage.h"
+#include "third_party/skia/include/core/SkSurface.h"
+#include "third_party/skia/include/encode/SkPngEncoder.h"
+#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
+
 namespace flutter {
 namespace testing {
 
@@ -17,9 +22,9 @@ sk_sp<SkSurface> CreateRenderSurface(const FlutterLayer& layer,
                                      GrDirectContext* context) {
   const auto image_info =
       SkImageInfo::MakeN32Premul(layer.size.width, layer.size.height);
-  auto surface = context ? SkSurface::MakeRenderTarget(
+  auto surface = context ? SkSurfaces::RenderTarget(
                                context,                   // context
-                               SkBudgeted::kNo,           // budgeted
+                               skgpu::Budgeted::kNo,      // budgeted
                                image_info,                // image info
                                1,                         // sample count
                                kTopLeft_GrSurfaceOrigin,  // surface origin
@@ -27,7 +32,7 @@ sk_sp<SkSurface> CreateRenderSurface(const FlutterLayer& layer,
                                false                      // mipmaps
 
                                )
-                         : SkSurface::MakeRaster(image_info);
+                         : SkSurfaces::Raster(image_info);
   FML_CHECK(surface != nullptr);
   return surface;
 }
@@ -133,7 +138,7 @@ bool WriteImageToDisk(const fml::UniqueFD& directory,
     return false;
   }
 
-  auto data = image->encodeToData();
+  auto data = SkPngEncoder::Encode(nullptr, image.get(), {});
 
   if (!data) {
     return false;
@@ -154,7 +159,8 @@ bool ImageMatchesFixture(const std::string& fixture_file_name,
   auto encoded_image = SkData::MakeWithoutCopy(
       fixture_image_mapping.GetMapping(), fixture_image_mapping.GetSize());
   auto fixture_image =
-      SkImage::MakeFromEncoded(std::move(encoded_image))->makeRasterImage();
+      SkImages::DeferredFromEncodedData(std::move(encoded_image))
+          ->makeRasterImage();
 
   FML_CHECK(fixture_image) << "Could not create image from fixture: "
                            << fixture_file_name;
@@ -162,6 +168,7 @@ bool ImageMatchesFixture(const std::string& fixture_file_name,
   FML_CHECK(scene_image) << "Invalid scene image.";
 
   auto scene_image_subset = scene_image->makeSubset(
+      nullptr,
       SkIRect::MakeWH(fixture_image->width(), fixture_image->height()));
 
   FML_CHECK(scene_image_subset)
diff --git a/shell/platform/embedder/tests/embedder_unittests_util.h b/shell/platform/embedder/tests/embedder_unittests_util.h
index cbc189269008c0aa71ef9d184d6ac887eb45271c..4e1cae51b1df77afcadd28c0a156f749e63d40bb 100644
--- a/shell/platform/embedder/tests/embedder_unittests_util.h
+++ b/shell/platform/embedder/tests/embedder_unittests_util.h
@@ -8,6 +8,7 @@
 #define FML_USED_ON_EMBEDDER
 
 #include <future>
+#include <utility>
 
 #include "flutter/fml/mapping.h"
 #include "flutter/fml/message_loop.h"
@@ -104,8 +105,8 @@ class EmbedderTestTaskRunner {
   EmbedderTestTaskRunner(fml::RefPtr<fml::TaskRunner> real_task_runner,
                          TaskExpiryCallback on_task_expired)
       : identifier_(++sEmbedderTaskRunnerIdentifiers),
-        real_task_runner_(real_task_runner),
-        on_task_expired_(on_task_expired) {
+        real_task_runner_(std::move(real_task_runner)),
+        on_task_expired_(std::move(on_task_expired)) {
     FML_CHECK(real_task_runner_);
     FML_CHECK(on_task_expired_);
 
diff --git a/shell/platform/embedder/tests/embedder_vk_unittests.cc b/shell/platform/embedder/tests/embedder_vk_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..d6209d2ed96d0da2b0a44da21e6cf5b5249125cd
--- /dev/null
+++ b/shell/platform/embedder/tests/embedder_vk_unittests.cc
@@ -0,0 +1,128 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#define FML_USED_ON_EMBEDDER
+
+#include <cstring>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "embedder.h"
+#include "embedder_engine.h"
+#include "flutter/fml/synchronization/count_down_latch.h"
+#include "flutter/shell/platform/embedder/tests/embedder_config_builder.h"
+#include "flutter/shell/platform/embedder/tests/embedder_test.h"
+#include "flutter/shell/platform/embedder/tests/embedder_test_context_vulkan.h"
+#include "flutter/shell/platform/embedder/tests/embedder_unittests_util.h"
+#include "flutter/testing/testing.h"
+
+// CREATE_NATIVE_ENTRY is leaky by design
+// NOLINTBEGIN(clang-analyzer-core.StackAddressEscape)
+
+namespace flutter {
+namespace testing {
+
+using EmbedderTest = testing::EmbedderTest;
+
+////////////////////////////////////////////////////////////////////////////////
+// Notice: Other Vulkan unit tests exist in embedder_gl_unittests.cc.
+//         See https://github.com/flutter/flutter/issues/134322
+////////////////////////////////////////////////////////////////////////////////
+
+namespace {
+
+struct VulkanProcInfo {
+  decltype(vkGetInstanceProcAddr)* get_instance_proc_addr = nullptr;
+  decltype(vkGetDeviceProcAddr)* get_device_proc_addr = nullptr;
+  decltype(vkQueueSubmit)* queue_submit_proc_addr = nullptr;
+  bool did_call_queue_submit = false;
+};
+
+static_assert(std::is_trivially_destructible_v<VulkanProcInfo>);
+
+VulkanProcInfo g_vulkan_proc_info;
+
+VkResult QueueSubmit(VkQueue queue,
+                     uint32_t submitCount,
+                     const VkSubmitInfo* pSubmits,
+                     VkFence fence) {
+  FML_DCHECK(g_vulkan_proc_info.queue_submit_proc_addr != nullptr);
+  g_vulkan_proc_info.did_call_queue_submit = true;
+  return g_vulkan_proc_info.queue_submit_proc_addr(queue, submitCount, pSubmits,
+                                                   fence);
+}
+
+template <size_t N>
+int StrcmpFixed(const char* str1, const char (&str2)[N]) {
+  return strncmp(str1, str2, N - 1);
+}
+
+PFN_vkVoidFunction GetDeviceProcAddr(VkDevice device, const char* pName) {
+  FML_DCHECK(g_vulkan_proc_info.get_device_proc_addr != nullptr);
+  if (StrcmpFixed(pName, "vkQueueSubmit") == 0) {
+    g_vulkan_proc_info.queue_submit_proc_addr =
+        reinterpret_cast<decltype(vkQueueSubmit)*>(
+            g_vulkan_proc_info.get_device_proc_addr(device, pName));
+    return reinterpret_cast<PFN_vkVoidFunction>(QueueSubmit);
+  }
+  return g_vulkan_proc_info.get_device_proc_addr(device, pName);
+}
+
+PFN_vkVoidFunction GetInstanceProcAddr(VkInstance instance, const char* pName) {
+  FML_DCHECK(g_vulkan_proc_info.get_instance_proc_addr != nullptr);
+  if (StrcmpFixed(pName, "vkGetDeviceProcAddr") == 0) {
+    g_vulkan_proc_info.get_device_proc_addr =
+        reinterpret_cast<decltype(vkGetDeviceProcAddr)*>(
+            g_vulkan_proc_info.get_instance_proc_addr(instance, pName));
+    return reinterpret_cast<PFN_vkVoidFunction>(GetDeviceProcAddr);
+  }
+  return g_vulkan_proc_info.get_instance_proc_addr(instance, pName);
+}
+
+template <typename T, typename U>
+struct CheckSameSignature : std::false_type {};
+
+template <typename Ret, typename... Args>
+struct CheckSameSignature<Ret(Args...), Ret(Args...)> : std::true_type {};
+
+static_assert(CheckSameSignature<decltype(GetInstanceProcAddr),
+                                 decltype(vkGetInstanceProcAddr)>::value);
+static_assert(CheckSameSignature<decltype(GetDeviceProcAddr),
+                                 decltype(vkGetDeviceProcAddr)>::value);
+static_assert(
+    CheckSameSignature<decltype(QueueSubmit), decltype(vkQueueSubmit)>::value);
+}  // namespace
+
+TEST_F(EmbedderTest, CanSwapOutVulkanCalls) {
+  auto& context = GetEmbedderContext(EmbedderTestContextType::kVulkanContext);
+  fml::AutoResetWaitableEvent latch;
+  context.AddIsolateCreateCallback([&latch]() { latch.Signal(); });
+  EmbedderConfigBuilder builder(context);
+  builder.SetVulkanRendererConfig(
+      SkISize::Make(1024, 1024),
+      [](void* user_data, FlutterVulkanInstanceHandle instance,
+         const char* name) -> void* {
+        if (StrcmpFixed(name, "vkGetInstanceProcAddr") == 0) {
+          g_vulkan_proc_info.get_instance_proc_addr =
+              reinterpret_cast<decltype(vkGetInstanceProcAddr)*>(
+                  EmbedderTestContextVulkan::InstanceProcAddr(user_data,
+                                                              instance, name));
+          return reinterpret_cast<void*>(GetInstanceProcAddr);
+        }
+        return EmbedderTestContextVulkan::InstanceProcAddr(user_data, instance,
+                                                           name);
+      });
+  auto engine = builder.LaunchEngine();
+  ASSERT_TRUE(engine.is_valid());
+  // Wait for the root isolate to launch.
+  latch.Wait();
+  engine.reset();
+  EXPECT_TRUE(g_vulkan_proc_info.did_call_queue_submit);
+}
+
+}  // namespace testing
+}  // namespace flutter
+
+// NOLINTEND(clang-analyzer-core.StackAddressEscape)
diff --git a/shell/platform/embedder/vsync_waiter_embedder.h b/shell/platform/embedder/vsync_waiter_embedder.h
index 4dac73a5a478907dbac68e4fbeffe82ac615379a..7348e1a524debbe0ebf45e9eb0b3249353e2b065 100644
--- a/shell/platform/embedder/vsync_waiter_embedder.h
+++ b/shell/platform/embedder/vsync_waiter_embedder.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_PLATFORM_EMBEDDER_VSYNC_WAITER_EMBEDDER_H_
-#define SHELL_PLATFORM_EMBEDDER_VSYNC_WAITER_EMBEDDER_H_
+#ifndef FLUTTER_SHELL_PLATFORM_EMBEDDER_VSYNC_WAITER_EMBEDDER_H_
+#define FLUTTER_SHELL_PLATFORM_EMBEDDER_VSYNC_WAITER_EMBEDDER_H_
 
 #include "flutter/fml/macros.h"
 #include "flutter/shell/common/vsync_waiter.h"
@@ -35,4 +35,4 @@ class VsyncWaiterEmbedder final : public VsyncWaiter {
 
 }  // namespace flutter
 
-#endif  // SHELL_PLATFORM_EMBEDDER_VSYNC_WAITER_EMBEDDER_H_
+#endif  // FLUTTER_SHELL_PLATFORM_EMBEDDER_VSYNC_WAITER_EMBEDDER_H_
diff --git a/shell/platform/fuchsia/BUILD.gn b/shell/platform/fuchsia/BUILD.gn
index 2565d40461ab9ea76b5a613436e6754a588cf496..4de6e16a88c83996eaea6c1cce78ae39e17122e6 100644
--- a/shell/platform/fuchsia/BUILD.gn
+++ b/shell/platform/fuchsia/BUILD.gn
@@ -4,11 +4,11 @@
 
 assert(is_fuchsia)
 
-import("//build/fuchsia/sdk.gni")
 import("//flutter/common/config.gni")
 import("//flutter/testing/testing.gni")
 import("//flutter/tools/fuchsia/dart.gni")
 import("//flutter/tools/fuchsia/fuchsia_host_bundle.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
 
 product_suffix = ""
 
@@ -90,6 +90,7 @@ if (enable_unittests) {
     testonly = true
 
     deps = [
+      "dart-pkg/zircon:tests",
       "dart_runner:tests",
       "flutter:tests",
     ]
diff --git a/shell/platform/fuchsia/dart-pkg/fuchsia/BUILD.gn b/shell/platform/fuchsia/dart-pkg/fuchsia/BUILD.gn
index 2ff857aaf082a8aa4b4d0e1a8eda04c9e9998b8e..c04a41690e62ffd25a4db1fc44e61992861ac715 100644
--- a/shell/platform/fuchsia/dart-pkg/fuchsia/BUILD.gn
+++ b/shell/platform/fuchsia/dart-pkg/fuchsia/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/fuchsia/sdk.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
 
 config("sdk_ext_config") {
   include_dirs = [ "../.." ]
@@ -19,12 +19,13 @@ source_set("sdk_ext") {
   ]
 
   deps = [
-    "$fuchsia_sdk_root/fidl:fuchsia.sys",
-    "$fuchsia_sdk_root/pkg:async-cpp",
+    "${fuchsia_sdk}/pkg/async-cpp",
     "../zircon",
     "//flutter/fml",
     "//flutter/third_party/tonic",
   ]
 
+  public_deps = [ "${fuchsia_sdk}/pkg/zx" ]
+
   public_configs = [ ":sdk_ext_config" ]
 }
diff --git a/shell/platform/fuchsia/dart-pkg/fuchsia/pubspec.yaml b/shell/platform/fuchsia/dart-pkg/fuchsia/pubspec.yaml
index b6f4924b5062118416e2d2d8ac47a19b1ee3d07d..85d01ce1515b9b3710c5a285ff6f552a364bce54 100644
--- a/shell/platform/fuchsia/dart-pkg/fuchsia/pubspec.yaml
+++ b/shell/platform/fuchsia/dart-pkg/fuchsia/pubspec.yaml
@@ -3,4 +3,4 @@
 # found in the LICENSE file.
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=3.2.0-0 <4.0.0'
diff --git a/shell/platform/fuchsia/dart-pkg/fuchsia/sdk_ext/fuchsia.cc b/shell/platform/fuchsia/dart-pkg/fuchsia/sdk_ext/fuchsia.cc
index 2c80baa4be36087393e5cd8a9a08062723c0216b..25f0d96127c424ea217733f0735d2a61227c313e 100644
--- a/shell/platform/fuchsia/dart-pkg/fuchsia/sdk_ext/fuchsia.cc
+++ b/shell/platform/fuchsia/dart-pkg/fuchsia/sdk_ext/fuchsia.cc
@@ -100,8 +100,7 @@ void SetReturnCode(Dart_NativeArguments arguments) {
 
 }  // namespace
 
-void Initialize(fidl::InterfaceHandle<fuchsia::sys::Environment> environment,
-                zx::channel directory_request,
+void Initialize(zx::channel directory_request,
                 std::optional<zx::eventpair> view_ref) {
   zircon::dart::Initialize();
 
@@ -117,14 +116,6 @@ void Initialize(fidl::InterfaceHandle<fuchsia::sys::Environment> environment,
   dart_state->class_library().add_provider("fuchsia",
                                            std::move(fuchsia_class_provider));
 
-  // V2 components do not use the environment.
-  if (environment) {
-    result = Dart_SetField(
-        library, ToDart("_environment"),
-        ToDart(zircon::dart::Handle::Create(environment.TakeChannel())));
-    FML_CHECK(!tonic::CheckAndHandleError(result));
-  }
-
   if (directory_request) {
     result = Dart_SetField(
         library, ToDart("_outgoingServices"),
diff --git a/shell/platform/fuchsia/dart-pkg/fuchsia/sdk_ext/fuchsia.h b/shell/platform/fuchsia/dart-pkg/fuchsia/sdk_ext/fuchsia.h
index acdb38fe21bd1c31add569c08f8234ca42aeabfb..457528d99311cff9542938d943c99463feaada61 100644
--- a/shell/platform/fuchsia/dart-pkg/fuchsia/sdk_ext/fuchsia.h
+++ b/shell/platform/fuchsia/dart-pkg/fuchsia/sdk_ext/fuchsia.h
@@ -5,14 +5,16 @@
 #ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_PKG_FUCHSIA_SDK_EXT_FUCHSIA_H_
 #define FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_PKG_FUCHSIA_SDK_EXT_FUCHSIA_H_
 
-#include <fuchsia/sys/cpp/fidl.h>
+#include <lib/zx/channel.h>
+#include <lib/zx/eventpair.h>
+
+#include <optional>
 
 namespace fuchsia {
 namespace dart {
 
 /// Initializes Dart bindings for the Fuchsia application model.
-void Initialize(fidl::InterfaceHandle<fuchsia::sys::Environment> environment,
-                zx::channel directory_request,
+void Initialize(zx::channel directory_request,
                 std::optional<zx::eventpair> view_ref);
 
 }  // namespace dart
diff --git a/shell/platform/fuchsia/dart-pkg/zircon/BUILD.gn b/shell/platform/fuchsia/dart-pkg/zircon/BUILD.gn
index 39329c34cee50970f25d879eafba3cee2c2a446b..ae17ef02af027f7deeab4901278f7b52336f7a28 100644
--- a/shell/platform/fuchsia/dart-pkg/zircon/BUILD.gn
+++ b/shell/platform/fuchsia/dart-pkg/zircon/BUILD.gn
@@ -2,8 +2,11 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/fuchsia/sdk.gni")
 import("//flutter/testing/testing.gni")
+import("//flutter/tools/fuchsia/dart/dart_library.gni")
+import("//flutter/tools/fuchsia/flutter/flutter_component.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/package.gni")
 
 config("zircon_config") {
   include_dirs = [ "." ]
@@ -26,19 +29,65 @@ source_set("zircon") {
   ]
 
   deps = [
-    "$fuchsia_sdk_root/pkg:async-cpp",
-    "$fuchsia_sdk_root/pkg:async-default",
-    "$fuchsia_sdk_root/pkg:async-loop-cpp",
-    "$fuchsia_sdk_root/pkg:fdio",
-    "$fuchsia_sdk_root/pkg:zx",
+    "${fuchsia_sdk}/fidl/fuchsia.io",
+    "${fuchsia_sdk}/pkg/async-cpp",
+    "${fuchsia_sdk}/pkg/async-default",
+    "${fuchsia_sdk}/pkg/async-loop-cpp",
+    "${fuchsia_sdk}/pkg/fdio",
+    "${fuchsia_sdk}/pkg/zx",
     "//flutter/fml",
     "//flutter/third_party/tonic",
   ]
 }
 
+dart_library("zircon_lib") {
+  testonly = true
+  package_name = "zircon"
+  language_version = "2.12"
+  source_dir = "lib"
+
+  sources = [
+    "src/handle.dart",
+    "src/handle_disposition.dart",
+    "src/handle_waiter.dart",
+    "src/init.dart",
+    "src/system.dart",
+    "src/zd_channel.dart",
+    "src/zd_handle.dart",
+    "zircon.dart",
+  ]
+}
+
+dart_library("zircon_tests_lib") {
+  testonly = true
+  package_name = "zircon_tests"
+  language_version = "2.12"
+  source_dir = "."
+  package_root = "test"
+
+  sources = [ "zircon_tests.dart" ]
+  deps = [ "//flutter/shell/platform/fuchsia/dart:litetest" ]
+}
+
+flutter_component("zircon_tests_component") {
+  testonly = true
+  main_package = "zircon_tests"
+  component_name = "zircon_tests"
+  main_dart = "zircon_tests.dart"
+  manifest = rebase_path("test/meta/zircon_tests.cml")
+
+  deps = [ ":zircon_tests_lib" ]
+}
+
+fuchsia_package("zircon_tests_package") {
+  testonly = true
+  package_name = "zircon_tests"
+  deps = [ ":zircon_tests_component" ]
+}
+
 if (enable_unittests) {
-  source_set("test") {
+  source_set("tests") {
     testonly = true
-    deps = [ "test" ]
+    deps = [ ":zircon_tests_package" ]
   }
 }
diff --git a/shell/platform/fuchsia/dart-pkg/zircon/lib/src/handle.dart b/shell/platform/fuchsia/dart-pkg/zircon/lib/src/handle.dart
index adfac800bc986eb5790cb6c12cd4f5293b7b6b5d..81a6300f25ddda46cb6507207297b7440d0f34f1 100644
--- a/shell/platform/fuchsia/dart-pkg/zircon/lib/src/handle.dart
+++ b/shell/platform/fuchsia/dart-pkg/zircon/lib/src/handle.dart
@@ -8,7 +8,7 @@ part of zircon;
 // ignore_for_file: public_member_api_docs
 
 @pragma('vm:entry-point')
-class Handle extends NativeFieldWrapperClass1 {
+base class Handle extends NativeFieldWrapperClass1 {
   // No public constructor - this can only be created from native code.
   @pragma('vm:entry-point')
   Handle._();
diff --git a/shell/platform/fuchsia/dart-pkg/zircon/lib/src/handle_disposition.dart b/shell/platform/fuchsia/dart-pkg/zircon/lib/src/handle_disposition.dart
index bd3fa0363a70fb9922668a3cb057ff64396a0e34..a3ce43bbc6cd87bdf439c9ccbf57fa9639331a4f 100644
--- a/shell/platform/fuchsia/dart-pkg/zircon/lib/src/handle_disposition.dart
+++ b/shell/platform/fuchsia/dart-pkg/zircon/lib/src/handle_disposition.dart
@@ -8,7 +8,7 @@ part of zircon;
 // ignore_for_file: public_member_api_docs
 
 @pragma('vm:entry-point')
-class HandleDisposition extends NativeFieldWrapperClass1 {
+base class HandleDisposition extends NativeFieldWrapperClass1 {
   @pragma('vm:entry-point')
   HandleDisposition(int operation, Handle handle, int type, int rights) {
     _constructor(operation, handle, type, rights);
diff --git a/shell/platform/fuchsia/dart-pkg/zircon/lib/src/handle_waiter.dart b/shell/platform/fuchsia/dart-pkg/zircon/lib/src/handle_waiter.dart
index dba823a13bb4735dd8ea1d024bb654cb653f3693..49bc437a5049f65cf912d59aa28489ae43e8d6ad 100644
--- a/shell/platform/fuchsia/dart-pkg/zircon/lib/src/handle_waiter.dart
+++ b/shell/platform/fuchsia/dart-pkg/zircon/lib/src/handle_waiter.dart
@@ -10,7 +10,7 @@ part of zircon;
 typedef AsyncWaitCallback = void Function(int status, int pending);
 
 @pragma('vm:entry-point')
-class HandleWaiter extends NativeFieldWrapperClass1 {
+base class HandleWaiter extends NativeFieldWrapperClass1 {
   // Private constructor.
   @pragma('vm:entry-point')
   HandleWaiter._();
diff --git a/shell/platform/fuchsia/dart-pkg/zircon/lib/src/system.dart b/shell/platform/fuchsia/dart-pkg/zircon/lib/src/system.dart
index 34e7f08c2d8bee3586f69005da46a4683b1849ed..ccf1b693608cedd7a09505b79e3adf5420ed9992 100644
--- a/shell/platform/fuchsia/dart-pkg/zircon/lib/src/system.dart
+++ b/shell/platform/fuchsia/dart-pkg/zircon/lib/src/system.dart
@@ -86,7 +86,8 @@ class ReadResult extends _Result {
   /// Returns the bytes as a Uint8List. If status != OK this will throw
   /// an exception.
   Uint8List bytesAsUint8List() {
-    return _bytes!.buffer.asUint8List(_bytes!.offsetInBytes, _numBytes!);
+    final lbytes = bytes;
+    return lbytes.buffer.asUint8List(lbytes.offsetInBytes, _numBytes!);
   }
 
   /// Returns the bytes as a String. If status != OK this will throw
@@ -129,7 +130,8 @@ class ReadEtcResult extends _Result {
   /// Returns the bytes as a Uint8List. If status != OK this will throw
   /// an exception.
   Uint8List bytesAsUint8List() {
-    return _bytes!.buffer.asUint8List(_bytes!.offsetInBytes, _numBytes!);
+    final lbytes = bytes;
+    return lbytes.buffer.asUint8List(lbytes.offsetInBytes, _numBytes!);
   }
 
   /// Returns the bytes as a String. If status != OK this will throw
@@ -191,7 +193,7 @@ class MapResult extends _Result {
 }
 
 @pragma('vm:entry-point')
-class System extends NativeFieldWrapperClass1 {
+base class System extends NativeFieldWrapperClass1 {
   // No public constructor - this only has static methods.
   System._();
 
diff --git a/shell/platform/fuchsia/dart-pkg/zircon/pubspec.yaml b/shell/platform/fuchsia/dart-pkg/zircon/pubspec.yaml
index d82a3ccf9e8b4fd59ab83f5ec20c4e5032a3d285..c75e7f8ff6a4a75fc25afe1603dd8f5903ace2aa 100644
--- a/shell/platform/fuchsia/dart-pkg/zircon/pubspec.yaml
+++ b/shell/platform/fuchsia/dart-pkg/zircon/pubspec.yaml
@@ -5,7 +5,7 @@
 name: zircon
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=3.2.0-0 <4.0.0'
 
 
 # Uncomment block for local testing
diff --git a/shell/platform/fuchsia/dart-pkg/zircon/sdk_ext/system.cc b/shell/platform/fuchsia/dart-pkg/zircon/sdk_ext/system.cc
index b455909feb5b16ded35e36c87738b48c810956fa..cdb51c1ad7987ca526c8d18152fe8f2f745499fb 100644
--- a/shell/platform/fuchsia/dart-pkg/zircon/sdk_ext/system.cc
+++ b/shell/platform/fuchsia/dart-pkg/zircon/sdk_ext/system.cc
@@ -6,8 +6,9 @@
 
 #include <array>
 
-#include <fcntl.h>
+#include <fuchsia/io/cpp/fidl.h>
 #include <lib/fdio/directory.h>
+#include <lib/fdio/fd.h>
 #include <lib/fdio/io.h>
 #include <lib/fdio/limits.h>
 #include <lib/fdio/namespace.h>
@@ -172,17 +173,25 @@ fdio_ns_t* GetNamespace() {
   return reinterpret_cast<fdio_ns_t*>(fdio_ns_ptr);
 }
 
-fml::UniqueFD FdFromPath(std::string path) {
-  // Get a VMO for the file.
-  fdio_ns_t* ns = reinterpret_cast<fdio_ns_t*>(GetNamespace());
-  fml::UniqueFD dirfd(fdio_ns_opendir(ns));
-  if (!dirfd.is_valid())
-    return fml::UniqueFD();
-
-  const char* c_path = path.c_str();
-  if (path.length() > 0 && c_path[0] == '/')
-    c_path = &c_path[1];
-  return fml::UniqueFD(openat(dirfd.get(), c_path, O_RDONLY));
+zx_status_t FdFromPath(const char* path, fml::UniqueFD& fd) {
+  fml::UniqueFD dir_fd(fdio_ns_opendir(GetNamespace()));
+  if (!dir_fd.is_valid()) {
+    // TODO: can we return errno?
+    return ZX_ERR_IO;
+  }
+  if (path != nullptr && *path == '/') {
+    path++;
+  }
+  int raw_fd;
+  if (zx_status_t status = fdio_open_fd_at(
+          dir_fd.get(), path,
+          static_cast<uint32_t>(fuchsia::io::OpenFlags::RIGHT_READABLE),
+          &raw_fd);
+      status != ZX_OK) {
+    return status;
+  }
+  fd.reset(raw_fd);
+  return ZX_OK;
 }
 
 }  // namespace
@@ -207,36 +216,30 @@ zx_status_t System::ConnectToService(std::string path,
                                  channel->ReleaseHandle());
 }
 
-zx::channel System::CloneChannelFromFileDescriptor(int fd) {
-  zx::handle handle;
-  zx_status_t status = fdio_fd_clone(fd, handle.reset_and_get_address());
-  if (status != ZX_OK)
-    return zx::channel();
-
-  zx_info_handle_basic_t info = {};
-  status =
-      handle.get_info(ZX_INFO_HANDLE_BASIC, &info, sizeof(info), NULL, NULL);
-
-  if (status != ZX_OK || info.type != ZX_OBJ_TYPE_CHANNEL)
-    return zx::channel();
-
-  return zx::channel(handle.release());
-}
-
 Dart_Handle System::ChannelFromFile(std::string path) {
-  fml::UniqueFD fd = FdFromPath(path);
-  if (!fd.is_valid()) {
-    return ConstructDartObject(kHandleResult, ToDart(ZX_ERR_IO));
+  fml::UniqueFD fd;
+  if (zx_status_t status = FdFromPath(path.c_str(), fd); status != ZX_OK) {
+    return ConstructDartObject(kHandleResult, ToDart(status));
   }
 
-  // Get channel from fd.
-  zx::channel channel = CloneChannelFromFileDescriptor(fd.get());
-  if (!channel) {
-    return ConstructDartObject(kHandleResult, ToDart(ZX_ERR_IO));
+  zx::handle handle;
+  if (zx_status_t status =
+          fdio_fd_transfer(fd.release(), handle.reset_and_get_address());
+      status != ZX_OK) {
+    return ConstructDartObject(kHandleResult, ToDart(status));
+  }
+  zx_info_handle_basic_t info;
+  if (zx_status_t status = handle.get_info(ZX_INFO_HANDLE_BASIC, &info,
+                                           sizeof(info), nullptr, nullptr);
+      status != ZX_OK) {
+    return ConstructDartObject(kHandleResult, ToDart(status));
+  }
+  if (info.type != ZX_OBJ_TYPE_CHANNEL) {
+    return ConstructDartObject(kHandleResult, ToDart(ZX_ERR_WRONG_TYPE));
   }
 
   return ConstructDartObject(kHandleResult, ToDart(ZX_OK),
-                             ToDart(Handle::Create(channel.release())));
+                             ToDart(Handle::Create(handle.release())));
 }
 
 zx_status_t System::ChannelWrite(fml::RefPtr<Handle> channel,
@@ -451,20 +454,25 @@ Dart_Handle System::VmoCreate(uint64_t size, uint32_t options) {
 }
 
 Dart_Handle System::VmoFromFile(std::string path) {
-  fml::UniqueFD fd = FdFromPath(path);
-  if (!fd.is_valid())
-    return ConstructDartObject(kFromFileResult, ToDart(ZX_ERR_IO));
+  fml::UniqueFD fd;
+  if (zx_status_t status = FdFromPath(path.c_str(), fd); status != ZX_OK) {
+    return ConstructDartObject(kHandleResult, ToDart(status));
+  }
 
   struct stat stat_struct;
-  if (fstat(fd.get(), &stat_struct) == -1)
+  if (fstat(fd.get(), &stat_struct) != 0) {
+    // TODO: can we return errno?
     return ConstructDartObject(kFromFileResult, ToDart(ZX_ERR_IO));
-  zx_handle_t vmo = ZX_HANDLE_INVALID;
-  zx_status_t status = fdio_get_vmo_clone(fd.get(), &vmo);
-  if (status != ZX_OK)
+  }
+  zx::vmo vmo;
+  if (zx_status_t status =
+          fdio_get_vmo_clone(fd.get(), vmo.reset_and_get_address());
+      status != ZX_OK) {
     return ConstructDartObject(kFromFileResult, ToDart(status));
+  }
 
-  return ConstructDartObject(kFromFileResult, ToDart(status),
-                             ToDart(Handle::Create(vmo)),
+  return ConstructDartObject(kFromFileResult, ToDart(ZX_OK),
+                             ToDart(Handle::Create(vmo.release())),
                              ToDart(stat_struct.st_size));
 }
 
diff --git a/shell/platform/fuchsia/dart-pkg/zircon/sdk_ext/system.h b/shell/platform/fuchsia/dart-pkg/zircon/sdk_ext/system.h
index f5b8abbd4783c3530033e502277dd5013f84e01e..c2dd01c799c4ca85912c1819bff38655db69a553 100644
--- a/shell/platform/fuchsia/dart-pkg/zircon/sdk_ext/system.h
+++ b/shell/platform/fuchsia/dart-pkg/zircon/sdk_ext/system.h
@@ -14,15 +14,6 @@
 #include "third_party/tonic/dart_wrappable.h"
 #include "third_party/tonic/typed_data/dart_byte_data.h"
 
-// TODO (kaushikiska): Once fuchsia adds fs to their sdk,
-// use the rights macros from "fs/vfs.h"
-
-// Rights
-// The file may be read.
-#define ZX_FS_RIGHT_READABLE 0x00000001
-// The file may be written.
-#define ZX_FS_RIGHT_WRITABLE 0x00000002
-
 namespace zircon {
 namespace dart {
 
@@ -76,8 +67,6 @@ class System : public fml::RefCountedThreadSafe<System>,
 
  private:
   static void VmoMapFinalizer(void* isolate_callback_data, void* peer);
-
-  static zx::channel CloneChannelFromFileDescriptor(int fd);
 };
 
 }  // namespace dart
diff --git a/shell/platform/fuchsia/dart-pkg/zircon/test/BUILD.gn b/shell/platform/fuchsia/dart-pkg/zircon/test/BUILD.gn
deleted file mode 100644
index 6feebc1d454d9cc261948a62690ebefc37995276..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/dart-pkg/zircon/test/BUILD.gn
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2013 The Flutter Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/fuchsia/sdk.gni")
-import("//flutter/tools/fuchsia/dart/dart_library.gni")
-import("//flutter/tools/fuchsia/flutter/flutter_component.gni")
-import("//flutter/tools/fuchsia/gn-sdk/package.gni")
-
-dart_library("dart_library") {
-  testonly = true
-  package_name = "channel_test"
-
-  language_version = "2.12"
-
-  source_dir = "."
-
-  sources = [
-    "channel_test.dart",
-    "eventpair_test.dart",
-    "handle_disposition_test.dart",
-    "handle_test.dart",
-    "socket_test.dart",
-    "vmo_test.dart",
-  ]
-
-  deps = [
-    "//flutter/shell/platform/fuchsia/dart:litetest",
-    "//flutter/tools/fuchsia/dart:zircon",
-  ]
-}
-
-flutter_component("channel_test_flutter_component") {
-  testonly = true
-
-  main_package = "channel_test"
-  component_name = "channel_test"
-  main_dart = "channel_test.dart"
-  manifest = rebase_path("meta/channel_test.cml")
-  deps = [ ":dart_library" ]
-}
-
-# TODO(richkadel): The target name is set differently compared to fuchsia.git's flutter_app().
-# Unlike in fuchsia.git's version of fuchsia_component, the Fuchsia GN SDK
-# version passes the component name to fuchsia_component via it's target_name only.
-# GN SDK's fuchsia_component doesn't have a `component_name` argument! So I'm forced to set
-# the component name via "target_name". This is a problem in fuchsia_package, which uses
-# the target_name to name the fuchsia_pm_tool target, creating duplicate target IDs!
-# So I have to change the fuchsia_package name to something that is NOT the component name,
-# and then set the package_name (which fuchsia_package does support).
-fuchsia_package("channel_test_package") {
-  testonly = true
-  package_name = "channel_test"
-  deps = [ ":channel_test_flutter_component" ]
-}
-
-group("test") {
-  testonly = true
-  deps = [ ":channel_test_package" ]
-}
diff --git a/shell/platform/fuchsia/dart-pkg/zircon/test/channel_test.dart b/shell/platform/fuchsia/dart-pkg/zircon/test/channel_test.dart
deleted file mode 100644
index 564ccd8155a6b35840070a0e409cca537da14d68..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/dart-pkg/zircon/test/channel_test.dart
+++ /dev/null
@@ -1,241 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'dart:async';
-import 'dart:convert';
-import 'dart:typed_data';
-
-import 'package:litetest/litetest.dart';
-
-import 'package:zircon/zircon.dart';
-
-/// Helper method to turn a [String] into a [ByteData] containing the
-/// text of the string encoded as UTF-8.
-ByteData utf8Bytes(final String text) {
-  return ByteData.view(Uint8List.fromList(utf8.encode(text)).buffer);
-}
-
-void main() {
-  test('create channel', () {
-    final HandlePairResult pair = System.channelCreate();
-    expect(pair.status, equals(ZX.OK));
-    expect(pair.first.isValid, isTrue);
-    expect(pair.second.isValid, isTrue);
-  });
-
-  test('[ffi] create channel', () {
-    final ZDChannel? channel = ZDChannel.create();
-    expect(channel, isNotNull);
-    final ZDHandlePair pair = channel!.handlePair;
-    expect(pair.left.isValid(), isTrue);
-    expect(pair.right.isValid(), isTrue);
-  });
-
-  test('close channel', () {
-    final HandlePairResult pair = System.channelCreate();
-    expect(pair.first.close(), equals(0));
-    expect(pair.first.isValid, isFalse);
-    expect(pair.second.isValid, isTrue);
-    expect(System.channelWrite(pair.first, ByteData(1), <Handle>[]),
-        equals(ZX.ERR_BAD_HANDLE));
-    expect(System.channelWrite(pair.second, ByteData(1), <Handle>[]),
-        equals(ZX.ERR_PEER_CLOSED));
-  });
-
-  test('[ffi] close channel', () {
-    final ZDChannel? channel = ZDChannel.create();
-    final ZDHandlePair pair = channel!.handlePair;
-    expect(pair.left.close(), isTrue);
-    expect(pair.left.isValid, isFalse);
-    expect(pair.right.isValid, isTrue);
-    expect(channel.writeLeft(ByteData(1), <ZDHandle>[]),
-        equals(ZX.ERR_BAD_HANDLE));
-    expect(channel.writeRight(ByteData(1), <ZDHandle>[]),
-        equals(ZX.ERR_PEER_CLOSED));
-  });
-
-  test('channel bytes', () {
-    final HandlePairResult pair = System.channelCreate();
-
-    // When no data is available, ZX.ERR_SHOULD_WAIT is returned.
-    expect(System.channelQueryAndRead(pair.second).status,
-        equals(ZX.ERR_SHOULD_WAIT));
-
-    // Write bytes.
-    final ByteData data = utf8Bytes('Hello, world');
-    final int status = System.channelWrite(pair.first, data, <Handle>[]);
-    expect(status, equals(ZX.OK));
-
-    // Read bytes.
-    final ReadResult readResult = System.channelQueryAndRead(pair.second);
-    expect(readResult.status, equals(ZX.OK));
-    expect(readResult.numBytes, equals(data.lengthInBytes));
-    expect(readResult.bytes.lengthInBytes, equals(data.lengthInBytes));
-    expect(readResult.bytesAsUTF8String(), equals('Hello, world'));
-    expect(readResult.handles.length, equals(0));
-  });
-
-  test('channel handles', () {
-    final HandlePairResult pair = System.channelCreate();
-    final ByteData data = utf8Bytes('');
-    final HandlePairResult eventPair = System.eventpairCreate();
-    final int status =
-        System.channelWrite(pair.first, data, <Handle>[eventPair.first]);
-    expect(status, equals(ZX.OK));
-    expect(eventPair.first.isValid, isFalse);
-
-    final ReadResult readResult = System.channelQueryAndRead(pair.second);
-    expect(readResult.status, equals(ZX.OK));
-    expect(readResult.numBytes, equals(0));
-    expect(readResult.bytes.lengthInBytes, equals(0));
-    expect(readResult.bytesAsUTF8String(), equals(''));
-    expect(readResult.handles.length, equals(1));
-    expect(readResult.handles[0].isValid, isTrue);
-  });
-
-  group('etc functions', () {
-    test('moved handle', () {
-      final HandlePairResult pair = System.channelCreate();
-      final ByteData data = utf8Bytes('');
-      final HandlePairResult transferred = System.channelCreate();
-
-      final HandleDisposition disposition = HandleDisposition(ZX.HANDLE_OP_MOVE,
-          transferred.first, ZX.OBJ_TYPE_CHANNEL, ZX.RIGHTS_IO);
-      final int status = System.channelWriteEtc(
-          pair.first, data, <HandleDisposition>[disposition]);
-      expect(status, equals(ZX.OK));
-      expect(disposition.result, equals(ZX.OK));
-      expect(transferred.first.isValid, isFalse);
-
-      final ReadEtcResult readResult =
-          System.channelQueryAndReadEtc(pair.second);
-      expect(readResult.status, equals(ZX.OK));
-      expect(readResult.numBytes, equals(0));
-      expect(readResult.bytes.lengthInBytes, equals(0));
-      expect(readResult.bytesAsUTF8String(), equals(''));
-      expect(readResult.handleInfos.length, equals(1));
-      final HandleInfo handleInfo = readResult.handleInfos[0];
-      expect(handleInfo.handle.isValid, isTrue);
-      expect(handleInfo.type, equals(ZX.OBJ_TYPE_CHANNEL));
-      expect(handleInfo.rights, equals(ZX.RIGHTS_IO));
-    });
-
-    test('copied handle', () {
-      final HandlePairResult pair = System.channelCreate();
-      final ByteData data = utf8Bytes('');
-      final HandleResult vmo = System.vmoCreate(0);
-
-      final HandleDisposition disposition = HandleDisposition(
-          ZX.HANDLE_OP_DUPLICATE,
-          vmo.handle,
-          ZX.OBJ_TYPE_VMO,
-          ZX.RIGHT_SAME_RIGHTS);
-      final int status = System.channelWriteEtc(
-          pair.first, data, <HandleDisposition>[disposition]);
-      expect(status, equals(ZX.OK));
-      expect(disposition.result, equals(ZX.OK));
-      expect(vmo.handle.isValid, isTrue);
-
-      final ReadEtcResult readResult =
-          System.channelQueryAndReadEtc(pair.second);
-      expect(readResult.status, equals(ZX.OK));
-      expect(readResult.numBytes, equals(0));
-      expect(readResult.bytes.lengthInBytes, equals(0));
-      expect(readResult.bytesAsUTF8String(), equals(''));
-      expect(readResult.handleInfos.length, equals(1));
-      final HandleInfo handleInfo = readResult.handleInfos[0];
-      expect(handleInfo.handle.isValid, isTrue);
-      expect(handleInfo.type, equals(ZX.OBJ_TYPE_VMO));
-      expect(handleInfo.rights, equals(ZX.DEFAULT_VMO_RIGHTS));
-    });
-
-    test('closed handle should error', () {
-      final HandlePairResult pair = System.channelCreate();
-      final ByteData data = utf8Bytes('');
-      final HandlePairResult closed = System.channelCreate();
-
-      final HandleDisposition disposition = HandleDisposition(ZX.HANDLE_OP_MOVE,
-          closed.first, ZX.OBJ_TYPE_CHANNEL, ZX.RIGHT_SAME_RIGHTS);
-      closed.first.close();
-      final int status = System.channelWriteEtc(
-          pair.first, data, <HandleDisposition>[disposition]);
-      expect(status, equals(ZX.ERR_BAD_HANDLE));
-      expect(disposition.result, equals(ZX.ERR_BAD_HANDLE));
-      expect(closed.first.isValid, isFalse);
-
-      final ReadEtcResult readResult =
-          System.channelQueryAndReadEtc(pair.second);
-      expect(readResult.status, equals(ZX.ERR_SHOULD_WAIT));
-    });
-
-    test('multiple handles', () {
-      final HandlePairResult pair = System.channelCreate();
-      final ByteData data = utf8Bytes('');
-      final HandlePairResult transferred = System.channelCreate();
-      final HandleResult vmo = System.vmoCreate(0);
-
-      final List<HandleDisposition> dispositions = [
-        HandleDisposition(ZX.HANDLE_OP_MOVE, transferred.first,
-            ZX.OBJ_TYPE_CHANNEL, ZX.RIGHTS_IO),
-        HandleDisposition(ZX.HANDLE_OP_DUPLICATE, vmo.handle, ZX.OBJ_TYPE_VMO,
-            ZX.RIGHT_SAME_RIGHTS)
-      ];
-      final int status = System.channelWriteEtc(pair.first, data, dispositions);
-      expect(status, equals(ZX.OK));
-      expect(dispositions[0].result, equals(ZX.OK));
-      expect(dispositions[1].result, equals(ZX.OK));
-      expect(transferred.first.isValid, isFalse);
-      expect(vmo.handle.isValid, isTrue);
-
-      final ReadEtcResult readResult =
-          System.channelQueryAndReadEtc(pair.second);
-      expect(readResult.status, equals(ZX.OK));
-      expect(readResult.numBytes, equals(0));
-      expect(readResult.bytes.lengthInBytes, equals(0));
-      expect(readResult.bytesAsUTF8String(), equals(''));
-
-      expect(readResult.handleInfos.length, equals(2));
-      final HandleInfo handleInfo = readResult.handleInfos[0];
-      expect(handleInfo.handle.isValid, isTrue);
-      expect(handleInfo.type, equals(ZX.OBJ_TYPE_CHANNEL));
-      expect(handleInfo.rights, equals(ZX.RIGHTS_IO));
-      final HandleInfo vmoInfo = readResult.handleInfos[1];
-      expect(vmoInfo.handle.isValid, isTrue);
-      expect(vmoInfo.type, equals(ZX.OBJ_TYPE_VMO));
-      expect(vmoInfo.rights, equals(ZX.DEFAULT_VMO_RIGHTS));
-    });
-  });
-
-  test('async wait channel read', () async {
-    final HandlePairResult pair = System.channelCreate();
-    final Completer<List<int>> completer = Completer<List<int>>();
-    pair.first.asyncWait(ZX.CHANNEL_READABLE, (int status, int pending) {
-      completer.complete(<int>[status, pending]);
-    });
-
-    expect(completer.isCompleted, isFalse);
-
-    System.channelWrite(pair.second, utf8Bytes('Hi'), <Handle>[]);
-
-    final List<int> result = await completer.future;
-    expect(result[0], equals(ZX.OK)); // status
-    expect(result[1] & ZX.CHANNEL_READABLE,
-        equals(ZX.CHANNEL_READABLE)); // pending
-  });
-
-  test('async wait channel closed', () async {
-    final HandlePairResult pair = System.channelCreate();
-    final Completer<int> completer = Completer<int>();
-    pair.first.asyncWait(ZX.CHANNEL_PEER_CLOSED, (int status, int pending) {
-      completer.complete(status);
-    });
-
-    expect(completer.isCompleted, isFalse);
-
-    pair.second.close();
-
-    final int status = await completer.future;
-    expect(status, equals(ZX.OK));
-  });
-}
diff --git a/shell/platform/fuchsia/dart-pkg/zircon/test/eventpair_test.dart b/shell/platform/fuchsia/dart-pkg/zircon/test/eventpair_test.dart
deleted file mode 100644
index aa133bb599aa3e9285f950a94177392382e8ce5c..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/dart-pkg/zircon/test/eventpair_test.dart
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'dart:async';
-
-import 'package:test/test.dart';
-import 'package:zircon/zircon.dart';
-
-void main() {
-  group('eventpair: ', () {
-    test('create', () {
-      final HandlePairResult pair = System.eventpairCreate();
-      expect(pair.status, equals(ZX.OK));
-      expect(pair.first.isValid, isTrue);
-      expect(pair.second.isValid, isTrue);
-    });
-
-    test('duplicate', () {
-      final HandlePairResult pair = System.eventpairCreate();
-      expect(pair.status, equals(ZX.OK));
-      expect(pair.first.isValid, isTrue);
-      expect(pair.second.isValid, isTrue);
-
-      expect(pair.first.duplicate(ZX.RIGHT_SAME_RIGHTS).isValid, isTrue);
-      expect(pair.second.duplicate(ZX.RIGHT_SAME_RIGHTS).isValid, isTrue);
-    });
-
-    test('close', () {
-      final HandlePairResult pair = System.eventpairCreate();
-      expect(pair.first.close(), equals(0));
-      expect(pair.first.isValid, isFalse);
-      expect(pair.second.isValid, isTrue);
-
-      expect(pair.second.close(), equals(0));
-      expect(pair.second.isValid, isFalse);
-    });
-
-    test('async wait peer closed', () async {
-      final HandlePairResult pair = System.eventpairCreate();
-      final Completer<int> completer = Completer<int>();
-      pair.first.asyncWait(EventPair.PEER_CLOSED, (int status, int pending) {
-        completer.complete(status);
-      });
-
-      expect(completer.isCompleted, isFalse);
-      pair.second.close();
-
-      final int status = await completer.future;
-      expect(status, equals(ZX.OK));
-    });
-  });
-}
diff --git a/shell/platform/fuchsia/dart-pkg/zircon/test/handle_disposition_test.dart b/shell/platform/fuchsia/dart-pkg/zircon/test/handle_disposition_test.dart
deleted file mode 100644
index 92819109335f42b4ea4d824a239afb047a5034fd..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/dart-pkg/zircon/test/handle_disposition_test.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2021 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'package:test/test.dart';
-import 'package:zircon/zircon.dart';
-
-void main() {
-  test('store the disposition arguments correctly', () {
-    final Handle handle = System.channelCreate().first;
-    final HandleDisposition disposition = HandleDisposition(1, handle, 2, 3);
-    expect(disposition.operation, equals(1));
-    expect(disposition.handle, equals(handle));
-    expect(disposition.type, equals(2));
-    expect(disposition.rights, equals(3));
-    expect(disposition.result, equals(ZX.OK));
-  });
-}
diff --git a/shell/platform/fuchsia/dart-pkg/zircon/test/handle_test.dart b/shell/platform/fuchsia/dart-pkg/zircon/test/handle_test.dart
deleted file mode 100644
index 79f9d25e81f68127fcb560269da0a14e87aa45e4..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/dart-pkg/zircon/test/handle_test.dart
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'dart:convert';
-import 'dart:typed_data';
-
-import 'package:test/test.dart';
-import 'package:zircon/zircon.dart';
-
-/// Helper method to turn a [String] into a [ByteData] containing the
-/// text of the string encoded as UTF-8.
-ByteData utf8Bytes(final String text) {
-  return ByteData.view(Uint8List.fromList(utf8.encode(text)).buffer);
-}
-
-void main() {
-  group('duplicated handle', () {
-    test('create and duplicate handles', () {
-      final HandlePairResult pair = System.eventpairCreate();
-      expect(pair.status, equals(ZX.OK));
-      expect(pair.first.isValid, isTrue);
-      expect(pair.second.isValid, isTrue);
-
-      final Handle duplicate = pair.first.duplicate(ZX.RIGHT_SAME_RIGHTS);
-      expect(duplicate.isValid, isTrue);
-
-      final Handle failedDuplicate = pair.first.duplicate(-1);
-      expect(failedDuplicate.isValid, isFalse);
-    });
-
-    test('failure invalid rights', () {
-      final HandleResult vmo = System.vmoCreate(0);
-      expect(vmo.status, equals(ZX.OK));
-      final Handle failedDuplicate = vmo.handle.duplicate(-1);
-      expect(failedDuplicate.isValid, isFalse);
-      expect(vmo.handle.isValid, isTrue);
-    });
-
-    test('failure invalid handle', () {
-      final Handle handle = Handle.invalid();
-      final Handle duplicate = handle.duplicate(ZX.RIGHT_SAME_RIGHTS);
-      expect(duplicate.isValid, isFalse);
-    });
-
-    test('duplicated handle should have same koid', () {
-      final HandlePairResult pair = System.eventpairCreate();
-      expect(pair.status, equals(ZX.OK));
-      expect(pair.first.isValid, isTrue);
-      expect(pair.second.isValid, isTrue);
-
-      final Handle duplicate = pair.first.duplicate(ZX.RIGHT_SAME_RIGHTS);
-      expect(duplicate.isValid, isTrue);
-
-      expect(pair.first.koid, duplicate.koid);
-    });
-
-    // TODO(fxbug.dev/77599): Simplify once zx_object_get_info is available.
-    test('reduced rights', () {
-      // Set up handle.
-      final HandleResult vmo = System.vmoCreate(2);
-      expect(vmo.status, equals(ZX.OK));
-
-      // Duplicate the first handle.
-      final Handle duplicate = vmo.handle.duplicate(ZX.RIGHTS_BASIC);
-      expect(duplicate.isValid, isTrue);
-
-      // Write bytes to the original handle.
-      final ByteData data1 = utf8Bytes('a');
-      final int status1 = System.vmoWrite(vmo.handle, 0, data1);
-      expect(status1, equals(ZX.OK));
-
-      // Write bytes to the duplicated handle.
-      final ByteData data2 = utf8Bytes('b');
-      final int status2 = System.vmoWrite(duplicate, 1, data2);
-      expect(status2, equals(ZX.ERR_ACCESS_DENIED));
-
-      // Read bytes.
-      final ReadResult readResult = System.vmoRead(vmo.handle, 0, 2);
-      expect(readResult.status, equals(ZX.OK));
-      expect(readResult.numBytes, equals(2));
-      expect(readResult.bytes.lengthInBytes, equals(2));
-      expect(readResult.bytesAsUTF8String(), equals('a\x00'));
-    });
-  });
-
-  group('replaced handle', () {
-    test('create and replace handles', () {
-      final HandlePairResult pair = System.eventpairCreate();
-      expect(pair.status, equals(ZX.OK));
-      expect(pair.first.isValid, isTrue);
-      expect(pair.second.isValid, isTrue);
-
-      final Handle replaced = pair.first.replace(ZX.RIGHT_SAME_RIGHTS);
-      expect(replaced.isValid, isTrue);
-      expect(pair.first.isValid, isFalse);
-    });
-
-    test('failure invalid rights', () {
-      final HandleResult vmo = System.vmoCreate(0);
-      expect(vmo.status, equals(ZX.OK));
-      final Handle failedDuplicate = vmo.handle.replace(-1);
-      expect(failedDuplicate.isValid, isFalse);
-      expect(vmo.handle.isValid, isFalse);
-    });
-
-    test('failure invalid handle', () {
-      final Handle handle = Handle.invalid();
-      final Handle replaced = handle.replace(ZX.RIGHT_SAME_RIGHTS);
-      expect(handle.isValid, isFalse);
-      expect(replaced.isValid, isFalse);
-    });
-
-    test('transferred handle should have same koid', () {
-      final HandlePairResult pair = System.eventpairCreate();
-      expect(pair.status, equals(ZX.OK));
-      expect(pair.first.isValid, isTrue);
-      expect(pair.second.isValid, isTrue);
-
-      final int koid = pair.first.koid;
-      final Handle replaced = pair.first.replace(ZX.RIGHT_SAME_RIGHTS);
-      expect(replaced.isValid, isTrue);
-
-      expect(koid, replaced.koid);
-    });
-
-    // TODO(fxbug.dev/77599): Simplify once zx_object_get_info is available.
-    test('reduced rights', () {
-      // Set up handle.
-      final HandleResult vmo = System.vmoCreate(2);
-      expect(vmo.status, equals(ZX.OK));
-
-      // Replace the first handle.
-      final Handle duplicate =
-          vmo.handle.replace(ZX.RIGHTS_BASIC | ZX.RIGHT_READ);
-      expect(duplicate.isValid, isTrue);
-
-      // Write bytes to the original handle.
-      final ByteData data1 = utf8Bytes('a');
-      final int status1 = System.vmoWrite(vmo.handle, 0, data1);
-      expect(status1, equals(ZX.ERR_BAD_HANDLE));
-
-      // Write bytes to the duplicated handle.
-      final ByteData data2 = utf8Bytes('b');
-      final int status2 = System.vmoWrite(duplicate, 1, data2);
-      expect(status2, equals(ZX.ERR_ACCESS_DENIED));
-
-      // Read bytes.
-      final ReadResult readResult = System.vmoRead(duplicate, 0, 2);
-      expect(readResult.status, equals(ZX.OK));
-      expect(readResult.numBytes, equals(2));
-      expect(readResult.bytes.lengthInBytes, equals(2));
-      expect(readResult.bytesAsUTF8String(), equals('\x00\x00'));
-    });
-  });
-
-  test('cache koid and invalidate', () {
-    final HandleResult vmo = System.vmoCreate(0);
-    expect(vmo.status, equals(ZX.OK));
-    int originalKoid = vmo.handle.koid;
-    expect(originalKoid, isNot(equals(ZX.KOID_INVALID)));
-    // Cached koid should be same value.
-    expect(originalKoid, equals(vmo.handle.koid));
-    vmo.handle.close();
-    // koid should be invalidated.
-    expect(vmo.handle.koid, equals(ZX.KOID_INVALID));
-  });
-}
diff --git a/shell/platform/fuchsia/dart-pkg/zircon/test/meta/channel_test.cml b/shell/platform/fuchsia/dart-pkg/zircon/test/meta/channel_test.cml
deleted file mode 100644
index d3c09451ea04dfd00849a4bb5ea4d167c99b8e40..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/dart-pkg/zircon/test/meta/channel_test.cml
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    program: {
-        data: "data/channel_test",
-    },
-}
diff --git a/shell/platform/fuchsia/dart-pkg/zircon/test/meta/zircon_tests.cml b/shell/platform/fuchsia/dart-pkg/zircon/test/meta/zircon_tests.cml
new file mode 100644
index 0000000000000000000000000000000000000000..e7faccaece4ed3297d4e67f1d911ef2ba7869355
--- /dev/null
+++ b/shell/platform/fuchsia/dart-pkg/zircon/test/meta/zircon_tests.cml
@@ -0,0 +1,6 @@
+{
+    program: {
+        data: "data/zircon_tests",
+        runner: "dart_jit_runner",
+    },
+}
diff --git a/shell/platform/fuchsia/dart-pkg/zircon/test/socket_test.dart b/shell/platform/fuchsia/dart-pkg/zircon/test/socket_test.dart
deleted file mode 100644
index 8fbb728febf817cb3820f313d5bf731890cb8bfc..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/dart-pkg/zircon/test/socket_test.dart
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'dart:async';
-import 'dart:convert';
-import 'dart:typed_data';
-
-import 'package:test/test.dart';
-import 'package:zircon/zircon.dart';
-
-/// Helper method to turn a [String] into a [ByteData] containing the
-/// text of the string encoded as UTF-8.
-ByteData utf8Bytes(final String text) {
-  return ByteData.view(Uint8List.fromList(utf8.encode(text)).buffer);
-}
-
-void main() {
-  // NOTE: This only tests stream sockets.
-  // We should add tests for datagram sockets.
-
-  test('create socket', () {
-    final HandlePairResult pair = System.socketCreate();
-    expect(pair.status, equals(ZX.OK));
-    expect(pair.first.isValid, isTrue);
-    expect(pair.second.isValid, isTrue);
-  });
-
-  test('close socket', () {
-    final HandlePairResult pair = System.socketCreate();
-    expect(pair.first.close(), equals(0));
-    expect(pair.first.isValid, isFalse);
-    expect(pair.second.isValid, isTrue);
-    final WriteResult firstResult =
-        System.socketWrite(pair.first, ByteData(1), 0);
-    expect(firstResult.status, equals(ZX.ERR_BAD_HANDLE));
-    final WriteResult secondResult =
-        System.socketWrite(pair.second, ByteData(1), 0);
-    expect(secondResult.status, equals(ZX.ERR_PEER_CLOSED));
-  });
-
-  test('read write socket', () {
-    final HandlePairResult pair = System.socketCreate();
-
-    // When no data is available, ZX.ERR_SHOULD_WAIT is returned.
-    expect(
-        System.socketRead(pair.second, 1).status, equals(ZX.ERR_SHOULD_WAIT));
-
-    final ByteData data = utf8Bytes('Hello, world');
-    final WriteResult writeResult = System.socketWrite(pair.first, data, 0);
-    expect(writeResult.status, equals(ZX.OK));
-
-    final ReadResult readResult =
-        System.socketRead(pair.second, data.lengthInBytes);
-    expect(readResult.status, equals(ZX.OK));
-    expect(readResult.numBytes, equals(data.lengthInBytes));
-    expect(readResult.bytes.lengthInBytes, equals(data.lengthInBytes));
-    expect(readResult.bytesAsUTF8String(), equals('Hello, world'));
-  });
-
-  test('partial read socket', () {
-    final HandlePairResult pair = System.socketCreate();
-    final ByteData data = utf8Bytes('Hello, world');
-    final WriteResult writeResult = System.socketWrite(pair.first, data, 0);
-    expect(writeResult.status, equals(ZX.OK));
-
-    const int shortLength = 'Hello'.length;
-    final ReadResult shortReadResult =
-        System.socketRead(pair.second, shortLength);
-    expect(shortReadResult.status, equals(ZX.OK));
-    expect(shortReadResult.numBytes, equals(shortLength));
-    expect(shortReadResult.bytes.lengthInBytes, equals(shortLength));
-    expect(shortReadResult.bytesAsUTF8String(), equals('Hello'));
-
-    final int longLength = data.lengthInBytes * 2;
-    final ReadResult longReadResult =
-        System.socketRead(pair.second, longLength);
-    expect(longReadResult.status, equals(ZX.OK));
-    expect(longReadResult.numBytes, equals(data.lengthInBytes - shortLength));
-    expect(longReadResult.bytes.lengthInBytes, equals(longLength));
-    expect(longReadResult.bytesAsUTF8String(), equals(', world'));
-  });
-
-  test('partial write socket', () {
-    final HandlePairResult pair = System.socketCreate();
-    final WriteResult writeResult1 =
-        System.socketWrite(pair.first, utf8Bytes('Hello, '), 0);
-    expect(writeResult1.status, equals(ZX.OK));
-    final WriteResult writeResult2 =
-        System.socketWrite(pair.first, utf8Bytes('world'), 0);
-    expect(writeResult2.status, equals(ZX.OK));
-
-    final ReadResult readResult = System.socketRead(pair.second, 100);
-    expect(readResult.status, equals(ZX.OK));
-    expect(readResult.numBytes, equals('Hello, world'.length));
-    expect(readResult.bytes.lengthInBytes, equals(100));
-    expect(readResult.bytesAsUTF8String(), equals('Hello, world'));
-  });
-
-  test('async wait socket read', () async {
-    final HandlePairResult pair = System.socketCreate();
-    final Completer<int> completer = Completer<int>();
-    pair.first.asyncWait(ZX.SOCKET_READABLE, (int status, int pending) {
-      completer.complete(status);
-    });
-
-    expect(completer.isCompleted, isFalse);
-
-    System.socketWrite(pair.second, utf8Bytes('Hi'), 0);
-
-    final int status = await completer.future;
-    expect(status, equals(ZX.OK));
-  });
-
-  test('async wait socket closed', () async {
-    final HandlePairResult pair = System.socketCreate();
-    final Completer<int> completer = Completer<int>();
-    pair.first.asyncWait(ZX.SOCKET_PEER_CLOSED, (int status, int pending) {
-      completer.complete(status);
-    });
-
-    expect(completer.isCompleted, isFalse);
-
-    pair.second.close();
-
-    final int status = await completer.future;
-    expect(status, equals(ZX.OK));
-  });
-}
diff --git a/shell/platform/fuchsia/dart-pkg/zircon/test/vmo_test.dart b/shell/platform/fuchsia/dart-pkg/zircon/test/vmo_test.dart
deleted file mode 100644
index ca72cd9f49518cc8ac4a3327237c284d5ac42f21..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/dart-pkg/zircon/test/vmo_test.dart
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'dart:convert';
-import 'dart:io';
-import 'dart:typed_data';
-
-import 'package:test/test.dart';
-import 'package:zircon/zircon.dart';
-
-void main() {
-  group('test vmo', () {
-    test('fromFile', () {
-      const String fuchsia = 'Fuchsia';
-      File f = File('tmp/testdata')
-        ..createSync()
-        ..writeAsStringSync(fuchsia);
-      String readFuchsia = f.readAsStringSync();
-      expect(readFuchsia, equals(fuchsia));
-
-      SizedVmo fileVmo = SizedVmo.fromFile('tmp/testdata');
-      Uint8List fileData = fileVmo.map();
-      String fileString = utf8.decode(fileData.sublist(0, fileVmo.size));
-      expect(fileString, equals(fuchsia));
-    });
-
-    test('duplicate', () {
-      const String fuchsia = 'Fuchsia';
-      Uint8List data = Uint8List.fromList(fuchsia.codeUnits);
-      SizedVmo vmo = SizedVmo.fromUint8List(data);
-      final Vmo duplicate =
-          vmo.duplicate(ZX.RIGHTS_BASIC | ZX.RIGHT_READ | ZX.RIGHT_MAP);
-      expect(duplicate.isValid, isTrue);
-
-      // Read from the duplicate.
-      final duplicatedVmo = SizedVmo(duplicate.handle, fuchsia.length);
-      Uint8List vmoData = duplicatedVmo.map();
-      String vmoString = utf8.decode(vmoData.sublist(0, vmo.size));
-      expect(vmoString, equals(fuchsia));
-    });
-  });
-}
diff --git a/shell/platform/fuchsia/dart-pkg/zircon/test/zircon_tests.dart b/shell/platform/fuchsia/dart-pkg/zircon/test/zircon_tests.dart
new file mode 100644
index 0000000000000000000000000000000000000000..a0e380fb34d35caff6094ad5f1d9049361e8ea5d
--- /dev/null
+++ b/shell/platform/fuchsia/dart-pkg/zircon/test/zircon_tests.dart
@@ -0,0 +1,618 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+import 'dart:typed_data';
+import 'dart:zircon';
+
+import 'package:litetest/litetest.dart';
+
+/// Helper method to turn a [String] into a [ByteData] containing the
+/// text of the string encoded as UTF-8.
+ByteData utf8Bytes(final String text) {
+  return ByteData.sublistView(utf8.encode(text));
+}
+
+// Take from zircon constants in zircon/errors.h, zircon/rights.h, zircon/types.h
+abstract class ZX {
+  ZX._();
+
+  static const int OK = 0;
+  static const int KOID_INVALID = 0;
+  static const int ERR_BAD_HANDLE = -11;
+  static const int ERR_SHOULD_WAIT = -22;
+  static const int ERR_PEER_CLOSED = -24;
+  static const int ERR_ACCESS_DENIED = -30;
+  static const int EVENTPAIR_PEER_CLOSED = __ZX_OBJECT_PEER_CLOSED;
+  static const int CHANNEL_READABLE = __ZX_OBJECT_READABLE;
+  static const int CHANNEL_PEER_CLOSED = __ZX_OBJECT_PEER_CLOSED;
+  static const int SOCKET_READABLE = __ZX_OBJECT_READABLE;
+  static const int SOCKET_PEER_CLOSED = __ZX_OBJECT_PEER_CLOSED;
+  static const int RIGHT_DUPLICATE = 1 << 0;
+  static const int RIGHT_TRANSFER = 1 << 1;
+  static const int RIGHT_READ = 1 << 2;
+  static const int RIGHT_WRITE = 1 << 3;
+  static const int RIGHT_GET_PROPERTY = 1 << 6;
+  static const int RIGHT_SET_PROPERTY = 1 << 7;
+  static const int RIGHT_MAP = 1 << 5;
+  static const int RIGHT_SIGNAL = 1 << 12;
+  static const int RIGHT_WAIT = 1 << 14;
+  static const int RIGHT_INSPECT = 1 << 15;
+  static const int RIGHT_SAME_RIGHTS = 1 << 31;
+  static const int RIGHTS_BASIC = RIGHT_TRANSFER | RIGHT_DUPLICATE |
+                                  RIGHT_WAIT | RIGHT_INSPECT;
+  static const int RIGHTS_IO = RIGHT_READ | RIGHT_WRITE;
+  static const int RIGHTS_PROPERTY = RIGHT_GET_PROPERTY | RIGHT_SET_PROPERTY;
+  static const int DEFAULT_VMO_RIGHTS = RIGHTS_BASIC | RIGHTS_IO |
+                                        RIGHTS_PROPERTY | RIGHT_MAP |
+                                        RIGHT_SIGNAL;
+  static const int OBJ_TYPE_VMO = 3;
+  static const int OBJ_TYPE_CHANNEL = 4;
+  static const int HANDLE_OP_MOVE = 0;
+  static const int HANDLE_OP_DUPLICATE = 1;
+  static const int __ZX_OBJECT_READABLE = 1 << 0;
+  static const int __ZX_OBJECT_PEER_CLOSED = 1 << 2;
+}
+
+void main() {
+  group('handle', () {
+    test('create and duplicate handles', () {
+      final HandlePairResult pair = System.eventpairCreate();
+      expect(pair.status, equals(ZX.OK));
+      expect(pair.first.isValid, isTrue);
+      expect(pair.second.isValid, isTrue);
+
+      final Handle duplicate = pair.first.duplicate(ZX.RIGHT_SAME_RIGHTS);
+      expect(duplicate.isValid, isTrue);
+
+      final Handle failedDuplicate = pair.first.duplicate(-1);
+      expect(failedDuplicate.isValid, isFalse);
+    });
+
+    test('failure invalid rights', () {
+      final HandleResult vmo = System.vmoCreate(0);
+      expect(vmo.status, equals(ZX.OK));
+      final Handle failedDuplicate = vmo.handle.duplicate(-1);
+      expect(failedDuplicate.isValid, isFalse);
+      expect(vmo.handle.isValid, isTrue);
+    });
+
+    test('failure invalid handle', () {
+      final Handle handle = Handle.invalid();
+      final Handle duplicate = handle.duplicate(ZX.RIGHT_SAME_RIGHTS);
+      expect(duplicate.isValid, isFalse);
+    });
+
+    test('duplicated handle should have same koid', () {
+      final HandlePairResult pair = System.eventpairCreate();
+      expect(pair.status, equals(ZX.OK));
+      expect(pair.first.isValid, isTrue);
+      expect(pair.second.isValid, isTrue);
+
+      final Handle duplicate = pair.first.duplicate(ZX.RIGHT_SAME_RIGHTS);
+      expect(duplicate.isValid, isTrue);
+
+      expect(pair.first.koid, duplicate.koid);
+    });
+
+    // TODO(fxbug.dev/77599): Simplify once zx_object_get_info is available.
+    test('reduced rights', () {
+      // Set up handle.
+      final HandleResult vmo = System.vmoCreate(2);
+      expect(vmo.status, equals(ZX.OK));
+
+      // Duplicate the first handle.
+      final Handle duplicate = vmo.handle.duplicate(ZX.RIGHTS_BASIC);
+      expect(duplicate.isValid, isTrue);
+
+      // Write bytes to the original handle.
+      final ByteData data1 = utf8Bytes('a');
+      final int status1 = System.vmoWrite(vmo.handle, 0, data1);
+      expect(status1, equals(ZX.OK));
+
+      // Write bytes to the duplicated handle.
+      final ByteData data2 = utf8Bytes('b');
+      final int status2 = System.vmoWrite(duplicate, 1, data2);
+      expect(status2, equals(ZX.ERR_ACCESS_DENIED));
+
+      // Read bytes.
+      final ReadResult readResult = System.vmoRead(vmo.handle, 0, 2);
+      expect(readResult.status, equals(ZX.OK));
+      expect(readResult.numBytes, equals(2));
+      expect(readResult.bytes.lengthInBytes, equals(2));
+      expect(readResult.bytesAsUTF8String(), equals('a\x00'));
+    });
+
+    test('create and replace handles', () {
+      final HandlePairResult pair = System.eventpairCreate();
+      expect(pair.status, equals(ZX.OK));
+      expect(pair.first.isValid, isTrue);
+      expect(pair.second.isValid, isTrue);
+
+      final Handle replaced = pair.first.replace(ZX.RIGHT_SAME_RIGHTS);
+      expect(replaced.isValid, isTrue);
+      expect(pair.first.isValid, isFalse);
+    });
+
+    test('failure invalid rights', () {
+      final HandleResult vmo = System.vmoCreate(0);
+      expect(vmo.status, equals(ZX.OK));
+      final Handle failedDuplicate = vmo.handle.replace(-1);
+      expect(failedDuplicate.isValid, isFalse);
+      expect(vmo.handle.isValid, isFalse);
+    });
+
+    test('failure invalid handle', () {
+      final Handle handle = Handle.invalid();
+      final Handle replaced = handle.replace(ZX.RIGHT_SAME_RIGHTS);
+      expect(handle.isValid, isFalse);
+      expect(replaced.isValid, isFalse);
+    });
+
+    test('transferred handle should have same koid', () {
+      final HandlePairResult pair = System.eventpairCreate();
+      expect(pair.status, equals(ZX.OK));
+      expect(pair.first.isValid, isTrue);
+      expect(pair.second.isValid, isTrue);
+
+      final int koid = pair.first.koid;
+      final Handle replaced = pair.first.replace(ZX.RIGHT_SAME_RIGHTS);
+      expect(replaced.isValid, isTrue);
+
+      expect(koid, replaced.koid);
+    });
+
+    // TODO(fxbug.dev/77599): Simplify once zx_object_get_info is available.
+    test('reduced rights', () {
+      // Set up handle.
+      final HandleResult vmo = System.vmoCreate(2);
+      expect(vmo.status, equals(ZX.OK));
+
+      // Replace the first handle.
+      final Handle duplicate =
+          vmo.handle.replace(ZX.RIGHTS_BASIC | ZX.RIGHT_READ);
+      expect(duplicate.isValid, isTrue);
+
+      // Write bytes to the original handle.
+      final ByteData data1 = utf8Bytes('a');
+      final int status1 = System.vmoWrite(vmo.handle, 0, data1);
+      expect(status1, equals(ZX.ERR_BAD_HANDLE));
+
+      // Write bytes to the duplicated handle.
+      final ByteData data2 = utf8Bytes('b');
+      final int status2 = System.vmoWrite(duplicate, 1, data2);
+      expect(status2, equals(ZX.ERR_ACCESS_DENIED));
+
+      // Read bytes.
+      final ReadResult readResult = System.vmoRead(duplicate, 0, 2);
+      expect(readResult.status, equals(ZX.OK));
+      expect(readResult.numBytes, equals(2));
+      expect(readResult.bytes.lengthInBytes, equals(2));
+      expect(readResult.bytesAsUTF8String(), equals('\x00\x00'));
+    });
+
+    test('cache koid and invalidate', () {
+      final HandleResult vmo = System.vmoCreate(0);
+      expect(vmo.status, equals(ZX.OK));
+      int originalKoid = vmo.handle.koid;
+      expect(originalKoid, notEquals(ZX.KOID_INVALID));
+      // Cached koid should be same value.
+      expect(originalKoid, equals(vmo.handle.koid));
+      vmo.handle.close();
+      // koid should be invalidated.
+      expect(vmo.handle.koid, equals(ZX.KOID_INVALID));
+    });
+
+    test('store the disposition arguments correctly', () {
+      final Handle handle = System.channelCreate().first;
+      final HandleDisposition disposition = HandleDisposition(1, handle, 2, 3);
+      expect(disposition.operation, equals(1));
+      expect(disposition.handle, equals(handle));
+      expect(disposition.type, equals(2));
+      expect(disposition.rights, equals(3));
+      expect(disposition.result, equals(ZX.OK));
+    });
+  });
+
+  group('channel', () {
+    test('create channel', () {
+      final HandlePairResult pair = System.channelCreate();
+      expect(pair.status, equals(ZX.OK));
+      expect(pair.first.isValid, isTrue);
+      expect(pair.second.isValid, isTrue);
+    });
+
+    test('close channel', () {
+      final HandlePairResult pair = System.channelCreate();
+      expect(pair.first.close(), equals(0));
+      expect(pair.first.isValid, isFalse);
+      expect(pair.second.isValid, isTrue);
+      expect(System.channelWrite(pair.first, ByteData(1), <Handle>[]),
+          equals(ZX.ERR_BAD_HANDLE));
+      expect(System.channelWrite(pair.second, ByteData(1), <Handle>[]),
+          equals(ZX.ERR_PEER_CLOSED));
+    });
+
+    test('channel bytes', () {
+      final HandlePairResult pair = System.channelCreate();
+
+      // When no data is available, ZX.ERR_SHOULD_WAIT is returned.
+      expect(System.channelQueryAndRead(pair.second).status,
+          equals(ZX.ERR_SHOULD_WAIT));
+
+      // Write bytes.
+      final ByteData data = utf8Bytes('Hello, world');
+      final int status = System.channelWrite(pair.first, data, <Handle>[]);
+      expect(status, equals(ZX.OK));
+
+      // Read bytes.
+      final ReadResult readResult = System.channelQueryAndRead(pair.second);
+      expect(readResult.status, equals(ZX.OK));
+      expect(readResult.numBytes, equals(data.lengthInBytes));
+      expect(readResult.bytes.lengthInBytes, equals(data.lengthInBytes));
+      expect(readResult.bytesAsUTF8String(), equals('Hello, world'));
+      expect(readResult.handles.length, equals(0));
+    });
+
+    test('channel handles', () {
+      final HandlePairResult pair = System.channelCreate();
+      final ByteData data = utf8Bytes('');
+      final HandlePairResult eventPair = System.eventpairCreate();
+      final int status =
+          System.channelWrite(pair.first, data, <Handle>[eventPair.first]);
+      expect(status, equals(ZX.OK));
+      expect(eventPair.first.isValid, isFalse);
+
+      final ReadResult readResult = System.channelQueryAndRead(pair.second);
+      expect(readResult.status, equals(ZX.OK));
+      expect(readResult.numBytes, equals(0));
+      expect(readResult.bytes.lengthInBytes, equals(0));
+      expect(readResult.bytesAsUTF8String(), equals(''));
+      expect(readResult.handles.length, equals(1));
+      expect(readResult.handles[0].isValid, isTrue);
+    });
+
+    test('async wait channel read', () async {
+      final HandlePairResult pair = System.channelCreate();
+      final Completer<List<int>> completer = Completer<List<int>>();
+      pair.first.asyncWait(ZX.CHANNEL_READABLE, (int status, int pending) {
+        completer.complete(<int>[status, pending]);
+      });
+
+      expect(completer.isCompleted, isFalse);
+
+      System.channelWrite(pair.second, utf8Bytes('Hi'), <Handle>[]);
+
+      final List<int> result = await completer.future;
+      expect(result[0], equals(ZX.OK)); // status
+      expect(result[1] & ZX.CHANNEL_READABLE,
+          equals(ZX.CHANNEL_READABLE)); // pending
+    });
+
+    test('async wait channel closed', () async {
+      final HandlePairResult pair = System.channelCreate();
+      final Completer<int> completer = Completer<int>();
+      pair.first.asyncWait(ZX.CHANNEL_PEER_CLOSED, (int status, int pending) {
+        completer.complete(status);
+      });
+
+      expect(completer.isCompleted, isFalse);
+
+      pair.second.close();
+
+      final int status = await completer.future;
+      expect(status, equals(ZX.OK));
+    });
+  });
+
+  group('channel etc functions', () {
+    test('moved handle', () {
+      final HandlePairResult pair = System.channelCreate();
+      final ByteData data = utf8Bytes('');
+      final HandlePairResult transferred = System.channelCreate();
+
+      final HandleDisposition disposition = HandleDisposition(ZX.HANDLE_OP_MOVE,
+          transferred.first, ZX.OBJ_TYPE_CHANNEL, ZX.RIGHTS_IO);
+      final int status = System.channelWriteEtc(
+          pair.first, data, <HandleDisposition>[disposition]);
+      expect(status, equals(ZX.OK));
+      expect(disposition.result, equals(ZX.OK));
+      expect(transferred.first.isValid, isFalse);
+
+      final ReadEtcResult readResult =
+          System.channelQueryAndReadEtc(pair.second);
+      expect(readResult.status, equals(ZX.OK));
+      expect(readResult.numBytes, equals(0));
+      expect(readResult.bytes.lengthInBytes, equals(0));
+      expect(readResult.bytesAsUTF8String(), equals(''));
+      expect(readResult.handleInfos.length, equals(1));
+      final HandleInfo handleInfo = readResult.handleInfos[0];
+      expect(handleInfo.handle.isValid, isTrue);
+      expect(handleInfo.type, equals(ZX.OBJ_TYPE_CHANNEL));
+      expect(handleInfo.rights, equals(ZX.RIGHTS_IO));
+    });
+
+    test('copied handle', () {
+      final HandlePairResult pair = System.channelCreate();
+      final ByteData data = utf8Bytes('');
+      final HandleResult vmo = System.vmoCreate(0);
+
+      final HandleDisposition disposition = HandleDisposition(
+          ZX.HANDLE_OP_DUPLICATE,
+          vmo.handle,
+          ZX.OBJ_TYPE_VMO,
+          ZX.RIGHT_SAME_RIGHTS);
+      final int status = System.channelWriteEtc(
+          pair.first, data, <HandleDisposition>[disposition]);
+      expect(status, equals(ZX.OK));
+      expect(disposition.result, equals(ZX.OK));
+      expect(vmo.handle.isValid, isTrue);
+
+      final ReadEtcResult readResult =
+          System.channelQueryAndReadEtc(pair.second);
+      expect(readResult.status, equals(ZX.OK));
+      expect(readResult.numBytes, equals(0));
+      expect(readResult.bytes.lengthInBytes, equals(0));
+      expect(readResult.bytesAsUTF8String(), equals(''));
+      expect(readResult.handleInfos.length, equals(1));
+      final HandleInfo handleInfo = readResult.handleInfos[0];
+      expect(handleInfo.handle.isValid, isTrue);
+      expect(handleInfo.type, equals(ZX.OBJ_TYPE_VMO));
+      expect(handleInfo.rights, equals(ZX.DEFAULT_VMO_RIGHTS));
+    });
+
+    test('closed handle should error', () {
+      final HandlePairResult pair = System.channelCreate();
+      final ByteData data = utf8Bytes('');
+      final HandlePairResult closed = System.channelCreate();
+
+      final HandleDisposition disposition = HandleDisposition(ZX.HANDLE_OP_MOVE,
+          closed.first, ZX.OBJ_TYPE_CHANNEL, ZX.RIGHT_SAME_RIGHTS);
+      closed.first.close();
+      final int status = System.channelWriteEtc(
+          pair.first, data, <HandleDisposition>[disposition]);
+      expect(status, equals(ZX.ERR_BAD_HANDLE));
+      expect(disposition.result, equals(ZX.ERR_BAD_HANDLE));
+      expect(closed.first.isValid, isFalse);
+
+      final ReadEtcResult readResult =
+          System.channelQueryAndReadEtc(pair.second);
+      expect(readResult.status, equals(ZX.ERR_SHOULD_WAIT));
+    });
+
+    test('multiple handles', () {
+      final HandlePairResult pair = System.channelCreate();
+      final ByteData data = utf8Bytes('');
+      final HandlePairResult transferred = System.channelCreate();
+      final HandleResult vmo = System.vmoCreate(0);
+
+      final List<HandleDisposition> dispositions = [
+        HandleDisposition(ZX.HANDLE_OP_MOVE, transferred.first,
+            ZX.OBJ_TYPE_CHANNEL, ZX.RIGHTS_IO),
+        HandleDisposition(ZX.HANDLE_OP_DUPLICATE, vmo.handle, ZX.OBJ_TYPE_VMO,
+            ZX.RIGHT_SAME_RIGHTS)
+      ];
+      final int status = System.channelWriteEtc(pair.first, data, dispositions);
+      expect(status, equals(ZX.OK));
+      expect(dispositions[0].result, equals(ZX.OK));
+      expect(dispositions[1].result, equals(ZX.OK));
+      expect(transferred.first.isValid, isFalse);
+      expect(vmo.handle.isValid, isTrue);
+
+      final ReadEtcResult readResult =
+          System.channelQueryAndReadEtc(pair.second);
+      expect(readResult.status, equals(ZX.OK));
+      expect(readResult.numBytes, equals(0));
+      expect(readResult.bytes.lengthInBytes, equals(0));
+      expect(readResult.bytesAsUTF8String(), equals(''));
+
+      expect(readResult.handleInfos.length, equals(2));
+      final HandleInfo handleInfo = readResult.handleInfos[0];
+      expect(handleInfo.handle.isValid, isTrue);
+      expect(handleInfo.type, equals(ZX.OBJ_TYPE_CHANNEL));
+      expect(handleInfo.rights, equals(ZX.RIGHTS_IO));
+      final HandleInfo vmoInfo = readResult.handleInfos[1];
+      expect(vmoInfo.handle.isValid, isTrue);
+      expect(vmoInfo.type, equals(ZX.OBJ_TYPE_VMO));
+      expect(vmoInfo.rights, equals(ZX.DEFAULT_VMO_RIGHTS));
+    });
+  });
+
+  group('eventpair', () {
+    test('create', () {
+      final HandlePairResult pair = System.eventpairCreate();
+      expect(pair.status, equals(ZX.OK));
+      expect(pair.first.isValid, isTrue);
+      expect(pair.second.isValid, isTrue);
+    });
+
+    test('duplicate', () {
+      final HandlePairResult pair = System.eventpairCreate();
+      expect(pair.status, equals(ZX.OK));
+      expect(pair.first.isValid, isTrue);
+      expect(pair.second.isValid, isTrue);
+
+      expect(pair.first.duplicate(ZX.RIGHT_SAME_RIGHTS).isValid, isTrue);
+      expect(pair.second.duplicate(ZX.RIGHT_SAME_RIGHTS).isValid, isTrue);
+    });
+
+    test('close', () {
+      final HandlePairResult pair = System.eventpairCreate();
+      expect(pair.first.close(), equals(0));
+      expect(pair.first.isValid, isFalse);
+      expect(pair.second.isValid, isTrue);
+
+      expect(pair.second.close(), equals(0));
+      expect(pair.second.isValid, isFalse);
+    });
+
+    test('async wait peer closed', () async {
+      final HandlePairResult pair = System.eventpairCreate();
+      final Completer<int> completer = Completer<int>();
+      pair.first.asyncWait(ZX.EVENTPAIR_PEER_CLOSED, (int status, int pending) {
+        completer.complete(status);
+      });
+
+      expect(completer.isCompleted, isFalse);
+      pair.second.close();
+
+      final int status = await completer.future;
+      expect(status, equals(ZX.OK));
+    });
+  });
+
+  // NOTE: This only tests stream sockets.
+  // We should add tests for datagram sockets.
+  group('socket', () {
+    test('create socket', () {
+      final HandlePairResult pair = System.socketCreate();
+      expect(pair.status, equals(ZX.OK));
+      expect(pair.first.isValid, isTrue);
+      expect(pair.second.isValid, isTrue);
+    });
+
+    test('close socket', () {
+      final HandlePairResult pair = System.socketCreate();
+      expect(pair.first.close(), equals(0));
+      expect(pair.first.isValid, isFalse);
+      expect(pair.second.isValid, isTrue);
+      final WriteResult firstResult =
+          System.socketWrite(pair.first, ByteData(1), 0);
+      expect(firstResult.status, equals(ZX.ERR_BAD_HANDLE));
+      final WriteResult secondResult =
+          System.socketWrite(pair.second, ByteData(1), 0);
+      expect(secondResult.status, equals(ZX.ERR_PEER_CLOSED));
+    });
+
+    test('read write socket', () {
+      final HandlePairResult pair = System.socketCreate();
+
+      // When no data is available, ZX.ERR_SHOULD_WAIT is returned.
+      expect(
+          System.socketRead(pair.second, 1).status, equals(ZX.ERR_SHOULD_WAIT));
+
+      final ByteData data = utf8Bytes('Hello, world');
+      final WriteResult writeResult = System.socketWrite(pair.first, data, 0);
+      expect(writeResult.status, equals(ZX.OK));
+
+      final ReadResult readResult =
+          System.socketRead(pair.second, data.lengthInBytes);
+      expect(readResult.status, equals(ZX.OK));
+      expect(readResult.numBytes, equals(data.lengthInBytes));
+      expect(readResult.bytes.lengthInBytes, equals(data.lengthInBytes));
+      expect(readResult.bytesAsUTF8String(), equals('Hello, world'));
+    });
+
+    test('partial read socket', () {
+      final HandlePairResult pair = System.socketCreate();
+      final ByteData data = utf8Bytes('Hello, world');
+      final WriteResult writeResult = System.socketWrite(pair.first, data, 0);
+      expect(writeResult.status, equals(ZX.OK));
+
+      const int shortLength = 'Hello'.length;
+      final ReadResult shortReadResult =
+          System.socketRead(pair.second, shortLength);
+      expect(shortReadResult.status, equals(ZX.OK));
+      expect(shortReadResult.numBytes, equals(shortLength));
+      expect(shortReadResult.bytes.lengthInBytes, equals(shortLength));
+      expect(shortReadResult.bytesAsUTF8String(), equals('Hello'));
+
+      final int longLength = data.lengthInBytes * 2;
+      final ReadResult longReadResult =
+          System.socketRead(pair.second, longLength);
+      expect(longReadResult.status, equals(ZX.OK));
+      expect(longReadResult.numBytes, equals(data.lengthInBytes - shortLength));
+      expect(longReadResult.bytes.lengthInBytes, equals(longLength));
+      expect(longReadResult.bytesAsUTF8String(), equals(', world'));
+    });
+
+    test('partial write socket', () {
+      final HandlePairResult pair = System.socketCreate();
+      final WriteResult writeResult1 =
+          System.socketWrite(pair.first, utf8Bytes('Hello, '), 0);
+      expect(writeResult1.status, equals(ZX.OK));
+      final WriteResult writeResult2 =
+          System.socketWrite(pair.first, utf8Bytes('world'), 0);
+      expect(writeResult2.status, equals(ZX.OK));
+
+      final ReadResult readResult = System.socketRead(pair.second, 100);
+      expect(readResult.status, equals(ZX.OK));
+      expect(readResult.numBytes, equals('Hello, world'.length));
+      expect(readResult.bytes.lengthInBytes, equals(100));
+      expect(readResult.bytesAsUTF8String(), equals('Hello, world'));
+    });
+
+    test('async wait socket read', () async {
+      final HandlePairResult pair = System.socketCreate();
+      final Completer<int> completer = Completer<int>();
+      pair.first.asyncWait(ZX.SOCKET_READABLE, (int status, int pending) {
+        completer.complete(status);
+      });
+
+      expect(completer.isCompleted, isFalse);
+
+      System.socketWrite(pair.second, utf8Bytes('Hi'), 0);
+
+      final int status = await completer.future;
+      expect(status, equals(ZX.OK));
+    });
+
+    test('async wait socket closed', () async {
+      final HandlePairResult pair = System.socketCreate();
+      final Completer<int> completer = Completer<int>();
+      pair.first.asyncWait(ZX.SOCKET_PEER_CLOSED, (int status, int pending) {
+        completer.complete(status);
+      });
+
+      expect(completer.isCompleted, isFalse);
+
+      pair.second.close();
+
+      final int status = await completer.future;
+      expect(status, equals(ZX.OK));
+    });
+  });
+
+  group('vmo', () {
+    test('fromFile', () {
+      const String fuchsia = 'Fuchsia';
+      File f = File('tmp/testdata')
+        ..createSync()
+        ..writeAsStringSync(fuchsia);
+      String readFuchsia = f.readAsStringSync();
+      expect(readFuchsia, equals(fuchsia));
+
+      FromFileResult fileResult = System.vmoFromFile('tmp/testdata');
+      expect(fileResult.status, equals(ZX.OK));
+      MapResult mapResult = System.vmoMap(fileResult.handle);
+      expect(mapResult.status, equals(ZX.OK));
+      Uint8List fileData = mapResult.data.asUnmodifiableView();
+      String fileString = utf8.decode(fileData.sublist(0, fileResult.numBytes));
+      expect(fileString, equals(fuchsia));
+    });
+
+    test('duplicate', () {
+      const String fuchsia = 'Fuchsia';
+      Uint8List data = Uint8List.fromList(fuchsia.codeUnits);
+      HandleResult createResult = System.vmoCreate(data.length);
+      expect(createResult.status, equals(ZX.OK));
+      int writeResult = System.vmoWrite(createResult.handle, 0,
+                                        data.buffer.asByteData());
+      expect(writeResult, equals(ZX.OK));
+      Handle duplicate = createResult.handle.duplicate(ZX.RIGHTS_BASIC |
+                                                       ZX.RIGHT_READ |
+                                                       ZX.RIGHT_MAP);
+      expect(duplicate.isValid, isTrue);
+
+      // Read from the duplicate.
+      MapResult mapResult = System.vmoMap(duplicate);
+      expect(mapResult.status, equals(ZX.OK));
+      Uint8List vmoData = mapResult.data.asUnmodifiableView();
+      String vmoString = utf8.decode(vmoData.sublist(0, data.length));
+      expect(vmoString, equals(fuchsia));
+    });
+  });
+}
diff --git a/shell/platform/fuchsia/dart-pkg/zircon_ffi/BUILD.gn b/shell/platform/fuchsia/dart-pkg/zircon_ffi/BUILD.gn
index bbce4e82de8e229cbf91f5ae2a59509342a8e216..b98973a1d022146eb074d2c884356eea04fe4d3b 100644
--- a/shell/platform/fuchsia/dart-pkg/zircon_ffi/BUILD.gn
+++ b/shell/platform/fuchsia/dart-pkg/zircon_ffi/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/fuchsia/sdk.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
 
 config("zircon_ffi_config") {
   include_dirs = [ "." ]
@@ -26,8 +26,8 @@ shared_library("zircon_ffi") {
   ]
 
   deps = [
-    "$fuchsia_sdk_root/pkg:zx",
+    "$dart_src/runtime:dart_api",
+    "${fuchsia_sdk}/pkg/zx",
     "//flutter/fml",
-    "//third_party/dart/runtime:dart_api",
   ]
 }
diff --git a/shell/platform/fuchsia/dart-pkg/zircon_ffi/channel.h b/shell/platform/fuchsia/dart-pkg/zircon_ffi/channel.h
index 07dbcd6a01cd94a50885dd46e766027ed2da836c..a096d3bd444aa9609fa41498d2573b540f6f731b 100644
--- a/shell/platform/fuchsia/dart-pkg/zircon_ffi/channel.h
+++ b/shell/platform/fuchsia/dart-pkg/zircon_ffi/channel.h
@@ -18,10 +18,10 @@ extern "C" {
 ZIRCON_FFI_EXPORT zircon_dart_handle_pair_t* zircon_dart_channel_create(
     uint32_t options);
 
-ZIRCON_FFI_EXPORT int32_t
-zircon_dart_channel_write(zircon_dart_handle_t* handle,
-                          zircon_dart_byte_array_t* bytes,
-                          zircon_dart_handle_list_t* handles);
+ZIRCON_FFI_EXPORT int32_t zircon_dart_channel_write(
+    zircon_dart_handle_t* handle,
+    zircon_dart_byte_array_t* bytes,
+    zircon_dart_handle_list_t* handles);
 
 #ifdef __cplusplus
 }
diff --git a/shell/platform/fuchsia/dart-pkg/zircon_ffi/clock.h b/shell/platform/fuchsia/dart-pkg/zircon_ffi/clock.h
index a4553deac886630cc377ebb1fd7d1219880dd019..f7df958f030845793d22990b614e7e6b094cb0cb 100644
--- a/shell/platform/fuchsia/dart-pkg/zircon_ffi/clock.h
+++ b/shell/platform/fuchsia/dart-pkg/zircon_ffi/clock.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_PKG_ZIRCON_SDK_FFI_CLOCK_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_PKG_ZIRCON_SDK_FFI_CLOCK_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_PKG_ZIRCON_FFI_CLOCK_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_PKG_ZIRCON_FFI_CLOCK_H_
 
 #include "macros.h"
 
@@ -19,4 +19,4 @@ ZIRCON_FFI_EXPORT uint64_t zircon_dart_clock_get_monotonic();
 }
 #endif
 
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_PKG_ZIRCON_SDK_FFI_CLOCK_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_PKG_ZIRCON_FFI_CLOCK_H_
diff --git a/shell/platform/fuchsia/dart-pkg/zircon_ffi/handle.h b/shell/platform/fuchsia/dart-pkg/zircon_ffi/handle.h
index c9248a15e8fb8ddfb2c5b06b2029a9c36cec0098..ba0435f2864b7888f2d8a98a3f8219b0fd7fe78e 100644
--- a/shell/platform/fuchsia/dart-pkg/zircon_ffi/handle.h
+++ b/shell/platform/fuchsia/dart-pkg/zircon_ffi/handle.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_PLATFORM_FUCHSIA_DART_PKG_ZIRCON_FFI_HANDLE_H_
-#define SHELL_PLATFORM_FUCHSIA_DART_PKG_ZIRCON_FFI_HANDLE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_PKG_ZIRCON_FFI_HANDLE_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_PKG_ZIRCON_FFI_HANDLE_H_
 
 #include "macros.h"
 
@@ -43,13 +43,13 @@ ZIRCON_FFI_EXPORT void zircon_dart_handle_list_free(
     zircon_dart_handle_list_t* list);
 
 // Returns 1 if the handle is valid.
-ZIRCON_FFI_EXPORT int32_t
-zircon_dart_handle_is_valid(zircon_dart_handle_t* handle);
+ZIRCON_FFI_EXPORT int32_t zircon_dart_handle_is_valid(
+    zircon_dart_handle_t* handle);
 
 // Closes the handle, but doesn't release any ffi-associated memory. Returns 1
 // on success.
-ZIRCON_FFI_EXPORT int32_t
-zircon_dart_handle_close(zircon_dart_handle_t* handle);
+ZIRCON_FFI_EXPORT int32_t zircon_dart_handle_close(
+    zircon_dart_handle_t* handle);
 
 // Closes the zircon handle if valid and frees the memory.
 ZIRCON_FFI_EXPORT void zircon_dart_handle_free(zircon_dart_handle_t* handle);
@@ -80,4 +80,4 @@ ZIRCON_FFI_EXPORT int zircon_dart_handle_attach_finalizer(
 }
 #endif
 
-#endif  // SHELL_PLATFORM_FUCHSIA_DART_PKG_ZIRCON_FFI_HANDLE_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_PKG_ZIRCON_FFI_HANDLE_H_
diff --git a/shell/platform/fuchsia/dart-pkg/zircon_ffi/lib/zircon_ffi.dart b/shell/platform/fuchsia/dart-pkg/zircon_ffi/lib/zircon_ffi.dart
index eea6ba2a8e514030edf8a9cdb13c36fb23caf625..ad265ff8d0220dac4276c5ed00b9cc6f1f3fd8d6 100644
--- a/shell/platform/fuchsia/dart-pkg/zircon_ffi/lib/zircon_ffi.dart
+++ b/shell/platform/fuchsia/dart-pkg/zircon_ffi/lib/zircon_ffi.dart
@@ -256,32 +256,32 @@ class ZirconFFIBindings {
           .asFunction<_dart_zircon_dart_dl_initialize>();
 }
 
-class zircon_dart_byte_array_t extends ffi.Struct {
+final class zircon_dart_byte_array_t extends ffi.Struct {
   external ffi.Pointer<ffi.Uint8> data;
 
   @ffi.Uint32()
   external int length;
 }
 
-class zircon_dart_handle_t extends ffi.Struct {
+final class zircon_dart_handle_t extends ffi.Struct {
   @ffi.Uint32()
   external int handle;
 }
 
-class zircon_dart_handle_pair_t extends ffi.Struct {
+final class zircon_dart_handle_pair_t extends ffi.Struct {
   external ffi.Pointer<zircon_dart_handle_t> left;
 
   external ffi.Pointer<zircon_dart_handle_t> right;
 }
 
-class zircon_dart_handle_list_t extends ffi.Struct {
+final class zircon_dart_handle_list_t extends ffi.Struct {
   external ffi.Pointer<ffi.Void> data;
 
   @ffi.Uint32()
   external int size;
 }
 
-class _Dart_Handle extends ffi.Opaque {}
+final class _Dart_Handle extends ffi.Opaque {}
 
 typedef _c_zircon_dart_byte_array_create = ffi.Pointer<zircon_dart_byte_array_t>
     Function(
diff --git a/shell/platform/fuchsia/dart-pkg/zircon_ffi/pubspec.yaml b/shell/platform/fuchsia/dart-pkg/zircon_ffi/pubspec.yaml
index 51113aa82fdd2dca3cffcf385361fc0d619d73f0..e30ca0196f5a747efcbbabcb8b85bc31e8d710a1 100644
--- a/shell/platform/fuchsia/dart-pkg/zircon_ffi/pubspec.yaml
+++ b/shell/platform/fuchsia/dart-pkg/zircon_ffi/pubspec.yaml
@@ -1,7 +1,7 @@
 name: zircon_ffi
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=3.2.0-0 <4.0.0'
 
 dependencies:
   ffi: ^1.0.0
diff --git a/shell/platform/fuchsia/dart/BUILD.gn b/shell/platform/fuchsia/dart/BUILD.gn
index a1315a738c19a7df9a500504e455125de492db1a..566232209e5f845ebff8144721a712449478c041 100644
--- a/shell/platform/fuchsia/dart/BUILD.gn
+++ b/shell/platform/fuchsia/dart/BUILD.gn
@@ -10,29 +10,26 @@ application_snapshot("kernel_compiler") {
 
   deps = [ "../flutter/kernel:kernel_platform_files($host_toolchain)" ]
 
-  package_config =
-      rebase_path("//third_party/dart/.dart_tool/package_config.json")
+  package_config = rebase_path("$dart_src/.dart_tool/package_config.json")
 
   training_args = [
     "--train",
     rebase_path(main_dart),
   ]
 
-  kernel_compiler_files =
-      exec_script("//third_party/dart/tools/list_dart_files.py",
-                  [
-                    "absolute",
-                    rebase_path("."),
-                  ],
-                  "list lines")
-
-  kernel_compiler_files +=
-      exec_script("//third_party/dart/tools/list_dart_files.py",
-                  [
-                    "absolute",
-                    rebase_path("//third_party/dart/pkg"),
-                  ],
-                  "list lines")
+  kernel_compiler_files = exec_script("$dart_src/tools/list_dart_files.py",
+                                      [
+                                        "absolute",
+                                        rebase_path("."),
+                                      ],
+                                      "list lines")
+
+  kernel_compiler_files += exec_script("$dart_src/tools/list_dart_files.py",
+                                       [
+                                         "absolute",
+                                         rebase_path("$dart_src/pkg"),
+                                       ],
+                                       "list lines")
 
   inputs = kernel_compiler_files
 }
@@ -40,18 +37,16 @@ application_snapshot("kernel_compiler") {
 application_snapshot("_list_libraries_kernel") {
   visibility = [ ":*" ]
   snapshot_kind = "kernel"
-  main_dart = "//third_party/dart/pkg/vm/bin/list_libraries.dart"
-  package_config =
-      rebase_path("//third_party/dart/.dart_tool/package_config.json")
+  main_dart = "$dart_src/pkg/vm/bin/list_libraries.dart"
+  package_config = rebase_path("$dart_src/.dart_tool/package_config.json")
   training_args = []
   output = "$target_gen_dir/list_libraries.dart.dill"
 }
 
 application_snapshot("list_libraries") {
   deps = [ ":_list_libraries_kernel" ]
-  main_dart = "//third_party/dart/pkg/vm/bin/list_libraries.dart"
-  package_config =
-      rebase_path("//third_party/dart/.dart_tool/package_config.json")
+  main_dart = "$dart_src/pkg/vm/bin/list_libraries.dart"
+  package_config = rebase_path("$dart_src/.dart_tool/package_config.json")
   training_args = [
     # train against the dill file which is generated for this snapshot.
     rebase_path("$target_gen_dir/list_libraries.dart.dill"),
@@ -59,10 +54,10 @@ application_snapshot("list_libraries") {
 }
 
 dart_library("async_helper") {
-  package_root = "//third_party/dart/pkg/async_helper"
+  package_root = "$dart_src/pkg/async_helper"
   package_name = "async_helper"
 
-  language_version = "2.12"
+  pubspec = "$package_root/pubspec.yaml"
 
   deps = []
 
@@ -73,10 +68,10 @@ dart_library("async_helper") {
 }
 
 dart_library("meta") {
-  package_root = "//third_party/dart/pkg/meta"
+  package_root = "$dart_src/pkg/meta"
   package_name = "meta"
 
-  language_version = "2.12"
+  pubspec = "$package_root/pubspec.yaml"
 
   deps = []
 
@@ -88,16 +83,18 @@ dart_library("meta") {
 }
 
 dart_library("expect") {
-  package_root = "//third_party/dart/pkg/expect"
+  package_root = "$dart_src/pkg/expect"
   package_name = "expect"
 
-  language_version = "2.12"
+  pubspec = "$package_root/pubspec.yaml"
 
   deps = [ ":meta" ]
 
   sources = [
+    "config.dart",
     "expect.dart",
     "minitest.dart",
+    "variations.dart",
   ]
 }
 
@@ -105,7 +102,7 @@ dart_library("litetest") {
   package_root = "//flutter/testing/litetest"
   package_name = "litetest"
 
-  language_version = "2.12"
+  pubspec = "$package_root/pubspec.yaml"
 
   source_dir = "lib"
 
@@ -124,10 +121,10 @@ dart_library("litetest") {
 }
 
 dart_library("args") {
-  package_root = "//third_party/dart/third_party/pkg/args"
+  package_root = "$dart_src/third_party/pkg/args"
   package_name = "args"
 
-  language_version = "2.18"
+  pubspec = "$package_root/pubspec.yaml"
 
   deps = []
 
@@ -148,10 +145,10 @@ dart_library("args") {
 }
 
 dart_library("collection") {
-  package_root = "//third_party/dart/third_party/pkg/collection"
+  package_root = "$dart_src/third_party/pkg/collection"
   package_name = "collection"
 
-  language_version = "2.12"
+  pubspec = "$package_root/pubspec.yaml"
 
   deps = []
 
@@ -188,10 +185,10 @@ dart_library("collection") {
 }
 
 dart_library("logging") {
-  package_root = "//third_party/dart/third_party/pkg/logging"
+  package_root = "$dart_src/third_party/pkg/logging"
   package_name = "logging"
 
-  language_version = "2.12"
+  pubspec = "$package_root/pubspec.yaml"
 
   deps = []
 
@@ -204,10 +201,10 @@ dart_library("logging") {
 }
 
 dart_library("path") {
-  package_root = "//third_party/dart/third_party/pkg/path"
+  package_root = "$dart_src/third_party/pkg/path"
   package_name = "path"
 
-  language_version = "2.12"
+  pubspec = "$package_root/pubspec.yaml"
 
   deps = []
 
@@ -229,10 +226,10 @@ dart_library("path") {
 }
 
 dart_library("stack_trace") {
-  package_root = "//third_party/dart/third_party/pkg/stack_trace"
+  package_root = "$dart_src/third_party/pkg/stack_trace"
   package_name = "stack_trace"
 
-  language_version = "2.12"
+  pubspec = "$package_root/pubspec.yaml"
 
   deps = [ ":path" ]
 
@@ -251,14 +248,15 @@ dart_library("stack_trace") {
 }
 
 dart_library("matcher") {
-  package_root = "//third_party/dart/third_party/pkg/matcher"
+  package_root = "$dart_src/third_party/pkg/matcher"
   package_name = "matcher"
 
-  language_version = "2.12"
+  pubspec = "$package_root/pubspec.yaml"
 
   deps = [ ":stack_trace" ]
 
   sources = [
+    "expect.dart",
     "matcher.dart",
     "mirror_matchers.dart",
     "src/core_matchers.dart",
@@ -266,6 +264,18 @@ dart_library("matcher") {
     "src/description.dart",
     "src/equals_matcher.dart",
     "src/error_matchers.dart",
+    "src/expect/async_matcher.dart",
+    "src/expect/expect.dart",
+    "src/expect/expect_async.dart",
+    "src/expect/future_matchers.dart",
+    "src/expect/never_called.dart",
+    "src/expect/prints_matcher.dart",
+    "src/expect/stream_matcher.dart",
+    "src/expect/stream_matchers.dart",
+    "src/expect/throws_matcher.dart",
+    "src/expect/throws_matchers.dart",
+    "src/expect/util/placeholder.dart",
+    "src/expect/util/pretty_print.dart",
     "src/feature_matcher.dart",
     "src/having_matcher.dart",
     "src/interfaces.dart",
@@ -285,8 +295,7 @@ dart_library("quiver") {
   package_root = "//third_party/pkg/quiver"
   package_name = "quiver"
 
-  # The current version of this library is not null safe
-  language_version = "2.0"
+  pubspec = "$package_root/pubspec.yaml"
 
   deps = [
     ":matcher",
@@ -299,16 +308,13 @@ dart_library("quiver") {
     "check.dart",
     "collection.dart",
     "core.dart",
-    "io.dart",
     "iterables.dart",
-    "mirrors.dart",
     "pattern.dart",
     "src/async/collect.dart",
     "src/async/concat.dart",
     "src/async/countdown_timer.dart",
     "src/async/enumerate.dart",
     "src/async/future_stream.dart",
-    "src/async/iteration.dart",
     "src/async/metronome.dart",
     "src/async/stream_buffer.dart",
     "src/async/stream_router.dart",
@@ -324,8 +330,10 @@ dart_library("quiver") {
     "src/collection/lru_map.dart",
     "src/collection/multimap.dart",
     "src/collection/treeset.dart",
+    "src/collection/utils.dart",
     "src/core/hash.dart",
     "src/core/optional.dart",
+    "src/core/utils.dart",
     "src/iterables/concat.dart",
     "src/iterables/count.dart",
     "src/iterables/cycle.dart",
@@ -343,10 +351,8 @@ dart_library("quiver") {
     "strings.dart",
     "testing/async.dart",
     "testing/equality.dart",
-    "testing/runtime.dart",
     "testing/src/async/fake_async.dart",
     "testing/src/equality/equality.dart",
-    "testing/src/runtime/checked_mode.dart",
     "testing/src/time/time.dart",
     "testing/time.dart",
     "time.dart",
@@ -354,10 +360,10 @@ dart_library("quiver") {
 }
 
 dart_library("vector_math") {
-  package_root = "//third_party/pkg/vector_math"
+  package_root = "//flutter/third_party/pkg/vector_math"
   package_name = "vector_math"
 
-  language_version = "2.12"
+  pubspec = "$package_root/pubspec.yaml"
 
   deps = []
 
diff --git a/shell/platform/fuchsia/dart_runner/BUILD.gn b/shell/platform/fuchsia/dart_runner/BUILD.gn
index 87520ce524e0c09265c3ae9ffd592d064fadafcd..4dac8a9d8b0d523869240083ac57ac2529b36070 100644
--- a/shell/platform/fuchsia/dart_runner/BUILD.gn
+++ b/shell/platform/fuchsia/dart_runner/BUILD.gn
@@ -4,12 +4,12 @@
 
 assert(is_fuchsia)
 
-import("//build/fuchsia/sdk.gni")
 import("//flutter/common/fuchsia_config.gni")
 import("//flutter/testing/testing.gni")
 import("//flutter/tools/fuchsia/dart.gni")
 import("//flutter/tools/fuchsia/fuchsia_archive.gni")
 import("//flutter/tools/fuchsia/fuchsia_libs.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
 
 template("runner_sources") {
   assert(defined(invoker.product), "runner_sources must define product")
@@ -32,39 +32,40 @@ template("runner_sources") {
     dart_public_deps = []
     if (!invoker.product) {
       dart_public_deps += [
+        "$dart_src/runtime/bin:dart_io_api",
         "//flutter/shell/platform/fuchsia/runtime/dart/utils:utils",
-        "//third_party/dart/runtime/bin:dart_io_api",
       ]
     } else {
       dart_public_deps += [
+        "$dart_src/runtime/bin:dart_io_api_product",
         "//flutter/shell/platform/fuchsia/runtime/dart/utils:utils_product",
-        "//third_party/dart/runtime/bin:dart_io_api_product",
       ]
     }
 
     public_deps = [
-                    "$fuchsia_sdk_root/pkg:sys_cpp",
+                    "${fuchsia_sdk}/fidl/fuchsia.component.runner",
+                    "${fuchsia_sdk}/fidl/fuchsia.test",
+                    "${fuchsia_sdk}/pkg/sys_cpp",
                     "//flutter/fml",
                   ] + dart_public_deps
 
     deps = [
-      "$fuchsia_sdk_root/fidl:fuchsia.component.runner",
-      "$fuchsia_sdk_root/fidl:fuchsia.logger",
-      "$fuchsia_sdk_root/fidl:fuchsia.test",
-      "$fuchsia_sdk_root/pkg:async",
-      "$fuchsia_sdk_root/pkg:async-cpp",
-      "$fuchsia_sdk_root/pkg:async-default",
-      "$fuchsia_sdk_root/pkg:async-loop",
-      "$fuchsia_sdk_root/pkg:async-loop-cpp",
-      "$fuchsia_sdk_root/pkg:async-loop-default",
-      "$fuchsia_sdk_root/pkg:fidl_cpp",
-      "$fuchsia_sdk_root/pkg:sys_cpp",
-      "$fuchsia_sdk_root/pkg:sys_cpp_testing",
-      "$fuchsia_sdk_root/pkg:sys_inspect_cpp",
-      "$fuchsia_sdk_root/pkg:syslog",
-      "$fuchsia_sdk_root/pkg:trace",
-      "$fuchsia_sdk_root/pkg:vfs_cpp",
-      "$fuchsia_sdk_root/pkg:zx",
+      "${fuchsia_sdk}/fidl/fuchsia.logger",
+      "${fuchsia_sdk}/pkg/async",
+      "${fuchsia_sdk}/pkg/async-cpp",
+      "${fuchsia_sdk}/pkg/async-default",
+      "${fuchsia_sdk}/pkg/async-loop",
+      "${fuchsia_sdk}/pkg/async-loop-cpp",
+      "${fuchsia_sdk}/pkg/async-loop-default",
+      "${fuchsia_sdk}/pkg/fidl_cpp",
+      "${fuchsia_sdk}/pkg/inspect",
+      "${fuchsia_sdk}/pkg/inspect_component_cpp",
+      "${fuchsia_sdk}/pkg/sys_cpp",
+      "${fuchsia_sdk}/pkg/sys_cpp_testing",
+      "${fuchsia_sdk}/pkg/trace",
+      "${fuchsia_sdk}/pkg/vfs_cpp",
+      "${fuchsia_sdk}/pkg/zx",
+      "fidl:dart_test",
       "//flutter/common",
       "//flutter/shell/platform/fuchsia/dart-pkg/fuchsia",
       "//flutter/shell/platform/fuchsia/dart-pkg/zircon",
@@ -99,8 +100,8 @@ template("runner") {
 
     deps = [
              ":" + target_name + "_runner_sources",
-             "$fuchsia_sdk_root/pkg:sys_inspect_cpp",
-             "$fuchsia_sdk_root/pkg:trace-provider-so",
+             "${fuchsia_sdk}/pkg/inspect_component_cpp",
+             "${fuchsia_sdk}/pkg/trace-provider-so",
            ] + extra_deps
   }
 }
@@ -113,8 +114,8 @@ runner("dart_jit_runner_bin") {
     extra_defines += [ "FLUTTER_PROFILE" ]
   }
   extra_deps = [
-    "//third_party/dart/runtime:libdart_jit",
-    "//third_party/dart/runtime/platform:libdart_platform_jit",
+    "$dart_src/runtime:libdart_jit",
+    "$dart_src/runtime/platform:libdart_platform_jit",
   ]
 }
 
@@ -123,8 +124,8 @@ runner("dart_jit_product_runner_bin") {
   product = true
   extra_defines = [ "DART_PRODUCT" ]
   extra_deps = [
-    "//third_party/dart/runtime:libdart_jit",
-    "//third_party/dart/runtime/platform:libdart_platform_jit",
+    "$dart_src/runtime:libdart_jit",
+    "$dart_src/runtime/platform:libdart_platform_jit",
   ]
 }
 
@@ -136,9 +137,9 @@ runner("dart_aot_runner_bin") {
     extra_defines += [ "FLUTTER_PROFILE" ]
   }
   extra_deps = [
+    "$dart_src/runtime:libdart_precompiled_runtime",
+    "$dart_src/runtime/platform:libdart_platform_precompiled_runtime",
     "embedder:dart_aot_snapshot_cc",
-    "//third_party/dart/runtime:libdart_precompiled_runtime",
-    "//third_party/dart/runtime/platform:libdart_platform_precompiled_runtime",
   ]
 }
 
@@ -150,9 +151,9 @@ runner("dart_aot_product_runner_bin") {
     "DART_PRODUCT",
   ]
   extra_deps = [
+    "$dart_src/runtime:libdart_precompiled_runtime",
+    "$dart_src/runtime/platform:libdart_platform_precompiled_runtime",
     "embedder:dart_aot_product_snapshot_cc",
-    "//third_party/dart/runtime:libdart_precompiled_runtime",
-    "//third_party/dart/runtime/platform:libdart_platform_precompiled_runtime",
   ]
 }
 
@@ -170,7 +171,7 @@ template("aot_runner_package") {
         "//flutter/shell/platform/fuchsia/runtime/dart/profiler_symbols:dart_aot_runner",
 
         # TODO(kaushikiska): Figure out how to get the profiler symbols for `libdart_precompiled_runtime`
-        # "//third_party/dart/runtime:libdart_precompiled_runtime",
+        # "$dart_src/runtime:libdart_precompiled_runtime",
         observatory_target,
       ]
     }
@@ -247,21 +248,11 @@ template("jit_runner_package") {
             rebase_path("$target_gen_dir/kernel/vm_data${product_suffix}.bin")
         dest = "vm_snapshot_data.bin"
       },
-      {
-        path = rebase_path(
-                "$target_gen_dir/kernel/vm_instructions${product_suffix}.bin")
-        dest = "vm_snapshot_instructions.bin"
-      },
       {
         path = rebase_path(
                 "$target_gen_dir/kernel/isolate_data${product_suffix}.bin")
         dest = "isolate_core_snapshot_data.bin"
       },
-      {
-        path = rebase_path(
-                "$target_gen_dir/kernel/isolate_instructions${product_suffix}.bin")
-        dest = "isolate_core_snapshot_instructions.bin"
-      },
     ]
 
     if (!invoker.product) {
@@ -324,15 +315,16 @@ if (enable_unittests) {
 
     sources = [ "tests/suite_impl_unittests.cc" ]
 
-    # This is needed for //third_party/googletest for linking zircon symbols.
-    libs = [ "$fuchsia_sdk_path/arch/$target_cpu/sysroot/lib/libzircon.so" ]
+    # This is needed for //flutter/third_party/googletest for linking zircon
+    # symbols.
+    libs = [ "${fuchsia_arch_root}/sysroot/lib/libzircon.so" ]
 
     deps = [
       ":jit_runner_sources_for_test",
+      "$dart_src/runtime:libdart_jit",
+      "$dart_src/runtime/platform:libdart_platform_jit",
       "//flutter/fml",
-      "//third_party/dart/runtime:libdart_jit",
-      "//third_party/dart/runtime/platform:libdart_platform_jit",
-      "//third_party/googletest:gtest_main",
+      "//flutter/third_party/googletest:gtest_main",
     ]
   }
 
diff --git a/shell/platform/fuchsia/dart_runner/builtin_libraries.cc b/shell/platform/fuchsia/dart_runner/builtin_libraries.cc
index 9fd6a9b203401a5f31a7b272dc1ddc42e100567f..9207d4c2a337725e801556d0b757ad48d8d89d1c 100644
--- a/shell/platform/fuchsia/dart_runner/builtin_libraries.cc
+++ b/shell/platform/fuchsia/dart_runner/builtin_libraries.cc
@@ -96,19 +96,16 @@ void ScheduleMicrotask(Dart_NativeArguments args) {
 
 }  // namespace
 
-void InitBuiltinLibrariesForIsolate(
-    const std::string& script_uri,
-    fdio_ns_t* namespc,
-    int stdoutfd,
-    int stderrfd,
-    fidl::InterfaceHandle<fuchsia::sys::Environment> environment,
-    zx::channel directory_request,
-    bool service_isolate) {
+void InitBuiltinLibrariesForIsolate(const std::string& script_uri,
+                                    fdio_ns_t* namespc,
+                                    int stdoutfd,
+                                    int stderrfd,
+                                    zx::channel directory_request,
+                                    bool service_isolate) {
   // dart:fuchsia --------------------------------------------------------------
   // dart runner doesn't care about scenic view ref.
   if (!service_isolate) {
-    fuchsia::dart::Initialize(std::move(environment),
-                              std::move(directory_request), std::nullopt);
+    fuchsia::dart::Initialize(std::move(directory_request), std::nullopt);
   }
 
   // dart:fuchsia.builtin ------------------------------------------------------
diff --git a/shell/platform/fuchsia/dart_runner/builtin_libraries.h b/shell/platform/fuchsia/dart_runner/builtin_libraries.h
index a23403c1a4b807015fea7623f09a44a9fadf6529..b44dc0166c578b7703cbd13a8c786ec442a3fd1b 100644
--- a/shell/platform/fuchsia/dart_runner/builtin_libraries.h
+++ b/shell/platform/fuchsia/dart_runner/builtin_libraries.h
@@ -5,22 +5,20 @@
 #ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_BUILTIN_LIBRARIES_H_
 #define FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_BUILTIN_LIBRARIES_H_
 
-#include <fuchsia/sys/cpp/fidl.h>
 #include <lib/fdio/namespace.h>
+#include <lib/zx/channel.h>
 
 #include <memory>
 #include <string>
 
 namespace dart_runner {
 
-void InitBuiltinLibrariesForIsolate(
-    const std::string& script_uri,
-    fdio_ns_t* namespc,
-    int stdoutfd,
-    int stderrfd,
-    fidl::InterfaceHandle<fuchsia::sys::Environment> environment,
-    zx::channel directory_request,
-    bool service_isolate);
+void InitBuiltinLibrariesForIsolate(const std::string& script_uri,
+                                    fdio_ns_t* namespc,
+                                    int stdoutfd,
+                                    int stderrfd,
+                                    zx::channel directory_request,
+                                    bool service_isolate);
 
 }  // namespace dart_runner
 
diff --git a/shell/platform/fuchsia/dart_runner/dart_component_controller.cc b/shell/platform/fuchsia/dart_runner/dart_component_controller.cc
index c0803410c7b29b53ac235d02961579bf9b161abb..666a29cba63a8d247d4ce678c37af9751db4c051 100644
--- a/shell/platform/fuchsia/dart_runner/dart_component_controller.cc
+++ b/shell/platform/fuchsia/dart_runner/dart_component_controller.cc
@@ -5,7 +5,6 @@
 #include "dart_component_controller.h"
 
 #include <fcntl.h>
-#include <fml/logging.h>
 #include <lib/async-loop/loop.h>
 #include <lib/async/cpp/task.h>
 #include <lib/async/default.h>
@@ -14,7 +13,8 @@
 #include <lib/fdio/namespace.h>
 #include <lib/fidl/cpp/string.h>
 #include <lib/sys/cpp/service_directory.h>
-#include <lib/syslog/global.h>
+#include <lib/vfs/cpp/composed_service_dir.h>
+#include <lib/vfs/cpp/remote_dir.h>
 #include <lib/zx/clock.h>
 #include <lib/zx/thread.h>
 #include <sys/stat.h>
@@ -25,9 +25,10 @@
 #include <regex>
 #include <utility>
 
+#include "dart_api.h"
+#include "flutter/fml/logging.h"
 #include "runtime/dart/utils/files.h"
 #include "runtime/dart/utils/handle_exception.h"
-#include "runtime/dart/utils/inlines.h"
 #include "runtime/dart/utils/tempfs.h"
 #include "third_party/dart/runtime/include/dart_tools_api.h"
 #include "third_party/tonic/converter/dart_converter.h"
@@ -38,7 +39,6 @@
 #include "third_party/tonic/logging/dart_invoke.h"
 
 #include "builtin_libraries.h"
-#include "logging.h"
 
 using tonic::ToDart;
 
@@ -104,10 +104,13 @@ DartComponentController::DartComponentController(
         controller)
     : loop_(new async::Loop(&kLoopConfig)),
       label_(GetLabelFromUrl(start_info.resolved_url())),
-      url_(std::move(start_info.resolved_url())),
-      runner_incoming_services_(runner_incoming_services),
+      url_(start_info.resolved_url()),
+      runner_incoming_services_(std::move(runner_incoming_services)),
+      dart_outgoing_dir_(new vfs::PseudoDir()),
       start_info_(std::move(start_info)),
-      binding_(this) {
+      binding_(this, std::move(controller)) {
+  binding_.set_error_handler([this](zx_status_t status) { Kill(); });
+
   // TODO(fxb/84537): This data path is configured based how we build Flutter
   // applications in tree currently, but the way we build the Flutter
   // application may change. We should avoid assuming the data path and let the
@@ -115,19 +118,11 @@ DartComponentController::DartComponentController(
   const std::string component_name = GetComponentNameFromUrl(url_);
   data_path_ = "pkg/data/" + component_name;
 
-  if (controller.is_valid()) {
-    binding_.Bind(std::move(controller));
-    binding_.set_error_handler([this](zx_status_t status) { Kill(); });
-  } else {
-    FX_LOG(ERROR, LOG_TAG,
-           "Fuchsia component controller endpoint is not valid.");
-  }
-
   zx_status_t idle_timer_status =
       zx::timer::create(ZX_TIMER_SLACK_LATE, ZX_CLOCK_MONOTONIC, &idle_timer_);
   if (idle_timer_status != ZX_OK) {
-    FX_LOGF(INFO, LOG_TAG, "Idle timer creation failed: %s",
-            zx_status_get_string(idle_timer_status));
+    FML_LOG(INFO) << "Idle timer creation failed: "
+                  << zx_status_get_string(idle_timer_status);
   } else {
     idle_wait_.set_object(idle_timer_.get());
     idle_wait_.set_trigger(ZX_TIMER_SIGNALED);
@@ -158,12 +153,11 @@ bool DartComponentController::SetUp() {
   }
 
   if (SetUpFromAppSnapshot()) {
-    FX_LOGF(INFO, LOG_TAG, "%s is running from an app snapshot", url_.c_str());
+    FML_LOG(INFO) << url_ << " is running from an app snapshot";
   } else if (SetUpFromKernel()) {
-    FX_LOGF(INFO, LOG_TAG, "%s is running from kernel", url_.c_str());
+    FML_LOG(INFO) << url_ << " is running from kernel";
   } else {
-    FX_LOGF(ERROR, LOG_TAG, "Failed to set up component controller for %s.",
-            url_.c_str());
+    FML_LOG(ERROR) << "Failed to set up component controller for " << url_;
     return false;
   }
 
@@ -172,17 +166,17 @@ bool DartComponentController::SetUp() {
 
 bool DartComponentController::CreateAndBindNamespace() {
   if (!start_info_.has_ns()) {
-    FX_LOG(ERROR, LOG_TAG, "Component start info does not have a namespace.");
+    FML_LOG(ERROR) << "Component start info does not have a namespace.";
     return false;
   }
 
   const zx_status_t ns_create_status = fdio_ns_create(&namespace_);
   if (ns_create_status != ZX_OK) {
-    FX_LOGF(ERROR, LOG_TAG, "Failed to create namespace: %s",
-            zx_status_get_string(ns_create_status));
+    FML_LOG(ERROR) << "Failed to create namespace: "
+                   << zx_status_get_string(ns_create_status);
   }
 
-  dart_utils::RunnerTemp::SetupComponent(namespace_);
+  dart_utils::BindTemp(namespace_);
 
   // Bind each directory in start_info's namespace to the controller's namespace
   // instance.
@@ -194,7 +188,7 @@ bool DartComponentController::CreateAndBindNamespace() {
     }
 
     if (ns_entry.path() == kTmpPath) {
-      // /tmp is covered by the local memfs.
+      // /tmp is covered by a locally served virtual filesystem.
       continue;
     }
 
@@ -207,12 +201,95 @@ bool DartComponentController::CreateAndBindNamespace() {
     const zx_status_t ns_bind_status =
         fdio_ns_bind(namespace_, path.c_str(), dir.TakeChannel().release());
     if (ns_bind_status != ZX_OK) {
-      FX_LOGF(ERROR, LOG_TAG, "Failed to bind %s to namespace: %s",
-              path.c_str(), zx_status_get_string(ns_bind_status));
+      FML_LOG(ERROR) << "Failed to bind " << path << " to namespace: "
+                     << zx_status_get_string(ns_bind_status);
       return false;
     }
   }
 
+  dart_outgoing_dir_request_ = dart_outgoing_dir_ptr_.NewRequest();
+
+  fuchsia::io::DirectoryHandle dart_public_dir;
+  // TODO(anmittal): when fixing enumeration using new c++ vfs, make sure that
+  // flutter_public_dir is only accessed once we receive OnOpen Event.
+  // That will prevent FL-175 for public directory
+  fdio_service_connect_at(dart_outgoing_dir_ptr_.channel().get(), "svc",
+                          dart_public_dir.NewRequest().TakeChannel().release());
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+
+  auto composed_service_dir = std::make_unique<vfs::ComposedServiceDir>();
+  composed_service_dir->set_fallback(std::move(dart_public_dir));
+
+#pragma clang diagnostic pop
+
+  // Clone and check if client is servicing the directory.
+  dart_outgoing_dir_ptr_->Clone(
+      fuchsia::io::OpenFlags::DESCRIBE |
+          fuchsia::io::OpenFlags::CLONE_SAME_RIGHTS,
+      dart_outgoing_dir_ptr_to_check_on_open_.NewRequest());
+
+  // Collect our standard set of directories.
+  std::vector<std::string> other_dirs = {"debug", "ctrl"};
+
+  dart_outgoing_dir_ptr_to_check_on_open_.events().OnOpen =
+      [this, other_dirs](zx_status_t status, auto unused) {
+        dart_outgoing_dir_ptr_to_check_on_open_.Unbind();
+        if (status != ZX_OK) {
+          FML_LOG(ERROR) << "could not bind out directory for dart component("
+                         << label_ << "): " << zx_status_get_string(status);
+          return;
+        }
+
+        // add other directories as RemoteDirs.
+        for (auto& dir_str : other_dirs) {
+          fuchsia::io::DirectoryHandle dir;
+          auto request = dir.NewRequest().TakeChannel();
+          auto status = fdio_open_at(
+              dart_outgoing_dir_ptr_.channel().get(), dir_str.c_str(),
+              static_cast<uint32_t>(fuchsia::io::OpenFlags::DIRECTORY |
+                                    fuchsia::io::OpenFlags::RIGHT_READABLE),
+              request.release());
+          if (status == ZX_OK) {
+            dart_outgoing_dir_->AddEntry(
+                dir_str.c_str(),
+                std::make_unique<vfs::RemoteDir>(dir.TakeChannel()));
+          } else {
+            FML_LOG(ERROR) << "could not add out directory entry(" << dir_str
+                           << ") for flutter component(" << label_
+                           << "): " << zx_status_get_string(status);
+          }
+        }
+      };
+  dart_outgoing_dir_ptr_to_check_on_open_.set_error_handler(
+      [this](zx_status_t status) {
+        dart_outgoing_dir_ptr_to_check_on_open_.Unbind();
+      });
+
+  // Expose the "Echo" service here on behalf of the running dart program, so
+  // that integration tests can make use of it.
+  //
+  // The flutter/engine repository doesn't support connecting to FIDL from Dart,
+  // so for the tests sake we connect to the FIDL from C++ here and proxy the
+  // Echo to dart using native hooks.
+  composed_service_dir->AddService(
+      dart::test::Echo::Name_,
+      std::make_unique<vfs::Service>([this](zx::channel channel,
+                                            async_dispatcher_t* dispatcher) {
+        echo_binding_.AddBinding(
+            this, fidl::InterfaceRequest<dart::test::Echo>(std::move(channel)));
+      }));
+  dart_outgoing_dir_->AddEntry("svc", std::move(composed_service_dir));
+
+  if (start_info_.has_outgoing_dir()) {
+    dart_outgoing_dir_->Serve(
+        fuchsia::io::OpenFlags::RIGHT_READABLE |
+            fuchsia::io::OpenFlags::RIGHT_WRITABLE |
+            fuchsia::io::OpenFlags::DIRECTORY,
+        start_info_.mutable_outgoing_dir()->TakeChannel());
+  }
+
   return true;
 }
 
@@ -228,26 +305,15 @@ bool DartComponentController::SetUpFromKernel() {
           isolate_snapshot_data_)) {
     return false;
   }
-  if (!dart_utils::MappedResource::LoadFromNamespace(
-          nullptr, "/pkg/data/isolate_core_snapshot_instructions.bin",
-          isolate_snapshot_instructions_, true /* executable */)) {
-    return false;
-  }
-
-  if (!CreateIsolate(isolate_snapshot_data_.address(),
-                     isolate_snapshot_instructions_.address())) {
-    return false;
-  }
-
-  Dart_EnterScope();
 
   std::string str(reinterpret_cast<const char*>(manifest.address()),
                   manifest.size());
   Dart_Handle library = Dart_Null();
+
   for (size_t start = 0; start < manifest.size();) {
     size_t end = str.find("\n", start);
     if (end == std::string::npos) {
-      FX_LOG(ERROR, LOG_TAG, "Malformed manifest");
+      FML_LOG(ERROR) << "Malformed manifest";
       Dart_ExitScope();
       return false;
     }
@@ -258,27 +324,35 @@ bool DartComponentController::SetUpFromKernel() {
     dart_utils::MappedResource kernel;
     if (!dart_utils::MappedResource::LoadFromNamespace(namespace_, path,
                                                        kernel)) {
-      FX_LOGF(ERROR, LOG_TAG, "Cannot load kernel from namespace: %s",
-              path.c_str());
+      FML_LOG(ERROR) << "Cannot load kernel from namespace: " << path;
       Dart_ExitScope();
       return false;
     }
+    kernel_peices_.emplace_back(std::move(kernel));
+  }
+
+  if (!CreateIsolate(isolate_snapshot_data_.address(),
+                     /*isolate_snapshot_instructions=*/nullptr)) {
+    return false;
+  }
+
+  Dart_EnterScope();
+
+  for (const auto& kernel : kernel_peices_) {
     library = Dart_LoadLibraryFromKernel(kernel.address(), kernel.size());
     if (Dart_IsError(library)) {
-      FX_LOGF(ERROR, LOG_TAG, "Cannot load library from kernel: %s",
-              Dart_GetError(library));
+      FML_LOG(ERROR) << "Cannot load library from kernel: "
+                     << Dart_GetError(library);
       Dart_ExitScope();
       return false;
     }
-
-    kernel_peices_.emplace_back(std::move(kernel));
   }
+
   Dart_SetRootLibrary(library);
 
   Dart_Handle result = Dart_FinalizeLoading(false);
   if (Dart_IsError(result)) {
-    FX_LOGF(ERROR, LOG_TAG, "Failed to FinalizeLoading: %s",
-            Dart_GetError(result));
+    FML_LOG(ERROR) << "Failed to FinalizeLoading: " << Dart_GetError(result);
     Dart_ExitScope();
     return false;
   }
@@ -305,11 +379,8 @@ bool DartComponentController::SetUpFromAppSnapshot() {
             isolate_snapshot_data_)) {
       return false;
     }
-    if (!dart_utils::MappedResource::LoadFromNamespace(
-            namespace_, data_path_ + "/isolate_snapshot_instructions.bin",
-            isolate_snapshot_instructions_, true /* executable */)) {
-      return false;
-    }
+    isolate_data = isolate_snapshot_data_.address();
+    isolate_instructions = nullptr;
   }
   return CreateIsolate(isolate_data, isolate_instructions);
 #endif  // defined(AOT_RUNTIME)
@@ -328,11 +399,15 @@ bool DartComponentController::CreateIsolate(
   auto state = new std::shared_ptr<tonic::DartState>(new tonic::DartState(
       namespace_fd, [this](Dart_Handle result) { MessageEpilogue(result); }));
 
+  Dart_IsolateFlags isolate_flags;
+  Dart_IsolateFlagsInitialize(&isolate_flags);
+  isolate_flags.null_safety = true;
+
   isolate_ = Dart_CreateIsolateGroup(
       url_.c_str(), label_.c_str(), isolate_snapshot_data,
-      isolate_snapshot_instructions, nullptr /* flags */, state, state, &error);
+      isolate_snapshot_instructions, &isolate_flags, state, state, &error);
   if (!isolate_) {
-    FX_LOGF(ERROR, LOG_TAG, "Dart_CreateIsolateGroup failed: %s", error);
+    FML_LOG(ERROR) << "Dart_CreateIsolateGroup failed: " << error;
     return false;
   }
 
@@ -390,11 +465,9 @@ bool DartComponentController::RunDartMain() {
   stdout_fd_ = fileno(stdout);
   stderr_fd_ = fileno(stderr);
 
-  fidl::InterfaceRequest<fuchsia::io::Directory> outgoing_dir =
-      std::move(*start_info_.mutable_outgoing_dir());
-  InitBuiltinLibrariesForIsolate(
-      url_, namespace_, stdout_fd_, stderr_fd_, nullptr /* environment */,
-      outgoing_dir.TakeChannel(), false /* service_isolate */);
+  InitBuiltinLibrariesForIsolate(url_, namespace_, stdout_fd_, stderr_fd_,
+                                 dart_outgoing_dir_request_.TakeChannel(),
+                                 false /* service_isolate */);
 
   Dart_ExitScope();
   Dart_ExitIsolate();
@@ -402,7 +475,7 @@ bool DartComponentController::RunDartMain() {
   if (error != nullptr) {
     Dart_EnterIsolate(isolate_);
     Dart_ShutdownIsolate();
-    FX_LOGF(ERROR, LOG_TAG, "Unable to make isolate runnable: %s", error);
+    FML_LOG(ERROR) << "Unable to make isolate runnable: " << error;
     free(error);
     return false;
   }
@@ -417,8 +490,8 @@ bool DartComponentController::RunDartMain() {
       Dart_NewListOfTypeFilled(string_type, Dart_EmptyString(), 0);
 
   if (Dart_IsError(dart_arguments)) {
-    FX_LOGF(ERROR, LOG_TAG, "Failed to allocate Dart arguments list: %s",
-            Dart_GetError(dart_arguments));
+    FML_LOG(ERROR) << "Failed to allocate Dart arguments list: "
+                   << Dart_GetError(dart_arguments);
     Dart_ExitScope();
     return false;
   }
@@ -426,9 +499,8 @@ bool DartComponentController::RunDartMain() {
   Dart_Handle user_main = Dart_GetField(Dart_RootLibrary(), ToDart("main"));
 
   if (Dart_IsError(user_main)) {
-    FX_LOGF(ERROR, LOG_TAG,
-            "Failed to locate user_main in the root library: %s",
-            Dart_GetError(user_main));
+    FML_LOG(ERROR) << "Failed to locate user_main in the root library: "
+                   << Dart_GetError(user_main);
     Dart_ExitScope();
     return false;
   }
@@ -436,8 +508,8 @@ bool DartComponentController::RunDartMain() {
   Dart_Handle fuchsia_lib = Dart_LookupLibrary(tonic::ToDart("dart:fuchsia"));
 
   if (Dart_IsError(fuchsia_lib)) {
-    FX_LOGF(ERROR, LOG_TAG, "Failed to locate dart:fuchsia: %s",
-            Dart_GetError(fuchsia_lib));
+    FML_LOG(ERROR) << "Failed to locate dart:fuchsia: "
+                   << Dart_GetError(fuchsia_lib);
     Dart_ExitScope();
     return false;
   }
@@ -449,7 +521,7 @@ bool DartComponentController::RunDartMain() {
     auto dart_state = tonic::DartState::Current();
     if (!dart_state->has_set_return_code()) {
       // The program hasn't set a return code meaning this exit is unexpected.
-      FX_LOG(ERROR, LOG_TAG, Dart_GetError(main_result));
+      FML_LOG(ERROR) << Dart_GetError(main_result);
       return_code_ = tonic::GetErrorExitCode(main_result);
 
       dart_utils::HandleIfException(runner_incoming_services_, url_,
@@ -463,6 +535,29 @@ bool DartComponentController::RunDartMain() {
   return true;
 }
 
+void DartComponentController::EchoString(fidl::StringPtr value,
+                                         EchoStringCallback callback) {
+  Dart_EnterScope();
+
+  Dart_Handle builtin_lib = Dart_LookupLibrary(ToDart("dart:fuchsia.builtin"));
+  FML_CHECK(!tonic::CheckAndHandleError(builtin_lib));
+
+  Dart_Handle receive_echo_string = ToDart("_receiveEchoString");
+  Dart_Handle string_to_echo =
+      value.has_value() ? tonic::ToDart(*value) : Dart_Null();
+  Dart_Handle result =
+      Dart_Invoke(builtin_lib, receive_echo_string, 1, &string_to_echo);
+  FML_CHECK(!tonic::CheckAndHandleError(result));
+
+  fidl::StringPtr echo_string;
+  if (!Dart_IsNull(result)) {
+    echo_string = tonic::StdStringFromDart(result);
+  }
+  callback(std::move(echo_string));
+
+  Dart_ExitScope();
+}
+
 void DartComponentController::Kill() {
   if (Dart_CurrentIsolate()) {
     tonic::DartMicrotaskQueue* queue =
@@ -482,6 +577,10 @@ void DartComponentController::Kill() {
   }
 }
 
+void DartComponentController::Stop() {
+  Kill();
+}
+
 void DartComponentController::MessageEpilogue(Dart_Handle result) {
   auto dart_state = tonic::DartState::Current();
   // If the Dart program has set a return code, then it is intending to shut
@@ -505,15 +604,10 @@ void DartComponentController::MessageEpilogue(Dart_Handle result) {
   zx_status_t status =
       idle_timer_.set(idle_start_ + kIdleWaitDuration, kIdleSlack);
   if (status != ZX_OK) {
-    FX_LOGF(INFO, LOG_TAG, "Idle timer set failed: %s",
-            zx_status_get_string(status));
+    FML_LOG(INFO) << "Idle timer set failed: " << zx_status_get_string(status);
   }
 }
 
-void DartComponentController::Stop() {
-  Kill();
-}
-
 void DartComponentController::OnIdleTimer(async_dispatcher_t* dispatcher,
                                           async::WaitBase* wait,
                                           zx_status_t status,
@@ -536,8 +630,8 @@ void DartComponentController::OnIdleTimer(async_dispatcher_t* dispatcher,
     // Early wakeup or message pushed idle time forward: reschedule.
     zx_status_t status = idle_timer_.set(deadline, kIdleSlack);
     if (status != ZX_OK) {
-      FX_LOGF(INFO, LOG_TAG, "Idle timer set failed: %s",
-              zx_status_get_string(status));
+      FML_LOG(INFO) << "Idle timer set failed: "
+                    << zx_status_get_string(status);
     }
   }
   wait->Begin(dispatcher);  // ignore errors
diff --git a/shell/platform/fuchsia/dart_runner/dart_component_controller.h b/shell/platform/fuchsia/dart_runner/dart_component_controller.h
index 7187c1f8126ec8da5ea4138fb4e4b699b969ee0b..fdc244079217af7cfa2879f722c004a8100b0c76 100644
--- a/shell/platform/fuchsia/dart_runner/dart_component_controller.h
+++ b/shell/platform/fuchsia/dart_runner/dart_component_controller.h
@@ -5,18 +5,21 @@
 #ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_DART_COMPONENT_CONTROLLER_H_
 #define FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_DART_COMPONENT_CONTROLLER_H_
 
-#include <memory>
-
+#include <dart/test/cpp/fidl.h>
 #include <fuchsia/component/runner/cpp/fidl.h>
-#include <fuchsia/sys/cpp/fidl.h>
 #include <lib/async-loop/cpp/loop.h>
 #include <lib/async/cpp/wait.h>
 #include <lib/fdio/namespace.h>
+#include <lib/fidl/cpp/binding.h>
+#include <lib/fidl/cpp/binding_set.h>
+#include <lib/fidl/cpp/string.h>
 #include <lib/sys/cpp/component_context.h>
 #include <lib/sys/cpp/service_directory.h>
+#include <lib/vfs/cpp/pseudo_dir.h>
 #include <lib/zx/timer.h>
 
-#include "lib/fidl/cpp/binding.h"
+#include <memory>
+
 #include "runtime/dart/utils/mapped_resource.h"
 #include "third_party/dart/runtime/include/dart_api.h"
 
@@ -24,7 +27,8 @@ namespace dart_runner {
 
 /// Starts a Dart component written in CFv2.
 class DartComponentController
-    : public fuchsia::component::runner::ComponentController {
+    : public dart::test::Echo,
+      public fuchsia::component::runner::ComponentController {
  public:
   DartComponentController(
       fuchsia::component::runner::ComponentStartInfo start_info,
@@ -59,6 +63,9 @@ class DartComponentController
   bool CreateIsolate(const uint8_t* isolate_snapshot_data,
                      const uint8_t* isolate_snapshot_instructions);
 
+  // |Echo|
+  void EchoString(fidl::StringPtr value, EchoStringCallback callback) override;
+
   // |ComponentController|
   void Kill() override;
   void Stop() override;
@@ -76,12 +83,17 @@ class DartComponentController
 
   std::string label_;
   std::string url_;
-  std::shared_ptr<sys::ServiceDirectory> runner_incoming_services_;
   std::string data_path_;
+  std::shared_ptr<sys::ServiceDirectory> runner_incoming_services_;
   std::unique_ptr<sys::ComponentContext> context_;
+  std::unique_ptr<vfs::PseudoDir> dart_outgoing_dir_;
+  fuchsia::io::DirectoryPtr dart_outgoing_dir_ptr_;
+  fidl::InterfaceRequest<fuchsia::io::Directory> dart_outgoing_dir_request_;
+  fuchsia::io::NodePtr dart_outgoing_dir_ptr_to_check_on_open_;
 
   fuchsia::component::runner::ComponentStartInfo start_info_;
   fidl::Binding<fuchsia::component::runner::ComponentController> binding_;
+  fidl::BindingSet<dart::test::Echo> echo_binding_;
 
   fdio_ns_t* namespace_ = nullptr;
   int stdout_fd_ = -1;
diff --git a/shell/platform/fuchsia/dart_runner/dart_runner.cc b/shell/platform/fuchsia/dart_runner/dart_runner.cc
index c75e5c22556fb23bd1292686930bb43079e415db..f420a3ec8bf06517932e3429853655ffcc85ad6a 100644
--- a/shell/platform/fuchsia/dart_runner/dart_runner.cc
+++ b/shell/platform/fuchsia/dart_runner/dart_runner.cc
@@ -6,7 +6,7 @@
 
 #include <lib/async-loop/loop.h>
 #include <lib/async/default.h>
-#include <lib/syslog/global.h>
+#include <lib/vfs/cpp/pseudo_dir.h>
 #include <sys/stat.h>
 #include <zircon/status.h>
 #include <zircon/syscalls.h>
@@ -20,7 +20,6 @@
 #include "flutter/fml/command_line.h"
 #include "flutter/fml/logging.h"
 #include "flutter/fml/trace_event.h"
-#include "logging.h"
 #include "runtime/dart/utils/inlines.h"
 #include "runtime/dart/utils/vmservice_object.h"
 #include "service_isolate.h"
@@ -40,7 +39,7 @@ namespace {
 const char* kDartVMArgs[] = {
     // clang-format off
 
-    "--systrace_timeline",
+    "--timeline_recorder=systrace",
     "--timeline_streams=Compiler,Dart,Debugger,Embedder,GC,Isolate,VM",
 
 #if defined(AOT_RUNTIME)
@@ -55,7 +54,6 @@ const char* kDartVMArgs[] = {
 #if !defined(DART_PRODUCT) && (!defined(FLUTTER_PROFILE) || !defined(NDEBUG))
     "--enable_asserts",
 #endif
-    // clang-format on
 };
 
 Dart_Isolate IsolateGroupCreateCallback(const char* uri,
@@ -116,8 +114,9 @@ void RunApplication(
   const bool success = app.SetUp();
 
   const int64_t end = Dart_TimelineGetMicros();
-  Dart_TimelineEvent("DartComponentController::SetUp", start, end,
-                     Dart_Timeline_Event_Duration, 0, NULL, NULL);
+  Dart_RecordTimelineEvent(
+      "DartComponentController::SetUp", start, end, 0, nullptr,
+      Dart_Timeline_Event_Duration, 0, NULL, NULL);
   if (success) {
     app.Run();
   }
@@ -148,8 +147,9 @@ void RunTestApplication(
   test_component->SetUp();
 
   const int64_t end = Dart_TimelineGetMicros();
-  Dart_TimelineEvent("DartTestComponentController::SetUp", start, end,
-                     Dart_Timeline_Event_Duration, 0, NULL, NULL);
+  Dart_RecordTimelineEvent(
+      "DartTestComponentController::SetUp", start, end, 0, nullptr,
+      Dart_Timeline_Event_Duration, 0, NULL, NULL);
 }
 
 bool EntropySource(uint8_t* buffer, intptr_t count) {
@@ -209,7 +209,7 @@ DartRunner::DartRunner(sys::ComponentContext* context) : context_(context) {
   char* error =
       Dart_SetVMFlags(dart_utils::ArraySize(kDartVMArgs), kDartVMArgs);
   if (error) {
-    FX_LOGF(FATAL, LOG_TAG, "Dart_SetVMFlags failed: %s", error);
+    FML_LOG(FATAL) << "Dart_SetVMFlags failed: " << error;
   }
 
   Dart_InitializeParams params = {};
@@ -220,15 +220,9 @@ DartRunner::DartRunner(sys::ComponentContext* context) : context_(context) {
 #else
   if (!dart_utils::MappedResource::LoadFromNamespace(
           nullptr, "/pkg/data/vm_snapshot_data.bin", vm_snapshot_data_)) {
-    FX_LOG(FATAL, LOG_TAG, "Failed to load vm snapshot data");
-  }
-  if (!dart_utils::MappedResource::LoadFromNamespace(
-          nullptr, "/pkg/data/vm_snapshot_instructions.bin",
-          vm_snapshot_instructions_, true /* executable */)) {
-    FX_LOG(FATAL, LOG_TAG, "Failed to load vm snapshot instructions");
+    FML_LOG(FATAL) << "Failed to load vm snapshot data";
   }
   params.vm_snapshot_data = vm_snapshot_data_.address();
-  params.vm_snapshot_instructions = vm_snapshot_instructions_.address();
 #endif
   params.create_group = IsolateGroupCreateCallback;
   params.shutdown_isolate = IsolateShutdownCallback;
@@ -239,13 +233,13 @@ DartRunner::DartRunner(sys::ComponentContext* context) : context_(context) {
 #endif
   error = Dart_Initialize(&params);
   if (error)
-    FX_LOGF(FATAL, LOG_TAG, "Dart_Initialize failed: %s", error);
+    FML_LOG(FATAL) << "Dart_Initialize failed: " << error;
 }
 
 DartRunner::~DartRunner() {
   char* error = Dart_Cleanup();
   if (error)
-    FX_LOGF(FATAL, LOG_TAG, "Dart_Cleanup failed: %s", error);
+    FML_LOG(FATAL) << "Dart_Cleanup failed: " << error;
 }
 
 void DartRunner::Start(
diff --git a/shell/platform/fuchsia/dart_runner/dart_runner.h b/shell/platform/fuchsia/dart_runner/dart_runner.h
index 8df540b3f0175b7dd544fbdf0ff35dabb40c0cb1..84da1a8b5bed75fef8985b0fac34a3e9e7a90f54 100644
--- a/shell/platform/fuchsia/dart_runner/dart_runner.h
+++ b/shell/platform/fuchsia/dart_runner/dart_runner.h
@@ -6,7 +6,6 @@
 #define FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_DART_RUNNER_H_
 
 #include <fuchsia/component/runner/cpp/fidl.h>
-#include <fuchsia/sys/cpp/fidl.h>
 #include <lib/fidl/cpp/binding_set.h>
 #include <lib/sys/cpp/component_context.h>
 
diff --git a/shell/platform/fuchsia/dart_runner/dart_test_component_controller.cc b/shell/platform/fuchsia/dart_runner/dart_test_component_controller.cc
index a1786e26497c5a68ab5e025e1f7e5ae9a4008319..d9d4b07120e2dae5feafbbcf9c954a7b8aeec358 100644
--- a/shell/platform/fuchsia/dart_runner/dart_test_component_controller.cc
+++ b/shell/platform/fuchsia/dart_runner/dart_test_component_controller.cc
@@ -5,7 +5,6 @@
 #include "dart_test_component_controller.h"
 
 #include <fcntl.h>
-#include <fml/logging.h>
 #include <fuchsia/test/cpp/fidl.h>
 #include <lib/async-loop/loop.h>
 #include <lib/async/cpp/task.h>
@@ -16,7 +15,6 @@
 #include <lib/fidl/cpp/string.h>
 #include <lib/fpromise/promise.h>
 #include <lib/sys/cpp/service_directory.h>
-#include <lib/syslog/global.h>
 #include <lib/zx/clock.h>
 #include <lib/zx/thread.h>
 #include <sys/stat.h>
@@ -27,6 +25,7 @@
 #include <regex>
 #include <utility>
 
+#include "flutter/fml/logging.h"
 #include "runtime/dart/utils/files.h"
 #include "runtime/dart/utils/handle_exception.h"
 #include "runtime/dart/utils/inlines.h"
@@ -40,7 +39,6 @@
 #include "third_party/tonic/logging/dart_invoke.h"
 
 #include "builtin_libraries.h"
-#include "logging.h"
 
 using tonic::ToDart;
 
@@ -126,15 +124,14 @@ DartTestComponentController::DartTestComponentController(
     binding_.Bind(std::move(controller));
     binding_.set_error_handler([this](zx_status_t status) { Kill(); });
   } else {
-    FX_LOG(ERROR, LOG_TAG,
-           "Fuchsia component controller endpoint is not valid.");
+    FML_LOG(ERROR) << "Fuchsia component controller endpoint is not valid.";
   }
 
   zx_status_t idle_timer_status =
       zx::timer::create(ZX_TIMER_SLACK_LATE, ZX_CLOCK_MONOTONIC, &idle_timer_);
   if (idle_timer_status != ZX_OK) {
-    FX_LOGF(INFO, LOG_TAG, "Idle timer creation failed: %s",
-            zx_status_get_string(idle_timer_status));
+    FML_LOG(INFO) << "Idle timer creation failed: "
+                  << zx_status_get_string(idle_timer_status);
   } else {
     idle_wait_.set_object(idle_timer_.get());
     idle_wait_.set_trigger(ZX_TIMER_SIGNALED);
@@ -165,12 +162,11 @@ void DartTestComponentController::SetUp() {
   }
 
   if (SetUpFromAppSnapshot()) {
-    FX_LOGF(INFO, LOG_TAG, "%s is running from an app snapshot", url_.c_str());
+    FML_LOG(INFO) << url_ << " is running from an app snapshot";
   } else if (SetUpFromKernel()) {
-    FX_LOGF(INFO, LOG_TAG, "%s is running from kernel", url_.c_str());
+    FML_LOG(INFO) << url_ << " is running from kernel";
   } else {
-    FX_LOGF(ERROR, LOG_TAG, "Failed to set up component controller for %s.",
-            url_.c_str());
+    FML_LOG(ERROR) << "Failed to set up component controller for " << url_;
     return;
   }
 
@@ -185,17 +181,17 @@ void DartTestComponentController::SetUp() {
 
 bool DartTestComponentController::CreateAndBindNamespace() {
   if (!start_info_.has_ns()) {
-    FX_LOG(ERROR, LOG_TAG, "Component start info does not have a namespace.");
+    FML_LOG(ERROR) << "Component start info does not have a namespace.";
     return false;
   }
 
   const zx_status_t ns_create_status = fdio_ns_create(&namespace_);
   if (ns_create_status != ZX_OK) {
-    FX_LOGF(ERROR, LOG_TAG, "Failed to create namespace: %s",
-            zx_status_get_string(ns_create_status));
+    FML_LOG(ERROR) << "Failed to create namespace: "
+                   << zx_status_get_string(ns_create_status);
   }
 
-  dart_utils::RunnerTemp::SetupComponent(namespace_);
+  dart_utils::BindTemp(namespace_);
 
   // Bind each directory in start_info's namespace to the controller's namespace
   // instance.
@@ -207,7 +203,7 @@ bool DartTestComponentController::CreateAndBindNamespace() {
     }
 
     if (ns_entry.path() == kTmpPath) {
-      // /tmp is covered by the local memfs.
+      // /tmp is covered by a locally served virtual filesystem.
       continue;
     }
 
@@ -220,8 +216,8 @@ bool DartTestComponentController::CreateAndBindNamespace() {
     const zx_status_t ns_bind_status =
         fdio_ns_bind(namespace_, path.c_str(), dir.TakeChannel().release());
     if (ns_bind_status != ZX_OK) {
-      FX_LOGF(ERROR, LOG_TAG, "Failed to bind %s to namespace: %s",
-              path.c_str(), zx_status_get_string(ns_bind_status));
+      FML_LOG(ERROR) << "Failed to bind " << path << " to namespace: "
+                     << zx_status_get_string(ns_bind_status);
       return false;
     }
   }
@@ -241,27 +237,15 @@ bool DartTestComponentController::SetUpFromKernel() {
           isolate_snapshot_data_)) {
     return false;
   }
-  if (!dart_utils::MappedResource::LoadFromNamespace(
-          nullptr, "/pkg/data/isolate_core_snapshot_instructions.bin",
-          isolate_snapshot_instructions_, true /* executable */)) {
-    return false;
-  }
-
-  if (!CreateIsolate(isolate_snapshot_data_.address(),
-                     isolate_snapshot_instructions_.address())) {
-    return false;
-  }
-
-  Dart_EnterScope();
 
   std::string str(reinterpret_cast<const char*>(manifest.address()),
                   manifest.size());
   Dart_Handle library = Dart_Null();
+
   for (size_t start = 0; start < manifest.size();) {
     size_t end = str.find("\n", start);
     if (end == std::string::npos) {
-      FX_LOG(ERROR, LOG_TAG, "Malformed manifest");
-      Dart_ExitScope();
+      FML_LOG(ERROR) << "Malformed manifest";
       return false;
     }
 
@@ -271,27 +255,33 @@ bool DartTestComponentController::SetUpFromKernel() {
     dart_utils::MappedResource kernel;
     if (!dart_utils::MappedResource::LoadFromNamespace(namespace_, path,
                                                        kernel)) {
-      FX_LOGF(ERROR, LOG_TAG, "Cannot load kernel from namespace: %s",
-              path.c_str());
-      Dart_ExitScope();
+      FML_LOG(ERROR) << "Cannot load kernel from namespace: " << path;
       return false;
     }
+    kernel_peices_.emplace_back(std::move(kernel));
+  }
+
+  if (!CreateIsolate(isolate_snapshot_data_.address(),
+                     /*isolate_snapshot_instructions=*/nullptr)) {
+    return false;
+  }
+
+  Dart_EnterScope();
+
+  for (const auto& kernel : kernel_peices_) {
     library = Dart_LoadLibraryFromKernel(kernel.address(), kernel.size());
     if (Dart_IsError(library)) {
-      FX_LOGF(ERROR, LOG_TAG, "Cannot load library from kernel: %s",
-              Dart_GetError(library));
+      FML_LOG(ERROR) << "Cannot load library from kernel: "
+                     << Dart_GetError(library);
       Dart_ExitScope();
       return false;
     }
-
-    kernel_peices_.emplace_back(std::move(kernel));
   }
   Dart_SetRootLibrary(library);
 
   Dart_Handle result = Dart_FinalizeLoading(false);
   if (Dart_IsError(result)) {
-    FX_LOGF(ERROR, LOG_TAG, "Failed to FinalizeLoading: %s",
-            Dart_GetError(result));
+    FML_LOG(ERROR) << "Failed to FinalizeLoading: " << Dart_GetError(result);
     Dart_ExitScope();
     return false;
   }
@@ -318,11 +308,8 @@ bool DartTestComponentController::SetUpFromAppSnapshot() {
             isolate_snapshot_data_)) {
       return false;
     }
-    if (!dart_utils::MappedResource::LoadFromNamespace(
-            namespace_, data_path_ + "/isolate_snapshot_instructions.bin",
-            isolate_snapshot_instructions_, true /* executable */)) {
-      return false;
-    }
+    isolate_data = isolate_snapshot_data_.address();
+    isolate_instructions = nullptr;
   }
   return CreateIsolate(isolate_data, isolate_instructions);
 #endif  // defined(AOT_RUNTIME)
@@ -341,11 +328,15 @@ bool DartTestComponentController::CreateIsolate(
   auto state = new std::shared_ptr<tonic::DartState>(new tonic::DartState(
       namespace_fd, [this](Dart_Handle result) { MessageEpilogue(result); }));
 
+  Dart_IsolateFlags isolate_flags;
+  Dart_IsolateFlagsInitialize(&isolate_flags);
+  isolate_flags.null_safety = true;
+
   isolate_ = Dart_CreateIsolateGroup(
       url_.c_str(), label_.c_str(), isolate_snapshot_data,
-      isolate_snapshot_instructions, nullptr /* flags */, state, state, &error);
+      isolate_snapshot_instructions, &isolate_flags, state, state, &error);
   if (!isolate_) {
-    FX_LOGF(ERROR, LOG_TAG, "Dart_CreateIsolateGroup failed: %s", error);
+    FML_LOG(ERROR) << "Dart_CreateIsolateGroup failed: " << error;
     return false;
   }
 
@@ -523,9 +514,9 @@ fpromise::promise<> DartTestComponentController::RunDartMain() {
 
   fidl::InterfaceRequest<fuchsia::io::Directory> outgoing_dir =
       std::move(*start_info_.mutable_outgoing_dir());
-  InitBuiltinLibrariesForIsolate(
-      url_, namespace_, stdout_fd_, stderr_fd_, nullptr /* environment */,
-      outgoing_dir.TakeChannel(), false /* service_isolate */);
+  InitBuiltinLibrariesForIsolate(url_, namespace_, stdout_fd_, stderr_fd_,
+                                 outgoing_dir.TakeChannel(),
+                                 false /* service_isolate */);
 
   Dart_ExitScope();
   Dart_ExitIsolate();
@@ -533,7 +524,7 @@ fpromise::promise<> DartTestComponentController::RunDartMain() {
   if (error != nullptr) {
     Dart_EnterIsolate(isolate_);
     Dart_ShutdownIsolate();
-    FX_LOGF(ERROR, LOG_TAG, "Unable to make isolate runnable: %s", error);
+    FML_LOG(ERROR) << "Unable to make isolate runnable: " << error;
     free(error);
     return fpromise::make_error_promise();
   }
@@ -548,8 +539,8 @@ fpromise::promise<> DartTestComponentController::RunDartMain() {
       Dart_NewListOfTypeFilled(string_type, Dart_EmptyString(), 0);
 
   if (Dart_IsError(dart_arguments)) {
-    FX_LOGF(ERROR, LOG_TAG, "Failed to allocate Dart arguments list: %s",
-            Dart_GetError(dart_arguments));
+    FML_LOG(ERROR) << "Failed to allocate Dart arguments list: "
+                   << Dart_GetError(dart_arguments);
     Dart_ExitScope();
     return fpromise::make_error_promise();
   }
@@ -557,9 +548,8 @@ fpromise::promise<> DartTestComponentController::RunDartMain() {
   Dart_Handle user_main = Dart_GetField(Dart_RootLibrary(), ToDart("main"));
 
   if (Dart_IsError(user_main)) {
-    FX_LOGF(ERROR, LOG_TAG,
-            "Failed to locate user_main in the root library: %s",
-            Dart_GetError(user_main));
+    FML_LOG(ERROR) << "Failed to locate user_main in the root library: "
+                   << Dart_GetError(user_main);
     Dart_ExitScope();
     return fpromise::make_error_promise();
   }
@@ -567,8 +557,8 @@ fpromise::promise<> DartTestComponentController::RunDartMain() {
   Dart_Handle fuchsia_lib = Dart_LookupLibrary(tonic::ToDart("dart:fuchsia"));
 
   if (Dart_IsError(fuchsia_lib)) {
-    FX_LOGF(ERROR, LOG_TAG, "Failed to locate dart:fuchsia: %s",
-            Dart_GetError(fuchsia_lib));
+    FML_LOG(ERROR) << "Failed to locate dart:fuchsia: "
+                   << Dart_GetError(fuchsia_lib);
     Dart_ExitScope();
     return fpromise::make_error_promise();
   }
@@ -580,7 +570,7 @@ fpromise::promise<> DartTestComponentController::RunDartMain() {
     auto dart_state = tonic::DartState::Current();
     if (!dart_state->has_set_return_code()) {
       // The program hasn't set a return code meaning this exit is unexpected.
-      FX_LOG(ERROR, LOG_TAG, Dart_GetError(main_result));
+      FML_LOG(ERROR) << Dart_GetError(main_result);
       return_code_ = tonic::GetErrorExitCode(main_result);
 
       dart_utils::HandleIfException(runner_incoming_services_, url_,
@@ -640,8 +630,7 @@ void DartTestComponentController::MessageEpilogue(Dart_Handle result) {
   zx_status_t status =
       idle_timer_.set(idle_start_ + kIdleWaitDuration, kIdleSlack);
   if (status != ZX_OK) {
-    FX_LOGF(INFO, LOG_TAG, "Idle timer set failed: %s",
-            zx_status_get_string(status));
+    FML_LOG(INFO) << "Idle timer set failed: " << zx_status_get_string(status);
   }
 }
 
@@ -671,8 +660,8 @@ void DartTestComponentController::OnIdleTimer(async_dispatcher_t* dispatcher,
     // Early wakeup or message pushed idle time forward: reschedule.
     zx_status_t status = idle_timer_.set(deadline, kIdleSlack);
     if (status != ZX_OK) {
-      FX_LOGF(INFO, LOG_TAG, "Idle timer set failed: %s",
-              zx_status_get_string(status));
+      FML_LOG(INFO) << "Idle timer set failed: "
+                    << zx_status_get_string(status);
     }
   }
   wait->Begin(dispatcher);  // ignore errors
diff --git a/shell/platform/fuchsia/dart_runner/dart_test_component_controller.h b/shell/platform/fuchsia/dart_runner/dart_test_component_controller.h
index 3fbbc422a624409fbb44cf7037731dc292f554c5..81655653342d45580b3f77e86d97d281dedfbeab 100644
--- a/shell/platform/fuchsia/dart_runner/dart_test_component_controller.h
+++ b/shell/platform/fuchsia/dart_runner/dart_test_component_controller.h
@@ -8,7 +8,6 @@
 #include <memory>
 
 #include <fuchsia/component/runner/cpp/fidl.h>
-#include <fuchsia/sys/cpp/fidl.h>
 #include <fuchsia/test/cpp/fidl.h>
 #include <lib/async-loop/cpp/loop.h>
 #include <lib/async/cpp/executor.h>
@@ -67,7 +66,7 @@ class DartTestComponentController
   }
 
  private:
-  /// Helper for actually running the Dart main. Returns Returns a promise.
+  /// Helper for actually running the Dart main. Returns a promise.
   fpromise::promise<> RunDartMain();
 
   /// Creates and binds the namespace for this component. Returns true if
diff --git a/shell/platform/fuchsia/dart_runner/embedder/BUILD.gn b/shell/platform/fuchsia/dart_runner/embedder/BUILD.gn
index afd12c4b51be8b2308faa81984e7ade3013ba4a4..eb7e0562fbd162927f69ea36afacf994e25609f5 100644
--- a/shell/platform/fuchsia/dart_runner/embedder/BUILD.gn
+++ b/shell/platform/fuchsia/dart_runner/embedder/BUILD.gn
@@ -5,7 +5,7 @@
 import("//build/compiled_action.gni")
 import("//flutter/common/fuchsia_config.gni")
 import("//flutter/tools/fuchsia/dart_kernel.gni")
-import("//third_party/dart/build/dart/dart_action.gni")
+import("$dart_src/build/dart/dart_action.gni")
 
 dart_kernel("shim_kernel") {
   main_dart = "shim.dart"
@@ -54,8 +54,7 @@ template("create_aot_snapshot") {
     # No asserts in debug or release product.
     # No asserts in release with flutter_profile=true (non-product)
     # Yes asserts in non-product debug.
-    if (!invoker.product &&
-        (!(flutter_runtime_mode == "profile") || is_debug)) {
+    if (!invoker.product && (flutter_runtime_mode == "debug" || is_debug)) {
       args += [ "--enable_asserts" ]
     }
     args += [ rebase_path(shim_kernel) ]
diff --git a/shell/platform/fuchsia/dart_runner/embedder/builtin.dart b/shell/platform/fuchsia/dart_runner/embedder/builtin.dart
index 996970f2e8870f54b7535e238cb07d9b439c729d..8b03142e5deb7220d6340714d5fc25981668a113 100644
--- a/shell/platform/fuchsia/dart_runner/embedder/builtin.dart
+++ b/shell/platform/fuchsia/dart_runner/embedder/builtin.dart
@@ -50,3 +50,11 @@ _setupHooks() {
 
 @pragma('vm:entry-point')
 _getPrintClosure() => _print;
+
+typedef EchoStringCallback = String? Function(String? str);
+late EchoStringCallback? receiveEchoStringCallback;
+
+@pragma('vm:entry-point')
+String? _receiveEchoString(String? str) {
+  return receiveEchoStringCallback?.call(str);
+}
diff --git a/shell/platform/fuchsia/dart_runner/embedder/pubspec.yaml b/shell/platform/fuchsia/dart_runner/embedder/pubspec.yaml
index 95d02521eaa7c854935e709f898ea4ed9e3c7fe8..d1ccbe7700dc5952a4ca4b025dca8d937eb88aed 100644
--- a/shell/platform/fuchsia/dart_runner/embedder/pubspec.yaml
+++ b/shell/platform/fuchsia/dart_runner/embedder/pubspec.yaml
@@ -6,5 +6,5 @@
 # template in BUILD.gn.
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=3.2.0-0 <4.0.0'
 
diff --git a/shell/platform/fuchsia/dart_runner/embedder/script_runner_snapshot.dart b/shell/platform/fuchsia/dart_runner/embedder/script_runner_snapshot.dart
deleted file mode 100644
index 39c0b98a0edb92410bdc0b816874a58e0900f71c..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/dart_runner/embedder/script_runner_snapshot.dart
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Core SDK libraries.
-import 'dart:async';
-import 'dart:core';
-import 'dart:collection';
-import 'dart:convert';
-import 'dart:io';
-import 'dart:isolate';
-import 'dart:math';
-import 'dart:fuchsia.builtin';
-import 'dart:zircon';
-import 'dart:fuchsia';
-import 'dart:typed_data';
-
-// If new imports are added to this list, then it is also necessary to ensure
-// that the dart_deps parameter in the rule
-// gen_snapshot_cc("script_runner_snapshot") in the BUILD.gn file in this
-// directory is updated with any new dependencies.
-
-import 'package:fuchsia/fuchsia.dart';
-import 'package:zircon/zircon.dart';
-
-// FIDL bindings and application libraries.
-import 'package:lib.app.dart/app.dart';
-import 'package:fidl/fidl.dart';
-
-// From //sdk/fidl/fuchsia.modular
-import 'package:fidl_fuchsia_modular/fidl_async.dart';
diff --git a/shell/platform/fuchsia/dart_runner/embedder/snapshot.h b/shell/platform/fuchsia/dart_runner/embedder/snapshot.h
index 44a890124c9463be775dc3b9139f55b18dea19ec..edd9c1eae59e9b32e1191c4c7e0d2360c52a1cbb 100644
--- a/shell/platform/fuchsia/dart_runner/embedder/snapshot.h
+++ b/shell/platform/fuchsia/dart_runner/embedder/snapshot.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_EMBEDDER_SNAPSHOT_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_EMBEDDER_SNAPSHOT_H_
+
 #include <cstdint>
 
 namespace dart_runner {
@@ -10,3 +13,5 @@ extern uint8_t const* const vm_isolate_snapshot_buffer;
 extern uint8_t const* const isolate_snapshot_buffer;
 
 }  // namespace dart_runner
+
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_EMBEDDER_SNAPSHOT_H_
diff --git a/shell/platform/fuchsia/dart_runner/tests/fidl/flutter.example.echo/BUILD.gn b/shell/platform/fuchsia/dart_runner/fidl/BUILD.gn
similarity index 45%
rename from shell/platform/fuchsia/dart_runner/tests/fidl/flutter.example.echo/BUILD.gn
rename to shell/platform/fuchsia/dart_runner/fidl/BUILD.gn
index e129e9be136dea19af4c534db401120a05a50660..3923e527169adac30e80a1ca3f4dd8ed9c72d865 100644
--- a/shell/platform/fuchsia/dart_runner/tests/fidl/flutter.example.echo/BUILD.gn
+++ b/shell/platform/fuchsia/dart_runner/fidl/BUILD.gn
@@ -2,11 +2,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/fuchsia/sdk.gni")
-import("//flutter/tools/fuchsia/fidl/fidl.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/fidl_library.gni")
 
-fidl("echo") {
-  name = "flutter.example.echo"
-  meta = "//flutter/shell/platform/fuchsia/dart_runner/tests/fidl/flutter.example.echo/meta.json"
+fidl_library("dart_test") {
+  library_name = "dart.test"
   sources = [ "echo.fidl" ]
 }
diff --git a/shell/platform/fuchsia/dart_runner/tests/fidl/flutter.example.echo/echo.fidl b/shell/platform/fuchsia/dart_runner/fidl/echo.fidl
similarity index 70%
rename from shell/platform/fuchsia/dart_runner/tests/fidl/flutter.example.echo/echo.fidl
rename to shell/platform/fuchsia/dart_runner/fidl/echo.fidl
index 14624e6be78f45c817efa507d018865b49d007ba..6c39ac59f7db28616c653f4db37d846efb25fc7f 100644
--- a/shell/platform/fuchsia/dart_runner/tests/fidl/flutter.example.echo/echo.fidl
+++ b/shell/platform/fuchsia/dart_runner/fidl/echo.fidl
@@ -1,15 +1,15 @@
-// Copyright 2019 The Fuchsia Authors. All rights reserved.
+// Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-library flutter.example.echo;
+library dart.test;
 
 const MAX_STRING_LENGTH uint64 = 32;
 
 @discoverable
-protocol Echo {
+closed protocol Echo {
     /// Returns the input.
-    EchoString(struct {
+    strict EchoString(struct {
         value string:<MAX_STRING_LENGTH, optional>;
     }) -> (struct {
         response string:<MAX_STRING_LENGTH, optional>;
diff --git a/shell/platform/fuchsia/dart_runner/kernel/BUILD.gn b/shell/platform/fuchsia/dart_runner/kernel/BUILD.gn
index 2c24da81da177f6fc0dba623b19a782dd2c6a2e4..f0319dee65f5130f2883b2b37e44c9f46b76b314 100644
--- a/shell/platform/fuchsia/dart_runner/kernel/BUILD.gn
+++ b/shell/platform/fuchsia/dart_runner/kernel/BUILD.gn
@@ -3,10 +3,10 @@
 # found in the LICENSE file.
 
 import("//build/compiled_action.gni")
-import("//build/fuchsia/sdk.gni")
 import("//flutter/common/config.gni")
 import("//flutter/tools/fuchsia/dart.gni")
-import("//third_party/dart/utils/compile_platform.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
+import("$dart_src/utils/compile_platform.gni")
 
 compile_platform("kernel_platform_files") {
   single_root_scheme = "org-dartlang-sdk"
@@ -40,17 +40,11 @@ template("create_kernel_core_snapshot") {
     inputs = [ platform_dill ]
 
     vm_snapshot_data = "$target_gen_dir/vm_data${product_suffix}.bin"
-    vm_snapshot_instructions =
-        "$target_gen_dir/vm_instructions${product_suffix}.bin"
     isolate_snapshot_data = "$target_gen_dir/isolate_data${product_suffix}.bin"
-    isolate_snapshot_instructions =
-        "$target_gen_dir/isolate_instructions${product_suffix}.bin"
     snapshot_profile = "$target_gen_dir/snapshot_profile${product_suffix}.json"
     outputs = [
       vm_snapshot_data,
-      vm_snapshot_instructions,
       isolate_snapshot_data,
-      isolate_snapshot_instructions,
       snapshot_profile,
     ]
 
@@ -64,14 +58,10 @@ template("create_kernel_core_snapshot") {
     args = [
       "--enable_mirrors=false",
       "--deterministic",
-      "--snapshot_kind=core-jit",
+      "--snapshot_kind=core",
       "--vm_snapshot_data=" + rebase_path(vm_snapshot_data, root_build_dir),
-      "--vm_snapshot_instructions=" +
-          rebase_path(vm_snapshot_instructions, root_build_dir),
       "--isolate_snapshot_data=" +
           rebase_path(isolate_snapshot_data, root_build_dir),
-      "--isolate_snapshot_instructions=" +
-          rebase_path(isolate_snapshot_instructions, root_build_dir),
       "--write_v8_snapshot_profile_to=" +
           rebase_path(snapshot_profile, root_build_dir),
     ]
@@ -79,8 +69,7 @@ template("create_kernel_core_snapshot") {
     # No asserts in debug or release product.
     # No asserts in release with flutter_profile=true (non-product)
     # Yes asserts in non-product debug.
-    if (!invoker.product &&
-        (is_debug || !(flutter_runtime_mode == "profile"))) {
+    if (!invoker.product && (is_debug || flutter_runtime_mode == "debug")) {
       args += [ "--enable_asserts" ]
     }
     args += [ rebase_path(platform_dill) ]
diff --git a/shell/platform/fuchsia/dart_runner/main.cc b/shell/platform/fuchsia/dart_runner/main.cc
index 329834db904061d49ef9433099ef36fb37c23235..1ab0648eaf3bca3ef407748a09c7cdc8271830e7 100644
--- a/shell/platform/fuchsia/dart_runner/main.cc
+++ b/shell/platform/fuchsia/dart_runner/main.cc
@@ -4,13 +4,14 @@
 
 #include <lib/async-loop/cpp/loop.h>
 #include <lib/async-loop/default.h>
-#include <lib/sys/inspect/cpp/component.h>
-#include <lib/syslog/global.h>
+#include <lib/inspect/component/cpp/component.h>
 #include <lib/trace-provider/provider.h>
 #include <lib/trace/event.h>
 
 #include "dart_runner.h"
 #include "flutter/fml/logging.h"
+#include "flutter/fml/platform/fuchsia/log_interest_listener.h"
+#include "flutter/fml/platform/fuchsia/log_state.h"
 #include "flutter/fml/trace_event.h"
 #include "logging.h"
 #include "platform/utils.h"
@@ -37,6 +38,12 @@ static void RegisterProfilerSymbols(const char* symbols_path,
 int main(int argc, const char** argv) {
   async::Loop loop(&kAsyncLoopConfigAttachToCurrentThread);
 
+  // Setup logging.
+  fml::LogState::Default().SetTags({LOG_TAG});
+  fml::LogInterestListener listener(fml::LogState::Default().TakeClientEnd(),
+                                    loop.dispatcher());
+  listener.AsyncWaitForInterestChanged();
+
   // Create our component context which is served later.
   auto context = sys::ComponentContext::Create();
   dart_utils::RootInspectNode::Initialize(context.get());
@@ -62,7 +69,6 @@ int main(int argc, const char** argv) {
 #endif  // defined(AOT_RUNTIME)
 #endif  // !defined(DART_PRODUCT)
 
-  dart_utils::RunnerTemp runner_temp;
   dart_runner::DartRunner runner(context.get());
 
   // Wait to serve until we have finished all of our setup.
diff --git a/shell/platform/fuchsia/dart_runner/meta/common.shard.cml b/shell/platform/fuchsia/dart_runner/meta/common.shard.cml
index 6cd5a6c31e5e83d2943fe0a0353fcd62db6ae239..e10a98271165d8452137f5f0e0874681a509a563 100644
--- a/shell/platform/fuchsia/dart_runner/meta/common.shard.cml
+++ b/shell/platform/fuchsia/dart_runner/meta/common.shard.cml
@@ -2,44 +2,44 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 {
-    capabilities: [
-        // Required for inspect.
-        // Copied from inspect/client.shard.cml because out-of-tree doesn't
-        // have support for CML includes from the SDK.
+    use: [
+        // This is used by the Dart VM to communicate from Dart code to C++ code.
         {
-            directory: "diagnostics",
-            rights: [ "connect" ],
-            path: "/diagnostics",
+            storage: "tmp",
+            path: "/tmp",
         },
-    ],
-    use: [
         // This is used by the Dart VM to load i18n data.
         {
             directory: "config-data",
             rights: [ "r*" ],
             path: "/config/data",
         },
+        // The ICU time zone data, factored out of `config-data`.
+        // See:
+        // https://fuchsia.dev/fuchsia-src/concepts/process/namespaces?typical_directory_structure
+        {
+            directory: "tzdata-icu",
+            rights: [ "r*" ],
+            path: "/config/tzdata/icu",
+        },
         {
             protocol: [
                 "fuchsia.device.NameProvider",  // For fdio uname()
                 "fuchsia.feedback.CrashReporter",
+                "fuchsia.inspect.InspectSink",  // For inspect
                 "fuchsia.intl.PropertyProvider",  // For dartVM timezone support
                 "fuchsia.logger.LogSink",  // For syslog
                 "fuchsia.net.name.Lookup",  // For fdio sockets
                 "fuchsia.posix.socket.Provider",  // For fdio sockets
-                "fuchsia.tracing.provider.Registry",  // For trace-provider
             ],
             from: "parent",
         },
-    ],
-    expose: [
-        // Required for inspect.
-        // Copied from inspect/client.shard.cml because out-of-tree doesn't
-        // have support for CML includes from the SDK.
         {
-            directory: "diagnostics",
-            from: "self",
-            to: "framework",
+            protocol: [
+                "fuchsia.tracing.provider.Registry",  // For trace-provider
+            ],
+            from: "parent",
+            availability: "optional",
         },
-    ],
+    ]
 }
diff --git a/shell/platform/fuchsia/dart_runner/service_isolate.cc b/shell/platform/fuchsia/dart_runner/service_isolate.cc
index 6c7ca066c673ba0286e4480d007cea1750c702b2..59d9cb8fbf99904c8a487464d15c5f67cb78b66a 100644
--- a/shell/platform/fuchsia/dart_runner/service_isolate.cc
+++ b/shell/platform/fuchsia/dart_runner/service_isolate.cc
@@ -4,7 +4,7 @@
 
 #include "service_isolate.h"
 
-#include "runtime/dart/utils/inlines.h"
+#include "flutter/fml/logging.h"
 #include "third_party/dart/runtime/include/bin/dart_io_api.h"
 #include "third_party/tonic/converter/dart_converter.h"
 #include "third_party/tonic/dart_library_natives.h"
@@ -14,7 +14,6 @@
 
 #include "builtin_libraries.h"
 #include "dart_component_controller.h"
-#include "logging.h"
 
 namespace dart_runner {
 namespace {
@@ -28,20 +27,20 @@ tonic::DartLibraryNatives* service_natives = nullptr;
 Dart_NativeFunction GetNativeFunction(Dart_Handle name,
                                       int argument_count,
                                       bool* auto_setup_scope) {
-  dart_utils::Check(service_natives, LOG_TAG);
+  FML_CHECK(service_natives);
   return service_natives->GetNativeFunction(name, argument_count,
                                             auto_setup_scope);
 }
 
 const uint8_t* GetSymbol(Dart_NativeFunction native_function) {
-  dart_utils::Check(service_natives, LOG_TAG);
+  FML_CHECK(service_natives);
   return service_natives->GetSymbol(native_function);
 }
 
 #define SHUTDOWN_ON_ERROR(handle)           \
   if (Dart_IsError(handle)) {               \
     *error = strdup(Dart_GetError(handle)); \
-    FX_LOG(ERROR, LOG_TAG, *error);         \
+    FML_LOG(ERROR) << error;                \
     Dart_ExitScope();                       \
     Dart_ShutdownIsolate();                 \
     return nullptr;                         \
@@ -106,14 +105,14 @@ Dart_Isolate CreateServiceIsolate(
     if (!dart_utils::MappedResource::LoadFromNamespace(
             nullptr, snapshot_data_path, mapped_isolate_snapshot_data)) {
       *error = strdup("Failed to load snapshot for service isolate");
-      FX_LOG(ERROR, LOG_TAG, *error);
+      FML_LOG(ERROR) << *error;
       return nullptr;
     }
     if (!dart_utils::MappedResource::LoadFromNamespace(
             nullptr, snapshot_instructions_path,
             mapped_isolate_snapshot_instructions, true /* executable */)) {
       *error = strdup("Failed to load snapshot for service isolate");
-      FX_LOG(ERROR, LOG_TAG, *error);
+      FML_LOG(ERROR) << *error;
       return nullptr;
     }
 
@@ -123,26 +122,16 @@ Dart_Isolate CreateServiceIsolate(
   }
 #endif
 
-  bool is_null_safe =
-      Dart_DetectNullSafety(nullptr,         // script_uri
-                            nullptr,         // package_config
-                            nullptr,         // original_working_directory
-                            vmservice_data,  // snapshot_data
-                            vmservice_instructions,  // snapshot_instructions
-                            nullptr,                 // kernel_buffer
-                            0u                       // kernel_buffer_size
-      );
-
   Dart_IsolateFlags flags;
   Dart_IsolateFlagsInitialize(&flags);
-  flags.null_safety = is_null_safe;
+  flags.null_safety = true;
 
   auto state = new std::shared_ptr<tonic::DartState>(new tonic::DartState());
   Dart_Isolate isolate = Dart_CreateIsolateGroup(
       uri, DART_VM_SERVICE_ISOLATE_NAME, vmservice_data, vmservice_instructions,
       &flags, state, state, error);
   if (!isolate) {
-    FX_LOGF(ERROR, LOG_TAG, "Dart_CreateIsolateGroup failed: %s", *error);
+    FML_LOG(ERROR) << "Dart_CreateIsolateGroup failed: " << *error;
     return nullptr;
   }
 
@@ -193,14 +182,14 @@ Dart_Isolate CreateServiceIsolate(
   SHUTDOWN_ON_ERROR(result);
 
   InitBuiltinLibrariesForIsolate(std::string(uri), nullptr, fileno(stdout),
-                                 fileno(stderr), nullptr, zx::channel(), true);
+                                 fileno(stderr), zx::channel(), true);
 
   // Make runnable.
   Dart_ExitScope();
   Dart_ExitIsolate();
   *error = Dart_IsolateMakeRunnable(isolate);
   if (*error != nullptr) {
-    FX_LOG(ERROR, LOG_TAG, *error);
+    FML_LOG(ERROR) << *error;
     Dart_EnterIsolate(isolate);
     Dart_ShutdownIsolate();
     return nullptr;
@@ -209,17 +198,17 @@ Dart_Isolate CreateServiceIsolate(
 }  // namespace dart_runner
 
 Dart_Handle GetVMServiceAssetsArchiveCallback() {
-  dart_utils::MappedResource observatory_tar;
+  dart_utils::MappedResource vm_service_tar;
   if (!dart_utils::MappedResource::LoadFromNamespace(
-          nullptr, "/pkg/data/observatory.tar", observatory_tar)) {
-    FX_LOG(ERROR, LOG_TAG, "Failed to load Observatory assets");
+          nullptr, "/pkg/data/observatory.tar", vm_service_tar)) {
+    FML_LOG(ERROR) << "Failed to load Observatory assets";
     return nullptr;
   }
   // TODO(rmacnak): Should we avoid copying the tar? Or does the service
   // library not hold onto it anyway?
   return tonic::DartConverter<tonic::Uint8List>::ToDart(
-      reinterpret_cast<const uint8_t*>(observatory_tar.address()),
-      observatory_tar.size());
+      reinterpret_cast<const uint8_t*>(vm_service_tar.address()),
+      vm_service_tar.size());
 }
 
 }  // namespace dart_runner
diff --git a/shell/platform/fuchsia/dart_runner/service_isolate.h b/shell/platform/fuchsia/dart_runner/service_isolate.h
index 1a589fd22762dac2d2359878f45cdd3aa26e098a..4e87f638769116c1fb88c76d2b188fc4bb477cbf 100644
--- a/shell/platform/fuchsia/dart_runner/service_isolate.h
+++ b/shell/platform/fuchsia/dart_runner/service_isolate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef APPS_DART_RUNNER_SERVICE_ISOLATE_H_
-#define APPS_DART_RUNNER_SERVICE_ISOLATE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_SERVICE_ISOLATE_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_SERVICE_ISOLATE_H_
 
 #include "third_party/dart/runtime/include/dart_api.h"
 
@@ -17,4 +17,4 @@ Dart_Handle GetVMServiceAssetsArchiveCallback();
 
 }  // namespace dart_runner
 
-#endif  // APPS_DART_RUNNER_SERVICE_ISOLATE_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_SERVICE_ISOLATE_H_
diff --git a/shell/platform/fuchsia/dart_runner/tests/fidl/flutter.example.echo/README.md b/shell/platform/fuchsia/dart_runner/tests/fidl/flutter.example.echo/README.md
deleted file mode 100644
index 149853e98f9dda19641aca6093f4b7d7c3b8bde0..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/dart_runner/tests/fidl/flutter.example.echo/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Echo FIDL
-
-This FIDL protocol allows the Dart integration tests to communicate with a Dart Echo server (a test Dart component that echoes back a request).
diff --git a/shell/platform/fuchsia/dart_runner/tests/fidl/flutter.example.echo/meta.json b/shell/platform/fuchsia/dart_runner/tests/fidl/flutter.example.echo/meta.json
deleted file mode 100644
index 379328987faf773246667a19b8287a97fe394d2a..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/dart_runner/tests/fidl/flutter.example.echo/meta.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "deps": [],
-    "name": "flutter.example.echo",
-    "root": "fidl/flutter.example.echo",
-    "sources": [
-        "../../../flutter/shell/platform/fuchsia/dart_runner/tests/fidl/flutter.example.echo/echo.fidl"
-    ],
-    "type": "fidl_library"
-}
\ No newline at end of file
diff --git a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/BUILD.gn b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/BUILD.gn
index efb1d7ac29647c359f2b3787647ac74e56dc2433..4580775e917c716a19c5bbd8e4ee47219e205f96 100644
--- a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/BUILD.gn
+++ b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/fuchsia/sdk.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
 
 group("startup_integration_test") {
   testonly = true
diff --git a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/BUILD.gn b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/BUILD.gn
index 43e68bab0ccdda5a34889bbabddfe07a839b6843..482378574aa6c86305c0868d538bf51a1ab12bd5 100644
--- a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/BUILD.gn
+++ b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/BUILD.gn
@@ -2,11 +2,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/fuchsia/sdk.gni")
-
 import("//flutter/tools/fuchsia/dart/dart_component.gni")
-import("//flutter/tools/fuchsia/fidl/fidl.gni")
 import("//flutter/tools/fuchsia/fuchsia_archive.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/fidl_library.gni")
 
 group("tests") {
   testonly = true
@@ -20,22 +18,23 @@ executable("dart-aot-runner-integration-test-bin") {
 
   sources = [ "dart-aot-runner-integration-test.cc" ]
 
-  # This is needed for //third_party/googletest for linking zircon symbols.
-  libs = [ "$fuchsia_sdk_path/arch/$target_cpu/sysroot/lib/libzircon.so" ]
+  # This is needed for //flutter/third_party/googletest for linking zircon
+  # symbols.
+  libs = [ "${fuchsia_arch_root}/sysroot/lib/libzircon.so" ]
 
   deps = [
-    "$fuchsia_sdk_root/fidl:fuchsia.logger",
-    "$fuchsia_sdk_root/fidl:fuchsia.tracing.provider",
-    "$fuchsia_sdk_root/pkg:async",
-    "$fuchsia_sdk_root/pkg:async-loop-testing",
-    "$fuchsia_sdk_root/pkg:fidl_cpp",
-    "$fuchsia_sdk_root/pkg:sys_component_cpp_testing",
-    "$fuchsia_sdk_root/pkg:zx",
+    "${fuchsia_sdk}/fidl/fuchsia.logger",
+    "${fuchsia_sdk}/fidl/fuchsia.tracing.provider",
+    "${fuchsia_sdk}/pkg/async",
+    "${fuchsia_sdk}/pkg/async-loop-testing",
+    "${fuchsia_sdk}/pkg/fidl_cpp",
+    "${fuchsia_sdk}/pkg/sys_component_cpp_testing",
+    "${fuchsia_sdk}/pkg/zx",
+    "../dart_echo_server:aot_echo_package",
     "//flutter/fml",
-    "//flutter/shell/platform/fuchsia/dart_runner/tests/fidl/flutter.example.echo:echo",
-    "//flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server:aot_echo_package",
-    "//third_party/googletest:gtest",
-    "//third_party/googletest:gtest_main",
+    "//flutter/shell/platform/fuchsia/dart_runner/fidl:dart_test",
+    "//flutter/third_party/googletest:gtest",
+    "//flutter/third_party/googletest:gtest_main",
   ]
 }
 
diff --git a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/README.md b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/README.md
index 53184dc43721850757d9aa60489f287959236b93..d9312738b0471bd526d56cc46279b1978b858da5 100644
--- a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/README.md
+++ b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/README.md
@@ -6,7 +6,7 @@ Contains the integration test for the Dart AOT runner.
 <!-- TODO(erkln): Replace steps once test runner script is updated to run Dart runner tests -->
 #### Setup emulator and PM serve
 ```
-fx set workstation_eng.qemu-x64
+fx set terminal.qemu-x64
 ffx emu start --headless
 
 fx serve
@@ -20,11 +20,11 @@ ninja -C $ENGINE_DIR/out/fuchsia_profile_x64 flutter/shell/platform/fuchsia fuch
 
 #### Publish files to PM
 ```
-$FUCHSIA_DIR/.jiri_root/bin/fx pm publish -a -repo $FUCHSIA_DIR/$(cat $FUCHSIA_DIR/.fx-build-dir)/amber-files -f $ENGINE_DIR/out/fuchsia_profile_x64/dart-aot-runner-integration-test-0.far
+$FUCHSIA_DIR/.jiri_root/bin/ffx repository publish $FUCHSIA_DIR/$(cat $FUCHSIA_DIR/.fx-build-dir)/amber-files --package-archive $ENGINE_DIR/out/fuchsia_profile_x64/dart-aot-runner-integration-test-0.far
 
-$FUCHSIA_DIR/.jiri_root/bin/fx pm publish -a -repo $FUCHSIA_DIR/$(cat $FUCHSIA_DIR/.fx-build-dir)/amber-files -f $ENGINE_DIR/out/fuchsia_profile_x64/oot_dart_aot_runner-0.far
+$FUCHSIA_DIR/.jiri_root/bin/ffx repository publish $FUCHSIA_DIR/$(cat $FUCHSIA_DIR/.fx-build-dir)/amber-files --package-archive $ENGINE_DIR/out/fuchsia_profile_x64/oot_dart_aot_runner-0.far
 
-$FUCHSIA_DIR/.jiri_root/bin/fx pm publish -a -repo $FUCHSIA_DIR/$(cat $FUCHSIA_DIR/.fx-build-dir)/amber-files -f $ENGINE_DIR/out/fuchsia_profile_x64/gen/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/dart_aot_echo_server/dart_aot_echo_server.far
+$FUCHSIA_DIR/.jiri_root/bin/ffx repository publish $FUCHSIA_DIR/$(cat $FUCHSIA_DIR/.fx-build-dir)/amber-files --package-archive $ENGINE_DIR/out/fuchsia_profile_x64/gen/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/dart_aot_echo_server/dart_aot_echo_server.far
 ```
 
 #### Run test
@@ -33,4 +33,4 @@ ffx test run "fuchsia-pkg://fuchsia.com/dart-aot-runner-integration-test#meta/da
 ```
 
 ## Notes
-The `profile` runtime should be used when running the `dart_aot_runner` integration test. Snapshots will fail to generate or generate incorrectly if the wrong runtime is used. 
+The `profile` runtime should be used when running the `dart_aot_runner` integration test. Snapshots will fail to generate or generate incorrectly if the wrong runtime is used.
diff --git a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/dart-aot-runner-integration-test.cc b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/dart-aot-runner-integration-test.cc
index fff8d443e031558c1074163bd528674d60c40d08..7e762ae60137493bcecb685c0ef3acc9e7890311 100644
--- a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/dart-aot-runner-integration-test.cc
+++ b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/dart-aot-runner-integration-test.cc
@@ -2,11 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// The generated C++ bindings for the Echo FIDL protocol
-#include <flutter/shell/platform/fuchsia/dart_runner/tests/fidl/flutter.example.echo/flutter/example/echo/cpp/fidl.h>
-
+#include <dart/test/cpp/fidl.h>
 #include <fuchsia/tracing/provider/cpp/fidl.h>
-
 #include <lib/async-loop/testing/cpp/real_loop.h>
 #include <lib/sys/component/cpp/testing/realm_builder.h>
 #include <lib/sys/component/cpp/testing/realm_builder_types.h>
@@ -86,22 +83,22 @@ TEST_F(RealmBuilderTest, DartRunnerStartsUp) {
                              Protocol{"fuchsia.posix.socket.Provider"},
                              Protocol{"fuchsia.intl.PropertyProvider"},
                              Protocol{"fuchsia.vulkan.loader.Loader"},
+                             Protocol{"fuchsia.inspect.InspectSink"},
                              Directory{"config-data"}},
             .source = ParentRef(),
             .targets = {kDartAotRunnerRef, kDartAotEchoServerRef}});
 
   // Route the Echo FIDL protocol, this allows the Dart echo server to
   // communicate with the Realm Builder
-  realm_builder.AddRoute(
-      Route{.capabilities = {Protocol{"flutter.example.echo.Echo"}},
-            .source = kDartAotEchoServerRef,
-            .targets = {ParentRef()}});
+  realm_builder.AddRoute(Route{.capabilities = {Protocol{"dart.test.Echo"}},
+                               .source = kDartAotEchoServerRef,
+                               .targets = {ParentRef()}});
 
   // Build the Realm with the provided child and protocols
   auto realm = realm_builder.Build(dispatcher());
-  FML_LOG(INFO) << "Realm built: " << realm.GetChildName();
+  FML_LOG(INFO) << "Realm built: " << realm.component().GetChildName();
   // Connect to the Dart echo server
-  auto echo = realm.ConnectSync<flutter::example::echo::Echo>();
+  auto echo = realm.component().ConnectSync<dart::test::Echo>();
   fidl::StringPtr response;
   // Attempt to ping the Dart echo server for a response
   echo->EchoString("hello", &response);
diff --git a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/meta/dart-aot-runner-integration-test.cml b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/meta/dart-aot-runner-integration-test.cml
index 1dff27943eedfe5bbe16576dd1bd8468be6dff1d..25c64dd6859bd7c716d077891d7a014bb69186ca 100644
--- a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/meta/dart-aot-runner-integration-test.cml
+++ b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/meta/dart-aot-runner-integration-test.cml
@@ -4,7 +4,7 @@
 
 {
     include: [
-        "gtest_runner.shard.cml",
+        "sys/testing/gtest_runner.shard.cml",
         "sys/component/realm_builder_absolute.shard.cml",
 
         // This test needs both the vulkan facet and the hermetic-tier-2 facet,
@@ -19,6 +19,7 @@
             // Offer capabilities needed by components in this test realm.
             // Keep it minimal, describe only what's actually needed.
             protocol: [
+                "fuchsia.inspect.InspectSink",
                 "fuchsia.logger.LogSink",
                 "fuchsia.sysmem.Allocator",
                 "fuchsia.tracing.provider.Registry",
diff --git a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/meta/gtest_runner.shard.cml b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/meta/gtest_runner.shard.cml
deleted file mode 100644
index f6cfe507747ad004c7fd97ee92a3184d91f88ec3..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/meta/gtest_runner.shard.cml
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-{
-    program: {
-        runner: "gtest_runner",
-    },
-    capabilities: [
-        { protocol: "fuchsia.test.Suite" },
-    ],
-    expose: [
-        {
-            protocol: "fuchsia.test.Suite",
-            from: "self",
-        },
-    ],
-}
diff --git a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/BUILD.gn b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/BUILD.gn
index c6b7622ca9b9faa71001ba8bbcc12f1cf9f581e8..245bdb7ae92c9f731098ac5a360eaf6674fd6d09 100644
--- a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/BUILD.gn
+++ b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/BUILD.gn
@@ -2,33 +2,23 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/fuchsia/sdk.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
 
 import("//flutter/tools/fuchsia/dart/dart_component.gni")
 import("//flutter/tools/fuchsia/dart/dart_library.gni")
-import("//flutter/tools/fuchsia/gn-sdk/package.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/package.gni")
 
 dart_library("lib") {
   testonly = true
   package_name = "dart_echo_server"
-  null_safe = true
 
   source_dir = "."
   sources = [ "main.dart" ]
-
-  deps = [
-    "//flutter/shell/platform/fuchsia/dart_runner/tests/fidl/flutter.example.echo:echo",
-    "//flutter/tools/fuchsia/dart:fidl",
-    "//flutter/tools/fuchsia/dart:fuchsia_services",
-    "//flutter/tools/fuchsia/fidl:fuchsia.logger",
-    "//flutter/tools/fuchsia/fidl:fuchsia.test",
-  ]
 }
 
 # Dart component that serves the test Echo FIDL protocol, built using the Dart AOT runner
 dart_component("aot_component") {
   testonly = true
-  null_safe = true
 
   main_package = "dart_echo_server"
   manifest = "meta/dart-aot-echo-server.cml"
@@ -40,7 +30,6 @@ dart_component("aot_component") {
 # Dart component that serves the test Echo FIDL protocol, built using the Dart AOT runner
 dart_component("jit_component") {
   testonly = true
-  null_safe = true
 
   main_package = "dart_echo_server"
   manifest = "meta/dart-jit-echo-server.cml"
diff --git a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/main.dart b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/main.dart
index 5874f324d14e8ec8ff947d322453aeb800174cc6..3741dcc6a7b9f31adee7c519fd9d71b49c217359 100644
--- a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/main.dart
+++ b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/main.dart
@@ -2,47 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// The server uses async code to be able to listen for incoming Echo requests and connections
-// asynchronously.
-import 'dart:async';
+import 'dart:fuchsia.builtin';
 
-// The fidl package contains general utility code for using FIDL in Dart.
-import 'package:fidl/fidl.dart' as fidl;
-// The generated Dart bindings for the Echo FIDL protocol
-import 'package:fidl_flutter_example_echo/fidl_async.dart' as fidl_echo;
-// The fuchsia_services package interfaces with the Fuchsia system. In particular, it is used
-// to expose a service to other components
-import 'package:fuchsia_services/services.dart' as sys;
-
-// Create an implementation for the Echo protocol by overriding the
-// fidl_echo.Echo class from the bindings
-class _EchoImpl extends fidl_echo.Echo {
-  // The stream controller for the stream of OnString events
-  final _onStringStreamController = StreamController<String>();
-
-  // Implementation of EchoString that just echoes the request value back
-  @override
-  Future<String?> echoString(String? value) async {
-    return value;
-  }
+String? OnEchoString(String? str) {
+  print('Got echo string: $str');
+  return str;
 }
 
 void main(List<String> args) {
-  // Create the component context. We should not serve outgoing before we add
-  // the services.
-  final context = sys.ComponentContext.create();
-  // Each FIDL protocol class has an accompanying Binding class, which takes
-  // an implementation of the protocol and a channel, and dispatches incoming
-  // requests on the channel to the protocol implementation.
-  final binding = fidl_echo.EchoBinding();
-  // Serves the implementation by passing it a handler for incoming requests,
-  // and the name of the protocol it is providing.
-  final echo = _EchoImpl();
-  // Add the outgoing service, and then serve the outgoing directory.
-  context.outgoing
-    ..addPublicService<fidl_echo.Echo>(
-        (fidl.InterfaceRequest<fidl_echo.Echo> serverEnd) =>
-            binding.bind(echo, serverEnd),
-        fidl_echo.Echo.$serviceName)
-    ..serveFromStartupInfo();
+  receiveEchoStringCallback = OnEchoString;
 }
diff --git a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/meta/dart-aot-echo-server.cml b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/meta/dart-aot-echo-server.cml
index 8f9954f736dd97589b9bc311d8a6cb529533db8d..10b336bdf90d34cbf7519a37742d7a3ac2ea8db9 100644
--- a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/meta/dart-aot-echo-server.cml
+++ b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/meta/dart-aot-echo-server.cml
@@ -10,11 +10,11 @@
     },
     // Capabilities provided by this component.
     capabilities: [
-        { protocol: "flutter.example.echo.Echo" },
+        { protocol: "dart.test.Echo" },
     ],
     expose: [
         {
-            protocol: "flutter.example.echo.Echo",
+            protocol: "dart.test.Echo",
             from: "self",
         },
     ],
diff --git a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/meta/dart-jit-echo-server.cml b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/meta/dart-jit-echo-server.cml
index 9687045f14285150542ad13263f075792d1b783f..f4d3ca6072d0787027c36f19774dfd813eacf511 100644
--- a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/meta/dart-jit-echo-server.cml
+++ b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/meta/dart-jit-echo-server.cml
@@ -10,11 +10,11 @@
     },
     // Capabilities provided by this component.
     capabilities: [
-        { protocol: "flutter.example.echo.Echo" },
+        { protocol: "dart.test.Echo" },
     ],
     expose: [
         {
-            protocol: "flutter.example.echo.Echo",
+            protocol: "dart.test.Echo",
             from: "self",
         },
     ],
diff --git a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/BUILD.gn b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/BUILD.gn
index b464b3f0213eff1f1dda5f13f7c38da174114150..83e5a2545153491ad70e0cce4c3fb5193997a96d 100644
--- a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/BUILD.gn
+++ b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/BUILD.gn
@@ -2,11 +2,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/fuchsia/sdk.gni")
-
 import("//flutter/tools/fuchsia/dart/dart_component.gni")
-import("//flutter/tools/fuchsia/fidl/fidl.gni")
 import("//flutter/tools/fuchsia/fuchsia_archive.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
 
 group("tests") {
   testonly = true
@@ -20,22 +18,23 @@ executable("dart-jit-runner-integration-test-bin") {
 
   sources = [ "dart-jit-runner-integration-test.cc" ]
 
-  # This is needed for //third_party/googletest for linking zircon symbols.
-  libs = [ "$fuchsia_sdk_path/arch/$target_cpu/sysroot/lib/libzircon.so" ]
+  # This is needed for //flutter/third_party/googletest for linking zircon
+  # symbols.
+  libs = [ "${fuchsia_arch_root}/sysroot/lib/libzircon.so" ]
 
   deps = [
-    "$fuchsia_sdk_root/fidl:fuchsia.logger",
-    "$fuchsia_sdk_root/fidl:fuchsia.tracing.provider",
-    "$fuchsia_sdk_root/pkg:async",
-    "$fuchsia_sdk_root/pkg:async-loop-testing",
-    "$fuchsia_sdk_root/pkg:fidl_cpp",
-    "$fuchsia_sdk_root/pkg:sys_component_cpp_testing",
-    "$fuchsia_sdk_root/pkg:zx",
+    "${fuchsia_sdk}/fidl/fuchsia.logger",
+    "${fuchsia_sdk}/fidl/fuchsia.tracing.provider",
+    "${fuchsia_sdk}/pkg/async",
+    "${fuchsia_sdk}/pkg/async-loop-testing",
+    "${fuchsia_sdk}/pkg/fidl_cpp",
+    "${fuchsia_sdk}/pkg/sys_component_cpp_testing",
+    "${fuchsia_sdk}/pkg/zx",
+    "../dart_echo_server:jit_echo_package",
     "//flutter/fml",
-    "//flutter/shell/platform/fuchsia/dart_runner/tests/fidl/flutter.example.echo:echo",
-    "//flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server:jit_echo_package",
-    "//third_party/googletest:gtest",
-    "//third_party/googletest:gtest_main",
+    "//flutter/shell/platform/fuchsia/dart_runner/fidl:dart_test",
+    "//flutter/third_party/googletest:gtest",
+    "//flutter/third_party/googletest:gtest_main",
   ]
 }
 
diff --git a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/README.md b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/README.md
index 98b52069f1dfa238d7d0338a20d0899f092fb115..08789dabe8ec68b780c4f87571bef68e5880c8d1 100644
--- a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/README.md
+++ b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/README.md
@@ -6,7 +6,7 @@ Contains the integration test for the Dart JIT runner.
 <!-- TODO(erkln): Replace steps once test runner script is updated to run Dart runner tests -->
 #### Setup emulator and PM serve
 ```
-fx set workstation_eng.qemu-x64
+fx set terminal.qemu-x64
 ffx emu start --headless
 
 fx serve
@@ -20,11 +20,11 @@ ninja -C $ENGINE_DIR/out/fuchsia_debug_x64 flutter/shell/platform/fuchsia fuchsi
 
 #### Publish files to PM
 ```
-$FUCHSIA_DIR/.jiri_root/bin/fx pm publish -a -repo $FUCHSIA_DIR/$(cat $FUCHSIA_DIR/.fx-build-dir)/amber-files -f $ENGINE_DIR/out/fuchsia_debug_x64/dart-jit-runner-integration-test-0.far
+$FUCHSIA_DIR/.jiri_root/bin/ffx repository publish $FUCHSIA_DIR/$(cat $FUCHSIA_DIR/.fx-build-dir)/amber-files --package-archive $ENGINE_DIR/out/fuchsia_debug_x64/dart-jit-runner-integration-test-0.far
 
-$FUCHSIA_DIR/.jiri_root/bin/fx pm publish -a -repo $FUCHSIA_DIR/$(cat $FUCHSIA_DIR/.fx-build-dir)/amber-files -f $ENGINE_DIR/out/fuchsia_debug_x64/oot_dart_jit_runner-0.far
+$FUCHSIA_DIR/.jiri_root/bin/ffx repository publish $FUCHSIA_DIR/$(cat $FUCHSIA_DIR/.fx-build-dir)/amber-files --package-archive $ENGINE_DIR/out/fuchsia_debug_x64/oot_dart_jit_runner-0.far
 
-$FUCHSIA_DIR/.jiri_root/bin/fx pm publish -a -repo $FUCHSIA_DIR/$(cat $FUCHSIA_DIR/.fx-build-dir)/amber-files -f $ENGINE_DIR/out/fuchsia_debug_x64/gen/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/dart_jit_echo_server/dart_jit_echo_server.far
+$FUCHSIA_DIR/.jiri_root/bin/ffx repository publish $FUCHSIA_DIR/$(cat $FUCHSIA_DIR/.fx-build-dir)/amber-files --package-archive $ENGINE_DIR/out/fuchsia_debug_x64/gen/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/dart_jit_echo_server/dart_jit_echo_server.far
 ```
 
 #### Run test
@@ -33,4 +33,4 @@ ffx test run "fuchsia-pkg://fuchsia.com/dart-jit-runner-integration-test#meta/da
 ```
 
 ## Notes
-The `debug` runtime should be used when running the `dart_jit_runner` integration test. Snapshots will fail to generate or generate incorrectly if the wrong runtime is used. 
+The `debug` runtime should be used when running the `dart_jit_runner` integration test. Snapshots will fail to generate or generate incorrectly if the wrong runtime is used.
diff --git a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/dart-jit-runner-integration-test.cc b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/dart-jit-runner-integration-test.cc
index 0c24533459e11115d3aa4508fae1290ff63ddd82..b8b4ee30ce1bf3b514e0afef5ffa936ba22f7c8e 100644
--- a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/dart-jit-runner-integration-test.cc
+++ b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/dart-jit-runner-integration-test.cc
@@ -2,11 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// The generated C++ bindings for the Echo FIDL protocol
-#include <flutter/shell/platform/fuchsia/dart_runner/tests/fidl/flutter.example.echo/flutter/example/echo/cpp/fidl.h>
-
+#include <dart/test/cpp/fidl.h>
 #include <fuchsia/tracing/provider/cpp/fidl.h>
-
 #include <lib/async-loop/testing/cpp/real_loop.h>
 #include <lib/sys/component/cpp/testing/realm_builder.h>
 #include <lib/sys/component/cpp/testing/realm_builder_types.h>
@@ -84,22 +81,22 @@ TEST_F(RealmBuilderTest, DartRunnerStartsUp) {
                              Protocol{"fuchsia.tracing.provider.Registry"},
                              Protocol{"fuchsia.posix.socket.Provider"},
                              Protocol{"fuchsia.intl.PropertyProvider"},
+                             Protocol{"fuchsia.inspect.InspectSink"},
                              Directory{"config-data"}},
             .source = ParentRef(),
             .targets = {kDartJitRunnerRef, kDartJitEchoServerRef}});
 
   // Route the Echo FIDL protocol, this allows the Dart echo server to
   // communicate with the Realm Builder
-  realm_builder.AddRoute(
-      Route{.capabilities = {Protocol{"flutter.example.echo.Echo"}},
-            .source = kDartJitEchoServerRef,
-            .targets = {ParentRef()}});
+  realm_builder.AddRoute(Route{.capabilities = {Protocol{"dart.test.Echo"}},
+                               .source = kDartJitEchoServerRef,
+                               .targets = {ParentRef()}});
 
   // Build the Realm with the provided child and protocols
   auto realm = realm_builder.Build(dispatcher());
-  FML_LOG(INFO) << "Realm built: " << realm.GetChildName();
+  FML_LOG(INFO) << "Realm built: " << realm.component().GetChildName();
   // Connect to the Dart echo server
-  auto echo = realm.ConnectSync<flutter::example::echo::Echo>();
+  auto echo = realm.component().ConnectSync<dart::test::Echo>();
   fidl::StringPtr response;
   // Attempt to ping the Dart echo server for a response
   echo->EchoString("hello", &response);
diff --git a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/meta/dart-jit-runner-integration-test.cml b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/meta/dart-jit-runner-integration-test.cml
index d9b4faee723de9ff7be6a5f69945b0d49f0b68dd..5a7a6fc7c5587a2c58f601fc037acfa109916151 100644
--- a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/meta/dart-jit-runner-integration-test.cml
+++ b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/meta/dart-jit-runner-integration-test.cml
@@ -4,7 +4,7 @@
 
 {
     include: [
-        "gtest_runner.shard.cml",
+        "sys/testing/gtest_runner.shard.cml",
         "sys/component/realm_builder_absolute.shard.cml",
 
         // This test needs both the vulkan facet and the hermetic-tier-2 facet,
@@ -19,6 +19,7 @@
             // Offer capabilities needed by components in this test realm.
             // Keep it minimal, describe only what's actually needed.
             protocol: [
+                "fuchsia.inspect.InspectSink",
                 "fuchsia.logger.LogSink",
                 "fuchsia.sysmem.Allocator",
                 "fuchsia.tracing.provider.Registry",
@@ -36,6 +37,12 @@
             from: "framework",
             to: "#realm_builder",
         },
+        // See common.shard.cml.
+        {
+            directory: "tzdata-icu",
+            from: "framework",
+            to: "#realm_builder",
+        },
     ],
     // TODO(https://fxbug.dev/114584): Figure out how to bring these in as deps (if possible oot).
     facets: {
diff --git a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/meta/gtest_runner.shard.cml b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/meta/gtest_runner.shard.cml
deleted file mode 100644
index f6cfe507747ad004c7fd97ee92a3184d91f88ec3..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/meta/gtest_runner.shard.cml
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-{
-    program: {
-        runner: "gtest_runner",
-    },
-    capabilities: [
-        { protocol: "fuchsia.test.Suite" },
-    ],
-    expose: [
-        {
-            protocol: "fuchsia.test.Suite",
-            from: "self",
-        },
-    ],
-}
diff --git a/shell/platform/fuchsia/dart_runner/vmservice/BUILD.gn b/shell/platform/fuchsia/dart_runner/vmservice/BUILD.gn
index 8aa7da550baab324ab5065fff1799c15edf765b9..0c87cc9c27384949cbdfc1c75ee7c2affac287eb 100644
--- a/shell/platform/fuchsia/dart_runner/vmservice/BUILD.gn
+++ b/shell/platform/fuchsia/dart_runner/vmservice/BUILD.gn
@@ -3,11 +3,11 @@
 # found in the LICENSE file.
 
 import("//build/compiled_action.gni")
-import("//build/fuchsia/sdk.gni")
 import("//flutter/common/config.gni")
 import("//flutter/tools/fuchsia/dart.gni")
 import("//flutter/tools/fuchsia/dart_kernel.gni")
-import("//third_party/dart/utils/compile_platform.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
+import("$dart_src/utils/compile_platform.gni")
 
 dart_kernel("vmservice_product_aot_kernel") {
   kernel_platform_files = "../kernel:kernel_platform_files"
@@ -65,7 +65,7 @@ template("aot_snapshot") {
     # No asserts in debug or release product.
     # No asserts in release with flutter_profile=true (non-product)
     # Yes asserts in non-product debug.
-    if (!product && (!(flutter_runtime_mode == "profile") || is_debug)) {
+    if (!product && (flutter_runtime_mode == "debug" || is_debug)) {
       args += [ "--enable_asserts" ]
     }
 
diff --git a/shell/platform/fuchsia/dart_runner/vmservice/pubspec.yaml b/shell/platform/fuchsia/dart_runner/vmservice/pubspec.yaml
index d0e8360c33486edb5f370b8c61d3df0cd91741c8..df2ce1ab10dbfe412a9ef88ade0ab6540a79f73c 100644
--- a/shell/platform/fuchsia/dart_runner/vmservice/pubspec.yaml
+++ b/shell/platform/fuchsia/dart_runner/vmservice/pubspec.yaml
@@ -3,5 +3,5 @@
 # found in the LICENSE file.
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=3.2.0-0 <4.0.0'
 
diff --git a/shell/platform/fuchsia/flutter/BUILD.gn b/shell/platform/fuchsia/flutter/BUILD.gn
index 13e55261d92f34b95a051f1ce272b2fded804c2e..ad4e3426a1c80bc744809d605eb3d53d6e9236c6 100644
--- a/shell/platform/fuchsia/flutter/BUILD.gn
+++ b/shell/platform/fuchsia/flutter/BUILD.gn
@@ -4,13 +4,14 @@
 
 assert(is_fuchsia)
 
-import("//build/fuchsia/sdk.gni")
 import("//flutter/common/config.gni")
+import("//flutter/shell/config.gni")
 import("//flutter/shell/gpu/gpu.gni")
 import("//flutter/testing/testing.gni")
 import("//flutter/tools/fuchsia/dart.gni")
 import("//flutter/tools/fuchsia/fuchsia_archive.gni")
 import("//flutter/tools/fuchsia/fuchsia_libs.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
 import("//flutter/vulkan/config.gni")
 
 # Fuchsia uses its own custom Surface implementation.
@@ -57,32 +58,24 @@ template("runner_sources") {
     sources = [
       "accessibility_bridge.cc",
       "accessibility_bridge.h",
-      "component_v1.cc",
-      "component_v1.h",
+      "canvas_spy.cc",
+      "canvas_spy.h",
       "component_v2.cc",
       "component_v2.h",
       "engine.cc",
       "engine.h",
+      "external_view_embedder.cc",
+      "external_view_embedder.h",
       "file_in_namespace_buffer.cc",
       "file_in_namespace_buffer.h",
       "flatland_connection.cc",
       "flatland_connection.h",
-      "flatland_external_view_embedder.cc",
-      "flatland_external_view_embedder.h",
-      "flatland_platform_view.cc",
-      "flatland_platform_view.h",
       "flutter_runner_product_configuration.cc",
       "flutter_runner_product_configuration.h",
       "focus_delegate.cc",
       "focus_delegate.h",
       "fuchsia_intl.cc",
       "fuchsia_intl.h",
-      "gfx_external_view_embedder.cc",
-      "gfx_external_view_embedder.h",
-      "gfx_platform_view.cc",
-      "gfx_platform_view.h",
-      "gfx_session_connection.cc",
-      "gfx_session_connection.h",
       "isolate_configurator.cc",
       "isolate_configurator.h",
       "keyboard.cc",
@@ -95,6 +88,8 @@ template("runner_sources") {
       "pointer_injector_delegate.cc",
       "pointer_injector_delegate.h",
       "program_metadata.h",
+      "rtree.cc",
+      "rtree.h",
       "runner.cc",
       "runner.h",
       "software_surface.cc",
@@ -143,41 +138,44 @@ template("runner_sources") {
       "//flutter/vulkan/procs",
     ]
 
+    # TODO(zijiehe): Considering which deps should belong to the public_deps,
+    # multiple dependencies of this target use the following deps without
+    # explicitly claiming the dependencies.
     public_deps = [
-                    "$fuchsia_sdk_root/pkg:inspect",
-                    "$fuchsia_sdk_root/pkg:scenic_cpp",
-                    "$fuchsia_sdk_root/pkg:sys_cpp",
-                    "$fuchsia_sdk_root/pkg:sys_inspect_cpp",
+                    "${fuchsia_sdk}/fidl/fuchsia.accessibility.semantics",
+                    "${fuchsia_sdk}/fidl/fuchsia.component.runner",
+                    "${fuchsia_sdk}/fidl/fuchsia.fonts",
+                    "${fuchsia_sdk}/fidl/fuchsia.images",
+                    "${fuchsia_sdk}/fidl/fuchsia.intl",
+                    "${fuchsia_sdk}/fidl/fuchsia.io",
+                    "${fuchsia_sdk}/fidl/fuchsia.media",
+                    "${fuchsia_sdk}/fidl/fuchsia.memorypressure",
+                    "${fuchsia_sdk}/fidl/fuchsia.ui.app",
+                    "${fuchsia_sdk}/fidl/fuchsia.ui.composition",
+                    "${fuchsia_sdk}/fidl/fuchsia.ui.input",
+                    "${fuchsia_sdk}/fidl/fuchsia.ui.input3",
+                    "${fuchsia_sdk}/fidl/fuchsia.ui.pointer",
+                    "${fuchsia_sdk}/fidl/fuchsia.ui.pointerinjector",
+                    "${fuchsia_sdk}/fidl/fuchsia.ui.test.input",
+                    "${fuchsia_sdk}/fidl/fuchsia.ui.views",
+                    "${fuchsia_sdk}/pkg/inspect",
+                    "${fuchsia_sdk}/pkg/inspect_component_cpp",
+                    "${fuchsia_sdk}/pkg/sys_cpp",
                     "//flutter/shell/platform/fuchsia/runtime/dart/utils",
                   ] + flutter_public_deps
 
     deps = [
-             "$fuchsia_sdk_root/fidl:fuchsia.accessibility.semantics",
-             "$fuchsia_sdk_root/fidl:fuchsia.component.runner",
-             "$fuchsia_sdk_root/fidl:fuchsia.fonts",
-             "$fuchsia_sdk_root/fidl:fuchsia.images",
-             "$fuchsia_sdk_root/fidl:fuchsia.intl",
-             "$fuchsia_sdk_root/fidl:fuchsia.io",
-             "$fuchsia_sdk_root/fidl:fuchsia.memorypressure",
-             "$fuchsia_sdk_root/fidl:fuchsia.sys",
-             "$fuchsia_sdk_root/fidl:fuchsia.ui.app",
-             "$fuchsia_sdk_root/fidl:fuchsia.ui.composition",
-             "$fuchsia_sdk_root/fidl:fuchsia.ui.pointer",
-             "$fuchsia_sdk_root/fidl:fuchsia.ui.views",
-             "$fuchsia_sdk_root/fidl:fuchsia.ui.scenic",
-             "$fuchsia_sdk_root/fidl:fuchsia.ui.pointerinjector",
-             "$fuchsia_sdk_root/pkg:async-cpp",
-             "$fuchsia_sdk_root/pkg:async-default",
-             "$fuchsia_sdk_root/pkg:async-loop",
-             "$fuchsia_sdk_root/pkg:async-loop-cpp",
-             "$fuchsia_sdk_root/pkg:fdio",
-             "$fuchsia_sdk_root/pkg:fidl_cpp",
-             "$fuchsia_sdk_root/pkg:syslog",
-             "$fuchsia_sdk_root/pkg:trace",
-             "$fuchsia_sdk_root/pkg:trace-engine",
-             "$fuchsia_sdk_root/pkg:trace-provider-so",
-             "$fuchsia_sdk_root/pkg:vfs_cpp",
-             "$fuchsia_sdk_root/pkg:zx",
+             "${fuchsia_sdk}/pkg/async-cpp",
+             "${fuchsia_sdk}/pkg/async-default",
+             "${fuchsia_sdk}/pkg/async-loop",
+             "${fuchsia_sdk}/pkg/async-loop-cpp",
+             "${fuchsia_sdk}/pkg/fdio",
+             "${fuchsia_sdk}/pkg/fidl_cpp",
+             "${fuchsia_sdk}/pkg/trace",
+             "${fuchsia_sdk}/pkg/trace-engine",
+             "${fuchsia_sdk}/pkg/trace-provider-so",
+             "${fuchsia_sdk}/pkg/vfs_cpp",
+             "${fuchsia_sdk}/pkg/zx",
              "//flutter/shell/platform/fuchsia/dart-pkg/fuchsia",
              "//flutter/shell/platform/fuchsia/dart-pkg/zircon",
            ] + flutter_deps
@@ -231,9 +229,9 @@ template("flutter_runner") {
 
     deps = [
              ":flutter_runner_sources${product_suffix}",
-             "$fuchsia_sdk_root/pkg:async-loop-cpp",
-             "$fuchsia_sdk_root/pkg:trace",
-             "$fuchsia_sdk_root/pkg:trace-provider-so",
+             "${fuchsia_sdk}/pkg/async-loop-cpp",
+             "${fuchsia_sdk}/pkg/trace",
+             "${fuchsia_sdk}/pkg/trace-provider-so",
            ] + extra_deps
 
     # The flags below are needed so that Dart's CPU profiler can walk the
@@ -260,8 +258,8 @@ flutter_runner("jit") {
   product = false
 
   extra_deps = [
-    "//third_party/dart/runtime:libdart_jit",
-    "//third_party/dart/runtime/platform:libdart_platform_jit",
+    "$dart_src/runtime:libdart_jit",
+    "$dart_src/runtime/platform:libdart_platform_jit",
   ]
 }
 
@@ -270,8 +268,8 @@ flutter_runner("jit_product") {
   product = true
 
   extra_deps = [
-    "//third_party/dart/runtime:libdart_jit",
-    "//third_party/dart/runtime/platform:libdart_platform_jit",
+    "$dart_src/runtime:libdart_jit",
+    "$dart_src/runtime/platform:libdart_platform_jit",
   ]
 }
 
@@ -280,8 +278,8 @@ flutter_runner("aot") {
   product = false
 
   extra_deps = [
-    "//third_party/dart/runtime:libdart_precompiled_runtime",
-    "//third_party/dart/runtime/platform:libdart_platform_precompiled_runtime",
+    "$dart_src/runtime:libdart_precompiled_runtime",
+    "$dart_src/runtime/platform:libdart_platform_precompiled_runtime",
   ]
 }
 
@@ -290,8 +288,8 @@ flutter_runner("aot_product") {
   product = true
 
   extra_deps = [
-    "//third_party/dart/runtime:libdart_precompiled_runtime",
-    "//third_party/dart/runtime/platform:libdart_platform_precompiled_runtime",
+    "$dart_src/runtime:libdart_precompiled_runtime",
+    "$dart_src/runtime/platform:libdart_platform_precompiled_runtime",
   ]
 }
 
@@ -322,12 +320,11 @@ template("jit_runner") {
 
     binary = "flutter_jit${product_suffix}_runner"
 
-    cmx_file = rebase_path("meta/flutter_jit${product_suffix}_runner.cmx")
     cml_file = rebase_path("meta/flutter_jit${product_suffix}_runner.cml")
 
     resources = [
       {
-        path = rebase_path("//third_party/icu/common/icudtl.dat")
+        path = rebase_path("//flutter/third_party/icu/common/icudtl.dat")
         dest = "icudtl.dat"
       },
     ]
@@ -355,21 +352,11 @@ template("jit_runner") {
                 "$snapshot_gen_dir/vm_isolate_snapshot${product_suffix}.bin")
         dest = "vm_snapshot_data.bin"
       },
-      {
-        path = rebase_path(
-                "$snapshot_gen_dir/vm_snapshot_instructions${product_suffix}.bin")
-        dest = "vm_snapshot_instructions.bin"
-      },
       {
         path = rebase_path(
                 "$snapshot_gen_dir/isolate_snapshot${product_suffix}.bin")
         dest = "isolate_core_snapshot_data.bin"
       },
-      {
-        path = rebase_path(
-                "$snapshot_gen_dir/isolate_snapshot_instructions${product_suffix}.bin")
-        dest = "isolate_core_snapshot_instructions.bin"
-      },
     ]
 
     _vulkan_icds = []
@@ -402,14 +389,13 @@ template("aot_runner") {
       ]
     }
 
-    cmx_file = rebase_path("meta/flutter_aot${product_suffix}_runner.cmx")
     cml_file = rebase_path("meta/flutter_aot${product_suffix}_runner.cml")
 
     binary = "flutter_aot${product_suffix}_runner"
 
     resources = [
       {
-        path = rebase_path("//third_party/icu/common/icudtl.dat")
+        path = rebase_path("//flutter/third_party/icu/common/icudtl.dat")
         dest = "icudtl.dat"
       },
     ]
@@ -500,51 +486,49 @@ if (enable_unittests) {
 
     sources = [
       "accessibility_bridge_unittest.cc",
-      "component_v1_unittest.cc",
+      "canvas_spy_unittests.cc",
       "component_v2_unittest.cc",
       "flutter_runner_fakes.h",
       "focus_delegate_unittests.cc",
       "fuchsia_intl_unittest.cc",
       "keyboard_unittest.cc",
-      "platform_view_unittest.cc",
       "pointer_delegate_unittests.cc",
       "pointer_injector_delegate_unittest.cc",
+      "rtree_unittests.cc",
       "tests/engine_unittests.cc",
+      "tests/external_view_embedder_unittests.cc",
       "tests/fake_flatland_unittests.cc",
-      "tests/fake_session_unittests.cc",
       "tests/flatland_connection_unittests.cc",
-      "tests/flatland_external_view_embedder_unittests.cc",
-      "tests/flatland_platform_view_unittest.cc",
       "tests/flutter_runner_product_configuration_unittests.cc",
-      "tests/gfx_external_view_embedder_unittests.cc",
-      "tests/gfx_session_connection_unittests.cc",
+      "tests/platform_view_unittest.cc",
       "tests/pointer_event_utility.cc",
       "tests/pointer_event_utility.h",
       "text_delegate_unittests.cc",
       "vsync_waiter_unittest.cc",
     ]
 
-    # This is needed for //third_party/googletest for linking zircon symbols.
-    libs = [ "$fuchsia_sdk_path/arch/$target_cpu/sysroot/lib/libzircon.so" ]
+    # This is needed for //flutter/third_party/googletest for linking zircon
+    # symbols.
+    libs = [ "${fuchsia_arch_root}/sysroot/lib/libzircon.so" ]
 
     # The use of these dependencies is temporary and will be moved behind the
     # embedder API.
     flutter_deps = [
+      "$dart_src/runtime:libdart_jit",
+      "$dart_src/runtime/platform:libdart_platform_jit",
       "//flutter/assets:assets",
       "//flutter/common/graphics",
       "//flutter/flow",
       "//flutter/lib/ui",
       "//flutter/shell/common",
-      "//third_party/dart/runtime:libdart_jit",
-      "//third_party/dart/runtime/platform:libdart_platform_jit",
     ]
 
     deps = [
              "tests/fakes",
              ":flutter_runner_fixtures",
              ":flutter_runner_sources",
-             "//build/fuchsia/pkg:async-testing",
-             "//build/fuchsia/pkg:sys_cpp_testing",
+             "${fuchsia_sdk}/pkg/async-testing",
+             "${fuchsia_sdk}/pkg/sys_cpp_testing",
              "//flutter/shell/platform/common/client_wrapper:client_wrapper_library_stubs",
              "//flutter/testing",
            ] + flutter_deps
@@ -557,16 +541,17 @@ if (enable_unittests) {
 
     sources = [ "runner_tzdata_unittest.cc" ]
 
-    # This is needed for //third_party/googletest for linking zircon symbols.
-    libs = [ "$fuchsia_sdk_path/arch/$target_cpu/sysroot/lib/libzircon.so" ]
+    # This is needed for //flutter/third_party/googletest for linking zircon
+    # symbols.
+    libs = [ "${fuchsia_arch_root}/sysroot/lib/libzircon.so" ]
 
     # The use of these dependencies is temporary and will be moved behind the
     # embedder API.
     flutter_deps = [
+      "$dart_src/runtime:libdart_jit",
+      "$dart_src/runtime/platform:libdart_platform_jit",
       "//flutter/lib/ui",
       "//flutter/shell/platform/common/client_wrapper:client_wrapper_library_stubs",
-      "//third_party/dart/runtime:libdart_jit",
-      "//third_party/dart/runtime/platform:libdart_platform_jit",
     ]
 
     deps = [
@@ -583,16 +568,17 @@ if (enable_unittests) {
 
     sources = [ "runner_tzdata_missing_unittest.cc" ]
 
-    # This is needed for //third_party/googletest for linking zircon symbols.
-    libs = [ "$fuchsia_sdk_path/arch/$target_cpu/sysroot/lib/libzircon.so" ]
+    # This is needed for //flutter/third_party/googletest for linking zircon
+    # symbols.
+    libs = [ "${fuchsia_arch_root}/sysroot/lib/libzircon.so" ]
 
     # The use of these dependencies is temporary and will be moved behind the
     # embedder API.
     flutter_deps = [
+      "$dart_src/runtime:libdart_jit",
+      "$dart_src/runtime/platform:libdart_platform_jit",
       "//flutter/lib/ui",
       "//flutter/shell/platform/common/client_wrapper:client_wrapper_library_stubs",
-      "//third_party/dart/runtime:libdart_jit",
-      "//third_party/dart/runtime/platform:libdart_platform_jit",
     ]
 
     deps = [
@@ -609,7 +595,7 @@ if (enable_unittests) {
 
     resources = [
       {
-        path = rebase_path("//third_party/icu/common/icudtl.dat")
+        path = rebase_path("//flutter/third_party/icu/common/icudtl.dat")
         dest = "icudtl.dat"
       },
     ]
@@ -622,7 +608,7 @@ if (enable_unittests) {
 
     resources = [
       {
-        path = rebase_path("//third_party/icu/common/icudtl.dat")
+        path = rebase_path("//flutter/third_party/icu/common/icudtl.dat")
         dest = "icudtl.dat"
       },
       {
@@ -650,7 +636,7 @@ if (enable_unittests) {
 
     resources = [
       {
-        path = rebase_path("//third_party/icu/common/icudtl.dat")
+        path = rebase_path("//flutter/third_party/icu/common/icudtl.dat")
         dest = "icudtl.dat"
       },
     ]
@@ -666,12 +652,28 @@ if (enable_unittests) {
     deps = [ "//flutter/display_list:display_list_unittests" ]
 
     binary = "display_list_unittests"
+
+    resources = [
+      {
+        path = rebase_path(
+                "//flutter/third_party/txt/third_party/fonts/Roboto-Regular.ttf")
+        dest = "assets/Roboto-Regular.ttf"
+      },
+    ]
   }
 
   fuchsia_test_archive("display_list_render_tests") {
     deps = [ "//flutter/display_list:display_list_rendertests" ]
 
     binary = "display_list_rendertests"
+
+    resources = [
+      {
+        path = rebase_path(
+                "//flutter/third_party/txt/third_party/fonts/Roboto-Regular.ttf")
+        dest = "assets/Roboto-Regular.ttf"
+      },
+    ]
   }
 
   fuchsia_test_archive("flow_tests") {
@@ -695,6 +697,11 @@ if (enable_unittests) {
                 "//flutter/testing/resources/performance_overlay_gold_120fps.png")
         dest = "flutter/testing/resources/performance_overlay_gold_120fps.png"
       },
+      {
+        path = rebase_path(
+                "//flutter/third_party/txt/third_party/fonts/Roboto-Regular.ttf")
+        dest = "assets/Roboto-Regular.ttf"
+      },
     ]
   }
 
@@ -738,6 +745,11 @@ if (enable_unittests) {
             "$root_gen_dir/flutter/shell/common/assets/shelltest_screenshot.png"
         dest = "assets/shelltest_screenshot.png"
       },
+      {
+        path = rebase_path(
+                "//flutter/third_party/txt/third_party/fonts/Roboto-Regular.ttf")
+        dest = "assets/Roboto-Regular.ttf"
+      },
     ]
 
     libraries = vulkan_validation_libs
@@ -757,11 +769,11 @@ if (enable_unittests) {
 
     resources = [
       {
-        path = rebase_path("//third_party/icu/common/icudtl.dat")
+        path = rebase_path("//flutter/third_party/icu/common/icudtl.dat")
         dest = "icudtl.dat"
       },
       {
-        path = rebase_path("//third_party/icu/common/icudtl.dat")
+        path = rebase_path("//flutter/third_party/icu/common/icudtl.dat")
         dest = "icudtl2.dat"
       },
     ]
diff --git a/shell/platform/fuchsia/flutter/accessibility_bridge.cc b/shell/platform/fuchsia/flutter/accessibility_bridge.cc
index c1f14df13ceacac9b9df8b5c6b65e41c35250fe8..c317a17b5497b08d20bef3822fdd1a896ebb31f4 100644
--- a/shell/platform/fuchsia/flutter/accessibility_bridge.cc
+++ b/shell/platform/fuchsia/flutter/accessibility_bridge.cc
@@ -340,6 +340,14 @@ fuchsia::accessibility::semantics::States AccessibilityBridge::GetNodeStates(
             : fuchsia::accessibility::semantics::CheckedState::UNCHECKED);
   }
 
+  // Set enabled state.
+  if (node.HasFlag(flutter::SemanticsFlags::kHasEnabledState)) {
+    states.set_enabled_state(
+        node.HasFlag(flutter::SemanticsFlags::kIsEnabled)
+            ? fuchsia::accessibility::semantics::EnabledState::ENABLED
+            : fuchsia::accessibility::semantics::EnabledState::DISABLED);
+  }
+
   // Set selected state.
   states.set_selected(node.HasFlag(flutter::SemanticsFlags::kIsSelected));
 
diff --git a/shell/platform/fuchsia/flutter/accessibility_bridge.h b/shell/platform/fuchsia/flutter/accessibility_bridge.h
index 8e3487c0ad492da196e54b8c2b9fa97bf107b5ef..b4bc5948d28f5908bad861d657b96f49416a9684 100644
--- a/shell/platform/fuchsia/flutter/accessibility_bridge.h
+++ b/shell/platform/fuchsia/flutter/accessibility_bridge.h
@@ -10,10 +10,9 @@
 #undef FALSE
 
 #include <fuchsia/accessibility/semantics/cpp/fidl.h>
-#include <fuchsia/sys/cpp/fidl.h>
 #include <fuchsia/ui/gfx/cpp/fidl.h>
 #include <lib/fidl/cpp/binding_set.h>
-#include <lib/sys/inspect/cpp/component.h>
+#include <lib/inspect/component/cpp/component.h>
 #include <zircon/types.h>
 
 #include <memory>
diff --git a/shell/platform/fuchsia/flutter/accessibility_bridge_unittest.cc b/shell/platform/fuchsia/flutter/accessibility_bridge_unittest.cc
index 0afa31ea62d59a8af50e0f3cc66be914b8489b18..fc4d0809e7633f473f0f9a91ff2bc32561afba7f 100644
--- a/shell/platform/fuchsia/flutter/accessibility_bridge_unittest.cc
+++ b/shell/platform/fuchsia/flutter/accessibility_bridge_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "accessibility_bridge.h"
 
+#include <fuchsia/ui/views/cpp/fidl.h>
 #include <lib/async-loop/cpp/loop.h>
 #include <lib/async-loop/default.h>
 #include <lib/async/cpp/executor.h>
@@ -13,7 +14,7 @@
 #include <lib/inspect/cpp/inspector.h>
 #include <lib/inspect/cpp/reader.h>
 #include <lib/sys/cpp/testing/service_directory_provider.h>
-#include <lib/ui/scenic/cpp/view_ref_pair.h>
+#include <lib/zx/eventpair.h>
 #include <zircon/status.h>
 #include <zircon/types.h>
 
@@ -112,7 +113,16 @@ class AccessibilityBridgeTest : public testing::Test {
             [this](int32_t node_id, flutter::SemanticsAction action) {
               accessibility_delegate_.DispatchSemanticsAction(node_id, action);
             };
-    auto [view_ref_control, view_ref] = scenic::ViewRefPair::New();
+
+    fuchsia::ui::views::ViewRefControl view_ref_control;
+    fuchsia::ui::views::ViewRef view_ref;
+    auto status = zx::eventpair::create(
+        /*options*/ 0u, &view_ref_control.reference, &view_ref.reference);
+    ASSERT_EQ(status, ZX_OK);
+    view_ref_control.reference.replace(
+        ZX_DEFAULT_EVENTPAIR_RIGHTS & (~ZX_RIGHT_DUPLICATE),
+        &view_ref_control.reference);
+    view_ref.reference.replace(ZX_RIGHTS_BASIC, &view_ref.reference);
     accessibility_bridge_ =
         std::make_unique<flutter_runner::AccessibilityBridge>(
             std::move(set_semantics_enabled_callback),
@@ -473,6 +483,36 @@ TEST_F(AccessibilityBridgeTest, PopulatesToggledState) {
   EXPECT_FALSE(semantics_manager_.UpdateOverflowed());
 }
 
+TEST_F(AccessibilityBridgeTest, PopulatesEnabledState) {
+  flutter::SemanticsNode node0;
+  node0.id = 0;
+  // HasEnabledState = true
+  // IsEnabled = true
+  node0.flags |= static_cast<int>(flutter::SemanticsFlags::kHasEnabledState);
+  node0.flags |= static_cast<int>(flutter::SemanticsFlags::kIsEnabled);
+  node0.value = "value";
+
+  accessibility_bridge_->AddSemanticsNodeUpdate({{0, node0}}, 1.f);
+  RunLoopUntilIdle();
+
+  EXPECT_EQ(0, semantics_manager_.DeleteCount());
+  EXPECT_EQ(1, semantics_manager_.UpdateCount());
+  EXPECT_EQ(1, semantics_manager_.CommitCount());
+  EXPECT_EQ(1U, semantics_manager_.LastUpdatedNodes().size());
+  const auto& fuchsia_node = semantics_manager_.LastUpdatedNodes().at(0u);
+  EXPECT_EQ(fuchsia_node.node_id(), static_cast<unsigned int>(node0.id));
+  EXPECT_TRUE(fuchsia_node.has_states());
+  const auto& states = fuchsia_node.states();
+  EXPECT_TRUE(states.has_enabled_state());
+  EXPECT_EQ(states.enabled_state(),
+            fuchsia::accessibility::semantics::EnabledState::ENABLED);
+  EXPECT_TRUE(states.has_value());
+  EXPECT_EQ(states.value(), node0.value);
+
+  EXPECT_FALSE(semantics_manager_.DeleteOverflowed());
+  EXPECT_FALSE(semantics_manager_.UpdateOverflowed());
+}
+
 TEST_F(AccessibilityBridgeTest, ApplyViewPixelRatioToRoot) {
   flutter::SemanticsNode node0;
   node0.id = 0;
diff --git a/shell/platform/fuchsia/flutter/build/asset_package.py b/shell/platform/fuchsia/flutter/build/asset_package.py
index 89470a6c14863d622b7d9e10f2e1cc13ccc580d3..12e1c37db2073079b1c3e18eeb5d661bc809d891 100755
--- a/shell/platform/fuchsia/flutter/build/asset_package.py
+++ b/shell/platform/fuchsia/flutter/build/asset_package.py
@@ -13,34 +13,17 @@ import sys
 def main():
   parser = argparse.ArgumentParser(description='Package a Flutter application')
 
+  parser.add_argument('--flutter-root', type=str, required=True, help='The root of the Flutter SDK')
   parser.add_argument(
-      '--flutter-root',
-      type=str,
-      required=True,
-      help='The root of the Flutter SDK'
-  )
-  parser.add_argument(
-      '--flutter-tools',
-      type=str,
-      required=True,
-      help='The executable for the Flutter tool'
+      '--flutter-tools', type=str, required=True, help='The executable for the Flutter tool'
   )
   parser.add_argument(
-      '--asset-dir',
-      type=str,
-      required=True,
-      help='The directory where to put intermediate files'
-  )
-  parser.add_argument(
-      '--app-dir', type=str, required=True, help='The root of the app'
-  )
-  parser.add_argument(
-      '--packages', type=str, required=True, help='The package map to use'
+      '--asset-dir', type=str, required=True, help='The directory where to put intermediate files'
   )
+  parser.add_argument('--app-dir', type=str, required=True, help='The root of the app')
+  parser.add_argument('--packages', type=str, required=True, help='The package map to use')
   parser.add_argument('--manifest', type=str, help='The application manifest')
-  parser.add_argument(
-      '--component-name', type=str, help='The name of the component'
-  )
+  parser.add_argument('--component-name', type=str, help='The name of the component')
   parser.add_argument(
       '--asset-manifest-out',
       type=str,
diff --git a/shell/platform/fuchsia/flutter/build/gen_debug_wrapper_main.py b/shell/platform/fuchsia/flutter/build/gen_debug_wrapper_main.py
index 22bb1ac5d89283b24afde9abd35de9f2ce712af9..11b48b82254d3ded3792fa00679eb639a702c35f 100755
--- a/shell/platform/fuchsia/flutter/build/gen_debug_wrapper_main.py
+++ b/shell/platform/fuchsia/flutter/build/gen_debug_wrapper_main.py
@@ -13,12 +13,8 @@ def main():
   parser = argparse.ArgumentParser(
       sys.argv[0], description="Generate main file for Fuchsia dart test"
   )
-  parser.add_argument(
-      "--out", help="Path to .dart file to generate", required=True
-  )
-  parser.add_argument(
-      "--main-dart", help="Path to main.dart file to import", required=True
-  )
+  parser.add_argument("--out", help="Path to .dart file to generate", required=True)
+  parser.add_argument("--main-dart", help="Path to main.dart file to import", required=True)
   args = parser.parse_args()
   out_dir = os.path.dirname(args.out)
   assert os.path.isfile(os.path.join(os.path.dirname(args.out), args.main_dart))
diff --git a/shell/common/canvas_spy.cc b/shell/platform/fuchsia/flutter/canvas_spy.cc
similarity index 97%
rename from shell/common/canvas_spy.cc
rename to shell/platform/fuchsia/flutter/canvas_spy.cc
index 592b686b206284da41e6a67f53f139e40b3e77f7..75df63a9069eba114011ae1693ddec38e93966c3 100644
--- a/shell/common/canvas_spy.cc
+++ b/shell/platform/fuchsia/flutter/canvas_spy.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/common/canvas_spy.h"
+#include "flutter/shell/platform/fuchsia/flutter/canvas_spy.h"
 
 namespace flutter {
 
@@ -14,12 +14,17 @@ CanvasSpy::CanvasSpy(SkCanvas* target_canvas) {
                                                      canvas_size.height());
   n_way_canvas_->addCanvas(target_canvas);
   n_way_canvas_->addCanvas(did_draw_canvas_.get());
+  adapter_.set_canvas(n_way_canvas_.get());
 }
 
-SkCanvas* CanvasSpy::GetSpyingCanvas() {
-  return n_way_canvas_.get();
+DlCanvas* CanvasSpy::GetSpyingCanvas() {
+  return &adapter_;
 }
 
+SkCanvas* CanvasSpy::GetRawSpyingCanvas() {
+  return n_way_canvas_.get();
+};
+
 DidDrawCanvas::DidDrawCanvas(int width, int height)
     : SkCanvasVirtualEnforcer<SkNoDrawCanvas>(width, height) {}
 
@@ -262,6 +267,4 @@ void DidDrawCanvas::onDrawEdgeAAImageSet2(const ImageSetEntry set[],
   did_draw_ = true;
 }
 
-void DidDrawCanvas::onFlush() {}
-
 }  // namespace flutter
diff --git a/shell/common/canvas_spy.h b/shell/platform/fuchsia/flutter/canvas_spy.h
similarity index 94%
rename from shell/common/canvas_spy.h
rename to shell/platform/fuchsia/flutter/canvas_spy.h
index ed9b5e0728c98021339d4b0d11847215aaa11fbe..fa781cbcb3861b4e30782a06e3a9470c0976a0af 100644
--- a/shell/common/canvas_spy.h
+++ b/shell/platform/fuchsia/flutter/canvas_spy.h
@@ -3,14 +3,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
+#include "flutter/display_list/skia/dl_sk_canvas.h"
 #include "flutter/fml/macros.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkCanvasVirtualEnforcer.h"
 #include "third_party/skia/include/utils/SkNWayCanvas.h"
 #include "third_party/skia/include/utils/SkNoDrawCanvas.h"
 
-#ifndef FLUTTER_SHELL_COMMON_CANVAS_SPY_H_
-#define FLUTTER_SHELL_COMMON_CANVAS_SPY_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_CANVAS_SPY_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_CANVAS_SPY_H_
 
 namespace flutter {
 
@@ -39,11 +40,17 @@ class CanvasSpy {
   /// @brief      The returned canvas delegate all operations to the target
   /// canvas
   ///             while spying on them.
-  SkCanvas* GetSpyingCanvas();
+  DlCanvas* GetSpyingCanvas();
+
+  //----------------------------------------------------------------------------
+  /// @brief      The underlying Skia canvas that implements the spying
+  ///             (mainly for testing)
+  SkCanvas* GetRawSpyingCanvas();
 
  private:
   std::unique_ptr<SkNWayCanvas> n_way_canvas_;
   std::unique_ptr<DidDrawCanvas> did_draw_canvas_;
+  DlSkCanvasAdapter adapter_;
 
   FML_DISALLOW_COPY_AND_ASSIGN(CanvasSpy);
 };
@@ -241,9 +248,6 @@ class DidDrawCanvas final : public SkCanvasVirtualEnforcer<SkNoDrawCanvas> {
                              const SkPaint*,
                              SrcRectConstraint) override;
 
-  // |SkCanvasVirtualEnforcer<SkNoDrawCanvas>|
-  void onFlush() override;
-
   void MarkDrawIfNonTransparentPaint(const SkPaint& paint);
 
   FML_DISALLOW_COPY_AND_ASSIGN(DidDrawCanvas);
@@ -251,4 +255,4 @@ class DidDrawCanvas final : public SkCanvasVirtualEnforcer<SkNoDrawCanvas> {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_COMMON_SKIA_EVENT_TRACER_IMPL_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_CANVAS_SPY_H_
diff --git a/shell/common/canvas_spy_unittests.cc b/shell/platform/fuchsia/flutter/canvas_spy_unittests.cc
similarity index 80%
rename from shell/common/canvas_spy_unittests.cc
rename to shell/platform/fuchsia/flutter/canvas_spy_unittests.cc
index e499666c47c489961ada9fb49f09caecaa61969b..80726fa047e282884c2c89069288133d977a1ae9 100644
--- a/shell/common/canvas_spy_unittests.cc
+++ b/shell/platform/fuchsia/flutter/canvas_spy_unittests.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "canvas_spy.h"
+#include "flutter/shell/platform/fuchsia/flutter/canvas_spy.h"
 
 #include "gtest/gtest.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
@@ -15,30 +15,30 @@ TEST(CanvasSpyTest, DrawingIsTracked) {
   SkPictureRecorder picture_recorder;
   SkCanvas* canvas = picture_recorder.beginRecording(100, 100);
   CanvasSpy canvas_spy = CanvasSpy(canvas);
-  SkCanvas* spy = canvas_spy.GetSpyingCanvas();
+  DlCanvas* spy = canvas_spy.GetSpyingCanvas();
 
   ASSERT_FALSE(canvas_spy.DidDrawIntoCanvas());
 
-  spy->translate(128, 128);
-  spy->clear(SK_ColorTRANSPARENT);
+  spy->Translate(128, 128);
+  spy->Clear(DlColor::kTransparent());
   ASSERT_FALSE(canvas_spy.DidDrawIntoCanvas());
 
-  SkPaint paint;
-  spy->drawCircle(0, 0, 60, paint);
+  DlPaint paint;
+  spy->DrawCircle({0, 0}, 60, paint);
   ASSERT_TRUE(canvas_spy.DidDrawIntoCanvas());
 }
 
 TEST(CanvasSpyTest, SpiedCanvasIsDrawing) {
   auto actual_surface =
-      SkSurface::MakeRaster(SkImageInfo::MakeN32Premul(100, 100));
+      SkSurfaces::Raster(SkImageInfo::MakeN32Premul(100, 100));
   SkCanvas* actual_canvas = actual_surface->getCanvas();
 
   auto expected_surface =
-      SkSurface::MakeRaster(SkImageInfo::MakeN32Premul(100, 100));
+      SkSurfaces::Raster(SkImageInfo::MakeN32Premul(100, 100));
   SkCanvas* expected_canvas = expected_surface->getCanvas();
 
   CanvasSpy canvas_spy = CanvasSpy(actual_canvas);
-  SkCanvas* spy = canvas_spy.GetSpyingCanvas();
+  SkCanvas* spy = canvas_spy.GetRawSpyingCanvas();
 
   SkNWayCanvas multi_canvas = SkNWayCanvas(100, 100);
   multi_canvas.addCanvas(spy);
diff --git a/shell/platform/fuchsia/flutter/component_v1.cc b/shell/platform/fuchsia/flutter/component_v1.cc
deleted file mode 100644
index bc58d846538f938a916a1bfc8af3035663f290a9..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/flutter/component_v1.cc
+++ /dev/null
@@ -1,603 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "component_v1.h"
-
-#include <dlfcn.h>
-#include <fuchsia/mem/cpp/fidl.h>
-#include <lib/async-loop/cpp/loop.h>
-#include <lib/async/cpp/task.h>
-#include <lib/async/default.h>
-#include <lib/fdio/directory.h>
-#include <lib/fdio/io.h>
-#include <lib/fdio/namespace.h>
-#include <lib/ui/scenic/cpp/view_ref_pair.h>
-#include <lib/ui/scenic/cpp/view_token_pair.h>
-#include <lib/vfs/cpp/composed_service_dir.h>
-#include <lib/vfs/cpp/remote_dir.h>
-#include <lib/vfs/cpp/service.h>
-#include <sys/stat.h>
-#include <zircon/dlfcn.h>
-#include <zircon/status.h>
-#include <zircon/types.h>
-
-#include <memory>
-#include <regex>
-#include <sstream>
-
-#include "file_in_namespace_buffer.h"
-#include "flutter/fml/mapping.h"
-#include "flutter/fml/platform/fuchsia/task_observers.h"
-#include "flutter/fml/synchronization/waitable_event.h"
-#include "flutter/fml/unique_fd.h"
-#include "flutter/runtime/dart_vm_lifecycle.h"
-#include "flutter/shell/common/switches.h"
-#include "runtime/dart/utils/files.h"
-#include "runtime/dart/utils/handle_exception.h"
-#include "runtime/dart/utils/mapped_resource.h"
-#include "runtime/dart/utils/tempfs.h"
-#include "runtime/dart/utils/vmo.h"
-
-namespace flutter_runner {
-namespace {
-
-constexpr char kDataKey[] = "data";
-constexpr char kAssetsKey[] = "assets";
-constexpr char kOldGenHeapSizeKey[] = "old_gen_heap_size";
-
-constexpr char kTmpPath[] = "/tmp";
-constexpr char kServiceRootPath[] = "/svc";
-constexpr char kRunnerConfigPath[] = "/config/data/flutter_runner_config";
-
-std::string DebugLabelForUrl(const std::string& url) {
-  auto found = url.rfind("/");
-  if (found == std::string::npos) {
-    return url;
-  } else {
-    return {url, found + 1};
-  }
-}
-
-}  // namespace
-
-ProgramMetadata ComponentV1::ParseProgramMetadata(
-    const fidl::VectorPtr<fuchsia::sys::ProgramMetadata>& program_metadata) {
-  ProgramMetadata result;
-  if (!program_metadata.has_value()) {
-    return result;
-  }
-
-  for (const auto& pg : *program_metadata) {
-    if (pg.key.compare(kDataKey) == 0) {
-      result.data_path = "pkg/" + pg.value;
-    } else if (pg.key.compare(kAssetsKey) == 0) {
-      result.assets_path = "pkg/" + pg.value;
-    } else if (pg.key.compare(kOldGenHeapSizeKey) == 0) {
-      int64_t specified_old_gen_heap_size =
-          strtol(pg.value.c_str(), nullptr /* endptr */, 10 /* base */);
-      if (specified_old_gen_heap_size != 0) {
-        result.old_gen_heap_size = specified_old_gen_heap_size;
-      } else {
-        FML_LOG(ERROR) << "Invalid old_gen_heap_size: " << pg.value;
-      }
-    }
-  }
-
-  // assets_path defaults to the same as data_path if omitted.
-  if (result.assets_path.empty()) {
-    result.assets_path = result.data_path;
-  }
-
-  return result;
-}
-
-ActiveComponentV1 ComponentV1::Create(
-    TerminationCallback termination_callback,
-    fuchsia::sys::Package package,
-    fuchsia::sys::StartupInfo startup_info,
-    std::shared_ptr<sys::ServiceDirectory> runner_incoming_services,
-    fidl::InterfaceRequest<fuchsia::sys::ComponentController> controller) {
-  auto thread = std::make_unique<fml::Thread>();
-  std::unique_ptr<ComponentV1> component;
-
-  fml::AutoResetWaitableEvent latch;
-  thread->GetTaskRunner()->PostTask([&]() mutable {
-    component.reset(new ComponentV1(std::move(termination_callback),
-                                    std::move(package), std::move(startup_info),
-                                    runner_incoming_services,
-                                    std::move(controller)));
-    latch.Signal();
-  });
-
-  latch.Wait();
-  return {.platform_thread = std::move(thread),
-          .component = std::move(component)};
-}
-
-ComponentV1::ComponentV1(
-    TerminationCallback termination_callback,
-    fuchsia::sys::Package package,
-    fuchsia::sys::StartupInfo startup_info,
-    std::shared_ptr<sys::ServiceDirectory> runner_incoming_services,
-    fidl::InterfaceRequest<fuchsia::sys::ComponentController>
-        component_controller_request)
-    : termination_callback_(std::move(termination_callback)),
-      debug_label_(DebugLabelForUrl(startup_info.launch_info.url)),
-      component_controller_(this),
-      outgoing_dir_(new vfs::PseudoDir()),
-      runner_incoming_services_(runner_incoming_services),
-      weak_factory_(this) {
-  component_controller_.set_error_handler(
-      [this](zx_status_t status) { Kill(); });
-
-  FML_DCHECK(fdio_ns_.is_valid());
-  // LaunchInfo::url non-optional.
-  auto& launch_info = startup_info.launch_info;
-
-  // LaunchInfo::arguments optional.
-  if (auto& arguments = launch_info.arguments) {
-    dart_entrypoint_args_ = arguments.value();
-  }
-
-  const ProgramMetadata metadata =
-      ParseProgramMetadata(startup_info.program_metadata);
-
-  if (metadata.data_path.empty()) {
-    FML_LOG(ERROR) << "Could not find a /pkg/data directory for "
-                   << package.resolved_url;
-    return;
-  }
-
-  // Setup /tmp to be mapped to the process-local memfs.
-  dart_utils::RunnerTemp::SetupComponent(fdio_ns_.get());
-
-  // LaunchInfo::flat_namespace optional.
-  for (size_t i = 0; i < startup_info.flat_namespace.paths.size(); ++i) {
-    const auto& path = startup_info.flat_namespace.paths.at(i);
-    if (path == kTmpPath) {
-      continue;
-    }
-
-    fidl::InterfaceHandle<fuchsia::io::Directory> dir;
-    if (path == kServiceRootPath) {
-      svc_ = std::make_unique<sys::ServiceDirectory>(
-          std::move(startup_info.flat_namespace.directories.at(i)));
-      dir = svc_->CloneChannel();
-    } else {
-      dir = std::move(startup_info.flat_namespace.directories.at(i));
-    }
-
-    zx_handle_t dir_handle = dir.TakeChannel().release();
-    if (fdio_ns_bind(fdio_ns_.get(), path.data(), dir_handle) != ZX_OK) {
-      FML_LOG(ERROR) << "Could not bind path to namespace: " << path;
-      zx_handle_close(dir_handle);
-    }
-  }
-
-  {
-    fml::UniqueFD ns_fd(fdio_ns_opendir(fdio_ns_.get()));
-    FML_DCHECK(ns_fd.is_valid());
-
-    constexpr mode_t mode = O_RDONLY | O_DIRECTORY;
-
-    component_assets_directory_.reset(
-        openat(ns_fd.get(), metadata.assets_path.c_str(), mode));
-    FML_DCHECK(component_assets_directory_.is_valid());
-
-    component_data_directory_.reset(
-        openat(ns_fd.get(), metadata.data_path.c_str(), mode));
-    FML_DCHECK(component_data_directory_.is_valid());
-  }
-
-  // TODO: LaunchInfo::out.
-
-  // TODO: LaunchInfo::err.
-
-  // LaunchInfo::service_request optional.
-  if (launch_info.directory_request) {
-    outgoing_dir_->Serve(fuchsia::io::OpenFlags::RIGHT_READABLE |
-                             fuchsia::io::OpenFlags::RIGHT_WRITABLE |
-                             fuchsia::io::OpenFlags::DIRECTORY,
-                         launch_info.directory_request.TakeChannel());
-  }
-
-  directory_request_ = directory_ptr_.NewRequest();
-
-  fuchsia::io::DirectoryHandle flutter_public_dir;
-  // TODO(anmittal): when fixing enumeration using new c++ vfs, make sure that
-  // flutter_public_dir is only accessed once we receive OnOpen Event.
-  // That will prevent FL-175 for public directory
-  auto request = flutter_public_dir.NewRequest().TakeChannel();
-  fdio_service_connect_at(directory_ptr_.channel().get(), "svc",
-                          request.release());
-
-  auto composed_service_dir = std::make_unique<vfs::ComposedServiceDir>();
-  composed_service_dir->set_fallback(std::move(flutter_public_dir));
-
-  // Clone and check if client is servicing the directory.
-  directory_ptr_->Clone(fuchsia::io::OpenFlags::DESCRIBE |
-                            fuchsia::io::OpenFlags::RIGHT_READABLE |
-                            fuchsia::io::OpenFlags::RIGHT_WRITABLE,
-                        cloned_directory_ptr_.NewRequest());
-
-  cloned_directory_ptr_.events().OnOpen = [this](zx_status_t status,
-                                                 auto unused) {
-    cloned_directory_ptr_.Unbind();
-    if (status != ZX_OK) {
-      FML_LOG(ERROR) << "could not bind out directory for flutter component("
-                     << debug_label_ << "): " << zx_status_get_string(status);
-      return;
-    }
-    const char* other_dirs[] = {"debug", "ctrl", "diagnostics"};
-    // add other directories as RemoteDirs.
-    for (auto& dir_str : other_dirs) {
-      fuchsia::io::DirectoryHandle dir;
-      auto request = dir.NewRequest().TakeChannel();
-      auto status = fdio_service_connect_at(directory_ptr_.channel().get(),
-                                            dir_str, request.release());
-      if (status == ZX_OK) {
-        outgoing_dir_->AddEntry(
-            dir_str, std::make_unique<vfs::RemoteDir>(dir.TakeChannel()));
-      } else {
-        FML_LOG(ERROR) << "could not add out directory entry(" << dir_str
-                       << ") for flutter component(" << debug_label_
-                       << "): " << zx_status_get_string(status);
-      }
-    }
-  };
-
-  cloned_directory_ptr_.set_error_handler(
-      [this](zx_status_t status) { cloned_directory_ptr_.Unbind(); });
-
-  // TODO: LaunchInfo::additional_services optional.
-
-  // All launch arguments have been read. Perform service binding and
-  // final settings configuration. The next call will be to create a view
-  // for this component.
-  composed_service_dir->AddService(
-      fuchsia::ui::app::ViewProvider::Name_,
-      std::make_unique<vfs::Service>(
-          [this](zx::channel channel, async_dispatcher_t* dispatcher) {
-            shells_bindings_.AddBinding(
-                this, fidl::InterfaceRequest<fuchsia::ui::app::ViewProvider>(
-                          std::move(channel)));
-          }));
-
-  outgoing_dir_->AddEntry("svc", std::move(composed_service_dir));
-
-  // Setup the component controller binding.
-  if (component_controller_request) {
-    component_controller_.Bind(std::move(component_controller_request));
-  }
-
-  // Load and use runner-specific configuration, if it exists.
-  std::string json_string;
-  if (dart_utils::ReadFileToString(kRunnerConfigPath, &json_string)) {
-    product_config_ = FlutterRunnerProductConfiguration(json_string);
-    FML_LOG(INFO) << "Successfully loaded runner configuration: "
-                  << json_string;
-  } else {
-    FML_LOG(WARNING) << "Failed to load runner configuration from "
-                     << kRunnerConfigPath << "; using default config values.";
-  }
-
-  // Load VM and component bytecode.
-  // For AOT, compare with flutter_aot_app in flutter_app.gni.
-  // For JIT, compare flutter_jit_runner in BUILD.gn.
-  if (flutter::DartVM::IsRunningPrecompiledCode()) {
-    std::shared_ptr<dart_utils::ElfSnapshot> snapshot =
-        std::make_shared<dart_utils::ElfSnapshot>();
-    if (snapshot->Load(component_data_directory_.get(),
-                       "app_aot_snapshot.so")) {
-      const uint8_t* isolate_data = snapshot->IsolateData();
-      const uint8_t* isolate_instructions = snapshot->IsolateInstrs();
-      const uint8_t* vm_data = snapshot->VmData();
-      const uint8_t* vm_instructions = snapshot->VmInstrs();
-      if (isolate_data == nullptr || isolate_instructions == nullptr ||
-          vm_data == nullptr || vm_instructions == nullptr) {
-        FML_LOG(FATAL) << "ELF snapshot missing AOT symbols.";
-        return;
-      }
-      auto hold_snapshot = [snapshot](const uint8_t* _, size_t __) {};
-      settings_.vm_snapshot_data = [hold_snapshot, vm_data]() {
-        return std::make_unique<fml::NonOwnedMapping>(vm_data, 0, hold_snapshot,
-                                                      true /* dontneed_safe */);
-      };
-      settings_.vm_snapshot_instr = [hold_snapshot, vm_instructions]() {
-        return std::make_unique<fml::NonOwnedMapping>(
-            vm_instructions, 0, hold_snapshot, true /* dontneed_safe */);
-      };
-      settings_.isolate_snapshot_data = [hold_snapshot, isolate_data]() {
-        return std::make_unique<fml::NonOwnedMapping>(
-            isolate_data, 0, hold_snapshot, true /* dontneed_safe */);
-      };
-      settings_.isolate_snapshot_instr = [hold_snapshot,
-                                          isolate_instructions]() {
-        return std::make_unique<fml::NonOwnedMapping>(
-            isolate_instructions, 0, hold_snapshot, true /* dontneed_safe */);
-      };
-      isolate_snapshot_ = fml::MakeRefCounted<flutter::DartSnapshot>(
-          std::make_shared<fml::NonOwnedMapping>(isolate_data, 0, hold_snapshot,
-                                                 true /* dontneed_safe */),
-          std::make_shared<fml::NonOwnedMapping>(isolate_instructions, 0,
-                                                 hold_snapshot,
-                                                 true /* dontneed_safe */));
-    } else {
-      const int namespace_fd = component_data_directory_.get();
-      settings_.vm_snapshot_data = [namespace_fd]() {
-        return LoadFile(namespace_fd, "vm_snapshot_data.bin",
-                        false /* executable */);
-      };
-      settings_.vm_snapshot_instr = [namespace_fd]() {
-        return LoadFile(namespace_fd, "vm_snapshot_instructions.bin",
-                        true /* executable */);
-      };
-      settings_.isolate_snapshot_data = [namespace_fd]() {
-        return LoadFile(namespace_fd, "isolate_snapshot_data.bin",
-                        false /* executable */);
-      };
-      settings_.isolate_snapshot_instr = [namespace_fd]() {
-        return LoadFile(namespace_fd, "isolate_snapshot_instructions.bin",
-                        true /* executable */);
-      };
-    }
-  } else {
-    settings_.vm_snapshot_data = []() {
-      return MakeFileMapping("/pkg/data/vm_snapshot_data.bin",
-                             false /* executable */);
-    };
-    settings_.vm_snapshot_instr = []() {
-      return MakeFileMapping("/pkg/data/vm_snapshot_instructions.bin",
-                             true /* executable */);
-    };
-
-    settings_.isolate_snapshot_data = []() {
-      return MakeFileMapping("/pkg/data/isolate_core_snapshot_data.bin",
-                             false /* executable */);
-    };
-    settings_.isolate_snapshot_instr = [] {
-      return MakeFileMapping("/pkg/data/isolate_core_snapshot_instructions.bin",
-                             true /* executable */);
-    };
-  }
-
-#if defined(DART_PRODUCT)
-  settings_.enable_observatory = false;
-#else
-  settings_.enable_observatory = true;
-
-  // TODO(cbracken): pass this in as a param to allow 0.0.0.0, ::1, etc.
-  settings_.observatory_host = "127.0.0.1";
-#endif
-
-  // Controls whether category "skia" trace events are enabled.
-  settings_.trace_skia = true;
-
-  settings_.verbose_logging = true;
-
-  settings_.advisory_script_uri = debug_label_;
-
-  settings_.advisory_script_entrypoint = debug_label_;
-
-  settings_.icu_data_path = "";
-
-  settings_.assets_dir = component_assets_directory_.get();
-
-  // Compare flutter_jit_app in flutter_app.gni.
-  settings_.application_kernel_list_asset = "app.dilplist";
-
-  settings_.log_tag = debug_label_ + std::string{"(flutter)"};
-
-  if (metadata.old_gen_heap_size.has_value()) {
-    settings_.old_gen_heap_size = *metadata.old_gen_heap_size;
-  }
-
-  // No asserts in debug or release product.
-  // No asserts in release with flutter_profile=true (non-product)
-  // Yes asserts in non-product debug.
-#if !defined(DART_PRODUCT) && (!defined(FLUTTER_PROFILE) || !defined(NDEBUG))
-  // Debug mode
-  settings_.disable_dart_asserts = false;
-#else
-  // Release mode
-  settings_.disable_dart_asserts = true;
-#endif
-
-  // Do not leak the VM; allow it to shut down normally when the last shell
-  // terminates.
-  settings_.leak_vm = false;
-
-  settings_.task_observer_add =
-      std::bind(&fml::CurrentMessageLoopAddAfterTaskObserver,
-                std::placeholders::_1, std::placeholders::_2);
-
-  settings_.task_observer_remove = std::bind(
-      &fml::CurrentMessageLoopRemoveAfterTaskObserver, std::placeholders::_1);
-
-  settings_.log_message_callback = [](const std::string& tag,
-                                      const std::string& message) {
-    if (!tag.empty()) {
-      std::cout << tag << ": ";
-    }
-    std::cout << message << std::endl;
-  };
-
-  settings_.dart_flags = {};
-
-  // Don't collect CPU samples from Dart VM C++ code.
-  settings_.dart_flags.push_back("--no_profile_vm");
-
-  // Scale back CPU profiler sampling period on ARM64 to avoid overloading
-  // the tracing engine.
-#if defined(__aarch64__)
-  settings_.dart_flags.push_back("--profile_period=10000");
-#endif  // defined(__aarch64__)
-
-  auto platform_task_runner = fml::MessageLoop::GetCurrent().GetTaskRunner();
-  const std::string component_url = package.resolved_url;
-  settings_.unhandled_exception_callback = [weak = weak_factory_.GetWeakPtr(),
-                                            platform_task_runner,
-                                            runner_incoming_services,
-                                            component_url](
-                                               const std::string& error,
-                                               const std::string& stack_trace) {
-    if (weak) {
-      // TODO(cbracken): unsafe. The above check and the PostTask below are
-      // happening on the UI thread. If the Component dtor and thread
-      // termination happen (on the platform thread) between the previous
-      // line and the next line, a crash will occur since we'll be posting
-      // to a dead thread. See Runner::OnComponentV1Terminate() in
-      // runner.cc.
-      platform_task_runner->PostTask([weak, runner_incoming_services,
-                                      component_url, error, stack_trace]() {
-        if (weak) {
-          dart_utils::HandleException(runner_incoming_services, component_url,
-                                      error, stack_trace);
-        } else {
-          FML_LOG(WARNING)
-              << "Exception was thrown which was not caught in Flutter app: "
-              << error;
-        }
-      });
-    } else {
-      FML_LOG(WARNING)
-          << "Exception was thrown which was not caught in Flutter app: "
-          << error;
-    }
-    // Ideally we would return whether HandleException returned ZX_OK, but
-    // short of knowing if the exception was correctly handled, we return
-    // false to have the error and stack trace printed in the logs.
-    return false;
-  };
-}
-
-ComponentV1::~ComponentV1() = default;
-
-const std::string& ComponentV1::GetDebugLabel() const {
-  return debug_label_;
-}
-
-void ComponentV1::Kill() {
-  component_controller_.events().OnTerminated(
-      last_return_code_.second, fuchsia::sys::TerminationReason::EXITED);
-
-  termination_callback_(this);
-  // WARNING: Don't do anything past this point as this instance may have been
-  // collected.
-}
-
-void ComponentV1::Detach() {
-  component_controller_.set_error_handler(nullptr);
-}
-
-void ComponentV1::OnEngineTerminate(const Engine* shell_holder) {
-  auto found = std::find_if(shell_holders_.begin(), shell_holders_.end(),
-                            [shell_holder](const auto& holder) {
-                              return holder.get() == shell_holder;
-                            });
-
-  if (found == shell_holders_.end()) {
-    // This indicates a deeper issue with memory management and should never
-    // happen.
-    FML_LOG(ERROR) << "Tried to terminate an unregistered shell holder.";
-    FML_DCHECK(false);
-
-    return;
-  }
-
-  // We may launch multiple shell in this component. However, we will
-  // terminate when the last shell goes away. The error code return to the
-  // component controller will be the last isolate that had an error.
-  auto return_code = shell_holder->GetEngineReturnCode();
-  if (return_code.has_value()) {
-    last_return_code_ = {true, return_code.value()};
-  } else {
-    FML_LOG(ERROR) << "Failed to get return code from terminated shell holder.";
-  }
-
-  shell_holders_.erase(found);
-
-  if (shell_holders_.empty()) {
-    FML_VLOG(-1) << "Killing component because all shell holders have been "
-                    "terminated.";
-    Kill();
-    // WARNING: Don't do anything past this point because the delegate may have
-    // collected this instance via the termination callback.
-  }
-}
-
-void ComponentV1::CreateView(
-    zx::eventpair token,
-    fidl::InterfaceRequest<fuchsia::sys::ServiceProvider> /*incoming_services*/,
-    fidl::InterfaceHandle<
-        fuchsia::sys::ServiceProvider> /*outgoing_services*/) {
-  auto view_ref_pair = scenic::ViewRefPair::New();
-  CreateViewWithViewRef(std::move(token), std::move(view_ref_pair.control_ref),
-                        std::move(view_ref_pair.view_ref));
-}
-
-void ComponentV1::CreateViewWithViewRef(
-    zx::eventpair view_token,
-    fuchsia::ui::views::ViewRefControl control_ref,
-    fuchsia::ui::views::ViewRef view_ref) {
-  if (!svc_) {
-    FML_LOG(ERROR)
-        << "Component incoming services was invalid when attempting to "
-           "create a shell for a view provider request.";
-    return;
-  }
-
-  shell_holders_.emplace(std::make_unique<Engine>(
-      *this,                      // delegate
-      debug_label_,               // thread label
-      svc_,                       // Component incoming services
-      runner_incoming_services_,  // Runner incoming services
-      settings_,                  // settings
-      scenic::ToViewToken(std::move(view_token)),  // view token
-      scenic::ViewRefPair{
-          .control_ref = std::move(control_ref),
-          .view_ref = std::move(view_ref),
-      },
-      std::move(fdio_ns_),            // FDIO namespace
-      std::move(directory_request_),  // outgoing request
-      product_config_,                // product configuration
-      dart_entrypoint_args_,          // dart entrypoint args
-      true                            // v1 component
-      ));
-}
-
-void ComponentV1::CreateView2(fuchsia::ui::app::CreateView2Args view_args) {
-  if (!svc_) {
-    FML_LOG(ERROR)
-        << "Component incoming services was invalid when attempting to "
-           "create a shell for a view provider request.";
-    return;
-  }
-
-  shell_holders_.emplace(std::make_unique<Engine>(
-      *this,                      // delegate
-      debug_label_,               // thread label
-      svc_,                       // Component incoming services
-      runner_incoming_services_,  // Runner incoming services
-      settings_,                  // settings
-      std::move(
-          *view_args.mutable_view_creation_token()),  // view creation token
-      scenic::ViewRefPair::New(),                     // view ref pair
-      std::move(fdio_ns_),                            // FDIO namespace
-      std::move(directory_request_),                  // outgoing request
-      product_config_,                                // product configuration
-      dart_entrypoint_args_,                          // dart entrypoint args
-      true                                            // v1 component
-      ));
-}
-
-#if !defined(DART_PRODUCT)
-void ComponentV1::WriteProfileToTrace() const {
-  for (const auto& engine : shell_holders_) {
-    engine->WriteProfileToTrace();
-  }
-}
-#endif  // !defined(DART_PRODUCT)
-
-}  // namespace flutter_runner
diff --git a/shell/platform/fuchsia/flutter/component_v1.h b/shell/platform/fuchsia/flutter/component_v1.h
deleted file mode 100644
index efdc2a338428d8ee95fb2354d601b69aa5a759c4..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/flutter/component_v1.h
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_COMPONENT_V1_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_COMPONENT_V1_H_
-
-#include <array>
-#include <memory>
-#include <set>
-
-#include <fuchsia/io/cpp/fidl.h>
-#include <fuchsia/sys/cpp/fidl.h>
-#include <fuchsia/ui/app/cpp/fidl.h>
-#include <lib/async-loop/cpp/loop.h>
-#include <lib/async/default.h>
-#include <lib/fidl/cpp/binding_set.h>
-#include <lib/fidl/cpp/interface_request.h>
-#include <lib/fit/function.h>
-#include <lib/sys/cpp/service_directory.h>
-#include <lib/vfs/cpp/pseudo_dir.h>
-#include <lib/zx/eventpair.h>
-
-#include "flutter/common/settings.h"
-#include "flutter/fml/macros.h"
-
-#include "engine.h"
-#include "flutter_runner_product_configuration.h"
-#include "program_metadata.h"
-#include "unique_fdio_ns.h"
-
-namespace flutter_runner {
-
-class ComponentV1;
-
-struct ActiveComponentV1 {
-  std::unique_ptr<fml::Thread> platform_thread;
-  std::unique_ptr<ComponentV1> component;
-
-  ActiveComponentV1& operator=(ActiveComponentV1&& other) noexcept {
-    if (this != &other) {
-      this->platform_thread.reset(other.platform_thread.release());
-      this->component.reset(other.component.release());
-    }
-    return *this;
-  }
-
-  ~ActiveComponentV1() = default;
-};
-
-// Represents an instance of a CF v1 Flutter component that contains one or more
-// Flutter engine instances.
-class ComponentV1 final : public Engine::Delegate,
-                          public fuchsia::sys::ComponentController,
-                          public fuchsia::ui::app::ViewProvider {
- public:
-  using TerminationCallback = fit::function<void(const ComponentV1*)>;
-
-  // Creates a dedicated thread to run the component and creates the
-  // component on it. The component can be accessed only on this thread.
-  // This is a synchronous operation.
-  static ActiveComponentV1 Create(
-      TerminationCallback termination_callback,
-      fuchsia::sys::Package package,
-      fuchsia::sys::StartupInfo startup_info,
-      std::shared_ptr<sys::ServiceDirectory> runner_incoming_services,
-      fidl::InterfaceRequest<fuchsia::sys::ComponentController> controller);
-
-  // Must be called on the same thread returned from the create call. The thread
-  // may be collected after.
-  ~ComponentV1();
-
-  static ProgramMetadata ParseProgramMetadata(
-      const fidl::VectorPtr<fuchsia::sys::ProgramMetadata>& program_metadata);
-
-  const std::string& GetDebugLabel() const;
-
-#if !defined(DART_PRODUCT)
-  void WriteProfileToTrace() const;
-#endif  // !defined(DART_PRODUCT)
-
- private:
-  ComponentV1(
-      TerminationCallback termination_callback,
-      fuchsia::sys::Package package,
-      fuchsia::sys::StartupInfo startup_info,
-      std::shared_ptr<sys::ServiceDirectory> runner_incoming_services,
-      fidl::InterfaceRequest<fuchsia::sys::ComponentController> controller);
-
-  // |fuchsia::sys::ComponentController|
-  void Kill() override;
-
-  // |fuchsia::sys::ComponentController|
-  void Detach() override;
-
-  // |fuchsia::ui::app::ViewProvider|
-  void CreateView(
-      zx::eventpair token,
-      fidl::InterfaceRequest<fuchsia::sys::ServiceProvider> incoming_services,
-      fuchsia::sys::ServiceProviderHandle outgoing_services) override;
-
-  // |fuchsia::ui::app::ViewProvider|
-  void CreateViewWithViewRef(zx::eventpair view_token,
-                             fuchsia::ui::views::ViewRefControl control_ref,
-                             fuchsia::ui::views::ViewRef view_ref) override;
-
-  // |fuchsia::ui::app::ViewProvider|
-  void CreateView2(fuchsia::ui::app::CreateView2Args view_args) override;
-
-  // |flutter::Engine::Delegate|
-  void OnEngineTerminate(const Engine* holder) override;
-
-  flutter::Settings settings_;
-  FlutterRunnerProductConfiguration product_config_;
-  TerminationCallback termination_callback_;
-  const std::string debug_label_;
-  UniqueFDIONS fdio_ns_ = UniqueFDIONSCreate();
-  fml::UniqueFD component_data_directory_;
-  fml::UniqueFD component_assets_directory_;
-
-  fidl::Binding<fuchsia::sys::ComponentController> component_controller_;
-  fuchsia::io::DirectoryPtr directory_ptr_;
-  fuchsia::io::NodePtr cloned_directory_ptr_;
-  fidl::InterfaceRequest<fuchsia::io::Directory> directory_request_;
-  std::unique_ptr<vfs::PseudoDir> outgoing_dir_;
-  std::shared_ptr<sys::ServiceDirectory> svc_;
-  std::shared_ptr<sys::ServiceDirectory> runner_incoming_services_;
-  fidl::BindingSet<fuchsia::ui::app::ViewProvider> shells_bindings_;
-
-  fml::RefPtr<flutter::DartSnapshot> isolate_snapshot_;
-  std::set<std::unique_ptr<Engine>> shell_holders_;
-  std::pair<bool, uint32_t> last_return_code_;
-  std::vector<std::string> dart_entrypoint_args_;
-  fml::WeakPtrFactory<ComponentV1> weak_factory_;  // Must be the last member.
-  FML_DISALLOW_COPY_AND_ASSIGN(ComponentV1);
-};
-
-}  // namespace flutter_runner
-
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_COMPONENT_V1_H_
diff --git a/shell/platform/fuchsia/flutter/component_v1_unittest.cc b/shell/platform/fuchsia/flutter/component_v1_unittest.cc
deleted file mode 100644
index c9abaccdc6e6547f3519071b820c30f95a211d45..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/flutter/component_v1_unittest.cc
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "component_v1.h"
-
-#include <gtest/gtest.h>
-#include <optional>
-
-namespace flutter_runner {
-namespace {
-
-TEST(ComponentV1, ParseProgramMetadata) {
-  // The ProgramMetadata field may be null. We should parse this as if no
-  // fields were specified.
-  ProgramMetadata result = ComponentV1::ParseProgramMetadata(nullptr);
-
-  EXPECT_EQ(result.data_path, "");
-  EXPECT_EQ(result.assets_path, "");
-  EXPECT_EQ(result.old_gen_heap_size, std::nullopt);
-
-  // The ProgramMetadata field may be empty. Treat this the same as null.
-  fidl::VectorPtr<fuchsia::sys::ProgramMetadata> program_metadata(size_t{0});
-  result = ComponentV1::ParseProgramMetadata(program_metadata);
-
-  EXPECT_EQ(result.data_path, "");
-  EXPECT_EQ(result.assets_path, "");
-  EXPECT_EQ(result.old_gen_heap_size, std::nullopt);
-
-  // The assets_path defaults to the "data" value if unspecified.
-  program_metadata = {{"data", "foobar"}};
-  result = ComponentV1::ParseProgramMetadata(program_metadata);
-
-  EXPECT_EQ(result.data_path, "pkg/foobar");
-  EXPECT_EQ(result.assets_path, "pkg/foobar");
-  EXPECT_EQ(result.old_gen_heap_size, std::nullopt);
-
-  // Invalid keys are ignored.
-  program_metadata = {{"not_data", "foo"}, {"data", "bar"}, {"assets", "baz"}};
-  result = ComponentV1::ParseProgramMetadata(program_metadata);
-
-  EXPECT_EQ(result.data_path, "pkg/bar");
-  EXPECT_EQ(result.assets_path, "pkg/baz");
-  EXPECT_EQ(result.old_gen_heap_size, std::nullopt);
-
-  // The old_gen_heap_size can be specified.
-  program_metadata = {{"old_gen_heap_size", "100"}};
-  result = ComponentV1::ParseProgramMetadata(program_metadata);
-
-  EXPECT_EQ(result.data_path, "");
-  EXPECT_EQ(result.assets_path, "");
-  EXPECT_EQ(result.old_gen_heap_size, 100);
-
-  // Invalid old_gen_heap_sizes should be ignored.
-  program_metadata = {{"old_gen_heap_size", "asdf100"}};
-  result = ComponentV1::ParseProgramMetadata(program_metadata);
-
-  EXPECT_EQ(result.data_path, "");
-  EXPECT_EQ(result.assets_path, "");
-  EXPECT_EQ(result.old_gen_heap_size, std::nullopt);
-}
-
-}  // anonymous namespace
-}  // namespace flutter_runner
diff --git a/shell/platform/fuchsia/flutter/component_v2.cc b/shell/platform/fuchsia/flutter/component_v2.cc
index 09fce7e806458169a3c422540a009927ff49b059..98f1f57abfcb48b1e83a2515fc0cc8768eaeccb9 100644
--- a/shell/platform/fuchsia/flutter/component_v2.cc
+++ b/shell/platform/fuchsia/flutter/component_v2.cc
@@ -12,8 +12,6 @@
 #include <lib/fdio/directory.h>
 #include <lib/fdio/io.h>
 #include <lib/fdio/namespace.h>
-#include <lib/ui/scenic/cpp/view_ref_pair.h>
-#include <lib/ui/scenic/cpp/view_token_pair.h>
 #include <lib/vfs/cpp/composed_service_dir.h>
 #include <lib/vfs/cpp/remote_dir.h>
 #include <lib/vfs/cpp/service.h>
@@ -182,14 +180,13 @@ ComponentV2::ComponentV2(
     return;
   }
 
-  // Setup /tmp to be mapped to the process-local memfs.
-  dart_utils::RunnerTemp::SetupComponent(fdio_ns_.get());
+  dart_utils::BindTemp(fdio_ns_.get());
 
   // ComponentStartInfo::ns (optional)
   if (start_info.has_ns()) {
     for (auto& entry : *start_info.mutable_ns()) {
-      // /tmp/ is mapped separately to the process-level memfs, so we ignore it
-      // here.
+      // /tmp/ is mapped separately to to a process-local virtual filesystem,
+      // so we ignore it here.
       const auto& path = entry.path();
       if (path == kTmpPath) {
         continue;
@@ -262,18 +259,22 @@ ComponentV2::ComponentV2(
   fdio_service_connect_at(directory_ptr_.channel().get(), "svc",
                           request.release());
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+
   auto composed_service_dir = std::make_unique<vfs::ComposedServiceDir>();
   composed_service_dir->set_fallback(std::move(flutter_public_dir));
 
+#pragma clang diagnostic pop
+
   // Clone and check if client is servicing the directory.
   directory_ptr_->Clone(fuchsia::io::OpenFlags::DESCRIBE |
-                            fuchsia::io::OpenFlags::RIGHT_READABLE |
-                            fuchsia::io::OpenFlags::RIGHT_WRITABLE,
+                            fuchsia::io::OpenFlags::CLONE_SAME_RIGHTS,
                         cloned_directory_ptr_.NewRequest());
 
   // Collect our standard set of directories along with directories that are
   // included in the cml file to expose.
-  std::vector<std::string> other_dirs = {"debug", "ctrl", "diagnostics"};
+  std::vector<std::string> other_dirs = {"debug", "ctrl"};
   for (auto dir : metadata.expose_dirs) {
     other_dirs.push_back(dir);
   }
@@ -291,8 +292,11 @@ ComponentV2::ComponentV2(
     for (auto& dir_str : other_dirs) {
       fuchsia::io::DirectoryHandle dir;
       auto request = dir.NewRequest().TakeChannel();
-      auto status = fdio_service_connect_at(directory_ptr_.channel().get(),
-                                            dir_str.c_str(), request.release());
+      auto status = fdio_open_at(
+          directory_ptr_.channel().get(), dir_str.c_str(),
+          static_cast<uint32_t>(fuchsia::io::OpenFlags::DIRECTORY |
+                                fuchsia::io::OpenFlags::RIGHT_READABLE),
+          request.release());
       if (status == ZX_OK) {
         outgoing_dir_->AddEntry(
             dir_str.c_str(),
@@ -410,28 +414,19 @@ ComponentV2::ComponentV2(
       return MakeFileMapping("/pkg/data/vm_snapshot_data.bin",
                              false /* executable */);
     };
-    settings_.vm_snapshot_instr = []() {
-      return MakeFileMapping("/pkg/data/vm_snapshot_instructions.bin",
-                             true /* executable */);
-    };
-
     settings_.isolate_snapshot_data = []() {
       return MakeFileMapping("/pkg/data/isolate_core_snapshot_data.bin",
                              false /* executable */);
     };
-    settings_.isolate_snapshot_instr = [] {
-      return MakeFileMapping("/pkg/data/isolate_core_snapshot_instructions.bin",
-                             true /* executable */);
-    };
   }
 
 #if defined(DART_PRODUCT)
-  settings_.enable_observatory = false;
+  settings_.enable_vm_service = false;
 #else
-  settings_.enable_observatory = true;
+  settings_.enable_vm_service = true;
 
   // TODO(cbracken): pass this in as a param to allow 0.0.0.0, ::1, etc.
-  settings_.observatory_host = "127.0.0.1";
+  settings_.vm_service_host = "127.0.0.1";
 #endif
 
   // Controls whether category "skia" trace events are enabled.
@@ -542,7 +537,7 @@ const std::string& ComponentV2::GetDebugLabel() const {
 }
 
 void ComponentV2::Kill() {
-  FML_VLOG(-1) << "received Kill event";
+  FML_VLOG(1) << "received Kill event";
 
   // From the documentation for ComponentController, ZX_OK should be sent when
   // the ComponentController receives a termination request. However, if the
@@ -579,7 +574,7 @@ void ComponentV2::KillWithEpitaph(zx_status_t epitaph_status) {
 }
 
 void ComponentV2::Stop() {
-  FML_VLOG(-1) << "received Stop event";
+  FML_VLOG(1) << "received Stop event";
 
   // TODO(fxb/89162): Any other cleanup logic we should do that's appropriate
   // for Stop but not for Kill?
@@ -614,54 +609,14 @@ void ComponentV2::OnEngineTerminate(const Engine* shell_holder) {
   shell_holders_.erase(found);
 
   if (shell_holders_.empty()) {
-    FML_VLOG(-1) << "Killing component because all shell holders have been "
-                    "terminated.";
+    FML_VLOG(1) << "Killing component because all shell holders have been "
+                   "terminated.";
     Kill();
     // WARNING: Don't do anything past this point because the delegate may have
     // collected this instance via the termination callback.
   }
 }
 
-void ComponentV2::CreateView(
-    zx::eventpair token,
-    fidl::InterfaceRequest<fuchsia::sys::ServiceProvider> /*incoming_services*/,
-    fidl::InterfaceHandle<
-        fuchsia::sys::ServiceProvider> /*outgoing_services*/) {
-  auto view_ref_pair = scenic::ViewRefPair::New();
-  CreateViewWithViewRef(std::move(token), std::move(view_ref_pair.control_ref),
-                        std::move(view_ref_pair.view_ref));
-}
-
-void ComponentV2::CreateViewWithViewRef(
-    zx::eventpair view_token,
-    fuchsia::ui::views::ViewRefControl control_ref,
-    fuchsia::ui::views::ViewRef view_ref) {
-  if (!svc_) {
-    FML_LOG(ERROR)
-        << "Component incoming services was invalid when attempting to "
-           "create a shell for a view provider request.";
-    return;
-  }
-
-  shell_holders_.emplace(std::make_unique<Engine>(
-      *this,                      // delegate
-      debug_label_,               // thread label
-      svc_,                       // Component incoming services
-      runner_incoming_services_,  // Runner incoming services
-      settings_,                  // settings
-      scenic::ToViewToken(std::move(view_token)),  // view token
-      scenic::ViewRefPair{
-          .control_ref = std::move(control_ref),
-          .view_ref = std::move(view_ref),
-      },
-      std::move(fdio_ns_),            // FDIO namespace
-      std::move(directory_request_),  // outgoing request
-      product_config_,                // product configuration
-      std::vector<std::string>(),     // dart entrypoint args
-      false                           // not a v1 component
-      ));
-}
-
 void ComponentV2::CreateView2(fuchsia::ui::app::CreateView2Args view_args) {
   if (!svc_) {
     FML_LOG(ERROR)
@@ -670,6 +625,18 @@ void ComponentV2::CreateView2(fuchsia::ui::app::CreateView2Args view_args) {
     return;
   }
 
+  fuchsia::ui::views::ViewRefControl view_ref_control;
+  fuchsia::ui::views::ViewRef view_ref;
+  auto status = zx::eventpair::create(
+      /*options*/ 0u, &view_ref_control.reference, &view_ref.reference);
+  ZX_ASSERT(status == ZX_OK);
+  view_ref_control.reference.replace(
+      ZX_DEFAULT_EVENTPAIR_RIGHTS & (~ZX_RIGHT_DUPLICATE),
+      &view_ref_control.reference);
+  view_ref.reference.replace(ZX_RIGHTS_BASIC, &view_ref.reference);
+  auto view_ref_pair =
+      std::make_pair(std::move(view_ref_control), std::move(view_ref));
+
   shell_holders_.emplace(std::make_unique<Engine>(
       *this,                      // delegate
       debug_label_,               // thread label
@@ -678,12 +645,11 @@ void ComponentV2::CreateView2(fuchsia::ui::app::CreateView2Args view_args) {
       settings_,                  // settings
       std::move(
           *view_args.mutable_view_creation_token()),  // view creation token
-      scenic::ViewRefPair::New(),                     // view ref pair
+      std::move(view_ref_pair),                       // view ref pair
       std::move(fdio_ns_),                            // FDIO namespace
       std::move(directory_request_),                  // outgoing request
       product_config_,                                // product configuration
-      std::vector<std::string>(),                     // dart entrypoint args
-      false                                           // not a v1 component
+      std::vector<std::string>()                      // dart entrypoint args
       ));
 }
 
diff --git a/shell/platform/fuchsia/flutter/component_v2.h b/shell/platform/fuchsia/flutter/component_v2.h
index c23f4406ed7fa644b7962d90f137096a7e9f19a7..33fd59e7810d990d9a595f018b7c431da863db09 100644
--- a/shell/platform/fuchsia/flutter/component_v2.h
+++ b/shell/platform/fuchsia/flutter/component_v2.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_COMPONENT_V2_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_COMPONENT_V2_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_COMPONENT_V2_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_COMPONENT_V2_H_
 
 #include <array>
 #include <memory>
@@ -11,7 +11,6 @@
 
 #include <fuchsia/component/runner/cpp/fidl.h>
 #include <fuchsia/io/cpp/fidl.h>
-#include <fuchsia/sys/cpp/fidl.h>
 #include <fuchsia/ui/app/cpp/fidl.h>
 #include <lib/async-loop/cpp/loop.h>
 #include <lib/async/default.h>
@@ -110,19 +109,12 @@ class ComponentV2 final
   // |fuchsia::component::runner::ComponentController|
   void Stop() override;
 
-  // |fuchsia::ui::app::ViewProvider|
-  void CreateView(
-      zx::eventpair token,
-      fidl::InterfaceRequest<fuchsia::sys::ServiceProvider> incoming_services,
-      fuchsia::sys::ServiceProviderHandle outgoing_services) override;
-
-  // |fuchsia::ui::app::ViewProvider|
-  void CreateViewWithViewRef(zx::eventpair view_token,
-                             fuchsia::ui::views::ViewRefControl control_ref,
-                             fuchsia::ui::views::ViewRef view_ref) override;
-
   // |fuchsia::ui::app::ViewProvider|
   void CreateView2(fuchsia::ui::app::CreateView2Args view_args) override;
+  void CreateViewWithViewRef(
+      ::zx::eventpair token,
+      ::fuchsia::ui::views::ViewRefControl view_ref_control,
+      ::fuchsia::ui::views::ViewRef view_ref) override {}
 
   // |flutter::Engine::Delegate|
   void OnEngineTerminate(const Engine* holder) override;
@@ -155,4 +147,4 @@ class ComponentV2 final
 
 }  // namespace flutter_runner
 
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_COMPONENT_V2_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_COMPONENT_V2_H_
diff --git a/shell/platform/fuchsia/flutter/engine.cc b/shell/platform/fuchsia/flutter/engine.cc
index d623804c1712b587b4d17bb455290c656f1a6799..d0893a77691f6dd2994c68396d6c299972fc2390 100644
--- a/shell/platform/fuchsia/flutter/engine.cc
+++ b/shell/platform/fuchsia/flutter/engine.cc
@@ -5,8 +5,11 @@
 #include "engine.h"
 
 #include <fuchsia/accessibility/semantics/cpp/fidl.h>
-#include <fuchsia/ui/scenic/cpp/fidl.h>
+#include <fuchsia/media/cpp/fidl.h>
 #include <lib/async/cpp/task.h>
+#include <lib/zx/eventpair.h>
+#include <lib/zx/thread.h>
+#include <zircon/rights.h>
 #include <zircon/status.h>
 #include <zircon/types.h>
 #include <memory>
@@ -21,16 +24,17 @@
 #include "flutter/shell/common/rasterizer.h"
 #include "flutter/shell/common/run_configuration.h"
 #include "flutter/shell/common/serialization_callbacks.h"
+#include "flutter/shell/common/thread_host.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/core/SkSerialProcs.h"
+#include "third_party/skia/include/gpu/GrTypes.h"
 #include "third_party/skia/include/ports/SkFontMgr_fuchsia.h"
 
 #include "../runtime/dart/utils/files.h"
 #include "../runtime/dart/utils/root_inspect_node.h"
-#include "flatland_platform_view.h"
 #include "focus_delegate.h"
 #include "fuchsia_intl.h"
-#include "gfx_platform_view.h"
+#include "platform_view.h"
 #include "software_surface_producer.h"
 #include "surface.h"
 #include "vsync_waiter.h"
@@ -54,40 +58,145 @@ std::unique_ptr<flutter::PlatformMessage> MakeLocalizationPlatformMessage(
       nullptr);
 }
 
+//
+// Fuchsia scheduler role naming scheme employed here:
+//
+// Roles based on thread function:
+//   <prefix>.type.{platform,ui,raster,io,profiler}
+//
+// Roles based on fml::Thread::ThreadPriority:
+//   <prefix>.thread.{background,display,raster,normal}
+//
+
+void SetThreadRole(
+    const fuchsia::media::ProfileProviderSyncPtr& profile_provider,
+    const std::string& role) {
+  ZX_ASSERT(profile_provider);
+
+  zx::thread dup;
+  const zx_status_t dup_status =
+      zx::thread::self()->duplicate(ZX_RIGHT_SAME_RIGHTS, &dup);
+  if (dup_status != ZX_OK) {
+    FML_LOG(WARNING)
+        << "Failed to duplicate thread handle when setting thread config: "
+        << zx_status_get_string(dup_status)
+        << ". Thread will run at default priority.";
+    return;
+  }
+
+  int64_t unused_period;
+  int64_t unused_capacity;
+  const zx_status_t status = profile_provider->RegisterHandlerWithCapacity(
+      std::move(dup), role, 0, 0.f, &unused_period, &unused_capacity);
+  if (status != ZX_OK) {
+    FML_LOG(WARNING) << "Failed to set thread role to \"" << role
+                     << "\": " << zx_status_get_string(status)
+                     << ". Thread will run at default priority.";
+    return;
+  }
+}
+
+void SetThreadConfig(
+    const std::string& name_prefix,
+    const fuchsia::media::ProfileProviderSyncPtr& profile_provider,
+    const fml::Thread::ThreadConfig& config) {
+  ZX_ASSERT(profile_provider);
+
+  fml::Thread::SetCurrentThreadName(config);
+
+  // Derive the role name from the prefix and priority. See comment above about
+  // the role naming scheme.
+  std::string role;
+  switch (config.priority) {
+    case fml::Thread::ThreadPriority::kBackground:
+      role = name_prefix + ".thread.background";
+      break;
+    case fml::Thread::ThreadPriority::kDisplay:
+      role = name_prefix + ".thread.display";
+      break;
+    case fml::Thread::ThreadPriority::kRaster:
+      role = name_prefix + ".thread.raster";
+      break;
+    case fml::Thread::ThreadPriority::kNormal:
+      role = name_prefix + ".thread.normal";
+      break;
+    default:
+      FML_LOG(WARNING) << "Unknown thread priority "
+                       << static_cast<int>(config.priority)
+                       << ". Thread will run at default priority.";
+      return;
+  }
+  ZX_ASSERT(!role.empty());
+
+  SetThreadRole(profile_provider, role);
+}
+
 }  // namespace
 
-flutter::ThreadHost Engine::CreateThreadHost(const std::string& name_prefix) {
+flutter::ThreadHost Engine::CreateThreadHost(
+    const std::string& name_prefix,
+    const std::shared_ptr<sys::ServiceDirectory>& services) {
   fml::Thread::SetCurrentThreadName(
       fml::Thread::ThreadConfig(name_prefix + ".platform"));
-  return flutter::ThreadHost(name_prefix, flutter::ThreadHost::Type::RASTER |
-                                              flutter::ThreadHost::Type::UI |
-                                              flutter::ThreadHost::Type::IO);
-}
 
-Engine::Engine(Delegate& delegate,
-               std::string thread_label,
-               std::shared_ptr<sys::ServiceDirectory> svc,
-               std::shared_ptr<sys::ServiceDirectory> runner_services,
-               flutter::Settings settings,
-               fuchsia::ui::views::ViewToken view_token,
-               scenic::ViewRefPair view_ref_pair,
-               UniqueFDIONS fdio_ns,
-               fidl::InterfaceRequest<fuchsia::io::Directory> directory_request,
-               FlutterRunnerProductConfiguration product_config,
-               const std::vector<std::string>& dart_entrypoint_args,
-               bool for_v1_component)
-    : delegate_(delegate),
-      thread_label_(std::move(thread_label)),
-      thread_host_(CreateThreadHost(thread_label_)),
-      view_token_(std::move(view_token)),
-      memory_pressure_watcher_binding_(this),
-      latest_memory_pressure_level_(fuchsia::memorypressure::Level::NORMAL),
-      intercept_all_input_(product_config.get_intercept_all_input()),
-      weak_factory_(this) {
-  Initialize(/*=use_flatland*/ false, std::move(view_ref_pair), std::move(svc),
-             std::move(runner_services), std::move(settings),
-             std::move(fdio_ns), std::move(directory_request),
-             std::move(product_config), dart_entrypoint_args, for_v1_component);
+  // Default the config setter to setup the thread name only.
+  flutter::ThreadConfigSetter config_setter = fml::Thread::SetCurrentThreadName;
+
+  // Override the config setter if the media profile provider is available.
+  if (services) {
+    // Connect to the media profile provider to assign thread priorities using
+    // Fuchsia's scheduler role API. Failure to connect will print a warning and
+    // proceed with engine initialization, leaving threads created by the engine
+    // at default priority.
+    //
+    // The use of std::shared_ptr here is to work around the unfortunate
+    // requirement for flutter::ThreadConfigSetter (i.e. std::function<>) that
+    // the target callable be copy-constructible. This awkwardly conflicts with
+    // fuchsia::media::ProfileProviderSyncPtr being move-only. std::shared_ptr
+    // provides copyable object that references the move-only SyncPtr.
+    std::shared_ptr<fuchsia::media::ProfileProviderSyncPtr>
+        media_profile_provider =
+            std::make_shared<fuchsia::media::ProfileProviderSyncPtr>();
+
+    const zx_status_t connect_status =
+        services->Connect(media_profile_provider->NewRequest());
+    if (connect_status != ZX_OK) {
+      FML_LOG(WARNING)
+          << "Failed to connect to " << fuchsia::media::ProfileProvider::Name_
+          << ": " << zx_status_get_string(connect_status)
+          << " This is not a fatal error, but threads created by the engine "
+             "will run at default priority, regardless of the requested "
+             "priority.";
+    } else {
+      // Set the role for (this) platform thread. See comment above about the
+      // role naming scheme.
+      SetThreadRole(*media_profile_provider, name_prefix + ".type.platform");
+
+      // This lambda must be copyable or the assignment fails to compile,
+      // necessitating the use of std::shared_ptr for the profile provider.
+      config_setter = [name_prefix, media_profile_provider](
+                          const fml::Thread::ThreadConfig& config) {
+        SetThreadConfig(name_prefix, *media_profile_provider, config);
+      };
+    }
+  }
+
+  flutter::ThreadHost::ThreadHostConfig thread_host_config{config_setter};
+
+  thread_host_config.SetRasterConfig(
+      {flutter::ThreadHost::ThreadHostConfig::MakeThreadName(
+           flutter::ThreadHost::Type::kRaster, name_prefix),
+       fml::Thread::ThreadPriority::kRaster});
+  thread_host_config.SetUIConfig(
+      {flutter::ThreadHost::ThreadHostConfig::MakeThreadName(
+           flutter::ThreadHost::Type::kUi, name_prefix),
+       fml::Thread::ThreadPriority::kDisplay});
+  thread_host_config.SetIOConfig(
+      {flutter::ThreadHost::ThreadHostConfig::MakeThreadName(
+           flutter::ThreadHost::Type::kIo, name_prefix),
+       fml::Thread::ThreadPriority::kNormal});
+
+  return flutter::ThreadHost(thread_host_config);
 }
 
 Engine::Engine(Delegate& delegate,
@@ -96,40 +205,38 @@ Engine::Engine(Delegate& delegate,
                std::shared_ptr<sys::ServiceDirectory> runner_services,
                flutter::Settings settings,
                fuchsia::ui::views::ViewCreationToken view_creation_token,
-               scenic::ViewRefPair view_ref_pair,
+               std::pair<fuchsia::ui::views::ViewRefControl,
+                         fuchsia::ui::views::ViewRef> view_ref_pair,
                UniqueFDIONS fdio_ns,
                fidl::InterfaceRequest<fuchsia::io::Directory> directory_request,
                FlutterRunnerProductConfiguration product_config,
-               const std::vector<std::string>& dart_entrypoint_args,
-               bool for_v1_component)
+               const std::vector<std::string>& dart_entrypoint_args)
     : delegate_(delegate),
       thread_label_(std::move(thread_label)),
-      thread_host_(CreateThreadHost(thread_label_)),
+      thread_host_(CreateThreadHost(thread_label_, runner_services)),
       view_creation_token_(std::move(view_creation_token)),
       memory_pressure_watcher_binding_(this),
       latest_memory_pressure_level_(fuchsia::memorypressure::Level::NORMAL),
       intercept_all_input_(product_config.get_intercept_all_input()),
       weak_factory_(this) {
-  Initialize(/*=use_flatland*/ true, std::move(view_ref_pair), std::move(svc),
+  Initialize(std::move(view_ref_pair), std::move(svc),
              std::move(runner_services), std::move(settings),
              std::move(fdio_ns), std::move(directory_request),
-             std::move(product_config), dart_entrypoint_args, for_v1_component);
+             std::move(product_config), dart_entrypoint_args);
 }
 
 void Engine::Initialize(
-    bool use_flatland,
-    scenic::ViewRefPair view_ref_pair,
+    std::pair<fuchsia::ui::views::ViewRefControl, fuchsia::ui::views::ViewRef>
+        view_ref_pair,
     std::shared_ptr<sys::ServiceDirectory> svc,
     std::shared_ptr<sys::ServiceDirectory> runner_services,
     flutter::Settings settings,
     UniqueFDIONS fdio_ns,
     fidl::InterfaceRequest<fuchsia::io::Directory> directory_request,
     FlutterRunnerProductConfiguration product_config,
-    const std::vector<std::string>& dart_entrypoint_args,
-    bool for_v1_component) {
-  // Flatland uses |view_creation_token_| for linking. Gfx uses |view_token_|.
-  FML_CHECK((use_flatland && view_creation_token_.value.is_valid()) ||
-            (!use_flatland && view_token_.value.is_valid()));
+    const std::vector<std::string>& dart_entrypoint_args) {
+  // Flatland uses |view_creation_token_| for linking.
+  FML_CHECK(view_creation_token_.value.is_valid());
 
   // Get the task runners from the managed threads. The current thread will be
   // used as the "platform" thread.
@@ -144,39 +251,23 @@ void Engine::Initialize(
       thread_host_.io_thread->GetTaskRunner()       // io
   );
 
-  // Connect to Scenic.
-  auto scenic = runner_services->Connect<fuchsia::ui::scenic::Scenic>();
-  fuchsia::ui::scenic::SessionEndpoints gfx_protocols;
-  fuchsia::ui::scenic::SessionHandle session;
-  gfx_protocols.set_session(session.NewRequest());
-  fuchsia::ui::scenic::SessionListenerHandle session_listener;
-  auto session_listener_request = session_listener.NewRequest();
-  gfx_protocols.set_session_listener(session_listener.Bind());
   fuchsia::ui::views::FocuserHandle focuser;
   fuchsia::ui::views::ViewRefFocusedHandle view_ref_focused;
   fuchsia::ui::pointer::TouchSourceHandle touch_source;
   fuchsia::ui::pointer::MouseSourceHandle mouse_source;
 
-  fuchsia::ui::composition::ViewBoundProtocols flatland_view_protocols;
-  if (use_flatland) {
-    flatland_view_protocols.set_view_focuser(focuser.NewRequest());
-    flatland_view_protocols.set_view_ref_focused(view_ref_focused.NewRequest());
-    flatland_view_protocols.set_touch_source(touch_source.NewRequest());
-    flatland_view_protocols.set_mouse_source(mouse_source.NewRequest());
-  } else {
-    gfx_protocols.set_view_focuser(focuser.NewRequest());
-    gfx_protocols.set_view_ref_focused(view_ref_focused.NewRequest());
-    gfx_protocols.set_touch_source(touch_source.NewRequest());
-    // GFX used only on products without a mouse.
-  }
-  scenic->CreateSessionT(std::move(gfx_protocols), [] {});
+  fuchsia::ui::composition::ViewBoundProtocols view_protocols;
+  view_protocols.set_view_focuser(focuser.NewRequest());
+  view_protocols.set_view_ref_focused(view_ref_focused.NewRequest());
+  view_protocols.set_touch_source(touch_source.NewRequest());
+  view_protocols.set_mouse_source(mouse_source.NewRequest());
 
   // Connect to Flatland.
   fuchsia::ui::composition::FlatlandHandle flatland;
   zx_status_t flatland_status =
       runner_services->Connect<fuchsia::ui::composition::Flatland>(
           flatland.NewRequest());
-  if (flatland_status != ZX_OK && use_flatland) {
+  if (flatland_status != ZX_OK) {
     FML_LOG(WARNING) << "fuchsia::ui::composition::Flatland connection failed: "
                      << zx_status_get_string(flatland_status);
   }
@@ -226,11 +317,11 @@ void Engine::Initialize(
 
   // Make clones of the `ViewRef` before sending it to various places.
   fuchsia::ui::views::ViewRef platform_view_ref;
-  view_ref_pair.view_ref.Clone(&platform_view_ref);
+  view_ref_pair.second.Clone(&platform_view_ref);
   fuchsia::ui::views::ViewRef accessibility_view_ref;
-  view_ref_pair.view_ref.Clone(&accessibility_view_ref);
+  view_ref_pair.second.Clone(&accessibility_view_ref);
   fuchsia::ui::views::ViewRef isolate_view_ref;
-  view_ref_pair.view_ref.Clone(&isolate_view_ref);
+  view_ref_pair.second.Clone(&isolate_view_ref);
 
   // Session is terminated on the raster thread, but we must terminate ourselves
   // on the platform thread.
@@ -258,57 +349,31 @@ void Engine::Initialize(
   task_runners.GetRasterTaskRunner()->PostTask(fml::MakeCopyable(
       [this, &view_embedder_latch,
        session_inspect_node = std::move(session_inspect_node),
-       session = std::move(session), flatland = std::move(flatland),
-       session_error_callback = std::move(session_error_callback), use_flatland,
-       view_token = std::move(view_token_),
+       flatland = std::move(flatland),
+       session_error_callback = std::move(session_error_callback),
        view_creation_token = std::move(view_creation_token_),
-       flatland_view_protocols = std::move(flatland_view_protocols),
+       view_protocols = std::move(view_protocols),
        request = parent_viewport_watcher.NewRequest(),
        view_ref_pair = std::move(view_ref_pair),
-       max_frames_in_flight = product_config.get_max_frames_in_flight(),
-       vsync_offset = product_config.get_vsync_offset(),
        software_rendering = product_config.software_rendering()]() mutable {
-        if (use_flatland) {
-          if (software_rendering) {
-            surface_producer_ = std::make_shared<SoftwareSurfaceProducer>(
-                /*scenic_session=*/nullptr);
-          } else {
-            surface_producer_ = std::make_shared<VulkanSurfaceProducer>(
-                /*scenic_session=*/nullptr);
-          }
-
-          flatland_connection_ = std::make_shared<FlatlandConnection>(
-              thread_label_, std::move(flatland),
-              std::move(session_error_callback), [](auto) {},
-              max_frames_in_flight, vsync_offset);
-
-          fuchsia::ui::views::ViewIdentityOnCreation view_identity = {
-              .view_ref = std::move(view_ref_pair.view_ref),
-              .view_ref_control = std::move(view_ref_pair.control_ref)};
-          flatland_view_embedder_ =
-              std::make_shared<FlatlandExternalViewEmbedder>(
-                  std::move(view_creation_token), std::move(view_identity),
-                  std::move(flatland_view_protocols), std::move(request),
-                  flatland_connection_, surface_producer_,
-                  intercept_all_input_);
+        if (software_rendering) {
+          surface_producer_ = std::make_shared<SoftwareSurfaceProducer>();
         } else {
-          session_connection_ = std::make_shared<GfxSessionConnection>(
-              thread_label_, std::move(session_inspect_node),
-              std::move(session), std::move(session_error_callback),
-              [](auto) {}, max_frames_in_flight, vsync_offset);
-
-          if (software_rendering) {
-            surface_producer_ = std::make_shared<SoftwareSurfaceProducer>(
-                session_connection_->get());
-          } else {
-            surface_producer_ = std::make_shared<VulkanSurfaceProducer>(
-                session_connection_->get());
-          }
-
-          external_view_embedder_ = std::make_shared<GfxExternalViewEmbedder>(
-              thread_label_, std::move(view_token), std::move(view_ref_pair),
-              session_connection_, surface_producer_, intercept_all_input_);
+          surface_producer_ = std::make_shared<VulkanSurfaceProducer>();
         }
+
+        flatland_connection_ = std::make_shared<FlatlandConnection>(
+            thread_label_, std::move(flatland),
+            std::move(session_error_callback), [](auto) {});
+
+        fuchsia::ui::views::ViewIdentityOnCreation view_identity = {
+            .view_ref = std::move(view_ref_pair.second),
+            .view_ref_control = std::move(view_ref_pair.first)};
+        view_embedder_ = std::make_shared<ExternalViewEmbedder>(
+            std::move(view_creation_token), std::move(view_identity),
+            std::move(view_protocols), std::move(request), flatland_connection_,
+            surface_producer_, intercept_all_input_);
+
         view_embedder_latch.Signal();
       }));
   view_embedder_latch.Wait();
@@ -341,32 +406,21 @@ void Engine::Initialize(
       dart_utils::RootInspectNode::CreateRootChild(
           std::move(accessibility_inspect_name)));
 
-  OnEnableWireframe on_enable_wireframe_callback = std::bind(
+  OnEnableWireframeCallback on_enable_wireframe_callback = std::bind(
       &Engine::DebugWireframeSettingsChanged, this, std::placeholders::_1);
 
-  OnCreateGfxView on_create_gfx_view_callback =
-      std::bind(&Engine::CreateGfxView, this, std::placeholders::_1,
-                std::placeholders::_2, std::placeholders::_3,
-                std::placeholders::_4, std::placeholders::_5);
+  OnCreateViewCallback on_create_view_callback = std::bind(
+      &Engine::CreateView, this, std::placeholders::_1, std::placeholders::_2,
+      std::placeholders::_3, std::placeholders::_4, std::placeholders::_5);
 
-  OnCreateFlatlandView on_create_flatland_view_callback =
-      std::bind(&Engine::CreateFlatlandView, this, std::placeholders::_1,
-                std::placeholders::_2, std::placeholders::_3,
-                std::placeholders::_4, std::placeholders::_5);
-
-  OnUpdateView on_update_view_callback = std::bind(
+  OnUpdateViewCallback on_update_view_callback = std::bind(
       &Engine::UpdateView, this, std::placeholders::_1, std::placeholders::_2,
-      std::placeholders::_3, std::placeholders::_4, use_flatland);
-
-  OnDestroyGfxView on_destroy_gfx_view_callback =
-      std::bind(&Engine::DestroyGfxView, this, std::placeholders::_1,
-                std::placeholders::_2);
+      std::placeholders::_3, std::placeholders::_4);
 
-  OnDestroyFlatlandView on_destroy_flatland_view_callback =
-      std::bind(&Engine::DestroyFlatlandView, this, std::placeholders::_1,
-                std::placeholders::_2);
+  OnDestroyViewCallback on_destroy_view_callback = std::bind(
+      &Engine::DestroyView, this, std::placeholders::_1, std::placeholders::_2);
 
-  OnCreateSurface on_create_surface_callback =
+  OnCreateSurfaceCallback on_create_surface_callback =
       std::bind(&Engine::CreateSurface, this);
 
   // SessionListener has a OnScenicError method; invoke this callback on the
@@ -391,12 +445,12 @@ void Engine::Initialize(
       settings, task_runners.GetIOTaskRunner());
   run_configuration.SetEntrypointArgs(std::move(dart_entrypoint_args));
 
-  OnSemanticsNodeUpdate on_semantics_node_update_callback =
+  OnSemanticsNodeUpdateCallback on_semantics_node_update_callback =
       [this](flutter::SemanticsNodeUpdates updates, float pixel_ratio) {
         accessibility_bridge_->AddSemanticsNodeUpdate(updates, pixel_ratio);
       };
 
-  OnRequestAnnounce on_request_announce_callback =
+  OnRequestAnnounceCallback on_request_announce_callback =
       [this](const std::string& message) {
         accessibility_bridge_->RequestAnnounce(message);
       };
@@ -404,8 +458,7 @@ void Engine::Initialize(
   // Setup the callback that will instantiate the platform view.
   flutter::Shell::CreateCallback<flutter::PlatformView>
       on_create_platform_view = fml::MakeCopyable(
-          [this, use_flatland, view_ref = std::move(platform_view_ref),
-           session_listener_request = std::move(session_listener_request),
+          [this, view_ref = std::move(platform_view_ref),
            parent_viewport_watcher = std::move(parent_viewport_watcher),
            ime_service = std::move(ime_service), keyboard = std::move(keyboard),
            focuser = std::move(focuser),
@@ -417,14 +470,9 @@ void Engine::Initialize(
                std::move(on_session_listener_error_callback),
            on_enable_wireframe_callback =
                std::move(on_enable_wireframe_callback),
-           on_create_gfx_view_callback = std::move(on_create_gfx_view_callback),
-           on_create_flatland_view_callback =
-               std::move(on_create_flatland_view_callback),
+           on_create_view_callback = std::move(on_create_view_callback),
            on_update_view_callback = std::move(on_update_view_callback),
-           on_destroy_gfx_view_callback =
-               std::move(on_destroy_gfx_view_callback),
-           on_destroy_flatland_view_callback =
-               std::move(on_destroy_flatland_view_callback),
+           on_destroy_view_callback = std::move(on_destroy_view_callback),
            on_create_surface_callback = std::move(on_create_surface_callback),
            on_semantics_node_update_callback =
                std::move(on_semantics_node_update_callback),
@@ -432,27 +480,19 @@ void Engine::Initialize(
                std::move(on_request_announce_callback),
            external_view_embedder = GetExternalViewEmbedder(),
            await_vsync_callback =
-               [this, use_flatland](FireCallbackCallback cb) {
-                 if (use_flatland) {
-                   flatland_connection_->AwaitVsync(cb);
-                 } else {
-                   session_connection_->AwaitVsync(cb);
-                 }
+               [this](FireCallbackCallback cb) {
+                 flatland_connection_->AwaitVsync(cb);
                },
            await_vsync_for_secondary_callback_callback =
-               [this, use_flatland](FireCallbackCallback cb) {
-                 if (use_flatland) {
-                   flatland_connection_->AwaitVsyncForSecondaryCallback(cb);
-                 } else {
-                   session_connection_->AwaitVsyncForSecondaryCallback(cb);
-                 }
+               [this](FireCallbackCallback cb) {
+                 flatland_connection_->AwaitVsyncForSecondaryCallback(cb);
                },
-           product_config](flutter::Shell& shell) mutable {
-            OnShaderWarmup on_shader_warmup = nullptr;
+           product_config, svc](flutter::Shell& shell) mutable {
+            OnShaderWarmupCallback on_shader_warmup_callback = nullptr;
             if (product_config.enable_shader_warmup()) {
               FML_DCHECK(surface_producer_);
               if (product_config.enable_shader_warmup_dart_hooks()) {
-                on_shader_warmup =
+                on_shader_warmup_callback =
                     [this, &shell](
                         const std::vector<std::string>& skp_names,
                         std::function<void(uint32_t)> completion_callback,
@@ -481,48 +521,24 @@ void Engine::Initialize(
               }
             }
 
-            std::unique_ptr<flutter::PlatformView> platform_view;
-            if (use_flatland) {
-              platform_view =
-                  std::make_unique<flutter_runner::FlatlandPlatformView>(
-                      shell, shell.GetTaskRunners(), std::move(view_ref),
-                      std::move(external_view_embedder), std::move(ime_service),
-                      std::move(keyboard), std::move(touch_source),
-                      std::move(mouse_source), std::move(focuser),
-                      std::move(view_ref_focused),
-                      std::move(parent_viewport_watcher),
-                      std::move(pointerinjector_registry),
-                      std::move(on_enable_wireframe_callback),
-                      std::move(on_create_flatland_view_callback),
-                      std::move(on_update_view_callback),
-                      std::move(on_destroy_flatland_view_callback),
-                      std::move(on_create_surface_callback),
-                      std::move(on_semantics_node_update_callback),
-                      std::move(on_request_announce_callback),
-                      std::move(on_shader_warmup),
-                      std::move(await_vsync_callback),
-                      std::move(await_vsync_for_secondary_callback_callback));
-            } else {
-              platform_view = std::make_unique<flutter_runner::GfxPlatformView>(
-                  shell, shell.GetTaskRunners(), std::move(view_ref),
-                  std::move(external_view_embedder), std::move(ime_service),
-                  std::move(keyboard), std::move(touch_source),
-                  std::move(mouse_source), std::move(focuser),
-                  std::move(view_ref_focused),
-                  std::move(pointerinjector_registry),
-                  std::move(session_listener_request),
-                  std::move(on_session_listener_error_callback),
-                  std::move(on_enable_wireframe_callback),
-                  std::move(on_create_gfx_view_callback),
-                  std::move(on_update_view_callback),
-                  std::move(on_destroy_gfx_view_callback),
-                  std::move(on_create_surface_callback),
-                  std::move(on_semantics_node_update_callback),
-                  std::move(on_request_announce_callback),
-                  std::move(on_shader_warmup), std::move(await_vsync_callback),
-                  std::move(await_vsync_for_secondary_callback_callback));
-            }
-            return platform_view;
+            return std::make_unique<flutter_runner::PlatformView>(
+                shell, shell.GetTaskRunners(), std::move(view_ref),
+                std::move(external_view_embedder), std::move(ime_service),
+                std::move(keyboard), std::move(touch_source),
+                std::move(mouse_source), std::move(focuser),
+                std::move(view_ref_focused), std::move(parent_viewport_watcher),
+                std::move(pointerinjector_registry),
+                std::move(on_enable_wireframe_callback),
+                std::move(on_create_view_callback),
+                std::move(on_update_view_callback),
+                std::move(on_destroy_view_callback),
+                std::move(on_create_surface_callback),
+                std::move(on_semantics_node_update_callback),
+                std::move(on_request_announce_callback),
+                std::move(on_shader_warmup_callback),
+                std::move(await_vsync_callback),
+                std::move(await_vsync_for_secondary_callback_callback),
+                std::move(svc));
           });
 
   // Setup the callback that will instantiate the rasterizer.
@@ -567,18 +583,9 @@ void Engine::Initialize(
 
   // Shell has been created. Before we run the engine, set up the isolate
   // configurator.
-  {
-    fuchsia::sys::EnvironmentPtr environment;
-    if (for_v1_component) {
-      svc->Connect(environment.NewRequest());
-    }
-
-    isolate_configurator_ = std::make_unique<IsolateConfigurator>(
-        std::move(fdio_ns),
-        // v2 components do not use fuchsia.sys.Environment.
-        for_v1_component ? std::move(environment) : nullptr,
-        directory_request.TakeChannel(), std::move(isolate_view_ref.reference));
-  }
+  isolate_configurator_ = std::make_unique<IsolateConfigurator>(
+      std::move(fdio_ns), directory_request.TakeChannel(),
+      std::move(isolate_view_ref.reference));
 
   //  This platform does not get a separate surface platform view creation
   //  notification. Fire one eagerly.
@@ -604,7 +611,7 @@ void Engine::Initialize(
     ZX_ASSERT(runner_services->Connect(
                   memory_pressure_provider_.NewRequest()) == ZX_OK);
 
-    FML_VLOG(-1) << "Registering memorypressure watcher";
+    FML_VLOG(1) << "Registering memorypressure watcher";
 
     // Register for changes, which will make the request for the initial
     // memory level.
@@ -640,12 +647,12 @@ void Engine::Initialize(
         FML_LOG(WARNING) << "Got intl Profile without locales";
       }
       auto message = MakeLocalizationPlatformMessage(profile);
-      FML_VLOG(-1) << "Sending LocalizationPlatformMessage";
+      FML_VLOG(1) << "Sending LocalizationPlatformMessage";
       weak->shell_->GetPlatformView()->DispatchPlatformMessage(
           std::move(message));
     };
 
-    FML_VLOG(-1) << "Requesting intl Profile";
+    FML_VLOG(1) << "Requesting intl Profile";
 
     // Make the initial request
     intl_property_provider_->GetProfile(get_profile_callback);
@@ -653,7 +660,7 @@ void Engine::Initialize(
     // And register for changes
     intl_property_provider_.events().OnChange = [this, runner_services,
                                                  get_profile_callback]() {
-      FML_VLOG(-1) << fuchsia::intl::PropertyProvider::Name_ << ": OnChange";
+      FML_VLOG(1) << fuchsia::intl::PropertyProvider::Name_ << ": OnChange";
       runner_services->Connect(intl_property_provider_.NewRequest());
       intl_property_provider_->GetProfile(get_profile_callback);
     };
@@ -691,15 +698,9 @@ Engine::~Engine() {
   fml::AutoResetWaitableEvent view_embedder_latch;
   thread_host_.raster_thread->GetTaskRunner()->PostTask(
       fml::MakeCopyable([this, &view_embedder_latch]() mutable {
-        if (flatland_view_embedder_ != nullptr) {
-          flatland_view_embedder_.reset();
-          flatland_connection_.reset();
-          surface_producer_.reset();
-        } else {
-          external_view_embedder_.reset();
-          surface_producer_.reset();
-          session_connection_.reset();
-        }
+        view_embedder_.reset();
+        flatland_connection_.reset();
+        surface_producer_.reset();
         view_embedder_latch.Signal();
       }));
   view_embedder_latch.Wait();
@@ -744,92 +745,50 @@ void Engine::Terminate() {
 void Engine::DebugWireframeSettingsChanged(bool enabled) {
   FML_CHECK(shell_);
 
-  // TODO(fxbug.dev/116000): Investigate if we can add flatland wireframe code
-  // for debugging.
-  shell_->GetTaskRunners().GetRasterTaskRunner()->PostTask([this, enabled]() {
-    if (external_view_embedder_) {
-      external_view_embedder_->EnableWireframe(enabled);
-    }
+  shell_->GetTaskRunners().GetRasterTaskRunner()->PostTask([]() {
+    // TODO(fxbug.dev/116000): Investigate if we can add flatland wireframe code
+    // for debugging.
   });
 }
 
-void Engine::CreateGfxView(int64_t view_id,
-                           ViewCallback on_view_created,
-                           GfxViewIdCallback on_view_bound,
-                           bool hit_testable,
-                           bool focusable) {
-  FML_CHECK(shell_);
-  shell_->GetTaskRunners().GetRasterTaskRunner()->PostTask(
-      [this, view_id, hit_testable, focusable,
-       on_view_created = std::move(on_view_created),
-       on_view_bound = std::move(on_view_bound)]() {
-        FML_CHECK(external_view_embedder_);
-        external_view_embedder_->CreateView(view_id, std::move(on_view_created),
-                                            std::move(on_view_bound));
-        external_view_embedder_->SetViewProperties(view_id, SkRect::MakeEmpty(),
-                                                   hit_testable, focusable);
-      });
-}
-
-void Engine::CreateFlatlandView(int64_t view_id,
-                                ViewCallback on_view_created,
-                                FlatlandViewCreatedCallback on_view_bound,
-                                bool hit_testable,
-                                bool focusable) {
+void Engine::CreateView(int64_t view_id,
+                        ViewCallback on_view_created,
+                        ViewCreatedCallback on_view_bound,
+                        bool hit_testable,
+                        bool focusable) {
   FML_CHECK(shell_);
   shell_->GetTaskRunners().GetRasterTaskRunner()->PostTask(
       [this, view_id, hit_testable, focusable,
        on_view_created = std::move(on_view_created),
        on_view_bound = std::move(on_view_bound)]() {
-        FML_CHECK(flatland_view_embedder_);
-        flatland_view_embedder_->CreateView(view_id, std::move(on_view_created),
-                                            std::move(on_view_bound));
-        flatland_view_embedder_->SetViewProperties(view_id, SkRect::MakeEmpty(),
-                                                   hit_testable, focusable);
+        FML_CHECK(view_embedder_);
+        view_embedder_->CreateView(view_id, std::move(on_view_created),
+                                   std::move(on_view_bound));
+        view_embedder_->SetViewProperties(view_id, SkRect::MakeEmpty(),
+                                          hit_testable, focusable);
       });
 }
 
 void Engine::UpdateView(int64_t view_id,
                         SkRect occlusion_hint,
                         bool hit_testable,
-                        bool focusable,
-                        bool use_flatland) {
+                        bool focusable) {
   FML_CHECK(shell_);
   shell_->GetTaskRunners().GetRasterTaskRunner()->PostTask(
-      [this, use_flatland, view_id, occlusion_hint, hit_testable, focusable]() {
-        if (use_flatland) {
-          FML_CHECK(flatland_view_embedder_);
-          flatland_view_embedder_->SetViewProperties(view_id, occlusion_hint,
-                                                     hit_testable, focusable);
-        } else {
-          FML_CHECK(external_view_embedder_);
-          external_view_embedder_->SetViewProperties(view_id, occlusion_hint,
-                                                     hit_testable, focusable);
-        }
+      [this, view_id, occlusion_hint, hit_testable, focusable]() {
+        FML_CHECK(view_embedder_);
+        view_embedder_->SetViewProperties(view_id, occlusion_hint, hit_testable,
+                                          focusable);
       });
 }
 
-void Engine::DestroyGfxView(int64_t view_id,
-                            GfxViewIdCallback on_view_unbound) {
+void Engine::DestroyView(int64_t view_id, ViewIdCallback on_view_unbound) {
   FML_CHECK(shell_);
 
   shell_->GetTaskRunners().GetRasterTaskRunner()->PostTask(
       [this, view_id, on_view_unbound = std::move(on_view_unbound)]() {
-        FML_CHECK(external_view_embedder_);
-        external_view_embedder_->DestroyView(view_id,
-                                             std::move(on_view_unbound));
-      });
-}
-
-void Engine::DestroyFlatlandView(int64_t view_id,
-                                 FlatlandViewIdCallback on_view_unbound) {
-  FML_CHECK(shell_);
-
-  shell_->GetTaskRunners().GetRasterTaskRunner()->PostTask(
-      [this, view_id, on_view_unbound = std::move(on_view_unbound)]() {
-        FML_CHECK(flatland_view_embedder_);
-        flatland_view_embedder_->DestroyView(view_id,
-                                             std::move(on_view_unbound));
+        FML_CHECK(view_embedder_);
+        view_embedder_->DestroyView(view_id, std::move(on_view_unbound));
       });
 }
 
@@ -840,12 +799,8 @@ std::unique_ptr<flutter::Surface> Engine::CreateSurface() {
 
 std::shared_ptr<flutter::ExternalViewEmbedder>
 Engine::GetExternalViewEmbedder() {
-  FML_CHECK(external_view_embedder_ || flatland_view_embedder_);
-
-  if (external_view_embedder_) {
-    return external_view_embedder_;
-  }
-  return flatland_view_embedder_;
+  FML_CHECK(view_embedder_);
+  return view_embedder_;
 }
 
 #if !defined(DART_PRODUCT)
@@ -990,7 +945,8 @@ void Engine::WarmupSkps(
             };
 
             surface_producer->gr_context()->flush(flush_info);
-            surface_producer->gr_context()->submit(synchronous);
+            surface_producer->gr_context()->submit(
+                synchronous ? GrSyncCpu::kYes : GrSyncCpu::kNo);
           }
         } else {
           if (i == count - 1) {
diff --git a/shell/platform/fuchsia/flutter/engine.h b/shell/platform/fuchsia/flutter/engine.h
index e11c41e878c14ceb6cce3289a9741b4d3ddd0088..a2e8ca33812874b6e28486b95fa0732f53cab65b 100644
--- a/shell/platform/fuchsia/flutter/engine.h
+++ b/shell/platform/fuchsia/flutter/engine.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_ENGINE_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_ENGINE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_ENGINE_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_ENGINE_H_
 
 #include <optional>
 
@@ -11,12 +11,9 @@
 #include <fuchsia/io/cpp/fidl.h>
 #include <fuchsia/memorypressure/cpp/fidl.h>
 #include <fuchsia/ui/composition/cpp/fidl.h>
-#include <fuchsia/ui/gfx/cpp/fidl.h>
 #include <fuchsia/ui/views/cpp/fidl.h>
 #include <lib/async-loop/cpp/loop.h>
 #include <lib/sys/cpp/service_directory.h>
-#include <lib/ui/scenic/cpp/id.h>
-#include <lib/ui/scenic/cpp/view_ref_pair.h>
 
 #include "flutter/flow/embedded_views.h"
 #include "flutter/flow/surface.h"
@@ -25,11 +22,9 @@
 #include "flutter/shell/common/thread_host.h"
 #include "flutter/shell/platform/fuchsia/flutter/accessibility_bridge.h"
 
+#include "external_view_embedder.h"
 #include "flatland_connection.h"
-#include "flatland_external_view_embedder.h"
 #include "flutter_runner_product_configuration.h"
-#include "gfx_external_view_embedder.h"
-#include "gfx_session_connection.h"
 #include "isolate_configurator.h"
 #include "surface_producer.h"
 
@@ -48,35 +43,22 @@ class Engine final : public fuchsia::memorypressure::Watcher {
     virtual void OnEngineTerminate(const Engine* holder) = 0;
   };
 
-  static flutter::ThreadHost CreateThreadHost(const std::string& name_prefix);
+  static flutter::ThreadHost CreateThreadHost(
+      const std::string& name_prefix,
+      const std::shared_ptr<sys::ServiceDirectory>& runner_services = nullptr);
 
-  // Gfx connection ctor.
-  Engine(Delegate& delegate,
-         std::string thread_label,
-         std::shared_ptr<sys::ServiceDirectory> svc,
-         std::shared_ptr<sys::ServiceDirectory> runner_services,
-         flutter::Settings settings,
-         fuchsia::ui::views::ViewToken view_token,
-         scenic::ViewRefPair view_ref_pair,
-         UniqueFDIONS fdio_ns,
-         fidl::InterfaceRequest<fuchsia::io::Directory> directory_request,
-         FlutterRunnerProductConfiguration product_config,
-         const std::vector<std::string>& dart_entrypoint_args,
-         bool for_v1_component);
-
-  // Flatland connection ctor.
   Engine(Delegate& delegate,
          std::string thread_label,
          std::shared_ptr<sys::ServiceDirectory> svc,
          std::shared_ptr<sys::ServiceDirectory> runner_services,
          flutter::Settings settings,
          fuchsia::ui::views::ViewCreationToken view_creation_token,
-         scenic::ViewRefPair view_ref_pair,
+         std::pair<fuchsia::ui::views::ViewRefControl,
+                   fuchsia::ui::views::ViewRef> view_ref_pair,
          UniqueFDIONS fdio_ns,
          fidl::InterfaceRequest<fuchsia::io::Directory> directory_request,
          FlutterRunnerProductConfiguration product_config,
-         const std::vector<std::string>& dart_entrypoint_args,
-         bool for_v1_component);
+         const std::vector<std::string>& dart_entrypoint_args);
 
   ~Engine();
 
@@ -90,16 +72,15 @@ class Engine final : public fuchsia::memorypressure::Watcher {
 
  private:
   void Initialize(
-      bool use_flatland,
-      scenic::ViewRefPair view_ref_pair,
+      std::pair<fuchsia::ui::views::ViewRefControl, fuchsia::ui::views::ViewRef>
+          view_ref_pair,
       std::shared_ptr<sys::ServiceDirectory> svc,
       std::shared_ptr<sys::ServiceDirectory> runner_services,
       flutter::Settings settings,
       UniqueFDIONS fdio_ns,
       fidl::InterfaceRequest<fuchsia::io::Directory> directory_request,
       FlutterRunnerProductConfiguration product_config,
-      const std::vector<std::string>& dart_entrypoint_args,
-      bool for_v1_component);
+      const std::vector<std::string>& dart_entrypoint_args);
 
   static void WarmupSkps(
       fml::BasicTaskRunner* concurrent_task_runner,
@@ -118,24 +99,16 @@ class Engine final : public fuchsia::memorypressure::Watcher {
   void Terminate();
 
   void DebugWireframeSettingsChanged(bool enabled);
-  void CreateGfxView(int64_t view_id,
-                     ViewCallback on_view_created,
-                     GfxViewIdCallback on_view_bound,
-                     bool hit_testable,
-                     bool focusable);
-  void CreateFlatlandView(int64_t view_id,
-                          ViewCallback on_view_created,
-                          FlatlandViewCreatedCallback on_view_bound,
-                          bool hit_testable,
-                          bool focusable);
+  void CreateView(int64_t view_id,
+                  ViewCallback on_view_created,
+                  ViewCreatedCallback on_view_bound,
+                  bool hit_testable,
+                  bool focusable);
   void UpdateView(int64_t view_id,
                   SkRect occlusion_hint,
                   bool hit_testable,
-                  bool focusable,
-                  bool use_flatland);
-  void DestroyGfxView(int64_t view_id, GfxViewIdCallback on_view_unbound);
-  void DestroyFlatlandView(int64_t view_id,
-                           FlatlandViewIdCallback on_view_unbound);
+                  bool focusable);
+  void DestroyView(int64_t view_id, ViewIdCallback on_view_unbound);
 
   // |fuchsia::memorypressure::Watcher|
   void OnLevelChanged(fuchsia::memorypressure::Level level,
@@ -151,15 +124,11 @@ class Engine final : public fuchsia::memorypressure::Watcher {
   const std::string thread_label_;
   flutter::ThreadHost thread_host_;
 
-  fuchsia::ui::views::ViewToken view_token_;
   fuchsia::ui::views::ViewCreationToken view_creation_token_;
-  std::shared_ptr<GfxSessionConnection>
-      session_connection_;  // Must come before surface_producer_
   std::shared_ptr<FlatlandConnection>
       flatland_connection_;  // Must come before surface_producer_
   std::shared_ptr<SurfaceProducer> surface_producer_;
-  std::shared_ptr<GfxExternalViewEmbedder> external_view_embedder_;
-  std::shared_ptr<FlatlandExternalViewEmbedder> flatland_view_embedder_;
+  std::shared_ptr<ExternalViewEmbedder> view_embedder_;
 
   std::unique_ptr<IsolateConfigurator> isolate_configurator_;
   std::unique_ptr<flutter::Shell> shell_;
@@ -184,4 +153,4 @@ class Engine final : public fuchsia::memorypressure::Watcher {
 
 }  // namespace flutter_runner
 
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_ENGINE_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_ENGINE_H_
diff --git a/shell/platform/fuchsia/flutter/flatland_external_view_embedder.cc b/shell/platform/fuchsia/flutter/external_view_embedder.cc
similarity index 79%
rename from shell/platform/fuchsia/flutter/flatland_external_view_embedder.cc
rename to shell/platform/fuchsia/flutter/external_view_embedder.cc
index 4d8d948e6ee670b1bcb1dbea0d5894fffd105d62..4f630c75e2c794c0ab4930a2655f127888a1866e 100644
--- a/shell/platform/fuchsia/flutter/flatland_external_view_embedder.cc
+++ b/shell/platform/fuchsia/flutter/external_view_embedder.cc
@@ -2,25 +2,24 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flatland_external_view_embedder.h"
+#include "external_view_embedder.h"
+
 #include <algorithm>
 #include <cstdint>
 
+#include "flutter/common/constants.h"
 #include "flutter/fml/trace_event.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/core/SkSurface.h"
+#include "third_party/skia/include/gpu/GrDirectContext.h"
+#include "third_party/skia/include/gpu/GrRecordingContext.h"
 
 namespace flutter_runner {
 namespace {
 
-// Since the flatland hit-region can be transformed (rotated, scaled or
-// translated), we must ensure that the size of the hit-region will not cause
-// overflows on operations (like FLT_MAX would).
-constexpr float kMaxHitRegionSize = 1'000'000.f;
-
 void AttachClipTransformChild(
     FlatlandConnection* flatland,
-    FlatlandExternalViewEmbedder::ClipTransform* parent_clip_transform,
+    ExternalViewEmbedder::ClipTransform* parent_clip_transform,
     const fuchsia::ui::composition::TransformId& child_transform_id) {
   flatland->flatland()->AddChild(parent_clip_transform->transform_id,
                                  child_transform_id);
@@ -29,7 +28,7 @@ void AttachClipTransformChild(
 
 void DetachClipTransformChildren(
     FlatlandConnection* flatland,
-    FlatlandExternalViewEmbedder::ClipTransform* clip_transform) {
+    ExternalViewEmbedder::ClipTransform* clip_transform) {
   for (auto& child : clip_transform->children) {
     flatland->flatland()->RemoveChild(clip_transform->transform_id, child);
   }
@@ -38,7 +37,7 @@ void DetachClipTransformChildren(
 
 }  // namespace
 
-FlatlandExternalViewEmbedder::FlatlandExternalViewEmbedder(
+ExternalViewEmbedder::ExternalViewEmbedder(
     fuchsia::ui::views::ViewCreationToken view_creation_token,
     fuchsia::ui::views::ViewIdentityOnCreation view_identity,
     fuchsia::ui::composition::ViewBoundProtocols view_protocols,
@@ -59,25 +58,19 @@ FlatlandExternalViewEmbedder::FlatlandExternalViewEmbedder(
   if (intercept_all_input) {
     input_interceptor_transform_ = flatland_->NextTransformId();
     flatland_->flatland()->CreateTransform(*input_interceptor_transform_);
+    flatland_->flatland()->SetInfiniteHitRegion(
+        *input_interceptor_transform_,
+        fuchsia::ui::composition::HitTestInteraction::SEMANTICALLY_INVISIBLE);
 
     flatland_->flatland()->AddChild(root_transform_id_,
                                     *input_interceptor_transform_);
     child_transforms_.emplace_back(*input_interceptor_transform_);
-
-    // Attach full-screen hit testing shield. Note that since the hit-region
-    // may be transformed (translated, rotated), we do not want to set
-    // width/height to FLT_MAX. This will cause a numeric overflow.
-    flatland_->flatland()->SetHitRegions(
-        *input_interceptor_transform_,
-        {{{0, 0, kMaxHitRegionSize, kMaxHitRegionSize},
-          fuchsia::ui::composition::HitTestInteraction::
-              SEMANTICALLY_INVISIBLE}});
   }
 }
 
-FlatlandExternalViewEmbedder::~FlatlandExternalViewEmbedder() = default;
+ExternalViewEmbedder::~ExternalViewEmbedder() = default;
 
-SkCanvas* FlatlandExternalViewEmbedder::GetRootCanvas() {
+flutter::DlCanvas* ExternalViewEmbedder::GetRootCanvas() {
   auto found = frame_layers_.find(kRootLayerId);
   if (found == frame_layers_.end()) {
     FML_LOG(WARNING)
@@ -90,24 +83,8 @@ SkCanvas* FlatlandExternalViewEmbedder::GetRootCanvas() {
   return found->second.canvas_spy->GetSpyingCanvas();
 }
 
-std::vector<SkCanvas*> FlatlandExternalViewEmbedder::GetCurrentCanvases() {
-  std::vector<SkCanvas*> canvases;
-  for (const auto& layer : frame_layers_) {
-    // This method (for legacy reasons) expects non-root current canvases.
-    if (layer.first.has_value()) {
-      canvases.push_back(layer.second.canvas_spy->GetSpyingCanvas());
-    }
-  }
-  return canvases;
-}
-
-std::vector<flutter::DisplayListBuilder*>
-FlatlandExternalViewEmbedder::GetCurrentBuilders() {
-  return std::vector<flutter::DisplayListBuilder*>();
-}
-
-void FlatlandExternalViewEmbedder::PrerollCompositeEmbeddedView(
-    int view_id,
+void ExternalViewEmbedder::PrerollCompositeEmbeddedView(
+    int64_t view_id,
     std::unique_ptr<flutter::EmbeddedViewParams> params) {
   zx_handle_t handle = static_cast<zx_handle_t>(view_id);
   FML_CHECK(frame_layers_.count(handle) == 0);
@@ -118,28 +95,28 @@ void FlatlandExternalViewEmbedder::PrerollCompositeEmbeddedView(
   frame_composition_order_.push_back(handle);
 }
 
-flutter::EmbedderPaintContext
-FlatlandExternalViewEmbedder::CompositeEmbeddedView(int view_id) {
+flutter::DlCanvas* ExternalViewEmbedder::CompositeEmbeddedView(
+    int64_t view_id) {
   zx_handle_t handle = static_cast<zx_handle_t>(view_id);
   auto found = frame_layers_.find(handle);
   FML_CHECK(found != frame_layers_.end());
 
-  return {found->second.canvas_spy->GetSpyingCanvas(), nullptr};
+  return found->second.canvas_spy->GetSpyingCanvas();
 }
 
-flutter::PostPrerollResult FlatlandExternalViewEmbedder::PostPrerollAction(
-    fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
+flutter::PostPrerollResult ExternalViewEmbedder::PostPrerollAction(
+    const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {
   return flutter::PostPrerollResult::kSuccess;
 }
 
-void FlatlandExternalViewEmbedder::BeginFrame(
-    SkISize frame_size,
+void ExternalViewEmbedder::BeginFrame(
     GrDirectContext* context,
-    double device_pixel_ratio,
-    fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
-  TRACE_EVENT0("flutter", "FlatlandExternalViewEmbedder::BeginFrame");
+    const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {}
 
-  // Reset for new frame.
+// |ExternalViewEmbedder|
+void ExternalViewEmbedder::PrepareFlutterView(SkISize frame_size,
+                                              double device_pixel_ratio) {
+  // Reset for new view.
   Reset();
   frame_size_ = frame_size;
   frame_dpr_ = device_pixel_ratio;
@@ -151,16 +128,21 @@ void FlatlandExternalViewEmbedder::BeginFrame(
   frame_composition_order_.push_back(kRootLayerId);
 }
 
-void FlatlandExternalViewEmbedder::EndFrame(
+void ExternalViewEmbedder::EndFrame(
     bool should_resubmit_frame,
-    fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
-  TRACE_EVENT0("flutter", "FlatlandExternalViewEmbedder::EndFrame");
+    const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {
+  TRACE_EVENT0("flutter", "ExternalViewEmbedder::EndFrame");
 }
 
-void FlatlandExternalViewEmbedder::SubmitFrame(
+void ExternalViewEmbedder::SubmitFlutterView(
+    int64_t flutter_view_id,
     GrDirectContext* context,
+    const std::shared_ptr<impeller::AiksContext>& aiks_context,
     std::unique_ptr<flutter::SurfaceFrame> frame) {
-  TRACE_EVENT0("flutter", "FlatlandExternalViewEmbedder::SubmitFrame");
+  // Fuchsia only supports operating the implicit view for now.
+  FML_DCHECK(flutter_view_id == flutter::kFlutterImplicitViewId);
+
+  TRACE_EVENT0("flutter", "ExternalViewEmbedder::SubmitFlutterView");
   std::vector<std::unique_ptr<SurfaceProducerSurface>> frame_surfaces;
   std::unordered_map<EmbedderLayerId, size_t> frame_surface_indices;
 
@@ -235,7 +217,7 @@ void FlatlandExternalViewEmbedder::SubmitFrame(
     const float inv_dpr = 1.0f / frame_dpr_;
     flatland_->flatland()->SetScale(root_transform_id_, {inv_dpr, inv_dpr});
 
-    size_t flatland_layer_index = 0;
+    size_t layer_index = 0;
     for (const auto& layer_id : frame_composition_order_) {
       const auto& layer = frame_layers_.find(layer_id);
       FML_CHECK(layer != frame_layers_.end());
@@ -245,10 +227,10 @@ void FlatlandExternalViewEmbedder::SubmitFrame(
         FML_CHECK(layer->second.embedded_view_params.has_value());
         auto& view_params = layer->second.embedded_view_params.value();
 
-        // Get the FlatlandView structure corresponding to the platform view.
-        auto found = flatland_views_.find(layer_id.value());
-        FML_CHECK(found != flatland_views_.end())
-            << "No FlatlandView for layer_id = " << layer_id.value()
+        // Get the View structure corresponding to the platform view.
+        auto found = views_.find(layer_id.value());
+        FML_CHECK(found != views_.end())
+            << "No View for layer_id = " << layer_id.value()
             << ". This typically indicates that the Dart code in "
                "Fuchsia's fuchsia_scenic_flutter library failed to create "
                "the platform view, leading to a crash later down the road in "
@@ -261,8 +243,26 @@ void FlatlandExternalViewEmbedder::SubmitFrame(
         const ViewMutators view_mutators =
             ParseMutatorStack(view_params.mutatorsStack());
         const SkSize view_size = view_params.sizePoints();
-        FML_CHECK(view_mutators.total_transform ==
-                  view_params.transformMatrix());
+
+        // Verify that we're unpacking the mutators' transform matrix correctly.
+        // Use built-in get method for SkMatrix to get values, see:
+        // https://source.corp.google.com/piper///depot/google3/third_party/skia/HEAD/include/core/SkMatrix.h;l=391
+        for (int index = 0; index < 9; index++) {
+          const SkScalar mutators_transform_value =
+              view_mutators.total_transform.get(index);
+          const SkScalar params_transform_value =
+              view_params.transformMatrix().get(index);
+          if (!SkScalarNearlyEqual(mutators_transform_value,
+                                   params_transform_value, 0.0005f)) {
+            FML_LOG(ERROR)
+                << "Assertion failed: view_mutators.total_transform[" << index
+                << "] (" << mutators_transform_value
+                << ") != view_params.transformMatrix()[" << index << "] ("
+                << params_transform_value
+                << "). This likely means there is a bug with the "
+                << "logic for parsing embedded views' transform matrices.";
+          }
+        }
 
         if (viewport.pending_create_viewport_callback) {
           if (view_size.fWidth && view_size.fHeight) {
@@ -361,7 +361,7 @@ void FlatlandExternalViewEmbedder::SubmitFrame(
           viewport.occlusion_hint = viewport.pending_occlusion_hint;
         }
 
-        // Attach the FlatlandView to the main scene graph.
+        // Attach the View to the main scene graph.
         const auto main_child_transform =
             viewport.mutators.clips.empty()
                 ? viewport.transform_id
@@ -392,17 +392,16 @@ void FlatlandExternalViewEmbedder::SubmitFrame(
       // Draw the layer if we acquired a surface for it successfully.
       if (surface_for_layer != nullptr) {
         // Create a new layer if needed for the surface.
-        FML_CHECK(flatland_layer_index <= flatland_layers_.size());
-        if (flatland_layer_index == flatland_layers_.size()) {
-          FlatlandLayer new_layer{.transform_id = flatland_->NextTransformId()};
+        FML_CHECK(layer_index <= layers_.size());
+        if (layer_index == layers_.size()) {
+          Layer new_layer{.transform_id = flatland_->NextTransformId()};
           flatland_->flatland()->CreateTransform(new_layer.transform_id);
-          flatland_layers_.emplace_back(std::move(new_layer));
+          layers_.emplace_back(std::move(new_layer));
         }
 
         // Update the image content and set size.
-        flatland_->flatland()->SetContent(
-            flatland_layers_[flatland_layer_index].transform_id,
-            {surface_for_layer->GetImageId()});
+        flatland_->flatland()->SetContent(layers_[layer_index].transform_id,
+                                          {surface_for_layer->GetImageId()});
         flatland_->flatland()->SetImageDestinationSize(
             {surface_for_layer->GetImageId()},
             {static_cast<uint32_t>(surface_for_layer->GetSize().width()),
@@ -412,9 +411,8 @@ void FlatlandExternalViewEmbedder::SubmitFrame(
         // For now, we assume any layer beyond the first has alpha.
         flatland_->flatland()->SetImageBlendingFunction(
             {surface_for_layer->GetImageId()},
-            flatland_layer_index == 0
-                ? fuchsia::ui::composition::BlendMode::SRC
-                : fuchsia::ui::composition::BlendMode::SRC_OVER);
+            layer_index == 0 ? fuchsia::ui::composition::BlendMode::SRC
+                             : fuchsia::ui::composition::BlendMode::SRC_OVER);
 
         // Set hit regions for this layer; these hit regions correspond to the
         // portions of the layer on which skia drew content.
@@ -437,25 +435,22 @@ void FlatlandExternalViewEmbedder::SubmitFrame(
           }
 
           flatland_->flatland()->SetHitRegions(
-              flatland_layers_[flatland_layer_index].transform_id,
-              std::move(hit_regions));
+              layers_[layer_index].transform_id, std::move(hit_regions));
         }
 
-        // Attach the FlatlandLayer to the main scene graph.
-        flatland_->flatland()->AddChild(
-            root_transform_id_,
-            flatland_layers_[flatland_layer_index].transform_id);
-        child_transforms_.emplace_back(
-            flatland_layers_[flatland_layer_index].transform_id);
+        // Attach the Layer to the main scene graph.
+        flatland_->flatland()->AddChild(root_transform_id_,
+                                        layers_[layer_index].transform_id);
+        child_transforms_.emplace_back(layers_[layer_index].transform_id);
       }
 
       // Reset for the next pass:
-      flatland_layer_index++;
+      layer_index++;
     }
 
-    // Set up the input interceptor at the top of the
-    // scene, if applicable.  It will capture all input, and any unwanted input
-    // will be reinjected into embedded views.
+    // Set up the input interceptor at the top of the scene, if applicable. It
+    // will capture all input, and any unwanted input will be reinjected into
+    // embedded views.
     if (input_interceptor_transform_.has_value()) {
       flatland_->flatland()->AddChild(root_transform_id_,
                                       *input_interceptor_transform_);
@@ -495,7 +490,10 @@ void FlatlandExternalViewEmbedder::SubmitFrame(
       canvas->setMatrix(SkMatrix::I());
       canvas->clear(SK_ColorTRANSPARENT);
       canvas->drawPicture(layer->second.picture);
-      canvas->flush();
+      if (GrDirectContext* direct_context =
+              GrAsDirectContext(canvas->recordingContext())) {
+        direct_context->flushAndSubmit();
+      }
     }
   }
 
@@ -510,16 +508,14 @@ void FlatlandExternalViewEmbedder::SubmitFrame(
   frame->Submit();
 }
 
-void FlatlandExternalViewEmbedder::CreateView(
-    int64_t view_id,
-    ViewCallback on_view_created,
-    FlatlandViewCreatedCallback on_view_bound) {
-  FML_CHECK(flatland_views_.find(view_id) == flatland_views_.end());
+void ExternalViewEmbedder::CreateView(int64_t view_id,
+                                      ViewCallback on_view_created,
+                                      ViewCreatedCallback on_view_bound) {
+  FML_CHECK(views_.find(view_id) == views_.end());
 
   const auto transform_id = flatland_->NextTransformId();
   const auto viewport_id = flatland_->NextContentId();
-  FlatlandView new_view = {.transform_id = transform_id,
-                           .viewport_id = viewport_id};
+  View new_view = {.transform_id = transform_id, .viewport_id = viewport_id};
   flatland_->flatland()->CreateTransform(new_view.transform_id);
   fuchsia::ui::composition::ChildViewWatcherHandle child_view_watcher;
   new_view.pending_create_viewport_callback =
@@ -541,19 +537,18 @@ void FlatlandExternalViewEmbedder::CreateView(
 
   on_view_created();
   on_view_bound(new_view.viewport_id, std::move(child_view_watcher));
-  flatland_views_.emplace(std::make_pair(view_id, std::move(new_view)));
+  views_.emplace(std::make_pair(view_id, std::move(new_view)));
 }
 
-void FlatlandExternalViewEmbedder::DestroyView(
-    int64_t view_id,
-    FlatlandViewIdCallback on_view_unbound) {
-  auto flatland_view = flatland_views_.find(view_id);
-  FML_CHECK(flatland_view != flatland_views_.end());
-
-  auto viewport_id = flatland_view->second.viewport_id;
-  auto transform_id = flatland_view->second.transform_id;
-  auto& clip_transforms = flatland_view->second.clip_transforms;
-  if (!flatland_view->second.pending_create_viewport_callback) {
+void ExternalViewEmbedder::DestroyView(int64_t view_id,
+                                       ViewIdCallback on_view_unbound) {
+  auto view = views_.find(view_id);
+  FML_CHECK(view != views_.end());
+
+  auto viewport_id = view->second.viewport_id;
+  auto transform_id = view->second.transform_id;
+  auto& clip_transforms = view->second.clip_transforms;
+  if (!view->second.pending_create_viewport_callback) {
     flatland_->flatland()->ReleaseViewport(viewport_id, [](auto) {});
   }
   auto itr = std::find_if(
@@ -576,17 +571,16 @@ void FlatlandExternalViewEmbedder::DestroyView(
     flatland_->flatland()->ReleaseTransform(clip_transform.transform_id);
   }
 
-  flatland_views_.erase(flatland_view);
+  views_.erase(view);
   on_view_unbound(viewport_id);
 }
 
-void FlatlandExternalViewEmbedder::SetViewProperties(
-    int64_t view_id,
-    const SkRect& occlusion_hint,
-    bool hit_testable,
-    bool focusable) {
-  auto found = flatland_views_.find(view_id);
-  FML_CHECK(found != flatland_views_.end());
+void ExternalViewEmbedder::SetViewProperties(int64_t view_id,
+                                             const SkRect& occlusion_hint,
+                                             bool hit_testable,
+                                             bool focusable) {
+  auto found = views_.find(view_id);
+  FML_CHECK(found != views_.end());
 
   // Note that pending_create_viewport_callback might not have run at this
   // point.
@@ -594,7 +588,7 @@ void FlatlandExternalViewEmbedder::SetViewProperties(
   viewport.pending_occlusion_hint = occlusion_hint;
 }
 
-void FlatlandExternalViewEmbedder::Reset() {
+void ExternalViewEmbedder::Reset() {
   frame_layers_.clear();
   frame_composition_order_.clear();
   frame_size_ = SkISize::Make(0, 0);
@@ -607,13 +601,12 @@ void FlatlandExternalViewEmbedder::Reset() {
   child_transforms_.clear();
 
   // Clear images on all layers so they aren't cached unnecessarily.
-  for (const auto& layer : flatland_layers_) {
+  for (const auto& layer : layers_) {
     flatland_->flatland()->SetContent(layer.transform_id, {0});
   }
 }
 
-FlatlandExternalViewEmbedder::ViewMutators
-FlatlandExternalViewEmbedder::ParseMutatorStack(
+ExternalViewEmbedder::ViewMutators ExternalViewEmbedder::ParseMutatorStack(
     const flutter::MutatorsStack& mutators_stack) {
   ViewMutators mutators;
   SkMatrix total_transform = SkMatrix::I();
diff --git a/shell/platform/fuchsia/flutter/flatland_external_view_embedder.h b/shell/platform/fuchsia/flutter/external_view_embedder.h
similarity index 75%
rename from shell/platform/fuchsia/flutter/flatland_external_view_embedder.h
rename to shell/platform/fuchsia/flutter/external_view_embedder.h
index b12ef0f8c107451e7ec5b3f381482e90da852ac2..5c002724990633155d9285139eb6539d7c9b3e1b 100644
--- a/shell/platform/fuchsia/flutter/flatland_external_view_embedder.h
+++ b/shell/platform/fuchsia/flutter/external_view_embedder.h
@@ -2,13 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_FLATLAND_EXTERNAL_VIEW_EMBEDDER_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_FLATLAND_EXTERNAL_VIEW_EMBEDDER_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_EXTERNAL_VIEW_EMBEDDER_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_EXTERNAL_VIEW_EMBEDDER_H_
 
 #include <fuchsia/ui/composition/cpp/fidl.h>
 #include <fuchsia/ui/views/cpp/fidl.h>
 #include <lib/fit/function.h>
-#include <lib/ui/scenic/cpp/view_ref_pair.h>
 
 #include <cstdint>  // For uint32_t & uint64_t
 #include <memory>
@@ -17,11 +16,10 @@
 #include <vector>
 
 #include "flutter/flow/embedded_views.h"
-#include "flutter/flow/rtree.h"
 #include "flutter/fml/logging.h"
 #include "flutter/fml/macros.h"
-#include "flutter/shell/common/canvas_spy.h"
-#include "third_party/skia/include/core/SkCanvas.h"
+#include "flutter/shell/platform/fuchsia/flutter/canvas_spy.h"
+#include "flutter/shell/platform/fuchsia/flutter/rtree.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "third_party/skia/include/core/SkPoint.h"
 #include "third_party/skia/include/core/SkRect.h"
@@ -34,21 +32,19 @@
 namespace flutter_runner {
 
 using ViewCallback = std::function<void()>;
-using FlatlandViewCreatedCallback = std::function<void(
+using ViewCreatedCallback = std::function<void(
     fuchsia::ui::composition::ContentId,
     fuchsia::ui::composition::ChildViewWatcherHandle child_view_watcher)>;
-using FlatlandViewIdCallback =
-    std::function<void(fuchsia::ui::composition::ContentId)>;
+using ViewIdCallback = std::function<void(fuchsia::ui::composition::ContentId)>;
 
-// This class orchestrates interaction with the Scenic's Flatland compositor on
+// This class orchestrates interaction with the Scenic's compositor on
 // Fuchsia. It ensures that flutter content and platform view content are both
 // rendered correctly in a unified scene.
-class FlatlandExternalViewEmbedder final
-    : public flutter::ExternalViewEmbedder {
+class ExternalViewEmbedder final : public flutter::ExternalViewEmbedder {
  public:
-  constexpr static uint32_t kFlatlandDefaultViewportSize = 32;
+  constexpr static uint32_t kDefaultViewportSize = 32;
 
-  FlatlandExternalViewEmbedder(
+  ExternalViewEmbedder(
       fuchsia::ui::views::ViewCreationToken view_creation_token,
       fuchsia::ui::views::ViewIdentityOnCreation view_identity,
       fuchsia::ui::composition::ViewBoundProtocols endpoints,
@@ -57,44 +53,44 @@ class FlatlandExternalViewEmbedder final
       std::shared_ptr<FlatlandConnection> flatland,
       std::shared_ptr<SurfaceProducer> surface_producer,
       bool intercept_all_input = false);
-  ~FlatlandExternalViewEmbedder();
+  ~ExternalViewEmbedder();
 
   // |ExternalViewEmbedder|
-  SkCanvas* GetRootCanvas() override;
-
-  // |ExternalViewEmbedder|
-  std::vector<SkCanvas*> GetCurrentCanvases() override;
-
-  // |ExternalViewEmbedder|
-  std::vector<flutter::DisplayListBuilder*> GetCurrentBuilders() override;
+  flutter::DlCanvas* GetRootCanvas() override;
 
   // |ExternalViewEmbedder|
   void PrerollCompositeEmbeddedView(
-      int view_id,
+      int64_t view_id,
       std::unique_ptr<flutter::EmbeddedViewParams> params) override;
 
   // |ExternalViewEmbedder|
-  flutter::EmbedderPaintContext CompositeEmbeddedView(int view_id) override;
+  flutter::DlCanvas* CompositeEmbeddedView(int64_t view_id) override;
 
   // |ExternalViewEmbedder|
   flutter::PostPrerollResult PostPrerollAction(
-      fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) override;
+      const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger)
+      override;
 
   // |ExternalViewEmbedder|
-  void BeginFrame(
-      SkISize frame_size,
-      GrDirectContext* context,
-      double device_pixel_ratio,
-      fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) override;
+  void BeginFrame(GrDirectContext* context,
+                  const fml::RefPtr<fml::RasterThreadMerger>&
+                      raster_thread_merger) override;
+
+  // |ExternalViewEmbedder|
+  void PrepareFlutterView(SkISize frame_size,
+                          double device_pixel_ratio) override;
 
   // |ExternalViewEmbedder|
-  void EndFrame(
-      bool should_resubmit_frame,
-      fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) override;
+  void EndFrame(bool should_resubmit_frame,
+                const fml::RefPtr<fml::RasterThreadMerger>&
+                    raster_thread_merger) override;
 
   // |ExternalViewEmbedder|
-  void SubmitFrame(GrDirectContext* context,
-                   std::unique_ptr<flutter::SurfaceFrame> frame) override;
+  void SubmitFlutterView(
+      int64_t flutter_view_id,
+      GrDirectContext* context,
+      const std::shared_ptr<impeller::AiksContext>& aiks_context,
+      std::unique_ptr<flutter::SurfaceFrame> frame) override;
 
   // |ExternalViewEmbedder|
   void CancelFrame() override { Reset(); }
@@ -107,14 +103,14 @@ class FlatlandExternalViewEmbedder final
   // properties for the next |UpdateView| call.
   void CreateView(int64_t view_id,
                   ViewCallback on_view_created,
-                  FlatlandViewCreatedCallback on_view_bound);
-  void DestroyView(int64_t view_id, FlatlandViewIdCallback on_view_unbound);
+                  ViewCreatedCallback on_view_bound);
+  void DestroyView(int64_t view_id, ViewIdCallback on_view_unbound);
   void SetViewProperties(int64_t view_id,
                          const SkRect& occlusion_hint,
                          bool hit_testable,
                          bool focusable);
 
-  // Holds the clip transform that may be applied on a FlatlandView.
+  // Holds the clip transform that may be applied on a View.
   struct ClipTransform {
     fuchsia::ui::composition::TransformId transform_id;
     std::vector<fuchsia::ui::composition::TransformId> children;
@@ -171,6 +167,8 @@ class FlatlandExternalViewEmbedder final
 
     std::optional<flutter::EmbeddedViewParams> embedded_view_params;
     std::unique_ptr<SkPictureRecorder> recorder;
+    // TODO(cyanglaz: use DlOpSpy instead.
+    // https://github.com/flutter/flutter/issues/123805
     std::unique_ptr<flutter::CanvasSpy> canvas_spy;
     SkISize surface_size;
     sk_sp<SkPicture> picture;
@@ -178,7 +176,7 @@ class FlatlandExternalViewEmbedder final
   using EmbedderLayerId = std::optional<uint32_t>;
   constexpr static EmbedderLayerId kRootLayerId = EmbedderLayerId{};
 
-  struct FlatlandView {
+  struct View {
     std::vector<ClipTransform> clip_transforms;
     fuchsia::ui::composition::TransformId transform_id;
     fuchsia::ui::composition::ContentId viewport_id;
@@ -190,7 +188,7 @@ class FlatlandExternalViewEmbedder final
         pending_create_viewport_callback;
   };
 
-  struct FlatlandLayer {
+  struct Layer {
     // Transform on which Images are set.
     fuchsia::ui::composition::TransformId transform_id;
   };
@@ -202,8 +200,8 @@ class FlatlandExternalViewEmbedder final
 
   fuchsia::ui::composition::TransformId root_transform_id_;
 
-  std::unordered_map<int64_t, FlatlandView> flatland_views_;
-  std::vector<FlatlandLayer> flatland_layers_;
+  std::unordered_map<int64_t, View> views_;
+  std::vector<Layer> layers_;
 
   std::unordered_map<EmbedderLayerId, EmbedderLayer> frame_layers_;
   std::vector<EmbedderLayerId> frame_composition_order_;
@@ -216,9 +214,9 @@ class FlatlandExternalViewEmbedder final
   std::optional<fuchsia::ui::composition::TransformId>
       input_interceptor_transform_;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(FlatlandExternalViewEmbedder);
+  FML_DISALLOW_COPY_AND_ASSIGN(ExternalViewEmbedder);
 };
 
 }  // namespace flutter_runner
 
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_FLATLAND_EXTERNAL_VIEW_EMBEDDER_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_EXTERNAL_VIEW_EMBEDDER_H_
diff --git a/shell/platform/fuchsia/flutter/file_in_namespace_buffer.h b/shell/platform/fuchsia/flutter/file_in_namespace_buffer.h
index 2a075edbd0f944bb89de4f387385aed314d12d7d..5eeba20f3697ddf60f617960df7c6b250123b550 100644
--- a/shell/platform/fuchsia/flutter/file_in_namespace_buffer.h
+++ b/shell/platform/fuchsia/flutter/file_in_namespace_buffer.h
@@ -1,8 +1,8 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FILE_IN_NAMESPACE_BUFFER_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FILE_IN_NAMESPACE_BUFFER_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_FILE_IN_NAMESPACE_BUFFER_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_FILE_IN_NAMESPACE_BUFFER_H_
 
 #include "flutter/fml/mapping.h"
 
@@ -56,4 +56,4 @@ std::unique_ptr<fml::FileMapping> MakeFileMapping(const char* path,
 
 }  // namespace flutter_runner
 
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FILE_IN_NAMESPACE_BUFFER_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_FILE_IN_NAMESPACE_BUFFER_H_
diff --git a/shell/platform/fuchsia/flutter/flatland_connection.cc b/shell/platform/fuchsia/flutter/flatland_connection.cc
index ec7846a5ed1c0ce0206073ed1ed978a5d99f72ea..cfc7ea092345554ac37ac6f5c7da5fb548796fac 100644
--- a/shell/platform/fuchsia/flutter/flatland_connection.cc
+++ b/shell/platform/fuchsia/flutter/flatland_connection.cc
@@ -7,16 +7,25 @@
 #include <zircon/status.h>
 
 #include "flutter/fml/logging.h"
+#include "flutter/fml/trace_event.h"
 
 namespace flutter_runner {
 
+namespace {
+
+// Helper function for traces.
+double DeltaFromNowInNanoseconds(const fml::TimePoint& now,
+                                 const fml::TimePoint& time) {
+  return (time - now).ToNanoseconds();
+}
+
+}  // namespace
+
 FlatlandConnection::FlatlandConnection(
     std::string debug_label,
     fuchsia::ui::composition::FlatlandHandle flatland,
     fml::closure error_callback,
-    on_frame_presented_event on_frame_presented_callback,
-    uint64_t max_frames_in_flight,
-    fml::TimeDelta vsync_offset)
+    on_frame_presented_event on_frame_presented_callback)
     : flatland_(flatland.Bind()),
       error_callback_(error_callback),
       on_frame_presented_callback_(std::move(on_frame_presented_callback)) {
@@ -37,28 +46,30 @@ FlatlandConnection::~FlatlandConnection() = default;
 
 // This method is called from the raster thread.
 void FlatlandConnection::Present() {
-  if (!threadsafe_state_.first_present_called_) {
-    std::scoped_lock<std::mutex> lock(threadsafe_state_.mutex_);
-    threadsafe_state_.first_present_called_ = true;
-  }
-  if (present_credits_ > 0) {
+  TRACE_DURATION("flutter", "FlatlandConnection::Present");
+  std::scoped_lock<std::mutex> lock(threadsafe_state_.mutex_);
+  if (threadsafe_state_.present_credits_ > 0) {
     DoPresent();
   } else {
-    present_pending_ = true;
+    present_waiting_for_credit_ = true;
   }
 }
 
 // This method is called from the raster thread.
 void FlatlandConnection::DoPresent() {
-  FML_CHECK(present_credits_ > 0);
-  --present_credits_;
+  TRACE_DURATION("flutter", "FlatlandConnection::DoPresent");
+  TRACE_FLOW_BEGIN("gfx", "Flatland::Present", next_present_trace_id_);
+  ++next_present_trace_id_;
+
+  FML_CHECK(threadsafe_state_.present_credits_ > 0);
+  --threadsafe_state_.present_credits_;
 
   fuchsia::ui::composition::PresentArgs present_args;
-  // TODO(fxbug.dev/114588): compute a better presentation time;
   present_args.set_requested_presentation_time(0);
   present_args.set_acquire_fences(std::move(acquire_fences_));
   present_args.set_release_fences(std::move(previous_present_release_fences_));
-  present_args.set_unsquashable(false);
+  // Frame rate over latency.
+  present_args.set_unsquashable(true);
   flatland_->Present(std::move(present_args));
 
   // In Flatland, release fences apply to the content of the previous present.
@@ -71,36 +82,44 @@ void FlatlandConnection::DoPresent() {
 
 // This method is called from the UI thread.
 void FlatlandConnection::AwaitVsync(FireCallbackCallback callback) {
+  TRACE_DURATION("flutter", "FlatlandConnection::AwaitVsync");
+
   std::scoped_lock<std::mutex> lock(threadsafe_state_.mutex_);
+  threadsafe_state_.pending_fire_callback_ = nullptr;
+  const auto now = fml::TimePoint::Now();
 
-  // Immediately fire callbacks until the first Present. We might receive
-  // multiple requests for AwaitVsync() until the first Present, which relies on
-  // receiving size on FlatlandPlatformView::OnGetLayout() at an uncertain time.
-  if (!threadsafe_state_.first_present_called_) {
-    fml::TimePoint now = fml::TimePoint::Now();
-    callback(now, now + kDefaultFlatlandPresentationInterval);
+  // Initial case.
+  if (MaybeRunInitialVsyncCallback(now, callback))
     return;
-  }
 
-  threadsafe_state_.fire_callback_ = callback;
-
-  if (threadsafe_state_.fire_callback_pending_) {
-    fml::TimePoint now = fml::TimePoint::Now();
-    // TODO(fxbug.dev/114588): Calculate correct frame times.
-    threadsafe_state_.fire_callback_(
-        now, now + kDefaultFlatlandPresentationInterval);
-    threadsafe_state_.fire_callback_ = nullptr;
-    threadsafe_state_.fire_callback_pending_ = false;
+  // Throttle case.
+  if (threadsafe_state_.present_credits_ == 0) {
+    threadsafe_state_.pending_fire_callback_ = callback;
+    return;
   }
+
+  // Regular case.
+  RunVsyncCallback(now, callback);
 }
 
 // This method is called from the UI thread.
 void FlatlandConnection::AwaitVsyncForSecondaryCallback(
     FireCallbackCallback callback) {
-  fml::TimePoint now = fml::TimePoint::Now();
-  callback(now, now);
+  TRACE_DURATION("flutter",
+                 "FlatlandConnection::AwaitVsyncForSecondaryCallback");
+
+  std::scoped_lock<std::mutex> lock(threadsafe_state_.mutex_);
+  const auto now = fml::TimePoint::Now();
+
+  // Initial case.
+  if (MaybeRunInitialVsyncCallback(now, callback))
+    return;
+
+  // Regular case.
+  RunVsyncCallback(now, callback);
 }
 
+// This method is called from the raster thread.
 void FlatlandConnection::OnError(
     fuchsia::ui::composition::FlatlandError error) {
   FML_LOG(ERROR) << "Flatland error: " << static_cast<int>(error);
@@ -110,24 +129,62 @@ void FlatlandConnection::OnError(
 // This method is called from the raster thread.
 void FlatlandConnection::OnNextFrameBegin(
     fuchsia::ui::composition::OnNextFrameBeginValues values) {
-  present_credits_ += values.additional_present_credits();
+  // Collect now before locking because this is an important timing information
+  // from Scenic.
+  const auto now = fml::TimePoint::Now();
 
-  if (present_pending_ && present_credits_ > 0) {
+  std::scoped_lock<std::mutex> lock(threadsafe_state_.mutex_);
+  threadsafe_state_.first_feedback_received_ = true;
+  threadsafe_state_.present_credits_ += values.additional_present_credits();
+  TRACE_DURATION("flutter", "FlatlandConnection::OnNextFrameBegin",
+                 "present_credits", threadsafe_state_.present_credits_);
+
+  if (present_waiting_for_credit_ && threadsafe_state_.present_credits_ > 0) {
     DoPresent();
-    present_pending_ = false;
+    present_waiting_for_credit_ = false;
   }
 
-  if (present_credits_ > 0) {
-    std::scoped_lock<std::mutex> lock(threadsafe_state_.mutex_);
-    if (threadsafe_state_.fire_callback_) {
-      fml::TimePoint now = fml::TimePoint::Now();
-      // TODO(fxbug.dev/114588): Calculate correct frame times.
-      threadsafe_state_.fire_callback_(
-          now, now + kDefaultFlatlandPresentationInterval);
-      threadsafe_state_.fire_callback_ = nullptr;
-    } else {
-      threadsafe_state_.fire_callback_pending_ = true;
-    }
+  // Update vsync_interval_ by calculating the difference between the first two
+  // presentation times. Flatland always returns >1 presentation_infos, so this
+  // check is to guard against any changes to this assumption.
+  if (values.has_future_presentation_infos() &&
+      values.future_presentation_infos().size() > 1) {
+    threadsafe_state_.vsync_interval_ = fml::TimeDelta::FromNanoseconds(
+        values.future_presentation_infos().at(1).presentation_time() -
+        values.future_presentation_infos().at(0).presentation_time());
+  } else {
+    FML_LOG(WARNING)
+        << "Flatland didn't send enough future_presentation_infos to update "
+           "vsync interval.";
+  }
+
+  // Update next_presentation_times_.
+  std::queue<fml::TimePoint> new_times;
+  for (const auto& info : values.future_presentation_infos()) {
+    new_times.emplace(fml::TimePoint::FromEpochDelta(
+        fml::TimeDelta::FromNanoseconds(info.presentation_time())));
+  }
+  threadsafe_state_.next_presentation_times_.swap(new_times);
+
+  // Update vsync_offset_.
+  // We use modulo here because Flatland may point to the following vsync if
+  // OnNextFrameBegin() is called after the current frame's latch point.
+  auto vsync_offset =
+      (fml::TimePoint::FromEpochDelta(fml::TimeDelta::FromNanoseconds(
+           values.future_presentation_infos().front().presentation_time())) -
+       now) %
+      threadsafe_state_.vsync_interval_;
+  // Thread contention may result in OnNextFrameBegin() being called after the
+  // presentation time. Ignore these outliers.
+  if (vsync_offset > fml::TimeDelta::Zero()) {
+    threadsafe_state_.vsync_offset_ = vsync_offset;
+  }
+
+  // Throttle case.
+  if (threadsafe_state_.pending_fire_callback_ &&
+      threadsafe_state_.present_credits_ > 0) {
+    RunVsyncCallback(now, threadsafe_state_.pending_fire_callback_);
+    threadsafe_state_.pending_fire_callback_ = nullptr;
   }
 }
 
@@ -137,6 +194,68 @@ void FlatlandConnection::OnFramePresented(
   on_frame_presented_callback_(std::move(info));
 }
 
+// Parses and updates next_presentation_times_.
+fml::TimePoint FlatlandConnection::GetNextPresentationTime(
+    const fml::TimePoint& now) {
+  const fml::TimePoint& cutoff =
+      now > threadsafe_state_.last_presentation_time_
+          ? now
+          : threadsafe_state_.last_presentation_time_;
+
+  // Remove presentation times that may have been passed. This may happen after
+  // a long draw call.
+  while (!threadsafe_state_.next_presentation_times_.empty() &&
+         threadsafe_state_.next_presentation_times_.front() <= cutoff) {
+    threadsafe_state_.next_presentation_times_.pop();
+  }
+
+  // Calculate a presentation time based on
+  // |threadsafe_state_.last_presentation_time_| that is later than cutoff using
+  // |vsync_interval| increments if we don't have any future presentation times
+  // left.
+  if (threadsafe_state_.next_presentation_times_.empty()) {
+    auto result = threadsafe_state_.last_presentation_time_;
+    while (result <= cutoff) {
+      result = result + threadsafe_state_.vsync_interval_;
+    }
+    return result;
+  }
+
+  // Return the next presentation time in the queue for the regular case.
+  const auto result = threadsafe_state_.next_presentation_times_.front();
+  threadsafe_state_.next_presentation_times_.pop();
+  return result;
+}
+
+// This method is called from the UI thread.
+bool FlatlandConnection::MaybeRunInitialVsyncCallback(
+    const fml::TimePoint& now,
+    FireCallbackCallback& callback) {
+  if (!threadsafe_state_.first_feedback_received_) {
+    TRACE_DURATION("flutter",
+                   "FlatlandConnection::MaybeRunInitialVsyncCallback");
+    const auto frame_end = now + kInitialFlatlandVsyncOffset;
+    threadsafe_state_.last_presentation_time_ = frame_end;
+    callback(now, frame_end);
+    return true;
+  }
+  return false;
+}
+
+// This method may be called from the raster or UI thread, but it is safe
+// because VsyncWaiter posts the vsync callback on UI thread.
+void FlatlandConnection::RunVsyncCallback(const fml::TimePoint& now,
+                                          FireCallbackCallback& callback) {
+  const auto& frame_end = GetNextPresentationTime(now);
+  const auto& frame_start = frame_end - threadsafe_state_.vsync_offset_;
+  threadsafe_state_.last_presentation_time_ = frame_end;
+  TRACE_DURATION("flutter", "FlatlandConnection::RunVsyncCallback",
+                 "frame_start_delta",
+                 DeltaFromNowInNanoseconds(now, frame_start), "frame_end_delta",
+                 DeltaFromNowInNanoseconds(now, frame_end));
+  callback(frame_start, frame_end);
+}
+
 // This method is called from the raster thread.
 void FlatlandConnection::EnqueueAcquireFence(zx::event fence) {
   acquire_fences_.push_back(std::move(fence));
diff --git a/shell/platform/fuchsia/flutter/flatland_connection.h b/shell/platform/fuchsia/flutter/flatland_connection.h
index 72940ace243cc652b9b8a6f85325b7c69f47b7a9..87020058db6dfc7d46a7698a6d651bd9b8e2d553 100644
--- a/shell/platform/fuchsia/flutter/flatland_connection.h
+++ b/shell/platform/fuchsia/flutter/flatland_connection.h
@@ -2,19 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_DEFAULT_FLATLAND_CONNECTION_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_DEFAULT_FLATLAND_CONNECTION_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_FLATLAND_CONNECTION_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_FLATLAND_CONNECTION_H_
 
 #include <fuchsia/ui/composition/cpp/fidl.h>
 
 #include "flutter/fml/closure.h"
 #include "flutter/fml/macros.h"
 #include "flutter/fml/time/time_delta.h"
+#include "flutter/fml/time/time_point.h"
 
 #include "vsync_waiter.h"
 
 #include <cstdint>
 #include <mutex>
+#include <queue>
 #include <string>
 
 namespace flutter_runner {
@@ -22,9 +24,10 @@ namespace flutter_runner {
 using on_frame_presented_event =
     std::function<void(fuchsia::scenic::scheduling::FramePresentedInfo)>;
 
-// Set to zero for now for maximum simplicity until we have real values.
-static constexpr fml::TimeDelta kDefaultFlatlandPresentationInterval =
-    fml::TimeDelta::FromSecondsF(0);
+// 10ms interval to target vsync is only used until Scenic sends presentation
+// feedback.
+static constexpr fml::TimeDelta kInitialFlatlandVsyncOffset =
+    fml::TimeDelta::FromMilliseconds(10);
 
 // The component residing on the raster thread that is responsible for
 // maintaining the Flatland instance connection and presenting updates.
@@ -33,9 +36,7 @@ class FlatlandConnection final {
   FlatlandConnection(std::string debug_label,
                      fuchsia::ui::composition::FlatlandHandle flatland,
                      fml::closure error_callback,
-                     on_frame_presented_event on_frame_presented_callback,
-                     uint64_t max_frames_in_flight,
-                     fml::TimeDelta vsync_offset);
+                     on_frame_presented_event on_frame_presented_callback);
 
   ~FlatlandConnection();
 
@@ -68,6 +69,12 @@ class FlatlandConnection final {
   void OnFramePresented(fuchsia::scenic::scheduling::FramePresentedInfo info);
   void DoPresent();
 
+  fml::TimePoint GetNextPresentationTime(const fml::TimePoint& now);
+  bool MaybeRunInitialVsyncCallback(const fml::TimePoint& now,
+                                    FireCallbackCallback& callback);
+  void RunVsyncCallback(const fml::TimePoint& now,
+                        FireCallbackCallback& callback);
+
   fuchsia::ui::composition::FlatlandPtr flatland_;
 
   fml::closure error_callback_;
@@ -76,17 +83,23 @@ class FlatlandConnection final {
   uint64_t next_content_id_ = 0;
 
   on_frame_presented_event on_frame_presented_callback_;
-  uint32_t present_credits_ = 1;
-  bool present_pending_ = false;
+  bool present_waiting_for_credit_ = false;
+
+  // A flow event trace id for following |Flatland::Present| calls into Scenic.
+  uint64_t next_present_trace_id_ = 0;
 
   // This struct contains state that is accessed from both from the UI thread
   // (in AwaitVsync) and the raster thread (in OnNextFrameBegin and Present).
   // You should always lock mutex_ before touching anything in this struct
   struct {
     std::mutex mutex_;
-    FireCallbackCallback fire_callback_;
-    bool fire_callback_pending_ = false;
-    bool first_present_called_ = false;
+    std::queue<fml::TimePoint> next_presentation_times_;
+    fml::TimeDelta vsync_interval_ = kInitialFlatlandVsyncOffset;
+    fml::TimeDelta vsync_offset_ = kInitialFlatlandVsyncOffset;
+    fml::TimePoint last_presentation_time_;
+    FireCallbackCallback pending_fire_callback_;
+    uint32_t present_credits_ = 1;
+    bool first_feedback_received_ = false;
   } threadsafe_state_;
 
   std::vector<zx::event> acquire_fences_;
@@ -98,4 +111,4 @@ class FlatlandConnection final {
 
 }  // namespace flutter_runner
 
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_DEFAULT_FLATLAND_CONNECTION_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_FLATLAND_CONNECTION_H_
diff --git a/shell/platform/fuchsia/flutter/flatland_platform_view.cc b/shell/platform/fuchsia/flutter/flatland_platform_view.cc
deleted file mode 100644
index 0922661723f71749672d65e6472e22fd04accf57..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/flutter/flatland_platform_view.cc
+++ /dev/null
@@ -1,298 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "flatland_platform_view.h"
-
-#include "flutter/fml/make_copyable.h"
-
-namespace flutter_runner {
-
-FlatlandPlatformView::FlatlandPlatformView(
-    flutter::PlatformView::Delegate& delegate,
-    flutter::TaskRunners task_runners,
-    fuchsia::ui::views::ViewRef view_ref,
-    std::shared_ptr<flutter::ExternalViewEmbedder> external_view_embedder,
-    fuchsia::ui::input::ImeServiceHandle ime_service,
-    fuchsia::ui::input3::KeyboardHandle keyboard,
-    fuchsia::ui::pointer::TouchSourceHandle touch_source,
-    fuchsia::ui::pointer::MouseSourceHandle mouse_source,
-    fuchsia::ui::views::FocuserHandle focuser,
-    fuchsia::ui::views::ViewRefFocusedHandle view_ref_focused,
-    fuchsia::ui::composition::ParentViewportWatcherHandle
-        parent_viewport_watcher,
-    fuchsia::ui::pointerinjector::RegistryHandle pointerinjector_registry,
-    OnEnableWireframe wireframe_enabled_callback,
-    OnCreateFlatlandView on_create_view_callback,
-    OnUpdateView on_update_view_callback,
-    OnDestroyFlatlandView on_destroy_view_callback,
-    OnCreateSurface on_create_surface_callback,
-    OnSemanticsNodeUpdate on_semantics_node_update_callback,
-    OnRequestAnnounce on_request_announce_callback,
-    OnShaderWarmup on_shader_warmup,
-    AwaitVsyncCallback await_vsync_callback,
-    AwaitVsyncForSecondaryCallbackCallback
-        await_vsync_for_secondary_callback_callback)
-    : PlatformView(true /* is_flatland */,
-                   delegate,
-                   std::move(task_runners),
-                   std::move(view_ref),
-                   std::move(external_view_embedder),
-                   std::move(ime_service),
-                   std::move(keyboard),
-                   std::move(touch_source),
-                   std::move(mouse_source),
-                   std::move(focuser),
-                   std::move(view_ref_focused),
-                   std::move(pointerinjector_registry),
-                   std::move(wireframe_enabled_callback),
-                   std::move(on_update_view_callback),
-                   std::move(on_create_surface_callback),
-                   std::move(on_semantics_node_update_callback),
-                   std::move(on_request_announce_callback),
-                   std::move(on_shader_warmup),
-                   std::move(await_vsync_callback),
-                   std::move(await_vsync_for_secondary_callback_callback)),
-      parent_viewport_watcher_(parent_viewport_watcher.Bind()),
-      on_create_view_callback_(std::move(on_create_view_callback)),
-      on_destroy_view_callback_(std::move(on_destroy_view_callback)),
-      weak_factory_(this) {
-  parent_viewport_watcher_.set_error_handler([](zx_status_t status) {
-    FML_LOG(ERROR) << "Interface error on: ParentViewportWatcher status: "
-                   << status;
-  });
-
-  parent_viewport_watcher_->GetLayout(
-      fit::bind_member(this, &FlatlandPlatformView::OnGetLayout));
-  parent_viewport_watcher_->GetStatus(
-      fit::bind_member(this, &FlatlandPlatformView::OnParentViewportStatus));
-}
-
-FlatlandPlatformView::~FlatlandPlatformView() = default;
-
-void FlatlandPlatformView::OnGetLayout(
-    fuchsia::ui::composition::LayoutInfo info) {
-  view_logical_size_ = {static_cast<float>(info.logical_size().width),
-                        static_cast<float>(info.logical_size().height)};
-
-  if (info.has_device_pixel_ratio()) {
-    // Flatland returns a Vec2 for DPR but both values should be identical.
-    FML_DCHECK(info.device_pixel_ratio().x == info.device_pixel_ratio().y);
-    view_pixel_ratio_ = info.device_pixel_ratio().x;
-  }
-
-  float pixel_ratio = view_pixel_ratio_ ? *view_pixel_ratio_ : 1.0f;
-
-  SetViewportMetrics({
-      pixel_ratio,  // device_pixel_ratio
-      std::round(view_logical_size_.value()[0] *
-                 pixel_ratio),  // physical_width
-      std::round(view_logical_size_.value()[1] *
-                 pixel_ratio),  // physical_height
-      0.0f,                     // physical_padding_top
-      0.0f,                     // physical_padding_right
-      0.0f,                     // physical_padding_bottom
-      0.0f,                     // physical_padding_left
-      0.0f,                     // physical_view_inset_top
-      0.0f,                     // physical_view_inset_right
-      0.0f,                     // physical_view_inset_bottom
-      0.0f,                     // physical_view_inset_left
-      0.0f,                     // p_physical_system_gesture_inset_top
-      0.0f,                     // p_physical_system_gesture_inset_right
-      0.0f,                     // p_physical_system_gesture_inset_bottom
-      0.0f,                     // p_physical_system_gesture_inset_left,
-      -1.0,                     // p_physical_touch_slop,
-      {},                       // p_physical_display_features_bounds
-      {},                       // p_physical_display_features_type
-      {},                       // p_physical_display_features_state
-  });
-
-  parent_viewport_watcher_->GetLayout(
-      fit::bind_member(this, &FlatlandPlatformView::OnGetLayout));
-}
-
-void FlatlandPlatformView::OnParentViewportStatus(
-    fuchsia::ui::composition::ParentViewportStatus status) {
-  // TODO(fxbug.dev/116001): Investigate if it is useful to send hidden/shown
-  // signals.
-  parent_viewport_status_ = status;
-  parent_viewport_watcher_->GetStatus(
-      fit::bind_member(this, &FlatlandPlatformView::OnParentViewportStatus));
-}
-
-void FlatlandPlatformView::OnChildViewStatus(
-    uint64_t content_id,
-    fuchsia::ui::composition::ChildViewStatus status) {
-  FML_DCHECK(child_view_info_.count(content_id) == 1);
-
-  std::ostringstream out;
-  out << "{"
-      << "\"method\":\"View.viewStateChanged\","
-      << "\"args\":{"
-      << "  \"viewId\":" << child_view_info_.at(content_id).view_id
-      << ","                         // ViewId
-      << "  \"is_rendering\":true,"  // IsViewRendering
-      << "  \"state\":true"          // IsViewRendering
-      << "  }"
-      << "}";
-  auto call = out.str();
-
-  std::unique_ptr<flutter::PlatformMessage> message =
-      std::make_unique<flutter::PlatformMessage>(
-          "flutter/platform_views",
-          fml::MallocMapping::Copy(call.c_str(), call.size()), nullptr);
-  DispatchPlatformMessage(std::move(message));
-
-  child_view_info_.at(content_id)
-      .child_view_watcher->GetStatus(
-          [this, content_id](fuchsia::ui::composition::ChildViewStatus status) {
-            OnChildViewStatus(content_id, status);
-          });
-}
-
-void FlatlandPlatformView::OnChildViewViewRef(
-    uint64_t content_id,
-    uint64_t view_id,
-    fuchsia::ui::views::ViewRef view_ref) {
-  FML_CHECK(child_view_info_.count(content_id) == 1);
-
-  fuchsia::ui::views::ViewRef view_ref_clone;
-  fidl::Clone(view_ref, &view_ref_clone);
-
-  focus_delegate_->OnChildViewViewRef(view_id, std::move(view_ref));
-
-  pointer_injector_delegate_->OnCreateView(view_id, std::move(view_ref_clone));
-  OnChildViewConnected(content_id);
-}
-
-void FlatlandPlatformView::OnCreateView(ViewCallback on_view_created,
-                                        int64_t view_id_raw,
-                                        bool hit_testable,
-                                        bool focusable) {
-  auto on_view_bound = [weak = weak_factory_.GetWeakPtr(),
-                        platform_task_runner =
-                            task_runners_.GetPlatformTaskRunner(),
-                        view_id = view_id_raw](
-                           fuchsia::ui::composition::ContentId content_id,
-                           fuchsia::ui::composition::ChildViewWatcherHandle
-                               child_view_watcher_handle) {
-    FML_CHECK(weak);
-    FML_CHECK(weak->child_view_info_.count(content_id.value) == 0);
-
-    // Bind the child view watcher to the platform thread so that the FIDL calls
-    // are handled on the platform thread.
-    fuchsia::ui::composition::ChildViewWatcherPtr child_view_watcher =
-        child_view_watcher_handle.Bind();
-    FML_CHECK(child_view_watcher);
-
-    child_view_watcher.set_error_handler(
-        [weak, view_id, content_id](zx_status_t status) {
-          FML_LOG(ERROR) << "Interface error on: ChildViewWatcher status: "
-                         << status;
-
-          if (!weak) {
-            FML_LOG(WARNING)
-                << "Flatland View bound to PlatformView after PlatformView was "
-                   "destroyed; ignoring.";
-            return;
-          }
-
-          // Disconnected views cannot listen to pointer events.
-          weak->pointer_injector_delegate_->OnDestroyView(view_id);
-
-          weak->OnChildViewDisconnected(content_id.value);
-        });
-
-    platform_task_runner->PostTask(
-        fml::MakeCopyable([weak, view_id, content_id,
-                           watcher = std::move(child_view_watcher)]() mutable {
-          if (!weak) {
-            FML_LOG(WARNING)
-                << "Flatland View bound to PlatformView after PlatformView was "
-                   "destroyed; ignoring.";
-            return;
-          }
-
-          weak->child_view_info_.emplace(
-              std::piecewise_construct, std::forward_as_tuple(content_id.value),
-              std::forward_as_tuple(view_id, std::move(watcher)));
-
-          weak->child_view_info_.at(content_id.value)
-              .child_view_watcher->GetStatus(
-                  [weak, id = content_id.value](
-                      fuchsia::ui::composition::ChildViewStatus status) {
-                    weak->OnChildViewStatus(id, status);
-                  });
-
-          weak->child_view_info_.at(content_id.value)
-              .child_view_watcher->GetViewRef(
-                  [weak, content_id = content_id.value,
-                   view_id](fuchsia::ui::views::ViewRef view_ref) {
-                    weak->OnChildViewViewRef(content_id, view_id,
-                                             std::move(view_ref));
-                  });
-        }));
-  };
-
-  on_create_view_callback_(view_id_raw, std::move(on_view_created),
-                           std::move(on_view_bound), hit_testable, focusable);
-}
-
-void FlatlandPlatformView::OnDisposeView(int64_t view_id_raw) {
-  auto on_view_unbound =
-      [weak = weak_factory_.GetWeakPtr(),
-       platform_task_runner = task_runners_.GetPlatformTaskRunner(),
-       view_id_raw](fuchsia::ui::composition::ContentId content_id) {
-        platform_task_runner->PostTask([weak, content_id, view_id_raw]() {
-          if (!weak) {
-            FML_LOG(WARNING)
-                << "Flatland View unbound from PlatformView after PlatformView"
-                   "was destroyed; ignoring.";
-            return;
-          }
-
-          FML_DCHECK(weak->child_view_info_.count(content_id.value) == 1);
-          weak->OnChildViewDisconnected(content_id.value);
-          weak->child_view_info_.erase(content_id.value);
-          weak->focus_delegate_->OnDisposeChildView(view_id_raw);
-          weak->pointer_injector_delegate_->OnDestroyView(view_id_raw);
-        });
-      };
-  on_destroy_view_callback_(view_id_raw, std::move(on_view_unbound));
-}
-
-void FlatlandPlatformView::OnChildViewConnected(uint64_t content_id) {
-  FML_CHECK(child_view_info_.count(content_id) == 1);
-  std::ostringstream out;
-  out << "{"
-      << "\"method\":\"View.viewConnected\","
-      << "\"args\":{"
-      << "  \"viewId\":" << child_view_info_.at(content_id).view_id << "  }"
-      << "}";
-  auto call = out.str();
-
-  std::unique_ptr<flutter::PlatformMessage> message =
-      std::make_unique<flutter::PlatformMessage>(
-          "flutter/platform_views",
-          fml::MallocMapping::Copy(call.c_str(), call.size()), nullptr);
-  DispatchPlatformMessage(std::move(message));
-}
-
-void FlatlandPlatformView::OnChildViewDisconnected(uint64_t content_id) {
-  FML_CHECK(child_view_info_.count(content_id) == 1);
-  std::ostringstream out;
-  out << "{"
-      << "\"method\":\"View.viewDisconnected\","
-      << "\"args\":{"
-      << "  \"viewId\":" << child_view_info_.at(content_id).view_id << "  }"
-      << "}";
-  auto call = out.str();
-
-  std::unique_ptr<flutter::PlatformMessage> message =
-      std::make_unique<flutter::PlatformMessage>(
-          "flutter/platform_views",
-          fml::MallocMapping::Copy(call.c_str(), call.size()), nullptr);
-  DispatchPlatformMessage(std::move(message));
-}
-
-}  // namespace flutter_runner
diff --git a/shell/platform/fuchsia/flutter/flatland_platform_view.h b/shell/platform/fuchsia/flutter/flatland_platform_view.h
deleted file mode 100644
index afe0819842cd9ea8e325a0519e47c0781c7516b7..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/flutter/flatland_platform_view.h
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_FLATLAND_PLATFORM_VIEW_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_FLATLAND_PLATFORM_VIEW_H_
-
-#include "flutter/shell/platform/fuchsia/flutter/platform_view.h"
-
-#include <fuchsia/ui/composition/cpp/fidl.h>
-
-#include "flutter/fml/memory/weak_ptr.h"
-#include "flutter/shell/platform/fuchsia/flutter/flatland_external_view_embedder.h"
-
-namespace flutter_runner {
-
-using OnCreateFlatlandView = fit::function<
-    void(int64_t, ViewCallback, FlatlandViewCreatedCallback, bool, bool)>;
-using OnDestroyFlatlandView =
-    fit::function<void(int64_t, FlatlandViewIdCallback)>;
-
-// The FlatlandPlatformView that does Flatland specific...
-class FlatlandPlatformView final : public flutter_runner::PlatformView {
- public:
-  FlatlandPlatformView(
-      flutter::PlatformView::Delegate& delegate,
-      flutter::TaskRunners task_runners,
-      fuchsia::ui::views::ViewRef view_ref,
-      std::shared_ptr<flutter::ExternalViewEmbedder> external_view_embedder,
-      fuchsia::ui::input::ImeServiceHandle ime_service,
-      fuchsia::ui::input3::KeyboardHandle keyboard,
-      fuchsia::ui::pointer::TouchSourceHandle touch_source,
-      fuchsia::ui::pointer::MouseSourceHandle mouse_source,
-      fuchsia::ui::views::FocuserHandle focuser,
-      fuchsia::ui::views::ViewRefFocusedHandle view_ref_focused,
-      fuchsia::ui::composition::ParentViewportWatcherHandle
-          parent_viewport_watcher,
-      fuchsia::ui::pointerinjector::RegistryHandle pointerinjector_registry,
-      OnEnableWireframe wireframe_enabled_callback,
-      OnCreateFlatlandView on_create_view_callback,
-      OnUpdateView on_update_view_callback,
-      OnDestroyFlatlandView on_destroy_view_callback,
-      OnCreateSurface on_create_surface_callback,
-      OnSemanticsNodeUpdate on_semantics_node_update_callback,
-      OnRequestAnnounce on_request_announce_callback,
-      OnShaderWarmup on_shader_warmup,
-      AwaitVsyncCallback await_vsync_callback,
-      AwaitVsyncForSecondaryCallbackCallback
-          await_vsync_for_secondary_callback_callback);
-  ~FlatlandPlatformView() override;
-
-  void OnGetLayout(fuchsia::ui::composition::LayoutInfo info);
-  void OnParentViewportStatus(
-      fuchsia::ui::composition::ParentViewportStatus status);
-  void OnChildViewStatus(uint64_t content_id,
-                         fuchsia::ui::composition::ChildViewStatus status);
-  void OnChildViewViewRef(uint64_t content_id,
-                          uint64_t view_id,
-                          fuchsia::ui::views::ViewRef view_ref);
-
- private:
-  void OnCreateView(ViewCallback on_view_created,
-                    int64_t view_id_raw,
-                    bool hit_testable,
-                    bool focusable) override;
-  void OnDisposeView(int64_t view_id_raw) override;
-
-  // Sends a 'View.viewConnected' platform message over 'flutter/platform_views'
-  // channel when a view gets created.
-  void OnChildViewConnected(uint64_t content_id);
-
-  // Sends a 'View.viewDisconnected' platform message over
-  // 'flutter/platform_views' channel when a view gets destroyed or the child
-  // view watcher channel of a view closes.
-  void OnChildViewDisconnected(uint64_t content_id);
-
-  // child_view_ids_ maintains a persistent mapping from Flatland ContentId's to
-  // flutter view ids, which are really zx_handle_t of ViewCreationToken.
-  struct ChildViewInfo {
-    ChildViewInfo(zx_handle_t token,
-                  fuchsia::ui::composition::ChildViewWatcherPtr watcher)
-        : view_id(token), child_view_watcher(std::move(watcher)) {}
-    zx_handle_t view_id;
-    fuchsia::ui::composition::ChildViewWatcherPtr child_view_watcher;
-  };
-  std::unordered_map<uint64_t /*fuchsia::ui::composition::ContentId*/,
-                     ChildViewInfo>
-      child_view_info_;
-
-  fuchsia::ui::composition::ParentViewportWatcherPtr parent_viewport_watcher_;
-
-  OnCreateFlatlandView on_create_view_callback_;
-  OnDestroyFlatlandView on_destroy_view_callback_;
-
-  fuchsia::ui::composition::ParentViewportStatus parent_viewport_status_;
-
-  fml::WeakPtrFactory<FlatlandPlatformView>
-      weak_factory_;  // Must be the last member.
-
-  FML_DISALLOW_COPY_AND_ASSIGN(FlatlandPlatformView);
-};
-
-}  // namespace flutter_runner
-
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_FLATLAND_PLATFORM_VIEW_H_
diff --git a/shell/platform/fuchsia/flutter/flutter_runner_fakes.h b/shell/platform/fuchsia/flutter/flutter_runner_fakes.h
index bbd6c3e4ce77134a78c0c20691f4008c2429e015..c0dbf776b8d0c458206b3a6fe35f16251b8cf0a4 100644
--- a/shell/platform/fuchsia/flutter/flutter_runner_fakes.h
+++ b/shell/platform/fuchsia/flutter/flutter_runner_fakes.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHELL_PLATFORM_FUCHSIA_FLUTTER_FLUTTER_RUNNER_FAKES_H_
-#define SHELL_PLATFORM_FUCHSIA_FLUTTER_FLUTTER_RUNNER_FAKES_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_FLUTTER_RUNNER_FAKES_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_FLUTTER_RUNNER_FAKES_H_
 
 #include <fuchsia/accessibility/semantics/cpp/fidl.h>
 
@@ -137,4 +137,4 @@ class MockSemanticsManager
 
 }  // namespace flutter_runner_test
 
-#endif  // SHELL_PLATFORM_FUCHSIA_FLUTTER_FLUTTER_RUNNER_FAKES_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_FLUTTER_RUNNER_FAKES_H_
diff --git a/shell/platform/fuchsia/flutter/flutter_runner_product_configuration.cc b/shell/platform/fuchsia/flutter/flutter_runner_product_configuration.cc
index f0137c355dbb0b66f2e0d0d0e290416a377a2175..6a536d585b0fe42255595d75ac3248dc4865168f 100644
--- a/shell/platform/fuchsia/flutter/flutter_runner_product_configuration.cc
+++ b/shell/platform/fuchsia/flutter/flutter_runner_product_configuration.cc
@@ -23,18 +23,6 @@ FlutterRunnerProductConfiguration::FlutterRunnerProductConfiguration(
   }
 
   // Parse out all values we're expecting.
-  if (document.HasMember("vsync_offset_in_us")) {
-    auto& val = document["vsync_offset_in_us"];
-    if (val.IsInt()) {
-      vsync_offset_ = fml::TimeDelta::FromMicroseconds(val.GetInt());
-    }
-  }
-  if (document.HasMember("max_frames_in_flight")) {
-    auto& val = document["max_frames_in_flight"];
-    if (val.IsInt()) {
-      max_frames_in_flight_ = val.GetInt();
-    }
-  }
   if (document.HasMember("intercept_all_input")) {
     auto& val = document["intercept_all_input"];
     if (val.IsBool()) {
diff --git a/shell/platform/fuchsia/flutter/flutter_runner_product_configuration.h b/shell/platform/fuchsia/flutter/flutter_runner_product_configuration.h
index 3b6fceb7e4e8ad041d0d7c6392d77ba5a658ebaf..bcd5d6ab58d211485e898613f99b9eca1cca8b0b 100644
--- a/shell/platform/fuchsia/flutter/flutter_runner_product_configuration.h
+++ b/shell/platform/fuchsia/flutter/flutter_runner_product_configuration.h
@@ -2,13 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_RUNNER_PRODUCT_CONFIGURATION_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_RUNNER_PRODUCT_CONFIGURATION_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_FLUTTER_RUNNER_PRODUCT_CONFIGURATION_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_FLUTTER_RUNNER_PRODUCT_CONFIGURATION_H_
 
 #include <string>
 
-#include "flutter/fml/time/time_delta.h"
-
 namespace flutter_runner {
 
 class FlutterRunnerProductConfiguration {
@@ -16,8 +14,6 @@ class FlutterRunnerProductConfiguration {
   FlutterRunnerProductConfiguration() {}
   explicit FlutterRunnerProductConfiguration(std::string json_string);
 
-  fml::TimeDelta get_vsync_offset() { return vsync_offset_; }
-  uint64_t get_max_frames_in_flight() { return max_frames_in_flight_; }
   bool get_intercept_all_input() { return intercept_all_input_; }
   bool software_rendering() { return software_rendering_; }
   bool enable_shader_warmup() { return enable_shader_warmup_; }
@@ -26,8 +22,6 @@ class FlutterRunnerProductConfiguration {
   }
 
  private:
-  fml::TimeDelta vsync_offset_ = fml::TimeDelta::Zero();
-  uint64_t max_frames_in_flight_ = 3;
   bool intercept_all_input_ = false;
   bool software_rendering_ = false;
   bool enable_shader_warmup_ = false;
@@ -35,4 +29,4 @@ class FlutterRunnerProductConfiguration {
 };
 
 }  // namespace flutter_runner
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_RUNNER_PRODUCT_CONFIGURATION_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_FLUTTER_RUNNER_PRODUCT_CONFIGURATION_H_
diff --git a/shell/platform/fuchsia/flutter/focus_delegate.h b/shell/platform/fuchsia/flutter/focus_delegate.h
index ec6ae91ae7c2e0356be689a747990132074e42d4..aa18fcf7b144de502c6ef8e25bf5c26a469587e5 100644
--- a/shell/platform/fuchsia/flutter/focus_delegate.h
+++ b/shell/platform/fuchsia/flutter/focus_delegate.h
@@ -2,10 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FOCUS_DELEGATE_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FOCUS_DELEGATE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_FOCUS_DELEGATE_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_FOCUS_DELEGATE_H_
 
-#include <fuchsia/sys/cpp/fidl.h>
 #include <fuchsia/ui/views/cpp/fidl.h>
 
 #include <unordered_map>
@@ -82,4 +81,4 @@ class FocusDelegate {
 };
 
 }  // namespace flutter_runner
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FOCUS_DELEGATE_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_FOCUS_DELEGATE_H_
diff --git a/shell/platform/fuchsia/flutter/focus_delegate_unittests.cc b/shell/platform/fuchsia/flutter/focus_delegate_unittests.cc
index 62f8a7bc0f215d0bd63413b3c06287dbbaa9e257..f8e9bda254dc822d6c3bd9f9aa76da4bcf6ec323 100644
--- a/shell/platform/fuchsia/flutter/focus_delegate_unittests.cc
+++ b/shell/platform/fuchsia/flutter/focus_delegate_unittests.cc
@@ -7,7 +7,7 @@
 #include <lib/async-loop/cpp/loop.h>
 #include <lib/async-loop/default.h>
 #include <lib/fidl/cpp/binding_set.h>
-#include <lib/ui/scenic/cpp/view_ref_pair.h>
+#include <lib/zx/eventpair.h>
 
 #include "focus_delegate.h"
 #include "tests/fakes/focuser.h"
@@ -131,14 +131,21 @@ TEST_F(FocusDelegateTest, WatchCallbackSeries) {
 // with a non-error status code.
 TEST_F(FocusDelegateTest, RequestFocusTest) {
   // This "Mock" ViewRef serves as the target for the RequestFocus operation.
-  auto mock_view_ref_pair = scenic::ViewRefPair::New();
+  fuchsia::ui::views::ViewRefControl view_ref_control;
+  fuchsia::ui::views::ViewRef view_ref;
+  auto status = zx::eventpair::create(
+      /*options*/ 0u, &view_ref_control.reference, &view_ref.reference);
+  ZX_ASSERT(status == ZX_OK);
+  view_ref_control.reference.replace(
+      ZX_DEFAULT_EVENTPAIR_RIGHTS & (~ZX_RIGHT_DUPLICATE),
+      &view_ref_control.reference);
+  view_ref.reference.replace(ZX_RIGHTS_BASIC, &view_ref.reference);
+
   // Create the platform message request.
   std::ostringstream message;
-  message << "{"
-          << "    \"method\":\"View.focus.request\","
+  message << "{" << "    \"method\":\"View.focus.request\","
           << "    \"args\": {"
-          << "       \"viewRef\":"
-          << mock_view_ref_pair.view_ref.reference.get() << "    }"
+          << "       \"viewRef\":" << view_ref.reference.get() << "    }"
           << "}";
 
   // Dispatch the plaform message request with an expected completion response.
@@ -155,16 +162,22 @@ TEST_F(FocusDelegateTest, RequestFocusTest) {
 // with a Error::DENIED status code.
 TEST_F(FocusDelegateTest, RequestFocusFailTest) {
   // This "Mock" ViewRef serves as the target for the RequestFocus operation.
-  auto mock_view_ref_pair = scenic::ViewRefPair::New();
+  fuchsia::ui::views::ViewRefControl view_ref_control;
+  fuchsia::ui::views::ViewRef view_ref;
+  auto status = zx::eventpair::create(
+      /*options*/ 0u, &view_ref_control.reference, &view_ref.reference);
+  ZX_ASSERT(status == ZX_OK);
+  view_ref_control.reference.replace(
+      ZX_DEFAULT_EVENTPAIR_RIGHTS & (~ZX_RIGHT_DUPLICATE),
+      &view_ref_control.reference);
+  view_ref.reference.replace(ZX_RIGHTS_BASIC, &view_ref.reference);
   // We're testing the focus failure case.
   focuser_->fail_request_focus();
   // Create the platform message request.
   std::ostringstream message;
-  message << "{"
-          << "    \"method\":\"View.focus.request\","
+  message << "{" << "    \"method\":\"View.focus.request\","
           << "    \"args\": {"
-          << "       \"viewRef\":"
-          << mock_view_ref_pair.view_ref.reference.get() << "    }"
+          << "       \"viewRef\":" << view_ref.reference.get() << "    }"
           << "}";
 
   // Dispatch the plaform message request with an expected completion response.
diff --git a/shell/platform/fuchsia/flutter/fuchsia_intl.h b/shell/platform/fuchsia/flutter/fuchsia_intl.h
index c769af9fd531d4d248340b00aa77e06229aa5788..20799c9d5e42e2b9a758c05cd565dcd4e3dee5b6 100644
--- a/shell/platform/fuchsia/flutter/fuchsia_intl.h
+++ b/shell/platform/fuchsia/flutter/fuchsia_intl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FUCHSIA_INTL_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FUCHSIA_INTL_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_FUCHSIA_INTL_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_FUCHSIA_INTL_H_
 
 #include <fuchsia/intl/cpp/fidl.h>
 #include "flutter/fml/mapping.h"
@@ -21,4 +21,4 @@ fml::MallocMapping MakeLocalizationPlatformMessageData(
 
 }  // namespace flutter_runner
 
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FUCHSIA_INTL_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_FUCHSIA_INTL_H_
diff --git a/shell/platform/fuchsia/flutter/gfx_external_view_embedder.cc b/shell/platform/fuchsia/flutter/gfx_external_view_embedder.cc
deleted file mode 100644
index 1cd292764efa32c981d4a257b1d10f0e9440f8aa..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/flutter/gfx_external_view_embedder.cc
+++ /dev/null
@@ -1,708 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "gfx_external_view_embedder.h"
-
-#include <lib/ui/scenic/cpp/commands.h>
-#include <lib/ui/scenic/cpp/view_token_pair.h>
-#include <zircon/types.h>
-
-#include <algorithm>  // For std::clamp
-
-#include "flutter/fml/logging.h"
-#include "flutter/fml/trace_event.h"
-#include "third_party/skia/include/core/SkPicture.h"
-#include "third_party/skia/include/core/SkSurface.h"
-
-namespace flutter_runner {
-namespace {
-
-ViewMutators ParseMutatorStack(const flutter::MutatorsStack& mutators_stack) {
-  ViewMutators mutators;
-  SkMatrix total_transform = SkMatrix::I();
-  SkMatrix transform_accumulator = SkMatrix::I();
-
-  for (auto i = mutators_stack.Begin(); i != mutators_stack.End(); ++i) {
-    const auto& mutator = *i;
-    switch (mutator->GetType()) {
-      case flutter::MutatorType::kOpacity: {
-        mutators.opacity *= std::clamp(mutator->GetAlphaFloat(), 0.f, 1.f);
-      } break;
-      case flutter::MutatorType::kTransform: {
-        total_transform.preConcat(mutator->GetMatrix());
-        transform_accumulator.preConcat(mutator->GetMatrix());
-      } break;
-      case flutter::MutatorType::kClipRect: {
-        mutators.clips.emplace_back(TransformedClip{
-            .transform = transform_accumulator,
-            .rect = mutator->GetRect(),
-        });
-        transform_accumulator = SkMatrix::I();
-      } break;
-      case flutter::MutatorType::kClipRRect: {
-        mutators.clips.emplace_back(TransformedClip{
-            .transform = transform_accumulator,
-            .rect = mutator->GetRRect().getBounds(),
-        });
-        transform_accumulator = SkMatrix::I();
-      } break;
-      case flutter::MutatorType::kClipPath: {
-        mutators.clips.emplace_back(TransformedClip{
-            .transform = transform_accumulator,
-            .rect = mutator->GetPath().getBounds(),
-        });
-        transform_accumulator = SkMatrix::I();
-      } break;
-      default: {
-        break;
-      }
-    }
-  }
-  mutators.total_transform = total_transform;
-  mutators.transform = transform_accumulator;
-  mutators.opacity = std::clamp(mutators.opacity, 0.f, 1.f);
-
-  return mutators;
-}
-
-std::vector<fuchsia::ui::gfx::Plane3> ClipPlanesFromRect(SkRect rect) {
-  // We will generate 4 oriented planes, one for each edge of the bounding rect.
-  std::vector<fuchsia::ui::gfx::Plane3> clip_planes;
-  clip_planes.resize(4);
-
-  // Top plane.
-  clip_planes[0].dist = rect.top();
-  clip_planes[0].dir.x = 0.f;
-  clip_planes[0].dir.y = 1.f;
-  clip_planes[0].dir.z = 0.f;
-
-  // Bottom plane.
-  clip_planes[1].dist = -rect.bottom();
-  clip_planes[1].dir.x = 0.f;
-  clip_planes[1].dir.y = -1.f;
-  clip_planes[1].dir.z = 0.f;
-
-  // Left plane.
-  clip_planes[2].dist = rect.left();
-  clip_planes[2].dir.x = 1.f;
-  clip_planes[2].dir.y = 0.f;
-  clip_planes[2].dir.z = 0.f;
-
-  // Right plane.
-  clip_planes[3].dist = -rect.right();
-  clip_planes[3].dir.x = -1.f;
-  clip_planes[3].dir.y = 0.f;
-  clip_planes[3].dir.z = 0.f;
-
-  return clip_planes;
-}
-
-}  // namespace
-
-GfxExternalViewEmbedder::GfxExternalViewEmbedder(
-    std::string debug_label,
-    fuchsia::ui::views::ViewToken view_token,
-    scenic::ViewRefPair view_ref_pair,
-    std::shared_ptr<GfxSessionConnection> session,
-    std::shared_ptr<SurfaceProducer> surface_producer,
-    bool intercept_all_input)
-    : session_(session),
-      surface_producer_(surface_producer),
-      root_view_(session_->get(),
-                 std::move(view_token),
-                 std::move(view_ref_pair.control_ref),
-                 std::move(view_ref_pair.view_ref),
-                 debug_label),
-      metrics_node_(session_->get()),
-      layer_tree_node_(session_->get()) {
-  layer_tree_node_.SetLabel("Flutter::LayerTree");
-  metrics_node_.SetLabel("Flutter::MetricsWatcher");
-  metrics_node_.SetEventMask(fuchsia::ui::gfx::kMetricsEventMask);
-  metrics_node_.AddChild(layer_tree_node_);
-  root_view_.AddChild(metrics_node_);
-
-  // Set up the input interceptor at the top of the scene, if applicable.  It
-  // will capture all input, and any unwanted input will be reinjected into
-  // embedded views.
-  if (intercept_all_input) {
-    input_interceptor_node_.emplace(session_->get());
-    input_interceptor_node_->SetLabel("Flutter::InputInterceptor");
-    input_interceptor_node_->SetHitTestBehavior(
-        fuchsia::ui::gfx::HitTestBehavior::kDefault);
-    input_interceptor_node_->SetSemanticVisibility(false);
-
-    metrics_node_.AddChild(input_interceptor_node_.value());
-  }
-
-  session_->Present();
-}
-
-GfxExternalViewEmbedder::~GfxExternalViewEmbedder() = default;
-
-SkCanvas* GfxExternalViewEmbedder::GetRootCanvas() {
-  auto found = frame_layers_.find(kRootLayerId);
-  if (found == frame_layers_.end()) {
-    FML_LOG(WARNING)
-        << "No root canvas could be found. This is extremely unlikely and "
-           "indicates that the external view embedder did not receive the "
-           "notification to begin the frame.";
-    return nullptr;
-  }
-
-  return found->second.canvas_spy->GetSpyingCanvas();
-}
-
-std::vector<SkCanvas*> GfxExternalViewEmbedder::GetCurrentCanvases() {
-  std::vector<SkCanvas*> canvases;
-  for (const auto& layer : frame_layers_) {
-    // This method (for legacy reasons) expects non-root current canvases.
-    if (layer.first.has_value()) {
-      canvases.push_back(layer.second.canvas_spy->GetSpyingCanvas());
-    }
-  }
-  return canvases;
-}
-
-std::vector<flutter::DisplayListBuilder*>
-GfxExternalViewEmbedder::GetCurrentBuilders() {
-  return std::vector<flutter::DisplayListBuilder*>({});
-}
-
-void GfxExternalViewEmbedder::PrerollCompositeEmbeddedView(
-    int view_id,
-    std::unique_ptr<flutter::EmbeddedViewParams> params) {
-  zx_handle_t handle = static_cast<zx_handle_t>(view_id);
-  FML_CHECK(frame_layers_.count(handle) == 0);
-
-  frame_layers_.emplace(std::make_pair(
-      EmbedderLayerId{handle},
-      EmbedderLayer(frame_size_, *params, flutter::RTreeFactory())));
-  frame_composition_order_.push_back(handle);
-}
-
-flutter::EmbedderPaintContext GfxExternalViewEmbedder::CompositeEmbeddedView(
-    int view_id) {
-  zx_handle_t handle = static_cast<zx_handle_t>(view_id);
-  auto found = frame_layers_.find(handle);
-  FML_CHECK(found != frame_layers_.end());
-
-  return {found->second.canvas_spy->GetSpyingCanvas(), nullptr};
-}
-
-flutter::PostPrerollResult GfxExternalViewEmbedder::PostPrerollAction(
-    fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
-  return flutter::PostPrerollResult::kSuccess;
-}
-
-void GfxExternalViewEmbedder::BeginFrame(
-    SkISize frame_size,
-    GrDirectContext* context,
-    double device_pixel_ratio,
-    fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
-  TRACE_EVENT0("flutter", "GfxExternalViewEmbedder::BeginFrame");
-
-  // Reset for new frame.
-  Reset();
-  frame_size_ = frame_size;
-  frame_dpr_ = device_pixel_ratio;
-
-  // Create the root layer.
-  frame_layers_.emplace(std::make_pair(
-      kRootLayerId,
-      EmbedderLayer(frame_size, std::nullopt, flutter::RTreeFactory())));
-  frame_composition_order_.push_back(kRootLayerId);
-
-  // Set up the input interceptor at the top of the scene, if applicable.
-  if (input_interceptor_node_.has_value()) {
-    const uint64_t rect_hash =
-        (static_cast<uint64_t>(frame_size_.width()) << 32) +
-        frame_size_.height();
-
-    // Create a new rect if needed for the interceptor.
-    auto found_rect = scenic_interceptor_rects_.find(rect_hash);
-    if (found_rect == scenic_interceptor_rects_.end()) {
-      auto [emplaced_rect, success] =
-          scenic_interceptor_rects_.emplace(std::make_pair(
-              rect_hash, scenic::Rectangle(session_->get(), frame_size_.width(),
-                                           frame_size_.height())));
-      FML_CHECK(success);
-
-      found_rect = std::move(emplaced_rect);
-    }
-
-    // TODO(fxb/): Don't hardcode elevation.
-    input_interceptor_node_->SetTranslation(
-        frame_size.width() * 0.5f, frame_size.height() * 0.5f,
-        -kScenicElevationForInputInterceptor);
-    input_interceptor_node_->SetShape(found_rect->second);
-  }
-}
-
-void GfxExternalViewEmbedder::EndFrame(
-    bool should_resubmit_frame,
-    fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) {
-  TRACE_EVENT0("flutter", "GfxExternalViewEmbedder::EndFrame");
-}
-
-void GfxExternalViewEmbedder::SubmitFrame(
-    GrDirectContext* context,
-    std::unique_ptr<flutter::SurfaceFrame> frame) {
-  TRACE_EVENT0("flutter", "GfxExternalViewEmbedder::SubmitFrame");
-  std::vector<std::unique_ptr<SurfaceProducerSurface>> frame_surfaces;
-  std::unordered_map<EmbedderLayerId, size_t> frame_surface_indices;
-
-  // Create surfaces for the frame and associate them with layer IDs.
-  {
-    TRACE_EVENT0("flutter", "CreateSurfaces");
-
-    for (const auto& layer : frame_layers_) {
-      if (!layer.second.canvas_spy->DidDrawIntoCanvas()) {
-        continue;
-      }
-
-      auto surface =
-          surface_producer_->ProduceSurface(layer.second.surface_size);
-      if (!surface) {
-        const std::string layer_id_str =
-            layer.first.has_value() ? std::to_string(layer.first.value())
-                                    : "Background";
-        FML_LOG(ERROR) << "Failed to create surface for layer " << layer_id_str
-                       << "; size (" << layer.second.surface_size.width()
-                       << ", " << layer.second.surface_size.height() << ")";
-        FML_DCHECK(false);
-        continue;
-      }
-
-      frame_surface_indices.emplace(
-          std::make_pair(layer.first, frame_surfaces.size()));
-      frame_surfaces.emplace_back(std::move(surface));
-    }
-  }
-
-  // Finish recording SkPictures.
-  {
-    TRACE_EVENT0("flutter", "FinishRecordingPictures");
-
-    for (const auto& surface_index : frame_surface_indices) {
-      const auto& layer = frame_layers_.find(surface_index.first);
-      FML_CHECK(layer != frame_layers_.end());
-      layer->second.picture =
-          layer->second.recorder->finishRecordingAsPicture();
-      FML_CHECK(layer->second.picture != nullptr);
-    }
-  }
-
-  // Submit layers and platform views to Scenic in composition order.
-  {
-    TRACE_EVENT0("flutter", "SubmitLayers");
-
-    std::unordered_map<uint64_t, size_t> scenic_rect_indices;
-    size_t scenic_layer_index = 0;
-    float embedded_views_height = 0.0f;
-
-    // First re-scale everything according to the DPR.
-    const float inv_dpr = 1.0f / frame_dpr_;
-    layer_tree_node_.SetScale(inv_dpr, inv_dpr, 1.0f);
-
-    bool first_layer = true;
-    for (const auto& layer_id : frame_composition_order_) {
-      const auto& layer = frame_layers_.find(layer_id);
-      FML_CHECK(layer != frame_layers_.end());
-
-      // Draw the PlatformView associated with each layer first.
-      if (layer_id.has_value()) {
-        FML_CHECK(layer->second.embedded_view_params.has_value());
-        auto& view_params = layer->second.embedded_view_params.value();
-
-        // Get the ScenicView structure corresponding to the platform view.
-        auto found = scenic_views_.find(layer_id.value());
-        FML_CHECK(found != scenic_views_.end());
-        auto& view_holder = found->second;
-
-        // Compute mutators, size, and elevation for the platform view.
-        const ViewMutators view_mutators =
-            ParseMutatorStack(view_params.mutatorsStack());
-        const SkSize view_size = view_params.sizePoints();
-        const float view_elevation =
-            kScenicZElevationBetweenLayers * scenic_layer_index +
-            embedded_views_height;
-        FML_CHECK(view_mutators.total_transform ==
-                  view_params.transformMatrix());
-
-        // Set clips for the platform view.
-        if (view_mutators.clips != view_holder.mutators.clips) {
-          // Expand the clip_nodes array to fit any new nodes.
-          while (view_holder.clip_nodes.size() < view_mutators.clips.size()) {
-            view_holder.clip_nodes.emplace_back(
-                scenic::EntityNode(session_->get()));
-          }
-          FML_CHECK(view_holder.clip_nodes.size() >=
-                    view_mutators.clips.size());
-
-          // Adjust and re-parent all clip rects.
-          for (auto& clip_node : view_holder.clip_nodes) {
-            clip_node.DetachChildren();
-          }
-          for (size_t c = 0; c < view_mutators.clips.size(); c++) {
-            const SkMatrix& clip_transform = view_mutators.clips[c].transform;
-            const SkRect& clip_rect = view_mutators.clips[c].rect;
-
-            view_holder.clip_nodes[c].SetTranslation(
-                clip_transform.getTranslateX(), clip_transform.getTranslateY(),
-                0.f);
-            view_holder.clip_nodes[c].SetScale(clip_transform.getScaleX(),
-                                               clip_transform.getScaleY(), 1.f);
-            view_holder.clip_nodes[c].SetClipPlanes(
-                ClipPlanesFromRect(clip_rect));
-
-            if (c != (view_mutators.clips.size() - 1)) {
-              view_holder.clip_nodes[c].AddChild(view_holder.clip_nodes[c + 1]);
-            } else {
-              view_holder.clip_nodes[c].AddChild(view_holder.opacity_node);
-            }
-          }
-
-          view_holder.mutators.clips = view_mutators.clips;
-        }
-
-        // Set transform and elevation for the platform view.
-        if (view_mutators.transform != view_holder.mutators.transform ||
-            view_elevation != view_holder.elevation) {
-          view_holder.transform_node.SetTranslation(
-              view_mutators.transform.getTranslateX(),
-              view_mutators.transform.getTranslateY(), -view_elevation);
-          view_holder.transform_node.SetScale(
-              view_mutators.transform.getScaleX(),
-              view_mutators.transform.getScaleY(), 1.f);
-
-          view_holder.mutators.transform = view_mutators.transform;
-          view_holder.elevation = view_elevation;
-        }
-
-        // Set HitTestBehavior for the platform view.
-        if (view_holder.pending_hit_testable != view_holder.hit_testable) {
-          view_holder.transform_node.SetHitTestBehavior(
-              view_holder.pending_hit_testable
-                  ? fuchsia::ui::gfx::HitTestBehavior::kDefault
-                  : fuchsia::ui::gfx::HitTestBehavior::kSuppress);
-
-          view_holder.hit_testable = view_holder.pending_hit_testable;
-        }
-
-        // Set opacity for the platform view.
-        if (view_mutators.opacity != view_holder.mutators.opacity) {
-          view_holder.opacity_node.SetOpacity(view_mutators.opacity);
-
-          view_holder.mutators.opacity = view_mutators.opacity;
-        }
-
-        // Set size, occlusion hint, and focusable.
-        if (view_size != view_holder.size ||
-            view_holder.pending_occlusion_hint != view_holder.occlusion_hint ||
-            view_holder.pending_focusable != view_holder.focusable) {
-          view_holder.view_holder.SetViewProperties({
-              .bounding_box =
-                  {
-                      .min = {.x = 0.f, .y = 0.f, .z = -1000.f},
-                      .max = {.x = view_size.fWidth,
-                              .y = view_size.fHeight,
-                              .z = 0.f},
-                  },
-              .inset_from_min = {.x = view_holder.pending_occlusion_hint.fLeft,
-                                 .y = view_holder.pending_occlusion_hint.fTop,
-                                 .z = 0.f},
-              .inset_from_max = {.x = view_holder.pending_occlusion_hint.fRight,
-                                 .y =
-                                     view_holder.pending_occlusion_hint.fBottom,
-                                 .z = 0.f},
-              .focus_change = view_holder.pending_focusable,
-          });
-
-          view_holder.size = view_size;
-          view_holder.occlusion_hint = view_holder.pending_occlusion_hint;
-          view_holder.focusable = view_holder.pending_focusable;
-        }
-
-        // Attach the ScenicView to the main scene graph.
-        if (view_holder.mutators.clips.empty()) {
-          layer_tree_node_.AddChild(view_holder.opacity_node);
-        } else {
-          layer_tree_node_.AddChild(view_holder.clip_nodes[0]);
-        }
-
-        // Account for the ScenicView's height when positioning the next layer.
-        embedded_views_height += kScenicZElevationForPlatformView;
-      }
-
-      // Acquire the surface associated with the layer.
-      SurfaceProducerSurface* surface_for_layer = nullptr;
-      if (layer->second.canvas_spy->DidDrawIntoCanvas()) {
-        const auto& surface_index = frame_surface_indices.find(layer_id);
-        if (surface_index != frame_surface_indices.end()) {
-          FML_CHECK(surface_index->second < frame_surfaces.size());
-          surface_for_layer = frame_surfaces[surface_index->second].get();
-          FML_CHECK(surface_for_layer != nullptr);
-        } else {
-          const std::string layer_id_str =
-              layer_id.has_value() ? std::to_string(layer_id.value())
-                                   : "Background";
-          FML_LOG(ERROR) << "Missing surface for layer " << layer_id_str
-                         << "; skipping scene graph add of layer.";
-          FML_DCHECK(false);
-        }
-      }
-
-      // Draw the layer if we acquired a surface for it successfully.
-      if (surface_for_layer != nullptr) {
-        // Create a new layer if needed for the surface.
-        FML_CHECK(scenic_layer_index <= scenic_layers_.size());
-        if (scenic_layer_index == scenic_layers_.size()) {
-          ScenicLayer new_layer{
-              .layer_node = scenic::EntityNode(session_->get()),
-              .image =
-                  ScenicImage{
-                      .shape_node = scenic::ShapeNode(session_->get()),
-                      .material = scenic::Material(session_->get()),
-                  },
-              // We'll set hit regions later.
-              .hit_regions = {},
-          };
-          new_layer.layer_node.SetLabel("Flutter::Layer");
-          new_layer.layer_node.AddChild(new_layer.image.shape_node);
-          new_layer.image.shape_node.SetMaterial(new_layer.image.material);
-          scenic_layers_.emplace_back(std::move(new_layer));
-        }
-
-        // Compute a hash and index for the rect.
-        const uint64_t rect_hash =
-            (static_cast<uint64_t>(layer->second.surface_size.width()) << 32) +
-            layer->second.surface_size.height();
-        size_t rect_index = 0;
-        auto found_index = scenic_rect_indices.find(rect_hash);
-        if (found_index == scenic_rect_indices.end()) {
-          scenic_rect_indices.emplace(std::make_pair(rect_hash, 0));
-        } else {
-          rect_index = found_index->second + 1;
-          scenic_rect_indices[rect_hash] = rect_index;
-        }
-
-        // Create a new rect if needed for the surface.
-        auto found_rects = scenic_rects_.find(rect_hash);
-        if (found_rects == scenic_rects_.end()) {
-          auto [emplaced_rects, success] = scenic_rects_.emplace(
-              std::make_pair(rect_hash, std::vector<scenic::Rectangle>()));
-          FML_CHECK(success);
-
-          found_rects = std::move(emplaced_rects);
-        }
-        FML_CHECK(rect_index <= found_rects->second.size());
-        if (rect_index == found_rects->second.size()) {
-          found_rects->second.emplace_back(scenic::Rectangle(
-              session_->get(), layer->second.surface_size.width(),
-              layer->second.surface_size.height()));
-        }
-
-        // Set layer shape and texture.
-        // Scenic currently lacks an API to enable rendering of alpha channel;
-        // Flutter Embedder also lacks an API to detect if a layer has alpha or
-        // not. Alpha channels are only rendered if there is a OpacityNode
-        // higher in the tree with opacity != 1. For now, assume any layer
-        // beyond the first has alpha and clamp to a infinitesimally smaller
-        // value than 1.  The first layer retains an opacity of 1 to avoid
-        // blending with anything underneath.
-        //
-        // This does not cause visual problems in practice, but probably has
-        // performance implications.
-        const SkAlpha layer_opacity =
-            first_layer ? kBackgroundLayerOpacity : kOverlayLayerOpacity;
-        const float layer_elevation =
-            kScenicZElevationBetweenLayers * scenic_layer_index +
-            embedded_views_height;
-        auto& scenic_layer = scenic_layers_[scenic_layer_index];
-        auto& scenic_rect = found_rects->second[rect_index];
-        auto& image = scenic_layer.image;
-        image.shape_node.SetLabel("Flutter::Layer::Image");
-        image.shape_node.SetShape(scenic_rect);
-        image.shape_node.SetTranslation(
-            layer->second.surface_size.width() * 0.5f,
-            layer->second.surface_size.height() * 0.5f, -layer_elevation);
-        image.material.SetColor(SK_AlphaOPAQUE, SK_AlphaOPAQUE, SK_AlphaOPAQUE,
-                                layer_opacity);
-        image.material.SetTexture(surface_for_layer->GetImageId());
-
-        // We'll set hit regions expliclty on a separate ShapeNode, so the image
-        // itself should be unhittable and semantically invisible.
-        image.shape_node.SetHitTestBehavior(
-            fuchsia::ui::gfx::HitTestBehavior::kSuppress);
-        image.shape_node.SetSemanticVisibility(false);
-
-        // Attach the ScenicLayer to the main scene graph.
-        layer_tree_node_.AddChild(scenic_layer.layer_node);
-
-        // Compute the set of non-overlapping set of bounding boxes for the
-        // painted content in this layer.
-        {
-          FML_CHECK(layer->second.rtree);
-          std::list<SkRect> intersection_rects =
-              layer->second.rtree->searchNonOverlappingDrawnRects(
-                  SkRect::Make(layer->second.surface_size));
-
-          // SkRect joined_rect = SkRect::MakeEmpty();
-          for (const SkRect& rect : intersection_rects) {
-            auto paint_bounds =
-                scenic::Rectangle(session_->get(), rect.width(), rect.height());
-            auto hit_region = scenic::ShapeNode(session_->get());
-            hit_region.SetLabel("Flutter::Layer::HitRegion");
-            hit_region.SetShape(paint_bounds);
-            hit_region.SetTranslation(rect.centerX(), rect.centerY(),
-                                      -layer_elevation);
-            hit_region.SetHitTestBehavior(
-                fuchsia::ui::gfx::HitTestBehavior::kDefault);
-            hit_region.SetSemanticVisibility(true);
-
-            scenic_layer.layer_node.AddChild(hit_region);
-            scenic_layer.hit_regions.push_back(std::move(hit_region));
-          }
-        }
-      }
-
-      // Reset for the next pass:
-      //  +The next layer will not be the first layer.
-      //  +Account for the current layer's height when positioning the next.
-      first_layer = false;
-      scenic_layer_index++;
-    }
-  }
-
-  // Present the session to Scenic, along with surface acquire/release fencess.
-  {
-    TRACE_EVENT0("flutter", "SessionPresent");
-
-    session_->Present();
-  }
-
-  // Flush pending skia operations.
-  // NOTE: This operation MUST occur AFTER the `Present() ` call above. We
-  // pipeline the Skia rendering work with scenic IPC, and scenic will delay
-  // internally until Skia is finished. So, doing this work before calling
-  // `Present()` would adversely affect performance.
-  {
-    TRACE_EVENT0("flutter", "RasterizeSurfaces");
-
-    for (const auto& surface_index : frame_surface_indices) {
-      TRACE_EVENT0("flutter", "RasterizeSurface");
-
-      FML_CHECK(surface_index.second < frame_surfaces.size());
-      SurfaceProducerSurface* surface =
-          frame_surfaces[surface_index.second].get();
-      FML_CHECK(surface != nullptr);
-
-      sk_sp<SkSurface> sk_surface = surface->GetSkiaSurface();
-      FML_CHECK(sk_surface != nullptr);
-      FML_CHECK(SkISize::Make(sk_surface->width(), sk_surface->height()) ==
-                frame_size_);
-      SkCanvas* canvas = sk_surface->getCanvas();
-      FML_CHECK(canvas != nullptr);
-
-      const auto& layer = frame_layers_.find(surface_index.first);
-      FML_CHECK(layer != frame_layers_.end());
-
-      canvas->setMatrix(SkMatrix::I());
-      canvas->clear(SK_ColorTRANSPARENT);
-      canvas->drawPicture(layer->second.picture);
-      canvas->flush();
-    }
-  }
-
-  // Flush deferred Skia work and inform Scenic that render targets are ready.
-  {
-    TRACE_EVENT0("flutter", "PresentSurfaces");
-
-    surface_producer_->SubmitSurfaces(std::move(frame_surfaces));
-  }
-
-  // Submit the underlying render-backend-specific frame for processing.
-  frame->Submit();
-}
-
-void GfxExternalViewEmbedder::EnableWireframe(bool enable) {
-  session_->get()->Enqueue(
-      scenic::NewSetEnableDebugViewBoundsCmd(root_view_.id(), enable));
-  session_->Present();
-}
-
-void GfxExternalViewEmbedder::CreateView(int64_t view_id,
-                                         ViewCallback on_view_created,
-                                         GfxViewIdCallback on_view_bound) {
-  FML_CHECK(scenic_views_.find(view_id) == scenic_views_.end());
-
-  ScenicView new_view = {
-      .opacity_node = scenic::OpacityNodeHACK(session_->get()),
-      .transform_node = scenic::EntityNode(session_->get()),
-      .view_holder = scenic::ViewHolder(
-          session_->get(),
-          scenic::ToViewHolderToken(zx::eventpair((zx_handle_t)view_id)),
-          "Flutter::PlatformView"),
-  };
-  on_view_created();
-  on_view_bound(new_view.view_holder.id());
-
-  new_view.opacity_node.SetLabel("Flutter::PlatformView::OpacityMutator");
-  new_view.opacity_node.AddChild(new_view.transform_node);
-  new_view.transform_node.SetLabel("Flutter::PlatformView::TransformMutator");
-  new_view.transform_node.SetTranslation(0.f, 0.f,
-                                         -kScenicZElevationBetweenLayers);
-  new_view.transform_node.Attach(new_view.view_holder);
-
-  scenic_views_.emplace(std::make_pair(view_id, std::move(new_view)));
-}
-
-void GfxExternalViewEmbedder::DestroyView(int64_t view_id,
-                                          GfxViewIdCallback on_view_unbound) {
-  auto scenic_view = scenic_views_.find(view_id);
-  FML_CHECK(scenic_view != scenic_views_.end());
-  scenic::ResourceId resource_id = scenic_view->second.view_holder.id();
-
-  scenic_views_.erase(scenic_view);
-  on_view_unbound(resource_id);
-}
-
-void GfxExternalViewEmbedder::SetViewProperties(int64_t view_id,
-                                                const SkRect& occlusion_hint,
-                                                bool hit_testable,
-                                                bool focusable) {
-  auto found = scenic_views_.find(view_id);
-  FML_CHECK(found != scenic_views_.end());
-  auto& view_holder = found->second;
-
-  view_holder.pending_occlusion_hint = occlusion_hint;
-  view_holder.pending_hit_testable = hit_testable;
-  view_holder.pending_focusable = focusable;
-}
-
-void GfxExternalViewEmbedder::Reset() {
-  frame_layers_.clear();
-  frame_composition_order_.clear();
-  frame_size_ = SkISize::Make(0, 0);
-  frame_dpr_ = 1.f;
-
-  // Detach the root node to prepare for the next frame.
-  layer_tree_node_.DetachChildren();
-
-  // Clear images on all layers so they aren't cached unnecessarily.
-  for (auto& layer : scenic_layers_) {
-    layer.image.material.SetTexture(0);
-
-    // Detach hit regions; otherwise, they may persist across frames
-    // incorrectly.
-    for (auto& hit_region : layer.hit_regions) {
-      hit_region.Detach();
-    }
-
-    // Remove cached hit regions so that we don't recreate stale ones.
-    layer.hit_regions.clear();
-  }
-}
-
-}  // namespace flutter_runner
diff --git a/shell/platform/fuchsia/flutter/gfx_external_view_embedder.h b/shell/platform/fuchsia/flutter/gfx_external_view_embedder.h
deleted file mode 100644
index c2e67e34a284546fc3a2c3129a2eb2bf12e2e3c4..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/flutter/gfx_external_view_embedder.h
+++ /dev/null
@@ -1,241 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_GFX_EXTERNAL_VIEW_EMBEDDER_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_GFX_EXTERNAL_VIEW_EMBEDDER_H_
-
-#include <fuchsia/ui/views/cpp/fidl.h>
-#include <lib/ui/scenic/cpp/id.h>
-#include <lib/ui/scenic/cpp/resources.h>
-#include <lib/ui/scenic/cpp/view_ref_pair.h>
-
-#include <cstdint>  // For uint32_t & uint64_t
-#include <memory>
-#include <string>
-#include <unordered_map>
-#include <vector>
-
-#include "flutter/flow/embedded_views.h"
-#include "flutter/flow/rtree.h"
-#include "flutter/fml/logging.h"
-#include "flutter/fml/macros.h"
-#include "flutter/shell/common/canvas_spy.h"
-#include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkPictureRecorder.h"
-#include "third_party/skia/include/core/SkPoint.h"
-#include "third_party/skia/include/core/SkRect.h"
-#include "third_party/skia/include/core/SkSize.h"
-#include "third_party/skia/include/gpu/GrDirectContext.h"
-
-#include "gfx_session_connection.h"
-#include "surface_producer.h"
-
-namespace flutter_runner {
-
-using ViewCallback = std::function<void()>;
-using GfxViewIdCallback = std::function<void(scenic::ResourceId)>;
-
-// This struct represents a transformed clip rect.
-struct TransformedClip {
-  SkMatrix transform = SkMatrix::I();
-  SkRect rect = SkRect::MakeEmpty();
-
-  bool operator==(const TransformedClip& other) const {
-    return transform == other.transform && rect == other.rect;
-  }
-};
-
-// This struct represents all the mutators that can be applied to a
-// PlatformView, unpacked from the `MutatorStack`.
-struct ViewMutators {
-  std::vector<TransformedClip> clips;
-  SkMatrix total_transform = SkMatrix::I();
-  SkMatrix transform = SkMatrix::I();
-  SkScalar opacity = 1.f;
-
-  bool operator==(const ViewMutators& other) const {
-    return clips == other.clips && total_transform == other.total_transform &&
-           transform == other.transform && opacity == other.opacity;
-  }
-};
-
-// This class orchestrates interaction with the Scenic compositor on Fuchsia. It
-// ensures that flutter content and platform view content are both rendered
-// correctly in a unified scene.
-class GfxExternalViewEmbedder final : public flutter::ExternalViewEmbedder {
- public:
-  // Layer separation is as infinitesimal as possible without introducing
-  // Z-fighting.
-  constexpr static float kScenicZElevationBetweenLayers = 0.0001f;
-  constexpr static float kScenicZElevationForPlatformView = 100.f;
-  constexpr static float kScenicElevationForInputInterceptor = 500.f;
-  constexpr static SkAlpha kBackgroundLayerOpacity = SK_AlphaOPAQUE;
-  constexpr static SkAlpha kOverlayLayerOpacity = SK_AlphaOPAQUE - 1;
-
-  GfxExternalViewEmbedder(std::string debug_label,
-                          fuchsia::ui::views::ViewToken view_token,
-                          scenic::ViewRefPair view_ref_pair,
-                          std::shared_ptr<GfxSessionConnection> session,
-                          std::shared_ptr<SurfaceProducer> surface_producer,
-                          bool intercept_all_input = false);
-  ~GfxExternalViewEmbedder();
-
-  // |ExternalViewEmbedder|
-  SkCanvas* GetRootCanvas() override;
-
-  // |ExternalViewEmbedder|
-  std::vector<SkCanvas*> GetCurrentCanvases() override;
-
-  // |ExternalViewEmbedder|
-  std::vector<flutter::DisplayListBuilder*> GetCurrentBuilders() override;
-
-  // |ExternalViewEmbedder|
-  void PrerollCompositeEmbeddedView(
-      int view_id,
-      std::unique_ptr<flutter::EmbeddedViewParams> params) override;
-
-  // |ExternalViewEmbedder|
-  flutter::EmbedderPaintContext CompositeEmbeddedView(int view_id) override;
-
-  // |ExternalViewEmbedder|
-  flutter::PostPrerollResult PostPrerollAction(
-      fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) override;
-
-  // |ExternalViewEmbedder|
-  void BeginFrame(
-      SkISize frame_size,
-      GrDirectContext* context,
-      double device_pixel_ratio,
-      fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) override;
-
-  // |ExternalViewEmbedder|
-  void EndFrame(
-      bool should_resubmit_frame,
-      fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) override;
-
-  // |ExternalViewEmbedder|
-  void SubmitFrame(GrDirectContext* context,
-                   std::unique_ptr<flutter::SurfaceFrame> frame) override;
-
-  // |ExternalViewEmbedder|
-  void CancelFrame() override { Reset(); }
-
-  // |ExternalViewEmbedder|
-  bool SupportsDynamicThreadMerging() override { return false; }
-
-  // View manipulation.
-  // |SetViewProperties| doesn't manipulate the view directly -- it sets pending
-  // properties for the next |UpdateView| call.
-  void EnableWireframe(bool enable);
-  void CreateView(int64_t view_id,
-                  ViewCallback on_view_created,
-                  GfxViewIdCallback on_view_bound);
-  void DestroyView(int64_t view_id, GfxViewIdCallback on_view_unbound);
-  void SetViewProperties(int64_t view_id,
-                         const SkRect& occlusion_hint,
-                         bool hit_testable,
-                         bool focusable);
-
- private:
-  void Reset();  // Reset state for a new frame.
-
-  struct EmbedderLayer {
-    EmbedderLayer(const SkISize& frame_size,
-                  std::optional<flutter::EmbeddedViewParams> view_params,
-                  flutter::RTreeFactory rtree_factory)
-        : rtree(rtree_factory.getInstance()),
-          embedded_view_params(std::move(view_params)),
-          recorder(std::make_unique<SkPictureRecorder>()),
-          canvas_spy(std::make_unique<flutter::CanvasSpy>(
-              recorder->beginRecording(SkRect::Make(frame_size),
-                                       &rtree_factory))),
-          surface_size(frame_size),
-          picture(nullptr) {}
-
-    // Records paint operations applied to this layer's `SkCanvas`.
-    // These records are used to determine which portions of this layer
-    // contain content. The embedder propagates this information to scenic, so
-    // that scenic can accurately decide which portions of this layer may
-    // interact with input.
-    sk_sp<flutter::RTree> rtree;
-
-    std::optional<flutter::EmbeddedViewParams> embedded_view_params;
-    std::unique_ptr<SkPictureRecorder> recorder;
-    std::unique_ptr<flutter::CanvasSpy> canvas_spy;
-    SkISize surface_size;
-    sk_sp<SkPicture> picture;
-  };
-  using EmbedderLayerId = std::optional<uint32_t>;
-  constexpr static EmbedderLayerId kRootLayerId = EmbedderLayerId{};
-
-  struct ScenicView {
-    std::vector<scenic::EntityNode> clip_nodes;
-    scenic::OpacityNodeHACK opacity_node;
-    scenic::EntityNode transform_node;
-    scenic::ViewHolder view_holder;
-
-    ViewMutators mutators;
-    float elevation = 0.f;
-
-    SkSize size = SkSize::MakeEmpty();
-    SkRect occlusion_hint = SkRect::MakeEmpty();
-    SkRect pending_occlusion_hint = SkRect::MakeEmpty();
-    bool hit_testable = true;
-    bool pending_hit_testable = true;
-    bool focusable = true;
-    bool pending_focusable = true;
-  };
-
-  // GFX resources required to render a composited flutter layer (i.e. an
-  // SkPicture).
-  struct ScenicImage {
-    scenic::ShapeNode shape_node;
-    scenic::Material material;
-  };
-
-  // All resources required to represent a flutter layer in the GFX scene
-  // graph. The structure of the subgraph for a particular layer is:
-  //
-  //         layer_node
-  //        /          \
-  //  image node     hit regions (zero or more)
-  //
-  // NOTE: `hit_regions` must be cleared before submitting each new frame;
-  // otherwise, we will report stale hittable geometry to scenic.
-  struct ScenicLayer {
-    // Root of the subtree containing the scenic resources for this layer.
-    scenic::EntityNode layer_node;
-
-    // Scenic resources used to render this layer's image.
-    ScenicImage image;
-
-    // Scenic resources that specify which parts of this layer are responsive
-    // to input.
-    std::vector<scenic::ShapeNode> hit_regions;
-  };
-
-  std::shared_ptr<GfxSessionConnection> session_;
-  std::shared_ptr<SurfaceProducer> surface_producer_;
-
-  scenic::View root_view_;
-  scenic::EntityNode metrics_node_;
-  scenic::EntityNode layer_tree_node_;
-  std::optional<scenic::ShapeNode> input_interceptor_node_;
-
-  std::unordered_map<uint64_t, scenic::Rectangle> scenic_interceptor_rects_;
-  std::unordered_map<uint64_t, std::vector<scenic::Rectangle>> scenic_rects_;
-  std::unordered_map<int64_t, ScenicView> scenic_views_;
-  std::vector<ScenicLayer> scenic_layers_;
-
-  std::unordered_map<EmbedderLayerId, EmbedderLayer> frame_layers_;
-  std::vector<EmbedderLayerId> frame_composition_order_;
-  SkISize frame_size_ = SkISize::Make(0, 0);
-  float frame_dpr_ = 1.f;
-
-  FML_DISALLOW_COPY_AND_ASSIGN(GfxExternalViewEmbedder);
-};
-
-}  // namespace flutter_runner
-
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_GFX_EXTERNAL_VIEW_EMBEDDER_H_
diff --git a/shell/platform/fuchsia/flutter/gfx_platform_view.cc b/shell/platform/fuchsia/flutter/gfx_platform_view.cc
deleted file mode 100644
index ed9eeece151a0172b017a320a32837430624050c..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/flutter/gfx_platform_view.cc
+++ /dev/null
@@ -1,364 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "gfx_platform_view.h"
-
-#include "flutter/fml/make_copyable.h"
-
-namespace flutter_runner {
-
-GfxPlatformView::GfxPlatformView(
-    flutter::PlatformView::Delegate& delegate,
-    flutter::TaskRunners task_runners,
-    fuchsia::ui::views::ViewRef view_ref,
-    std::shared_ptr<flutter::ExternalViewEmbedder> external_view_embedder,
-    fuchsia::ui::input::ImeServiceHandle ime_service,
-    fuchsia::ui::input3::KeyboardHandle keyboard,
-    fuchsia::ui::pointer::TouchSourceHandle touch_source,
-    fuchsia::ui::pointer::MouseSourceHandle mouse_source,
-    fuchsia::ui::views::FocuserHandle focuser,
-    fuchsia::ui::views::ViewRefFocusedHandle view_ref_focused,
-    fuchsia::ui::pointerinjector::RegistryHandle pointerinjector_registry,
-    fidl::InterfaceRequest<fuchsia::ui::scenic::SessionListener>
-        session_listener_request,
-    fit::closure on_session_listener_error_callback,
-    OnEnableWireframe wireframe_enabled_callback,
-    OnCreateGfxView on_create_view_callback,
-    OnUpdateView on_update_view_callback,
-    OnDestroyGfxView on_destroy_view_callback,
-    OnCreateSurface on_create_surface_callback,
-    OnSemanticsNodeUpdate on_semantics_node_update_callback,
-    OnRequestAnnounce on_request_announce_callback,
-    OnShaderWarmup on_shader_warmup,
-    AwaitVsyncCallback await_vsync_callback,
-    AwaitVsyncForSecondaryCallbackCallback
-        await_vsync_for_secondary_callback_callback)
-    : PlatformView(false /* is_flatland */,
-                   delegate,
-                   std::move(task_runners),
-                   std::move(view_ref),
-                   std::move(external_view_embedder),
-                   std::move(ime_service),
-                   std::move(keyboard),
-                   std::move(touch_source),
-                   std::move(mouse_source),
-                   std::move(focuser),
-                   std::move(view_ref_focused),
-                   std::move(pointerinjector_registry),
-                   std::move(wireframe_enabled_callback),
-                   std::move(on_update_view_callback),
-                   std::move(on_create_surface_callback),
-                   std::move(on_semantics_node_update_callback),
-                   std::move(on_request_announce_callback),
-                   std::move(on_shader_warmup),
-                   std::move(await_vsync_callback),
-                   std::move(await_vsync_for_secondary_callback_callback)),
-      session_listener_binding_(this, std::move(session_listener_request)),
-      session_listener_error_callback_(
-          std::move(on_session_listener_error_callback)),
-      on_create_view_callback_(std::move(on_create_view_callback)),
-      on_destroy_view_callback_(std::move(on_destroy_view_callback)),
-      weak_factory_(this) {
-  session_listener_binding_.set_error_handler([](zx_status_t status) {
-    FML_LOG(ERROR) << "Interface error on: SessionListener, status: " << status;
-  });
-}
-
-GfxPlatformView::~GfxPlatformView() = default;
-
-void GfxPlatformView::OnScenicError(std::string error) {
-  FML_LOG(ERROR) << "Session error: " << error;
-  session_listener_error_callback_();
-}
-
-void GfxPlatformView::OnScenicEvent(
-    std::vector<fuchsia::ui::scenic::Event> events) {
-  TRACE_EVENT0("flutter", "PlatformView::OnScenicEvent");
-
-  std::vector<fuchsia::ui::gfx::Event> deferred_view_events;
-  bool metrics_changed = false;
-  for (auto& event : events) {
-    switch (event.Which()) {
-      case fuchsia::ui::scenic::Event::Tag::kGfx:
-        switch (event.gfx().Which()) {
-          case fuchsia::ui::gfx::Event::Tag::kMetrics: {
-            const fuchsia::ui::gfx::Metrics& metrics =
-                event.gfx().metrics().metrics;
-            const float new_view_pixel_ratio = metrics.scale_x;
-            if (new_view_pixel_ratio <= 0.f) {
-              FML_LOG(ERROR)
-                  << "Got an invalid pixel ratio from Scenic; ignoring: "
-                  << new_view_pixel_ratio;
-              break;
-            }
-
-            // Avoid metrics update when possible -- it is computationally
-            // expensive.
-            if (view_pixel_ratio_.has_value() &&
-                *view_pixel_ratio_ == new_view_pixel_ratio) {
-              break;
-            }
-
-            view_pixel_ratio_ = new_view_pixel_ratio;
-            metrics_changed = true;
-            break;
-          }
-          case fuchsia::ui::gfx::Event::Tag::kViewPropertiesChanged: {
-            const fuchsia::ui::gfx::BoundingBox& bounding_box =
-                event.gfx().view_properties_changed().properties.bounding_box;
-            const std::array<float, 2> new_view_size = {
-                std::max(bounding_box.max.x - bounding_box.min.x, 0.0f),
-                std::max(bounding_box.max.y - bounding_box.min.y, 0.0f)};
-            if (new_view_size[0] <= 0.f || new_view_size[1] <= 0.f) {
-              FML_LOG(ERROR)
-                  << "Got an invalid view size from Scenic; ignoring: "
-                  << new_view_size[0] << " " << new_view_size[1];
-              break;
-            }
-
-            // Avoid metrics update when possible -- it is computationally
-            // expensive.
-            if (view_logical_size_.has_value() &&
-                *view_logical_size_ == new_view_size) {
-              break;
-            }
-
-            view_logical_size_ = new_view_size;
-            view_logical_origin_ = {bounding_box.min.x, bounding_box.min.y};
-            metrics_changed = true;
-            break;
-          }
-          case fuchsia::ui::gfx::Event::Tag::kViewConnected:
-            if (!OnChildViewConnected(
-                    event.gfx().view_connected().view_holder_id)) {
-              deferred_view_events.push_back(std::move(event.gfx()));
-            }
-            break;
-          case fuchsia::ui::gfx::Event::Tag::kViewDisconnected:
-            if (!OnChildViewDisconnected(
-                    event.gfx().view_disconnected().view_holder_id)) {
-              deferred_view_events.push_back(std::move(event.gfx()));
-            }
-            break;
-          case fuchsia::ui::gfx::Event::Tag::kViewStateChanged:
-            if (!OnChildViewStateChanged(
-                    event.gfx().view_state_changed().view_holder_id,
-                    event.gfx().view_state_changed().state.is_rendering)) {
-              deferred_view_events.push_back(std::move(event.gfx()));
-            }
-            break;
-          case fuchsia::ui::gfx::Event::Tag::Invalid:
-            FML_DCHECK(false) << "Flutter PlatformView::OnScenicEvent: Got "
-                                 "an invalid GFX event.";
-            break;
-          default:
-            // We don't care about some event types, so not handling them is OK.
-            break;
-        }
-        break;
-      default: {
-        break;
-      }
-    }
-  }
-
-  // If some View events went unmatched, try processing them again one more time
-  // in case they arrived out-of-order with the View creation callback.
-  if (!deferred_view_events.empty()) {
-    task_runners_.GetPlatformTaskRunner()->PostTask(fml::MakeCopyable(
-        [weak = weak_factory_.GetWeakPtr(),
-         deferred_view_events = std::move(deferred_view_events)]() {
-          if (!weak) {
-            FML_LOG(WARNING)
-                << "PlatformView already destroyed when "
-                   "processing deferred view events; dropping events.";
-            return;
-          }
-
-          for (const auto& event : deferred_view_events) {
-            switch (event.Which()) {
-              case fuchsia::ui::gfx::Event::Tag::kViewConnected: {
-                bool view_found = weak->OnChildViewConnected(
-                    event.view_connected().view_holder_id);
-                FML_DCHECK(view_found);
-                break;
-              }
-              case fuchsia::ui::gfx::Event::Tag::kViewDisconnected: {
-                bool view_found = weak->OnChildViewDisconnected(
-                    event.view_disconnected().view_holder_id);
-                FML_DCHECK(view_found);
-                break;
-              }
-              case fuchsia::ui::gfx::Event::Tag::kViewStateChanged: {
-                bool view_found = weak->OnChildViewStateChanged(
-                    event.view_state_changed().view_holder_id,
-                    event.view_state_changed().state.is_rendering);
-                FML_DCHECK(view_found);
-                break;
-              }
-              default:
-                FML_DCHECK(false) << "Flutter PlatformView::OnScenicEvent: Got "
-                                     "an invalid deferred GFX event.";
-                break;
-            }
-          }
-        }));
-  }
-
-  // If any of the viewport metrics changed, inform the engine now.
-  if (view_pixel_ratio_.has_value() && view_logical_size_.has_value() &&
-      metrics_changed) {
-    const float pixel_ratio = *view_pixel_ratio_;
-    const std::array<float, 2> logical_size = *view_logical_size_;
-    SetViewportMetrics({
-        pixel_ratio,                                // device_pixel_ratio
-        std::round(logical_size[0] * pixel_ratio),  // physical_width
-        std::round(logical_size[1] * pixel_ratio),  // physical_height
-        0.0f,                                       // physical_padding_top
-        0.0f,                                       // physical_padding_right
-        0.0f,                                       // physical_padding_bottom
-        0.0f,                                       // physical_padding_left
-        0.0f,                                       // physical_view_inset_top
-        0.0f,                                       // physical_view_inset_right
-        0.0f,  // physical_view_inset_bottom
-        0.0f,  // physical_view_inset_left
-        0.0f,  // p_physical_system_gesture_inset_top
-        0.0f,  // p_physical_system_gesture_inset_right
-        0.0f,  // p_physical_system_gesture_inset_bottom
-        0.0f,  // p_physical_system_gesture_inset_left,
-        -1.0,  // p_physical_touch_slop,
-        {},    // p_physical_display_features_bounds
-        {},    // p_physical_display_features_type
-        {},    // p_physical_display_features_state
-    });
-  }
-}
-
-bool GfxPlatformView::OnChildViewConnected(scenic::ResourceId view_holder_id) {
-  auto view_id_mapping = child_view_ids_.find(view_holder_id);
-  if (view_id_mapping == child_view_ids_.end()) {
-    return false;
-  }
-
-  std::ostringstream out;
-  out << "{"
-      << "\"method\":\"View.viewConnected\","
-      << "\"args\":{"
-      << "  \"viewId\":" << view_id_mapping->second  // ViewHolderToken handle
-      << "  }"
-      << "}";
-  auto call = out.str();
-
-  std::unique_ptr<flutter::PlatformMessage> message =
-      std::make_unique<flutter::PlatformMessage>(
-          "flutter/platform_views",
-          fml::MallocMapping::Copy(call.c_str(), call.size()), nullptr);
-  DispatchPlatformMessage(std::move(message));
-
-  return true;
-}
-
-bool GfxPlatformView::OnChildViewDisconnected(
-    scenic::ResourceId view_holder_id) {
-  auto view_id_mapping = child_view_ids_.find(view_holder_id);
-  if (view_id_mapping == child_view_ids_.end()) {
-    return false;
-  }
-
-  std::ostringstream out;
-  out << "{"
-      << "\"method\":\"View.viewDisconnected\","
-      << "\"args\":{"
-      << "  \"viewId\":" << view_id_mapping->second  // ViewHolderToken handle
-      << "  }"
-      << "}";
-  auto call = out.str();
-
-  // A disconnected view cannot listen to pointer events.
-  pointer_injector_delegate_->OnDestroyView(view_id_mapping->second);
-
-  std::unique_ptr<flutter::PlatformMessage> message =
-      std::make_unique<flutter::PlatformMessage>(
-          "flutter/platform_views",
-          fml::MallocMapping::Copy(call.c_str(), call.size()), nullptr);
-  DispatchPlatformMessage(std::move(message));
-
-  return true;
-}
-
-bool GfxPlatformView::OnChildViewStateChanged(scenic::ResourceId view_holder_id,
-                                              bool is_rendering) {
-  auto view_id_mapping = child_view_ids_.find(view_holder_id);
-  if (view_id_mapping == child_view_ids_.end()) {
-    return false;
-  }
-
-  const std::string is_rendering_str = is_rendering ? "true" : "false";
-  std::ostringstream out;
-  out << "{"
-      << "\"method\":\"View.viewStateChanged\","
-      << "\"args\":{"
-      << "  \"viewId\":" << view_id_mapping->second << ","  // ViewHolderToken
-      << "  \"is_rendering\":" << is_rendering_str << ","   // IsViewRendering
-      << "  \"state\":" << is_rendering_str                 // IsViewRendering
-      << "  }"
-      << "}";
-  auto call = out.str();
-
-  std::unique_ptr<flutter::PlatformMessage> message =
-      std::make_unique<flutter::PlatformMessage>(
-          "flutter/platform_views",
-          fml::MallocMapping::Copy(call.c_str(), call.size()), nullptr);
-  DispatchPlatformMessage(std::move(message));
-
-  return true;
-}
-
-void GfxPlatformView::OnCreateView(ViewCallback on_view_created,
-                                   int64_t view_id_raw,
-                                   bool hit_testable,
-                                   bool focusable) {
-  auto on_view_bound =
-      [weak = weak_factory_.GetWeakPtr(),
-       platform_task_runner = task_runners_.GetPlatformTaskRunner(),
-       view_id = view_id_raw](scenic::ResourceId resource_id) {
-        platform_task_runner->PostTask([weak, view_id, resource_id]() {
-          if (!weak) {
-            FML_LOG(WARNING)
-                << "ViewHolder bound to PlatformView after PlatformView was "
-                   "destroyed; ignoring.";
-            return;
-          }
-
-          FML_DCHECK(weak->child_view_ids_.count(resource_id) == 0);
-          weak->child_view_ids_[resource_id] = view_id;
-          weak->pointer_injector_delegate_->OnCreateView(view_id);
-        });
-      };
-  on_create_view_callback_(view_id_raw, std::move(on_view_created),
-                           std::move(on_view_bound), hit_testable, focusable);
-}
-
-void GfxPlatformView::OnDisposeView(int64_t view_id_raw) {
-  auto on_view_unbound =
-      [weak = weak_factory_.GetWeakPtr(), view_id = view_id_raw,
-       platform_task_runner = task_runners_.GetPlatformTaskRunner()](
-          scenic::ResourceId resource_id) {
-        platform_task_runner->PostTask([weak, resource_id, view_id]() {
-          if (!weak) {
-            FML_LOG(WARNING)
-                << "ViewHolder unbound from PlatformView after PlatformView"
-                   "was destroyed; ignoring.";
-            return;
-          }
-
-          FML_DCHECK(weak->child_view_ids_.count(resource_id) == 1);
-          weak->child_view_ids_.erase(resource_id);
-          weak->pointer_injector_delegate_->OnDestroyView(view_id);
-        });
-      };
-  on_destroy_view_callback_(view_id_raw, std::move(on_view_unbound));
-}
-
-}  // namespace flutter_runner
diff --git a/shell/platform/fuchsia/flutter/gfx_platform_view.h b/shell/platform/fuchsia/flutter/gfx_platform_view.h
deleted file mode 100644
index 1004a85808c5657ee38214a6d91a855d7608daf1..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/flutter/gfx_platform_view.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_GFX_PLATFORM_VIEW_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_GFX_PLATFORM_VIEW_H_
-
-#include "flutter/shell/platform/fuchsia/flutter/platform_view.h"
-
-#include <fuchsia/ui/gfx/cpp/fidl.h>
-#include <fuchsia/ui/pointer/cpp/fidl.h>
-
-#include "flutter/fml/memory/weak_ptr.h"
-#include "flutter/shell/platform/fuchsia/flutter/gfx_external_view_embedder.h"
-
-namespace flutter_runner {
-
-using OnCreateGfxView =
-    fit::function<void(int64_t, ViewCallback, GfxViewIdCallback, bool, bool)>;
-using OnDestroyGfxView = fit::function<void(int64_t, GfxViewIdCallback)>;
-
-// The GfxPlatformView implements SessionListener and gets Session events but it
-// does *not* actually own the Session itself; that is owned by the
-// GfxExternalViewEmbedder on the raster thread.
-class GfxPlatformView final : public flutter_runner::PlatformView,
-                              private fuchsia::ui::scenic::SessionListener {
- public:
-  GfxPlatformView(
-      flutter::PlatformView::Delegate& delegate,
-      flutter::TaskRunners task_runners,
-      fuchsia::ui::views::ViewRef view_ref,
-      std::shared_ptr<flutter::ExternalViewEmbedder> external_view_embedder,
-      fuchsia::ui::input::ImeServiceHandle ime_service,
-      fuchsia::ui::input3::KeyboardHandle keyboard,
-      fuchsia::ui::pointer::TouchSourceHandle touch_source,
-      fuchsia::ui::pointer::MouseSourceHandle mouse_source,
-      fuchsia::ui::views::FocuserHandle focuser,
-      fuchsia::ui::views::ViewRefFocusedHandle view_ref_focused,
-      fuchsia::ui::pointerinjector::RegistryHandle pointerinjector_registry,
-      fidl::InterfaceRequest<fuchsia::ui::scenic::SessionListener>
-          session_listener_request,
-      fit::closure on_session_listener_error_callback,
-      OnEnableWireframe wireframe_enabled_callback,
-      OnCreateGfxView on_create_view_callback,
-      OnUpdateView on_update_view_callback,
-      OnDestroyGfxView on_destroy_view_callback,
-      OnCreateSurface on_create_surface_callback,
-      OnSemanticsNodeUpdate on_semantics_node_update_callback,
-      OnRequestAnnounce on_request_announce_callback,
-      OnShaderWarmup on_shader_warmup,
-      AwaitVsyncCallback await_vsync_callback,
-      AwaitVsyncForSecondaryCallbackCallback
-          await_vsync_for_secondary_callback_callback);
-
-  ~GfxPlatformView() override;
-
- private:
-  // |fuchsia::ui::scenic::SessionListener|
-  void OnScenicError(std::string error) override;
-  void OnScenicEvent(std::vector<fuchsia::ui::scenic::Event> events) override;
-
-  // ViewHolder event handlers.  These return false if the ViewHolder
-  // corresponding to `view_holder_id` could not be found and the evnt was
-  // unhandled.
-  bool OnChildViewConnected(scenic::ResourceId view_holder_id);
-  bool OnChildViewDisconnected(scenic::ResourceId view_holder_id);
-  bool OnChildViewStateChanged(scenic::ResourceId view_holder_id,
-                               bool is_rendering);
-
-  void OnCreateView(ViewCallback on_view_created,
-                    int64_t view_id_raw,
-                    bool hit_testable,
-                    bool focusable) override;
-  void OnDisposeView(int64_t view_id_raw) override;
-
-  fidl::Binding<fuchsia::ui::scenic::SessionListener> session_listener_binding_;
-  fit::closure session_listener_error_callback_;
-
-  // child_view_ids_ maintains a persistent mapping from Scenic ResourceId's to
-  // flutter view ids, which are really zx_handle_t of ViewHolderToken.
-  std::unordered_map<scenic::ResourceId, zx_handle_t> child_view_ids_;
-
-  OnCreateGfxView on_create_view_callback_;
-  OnDestroyGfxView on_destroy_view_callback_;
-
-  fml::WeakPtrFactory<GfxPlatformView>
-      weak_factory_;  // Must be the last member.
-
-  FML_DISALLOW_COPY_AND_ASSIGN(GfxPlatformView);
-};
-
-}  // namespace flutter_runner
-
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_GFX_PLATFORM_VIEW_H_
diff --git a/shell/platform/fuchsia/flutter/gfx_session_connection.cc b/shell/platform/fuchsia/flutter/gfx_session_connection.cc
deleted file mode 100644
index 530b07d8e7647ff2df7da1a88d147c87fd44b1c5..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/flutter/gfx_session_connection.cc
+++ /dev/null
@@ -1,522 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "gfx_session_connection.h"
-
-#include <lib/async/cpp/task.h>
-#include <lib/async/cpp/time.h>
-#include <lib/async/default.h>
-#include <lib/fit/function.h>
-#include <zircon/status.h>
-
-#include "flutter/fml/make_copyable.h"
-#include "flutter/fml/time/time_point.h"
-#include "flutter/fml/trace_event.h"
-
-#include "vsync_waiter.h"
-
-namespace flutter_runner {
-namespace {
-
-fml::TimePoint Now() {
-  return fml::TimePoint::FromEpochDelta(fml::TimeDelta::FromNanoseconds(
-      async::Now(async_get_default_dispatcher()).get()));
-}
-
-}  // namespace
-
-// This function takes in all relevant information to determining when should
-// the next frame be scheduled. It returns a pair of (frame_start_time,
-// frame_end_time) to be passed into FireCallback().
-//
-// Importantly, there are two invariants for correct and performant scheduling
-// that this function upholds:
-// 1. Schedule the next frame at least half a vsync interval from the previous
-// one. In practice, this means that every vsync interval Flutter produces
-// exactly one frame in steady state behavior.
-// 2. Only produce frames beginning in the future.
-//
-// |vsync_offset| - the time from the next vsync that the animator should begin
-// working on the next frame. For instance if vsyncs are at 0ms, 16ms, and 33ms,
-// and the |vsync_offset| is 5ms, then frames should begin at 11ms and 28ms.
-//
-// |vsync_interval| - the interval between vsyncs. Would be 16.6ms for a 60Hz
-// display.
-//
-// |last_targeted_vsync| - the last vsync targeted, which is usually the
-// frame_end_time returned from the last invocation of this function
-//
-// |now| - the current time
-//
-// |next_vsync| - the next vsync after |now|. This can be generated using the
-// SnapToNextPhase function.
-FlutterFrameTimes GfxSessionConnection::GetTargetTimes(
-    fml::TimeDelta vsync_offset,
-    fml::TimeDelta vsync_interval,
-    fml::TimePoint last_targeted_vsync,
-    fml::TimePoint now,
-    fml::TimePoint next_vsync) {
-  FML_DCHECK(vsync_offset <= vsync_interval);
-  FML_DCHECK(vsync_interval > fml::TimeDelta::FromMilliseconds(0));
-  FML_DCHECK(now < next_vsync && next_vsync < now + vsync_interval);
-
-  // This makes the math much easier below, since we live in a (mod
-  // vsync_interval) world.
-  if (vsync_offset == fml::TimeDelta::FromNanoseconds(0)) {
-    vsync_offset = vsync_interval;
-  }
-
-  // Start the frame after Scenic has finished its CPU work. This is
-  // accomplished using the vsync_offset.
-  fml::TimeDelta vsync_offset2 = vsync_interval - vsync_offset;
-  fml::TimePoint frame_start_time =
-      (next_vsync - vsync_interval) + vsync_offset2;
-
-  fml::TimePoint frame_end_time = next_vsync;
-
-  // Advance to next available slot, keeping in mind the two invariants.
-  while (frame_end_time < (last_targeted_vsync + (vsync_interval / 2)) ||
-         frame_start_time < now) {
-    frame_start_time = frame_start_time + vsync_interval;
-    frame_end_time = frame_end_time + vsync_interval;
-  }
-
-  // Useful knowledge for analyzing traces.
-  fml::TimePoint previous_vsync = next_vsync - vsync_interval;
-  TRACE_DURATION(
-      "flutter", "GfxSessionConnection::GetTargetTimes", "previous_vsync(ms)",
-      previous_vsync.ToEpochDelta().ToMilliseconds(), "last_targeted(ms)",
-      last_targeted_vsync.ToEpochDelta().ToMilliseconds(), "now(ms)",
-      now.ToEpochDelta().ToMilliseconds(), "next_vsync(ms))",
-      next_vsync.ToEpochDelta().ToMilliseconds(), "frame_start_time(ms)",
-      frame_start_time.ToEpochDelta().ToMilliseconds(), "frame_end_time(ms)",
-      frame_end_time.ToEpochDelta().ToMilliseconds());
-
-  return {frame_start_time, frame_end_time};
-}
-
-fml::TimePoint GfxSessionConnection::CalculateNextLatchPoint(
-    fml::TimePoint present_requested_time,
-    fml::TimePoint now,
-    fml::TimePoint last_latch_point_targeted,
-    fml::TimeDelta flutter_frame_build_time,
-    fml::TimeDelta vsync_interval,
-    std::deque<std::pair<fml::TimePoint, fml::TimePoint>>&
-        future_presentation_infos) {
-  // The minimum latch point is the largest of:
-  // Now
-  // When we expect the Flutter work for the frame to be completed
-  // The last latch point targeted
-  fml::TimePoint minimum_latch_point_to_target =
-      std::max(std::max(now, present_requested_time + flutter_frame_build_time),
-               last_latch_point_targeted);
-
-  for (auto& info : future_presentation_infos) {
-    fml::TimePoint latch_point = info.first;
-
-    if (latch_point >= minimum_latch_point_to_target) {
-      return latch_point;
-    }
-  }
-
-  // We could not find a suitable latch point in the list given to us from
-  // Scenic, so aim for the smallest safe value.
-  return minimum_latch_point_to_target;
-}
-
-/// Returns the system time at which the next frame is likely to be presented.
-///
-/// Consider the following scenarios, where in both the
-/// scenarios the result will be the same.
-///
-/// Scenario 1:
-/// presentation_interval is 2
-/// ^     ^     ^     ^     ^
-/// +     +     +     +     +
-/// 0--1--2--3--4--5--6--7--8--9--
-/// +        +  +
-/// |        |  +---------> result: next_presentation_time
-/// |        v
-/// v        now
-/// last_presentation_time
-///
-/// Scenario 2:
-/// presentation_interval is 2
-/// ^     ^     ^     ^     ^
-/// +     +     +     +     +
-/// 0--1--2--3--4--5--6--7--8--9--
-///       +  +  +
-///       |  |  +--------->result: next_presentation_time
-///       |  |
-///       |  +>now
-///       |
-///       +->last_presentation_time
-fml::TimePoint GfxSessionConnection::SnapToNextPhase(
-    const fml::TimePoint now,
-    const fml::TimePoint last_frame_presentation_time,
-    const fml::TimeDelta presentation_interval) {
-  if (presentation_interval <= fml::TimeDelta::Zero()) {
-    FML_LOG(WARNING)
-        << "Presentation interval must be positive. The value was: "
-        << presentation_interval.ToMilliseconds() << "ms.";
-    return now;
-  }
-
-  if (last_frame_presentation_time > now) {
-    FML_LOG(WARNING)
-        << "Last frame was presented in the future. Clamping to now.";
-    return now + presentation_interval;
-  }
-
-  const fml::TimeDelta time_since_last_presentation =
-      now - last_frame_presentation_time;
-  // this will be the most likely scenario if we are rendering at a good
-  // frame rate, short circuiting the other checks in this case.
-  if (time_since_last_presentation < presentation_interval) {
-    return last_frame_presentation_time + presentation_interval;
-  } else {
-    const int64_t num_phases_passed =
-        (time_since_last_presentation / presentation_interval);
-    return last_frame_presentation_time +
-           (presentation_interval * (num_phases_passed + 1));
-  }
-}
-
-GfxSessionConnection::GfxSessionConnection(
-    std::string debug_label,
-    inspect::Node inspect_node,
-    fuchsia::ui::scenic::SessionHandle session,
-    fml::closure session_error_callback,
-    on_frame_presented_event on_frame_presented_callback,
-    uint64_t max_frames_in_flight,
-    fml::TimeDelta vsync_offset)
-    : session_wrapper_(session.Bind(), nullptr),
-      inspect_node_(std::move(inspect_node)),
-      secondary_vsyncs_completed_(
-          inspect_node_.CreateUint("SecondaryVsyncsCompleted", 0u)),
-      vsyncs_requested_(inspect_node_.CreateUint("VsyncsRequested", 0u)),
-      vsyncs_completed_(inspect_node_.CreateUint("VsyncsCompleted", 0u)),
-      presents_requested_(inspect_node_.CreateUint("PresentsRequested", 0u)),
-      presents_submitted_(inspect_node_.CreateUint("PresentsSubmitted", 0u)),
-      presents_completed_(inspect_node_.CreateUint("PresentsCompleted", 0u)),
-      last_secondary_vsync_completed_(
-          inspect_node_.CreateInt("LastSecondaryVsyncCompleteTime", 0)),
-      last_vsync_requested_(inspect_node_.CreateInt("LastVsyncRequestTime", 0)),
-      last_vsync_completed_(
-          inspect_node_.CreateInt("LastVsyncCompleteTime", 0)),
-      last_frame_requested_(
-          inspect_node_.CreateInt("LastPresentRequestTime", 0)),
-      last_frame_presented_(
-          inspect_node_.CreateInt("LastPresentSubmitTime", 0)),
-      last_frame_completed_(
-          inspect_node_.CreateInt("LastSubmitCompleteTime", 0)),
-      inspect_dispatcher_(async_get_default_dispatcher()),
-      on_frame_presented_callback_(std::move(on_frame_presented_callback)),
-      kMaxFramesInFlight(max_frames_in_flight),
-      vsync_offset_(vsync_offset),
-      weak_factory_(this) {
-  FML_CHECK(kMaxFramesInFlight > 0);
-  last_presentation_time_ = Now();
-
-  next_presentation_info_.set_presentation_time(0);
-
-  session_wrapper_.set_error_handler([callback = session_error_callback](
-                                         zx_status_t status) {
-    FML_LOG(ERROR) << "scenic::Session error: " << zx_status_get_string(status);
-    callback();
-  });
-
-  // Set the |fuchsia::ui::scenic::OnFramePresented()| event handler that will
-  // fire every time a set of one or more frames is presented.
-  session_wrapper_.set_on_frame_presented_handler(
-      [weak = weak_factory_.GetWeakPtr()](
-          fuchsia::scenic::scheduling::FramePresentedInfo info) {
-        if (!weak) {
-          return;
-        }
-
-        std::lock_guard<std::mutex> lock(weak->mutex_);
-
-        // Update Scenic's limit for our remaining frames in flight allowed.
-        size_t num_presents_handled = info.presentation_infos.size();
-
-        // A frame was presented: Update our |frames_in_flight| to match the
-        // updated unfinalized present requests.
-        weak->frames_in_flight_ -= num_presents_handled;
-
-        TRACE_DURATION("gfx", "OnFramePresented5", "frames_in_flight",
-                       weak->frames_in_flight_, "max_frames_in_flight",
-                       weak->kMaxFramesInFlight, "num_presents_handled",
-                       num_presents_handled);
-        FML_DCHECK(weak->frames_in_flight_ >= 0);
-
-        weak->last_presentation_time_ = fml::TimePoint::FromEpochDelta(
-            fml::TimeDelta::FromNanoseconds(info.actual_presentation_time));
-
-        // Scenic retired a given number of frames, so mark them as completed.
-        // Inspect updates must run on the inspect dispatcher.
-        //
-        // TODO(akbiggs): It might not be necessary to post an async task for
-        // the inspect updates. Read over the Inspect API's thread safety and
-        // adjust accordingly.
-        async::PostTask(weak->inspect_dispatcher_, [weak, now = Now(),
-                                                    num_presents_handled]() {
-          if (!weak) {
-            return;
-          }
-
-          weak->presents_completed_.Add(num_presents_handled);
-          weak->last_frame_completed_.Set(now.ToEpochDelta().ToNanoseconds());
-        });
-
-        if (weak->fire_callback_request_pending_) {
-          weak->FireCallbackMaybe();
-        }
-
-        if (weak->present_session_pending_) {
-          weak->PresentSession();
-        }
-
-        // Call the client-provided callback once we are done using |info|.
-        weak->on_frame_presented_callback_(std::move(info));
-      });
-
-  session_wrapper_.SetDebugName(debug_label);
-
-  // Get information to finish initialization and only then allow Present()s.
-  session_wrapper_.RequestPresentationTimes(
-      /*requested_prediction_span=*/0,
-      [weak = weak_factory_.GetWeakPtr()](
-          fuchsia::scenic::scheduling::FuturePresentationTimes info) {
-        if (!weak) {
-          return;
-        }
-
-        std::lock_guard<std::mutex> lock(weak->mutex_);
-
-        weak->next_presentation_info_ = UpdatePresentationInfo(
-            std::move(info), weak->next_presentation_info_);
-
-        weak->initialized_ = true;
-
-        weak->PresentSession();
-      });
-  FML_LOG(INFO) << "Flutter GfxSessionConnection: Set vsync_offset to "
-                << vsync_offset_.ToMicroseconds() << "us";
-}
-
-GfxSessionConnection::~GfxSessionConnection() = default;
-
-void GfxSessionConnection::Present() {
-  std::lock_guard<std::mutex> lock(mutex_);
-
-  TRACE_DURATION("gfx", "GfxSessionConnection::Present", "frames_in_flight",
-                 frames_in_flight_, "max_frames_in_flight", kMaxFramesInFlight);
-
-  TRACE_FLOW_BEGIN("gfx", "GfxSessionConnection::PresentSession",
-                   next_present_session_trace_id_);
-  ++next_present_session_trace_id_;
-
-  auto now = Now();
-  present_requested_time_ = now;
-
-  // Flutter is requesting a frame here, so mark it as such.
-  // Inspect updates must run on the inspect dispatcher.
-  async::PostTask(inspect_dispatcher_, [this, now]() {
-    presents_requested_.Add(1);
-    last_frame_requested_.Set(now.ToEpochDelta().ToNanoseconds());
-  });
-
-  // Throttle frame submission to Scenic if we already have the maximum amount
-  // of frames in flight. This allows the paint tasks for this frame to execute
-  // in parallel with the presentation of previous frame but still provides
-  // back-pressure to prevent us from enqueuing even more work.
-  if (initialized_ && frames_in_flight_ < kMaxFramesInFlight) {
-    PresentSession();
-  } else {
-    // We should never exceed the max frames in flight.
-    FML_CHECK(frames_in_flight_ <= kMaxFramesInFlight);
-
-    present_session_pending_ = true;
-  }
-}
-
-void GfxSessionConnection::AwaitVsync(FireCallbackCallback callback) {
-  std::lock_guard<std::mutex> lock(mutex_);
-  TRACE_DURATION("flutter", "GfxSessionConnection::AwaitVsync");
-  fire_callback_ = callback;
-
-  // Flutter is requesting a vsync here, so mark it as such.
-  // Inspect updates must run on the inspect dispatcher.
-  async::PostTask(inspect_dispatcher_, [this, now = Now()]() {
-    vsyncs_requested_.Add(1);
-    last_vsync_requested_.Set(now.ToEpochDelta().ToNanoseconds());
-  });
-
-  FireCallbackMaybe();
-}
-
-void GfxSessionConnection::AwaitVsyncForSecondaryCallback(
-    FireCallbackCallback callback) {
-  std::lock_guard<std::mutex> lock(mutex_);
-  TRACE_DURATION("flutter",
-                 "GfxSessionConnection::AwaitVsyncForSecondaryCallback");
-  fire_callback_ = callback;
-
-  // Flutter is requesting a secondary vsync here, so mark it as such.
-  // Inspect updates must run on the inspect dispatcher.
-  async::PostTask(inspect_dispatcher_, [this, now = Now()]() {
-    secondary_vsyncs_completed_.Add(1);
-    last_secondary_vsync_completed_.Set(now.ToEpochDelta().ToNanoseconds());
-  });
-
-  FlutterFrameTimes times = GetTargetTimesHelper(/*secondary_callback=*/true);
-  fire_callback_(times.frame_start, times.frame_target);
-}
-
-// Precondition: |mutex_| is held
-void GfxSessionConnection::PresentSession() {
-  TRACE_DURATION("gfx", "GfxSessionConnection::PresentSession");
-
-  present_session_pending_ = false;
-
-  while (processed_present_session_trace_id_ < next_present_session_trace_id_) {
-    TRACE_FLOW_END("gfx", "GfxSessionConnection::PresentSession",
-                   processed_present_session_trace_id_);
-    ++processed_present_session_trace_id_;
-  }
-  TRACE_FLOW_BEGIN("gfx", "Session::Present", next_present_trace_id_);
-  ++next_present_trace_id_;
-
-  ++frames_in_flight_;
-
-  fml::TimeDelta presentation_interval =
-      GetCurrentVsyncInfo().presentation_interval;
-
-  fml::TimePoint next_latch_point = CalculateNextLatchPoint(
-      Now(), present_requested_time_, last_latch_point_targeted_,
-      fml::TimeDelta::FromMicroseconds(0),  // flutter_frame_build_time
-      presentation_interval, future_presentation_infos_);
-
-  last_latch_point_targeted_ = next_latch_point;
-
-  // Flutter is presenting a frame here, so mark it as such.
-  // Inspect updates must run on the inspect dispatcher.
-  async::PostTask(inspect_dispatcher_, [this, now = Now()]() {
-    presents_submitted_.Add(1);
-    last_frame_presented_.Set(now.ToEpochDelta().ToNanoseconds());
-  });
-
-  session_wrapper_.Present2(
-      /*requested_presentation_time=*/next_latch_point.ToEpochDelta()
-          .ToNanoseconds(),
-      /*requested_prediction_span=*/presentation_interval.ToNanoseconds() * 10,
-      [weak = weak_factory_.GetWeakPtr()](
-          fuchsia::scenic::scheduling::FuturePresentationTimes info) {
-        if (!weak) {
-          return;
-        }
-
-        std::lock_guard<std::mutex> lock(weak->mutex_);
-
-        // Clear |future_presentation_infos_| and replace it with the updated
-        // information.
-        std::deque<std::pair<fml::TimePoint, fml::TimePoint>>().swap(
-            weak->future_presentation_infos_);
-
-        for (fuchsia::scenic::scheduling::PresentationInfo& presentation_info :
-             info.future_presentations) {
-          weak->future_presentation_infos_.push_back(
-              {fml::TimePoint::FromEpochDelta(fml::TimeDelta::FromNanoseconds(
-                   presentation_info.latch_point())),
-               fml::TimePoint::FromEpochDelta(fml::TimeDelta::FromNanoseconds(
-                   presentation_info.presentation_time()))});
-        }
-
-        weak->next_presentation_info_ = UpdatePresentationInfo(
-            std::move(info), weak->next_presentation_info_);
-      });
-}
-
-// Precondition: |mutex_| is held.
-//
-// Postcondition: Either a frame is scheduled or fire_callback_request_pending_
-// is set to true, meaning we will attempt to schedule a frame on the next
-// |OnFramePresented|.
-void GfxSessionConnection::FireCallbackMaybe() {
-  TRACE_DURATION("flutter", "FireCallbackMaybe");
-
-  if (frames_in_flight_ < kMaxFramesInFlight) {
-    FlutterFrameTimes times =
-        GetTargetTimesHelper(/*secondary_callback=*/false);
-
-    last_targeted_vsync_ = times.frame_target;
-    fire_callback_request_pending_ = false;
-
-    // Scenic completed a vsync here, so mark it as such.
-    // Inspect updates must run on the inspect dispatcher.
-    async::PostTask(inspect_dispatcher_, [this, now = Now()]() {
-      vsyncs_completed_.Add(1);
-      last_vsync_completed_.Set(now.ToEpochDelta().ToNanoseconds());
-    });
-
-    fire_callback_(times.frame_start, times.frame_target);
-  } else {
-    fire_callback_request_pending_ = true;
-  }
-}
-
-// Precondition: |mutex_| is held
-//
-// A helper function for GetTargetTimes(), since many of the fields it takes
-// have to be derived from other state.
-FlutterFrameTimes GfxSessionConnection::GetTargetTimesHelper(
-    bool secondary_callback) {
-  fml::TimeDelta presentation_interval =
-      GetCurrentVsyncInfo().presentation_interval;
-
-  fml::TimePoint next_vsync = GetCurrentVsyncInfo().presentation_time;
-  fml::TimePoint now = Now();
-  fml::TimePoint last_presentation_time = last_presentation_time_;
-  if (next_vsync <= now) {
-    next_vsync =
-        SnapToNextPhase(now, last_presentation_time, presentation_interval);
-  }
-
-  fml::TimePoint last_targeted_vsync =
-      secondary_callback ? fml::TimePoint::Min() : last_targeted_vsync_;
-  return GetTargetTimes(vsync_offset_, presentation_interval,
-                        last_targeted_vsync, now, next_vsync);
-}
-
-fuchsia::scenic::scheduling::PresentationInfo
-GfxSessionConnection::UpdatePresentationInfo(
-    fuchsia::scenic::scheduling::FuturePresentationTimes future_info,
-    fuchsia::scenic::scheduling::PresentationInfo& presentation_info) {
-  fuchsia::scenic::scheduling::PresentationInfo new_presentation_info;
-  new_presentation_info.set_presentation_time(
-      presentation_info.presentation_time());
-
-  auto next_time = presentation_info.presentation_time();
-  // Get the earliest vsync time that is after our recorded |presentation_time|.
-  for (auto& presentation_info : future_info.future_presentations) {
-    auto current_time = presentation_info.presentation_time();
-
-    if (current_time > next_time) {
-      new_presentation_info.set_presentation_time(current_time);
-      return new_presentation_info;
-    }
-  }
-
-  return new_presentation_info;
-}
-
-// Precondition: |mutex_| is held
-VsyncInfo GfxSessionConnection::GetCurrentVsyncInfo() const {
-  return {fml::TimePoint::FromEpochDelta(fml::TimeDelta::FromNanoseconds(
-              next_presentation_info_.presentation_time())),
-          kDefaultPresentationInterval};
-}
-
-}  // namespace flutter_runner
diff --git a/shell/platform/fuchsia/flutter/gfx_session_connection.h b/shell/platform/fuchsia/flutter/gfx_session_connection.h
deleted file mode 100644
index 27dc1e101803698e304a87d5e6a0bca58379d38f..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/flutter/gfx_session_connection.h
+++ /dev/null
@@ -1,186 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_GFX_SESSION_CONNECTION_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_GFX_SESSION_CONNECTION_H_
-
-#include <fuchsia/scenic/scheduling/cpp/fidl.h>
-#include <fuchsia/ui/scenic/cpp/fidl.h>
-#include <lib/async/dispatcher.h>
-#include <lib/fidl/cpp/interface_handle.h>
-#include <lib/inspect/cpp/inspect.h>
-#include <lib/ui/scenic/cpp/session.h>
-
-#include "flutter/fml/closure.h"
-#include "flutter/fml/macros.h"
-
-#include "fml/time/time_delta.h"
-#include "vsync_waiter.h"
-
-#include <mutex>
-
-namespace flutter_runner {
-
-using on_frame_presented_event =
-    std::function<void(fuchsia::scenic::scheduling::FramePresentedInfo)>;
-
-struct FlutterFrameTimes {
-  fml::TimePoint frame_start;
-  fml::TimePoint frame_target;
-};
-
-struct VsyncInfo {
-  fml::TimePoint presentation_time;
-  fml::TimeDelta presentation_interval;
-};
-
-// Assume a 60hz refresh rate before we have enough past
-// |fuchsia::scenic::scheduling::PresentationInfo|s to calculate it ourselves.
-static constexpr fml::TimeDelta kDefaultPresentationInterval =
-    fml::TimeDelta::FromSecondsF(1.0 / 60.0);
-
-// The component residing on the raster thread that is responsible for
-// maintaining the Scenic session connection and presenting node updates.
-class GfxSessionConnection final {
- public:
-  static FlutterFrameTimes GetTargetTimes(fml::TimeDelta vsync_offset,
-                                          fml::TimeDelta vsync_interval,
-                                          fml::TimePoint last_targeted_vsync,
-                                          fml::TimePoint now,
-                                          fml::TimePoint next_vsync);
-
-  static fml::TimePoint CalculateNextLatchPoint(
-      fml::TimePoint present_requested_time,
-      fml::TimePoint now,
-      fml::TimePoint last_latch_point_targeted,
-      fml::TimeDelta flutter_frame_build_time,
-      fml::TimeDelta vsync_interval,
-      std::deque<std::pair<fml::TimePoint, fml::TimePoint>>&
-          future_presentation_infos);
-
-  static fml::TimePoint SnapToNextPhase(
-      const fml::TimePoint now,
-      const fml::TimePoint last_frame_presentation_time,
-      const fml::TimeDelta presentation_interval);
-
-  // Update the next Vsync info to |next_presentation_info_|. This is expected
-  // to be called in |scenic::Session::Present2| immedaite callbacks with the
-  // presentation info provided by Scenic.  Only the next vsync
-  // information will be saved (in order to handle edge cases involving
-  // multiple Scenic sessions in the same process). This function is safe to
-  // call from any thread.
-  static fuchsia::scenic::scheduling::PresentationInfo UpdatePresentationInfo(
-      fuchsia::scenic::scheduling::FuturePresentationTimes future_info,
-      fuchsia::scenic::scheduling::PresentationInfo& presentation_info);
-
-  GfxSessionConnection(std::string debug_label,
-                       inspect::Node inspect_node,
-                       fuchsia::ui::scenic::SessionHandle session,
-                       fml::closure session_error_callback,
-                       on_frame_presented_event on_frame_presented_callback,
-                       uint64_t max_frames_in_flight,
-                       fml::TimeDelta vsync_offset);
-
-  ~GfxSessionConnection();
-
-  scenic::Session* get() { return &session_wrapper_; }
-
-  // Call to request that the all enqueued Session ops since the last |Present|
-  // be sent to Scenic.
-  void Present();
-
-  // Used to implement VsyncWaiter functionality.
-  void AwaitVsync(FireCallbackCallback callback);
-  void AwaitVsyncForSecondaryCallback(FireCallbackCallback callback);
-
- private:
-  void PresentSession();
-
-  void FireCallbackMaybe();
-
-  FlutterFrameTimes GetTargetTimesHelper(bool secondary_callback);
-  VsyncInfo GetCurrentVsyncInfo() const;
-
-  scenic::Session session_wrapper_;
-
-  inspect::Node inspect_node_;
-  inspect::UintProperty secondary_vsyncs_completed_;
-  inspect::UintProperty vsyncs_requested_;
-  inspect::UintProperty vsyncs_completed_;
-  inspect::UintProperty presents_requested_;
-  inspect::UintProperty presents_submitted_;
-  inspect::UintProperty presents_completed_;
-  inspect::IntProperty last_secondary_vsync_completed_;
-  inspect::IntProperty last_vsync_requested_;
-  inspect::IntProperty last_vsync_completed_;
-  inspect::IntProperty last_frame_requested_;
-  inspect::IntProperty last_frame_presented_;
-  inspect::IntProperty last_frame_completed_;
-  async_dispatcher_t* inspect_dispatcher_;
-
-  on_frame_presented_event on_frame_presented_callback_;
-
-  fml::TimePoint last_latch_point_targeted_;
-  fml::TimePoint present_requested_time_;
-
-  std::deque<std::pair<fml::TimePoint, fml::TimePoint>>
-      future_presentation_infos_ = {};
-
-  bool initialized_ = false;
-
-  // A flow event trace id for following |Session::Present| calls into
-  // Scenic.  This will be incremented each |Session::Present| call.  By
-  // convention, the Scenic side will also contain its own trace id that
-  // begins at 0, and is incremented each |Session::Present| call.
-  uint64_t next_present_trace_id_ = 0;
-  uint64_t next_present_session_trace_id_ = 0;
-  uint64_t processed_present_session_trace_id_ = 0;
-
-  // The maximum number of frames Flutter sent to Scenic that it can have
-  // outstanding at any time. This is equivalent to how many times it has
-  // called Present2() before receiving an OnFramePresented() event.
-  const int kMaxFramesInFlight;
-
-  int frames_in_flight_ = 0;
-  bool present_session_pending_ = false;
-
-  // The time from vsync that the Flutter animator should begin its frames. This
-  // is non-zero so that Flutter and Scenic compete less for CPU and GPU time.
-  fml::TimeDelta vsync_offset_;
-
-  // Variables for recording past and future vsync info, as reported by Scenic.
-  fml::TimePoint last_presentation_time_;
-  fuchsia::scenic::scheduling::PresentationInfo next_presentation_info_;
-
-  // Flutter framework pipeline logic.
-
-  // The following fields can be accessed from both the raster and UI threads,
-  // so guard them with this mutex. If performance dictates, this could probably
-  // be made lock-free, but it's much easier to reason about with this mutex.
-  std::mutex mutex_;
-
-  // This is the last Vsync we submitted as the frame_target_time to
-  // FireCallback(). This value should be strictly increasing in order to
-  // guarantee that animation code that relies on target vsyncs works correctly,
-  // and that Flutter is not producing multiple frames in a small interval.
-  fml::TimePoint last_targeted_vsync_;
-
-  // This is true iff AwaitVSync() was called but we could not schedule a frame.
-  bool fire_callback_request_pending_ = false;
-
-  // The callback passed in from VsyncWaiter which eventually runs on the UI
-  // thread.
-  FireCallbackCallback fire_callback_;
-
-  // Generates WeakPtrs to the instance of the class so callbacks can verify
-  // that the instance is still in-scope before accessing state.
-  // This must be the last field in the class.
-  fml::WeakPtrFactory<GfxSessionConnection> weak_factory_;
-
-  FML_DISALLOW_COPY_AND_ASSIGN(GfxSessionConnection);
-};
-
-}  // namespace flutter_runner
-
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_GFX_SESSION_CONNECTION_H_
diff --git a/shell/platform/fuchsia/flutter/isolate_configurator.cc b/shell/platform/fuchsia/flutter/isolate_configurator.cc
index 030f4bf9bcfbb107a91df9c1865c64fc80cde3db..8c3d457a6a6c8a38aad88832bcfb24c95c1b3512 100644
--- a/shell/platform/fuchsia/flutter/isolate_configurator.cc
+++ b/shell/platform/fuchsia/flutter/isolate_configurator.cc
@@ -13,13 +13,10 @@
 
 namespace flutter_runner {
 
-IsolateConfigurator::IsolateConfigurator(
-    UniqueFDIONS fdio_ns,
-    fuchsia::sys::EnvironmentHandle environment,
-    zx::channel directory_request,
-    zx::eventpair view_ref)
+IsolateConfigurator::IsolateConfigurator(UniqueFDIONS fdio_ns,
+                                         zx::channel directory_request,
+                                         zx::eventpair view_ref)
     : fdio_ns_(std::move(fdio_ns)),
-      environment_(std::move(environment)),
       directory_request_(std::move(directory_request)),
       view_ref_(std::move(view_ref)) {}
 
@@ -43,8 +40,7 @@ bool IsolateConfigurator::ConfigureCurrentIsolate() {
 }
 
 void IsolateConfigurator::BindFuchsia() {
-  fuchsia::dart::Initialize(std::move(environment_),
-                            std::move(directory_request_),
+  fuchsia::dart::Initialize(std::move(directory_request_),
                             std::move(view_ref_));
 }
 
diff --git a/shell/platform/fuchsia/flutter/isolate_configurator.h b/shell/platform/fuchsia/flutter/isolate_configurator.h
index f38bed4f01b438d4bb371ae694c9e42fbfbe59fc..69580600b938cf68125a692552e6e9fdc03c56bc 100644
--- a/shell/platform/fuchsia/flutter/isolate_configurator.h
+++ b/shell/platform/fuchsia/flutter/isolate_configurator.h
@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_ISOLATE_CONFIGURATOR_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_ISOLATE_CONFIGURATOR_H_
-
-#include <fuchsia/sys/cpp/fidl.h>
-#include <fuchsia/ui/scenic/cpp/fidl.h>
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_ISOLATE_CONFIGURATOR_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_ISOLATE_CONFIGURATOR_H_
 
+#include <lib/zx/channel.h>
+#include <lib/zx/eventpair.h>
 #include "flutter/fml/macros.h"
 #include "unique_fdio_ns.h"
 
@@ -19,7 +18,6 @@ namespace flutter_runner {
 class IsolateConfigurator final {
  public:
   IsolateConfigurator(UniqueFDIONS fdio_ns,
-                      fuchsia::sys::EnvironmentHandle environment,
                       zx::channel directory_request,
                       zx::eventpair view_ref);
 
@@ -32,7 +30,6 @@ class IsolateConfigurator final {
  private:
   bool used_ = false;
   UniqueFDIONS fdio_ns_;
-  fuchsia::sys::EnvironmentHandle environment_;
   zx::channel directory_request_;
   zx::eventpair view_ref_;
 
@@ -47,4 +44,4 @@ class IsolateConfigurator final {
 
 }  // namespace flutter_runner
 
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_ISOLATE_CONFIGURATOR_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_ISOLATE_CONFIGURATOR_H_
diff --git a/shell/platform/fuchsia/flutter/kernel/BUILD.gn b/shell/platform/fuchsia/flutter/kernel/BUILD.gn
index 7564a3584e744f26c37915bbbfdf4da7b824e990..0e4cdb25f8f85bd160f2cad85adbcc16ae19ccd1 100644
--- a/shell/platform/fuchsia/flutter/kernel/BUILD.gn
+++ b/shell/platform/fuchsia/flutter/kernel/BUILD.gn
@@ -3,10 +3,10 @@
 # found in the LICENSE file.
 
 import("//build/compiled_action.gni")
-import("//build/fuchsia/sdk.gni")
 import("//flutter/common/config.gni")
 import("//flutter/tools/fuchsia/dart.gni")
-import("//third_party/dart/utils/compile_platform.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
+import("$dart_src/utils/compile_platform.gni")
 
 compile_platform("kernel_platform_files") {
   single_root_scheme = "org-dartlang-sdk"
@@ -44,17 +44,11 @@ template("core_snapshot") {
     inputs = [ platform_dill ]
 
     vm_snapshot_data = "$target_gen_dir/vm_isolate_snapshot${suffix}.bin"
-    vm_snapshot_instructions =
-        "$target_gen_dir/vm_snapshot_instructions${suffix}.bin"
     isolate_snapshot_data = "$target_gen_dir/isolate_snapshot${suffix}.bin"
-    isolate_snapshot_instructions =
-        "$target_gen_dir/isolate_snapshot_instructions${suffix}.bin"
     snapshot_profile = "$target_gen_dir/snapshot_profile${suffix}.json"
     outputs = [
       vm_snapshot_data,
-      vm_snapshot_instructions,
       isolate_snapshot_data,
-      isolate_snapshot_instructions,
       snapshot_profile,
     ]
 
@@ -68,14 +62,10 @@ template("core_snapshot") {
     args = [
       "--enable_mirrors=false",
       "--deterministic",
-      "--snapshot_kind=core-jit",
+      "--snapshot_kind=core",
       "--vm_snapshot_data=" + rebase_path(vm_snapshot_data, root_build_dir),
-      "--vm_snapshot_instructions=" +
-          rebase_path(vm_snapshot_instructions, root_build_dir),
       "--isolate_snapshot_data=" +
           rebase_path(isolate_snapshot_data, root_build_dir),
-      "--isolate_snapshot_instructions=" +
-          rebase_path(isolate_snapshot_instructions, root_build_dir),
       "--write_v8_snapshot_profile_to=" +
           rebase_path(snapshot_profile, root_build_dir),
     ]
@@ -83,8 +73,7 @@ template("core_snapshot") {
     # No asserts in debug or release product.
     # No asserts in release with flutter_profile=true (non-product)
     # Yes asserts in non-product debug.
-    if (!invoker.product &&
-        (is_debug || !(flutter_runtime_mode == "profile"))) {
+    if (!invoker.product && (is_debug || flutter_runtime_mode == "debug")) {
       args += [ "--enable_asserts" ]
     }
     args += [ rebase_path(platform_dill) ]
diff --git a/shell/platform/fuchsia/flutter/kernel/pubspec.yaml b/shell/platform/fuchsia/flutter/kernel/pubspec.yaml
index b6f4924b5062118416e2d2d8ac47a19b1ee3d07d..85d01ce1515b9b3710c5a285ff6f552a364bce54 100644
--- a/shell/platform/fuchsia/flutter/kernel/pubspec.yaml
+++ b/shell/platform/fuchsia/flutter/kernel/pubspec.yaml
@@ -3,4 +3,4 @@
 # found in the LICENSE file.
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=3.2.0-0 <4.0.0'
diff --git a/shell/platform/fuchsia/flutter/keyboard.h b/shell/platform/fuchsia/flutter/keyboard.h
index 02c697ff7c613ab6c7a4f72bbd0946d57e9cbc51..a0a92c493ac9c50538e7503e02f2f0cfd27cbf88 100644
--- a/shell/platform/fuchsia/flutter/keyboard.h
+++ b/shell/platform/fuchsia/flutter/keyboard.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_KEYBOARD_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_KEYBOARD_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_KEYBOARD_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_KEYBOARD_H_
 
 #include <fuchsia/ui/input3/cpp/fidl.h>
 
@@ -82,4 +82,4 @@ class Keyboard final {
 
 }  // namespace flutter_runner
 
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_KEYBOARD_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_KEYBOARD_H_
diff --git a/shell/platform/fuchsia/flutter/logging.h b/shell/platform/fuchsia/flutter/logging.h
index 3eea76a034ff7569ffe35f9c0edc57e0873ba42a..165a16031299d92bcadfab75a82f83067be185b5 100644
--- a/shell/platform/fuchsia/flutter/logging.h
+++ b/shell/platform/fuchsia/flutter/logging.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_LOGGING_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_LOGGING_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_LOGGING_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_LOGGING_H_
 
 #include "flutter/fml/logging.h"
 
@@ -14,4 +14,4 @@ namespace flutter_runner {
 
 }  // namespace flutter_runner
 
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_LOGGING_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_LOGGING_H_
diff --git a/shell/platform/fuchsia/flutter/main.cc b/shell/platform/fuchsia/flutter/main.cc
index cb41db4576cc6292958e8c99797fdf248d21d740..21162214a8d547c65685f6d17b33304bf8531338 100644
--- a/shell/platform/fuchsia/flutter/main.cc
+++ b/shell/platform/fuchsia/flutter/main.cc
@@ -3,14 +3,17 @@
 // found in the LICENSE file.
 
 #include <lib/async-loop/cpp/loop.h>
-#include <lib/sys/inspect/cpp/component.h>
+#include <lib/inspect/component/cpp/component.h>
 #include <lib/trace-provider/provider.h>
 #include <lib/trace/event.h>
 
 #include <cstdlib>
 
 #include "fml/message_loop.h"
+#include "fml/platform/fuchsia/log_interest_listener.h"
+#include "fml/platform/fuchsia/log_state.h"
 #include "lib/async/default.h"
+#include "logging.h"
 #include "platform/utils.h"
 #include "runner.h"
 #include "runtime/dart/utils/build_info.h"
@@ -20,6 +23,12 @@
 int main(int argc, char const* argv[]) {
   fml::MessageLoop::EnsureInitializedForCurrentThread();
 
+  // Setup logging.
+  fml::LogState::Default().SetTags({LOG_TAG});
+  fml::LogInterestListener listener(fml::LogState::Default().TakeClientEnd(),
+                                    async_get_default_dispatcher());
+  listener.AsyncWaitForInterestChanged();
+
   // Create our component context which is served later.
   auto context = sys::ComponentContext::Create();
   dart_utils::RootInspectNode::Initialize(context.get());
@@ -40,9 +49,6 @@ int main(int argc, char const* argv[]) {
         &already_started);
   }
 
-  // Set up the process-wide /tmp memfs.
-  dart_utils::RunnerTemp runner_temp;
-
   fml::MessageLoop& loop = fml::MessageLoop::GetCurrent();
   flutter_runner::Runner runner(loop.GetTaskRunner(), context.get());
 
diff --git a/shell/platform/fuchsia/flutter/meta/aot_product_runtime b/shell/platform/fuchsia/flutter/meta/aot_product_runtime
deleted file mode 100644
index 244bbc8d9722d3c8eb56a93d1e9ebdcf8ae9c54b..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/flutter/meta/aot_product_runtime
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "runner": "fuchsia-pkg://fuchsia.com/flutter_aot_product_runner#meta/flutter_aot_product_runner.cmx"
-}
diff --git a/shell/platform/fuchsia/flutter/meta/aot_runtime b/shell/platform/fuchsia/flutter/meta/aot_runtime
deleted file mode 100644
index 8e1b724662f0c022bb1c697684a43bf897177da4..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/flutter/meta/aot_runtime
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "runner": "fuchsia-pkg://fuchsia.com/flutter_aot_runner#meta/flutter_aot_runner.cmx"
-}
\ No newline at end of file
diff --git a/shell/platform/fuchsia/flutter/meta/common.shard.cml b/shell/platform/fuchsia/flutter/meta/common.shard.cml
index b43a3da575c052dc76ccbd1db027d3d2e26b9ab3..6bc325ab628a841a26bb5a834b0e21caed2f9e8a 100644
--- a/shell/platform/fuchsia/flutter/meta/common.shard.cml
+++ b/shell/platform/fuchsia/flutter/meta/common.shard.cml
@@ -2,22 +2,26 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file
 {
-    capabilities: [
-        // Required for inspect.
-        // Copied from inspect/client.shard.cml because out-of-tree doesn't
-        // have support for CML includes from the SDK.
+    use: [
+        // This is used by the Dart VM to communicate from Dart code to C++ code.
         {
-            directory: "diagnostics",
-            rights: [ "connect" ],
-            path: "/diagnostics",
+            storage: "tmp",
+            path: "/tmp",
         },
-    ],
-    use: [
+        // This is used by the Dart VM to load i18n data.
         {
             directory: "config-data",
             rights: [ "r*" ],
             path: "/config/data",
         },
+        // The ICU time zone data, factored out of `config-data`.
+        // See:
+        // https://fuchsia.dev/fuchsia-src/concepts/process/namespaces?typical_directory_structure
+        {
+            directory: "tzdata-icu",
+            rights: [ "r*" ],
+            path: "/config/tzdata/icu",
+        },
         {
             directory: "root-ssl-certificates",
             rights: [ "r*" ],
@@ -29,32 +33,27 @@
                 "fuchsia.device.NameProvider",
                 "fuchsia.feedback.CrashReporter",
                 "fuchsia.fonts.Provider",
+                "fuchsia.inspect.InspectSink", // Copied from inspect/client.shard.cml.
                 "fuchsia.intl.PropertyProvider",
                 "fuchsia.logger.LogSink", // Copied from syslog/client.shard.cml.
+                "fuchsia.media.ProfileProvider",
                 "fuchsia.memorypressure.Provider",
                 "fuchsia.net.name.Lookup",
                 "fuchsia.posix.socket.Provider",
                 "fuchsia.sysmem.Allocator",
-                "fuchsia.timezone.Timezone", // Copied from vulkan/client.shard.cml.
-                "fuchsia.tracing.provider.Registry", // Copied from vulkan/client.shard.cml.
                 "fuchsia.ui.composition.Allocator",
                 "fuchsia.ui.composition.Flatland",
                 "fuchsia.ui.input.ImeService",
                 "fuchsia.ui.input3.Keyboard",
                 "fuchsia.ui.pointerinjector.Registry",
-                "fuchsia.ui.scenic.Scenic",
                 "fuchsia.vulkan.loader.Loader", // Copied from vulkan/client.shard.cml.
             ],
         },
-    ],
-    expose: [
-        // Required for inspect.
-        // Copied from inspect/client.shard.cml because out-of-tree doesn't
-        // have support for CML includes from the SDK.
         {
-            directory: "diagnostics",
-            from: "self",
-            to: "framework",
+            protocol: [
+                "fuchsia.tracing.provider.Registry", // Copied from vulkan/client.shard.cml.
+            ],
+            availability: "optional",
         },
-    ],
+    ]
 }
diff --git a/shell/platform/fuchsia/flutter/meta/flutter_aot_product_runner.cmx b/shell/platform/fuchsia/flutter/meta/flutter_aot_product_runner.cmx
deleted file mode 100644
index ec1e1975c6e5855e3432ce086adcfb97aabd3234..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/flutter/meta/flutter_aot_product_runner.cmx
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "program": {
-        "data": "data"
-    },
-    "sandbox": {
-        "features": [
-            "config-data",
-            "isolated-cache-storage",
-            "root-ssl-certificates",
-            "vulkan"
-        ],
-        "services": [
-            "fuchsia.accessibility.semantics.SemanticsManager",
-            "fuchsia.device.NameProvider",
-            "fuchsia.feedback.CrashReporter",
-            "fuchsia.fonts.Provider",
-            "fuchsia.intl.PropertyProvider",
-            "fuchsia.logger.LogSink",
-            "fuchsia.memorypressure.Provider",
-            "fuchsia.net.name.Lookup",
-            "fuchsia.posix.socket.Provider",
-            "fuchsia.sysmem.Allocator",
-            "fuchsia.tracing.provider.Registry",
-            "fuchsia.ui.composition.Allocator",
-            "fuchsia.ui.composition.Flatland",
-            "fuchsia.ui.input.ImeService",
-            "fuchsia.ui.input3.Keyboard",
-            "fuchsia.ui.scenic.Scenic",
-            "fuchsia.ui.pointerinjector.Registry",
-            "fuchsia.vulkan.loader.Loader"
-        ]
-    }
-}
diff --git a/shell/platform/fuchsia/flutter/meta/flutter_aot_runner.cmx b/shell/platform/fuchsia/flutter/meta/flutter_aot_runner.cmx
deleted file mode 100644
index ec1e1975c6e5855e3432ce086adcfb97aabd3234..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/flutter/meta/flutter_aot_runner.cmx
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "program": {
-        "data": "data"
-    },
-    "sandbox": {
-        "features": [
-            "config-data",
-            "isolated-cache-storage",
-            "root-ssl-certificates",
-            "vulkan"
-        ],
-        "services": [
-            "fuchsia.accessibility.semantics.SemanticsManager",
-            "fuchsia.device.NameProvider",
-            "fuchsia.feedback.CrashReporter",
-            "fuchsia.fonts.Provider",
-            "fuchsia.intl.PropertyProvider",
-            "fuchsia.logger.LogSink",
-            "fuchsia.memorypressure.Provider",
-            "fuchsia.net.name.Lookup",
-            "fuchsia.posix.socket.Provider",
-            "fuchsia.sysmem.Allocator",
-            "fuchsia.tracing.provider.Registry",
-            "fuchsia.ui.composition.Allocator",
-            "fuchsia.ui.composition.Flatland",
-            "fuchsia.ui.input.ImeService",
-            "fuchsia.ui.input3.Keyboard",
-            "fuchsia.ui.scenic.Scenic",
-            "fuchsia.ui.pointerinjector.Registry",
-            "fuchsia.vulkan.loader.Loader"
-        ]
-    }
-}
diff --git a/shell/platform/fuchsia/flutter/meta/flutter_jit_product_runner.cmx b/shell/platform/fuchsia/flutter/meta/flutter_jit_product_runner.cmx
deleted file mode 100644
index b0a626ca1b0656ff32223810c34d9ff1e408fb07..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/flutter/meta/flutter_jit_product_runner.cmx
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "program": {
-        "data": "data"
-    },
-    "sandbox": {
-        "features": [
-            "config-data",
-            "deprecated-ambient-replace-as-executable",
-            "isolated-cache-storage",
-            "root-ssl-certificates",
-            "vulkan"
-        ],
-        "services": [
-            "fuchsia.accessibility.semantics.SemanticsManager",
-            "fuchsia.device.NameProvider",
-            "fuchsia.feedback.CrashReporter",
-            "fuchsia.fonts.Provider",
-            "fuchsia.intl.PropertyProvider",
-            "fuchsia.logger.LogSink",
-            "fuchsia.memorypressure.Provider",
-            "fuchsia.net.name.Lookup",
-            "fuchsia.posix.socket.Provider",
-            "fuchsia.sysmem.Allocator",
-            "fuchsia.tracing.provider.Registry",
-            "fuchsia.ui.composition.Allocator",
-            "fuchsia.ui.composition.Flatland",
-            "fuchsia.ui.input.ImeService",
-            "fuchsia.ui.input3.Keyboard",
-            "fuchsia.ui.scenic.Scenic",
-            "fuchsia.ui.pointerinjector.Registry",
-            "fuchsia.vulkan.loader.Loader"
-        ]
-    }
-}
diff --git a/shell/platform/fuchsia/flutter/meta/flutter_jit_runner.cmx b/shell/platform/fuchsia/flutter/meta/flutter_jit_runner.cmx
deleted file mode 100644
index b0a626ca1b0656ff32223810c34d9ff1e408fb07..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/flutter/meta/flutter_jit_runner.cmx
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "program": {
-        "data": "data"
-    },
-    "sandbox": {
-        "features": [
-            "config-data",
-            "deprecated-ambient-replace-as-executable",
-            "isolated-cache-storage",
-            "root-ssl-certificates",
-            "vulkan"
-        ],
-        "services": [
-            "fuchsia.accessibility.semantics.SemanticsManager",
-            "fuchsia.device.NameProvider",
-            "fuchsia.feedback.CrashReporter",
-            "fuchsia.fonts.Provider",
-            "fuchsia.intl.PropertyProvider",
-            "fuchsia.logger.LogSink",
-            "fuchsia.memorypressure.Provider",
-            "fuchsia.net.name.Lookup",
-            "fuchsia.posix.socket.Provider",
-            "fuchsia.sysmem.Allocator",
-            "fuchsia.tracing.provider.Registry",
-            "fuchsia.ui.composition.Allocator",
-            "fuchsia.ui.composition.Flatland",
-            "fuchsia.ui.input.ImeService",
-            "fuchsia.ui.input3.Keyboard",
-            "fuchsia.ui.scenic.Scenic",
-            "fuchsia.ui.pointerinjector.Registry",
-            "fuchsia.vulkan.loader.Loader"
-        ]
-    }
-}
diff --git a/shell/platform/fuchsia/flutter/meta/jit_product_runtime b/shell/platform/fuchsia/flutter/meta/jit_product_runtime
deleted file mode 100644
index 03707e7721409d78f0f9067cc663b7747e8590fc..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/flutter/meta/jit_product_runtime
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "runner": "fuchsia-pkg://fuchsia.com/flutter_jit_product_runner#meta/flutter_jit_product_runner.cmx"
-}
diff --git a/shell/platform/fuchsia/flutter/meta/jit_runtime b/shell/platform/fuchsia/flutter/meta/jit_runtime
deleted file mode 100644
index d23fb95a7279b019fa609d1672a7e830f501287d..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/flutter/meta/jit_runtime
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "runner": "fuchsia-pkg://fuchsia.com/flutter_jit_runner#meta/flutter_jit_runner.cmx"
-}
\ No newline at end of file
diff --git a/shell/platform/fuchsia/flutter/platform_view.cc b/shell/platform/fuchsia/flutter/platform_view.cc
index 85d671c1e773ffc460cd90aea5a0ac9202922321..8e78c4ab94c1a34453e14b633b15846b5389b252 100644
--- a/shell/platform/fuchsia/flutter/platform_view.cc
+++ b/shell/platform/fuchsia/flutter/platform_view.cc
@@ -2,12 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flow/embedded_views.h"
-#include "pointer_injector_delegate.h"
 #define RAPIDJSON_HAS_STDSTRING 1
 
 #include "platform_view.h"
 
+#include <fuchsia/ui/app/cpp/fidl.h>
+#include <zircon/status.h>
+
 #include <algorithm>
 #include <cstring>
 #include <limits>
@@ -16,27 +17,46 @@
 #include "flutter/fml/logging.h"
 #include "flutter/fml/make_copyable.h"
 #include "flutter/lib/ui/window/pointer_data.h"
-#include "flutter/lib/ui/window/window.h"
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/encodable_value.h"
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_message_codec.h"
 #include "third_party/rapidjson/include/rapidjson/document.h"
 #include "third_party/rapidjson/include/rapidjson/stringbuffer.h"
 #include "third_party/rapidjson/include/rapidjson/writer.h"
 
+#include "flutter/fml/make_copyable.h"
 #include "logging.h"
+#include "pointer_injector_delegate.h"
 #include "runtime/dart/utils/inlines.h"
 #include "text_delegate.h"
 #include "vsync_waiter.h"
 
+namespace {
+// Helper to extract a given member with a given type from a rapidjson object.
+template <typename T, typename O, typename F>
+bool CallWithMember(O obj, const char* member_name, F func) {
+  auto it = obj.FindMember(member_name);
+  if (it == obj.MemberEnd()) {
+    return false;
+  }
+  if (!it->value.template Is<T>()) {
+    return false;
+  }
+  func(it->value.template Get<T>());
+  return true;
+}
+}  // namespace
+
 namespace flutter_runner {
 
 static constexpr char kFlutterPlatformChannel[] = "flutter/platform";
 static constexpr char kAccessibilityChannel[] = "flutter/accessibility";
 static constexpr char kFlutterPlatformViewsChannel[] = "flutter/platform_views";
 static constexpr char kFuchsiaShaderWarmupChannel[] = "fuchsia/shader_warmup";
+static constexpr char kFuchsiaInputTestChannel[] = "fuchsia/input_test";
+static constexpr char kFuchsiaChildViewChannel[] = "fuchsia/child_view";
+static constexpr int64_t kFlutterImplicitViewId = 0ll;
 
 PlatformView::PlatformView(
-    bool is_flatland,
     flutter::PlatformView::Delegate& delegate,
     flutter::TaskRunners task_runners,
     fuchsia::ui::views::ViewRef view_ref,
@@ -47,16 +67,21 @@ PlatformView::PlatformView(
     fuchsia::ui::pointer::MouseSourceHandle mouse_source,
     fuchsia::ui::views::FocuserHandle focuser,
     fuchsia::ui::views::ViewRefFocusedHandle view_ref_focused,
+    fuchsia::ui::composition::ParentViewportWatcherHandle
+        parent_viewport_watcher,
     fuchsia::ui::pointerinjector::RegistryHandle pointerinjector_registry,
-    OnEnableWireframe wireframe_enabled_callback,
-    OnUpdateView on_update_view_callback,
-    OnCreateSurface on_create_surface_callback,
-    OnSemanticsNodeUpdate on_semantics_node_update_callback,
-    OnRequestAnnounce on_request_announce_callback,
-    OnShaderWarmup on_shader_warmup,
+    OnEnableWireframeCallback wireframe_enabled_callback,
+    OnCreateViewCallback on_create_view_callback,
+    OnUpdateViewCallback on_update_view_callback,
+    OnDestroyViewCallback on_destroy_view_callback,
+    OnCreateSurfaceCallback on_create_surface_callback,
+    OnSemanticsNodeUpdateCallback on_semantics_node_update_callback,
+    OnRequestAnnounceCallback on_request_announce_callback,
+    OnShaderWarmupCallback on_shader_warmup_callback,
     AwaitVsyncCallback await_vsync_callback,
     AwaitVsyncForSecondaryCallbackCallback
-        await_vsync_for_secondary_callback_callback)
+        await_vsync_for_secondary_callback_callback,
+    std::shared_ptr<sys::ServiceDirectory> dart_application_svc)
     : flutter::PlatformView(delegate, std::move(task_runners)),
       external_view_embedder_(external_view_embedder),
       focus_delegate_(
@@ -71,10 +96,14 @@ PlatformView::PlatformView(
       on_semantics_node_update_callback_(
           std::move(on_semantics_node_update_callback)),
       on_request_announce_callback_(std::move(on_request_announce_callback)),
-      on_shader_warmup_(std::move(on_shader_warmup)),
+      on_create_view_callback_(std::move(on_create_view_callback)),
+      on_destroy_view_callback_(std::move(on_destroy_view_callback)),
+      on_shader_warmup_callback_(std::move(on_shader_warmup_callback)),
       await_vsync_callback_(await_vsync_callback),
       await_vsync_for_secondary_callback_callback_(
           await_vsync_for_secondary_callback_callback),
+      dart_application_svc_(dart_application_svc),
+      parent_viewport_watcher_(parent_viewport_watcher.Bind()),
       weak_factory_(this) {
   fuchsia::ui::views::ViewRef view_ref_clone;
   fidl::Clone(view_ref, &view_ref_clone);
@@ -137,11 +166,65 @@ PlatformView::PlatformView(
 
   // Configure the pointer injector delegate.
   pointer_injector_delegate_ = std::make_unique<PointerInjectorDelegate>(
-      std::move(pointerinjector_registry), std::move(view_ref_clone),
-      is_flatland);
+      std::move(pointerinjector_registry), std::move(view_ref_clone));
+
+  // This is only used by the integration tests.
+  if (dart_application_svc) {
+    // Connect to TouchInputListener
+    fuchsia::ui::test::input::TouchInputListenerHandle touch_input_listener;
+    zx_status_t touch_input_listener_status =
+        dart_application_svc
+            ->Connect<fuchsia::ui::test::input::TouchInputListener>(
+                touch_input_listener.NewRequest());
+    if (touch_input_listener_status != ZX_OK) {
+      FML_LOG(WARNING)
+          << "fuchsia::ui::test::input::TouchInputListener connection failed: "
+          << zx_status_get_string(touch_input_listener_status);
+    } else {
+      touch_input_listener_.Bind(std::move(touch_input_listener));
+    }
+
+    // Connect to KeyboardInputListener
+    fuchsia::ui::test::input::KeyboardInputListenerHandle
+        keyboard_input_listener;
+    zx_status_t keyboard_input_listener_status =
+        dart_application_svc
+            ->Connect<fuchsia::ui::test::input::KeyboardInputListener>(
+                keyboard_input_listener.NewRequest());
+    if (keyboard_input_listener_status != ZX_OK) {
+      FML_LOG(WARNING) << "fuchsia::ui::test::input::KeyboardInputListener "
+                          "connection failed: "
+                       << zx_status_get_string(keyboard_input_listener_status);
+    } else {
+      keyboard_input_listener_.Bind(std::move(keyboard_input_listener));
+    }
+    // Connect to MouseInputListener
+    fuchsia::ui::test::input::MouseInputListenerHandle mouse_input_listener;
+    zx_status_t mouse_input_listener_status =
+        dart_application_svc
+            ->Connect<fuchsia::ui::test::input::MouseInputListener>(
+                mouse_input_listener.NewRequest());
+    if (mouse_input_listener_status != ZX_OK) {
+      FML_LOG(WARNING)
+          << "fuchsia::ui::test::input::MouseInputListener connection failed: "
+          << zx_status_get_string(mouse_input_listener_status);
+    } else {
+      mouse_input_listener_.Bind(std::move(mouse_input_listener));
+    }
+  }
 
   // Finally! Register the native platform message handlers.
   RegisterPlatformMessageHandlers();
+
+  parent_viewport_watcher_.set_error_handler([](zx_status_t status) {
+    FML_LOG(ERROR) << "Interface error on: ParentViewportWatcher status: "
+                   << status;
+  });
+
+  parent_viewport_watcher_->GetLayout(
+      fit::bind_member(this, &PlatformView::OnGetLayout));
+  parent_viewport_watcher_->GetStatus(
+      fit::bind_member(this, &PlatformView::OnParentViewportStatus));
 }
 
 PlatformView::~PlatformView() = default;
@@ -161,7 +244,13 @@ void PlatformView::RegisterPlatformMessageHandlers() {
                 this, std::placeholders::_1);
   platform_message_handlers_[kFuchsiaShaderWarmupChannel] =
       std::bind(&HandleFuchsiaShaderWarmupChannelPlatformMessage,
-                on_shader_warmup_, std::placeholders::_1);
+                on_shader_warmup_callback_, std::placeholders::_1);
+  platform_message_handlers_[kFuchsiaInputTestChannel] =
+      std::bind(&PlatformView::HandleFuchsiaInputTestChannelPlatformMessage,
+                this, std::placeholders::_1);
+  platform_message_handlers_[kFuchsiaChildViewChannel] =
+      std::bind(&PlatformView::HandleFuchsiaChildViewChannelPlatformMessage,
+                this, std::placeholders::_1);
 }
 
 static flutter::PointerData::Change GetChangeFromPointerEventPhase(
@@ -236,6 +325,223 @@ std::array<float, 2> PlatformView::ClampToViewSpace(const float x,
   return {clamped_x, clamped_y};
 }
 
+void PlatformView::OnGetLayout(fuchsia::ui::composition::LayoutInfo info) {
+  view_logical_size_ = {static_cast<float>(info.logical_size().width),
+                        static_cast<float>(info.logical_size().height)};
+
+  if (info.has_device_pixel_ratio()) {
+    // Both values should be identical for the Vec2 for DPR.
+    FML_DCHECK(info.device_pixel_ratio().x == info.device_pixel_ratio().y);
+    view_pixel_ratio_ = info.device_pixel_ratio().x;
+  }
+
+  float pixel_ratio = view_pixel_ratio_ ? *view_pixel_ratio_ : 1.0f;
+  flutter::ViewportMetrics metrics{
+      pixel_ratio,  // device_pixel_ratio
+      std::round(view_logical_size_.value()[0] *
+                 pixel_ratio),  // physical_width
+      std::round(view_logical_size_.value()[1] *
+                 pixel_ratio),  // physical_height
+      0.0f,                     // physical_padding_top
+      0.0f,                     // physical_padding_right
+      0.0f,                     // physical_padding_bottom
+      0.0f,                     // physical_padding_left
+      0.0f,                     // physical_view_inset_top
+      0.0f,                     // physical_view_inset_right
+      0.0f,                     // physical_view_inset_bottom
+      0.0f,                     // physical_view_inset_left
+      0.0f,                     // p_physical_system_gesture_inset_top
+      0.0f,                     // p_physical_system_gesture_inset_right
+      0.0f,                     // p_physical_system_gesture_inset_bottom
+      0.0f,                     // p_physical_system_gesture_inset_left,
+      -1.0,                     // p_physical_touch_slop,
+      {},                       // p_physical_display_features_bounds
+      {},                       // p_physical_display_features_type
+      {},                       // p_physical_display_features_state
+      0,                        // p_display_id
+  };
+  SetViewportMetrics(kFlutterImplicitViewId, metrics);
+
+  parent_viewport_watcher_->GetLayout(
+      fit::bind_member(this, &PlatformView::OnGetLayout));
+}
+
+void PlatformView::OnParentViewportStatus(
+    fuchsia::ui::composition::ParentViewportStatus status) {
+  // TODO(fxbug.dev/116001): Investigate if it is useful to send hidden/shown
+  // signals.
+  parent_viewport_status_ = status;
+  parent_viewport_watcher_->GetStatus(
+      fit::bind_member(this, &PlatformView::OnParentViewportStatus));
+}
+
+void PlatformView::OnChildViewStatus(
+    uint64_t content_id,
+    fuchsia::ui::composition::ChildViewStatus status) {
+  FML_DCHECK(child_view_info_.count(content_id) == 1);
+
+  std::ostringstream out;
+  out << "{" << "\"method\":\"View.viewStateChanged\"," << "\"args\":{"
+      << "  \"viewId\":" << child_view_info_.at(content_id).view_id
+      << ","                         // ViewId
+      << "  \"is_rendering\":true,"  // IsViewRendering
+      << "  \"state\":true"          // IsViewRendering
+      << "  }" << "}";
+  auto call = out.str();
+
+  std::unique_ptr<flutter::PlatformMessage> message =
+      std::make_unique<flutter::PlatformMessage>(
+          "flutter/platform_views",
+          fml::MallocMapping::Copy(call.c_str(), call.size()), nullptr);
+  DispatchPlatformMessage(std::move(message));
+
+  child_view_info_.at(content_id)
+      .child_view_watcher->GetStatus(
+          [this, content_id](fuchsia::ui::composition::ChildViewStatus status) {
+            OnChildViewStatus(content_id, status);
+          });
+}
+
+void PlatformView::OnChildViewViewRef(uint64_t content_id,
+                                      uint64_t view_id,
+                                      fuchsia::ui::views::ViewRef view_ref) {
+  FML_CHECK(child_view_info_.count(content_id) == 1);
+
+  fuchsia::ui::views::ViewRef view_ref_clone;
+  fidl::Clone(view_ref, &view_ref_clone);
+
+  focus_delegate_->OnChildViewViewRef(view_id, std::move(view_ref));
+
+  pointer_injector_delegate_->OnCreateView(view_id, std::move(view_ref_clone));
+  OnChildViewConnected(content_id);
+}
+
+void PlatformView::OnCreateView(ViewCallback on_view_created,
+                                int64_t view_id_raw,
+                                bool hit_testable,
+                                bool focusable) {
+  auto on_view_bound = [weak = weak_factory_.GetWeakPtr(),
+                        platform_task_runner =
+                            task_runners_.GetPlatformTaskRunner(),
+                        view_id = view_id_raw](
+                           fuchsia::ui::composition::ContentId content_id,
+                           fuchsia::ui::composition::ChildViewWatcherHandle
+                               child_view_watcher_handle) {
+    FML_CHECK(weak);
+    FML_CHECK(weak->child_view_info_.count(content_id.value) == 0);
+
+    platform_task_runner->PostTask(fml::MakeCopyable(
+        [weak, view_id, content_id,
+         watcher_handle = std::move(child_view_watcher_handle)]() mutable {
+          if (!weak) {
+            FML_LOG(WARNING)
+                << "View bound to PlatformView after PlatformView was "
+                   "destroyed; ignoring.";
+            return;
+          }
+
+          // Bind the child view watcher to the platform thread so that the FIDL
+          // calls are handled on the platform thread.
+          fuchsia::ui::composition::ChildViewWatcherPtr child_view_watcher =
+              watcher_handle.Bind();
+          FML_CHECK(child_view_watcher);
+
+          child_view_watcher.set_error_handler([weak, view_id, content_id](
+                                                   zx_status_t status) {
+            FML_LOG(WARNING)
+                << "Child disconnected. ChildViewWatcher status: " << status;
+
+            if (!weak) {
+              FML_LOG(WARNING) << "View bound to PlatformView after "
+                                  "PlatformView was "
+                                  "destroyed; ignoring.";
+              return;
+            }
+
+            // Disconnected views cannot listen to pointer events.
+            weak->pointer_injector_delegate_->OnDestroyView(view_id);
+
+            weak->OnChildViewDisconnected(content_id.value);
+          });
+
+          weak->child_view_info_.emplace(
+              std::piecewise_construct, std::forward_as_tuple(content_id.value),
+              std::forward_as_tuple(view_id, std::move(child_view_watcher)));
+
+          weak->child_view_info_.at(content_id.value)
+              .child_view_watcher->GetStatus(
+                  [weak, id = content_id.value](
+                      fuchsia::ui::composition::ChildViewStatus status) {
+                    weak->OnChildViewStatus(id, status);
+                  });
+
+          weak->child_view_info_.at(content_id.value)
+              .child_view_watcher->GetViewRef(
+                  [weak, content_id = content_id.value,
+                   view_id](fuchsia::ui::views::ViewRef view_ref) {
+                    weak->OnChildViewViewRef(content_id, view_id,
+                                             std::move(view_ref));
+                  });
+        }));
+  };
+
+  on_create_view_callback_(view_id_raw, std::move(on_view_created),
+                           std::move(on_view_bound), hit_testable, focusable);
+}
+
+void PlatformView::OnDisposeView(int64_t view_id_raw) {
+  auto on_view_unbound =
+      [weak = weak_factory_.GetWeakPtr(),
+       platform_task_runner = task_runners_.GetPlatformTaskRunner(),
+       view_id_raw](fuchsia::ui::composition::ContentId content_id) {
+        platform_task_runner->PostTask([weak, content_id, view_id_raw]() {
+          if (!weak) {
+            FML_LOG(WARNING)
+                << "View unbound from PlatformView after PlatformView"
+                   "was destroyed; ignoring.";
+            return;
+          }
+
+          FML_DCHECK(weak->child_view_info_.count(content_id.value) == 1);
+          weak->OnChildViewDisconnected(content_id.value);
+          weak->child_view_info_.erase(content_id.value);
+          weak->focus_delegate_->OnDisposeChildView(view_id_raw);
+          weak->pointer_injector_delegate_->OnDestroyView(view_id_raw);
+        });
+      };
+  on_destroy_view_callback_(view_id_raw, std::move(on_view_unbound));
+}
+
+void PlatformView::OnChildViewConnected(uint64_t content_id) {
+  FML_CHECK(child_view_info_.count(content_id) == 1);
+  std::ostringstream out;
+  out << "{" << "\"method\":\"View.viewConnected\"," << "\"args\":{"
+      << "  \"viewId\":" << child_view_info_.at(content_id).view_id << "  }"
+      << "}";
+  auto call = out.str();
+
+  std::unique_ptr<flutter::PlatformMessage> message =
+      std::make_unique<flutter::PlatformMessage>(
+          "flutter/platform_views",
+          fml::MallocMapping::Copy(call.c_str(), call.size()), nullptr);
+  DispatchPlatformMessage(std::move(message));
+}
+
+void PlatformView::OnChildViewDisconnected(uint64_t content_id) {
+  FML_CHECK(child_view_info_.count(content_id) == 1);
+  std::ostringstream out;
+  out << "{" << "\"method\":\"View.viewDisconnected\"," << "\"args\":{"
+      << "  \"viewId\":" << child_view_info_.at(content_id).view_id << "  }"
+      << "}";
+  auto call = out.str();
+
+  std::unique_ptr<flutter::PlatformMessage> message =
+      std::make_unique<flutter::PlatformMessage>(
+          "flutter/platform_views",
+          fml::MallocMapping::Copy(call.c_str(), call.size()), nullptr);
+  DispatchPlatformMessage(std::move(message));
+}
+
 bool PlatformView::OnHandlePointerEvent(
     const fuchsia::ui::input::PointerEvent& pointer) {
   TRACE_EVENT0("flutter", "PlatformView::OnHandlePointerEvent");
@@ -594,11 +900,11 @@ bool PlatformView::HandleFlutterPlatformViewsChannelPlatformMessage(
 }
 
 bool PlatformView::HandleFuchsiaShaderWarmupChannelPlatformMessage(
-    OnShaderWarmup on_shader_warmup,
+    OnShaderWarmupCallback on_shader_warmup_callback,
     std::unique_ptr<flutter::PlatformMessage> message) {
   FML_DCHECK(message->channel() == kFuchsiaShaderWarmupChannel);
 
-  if (!on_shader_warmup) {
+  if (!on_shader_warmup_callback) {
     FML_LOG(ERROR) << "No shader warmup callback set!";
     std::string result = "[0]";
     message->response()->Complete(
@@ -657,7 +963,7 @@ bool PlatformView::HandleFuchsiaShaderWarmupChannelPlatformMessage(
   }
 
   auto completion_callback = [response =
-                                  message->response()](uint num_successes) {
+                                  message->response()](uint32_t num_successes) {
     std::ostringstream result_stream;
     result_stream << "[" << num_successes << "]";
 
@@ -668,9 +974,197 @@ bool PlatformView::HandleFuchsiaShaderWarmupChannelPlatformMessage(
         (const uint8_t*)result.c_str() + result.length())));
   };
 
-  on_shader_warmup(skp_paths, completion_callback, width, height);
+  on_shader_warmup_callback(skp_paths, completion_callback, width, height);
   // The response has already been completed by us.
   return true;
 }
 
+// Channel handler for kFuchsiaInputTestChannel
+bool PlatformView::HandleFuchsiaInputTestChannelPlatformMessage(
+    std::unique_ptr<flutter::PlatformMessage> message) {
+  FML_DCHECK(message->channel() == kFuchsiaInputTestChannel);
+
+  const auto& data = message->data();
+  rapidjson::Document document;
+  document.Parse(reinterpret_cast<const char*>(data.GetMapping()),
+                 data.GetSize());
+  if (document.HasParseError() || !document.IsObject()) {
+    FML_LOG(ERROR) << "Could not parse document";
+    return false;
+  }
+  auto root = document.GetObject();
+  auto method = root.FindMember("method");
+  if (method == root.MemberEnd() || !method->value.IsString()) {
+    FML_LOG(ERROR) << "Missing method";
+    return false;
+  }
+
+  FML_LOG(INFO) << "fuchsia/input_test: method=" << method->value.GetString();
+
+  if (method->value == "TouchInputListener.ReportTouchInput") {
+    if (!touch_input_listener_) {
+      FML_LOG(ERROR) << "TouchInputListener not found.";
+      return false;
+    }
+
+    fuchsia::ui::test::input::TouchInputListenerReportTouchInputRequest request;
+    CallWithMember<double>(
+        root, "local_x", [&](double local_x) { request.set_local_x(local_x); });
+    CallWithMember<double>(
+        root, "local_y", [&](double local_y) { request.set_local_y(local_y); });
+    CallWithMember<int64_t>(root, "time_received", [&](uint64_t time_received) {
+      request.set_time_received(time_received);
+    });
+    CallWithMember<std::string>(root, "component_name",
+                                [&](std::string component_name) {
+                                  request.set_component_name(component_name);
+                                });
+
+    touch_input_listener_->ReportTouchInput(std::move(request));
+    return true;
+  }
+
+  if (method->value == "KeyboardInputListener.ReportTextInput") {
+    if (!keyboard_input_listener_) {
+      FML_LOG(ERROR) << "KeyboardInputListener not found.";
+      return false;
+    }
+
+    fuchsia::ui::test::input::KeyboardInputListenerReportTextInputRequest
+        request;
+    CallWithMember<std::string>(
+        root, "text", [&](std::string text) { request.set_text(text); });
+
+    keyboard_input_listener_->ReportTextInput(std::move(request));
+    return true;
+  }
+
+  if (method->value == "MouseInputListener.ReportMouseInput") {
+    if (!mouse_input_listener_) {
+      FML_LOG(ERROR) << "MouseInputListener not found.";
+      return false;
+    }
+
+    fuchsia::ui::test::input::MouseInputListenerReportMouseInputRequest request;
+    CallWithMember<double>(
+        root, "local_x", [&](double local_x) { request.set_local_x(local_x); });
+    CallWithMember<double>(
+        root, "local_y", [&](double local_y) { request.set_local_y(local_y); });
+    CallWithMember<int64_t>(root, "time_received", [&](uint64_t time_received) {
+      request.set_time_received(time_received);
+    });
+    CallWithMember<std::string>(root, "component_name",
+                                [&](std::string component_name) {
+                                  request.set_component_name(component_name);
+                                });
+    CallWithMember<int>(root, "buttons", [&](int button_mask) {
+      std::vector<fuchsia::ui::test::input::MouseButton> buttons;
+      if (button_mask & 1) {
+        buttons.push_back(fuchsia::ui::test::input::MouseButton::FIRST);
+      }
+      if (button_mask & 2) {
+        buttons.push_back(fuchsia::ui::test::input::MouseButton::SECOND);
+      }
+      if (button_mask & 4) {
+        buttons.push_back(fuchsia::ui::test::input::MouseButton::THIRD);
+      }
+      request.set_buttons(buttons);
+    });
+    CallWithMember<std::string>(root, "phase", [&](std::string phase) {
+      if (phase == "add") {
+        request.set_phase(fuchsia::ui::test::input::MouseEventPhase::ADD);
+      } else if (phase == "hover") {
+        request.set_phase(fuchsia::ui::test::input::MouseEventPhase::HOVER);
+      } else if (phase == "down") {
+        request.set_phase(fuchsia::ui::test::input::MouseEventPhase::DOWN);
+      } else if (phase == "move") {
+        request.set_phase(fuchsia::ui::test::input::MouseEventPhase::MOVE);
+      } else if (phase == "up") {
+        request.set_phase(fuchsia::ui::test::input::MouseEventPhase::UP);
+      } else {
+        FML_LOG(ERROR) << "Unexpected mouse phase: " << phase;
+      }
+    });
+    CallWithMember<double>(
+        root, "wheel_x_physical_pixel", [&](double wheel_x_physical_pixel) {
+          request.set_wheel_x_physical_pixel(wheel_x_physical_pixel);
+        });
+    CallWithMember<double>(
+        root, "wheel_y_physical_pixel", [&](double wheel_y_physical_pixel) {
+          request.set_wheel_y_physical_pixel(wheel_y_physical_pixel);
+        });
+
+    mouse_input_listener_->ReportMouseInput(std::move(request));
+    return true;
+  }
+
+  FML_LOG(ERROR) << "fuchsia/input_test: unrecognized method "
+                 << method->value.GetString();
+  return false;
+}
+
+// Channel handler for kFuchsiaChildViewChannel
+bool PlatformView::HandleFuchsiaChildViewChannelPlatformMessage(
+    std::unique_ptr<flutter::PlatformMessage> message) {
+  FML_DCHECK(message->channel() == kFuchsiaChildViewChannel);
+
+  if (message->data().GetSize() != 1 ||
+      (message->data().GetMapping()[0] != '1')) {
+    FML_LOG(ERROR) << kFuchsiaChildViewChannel
+                   << " data must be singularly '1'.";
+    return false;
+  }
+
+  FML_DCHECK(message->data().GetMapping()[0] == '1');
+
+  if (!message->response()) {
+    FML_LOG(ERROR) << kFuchsiaChildViewChannel
+                   << " must have a response callback.";
+    return false;
+  }
+
+  if (!dart_application_svc_) {
+    FML_LOG(ERROR) << "No service directory.";
+    return false;
+  }
+
+  fuchsia::ui::app::ViewProviderHandle view_provider_handle;
+  zx_status_t status =
+      dart_application_svc_->Connect(view_provider_handle.NewRequest());
+  if (status != ZX_OK) {
+    FML_LOG(ERROR) << "Failed to connect to view provider.";
+    return false;
+  }
+  fuchsia::ui::app::ViewProviderPtr view_provider;
+  view_provider.Bind(std::move(view_provider_handle));
+
+  zx::handle view_id;
+
+  zx::channel view_tokens[2];
+  fuchsia::ui::views::ViewportCreationToken viewport_creation_token;
+  fuchsia::ui::views::ViewCreationToken view_creation_token;
+  status = zx::channel::create(0, &viewport_creation_token.value,
+                               &view_creation_token.value);
+  if (status != ZX_OK) {
+    FML_LOG(ERROR) << "Creating view tokens: " << zx_status_get_string(status);
+    return false;
+  }
+
+  fuchsia::ui::app::CreateView2Args create_view_args;
+  create_view_args.set_view_creation_token(std::move(view_creation_token));
+  view_provider->CreateView2(std::move(create_view_args));
+
+  view_id = std::move(viewport_creation_token.value);
+
+  if (view_id) {
+    message->response()->Complete(
+        std::make_unique<fml::DataMapping>(std::to_string(view_id.release())
+
+                                               ));
+    return true;
+  } else {
+    return false;
+  }
+}
+
 }  // namespace flutter_runner
diff --git a/shell/platform/fuchsia/flutter/platform_view.h b/shell/platform/fuchsia/flutter/platform_view.h
index 7c6aa98108ebe84f6d3468a348cbbbf1070f50fb..8e6ffd0ec087e018c847aabf1212a5ba2d1c8c16 100644
--- a/shell/platform/fuchsia/flutter/platform_view.h
+++ b/shell/platform/fuchsia/flutter/platform_view.h
@@ -2,18 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_PLATFORM_VIEW_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_PLATFORM_VIEW_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_PLATFORM_VIEW_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_PLATFORM_VIEW_H_
 
-#include <fuchsia/sys/cpp/fidl.h>
+#include <fuchsia/ui/composition/cpp/fidl.h>
 #include <fuchsia/ui/input/cpp/fidl.h>
 #include <fuchsia/ui/input3/cpp/fidl.h>
 #include <fuchsia/ui/pointer/cpp/fidl.h>
-#include <fuchsia/ui/scenic/cpp/fidl.h>
+#include <fuchsia/ui/test/input/cpp/fidl.h>
 #include <lib/fidl/cpp/binding.h>
 #include <lib/fit/function.h>
 #include <lib/sys/cpp/service_directory.h>
-#include <lib/ui/scenic/cpp/id.h>
 
 #include <array>
 #include <functional>
@@ -23,6 +22,8 @@
 #include <string>
 #include <unordered_map>
 #include <vector>
+#include "flutter/fml/memory/weak_ptr.h"
+#include "flutter/shell/platform/fuchsia/flutter/external_view_embedder.h"
 
 #include "flow/embedded_views.h"
 #include "flutter/fml/macros.h"
@@ -38,20 +39,26 @@
 
 namespace flutter_runner {
 
-using OnEnableWireframe = fit::function<void(bool)>;
+using OnEnableWireframeCallback = fit::function<void(bool)>;
 using ViewCallback = std::function<void()>;
-using OnUpdateView = fit::function<void(int64_t, SkRect, bool, bool)>;
-using OnCreateSurface = fit::function<std::unique_ptr<flutter::Surface>()>;
-using OnSemanticsNodeUpdate =
+using OnUpdateViewCallback = fit::function<void(int64_t, SkRect, bool, bool)>;
+using OnCreateSurfaceCallback =
+    fit::function<std::unique_ptr<flutter::Surface>()>;
+using OnSemanticsNodeUpdateCallback =
     fit::function<void(flutter::SemanticsNodeUpdates, float)>;
-using OnRequestAnnounce = fit::function<void(std::string)>;
+using OnRequestAnnounceCallback = fit::function<void(std::string)>;
+using OnCreateViewCallback =
+    fit::function<void(int64_t, ViewCallback, ViewCreatedCallback, bool, bool)>;
+using OnDestroyViewCallback = fit::function<void(int64_t, ViewIdCallback)>;
+
 // we use an std::function here because the fit::funtion causes problems with
 // std:bind since HandleFuchsiaShaderWarmupChannelPlatformMessage takes one of
 // these as its first argument.
-using OnShaderWarmup = std::function<void(const std::vector<std::string>&,
-                                          std::function<void(uint32_t)>,
-                                          uint64_t,
-                                          uint64_t)>;
+using OnShaderWarmupCallback =
+    std::function<void(const std::vector<std::string>&,
+                       std::function<void(uint32_t)>,
+                       uint64_t,
+                       uint64_t)>;
 
 // PlatformView is the per-engine component residing on the platform thread that
 // is responsible for all platform specific integrations -- particularly
@@ -64,7 +71,6 @@ using OnShaderWarmup = std::function<void(const std::vector<std::string>&,
 class PlatformView : public flutter::PlatformView {
  public:
   PlatformView(
-      bool is_flatland,
       flutter::PlatformView::Delegate& delegate,
       flutter::TaskRunners task_runners,
       fuchsia::ui::views::ViewRef view_ref,
@@ -75,19 +81,33 @@ class PlatformView : public flutter::PlatformView {
       fuchsia::ui::pointer::MouseSourceHandle mouse_source,
       fuchsia::ui::views::FocuserHandle focuser,
       fuchsia::ui::views::ViewRefFocusedHandle view_ref_focused,
+      fuchsia::ui::composition::ParentViewportWatcherHandle
+          parent_viewport_watcher,
       fuchsia::ui::pointerinjector::RegistryHandle pointerinjector_registry,
-      OnEnableWireframe wireframe_enabled_callback,
-      OnUpdateView on_update_view_callback,
-      OnCreateSurface on_create_surface_callback,
-      OnSemanticsNodeUpdate on_semantics_node_update_callback,
-      OnRequestAnnounce on_request_announce_callback,
-      OnShaderWarmup on_shader_warmup,
+      OnEnableWireframeCallback wireframe_enabled_callback,
+      OnCreateViewCallback on_create_view_callback,
+      OnUpdateViewCallback on_update_view_callback,
+      OnDestroyViewCallback on_destroy_view_callback,
+      OnCreateSurfaceCallback on_create_surface_callback,
+      OnSemanticsNodeUpdateCallback on_semantics_node_update_callback,
+      OnRequestAnnounceCallback on_request_announce_callback,
+      OnShaderWarmupCallback on_shader_warmup_callback,
       AwaitVsyncCallback await_vsync_callback,
       AwaitVsyncForSecondaryCallbackCallback
-          await_vsync_for_secondary_callback_callback);
+          await_vsync_for_secondary_callback_callback,
+      std::shared_ptr<sys::ServiceDirectory> dart_application_svc);
 
   ~PlatformView() override;
 
+  void OnGetLayout(fuchsia::ui::composition::LayoutInfo info);
+  void OnParentViewportStatus(
+      fuchsia::ui::composition::ParentViewportStatus status);
+  void OnChildViewStatus(uint64_t content_id,
+                         fuchsia::ui::composition::ChildViewStatus status);
+  void OnChildViewViewRef(uint64_t content_id,
+                          uint64_t view_id,
+                          fuchsia::ui::views::ViewRef view_ref);
+
   // |flutter::PlatformView|
   void SetSemanticsEnabled(bool enabled) override;
 
@@ -95,7 +115,7 @@ class PlatformView : public flutter::PlatformView {
   std::shared_ptr<flutter::ExternalViewEmbedder> CreateExternalViewEmbedder()
       override;
 
- protected:
+ private:
   void RegisterPlatformMessageHandlers();
 
   bool OnHandlePointerEvent(const fuchsia::ui::input::PointerEvent& pointer);
@@ -133,14 +153,31 @@ class PlatformView : public flutter::PlatformView {
 
   // Channel handler for kFuchsiaShaderWarmupChannel.
   static bool HandleFuchsiaShaderWarmupChannelPlatformMessage(
-      OnShaderWarmup on_shader_warmup,
+      OnShaderWarmupCallback on_shader_warmup_callback,
+      std::unique_ptr<flutter::PlatformMessage> message);
+
+  // Channel handler for kFuchsiaInputTestChannel.
+  bool HandleFuchsiaInputTestChannelPlatformMessage(
       std::unique_ptr<flutter::PlatformMessage> message);
 
-  virtual void OnCreateView(ViewCallback on_view_created,
-                            int64_t view_id_raw,
-                            bool hit_testable,
-                            bool focusable) = 0;
-  virtual void OnDisposeView(int64_t view_id_raw) = 0;
+  // Channel handler for kFuchsiaChildViewChannel.
+  bool HandleFuchsiaChildViewChannelPlatformMessage(
+      std::unique_ptr<flutter::PlatformMessage> message);
+
+  void OnCreateView(ViewCallback on_view_created,
+                    int64_t view_id_raw,
+                    bool hit_testable,
+                    bool focusable);
+  void OnDisposeView(int64_t view_id_raw);
+
+  // Sends a 'View.viewConnected' platform message over 'flutter/platform_views'
+  // channel when a view gets created.
+  void OnChildViewConnected(uint64_t content_id);
+
+  // Sends a 'View.viewDisconnected' platform message over
+  // 'flutter/platform_views' channel when a view gets destroyed or the child
+  // view watcher channel of a view closes.
+  void OnChildViewDisconnected(uint64_t content_id);
 
   // Utility function for coordinate massaging.
   std::array<float, 2> ClampToViewSpace(const float x, const float y) const;
@@ -176,16 +213,42 @@ class PlatformView : public flutter::PlatformView {
   // https://github.com/flutter/flutter/issues/55966
   std::set<std::string /* channel */> unregistered_channels_;
 
-  OnEnableWireframe wireframe_enabled_callback_;
-  OnUpdateView on_update_view_callback_;
-  OnCreateSurface on_create_surface_callback_;
-  OnSemanticsNodeUpdate on_semantics_node_update_callback_;
-  OnRequestAnnounce on_request_announce_callback_;
-  OnShaderWarmup on_shader_warmup_;
+  OnEnableWireframeCallback wireframe_enabled_callback_;
+  OnUpdateViewCallback on_update_view_callback_;
+  OnCreateSurfaceCallback on_create_surface_callback_;
+  OnSemanticsNodeUpdateCallback on_semantics_node_update_callback_;
+  OnRequestAnnounceCallback on_request_announce_callback_;
+  OnCreateViewCallback on_create_view_callback_;
+  OnDestroyViewCallback on_destroy_view_callback_;
+  OnShaderWarmupCallback on_shader_warmup_callback_;
   AwaitVsyncCallback await_vsync_callback_;
   AwaitVsyncForSecondaryCallbackCallback
       await_vsync_for_secondary_callback_callback_;
 
+  // Proxies for input tests.
+  fuchsia::ui::test::input::TouchInputListenerPtr touch_input_listener_;
+  fuchsia::ui::test::input::KeyboardInputListenerPtr keyboard_input_listener_;
+  fuchsia::ui::test::input::MouseInputListenerPtr mouse_input_listener_;
+
+  // Component's service directory.
+  std::shared_ptr<sys::ServiceDirectory> dart_application_svc_;
+
+  // child_view_ids_ maintains a persistent mapping from Flatland ContentId's to
+  // flutter view ids, which are really zx_handle_t of ViewCreationToken.
+  struct ChildViewInfo {
+    ChildViewInfo(zx_handle_t token,
+                  fuchsia::ui::composition::ChildViewWatcherPtr watcher)
+        : view_id(token), child_view_watcher(std::move(watcher)) {}
+    zx_handle_t view_id;
+    fuchsia::ui::composition::ChildViewWatcherPtr child_view_watcher;
+  };
+  std::unordered_map<uint64_t /*fuchsia::ui::composition::ContentId*/,
+                     ChildViewInfo>
+      child_view_info_;
+
+  fuchsia::ui::composition::ParentViewportWatcherPtr parent_viewport_watcher_;
+  fuchsia::ui::composition::ParentViewportStatus parent_viewport_status_;
+
   fml::WeakPtrFactory<PlatformView> weak_factory_;  // Must be the last member.
 
   FML_DISALLOW_COPY_AND_ASSIGN(PlatformView);
@@ -193,4 +256,4 @@ class PlatformView : public flutter::PlatformView {
 
 }  // namespace flutter_runner
 
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_PLATFORM_VIEW_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_PLATFORM_VIEW_H_
diff --git a/shell/platform/fuchsia/flutter/platform_view_unittest.cc b/shell/platform/fuchsia/flutter/platform_view_unittest.cc
deleted file mode 100644
index 654455b4af4bd15dd3d961f72dd3e512c1a5e267..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/flutter/platform_view_unittest.cc
+++ /dev/null
@@ -1,1492 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "gfx_platform_view.h"
-
-#include <fuchsia/ui/gfx/cpp/fidl.h>
-#include <fuchsia/ui/input/cpp/fidl.h>
-#include <fuchsia/ui/input3/cpp/fidl.h>
-#include <fuchsia/ui/input3/cpp/fidl_test_base.h>
-#include <fuchsia/ui/scenic/cpp/fidl.h>
-#include <fuchsia/ui/views/cpp/fidl.h>
-#include <lib/async-loop/cpp/loop.h>
-#include <lib/async-loop/default.h>
-#include <lib/async/default.h>
-#include <lib/fidl/cpp/binding_set.h>
-#include <lib/ui/scenic/cpp/view_ref_pair.h>
-
-#include <memory>
-#include <ostream>
-#include <string>
-#include <vector>
-
-#include "flutter/flow/embedded_views.h"
-#include "flutter/lib/ui/window/platform_message.h"
-#include "flutter/lib/ui/window/pointer_data.h"
-#include "flutter/lib/ui/window/viewport_metrics.h"
-#include "flutter/shell/common/context_options.h"
-#include "flutter/shell/platform/fuchsia/flutter/gfx_platform_view.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-#include "platform/assert.h"
-#include "surface.h"
-#include "task_runner_adapter.h"
-#include "tests/fakes/focuser.h"
-#include "tests/fakes/platform_message.h"
-#include "tests/fakes/touch_source.h"
-#include "tests/fakes/view_ref_focused.h"
-#include "tests/pointer_event_utility.h"
-
-namespace flutter_runner::testing {
-namespace {
-
-class MockExternalViewEmbedder : public flutter::ExternalViewEmbedder {
- public:
-  SkCanvas* GetRootCanvas() override { return nullptr; }
-  std::vector<SkCanvas*> GetCurrentCanvases() override {
-    return std::vector<SkCanvas*>();
-  }
-  std::vector<flutter::DisplayListBuilder*> GetCurrentBuilders() override {
-    return std::vector<flutter::DisplayListBuilder*>();
-  }
-
-  void CancelFrame() override {}
-  void BeginFrame(
-      SkISize frame_size,
-      GrDirectContext* context,
-      double device_pixel_ratio,
-      fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) override {}
-  void SubmitFrame(GrDirectContext* context,
-                   std::unique_ptr<flutter::SurfaceFrame> frame) override {
-    return;
-  }
-
-  void PrerollCompositeEmbeddedView(
-      int view_id,
-      std::unique_ptr<flutter::EmbeddedViewParams> params) override {}
-  flutter::EmbedderPaintContext CompositeEmbeddedView(int view_id) override {
-    return {nullptr, nullptr};
-  }
-};
-
-class MockPlatformViewDelegate : public flutter::PlatformView::Delegate {
- public:
-  void Reset() {
-    message_ = nullptr;
-    metrics_ = flutter::ViewportMetrics{};
-    semantics_features_ = 0;
-    semantics_enabled_ = false;
-    pointer_packets_.clear();
-  }
-
-  // |flutter::PlatformView::Delegate|
-  void OnPlatformViewCreated(std::unique_ptr<flutter::Surface> surface) {
-    ASSERT_EQ(surface_.get(), nullptr);
-
-    surface_ = std::move(surface);
-  }
-  // |flutter::PlatformView::Delegate|
-  void OnPlatformViewDestroyed() {}
-  // |flutter::PlatformView::Delegate|
-  void OnPlatformViewScheduleFrame() {}
-  // |flutter::PlatformView::Delegate|
-  void OnPlatformViewSetNextFrameCallback(const fml::closure& closure) {}
-  // |flutter::PlatformView::Delegate|
-  void OnPlatformViewSetViewportMetrics(
-      const flutter::ViewportMetrics& metrics) {
-    metrics_ = metrics;
-  }
-  // |flutter::PlatformView::Delegate|
-  const flutter::Settings& OnPlatformViewGetSettings() const {
-    return settings_;
-  }
-  // |flutter::PlatformView::Delegate|
-  void OnPlatformViewDispatchPlatformMessage(
-      std::unique_ptr<flutter::PlatformMessage> message) {
-    message_ = std::move(message);
-  }
-  // |flutter::PlatformView::Delegate|
-  void OnPlatformViewDispatchPointerDataPacket(
-      std::unique_ptr<flutter::PointerDataPacket> packet) {
-    pointer_packets_.push_back(std::move(packet));
-  }
-  // |flutter::PlatformView::Delegate|
-  void OnPlatformViewDispatchSemanticsAction(int32_t id,
-                                             flutter::SemanticsAction action,
-                                             fml::MallocMapping args) {}
-  // |flutter::PlatformView::Delegate|
-  void OnPlatformViewSetSemanticsEnabled(bool enabled) {
-    semantics_enabled_ = enabled;
-  }
-  // |flutter::PlatformView::Delegate|
-  void OnPlatformViewSetAccessibilityFeatures(int32_t flags) {
-    semantics_features_ = flags;
-  }
-  // |flutter::PlatformView::Delegate|
-  void OnPlatformViewRegisterTexture(
-      std::shared_ptr<flutter::Texture> texture) {}
-  // |flutter::PlatformView::Delegate|
-  void OnPlatformViewUnregisterTexture(int64_t texture_id) {}
-  // |flutter::PlatformView::Delegate|
-  void OnPlatformViewMarkTextureFrameAvailable(int64_t texture_id) {}
-  // |flutter::PlatformView::Delegate|
-  std::unique_ptr<std::vector<std::string>> ComputePlatformViewResolvedLocale(
-      const std::vector<std::string>& supported_locale_data) {
-    return nullptr;
-  }
-  // |flutter::PlatformView::Delegate|
-  void LoadDartDeferredLibrary(
-      intptr_t loading_unit_id,
-      std::unique_ptr<const fml::Mapping> snapshot_data,
-      std::unique_ptr<const fml::Mapping> snapshot_instructions) {}
-  // |flutter::PlatformView::Delegate|
-  void LoadDartDeferredLibraryError(intptr_t loading_unit_id,
-                                    const std::string error_message,
-                                    bool transient) {}
-  // |flutter::PlatformView::Delegate|
-  void UpdateAssetResolverByType(
-      std::unique_ptr<flutter::AssetResolver> updated_asset_resolver,
-      flutter::AssetResolver::AssetResolverType type) {}
-
-  flutter::Surface* surface() const { return surface_.get(); }
-  flutter::PlatformMessage* message() const { return message_.get(); }
-  const flutter::ViewportMetrics& metrics() const { return metrics_; }
-  int32_t semantics_features() const { return semantics_features_; }
-  bool semantics_enabled() const { return semantics_enabled_; }
-  const std::vector<std::unique_ptr<flutter::PointerDataPacket>>&
-  pointer_packets() const {
-    return pointer_packets_;
-  }
-  std::vector<std::unique_ptr<flutter::PointerDataPacket>>
-  TakePointerDataPackets() {
-    auto tmp = std::move(pointer_packets_);
-    pointer_packets_.clear();
-    return tmp;
-  }
-
- private:
-  std::unique_ptr<flutter::Surface> surface_;
-  std::unique_ptr<flutter::PlatformMessage> message_;
-  flutter::ViewportMetrics metrics_;
-  std::vector<std::unique_ptr<flutter::PointerDataPacket>> pointer_packets_;
-  int32_t semantics_features_ = 0;
-  bool semantics_enabled_ = false;
-  flutter::Settings settings_;
-};
-
-class MockResponse : public flutter::PlatformMessageResponse {
- public:
-  MOCK_METHOD1(Complete, void(std::unique_ptr<fml::Mapping> data));
-  MOCK_METHOD0(CompleteEmpty, void());
-};
-
-class TestPlatformMessageResponse : public flutter::PlatformMessageResponse {
- public:
-  TestPlatformMessageResponse() {}
-  void Complete(std::unique_ptr<fml::Mapping> data) override {
-    result_string = std::string(
-        reinterpret_cast<const char*>(data->GetMapping()), data->GetSize());
-    is_complete_ = true;
-  }
-  void CompleteEmpty() override { is_complete_ = true; }
-  std::string result_string;
-  FML_DISALLOW_COPY_AND_ASSIGN(TestPlatformMessageResponse);
-};
-
-class MockKeyboard : public fuchsia::ui::input3::testing::Keyboard_TestBase {
- public:
-  explicit MockKeyboard(
-      fidl::InterfaceRequest<fuchsia::ui::input3::Keyboard> keyboard)
-      : keyboard_(this, std::move(keyboard)) {}
-  ~MockKeyboard() = default;
-
-  void AddListener(fuchsia::ui::views::ViewRef view_ref,
-                   fuchsia::ui::input3::KeyboardListenerHandle listener,
-                   AddListenerCallback callback) override {
-    FML_CHECK(!listener_.is_bound());
-
-    listener_ = listener.Bind();
-    view_ref_ = std::move(view_ref);
-
-    callback();
-  }
-
-  void NotImplemented_(const std::string& name) override { FAIL(); }
-
-  fidl::Binding<fuchsia::ui::input3::Keyboard> keyboard_;
-  fuchsia::ui::input3::KeyboardListenerPtr listener_{};
-  fuchsia::ui::views::ViewRef view_ref_{};
-
-  FML_DISALLOW_COPY_AND_ASSIGN(MockKeyboard);
-};
-
-// Used to construct partial instances of PlatformView for testing.  The
-// PlatformView constructor has many parameters, not all of which need to
-// be filled out for each test.  The builder allows you to initialize only
-// those that matter to your specific test.  Not all builder methods are
-// provided: if you find some that are missing, feel free to add them.
-class PlatformViewBuilder {
- public:
-  PlatformViewBuilder(flutter::PlatformView::Delegate& delegate,
-                      flutter::TaskRunners task_runners)
-      : delegate_(delegate),
-        task_runners_(task_runners),
-        view_ref_pair_(scenic::ViewRefPair::New()) {}
-
-  PlatformViewBuilder& SetExternalViewEmbedder(
-      std::shared_ptr<flutter::ExternalViewEmbedder> embedder) {
-    external_external_view_embedder_ = embedder;
-    return *this;
-  }
-
-  PlatformViewBuilder& SetImeService(
-      fuchsia::ui::input::ImeServiceHandle ime_service) {
-    ime_service_ = std::move(ime_service);
-    return *this;
-  }
-
-  PlatformViewBuilder& SetKeyboard(
-      fuchsia::ui::input3::KeyboardHandle keyboard) {
-    keyboard_ = std::move(keyboard);
-    return *this;
-  }
-
-  PlatformViewBuilder& SetTouchSource(
-      fuchsia::ui::pointer::TouchSourceHandle touch_source) {
-    touch_source_ = std::move(touch_source);
-    return *this;
-  }
-
-  PlatformViewBuilder& SetMouseSource(
-      fuchsia::ui::pointer::MouseSourceHandle mouse_source) {
-    mouse_source_ = std::move(mouse_source);
-    return *this;
-  }
-
-  PlatformViewBuilder& SetFocuser(fuchsia::ui::views::FocuserHandle focuser) {
-    focuser_ = std::move(focuser);
-    return *this;
-  }
-
-  PlatformViewBuilder& SetViewRefFocused(
-      fuchsia::ui::views::ViewRefFocusedHandle view_ref_focused) {
-    view_ref_focused_ = std::move(view_ref_focused);
-    return *this;
-  }
-
-  PlatformViewBuilder& SetPointerinjectorRegistry(
-      fuchsia::ui::pointerinjector::RegistryHandle pointerinjector_registry) {
-    pointerinjector_registry_ = std::move(pointerinjector_registry);
-    return *this;
-  }
-
-  PlatformViewBuilder& SetSessionListenerRequest(
-      fidl::InterfaceRequest<fuchsia::ui::scenic::SessionListener> request) {
-    session_listener_request_ = std::move(request);
-    return *this;
-  }
-
-  PlatformViewBuilder& SetEnableWireframeCallback(OnEnableWireframe callback) {
-    wireframe_enabled_callback_ = std::move(callback);
-    return *this;
-  }
-
-  PlatformViewBuilder& SetCreateViewCallback(OnCreateGfxView callback) {
-    on_create_view_callback_ = std::move(callback);
-    return *this;
-  }
-
-  PlatformViewBuilder& SetUpdateViewCallback(OnUpdateView callback) {
-    on_update_view_callback_ = std::move(callback);
-    return *this;
-  }
-
-  PlatformViewBuilder& SetDestroyViewCallback(OnDestroyGfxView callback) {
-    on_destroy_view_callback_ = std::move(callback);
-    return *this;
-  }
-
-  PlatformViewBuilder& SetCreateSurfaceCallback(OnCreateSurface callback) {
-    on_create_surface_callback_ = std::move(callback);
-    return *this;
-  }
-
-  PlatformViewBuilder& SetShaderWarmupCallback(OnShaderWarmup callback) {
-    on_shader_warmup_callback_ = std::move(callback);
-    return *this;
-  }
-
-  // Once Build is called, the instance is no longer usable.
-  GfxPlatformView Build() {
-    EXPECT_FALSE(std::exchange(built_, true))
-        << "Build() was already called, this builder is good for one use only.";
-    return GfxPlatformView(
-        delegate_, task_runners_, std::move(view_ref_pair_.view_ref),
-        external_external_view_embedder_, std::move(ime_service_),
-        std::move(keyboard_), std::move(touch_source_),
-        std::move(mouse_source_), std::move(focuser_),
-        std::move(view_ref_focused_), std::move(pointerinjector_registry_),
-        std::move(session_listener_request_),
-        std::move(on_session_listener_error_callback_),
-        std::move(wireframe_enabled_callback_),
-        std::move(on_create_view_callback_),
-        std::move(on_update_view_callback_),
-        std::move(on_destroy_view_callback_),
-        std::move(on_create_surface_callback_),
-        std::move(on_semantics_node_update_callback_),
-        std::move(on_request_announce_callback_),
-        std::move(on_shader_warmup_callback_), [](auto...) {}, [](auto...) {});
-  }
-
- private:
-  PlatformViewBuilder() = delete;
-
-  flutter::PlatformView::Delegate& delegate_;
-  flutter::TaskRunners task_runners_;
-  scenic::ViewRefPair view_ref_pair_;
-
-  std::shared_ptr<flutter::ExternalViewEmbedder>
-      external_external_view_embedder_;
-  fuchsia::ui::input::ImeServiceHandle ime_service_;
-  fuchsia::ui::input3::KeyboardHandle keyboard_;
-  fuchsia::ui::pointer::TouchSourceHandle touch_source_;
-  fuchsia::ui::pointer::MouseSourceHandle mouse_source_;
-  fuchsia::ui::views::ViewRefFocusedHandle view_ref_focused_;
-  fuchsia::ui::views::FocuserHandle focuser_;
-  fuchsia::ui::pointerinjector::RegistryHandle pointerinjector_registry_;
-  fidl::InterfaceRequest<fuchsia::ui::scenic::SessionListener>
-      session_listener_request_;
-  fit::closure on_session_listener_error_callback_;
-  OnEnableWireframe wireframe_enabled_callback_;
-  OnCreateGfxView on_create_view_callback_;
-  OnUpdateView on_update_view_callback_;
-  OnDestroyGfxView on_destroy_view_callback_;
-  OnCreateSurface on_create_surface_callback_;
-  OnSemanticsNodeUpdate on_semantics_node_update_callback_;
-  OnRequestAnnounce on_request_announce_callback_;
-  OnShaderWarmup on_shader_warmup_callback_;
-
-  bool built_{false};
-};
-
-std::string ToString(const fml::Mapping& mapping) {
-  return std::string(mapping.GetMapping(),
-                     mapping.GetMapping() + mapping.GetSize());
-}
-
-// Stolen from pointer_data_packet_converter_unittests.cc.
-void UnpackPointerPacket(std::vector<flutter::PointerData>& output,  // NOLINT
-                         std::unique_ptr<flutter::PointerDataPacket> packet) {
-  for (size_t i = 0; i < packet->GetLength(); i++) {
-    flutter::PointerData pointer_data = packet->GetPointerData(i);
-    output.push_back(pointer_data);
-  }
-  packet.reset();
-}
-
-}  // namespace
-
-class PlatformViewTests : public ::testing::Test {
- protected:
-  PlatformViewTests() : loop_(&kAsyncLoopConfigAttachToCurrentThread) {}
-
-  async_dispatcher_t* dispatcher() { return loop_.dispatcher(); }
-
-  void RunLoopUntilIdle() {
-    loop_.RunUntilIdle();
-    loop_.ResetQuit();
-  }
-
-  fuchsia::ui::input3::KeyEvent MakeEvent(
-      fuchsia::ui::input3::KeyEventType event_type,
-      std::optional<fuchsia::ui::input3::Modifiers> modifiers,
-      fuchsia::input::Key key) {
-    fuchsia::ui::input3::KeyEvent event;
-    event.set_timestamp(++event_timestamp_);
-    event.set_type(event_type);
-    if (modifiers.has_value()) {
-      event.set_modifiers(modifiers.value());
-    }
-    event.set_key(key);
-    return event;
-  }
-
- private:
-  async::Loop loop_;
-
-  uint64_t event_timestamp_{42};
-
-  FML_DISALLOW_COPY_AND_ASSIGN(PlatformViewTests);
-};
-
-// This test makes sure that the PlatformView always completes a platform
-// message request, even for error conditions or if the request is malformed.
-TEST_F(PlatformViewTests, InvalidPlatformMessageRequest) {
-  MockPlatformViewDelegate delegate;
-  flutter::TaskRunners task_runners =
-      flutter::TaskRunners("test_runners", nullptr, nullptr, nullptr, nullptr);
-
-  FakeViewRefFocused vrf;
-  fidl::BindingSet<fuchsia::ui::views::ViewRefFocused> vrf_bindings;
-  auto vrf_handle = vrf_bindings.AddBinding(&vrf);
-
-  flutter_runner::GfxPlatformView platform_view =
-      PlatformViewBuilder(delegate, std::move(task_runners))
-          .SetViewRefFocused(std::move(vrf_handle))
-          .Build();
-
-  // Cast platform_view to its base view so we can have access to the public
-  // "HandlePlatformMessage" function.
-  auto base_view = static_cast<flutter::PlatformView*>(&platform_view);
-  EXPECT_TRUE(base_view);
-
-  // Invalid platform channel.
-  auto response1 = FakePlatformMessageResponse::Create();
-  base_view->HandlePlatformMessage(response1->WithMessage(
-      "flutter/invalid", "{\"method\":\"Invalid.invalidMethod\"}"));
-
-  // Invalid json.
-  auto response2 = FakePlatformMessageResponse::Create();
-  base_view->HandlePlatformMessage(
-      response2->WithMessage("flutter/platform_views", "{Invalid JSON"));
-
-  // Invalid method.
-  auto response3 = FakePlatformMessageResponse::Create();
-  base_view->HandlePlatformMessage(response3->WithMessage(
-      "flutter/platform_views", "{\"method\":\"View.focus.invalidMethod\"}"));
-
-  // Missing arguments.
-  auto response4 = FakePlatformMessageResponse::Create();
-  base_view->HandlePlatformMessage(response4->WithMessage(
-      "flutter/platform_views", "{\"method\":\"View.update\"}"));
-  auto response5 = FakePlatformMessageResponse::Create();
-  base_view->HandlePlatformMessage(
-      response5->WithMessage("flutter/platform_views",
-                             "{\"method\":\"View.update\",\"args\":{"
-                             "\"irrelevantField\":\"irrelevantValue\"}}"));
-
-  // Wrong argument types.
-  auto response6 = FakePlatformMessageResponse::Create();
-  base_view->HandlePlatformMessage(response6->WithMessage(
-      "flutter/platform_views",
-      "{\"method\":\"View.update\",\"args\":{\"viewId\":false,\"hitTestable\":"
-      "123,\"focusable\":\"yes\"}}"));
-
-  // Run the event loop and check our responses.
-  RunLoopUntilIdle();
-  response1->ExpectCompleted("");
-  response2->ExpectCompleted("");
-  response3->ExpectCompleted("");
-  response4->ExpectCompleted("");
-  response5->ExpectCompleted("");
-  response6->ExpectCompleted("");
-}
-
-// This test makes sure that the PlatformView correctly returns a Surface
-// instance that can surface the provided gr_context and external_view_embedder.
-TEST_F(PlatformViewTests, CreateSurfaceTest) {
-  MockPlatformViewDelegate delegate;
-
-  flutter::TaskRunners task_runners =
-      flutter::TaskRunners("test_runners",  // label
-                           nullptr,         // platform
-                           flutter_runner::CreateFMLTaskRunner(
-                               async_get_default_dispatcher()),  // raster
-                           nullptr,                              // ui
-                           nullptr                               // io
-      );
-
-  // Test create surface callback function.
-  sk_sp<GrDirectContext> gr_context = GrDirectContext::MakeMock(
-      nullptr,
-      flutter::MakeDefaultContextOptions(flutter::ContextType::kRender));
-  std::shared_ptr<MockExternalViewEmbedder> external_view_embedder =
-      std::make_shared<MockExternalViewEmbedder>();
-  auto CreateSurfaceCallback = [&external_view_embedder, gr_context]() {
-    return std::make_unique<flutter_runner::Surface>(
-        "PlatformViewTest", external_view_embedder, gr_context.get());
-  };
-
-  flutter_runner::GfxPlatformView platform_view =
-      PlatformViewBuilder(delegate, std::move(task_runners))
-          .SetCreateSurfaceCallback(CreateSurfaceCallback)
-          .SetExternalViewEmbedder(external_view_embedder)
-          .Build();
-  platform_view.NotifyCreated();
-
-  RunLoopUntilIdle();
-
-  EXPECT_EQ(gr_context.get(), delegate.surface()->GetContext());
-  EXPECT_EQ(external_view_embedder.get(),
-            platform_view.CreateExternalViewEmbedder().get());
-}
-
-// This test makes sure that the PlatformView correctly registers Scenic
-// MetricsEvents sent to it via FIDL, correctly parses the metrics it receives,
-// and calls the SetViewportMetrics callback with the appropriate parameters.
-TEST_F(PlatformViewTests, SetViewportMetrics) {
-  constexpr float invalid_pixel_ratio = -0.75f;
-  constexpr float valid_pixel_ratio = 0.75f;
-  constexpr float invalid_max_bound = -0.75f;
-  constexpr float valid_max_bound = 0.75f;
-
-  MockPlatformViewDelegate delegate;
-  EXPECT_EQ(delegate.metrics(), flutter::ViewportMetrics());
-
-  fuchsia::ui::scenic::SessionListenerPtr session_listener;
-  std::vector<fuchsia::ui::scenic::Event> events;
-  flutter::TaskRunners task_runners("test_runners", nullptr, nullptr, nullptr,
-                                    nullptr);
-  flutter_runner::GfxPlatformView platform_view =
-      PlatformViewBuilder(delegate, std::move(task_runners))
-          .SetSessionListenerRequest(session_listener.NewRequest())
-          .Build();
-  RunLoopUntilIdle();
-  EXPECT_EQ(delegate.metrics(), flutter::ViewportMetrics());
-
-  // Test updating with an invalid pixel ratio.  The final metrics should be
-  // unchanged.
-  events.clear();
-  events.emplace_back(fuchsia::ui::scenic::Event::WithGfx(
-      fuchsia::ui::gfx::Event::WithMetrics(fuchsia::ui::gfx::MetricsEvent{
-          .node_id = 0,
-          .metrics =
-              fuchsia::ui::gfx::Metrics{
-                  .scale_x = invalid_pixel_ratio,
-                  .scale_y = 1.f,
-                  .scale_z = 1.f,
-              },
-      })));
-  session_listener->OnScenicEvent(std::move(events));
-  RunLoopUntilIdle();
-  EXPECT_EQ(delegate.metrics(), flutter::ViewportMetrics());
-
-  // Test updating with an invalid size. The final metrics should be unchanged.
-  events.clear();
-  events.emplace_back(
-      fuchsia::ui::scenic::Event::WithGfx(
-          fuchsia::ui::gfx::Event::WithViewPropertiesChanged(
-              fuchsia::ui::gfx::ViewPropertiesChangedEvent{
-                  .view_id = 0,
-                  .properties =
-                      fuchsia::ui::gfx::ViewProperties{
-                          .bounding_box =
-                              fuchsia::ui::gfx::BoundingBox{
-                                  .min =
-                                      fuchsia::ui::gfx::vec3{
-                                          .x = 0.f,
-                                          .y = 0.f,
-                                          .z = 0.f,
-                                      },
-                                  .max =
-                                      fuchsia::ui::gfx::vec3{
-                                          .x = invalid_max_bound,
-                                          .y = invalid_max_bound,
-                                          .z = invalid_max_bound,
-                                      },
-                              },
-                      },
-              })));
-  session_listener->OnScenicEvent(std::move(events));
-  RunLoopUntilIdle();
-  EXPECT_EQ(delegate.metrics(), flutter::ViewportMetrics());
-
-  // Test updating the size only.  The final metrics should be unchanged until
-  // both pixel ratio and size are updated.
-  events.clear();
-  events.emplace_back(
-      fuchsia::ui::scenic::Event::WithGfx(
-          fuchsia::ui::gfx::Event::WithViewPropertiesChanged(
-              fuchsia::ui::gfx::ViewPropertiesChangedEvent{
-                  .view_id = 0,
-                  .properties =
-                      fuchsia::ui::gfx::ViewProperties{
-                          .bounding_box =
-                              fuchsia::ui::gfx::BoundingBox{
-                                  .min =
-                                      fuchsia::ui::gfx::vec3{
-                                          .x = 0.f,
-                                          .y = 0.f,
-                                          .z = 0.f,
-                                      },
-                                  .max =
-                                      fuchsia::ui::gfx::vec3{
-                                          .x = valid_max_bound,
-                                          .y = valid_max_bound,
-                                          .z = valid_max_bound,
-                                      },
-                              },
-                      },
-              })));
-  session_listener->OnScenicEvent(std::move(events));
-  RunLoopUntilIdle();
-  EXPECT_EQ(delegate.metrics(), flutter::ViewportMetrics());
-
-  // Test updating the pixel ratio only.  The final metrics should change now.
-  events.clear();
-  events.emplace_back(fuchsia::ui::scenic::Event::WithGfx(
-      fuchsia::ui::gfx::Event::WithMetrics(fuchsia::ui::gfx::MetricsEvent{
-          .node_id = 0,
-          .metrics =
-              fuchsia::ui::gfx::Metrics{
-                  .scale_x = valid_pixel_ratio,
-                  .scale_y = 1.f,
-                  .scale_z = 1.f,
-              },
-      })));
-  session_listener->OnScenicEvent(std::move(events));
-  RunLoopUntilIdle();
-  EXPECT_EQ(
-      delegate.metrics(),
-      flutter::ViewportMetrics(
-          valid_pixel_ratio, std::round(valid_pixel_ratio * valid_max_bound),
-          std::round(valid_pixel_ratio * valid_max_bound), -1.0));
-}
-
-// This test makes sure that the PlatformView correctly registers semantics
-// settings changes applied to it and calls the SetSemanticsEnabled /
-// SetAccessibilityFeatures callbacks with the appropriate parameters.
-TEST_F(PlatformViewTests, ChangesAccessibilitySettings) {
-  MockPlatformViewDelegate delegate;
-  flutter::TaskRunners task_runners =
-      flutter::TaskRunners("test_runners", nullptr, nullptr, nullptr, nullptr);
-
-  EXPECT_FALSE(delegate.semantics_enabled());
-  EXPECT_EQ(delegate.semantics_features(), 0);
-
-  flutter_runner::GfxPlatformView platform_view =
-      PlatformViewBuilder(delegate, std::move(task_runners)).Build();
-
-  RunLoopUntilIdle();
-
-  platform_view.SetSemanticsEnabled(true);
-
-  EXPECT_TRUE(delegate.semantics_enabled());
-  EXPECT_EQ(delegate.semantics_features(),
-            static_cast<int32_t>(
-                flutter::AccessibilityFeatureFlag::kAccessibleNavigation));
-
-  platform_view.SetSemanticsEnabled(false);
-
-  EXPECT_FALSE(delegate.semantics_enabled());
-  EXPECT_EQ(delegate.semantics_features(), 0);
-}
-
-// This test makes sure that the PlatformView forwards messages on the
-// "flutter/platform_views" channel for EnableWireframe.
-TEST_F(PlatformViewTests, EnableWireframeTest) {
-  MockPlatformViewDelegate delegate;
-  flutter::TaskRunners task_runners =
-      flutter::TaskRunners("test_runners", nullptr, nullptr, nullptr, nullptr);
-
-  // Test wireframe callback function. If the message sent to the platform
-  // view was properly handled and parsed, this function should be called,
-  // setting |wireframe_enabled| to true.
-  bool wireframe_enabled = false;
-  auto EnableWireframeCallback = [&wireframe_enabled](bool should_enable) {
-    wireframe_enabled = should_enable;
-  };
-
-  flutter_runner::GfxPlatformView platform_view =
-      PlatformViewBuilder(delegate, std::move(task_runners))
-          .SetEnableWireframeCallback(EnableWireframeCallback)
-          .Build();
-
-  // Cast platform_view to its base view so we can have access to the public
-  // "HandlePlatformMessage" function.
-  auto base_view = static_cast<flutter::PlatformView*>(&platform_view);
-  EXPECT_TRUE(base_view);
-
-  // JSON for the message to be passed into the PlatformView.
-  const uint8_t txt[] =
-      "{"
-      "    \"method\":\"View.enableWireframe\","
-      "    \"args\": {"
-      "       \"enable\":true"
-      "    }"
-      "}";
-
-  std::unique_ptr<flutter::PlatformMessage> message =
-      std::make_unique<flutter::PlatformMessage>(
-          "flutter/platform_views", fml::MallocMapping::Copy(txt, sizeof(txt)),
-          fml::RefPtr<flutter::PlatformMessageResponse>());
-  base_view->HandlePlatformMessage(std::move(message));
-
-  RunLoopUntilIdle();
-
-  EXPECT_TRUE(wireframe_enabled);
-}
-
-// This test makes sure that the PlatformView forwards messages on the
-// "flutter/platform_views" channel for Createview.
-TEST_F(PlatformViewTests, CreateViewTest) {
-  MockPlatformViewDelegate delegate;
-  flutter::TaskRunners task_runners =
-      flutter::TaskRunners("test_runners",  // label
-                           flutter_runner::CreateFMLTaskRunner(
-                               async_get_default_dispatcher()),  // platform
-                           nullptr,                              // raster
-                           nullptr,                              // ui
-                           nullptr                               // io
-      );
-
-  // Test wireframe callback function. If the message sent to the platform
-  // view was properly handled and parsed, this function should be called,
-  // setting |wireframe_enabled| to true.
-  bool create_view_called = false;
-  auto CreateViewCallback = [&create_view_called](
-                                int64_t view_id,
-                                flutter_runner::ViewCallback on_view_created,
-                                flutter_runner::GfxViewIdCallback on_view_bound,
-                                bool hit_testable, bool focusable) {
-    create_view_called = true;
-    on_view_created();
-    on_view_bound(0);
-  };
-
-  flutter_runner::GfxPlatformView platform_view =
-      PlatformViewBuilder(delegate, std::move(task_runners))
-          .SetCreateViewCallback(CreateViewCallback)
-          .Build();
-
-  // Cast platform_view to its base view so we can have access to the public
-  // "HandlePlatformMessage" function.
-  auto base_view = static_cast<flutter::PlatformView*>(&platform_view);
-  EXPECT_TRUE(base_view);
-
-  // JSON for the message to be passed into the PlatformView.
-  const uint8_t txt[] =
-      "{"
-      "    \"method\":\"View.create\","
-      "    \"args\": {"
-      "       \"viewId\":42,"
-      "       \"hitTestable\":true,"
-      "       \"focusable\":true"
-      "    }"
-      "}";
-
-  std::unique_ptr<flutter::PlatformMessage> message =
-      std::make_unique<flutter::PlatformMessage>(
-          "flutter/platform_views", fml::MallocMapping::Copy(txt, sizeof(txt)),
-          fml::RefPtr<flutter::PlatformMessageResponse>());
-  base_view->HandlePlatformMessage(std::move(message));
-
-  RunLoopUntilIdle();
-
-  EXPECT_TRUE(create_view_called);
-}
-
-// This test makes sure that the PlatformView forwards messages on the
-// "flutter/platform_views" channel for UpdateView.
-TEST_F(PlatformViewTests, UpdateViewTest) {
-  MockPlatformViewDelegate delegate;
-  flutter::TaskRunners task_runners =
-      flutter::TaskRunners("test_runners", nullptr, nullptr, nullptr, nullptr);
-
-  std::optional<SkRect> occlusion_hint_for_test;
-  std::optional<bool> hit_testable_for_test;
-  std::optional<bool> focusable_for_test;
-  auto UpdateViewCallback = [&occlusion_hint_for_test, &hit_testable_for_test,
-                             &focusable_for_test](
-                                int64_t view_id, SkRect occlusion_hint,
-                                bool hit_testable, bool focusable) {
-    occlusion_hint_for_test = occlusion_hint;
-    hit_testable_for_test = hit_testable;
-    focusable_for_test = focusable;
-  };
-
-  flutter_runner::GfxPlatformView platform_view =
-      PlatformViewBuilder(delegate, std::move(task_runners))
-          .SetUpdateViewCallback(UpdateViewCallback)
-          .Build();
-
-  // Cast platform_view to its base view so we can have access to the public
-  // "HandlePlatformMessage" function.
-  auto base_view = static_cast<flutter::PlatformView*>(&platform_view);
-  EXPECT_TRUE(base_view);
-
-  // Send a basic message.
-  const uint8_t json[] =
-      "{"
-      "    \"method\":\"View.update\","
-      "    \"args\": {"
-      "       \"viewId\":42,"
-      "       \"hitTestable\":true,"
-      "       \"focusable\":true"
-      "    }"
-      "}";
-  std::unique_ptr<flutter::PlatformMessage> message =
-      std::make_unique<flutter::PlatformMessage>(
-          "flutter/platform_views",
-          fml::MallocMapping::Copy(json, sizeof(json)),
-          fml::RefPtr<flutter::PlatformMessageResponse>());
-  base_view->HandlePlatformMessage(std::move(message));
-
-  RunLoopUntilIdle();
-  ASSERT_TRUE(occlusion_hint_for_test.has_value());
-  ASSERT_TRUE(hit_testable_for_test.has_value());
-  ASSERT_TRUE(focusable_for_test.has_value());
-  EXPECT_EQ(occlusion_hint_for_test.value(), SkRect::MakeEmpty());
-  EXPECT_EQ(hit_testable_for_test.value(), true);
-  EXPECT_EQ(focusable_for_test.value(), true);
-
-  // Reset for the next message.
-  occlusion_hint_for_test.reset();
-  hit_testable_for_test.reset();
-  focusable_for_test.reset();
-
-  // Send another basic message.
-  const uint8_t json_false[] =
-      "{"
-      "    \"method\":\"View.update\","
-      "    \"args\": {"
-      "       \"viewId\":42,"
-      "       \"hitTestable\":false,"
-      "       \"focusable\":false"
-      "    }"
-      "}";
-  std::unique_ptr<flutter::PlatformMessage> message_false =
-      std::make_unique<flutter::PlatformMessage>(
-          "flutter/platform_views",
-          fml::MallocMapping::Copy(json_false, sizeof(json_false)),
-          fml::RefPtr<flutter::PlatformMessageResponse>());
-  base_view->HandlePlatformMessage(std::move(message_false));
-  RunLoopUntilIdle();
-  ASSERT_TRUE(occlusion_hint_for_test.has_value());
-  ASSERT_TRUE(hit_testable_for_test.has_value());
-  ASSERT_TRUE(focusable_for_test.has_value());
-  EXPECT_EQ(occlusion_hint_for_test.value(), SkRect::MakeEmpty());
-  EXPECT_EQ(hit_testable_for_test.value(), false);
-  EXPECT_EQ(focusable_for_test.value(), false);
-
-  // Reset for the next message.
-  occlusion_hint_for_test.reset();
-  hit_testable_for_test.reset();
-  focusable_for_test.reset();
-
-  // Send a message including an occlusion hint.
-  const uint8_t json_occlusion_hint[] =
-      "{"
-      "    \"method\":\"View.update\","
-      "    \"args\": {"
-      "       \"viewId\":42,"
-      "       \"hitTestable\":true,"
-      "       \"focusable\":true,"
-      "       \"viewOcclusionHintLTRB\":[0.1,0.2,0.3,0.4]"
-      "    }"
-      "}";
-  std::unique_ptr<flutter::PlatformMessage> message_occlusion_hint =
-      std::make_unique<flutter::PlatformMessage>(
-          "flutter/platform_views",
-          fml::MallocMapping::Copy(json_occlusion_hint,
-                                   sizeof(json_occlusion_hint)),
-          fml::RefPtr<flutter::PlatformMessageResponse>());
-  base_view->HandlePlatformMessage(std::move(message_occlusion_hint));
-  RunLoopUntilIdle();
-  ASSERT_TRUE(occlusion_hint_for_test.has_value());
-  ASSERT_TRUE(hit_testable_for_test.has_value());
-  ASSERT_TRUE(focusable_for_test.has_value());
-  EXPECT_EQ(occlusion_hint_for_test.value(),
-            SkRect::MakeLTRB(0.1, 0.2, 0.3, 0.4));
-  EXPECT_EQ(hit_testable_for_test.value(), true);
-  EXPECT_EQ(focusable_for_test.value(), true);
-}
-
-// This test makes sure that the PlatformView forwards messages on the
-// "flutter/platform_views" channel for DestroyView.
-TEST_F(PlatformViewTests, DestroyViewTest) {
-  MockPlatformViewDelegate delegate;
-  flutter::TaskRunners task_runners =
-      flutter::TaskRunners("test_runners",  // label
-                           flutter_runner::CreateFMLTaskRunner(
-                               async_get_default_dispatcher()),  // platform
-                           nullptr,                              // raster
-                           nullptr,                              // ui
-                           nullptr                               // io
-      );
-
-  // Test wireframe callback function. If the message sent to the platform
-  // view was properly handled and parsed, this function should be called,
-  // setting |wireframe_enabled| to true.
-  bool destroy_view_called = false;
-  auto DestroyViewCallback =
-      [&destroy_view_called](
-          int64_t view_id, flutter_runner::GfxViewIdCallback on_view_unbound) {
-        destroy_view_called = true;
-        on_view_unbound(0);
-      };
-
-  flutter_runner::GfxPlatformView platform_view =
-      PlatformViewBuilder(delegate, std::move(task_runners))
-          .SetDestroyViewCallback(DestroyViewCallback)
-          .Build();
-
-  // Cast platform_view to its base view so we can have access to the public
-  // "HandlePlatformMessage" function.
-  auto base_view = static_cast<flutter::PlatformView*>(&platform_view);
-  EXPECT_TRUE(base_view);
-
-  // JSON for the message to be passed into the PlatformView.
-  const uint8_t txt[] =
-      "{"
-      "    \"method\":\"View.dispose\","
-      "    \"args\": {"
-      "       \"viewId\":42"
-      "    }"
-      "}";
-
-  std::unique_ptr<flutter::PlatformMessage> message =
-      std::make_unique<flutter::PlatformMessage>(
-          "flutter/platform_views", fml::MallocMapping::Copy(txt, sizeof(txt)),
-          fml::RefPtr<flutter::PlatformMessageResponse>());
-  base_view->HandlePlatformMessage(std::move(message));
-
-  RunLoopUntilIdle();
-
-  EXPECT_TRUE(destroy_view_called);
-}
-
-// This test makes sure that the PlatformView forwards messages on the
-// "flutter/platform_views" channel for ViewConnected, ViewDisconnected, and
-// ViewStateChanged events.
-TEST_F(PlatformViewTests, ViewEventsTest) {
-  constexpr int64_t kViewId = 33;
-  constexpr scenic::ResourceId kViewHolderId = 42;
-  MockPlatformViewDelegate delegate;
-
-  fuchsia::ui::scenic::SessionListenerPtr session_listener;
-  std::vector<fuchsia::ui::scenic::Event> events;
-  flutter::TaskRunners task_runners =
-      flutter::TaskRunners("test_runners",  // label
-                           flutter_runner::CreateFMLTaskRunner(
-                               async_get_default_dispatcher()),  // platform
-                           flutter_runner::CreateFMLTaskRunner(
-                               async_get_default_dispatcher()),  // raster
-                           flutter_runner::CreateFMLTaskRunner(
-                               async_get_default_dispatcher()),  // ui
-                           nullptr                               // io
-      );
-
-  auto on_create_view =
-      [kViewId](int64_t view_id, flutter_runner::ViewCallback on_view_created,
-                flutter_runner::GfxViewIdCallback on_view_bound,
-                bool hit_testable, bool focusable) {
-        ASSERT_EQ(view_id, kViewId);
-        on_view_created();
-        on_view_bound(kViewHolderId);
-      };
-
-  flutter_runner::GfxPlatformView platform_view =
-      PlatformViewBuilder(delegate, std::move(task_runners))
-          .SetSessionListenerRequest(session_listener.NewRequest())
-          .SetCreateViewCallback(on_create_view)
-          .Build();
-  RunLoopUntilIdle();
-  ASSERT_EQ(delegate.message(), nullptr);
-
-  // Create initial view for testing.
-  std::ostringstream create_view_message;
-  create_view_message << "{"
-                      << "  \"method\":\"View.create\","
-                      << "  \"args\":{"
-                      << "    \"viewId\":" << kViewId << ","
-                      << "    \"hitTestable\":true,"
-                      << "    \"focusable\":true"
-                      << "  }"
-                      << "}";
-  std::string create_view_call = create_view_message.str();
-  static_cast<flutter::PlatformView*>(&platform_view)
-      ->HandlePlatformMessage(std::make_unique<flutter::PlatformMessage>(
-          "flutter/platform_views",
-          fml::MallocMapping::Copy(create_view_call.c_str(),
-                                   create_view_call.size()),
-          fml::RefPtr<flutter::PlatformMessageResponse>()));
-  RunLoopUntilIdle();
-
-  // ViewConnected event.
-  delegate.Reset();
-  events.clear();
-  events.emplace_back(fuchsia::ui::scenic::Event::WithGfx(
-      fuchsia::ui::gfx::Event::WithViewConnected(
-          fuchsia::ui::gfx::ViewConnectedEvent{
-              .view_holder_id = kViewHolderId,
-          })));
-  session_listener->OnScenicEvent(std::move(events));
-  RunLoopUntilIdle();
-
-  flutter::PlatformMessage* view_connected_msg = delegate.message();
-  ASSERT_NE(view_connected_msg, nullptr);
-  std::ostringstream view_connected_expected_out;
-  view_connected_expected_out
-      << "{"
-      << "\"method\":\"View.viewConnected\","
-      << "\"args\":{"
-      << "  \"viewId\":" << kViewId  // ViewHolderToken handle
-      << "  }"
-      << "}";
-  EXPECT_EQ(view_connected_expected_out.str(),
-            ToString(view_connected_msg->data()));
-
-  // ViewDisconnected event.
-  delegate.Reset();
-  events.clear();
-  events.emplace_back(fuchsia::ui::scenic::Event::WithGfx(
-      fuchsia::ui::gfx::Event::WithViewDisconnected(
-          fuchsia::ui::gfx::ViewDisconnectedEvent{
-              .view_holder_id = kViewHolderId,
-          })));
-  session_listener->OnScenicEvent(std::move(events));
-  RunLoopUntilIdle();
-
-  flutter::PlatformMessage* view_disconnected_msg = delegate.message();
-  ASSERT_NE(view_disconnected_msg, nullptr);
-  std::ostringstream view_disconnected_expected_out;
-  view_disconnected_expected_out
-      << "{"
-      << "\"method\":\"View.viewDisconnected\","
-      << "\"args\":{"
-      << "  \"viewId\":" << kViewId  // ViewHolderToken handle
-      << "  }"
-      << "}";
-  EXPECT_EQ(view_disconnected_expected_out.str(),
-            ToString(view_disconnected_msg->data()));
-
-  // ViewStateChanged event.
-  delegate.Reset();
-  events.clear();
-  events.emplace_back(fuchsia::ui::scenic::Event::WithGfx(
-      fuchsia::ui::gfx::Event::WithViewStateChanged(
-          fuchsia::ui::gfx::ViewStateChangedEvent{
-              .view_holder_id = kViewHolderId,
-              .state =
-                  fuchsia::ui::gfx::ViewState{
-                      .is_rendering = true,
-                  },
-          })));
-  session_listener->OnScenicEvent(std::move(events));
-  RunLoopUntilIdle();
-
-  flutter::PlatformMessage* view_state_changed_msg = delegate.message();
-  ASSERT_NE(view_state_changed_msg, nullptr);
-  std::ostringstream view_state_changed_expected_out;
-  view_state_changed_expected_out
-      << "{"
-      << "\"method\":\"View.viewStateChanged\","
-      << "\"args\":{"
-      << "  \"viewId\":" << kViewId << ","  // ViewHolderToken
-      << "  \"is_rendering\":true,"         // IsViewRendering
-      << "  \"state\":true"                 // IsViewRendering
-      << "  }"
-      << "}";
-  EXPECT_EQ(view_state_changed_expected_out.str(),
-            ToString(view_state_changed_msg->data()));
-}
-
-// This test makes sure that the PlatformView forwards messages on the
-// "flutter/platform_views" channel for View.focus.getCurrent and
-// View.focus.getNext.
-TEST_F(PlatformViewTests, GetFocusStatesTest) {
-  MockPlatformViewDelegate delegate;
-  flutter::TaskRunners task_runners =
-      flutter::TaskRunners("test_runners", nullptr, nullptr, nullptr, nullptr);
-
-  FakeViewRefFocused vrf;
-  fidl::BindingSet<fuchsia::ui::views::ViewRefFocused> vrf_bindings;
-  auto vrf_handle = vrf_bindings.AddBinding(&vrf);
-
-  flutter_runner::GfxPlatformView platform_view =
-      PlatformViewBuilder(delegate, std::move(task_runners))
-          .SetViewRefFocused(std::move(vrf_handle))
-          .Build();
-
-  // Cast platform_view to its base view so we can have access to the public
-  // "HandlePlatformMessage" function.
-  auto base_view = static_cast<flutter::PlatformView*>(&platform_view);
-  EXPECT_TRUE(base_view);
-
-  std::vector<bool> vrf_states{false, true,  true, false,
-                               true,  false, true, true};
-
-  for (std::size_t i = 0; i < vrf_states.size(); ++i) {
-    // View.focus.getNext should complete with the next focus state.
-    auto response1 = FakePlatformMessageResponse::Create();
-    base_view->HandlePlatformMessage(response1->WithMessage(
-        "flutter/platform_views", "{\"method\":\"View.focus.getNext\"}"));
-    // Duplicate View.focus.getNext requests should complete empty.
-    auto response2 = FakePlatformMessageResponse::Create();
-    base_view->HandlePlatformMessage(response2->WithMessage(
-        "flutter/platform_views", "{\"method\":\"View.focus.getNext\"}"));
-
-    // Post watch events and make sure the hanging get is invoked each time.
-    RunLoopUntilIdle();
-    EXPECT_EQ(vrf.times_watched, i + 1);
-
-    // Dispatch the next vrf event.
-    vrf.ScheduleCallback(vrf_states[i]);
-    RunLoopUntilIdle();
-
-    // Make sure View.focus.getCurrent completes with the current focus state.
-    auto response3 = FakePlatformMessageResponse::Create();
-    base_view->HandlePlatformMessage(response3->WithMessage(
-        "flutter/platform_views", "{\"method\":\"View.focus.getCurrent\"}"));
-    // Duplicate View.focus.getCurrent are allowed.
-    auto response4 = FakePlatformMessageResponse::Create();
-    base_view->HandlePlatformMessage(response4->WithMessage(
-        "flutter/platform_views", "{\"method\":\"View.focus.getCurrent\"}"));
-
-    // Run event loop and check our results.
-    RunLoopUntilIdle();
-    response1->ExpectCompleted(vrf_states[i] ? "[true]" : "[false]");
-    response2->ExpectCompleted("[null]");
-    response3->ExpectCompleted(vrf_states[i] ? "[true]" : "[false]");
-    response4->ExpectCompleted(vrf_states[i] ? "[true]" : "[false]");
-  }
-}
-
-// This test makes sure that the PlatformView forwards messages on the
-// "flutter/platform_views" channel for View.focus.request.
-TEST_F(PlatformViewTests, RequestFocusTest) {
-  MockPlatformViewDelegate delegate;
-  flutter::TaskRunners task_runners =
-      flutter::TaskRunners("test_runners", nullptr, nullptr, nullptr, nullptr);
-
-  FakeFocuser focuser;
-  fidl::BindingSet<fuchsia::ui::views::Focuser> focuser_bindings;
-  auto focuser_handle = focuser_bindings.AddBinding(&focuser);
-
-  flutter_runner::GfxPlatformView platform_view =
-      PlatformViewBuilder(delegate, std::move(task_runners))
-          .SetFocuser(std::move(focuser_handle))
-          .Build();
-
-  // Cast platform_view to its base view so we can have access to the public
-  // "HandlePlatformMessage" function.
-  auto base_view = static_cast<flutter::PlatformView*>(&platform_view);
-  EXPECT_TRUE(base_view);
-
-  // This "Mock" ViewRef serves as the target for the RequestFocus operation.
-  auto mock_view_ref_pair = scenic::ViewRefPair::New();
-
-  // JSON for the message to be passed into the PlatformView.
-  std::ostringstream message;
-  message << "{"
-          << "    \"method\":\"View.focus.request\","
-          << "    \"args\": {"
-          << "       \"viewRef\":"
-          << mock_view_ref_pair.view_ref.reference.get() << "    }"
-          << "}";
-
-  // Dispatch the plaform message request.
-  auto response = FakePlatformMessageResponse::Create();
-  base_view->HandlePlatformMessage(
-      response->WithMessage("flutter/platform_views", message.str()));
-  RunLoopUntilIdle();
-
-  response->ExpectCompleted("[0]");
-  EXPECT_TRUE(focuser.request_focus_called());
-}
-
-// This test makes sure that the PlatformView correctly replies with an error
-// response when a View.focus.request call fails.
-TEST_F(PlatformViewTests, RequestFocusFailTest) {
-  MockPlatformViewDelegate delegate;
-  flutter::TaskRunners task_runners =
-      flutter::TaskRunners("test_runners", nullptr, nullptr, nullptr, nullptr);
-
-  FakeFocuser focuser;
-  focuser.fail_request_focus();
-  fidl::BindingSet<fuchsia::ui::views::Focuser> focuser_bindings;
-  auto focuser_handle = focuser_bindings.AddBinding(&focuser);
-
-  flutter_runner::GfxPlatformView platform_view =
-      PlatformViewBuilder(delegate, std::move(task_runners))
-          .SetFocuser(std::move(focuser_handle))
-          .Build();
-
-  // Cast platform_view to its base view so we can have access to the public
-  // "HandlePlatformMessage" function.
-  auto base_view = static_cast<flutter::PlatformView*>(&platform_view);
-  EXPECT_TRUE(base_view);
-
-  // This "Mock" ViewRef serves as the target for the RequestFocus operation.
-  auto mock_view_ref_pair = scenic::ViewRefPair::New();
-
-  // JSON for the message to be passed into the PlatformView.
-  std::ostringstream message;
-  message << "{"
-          << "    \"method\":\"View.focus.request\","
-          << "    \"args\": {"
-          << "       \"viewRef\":"
-          << mock_view_ref_pair.view_ref.reference.get() << "    }"
-          << "}";
-
-  // Dispatch the plaform message request.
-  auto response = FakePlatformMessageResponse::Create();
-  base_view->HandlePlatformMessage(
-      response->WithMessage("flutter/platform_views", message.str()));
-  RunLoopUntilIdle();
-
-  response->ExpectCompleted(
-      "[" +
-      std::to_string(
-          static_cast<std::underlying_type_t<fuchsia::ui::views::Error>>(
-              fuchsia::ui::views::Error::DENIED)) +
-      "]");
-  EXPECT_TRUE(focuser.request_focus_called());
-}
-
-// Makes sure that OnKeyEvent is dispatched as a platform message.
-TEST_F(PlatformViewTests, OnKeyEvent) {
-  struct EventFlow {
-    fuchsia::ui::input3::KeyEvent event;
-    fuchsia::ui::input3::KeyEventStatus expected_key_event_status;
-    std::string expected_platform_message;
-  };
-
-  MockPlatformViewDelegate delegate;
-  flutter::TaskRunners task_runners =
-      flutter::TaskRunners("test_runners", nullptr, nullptr, nullptr, nullptr);
-
-  fuchsia::ui::input3::KeyboardHandle keyboard_service;
-  MockKeyboard keyboard(keyboard_service.NewRequest());
-
-  flutter_runner::GfxPlatformView platform_view =
-      PlatformViewBuilder(delegate, std::move(task_runners))
-          .SetKeyboard(std::move(keyboard_service))
-          .Build();
-  RunLoopUntilIdle();
-
-  std::vector<EventFlow> events;
-  // Press A.  Get 'a'.
-  // The HID usage for the key A is 0x70004, or 458756.
-  events.emplace_back(EventFlow{
-      MakeEvent(fuchsia::ui::input3::KeyEventType::PRESSED, std::nullopt,
-                fuchsia::input::Key::A),
-      fuchsia::ui::input3::KeyEventStatus::HANDLED,
-      R"({"type":"keydown","keymap":"fuchsia","hidUsage":458756,"codePoint":97,"modifiers":0})",
-  });
-  // Release A. Get 'a' release.
-  events.emplace_back(EventFlow{
-      MakeEvent(fuchsia::ui::input3::KeyEventType::RELEASED, std::nullopt,
-                fuchsia::input::Key::A),
-      fuchsia::ui::input3::KeyEventStatus::HANDLED,
-      R"({"type":"keyup","keymap":"fuchsia","hidUsage":458756,"codePoint":97,"modifiers":0})",
-  });
-  // Press CAPS_LOCK.  Modifier now active.
-  events.emplace_back(EventFlow{
-      MakeEvent(fuchsia::ui::input3::KeyEventType::PRESSED,
-                fuchsia::ui::input3::Modifiers::CAPS_LOCK,
-                fuchsia::input::Key::CAPS_LOCK),
-      fuchsia::ui::input3::KeyEventStatus::HANDLED,
-      R"({"type":"keydown","keymap":"fuchsia","hidUsage":458809,"codePoint":0,"modifiers":1})",
-  });
-  // Press A.  Get 'A'.
-  events.emplace_back(EventFlow{
-      MakeEvent(fuchsia::ui::input3::KeyEventType::PRESSED, std::nullopt,
-                fuchsia::input::Key::A),
-      fuchsia::ui::input3::KeyEventStatus::HANDLED,
-      R"({"type":"keydown","keymap":"fuchsia","hidUsage":458756,"codePoint":65,"modifiers":1})",
-  });
-  // Release CAPS_LOCK.
-  events.emplace_back(EventFlow{
-      MakeEvent(fuchsia::ui::input3::KeyEventType::RELEASED,
-                fuchsia::ui::input3::Modifiers::CAPS_LOCK,
-                fuchsia::input::Key::CAPS_LOCK),
-      fuchsia::ui::input3::KeyEventStatus::HANDLED,
-      R"({"type":"keyup","keymap":"fuchsia","hidUsage":458809,"codePoint":0,"modifiers":1})",
-  });
-  // Press A again.  This time get 'A'.
-  // CAPS_LOCK is latched active even if it was just released.
-  events.emplace_back(EventFlow{
-      MakeEvent(fuchsia::ui::input3::KeyEventType::PRESSED, std::nullopt,
-                fuchsia::input::Key::A),
-      fuchsia::ui::input3::KeyEventStatus::HANDLED,
-      R"({"type":"keydown","keymap":"fuchsia","hidUsage":458756,"codePoint":65,"modifiers":1})",
-  });
-
-  for (const auto& event : events) {
-    fuchsia::ui::input3::KeyEvent e;
-    event.event.Clone(&e);
-    fuchsia::ui::input3::KeyEventStatus key_event_status{0u};
-    keyboard.listener_->OnKeyEvent(
-        std::move(e),
-        [&key_event_status](fuchsia::ui::input3::KeyEventStatus status) {
-          key_event_status = status;
-        });
-    RunLoopUntilIdle();
-
-    ASSERT_NOTNULL(delegate.message());
-    EXPECT_EQ(event.expected_platform_message,
-              ToString(delegate.message()->data()));
-    EXPECT_EQ(event.expected_key_event_status, key_event_status);
-  }
-}
-
-TEST_F(PlatformViewTests, OnShaderWarmup) {
-  MockPlatformViewDelegate delegate;
-  flutter::TaskRunners task_runners =
-      flutter::TaskRunners("test_runners", nullptr, nullptr, nullptr, nullptr);
-
-  uint64_t width = 200;
-  uint64_t height = 100;
-  std::vector<std::string> shaders = {"foo.skp", "bar.skp", "baz.skp"};
-
-  OnShaderWarmup on_shader_warmup =
-      [&](const std::vector<std::string>& shaders_in,
-          std::function<void(uint32_t)> completion_callback, uint64_t width_in,
-          uint64_t height_in) {
-        ASSERT_EQ(shaders.size(), shaders_in.size());
-        for (size_t i = 0; i < shaders_in.size(); i++) {
-          ASSERT_EQ(shaders[i], shaders_in[i]);
-        }
-        ASSERT_EQ(width, width_in);
-        ASSERT_EQ(height, height_in);
-
-        completion_callback(shaders_in.size());
-      };
-
-  flutter_runner::GfxPlatformView platform_view =
-      PlatformViewBuilder(delegate, std::move(task_runners))
-          .SetShaderWarmupCallback(on_shader_warmup)
-          .Build();
-
-  std::ostringstream shaders_array_ostream;
-  shaders_array_ostream << "[ ";
-  for (auto it = shaders.begin(); it != shaders.end(); ++it) {
-    shaders_array_ostream << "\"" << *it << "\"";
-    if (std::next(it) != shaders.end()) {
-      shaders_array_ostream << ", ";
-    }
-  }
-  shaders_array_ostream << "]";
-
-  std::string shaders_array_string = shaders_array_ostream.str();
-
-  // Create initial view for testing.
-  std::ostringstream warmup_shaders_ostream;
-  warmup_shaders_ostream << "{"
-                         << "  \"method\":\"WarmupSkps\","
-                         << "  \"args\":{"
-                         << "    \"shaders\":" << shaders_array_string << ","
-                         << "    \"width\":" << width << ","
-                         << "    \"height\":" << height << "  }"
-                         << "}\n";
-  std::string warmup_shaders_string = warmup_shaders_ostream.str();
-
-  fml::RefPtr<TestPlatformMessageResponse> response(
-      new TestPlatformMessageResponse);
-  static_cast<flutter::PlatformView*>(&platform_view)
-      ->HandlePlatformMessage(std::make_unique<flutter::PlatformMessage>(
-          "fuchsia/shader_warmup",
-          fml::MallocMapping::Copy(warmup_shaders_string.c_str(),
-                                   warmup_shaders_string.size()),
-          response));
-  RunLoopUntilIdle();
-  ASSERT_TRUE(response->is_complete());
-
-  std::ostringstream expected_result_ostream;
-  expected_result_ostream << "[" << shaders.size() << "]";
-  std::string expected_result_string = expected_result_ostream.str();
-  EXPECT_EQ(expected_result_string, response->result_string);
-}
-
-TEST_F(PlatformViewTests, TouchSourceLogicalToPhysicalConversion) {
-  constexpr std::array<std::array<float, 2>, 2> kRect = {{{0, 0}, {20, 20}}};
-  constexpr std::array<float, 9> kIdentity = {1, 0, 0, 0, 1, 0, 0, 0, 1};
-  constexpr fuchsia::ui::pointer::TouchInteractionId kIxnOne = {
-      .device_id = 0u, .pointer_id = 1u, .interaction_id = 2u};
-  constexpr float valid_pixel_ratio = 2.f;
-
-  MockPlatformViewDelegate delegate;
-  flutter::TaskRunners task_runners("test_runners", nullptr, nullptr, nullptr,
-                                    nullptr);
-
-  fuchsia::ui::scenic::SessionListenerPtr session_listener;
-  FakeTouchSource touch_server;
-  fidl::BindingSet<fuchsia::ui::pointer::TouchSource> touch_bindings;
-  auto touch_handle = touch_bindings.AddBinding(&touch_server);
-  flutter_runner::GfxPlatformView platform_view =
-      PlatformViewBuilder(delegate, std::move(task_runners))
-          .SetSessionListenerRequest(session_listener.NewRequest())
-          .SetTouchSource(std::move(touch_handle))
-          .Build();
-  RunLoopUntilIdle();
-  EXPECT_EQ(delegate.pointer_packets().size(), 0u);
-
-  // Set logical-to-physical metrics and logical view size
-  std::vector<fuchsia::ui::scenic::Event> scenic_events;
-  scenic_events.emplace_back(fuchsia::ui::scenic::Event::WithGfx(
-      fuchsia::ui::gfx::Event::WithMetrics(fuchsia::ui::gfx::MetricsEvent{
-          .node_id = 0,
-          .metrics =
-              fuchsia::ui::gfx::Metrics{
-                  .scale_x = valid_pixel_ratio,
-                  .scale_y = valid_pixel_ratio,
-                  .scale_z = valid_pixel_ratio,
-              },
-      })));
-  scenic_events.emplace_back(
-      fuchsia::ui::scenic::Event::WithGfx(
-          fuchsia::ui::gfx::Event::WithViewPropertiesChanged(
-              fuchsia::ui::gfx::ViewPropertiesChangedEvent{
-                  .view_id = 0,
-                  .properties =
-                      fuchsia::ui::gfx::ViewProperties{
-                          .bounding_box =
-                              fuchsia::ui::gfx::BoundingBox{
-                                  .min =
-                                      fuchsia::ui::gfx::vec3{
-                                          .x = 0.f,
-                                          .y = 0.f,
-                                          .z = 0.f,
-                                      },
-                                  .max =
-                                      fuchsia::ui::gfx::vec3{
-                                          .x = 20.f,
-                                          .y = 20.f,
-                                          .z = 20.f,
-                                      },
-                              },
-                      },
-              })));
-  session_listener->OnScenicEvent(std::move(scenic_events));
-  RunLoopUntilIdle();
-  EXPECT_EQ(delegate.metrics(), flutter::ViewportMetrics(2.f, 40.f, 40.f, -1));
-
-  // Inject
-  std::vector<fuchsia::ui::pointer::TouchEvent> events =
-      TouchEventBuilder::New()
-          .AddTime(/* in nanoseconds */ 1111789u)
-          .AddViewParameters(kRect, kRect, kIdentity)
-          .AddSample(kIxnOne, fuchsia::ui::pointer::EventPhase::ADD,
-                     {10.f, 10.f})
-          .AddResult(
-              {.interaction = kIxnOne,
-               .status = fuchsia::ui::pointer::TouchInteractionStatus::GRANTED})
-          .BuildAsVector();
-  touch_server.ScheduleCallback(std::move(events));
-  RunLoopUntilIdle();
-
-  // Unpack
-  std::vector<std::unique_ptr<flutter::PointerDataPacket>> packets =
-      delegate.TakePointerDataPackets();
-  ASSERT_EQ(packets.size(), 1u);
-  std::vector<flutter::PointerData> flutter_events;
-  UnpackPointerPacket(flutter_events, std::move(packets[0]));
-
-  // Examine phases
-  ASSERT_EQ(flutter_events.size(), 2u);
-  EXPECT_EQ(flutter_events[0].change, flutter::PointerData::Change::kAdd);
-  EXPECT_EQ(flutter_events[1].change, flutter::PointerData::Change::kDown);
-
-  // Examine coordinates
-  // With metrics defined, observe metrics ratio applied.
-  EXPECT_EQ(flutter_events[0].physical_x, 20.f);
-  EXPECT_EQ(flutter_events[0].physical_y, 20.f);
-  EXPECT_EQ(flutter_events[1].physical_x, 20.f);
-  EXPECT_EQ(flutter_events[1].physical_y, 20.f);
-}
-
-}  // namespace flutter_runner::testing
diff --git a/shell/platform/fuchsia/flutter/pointer_delegate.h b/shell/platform/fuchsia/flutter/pointer_delegate.h
index 996130ef4d957f90bb7fc72ebd1acbc421e02e29..650c2b3300834ec7507ddb7a7a3e3f062d687bb1 100644
--- a/shell/platform/fuchsia/flutter/pointer_delegate.h
+++ b/shell/platform/fuchsia/flutter/pointer_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_POINTER_DELEGATE_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_POINTER_DELEGATE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_POINTER_DELEGATE_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_POINTER_DELEGATE_H_
 
 #include <fuchsia/ui/pointer/cpp/fidl.h>
 
@@ -140,4 +140,4 @@ class PointerDelegate {
 };
 
 }  // namespace flutter_runner
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_POINTER_DELEGATE_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_POINTER_DELEGATE_H_
diff --git a/shell/platform/fuchsia/flutter/pointer_injector_delegate.cc b/shell/platform/fuchsia/flutter/pointer_injector_delegate.cc
index 0c682bef6ff6b4ab73af39b4ee4767f69e7831c2..ba93b9e2bc8e4abff9e5e29c75cbd2ebaa12283d 100644
--- a/shell/platform/fuchsia/flutter/pointer_injector_delegate.cc
+++ b/shell/platform/fuchsia/flutter/pointer_injector_delegate.cc
@@ -43,118 +43,100 @@ bool PointerInjectorDelegate::HandlePlatformMessage(
 
   auto method = request.FindMember("method");
   if (method == request.MemberEnd() || !method->value.IsString()) {
+    FML_LOG(ERROR) << "No method found in platform message.";
     return false;
   }
 
-  if (method->value == kPointerInjectorMethodPrefix) {
-    auto args_it = request.FindMember("args");
-    if (args_it == request.MemberEnd() || !args_it->value.IsObject()) {
-      FML_LOG(ERROR) << "No arguments found.";
-      return false;
-    }
-
-    const auto& args = args_it->value;
-
-    auto view_id = args.FindMember("viewId");
-    if (!view_id->value.IsUint64()) {
-      FML_LOG(ERROR) << "Argument 'viewId' is not a uint64";
-      return false;
-    }
-    auto id = view_id->value.GetUint64();
-
-    auto phase = args.FindMember("phase");
-    if (!phase->value.IsInt()) {
-      FML_LOG(ERROR) << "Argument 'phase' is not a int";
-      return false;
-    }
-
-    auto pointer_x = args.FindMember("x");
-    if (!pointer_x->value.IsFloat() && !pointer_x->value.IsInt()) {
-      FML_LOG(ERROR) << "Argument 'Pointer.X' is not a float";
-      return false;
-    }
-
-    auto pointer_y = args.FindMember("y");
-    if (!pointer_y->value.IsFloat() && !pointer_y->value.IsInt()) {
-      FML_LOG(ERROR) << "Argument 'Pointer.Y' is not a float";
-      return false;
-    }
-
-    auto pointer_id = args.FindMember("pointerId");
-    if (!pointer_id->value.IsUint()) {
-      FML_LOG(ERROR) << "Argument 'pointerId' is not a uint32";
-      return false;
-    }
-
-    auto trace_flow_id = args.FindMember("traceFlowId");
-    if (!trace_flow_id->value.IsInt()) {
-      FML_LOG(ERROR) << "Argument 'traceFlowId' is not a int";
-      return false;
-    }
-
-    // For GFX, the viewRef for the view is provided through the platform
-    // message. For flatland, the viewRef is provided through |OnCreateView|.
-    std::optional<fuv_ViewRef> view_ref;
-    if (!is_flatland_) {
-      auto view_ref_arg = args.FindMember("viewRef");
-      if (!view_ref_arg->value.IsUint64()) {
-        FML_LOG(ERROR) << "Argument 'viewRef' is not a uint64";
-        return false;
-      }
+  if (method->value != kPointerInjectorMethodPrefix) {
+    FML_LOG(ERROR) << "Unexpected platform message method, expected "
+                      "View.pointerinjector.inject.";
+    return false;
+  }
 
-      zx_handle_t handle = view_ref_arg->value.GetUint64();
-      zx_handle_t out_handle;
-      zx_status_t status =
-          zx_handle_duplicate(handle, ZX_RIGHT_SAME_RIGHTS, &out_handle);
-      if (status != ZX_OK) {
-        FML_LOG(ERROR) << "Argument 'viewRef' is not valid";
-        return false;
-      }
-      auto ref = fuv_ViewRef({
-          .reference = zx::eventpair(out_handle),
-      });
-      view_ref = std::move(ref);
-    }
-
-    auto width = args.FindMember("logicalWidth");
-    if (!width->value.IsFloat() && !width->value.IsInt()) {
-      FML_LOG(ERROR) << "Argument 'logicalWidth' is not a float";
-      return false;
-    }
-
-    auto height = args.FindMember("logicalHeight");
-    if (!height->value.IsFloat() && !height->value.IsInt()) {
-      FML_LOG(ERROR) << "Argument 'logicalHeight' is not a float";
-      return false;
-    }
-
-    auto timestamp = args.FindMember("timestamp");
-    if (!timestamp->value.IsInt() && !timestamp->value.IsUint64()) {
-      FML_LOG(ERROR) << "Argument 'timestamp' is not a int";
-      return false;
-    }
-
-    PointerInjectorRequest request = {
-        .x = pointer_x->value.GetFloat(),
-        .y = pointer_y->value.GetFloat(),
-        .pointer_id = pointer_id->value.GetUint(),
-        .phase = static_cast<fup_EventPhase>(phase->value.GetInt()),
-        .trace_flow_id = trace_flow_id->value.GetUint64(),
-        .view_ref = std::move(view_ref),
-        .logical_size = {width->value.GetFloat(), height->value.GetFloat()},
-        .timestamp = timestamp->value.GetInt()};
-
-    // Inject the pointer event if the view has been created.
-    if (valid_views_.count(id) > 0) {
-      valid_views_.at(id).InjectEvent(std::move(request));
-      Complete(std::move(response), "[0]");
-    } else {
-      return false;
-    }
-  } else {
+  auto args_it = request.FindMember("args");
+  if (args_it == request.MemberEnd() || !args_it->value.IsObject()) {
+    FML_LOG(ERROR) << "No arguments found in platform message's method";
+    return false;
+  }
+
+  const auto& args = args_it->value;
+
+  auto view_id = args.FindMember("viewId");
+  if (!view_id->value.IsUint64()) {
+    FML_LOG(ERROR) << "Argument 'viewId' is not a uint64";
+    return false;
+  }
+
+  auto id = view_id->value.GetUint64();
+  if (valid_views_.count(id) == 0) {
+    // A child view can get destroyed bottom-up, so the parent view may continue
+    // injecting until all view state processing "catches up". Until then, it's
+    // okay to accept a request to inject into a view that no longer exists.
+    // Doing so avoids log pollution regarding "MissingPluginException".
+    Complete(std::move(response), "[0]");
+    return true;
+  }
+
+  auto phase = args.FindMember("phase");
+  if (!phase->value.IsInt()) {
+    FML_LOG(ERROR) << "Argument 'phase' is not a int";
+    return false;
+  }
+
+  auto pointer_x = args.FindMember("x");
+  if (!pointer_x->value.IsFloat() && !pointer_x->value.IsInt()) {
+    FML_LOG(ERROR) << "Argument 'Pointer.X' is not a float";
+    return false;
+  }
+
+  auto pointer_y = args.FindMember("y");
+  if (!pointer_y->value.IsFloat() && !pointer_y->value.IsInt()) {
+    FML_LOG(ERROR) << "Argument 'Pointer.Y' is not a float";
+    return false;
+  }
+
+  auto pointer_id = args.FindMember("pointerId");
+  if (!pointer_id->value.IsUint()) {
+    FML_LOG(ERROR) << "Argument 'pointerId' is not a uint32";
+    return false;
+  }
+
+  auto trace_flow_id = args.FindMember("traceFlowId");
+  if (!trace_flow_id->value.IsInt()) {
+    FML_LOG(ERROR) << "Argument 'traceFlowId' is not a int";
+    return false;
+  }
+
+  auto width = args.FindMember("logicalWidth");
+  if (!width->value.IsFloat() && !width->value.IsInt()) {
+    FML_LOG(ERROR) << "Argument 'logicalWidth' is not a float";
     return false;
   }
-  // All of our methods complete the platform message response.
+
+  auto height = args.FindMember("logicalHeight");
+  if (!height->value.IsFloat() && !height->value.IsInt()) {
+    FML_LOG(ERROR) << "Argument 'logicalHeight' is not a float";
+    return false;
+  }
+
+  auto timestamp = args.FindMember("timestamp");
+  if (!timestamp->value.IsInt() && !timestamp->value.IsUint64()) {
+    FML_LOG(ERROR) << "Argument 'timestamp' is not a int";
+    return false;
+  }
+
+  PointerInjectorRequest event = {
+      .x = pointer_x->value.GetFloat(),
+      .y = pointer_y->value.GetFloat(),
+      .pointer_id = pointer_id->value.GetUint(),
+      .phase = static_cast<fup_EventPhase>(phase->value.GetInt()),
+      .trace_flow_id = trace_flow_id->value.GetUint64(),
+      .logical_size = {width->value.GetFloat(), height->value.GetFloat()},
+      .timestamp = timestamp->value.GetInt()};
+
+  // Inject the pointer event if the view has been created.
+  valid_views_.at(id).InjectEvent(std::move(event));
+  Complete(std::move(response), "[0]");
   return true;
 }
 
@@ -275,18 +257,11 @@ void PointerInjectorDelegate::PointerInjectorEndpoint::RegisterInjector(
   context.set_view(std::move(context_clone));
   config.set_context(std::move(context));
 
-  FML_CHECK(request.view_ref.has_value() || view_ref_.has_value());
+  FML_CHECK(view_ref_.has_value());
   fup_Target target;
   fuv_ViewRef target_clone;
 
-  // GFX.
-  if (request.view_ref.has_value()) {
-    fidl::Clone(*request.view_ref, &target_clone);
-  }
-  // Flatland.
-  else {
-    fidl::Clone(*view_ref_, &target_clone);
-  }
+  fidl::Clone(*view_ref_, &target_clone);
   target.set_view(std::move(target_clone));
   config.set_target(std::move(target));
 
diff --git a/shell/platform/fuchsia/flutter/pointer_injector_delegate.h b/shell/platform/fuchsia/flutter/pointer_injector_delegate.h
index 00063c1af32e56975c2221e65f27251f8edffe25..4a9ccce7edbbcf800b54622c593b8115f0c81b90 100644
--- a/shell/platform/fuchsia/flutter/pointer_injector_delegate.h
+++ b/shell/platform/fuchsia/flutter/pointer_injector_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_POINTER_INJECTOR_DELEGATE_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_POINTER_INJECTOR_DELEGATE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_POINTER_INJECTOR_DELEGATE_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_POINTER_INJECTOR_DELEGATE_H_
 
 #include <fuchsia/ui/pointerinjector/cpp/fidl.h>
 #include <fuchsia/ui/views/cpp/fidl.h>
@@ -28,13 +28,11 @@ class PointerInjectorDelegate {
       "View.pointerinjector.inject";
 
   PointerInjectorDelegate(fuchsia::ui::pointerinjector::RegistryHandle registry,
-                          fuchsia::ui::views::ViewRef host_view_ref,
-                          bool is_flatland)
+                          fuchsia::ui::views::ViewRef host_view_ref)
       : registry_(std::make_shared<fuchsia::ui::pointerinjector::RegistryPtr>(
             registry.Bind())),
         host_view_ref_(std::make_shared<fuchsia::ui::views::ViewRef>(
-            std::move(host_view_ref))),
-        is_flatland_(is_flatland) {}
+            std::move(host_view_ref))) {}
 
   // Handles the following pointer event related platform message requests:
   // View.Pointerinjector.inject
@@ -45,15 +43,14 @@ class PointerInjectorDelegate {
       fml::RefPtr<flutter::PlatformMessageResponse> response);
 
   // Adds an endpoint for |view_id| in |valid_views_| for lifecycle management.
-  // Called in |GFXPlatformView::OnCreateView()| and
-  // |FlatlandPlatformView::OnChildViewViewRef()|.
+  // Called in |PlatformView::OnChildViewViewRef()|.
   void OnCreateView(
       uint64_t view_id,
       std::optional<fuchsia::ui::views::ViewRef> view_ref = std::nullopt);
 
   // Closes the |fuchsia.ui.pointerinjector.Device| channel for |view_id| and
   // cleans up resources.
-  void OnDestroyView(uint64_t view_id) { valid_views_.erase(view_id); };
+  void OnDestroyView(uint64_t view_id) { valid_views_.erase(view_id); }
 
  private:
   using ViewId = int64_t;
@@ -72,10 +69,6 @@ class PointerInjectorDelegate {
     // |fuchsia.ui.pointerinjector.Event.trace_flow_id|.
     uint64_t trace_flow_id = 0;
 
-    // The view for which dispatch is attempted for the pointer event. For
-    // flatland views, this value is set as std::nullopt.
-    std::optional<fuchsia::ui::views::ViewRef> view_ref;
-
     // Logical size of the view's coordinate system.
     std::array<float, 2> logical_size = {0.f, 0.f};
 
@@ -153,7 +146,7 @@ class PointerInjectorDelegate {
     // ViewRef for the main flutter app launching the embedded child views.
     std::shared_ptr<fuchsia::ui::views::ViewRef> host_view_ref_;
 
-    // ViewRef for a flatland view. For GFX this value is set as std::nullopt.
+    // ViewRef for a flatland view.
     // Set in |OnCreateView|.
     std::optional<fuchsia::ui::views::ViewRef> view_ref_;
 
@@ -190,10 +183,8 @@ class PointerInjectorDelegate {
   // ViewRef for the main flutter app launching the embedded child views.
   std::shared_ptr<fuchsia::ui::views::ViewRef> host_view_ref_;
 
-  bool is_flatland_ = false;
-
   FML_DISALLOW_COPY_AND_ASSIGN(PointerInjectorDelegate);
 };
 
 }  // namespace flutter_runner
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_POINTER_INJECTOR_DELEGATE_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_POINTER_INJECTOR_DELEGATE_H_
diff --git a/shell/platform/fuchsia/flutter/pointer_injector_delegate_unittest.cc b/shell/platform/fuchsia/flutter/pointer_injector_delegate_unittest.cc
index cee930a428f3505dc06a0bff290cedde1ec190d8..dcf0fd41c6b6d766f7ac73fb383cb1b8b4024e6a 100644
--- a/shell/platform/fuchsia/flutter/pointer_injector_delegate_unittest.cc
+++ b/shell/platform/fuchsia/flutter/pointer_injector_delegate_unittest.cc
@@ -9,9 +9,9 @@
 #include <lib/async-loop/cpp/loop.h>
 #include <lib/async-loop/default.h>
 #include <lib/async/cpp/task.h>
+#include <lib/zx/eventpair.h>
 
 #include <lib/fidl/cpp/binding_set.h>
-#include <lib/ui/scenic/cpp/view_ref_pair.h>
 
 #include "pointer_injector_delegate.h"
 #include "tests/fakes/mock_injector_registry.h"
@@ -91,13 +91,6 @@ class PlatformMessageBuilder {
     return *this;
   }
 
-  PlatformMessageBuilder& SetViewRefMaybe(std::optional<fuv_ViewRef> view_ref) {
-    if (view_ref.has_value()) {
-      view_ref_ = std::move(*view_ref);
-    }
-    return *this;
-  }
-
   PlatformMessageBuilder& SetLogicalWidth(float width) {
     width_ = width;
     return *this;
@@ -115,11 +108,9 @@ class PlatformMessageBuilder {
 
   rapidjson::Value Build() {
     std::ostringstream message;
-    message << "{"
-            << "    \"method\":\""
+    message << "{" << "    \"method\":\""
             << PointerInjectorDelegate::kPointerInjectorMethodPrefix << "\","
-            << "    \"args\": {"
-            << "        \"viewId\":" << view_id_ << ","
+            << "    \"args\": {" << "        \"viewId\":" << view_id_ << ","
             << "        \"x\":" << pointer_x_ << ","
             << "        \"y\":" << pointer_y_ << ","
             << "        \"phase\":" << phase_ << ","
@@ -128,8 +119,7 @@ class PlatformMessageBuilder {
             << "        \"viewRef\":" << view_ref_.reference.get() << ","
             << "        \"logicalWidth\":" << width_ << ","
             << "        \"logicalHeight\":" << height_ << ","
-            << "        \"timestamp\":" << timestamp_ << "   }"
-            << "}";
+            << "        \"timestamp\":" << timestamp_ << "   }" << "}";
     return ParsePlatformMessage(message.str());
   }
 
@@ -211,9 +201,17 @@ class PointerInjectorDelegateTest : public ::testing::Test,
   }
 
   void SetUp() override {
-    auto view_ref_pair = scenic::ViewRefPair::New();
-
-    host_view_ref_ = std::move(view_ref_pair.view_ref);
+    fuchsia::ui::views::ViewRefControl view_ref_control;
+    fuchsia::ui::views::ViewRef view_ref;
+    auto status = zx::eventpair::create(
+        /*options*/ 0u, &view_ref_control.reference, &view_ref.reference);
+    ASSERT_EQ(status, ZX_OK);
+    view_ref_control.reference.replace(
+        ZX_DEFAULT_EVENTPAIR_RIGHTS & (~ZX_RIGHT_DUPLICATE),
+        &view_ref_control.reference);
+    view_ref.reference.replace(ZX_RIGHTS_BASIC, &view_ref.reference);
+
+    host_view_ref_ = std::move(view_ref);
 
     fup_RegistryHandle registry;
     registry_ = std::make_unique<MockInjectorRegistry>(registry.NewRequest());
@@ -221,31 +219,34 @@ class PointerInjectorDelegateTest : public ::testing::Test,
     fuv_ViewRef host_view_ref_clone;
     fidl::Clone(host_view_ref_, &host_view_ref_clone);
 
-    is_flatland_ = GetParam();
     pointer_injector_delegate_ = std::make_unique<PointerInjectorDelegate>(
-        std::move(registry), std::move(host_view_ref_clone), is_flatland_);
+        std::move(registry), std::move(host_view_ref_clone));
   }
 
   void CreateView(uint64_t view_id,
                   std::optional<fuv_ViewRef> view_ref = std::nullopt) {
-    if (!is_flatland_) {
-      pointer_injector_delegate_->OnCreateView(view_id);
+    fuv_ViewRef ref;
+    if (view_ref.has_value()) {
+      ref = std::move(*view_ref);
     } else {
-      fuv_ViewRef ref;
-      if (view_ref.has_value()) {
-        ref = std::move(*view_ref);
-      } else {
-        auto view_ref_pair = scenic::ViewRefPair::New();
-        ref = std::move(view_ref_pair.view_ref);
-      }
-      pointer_injector_delegate_->OnCreateView(view_id, std::move(ref));
+      fuchsia::ui::views::ViewRefControl view_ref_control;
+      fuchsia::ui::views::ViewRef view_ref;
+      auto status = zx::eventpair::create(
+          /*options*/ 0u, &view_ref_control.reference, &view_ref.reference);
+      ASSERT_EQ(status, ZX_OK);
+      view_ref_control.reference.replace(
+          ZX_DEFAULT_EVENTPAIR_RIGHTS & (~ZX_RIGHT_DUPLICATE),
+          &view_ref_control.reference);
+      view_ref.reference.replace(ZX_RIGHTS_BASIC, &view_ref.reference);
+
+      ref = std::move(view_ref);
     }
+    pointer_injector_delegate_->OnCreateView(view_id, std::move(ref));
   }
 
   std::unique_ptr<PointerInjectorDelegate> pointer_injector_delegate_;
   std::unique_ptr<MockInjectorRegistry> registry_;
   fuv_ViewRef host_view_ref_;
-  bool is_flatland_ = false;
 
  private:
   async::Loop loop_;
@@ -294,25 +295,21 @@ TEST_P(PointerInjectorDelegateTest, ViewsReceiveInjectedEvents) {
 
     CreateView(view_id);
 
-    auto view_ref_pair = scenic::ViewRefPair::New();
+    fuchsia::ui::views::ViewRefControl view_ref_control;
+    fuchsia::ui::views::ViewRef view_ref;
+    auto status = zx::eventpair::create(
+        /*options*/ 0u, &view_ref_control.reference, &view_ref.reference);
+    ASSERT_EQ(status, ZX_OK);
+    view_ref_control.reference.replace(
+        ZX_DEFAULT_EVENTPAIR_RIGHTS & (~ZX_RIGHT_DUPLICATE),
+        &view_ref_control.reference);
+    view_ref.reference.replace(ZX_RIGHTS_BASIC, &view_ref.reference);
 
     for (size_t i = 0; i < num_events; i++) {
       auto response = FakePlatformMessageResponse::Create();
 
-      // Flatland views do not rely on ViewRef to be passed in the platform
-      // message.
-      std::optional<fuv_ViewRef> view_ref_clone;
-      if (fuv_ViewRef temp_ref; !is_flatland_) {
-        fidl::Clone(view_ref_pair.view_ref, &temp_ref);
-        view_ref_clone = std::move(temp_ref);
-      }
-
       EXPECT_TRUE(pointer_injector_delegate_->HandlePlatformMessage(
-          PlatformMessageBuilder()
-              .SetViewId(view_id)
-              .SetViewRefMaybe(std::move(view_ref_clone))
-              .Build(),
-          response));
+          PlatformMessageBuilder().SetViewId(view_id).Build(), response));
 
       response->ExpectCompleted("[0]");
     }
@@ -324,25 +321,21 @@ TEST_P(PointerInjectorDelegateTest, ViewsReceiveInjectedEvents) {
 
     CreateView(view_id);
 
-    auto view_ref_pair = scenic::ViewRefPair::New();
+    fuchsia::ui::views::ViewRefControl view_ref_control;
+    fuchsia::ui::views::ViewRef view_ref;
+    auto status = zx::eventpair::create(
+        /*options*/ 0u, &view_ref_control.reference, &view_ref.reference);
+    ASSERT_EQ(status, ZX_OK);
+    view_ref_control.reference.replace(
+        ZX_DEFAULT_EVENTPAIR_RIGHTS & (~ZX_RIGHT_DUPLICATE),
+        &view_ref_control.reference);
+    view_ref.reference.replace(ZX_RIGHTS_BASIC, &view_ref.reference);
 
     for (size_t i = 0; i < num_events; i++) {
       auto response = FakePlatformMessageResponse::Create();
 
-      // Flatland views do not rely on ViewRef to be passed in the platform
-      // message.
-      std::optional<fuv_ViewRef> view_ref_clone;
-      if (fuv_ViewRef temp_ref; !is_flatland_) {
-        fidl::Clone(view_ref_pair.view_ref, &temp_ref);
-        view_ref_clone = std::move(temp_ref);
-      }
-
       EXPECT_TRUE(pointer_injector_delegate_->HandlePlatformMessage(
-          PlatformMessageBuilder()
-              .SetViewId(view_id)
-              .SetViewRefMaybe(std::move(view_ref_clone))
-              .Build(),
-          response));
+          PlatformMessageBuilder().SetViewId(view_id).Build(), response));
 
       response->ExpectCompleted("[0]");
     }
@@ -365,25 +358,25 @@ TEST_P(PointerInjectorDelegateTest,
 
   // Inject |num_events| platform messages for |view_id_1|.
   {
-    auto view_ref_pair = scenic::ViewRefPair::New();
+    fuchsia::ui::views::ViewRefControl view_ref_control;
+    fuchsia::ui::views::ViewRef view_ref;
+    auto status = zx::eventpair::create(
+        /*options*/ 0u, &view_ref_control.reference, &view_ref.reference);
+    ASSERT_EQ(status, ZX_OK);
+    view_ref_control.reference.replace(
+        ZX_DEFAULT_EVENTPAIR_RIGHTS & (~ZX_RIGHT_DUPLICATE),
+        &view_ref_control.reference);
+    view_ref.reference.replace(ZX_RIGHTS_BASIC, &view_ref.reference);
 
     for (size_t i = 0; i < num_events; i++) {
       auto response = FakePlatformMessageResponse::Create();
 
-      // Flatland views do not rely on ViewRef to be passed in the platform
-      // message.
-      std::optional<fuv_ViewRef> view_ref_clone;
-      if (fuv_ViewRef temp_ref; !is_flatland_) {
-        fidl::Clone(view_ref_pair.view_ref, &temp_ref);
-        view_ref_clone = std::move(temp_ref);
-      }
-
-      EXPECT_FALSE(pointer_injector_delegate_->HandlePlatformMessage(
-          PlatformMessageBuilder()
-              .SetViewId(view_id_1)
-              .SetViewRefMaybe(std::move(view_ref_clone))
-              .Build(),
-          response));
+      // The platform message is *silently* accepted for non-existent views, in
+      // order to cleanly handle the lifecycle case where the child view is
+      // forcibly killed. By doing so, products avoid "MissingPluginException"
+      // log spam.
+      EXPECT_TRUE(pointer_injector_delegate_->HandlePlatformMessage(
+          PlatformMessageBuilder().SetViewId(view_id_1).Build(), response));
     }
   }
 
@@ -391,25 +384,25 @@ TEST_P(PointerInjectorDelegateTest,
 
   // Inject |num_events| platform messages for |view_id_2|.
   {
-    auto view_ref_pair = scenic::ViewRefPair::New();
+    fuchsia::ui::views::ViewRefControl view_ref_control;
+    fuchsia::ui::views::ViewRef view_ref;
+    auto status = zx::eventpair::create(
+        /*options*/ 0u, &view_ref_control.reference, &view_ref.reference);
+    ASSERT_EQ(status, ZX_OK);
+    view_ref_control.reference.replace(
+        ZX_DEFAULT_EVENTPAIR_RIGHTS & (~ZX_RIGHT_DUPLICATE),
+        &view_ref_control.reference);
+    view_ref.reference.replace(ZX_RIGHTS_BASIC, &view_ref.reference);
 
     for (size_t i = 0; i < num_events; i++) {
       auto response = FakePlatformMessageResponse::Create();
 
-      // Flatland views do not rely on ViewRef to be passed in the platform
-      // message.
-      std::optional<fuv_ViewRef> view_ref_clone;
-      if (fuv_ViewRef temp_ref; !is_flatland_) {
-        fidl::Clone(view_ref_pair.view_ref, &temp_ref);
-        view_ref_clone = std::move(temp_ref);
-      }
-
-      EXPECT_FALSE(pointer_injector_delegate_->HandlePlatformMessage(
-          PlatformMessageBuilder()
-              .SetViewId(view_id_2)
-              .SetViewRefMaybe(std::move(view_ref_clone))
-              .Build(),
-          response));
+      // The platform message is *silently* accepted for non-existent views, in
+      // order to cleanly handle the lifecycle case where the child view is
+      // forcibly killed. By doing so, products avoid "MissingPluginException"
+      // log spam.
+      EXPECT_TRUE(pointer_injector_delegate_->HandlePlatformMessage(
+          PlatformMessageBuilder().SetViewId(view_id_2).Build(), response));
     }
   }
 
@@ -429,20 +422,20 @@ TEST_P(PointerInjectorDelegateTest, ValidRegistrationConfigTest) {
 
   auto response = FakePlatformMessageResponse::Create();
 
-  auto view_ref_pair = scenic::ViewRefPair::New();
-  std::optional<fuv_ViewRef> view_ref_clone;
+  fuchsia::ui::views::ViewRefControl view_ref_control;
+  fuchsia::ui::views::ViewRef view_ref;
+  auto status = zx::eventpair::create(
+      /*options*/ 0u, &view_ref_control.reference, &view_ref.reference);
+  ZX_ASSERT(status == ZX_OK);
+  view_ref_control.reference.replace(
+      ZX_DEFAULT_EVENTPAIR_RIGHTS & (~ZX_RIGHT_DUPLICATE),
+      &view_ref_control.reference);
+  view_ref.reference.replace(ZX_RIGHTS_BASIC, &view_ref.reference);
 
   // Create the view.
-  if (!is_flatland_) {
-    CreateView(view_id);
-    fuv_ViewRef temp_ref;
-    fidl::Clone(view_ref_pair.view_ref, &temp_ref);
-    view_ref_clone = std::move(temp_ref);
-  } else {
-    fuv_ViewRef view_ref;
-    fidl::Clone(view_ref_pair.view_ref, &view_ref);
-    CreateView(view_id, std::move(view_ref));
-  }
+  fuv_ViewRef view_ref_clone;
+  fidl::Clone(view_ref, &view_ref_clone);
+  CreateView(view_id, std::move(view_ref_clone));
 
   // Inject a platform message.
   EXPECT_TRUE(pointer_injector_delegate_->HandlePlatformMessage(
@@ -453,7 +446,6 @@ TEST_P(PointerInjectorDelegateTest, ValidRegistrationConfigTest) {
           .SetPhase(phase)
           .SetPointerId(pointer_id)
           .SetTraceFlowId(trace_flow_id)
-          .SetViewRefMaybe(std::move(view_ref_clone))
           .SetLogicalWidth(width)
           .SetLogicalHeight(height)
           .SetTimestamp(timestamp)
@@ -487,8 +479,7 @@ TEST_P(PointerInjectorDelegateTest, ValidRegistrationConfigTest) {
 
   ASSERT_TRUE(config.has_target());
   ASSERT_TRUE(config.target().is_view());
-  EXPECT_EQ(ExtractKoid(config.target().view()),
-            ExtractKoid(view_ref_pair.view_ref));
+  EXPECT_EQ(ExtractKoid(config.target().view()), ExtractKoid(view_ref));
 
   ASSERT_TRUE(config.has_viewport());
   ASSERT_TRUE(config.viewport().has_viewport_to_context_transform());
@@ -509,21 +500,20 @@ TEST_P(PointerInjectorDelegateTest, ValidPointerEventTest) {
 
   auto response = FakePlatformMessageResponse::Create();
 
-  auto view_ref_pair = scenic::ViewRefPair::New();
-
-  std::optional<fuv_ViewRef> view_ref_clone;
+  fuchsia::ui::views::ViewRefControl view_ref_control;
+  fuchsia::ui::views::ViewRef view_ref;
+  auto status = zx::eventpair::create(
+      /*options*/ 0u, &view_ref_control.reference, &view_ref.reference);
+  ZX_ASSERT(status == ZX_OK);
+  view_ref_control.reference.replace(
+      ZX_DEFAULT_EVENTPAIR_RIGHTS & (~ZX_RIGHT_DUPLICATE),
+      &view_ref_control.reference);
+  view_ref.reference.replace(ZX_RIGHTS_BASIC, &view_ref.reference);
 
   // Create the view.
-  if (!is_flatland_) {
-    CreateView(view_id);
-    fuv_ViewRef temp_ref;
-    fidl::Clone(view_ref_pair.view_ref, &temp_ref);
-    view_ref_clone = std::move(temp_ref);
-  } else {
-    fuv_ViewRef view_ref;
-    fidl::Clone(view_ref_pair.view_ref, &view_ref);
-    CreateView(view_id, std::move(view_ref));
-  }
+  fuv_ViewRef view_ref_clone;
+  fidl::Clone(view_ref, &view_ref_clone);
+  CreateView(view_id, std::move(view_ref_clone));
 
   // Inject a platform message.
   EXPECT_TRUE(pointer_injector_delegate_->HandlePlatformMessage(
@@ -534,7 +524,6 @@ TEST_P(PointerInjectorDelegateTest, ValidPointerEventTest) {
           .SetPhase(phase)
           .SetPointerId(pointer_id)
           .SetTraceFlowId(trace_flow_id)
-          .SetViewRefMaybe(std::move(view_ref_clone))
           .SetLogicalWidth(width)
           .SetLogicalHeight(height)
           .SetTimestamp(timestamp)
@@ -580,7 +569,15 @@ TEST_P(PointerInjectorDelegateTest, ValidPointerEventTest) {
 TEST_P(PointerInjectorDelegateTest, DestroyedViewsDontGetPointerEvents) {
   const uint64_t view_id = 1, num_events = 150;
 
-  auto view_ref_pair = scenic::ViewRefPair::New();
+  fuchsia::ui::views::ViewRefControl view_ref_control;
+  fuchsia::ui::views::ViewRef view_ref;
+  auto status = zx::eventpair::create(
+      /*options*/ 0u, &view_ref_control.reference, &view_ref.reference);
+  ZX_ASSERT(status == ZX_OK);
+  view_ref_control.reference.replace(
+      ZX_DEFAULT_EVENTPAIR_RIGHTS & (~ZX_RIGHT_DUPLICATE),
+      &view_ref_control.reference);
+  view_ref.reference.replace(ZX_RIGHTS_BASIC, &view_ref.reference);
 
   // Create the view.
   CreateView(view_id);
@@ -589,20 +586,8 @@ TEST_P(PointerInjectorDelegateTest, DestroyedViewsDontGetPointerEvents) {
   for (size_t i = 0; i < num_events; i++) {
     auto response = FakePlatformMessageResponse::Create();
 
-    // Flatland views do not rely on ViewRef to be passed in the platform
-    // message.
-    std::optional<fuv_ViewRef> view_ref_clone;
-    if (fuv_ViewRef temp_ref; !is_flatland_) {
-      fidl::Clone(view_ref_pair.view_ref, &temp_ref);
-      view_ref_clone = std::move(temp_ref);
-    }
-
     EXPECT_TRUE(pointer_injector_delegate_->HandlePlatformMessage(
-        PlatformMessageBuilder()
-            .SetViewId(view_id)
-            .SetViewRefMaybe(std::move(view_ref_clone))
-            .Build(),
-        response));
+        PlatformMessageBuilder().SetViewId(view_id).Build(), response));
 
     response->ExpectCompleted("[0]");
   }
@@ -623,7 +608,15 @@ TEST_P(PointerInjectorDelegateTest, DestroyedViewsDontGetPointerEvents) {
 TEST_P(PointerInjectorDelegateTest, ViewsGetPointerEventsInFIFO) {
   const uint64_t view_id = 1, num_events = 150;
 
-  auto view_ref_pair = scenic::ViewRefPair::New();
+  fuchsia::ui::views::ViewRefControl view_ref_control;
+  fuchsia::ui::views::ViewRef view_ref;
+  auto status = zx::eventpair::create(
+      /*options*/ 0u, &view_ref_control.reference, &view_ref.reference);
+  ZX_ASSERT(status == ZX_OK);
+  view_ref_control.reference.replace(
+      ZX_DEFAULT_EVENTPAIR_RIGHTS & (~ZX_RIGHT_DUPLICATE),
+      &view_ref_control.reference);
+  view_ref.reference.replace(ZX_RIGHTS_BASIC, &view_ref.reference);
 
   // Create the view.
   CreateView(view_id);
@@ -632,19 +625,10 @@ TEST_P(PointerInjectorDelegateTest, ViewsGetPointerEventsInFIFO) {
   for (size_t i = 0; i < num_events; i++) {
     auto response = FakePlatformMessageResponse::Create();
 
-    // Flatland views do not rely on ViewRef to be passed in the platform
-    // message.
-    std::optional<fuv_ViewRef> view_ref_clone;
-    if (fuv_ViewRef temp_ref; !is_flatland_) {
-      fidl::Clone(view_ref_pair.view_ref, &temp_ref);
-      view_ref_clone = std::move(temp_ref);
-    }
-
     EXPECT_TRUE(pointer_injector_delegate_->HandlePlatformMessage(
         PlatformMessageBuilder()
             .SetViewId(view_id)
             .SetPointerId(static_cast<uint32_t>(i))
-            .SetViewRefMaybe(std::move(view_ref_clone))
             .Build(),
         response));
 
@@ -684,34 +668,28 @@ TEST_P(PointerInjectorDelegateTest, ViewsGetPointerEventsInFIFO) {
 TEST_P(PointerInjectorDelegateTest, DeviceRetriesRegisterWhenClosed) {
   const uint64_t view_id = 1;
   const int pointer_id = 1;
-  auto view_ref_pair = scenic::ViewRefPair::New();
+  fuchsia::ui::views::ViewRefControl view_ref_control;
+  fuchsia::ui::views::ViewRef view_ref;
+  auto status = zx::eventpair::create(
+      /*options*/ 0u, &view_ref_control.reference, &view_ref.reference);
+  ZX_ASSERT(status == ZX_OK);
+  view_ref_control.reference.replace(
+      ZX_DEFAULT_EVENTPAIR_RIGHTS & (~ZX_RIGHT_DUPLICATE),
+      &view_ref_control.reference);
+  view_ref.reference.replace(ZX_RIGHTS_BASIC, &view_ref.reference);
 
   auto response = FakePlatformMessageResponse::Create();
   auto response_2 = FakePlatformMessageResponse::Create();
 
-  std::optional<fuv_ViewRef> view_ref_clone;
-  std::optional<fuv_ViewRef> view_ref_clone_2;
-
   // Create the view.
-  if (!is_flatland_) {
-    CreateView(view_id);
-    fuv_ViewRef temp_ref;
-    fuv_ViewRef temp_ref_2;
-    fidl::Clone(view_ref_pair.view_ref, &temp_ref);
-    fidl::Clone(view_ref_pair.view_ref, &temp_ref_2);
-    view_ref_clone = std::move(temp_ref);
-    view_ref_clone_2 = std::move(temp_ref_2);
-  } else {
-    fuv_ViewRef view_ref;
-    fidl::Clone(view_ref_pair.view_ref, &view_ref);
-    CreateView(view_id, std::move(view_ref));
-  }
+  fuv_ViewRef view_ref_clone;
+  fidl::Clone(view_ref, &view_ref_clone);
+  CreateView(view_id, std::move(view_ref_clone));
 
   EXPECT_TRUE(pointer_injector_delegate_->HandlePlatformMessage(
       PlatformMessageBuilder()
           .SetViewId(view_id)
           .SetPointerId(pointer_id)
-          .SetViewRefMaybe(std::move(view_ref_clone))
           .Build(),
       response));
 
@@ -733,7 +711,6 @@ TEST_P(PointerInjectorDelegateTest, DeviceRetriesRegisterWhenClosed) {
       PlatformMessageBuilder()
           .SetViewId(view_id)
           .SetPointerId(pointer_id)
-          .SetViewRefMaybe(std::move(view_ref_clone_2))
           .Build(),
       response_2));
 
diff --git a/shell/platform/fuchsia/flutter/program_metadata.h b/shell/platform/fuchsia/flutter/program_metadata.h
index 8a57ba1bb73b9b51f3cc5ad153ac46e1ce510444..e7117ed46d9a33e84166e6187464c1d235a1506f 100644
--- a/shell/platform/fuchsia/flutter/program_metadata.h
+++ b/shell/platform/fuchsia/flutter/program_metadata.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_PROGRAM_METADATA_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_PROGRAM_METADATA_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_PROGRAM_METADATA_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_PROGRAM_METADATA_H_
 
 #include <optional>
 #include <string>
@@ -33,4 +33,4 @@ struct ProgramMetadata {
 
 }  // namespace flutter_runner
 
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_PROGRAM_METADATA_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_PROGRAM_METADATA_H_
diff --git a/flow/rtree.cc b/shell/platform/fuchsia/flutter/rtree.cc
similarity index 54%
rename from flow/rtree.cc
rename to shell/platform/fuchsia/flutter/rtree.cc
index a6df0d903c303be63cc5eec0bb308326507d6f2d..c0b1aa3ab08bf09c10f5d09a9b984c7d31cd8bf0 100644
--- a/flow/rtree.cc
+++ b/shell/platform/fuchsia/flutter/rtree.cc
@@ -2,12 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "rtree.h"
+#include "flutter/shell/platform/fuchsia/flutter/rtree.h"
 
 #include <list>
 
+#include "flutter/display_list/geometry/dl_region.h"
 #include "flutter/fml/logging.h"
 #include "third_party/skia/include/core/SkBBHFactory.h"
+#include "third_party/skia/include/core/SkRect.h"
 
 namespace flutter {
 
@@ -40,43 +42,23 @@ std::list<SkRect> RTree::searchNonOverlappingDrawnRects(
   std::vector<int> intermediary_results;
   search(query, &intermediary_results);
 
-  std::list<SkRect> final_results;
+  std::vector<SkIRect> rects;
   for (int index : intermediary_results) {
     auto draw_op = draw_op_.find(index);
     // Ignore records that don't draw anything.
     if (draw_op == draw_op_.end()) {
       continue;
     }
-    auto current_record_rect = draw_op->second;
-    auto replaced_existing_rect = false;
-    // // If the current record rect intersects with any of the rects in the
-    // // result list, then join them, and update the rect in final_results.
-    std::list<SkRect>::iterator curr_rect_itr = final_results.begin();
-    std::list<SkRect>::iterator first_intersecting_rect_itr;
-    while (!replaced_existing_rect && curr_rect_itr != final_results.end()) {
-      if (SkRect::Intersects(*curr_rect_itr, current_record_rect)) {
-        replaced_existing_rect = true;
-        first_intersecting_rect_itr = curr_rect_itr;
-        curr_rect_itr->join(current_record_rect);
-      }
-      curr_rect_itr++;
-    }
-    // It's possible that the result contains duplicated rects at this point.
-    // For example, consider a result list that contains rects A, B. If a
-    // new rect C is a superset of A and B, then A and B are the same set after
-    // the merge. As a result, find such cases and remove them from the result
-    // list.
-    while (replaced_existing_rect && curr_rect_itr != final_results.end()) {
-      if (SkRect::Intersects(*curr_rect_itr, *first_intersecting_rect_itr)) {
-        first_intersecting_rect_itr->join(*curr_rect_itr);
-        curr_rect_itr = final_results.erase(curr_rect_itr);
-      } else {
-        curr_rect_itr++;
-      }
-    }
-    if (!replaced_existing_rect) {
-      final_results.push_back(current_record_rect);
-    }
+    SkIRect current_record_rect;
+    draw_op->second.roundOut(&current_record_rect);
+    rects.push_back(current_record_rect);
+  }
+
+  DlRegion region(rects);
+  auto non_overlapping_rects = region.getRects(true);
+  std::list<SkRect> final_results;
+  for (const auto& rect : non_overlapping_rects) {
+    final_results.push_back(SkRect::Make(rect));
   }
   return final_results;
 }
diff --git a/flow/rtree.h b/shell/platform/fuchsia/flutter/rtree.h
similarity index 91%
rename from flow/rtree.h
rename to shell/platform/fuchsia/flutter/rtree.h
index 35c74137243c8324a584f6e950570570aff75af1..ac5334cbdc8f1970ed548bbedac901e6d1218a5c 100644
--- a/flow/rtree.h
+++ b/shell/platform/fuchsia/flutter/rtree.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_FLOW_RTREE_H_
-#define FLUTTER_FLOW_RTREE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_RTREE_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_RTREE_H_
 
 #include <list>
 #include <map>
@@ -62,4 +62,4 @@ class RTreeFactory : public SkBBHFactory {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_FLOW_RTREE_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_RTREE_H_
diff --git a/flow/rtree_unittests.cc b/shell/platform/fuchsia/flutter/rtree_unittests.cc
similarity index 89%
rename from flow/rtree_unittests.cc
rename to shell/platform/fuchsia/flutter/rtree_unittests.cc
index 1a1498efc8af3eef2a236acdce4d315a90f418a1..80bcb35bbb5d667ec093fc3a540876e445bbd8c6 100644
--- a/flow/rtree_unittests.cc
+++ b/shell/platform/fuchsia/flutter/rtree_unittests.cc
@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "rtree.h"
+#include "flutter/shell/platform/fuchsia/flutter/rtree.h"
 
 #include "flutter/testing/testing.h"
 #include "third_party/skia/include/core/SkCanvas.h"
+#include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 
 namespace flutter {
@@ -123,15 +124,15 @@ TEST(RTree, searchNonOverlappingDrawnRectsJoinRectsWhenIntersectedCase1) {
   rect_paint.setStyle(SkPaint::Style::kFill_Style);
 
   // Given the A, and B rects, which intersect with the query rect,
-  // the result list contains the rect resulting from the union of A and B.
+  // the result list contains the three rectangles covering same area.
   //
-  // +-----+
-  // |  A  |
-  // |   +-----+
-  // |   |  C  |
-  // |   +-----+
-  // |     |
-  // +-----+
+  // +-----+        +-----+
+  // |  A  |        |  A  |
+  // |   +-----+    +---------+
+  // |   |     |    |   B     |
+  // +---|  B  |    +---+-----+
+  //     |     |        |  C  |
+  //     +-----+        +-----+
 
   // A
   recording_canvas->drawRect(SkRect::MakeLTRB(100, 100, 150, 150), rect_paint);
@@ -142,8 +143,10 @@ TEST(RTree, searchNonOverlappingDrawnRectsJoinRectsWhenIntersectedCase1) {
 
   auto hits = rtree_factory.getInstance()->searchNonOverlappingDrawnRects(
       SkRect::MakeXYWH(120, 120, 126, 126));
-  ASSERT_EQ(1UL, hits.size());
-  ASSERT_EQ(*hits.begin(), SkRect::MakeLTRB(100, 100, 175, 175));
+  ASSERT_EQ(3UL, hits.size());
+  ASSERT_EQ(*hits.begin(), SkRect::MakeLTRB(100, 100, 150, 125));
+  ASSERT_EQ(*std::next(hits.begin(), 1), SkRect::MakeLTRB(100, 125, 175, 150));
+  ASSERT_EQ(*std::next(hits.begin(), 2), SkRect::MakeLTRB(125, 150, 175, 175));
 }
 
 TEST(RTree, searchNonOverlappingDrawnRectsJoinRectsWhenIntersectedCase2) {
@@ -198,7 +201,7 @@ TEST(RTree, searchNonOverlappingDrawnRectsJoinRectsWhenIntersectedCase3) {
   rect_paint.setStyle(SkPaint::Style::kFill_Style);
 
   // Given the A, B, C and D rects that intersect with the query rect,
-  // the result list contains a single rect, which is the union of
+  // the result list contains two rects - D and remainder of C
   // these four rects.
   //
   // +------------------------------+
@@ -227,8 +230,9 @@ TEST(RTree, searchNonOverlappingDrawnRectsJoinRectsWhenIntersectedCase3) {
 
   auto hits = rtree_factory.getInstance()->searchNonOverlappingDrawnRects(
       SkRect::MakeLTRB(30, 30, 550, 270));
-  ASSERT_EQ(1UL, hits.size());
-  ASSERT_EQ(*hits.begin(), SkRect::MakeLTRB(50, 50, 620, 300));
+  ASSERT_EQ(2UL, hits.size());
+  ASSERT_EQ(*hits.begin(), SkRect::MakeLTRB(50, 50, 620, 250));
+  ASSERT_EQ(*std::next(hits.begin(), 1), SkRect::MakeLTRB(500, 250, 600, 300));
 }
 
 }  // namespace testing
diff --git a/shell/platform/fuchsia/flutter/runner.cc b/shell/platform/fuchsia/flutter/runner.cc
index 97cb8dda9b8b6b64651af4bf108d13ca9c234659..e5dadc66696236cc813e8fea70982a616a3a7c5a 100644
--- a/shell/platform/fuchsia/flutter/runner.cc
+++ b/shell/platform/fuchsia/flutter/runner.cc
@@ -7,8 +7,11 @@
 #include <fcntl.h>
 #include <fuchsia/mem/cpp/fidl.h>
 #include <lib/async/cpp/task.h>
+#include <lib/async/default.h>
 #include <lib/inspect/cpp/inspect.h>
+#include <lib/sys/cpp/component_context.h>
 #include <lib/trace-engine/instrumentation.h>
+#include <lib/vfs/cpp/pseudo_dir.h>
 #include <zircon/status.h>
 #include <zircon/types.h>
 
@@ -19,8 +22,6 @@
 #include "flutter/fml/make_copyable.h"
 #include "flutter/lib/ui/text/font_collection.h"
 #include "flutter/runtime/dart_vm.h"
-#include "lib/async/default.h"
-#include "lib/sys/cpp/component_context.h"
 #include "runtime/dart/utils/files.h"
 #include "runtime/dart/utils/root_inspect_node.h"
 #include "runtime/dart/utils/vmo.h"
@@ -187,8 +188,6 @@ Runner::Runner(fml::RefPtr<fml::TaskRunner> task_runner,
 
   SetThreadName("io.flutter.runner.main");
 
-  context_->outgoing()->AddPublicService<fuchsia::sys::Runner>(
-      std::bind(&Runner::RegisterComponentV1, this, std::placeholders::_1));
   context_->outgoing()
       ->AddPublicService<fuchsia::component::runner::ComponentRunner>(
           std::bind(&Runner::RegisterComponentV2, this, std::placeholders::_1));
@@ -205,7 +204,6 @@ Runner::Runner(fml::RefPtr<fml::TaskRunner> task_runner,
 }
 
 Runner::~Runner() {
-  context_->outgoing()->RemovePublicService<fuchsia::sys::Runner>();
   context_->outgoing()
       ->RemovePublicService<fuchsia::component::runner::ComponentRunner>();
 
@@ -214,82 +212,6 @@ Runner::~Runner() {
 #endif  // !defined(DART_PRODUCT)
 }
 
-// CF v1 lifecycle methods.
-
-void Runner::RegisterComponentV1(
-    fidl::InterfaceRequest<fuchsia::sys::Runner> request) {
-  active_components_v1_bindings_.AddBinding(this, std::move(request));
-}
-
-void Runner::StartComponent(
-    fuchsia::sys::Package package,
-    fuchsia::sys::StartupInfo startup_info,
-    fidl::InterfaceRequest<fuchsia::sys::ComponentController> controller) {
-  // TRACE_DURATION currently requires that the string data does not change
-  // in the traced scope. Since |package| gets moved in the Component::Create
-  // call below, we cannot ensure that |package.resolved_url| does not move or
-  // change, so we make a copy to pass to TRACE_DURATION.
-  // TODO(PT-169): Remove this copy when TRACE_DURATION reads string arguments
-  // eagerly.
-  std::string url_copy = package.resolved_url;
-  TRACE_EVENT1("flutter", "StartComponent", "url", url_copy.c_str());
-  // Notes on component termination: Components typically terminate on the
-  // thread on which they were created. This usually means the thread was
-  // specifically created to host the component. But we want to ensure that
-  // access to the active components collection is made on the same thread. So
-  // we capture the runner in the termination callback. There is no risk of
-  // there being multiple component runner instances in the process at the same
-  // time. So it is safe to use the raw pointer.
-  ComponentV1::TerminationCallback termination_callback =
-      [component_runner = this](const ComponentV1* component) {
-        component_runner->task_runner_->PostTask(
-            [component_runner, component]() {
-              component_runner->OnComponentV1Terminate(component);
-            });
-      };
-
-  ActiveComponentV1 active_component = ComponentV1::Create(
-      std::move(termination_callback),  // termination callback
-      std::move(package),               // component package
-      std::move(startup_info),          // startup info
-      context_->svc(),                  // runner incoming services
-      std::move(controller)             // controller request
-  );
-
-  auto key = active_component.component.get();
-  active_components_v1_[key] = std::move(active_component);
-}
-
-void Runner::OnComponentV1Terminate(const ComponentV1* component) {
-  auto app = active_components_v1_.find(component);
-  if (app == active_components_v1_.end()) {
-    FML_LOG(INFO)
-        << "The remote end of the component runner tried to terminate an "
-           "component that has already been terminated, possibly because we "
-           "initiated the termination";
-    return;
-  }
-  ActiveComponentV1& active_component = app->second;
-
-  // Grab the items out of the entry because we will have to rethread the
-  // destruction.
-  std::unique_ptr<ComponentV1> component_to_destroy =
-      std::move(active_component.component);
-  std::unique_ptr<fml::Thread> component_thread =
-      std::move(active_component.platform_thread);
-
-  // Delete the entry.
-  active_components_v1_.erase(component);
-
-  // Post the task to destroy the component and quit its message loop.
-  component_thread->GetTaskRunner()->PostTask(fml::MakeCopyable(
-      [instance = std::move(component_to_destroy),
-       thread = component_thread.get()]() mutable { instance.reset(); }));
-
-  // Terminate and join the thread's message loop.
-  component_thread->Join();
-}
-
 // CF v2 lifecycle methods.
 
 void Runner::RegisterComponentV2(
@@ -409,7 +331,6 @@ void Runner::SetupTraceObserver() {
             latch.Wait();
           }
         };
-        write_profile_trace_for_components(runner->active_components_v1_);
         write_profile_trace_for_components(runner->active_components_v2_);
 
         Dart_StopProfiling();
diff --git a/shell/platform/fuchsia/flutter/runner.h b/shell/platform/fuchsia/flutter/runner.h
index 2d5c71146f26045f367fa791a16406c33e7b3702..18c92ec5b099f2870af0d938db3d8bfe9b617819 100644
--- a/shell/platform/fuchsia/flutter/runner.h
+++ b/shell/platform/fuchsia/flutter/runner.h
@@ -2,20 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_RUNNER_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_RUNNER_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_RUNNER_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_RUNNER_H_
 
 #include <memory>
 #include <unordered_map>
 
 #include <fuchsia/component/runner/cpp/fidl.h>
-#include <fuchsia/sys/cpp/fidl.h>
 #include <lib/async-loop/cpp/loop.h>
 #include <lib/sys/cpp/component_context.h>
 #include <lib/trace-engine/instrumentation.h>
 #include <lib/trace/observer.h>
 
-#include "component_v1.h"
 #include "component_v2.h"
 #include "flutter/fml/macros.h"
 #include "fml/memory/ref_ptr.h"
@@ -25,14 +23,13 @@
 
 namespace flutter_runner {
 
-/// Publishes the CF v1 and CF v2 runner services.
+/// Publishes the CF v2 runner service.
 ///
 /// Each component will be run on a separate thread dedicated to that component.
 ///
 /// TODO(fxb/50694): Add unit tests for CF v2.
 class Runner final
-    : public fuchsia::sys::Runner /* CF v1 */,
-      public fuchsia::component::runner::ComponentRunner /* CF v2 */ {
+    : public fuchsia::component::runner::ComponentRunner /* CF v2 */ {
  public:
   // Does not take ownership of context.
   Runner(fml::RefPtr<fml::TaskRunner> task_runner,
@@ -41,25 +38,6 @@ class Runner final
   ~Runner();
 
  private:
-  // CF v1 lifecycle methods.
-  // TODO(fxb/50694) Deprecate these once all Flutter components have been
-  // ported to CF v2.
-
-  // |fuchsia::sys::Runner|
-  void StartComponent(fuchsia::sys::Package package,
-                      fuchsia::sys::StartupInfo startup_info,
-                      fidl::InterfaceRequest<fuchsia::sys::ComponentController>
-                          controller) override;
-
-  /// Registers a new CF v1 component with this runner, binding the component
-  /// to this runner.
-  void RegisterComponentV1(
-      fidl::InterfaceRequest<fuchsia::sys::Runner> request);
-
-  /// Callback that should be fired when a registered CF v2 component is
-  /// terminated.
-  void OnComponentV1Terminate(const ComponentV1* component);
-
   // CF v2 lifecycle methods.
 
   // |fuchsia::component::runner::ComponentRunner|
@@ -97,11 +75,6 @@ class Runner final
 
   sys::ComponentContext* context_;
 
-  // CF v1 component state.
-  fidl::BindingSet<fuchsia::sys::Runner> active_components_v1_bindings_;
-  std::unordered_map<const ComponentV1*, ActiveComponentV1>
-      active_components_v1_;
-
   // CF v2 component state.
 
   /// The components that are currently bound to this runner.
@@ -125,4 +98,4 @@ class Runner final
 
 }  // namespace flutter_runner
 
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_RUNNER_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_RUNNER_H_
diff --git a/shell/platform/fuchsia/flutter/software_surface.cc b/shell/platform/fuchsia/flutter/software_surface.cc
index 307b804d55b5e655a094417283215fca1b7e4c70..1184f63fde0265ba622bec0b21aa34136e971a45 100644
--- a/shell/platform/fuchsia/flutter/software_surface.cc
+++ b/shell/platform/fuchsia/flutter/software_surface.cc
@@ -5,7 +5,6 @@
 #include "software_surface.h"
 
 #include <lib/async/default.h>
-#include <lib/ui/scenic/cpp/commands.h>
 #include <zircon/rights.h>
 #include <zircon/status.h>
 #include <zircon/types.h>
@@ -16,8 +15,10 @@
 #include "flutter/fml/trace_event.h"
 #include "fuchsia/sysmem/cpp/fidl.h"
 #include "include/core/SkImageInfo.h"
+
 #include "third_party/skia/include/core/SkColorSpace.h"
 #include "third_party/skia/include/core/SkImageInfo.h"
+#include "third_party/skia/include/core/SkSurface.h"
 
 #include "../runtime/dart/utils/inlines.h"
 
@@ -44,16 +45,12 @@ uint32_t BytesPerRow(const fuchsia::sysmem::SingleBufferSettings& settings,
 
 }  // namespace
 
-uint32_t SoftwareSurface::sNextBufferId = 1;  // 0 is invalid; start at 1.
-
 SoftwareSurface::SoftwareSurface(
     fuchsia::sysmem::AllocatorSyncPtr& sysmem_allocator,
     fuchsia::ui::composition::AllocatorPtr& flatland_allocator,
-    scenic::Session* session,
     const SkISize& size)
-    : session_(session), wait_for_surface_read_finished_(this) {
-  FML_CHECK((session_ || flatland_allocator.is_bound()) &&
-            !(session_ && flatland_allocator.is_bound()));
+    : wait_for_surface_read_finished_(this) {
+  FML_CHECK(flatland_allocator.is_bound());
 
   if (!SetupSkiaSurface(sysmem_allocator, flatland_allocator, size)) {
     FML_LOG(ERROR) << "Could not create render surface.";
@@ -65,14 +62,6 @@ SoftwareSurface::SoftwareSurface(
     return;
   }
 
-  if (session) {
-    if (image_id_ == 0) {
-      image_id_ = session->AllocResourceId();
-    }
-    session->Enqueue(scenic::NewCreateImage2Cmd(
-        image_id_, sk_surface_->width(), sk_surface_->height(), buffer_id_, 0));
-  }
-
   wait_for_surface_read_finished_.set_object(release_event_.get());
   wait_for_surface_read_finished_.set_trigger(ZX_EVENT_SIGNALED);
   Reset();
@@ -81,16 +70,7 @@ SoftwareSurface::SoftwareSurface(
 }
 
 SoftwareSurface::~SoftwareSurface() {
-  if (session_) {
-    if (image_id_) {
-      session_->Enqueue(scenic::NewReleaseResourceCmd(image_id_));
-    }
-    if (buffer_id_) {
-      session_->DeregisterBufferCollection(buffer_id_);
-    }
-  } else {
-    release_image_callback_();
-  }
+  release_image_callback_();
   wait_for_surface_read_finished_.Cancel();
   wait_for_surface_read_finished_.set_object(ZX_HANDLE_INVALID);
 }
@@ -158,42 +138,34 @@ bool SoftwareSurface::SetupSkiaSurface(
   }
   auto scenic_token = std::move(duplicate_tokens[0]);
 
-  // Register the sysmem token with flatland (or scenic's legacy gfx interface).
+  // Register the sysmem token with flatland.
   //
   // This binds the sysmem token to a composition token, which is used later
   // to associate the rendering surface with a specific flatland Image.
-  //
-  // Under gfx, scenic uses an integral `buffer_id` instead of the composition
-  // token.
-  if (session_) {
-    buffer_id_ = sNextBufferId++;
-    session_->RegisterBufferCollection(buffer_id_, std::move(scenic_token));
-  } else {
-    fuchsia::ui::composition::BufferCollectionExportToken export_token;
-    zx_status_t token_create_status =
-        zx::eventpair::create(0, &export_token.value, &import_token_.value);
-    if (token_create_status != ZX_OK) {
-      FML_LOG(ERROR) << "Failed to create flatland export token: "
-                     << zx_status_get_string(token_create_status);
-      return false;
-    }
-
-    fuchsia::ui::composition::RegisterBufferCollectionArgs args;
-    args.set_export_token(std::move(export_token));
-    args.set_buffer_collection_token(std::move(scenic_token));
-    args.set_usage(
-        fuchsia::ui::composition::RegisterBufferCollectionUsage::DEFAULT);
-    flatland_allocator->RegisterBufferCollection(
-        std::move(args),
-        [](fuchsia::ui::composition::Allocator_RegisterBufferCollection_Result
-               result) {
-          if (result.is_err()) {
-            FML_LOG(ERROR)
-                << "RegisterBufferCollection call to Scenic Allocator failed.";
-          }
-        });
+  fuchsia::ui::composition::BufferCollectionExportToken export_token;
+  zx_status_t token_create_status =
+      zx::eventpair::create(0, &export_token.value, &import_token_.value);
+  if (token_create_status != ZX_OK) {
+    FML_LOG(ERROR) << "Failed to create flatland export token: "
+                   << zx_status_get_string(token_create_status);
+    return false;
   }
 
+  fuchsia::ui::composition::RegisterBufferCollectionArgs args;
+  args.set_export_token(std::move(export_token));
+  args.set_buffer_collection_token(std::move(scenic_token));
+  args.set_usage(
+      fuchsia::ui::composition::RegisterBufferCollectionUsage::DEFAULT);
+  flatland_allocator->RegisterBufferCollection(
+      std::move(args),
+      [](fuchsia::ui::composition::Allocator_RegisterBufferCollection_Result
+             result) {
+        if (result.is_err()) {
+          FML_LOG(ERROR)
+              << "RegisterBufferCollection call to Scenic Allocator failed.";
+        }
+      });
+
   // Acquire flutter's local handle to the sysmem buffer.
   fuchsia::sysmem::BufferCollectionSyncPtr buffer_collection;
   zx_status_t bind_status = sysmem_allocator->BindSharedCollection(
@@ -293,12 +265,12 @@ bool SoftwareSurface::SetupSkiaSurface(
   const size_t vmo_stride =
       BytesPerRow(buffer_collection_info.settings, 4u, size.width());
   SkSurfaceProps sk_surface_props(0, kUnknown_SkPixelGeometry);
-  sk_surface_ = SkSurface::MakeRasterDirect(
+  sk_surface_ = SkSurfaces::WrapPixels(
       SkImageInfo::Make(size, kSkiaColorType, kPremul_SkAlphaType,
                         SkColorSpace::MakeSRGB()),
       vmo_base + vmo_offset, vmo_stride, &sk_surface_props);
   if (!sk_surface_ || sk_surface_->getCanvas() == nullptr) {
-    FML_LOG(ERROR) << "SkSurface::MakeRasterDirect failed.";
+    FML_LOG(ERROR) << "SkSurfaces::WrapPixels failed.";
     return false;
   }
 
@@ -307,7 +279,6 @@ bool SoftwareSurface::SetupSkiaSurface(
 
 void SoftwareSurface::SetImageId(uint32_t image_id) {
   FML_CHECK(image_id_ == 0);
-  FML_CHECK(!session_);
   image_id_ = image_id;
 }
 
@@ -321,28 +292,24 @@ sk_sp<SkSurface> SoftwareSurface::GetSkiaSurface() const {
 
 fuchsia::ui::composition::BufferCollectionImportToken
 SoftwareSurface::GetBufferCollectionImportToken() {
-  FML_CHECK(!session_);
   fuchsia::ui::composition::BufferCollectionImportToken import_dup;
   import_token_.value.duplicate(ZX_RIGHT_SAME_RIGHTS, &import_dup.value);
   return import_dup;
 }
 
 zx::event SoftwareSurface::GetAcquireFence() {
-  FML_CHECK(!session_);
   zx::event fence;
   acquire_event_.duplicate(ZX_RIGHT_SAME_RIGHTS, &fence);
   return fence;
 }
 
 zx::event SoftwareSurface::GetReleaseFence() {
-  FML_CHECK(!session_);
   zx::event fence;
   release_event_.duplicate(ZX_RIGHT_SAME_RIGHTS, &fence);
   return fence;
 }
 void SoftwareSurface::SetReleaseImageCallback(
     ReleaseImageCallback release_image_callback) {
-  FML_CHECK(!session_);
   release_image_callback_ = release_image_callback;
 }
 
@@ -351,16 +318,6 @@ size_t SoftwareSurface::AdvanceAndGetAge() {
 }
 
 bool SoftwareSurface::FlushSessionAcquireAndReleaseEvents() {
-  if (session_) {
-    zx::event acquire, release;
-    if (acquire_event_.duplicate(ZX_RIGHT_SAME_RIGHTS, &acquire) != ZX_OK ||
-        release_event_.duplicate(ZX_RIGHT_SAME_RIGHTS, &release) != ZX_OK) {
-      return false;
-    }
-    session_->EnqueueAcquireFence(std::move(acquire));
-    session_->EnqueueReleaseFence(std::move(release));
-  }
-
   age_ = 0;
   return true;
 }
@@ -374,10 +331,10 @@ void SoftwareSurface::SignalWritesFinished(
     return;
   }
 
-  dart_utils::Check(surface_read_finished_callback_ == nullptr,
-                    "Attempted to signal a write on the surface when the "
-                    "previous write has not yet been acknowledged by the "
-                    "compositor.");
+  FML_CHECK(surface_read_finished_callback_ == nullptr)
+      << "Attempted to signal a write on the surface when the "
+         "previous write has not yet been acknowledged by the "
+         "compositor.";
   surface_read_finished_callback_ = on_surface_read_finished;
 
   // Sysmem *may* require the cache to be cleared after writes to the surface
diff --git a/shell/platform/fuchsia/flutter/software_surface.h b/shell/platform/fuchsia/flutter/software_surface.h
index c1af8fb7156ecdf92dd8cd270ea4f46886200a0f..8ea4c0dffdac0f936090e77cff9db7e03bc53c07 100644
--- a/shell/platform/fuchsia/flutter/software_surface.h
+++ b/shell/platform/fuchsia/flutter/software_surface.h
@@ -2,13 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_SOFTWARE_SURFACE_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_SOFTWARE_SURFACE_H_
 
 #include <fuchsia/sysmem/cpp/fidl.h>
 #include <fuchsia/ui/composition/cpp/fidl.h>
 #include <lib/async/cpp/wait.h>
-#include <lib/ui/scenic/cpp/id.h>
-#include <lib/ui/scenic/cpp/resources.h>
 #include <lib/zx/event.h>
 #include <lib/zx/vmo.h>
 
@@ -28,7 +27,6 @@ class SoftwareSurface final : public SurfaceProducerSurface {
  public:
   SoftwareSurface(fuchsia::sysmem::AllocatorSyncPtr& sysmem_allocator,
                   fuchsia::ui::composition::AllocatorPtr& flatland_allocator,
-                  scenic::Session* session,
                   const SkISize& size);
 
   ~SoftwareSurface() override;
@@ -88,11 +86,7 @@ class SoftwareSurface final : public SurfaceProducerSurface {
   bool CreateFences();
 
   void Reset();
-
-  static uint32_t sNextBufferId;  // For legacy gfx; counter for `buffer_id_`.
-
-  scenic::Session* session_;        // Legacy gfx API endpoint.
-  scenic::ResourceId image_id_{0};  // Legacy gfx image ID.
+  uint32_t image_id_ = 0;
 
   sk_sp<SkSurface> sk_surface_;
 
@@ -105,12 +99,11 @@ class SoftwareSurface final : public SurfaceProducerSurface {
   // `SoftwareSurfaceProducer` to re-use the surface.
   std::function<void()> surface_read_finished_callback_;
   // Called when the surface is destroyed, to allow
-  // `FlatlandExternalViewEmbedder` to release the associated Flatland image.
+  // `ExternalViewEmbedder` to release the associated Flatland image.
   ReleaseImageCallback release_image_callback_;
 
   // Allows Flatland to associate this surface with a Flatland Image.
   fuchsia::ui::composition::BufferCollectionImportToken import_token_;
-  uint32_t buffer_id_{0};    // Legacy gfx version of the import_token_.
   zx::event acquire_event_;  // Signals to scenic that writing is finished.
   zx::event release_event_;  // Signalled by scenic that reading is finished.
   zx::vmo surface_vmo_;      // VMO that is backing the surface memory.
@@ -125,3 +118,5 @@ class SoftwareSurface final : public SurfaceProducerSurface {
 };
 
 }  // namespace flutter_runner
+
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_SOFTWARE_SURFACE_H_
diff --git a/shell/platform/fuchsia/flutter/software_surface_producer.cc b/shell/platform/fuchsia/flutter/software_surface_producer.cc
index 4246ed5653727ef8efce4d471357d1b0dfcc5f6d..d279a92fa777d18b3b66804787d3caaaa699d9d2 100644
--- a/shell/platform/fuchsia/flutter/software_surface_producer.cc
+++ b/shell/platform/fuchsia/flutter/software_surface_producer.cc
@@ -7,7 +7,7 @@
 #include <lib/fdio/directory.h>
 #include <lib/zx/process.h>
 
-#include <algorithm>  // Foor std::remove_if
+#include <algorithm>  // For std::remove_if
 #include <memory>
 #include <string>
 #include <utility>
@@ -47,9 +47,7 @@ zx_koid_t GetCurrentProcessId() {
 
 }  // namespace
 
-SoftwareSurfaceProducer::SoftwareSurfaceProducer(
-    scenic::Session* scenic_session)
-    : scenic_session_(scenic_session) {
+SoftwareSurfaceProducer::SoftwareSurfaceProducer() {
   zx_status_t status = fdio_service_connect(
       "/svc/fuchsia.sysmem.Allocator",
       sysmem_allocator_.NewRequest().TakeChannel().release());
@@ -57,12 +55,10 @@ SoftwareSurfaceProducer::SoftwareSurfaceProducer(
                                         GetCurrentProcessId());
   FML_DCHECK(status == ZX_OK);
 
-  if (!scenic_session_) {
-    status = fdio_service_connect(
-        "/svc/fuchsia.ui.composition.Allocator",
-        flatland_allocator_.NewRequest().TakeChannel().release());
-    FML_DCHECK(status == ZX_OK);
-  }
+  status = fdio_service_connect(
+      "/svc/fuchsia.ui.composition.Allocator",
+      flatland_allocator_.NewRequest().TakeChannel().release());
+  FML_DCHECK(status == ZX_OK);
 
   valid_ = true;
 }
@@ -152,8 +148,8 @@ std::unique_ptr<SoftwareSurface> SoftwareSurfaceProducer::CreateSurface(
     const SkISize& size) {
   TRACE_EVENT2("flutter", "SoftwareSurfacePool::CreateSurface", "width",
                size.width(), "height", size.height());
-  auto surface = std::make_unique<SoftwareSurface>(
-      sysmem_allocator_, flatland_allocator_, scenic_session_, size);
+  auto surface = std::make_unique<SoftwareSurface>(sysmem_allocator_,
+                                                   flatland_allocator_, size);
   if (!surface->IsValid()) {
     FML_LOG(ERROR) << "Created surface is invalid.";
     return nullptr;
diff --git a/shell/platform/fuchsia/flutter/software_surface_producer.h b/shell/platform/fuchsia/flutter/software_surface_producer.h
index 9e0ddbcf276c48880cbd2cf414a98c51c79d625d..af814928d2df5ec79365c2a205ff3b5b31beb42f 100644
--- a/shell/platform/fuchsia/flutter/software_surface_producer.h
+++ b/shell/platform/fuchsia/flutter/software_surface_producer.h
@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_SOFTWARE_SURFACE_PRODUCER_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_SOFTWARE_SURFACE_PRODUCER_H_
 
 #include <fuchsia/sysmem/cpp/fidl.h>
 #include <fuchsia/ui/composition/cpp/fidl.h>
-#include <lib/ui/scenic/cpp/resources.h>
-#include <lib/ui/scenic/cpp/session.h>
 
 #include <unordered_map>
 
@@ -24,7 +23,7 @@ class SoftwareSurfaceProducer final : public SurfaceProducer {
   // If a surface doesn't get used for 3 or more generations, we discard it.
   static constexpr int kMaxSurfaceAge = 3;
 
-  explicit SoftwareSurfaceProducer(scenic::Session* scenic_session);
+  explicit SoftwareSurfaceProducer();
   ~SoftwareSurfaceProducer() override;
 
   bool IsValid() const { return valid_; }
@@ -55,7 +54,6 @@ class SoftwareSurfaceProducer final : public SurfaceProducer {
 
   void TraceStats();
 
-  scenic::Session* scenic_session_;  // Legacy gfx API endpoint.
   fuchsia::sysmem::AllocatorSyncPtr sysmem_allocator_;
   fuchsia::ui::composition::AllocatorPtr flatland_allocator_;
 
@@ -75,3 +73,5 @@ class SoftwareSurfaceProducer final : public SurfaceProducer {
 };
 
 }  // namespace flutter_runner
+
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_SOFTWARE_SURFACE_PRODUCER_H_
diff --git a/shell/platform/fuchsia/flutter/surface.cc b/shell/platform/fuchsia/flutter/surface.cc
index 5b9c5be50e4d0a60f97f2ebc026b2a16e7bdcc6e..49d06f023cbf87fb788f46e1ec0c7822223b246c 100644
--- a/shell/platform/fuchsia/flutter/surface.cc
+++ b/shell/platform/fuchsia/flutter/surface.cc
@@ -34,9 +34,8 @@ std::unique_ptr<flutter::SurfaceFrame> Surface::AcquireFrame(
   framebuffer_info.supports_readback = true;
   return std::make_unique<flutter::SurfaceFrame>(
       nullptr, std::move(framebuffer_info),
-      [](const flutter::SurfaceFrame& surface_frame, SkCanvas* canvas) {
-        return true;
-      },
+      [](const flutter::SurfaceFrame& surface_frame,
+         flutter::DlCanvas* canvas) { return true; },
       size);
 }
 
diff --git a/shell/platform/fuchsia/flutter/surface.h b/shell/platform/fuchsia/flutter/surface.h
index 5d9098fbc6e07ea3ba86000ea00ecc7df5a5bccf..36dffb417c8a1d13b1bb5cd34a6a7615dd7e76e8 100644
--- a/shell/platform/fuchsia/flutter/surface.h
+++ b/shell/platform/fuchsia/flutter/surface.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_SURFACE_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_SURFACE_H_
 
 #include "flutter/flow/surface.h"
 #include "flutter/fml/macros.h"
@@ -43,3 +44,5 @@ class Surface final : public flutter::Surface {
 };
 
 }  // namespace flutter_runner
+
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_SURFACE_H_
diff --git a/shell/platform/fuchsia/flutter/task_runner_adapter.h b/shell/platform/fuchsia/flutter/task_runner_adapter.h
index 649b2a31e4d6c42f44a42f8104bd4ea34e0aca45..dbba873e0c3f44b2320de4439420892bc15c64d3 100644
--- a/shell/platform/fuchsia/flutter/task_runner_adapter.h
+++ b/shell/platform/fuchsia/flutter/task_runner_adapter.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TASK_RUNNER_ADAPTER_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TASK_RUNNER_ADAPTER_H_
 
 #include <lib/async/dispatcher.h>
 
@@ -14,3 +15,5 @@ fml::RefPtr<fml::TaskRunner> CreateFMLTaskRunner(
     async_dispatcher_t* dispatcher);
 
 }  // namespace flutter_runner
+
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TASK_RUNNER_ADAPTER_H_
diff --git a/shell/platform/fuchsia/flutter/tests/flatland_external_view_embedder_unittests.cc b/shell/platform/fuchsia/flutter/tests/external_view_embedder_unittests.cc
similarity index 65%
rename from shell/platform/fuchsia/flutter/tests/flatland_external_view_embedder_unittests.cc
rename to shell/platform/fuchsia/flutter/tests/external_view_embedder_unittests.cc
index eb9b79d46d1118f014afa4a028f458a79c9b6389..bd34c855081248b1cc5989e7854ef9487f7d81be 100644
--- a/shell/platform/fuchsia/flutter/tests/flatland_external_view_embedder_unittests.cc
+++ b/shell/platform/fuchsia/flutter/tests/external_view_embedder_unittests.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/fuchsia/flutter/flatland_external_view_embedder.h"
+#include "flutter/shell/platform/fuchsia/flutter/external_view_embedder.h"
 
 #include <fuchsia/math/cpp/fidl.h>
 #include <fuchsia/sysmem/cpp/fidl.h>
@@ -10,6 +10,7 @@
 #include <fuchsia/ui/views/cpp/fidl.h>
 #include <lib/async-testing/test_loop.h>
 #include <lib/zx/event.h>
+#include <lib/zx/eventpair.h>
 
 #include <cstdint>
 #include <functional>
@@ -38,8 +39,10 @@ using fuchsia::scenic::scheduling::FuturePresentationTimes;
 using fuchsia::scenic::scheduling::PresentReceivedInfo;
 using ::testing::_;
 using ::testing::AllOf;
+using ::testing::Contains;
 using ::testing::ElementsAre;
 using ::testing::Eq;
+using ::testing::Field;
 using ::testing::FieldsAre;
 using ::testing::IsEmpty;
 using ::testing::Matcher;
@@ -55,6 +58,7 @@ constexpr static fuchsia::ui::composition::BlendMode kFirstLayerBlendMode{
     fuchsia::ui::composition::BlendMode::SRC};
 constexpr static fuchsia::ui::composition::BlendMode kUpperLayerBlendMode{
     fuchsia::ui::composition::BlendMode::SRC_OVER};
+constexpr static int64_t kImplicitViewId = 0;
 
 class FakeSurfaceProducerSurface : public SurfaceProducerSurface {
  public:
@@ -65,7 +69,7 @@ class FakeSurfaceProducerSurface : public SurfaceProducerSurface {
       const SkISize& size)
       : sysmem_token_request_(std::move(sysmem_token_request)),
         buffer_import_token_(std::move(buffer_import_token)),
-        surface_(SkSurface::MakeNull(size.width(), size.height())) {
+        surface_(SkSurfaces::Null(size.width(), size.height())) {
     zx_status_t acquire_status = zx::event::create(0, &acquire_fence_);
     if (acquire_status != ZX_OK) {
       FML_LOG(ERROR)
@@ -297,74 +301,93 @@ Matcher<std::shared_ptr<FakeTransform>> IsClipTransformLayer(
       /*content*/ _,
       /*hit_regions*/ _));
 }
+
+Matcher<std::shared_ptr<FakeTransform>> IsInputShield() {
+  return Pointee(AllOf(
+      // Must not clip the hit region.
+      Field("clip_bounds", &FakeTransform::clip_bounds, Eq(std::nullopt)),
+      // Hit region must be "infinite".
+      Field("hit_regions", &FakeTransform::hit_regions,
+            Contains(flutter_runner::testing::kInfiniteHitRegion))));
+}
+
 fuchsia::ui::composition::OnNextFrameBeginValues WithPresentCredits(
     uint32_t additional_present_credits) {
   fuchsia::ui::composition::OnNextFrameBeginValues values;
-
   values.set_additional_present_credits(additional_present_credits);
+  fuchsia::scenic::scheduling::PresentationInfo info_1;
+  info_1.set_presentation_time(123);
+  std::vector<fuchsia::scenic::scheduling::PresentationInfo> infos;
+  infos.push_back(std::move(info_1));
+  values.set_future_presentation_infos(std::move(infos));
   return values;
 }
 
-void DrawSimpleFrame(FlatlandExternalViewEmbedder& external_view_embedder,
+void DrawSimpleFrame(ExternalViewEmbedder& external_view_embedder,
                      SkISize frame_size,
                      float frame_dpr,
-                     std::function<void(SkCanvas*)> draw_callback) {
-  external_view_embedder.BeginFrame(frame_size, nullptr, frame_dpr, nullptr);
+                     std::function<void(flutter::DlCanvas*)> draw_callback) {
+  external_view_embedder.BeginFrame(nullptr, nullptr);
+  external_view_embedder.PrepareFlutterView(frame_size, frame_dpr);
   {
-    SkCanvas* root_canvas = external_view_embedder.GetRootCanvas();
+    flutter::DlCanvas* root_canvas = external_view_embedder.GetRootCanvas();
     external_view_embedder.PostPrerollAction(nullptr);
     draw_callback(root_canvas);
   }
   external_view_embedder.EndFrame(false, nullptr);
   flutter::SurfaceFrame::FramebufferInfo framebuffer_info;
   framebuffer_info.supports_readback = true;
-  external_view_embedder.SubmitFrame(
-      nullptr, std::make_unique<flutter::SurfaceFrame>(
-                   nullptr, std::move(framebuffer_info),
-                   [](const flutter::SurfaceFrame& surface_frame,
-                      SkCanvas* canvas) { return true; },
-                   frame_size));
+  external_view_embedder.SubmitFlutterView(
+      kImplicitViewId, nullptr, nullptr,
+      std::make_unique<flutter::SurfaceFrame>(
+          nullptr, std::move(framebuffer_info),
+          [](const flutter::SurfaceFrame& surface_frame,
+             flutter::DlCanvas* canvas) { return true; },
+          frame_size));
 }
 
-void DrawFrameWithView(FlatlandExternalViewEmbedder& external_view_embedder,
-                       SkISize frame_size,
-                       float frame_dpr,
-                       int view_id,
-                       flutter::EmbeddedViewParams& view_params,
-                       std::function<void(SkCanvas*)> background_draw_callback,
-                       std::function<void(SkCanvas*)> overlay_draw_callback) {
-  external_view_embedder.BeginFrame(frame_size, nullptr, frame_dpr, nullptr);
+void DrawFrameWithView(
+    ExternalViewEmbedder& external_view_embedder,
+    SkISize frame_size,
+    float frame_dpr,
+    int view_id,
+    flutter::EmbeddedViewParams& view_params,
+    std::function<void(flutter::DlCanvas*)> background_draw_callback,
+    std::function<void(flutter::DlCanvas*)> overlay_draw_callback) {
+  external_view_embedder.BeginFrame(nullptr, nullptr);
+  external_view_embedder.PrepareFlutterView(frame_size, frame_dpr);
   {
-    SkCanvas* root_canvas = external_view_embedder.GetRootCanvas();
+    flutter::DlCanvas* root_canvas = external_view_embedder.GetRootCanvas();
     external_view_embedder.PrerollCompositeEmbeddedView(
         view_id, std::make_unique<flutter::EmbeddedViewParams>(view_params));
     external_view_embedder.PostPrerollAction(nullptr);
     background_draw_callback(root_canvas);
-    SkCanvas* overlay_canvas =
-        external_view_embedder.CompositeEmbeddedView(view_id).canvas;
+    flutter::DlCanvas* overlay_canvas =
+        external_view_embedder.CompositeEmbeddedView(view_id);
     overlay_draw_callback(overlay_canvas);
   }
   external_view_embedder.EndFrame(false, nullptr);
   flutter::SurfaceFrame::FramebufferInfo framebuffer_info;
   framebuffer_info.supports_readback = true;
-  external_view_embedder.SubmitFrame(
-      nullptr, std::make_unique<flutter::SurfaceFrame>(
-                   nullptr, std::move(framebuffer_info),
-                   [](const flutter::SurfaceFrame& surface_frame,
-                      SkCanvas* canvas) { return true; },
-                   frame_size));
+  external_view_embedder.SubmitFlutterView(
+      kImplicitViewId, nullptr, nullptr,
+      std::make_unique<flutter::SurfaceFrame>(
+          nullptr, std::move(framebuffer_info),
+          [](const flutter::SurfaceFrame& surface_frame,
+             flutter::DlCanvas* canvas) { return true; },
+          frame_size));
 }
 
 };  // namespace
 
-class FlatlandExternalViewEmbedderTest : public ::testing::Test {
+class ExternalViewEmbedderTest : public ::testing::Test {
  protected:
-  FlatlandExternalViewEmbedderTest()
+  ExternalViewEmbedderTest()
       : session_subloop_(loop_.StartNewLoop()),
         flatland_connection_(CreateFlatlandConnection()),
         fake_surface_producer_(
             std::make_shared<FakeSurfaceProducer>(CreateFlatlandAllocator())) {}
-  ~FlatlandExternalViewEmbedderTest() override = default;
+  ~ExternalViewEmbedderTest() override = default;
 
   async::TestLoop& loop() { return loop_; }
 
@@ -392,15 +415,15 @@ class FlatlandExternalViewEmbedderTest : public ::testing::Test {
     fuchsia::ui::composition::FlatlandHandle flatland =
         fake_flatland_.ConnectFlatland(session_subloop_->dispatcher());
 
-    auto test_name =
+    const auto test_name =
         ::testing::UnitTest::GetInstance()->current_test_info()->name();
     return std::make_shared<FlatlandConnection>(
-        std::move(test_name), std::move(flatland), []() { FAIL(); },
-        [](auto...) {}, 1, fml::TimeDelta::Zero());
+        std::move(test_name), std::move(flatland),
+        /*error_callback=*/[] { FAIL(); }, /*ofpe_callback=*/[](auto...) {});
   }
 
   // Primary loop and subloop for the FakeFlatland instance to process its
-  // messages.  The subloop allocates it's own zx_port_t, allowing us to use a
+  // messages.  The subloop allocates its own zx_port_t, allowing us to use a
   // separate port for each end of the message channel, rather than sharing a
   // single one.  Dual ports allow messages and responses to be intermingled,
   // which is how production code behaves; this improves test realism.
@@ -413,22 +436,31 @@ class FlatlandExternalViewEmbedderTest : public ::testing::Test {
   std::shared_ptr<FakeSurfaceProducer> fake_surface_producer_;
 };
 
-TEST_F(FlatlandExternalViewEmbedderTest, RootScene) {
+TEST_F(ExternalViewEmbedderTest, RootScene) {
   fuchsia::ui::composition::ParentViewportWatcherPtr parent_viewport_watcher;
   fuchsia::ui::views::ViewportCreationToken viewport_creation_token;
   fuchsia::ui::views::ViewCreationToken view_creation_token;
-  fuchsia::ui::views::ViewRef view_ref;
+  fuchsia::ui::views::ViewRef view_ref_clone;
   auto view_creation_token_status = zx::channel::create(
       0u, &viewport_creation_token.value, &view_creation_token.value);
   ASSERT_EQ(view_creation_token_status, ZX_OK);
-  auto view_ref_pair = scenic::ViewRefPair::New();
-  view_ref_pair.view_ref.Clone(&view_ref);
 
-  FlatlandExternalViewEmbedder external_view_embedder(
+  fuchsia::ui::views::ViewRefControl view_ref_control;
+  fuchsia::ui::views::ViewRef view_ref;
+  auto status = zx::eventpair::create(
+      /*options*/ 0u, &view_ref_control.reference, &view_ref.reference);
+  ASSERT_EQ(status, ZX_OK);
+  view_ref_control.reference.replace(
+      ZX_DEFAULT_EVENTPAIR_RIGHTS & (~ZX_RIGHT_DUPLICATE),
+      &view_ref_control.reference);
+  view_ref.reference.replace(ZX_RIGHTS_BASIC, &view_ref.reference);
+  view_ref.Clone(&view_ref_clone);
+
+  ExternalViewEmbedder external_view_embedder(
       std::move(view_creation_token),
       fuchsia::ui::views::ViewIdentityOnCreation{
-          .view_ref = std::move(view_ref_pair.view_ref),
-          .view_ref_control = std::move(view_ref_pair.control_ref),
+          .view_ref = std::move(view_ref),
+          .view_ref_control = std::move(view_ref_control),
       },
       fuchsia::ui::composition::ViewBoundProtocols{},
       parent_viewport_watcher.NewRequest(), flatland_connection(),
@@ -445,27 +477,36 @@ TEST_F(FlatlandExternalViewEmbedderTest, RootScene) {
   loop().RunUntilIdle();
   EXPECT_THAT(fake_flatland().graph(),
               IsFlutterGraph(parent_viewport_watcher, viewport_creation_token,
-                             view_ref));
+                             view_ref_clone));
 }
 
-TEST_F(FlatlandExternalViewEmbedderTest, SimpleScene) {
+TEST_F(ExternalViewEmbedderTest, SimpleScene) {
   fuchsia::ui::composition::ParentViewportWatcherPtr parent_viewport_watcher;
   fuchsia::ui::views::ViewportCreationToken viewport_creation_token;
   fuchsia::ui::views::ViewCreationToken view_creation_token;
-  fuchsia::ui::views::ViewRef view_ref;
+  fuchsia::ui::views::ViewRef view_ref_clone;
   auto view_creation_token_status = zx::channel::create(
       0u, &viewport_creation_token.value, &view_creation_token.value);
   ASSERT_EQ(view_creation_token_status, ZX_OK);
-  auto view_ref_pair = scenic::ViewRefPair::New();
-  view_ref_pair.view_ref.Clone(&view_ref);
 
-  // Create the `FlatlandExternalViewEmbedder` and pump the message loop until
+  fuchsia::ui::views::ViewRefControl view_ref_control;
+  fuchsia::ui::views::ViewRef view_ref;
+  auto status = zx::eventpair::create(
+      /*options*/ 0u, &view_ref_control.reference, &view_ref.reference);
+  ASSERT_EQ(status, ZX_OK);
+  view_ref_control.reference.replace(
+      ZX_DEFAULT_EVENTPAIR_RIGHTS & (~ZX_RIGHT_DUPLICATE),
+      &view_ref_control.reference);
+  view_ref.reference.replace(ZX_RIGHTS_BASIC, &view_ref.reference);
+  view_ref.Clone(&view_ref_clone);
+
+  // Create the `ExternalViewEmbedder` and pump the message loop until
   // the initial scene graph is setup.
-  FlatlandExternalViewEmbedder external_view_embedder(
+  ExternalViewEmbedder external_view_embedder(
       std::move(view_creation_token),
       fuchsia::ui::views::ViewIdentityOnCreation{
-          .view_ref = std::move(view_ref_pair.view_ref),
-          .view_ref_control = std::move(view_ref_pair.control_ref),
+          .view_ref = std::move(view_ref),
+          .view_ref_control = std::move(view_ref_control),
       },
       fuchsia::ui::composition::ViewBoundProtocols{},
       parent_viewport_watcher.NewRequest(), flatland_connection(),
@@ -476,28 +517,30 @@ TEST_F(FlatlandExternalViewEmbedderTest, SimpleScene) {
   loop().RunUntilIdle();
   EXPECT_THAT(fake_flatland().graph(),
               IsFlutterGraph(parent_viewport_watcher, viewport_creation_token,
-                             view_ref));
+                             view_ref_clone));
 
   // Draw the scene.  The scene graph shouldn't change yet.
   const SkISize frame_size_signed = SkISize::Make(512, 512);
   const fuchsia::math::SizeU frame_size{
       static_cast<uint32_t>(frame_size_signed.width()),
       static_cast<uint32_t>(frame_size_signed.height())};
-  DrawSimpleFrame(
-      external_view_embedder, frame_size_signed, 1.f, [](SkCanvas* canvas) {
-        const SkSize canvas_size = SkSize::Make(canvas->imageInfo().width(),
-                                                canvas->imageInfo().height());
-        SkPaint rect_paint;
-        rect_paint.setColor(SK_ColorGREEN);
-        canvas->translate(canvas_size.width() / 4.f,
-                          canvas_size.height() / 2.f);
-        canvas->drawRect(SkRect::MakeWH(canvas_size.width() / 32.f,
-                                        canvas_size.height() / 32.f),
-                         rect_paint);
-      });
+  DrawSimpleFrame(external_view_embedder, frame_size_signed, 1.f,
+                  [](flutter::DlCanvas* canvas) {
+                    const SkISize layer_size = canvas->GetBaseLayerSize();
+                    const SkSize canvas_size =
+                        SkSize::Make(layer_size.width(), layer_size.height());
+                    flutter::DlPaint rect_paint;
+                    rect_paint.setColor(flutter::DlColor::kGreen());
+                    canvas->Translate(canvas_size.width() / 4.f,
+                                      canvas_size.height() / 2.f);
+                    canvas->DrawRect(
+                        SkRect::MakeWH(canvas_size.width() / 32.f,
+                                       canvas_size.height() / 32.f),
+                        rect_paint);
+                  });
   EXPECT_THAT(fake_flatland().graph(),
               IsFlutterGraph(parent_viewport_watcher, viewport_creation_token,
-                             view_ref));
+                             view_ref_clone));
 
   // Pump the message loop. The scene updates should propagate to flatland.
   loop().RunUntilIdle();
@@ -505,7 +548,7 @@ TEST_F(FlatlandExternalViewEmbedderTest, SimpleScene) {
   EXPECT_THAT(
       fake_flatland().graph(),
       IsFlutterGraph(
-          parent_viewport_watcher, viewport_creation_token, view_ref,
+          parent_viewport_watcher, viewport_creation_token, view_ref_clone,
           /*layers*/
           {IsImageLayer(
               frame_size, kFirstLayerBlendMode,
@@ -518,24 +561,33 @@ TEST_F(FlatlandExternalViewEmbedderTest, SimpleScene) {
                   fuchsia::ui::composition::HitTestInteraction::DEFAULT)})}));
 }
 
-TEST_F(FlatlandExternalViewEmbedderTest, SceneWithOneView) {
+TEST_F(ExternalViewEmbedderTest, SceneWithOneView) {
   fuchsia::ui::composition::ParentViewportWatcherPtr parent_viewport_watcher;
   fuchsia::ui::views::ViewportCreationToken viewport_creation_token;
   fuchsia::ui::views::ViewCreationToken view_creation_token;
-  fuchsia::ui::views::ViewRef view_ref;
+  fuchsia::ui::views::ViewRef view_ref_clone;
   auto view_creation_token_status = zx::channel::create(
       0u, &viewport_creation_token.value, &view_creation_token.value);
   ASSERT_EQ(view_creation_token_status, ZX_OK);
-  auto view_ref_pair = scenic::ViewRefPair::New();
-  view_ref_pair.view_ref.Clone(&view_ref);
 
-  // Create the `FlatlandExternalViewEmbedder` and pump the message loop until
+  fuchsia::ui::views::ViewRefControl view_ref_control;
+  fuchsia::ui::views::ViewRef view_ref;
+  auto status = zx::eventpair::create(
+      /*options*/ 0u, &view_ref_control.reference, &view_ref.reference);
+  ASSERT_EQ(status, ZX_OK);
+  view_ref_control.reference.replace(
+      ZX_DEFAULT_EVENTPAIR_RIGHTS & (~ZX_RIGHT_DUPLICATE),
+      &view_ref_control.reference);
+  view_ref.reference.replace(ZX_RIGHTS_BASIC, &view_ref.reference);
+  view_ref.Clone(&view_ref_clone);
+
+  // Create the `ExternalViewEmbedder` and pump the message loop until
   // the initial scene graph is setup.
-  FlatlandExternalViewEmbedder external_view_embedder(
+  ExternalViewEmbedder external_view_embedder(
       std::move(view_creation_token),
       fuchsia::ui::views::ViewIdentityOnCreation{
-          .view_ref = std::move(view_ref_pair.view_ref),
-          .view_ref_control = std::move(view_ref_pair.control_ref),
+          .view_ref = std::move(view_ref),
+          .view_ref_control = std::move(view_ref_control),
       },
       fuchsia::ui::composition::ViewBoundProtocols{},
       parent_viewport_watcher.NewRequest(), flatland_connection(),
@@ -546,7 +598,7 @@ TEST_F(FlatlandExternalViewEmbedderTest, SceneWithOneView) {
   loop().RunUntilIdle();
   EXPECT_THAT(fake_flatland().graph(),
               IsFlutterGraph(parent_viewport_watcher, viewport_creation_token,
-                             view_ref));
+                             view_ref_clone));
 
   // Create the view before drawing the scene.
   const SkSize child_view_size_signed = SkSize::Make(256.f, 512.f);
@@ -596,31 +648,33 @@ TEST_F(FlatlandExternalViewEmbedderTest, SceneWithOneView) {
   DrawFrameWithView(
       external_view_embedder, frame_size_signed, kDPR, child_view_id,
       child_view_params,
-      [](SkCanvas* canvas) {
-        const SkSize canvas_size = SkSize::Make(canvas->imageInfo().width(),
-                                                canvas->imageInfo().height());
-        SkPaint rect_paint;
-        rect_paint.setColor(SK_ColorGREEN);
-        canvas->translate(canvas_size.width() / 4.f,
+      [](flutter::DlCanvas* canvas) {
+        const SkISize layer_size = canvas->GetBaseLayerSize();
+        const SkSize canvas_size =
+            SkSize::Make(layer_size.width(), layer_size.height());
+        flutter::DlPaint rect_paint;
+        rect_paint.setColor(flutter::DlColor::kGreen());
+        canvas->Translate(canvas_size.width() / 4.f,
                           canvas_size.height() / 2.f);
-        canvas->drawRect(SkRect::MakeWH(canvas_size.width() / 32.f,
+        canvas->DrawRect(SkRect::MakeWH(canvas_size.width() / 32.f,
                                         canvas_size.height() / 32.f),
                          rect_paint);
       },
-      [](SkCanvas* canvas) {
-        const SkSize canvas_size = SkSize::Make(canvas->imageInfo().width(),
-                                                canvas->imageInfo().height());
-        SkPaint rect_paint;
-        rect_paint.setColor(SK_ColorRED);
-        canvas->translate(canvas_size.width() * 3.f / 4.f,
+      [](flutter::DlCanvas* canvas) {
+        const SkISize layer_size = canvas->GetBaseLayerSize();
+        const SkSize canvas_size =
+            SkSize::Make(layer_size.width(), layer_size.height());
+        flutter::DlPaint rect_paint;
+        rect_paint.setColor(flutter::DlColor::kRed());
+        canvas->Translate(canvas_size.width() * 3.f / 4.f,
                           canvas_size.height() / 2.f);
-        canvas->drawRect(SkRect::MakeWH(canvas_size.width() / 32.f,
+        canvas->DrawRect(SkRect::MakeWH(canvas_size.width() / 32.f,
                                         canvas_size.height() / 32.f),
                          rect_paint);
       });
   EXPECT_THAT(fake_flatland().graph(),
               IsFlutterGraph(parent_viewport_watcher, viewport_creation_token,
-                             view_ref));
+                             view_ref_clone));
 
   // Pump the message loop.  The scene updates should propagate to flatland.
   loop().RunUntilIdle();
@@ -630,7 +684,8 @@ TEST_F(FlatlandExternalViewEmbedderTest, SceneWithOneView) {
   EXPECT_THAT(
       fake_flatland().graph(),
       IsFlutterGraph(
-          parent_viewport_watcher, viewport_creation_token, view_ref, /*layers*/
+          parent_viewport_watcher, viewport_creation_token,
+          view_ref_clone, /*layers*/
           {IsImageLayer(
                frame_size, kFirstLayerBlendMode,
                {IsHitRegion(
@@ -659,7 +714,8 @@ TEST_F(FlatlandExternalViewEmbedderTest, SceneWithOneView) {
   EXPECT_THAT(
       fake_flatland().graph(),
       IsFlutterGraph(
-          parent_viewport_watcher, viewport_creation_token, view_ref, /*layers*/
+          parent_viewport_watcher, viewport_creation_token,
+          view_ref_clone, /*layers*/
           {IsImageLayer(
                frame_size, kFirstLayerBlendMode,
                {IsHitRegion(
@@ -683,22 +739,25 @@ TEST_F(FlatlandExternalViewEmbedderTest, SceneWithOneView) {
           {kInvDPR, kInvDPR}));
 
   // Draw another frame without the view.  The scene graph shouldn't change yet.
-  DrawSimpleFrame(
-      external_view_embedder, frame_size_signed, 1.f, [](SkCanvas* canvas) {
-        const SkSize canvas_size = SkSize::Make(canvas->imageInfo().width(),
-                                                canvas->imageInfo().height());
-        SkPaint rect_paint;
-        rect_paint.setColor(SK_ColorGREEN);
-        canvas->translate(canvas_size.width() / 4.f,
-                          canvas_size.height() / 2.f);
-        canvas->drawRect(SkRect::MakeWH(canvas_size.width() / 32.f,
-                                        canvas_size.height() / 32.f),
-                         rect_paint);
-      });
+  DrawSimpleFrame(external_view_embedder, frame_size_signed, 1.f,
+                  [](flutter::DlCanvas* canvas) {
+                    const SkISize layer_size = canvas->GetBaseLayerSize();
+                    const SkSize canvas_size =
+                        SkSize::Make(layer_size.width(), layer_size.height());
+                    flutter::DlPaint rect_paint;
+                    rect_paint.setColor(flutter::DlColor::kGreen());
+                    canvas->Translate(canvas_size.width() / 4.f,
+                                      canvas_size.height() / 2.f);
+                    canvas->DrawRect(
+                        SkRect::MakeWH(canvas_size.width() / 32.f,
+                                       canvas_size.height() / 32.f),
+                        rect_paint);
+                  });
   EXPECT_THAT(
       fake_flatland().graph(),
       IsFlutterGraph(
-          parent_viewport_watcher, viewport_creation_token, view_ref, /*layers*/
+          parent_viewport_watcher, viewport_creation_token,
+          view_ref_clone, /*layers*/
           {IsImageLayer(
                frame_size, kFirstLayerBlendMode,
                {IsHitRegion(
@@ -726,7 +785,8 @@ TEST_F(FlatlandExternalViewEmbedderTest, SceneWithOneView) {
   EXPECT_THAT(
       fake_flatland().graph(),
       IsFlutterGraph(
-          parent_viewport_watcher, viewport_creation_token, view_ref, /*layers*/
+          parent_viewport_watcher, viewport_creation_token,
+          view_ref_clone, /*layers*/
           {IsImageLayer(
               frame_size, kFirstLayerBlendMode,
               {IsHitRegion(
@@ -738,24 +798,33 @@ TEST_F(FlatlandExternalViewEmbedderTest, SceneWithOneView) {
                   fuchsia::ui::composition::HitTestInteraction::DEFAULT)})}));
 }
 
-TEST_F(FlatlandExternalViewEmbedderTest, SceneWithOneClippedView) {
+TEST_F(ExternalViewEmbedderTest, SceneWithOneClippedView) {
   fuchsia::ui::composition::ParentViewportWatcherPtr parent_viewport_watcher;
   fuchsia::ui::views::ViewportCreationToken viewport_creation_token;
   fuchsia::ui::views::ViewCreationToken view_creation_token;
-  fuchsia::ui::views::ViewRef view_ref;
+  fuchsia::ui::views::ViewRef view_ref_clone;
   auto view_creation_token_status = zx::channel::create(
       0u, &viewport_creation_token.value, &view_creation_token.value);
   ASSERT_EQ(view_creation_token_status, ZX_OK);
-  auto view_ref_pair = scenic::ViewRefPair::New();
-  view_ref_pair.view_ref.Clone(&view_ref);
 
-  // Create the `FlatlandExternalViewEmbedder` and pump the message loop until
+  fuchsia::ui::views::ViewRefControl view_ref_control;
+  fuchsia::ui::views::ViewRef view_ref;
+  auto status = zx::eventpair::create(
+      /*options*/ 0u, &view_ref_control.reference, &view_ref.reference);
+  ASSERT_EQ(status, ZX_OK);
+  view_ref_control.reference.replace(
+      ZX_DEFAULT_EVENTPAIR_RIGHTS & (~ZX_RIGHT_DUPLICATE),
+      &view_ref_control.reference);
+  view_ref.reference.replace(ZX_RIGHTS_BASIC, &view_ref.reference);
+  view_ref.Clone(&view_ref_clone);
+
+  // Create the `ExternalViewEmbedder` and pump the message loop until
   // the initial scene graph is setup.
-  FlatlandExternalViewEmbedder external_view_embedder(
+  ExternalViewEmbedder external_view_embedder(
       std::move(view_creation_token),
       fuchsia::ui::views::ViewIdentityOnCreation{
-          .view_ref = std::move(view_ref_pair.view_ref),
-          .view_ref_control = std::move(view_ref_pair.control_ref),
+          .view_ref = std::move(view_ref),
+          .view_ref_control = std::move(view_ref_control),
       },
       fuchsia::ui::composition::ViewBoundProtocols{},
       parent_viewport_watcher.NewRequest(), flatland_connection(),
@@ -766,7 +835,7 @@ TEST_F(FlatlandExternalViewEmbedderTest, SceneWithOneClippedView) {
   loop().RunUntilIdle();
   EXPECT_THAT(fake_flatland().graph(),
               IsFlutterGraph(parent_viewport_watcher, viewport_creation_token,
-                             view_ref));
+                             view_ref_clone));
 
   // Create the view before drawing the scene.
   const SkSize child_view_size_signed = SkSize::Make(256.f, 512.f);
@@ -829,31 +898,33 @@ TEST_F(FlatlandExternalViewEmbedderTest, SceneWithOneClippedView) {
   DrawFrameWithView(
       external_view_embedder, frame_size_signed, kDPR, child_view_id,
       child_view_params,
-      [](SkCanvas* canvas) {
-        const SkSize canvas_size = SkSize::Make(canvas->imageInfo().width(),
-                                                canvas->imageInfo().height());
-        SkPaint rect_paint;
-        rect_paint.setColor(SK_ColorGREEN);
-        canvas->translate(canvas_size.width() / 4.f,
+      [](flutter::DlCanvas* canvas) {
+        const SkISize layer_size = canvas->GetBaseLayerSize();
+        const SkSize canvas_size =
+            SkSize::Make(layer_size.width(), layer_size.height());
+        flutter::DlPaint rect_paint;
+        rect_paint.setColor(flutter::DlColor::kGreen());
+        canvas->Translate(canvas_size.width() / 4.f,
                           canvas_size.height() / 2.f);
-        canvas->drawRect(SkRect::MakeWH(canvas_size.width() / 32.f,
+        canvas->DrawRect(SkRect::MakeWH(canvas_size.width() / 32.f,
                                         canvas_size.height() / 32.f),
                          rect_paint);
       },
-      [](SkCanvas* canvas) {
-        const SkSize canvas_size = SkSize::Make(canvas->imageInfo().width(),
-                                                canvas->imageInfo().height());
-        SkPaint rect_paint;
-        rect_paint.setColor(SK_ColorRED);
-        canvas->translate(canvas_size.width() * 3.f / 4.f,
+      [](flutter::DlCanvas* canvas) {
+        const SkISize layer_size = canvas->GetBaseLayerSize();
+        const SkSize canvas_size =
+            SkSize::Make(layer_size.width(), layer_size.height());
+        flutter::DlPaint rect_paint;
+        rect_paint.setColor(flutter::DlColor::kRed());
+        canvas->Translate(canvas_size.width() * 3.f / 4.f,
                           canvas_size.height() / 2.f);
-        canvas->drawRect(SkRect::MakeWH(canvas_size.width() / 32.f,
+        canvas->DrawRect(SkRect::MakeWH(canvas_size.width() / 32.f,
                                         canvas_size.height() / 32.f),
                          rect_paint);
       });
   EXPECT_THAT(fake_flatland().graph(),
               IsFlutterGraph(parent_viewport_watcher, viewport_creation_token,
-                             view_ref));
+                             view_ref_clone));
 
   // Pump the message loop.  The scene updates should propagate to flatland.
   loop().RunUntilIdle();
@@ -863,7 +934,8 @@ TEST_F(FlatlandExternalViewEmbedderTest, SceneWithOneClippedView) {
   EXPECT_THAT(
       fake_flatland().graph(),
       IsFlutterGraph(
-          parent_viewport_watcher, viewport_creation_token, view_ref, /*layers*/
+          parent_viewport_watcher, viewport_creation_token,
+          view_ref_clone, /*layers*/
           {IsImageLayer(
                frame_size, kFirstLayerBlendMode,
                {IsHitRegion(
@@ -902,25 +974,27 @@ TEST_F(FlatlandExternalViewEmbedderTest, SceneWithOneClippedView) {
   DrawFrameWithView(
       external_view_embedder, frame_size_signed, kDPR, child_view_id,
       new_child_view_params,
-      [](SkCanvas* canvas) {
-        const SkSize canvas_size = SkSize::Make(canvas->imageInfo().width(),
-                                                canvas->imageInfo().height());
-        SkPaint rect_paint;
-        rect_paint.setColor(SK_ColorGREEN);
-        canvas->translate(canvas_size.width() / 4.f,
+      [](flutter::DlCanvas* canvas) {
+        const SkISize layer_size = canvas->GetBaseLayerSize();
+        const SkSize canvas_size =
+            SkSize::Make(layer_size.width(), layer_size.height());
+        flutter::DlPaint rect_paint;
+        rect_paint.setColor(flutter::DlColor::kGreen());
+        canvas->Translate(canvas_size.width() / 4.f,
                           canvas_size.height() / 2.f);
-        canvas->drawRect(SkRect::MakeWH(canvas_size.width() / 32.f,
+        canvas->DrawRect(SkRect::MakeWH(canvas_size.width() / 32.f,
                                         canvas_size.height() / 32.f),
                          rect_paint);
       },
-      [](SkCanvas* canvas) {
-        const SkSize canvas_size = SkSize::Make(canvas->imageInfo().width(),
-                                                canvas->imageInfo().height());
-        SkPaint rect_paint;
-        rect_paint.setColor(SK_ColorRED);
-        canvas->translate(canvas_size.width() * 3.f / 4.f,
+      [](flutter::DlCanvas* canvas) {
+        const SkISize layer_size = canvas->GetBaseLayerSize();
+        const SkSize canvas_size =
+            SkSize::Make(layer_size.width(), layer_size.height());
+        flutter::DlPaint rect_paint;
+        rect_paint.setColor(flutter::DlColor::kRed());
+        canvas->Translate(canvas_size.width() * 3.f / 4.f,
                           canvas_size.height() / 2.f);
-        canvas->drawRect(SkRect::MakeWH(canvas_size.width() / 32.f,
+        canvas->DrawRect(SkRect::MakeWH(canvas_size.width() / 32.f,
                                         canvas_size.height() / 32.f),
                          rect_paint);
       });
@@ -930,7 +1004,8 @@ TEST_F(FlatlandExternalViewEmbedderTest, SceneWithOneClippedView) {
   EXPECT_THAT(
       fake_flatland().graph(),
       IsFlutterGraph(
-          parent_viewport_watcher, viewport_creation_token, view_ref, /*layers*/
+          parent_viewport_watcher, viewport_creation_token,
+          view_ref_clone, /*layers*/
           {IsImageLayer(
                frame_size, kFirstLayerBlendMode,
                {IsHitRegion(
@@ -956,23 +1031,26 @@ TEST_F(FlatlandExternalViewEmbedderTest, SceneWithOneClippedView) {
   // Destroy the view and draw another frame without the view.
   external_view_embedder.DestroyView(
       child_view_id, [](fuchsia::ui::composition::ContentId) {});
-  DrawSimpleFrame(
-      external_view_embedder, frame_size_signed, 1.f, [](SkCanvas* canvas) {
-        const SkSize canvas_size = SkSize::Make(canvas->imageInfo().width(),
-                                                canvas->imageInfo().height());
-        SkPaint rect_paint;
-        rect_paint.setColor(SK_ColorGREEN);
-        canvas->translate(canvas_size.width() / 4.f,
-                          canvas_size.height() / 2.f);
-        canvas->drawRect(SkRect::MakeWH(canvas_size.width() / 32.f,
-                                        canvas_size.height() / 32.f),
-                         rect_paint);
-      });
+  DrawSimpleFrame(external_view_embedder, frame_size_signed, 1.f,
+                  [](flutter::DlCanvas* canvas) {
+                    const SkISize layer_size = canvas->GetBaseLayerSize();
+                    const SkSize canvas_size =
+                        SkSize::Make(layer_size.width(), layer_size.height());
+                    flutter::DlPaint rect_paint;
+                    rect_paint.setColor(flutter::DlColor::kGreen());
+                    canvas->Translate(canvas_size.width() / 4.f,
+                                      canvas_size.height() / 2.f);
+                    canvas->DrawRect(
+                        SkRect::MakeWH(canvas_size.width() / 32.f,
+                                       canvas_size.height() / 32.f),
+                        rect_paint);
+                  });
   loop().RunUntilIdle();
   EXPECT_THAT(
       fake_flatland().graph(),
       IsFlutterGraph(
-          parent_viewport_watcher, viewport_creation_token, view_ref, /*layers*/
+          parent_viewport_watcher, viewport_creation_token,
+          view_ref_clone, /*layers*/
           {IsImageLayer(
               frame_size, kFirstLayerBlendMode,
               {IsHitRegion(
@@ -984,24 +1062,33 @@ TEST_F(FlatlandExternalViewEmbedderTest, SceneWithOneClippedView) {
                   fuchsia::ui::composition::HitTestInteraction::DEFAULT)})}));
 }
 
-TEST_F(FlatlandExternalViewEmbedderTest, SceneWithOneView_NoOverlay) {
+TEST_F(ExternalViewEmbedderTest, SceneWithOneView_NoOverlay) {
   fuchsia::ui::composition::ParentViewportWatcherPtr parent_viewport_watcher;
   fuchsia::ui::views::ViewportCreationToken viewport_creation_token;
   fuchsia::ui::views::ViewCreationToken view_creation_token;
-  fuchsia::ui::views::ViewRef view_ref;
+  fuchsia::ui::views::ViewRef view_ref_clone;
   auto view_creation_token_status = zx::channel::create(
       0u, &viewport_creation_token.value, &view_creation_token.value);
   ASSERT_EQ(view_creation_token_status, ZX_OK);
-  auto view_ref_pair = scenic::ViewRefPair::New();
-  view_ref_pair.view_ref.Clone(&view_ref);
 
-  // Create the `FlatlandExternalViewEmbedder` and pump the message loop until
+  fuchsia::ui::views::ViewRefControl view_ref_control;
+  fuchsia::ui::views::ViewRef view_ref;
+  auto status = zx::eventpair::create(
+      /*options*/ 0u, &view_ref_control.reference, &view_ref.reference);
+  ASSERT_EQ(status, ZX_OK);
+  view_ref_control.reference.replace(
+      ZX_DEFAULT_EVENTPAIR_RIGHTS & (~ZX_RIGHT_DUPLICATE),
+      &view_ref_control.reference);
+  view_ref.reference.replace(ZX_RIGHTS_BASIC, &view_ref.reference);
+  view_ref.Clone(&view_ref_clone);
+
+  // Create the `ExternalViewEmbedder` and pump the message loop until
   // the initial scene graph is setup.
-  FlatlandExternalViewEmbedder external_view_embedder(
+  ExternalViewEmbedder external_view_embedder(
       std::move(view_creation_token),
       fuchsia::ui::views::ViewIdentityOnCreation{
-          .view_ref = std::move(view_ref_pair.view_ref),
-          .view_ref_control = std::move(view_ref_pair.control_ref),
+          .view_ref = std::move(view_ref),
+          .view_ref_control = std::move(view_ref_control),
       },
       fuchsia::ui::composition::ViewBoundProtocols{},
       parent_viewport_watcher.NewRequest(), flatland_connection(),
@@ -1012,7 +1099,7 @@ TEST_F(FlatlandExternalViewEmbedderTest, SceneWithOneView_NoOverlay) {
   loop().RunUntilIdle();
   EXPECT_THAT(fake_flatland().graph(),
               IsFlutterGraph(parent_viewport_watcher, viewport_creation_token,
-                             view_ref));
+                             view_ref_clone));
 
   // Create the view before drawing the scene.
   const SkSize child_view_size_signed = SkSize::Make(256.f, 512.f);
@@ -1049,21 +1136,22 @@ TEST_F(FlatlandExternalViewEmbedderTest, SceneWithOneView_NoOverlay) {
   DrawFrameWithView(
       external_view_embedder, frame_size_signed, 1.f, child_view_id,
       child_view_params,
-      [](SkCanvas* canvas) {
-        const SkSize canvas_size = SkSize::Make(canvas->imageInfo().width(),
-                                                canvas->imageInfo().height());
-        SkPaint rect_paint;
-        rect_paint.setColor(SK_ColorGREEN);
-        canvas->translate(canvas_size.width() / 4.f,
+      [](flutter::DlCanvas* canvas) {
+        const SkISize layer_size = canvas->GetBaseLayerSize();
+        const SkSize canvas_size =
+            SkSize::Make(layer_size.width(), layer_size.height());
+        flutter::DlPaint rect_paint;
+        rect_paint.setColor(flutter::DlColor::kGreen());
+        canvas->Translate(canvas_size.width() / 4.f,
                           canvas_size.height() / 2.f);
-        canvas->drawRect(SkRect::MakeWH(canvas_size.width() / 32.f,
+        canvas->DrawRect(SkRect::MakeWH(canvas_size.width() / 32.f,
                                         canvas_size.height() / 32.f),
                          rect_paint);
       },
-      [](SkCanvas* canvas) {});
+      [](flutter::DlCanvas* canvas) {});
   EXPECT_THAT(fake_flatland().graph(),
               IsFlutterGraph(parent_viewport_watcher, viewport_creation_token,
-                             view_ref));
+                             view_ref_clone));
 
   // Pump the message loop.  The scene updates should propagate to flatland.
   loop().RunUntilIdle();
@@ -1072,7 +1160,8 @@ TEST_F(FlatlandExternalViewEmbedderTest, SceneWithOneView_NoOverlay) {
   EXPECT_THAT(
       fake_flatland().graph(),
       IsFlutterGraph(
-          parent_viewport_watcher, viewport_creation_token, view_ref, /*layers*/
+          parent_viewport_watcher, viewport_creation_token,
+          view_ref_clone, /*layers*/
           {IsImageLayer(
                frame_size, kFirstLayerBlendMode,
                {IsHitRegion(
@@ -1092,7 +1181,8 @@ TEST_F(FlatlandExternalViewEmbedderTest, SceneWithOneView_NoOverlay) {
   EXPECT_THAT(
       fake_flatland().graph(),
       IsFlutterGraph(
-          parent_viewport_watcher, viewport_creation_token, view_ref, /*layers*/
+          parent_viewport_watcher, viewport_creation_token,
+          view_ref_clone, /*layers*/
           {IsImageLayer(
                frame_size, kFirstLayerBlendMode,
                {IsHitRegion(
@@ -1107,23 +1197,26 @@ TEST_F(FlatlandExternalViewEmbedderTest, SceneWithOneView_NoOverlay) {
                            kOpacityFloat)}));
 
   // Draw another frame without the view.  The scene graph shouldn't change yet.
-  DrawSimpleFrame(
-      external_view_embedder, frame_size_signed, 1.f, [](SkCanvas* canvas) {
-        const SkSize canvas_size = SkSize::Make(canvas->imageInfo().width(),
-                                                canvas->imageInfo().height());
-        SkPaint rect_paint;
-        rect_paint.setColor(SK_ColorGREEN);
-        canvas->translate(canvas_size.width() / 4.f,
-                          canvas_size.height() / 2.f);
-        canvas->drawRect(SkRect::MakeWH(canvas_size.width() / 32.f,
-                                        canvas_size.height() / 32.f),
-                         rect_paint);
-      });
+  DrawSimpleFrame(external_view_embedder, frame_size_signed, 1.f,
+                  [](flutter::DlCanvas* canvas) {
+                    const SkISize layer_size = canvas->GetBaseLayerSize();
+                    const SkSize canvas_size =
+                        SkSize::Make(layer_size.width(), layer_size.height());
+                    flutter::DlPaint rect_paint;
+                    rect_paint.setColor(flutter::DlColor::kGreen());
+                    canvas->Translate(canvas_size.width() / 4.f,
+                                      canvas_size.height() / 2.f);
+                    canvas->DrawRect(
+                        SkRect::MakeWH(canvas_size.width() / 32.f,
+                                       canvas_size.height() / 32.f),
+                        rect_paint);
+                  });
 
   EXPECT_THAT(
       fake_flatland().graph(),
       IsFlutterGraph(
-          parent_viewport_watcher, viewport_creation_token, view_ref, /*layers*/
+          parent_viewport_watcher, viewport_creation_token,
+          view_ref_clone, /*layers*/
           {IsImageLayer(
                frame_size, kFirstLayerBlendMode,
                {IsHitRegion(
@@ -1142,7 +1235,8 @@ TEST_F(FlatlandExternalViewEmbedderTest, SceneWithOneView_NoOverlay) {
   EXPECT_THAT(
       fake_flatland().graph(),
       IsFlutterGraph(
-          parent_viewport_watcher, viewport_creation_token, view_ref, /*layers*/
+          parent_viewport_watcher, viewport_creation_token,
+          view_ref_clone, /*layers*/
           {IsImageLayer(
               frame_size, kFirstLayerBlendMode,
               {IsHitRegion(
@@ -1154,25 +1248,33 @@ TEST_F(FlatlandExternalViewEmbedderTest, SceneWithOneView_NoOverlay) {
                   fuchsia::ui::composition::HitTestInteraction::DEFAULT)})}));
 }
 
-TEST_F(FlatlandExternalViewEmbedderTest,
-       SceneWithOneView_DestroyBeforeDrawing) {
+TEST_F(ExternalViewEmbedderTest, SceneWithOneView_DestroyBeforeDrawing) {
   fuchsia::ui::composition::ParentViewportWatcherPtr parent_viewport_watcher;
   fuchsia::ui::views::ViewportCreationToken viewport_creation_token;
   fuchsia::ui::views::ViewCreationToken view_creation_token;
-  fuchsia::ui::views::ViewRef view_ref;
+  fuchsia::ui::views::ViewRef view_ref_clone;
   auto view_creation_token_status = zx::channel::create(
       0u, &viewport_creation_token.value, &view_creation_token.value);
   ASSERT_EQ(view_creation_token_status, ZX_OK);
-  auto view_ref_pair = scenic::ViewRefPair::New();
-  view_ref_pair.view_ref.Clone(&view_ref);
 
-  // Create the `FlatlandExternalViewEmbedder` and pump the message loop until
+  fuchsia::ui::views::ViewRefControl view_ref_control;
+  fuchsia::ui::views::ViewRef view_ref;
+  auto status = zx::eventpair::create(
+      /*options*/ 0u, &view_ref_control.reference, &view_ref.reference);
+  ASSERT_EQ(status, ZX_OK);
+  view_ref_control.reference.replace(
+      ZX_DEFAULT_EVENTPAIR_RIGHTS & (~ZX_RIGHT_DUPLICATE),
+      &view_ref_control.reference);
+  view_ref.reference.replace(ZX_RIGHTS_BASIC, &view_ref.reference);
+  view_ref.Clone(&view_ref_clone);
+
+  // Create the `ExternalViewEmbedder` and pump the message loop until
   // the initial scene graph is setup.
-  FlatlandExternalViewEmbedder external_view_embedder(
+  ExternalViewEmbedder external_view_embedder(
       std::move(view_creation_token),
       fuchsia::ui::views::ViewIdentityOnCreation{
-          .view_ref = std::move(view_ref_pair.view_ref),
-          .view_ref_control = std::move(view_ref_pair.control_ref),
+          .view_ref = std::move(view_ref),
+          .view_ref_control = std::move(view_ref_control),
       },
       fuchsia::ui::composition::ViewBoundProtocols{},
       parent_viewport_watcher.NewRequest(), flatland_connection(),
@@ -1183,7 +1285,7 @@ TEST_F(FlatlandExternalViewEmbedderTest,
   loop().RunUntilIdle();
   EXPECT_THAT(fake_flatland().graph(),
               IsFlutterGraph(parent_viewport_watcher, viewport_creation_token,
-                             view_ref));
+                             view_ref_clone));
 
   // Create the view before drawing the scene.
   auto [child_view_token, child_viewport_token] = ViewTokenPair::New();
@@ -1198,18 +1300,20 @@ TEST_F(FlatlandExternalViewEmbedderTest,
   const fuchsia::math::SizeU frame_size{
       static_cast<uint32_t>(frame_size_signed.width()),
       static_cast<uint32_t>(frame_size_signed.height())};
-  DrawSimpleFrame(
-      external_view_embedder, frame_size_signed, 1.f, [](SkCanvas* canvas) {
-        const SkSize canvas_size = SkSize::Make(canvas->imageInfo().width(),
-                                                canvas->imageInfo().height());
-        SkPaint rect_paint;
-        rect_paint.setColor(SK_ColorGREEN);
-        canvas->translate(canvas_size.width() / 4.f,
-                          canvas_size.height() / 2.f);
-        canvas->drawRect(SkRect::MakeWH(canvas_size.width() / 32.f,
-                                        canvas_size.height() / 32.f),
-                         rect_paint);
-      });
+  DrawSimpleFrame(external_view_embedder, frame_size_signed, 1.f,
+                  [](flutter::DlCanvas* canvas) {
+                    const SkISize layer_size = canvas->GetBaseLayerSize();
+                    const SkSize canvas_size =
+                        SkSize::Make(layer_size.width(), layer_size.height());
+                    flutter::DlPaint rect_paint;
+                    rect_paint.setColor(flutter::DlColor().kGreen());
+                    canvas->Translate(canvas_size.width() / 4.f,
+                                      canvas_size.height() / 2.f);
+                    canvas->DrawRect(
+                        SkRect::MakeWH(canvas_size.width() / 32.f,
+                                       canvas_size.height() / 32.f),
+                        rect_paint);
+                  });
 
   // Pump the message loop. The scene updates should propagate to flatland.
   loop().RunUntilIdle();
@@ -1218,7 +1322,7 @@ TEST_F(FlatlandExternalViewEmbedderTest,
   EXPECT_THAT(
       fake_flatland().graph(),
       IsFlutterGraph(
-          parent_viewport_watcher, viewport_creation_token, view_ref,
+          parent_viewport_watcher, viewport_creation_token, view_ref_clone,
           /*layers*/
           {IsImageLayer(
               frame_size, kFirstLayerBlendMode,
@@ -1236,7 +1340,7 @@ TEST_F(FlatlandExternalViewEmbedderTest,
   EXPECT_THAT(
       fake_flatland().graph(),
       IsFlutterGraph(
-          parent_viewport_watcher, viewport_creation_token, view_ref,
+          parent_viewport_watcher, viewport_creation_token, view_ref_clone,
           /*layers*/
           {IsImageLayer(
               frame_size, kFirstLayerBlendMode,
@@ -1254,22 +1358,24 @@ TEST_F(FlatlandExternalViewEmbedderTest,
   const fuchsia::math::SizeU new_frame_size{
       static_cast<uint32_t>(new_frame_size_signed.width()),
       static_cast<uint32_t>(new_frame_size_signed.height())};
-  DrawSimpleFrame(
-      external_view_embedder, new_frame_size_signed, 1.f, [](SkCanvas* canvas) {
-        const SkSize canvas_size = SkSize::Make(canvas->imageInfo().width(),
-                                                canvas->imageInfo().height());
-        SkPaint rect_paint;
-        rect_paint.setColor(SK_ColorGREEN);
-        canvas->translate(canvas_size.width() / 4.f,
-                          canvas_size.height() / 2.f);
-        canvas->drawRect(SkRect::MakeWH(canvas_size.width() / 32.f,
-                                        canvas_size.height() / 32.f),
-                         rect_paint);
-      });
+  DrawSimpleFrame(external_view_embedder, new_frame_size_signed, 1.f,
+                  [](flutter::DlCanvas* canvas) {
+                    const SkISize layer_size = canvas->GetBaseLayerSize();
+                    const SkSize canvas_size =
+                        SkSize::Make(layer_size.width(), layer_size.height());
+                    flutter::DlPaint rect_paint;
+                    rect_paint.setColor(flutter::DlColor::kGreen());
+                    canvas->Translate(canvas_size.width() / 4.f,
+                                      canvas_size.height() / 2.f);
+                    canvas->DrawRect(
+                        SkRect::MakeWH(canvas_size.width() / 32.f,
+                                       canvas_size.height() / 32.f),
+                        rect_paint);
+                  });
   EXPECT_THAT(
       fake_flatland().graph(),
       IsFlutterGraph(
-          parent_viewport_watcher, viewport_creation_token, view_ref,
+          parent_viewport_watcher, viewport_creation_token, view_ref_clone,
           /*layers*/
           {IsImageLayer(
               frame_size, kFirstLayerBlendMode,
@@ -1286,7 +1392,8 @@ TEST_F(FlatlandExternalViewEmbedderTest,
   EXPECT_THAT(
       fake_flatland().graph(),
       IsFlutterGraph(
-          parent_viewport_watcher, viewport_creation_token, view_ref, /*layers*/
+          parent_viewport_watcher, viewport_creation_token,
+          view_ref_clone, /*layers*/
           {IsImageLayer(
               new_frame_size, kFirstLayerBlendMode,
               {IsHitRegion(
@@ -1301,24 +1408,33 @@ TEST_F(FlatlandExternalViewEmbedderTest,
 // This test case exercises the scenario in which the view contains two disjoint
 // regions with painted content; we should generate two separate hit regions
 // matching the bounds of the painted regions in this case.
-TEST_F(FlatlandExternalViewEmbedderTest, SimpleScene_DisjointHitRegions) {
+TEST_F(ExternalViewEmbedderTest, SimpleScene_DisjointHitRegions) {
   fuchsia::ui::composition::ParentViewportWatcherPtr parent_viewport_watcher;
   fuchsia::ui::views::ViewportCreationToken viewport_creation_token;
   fuchsia::ui::views::ViewCreationToken view_creation_token;
-  fuchsia::ui::views::ViewRef view_ref;
+  fuchsia::ui::views::ViewRef view_ref_clone;
   auto view_creation_token_status = zx::channel::create(
       0u, &viewport_creation_token.value, &view_creation_token.value);
   ASSERT_EQ(view_creation_token_status, ZX_OK);
-  auto view_ref_pair = scenic::ViewRefPair::New();
-  view_ref_pair.view_ref.Clone(&view_ref);
 
-  // Create the `FlatlandExternalViewEmbedder` and pump the message loop until
+  fuchsia::ui::views::ViewRefControl view_ref_control;
+  fuchsia::ui::views::ViewRef view_ref;
+  auto status = zx::eventpair::create(
+      /*options*/ 0u, &view_ref_control.reference, &view_ref.reference);
+  ASSERT_EQ(status, ZX_OK);
+  view_ref_control.reference.replace(
+      ZX_DEFAULT_EVENTPAIR_RIGHTS & (~ZX_RIGHT_DUPLICATE),
+      &view_ref_control.reference);
+  view_ref.reference.replace(ZX_RIGHTS_BASIC, &view_ref.reference);
+  view_ref.Clone(&view_ref_clone);
+
+  // Create the `ExternalViewEmbedder` and pump the message loop until
   // the initial scene graph is setup.
-  FlatlandExternalViewEmbedder external_view_embedder(
+  ExternalViewEmbedder external_view_embedder(
       std::move(view_creation_token),
       fuchsia::ui::views::ViewIdentityOnCreation{
-          .view_ref = std::move(view_ref_pair.view_ref),
-          .view_ref_control = std::move(view_ref_pair.control_ref),
+          .view_ref = std::move(view_ref),
+          .view_ref_control = std::move(view_ref_control),
       },
       fuchsia::ui::composition::ViewBoundProtocols{},
       parent_viewport_watcher.NewRequest(), flatland_connection(),
@@ -1329,7 +1445,7 @@ TEST_F(FlatlandExternalViewEmbedderTest, SimpleScene_DisjointHitRegions) {
   loop().RunUntilIdle();
   EXPECT_THAT(fake_flatland().graph(),
               IsFlutterGraph(parent_viewport_watcher, viewport_creation_token,
-                             view_ref));
+                             view_ref_clone));
 
   // Draw the scene.  The scene graph shouldn't change yet.
   const SkISize frame_size_signed = SkISize::Make(512, 512);
@@ -1337,9 +1453,11 @@ TEST_F(FlatlandExternalViewEmbedderTest, SimpleScene_DisjointHitRegions) {
       static_cast<uint32_t>(frame_size_signed.width()),
       static_cast<uint32_t>(frame_size_signed.height())};
   DrawSimpleFrame(
-      external_view_embedder, frame_size_signed, 1.f, [](SkCanvas* canvas) {
-        const SkSize canvas_size = SkSize::Make(canvas->imageInfo().width(),
-                                                canvas->imageInfo().height());
+      external_view_embedder, frame_size_signed, 1.f,
+      [](flutter::DlCanvas* canvas) {
+        const SkISize layer_size = canvas->GetBaseLayerSize();
+        const SkSize canvas_size =
+            SkSize::Make(layer_size.width(), layer_size.height());
 
         SkRect paint_region_1, paint_region_2;
 
@@ -1347,20 +1465,20 @@ TEST_F(FlatlandExternalViewEmbedderTest, SimpleScene_DisjointHitRegions) {
             canvas_size.width() / 4.f, canvas_size.height() / 2.f,
             canvas_size.width() / 32.f, canvas_size.height() / 32.f);
 
-        SkPaint rect_paint;
-        rect_paint.setColor(SK_ColorGREEN);
-        canvas->drawRect(paint_region_1, rect_paint);
+        flutter::DlPaint rect_paint;
+        rect_paint.setColor(flutter::DlColor::kGreen());
+        canvas->DrawRect(paint_region_1, rect_paint);
 
         paint_region_2 = SkRect::MakeXYWH(
             canvas_size.width() * 3.f / 4.f, canvas_size.height() / 2.f,
             canvas_size.width() / 32.f, canvas_size.height() / 32.f);
 
-        rect_paint.setColor(SK_ColorRED);
-        canvas->drawRect(paint_region_2, rect_paint);
+        rect_paint.setColor(flutter::DlColor::kRed());
+        canvas->DrawRect(paint_region_2, rect_paint);
       });
   EXPECT_THAT(fake_flatland().graph(),
               IsFlutterGraph(parent_viewport_watcher, viewport_creation_token,
-                             view_ref));
+                             view_ref_clone));
 
   // Pump the message loop. The scene updates should propagate to flatland.
   loop().RunUntilIdle();
@@ -1368,7 +1486,7 @@ TEST_F(FlatlandExternalViewEmbedderTest, SimpleScene_DisjointHitRegions) {
   EXPECT_THAT(
       fake_flatland().graph(),
       IsFlutterGraph(
-          parent_viewport_watcher, viewport_creation_token, view_ref,
+          parent_viewport_watcher, viewport_creation_token, view_ref_clone,
           /*layers*/
           {IsImageLayer(
               frame_size, kFirstLayerBlendMode,
@@ -1392,24 +1510,33 @@ TEST_F(FlatlandExternalViewEmbedderTest, SimpleScene_DisjointHitRegions) {
 // overlapping regions with painted content; we should generate one hit
 // region matching the union of the bounds of the two painted regions in
 // this case.
-TEST_F(FlatlandExternalViewEmbedderTest, SimpleScene_OverlappingHitRegions) {
+TEST_F(ExternalViewEmbedderTest, SimpleScene_OverlappingHitRegions) {
   fuchsia::ui::composition::ParentViewportWatcherPtr parent_viewport_watcher;
   fuchsia::ui::views::ViewportCreationToken viewport_creation_token;
   fuchsia::ui::views::ViewCreationToken view_creation_token;
-  fuchsia::ui::views::ViewRef view_ref;
+  fuchsia::ui::views::ViewRef view_ref_clone;
   auto view_creation_token_status = zx::channel::create(
       0u, &viewport_creation_token.value, &view_creation_token.value);
   ASSERT_EQ(view_creation_token_status, ZX_OK);
-  auto view_ref_pair = scenic::ViewRefPair::New();
-  view_ref_pair.view_ref.Clone(&view_ref);
 
-  // Create the `FlatlandExternalViewEmbedder` and pump the message loop until
+  fuchsia::ui::views::ViewRefControl view_ref_control;
+  fuchsia::ui::views::ViewRef view_ref;
+  auto status = zx::eventpair::create(
+      /*options*/ 0u, &view_ref_control.reference, &view_ref.reference);
+  ASSERT_EQ(status, ZX_OK);
+  view_ref_control.reference.replace(
+      ZX_DEFAULT_EVENTPAIR_RIGHTS & (~ZX_RIGHT_DUPLICATE),
+      &view_ref_control.reference);
+  view_ref.reference.replace(ZX_RIGHTS_BASIC, &view_ref.reference);
+  view_ref.Clone(&view_ref_clone);
+
+  // Create the `ExternalViewEmbedder` and pump the message loop until
   // the initial scene graph is setup.
-  FlatlandExternalViewEmbedder external_view_embedder(
+  ExternalViewEmbedder external_view_embedder(
       std::move(view_creation_token),
       fuchsia::ui::views::ViewIdentityOnCreation{
-          .view_ref = std::move(view_ref_pair.view_ref),
-          .view_ref_control = std::move(view_ref_pair.control_ref),
+          .view_ref = std::move(view_ref),
+          .view_ref_control = std::move(view_ref_control),
       },
       fuchsia::ui::composition::ViewBoundProtocols{},
       parent_viewport_watcher.NewRequest(), flatland_connection(),
@@ -1420,7 +1547,7 @@ TEST_F(FlatlandExternalViewEmbedderTest, SimpleScene_OverlappingHitRegions) {
   loop().RunUntilIdle();
   EXPECT_THAT(fake_flatland().graph(),
               IsFlutterGraph(parent_viewport_watcher, viewport_creation_token,
-                             view_ref));
+                             view_ref_clone));
 
   // Draw the scene.  The scene graph shouldn't change yet.
   const SkISize frame_size_signed = SkISize::Make(512, 512);
@@ -1428,9 +1555,11 @@ TEST_F(FlatlandExternalViewEmbedderTest, SimpleScene_OverlappingHitRegions) {
       static_cast<uint32_t>(frame_size_signed.width()),
       static_cast<uint32_t>(frame_size_signed.height())};
   DrawSimpleFrame(
-      external_view_embedder, frame_size_signed, 1.f, [](SkCanvas* canvas) {
-        const SkSize canvas_size = SkSize::Make(canvas->imageInfo().width(),
-                                                canvas->imageInfo().height());
+      external_view_embedder, frame_size_signed, 1.f,
+      [](flutter::DlCanvas* canvas) {
+        const SkISize layer_size = canvas->GetBaseLayerSize();
+        const SkSize canvas_size =
+            SkSize::Make(layer_size.width(), layer_size.height());
 
         SkRect paint_region_1, paint_region_2;
 
@@ -1438,20 +1567,20 @@ TEST_F(FlatlandExternalViewEmbedderTest, SimpleScene_OverlappingHitRegions) {
             canvas_size.width() / 4.f, canvas_size.height() / 2.f,
             3.f * canvas_size.width() / 8.f, canvas_size.height() / 4.f);
 
-        SkPaint rect_paint;
-        rect_paint.setColor(SK_ColorGREEN);
-        canvas->drawRect(paint_region_1, rect_paint);
+        flutter::DlPaint rect_paint;
+        rect_paint.setColor(flutter::DlColor::kGreen());
+        canvas->DrawRect(paint_region_1, rect_paint);
 
         paint_region_2 = SkRect::MakeXYWH(
             canvas_size.width() * 3.f / 8.f, canvas_size.height() / 2.f,
             3.f * canvas_size.width() / 8.f, canvas_size.height() / 4.f);
 
-        rect_paint.setColor(SK_ColorRED);
-        canvas->drawRect(paint_region_2, rect_paint);
+        rect_paint.setColor(flutter::DlColor::kRed());
+        canvas->DrawRect(paint_region_2, rect_paint);
       });
   EXPECT_THAT(fake_flatland().graph(),
               IsFlutterGraph(parent_viewport_watcher, viewport_creation_token,
-                             view_ref));
+                             view_ref_clone));
 
   // Pump the message loop. The scene updates should propagate to flatland.
   loop().RunUntilIdle();
@@ -1459,7 +1588,7 @@ TEST_F(FlatlandExternalViewEmbedderTest, SimpleScene_OverlappingHitRegions) {
   EXPECT_THAT(
       fake_flatland().graph(),
       IsFlutterGraph(
-          parent_viewport_watcher, viewport_creation_token, view_ref,
+          parent_viewport_watcher, viewport_creation_token, view_ref_clone,
           /*layers*/
           {IsImageLayer(
               frame_size, kFirstLayerBlendMode,
@@ -1472,4 +1601,155 @@ TEST_F(FlatlandExternalViewEmbedderTest, SimpleScene_OverlappingHitRegions) {
                   fuchsia::ui::composition::HitTestInteraction::DEFAULT)})}));
 }
 
+TEST_F(ExternalViewEmbedderTest, ViewportCoveredWithInputInterceptor) {
+  fuchsia::ui::composition::ParentViewportWatcherPtr parent_viewport_watcher;
+  fuchsia::ui::views::ViewportCreationToken viewport_creation_token;
+  fuchsia::ui::views::ViewCreationToken view_creation_token;
+  fuchsia::ui::views::ViewRef view_ref_clone;
+  auto view_creation_token_status = zx::channel::create(
+      0u, &viewport_creation_token.value, &view_creation_token.value);
+  ASSERT_EQ(view_creation_token_status, ZX_OK);
+
+  fuchsia::ui::views::ViewRefControl view_ref_control;
+  fuchsia::ui::views::ViewRef view_ref;
+  auto status = zx::eventpair::create(
+      /*options*/ 0u, &view_ref_control.reference, &view_ref.reference);
+  ASSERT_EQ(status, ZX_OK);
+  view_ref_control.reference.replace(
+      ZX_DEFAULT_EVENTPAIR_RIGHTS & (~ZX_RIGHT_DUPLICATE),
+      &view_ref_control.reference);
+  view_ref.reference.replace(ZX_RIGHTS_BASIC, &view_ref.reference);
+  view_ref.Clone(&view_ref_clone);
+
+  // Create the `ExternalViewEmbedder` and pump the message loop until
+  // the initial scene graph is setup.
+  ExternalViewEmbedder external_view_embedder(
+      std::move(view_creation_token),
+      fuchsia::ui::views::ViewIdentityOnCreation{
+          .view_ref = std::move(view_ref),
+          .view_ref_control = std::move(view_ref_control),
+      },
+      fuchsia::ui::composition::ViewBoundProtocols{},
+      parent_viewport_watcher.NewRequest(), flatland_connection(),
+      fake_surface_producer(),
+      /*intercept_all_input=*/true  // Enables the interceptor.
+  );
+  flatland_connection()->Present();
+  loop().RunUntilIdle();
+  fake_flatland().FireOnNextFrameBeginEvent(WithPresentCredits(1u));
+  loop().RunUntilIdle();
+  EXPECT_THAT(fake_flatland().graph(),
+              IsFlutterGraph(parent_viewport_watcher, viewport_creation_token,
+                             view_ref_clone, {IsInputShield()}));
+
+  // Create the view before drawing the scene.
+  const SkSize child_view_size_signed = SkSize::Make(256.f, 512.f);
+  const fuchsia::math::SizeU child_view_size{
+      static_cast<uint32_t>(child_view_size_signed.width()),
+      static_cast<uint32_t>(child_view_size_signed.height())};
+  auto [child_view_token, child_viewport_token] = ViewTokenPair::New();
+  const uint32_t child_view_id = child_viewport_token.value.get();
+
+  const int kOpacity = 200;
+  const float kOpacityFloat = 200 / 255.0f;
+  const fuchsia::math::VecF kScale{3.0f, 4.0f};
+
+  auto matrix = SkMatrix::I();
+  matrix.setScaleX(kScale.x);
+  matrix.setScaleY(kScale.y);
+
+  auto mutators_stack = flutter::MutatorsStack();
+  mutators_stack.PushOpacity(kOpacity);
+  mutators_stack.PushTransform(matrix);
+
+  flutter::EmbeddedViewParams child_view_params(matrix, child_view_size_signed,
+                                                mutators_stack);
+  external_view_embedder.CreateView(
+      child_view_id, []() {},
+      [](fuchsia::ui::composition::ContentId,
+         fuchsia::ui::composition::ChildViewWatcherHandle) {});
+  const SkRect child_view_occlusion_hint = SkRect::MakeLTRB(1, 2, 3, 4);
+  const fuchsia::math::Inset child_view_inset{
+      static_cast<int32_t>(child_view_occlusion_hint.top()),
+      static_cast<int32_t>(child_view_occlusion_hint.right()),
+      static_cast<int32_t>(child_view_occlusion_hint.bottom()),
+      static_cast<int32_t>(child_view_occlusion_hint.left())};
+  external_view_embedder.SetViewProperties(
+      child_view_id, child_view_occlusion_hint, /*hit_testable=*/false,
+      /*focusable=*/false);
+
+  // We must take into account the effect of DPR on the view scale.
+  const float kDPR = 2.0f;
+  const float kInvDPR = 1.f / kDPR;
+
+  // Draw the scene. The scene graph shouldn't change yet.
+  const SkISize frame_size_signed = SkISize::Make(512, 512);
+  const fuchsia::math::SizeU frame_size{
+      static_cast<uint32_t>(frame_size_signed.width()),
+      static_cast<uint32_t>(frame_size_signed.height())};
+  DrawFrameWithView(
+      external_view_embedder, frame_size_signed, kDPR, child_view_id,
+      child_view_params,
+      [](flutter::DlCanvas* canvas) {
+        const SkISize layer_size = canvas->GetBaseLayerSize();
+        const SkSize canvas_size =
+            SkSize::Make(layer_size.width(), layer_size.height());
+        flutter::DlPaint rect_paint;
+        rect_paint.setColor(flutter::DlColor::kGreen());
+        canvas->Translate(canvas_size.width() / 4.f,
+                          canvas_size.height() / 2.f);
+        canvas->DrawRect(SkRect::MakeWH(canvas_size.width() / 32.f,
+                                        canvas_size.height() / 32.f),
+                         rect_paint);
+      },
+      [](flutter::DlCanvas* canvas) {
+        const SkISize layer_size = canvas->GetBaseLayerSize();
+        const SkSize canvas_size =
+            SkSize::Make(layer_size.width(), layer_size.height());
+        flutter::DlPaint rect_paint;
+        rect_paint.setColor(flutter::DlColor::kRed());
+        canvas->Translate(canvas_size.width() * 3.f / 4.f,
+                          canvas_size.height() / 2.f);
+        canvas->DrawRect(SkRect::MakeWH(canvas_size.width() / 32.f,
+                                        canvas_size.height() / 32.f),
+                         rect_paint);
+      });
+  EXPECT_THAT(fake_flatland().graph(),
+              IsFlutterGraph(parent_viewport_watcher, viewport_creation_token,
+                             view_ref_clone, {IsInputShield()}));
+
+  // Pump the message loop.  The scene updates should propagate to flatland.
+  loop().RunUntilIdle();
+  fake_flatland().FireOnNextFrameBeginEvent(WithPresentCredits(1u));
+  loop().RunUntilIdle();
+
+  EXPECT_THAT(
+      fake_flatland().graph(),
+      IsFlutterGraph(
+          parent_viewport_watcher, viewport_creation_token,
+          view_ref_clone, /*layers*/
+          {IsImageLayer(
+               frame_size, kFirstLayerBlendMode,
+               {IsHitRegion(
+                   /* x */ 128.f,
+                   /* y */ 256.f,
+                   /* width */ 16.f,
+                   /* height */ 16.f,
+                   /* hit_test */
+                   fuchsia::ui::composition::HitTestInteraction::DEFAULT)}),
+           IsViewportLayer(child_view_token, child_view_size, child_view_inset,
+                           {0, 0}, kScale, kOpacityFloat),
+           IsImageLayer(
+               frame_size, kUpperLayerBlendMode,
+               {IsHitRegion(
+                   /* x */ 384.f,
+                   /* y */ 256.f,
+                   /* width */ 16.f,
+                   /* height */ 16.f,
+                   /* hit_test */
+                   fuchsia::ui::composition::HitTestInteraction::DEFAULT)}),
+           IsInputShield()},
+          {kInvDPR, kInvDPR}));
+}
+
 }  // namespace flutter_runner::testing
diff --git a/shell/platform/fuchsia/flutter/tests/fake_session_unittests.cc b/shell/platform/fuchsia/flutter/tests/fake_session_unittests.cc
deleted file mode 100644
index 966d133f499f19ad0fb0cd4f654c731e596500eb..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/flutter/tests/fake_session_unittests.cc
+++ /dev/null
@@ -1,461 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "fakes/scenic/fake_session.h"
-
-#include <fuchsia/ui/scenic/cpp/fidl.h>
-#include <fuchsia/ui/views/cpp/fidl.h>
-#include <lib/async-testing/test_loop.h>
-#include <lib/async/dispatcher.h>
-#include <lib/ui/scenic/cpp/resources.h>
-#include <lib/ui/scenic/cpp/session.h>
-#include <lib/ui/scenic/cpp/view_ref_pair.h>
-#include <lib/ui/scenic/cpp/view_token_pair.h>
-#include <zircon/types.h>
-
-#include <memory>
-#include <string>
-#include <type_traits>
-#include <vector>
-
-#include "flutter/fml/logging.h"
-#include "gmock/gmock.h"  // For EXPECT_THAT and matchers
-#include "gtest/gtest.h"
-
-#include "fakes/scenic/fake_resources.h"
-
-using ::testing::_;
-using ::testing::AllOf;
-using ::testing::ElementsAre;
-using ::testing::FieldsAre;
-using ::testing::IsEmpty;
-using ::testing::Matcher;
-using ::testing::Not;
-using ::testing::Pair;
-using ::testing::Pointee;
-using ::testing::SizeIs;
-using ::testing::VariantWith;
-
-namespace flutter_runner::testing {
-namespace {
-
-std::string GetCurrentTestName() {
-  return ::testing::UnitTest::GetInstance()->current_test_info()->name();
-}
-
-zx_koid_t GetKoid(zx_handle_t handle) {
-  if (handle == ZX_HANDLE_INVALID) {
-    return ZX_KOID_INVALID;
-  }
-
-  zx_info_handle_basic_t info;
-  zx_status_t status = zx_object_get_info(handle, ZX_INFO_HANDLE_BASIC, &info,
-                                          sizeof(info), nullptr, nullptr);
-  return status == ZX_OK ? info.koid : ZX_KOID_INVALID;
-}
-
-zx_koid_t GetPeerKoid(zx_handle_t handle) {
-  if (handle == ZX_HANDLE_INVALID) {
-    return ZX_KOID_INVALID;
-  }
-
-  zx_info_handle_basic_t info;
-  zx_status_t status = zx_object_get_info(handle, ZX_INFO_HANDLE_BASIC, &info,
-                                          sizeof(info), nullptr, nullptr);
-  return status == ZX_OK ? info.related_koid : ZX_KOID_INVALID;
-}
-
-Matcher<FakeResource> IsEntityNode(
-    Matcher<decltype(FakeResource::id)> id,
-    Matcher<decltype(FakeResource::label)> label,
-    Matcher<decltype(FakeNode::children)> children) {
-  return FieldsAre(
-      id, label, FakeResource::kDefaultEmptyEventMask,
-      VariantWith<FakeEntityNode>(FieldsAre(
-          FieldsAre(children, FakeNode::kDefaultZeroRotation,
-                    FakeNode::kDefaultOneScale,
-                    FakeNode::kDefaultZeroTranslation,
-                    FakeNode::kDefaultZeroAnchor, FakeNode::kIsHitTestable,
-                    FakeNode::kIsSemanticallyVisible),
-          IsEmpty())));
-}
-
-Matcher<FakeSceneGraph> IsEmptySceneGraph() {
-  return FieldsAre(IsEmpty(), IsEmpty(), IsEmpty(), kInvalidFakeResourceId);
-}
-
-MATCHER_P2(IsEntityNodeSceneGraph, node_label, node_id, "") {
-  static_assert(std::is_same_v<FakeSceneGraph, std::decay_t<decltype(arg)>>);
-  static_assert(
-      std::is_constructible_v<std::string, std::decay_t<decltype(node_label)>>);
-  static_assert(
-      std::is_same_v<FakeResourceId, std::decay_t<decltype(node_id)>>);
-
-  return ExplainMatchResult(
-      FieldsAre(
-          IsEmpty(),
-          AllOf(SizeIs(1u),
-                Contains(Pair(node_id, Pointee(IsEntityNode(node_id, node_label,
-                                                            IsEmpty()))))),
-          _, kInvalidFakeResourceId),
-      arg, result_listener);
-}
-
-MATCHER_P5(IsBasicSceneGraph,
-           view_label,
-           node_label,
-           view_holder_koid,
-           view_ref_control_koid,
-           view_ref_koid,
-           "") {
-  static_assert(std::is_same_v<FakeSceneGraph, std::decay_t<decltype(arg)>>);
-  static_assert(
-      std::is_constructible_v<std::string, std::decay_t<decltype(view_label)>>);
-  static_assert(
-      std::is_constructible_v<std::string, std::decay_t<decltype(node_label)>>);
-  static_assert(
-      std::is_same_v<zx_koid_t, std::decay_t<decltype(view_holder_koid)>>);
-  static_assert(
-      std::is_same_v<zx_koid_t, std::decay_t<decltype(view_ref_control_koid)>>);
-  static_assert(
-      std::is_same_v<zx_koid_t, std::decay_t<decltype(view_ref_koid)>>);
-
-  return ExplainMatchResult(
-      FieldsAre(
-          IsEmpty(),
-          AllOf(SizeIs(2u),
-                Contains(Pair(arg.root_view_id,
-                              Pointee(FieldsAre(
-                                  arg.root_view_id, "",
-                                  FakeResource::kDefaultEmptyEventMask,
-                                  VariantWith<FakeView>(FieldsAre(
-                                      view_holder_koid, view_ref_control_koid,
-                                      view_ref_koid, view_label,
-                                      ElementsAre(Pointee(IsEntityNode(
-                                          _, node_label, IsEmpty()))),
-                                      FakeView::kDebugBoundsDisbaled))))))),
-          _, AllOf(Not(kInvalidFakeResourceId), arg.root_view_id)),
-      arg, result_listener);
-}
-
-}  // namespace
-
-class FakeSessionTest : public ::testing::Test,
-                        public fuchsia::ui::scenic::SessionListener {
- protected:
-  FakeSessionTest()
-      : session_listener_(this), session_subloop_(loop_.StartNewLoop()) {}
-  ~FakeSessionTest() override = default;
-
-  async::TestLoop& loop() { return loop_; }
-
-  FakeSession& fake_session() { return fake_session_; }
-
-  scenic::Session CreateSession() {
-    FML_CHECK(!fake_session_.is_bound());
-    FML_CHECK(!session_listener_.is_bound());
-
-    auto [session, session_listener] =
-        fake_session_.Bind(session_subloop_->dispatcher());
-    session_listener_.Bind(std::move(session_listener));
-
-    return scenic::Session(session.Bind());
-  }
-
- private:
-  // |fuchsia::ui::scenic::SessionListener|
-  void OnScenicError(std::string error) override { FAIL(); }
-
-  // |fuchsia::ui::scenic::SessionListener|
-  void OnScenicEvent(std::vector<fuchsia::ui::scenic::Event> events) override {
-    FAIL();
-  }
-
-  async::TestLoop loop_;  // Must come before FIDL bindings.
-
-  fuchsia::ui::scenic::SessionPtr session_ptr_;
-  fidl::Binding<fuchsia::ui::scenic::SessionListener> session_listener_;
-
-  std::unique_ptr<async::LoopInterface> session_subloop_;
-  FakeSession fake_session_;
-};
-
-TEST_F(FakeSessionTest, Initialization) {
-  EXPECT_EQ(fake_session().debug_name(), "");
-  EXPECT_EQ(fake_session().command_queue().size(), 0u);
-  EXPECT_THAT(fake_session().SceneGraph(), IsEmptySceneGraph());
-
-  // Pump the loop one time; the session should retain its initial state.
-  loop().RunUntilIdle();
-  EXPECT_EQ(fake_session().debug_name(), "");
-  EXPECT_EQ(fake_session().command_queue().size(), 0u);
-  EXPECT_THAT(fake_session().SceneGraph(), IsEmptySceneGraph());
-}
-
-TEST_F(FakeSessionTest, DebugLabel) {
-  scenic::Session session = CreateSession();
-
-  // Set the session's debug name.  The `SetDebugName` hasn't been processed
-  // yet, so the session's view of the debug name is still empty.
-  const std::string kDebugLabel = GetCurrentTestName();
-  session.SetDebugName(kDebugLabel);
-  session.Flush();  // Bypass local command caching.
-  EXPECT_EQ(fake_session().debug_name(), "");
-
-  // Pump the loop; the contents of the initial `SetDebugName` should be
-  // processed.
-  loop().RunUntilIdle();
-  EXPECT_EQ(fake_session().debug_name(), kDebugLabel);
-}
-
-TEST_F(FakeSessionTest, CommandQueueInvariants) {
-  scenic::Session session = CreateSession();
-
-  // The scene graph is initially empty.
-  EXPECT_THAT(fake_session().SceneGraph(), IsEmptySceneGraph());
-
-  // Create entity node for testing; no creation commands have been processed
-  // yet, so the session's view of the scene graph is empty.
-  std::optional<scenic::EntityNode> node(&session);
-  session.Flush();  // Bypass local command caching.
-  EXPECT_EQ(fake_session().command_queue().size(), 0u);
-  EXPECT_THAT(fake_session().SceneGraph(), IsEmptySceneGraph());
-
-  // Pump the loop; the initial creation command should be enqueued but still
-  // not processed yet, so the session's view of the scene graph is empty.
-  loop().RunUntilIdle();
-  EXPECT_GT(fake_session().command_queue().size(), 0u);
-  EXPECT_THAT(fake_session().SceneGraph(), IsEmptySceneGraph());
-
-  // Present initial scene graph.  The `Present` hasn't been processed yet, so
-  // the session's view of the scene graph is still empty.
-  session.Present2(0u, 0u, [](auto...) {});
-  EXPECT_GT(fake_session().command_queue().size(), 0u);
-  EXPECT_THAT(fake_session().SceneGraph(), IsEmptySceneGraph());
-
-  // Pump the loop; the contents of the initial `Present` should be processed.
-  loop().RunUntilIdle();
-  EXPECT_EQ(fake_session().command_queue().size(), 0u);
-  EXPECT_THAT(fake_session().SceneGraph(),
-              IsEntityNodeSceneGraph("", node->id()));
-}
-
-TEST_F(FakeSessionTest, SimpleResourceLifecycle) {
-  scenic::Session session = CreateSession();
-
-  // The scene graph is initially empty.
-  EXPECT_THAT(fake_session().SceneGraph(), IsEmptySceneGraph());
-
-  // Present an initial entity node, pumping the loop to process commands.
-  std::optional<scenic::EntityNode> node(&session);
-  session.Present2(0u, 0u, [](auto...) {});
-  loop().RunUntilIdle();
-  EXPECT_THAT(fake_session().SceneGraph(),
-              IsEntityNodeSceneGraph("", node->id()));
-
-  // Present a simple property update on the test entity node.
-  const std::string kNodeLabel = "EntityNode";
-  node->SetLabel(kNodeLabel);
-  session.Present2(0u, 0u, [](auto...) {});
-  loop().RunUntilIdle();
-  EXPECT_THAT(fake_session().SceneGraph(),
-              IsEntityNodeSceneGraph(kNodeLabel, node->id()));
-
-  // Present the destruction of the entity node.
-  node.reset();
-  session.Present2(0u, 0u, [](auto...) {});
-  loop().RunUntilIdle();
-  EXPECT_THAT(fake_session().SceneGraph(), IsEmptySceneGraph());
-}
-
-TEST_F(FakeSessionTest, ResourceReferenceCounting) {
-  scenic::Session session = CreateSession();
-
-  // Present a chain of 4 entity nodes for testing.
-  std::array<std::optional<scenic::EntityNode>, 4> nodes{
-      std::optional<scenic::EntityNode>(&session),
-      std::optional<scenic::EntityNode>(&session),
-      std::optional<scenic::EntityNode>(&session),
-      std::optional<scenic::EntityNode>(&session)};
-  const std::string kNodeLabel = "EntityNode";
-  for (size_t i = 0; i < 4; i++) {
-    nodes[i]->SetLabel(kNodeLabel + std::string(1, '0' + i));
-    if (i < 3) {
-      nodes[i]->AddChild(*nodes[i + 1]);
-    }
-  }
-  session.Present2(0u, 0u, [](auto...) {});
-  loop().RunUntilIdle();
-  {
-    auto scene_graph = fake_session().SceneGraph();
-    EXPECT_EQ(scene_graph.root_view_id, kInvalidFakeResourceId);
-    EXPECT_EQ(scene_graph.buffer_collection_map.size(), 0u);
-    EXPECT_EQ(scene_graph.resource_map.size(), 4u);
-    EXPECT_EQ(scene_graph.label_map.size(), 4u);
-    for (size_t i = 0; i < 4; i++) {
-      const std::string node_i_label = kNodeLabel + std::string(1, '0' + i);
-      ASSERT_EQ(scene_graph.resource_map.count(nodes[i]->id()), 1u);
-      ASSERT_EQ(scene_graph.label_map.count(node_i_label), 1u);
-
-      const auto node_i = scene_graph.resource_map[nodes[i]->id()];
-      const auto node_i_label_resources = scene_graph.label_map[node_i_label];
-      EXPECT_EQ(node_i_label_resources.size(), 1u);
-      EXPECT_FALSE(node_i_label_resources[0].expired());
-      EXPECT_EQ(node_i_label_resources[0].lock(), node_i);
-    }
-
-    EXPECT_THAT(
-        scene_graph.resource_map[nodes[0]->id()],
-        Pointee(IsEntityNode(
-            nodes[0]->id(), kNodeLabel + std::string(1, '0'),
-            ElementsAre(Pointee(IsEntityNode(
-                nodes[1]->id(), kNodeLabel + std::string(1, '1'),
-                ElementsAre(Pointee(IsEntityNode(
-                    nodes[2]->id(), kNodeLabel + std::string(1, '2'),
-                    ElementsAre(Pointee(IsEntityNode(
-                        nodes[3]->id(), kNodeLabel + std::string(1, '3'),
-                        IsEmpty()))))))))))));
-  }
-
-  // Destroy node #0.  It should be dropped immediately since it has no parent.
-  nodes[0].reset();
-  session.Present2(0u, 0u, [](auto...) {});
-  loop().RunUntilIdle();
-  {
-    auto scene_graph = fake_session().SceneGraph();
-    EXPECT_EQ(scene_graph.root_view_id, kInvalidFakeResourceId);
-    EXPECT_EQ(scene_graph.buffer_collection_map.size(), 0u);
-    EXPECT_EQ(scene_graph.resource_map.size(), 3u);
-    EXPECT_EQ(scene_graph.label_map.size(), 3u);
-    for (size_t i = 1; i < 4; i++) {
-      const std::string node_i_label = kNodeLabel + std::string(1, '0' + i);
-      ASSERT_EQ(scene_graph.resource_map.count(nodes[i]->id()), 1u);
-      ASSERT_EQ(scene_graph.label_map.count(node_i_label), 1u);
-
-      const auto node_i = scene_graph.resource_map[nodes[i]->id()];
-      const auto node_i_label_resources = scene_graph.label_map[node_i_label];
-      EXPECT_EQ(node_i_label_resources.size(), 1u);
-      EXPECT_FALSE(node_i_label_resources[0].expired());
-      EXPECT_EQ(node_i_label_resources[0].lock(), node_i);
-    }
-
-    EXPECT_EQ(scene_graph.resource_map.count(nodes[0]->id()), 0u);
-    EXPECT_THAT(scene_graph.resource_map[nodes[1]->id()],
-                Pointee(IsEntityNode(
-                    nodes[1]->id(), kNodeLabel + std::string(1, '1'),
-                    ElementsAre(Pointee(IsEntityNode(
-                        nodes[2]->id(), kNodeLabel + std::string(1, '2'),
-                        ElementsAre(Pointee(IsEntityNode(
-                            nodes[3]->id(), kNodeLabel + std::string(1, '3'),
-                            IsEmpty())))))))));
-  }
-
-  // Destroy node #2.  It should still exist in the tree and the labels map
-  // because it has a parent, but it is removed from the resource map.
-  nodes[2].reset();
-  session.Present2(0u, 0u, [](auto...) {});
-  loop().RunUntilIdle();
-  {
-    auto scene_graph = fake_session().SceneGraph();
-    EXPECT_EQ(scene_graph.root_view_id, kInvalidFakeResourceId);
-    EXPECT_EQ(scene_graph.buffer_collection_map.size(), 0u);
-    EXPECT_EQ(scene_graph.resource_map.size(), 2u);
-    EXPECT_EQ(scene_graph.label_map.size(), 3u);
-    for (size_t i = 1; i < 4; i++) {
-      const std::string node_i_label = kNodeLabel + std::string(1, '0' + i);
-      ASSERT_EQ(scene_graph.label_map.count(node_i_label), 1u);
-      ASSERT_EQ(scene_graph.resource_map.count(nodes[i]->id()),
-                i != 2 ? 1u : 0u);
-
-      const auto node_i_label_resources = scene_graph.label_map[node_i_label];
-      EXPECT_EQ(node_i_label_resources.size(), 1u);
-      EXPECT_FALSE(node_i_label_resources[0].expired());
-
-      if (i != 2) {
-        const auto node_i = scene_graph.resource_map[nodes[i]->id()];
-        EXPECT_EQ(node_i_label_resources[0].lock(), node_i);
-      } else {
-        EXPECT_EQ(scene_graph.resource_map.count(nodes[i]->id()), 0u);
-      }
-    }
-
-    EXPECT_THAT(scene_graph.resource_map[nodes[1]->id()],
-                Pointee(IsEntityNode(
-                    nodes[1]->id(), kNodeLabel + std::string(1, '1'),
-                    ElementsAre(Pointee(IsEntityNode(
-                        nodes[2]->id(), kNodeLabel + std::string(1, '2'),
-                        ElementsAre(Pointee(IsEntityNode(
-                            nodes[3]->id(), kNodeLabel + std::string(1, '3'),
-                            IsEmpty())))))))));
-  }
-
-  // Destroy node #3.  It should still exist in the tree and the labels map
-  // because it has a grand-parent, but it is removed from the resource map.
-  nodes[3].reset();
-  session.Present2(0u, 0u, [](auto...) {});
-  loop().RunUntilIdle();
-  {
-    auto scene_graph = fake_session().SceneGraph();
-    EXPECT_EQ(scene_graph.root_view_id, kInvalidFakeResourceId);
-    EXPECT_EQ(scene_graph.buffer_collection_map.size(), 0u);
-    EXPECT_EQ(scene_graph.resource_map.size(), 1u);
-    EXPECT_EQ(scene_graph.label_map.size(), 3u);
-    for (size_t i = 1; i < 4; i++) {
-      const std::string node_i_label = kNodeLabel + std::string(1, '0' + i);
-      ASSERT_EQ(scene_graph.label_map.count(node_i_label), 1u);
-      ASSERT_EQ(scene_graph.resource_map.count(nodes[i]->id()),
-                i < 2 ? 1u : 0u);
-
-      const auto node_i_label_resources = scene_graph.label_map[node_i_label];
-      EXPECT_EQ(node_i_label_resources.size(), 1u);
-      EXPECT_FALSE(node_i_label_resources[0].expired());
-
-      if (i < 2) {
-        const auto node_i = scene_graph.resource_map[nodes[i]->id()];
-        EXPECT_EQ(node_i_label_resources[0].lock(), node_i);
-      } else {
-        EXPECT_EQ(scene_graph.resource_map.count(nodes[i]->id()), 0u);
-      }
-    }
-
-    EXPECT_THAT(scene_graph.resource_map[nodes[1]->id()],
-                Pointee(IsEntityNode(
-                    nodes[1]->id(), kNodeLabel + std::string(1, '1'),
-                    ElementsAre(Pointee(IsEntityNode(
-                        nodes[2]->id(), kNodeLabel + std::string(1, '2'),
-                        ElementsAre(Pointee(IsEntityNode(
-                            nodes[3]->id(), kNodeLabel + std::string(1, '3'),
-                            IsEmpty())))))))));
-  }
-}
-
-TEST_F(FakeSessionTest, BasicSceneGraph) {
-  scenic::Session session = CreateSession();
-
-  // The scene graph is initially empty.
-  EXPECT_THAT(fake_session().SceneGraph(), IsEmptySceneGraph());
-
-  // Create and present initial scene graph.
-  const std::string kViewDebugString = GetCurrentTestName();
-  const std::string kNodeLabel = "ChildNode";
-  fuchsia::ui::views::ViewRef view_ref;
-  auto [view_token, view_holder_token] = scenic::ViewTokenPair::New();
-  auto view_ref_pair = scenic::ViewRefPair::New();
-  view_ref_pair.view_ref.Clone(&view_ref);
-  scenic::View root_view(&session, std::move(view_token),
-                         std::move(view_ref_pair.control_ref),
-                         std::move(view_ref_pair.view_ref), kViewDebugString);
-  scenic::EntityNode child_node(&session);
-  child_node.SetLabel(kNodeLabel);
-  root_view.AddChild(child_node);
-  session.Present2(0u, 0u, [](auto...) {});
-  loop().RunUntilIdle();
-  EXPECT_THAT(fake_session().SceneGraph(),
-              IsBasicSceneGraph(kViewDebugString, kNodeLabel,
-                                GetPeerKoid(view_holder_token.value.get()),
-                                GetPeerKoid(view_ref.reference.get()),
-                                GetKoid(view_ref.reference.get())));
-}
-
-}  // namespace flutter_runner::testing
diff --git a/shell/platform/fuchsia/flutter/tests/fakes/BUILD.gn b/shell/platform/fuchsia/flutter/tests/fakes/BUILD.gn
index 590df78802f176bfcd5c8f8ed8f72471fd2b11ef..e47a8d3cbcec821e3904ac45caf512432e60d54a 100644
--- a/shell/platform/fuchsia/flutter/tests/fakes/BUILD.gn
+++ b/shell/platform/fuchsia/flutter/tests/fakes/BUILD.gn
@@ -4,6 +4,8 @@
 
 assert(is_fuchsia)
 
+import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
+
 group("fakes") {
   testonly = true
 
@@ -25,10 +27,10 @@ source_set("focus") {
   ]
 
   deps = [
-    "//build/fuchsia/pkg:sys_cpp_testing",
+    "${fuchsia_sdk}/pkg/sys_cpp_testing",
     "//flutter/lib/ui",
     "//flutter/testing",
-    "//third_party/rapidjson",
+    "//flutter/third_party/rapidjson",
   ]
 }
 
@@ -38,9 +40,9 @@ source_set("pointer") {
   sources = [ "mock_injector_registry.h" ]
 
   deps = [
-    "//build/fuchsia/pkg:sys_cpp_testing",
+    "${fuchsia_sdk}/pkg/sys_cpp_testing",
     "//flutter/lib/ui",
     "//flutter/testing",
-    "//third_party/rapidjson",
+    "//flutter/third_party/rapidjson",
   ]
 }
diff --git a/shell/platform/fuchsia/flutter/tests/fakes/focuser.h b/shell/platform/fuchsia/flutter/tests/fakes/focuser.h
index aeaf8755d56615f086c79aeb013c73c939a068c4..06e7da792ab1057505f9fee1501023229baccdbc 100644
--- a/shell/platform/fuchsia/flutter/tests/fakes/focuser.h
+++ b/shell/platform/fuchsia/flutter/tests/fakes/focuser.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_TESTS_FAKES_FOCUSER_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_TESTS_FAKES_FOCUSER_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_FAKES_FOCUSER_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_FAKES_FOCUSER_H_
 
 #include <fuchsia/ui/views/cpp/fidl.h>
 #include <fuchsia/ui/views/cpp/fidl_test_base.h>
@@ -48,4 +48,4 @@ class FakeFocuser : public fuchsia::ui::views::testing::Focuser_TestBase {
 
 }  // namespace flutter_runner::testing
 
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_TESTS_FAKES_FOCUSER_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_FAKES_FOCUSER_H_
diff --git a/shell/platform/fuchsia/flutter/tests/fakes/mock_injector_registry.h b/shell/platform/fuchsia/flutter/tests/fakes/mock_injector_registry.h
index cd7d14b7f7d9040b1f103261d9f14df8a50dca02..37f7d478ed328c63d53f4750a14ed1809642642f 100644
--- a/shell/platform/fuchsia/flutter/tests/fakes/mock_injector_registry.h
+++ b/shell/platform/fuchsia/flutter/tests/fakes/mock_injector_registry.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_TESTS_MOCK_INJECTOR_REGISTRY_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_TESTS_MOCK_INJECTOR_REGISTRY_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_FAKES_MOCK_INJECTOR_REGISTRY_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_FAKES_MOCK_INJECTOR_REGISTRY_H_
 
 #include <fuchsia/ui/pointerinjector/cpp/fidl.h>
 #include <lib/fidl/cpp/binding_set.h>
@@ -90,4 +90,4 @@ class MockInjectorRegistry : public fuchsia::ui::pointerinjector::Registry,
 };
 }  // namespace flutter_runner::testing
 
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_TESTS_MOCK_INJECTOR_REGISTRY_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_FAKES_MOCK_INJECTOR_REGISTRY_H_
diff --git a/shell/platform/fuchsia/flutter/tests/fakes/mouse_source.h b/shell/platform/fuchsia/flutter/tests/fakes/mouse_source.h
index 47585e69a4fd565a61d37f194a4ccd0abb03269f..e86c7cc9eebd85c0e5494e2261f981e348491090 100644
--- a/shell/platform/fuchsia/flutter/tests/fakes/mouse_source.h
+++ b/shell/platform/fuchsia/flutter/tests/fakes/mouse_source.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_TESTS_FAKES_MOUSE_SOURCE_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_TESTS_FAKES_MOUSE_SOURCE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_FAKES_MOUSE_SOURCE_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_FAKES_MOUSE_SOURCE_H_
 
 #include <fuchsia/ui/pointer/cpp/fidl.h>
 
@@ -34,4 +34,4 @@ class FakeMouseSource : public fuchsia::ui::pointer::MouseSource {
 
 }  // namespace flutter_runner::testing
 
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_TESTS_FAKES_MOUSE_SOURCE_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_FAKES_MOUSE_SOURCE_H_
diff --git a/shell/platform/fuchsia/flutter/tests/fakes/platform_message.h b/shell/platform/fuchsia/flutter/tests/fakes/platform_message.h
index e024b9bc85da738e3c227d4889e0f6ecee1a22dd..f39f3513ba81a48ce1d726cda2b652a131783d2d 100644
--- a/shell/platform/fuchsia/flutter/tests/fakes/platform_message.h
+++ b/shell/platform/fuchsia/flutter/tests/fakes/platform_message.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_TESTS_FAKES_PLATFORM_MESSAGE_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_TESTS_FAKES_PLATFORM_MESSAGE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_FAKES_PLATFORM_MESSAGE_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_FAKES_PLATFORM_MESSAGE_H_
 
 #include <gtest/gtest.h>
 #include <optional>
@@ -62,4 +62,4 @@ class FakePlatformMessageResponse : public PlatformMessageResponse {
 
 }  // namespace flutter_runner::testing
 
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_TESTS_FAKES_PLATFORM_MESSAGE_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_FAKES_PLATFORM_MESSAGE_H_
diff --git a/shell/platform/fuchsia/flutter/tests/fakes/scenic/BUILD.gn b/shell/platform/fuchsia/flutter/tests/fakes/scenic/BUILD.gn
index f1c40fd448be627402cc306fd0c3c7e7313b1579..d8ac33b6b0522e2d8c2e047bac206b956934de7e 100644
--- a/shell/platform/fuchsia/flutter/tests/fakes/scenic/BUILD.gn
+++ b/shell/platform/fuchsia/flutter/tests/fakes/scenic/BUILD.gn
@@ -4,6 +4,8 @@
 
 assert(is_fuchsia)
 
+import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
+
 source_set("scenic") {
   testonly = true
 
@@ -12,22 +14,16 @@ source_set("scenic") {
     "fake_flatland.h",
     "fake_flatland_types.cc",
     "fake_flatland_types.h",
-    "fake_resources.cc",
-    "fake_resources.h",
-    "fake_session.cc",
-    "fake_session.h",
   ]
 
   public_deps = [
-    "//build/fuchsia/fidl:fuchsia.images",
-    "//build/fuchsia/fidl:fuchsia.scenic.scheduling",
-    "//build/fuchsia/fidl:fuchsia.ui.composition",
-    "//build/fuchsia/fidl:fuchsia.ui.gfx",
-    "//build/fuchsia/fidl:fuchsia.ui.scenic",
-    "//build/fuchsia/fidl:fuchsia.ui.views",
-    "//build/fuchsia/pkg:async-cpp",
-    "//build/fuchsia/pkg:async-testing",
-    "//build/fuchsia/pkg:fidl_cpp",
+    "${fuchsia_sdk}/fidl/fuchsia.images",
+    "${fuchsia_sdk}/fidl/fuchsia.scenic.scheduling",
+    "${fuchsia_sdk}/fidl/fuchsia.ui.composition",
+    "${fuchsia_sdk}/fidl/fuchsia.ui.views",
+    "${fuchsia_sdk}/pkg/async-cpp",
+    "${fuchsia_sdk}/pkg/async-testing",
+    "${fuchsia_sdk}/pkg/fidl_cpp",
     "//flutter/fml",
   ]
 }
diff --git a/shell/platform/fuchsia/flutter/tests/fakes/scenic/fake_flatland.cc b/shell/platform/fuchsia/flutter/tests/fakes/scenic/fake_flatland.cc
index 4c782089df38e2a083a45b5a1ac6643925c656c8..8322275507ea7dda5b382319bd3b0126c6c4eaf0 100644
--- a/shell/platform/fuchsia/flutter/tests/fakes/scenic/fake_flatland.cc
+++ b/shell/platform/fuchsia/flutter/tests/fakes/scenic/fake_flatland.cc
@@ -853,6 +853,29 @@ void FakeFlatland::SetHitRegions(
   transform->hit_regions = std::move(regions);
 }
 
+void FakeFlatland::SetInfiniteHitRegion(
+    fuchsia::ui::composition::TransformId transform_id,
+    fuchsia::ui::composition::HitTestInteraction hit_test) {
+  if (transform_id.value == 0) {
+    // TODO(fxb/85619): Raise a FlatlandError here
+    FML_CHECK(false)
+        << "FakeFlatland::SetTranslation: TransformId 0 is invalid.";
+    return;
+  }
+
+  auto found_transform = pending_graph_.transform_map.find(transform_id.value);
+  if (found_transform == pending_graph_.transform_map.end()) {
+    // TODO(fxb/85619): Raise a FlatlandError here
+    FML_CHECK(false) << "FakeFlatland::SetTranslation: TransformId "
+                     << transform_id.value << " does not exist.";
+    return;
+  }
+
+  auto& transform = found_transform->second;
+  ZX_ASSERT(transform);
+  transform->hit_regions = {kInfiniteHitRegion};
+}
+
 void FakeFlatland::Clear() {
   parents_map_.clear();
   pending_graph_.Clear();
diff --git a/shell/platform/fuchsia/flutter/tests/fakes/scenic/fake_flatland.h b/shell/platform/fuchsia/flutter/tests/fakes/scenic/fake_flatland.h
index 94ca6578f93e0495fb7050d6c822645fcf58eb2b..ac70c4641cc40dd3a931832cbdf0f7a7abf127bd 100644
--- a/shell/platform/fuchsia/flutter/tests/fakes/scenic/fake_flatland.h
+++ b/shell/platform/fuchsia/flutter/tests/fakes/scenic/fake_flatland.h
@@ -310,6 +310,11 @@ class FakeFlatland
       fuchsia::ui::composition::TransformId transform_id,
       std::vector<fuchsia::ui::composition::HitRegion> regions) override;
 
+  // |fuchsia::ui::composition::Flatland|
+  void SetInfiniteHitRegion(
+      fuchsia::ui::composition::TransformId transform_id,
+      fuchsia::ui::composition::HitTestInteraction hit_test) override;
+
   // |fuchsia::ui::composition::Flatland|
   void Clear() override;
 
diff --git a/shell/platform/fuchsia/flutter/tests/fakes/scenic/fake_flatland_types.h b/shell/platform/fuchsia/flutter/tests/fakes/scenic/fake_flatland_types.h
index 40f1648707e101d754abc293aef839cb4f22748b..2dbd8b5e8e90d015025d1de2062073126efbe999 100644
--- a/shell/platform/fuchsia/flutter/tests/fakes/scenic/fake_flatland_types.h
+++ b/shell/platform/fuchsia/flutter/tests/fakes/scenic/fake_flatland_types.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_FAKES_SCENIC_FAKE_FLATLAND_GRAPH_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_FAKES_SCENIC_FAKE_FLATLAND_GRAPH_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_FAKES_SCENIC_FAKE_FLATLAND_TYPES_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_FAKES_SCENIC_FAKE_FLATLAND_TYPES_H_
 
 #include <fuchsia/math/cpp/fidl.h>
 #include <fuchsia/ui/composition/cpp/fidl.h>
@@ -16,6 +16,7 @@
 #include <zircon/types.h>
 
 #include <algorithm>
+#include <cfloat>
 #include <cstdint>
 #include <optional>
 #include <unordered_map>
@@ -24,6 +25,9 @@
 
 #include "flutter/fml/macros.h"
 
+namespace fuchsia {
+namespace math {
+
 inline bool operator==(const fuchsia::math::SizeU& a,
                        const fuchsia::math::SizeU& b) {
   return a.width == b.width && a.height == b.height;
@@ -55,6 +59,20 @@ inline bool operator==(const fuchsia::math::RectF& a,
   return a.x == b.x && a.y == b.y && a.width == b.width && a.height == b.height;
 }
 
+inline bool operator==(const std::optional<fuchsia::math::Rect>& a,
+                       const std::optional<fuchsia::math::Rect>& b) {
+  if (a.has_value() != b.has_value()) {
+    return false;
+  }
+  if (!a.has_value()) {
+  }
+  return a.value() == b.value();
+}
+
+}  // namespace math
+
+namespace ui::composition {
+
 inline bool operator==(const fuchsia::ui::composition::ContentId& a,
                        const fuchsia::ui::composition::ContentId& b) {
   return a.value == b.value;
@@ -124,20 +142,15 @@ inline bool operator==(
   return true;
 }
 
-inline bool operator==(const std::optional<fuchsia::math::Rect>& a,
-                       const std::optional<fuchsia::math::Rect>& b) {
-  if (a.has_value() != b.has_value()) {
-    return false;
-  }
-  if (!a.has_value()) {
-  }
-  return a.value() == b.value();
-}
+}  // namespace ui::composition
+}  // namespace fuchsia
 
 namespace flutter_runner::testing {
 
 constexpr static fuchsia::ui::composition::TransformId kInvalidTransformId{0};
 constexpr static fuchsia::ui::composition::ContentId kInvalidContentId{0};
+constexpr static fuchsia::ui::composition::HitRegion kInfiniteHitRegion = {
+    .region = {-FLT_MAX, -FLT_MAX, FLT_MAX, FLT_MAX}};
 
 // Convenience structure which allows clients to easily create a valid
 // `ViewCreationToken` / `ViewportCreationToken` pair for use with Flatland
@@ -317,4 +330,4 @@ inline std::pair<zx_koid_t, zx_koid_t> GetKoids(
 
 };  // namespace flutter_runner::testing
 
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_FAKES_SCENIC_FAKE_FLATLAND_GRAPH_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_FAKES_SCENIC_FAKE_FLATLAND_TYPES_H_
diff --git a/shell/platform/fuchsia/flutter/tests/fakes/scenic/fake_resources.cc b/shell/platform/fuchsia/flutter/tests/fakes/scenic/fake_resources.cc
deleted file mode 100644
index ac4fda971fb674dcd9ff8be7e375b3502e4597a4..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/flutter/tests/fakes/scenic/fake_resources.cc
+++ /dev/null
@@ -1,311 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "fake_resources.h"
-
-#include "flutter/fml/logging.h"
-
-namespace flutter_runner::testing {
-namespace {
-
-using FakeResourceCache =
-    std::unordered_map<FakeResourceState*, std::shared_ptr<FakeResource>>;
-
-std::shared_ptr<FakeResource> ResourceFromState(
-    const std::shared_ptr<FakeResourceState>& resource,
-    FakeResourceCache& cache);
-std::vector<std::shared_ptr<FakeResource>> ResourcesFromStates(
-    const std::vector<std::shared_ptr<FakeResourceState>>& resources,
-    FakeResourceCache& cache);
-
-FakeNode NodeFromState(FakeNodeState* node, FakeResourceCache& cache) {
-  FML_CHECK(node);
-
-  return FakeNode{
-      .children = ResourcesFromStates(node->children, cache),
-      .rotation_quaternion = node->rotation_quaternion,
-      .scale_vector = node->scale_vector,
-      .translation_vector = node->translation_vector,
-      .anchor_vector = node->anchor_vector,
-      .hit_testable = node->hit_testable,
-      .semantically_visible = node->semantically_visible,
-  };
-}
-
-FakeEntityNode EntityNodeFromState(FakeEntityNodeState* entity_node,
-                                   FakeResourceCache& cache) {
-  FML_CHECK(entity_node);
-
-  // Convert clip planes.
-  std::vector<FakeEntityNode::ClipPlane> clip_planes;
-  for (auto& clip_plane : entity_node->clip_planes) {
-    clip_planes.emplace_back(FakeEntityNode::ClipPlane{
-        .dir = clip_plane.dir,
-        .dist = clip_plane.dist,
-    });
-  }
-
-  return FakeEntityNode{
-      .node_state = NodeFromState(&entity_node->node_state, cache),
-      .clip_planes = std::move(clip_planes),
-  };
-}
-
-FakeOpacityNode OpacityNodeFromState(FakeOpacityNodeState* opacity_node,
-                                     FakeResourceCache& cache) {
-  FML_CHECK(opacity_node);
-
-  return FakeOpacityNode{
-      .node_state = NodeFromState(&opacity_node->node_state, cache),
-      .opacity = opacity_node->opacity,
-  };
-}
-
-FakeShapeNode ShapeNodeFromState(FakeShapeNodeState* shape_node,
-                                 FakeResourceCache& cache) {
-  FML_CHECK(shape_node);
-
-  return FakeShapeNode{
-      .node_state = NodeFromState(&shape_node->node_state, cache),
-      .shape = ResourceFromState(shape_node->shape, cache),
-      .material = ResourceFromState(shape_node->material, cache),
-  };
-}
-
-FakeView ViewFromState(FakeViewState* view, FakeResourceCache& cache) {
-  FML_CHECK(view);
-
-  return FakeView{
-      .token = view->token.koid,
-      .control_ref = view->control_ref.koid,
-      .view_ref = view->view_ref.koid,
-      .debug_name = view->debug_name,
-      .children = ResourcesFromStates(view->children, cache),
-      .enable_debug_bounds = view->enable_debug_bounds,
-  };
-}
-
-FakeViewHolder ViewHolderFromState(FakeViewHolderState* view_holder,
-                                   FakeResourceCache& cache) {
-  FML_CHECK(view_holder);
-
-  return FakeViewHolder{
-      .token = view_holder->token.koid,
-      .debug_name = view_holder->debug_name,
-      .properties = view_holder->properties,
-      .bounds_color = view_holder->bounds_color,
-  };
-}
-
-FakeShape ShapeFromState(FakeShapeState* shape, FakeResourceCache& cache) {
-  FML_CHECK(shape);
-
-  auto snapshot = FakeShape{};
-  std::visit(
-      [&snapshot](auto&& shape_def) {
-        using T = std::decay_t<decltype(shape_def)>;
-        if constexpr (std::is_same_v<T, FakeShapeState::CircleDef>) {
-          snapshot.shape_def = FakeShape::CircleDef{
-              .radius = shape_def.radius,
-          };
-        } else if constexpr (std::is_same_v<T, FakeShapeState::RectangleDef>) {
-          snapshot.shape_def = FakeShape::RectangleDef{
-              .width = shape_def.width,
-              .height = shape_def.height,
-          };
-        } else if constexpr (std::is_same_v<
-                                 T, FakeShapeState::RoundedRectangleDef>) {
-          snapshot.shape_def = FakeShape::RoundedRectangleDef{
-              .width = shape_def.width,
-              .height = shape_def.height,
-              .top_left_radius = shape_def.top_left_radius,
-              .top_right_radius = shape_def.top_right_radius,
-              .bottom_right_radius = shape_def.bottom_right_radius,
-              .bottom_left_radius = shape_def.bottom_left_radius,
-          };
-        } else {
-          FML_CHECK(false);
-        }
-      },
-      shape->shape_def);
-
-  return snapshot;
-}
-
-FakeMaterial MaterialFromState(FakeMaterialState* material,
-                               FakeResourceCache& cache) {
-  FML_CHECK(material);
-
-  return FakeMaterial{
-      .image = ResourceFromState(material->image, cache),
-      .color = material->color,
-  };
-}
-
-FakeImage ImageFromState(FakeImageState* image, FakeResourceCache& cache) {
-  FML_CHECK(image);
-
-  auto snapshot = FakeImage{
-      .memory = ResourceFromState(image->memory, cache),
-  };
-  std::visit(
-      [&snapshot](auto&& image_def) {
-        using T = std::decay_t<decltype(image_def)>;
-        if constexpr (std::is_same_v<T, FakeImageState::ImageDef>) {
-          snapshot.image_def = FakeImage::ImageDef{
-              .info = image_def.info,
-              .memory_offset = image_def.memory_offset,
-          };
-        } else if constexpr (std::is_same_v<T, FakeImageState::Image2Def>) {
-          snapshot.image_def = FakeImage::Image2Def{
-              .buffer_collection_id = image_def.buffer_collection_id,
-              .buffer_collection_index = image_def.buffer_collection_index,
-              .width = image_def.width,
-              .height = image_def.height,
-          };
-        } else if constexpr (std::is_same_v<T, FakeImageState::Image3Def>) {
-          snapshot.image_def = FakeImage::Image3Def{
-              .import_token = image_def.import_token.koid,
-              .buffer_collection_index = image_def.buffer_collection_index,
-              .width = image_def.width,
-              .height = image_def.height,
-          };
-        } else if constexpr (std::is_same_v<T, FakeImageState::ImagePipe2Def>) {
-          snapshot.image_def = FakeImage::ImagePipe2Def{
-              .image_pipe_request = image_def.image_pipe_request.koid,
-          };
-        } else {
-          FML_CHECK(false);
-        }
-      },
-      image->image_def);
-
-  return snapshot;
-}
-
-FakeMemory MemoryFromState(FakeMemoryState* memory, FakeResourceCache& cache) {
-  FML_CHECK(memory);
-
-  return FakeMemory{
-      .vmo = memory->vmo.koid,
-      .allocation_size = memory->allocation_size,
-      .is_device_memory = memory->is_device_memory,
-  };
-}
-
-std::shared_ptr<FakeResource> ResourceFromState(
-    const std::shared_ptr<FakeResourceState>& resource,
-    FakeResourceCache& cache) {
-  if (!resource) {
-    return std::shared_ptr<FakeResource>();
-  }
-
-  // Try to hit the cache first...
-  auto cache_it = cache.find(resource.get());
-  if (cache_it != cache.end()) {
-    return cache_it->second;
-  }
-
-  // Otherwise create a brand-new snapshot.
-  std::shared_ptr<FakeResource> snapshot =
-      std::make_shared<FakeResource>(FakeResource{
-          .id = resource->id,
-          .label = resource->label,
-          .event_mask = resource->event_mask,
-      });
-  std::visit(
-      [&snapshot, &resource, &cache](auto&& state) {
-        using T = std::decay_t<decltype(state)>;
-        if constexpr (std::is_same_v<T, FakeEntityNodeState>) {
-          snapshot->state = EntityNodeFromState(
-              std::get_if<FakeEntityNodeState>(&resource->state), cache);
-        } else if constexpr (std::is_same_v<T, FakeOpacityNodeState>) {
-          snapshot->state = OpacityNodeFromState(
-              std::get_if<FakeOpacityNodeState>(&resource->state), cache);
-        } else if constexpr (std::is_same_v<T, FakeShapeNodeState>) {
-          snapshot->state = ShapeNodeFromState(
-              std::get_if<FakeShapeNodeState>(&resource->state), cache);
-        } else if constexpr (std::is_same_v<T, FakeViewState>) {
-          snapshot->state = ViewFromState(
-              std::get_if<FakeViewState>(&resource->state), cache);
-        } else if constexpr (std::is_same_v<T, FakeViewHolderState>) {
-          snapshot->state = ViewHolderFromState(
-              std::get_if<FakeViewHolderState>(&resource->state), cache);
-        } else if constexpr (std::is_same_v<T, FakeShapeState>) {
-          snapshot->state = ShapeFromState(
-              std::get_if<FakeShapeState>(&resource->state), cache);
-        } else if constexpr (std::is_same_v<T, FakeMaterialState>) {
-          snapshot->state = MaterialFromState(
-              std::get_if<FakeMaterialState>(&resource->state), cache);
-        } else if constexpr (std::is_same_v<T, FakeImageState>) {
-          snapshot->state = ImageFromState(
-              std::get_if<FakeImageState>(&resource->state), cache);
-        } else if constexpr (std::is_same_v<T, FakeMemoryState>) {
-          snapshot->state = MemoryFromState(
-              std::get_if<FakeMemoryState>(&resource->state), cache);
-        } else {
-          FML_CHECK(false);
-        }
-      },
-      resource->state);
-  auto [_, cache_success] =
-      cache.emplace(std::make_pair(resource.get(), snapshot));
-  FML_CHECK(cache_success);
-
-  return snapshot;
-}
-
-std::vector<std::shared_ptr<FakeResource>> ResourcesFromStates(
-    const std::vector<std::shared_ptr<FakeResourceState>>& resources,
-    FakeResourceCache& cache) {
-  std::vector<std::shared_ptr<FakeResource>> snapshots;
-
-  for (auto& resource : resources) {
-    snapshots.emplace_back(ResourceFromState(resource, cache));
-  }
-  return snapshots;
-}
-
-}  // namespace
-
-FakeSceneGraph SceneGraphFromState(const FakeSceneGraphState& state) {
-  FakeResourceCache resource_cache;
-  FakeSceneGraph scene_graph;
-
-  // Snapshot all buffer collections.
-  for (auto& buffer_collection : state.buffer_collection_map) {
-    scene_graph.buffer_collection_map.emplace(
-        std::make_pair(buffer_collection.first, buffer_collection.second.koid));
-  }
-
-  // Snapshot resources in the map recursively.
-  for (auto& resource : state.resource_map) {
-    scene_graph.resource_map.emplace(std::make_pair(
-        resource.first, ResourceFromState(resource.second, resource_cache)));
-  }
-
-  // Snapshot labels in the map.
-  for (auto& label_resources : state.label_map) {
-    auto [label_iter, label_success] =
-        scene_graph.label_map.emplace(std::make_pair(
-            label_resources.first, std::vector<std::weak_ptr<FakeResource>>()));
-    FML_CHECK(label_success);
-    auto& snapshot_label_resources = label_iter->second;
-
-    for (auto& resource : label_resources.second) {
-      auto resource_ptr = resource.lock();
-      FML_CHECK(resource_ptr);
-
-      snapshot_label_resources.emplace_back(
-          ResourceFromState(resource_ptr, resource_cache));
-    }
-  }
-
-  // Snapshot the view id.
-  scene_graph.root_view_id = state.root_view_id;
-
-  return scene_graph;
-}
-
-}  // namespace flutter_runner::testing
diff --git a/shell/platform/fuchsia/flutter/tests/fakes/scenic/fake_resources.h b/shell/platform/fuchsia/flutter/tests/fakes/scenic/fake_resources.h
deleted file mode 100644
index 5a6484bc3f59c686883d35cdbe030f7bc846d446..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/flutter/tests/fakes/scenic/fake_resources.h
+++ /dev/null
@@ -1,538 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_FAKES_SCENIC_FAKE_RESOURCES_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_FAKES_SCENIC_FAKE_RESOURCES_H_
-
-#include <fuchsia/images/cpp/fidl.h>
-#include <fuchsia/sysmem/cpp/fidl.h>
-#include <fuchsia/ui/composition/cpp/fidl.h>
-#include <fuchsia/ui/gfx/cpp/fidl.h>
-#include <fuchsia/ui/views/cpp/fidl.h>
-#include <lib/fidl/cpp/interface_handle.h>
-#include <lib/fidl/cpp/interface_request.h>
-#include <lib/zx/vmo.h>
-#include <zircon/types.h>
-
-#include <array>
-#include <memory>
-#include <string>
-#include <unordered_map>
-#include <variant>
-#include <vector>
-
-inline bool operator==(const fuchsia::images::ImageInfo& a,
-                       const fuchsia::images::ImageInfo& b) {
-  return a.height == b.height && a.width == b.width && a.stride == b.stride &&
-         a.tiling == b.tiling && a.transform == b.transform &&
-         a.alpha_format == b.alpha_format && a.pixel_format == b.pixel_format &&
-         a.color_space == b.color_space;
-}
-
-inline bool operator==(const fuchsia::ui::gfx::vec3& a,
-                       const fuchsia::ui::gfx::vec3& b) {
-  return a.x == b.x && a.y == b.y && a.z == b.z;
-}
-
-inline bool operator==(const fuchsia::ui::gfx::BoundingBox& a,
-                       const fuchsia::ui::gfx::BoundingBox& b) {
-  return a.min == b.min && a.max == b.max;
-}
-
-inline bool operator==(const fuchsia::ui::gfx::ViewProperties& a,
-                       const fuchsia::ui::gfx::ViewProperties& b) {
-  return a.downward_input == b.downward_input &&
-         a.focus_change == b.focus_change && a.bounding_box == b.bounding_box &&
-         a.inset_from_min == b.inset_from_min &&
-         a.inset_from_max == b.inset_from_max;
-}
-
-namespace flutter_runner::testing {
-
-// Forward declarations
-template <typename S>
-struct FakeResourceT;
-
-// Unique (within a Session) identifier for a Resource.
-using FakeResourceId = decltype(fuchsia::ui::gfx::CreateResourceCmd::id);
-constexpr FakeResourceId kInvalidFakeResourceId = 0u;
-
-// Tag type for a Resource "state".  The Resource state keeps alive any handles
-// associated with a resource e.g. view token or sysmem token.
-//
-// "snapshot" Resources are generated from "state" Resources during
-// `SceneGraphFromState()` calls.
-//
-// The `FakeSession` stores `FakeResourceT<StateT>` internally.
-struct StateT {
-  using ResourceT = FakeResourceT<StateT>;
-
-  template <typename T>
-  struct HandleT {
-    T value{};
-    zx_koid_t koid{ZX_KOID_INVALID};
-  };
-
-  template <typename T>
-  static bool HandlesAreEqual(const HandleT<T>& token,
-                              const HandleT<T>& other_token) {
-    return token.koid == other_token.koid;
-  }
-};
-
-// Tag type for a Resource "snapshot".  The Resource snapshot only stores koids
-// for any handles associated with the resource; in this way it doesn't have any
-// control over the underlying handle lifetime.
-//
-// "snapshot" Resources are generated from "state" Resources during
-// `SceneGraphFromState()` calls.
-//
-// The `FakeSession` returns `FakeResourceT<SnapshotT>` from its `SceneGraph()`
-// accessor.
-struct SnapshotT {
-  using ResourceT = FakeResourceT<SnapshotT>;
-
-  template <typename T>
-  using HandleT = zx_koid_t;
-
-  template <typename T>
-  static bool HandlesAreEqual(const HandleT<T>& token,
-                              const HandleT<T>& other_token) {
-    return token == other_token;
-  }
-};
-
-// Common state for Node-typed Resources:  EntityNode, OpacityNode, ShapeNode,
-// ViewHolder.
-//
-// FakeNodeT's are never used directly, only as an embedded field of a
-// Node-typed resource.
-template <typename S>
-struct FakeNodeT {
-  bool operator==(const FakeNodeT& other) const;
-
-  constexpr static std::array<float, 4> kDefaultZeroRotation{0.f, 0.f, 0.f,
-                                                             1.f};
-  constexpr static std::array<float, 3> kDefaultOneScale{1.f, 1.f, 1.f};
-  constexpr static std::array<float, 3> kDefaultZeroTranslation{0.f, 0.f, 0.f};
-  constexpr static std::array<float, 3> kDefaultZeroAnchor{0.f, 0.f, 0.f};
-  constexpr static bool kIsHitTestable{true};
-  constexpr static bool kIsNotHitTestable{false};
-  constexpr static bool kIsSemanticallyVisible{true};
-  constexpr static bool kIsNotSemanticallyVisible{false};
-
-  std::vector<std::shared_ptr<typename S::ResourceT>> children;
-  std::array<float, 4> rotation_quaternion{kDefaultZeroRotation};
-  std::array<float, 3> scale_vector{kDefaultOneScale};
-  std::array<float, 3> translation_vector{kDefaultZeroTranslation};
-  std::array<float, 3> anchor_vector{kDefaultZeroAnchor};
-  bool hit_testable{kIsHitTestable};
-  bool semantically_visible{kIsSemanticallyVisible};
-};
-
-using FakeNodeState = FakeNodeT<StateT>;
-using FakeNode = FakeNodeT<SnapshotT>;
-
-// EntityNode Resource state.
-template <typename S>
-struct FakeEntityNodeT {
-  struct ClipPlane {
-    bool operator==(const ClipPlane& other) const;
-
-    constexpr static std::array<float, 3> kDefaultZeroDir{0.f, 0.f, 0.f};
-    constexpr static float kDefaultZeroDist{0.f};
-
-    std::array<float, 3> dir{kDefaultZeroDir};
-    float dist{kDefaultZeroDist};
-  };
-
-  bool operator==(const FakeEntityNodeT& other) const;
-
-  FakeNodeT<S> node_state;
-
-  std::vector<ClipPlane> clip_planes;
-};
-using FakeEntityNodeState = FakeEntityNodeT<StateT>;
-using FakeEntityNode = FakeEntityNodeT<SnapshotT>;
-
-// OpacityNode Resource state.
-template <typename S>
-struct FakeOpacityNodeT {
-  bool operator==(const FakeOpacityNodeT& other) const;
-
-  FakeNodeT<S> node_state;
-
-  constexpr static float kDefaultOneOpacity{1.f};
-
-  float opacity{kDefaultOneOpacity};
-};
-using FakeOpacityNodeState = FakeOpacityNodeT<StateT>;
-using FakeOpacityNode = FakeOpacityNodeT<SnapshotT>;
-
-// ShapeNode Resource state.
-template <typename S>
-struct FakeShapeNodeT {
-  bool operator==(const FakeShapeNodeT& other) const;
-
-  FakeNodeT<S> node_state;
-
-  std::shared_ptr<typename S::ResourceT> shape;
-  std::shared_ptr<typename S::ResourceT> material;
-};
-using FakeShapeNodeState = FakeShapeNodeT<StateT>;
-using FakeShapeNode = FakeShapeNodeT<SnapshotT>;
-
-// View Resource state.
-template <typename S>
-struct FakeViewT {
-  bool operator==(const FakeViewT& other) const;
-
-  constexpr static bool kDebugBoundsEnabled{true};
-  constexpr static bool kDebugBoundsDisbaled{false};
-
-  typename S::template HandleT<fuchsia::ui::views::ViewToken> token{};
-  typename S::template HandleT<fuchsia::ui::views::ViewRefControl>
-      control_ref{};
-  typename S::template HandleT<fuchsia::ui::views::ViewRef> view_ref{};
-  std::string debug_name{};
-
-  std::vector<std::shared_ptr<typename S::ResourceT>> children;
-  bool enable_debug_bounds{kDebugBoundsDisbaled};
-};
-using FakeViewState = FakeViewT<StateT>;
-using FakeView = FakeViewT<SnapshotT>;
-
-// ViewHolder Resource state.
-template <typename S>
-struct FakeViewHolderT {
-  bool operator==(const FakeViewHolderT& other) const;
-
-  FakeNodeT<S> node_state;
-
-  constexpr static std::array<float, 4> kDefaultBoundsColorWhite{1.f, 1.f, 1.f,
-                                                                 1.f};
-  typename S::template HandleT<fuchsia::ui::views::ViewHolderToken> token{};
-  std::string debug_name{};
-
-  fuchsia::ui::gfx::ViewProperties properties;
-  std::array<float, 4> bounds_color{kDefaultBoundsColorWhite};
-};
-using FakeViewHolderState = FakeViewHolderT<StateT>;
-using FakeViewHolder = FakeViewHolderT<SnapshotT>;
-
-// Shape Resource state.
-template <typename S>
-struct FakeShapeT {
-  bool operator==(const FakeShapeT& other) const;
-
-  struct CircleDef {
-    bool operator==(const CircleDef& other) const;
-
-    float radius{0.f};
-  };
-
-  struct RectangleDef {
-    bool operator==(const RectangleDef& other) const;
-
-    float width{0.f};
-    float height{0.f};
-  };
-
-  struct RoundedRectangleDef {
-    bool operator==(const RoundedRectangleDef& other) const;
-
-    float width{0.f};
-    float height{0.f};
-    float top_left_radius{0.f};
-    float top_right_radius{0.f};
-    float bottom_right_radius{0.f};
-    float bottom_left_radius{0.f};
-  };
-
-  std::variant<CircleDef, RectangleDef, RoundedRectangleDef> shape_def;
-};
-using FakeShapeState = FakeShapeT<StateT>;
-using FakeShape = FakeShapeT<SnapshotT>;
-
-// Material Resource state.
-template <typename S>
-struct FakeMaterialT {
-  bool operator==(const FakeMaterialT& other) const;
-
-  constexpr static std::array<float, 4> kDefaultColorWhite{1.f, 1.f, 1.f, 1.f};
-
-  std::shared_ptr<typename S::ResourceT> image;
-  std::array<float, 4> color{kDefaultColorWhite};
-};
-using FakeMaterialState = FakeMaterialT<StateT>;
-using FakeMaterial = FakeMaterialT<SnapshotT>;
-
-// Image Resource state.
-template <typename S>
-struct FakeImageT {
-  struct ImageDef {
-    bool operator==(const ImageDef& other) const;
-
-    fuchsia::images::ImageInfo info{};
-    uint32_t memory_offset{};
-  };
-
-  struct Image2Def {
-    bool operator==(const Image2Def& other) const;
-
-    uint32_t buffer_collection_id{};
-    uint32_t buffer_collection_index{};
-    uint32_t width{};
-    uint32_t height{};
-  };
-
-  struct Image3Def {
-    bool operator==(const Image3Def& other) const;
-
-    typename S::template HandleT<
-        fuchsia::ui::composition::BufferCollectionImportToken>
-        import_token{};
-    uint32_t buffer_collection_index{};
-    uint32_t width{};
-    uint32_t height{};
-  };
-
-  struct ImagePipe2Def {
-    bool operator==(const ImagePipe2Def& other) const;
-
-    typename S::template HandleT<
-        fidl::InterfaceRequest<fuchsia::images::ImagePipe2>>
-        image_pipe_request{};
-  };
-
-  bool operator==(const FakeImageT& other) const;
-
-  std::variant<ImageDef, Image2Def, Image3Def, ImagePipe2Def> image_def;
-  std::shared_ptr<typename S::ResourceT> memory;
-};
-using FakeImageState = FakeImageT<StateT>;
-using FakeImage = FakeImageT<SnapshotT>;
-
-// Memory Resource state.
-template <typename S>
-struct FakeMemoryT {
-  bool operator==(const FakeMemoryT& other) const;
-
-  constexpr static bool kIsDeviceMemory{true};
-  constexpr static bool kIsNotDeviceMemory{false};
-
-  typename S::template HandleT<zx::vmo> vmo{};
-  uint64_t allocation_size{};
-  bool is_device_memory{kIsNotDeviceMemory};
-};
-using FakeMemoryState = FakeMemoryT<StateT>;
-using FakeMemory = FakeMemoryT<SnapshotT>;
-
-// A complete Resource which records common Resource data and stores it's
-// type-specific state inside of a variant.
-template <typename S>
-struct FakeResourceT {
-  bool operator==(const FakeResourceT& other) const;
-
-  constexpr static uint32_t kDefaultEmptyEventMask{0};
-
-  FakeResourceId id{kInvalidFakeResourceId};
-
-  std::string label{};
-  uint32_t event_mask{kDefaultEmptyEventMask};
-
-  std::variant<FakeEntityNodeT<S>,
-               FakeOpacityNodeT<S>,
-               FakeShapeNodeT<S>,
-               FakeViewT<S>,
-               FakeViewHolderT<S>,
-               FakeShapeT<S>,
-               FakeMaterialT<S>,
-               FakeImageT<S>,
-               FakeMemoryT<S>>
-      state;
-};
-using FakeResourceState = FakeResourceT<StateT>;
-using FakeResource = FakeResourceT<SnapshotT>;
-
-// A complete scene graph which records a forest of Resource trees.
-//
-// It also records auxiliary data like buffer collection IDs and resource labels
-// for fast lookup.
-//
-// Each Session / scene graph may only have a single View Resource which is
-// treated as the root of that scene.  The root View and all Resources
-// descending from it are what the real scenic implementation would submit for
-// rendering.
-template <typename S>
-struct FakeSceneGraphT {
-  bool operator==(const FakeSceneGraphT& other) const;
-
-  std::unordered_map<uint32_t,
-                     typename S::template HandleT<fidl::InterfaceHandle<
-                         fuchsia::sysmem::BufferCollectionToken>>>
-      buffer_collection_map;
-
-  std::unordered_map<FakeResourceId, std::shared_ptr<FakeResourceT<S>>>
-      resource_map;
-  std::unordered_map<std::string, std::vector<std::weak_ptr<FakeResourceT<S>>>>
-      label_map;
-  FakeResourceId root_view_id{kInvalidFakeResourceId};
-};
-using FakeSceneGraphState = FakeSceneGraphT<StateT>;
-using FakeSceneGraph = FakeSceneGraphT<SnapshotT>;
-
-// Generate a snapshot of a scene graph from that scene graph's state.
-//
-// The lifetime of the snapshot and its Resources has no influence on the
-// lifetime of the source scene graph or its Resources.
-FakeSceneGraph SceneGraphFromState(const FakeSceneGraphState& state);
-
-template <typename S>
-bool FakeEntityNodeT<S>::ClipPlane::operator==(
-    const FakeEntityNodeT<S>::ClipPlane& other) const {
-  return dir == other.dir && dist == other.dist;
-}
-
-template <typename S>
-bool FakeNodeT<S>::operator==(const FakeNodeT<S>& other) const {
-  return children == other.children &&
-         rotation_quaternion == other.rotation_quaternion &&
-         scale_vector == other.scale_vector &&
-         translation_vector == other.translation_vector &&
-         anchor_vector == other.anchor_vector &&
-         hit_testable == other.hit_testable &&
-         semantically_visible == other.semantically_visible;
-}
-
-template <typename S>
-bool FakeEntityNodeT<S>::operator==(const FakeEntityNodeT<S>& other) const {
-  return node_state == other.node_state && clip_planes == other.clip_planes;
-}
-
-template <typename S>
-bool FakeOpacityNodeT<S>::operator==(const FakeOpacityNodeT<S>& other) const {
-  return node_state == other.node_state && opacity == other.opacity;
-}
-
-template <typename S>
-bool FakeShapeNodeT<S>::operator==(const FakeShapeNodeT<S>& other) const {
-  return node_state == other.node_state && shape == other.shape &&
-         material == other.material;
-}
-
-template <typename S>
-bool FakeViewT<S>::operator==(const FakeViewT<S>& other) const {
-  return S::template HandlesAreEqual<fuchsia::ui::views::ViewToken>(
-             token, other.token) &&
-         S::template HandlesAreEqual<fuchsia::ui::views::ViewRefControl>(
-             control_ref, other.control_ref) &&
-         S::template HandlesAreEqual<fuchsia::ui::views::ViewRef>(
-             view_ref, other.view_ref) &&
-         children == other.children && debug_name == other.debug_name &&
-         enable_debug_bounds == other.enable_debug_bounds;
-}
-
-template <typename S>
-bool FakeViewHolderT<S>::operator==(const FakeViewHolderT<S>& other) const {
-  return FakeNodeT<S>::operator==(other) &&
-         S::template HandlesAreEqual<fuchsia::ui::views::ViewHolderToken>(
-             token, other.token) &&
-         debug_name == other.debug_name && properties == other.properties &&
-         bounds_color == other.bounds_color;
-}
-
-template <typename S>
-bool FakeShapeT<S>::CircleDef::operator==(
-    const FakeShapeT<S>::CircleDef& other) const {
-  return radius == other.radius;
-}
-
-template <typename S>
-bool FakeShapeT<S>::RectangleDef::operator==(
-    const FakeShapeT<S>::RectangleDef& other) const {
-  return width == other.width && height == other.height;
-}
-
-template <typename S>
-bool FakeShapeT<S>::RoundedRectangleDef::operator==(
-    const FakeShapeT<S>::RoundedRectangleDef& other) const {
-  return width == other.width && height == other.height &&
-         top_left_radius == other.top_left_radius &&
-         top_right_radius == other.top_right_radius &&
-         bottom_right_radius == other.bottom_right_radius &&
-         bottom_left_radius == other.bottom_left_radius;
-}
-
-template <typename S>
-bool FakeShapeT<S>::operator==(const FakeShapeT<S>& other) const {
-  return shape_def == other.shape_def;
-}
-
-template <typename S>
-bool FakeMaterialT<S>::operator==(const FakeMaterialT<S>& other) const {
-  return image == other.image && color == other.color;
-}
-
-template <typename S>
-bool FakeImageT<S>::ImageDef::operator==(
-    const FakeImageT<S>::ImageDef& other) const {
-  return info == other.info && memory_offset == other.memory_offset;
-}
-
-template <typename S>
-bool FakeImageT<S>::Image2Def::operator==(
-    const FakeImageT<S>::Image2Def& other) const {
-  return buffer_collection_id == other.buffer_collection_id &&
-         buffer_collection_index == other.buffer_collection_index &&
-         width == other.width && height == other.height;
-}
-
-template <typename S>
-bool FakeImageT<S>::Image3Def::operator==(
-    const FakeImageT<S>::Image3Def& other) const {
-  return S::template HandlesAreEqual<
-             fuchsia::ui::composition::BufferCollectionImportToken>(
-             import_token, other.import_token) &&
-         buffer_collection_index == other.buffer_collection_index &&
-         width == other.width && height == other.height;
-}
-
-template <typename S>
-bool FakeImageT<S>::ImagePipe2Def::operator==(
-    const FakeImageT<S>::ImagePipe2Def& other) const {
-  return S::template HandlesAreEqual<
-      fidl::InterfaceRequest<fuchsia::images::ImagePipe2>>(
-      image_pipe_request, other.image_pipe_request);
-}
-
-template <typename S>
-bool FakeImageT<S>::operator==(const FakeImageT<S>& other) const {
-  return image_def == other.image_def && memory == other.memory;
-}
-
-template <typename S>
-bool FakeMemoryT<S>::operator==(const FakeMemoryT<S>& other) const {
-  return S::template HandlesAreEqual<zx::vmo>(vmo, other.vmo) &&
-         allocation_size == other.allocation_size &&
-         is_device_memory == other.is_device_memory;
-}
-
-template <typename S>
-bool FakeResourceT<S>::operator==(const FakeResourceT<S>& other) const {
-  return id == other.id && label == other.label &&
-         event_mask == other.event_mask && state == other.state;
-}
-
-template <typename S>
-bool FakeSceneGraphT<S>::operator==(const FakeSceneGraphT<S>& other) const {
-  return buffer_collection_map == other.buffer_collection_map &&
-         resource_map ==
-             other.resource_map &&  // labels_map == other.labels_map &&
-         root_view_id == other.root_view_id;
-}
-
-}  // namespace flutter_runner::testing
-
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_FAKES_SCENIC_FAKE_RESOURCES_H_
diff --git a/shell/platform/fuchsia/flutter/tests/fakes/scenic/fake_session.cc b/shell/platform/fuchsia/flutter/tests/fakes/scenic/fake_session.cc
deleted file mode 100644
index 133360acd21acd802e6a8a966a877f856bc66269..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/flutter/tests/fakes/scenic/fake_session.cc
+++ /dev/null
@@ -1,1161 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "fake_session.h"
-
-#include <zircon/types.h>
-
-#include <algorithm>  // For remove_if
-#include <iterator>   // For make_move_iterator
-#include <memory>
-
-#include "flutter/fml/logging.h"
-#include "flutter/shell/platform/fuchsia/flutter/tests/fakes/scenic/fake_resources.h"
-#include "fuchsia/images/cpp/fidl.h"
-
-namespace flutter_runner::testing {
-namespace {
-
-template <typename T>
-constexpr bool is_node_v = std::is_same_v<T, FakeEntityNodeState> ||
-                           std::is_same_v<T, FakeOpacityNodeState> ||
-                           std::is_same_v<T, FakeShapeNodeState> ||
-                           std::is_same_v<T, FakeViewHolderState>;
-
-template <typename T>
-bool ResourceIs(const FakeResourceState& resource) {
-  return std::holds_alternative<T>(resource.state);
-}
-
-bool ResourceIsNode(const FakeResourceState& resource) {
-  return ResourceIs<FakeEntityNodeState>(resource) ||
-         ResourceIs<FakeOpacityNodeState>(resource) ||
-         ResourceIs<FakeShapeNodeState>(resource) ||
-         ResourceIs<FakeViewHolderState>(resource);
-}
-
-zx_koid_t GetKoid(zx_handle_t handle) {
-  if (handle == ZX_HANDLE_INVALID) {
-    return ZX_KOID_INVALID;
-  }
-
-  zx_info_handle_basic_t info;
-  zx_status_t status = zx_object_get_info(handle, ZX_INFO_HANDLE_BASIC, &info,
-                                          sizeof(info), nullptr, nullptr);
-  return status == ZX_OK ? info.koid : ZX_KOID_INVALID;
-}
-
-}  // namespace
-
-FakeSession::FakeSession() : binding_(this) {}
-
-FakeSession::SessionAndListenerClientPair FakeSession::Bind(
-    async_dispatcher_t* dispatcher) {
-  FML_CHECK(!listener_.is_bound());
-  FML_CHECK(!binding_.is_bound());
-
-  fidl::InterfaceHandle<fuchsia::ui::scenic::Session> session;
-  auto listener_request = listener_.NewRequest(dispatcher);
-  binding_.Bind(session.NewRequest(), dispatcher);
-
-  return std::make_pair(std::move(session), std::move(listener_request));
-}
-
-void FakeSession::SetPresentHandler(PresentHandler present_handler) {
-  present_handler_ = std::move(present_handler);
-}
-
-void FakeSession::SetPresent2Handler(Present2Handler present2_handler) {
-  present2_handler_ = std::move(present2_handler);
-}
-
-void FakeSession::SetRequestPresentationTimesHandler(
-    RequestPresentationTimesHandler request_presentation_times_handler) {
-  request_presentation_times_handler_ =
-      std::move(request_presentation_times_handler);
-}
-
-void FakeSession::FireOnFramePresentedEvent(
-    fuchsia::scenic::scheduling::FramePresentedInfo frame_presented_info) {
-  FML_CHECK(is_bound());
-
-  binding_.events().OnFramePresented(std::move(frame_presented_info));
-}
-
-void FakeSession::DisconnectSession() {
-  // Unbind the channels and drop them on the floor, simulating Scenic behavior.
-  binding_.Unbind();
-  listener_.Unbind();
-}
-
-void FakeSession::NotImplemented_(const std::string& name) {
-  FML_LOG(FATAL) << "FakeSession does not implement " << name;
-}
-
-void FakeSession::Enqueue(std::vector<fuchsia::ui::scenic::Command> cmds) {
-  // Append `cmds` to the end of the command queue, preferring to move elements
-  // when possible.
-  command_queue_.insert(command_queue_.end(),
-                        std::make_move_iterator(cmds.begin()),
-                        std::make_move_iterator(cmds.end()));
-}
-
-void FakeSession::Present(uint64_t presentation_time,
-                          std::vector<zx::event> acquire_fences,
-                          std::vector<zx::event> release_fences,
-                          PresentCallback callback) {
-  ApplyCommands();
-
-  PresentHandler present_handler =
-      present_handler_ ? present_handler_ : [](auto... args) -> auto {
-    return fuchsia::images::PresentationInfo{};
-  };
-
-  auto present_info = present_handler_(
-      presentation_time, std::move(acquire_fences), std::move(release_fences));
-  if (callback) {
-    callback(std::move(present_info));
-  }
-}
-
-void FakeSession::Present2(fuchsia::ui::scenic::Present2Args args,
-                           Present2Callback callback) {
-  ApplyCommands();
-
-  Present2Handler present2_handler =
-      present2_handler_ ? present2_handler_ : [](auto args) -> auto {
-    return fuchsia::scenic::scheduling::FuturePresentationTimes{
-        .future_presentations = {},
-        .remaining_presents_in_flight_allowed = 1,
-    };
-  };
-
-  auto future_presentation_times = present2_handler(std::move(args));
-  if (callback) {
-    callback(std::move(future_presentation_times));
-  }
-}
-
-void FakeSession::RequestPresentationTimes(
-    int64_t requested_prediction_span,
-    RequestPresentationTimesCallback callback) {
-  RequestPresentationTimesHandler request_presentation_times_handler =
-      request_presentation_times_handler_ ? request_presentation_times_handler_
-                                          : [](auto args) -> auto {
-    return fuchsia::scenic::scheduling::FuturePresentationTimes{
-        .future_presentations = {},
-        .remaining_presents_in_flight_allowed = 1,
-    };
-  };
-
-  auto future_presentation_times =
-      request_presentation_times_handler(requested_prediction_span);
-  if (callback) {
-    callback(std::move(future_presentation_times));
-  }
-}
-
-void FakeSession::RegisterBufferCollection(
-    uint32_t buffer_id,
-    fidl::InterfaceHandle<fuchsia::sysmem::BufferCollectionToken> token) {
-  zx_koid_t token_koid = GetKoid(token.channel().get());
-  auto [_, buffer_success] =
-      scene_graph_.buffer_collection_map.emplace(std::make_pair(
-          buffer_id,
-          StateT::HandleT<
-              fidl::InterfaceHandle<fuchsia::sysmem::BufferCollectionToken>>{
-              std::move(token), token_koid}));
-  FML_CHECK(buffer_success);
-}
-
-void FakeSession::DeregisterBufferCollection(uint32_t buffer_id) {
-  size_t erased = scene_graph_.buffer_collection_map.erase(buffer_id);
-  FML_CHECK(erased == 1);
-}
-
-void FakeSession::SetDebugName(std::string debug_name) {
-  debug_name_ = std::move(debug_name);
-}
-
-std::shared_ptr<FakeResourceState> FakeSession::GetResource(FakeResourceId id) {
-  FML_CHECK(id != kInvalidFakeResourceId);
-  auto resource_it = scene_graph_.resource_map.find(id);
-  FML_CHECK(resource_it != scene_graph_.resource_map.end());
-  auto resource_ptr = resource_it->second;
-  FML_CHECK(resource_ptr);
-
-  return resource_ptr;
-}
-
-void FakeSession::AddResource(FakeResourceState&& resource) {
-  const FakeResourceId resource_id = resource.id;
-  FML_CHECK(resource_id != kInvalidFakeResourceId);
-
-  // Track the view id if the resource is a view.
-  if (ResourceIs<FakeViewState>(resource)) {
-    // If there was already a View in the scene graph, scenic prints a warning
-    // here but doesn't update the "root view" and allows the Session to
-    // continue.  See also: fxbug.dev/24450
-    if (scene_graph_.root_view_id == kInvalidFakeResourceId) {
-      scene_graph_.root_view_id = resource_id;
-    }
-  }
-
-  // Add to initial spot in parents map.
-  auto resource_ptr = std::make_shared<FakeResourceState>(
-      std::forward<FakeResourceState>(resource));
-  if (ResourceIsNode(*resource_ptr)) {
-    auto [_, parents_success] = parents_map_.emplace(std::make_pair(
-        resource_ptr.get(),
-        std::make_pair(std::weak_ptr<FakeResourceState>(resource_ptr),
-                       std::weak_ptr<FakeResourceState>())));
-    FML_CHECK(parents_success);
-  }
-
-  // Add to initial spot in labels map.
-  auto empty_label_it = scene_graph_.label_map.find("");
-  if (empty_label_it == scene_graph_.label_map.end()) {
-    auto [emplace_it, empty_label_success] = scene_graph_.label_map.emplace(
-        std::make_pair("", std::vector<std::weak_ptr<FakeResourceState>>()));
-    FML_CHECK(empty_label_success);
-    empty_label_it = emplace_it;
-  }
-  empty_label_it->second.emplace_back(resource_ptr);
-
-  // Add to resource map.
-  auto [__, resource_success] = scene_graph_.resource_map.emplace(
-      std::make_pair(resource_id, std::move(resource_ptr)));
-  FML_CHECK(resource_success);
-}
-
-void FakeSession::DetachResourceFromParent(
-    std::shared_ptr<FakeResourceState> resource_ptr,
-    std::shared_ptr<FakeResourceState> new_parent_ptr) {
-  FML_CHECK(resource_ptr);
-
-  // Remove reference from the parent's `children` array.
-  auto parent_it = parents_map_.find(resource_ptr.get());
-  FML_CHECK(parent_it != parents_map_.end());
-  if (auto parent_ptr = parent_it->second.second.lock()) {
-    std::visit(
-        [&resource_ptr](auto&& state) {
-          using T = std::decay_t<decltype(state)>;
-          if constexpr (is_node_v<T>) {
-            auto erase_it =
-                std::remove_if(state.node_state.children.begin(),
-                               state.node_state.children.end(),
-                               [&resource_ptr](const auto& resource) {
-                                 return resource == resource_ptr;
-                               });
-            FML_CHECK(erase_it != state.node_state.children.end());
-            state.node_state.children.erase(erase_it);
-          } else if constexpr (std::is_same_v<T, FakeViewState>) {
-            auto erase_it =
-                std::remove_if(state.children.begin(), state.children.end(),
-                               [&resource_ptr](const auto& resource) {
-                                 return resource == resource_ptr;
-                               });
-            FML_CHECK(erase_it != state.children.end());
-            state.children.erase(erase_it);
-          } else {
-            FML_CHECK(false);
-          }
-        },
-        parent_ptr->state);
-  }
-
-  // Fix up the parent ptr.
-  if (new_parent_ptr) {
-    parent_it->second.second = new_parent_ptr;
-  } else {
-    parent_it->second.second = std::weak_ptr<FakeResourceState>();
-  }
-}
-
-void FakeSession::PruneDeletedResourceRefs() {
-  // Remove expired resources from the parents map.
-  for (auto parent_it = parents_map_.begin(), parent_end = parents_map_.end();
-       parent_it != parent_end;) {
-    if (parent_it->second.first.expired()) {
-      parent_it = parents_map_.erase(parent_it);
-    } else {
-      ++parent_it;
-    }
-  }
-
-  // Remove expired resurces from the labels map.
-  for (auto scene_it = scene_graph_.label_map.begin(),
-            scene_end = scene_graph_.label_map.end();
-       scene_it != scene_end;) {
-    auto erase_it = std::remove_if(
-        scene_it->second.begin(), scene_it->second.end(),
-        [](const auto& weak_resource) { return weak_resource.expired(); });
-    if (erase_it != scene_it->second.end()) {
-      scene_it->second.erase(erase_it);
-    }
-
-    if (scene_it->second.empty()) {
-      scene_it = scene_graph_.label_map.erase(scene_it);
-    } else {
-      ++scene_it;
-    }
-  }
-}
-
-void FakeSession::ApplyCommands() {
-  while (!command_queue_.empty()) {
-    auto scenic_command = std::move(command_queue_.front());
-    command_queue_.pop_front();
-
-    if (!scenic_command.is_gfx()) {
-      FML_LOG(FATAL) << "FakeSession: Unexpected non-gfx command (type "
-                     << scenic_command.Which() << ")";
-      continue;
-    }
-
-    auto& command = scenic_command.gfx();
-    switch (command.Which()) {
-      case fuchsia::ui::gfx::Command::Tag::kCreateResource:
-        ApplyCreateResourceCmd(std::move(command.create_resource()));
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kReleaseResource:
-        ApplyReleaseResourceCmd(std::move(command.release_resource()));
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kAddChild:
-        ApplyAddChildCmd(std::move(command.add_child()));
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kDetach:
-        ApplyDetachCmd(std::move(command.detach()));
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kDetachChildren:
-        ApplyDetachChildrenCmd(std::move(command.detach_children()));
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetTranslation:
-        ApplySetTranslationCmd(std::move(command.set_translation()));
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetScale:
-        ApplySetScaleCmd(std::move(command.set_scale()));
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetRotation:
-        ApplySetRotationCmd(std::move(command.set_rotation()));
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetAnchor:
-        ApplySetAnchorCmd(std::move(command.set_anchor()));
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetOpacity:
-        ApplySetOpacityCmd(command.set_opacity());
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetShape:
-        ApplySetShapeCmd(std::move(command.set_shape()));
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetMaterial:
-        ApplySetMaterialCmd(std::move(command.set_material()));
-        break;
-      case ::fuchsia::ui::gfx::Command::Tag::kSetClipPlanes:
-        ApplySetClipPlanesCmd(std::move(command.set_clip_planes()));
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetHitTestBehavior:
-        ApplySetHitTestBehaviorCmd(std::move(command.set_hit_test_behavior()));
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetSemanticVisibility:
-        ApplySetSemanticVisibilityCmd(
-            std::move(command.set_semantic_visibility()));
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetViewProperties:
-        ApplySetViewPropertiesCmd(std::move(command.set_view_properties()));
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetTexture:
-        ApplySetTextureCmd(std::move(command.set_texture()));
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetColor:
-        ApplySetColorCmd(std::move(command.set_color()));
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetEventMask:
-        ApplySetEventMaskCmd(std::move(command.set_event_mask()));
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetLabel:
-        ApplySetLabelCmd(std::move(command.set_label()));
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetEnableViewDebugBounds:
-        ApplySetEnableViewDebugBoundsCmd(
-            std::move(command.set_enable_view_debug_bounds()));
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetViewHolderBoundsColor:
-        ApplySetViewHolderBoundsColorCmd(
-            std::move(command.set_view_holder_bounds_color()));
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kExportResource:
-        NotImplemented_("ExportResourceCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kImportResource:
-        NotImplemented_("ImportResourceCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetTag:
-        NotImplemented_("SetTagCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetSize:
-        NotImplemented_("SetSizeCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSendSizeChangeHintHack:
-        NotImplemented_("SendSizeChangedHintHackCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kAddPart:
-        NotImplemented_("AddPartCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetClip:
-        NotImplemented_("SetClipCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetCamera:
-        NotImplemented_("SetCameraCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetCameraTransform:
-        NotImplemented_("SetCameraTransformCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetCameraProjection:
-        NotImplemented_("SetCameraProjectionCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetStereoCameraProjection:
-        NotImplemented_("SetStereoCameraProjectionCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetCameraClipSpaceTransform:
-        NotImplemented_("SetCameraClipSpaceTransformCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetCameraPoseBuffer:
-        NotImplemented_("SetCameraPoseBufferCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetLightColor:
-        NotImplemented_("SetLightColorCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetLightDirection:
-        NotImplemented_("SetLightDirectionCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetPointLightPosition:
-        NotImplemented_("SetPointLightPositionCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetPointLightFalloff:
-        NotImplemented_("SetPointLightFalloffCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kAddLight:
-        NotImplemented_("AddLightCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kScene_AddAmbientLight:
-        NotImplemented_("Scene_AddAmbientLightCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kScene_AddDirectionalLight:
-        NotImplemented_("Scene_AddDirectionalLightCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kScene_AddPointLight:
-        NotImplemented_("Scene_AddPointLightCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kDetachLight:
-        NotImplemented_("DetachLightCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kDetachLights:
-        NotImplemented_("DetachLightsCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kBindMeshBuffers:
-        NotImplemented_("BindMeshBuffersCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kAddLayer:
-        NotImplemented_("AddLayerCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kRemoveLayer:
-        NotImplemented_("RemoveLayerCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kRemoveAllLayers:
-        NotImplemented_("RemoveAllLayersCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetLayerStack:
-        NotImplemented_("SetLayerStackCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetRenderer:
-        NotImplemented_("SetRendererCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetRendererParam:
-        NotImplemented_("SetRendererParamCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetDisableClipping:
-        NotImplemented_("SetDisableClippingCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetImportFocus:
-        NotImplemented_("SetImportFocusCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kTakeSnapshotCmd:
-        NotImplemented_("TakeSnapshotCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetDisplayColorConversion:
-        NotImplemented_("SetDisplayColorConversionCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetDisplayRotation:
-        NotImplemented_("SetDisplayRotationCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::kSetDisplayMinimumRgb:
-        NotImplemented_("SetDisplayMinimumRgbCmd");
-        break;
-      case fuchsia::ui::gfx::Command::Tag::Invalid:
-        FML_LOG(FATAL) << "FakeSession found Invalid gfx command";
-        break;
-    }
-  }
-
-  // Clean up resource refs after processing commands.
-  PruneDeletedResourceRefs();
-}
-
-void FakeSession::ApplyCreateResourceCmd(
-    fuchsia::ui::gfx::CreateResourceCmd command) {
-  const FakeResourceId resource_id = command.id;
-  FML_CHECK(resource_id != 0);
-
-  switch (command.resource.Which()) {
-    case fuchsia::ui::gfx::ResourceArgs::Tag::kMemory:
-      ApplyCreateMemory(resource_id, std::move(command.resource.memory()));
-      break;
-    case fuchsia::ui::gfx::ResourceArgs::Tag::kImage:
-      ApplyCreateImage(resource_id, std::move(command.resource.image()));
-      break;
-    case fuchsia::ui::gfx::ResourceArgs::Tag::kImage2:
-      ApplyCreateImage2(resource_id, std::move(command.resource.image2()));
-      break;
-    case fuchsia::ui::gfx::ResourceArgs::Tag::kImage3:
-      ApplyCreateImage3(resource_id, std::move(command.resource.image3()));
-      break;
-    case fuchsia::ui::gfx::ResourceArgs::Tag::kImagePipe2:
-      ApplyCreateImagePipe2(resource_id,
-                            std::move(command.resource.image_pipe2()));
-      break;
-    case fuchsia::ui::gfx::ResourceArgs::Tag::kRectangle:
-      ApplyCreateRectangle(resource_id,
-                           std::move(command.resource.rectangle()));
-      break;
-    case fuchsia::ui::gfx::ResourceArgs::Tag::kRoundedRectangle:
-      ApplyCreateRoundedRectangle(
-          resource_id, std::move(command.resource.rounded_rectangle()));
-      break;
-    case fuchsia::ui::gfx::ResourceArgs::Tag::kCircle:
-      ApplyCreateCircle(resource_id, std::move(command.resource.circle()));
-      break;
-    case fuchsia::ui::gfx::ResourceArgs::Tag::kMaterial:
-      ApplyCreateMaterial(resource_id, std::move(command.resource.material()));
-      break;
-    case fuchsia::ui::gfx::ResourceArgs::Tag::kView:
-      ApplyCreateView(resource_id, std::move(command.resource.view()));
-      break;
-    case fuchsia::ui::gfx::ResourceArgs::Tag::kView3:
-      ApplyCreateView(resource_id, std::move(command.resource.view3()));
-      break;
-    case fuchsia::ui::gfx::ResourceArgs::Tag::kViewHolder:
-      ApplyCreateViewHolder(resource_id,
-                            std::move(command.resource.view_holder()));
-      break;
-    case fuchsia::ui::gfx::ResourceArgs::Tag::kOpacityNode:
-      ApplyCreateOpacityNode(resource_id, command.resource.opacity_node());
-      break;
-    case fuchsia::ui::gfx::ResourceArgs::Tag::kEntityNode:
-      ApplyCreateEntityNode(resource_id,
-                            std::move(command.resource.entity_node()));
-      break;
-    case fuchsia::ui::gfx::ResourceArgs::Tag::kShapeNode:
-      ApplyCreateShapeNode(resource_id,
-                           std::move(command.resource.shape_node()));
-      break;
-    case fuchsia::ui::gfx::ResourceArgs::Tag::kBuffer:
-      NotImplemented_("CreateBufferResource");
-      break;
-    case fuchsia::ui::gfx::ResourceArgs::Tag::kScene:
-      NotImplemented_("CreateSceneResource");
-      break;
-    case fuchsia::ui::gfx::ResourceArgs::Tag::kCamera:
-      NotImplemented_("CreateCameraResource");
-      break;
-    case fuchsia::ui::gfx::ResourceArgs::Tag::kStereoCamera:
-      NotImplemented_("CreateStereoCameraResource");
-      break;
-    case fuchsia::ui::gfx::ResourceArgs::Tag::kRenderer:
-      NotImplemented_("CreateRendererResource");
-      break;
-    case fuchsia::ui::gfx::ResourceArgs::Tag::kAmbientLight:
-      NotImplemented_("CreateAmbientLightResource");
-      break;
-    case fuchsia::ui::gfx::ResourceArgs::Tag::kDirectionalLight:
-      NotImplemented_("CreateDirectionalLightResource");
-      break;
-    case fuchsia::ui::gfx::ResourceArgs::Tag::kPointLight:
-      NotImplemented_("CreatePointLightResource");
-      break;
-    case fuchsia::ui::gfx::ResourceArgs::Tag::kMesh:
-      NotImplemented_("CreateMeshResource");
-      break;
-    case fuchsia::ui::gfx::ResourceArgs::Tag::kClipNode:
-      NotImplemented_("CreateClipNodeResource");
-      break;
-    case fuchsia::ui::gfx::ResourceArgs::Tag::kCompositor:
-      NotImplemented_("CreateCompositorResource");
-      break;
-    case fuchsia::ui::gfx::ResourceArgs::Tag::kDisplayCompositor:
-      NotImplemented_("CreateDisplayCompositorResource");
-      break;
-    case fuchsia::ui::gfx::ResourceArgs::Tag::kLayerStack:
-      NotImplemented_("CreateLayerStackResource");
-      break;
-    case fuchsia::ui::gfx::ResourceArgs::Tag::kLayer:
-      NotImplemented_("CreateLayerResource");
-      break;
-    case fuchsia::ui::gfx::ResourceArgs::Tag::kVariable:
-      NotImplemented_("CreateVariableResource");
-      break;
-    case fuchsia::ui::gfx::ResourceArgs::Tag::Invalid:
-      FML_LOG(FATAL) << "FakeSession found Invalid CreateResource command";
-      break;
-    default:
-      FML_UNREACHABLE();
-  }
-}
-
-void FakeSession::ApplyReleaseResourceCmd(
-    fuchsia::ui::gfx::ReleaseResourceCmd command) {
-  auto resource_ptr = GetResource(command.id);
-  if (ResourceIs<FakeViewState>(*resource_ptr)) {
-    FML_CHECK(scene_graph_.root_view_id == resource_ptr->id);
-    scene_graph_.root_view_id = kInvalidFakeResourceId;
-  }
-
-  scene_graph_.resource_map.erase(command.id);
-}
-
-void FakeSession::ApplyAddChildCmd(fuchsia::ui::gfx::AddChildCmd command) {
-  auto parent_node_ptr = GetResource(command.node_id);
-  FML_CHECK(ResourceIsNode(*parent_node_ptr) ||
-            ResourceIs<FakeViewState>(*parent_node_ptr));
-
-  auto child_node_ptr = GetResource(command.child_id);
-  FML_CHECK(ResourceIsNode(*child_node_ptr));
-
-  // Add the Node as a child of the new parent.
-  std::visit(
-      [&child_node_ptr](auto&& state) {
-        using T = std::decay_t<decltype(state)>;
-        if constexpr (is_node_v<T>) {
-          state.node_state.children.emplace_back(child_node_ptr);
-        } else if constexpr (std::is_same_v<T, FakeViewState>) {
-          state.children.emplace_back(child_node_ptr);
-        } else {
-          FML_CHECK(false);
-        }
-      },
-      parent_node_ptr->state);
-
-  // Remove the Node as a child of the old parent and fix up the parent ptr.
-  DetachResourceFromParent(child_node_ptr, parent_node_ptr);
-}
-
-void FakeSession::ApplyDetachCmd(fuchsia::ui::gfx::DetachCmd command) {
-  auto resource_ptr = GetResource(command.id);
-  FML_CHECK(ResourceIsNode(*resource_ptr));
-
-  DetachResourceFromParent(std::move(resource_ptr));
-}
-
-void FakeSession::ApplyDetachChildrenCmd(
-    fuchsia::ui::gfx::DetachChildrenCmd command) {
-  auto resource_ptr = GetResource(command.node_id);
-  FML_CHECK(ResourceIsNode(*resource_ptr));
-
-  std::visit(
-      [this](auto&& state) {
-        using T = std::decay_t<decltype(state)>;
-        if constexpr (is_node_v<T>) {
-          for (auto& child : state.node_state.children) {
-            DetachResourceFromParent(child);
-          }
-          state.node_state.children.clear();
-        } else {
-          FML_CHECK(false);
-        }
-      },
-      resource_ptr->state);
-}
-
-void FakeSession::ApplySetTranslationCmd(
-    fuchsia::ui::gfx::SetTranslationCmd command) {
-  auto resource_ptr = GetResource(command.id);
-  FML_CHECK(ResourceIsNode(*resource_ptr));
-
-  const std::array<float, 3> translation = {
-      command.value.value.x, command.value.value.y, command.value.value.z};
-  std::visit(
-      [&translation](auto&& state) {
-        using T = std::decay_t<decltype(state)>;
-        if constexpr (is_node_v<T>) {
-          state.node_state.translation_vector = translation;
-        } else {
-          FML_CHECK(false);
-        }
-      },
-      resource_ptr->state);
-}
-
-void FakeSession::ApplySetScaleCmd(fuchsia::ui::gfx::SetScaleCmd command) {
-  auto resource_ptr = GetResource(command.id);
-  FML_CHECK(ResourceIsNode(*resource_ptr));
-
-  const std::array<float, 3> scale = {
-      command.value.value.x, command.value.value.y, command.value.value.z};
-  std::visit(
-      [&scale](auto&& state) {
-        using T = std::decay_t<decltype(state)>;
-        if constexpr (is_node_v<T>) {
-          state.node_state.scale_vector = scale;
-        } else {
-          FML_CHECK(false);
-        }
-      },
-      resource_ptr->state);
-}
-
-void FakeSession::ApplySetRotationCmd(
-    fuchsia::ui::gfx::SetRotationCmd command) {
-  auto resource_ptr = GetResource(command.id);
-  FML_CHECK(ResourceIsNode(*resource_ptr));
-
-  const std::array<float, 4> rotation = {
-      command.value.value.x, command.value.value.y, command.value.value.z,
-      command.value.value.w};
-  std::visit(
-      [&rotation](auto&& state) {
-        using T = std::decay_t<decltype(state)>;
-        if constexpr (is_node_v<T>) {
-          state.node_state.rotation_quaternion = rotation;
-        } else {
-          FML_CHECK(false);
-        }
-      },
-      resource_ptr->state);
-}
-
-void FakeSession::ApplySetAnchorCmd(fuchsia::ui::gfx::SetAnchorCmd command) {
-  auto resource_ptr = GetResource(command.id);
-  FML_CHECK(ResourceIsNode(*resource_ptr));
-
-  const std::array<float, 3> anchor = {
-      command.value.value.x, command.value.value.y, command.value.value.z};
-  std::visit(
-      [&anchor](auto&& state) {
-        using T = std::decay_t<decltype(state)>;
-        if constexpr (is_node_v<T>) {
-          state.node_state.anchor_vector = anchor;
-        } else {
-          FML_CHECK(false);
-        }
-      },
-      resource_ptr->state);
-}
-
-void FakeSession::ApplySetOpacityCmd(fuchsia::ui::gfx::SetOpacityCmd command) {
-  auto resource_ptr = GetResource(command.node_id);
-  FML_CHECK(ResourceIs<FakeOpacityNodeState>(*resource_ptr));
-
-  const bool opacity = command.opacity;
-  std::visit(
-      [opacity](auto&& state) {
-        using T = std::decay_t<decltype(state)>;
-        if constexpr (std::is_same_v<T, FakeOpacityNodeState>) {
-          state.opacity = opacity;
-        } else {
-          FML_CHECK(false);
-        }
-      },
-      resource_ptr->state);
-}
-
-void FakeSession::ApplySetShapeCmd(fuchsia::ui::gfx::SetShapeCmd command) {
-  auto shape_node_ptr = GetResource(command.node_id);
-  FML_CHECK(ResourceIs<FakeShapeNodeState>(*shape_node_ptr));
-  auto* shape_node_state =
-      std::get_if<FakeShapeNodeState>(&shape_node_ptr->state);
-  FML_CHECK(shape_node_state != nullptr);
-  auto shape_ptr = GetResource(command.shape_id);
-  FML_CHECK(ResourceIs<FakeShapeState>(*shape_ptr));
-
-  shape_node_state->shape = shape_ptr;
-}
-
-void FakeSession::ApplySetMaterialCmd(
-    fuchsia::ui::gfx::SetMaterialCmd command) {
-  auto shape_node_ptr = GetResource(command.node_id);
-  FML_CHECK(ResourceIs<FakeShapeNodeState>(*shape_node_ptr));
-  auto* shape_node_state =
-      std::get_if<FakeShapeNodeState>(&shape_node_ptr->state);
-  FML_CHECK(shape_node_state != nullptr);
-  auto material_ptr = GetResource(command.material_id);
-  FML_CHECK(ResourceIs<FakeMaterialState>(*material_ptr));
-
-  shape_node_state->material = material_ptr;
-}
-
-void FakeSession::ApplySetClipPlanesCmd(
-    fuchsia::ui::gfx::SetClipPlanesCmd command) {
-  auto node_ptr = GetResource(command.node_id);
-  FML_CHECK(ResourceIs<FakeEntityNodeState>(*node_ptr));
-
-  std::vector<FakeEntityNodeState::ClipPlane> clip_planes;
-  for (auto& clip_plane : command.clip_planes) {
-    clip_planes.emplace_back(FakeEntityNodeState::ClipPlane{
-        .dir = {clip_plane.dir.x, clip_plane.dir.y, clip_plane.dir.z},
-        .dist = clip_plane.dist,
-    });
-  }
-  std::visit(
-      [clip_planes = std::move(clip_planes)](auto&& state) {
-        using T = std::decay_t<decltype(state)>;
-        if constexpr (std::is_same_v<T, FakeEntityNodeState>) {
-          state.clip_planes = std::move(clip_planes);
-        } else {
-          FML_CHECK(false);
-        }
-      },
-      node_ptr->state);
-}
-
-void FakeSession::ApplySetViewPropertiesCmd(
-    fuchsia::ui::gfx::SetViewPropertiesCmd command) {
-  auto view_holder_ptr = GetResource(command.view_holder_id);
-  FML_CHECK(ResourceIs<FakeViewHolderState>(*view_holder_ptr));
-  auto* view_holder_state =
-      std::get_if<FakeViewHolderState>(&view_holder_ptr->state);
-  FML_CHECK(view_holder_state != nullptr);
-
-  view_holder_state->properties = command.properties;
-}
-
-void FakeSession::ApplySetHitTestBehaviorCmd(
-    fuchsia::ui::gfx::SetHitTestBehaviorCmd command) {
-  auto node_ptr = GetResource(command.node_id);
-  FML_CHECK(ResourceIsNode(*node_ptr));
-
-  const bool hit_testable =
-      command.hit_test_behavior == fuchsia::ui::gfx::HitTestBehavior::kDefault;
-  std::visit(
-      [hit_testable](auto&& state) {
-        using T = std::decay_t<decltype(state)>;
-        if constexpr (is_node_v<T>) {
-          state.node_state.hit_testable = hit_testable;
-        } else {
-          FML_CHECK(false);
-        }
-      },
-      node_ptr->state);
-}
-
-void FakeSession::ApplySetSemanticVisibilityCmd(
-    fuchsia::ui::gfx::SetSemanticVisibilityCmd command) {
-  auto node_ptr = GetResource(command.node_id);
-  FML_CHECK(ResourceIsNode(*node_ptr));
-
-  const bool semantic_visibility = command.visible;
-  std::visit(
-      [semantic_visibility](auto&& state) {
-        using T = std::decay_t<decltype(state)>;
-        if constexpr (is_node_v<T>) {
-          state.node_state.semantically_visible = semantic_visibility;
-        } else {
-          FML_CHECK(false);
-        }
-      },
-      node_ptr->state);
-}
-
-void FakeSession::ApplySetTextureCmd(fuchsia::ui::gfx::SetTextureCmd command) {
-  auto material_ptr = GetResource(command.material_id);
-  FML_CHECK(ResourceIs<FakeMaterialState>(*material_ptr));
-  auto* material_state = std::get_if<FakeMaterialState>(&material_ptr->state);
-  FML_CHECK(material_state != nullptr);
-  auto image_ptr = GetResource(command.texture_id);
-  FML_CHECK(ResourceIs<FakeImageState>(*image_ptr));
-
-  material_state->image = image_ptr;
-}
-
-void FakeSession::ApplySetColorCmd(fuchsia::ui::gfx::SetColorCmd command) {
-  auto material_ptr = GetResource(command.material_id);
-  FML_CHECK(ResourceIs<FakeMaterialState>(*material_ptr));
-  auto* material_state = std::get_if<FakeMaterialState>(&material_ptr->state);
-  FML_CHECK(material_state != nullptr);
-
-  material_state->color = {(command.color.value.red * 1.f) / 255.f,
-                           (command.color.value.green * 1.f) / 255.f,
-                           (command.color.value.blue * 1.f) / 255.f,
-                           (command.color.value.alpha * 1.f) / 255.f};
-}
-
-void FakeSession::ApplySetEventMaskCmd(
-    fuchsia::ui::gfx::SetEventMaskCmd command) {
-  auto resource_ptr = GetResource(command.id);
-
-  resource_ptr->event_mask = command.event_mask;
-}
-
-void FakeSession::ApplySetLabelCmd(fuchsia::ui::gfx::SetLabelCmd command) {
-  auto resource_ptr = GetResource(command.id);
-
-  // Erase from old spot in the labels map.
-  auto current_label_it = scene_graph_.label_map.find(resource_ptr->label);
-  FML_CHECK(current_label_it != scene_graph_.label_map.end());
-  auto current_erase_it = std::remove_if(
-      current_label_it->second.begin(), current_label_it->second.end(),
-      [&resource_ptr](const auto& weak_resource) {
-        return resource_ptr == weak_resource.lock();
-      });
-  FML_CHECK(current_erase_it != current_label_it->second.end());
-  current_label_it->second.erase(current_erase_it);
-
-  // Add to new spot in labels map.
-  auto new_label_it = scene_graph_.label_map.find(command.label);
-  if (new_label_it == scene_graph_.label_map.end()) {
-    auto [emplace_it, current_label_success] =
-        scene_graph_.label_map.emplace(std::make_pair(
-            command.label, std::vector<std::weak_ptr<FakeResourceState>>()));
-    FML_CHECK(current_label_success);
-    new_label_it = emplace_it;
-  }
-  new_label_it->second.emplace_back(resource_ptr);
-
-  resource_ptr->label = std::move(command.label);
-}
-
-void FakeSession::ApplySetEnableViewDebugBoundsCmd(
-    fuchsia::ui::gfx::SetEnableDebugViewBoundsCmd command) {
-  auto view_ptr = GetResource(command.view_id);
-  FML_CHECK(ResourceIs<FakeViewState>(*view_ptr));
-  auto* view_state = std::get_if<FakeViewState>(&view_ptr->state);
-  FML_CHECK(view_state != nullptr);
-
-  view_state->enable_debug_bounds = command.enable;
-}
-
-void FakeSession::ApplySetViewHolderBoundsColorCmd(
-    fuchsia::ui::gfx::SetViewHolderBoundsColorCmd command) {
-  auto view_holder_ptr = GetResource(command.view_holder_id);
-  FML_CHECK(ResourceIs<FakeViewHolderState>(*view_holder_ptr));
-  auto* view_holder_state =
-      std::get_if<FakeViewHolderState>(&view_holder_ptr->state);
-  FML_CHECK(view_holder_state != nullptr);
-
-  view_holder_state->bounds_color = {command.color.value.red,
-                                     command.color.value.green,
-                                     command.color.value.blue, 1.f};
-}
-
-void FakeSession::ApplyCreateMemory(FakeResourceId id,
-                                    fuchsia::ui::gfx::MemoryArgs args) {
-  zx_koid_t vmo_koid = GetKoid(args.vmo.get());
-  AddResource(
-      {.id = id,
-       .state = FakeMemoryState{
-           .vmo = {std::move(args.vmo), vmo_koid},
-           .allocation_size = args.allocation_size,
-           .is_device_memory = (args.memory_type ==
-                                fuchsia::images::MemoryType::VK_DEVICE_MEMORY),
-       }});
-}
-
-void FakeSession::ApplyCreateImage(FakeResourceId id,
-                                   fuchsia::ui::gfx::ImageArgs args) {
-  AddResource({.id = id,
-               .state = FakeImageState{
-                   .image_def =
-                       FakeImageState::ImageDef{
-                           .info = std::move(args.info),
-                           .memory_offset = args.memory_offset,
-                       },
-               }});
-
-  // Hook up the memory resource to the image
-  auto image_ptr = GetResource(id);
-  FML_CHECK(ResourceIs<FakeImageState>(*image_ptr));
-  auto* image_state = std::get_if<FakeImageState>(&image_ptr->state);
-  FML_CHECK(image_state != nullptr);
-  auto memory_ptr = GetResource(args.memory_id);
-  FML_CHECK(ResourceIs<FakeMemoryState>(*memory_ptr));
-
-  image_state->memory = memory_ptr;
-}
-
-void FakeSession::ApplyCreateImage2(FakeResourceId id,
-                                    fuchsia::ui::gfx::ImageArgs2 args) {
-  AddResource(
-      {.id = id,
-       .state = FakeImageState{
-           .image_def =
-               FakeImageState::Image2Def{
-                   .buffer_collection_id = args.buffer_collection_id,
-                   .buffer_collection_index = args.buffer_collection_index,
-                   .width = args.width,
-                   .height = args.height,
-               },
-       }});
-}
-
-void FakeSession::ApplyCreateImage3(FakeResourceId id,
-                                    fuchsia::ui::gfx::ImageArgs3 args) {
-  zx_koid_t import_token_koid = GetKoid(args.import_token.value.get());
-  AddResource(
-      {.id = id,
-       .state = FakeImageState{
-           .image_def =
-               FakeImageState::Image3Def{
-                   .import_token = {std::move(args.import_token),
-                                    import_token_koid},
-                   .buffer_collection_index = args.buffer_collection_index,
-                   .width = args.width,
-                   .height = args.height,
-               },
-       }});
-}
-
-void FakeSession::ApplyCreateImagePipe2(FakeResourceId id,
-                                        fuchsia::ui::gfx::ImagePipe2Args args) {
-  zx_koid_t image_pipe_request_koid =
-      GetKoid(args.image_pipe_request.channel().get());
-  AddResource(
-      {.id = id,
-       .state = FakeImageState{
-           .image_def =
-               FakeImageState::ImagePipe2Def{
-                   .image_pipe_request = {std::move(args.image_pipe_request),
-                                          image_pipe_request_koid},
-               },
-       }});
-}
-
-void FakeSession::ApplyCreateRectangle(FakeResourceId id,
-                                       fuchsia::ui::gfx::RectangleArgs args) {
-  FML_CHECK(args.width.is_vector1());
-  FML_CHECK(args.height.is_vector1());
-
-  AddResource({.id = id,
-               .state = FakeShapeState{
-                   .shape_def =
-                       FakeShapeState::RectangleDef{
-                           .width = args.width.vector1(),
-                           .height = args.height.vector1(),
-                       },
-               }});
-}
-
-void FakeSession::ApplyCreateRoundedRectangle(
-    FakeResourceId id,
-    fuchsia::ui::gfx::RoundedRectangleArgs args) {
-  FML_CHECK(args.width.is_vector1());
-  FML_CHECK(args.height.is_vector1());
-  FML_CHECK(args.top_left_radius.is_vector1());
-  FML_CHECK(args.top_right_radius.is_vector1());
-  FML_CHECK(args.bottom_right_radius.is_vector1());
-  FML_CHECK(args.bottom_left_radius.is_vector1());
-
-  AddResource(
-      {.id = id,
-       .state = FakeShapeState{
-           .shape_def =
-               FakeShapeState::RoundedRectangleDef{
-                   .width = args.width.vector1(),
-                   .height = args.height.vector1(),
-                   .top_left_radius = args.top_left_radius.vector1(),
-                   .top_right_radius = args.top_right_radius.vector1(),
-                   .bottom_right_radius = args.bottom_right_radius.vector1(),
-                   .bottom_left_radius = args.bottom_left_radius.vector1(),
-               },
-       }});
-}
-
-void FakeSession::ApplyCreateCircle(FakeResourceId id,
-                                    fuchsia::ui::gfx::CircleArgs args) {
-  FML_CHECK(args.radius.is_vector1());
-
-  AddResource({.id = id,
-               .state = FakeShapeState{
-                   .shape_def =
-                       FakeShapeState::CircleDef{
-                           .radius = args.radius.vector1(),
-                       },
-               }});
-}
-
-void FakeSession::ApplyCreateMaterial(FakeResourceId id,
-                                      fuchsia::ui::gfx::MaterialArgs args) {
-  AddResource({
-      .id = id,
-      .state = FakeMaterialState{},
-  });
-}
-
-void FakeSession::ApplyCreateView(FakeResourceId id,
-                                  fuchsia::ui::gfx::ViewArgs args) {
-  FML_CHECK(scene_graph_.root_view_id == kInvalidFakeResourceId);
-
-  zx_koid_t token_koid = GetKoid(args.token.value.get());
-  AddResource({.id = id,
-               .state = FakeViewState{
-                   .token = {std::move(args.token), token_koid},
-                   .debug_name = std::string(args.debug_name->c_str(),
-                                             args.debug_name->length()),
-               }});
-}
-
-void FakeSession::ApplyCreateView(FakeResourceId id,
-                                  fuchsia::ui::gfx::ViewArgs3 args) {
-  zx_koid_t token_koid = GetKoid(args.token.value.get());
-  zx_koid_t control_ref_koid = GetKoid(args.control_ref.reference.get());
-  zx_koid_t view_ref_koid = GetKoid(args.view_ref.reference.get());
-  AddResource(
-      {.id = id,
-       .state = FakeViewState{
-           .token = {std::move(args.token), token_koid},
-           .control_ref = {std::move(args.control_ref), control_ref_koid},
-           .view_ref = {std::move(args.view_ref), view_ref_koid},
-           .debug_name =
-               std::string(args.debug_name->c_str(), args.debug_name->length()),
-       }});
-}
-
-void FakeSession::ApplyCreateViewHolder(FakeResourceId id,
-                                        fuchsia::ui::gfx::ViewHolderArgs args) {
-  zx_koid_t token_koid = GetKoid(args.token.value.get());
-  AddResource({
-      .id = id,
-      .state =
-          FakeViewHolderState{
-              .token = {std::move(args.token), token_koid},
-              .debug_name = std::string(args.debug_name->c_str(),
-                                        args.debug_name->length()),
-          },
-  });
-}
-
-void FakeSession::ApplyCreateEntityNode(FakeResourceId id,
-                                        fuchsia::ui::gfx::EntityNodeArgs args) {
-  AddResource({
-      .id = id,
-      .state = FakeEntityNodeState{},
-  });
-}
-
-void FakeSession::ApplyCreateOpacityNode(
-    FakeResourceId id,
-    fuchsia::ui::gfx::OpacityNodeArgsHACK args) {
-  AddResource({
-      .id = id,
-      .state = FakeOpacityNodeState{},
-  });
-}
-
-void FakeSession::ApplyCreateShapeNode(FakeResourceId id,
-                                       fuchsia::ui::gfx::ShapeNodeArgs args) {
-  AddResource({
-      .id = id,
-      .state = FakeShapeNodeState{},
-  });
-}
-
-}  // namespace flutter_runner::testing
diff --git a/shell/platform/fuchsia/flutter/tests/fakes/scenic/fake_session.h b/shell/platform/fuchsia/flutter/tests/fakes/scenic/fake_session.h
deleted file mode 100644
index eb55b95da6daa0f268310f815a597849e9ae32a4..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/flutter/tests/fakes/scenic/fake_session.h
+++ /dev/null
@@ -1,241 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_FAKES_SCENIC_FAKE_SESSION_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_FAKES_SCENIC_FAKE_SESSION_H_
-
-#include <fuchsia/images/cpp/fidl.h>
-#include <fuchsia/scenic/scheduling/cpp/fidl.h>
-#include <fuchsia/sysmem/cpp/fidl.h>
-#include <fuchsia/ui/gfx/cpp/fidl.h>
-#include <fuchsia/ui/scenic/cpp/fidl.h>
-#include <fuchsia/ui/scenic/cpp/fidl_test_base.h>
-#include <lib/async/dispatcher.h>
-#include <lib/fidl/cpp/binding.h>
-#include <lib/fidl/cpp/interface_handle.h>
-#include <lib/fidl/cpp/interface_request.h>
-
-#include <deque>
-#include <functional>
-#include <memory>
-#include <string>
-#include <unordered_map>
-#include <utility>  // For std::pair
-#include <vector>
-
-#include "flutter/fml/macros.h"
-
-#include "fake_resources.h"
-
-namespace flutter_runner::testing {
-
-// A lightweight fake implementation of the scenic Session API, also called
-// the "gfx API".  The fake has no side effects besides mutating its own
-// internal state.
-//
-// The fake allows tests to do a few things that would be difficult using either
-// a mock implementation or the real implementation:
-//   + It allows the user to hook `Present` invocations and respond with
-//   stubbed-out `FuturePresentationTimes`, but more crucially it mimics the
-//   real scenic behavior of only processing commands when a `Present` is
-//   invoked.
-//   + It allows the user to inspect a snapshot of the session's local scene
-//   graph at any moment in time, via the `SceneGraph()` accessor.
-//   + The resources returned by `SceneGraph()` that the test uses for
-//   inspection are decoupled from the resources managed internally by the
-//   `FakeSession` itself -- they are a snapshot of the scene graph at that
-//   moment in time, with all snapshot state being cloned from the underlying
-//   scene graph state.  This allows the `FakeSession` and test to naturally use
-//   `shared_ptr` for reference counting and mimic the real scenic behavior
-//   exactly, instead of an awkward index-based API.
-//   + It stores the various session resources generated by commands into a
-//   std::unordered_map, and also correctly manages the resource lifetimes via
-//   reference counting. This allows a resource to stay alive if its parent
-//   still holds a reference to it, in the same way the real scenic
-//   implementation would.
-//
-// Limitations:
-//   +Error handling / session disconnection is still WIP.  FakeSession will
-//   likely generate a CHECK in any place where the real scenic would disconnect
-//   the session or send a ScenicError.
-//   +root_presenter-only commands e.g. CreateLayer are not handled.
-//   +Deprecated / obsolete commands are not handled.
-//   +Input is not handled.
-//   +Rendering is not handled.
-//   +Cross-session links are not handled; the FakeSession only stores the
-//   tokens provided to it in a FakeResourceState.
-class FakeSession : public fuchsia::ui::scenic::testing::Session_TestBase {
- public:
-  using PresentHandler =
-      std::function<fuchsia::images::PresentationInfo(uint64_t,
-                                                      std::vector<zx::event>,
-                                                      std::vector<zx::event>)>;
-  using Present2Handler =
-      std::function<fuchsia::scenic::scheduling::FuturePresentationTimes(
-          fuchsia::ui::scenic::Present2Args)>;
-  using RequestPresentationTimesHandler =
-      std::function<fuchsia::scenic::scheduling::FuturePresentationTimes(
-          int64_t)>;
-  using SessionAndListenerClientPair =
-      std::pair<fidl::InterfaceHandle<fuchsia::ui::scenic::Session>,
-                fidl::InterfaceRequest<fuchsia::ui::scenic::SessionListener>>;
-
-  FakeSession();
-  ~FakeSession() override = default;
-
-  bool is_bound() const { return binding_.is_bound() && listener_.is_bound(); }
-
-  const std::string& debug_name() const { return debug_name_; }
-
-  const std::deque<fuchsia::ui::scenic::Command>& command_queue() const {
-    return command_queue_;
-  }
-
-  // Generate a snapshot of the underlying scene graph for test inspection.
-  FakeSceneGraph SceneGraph() const {
-    return SceneGraphFromState(scene_graph_);
-  }
-
-  // Bind this session's FIDL channels to the `dispatcher` and allow processing
-  // of incoming FIDL requests.
-  SessionAndListenerClientPair Bind(async_dispatcher_t* dispatcher = nullptr);
-
-  // Set a handler for `Present`-related FIDL calls' return values.
-  void SetPresentHandler(PresentHandler present_handler);
-  void SetPresent2Handler(Present2Handler present2_handler);
-  void SetRequestPresentationTimesHandler(
-      RequestPresentationTimesHandler request_presentation_times_handler);
-
-  // Call after a successful `Present` or `Present2` to fire an
-  // `OnFramePresented` event, which simulates the frame being displayed.
-  void FireOnFramePresentedEvent(
-      fuchsia::scenic::scheduling::FramePresentedInfo frame_presented_info);
-
-  // Disconnect the session with an error.
-  // TODO: Call this internally upon command error, instead of CHECK'ing.
-  void DisconnectSession();
-
- private:
-  // |fuchsia::ui::scenic::testing::Session_TestBase|
-  void NotImplemented_(const std::string& name) override;
-
-  // |fuchsia::ui::scenic::Session|
-  void Enqueue(std::vector<fuchsia::ui::scenic::Command> cmds) override;
-
-  // |fuchsia::ui::scenic::Session|
-  void Present(uint64_t presentation_time,
-               std::vector<zx::event> acquire_fences,
-               std::vector<zx::event> release_fences,
-               PresentCallback callback) override;
-
-  // |fuchsia::ui::scenic::Session|
-  void Present2(fuchsia::ui::scenic::Present2Args args,
-                Present2Callback callback) override;
-
-  // |fuchsia::ui::scenic::Session|
-  void RequestPresentationTimes(
-      int64_t requested_prediction_span,
-      RequestPresentationTimesCallback callback) override;
-
-  // |fuchsia::ui::scenic::Session|
-  void RegisterBufferCollection(
-      uint32_t buffer_id,
-      fidl::InterfaceHandle<fuchsia::sysmem::BufferCollectionToken> token)
-      override;
-
-  // |fuchsia::ui::scenic::Session|
-  void DeregisterBufferCollection(uint32_t buffer_id) override;
-
-  // |fuchsia::ui::scenic::Session|
-  void SetDebugName(std::string debug_name) override;
-
-  // Resource management.
-  std::shared_ptr<FakeResourceState> GetResource(FakeResourceId id);
-  void AddResource(FakeResourceState&& resource);
-  void DetachResourceFromParent(
-      std::shared_ptr<FakeResourceState> resource_ptr,
-      std::shared_ptr<FakeResourceState> new_parent_ptr = nullptr);
-  void PruneDeletedResourceRefs();
-
-  // Apply queued commands and mutate the resource map.
-  void ApplyCommands();
-  void ApplyCreateResourceCmd(fuchsia::ui::gfx::CreateResourceCmd command);
-  void ApplyReleaseResourceCmd(fuchsia::ui::gfx::ReleaseResourceCmd command);
-  void ApplyAddChildCmd(fuchsia::ui::gfx::AddChildCmd command);
-  void ApplyDetachCmd(fuchsia::ui::gfx::DetachCmd command);
-  void ApplyDetachChildrenCmd(fuchsia::ui::gfx::DetachChildrenCmd command);
-  void ApplySetTranslationCmd(fuchsia::ui::gfx::SetTranslationCmd command);
-  void ApplySetScaleCmd(fuchsia::ui::gfx::SetScaleCmd command);
-  void ApplySetRotationCmd(fuchsia::ui::gfx::SetRotationCmd command);
-  void ApplySetAnchorCmd(fuchsia::ui::gfx::SetAnchorCmd command);
-  void ApplySetOpacityCmd(fuchsia::ui::gfx::SetOpacityCmd command);
-  void ApplySetShapeCmd(fuchsia::ui::gfx::SetShapeCmd command);
-  void ApplySetMaterialCmd(fuchsia::ui::gfx::SetMaterialCmd command);
-  void ApplySetClipPlanesCmd(fuchsia::ui::gfx::SetClipPlanesCmd command);
-  void ApplySetViewPropertiesCmd(
-      fuchsia::ui::gfx::SetViewPropertiesCmd command);
-  void ApplySetHitTestBehaviorCmd(
-      fuchsia::ui::gfx::SetHitTestBehaviorCmd command);
-  void ApplySetSemanticVisibilityCmd(
-      fuchsia::ui::gfx::SetSemanticVisibilityCmd command);
-  void ApplySetTextureCmd(fuchsia::ui::gfx::SetTextureCmd command);
-  void ApplySetColorCmd(fuchsia::ui::gfx::SetColorCmd command);
-  void ApplySetEventMaskCmd(fuchsia::ui::gfx::SetEventMaskCmd command);
-  void ApplySetLabelCmd(fuchsia::ui::gfx::SetLabelCmd command);
-  void ApplySetEnableViewDebugBoundsCmd(
-      fuchsia::ui::gfx::SetEnableDebugViewBoundsCmd command);
-  void ApplySetViewHolderBoundsColorCmd(
-      fuchsia::ui::gfx::SetViewHolderBoundsColorCmd command);
-  void ApplyCreateMemory(FakeResourceId id, fuchsia::ui::gfx::MemoryArgs args);
-  void ApplyCreateImage(FakeResourceId id, fuchsia::ui::gfx::ImageArgs args);
-  void ApplyCreateImage2(FakeResourceId id, fuchsia::ui::gfx::ImageArgs2 args);
-  void ApplyCreateImage3(FakeResourceId id, fuchsia::ui::gfx::ImageArgs3 args);
-  void ApplyCreateImagePipe2(FakeResourceId id,
-                             fuchsia::ui::gfx::ImagePipe2Args args);
-  void ApplyCreateRectangle(FakeResourceId id,
-                            fuchsia::ui::gfx::RectangleArgs args);
-  void ApplyCreateRoundedRectangle(FakeResourceId id,
-                                   fuchsia::ui::gfx::RoundedRectangleArgs args);
-  void ApplyCreateCircle(FakeResourceId id, fuchsia::ui::gfx::CircleArgs args);
-  void ApplyCreateMaterial(FakeResourceId id,
-                           fuchsia::ui::gfx::MaterialArgs args);
-  void ApplyCreateView(FakeResourceId id, fuchsia::ui::gfx::ViewArgs args);
-  void ApplyCreateViewHolder(FakeResourceId id,
-                             fuchsia::ui::gfx::ViewHolderArgs args);
-  void ApplyCreateView(FakeResourceId id, fuchsia::ui::gfx::ViewArgs3 args);
-  void ApplyCreateEntityNode(FakeResourceId id,
-                             fuchsia::ui::gfx::EntityNodeArgs args);
-  void ApplyCreateOpacityNode(FakeResourceId id,
-                              fuchsia::ui::gfx::OpacityNodeArgsHACK args);
-  void ApplyCreateShapeNode(FakeResourceId id,
-                            fuchsia::ui::gfx::ShapeNodeArgs args);
-
-  fidl::Binding<fuchsia::ui::scenic::Session> binding_;
-  fuchsia::ui::scenic::SessionListenerPtr listener_;
-
-  std::string debug_name_;
-
-  FakeSceneGraphState scene_graph_;
-  std::deque<fuchsia::ui::scenic::Command> command_queue_;
-
-  // This map is used to cache parent refs for `AddChildCmd`.
-  //
-  // Ideally we would like to map weak(parent) -> weak(child), but std::weak_ptr
-  // cannot be the Key for an associative container. Instead we key on the raw
-  // parent pointer and store pair(weak(parent), weak(child)) in the map.
-  std::unordered_map<FakeResourceState*,
-                     std::pair<std::weak_ptr<FakeResourceState>,
-                               std::weak_ptr<FakeResourceState>>>
-      parents_map_;
-
-  PresentHandler present_handler_;
-  Present2Handler present2_handler_;
-  RequestPresentationTimesHandler request_presentation_times_handler_;
-
-  FML_DISALLOW_COPY_AND_ASSIGN(FakeSession);
-};
-
-}  // namespace flutter_runner::testing
-
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_FAKES_SCENIC_FAKE_SESSION_H_
diff --git a/shell/platform/fuchsia/flutter/tests/fakes/touch_source.h b/shell/platform/fuchsia/flutter/tests/fakes/touch_source.h
index 99cfc050d4c11d7df3c6b9c1928984385fd90b0e..31bc4e7c67dd5cb9099a07a505146d65158e02ad 100644
--- a/shell/platform/fuchsia/flutter/tests/fakes/touch_source.h
+++ b/shell/platform/fuchsia/flutter/tests/fakes/touch_source.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_TESTS_FAKES_TOUCH_SOURCE_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_TESTS_FAKES_TOUCH_SOURCE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_FAKES_TOUCH_SOURCE_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_FAKES_TOUCH_SOURCE_H_
 
 #include <fuchsia/ui/pointer/cpp/fidl.h>
 
@@ -57,4 +57,4 @@ class FakeTouchSource : public fuchsia::ui::pointer::TouchSource {
 
 }  // namespace flutter_runner::testing
 
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_TESTS_FAKES_TOUCH_SOURCE_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_FAKES_TOUCH_SOURCE_H_
diff --git a/shell/platform/fuchsia/flutter/tests/fakes/view_ref_focused.h b/shell/platform/fuchsia/flutter/tests/fakes/view_ref_focused.h
index 84223a44e723c285fb52e668517b6f2737b33967..f6789a874dff9bc25d156dcf50fd38cd6637f7d5 100644
--- a/shell/platform/fuchsia/flutter/tests/fakes/view_ref_focused.h
+++ b/shell/platform/fuchsia/flutter/tests/fakes/view_ref_focused.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_TESTS_FAKES_VIEW_REF_FOCUSED_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_TESTS_FAKES_VIEW_REF_FOCUSED_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_FAKES_VIEW_REF_FOCUSED_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_FAKES_VIEW_REF_FOCUSED_H_
 
 #include <fuchsia/ui/views/cpp/fidl.h>
 
@@ -33,4 +33,4 @@ class FakeViewRefFocused : public ViewRefFocused {
 
 }  // namespace flutter_runner::testing
 
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_TESTS_FAKES_VIEW_REF_FOCUSED_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_FAKES_VIEW_REF_FOCUSED_H_
diff --git a/shell/platform/fuchsia/flutter/tests/flatland_connection_unittests.cc b/shell/platform/fuchsia/flutter/tests/flatland_connection_unittests.cc
index 5da43cc8e1d5b6e7e65fb6c2de75ad662741b598..f70afc92d25113feacea58c79f6945baf9e6306f 100644
--- a/shell/platform/fuchsia/flutter/tests/flatland_connection_unittests.cc
+++ b/shell/platform/fuchsia/flutter/tests/flatland_connection_unittests.cc
@@ -40,6 +40,32 @@ void AwaitVsyncChecked(FlatlandConnection& flatland_connection,
       });
 }
 
+void AwaitVsyncChecked(FlatlandConnection& flatland_connection,
+                       bool& condition_variable,
+                       fml::TimePoint expected_frame_end) {
+  flatland_connection.AwaitVsync(
+      [&condition_variable, expected_frame_end = std::move(expected_frame_end)](
+          fml::TimePoint frame_start, fml::TimePoint frame_end) {
+        EXPECT_EQ(frame_end, expected_frame_end);
+        condition_variable = true;
+      });
+}
+
+std::vector<fuchsia::scenic::scheduling::PresentationInfo>
+CreateFuturePresentationInfos(const fml::TimePoint& presentation_time_1,
+                              const fml::TimePoint& presentation_time_2) {
+  fuchsia::scenic::scheduling::PresentationInfo info_1;
+  info_1.set_presentation_time(
+      presentation_time_1.ToEpochDelta().ToNanoseconds());
+  std::vector<fuchsia::scenic::scheduling::PresentationInfo> infos;
+  infos.push_back(std::move(info_1));
+  fuchsia::scenic::scheduling::PresentationInfo info_2;
+  info_2.set_presentation_time(
+      presentation_time_2.ToEpochDelta().ToNanoseconds());
+  infos.push_back(std::move(info_2));
+  return infos;
+}
+
 }  // namespace
 
 class FlatlandConnectionTest : public ::testing::Test {
@@ -61,13 +87,25 @@ class FlatlandConnectionTest : public ::testing::Test {
   }
 
   // Syntactic sugar for OnNextFrameBegin
-  void OnNextFrameBegin(int num_present_credits) {
+  void OnNextFrameBegin(int num_present_credits,
+                        const fml::TimePoint& presentation_time_1,
+                        const fml::TimePoint& presentation_time_2) {
     fuchsia::ui::composition::OnNextFrameBeginValues on_next_frame_begin_values;
     on_next_frame_begin_values.set_additional_present_credits(
         num_present_credits);
+    on_next_frame_begin_values.set_future_presentation_infos(
+        CreateFuturePresentationInfos(presentation_time_1,
+                                      presentation_time_2));
     fake_flatland().FireOnNextFrameBeginEvent(
         std::move(on_next_frame_begin_values));
   }
+  void OnNextFrameBegin(int num_present_credits) {
+    const auto now = fml::TimePoint::Now();
+    const auto kPresentationTime1 = now + fml::TimeDelta::FromSeconds(100);
+    const auto kPresentationTime2 = now + fml::TimeDelta::FromSeconds(200);
+    OnNextFrameBegin(num_present_credits, kPresentationTime1,
+                     kPresentationTime2);
+  }
 
  private:
   async::TestLoop loop_;
@@ -84,13 +122,13 @@ TEST_F(FlatlandConnectionTest, Initialization) {
   const std::string debug_name = GetCurrentTestName();
   flutter_runner::FlatlandConnection flatland_connection(
       debug_name, TakeFlatlandHandle(), []() { FAIL(); },
-      [](auto...) { FAIL(); }, 1, fml::TimeDelta::Zero());
+      [](auto...) { FAIL(); });
   EXPECT_EQ(fake_flatland().debug_name(), "");
 
-  // Simulate an AwaitVsync that comes immediately.
+  // Simulate an AwaitVsync that returns immediately.
   bool await_vsync_fired = false;
   AwaitVsyncChecked(flatland_connection, await_vsync_fired,
-                    kDefaultFlatlandPresentationInterval);
+                    kInitialFlatlandVsyncOffset);
   EXPECT_TRUE(await_vsync_fired);
 
   // Ensure the debug name is set.
@@ -107,7 +145,7 @@ TEST_F(FlatlandConnectionTest, FlatlandDisconnect) {
   // completed yet.
   flutter_runner::FlatlandConnection flatland_connection(
       GetCurrentTestName(), TakeFlatlandHandle(), std::move(on_session_error),
-      [](auto...) { FAIL(); }, 1, fml::TimeDelta::Zero());
+      [](auto...) { FAIL(); });
   EXPECT_FALSE(error_fired);
 
   // Simulate a flatland disconnection, then Pump the loop.  The error callback
@@ -141,7 +179,7 @@ TEST_F(FlatlandConnectionTest, BasicPresent) {
   // completed yet.
   flutter_runner::FlatlandConnection flatland_connection(
       GetCurrentTestName(), TakeFlatlandHandle(), []() { FAIL(); },
-      std::move(on_frame_presented), 1, fml::TimeDelta::Zero());
+      std::move(on_frame_presented));
   EXPECT_EQ(presents_called, 0u);
   EXPECT_EQ(vsyncs_handled, 0u);
 
@@ -153,7 +191,7 @@ TEST_F(FlatlandConnectionTest, BasicPresent) {
   // Simulate an AwaitVsync that comes after the first call.
   bool await_vsync_fired = false;
   AwaitVsyncChecked(flatland_connection, await_vsync_fired,
-                    kDefaultFlatlandPresentationInterval);
+                    kInitialFlatlandVsyncOffset);
   EXPECT_TRUE(await_vsync_fired);
 
   // Call Present and Pump the loop; `Present` and its callback is called. No
@@ -171,13 +209,17 @@ TEST_F(FlatlandConnectionTest, BasicPresent) {
   EXPECT_FALSE(await_vsync_fired);
 
   // Fire the `OnNextFrameBegin` event. AwaitVsync should be fired.
-  AwaitVsyncChecked(flatland_connection, await_vsync_fired,
-                    kDefaultFlatlandPresentationInterval);
+  const auto now = fml::TimePoint::Now();
+  const auto kPresentationTime1 = now + fml::TimeDelta::FromSeconds(100);
+  const auto kPresentationTime2 = now + fml::TimeDelta::FromSeconds(200);
   fuchsia::ui::composition::OnNextFrameBeginValues on_next_frame_begin_values;
   on_next_frame_begin_values.set_additional_present_credits(3);
+  on_next_frame_begin_values.set_future_presentation_infos(
+      CreateFuturePresentationInfos(kPresentationTime1, kPresentationTime2));
   fake_flatland().FireOnNextFrameBeginEvent(
       std::move(on_next_frame_begin_values));
   loop().RunUntilIdle();
+  AwaitVsyncChecked(flatland_connection, await_vsync_fired, kPresentationTime1);
   EXPECT_TRUE(await_vsync_fired);
 
   // Fire the `OnFramePresented` event associated with the first `Present`,
@@ -193,9 +235,14 @@ TEST_F(FlatlandConnectionTest, BasicPresent) {
   loop().RunUntilIdle();
   EXPECT_EQ(presents_called, 2u);
   EXPECT_EQ(release_fence_handle, first_release_fence_handle);
+
+  // AwaitVsync should be fired with the second present.
+  await_vsync_fired = false;
+  AwaitVsyncChecked(flatland_connection, await_vsync_fired, kPresentationTime2);
+  EXPECT_TRUE(await_vsync_fired);
 }
 
-TEST_F(FlatlandConnectionTest, AwaitVsyncBeforePresent) {
+TEST_F(FlatlandConnectionTest, AwaitVsyncsBeforeOnNextFrameBegin) {
   // Set up callbacks which allow sensing of how many presents were handled.
   size_t presents_called = 0u;
   fake_flatland().SetPresentHandler(
@@ -205,7 +252,7 @@ TEST_F(FlatlandConnectionTest, AwaitVsyncBeforePresent) {
   // completed yet.
   flutter_runner::FlatlandConnection flatland_connection(
       GetCurrentTestName(), TakeFlatlandHandle(), []() { FAIL(); },
-      [](auto...) {}, 1, fml::TimeDelta::Zero());
+      [](auto...) {});
   EXPECT_EQ(presents_called, 0u);
 
   // Pump the loop. Nothing is called.
@@ -215,28 +262,20 @@ TEST_F(FlatlandConnectionTest, AwaitVsyncBeforePresent) {
   // Simulate an AwaitVsync that comes before the first Present.
   bool await_vsync_callback_fired = false;
   AwaitVsyncChecked(flatland_connection, await_vsync_callback_fired,
-                    kDefaultFlatlandPresentationInterval);
-  EXPECT_TRUE(await_vsync_callback_fired);
-
-  // Another AwaitVsync that comes before the first Present.
-  await_vsync_callback_fired = false;
-  AwaitVsyncChecked(flatland_connection, await_vsync_callback_fired,
-                    kDefaultFlatlandPresentationInterval);
+                    kInitialFlatlandVsyncOffset);
   EXPECT_TRUE(await_vsync_callback_fired);
 
-  // Queue Present.
-  flatland_connection.Present();
-  loop().RunUntilIdle();
-  EXPECT_EQ(presents_called, 1u);
-
-  // Set the callback with AwaitVsync, callback should not be fired
-  await_vsync_callback_fired = false;
-  AwaitVsyncChecked(flatland_connection, await_vsync_callback_fired,
-                    kDefaultFlatlandPresentationInterval);
-  EXPECT_FALSE(await_vsync_callback_fired);
+  // AwaitVsync that comes before the first Present.
+  bool await_vsync_secondary_callback_fired = false;
+  flatland_connection.AwaitVsyncForSecondaryCallback(
+      [&await_vsync_secondary_callback_fired](fml::TimePoint frame_start,
+                                              fml::TimePoint frame_end) {
+        await_vsync_secondary_callback_fired = true;
+      });
+  EXPECT_TRUE(await_vsync_secondary_callback_fired);
 }
 
-TEST_F(FlatlandConnectionTest, OutOfOrderAwait) {
+TEST_F(FlatlandConnectionTest, RunsOutOfFuturePresentationInfos) {
   // Set up callbacks which allow sensing of how many presents were handled.
   size_t presents_called = 0u;
   fake_flatland().SetPresentHandler(
@@ -253,7 +292,7 @@ TEST_F(FlatlandConnectionTest, OutOfOrderAwait) {
   // completed yet.
   flutter_runner::FlatlandConnection flatland_connection(
       GetCurrentTestName(), TakeFlatlandHandle(), []() { FAIL(); },
-      std::move(on_frame_presented), 1, fml::TimeDelta::Zero());
+      std::move(on_frame_presented));
   EXPECT_EQ(presents_called, 0u);
   EXPECT_EQ(vsyncs_handled, 0u);
 
@@ -265,7 +304,7 @@ TEST_F(FlatlandConnectionTest, OutOfOrderAwait) {
   // Simulate an AwaitVsync that comes before the first Present.
   bool await_vsync_callback_fired = false;
   AwaitVsyncChecked(flatland_connection, await_vsync_callback_fired,
-                    kDefaultFlatlandPresentationInterval);
+                    kInitialFlatlandVsyncOffset);
   EXPECT_TRUE(await_vsync_callback_fired);
 
   // Queue Present.
@@ -273,42 +312,30 @@ TEST_F(FlatlandConnectionTest, OutOfOrderAwait) {
   loop().RunUntilIdle();
   EXPECT_EQ(presents_called, 1u);
 
-  // Set the callback with AwaitVsync, callback should not be fired
-  await_vsync_callback_fired = false;
-  AwaitVsyncChecked(flatland_connection, await_vsync_callback_fired,
-                    kDefaultFlatlandPresentationInterval);
-  EXPECT_FALSE(await_vsync_callback_fired);
-
-  // Fire the `OnNextFrameBegin` event. AwaitVsync callback should be fired.
+  // Fire the `OnNextFrameBegin` event. AwaitVsync callback should be fired with
+  // the first presentation time.
   await_vsync_callback_fired = false;
-  OnNextFrameBegin(1);
+  const auto kPresentationTime1 =
+      fml::TimePoint::Now() + fml::TimeDelta::FromSeconds(123);
+  const auto kVsyncInterval = fml::TimeDelta::FromSeconds(234);
+  const auto kPresentationTime2 = kPresentationTime1 + kVsyncInterval;
+  OnNextFrameBegin(1, kPresentationTime1, kPresentationTime2);
   loop().RunUntilIdle();
+  AwaitVsyncChecked(flatland_connection, await_vsync_callback_fired,
+                    kPresentationTime1);
   EXPECT_TRUE(await_vsync_callback_fired);
 
-  // Second consecutive ONFB should not call the fire callback and should
-  // instead set it to be pending to fire on next AwaitVsync
-  await_vsync_callback_fired = false;
-  OnNextFrameBegin(1);
-  loop().RunUntilIdle();
-  EXPECT_FALSE(await_vsync_callback_fired);
-
-  // Now an AwaitVsync should immediately fire the pending callback
+  // Second consecutive AwaitVsync callback should be fired with
+  // the second presentation time.
   await_vsync_callback_fired = false;
   AwaitVsyncChecked(flatland_connection, await_vsync_callback_fired,
-                    kDefaultFlatlandPresentationInterval);
+                    kPresentationTime2);
   EXPECT_TRUE(await_vsync_callback_fired);
 
-  // With the pending callback fired, The new callback should be set for the
-  // next OnNextFrameBegin to call
+  // Another AwaitVsync callback should be fired with vsync_interval.
   await_vsync_callback_fired = false;
   AwaitVsyncChecked(flatland_connection, await_vsync_callback_fired,
-                    kDefaultFlatlandPresentationInterval);
-  EXPECT_FALSE(await_vsync_callback_fired);
-
-  // Now OnNextFrameBegin should fire the callback
-  await_vsync_callback_fired = false;
-  OnNextFrameBegin(1);
-  loop().RunUntilIdle();
+                    kPresentationTime2 + kVsyncInterval);
   EXPECT_TRUE(await_vsync_callback_fired);
 }
 
@@ -338,7 +365,7 @@ TEST_F(FlatlandConnectionTest, PresentCreditExhaustion) {
   on_frame_presented_event on_frame_presented = [](auto...) {};
   flutter_runner::FlatlandConnection flatland_connection(
       GetCurrentTestName(), TakeFlatlandHandle(), []() { FAIL(); },
-      std::move(on_frame_presented), 1, fml::TimeDelta::Zero());
+      std::move(on_frame_presented));
   EXPECT_EQ(num_presents_called, 0u);
 
   // Pump the loop. Nothing is called.
diff --git a/shell/platform/fuchsia/flutter/tests/flutter_runner_product_configuration_unittests.cc b/shell/platform/fuchsia/flutter/tests/flutter_runner_product_configuration_unittests.cc
index 2e287dbbdbf659a75239d203f9dd0fe980bf8f34..51fa2a1a3816aaa5d63ebdf027df4326f917a2c2 100644
--- a/shell/platform/fuchsia/flutter/tests/flutter_runner_product_configuration_unittests.cc
+++ b/shell/platform/fuchsia/flutter/tests/flutter_runner_product_configuration_unittests.cc
@@ -4,7 +4,6 @@
 
 #include <gtest/gtest.h>
 
-#include "flutter/fml/time/time_delta.h"
 #include "flutter/shell/platform/fuchsia/flutter/flutter_runner_product_configuration.h"
 
 using namespace flutter_runner;
@@ -13,79 +12,24 @@ namespace flutter_runner_test {
 
 class FlutterRunnerProductConfigurationTest : public testing::Test {};
 
-TEST_F(FlutterRunnerProductConfigurationTest, ValidVsyncOffset) {
-  const std::string json_string = "{ \"vsync_offset_in_us\" : 9000 } ";
-  const fml::TimeDelta expected_offset = fml::TimeDelta::FromMicroseconds(9000);
-
-  FlutterRunnerProductConfiguration product_config =
-      FlutterRunnerProductConfiguration(json_string);
-  EXPECT_EQ(product_config.get_vsync_offset(), expected_offset);
-}
-
 TEST_F(FlutterRunnerProductConfigurationTest, InvalidJsonString) {
   const std::string json_string = "{ \"invalid json string\" }}} ";
-  const fml::TimeDelta expected_offset = fml::TimeDelta::FromMicroseconds(0);
+  const uint64_t expected_intercept_all_input = false;
 
   FlutterRunnerProductConfiguration product_config =
       FlutterRunnerProductConfiguration(json_string);
-  EXPECT_EQ(product_config.get_vsync_offset(), expected_offset);
+  EXPECT_EQ(expected_intercept_all_input,
+            product_config.get_intercept_all_input());
 }
 
 TEST_F(FlutterRunnerProductConfigurationTest, EmptyJsonString) {
   const std::string json_string = "";
-  const fml::TimeDelta expected_offset = fml::TimeDelta::FromMicroseconds(0);
-
-  FlutterRunnerProductConfiguration product_config =
-      FlutterRunnerProductConfiguration(json_string);
-  EXPECT_EQ(product_config.get_vsync_offset(), expected_offset);
-}
-
-TEST_F(FlutterRunnerProductConfigurationTest, EmptyVsyncOffset) {
-  const std::string json_string = "{ \"vsync_offset_in_us\" : } ";
-  const fml::TimeDelta expected_offset = fml::TimeDelta::FromMicroseconds(0);
-
-  FlutterRunnerProductConfiguration product_config =
-      FlutterRunnerProductConfiguration(json_string);
-  EXPECT_EQ(product_config.get_vsync_offset(), expected_offset);
-}
-
-TEST_F(FlutterRunnerProductConfigurationTest, NegativeVsyncOffset) {
-  const std::string json_string = "{ \"vsync_offset_in_us\" : -15410 } ";
-  const fml::TimeDelta expected_offset =
-      fml::TimeDelta::FromMicroseconds(-15410);
-
-  FlutterRunnerProductConfiguration product_config =
-      FlutterRunnerProductConfiguration(json_string);
-  EXPECT_EQ(product_config.get_vsync_offset(), expected_offset);
-}
-
-TEST_F(FlutterRunnerProductConfigurationTest, NonIntegerVsyncOffset) {
-  const std::string json_string = "{ \"vsync_offset_in_us\" : 3.14159 } ";
-  const fml::TimeDelta expected_offset = fml::TimeDelta::FromMicroseconds(0);
-
-  FlutterRunnerProductConfiguration product_config =
-      FlutterRunnerProductConfiguration(json_string);
-  EXPECT_EQ(product_config.get_vsync_offset(), expected_offset);
-}
-
-TEST_F(FlutterRunnerProductConfigurationTest, ValidMaxFramesInFlight) {
-  const std::string json_string = "{ \"max_frames_in_flight\" : 5 } ";
-  const uint64_t expected_max_frames_in_flight = 5;
-
-  FlutterRunnerProductConfiguration product_config =
-      FlutterRunnerProductConfiguration(json_string);
-  EXPECT_EQ(product_config.get_max_frames_in_flight(),
-            expected_max_frames_in_flight);
-}
-
-TEST_F(FlutterRunnerProductConfigurationTest, MissingMaxFramesInFlight) {
-  const std::string json_string = "{ \"max_frames_in_flight\" :  } ";
-  const uint64_t minimum_reasonable_max_frames_in_flight = 1;
+  const uint64_t expected_intercept_all_input = false;
 
   FlutterRunnerProductConfiguration product_config =
       FlutterRunnerProductConfiguration(json_string);
-  EXPECT_GE(product_config.get_max_frames_in_flight(),
-            minimum_reasonable_max_frames_in_flight);
+  EXPECT_EQ(expected_intercept_all_input,
+            product_config.get_intercept_all_input());
 }
 
 TEST_F(FlutterRunnerProductConfigurationTest, ValidInterceptAllInput) {
diff --git a/shell/platform/fuchsia/flutter/tests/gfx_external_view_embedder_unittests.cc b/shell/platform/fuchsia/flutter/tests/gfx_external_view_embedder_unittests.cc
deleted file mode 100644
index ef0569d5c8a5c20bc9308ccabcf47be7f4aab178..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/flutter/tests/gfx_external_view_embedder_unittests.cc
+++ /dev/null
@@ -1,864 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "flutter/shell/platform/fuchsia/flutter/gfx_external_view_embedder.h"
-
-#include <fuchsia/sysmem/cpp/fidl.h>
-#include <fuchsia/ui/gfx/cpp/fidl.h>
-#include <fuchsia/ui/scenic/cpp/fidl.h>
-#include <fuchsia/ui/views/cpp/fidl.h>
-#include <lib/async-testing/test_loop.h>
-#include <lib/async/dispatcher.h>
-#include <lib/fidl/cpp/interface_request.h>
-#include <lib/fidl/cpp/synchronous_interface_ptr.h>
-#include <lib/inspect/cpp/inspect.h>
-#include <lib/ui/scenic/cpp/commands.h>
-#include <lib/ui/scenic/cpp/view_ref_pair.h>
-#include <lib/ui/scenic/cpp/view_token_pair.h>
-
-#include <algorithm>
-#include <cstdint>
-#include <functional>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "flutter/flow/embedded_views.h"
-#include "flutter/fml/logging.h"
-#include "flutter/fml/time/time_delta.h"
-#include "flutter/fml/time/time_point.h"
-#include "third_party/skia/include/core/SkColor.h"
-#include "third_party/skia/include/core/SkSize.h"
-#include "third_party/skia/include/core/SkSurface.h"
-
-#include "fakes/scenic/fake_resources.h"
-#include "fakes/scenic/fake_session.h"
-#include "flutter/shell/platform/fuchsia/flutter/surface_producer.h"
-
-#include "gmock/gmock.h"  // For EXPECT_THAT and matchers
-#include "gtest/gtest.h"
-
-using fuchsia::scenic::scheduling::FramePresentedInfo;
-using fuchsia::scenic::scheduling::FuturePresentationTimes;
-using fuchsia::scenic::scheduling::PresentReceivedInfo;
-using ::testing::_;
-using ::testing::ElementsAre;
-using ::testing::FieldsAre;
-using ::testing::IsEmpty;
-using ::testing::IsNull;
-using ::testing::Matcher;
-using ::testing::Pointee;
-using ::testing::SizeIs;
-using ::testing::VariantWith;
-
-namespace flutter_runner::testing {
-namespace {
-
-class FakeSurfaceProducerSurface : public SurfaceProducerSurface {
- public:
-  explicit FakeSurfaceProducerSurface(scenic::Session* session,
-                                      const SkISize& size,
-                                      uint32_t buffer_id)
-      : session_(session),
-        surface_(SkSurface::MakeNull(size.width(), size.height())),
-        buffer_id_(buffer_id) {
-    FML_CHECK(session_);
-    FML_CHECK(buffer_id_ != 0);
-
-    fuchsia::sysmem::BufferCollectionTokenSyncPtr token;
-    buffer_binding_ = token.NewRequest();
-
-    image_id_ = session_->AllocResourceId();
-    session_->RegisterBufferCollection(buffer_id_, std::move(token));
-    session_->Enqueue(scenic::NewCreateImage2Cmd(
-        image_id_, surface_->width(), surface_->height(), buffer_id_, 0));
-  }
-  ~FakeSurfaceProducerSurface() override {
-    session_->DeregisterBufferCollection(buffer_id_);
-    session_->Enqueue(scenic::NewReleaseResourceCmd(image_id_));
-  }
-
-  bool IsValid() const override { return true; }
-
-  SkISize GetSize() const override {
-    return SkISize::Make(surface_->width(), surface_->height());
-  }
-
-  void SetImageId(uint32_t image_id) override { FAIL(); }
-  uint32_t GetImageId() override { return image_id_; }
-
-  sk_sp<SkSurface> GetSkiaSurface() const override { return surface_; }
-
-  fuchsia::ui::composition::BufferCollectionImportToken
-  GetBufferCollectionImportToken() override {
-    return fuchsia::ui::composition::BufferCollectionImportToken{};
-  }
-
-  zx::event GetAcquireFence() override { return zx::event{}; }
-
-  zx::event GetReleaseFence() override { return zx::event{}; }
-
-  void SetReleaseImageCallback(
-      ReleaseImageCallback release_image_callback) override {}
-
-  size_t AdvanceAndGetAge() override { return 0; }
-  bool FlushSessionAcquireAndReleaseEvents() override { return true; }
-  void SignalWritesFinished(
-      const std::function<void(void)>& on_writes_committed) override {}
-
- private:
-  scenic::Session* session_;
-
-  sk_sp<SkSurface> surface_;
-
-  fidl::InterfaceRequest<fuchsia::sysmem::BufferCollectionToken>
-      buffer_binding_;
-  FakeResourceId image_id_{kInvalidFakeResourceId};
-  uint32_t buffer_id_{0};
-};
-
-class FakeSurfaceProducer : public SurfaceProducer {
- public:
-  explicit FakeSurfaceProducer(scenic::Session* session) : session_(session) {}
-  ~FakeSurfaceProducer() override = default;
-
-  // |SurfaceProducer|
-  GrDirectContext* gr_context() const override { return nullptr; }
-
-  // |SurfaceProducer|
-  std::unique_ptr<SurfaceProducerSurface> ProduceOffscreenSurface(
-      const SkISize& size) override {
-    return nullptr;
-  }
-
-  // |SurfaceProducer|
-  std::unique_ptr<SurfaceProducerSurface> ProduceSurface(
-      const SkISize& size) override {
-    return std::make_unique<FakeSurfaceProducerSurface>(session_, size,
-                                                        buffer_id_++);
-  }
-
-  // |SurfaceProducer|
-  void SubmitSurfaces(
-      std::vector<std::unique_ptr<SurfaceProducerSurface>> surfaces) override {}
-
- private:
-  scenic::Session* session_;
-
-  uint32_t buffer_id_{1};
-};
-
-std::string GetCurrentTestName() {
-  return ::testing::UnitTest::GetInstance()->current_test_info()->name();
-}
-
-zx_koid_t GetKoid(zx_handle_t handle) {
-  if (handle == ZX_HANDLE_INVALID) {
-    return ZX_KOID_INVALID;
-  }
-
-  zx_info_handle_basic_t info;
-  zx_status_t status = zx_object_get_info(handle, ZX_INFO_HANDLE_BASIC, &info,
-                                          sizeof(info), nullptr, nullptr);
-  return status == ZX_OK ? info.koid : ZX_KOID_INVALID;
-}
-
-zx_koid_t GetPeerKoid(zx_handle_t handle) {
-  if (handle == ZX_HANDLE_INVALID) {
-    return ZX_KOID_INVALID;
-  }
-
-  zx_info_handle_basic_t info;
-  zx_status_t status = zx_object_get_info(handle, ZX_INFO_HANDLE_BASIC, &info,
-                                          sizeof(info), nullptr, nullptr);
-  return status == ZX_OK ? info.related_koid : ZX_KOID_INVALID;
-}
-
-MATCHER_P(MaybeIsEmpty, assert_empty, "") {
-  return assert_empty ? ExplainMatchResult(IsEmpty(), arg, result_listener)
-                      : ExplainMatchResult(_, arg, result_listener);
-}
-
-Matcher<FakeSceneGraph> IsEmptySceneGraph() {
-  return FieldsAre(IsEmpty(), IsEmpty(), IsEmpty(), kInvalidFakeResourceId);
-}
-
-void AssertRootSceneGraph(const FakeSceneGraph& scene_graph,
-                          bool assert_empty) {
-  ASSERT_NE(scene_graph.root_view_id, kInvalidFakeResourceId);
-  ASSERT_EQ(scene_graph.resource_map.count(scene_graph.root_view_id), 1u);
-  auto scene_graph_root =
-      scene_graph.resource_map.find(scene_graph.root_view_id);
-  ASSERT_THAT(
-      scene_graph_root->second,
-      Pointee(FieldsAre(
-          scene_graph.root_view_id, "", FakeResource::kDefaultEmptyEventMask,
-          VariantWith<FakeView>(FieldsAre(
-              _, _, _, _,
-              ElementsAre(Pointee(FieldsAre(
-                  _, "Flutter::MetricsWatcher",
-                  fuchsia::ui::gfx::kMetricsEventMask,
-                  VariantWith<FakeEntityNode>(FieldsAre(
-                      FieldsAre(
-                          ElementsAre(Pointee(FieldsAre(
-                              _, "Flutter::LayerTree",
-                              FakeResource::kDefaultEmptyEventMask,
-                              VariantWith<FakeEntityNode>(FieldsAre(
-                                  FieldsAre(MaybeIsEmpty(assert_empty),
-                                            FakeNode::kDefaultZeroRotation,
-                                            FakeNode::kDefaultOneScale,
-                                            FakeNode::kDefaultZeroTranslation,
-                                            FakeNode::kDefaultZeroAnchor,
-                                            FakeNode::kIsHitTestable,
-                                            FakeNode::kIsSemanticallyVisible),
-                                  IsEmpty()))))),
-                          FakeNode::kDefaultZeroRotation,
-                          FakeNode::kDefaultOneScale,
-                          FakeNode::kDefaultZeroTranslation,
-                          FakeNode::kDefaultZeroAnchor,
-                          FakeNode::kIsHitTestable,
-                          FakeNode::kIsSemanticallyVisible),
-                      IsEmpty()))))),
-              FakeView::kDebugBoundsDisbaled)))));
-}
-
-void ExpectRootSceneGraph(
-    const FakeSceneGraph& scene_graph,
-    const std::string& debug_name,
-    const fuchsia::ui::views::ViewHolderToken& view_holder_token,
-    const fuchsia::ui::views::ViewRef& view_ref) {
-  AssertRootSceneGraph(scene_graph, true);
-
-  // These are safe to do unchecked due to `AssertRootSceneGraph` above.
-  auto root_view_it = scene_graph.resource_map.find(scene_graph.root_view_id);
-  auto* root_view_state = std::get_if<FakeView>(&root_view_it->second->state);
-  EXPECT_EQ(root_view_state->token, GetPeerKoid(view_holder_token.value.get()));
-  EXPECT_EQ(root_view_state->control_ref,
-            GetPeerKoid(view_ref.reference.get()));
-  EXPECT_EQ(root_view_state->view_ref, GetKoid(view_ref.reference.get()));
-  EXPECT_EQ(root_view_state->debug_name, debug_name);
-  EXPECT_EQ(scene_graph.resource_map.size(), 3u);
-}
-
-/// Verifies the scene subgraph for a particular flutter embedder layer.
-///
-/// ARGUMENTS
-///
-/// scenic_node: The root of the layer's scenic subgraph.
-///
-/// layer_size: The expected dimensions of the layer's image.
-///
-/// flutter_layer_index: This layer's 0-indexed position in the list of
-/// flutter layers present in this frame, sorted in paint order.
-///
-/// paint_regions: List of non-overlapping rects, in canvas coordinate space,
-/// where content was drawn. For each "paint region" present in the frame, the
-/// embedder reports a corresponding "hit region" to scenic as a hittable
-/// ShapeNode. ShapeNodes are centered at (0, 0), by default, so they must be
-/// translated to match the locations of the corresopnding paint regions.
-void ExpectImageCompositorLayer(const FakeResource& scenic_node,
-                                const SkISize layer_size,
-                                size_t flutter_layer_index,
-                                std::vector<SkRect> paint_regions) {
-  const SkSize float_layer_size =
-      SkSize::Make(layer_size.width(), layer_size.height());
-  const float views_under_layer_depth =
-      flutter_layer_index *
-      GfxExternalViewEmbedder::kScenicZElevationForPlatformView;
-  const float layer_depth =
-      flutter_layer_index *
-          GfxExternalViewEmbedder::kScenicZElevationBetweenLayers +
-      views_under_layer_depth;
-  const float layer_opacity =
-      (flutter_layer_index == 0)
-          ? GfxExternalViewEmbedder::kBackgroundLayerOpacity / 255.f
-          : GfxExternalViewEmbedder::kOverlayLayerOpacity / 255.f;
-
-  EXPECT_THAT(
-      scenic_node,
-      FieldsAre(
-          _, "Flutter::Layer", FakeResource::kDefaultEmptyEventMask,
-          VariantWith<FakeEntityNode>(FieldsAre(
-              FieldsAre(
-                  // Verify children separately below, since the
-                  // expected number of children may vary across
-                  // different test cases that call this method.
-                  _, FakeNode::kDefaultZeroRotation, FakeNode::kDefaultOneScale,
-                  FakeNode::kDefaultZeroTranslation,
-                  FakeNode::kDefaultZeroAnchor, FakeNode::kIsHitTestable,
-                  FakeNode::kIsSemanticallyVisible),
-              _))));
-
-  const auto* layer_node_state =
-      std::get_if<FakeEntityNode>(&scenic_node.state);
-  ASSERT_TRUE(layer_node_state);
-
-  const auto& layer_node_children = layer_node_state->node_state.children;
-
-  // The layer entity node should have a child node for the image, and
-  // separate children for each of the hit regions.
-  ASSERT_EQ(layer_node_children.size(), paint_regions.size() + 1);
-
-  // Verify image node.
-  EXPECT_THAT(
-      layer_node_children[0],
-      Pointee(FieldsAre(
-          _, "Flutter::Layer::Image", FakeResource::kDefaultEmptyEventMask,
-          VariantWith<FakeShapeNode>(FieldsAre(
-              FieldsAre(IsEmpty(), FakeNode::kDefaultZeroRotation,
-                        FakeNode::kDefaultOneScale,
-                        std::array<float, 3>{float_layer_size.width() / 2.f,
-                                             float_layer_size.height() / 2.f,
-                                             -layer_depth},
-                        FakeNode::kDefaultZeroAnchor,
-                        FakeNode::kIsNotHitTestable,
-                        FakeNode::kIsNotSemanticallyVisible),
-              Pointee(
-                  FieldsAre(_, "", FakeResource::kDefaultEmptyEventMask,
-                            VariantWith<FakeShape>(
-                                FieldsAre(VariantWith<FakeShape::RectangleDef>(
-                                    FieldsAre(float_layer_size.width(),
-                                              float_layer_size.height())))))),
-              Pointee(FieldsAre(
-                  _, "", FakeResource::kDefaultEmptyEventMask,
-                  VariantWith<FakeMaterial>(FieldsAre(
-                      Pointee(FieldsAre(
-                          _, "", FakeResource::kDefaultEmptyEventMask,
-                          VariantWith<FakeImage>(FieldsAre(
-                              VariantWith<FakeImage::Image2Def>(
-                                  FieldsAre(_, 0, float_layer_size.width(),
-                                            float_layer_size.height())),
-                              IsNull())))),
-                      std::array<float, 4>{1.f, 1.f, 1.f,
-                                           layer_opacity})))))))));
-
-  // Verify hit regions.
-  for (size_t i = 0; i < paint_regions.size(); ++i) {
-    ASSERT_LT(i, layer_node_children.size());
-    const auto& paint_region = paint_regions[i];
-    EXPECT_THAT(
-        layer_node_children[i + 1],
-        Pointee(FieldsAre(
-            _, "Flutter::Layer::HitRegion",
-            FakeResource::kDefaultEmptyEventMask,
-            VariantWith<FakeShapeNode>(FieldsAre(
-                FieldsAre(IsEmpty(), FakeNode::kDefaultZeroRotation,
-                          FakeNode::kDefaultOneScale,
-                          std::array<float, 3>{
-                              paint_region.x() + paint_region.width() / 2.f,
-                              paint_region.y() + paint_region.height() / 2.f,
-                              -layer_depth},
-                          FakeNode::kDefaultZeroAnchor,
-                          FakeNode::kIsHitTestable,
-                          FakeNode::kIsSemanticallyVisible),
-                Pointee(FieldsAre(
-                    _, "", FakeResource::kDefaultEmptyEventMask,
-                    VariantWith<FakeShape>(FieldsAre(
-                        VariantWith<FakeShape::RectangleDef>(FieldsAre(
-                            paint_region.width(), paint_region.height())))))),
-                IsNull())))));
-  }
-}
-
-void ExpectViewCompositorLayer(const FakeResource& scenic_node,
-                               const fuchsia::ui::views::ViewToken& view_token,
-                               const flutter::EmbeddedViewParams& view_params,
-                               size_t flutter_layer_index) {
-  const float views_under_layer_depth =
-      flutter_layer_index > 0
-          ? (flutter_layer_index - 1) *
-                GfxExternalViewEmbedder::kScenicZElevationForPlatformView
-          : 0.f;
-  const float layer_depth =
-      flutter_layer_index *
-          GfxExternalViewEmbedder::kScenicZElevationBetweenLayers +
-      views_under_layer_depth;
-  EXPECT_THAT(
-      scenic_node,
-      FieldsAre(
-          _, _ /*"Flutter::PlatformView::OpacityMutator" */,
-          FakeResource::kDefaultEmptyEventMask,
-          VariantWith<FakeOpacityNode>(FieldsAre(
-              FieldsAre(
-                  ElementsAre(Pointee(FieldsAre(
-                      _, _ /*"Flutter::PlatformView::TransformMutator" */,
-                      FakeResource::kDefaultEmptyEventMask,
-                      VariantWith<FakeEntityNode>(FieldsAre(
-                          FieldsAre(
-                              ElementsAre(Pointee(FieldsAre(
-                                  _, "", FakeResource::kDefaultEmptyEventMask,
-                                  VariantWith<FakeViewHolder>(FieldsAre(
-                                      FieldsAre(
-                                          IsEmpty(),
-                                          FakeNode::kDefaultZeroRotation,
-                                          FakeNode::kDefaultOneScale,
-                                          FakeNode::kDefaultZeroTranslation,
-                                          FakeNode::kDefaultZeroAnchor,
-                                          FakeNode::kIsHitTestable,
-                                          FakeNode::kIsSemanticallyVisible),
-                                      GetPeerKoid(view_token.value.get()),
-                                      "Flutter::PlatformView",
-                                      fuchsia::ui::gfx::ViewProperties{
-                                          .bounding_box =
-                                              fuchsia::ui::gfx::BoundingBox{
-                                                  .min = {0.f, 0.f, -1000.f},
-                                                  .max =
-                                                      {view_params.sizePoints()
-                                                           .width(),
-                                                       view_params.sizePoints()
-                                                           .height(),
-                                                       0.f},
-                                              }},
-                                      FakeViewHolder::
-                                          kDefaultBoundsColorWhite))))),
-                              FakeNode::kDefaultZeroRotation,
-                              FakeNode::kDefaultOneScale,
-                              std::array<float, 3>{0.f, 0.f, -layer_depth},
-                              FakeNode::kDefaultZeroAnchor,
-                              FakeNode::kIsHitTestable,
-                              FakeNode::kIsSemanticallyVisible),
-                          IsEmpty()))))),
-                  FakeNode::kDefaultZeroRotation, FakeNode::kDefaultOneScale,
-                  FakeNode::kDefaultZeroTranslation,
-                  FakeNode::kDefaultZeroAnchor, FakeNode::kIsHitTestable,
-                  FakeNode::kIsSemanticallyVisible),
-              FakeOpacityNode::kDefaultOneOpacity))));
-}
-
-std::vector<FakeResource> ExtractLayersFromSceneGraph(
-    const FakeSceneGraph& scene_graph) {
-  AssertRootSceneGraph(scene_graph, false);
-
-  // These are safe to do unchecked due to `AssertRootSceneGraph` above.
-  auto root_view_it = scene_graph.resource_map.find(scene_graph.root_view_id);
-  auto* root_view_state = std::get_if<FakeView>(&root_view_it->second->state);
-  auto* metrics_watcher_state =
-      std::get_if<FakeEntityNode>(&root_view_state->children[0]->state);
-  auto* layer_tree_state = std::get_if<FakeEntityNode>(
-      &metrics_watcher_state->node_state.children[0]->state);
-
-  std::vector<FakeResource> scenic_layers;
-  for (auto& layer_resource : layer_tree_state->node_state.children) {
-    scenic_layers.push_back(*layer_resource);
-  }
-
-  return scenic_layers;
-}
-
-void DrawSimpleFrame(GfxExternalViewEmbedder& external_view_embedder,
-                     SkISize frame_size,
-                     float frame_dpr,
-                     std::function<void(SkCanvas*)> draw_callback) {
-  external_view_embedder.BeginFrame(frame_size, nullptr, frame_dpr, nullptr);
-  {
-    SkCanvas* root_canvas = external_view_embedder.GetRootCanvas();
-    external_view_embedder.PostPrerollAction(nullptr);
-    draw_callback(root_canvas);
-  }
-  external_view_embedder.EndFrame(false, nullptr);
-  flutter::SurfaceFrame::FramebufferInfo framebuffer_info;
-  external_view_embedder.SubmitFrame(
-      nullptr, std::make_unique<flutter::SurfaceFrame>(
-                   nullptr, framebuffer_info,
-                   [](const flutter::SurfaceFrame& surface_frame,
-                      SkCanvas* canvas) { return true; },
-                   frame_size));
-}
-
-void DrawFrameWithView(GfxExternalViewEmbedder& external_view_embedder,
-                       SkISize frame_size,
-                       float frame_dpr,
-                       int view_id,
-                       flutter::EmbeddedViewParams& view_params,
-                       std::function<void(SkCanvas*)> background_draw_callback,
-                       std::function<void(SkCanvas*)> overlay_draw_callback) {
-  external_view_embedder.BeginFrame(frame_size, nullptr, frame_dpr, nullptr);
-  {
-    SkCanvas* root_canvas = external_view_embedder.GetRootCanvas();
-    external_view_embedder.PrerollCompositeEmbeddedView(
-        view_id, std::make_unique<flutter::EmbeddedViewParams>(view_params));
-    external_view_embedder.PostPrerollAction(nullptr);
-    background_draw_callback(root_canvas);
-    SkCanvas* overlay_canvas =
-        external_view_embedder.CompositeEmbeddedView(view_id).canvas;
-    overlay_draw_callback(overlay_canvas);
-  }
-  external_view_embedder.EndFrame(false, nullptr);
-  flutter::SurfaceFrame::FramebufferInfo framebuffer_info;
-  external_view_embedder.SubmitFrame(
-      nullptr, std::make_unique<flutter::SurfaceFrame>(
-                   nullptr, framebuffer_info,
-                   [](const flutter::SurfaceFrame& surface_frame,
-                      SkCanvas* canvas) { return true; },
-                   frame_size));
-}
-
-FramePresentedInfo MakeFramePresentedInfoForOnePresent(
-    int64_t latched_time,
-    int64_t frame_presented_time) {
-  std::vector<PresentReceivedInfo> present_infos;
-  present_infos.emplace_back();
-  present_infos.back().set_present_received_time(0);
-  present_infos.back().set_latched_time(0);
-  return FramePresentedInfo{
-      .actual_presentation_time = 0,
-      .presentation_infos = std::move(present_infos),
-      .num_presents_allowed = 1,
-  };
-}
-
-};  // namespace
-
-class GfxExternalViewEmbedderTest
-    : public ::testing::Test,
-      public fuchsia::ui::scenic::SessionListener {
- protected:
-  GfxExternalViewEmbedderTest()
-      : session_subloop_(loop_.StartNewLoop()),
-        session_listener_(this),
-        session_connection_(CreateSessionConnection()),
-        fake_surface_producer_(
-            std::make_shared<FakeSurfaceProducer>(session_connection_->get())) {
-  }
-  ~GfxExternalViewEmbedderTest() override = default;
-
-  async::TestLoop& loop() { return loop_; }
-
-  FakeSession& fake_session() { return fake_session_; }
-
-  std::shared_ptr<FakeSurfaceProducer> fake_surface_producer() {
-    return fake_surface_producer_;
-  }
-
-  std::shared_ptr<GfxSessionConnection> session_connection() {
-    return session_connection_;
-  }
-
- private:
-  // |fuchsia::ui::scenic::SessionListener|
-  void OnScenicError(std::string error) override { FAIL(); }
-
-  // |fuchsia::ui::scenic::SessionListener|
-  void OnScenicEvent(std::vector<fuchsia::ui::scenic::Event> events) override {
-    FAIL();
-  }
-
-  std::shared_ptr<GfxSessionConnection> CreateSessionConnection() {
-    FML_CHECK(!fake_session_.is_bound());
-    FML_CHECK(!session_listener_.is_bound());
-
-    inspect::Node inspect_node =
-        inspector_.GetRoot().CreateChild("GfxExternalViewEmbedderTest");
-
-    auto [session, session_listener] =
-        fake_session_.Bind(session_subloop_->dispatcher());
-    session_listener_.Bind(std::move(session_listener));
-
-    return std::make_shared<GfxSessionConnection>(
-        GetCurrentTestName(), std::move(inspect_node), std::move(session),
-        []() { FAIL(); }, [](auto...) {}, 1, fml::TimeDelta::Zero());
-  }
-
-  async::TestLoop loop_;  // Must come before FIDL bindings.
-  std::unique_ptr<async::LoopInterface> session_subloop_;
-
-  fidl::Binding<fuchsia::ui::scenic::SessionListener> session_listener_;
-
-  inspect::Inspector inspector_;
-
-  FakeSession fake_session_;
-
-  std::shared_ptr<GfxSessionConnection> session_connection_;
-  std::shared_ptr<FakeSurfaceProducer> fake_surface_producer_;
-};
-
-// Tests the trivial case where flutter does not present any content to scenic.
-TEST_F(GfxExternalViewEmbedderTest, RootScene) {
-  const std::string debug_name = GetCurrentTestName();
-  auto [view_token, view_holder_token] = scenic::ViewTokenPair::New();
-  auto view_ref_pair = scenic::ViewRefPair::New();
-  fuchsia::ui::views::ViewRef view_ref;
-  view_ref_pair.view_ref.Clone(&view_ref);
-
-  GfxExternalViewEmbedder external_view_embedder(
-      debug_name, std::move(view_token), std::move(view_ref_pair),
-      session_connection(), fake_surface_producer());
-  EXPECT_EQ(fake_session().debug_name(), "");
-  EXPECT_THAT(fake_session().SceneGraph(), IsEmptySceneGraph());
-
-  // Pump the loop; the contents of the initial `Present` should be processed.
-  loop().RunUntilIdle();
-  EXPECT_EQ(fake_session().debug_name(), debug_name);
-  ExpectRootSceneGraph(fake_session().SceneGraph(), debug_name,
-                       view_holder_token, view_ref);
-
-  // Fire the `OnFramePresented` event associated with the first `Present`, then
-  // pump the loop.  The `OnFramePresented` event is resolved.
-  //
-  // The scene graph shouldn't change.
-  fake_session().FireOnFramePresentedEvent(
-      MakeFramePresentedInfoForOnePresent(0, 0));
-  loop().RunUntilIdle();
-  ExpectRootSceneGraph(fake_session().SceneGraph(), debug_name,
-                       view_holder_token, view_ref);
-}
-
-// Tests the case where flutter renders a single image.
-TEST_F(GfxExternalViewEmbedderTest, SimpleScene) {
-  const std::string debug_name = GetCurrentTestName();
-  auto [view_token, view_holder_token] = scenic::ViewTokenPair::New();
-  auto view_ref_pair = scenic::ViewRefPair::New();
-  fuchsia::ui::views::ViewRef view_ref;
-  view_ref_pair.view_ref.Clone(&view_ref);
-
-  // Create the `GfxExternalViewEmbedder` and pump the message loop until
-  // the initial scene graph is setup.
-  GfxExternalViewEmbedder external_view_embedder(
-      debug_name, std::move(view_token), std::move(view_ref_pair),
-      session_connection(), fake_surface_producer());
-  loop().RunUntilIdle();
-  fake_session().FireOnFramePresentedEvent(
-      MakeFramePresentedInfoForOnePresent(0, 0));
-  loop().RunUntilIdle();
-  ExpectRootSceneGraph(fake_session().SceneGraph(), debug_name,
-                       view_holder_token, view_ref);
-
-  // Draw the scene.  The scene graph shouldn't change yet.
-  const SkISize frame_size = SkISize::Make(512, 512);
-  SkRect paint_region;
-  DrawSimpleFrame(
-      external_view_embedder, frame_size, 1.f,
-      [&paint_region](SkCanvas* canvas) {
-        const SkSize canvas_size = SkSize::Make(canvas->imageInfo().width(),
-                                                canvas->imageInfo().height());
-        SkPaint rect_paint;
-        rect_paint.setColor(SK_ColorGREEN);
-
-        paint_region = SkRect::MakeXYWH(
-            canvas_size.width() / 4.f, canvas_size.height() / 2.f,
-            canvas_size.width() / 32.f, canvas_size.height() / 32.f);
-
-        canvas->drawRect(paint_region, rect_paint);
-      });
-  ExpectRootSceneGraph(fake_session().SceneGraph(), debug_name,
-                       view_holder_token, view_ref);
-
-  // Pump the message loop.  The scene updates should propogate to Scenic.
-  loop().RunUntilIdle();
-  std::vector<FakeResource> scenic_layers =
-      ExtractLayersFromSceneGraph(fake_session().SceneGraph());
-  EXPECT_EQ(scenic_layers.size(), 1u);
-  ExpectImageCompositorLayer(scenic_layers[0], frame_size,
-                             /* flutter layer index = */ 0, {paint_region});
-}
-
-// Tests the case where flutter embeds a platform view on top of an image layer.
-TEST_F(GfxExternalViewEmbedderTest, SceneWithOneView) {
-  const std::string debug_name = GetCurrentTestName();
-  auto [view_token, view_holder_token] = scenic::ViewTokenPair::New();
-  auto view_ref_pair = scenic::ViewRefPair::New();
-  fuchsia::ui::views::ViewRef view_ref;
-  view_ref_pair.view_ref.Clone(&view_ref);
-
-  // Create the `GfxExternalViewEmbedder` and pump the message loop until
-  // the initial scene graph is setup.
-  GfxExternalViewEmbedder external_view_embedder(
-      debug_name, std::move(view_token), std::move(view_ref_pair),
-      session_connection(), fake_surface_producer());
-  loop().RunUntilIdle();
-  fake_session().FireOnFramePresentedEvent(
-      MakeFramePresentedInfoForOnePresent(0, 0));
-  loop().RunUntilIdle();
-  ExpectRootSceneGraph(fake_session().SceneGraph(), debug_name,
-                       view_holder_token, view_ref);
-
-  // Create the view before drawing the scene.
-  const SkSize child_view_size = SkSize::Make(256.f, 512.f);
-  auto [child_view_token, child_view_holder_token] =
-      scenic::ViewTokenPair::New();
-  const uint32_t child_view_id = child_view_holder_token.value.get();
-  flutter::EmbeddedViewParams child_view_params(SkMatrix::I(), child_view_size,
-                                                flutter::MutatorsStack());
-  external_view_embedder.CreateView(
-      child_view_id, []() {}, [](scenic::ResourceId) {});
-
-  // Draw the scene.  The scene graph shouldn't change yet.
-  const SkISize frame_size = SkISize::Make(512, 512);
-
-  SkRect main_surface_paint_region, overlay_paint_region;
-
-  DrawFrameWithView(
-      external_view_embedder, frame_size, 1.f, child_view_id, child_view_params,
-      [&main_surface_paint_region](SkCanvas* canvas) {
-        const SkSize canvas_size = SkSize::Make(canvas->imageInfo().width(),
-                                                canvas->imageInfo().height());
-
-        main_surface_paint_region = SkRect::MakeXYWH(
-            canvas_size.width() / 4.f, canvas_size.width() / 2.f,
-            canvas_size.width() / 32.f, canvas_size.height() / 32.f);
-
-        SkPaint rect_paint;
-        rect_paint.setColor(SK_ColorGREEN);
-        canvas->drawRect(main_surface_paint_region, rect_paint);
-      },
-      [&overlay_paint_region](SkCanvas* canvas) {
-        const SkSize canvas_size = SkSize::Make(canvas->imageInfo().width(),
-                                                canvas->imageInfo().height());
-        overlay_paint_region = SkRect::MakeXYWH(
-            canvas_size.width() * 3.f / 4.f, canvas_size.height() / 2.f,
-            canvas_size.width() / 32.f, canvas_size.height() / 32.f);
-
-        SkPaint rect_paint;
-        rect_paint.setColor(SK_ColorRED);
-        canvas->drawRect(overlay_paint_region, rect_paint);
-      });
-  ExpectRootSceneGraph(fake_session().SceneGraph(), debug_name,
-                       view_holder_token, view_ref);
-
-  // Pump the message loop.  The scene updates should propagate to Scenic.
-  loop().RunUntilIdle();
-  std::vector<FakeResource> scenic_layers =
-      ExtractLayersFromSceneGraph(fake_session().SceneGraph());
-  EXPECT_EQ(scenic_layers.size(), 3u);
-  ExpectImageCompositorLayer(scenic_layers[0], frame_size,
-                             /* flutter layer index = */ 0,
-                             {main_surface_paint_region});
-  ExpectViewCompositorLayer(scenic_layers[1], child_view_token,
-                            child_view_params,
-                            /* flutter layer index = */ 1);
-  ExpectImageCompositorLayer(scenic_layers[2], frame_size,
-                             /* flutter layer index = */ 1,
-                             {overlay_paint_region});
-
-  // Destroy the view.
-  external_view_embedder.DestroyView(child_view_id, [](scenic::ResourceId) {});
-
-  // Pump the message loop.
-  loop().RunUntilIdle();
-}
-
-// Tests the case where flutter renders an image with two non-overlapping pieces
-// of content. In this case, the embedder should report two separate hit regions
-// to scenic.
-TEST_F(GfxExternalViewEmbedderTest, SimpleSceneDisjointHitRegions) {
-  const std::string debug_name = GetCurrentTestName();
-  auto [view_token, view_holder_token] = scenic::ViewTokenPair::New();
-  auto view_ref_pair = scenic::ViewRefPair::New();
-  fuchsia::ui::views::ViewRef view_ref;
-  view_ref_pair.view_ref.Clone(&view_ref);
-
-  // Create the `GfxExternalViewEmbedder` and pump the message loop until
-  // the initial scene graph is setup.
-  GfxExternalViewEmbedder external_view_embedder(
-      debug_name, std::move(view_token), std::move(view_ref_pair),
-      session_connection(), fake_surface_producer());
-  loop().RunUntilIdle();
-  fake_session().FireOnFramePresentedEvent(
-      MakeFramePresentedInfoForOnePresent(0, 0));
-  loop().RunUntilIdle();
-  ExpectRootSceneGraph(fake_session().SceneGraph(), debug_name,
-                       view_holder_token, view_ref);
-
-  // Draw the scene.  The scene graph shouldn't change yet.
-  SkRect paint_region_1, paint_region_2;
-  const SkISize frame_size = SkISize::Make(512, 512);
-  DrawSimpleFrame(
-      external_view_embedder, frame_size, 1.f,
-      [&paint_region_1, &paint_region_2](SkCanvas* canvas) {
-        const SkSize canvas_size = SkSize::Make(canvas->imageInfo().width(),
-                                                canvas->imageInfo().height());
-
-        paint_region_1 = SkRect::MakeXYWH(
-            canvas_size.width() / 4.f, canvas_size.height() / 2.f,
-            canvas_size.width() / 32.f, canvas_size.height() / 32.f);
-
-        SkPaint rect_paint;
-        rect_paint.setColor(SK_ColorGREEN);
-        canvas->drawRect(paint_region_1, rect_paint);
-
-        paint_region_2 = SkRect::MakeXYWH(
-            canvas_size.width() * 3.f / 4.f, canvas_size.height() / 2.f,
-            canvas_size.width() / 32.f, canvas_size.height() / 32.f);
-
-        rect_paint.setColor(SK_ColorRED);
-        canvas->drawRect(paint_region_2, rect_paint);
-      });
-  ExpectRootSceneGraph(fake_session().SceneGraph(), debug_name,
-                       view_holder_token, view_ref);
-
-  // Pump the message loop.  The scene updates should propogate to Scenic.
-  loop().RunUntilIdle();
-  std::vector<FakeResource> scenic_layers =
-      ExtractLayersFromSceneGraph(fake_session().SceneGraph());
-  EXPECT_EQ(scenic_layers.size(), 1u);
-  ExpectImageCompositorLayer(scenic_layers[0], frame_size,
-                             /* flutter layer index = */ 0,
-                             {paint_region_1, paint_region_2});
-}
-
-// Tests the case where flutter renders an image with two overlapping pieces of
-// content. In this case, the embedder should report a single joint hit region
-// to scenic.
-TEST_F(GfxExternalViewEmbedderTest, SimpleSceneOverlappingHitRegions) {
-  const std::string debug_name = GetCurrentTestName();
-  auto [view_token, view_holder_token] = scenic::ViewTokenPair::New();
-  auto view_ref_pair = scenic::ViewRefPair::New();
-  fuchsia::ui::views::ViewRef view_ref;
-  view_ref_pair.view_ref.Clone(&view_ref);
-
-  // Create the `GfxExternalViewEmbedder` and pump the message loop until
-  // the initial scene graph is setup.
-  GfxExternalViewEmbedder external_view_embedder(
-      debug_name, std::move(view_token), std::move(view_ref_pair),
-      session_connection(), fake_surface_producer());
-  loop().RunUntilIdle();
-  fake_session().FireOnFramePresentedEvent(
-      MakeFramePresentedInfoForOnePresent(0, 0));
-  loop().RunUntilIdle();
-  ExpectRootSceneGraph(fake_session().SceneGraph(), debug_name,
-                       view_holder_token, view_ref);
-
-  // Draw the scene.  The scene graph shouldn't change yet.
-  SkRect joined_paint_region = SkRect::MakeEmpty();
-  const SkISize frame_size = SkISize::Make(512, 512);
-  DrawSimpleFrame(
-      external_view_embedder, frame_size, 1.f,
-      [&joined_paint_region](SkCanvas* canvas) {
-        const SkSize canvas_size = SkSize::Make(canvas->imageInfo().width(),
-                                                canvas->imageInfo().height());
-
-        auto paint_region_1 = SkRect::MakeXYWH(
-            canvas_size.width() / 4.f, canvas_size.height() / 4.f,
-            canvas_size.width() / 2.f, canvas_size.height() / 2.f);
-        SkPaint rect_paint;
-        rect_paint.setColor(SK_ColorGREEN);
-        canvas->drawRect(paint_region_1, rect_paint);
-
-        auto paint_region_2 = SkRect::MakeXYWH(
-            canvas_size.width() * 3.f / 8.f, canvas_size.height() / 4.f,
-            canvas_size.width() / 2.f, canvas_size.height() / 2.f);
-        rect_paint.setColor(SK_ColorRED);
-        canvas->drawRect(paint_region_2, rect_paint);
-
-        joined_paint_region.join(paint_region_1);
-        joined_paint_region.join(paint_region_2);
-      });
-  ExpectRootSceneGraph(fake_session().SceneGraph(), debug_name,
-                       view_holder_token, view_ref);
-
-  EXPECT_EQ(joined_paint_region.x(), 128.f);
-  EXPECT_EQ(joined_paint_region.y(), 128.f);
-  EXPECT_EQ(joined_paint_region.width(), 320.f);
-  EXPECT_EQ(joined_paint_region.height(), 256.f);
-  // Pump the message loop.  The scene updates should propogate to Scenic.
-  loop().RunUntilIdle();
-  std::vector<FakeResource> scenic_layers =
-      ExtractLayersFromSceneGraph(fake_session().SceneGraph());
-  EXPECT_EQ(scenic_layers.size(), 1u);
-  ExpectImageCompositorLayer(scenic_layers[0], frame_size,
-                             /* flutter layer index = */ 0,
-                             {joined_paint_region});
-}
-
-}  // namespace flutter_runner::testing
diff --git a/shell/platform/fuchsia/flutter/tests/gfx_session_connection_unittests.cc b/shell/platform/fuchsia/flutter/tests/gfx_session_connection_unittests.cc
deleted file mode 100644
index d8fdec58f3a1a0b833b7ba56b22ae6003beaa2c7..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/flutter/tests/gfx_session_connection_unittests.cc
+++ /dev/null
@@ -1,1075 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "flutter/shell/platform/fuchsia/flutter/gfx_session_connection.h"
-
-#include <fuchsia/scenic/scheduling/cpp/fidl.h>
-#include <fuchsia/ui/scenic/cpp/fidl.h>
-#include <lib/async-testing/test_loop.h>
-#include <lib/inspect/cpp/inspect.h>
-
-#include <functional>
-#include <string>
-#include <vector>
-
-#include "flutter/fml/logging.h"
-#include "flutter/fml/time/time_delta.h"
-#include "flutter/fml/time/time_point.h"
-#include "gtest/gtest.h"
-
-#include "fakes/scenic/fake_session.h"
-
-using fuchsia::scenic::scheduling::FramePresentedInfo;
-using fuchsia::scenic::scheduling::FuturePresentationTimes;
-using fuchsia::scenic::scheduling::PresentReceivedInfo;
-
-namespace flutter_runner::testing {
-namespace {
-
-std::string GetCurrentTestName() {
-  return ::testing::UnitTest::GetInstance()->current_test_info()->name();
-}
-
-fml::TimePoint TimePointFromInt(int64_t i) {
-  return fml::TimePoint::FromEpochDelta(fml::TimeDelta::FromNanoseconds(i));
-}
-
-fml::TimeDelta TimeDeltaFromInt(int64_t i) {
-  return fml::TimeDelta::FromNanoseconds(i);
-}
-
-int64_t TimePointToInt(fml::TimePoint time) {
-  return time.ToEpochDelta().ToNanoseconds();
-}
-
-fuchsia::scenic::scheduling::PresentationInfo CreatePresentationInfo(
-    zx_time_t latch_point,
-    zx_time_t presentation_time) {
-  fuchsia::scenic::scheduling::PresentationInfo info;
-
-  info.set_latch_point(latch_point);
-  info.set_presentation_time(presentation_time);
-  return info;
-}
-
-FramePresentedInfo MakeFramePresentedInfoForOnePresent(
-    int64_t latched_time,
-    int64_t frame_presented_time) {
-  std::vector<PresentReceivedInfo> present_infos;
-  present_infos.emplace_back();
-  present_infos.back().set_present_received_time(0);
-  present_infos.back().set_latched_time(0);
-  return FramePresentedInfo{
-      .actual_presentation_time = 0,
-      .presentation_infos = std::move(present_infos),
-      .num_presents_allowed = 1,
-  };
-}
-
-void AwaitVsyncChecked(GfxSessionConnection& session_connection,
-                       bool& condition_variable,
-                       fml::TimeDelta expected_frame_start,
-                       fml::TimeDelta expected_frame_end) {
-  session_connection.AwaitVsync(
-      [&condition_variable,
-       expected_frame_start = std::move(expected_frame_start),
-       expected_frame_end = std::move(expected_frame_end)](
-          fml::TimePoint frame_start, fml::TimePoint frame_end) {
-        EXPECT_EQ(frame_start.ToEpochDelta(), expected_frame_start);
-        EXPECT_EQ(frame_end.ToEpochDelta(), expected_frame_end);
-        condition_variable = true;
-      });
-}
-
-};  // namespace
-
-class GfxSessionConnectionTest : public ::testing::Test,
-                                 public fuchsia::ui::scenic::SessionListener {
- protected:
-  GfxSessionConnectionTest()
-      : session_listener_(this), session_subloop_(loop_.StartNewLoop()) {
-    auto [session, session_listener] =
-        fake_session().Bind(session_subloop_->dispatcher());
-
-    session_ = std::move(session);
-    session_listener_.Bind(std::move(session_listener));
-  }
-  ~GfxSessionConnectionTest() override = default;
-
-  async::TestLoop& loop() { return loop_; }
-
-  FakeSession& fake_session() { return fake_session_; }
-
-  inspect::Node GetInspectNode() {
-    return inspector_.GetRoot().CreateChild("GfxSessionConnectionTest");
-  }
-
-  fidl::InterfaceHandle<fuchsia::ui::scenic::Session> TakeSessionHandle() {
-    FML_CHECK(session_.is_valid());
-    return std::move(session_);
-  }
-
- private:
-  // |fuchsia::ui::scenic::SessionListener|
-  void OnScenicError(std::string error) override { FAIL(); }
-
-  // |fuchsia::ui::scenic::SessionListener|
-  void OnScenicEvent(std::vector<fuchsia::ui::scenic::Event> events) override {
-    FAIL();
-  }
-
-  async::TestLoop loop_;
-
-  inspect::Inspector inspector_;
-
-  fidl::InterfaceHandle<fuchsia::ui::scenic::Session> session_;
-  fidl::Binding<fuchsia::ui::scenic::SessionListener> session_listener_;
-
-  std::unique_ptr<async::LoopInterface> session_subloop_;
-  FakeSession fake_session_;
-};
-
-TEST_F(GfxSessionConnectionTest, Initialization) {
-  // Create the GfxSessionConnection but don't pump the loop.  No FIDL calls are
-  // completed yet.
-  const std::string debug_name = GetCurrentTestName();
-  flutter_runner::GfxSessionConnection session_connection(
-      debug_name, GetInspectNode(), TakeSessionHandle(), []() { FAIL(); },
-      [](auto...) { FAIL(); }, 1, fml::TimeDelta::Zero());
-  EXPECT_EQ(fake_session().debug_name(), "");
-  EXPECT_TRUE(fake_session().command_queue().empty());
-
-  // Simulate an AwaitVsync that comes immediately, before
-  // `RequestPresentationTimes` returns.
-  bool await_vsync_fired = false;
-  AwaitVsyncChecked(session_connection, await_vsync_fired,
-                    fml::TimeDelta::Zero(), kDefaultPresentationInterval);
-  EXPECT_TRUE(await_vsync_fired);
-
-  // Ensure the debug name is set.
-  loop().RunUntilIdle();
-  EXPECT_EQ(fake_session().debug_name(), debug_name);
-  EXPECT_TRUE(fake_session().command_queue().empty());
-}
-
-TEST_F(GfxSessionConnectionTest, SessionDisconnect) {
-  // Set up a callback which allows sensing of the session error state.
-  bool session_error_fired = false;
-  fml::closure on_session_error = [&session_error_fired]() {
-    session_error_fired = true;
-  };
-
-  // Create the GfxSessionConnection but don't pump the loop.  No FIDL calls are
-  // completed yet.
-  flutter_runner::GfxSessionConnection session_connection(
-      GetCurrentTestName(), GetInspectNode(), TakeSessionHandle(),
-      std::move(on_session_error), [](auto...) { FAIL(); }, 1,
-      fml::TimeDelta::Zero());
-  EXPECT_FALSE(session_error_fired);
-
-  // Simulate a session disconnection, then Pump the loop.  The session error
-  // callback will fire.
-  fake_session().DisconnectSession();
-  loop().RunUntilIdle();
-  EXPECT_TRUE(session_error_fired);
-}
-
-TEST_F(GfxSessionConnectionTest, BasicPresent) {
-  // Set up callbacks which allow sensing of how many presents
-  // (`RequestPresentationTimes` or `Present` calls) were handled.
-  size_t request_times_called = 0u;
-  size_t presents_called = 0u;
-  fake_session().SetRequestPresentationTimesHandler(
-      [&request_times_called](auto...) -> auto {
-        request_times_called++;
-        return FuturePresentationTimes{
-            .future_presentations = {},
-            .remaining_presents_in_flight_allowed = 1,
-        };
-      });
-  fake_session().SetPresent2Handler([&presents_called](auto...) -> auto {
-    presents_called++;
-    return FuturePresentationTimes{
-        .future_presentations = {},
-        .remaining_presents_in_flight_allowed = 1,
-    };
-  });
-
-  // Set up a callback which allows sensing of how many vsync's
-  // (`OnFramePresented` events) were handled.
-  size_t vsyncs_handled = 0u;
-  on_frame_presented_event on_frame_presented = [&vsyncs_handled](auto...) {
-    vsyncs_handled++;
-  };
-
-  // Create the GfxSessionConnection but don't pump the loop.  No FIDL calls are
-  // completed yet.
-  flutter_runner::GfxSessionConnection session_connection(
-      GetCurrentTestName(), GetInspectNode(), TakeSessionHandle(),
-      []() { FAIL(); }, std::move(on_frame_presented), 1,
-      fml::TimeDelta::Zero());
-  EXPECT_TRUE(fake_session().command_queue().empty());
-  EXPECT_EQ(request_times_called, 0u);
-  EXPECT_EQ(presents_called, 0u);
-  EXPECT_EQ(vsyncs_handled, 0u);
-
-  // Pump the loop; `RequestPresentationTimes`, `Present`, and both of their
-  // callbacks are called.
-  loop().RunUntilIdle();
-  EXPECT_TRUE(fake_session().command_queue().empty());
-  EXPECT_EQ(request_times_called, 1u);
-  EXPECT_EQ(presents_called, 1u);
-  EXPECT_EQ(vsyncs_handled, 0u);
-
-  // Fire the `OnFramePresented` event associated with the first `Present`, then
-  // pump the loop.  The `OnFramePresented` event is resolved.
-  fake_session().FireOnFramePresentedEvent(
-      MakeFramePresentedInfoForOnePresent(0, 0));
-  loop().RunUntilIdle();
-  EXPECT_TRUE(fake_session().command_queue().empty());
-  EXPECT_EQ(request_times_called, 1u);
-  EXPECT_EQ(presents_called, 1u);
-  EXPECT_EQ(vsyncs_handled, 1u);
-
-  // Simulate an AwaitVsync that comes after the first `OnFramePresented`
-  // event.
-  bool await_vsync_fired = false;
-  AwaitVsyncChecked(session_connection, await_vsync_fired,
-                    fml::TimeDelta::Zero(), kDefaultPresentationInterval);
-  EXPECT_TRUE(await_vsync_fired);
-
-  // Call Present and Pump the loop; `Present` and its callback is called.
-  await_vsync_fired = false;
-  session_connection.Present();
-  loop().RunUntilIdle();
-  EXPECT_TRUE(fake_session().command_queue().empty());
-  EXPECT_FALSE(await_vsync_fired);
-  EXPECT_EQ(request_times_called, 1u);
-  EXPECT_EQ(presents_called, 2u);
-  EXPECT_EQ(vsyncs_handled, 1u);
-
-  // Fire the `OnFramePresented` event associated with the second `Present`,
-  // then pump the loop.  The `OnFramePresented` event is resolved.
-  fake_session().FireOnFramePresentedEvent(
-      MakeFramePresentedInfoForOnePresent(0, 0));
-  loop().RunUntilIdle();
-  EXPECT_TRUE(fake_session().command_queue().empty());
-  EXPECT_FALSE(await_vsync_fired);
-  EXPECT_EQ(request_times_called, 1u);
-  EXPECT_EQ(presents_called, 2u);
-  EXPECT_EQ(vsyncs_handled, 2u);
-
-  // Simulate an AwaitVsync that comes after the second `OnFramePresented`
-  // event.
-  await_vsync_fired = false;
-  AwaitVsyncChecked(session_connection, await_vsync_fired,
-                    kDefaultPresentationInterval,
-                    kDefaultPresentationInterval * 2);
-  EXPECT_TRUE(await_vsync_fired);
-}
-
-TEST_F(GfxSessionConnectionTest, AwaitVsyncBackpressure) {
-  // Set up a callback which allows sensing of how many presents
-  // (`Present` calls) were handled.
-  size_t presents_called = 0u;
-  fake_session().SetPresent2Handler([&presents_called](auto...) -> auto {
-    presents_called++;
-    return FuturePresentationTimes{
-        .future_presentations = {},
-        .remaining_presents_in_flight_allowed = 1,
-    };
-  });
-
-  // Set up a callback which allows sensing of how many vsync's
-  // (`OnFramePresented` events) were handled.
-  size_t vsyncs_handled = 0u;
-  on_frame_presented_event on_frame_presented = [&vsyncs_handled](auto...) {
-    vsyncs_handled++;
-  };
-
-  // Create the GfxSessionConnection but don't pump the loop.  No FIDL calls are
-  // completed yet.
-  flutter_runner::GfxSessionConnection session_connection(
-      GetCurrentTestName(), GetInspectNode(), TakeSessionHandle(),
-      []() { FAIL(); }, std::move(on_frame_presented), 1,
-      fml::TimeDelta::Zero());
-  EXPECT_EQ(presents_called, 0u);
-  EXPECT_EQ(vsyncs_handled, 0u);
-
-  // Pump the loop; `RequestPresentationTimes`, `Present`, and both of their
-  // callbacks are called.
-  loop().RunUntilIdle();
-  EXPECT_EQ(presents_called, 1u);
-  EXPECT_EQ(vsyncs_handled, 0u);
-
-  // Simulate an AwaitVsync that comes before the first `OnFramePresented`
-  // event.
-  bool await_vsync_fired = false;
-  AwaitVsyncChecked(session_connection, await_vsync_fired,
-                    fml::TimeDelta::Zero(), kDefaultPresentationInterval);
-  EXPECT_FALSE(await_vsync_fired);
-
-  // Fire the `OnFramePresented` event associated with the first `Present`, then
-  // pump the loop.  The `OnFramePresented` event is resolved.  The AwaitVsync
-  // callback is resolved.
-  fake_session().FireOnFramePresentedEvent(
-      MakeFramePresentedInfoForOnePresent(0, 0));
-  loop().RunUntilIdle();
-  EXPECT_TRUE(await_vsync_fired);
-  EXPECT_EQ(presents_called, 1u);
-  EXPECT_EQ(vsyncs_handled, 1u);
-
-  // Simulate an AwaitVsync that comes before the second `Present`.
-  await_vsync_fired = false;
-  AwaitVsyncChecked(session_connection, await_vsync_fired,
-                    kDefaultPresentationInterval,
-                    kDefaultPresentationInterval * 2);
-  EXPECT_TRUE(await_vsync_fired);
-
-  // Call Present and Pump the loop; `Present` and its callback is called.
-  await_vsync_fired = false;
-  session_connection.Present();
-  loop().RunUntilIdle();
-  EXPECT_FALSE(await_vsync_fired);
-  EXPECT_EQ(presents_called, 2u);
-  EXPECT_EQ(vsyncs_handled, 1u);
-
-  // Simulate an AwaitVsync that comes before the second `OnFramePresented`
-  // event.
-  await_vsync_fired = false;
-  AwaitVsyncChecked(session_connection, await_vsync_fired,
-                    kDefaultPresentationInterval * 2,
-                    kDefaultPresentationInterval * 3);
-  EXPECT_FALSE(await_vsync_fired);
-
-  // Fire the `OnFramePresented` event associated with the second `Present`,
-  // then pump the loop.  The `OnFramePresented` event is resolved.
-  fake_session().FireOnFramePresentedEvent(
-      MakeFramePresentedInfoForOnePresent(0, 0));
-  loop().RunUntilIdle();
-  EXPECT_TRUE(await_vsync_fired);
-  EXPECT_EQ(presents_called, 2u);
-  EXPECT_EQ(vsyncs_handled, 2u);
-}
-
-TEST_F(GfxSessionConnectionTest, PresentBackpressure) {
-  // Set up a callback which allows sensing of how many presents
-  // (`Present` calls) were handled.
-  size_t presents_called = 0u;
-  fake_session().SetPresent2Handler([&presents_called](auto...) -> auto {
-    presents_called++;
-    return FuturePresentationTimes{
-        .future_presentations = {},
-        .remaining_presents_in_flight_allowed = 1,
-    };
-  });
-
-  // Set up a callback which allows sensing of how many vsync's
-  // (`OnFramePresented` events) were handled.
-  size_t vsyncs_handled = 0u;
-  on_frame_presented_event on_frame_presented = [&vsyncs_handled](auto...) {
-    vsyncs_handled++;
-  };
-
-  // Create the GfxSessionConnection but don't pump the loop.  No FIDL calls are
-  // completed yet.
-  flutter_runner::GfxSessionConnection session_connection(
-      GetCurrentTestName(), GetInspectNode(), TakeSessionHandle(),
-      []() { FAIL(); }, std::move(on_frame_presented), 1,
-      fml::TimeDelta::Zero());
-  EXPECT_EQ(presents_called, 0u);
-  EXPECT_EQ(vsyncs_handled, 0u);
-
-  // Pump the loop; `RequestPresentationTimes`, `Present`, and both of their
-  // callbacks are called.
-  loop().RunUntilIdle();
-  EXPECT_EQ(presents_called, 1u);
-  EXPECT_EQ(vsyncs_handled, 0u);
-
-  // Call Present and Pump the loop; `Present` is not called due to backpressue.
-  session_connection.Present();
-  loop().RunUntilIdle();
-  EXPECT_EQ(presents_called, 1u);
-  EXPECT_EQ(vsyncs_handled, 0u);
-
-  // Call Present again and Pump the loop; `Present` is not called due to
-  // backpressue.
-  session_connection.Present();
-  loop().RunUntilIdle();
-  EXPECT_EQ(presents_called, 1u);
-  EXPECT_EQ(vsyncs_handled, 0u);
-
-  // Fire the `OnFramePresented` event associated with the first `Present`, then
-  // pump the loop.  The `OnFramePresented` event is resolved.  The pending
-  // `Present` calls are resolved.
-  fake_session().FireOnFramePresentedEvent(
-      MakeFramePresentedInfoForOnePresent(0, 0));
-  loop().RunUntilIdle();
-  EXPECT_EQ(presents_called, 2u);
-  EXPECT_EQ(vsyncs_handled, 1u);
-
-  // Call Present and Pump the loop; `Present` is not called due to
-  // backpressue.
-  session_connection.Present();
-  loop().RunUntilIdle();
-  EXPECT_EQ(presents_called, 2u);
-  EXPECT_EQ(vsyncs_handled, 1u);
-
-  // Call Present again and Pump the loop; `Present` is not called due to
-  // backpressue.
-  session_connection.Present();
-  loop().RunUntilIdle();
-  EXPECT_EQ(presents_called, 2u);
-  EXPECT_EQ(vsyncs_handled, 1u);
-
-  // Fire the `OnFramePresented` event associated with the second `Present`,
-  // then pump the loop.  The `OnFramePresented` event is resolved.  The pending
-  // `Present` calls are resolved.
-  fake_session().FireOnFramePresentedEvent(
-      MakeFramePresentedInfoForOnePresent(0, 0));
-  loop().RunUntilIdle();
-  EXPECT_EQ(presents_called, 3u);
-  EXPECT_EQ(vsyncs_handled, 2u);
-
-  // Fire the `OnFramePresented` event associated with the third `Present`,
-  // then pump the loop.  The `OnFramePresented` event is resolved.  No pending
-  // `Present` calls exist, so none are resolved.
-  fake_session().FireOnFramePresentedEvent(
-      MakeFramePresentedInfoForOnePresent(0, 0));
-  loop().RunUntilIdle();
-  EXPECT_EQ(presents_called, 3u);
-  EXPECT_EQ(vsyncs_handled, 3u);
-}
-
-// The first set of tests has an empty |future_presentation_infos| passed in.
-// Therefore these tests are to ensure that on startup and after not presenting
-// for some time that we have correct, reasonable behavior.
-TEST(CalculateNextLatchPointTest, PresentAsSoonAsPossible) {
-  fml::TimePoint present_requested_time = TimePointFromInt(0);
-  fml::TimePoint now = TimePointFromInt(0);
-  fml::TimePoint last_latch_point_targeted = TimePointFromInt(0);
-  fml::TimeDelta flutter_frame_build_time = TimeDeltaFromInt(0);
-  fml::TimeDelta vsync_interval = TimeDeltaFromInt(1000);
-  std::deque<std::pair<fml::TimePoint, fml::TimePoint>>
-      future_presentation_infos = {};
-
-  // Assertions about given values.
-  EXPECT_GE(now, present_requested_time);
-  EXPECT_GE(flutter_frame_build_time, TimeDeltaFromInt(0));
-  EXPECT_GT(vsync_interval, TimeDeltaFromInt(0));
-
-  fml::TimePoint calculated_latch_point =
-      GfxSessionConnection::CalculateNextLatchPoint(
-          present_requested_time, now, last_latch_point_targeted,
-          flutter_frame_build_time, vsync_interval, future_presentation_infos);
-
-  EXPECT_GE(TimePointToInt(calculated_latch_point), TimePointToInt(now));
-  EXPECT_LE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(now + vsync_interval));
-
-  EXPECT_GE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(present_requested_time + flutter_frame_build_time));
-  EXPECT_GE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(last_latch_point_targeted));
-}
-
-TEST(CalculateNextLatchPointTest, LongFrameBuildTime) {
-  fml::TimePoint present_requested_time = TimePointFromInt(500);
-  fml::TimePoint now = TimePointFromInt(600);
-  fml::TimePoint last_latch_point_targeted = TimePointFromInt(0);
-  fml::TimeDelta flutter_frame_build_time = TimeDeltaFromInt(2500);
-  fml::TimeDelta vsync_interval = TimeDeltaFromInt(1000);
-  std::deque<std::pair<fml::TimePoint, fml::TimePoint>>
-      future_presentation_infos = {};
-
-  // Assertions about given values.
-  EXPECT_GE(now, present_requested_time);
-  EXPECT_GE(flutter_frame_build_time, TimeDeltaFromInt(0));
-  EXPECT_GT(vsync_interval, TimeDeltaFromInt(0));
-
-  EXPECT_GT(flutter_frame_build_time, vsync_interval);
-
-  fml::TimePoint calculated_latch_point =
-      GfxSessionConnection::CalculateNextLatchPoint(
-          present_requested_time, now, last_latch_point_targeted,
-          flutter_frame_build_time, vsync_interval, future_presentation_infos);
-
-  EXPECT_GE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(now + (vsync_interval * 2)));
-  EXPECT_LE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(now + (vsync_interval * 3)));
-
-  EXPECT_GE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(present_requested_time + flutter_frame_build_time));
-  EXPECT_GE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(last_latch_point_targeted));
-}
-
-TEST(CalculateNextLatchPointTest, DelayedPresentRequestWithLongFrameBuildTime) {
-  fml::TimePoint present_requested_time = TimePointFromInt(0);
-  fml::TimePoint now = TimePointFromInt(1500);
-  fml::TimePoint last_latch_point_targeted = TimePointFromInt(0);
-  fml::TimeDelta flutter_frame_build_time = TimeDeltaFromInt(2000);
-  fml::TimeDelta vsync_interval = TimeDeltaFromInt(1000);
-  std::deque<std::pair<fml::TimePoint, fml::TimePoint>>
-      future_presentation_infos = {};
-
-  // Assertions about given values.
-  EXPECT_GE(now, present_requested_time);
-  EXPECT_GE(flutter_frame_build_time, TimeDeltaFromInt(0));
-  EXPECT_GT(vsync_interval, TimeDeltaFromInt(0));
-
-  EXPECT_GT(flutter_frame_build_time, vsync_interval);
-  EXPECT_GT(now, present_requested_time + vsync_interval);
-
-  fml::TimePoint calculated_latch_point =
-      GfxSessionConnection::CalculateNextLatchPoint(
-          present_requested_time, now, last_latch_point_targeted,
-          flutter_frame_build_time, vsync_interval, future_presentation_infos);
-
-  EXPECT_GE(TimePointToInt(calculated_latch_point), TimePointToInt(now));
-  EXPECT_LE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(now + vsync_interval));
-
-  EXPECT_GE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(present_requested_time + flutter_frame_build_time));
-  EXPECT_GE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(last_latch_point_targeted));
-}
-
-TEST(CalculateNextLatchPointTest, LastLastPointTargetedLate) {
-  fml::TimePoint present_requested_time = TimePointFromInt(2000);
-  fml::TimePoint now = TimePointFromInt(2000);
-  fml::TimePoint last_latch_point_targeted = TimePointFromInt(2600);
-  fml::TimeDelta flutter_frame_build_time = TimeDeltaFromInt(1000);
-  fml::TimeDelta vsync_interval = TimeDeltaFromInt(1000);
-  std::deque<std::pair<fml::TimePoint, fml::TimePoint>>
-      future_presentation_infos = {};
-
-  // Assertions about given values.
-  EXPECT_GE(now, present_requested_time);
-  EXPECT_GE(flutter_frame_build_time, TimeDeltaFromInt(0));
-  EXPECT_GT(vsync_interval, TimeDeltaFromInt(0));
-
-  EXPECT_GT(last_latch_point_targeted, present_requested_time);
-
-  fml::TimePoint calculated_latch_point =
-      GfxSessionConnection::CalculateNextLatchPoint(
-          present_requested_time, now, last_latch_point_targeted,
-          flutter_frame_build_time, vsync_interval, future_presentation_infos);
-
-  EXPECT_GE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(now + vsync_interval));
-  EXPECT_LE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(now + (vsync_interval * 2)));
-
-  EXPECT_GE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(present_requested_time + flutter_frame_build_time));
-  EXPECT_GE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(last_latch_point_targeted));
-}
-
-// This set of tests provides (latch_point, vsync_time) pairs in
-// |future_presentation_infos|. This tests steady state behavior where we're
-// presenting frames virtually every vsync interval.
-
-TEST(CalculateNextLatchPointTest, SteadyState_OnTimeFrames) {
-  fml::TimePoint present_requested_time = TimePointFromInt(5000);
-  fml::TimePoint now = TimePointFromInt(5000);
-  fml::TimePoint last_latch_point_targeted = TimePointFromInt(4500);
-  fml::TimeDelta flutter_frame_build_time = TimeDeltaFromInt(1000);
-  fml::TimeDelta vsync_interval = TimeDeltaFromInt(1000);
-  std::deque<std::pair<fml::TimePoint, fml::TimePoint>>
-      future_presentation_infos = {
-          {TimePointFromInt(3500), TimePointFromInt(4000)},
-          {TimePointFromInt(4500), TimePointFromInt(5000)},
-          {TimePointFromInt(5500), TimePointFromInt(6000)},
-          {TimePointFromInt(6500), TimePointFromInt(7000)},
-          {TimePointFromInt(7500), TimePointFromInt(8000)},
-      };
-
-  // Assertions about given values.
-  EXPECT_GE(now, present_requested_time);
-  EXPECT_GE(flutter_frame_build_time, TimeDeltaFromInt(0));
-  EXPECT_GT(vsync_interval, TimeDeltaFromInt(0));
-
-  fml::TimePoint calculated_latch_point =
-      GfxSessionConnection::CalculateNextLatchPoint(
-          present_requested_time, now, last_latch_point_targeted,
-          flutter_frame_build_time, vsync_interval, future_presentation_infos);
-
-  EXPECT_GE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(now + vsync_interval));
-  EXPECT_LE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(now + (vsync_interval * 2)));
-  EXPECT_EQ(TimePointToInt(calculated_latch_point), 6500);
-
-  EXPECT_GE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(present_requested_time + flutter_frame_build_time));
-  EXPECT_GE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(last_latch_point_targeted));
-}
-
-TEST(CalculateNextLatchPointTest, SteadyState_LongFrameBuildTimes) {
-  fml::TimePoint present_requested_time = TimePointFromInt(5000);
-  fml::TimePoint now = TimePointFromInt(5000);
-  fml::TimePoint last_latch_point_targeted = TimePointFromInt(4500);
-  fml::TimeDelta flutter_frame_build_time = TimeDeltaFromInt(2000);
-  fml::TimeDelta vsync_interval = TimeDeltaFromInt(1000);
-  std::deque<std::pair<fml::TimePoint, fml::TimePoint>>
-      future_presentation_infos = {
-          {TimePointFromInt(3500), TimePointFromInt(4000)},
-          {TimePointFromInt(4500), TimePointFromInt(5000)},
-          {TimePointFromInt(5500), TimePointFromInt(6000)},
-          {TimePointFromInt(6500), TimePointFromInt(7000)},
-          {TimePointFromInt(7500), TimePointFromInt(8000)},
-      };
-
-  // Assertions about given values.
-  EXPECT_GE(now, present_requested_time);
-  EXPECT_GE(flutter_frame_build_time, TimeDeltaFromInt(0));
-  EXPECT_GT(vsync_interval, TimeDeltaFromInt(0));
-
-  EXPECT_GT(flutter_frame_build_time, vsync_interval);
-
-  fml::TimePoint calculated_latch_point =
-      GfxSessionConnection::CalculateNextLatchPoint(
-          present_requested_time, now, last_latch_point_targeted,
-          flutter_frame_build_time, vsync_interval, future_presentation_infos);
-
-  EXPECT_GE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(now + (vsync_interval * 2)));
-  EXPECT_LE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(now + (vsync_interval * 3)));
-  EXPECT_EQ(TimePointToInt(calculated_latch_point), 7500);
-
-  EXPECT_GE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(present_requested_time + flutter_frame_build_time));
-  EXPECT_GE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(last_latch_point_targeted));
-}
-
-TEST(CalculateNextLatchPointTest, SteadyState_LateLastLatchPointTargeted) {
-  fml::TimePoint present_requested_time = TimePointFromInt(5000);
-  fml::TimePoint now = TimePointFromInt(5000);
-  fml::TimePoint last_latch_point_targeted = TimePointFromInt(6500);
-  fml::TimeDelta flutter_frame_build_time = TimeDeltaFromInt(1000);
-  fml::TimeDelta vsync_interval = TimeDeltaFromInt(1000);
-  std::deque<std::pair<fml::TimePoint, fml::TimePoint>>
-      future_presentation_infos = {
-          {TimePointFromInt(4500), TimePointFromInt(5000)},
-          {TimePointFromInt(5500), TimePointFromInt(6000)},
-          {TimePointFromInt(6500), TimePointFromInt(7000)},
-          {TimePointFromInt(7500), TimePointFromInt(8000)},
-          {TimePointFromInt(8500), TimePointFromInt(9000)},
-      };
-
-  // Assertions about given values.
-  EXPECT_GE(now, present_requested_time);
-  EXPECT_GE(flutter_frame_build_time, TimeDeltaFromInt(0));
-  EXPECT_GT(vsync_interval, TimeDeltaFromInt(0));
-
-  EXPECT_GT(last_latch_point_targeted, now + vsync_interval);
-
-  fml::TimePoint calculated_latch_point =
-      GfxSessionConnection::CalculateNextLatchPoint(
-          present_requested_time, now, last_latch_point_targeted,
-          flutter_frame_build_time, vsync_interval, future_presentation_infos);
-
-  EXPECT_GE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(now + vsync_interval));
-  EXPECT_LE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(now + (vsync_interval * 2)));
-  EXPECT_EQ(TimePointToInt(calculated_latch_point), 6500);
-
-  EXPECT_GE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(present_requested_time + flutter_frame_build_time));
-  EXPECT_GE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(last_latch_point_targeted));
-}
-
-TEST(CalculateNextLatchPointTest,
-     SteadyState_DelayedPresentRequestWithLongFrameBuildTime) {
-  fml::TimePoint present_requested_time = TimePointFromInt(4000);
-  fml::TimePoint now = TimePointFromInt(5500);
-  fml::TimePoint last_latch_point_targeted = TimePointFromInt(3500);
-  fml::TimeDelta flutter_frame_build_time = TimeDeltaFromInt(2000);
-  fml::TimeDelta vsync_interval = TimeDeltaFromInt(1000);
-  std::deque<std::pair<fml::TimePoint, fml::TimePoint>>
-      future_presentation_infos = {
-          {TimePointFromInt(4500), TimePointFromInt(5000)},
-          {TimePointFromInt(5500), TimePointFromInt(6000)},
-          {TimePointFromInt(6500), TimePointFromInt(7000)},
-      };
-
-  // Assertions about given values.
-  EXPECT_GE(now, present_requested_time);
-  EXPECT_GE(flutter_frame_build_time, TimeDeltaFromInt(0));
-  EXPECT_GT(vsync_interval, TimeDeltaFromInt(0));
-
-  EXPECT_GT(flutter_frame_build_time, vsync_interval);
-  EXPECT_GT(now, present_requested_time + vsync_interval);
-
-  fml::TimePoint calculated_latch_point =
-      GfxSessionConnection::CalculateNextLatchPoint(
-          present_requested_time, now, last_latch_point_targeted,
-          flutter_frame_build_time, vsync_interval, future_presentation_infos);
-
-  EXPECT_GE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(now + vsync_interval));
-  EXPECT_LE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(now + (vsync_interval * 2)));
-  EXPECT_EQ(TimePointToInt(calculated_latch_point), 6500);
-
-  EXPECT_GE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(present_requested_time + flutter_frame_build_time));
-  EXPECT_GE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(last_latch_point_targeted));
-}
-
-TEST(CalculateNextLatchPointTest, SteadyState_FuzzyLatchPointsBeforeTarget) {
-  fml::TimePoint present_requested_time = TimePointFromInt(4000);
-  fml::TimePoint now = TimePointFromInt(4000);
-  fml::TimePoint last_latch_point_targeted = TimePointFromInt(5490);
-  fml::TimeDelta flutter_frame_build_time = TimeDeltaFromInt(1000);
-  fml::TimeDelta vsync_interval = TimeDeltaFromInt(1000);
-  std::deque<std::pair<fml::TimePoint, fml::TimePoint>>
-      future_presentation_infos = {
-          {TimePointFromInt(4510), TimePointFromInt(5000)},
-          {TimePointFromInt(5557), TimePointFromInt(6000)},
-          {TimePointFromInt(6482), TimePointFromInt(7000)},
-          {TimePointFromInt(7356), TimePointFromInt(8000)},
-      };
-
-  // Assertions about given values.
-  EXPECT_GE(now, present_requested_time);
-  EXPECT_GE(flutter_frame_build_time, TimeDeltaFromInt(0));
-  EXPECT_GT(vsync_interval, TimeDeltaFromInt(0));
-
-  fml::TimePoint calculated_latch_point =
-      GfxSessionConnection::CalculateNextLatchPoint(
-          present_requested_time, now, last_latch_point_targeted,
-          flutter_frame_build_time, vsync_interval, future_presentation_infos);
-
-  EXPECT_GE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(now + vsync_interval));
-  EXPECT_LE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(now + (vsync_interval * 2)));
-  EXPECT_EQ(TimePointToInt(calculated_latch_point), 5557);
-
-  EXPECT_GE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(present_requested_time + flutter_frame_build_time));
-  EXPECT_GE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(last_latch_point_targeted));
-}
-
-TEST(CalculateNextLatchPointTest, SteadyState_FuzzyLatchPointsAfterTarget) {
-  fml::TimePoint present_requested_time = TimePointFromInt(4000);
-  fml::TimePoint now = TimePointFromInt(4000);
-  fml::TimePoint last_latch_point_targeted = TimePointFromInt(5557);
-  fml::TimeDelta flutter_frame_build_time = TimeDeltaFromInt(1000);
-  fml::TimeDelta vsync_interval = TimeDeltaFromInt(1000);
-  std::deque<std::pair<fml::TimePoint, fml::TimePoint>>
-      future_presentation_infos = {
-          {TimePointFromInt(4510), TimePointFromInt(5000)},
-          {TimePointFromInt(5490), TimePointFromInt(6000)},
-          {TimePointFromInt(6482), TimePointFromInt(7000)},
-          {TimePointFromInt(7356), TimePointFromInt(8000)},
-      };
-
-  // Assertions about given values.
-  EXPECT_GE(now, present_requested_time);
-  EXPECT_GE(flutter_frame_build_time, TimeDeltaFromInt(0));
-  EXPECT_GT(vsync_interval, TimeDeltaFromInt(0));
-
-  fml::TimePoint calculated_latch_point =
-      GfxSessionConnection::CalculateNextLatchPoint(
-          present_requested_time, now, last_latch_point_targeted,
-          flutter_frame_build_time, vsync_interval, future_presentation_infos);
-
-  EXPECT_GE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(now + (vsync_interval * 2)));
-  EXPECT_LE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(now + (vsync_interval * 3)));
-  EXPECT_EQ(TimePointToInt(calculated_latch_point), 6482);
-
-  EXPECT_GE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(present_requested_time + flutter_frame_build_time));
-  EXPECT_GE(TimePointToInt(calculated_latch_point),
-            TimePointToInt(last_latch_point_targeted));
-}
-
-TEST(SnapToNextPhaseTest, SnapOverlapsWithNow) {
-  const auto now = fml::TimePoint::Now();
-  const auto last_presentation_time = now - fml::TimeDelta::FromNanoseconds(10);
-  const auto delta = fml::TimeDelta::FromNanoseconds(10);
-  const auto next_vsync = flutter_runner::GfxSessionConnection::SnapToNextPhase(
-      now, last_presentation_time, delta);
-
-  EXPECT_EQ(now + delta, next_vsync);
-}
-
-TEST(SnapToNextPhaseTest, SnapAfterNow) {
-  const auto now = fml::TimePoint::Now();
-  const auto last_presentation_time = now - fml::TimeDelta::FromNanoseconds(9);
-  const auto delta = fml::TimeDelta::FromNanoseconds(10);
-  const auto next_vsync = flutter_runner::GfxSessionConnection::SnapToNextPhase(
-      now, last_presentation_time, delta);
-
-  // math here: 10 - 9 = 1
-  EXPECT_EQ(now + fml::TimeDelta::FromNanoseconds(1), next_vsync);
-}
-
-TEST(SnapToNextPhaseTest, SnapAfterNowMultiJump) {
-  const auto now = fml::TimePoint::Now();
-  const auto last_presentation_time = now - fml::TimeDelta::FromNanoseconds(34);
-  const auto delta = fml::TimeDelta::FromNanoseconds(10);
-  const auto next_vsync = flutter_runner::GfxSessionConnection::SnapToNextPhase(
-      now, last_presentation_time, delta);
-
-  // zeroes: -34, -24, -14, -4, 6, ...
-  EXPECT_EQ(now + fml::TimeDelta::FromNanoseconds(6), next_vsync);
-}
-
-TEST(SnapToNextPhaseTest, SnapAfterNowMultiJumpAccountForCeils) {
-  const auto now = fml::TimePoint::Now();
-  const auto last_presentation_time = now - fml::TimeDelta::FromNanoseconds(20);
-  const auto delta = fml::TimeDelta::FromNanoseconds(16);
-  const auto next_vsync = flutter_runner::GfxSessionConnection::SnapToNextPhase(
-      now, last_presentation_time, delta);
-
-  // zeroes: -20, -4, 12, 28, ...
-  EXPECT_EQ(now + fml::TimeDelta::FromNanoseconds(12), next_vsync);
-}
-
-TEST(GetTargetTimesTest, ScheduleForNextVsync) {
-  const fml::TimeDelta vsync_offset = TimeDeltaFromInt(0);
-  const fml::TimeDelta vsync_interval = TimeDeltaFromInt(10);
-  const fml::TimePoint last_targeted_vsync = TimePointFromInt(10);
-  const fml::TimePoint now = TimePointFromInt(9);
-  const fml::TimePoint next_vsync = TimePointFromInt(10);
-
-  const auto target_times =
-      flutter_runner::GfxSessionConnection::GetTargetTimes(
-          vsync_offset, vsync_interval, last_targeted_vsync, now, next_vsync);
-
-  EXPECT_EQ(TimePointToInt(target_times.frame_start), 10);
-  EXPECT_EQ(TimePointToInt(target_times.frame_target), 20);
-}
-
-TEST(GetTargetTimesTest, ScheduleForCurrentVsync_DueToOffset) {
-  const fml::TimeDelta vsync_offset = TimeDeltaFromInt(3);
-  const fml::TimeDelta vsync_interval = TimeDeltaFromInt(10);
-  const fml::TimePoint last_targeted_vsync = TimePointFromInt(0);
-  const fml::TimePoint now = TimePointFromInt(6);
-  const fml::TimePoint next_vsync = TimePointFromInt(10);
-
-  const auto target_times =
-      flutter_runner::GfxSessionConnection::GetTargetTimes(
-          vsync_offset, vsync_interval, last_targeted_vsync, now, next_vsync);
-
-  EXPECT_EQ(TimePointToInt(target_times.frame_start), 7);
-  EXPECT_EQ(TimePointToInt(target_times.frame_target), 10);
-}
-
-TEST(GetTargetTimesTest, ScheduleForFollowingVsync_BecauseOfNow) {
-  const fml::TimeDelta vsync_offset = TimeDeltaFromInt(0);
-  const fml::TimeDelta vsync_interval = TimeDeltaFromInt(10);
-  const fml::TimePoint last_targeted_vsync = TimePointFromInt(10);
-  const fml::TimePoint now = TimePointFromInt(15);
-  const fml::TimePoint next_vsync = TimePointFromInt(10);
-
-  const auto target_times =
-      flutter_runner::GfxSessionConnection::GetTargetTimes(
-          vsync_offset, vsync_interval, last_targeted_vsync, now, next_vsync);
-
-  EXPECT_EQ(TimePointToInt(target_times.frame_start), 20);
-  EXPECT_EQ(TimePointToInt(target_times.frame_target), 30);
-}
-
-TEST(GetTargetTimesTest, ScheduleForFollowingVsync_BecauseOfTargettedTime) {
-  const fml::TimeDelta vsync_offset = TimeDeltaFromInt(0);
-  const fml::TimeDelta vsync_interval = TimeDeltaFromInt(10);
-  const fml::TimePoint last_targeted_vsync = TimePointFromInt(20);
-  const fml::TimePoint now = TimePointFromInt(9);
-  const fml::TimePoint next_vsync = TimePointFromInt(10);
-
-  const auto target_times =
-      flutter_runner::GfxSessionConnection::GetTargetTimes(
-          vsync_offset, vsync_interval, last_targeted_vsync, now, next_vsync);
-
-  EXPECT_EQ(TimePointToInt(target_times.frame_start), 20);
-  EXPECT_EQ(TimePointToInt(target_times.frame_target), 30);
-}
-
-TEST(GetTargetTimesTest, ScheduleForDistantVsync_BecauseOfTargettedTime) {
-  const fml::TimeDelta vsync_offset = TimeDeltaFromInt(0);
-  const fml::TimeDelta vsync_interval = TimeDeltaFromInt(10);
-  const fml::TimePoint last_targeted_vsync = TimePointFromInt(60);
-  const fml::TimePoint now = TimePointFromInt(9);
-  const fml::TimePoint next_vsync = TimePointFromInt(10);
-
-  const auto target_times =
-      flutter_runner::GfxSessionConnection::GetTargetTimes(
-          vsync_offset, vsync_interval, last_targeted_vsync, now, next_vsync);
-
-  EXPECT_EQ(TimePointToInt(target_times.frame_start), 60);
-  EXPECT_EQ(TimePointToInt(target_times.frame_target), 70);
-}
-
-TEST(GetTargetTimesTest, ScheduleForFollowingVsync_WithSlightVsyncDrift) {
-  const fml::TimeDelta vsync_offset = TimeDeltaFromInt(0);
-  const fml::TimeDelta vsync_interval = TimeDeltaFromInt(10);
-
-  // Even though it appears as if the next vsync is at time 40, we should still
-  // present at time 50.
-  const fml::TimePoint last_targeted_vsync = TimePointFromInt(37);
-  const fml::TimePoint now = TimePointFromInt(9);
-  const fml::TimePoint next_vsync = TimePointFromInt(10);
-
-  const auto target_times =
-      flutter_runner::GfxSessionConnection::GetTargetTimes(
-          vsync_offset, vsync_interval, last_targeted_vsync, now, next_vsync);
-
-  EXPECT_EQ(TimePointToInt(target_times.frame_start), 40);
-  EXPECT_EQ(TimePointToInt(target_times.frame_target), 50);
-}
-
-TEST(GetTargetTimesTest, ScheduleForAnOffsetFromVsync) {
-  const fml::TimeDelta vsync_offset = TimeDeltaFromInt(4);
-  const fml::TimeDelta vsync_interval = TimeDeltaFromInt(10);
-  const fml::TimePoint last_targeted_vsync = TimePointFromInt(10);
-  const fml::TimePoint now = TimePointFromInt(9);
-  const fml::TimePoint next_vsync = TimePointFromInt(10);
-
-  const auto target_times =
-      flutter_runner::GfxSessionConnection::GetTargetTimes(
-          vsync_offset, vsync_interval, last_targeted_vsync, now, next_vsync);
-
-  EXPECT_EQ(TimePointToInt(target_times.frame_start), 16);
-  EXPECT_EQ(TimePointToInt(target_times.frame_target), 20);
-}
-
-TEST(GetTargetTimesTest, ScheduleMultipleTimes) {
-  const fml::TimeDelta vsync_offset = TimeDeltaFromInt(0);
-  const fml::TimeDelta vsync_interval = TimeDeltaFromInt(10);
-
-  fml::TimePoint last_targeted_vsync = TimePointFromInt(0);
-  fml::TimePoint now = TimePointFromInt(5);
-  fml::TimePoint next_vsync = TimePointFromInt(10);
-
-  for (int i = 0; i < 100; ++i) {
-    const auto target_times =
-        flutter_runner::GfxSessionConnection::GetTargetTimes(
-            vsync_offset, vsync_interval, last_targeted_vsync, now, next_vsync);
-
-    EXPECT_EQ(TimePointToInt(target_times.frame_start), 10 * (i + 1));
-    EXPECT_EQ(TimePointToInt(target_times.frame_target), 10 * (i + 2));
-
-    // Simulate the passage of time.
-    now = now + vsync_interval;
-    next_vsync = next_vsync + vsync_interval;
-    last_targeted_vsync = target_times.frame_target;
-  }
-}
-
-TEST(GetTargetTimesTest, ScheduleMultipleTimes_WithDelayedWakeups) {
-  // It is often the case that Flutter does not wake up when it intends to due
-  // to CPU contention. This test has GfxSessionConnection wake up to
-  // schedule 0-4ns after when |now| should be - and we verify that the results
-  // should be the same as if there were no delay.
-  const fml::TimeDelta vsync_offset = TimeDeltaFromInt(0);
-  const fml::TimeDelta vsync_interval = TimeDeltaFromInt(10);
-
-  fml::TimePoint last_targeted_vsync = TimePointFromInt(0);
-  fml::TimePoint now = TimePointFromInt(5);
-  fml::TimePoint next_vsync = TimePointFromInt(10);
-
-  for (int i = 0; i < 100; ++i) {
-    const auto target_times =
-        flutter_runner::GfxSessionConnection::GetTargetTimes(
-            vsync_offset, vsync_interval, last_targeted_vsync, now, next_vsync);
-
-    const auto target_times_delay =
-        flutter_runner::GfxSessionConnection::GetTargetTimes(
-            vsync_offset, vsync_interval, last_targeted_vsync,
-            now + TimeDeltaFromInt(i % 5), next_vsync);
-
-    EXPECT_EQ(TimePointToInt(target_times.frame_start),
-              TimePointToInt(target_times_delay.frame_start));
-    EXPECT_EQ(TimePointToInt(target_times.frame_target),
-              TimePointToInt(target_times_delay.frame_target));
-
-    // Simulate the passage of time.
-    now = now + vsync_interval;
-    next_vsync = next_vsync + vsync_interval;
-    last_targeted_vsync = target_times.frame_target;
-  }
-}
-
-TEST(UpdatePresentationInfoTest, SingleUpdate) {
-  std::vector<fuchsia::scenic::scheduling::PresentationInfo>
-      future_presentations = {};
-
-  // Update the |vsync_info|.
-  future_presentations.push_back(
-      CreatePresentationInfo(/*latch_point=*/5, /*presentation_time=*/10));
-
-  fuchsia::scenic::scheduling::FuturePresentationTimes future_info;
-  future_info.future_presentations = std::move(future_presentations);
-  future_info.remaining_presents_in_flight_allowed = 1;
-
-  fuchsia::scenic::scheduling::PresentationInfo presentation_info;
-  presentation_info.set_presentation_time(0);
-
-  fuchsia::scenic::scheduling::PresentationInfo new_presentation_info =
-      flutter_runner::GfxSessionConnection::UpdatePresentationInfo(
-          std::move(future_info), presentation_info);
-
-  EXPECT_EQ(new_presentation_info.presentation_time(), 10);
-}
-
-TEST(UpdatePresentationInfoTest, MultipleUpdates) {
-  std::vector<fuchsia::scenic::scheduling::PresentationInfo>
-      future_presentations = {};
-
-  // Update the |vsync_info|.
-  future_presentations.push_back(
-      CreatePresentationInfo(/*latch_point=*/15, /*presentation_time=*/20));
-  future_presentations.push_back(
-      CreatePresentationInfo(/*latch_point=*/25, /*presentation_time=*/30));
-  fuchsia::scenic::scheduling::FuturePresentationTimes future_info;
-  future_info.future_presentations = std::move(future_presentations);
-  future_info.remaining_presents_in_flight_allowed = 1;
-
-  fuchsia::scenic::scheduling::PresentationInfo presentation_info;
-  presentation_info.set_presentation_time(0);
-
-  fuchsia::scenic::scheduling::PresentationInfo new_presentation_info =
-      flutter_runner::GfxSessionConnection::UpdatePresentationInfo(
-          std::move(future_info), presentation_info);
-
-  EXPECT_EQ(new_presentation_info.presentation_time(), 20);
-
-  // Clear and re-try with more future times!
-  future_presentations.clear();
-  future_presentations.push_back(
-      CreatePresentationInfo(/*latch_point=*/15, /*presentation_time=*/20));
-  future_presentations.push_back(
-      CreatePresentationInfo(/*latch_point=*/25, /*presentation_time=*/30));
-  future_presentations.push_back(
-      CreatePresentationInfo(/*latch_point=*/35, /*presentation_time=*/40));
-  future_presentations.push_back(
-      CreatePresentationInfo(/*latch_point=*/45, /*presentation_time=*/50));
-  future_info.future_presentations = std::move(future_presentations);
-  future_info.remaining_presents_in_flight_allowed = 1;
-
-  new_presentation_info =
-      flutter_runner::GfxSessionConnection::UpdatePresentationInfo(
-          std::move(future_info), new_presentation_info);
-
-  EXPECT_EQ(new_presentation_info.presentation_time(), 30);
-}
-
-}  // namespace flutter_runner::testing
diff --git a/shell/platform/fuchsia/flutter/tests/integration/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/BUILD.gn
index 30ba3b7690f4287e2dca8580c00bcf399fdaea74..2117b86aa4e62d8db742e073013e02cc9fa536f6 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/BUILD.gn
+++ b/shell/platform/fuchsia/flutter/tests/integration/BUILD.gn
@@ -4,7 +4,7 @@
 
 assert(is_fuchsia)
 
-import("//build/fuchsia/sdk.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
 
 group("integration") {
   testonly = true
diff --git a/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn
index 392a271be85ec61b0017aeadd9804747c942267c..4af5ae5df9a0fd4cb931f7f3e01ac1afbb3cfc06 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn
+++ b/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn
@@ -4,8 +4,8 @@
 
 assert(is_fuchsia)
 
-import("//build/fuchsia/sdk.gni")
 import("//flutter/tools/fuchsia/fuchsia_archive.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
 
 group("tests") {
   testonly = true
@@ -19,30 +19,30 @@ executable("flutter-embedder-test-bin") {
 
   sources = [ "flutter-embedder-test.cc" ]
 
-  # This is needed for //third_party/googletest for linking zircon symbols.
-  libs = [ "$fuchsia_sdk_path/arch/$target_cpu/sysroot/lib/libzircon.so" ]
+  # This is needed for //flutter/third_party/googletest for linking zircon
+  # symbols.
+  libs = [ "${fuchsia_arch_root}/sysroot/lib/libzircon.so" ]
 
   deps = [
-    "$fuchsia_sdk_root/fidl:fuchsia.logger",
-    "$fuchsia_sdk_root/fidl:fuchsia.tracing.provider",
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.app",
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.composition",
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.observation.geometry",
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.scenic",
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.test.input",
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.test.scene",
-    "$fuchsia_sdk_root/pkg:async",
-    "$fuchsia_sdk_root/pkg:async-loop-testing",
-    "$fuchsia_sdk_root/pkg:fidl_cpp",
-    "$fuchsia_sdk_root/pkg:scenic_cpp",
-    "$fuchsia_sdk_root/pkg:sys_component_cpp_testing",
-    "$fuchsia_sdk_root/pkg:zx",
+    "${fuchsia_sdk}/fidl/fuchsia.inspect",
+    "${fuchsia_sdk}/fidl/fuchsia.logger",
+    "${fuchsia_sdk}/fidl/fuchsia.tracing.provider",
+    "${fuchsia_sdk}/fidl/fuchsia.ui.app",
+    "${fuchsia_sdk}/fidl/fuchsia.ui.composition",
+    "${fuchsia_sdk}/fidl/fuchsia.ui.display.singleton",
+    "${fuchsia_sdk}/fidl/fuchsia.ui.observation.geometry",
+    "${fuchsia_sdk}/fidl/fuchsia.ui.test.input",
+    "${fuchsia_sdk}/fidl/fuchsia.ui.test.scene",
+    "${fuchsia_sdk}/pkg/async",
+    "${fuchsia_sdk}/pkg/async-loop-testing",
+    "${fuchsia_sdk}/pkg/fidl_cpp",
+    "${fuchsia_sdk}/pkg/sys_component_cpp_testing",
+    "${fuchsia_sdk}/pkg/zx",
     "//flutter/fml",
     "//flutter/shell/platform/fuchsia/flutter/tests/integration/utils:check_view",
-    "//flutter/shell/platform/fuchsia/flutter/tests/integration/utils:color",
     "//flutter/shell/platform/fuchsia/flutter/tests/integration/utils:screenshot",
-    "//third_party/googletest:gtest",
-    "//third_party/googletest:gtest_main",
+    "//flutter/third_party/googletest:gtest",
+    "//flutter/third_party/googletest:gtest_main",
   ]
 }
 
diff --git a/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/BUILD.gn
index dedf77c3eb950cfbc413a1953cc16917d201a2b4..08cb1bd9588a0666b5ad9b1104717474e9db6d8a 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/BUILD.gn
+++ b/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/BUILD.gn
@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/fuchsia/sdk.gni")
 import("//flutter/tools/fuchsia/dart/dart_library.gni")
 import("//flutter/tools/fuchsia/flutter/flutter_component.gni")
-import("//flutter/tools/fuchsia/gn-sdk/package.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/package.gni")
 
 dart_library("lib") {
   package_name = "child-view"
diff --git a/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/pubspec.yaml b/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/pubspec.yaml
index a50988f1a4baf205e55b0110e66f7bcbf3296f6a..89f565db2969b4df66aa1f5d81e501e05b26f5d2 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/pubspec.yaml
+++ b/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/pubspec.yaml
@@ -5,4 +5,4 @@
 name: child_view2
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=3.2.0-0 <4.0.0'
diff --git a/shell/platform/fuchsia/flutter/tests/integration/embedder/flutter-embedder-test.cc b/shell/platform/fuchsia/flutter/tests/integration/embedder/flutter-embedder-test.cc
index 20200e0725c588369fc5080c48095517d6c62ecc..17cfb87e55aec49288da283388e55c20d11e323c 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/embedder/flutter-embedder-test.cc
+++ b/shell/platform/fuchsia/flutter/tests/integration/embedder/flutter-embedder-test.cc
@@ -2,12 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <fuchsia/inspect/cpp/fidl.h>
 #include <fuchsia/logger/cpp/fidl.h>
 #include <fuchsia/tracing/provider/cpp/fidl.h>
 #include <fuchsia/ui/app/cpp/fidl.h>
 #include <fuchsia/ui/composition/cpp/fidl.h>
+#include <fuchsia/ui/display/singleton/cpp/fidl.h>
 #include <fuchsia/ui/observation/geometry/cpp/fidl.h>
-#include <fuchsia/ui/scenic/cpp/fidl.h>
 #include <fuchsia/ui/test/input/cpp/fidl.h>
 #include <fuchsia/ui/test/scene/cpp/fidl.h>
 #include <lib/async-loop/testing/cpp/real_loop.h>
@@ -15,7 +16,6 @@
 #include <lib/fidl/cpp/binding_set.h>
 #include <lib/sys/component/cpp/testing/realm_builder.h>
 #include <lib/sys/component/cpp/testing/realm_builder_types.h>
-#include <lib/ui/scenic/cpp/view_ref_pair.h>
 #include <lib/zx/clock.h>
 #include <zircon/status.h>
 #include <zircon/time.h>
@@ -27,7 +27,6 @@
 #include "gtest/gtest.h"
 
 #include "flutter/shell/platform/fuchsia/flutter/tests/integration/utils/check_view.h"
-#include "flutter/shell/platform/fuchsia/flutter/tests/integration/utils/color.h"
 #include "flutter/shell/platform/fuchsia/flutter/tests/integration/utils/screenshot.h"
 
 namespace flutter_embedder_test {
@@ -66,7 +65,8 @@ constexpr char kChildViewUrl[] =
 constexpr char kParentViewUrl[] =
     "fuchsia-pkg://fuchsia.com/parent-view#meta/parent-view.cm";
 static constexpr auto kTestUiStackUrl =
-    "fuchsia-pkg://fuchsia.com/test-ui-stack#meta/test-ui-stack.cm";
+    "fuchsia-pkg://fuchsia.com/flatland-scene-manager-test-ui-stack#meta/"
+    "test-ui-stack.cm";
 
 constexpr auto kFlutterRunnerEnvironment = "flutter_runner_env";
 constexpr auto kFlutterJitRunner = "flutter_jit_runner";
@@ -84,40 +84,26 @@ constexpr auto kParentViewRef = ChildRef{kParentView};
 constexpr auto kTestUiStack = "ui";
 constexpr auto kTestUiStackRef = ChildRef{kTestUiStack};
 
-constexpr fuchsia_test_utils::Color kParentBackgroundColor = {0x00, 0x00, 0xFF,
-                                                              0xFF};  // Blue
-constexpr fuchsia_test_utils::Color kParentTappedColor = {0x00, 0x00, 0x00,
-                                                          0xFF};  // Black
-constexpr fuchsia_test_utils::Color kChildBackgroundColor = {0xFF, 0x00, 0xFF,
-                                                             0xFF};  // Pink
-constexpr fuchsia_test_utils::Color kChildTappedColor = {0xFF, 0xFF, 0x00,
-                                                         0xFF};  // Yellow
-
-// TODO(fxb/64201): Remove forced opacity colors when Flatland is enabled.
-constexpr fuchsia_test_utils::Color kOverlayBackgroundColor1 = {
-    0x00, 0xFF, 0x0E, 0xFF};  // Green, blended with blue (FEMU local)
-constexpr fuchsia_test_utils::Color kOverlayBackgroundColor2 = {
-    0x0E, 0xFF, 0x0E, 0xFF};  // Green, blended with pink (FEMU local)
-constexpr fuchsia_test_utils::Color kOverlayBackgroundColor3 = {
-    0x00, 0xFF, 0x0D, 0xFF};  // Green, blended with blue (AEMU infra)
-constexpr fuchsia_test_utils::Color kOverlayBackgroundColor4 = {
-    0x0D, 0xFF, 0x0D, 0xFF};  // Green, blended with pink (AEMU infra)
-constexpr fuchsia_test_utils::Color kOverlayBackgroundColor5 = {
-    0x00, 0xFE, 0x0D, 0xFF};  // Green, blended with blue (NUC)
-constexpr fuchsia_test_utils::Color kOverlayBackgroundColor6 = {
-    0x0D, 0xFF, 0x00, 0xFF};  // Green, blended with pink (NUC)
-
-static size_t OverlayPixelCount(
-    std::map<fuchsia_test_utils::Color, size_t>& histogram) {
-  return histogram[kOverlayBackgroundColor1] +
-         histogram[kOverlayBackgroundColor2] +
-         histogram[kOverlayBackgroundColor3] +
-         histogram[kOverlayBackgroundColor4] +
-         histogram[kOverlayBackgroundColor5] +
-         histogram[kOverlayBackgroundColor6];
+// Background and foreground color values.
+const fuchsia_test_utils::Pixel kParentBackgroundColor(0xFF,
+                                                       0x00,
+                                                       0x00,
+                                                       0xFF);  // Blue
+const fuchsia_test_utils::Pixel kChildBackgroundColor(0xFF,
+                                                      0x00,
+                                                      0xFF,
+                                                      0xFF);  // Pink
+const fuchsia_test_utils::Pixel kFlatlandOverlayColor(0x00,
+                                                      0xFF,
+                                                      0x00,
+                                                      0xFF);  // Green
+
+static uint32_t OverlayPixelCount(
+    std::map<fuchsia_test_utils::Pixel, uint32_t>& histogram) {
+  return histogram[kFlatlandOverlayColor];
 }
 
-// Timeout for Scenic's |TakeScreenshot| FIDL call.
+// Timeout for |TakeScreenshot| FIDL call.
 constexpr zx::duration kScreenshotTimeout = zx::sec(10);
 // Timeout to fail the test if it goes beyond this duration.
 constexpr zx::duration kTestTimeout = zx::min(1);
@@ -129,7 +115,7 @@ class FlutterEmbedderTest : public ::loop_fixture::RealLoop,
  public:
   FlutterEmbedderTest()
       : realm_builder_(component_testing::RealmBuilder::Create()) {
-    FML_VLOG(-1) << "Setting up base realm";
+    FML_VLOG(1) << "Setting up base realm";
     SetUpRealmBase();
 
     // Post a "just in case" quit task, if the test hangs.
@@ -155,65 +141,24 @@ class FlutterEmbedderTest : public ::loop_fixture::RealLoop,
   fuchsia_test_utils::Screenshot TakeScreenshot();
 
   bool TakeScreenshotUntil(
-      fuchsia_test_utils::Color color,
-      fit::function<void(std::map<fuchsia_test_utils::Color, size_t>)>
+      fuchsia_test_utils::Pixel color,
+      fit::function<void(std::map<fuchsia_test_utils::Pixel, uint32_t>)>
           callback = nullptr,
       zx::duration timeout = kTestTimeout);
 
-  // Simulates a tap at location (x, y).
-  void InjectTap(int32_t x, int32_t y);
-
-  // Injects an input event, and posts a task to retry after
-  // `kTapRetryInterval`.
-  //
-  // We post the retry task because the first input event we send to Flutter may
-  // be lost. The reason the first event may be lost is that there is a race
-  // condition as the scene owner starts up.
-  //
-  // More specifically: in order for our app
-  // to receive the injected input, two things must be true before we inject
-  // touch input:
-  // * The Scenic root view must have been installed, and
-  // * The Input Pipeline must have received a viewport to inject touch into.
-  //
-  // The problem we have is that the `is_rendering` signal that we monitor only
-  // guarantees us the view is ready. If the viewport is not ready in Input
-  // Pipeline at that time, it will drop the touch event.
-  //
-  // TODO(fxbug.dev/96986): Improve synchronization and remove retry logic.
-  void TryInject(int32_t x, int32_t y);
-
  private:
-  fuchsia::ui::scenic::Scenic* scenic() { return scenic_.get(); }
-
   void SetUpRealmBase();
 
-  // Registers a fake touch screen device with an injection coordinate space
-  // spanning [-1000, 1000] on both axes.
-  void RegisterTouchScreen();
-
-  fuchsia::ui::scenic::ScenicPtr scenic_;
-  fuchsia::ui::test::input::RegistryPtr input_registry_;
-  fuchsia::ui::test::input::TouchScreenPtr fake_touchscreen_;
   fuchsia::ui::test::scene::ControllerPtr scene_provider_;
   fuchsia::ui::observation::geometry::ViewTreeWatcherPtr view_tree_watcher_;
+  fuchsia::ui::composition::ScreenshotPtr screenshot_;
 
   // Wrapped in optional since the view is not created until the middle of SetUp
   component_testing::RealmBuilder realm_builder_;
   std::unique_ptr<component_testing::RealmRoot> realm_;
 
-  // The typical latency on devices we've tested is ~60 msec. The retry interval
-  // is chosen to be a) Long enough that it's unlikely that we send a new tap
-  // while a previous tap is still being
-  //    processed. That is, it should be far more likely that a new tap is sent
-  //    because the first tap was lost, than because the system is just running
-  //    slowly.
-  // b) Short enough that we don't slow down tryjobs.
-  //
-  // The first property is important to avoid skewing the latency metrics that
-  // we collect. For an explanation of why a tap might be lost, see the
-  // documentation for TryInject().
-  static constexpr auto kTapRetryInterval = zx::sec(1);
+  uint64_t display_width_ = 0;
+  uint64_t display_height_ = 0;
 };
 
 void FlutterEmbedderTest::SetUpRealmBase() {
@@ -288,6 +233,7 @@ void FlutterEmbedderTest::SetUpRealmBase() {
       Route{.capabilities =
                 {
                     Protocol{fuchsia::logger::LogSink::Name_},
+                    Protocol{fuchsia::inspect::InspectSink::Name_},
                     Protocol{fuchsia::sysmem::Allocator::Name_},
                     Protocol{fuchsia::tracing::provider::Registry::Name_},
                     Protocol{kVulkanLoaderServiceName},
@@ -299,6 +245,7 @@ void FlutterEmbedderTest::SetUpRealmBase() {
   // Route base system services to the test UI stack.
   realm_builder_.AddRoute(Route{
       .capabilities = {Protocol{fuchsia::logger::LogSink::Name_},
+                       Protocol{fuchsia::inspect::InspectSink::Name_},
                        Protocol{fuchsia::sysmem::Allocator::Name_},
                        Protocol{fuchsia::tracing::provider::Registry::Name_},
                        Protocol{kVulkanLoaderServiceName}},
@@ -307,19 +254,20 @@ void FlutterEmbedderTest::SetUpRealmBase() {
 
   // Route UI capabilities from test UI stack to flutter runners.
   realm_builder_.AddRoute(Route{
-      .capabilities = {Protocol{fuchsia::ui::composition::Flatland::Name_},
-                       Protocol{fuchsia::ui::scenic::Scenic::Name_}},
+      .capabilities = {Protocol{fuchsia::ui::composition::Allocator::Name_},
+                       Protocol{fuchsia::ui::composition::Flatland::Name_}},
       .source = kTestUiStackRef,
       .targets = {kFlutterJitRunnerRef, kFlutterJitProductRunnerRef,
                   kFlutterAotRunnerRef, kFlutterAotProductRunnerRef}});
 
   // Route test capabilities from test UI stack to test driver.
   realm_builder_.AddRoute(Route{
-      .capabilities = {Protocol{fuchsia::ui::test::input::Registry::Name_},
+      .capabilities = {Protocol{fuchsia::ui::composition::Screenshot::Name_},
+                       Protocol{fuchsia::ui::test::input::Registry::Name_},
                        Protocol{fuchsia::ui::test::scene::Controller::Name_},
-                       Protocol{fuchsia::ui::scenic::Scenic::Name_}},
+                       Protocol{fuchsia::ui::display::singleton::Info::Name_}},
       .source = kTestUiStackRef,
-      .targets = {ParentRef{}}});
+      .targets = {ParentRef()}});
 
   // Route ViewProvider from child to parent, and parent to test.
   realm_builder_.AddRoute(
@@ -374,16 +322,30 @@ void FlutterEmbedderTest::LaunchParentViewInRealm(
   }
   realm_ = std::make_unique<RealmRoot>(realm_builder_.Build());
 
-  // Register fake touch screen device.
-  RegisterTouchScreen();
+  // Get the display information using the |fuchsia.ui.display.singleton.Info|.
+  std::optional<bool> display_metrics_obtained;
+  fuchsia::ui::display::singleton::InfoPtr display_info =
+      realm_->component().Connect<fuchsia::ui::display::singleton::Info>();
+  display_info->GetMetrics([this, &display_metrics_obtained](auto info) {
+    display_width_ = info.extent_in_px().width;
+    display_height_ = info.extent_in_px().height;
+    display_metrics_obtained = true;
+  });
+  RunLoopUntil([&display_metrics_obtained] {
+    return display_metrics_obtained.has_value();
+  });
+  FML_LOG(INFO) << "Got display_width " << display_width_ << " display_height "
+                << display_height_;
 
   // Instruct Test UI Stack to present parent-view's View.
   std::optional<zx_koid_t> view_ref_koid;
-  scene_provider_ = realm_->Connect<fuchsia::ui::test::scene::Controller>();
+  scene_provider_ =
+      realm_->component().Connect<fuchsia::ui::test::scene::Controller>();
   scene_provider_.set_error_handler(
       [](auto) { FML_LOG(ERROR) << "Error from test scene provider"; });
   fuchsia::ui::test::scene::ControllerAttachClientViewRequest request;
-  request.set_view_provider(realm_->Connect<fuchsia::ui::app::ViewProvider>());
+  request.set_view_provider(
+      realm_->component().Connect<fuchsia::ui::app::ViewProvider>());
   scene_provider_->RegisterViewTreeWatcher(view_tree_watcher_.NewRequest(),
                                            []() {});
   scene_provider_->AttachClientView(
@@ -404,30 +366,34 @@ void FlutterEmbedderTest::LaunchParentViewInRealm(
   });
   FML_LOG(INFO) << "Client view has rendered";
 
-  scenic_ = realm_->Connect<fuchsia::ui::scenic::Scenic>();
+  screenshot_ =
+      realm_->component().Connect<fuchsia::ui::composition::Screenshot>();
   FML_LOG(INFO) << "Launched parent-view";
 }
 
 fuchsia_test_utils::Screenshot FlutterEmbedderTest::TakeScreenshot() {
   FML_LOG(INFO) << "Taking screenshot... ";
-  fuchsia::ui::scenic::ScreenshotData screenshot_out;
-  scenic_->TakeScreenshot(
-      [this, &screenshot_out](fuchsia::ui::scenic::ScreenshotData screenshot,
-                              bool status) {
-        EXPECT_TRUE(status) << "Failed to take screenshot";
-        screenshot_out = std::move(screenshot);
-        QuitLoop();
-      });
+
+  fuchsia::ui::composition::ScreenshotTakeRequest request;
+  request.set_format(fuchsia::ui::composition::ScreenshotFormat::BGRA_RAW);
+
+  std::optional<fuchsia::ui::composition::ScreenshotTakeResponse> response;
+  screenshot_->Take(std::move(request), [this, &response](auto screenshot) {
+    response = std::move(screenshot);
+    QuitLoop();
+  });
+
   EXPECT_FALSE(RunLoopWithTimeout(kScreenshotTimeout))
       << "Timed out waiting for screenshot.";
   FML_LOG(INFO) << "Screenshot captured.";
 
-  return fuchsia_test_utils::Screenshot(screenshot_out);
+  return fuchsia_test_utils::Screenshot(
+      response->vmo(), display_width_, display_height_, /*display_rotation*/ 0);
 }
 
 bool FlutterEmbedderTest::TakeScreenshotUntil(
-    fuchsia_test_utils::Color color,
-    fit::function<void(std::map<fuchsia_test_utils::Color, size_t>)> callback,
+    fuchsia_test_utils::Pixel color,
+    fit::function<void(std::map<fuchsia_test_utils::Pixel, uint32_t>)> callback,
     zx::duration timeout) {
   return RunLoopWithTimeoutOrUntil(
       [this, &callback, &color] {
@@ -443,43 +409,13 @@ bool FlutterEmbedderTest::TakeScreenshotUntil(
       timeout);
 }
 
-void FlutterEmbedderTest::RegisterTouchScreen() {
-  FML_LOG(INFO) << "Registering fake touch screen";
-  input_registry_ = realm_->Connect<fuchsia::ui::test::input::Registry>();
-  input_registry_.set_error_handler(
-      [](auto) { FML_LOG(ERROR) << "Error from input helper"; });
-  bool touchscreen_registered = false;
-  fuchsia::ui::test::input::RegistryRegisterTouchScreenRequest request;
-  request.set_device(fake_touchscreen_.NewRequest());
-  input_registry_->RegisterTouchScreen(
-      std::move(request),
-      [&touchscreen_registered]() { touchscreen_registered = true; });
-  RunLoopUntil([&touchscreen_registered] { return touchscreen_registered; });
-  FML_LOG(INFO) << "Touchscreen registered";
-}
-
-void FlutterEmbedderTest::InjectTap(int32_t x, int32_t y) {
-  fuchsia::ui::test::input::TouchScreenSimulateTapRequest tap_request;
-  tap_request.mutable_tap_location()->x = x;
-  tap_request.mutable_tap_location()->y = y;
-  fake_touchscreen_->SimulateTap(std::move(tap_request), [x, y]() {
-    FML_LOG(INFO) << "Tap injected at (" << x << ", " << y << ")";
-  });
-}
-
-void FlutterEmbedderTest::TryInject(int32_t x, int32_t y) {
-  InjectTap(x, y);
-  async::PostDelayedTask(
-      dispatcher(), [this, x, y] { TryInject(x, y); }, kTapRetryInterval);
-}
-
 TEST_F(FlutterEmbedderTest, Embedding) {
   LaunchParentViewInRealm();
 
   // Take screenshot until we see the child-view's embedded color.
   ASSERT_TRUE(TakeScreenshotUntil(
       kChildBackgroundColor,
-      [](std::map<fuchsia_test_utils::Color, size_t> histogram) {
+      [](std::map<fuchsia_test_utils::Pixel, uint32_t> histogram) {
         // Expect parent and child background colors, with parent color > child
         // color.
         EXPECT_GT(histogram[kParentBackgroundColor], 0u);
@@ -489,63 +425,16 @@ TEST_F(FlutterEmbedderTest, Embedding) {
       }));
 }
 
-TEST_F(FlutterEmbedderTest, HittestEmbedding) {
-  LaunchParentViewInRealm();
-
-  // Take screenshot until we see the child-view's embedded color.
-  ASSERT_TRUE(TakeScreenshotUntil(kChildBackgroundColor));
-
-  // Simulate a tap at the center of the child view.
-  TryInject(/* x = */ 0, /* y = */ 0);
-
-  // Take screenshot until we see the child-view's tapped color.
-  ASSERT_TRUE(TakeScreenshotUntil(
-      kChildTappedColor,
-      [](std::map<fuchsia_test_utils::Color, size_t> histogram) {
-        // Expect parent and child background colors, with parent color > child
-        // color.
-        EXPECT_GT(histogram[kParentBackgroundColor], 0u);
-        EXPECT_EQ(histogram[kChildBackgroundColor], 0u);
-        EXPECT_GT(histogram[kChildTappedColor], 0u);
-        EXPECT_GT(histogram[kParentBackgroundColor],
-                  histogram[kChildTappedColor]);
-      }));
-}
-
-TEST_F(FlutterEmbedderTest, HittestDisabledEmbedding) {
-  LaunchParentViewInRealm({"--no-hitTestable"});
-
-  // Take screenshots until we see the child-view's embedded color.
-  ASSERT_TRUE(TakeScreenshotUntil(kChildBackgroundColor));
-
-  // Simulate a tap at the center of the child view.
-  TryInject(/* x = */ 0, /* y = */ 0);
-
-  // The parent-view should change color.
-  ASSERT_TRUE(TakeScreenshotUntil(
-      kParentTappedColor,
-      [](std::map<fuchsia_test_utils::Color, size_t> histogram) {
-        // Expect parent and child background colors, with parent color > child
-        // color.
-        EXPECT_EQ(histogram[kParentBackgroundColor], 0u);
-        EXPECT_GT(histogram[kParentTappedColor], 0u);
-        EXPECT_GT(histogram[kChildBackgroundColor], 0u);
-        EXPECT_EQ(histogram[kChildTappedColor], 0u);
-        EXPECT_GT(histogram[kParentTappedColor],
-                  histogram[kChildBackgroundColor]);
-      }));
-}
-
 TEST_F(FlutterEmbedderTest, EmbeddingWithOverlay) {
   LaunchParentViewInRealm({"--showOverlay"});
 
   // Take screenshot until we see the child-view's embedded color.
   ASSERT_TRUE(TakeScreenshotUntil(
       kChildBackgroundColor,
-      [](std::map<fuchsia_test_utils::Color, size_t> histogram) {
+      [](std::map<fuchsia_test_utils::Pixel, uint32_t> histogram) {
         // Expect parent, overlay and child background colors.
         // With parent color > child color and overlay color > child color.
-        const size_t overlay_pixel_count = OverlayPixelCount(histogram);
+        const uint32_t overlay_pixel_count = OverlayPixelCount(histogram);
         EXPECT_GT(histogram[kParentBackgroundColor], 0u);
         EXPECT_GT(overlay_pixel_count, 0u);
         EXPECT_GT(histogram[kChildBackgroundColor], 0u);
@@ -555,33 +444,4 @@ TEST_F(FlutterEmbedderTest, EmbeddingWithOverlay) {
       }));
 }
 
-TEST_F(FlutterEmbedderTest, HittestEmbeddingWithOverlay) {
-  LaunchParentViewInRealm({"--showOverlay"});
-
-  // Take screenshot until we see the child-view's embedded color.
-  ASSERT_TRUE(TakeScreenshotUntil(kChildBackgroundColor));
-
-  // The bottom-left corner of the overlay is at the center of the screen,
-  // which is at (0, 0) in the injection coordinate space. Inject a pointer
-  // event just outside the overlay's bounds, and ensure that it goes to the
-  // embedded view.
-  TryInject(/* x = */ -1, /* y = */ 1);
-
-  // Take screenshot until we see the child-view's tapped color.
-  ASSERT_TRUE(TakeScreenshotUntil(
-      kChildTappedColor,
-      [](std::map<fuchsia_test_utils::Color, size_t> histogram) {
-        // Expect parent, overlay and child background colors.
-        // With parent color > child color and overlay color > child color.
-        const size_t overlay_pixel_count = OverlayPixelCount(histogram);
-        EXPECT_GT(histogram[kParentBackgroundColor], 0u);
-        EXPECT_GT(overlay_pixel_count, 0u);
-        EXPECT_EQ(histogram[kChildBackgroundColor], 0u);
-        EXPECT_GT(histogram[kChildTappedColor], 0u);
-        EXPECT_GT(histogram[kParentBackgroundColor],
-                  histogram[kChildTappedColor]);
-        EXPECT_GT(overlay_pixel_count, histogram[kChildTappedColor]);
-      }));
-}
-
 }  // namespace flutter_embedder_test
diff --git a/shell/platform/fuchsia/flutter/tests/integration/embedder/meta/flutter-embedder-test.cml b/shell/platform/fuchsia/flutter/tests/integration/embedder/meta/flutter-embedder-test.cml
index 8ff1e67899ae94fb05f5032d88646ff9542e8705..ada9c05048533ef7f356e4326df0976682e548f2 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/embedder/meta/flutter-embedder-test.cml
+++ b/shell/platform/fuchsia/flutter/tests/integration/embedder/meta/flutter-embedder-test.cml
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 {
     include: [
-        "gtest_runner.shard.cml",
+        "sys/testing/gtest_runner.shard.cml",
         "sys/component/realm_builder_absolute.shard.cml",
 
         // This test needs both the vulkan facet and the hermetic-tier-2 facet,
@@ -18,6 +18,7 @@
             // Offer capabilities needed by components in this test realm.
             // Keep it minimal, describe only what's actually needed.
             protocol: [
+                "fuchsia.inspect.InspectSink",
                 "fuchsia.logger.LogSink",
                 "fuchsia.sysmem.Allocator",
                 "fuchsia.tracing.provider.Registry",
@@ -32,6 +33,7 @@
         "fuchsia.test": {
             "deprecated-allowed-packages": [
                 "child-view",
+                "flatland-scene-manager-test-ui-stack",
                 "oot_flutter_aot_runner",
                 "oot_flutter_jit_runner",
                 "oot_flutter_jit_product_runner",
diff --git a/shell/platform/fuchsia/flutter/tests/integration/embedder/meta/gtest_runner.shard.cml b/shell/platform/fuchsia/flutter/tests/integration/embedder/meta/gtest_runner.shard.cml
deleted file mode 100644
index d9871b70f3022b5a28f93581d65362348c52905b..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/flutter/tests/integration/embedder/meta/gtest_runner.shard.cml
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-{
-    program: {
-        runner: "gtest_runner",
-    },
-    capabilities: [
-        { protocol: "fuchsia.test.Suite" },
-    ],
-    expose: [
-        {
-            protocol: "fuchsia.test.Suite",
-            from: "self",
-        },
-    ],
-}
diff --git a/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/BUILD.gn
index ceaf8299f4a1b9a362b91d4a429189dd46e88523..0407e790c75ba57af26eec718ec905619fc7ab56 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/BUILD.gn
+++ b/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/BUILD.gn
@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/fuchsia/sdk.gni")
 import("//flutter/tools/fuchsia/dart/dart_library.gni")
 import("//flutter/tools/fuchsia/flutter/flutter_component.gni")
-import("//flutter/tools/fuchsia/gn-sdk/package.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/package.gni")
 
 dart_library("lib") {
   package_name = "parent-view"
@@ -14,11 +14,6 @@ dart_library("lib") {
   deps = [
     "//flutter/shell/platform/fuchsia/dart:args",
     "//flutter/shell/platform/fuchsia/dart:vector_math",
-    "//flutter/tools/fuchsia/dart:fuchsia_services",
-    "//flutter/tools/fuchsia/dart:zircon",
-    "//flutter/tools/fuchsia/fidl:fuchsia.sys",
-    "//flutter/tools/fuchsia/fidl:fuchsia.ui.app",
-    "//flutter/tools/fuchsia/fidl:fuchsia.ui.views",
   ]
 }
 
diff --git a/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/lib/parent_view.dart b/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/lib/parent_view.dart
index 5fd521661150d9d780f70f5938fea6045443c388..918bef8260b54dcd0f4b1982922d241756b4d7ba 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/lib/parent_view.dart
+++ b/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/lib/parent_view.dart
@@ -2,51 +2,35 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:async';
 import 'dart:convert';
 import 'dart:typed_data';
 import 'dart:io';
 import 'dart:ui';
 
 import 'package:args/args.dart';
-import 'package:fidl_fuchsia_ui_app/fidl_async.dart';
-import 'package:fidl_fuchsia_ui_views/fidl_async.dart';
-import 'package:fuchsia_services/services.dart';
 import 'package:vector_math/vector_math_64.dart' as vector_math_64;
-import 'package:zircon/zircon.dart';
 
 final _argsCsvFilePath = '/config/data/args.csv';
 
-void main(List<String> args) {
+void main(List<String> args) async {
   print('parent-view: starting');
 
   args = args + _GetArgsFromConfigFile();
   final parser = ArgParser()
     ..addFlag('showOverlay', defaultsTo: false)
-    ..addFlag('hitTestable', defaultsTo: true)
-    ..addFlag('focusable', defaultsTo: true)
-    ..addFlag('useFlatland', defaultsTo: false);
+    ..addFlag('focusable', defaultsTo: true);
   final arguments = parser.parse(args);
   for (final option in arguments.options) {
     print('parent-view: $option: ${arguments[option]}');
   }
 
   TestApp app;
-  final useFlatland = arguments['useFlatland'];
-  if (useFlatland) {
-    app = TestApp(
-      ChildView(_launchFlatlandChildView()),
-      showOverlay: arguments['showOverlay'],
-      hitTestable: arguments['hitTestable'],
-      focusable: arguments['focusable'],
-    );
-  } else {
-    app = TestApp(
-      ChildView.gfx(_launchGfxChildView()),
-      showOverlay: arguments['showOverlay'],
-      hitTestable: arguments['hitTestable'],
-      focusable: arguments['focusable'],
-    );
-  }
+  app = TestApp(
+    ChildView(await _launchChildView()),
+    showOverlay: arguments['showOverlay'],
+    focusable: arguments['focusable'],
+  );
 
   app.run();
 }
@@ -57,40 +41,36 @@ class TestApp {
 
   final ChildView childView;
   final bool showOverlay;
-  final bool hitTestable;
   final bool focusable;
 
   Color _backgroundColor = _blue;
 
-  TestApp(
-    this.childView,
-    {this.showOverlay = false,
-    this.hitTestable = true,
-    this.focusable = true}) {
-  }
+  TestApp(this.childView,
+      {this.showOverlay = false,
+      this.focusable = true}) {}
 
   void run() {
-    childView.create(hitTestable, focusable, (ByteData reply) {
-        // Set up window allbacks.
-        window.onPointerDataPacket = (PointerDataPacket packet) {
-          for (final data in packet.data) {
-            if (data.change == PointerChange.down) {
-              this._backgroundColor = _black;
-            }
+    childView.create(focusable, (ByteData? reply) {
+      // Set up window allbacks.
+      window.onPointerDataPacket = (PointerDataPacket packet) {
+        for (final data in packet.data) {
+          if (data.change == PointerChange.down) {
+            this._backgroundColor = _black;
           }
-          window.scheduleFrame();
-        };
-        window.onMetricsChanged = () {
-          window.scheduleFrame();
-        };
-        window.onBeginFrame = (Duration duration) {
-          this.beginFrame(duration);
-        };
-
-        // The child view should be attached to Scenic now.
-        // Ready to build the scene.
+        }
         window.scheduleFrame();
-      });
+      };
+      window.onMetricsChanged = () {
+        window.scheduleFrame();
+      };
+      window.onBeginFrame = (Duration duration) {
+        this.beginFrame(duration);
+      };
+
+      // The child view should be attached to Scenic now.
+      // Ready to build the scene.
+      window.scheduleFrame();
+    });
   }
 
   void beginFrame(Duration duration) {
@@ -114,18 +94,16 @@ class TestApp {
     // Alignment.center
     final windowCenter = windowSize.center(Offset.zero);
     final windowPhysicalCenter = window.physicalSize.center(Offset.zero);
-    final childPhysicalOffset = windowPhysicalCenter - childPhysicalSize.center(Offset.zero);
+    final childPhysicalOffset =
+        windowPhysicalCenter - childPhysicalSize.center(Offset.zero);
 
     sceneBuilder
-      ..pushTransform(
-        vector_math_64.Matrix4.translationValues(childPhysicalOffset.dx,
-                                                 childPhysicalOffset.dy,
-                                                 0.0).storage)
+      ..pushTransform(vector_math_64.Matrix4.translationValues(
+              childPhysicalOffset.dx, childPhysicalOffset.dy, 0.0)
+          .storage)
       ..addPlatformView(childView.viewId,
-                        width: childPhysicalSize.width,
-                        height: childPhysicalSize.height)
-      ..pop()
-    ;
+          width: childPhysicalSize.width, height: childPhysicalSize.height)
+      ..pop();
 
     if (showOverlay) {
       final containerSize = windowSize * .66;
@@ -135,15 +113,16 @@ class TestApp {
       final overlaySize = containerSize * 0.5;
       // Alignment.topRight
       final overlayOffset = Offset(
-        containerOffset.dx + containerSize.width - overlaySize.width,
-        containerOffset.dy);
+          containerOffset.dx + containerSize.width - overlaySize.width,
+          containerOffset.dy);
 
       final overlayPhysicalSize = overlaySize * pixelRatio;
       final overlayPhysicalOffset = overlayOffset * pixelRatio;
       final overlayPhysicalBounds = overlayPhysicalOffset & overlayPhysicalSize;
 
       final recorder = PictureRecorder();
-      final overlayCullRect = Offset.zero & overlayPhysicalSize; // in canvas physical coordinates
+      final overlayCullRect =
+          Offset.zero & overlayPhysicalSize; // in canvas physical coordinates
       final canvas = Canvas(recorder, overlayCullRect);
       canvas.scale(pixelRatio);
       final paint = Paint()..color = Color.fromARGB(255, 0, 255, 0);
@@ -152,8 +131,7 @@ class TestApp {
       sceneBuilder
         ..pushClipRect(overlayPhysicalBounds) // in window physical coordinates
         ..addPicture(overlayPhysicalOffset, overlayPicture)
-        ..pop()
-        ;
+        ..pop();
     }
     sceneBuilder.pop();
 
@@ -162,22 +140,12 @@ class TestApp {
 }
 
 class ChildView {
-  final ViewHolderToken viewHolderToken;
-  final ViewportCreationToken viewportCreationToken;
   final int viewId;
 
-  ChildView(this.viewportCreationToken) : viewHolderToken = null, viewId = viewportCreationToken.value.handle.handle {
-    assert(viewId != null);
-  }
+  ChildView(this.viewId);
 
-  ChildView.gfx(this.viewHolderToken) : viewportCreationToken = null, viewId = viewHolderToken.value.handle.handle {
-    assert(viewId != null);
-  }
-
-  void create(
-    bool hitTestable,
-    bool focusable,
-    PlatformMessageResponseCallback callback) {
+  void create(bool focusable,
+      PlatformMessageResponseCallback callback) {
     // Construct the dart:ui platform message to create the view, and when the
     // return callback is invoked, build the scene. At that point, it is safe
     // to embed the child-view2 in the scene.
@@ -185,7 +153,8 @@ class ChildView {
 
     final Map<String, dynamic> args = <String, dynamic>{
       'viewId': viewId,
-      'hitTestable': hitTestable,
+      // Flatland doesn't support disabling hit testing.
+      'hitTestable': true,
       'focusable': focusable,
       'viewOcclusionHintLTRB': <double>[
         viewOcclusionHint.left,
@@ -195,55 +164,29 @@ class ChildView {
       ],
     };
 
-    final ByteData createViewMessage = utf8.encoder.convert(
-      json.encode(<String, Object>{
-        'method': 'View.create',
-        'args': args,
-      })
-    ).buffer.asByteData();
+    final ByteData createViewMessage =
+        ByteData.sublistView(utf8.encode(json.encode(<String, Object>{
+      'method': 'View.create',
+      'args': args,
+    })));
 
     final platformViewsChannel = 'flutter/platform_views';
 
-    PlatformDispatcher.instance.sendPlatformMessage(
-      platformViewsChannel,
-      createViewMessage,
-      callback);
+    PlatformDispatcher.instance
+        .sendPlatformMessage(platformViewsChannel, createViewMessage, callback);
   }
 }
 
-ViewportCreationToken _launchFlatlandChildView() {
-  ViewProviderProxy viewProvider = ViewProviderProxy();
-  Incoming.fromSvcPath()
-    ..connectToService(viewProvider)
-    ..close();
-
-  final viewTokens = ChannelPair();
-  assert(viewTokens.status == ZX.OK);
-  final viewportCreationToken = ViewportCreationToken(value: viewTokens.first);
-  final viewCreationToken = ViewCreationToken(value: viewTokens.second);
-
-  final createViewArgs = CreateView2Args(viewCreationToken: viewCreationToken);
-  viewProvider.createView2(createViewArgs);
-  viewProvider.ctrl.close();
-
-  return viewportCreationToken;
-}
-
-ViewHolderToken _launchGfxChildView() {
-  ViewProviderProxy viewProvider = ViewProviderProxy();
-  Incoming.fromSvcPath()
-    ..connectToService(viewProvider)
-    ..close();
-
-  final viewTokens = EventPairPair();
-  assert(viewTokens.status == ZX.OK);
-  final viewHolderToken = ViewHolderToken(value: viewTokens.first);
-  final viewToken = ViewToken(value: viewTokens.second);
-
-  viewProvider.createView(viewToken.value, null, null);
-  viewProvider.ctrl.close();
+Future<int> _launchChildView() async {
+  final message = Int8List.fromList([0x31]);
+  final completer = new Completer<ByteData>();
+  PlatformDispatcher.instance.sendPlatformMessage(
+      'fuchsia/child_view', ByteData.sublistView(message), (ByteData? reply) {
+    completer.complete(reply!);
+  });
 
-  return viewHolderToken;
+  return int.parse(
+      ascii.decode(((await completer.future).buffer.asUint8List())));
 }
 
 List<String> _GetArgsFromConfigFile() {
diff --git a/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/meta/parent-view.cml b/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/meta/parent-view.cml
index 3eda9427a29c90bd2659a38ec714319e1155e0ba..a285bb4a55ad85fa07326372c82dc102f736a0f5 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/meta/parent-view.cml
+++ b/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/meta/parent-view.cml
@@ -26,6 +26,12 @@
             rights: [ "r*" ],
             path: "/config/data",
         },
+        // See common.shard.cml.
+        {
+            directory: "tzdata-icu",
+            rights: [ "r*" ],
+            path: "/config/tzdata/icu",
+        },
     ],
     expose: [
         {
diff --git a/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/pubspec.yaml b/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/pubspec.yaml
index 151abb7e2d1311e6dc442367c1c79e281680e70e..1ee7f0c30401c28d32b5220255b20b459e02140e 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/pubspec.yaml
+++ b/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/pubspec.yaml
@@ -5,4 +5,4 @@
 name: parent-view2
 
 environment:
-  sdk: '>=2.18.0 <3.0.0'
+  sdk: '>=3.2.0-0 <4.0.0'
diff --git a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn
index c26b44b7da8748cba666d5ced93532e1de8b6b7c..d976e940ffa594dfa1a5e167bdca6efab512e5ff 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn
+++ b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn
@@ -4,9 +4,9 @@
 
 assert(is_fuchsia)
 
-import("//build/fuchsia/sdk.gni")
 import("//flutter/tools/fuchsia/fuchsia_archive.gni")
-import("//flutter/tools/fuchsia/gn-sdk/package.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/package.gni")
 
 group("tests") {
   testonly = true
@@ -18,40 +18,38 @@ executable("mouse-input-test-bin") {
   output_name = "mouse-input-test"
   sources = [ "mouse-input-test.cc" ]
 
-  # This is needed for //third_party/googletest for linking zircon symbols.
-  libs = [ "$fuchsia_sdk_path/arch/$target_cpu/sysroot/lib/libzircon.so" ]
+  # This is needed for //flutter/third_party/googletest for linking zircon
+  # symbols.
+  libs = [ "${fuchsia_arch_root}/sysroot/lib/libzircon.so" ]
 
   deps = [
-    "$fuchsia_sdk_root/fidl:fuchsia.accessibility.semantics",
-    "$fuchsia_sdk_root/fidl:fuchsia.buildinfo",
-    "$fuchsia_sdk_root/fidl:fuchsia.component",
-    "$fuchsia_sdk_root/fidl:fuchsia.fonts",
-    "$fuchsia_sdk_root/fidl:fuchsia.intl",
-    "$fuchsia_sdk_root/fidl:fuchsia.kernel",
-    "$fuchsia_sdk_root/fidl:fuchsia.memorypressure",
-    "$fuchsia_sdk_root/fidl:fuchsia.metrics",
-    "$fuchsia_sdk_root/fidl:fuchsia.net.interfaces",
-    "$fuchsia_sdk_root/fidl:fuchsia.tracing.provider",
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.app",
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.input",
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.pointerinjector",
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.policy",
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.scenic",
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.test.input",
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.test.scene",
-    "$fuchsia_sdk_root/fidl:fuchsia.web",
-    "$fuchsia_sdk_root/pkg:async",
-    "$fuchsia_sdk_root/pkg:async-loop-testing",
-    "$fuchsia_sdk_root/pkg:fidl_cpp",
-    "$fuchsia_sdk_root/pkg:scenic_cpp",
-    "$fuchsia_sdk_root/pkg:sys_component_cpp_testing",
-    "$fuchsia_sdk_root/pkg:zx",
+    "${fuchsia_sdk}/fidl/fuchsia.accessibility.semantics",
+    "${fuchsia_sdk}/fidl/fuchsia.buildinfo",
+    "${fuchsia_sdk}/fidl/fuchsia.component",
+    "${fuchsia_sdk}/fidl/fuchsia.fonts",
+    "${fuchsia_sdk}/fidl/fuchsia.intl",
+    "${fuchsia_sdk}/fidl/fuchsia.kernel",
+    "${fuchsia_sdk}/fidl/fuchsia.memorypressure",
+    "${fuchsia_sdk}/fidl/fuchsia.metrics",
+    "${fuchsia_sdk}/fidl/fuchsia.net.interfaces",
+    "${fuchsia_sdk}/fidl/fuchsia.tracing.provider",
+    "${fuchsia_sdk}/fidl/fuchsia.ui.app",
+    "${fuchsia_sdk}/fidl/fuchsia.ui.display.singleton",
+    "${fuchsia_sdk}/fidl/fuchsia.ui.input",
+    "${fuchsia_sdk}/fidl/fuchsia.ui.pointerinjector",
+    "${fuchsia_sdk}/fidl/fuchsia.ui.test.input",
+    "${fuchsia_sdk}/fidl/fuchsia.ui.test.scene",
+    "${fuchsia_sdk}/fidl/fuchsia.web",
+    "${fuchsia_sdk}/pkg/async",
+    "${fuchsia_sdk}/pkg/async-loop-testing",
+    "${fuchsia_sdk}/pkg/fidl_cpp",
+    "${fuchsia_sdk}/pkg/sys_component_cpp_testing",
+    "${fuchsia_sdk}/pkg/zx",
     "mouse-input-view:package",
-    "//build/fuchsia/fidl:fuchsia.ui.gfx",
     "//flutter/fml",
     "//flutter/shell/platform/fuchsia/flutter/tests/integration/utils:portable_ui_test",
-    "//third_party/googletest:gtest",
-    "//third_party/googletest:gtest_main",
+    "//flutter/third_party/googletest:gtest",
+    "//flutter/third_party/googletest:gtest_main",
   ]
 }
 
diff --git a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/README.md b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/README.md
index 0680adb4416c1ab01ec38a323461977ba81b7747..5755445724ab7b28d036c1f0de2b71fae28d40a9 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/README.md
+++ b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/README.md
@@ -1,8 +1,8 @@
 # mouse-input
 
-`mouse-input-test` exercises mouse input through a child view (in this case, the `mouse-input-view` Dart component) and 
-asserting the location as well as what button was used (mouse down, mouse up, wheel, etc) during the event. We do this by 
-attaching the child view, injecting mouse input, and validating that the view reports the event back with the expected 
+`mouse-input-test` exercises mouse input through a child view (in this case, the `mouse-input-view` Dart component) and
+asserting the location as well as what button was used (mouse down, mouse up, wheel, etc) during the event. We do this by
+attaching the child view, injecting mouse input, and validating that the view reports the event back with the expected
 payload.
 
 ```shell
@@ -24,9 +24,9 @@ Reference the Flutter integration test [documentation](https://github.com/flutte
 
 ## Playing around with `mouse-input-view`
 
-Build Fuchsia with `workstation_eng.qemu-x64`
+Build Fuchsia with `terminal.qemu-x64`
 ```shell
-fx set workstation_eng.qemu-x64 && fx build
+fx set terminal.qemu-x64 && fx build
 ```
 
 Build flutter/engine
diff --git a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/meta/gtest_runner.shard.cml b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/meta/gtest_runner.shard.cml
deleted file mode 100644
index d9871b70f3022b5a28f93581d65362348c52905b..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/meta/gtest_runner.shard.cml
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-{
-    program: {
-        runner: "gtest_runner",
-    },
-    capabilities: [
-        { protocol: "fuchsia.test.Suite" },
-    ],
-    expose: [
-        {
-            protocol: "fuchsia.test.Suite",
-            from: "self",
-        },
-    ],
-}
diff --git a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/meta/mouse-input-test.cml b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/meta/mouse-input-test.cml
index 0c4de88067b4db4cca232d3be78544a87f48fdd0..1199c2cb024fea9ad7c6388bb95613526aca5b4a 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/meta/mouse-input-test.cml
+++ b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/meta/mouse-input-test.cml
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 {
     include: [
-        "gtest_runner.shard.cml",
+        "sys/testing/gtest_runner.shard.cml",
         "sys/component/realm_builder_absolute.shard.cml",
 
         // This test needs both the vulkan facet and the hermetic-tier-2 facet,
@@ -25,6 +25,7 @@
             // Offer capabilities needed by components in this test realm.
             // Keep it minimal, describe only what's actually needed.
             protocol: [
+                "fuchsia.inspect.InspectSink",
                 "fuchsia.kernel.RootJobForInspect",
                 "fuchsia.kernel.Stats",
                 "fuchsia.logger.LogSink",
@@ -33,7 +34,6 @@
                 "fuchsia.tracing.provider.Registry",
                 "fuchsia.ui.input.ImeService",
                 "fuchsia.vulkan.loader.Loader",
-                "fuchsia.ui.scenic.Scenic",
                 "fuchsia.ui.composition.Allocator",
                 "fuchsia.ui.composition.Flatland",
                 "fuchsia.ui.test.input.MouseInputListener",
@@ -51,6 +51,12 @@
             from: "framework",
             to: "#realm_builder",
         },
+        // See common.shard.cml.
+        {
+            directory: "tzdata-icu",
+            from: "framework",
+            to: "#realm_builder",
+        },
     ],
     // TODO(https://fxbug.dev/114584): Figure out how to bring these in as deps (if possible oot).
     facets: {
diff --git a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-test.cc b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-test.cc
index 2839b6f39e5a60a4d7351d1d2d301cd943d54e91..bbce8eed34db256b7f5d37be213215c936b8049e 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-test.cc
+++ b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-test.cc
@@ -12,11 +12,10 @@
 #include <fuchsia/memorypressure/cpp/fidl.h>
 #include <fuchsia/metrics/cpp/fidl.h>
 #include <fuchsia/net/interfaces/cpp/fidl.h>
-#include <fuchsia/sys/cpp/fidl.h>
 #include <fuchsia/tracing/provider/cpp/fidl.h>
 #include <fuchsia/ui/app/cpp/fidl.h>
+#include <fuchsia/ui/display/singleton/cpp/fidl.h>
 #include <fuchsia/ui/input/cpp/fidl.h>
-#include <fuchsia/ui/scenic/cpp/fidl.h>
 #include <fuchsia/ui/test/input/cpp/fidl.h>
 #include <fuchsia/web/cpp/fidl.h>
 #include <lib/async/cpp/task.h>
@@ -49,8 +48,7 @@ namespace {
 // Types imported for the realm_builder library.
 using component_testing::ChildRef;
 using component_testing::ConfigValue;
-using component_testing::LocalComponent;
-using component_testing::LocalComponentHandles;
+using component_testing::LocalComponentImpl;
 using component_testing::ParentRef;
 using component_testing::Protocol;
 using component_testing::Realm;
@@ -109,7 +107,7 @@ int ButtonsToInt(
 // us know what position and button press state the mouse cursor has.
 class MouseInputListenerServer
     : public fuchsia::ui::test::input::MouseInputListener,
-      public LocalComponent {
+      public LocalComponentImpl {
  public:
   explicit MouseInputListenerServer(async_dispatcher_t* dispatcher)
       : dispatcher_(dispatcher) {}
@@ -121,19 +119,18 @@ class MouseInputListenerServer
     events_.push(std::move(request));
   }
 
-  // |MockComponent::Start|
+  // |MockComponent::OnStart|
   // When the component framework requests for this component to start, this
   // method will be invoked by the realm_builder library.
-  void Start(std::unique_ptr<LocalComponentHandles> mock_handles) override {
+  void OnStart() override {
     FML_LOG(INFO) << "Starting MouseInputServer";
-    ASSERT_EQ(ZX_OK, mock_handles->outgoing()->AddPublicService(
+    ASSERT_EQ(ZX_OK, outgoing()->AddPublicService(
                          fidl::InterfaceRequestHandler<
                              fuchsia::ui::test::input::MouseInputListener>(
                              [this](auto request) {
                                bindings_.AddBinding(this, std::move(request),
                                                     dispatcher_);
                              })));
-    mock_handles_.emplace_back(std::move(mock_handles));
   }
 
   size_t SizeOfEvents() const { return events_.size(); }
@@ -156,7 +153,6 @@ class MouseInputListenerServer
   // Not owned.
   async_dispatcher_t* dispatcher_ = nullptr;
   fidl::BindingSet<fuchsia::ui::test::input::MouseInputListener> bindings_;
-  std::vector<std::unique_ptr<LocalComponentHandles>> mock_handles_;
   std::queue<
       fuchsia::ui::test::input::MouseInputListenerReportMouseInputRequest>
       events_;
@@ -173,14 +169,19 @@ class MouseInputTest : public PortableUITest,
     RegisterMouse();
 
     // Get the display dimensions.
-    FML_LOG(INFO) << "Waiting for scenic display info";
-    scenic_ = realm_root()->Connect<fuchsia::ui::scenic::Scenic>();
-    scenic_->GetDisplayInfo([this](fuchsia::ui::gfx::DisplayInfo display_info) {
-      display_width_ = display_info.width_in_px;
-      display_height_ = display_info.height_in_px;
-      FML_LOG(INFO) << "Got display_width = " << display_width_
-                    << " and display_height = " << display_height_;
-    });
+    FML_LOG(INFO)
+        << "Waiting for display info from fuchsia.ui.display.singleton.Info";
+    fuchsia::ui::display::singleton::InfoPtr display_info =
+        realm_root()
+            ->component()
+            .Connect<fuchsia::ui::display::singleton::Info>();
+    display_info->GetMetrics(
+        [this](fuchsia::ui::display::singleton::Metrics metrics) {
+          display_width_ = metrics.extent_in_px().width;
+          display_height_ = metrics.extent_in_px().height;
+          FML_LOG(INFO) << "Got display_width = " << display_width_
+                        << " and display_height = " << display_height_;
+        });
     RunLoopUntil(
         [this] { return display_width_ != 0 && display_height_ != 0; });
   }
@@ -191,7 +192,7 @@ class MouseInputTest : public PortableUITest,
   }
 
   MouseInputListenerServer* mouse_input_listener() {
-    return mouse_input_listener_.get();
+    return mouse_input_listener_;
   }
 
   // Helper method for checking the test.mouse.MouseInputListener response from
@@ -254,13 +255,17 @@ class MouseInputTest : public PortableUITest,
  private:
   void ExtendRealm() override {
     FML_LOG(INFO) << "Extending realm";
-    mouse_input_listener_ =
-        std::make_unique<MouseInputListenerServer>(dispatcher());
 
     // Key part of service setup: have this test component vend the
     // |MouseInputListener| service in the constructed realm.
-    realm_builder()->AddLocalChild(kMouseInputListener,
-                                   mouse_input_listener_.get());
+    auto mouse_input_listener =
+        std::make_unique<MouseInputListenerServer>(dispatcher());
+    mouse_input_listener_ = mouse_input_listener.get();
+    realm_builder()->AddLocalChild(
+        kMouseInputListener,
+        [mouse_input_listener = std::move(mouse_input_listener)]() mutable {
+          return std::move(mouse_input_listener);
+        });
 
     realm_builder()->AddChild(kMouseInputView, kMouseInputViewUrl,
                               component_testing::ChildOptions{
@@ -281,9 +286,8 @@ class MouseInputTest : public PortableUITest,
 
   ParamType GetTestUIStackUrl() override { return GetParam(); };
 
-  std::unique_ptr<MouseInputListenerServer> mouse_input_listener_;
+  MouseInputListenerServer* mouse_input_listener_;
 
-  fuchsia::ui::scenic::ScenicPtr scenic_;
   uint32_t display_width_ = 0;
   uint32_t display_height_ = 0;
 };
@@ -299,7 +303,7 @@ INSTANTIATE_TEST_SUITE_P(
         "fuchsia-pkg://fuchsia.com/flatland-scene-manager-test-ui-stack#meta/"
         "test-ui-stack.cm"));
 
-TEST_P(MouseInputTest, FlutterMouseMove) {
+TEST_P(MouseInputTest, DISABLED_FlutterMouseMove) {
   LaunchClient();
 
   SimulateMouseEvent(/* pressed_buttons = */ {}, /* movement_x = */ 1,
@@ -321,7 +325,7 @@ TEST_P(MouseInputTest, FlutterMouseMove) {
               /*component_name=*/"mouse-input-view");
 }
 
-TEST_P(MouseInputTest, FlutterMouseDown) {
+TEST_P(MouseInputTest, DISABLED_FlutterMouseDown) {
   LaunchClient();
 
   SimulateMouseEvent(
@@ -364,7 +368,7 @@ TEST_P(MouseInputTest, FlutterMouseDown) {
       /*component_name=*/"mouse-input-view");
 }
 
-TEST_P(MouseInputTest, FlutterMouseDownUp) {
+TEST_P(MouseInputTest, DISABLED_FlutterMouseDownUp) {
   LaunchClient();
 
   SimulateMouseEvent(
@@ -422,7 +426,7 @@ TEST_P(MouseInputTest, FlutterMouseDownUp) {
               /*component_name=*/"mouse-input-view");
 }
 
-TEST_P(MouseInputTest, FlutterMouseDownMoveUp) {
+TEST_P(MouseInputTest, DISABLED_FlutterMouseDownMoveUp) {
   LaunchClient();
 
   SimulateMouseEvent(
@@ -551,7 +555,7 @@ TEST_P(MouseInputTest, DISABLED_FlutterMouseWheelIssue103098) {
   EXPECT_EQ(event_3.wheel_y_physical_pixel(), 0);
 }
 
-TEST_P(MouseInputTest, FlutterMouseWheel) {
+TEST_P(MouseInputTest, DISABLED_FlutterMouseWheel) {
   LaunchClient();
 
   double initial_x = static_cast<double>(display_width()) / 2.f + 1;
diff --git a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/BUILD.gn
index edb58ee0fd16f478d4415793d5a3686b7dbab917..1e59eeafe42a5539ff908f7a8be81263e6d0f70b 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/BUILD.gn
+++ b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/BUILD.gn
@@ -2,22 +2,17 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/fuchsia/sdk.gni")
 import("//flutter/tools/fuchsia/dart/dart_library.gni")
 import("//flutter/tools/fuchsia/flutter/flutter_component.gni")
-import("//flutter/tools/fuchsia/gn-sdk/component.gni")
-import("//flutter/tools/fuchsia/gn-sdk/package.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/component.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/package.gni")
 
 dart_library("lib") {
   package_name = "mouse-input-view"
   sources = [ "mouse-input-view.dart" ]
 
-  deps = [
-    "//flutter/shell/platform/fuchsia/dart:args",
-    "//flutter/tools/fuchsia/dart:fuchsia_services",
-    "//flutter/tools/fuchsia/dart:zircon",
-    "//flutter/tools/fuchsia/fidl:fuchsia.ui.test.input",
-  ]
+  deps = [ "//flutter/shell/platform/fuchsia/dart:args" ]
 }
 
 flutter_component("component") {
diff --git a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/lib/mouse-input-view.dart b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/lib/mouse-input-view.dart
index 9c657ff658f4e2dde2bb1eaef882e08799db8c95..b3f2104c5747cfc7fbdb3d1ef887fe149abb4c8e 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/lib/mouse-input-view.dart
+++ b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/lib/mouse-input-view.dart
@@ -5,10 +5,7 @@
 import 'dart:convert';
 import 'dart:typed_data';
 import 'dart:ui';
-
-import 'package:fidl_fuchsia_ui_test_input/fidl_async.dart' as test_mouse;
-import 'package:fuchsia_services/services.dart';
-import 'package:zircon/zircon.dart';
+import 'dart:zircon';
 
 void main() {
   print('Launching mouse-input-view');
@@ -16,38 +13,6 @@ void main() {
   app.run();
 }
 
-List<test_mouse.MouseButton> getPressedButtons(int buttons) {
-  var pressed_buttons = <test_mouse.MouseButton>[];
-  if (buttons & 0x1 != 0) {
-    pressed_buttons.add(test_mouse.MouseButton.first);
-  }
-  if (buttons & (0x1 >> 1) != 0) {
-    pressed_buttons.add(test_mouse.MouseButton.second);
-  }
-  if (buttons & (0x1 >> 2) != 0) {
-    pressed_buttons.add(test_mouse.MouseButton.third);
-  }
-
-  return pressed_buttons;
-}
-
-test_mouse.MouseEventPhase getPhase(String event_type) {
-  switch (event_type) {
-    case 'add':
-      return test_mouse.MouseEventPhase.add;
-    case 'hover':
-      return test_mouse.MouseEventPhase.hover;
-    case 'down':
-      return test_mouse.MouseEventPhase.down;
-    case 'move':
-      return test_mouse.MouseEventPhase.move;
-    case 'up':
-      return test_mouse.MouseEventPhase.up;
-    default:
-      print('Invalid event type: ${event_type}');
-  }
-}
-
 class MyApp {
   static const _red = Color.fromARGB(255, 244, 67, 54);
   static const _orange = Color.fromARGB(255, 255, 152, 0);
@@ -67,11 +32,8 @@ class MyApp {
 
   // Each tap will increment the counter, we then determine what color to choose
   int _touchCounter = 0;
-  final _responseListener = test_mouse.MouseInputListenerProxy();
 
   void run() {
-    Incoming.fromSvcPath()
-      ..connectToService(_responseListener);
     // Set up window callbacks.
     window.onPointerDataPacket = (PointerDataPacket packet) {
       this.pointerDataPacket(packet);
@@ -122,28 +84,42 @@ class MyApp {
           _touchCounter++;
         }
 
-        // Incoming.fromSvcPath()
-        //   ..connectToService(_responseListener)
-          // ..close();
-
-        _respond(test_mouse.MouseInputListenerReportMouseInputRequest(
+        _reportMouseInput(
           localX: data.physicalX,
           localY: data.physicalY,
-          buttons: getPressedButtons(data.buttons),
-          phase: getPhase(data.change.name),
+          buttons: data.buttons,
+          phase: data.change.name,
           timeReceived: nowNanos,
           wheelXPhysicalPixel: data.scrollDeltaX,
           wheelYPhysicalPixel: data.scrollDeltaY,
-          componentName: 'mouse-input-view',
-        ));
+        );
       }
     }
 
     window.scheduleFrame();
   }
 
-  void _respond(test_mouse.MouseInputListenerReportMouseInputRequest request) async {
+  void _reportMouseInput(
+      {required double localX,
+      required double localY,
+      required int timeReceived,
+      required int buttons,
+      required String phase,
+      required double wheelXPhysicalPixel,
+      required double wheelYPhysicalPixel}) {
     print('mouse-input-view reporting mouse input to MouseInputListener');
-    await _responseListener.reportMouseInput(request);
+    final message = ByteData.sublistView(utf8.encode(json.encode({
+        'method': 'MouseInputListener.ReportMouseInput',
+        'local_x': localX,
+        'local_y': localY,
+        'time_received': timeReceived,
+        'component_name': 'touch-input-view',
+        'buttons': buttons,
+        'phase': phase,
+        'wheel_x_physical_pixel': wheelXPhysicalPixel,
+        'wheel_y_physical_pixel': wheelYPhysicalPixel,
+      })));
+    PlatformDispatcher.instance
+        .sendPlatformMessage('fuchsia/input_test', message, null);
   }
 }
diff --git a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/meta/mouse-input-view.cml b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/meta/mouse-input-view.cml
index 38d23643e46641faeacdfc2ead4b306390980ac5..fecafe2c6275db56b4045bf4ec08aa0f561aeead 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/meta/mouse-input-view.cml
+++ b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/meta/mouse-input-view.cml
@@ -26,7 +26,6 @@
             protocol: [
                 "fuchsia.sysmem.Allocator",
                 "fuchsia.tracing.provider.Registry",
-                "fuchsia.ui.scenic.Scenic",
                 "fuchsia.ui.composition.Flatland",
                 "fuchsia.ui.test.input.MouseInputListener",
                 "fuchsia.vulkan.loader.Loader",
diff --git a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/pubspec.yaml b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/pubspec.yaml
index a557dbe433abdbac99e516218cb0c4e085c63157..40e52bb3bbc54c4f02c6a3437429191e37a1abbb 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/pubspec.yaml
+++ b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/pubspec.yaml
@@ -5,4 +5,4 @@
 name: mouse-input-view
 
 environment:
-  sdk: '>=2.18.0 <3.0.0'
+  sdk: '>=3.2.0-0 <4.0.0'
diff --git a/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn
index 9fb5acaebaecdce38c9f1699f87ac85a2c52b6b8..41346b91046c2f808075176f62a41cc4e94039fa 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn
+++ b/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn
@@ -4,9 +4,9 @@
 
 assert(is_fuchsia)
 
-import("//build/fuchsia/sdk.gni")
 import("//flutter/tools/fuchsia/fuchsia_archive.gni")
-import("//flutter/tools/fuchsia/gn-sdk/package.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/package.gni")
 
 group("tests") {
   testonly = true
@@ -15,44 +15,44 @@ group("tests") {
 
 executable("text-input-test-bin") {
   testonly = true
-
   output_name = "text-input-test"
-
   sources = [ "text-input-test.cc" ]
 
-  # This is needed for //third_party/googletest for linking zircon symbols.
-  libs = [ "$fuchsia_sdk_path/arch/$target_cpu/sysroot/lib/libzircon.so" ]
+  # This is needed for //flutter/third_party/googletest for linking zircon
+  # symbols.
+  libs = [ "${fuchsia_arch_root}/sysroot/lib/libzircon.so" ]
 
   deps = [
-    "$fuchsia_sdk_root/fidl:fuchsia.feedback",
-    "$fuchsia_sdk_root/fidl:fuchsia.logger",
-    "$fuchsia_sdk_root/fidl:fuchsia.sys",
-    "$fuchsia_sdk_root/fidl:fuchsia.tracing.provider",
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.app",
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.composition",
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.input",
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.scenic",
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.test.input",
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.test.scene",
-    "$fuchsia_sdk_root/pkg:async",
-    "$fuchsia_sdk_root/pkg:async-loop-testing",
-    "$fuchsia_sdk_root/pkg:fidl_cpp",
-    "$fuchsia_sdk_root/pkg:scenic_cpp",
-    "$fuchsia_sdk_root/pkg:sys_component_cpp_testing",
-    "$fuchsia_sdk_root/pkg:zx",
+    "${fuchsia_sdk}/fidl/fuchsia.accessibility.semantics",
+    "${fuchsia_sdk}/fidl/fuchsia.component",
+    "${fuchsia_sdk}/fidl/fuchsia.feedback",
+    "${fuchsia_sdk}/fidl/fuchsia.intl",
+    "${fuchsia_sdk}/fidl/fuchsia.kernel",
+    "${fuchsia_sdk}/fidl/fuchsia.logger",
+    "${fuchsia_sdk}/fidl/fuchsia.tracing.provider",
+    "${fuchsia_sdk}/fidl/fuchsia.ui.app",
+    "${fuchsia_sdk}/fidl/fuchsia.ui.display.singleton",
+    "${fuchsia_sdk}/fidl/fuchsia.ui.input",
+    "${fuchsia_sdk}/fidl/fuchsia.ui.pointerinjector",
+    "${fuchsia_sdk}/fidl/fuchsia.ui.test.input",
+    "${fuchsia_sdk}/fidl/fuchsia.ui.test.scene",
+    "${fuchsia_sdk}/pkg/async",
+    "${fuchsia_sdk}/pkg/async-loop-testing",
+    "${fuchsia_sdk}/pkg/fidl_cpp",
+    "${fuchsia_sdk}/pkg/sys_component_cpp_testing",
+    "${fuchsia_sdk}/pkg/zx",
+    "text-input-view:package",
     "//flutter/fml",
     "//flutter/shell/platform/fuchsia/flutter/tests/integration/utils:check_view",
-    "//flutter/shell/platform/fuchsia/flutter/tests/integration/utils:color",
-    "//flutter/shell/platform/fuchsia/flutter/tests/integration/utils:screenshot",
-    "//third_party/googletest:gtest",
-    "//third_party/googletest:gtest_main",
+    "//flutter/shell/platform/fuchsia/flutter/tests/integration/utils:portable_ui_test",
+    "//flutter/third_party/googletest:gtest",
+    "//flutter/third_party/googletest:gtest_main",
   ]
 }
 
 fuchsia_test_archive("text-input-test") {
   deps = [
     ":text-input-test-bin",
-    "text-input-view:package",
 
     # "OOT" copies of the runners used by tests, to avoid conflicting with the
     # runners in the base fuchsia image.
@@ -61,6 +61,5 @@ fuchsia_test_archive("text-input-test") {
   ]
 
   binary = "$target_name"
-
   cml_file = rebase_path("meta/$target_name.cml")
 }
diff --git a/shell/platform/fuchsia/flutter/tests/integration/text-input/meta/gtest_runner.shard.cml b/shell/platform/fuchsia/flutter/tests/integration/text-input/meta/gtest_runner.shard.cml
deleted file mode 100644
index d9871b70f3022b5a28f93581d65362348c52905b..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/flutter/tests/integration/text-input/meta/gtest_runner.shard.cml
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-{
-    program: {
-        runner: "gtest_runner",
-    },
-    capabilities: [
-        { protocol: "fuchsia.test.Suite" },
-    ],
-    expose: [
-        {
-            protocol: "fuchsia.test.Suite",
-            from: "self",
-        },
-    ],
-}
diff --git a/shell/platform/fuchsia/flutter/tests/integration/text-input/meta/text-input-test.cml b/shell/platform/fuchsia/flutter/tests/integration/text-input/meta/text-input-test.cml
index 6b97f55f426f3b840f121745665b5f94e853e6d1..38ce49b81ee5f1d5405f32f5d2f62f6fb52a24b7 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/text-input/meta/text-input-test.cml
+++ b/shell/platform/fuchsia/flutter/tests/integration/text-input/meta/text-input-test.cml
@@ -3,12 +3,9 @@
 // found in the LICENSE file.
 {
     include: [
-        "gtest_runner.shard.cml",
+        "sys/testing/gtest_runner.shard.cml",
         "sys/component/realm_builder_absolute.shard.cml",
 
-        "syslog/client.shard.cml",
-        "vulkan/client.shard.cml",
-
         // This test needs both the vulkan facet and the hermetic-tier-2 facet,
         // so we are forced to make it a system test.
         "sys/testing/system-test.shard.cml",
@@ -17,30 +14,65 @@
     program: {
         binary: "bin/app",
     },
+    use: [
+      {
+        protocol: [
+          "fuchsia.ui.test.input.KeyboardInputListener",
+        ]
+      }
+    ],
     offer: [
         {
             protocol: [
+                "fuchsia.inspect.InspectSink",
                 "fuchsia.kernel.RootJobForInspect",
                 "fuchsia.kernel.Stats",
                 "fuchsia.logger.LogSink",
                 "fuchsia.scheduler.ProfileProvider",
                 "fuchsia.sysmem.Allocator",
                 "fuchsia.tracing.provider.Registry",
+                "fuchsia.ui.input.ImeService",
                 "fuchsia.vulkan.loader.Loader",
+                "fuchsia.ui.test.input.KeyboardInputListener",
+                "fuchsia.ui.input3.Keyboard",
+                "fuchsia.intl.PropertyProvider",
+                "fuchsia.posix.socket.Provider",
+                "fuchsia.ui.pointerinjector.Registry",
+                "fuchsia.fonts.Provider",
+                "fuchsia.feedback.CrashReportingProductRegister",
+                "fuchsia.settings.Keyboard",
+                "fuchsia.accessibility.semantics.SemanticsManager",
             ],
             from: "parent",
             to: "#realm_builder",
         },
+        {
+            directory: "pkg",
+            subdir: "config",
+            as: "config-data",
+            from: "framework",
+            to: "#realm_builder",
+        },
+        // See common.shard.cml.
+        {
+            directory: "tzdata-icu",
+            from: "framework",
+            to: "#realm_builder",
+        },
     ],
     // TODO(https://fxbug.dev/114584): Figure out how to bring these in as deps (if possible oot).
     facets: {
         "fuchsia.test": {
             "deprecated-allowed-packages": [
+                "cursor",
+                "flatland-scene-manager-test-ui-stack",
+                "test-ui-stack",
                 "oot_flutter_aot_runner",
                 "oot_flutter_jit_runner",
                 "oot_flutter_jit_product_runner",
                 "oot_flutter_aot_product_runner",
                 "test_manager",
+                "text-input-view",
             ],
         },
     },
diff --git a/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-test.cc b/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-test.cc
index 0fe3a47d5e78f38b28846a0c3077faaf52ca84f6..345f9763ce36f5e3daaf07a9a31d897e44550831 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-test.cc
+++ b/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-test.cc
@@ -4,12 +4,11 @@
 
 #include <fuchsia/feedback/cpp/fidl.h>
 #include <fuchsia/logger/cpp/fidl.h>
-#include <fuchsia/sys/cpp/fidl.h>
 #include <fuchsia/sysmem/cpp/fidl.h>
 #include <fuchsia/tracing/provider/cpp/fidl.h>
 #include <fuchsia/ui/app/cpp/fidl.h>
+#include <fuchsia/ui/display/singleton/cpp/fidl.h>
 #include <fuchsia/ui/input/cpp/fidl.h>
-#include <fuchsia/ui/scenic/cpp/fidl.h>
 #include <fuchsia/ui/test/input/cpp/fidl.h>
 #include <fuchsia/ui/test/scene/cpp/fidl.h>
 #include <lib/async-loop/testing/cpp/real_loop.h>
@@ -35,13 +34,13 @@
 
 #include "flutter/fml/logging.h"
 #include "flutter/shell/platform/fuchsia/flutter/tests/integration/utils/check_view.h"
+#include "flutter/shell/platform/fuchsia/flutter/tests/integration/utils/portable_ui_test.h"
 
 namespace {
 
 // Types imported for the realm_builder library.
 using component_testing::ChildRef;
-using component_testing::LocalComponent;
-using component_testing::LocalComponentHandles;
+using component_testing::LocalComponentImpl;
 using component_testing::ParentRef;
 using component_testing::Protocol;
 using component_testing::RealmBuilder;
@@ -49,216 +48,91 @@ using component_testing::RealmRoot;
 using component_testing::Route;
 
 using fuchsia_test_utils::CheckViewExistsInUpdates;
+using fuchsia_test_utils::PortableUITest;
 
 /// Max timeout in failure cases.
 /// Set this as low as you can that still works across all test platforms.
 constexpr zx::duration kTimeout = zx::min(5);
 
-// The FIDL bindings for these services are not exposed in the Fuchsia SDK so we
-// must encode the names manually here.
-constexpr auto kVulkanLoaderServiceName = "fuchsia.vulkan.loader.Loader";
-constexpr auto kProfileProviderServiceName = "fuchsia.sheduler.ProfileProvider";
+constexpr auto kKeyboardInputListener = "keyboard_input_listener";
+constexpr auto kKeyboardInputListenerRef = ChildRef{kKeyboardInputListener};
 
-constexpr auto kResponseListener = "test_text_response_listener";
 constexpr auto kTextInputView = "text-input-view";
+constexpr auto kTextInputViewRef = ChildRef{kTextInputView};
 static constexpr auto kTextInputViewUrl =
-    "fuchsia-pkg://fuchsia.com/view#meta/view-realm.cm";
+    "fuchsia-pkg://fuchsia.com/text-input-view#meta/text-input-view.cm";
 
-constexpr auto kTestUiStack = "ui";
-constexpr auto kTestUiStackUrl =
-    "fuchsia-pkg://fuchsia.com/test-ui-stack#meta/test-ui-stack.cm";
+constexpr auto kTestUIStackUrl =
+    "fuchsia-pkg://fuchsia.com/flatland-scene-manager-test-ui-stack#meta/"
+    "test-ui-stack.cm";
 
-/// |ResponseListener| is a local test protocol that our test Flutter app uses
-/// to let us know what text is being entered into its only text field.
+/// |KeyboardInputListener| is a local test protocol that our test Flutter app
+/// uses to let us know what text is being entered into its only text field.
 ///
 /// The text field contents are reported on almost every change, so if you are
 /// entering a long text, you will see calls corresponding to successive
 /// additions of characters, not just the end result.
-class TestResponseListenerServer
+class KeyboardInputListenerServer
     : public fuchsia::ui::test::input::KeyboardInputListener,
-      public LocalComponent {
+      public LocalComponentImpl {
  public:
-  explicit TestResponseListenerServer(async_dispatcher_t* dispatcher)
+  explicit KeyboardInputListenerServer(async_dispatcher_t* dispatcher)
       : dispatcher_(dispatcher) {}
 
-  TestResponseListenerServer(const TestResponseListenerServer&) = delete;
-  TestResponseListenerServer& operator=(const TestResponseListenerServer&) =
-      delete;
-
   // |fuchsia::ui::test::input::KeyboardInputListener|
   void ReportTextInput(
       fuchsia::ui::test::input::KeyboardInputListenerReportTextInputRequest
           request) override {
     FML_LOG(INFO) << "Flutter app sent: '" << request.text() << "'";
-    response_ = request.text();
+    response_list_.push_back(request.text());
   }
 
   /// Starts this server.
-  void Start(std::unique_ptr<LocalComponentHandles> handles) override {
-    handles_ = std::move(handles);
-
-    ASSERT_EQ(ZX_OK, handles_->outgoing()->AddPublicService(
+  void OnStart() override {
+    FML_LOG(INFO) << "Starting KeyboardInputListenerServer";
+    ASSERT_EQ(ZX_OK, outgoing()->AddPublicService(
                          bindings_.GetHandler(this, dispatcher_)));
   }
 
-  /// Returns true if the last response received matches `expected`.  If a match
-  /// is found, the match is consumed, so a next call to HasResponse starts from
-  /// scratch.
-  bool HasResponse(const std::string& expected) {
-    bool match = response_.has_value() && response_.value() == expected;
-    if (match) {
-      response_ = std::nullopt;
+  /// Returns true if the response vector values matches `expected`
+  bool HasResponse(const std::vector<std::string>& expected) {
+    if (response_list_.size() != expected.size()) {
+      return false;
     }
-    return match;
+
+    // Iterate through the expected vector
+    // Corresponding indices for response_list and expected should contain the
+    // same values
+    for (size_t i = 0; i < expected.size(); ++i) {
+      if (response_list_[i] != expected[i]) {
+        return false;
+      }
+    }
+
+    return true;
   }
 
   // KeyboardInputListener override
-  void ReportReady(ReportReadyCallback) override {}
+  void ReportReady(ReportReadyCallback callback) override {
+    FML_LOG(INFO) << "ReportReady callback ready";
+    ready_ = true;
+    callback();
+  }
 
  private:
-  // Not owned.
   async_dispatcher_t* dispatcher_ = nullptr;
   fidl::BindingSet<fuchsia::ui::test::input::KeyboardInputListener> bindings_;
-  std::unique_ptr<LocalComponentHandles> handles_;
-  std::optional<std::string> response_;
+  std::vector<std::string> response_list_;
+  bool ready_ = false;
 };
 
-class TextInputTest : public ::loop_fixture::RealLoop, public ::testing::Test {
+class TextInputTest : public PortableUITest,
+                      public ::testing::Test,
+                      public ::testing::WithParamInterface<std::string> {
  protected:
-  TextInputTest()
-      : test_response_listener_(
-            std::make_unique<TestResponseListenerServer>(dispatcher())) {}
-
-  bool HasViewConnected(
-      const fuchsia::ui::observation::geometry::ViewTreeWatcherPtr&
-          view_tree_watcher,
-      std::optional<fuchsia::ui::observation::geometry::WatchResponse>&
-          watch_response,
-      zx_koid_t view_ref_koid) {
-    std::optional<fuchsia::ui::observation::geometry::WatchResponse>
-        watch_result;
-    view_tree_watcher->Watch(
-        [&watch_result](auto response) { watch_result = std::move(response); });
-    FML_LOG(INFO) << "Waiting for view tree watch result";
-    RunLoopUntil([&watch_result] { return watch_result.has_value(); });
-    FML_LOG(INFO) << "Received for view tree watch result";
-    if (CheckViewExistsInUpdates(watch_result->updates(), view_ref_koid)) {
-      watch_response = std::move(watch_result);
-    };
-    return watch_response.has_value();
-  }
-
-  void RegisterKeyboard() {
-    FML_LOG(INFO) << "Registering fake keyboard";
-    input_registry_ =
-        realm_root_->Connect<fuchsia::ui::test::input::Registry>();
-    input_registry_.set_error_handler(
-        [](auto) { FML_LOG(ERROR) << "Error from input helper"; });
-    bool keyboard_registered = false;
-    fuchsia::ui::test::input::RegistryRegisterKeyboardRequest request;
-    request.set_device(fake_keyboard_.NewRequest());
-    input_registry_->RegisterKeyboard(
-        std::move(request),
-        [&keyboard_registered]() { keyboard_registered = true; });
-    RunLoopUntil([&keyboard_registered] { return keyboard_registered; });
-    FML_LOG(INFO) << "Keyboard registered";
-  }
-
-  void InitializeScene() {
-    // Instruct Scene Manager to present test's View.
-    std::optional<zx_koid_t> view_ref_koid;
-    scene_provider_ =
-        realm_root_->Connect<fuchsia::ui::test::scene::Controller>();
-    scene_provider_.set_error_handler(
-        [](auto) { FML_LOG(ERROR) << "Error from test scene provider"; });
-    fuchsia::ui::test::scene::ControllerAttachClientViewRequest request;
-    request.set_view_provider(
-        realm_root_->Connect<fuchsia::ui::app::ViewProvider>());
-    scene_provider_->RegisterViewTreeWatcher(view_tree_watcher_.NewRequest(),
-                                             []() {});
-    scene_provider_->AttachClientView(
-        std::move(request), [&view_ref_koid](auto client_view_ref_koid) {
-          view_ref_koid = client_view_ref_koid;
-        });
-
-    FML_LOG(INFO) << "Waiting for client view ref koid";
-    RunLoopUntil([&view_ref_koid] { return view_ref_koid.has_value(); });
-
-    // Wait for the client view to get attached to the view tree.
-    std::optional<fuchsia::ui::observation::geometry::WatchResponse>
-        watch_response;
-    FML_LOG(INFO) << "Waiting for client view to render";
-    RunLoopUntil([this, &watch_response, &view_ref_koid] {
-      return HasViewConnected(view_tree_watcher_, watch_response,
-                              *view_ref_koid);
-    });
-    FML_LOG(INFO) << "Client view has rendered";
-  }
-
-  void BuildRealm() {
-    FML_LOG(INFO) << "Building realm";
-    realm_builder_.AddChild(kTestUiStack, kTestUiStackUrl);
-    realm_builder_.AddLocalChild(kResponseListener,
-                                 test_response_listener_.get());
-    realm_builder_.AddChild(kTextInputView, kTextInputViewUrl);
-
-    // Route base system services to the view and the test UI stack.
-    realm_builder_.AddRoute(Route{
-        .capabilities = {Protocol{fuchsia::logger::LogSink::Name_},
-                         Protocol{fuchsia::sys::Environment::Name_},
-                         Protocol{fuchsia::sysmem::Allocator::Name_},
-                         Protocol{fuchsia::tracing::provider::Registry::Name_},
-                         Protocol{kVulkanLoaderServiceName},
-                         Protocol{kProfileProviderServiceName}},
-        .source = ParentRef{},
-        .targets = {ChildRef{kTestUiStack}, ChildRef{kTextInputView}}});
-
-    // Expose fuchsia.ui.app.ViewProvider from the flutter app.
-    realm_builder_.AddRoute(
-        Route{.capabilities = {Protocol{fuchsia::ui::app::ViewProvider::Name_}},
-              .source = ChildRef{kTextInputView},
-              .targets = {ParentRef()}});
-
-    // Route UI capabilities from test-ui-stack to the flutter app.
-    realm_builder_.AddRoute(Route{
-        .capabilities = {Protocol{fuchsia::ui::composition::Flatland::Name_},
-                         Protocol{fuchsia::ui::composition::Allocator::Name_},
-                         Protocol{fuchsia::ui::input::ImeService::Name_},
-                         Protocol{fuchsia::ui::input3::Keyboard::Name_},
-                         Protocol{fuchsia::ui::scenic::Scenic::Name_}},
-        .source = ChildRef{kTestUiStack},
-        .targets = {ChildRef{kTextInputView}}});
-
-    // Route UI helpers to test driver.
-    realm_builder_.AddRoute(Route{
-        .capabilities = {Protocol{fuchsia::ui::test::input::Registry::Name_},
-                         Protocol{fuchsia::ui::test::scene::Controller::Name_}},
-        .source = ChildRef{kTestUiStack},
-        .targets = {ParentRef{}}});
-
-    // Route crash reporter service to flutter app.
-    realm_builder_.AddRoute(
-        {.capabilities =
-             {
-                 Protocol{fuchsia::feedback::CrashReporter::Name_},
-             },
-         .source = ParentRef(),
-         .targets = {ChildRef{kTextInputView}}});
-
-    // Route text listener from the flutter app to the response listener.
-    realm_builder_.AddRoute(Route{
-        .capabilities =
-            {
-                Protocol{
-                    fuchsia::ui::test::input::KeyboardInputListener::Name_},
-            },
-        .source = ChildRef{kResponseListener},
-        .targets = {ChildRef{kTextInputView}}});
-
-    realm_root_ = std::make_unique<RealmRoot>(realm_builder_.Build());
-  }
-
   void SetUp() override {
+    PortableUITest::SetUp();
+
     // Post a "just in case" quit task, if the test hangs.
     async::PostDelayedTask(
         dispatcher(),
@@ -268,39 +142,96 @@ class TextInputTest : public ::loop_fixture::RealLoop, public ::testing::Test {
         },
         kTimeout);
 
-    BuildRealm();
+    // Get the display dimensions.
+    FML_LOG(INFO)
+        << "Waiting for display info from fuchsia.ui.display.singleton.Info";
+    fuchsia::ui::display::singleton::InfoPtr display_info =
+        realm_root()
+            ->component()
+            .Connect<fuchsia::ui::display::singleton::Info>();
+    display_info->GetMetrics(
+        [this](fuchsia::ui::display::singleton::Metrics metrics) {
+          display_width_ = metrics.extent_in_px().width;
+          display_height_ = metrics.extent_in_px().height;
+          FML_LOG(INFO) << "Got display_width = " << display_width_
+                        << " and display_height = " << display_height_;
+        });
+    RunLoopUntil(
+        [this] { return display_width_ != 0 && display_height_ != 0; });
 
+    // Register input injection device.
+    FML_LOG(INFO) << "Registering input injection device";
     RegisterKeyboard();
-
-    InitializeScene();
   }
 
-  std::unique_ptr<TestResponseListenerServer> test_response_listener_;
+  // Guaranteed to be initialized after SetUp().
+  uint32_t display_width() const { return display_width_; }
+  uint32_t display_height() const { return display_height_; }
+
+  std::string GetTestUIStackUrl() override { return GetParam(); };
+
+  KeyboardInputListenerServer* keyboard_input_listener_server_;
 
-  fuchsia::ui::test::input::RegistryPtr input_registry_;
-  fuchsia::ui::test::input::KeyboardPtr fake_keyboard_;
-  fuchsia::ui::test::scene::ControllerPtr scene_provider_;
-  fuchsia::ui::observation::geometry::ViewTreeWatcherPtr view_tree_watcher_;
+ private:
+  void ExtendRealm() override {
+    FML_LOG(INFO) << "Extending realm";
+    // Key part of service setup: have this test component vend the
+    // |KeyboardInputListener| service in the constructed realm.
+    auto keyboard_input_listener_server =
+        std::make_unique<KeyboardInputListenerServer>(dispatcher());
+    keyboard_input_listener_server_ = keyboard_input_listener_server.get();
+    realm_builder()->AddLocalChild(
+        kKeyboardInputListener,
+        [keyboard_input_listener_server =
+             std::move(keyboard_input_listener_server)]() mutable {
+          return std::move(keyboard_input_listener_server);
+        });
 
-  RealmBuilder realm_builder_ = RealmBuilder::Create();
-  std::unique_ptr<RealmRoot> realm_root_;
+    // Add text-input-view to the Realm
+    realm_builder()->AddChild(kTextInputView, kTextInputViewUrl,
+                              component_testing::ChildOptions{
+                                  .environment = kFlutterRunnerEnvironment,
+                              });
+
+    // Route KeyboardInputListener to the runner and Flutter app
+    realm_builder()->AddRoute(
+        Route{.capabilities = {Protocol{
+                  fuchsia::ui::test::input::KeyboardInputListener::Name_}},
+              .source = kKeyboardInputListenerRef,
+              .targets = {kFlutterJitRunnerRef, kTextInputViewRef}});
+
+    // Expose fuchsia.ui.app.ViewProvider from the flutter app.
+    realm_builder()->AddRoute(
+        Route{.capabilities = {Protocol{fuchsia::ui::app::ViewProvider::Name_}},
+              .source = kTextInputViewRef,
+              .targets = {ParentRef()}});
+
+    realm_builder()->AddRoute(Route{
+        .capabilities =
+            {Protocol{fuchsia::ui::input3::Keyboard::Name_},
+             Protocol{"fuchsia.accessibility.semantics.SemanticsManager"}},
+        .source = kTestUIStackRef,
+        .targets = {ParentRef(), kFlutterJitRunnerRef}});
+  }
 };
 
-TEST_F(TextInputTest, FlutterTextFieldEntry) {
-  FML_LOG(INFO) << "Wait for the initial text response";
-  RunLoopUntil([&] { return test_response_listener_->HasResponse(""); });
+INSTANTIATE_TEST_SUITE_P(TextInputTestParameterized,
+                         TextInputTest,
+                         ::testing::Values(kTestUIStackUrl));
+
+TEST_P(TextInputTest, TextInput) {
+  // Launch view
+  FML_LOG(INFO) << "Initializing scene";
+  LaunchClient();
+  FML_LOG(INFO) << "Client launched";
 
-  FML_LOG(INFO) << "Sending a text message";
-  bool done = false;
-  fuchsia::ui::test::input::KeyboardSimulateUsAsciiTextEntryRequest request;
-  request.set_text("Hello\nworld!");
-  fake_keyboard_->SimulateUsAsciiTextEntry(std::move(request),
-                                           [&done]() { done = true; });
-  RunLoopUntil([&] { return done; });
-  FML_LOG(INFO) << "Message was sent";
+  SimulateTextEntry("Hello\nworld!");
+  std::vector<std::string> expected = {"LEFT_SHIFT", "H",    "E", "L", "L", "O",
+                                       "ENTER",      "W",    "O", "R", "L", "D",
+                                       "LEFT_SHIFT", "KEY_1"};
 
   RunLoopUntil(
-      [&] { return test_response_listener_->HasResponse("Hello\nworld!"); });
+      [&] { return keyboard_input_listener_server_->HasResponse(expected); });
 }
 
 }  // namespace
diff --git a/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/BUILD.gn
index 24219ea200dfd1e04cbc70ede7b8a671cf1b1de4..5ec7ed603cc21e8a231dbc791e8ffe634bdd8006 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/BUILD.gn
+++ b/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/BUILD.gn
@@ -2,22 +2,17 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/fuchsia/sdk.gni")
 import("//flutter/tools/fuchsia/dart/dart_library.gni")
 import("//flutter/tools/fuchsia/flutter/flutter_component.gni")
-import("//flutter/tools/fuchsia/gn-sdk/component.gni")
-import("//flutter/tools/fuchsia/gn-sdk/package.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/component.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/package.gni")
 
 dart_library("lib") {
   testonly = true
   package_name = "text-input-view"
   sources = [ "text_input_view.dart" ]
-  deps = [
-    "//flutter/shell/platform/fuchsia/dart:args",
-    "//flutter/tools/fuchsia/dart:fuchsia_services",
-    "//flutter/tools/fuchsia/dart:zircon",
-    "//flutter/tools/fuchsia/fidl:fuchsia.ui.test.input",
-  ]
+  deps = [ "//flutter/shell/platform/fuchsia/dart:args" ]
 }
 
 flutter_component("component") {
@@ -29,18 +24,8 @@ flutter_component("component") {
   deps = [ ":lib" ]
 }
 
-fuchsia_component("realm") {
-  testonly = true
-  manifest = "meta/text-input-view-realm.cml"
-  manifest_output_name = "text-input-view-realm.cm"
-  deps = [ ":component" ]
-}
-
 fuchsia_package("package") {
   testonly = true
   package_name = "text-input-view"
-  deps = [
-    ":component",
-    ":realm",
-  ]
+  deps = [ ":component" ]
 }
diff --git a/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/lib/text_input_view.dart b/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/lib/text_input_view.dart
index 83e70afac3631faca9bfa2752e900175d71c623c..d3a318e3b248dbf06e82a83c3afc8f48fc2490b9 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/lib/text_input_view.dart
+++ b/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/lib/text_input_view.dart
@@ -8,14 +8,100 @@
 
 import 'dart:convert';
 import 'dart:typed_data';
-import 'dart:io';
 import 'dart:ui';
 
-import 'package:fidl_fuchsia_ui_test_input/fidl_async.dart' as test_text;
-import 'package:fuchsia_services/services.dart';
+// Corresponds to the USB HID values provided in fidl.fuchsia.input
+// https://fuchsia.dev/reference/fidl/fuchsia.input
+final Map<int, String> hidToKey = {
+  458977: 'LEFT_SHIFT', // Keyboard Left Shift
+  458792: 'ENTER', // Keyboard Enter (Return)
+  458782: 'KEY_1', // Keyboard 1 and !
+  458763: 'H', // Keyboard h and H
+  458760: 'E', // Keyboard e and E
+  458767: 'L', // Keyboard l and L
+  458770: 'O', // Keyboard o and O
+  458778: 'W', // Keyboard w and W
+  458773: 'R', // Keyboard r and R
+  458759: 'D', // Keyboard d and D
+};
 
 int main() {
-  // TODO(https://fxbug.dev/107917): Port https://cs.opensource.google/fuchsia/fuchsia/+/main:src/ui/tests/integration_input_tests/text-input/text-input-flutter/lib/text-input-flutter.dart
-  // to dart:ui.
-  print('text-input-view: starting');
+  final bool soundNullSafety = <int?>[null] is! List<int>;
+  print('Launching text-input-view. Sound null safety: $soundNullSafety');
+  TestApp app = TestApp();
+  app.run();
+  return 0;
+}
+
+class TestApp {
+  static const _yellow = Color.fromARGB(255, 255, 255, 0);
+  Color _backgroundColor = _yellow;
+
+  void run() {
+    // Set up window callbacks
+    window.onPlatformMessage =
+        (String name, ByteData? data, PlatformMessageResponseCallback? callback) {
+      this.decodeAndReportPlatformMessage(name, data!);
+    };
+    window.onMetricsChanged = () {
+      window.scheduleFrame();
+    };
+    window.onBeginFrame = (Duration duration) {
+      this.beginFrame(duration);
+    };
+
+    window.scheduleFrame();
+  }
+
+  void beginFrame(Duration duration) {
+    // Convert physical screen size of device to values
+    final pixelRatio = window.devicePixelRatio;
+    final size = window.physicalSize / pixelRatio;
+    final physicalBounds = Offset.zero & size * pixelRatio;
+    final windowBounds = Offset.zero & size;
+    // Set up a Canvas that uses the screen size
+    final recorder = PictureRecorder();
+    final canvas = Canvas(recorder, physicalBounds);
+    canvas.scale(pixelRatio, pixelRatio);
+    // Draw something
+    final paint = Paint()..color = this._backgroundColor;
+    canvas.drawRect(windowBounds, paint);
+    // Build the scene
+    final picture = recorder.endRecording();
+    final sceneBuilder = SceneBuilder()
+      ..pushClipRect(physicalBounds)
+      ..addPicture(Offset.zero, picture)
+      ..pop();
+    window.render(sceneBuilder.build());
+  }
+
+  void decodeAndReportPlatformMessage(String name, ByteData data) async {
+    final buffer = data.buffer;
+    var list = buffer.asUint8List(data.offsetInBytes, data.lengthInBytes);
+    var decoded = utf8.decode(list);
+    var decodedJson = json.decode(decoded);
+    print('received ${name} platform message: ${decodedJson}');
+
+    if (name == "flutter/keyevent" && decodedJson["type"] == "keydown") {
+      if (hidToKey[decodedJson["hidUsage"]] != null) {
+        _reportTextInput(hidToKey[decodedJson["hidUsage"]!]!);
+      }
+    }
+
+    window.scheduleFrame();
+  }
+
+  void _reportTextInput(String text) {
+    print('text-input-view reporting keyboard input to KeyboardInputListener');
+
+    final message = utf8
+        .encode(json.encode({
+          'method': 'KeyboardInputListener.ReportTextInput',
+          'text': text,
+        }))
+        .buffer
+        .asByteData();
+    PlatformDispatcher.instance
+        .sendPlatformMessage('fuchsia/input_test', message, null);
+  }
 }
diff --git a/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/meta/text-input-view-realm.cml b/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/meta/text-input-view-realm.cml
deleted file mode 100644
index d95699769dcd083b88c93bb3975694a9a0c39373..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/meta/text-input-view-realm.cml
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-{
-    children: [
-        {
-            name: "flutter_jit_runner",
-            url: "fuchsia-pkg://fuchsia.com/flutter_jit_runner#meta/flutter_jit_runner.cm",
-        },
-        {
-            name: "text_input_view",
-            url: "#meta/text-input-view.cm",
-            environment: "#text_input_view_env",
-        },
-    ],
-    offer: [
-        {
-            protocol: [
-                "fuchsia.logger.LogSink",
-                "fuchsia.memorypressure.Provider",
-                "fuchsia.posix.socket.Provider",
-                "fuchsia.sysmem.Allocator",
-                "fuchsia.tracing.provider.Registry",
-                "fuchsia.ui.composition.Allocator",
-                "fuchsia.ui.composition.Flatland",
-                "fuchsia.ui.input.ImeService",
-                "fuchsia.ui.input3.Keyboard",
-                "fuchsia.ui.scenic.Scenic",
-                "fuchsia.vulkan.loader.Loader",
-            ],
-            from: "parent",
-            to: [
-                "#flutter_jit_runner",
-                "#text_input_view",
-            ],
-        },
-        {
-            protocol: [ "fuchsia.ui.test.input.KeyboardInputListener" ],
-            from: "parent",
-            to: "#text_input_view",
-        },
-    ],
-    expose: [
-        {
-            protocol: [ "fuchsia.ui.app.ViewProvider" ],
-            from: "#text_input_view",
-            to: "parent",
-        },
-    ],
-    environments: [
-        {
-            name: "text_input_view_env",
-            extends: "realm",
-            runners: [
-                {
-                    runner: "flutter_jit_runner",
-                    from: "#flutter_jit_runner",
-                },
-            ],
-        },
-    ],
-}
diff --git a/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/meta/text-input-view.cml b/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/meta/text-input-view.cml
index 471f1c1c569b53d7b91bb008073311c39d6a56ad..901c136829f40de3f84cf78ec68bd49a42320436 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/meta/text-input-view.cml
+++ b/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/meta/text-input-view.cml
@@ -4,7 +4,7 @@
 {
     include: [ "syslog/client.shard.cml" ],
     program: {
-        data: "data/text_input_view",
+        data: "data/text-input-view",
 
         // Always use the jit runner for now.
         // TODO(fxbug.dev/106577): Implement manifest merging build rules for V2 components.
@@ -12,26 +12,17 @@
     },
     capabilities: [
         {
-            protocol: [ "fuchsia.ui.app.ViewProvider" ],
+            protocol: [ "fuchsia.ui.app.ViewProvider", "fuchsia.settings.Keyboard" ],
         },
     ],
     use: [
         {
-            protocol: [
-                "fuchsia.logger.LogSink",
-                "fuchsia.sysmem.Allocator",
-                "fuchsia.tracing.provider.Registry",
-                "fuchsia.ui.input.ImeService",
-                "fuchsia.ui.input3.Keyboard",
-                "fuchsia.ui.scenic.Scenic",
-                "fuchsia.ui.test.input.KeyboardInputListener",
-                "fuchsia.vulkan.loader.Loader",
-            ],
+            protocol: [ "fuchsia.ui.test.input.KeyboardInputListener", "fuchsia.settings.Keyboard" ],
         },
     ],
     expose: [
         {
-            protocol: [ "fuchsia.ui.app.ViewProvider" ],
+            protocol: [ "fuchsia.ui.app.ViewProvider", "fuchsia.settings.Keyboard" ],
             from: "self",
         },
     ],
diff --git a/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/pubspec.yaml b/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/pubspec.yaml
index 30c6e7096ef8c3d9a97acda246fcba396b7a1b43..21d9b7d9c0917350b3735e3c1147ab724e0b790e 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/pubspec.yaml
+++ b/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/pubspec.yaml
@@ -5,4 +5,4 @@
 name: text-input-view
 
 environment:
-  sdk: '>=2.18.0 <3.0.0'
+  sdk: '>=3.2.0-0 <4.0.0'
diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn
index 051fc40bbf33b2359b39d245dcfb2f73c77e2f0b..984456cbbb004d9194e7b505ab1da70aa51b4d10 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn
+++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn
@@ -4,9 +4,9 @@
 
 assert(is_fuchsia)
 
-import("//build/fuchsia/sdk.gni")
 import("//flutter/tools/fuchsia/fuchsia_archive.gni")
-import("//flutter/tools/fuchsia/gn-sdk/package.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/package.gni")
 
 group("tests") {
   testonly = true
@@ -18,41 +18,39 @@ executable("touch-input-test-bin") {
   output_name = "touch-input-test"
   sources = [ "touch-input-test.cc" ]
 
-  # This is needed for //third_party/googletest for linking zircon symbols.
-  libs = [ "$fuchsia_sdk_path/arch/$target_cpu/sysroot/lib/libzircon.so" ]
+  # This is needed for //flutter/third_party/googletest for linking zircon
+  # symbols.
+  libs = [ "${fuchsia_arch_root}/sysroot/lib/libzircon.so" ]
 
   deps = [
-    "$fuchsia_sdk_root/fidl:fuchsia.accessibility.semantics",
-    "$fuchsia_sdk_root/fidl:fuchsia.buildinfo",
-    "$fuchsia_sdk_root/fidl:fuchsia.component",
-    "$fuchsia_sdk_root/fidl:fuchsia.fonts",
-    "$fuchsia_sdk_root/fidl:fuchsia.intl",
-    "$fuchsia_sdk_root/fidl:fuchsia.kernel",
-    "$fuchsia_sdk_root/fidl:fuchsia.memorypressure",
-    "$fuchsia_sdk_root/fidl:fuchsia.metrics",
-    "$fuchsia_sdk_root/fidl:fuchsia.net.interfaces",
-    "$fuchsia_sdk_root/fidl:fuchsia.tracing.provider",
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.app",
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.input",
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.pointerinjector",
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.policy",
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.scenic",
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.test.input",
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.test.scene",
-    "$fuchsia_sdk_root/fidl:fuchsia.web",
-    "$fuchsia_sdk_root/pkg:async",
-    "$fuchsia_sdk_root/pkg:async-loop-testing",
-    "$fuchsia_sdk_root/pkg:fidl_cpp",
-    "$fuchsia_sdk_root/pkg:scenic_cpp",
-    "$fuchsia_sdk_root/pkg:sys_component_cpp_testing",
-    "$fuchsia_sdk_root/pkg:zx",
+    "${fuchsia_sdk}/fidl/fuchsia.accessibility.semantics",
+    "${fuchsia_sdk}/fidl/fuchsia.buildinfo",
+    "${fuchsia_sdk}/fidl/fuchsia.component",
+    "${fuchsia_sdk}/fidl/fuchsia.fonts",
+    "${fuchsia_sdk}/fidl/fuchsia.intl",
+    "${fuchsia_sdk}/fidl/fuchsia.kernel",
+    "${fuchsia_sdk}/fidl/fuchsia.memorypressure",
+    "${fuchsia_sdk}/fidl/fuchsia.metrics",
+    "${fuchsia_sdk}/fidl/fuchsia.net.interfaces",
+    "${fuchsia_sdk}/fidl/fuchsia.tracing.provider",
+    "${fuchsia_sdk}/fidl/fuchsia.ui.app",
+    "${fuchsia_sdk}/fidl/fuchsia.ui.display.singleton",
+    "${fuchsia_sdk}/fidl/fuchsia.ui.input",
+    "${fuchsia_sdk}/fidl/fuchsia.ui.pointerinjector",
+    "${fuchsia_sdk}/fidl/fuchsia.ui.test.input",
+    "${fuchsia_sdk}/fidl/fuchsia.ui.test.scene",
+    "${fuchsia_sdk}/fidl/fuchsia.web",
+    "${fuchsia_sdk}/pkg/async",
+    "${fuchsia_sdk}/pkg/async-loop-testing",
+    "${fuchsia_sdk}/pkg/fidl_cpp",
+    "${fuchsia_sdk}/pkg/sys_component_cpp_testing",
+    "${fuchsia_sdk}/pkg/zx",
     "embedding-flutter-view:package",
     "touch-input-view:package",
-    "//build/fuchsia/fidl:fuchsia.ui.gfx",
     "//flutter/fml",
     "//flutter/shell/platform/fuchsia/flutter/tests/integration/utils:portable_ui_test",
-    "//third_party/googletest:gtest",
-    "//third_party/googletest:gtest_main",
+    "//flutter/third_party/googletest:gtest",
+    "//flutter/third_party/googletest:gtest_main",
   ]
 }
 
diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/README.md b/shell/platform/fuchsia/flutter/tests/integration/touch-input/README.md
index 006236a21c8ab31ee7b78089507305cf301e0483..61c23e9aa5b8c67f942dc0108fd27932f084f89f 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/README.md
+++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/README.md
@@ -41,9 +41,9 @@ Reference the Flutter integration test [documentation](https://github.com/flutte
 
 ## Playing around with `touch-input-view`
 
-Build Fuchsia with `workstation_eng.qemu-x64`
+Build Fuchsia with `terminal.qemu-x64`
 ```shell
-fx set workstation_eng.qemu-x64 && fx build
+fx set terminal.qemu-x64 && fx build
 ```
 
 Build flutter/engine
diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/BUILD.gn
index 665050687076d2733222c8aae56fd2d896ddd628..e532a158c8749220a10fe26029f66eb039c6eafb 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/BUILD.gn
+++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/BUILD.gn
@@ -2,23 +2,19 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/fuchsia/sdk.gni")
 import("//flutter/tools/fuchsia/dart/dart_library.gni")
 import("//flutter/tools/fuchsia/flutter/flutter_component.gni")
-import("//flutter/tools/fuchsia/gn-sdk/component.gni")
-import("//flutter/tools/fuchsia/gn-sdk/package.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/component.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/package.gni")
 
 dart_library("lib") {
   package_name = "embedding-flutter-view"
   sources = [ "embedding-flutter-view.dart" ]
 
   deps = [
-    "//flutter/tools/fuchsia/dart:fuchsia_services",
-    "//flutter/tools/fuchsia/dart:zircon",
-    "//flutter/tools/fuchsia/fidl:fuchsia.ui.app",
-    "//flutter/tools/fuchsia/fidl:fuchsia.ui.scenic",
-    "//flutter/tools/fuchsia/fidl:fuchsia.ui.test.input",
-    "//flutter/tools/fuchsia/fidl:fuchsia.ui.views",
+    "//flutter/shell/platform/fuchsia/dart:args",
+    "//flutter/shell/platform/fuchsia/dart:vector_math",
   ]
 }
 
diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/lib/embedding-flutter-view.dart b/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/lib/embedding-flutter-view.dart
index 745556bccc20bb598ff1cefee9da39df11b08755..39a161a05ee44c39197df97796e786b26d3bb0af 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/lib/embedding-flutter-view.dart
+++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/lib/embedding-flutter-view.dart
@@ -2,20 +2,37 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:async';
 import 'dart:convert';
 import 'dart:typed_data';
 import 'dart:io';
 import 'dart:ui';
+import 'dart:zircon';
 
-import 'package:fidl_fuchsia_ui_app/fidl_async.dart';
-import 'package:fidl_fuchsia_ui_views/fidl_async.dart';
-import 'package:fidl_fuchsia_ui_test_input/fidl_async.dart' as test_touch;
-import 'package:fuchsia_services/services.dart';
-import 'package:zircon/zircon.dart';
+import 'package:args/args.dart';
+import 'package:vector_math/vector_math_64.dart' as vector_math_64;
 
-void main(List<String> args) {
+final _argsCsvFilePath = '/config/data/args.csv';
+
+void main(List<String> args) async {
   print('Launching embedding-flutter-view');
-  TestApp app = TestApp(ChildView.gfx(_launchGfxChildView()));
+
+  args = args + _GetArgsFromConfigFile();
+  final parser = ArgParser()
+    ..addFlag('showOverlay', defaultsTo: false)
+    ..addFlag('focusable', defaultsTo: true);
+
+  final arguments = parser.parse(args);
+  for (final option in arguments.options) {
+    print('embedding-flutter-view args: $option: ${arguments[option]}');
+  }
+
+  TestApp app = TestApp(
+    ChildView(await _launchChildView()),
+    showOverlay: arguments['showOverlay'],
+    focusable: arguments['focusable'],
+  );
+
   app.run();
 }
 
@@ -24,14 +41,19 @@ class TestApp {
   static const _blue = Color.fromARGB(255, 0, 0, 255);
 
   final ChildView childView;
-  final _responseListener = test_touch.TouchInputListenerProxy();
+  final bool showOverlay;
+  final bool focusable;
 
   Color _backgroundColor = _blue;
 
-  TestApp(this.childView) {}
+  TestApp(
+    this.childView,
+    {this.showOverlay = false,
+    this.focusable = true}) {
+  }
 
   void run() {
-    childView.create((ByteData reply) {
+    childView.create(focusable, (ByteData? reply) {
         // Set up window callbacks.
         window.onPointerDataPacket = (PointerDataPacket packet) {
           this.pointerDataPacket(packet);
@@ -67,13 +89,52 @@ class TestApp {
     final sceneBuilder = SceneBuilder()
       ..pushClipRect(physicalBounds)
       ..addPicture(Offset.zero, picture);
-    // Child view should take up half the screen
-    final childPhysicalSize = window.physicalSize * 0.5;
+
+    final childPhysicalSize = window.physicalSize * 0.25;
+    // Alignment.center
+    final windowCenter = size.center(Offset.zero);
+    final windowPhysicalCenter = window.physicalSize.center(Offset.zero);
+    final childPhysicalOffset = windowPhysicalCenter - childPhysicalSize.center(Offset.zero);
+
     sceneBuilder
+      ..pushTransform(
+        vector_math_64.Matrix4.translationValues(childPhysicalOffset.dx,
+                                                 childPhysicalOffset.dy,
+                                                 0.0).storage)
       ..addPlatformView(childView.viewId,
                         width: childPhysicalSize.width,
-                        height: size.height)
+                        height: childPhysicalSize.height)
       ..pop();
+
+    if (showOverlay) {
+      final containerSize = size * 0.5;
+      // Alignment.center
+      final containerOffset = windowCenter - containerSize.center(Offset.zero);
+
+      final overlaySize = containerSize * 0.5;
+      // Alignment.topRight
+      final overlayOffset = Offset(
+        containerOffset.dx + containerSize.width - overlaySize.width,
+        containerOffset.dy);
+      final overlayPhysicalSize = overlaySize * pixelRatio;
+      final overlayPhysicalOffset = overlayOffset * pixelRatio;
+      final overlayPhysicalBounds = overlayPhysicalOffset & overlayPhysicalSize;
+
+      final recorder = PictureRecorder();
+      final overlayCullRect = Offset.zero & overlayPhysicalSize; // in canvas physical coordinates
+      final canvas = Canvas(recorder, overlayCullRect);
+      canvas.scale(pixelRatio);
+
+      final paint = Paint()..color = Color.fromARGB(255, 0, 255, 0);
+      canvas.drawRect(Offset.zero & overlaySize, paint);
+
+      final overlayPicture = recorder.endRecording();
+      sceneBuilder
+        ..pushClipRect(overlayPhysicalBounds) // in window physical coordinates
+        ..addPicture(overlayPhysicalOffset, overlayPicture)
+        ..pop();
+    }
+
     sceneBuilder.pop();
     window.render(sceneBuilder.build());
   }
@@ -89,50 +150,47 @@ class TestApp {
       }
 
       if (data.change == PointerChange.down || data.change == PointerChange.move) {
-        Incoming.fromSvcPath()
-          ..connectToService(_responseListener)
-          ..close();
-
-        _respond(test_touch.TouchInputListenerReportTouchInputRequest(
+        _reportTouchInput(
           localX: data.physicalX,
           localY: data.physicalY,
           timeReceived: nowNanos,
-          componentName: 'embedding-flutter-view',
-        ));
+        );
       }
     }
 
     window.scheduleFrame();
   }
 
-  void _respond(test_touch.TouchInputListenerReportTouchInputRequest request) async {
+  void _reportTouchInput({required double localX, required double localY, required int timeReceived}) {
     print('embedding-flutter-view reporting touch input to TouchInputListener');
-    await _responseListener.reportTouchInput(request);
+    final message = utf8.encode(json.encode({
+      'method': 'TouchInputListener.ReportTouchInput',
+      'local_x': localX,
+      'local_y': localY,
+      'time_received': timeReceived,
+      'component_name': 'embedding-flutter-view',
+    })).buffer.asByteData();
+    PlatformDispatcher.instance.sendPlatformMessage('fuchsia/input_test', message, null);
   }
 }
 
 class ChildView {
-  final ViewHolderToken viewHolderToken;
-  final ViewportCreationToken viewportCreationToken;
   final int viewId;
 
-  ChildView(this.viewportCreationToken) : viewHolderToken = null, viewId = viewportCreationToken.value.handle.handle {
-    assert(viewId != null);
-  }
+  ChildView(this.viewId);
 
-  ChildView.gfx(this.viewHolderToken) : viewportCreationToken = null, viewId = viewHolderToken.value.handle.handle {
-    assert(viewId != null);
-  }
-
-  void create(PlatformMessageResponseCallback callback) {
+  void create(
+    bool focusable,
+    PlatformMessageResponseCallback callback) {
     // Construct the dart:ui platform message to create the view, and when the
     // return callback is invoked, build the scene. At that point, it is safe
     // to embed the child view in the scene.
     final viewOcclusionHint = Rect.zero;
     final Map<String, dynamic> args = <String, dynamic>{
       'viewId': viewId,
+      // Flatland doesn't support disabling hit testing.
       'hitTestable': true,
-      'focusable': true,
+      'focusable': focusable,
       'viewOcclusionHintLTRB': <double>[
         viewOcclusionHint.left,
         viewOcclusionHint.top,
@@ -141,7 +199,7 @@ class ChildView {
       ],
     };
 
-    final ByteData createViewMessage = utf8.encoder.convert(
+    final ByteData createViewMessage = utf8.encode(
       json.encode(<String, Object>{
         'method': 'View.create',
         'args': args,
@@ -157,19 +215,26 @@ class ChildView {
   }
 }
 
-ViewHolderToken _launchGfxChildView() {
-  ViewProviderProxy viewProvider = ViewProviderProxy();
-  Incoming.fromSvcPath()
-    ..connectToService(viewProvider)
-    ..close();
+Future<int> _launchChildView() async {
+  final message = Int8List.fromList([0x31]);
+  final completer = new Completer<ByteData>();
+  PlatformDispatcher.instance.sendPlatformMessage(
+      'fuchsia/child_view', ByteData.sublistView(message), (ByteData? reply) {
+    completer.complete(reply!);
+  });
 
-  final viewTokens = EventPairPair();
-  assert(viewTokens.status == ZX.OK);
-  final viewHolderToken = ViewHolderToken(value: viewTokens.first);
-  final viewToken = ViewToken(value: viewTokens.second);
+  return int.parse(
+      ascii.decode(((await completer.future).buffer.asUint8List())));
+}
 
-  viewProvider.createView(viewToken.value, null, null);
-  viewProvider.ctrl.close();
 
-  return viewHolderToken;
+List<String> _GetArgsFromConfigFile() {
+  List<String> args;
+  final f = File(_argsCsvFilePath);
+  if (!f.existsSync()) {
+    return List.empty();
+  }
+  final fileContentCsv = f.readAsStringSync();
+  args = fileContentCsv.split('\n');
+  return args;
 }
diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/meta/embedding-flutter-view.cml b/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/meta/embedding-flutter-view.cml
index f55ac3507b2c8ffda73248f9f6a63f25a67f7a48..ead254908f27961fef7e6780e7cfff4ff3af67fb 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/meta/embedding-flutter-view.cml
+++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/meta/embedding-flutter-view.cml
@@ -25,7 +25,6 @@
         {
             protocol: [
                 "fuchsia.ui.app.ViewProvider",
-                "fuchsia.ui.scenic.Scenic",
                 "fuchsia.ui.test.input.TouchInputListener",
             ]
         },
diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/pubspec.yaml b/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/pubspec.yaml
index fcd78ccdc8d9a6ea707e786903aadc7c9cf3e9fe..e929bdaaa7518b4b730cb8ef307f08c90ef209d1 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/pubspec.yaml
+++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/pubspec.yaml
@@ -5,4 +5,4 @@
 name: embedding-flutter-view
 
 environment:
-  sdk: '>=2.18.0 <3.0.0'
+  sdk: '>=3.2.0-0 <4.0.0'
diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/meta/gtest_runner.shard.cml b/shell/platform/fuchsia/flutter/tests/integration/touch-input/meta/gtest_runner.shard.cml
deleted file mode 100644
index d9871b70f3022b5a28f93581d65362348c52905b..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/meta/gtest_runner.shard.cml
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-{
-    program: {
-        runner: "gtest_runner",
-    },
-    capabilities: [
-        { protocol: "fuchsia.test.Suite" },
-    ],
-    expose: [
-        {
-            protocol: "fuchsia.test.Suite",
-            from: "self",
-        },
-    ],
-}
diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/meta/touch-input-test.cml b/shell/platform/fuchsia/flutter/tests/integration/touch-input/meta/touch-input-test.cml
index 2e24ff66dff3d3869ed449db486013a26b687325..e02e3b7de72c6951c81664a5d9711c2bc72bea1f 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/meta/touch-input-test.cml
+++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/meta/touch-input-test.cml
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 {
     include: [
-        "gtest_runner.shard.cml",
+        "sys/testing/gtest_runner.shard.cml",
         "sys/component/realm_builder_absolute.shard.cml",
 
         // This test needs both the vulkan facet and the hermetic-tier-2 facet,
@@ -25,6 +25,7 @@
             // Offer capabilities needed by components in this test realm.
             // Keep it minimal, describe only what's actually needed.
             protocol: [
+                "fuchsia.inspect.InspectSink",
                 "fuchsia.kernel.RootJobForInspect",
                 "fuchsia.kernel.Stats",
                 "fuchsia.logger.LogSink",
@@ -33,7 +34,6 @@
                 "fuchsia.tracing.provider.Registry",
                 "fuchsia.ui.input.ImeService",
                 "fuchsia.vulkan.loader.Loader",
-                "fuchsia.ui.scenic.Scenic",
                 "fuchsia.ui.test.input.TouchInputListener",
                 "fuchsia.intl.PropertyProvider",
                 "fuchsia.posix.socket.Provider",
@@ -55,7 +55,7 @@
         "fuchsia.test": {
             "deprecated-allowed-packages": [
                 "embedding-flutter-view",
-                "gfx-root-presenter-test-ui-stack",
+                "flatland-scene-manager-test-ui-stack",
                 "oot_flutter_aot_runner",
                 "oot_flutter_jit_runner",
                 "oot_flutter_jit_product_runner",
diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-test.cc b/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-test.cc
index 9ebf909be443702c5a85969784d19bced90c6a6e..913ce128b5876abd9333f98a228ca9179d033ec5 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-test.cc
+++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-test.cc
@@ -14,9 +14,8 @@
 #include <fuchsia/sysmem/cpp/fidl.h>
 #include <fuchsia/tracing/provider/cpp/fidl.h>
 #include <fuchsia/ui/app/cpp/fidl.h>
+#include <fuchsia/ui/display/singleton/cpp/fidl.h>
 #include <fuchsia/ui/input/cpp/fidl.h>
-#include <fuchsia/ui/policy/cpp/fidl.h>
-#include <fuchsia/ui/scenic/cpp/fidl.h>
 #include <fuchsia/ui/test/input/cpp/fidl.h>
 #include <fuchsia/ui/test/scene/cpp/fidl.h>
 #include <fuchsia/web/cpp/fidl.h>
@@ -26,9 +25,6 @@
 #include <lib/sys/component/cpp/testing/realm_builder.h>
 #include <lib/sys/component/cpp/testing/realm_builder_types.h>
 #include <lib/sys/cpp/component_context.h>
-#include <lib/ui/scenic/cpp/resources.h>
-#include <lib/ui/scenic/cpp/session.h>
-#include <lib/ui/scenic/cpp/view_token_pair.h>
 #include <lib/zx/clock.h>
 #include <lib/zx/time.h>
 #include <zircon/status.h>
@@ -51,13 +47,12 @@
 // This test exercises the touch input dispatch path from Input Pipeline to a
 // Scenic client. It is a multi-component test, and carefully avoids sleeping or
 // polling for component coordination.
-// - It runs real Root Presenter, Input Pipeline, and Scenic components.
+// - It runs real Scene Manager and Scenic components.
 // - It uses a fake display controller; the physical device is unused.
 //
 // Components involved
 // - This test program
-// - Input Pipeline
-// - Root Presenter
+// - Scene Manager
 // - Scenic
 // - Child view, a Scenic client
 //
@@ -66,7 +61,7 @@
 //
 // Setup sequence
 // - The test sets up this view hierarchy:
-//   - Top level scene, owned by Root Presenter.
+//   - Top level scene, owned by Scene Manager.
 //   - Child view, owned by the ui client.
 // - The test waits for a Scenic event that verifies the child has UI content in
 // the scene graph.
@@ -112,8 +107,8 @@ namespace {
 // Types imported for the realm_builder library.
 using component_testing::ChildRef;
 using component_testing::ConfigValue;
-using component_testing::LocalComponent;
-using component_testing::LocalComponentHandles;
+using component_testing::DirectoryContents;
+using component_testing::LocalComponentImpl;
 using component_testing::ParentRef;
 using component_testing::Protocol;
 using component_testing::Realm;
@@ -129,7 +124,7 @@ using RealmBuilder = component_testing::RealmBuilder;
 constexpr zx::duration kTimeout = zx::min(1);
 
 constexpr auto kTestUIStackUrl =
-    "fuchsia-pkg://fuchsia.com/gfx-root-presenter-test-ui-stack#meta/"
+    "fuchsia-pkg://fuchsia.com/flatland-scene-manager-test-ui-stack#meta/"
     "test-ui-stack.cm";
 
 constexpr auto kMockTouchInputListener = "touch_input_listener";
@@ -150,17 +145,17 @@ bool CompareDouble(double f0, double f1, double epsilon) {
 }
 
 // This component implements the TouchInput protocol
-// and the interface for a RealmBuilder LocalComponent. A LocalComponent
+// and the interface for a RealmBuilder LocalComponentImpl. A LocalComponentImpl
 // is a component that is implemented here in the test, as opposed to
 // elsewhere in the system. When it's inserted to the realm, it will act
 // like a proper component. This is accomplished, in part, because the
 // realm_builder library creates the necessary plumbing. It creates a manifest
 // for the component and routes all capabilities to and from it.
-// LocalComponent:
+// LocalComponentImpl:
 // https://fuchsia.dev/fuchsia-src/development/testing/components/realm_builder#mock-components
 class TouchInputListenerServer
     : public fuchsia::ui::test::input::TouchInputListener,
-      public LocalComponent {
+      public LocalComponentImpl {
  public:
   explicit TouchInputListenerServer(async_dispatcher_t* dispatcher)
       : dispatcher_(dispatcher) {}
@@ -173,21 +168,20 @@ class TouchInputListenerServer
     events_received_.push_back(std::move(request));
   }
 
-  // |LocalComponent::Start|
+  // |LocalComponentImpl::OnStart|
   // When the component framework requests for this component to start, this
   // method will be invoked by the realm_builder library.
-  void Start(std::unique_ptr<LocalComponentHandles> local_handles) override {
+  void OnStart() override {
     FML_LOG(INFO) << "Starting TouchInputListenerServer";
     // When this component starts, add a binding to the
     // protocol to this component's outgoing directory.
-    ASSERT_EQ(ZX_OK, local_handles->outgoing()->AddPublicService(
+    ASSERT_EQ(ZX_OK, outgoing()->AddPublicService(
                          fidl::InterfaceRequestHandler<
                              fuchsia::ui::test::input::TouchInputListener>(
                              [this](auto request) {
                                bindings_.AddBinding(this, std::move(request),
                                                     dispatcher_);
                              })));
-    local_handles_.emplace_back(std::move(local_handles));
   }
 
   const std::vector<
@@ -198,16 +192,13 @@ class TouchInputListenerServer
 
  private:
   async_dispatcher_t* dispatcher_ = nullptr;
-  std::vector<std::unique_ptr<LocalComponentHandles>> local_handles_;
   fidl::BindingSet<fuchsia::ui::test::input::TouchInputListener> bindings_;
   std::vector<
       fuchsia::ui::test::input::TouchInputListenerReportTouchInputRequest>
       events_received_;
 };
 
-class FlutterTapTestBase : public PortableUITest,
-                           public ::testing::Test,
-                           public ::testing::WithParamInterface<std::string> {
+class FlutterTapTestBase : public PortableUITest, public ::testing::Test {
  protected:
   ~FlutterTapTestBase() override {
     FML_CHECK(touch_injection_request_count() > 0)
@@ -226,17 +217,23 @@ class FlutterTapTestBase : public PortableUITest,
         },
         kTimeout);
 
-    // Get the display dimensions.
-    FML_LOG(INFO) << "Waiting for scenic display info";
-    scenic_ = realm_root()->template Connect<fuchsia::ui::scenic::Scenic>();
-    scenic_->GetDisplayInfo([this](fuchsia::ui::gfx::DisplayInfo display_info) {
-      display_width_ = display_info.width_in_px;
-      display_height_ = display_info.height_in_px;
-      FML_LOG(INFO) << "Got display_width = " << display_width_
-                    << " and display_height = " << display_height_;
+    // Get the display information using the
+    // |fuchsia.ui.display.singleton.Info|.
+    FML_LOG(INFO)
+        << "Waiting for display info from fuchsia.ui.display.singleton.Info";
+    std::optional<bool> display_metrics_obtained;
+    fuchsia::ui::display::singleton::InfoPtr display_info =
+        realm_root()
+            ->component()
+            .Connect<fuchsia::ui::display::singleton::Info>();
+    display_info->GetMetrics([this, &display_metrics_obtained](auto info) {
+      display_width_ = info.extent_in_px().width;
+      display_height_ = info.extent_in_px().height;
+      display_metrics_obtained = true;
+    });
+    RunLoopUntil([&display_metrics_obtained] {
+      return display_metrics_obtained.has_value();
     });
-    RunLoopUntil(
-        [this] { return display_width_ != 0 && display_height_ != 0; });
 
     // Register input injection device.
     FML_LOG(INFO) << "Registering input injection device";
@@ -287,9 +284,9 @@ class FlutterTapTestBase : public PortableUITest,
   uint32_t display_width() const { return display_width_; }
   uint32_t display_height() const { return display_height_; }
 
-  ParamType GetTestUIStackUrl() override { return GetParam(); };
+  std::string GetTestUIStackUrl() override { return kTestUIStackUrl; };
 
-  std::unique_ptr<TouchInputListenerServer> touch_input_listener_server_;
+  TouchInputListenerServer* touch_input_listener_server_;
 };
 
 class FlutterTapTest : public FlutterTapTestBase {
@@ -298,10 +295,14 @@ class FlutterTapTest : public FlutterTapTestBase {
     FML_LOG(INFO) << "Extending realm";
     // Key part of service setup: have this test component vend the
     // |TouchInputListener| service in the constructed realm.
-    touch_input_listener_server_ =
+    auto touch_input_listener_server =
         std::make_unique<TouchInputListenerServer>(dispatcher());
-    realm_builder()->AddLocalChild(kMockTouchInputListener,
-                                   touch_input_listener_server_.get());
+    touch_input_listener_server_ = touch_input_listener_server.get();
+    realm_builder()->AddLocalChild(
+        kMockTouchInputListener, [touch_input_listener_server = std::move(
+                                      touch_input_listener_server)]() mutable {
+          return std::move(touch_input_listener_server);
+        });
 
     // Add touch-input-view to the Realm
     realm_builder()->AddChild(kTouchInputView, kTouchInputViewUrl,
@@ -324,15 +325,76 @@ class FlutterTapTest : public FlutterTapTestBase {
 };
 
 class FlutterEmbedTapTest : public FlutterTapTestBase {
+ protected:
+  void SetUp() override {
+    PortableUITest::SetUp(false);
+
+    // Post a "just in case" quit task, if the test hangs.
+    async::PostDelayedTask(
+        dispatcher(),
+        [] {
+          FML_LOG(FATAL)
+              << "\n\n>> Test did not complete in time, terminating.  <<\n\n";
+        },
+        kTimeout);
+  }
+
+  void LaunchClientWithEmbeddedView() {
+    BuildRealm();
+
+    // Get the display information using the
+    // |fuchsia.ui.display.singleton.Info|.
+    FML_LOG(INFO)
+        << "Waiting for display info from fuchsia.ui.display.singleton.Info";
+    std::optional<bool> display_metrics_obtained;
+    fuchsia::ui::display::singleton::InfoPtr display_info =
+        realm_root()
+            ->component()
+            .Connect<fuchsia::ui::display::singleton::Info>();
+    display_info->GetMetrics([this, &display_metrics_obtained](auto info) {
+      display_width_ = info.extent_in_px().width;
+      display_height_ = info.extent_in_px().height;
+      display_metrics_obtained = true;
+    });
+    RunLoopUntil([&display_metrics_obtained] {
+      return display_metrics_obtained.has_value();
+    });
+
+    // Register input injection device.
+    FML_LOG(INFO) << "Registering input injection device";
+    RegisterTouchScreen();
+
+    PortableUITest::LaunchClientWithEmbeddedView();
+  }
+
+  // Helper method to add a component argument
+  // This will be written into an args.csv file that can be parsed and read
+  // by embedding-flutter-view.dart
+  //
+  // Note: You must call this method before LaunchClientWithEmbeddedView()
+  // Realm Builder will not allow you to create a new directory / file in a
+  // realm that's already been built
+  void AddComponentArgument(std::string component_arg) {
+    auto config_directory_contents = DirectoryContents();
+    config_directory_contents.AddFile("args.csv", component_arg);
+    realm_builder()->RouteReadOnlyDirectory(
+        "config-data", {kEmbeddingFlutterViewRef},
+        std::move(config_directory_contents));
+  }
+
  private:
   void ExtendRealm() override {
     FML_LOG(INFO) << "Extending realm";
     // Key part of service setup: have this test component vend the
     // |TouchInputListener| service in the constructed realm.
-    touch_input_listener_server_ =
+    auto touch_input_listener_server =
         std::make_unique<TouchInputListenerServer>(dispatcher());
-    realm_builder()->AddLocalChild(kMockTouchInputListener,
-                                   touch_input_listener_server_.get());
+    touch_input_listener_server_ = touch_input_listener_server.get();
+    realm_builder()->AddLocalChild(
+        kMockTouchInputListener, [touch_input_listener_server = std::move(
+                                      touch_input_listener_server)]() mutable {
+          return std::move(touch_input_listener_server);
+        });
 
     // Add touch-input-view to the Realm
     realm_builder()->AddChild(kTouchInputView, kTouchInputViewUrl,
@@ -365,15 +427,7 @@ class FlutterEmbedTapTest : public FlutterTapTestBase {
   }
 };
 
-// Makes use of gtest's parameterized testing, allowing us
-// to test different combinations of test-ui-stack + runners. Currently, there
-// is just one combination. Documentation:
-// http://go/gunitadvanced#value-parameterized-tests
-INSTANTIATE_TEST_SUITE_P(FlutterTapTestParameterized,
-                         FlutterTapTest,
-                         ::testing::Values(kTestUIStackUrl));
-
-TEST_P(FlutterTapTest, FlutterTap) {
+TEST_F(FlutterTapTest, FlutterTap) {
   // Launch client view, and wait until it's rendering to proceed with the test.
   FML_LOG(INFO) << "Initializing scene";
   LaunchClient();
@@ -392,32 +446,31 @@ TEST_P(FlutterTapTest, FlutterTap) {
         /*expected_y=*/static_cast<float>(display_height() / 4.0f),
         /*component_name=*/"touch-input-view");
   });
-}
 
-INSTANTIATE_TEST_SUITE_P(FlutterEmbedTapTestParameterized,
-                         FlutterEmbedTapTest,
-                         ::testing::Values(kTestUIStackUrl));
+  // There should be 1 injected tap
+  ASSERT_EQ(touch_injection_request_count(), 1);
+}
 
-TEST_P(FlutterEmbedTapTest, FlutterEmbedTap) {
+TEST_F(FlutterEmbedTapTest, FlutterEmbedTap) {
   // Launch view
   FML_LOG(INFO) << "Initializing scene";
   LaunchClientWithEmbeddedView();
   FML_LOG(INFO) << "Client launched";
 
   {
-    // Embedded child view takes up the left side of the screen
+    // Embedded child view takes up the center of the screen
     // Expect a response from the child view if we inject a tap there
-    InjectTap(-500, -500);
+    InjectTap(0, 0);
     RunLoopUntil([this] {
       return LastEventReceivedMatches(
-          /*expected_x=*/static_cast<float>(display_width() / 4.0f),
-          /*expected_y=*/static_cast<float>(display_height() / 4.0f),
+          /*expected_x=*/static_cast<float>(display_width() / 8.0f),
+          /*expected_y=*/static_cast<float>(display_height() / 8.0f),
           /*component_name=*/"touch-input-view");
     });
   }
 
   {
-    // Parent view takes up the right side of the screen
+    // Parent view takes up the rest of the screen
     // Validate that parent can still receive taps
     InjectTap(500, 500);
     RunLoopUntil([this] {
@@ -432,5 +485,41 @@ TEST_P(FlutterEmbedTapTest, FlutterEmbedTap) {
   ASSERT_EQ(touch_injection_request_count(), 2);
 }
 
+TEST_F(FlutterEmbedTapTest, FlutterEmbedOverlayEnabled) {
+  FML_LOG(INFO) << "Initializing scene";
+  AddComponentArgument("--showOverlay");
+  LaunchClientWithEmbeddedView();
+  FML_LOG(INFO) << "Client launched";
+
+  {
+    // The bottom-left corner of the overlay is at the center of the screen
+    // Expect the overlay / parent view to respond if we inject a tap there
+    // and not the embedded child view
+    InjectTap(0, 0);
+    RunLoopUntil([this] {
+      return LastEventReceivedMatches(
+          /*expected_x=*/static_cast<float>(display_width() / 2.0f),
+          /*expected_y=*/static_cast<float>(display_height() / 2.0f),
+          /*component_name=*/"embedding-flutter-view");
+    });
+  }
+
+  {
+    // The embedded child view is just outside of the bottom-left corner of the
+    // overlay
+    // Expect the embedded child view to still receive taps
+    InjectTap(-1, -1);
+    RunLoopUntil([this] {
+      return LastEventReceivedMatches(
+          /*expected_x=*/static_cast<float>(display_width() / 8.0f),
+          /*expected_y=*/static_cast<float>(display_height() / 8.0f),
+          /*component_name=*/"touch-input-view");
+    });
+  }
+
+  // There should be 2 injected taps
+  ASSERT_EQ(touch_injection_request_count(), 2);
+}
+
 }  // namespace
 }  // namespace touch_input_test::testing
diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/BUILD.gn
index bbaf6ca65fc5afc9124881ae3926be429c921c68..2ba2fa5a7373a3c1a0f5f2baba010eeed131df12 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/BUILD.gn
+++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/BUILD.gn
@@ -2,22 +2,17 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/fuchsia/sdk.gni")
 import("//flutter/tools/fuchsia/dart/dart_library.gni")
 import("//flutter/tools/fuchsia/flutter/flutter_component.gni")
-import("//flutter/tools/fuchsia/gn-sdk/component.gni")
-import("//flutter/tools/fuchsia/gn-sdk/package.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/component.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/package.gni")
 
 dart_library("lib") {
   package_name = "touch-input-view"
   sources = [ "touch-input-view.dart" ]
 
-  deps = [
-    "//flutter/shell/platform/fuchsia/dart:args",
-    "//flutter/tools/fuchsia/dart:fuchsia_services",
-    "//flutter/tools/fuchsia/dart:zircon",
-    "//flutter/tools/fuchsia/fidl:fuchsia.ui.test.input",
-  ]
+  deps = [ "//flutter/shell/platform/fuchsia/dart:args" ]
 }
 
 flutter_component("component") {
diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/lib/touch-input-view.dart b/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/lib/touch-input-view.dart
index 58c1ac98edbad5bb9b0e2472ada3be14ecda8684..8032b1e4ba20b3e115d7395fbf4f9e7e17819626 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/lib/touch-input-view.dart
+++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/lib/touch-input-view.dart
@@ -5,10 +5,7 @@
 import 'dart:convert';
 import 'dart:typed_data';
 import 'dart:ui';
-
-import 'package:fidl_fuchsia_ui_test_input/fidl_async.dart' as test_touch;
-import 'package:fuchsia_services/services.dart';
-import 'package:zircon/zircon.dart';
+import 'dart:zircon';
 
 void main() {
   print('Launching touch-input-view');
@@ -22,8 +19,6 @@ class TestApp {
 
   Color _backgroundColor = _pink;
 
-  final _responseListener = test_touch.TouchInputListenerProxy();
-
   void run() {
     // Set up window callbacks.
     window.onPointerDataPacket = (PointerDataPacket packet) {
@@ -69,25 +64,31 @@ class TestApp {
     for (PointerData data in packet.data) {
       print('touch-input-view received tap: ${data.toStringFull()}');
 
-      if (data.change == PointerChange.down || data.change == PointerChange.move) {
-        Incoming.fromSvcPath()
-          ..connectToService(_responseListener)
-          ..close();
+      if (data.change == PointerChange.down) {
+        this._backgroundColor = _yellow;
+      }
 
-        _respond(test_touch.TouchInputListenerReportTouchInputRequest(
+      if (data.change == PointerChange.down || data.change == PointerChange.move) {
+        _reportTouchInput(
           localX: data.physicalX,
           localY: data.physicalY,
           timeReceived: nowNanos,
-          componentName: 'touch-input-view',
-        ));
+        );
       }
     }
 
     window.scheduleFrame();
   }
 
-  void _respond(test_touch.TouchInputListenerReportTouchInputRequest request) async {
+  void _reportTouchInput({required double localX, required double localY, required int timeReceived}) {
     print('touch-input-view reporting touch input to TouchInputListener');
-    await _responseListener.reportTouchInput(request);
+    final message = utf8.encode(json.encode({
+      'method': 'TouchInputListener.ReportTouchInput',
+      'local_x': localX,
+      'local_y': localY,
+      'time_received': timeReceived,
+      'component_name': 'touch-input-view',
+    })).buffer.asByteData();
+    PlatformDispatcher.instance.sendPlatformMessage('fuchsia/input_test', message, null);
   }
 }
diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/pubspec.yaml b/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/pubspec.yaml
index cc78c78f090eb7610c2ea2de3cb6b3bdbd50f26f..7fc83f8c32fd095c2f68bcafa7f2a9f064ca10d7 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/pubspec.yaml
+++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/pubspec.yaml
@@ -5,4 +5,4 @@
 name: touch-input-view
 
 environment:
-  sdk: '>=2.18.0 <3.0.0'
+  sdk: '>=3.2.0-0 <4.0.0'
diff --git a/shell/platform/fuchsia/flutter/tests/integration/utils/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/utils/BUILD.gn
index dd4ae203bfd5c9499c67c9e6ba1f3a48ea99f0eb..613976f2056a5e9c48063042e46f56af46a06af7 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/utils/BUILD.gn
+++ b/shell/platform/fuchsia/flutter/tests/integration/utils/BUILD.gn
@@ -4,7 +4,7 @@
 
 assert(is_fuchsia)
 
-import("//build/fuchsia/sdk.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
 
 source_set("check_view") {
   sources = [
@@ -13,19 +13,12 @@ source_set("check_view") {
   ]
 
   deps = [
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.observation.geometry",
-    "$fuchsia_sdk_root/pkg:zx",
+    "${fuchsia_sdk}/fidl/fuchsia.ui.observation.geometry",
+    "${fuchsia_sdk}/pkg/zx",
     "//flutter/fml",
   ]
 }
 
-source_set("color") {
-  sources = [
-    "color.cc",
-    "color.h",
-  ]
-}
-
 source_set("screenshot") {
   sources = [
     "screenshot.cc",
@@ -33,10 +26,8 @@ source_set("screenshot") {
   ]
 
   deps = [
-    ":color",
-    "$fuchsia_sdk_root/fidl:fuchsia.logger",
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.scenic",
-    "$fuchsia_sdk_root/pkg:zx",
+    "${fuchsia_sdk}/fidl/fuchsia.logger",
+    "${fuchsia_sdk}/pkg/zx",
     "//flutter/fml",
   ]
 }
@@ -50,15 +41,18 @@ source_set("portable_ui_test") {
 
   deps = [
     ":check_view",
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.app",
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.input",
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.observation.geometry",
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.policy",
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.scenic",
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.test.input",
-    "$fuchsia_sdk_root/fidl:fuchsia.ui.test.scene",
-    "$fuchsia_sdk_root/pkg:async-loop-testing",
-    "$fuchsia_sdk_root/pkg:sys_component_cpp_testing",
+    "${fuchsia_sdk}/fidl/fuchsia.inspect",
+    "${fuchsia_sdk}/fidl/fuchsia.logger",
+    "${fuchsia_sdk}/fidl/fuchsia.tracing.provider",
+    "${fuchsia_sdk}/fidl/fuchsia.ui.app",
+    "${fuchsia_sdk}/fidl/fuchsia.ui.composition",
+    "${fuchsia_sdk}/fidl/fuchsia.ui.display.singleton",
+    "${fuchsia_sdk}/fidl/fuchsia.ui.input",
+    "${fuchsia_sdk}/fidl/fuchsia.ui.observation.geometry",
+    "${fuchsia_sdk}/fidl/fuchsia.ui.test.input",
+    "${fuchsia_sdk}/fidl/fuchsia.ui.test.scene",
+    "${fuchsia_sdk}/pkg/async-loop-testing",
+    "${fuchsia_sdk}/pkg/sys_component_cpp_testing",
     "//flutter/fml",
   ]
 }
diff --git a/shell/platform/fuchsia/flutter/tests/integration/utils/color.cc b/shell/platform/fuchsia/flutter/tests/integration/utils/color.cc
deleted file mode 100644
index 818c4c8cc641982299a582b48e962c9242cc0a7e..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/flutter/tests/integration/utils/color.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "color.h"
-
-namespace fuchsia_test_utils {
-
-// RGBA hex dump
-std::ostream& operator<<(std::ostream& os, const Color& c) {
-  char rgba[9] = {};
-  snprintf(rgba, (sizeof(rgba) / sizeof(char)), "%02X%02X%02X%02X", c.r, c.g,
-           c.b, c.a);
-  return os << rgba;
-}
-
-}  // namespace fuchsia_test_utils
diff --git a/shell/platform/fuchsia/flutter/tests/integration/utils/color.h b/shell/platform/fuchsia/flutter/tests/integration/utils/color.h
deleted file mode 100644
index 4cb1c328fe42eb7cb0e3caf327d4b6a76f07e000..0000000000000000000000000000000000000000
--- a/shell/platform/fuchsia/flutter/tests/integration/utils/color.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_INTEGRATION_UTILS_COLOR_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_INTEGRATION_UTILS_COLOR_H_
-
-#include <map>
-#include <ostream>
-#include <tuple>
-
-namespace fuchsia_test_utils {
-
-struct Color {
-  // Constructor is idiomatic RGBA, but memory layout is native BGRA.
-  constexpr Color(uint8_t r, uint8_t g, uint8_t b, uint8_t a)
-      : b(b), g(g), r(r), a(a) {}
-
-  uint8_t b;
-  uint8_t g;
-  uint8_t r;
-  uint8_t a;
-};
-
-inline bool operator==(const Color& a, const Color& b) {
-  return a.r == b.r && a.g == b.g && a.b == b.b && a.a == b.a;
-}
-
-inline bool operator<(const Color& a, const Color& b) {
-  return std::tie(a.r, a.g, a.b, a.a) < std::tie(b.r, b.g, b.b, b.a);
-}
-
-// RGBA hex dump. Note that this differs from the internal BGRA memory layout.
-std::ostream& operator<<(std::ostream& os, const Color& c);
-
-}  // namespace fuchsia_test_utils
-
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_INTEGRATION_UTILS_COLOR_H_
diff --git a/shell/platform/fuchsia/flutter/tests/integration/utils/portable_ui_test.cc b/shell/platform/fuchsia/flutter/tests/integration/utils/portable_ui_test.cc
index 74085ba945248ec9911ae6f5323f4016a43d8f12..e36718a44808159accd3ad4c33747803d1d4db11 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/utils/portable_ui_test.cc
+++ b/shell/platform/fuchsia/flutter/tests/integration/utils/portable_ui_test.cc
@@ -4,6 +4,7 @@
 
 #include "portable_ui_test.h"
 
+#include <fuchsia/inspect/cpp/fidl.h>
 #include <fuchsia/logger/cpp/fidl.h>
 #include <fuchsia/tracing/provider/cpp/fidl.h>
 #include <fuchsia/ui/app/cpp/fidl.h>
@@ -29,9 +30,16 @@ using fuchsia_test_utils::CheckViewExistsInSnapshot;
 
 }  // namespace
 
-void PortableUITest::SetUp() {
+void PortableUITest::SetUp(bool build_realm) {
   SetUpRealmBase();
   ExtendRealm();
+
+  if (build_realm) {
+    BuildRealm();
+  }
+}
+
+void PortableUITest::BuildRealm() {
   realm_ = std::make_unique<RealmRoot>(realm_builder_.Build());
 }
 
@@ -70,11 +78,10 @@ void PortableUITest::SetUpRealmBase() {
   // // Route base system services to flutter and the test UI stack.
   realm_builder_.AddRoute(Route{
       .capabilities = {Protocol{fuchsia::logger::LogSink::Name_},
-                       Protocol{fuchsia::sys::Environment::Name_},
+                       Protocol{fuchsia::inspect::InspectSink::Name_},
                        Protocol{fuchsia::sysmem::Allocator::Name_},
                        Protocol{fuchsia::tracing::provider::Registry::Name_},
                        Protocol{fuchsia::ui::input::ImeService::Name_},
-                       Protocol{kPointerInjectorRegistryName},
                        Protocol{kPosixSocketProviderName},
                        Protocol{kVulkanLoaderServiceName},
                        component_testing::Directory{"config-data"}},
@@ -85,9 +92,10 @@ void PortableUITest::SetUpRealmBase() {
   realm_builder_.AddRoute(Route{
       .capabilities = {Protocol{fuchsia::ui::composition::Allocator::Name_},
                        Protocol{fuchsia::ui::composition::Flatland::Name_},
-                       Protocol{fuchsia::ui::scenic::Scenic::Name_},
                        Protocol{fuchsia::ui::test::input::Registry::Name_},
-                       Protocol{fuchsia::ui::test::scene::Controller::Name_}},
+                       Protocol{fuchsia::ui::test::scene::Controller::Name_},
+                       Protocol{fuchsia::ui::display::singleton::Info::Name_},
+                       Protocol{kPointerInjectorRegistryName}},
       .source = kTestUIStackRef,
       .targets = {ParentRef(), kFlutterJitRunnerRef}});
 }
@@ -135,14 +143,16 @@ bool PortableUITest::HasViewConnected(zx_koid_t view_ref_koid) {
 }
 
 void PortableUITest::LaunchClient() {
-  scene_provider_ = realm_->Connect<fuchsia::ui::test::scene::Controller>();
+  scene_provider_ =
+      realm_->component().Connect<fuchsia::ui::test::scene::Controller>();
   scene_provider_.set_error_handler([](auto) {
     FML_LOG(ERROR) << "Error from test scene provider: "
                    << &zx_status_get_string;
   });
 
   fuchsia::ui::test::scene::ControllerAttachClientViewRequest request;
-  request.set_view_provider(realm_->Connect<fuchsia::ui::app::ViewProvider>());
+  request.set_view_provider(
+      realm_->component().Connect<fuchsia::ui::app::ViewProvider>());
   scene_provider_->RegisterViewTreeWatcher(view_tree_watcher_.NewRequest(),
                                            []() {});
   scene_provider_->AttachClientView(
@@ -207,7 +217,8 @@ void PortableUITest::LaunchClientWithEmbeddedView() {
 
 void PortableUITest::RegisterTouchScreen() {
   FML_LOG(INFO) << "Registering fake touch screen";
-  input_registry_ = realm_->Connect<fuchsia::ui::test::input::Registry>();
+  input_registry_ =
+      realm_->component().Connect<fuchsia::ui::test::input::Registry>();
   input_registry_.set_error_handler([](auto) {
     FML_LOG(ERROR) << "Error from input helper: " << &zx_status_get_string;
   });
@@ -225,7 +236,8 @@ void PortableUITest::RegisterTouchScreen() {
 
 void PortableUITest::RegisterMouse() {
   FML_LOG(INFO) << "Registering fake mouse";
-  input_registry_ = realm_->Connect<fuchsia::ui::test::input::Registry>();
+  input_registry_ =
+      realm_->component().Connect<fuchsia::ui::test::input::Registry>();
   input_registry_.set_error_handler([](auto) {
     FML_LOG(ERROR) << "Error from input helper: " << &zx_status_get_string;
   });
@@ -240,6 +252,25 @@ void PortableUITest::RegisterMouse() {
   FML_LOG(INFO) << "Mouse registered";
 }
 
+void PortableUITest::RegisterKeyboard() {
+  FML_LOG(INFO) << "Registering fake keyboard";
+  input_registry_ =
+      realm_->component().Connect<fuchsia::ui::test::input::Registry>();
+  input_registry_.set_error_handler([](auto) {
+    FML_LOG(ERROR) << "Error from input helper: " << &zx_status_get_string;
+  });
+
+  bool keyboard_registered = false;
+  fuchsia::ui::test::input::RegistryRegisterKeyboardRequest request;
+  request.set_device(fake_keyboard_.NewRequest());
+  input_registry_->RegisterKeyboard(
+      std::move(request),
+      [&keyboard_registered]() { keyboard_registered = true; });
+
+  RunLoopUntil([&keyboard_registered] { return keyboard_registered; });
+  FML_LOG(INFO) << "Keyboard registered";
+}
+
 void PortableUITest::InjectTap(int32_t x, int32_t y) {
   fuchsia::ui::test::input::TouchScreenSimulateTapRequest tap_request;
   tap_request.mutable_tap_location()->x = x;
@@ -290,4 +321,17 @@ void PortableUITest::SimulateMouseScroll(
   });
 }
 
+void PortableUITest::SimulateTextEntry(std::string text) {
+  FML_LOG(INFO) << "Sending text request";
+  bool done = false;
+
+  fuchsia::ui::test::input::KeyboardSimulateUsAsciiTextEntryRequest request;
+  request.set_text(text);
+  fake_keyboard_->SimulateUsAsciiTextEntry(std::move(request),
+                                           [&done]() { done = true; });
+
+  RunLoopUntil([&] { return done; });
+  FML_LOG(INFO) << "Text request sent";
+}
+
 }  // namespace fuchsia_test_utils
diff --git a/shell/platform/fuchsia/flutter/tests/integration/utils/portable_ui_test.h b/shell/platform/fuchsia/flutter/tests/integration/utils/portable_ui_test.h
index 42178a2ccfb544016bf8f86bd1313c3168e3850e..363dba78c7e93d9a46b60e5ae0e43d4cc2ab9aac 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/utils/portable_ui_test.h
+++ b/shell/platform/fuchsia/flutter/tests/integration/utils/portable_ui_test.h
@@ -7,9 +7,9 @@
 
 #include <fuchsia/sysmem/cpp/fidl.h>
 #include <fuchsia/ui/app/cpp/fidl.h>
+#include <fuchsia/ui/composition/cpp/fidl.h>
+#include <fuchsia/ui/display/singleton/cpp/fidl.h>
 #include <fuchsia/ui/input/cpp/fidl.h>
-#include <fuchsia/ui/policy/cpp/fidl.h>
-#include <fuchsia/ui/scenic/cpp/fidl.h>
 #include <fuchsia/ui/test/input/cpp/fidl.h>
 #include <fuchsia/ui/test/scene/cpp/fidl.h>
 #include <lib/async-loop/testing/cpp/real_loop.h>
@@ -44,7 +44,11 @@ class PortableUITest : public ::loop_fixture::RealLoop {
       "flutter_jit_runner.cm";
   static constexpr auto kFlutterRunnerEnvironment = "flutter_runner_env";
 
-  void SetUp();
+  void SetUp(bool build_realm = true);
+
+  // Calls the Build method for Realm Builder to build the realm
+  // Can only be called once, panics otherwise
+  void BuildRealm();
 
   // Attaches a client view to the scene, and waits for it to render.
   void LaunchClient();
@@ -65,6 +69,9 @@ class PortableUITest : public ::loop_fixture::RealLoop {
   // on both axes.
   void RegisterMouse();
 
+  // Register a fake keyboard
+  void RegisterKeyboard();
+
   // Simulates a tap at location (x, y).
   void InjectTap(int32_t x, int32_t y);
 
@@ -85,11 +92,13 @@ class PortableUITest : public ::loop_fixture::RealLoop {
       int scroll_y,
       bool use_physical_units = false);
 
+  // Helper method to simluate text input
+  void SimulateTextEntry(std::string text);
+
  protected:
   component_testing::RealmBuilder* realm_builder() { return &realm_builder_; }
   component_testing::RealmRoot* realm_root() { return realm_.get(); }
 
-  fuchsia::ui::scenic::ScenicPtr scenic_;
   uint32_t display_width_ = 0;
   uint32_t display_height_ = 0;
 
@@ -104,10 +113,10 @@ class PortableUITest : public ::loop_fixture::RealLoop {
   virtual void ExtendRealm() = 0;
 
   // Returns the test-specific test-ui-stack component url to use.
-  // Usually overriden to return a value from gtest GetParam()
+  // Usually overridden to return a value from gtest GetParam()
   virtual std::string GetTestUIStackUrl() = 0;
 
-  // Helper method to watch watch for view geometry updates.
+  // Helper method to watch for view geometry updates.
   void WatchViewGeometry();
 
   // Helper method to process a view geometry update.
@@ -117,6 +126,7 @@ class PortableUITest : public ::loop_fixture::RealLoop {
   fuchsia::ui::test::input::RegistryPtr input_registry_;
   fuchsia::ui::test::input::TouchScreenPtr fake_touchscreen_;
   fuchsia::ui::test::input::MousePtr fake_mouse_;
+  fuchsia::ui::test::input::KeyboardPtr fake_keyboard_;
   fuchsia::ui::test::scene::ControllerPtr scene_provider_;
   fuchsia::ui::observation::geometry::ViewTreeWatcherPtr view_tree_watcher_;
 
diff --git a/shell/platform/fuchsia/flutter/tests/integration/utils/screenshot.cc b/shell/platform/fuchsia/flutter/tests/integration/utils/screenshot.cc
index e3abfb64767e70cce44f336168246c4a9969c231..9f7e33764a7ee744121cab964b927fdb05755d4f 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/utils/screenshot.cc
+++ b/shell/platform/fuchsia/flutter/tests/integration/utils/screenshot.cc
@@ -4,67 +4,101 @@
 
 #include "screenshot.h"
 
-#include <zircon/status.h>
+#include <lib/zx/vmar.h>
+
+#include <map>
+#include <ostream>
+#include <utility>
+#include <vector>
 
 #include "flutter/fml/logging.h"
 
 namespace fuchsia_test_utils {
-
-Screenshot::Screenshot(
-    const fuchsia::ui::scenic::ScreenshotData& screenshot_data)
-    : width_(screenshot_data.info.width), height_(screenshot_data.info.height) {
-  FML_CHECK(screenshot_data.info.pixel_format ==
-            fuchsia::images::PixelFormat::BGRA_8)
-      << "Non-BGRA_8 pixel formats not supported";
-
-  const auto& buffer = screenshot_data.data.vmo;
-  const auto num_bytes = screenshot_data.data.size;
-
-  data_.resize(num_bytes);
-
-  if (num_bytes == 0) {
-    return;
-  }
-
-  zx_status_t status = buffer.read(&data_[0], 0, num_bytes);
-  if (status < 0) {
-    FML_LOG(WARNING) << "zx::vmo::read failed " << zx_status_get_string(status);
+namespace {
+constexpr uint64_t kBytesPerPixel = 4;
+}  // namespace
+
+Screenshot::Screenshot(const zx::vmo& screenshot_vmo,
+                       uint64_t width,
+                       uint64_t height,
+                       int rotation)
+    : width_(width), height_(height) {
+  FML_CHECK(rotation == 0 || rotation == 90 || rotation == 270);
+  if (rotation == 90 || rotation == 270) {
+    std::swap(width_, height_);
   }
+  // Populate |screenshot_| from |screenshot_vmo|.
+  uint64_t vmo_size;
+  screenshot_vmo.get_prop_content_size(&vmo_size);
+  FML_CHECK(vmo_size == kBytesPerPixel * width_ * height_);
+  uint8_t* vmo_host = nullptr;
+  auto status = zx::vmar::root_self()->map(
+      ZX_VM_PERM_READ, /*vmar_offset*/ 0, screenshot_vmo,
+      /*vmo_offset*/ 0, vmo_size, reinterpret_cast<uintptr_t*>(&vmo_host));
+  FML_CHECK(status == ZX_OK);
+  ExtractScreenshotFromVMO(vmo_host);
+  // map the pointer.
+  uintptr_t address = reinterpret_cast<uintptr_t>(vmo_host);
+  status = zx::vmar::root_self()->unmap(address, vmo_size);
+  FML_CHECK(status == ZX_OK);
 }
 
-const Color* Screenshot::operator[](size_t row) const {
-  return &begin()[row * width_];
+std::ostream& operator<<(std::ostream& stream, const Pixel& pixel) {
+  return stream << "{Pixel:" << " r:" << static_cast<unsigned int>(pixel.red)
+                << " g:" << static_cast<unsigned int>(pixel.green)
+                << " b:" << static_cast<unsigned int>(pixel.blue)
+                << " a:" << static_cast<unsigned int>(pixel.alpha) << "}";
 }
 
-const Color& Screenshot::ColorAt(float x, float y) const {
-  FML_CHECK(x >= 0 && x < 1 && y >= 0 && y < 1)
-      << "(" << x << ", " << y << ") is out of bounds [0, 1) x [0, 1)";
-  const size_t ix = static_cast<size_t>(x * static_cast<float>(width_));
-  const size_t iy = static_cast<size_t>(y * static_cast<float>(height_));
-  return (*this)[iy][ix];
+Pixel Screenshot::GetPixelAt(uint64_t x, uint64_t y) const {
+  FML_CHECK(x >= 0 && x < width_ && y >= 0 && y < height_)
+      << "Index out of bounds";
+  return screenshot_[y][x];
 }
 
-const Color& Screenshot::ColorAtPixelXY(size_t ix, size_t iy) const {
-  FML_CHECK(ix < width_ && iy < height_);
-  return (*this)[iy][ix];
-}
-
-const Color* Screenshot::begin() const {
-  return reinterpret_cast<const Color*>(data_.data());
+std::map<Pixel, uint32_t> Screenshot::Histogram() const {
+  std::map<Pixel, uint32_t> histogram;
+  FML_CHECK(screenshot_.size() == height_ && screenshot_[0].size() == width_);
+  for (size_t i = 0; i < height_; i++) {
+    for (size_t j = 0; j < width_; j++) {
+      histogram[screenshot_[i][j]]++;
+    }
+  }
+  return histogram;
 }
 
-const Color* Screenshot::end() const {
-  return &begin()[width_ * height_];
+void Screenshot::ExtractScreenshotFromVMO(uint8_t* screenshot_vmo) {
+  FML_CHECK(screenshot_vmo);
+  for (size_t i = 0; i < height_; i++) {
+    // The head index of the ith row in the screenshot is |i* width_*
+    // KbytesPerPixel|.
+    screenshot_.push_back(GetPixelsInRow(screenshot_vmo, i));
+  }
 }
 
-std::map<Color, size_t> Screenshot::Histogram() const {
-  std::map<Color, size_t> histogram;
-
-  for (const auto color : *this) {
-    ++histogram[color];
+std::vector<Pixel> Screenshot::GetPixelsInRow(uint8_t* screenshot_vmo,
+                                              size_t row_index) {
+  std::vector<Pixel> row;
+  for (size_t col_idx = 0;
+       col_idx < static_cast<size_t>(width_ * kBytesPerPixel);
+       col_idx += kBytesPerPixel) {
+    // Each row in the screenshot has |kBytesPerPixel * width_| elements.
+    // Therefore in order to reach the first pixel of the |row_index| row, we
+    // have to jump |row_index * width_ * kBytesPerPixel| positions.
+    auto pixel_start_index = row_index * width_ * kBytesPerPixel;
+    // Every |kBytesPerPixel| bytes represents the BGRA values of a pixel. Skip
+    // |kBytesPerPixel| bytes to get to the BGRA values of the next pixel. Each
+    // row in a screenshot has |kBytesPerPixel * width_| bytes of data.
+    // Example:-
+    // auto data = TakeScreenshot();
+    // data[0-3] -> RGBA of pixel 0.
+    // data[4-7] -> RGBA pf pixel 1.
+    row.emplace_back(screenshot_vmo[pixel_start_index + col_idx],
+                     screenshot_vmo[pixel_start_index + col_idx + 1],
+                     screenshot_vmo[pixel_start_index + col_idx + 2],
+                     screenshot_vmo[pixel_start_index + col_idx + 3]);
   }
-
-  return histogram;
+  return row;
 }
 
 }  // namespace fuchsia_test_utils
diff --git a/shell/platform/fuchsia/flutter/tests/integration/utils/screenshot.h b/shell/platform/fuchsia/flutter/tests/integration/utils/screenshot.h
index f2090eb7a4e8993bf781cfd49cf580a61599e700..717089d9d9840c47a3dda1b13dd85a806878a641 100644
--- a/shell/platform/fuchsia/flutter/tests/integration/utils/screenshot.h
+++ b/shell/platform/fuchsia/flutter/tests/integration/utils/screenshot.h
@@ -5,52 +5,106 @@
 #ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_INTEGRATION_UTILS_SCREENSHOT_H_
 #define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_INTEGRATION_UTILS_SCREENSHOT_H_
 
-#include <fuchsia/ui/scenic/cpp/fidl.h>
+#include <lib/zx/vmo.h>
+#include <zircon/status.h>
 
+#include <cmath>
+#include <iostream>
 #include <map>
-#include <ostream>
 #include <tuple>
-
-#include "color.h"
+#include <vector>
 
 namespace fuchsia_test_utils {
+// Represents a Pixel in BGRA format.
+// Uses the sRGB color space.
+struct Pixel {
+  uint8_t blue = 0;
+  uint8_t green = 0;
+  uint8_t red = 0;
+  uint8_t alpha = 0;
+
+  Pixel(uint8_t blue, uint8_t green, uint8_t red, uint8_t alpha)
+      : blue(blue), green(green), red(red), alpha(alpha) {}
+
+  bool operator==(const Pixel& rhs) const {
+    return blue == rhs.blue && green == rhs.green && red == rhs.red &&
+           alpha == rhs.alpha;
+  }
+
+  inline bool operator!=(const Pixel& rhs) const { return !(*this == rhs); }
+
+  bool operator<(const Pixel& other) const {
+    return std::tie(blue, green, red, alpha) <
+           std::tie(other.blue, other.green, other.red, other.alpha);
+  }
+};
 
-/// A screenshot that has been taken from a Fuchsia device.
+std::ostream& operator<<(std::ostream& stream, const Pixel& pixel);
+
+// Helper class to get information about a screenshot returned by
+// |fuchsia.ui.composition.Screenshot| protocol.
 class Screenshot {
  public:
-  Screenshot(const fuchsia::ui::scenic::ScreenshotData& screenshot_data);
+  // BGRA format.
+  inline static const Pixel kBlack = Pixel(0, 0, 0, 255);
+  inline static const Pixel kBlue = Pixel(255, 0, 0, 255);
+  inline static const Pixel kRed = Pixel(0, 0, 255, 255);
+  inline static const Pixel kMagenta = Pixel(255, 0, 255, 255);
+  inline static const Pixel kGreen = Pixel(0, 255, 0, 255);
 
-  size_t width() const { return width_; }
-  size_t height() const { return height_; }
-  bool empty() const { return width_ == 0 || height_ == 0; }
+  // Params:-
+  // |screenshot_vmo| - The VMO returned by
+  //    fuchsia.ui.composition.Screenshot.Take representing the screenshot data.
+  // |width|, |height| - Width and height of the physical display in pixels as
+  //    returned by |fuchsia.ui.display.singleton.Info|.
+  // |rotation| - The display rotation value in degrees. The width and the
+  //    height of the screenshot are flipped if this value is 90 or 270 degrees,
+  //    as the screenshot shows how content is seen by the user.
+  Screenshot(const zx::vmo& screenshot_vmo,
+             uint64_t width,
+             uint64_t height,
+             int rotation);
 
-  // Notably the indexer behaves like a row-major matrix, whereas the iterator
-  // behaves like a flat array. *IMPORTANT*: Use caution because index values
-  // are not validated, and out of bounds indexes can introduce memory errors.
-  // Also when indexing a specific pixel with |screenshot[a][b]|, note that
-  // the order of the indexes is non-traditional. The first index is for the
-  // |y| position (the row), followed by the |x| position. Consider using
-  // |ColorAtPixelXY()| instead.
-  const Color* operator[](size_t row) const;
+  // Returns the |Pixel| located at (x,y) coordinates. |x| and |y| should range
+  // from [0,width_) and [0,height_) respectively.
+  //
+  //  (0,0)________________width_____________(w-1,0)
+  //      |                       |         |
+  //      |                       | y       |h
+  //      |          x            |         |e
+  //      |-----------------------X         |i
+  //      |                                 |g
+  //      |                                 |h
+  //      |                                 |t
+  //      |_________________________________|
+  // (0,h-1)           screenshot             (w-1,h-1)
+  //
+  // Clients should only use this function to get the pixel data.
+  Pixel GetPixelAt(uint64_t x, uint64_t y) const;
 
-  // Coordinates are in the range [0, 1).
-  const Color& ColorAt(float x, float y) const;
+  // Counts the frequencies of each color in a screenshot.
+  std::map<Pixel, uint32_t> Histogram() const;
 
-  // Returns the color of a pixel at the integer x and y indexes, after
-  // asserting that the indexes are in range.
-  const Color& ColorAtPixelXY(size_t ix, size_t iy) const;
+  // Returns a 2D vector of size |height_ * width_|. Each value in the vector
+  // corresponds to a pixel in the screenshot.
+  std::vector<std::vector<Pixel>> screenshot() const { return screenshot_; }
 
-  // Notably the iterator behaves like a flat array, whereas the indexer behaves
-  // like a row-major matrix.
-  const Color* begin() const;
-  const Color* end() const;
+  uint64_t width() const { return width_; }
 
-  // Counts the frequencies of each color in a screenshot.
-  std::map<Color, size_t> Histogram() const;
+  uint64_t height() const { return height_; }
 
  private:
-  const size_t width_, height_;
-  std::vector<uint8_t> data_;
+  // Populates |screenshot_| by converting the linear array of bytes in
+  // |screenshot_vmo| of size |kBytesPerPixel * width_ * height_| to a 2D vector
+  //  of |Pixel|s of size |height_ * width_|.
+  void ExtractScreenshotFromVMO(uint8_t* screenshot_vmo);
+
+  // Returns the |Pixel|s in the |row_index| row of the screenshot.
+  std::vector<Pixel> GetPixelsInRow(uint8_t* screenshot_vmo, size_t row_index);
+
+  uint64_t width_ = 0;
+  uint64_t height_ = 0;
+  std::vector<std::vector<Pixel>> screenshot_;
 };
 
 }  // namespace fuchsia_test_utils
diff --git a/shell/platform/fuchsia/flutter/tests/flatland_platform_view_unittest.cc b/shell/platform/fuchsia/flutter/tests/platform_view_unittest.cc
similarity index 84%
rename from shell/platform/fuchsia/flutter/tests/flatland_platform_view_unittest.cc
rename to shell/platform/fuchsia/flutter/tests/platform_view_unittest.cc
index 142411872ef8ba88d3a65ffb747b9f4b89cc9a07..b61d87b22cfa2bf6abea63ec563f27c7f9b74202 100644
--- a/shell/platform/fuchsia/flutter/tests/flatland_platform_view_unittest.cc
+++ b/shell/platform/fuchsia/flutter/tests/platform_view_unittest.cc
@@ -7,13 +7,12 @@
 #include <fuchsia/ui/input/cpp/fidl.h>
 #include <fuchsia/ui/input3/cpp/fidl.h>
 #include <fuchsia/ui/input3/cpp/fidl_test_base.h>
-#include <fuchsia/ui/scenic/cpp/fidl.h>
 #include <fuchsia/ui/views/cpp/fidl.h>
 #include <lib/async-loop/cpp/loop.h>
 #include <lib/async-loop/default.h>
 #include <lib/async/default.h>
 #include <lib/fidl/cpp/binding_set.h>
-#include <lib/ui/scenic/cpp/view_ref_pair.h>
+#include <lib/zx/eventpair.h>
 
 #include <memory>
 #include <ostream>
@@ -25,7 +24,7 @@
 #include "flutter/lib/ui/window/pointer_data.h"
 #include "flutter/lib/ui/window/viewport_metrics.h"
 #include "flutter/shell/common/context_options.h"
-#include "flutter/shell/platform/fuchsia/flutter/flatland_platform_view.h"
+#include "flutter/shell/platform/fuchsia/flutter/platform_view.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
@@ -43,30 +42,28 @@ namespace {
 
 class MockExternalViewEmbedder : public flutter::ExternalViewEmbedder {
  public:
-  SkCanvas* GetRootCanvas() override { return nullptr; }
-  std::vector<SkCanvas*> GetCurrentCanvases() override {
-    return std::vector<SkCanvas*>();
-  }
-  std::vector<flutter::DisplayListBuilder*> GetCurrentBuilders() override {
-    return std::vector<flutter::DisplayListBuilder*>();
-  }
+  flutter::DlCanvas* GetRootCanvas() override { return nullptr; }
 
   void CancelFrame() override {}
-  void BeginFrame(
-      SkISize frame_size,
+  void BeginFrame(GrDirectContext* context,
+                  const fml::RefPtr<fml::RasterThreadMerger>&
+                      raster_thread_merger) override {}
+
+  void PrepareFlutterView(SkISize frame_size,
+                          double device_pixel_ratio) override {}
+
+  void SubmitFlutterView(
+      int64_t flutter_view_id,
       GrDirectContext* context,
-      double device_pixel_ratio,
-      fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) override {}
-  void SubmitFrame(GrDirectContext* context,
-                   std::unique_ptr<flutter::SurfaceFrame> frame) override {
-    return;
-  }
+      const std::shared_ptr<impeller::AiksContext>& aiks_context,
+      std::unique_ptr<flutter::SurfaceFrame> frame) override {}
 
   void PrerollCompositeEmbeddedView(
-      int view_id,
+      int64_t view_id,
       std::unique_ptr<flutter::EmbeddedViewParams> params) override {}
-  flutter::EmbedderPaintContext CompositeEmbeddedView(int view_id) override {
-    return {nullptr, nullptr};
+
+  flutter::DlCanvas* CompositeEmbeddedView(int64_t view_id) override {
+    return nullptr;
   }
 };
 
@@ -94,6 +91,7 @@ class MockPlatformViewDelegate : public flutter::PlatformView::Delegate {
   void OnPlatformViewSetNextFrameCallback(const fml::closure& closure) {}
   // |flutter::PlatformView::Delegate|
   void OnPlatformViewSetViewportMetrics(
+      int64_t view_id,
       const flutter::ViewportMetrics& metrics) {
     metrics_ = metrics;
   }
@@ -181,8 +179,8 @@ class MockPlatformViewDelegate : public flutter::PlatformView::Delegate {
 
 class MockResponse : public flutter::PlatformMessageResponse {
  public:
-  MOCK_METHOD1(Complete, void(std::unique_ptr<fml::Mapping> data));
-  MOCK_METHOD0(CompleteEmpty, void());
+  MOCK_METHOD(void, Complete, (std::unique_ptr<fml::Mapping> data), (override));
+  MOCK_METHOD(void, CompleteEmpty, (), (override));
 };
 
 class TestPlatformMessageResponse : public flutter::PlatformMessageResponse {
@@ -248,9 +246,17 @@ class MockChildViewWatcher
   void GetViewRef(GetViewRefCallback callback) override {
     // GetViewRef only returns once as per flatland.fidl comments
     ASSERT_FALSE(control_ref_.reference);
-    auto pair = scenic::ViewRefPair::New();
-    control_ref_ = std::move(pair.control_ref);
-    callback(std::move(pair.view_ref));
+    fuchsia::ui::views::ViewRefControl view_ref_control;
+    fuchsia::ui::views::ViewRef view_ref;
+    auto status = zx::eventpair::create(
+        /*options*/ 0u, &view_ref_control.reference, &view_ref.reference);
+    ZX_ASSERT(status == ZX_OK);
+    view_ref_control.reference.replace(
+        ZX_DEFAULT_EVENTPAIR_RIGHTS & (~ZX_RIGHT_DUPLICATE),
+        &view_ref_control.reference);
+    view_ref.reference.replace(ZX_RIGHTS_BASIC, &view_ref.reference);
+    control_ref_ = std::move(view_ref_control);
+    callback(std::move(view_ref));
   }
 
   void NotImplemented_(const std::string& name) override { FAIL(); }
@@ -336,9 +342,20 @@ class PlatformViewBuilder {
  public:
   PlatformViewBuilder(flutter::PlatformView::Delegate& delegate,
                       flutter::TaskRunners task_runners)
-      : delegate_(delegate),
-        task_runners_(task_runners),
-        view_ref_pair_(scenic::ViewRefPair::New()) {}
+      : delegate_(delegate), task_runners_(task_runners) {
+    fuchsia::ui::views::ViewRefControl view_ref_control;
+    fuchsia::ui::views::ViewRef view_ref;
+    auto status = zx::eventpair::create(
+        /*options*/ 0u, &view_ref_control.reference, &view_ref.reference);
+    ZX_ASSERT(status == ZX_OK);
+    view_ref_control.reference.replace(
+        ZX_DEFAULT_EVENTPAIR_RIGHTS & (~ZX_RIGHT_DUPLICATE),
+        &view_ref_control.reference);
+    view_ref.reference.replace(ZX_RIGHTS_BASIC, &view_ref.reference);
+    auto view_ref_pair =
+        std::make_pair(std::move(view_ref_control), std::move(view_ref));
+    view_ref_pair_ = std::move(view_ref_pair);
+  }
 
   PlatformViewBuilder& SetExternalViewEmbedder(
       std::shared_ptr<flutter::ExternalViewEmbedder> embedder) {
@@ -387,7 +404,8 @@ class PlatformViewBuilder {
     return *this;
   }
 
-  PlatformViewBuilder& SetEnableWireframeCallback(OnEnableWireframe callback) {
+  PlatformViewBuilder& SetEnableWireframeCallback(
+      OnEnableWireframeCallback callback) {
     wireframe_enabled_callback_ = std::move(callback);
     return *this;
   }
@@ -399,37 +417,39 @@ class PlatformViewBuilder {
     return *this;
   }
 
-  PlatformViewBuilder& SetCreateViewCallback(OnCreateFlatlandView callback) {
+  PlatformViewBuilder& SetCreateViewCallback(OnCreateViewCallback callback) {
     on_create_view_callback_ = std::move(callback);
     return *this;
   }
 
-  PlatformViewBuilder& SetDestroyViewCallback(OnDestroyFlatlandView callback) {
+  PlatformViewBuilder& SetDestroyViewCallback(OnDestroyViewCallback callback) {
     on_destroy_view_callback_ = std::move(callback);
     return *this;
   }
 
-  PlatformViewBuilder& SetUpdateViewCallback(OnUpdateView callback) {
+  PlatformViewBuilder& SetUpdateViewCallback(OnUpdateViewCallback callback) {
     on_update_view_callback_ = std::move(callback);
     return *this;
   }
 
-  PlatformViewBuilder& SetCreateSurfaceCallback(OnCreateSurface callback) {
+  PlatformViewBuilder& SetCreateSurfaceCallback(
+      OnCreateSurfaceCallback callback) {
     on_create_surface_callback_ = std::move(callback);
     return *this;
   }
 
-  PlatformViewBuilder& SetShaderWarmupCallback(OnShaderWarmup callback) {
+  PlatformViewBuilder& SetShaderWarmupCallback(
+      OnShaderWarmupCallback callback) {
     on_shader_warmup_callback_ = std::move(callback);
     return *this;
   }
 
   // Once Build is called, the instance is no longer usable.
-  FlatlandPlatformView Build() {
+  PlatformView Build() {
     EXPECT_FALSE(std::exchange(built_, true))
         << "Build() was already called, this builder is good for one use only.";
-    return FlatlandPlatformView(
-        delegate_, task_runners_, std::move(view_ref_pair_.view_ref),
+    return PlatformView(
+        delegate_, task_runners_, std::move(view_ref_pair_.second),
         external_external_view_embedder_, std::move(ime_service_),
         std::move(keyboard_), std::move(touch_source_),
         std::move(mouse_source_), std::move(focuser_),
@@ -442,7 +462,8 @@ class PlatformViewBuilder {
         std::move(on_create_surface_callback_),
         std::move(on_semantics_node_update_callback_),
         std::move(on_request_announce_callback_),
-        std::move(on_shader_warmup_callback_), [](auto...) {}, [](auto...) {});
+        std::move(on_shader_warmup_callback_), [](auto...) {}, [](auto...) {},
+        nullptr);
   }
 
  private:
@@ -450,7 +471,8 @@ class PlatformViewBuilder {
 
   flutter::PlatformView::Delegate& delegate_;
   flutter::TaskRunners task_runners_;
-  scenic::ViewRefPair view_ref_pair_;
+  std::pair<fuchsia::ui::views::ViewRefControl, fuchsia::ui::views::ViewRef>
+      view_ref_pair_;
 
   std::shared_ptr<flutter::ExternalViewEmbedder>
       external_external_view_embedder_;
@@ -462,16 +484,16 @@ class PlatformViewBuilder {
   fuchsia::ui::views::FocuserHandle focuser_;
   fuchsia::ui::pointerinjector::RegistryHandle pointerinjector_registry_;
   fit::closure on_session_listener_error_callback_;
-  OnEnableWireframe wireframe_enabled_callback_;
+  OnEnableWireframeCallback wireframe_enabled_callback_;
   fuchsia::ui::composition::ParentViewportWatcherHandle
       parent_viewport_watcher_;
-  OnCreateFlatlandView on_create_view_callback_;
-  OnDestroyFlatlandView on_destroy_view_callback_;
-  OnUpdateView on_update_view_callback_;
-  OnCreateSurface on_create_surface_callback_;
-  OnSemanticsNodeUpdate on_semantics_node_update_callback_;
-  OnRequestAnnounce on_request_announce_callback_;
-  OnShaderWarmup on_shader_warmup_callback_;
+  OnCreateViewCallback on_create_view_callback_;
+  OnDestroyViewCallback on_destroy_view_callback_;
+  OnUpdateViewCallback on_update_view_callback_;
+  OnCreateSurfaceCallback on_create_surface_callback_;
+  OnSemanticsNodeUpdateCallback on_semantics_node_update_callback_;
+  OnRequestAnnounceCallback on_request_announce_callback_;
+  OnShaderWarmupCallback on_shader_warmup_callback_;
 
   bool built_{false};
 };
@@ -493,9 +515,9 @@ void UnpackPointerPacket(std::vector<flutter::PointerData>& output,  // NOLINT
 
 }  // namespace
 
-class FlatlandPlatformViewTests : public ::testing::Test {
+class PlatformViewTests : public ::testing::Test {
  protected:
-  FlatlandPlatformViewTests() : loop_(&kAsyncLoopConfigAttachToCurrentThread) {}
+  PlatformViewTests() : loop_(&kAsyncLoopConfigAttachToCurrentThread) {}
 
   async_dispatcher_t* dispatcher() { return loop_.dispatcher(); }
 
@@ -538,12 +560,12 @@ class FlatlandPlatformViewTests : public ::testing::Test {
 
   std::vector<std::unique_ptr<MockChildViewWatcher>> child_view_watchers_;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(FlatlandPlatformViewTests);
+  FML_DISALLOW_COPY_AND_ASSIGN(PlatformViewTests);
 };
 
 // This test makes sure that the PlatformView always completes a platform
 // message request, even for error conditions or if the request is malformed.
-TEST_F(FlatlandPlatformViewTests, InvalidPlatformMessageRequest) {
+TEST_F(PlatformViewTests, InvalidPlatformMessageRequest) {
   MockPlatformViewDelegate delegate;
   flutter::TaskRunners task_runners =
       flutter::TaskRunners("test_runners", nullptr, nullptr, nullptr, nullptr);
@@ -605,7 +627,7 @@ TEST_F(FlatlandPlatformViewTests, InvalidPlatformMessageRequest) {
 
 // This test makes sure that the PlatformView correctly returns a Surface
 // instance that can surface the provided gr_context and external_view_embedder.
-TEST_F(FlatlandPlatformViewTests, CreateSurfaceTest) {
+TEST_F(PlatformViewTests, CreateSurfaceTest) {
   MockPlatformViewDelegate delegate;
 
   flutter::TaskRunners task_runners =
@@ -644,7 +666,7 @@ TEST_F(FlatlandPlatformViewTests, CreateSurfaceTest) {
 // This test makes sure that the PlatformView correctly registers Scenic
 // MetricsEvents sent to it via FIDL, correctly parses the metrics it receives,
 // and calls the SetViewportMetrics callback with the appropriate parameters.
-TEST_F(FlatlandPlatformViewTests, SetViewportMetrics) {
+TEST_F(PlatformViewTests, SetViewportMetrics) {
   constexpr float kDPR = 2;
   constexpr uint32_t width = 640;
   constexpr uint32_t height = 480;
@@ -653,7 +675,6 @@ TEST_F(FlatlandPlatformViewTests, SetViewportMetrics) {
   EXPECT_EQ(delegate.metrics(), flutter::ViewportMetrics());
 
   MockParentViewportWatcher watcher;
-  std::vector<fuchsia::ui::scenic::Event> events;
   flutter::TaskRunners task_runners("test_runners", nullptr, nullptr, nullptr,
                                     nullptr);
   auto platform_view = PlatformViewBuilder(delegate, std::move(task_runners))
@@ -666,13 +687,13 @@ TEST_F(FlatlandPlatformViewTests, SetViewportMetrics) {
   RunLoopUntilIdle();
   EXPECT_EQ(delegate.metrics(),
             flutter::ViewportMetrics(kDPR, std::round(width * kDPR),
-                                     std::round(height * kDPR), -1.0));
+                                     std::round(height * kDPR), -1.0, 0));
 }
 
 // This test makes sure that the PlatformView correctly registers semantics
 // settings changes applied to it and calls the SetSemanticsEnabled /
 // SetAccessibilityFeatures callbacks with the appropriate parameters.
-TEST_F(FlatlandPlatformViewTests, ChangesAccessibilitySettings) {
+TEST_F(PlatformViewTests, ChangesAccessibilitySettings) {
   MockPlatformViewDelegate delegate;
   flutter::TaskRunners task_runners =
       flutter::TaskRunners("test_runners", nullptr, nullptr, nullptr, nullptr);
@@ -700,7 +721,7 @@ TEST_F(FlatlandPlatformViewTests, ChangesAccessibilitySettings) {
 
 // This test makes sure that the PlatformView forwards messages on the
 // "flutter/platform_views" channel for EnableWireframe.
-TEST_F(FlatlandPlatformViewTests, EnableWireframeTest) {
+TEST_F(PlatformViewTests, EnableWireframeTest) {
   MockPlatformViewDelegate delegate;
   flutter::TaskRunners task_runners =
       flutter::TaskRunners("test_runners", nullptr, nullptr, nullptr, nullptr);
@@ -744,7 +765,7 @@ TEST_F(FlatlandPlatformViewTests, EnableWireframeTest) {
 
 // This test makes sure that the PlatformView forwards messages on the
 // "flutter/platform_views" channel for Createview.
-TEST_F(FlatlandPlatformViewTests, CreateViewTest) {
+TEST_F(PlatformViewTests, CreateViewTest) {
   MockPlatformViewDelegate delegate;
   const uint64_t view_id = 42;
   flutter::TaskRunners task_runners =
@@ -763,8 +784,8 @@ TEST_F(FlatlandPlatformViewTests, CreateViewTest) {
   auto CreateViewCallback =
       [&create_view_called, this](
           int64_t view_id, flutter_runner::ViewCallback on_view_created,
-          flutter_runner::FlatlandViewCreatedCallback on_view_bound,
-          bool hit_testable, bool focusable) {
+          flutter_runner::ViewCreatedCallback on_view_bound, bool hit_testable,
+          bool focusable) {
         create_view_called = true;
         on_view_created();
         fuchsia::ui::composition::ContentId content_id;
@@ -782,14 +803,10 @@ TEST_F(FlatlandPlatformViewTests, CreateViewTest) {
 
   // JSON for the message to be passed into the PlatformView.
   std::ostringstream create_view_message;
-  create_view_message << "{"
-                      << "  \"method\":\"View.create\","
-                      << "  \"args\":{"
-                      << "    \"viewId\":" << view_id << ","
-                      << "    \"hitTestable\":true,"
-                      << "    \"focusable\":true"
-                      << "  }"
-                      << "}";
+  create_view_message << "{" << "  \"method\":\"View.create\","
+                      << "  \"args\":{" << "    \"viewId\":" << view_id << ","
+                      << "    \"hitTestable\":true," << "    \"focusable\":true"
+                      << "  }" << "}";
 
   std::string create_view_call = create_view_message.str();
   std::unique_ptr<flutter::PlatformMessage> message =
@@ -807,11 +824,9 @@ TEST_F(FlatlandPlatformViewTests, CreateViewTest) {
   // Platform view forwards the 'View.viewConnected' message on the
   // 'flutter/platform_views' channel when a view gets created.
   std::ostringstream view_connected_expected_out;
-  view_connected_expected_out << "{"
-                              << "\"method\":\"View.viewConnected\","
-                              << "\"args\":{"
-                              << "  \"viewId\":" << view_id << "  }"
-                              << "}";
+  view_connected_expected_out << "{" << "\"method\":\"View.viewConnected\","
+                              << "\"args\":{" << "  \"viewId\":" << view_id
+                              << "  }" << "}";
 
   ASSERT_NE(delegate.message(), nullptr);
   EXPECT_EQ(view_connected_expected_out.str(),
@@ -820,7 +835,7 @@ TEST_F(FlatlandPlatformViewTests, CreateViewTest) {
 
 // This test makes sure that the PlatformView forwards messages on the
 // "flutter/platform_views" channel for UpdateView.
-TEST_F(FlatlandPlatformViewTests, UpdateViewTest) {
+TEST_F(PlatformViewTests, UpdateViewTest) {
   MockPlatformViewDelegate delegate;
   flutter::TaskRunners task_runners =
       flutter::TaskRunners("test_runners", nullptr, nullptr, nullptr, nullptr);
@@ -935,7 +950,7 @@ TEST_F(FlatlandPlatformViewTests, UpdateViewTest) {
 
 // This test makes sure that the PlatformView forwards messages on the
 // "flutter/platform_views" channel for DestroyView.
-TEST_F(FlatlandPlatformViewTests, DestroyViewTest) {
+TEST_F(PlatformViewTests, DestroyViewTest) {
   MockPlatformViewDelegate delegate;
   const uint64_t view_id = 42;
 
@@ -950,26 +965,25 @@ TEST_F(FlatlandPlatformViewTests, DestroyViewTest) {
 
   bool destroy_view_called = false;
 
-  auto on_destroy_view =
-      [&destroy_view_called](
-          int64_t view_id,
-          flutter_runner::FlatlandViewIdCallback on_view_unbound) {
-        destroy_view_called = true;
-        fuchsia::ui::composition::ContentId content_id;
-        on_view_unbound(std::move(content_id));
-      };
+  auto on_destroy_view = [&destroy_view_called](
+                             int64_t view_id,
+                             flutter_runner::ViewIdCallback on_view_unbound) {
+    destroy_view_called = true;
+    fuchsia::ui::composition::ContentId content_id;
+    on_view_unbound(std::move(content_id));
+  };
 
   bool create_view_called = false;
-  auto on_create_view =
-      [&create_view_called, this](
-          int64_t view_id, flutter_runner::ViewCallback on_view_created,
-          flutter_runner::FlatlandViewCreatedCallback on_view_bound,
-          bool hit_testable, bool focusable) {
-        create_view_called = true;
-        on_view_created();
-        fuchsia::ui::composition::ContentId content_id;
-        on_view_bound(std::move(content_id), MakeChildViewWatcher());
-      };
+  auto on_create_view = [&create_view_called, this](
+                            int64_t view_id,
+                            flutter_runner::ViewCallback on_view_created,
+                            flutter_runner::ViewCreatedCallback on_view_bound,
+                            bool hit_testable, bool focusable) {
+    create_view_called = true;
+    on_view_created();
+    fuchsia::ui::composition::ContentId content_id;
+    on_view_bound(std::move(content_id), MakeChildViewWatcher());
+  };
 
   auto platform_view = PlatformViewBuilder(delegate, std::move(task_runners))
                            .SetCreateViewCallback(on_create_view)
@@ -982,14 +996,10 @@ TEST_F(FlatlandPlatformViewTests, DestroyViewTest) {
   EXPECT_TRUE(base_view);
 
   std::ostringstream create_message;
-  create_message << "{"
-                 << "    \"method\":\"View.create\","
-                 << "    \"args\": {"
-                 << "       \"viewId\":" << view_id << ","
+  create_message << "{" << "    \"method\":\"View.create\","
+                 << "    \"args\": {" << "       \"viewId\":" << view_id << ","
                  << "       \"hitTestable\":true,"
-                 << "       \"focusable\":true"
-                 << "    }"
-                 << "}";
+                 << "       \"focusable\":true" << "    }" << "}";
 
   auto create_response = FakePlatformMessageResponse::Create();
   base_view->HandlePlatformMessage(create_response->WithMessage(
@@ -1000,11 +1010,9 @@ TEST_F(FlatlandPlatformViewTests, DestroyViewTest) {
 
   // JSON for the message to be passed into the PlatformView.
   std::ostringstream dispose_message;
-  dispose_message << "{"
-                  << "    \"method\":\"View.dispose\","
-                  << "    \"args\": {"
-                  << "       \"viewId\":" << view_id << "    }"
-                  << "}";
+  dispose_message << "{" << "    \"method\":\"View.dispose\","
+                  << "    \"args\": {" << "       \"viewId\":" << view_id
+                  << "    }" << "}";
 
   std::string dispose_view_call = dispose_message.str();
   std::unique_ptr<flutter::PlatformMessage> message =
@@ -1022,11 +1030,9 @@ TEST_F(FlatlandPlatformViewTests, DestroyViewTest) {
   // Platform view forwards the 'View.viewDisconnected' message on the
   // 'flutter/platform_views' channel when a view gets destroyed.
   std::ostringstream view_disconnected_expected_out;
-  view_disconnected_expected_out << "{"
-                                 << "\"method\":\"View.viewDisconnected\","
-                                 << "\"args\":{"
-                                 << "  \"viewId\":" << view_id << "  }"
-                                 << "}";
+  view_disconnected_expected_out
+      << "{" << "\"method\":\"View.viewDisconnected\"," << "\"args\":{"
+      << "  \"viewId\":" << view_id << "  }" << "}";
 
   ASSERT_NE(delegate.message(), nullptr);
   EXPECT_EQ(view_disconnected_expected_out.str(),
@@ -1036,7 +1042,7 @@ TEST_F(FlatlandPlatformViewTests, DestroyViewTest) {
 // This test makes sure that the PlatformView forwards messages on the
 // "flutter/platform_views" channel for View.focus.getCurrent and
 // View.focus.getNext.
-TEST_F(FlatlandPlatformViewTests, GetFocusStatesTest) {
+TEST_F(PlatformViewTests, GetFocusStatesTest) {
   MockPlatformViewDelegate delegate;
   flutter::TaskRunners task_runners =
       flutter::TaskRunners("test_runners", nullptr, nullptr, nullptr, nullptr);
@@ -1095,7 +1101,7 @@ TEST_F(FlatlandPlatformViewTests, GetFocusStatesTest) {
 
 // This test makes sure that the PlatformView forwards messages on the
 // "flutter/platform_views" channel for View.focus.request.
-TEST_F(FlatlandPlatformViewTests, RequestFocusTest) {
+TEST_F(PlatformViewTests, RequestFocusTest) {
   MockPlatformViewDelegate delegate;
   flutter::TaskRunners task_runners =
       flutter::TaskRunners("test_runners",  // label
@@ -1111,16 +1117,16 @@ TEST_F(FlatlandPlatformViewTests, RequestFocusTest) {
   auto focuser_handle = focuser_bindings.AddBinding(&focuser);
 
   bool create_view_called = false;
-  auto on_create_view =
-      [&create_view_called, this](
-          int64_t view_id, flutter_runner::ViewCallback on_view_created,
-          flutter_runner::FlatlandViewCreatedCallback on_view_bound,
-          bool hit_testable, bool focusable) {
-        create_view_called = true;
-        on_view_created();
-        fuchsia::ui::composition::ContentId content_id;
-        on_view_bound(std::move(content_id), MakeChildViewWatcher());
-      };
+  auto on_create_view = [&create_view_called, this](
+                            int64_t view_id,
+                            flutter_runner::ViewCallback on_view_created,
+                            flutter_runner::ViewCreatedCallback on_view_bound,
+                            bool hit_testable, bool focusable) {
+    create_view_called = true;
+    on_view_created();
+    fuchsia::ui::composition::ContentId content_id;
+    on_view_bound(std::move(content_id), MakeChildViewWatcher());
+  };
 
   auto platform_view = PlatformViewBuilder(delegate, std::move(task_runners))
                            .SetFocuser(std::move(focuser_handle))
@@ -1135,14 +1141,10 @@ TEST_F(FlatlandPlatformViewTests, RequestFocusTest) {
   uint64_t view_id = 42;
 
   std::ostringstream create_message;
-  create_message << "{"
-                 << "    \"method\":\"View.create\","
-                 << "    \"args\": {"
-                 << "       \"viewId\":" << view_id << ","
+  create_message << "{" << "    \"method\":\"View.create\","
+                 << "    \"args\": {" << "       \"viewId\":" << view_id << ","
                  << "       \"hitTestable\":true,"
-                 << "       \"focusable\":true"
-                 << "    }"
-                 << "}";
+                 << "       \"focusable\":true" << "    }" << "}";
 
   // Dispatch the plaform message request.
   auto create_response = FakePlatformMessageResponse::Create();
@@ -1153,11 +1155,9 @@ TEST_F(FlatlandPlatformViewTests, RequestFocusTest) {
 
   // JSON for the message to be passed into the PlatformView.
   std::ostringstream focus_message;
-  focus_message << "{"
-                << "    \"method\":\"View.focus.requestById\","
-                << "    \"args\": {"
-                << "       \"viewId\":" << view_id << "    }"
-                << "}";
+  focus_message << "{" << "    \"method\":\"View.focus.requestById\","
+                << "    \"args\": {" << "       \"viewId\":" << view_id
+                << "    }" << "}";
 
   // Dispatch the plaform message request.
   auto focus_response = FakePlatformMessageResponse::Create();
@@ -1170,7 +1170,7 @@ TEST_F(FlatlandPlatformViewTests, RequestFocusTest) {
 }
 
 // This test tries to set focus on a view without creating it first
-TEST_F(FlatlandPlatformViewTests, RequestFocusNeverCreatedTest) {
+TEST_F(PlatformViewTests, RequestFocusNeverCreatedTest) {
   MockPlatformViewDelegate delegate;
   flutter::TaskRunners task_runners =
       flutter::TaskRunners("test_runners",  // label
@@ -1186,16 +1186,16 @@ TEST_F(FlatlandPlatformViewTests, RequestFocusNeverCreatedTest) {
   auto focuser_handle = focuser_bindings.AddBinding(&focuser);
 
   bool create_view_called = false;
-  auto on_create_view =
-      [&create_view_called, this](
-          int64_t view_id, flutter_runner::ViewCallback on_view_created,
-          flutter_runner::FlatlandViewCreatedCallback on_view_bound,
-          bool hit_testable, bool focusable) {
-        create_view_called = true;
-        on_view_created();
-        fuchsia::ui::composition::ContentId content_id;
-        on_view_bound(std::move(content_id), MakeChildViewWatcher());
-      };
+  auto on_create_view = [&create_view_called, this](
+                            int64_t view_id,
+                            flutter_runner::ViewCallback on_view_created,
+                            flutter_runner::ViewCreatedCallback on_view_bound,
+                            bool hit_testable, bool focusable) {
+    create_view_called = true;
+    on_view_created();
+    fuchsia::ui::composition::ContentId content_id;
+    on_view_bound(std::move(content_id), MakeChildViewWatcher());
+  };
 
   auto platform_view = PlatformViewBuilder(delegate, std::move(task_runners))
                            .SetFocuser(std::move(focuser_handle))
@@ -1208,11 +1208,9 @@ TEST_F(FlatlandPlatformViewTests, RequestFocusNeverCreatedTest) {
   uint64_t view_id = 42;
 
   std::ostringstream focus_message;
-  focus_message << "{"
-                << "    \"method\":\"View.focus.requestById\","
-                << "    \"args\": {"
-                << "       \"viewId\":" << view_id << "    }"
-                << "}";
+  focus_message << "{" << "    \"method\":\"View.focus.requestById\","
+                << "    \"args\": {" << "       \"viewId\":" << view_id
+                << "    }" << "}";
 
   // Dispatch the plaform message request.
   auto focus_response = FakePlatformMessageResponse::Create();
@@ -1224,7 +1222,7 @@ TEST_F(FlatlandPlatformViewTests, RequestFocusNeverCreatedTest) {
   EXPECT_FALSE(focuser.request_focus_called());
 }
 
-TEST_F(FlatlandPlatformViewTests, RequestFocusDisposedTest) {
+TEST_F(PlatformViewTests, RequestFocusDisposedTest) {
   MockPlatformViewDelegate delegate;
   flutter::TaskRunners task_runners =
       flutter::TaskRunners("test_runners",  // label
@@ -1240,27 +1238,26 @@ TEST_F(FlatlandPlatformViewTests, RequestFocusDisposedTest) {
   auto focuser_handle = focuser_bindings.AddBinding(&focuser);
 
   bool create_view_called = false;
-  auto on_create_view =
-      [&create_view_called, this](
-          int64_t view_id, flutter_runner::ViewCallback on_view_created,
-          flutter_runner::FlatlandViewCreatedCallback on_view_bound,
-          bool hit_testable, bool focusable) {
-        create_view_called = true;
-        on_view_created();
-        fuchsia::ui::composition::ContentId content_id;
-        on_view_bound(std::move(content_id), MakeChildViewWatcher());
-      };
+  auto on_create_view = [&create_view_called, this](
+                            int64_t view_id,
+                            flutter_runner::ViewCallback on_view_created,
+                            flutter_runner::ViewCreatedCallback on_view_bound,
+                            bool hit_testable, bool focusable) {
+    create_view_called = true;
+    on_view_created();
+    fuchsia::ui::composition::ContentId content_id;
+    on_view_bound(std::move(content_id), MakeChildViewWatcher());
+  };
 
   bool destroy_view_called = false;
 
-  auto on_destroy_view =
-      [&destroy_view_called](
-          int64_t view_id,
-          flutter_runner::FlatlandViewIdCallback on_view_unbound) {
-        destroy_view_called = true;
-        fuchsia::ui::composition::ContentId content_id;
-        on_view_unbound(std::move(content_id));
-      };
+  auto on_destroy_view = [&destroy_view_called](
+                             int64_t view_id,
+                             flutter_runner::ViewIdCallback on_view_unbound) {
+    destroy_view_called = true;
+    fuchsia::ui::composition::ContentId content_id;
+    on_view_unbound(std::move(content_id));
+  };
 
   auto platform_view = PlatformViewBuilder(delegate, std::move(task_runners))
                            .SetFocuser(std::move(focuser_handle))
@@ -1275,14 +1272,10 @@ TEST_F(FlatlandPlatformViewTests, RequestFocusDisposedTest) {
 
   // Create a new view
   std::ostringstream create_message;
-  create_message << "{"
-                 << "    \"method\":\"View.create\","
-                 << "    \"args\": {"
-                 << "       \"viewId\":" << view_id << ","
+  create_message << "{" << "    \"method\":\"View.create\","
+                 << "    \"args\": {" << "       \"viewId\":" << view_id << ","
                  << "       \"hitTestable\":true,"
-                 << "       \"focusable\":true"
-                 << "    }"
-                 << "}";
+                 << "       \"focusable\":true" << "    }" << "}";
 
   auto create_response = FakePlatformMessageResponse::Create();
   base_view->HandlePlatformMessage(create_response->WithMessage(
@@ -1292,11 +1285,9 @@ TEST_F(FlatlandPlatformViewTests, RequestFocusDisposedTest) {
   EXPECT_FALSE(destroy_view_called);
   // Dispose of the view
   std::ostringstream dispose_message;
-  dispose_message << "{"
-                  << "    \"method\":\"View.dispose\","
-                  << "    \"args\": {"
-                  << "       \"viewId\":" << view_id << "    }"
-                  << "}";
+  dispose_message << "{" << "    \"method\":\"View.dispose\","
+                  << "    \"args\": {" << "       \"viewId\":" << view_id
+                  << "    }" << "}";
 
   auto dispose_response = FakePlatformMessageResponse::Create();
   base_view->HandlePlatformMessage(dispose_response->WithMessage(
@@ -1306,11 +1297,9 @@ TEST_F(FlatlandPlatformViewTests, RequestFocusDisposedTest) {
 
   // Request focus on newly disposed view
   std::ostringstream focus_message;
-  focus_message << "{"
-                << "    \"method\":\"View.focus.requestById\","
-                << "    \"args\": {"
-                << "       \"viewId\":" << view_id << "    }"
-                << "}";
+  focus_message << "{" << "    \"method\":\"View.focus.requestById\","
+                << "    \"args\": {" << "       \"viewId\":" << view_id
+                << "    }" << "}";
 
   auto focus_response = FakePlatformMessageResponse::Create();
   base_view->HandlePlatformMessage(focus_response->WithMessage(
@@ -1323,7 +1312,7 @@ TEST_F(FlatlandPlatformViewTests, RequestFocusDisposedTest) {
 }
 
 // Makes sure that OnKeyEvent is dispatched as a platform message.
-TEST_F(FlatlandPlatformViewTests, OnKeyEvent) {
+TEST_F(PlatformViewTests, OnKeyEvent) {
   struct EventFlow {
     fuchsia::ui::input3::KeyEvent event;
     fuchsia::ui::input3::KeyEventStatus expected_key_event_status;
@@ -1408,7 +1397,7 @@ TEST_F(FlatlandPlatformViewTests, OnKeyEvent) {
   }
 }
 
-TEST_F(FlatlandPlatformViewTests, OnShaderWarmup) {
+TEST_F(PlatformViewTests, OnShaderWarmup) {
   MockPlatformViewDelegate delegate;
   flutter::TaskRunners task_runners =
       flutter::TaskRunners("test_runners", nullptr, nullptr, nullptr, nullptr);
@@ -1417,7 +1406,7 @@ TEST_F(FlatlandPlatformViewTests, OnShaderWarmup) {
   uint64_t height = 100;
   std::vector<std::string> shaders = {"foo.skp", "bar.skp", "baz.skp"};
 
-  OnShaderWarmup on_shader_warmup =
+  OnShaderWarmupCallback on_shader_warmup_callback =
       [&](const std::vector<std::string>& shaders_in,
           std::function<void(uint32_t)> completion_callback, uint64_t width_in,
           uint64_t height_in) {
@@ -1432,7 +1421,7 @@ TEST_F(FlatlandPlatformViewTests, OnShaderWarmup) {
       };
 
   auto platform_view = PlatformViewBuilder(delegate, std::move(task_runners))
-                           .SetShaderWarmupCallback(on_shader_warmup)
+                           .SetShaderWarmupCallback(on_shader_warmup_callback)
                            .Build();
 
   std::ostringstream shaders_array_ostream;
@@ -1449,13 +1438,11 @@ TEST_F(FlatlandPlatformViewTests, OnShaderWarmup) {
 
   // Create initial view for testing.
   std::ostringstream warmup_shaders_ostream;
-  warmup_shaders_ostream << "{"
-                         << "  \"method\":\"WarmupSkps\","
+  warmup_shaders_ostream << "{" << "  \"method\":\"WarmupSkps\","
                          << "  \"args\":{"
                          << "    \"shaders\":" << shaders_array_string << ","
                          << "    \"width\":" << width << ","
-                         << "    \"height\":" << height << "  }"
-                         << "}\n";
+                         << "    \"height\":" << height << "  }" << "}\n";
   std::string warmup_shaders_string = warmup_shaders_ostream.str();
 
   fml::RefPtr<TestPlatformMessageResponse> response(
@@ -1475,7 +1462,7 @@ TEST_F(FlatlandPlatformViewTests, OnShaderWarmup) {
   EXPECT_EQ(expected_result_string, response->result_string);
 }
 
-TEST_F(FlatlandPlatformViewTests, TouchSourceLogicalToPhysicalConversion) {
+TEST_F(PlatformViewTests, TouchSourceLogicalToPhysicalConversion) {
   constexpr uint32_t width = 640;
   constexpr uint32_t height = 480;
   constexpr std::array<std::array<float, 2>, 2> kRect = {
@@ -1502,7 +1489,8 @@ TEST_F(FlatlandPlatformViewTests, TouchSourceLogicalToPhysicalConversion) {
 
   viewport_watcher.SetLayout(width, height);
   RunLoopUntilIdle();
-  EXPECT_EQ(delegate.metrics(), flutter::ViewportMetrics(1, width, height, -1));
+  EXPECT_EQ(delegate.metrics(),
+            flutter::ViewportMetrics(1, width, height, -1, 0));
 
   // Inject
   std::vector<fuchsia::ui::pointer::TouchEvent> events =
diff --git a/shell/platform/fuchsia/flutter/tests/pointer_event_utility.h b/shell/platform/fuchsia/flutter/tests/pointer_event_utility.h
index 243638436bf27b8f1617ea94ed9fc50823f3cecf..1e3ce9fc6b56cf3e4945488ae767d0e54b327f36 100644
--- a/shell/platform/fuchsia/flutter/tests/pointer_event_utility.h
+++ b/shell/platform/fuchsia/flutter/tests/pointer_event_utility.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_TESTS_POINTER_EVENT_UTILITY_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_TESTS_POINTER_EVENT_UTILITY_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_POINTER_EVENT_UTILITY_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_POINTER_EVENT_UTILITY_H_
 
 #include <fuchsia/ui/pointer/cpp/fidl.h>
 #include <zircon/types.h>
@@ -70,4 +70,4 @@ class MouseEventBuilder {
 
 }  // namespace flutter_runner::testing
 
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_TESTS_POINTER_EVENT_UTILITY_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TESTS_POINTER_EVENT_UTILITY_H_
diff --git a/shell/platform/fuchsia/flutter/text_delegate.cc b/shell/platform/fuchsia/flutter/text_delegate.cc
index 20816e89a6834d6d3e45f0f19a8982f275a0d49a..7b933e85829e9ffd8387e3982d75f40f858433a5 100644
--- a/shell/platform/fuchsia/flutter/text_delegate.cc
+++ b/shell/platform/fuchsia/flutter/text_delegate.cc
@@ -141,7 +141,7 @@ void TextDelegate::ActivateIme() {
 }
 
 void TextDelegate::ActivateIme(fuchsia::ui::input::InputMethodAction action) {
-  DEBUG_CHECK(last_text_state_.has_value(), LOG_TAG, "");
+  FML_DCHECK(last_text_state_.has_value());
 
   requested_text_action_ = action;
   text_sync_service_->GetInputMethodEditor(
diff --git a/shell/platform/fuchsia/flutter/text_delegate.h b/shell/platform/fuchsia/flutter/text_delegate.h
index ce27c45b624d4af3ef2739aeefc68c89cc1af8b6..a1b935369dd2eea0d98182811afec9a13ed052f4 100644
--- a/shell/platform/fuchsia/flutter/text_delegate.h
+++ b/shell/platform/fuchsia/flutter/text_delegate.h
@@ -5,8 +5,8 @@
 /// Text editing functionality delegated from |PlatformView|.
 /// See |TextDelegate| for details.
 
-#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_TEXT_DELEGATE_H_
-#define FLUTTER_SHELL_PLATFORM_FUCHSIA_TEXT_DELEGATE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TEXT_DELEGATE_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TEXT_DELEGATE_H_
 
 #include <memory>
 
@@ -151,4 +151,4 @@ class TextDelegate : public fuchsia::ui::input3::KeyboardListener,
 
 }  // namespace flutter_runner
 
-#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_TEXT_DELEGATE_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_TEXT_DELEGATE_H_
diff --git a/shell/platform/fuchsia/flutter/text_delegate_unittests.cc b/shell/platform/fuchsia/flutter/text_delegate_unittests.cc
index 29835d0752d676b709750cea0224c33311fd83e0..b56e076d1dc66129d23189151baa016b8dee9b6a 100644
--- a/shell/platform/fuchsia/flutter/text_delegate_unittests.cc
+++ b/shell/platform/fuchsia/flutter/text_delegate_unittests.cc
@@ -12,7 +12,7 @@
 #include <lib/async-loop/default.h>
 #include <lib/fidl/cpp/binding.h>
 #include <lib/fidl/cpp/binding_set.h>
-#include <lib/ui/scenic/cpp/view_ref_pair.h>
+#include <lib/zx/eventpair.h>
 
 #include "tests/fakes/platform_message.h"
 
@@ -89,10 +89,15 @@ class TextDelegateTest : public ::testing::Test {
     fidl::InterfaceHandle<fuchsia::ui::input::ImeService> ime_service_handle;
     ime_service_binding_.Bind(ime_service_handle.NewRequest().TakeChannel());
 
-    auto fake_view_ref_pair = scenic::ViewRefPair::New();
+    fuchsia::ui::views::ViewRefControl view_ref_control;
+    fuchsia::ui::views::ViewRef view_ref;
+    auto status = zx::eventpair::create(
+        /*options*/ 0u, &view_ref_control.reference, &view_ref.reference);
+    ZX_ASSERT(status == ZX_OK);
+    view_ref.reference.replace(ZX_RIGHTS_BASIC, &view_ref.reference);
 
     text_delegate_ = std::make_unique<TextDelegate>(
-        std::move(fake_view_ref_pair.view_ref), std::move(ime_service_handle),
+        std::move(view_ref), std::move(ime_service_handle),
         std::move(keyboard_handle),
         // Should this be accessed through a weak pointer?
         [this](std::unique_ptr<flutter::PlatformMessage> message) {
diff --git a/shell/platform/fuchsia/flutter/unique_fdio_ns.h b/shell/platform/fuchsia/flutter/unique_fdio_ns.h
index 4ec58fd86d721f41291f51970fa7dad58b0cf396..eb8cbf4f80dae268f038cdd64907b7e8380f9822 100644
--- a/shell/platform/fuchsia/flutter/unique_fdio_ns.h
+++ b/shell/platform/fuchsia/flutter/unique_fdio_ns.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_UNIQUE_FDIO_NS_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_UNIQUE_FDIO_NS_H_
 
 #include "flutter/fml/logging.h"
 #include "flutter/fml/unique_object.h"
@@ -32,3 +33,5 @@ inline UniqueFDIONS UniqueFDIONSCreate() {
 }
 
 }  // namespace flutter_runner
+
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_UNIQUE_FDIO_NS_H_
diff --git a/shell/platform/fuchsia/flutter/vsync_waiter_unittest.cc b/shell/platform/fuchsia/flutter/vsync_waiter_unittest.cc
index f01a2a02c90c45ace8e5ebcc6e401e7ed52b00cb..3be48a61aee6e0e182932826b455452fb1cb551c 100644
--- a/shell/platform/fuchsia/flutter/vsync_waiter_unittest.cc
+++ b/shell/platform/fuchsia/flutter/vsync_waiter_unittest.cc
@@ -25,9 +25,9 @@ TEST(VSyncWaiterFuchsia, FrameScheduledForStartTime) {
   auto platform_task_runner = fml::MessageLoop::GetCurrent().GetTaskRunner();
 
   ThreadHost thread_host =
-      ThreadHost(prefix, flutter::ThreadHost::Type::RASTER |
-                             flutter::ThreadHost::Type::UI |
-                             flutter::ThreadHost::Type::IO);
+      ThreadHost(prefix, flutter::ThreadHost::Type::kRaster |
+                             flutter::ThreadHost::Type::kUi |
+                             flutter::ThreadHost::Type::kIo);
   const flutter::TaskRunners task_runners(
       prefix,                                      // Dart thread labels
       platform_task_runner,                        // platform
diff --git a/shell/platform/fuchsia/flutter/vulkan_surface.cc b/shell/platform/fuchsia/flutter/vulkan_surface.cc
index 7ca2e68f2065f0bcb258aec4a21476cb62325501..66e925f6053e868c41df84d7753b4edcf186cfcf 100644
--- a/shell/platform/fuchsia/flutter/vulkan_surface.cc
+++ b/shell/platform/fuchsia/flutter/vulkan_surface.cc
@@ -6,10 +6,10 @@
 
 #include <fuchsia/sysmem/cpp/fidl.h>
 #include <lib/async/default.h>
-#include <lib/ui/scenic/cpp/commands.h>
 
 #include <algorithm>
 
+#include "flutter/fml/logging.h"
 #include "flutter/fml/trace_event.h"
 #include "runtime/dart/utils/inlines.h"
 #include "third_party/skia/include/core/SkCanvas.h"
@@ -18,6 +18,8 @@
 #include "third_party/skia/include/gpu/GrBackendSemaphore.h"
 #include "third_party/skia/include/gpu/GrBackendSurface.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
+#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
+#include "third_party/skia/include/gpu/ganesh/vk/GrVkBackendSurface.h"
 #include "vulkan/vulkan_core.h"
 #include "vulkan/vulkan_fuchsia.h"
 
@@ -147,15 +149,13 @@ VulkanSurface::VulkanSurface(
     fuchsia::sysmem::AllocatorSyncPtr& sysmem_allocator,
     fuchsia::ui::composition::AllocatorPtr& flatland_allocator,
     sk_sp<GrDirectContext> context,
-    scenic::Session* session,
-    const SkISize& size,
-    uint32_t buffer_id)
-    : vulkan_provider_(vulkan_provider), session_(session), wait_(this) {
-  FML_CHECK(session_ || flatland_allocator.is_bound());
+    const SkISize& size)
+    : vulkan_provider_(vulkan_provider), wait_(this) {
+  FML_CHECK(flatland_allocator.is_bound());
   FML_CHECK(context != nullptr);
 
   if (!AllocateDeviceMemory(sysmem_allocator, flatland_allocator,
-                            std::move(context), size, buffer_id)) {
+                            std::move(context), size)) {
     FML_LOG(ERROR) << "VulkanSurface: Could not allocate device memory.";
     return;
   }
@@ -165,8 +165,6 @@ VulkanSurface::VulkanSurface(
     return;
   }
 
-  PushSessionImageSetupOps(session);
-
   std::fill(size_history_.begin(), size_history_.end(), SkISize::MakeEmpty());
 
   wait_.set_object(release_event_.get());
@@ -177,14 +175,7 @@ VulkanSurface::VulkanSurface(
 }
 
 VulkanSurface::~VulkanSurface() {
-  if (session_) {
-    if (image_id_) {
-      session_->Enqueue(scenic::NewReleaseResourceCmd(image_id_));
-    }
-    if (buffer_id_) {
-      session_->DeregisterBufferCollection(buffer_id_);
-    }
-  } else if (release_image_callback_) {
+  if (release_image_callback_) {
     release_image_callback_();
   }
   wait_.Cancel();
@@ -274,8 +265,7 @@ bool VulkanSurface::AllocateDeviceMemory(
     fuchsia::sysmem::AllocatorSyncPtr& sysmem_allocator,
     fuchsia::ui::composition::AllocatorPtr& flatland_allocator,
     sk_sp<GrDirectContext> context,
-    const SkISize& size,
-    uint32_t buffer_id) {
+    const SkISize& size) {
   if (size.isEmpty()) {
     FML_LOG(ERROR)
         << "VulkanSurface: Failed to allocate surface, size is empty";
@@ -296,29 +286,23 @@ bool VulkanSurface::AllocateDeviceMemory(
   LOG_AND_RETURN(status != ZX_OK,
                  "VulkanSurface: Failed to sync collection token");
 
-  if (session_) {
-    session_->RegisterBufferCollection(buffer_id, std::move(scenic_token));
-    buffer_id_ = buffer_id;
-  } else {
-    fuchsia::ui::composition::BufferCollectionExportToken export_token;
-    status =
-        zx::eventpair::create(0, &export_token.value, &import_token_.value);
-
-    fuchsia::ui::composition::RegisterBufferCollectionArgs args;
-    args.set_export_token(std::move(export_token));
-    args.set_buffer_collection_token(std::move(scenic_token));
-    args.set_usage(
-        fuchsia::ui::composition::RegisterBufferCollectionUsage::DEFAULT);
-    flatland_allocator->RegisterBufferCollection(
-        std::move(args),
-        [](fuchsia::ui::composition::Allocator_RegisterBufferCollection_Result
-               result) {
-          if (result.is_err()) {
-            FML_LOG(ERROR)
-                << "RegisterBufferCollection call to Scenic Allocator failed";
-          }
-        });
-  }
+  fuchsia::ui::composition::BufferCollectionExportToken export_token;
+  status = zx::eventpair::create(0, &export_token.value, &import_token_.value);
+
+  fuchsia::ui::composition::RegisterBufferCollectionArgs args;
+  args.set_export_token(std::move(export_token));
+  args.set_buffer_collection_token(std::move(scenic_token));
+  args.set_usage(
+      fuchsia::ui::composition::RegisterBufferCollectionUsage::DEFAULT);
+  flatland_allocator->RegisterBufferCollection(
+      std::move(args),
+      [](fuchsia::ui::composition::Allocator_RegisterBufferCollection_Result
+             result) {
+        if (result.is_err()) {
+          FML_LOG(ERROR)
+              << "RegisterBufferCollection call to Scenic Allocator failed";
+        }
+      });
 
   VkBufferCollectionCreateInfoFUCHSIA import_info{
       .sType = VK_STRUCTURE_TYPE_BUFFER_COLLECTION_CREATE_INFO_FUCHSIA,
@@ -426,23 +410,23 @@ bool VulkanSurface::SetupSkiaSurface(sk_sp<GrDirectContext> context,
   image_info.fSampleCount = 1;
   image_info.fLevelCount = image_create_info.mipLevels;
 
-  GrBackendRenderTarget sk_render_target(size.width(), size.height(), 0,
-                                         image_info);
+  auto sk_render_target =
+      GrBackendRenderTargets::MakeVk(size.width(), size.height(), image_info);
 
   SkSurfaceProps sk_surface_props(0, kUnknown_SkPixelGeometry);
 
   auto sk_surface =
-      SkSurface::MakeFromBackendRenderTarget(context.get(),             //
-                                             sk_render_target,          //
-                                             kTopLeft_GrSurfaceOrigin,  //
-                                             color_type,                //
-                                             SkColorSpace::MakeSRGB(),  //
-                                             &sk_surface_props          //
+      SkSurfaces::WrapBackendRenderTarget(context.get(),             //
+                                          sk_render_target,          //
+                                          kTopLeft_GrSurfaceOrigin,  //
+                                          color_type,                //
+                                          SkColorSpace::MakeSRGB(),  //
+                                          &sk_surface_props          //
       );
 
   if (!sk_surface || sk_surface->getCanvas() == nullptr) {
     FML_LOG(ERROR)
-        << "VulkanSurface: SkSurface::MakeFromBackendRenderTarget failed";
+        << "VulkanSurface: SkSurfaces::WrapBackendRenderTarget failed";
     return false;
   }
   sk_surface_ = std::move(sk_surface);
@@ -450,18 +434,8 @@ bool VulkanSurface::SetupSkiaSurface(sk_sp<GrDirectContext> context,
   return true;
 }
 
-void VulkanSurface::PushSessionImageSetupOps(scenic::Session* session) {
-  if (session) {
-    if (image_id_ == 0)
-      image_id_ = session->AllocResourceId();
-    session->Enqueue(scenic::NewCreateImage2Cmd(
-        image_id_, sk_surface_->width(), sk_surface_->height(), buffer_id_, 0));
-  }
-}
-
 void VulkanSurface::SetImageId(uint32_t image_id) {
   FML_CHECK(image_id_ == 0);
-  FML_CHECK(!session_);
   image_id_ = image_id;
 }
 
@@ -475,28 +449,24 @@ sk_sp<SkSurface> VulkanSurface::GetSkiaSurface() const {
 
 fuchsia::ui::composition::BufferCollectionImportToken
 VulkanSurface::GetBufferCollectionImportToken() {
-  FML_CHECK(!session_);
   fuchsia::ui::composition::BufferCollectionImportToken import_dup;
   import_token_.value.duplicate(ZX_RIGHT_SAME_RIGHTS, &import_dup.value);
   return import_dup;
 }
 
 zx::event VulkanSurface::GetAcquireFence() {
-  FML_CHECK(!session_);
   zx::event fence;
   acquire_event_.duplicate(ZX_RIGHT_SAME_RIGHTS, &fence);
   return fence;
 }
 
 zx::event VulkanSurface::GetReleaseFence() {
-  FML_CHECK(!session_);
   zx::event fence;
   release_event_.duplicate(ZX_RIGHT_SAME_RIGHTS, &fence);
   return fence;
 }
 void VulkanSurface::SetReleaseImageCallback(
     ReleaseImageCallback release_image_callback) {
-  FML_CHECK(!session_);
   release_image_callback_ = release_image_callback;
 }
 
@@ -508,16 +478,6 @@ size_t VulkanSurface::AdvanceAndGetAge() {
 }
 
 bool VulkanSurface::FlushSessionAcquireAndReleaseEvents() {
-  if (session_) {
-    zx::event acquire, release;
-    if (acquire_event_.duplicate(ZX_RIGHT_SAME_RIGHTS, &acquire) != ZX_OK ||
-        release_event_.duplicate(ZX_RIGHT_SAME_RIGHTS, &release) != ZX_OK) {
-      return false;
-    }
-    session_->EnqueueAcquireFence(std::move(acquire));
-    session_->EnqueueReleaseFence(std::move(release));
-  }
-
   age_ = 0;
   return true;
 }
@@ -531,10 +491,10 @@ void VulkanSurface::SignalWritesFinished(
     return;
   }
 
-  dart_utils::Check(pending_on_writes_committed_ == nullptr,
-                    "Attempted to signal a write on the surface when the "
-                    "previous write has not yet been acknowledged by the "
-                    "compositor.");
+  FML_CHECK(pending_on_writes_committed_ == nullptr)
+      << "Attempted to signal a write on the surface when the "
+         "previous write has not yet been acknowledged by the "
+         "compositor.";
 
   pending_on_writes_committed_ = on_writes_committed;
 }
@@ -549,7 +509,7 @@ void VulkanSurface::Reset() {
   VkFence fence = command_buffer_fence_;
 
   if (command_buffer_) {
-    VK_CALL_LOG_ERROR(vulkan_provider_.vk().WaitForFences(
+    VK_CALL_LOG_FATAL(vulkan_provider_.vk().WaitForFences(
         vulkan_provider_.vk_device(), 1, &fence, VK_TRUE, UINT64_MAX));
     command_buffer_.reset();
   }
diff --git a/shell/platform/fuchsia/flutter/vulkan_surface.h b/shell/platform/fuchsia/flutter/vulkan_surface.h
index 37db0c4fe35e5e5b0590e70ea54e27028644fbd3..17ef7c544c14c1d41d1c6db945e97fb602cb5e27 100644
--- a/shell/platform/fuchsia/flutter/vulkan_surface.h
+++ b/shell/platform/fuchsia/flutter/vulkan_surface.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_VULKAN_SURFACE_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_VULKAN_SURFACE_H_
 
 #include <lib/async/cpp/wait.h>
-#include <lib/ui/scenic/cpp/resources.h>
 #include <lib/zx/event.h>
 #include <lib/zx/vmo.h>
 
@@ -47,9 +47,7 @@ class VulkanSurface final : public SurfaceProducerSurface {
                 fuchsia::sysmem::AllocatorSyncPtr& sysmem_allocator,
                 fuchsia::ui::composition::AllocatorPtr& flatland_allocator,
                 sk_sp<GrDirectContext> context,
-                scenic::Session* session,
-                const SkISize& size,
-                uint32_t buffer_id);
+                const SkISize& size);
 
   ~VulkanSurface() override;
 
@@ -140,8 +138,7 @@ class VulkanSurface final : public SurfaceProducerSurface {
       fuchsia::sysmem::AllocatorSyncPtr& sysmem_allocator,
       fuchsia::ui::composition::AllocatorPtr& flatland_allocator,
       sk_sp<GrDirectContext> context,
-      const SkISize& size,
-      uint32_t buffer_id);
+      const SkISize& size);
 
   bool CreateVulkanImage(vulkan::VulkanProvider& vulkan_provider,
                          const SkISize& size,
@@ -155,21 +152,17 @@ class VulkanSurface final : public SurfaceProducerSurface {
 
   bool CreateFences();
 
-  void PushSessionImageSetupOps(scenic::Session* session);
-
   void Reset();
 
   vulkan::VulkanHandle<VkSemaphore> SemaphoreFromEvent(
       const zx::event& event) const;
 
   vulkan::VulkanProvider& vulkan_provider_;
-  scenic::Session* session_;
   VulkanImage vulkan_image_;
   vulkan::VulkanHandle<VkDeviceMemory> vk_memory_;
   VkMemoryAllocateInfo vk_memory_info_;
   vulkan::VulkanHandle<VkFence> command_buffer_fence_;
   sk_sp<SkSurface> sk_surface_;
-  uint32_t buffer_id_ = 0;
   fuchsia::ui::composition::BufferCollectionImportToken import_token_;
   uint32_t image_id_ = 0;
   vulkan::VulkanHandle<VkBufferCollectionFUCHSIA> collection_;
@@ -189,3 +182,5 @@ class VulkanSurface final : public SurfaceProducerSurface {
 };
 
 }  // namespace flutter_runner
+
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_VULKAN_SURFACE_H_
diff --git a/shell/platform/fuchsia/flutter/vulkan_surface_pool.cc b/shell/platform/fuchsia/flutter/vulkan_surface_pool.cc
index ce6fa2e03b5e83c1044b24ac0963676cc8319441..94df4a0f6f164766a0efbcd7d5a50d750b384fb0 100644
--- a/shell/platform/fuchsia/flutter/vulkan_surface_pool.cc
+++ b/shell/platform/fuchsia/flutter/vulkan_surface_pool.cc
@@ -30,11 +30,8 @@ static zx_koid_t GetCurrentProcessId() {
 }
 
 VulkanSurfacePool::VulkanSurfacePool(vulkan::VulkanProvider& vulkan_provider,
-                                     sk_sp<GrDirectContext> context,
-                                     scenic::Session* scenic_session)
-    : vulkan_provider_(vulkan_provider),
-      context_(std::move(context)),
-      scenic_session_(scenic_session) {
+                                     sk_sp<GrDirectContext> context)
+    : vulkan_provider_(vulkan_provider), context_(std::move(context)) {
   FML_CHECK(context_ != nullptr);
 
   zx_status_t status = fdio_service_connect(
@@ -44,12 +41,10 @@ VulkanSurfacePool::VulkanSurfacePool(vulkan::VulkanProvider& vulkan_provider,
                                         GetCurrentProcessId());
   FML_DCHECK(status == ZX_OK);
 
-  if (!scenic_session_) {
-    status = fdio_service_connect(
-        "/svc/fuchsia.ui.composition.Allocator",
-        flatland_allocator_.NewRequest().TakeChannel().release());
-    FML_DCHECK(status == ZX_OK);
-  }
+  status = fdio_service_connect(
+      "/svc/fuchsia.ui.composition.Allocator",
+      flatland_allocator_.NewRequest().TakeChannel().release());
+  FML_DCHECK(status == ZX_OK);
 }
 
 VulkanSurfacePool::~VulkanSurfacePool() {}
@@ -124,8 +119,7 @@ std::unique_ptr<VulkanSurface> VulkanSurfacePool::CreateSurface(
   TRACE_EVENT2("flutter", "VulkanSurfacePool::CreateSurface", "width",
                size.width(), "height", size.height());
   auto surface = std::make_unique<VulkanSurface>(
-      vulkan_provider_, sysmem_allocator_, flatland_allocator_, context_,
-      scenic_session_, size, buffer_id_++);
+      vulkan_provider_, sysmem_allocator_, flatland_allocator_, context_, size);
   if (!surface->IsValid()) {
     FML_LOG(ERROR) << "VulkanSurfaceProducer: Created surface is invalid";
     return nullptr;
diff --git a/shell/platform/fuchsia/flutter/vulkan_surface_pool.h b/shell/platform/fuchsia/flutter/vulkan_surface_pool.h
index 694b8396c6c5226ec40b8dd2268e23af03041942..b6ddf25468cb68e024519481aec744d06c59b925 100644
--- a/shell/platform/fuchsia/flutter/vulkan_surface_pool.h
+++ b/shell/platform/fuchsia/flutter/vulkan_surface_pool.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_VULKAN_SURFACE_POOL_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_VULKAN_SURFACE_POOL_H_
 
 #include <fuchsia/ui/composition/cpp/fidl.h>
 
@@ -23,8 +24,7 @@ class VulkanSurfacePool final {
   static constexpr int kMaxSurfaceAge = 3;
 
   VulkanSurfacePool(vulkan::VulkanProvider& vulkan_provider,
-                    sk_sp<GrDirectContext> context,
-                    scenic::Session* scenic_session);
+                    sk_sp<GrDirectContext> context);
 
   ~VulkanSurfacePool();
 
@@ -42,13 +42,11 @@ class VulkanSurfacePool final {
  private:
   vulkan::VulkanProvider& vulkan_provider_;
   sk_sp<GrDirectContext> context_;
-  scenic::Session* scenic_session_;
   fuchsia::sysmem::AllocatorSyncPtr sysmem_allocator_;
   fuchsia::ui::composition::AllocatorPtr flatland_allocator_;
   std::vector<std::unique_ptr<VulkanSurface>> available_surfaces_;
   std::unordered_map<uintptr_t, std::unique_ptr<VulkanSurface>>
       pending_surfaces_;
-  uint32_t buffer_id_ = 1;
 
   size_t trace_surfaces_created_ = 0;
   size_t trace_surfaces_reused_ = 0;
@@ -65,3 +63,5 @@ class VulkanSurfacePool final {
 };
 
 }  // namespace flutter_runner
+
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_VULKAN_SURFACE_POOL_H_
diff --git a/shell/platform/fuchsia/flutter/vulkan_surface_producer.cc b/shell/platform/fuchsia/flutter/vulkan_surface_producer.cc
index 55ccbda9c7ca8e75d5a38d096ee2dd2672dc32fd..538827ef76cb574348272c717c9cb60865bc4643 100644
--- a/shell/platform/fuchsia/flutter/vulkan_surface_producer.cc
+++ b/shell/platform/fuchsia/flutter/vulkan_surface_producer.cc
@@ -14,8 +14,13 @@
 #include "flutter/fml/trace_event.h"
 #include "flutter/vulkan/vulkan_skia_proc_table.h"
 #include "flutter_vma/flutter_skia_vma.h"
+
+#include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/gpu/GrBackendSemaphore.h"
 #include "third_party/skia/include/gpu/GrBackendSurface.h"
+#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
+#include "third_party/skia/include/gpu/ganesh/vk/GrVkBackendSurface.h"
+#include "third_party/skia/include/gpu/ganesh/vk/GrVkDirectContext.h"
 #include "third_party/skia/include/gpu/vk/GrVkBackendContext.h"
 #include "third_party/skia/include/gpu/vk/GrVkExtensions.h"
 #include "third_party/skia/include/gpu/vk/GrVkTypes.h"
@@ -37,8 +42,8 @@ constexpr size_t kGrCacheMaxByteSize = 1024 * 600 * 12 * 4;
 
 }  // namespace
 
-VulkanSurfaceProducer::VulkanSurfaceProducer(scenic::Session* scenic_session) {
-  valid_ = Initialize(scenic_session);
+VulkanSurfaceProducer::VulkanSurfaceProducer() {
+  valid_ = Initialize();
 
   if (!valid_) {
     FML_LOG(FATAL) << "VulkanSurfaceProducer: Initialization failed";
@@ -54,7 +59,7 @@ VulkanSurfaceProducer::~VulkanSurfaceProducer() {
   }
 };
 
-bool VulkanSurfaceProducer::Initialize(scenic::Session* scenic_session) {
+bool VulkanSurfaceProducer::Initialize() {
   vk_ = fml::MakeRefCounted<vulkan::VulkanProcTable>();
 
   std::vector<std::string> extensions = {
@@ -149,7 +154,7 @@ bool VulkanSurfaceProducer::Initialize(scenic::Session* scenic_session) {
   GrContextOptions options;
   options.fReduceOpsTaskSplitting = GrContextOptions::Enable::kNo;
 
-  context_ = GrDirectContext::MakeVulkan(backend_context, options);
+  context_ = GrDirectContexts::MakeVulkan(backend_context, options);
 
   if (context_ == nullptr) {
     FML_LOG(ERROR)
@@ -160,8 +165,7 @@ bool VulkanSurfaceProducer::Initialize(scenic::Session* scenic_session) {
   // Use local limits specified in this file above instead of flutter defaults.
   context_->setResourceCacheLimit(kGrCacheMaxByteSize);
 
-  surface_pool_ =
-      std::make_unique<VulkanSurfacePool>(*this, context_, scenic_session);
+  surface_pool_ = std::make_unique<VulkanSurfacePool>(*this, context_);
 
   return true;
 }
@@ -219,34 +223,33 @@ bool VulkanSurfaceProducer::TransitionSurfacesToExternal(
     if (!command_buffer->Begin())
       return false;
 
-    GrBackendRenderTarget backendRT =
-        vk_surface->GetSkiaSurface()->getBackendRenderTarget(
-            SkSurface::kFlushRead_BackendHandleAccess);
+    GrBackendRenderTarget backendRT = SkSurfaces::GetBackendRenderTarget(
+        vk_surface->GetSkiaSurface().get(),
+        SkSurfaces::BackendHandleAccess::kFlushRead);
     if (!backendRT.isValid()) {
       return false;
     }
     GrVkImageInfo imageInfo;
-    if (!backendRT.getVkImageInfo(&imageInfo)) {
+    if (!GrBackendRenderTargets::GetVkImageInfo(backendRT, &imageInfo)) {
       return false;
     }
 
     VkImageMemoryBarrier image_barrier = {
-      .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
-      .pNext = nullptr,
-      .srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,
-      .dstAccessMask = 0,
-      .oldLayout = imageInfo.fImageLayout,
+        .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
+        .pNext = nullptr,
+        .srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,
+        .dstAccessMask = 0,
+        .oldLayout = imageInfo.fImageLayout,
     // Understand why this is causing issues on Intel. TODO(fxb/53449)
 #if defined(__aarch64__)
-      .newLayout = imageInfo.fImageLayout,
+        .newLayout = imageInfo.fImageLayout,
 #else
-      .newLayout = VK_IMAGE_LAYOUT_GENERAL,
+        .newLayout = VK_IMAGE_LAYOUT_GENERAL,
 #endif
-      .srcQueueFamilyIndex = 0,
-      .dstQueueFamilyIndex = VK_QUEUE_FAMILY_EXTERNAL_KHR,
-      .image = vk_surface->GetVkImage(),
-      .subresourceRange = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1}
-    };
+        .srcQueueFamilyIndex = 0,
+        .dstQueueFamilyIndex = VK_QUEUE_FAMILY_EXTERNAL_KHR,
+        .image = vk_surface->GetVkImage(),
+        .subresourceRange = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1}};
 
     if (!command_buffer->InsertPipelineBarrier(
             VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
@@ -257,7 +260,8 @@ bool VulkanSurfaceProducer::TransitionSurfacesToExternal(
             1, &image_barrier))
       return false;
 
-    backendRT.setVkImageLayout(image_barrier.newLayout);
+    GrBackendRenderTargets::SetVkImageLayout(&backendRT,
+                                             image_barrier.newLayout);
 
     if (!command_buffer->End())
       return false;
diff --git a/shell/platform/fuchsia/flutter/vulkan_surface_producer.h b/shell/platform/fuchsia/flutter/vulkan_surface_producer.h
index 10f025399b8b56488ff1f50b708d5ba6bb732098..d93691be867c187b41f33fb5544e6e8387b07482 100644
--- a/shell/platform/fuchsia/flutter/vulkan_surface_producer.h
+++ b/shell/platform/fuchsia/flutter/vulkan_surface_producer.h
@@ -2,13 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_VULKAN_SURFACE_PRODUCER_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_VULKAN_SURFACE_PRODUCER_H_
 
 #include <lib/async/cpp/time.h>
 #include <lib/async/default.h>
-#include <lib/syslog/global.h>
-#include <lib/ui/scenic/cpp/resources.h>
-#include <lib/ui/scenic/cpp/session.h>
 
 #include "flutter/flutter_vma/flutter_skia_vma.h"
 #include "flutter/fml/macros.h"
@@ -28,7 +26,7 @@ namespace flutter_runner {
 class VulkanSurfaceProducer final : public SurfaceProducer,
                                     public vulkan::VulkanProvider {
  public:
-  explicit VulkanSurfaceProducer(scenic::Session* scenic_session);
+  explicit VulkanSurfaceProducer();
   ~VulkanSurfaceProducer() override;
 
   bool IsValid() const { return valid_; }
@@ -55,7 +53,7 @@ class VulkanSurfaceProducer final : public SurfaceProducer,
     return logical_device_->GetHandle();
   }
 
-  bool Initialize(scenic::Session* scenic_session);
+  bool Initialize();
 
   void SubmitSurface(std::unique_ptr<SurfaceProducerSurface> surface);
   bool TransitionSurfacesToExternal(
@@ -85,3 +83,5 @@ class VulkanSurfaceProducer final : public SurfaceProducer,
 };
 
 }  // namespace flutter_runner
+
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_VULKAN_SURFACE_PRODUCER_H_
diff --git a/shell/platform/fuchsia/runtime/dart/profiler_symbols/BUILD.gn b/shell/platform/fuchsia/runtime/dart/profiler_symbols/BUILD.gn
index 4f4e683ba1b9f60e6c5fd1272f6e566c229728fe..61b63713e3467d3e552a14e924f7842d67ab602d 100644
--- a/shell/platform/fuchsia/runtime/dart/profiler_symbols/BUILD.gn
+++ b/shell/platform/fuchsia/runtime/dart/profiler_symbols/BUILD.gn
@@ -2,8 +2,11 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/toolchain/toolchain.gni")
+import("//flutter/build/dart/dart.gni")
 import("//flutter/tools/fuchsia/clang.gni")
-import("//third_party/dart/build/dart/dart_action.gni")
+
+import("$dart_src/build/dart/dart_action.gni")
 
 template("generate_dart_profiler_symbols") {
   assert(defined(invoker.library_label), "Must define 'library_label'")
@@ -17,11 +20,11 @@ template("generate_dart_profiler_symbols") {
 
     script = "dart_profiler_symbols.dart"
 
-    packages = rebase_path("//third_party/dart/.dart_tool/package_config.json")
+    packages = rebase_path("$dart_src/.dart_tool/package_config.json")
 
     args = [
       "--nm",
-      rebase_path("//buildtools/${host_os}-${host_cpu}/clang/bin/llvm-nm"),
+      rebase_path("$buildtools_path/${host_os}-${host_cpu}/clang/bin/llvm-nm"),
       "--binary",
       rebase_path(invoker.library_path),
       "--output",
diff --git a/shell/platform/fuchsia/runtime/dart/profiler_symbols/pubspec.yaml b/shell/platform/fuchsia/runtime/dart/profiler_symbols/pubspec.yaml
index 56bddf8c6277a4f2b3aa5d45c582ac53d0db37f1..7076e2a537f4404299d10fa57f336894513c4085 100644
--- a/shell/platform/fuchsia/runtime/dart/profiler_symbols/pubspec.yaml
+++ b/shell/platform/fuchsia/runtime/dart/profiler_symbols/pubspec.yaml
@@ -4,7 +4,7 @@
 
 name: profiler_symbols
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=3.2.0-0 <4.0.0'
 version: 0
 description: Extracts a minimal symbols table for the Dart VM profiler
 author: Dart Team <misc@dartlang.org>
diff --git a/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn b/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn
index fc1e9cc5c9d5c04674651cee1aafb93122bece4e..08660b51436b5d28d0bd5fbb5b628420b96694eb 100644
--- a/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn
+++ b/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn
@@ -4,9 +4,9 @@
 
 assert(is_fuchsia)
 
-import("//build/fuchsia/sdk.gni")
 import("//flutter/common/config.gni")
 import("//flutter/testing/testing.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
 
 config("utils_config") {
   include_dirs = [ "../../.." ]
@@ -37,19 +37,18 @@ template("make_utils") {
 
     deps = invoker.deps + [
              ":generate_build_info_cc_file",
-             "$fuchsia_sdk_root/fidl:fuchsia.feedback",
-             "$fuchsia_sdk_root/fidl:fuchsia.mem",
-             "$fuchsia_sdk_root/pkg:async-loop",
-             "$fuchsia_sdk_root/pkg:async-loop-cpp",
-             "$fuchsia_sdk_root/pkg:async-loop-default",
-             "$fuchsia_sdk_root/pkg:fdio",
-             "$fuchsia_sdk_root/pkg:memfs",
-             "$fuchsia_sdk_root/pkg:sys_cpp",
-             "$fuchsia_sdk_root/pkg:sys_inspect_cpp",
-             "$fuchsia_sdk_root/pkg:syslog",
-             "$fuchsia_sdk_root/pkg:trace",
-             "$fuchsia_sdk_root/pkg:vfs_cpp",
-             "$fuchsia_sdk_root/pkg:zx",
+             "${fuchsia_sdk}/fidl/fuchsia.feedback",
+             "${fuchsia_sdk}/fidl/fuchsia.mem",
+             "${fuchsia_sdk}/pkg/async-loop",
+             "${fuchsia_sdk}/pkg/async-loop-cpp",
+             "${fuchsia_sdk}/pkg/async-loop-default",
+             "${fuchsia_sdk}/pkg/fdio",
+             "${fuchsia_sdk}/pkg/sys_cpp",
+             "${fuchsia_sdk}/pkg/inspect_component_cpp",
+             "${fuchsia_sdk}/pkg/trace",
+             "${fuchsia_sdk}/pkg/vfs_cpp",
+             "${fuchsia_sdk}/pkg/zx",
+             "//flutter/fml",
              "//flutter/third_party/tonic",
            ]
 
@@ -62,7 +61,7 @@ action("generate_build_info_cc_file") {
     "build_info_in.cc",
     "//flutter/.git/logs/HEAD",
     "//fuchsia/sdk/$host_os/meta/manifest.json",
-    "//third_party/dart/.git/logs/HEAD",
+    "$dart_src/.git/logs/HEAD",
   ]
   outputs = [ "$target_gen_dir/build_info.cc" ]
 
@@ -78,7 +77,7 @@ action("generate_build_info_cc_file") {
 }
 
 make_utils("utils") {
-  deps = [ "//third_party/dart/runtime/bin:elf_loader" ]
+  deps = [ "$dart_src/runtime/bin:elf_loader" ]
 }
 
 test_fixtures("utils_fixtures") {
@@ -93,20 +92,22 @@ executable("dart_utils_unittests") {
   sources = [ "build_info_unittests.cc" ]
 
   libs = [
-    # This is needed for //third_party/googletest for linking zircon symbols.
-    "$fuchsia_sdk_path/arch/$target_cpu/sysroot/lib/libzircon.so",
+    # This is needed for //flutter/third_party/googletest for linking zircon
+    # symbols.
+    "${fuchsia_arch_root}/sysroot/lib/libzircon.so",
   ]
 
   deps = [
     ":utils",
     ":utils_fixtures",
-    "$fuchsia_sdk_root/pkg:sys_inspect_cpp",
+    "$dart_src/runtime:libdart_jit",
+    "$dart_src/runtime/bin:dart_io_api",
+    "${fuchsia_sdk}/pkg/inspect_component_cpp",
+    "${fuchsia_sdk}/pkg/sys_cpp",
     "//flutter/testing",
-    "//third_party/dart/runtime:libdart_jit",
-    "//third_party/dart/runtime/bin:dart_io_api",
   ]
 }
 
 make_utils("utils_product") {
-  deps = [ "//third_party/dart/runtime/bin:elf_loader_product" ]
+  deps = [ "$dart_src/runtime/bin:elf_loader_product" ]
 }
diff --git a/shell/platform/fuchsia/runtime/dart/utils/files.cc b/shell/platform/fuchsia/runtime/dart/utils/files.cc
index c0223bd81d7ba8e0c0cad938b2a36cd3cc871140..08391b320b928a41b4e83efdf38b574c545ac0a7 100644
--- a/shell/platform/fuchsia/runtime/dart/utils/files.cc
+++ b/shell/platform/fuchsia/runtime/dart/utils/files.cc
@@ -5,18 +5,18 @@
 #include "files.h"
 
 #include <fcntl.h>
+#include <unistd.h>
 
 #include <cstdint>
 
-#include "inlines.h"
-#include "logging.h"
+#include "flutter/fml/logging.h"
 
 namespace dart_utils {
 
 namespace {
 
 bool ReadFileDescriptor(int fd, std::string* result) {
-  DEBUG_CHECK(result, LOG_TAG, "");
+  FML_DCHECK(result);
   result->clear();
 
   if (fd < 0) {
diff --git a/shell/platform/fuchsia/runtime/dart/utils/handle_exception.cc b/shell/platform/fuchsia/runtime/dart/utils/handle_exception.cc
index 2c9106358ef8322d41bc4a599fc50b56586153ba..e1b12beb085d557e510360d8a6b5fa80ee006522 100644
--- a/shell/platform/fuchsia/runtime/dart/utils/handle_exception.cc
+++ b/shell/platform/fuchsia/runtime/dart/utils/handle_exception.cc
@@ -6,17 +6,15 @@
 
 #include <fuchsia/feedback/cpp/fidl.h>
 #include <fuchsia/mem/cpp/fidl.h>
-#include <lib/syslog/global.h>
 #include <lib/zx/vmo.h>
 #include <sys/types.h>
 #include <zircon/status.h>
 
 #include <string>
 
+#include "flutter/fml/logging.h"
 #include "third_party/tonic/converter/dart_converter.h"
 
-#include "logging.h"
-
 namespace {
 static bool SetStackTrace(const std::string& data,
                           fuchsia::feedback::RuntimeCrashReport* report) {
@@ -51,10 +49,9 @@ fuchsia::feedback::CrashReport BuildCrashReport(
   std::string error_message;
   const size_t delimiter_pos = error.find_first_of(':');
   if (delimiter_pos == std::string::npos) {
-    FX_LOGF(ERROR, LOG_TAG,
-            "error parsing Dart exception: expected format '$RuntimeType: "
-            "$Message', got '%s'",
-            error.c_str());
+    FML_LOG(ERROR) << "error parsing Dart exception: expected format "
+                      "'$RuntimeType: $Message', got '"
+                   << error << "'";
     // We still need to specify a type, otherwise the stack trace does not
     // show up in the crash server UI.
     error_type = "UnknownError";
@@ -74,7 +71,7 @@ fuchsia::feedback::CrashReport BuildCrashReport(
   dart_report.set_exception_type(error_type);
   dart_report.set_exception_message(error_message);
   if (!SetStackTrace(stack_trace, &dart_report)) {
-    FX_LOG(ERROR, LOG_TAG, "Failed to convert Dart stack trace to VMO");
+    FML_LOG(ERROR) << "Failed to convert Dart stack trace to VMO";
   }
 
   fuchsia::feedback::SpecificCrashReport specific_report;
@@ -114,12 +111,12 @@ void HandleException(std::shared_ptr<::sys::ServiceDirectory> services,
 
   fuchsia::feedback::CrashReporterPtr crash_reporter =
       services->Connect<fuchsia::feedback::CrashReporter>();
-  crash_reporter->File(
+  crash_reporter->FileReport(
       std::move(crash_report),
-      [](fuchsia::feedback::CrashReporter_File_Result result) {
+      [](fuchsia::feedback::CrashReporter_FileReport_Result result) {
         if (result.is_err()) {
-          FX_LOGF(ERROR, LOG_TAG, "Failed to report Dart exception: %d (%s)",
-                  result.err(), zx_status_get_string(result.err()));
+          FML_LOG(ERROR) << "Failed to report Dart exception: "
+                         << static_cast<uint32_t>(result.err());
         }
       });
 }
diff --git a/shell/platform/fuchsia/runtime/dart/utils/inlines.h b/shell/platform/fuchsia/runtime/dart/utils/inlines.h
index 5bd6b07d0b7d5cf531afc04cd33ef297ea91ed88..d80ae301ffb932a3721eb9eafd209facb442d02d 100644
--- a/shell/platform/fuchsia/runtime/dart/utils/inlines.h
+++ b/shell/platform/fuchsia/runtime/dart/utils/inlines.h
@@ -5,23 +5,8 @@
 #ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_RUNTIME_DART_UTILS_INLINES_H_
 #define FLUTTER_SHELL_PLATFORM_FUCHSIA_RUNTIME_DART_UTILS_INLINES_H_
 
-#include <lib/syslog/global.h>
-
 namespace dart_utils {
 
-inline void Check(bool condition, const char* tag, const char* message = "") {
-  if (!condition) {
-    FX_LOG(FATAL, tag, message);
-  }
-}
-
-#ifndef NDEBUG
-#define DEBUG_CHECK(condition, tag, message) \
-  dart_utils::Check(condition, tag, message)
-#else
-#define DEBUG_CHECK(condition, tag, message) (true || (condition))
-#endif
-
 template <size_t SIZE, typename T>
 inline size_t ArraySize(T (&array)[SIZE]) {
   return SIZE;
diff --git a/shell/platform/fuchsia/runtime/dart/utils/mapped_resource.cc b/shell/platform/fuchsia/runtime/dart/utils/mapped_resource.cc
index b265127e8fe09f1ea51c179709014bafe26bf47e..c9c657b47bba74c7679c75f0b65ca29597f48656 100644
--- a/shell/platform/fuchsia/runtime/dart/utils/mapped_resource.cc
+++ b/shell/platform/fuchsia/runtime/dart/utils/mapped_resource.cc
@@ -10,7 +10,6 @@
 #include <fuchsia/mem/cpp/fidl.h>
 #include <lib/fdio/directory.h>
 #include <lib/fdio/io.h>
-#include <lib/syslog/global.h>
 #include <lib/trace/event.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
@@ -18,10 +17,10 @@
 #include <zircon/dlfcn.h>
 #include <zircon/status.h>
 
+#include "flutter/fml/logging.h"
 #include "third_party/dart/runtime/include/dart_api.h"
 
 #include "inlines.h"
-#include "logging.h"
 #include "vmo.h"
 
 namespace dart_utils {
@@ -34,18 +33,18 @@ static bool OpenVmo(fuchsia::mem::Buffer* resource_vmo,
 
   if (namespc == nullptr) {
     // Opening a file in the root namespace expects an absolute path.
-    dart_utils::Check(path[0] == '/', LOG_TAG);
+    FML_CHECK(path[0] == '/');
     if (!VmoFromFilename(path, executable, resource_vmo)) {
       return false;
     }
   } else {
     // openat of a path with a leading '/' ignores the namespace fd.
     // require a relative path.
-    dart_utils::Check(path[0] != '/', LOG_TAG);
+    FML_CHECK(path[0] != '/');
 
     auto root_dir = fdio_ns_opendir(namespc);
     if (root_dir < 0) {
-      FX_LOG(ERROR, LOG_TAG, "Failed to open namespace directory");
+      FML_LOG(ERROR) << "Failed to open namespace directory";
       return false;
     }
 
@@ -85,7 +84,7 @@ bool MappedResource::LoadFromVmo(const std::string& path,
   zx_status_t status = zx::vmar::root_self()->map(flags, 0, resource_vmo.vmo, 0,
                                                   resource_vmo.size, &addr);
   if (status != ZX_OK) {
-    FX_LOGF(ERROR, LOG_TAG, "Failed to map: %s", zx_status_get_string(status));
+    FML_LOG(ERROR) << "Failed to map: " << zx_status_get_string(status);
     return false;
   }
 
@@ -108,14 +107,14 @@ static int OpenFdExec(const std::string& path, int dirfd) {
   if (dirfd == AT_FDCWD) {
     // fdio_open_fd_at does not support AT_FDCWD, by design.  Use fdio_open_fd
     // and expect an absolute path for that usage pattern.
-    dart_utils::Check(path[0] == '/', LOG_TAG);
+    FML_CHECK(path[0] == '/');
     result = fdio_open_fd(
         path.c_str(),
         static_cast<uint32_t>(fuchsia::io::OpenFlags::RIGHT_READABLE |
                               fuchsia::io::OpenFlags::RIGHT_EXECUTABLE),
         &fd);
   } else {
-    dart_utils::Check(path[0] != '/', LOG_TAG);
+    FML_CHECK(path[0] != '/');
     result = fdio_open_fd_at(
         dirfd, path.c_str(),
         static_cast<uint32_t>(fuchsia::io::OpenFlags::RIGHT_READABLE |
@@ -123,8 +122,8 @@ static int OpenFdExec(const std::string& path, int dirfd) {
         &fd);
   }
   if (result != ZX_OK) {
-    FX_LOGF(ERROR, LOG_TAG, "fdio_open_fd_at(%s) failed: %s", path.c_str(),
-            zx_status_get_string(result));
+    FML_LOG(ERROR) << "fdio_open_fd_at(" << path << ") "
+                   << "failed: " << zx_status_get_string(result);
     return -1;
   }
   return fd;
@@ -137,7 +136,7 @@ bool ElfSnapshot::Load(fdio_ns_t* namespc, const std::string& path) {
   } else {
     root_dir = fdio_ns_opendir(namespc);
     if (root_dir < 0) {
-      FX_LOG(ERROR, LOG_TAG, "Failed to open namespace directory");
+      FML_LOG(ERROR) << "Failed to open namespace directory";
       return false;
     }
   }
@@ -147,8 +146,7 @@ bool ElfSnapshot::Load(fdio_ns_t* namespc, const std::string& path) {
 bool ElfSnapshot::Load(int dirfd, const std::string& path) {
   const int fd = OpenFdExec(path, dirfd);
   if (fd < 0) {
-    FX_LOGF(ERROR, LOG_TAG, "Failed to open VMO for %s from dir.",
-            path.c_str());
+    FML_LOG(ERROR) << "Failed to open VMO for " << path << " from dir.";
     return false;
   }
   return Load(fd);
@@ -159,7 +157,7 @@ bool ElfSnapshot::Load(int fd) {
   handle_ = Dart_LoadELF_Fd(fd, 0, &error, &vm_data_, &vm_instrs_,
                             &isolate_data_, &isolate_instrs_);
   if (handle_ == nullptr) {
-    FX_LOGF(ERROR, LOG_TAG, "Failed load ELF: %s", error);
+    FML_LOG(ERROR) << "Failed load ELF: " << error;
     return false;
   }
   return true;
diff --git a/shell/platform/fuchsia/runtime/dart/utils/mapped_resource.h b/shell/platform/fuchsia/runtime/dart/utils/mapped_resource.h
index 8f8cd5160e23a75ac3207a709bca8f8cd0b509a4..41f3bdfcf6765bcbf9830f63740ab28be81f546f 100644
--- a/shell/platform/fuchsia/runtime/dart/utils/mapped_resource.h
+++ b/shell/platform/fuchsia/runtime/dart/utils/mapped_resource.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef APPS_DART_RUNNER_MAPPED_RESOURCE_H_
-#define APPS_DART_RUNNER_MAPPED_RESOURCE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_RUNTIME_DART_UTILS_MAPPED_RESOURCE_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_RUNTIME_DART_UTILS_MAPPED_RESOURCE_H_
 
 #include <fuchsia/mem/cpp/fidl.h>
 #include <lib/fdio/namespace.h>
@@ -105,4 +105,4 @@ class MappedResource {
 
 }  // namespace dart_utils
 
-#endif  // APPS_DART_RUNNER_MAPPED_RESOURCE_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_RUNTIME_DART_UTILS_MAPPED_RESOURCE_H_
diff --git a/shell/platform/fuchsia/runtime/dart/utils/root_inspect_node.cc b/shell/platform/fuchsia/runtime/dart/utils/root_inspect_node.cc
index b420be79e16cda1cdfef06ce77fb27f1d494bf9b..474fa29eef29220c47565a26f5e37e91af04e8c6 100644
--- a/shell/platform/fuchsia/runtime/dart/utils/root_inspect_node.cc
+++ b/shell/platform/fuchsia/runtime/dart/utils/root_inspect_node.cc
@@ -3,26 +3,28 @@
 // found in the LICENSE file.
 
 #include "root_inspect_node.h"
+#include <lib/async/default.h>
 
 namespace dart_utils {
 
-std::unique_ptr<sys::ComponentInspector> RootInspectNode::inspector_;
+std::unique_ptr<inspect::ComponentInspector> RootInspectNode::inspector_;
 std::mutex RootInspectNode::mutex_;
 
 void RootInspectNode::Initialize(sys::ComponentContext* context) {
   std::lock_guard<std::mutex> lock(mutex_);
   if (!inspector_) {
-    inspector_ = std::make_unique<sys::ComponentInspector>(context);
+    inspector_ = std::make_unique<inspect::ComponentInspector>(
+        async_get_default_dispatcher(), inspect::PublishOptions{});
   }
 }
 
 inspect::Node RootInspectNode::CreateRootChild(const std::string& name) {
   std::lock_guard<std::mutex> lock(mutex_);
-  return inspector_->inspector()->GetRoot().CreateChild(name);
+  return inspector_->inspector().GetRoot().CreateChild(name);
 }
 
 inspect::Inspector* RootInspectNode::GetInspector() {
-  return inspector_->inspector();
+  return &inspector_->inspector();
 }
 
 }  // namespace dart_utils
diff --git a/shell/platform/fuchsia/runtime/dart/utils/root_inspect_node.h b/shell/platform/fuchsia/runtime/dart/utils/root_inspect_node.h
index 8eb7d5d3bcf0ff4cf04f7702ef4386b97f8ed215..f9c9153b3050b848e5605eb66b010dcd67d346a4 100644
--- a/shell/platform/fuchsia/runtime/dart/utils/root_inspect_node.h
+++ b/shell/platform/fuchsia/runtime/dart/utils/root_inspect_node.h
@@ -5,7 +5,8 @@
 #ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_RUNTIME_DART_UTILS_ROOT_INSPECT_NODE_H_
 #define FLUTTER_SHELL_PLATFORM_FUCHSIA_RUNTIME_DART_UTILS_ROOT_INSPECT_NODE_H_
 
-#include <lib/sys/inspect/cpp/component.h>
+#include <lib/inspect/component/cpp/component.h>
+#include <lib/sys/cpp/component_context.h>
 
 #include <memory>
 #include <mutex>
@@ -36,7 +37,7 @@ class RootInspectNode {
   static inspect::Inspector* GetInspector();
 
  private:
-  static std::unique_ptr<sys::ComponentInspector> inspector_;
+  static std::unique_ptr<inspect::ComponentInspector> inspector_;
   static std::mutex mutex_;
 };
 
diff --git a/shell/platform/fuchsia/runtime/dart/utils/tempfs.cc b/shell/platform/fuchsia/runtime/dart/utils/tempfs.cc
index becfffddf0874f93566bef3bb580a228837ec0df..2545e4e5b15e66fc00d851f9f15332b124074e23 100644
--- a/shell/platform/fuchsia/runtime/dart/utils/tempfs.cc
+++ b/shell/platform/fuchsia/runtime/dart/utils/tempfs.cc
@@ -4,94 +4,47 @@
 
 #include "tempfs.h"
 
-#include <future>
-#include <string>
-#include <thread>
+#include <string_view>
 
-#include <lib/async-loop/cpp/loop.h>
-#include <lib/async-loop/default.h>
-#include <lib/async/cpp/task.h>
-#include <lib/fdio/namespace.h>
-#include <lib/memfs/memfs.h>
-#include <lib/syslog/global.h>
 #include <zircon/errors.h>
 #include <zircon/status.h>
 #include <zircon/syscalls.h>
 
-#include "logging.h"
+#include "flutter/fml/logging.h"
 
 namespace {
 
 constexpr char kTmpPath[] = "/tmp";
-[[maybe_unused]] constexpr size_t kMaxTmpPages = 1024;
 
 }  // namespace
 
 namespace dart_utils {
 
-RunnerTemp::RunnerTemp()
-    : loop_(std::make_unique<async::Loop>(
-          &kAsyncLoopConfigNoAttachToCurrentThread)) {
-  loop_->StartThread("RunnerTemp");
-  Start();
-}
-
-RunnerTemp::~RunnerTemp() = default;
-
-void RunnerTemp::Start() {
-  std::promise<void> finished;
-  async::PostTask(loop_->dispatcher(), [this, &finished]() {
-#if defined(DART_PRODUCT)
-    zx_status_t status = memfs_install_at_with_page_limit(
-        loop_->dispatcher(), kMaxTmpPages, kTmpPath);
-#else
-    memfs_filesystem_t* fs;
-    // Hot reload uses /tmp to hold the updated dills and assets so do not
-    // impose any size limitation in non product runners.
-    zx_status_t status = memfs_install_at(loop_->dispatcher(), kTmpPath, &fs);
-#endif
-    finished.set_value();
-    if (status != ZX_OK) {
-      FX_LOGF(ERROR, LOG_TAG, "Failed to install a /tmp memfs: %s",
-              zx_status_get_string(status));
-      return;
-    }
-  });
-  finished.get_future().wait();
-}
-
-void RunnerTemp::SetupComponent(fdio_ns_t* ns) {
+void BindTemp(fdio_ns_t* ns) {
   // TODO(zra): Should isolates share a /tmp file system within a process, or
-  // should isolates each get their own private memfs for /tmp? For now,
+  // should isolates each get their own private file system for /tmp? For now,
   // sharing the process-wide /tmp simplifies hot reload since the hot reload
   // devfs requires sharing between the service isolate and the app isolates.
-  zx_status_t status;
   fdio_flat_namespace_t* rootns;
-  status = fdio_ns_export_root(&rootns);
-  if (status != ZX_OK) {
-    FX_LOGF(ERROR, LOG_TAG, "Failed to export root ns: %s",
-            zx_status_get_string(status));
+  if (zx_status_t status = fdio_ns_export_root(&rootns); status != ZX_OK) {
+    FML_LOG(ERROR) << "Failed to export root ns: "
+                   << zx_status_get_string(status);
     return;
   }
 
   zx_handle_t tmp_dir_handle;
   for (size_t i = 0; i < rootns->count; i++) {
-    if (strcmp(rootns->path[i], kTmpPath) == 0) {
-      tmp_dir_handle = rootns->handle[i];
-    } else {
-      zx_handle_close(rootns->handle[i]);
-      rootns->handle[i] = ZX_HANDLE_INVALID;
+    if (std::string_view{rootns->path[i]} == kTmpPath) {
+      tmp_dir_handle = std::exchange(rootns->handle[i], ZX_HANDLE_INVALID);
     }
   }
-  free(rootns);
-  rootns = nullptr;
+  fdio_ns_free_flat_ns(rootns);
 
-  status = fdio_ns_bind(ns, kTmpPath, tmp_dir_handle);
-  if (status != ZX_OK) {
+  if (zx_status_t status = fdio_ns_bind(ns, kTmpPath, tmp_dir_handle);
+      status != ZX_OK) {
     zx_handle_close(tmp_dir_handle);
-    FX_LOGF(ERROR, LOG_TAG,
-            "Failed to bind /tmp directory into isolate namespace: %s",
-            zx_status_get_string(status));
+    FML_LOG(ERROR) << "Failed to bind /tmp directory into isolate namespace: "
+                   << zx_status_get_string(status);
   }
 }
 
diff --git a/shell/platform/fuchsia/runtime/dart/utils/tempfs.h b/shell/platform/fuchsia/runtime/dart/utils/tempfs.h
index 1861ee1e6d0c03c70260e1451f0ef0cacf9b3cc5..1c89ab42f24f975be22c02ec63724faa066593d3 100644
--- a/shell/platform/fuchsia/runtime/dart/utils/tempfs.h
+++ b/shell/platform/fuchsia/runtime/dart/utils/tempfs.h
@@ -5,34 +5,13 @@
 #ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_RUNTIME_DART_UTILS_TEMPFS_H_
 #define FLUTTER_SHELL_PLATFORM_FUCHSIA_RUNTIME_DART_UTILS_TEMPFS_H_
 
-#include <mutex>
-
-#include <lib/async-loop/cpp/loop.h>
 #include <lib/fdio/namespace.h>
 
 namespace dart_utils {
 
-// Sets up /tmp for the dart_runner and flutter_runner.
-class RunnerTemp {
- public:
-  // Sets up a memfs bound to /tmp in the process-wide namespace that has the
-  // lifetime of this instance.
-  RunnerTemp();
-  ~RunnerTemp();
-
-  // Take the memfs mapped into the process-wide namespace for /tmp, and map it
-  // to /tmp in the given namespace.
-  static void SetupComponent(fdio_ns_t* ns);
-
- private:
-  void Start();
-
-  std::unique_ptr<async::Loop> loop_;
-
-  // Disallow copy and assignment.
-  RunnerTemp(const RunnerTemp&) = delete;
-  RunnerTemp& operator=(const RunnerTemp&) = delete;
-};
+// Take the virtual filesystem mapped into the process-wide namespace for /tmp,
+// and map it to /tmp in the given namespace.
+void BindTemp(fdio_ns_t* ns);
 
 }  // namespace dart_utils
 
diff --git a/shell/platform/fuchsia/runtime/dart/utils/vmo.cc b/shell/platform/fuchsia/runtime/dart/utils/vmo.cc
index ecc29e22db1ddbbea28fd14463a2f60f05b00569..f0295eb48f815dac87a27855415e184dcc6db790 100644
--- a/shell/platform/fuchsia/runtime/dart/utils/vmo.cc
+++ b/shell/platform/fuchsia/runtime/dart/utils/vmo.cc
@@ -11,21 +11,22 @@
 #include <fuchsia/mem/cpp/fidl.h>
 #include <lib/fdio/directory.h>
 #include <lib/fdio/io.h>
-#include <lib/syslog/global.h>
 #include <zircon/status.h>
 
-#include "logging.h"
+#include <ios>
+
+#include "flutter/fml/logging.h"
 
 namespace {
 
 bool VmoFromFd(int fd, bool executable, fuchsia::mem::Buffer* buffer) {
   if (!buffer) {
-    FX_LOG(FATAL, LOG_TAG, "Invalid buffer pointer");
+    FML_LOG(FATAL) << "Invalid buffer pointer";
   }
 
   struct stat stat_struct;
   if (fstat(fd, &stat_struct) == -1) {
-    FX_LOGF(ERROR, LOG_TAG, "fstat failed: %s", strerror(errno));
+    FML_LOG(ERROR) << "fstat failed: " << strerror(errno);
     return false;
   }
 
@@ -38,8 +39,8 @@ bool VmoFromFd(int fd, bool executable, fuchsia::mem::Buffer* buffer) {
   }
 
   if (status != ZX_OK) {
-    FX_LOGF(ERROR, LOG_TAG, "fdio_get_vmo_%s failed: %s",
-            executable ? "exec" : "copy", zx_status_get_string(status));
+    FML_LOG(ERROR) << (executable ? "fdio_get_vmo_exec" : "fdio_get_vmo_copy")
+                   << " failed: " << zx_status_get_string(status);
     return false;
   }
 
@@ -68,8 +69,9 @@ bool VmoFromFilename(const std::string& filename,
   const zx_status_t status =
       fdio_open_fd(filename.c_str(), static_cast<uint32_t>(flags), &fd);
   if (status != ZX_OK) {
-    FX_LOGF(ERROR, LOG_TAG, "fdio_open_fd(\"%s\", %08x) failed: %s",
-            filename.c_str(), flags, zx_status_get_string(status));
+    FML_LOG(ERROR) << "fdio_open_fd(\"" << filename << "\", " << std::hex
+                   << static_cast<uint32_t>(flags)
+                   << ") failed: " << zx_status_get_string(status);
     return false;
   }
   bool result = VmoFromFd(fd, executable, buffer);
@@ -90,8 +92,9 @@ bool VmoFromFilenameAt(int dirfd,
   const zx_status_t status = fdio_open_fd_at(dirfd, filename.c_str(),
                                              static_cast<uint32_t>(flags), &fd);
   if (status != ZX_OK) {
-    FX_LOGF(ERROR, LOG_TAG, "fdio_open_fd_at(%d, \"%s\", %08x) failed: %s",
-            dirfd, filename.c_str(), flags, zx_status_get_string(status));
+    FML_LOG(ERROR) << "fdio_open_fd_at(" << dirfd << ", \"" << filename
+                   << "\", " << std::hex << static_cast<uint32_t>(flags)
+                   << ") failed: " << zx_status_get_string(status);
     return false;
   }
   bool result = VmoFromFd(fd, executable, buffer);
diff --git a/shell/platform/fuchsia/runtime/dart/utils/vmservice_object.cc b/shell/platform/fuchsia/runtime/dart/utils/vmservice_object.cc
index fc196bb847880e37c581d24e553d6481604e3d1e..d36257ba816bc567b10177614b1c7814f3fdf6b4 100644
--- a/shell/platform/fuchsia/runtime/dart/utils/vmservice_object.cc
+++ b/shell/platform/fuchsia/runtime/dart/utils/vmservice_object.cc
@@ -6,13 +6,12 @@
 
 #include <dirent.h>
 #include <fuchsia/io/cpp/fidl.h>
-#include <lib/syslog/global.h>
 #include <zircon/status.h>
 
 #include <cerrno>
 #include <string>
 
-#include "logging.h"
+#include "flutter/fml/logging.h"
 
 namespace {
 
@@ -37,12 +36,11 @@ namespace dart_utils {
 
 void VMServiceObject::GetContents(LazyEntryVector* out_vector) const {
   // List /tmp/dart.services if it exists, and push its contents as
-  // as the conrtents of this directory.
+  // the contents of this directory.
   std::vector<std::string> files;
   if (!ReadDirContents(kPortDir, &files)) {
-    FX_LOGF(ERROR, LOG_TAG,
-            "Failed to read Dart VM service port directory '%s': %s", kPortDir,
-            strerror(errno));
+    FML_LOG(ERROR) << "Failed to read Dart VM service port directory '"
+                   << kPortDir << "': " << strerror(errno);
     return;
   }
   for (const auto& file : files) {
diff --git a/shell/platform/fuchsia/runtime/dart/utils/vmservice_object.h b/shell/platform/fuchsia/runtime/dart/utils/vmservice_object.h
index 697922491a27794e5c36e55993a92ce71fe9ff4b..c02d609e51506fded898e3564f55192692f4d72e 100644
--- a/shell/platform/fuchsia/runtime/dart/utils/vmservice_object.h
+++ b/shell/platform/fuchsia/runtime/dart/utils/vmservice_object.h
@@ -9,6 +9,9 @@
 
 namespace dart_utils {
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+
 class VMServiceObject : public vfs::LazyDir {
  public:
   static constexpr const char* kDirName = "DartVM";
@@ -21,6 +24,8 @@ class VMServiceObject : public vfs::LazyDir {
                       std::string name) const override;
 };
 
+#pragma clang diagnostic pop
+
 }  // namespace dart_utils
 
 #endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_RUNTIME_DART_UTILS_VMSERVICE_OBJECT_H_
diff --git a/shell/platform/glfw/BUILD.gn b/shell/platform/glfw/BUILD.gn
index 9d23979d957b111364fcf91f37c2231497687b55..59735b59763561e6db3775d3834d187d767ea268 100644
--- a/shell/platform/glfw/BUILD.gn
+++ b/shell/platform/glfw/BUILD.gn
@@ -59,8 +59,8 @@ source_set("flutter_glfw") {
     "//flutter/shell/platform/common/client_wrapper:client_wrapper",
     "//flutter/shell/platform/embedder:embedder_as_internal_library",
     "//flutter/shell/platform/glfw/client_wrapper:client_wrapper_glfw",
-    "//third_party/glfw",
-    "//third_party/rapidjson",
+    "//flutter/third_party/glfw",
+    "//flutter/third_party/rapidjson",
   ]
 
   if (is_linux) {
diff --git a/shell/platform/glfw/client_wrapper/BUILD.gn b/shell/platform/glfw/client_wrapper/BUILD.gn
index 6f1faae1f534cf4a3f10918191c4c35fa8aec8e3..d9c24fb5133075c66f57ad9548e641905b7c37e1 100644
--- a/shell/platform/glfw/client_wrapper/BUILD.gn
+++ b/shell/platform/glfw/client_wrapper/BUILD.gn
@@ -19,7 +19,7 @@ _wrapper_sources = [
 
 # This code will be merged into .../common/cpp/client_wrapper for client use,
 # so uses header paths that assume the merged state. Include the header
-# header directory of the core wrapper files so these includes will work.
+# directory of the core wrapper files so these includes will work.
 config("relative_core_wrapper_headers") {
   include_dirs =
       [ "//flutter/shell/platform/common/client_wrapper/include/flutter" ]
@@ -91,6 +91,6 @@ executable("client_wrapper_glfw_unittests") {
     # TODO(chunhtai): Consider refactoring flutter_root/testing so that there's a testing
     # target that doesn't require a Dart runtime to be linked in.
     # https://github.com/flutter/flutter/issues/41414.
-    "//third_party/dart/runtime:libdart_jit",
+    "$dart_src/runtime:libdart_jit",
   ]
 }
diff --git a/shell/platform/glfw/client_wrapper/include/flutter/flutter_window_controller.h b/shell/platform/glfw/client_wrapper/include/flutter/flutter_window_controller.h
index 60bc4c151e9aa641f11146be09546172007f8d61..22cf2d2fa3c18e3efd049948c50481f8888721bb 100644
--- a/shell/platform/glfw/client_wrapper/include/flutter/flutter_window_controller.h
+++ b/shell/platform/glfw/client_wrapper/include/flutter/flutter_window_controller.h
@@ -64,7 +64,7 @@ class FlutterWindowController : public PluginRegistry {
   //
   // The |arguments| are passed to the Flutter engine. See:
   // https://github.com/flutter/engine/blob/main/shell/common/switches.h for
-  // for details. Not all arguments will apply to desktop.
+  // details. Not all arguments will apply to desktop.
   //
   // The |aot_library_path| is the path to the libapp.so file for the Flutter
   // application to be run. While this parameter is only required in AOT mode,
diff --git a/shell/platform/glfw/client_wrapper/testing/stub_flutter_glfw_api.h b/shell/platform/glfw/client_wrapper/testing/stub_flutter_glfw_api.h
index 0b638eaf89753756f0c60fce49aecd2be07f67af..82ee361198c85ec4e94edd74e3bd5e683eb25394 100644
--- a/shell/platform/glfw/client_wrapper/testing/stub_flutter_glfw_api.h
+++ b/shell/platform/glfw/client_wrapper/testing/stub_flutter_glfw_api.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_GLFW_WRAPPER_TESTING_STUB_FLUTTER_GLFW_API_H_
-#define FLUTTER_SHELL_PLATFORM_GLFW_WRAPPER_TESTING_STUB_FLUTTER_GLFW_API_H_
+#ifndef FLUTTER_SHELL_PLATFORM_GLFW_CLIENT_WRAPPER_TESTING_STUB_FLUTTER_GLFW_API_H_
+#define FLUTTER_SHELL_PLATFORM_GLFW_CLIENT_WRAPPER_TESTING_STUB_FLUTTER_GLFW_API_H_
 
 #include <memory>
 
diff --git a/shell/platform/glfw/flutter_glfw.cc b/shell/platform/glfw/flutter_glfw.cc
index 2509067a7ccc9d5e5580c135db5409717f9071ef..b00bab8cedbcaedb2468d5c3a7220c7b2a79f4c8 100644
--- a/shell/platform/glfw/flutter_glfw.cc
+++ b/shell/platform/glfw/flutter_glfw.cc
@@ -12,7 +12,9 @@
 #include <cstdlib>
 #include <filesystem>
 #include <iostream>
+#include <string>
 
+#include "flutter/common/constants.h"
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/plugin_registrar.h"
 #include "flutter/shell/platform/common/incoming_message_dispatcher.h"
 #include "flutter/shell/platform/common/path_utils.h"
@@ -237,6 +239,8 @@ static UniqueGLFWwindowPtr CreateShareWindowForWindow(GLFWwindow* window) {
   glfwWindowHint(GLFW_VISIBLE, GLFW_FALSE);
 #if defined(__linux__)
   glfwWindowHint(GLFW_CONTEXT_CREATION_API, GLFW_EGL_CONTEXT_API);
+  glfwWindowHint(GLFW_CLIENT_API, GLFW_OPENGL_ES_API);
+  glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 2);
 #endif
   GLFWwindow* share_window = glfwCreateWindow(1, 1, "", NULL, window);
   glfwDefaultWindowHints();
@@ -293,6 +297,9 @@ static void SendWindowMetrics(FlutterDesktopWindowControllerState* controller,
   } else {
     event.pixel_ratio = controller->window_wrapper->pixel_ratio_override;
   }
+  // The GLFW embedder doesn't support multiple views. We assume all pointer
+  // events come from the only view, the implicit view.
+  event.view_id = flutter::kFlutterImplicitViewId;
   FlutterEngineSendWindowMetricsEvent(controller->engine->flutter_engine,
                                       &event);
 }
@@ -388,6 +395,9 @@ static void SendPointerEventWithData(GLFWwindow* window,
   event.y *= pixels_per_coordinate;
   event.scroll_delta_x *= pixels_per_coordinate;
   event.scroll_delta_y *= pixels_per_coordinate;
+  // The GLFW embedder doesn't support multiple views. We assume all pointer
+  // events come from the only view, the implicit view.
+  event.view_id = flutter::kFlutterImplicitViewId;
 
   FlutterEngineSendPointerEvent(controller->engine->flutter_engine, &event, 1);
 
@@ -673,12 +683,12 @@ UniqueAotDataPtr LoadAotData(const std::filesystem::path& aot_data_path) {
         << std::endl;
     return nullptr;
   }
+  std::string path_string = aot_data_path.string();
   if (!std::filesystem::exists(aot_data_path)) {
-    std::cerr << "Can't load AOT data from " << aot_data_path.string()
-              << "; no such file." << std::endl;
+    std::cerr << "Can't load AOT data from " << path_string << "; no such file."
+              << std::endl;
     return nullptr;
   }
-  std::string path_string = aot_data_path.u8string();
   FlutterEngineAOTDataSource source = {};
   source.type = kFlutterEngineAOTDataSourceTypeElfPath;
   source.elf_path = path_string.c_str();
@@ -755,10 +765,12 @@ static bool RunFlutterEngine(
   if (engine_state->window_controller != nullptr) {
     config.open_gl.gl_proc_resolver = EngineProcResolver;
   }
+  const std::string assets_path_string = assets_path.string();
+  const std::string icu_path_string = icu_path.string();
   FlutterProjectArgs args = {};
   args.struct_size = sizeof(FlutterProjectArgs);
-  args.assets_path = assets_path.c_str();
-  args.icu_data_path = icu_path.c_str();
+  args.assets_path = assets_path_string.c_str();
+  args.icu_data_path = icu_path_string.c_str();
   args.command_line_argc = static_cast<int>(argv.size());
   args.command_line_argv = &argv[0];
   args.platform_message_callback = EngineOnFlutterPlatformMessage;
diff --git a/shell/platform/glfw/platform_handler.cc b/shell/platform/glfw/platform_handler.cc
index 27098f985020f19092bd133b3cb70e796fe19ed7..8659c84f58598b046c5893339067aafb3f335757 100644
--- a/shell/platform/glfw/platform_handler.cc
+++ b/shell/platform/glfw/platform_handler.cc
@@ -87,7 +87,6 @@ void PlatformHandler::HandleMethodCall(
     result->Success();
   } else if (method.compare(kSystemNavigatorPopMethod) == 0) {
     exit(EXIT_SUCCESS);
-    result->Success();
   } else {
     result->NotImplemented();
   }
diff --git a/shell/platform/glfw/public/flutter_glfw.h b/shell/platform/glfw/public/flutter_glfw.h
index 30d3261e8b2a6df9a1d46abe2b893109e7e5ca49..7dbb8b9395ff0117f7f4f4624022a639ddd4532c 100644
--- a/shell/platform/glfw/public/flutter_glfw.h
+++ b/shell/platform/glfw/public/flutter_glfw.h
@@ -120,15 +120,15 @@ FLUTTER_EXPORT bool FlutterDesktopRunWindowEventLoopWithTimeout(
 // FlutterDesktopWindowControllerRef.
 //
 // Its lifetime is the same as the |controller|'s.
-FLUTTER_EXPORT FlutterDesktopWindowRef
-FlutterDesktopGetWindow(FlutterDesktopWindowControllerRef controller);
+FLUTTER_EXPORT FlutterDesktopWindowRef FlutterDesktopGetWindow(
+    FlutterDesktopWindowControllerRef controller);
 
 // Returns the handle for the engine running in
 // FlutterDesktopWindowControllerRef.
 //
 // Its lifetime is the same as the |controller|'s.
-FLUTTER_EXPORT FlutterDesktopEngineRef
-FlutterDesktopGetEngine(FlutterDesktopWindowControllerRef controller);
+FLUTTER_EXPORT FlutterDesktopEngineRef FlutterDesktopGetEngine(
+    FlutterDesktopWindowControllerRef controller);
 
 // Returns the plugin registrar handle for the plugin with the given name.
 //
@@ -201,8 +201,8 @@ FLUTTER_EXPORT void FlutterDesktopWindowSetSizeLimits(
 // Runs an instance of a headless Flutter engine.
 //
 // Returns a null pointer in the event of an error.
-FLUTTER_EXPORT FlutterDesktopEngineRef
-FlutterDesktopRunEngine(const FlutterDesktopEngineProperties& properties);
+FLUTTER_EXPORT FlutterDesktopEngineRef FlutterDesktopRunEngine(
+    const FlutterDesktopEngineProperties& properties);
 
 // Waits for and processes the next event before |timeout_milliseconds|.
 //
diff --git a/shell/platform/linux/BUILD.gn b/shell/platform/linux/BUILD.gn
index 4c1cbc4a75deabc3bdc13efec988228c6accc30b..b2a8e800f8b386e6ea9a1a12d8131b1073c4c9a4 100644
--- a/shell/platform/linux/BUILD.gn
+++ b/shell/platform/linux/BUILD.gn
@@ -90,14 +90,12 @@ source_set("flutter_linux_sources") {
              "fl_method_channel_private.h",
              "fl_method_codec_private.h",
              "fl_plugin_registrar_private.h",
-             "fl_standard_message_codec_private.h",
              "key_mapping.h",
            ]
 
   configs += [ "//flutter/shell/platform/linux/config:gtk" ]
 
   sources = [
-    "fl_accessibility_plugin.cc",
     "fl_accessible_node.cc",
     "fl_accessible_text_field.cc",
     "fl_backing_store_provider.cc",
@@ -107,7 +105,6 @@ source_set("flutter_linux_sources") {
     "fl_dart_project.cc",
     "fl_engine.cc",
     "fl_event_channel.cc",
-    "fl_gl_area.cc",
     "fl_gnome_settings.cc",
     "fl_json_message_codec.cc",
     "fl_json_method_codec.cc",
@@ -128,7 +125,7 @@ source_set("flutter_linux_sources") {
     "fl_plugin_registrar.cc",
     "fl_plugin_registry.cc",
     "fl_renderer.cc",
-    "fl_renderer_gl.cc",
+    "fl_renderer_gdk.cc",
     "fl_renderer_headless.cc",
     "fl_scrolling_manager.cc",
     "fl_scrolling_view_delegate.cc",
@@ -158,10 +155,12 @@ source_set("flutter_linux_sources") {
   ]
 
   deps = [
+    "//flutter/fml",
+    "//flutter/shell/platform/common:common_cpp_enums",
     "//flutter/shell/platform/common:common_cpp_input",
     "//flutter/shell/platform/common:common_cpp_switches",
     "//flutter/shell/platform/embedder:embedder_headers",
-    "//third_party/rapidjson",
+    "//flutter/third_party/rapidjson",
   ]
 }
 
@@ -212,6 +211,7 @@ executable("flutter_linux_unittests") {
     "fl_method_codec_test.cc",
     "fl_method_response_test.cc",
     "fl_pixel_buffer_texture_test.cc",
+    "fl_platform_plugin_test.cc",
     "fl_plugin_registrar_test.cc",
     "fl_scrolling_manager_test.cc",
     "fl_settings_plugin_test.cc",
@@ -224,7 +224,11 @@ executable("flutter_linux_unittests") {
     "fl_texture_registrar_test.cc",
     "fl_value_test.cc",
     "fl_view_accessible_test.cc",
+    "fl_view_test.cc",
+    "key_mapping_test.cc",
     "testing/fl_test.cc",
+    "testing/fl_test_gtk_logs.cc",
+    "testing/fl_test_gtk_logs.h",
     "testing/mock_binary_messenger.cc",
     "testing/mock_binary_messenger_response_handle.cc",
     "testing/mock_engine.cc",
@@ -241,7 +245,10 @@ executable("flutter_linux_unittests") {
 
   public_configs = [ "//flutter:config" ]
 
-  configs += [ "//flutter/shell/platform/linux/config:gtk" ]
+  configs += [
+    "//flutter/shell/platform/linux/config:gtk",
+    "//flutter/shell/platform/linux/config:epoxy",
+  ]
 
   defines = [
     "FLUTTER_ENGINE_NO_PROTOTYPES",
@@ -256,6 +263,7 @@ executable("flutter_linux_unittests") {
     ":flutter_linux_gschemas",
     ":flutter_linux_sources",
     "//flutter/runtime:libdart",
+    "//flutter/shell/platform/common:common_cpp_enums",
     "//flutter/shell/platform/embedder:embedder_headers",
     "//flutter/shell/platform/embedder:embedder_test_utils",
     "//flutter/testing",
@@ -276,16 +284,12 @@ copy("publish_headers_linux") {
 }
 
 zip_bundle("flutter_gtk") {
-  prefix = "$full_target_platform_name/"
-  if (flutter_runtime_mode != "debug" ||
-      (flutter_runtime_mode == "debug" && target_cpu != "x64")) {
-    prefix = "$full_target_platform_name-$flutter_runtime_mode/"
-  }
+  prefix = "$full_target_platform_name-$flutter_runtime_mode/"
   output = "${prefix}${full_target_platform_name}-flutter-gtk.zip"
   deps = [
     ":flutter_linux_gtk",
     ":publish_headers_linux",
-    "//third_party/dart/runtime/bin:gen_snapshot",
+    "$dart_src/runtime/bin:gen_snapshot",
   ]
   sources = get_target_outputs(":publish_headers_linux")
   tmp_files = []
diff --git a/shell/platform/linux/fl_accessibility_plugin.cc b/shell/platform/linux/fl_accessibility_plugin.cc
deleted file mode 100644
index b006b8b12d2d5ca5e4c57ee33c1d0f3f26351a24..0000000000000000000000000000000000000000
--- a/shell/platform/linux/fl_accessibility_plugin.cc
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "flutter/shell/platform/linux/fl_accessibility_plugin.h"
-#include "flutter/shell/platform/linux/fl_view_accessible.h"
-
-struct _FlAccessibilityPlugin {
-  GObject parent_instance;
-
-  FlView* view;
-};
-
-G_DEFINE_TYPE(FlAccessibilityPlugin, fl_accessibility_plugin, G_TYPE_OBJECT)
-
-static void fl_accessibility_plugin_dispose(GObject* object) {
-  FlAccessibilityPlugin* self = FL_ACCESSIBILITY_PLUGIN(object);
-
-  if (self->view != nullptr) {
-    g_object_remove_weak_pointer(G_OBJECT(self),
-                                 reinterpret_cast<gpointer*>(&(self->view)));
-    self->view = nullptr;
-  }
-
-  G_OBJECT_CLASS(fl_accessibility_plugin_parent_class)->dispose(object);
-}
-
-static void fl_accessibility_plugin_class_init(
-    FlAccessibilityPluginClass* klass) {
-  G_OBJECT_CLASS(klass)->dispose = fl_accessibility_plugin_dispose;
-}
-
-static void fl_accessibility_plugin_init(FlAccessibilityPlugin* self) {}
-
-FlAccessibilityPlugin* fl_accessibility_plugin_new(FlView* view) {
-  FlAccessibilityPlugin* self = FL_ACCESSIBILITY_PLUGIN(
-      g_object_new(fl_accessibility_plugin_get_type(), nullptr));
-
-  self->view = view;
-  g_object_add_weak_pointer(G_OBJECT(self),
-                            reinterpret_cast<gpointer*>(&(self->view)));
-
-  return self;
-}
-
-void fl_accessibility_plugin_handle_update_semantics_node(
-    FlAccessibilityPlugin* self,
-    const FlutterSemanticsNode* node) {
-  if (self->view == nullptr) {
-    return;
-  }
-
-  AtkObject* accessible = gtk_widget_get_accessible(GTK_WIDGET(self->view));
-  fl_view_accessible_handle_update_semantics_node(
-      FL_VIEW_ACCESSIBLE(accessible), node);
-}
diff --git a/shell/platform/linux/fl_accessibility_plugin.h b/shell/platform/linux/fl_accessibility_plugin.h
deleted file mode 100644
index 40b9333753b75975ee9c9b2167d8848413777481..0000000000000000000000000000000000000000
--- a/shell/platform/linux/fl_accessibility_plugin.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_SHELL_PLATFORM_LINUX_FL_ACCESSIBILITY_PLUGIN_H_
-#define FLUTTER_SHELL_PLATFORM_LINUX_FL_ACCESSIBILITY_PLUGIN_H_
-
-#include "flutter/shell/platform/linux/public/flutter_linux/fl_view.h"
-
-#include "flutter/shell/platform/embedder/embedder.h"
-
-G_BEGIN_DECLS
-
-G_DECLARE_FINAL_TYPE(FlAccessibilityPlugin,
-                     fl_accessibility_plugin,
-                     FL,
-                     ACCESSIBILITY_PLUGIN,
-                     GObject);
-
-/**
- * FlAccessibilityPlugin:
- *
- * #FlAccessibilityPlugin is a plugin that handles semantic node updates and
- * converts them to ATK events.
- */
-
-/**
- * fl_accessibility_plugin_new:
- * @view: an #FlView to export accessibility information to.
- *
- * Creates a new plugin handles semantic node updates.
- *
- * Returns: a new #FlAccessibilityPlugin.
- */
-FlAccessibilityPlugin* fl_accessibility_plugin_new(FlView* view);
-
-/**
- * fl_accessibility_plugin_handle_update_semantics_node:
- * @plugin: an #FlAccessibilityPlugin.
- * @node: semantic node information.
- *
- * Handle a semantics node update.
- */
-void fl_accessibility_plugin_handle_update_semantics_node(
-    FlAccessibilityPlugin* plugin,
-    const FlutterSemanticsNode* node);
-
-G_END_DECLS
-
-#endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_ACCESSIBILITY_PLUGIN_H_
diff --git a/shell/platform/linux/fl_accessible_node.cc b/shell/platform/linux/fl_accessible_node.cc
index d0681de80e761c9732c2f590c91ea29d433f9f12..f8316755ecb8714ad6a76169702fee6e530b1498 100644
--- a/shell/platform/linux/fl_accessible_node.cc
+++ b/shell/platform/linux/fl_accessible_node.cc
@@ -405,6 +405,11 @@ static void fl_accessible_node_set_text_selection_impl(FlAccessibleNode* self,
                                                        gint base,
                                                        gint extent) {}
 
+// Implements FlAccessibleNode::set_text_direction.
+static void fl_accessible_node_set_text_direction_impl(
+    FlAccessibleNode* self,
+    FlutterTextDirection direction) {}
+
 // Implements FlAccessibleNode::perform_action.
 static void fl_accessible_node_perform_action_impl(
     FlAccessibleNode* self,
@@ -436,6 +441,8 @@ static void fl_accessible_node_class_init(FlAccessibleNodeClass* klass) {
       fl_accessible_node_set_value_impl;
   FL_ACCESSIBLE_NODE_CLASS(klass)->set_text_selection =
       fl_accessible_node_set_text_selection_impl;
+  FL_ACCESSIBLE_NODE_CLASS(klass)->set_text_direction =
+      fl_accessible_node_set_text_direction_impl;
   FL_ACCESSIBLE_NODE_CLASS(klass)->perform_action =
       fl_accessible_node_perform_action_impl;
 
@@ -561,6 +568,14 @@ void fl_accessible_node_set_text_selection(FlAccessibleNode* self,
                                                                 extent);
 }
 
+void fl_accessible_node_set_text_direction(FlAccessibleNode* self,
+                                           FlutterTextDirection direction) {
+  g_return_if_fail(FL_IS_ACCESSIBLE_NODE(self));
+
+  return FL_ACCESSIBLE_NODE_GET_CLASS(self)->set_text_direction(self,
+                                                                direction);
+}
+
 void fl_accessible_node_perform_action(FlAccessibleNode* self,
                                        FlutterSemanticsAction action,
                                        GBytes* data) {
diff --git a/shell/platform/linux/fl_accessible_node.h b/shell/platform/linux/fl_accessible_node.h
index d9c0f9ec1ebf5d6f4653b5ba6db30bdabb425401..7969b5419fa341bdfd39a716a656b04782cf8c67 100644
--- a/shell/platform/linux/fl_accessible_node.h
+++ b/shell/platform/linux/fl_accessible_node.h
@@ -45,6 +45,8 @@ struct _FlAccessibleNodeClass {
   void (*set_actions)(FlAccessibleNode* node, FlutterSemanticsAction actions);
   void (*set_value)(FlAccessibleNode* node, const gchar* value);
   void (*set_text_selection)(FlAccessibleNode* node, gint base, gint extent);
+  void (*set_text_direction)(FlAccessibleNode* node,
+                             FlutterTextDirection direction);
 
   void (*perform_action)(FlAccessibleNode* node,
                          FlutterSemanticsAction action,
@@ -151,6 +153,16 @@ void fl_accessible_node_set_text_selection(FlAccessibleNode* node,
                                            gint base,
                                            gint extent);
 
+/**
+ * fl_accessible_node_set_text_direction:
+ * @node: an #FlAccessibleNode.
+ * @direction: the direction of the text.
+ *
+ * Sets the text direction of this node.
+ */
+void fl_accessible_node_set_text_direction(FlAccessibleNode* node,
+                                           FlutterTextDirection direction);
+
 /**
  * fl_accessible_node_dispatch_action:
  * @node: an #FlAccessibleNode.
diff --git a/shell/platform/linux/fl_accessible_text_field.cc b/shell/platform/linux/fl_accessible_text_field.cc
index 9c483e61fe360952c51212b4a952e9d9a92c7ff8..9dcc7f64fb82048ca0e7232ae830c3be8729ff4d 100644
--- a/shell/platform/linux/fl_accessible_text_field.cc
+++ b/shell/platform/linux/fl_accessible_text_field.cc
@@ -6,12 +6,22 @@
 #include "flutter/shell/platform/linux/public/flutter_linux/fl_standard_message_codec.h"
 #include "flutter/shell/platform/linux/public/flutter_linux/fl_value.h"
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(PangoContext, g_object_unref)
+// PangoLayout g_autoptr macro weren't added until 1.49.4. Add them manually.
+// https://gitlab.gnome.org/GNOME/pango/-/commit/0b84e14
+#if !PANGO_VERSION_CHECK(1, 49, 4)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(PangoLayout, g_object_unref)
+#endif
+
+typedef bool (*FlTextBoundaryCallback)(const PangoLogAttr* attr);
+
 struct _FlAccessibleTextField {
   FlAccessibleNode parent_instance;
 
   gint selection_base;
   gint selection_extent;
   GtkEntryBuffer* buffer;
+  FlutterTextDirection text_direction;
 };
 
 static void fl_accessible_text_iface_init(AtkTextIface* iface);
@@ -36,6 +46,145 @@ static gchar* get_substring(FlAccessibleTextField* self,
   return g_utf8_substring(value, start, end);
 }
 
+static PangoContext* get_pango_context(FlAccessibleTextField* self) {
+  PangoFontMap* font_map = pango_cairo_font_map_get_default();
+  PangoContext* context = pango_font_map_create_context(font_map);
+  pango_context_set_base_dir(context,
+                             self->text_direction == kFlutterTextDirectionRTL
+                                 ? PANGO_DIRECTION_RTL
+                                 : PANGO_DIRECTION_LTR);
+  return context;
+}
+
+static PangoLayout* create_pango_layout(FlAccessibleTextField* self) {
+  g_autoptr(PangoContext) context = get_pango_context(self);
+  PangoLayout* layout = pango_layout_new(context);
+  pango_layout_set_text(layout, gtk_entry_buffer_get_text(self->buffer), -1);
+  return layout;
+}
+
+static gchar* get_string_at_offset(FlAccessibleTextField* self,
+                                   gint start,
+                                   gint end,
+                                   FlTextBoundaryCallback is_start,
+                                   FlTextBoundaryCallback is_end,
+                                   gint* start_offset,
+                                   gint* end_offset) {
+  g_autoptr(PangoLayout) layout = create_pango_layout(self);
+
+  gint n_attrs = 0;
+  const PangoLogAttr* attrs =
+      pango_layout_get_log_attrs_readonly(layout, &n_attrs);
+
+  while (start > 0 && !is_start(&attrs[start])) {
+    --start;
+  }
+  if (start_offset != nullptr) {
+    *start_offset = start;
+  }
+
+  while (end < n_attrs && !is_end(&attrs[end])) {
+    ++end;
+  }
+  if (end_offset != nullptr) {
+    *end_offset = end;
+  }
+
+  return get_substring(self, start, end);
+}
+
+static gchar* get_char_at_offset(FlAccessibleTextField* self,
+                                 gint offset,
+                                 gint* start_offset,
+                                 gint* end_offset) {
+  return get_string_at_offset(
+      self, offset, offset + 1,
+      [](const PangoLogAttr* attr) -> bool { return attr->is_char_break; },
+      [](const PangoLogAttr* attr) -> bool { return attr->is_char_break; },
+      start_offset, end_offset);
+}
+
+static gchar* get_word_at_offset(FlAccessibleTextField* self,
+                                 gint offset,
+                                 gint* start_offset,
+                                 gint* end_offset) {
+  return get_string_at_offset(
+      self, offset, offset,
+      [](const PangoLogAttr* attr) -> bool { return attr->is_word_start; },
+      [](const PangoLogAttr* attr) -> bool { return attr->is_word_end; },
+      start_offset, end_offset);
+}
+
+static gchar* get_sentence_at_offset(FlAccessibleTextField* self,
+                                     gint offset,
+                                     gint* start_offset,
+                                     gint* end_offset) {
+  return get_string_at_offset(
+      self, offset, offset,
+      [](const PangoLogAttr* attr) -> bool { return attr->is_sentence_start; },
+      [](const PangoLogAttr* attr) -> bool { return attr->is_sentence_end; },
+      start_offset, end_offset);
+}
+
+static gchar* get_line_at_offset(FlAccessibleTextField* self,
+                                 gint offset,
+                                 gint* start_offset,
+                                 gint* end_offset) {
+  g_autoptr(PangoLayout) layout = create_pango_layout(self);
+
+  GSList* lines = pango_layout_get_lines_readonly(layout);
+  while (lines != nullptr) {
+    PangoLayoutLine* line = static_cast<PangoLayoutLine*>(lines->data);
+    if (offset >= line->start_index &&
+        offset <= line->start_index + line->length) {
+      if (start_offset != nullptr) {
+        *start_offset = line->start_index;
+      }
+      if (end_offset != nullptr) {
+        *end_offset = line->start_index + line->length;
+      }
+      return get_substring(self, line->start_index,
+                           line->start_index + line->length);
+    }
+    lines = lines->next;
+  }
+
+  return nullptr;
+}
+
+static gchar* get_paragraph_at_offset(FlAccessibleTextField* self,
+                                      gint offset,
+                                      gint* start_offset,
+                                      gint* end_offset) {
+  g_autoptr(PangoLayout) layout = create_pango_layout(self);
+
+  PangoLayoutLine* start = nullptr;
+  PangoLayoutLine* end = nullptr;
+  gint n_lines = pango_layout_get_line_count(layout);
+  for (gint i = 0; i < n_lines; ++i) {
+    PangoLayoutLine* line = pango_layout_get_line(layout, i);
+    if (line->is_paragraph_start) {
+      end = line;
+    }
+    if (start != nullptr && end != nullptr && offset >= start->start_index &&
+        offset <= end->start_index + end->length) {
+      if (start_offset != nullptr) {
+        *start_offset = start->start_index;
+      }
+      if (end_offset != nullptr) {
+        *end_offset = end->start_index + end->length;
+      }
+      return get_substring(self, start->start_index,
+                           end->start_index + end->length);
+    }
+    if (line->is_paragraph_start) {
+      start = line;
+    }
+  }
+
+  return nullptr;
+}
+
 static void perform_set_text_action(FlAccessibleTextField* self,
                                     const char* text) {
   g_autoptr(FlValue) value = fl_value_new_string(text);
@@ -109,6 +258,16 @@ static void fl_accessible_text_field_set_text_selection(FlAccessibleNode* node,
   }
 }
 
+// Implements FlAccessibleNode::set_text_direction.
+static void fl_accessible_text_field_set_text_direction(
+    FlAccessibleNode* node,
+    FlutterTextDirection direction) {
+  g_return_if_fail(FL_IS_ACCESSIBLE_TEXT_FIELD(node));
+  FlAccessibleTextField* self = FL_ACCESSIBLE_TEXT_FIELD(node);
+
+  self->text_direction = direction;
+}
+
 // Overrides FlAccessibleNode::perform_action.
 void fl_accessible_text_field_perform_action(FlAccessibleNode* self,
                                              FlutterSemanticsAction action,
@@ -154,6 +313,65 @@ static gchar* fl_accessible_text_field_get_text(AtkText* text,
   return get_substring(self, start_offset, end_offset);
 }
 
+// Implements AtkText::get_string_at_offset.
+static gchar* fl_accessible_text_field_get_string_at_offset(
+    AtkText* text,
+    gint offset,
+    AtkTextGranularity granularity,
+    gint* start_offset,
+    gint* end_offset) {
+  g_return_val_if_fail(FL_IS_ACCESSIBLE_TEXT_FIELD(text), nullptr);
+  FlAccessibleTextField* self = FL_ACCESSIBLE_TEXT_FIELD(text);
+
+  switch (granularity) {
+    case ATK_TEXT_GRANULARITY_CHAR:
+      return get_char_at_offset(self, offset, start_offset, end_offset);
+    case ATK_TEXT_GRANULARITY_WORD:
+      return get_word_at_offset(self, offset, start_offset, end_offset);
+    case ATK_TEXT_GRANULARITY_SENTENCE:
+      return get_sentence_at_offset(self, offset, start_offset, end_offset);
+    case ATK_TEXT_GRANULARITY_LINE:
+      return get_line_at_offset(self, offset, start_offset, end_offset);
+    case ATK_TEXT_GRANULARITY_PARAGRAPH:
+      return get_paragraph_at_offset(self, offset, start_offset, end_offset);
+    default:
+      return nullptr;
+  }
+}
+
+// Implements AtkText::get_text_at_offset (deprecated but still commonly used).
+static gchar* fl_accessible_text_field_get_text_at_offset(
+    AtkText* text,
+    gint offset,
+    AtkTextBoundary boundary_type,
+    gint* start_offset,
+    gint* end_offset) {
+  switch (boundary_type) {
+    case ATK_TEXT_BOUNDARY_CHAR:
+      return fl_accessible_text_field_get_string_at_offset(
+          text, offset, ATK_TEXT_GRANULARITY_CHAR, start_offset, end_offset);
+      break;
+    case ATK_TEXT_BOUNDARY_WORD_START:
+    case ATK_TEXT_BOUNDARY_WORD_END:
+      return fl_accessible_text_field_get_string_at_offset(
+          text, offset, ATK_TEXT_GRANULARITY_WORD, start_offset, end_offset);
+      break;
+    case ATK_TEXT_BOUNDARY_SENTENCE_START:
+    case ATK_TEXT_BOUNDARY_SENTENCE_END:
+      return fl_accessible_text_field_get_string_at_offset(
+          text, offset, ATK_TEXT_GRANULARITY_SENTENCE, start_offset,
+          end_offset);
+      break;
+    case ATK_TEXT_BOUNDARY_LINE_START:
+    case ATK_TEXT_BOUNDARY_LINE_END:
+      return fl_accessible_text_field_get_string_at_offset(
+          text, offset, ATK_TEXT_GRANULARITY_LINE, start_offset, end_offset);
+      break;
+    default:
+      return nullptr;
+  }
+}
+
 // Implements AtkText::get_caret_offset.
 static gint fl_accessible_text_field_get_caret_offset(AtkText* text) {
   g_return_val_if_fail(FL_IS_ACCESSIBLE_TEXT_FIELD(text), -1);
@@ -338,6 +556,8 @@ static void fl_accessible_text_field_class_init(
       fl_accessible_text_field_set_value;
   FL_ACCESSIBLE_NODE_CLASS(klass)->set_text_selection =
       fl_accessible_text_field_set_text_selection;
+  FL_ACCESSIBLE_NODE_CLASS(klass)->set_text_direction =
+      fl_accessible_text_field_set_text_direction;
   FL_ACCESSIBLE_NODE_CLASS(klass)->perform_action =
       fl_accessible_text_field_perform_action;
 }
@@ -345,7 +565,8 @@ static void fl_accessible_text_field_class_init(
 static void fl_accessible_text_iface_init(AtkTextIface* iface) {
   iface->get_character_count = fl_accessible_text_field_get_character_count;
   iface->get_text = fl_accessible_text_field_get_text;
-  // TODO(jpnurmi): get_text_at/before/after_offset
+  iface->get_text_at_offset = fl_accessible_text_field_get_text_at_offset;
+  iface->get_string_at_offset = fl_accessible_text_field_get_string_at_offset;
 
   iface->get_caret_offset = fl_accessible_text_field_get_caret_offset;
   iface->set_caret_offset = fl_accessible_text_field_set_caret_offset;
diff --git a/shell/platform/linux/fl_accessible_text_field_test.cc b/shell/platform/linux/fl_accessible_text_field_test.cc
index 475711345ab67462402d72b937740f34927fa248..396c4b0b7bf001021ec11f3dca749eaf8e890fcd 100644
--- a/shell/platform/linux/fl_accessible_text_field_test.cc
+++ b/shell/platform/linux/fl_accessible_text_field_test.cc
@@ -521,4 +521,121 @@ TEST(FlAccessibleTextFieldTest, CopyCutPasteText) {
   EXPECT_EQ(act, kFlutterSemanticsActionPaste);
 }
 
+TEST(FlAccessibleTextFieldTest, TextBoundary) {
+  g_autoptr(FlEngine) engine = make_mock_engine();
+  g_autoptr(FlAccessibleNode) node = fl_accessible_text_field_new(engine, 1);
+
+  fl_accessible_node_set_value(node,
+                               "Lorem ipsum.\nDolor sit amet. Praesent commodo?"
+                               "\n\nPraesent et felis dui.");
+
+  // |Lorem
+  gint start_offset = -1, end_offset = -1;
+  g_autofree gchar* lorem_char = atk_text_get_string_at_offset(
+      ATK_TEXT(node), 0, ATK_TEXT_GRANULARITY_CHAR, &start_offset, &end_offset);
+  EXPECT_STREQ(lorem_char, "L");
+  EXPECT_EQ(start_offset, 0);
+  EXPECT_EQ(end_offset, 1);
+
+  g_autofree gchar* lorem_word = atk_text_get_string_at_offset(
+      ATK_TEXT(node), 0, ATK_TEXT_GRANULARITY_WORD, &start_offset, &end_offset);
+  EXPECT_STREQ(lorem_word, "Lorem");
+  EXPECT_EQ(start_offset, 0);
+  EXPECT_EQ(end_offset, 5);
+
+  g_autofree gchar* lorem_sentence = atk_text_get_string_at_offset(
+      ATK_TEXT(node), 0, ATK_TEXT_GRANULARITY_SENTENCE, &start_offset,
+      &end_offset);
+  EXPECT_STREQ(lorem_sentence, "Lorem ipsum.");
+  EXPECT_EQ(start_offset, 0);
+  EXPECT_EQ(end_offset, 12);
+
+  g_autofree gchar* lorem_line = atk_text_get_string_at_offset(
+      ATK_TEXT(node), 0, ATK_TEXT_GRANULARITY_LINE, &start_offset, &end_offset);
+  EXPECT_STREQ(lorem_line, "Lorem ipsum.");
+  EXPECT_EQ(start_offset, 0);
+  EXPECT_EQ(end_offset, 12);
+
+  g_autofree gchar* lorem_paragraph = atk_text_get_string_at_offset(
+      ATK_TEXT(node), 0, ATK_TEXT_GRANULARITY_PARAGRAPH, &start_offset,
+      &end_offset);
+  EXPECT_STREQ(lorem_paragraph,
+               "Lorem ipsum.\nDolor sit amet. Praesent commodo?");
+  EXPECT_EQ(start_offset, 0);
+  EXPECT_EQ(end_offset, 46);
+
+  // Pra|esent
+  g_autofree gchar* praesent_char = atk_text_get_string_at_offset(
+      ATK_TEXT(node), 32, ATK_TEXT_GRANULARITY_CHAR, &start_offset,
+      &end_offset);
+  EXPECT_STREQ(praesent_char, "e");
+  EXPECT_EQ(start_offset, 32);
+  EXPECT_EQ(end_offset, 33);
+
+  g_autofree gchar* praesent_word = atk_text_get_string_at_offset(
+      ATK_TEXT(node), 32, ATK_TEXT_GRANULARITY_WORD, &start_offset,
+      &end_offset);
+  EXPECT_STREQ(praesent_word, "Praesent");
+  EXPECT_EQ(start_offset, 29);
+  EXPECT_EQ(end_offset, 37);
+
+  g_autofree gchar* praesent_sentence = atk_text_get_string_at_offset(
+      ATK_TEXT(node), 32, ATK_TEXT_GRANULARITY_SENTENCE, &start_offset,
+      &end_offset);
+  EXPECT_STREQ(praesent_sentence, "Praesent commodo?");
+  EXPECT_EQ(start_offset, 29);
+  EXPECT_EQ(end_offset, 46);
+
+  g_autofree gchar* praesent_line = atk_text_get_string_at_offset(
+      ATK_TEXT(node), 32, ATK_TEXT_GRANULARITY_LINE, &start_offset,
+      &end_offset);
+  EXPECT_STREQ(praesent_line, "Dolor sit amet. Praesent commodo?");
+  EXPECT_EQ(start_offset, 13);
+  EXPECT_EQ(end_offset, 46);
+
+  g_autofree gchar* praesent_paragraph = atk_text_get_string_at_offset(
+      ATK_TEXT(node), 32, ATK_TEXT_GRANULARITY_PARAGRAPH, &start_offset,
+      &end_offset);
+  EXPECT_STREQ(praesent_paragraph,
+               "Lorem ipsum.\nDolor sit amet. Praesent commodo?");
+  EXPECT_EQ(start_offset, 0);
+  EXPECT_EQ(end_offset, 46);
+
+  // feli|s
+  g_autofree gchar* felis_char = atk_text_get_string_at_offset(
+      ATK_TEXT(node), 64, ATK_TEXT_GRANULARITY_CHAR, &start_offset,
+      &end_offset);
+  EXPECT_STREQ(felis_char, "s");
+  EXPECT_EQ(start_offset, 64);
+  EXPECT_EQ(end_offset, 65);
+
+  g_autofree gchar* felis_word = atk_text_get_string_at_offset(
+      ATK_TEXT(node), 64, ATK_TEXT_GRANULARITY_WORD, &start_offset,
+      &end_offset);
+  EXPECT_STREQ(felis_word, "felis");
+  EXPECT_EQ(start_offset, 60);
+  EXPECT_EQ(end_offset, 65);
+
+  g_autofree gchar* felis_sentence = atk_text_get_string_at_offset(
+      ATK_TEXT(node), 64, ATK_TEXT_GRANULARITY_SENTENCE, &start_offset,
+      &end_offset);
+  EXPECT_STREQ(felis_sentence, "Praesent et felis dui.");
+  EXPECT_EQ(start_offset, 48);
+  EXPECT_EQ(end_offset, 70);
+
+  g_autofree gchar* felis_line = atk_text_get_string_at_offset(
+      ATK_TEXT(node), 64, ATK_TEXT_GRANULARITY_LINE, &start_offset,
+      &end_offset);
+  EXPECT_STREQ(felis_line, "Praesent et felis dui.");
+  EXPECT_EQ(start_offset, 48);
+  EXPECT_EQ(end_offset, 70);
+
+  g_autofree gchar* felis_paragraph = atk_text_get_string_at_offset(
+      ATK_TEXT(node), 64, ATK_TEXT_GRANULARITY_PARAGRAPH, &start_offset,
+      &end_offset);
+  EXPECT_STREQ(felis_paragraph, "\nPraesent et felis dui.");
+  EXPECT_EQ(start_offset, 47);
+  EXPECT_EQ(end_offset, 70);
+}
+
 // NOLINTEND(clang-analyzer-core.StackAddressEscape)
diff --git a/shell/platform/linux/fl_backing_store_provider.cc b/shell/platform/linux/fl_backing_store_provider.cc
index 643e9a343621eb00078e00bd41c94259e401c6d8..c7be731c67b356a78d7bdc6d35901ef3e0a28e06 100644
--- a/shell/platform/linux/fl_backing_store_provider.cc
+++ b/shell/platform/linux/fl_backing_store_provider.cc
@@ -82,7 +82,8 @@ uint32_t fl_backing_store_provider_get_gl_format(FlBackingStoreProvider* self) {
   // In Linux kN32_SkColorType is assumed to be kBGRA_8888_SkColorType.
   // So we must choose a valid gl format to be compatible with surface format
   // BGRA8.
-  // Following logics are copied from Skia GrGLCaps.cpp.
+  // Following logic is copied from Skia GrGLCaps.cpp:
+  // https://github.com/google/skia/blob/4738ed711e03212aceec3cd502a4adb545f38e63/src/gpu/ganesh/gl/GrGLCaps.cpp#L1963-L2116
 
   if (epoxy_is_desktop_gl()) {
     // For OpenGL.
diff --git a/shell/platform/linux/fl_basic_message_channel.cc b/shell/platform/linux/fl_basic_message_channel.cc
index 52670f6c1ab3a1b47fd35fa5b82d933fa73635cb..7d2b5afe60a6acad16400ad81cb011a209462e92 100644
--- a/shell/platform/linux/fl_basic_message_channel.cc
+++ b/shell/platform/linux/fl_basic_message_channel.cc
@@ -33,9 +33,6 @@ struct _FlBasicMessageChannelResponseHandle {
   FlBinaryMessengerResponseHandle* response_handle;
 };
 
-// Added here to stop the compiler from optimizing this function away.
-G_MODULE_EXPORT GType fl_basic_message_channel_get_type();
-
 G_DEFINE_TYPE(FlBasicMessageChannel, fl_basic_message_channel, G_TYPE_OBJECT)
 G_DEFINE_TYPE(FlBasicMessageChannelResponseHandle,
               fl_basic_message_channel_response_handle,
@@ -232,7 +229,6 @@ G_MODULE_EXPORT void fl_basic_message_channel_send(FlBasicMessageChannel* self,
                                                    GAsyncReadyCallback callback,
                                                    gpointer user_data) {
   g_return_if_fail(FL_IS_BASIC_MESSAGE_CHANNEL(self));
-  g_return_if_fail(message != nullptr);
 
   g_autoptr(GTask) task =
       callback != nullptr ? g_task_new(self, cancellable, callback, user_data)
diff --git a/shell/platform/linux/fl_basic_message_channel_test.cc b/shell/platform/linux/fl_basic_message_channel_test.cc
index 8811fa388af8366244985d702b420b31a88a0c14..5a8eb635af4b5876864265eeb8fbbc728ec8b01f 100644
--- a/shell/platform/linux/fl_basic_message_channel_test.cc
+++ b/shell/platform/linux/fl_basic_message_channel_test.cc
@@ -62,7 +62,8 @@ TEST(FlBasicMessageChannelTest, SendMessageWithoutResponse) {
 }
 // NOLINTEND(clang-analyzer-core.StackAddressEscape)
 
-// Called when the message response is received in the SendMessage test.
+// Called when the message response is received in the SendMessageWithResponse
+// test.
 static void echo_response_cb(GObject* object,
                              GAsyncResult* result,
                              gpointer user_data) {
@@ -189,3 +190,35 @@ TEST(FlBasicMessageChannelTest, ReceiveMessage) {
   // Blocks here until response_cb is called.
   g_main_loop_run(loop);
 }
+
+// Called when the message response is received in the
+// SendNullMessageWithResponse test.
+static void null_message_response_cb(GObject* object,
+                                     GAsyncResult* result,
+                                     gpointer user_data) {
+  g_autoptr(GError) error = nullptr;
+  g_autoptr(FlValue) message = fl_basic_message_channel_send_finish(
+      FL_BASIC_MESSAGE_CHANNEL(object), result, &error);
+  EXPECT_NE(message, nullptr);
+  EXPECT_EQ(error, nullptr);
+
+  EXPECT_EQ(fl_value_get_type(message), FL_VALUE_TYPE_NULL);
+
+  g_main_loop_quit(static_cast<GMainLoop*>(user_data));
+}
+
+// Checks sending a null message with a response works.
+TEST(FlBasicMessageChannelTest, SendNullMessageWithResponse) {
+  g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0);
+
+  g_autoptr(FlEngine) engine = make_mock_engine();
+  FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
+  g_autoptr(FlStandardMessageCodec) codec = fl_standard_message_codec_new();
+  g_autoptr(FlBasicMessageChannel) channel = fl_basic_message_channel_new(
+      messenger, "test/echo", FL_MESSAGE_CODEC(codec));
+  fl_basic_message_channel_send(channel, nullptr, nullptr,
+                                null_message_response_cb, loop);
+
+  // Blocks here until null_message_response_cb is called.
+  g_main_loop_run(loop);
+}
diff --git a/shell/platform/linux/fl_binary_messenger.cc b/shell/platform/linux/fl_binary_messenger.cc
index 92c3f69dc29e226d5f758ff6ef76f10ebdb5cde8..3a1a998e597218b166a56b4be37a04ed4218998f 100644
--- a/shell/platform/linux/fl_binary_messenger.cc
+++ b/shell/platform/linux/fl_binary_messenger.cc
@@ -5,13 +5,19 @@
 #include "flutter/shell/platform/linux/public/flutter_linux/fl_binary_messenger.h"
 #include "flutter/shell/platform/linux/fl_binary_messenger_private.h"
 
+#include "flutter/fml/logging.h"
 #include "flutter/shell/platform/linux/fl_engine_private.h"
+#include "flutter/shell/platform/linux/fl_method_codec_private.h"
 #include "flutter/shell/platform/linux/public/flutter_linux/fl_engine.h"
+#include "flutter/shell/platform/linux/public/flutter_linux/fl_method_channel.h"
+#include "flutter/shell/platform/linux/public/flutter_linux/fl_method_codec.h"
+#include "flutter/shell/platform/linux/public/flutter_linux/fl_standard_method_codec.h"
 
 #include <gmodule.h>
 
-// Added here to stop the compiler from optimizing this function away.
-G_MODULE_EXPORT GType fl_binary_messenger_get_type();
+static constexpr char kControlChannelName[] = "dev.flutter/channel-buffers";
+static constexpr char kResizeMethod[] = "resize";
+static constexpr char kOverflowMethod[] = "overflow";
 
 G_DEFINE_QUARK(fl_binary_messenger_codec_error_quark,
                fl_binary_messenger_codec_error)
@@ -33,7 +39,7 @@ G_DEFINE_INTERFACE(FlBinaryMessenger, fl_binary_messenger, G_TYPE_OBJECT)
 struct _FlBinaryMessengerImpl {
   GObject parent_instance;
 
-  FlEngine* engine;
+  GWeakRef engine;
 
   // PlatformMessageHandler keyed by channel name.
   GHashTable* platform_message_handlers;
@@ -81,7 +87,9 @@ static void fl_binary_messenger_response_handle_impl_dispose(GObject* object) {
   FlBinaryMessengerResponseHandleImpl* self =
       FL_BINARY_MESSENGER_RESPONSE_HANDLE_IMPL(object);
 
-  if (self->response_handle != nullptr && self->messenger->engine != nullptr) {
+  g_autoptr(FlEngine) engine =
+      FL_ENGINE(g_weak_ref_get(&self->messenger->engine));
+  if (self->response_handle != nullptr && engine != nullptr) {
     g_critical("FlBinaryMessengerResponseHandle was not responded to");
   }
 
@@ -144,7 +152,6 @@ static void platform_message_handler_free(gpointer data) {
 static void engine_weak_notify_cb(gpointer user_data,
                                   GObject* where_the_object_was) {
   FlBinaryMessengerImpl* self = FL_BINARY_MESSENGER_IMPL(user_data);
-  self->engine = nullptr;
 
   // Disconnect any handlers.
   // Take the reference in case a handler tries to modify this table.
@@ -180,11 +187,15 @@ static gboolean fl_binary_messenger_platform_message_cb(
 static void fl_binary_messenger_impl_dispose(GObject* object) {
   FlBinaryMessengerImpl* self = FL_BINARY_MESSENGER_IMPL(object);
 
-  if (self->engine != nullptr) {
-    g_object_weak_unref(G_OBJECT(self->engine), engine_weak_notify_cb, self);
-    self->engine = nullptr;
+  {
+    g_autoptr(FlEngine) engine = FL_ENGINE(g_weak_ref_get(&self->engine));
+    if (engine) {
+      g_object_weak_unref(G_OBJECT(engine), engine_weak_notify_cb, self);
+    }
   }
 
+  g_weak_ref_clear(&self->engine);
+
   g_clear_pointer(&self->platform_message_handlers, g_hash_table_unref);
 
   G_OBJECT_CLASS(fl_binary_messenger_impl_parent_class)->dispose(object);
@@ -199,7 +210,8 @@ static void set_message_handler_on_channel(
   FlBinaryMessengerImpl* self = FL_BINARY_MESSENGER_IMPL(messenger);
 
   // Don't set handlers if engine already gone.
-  if (self->engine == nullptr) {
+  g_autoptr(FlEngine) engine = FL_ENGINE(g_weak_ref_get(&self->engine));
+  if (engine == nullptr) {
     if (handler != nullptr) {
       g_warning(
           "Attempted to set message handler on an FlBinaryMessenger without an "
@@ -220,6 +232,12 @@ static void set_message_handler_on_channel(
   }
 }
 
+static gboolean do_unref(gpointer value) {
+  g_object_unref(value);
+  return G_SOURCE_REMOVE;
+}
+
+// Note: This function can be called from any thread.
 static gboolean send_response(FlBinaryMessenger* messenger,
                               FlBinaryMessengerResponseHandle* response_handle_,
                               GBytes* response,
@@ -233,21 +251,27 @@ static gboolean send_response(FlBinaryMessenger* messenger,
   g_return_val_if_fail(response_handle->messenger == self, FALSE);
   g_return_val_if_fail(response_handle->response_handle != nullptr, FALSE);
 
-  if (self->engine == nullptr) {
+  FlEngine* engine = FL_ENGINE(g_weak_ref_get(&self->engine));
+  if (engine == nullptr) {
     return TRUE;
   }
 
+  gboolean result = false;
   if (response_handle->response_handle == nullptr) {
     g_set_error(
         error, FL_BINARY_MESSENGER_ERROR,
         FL_BINARY_MESSENGER_ERROR_ALREADY_RESPONDED,
         "Attempted to respond to a message that is already responded to");
-    return FALSE;
+    result = FALSE;
+  } else {
+    result = fl_engine_send_platform_message_response(
+        engine, response_handle->response_handle, response, error);
+    response_handle->response_handle = nullptr;
   }
 
-  gboolean result = fl_engine_send_platform_message_response(
-      self->engine, response_handle->response_handle, response, error);
-  response_handle->response_handle = nullptr;
+  // This guarantees that the dispose method for the engine is executed
+  // on the platform thread in the rare chance this is the last ref.
+  g_idle_add(do_unref, engine);
 
   return result;
 }
@@ -267,12 +291,13 @@ static void send_on_channel(FlBinaryMessenger* messenger,
                             gpointer user_data) {
   FlBinaryMessengerImpl* self = FL_BINARY_MESSENGER_IMPL(messenger);
 
-  if (self->engine == nullptr) {
+  g_autoptr(FlEngine) engine = FL_ENGINE(g_weak_ref_get(&self->engine));
+  if (engine == nullptr) {
     return;
   }
 
   fl_engine_send_platform_message(
-      self->engine, channel, message, cancellable,
+      engine, channel, message, cancellable,
       callback != nullptr ? platform_message_ready_cb : nullptr,
       callback != nullptr ? g_task_new(self, cancellable, callback, user_data)
                           : nullptr);
@@ -287,11 +312,75 @@ static GBytes* send_on_channel_finish(FlBinaryMessenger* messenger,
   g_autoptr(GTask) task = G_TASK(result);
   GAsyncResult* r = G_ASYNC_RESULT(g_task_propagate_pointer(task, nullptr));
 
-  if (self->engine == nullptr) {
+  g_autoptr(FlEngine) engine = FL_ENGINE(g_weak_ref_get(&self->engine));
+  if (engine == nullptr) {
     return nullptr;
   }
 
-  return fl_engine_send_platform_message_finish(self->engine, r, error);
+  return fl_engine_send_platform_message_finish(engine, r, error);
+}
+
+// Completes method call and returns TRUE if the call was successful.
+static gboolean finish_method(GObject* object,
+                              GAsyncResult* result,
+                              GError** error) {
+  g_autoptr(GBytes) response = fl_binary_messenger_send_on_channel_finish(
+      FL_BINARY_MESSENGER(object), result, error);
+  if (response == nullptr) {
+    return FALSE;
+  }
+  g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
+  return fl_method_codec_decode_response(FL_METHOD_CODEC(codec), response,
+                                         error) != nullptr;
+}
+
+// Called when a response is received for the resize channel message.
+static void resize_channel_response_cb(GObject* object,
+                                       GAsyncResult* result,
+                                       gpointer user_data) {
+  g_autoptr(GError) error = nullptr;
+  if (!finish_method(object, result, &error)) {
+    g_warning("Failed to resize channel: %s", error->message);
+  }
+}
+
+static void resize_channel(FlBinaryMessenger* messenger,
+                           const gchar* channel,
+                           int64_t new_size) {
+  FML_DCHECK(new_size >= 0);
+  g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
+  g_autoptr(FlValue) args = fl_value_new_list();
+  fl_value_append_take(args, fl_value_new_string(channel));
+  fl_value_append_take(args, fl_value_new_int(new_size));
+  g_autoptr(GBytes) message = fl_method_codec_encode_method_call(
+      FL_METHOD_CODEC(codec), kResizeMethod, args, nullptr);
+  fl_binary_messenger_send_on_channel(messenger, kControlChannelName, message,
+                                      nullptr, resize_channel_response_cb,
+                                      nullptr);
+}
+
+// Called when a response is received for the warns on overflow message.
+static void set_warns_on_channel_overflow_response_cb(GObject* object,
+                                                      GAsyncResult* result,
+                                                      gpointer user_data) {
+  g_autoptr(GError) error = nullptr;
+  if (!finish_method(object, result, &error)) {
+    g_warning("Failed to set warns on channel overflow: %s", error->message);
+  }
+}
+
+static void set_warns_on_channel_overflow(FlBinaryMessenger* messenger,
+                                          const gchar* channel,
+                                          bool warns) {
+  g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
+  g_autoptr(FlValue) args = fl_value_new_list();
+  fl_value_append_take(args, fl_value_new_string(channel));
+  fl_value_append_take(args, fl_value_new_bool(!warns));
+  g_autoptr(GBytes) message = fl_method_codec_encode_method_call(
+      FL_METHOD_CODEC(codec), kOverflowMethod, args, nullptr);
+  fl_binary_messenger_send_on_channel(
+      messenger, kControlChannelName, message, nullptr,
+      set_warns_on_channel_overflow_response_cb, nullptr);
 }
 
 static void fl_binary_messenger_impl_class_init(
@@ -305,6 +394,8 @@ static void fl_binary_messenger_impl_iface_init(
   iface->send_response = send_response;
   iface->send_on_channel = send_on_channel;
   iface->send_on_channel_finish = send_on_channel_finish;
+  iface->resize_channel = resize_channel;
+  iface->set_warns_on_channel_overflow = set_warns_on_channel_overflow;
 }
 
 static void fl_binary_messenger_impl_init(FlBinaryMessengerImpl* self) {
@@ -321,7 +412,7 @@ FlBinaryMessenger* fl_binary_messenger_new(FlEngine* engine) {
   // Added to stop compiler complaining about an unused function.
   FL_IS_BINARY_MESSENGER_IMPL(self);
 
-  self->engine = engine;
+  g_weak_ref_init(&self->engine, G_OBJECT(engine));
   g_object_weak_ref(G_OBJECT(engine), engine_weak_notify_cb, self);
 
   fl_engine_set_platform_message_handler(
@@ -343,6 +434,7 @@ G_MODULE_EXPORT void fl_binary_messenger_set_message_handler_on_channel(
       self, channel, handler, user_data, destroy_notify);
 }
 
+// Note: This function can be called from any thread.
 G_MODULE_EXPORT gboolean fl_binary_messenger_send_response(
     FlBinaryMessenger* self,
     FlBinaryMessengerResponseHandle* response_handle,
@@ -379,3 +471,22 @@ G_MODULE_EXPORT GBytes* fl_binary_messenger_send_on_channel_finish(
   return FL_BINARY_MESSENGER_GET_IFACE(self)->send_on_channel_finish(
       self, result, error);
 }
+
+G_MODULE_EXPORT void fl_binary_messenger_resize_channel(FlBinaryMessenger* self,
+                                                        const gchar* channel,
+                                                        int64_t new_size) {
+  g_return_if_fail(FL_IS_BINARY_MESSENGER(self));
+
+  return FL_BINARY_MESSENGER_GET_IFACE(self)->resize_channel(self, channel,
+                                                             new_size);
+}
+
+G_MODULE_EXPORT void fl_binary_messenger_set_warns_on_channel_overflow(
+    FlBinaryMessenger* self,
+    const gchar* channel,
+    bool warns) {
+  g_return_if_fail(FL_IS_BINARY_MESSENGER(self));
+
+  return FL_BINARY_MESSENGER_GET_IFACE(self)->set_warns_on_channel_overflow(
+      self, channel, warns);
+}
diff --git a/shell/platform/linux/fl_binary_messenger_test.cc b/shell/platform/linux/fl_binary_messenger_test.cc
index 37278f8b14c018d011f8f5dc54a8b9fe81c2519b..d27e07d8af9bff3e04d206f23c2182aed4281783 100644
--- a/shell/platform/linux/fl_binary_messenger_test.cc
+++ b/shell/platform/linux/fl_binary_messenger_test.cc
@@ -5,11 +5,16 @@
 // Included first as it collides with the X11 headers.
 #include "gtest/gtest.h"
 
+#include <pthread.h>
 #include <cstring>
 
+#include "flutter/shell/platform/embedder/embedder.h"
+#include "flutter/shell/platform/embedder/test_utils/proc_table_replacement.h"
 #include "flutter/shell/platform/linux/fl_binary_messenger_private.h"
 #include "flutter/shell/platform/linux/fl_engine_private.h"
 #include "flutter/shell/platform/linux/public/flutter_linux/fl_binary_messenger.h"
+#include "flutter/shell/platform/linux/public/flutter_linux/fl_method_channel.h"
+#include "flutter/shell/platform/linux/public/flutter_linux/fl_standard_method_codec.h"
 #include "flutter/shell/platform/linux/testing/fl_test.h"
 #include "flutter/shell/platform/linux/testing/mock_binary_messenger_response_handle.h"
 #include "flutter/shell/platform/linux/testing/mock_renderer.h"
@@ -125,12 +130,26 @@ static GBytes* send_on_channel_finish(FlBinaryMessenger* messenger,
   return g_bytes_new(text, strlen(text));
 }
 
+static void resize_channel(FlBinaryMessenger* messenger,
+                           const gchar* channel,
+                           int64_t new_size) {
+  // Fake implementation. Do nothing.
+}
+
+static void set_warns_on_channel_overflow(FlBinaryMessenger* messenger,
+                                          const gchar* channel,
+                                          bool warns) {
+  // Fake implementation. Do nothing.
+}
+
 static void fl_fake_binary_messenger_iface_init(
     FlBinaryMessengerInterface* iface) {
   iface->set_message_handler_on_channel = set_message_handler_on_channel;
   iface->send_response = send_response;
   iface->send_on_channel = send_on_channel;
   iface->send_on_channel_finish = send_on_channel_finish;
+  iface->resize_channel = resize_channel;
+  iface->set_warns_on_channel_overflow = set_warns_on_channel_overflow;
 }
 
 static void fl_fake_binary_messenger_init(FlFakeBinaryMessenger* self) {}
@@ -384,3 +403,246 @@ TEST(FlBinaryMessengerTest, ReceiveMessage) {
   // Blocks here until response_cb is called.
   g_main_loop_run(loop);
 }
+
+// MOCK_ENGINE_PROC is leaky by design.
+// NOLINTBEGIN(clang-analyzer-core.StackAddressEscape)
+
+// Checks if the 'resize' command is sent and is well-formed.
+TEST(FlBinaryMessengerTest, ResizeChannel) {
+  g_autoptr(FlEngine) engine = make_mock_engine();
+  FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine);
+
+  bool called = false;
+
+  FlutterEngineSendPlatformMessageFnPtr old_handler =
+      embedder_api->SendPlatformMessage;
+  embedder_api->SendPlatformMessage = MOCK_ENGINE_PROC(
+      SendPlatformMessage,
+      ([&called, old_handler](auto engine,
+                              const FlutterPlatformMessage* message) {
+        // Expect to receive a message on the "control" channel.
+        if (strcmp(message->channel, "dev.flutter/channel-buffers") != 0) {
+          return old_handler(engine, message);
+        }
+
+        called = true;
+
+        // The expected content was created from the following Dart code:
+        //   MethodCall call = MethodCall('resize', ['flutter/test',3]);
+        //   StandardMethodCodec().encodeMethodCall(call).buffer.asUint8List();
+        const int expected_message_size = 29;
+        EXPECT_EQ(message->message_size,
+                  static_cast<size_t>(expected_message_size));
+        int expected[expected_message_size] = {
+            7,   6,   114, 101, 115, 105, 122, 101, 12,  2,
+            7,   12,  102, 108, 117, 116, 116, 101, 114, 47,
+            116, 101, 115, 116, 3,   3,   0,   0,   0};
+        for (size_t i = 0; i < expected_message_size; i++) {
+          EXPECT_EQ(message->message[i], expected[i]);
+        }
+
+        return kSuccess;
+      }));
+
+  g_autoptr(GError) error = nullptr;
+  EXPECT_TRUE(fl_engine_start(engine, &error));
+  EXPECT_EQ(error, nullptr);
+
+  FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
+  fl_binary_messenger_resize_channel(messenger, "flutter/test", 3);
+
+  EXPECT_TRUE(called);
+}
+
+// Checks if the 'overflow' command is sent and is well-formed.
+TEST(FlBinaryMessengerTest, WarnsOnOverflowChannel) {
+  g_autoptr(FlEngine) engine = make_mock_engine();
+  FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine);
+
+  bool called = false;
+
+  FlutterEngineSendPlatformMessageFnPtr old_handler =
+      embedder_api->SendPlatformMessage;
+  embedder_api->SendPlatformMessage = MOCK_ENGINE_PROC(
+      SendPlatformMessage,
+      ([&called, old_handler](auto engine,
+                              const FlutterPlatformMessage* message) {
+        // Expect to receive a message on the "control" channel.
+        if (strcmp(message->channel, "dev.flutter/channel-buffers") != 0) {
+          return old_handler(engine, message);
+        }
+
+        called = true;
+
+        // The expected content was created from the following Dart code:
+        //   MethodCall call = MethodCall('overflow',['flutter/test', true]);
+        //   StandardMethodCodec().encodeMethodCall(call).buffer.asUint8List();
+        const int expected_message_size = 27;
+        EXPECT_EQ(message->message_size,
+                  static_cast<size_t>(expected_message_size));
+        int expected[expected_message_size] = {
+            7,   8,   111, 118, 101, 114, 102, 108, 111, 119, 12,  2,   7, 12,
+            102, 108, 117, 116, 116, 101, 114, 47,  116, 101, 115, 116, 1};
+        for (size_t i = 0; i < expected_message_size; i++) {
+          EXPECT_EQ(message->message[i], expected[i]);
+        }
+
+        return kSuccess;
+      }));
+
+  g_autoptr(GError) error = nullptr;
+  EXPECT_TRUE(fl_engine_start(engine, &error));
+  EXPECT_EQ(error, nullptr);
+
+  FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
+  fl_binary_messenger_set_warns_on_channel_overflow(messenger, "flutter/test",
+                                                    false);
+
+  EXPECT_TRUE(called);
+}
+
+static gboolean quit_main_loop_cb(gpointer user_data) {
+  g_main_loop_quit(static_cast<GMainLoop*>(user_data));
+  return FALSE;
+}
+
+// Checks if error returned when invoking a command on the control channel
+// are handled.
+TEST(FlBinaryMessengerTest, ControlChannelErrorResponse) {
+  g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0);
+  g_autoptr(FlEngine) engine = make_mock_engine();
+  FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
+
+  g_autoptr(GError) error = nullptr;
+  EXPECT_TRUE(fl_engine_start(engine, &error));
+  EXPECT_EQ(error, nullptr);
+
+  FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine);
+
+  bool called = false;
+
+  FlutterEngineSendPlatformMessageFnPtr old_handler =
+      embedder_api->SendPlatformMessage;
+  embedder_api->SendPlatformMessage = MOCK_ENGINE_PROC(
+      SendPlatformMessage,
+      ([&called, old_handler, loop](auto engine,
+                                    const FlutterPlatformMessage* message) {
+        // Expect to receive a message on the "control" channel.
+        if (strcmp(message->channel, "dev.flutter/channel-buffers") != 0) {
+          return old_handler(engine, message);
+        }
+
+        called = true;
+
+        // Register a callback to quit the main loop when binary messenger work
+        // ends.
+        g_idle_add(quit_main_loop_cb, loop);
+
+        // Simulates an internal error.
+        return kInvalidArguments;
+      }));
+
+  fl_binary_messenger_set_warns_on_channel_overflow(messenger, "flutter/test",
+                                                    false);
+
+  EXPECT_TRUE(called);
+
+  // Blocks here until quit_main_loop_cb is called.
+  g_main_loop_run(loop);
+}
+
+// NOLINTEND(clang-analyzer-core.StackAddressEscape)
+
+struct RespondsOnBackgroundThreadInfo {
+  FlBinaryMessenger* messenger;
+  FlBinaryMessengerResponseHandle* response_handle;
+  GMainLoop* loop;
+};
+
+static gboolean cleanup_responds_on_background_thread_info(gpointer user_data) {
+  RespondsOnBackgroundThreadInfo* info =
+      static_cast<RespondsOnBackgroundThreadInfo*>(user_data);
+  GMainLoop* loop = info->loop;
+
+  g_object_unref(info->messenger);
+  g_object_unref(info->response_handle);
+  free(info);
+
+  g_main_loop_quit(static_cast<GMainLoop*>(loop));
+
+  return G_SOURCE_REMOVE;
+}
+
+static void* response_from_thread_main(void* user_data) {
+  RespondsOnBackgroundThreadInfo* info =
+      static_cast<RespondsOnBackgroundThreadInfo*>(user_data);
+
+  fl_binary_messenger_send_response(info->messenger, info->response_handle,
+                                    nullptr, nullptr);
+
+  g_idle_add(cleanup_responds_on_background_thread_info, info);
+
+  return nullptr;
+}
+
+static void response_from_thread_cb(
+    FlBinaryMessenger* messenger,
+    const gchar* channel,
+    GBytes* message,
+    FlBinaryMessengerResponseHandle* response_handle,
+    gpointer user_data) {
+  EXPECT_NE(message, nullptr);
+  pthread_t thread;
+  RespondsOnBackgroundThreadInfo* info =
+      static_cast<RespondsOnBackgroundThreadInfo*>(
+          malloc(sizeof(RespondsOnBackgroundThreadInfo)));
+  info->messenger = FL_BINARY_MESSENGER(g_object_ref(messenger));
+  info->response_handle =
+      FL_BINARY_MESSENGER_RESPONSE_HANDLE(g_object_ref(response_handle));
+  info->loop = static_cast<GMainLoop*>(user_data);
+  EXPECT_EQ(0,
+            pthread_create(&thread, nullptr, &response_from_thread_main, info));
+}
+
+TEST(FlBinaryMessengerTest, RespondOnBackgroundThread) {
+  g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0);
+
+  g_autoptr(FlEngine) engine = make_mock_engine();
+  FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
+
+  // Listen for messages from the engine.
+  fl_binary_messenger_set_message_handler_on_channel(
+      messenger, "test/messages", message_cb, nullptr, nullptr);
+
+  // Listen for response from the engine.
+  fl_binary_messenger_set_message_handler_on_channel(
+      messenger, "test/responses", response_from_thread_cb, loop, nullptr);
+
+  // Trigger the engine to send a message.
+  const char* text = "Marco!";
+  g_autoptr(GBytes) message = g_bytes_new(text, strlen(text));
+  fl_binary_messenger_send_on_channel(messenger, "test/send-message", message,
+                                      nullptr, nullptr, nullptr);
+
+  // Blocks here until response_cb is called.
+  g_main_loop_run(loop);
+}
+
+static void kill_handler_notify_cb(gpointer was_called) {
+  *static_cast<gboolean*>(was_called) = TRUE;
+}
+
+TEST(FlBinaryMessengerTest, DeletingEngineClearsHandlers) {
+  FlEngine* engine = make_mock_engine();
+  g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
+  gboolean was_killed = FALSE;
+
+  // Listen for messages from the engine.
+  fl_binary_messenger_set_message_handler_on_channel(messenger, "test/messages",
+                                                     message_cb, &was_killed,
+                                                     kill_handler_notify_cb);
+
+  g_clear_object(&engine);
+
+  ASSERT_TRUE(was_killed);
+}
diff --git a/shell/platform/linux/fl_dart_project.cc b/shell/platform/linux/fl_dart_project.cc
index 3a8de3fa571f9dc5c8bf6df2f7430eaa87955a66..934fea435005288f3512495045d3bf50d632177f 100644
--- a/shell/platform/linux/fl_dart_project.cc
+++ b/shell/platform/linux/fl_dart_project.cc
@@ -6,16 +6,9 @@
 
 #include <gmodule.h>
 
-#include <string>
-#include <vector>
-
-#include "flutter/shell/platform/common/engine_switches.h"
-#include "flutter/shell/platform/linux/fl_dart_project_private.h"
-
 struct _FlDartProject {
   GObject parent_instance;
 
-  gboolean enable_mirrors;
   gchar* aot_library_path;
   gchar* assets_path;
   gchar* icu_data_path;
@@ -69,17 +62,11 @@ G_MODULE_EXPORT FlDartProject* fl_dart_project_new() {
   return self;
 }
 
-G_MODULE_EXPORT void fl_dart_project_set_enable_mirrors(
-    FlDartProject* self,
-    gboolean enable_mirrors) {
+G_MODULE_EXPORT void fl_dart_project_set_aot_library_path(FlDartProject* self,
+                                                          const gchar* path) {
   g_return_if_fail(FL_IS_DART_PROJECT(self));
-  self->enable_mirrors = enable_mirrors;
-}
-
-G_MODULE_EXPORT gboolean
-fl_dart_project_get_enable_mirrors(FlDartProject* self) {
-  g_return_val_if_fail(FL_IS_DART_PROJECT(self), FALSE);
-  return self->enable_mirrors;
+  g_clear_pointer(&self->aot_library_path, g_free);
+  self->aot_library_path = g_strdup(path);
 }
 
 G_MODULE_EXPORT const gchar* fl_dart_project_get_aot_library_path(
@@ -88,12 +75,26 @@ G_MODULE_EXPORT const gchar* fl_dart_project_get_aot_library_path(
   return self->aot_library_path;
 }
 
+G_MODULE_EXPORT void fl_dart_project_set_assets_path(FlDartProject* self,
+                                                     gchar* path) {
+  g_return_if_fail(FL_IS_DART_PROJECT(self));
+  g_clear_pointer(&self->assets_path, g_free);
+  self->assets_path = g_strdup(path);
+}
+
 G_MODULE_EXPORT const gchar* fl_dart_project_get_assets_path(
     FlDartProject* self) {
   g_return_val_if_fail(FL_IS_DART_PROJECT(self), nullptr);
   return self->assets_path;
 }
 
+G_MODULE_EXPORT void fl_dart_project_set_icu_data_path(FlDartProject* self,
+                                                       gchar* path) {
+  g_return_if_fail(FL_IS_DART_PROJECT(self));
+  g_clear_pointer(&self->icu_data_path, g_free);
+  self->icu_data_path = g_strdup(path);
+}
+
 G_MODULE_EXPORT const gchar* fl_dart_project_get_icu_data_path(
     FlDartProject* self) {
   g_return_val_if_fail(FL_IS_DART_PROJECT(self), nullptr);
@@ -113,15 +114,3 @@ G_MODULE_EXPORT void fl_dart_project_set_dart_entrypoint_arguments(
   g_clear_pointer(&self->dart_entrypoint_args, g_strfreev);
   self->dart_entrypoint_args = g_strdupv(argv);
 }
-
-GPtrArray* fl_dart_project_get_switches(FlDartProject* self) {
-  GPtrArray* switches = g_ptr_array_new_with_free_func(g_free);
-  std::vector<std::string> env_switches = flutter::GetSwitchesFromEnvironment();
-  for (const auto& env_switch : env_switches) {
-    g_ptr_array_add(switches, g_strdup(env_switch.c_str()));
-  }
-  if (self->enable_mirrors) {
-    g_ptr_array_add(switches, g_strdup("--dart-flags=--enable_mirrors=true"));
-  }
-  return switches;
-}
diff --git a/shell/platform/linux/fl_dart_project_private.h b/shell/platform/linux/fl_dart_project_private.h
index 89422e7264669c9dbaadabcad78d6760819f1183..be03e58791b420e2204c94da25b1da71a6fe8854 100644
--- a/shell/platform/linux/fl_dart_project_private.h
+++ b/shell/platform/linux/fl_dart_project_private.h
@@ -11,16 +11,6 @@
 
 G_BEGIN_DECLS
 
-/**
- * fl_dart_project_get_switches:
- * @project: an #FlDartProject.
- *
- * Determines the engine switches that should be passed to the Flutter engine.
- *
- * Returns: an array of switches to pass to the Flutter engine.
- */
-GPtrArray* fl_dart_project_get_switches(FlDartProject* project);
-
 G_END_DECLS
 
 #endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_DART_PROJECT_PRIVATE_H_
diff --git a/shell/platform/linux/fl_dart_project_test.cc b/shell/platform/linux/fl_dart_project_test.cc
index 7b37ced42a57d019fa8e3419f3f72e65e4c924db..bcc6cca90922410b566500c65778f890c3c15688 100644
--- a/shell/platform/linux/fl_dart_project_test.cc
+++ b/shell/platform/linux/fl_dart_project_test.cc
@@ -8,7 +8,6 @@
 
 #include <cstdlib>
 
-#include "flutter/shell/platform/linux/fl_dart_project_private.h"
 #include "gtest/gtest.h"
 
 TEST(FlDartProjectTest, GetPaths) {
@@ -29,13 +28,28 @@ TEST(FlDartProjectTest, GetPaths) {
                expected_icu_data_path);
 }
 
-TEST(FlDartProjectTest, EnableMirrors) {
+TEST(FlDartProjectTest, OverrideAotLibraryPath) {
   g_autoptr(FlDartProject) project = fl_dart_project_new();
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-  EXPECT_FALSE(fl_dart_project_get_enable_mirrors(project));
-  fl_dart_project_set_enable_mirrors(project, TRUE);
-  EXPECT_TRUE(fl_dart_project_get_enable_mirrors(project));
-  G_GNUC_END_IGNORE_DEPRECATIONS
+
+  char aot_library_path[] = "/normal/tuesday/night/for/shia/labeouf";
+  fl_dart_project_set_aot_library_path(project, aot_library_path);
+  EXPECT_STREQ(fl_dart_project_get_aot_library_path(project), aot_library_path);
+}
+
+TEST(FlDartProjectTest, OverrideAssetsPath) {
+  g_autoptr(FlDartProject) project = fl_dart_project_new();
+
+  char assets_path[] = "/normal/tuesday/night/for/shia/labeouf";
+  fl_dart_project_set_assets_path(project, assets_path);
+  EXPECT_STREQ(fl_dart_project_get_assets_path(project), assets_path);
+}
+
+TEST(FlDartProjectTest, OverrideIcuDataPath) {
+  g_autoptr(FlDartProject) project = fl_dart_project_new();
+
+  char icu_data_path[] = "/living/in/the/woods/icudtl.dat";
+  fl_dart_project_set_icu_data_path(project, icu_data_path);
+  EXPECT_STREQ(fl_dart_project_get_icu_data_path(project), icu_data_path);
 }
 
 TEST(FlDartProjectTest, DartEntrypointArgs) {
@@ -62,35 +76,3 @@ TEST(FlDartProjectTest, DartEntrypointArgs) {
 
   EXPECT_EQ(g_strv_length(retrieved_args), 3U);
 }
-
-TEST(FlDartProjectTest, SwitchesEmpty) {
-  g_autoptr(FlDartProject) project = fl_dart_project_new();
-
-  // Clear the main environment variable, since test order is not guaranteed.
-  unsetenv("FLUTTER_ENGINE_SWITCHES");
-
-  g_autoptr(GPtrArray) switches = fl_dart_project_get_switches(project);
-
-  EXPECT_EQ(switches->len, 0U);
-}
-
-#ifndef FLUTTER_RELEASE
-TEST(FlDartProjectTest, Switches) {
-  g_autoptr(FlDartProject) project = fl_dart_project_new();
-
-  setenv("FLUTTER_ENGINE_SWITCHES", "2", 1);
-  setenv("FLUTTER_ENGINE_SWITCH_1", "abc", 1);
-  setenv("FLUTTER_ENGINE_SWITCH_2", "foo=\"bar, baz\"", 1);
-
-  g_autoptr(GPtrArray) switches = fl_dart_project_get_switches(project);
-  EXPECT_EQ(switches->len, 2U);
-  EXPECT_STREQ(static_cast<const char*>(g_ptr_array_index(switches, 0)),
-               "--abc");
-  EXPECT_STREQ(static_cast<const char*>(g_ptr_array_index(switches, 1)),
-               "--foo=\"bar, baz\"");
-
-  unsetenv("FLUTTER_ENGINE_SWITCHES");
-  unsetenv("FLUTTER_ENGINE_SWITCH_1");
-  unsetenv("FLUTTER_ENGINE_SWITCH_2");
-}
-#endif  // !FLUTTER_RELEASE
diff --git a/shell/platform/linux/fl_engine.cc b/shell/platform/linux/fl_engine.cc
index 042e91abc4b1b9c0c148a1a34dabf8292fe41e77..f2c8040aa41d202cac78c4496323d95e7a1d6573 100644
--- a/shell/platform/linux/fl_engine.cc
+++ b/shell/platform/linux/fl_engine.cc
@@ -7,7 +7,12 @@
 #include <gmodule.h>
 
 #include <cstring>
+#include <string>
+#include <vector>
 
+#include "flutter/common/constants.h"
+#include "flutter/shell/platform/common/app_lifecycle_state.h"
+#include "flutter/shell/platform/common/engine_switches.h"
 #include "flutter/shell/platform/embedder/embedder.h"
 #include "flutter/shell/platform/linux/fl_binary_messenger_private.h"
 #include "flutter/shell/platform/linux/fl_dart_project_private.h"
@@ -20,6 +25,7 @@
 #include "flutter/shell/platform/linux/fl_texture_gl_private.h"
 #include "flutter/shell/platform/linux/fl_texture_registrar_private.h"
 #include "flutter/shell/platform/linux/public/flutter_linux/fl_plugin_registry.h"
+#include "flutter/shell/platform/linux/public/flutter_linux/fl_string_codec.h"
 
 // Unique number associated with platform tasks.
 static constexpr size_t kPlatformTaskRunnerIdentifier = 1;
@@ -29,6 +35,8 @@ static constexpr size_t kPlatformTaskRunnerIdentifier = 1;
 static constexpr int32_t kMousePointerDeviceId = 0;
 static constexpr int32_t kPointerPanZoomDeviceId = 1;
 
+static constexpr const char* kFlutterLifecycleChannel = "flutter/lifecycle";
+
 struct _FlEngine {
   GObject parent_instance;
 
@@ -51,9 +59,9 @@ struct _FlEngine {
   GDestroyNotify platform_message_handler_destroy_notify;
 
   // Function to call when a semantic node is received.
-  FlEngineUpdateSemanticsNodeHandler update_semantics_node_handler;
-  gpointer update_semantics_node_handler_data;
-  GDestroyNotify update_semantics_node_handler_destroy_notify;
+  FlEngineUpdateSemanticsHandler update_semantics_handler;
+  gpointer update_semantics_handler_data;
+  GDestroyNotify update_semantics_handler_destroy_notify;
 
   // Function to call right before the engine is restarted.
   FlEngineOnPreEngineRestartHandler on_pre_engine_restart_handler;
@@ -86,29 +94,56 @@ static void parse_locale(const gchar* locale,
   // Locales are in the form "language[_territory][.codeset][@modifier]"
   gchar* match = strrchr(l, '@');
   if (match != nullptr) {
-    *modifier = g_strdup(match + 1);
+    if (modifier != nullptr) {
+      *modifier = g_strdup(match + 1);
+    }
     *match = '\0';
-  } else {
+  } else if (modifier != nullptr) {
     *modifier = nullptr;
   }
 
   match = strrchr(l, '.');
   if (match != nullptr) {
-    *codeset = g_strdup(match + 1);
+    if (codeset != nullptr) {
+      *codeset = g_strdup(match + 1);
+    }
     *match = '\0';
-  } else {
+  } else if (codeset != nullptr) {
     *codeset = nullptr;
   }
 
   match = strrchr(l, '_');
   if (match != nullptr) {
-    *territory = g_strdup(match + 1);
+    if (territory != nullptr) {
+      *territory = g_strdup(match + 1);
+    }
     *match = '\0';
-  } else {
+  } else if (territory != nullptr) {
     *territory = nullptr;
   }
 
-  *language = l;
+  if (language != nullptr) {
+    *language = l;
+  }
+}
+
+static void set_app_lifecycle_state(FlEngine* self,
+                                    const flutter::AppLifecycleState state) {
+  FlBinaryMessenger* binary_messenger = fl_engine_get_binary_messenger(self);
+
+  g_autoptr(FlValue) value =
+      fl_value_new_string(flutter::AppLifecycleStateToString(state));
+  g_autoptr(FlStringCodec) codec = fl_string_codec_new();
+  g_autoptr(GBytes) message =
+      fl_message_codec_encode_message(FL_MESSAGE_CODEC(codec), value, nullptr);
+
+  if (message == nullptr) {
+    return;
+  }
+
+  fl_binary_messenger_send_on_channel(binary_messenger,
+                                      kFlutterLifecycleChannel, message,
+                                      nullptr, nullptr, nullptr);
 }
 
 // Passes locale information to the Flutter engine.
@@ -118,20 +153,14 @@ static void setup_locales(FlEngine* self) {
   // Helper array to take ownership of the strings passed to Flutter.
   g_autoptr(GPtrArray) locale_strings = g_ptr_array_new_with_free_func(g_free);
   for (int i = 0; languages[i] != nullptr; i++) {
-    gchar *language, *territory, *codeset, *modifier;
-    parse_locale(languages[i], &language, &territory, &codeset, &modifier);
+    gchar *language, *territory;
+    parse_locale(languages[i], &language, &territory, nullptr, nullptr);
     if (language != nullptr) {
       g_ptr_array_add(locale_strings, language);
     }
     if (territory != nullptr) {
       g_ptr_array_add(locale_strings, territory);
     }
-    if (codeset != nullptr) {
-      g_ptr_array_add(locale_strings, codeset);
-    }
-    if (modifier != nullptr) {
-      g_ptr_array_add(locale_strings, modifier);
-    }
 
     FlutterLocale* locale =
         static_cast<FlutterLocale*>(g_malloc0(sizeof(FlutterLocale)));
@@ -139,8 +168,8 @@ static void setup_locales(FlEngine* self) {
     locale->struct_size = sizeof(FlutterLocale);
     locale->language_code = language;
     locale->country_code = territory;
-    locale->script_code = codeset;
-    locale->variant_code = modifier;
+    locale->script_code = nullptr;
+    locale->variant_code = nullptr;
   }
   FlutterLocale** locales =
       reinterpret_cast<FlutterLocale**>(locales_array->pdata);
@@ -188,22 +217,14 @@ static void* fl_engine_gl_proc_resolver(void* user_data, const char* name) {
 
 static bool fl_engine_gl_make_current(void* user_data) {
   FlEngine* self = static_cast<FlEngine*>(user_data);
-  g_autoptr(GError) error = nullptr;
-  gboolean result = fl_renderer_make_current(self->renderer, &error);
-  if (!result) {
-    g_warning("%s", error->message);
-  }
-  return result;
+  fl_renderer_make_current(self->renderer);
+  return true;
 }
 
 static bool fl_engine_gl_clear_current(void* user_data) {
   FlEngine* self = static_cast<FlEngine*>(user_data);
-  g_autoptr(GError) error = nullptr;
-  gboolean result = fl_renderer_clear_current(self->renderer, &error);
-  if (!result) {
-    g_warning("%s", error->message);
-  }
-  return result;
+  fl_renderer_clear_current(self->renderer);
+  return true;
 }
 
 static uint32_t fl_engine_gl_get_fbo(void* user_data) {
@@ -219,12 +240,8 @@ static bool fl_engine_gl_present(void* user_data) {
 
 static bool fl_engine_gl_make_resource_current(void* user_data) {
   FlEngine* self = static_cast<FlEngine*>(user_data);
-  g_autoptr(GError) error = nullptr;
-  gboolean result = fl_renderer_make_resource_current(self->renderer, &error);
-  if (!result) {
-    g_warning("%s", error->message);
-  }
-  return result;
+  fl_renderer_make_resource_current(self->renderer);
+  return true;
 }
 
 // Called by the engine to retrieve an external texture.
@@ -304,13 +321,13 @@ static void fl_engine_platform_message_cb(const FlutterPlatformMessage* message,
 }
 
 // Called when a semantic node update is received from the engine.
-static void fl_engine_update_semantics_node_cb(const FlutterSemanticsNode* node,
-                                               void* user_data) {
+static void fl_engine_update_semantics_cb(const FlutterSemanticsUpdate2* update,
+                                          void* user_data) {
   FlEngine* self = FL_ENGINE(user_data);
 
-  if (self->update_semantics_node_handler != nullptr) {
-    self->update_semantics_node_handler(
-        self, node, self->update_semantics_node_handler_data);
+  if (self->update_semantics_handler != nullptr) {
+    self->update_semantics_handler(self, update,
+                                   self->update_semantics_handler_data);
   }
 }
 
@@ -396,12 +413,12 @@ static void fl_engine_dispose(GObject* object) {
   self->platform_message_handler_data = nullptr;
   self->platform_message_handler_destroy_notify = nullptr;
 
-  if (self->update_semantics_node_handler_destroy_notify) {
-    self->update_semantics_node_handler_destroy_notify(
-        self->update_semantics_node_handler_data);
+  if (self->update_semantics_handler_destroy_notify) {
+    self->update_semantics_handler_destroy_notify(
+        self->update_semantics_handler_data);
   }
-  self->update_semantics_node_handler_data = nullptr;
-  self->update_semantics_node_handler_destroy_notify = nullptr;
+  self->update_semantics_handler_data = nullptr;
+  self->update_semantics_handler_destroy_notify = nullptr;
 
   if (self->on_pre_engine_restart_handler_destroy_notify) {
     self->on_pre_engine_restart_handler_destroy_notify(
@@ -481,8 +498,7 @@ gboolean fl_engine_start(FlEngine* self, GError** error) {
   custom_task_runners.platform_task_runner = &platform_task_runner;
   custom_task_runners.render_task_runner = &platform_task_runner;
 
-  g_autoptr(GPtrArray) command_line_args =
-      fl_dart_project_get_switches(self->project);
+  g_autoptr(GPtrArray) command_line_args = fl_engine_get_switches(self);
   // FlutterProjectArgs expects a full argv, so when processing it for flags
   // the first item is treated as the executable and ignored. Add a dummy value
   // so that all switches are used.
@@ -499,7 +515,7 @@ gboolean fl_engine_start(FlEngine* self, GError** error) {
   args.command_line_argv =
       reinterpret_cast<const char* const*>(command_line_args->pdata);
   args.platform_message_callback = fl_engine_platform_message_cb;
-  args.update_semantics_node_callback = fl_engine_update_semantics_node_cb;
+  args.update_semantics_callback2 = fl_engine_update_semantics_cb;
   args.custom_task_runners = &custom_task_runners;
   args.shutdown_dart_vm_when_done = true;
   args.on_pre_engine_restart_callback = fl_engine_on_pre_engine_restart_cb;
@@ -582,21 +598,21 @@ void fl_engine_set_platform_message_handler(
   self->platform_message_handler_destroy_notify = destroy_notify;
 }
 
-void fl_engine_set_update_semantics_node_handler(
+void fl_engine_set_update_semantics_handler(
     FlEngine* self,
-    FlEngineUpdateSemanticsNodeHandler handler,
+    FlEngineUpdateSemanticsHandler handler,
     gpointer user_data,
     GDestroyNotify destroy_notify) {
   g_return_if_fail(FL_IS_ENGINE(self));
 
-  if (self->update_semantics_node_handler_destroy_notify) {
-    self->update_semantics_node_handler_destroy_notify(
-        self->update_semantics_node_handler_data);
+  if (self->update_semantics_handler_destroy_notify) {
+    self->update_semantics_handler_destroy_notify(
+        self->update_semantics_handler_data);
   }
 
-  self->update_semantics_node_handler = handler;
-  self->update_semantics_node_handler_data = user_data;
-  self->update_semantics_node_handler_destroy_notify = destroy_notify;
+  self->update_semantics_handler = handler;
+  self->update_semantics_handler_data = user_data;
+  self->update_semantics_handler_destroy_notify = destroy_notify;
 }
 
 void fl_engine_set_on_pre_engine_restart_handler(
@@ -616,6 +632,7 @@ void fl_engine_set_on_pre_engine_restart_handler(
   self->on_pre_engine_restart_handler_destroy_notify = destroy_notify;
 }
 
+// Note: This function can be called from any thread.
 gboolean fl_engine_send_platform_message_response(
     FlEngine* self,
     const FlutterPlatformMessageResponseHandle* handle,
@@ -716,6 +733,18 @@ GBytes* fl_engine_send_platform_message_finish(FlEngine* self,
   return static_cast<GBytes*>(g_task_propagate_pointer(G_TASK(result), error));
 }
 
+void fl_engine_send_window_state_event(FlEngine* self,
+                                       gboolean visible,
+                                       gboolean focused) {
+  if (visible && focused) {
+    set_app_lifecycle_state(self, flutter::AppLifecycleState::kResumed);
+  } else if (visible) {
+    set_app_lifecycle_state(self, flutter::AppLifecycleState::kInactive);
+  } else {
+    set_app_lifecycle_state(self, flutter::AppLifecycleState::kHidden);
+  }
+}
+
 void fl_engine_send_window_metrics_event(FlEngine* self,
                                          size_t width,
                                          size_t height,
@@ -731,6 +760,10 @@ void fl_engine_send_window_metrics_event(FlEngine* self,
   event.width = width;
   event.height = height;
   event.pixel_ratio = pixel_ratio;
+  // TODO(dkwingsmt): Assign the correct view ID once the Linux embedder
+  // supports multiple views.
+  // https://github.com/flutter/flutter/issues/138178
+  event.view_id = flutter::kFlutterImplicitViewId;
   self->embedder_api.SendWindowMetricsEvent(self->engine, &event);
 }
 
@@ -762,6 +795,10 @@ void fl_engine_send_mouse_pointer_event(FlEngine* self,
   fl_event.device_kind = kFlutterPointerDeviceKindMouse;
   fl_event.buttons = buttons;
   fl_event.device = kMousePointerDeviceId;
+  // TODO(dkwingsmt): Assign the correct view ID once the Linux embedder
+  // supports multiple views.
+  // https://github.com/flutter/flutter/issues/138178
+  fl_event.view_id = flutter::kFlutterImplicitViewId;
   self->embedder_api.SendPointerEvent(self->engine, &fl_event, 1);
 }
 
@@ -792,6 +829,10 @@ void fl_engine_send_pointer_pan_zoom_event(FlEngine* self,
   fl_event.rotation = rotation;
   fl_event.device = kPointerPanZoomDeviceId;
   fl_event.device_kind = kFlutterPointerDeviceKindTrackpad;
+  // TODO(dkwingsmt): Assign the correct view ID once the Linux embedder
+  // supports multiple views.
+  // https://github.com/flutter/flutter/issues/138178
+  fl_event.view_id = flutter::kFlutterImplicitViewId;
   self->embedder_api.SendPointerEvent(self->engine, &fl_event, 1);
 }
 
@@ -882,3 +923,11 @@ void fl_engine_update_accessibility_features(FlEngine* self, int32_t flags) {
   self->embedder_api.UpdateAccessibilityFeatures(
       self->engine, static_cast<FlutterAccessibilityFeature>(flags));
 }
+
+GPtrArray* fl_engine_get_switches(FlEngine* self) {
+  GPtrArray* switches = g_ptr_array_new_with_free_func(g_free);
+  for (const auto& env_switch : flutter::GetSwitchesFromEnvironment()) {
+    g_ptr_array_add(switches, g_strdup(env_switch.c_str()));
+  }
+  return switches;
+}
diff --git a/shell/platform/linux/fl_engine_private.h b/shell/platform/linux/fl_engine_private.h
index 879e4f54b5ed0ba8daf2bbcace3166c11559a9a1..10d57a7e7fccf30c9e71ab06e01bbe5798a7c6ae 100644
--- a/shell/platform/linux/fl_engine_private.h
+++ b/shell/platform/linux/fl_engine_private.h
@@ -21,7 +21,9 @@ G_BEGIN_DECLS
  */
 
 typedef enum {
+  // NOLINTBEGIN(readability-identifier-naming)
   FL_ENGINE_ERROR_FAILED,
+  // NOLINTEND(readability-identifier-naming)
 } FlEngineError;
 
 GQuark fl_engine_error_quark(void) G_GNUC_CONST;
@@ -46,24 +48,24 @@ typedef gboolean (*FlEnginePlatformMessageHandler)(
     gpointer user_data);
 
 /**
- * FlEngineUpdateSemanticsNodeHandler:
+ * FlEngineUpdateSemanticsHandler:
  * @engine: an #FlEngine.
  * @node: semantic node information.
  * @user_data: (closure): data provided when registering this handler.
  *
  * Function called when semantics node updates are received.
  */
-typedef void (*FlEngineUpdateSemanticsNodeHandler)(
+typedef void (*FlEngineUpdateSemanticsHandler)(
     FlEngine* engine,
-    const FlutterSemanticsNode* node,
+    const FlutterSemanticsUpdate2* update,
     gpointer user_data);
 
 /**
  * FlEngineOnPreEngineRestartHandler:
  * @engine: an #FlEngine.
- * @user_data: semantic node information.
- *
  * @user_data: (closure): data provided when registering this handler.
+ *
+ * Function called right before the engine is restarted.
  */
 typedef void (*FlEngineOnPreEngineRestartHandler)(FlEngine* engine,
                                                   gpointer user_data);
@@ -100,7 +102,7 @@ FlutterEngineProcTable* fl_engine_get_embedder_api(FlEngine* engine);
  * Registers the function called when a platform message is received. Call
  * fl_engine_send_platform_message_response() with the response to this message.
  * Ownership of #FlutterPlatformMessageResponseHandle is
- * transferred to the caller, and the message must be responded to to avoid
+ * transferred to the caller, and the message must be responded to avoid
  * memory leaks.
  */
 void fl_engine_set_platform_message_handler(
@@ -110,18 +112,18 @@ void fl_engine_set_platform_message_handler(
     GDestroyNotify destroy_notify);
 
 /**
- * fl_engine_set_update_semantics_node_handler:
+ * fl_engine_set_update_semantics_handler:
  * @engine: an #FlEngine.
- * @handler: function to call when a semantics node update is received.
+ * @handler: function to call when a semantics update is received.
  * @user_data: (closure): user data to pass to @handler.
  * @destroy_notify: (allow-none): a function which gets called to free
  * @user_data, or %NULL.
  *
- * Registers the function called when a semantics node update is reveived.
+ * Registers the function called when a semantics update is received.
  */
-void fl_engine_set_update_semantics_node_handler(
+void fl_engine_set_update_semantics_handler(
     FlEngine* engine,
-    FlEngineUpdateSemanticsNodeHandler handler,
+    FlEngineUpdateSemanticsHandler handler,
     gpointer user_data,
     GDestroyNotify destroy_notify);
 
@@ -167,6 +169,18 @@ void fl_engine_send_window_metrics_event(FlEngine* engine,
                                          size_t height,
                                          double pixel_ratio);
 
+/**
+ * fl_engine_send_window_state_event:
+ * @engine: an #FlEngine.
+ * @visible: whether the window is currently visible or not.
+ * @focused: whether the window is currently focused or not.
+ *
+ * Sends a window state event to the engine.
+ */
+void fl_engine_send_window_state_event(FlEngine* engine,
+                                       gboolean visible,
+                                       gboolean focused);
+
 /**
  * fl_engine_send_mouse_pointer_event:
  * @engine: an #FlEngine.
@@ -336,6 +350,16 @@ gboolean fl_engine_unregister_external_texture(FlEngine* engine,
  */
 void fl_engine_update_accessibility_features(FlEngine* engine, int32_t flags);
 
+/**
+ * fl_engine_get_switches:
+ * @project: an #FlEngine.
+ *
+ * Determines the switches that should be passed to the Flutter engine.
+ *
+ * Returns: an array of switches to pass to the Flutter engine.
+ */
+GPtrArray* fl_engine_get_switches(FlEngine* engine);
+
 G_END_DECLS
 
 #endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_ENGINE_PRIVATE_H_
diff --git a/shell/platform/linux/fl_engine_test.cc b/shell/platform/linux/fl_engine_test.cc
index 6bbc699195d5e36b6e2d2eb27bbd2a6bb6a5480d..a7329a6997b0f58a1d19f03acebfe2884a28e94d 100644
--- a/shell/platform/linux/fl_engine_test.cc
+++ b/shell/platform/linux/fl_engine_test.cc
@@ -5,10 +5,12 @@
 // Included first as it collides with the X11 headers.
 #include "gtest/gtest.h"
 
+#include "flutter/shell/platform/common/app_lifecycle_state.h"
 #include "flutter/shell/platform/embedder/test_utils/proc_table_replacement.h"
 #include "flutter/shell/platform/linux/fl_engine_private.h"
 #include "flutter/shell/platform/linux/public/flutter_linux/fl_engine.h"
 #include "flutter/shell/platform/linux/public/flutter_linux/fl_json_message_codec.h"
+#include "flutter/shell/platform/linux/public/flutter_linux/fl_string_codec.h"
 #include "flutter/shell/platform/linux/testing/fl_test.h"
 
 // MOCK_ENGINE_PROC is leaky by design
@@ -359,4 +361,125 @@ TEST(FlEngineTest, DartEntrypointArgs) {
   EXPECT_TRUE(called);
 }
 
+TEST(FlEngineTest, Locales) {
+  gchar* initial_language = g_strdup(g_getenv("LANGUAGE"));
+  g_setenv("LANGUAGE", "de:en_US", TRUE);
+  g_autoptr(FlDartProject) project = fl_dart_project_new();
+
+  g_autoptr(FlEngine) engine = make_mock_engine_with_project(project);
+  FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine);
+
+  bool called = false;
+  embedder_api->UpdateLocales = MOCK_ENGINE_PROC(
+      UpdateLocales, ([&called](auto engine, const FlutterLocale** locales,
+                                size_t locales_count) {
+        called = true;
+
+        EXPECT_EQ(locales_count, static_cast<size_t>(4));
+
+        EXPECT_STREQ(locales[0]->language_code, "de");
+        EXPECT_STREQ(locales[0]->country_code, nullptr);
+        EXPECT_STREQ(locales[0]->script_code, nullptr);
+        EXPECT_STREQ(locales[0]->variant_code, nullptr);
+
+        EXPECT_STREQ(locales[1]->language_code, "en");
+        EXPECT_STREQ(locales[1]->country_code, "US");
+        EXPECT_STREQ(locales[1]->script_code, nullptr);
+        EXPECT_STREQ(locales[1]->variant_code, nullptr);
+
+        EXPECT_STREQ(locales[2]->language_code, "en");
+        EXPECT_STREQ(locales[2]->country_code, nullptr);
+        EXPECT_STREQ(locales[2]->script_code, nullptr);
+        EXPECT_STREQ(locales[2]->variant_code, nullptr);
+
+        EXPECT_STREQ(locales[3]->language_code, "C");
+        EXPECT_STREQ(locales[3]->country_code, nullptr);
+        EXPECT_STREQ(locales[3]->script_code, nullptr);
+        EXPECT_STREQ(locales[3]->variant_code, nullptr);
+
+        return kSuccess;
+      }));
+
+  g_autoptr(GError) error = nullptr;
+  EXPECT_TRUE(fl_engine_start(engine, &error));
+  EXPECT_EQ(error, nullptr);
+
+  EXPECT_TRUE(called);
+
+  if (initial_language) {
+    g_setenv("LANGUAGE", initial_language, TRUE);
+  } else {
+    g_unsetenv("LANGUAGE");
+  }
+  g_free(initial_language);
+}
+
+TEST(FlEngineTest, SwitchesEmpty) {
+  g_autoptr(FlEngine) engine = make_mock_engine();
+
+  // Clear the main environment variable, since test order is not guaranteed.
+  unsetenv("FLUTTER_ENGINE_SWITCHES");
+
+  g_autoptr(GPtrArray) switches = fl_engine_get_switches(engine);
+
+  EXPECT_EQ(switches->len, 0U);
+}
+
+TEST(FlEngineTest, SendWindowStateEvent) {
+  g_autoptr(FlEngine) engine = make_mock_engine();
+  FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine);
+
+  bool called = false;
+  std::string state;
+  embedder_api->SendPlatformMessage = MOCK_ENGINE_PROC(
+      SendPlatformMessage,
+      ([&called, &state](auto engine, const FlutterPlatformMessage* message) {
+        EXPECT_STREQ(message->channel, "flutter/lifecycle");
+        called = true;
+        g_autoptr(FlStringCodec) codec = fl_string_codec_new();
+        g_autoptr(GBytes) data =
+            g_bytes_new(message->message, message->message_size);
+        g_autoptr(GError) error = nullptr;
+        g_autoptr(FlValue) parsed_state = fl_message_codec_decode_message(
+            FL_MESSAGE_CODEC(codec), data, &error);
+
+        state = fl_value_get_string(parsed_state);
+        return kSuccess;
+      }));
+  fl_engine_send_window_state_event(engine, false, false);
+  EXPECT_STREQ(state.c_str(), flutter::AppLifecycleStateToString(
+                                  flutter::AppLifecycleState::kHidden));
+  fl_engine_send_window_state_event(engine, false, true);
+  EXPECT_STREQ(state.c_str(), flutter::AppLifecycleStateToString(
+                                  flutter::AppLifecycleState::kHidden));
+  fl_engine_send_window_state_event(engine, true, false);
+  EXPECT_STREQ(state.c_str(), flutter::AppLifecycleStateToString(
+                                  flutter::AppLifecycleState::kInactive));
+  fl_engine_send_window_state_event(engine, true, true);
+  EXPECT_STREQ(state.c_str(), flutter::AppLifecycleStateToString(
+                                  flutter::AppLifecycleState::kResumed));
+  EXPECT_TRUE(called);
+}
+
+#ifndef FLUTTER_RELEASE
+TEST(FlEngineTest, Switches) {
+  g_autoptr(FlEngine) engine = make_mock_engine();
+
+  setenv("FLUTTER_ENGINE_SWITCHES", "2", 1);
+  setenv("FLUTTER_ENGINE_SWITCH_1", "abc", 1);
+  setenv("FLUTTER_ENGINE_SWITCH_2", "foo=\"bar, baz\"", 1);
+
+  g_autoptr(GPtrArray) switches = fl_engine_get_switches(engine);
+  EXPECT_EQ(switches->len, 2U);
+  EXPECT_STREQ(static_cast<const char*>(g_ptr_array_index(switches, 0)),
+               "--abc");
+  EXPECT_STREQ(static_cast<const char*>(g_ptr_array_index(switches, 1)),
+               "--foo=\"bar, baz\"");
+
+  unsetenv("FLUTTER_ENGINE_SWITCHES");
+  unsetenv("FLUTTER_ENGINE_SWITCH_1");
+  unsetenv("FLUTTER_ENGINE_SWITCH_2");
+}
+#endif  // !FLUTTER_RELEASE
+
 // NOLINTEND(clang-analyzer-core.StackAddressEscape)
diff --git a/shell/platform/linux/fl_event_channel.cc b/shell/platform/linux/fl_event_channel.cc
index 73ff575cc03e873f3eb30cdecd8f9073813e174f..7e6e28523a0adbc80157173986808b08b297603a 100644
--- a/shell/platform/linux/fl_event_channel.cc
+++ b/shell/platform/linux/fl_event_channel.cc
@@ -18,6 +18,9 @@ struct _FlEventChannel {
   // Messenger to communicate on.
   FlBinaryMessenger* messenger;
 
+  // TRUE if the channel has been closed.
+  gboolean channel_closed;
+
   // Channel name.
   gchar* name;
 
@@ -37,9 +40,6 @@ struct _FlEventChannelResponseHandle {
   FlBinaryMessengerResponseHandle* response_handle;
 };
 
-// Added here to stop the compiler from optimizing this function away.
-G_MODULE_EXPORT GType fl_event_channel_get_type();
-
 G_DEFINE_TYPE(FlEventChannel, fl_event_channel, G_TYPE_OBJECT)
 
 // Handle method calls from the Dart side of the channel.
@@ -129,13 +129,14 @@ static void remove_handlers(FlEventChannel* self) {
 // Called when the channel handler is closed.
 static void channel_closed_cb(gpointer user_data) {
   g_autoptr(FlEventChannel) self = FL_EVENT_CHANNEL(user_data);
+  self->channel_closed = TRUE;
   remove_handlers(self);
 }
 
 static void fl_event_channel_dispose(GObject* object) {
   FlEventChannel* self = FL_EVENT_CHANNEL(object);
 
-  if (self->messenger != nullptr) {
+  if (!self->channel_closed) {
     fl_binary_messenger_set_message_handler_on_channel(
         self->messenger, self->name, nullptr, nullptr, nullptr);
   }
@@ -233,10 +234,10 @@ G_MODULE_EXPORT gboolean fl_event_channel_send_error(FlEventChannel* self,
   return TRUE;
 }
 
-G_MODULE_EXPORT gboolean
-fl_event_channel_send_end_of_stream(FlEventChannel* self,
-                                    GCancellable* cancellable,
-                                    GError** error) {
+G_MODULE_EXPORT gboolean fl_event_channel_send_end_of_stream(
+    FlEventChannel* self,
+    GCancellable* cancellable,
+    GError** error) {
   g_return_val_if_fail(FL_IS_EVENT_CHANNEL(self), FALSE);
   fl_binary_messenger_send_on_channel(self->messenger, self->name, nullptr,
                                       cancellable, nullptr, nullptr);
diff --git a/shell/platform/linux/fl_event_channel_test.cc b/shell/platform/linux/fl_event_channel_test.cc
index d40ad3276ea11e4ece057cf070de56a2e088baeb..7515c34353f6fbb8c1697d4dae755cd6c15e83b4 100644
--- a/shell/platform/linux/fl_event_channel_test.cc
+++ b/shell/platform/linux/fl_event_channel_test.cc
@@ -66,7 +66,7 @@ static void cancel_channel(FlBinaryMessenger* messenger, FlValue* args) {
                                   nullptr, nullptr);
 }
 
-// Called when when the remote end starts listening on the channel.
+// Called when the remote end starts listening on the channel.
 static FlMethodErrorResponse* listen_listen_cb(FlEventChannel* channel,
                                                FlValue* args,
                                                gpointer user_data) {
@@ -98,7 +98,7 @@ TEST(FlEventChannelTest, Listen) {
   g_object_unref(channel);
 }
 
-// Called when when the remote end starts listening on the channel.
+// Called when the remote end starts listening on the channel.
 static FlMethodErrorResponse* listen_exception_listen_cb(
     FlEventChannel* channel,
     FlValue* args,
@@ -161,7 +161,7 @@ TEST(FlEventChannelTest, ListenException) {
   g_object_unref(channel);
 }
 
-// Called when when the remote end cancels their subscription.
+// Called when the remote end cancels their subscription.
 static FlMethodErrorResponse* cancel_cancel_cb(FlEventChannel* channel,
                                                FlValue* args,
                                                gpointer user_data) {
@@ -194,7 +194,7 @@ TEST(FlEventChannelTest, Cancel) {
   g_object_unref(channel);
 }
 
-// Called when when the remote end cancels their subscription.
+// Called when the remote end cancels their subscription.
 static FlMethodErrorResponse* cancel_exception_cancel_cb(
     FlEventChannel* channel,
     FlValue* args,
@@ -267,7 +267,7 @@ TEST(FlEventChannelTest, CancelException) {
   g_object_unref(channel);
 }
 
-// Called when when the remote end starts listening on the channel.
+// Called when the remote end starts listening on the channel.
 static FlMethodErrorResponse* args_listen_cb(FlEventChannel* channel,
                                              FlValue* args,
                                              gpointer user_data) {
@@ -277,7 +277,7 @@ static FlMethodErrorResponse* args_listen_cb(FlEventChannel* channel,
   return nullptr;
 }
 
-// Called when when the remote end cancels their subscription.
+// Called when the remote end cancels their subscription.
 static FlMethodErrorResponse* args_cancel_cb(FlEventChannel* channel,
                                              FlValue* args,
                                              gpointer user_data) {
@@ -313,7 +313,7 @@ TEST(FlEventChannelTest, Args) {
   g_object_unref(channel);
 }
 
-// Called when when the remote end starts listening on the channel.
+// Called when the remote end starts listening on the channel.
 static FlMethodErrorResponse* send_events_listen_cb(FlEventChannel* channel,
                                                     FlValue* args,
                                                     gpointer user_data) {
@@ -390,3 +390,73 @@ TEST(FlEventChannelTest, Test) {
   // Manually unref because the compiler complains 'channel' is unused.
   g_object_unref(channel);
 }
+
+// Check can register an event channel with the same name as one previously
+// used.
+TEST(FlEventChannelTest, ReuseChannel) {
+  g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0);
+  TestData data;
+  data.loop = loop;
+  data.count = 0;
+
+  // Register an event channel.
+  g_autoptr(FlEngine) engine = make_mock_engine();
+  FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
+  g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
+  FlEventChannel* channel1 = fl_event_channel_new(
+      messenger, "test/standard-event", FL_METHOD_CODEC(codec));
+  fl_event_channel_set_stream_handlers(channel1, send_events_listen_cb, nullptr,
+                                       &data, nullptr);
+
+  // Remove this channel
+  g_object_unref(channel1);
+
+  // Register a second channel with the same name.
+  g_autoptr(FlEventChannel) channel2 = fl_event_channel_new(
+      messenger, "test/standard-event", FL_METHOD_CODEC(codec));
+  fl_event_channel_set_stream_handlers(channel2, send_events_listen_cb, nullptr,
+                                       &data, nullptr);
+
+  // Listen for events from the engine.
+  fl_binary_messenger_set_message_handler_on_channel(
+      messenger, "test/events", send_events_events_cb, &data, nullptr);
+
+  listen_channel(messenger, nullptr);
+  cancel_channel(messenger, nullptr);
+
+  // Blocks here until send_events_events_cb receives the last event.
+  g_main_loop_run(loop);
+}
+
+// Check can register an event channel replacing an existing one.
+TEST(FlEventChannelTest, ReplaceChannel) {
+  g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0);
+  TestData data;
+  data.loop = loop;
+  data.count = 0;
+
+  // Register an event channel.
+  g_autoptr(FlEngine) engine = make_mock_engine();
+  FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
+  g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
+  FlEventChannel* channel1 = fl_event_channel_new(
+      messenger, "test/standard-event", FL_METHOD_CODEC(codec));
+  fl_event_channel_set_stream_handlers(channel1, send_events_listen_cb, nullptr,
+                                       &data, nullptr);
+
+  // Register a second channel with the same name.
+  g_autoptr(FlEventChannel) channel2 = fl_event_channel_new(
+      messenger, "test/standard-event", FL_METHOD_CODEC(codec));
+  fl_event_channel_set_stream_handlers(channel2, send_events_listen_cb, nullptr,
+                                       &data, nullptr);
+
+  // Listen for events from the engine.
+  fl_binary_messenger_set_message_handler_on_channel(
+      messenger, "test/events", send_events_events_cb, &data, nullptr);
+
+  listen_channel(messenger, nullptr);
+  cancel_channel(messenger, nullptr);
+
+  // Blocks here until send_events_events_cb receives the last event.
+  g_main_loop_run(loop);
+}
diff --git a/shell/platform/linux/fl_gl_area.cc b/shell/platform/linux/fl_gl_area.cc
deleted file mode 100644
index 7804d66d8800093672c9c2cf920dff4ce8428b45..0000000000000000000000000000000000000000
--- a/shell/platform/linux/fl_gl_area.cc
+++ /dev/null
@@ -1,134 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "flutter/shell/platform/linux/fl_gl_area.h"
-
-#include <epoxy/gl.h>
-
-struct _FlGLArea {
-  GtkWidget parent_instance;
-
-  GdkGLContext* context;
-
-  FlBackingStoreProvider* texture;
-};
-
-G_DEFINE_TYPE(FlGLArea, fl_gl_area, GTK_TYPE_WIDGET)
-
-static void fl_gl_area_dispose(GObject* gobject) {
-  FlGLArea* self = FL_GL_AREA(gobject);
-
-  g_clear_object(&self->context);
-  g_clear_object(&self->texture);
-
-  G_OBJECT_CLASS(fl_gl_area_parent_class)->dispose(gobject);
-}
-
-// Implements GtkWidget::realize.
-static void fl_gl_area_realize(GtkWidget* widget) {
-  GtkAllocation allocation;
-  gtk_widget_get_allocation(widget, &allocation);
-
-  gtk_widget_set_realized(widget, TRUE);
-
-  GdkWindowAttr attributes;
-  attributes.window_type = GDK_WINDOW_CHILD;
-  attributes.x = allocation.x;
-  attributes.y = allocation.y;
-  attributes.width = allocation.width;
-  attributes.height = allocation.height;
-  attributes.wclass = GDK_INPUT_OUTPUT;
-  attributes.visual = gtk_widget_get_visual(widget);
-  attributes.event_mask = gtk_widget_get_events(widget);
-  gint attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
-  GdkWindow* window = gdk_window_new(gtk_widget_get_parent_window(widget),
-                                     &attributes, attributes_mask);
-  gtk_widget_set_window(widget, window);
-  gtk_widget_register_window(widget, window);
-}
-
-// Implements GtkWidget::unrealize.
-static void fl_gl_area_unrealize(GtkWidget* widget) {
-  FlGLArea* self = FL_GL_AREA(widget);
-  gdk_gl_context_make_current(self->context);
-  g_clear_object(&self->texture);
-
-  /* Make sure to unset the context if current */
-  if (self->context == gdk_gl_context_get_current()) {
-    gdk_gl_context_clear_current();
-  }
-
-  GTK_WIDGET_CLASS(fl_gl_area_parent_class)->unrealize(widget);
-}
-
-// Implements GtkWidget::size_allocate.
-static void fl_gl_area_size_allocate(GtkWidget* widget,
-                                     GtkAllocation* allocation) {
-  gtk_widget_set_allocation(widget, allocation);
-
-  if (gtk_widget_get_has_window(widget)) {
-    if (gtk_widget_get_realized(widget)) {
-      gdk_window_move_resize(gtk_widget_get_window(widget), allocation->x,
-                             allocation->y, allocation->width,
-                             allocation->height);
-    }
-  }
-}
-
-// Implements GtkWidget::draw.
-static gboolean fl_gl_area_draw(GtkWidget* widget, cairo_t* cr) {
-  FlGLArea* self = FL_GL_AREA(widget);
-
-  gdk_gl_context_make_current(self->context);
-
-  gint scale = gtk_widget_get_scale_factor(widget);
-
-  if (self->texture) {
-    uint32_t texture =
-        fl_backing_store_provider_get_gl_texture_id(self->texture);
-    GdkRectangle geometry =
-        fl_backing_store_provider_get_geometry(self->texture);
-    gdk_cairo_draw_from_gl(cr, gtk_widget_get_window(widget), texture,
-                           GL_TEXTURE, scale, geometry.x, geometry.y,
-                           geometry.width, geometry.height);
-    gdk_gl_context_make_current(self->context);
-  }
-
-  return TRUE;
-}
-
-static void fl_gl_area_class_init(FlGLAreaClass* klass) {
-  GObjectClass* gobject_class = G_OBJECT_CLASS(klass);
-  gobject_class->dispose = fl_gl_area_dispose;
-
-  GtkWidgetClass* widget_class = GTK_WIDGET_CLASS(klass);
-  widget_class->realize = fl_gl_area_realize;
-  widget_class->unrealize = fl_gl_area_unrealize;
-  widget_class->size_allocate = fl_gl_area_size_allocate;
-  widget_class->draw = fl_gl_area_draw;
-
-  gtk_widget_class_set_accessible_role(widget_class, ATK_ROLE_DRAWING_AREA);
-}
-
-static void fl_gl_area_init(FlGLArea* self) {
-  gtk_widget_set_can_focus(GTK_WIDGET(self), TRUE);
-  gtk_widget_set_app_paintable(GTK_WIDGET(self), TRUE);
-}
-
-GtkWidget* fl_gl_area_new(GdkGLContext* context) {
-  g_return_val_if_fail(GDK_IS_GL_CONTEXT(context), nullptr);
-  FlGLArea* area =
-      reinterpret_cast<FlGLArea*>(g_object_new(fl_gl_area_get_type(), nullptr));
-  area->context = GDK_GL_CONTEXT(g_object_ref(context));
-  return GTK_WIDGET(area);
-}
-
-void fl_gl_area_queue_render(FlGLArea* self, FlBackingStoreProvider* texture) {
-  g_return_if_fail(FL_IS_GL_AREA(self));
-
-  g_clear_object(&self->texture);
-  g_set_object(&self->texture, texture);
-
-  gtk_widget_queue_draw(GTK_WIDGET(self));
-}
diff --git a/shell/platform/linux/fl_gl_area.h b/shell/platform/linux/fl_gl_area.h
deleted file mode 100644
index 36bdd7cdd6744cdadd466290d156b98317d4cb9e..0000000000000000000000000000000000000000
--- a/shell/platform/linux/fl_gl_area.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_SHELL_PLATFORM_LINUX_FL_GL_AREA_H_
-#define FLUTTER_SHELL_PLATFORM_LINUX_FL_GL_AREA_H_
-
-#include <gtk/gtk.h>
-
-#include "flutter/shell/platform/linux/fl_backing_store_provider.h"
-
-G_BEGIN_DECLS
-
-G_DECLARE_FINAL_TYPE(FlGLArea, fl_gl_area, FL, GL_AREA, GtkWidget)
-
-/**
- * FlGLArea:
- *
- * #FlGLArea is a OpenGL drawing area that shows Flutter backing store Layer.
- */
-
-/**
- * fl_gl_area_new:
- * @context: an #GdkGLContext.
- *
- * Creates a new #FlGLArea widget.
- *
- * Returns: the newly created #FlGLArea widget.
- */
-GtkWidget* fl_gl_area_new(GdkGLContext* context);
-
-/**
- * fl_gl_area_queue_render:
- * @area: an #FlGLArea.
- * @texture: queued OpenGL texture.
- *
- * Queues a texture to be drawn later.
- */
-void fl_gl_area_queue_render(FlGLArea* area, FlBackingStoreProvider* texture);
-
-G_END_DECLS
-
-#endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_GL_AREA_H_
diff --git a/shell/platform/linux/fl_key_channel_responder_test.cc b/shell/platform/linux/fl_key_channel_responder_test.cc
index cc7482ae8fcf118de73562ff73320150f9939153..4972f59b81fd2af1a7b2acd409935e2169066848 100644
--- a/shell/platform/linux/fl_key_channel_responder_test.cc
+++ b/shell/platform/linux/fl_key_channel_responder_test.cc
@@ -45,20 +45,14 @@ static FlKeyEvent* fl_key_event_new_by_mock(guint32 time_in_milliseconds,
                                             bool is_press,
                                             guint keyval,
                                             guint16 keycode,
-                                            int state,
-                                            const char* string,
+                                            GdkModifierType state,
                                             gboolean is_modifier) {
-  if (_g_key_event.string != nullptr) {
-    g_free(const_cast<char*>(_g_key_event.string));
-  }
   _g_key_event.is_press = is_press;
   _g_key_event.time = time_in_milliseconds;
   _g_key_event.state = state;
   _g_key_event.keyval = keyval;
-  _g_key_event.string = g_strdup(string);
   _g_key_event.keycode = keycode;
   _g_key_event.origin = nullptr;
-  _g_key_event.dispose_origin = nullptr;
   return &_g_key_event;
 }
 
@@ -77,7 +71,8 @@ TEST(FlKeyChannelResponderTest, SendKeyEvent) {
 
   fl_key_responder_handle_event(
       responder,
-      fl_key_event_new_by_mock(12345, true, GDK_KEY_A, 0x04, 0x0, "A", false),
+      fl_key_event_new_by_mock(12345, true, GDK_KEY_A, 0x04,
+                               static_cast<GdkModifierType>(0), false),
       responder_callback, loop);
   expected_value =
       "{type: keydown, keymap: linux, scanCode: 4, toolkit: gtk, keyCode: 65, "
@@ -89,7 +84,8 @@ TEST(FlKeyChannelResponderTest, SendKeyEvent) {
 
   fl_key_responder_handle_event(
       responder,
-      fl_key_event_new_by_mock(23456, false, GDK_KEY_A, 0x04, 0x0, "A", false),
+      fl_key_event_new_by_mock(23456, false, GDK_KEY_A, 0x04,
+                               static_cast<GdkModifierType>(0), false),
       responder_callback, loop);
   expected_value =
       "{type: keyup, keymap: linux, scanCode: 4, toolkit: gtk, keyCode: 65, "
@@ -116,8 +112,8 @@ void test_lock_event(guint key_code,
 
   fl_key_responder_handle_event(
       responder,
-      fl_key_event_new_by_mock(12345, true, key_code, 0x04, 0x0, nullptr,
-                               false),
+      fl_key_event_new_by_mock(12345, true, key_code, 0x04,
+                               static_cast<GdkModifierType>(0), false),
       responder_callback, loop);
   expected_value = down_expected;
   expected_handled = FALSE;
@@ -129,8 +125,8 @@ void test_lock_event(guint key_code,
   expected_handled = FALSE;
   fl_key_responder_handle_event(
       responder,
-      fl_key_event_new_by_mock(12346, false, key_code, 0x04, 0x0, nullptr,
-                               false),
+      fl_key_event_new_by_mock(12346, false, key_code, 0x04,
+                               static_cast<GdkModifierType>(0), false),
       responder_callback, loop);
 
   // Blocks here until echo_response_cb is called.
@@ -178,8 +174,8 @@ TEST(FlKeyChannelResponderTest, TestKeyEventHandledByFramework) {
 
   fl_key_responder_handle_event(
       responder,
-      fl_key_event_new_by_mock(12345, true, GDK_KEY_A, 0x04, 0x0, nullptr,
-                               false),
+      fl_key_event_new_by_mock(12345, true, GDK_KEY_A, 0x04,
+                               static_cast<GdkModifierType>(0), false),
       responder_callback, loop);
   expected_handled = TRUE;
   expected_value =
@@ -204,8 +200,8 @@ TEST(FlKeyChannelResponderTest, UseSpecifiedLogicalKey) {
 
   fl_key_responder_handle_event(
       responder,
-      fl_key_event_new_by_mock(12345, true, GDK_KEY_A, 0x04, 0x0, nullptr,
-                               false),
+      fl_key_event_new_by_mock(12345, true, GDK_KEY_A, 0x04,
+                               static_cast<GdkModifierType>(0), false),
       responder_callback, loop, 888);
   expected_handled = TRUE;
   expected_value =
diff --git a/shell/platform/linux/fl_key_embedder_responder.cc b/shell/platform/linux/fl_key_embedder_responder.cc
index 6c9c91f102a0d41a8dd68765ee4e7a55e61e7674..100d6189f7b5314437738183a8f85f2a000a7823 100644
--- a/shell/platform/linux/fl_key_embedder_responder.cc
+++ b/shell/platform/linux/fl_key_embedder_responder.cc
@@ -141,6 +141,7 @@ struct _FlKeyEmbedderResponder {
   GObject parent_instance;
 
   EmbedderSendKeyEvent send_key_event;
+  void* send_key_event_user_data;
 
   // Internal record for states of whether a key is pressed.
   //
@@ -260,11 +261,13 @@ static void initialize_logical_key_to_lock_bit_loop_body(gpointer lock_bit,
 
 // Creates a new FlKeyEmbedderResponder instance.
 FlKeyEmbedderResponder* fl_key_embedder_responder_new(
-    EmbedderSendKeyEvent send_key_event) {
+    EmbedderSendKeyEvent send_key_event,
+    void* send_key_event_user_data) {
   FlKeyEmbedderResponder* self = FL_KEY_EMBEDDER_RESPONDER(
       g_object_new(FL_TYPE_EMBEDDER_RESPONDER_USER_DATA, nullptr));
 
-  self->send_key_event = std::move(send_key_event);
+  self->send_key_event = send_key_event;
+  self->send_key_event_user_data = send_key_event_user_data;
 
   self->pressing_records = g_hash_table_new(g_direct_hash, g_direct_equal);
   self->mapping_records = g_hash_table_new(g_direct_hash, g_direct_equal);
@@ -360,7 +363,8 @@ static void synthesize_simple_event(FlKeyEmbedderResponder* self,
   out_event.character = nullptr;
   out_event.synthesized = true;
   self->sent_any_events = true;
-  self->send_key_event(&out_event, nullptr, nullptr);
+  self->send_key_event(&out_event, nullptr, nullptr,
+                       self->send_key_event_user_data);
 }
 
 namespace {
@@ -850,7 +854,8 @@ static void fl_key_embedder_responder_handle_event_impl(
   FlKeyEmbedderUserData* response_data =
       fl_key_embedder_user_data_new(callback, user_data);
   self->sent_any_events = true;
-  self->send_key_event(&out_event, handle_response, response_data);
+  self->send_key_event(&out_event, handle_response, response_data,
+                       self->send_key_event_user_data);
 }
 
 // Sends a key event to the framework.
@@ -865,7 +870,8 @@ static void fl_key_embedder_responder_handle_event(
   fl_key_embedder_responder_handle_event_impl(
       responder, event, specified_logical_key, callback, user_data);
   if (!self->sent_any_events) {
-    self->send_key_event(&kEmptyEvent, nullptr, nullptr);
+    self->send_key_event(&kEmptyEvent, nullptr, nullptr,
+                         self->send_key_event_user_data);
   }
 }
 
@@ -885,3 +891,8 @@ void fl_key_embedder_responder_sync_modifiers_if_needed(
                        synchronize_pressed_states_loop_body,
                        &sync_state_context);
 }
+
+GHashTable* fl_key_embedder_responder_get_pressed_state(
+    FlKeyEmbedderResponder* self) {
+  return self->pressing_records;
+}
diff --git a/shell/platform/linux/fl_key_embedder_responder.h b/shell/platform/linux/fl_key_embedder_responder.h
index d7b3af8c0b410ce175622838649d8a637e483400..73c754bf77b4bb9d5eabb91d4c9c0fcebda1f9ea 100644
--- a/shell/platform/linux/fl_key_embedder_responder.h
+++ b/shell/platform/linux/fl_key_embedder_responder.h
@@ -15,10 +15,21 @@
 
 constexpr int kMaxConvertedKeyData = 3;
 
-typedef std::function<void(const FlutterKeyEvent* event,
-                           FlutterKeyEventCallback callback,
-                           void* user_data)>
-    EmbedderSendKeyEvent;
+// The signature of a function that FlKeyEmbedderResponder calls on every key
+// event.
+//
+// The `user_data` is opaque data managed by the object that creates
+// FlKeyEmbedderResponder, and is registered along with this callback
+// via `fl_key_embedder_responder_new`.
+//
+// The `callback_user_data` is opaque data managed by FlKeyEmbedderResponder.
+// Instances of the EmbedderSendKeyEvent callback are required to invoke
+// `callback` with the `callback_user_data` parameter after the `event` has been
+// processed.
+typedef void (*EmbedderSendKeyEvent)(const FlutterKeyEvent* event,
+                                     FlutterKeyEventCallback callback,
+                                     void* callback_user_data,
+                                     void* send_key_event_user_data);
 
 G_BEGIN_DECLS
 
@@ -44,11 +55,16 @@ G_DECLARE_FINAL_TYPE(FlKeyEmbedderResponder,
  * the event.
  *
  * Creates a new #FlKeyEmbedderResponder.
+ * @send_key_event: a function that is called on every key event.
+ * @send_key_event_user_data: an opaque pointer that will be sent back as the
+ * last argument of send_key_event, created and managed by the object that holds
+ * FlKeyEmbedderResponder.
  *
  * Returns: a new #FlKeyEmbedderResponder.
  */
 FlKeyEmbedderResponder* fl_key_embedder_responder_new(
-    EmbedderSendKeyEvent send_key_event);
+    EmbedderSendKeyEvent send_key_event,
+    void* send_key_event_user_data);
 
 /**
  * fl_key_embedder_responder_sync_modifiers_if_needed:
@@ -64,6 +80,16 @@ void fl_key_embedder_responder_sync_modifiers_if_needed(
     guint state,
     double event_time);
 
+/**
+ * fl_key_embedder_responder_get_pressed_state:
+ * @responder: the #FlKeyEmbedderResponder self.
+ *
+ * Returns the keyboard pressed state. The hash table contains one entry per
+ * pressed keys, mapping from the logical key to the physical key.
+ */
+GHashTable* fl_key_embedder_responder_get_pressed_state(
+    FlKeyEmbedderResponder* responder);
+
 G_END_DECLS
 
 #endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_KEY_EMBEDDER_RESPONDER_H_
diff --git a/shell/platform/linux/fl_key_embedder_responder_test.cc b/shell/platform/linux/fl_key_embedder_responder_test.cc
index 6b7d0f1c068e283811c20f33814da724e56a5500..aac675ddec5ed7f748d0035b019f92b1fe2b9f8b 100644
--- a/shell/platform/linux/fl_key_embedder_responder_test.cc
+++ b/shell/platform/linux/fl_key_embedder_responder_test.cc
@@ -116,16 +116,14 @@ static FlKeyEvent* fl_key_event_new_by_mock(guint32 time_in_milliseconds,
                                             bool is_press,
                                             guint keyval,
                                             guint16 keycode,
-                                            int state,
+                                            GdkModifierType state,
                                             gboolean is_modifier) {
   _g_key_event.is_press = is_press;
   _g_key_event.time = time_in_milliseconds;
   _g_key_event.state = state;
   _g_key_event.keyval = keyval;
-  _g_key_event.string = nullptr;
   _g_key_event.keycode = keycode;
   _g_key_event.origin = nullptr;
-  _g_key_event.dispose_origin = nullptr;
   return &_g_key_event;
 }
 
@@ -149,14 +147,16 @@ namespace {
 GPtrArray* g_call_records;
 }
 
-static EmbedderSendKeyEvent record_calls_in(GPtrArray* records_array) {
-  return [records_array](const FlutterKeyEvent* event,
-                         FlutterKeyEventCallback callback, void* user_data) {
-    if (records_array != nullptr) {
-      g_ptr_array_add(records_array, fl_key_embedder_call_record_new(
-                                         event, callback, user_data));
-    }
-  };
+static void record_calls(const FlutterKeyEvent* event,
+                         FlutterKeyEventCallback callback,
+                         void* callback_user_data,
+                         void* send_key_event_user_data) {
+  GPtrArray* records_array =
+      reinterpret_cast<GPtrArray*>(send_key_event_user_data);
+  if (records_array != nullptr) {
+    g_ptr_array_add(records_array, fl_key_embedder_call_record_new(
+                                       event, callback, callback_user_data));
+  }
 }
 
 static void clear_g_call_records() {
@@ -169,7 +169,7 @@ TEST(FlKeyEmbedderResponderTest, SendKeyEvent) {
   EXPECT_EQ(g_call_records, nullptr);
   g_call_records = g_ptr_array_new_with_free_func(g_object_unref);
   FlKeyResponder* responder = FL_KEY_RESPONDER(
-      fl_key_embedder_responder_new(record_calls_in(g_call_records)));
+      fl_key_embedder_responder_new(record_calls, g_call_records));
   int user_data = 123;  // Arbitrary user data
 
   FlKeyEmbedderCallRecord* record;
@@ -178,8 +178,8 @@ TEST(FlKeyEmbedderResponderTest, SendKeyEvent) {
   // Key down
   fl_key_responder_handle_event(
       responder,
-      fl_key_event_new_by_mock(12345, kPress, GDK_KEY_a, kKeyCodeKeyA, 0,
-                               kIsNotModifier),
+      fl_key_event_new_by_mock(12345, kPress, GDK_KEY_a, kKeyCodeKeyA,
+                               static_cast<GdkModifierType>(0), kIsNotModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -198,8 +198,8 @@ TEST(FlKeyEmbedderResponderTest, SendKeyEvent) {
   // Key up
   fl_key_responder_handle_event(
       responder,
-      fl_key_event_new_by_mock(12346, kRelease, GDK_KEY_a, kKeyCodeKeyA, 0,
-                               kIsNotModifier),
+      fl_key_event_new_by_mock(12346, kRelease, GDK_KEY_a, kKeyCodeKeyA,
+                               static_cast<GdkModifierType>(0), kIsNotModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -219,8 +219,8 @@ TEST(FlKeyEmbedderResponderTest, SendKeyEvent) {
   // Key down
   fl_key_responder_handle_event(
       responder,
-      fl_key_event_new_by_mock(12347, kPress, GDK_KEY_q, kKeyCodeKeyA, 0,
-                               kIsNotModifier),
+      fl_key_event_new_by_mock(12347, kPress, GDK_KEY_q, kKeyCodeKeyA,
+                               static_cast<GdkModifierType>(0), kIsNotModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -239,8 +239,8 @@ TEST(FlKeyEmbedderResponderTest, SendKeyEvent) {
   // Key up
   fl_key_responder_handle_event(
       responder,
-      fl_key_event_new_by_mock(12348, kRelease, GDK_KEY_q, kKeyCodeKeyA, 0,
-                               kIsNotModifier),
+      fl_key_event_new_by_mock(12348, kRelease, GDK_KEY_q, kKeyCodeKeyA,
+                               static_cast<GdkModifierType>(0), kIsNotModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -265,7 +265,7 @@ TEST(FlKeyEmbedderResponderTest, UsesSpecifiedLogicalKey) {
   EXPECT_EQ(g_call_records, nullptr);
   g_call_records = g_ptr_array_new_with_free_func(g_object_unref);
   FlKeyResponder* responder = FL_KEY_RESPONDER(
-      fl_key_embedder_responder_new(record_calls_in(g_call_records)));
+      fl_key_embedder_responder_new(record_calls, g_call_records));
   int user_data = 123;  // Arbitrary user data
 
   FlKeyEmbedderCallRecord* record;
@@ -275,7 +275,7 @@ TEST(FlKeyEmbedderResponderTest, UsesSpecifiedLogicalKey) {
   fl_key_responder_handle_event(
       responder,
       fl_key_event_new_by_mock(12345, kPress, GDK_KEY_ampersand, kKeyCodeDigit1,
-                               0, kIsNotModifier),
+                               static_cast<GdkModifierType>(0), kIsNotModifier),
       verify_response_handled, &user_data, kLogicalDigit1);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -300,7 +300,7 @@ TEST(FlKeyEmbedderResponderTest, PressShiftDuringLetterKeyTap) {
   EXPECT_EQ(g_call_records, nullptr);
   g_call_records = g_ptr_array_new_with_free_func(g_object_unref);
   FlKeyResponder* responder = FL_KEY_RESPONDER(
-      fl_key_embedder_responder_new(record_calls_in(g_call_records)));
+      fl_key_embedder_responder_new(record_calls, g_call_records));
   int user_data = 123;  // Arbitrary user data
 
   FlKeyEmbedderCallRecord* record;
@@ -309,7 +309,7 @@ TEST(FlKeyEmbedderResponderTest, PressShiftDuringLetterKeyTap) {
   fl_key_responder_handle_event(
       responder,
       fl_key_event_new_by_mock(101, kPress, GDK_KEY_Shift_R, kKeyCodeShiftRight,
-                               0, kIsModifier),
+                               static_cast<GdkModifierType>(0), kIsModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -326,8 +326,8 @@ TEST(FlKeyEmbedderResponderTest, PressShiftDuringLetterKeyTap) {
   // Press key A
   fl_key_responder_handle_event(
       responder,
-      fl_key_event_new_by_mock(102, kPress, GDK_KEY_A, kKeyCodeKeyA, 0x1,
-                               kIsNotModifier),
+      fl_key_event_new_by_mock(102, kPress, GDK_KEY_A, kKeyCodeKeyA,
+                               GDK_SHIFT_MASK, kIsNotModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -345,7 +345,7 @@ TEST(FlKeyEmbedderResponderTest, PressShiftDuringLetterKeyTap) {
   fl_key_responder_handle_event(
       responder,
       fl_key_event_new_by_mock(103, kRelease, GDK_KEY_Shift_R,
-                               kKeyCodeShiftRight, 0x1, kIsModifier),
+                               kKeyCodeShiftRight, GDK_SHIFT_MASK, kIsModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -362,8 +362,8 @@ TEST(FlKeyEmbedderResponderTest, PressShiftDuringLetterKeyTap) {
   // Release key A
   fl_key_responder_handle_event(
       responder,
-      fl_key_event_new_by_mock(104, kRelease, GDK_KEY_A, kKeyCodeKeyA, 0,
-                               kIsNotModifier),
+      fl_key_event_new_by_mock(104, kRelease, GDK_KEY_A, kKeyCodeKeyA,
+                               static_cast<GdkModifierType>(0), kIsNotModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -393,7 +393,7 @@ TEST(FlKeyEmbedderResponderTest, TapNumPadKeysBetweenNumLockEvents) {
   EXPECT_EQ(g_call_records, nullptr);
   g_call_records = g_ptr_array_new_with_free_func(g_object_unref);
   FlKeyResponder* responder = FL_KEY_RESPONDER(
-      fl_key_embedder_responder_new(record_calls_in(g_call_records)));
+      fl_key_embedder_responder_new(record_calls, g_call_records));
   int user_data = 123;  // Arbitrary user data
 
   FlKeyEmbedderCallRecord* record;
@@ -401,8 +401,8 @@ TEST(FlKeyEmbedderResponderTest, TapNumPadKeysBetweenNumLockEvents) {
   // Press Numpad 1 (stage 0)
   fl_key_responder_handle_event(
       responder,
-      fl_key_event_new_by_mock(101, kPress, GDK_KEY_KP_End, kKeyCodeNumpad1, 0,
-                               kIsNotModifier),
+      fl_key_event_new_by_mock(101, kPress, GDK_KEY_KP_End, kKeyCodeNumpad1,
+                               static_cast<GdkModifierType>(0), kIsNotModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -420,7 +420,7 @@ TEST(FlKeyEmbedderResponderTest, TapNumPadKeysBetweenNumLockEvents) {
   fl_key_responder_handle_event(
       responder,
       fl_key_event_new_by_mock(102, kPress, GDK_KEY_Num_Lock, kKeyCodeNumLock,
-                               0, kIsNotModifier),
+                               static_cast<GdkModifierType>(0), kIsNotModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -438,7 +438,7 @@ TEST(FlKeyEmbedderResponderTest, TapNumPadKeysBetweenNumLockEvents) {
   fl_key_responder_handle_event(
       responder,
       fl_key_event_new_by_mock(104, kRelease, GDK_KEY_KP_1, kKeyCodeNumpad1,
-                               0x10, kIsNotModifier),
+                               GDK_MOD2_MASK, kIsNotModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -456,7 +456,7 @@ TEST(FlKeyEmbedderResponderTest, TapNumPadKeysBetweenNumLockEvents) {
   fl_key_responder_handle_event(
       responder,
       fl_key_event_new_by_mock(103, kRelease, GDK_KEY_Num_Lock, kKeyCodeNumLock,
-                               0x10, kIsModifier),
+                               GDK_MOD2_MASK, kIsModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -474,7 +474,7 @@ TEST(FlKeyEmbedderResponderTest, TapNumPadKeysBetweenNumLockEvents) {
   fl_key_responder_handle_event(
       responder,
       fl_key_event_new_by_mock(101, kPress, GDK_KEY_KP_End, kKeyCodeNumpad1,
-                               0x10, kIsNotModifier),
+                               GDK_MOD2_MASK, kIsNotModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -492,7 +492,7 @@ TEST(FlKeyEmbedderResponderTest, TapNumPadKeysBetweenNumLockEvents) {
   fl_key_responder_handle_event(
       responder,
       fl_key_event_new_by_mock(102, kPress, GDK_KEY_Num_Lock, kKeyCodeNumLock,
-                               0x10, kIsNotModifier),
+                               GDK_MOD2_MASK, kIsNotModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -510,7 +510,7 @@ TEST(FlKeyEmbedderResponderTest, TapNumPadKeysBetweenNumLockEvents) {
   fl_key_responder_handle_event(
       responder,
       fl_key_event_new_by_mock(104, kRelease, GDK_KEY_KP_1, kKeyCodeNumpad1,
-                               0x10, kIsNotModifier),
+                               GDK_MOD2_MASK, kIsNotModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -528,7 +528,7 @@ TEST(FlKeyEmbedderResponderTest, TapNumPadKeysBetweenNumLockEvents) {
   fl_key_responder_handle_event(
       responder,
       fl_key_event_new_by_mock(103, kRelease, GDK_KEY_Num_Lock, kKeyCodeNumLock,
-                               0x10, kIsModifier),
+                               GDK_MOD2_MASK, kIsModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -554,12 +554,12 @@ TEST(FlKeyEmbedderResponderTest, ReleaseShiftKeyBetweenDigitKeyEvents) {
   EXPECT_EQ(g_call_records, nullptr);
   g_call_records = g_ptr_array_new_with_free_func(g_object_unref);
   FlKeyResponder* responder = FL_KEY_RESPONDER(
-      fl_key_embedder_responder_new(record_calls_in(g_call_records)));
+      fl_key_embedder_responder_new(record_calls, g_call_records));
   int user_data = 123;  // Arbitrary user data
 
   FlKeyEmbedderCallRecord* record;
 
-  guint state = 0;
+  GdkModifierType state = static_cast<GdkModifierType>(0);
 
   // Press shift left
   fl_key_responder_handle_event(
@@ -617,7 +617,7 @@ TEST(FlKeyEmbedderResponderTest, ReleaseShiftKeyBetweenDigitKeyEvents) {
   invoke_record_callback_and_verify(record, TRUE, &user_data);
   g_ptr_array_clear(g_call_records);
 
-  state = 0;
+  state = static_cast<GdkModifierType>(0);
 
   // Release digit 1, which is "1" because shift has been released.
   fl_key_responder_handle_event(
@@ -649,7 +649,7 @@ TEST(FlKeyEmbedderResponderTest, TapLetterKeysBetweenCapsLockEvents) {
   EXPECT_EQ(g_call_records, nullptr);
   g_call_records = g_ptr_array_new_with_free_func(g_object_unref);
   FlKeyResponder* responder = FL_KEY_RESPONDER(
-      fl_key_embedder_responder_new(record_calls_in(g_call_records)));
+      fl_key_embedder_responder_new(record_calls, g_call_records));
   int user_data = 123;  // Arbitrary user data
 
   FlKeyEmbedderCallRecord* record;
@@ -658,7 +658,7 @@ TEST(FlKeyEmbedderResponderTest, TapLetterKeysBetweenCapsLockEvents) {
   fl_key_responder_handle_event(
       responder,
       fl_key_event_new_by_mock(101, kPress, GDK_KEY_Caps_Lock, kKeyCodeCapsLock,
-                               0x0, kIsModifier),
+                               static_cast<GdkModifierType>(0), kIsModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -675,8 +675,8 @@ TEST(FlKeyEmbedderResponderTest, TapLetterKeysBetweenCapsLockEvents) {
   // Press key A (stage 1)
   fl_key_responder_handle_event(
       responder,
-      fl_key_event_new_by_mock(102, kPress, GDK_KEY_A, kKeyCodeKeyA, 0x2,
-                               kIsNotModifier),
+      fl_key_event_new_by_mock(102, kPress, GDK_KEY_A, kKeyCodeKeyA,
+                               GDK_LOCK_MASK, kIsNotModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -694,7 +694,7 @@ TEST(FlKeyEmbedderResponderTest, TapLetterKeysBetweenCapsLockEvents) {
   fl_key_responder_handle_event(
       responder,
       fl_key_event_new_by_mock(103, kRelease, GDK_KEY_Caps_Lock,
-                               kKeyCodeCapsLock, 0x2, kIsModifier),
+                               kKeyCodeCapsLock, GDK_LOCK_MASK, kIsModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -711,8 +711,8 @@ TEST(FlKeyEmbedderResponderTest, TapLetterKeysBetweenCapsLockEvents) {
   // Release key A (stage 2)
   fl_key_responder_handle_event(
       responder,
-      fl_key_event_new_by_mock(104, kRelease, GDK_KEY_A, kKeyCodeKeyA, 0x2,
-                               kIsNotModifier),
+      fl_key_event_new_by_mock(104, kRelease, GDK_KEY_A, kKeyCodeKeyA,
+                               GDK_LOCK_MASK, kIsNotModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -730,7 +730,7 @@ TEST(FlKeyEmbedderResponderTest, TapLetterKeysBetweenCapsLockEvents) {
   fl_key_responder_handle_event(
       responder,
       fl_key_event_new_by_mock(105, kPress, GDK_KEY_Caps_Lock, kKeyCodeCapsLock,
-                               0x2, kIsModifier),
+                               GDK_LOCK_MASK, kIsModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -747,8 +747,8 @@ TEST(FlKeyEmbedderResponderTest, TapLetterKeysBetweenCapsLockEvents) {
   // Press key A (stage 3)
   fl_key_responder_handle_event(
       responder,
-      fl_key_event_new_by_mock(106, kPress, GDK_KEY_A, kKeyCodeKeyA, 0x2,
-                               kIsNotModifier),
+      fl_key_event_new_by_mock(106, kPress, GDK_KEY_A, kKeyCodeKeyA,
+                               GDK_LOCK_MASK, kIsNotModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -766,7 +766,7 @@ TEST(FlKeyEmbedderResponderTest, TapLetterKeysBetweenCapsLockEvents) {
   fl_key_responder_handle_event(
       responder,
       fl_key_event_new_by_mock(107, kRelease, GDK_KEY_Caps_Lock,
-                               kKeyCodeCapsLock, 0x2, kIsModifier),
+                               kKeyCodeCapsLock, GDK_LOCK_MASK, kIsModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -783,8 +783,8 @@ TEST(FlKeyEmbedderResponderTest, TapLetterKeysBetweenCapsLockEvents) {
   // Release key A (stage 0)
   fl_key_responder_handle_event(
       responder,
-      fl_key_event_new_by_mock(108, kRelease, GDK_KEY_a, kKeyCodeKeyA, 0x0,
-                               kIsNotModifier),
+      fl_key_event_new_by_mock(108, kRelease, GDK_KEY_a, kKeyCodeKeyA,
+                               static_cast<GdkModifierType>(0), kIsNotModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -810,7 +810,7 @@ TEST(FlKeyEmbedderResponderTest, TapLetterKeysBetweenCapsLockEventsReversed) {
   EXPECT_EQ(g_call_records, nullptr);
   g_call_records = g_ptr_array_new_with_free_func(g_object_unref);
   FlKeyResponder* responder = FL_KEY_RESPONDER(
-      fl_key_embedder_responder_new(record_calls_in(g_call_records)));
+      fl_key_embedder_responder_new(record_calls, g_call_records));
   int user_data = 123;  // Arbitrary user data
 
   FlKeyEmbedderCallRecord* record;
@@ -818,8 +818,8 @@ TEST(FlKeyEmbedderResponderTest, TapLetterKeysBetweenCapsLockEventsReversed) {
   // Press key A (stage 0)
   fl_key_responder_handle_event(
       responder,
-      fl_key_event_new_by_mock(101, kPress, GDK_KEY_a, kKeyCodeKeyA, 0x0,
-                               kIsNotModifier),
+      fl_key_event_new_by_mock(101, kPress, GDK_KEY_a, kKeyCodeKeyA,
+                               static_cast<GdkModifierType>(0), kIsNotModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -837,7 +837,7 @@ TEST(FlKeyEmbedderResponderTest, TapLetterKeysBetweenCapsLockEventsReversed) {
   fl_key_responder_handle_event(
       responder,
       fl_key_event_new_by_mock(102, kPress, GDK_KEY_Caps_Lock, kKeyCodeCapsLock,
-                               0x2, kIsModifier),
+                               GDK_LOCK_MASK, kIsModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -855,7 +855,7 @@ TEST(FlKeyEmbedderResponderTest, TapLetterKeysBetweenCapsLockEventsReversed) {
   fl_key_responder_handle_event(
       responder,
       fl_key_event_new_by_mock(103, kRelease, GDK_KEY_Caps_Lock,
-                               kKeyCodeCapsLock, 0x2, kIsModifier),
+                               kKeyCodeCapsLock, GDK_LOCK_MASK, kIsModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -872,8 +872,8 @@ TEST(FlKeyEmbedderResponderTest, TapLetterKeysBetweenCapsLockEventsReversed) {
   // Release key A (stage 2)
   fl_key_responder_handle_event(
       responder,
-      fl_key_event_new_by_mock(104, kRelease, GDK_KEY_A, kKeyCodeKeyA, 0x2,
-                               kIsNotModifier),
+      fl_key_event_new_by_mock(104, kRelease, GDK_KEY_A, kKeyCodeKeyA,
+                               GDK_LOCK_MASK, kIsNotModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -890,8 +890,8 @@ TEST(FlKeyEmbedderResponderTest, TapLetterKeysBetweenCapsLockEventsReversed) {
   // Press key A (stage 2)
   fl_key_responder_handle_event(
       responder,
-      fl_key_event_new_by_mock(105, kPress, GDK_KEY_A, kKeyCodeKeyA, 0x2,
-                               kIsNotModifier),
+      fl_key_event_new_by_mock(105, kPress, GDK_KEY_A, kKeyCodeKeyA,
+                               GDK_LOCK_MASK, kIsNotModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -909,7 +909,7 @@ TEST(FlKeyEmbedderResponderTest, TapLetterKeysBetweenCapsLockEventsReversed) {
   fl_key_responder_handle_event(
       responder,
       fl_key_event_new_by_mock(106, kPress, GDK_KEY_Caps_Lock, kKeyCodeCapsLock,
-                               0x0, kIsModifier),
+                               static_cast<GdkModifierType>(0), kIsModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -927,7 +927,7 @@ TEST(FlKeyEmbedderResponderTest, TapLetterKeysBetweenCapsLockEventsReversed) {
   fl_key_responder_handle_event(
       responder,
       fl_key_event_new_by_mock(107, kRelease, GDK_KEY_Caps_Lock,
-                               kKeyCodeCapsLock, 0x2, kIsModifier),
+                               kKeyCodeCapsLock, GDK_LOCK_MASK, kIsModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -944,8 +944,8 @@ TEST(FlKeyEmbedderResponderTest, TapLetterKeysBetweenCapsLockEventsReversed) {
   // Release key A (stage 0)
   fl_key_responder_handle_event(
       responder,
-      fl_key_event_new_by_mock(108, kRelease, GDK_KEY_a, kKeyCodeKeyA, 0x0,
-                               kIsNotModifier),
+      fl_key_event_new_by_mock(108, kRelease, GDK_KEY_a, kKeyCodeKeyA,
+                               static_cast<GdkModifierType>(0), kIsNotModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -967,7 +967,7 @@ TEST(FlKeyEmbedderResponderTest, TurnDuplicateDownEventsToRepeats) {
   EXPECT_EQ(g_call_records, nullptr);
   g_call_records = g_ptr_array_new_with_free_func(g_object_unref);
   FlKeyResponder* responder = FL_KEY_RESPONDER(
-      fl_key_embedder_responder_new(record_calls_in(g_call_records)));
+      fl_key_embedder_responder_new(record_calls, g_call_records));
   int user_data = 123;  // Arbitrary user data
 
   FlKeyEmbedderCallRecord* record;
@@ -975,8 +975,8 @@ TEST(FlKeyEmbedderResponderTest, TurnDuplicateDownEventsToRepeats) {
   // Press KeyA
   fl_key_responder_handle_event(
       responder,
-      fl_key_event_new_by_mock(101, kPress, GDK_KEY_a, kKeyCodeKeyA, 0,
-                               kIsNotModifier),
+      fl_key_event_new_by_mock(101, kPress, GDK_KEY_a, kKeyCodeKeyA,
+                               static_cast<GdkModifierType>(0), kIsNotModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -989,8 +989,8 @@ TEST(FlKeyEmbedderResponderTest, TurnDuplicateDownEventsToRepeats) {
   g_expected_handled = false;
   fl_key_responder_handle_event(
       responder,
-      fl_key_event_new_by_mock(102, kPress, GDK_KEY_a, kKeyCodeKeyA, 0,
-                               kIsNotModifier),
+      fl_key_event_new_by_mock(102, kPress, GDK_KEY_a, kKeyCodeKeyA,
+                               static_cast<GdkModifierType>(0), kIsNotModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -1009,8 +1009,8 @@ TEST(FlKeyEmbedderResponderTest, TurnDuplicateDownEventsToRepeats) {
   // Release KeyA
   fl_key_responder_handle_event(
       responder,
-      fl_key_event_new_by_mock(103, kRelease, GDK_KEY_q, kKeyCodeKeyA, 0,
-                               kIsNotModifier),
+      fl_key_event_new_by_mock(103, kRelease, GDK_KEY_q, kKeyCodeKeyA,
+                               static_cast<GdkModifierType>(0), kIsNotModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -1028,15 +1028,15 @@ TEST(FlKeyEmbedderResponderTest, IgnoreAbruptUpEvent) {
   EXPECT_EQ(g_call_records, nullptr);
   g_call_records = g_ptr_array_new_with_free_func(g_object_unref);
   FlKeyResponder* responder = FL_KEY_RESPONDER(
-      fl_key_embedder_responder_new(record_calls_in(g_call_records)));
+      fl_key_embedder_responder_new(record_calls, g_call_records));
   int user_data = 123;  // Arbitrary user data
 
   // Release KeyA before it was even pressed.
   g_expected_handled = true;  // The empty event is always handled.
   fl_key_responder_handle_event(
       responder,
-      fl_key_event_new_by_mock(103, kRelease, GDK_KEY_q, kKeyCodeKeyA, 0,
-                               kIsNotModifier),
+      fl_key_event_new_by_mock(103, kRelease, GDK_KEY_q, kKeyCodeKeyA,
+                               static_cast<GdkModifierType>(0), kIsNotModifier),
       verify_response_handled, &user_data);
 
   EXPECT_EQ(g_call_records->len, 1u);
@@ -1058,7 +1058,7 @@ TEST(FlKeyEmbedderResponderTest, SynthesizeForDesyncPressingStateOnSelfEvents) {
   EXPECT_EQ(g_call_records, nullptr);
   g_call_records = g_ptr_array_new_with_free_func(g_object_unref);
   FlKeyResponder* responder = FL_KEY_RESPONDER(
-      fl_key_embedder_responder_new(record_calls_in(g_call_records)));
+      fl_key_embedder_responder_new(record_calls, g_call_records));
   int user_data = 123;  // Arbitrary user data
 
   FlKeyEmbedderCallRecord* record;
@@ -1066,7 +1066,7 @@ TEST(FlKeyEmbedderResponderTest, SynthesizeForDesyncPressingStateOnSelfEvents) {
   // Test 1: synthesize key down.
 
   // A key down of control left is missed.
-  guint state = GDK_CONTROL_MASK;
+  GdkModifierType state = GDK_CONTROL_MASK;
 
   // Send a ControlLeft up
   fl_key_responder_handle_event(
@@ -1098,7 +1098,7 @@ TEST(FlKeyEmbedderResponderTest, SynthesizeForDesyncPressingStateOnSelfEvents) {
   // Test 2: synthesize key up.
 
   // Send a ControlLeft down.
-  state = 0;
+  state = static_cast<GdkModifierType>(0);
   fl_key_responder_handle_event(
       responder,
       fl_key_event_new_by_mock(102, kPress, GDK_KEY_Control_L,
@@ -1110,7 +1110,7 @@ TEST(FlKeyEmbedderResponderTest, SynthesizeForDesyncPressingStateOnSelfEvents) {
   g_ptr_array_clear(g_call_records);
 
   // A key up of control left is missed.
-  state = 0;
+  state = static_cast<GdkModifierType>(0);
 
   // Send another ControlLeft down
   fl_key_responder_handle_event(
@@ -1189,13 +1189,13 @@ TEST(FlKeyEmbedderResponderTest,
   EXPECT_EQ(g_call_records, nullptr);
   g_call_records = g_ptr_array_new_with_free_func(g_object_unref);
   FlKeyResponder* responder = FL_KEY_RESPONDER(
-      fl_key_embedder_responder_new(record_calls_in(g_call_records)));
+      fl_key_embedder_responder_new(record_calls, g_call_records));
   int user_data = 123;  // Arbitrary user data
 
   FlKeyEmbedderCallRecord* record;
 
   // A key down of control left is missed.
-  guint state = GDK_CONTROL_MASK;
+  GdkModifierType state = GDK_CONTROL_MASK;
 
   // Send a normal event (KeyA down)
   fl_key_responder_handle_event(
@@ -1225,7 +1225,7 @@ TEST(FlKeyEmbedderResponderTest,
   g_ptr_array_clear(g_call_records);
 
   // A key up of control left is missed.
-  state = 0;
+  state = static_cast<GdkModifierType>(0);
 
   // Send a normal event (KeyA up)
   fl_key_responder_handle_event(
@@ -1257,7 +1257,7 @@ TEST(FlKeyEmbedderResponderTest,
   // Test non-default key mapping.
 
   // Press a key with physical CapsLock and logical ControlLeft.
-  state = 0;
+  state = static_cast<GdkModifierType>(0);
 
   fl_key_responder_handle_event(
       responder,
@@ -1278,7 +1278,7 @@ TEST(FlKeyEmbedderResponderTest,
   g_ptr_array_clear(g_call_records);
 
   // The key up of the control left press is missed.
-  state = 0;
+  state = static_cast<GdkModifierType>(0);
 
   // Send a normal event (KeyA down).
   fl_key_responder_handle_event(
@@ -1320,13 +1320,13 @@ TEST(FlKeyEmbedderResponderTest,
   EXPECT_EQ(g_call_records, nullptr);
   g_call_records = g_ptr_array_new_with_free_func(g_object_unref);
   FlKeyResponder* responder = FL_KEY_RESPONDER(
-      fl_key_embedder_responder_new(record_calls_in(g_call_records)));
+      fl_key_embedder_responder_new(record_calls, g_call_records));
   int user_data = 123;  // Arbitrary user data
 
   FlKeyEmbedderCallRecord* record;
 
   // Press a key with physical CapsLock and logical ControlLeft.
-  guint state = 0;
+  GdkModifierType state = static_cast<GdkModifierType>(0);
 
   fl_key_responder_handle_event(
       responder,
@@ -1347,7 +1347,7 @@ TEST(FlKeyEmbedderResponderTest,
   g_ptr_array_clear(g_call_records);
 
   // The key up of the control left press is missed.
-  state = 0;
+  state = static_cast<GdkModifierType>(0);
 
   // Send a normal event (KeyA down).
   fl_key_responder_handle_event(
@@ -1388,13 +1388,13 @@ TEST(FlKeyEmbedderResponderTest, SynthesizeForDesyncLockModeOnNonSelfEvents) {
   EXPECT_EQ(g_call_records, nullptr);
   g_call_records = g_ptr_array_new_with_free_func(g_object_unref);
   FlKeyResponder* responder = FL_KEY_RESPONDER(
-      fl_key_embedder_responder_new(record_calls_in(g_call_records)));
+      fl_key_embedder_responder_new(record_calls, g_call_records));
   int user_data = 123;  // Arbitrary user data
 
   FlKeyEmbedderCallRecord* record;
 
   // The NumLock is desynchronized by being enabled.
-  guint state = GDK_MOD2_MASK;
+  GdkModifierType state = GDK_MOD2_MASK;
 
   // Send a normal event
   fl_key_responder_handle_event(
@@ -1424,7 +1424,7 @@ TEST(FlKeyEmbedderResponderTest, SynthesizeForDesyncLockModeOnNonSelfEvents) {
   g_ptr_array_clear(g_call_records);
 
   // The NumLock is desynchronized by being disabled.
-  state = 0;
+  state = static_cast<GdkModifierType>(0);
 
   // Release key A
   fl_key_responder_handle_event(
@@ -1496,13 +1496,13 @@ TEST(FlKeyEmbedderResponderTest, SynthesizeForDesyncLockModeOnSelfEvents) {
   EXPECT_EQ(g_call_records, nullptr);
   g_call_records = g_ptr_array_new_with_free_func(g_object_unref);
   FlKeyResponder* responder = FL_KEY_RESPONDER(
-      fl_key_embedder_responder_new(record_calls_in(g_call_records)));
+      fl_key_embedder_responder_new(record_calls, g_call_records));
   int user_data = 123;  // Arbitrary user data
 
   FlKeyEmbedderCallRecord* record;
 
   // The NumLock is desynchronized by being enabled.
-  guint state = GDK_MOD2_MASK;
+  GdkModifierType state = GDK_MOD2_MASK;
 
   // NumLock down
   fl_key_responder_handle_event(
@@ -1595,13 +1595,14 @@ TEST(FlKeyEmbedderResponderTest, SynthesizationOccursOnIgnoredEvents) {
   EXPECT_EQ(g_call_records, nullptr);
   g_call_records = g_ptr_array_new_with_free_func(g_object_unref);
   FlKeyResponder* responder = FL_KEY_RESPONDER(
-      fl_key_embedder_responder_new(record_calls_in(g_call_records)));
+      fl_key_embedder_responder_new(record_calls, g_call_records));
   int user_data = 123;  // Arbitrary user data
 
   FlKeyEmbedderCallRecord* record;
 
   // The NumLock is desynchronized by being enabled, and Control is pressed.
-  guint state = GDK_MOD2_MASK | GDK_CONTROL_MASK;
+  GdkModifierType state =
+      static_cast<GdkModifierType>(GDK_MOD2_MASK | GDK_CONTROL_MASK);
 
   // Send a KeyA up event, which will be ignored.
   g_expected_handled = true;  // The ignored event is always handled.
@@ -1648,13 +1649,14 @@ TEST(FlKeyEmbedderResponderTest, HandlesShiftAltVersusGroupNext) {
   EXPECT_EQ(g_call_records, nullptr);
   g_call_records = g_ptr_array_new_with_free_func(g_object_unref);
   FlKeyResponder* responder = FL_KEY_RESPONDER(
-      fl_key_embedder_responder_new(record_calls_in(g_call_records)));
+      fl_key_embedder_responder_new(record_calls, g_call_records));
 
   g_expected_handled = true;
   guint32 now_time = 1;
   // A convenient shorthand to simulate events.
   auto send_key_event = [responder, &now_time](bool is_press, guint keyval,
-                                               guint16 keycode, int state) {
+                                               guint16 keycode,
+                                               GdkModifierType state) {
     now_time += 1;
     int user_data = 123;  // Arbitrary user data
     fl_key_responder_handle_event(
@@ -1666,7 +1668,8 @@ TEST(FlKeyEmbedderResponderTest, HandlesShiftAltVersusGroupNext) {
 
   FlKeyEmbedderCallRecord* record;
 
-  send_key_event(kPress, GDK_KEY_Shift_L, kKeyCodeShiftLeft, 0x2000000);
+  send_key_event(kPress, GDK_KEY_Shift_L, kKeyCodeShiftLeft,
+                 GDK_MODIFIER_RESERVED_25_MASK);
   EXPECT_EQ(g_call_records->len, 1u);
   record = FL_KEY_EMBEDDER_CALL_RECORD(g_ptr_array_index(g_call_records, 0));
   EXPECT_EQ(record->event->type, kFlutterKeyEventTypeDown);
@@ -1674,7 +1677,9 @@ TEST(FlKeyEmbedderResponderTest, HandlesShiftAltVersusGroupNext) {
   EXPECT_EQ(record->event->logical, kLogicalShiftLeft);
   EXPECT_EQ(record->event->synthesized, false);
 
-  send_key_event(kPress, GDK_KEY_Meta_R, kKeyCodeAltRight, 0x2000001);
+  send_key_event(kPress, GDK_KEY_Meta_R, kKeyCodeAltRight,
+                 static_cast<GdkModifierType>(GDK_SHIFT_MASK |
+                                              GDK_MODIFIER_RESERVED_25_MASK));
   EXPECT_EQ(g_call_records->len, 2u);
   record = FL_KEY_EMBEDDER_CALL_RECORD(g_ptr_array_index(g_call_records, 1));
   EXPECT_EQ(record->event->type, kFlutterKeyEventTypeDown);
@@ -1683,7 +1688,8 @@ TEST(FlKeyEmbedderResponderTest, HandlesShiftAltVersusGroupNext) {
   EXPECT_EQ(record->event->synthesized, false);
 
   send_key_event(kRelease, GDK_KEY_ISO_Next_Group, kKeyCodeShiftLeft,
-                 0x2000009);
+                 static_cast<GdkModifierType>(GDK_SHIFT_MASK | GDK_MOD1_MASK |
+                                              GDK_MODIFIER_RESERVED_25_MASK));
   EXPECT_EQ(g_call_records->len, 5u);
   record = FL_KEY_EMBEDDER_CALL_RECORD(g_ptr_array_index(g_call_records, 2));
   EXPECT_EQ(record->event->type, kFlutterKeyEventTypeDown);
@@ -1703,7 +1709,9 @@ TEST(FlKeyEmbedderResponderTest, HandlesShiftAltVersusGroupNext) {
   EXPECT_EQ(record->event->logical, kLogicalShiftLeft);
   EXPECT_EQ(record->event->synthesized, false);
 
-  send_key_event(kPress, GDK_KEY_ISO_Next_Group, kKeyCodeShiftLeft, 0x2000008);
+  send_key_event(kPress, GDK_KEY_ISO_Next_Group, kKeyCodeShiftLeft,
+                 static_cast<GdkModifierType>(GDK_MOD1_MASK |
+                                              GDK_MODIFIER_RESERVED_25_MASK));
   EXPECT_EQ(g_call_records->len, 6u);
   record = FL_KEY_EMBEDDER_CALL_RECORD(g_ptr_array_index(g_call_records, 5));
   EXPECT_EQ(record->event->type, kFlutterKeyEventTypeDown);
@@ -1712,13 +1720,17 @@ TEST(FlKeyEmbedderResponderTest, HandlesShiftAltVersusGroupNext) {
   EXPECT_EQ(record->event->synthesized, false);
 
   send_key_event(kRelease, GDK_KEY_ISO_Level3_Shift, kKeyCodeAltRight,
-                 0x2002008);
+                 static_cast<GdkModifierType>(GDK_MOD1_MASK |
+                                              GDK_MODIFIER_RESERVED_13_MASK |
+                                              GDK_MODIFIER_RESERVED_25_MASK));
   EXPECT_EQ(g_call_records->len, 7u);
   record = FL_KEY_EMBEDDER_CALL_RECORD(g_ptr_array_index(g_call_records, 6));
   EXPECT_EQ(record->event->physical, 0u);
   EXPECT_EQ(record->event->logical, 0u);
 
-  send_key_event(kRelease, GDK_KEY_Shift_L, kKeyCodeShiftLeft, 0x2002000);
+  send_key_event(kRelease, GDK_KEY_Shift_L, kKeyCodeShiftLeft,
+                 static_cast<GdkModifierType>(GDK_MODIFIER_RESERVED_13_MASK |
+                                              GDK_MODIFIER_RESERVED_25_MASK));
   EXPECT_EQ(g_call_records->len, 9u);
   record = FL_KEY_EMBEDDER_CALL_RECORD(g_ptr_array_index(g_call_records, 7));
   EXPECT_EQ(record->event->type, kFlutterKeyEventTypeUp);
@@ -1746,13 +1758,14 @@ TEST(FlKeyEmbedderResponderTest, HandlesShiftAltLeftIsMetaLeft) {
   EXPECT_EQ(g_call_records, nullptr);
   g_call_records = g_ptr_array_new_with_free_func(g_object_unref);
   FlKeyResponder* responder = FL_KEY_RESPONDER(
-      fl_key_embedder_responder_new(record_calls_in(g_call_records)));
+      fl_key_embedder_responder_new(record_calls, g_call_records));
 
   g_expected_handled = true;
   guint32 now_time = 1;
   // A convenient shorthand to simulate events.
   auto send_key_event = [responder, &now_time](bool is_press, guint keyval,
-                                               guint16 keycode, int state) {
+                                               guint16 keycode,
+                                               GdkModifierType state) {
     now_time += 1;
     int user_data = 123;  // Arbitrary user data
     fl_key_responder_handle_event(
@@ -1765,7 +1778,8 @@ TEST(FlKeyEmbedderResponderTest, HandlesShiftAltLeftIsMetaLeft) {
   FlKeyEmbedderCallRecord* record;
 
   // ShiftLeft + AltLeft
-  send_key_event(kPress, GDK_KEY_Shift_L, kKeyCodeShiftLeft, 0x2000000);
+  send_key_event(kPress, GDK_KEY_Shift_L, kKeyCodeShiftLeft,
+                 GDK_MODIFIER_RESERVED_25_MASK);
   EXPECT_EQ(g_call_records->len, 1u);
   record = FL_KEY_EMBEDDER_CALL_RECORD(g_ptr_array_index(g_call_records, 0));
   EXPECT_EQ(record->event->type, kFlutterKeyEventTypeDown);
@@ -1773,7 +1787,9 @@ TEST(FlKeyEmbedderResponderTest, HandlesShiftAltLeftIsMetaLeft) {
   EXPECT_EQ(record->event->logical, kLogicalShiftLeft);
   EXPECT_EQ(record->event->synthesized, false);
 
-  send_key_event(kPress, GDK_KEY_Meta_L, kKeyCodeAltLeft, 0x2000001);
+  send_key_event(kPress, GDK_KEY_Meta_L, kKeyCodeAltLeft,
+                 static_cast<GdkModifierType>(GDK_SHIFT_MASK |
+                                              GDK_MODIFIER_RESERVED_25_MASK));
   EXPECT_EQ(g_call_records->len, 2u);
   record = FL_KEY_EMBEDDER_CALL_RECORD(g_ptr_array_index(g_call_records, 1));
   EXPECT_EQ(record->event->type, kFlutterKeyEventTypeDown);
@@ -1781,12 +1797,16 @@ TEST(FlKeyEmbedderResponderTest, HandlesShiftAltLeftIsMetaLeft) {
   EXPECT_EQ(record->event->logical, kLogicalMetaLeft);
   EXPECT_EQ(record->event->synthesized, false);
 
-  send_key_event(kRelease, GDK_KEY_Meta_L, kKeyCodeAltLeft, 0x2002000);
-  send_key_event(kRelease, GDK_KEY_Shift_L, kKeyCodeShiftLeft, 0x2000000);
+  send_key_event(kRelease, GDK_KEY_Meta_L, kKeyCodeAltLeft,
+                 static_cast<GdkModifierType>(GDK_MODIFIER_RESERVED_13_MASK |
+                                              GDK_MODIFIER_RESERVED_25_MASK));
+  send_key_event(kRelease, GDK_KEY_Shift_L, kKeyCodeShiftLeft,
+                 GDK_MODIFIER_RESERVED_25_MASK);
   g_ptr_array_clear(g_call_records);
 
   // ShiftRight + AltLeft
-  send_key_event(kPress, GDK_KEY_Shift_R, kKeyCodeShiftRight, 0x2000000);
+  send_key_event(kPress, GDK_KEY_Shift_R, kKeyCodeShiftRight,
+                 GDK_MODIFIER_RESERVED_25_MASK);
   EXPECT_EQ(g_call_records->len, 1u);
   record = FL_KEY_EMBEDDER_CALL_RECORD(g_ptr_array_index(g_call_records, 0));
   EXPECT_EQ(record->event->type, kFlutterKeyEventTypeDown);
@@ -1794,7 +1814,9 @@ TEST(FlKeyEmbedderResponderTest, HandlesShiftAltLeftIsMetaLeft) {
   EXPECT_EQ(record->event->logical, kLogicalShiftRight);
   EXPECT_EQ(record->event->synthesized, false);
 
-  send_key_event(kPress, GDK_KEY_Meta_L, kKeyCodeAltLeft, 0x2000001);
+  send_key_event(kPress, GDK_KEY_Meta_L, kKeyCodeAltLeft,
+                 static_cast<GdkModifierType>(GDK_SHIFT_MASK |
+                                              GDK_MODIFIER_RESERVED_25_MASK));
   EXPECT_EQ(g_call_records->len, 2u);
   record = FL_KEY_EMBEDDER_CALL_RECORD(g_ptr_array_index(g_call_records, 1));
   EXPECT_EQ(record->event->type, kFlutterKeyEventTypeDown);
diff --git a/shell/platform/linux/fl_key_event.cc b/shell/platform/linux/fl_key_event.cc
index db258f9187f201d973f9e152e79cc09063031be4..230bd9c53291c8de7c9b1788ff7711d4a7cb9f49 100644
--- a/shell/platform/linux/fl_key_event.cc
+++ b/shell/platform/linux/fl_key_event.cc
@@ -4,38 +4,34 @@
 
 #include "flutter/shell/platform/linux/fl_key_event.h"
 
-static void dispose_origin_from_gdk_event(gpointer origin) {
-  g_return_if_fail(origin != nullptr);
-  gdk_event_free(reinterpret_cast<GdkEvent*>(origin));
-}
-
-FlKeyEvent* fl_key_event_new_from_gdk_event(GdkEvent* raw_event) {
-  g_return_val_if_fail(raw_event != nullptr, nullptr);
-  GdkEventKey* event = reinterpret_cast<GdkEventKey*>(raw_event);
-  GdkEventType type = event->type;
+FlKeyEvent* fl_key_event_new_from_gdk_event(GdkEvent* event) {
+  g_return_val_if_fail(event != nullptr, nullptr);
+  GdkEventType type = gdk_event_get_event_type(event);
   g_return_val_if_fail(type == GDK_KEY_PRESS || type == GDK_KEY_RELEASE,
                        nullptr);
   FlKeyEvent* result = g_new(FlKeyEvent, 1);
 
-  result->time = event->time;
+  guint16 keycode = 0;
+  gdk_event_get_keycode(event, &keycode);
+  guint keyval = 0;
+  gdk_event_get_keyval(event, &keyval);
+  GdkModifierType state = static_cast<GdkModifierType>(0);
+  gdk_event_get_state(event, &state);
+
+  result->time = gdk_event_get_time(event);
   result->is_press = type == GDK_KEY_PRESS;
-  result->keycode = event->hardware_keycode;
-  result->keyval = event->keyval;
-  result->state = event->state;
-  result->string = g_strdup(event->string);
-  result->group = event->group;
+  result->keycode = keycode;
+  result->keyval = keyval;
+  result->state = state;
+  result->group = event->key.group;
   result->origin = event;
-  result->dispose_origin = dispose_origin_from_gdk_event;
 
   return result;
 }
 
 void fl_key_event_dispose(FlKeyEvent* event) {
-  if (event->string != nullptr) {
-    g_free(const_cast<char*>(event->string));
-  }
-  if (event->dispose_origin != nullptr) {
-    event->dispose_origin(event->origin);
+  if (event->origin != nullptr) {
+    gdk_event_free(event->origin);
   }
   g_free(event);
 }
@@ -43,6 +39,5 @@ void fl_key_event_dispose(FlKeyEvent* event) {
 FlKeyEvent* fl_key_event_clone(const FlKeyEvent* event) {
   FlKeyEvent* new_event = g_new(FlKeyEvent, 1);
   *new_event = *event;
-  new_event->string = g_strdup(event->string);
   return new_event;
 }
diff --git a/shell/platform/linux/fl_key_event.h b/shell/platform/linux/fl_key_event.h
index 82a678a443e8f392767a214a449a7d1f9aee7cd1..48221d463a653736de62f1b205f9833e94d9e6a7 100644
--- a/shell/platform/linux/fl_key_event.h
+++ b/shell/platform/linux/fl_key_event.h
@@ -7,15 +7,6 @@
 
 #include <gdk/gdk.h>
 
-/**
- * FlKeyEventDispose:
- * @origin: the #FlKeyEvent::origin to dispose.
- *
- * The signature for #FlKeyEvent::dispose_origin, which
- * frees #FlKeyEvent::origin.
- **/
-typedef void (*FlKeyEventDisposeOrigin)(gpointer origin);
-
 /**
  * FlKeyEvent:
  * A struct that stores information from GdkEvent.
@@ -38,22 +29,11 @@ typedef struct _FlKeyEvent {
   // Keyval.
   guint keyval;
   // Modifier state.
-  int state;
+  GdkModifierType state;
   // Keyboard group.
   guint8 group;
-  // String, null-terminated.
-  //
-  // Can be nullptr.
-  const char* string;
-  // An opaque pointer to the original event.
-  //
-  // This is used when dispatching.  For native events, this is #GdkEvent
-  // pointer.  For unit tests, this is a dummy pointer.
-  gpointer origin;
-  // A callback to free #origin, called in #fl_key_event_dispose.
-  //
-  // Can be nullptr.
-  FlKeyEventDisposeOrigin dispose_origin;
+  // The original event.
+  GdkEvent* origin;
 } FlKeyEvent;
 
 /**
diff --git a/shell/platform/linux/fl_keyboard_manager.cc b/shell/platform/linux/fl_keyboard_manager.cc
index fc3c8ca31b38a55ddc3feea24fd10ae2c7a87ada..2d14293560eac2d83774c593bb1555006756afec 100644
--- a/shell/platform/linux/fl_keyboard_manager.cc
+++ b/shell/platform/linux/fl_keyboard_manager.cc
@@ -12,11 +12,16 @@
 #include "flutter/shell/platform/linux/fl_key_channel_responder.h"
 #include "flutter/shell/platform/linux/fl_key_embedder_responder.h"
 #include "flutter/shell/platform/linux/key_mapping.h"
+#include "flutter/shell/platform/linux/public/flutter_linux/fl_method_channel.h"
+#include "flutter/shell/platform/linux/public/flutter_linux/fl_standard_method_codec.h"
 
 // Turn on this flag to print complete layout data when switching IMEs. The data
 // is used in unit tests.
 #define DEBUG_PRINT_LAYOUT
 
+static constexpr char kChannelName[] = "flutter/keyboard";
+static constexpr char kGetKeyboardStateMethod[] = "getKeyboardState";
+
 /* Declarations of private classes */
 
 G_DECLARE_FINAL_TYPE(FlKeyboardPendingEvent,
@@ -287,6 +292,9 @@ struct _FlKeyboardManager {
   // It is set up when the manager is initialized and is not changed ever after.
   std::unique_ptr<std::map<uint64_t, const LayoutGoal*>>
       logical_to_mandatory_goals;
+
+  // The channel used by the framework to query the keyboard pressed state.
+  FlMethodChannel* channel;
 };
 
 G_DEFINE_TYPE(FlKeyboardManager, fl_keyboard_manager, G_TYPE_OBJECT);
@@ -532,7 +540,50 @@ static void guarantee_layout(FlKeyboardManager* self, FlKeyEvent* event) {
   }
 }
 
+// Returns the keyboard pressed state.
+FlMethodResponse* get_keyboard_state(FlKeyboardManager* self) {
+  g_autoptr(FlValue) result = fl_value_new_map();
+
+  GHashTable* pressing_records =
+      fl_keyboard_view_delegate_get_keyboard_state(self->view_delegate);
+
+  g_hash_table_foreach(
+      pressing_records,
+      [](gpointer key, gpointer value, gpointer user_data) {
+        int64_t physical_key = reinterpret_cast<int64_t>(key);
+        int64_t logical_key = reinterpret_cast<int64_t>(value);
+        FlValue* fl_value_map = reinterpret_cast<FlValue*>(user_data);
+
+        fl_value_set_take(fl_value_map, fl_value_new_int(physical_key),
+                          fl_value_new_int(logical_key));
+      },
+      result);
+  return FL_METHOD_RESPONSE(fl_method_success_response_new(result));
+}
+
+// Called when a method call on flutter/keyboard is received from Flutter.
+static void method_call_handler(FlMethodChannel* channel,
+                                FlMethodCall* method_call,
+                                gpointer user_data) {
+  FlKeyboardManager* self = FL_KEYBOARD_MANAGER(user_data);
+
+  const gchar* method = fl_method_call_get_name(method_call);
+
+  g_autoptr(FlMethodResponse) response = nullptr;
+  if (strcmp(method, kGetKeyboardStateMethod) == 0) {
+    response = get_keyboard_state(self);
+  } else {
+    response = FL_METHOD_RESPONSE(fl_method_not_implemented_response_new());
+  }
+
+  g_autoptr(GError) error = nullptr;
+  if (!fl_method_call_respond(method_call, response, &error)) {
+    g_warning("Failed to send method call response: %s", error->message);
+  }
+}
+
 FlKeyboardManager* fl_keyboard_manager_new(
+    FlBinaryMessenger* messenger,
     FlKeyboardViewDelegate* view_delegate) {
   g_return_val_if_fail(FL_IS_KEYBOARD_VIEW_DELEGATE(view_delegate), nullptr);
 
@@ -548,18 +599,28 @@ FlKeyboardManager* fl_keyboard_manager_new(
   g_ptr_array_add(
       self->responder_list,
       FL_KEY_RESPONDER(fl_key_embedder_responder_new(
-          [self](const FlutterKeyEvent* event, FlutterKeyEventCallback callback,
-                 void* user_data) {
+          [](const FlutterKeyEvent* event, FlutterKeyEventCallback callback,
+             void* callback_user_data, void* send_key_event_user_data) {
+            FlKeyboardManager* self =
+                FL_KEYBOARD_MANAGER(send_key_event_user_data);
             g_return_if_fail(self->view_delegate != nullptr);
-            fl_keyboard_view_delegate_send_key_event(self->view_delegate, event,
-                                                     callback, user_data);
-          })));
+            fl_keyboard_view_delegate_send_key_event(
+                self->view_delegate, event, callback, callback_user_data);
+          },
+          self)));
   g_ptr_array_add(self->responder_list,
                   FL_KEY_RESPONDER(fl_key_channel_responder_new(
                       fl_keyboard_view_delegate_get_messenger(view_delegate))));
 
   fl_keyboard_view_delegate_subscribe_to_layout_change(
       self->view_delegate, [self]() { self->derived_layout->clear(); });
+
+  // Setup the flutter/keyboard channel.
+  g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
+  self->channel =
+      fl_method_channel_new(messenger, kChannelName, FL_METHOD_CODEC(codec));
+  fl_method_channel_set_method_call_handler(self->channel, method_call_handler,
+                                            self, nullptr);
   return self;
 }
 
@@ -614,6 +675,8 @@ gboolean fl_keyboard_manager_is_state_clear(FlKeyboardManager* self) {
 void fl_keyboard_manager_sync_modifier_if_needed(FlKeyboardManager* self,
                                                  guint state,
                                                  double event_time) {
+  g_return_if_fail(FL_IS_KEYBOARD_MANAGER(self));
+
   // The embedder responder is the first element in
   // FlKeyboardManager.responder_list.
   FlKeyEmbedderResponder* responder =
@@ -621,3 +684,13 @@ void fl_keyboard_manager_sync_modifier_if_needed(FlKeyboardManager* self,
   fl_key_embedder_responder_sync_modifiers_if_needed(responder, state,
                                                      event_time);
 }
+
+GHashTable* fl_keyboard_manager_get_pressed_state(FlKeyboardManager* self) {
+  g_return_val_if_fail(FL_IS_KEYBOARD_MANAGER(self), nullptr);
+
+  // The embedder responder is the first element in
+  // FlKeyboardManager.responder_list.
+  FlKeyEmbedderResponder* responder =
+      FL_KEY_EMBEDDER_RESPONDER(g_ptr_array_index(self->responder_list, 0));
+  return fl_key_embedder_responder_get_pressed_state(responder);
+}
diff --git a/shell/platform/linux/fl_keyboard_manager.h b/shell/platform/linux/fl_keyboard_manager.h
index 688e49f972a924b9685edac3ef7b0aaa93a6384e..84f4b574bd28e8e73a14eb9a60c31ad2fc57a444 100644
--- a/shell/platform/linux/fl_keyboard_manager.h
+++ b/shell/platform/linux/fl_keyboard_manager.h
@@ -44,6 +44,7 @@ G_DECLARE_FINAL_TYPE(FlKeyboardManager,
  * Returns: a new #FlKeyboardManager.
  */
 FlKeyboardManager* fl_keyboard_manager_new(
+    FlBinaryMessenger* messenger,
     FlKeyboardViewDelegate* view_delegate);
 
 /**
@@ -83,6 +84,15 @@ void fl_keyboard_manager_sync_modifier_if_needed(FlKeyboardManager* manager,
                                                  guint state,
                                                  double event_time);
 
+/**
+ * fl_keyboard_manager_get_pressed_state:
+ * @manager: the #FlKeyboardManager self.
+ *
+ * Returns the keyboard pressed state. The hash table contains one entry per
+ * pressed keys, mapping from the logical key to the physical key.*
+ */
+GHashTable* fl_keyboard_manager_get_pressed_state(FlKeyboardManager* manager);
+
 G_END_DECLS
 
 #endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_KEYBOARD_MANAGER_H_
diff --git a/shell/platform/linux/fl_keyboard_manager_test.cc b/shell/platform/linux/fl_keyboard_manager_test.cc
index b408cb89eac00aedf05646da69bc94615dc41af7..8a5f02d21d21fa7f56235ed4599e4f070efc969f 100644
--- a/shell/platform/linux/fl_keyboard_manager_test.cc
+++ b/shell/platform/linux/fl_keyboard_manager_test.cc
@@ -8,8 +8,18 @@
 #include <vector>
 
 #include "flutter/shell/platform/embedder/test_utils/key_codes.g.h"
+#include "flutter/shell/platform/linux/fl_binary_messenger_private.h"
+#include "flutter/shell/platform/linux/fl_method_codec_private.h"
+#include "flutter/shell/platform/linux/key_mapping.h"
 #include "flutter/shell/platform/linux/public/flutter_linux/fl_json_message_codec.h"
+#include "flutter/shell/platform/linux/public/flutter_linux/fl_method_codec.h"
+#include "flutter/shell/platform/linux/public/flutter_linux/fl_standard_method_codec.h"
+#include "flutter/shell/platform/linux/testing/fl_test.h"
+#include "flutter/shell/platform/linux/testing/mock_binary_messenger.h"
 #include "flutter/shell/platform/linux/testing/mock_text_input_plugin.h"
+#include "flutter/testing/testing.h"
+
+#include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
 // Define compound `expect` in macros. If they were defined in functions, the
@@ -100,6 +110,10 @@ constexpr guint16 kKeyCodeSemicolon = 0x2fu;
 constexpr guint16 kKeyCodeKeyLeftBracket = 0x22u;
 
 static constexpr char kKeyEventChannelName[] = "flutter/keyevent";
+static constexpr char kKeyboardChannelName[] = "flutter/keyboard";
+static constexpr char kGetKeyboardStateMethod[] = "getKeyboardState";
+static constexpr uint64_t kMockPhysicalKey = 42;
+static constexpr uint64_t kMockLogicalKey = 42;
 
 // All key clues for a keyboard layout.
 //
@@ -129,6 +143,19 @@ G_DECLARE_FINAL_TYPE(FlMockKeyBinaryMessenger,
 
 G_END_DECLS
 
+MATCHER_P(MethodSuccessResponse, result, "") {
+  g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
+  g_autoptr(FlMethodResponse) response =
+      fl_method_codec_decode_response(FL_METHOD_CODEC(codec), arg, nullptr);
+  fl_method_response_get_result(response, nullptr);
+  if (fl_value_equal(fl_method_response_get_result(response, nullptr),
+                     result)) {
+    return true;
+  }
+  *result_listener << ::testing::PrintToString(response);
+  return false;
+}
+
 /***** FlMockKeyBinaryMessenger *****/
 /* Mock a binary messenger that only processes messages from the embedding on
  * the key event channel, and does so according to the callback set by
@@ -136,7 +163,9 @@ G_END_DECLS
 
 struct _FlMockKeyBinaryMessenger {
   GObject parent_instance;
+};
 
+struct FlMockKeyBinaryMessengerPrivate {
   ChannelCallHandler callback_handler;
 };
 
@@ -148,10 +177,29 @@ G_DEFINE_TYPE_WITH_CODE(
     fl_mock_key_binary_messenger,
     G_TYPE_OBJECT,
     G_IMPLEMENT_INTERFACE(fl_binary_messenger_get_type(),
-                          fl_mock_key_binary_messenger_iface_init))
+                          fl_mock_key_binary_messenger_iface_init);
+    G_ADD_PRIVATE(FlMockKeyBinaryMessenger))
+
+#define FL_MOCK_KEY_BINARY_MESSENGER_GET_PRIVATE(obj)    \
+  static_cast<FlMockKeyBinaryMessengerPrivate*>(         \
+      fl_mock_key_binary_messenger_get_instance_private( \
+          FL_MOCK_KEY_BINARY_MESSENGER(obj)))
+
+static void fl_mock_key_binary_messenger_init(FlMockKeyBinaryMessenger* self) {
+  FlMockKeyBinaryMessengerPrivate* priv =
+      FL_MOCK_KEY_BINARY_MESSENGER_GET_PRIVATE(self);
+  new (priv) FlMockKeyBinaryMessengerPrivate();
+}
+
+static void fl_mock_key_binary_messenger_finalize(GObject* object) {
+  FL_MOCK_KEY_BINARY_MESSENGER_GET_PRIVATE(object)
+      ->~FlMockKeyBinaryMessengerPrivate();
+}
 
 static void fl_mock_key_binary_messenger_class_init(
-    FlMockKeyBinaryMessengerClass* klass) {}
+    FlMockKeyBinaryMessengerClass* klass) {
+  G_OBJECT_CLASS(klass)->finalize = fl_mock_key_binary_messenger_finalize;
+}
 
 static void fl_mock_key_binary_messenger_send_on_channel(
     FlBinaryMessenger* messenger,
@@ -164,20 +212,21 @@ static void fl_mock_key_binary_messenger_send_on_channel(
 
   if (callback != nullptr) {
     EXPECT_STREQ(channel, kKeyEventChannelName);
-    self->callback_handler([self, cancellable, callback,
-                            user_data](bool handled) {
-      g_autoptr(GTask) task =
-          g_task_new(self, cancellable, callback, user_data);
-      g_autoptr(FlValue) result = fl_value_new_map();
-      fl_value_set_string_take(result, "handled", fl_value_new_bool(handled));
-      g_autoptr(FlJsonMessageCodec) codec = fl_json_message_codec_new();
-      g_autoptr(GError) error = nullptr;
-      GBytes* data = fl_message_codec_encode_message(FL_MESSAGE_CODEC(codec),
-                                                     result, &error);
-
-      g_task_return_pointer(task, data,
-                            reinterpret_cast<GDestroyNotify>(g_bytes_unref));
-    });
+    FL_MOCK_KEY_BINARY_MESSENGER_GET_PRIVATE(self)->callback_handler(
+        [self, cancellable, callback, user_data](bool handled) {
+          g_autoptr(GTask) task =
+              g_task_new(self, cancellable, callback, user_data);
+          g_autoptr(FlValue) result = fl_value_new_map();
+          fl_value_set_string_take(result, "handled",
+                                   fl_value_new_bool(handled));
+          g_autoptr(FlJsonMessageCodec) codec = fl_json_message_codec_new();
+          g_autoptr(GError) error = nullptr;
+          GBytes* data = fl_message_codec_encode_message(
+              FL_MESSAGE_CODEC(codec), result, &error);
+
+          g_task_return_pointer(
+              task, data, reinterpret_cast<GDestroyNotify>(g_bytes_unref));
+        });
   }
 }
 
@@ -188,6 +237,20 @@ static GBytes* fl_mock_key_binary_messenger_send_on_channel_finish(
   return static_cast<GBytes*>(g_task_propagate_pointer(G_TASK(result), error));
 }
 
+static void fl_mock_binary_messenger_resize_channel(
+    FlBinaryMessenger* messenger,
+    const gchar* channel,
+    int64_t new_size) {
+  // Mock implementation. Do nothing.
+}
+
+static void fl_mock_binary_messenger_set_warns_on_channel_overflow(
+    FlBinaryMessenger* messenger,
+    const gchar* channel,
+    bool warns) {
+  // Mock implementation. Do nothing.
+}
+
 static void fl_mock_key_binary_messenger_iface_init(
     FlBinaryMessengerInterface* iface) {
   iface->set_message_handler_on_channel =
@@ -209,10 +272,11 @@ static void fl_mock_key_binary_messenger_iface_init(
   iface->send_on_channel = fl_mock_key_binary_messenger_send_on_channel;
   iface->send_on_channel_finish =
       fl_mock_key_binary_messenger_send_on_channel_finish;
+  iface->resize_channel = fl_mock_binary_messenger_resize_channel;
+  iface->set_warns_on_channel_overflow =
+      fl_mock_binary_messenger_set_warns_on_channel_overflow;
 }
 
-static void fl_mock_key_binary_messenger_init(FlMockKeyBinaryMessenger* self) {}
-
 static FlMockKeyBinaryMessenger* fl_mock_key_binary_messenger_new() {
   FlMockKeyBinaryMessenger* self = FL_MOCK_KEY_BINARY_MESSENGER(
       g_object_new(fl_mock_key_binary_messenger_get_type(), NULL));
@@ -226,14 +290,17 @@ static FlMockKeyBinaryMessenger* fl_mock_key_binary_messenger_new() {
 static void fl_mock_key_binary_messenger_set_callback_handler(
     FlMockKeyBinaryMessenger* self,
     ChannelCallHandler handler) {
-  self->callback_handler = std::move(handler);
+  FL_MOCK_KEY_BINARY_MESSENGER_GET_PRIVATE(self)->callback_handler =
+      std::move(handler);
 }
 
 /***** FlMockViewDelegate *****/
 
 struct _FlMockViewDelegate {
   GObject parent_instance;
+};
 
+struct FlMockViewDelegatePrivate {
   FlMockKeyBinaryMessenger* messenger;
   EmbedderCallHandler embedder_handler;
   bool text_filter_result;
@@ -250,31 +317,43 @@ G_DEFINE_TYPE_WITH_CODE(
     fl_mock_view_delegate,
     G_TYPE_OBJECT,
     G_IMPLEMENT_INTERFACE(fl_keyboard_view_delegate_get_type(),
-                          fl_mock_view_keyboard_delegate_iface_init))
+                          fl_mock_view_keyboard_delegate_iface_init);
+    G_ADD_PRIVATE(FlMockViewDelegate))
 
-static void fl_mock_view_delegate_init(FlMockViewDelegate* self) {}
+#define FL_MOCK_VIEW_DELEGATE_GET_PRIVATE(obj) \
+  static_cast<FlMockViewDelegatePrivate*>(     \
+      fl_mock_view_delegate_get_instance_private(FL_MOCK_VIEW_DELEGATE(obj)))
+
+static void fl_mock_view_delegate_init(FlMockViewDelegate* self) {
+  FlMockViewDelegatePrivate* priv = FL_MOCK_VIEW_DELEGATE_GET_PRIVATE(self);
+  new (priv) FlMockViewDelegatePrivate();
+}
+
+static void fl_mock_view_delegate_finalize(GObject* object) {
+  FL_MOCK_VIEW_DELEGATE_GET_PRIVATE(object)->~FlMockViewDelegatePrivate();
+}
 
 static void fl_mock_view_delegate_dispose(GObject* object) {
-  FlMockViewDelegate* self = FL_MOCK_VIEW_DELEGATE(object);
+  FlMockViewDelegatePrivate* priv = FL_MOCK_VIEW_DELEGATE_GET_PRIVATE(object);
 
-  g_clear_object(&self->messenger);
+  g_clear_object(&priv->messenger);
 
   G_OBJECT_CLASS(fl_mock_view_delegate_parent_class)->dispose(object);
 }
 
 static void fl_mock_view_delegate_class_init(FlMockViewDelegateClass* klass) {
   G_OBJECT_CLASS(klass)->dispose = fl_mock_view_delegate_dispose;
+  G_OBJECT_CLASS(klass)->finalize = fl_mock_view_delegate_finalize;
 }
 
-static FlKeyEvent* fl_key_event_clone_information_only(FlKeyEvent* event);
-
 static void fl_mock_view_keyboard_send_key_event(
     FlKeyboardViewDelegate* view_delegate,
     const FlutterKeyEvent* event,
     FlutterKeyEventCallback callback,
     void* user_data) {
-  FlMockViewDelegate* self = FL_MOCK_VIEW_DELEGATE(view_delegate);
-  self->embedder_handler(event, [callback, user_data](bool handled) {
+  FlMockViewDelegatePrivate* priv =
+      FL_MOCK_VIEW_DELEGATE_GET_PRIVATE(view_delegate);
+  priv->embedder_handler(event, [callback, user_data](bool handled) {
     if (callback != nullptr) {
       callback(handled, user_data);
     }
@@ -284,44 +363,56 @@ static void fl_mock_view_keyboard_send_key_event(
 static gboolean fl_mock_view_keyboard_text_filter_key_press(
     FlKeyboardViewDelegate* view_delegate,
     FlKeyEvent* event) {
-  FlMockViewDelegate* self = FL_MOCK_VIEW_DELEGATE(view_delegate);
-  return self->text_filter_result;
+  FlMockViewDelegatePrivate* priv =
+      FL_MOCK_VIEW_DELEGATE_GET_PRIVATE(view_delegate);
+  return priv->text_filter_result;
 }
 
 static FlBinaryMessenger* fl_mock_view_keyboard_get_messenger(
     FlKeyboardViewDelegate* view_delegate) {
-  FlMockViewDelegate* self = FL_MOCK_VIEW_DELEGATE(view_delegate);
-  return FL_BINARY_MESSENGER(self->messenger);
+  FlMockViewDelegatePrivate* priv =
+      FL_MOCK_VIEW_DELEGATE_GET_PRIVATE(view_delegate);
+  return FL_BINARY_MESSENGER(priv->messenger);
 }
 
 static void fl_mock_view_keyboard_redispatch_event(
     FlKeyboardViewDelegate* view_delegate,
     std::unique_ptr<FlKeyEvent> event) {
-  FlMockViewDelegate* self = FL_MOCK_VIEW_DELEGATE(view_delegate);
-  if (self->redispatch_handler) {
-    self->redispatch_handler(std::move(event));
+  FlMockViewDelegatePrivate* priv =
+      FL_MOCK_VIEW_DELEGATE_GET_PRIVATE(view_delegate);
+  if (priv->redispatch_handler) {
+    priv->redispatch_handler(std::move(event));
   }
 }
 
 static void fl_mock_view_keyboard_subscribe_to_layout_change(
     FlKeyboardViewDelegate* delegate,
     KeyboardLayoutNotifier notifier) {
-  FlMockViewDelegate* self = FL_MOCK_VIEW_DELEGATE(delegate);
-  self->layout_notifier = std::move(notifier);
+  FlMockViewDelegatePrivate* priv = FL_MOCK_VIEW_DELEGATE_GET_PRIVATE(delegate);
+  priv->layout_notifier = std::move(notifier);
 }
 
 static guint fl_mock_view_keyboard_lookup_key(FlKeyboardViewDelegate* delegate,
                                               const GdkKeymapKey* key) {
-  FlMockViewDelegate* self = FL_MOCK_VIEW_DELEGATE(delegate);
+  FlMockViewDelegatePrivate* priv = FL_MOCK_VIEW_DELEGATE_GET_PRIVATE(delegate);
   guint8 group = static_cast<guint8>(key->group);
-  EXPECT_LT(group, self->layout_data->size());
-  const MockGroupLayoutData* group_layout = (*self->layout_data)[group];
+  EXPECT_LT(group, priv->layout_data->size());
+  const MockGroupLayoutData* group_layout = (*priv->layout_data)[group];
   EXPECT_TRUE(group_layout != nullptr);
   EXPECT_TRUE(key->level == 0 || key->level == 1);
   bool shift = key->level == 1;
   return (*group_layout)[key->keycode * 2 + shift];
 }
 
+static GHashTable* fl_mock_view_keyboard_get_keyboard_state(
+    FlKeyboardViewDelegate* view_delegate) {
+  GHashTable* result = g_hash_table_new(g_direct_hash, g_direct_equal);
+  g_hash_table_insert(result, reinterpret_cast<gpointer>(kMockPhysicalKey),
+                      reinterpret_cast<gpointer>(kMockLogicalKey));
+
+  return result;
+}
+
 static void fl_mock_view_keyboard_delegate_iface_init(
     FlKeyboardViewDelegateInterface* iface) {
   iface->send_key_event = fl_mock_view_keyboard_send_key_event;
@@ -331,6 +422,7 @@ static void fl_mock_view_keyboard_delegate_iface_init(
   iface->subscribe_to_layout_change =
       fl_mock_view_keyboard_subscribe_to_layout_change;
   iface->lookup_key = fl_mock_view_keyboard_lookup_key;
+  iface->get_keyboard_state = fl_mock_view_keyboard_get_keyboard_state;
 }
 
 static FlMockViewDelegate* fl_mock_view_delegate_new() {
@@ -340,79 +432,71 @@ static FlMockViewDelegate* fl_mock_view_delegate_new() {
   // Added to stop compiler complaining about an unused function.
   FL_IS_MOCK_VIEW_DELEGATE(self);
 
-  self->messenger = fl_mock_key_binary_messenger_new();
+  FlMockViewDelegatePrivate* priv = FL_MOCK_VIEW_DELEGATE_GET_PRIVATE(self);
+  priv->messenger = fl_mock_key_binary_messenger_new();
 
   return self;
 }
 
 static void fl_mock_view_set_embedder_handler(FlMockViewDelegate* self,
                                               EmbedderCallHandler handler) {
-  self->embedder_handler = std::move(handler);
+  FlMockViewDelegatePrivate* priv = FL_MOCK_VIEW_DELEGATE_GET_PRIVATE(self);
+  priv->embedder_handler = std::move(handler);
 }
 
 static void fl_mock_view_set_text_filter_result(FlMockViewDelegate* self,
                                                 bool result) {
-  self->text_filter_result = result;
+  FlMockViewDelegatePrivate* priv = FL_MOCK_VIEW_DELEGATE_GET_PRIVATE(self);
+  priv->text_filter_result = result;
 }
 
 static void fl_mock_view_set_redispatch_handler(FlMockViewDelegate* self,
                                                 RedispatchHandler handler) {
-  self->redispatch_handler = std::move(handler);
+  FlMockViewDelegatePrivate* priv = FL_MOCK_VIEW_DELEGATE_GET_PRIVATE(self);
+  priv->redispatch_handler = std::move(handler);
 }
 
 static void fl_mock_view_set_layout(FlMockViewDelegate* self,
                                     const MockLayoutData* layout) {
-  self->layout_data = layout;
-  if (self->layout_notifier != nullptr) {
-    self->layout_notifier();
+  FlMockViewDelegatePrivate* priv = FL_MOCK_VIEW_DELEGATE_GET_PRIVATE(self);
+  priv->layout_data = layout;
+  if (priv->layout_notifier != nullptr) {
+    priv->layout_notifier();
   }
 }
 
 /***** End FlMockViewDelegate *****/
 
-// Return a newly allocated #FlKeyEvent that is a clone to the given #event
-// but with #origin and #dispose set to 0.
-static FlKeyEvent* fl_key_event_clone_information_only(FlKeyEvent* event) {
-  FlKeyEvent* new_event = fl_key_event_clone(event);
-  new_event->origin = nullptr;
-  new_event->dispose_origin = nullptr;
-  return new_event;
-}
-
 // Create a new #FlKeyEvent with the given information.
-//
-// The #origin will be another #FlKeyEvent with the exact information,
-// so that it can be used to redispatch, and is freed upon disposal.
 static FlKeyEvent* fl_key_event_new_by_mock(bool is_press,
                                             guint keyval,
                                             guint16 keycode,
-                                            int state,
+                                            GdkModifierType state,
                                             gboolean is_modifier,
                                             guint8 group = 0) {
-  FlKeyEvent* event = g_new(FlKeyEvent, 1);
+  FlKeyEvent* event = g_new0(FlKeyEvent, 1);
   event->is_press = is_press;
   event->time = 0;
   event->state = state;
   event->keyval = keyval;
-  event->string = nullptr;
   event->group = group;
   event->keycode = keycode;
-  FlKeyEvent* origin_event = fl_key_event_clone_information_only(event);
-  event->origin = origin_event;
-  event->dispose_origin = [](gpointer origin) { g_free(origin); };
   return event;
 }
 
 class KeyboardTester {
  public:
   KeyboardTester() {
+    ::testing::NiceMock<flutter::testing::MockBinaryMessenger> messenger;
+
     view_ = fl_mock_view_delegate_new();
     respondToEmbedderCallsWith(false);
     respondToChannelCallsWith(false);
     respondToTextInputWith(false);
     setLayout(kLayoutUs);
 
-    manager_ = fl_keyboard_manager_new(FL_KEYBOARD_VIEW_DELEGATE(view_));
+    manager_ =
+        fl_keyboard_manager_new(messenger, FL_KEYBOARD_VIEW_DELEGATE(view_));
   }
 
   ~KeyboardTester() {
@@ -500,16 +584,20 @@ class KeyboardTester {
   }
 
   void respondToChannelCallsWith(bool response) {
+    FlMockViewDelegatePrivate* priv = FL_MOCK_VIEW_DELEGATE_GET_PRIVATE(view_);
+
     fl_mock_key_binary_messenger_set_callback_handler(
-        view_->messenger, [response, this](const AsyncKeyCallback& callback) {
+        priv->messenger, [response, this](const AsyncKeyCallback& callback) {
           EXPECT_FALSE(during_redispatch_);
           callback(response);
         });
   }
 
   void recordChannelCallsTo(std::vector<CallRecord>& storage) {
+    FlMockViewDelegatePrivate* priv = FL_MOCK_VIEW_DELEGATE_GET_PRIVATE(view_);
+
     fl_mock_key_binary_messenger_set_callback_handler(
-        view_->messenger, [&storage, this](AsyncKeyCallback callback) {
+        priv->messenger, [&storage, this](AsyncKeyCallback callback) {
           EXPECT_FALSE(during_redispatch_);
           storage.push_back(CallRecord{
               .type = CallRecord::kKeyCallChannel,
@@ -556,12 +644,14 @@ TEST(FlKeyboardManagerTest, DisposeWithUnresolvedPends) {
   tester.recordEmbedderCallsTo(call_records);
   fl_keyboard_manager_handle_event(
       tester.manager(),
-      fl_key_event_new_by_mock(true, GDK_KEY_a, kKeyCodeKeyA, 0x0, false));
+      fl_key_event_new_by_mock(true, GDK_KEY_a, kKeyCodeKeyA,
+                               static_cast<GdkModifierType>(0), false));
 
   tester.respondToEmbedderCallsWith(true);
   fl_keyboard_manager_handle_event(
       tester.manager(),
-      fl_key_event_new_by_mock(false, GDK_KEY_a, kKeyCodeKeyA, 0x0, false));
+      fl_key_event_new_by_mock(false, GDK_KEY_a, kKeyCodeKeyA,
+                               static_cast<GdkModifierType>(0), false));
 
   tester.flushChannelMessages();
 
@@ -582,7 +672,8 @@ TEST(FlKeyboardManagerTest, SingleDelegateWithAsyncResponds) {
   // Dispatch a key event
   manager_handled = fl_keyboard_manager_handle_event(
       tester.manager(),
-      fl_key_event_new_by_mock(true, GDK_KEY_a, kKeyCodeKeyA, 0x0, false));
+      fl_key_event_new_by_mock(true, GDK_KEY_a, kKeyCodeKeyA,
+                               static_cast<GdkModifierType>(0), false));
   tester.flushChannelMessages();
   EXPECT_EQ(manager_handled, true);
   EXPECT_EQ(redispatched.size(), 0u);
@@ -599,7 +690,8 @@ TEST(FlKeyboardManagerTest, SingleDelegateWithAsyncResponds) {
   /// Test 2: Two events that are unhandled by the framework
   manager_handled = fl_keyboard_manager_handle_event(
       tester.manager(),
-      fl_key_event_new_by_mock(false, GDK_KEY_a, kKeyCodeKeyA, 0x0, false));
+      fl_key_event_new_by_mock(false, GDK_KEY_a, kKeyCodeKeyA,
+                               static_cast<GdkModifierType>(0), false));
   tester.flushChannelMessages();
   EXPECT_EQ(manager_handled, true);
   EXPECT_EQ(redispatched.size(), 0u);
@@ -610,7 +702,8 @@ TEST(FlKeyboardManagerTest, SingleDelegateWithAsyncResponds) {
   // Dispatch another key event
   manager_handled = fl_keyboard_manager_handle_event(
       tester.manager(),
-      fl_key_event_new_by_mock(true, GDK_KEY_b, kKeyCodeKeyB, 0x0, false));
+      fl_key_event_new_by_mock(true, GDK_KEY_b, kKeyCodeKeyB,
+                               static_cast<GdkModifierType>(0), false));
   tester.flushChannelMessages();
   EXPECT_EQ(manager_handled, true);
   EXPECT_EQ(redispatched.size(), 0u);
@@ -640,7 +733,8 @@ TEST(FlKeyboardManagerTest, SingleDelegateWithAsyncResponds) {
   /// redispatching only works once.
   manager_handled = fl_keyboard_manager_handle_event(
       tester.manager(),
-      fl_key_event_new_by_mock(false, GDK_KEY_a, kKeyCodeKeyA, 0x0, false));
+      fl_key_event_new_by_mock(false, GDK_KEY_a, kKeyCodeKeyA,
+                               static_cast<GdkModifierType>(0), false));
   tester.flushChannelMessages();
   EXPECT_EQ(manager_handled, true);
   EXPECT_EQ(redispatched.size(), 0u);
@@ -663,7 +757,8 @@ TEST(FlKeyboardManagerTest, SingleDelegateWithSyncResponds) {
   // Dispatch a key event
   manager_handled = fl_keyboard_manager_handle_event(
       tester.manager(),
-      fl_key_event_new_by_mock(true, GDK_KEY_a, kKeyCodeKeyA, 0x0, false));
+      fl_key_event_new_by_mock(true, GDK_KEY_a, kKeyCodeKeyA,
+                               static_cast<GdkModifierType>(0), false));
   tester.flushChannelMessages();
   EXPECT_EQ(manager_handled, true);
   EXPECT_EQ(call_records.size(), 1u);
@@ -679,7 +774,8 @@ TEST(FlKeyboardManagerTest, SingleDelegateWithSyncResponds) {
   tester.respondToEmbedderCallsWithAndRecordsTo(false, call_records);
   manager_handled = fl_keyboard_manager_handle_event(
       tester.manager(),
-      fl_key_event_new_by_mock(false, GDK_KEY_a, kKeyCodeKeyA, 0x0, false));
+      fl_key_event_new_by_mock(false, GDK_KEY_a, kKeyCodeKeyA,
+                               static_cast<GdkModifierType>(0), false));
   tester.flushChannelMessages();
   EXPECT_EQ(manager_handled, true);
   EXPECT_EQ(call_records.size(), 1u);
@@ -711,7 +807,8 @@ TEST(FlKeyboardManagerTest, WithTwoAsyncDelegates) {
 
   manager_handled = fl_keyboard_manager_handle_event(
       tester.manager(),
-      fl_key_event_new_by_mock(true, GDK_KEY_a, kKeyCodeKeyA, 0x0, false));
+      fl_key_event_new_by_mock(true, GDK_KEY_a, kKeyCodeKeyA,
+                               static_cast<GdkModifierType>(0), false));
 
   EXPECT_EQ(manager_handled, true);
   EXPECT_EQ(redispatched.size(), 0u);
@@ -731,7 +828,8 @@ TEST(FlKeyboardManagerTest, WithTwoAsyncDelegates) {
   /// Test 2: All delegates respond false
   manager_handled = fl_keyboard_manager_handle_event(
       tester.manager(),
-      fl_key_event_new_by_mock(false, GDK_KEY_a, kKeyCodeKeyA, 0x0, false));
+      fl_key_event_new_by_mock(false, GDK_KEY_a, kKeyCodeKeyA,
+                               static_cast<GdkModifierType>(0), false));
 
   EXPECT_EQ(manager_handled, true);
   EXPECT_EQ(redispatched.size(), 0u);
@@ -764,7 +862,8 @@ TEST(FlKeyboardManagerTest, TextInputPluginReturnsFalse) {
   // Dispatch a key event.
   manager_handled = fl_keyboard_manager_handle_event(
       tester.manager(),
-      fl_key_event_new_by_mock(true, GDK_KEY_a, kKeyCodeKeyA, 0, false));
+      fl_key_event_new_by_mock(true, GDK_KEY_a, kKeyCodeKeyA,
+                               static_cast<GdkModifierType>(0), false));
   tester.flushChannelMessages();
   EXPECT_EQ(manager_handled, true);
   // The event was redispatched because no one handles it.
@@ -786,7 +885,8 @@ TEST(FlKeyboardManagerTest, TextInputPluginReturnsTrue) {
   // Dispatch a key event.
   manager_handled = fl_keyboard_manager_handle_event(
       tester.manager(),
-      fl_key_event_new_by_mock(true, GDK_KEY_a, kKeyCodeKeyA, 0, false));
+      fl_key_event_new_by_mock(true, GDK_KEY_a, kKeyCodeKeyA,
+                               static_cast<GdkModifierType>(0), false));
   tester.flushChannelMessages();
   EXPECT_EQ(manager_handled, true);
   // The event was not redispatched because text input plugin handles it.
@@ -803,11 +903,13 @@ TEST(FlKeyboardManagerTest, CorrectLogicalKeyForLayouts) {
 
   auto sendTap = [&](guint8 keycode, guint keyval, guint8 group) {
     fl_keyboard_manager_handle_event(
-        tester.manager(),
-        fl_key_event_new_by_mock(true, keyval, keycode, 0, false, group));
+        tester.manager(), fl_key_event_new_by_mock(
+                              true, keyval, keycode,
+                              static_cast<GdkModifierType>(0), false, group));
     fl_keyboard_manager_handle_event(
-        tester.manager(),
-        fl_key_event_new_by_mock(false, keyval, keycode, 0, false, group));
+        tester.manager(), fl_key_event_new_by_mock(
+                              false, keyval, keycode,
+                              static_cast<GdkModifierType>(0), false, group));
   };
 
   /* US keyboard layout */
@@ -926,6 +1028,48 @@ TEST(FlKeyboardManagerTest, SynthesizeModifiersIfNeeded) {
                               kLogicalShiftLeft);
 }
 
+TEST(FlKeyboardManagerTest, GetPressedState) {
+  KeyboardTester tester;
+  tester.respondToTextInputWith(true);
+
+  // Dispatch a key event.
+  fl_keyboard_manager_handle_event(
+      tester.manager(),
+      fl_key_event_new_by_mock(true, GDK_KEY_a, kKeyCodeKeyA,
+                               static_cast<GdkModifierType>(0), false));
+
+  GHashTable* pressedState =
+      fl_keyboard_manager_get_pressed_state(tester.manager());
+  EXPECT_EQ(g_hash_table_size(pressedState), 1u);
+
+  gpointer physical_key =
+      g_hash_table_lookup(pressedState, uint64_to_gpointer(kPhysicalKeyA));
+  EXPECT_EQ(gpointer_to_uint64(physical_key), kLogicalKeyA);
+}
+
+TEST(FlKeyboardPluginTest, KeyboardChannelGetPressedState) {
+  ::testing::NiceMock<flutter::testing::MockBinaryMessenger> messenger;
+
+  g_autoptr(FlKeyboardManager) manager = fl_keyboard_manager_new(
+      messenger, FL_KEYBOARD_VIEW_DELEGATE(fl_mock_view_delegate_new()));
+  EXPECT_NE(manager, nullptr);
+
+  g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
+  g_autoptr(GBytes) message = fl_method_codec_encode_method_call(
+      FL_METHOD_CODEC(codec), kGetKeyboardStateMethod, nullptr, nullptr);
+
+  g_autoptr(FlValue) response = fl_value_new_map();
+  fl_value_set_take(response, fl_value_new_int(kMockPhysicalKey),
+                    fl_value_new_int(kMockLogicalKey));
+  EXPECT_CALL(messenger,
+              fl_binary_messenger_send_response(
+                  ::testing::Eq<FlBinaryMessenger*>(messenger), ::testing::_,
+                  MethodSuccessResponse(response), ::testing::_))
+      .WillOnce(::testing::Return(true));
+
+  messenger.ReceiveMessage(kKeyboardChannelName, message);
+}
+
 // The following layout data is generated using DEBUG_PRINT_LAYOUT.
 
 const MockGroupLayoutData kLayoutUs0{{
diff --git a/shell/platform/linux/fl_keyboard_view_delegate.cc b/shell/platform/linux/fl_keyboard_view_delegate.cc
index b2a724acfa4150c282c2702480d761660df108e1..3c5fac95a8c4d2404f87847b3e1c5afc8d14b146 100644
--- a/shell/platform/linux/fl_keyboard_view_delegate.cc
+++ b/shell/platform/linux/fl_keyboard_view_delegate.cc
@@ -64,3 +64,10 @@ guint fl_keyboard_view_delegate_lookup_key(FlKeyboardViewDelegate* self,
 
   return FL_KEYBOARD_VIEW_DELEGATE_GET_IFACE(self)->lookup_key(self, key);
 }
+
+GHashTable* fl_keyboard_view_delegate_get_keyboard_state(
+    FlKeyboardViewDelegate* self) {
+  g_return_val_if_fail(FL_IS_KEYBOARD_VIEW_DELEGATE(self), nullptr);
+
+  return FL_KEYBOARD_VIEW_DELEGATE_GET_IFACE(self)->get_keyboard_state(self);
+}
diff --git a/shell/platform/linux/fl_keyboard_view_delegate.h b/shell/platform/linux/fl_keyboard_view_delegate.h
index 041cb0029e14306f741b157f05cd7acbe862b2b1..6d66b12ca35377b8630c60e13d021c409e2b2ed8 100644
--- a/shell/platform/linux/fl_keyboard_view_delegate.h
+++ b/shell/platform/linux/fl_keyboard_view_delegate.h
@@ -54,6 +54,8 @@ struct _FlKeyboardViewDelegateInterface {
 
   guint (*lookup_key)(FlKeyboardViewDelegate* view_delegate,
                       const GdkKeymapKey* key);
+
+  GHashTable* (*get_keyboard_state)(FlKeyboardViewDelegate* delegate);
 };
 
 /**
@@ -116,6 +118,16 @@ void fl_keyboard_view_delegate_subscribe_to_layout_change(
 guint fl_keyboard_view_delegate_lookup_key(FlKeyboardViewDelegate* delegate,
                                            const GdkKeymapKey* key);
 
+/**
+ * fl_keyboard_view_delegate_get_keyboard_state:
+ *
+ * Returns the keyboard pressed state. The hash table contains one entry per
+ * pressed keys, mapping from the logical key to the physical key.*
+ *
+ */
+GHashTable* fl_keyboard_view_delegate_get_keyboard_state(
+    FlKeyboardViewDelegate* delegate);
+
 G_END_DECLS
 
 #endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_KEYBOARD_VIEW_DELEGATE_H_
diff --git a/shell/platform/linux/fl_message_codec.cc b/shell/platform/linux/fl_message_codec.cc
index 5b4454f2acb25727ebbba21a9f146bb7a9c78bdf..38aa967f2fe3079e2d65858766a1f24df729b843 100644
--- a/shell/platform/linux/fl_message_codec.cc
+++ b/shell/platform/linux/fl_message_codec.cc
@@ -8,9 +8,6 @@
 
 G_DEFINE_QUARK(fl_message_codec_error_quark, fl_message_codec_error)
 
-// Added here to stop the compiler from optimizing this function away.
-G_MODULE_EXPORT GType fl_message_codec_get_type();
-
 G_DEFINE_TYPE(FlMessageCodec, fl_message_codec, G_TYPE_OBJECT)
 
 static void fl_message_codec_class_init(FlMessageCodecClass* klass) {}
diff --git a/shell/platform/linux/fl_method_call.cc b/shell/platform/linux/fl_method_call.cc
index 2bf9c28e7fa072618b53f1102bf73aa43a109327..35fcd24c57f45720b06f4ea9d44f06792a93f03e 100644
--- a/shell/platform/linux/fl_method_call.cc
+++ b/shell/platform/linux/fl_method_call.cc
@@ -122,8 +122,9 @@ G_MODULE_EXPORT gboolean fl_method_call_respond_error(FlMethodCall* self,
                                    response, error);
 }
 
-G_MODULE_EXPORT gboolean
-fl_method_call_respond_not_implemented(FlMethodCall* self, GError** error) {
+G_MODULE_EXPORT gboolean fl_method_call_respond_not_implemented(
+    FlMethodCall* self,
+    GError** error) {
   g_return_val_if_fail(FL_IS_METHOD_CALL(self), FALSE);
 
   g_autoptr(FlMethodResponse) response =
diff --git a/shell/platform/linux/fl_method_channel.cc b/shell/platform/linux/fl_method_channel.cc
index d4c45ed920a7c02f2d2430ef6f4256fe28c61a02..266bfa7d812d73dafccbcbe4b0de1ccb03473983 100644
--- a/shell/platform/linux/fl_method_channel.cc
+++ b/shell/platform/linux/fl_method_channel.cc
@@ -31,9 +31,6 @@ struct _FlMethodChannel {
   GDestroyNotify method_call_handler_destroy_notify;
 };
 
-// Added here to stop the compiler from optimizing this function away.
-G_MODULE_EXPORT GType fl_method_channel_get_type();
-
 G_DEFINE_TYPE(FlMethodChannel, fl_method_channel, G_TYPE_OBJECT)
 
 // Called when a binary message is received on this channel.
@@ -75,10 +72,6 @@ static void channel_closed_cb(gpointer user_data) {
   g_autoptr(FlMethodChannel) self = FL_METHOD_CHANNEL(user_data);
 
   self->channel_closed = TRUE;
-  // Clear the messenger so that disposing the channel will not clear the
-  // messenger's mapped channel, since `channel_closed_cb` means the messenger
-  // has abandoned this channel.
-  self->messenger = nullptr;
 
   // Disconnect handler.
   if (self->method_call_handler_destroy_notify != nullptr) {
@@ -92,10 +85,9 @@ static void channel_closed_cb(gpointer user_data) {
 static void fl_method_channel_dispose(GObject* object) {
   FlMethodChannel* self = FL_METHOD_CHANNEL(object);
 
-  if (self->messenger != nullptr) {
-    fl_binary_messenger_set_message_handler_on_channel(
-        self->messenger, self->name, nullptr, nullptr, nullptr);
-  }
+  // Note we don't have to clear the handler in messenger as it holds
+  // a reference to this object so the following code is only run after
+  // the messenger has closed the channel already.
 
   g_clear_object(&self->messenger);
   g_clear_pointer(&self->name, g_free);
diff --git a/shell/platform/linux/fl_method_channel_test.cc b/shell/platform/linux/fl_method_channel_test.cc
index 74b9294c60e0397748d53e7dce7f85280e259ccc..bcbaead6fb59a061909431070e1ed04b8ed5d695 100644
--- a/shell/platform/linux/fl_method_channel_test.cc
+++ b/shell/platform/linux/fl_method_channel_test.cc
@@ -14,7 +14,7 @@
 #include "flutter/shell/platform/linux/testing/fl_test.h"
 #include "flutter/shell/platform/linux/testing/mock_renderer.h"
 
-// Called when when the method call response is received in the InvokeMethod
+// Called when the method call response is received in the InvokeMethod
 // test.
 static void method_response_cb(GObject* object,
                                GAsyncResult* result,
@@ -53,7 +53,7 @@ TEST(FlMethodChannelTest, InvokeMethod) {
   g_main_loop_run(loop);
 }
 
-// Called when when the method call response is received in the
+// Called when the method call response is received in the
 // InvokeMethodNullptrArgsMessage test.
 static void nullptr_args_response_cb(GObject* object,
                                      GAsyncResult* result,
@@ -89,7 +89,7 @@ TEST(FlMethodChannelTest, InvokeMethodNullptrArgsMessage) {
   g_main_loop_run(loop);
 }
 
-// Called when when the method call response is received in the
+// Called when the method call response is received in the
 // InvokeMethodError test.
 static void error_response_cb(GObject* object,
                               GAsyncResult* result,
@@ -137,7 +137,7 @@ TEST(FlMethodChannelTest, InvokeMethodError) {
   g_main_loop_run(loop);
 }
 
-// Called when when the method call response is received in the
+// Called when the method call response is received in the
 // InvokeMethodNotImplemented test.
 static void not_implemented_response_cb(GObject* object,
                                         GAsyncResult* result,
@@ -170,7 +170,7 @@ TEST(FlMethodChannelTest, InvokeMethodNotImplemented) {
   g_main_loop_run(loop);
 }
 
-// Called when when the method call response is received in the
+// Called when the method call response is received in the
 // InvokeMethodFailure test.
 static void failure_response_cb(GObject* object,
                                 GAsyncResult* result,
diff --git a/shell/platform/linux/fl_method_codec.cc b/shell/platform/linux/fl_method_codec.cc
index 38cedb602d0c3e644b3c41473a535708e3eebccc..5b6d87c47a39af3580a9811929bbe12e5740f3d1 100644
--- a/shell/platform/linux/fl_method_codec.cc
+++ b/shell/platform/linux/fl_method_codec.cc
@@ -7,9 +7,6 @@
 
 #include <gmodule.h>
 
-// Added here to stop the compiler from optimizing this function away.
-G_MODULE_EXPORT GType fl_method_codec_get_type();
-
 G_DEFINE_TYPE(FlMethodCodec, fl_method_codec, G_TYPE_OBJECT)
 
 static void fl_method_codec_class_init(FlMethodCodecClass* klass) {}
diff --git a/shell/platform/linux/fl_method_response.cc b/shell/platform/linux/fl_method_response.cc
index 1c0483738f810e92aad1a897b60b8528f145fd4d..d970ffa127fa7c9e53df191b022b80a6d7a86a8c 100644
--- a/shell/platform/linux/fl_method_response.cc
+++ b/shell/platform/linux/fl_method_response.cc
@@ -26,12 +26,6 @@ struct _FlMethodNotImplementedResponse {
   FlMethodResponse parent_instance;
 };
 
-// Added here to stop the compiler from optimizing these functions away.
-G_MODULE_EXPORT GType fl_method_response_get_type();
-G_MODULE_EXPORT GType fl_method_success_response_get_type();
-G_MODULE_EXPORT GType fl_method_error_response_get_type();
-G_MODULE_EXPORT GType fl_method_not_implemented_response_get_type();
-
 G_DEFINE_TYPE(FlMethodResponse, fl_method_response, G_TYPE_OBJECT)
 G_DEFINE_TYPE(FlMethodSuccessResponse,
               fl_method_success_response,
diff --git a/shell/platform/linux/fl_mouse_cursor_plugin.h b/shell/platform/linux/fl_mouse_cursor_plugin.h
index 86a30feb6d21f75fffde85246194e3313974a00c..5962996f80d36585041ed9a4f1bbcafe9abfe2ee 100644
--- a/shell/platform/linux/fl_mouse_cursor_plugin.h
+++ b/shell/platform/linux/fl_mouse_cursor_plugin.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_MOUSE_CURSOR_LINUX_FL_MOUSE_CURSOR_PLUGIN_H_
-#define FLUTTER_SHELL_MOUSE_CURSOR_LINUX_FL_MOUSE_CURSOR_PLUGIN_H_
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_FL_MOUSE_CURSOR_PLUGIN_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_FL_MOUSE_CURSOR_PLUGIN_H_
 
 #include <gdk/gdk.h>
 
@@ -40,4 +40,4 @@ FlMouseCursorPlugin* fl_mouse_cursor_plugin_new(FlBinaryMessenger* messenger,
 
 G_END_DECLS
 
-#endif  // FLUTTER_SHELL_MOUSE_CURSOR_LINUX_FL_MOUSE_CURSOR_PLUGIN_H_
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_MOUSE_CURSOR_PLUGIN_H_
diff --git a/shell/platform/linux/fl_pixel_buffer_texture.cc b/shell/platform/linux/fl_pixel_buffer_texture.cc
index f0f75bef1146fa02dd620965c8b63016e835ab97..374368f039c09c54bfcf7f1b988beb82501818fa 100644
--- a/shell/platform/linux/fl_pixel_buffer_texture.cc
+++ b/shell/platform/linux/fl_pixel_buffer_texture.cc
@@ -10,13 +10,11 @@
 #include "flutter/shell/platform/linux/fl_pixel_buffer_texture_private.h"
 
 typedef struct {
+  int64_t id;
   GLuint texture_id;
 } FlPixelBufferTexturePrivate;
 
-// Added here to stop the compiler from optimising this function away.
-G_MODULE_EXPORT GType fl_pixel_buffer_texture_get_type();
-
-static void fl_pixel_buffer_texture_iface_init(FlTextureInterface* iface) {}
+static void fl_pixel_buffer_texture_iface_init(FlTextureInterface* iface);
 
 G_DEFINE_TYPE_WITH_CODE(
     FlPixelBufferTexture,
@@ -26,6 +24,29 @@ G_DEFINE_TYPE_WITH_CODE(
                           fl_pixel_buffer_texture_iface_init);
     G_ADD_PRIVATE(FlPixelBufferTexture))
 
+// Implements FlTexture::set_id
+static void fl_pixel_buffer_texture_set_id(FlTexture* texture, int64_t id) {
+  FlPixelBufferTexture* self = FL_PIXEL_BUFFER_TEXTURE(texture);
+  FlPixelBufferTexturePrivate* priv =
+      reinterpret_cast<FlPixelBufferTexturePrivate*>(
+          fl_pixel_buffer_texture_get_instance_private(self));
+  priv->id = id;
+}
+
+// Implements FlTexture::set_id
+static int64_t fl_pixel_buffer_texture_get_id(FlTexture* texture) {
+  FlPixelBufferTexture* self = FL_PIXEL_BUFFER_TEXTURE(texture);
+  FlPixelBufferTexturePrivate* priv =
+      reinterpret_cast<FlPixelBufferTexturePrivate*>(
+          fl_pixel_buffer_texture_get_instance_private(self));
+  return priv->id;
+}
+
+static void fl_pixel_buffer_texture_iface_init(FlTextureInterface* iface) {
+  iface->set_id = fl_pixel_buffer_texture_set_id;
+  iface->get_id = fl_pixel_buffer_texture_get_id;
+}
+
 static void fl_pixel_buffer_texture_dispose(GObject* object) {
   FlPixelBufferTexture* self = FL_PIXEL_BUFFER_TEXTURE(object);
   FlPixelBufferTexturePrivate* priv =
diff --git a/shell/platform/linux/fl_pixel_buffer_texture_test.cc b/shell/platform/linux/fl_pixel_buffer_texture_test.cc
index c04c4fa66e93a9e61f33c4d13d21763ea8e843f0..5b32f5a58bcffb626c492d79930a8e690c81c6a5 100644
--- a/shell/platform/linux/fl_pixel_buffer_texture_test.cc
+++ b/shell/platform/linux/fl_pixel_buffer_texture_test.cc
@@ -68,10 +68,9 @@ static FlTestPixelBufferTexture* fl_test_pixel_buffer_texture_new() {
 
 // Test that getting the texture ID works.
 TEST(FlPixelBufferTextureTest, TextureID) {
-  // Texture ID is not assigned until the pixel buffer is copied once.
   g_autoptr(FlTexture) texture = FL_TEXTURE(fl_test_pixel_buffer_texture_new());
-  EXPECT_EQ(fl_texture_get_texture_id(texture),
-            reinterpret_cast<int64_t>(texture));
+  fl_texture_set_id(texture, 42);
+  EXPECT_EQ(fl_texture_get_id(texture), static_cast<int64_t>(42));
 }
 
 // Test that populating an OpenGL texture works.
diff --git a/shell/platform/linux/fl_platform_plugin.cc b/shell/platform/linux/fl_platform_plugin.cc
index 86fee31da8d79a76ae5251efcf9b1c6abba3c9ac..2f4beb4bfdb4d3b7fc904385b4bd4dc5bdd22e11 100644
--- a/shell/platform/linux/fl_platform_plugin.cc
+++ b/shell/platform/linux/fl_platform_plugin.cc
@@ -14,15 +14,27 @@ static constexpr char kChannelName[] = "flutter/platform";
 static constexpr char kBadArgumentsError[] = "Bad Arguments";
 static constexpr char kUnknownClipboardFormatError[] =
     "Unknown Clipboard Format";
-static constexpr char kFailedError[] = "Failed";
+static constexpr char kInProgressError[] = "In Progress";
 static constexpr char kGetClipboardDataMethod[] = "Clipboard.getData";
 static constexpr char kSetClipboardDataMethod[] = "Clipboard.setData";
 static constexpr char kClipboardHasStringsMethod[] = "Clipboard.hasStrings";
+static constexpr char kExitApplicationMethod[] = "System.exitApplication";
+static constexpr char kRequestAppExitMethod[] = "System.requestAppExit";
+static constexpr char kInitializationCompleteMethod[] =
+    "System.initializationComplete";
 static constexpr char kPlaySoundMethod[] = "SystemSound.play";
 static constexpr char kSystemNavigatorPopMethod[] = "SystemNavigator.pop";
 static constexpr char kTextKey[] = "text";
 static constexpr char kValueKey[] = "value";
 
+static constexpr char kExitTypeKey[] = "type";
+static constexpr char kExitTypeCancelable[] = "cancelable";
+static constexpr char kExitTypeRequired[] = "required";
+
+static constexpr char kExitResponseKey[] = "response";
+static constexpr char kExitResponseCancel[] = "cancel";
+static constexpr char kExitResponseExit[] = "exit";
+
 static constexpr char kTextPlainFormat[] = "text/plain";
 
 static constexpr char kSoundTypeAlert[] = "SystemSoundType.alert";
@@ -32,6 +44,9 @@ struct _FlPlatformPlugin {
   GObject parent_instance;
 
   FlMethodChannel* channel;
+  FlMethodCall* exit_application_method_call;
+  GCancellable* cancellable;
+  bool app_initialization_complete;
 };
 
 G_DEFINE_TYPE(FlPlatformPlugin, fl_platform_plugin, G_TYPE_OBJECT)
@@ -140,6 +155,168 @@ static FlMethodResponse* clipboard_has_strings_async(
   return nullptr;
 }
 
+// Get the exit response from a System.requestAppExit method call.
+static gchar* get_exit_response(FlMethodResponse* response) {
+  if (response == nullptr) {
+    return nullptr;
+  }
+
+  g_autoptr(GError) error = nullptr;
+  FlValue* result = fl_method_response_get_result(response, &error);
+  if (result == nullptr) {
+    g_warning("Error returned from System.requestAppExit: %s", error->message);
+    return nullptr;
+  }
+  if (fl_value_get_type(result) != FL_VALUE_TYPE_MAP) {
+    g_warning("System.requestAppExit result argument map missing or malformed");
+    return nullptr;
+  }
+
+  FlValue* response_value = fl_value_lookup_string(result, kExitResponseKey);
+  if (fl_value_get_type(response_value) != FL_VALUE_TYPE_STRING) {
+    g_warning("Invalid response from System.requestAppExit");
+    return nullptr;
+  }
+  return g_strdup(fl_value_get_string(response_value));
+}
+
+// Quit this application
+static void quit_application() {
+  GApplication* app = g_application_get_default();
+  if (app == nullptr) {
+    // Unable to gracefully quit, so just exit the process.
+    exit(0);
+  }
+
+  // GtkApplication windows contain a reference back to the application.
+  // Break them so the application object can cleanup.
+  // See https://gitlab.gnome.org/GNOME/gtk/-/issues/6190
+  if (GTK_IS_APPLICATION(app)) {
+    GList* windows = gtk_application_get_windows(GTK_APPLICATION(app));
+    for (GList* link = windows; link != NULL; link = link->next) {
+      GtkWidget* window = GTK_WIDGET(link->data);
+      gtk_window_set_application(GTK_WINDOW(window), NULL);
+    }
+  }
+
+  g_application_quit(app);
+}
+
+// Handle response of System.requestAppExit.
+static void request_app_exit_response_cb(GObject* object,
+                                         GAsyncResult* result,
+                                         gpointer user_data) {
+  FlPlatformPlugin* self = FL_PLATFORM_PLUGIN(user_data);
+
+  g_autoptr(GError) error = nullptr;
+  g_autoptr(FlMethodResponse) method_response =
+      fl_method_channel_invoke_method_finish(FL_METHOD_CHANNEL(object), result,
+                                             &error);
+  g_autofree gchar* exit_response = nullptr;
+  if (method_response == nullptr) {
+    if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+      return;
+    }
+    g_warning("Failed to complete System.requestAppExit: %s", error->message);
+  } else {
+    exit_response = get_exit_response(method_response);
+  }
+  // If something went wrong, then just exit.
+  if (exit_response == nullptr) {
+    exit_response = g_strdup(kExitResponseExit);
+  }
+
+  if (g_str_equal(exit_response, kExitResponseExit)) {
+    quit_application();
+  } else if (g_str_equal(exit_response, kExitResponseCancel)) {
+    // Canceled - no action to take.
+  }
+
+  // If request was due to a request from Flutter, pass result back.
+  if (self->exit_application_method_call != nullptr) {
+    g_autoptr(FlValue) exit_result = fl_value_new_map();
+    fl_value_set_string_take(exit_result, kExitResponseKey,
+                             fl_value_new_string(exit_response));
+    g_autoptr(FlMethodResponse) exit_response =
+        FL_METHOD_RESPONSE(fl_method_success_response_new(exit_result));
+    if (!fl_method_call_respond(self->exit_application_method_call,
+                                exit_response, &error)) {
+      g_warning("Failed to send response to System.exitApplication: %s",
+                error->message);
+    }
+    g_clear_object(&self->exit_application_method_call);
+  }
+}
+
+// Send a request to Flutter to exit the application, but only if it's ready for
+// a request.
+static void request_app_exit(FlPlatformPlugin* self, const char* type) {
+  g_autoptr(FlValue) args = fl_value_new_map();
+  if (!self->app_initialization_complete ||
+      g_str_equal(type, kExitTypeRequired)) {
+    quit_application();
+    return;
+  }
+
+  fl_value_set_string_take(args, kExitTypeKey, fl_value_new_string(type));
+  fl_method_channel_invoke_method(self->channel, kRequestAppExitMethod, args,
+                                  self->cancellable,
+                                  request_app_exit_response_cb, self);
+}
+
+// Called when the Dart app has finished initialization and is ready to handle
+// requests. For the Flutter framework, this means after the ServicesBinding has
+// been initialized and it sends a System.initializationComplete message.
+static FlMethodResponse* system_intitialization_complete(
+    FlPlatformPlugin* self,
+    FlMethodCall* method_call) {
+  self->app_initialization_complete = TRUE;
+  return FL_METHOD_RESPONSE(fl_method_success_response_new(nullptr));
+}
+
+// Called when Flutter wants to exit the application.
+static FlMethodResponse* system_exit_application(FlPlatformPlugin* self,
+                                                 FlMethodCall* method_call) {
+  FlValue* args = fl_method_call_get_args(method_call);
+  if (fl_value_get_type(args) != FL_VALUE_TYPE_MAP) {
+    return FL_METHOD_RESPONSE(fl_method_error_response_new(
+        kBadArgumentsError, "Argument map missing or malformed", nullptr));
+  }
+
+  FlValue* type_value = fl_value_lookup_string(args, kExitTypeKey);
+  if (type_value == nullptr ||
+      fl_value_get_type(type_value) != FL_VALUE_TYPE_STRING) {
+    return FL_METHOD_RESPONSE(fl_method_error_response_new(
+        kBadArgumentsError, "Missing type argument", nullptr));
+  }
+  const char* type = fl_value_get_string(type_value);
+
+  // Save method call to respond to when our request to Flutter completes.
+  if (self->exit_application_method_call != nullptr) {
+    return FL_METHOD_RESPONSE(fl_method_error_response_new(
+        kInProgressError, "Request already in progress", nullptr));
+  }
+  self->exit_application_method_call =
+      FL_METHOD_CALL(g_object_ref(method_call));
+
+  // Requested to immediately quit if the app hasn't yet signaled that it is
+  // ready to handle requests, or if the type of exit requested is "required".
+  if (!self->app_initialization_complete ||
+      g_str_equal(type, kExitTypeRequired)) {
+    quit_application();
+    g_autoptr(FlValue) exit_result = fl_value_new_map();
+    fl_value_set_string_take(exit_result, kExitResponseKey,
+                             fl_value_new_string(kExitResponseExit));
+    return FL_METHOD_RESPONSE(fl_method_success_response_new(exit_result));
+  }
+
+  // Send the request back to Flutter to follow the standard process.
+  request_app_exit(self, type);
+
+  // Will respond later.
+  return nullptr;
+}
+
 // Called when Flutter wants to play a sound.
 static FlMethodResponse* system_sound_play(FlPlatformPlugin* self,
                                            FlValue* args) {
@@ -160,19 +337,12 @@ static FlMethodResponse* system_sound_play(FlPlatformPlugin* self,
     g_warning("Ignoring unknown sound type %s in SystemSound.play.\n", type);
   }
 
-  return FL_METHOD_RESPONSE(fl_method_not_implemented_response_new());
+  return FL_METHOD_RESPONSE(fl_method_success_response_new(nullptr));
 }
 
 // Called when Flutter wants to quit the application.
 static FlMethodResponse* system_navigator_pop(FlPlatformPlugin* self) {
-  GApplication* app = g_application_get_default();
-  if (app == nullptr) {
-    return FL_METHOD_RESPONSE(fl_method_error_response_new(
-        kFailedError, "Unable to get GApplication", nullptr));
-  }
-
-  g_application_quit(app);
-
+  quit_application();
   return FL_METHOD_RESPONSE(fl_method_success_response_new(nullptr));
 }
 
@@ -192,6 +362,10 @@ static void method_call_cb(FlMethodChannel* channel,
     response = clipboard_get_data_async(self, method_call);
   } else if (strcmp(method, kClipboardHasStringsMethod) == 0) {
     response = clipboard_has_strings_async(self, method_call);
+  } else if (strcmp(method, kExitApplicationMethod) == 0) {
+    response = system_exit_application(self, method_call);
+  } else if (strcmp(method, kInitializationCompleteMethod) == 0) {
+    response = system_intitialization_complete(self, method_call);
   } else if (strcmp(method, kPlaySoundMethod) == 0) {
     response = system_sound_play(self, args);
   } else if (strcmp(method, kSystemNavigatorPopMethod) == 0) {
@@ -208,7 +382,11 @@ static void method_call_cb(FlMethodChannel* channel,
 static void fl_platform_plugin_dispose(GObject* object) {
   FlPlatformPlugin* self = FL_PLATFORM_PLUGIN(object);
 
+  g_cancellable_cancel(self->cancellable);
+
   g_clear_object(&self->channel);
+  g_clear_object(&self->exit_application_method_call);
+  g_clear_object(&self->cancellable);
 
   G_OBJECT_CLASS(fl_platform_plugin_parent_class)->dispose(object);
 }
@@ -217,7 +395,9 @@ static void fl_platform_plugin_class_init(FlPlatformPluginClass* klass) {
   G_OBJECT_CLASS(klass)->dispose = fl_platform_plugin_dispose;
 }
 
-static void fl_platform_plugin_init(FlPlatformPlugin* self) {}
+static void fl_platform_plugin_init(FlPlatformPlugin* self) {
+  self->cancellable = g_cancellable_new();
+}
 
 FlPlatformPlugin* fl_platform_plugin_new(FlBinaryMessenger* messenger) {
   g_return_val_if_fail(FL_IS_BINARY_MESSENGER(messenger), nullptr);
@@ -230,6 +410,13 @@ FlPlatformPlugin* fl_platform_plugin_new(FlBinaryMessenger* messenger) {
       fl_method_channel_new(messenger, kChannelName, FL_METHOD_CODEC(codec));
   fl_method_channel_set_method_call_handler(self->channel, method_call_cb, self,
                                             nullptr);
+  self->app_initialization_complete = FALSE;
 
   return self;
 }
+
+void fl_platform_plugin_request_app_exit(FlPlatformPlugin* self) {
+  g_return_if_fail(FL_IS_PLATFORM_PLUGIN(self));
+  // Request a cancellable exit.
+  request_app_exit(self, kExitTypeCancelable);
+}
diff --git a/shell/platform/linux/fl_platform_plugin.h b/shell/platform/linux/fl_platform_plugin.h
index 72f91ea268f0fef23d1f0e96fcf5a91a1bd7c9f1..573becb44a66039771410be52864978d6f2c141c 100644
--- a/shell/platform/linux/fl_platform_plugin.h
+++ b/shell/platform/linux/fl_platform_plugin.h
@@ -33,6 +33,20 @@ G_DECLARE_FINAL_TYPE(FlPlatformPlugin,
  */
 FlPlatformPlugin* fl_platform_plugin_new(FlBinaryMessenger* messenger);
 
+/**
+ * fl_platform_plugin_request_app_exit:
+ * @plugin: an #FlPlatformPlugin
+ *
+ * Request the application exits (i.e. due to the window being requested to be
+ * closed).
+ *
+ * Calling this will only send an exit request to the framework if the framework
+ * has already indicated that it is ready to receive requests by sending a
+ * "System.initializationComplete" method call on the platform channel. Calls
+ * before initialization is complete will result in an immediate exit.
+ */
+void fl_platform_plugin_request_app_exit(FlPlatformPlugin* plugin);
+
 G_END_DECLS
 
 #endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_PLATFORM_PLUGIN_H_
diff --git a/shell/platform/linux/fl_platform_plugin_test.cc b/shell/platform/linux/fl_platform_plugin_test.cc
new file mode 100644
index 0000000000000000000000000000000000000000..e5fe1d7963bb67b2c56ffb423385809823ed0d0d
--- /dev/null
+++ b/shell/platform/linux/fl_platform_plugin_test.cc
@@ -0,0 +1,241 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <gtk/gtk.h>
+
+#include "flutter/shell/platform/linux/fl_binary_messenger_private.h"
+#include "flutter/shell/platform/linux/fl_method_codec_private.h"
+#include "flutter/shell/platform/linux/fl_platform_plugin.h"
+#include "flutter/shell/platform/linux/public/flutter_linux/fl_json_method_codec.h"
+#include "flutter/shell/platform/linux/public/flutter_linux/fl_method_codec.h"
+#include "flutter/shell/platform/linux/testing/fl_test.h"
+#include "flutter/shell/platform/linux/testing/mock_binary_messenger.h"
+#include "flutter/testing/testing.h"
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+MATCHER_P(SuccessResponse, result, "") {
+  g_autoptr(FlJsonMethodCodec) codec = fl_json_method_codec_new();
+  g_autoptr(FlMethodResponse) response =
+      fl_method_codec_decode_response(FL_METHOD_CODEC(codec), arg, nullptr);
+  if (fl_value_equal(fl_method_response_get_result(response, nullptr),
+                     result)) {
+    return true;
+  }
+  *result_listener << ::testing::PrintToString(response);
+  return false;
+}
+
+class MethodCallMatcher {
+ public:
+  using is_gtest_matcher = void;
+
+  explicit MethodCallMatcher(::testing::Matcher<std::string> name,
+                             ::testing::Matcher<FlValue*> args)
+      : name_(std::move(name)), args_(std::move(args)) {}
+
+  bool MatchAndExplain(GBytes* method_call,
+                       ::testing::MatchResultListener* result_listener) const {
+    g_autoptr(FlJsonMethodCodec) codec = fl_json_method_codec_new();
+    g_autoptr(GError) error = nullptr;
+    g_autofree gchar* name = nullptr;
+    g_autoptr(FlValue) args = nullptr;
+    gboolean result = fl_method_codec_decode_method_call(
+        FL_METHOD_CODEC(codec), method_call, &name, &args, &error);
+    if (!result) {
+      *result_listener << ::testing::PrintToString(error->message);
+      return false;
+    }
+    if (!name_.MatchAndExplain(name, result_listener)) {
+      *result_listener << " where the name doesn't match: \"" << name << "\"";
+      return false;
+    }
+    if (!args_.MatchAndExplain(args, result_listener)) {
+      *result_listener << " where the args don't match: "
+                       << ::testing::PrintToString(args);
+      return false;
+    }
+    return true;
+  }
+
+  void DescribeTo(std::ostream* os) const {
+    *os << "method name ";
+    name_.DescribeTo(os);
+    *os << " and args ";
+    args_.DescribeTo(os);
+  }
+
+  void DescribeNegationTo(std::ostream* os) const {
+    *os << "method name ";
+    name_.DescribeNegationTo(os);
+    *os << " or args ";
+    args_.DescribeNegationTo(os);
+  }
+
+ private:
+  ::testing::Matcher<std::string> name_;
+  ::testing::Matcher<FlValue*> args_;
+};
+
+static ::testing::Matcher<GBytes*> MethodCall(
+    const std::string& name,
+    ::testing::Matcher<FlValue*> args) {
+  return MethodCallMatcher(::testing::StrEq(name), std::move(args));
+}
+
+MATCHER_P(FlValueEq, value, "equal to " + ::testing::PrintToString(value)) {
+  return fl_value_equal(arg, value);
+}
+
+G_DECLARE_FINAL_TYPE(FlTestApplication,
+                     fl_test_application,
+                     FL,
+                     TEST_APPLICATION,
+                     GtkApplication)
+
+struct _FlTestApplication {
+  GtkApplication parent_instance;
+  gboolean* dispose_called;
+};
+
+G_DEFINE_TYPE(FlTestApplication,
+              fl_test_application,
+              gtk_application_get_type())
+
+static void fl_test_application_startup(GApplication* application) {
+  G_APPLICATION_CLASS(fl_test_application_parent_class)->startup(application);
+
+  // Add a window to this application, which will hold a reference to the
+  // application and stop it disposing. See
+  // https://gitlab.gnome.org/GNOME/gtk/-/issues/6190
+  gtk_application_window_new(GTK_APPLICATION(application));
+}
+
+static void fl_test_application_activate(GApplication* application) {
+  G_APPLICATION_CLASS(fl_test_application_parent_class)->activate(application);
+
+  ::testing::NiceMock<flutter::testing::MockBinaryMessenger> messenger;
+  g_autoptr(FlPlatformPlugin) plugin = fl_platform_plugin_new(messenger);
+  EXPECT_NE(plugin, nullptr);
+  g_autoptr(FlJsonMethodCodec) codec = fl_json_method_codec_new();
+
+  g_autoptr(FlValue) exit_result = fl_value_new_map();
+  fl_value_set_string_take(exit_result, "response",
+                           fl_value_new_string("exit"));
+  EXPECT_CALL(messenger,
+              fl_binary_messenger_send_response(
+                  ::testing::Eq<FlBinaryMessenger*>(messenger), ::testing::_,
+                  SuccessResponse(exit_result), ::testing::_))
+      .WillOnce(::testing::Return(true));
+
+  // Request app exit.
+  g_autoptr(FlValue) args = fl_value_new_map();
+  fl_value_set_string_take(args, "type", fl_value_new_string("required"));
+  g_autoptr(GBytes) message = fl_method_codec_encode_method_call(
+      FL_METHOD_CODEC(codec), "System.exitApplication", args, nullptr);
+  messenger.ReceiveMessage("flutter/platform", message);
+}
+
+static void fl_test_application_dispose(GObject* object) {
+  FlTestApplication* self = FL_TEST_APPLICATION(object);
+
+  *self->dispose_called = true;
+
+  G_OBJECT_CLASS(fl_test_application_parent_class)->dispose(object);
+}
+
+static void fl_test_application_class_init(FlTestApplicationClass* klass) {
+  G_OBJECT_CLASS(klass)->dispose = fl_test_application_dispose;
+  G_APPLICATION_CLASS(klass)->startup = fl_test_application_startup;
+  G_APPLICATION_CLASS(klass)->activate = fl_test_application_activate;
+}
+
+static void fl_test_application_init(FlTestApplication* self) {}
+
+FlTestApplication* fl_test_application_new(gboolean* dispose_called) {
+  FlTestApplication* self = FL_TEST_APPLICATION(
+      g_object_new(fl_test_application_get_type(), nullptr));
+
+  // Don't try and register on D-Bus.
+  g_application_set_application_id(G_APPLICATION(self), "dev.flutter.GtkTest");
+  g_application_set_flags(G_APPLICATION(self), G_APPLICATION_NON_UNIQUE);
+
+  // Added to stop compiler complaining about an unused function.
+  FL_IS_TEST_APPLICATION(self);
+
+  self->dispose_called = dispose_called;
+
+  return self;
+}
+
+TEST(FlPlatformPluginTest, PlaySound) {
+  ::testing::NiceMock<flutter::testing::MockBinaryMessenger> messenger;
+
+  g_autoptr(FlPlatformPlugin) plugin = fl_platform_plugin_new(messenger);
+  EXPECT_NE(plugin, nullptr);
+
+  g_autoptr(FlValue) args = fl_value_new_string("SystemSoundType.alert");
+  g_autoptr(FlJsonMethodCodec) codec = fl_json_method_codec_new();
+  g_autoptr(GBytes) message = fl_method_codec_encode_method_call(
+      FL_METHOD_CODEC(codec), "SystemSound.play", args, nullptr);
+
+  g_autoptr(FlValue) null = fl_value_new_null();
+  EXPECT_CALL(messenger, fl_binary_messenger_send_response(
+                             ::testing::Eq<FlBinaryMessenger*>(messenger),
+                             ::testing::_, SuccessResponse(null), ::testing::_))
+      .WillOnce(::testing::Return(true));
+
+  messenger.ReceiveMessage("flutter/platform", message);
+}
+
+TEST(FlPlatformPluginTest, ExitApplication) {
+  ::testing::NiceMock<flutter::testing::MockBinaryMessenger> messenger;
+
+  g_autoptr(FlPlatformPlugin) plugin = fl_platform_plugin_new(messenger);
+  EXPECT_NE(plugin, nullptr);
+  g_autoptr(FlJsonMethodCodec) codec = fl_json_method_codec_new();
+
+  g_autoptr(FlValue) null = fl_value_new_null();
+  ON_CALL(messenger, fl_binary_messenger_send_response(
+                         ::testing::Eq<FlBinaryMessenger*>(messenger),
+                         ::testing::_, SuccessResponse(null), ::testing::_))
+      .WillByDefault(testing::Return(TRUE));
+
+  // Indicate that the binding is initialized.
+  g_autoptr(GError) error = nullptr;
+  g_autoptr(GBytes) init_message = fl_method_codec_encode_method_call(
+      FL_METHOD_CODEC(codec), "System.initializationComplete", nullptr, &error);
+  messenger.ReceiveMessage("flutter/platform", init_message);
+
+  g_autoptr(FlValue) request_args = fl_value_new_map();
+  fl_value_set_string_take(request_args, "type",
+                           fl_value_new_string("cancelable"));
+  EXPECT_CALL(messenger,
+              fl_binary_messenger_send_on_channel(
+                  ::testing::Eq<FlBinaryMessenger*>(messenger),
+                  ::testing::StrEq("flutter/platform"),
+                  MethodCall("System.requestAppExit", FlValueEq(request_args)),
+                  ::testing::_, ::testing::_, ::testing::_));
+
+  g_autoptr(FlValue) args = fl_value_new_map();
+  fl_value_set_string_take(args, "type", fl_value_new_string("cancelable"));
+  g_autoptr(GBytes) message = fl_method_codec_encode_method_call(
+      FL_METHOD_CODEC(codec), "System.exitApplication", args, nullptr);
+  messenger.ReceiveMessage("flutter/platform", message);
+}
+
+TEST(FlPlatformPluginTest, ExitApplicationDispose) {
+  gtk_init(0, nullptr);
+
+  gboolean dispose_called = false;
+  FlTestApplication* application = fl_test_application_new(&dispose_called);
+
+  // Run the application, it will quit after startup.
+  g_application_run(G_APPLICATION(application), 0, nullptr);
+
+  EXPECT_FALSE(dispose_called);
+  g_object_unref(application);
+  EXPECT_TRUE(dispose_called);
+}
diff --git a/shell/platform/linux/fl_plugin_registrar.cc b/shell/platform/linux/fl_plugin_registrar.cc
index c2b83fb6bfb57185aa88295a56fbcf05eff2aa9b..403af32aa706a4d9709a418b6f16a0e323e0f3ca 100644
--- a/shell/platform/linux/fl_plugin_registrar.cc
+++ b/shell/platform/linux/fl_plugin_registrar.cc
@@ -26,9 +26,6 @@ struct _FlPluginRegistrarImpl {
   FlTextureRegistrar* texture_registrar;
 };
 
-// Added here to stop the compiler from optimizing this function away.
-G_MODULE_EXPORT GType fl_plugin_registrar_get_type();
-
 static void fl_plugin_registrar_impl_iface_init(
     FlPluginRegistrarInterface* iface);
 
diff --git a/shell/platform/linux/fl_plugin_registry.cc b/shell/platform/linux/fl_plugin_registry.cc
index 0d0ece40e8a63a6195150dec049db89eb0b191a0..18017904e40eb9cdc694732182ff5fbf165bc096 100644
--- a/shell/platform/linux/fl_plugin_registry.cc
+++ b/shell/platform/linux/fl_plugin_registry.cc
@@ -6,9 +6,6 @@
 
 #include <gmodule.h>
 
-// Added here to stop the compiler from optimizing this function away.
-G_MODULE_EXPORT GType fl_plugin_registry_get_type();
-
 G_DEFINE_INTERFACE(FlPluginRegistry, fl_plugin_registry, G_TYPE_OBJECT)
 
 void fl_plugin_registry_default_init(FlPluginRegistryInterface* self) {}
diff --git a/shell/platform/linux/fl_renderer.cc b/shell/platform/linux/fl_renderer.cc
index f32215dd38ecc24893c8dccb2f0b2fc3fea00da4..c6d20f5a1f308033bc37d77990a6805bc1d77eb9 100644
--- a/shell/platform/linux/fl_renderer.cc
+++ b/shell/platform/linux/fl_renderer.cc
@@ -10,6 +10,27 @@
 #include "flutter/shell/platform/embedder/embedder.h"
 #include "flutter/shell/platform/linux/fl_backing_store_provider.h"
 #include "flutter/shell/platform/linux/fl_engine_private.h"
+#include "flutter/shell/platform/linux/fl_view_private.h"
+
+// Vertex shader to draw Flutter window contents.
+static const char* vertex_shader_src =
+    "attribute vec2 position;\n"
+    "attribute vec2 in_texcoord;\n"
+    "varying vec2 texcoord;\n"
+    "\n"
+    "void main() {\n"
+    "  gl_Position = vec4(position, 0, 1);\n"
+    "  texcoord = in_texcoord;\n"
+    "}\n";
+
+// Fragment shader to draw Flutter window contents.
+static const char* fragment_shader_src =
+    "uniform sampler2D texture;\n"
+    "varying vec2 texcoord;\n"
+    "\n"
+    "void main() {\n"
+    "  gl_FragColor = texture2D(texture, texcoord);\n"
+    "}\n";
 
 G_DEFINE_QUARK(fl_renderer_error_quark, fl_renderer_error)
 
@@ -27,12 +48,46 @@ typedef struct {
   // was rendered
   bool had_first_frame;
 
-  GdkGLContext* main_context;
-  GdkGLContext* resource_context;
+  // Shader program.
+  GLuint program;
+
+  // Textures to render.
+  GPtrArray* textures;
 } FlRendererPrivate;
 
 G_DEFINE_TYPE_WITH_PRIVATE(FlRenderer, fl_renderer, G_TYPE_OBJECT)
 
+// Returns the log for the given OpenGL shader. Must be freed by the caller.
+static gchar* get_shader_log(GLuint shader) {
+  int log_length;
+  gchar* log;
+
+  glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &log_length);
+
+  log = static_cast<gchar*>(g_malloc(log_length + 1));
+  glGetShaderInfoLog(shader, log_length, nullptr, log);
+
+  return log;
+}
+
+// Returns the log for the given OpenGL program. Must be freed by the caller.
+static gchar* get_program_log(GLuint program) {
+  int log_length;
+  gchar* log;
+
+  glGetProgramiv(program, GL_INFO_LOG_LENGTH, &log_length);
+
+  log = static_cast<gchar*>(g_malloc(log_length + 1));
+  glGetProgramInfoLog(program, log_length, nullptr, log);
+
+  return log;
+}
+
+/// Converts a pixel co-ordinate from 0..pixels to OpenGL -1..1.
+static GLfloat pixels_to_gl_coords(GLfloat position, GLfloat pixels) {
+  return (2.0 * position / pixels) - 1.0;
+}
+
 static void fl_renderer_unblock_main_thread(FlRenderer* self) {
   FlRendererPrivate* priv = reinterpret_cast<FlRendererPrivate*>(
       fl_renderer_get_instance_private(self));
@@ -45,96 +100,103 @@ static void fl_renderer_unblock_main_thread(FlRenderer* self) {
   }
 }
 
-static void fl_renderer_dispose(GObject* self) {
-  fl_renderer_unblock_main_thread(FL_RENDERER(self));
-  G_OBJECT_CLASS(fl_renderer_parent_class)->dispose(self);
+static void fl_renderer_dispose(GObject* object) {
+  FlRenderer* self = FL_RENDERER(object);
+  FlRendererPrivate* priv = reinterpret_cast<FlRendererPrivate*>(
+      fl_renderer_get_instance_private(self));
+
+  fl_renderer_unblock_main_thread(self);
+
+  g_clear_pointer(&priv->textures, g_ptr_array_unref);
+
+  G_OBJECT_CLASS(fl_renderer_parent_class)->dispose(object);
 }
 
 static void fl_renderer_class_init(FlRendererClass* klass) {
   G_OBJECT_CLASS(klass)->dispose = fl_renderer_dispose;
 }
 
-static void fl_renderer_init(FlRenderer* self) {}
-
-gboolean fl_renderer_start(FlRenderer* self, FlView* view, GError** error) {
-  g_return_val_if_fail(FL_IS_RENDERER(self), FALSE);
+static void fl_renderer_init(FlRenderer* self) {
   FlRendererPrivate* priv = reinterpret_cast<FlRendererPrivate*>(
       fl_renderer_get_instance_private(self));
-  priv->view = view;
-  gboolean result = FL_RENDERER_GET_CLASS(self)->create_contexts(
-      self, GTK_WIDGET(view), &priv->main_context, &priv->resource_context,
-      error);
-
-  if (result) {
-    gdk_gl_context_realize(priv->main_context, error);
-    gdk_gl_context_realize(priv->resource_context, error);
-  }
-
-  if (*error != nullptr) {
-    return FALSE;
-  }
-  return TRUE;
+  priv->textures = g_ptr_array_new_with_free_func(g_object_unref);
 }
 
-FlView* fl_renderer_get_view(FlRenderer* self) {
+gboolean fl_renderer_start(FlRenderer* self, FlView* view) {
   FlRendererPrivate* priv = reinterpret_cast<FlRendererPrivate*>(
       fl_renderer_get_instance_private(self));
-  return priv->view;
-}
 
-GdkGLContext* fl_renderer_get_context(FlRenderer* self) {
-  FlRendererPrivate* priv = reinterpret_cast<FlRendererPrivate*>(
-      fl_renderer_get_instance_private(self));
-  return priv->main_context;
+  g_return_val_if_fail(FL_IS_RENDERER(self), FALSE);
+
+  priv->view = view;
+  return TRUE;
 }
 
 void* fl_renderer_get_proc_address(FlRenderer* self, const char* name) {
+  g_return_val_if_fail(FL_IS_RENDERER(self), NULL);
+
   return reinterpret_cast<void*>(eglGetProcAddress(name));
 }
 
-gboolean fl_renderer_make_current(FlRenderer* self, GError** error) {
-  FlRendererPrivate* priv = reinterpret_cast<FlRendererPrivate*>(
-      fl_renderer_get_instance_private(self));
-  if (priv->main_context) {
-    gdk_gl_context_make_current(priv->main_context);
-  }
-
-  return TRUE;
+void fl_renderer_make_current(FlRenderer* self) {
+  g_return_if_fail(FL_IS_RENDERER(self));
+  FL_RENDERER_GET_CLASS(self)->make_current(self);
 }
 
-gboolean fl_renderer_make_resource_current(FlRenderer* self, GError** error) {
-  FlRendererPrivate* priv = reinterpret_cast<FlRendererPrivate*>(
-      fl_renderer_get_instance_private(self));
-  if (priv->resource_context) {
-    gdk_gl_context_make_current(priv->resource_context);
-  }
-
-  return TRUE;
+void fl_renderer_make_resource_current(FlRenderer* self) {
+  g_return_if_fail(FL_IS_RENDERER(self));
+  FL_RENDERER_GET_CLASS(self)->make_resource_current(self);
 }
 
-gboolean fl_renderer_clear_current(FlRenderer* self, GError** error) {
-  gdk_gl_context_clear_current();
-  return TRUE;
+void fl_renderer_clear_current(FlRenderer* self) {
+  g_return_if_fail(FL_IS_RENDERER(self));
+  FL_RENDERER_GET_CLASS(self)->clear_current(self);
 }
 
 guint32 fl_renderer_get_fbo(FlRenderer* self) {
+  g_return_val_if_fail(FL_IS_RENDERER(self), 0);
+
   // There is only one frame buffer object - always return that.
   return 0;
 }
 
 gboolean fl_renderer_create_backing_store(
-    FlRenderer* self,
+    FlRenderer* renderer,
     const FlutterBackingStoreConfig* config,
     FlutterBackingStore* backing_store_out) {
-  return FL_RENDERER_GET_CLASS(self)->create_backing_store(self, config,
-                                                           backing_store_out);
+  fl_renderer_make_current(renderer);
+
+  FlBackingStoreProvider* provider =
+      fl_backing_store_provider_new(config->size.width, config->size.height);
+  if (!provider) {
+    g_warning("Failed to create backing store");
+    return FALSE;
+  }
+
+  uint32_t name = fl_backing_store_provider_get_gl_framebuffer_id(provider);
+  uint32_t format = fl_backing_store_provider_get_gl_format(provider);
+
+  backing_store_out->type = kFlutterBackingStoreTypeOpenGL;
+  backing_store_out->open_gl.type = kFlutterOpenGLTargetTypeFramebuffer;
+  backing_store_out->open_gl.framebuffer.user_data = provider;
+  backing_store_out->open_gl.framebuffer.name = name;
+  backing_store_out->open_gl.framebuffer.target = format;
+  backing_store_out->open_gl.framebuffer.destruction_callback = [](void* p) {
+    // Backing store destroyed in fl_renderer_collect_backing_store(), set
+    // on FlutterCompositor.collect_backing_store_callback during engine start.
+  };
+
+  return TRUE;
 }
 
 gboolean fl_renderer_collect_backing_store(
     FlRenderer* self,
     const FlutterBackingStore* backing_store) {
-  return FL_RENDERER_GET_CLASS(self)->collect_backing_store(self,
-                                                            backing_store);
+  fl_renderer_make_current(self);
+
+  // OpenGL context is required when destroying #FlBackingStoreProvider.
+  g_object_unref(backing_store->open_gl.framebuffer.user_data);
+  return TRUE;
 }
 
 void fl_renderer_wait_for_frame(FlRenderer* self,
@@ -143,6 +205,8 @@ void fl_renderer_wait_for_frame(FlRenderer* self,
   FlRendererPrivate* priv = reinterpret_cast<FlRendererPrivate*>(
       fl_renderer_get_instance_private(self));
 
+  g_return_if_fail(FL_IS_RENDERER(self));
+
   priv->target_width = target_width;
   priv->target_height = target_height;
 
@@ -160,6 +224,8 @@ gboolean fl_renderer_present_layers(FlRenderer* self,
   FlRendererPrivate* priv = reinterpret_cast<FlRendererPrivate*>(
       fl_renderer_get_instance_private(self));
 
+  g_return_val_if_fail(FL_IS_RENDERER(self), FALSE);
+
   // ignore incoming frame with wrong dimensions in trivial case with just one
   // layer
   if (priv->blocking_main_thread && layers_count == 1 &&
@@ -173,6 +239,138 @@ gboolean fl_renderer_present_layers(FlRenderer* self,
 
   fl_renderer_unblock_main_thread(self);
 
-  return FL_RENDERER_GET_CLASS(self)->present_layers(self, layers,
-                                                     layers_count);
+  if (!priv->view) {
+    return FALSE;
+  }
+
+  g_ptr_array_set_size(priv->textures, 0);
+  for (size_t i = 0; i < layers_count; ++i) {
+    const FlutterLayer* layer = layers[i];
+    switch (layer->type) {
+      case kFlutterLayerContentTypeBackingStore: {
+        const FlutterBackingStore* backing_store = layer->backing_store;
+        auto framebuffer = &backing_store->open_gl.framebuffer;
+        FlBackingStoreProvider* provider =
+            FL_BACKING_STORE_PROVIDER(framebuffer->user_data);
+        g_ptr_array_add(priv->textures, g_object_ref(provider));
+      } break;
+      case kFlutterLayerContentTypePlatformView: {
+        // TODO(robert-ancell) Not implemented -
+        // https://github.com/flutter/flutter/issues/41724
+      } break;
+    }
+  }
+
+  fl_view_redraw(priv->view);
+
+  return TRUE;
+}
+
+void fl_renderer_setup(FlRenderer* self) {
+  FlRendererPrivate* priv = reinterpret_cast<FlRendererPrivate*>(
+      fl_renderer_get_instance_private(self));
+
+  g_return_if_fail(FL_IS_RENDERER(self));
+
+  GLuint vertex_shader = glCreateShader(GL_VERTEX_SHADER);
+  glShaderSource(vertex_shader, 1, &vertex_shader_src, nullptr);
+  glCompileShader(vertex_shader);
+  int vertex_compile_status;
+  glGetShaderiv(vertex_shader, GL_COMPILE_STATUS, &vertex_compile_status);
+  if (vertex_compile_status == GL_FALSE) {
+    g_autofree gchar* shader_log = get_shader_log(vertex_shader);
+    g_warning("Failed to compile vertex shader: %s", shader_log);
+  }
+
+  GLuint fragment_shader = glCreateShader(GL_FRAGMENT_SHADER);
+  glShaderSource(fragment_shader, 1, &fragment_shader_src, nullptr);
+  glCompileShader(fragment_shader);
+  int fragment_compile_status;
+  glGetShaderiv(fragment_shader, GL_COMPILE_STATUS, &fragment_compile_status);
+  if (fragment_compile_status == GL_FALSE) {
+    g_autofree gchar* shader_log = get_shader_log(fragment_shader);
+    g_warning("Failed to compile fragment shader: %s", shader_log);
+  }
+
+  priv->program = glCreateProgram();
+  glAttachShader(priv->program, vertex_shader);
+  glAttachShader(priv->program, fragment_shader);
+  glLinkProgram(priv->program);
+
+  int link_status;
+  glGetProgramiv(priv->program, GL_LINK_STATUS, &link_status);
+  if (link_status == GL_FALSE) {
+    g_autofree gchar* program_log = get_program_log(priv->program);
+    g_warning("Failed to link program: %s", program_log);
+  }
+
+  glDeleteShader(vertex_shader);
+  glDeleteShader(fragment_shader);
+}
+
+void fl_renderer_render(FlRenderer* self, int width, int height) {
+  FlRendererPrivate* priv = reinterpret_cast<FlRendererPrivate*>(
+      fl_renderer_get_instance_private(self));
+
+  g_return_if_fail(FL_IS_RENDERER(self));
+
+  glClearColor(0.0, 0.0, 0.0, 1.0);
+  glClear(GL_COLOR_BUFFER_BIT);
+
+  glUseProgram(priv->program);
+
+  for (guint i = 0; i < priv->textures->len; i++) {
+    FlBackingStoreProvider* texture =
+        FL_BACKING_STORE_PROVIDER(g_ptr_array_index(priv->textures, i));
+
+    uint32_t texture_id = fl_backing_store_provider_get_gl_texture_id(texture);
+    glBindTexture(GL_TEXTURE_2D, texture_id);
+
+    // Translate into OpenGL co-ordinates
+    GdkRectangle texture_geometry =
+        fl_backing_store_provider_get_geometry(texture);
+    GLfloat texture_x = texture_geometry.x;
+    GLfloat texture_y = texture_geometry.y;
+    GLfloat texture_width = texture_geometry.width;
+    GLfloat texture_height = texture_geometry.height;
+    GLfloat x0 = pixels_to_gl_coords(texture_x, width);
+    GLfloat y0 =
+        pixels_to_gl_coords(height - (texture_y + texture_height), height);
+    GLfloat x1 = pixels_to_gl_coords(texture_x + texture_width, width);
+    GLfloat y1 = pixels_to_gl_coords(height - texture_y, height);
+    GLfloat vertex_data[] = {x0, y0, 0, 0, x1, y1, 1, 1, x0, y1, 0, 1,
+                             x0, y0, 0, 0, x1, y0, 1, 0, x1, y1, 1, 1};
+
+    GLuint vao, vertex_buffer;
+    glGenVertexArrays(1, &vao);
+    glBindVertexArray(vao);
+    glGenBuffers(1, &vertex_buffer);
+    glBindBuffer(GL_ARRAY_BUFFER, vertex_buffer);
+    glBufferData(GL_ARRAY_BUFFER, sizeof(vertex_data), vertex_data,
+                 GL_STATIC_DRAW);
+    GLint position_index = glGetAttribLocation(priv->program, "position");
+    glEnableVertexAttribArray(position_index);
+    glVertexAttribPointer(position_index, 2, GL_FLOAT, GL_FALSE,
+                          sizeof(GLfloat) * 4, 0);
+    GLint texcoord_index = glGetAttribLocation(priv->program, "in_texcoord");
+    glEnableVertexAttribArray(texcoord_index);
+    glVertexAttribPointer(texcoord_index, 2, GL_FLOAT, GL_FALSE,
+                          sizeof(GLfloat) * 4, (void*)(sizeof(GLfloat) * 2));
+
+    glDrawArrays(GL_TRIANGLES, 0, 6);
+
+    glDeleteVertexArrays(1, &vao);
+    glDeleteBuffers(1, &vertex_buffer);
+  }
+
+  glFlush();
+}
+
+void fl_renderer_cleanup(FlRenderer* self) {
+  FlRendererPrivate* priv = reinterpret_cast<FlRendererPrivate*>(
+      fl_renderer_get_instance_private(self));
+
+  g_return_if_fail(FL_IS_RENDERER(self));
+
+  glDeleteProgram(priv->program);
 }
diff --git a/shell/platform/linux/fl_renderer.h b/shell/platform/linux/fl_renderer.h
index d5db38cd0b5beaf2e977bf8ef588a1f6cd000f5c..e2145fdbaed7bff8680205201ff28c9cade12d5b 100644
--- a/shell/platform/linux/fl_renderer.h
+++ b/shell/platform/linux/fl_renderer.h
@@ -20,7 +20,9 @@ G_BEGIN_DECLS
  */
 
 typedef enum {
+  // NOLINTBEGIN(readability-identifier-naming)
   FL_RENDERER_ERROR_FAILED,
+  // NOLINTEND(readability-identifier-naming)
 } FlRendererError;
 
 GQuark fl_renderer_error_quark(void) G_GNUC_CONST;
@@ -37,30 +39,24 @@ struct _FlRendererClass {
   GObjectClass parent_class;
 
   /**
-   * Virtual method called when Flutter needs #GdkGLContext to render.
+   * Virtual method called when Flutter needs to make the OpenGL context
+   * current.
    * @renderer: an #FlRenderer.
-   * @widget: the widget being rendered on.
-   * @visible: (out): the GL context for visible surface.
-   * @resource: (out): the GL context for resource loading.
-   * @error: (allow-none): #GError location to store the error occurring, or
-   * %NULL to ignore.
-   *
-   * Returns: %TRUE if both contexts were created, %FALSE if there was an error.
    */
-  gboolean (*create_contexts)(FlRenderer* renderer,
-                              GtkWidget* widget,
-                              GdkGLContext** visible,
-                              GdkGLContext** resource,
-                              GError** error);
+  void (*make_current)(FlRenderer* renderer);
 
   /**
-   * Virtual method called when Flutter needs OpenGL proc address.
+   * Virtual method called when Flutter needs to make the OpenGL resource
+   * context current.
+   * @renderer: an #FlRenderer.
+   */
+  void (*make_resource_current)(FlRenderer* renderer);
+
+  /**
+   * Virtual method called when Flutter needs to clear the OpenGL context.
    * @renderer: an #FlRenderer.
-   * @name: proc name.
-   *
-   * Returns: OpenGL proc address.
    */
-  void* (*get_proc_address)();
+  void (*clear_current)(FlRenderer* renderer);
 
   /**
    * Virtual method called when Flutter needs a backing store for a specific
@@ -84,49 +80,18 @@ struct _FlRendererClass {
    */
   gboolean (*collect_backing_store)(FlRenderer* renderer,
                                     const FlutterBackingStore* backing_store);
-
-  /**
-   * Virtual method called when Flutter wants to composite layers onto the
-   * screen.
-   * @renderer: an #FlRenderer.
-   * @layers: layers to be composited.
-   * @layers_count: number of layers.
-   *
-   * Returns %TRUE if successful.
-   */
-  gboolean (*present_layers)(FlRenderer* renderer,
-                             const FlutterLayer** layers,
-                             size_t layers_count);
 };
 
 /**
  * fl_renderer_start:
  * @renderer: an #FlRenderer.
  * @view: the view Flutter is renderering to.
- * @error: (allow-none): #GError location to store the error occurring, or %NULL
- * to ignore.
  *
  * Start the renderer.
  *
  * Returns: %TRUE if successfully started.
  */
-gboolean fl_renderer_start(FlRenderer* renderer, FlView* view, GError** error);
-
-/**
- * fl_renderer_get_view:
- * @renderer: an #FlRenderer.
- *
- * Returns: targeted #FlView or %NULL if headless.
- */
-FlView* fl_renderer_get_view(FlRenderer* renderer);
-
-/**
- * fl_renderer_get_context:
- * @renderer: an #FlRenderer.
- *
- * Returns: GL context for GLAreas or %NULL if headless.
- */
-GdkGLContext* fl_renderer_get_context(FlRenderer* renderer);
+gboolean fl_renderer_start(FlRenderer* renderer, FlView* view);
 
 /**
  * fl_renderer_get_proc_address:
@@ -142,39 +107,26 @@ void* fl_renderer_get_proc_address(FlRenderer* renderer, const char* name);
 /**
  * fl_renderer_make_current:
  * @renderer: an #FlRenderer.
- * @error: (allow-none): #GError location to store the error occurring, or %NULL
- * to ignore.
  *
  * Makes the rendering context current.
- *
- * Returns %TRUE if successful.
  */
-gboolean fl_renderer_make_current(FlRenderer* renderer, GError** error);
+void fl_renderer_make_current(FlRenderer* renderer);
 
 /**
  * fl_renderer_make_resource_current:
  * @renderer: an #FlRenderer.
- * @error: (allow-none): #GError location to store the error occurring, or %NULL
- * to ignore.
  *
  * Makes the resource rendering context current.
- *
- * Returns %TRUE if successful.
  */
-gboolean fl_renderer_make_resource_current(FlRenderer* renderer,
-                                           GError** error);
+void fl_renderer_make_resource_current(FlRenderer* renderer);
 
 /**
  * fl_renderer_clear_current:
  * @renderer: an #FlRenderer.
- * @error: (allow-none): #GError location to store the error occurring, or %NULL
- * to ignore.
  *
  * Clears the current rendering context.
- *
- * Returns %TRUE if successful.
  */
-gboolean fl_renderer_clear_current(FlRenderer* renderer, GError** error);
+void fl_renderer_clear_current(FlRenderer* renderer);
 
 /**
  * fl_renderer_get_fbo:
@@ -244,6 +196,33 @@ void fl_renderer_wait_for_frame(FlRenderer* renderer,
                                 int target_width,
                                 int target_height);
 
+/**
+ * fl_renderer_setup:
+ * @renderer: an #FlRenderer.
+ *
+ * Creates OpenGL resources required before rendering. Requires an active OpenGL
+ * context.
+ */
+void fl_renderer_setup(FlRenderer* renderer);
+
+/**
+ * fl_renderer_render:
+ * @renderer: an #FlRenderer.
+ * @width: width of the window in pixels.
+ * @height: height of the window in pixels.
+ *
+ * Performs OpenGL commands to render current Flutter view.
+ */
+void fl_renderer_render(FlRenderer* renderer, int width, int height);
+
+/**
+ * fl_renderer_cleanup:
+ *
+ * Removes OpenGL resources used for rendering. Requires an active OpenGL
+ * context.
+ */
+void fl_renderer_cleanup(FlRenderer* renderer);
+
 G_END_DECLS
 
 #endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_RENDERER_H_
diff --git a/shell/platform/linux/fl_renderer_gdk.cc b/shell/platform/linux/fl_renderer_gdk.cc
new file mode 100644
index 0000000000000000000000000000000000000000..f5d4990efcd82ad65503306db7b9c970473b9671
--- /dev/null
+++ b/shell/platform/linux/fl_renderer_gdk.cc
@@ -0,0 +1,89 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/platform/linux/fl_renderer_gdk.h"
+
+struct _FlRendererGdk {
+  FlRenderer parent_instance;
+
+  // Window being rendered on.
+  GdkWindow* window;
+
+  // Main OpenGL rendering context.
+  GdkGLContext* main_context;
+
+  // Secondary OpenGL rendering context.
+  GdkGLContext* resource_context;
+};
+
+G_DEFINE_TYPE(FlRendererGdk, fl_renderer_gdk, fl_renderer_get_type())
+
+// Implements FlRenderer::make_current.
+static void fl_renderer_gdk_make_current(FlRenderer* renderer) {
+  FlRendererGdk* self = FL_RENDERER_GDK(renderer);
+  gdk_gl_context_make_current(self->main_context);
+}
+
+// Implements FlRenderer::make_resource_current.
+static void fl_renderer_gdk_make_resource_current(FlRenderer* renderer) {
+  FlRendererGdk* self = FL_RENDERER_GDK(renderer);
+  gdk_gl_context_make_current(self->resource_context);
+}
+
+// Implements FlRenderer::clear_current.
+static void fl_renderer_gdk_clear_current(FlRenderer* renderer) {
+  gdk_gl_context_clear_current();
+}
+
+static void fl_renderer_gdk_dispose(GObject* object) {
+  FlRendererGdk* self = FL_RENDERER_GDK(object);
+
+  g_clear_object(&self->main_context);
+  g_clear_object(&self->resource_context);
+
+  G_OBJECT_CLASS(fl_renderer_gdk_parent_class)->dispose(object);
+}
+
+static void fl_renderer_gdk_class_init(FlRendererGdkClass* klass) {
+  G_OBJECT_CLASS(klass)->dispose = fl_renderer_gdk_dispose;
+
+  FL_RENDERER_CLASS(klass)->make_current = fl_renderer_gdk_make_current;
+  FL_RENDERER_CLASS(klass)->make_resource_current =
+      fl_renderer_gdk_make_resource_current;
+  FL_RENDERER_CLASS(klass)->clear_current = fl_renderer_gdk_clear_current;
+}
+
+static void fl_renderer_gdk_init(FlRendererGdk* self) {}
+
+FlRendererGdk* fl_renderer_gdk_new(GdkWindow* window) {
+  FlRendererGdk* self =
+      FL_RENDERER_GDK(g_object_new(fl_renderer_gdk_get_type(), nullptr));
+  self->window = window;
+  return self;
+}
+
+gboolean fl_renderer_gdk_create_contexts(FlRendererGdk* self, GError** error) {
+  self->main_context = gdk_window_create_gl_context(self->window, error);
+  if (self->main_context == nullptr) {
+    return FALSE;
+  }
+  if (!gdk_gl_context_realize(self->main_context, error)) {
+    return FALSE;
+  }
+
+  self->resource_context = gdk_window_create_gl_context(self->window, error);
+  if (self->resource_context == nullptr) {
+    return FALSE;
+  }
+  if (!gdk_gl_context_realize(self->resource_context, error)) {
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+GdkGLContext* fl_renderer_gdk_get_context(FlRendererGdk* self) {
+  g_return_val_if_fail(FL_IS_RENDERER_GDK(self), nullptr);
+  return self->main_context;
+}
diff --git a/shell/platform/linux/fl_renderer_gdk.h b/shell/platform/linux/fl_renderer_gdk.h
new file mode 100644
index 0000000000000000000000000000000000000000..e2b3f7bb1f96184f07c91413d8d563462468647b
--- /dev/null
+++ b/shell/platform/linux/fl_renderer_gdk.h
@@ -0,0 +1,57 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_FL_RENDERER_GDK_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_FL_RENDERER_GDK_H_
+
+#include "flutter/shell/platform/linux/fl_renderer.h"
+
+G_BEGIN_DECLS
+
+G_DECLARE_FINAL_TYPE(FlRendererGdk,
+                     fl_renderer_gdk,
+                     FL,
+                     RENDERER_GDK,
+                     FlRenderer)
+
+/**
+ * FlRendererGdk:
+ *
+ * #FlRendererGdk is an implementation of #FlRenderer that renders by OpenGL ES.
+ */
+
+/**
+ * fl_renderer_gdk_new:
+ * @window: the window that is being rendered on.
+ *
+ * Creates an object that allows Flutter to render by OpenGL ES.
+ *
+ * Returns: a new #FlRendererGdk.
+ */
+FlRendererGdk* fl_renderer_gdk_new(GdkWindow* window);
+
+/**
+ * fl_renderer_gdk_create_contexts:
+ * @renderer: an #FlRendererGdk.
+ * @error: (allow-none): #GError location to store the error occurring, or
+ * %NULL to ignore.
+ *
+ * Create rendering contexts.
+ *
+ * Returns: %TRUE if contexts were created, %FALSE if there was an error.
+ */
+gboolean fl_renderer_gdk_create_contexts(FlRendererGdk* renderer,
+                                         GError** error);
+
+/**
+ * fl_renderer_gdk_get_context:
+ * @renderer: an #FlRendererGdk.
+ *
+ * Returns: the main context used for rendering.
+ */
+GdkGLContext* fl_renderer_gdk_get_context(FlRendererGdk* renderer);
+
+G_END_DECLS
+
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_RENDERER_GDK_H_
diff --git a/shell/platform/linux/fl_renderer_gl.cc b/shell/platform/linux/fl_renderer_gl.cc
deleted file mode 100644
index ec44b9b2dc5b87d69717a79b5905119d7fb01edd..0000000000000000000000000000000000000000
--- a/shell/platform/linux/fl_renderer_gl.cc
+++ /dev/null
@@ -1,136 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "flutter/shell/platform/linux/fl_renderer_gl.h"
-
-#include "flutter/shell/platform/linux/fl_backing_store_provider.h"
-#include "flutter/shell/platform/linux/fl_view_private.h"
-
-struct _FlRendererGL {
-  FlRenderer parent_instance;
-};
-
-G_DEFINE_TYPE(FlRendererGL, fl_renderer_gl, fl_renderer_get_type())
-
-// Implements FlRenderer::create_contexts.
-static gboolean fl_renderer_gl_create_contexts(FlRenderer* renderer,
-                                               GtkWidget* widget,
-                                               GdkGLContext** visible,
-                                               GdkGLContext** resource,
-                                               GError** error) {
-  GdkWindow* window = gtk_widget_get_parent_window(widget);
-
-  *visible = gdk_window_create_gl_context(window, error);
-
-  if (*error != nullptr) {
-    return FALSE;
-  }
-
-  *resource = gdk_window_create_gl_context(window, error);
-
-  if (*error != nullptr) {
-    return FALSE;
-  }
-  return TRUE;
-}
-
-// Implements FlRenderer::create_backing_store.
-static gboolean fl_renderer_gl_create_backing_store(
-    FlRenderer* renderer,
-    const FlutterBackingStoreConfig* config,
-    FlutterBackingStore* backing_store_out) {
-  g_autoptr(GError) error = nullptr;
-  gboolean result = fl_renderer_make_current(renderer, &error);
-  if (!result) {
-    g_warning("Failed to make renderer current when creating backing store: %s",
-              error->message);
-    return FALSE;
-  }
-
-  FlBackingStoreProvider* provider =
-      fl_backing_store_provider_new(config->size.width, config->size.height);
-  if (!provider) {
-    g_warning("Failed to create backing store");
-    return FALSE;
-  }
-
-  uint32_t name = fl_backing_store_provider_get_gl_framebuffer_id(provider);
-  uint32_t format = fl_backing_store_provider_get_gl_format(provider);
-
-  backing_store_out->type = kFlutterBackingStoreTypeOpenGL;
-  backing_store_out->open_gl.type = kFlutterOpenGLTargetTypeFramebuffer;
-  backing_store_out->open_gl.framebuffer.user_data = provider;
-  backing_store_out->open_gl.framebuffer.name = name;
-  backing_store_out->open_gl.framebuffer.target = format;
-  backing_store_out->open_gl.framebuffer.destruction_callback = [](void* p) {
-    // Backing store destroyed in fl_renderer_gl_collect_backing_store(), set
-    // on FlutterCompositor.collect_backing_store_callback during engine start.
-  };
-
-  return TRUE;
-}
-
-// Implements FlRenderer::collect_backing_store.
-static gboolean fl_renderer_gl_collect_backing_store(
-    FlRenderer* renderer,
-    const FlutterBackingStore* backing_store) {
-  g_autoptr(GError) error = nullptr;
-  gboolean result = fl_renderer_make_current(renderer, &error);
-  if (!result) {
-    g_warning(
-        "Failed to make renderer current when collecting backing store: %s",
-        error->message);
-    return FALSE;
-  }
-
-  // OpenGL context is required when destroying #FlBackingStoreProvider.
-  g_object_unref(backing_store->open_gl.framebuffer.user_data);
-  return TRUE;
-}
-
-// Implements FlRenderer::present_layers.
-static gboolean fl_renderer_gl_present_layers(FlRenderer* renderer,
-                                              const FlutterLayer** layers,
-                                              size_t layers_count) {
-  FlView* view = fl_renderer_get_view(renderer);
-  GdkGLContext* context = fl_renderer_get_context(renderer);
-  if (!view || !context) {
-    return FALSE;
-  }
-  fl_view_begin_frame(view);
-
-  for (size_t i = 0; i < layers_count; ++i) {
-    const FlutterLayer* layer = layers[i];
-    switch (layer->type) {
-      case kFlutterLayerContentTypeBackingStore: {
-        const FlutterBackingStore* backing_store = layer->backing_store;
-        auto framebuffer = &backing_store->open_gl.framebuffer;
-        fl_view_add_gl_area(
-            view, context,
-            reinterpret_cast<FlBackingStoreProvider*>(framebuffer->user_data));
-      } break;
-      case kFlutterLayerContentTypePlatformView: {
-        // Currently unsupported.
-      } break;
-    }
-  }
-
-  fl_view_end_frame(view);
-  return TRUE;
-}
-
-static void fl_renderer_gl_class_init(FlRendererGLClass* klass) {
-  FL_RENDERER_CLASS(klass)->create_contexts = fl_renderer_gl_create_contexts;
-  FL_RENDERER_CLASS(klass)->create_backing_store =
-      fl_renderer_gl_create_backing_store;
-  FL_RENDERER_CLASS(klass)->collect_backing_store =
-      fl_renderer_gl_collect_backing_store;
-  FL_RENDERER_CLASS(klass)->present_layers = fl_renderer_gl_present_layers;
-}
-
-static void fl_renderer_gl_init(FlRendererGL* self) {}
-
-FlRendererGL* fl_renderer_gl_new() {
-  return FL_RENDERER_GL(g_object_new(fl_renderer_gl_get_type(), nullptr));
-}
diff --git a/shell/platform/linux/fl_renderer_gl.h b/shell/platform/linux/fl_renderer_gl.h
deleted file mode 100644
index 25216b49cab10211b749ae5bc45dd44b5720db0e..0000000000000000000000000000000000000000
--- a/shell/platform/linux/fl_renderer_gl.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_SHELL_PLATFORM_LINUX_FL_RENDERER_GL_H_
-#define FLUTTER_SHELL_PLATFORM_LINUX_FL_RENDERER_GL_H_
-
-#include "flutter/shell/platform/linux/fl_renderer.h"
-
-G_BEGIN_DECLS
-
-G_DECLARE_FINAL_TYPE(FlRendererGL, fl_renderer_gl, FL, RENDERER_GL, FlRenderer)
-
-/**
- * FlRendererGL:
- *
- * #FlRendererGL is an implementation of #FlRenderer that renders by OpenGL ES.
- */
-
-/**
- * fl_renderer_gl_new:
- *
- * Creates an object that allows Flutter to render by OpenGL ES.
- *
- * Returns: a new #FlRendererGL.
- */
-FlRendererGL* fl_renderer_gl_new();
-
-G_END_DECLS
-
-#endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_RENDERER_GL_H_
diff --git a/shell/platform/linux/fl_renderer_headless.cc b/shell/platform/linux/fl_renderer_headless.cc
index 19d2da931e8e29da3d5e80660e6bbe9f50f41b4a..1736e1437396f7887bf5e10edc5d94ac45d07f47 100644
--- a/shell/platform/linux/fl_renderer_headless.cc
+++ b/shell/platform/linux/fl_renderer_headless.cc
@@ -10,46 +10,20 @@ struct _FlRendererHeadless {
 
 G_DEFINE_TYPE(FlRendererHeadless, fl_renderer_headless, fl_renderer_get_type())
 
-// Implements FlRenderer::create_contexts.
-static gboolean fl_renderer_headless_create_contexts(FlRenderer* renderer,
-                                                     GtkWidget* widget,
-                                                     GdkGLContext** visible,
-                                                     GdkGLContext** resource,
-                                                     GError** error) {
-  return FALSE;
-}
+// Implements FlRenderer::make_current.
+static void fl_renderer_headless_make_current(FlRenderer* renderer) {}
 
-// Implements FlRenderer::create_backing_store.
-static gboolean fl_renderer_headless_create_backing_store(
-    FlRenderer* renderer,
-    const FlutterBackingStoreConfig* config,
-    FlutterBackingStore* backing_store_out) {
-  return FALSE;
-}
+// Implements FlRenderer::make_resource_current.
+static void fl_renderer_headless_make_resource_current(FlRenderer* renderer) {}
 
-// Implements FlRenderer::collect_backing_store.
-static gboolean fl_renderer_headless_collect_backing_store(
-    FlRenderer* self,
-    const FlutterBackingStore* backing_store) {
-  return FALSE;
-}
-
-// Implements FlRenderer::present_layers.
-static gboolean fl_renderer_headless_present_layers(FlRenderer* self,
-                                                    const FlutterLayer** layers,
-                                                    size_t layers_count) {
-  return FALSE;
-}
+// Implements FlRenderer::clear_current.
+static void fl_renderer_headless_clear_current(FlRenderer* renderer) {}
 
 static void fl_renderer_headless_class_init(FlRendererHeadlessClass* klass) {
-  FL_RENDERER_CLASS(klass)->create_contexts =
-      fl_renderer_headless_create_contexts;
-  FL_RENDERER_CLASS(klass)->create_backing_store =
-      fl_renderer_headless_create_backing_store;
-  FL_RENDERER_CLASS(klass)->collect_backing_store =
-      fl_renderer_headless_collect_backing_store;
-  FL_RENDERER_CLASS(klass)->present_layers =
-      fl_renderer_headless_present_layers;
+  FL_RENDERER_CLASS(klass)->make_current = fl_renderer_headless_make_current;
+  FL_RENDERER_CLASS(klass)->make_resource_current =
+      fl_renderer_headless_make_resource_current;
+  FL_RENDERER_CLASS(klass)->clear_current = fl_renderer_headless_clear_current;
 }
 
 static void fl_renderer_headless_init(FlRendererHeadless* self) {}
diff --git a/shell/platform/linux/fl_scrolling_manager.cc b/shell/platform/linux/fl_scrolling_manager.cc
index f75efec4440c6a2a29766c9fd6ea5f31101b5794..aee1b52aed724a46c0907e298b24c630d0b5cffc 100644
--- a/shell/platform/linux/fl_scrolling_manager.cc
+++ b/shell/platform/linux/fl_scrolling_manager.cc
@@ -26,7 +26,17 @@ struct _FlScrollingManager {
 
 G_DEFINE_TYPE(FlScrollingManager, fl_scrolling_manager, G_TYPE_OBJECT);
 
-static void fl_scrolling_manager_dispose(GObject* object);
+static void fl_scrolling_manager_dispose(GObject* object) {
+  FlScrollingManager* self = FL_SCROLLING_MANAGER(object);
+
+  if (self->view_delegate != nullptr) {
+    g_object_remove_weak_pointer(
+        object, reinterpret_cast<gpointer*>(&self->view_delegate));
+    self->view_delegate = nullptr;
+  }
+
+  G_OBJECT_CLASS(fl_scrolling_manager_parent_class)->dispose(object);
+}
 
 static void fl_scrolling_manager_class_init(FlScrollingManagerClass* klass) {
   G_OBJECT_CLASS(klass)->dispose = fl_scrolling_manager_dispose;
@@ -34,10 +44,6 @@ static void fl_scrolling_manager_class_init(FlScrollingManagerClass* klass) {
 
 static void fl_scrolling_manager_init(FlScrollingManager* self) {}
 
-static void fl_scrolling_manager_dispose(GObject* object) {
-  G_OBJECT_CLASS(fl_scrolling_manager_parent_class)->dispose(object);
-}
-
 FlScrollingManager* fl_scrolling_manager_new(
     FlScrollingViewDelegate* view_delegate) {
   g_return_val_if_fail(FL_IS_SCROLLING_VIEW_DELEGATE(view_delegate), nullptr);
@@ -50,9 +56,9 @@ FlScrollingManager* fl_scrolling_manager_new(
       G_OBJECT(view_delegate),
       reinterpret_cast<gpointer*>(&(self->view_delegate)));
 
-  self->pan_started = false;
-  self->zoom_started = false;
-  self->rotate_started = false;
+  self->pan_started = FALSE;
+  self->zoom_started = FALSE;
+  self->rotate_started = FALSE;
 
   return self;
 }
@@ -60,25 +66,39 @@ FlScrollingManager* fl_scrolling_manager_new(
 void fl_scrolling_manager_set_last_mouse_position(FlScrollingManager* self,
                                                   gdouble x,
                                                   gdouble y) {
+  g_return_if_fail(FL_IS_SCROLLING_MANAGER(self));
   self->last_x = x;
   self->last_y = y;
 }
 
 void fl_scrolling_manager_handle_scroll_event(FlScrollingManager* self,
-                                              GdkEventScroll* event,
+                                              GdkEventScroll* scroll_event,
                                               gint scale_factor) {
+  g_return_if_fail(FL_IS_SCROLLING_MANAGER(self));
+
+  GdkEvent* event = reinterpret_cast<GdkEvent*>(scroll_event);
+
+  guint event_time = gdk_event_get_time(event);
+  gdouble event_x = 0.0, event_y = 0.0;
+  gdk_event_get_coords(event, &event_x, &event_y);
   gdouble scroll_delta_x = 0.0, scroll_delta_y = 0.0;
-  if (event->direction == GDK_SCROLL_SMOOTH) {
-    scroll_delta_x = event->delta_x;
-    scroll_delta_y = event->delta_y;
-  } else if (event->direction == GDK_SCROLL_UP) {
-    scroll_delta_y = -1;
-  } else if (event->direction == GDK_SCROLL_DOWN) {
-    scroll_delta_y = 1;
-  } else if (event->direction == GDK_SCROLL_LEFT) {
-    scroll_delta_x = -1;
-  } else if (event->direction == GDK_SCROLL_RIGHT) {
-    scroll_delta_x = 1;
+  GdkScrollDirection event_direction = GDK_SCROLL_SMOOTH;
+  if (gdk_event_get_scroll_direction(event, &event_direction)) {
+    if (event_direction == GDK_SCROLL_UP) {
+      scroll_delta_x = 0;
+      scroll_delta_y = -1;
+    } else if (event_direction == GDK_SCROLL_DOWN) {
+      scroll_delta_x = 0;
+      scroll_delta_y = 1;
+    } else if (event_direction == GDK_SCROLL_LEFT) {
+      scroll_delta_x = -1;
+      scroll_delta_y = 0;
+    } else if (event_direction == GDK_SCROLL_RIGHT) {
+      scroll_delta_x = 1;
+      scroll_delta_y = 0;
+    }
+  } else {
+    gdk_event_get_scroll_deltas(event, &scroll_delta_x, &scroll_delta_y);
   }
 
   // The multiplier is taken from the Chromium source
@@ -87,14 +107,14 @@ void fl_scrolling_manager_handle_scroll_event(FlScrollingManager* self,
   scroll_delta_x *= kScrollOffsetMultiplier * scale_factor;
   scroll_delta_y *= kScrollOffsetMultiplier * scale_factor;
 
-  if (gdk_device_get_source(gdk_event_get_source_device(
-          reinterpret_cast<GdkEvent*>(event))) == GDK_SOURCE_TOUCHPAD) {
+  if (gdk_device_get_source(gdk_event_get_source_device(event)) ==
+      GDK_SOURCE_TOUCHPAD) {
     scroll_delta_x *= -1;
     scroll_delta_y *= -1;
-    if (event->is_stop) {
+    if (gdk_event_is_scroll_stop_event(event)) {
       fl_scrolling_view_delegate_send_pointer_pan_zoom_event(
-          self->view_delegate, event->time * kMicrosecondsPerMillisecond,
-          event->x * scale_factor, event->y * scale_factor, kPanZoomEnd,
+          self->view_delegate, event_time * kMicrosecondsPerMillisecond,
+          event_x * scale_factor, event_y * scale_factor, kPanZoomEnd,
           self->pan_x, self->pan_y, 0, 0);
       self->pan_started = FALSE;
     } else {
@@ -102,33 +122,35 @@ void fl_scrolling_manager_handle_scroll_event(FlScrollingManager* self,
         self->pan_x = 0;
         self->pan_y = 0;
         fl_scrolling_view_delegate_send_pointer_pan_zoom_event(
-            self->view_delegate, event->time * kMicrosecondsPerMillisecond,
-            event->x * scale_factor, event->y * scale_factor, kPanZoomStart, 0,
-            0, 0, 0);
+            self->view_delegate, event_time * kMicrosecondsPerMillisecond,
+            event_x * scale_factor, event_y * scale_factor, kPanZoomStart, 0, 0,
+            0, 0);
         self->pan_started = TRUE;
       }
       self->pan_x += scroll_delta_x;
       self->pan_y += scroll_delta_y;
       fl_scrolling_view_delegate_send_pointer_pan_zoom_event(
-          self->view_delegate, event->time * kMicrosecondsPerMillisecond,
-          event->x * scale_factor, event->y * scale_factor, kPanZoomUpdate,
+          self->view_delegate, event_time * kMicrosecondsPerMillisecond,
+          event_x * scale_factor, event_y * scale_factor, kPanZoomUpdate,
           self->pan_x, self->pan_y, 1, 0);
     }
   } else {
-    self->last_x = event->x * scale_factor;
-    self->last_y = event->y * scale_factor;
+    self->last_x = event_x * scale_factor;
+    self->last_y = event_y * scale_factor;
     fl_scrolling_view_delegate_send_mouse_pointer_event(
         self->view_delegate,
         FlutterPointerPhase::kMove /* arbitrary value, phase will be ignored as
                                       this is a discrete scroll event */
         ,
-        event->time * kMicrosecondsPerMillisecond, event->x * scale_factor,
-        event->y * scale_factor, scroll_delta_x, scroll_delta_y, 0);
+        event_time * kMicrosecondsPerMillisecond, event_x * scale_factor,
+        event_y * scale_factor, scroll_delta_x, scroll_delta_y, 0);
   }
 }
 
 void fl_scrolling_manager_handle_rotation_begin(FlScrollingManager* self) {
-  self->rotate_started = true;
+  g_return_if_fail(FL_IS_SCROLLING_MANAGER(self));
+
+  self->rotate_started = TRUE;
   if (!self->zoom_started) {
     self->scale = 1;
     self->rotation = 0;
@@ -140,13 +162,18 @@ void fl_scrolling_manager_handle_rotation_begin(FlScrollingManager* self) {
 
 void fl_scrolling_manager_handle_rotation_update(FlScrollingManager* self,
                                                  gdouble rotation) {
+  g_return_if_fail(FL_IS_SCROLLING_MANAGER(self));
+
   self->rotation = rotation;
   fl_scrolling_view_delegate_send_pointer_pan_zoom_event(
       self->view_delegate, g_get_real_time(), self->last_x, self->last_y,
       kPanZoomUpdate, 0, 0, self->scale, self->rotation);
 }
+
 void fl_scrolling_manager_handle_rotation_end(FlScrollingManager* self) {
-  self->rotate_started = false;
+  g_return_if_fail(FL_IS_SCROLLING_MANAGER(self));
+
+  self->rotate_started = FALSE;
   if (!self->zoom_started) {
     fl_scrolling_view_delegate_send_pointer_pan_zoom_event(
         self->view_delegate, g_get_real_time(), self->last_x, self->last_y,
@@ -155,7 +182,9 @@ void fl_scrolling_manager_handle_rotation_end(FlScrollingManager* self) {
 }
 
 void fl_scrolling_manager_handle_zoom_begin(FlScrollingManager* self) {
-  self->zoom_started = true;
+  g_return_if_fail(FL_IS_SCROLLING_MANAGER(self));
+
+  self->zoom_started = TRUE;
   if (!self->rotate_started) {
     self->scale = 1;
     self->rotation = 0;
@@ -164,15 +193,21 @@ void fl_scrolling_manager_handle_zoom_begin(FlScrollingManager* self) {
         kPanZoomStart, 0, 0, 0, 0);
   }
 }
+
 void fl_scrolling_manager_handle_zoom_update(FlScrollingManager* self,
                                              gdouble scale) {
+  g_return_if_fail(FL_IS_SCROLLING_MANAGER(self));
+
   self->scale = scale;
   fl_scrolling_view_delegate_send_pointer_pan_zoom_event(
       self->view_delegate, g_get_real_time(), self->last_x, self->last_y,
       kPanZoomUpdate, 0, 0, self->scale, self->rotation);
 }
+
 void fl_scrolling_manager_handle_zoom_end(FlScrollingManager* self) {
-  self->zoom_started = false;
+  g_return_if_fail(FL_IS_SCROLLING_MANAGER(self));
+
+  self->zoom_started = FALSE;
   if (!self->rotate_started) {
     fl_scrolling_view_delegate_send_pointer_pan_zoom_event(
         self->view_delegate, g_get_real_time(), self->last_x, self->last_y,
diff --git a/shell/platform/linux/fl_scrolling_manager.h b/shell/platform/linux/fl_scrolling_manager.h
index 95208237df5ee6d833884885ebdca564513738b1..5c011876abbfe2bbe03864f11f6b2eff0aae25fb 100644
--- a/shell/platform/linux/fl_scrolling_manager.h
+++ b/shell/platform/linux/fl_scrolling_manager.h
@@ -6,7 +6,6 @@
 #define FLUTTER_SHELL_PLATFORM_LINUX_FL_SCROLLING_MANAGER_H_
 
 #include <gdk/gdk.h>
-#include <functional>
 
 #include "flutter/shell/platform/linux/fl_scrolling_view_delegate.h"
 
@@ -33,7 +32,7 @@ FlScrollingManager* fl_scrolling_manager_new(
 
 /**
  * fl_scrolling_manager_set_last_mouse_position:
- * @manager: the #FlScrollingManager self.
+ * @manager: an #FlScrollingManager.
  * @x: the mouse x-position, in window coordinates.
  * @y: the mouse y-position, in window coordinates.
  *
@@ -46,7 +45,7 @@ void fl_scrolling_manager_set_last_mouse_position(FlScrollingManager* manager,
 
 /**
  * fl_scrolling_manager_handle_scroll_event:
- * @manager: the #FlScrollingManager self.
+ * @manager: an #FlScrollingManager.
  * @event: the scroll event.
  * @scale_factor: the GTK scaling factor of the window.
  *
@@ -58,7 +57,7 @@ void fl_scrolling_manager_handle_scroll_event(FlScrollingManager* manager,
 
 /**
  * fl_scrolling_manager_handle_rotation_begin:
- * @manager: the #FlScrollingManager self.
+ * @manager: an #FlScrollingManager.
  *
  * Inform the scrolling manager that a rotation gesture has begun.
  */
@@ -66,7 +65,7 @@ void fl_scrolling_manager_handle_rotation_begin(FlScrollingManager* manager);
 
 /**
  * fl_scrolling_manager_handle_rotation_update:
- * @manager: the #FlScrollingManager self.
+ * @manager: an #FlScrollingManager.
  * @rotation: the rotation angle, in radians.
  *
  * Inform the scrolling manager that a rotation gesture has updated.
@@ -76,7 +75,7 @@ void fl_scrolling_manager_handle_rotation_update(FlScrollingManager* manager,
 
 /**
  * fl_scrolling_manager_handle_rotation_end:
- * @manager: the #FlScrollingManager self.
+ * @manager: an #FlScrollingManager.
  *
  * Inform the scrolling manager that a rotation gesture has ended.
  */
@@ -84,7 +83,7 @@ void fl_scrolling_manager_handle_rotation_end(FlScrollingManager* manager);
 
 /**
  * fl_scrolling_manager_handle_zoom_begin:
- * @manager: the #FlScrollingManager self.
+ * @manager: an #FlScrollingManager.
  *
  * Inform the scrolling manager that a zoom gesture has begun.
  */
@@ -92,7 +91,7 @@ void fl_scrolling_manager_handle_zoom_begin(FlScrollingManager* manager);
 
 /**
  * fl_scrolling_manager_handle_zoom_update:
- * @manager: the #FlScrollingManager self.
+ * @manager: an #FlScrollingManager.
  * @scale: the zoom scale.
  *
  * Inform the scrolling manager that a zoom gesture has updated.
@@ -102,7 +101,7 @@ void fl_scrolling_manager_handle_zoom_update(FlScrollingManager* manager,
 
 /**
  * fl_scrolling_manager_handle_zoom_end:
- * @manager: the #FlScrollingManager self.
+ * @manager: an #FlScrollingManager.
  *
  * Inform the scrolling manager that a zoom gesture has ended.
  */
diff --git a/shell/platform/linux/fl_scrolling_manager_test.cc b/shell/platform/linux/fl_scrolling_manager_test.cc
index 4f8617a3cdf28658a45a96dc43a31348a27351dd..59b67bc925382983d72e83d17187f77a42815cf9 100644
--- a/shell/platform/linux/fl_scrolling_manager_test.cc
+++ b/shell/platform/linux/fl_scrolling_manager_test.cc
@@ -62,7 +62,9 @@ G_END_DECLS
 
 struct _FlMockScrollingViewDelegate {
   GObject parent_instance;
+};
 
+struct FlMockScrollingViewDelegatePrivate {
   MousePointerCallHandler mouse_handler;
   PointerPanZoomCallHandler pan_zoom_handler;
 };
@@ -75,10 +77,26 @@ G_DEFINE_TYPE_WITH_CODE(
     fl_mock_scrolling_view_delegate,
     G_TYPE_OBJECT,
     G_IMPLEMENT_INTERFACE(fl_scrolling_view_delegate_get_type(),
-                          fl_mock_view_scroll_delegate_iface_init))
+                          fl_mock_view_scroll_delegate_iface_init);
+    G_ADD_PRIVATE(FlMockScrollingViewDelegate))
+
+#define FL_MOCK_SCROLLING_VIEW_DELEGATE_GET_PRIVATE(obj)    \
+  static_cast<FlMockScrollingViewDelegatePrivate*>(         \
+      fl_mock_scrolling_view_delegate_get_instance_private( \
+          FL_MOCK_SCROLLING_VIEW_DELEGATE(obj)))
 
 static void fl_mock_scrolling_view_delegate_init(
-    FlMockScrollingViewDelegate* self) {}
+    FlMockScrollingViewDelegate* self) {
+  FlMockScrollingViewDelegatePrivate* priv =
+      FL_MOCK_SCROLLING_VIEW_DELEGATE_GET_PRIVATE(self);
+
+  new (priv) FlMockScrollingViewDelegatePrivate();
+}
+
+static void fl_mock_scrolling_view_delegate_finalize(GObject* object) {
+  FL_MOCK_SCROLLING_VIEW_DELEGATE_GET_PRIVATE(object)
+      ->~FlMockScrollingViewDelegatePrivate();
+}
 
 static void fl_mock_scrolling_view_delegate_dispose(GObject* object) {
   G_OBJECT_CLASS(fl_mock_scrolling_view_delegate_parent_class)->dispose(object);
@@ -87,6 +105,7 @@ static void fl_mock_scrolling_view_delegate_dispose(GObject* object) {
 static void fl_mock_scrolling_view_delegate_class_init(
     FlMockScrollingViewDelegateClass* klass) {
   G_OBJECT_CLASS(klass)->dispose = fl_mock_scrolling_view_delegate_dispose;
+  G_OBJECT_CLASS(klass)->finalize = fl_mock_scrolling_view_delegate_finalize;
 }
 
 static void fl_mock_view_send_mouse_pointer_event(
@@ -98,8 +117,9 @@ static void fl_mock_view_send_mouse_pointer_event(
     double scroll_delta_x,
     double scroll_delta_y,
     int64_t buttons) {
-  FlMockScrollingViewDelegate* self = FL_MOCK_SCROLLING_VIEW_DELEGATE(delegate);
-  self->mouse_handler(phase, timestamp, x, y, scroll_delta_x, scroll_delta_y,
+  FlMockScrollingViewDelegatePrivate* priv =
+      FL_MOCK_SCROLLING_VIEW_DELEGATE_GET_PRIVATE(delegate);
+  priv->mouse_handler(phase, timestamp, x, y, scroll_delta_x, scroll_delta_y,
                       buttons);
 }
 
@@ -113,8 +133,9 @@ static void fl_mock_view_send_pointer_pan_zoom_event(
     double pan_y,
     double scale,
     double rotation) {
-  FlMockScrollingViewDelegate* self = FL_MOCK_SCROLLING_VIEW_DELEGATE(delegate);
-  self->pan_zoom_handler(timestamp, x, y, phase, pan_x, pan_y, scale, rotation);
+  FlMockScrollingViewDelegatePrivate* priv =
+      FL_MOCK_SCROLLING_VIEW_DELEGATE_GET_PRIVATE(delegate);
+  priv->pan_zoom_handler(timestamp, x, y, phase, pan_x, pan_y, scale, rotation);
 }
 
 static void fl_mock_view_scroll_delegate_iface_init(
@@ -136,13 +157,19 @@ static FlMockScrollingViewDelegate* fl_mock_scrolling_view_delegate_new() {
 static void fl_mock_scrolling_view_set_mouse_handler(
     FlMockScrollingViewDelegate* self,
     MousePointerCallHandler handler) {
-  self->mouse_handler = std::move(handler);
+  FlMockScrollingViewDelegatePrivate* priv =
+      FL_MOCK_SCROLLING_VIEW_DELEGATE_GET_PRIVATE(self);
+
+  priv->mouse_handler = std::move(handler);
 }
 
 static void fl_mock_scrolling_view_set_pan_zoom_handler(
     FlMockScrollingViewDelegate* self,
     PointerPanZoomCallHandler handler) {
-  self->pan_zoom_handler = std::move(handler);
+  FlMockScrollingViewDelegatePrivate* priv =
+      FL_MOCK_SCROLLING_VIEW_DELEGATE_GET_PRIVATE(self);
+
+  priv->pan_zoom_handler = std::move(handler);
 }
 
 /***** End FlMockScrollingViewDelegate *****/
diff --git a/shell/platform/linux/fl_settings.h b/shell/platform/linux/fl_settings.h
index 4453fd86196ceef6ae00b37db734c1026518b4d4..f7305f1876d517c648943bb75fab9e316d6d02e5 100644
--- a/shell/platform/linux/fl_settings.h
+++ b/shell/platform/linux/fl_settings.h
@@ -19,8 +19,10 @@ G_DECLARE_INTERFACE(FlSettings, fl_settings, FL, SETTINGS, GObject)
  * Available clock formats.
  */
 typedef enum {
+  // NOLINTBEGIN(readability-identifier-naming)
   FL_CLOCK_FORMAT_12H,
   FL_CLOCK_FORMAT_24H,
+  // NOLINTEND(readability-identifier-naming)
 } FlClockFormat;
 
 /**
@@ -31,8 +33,10 @@ typedef enum {
  * Available color schemes.
  */
 typedef enum {
+  // NOLINTBEGIN(readability-identifier-naming)
   FL_COLOR_SCHEME_LIGHT,
   FL_COLOR_SCHEME_DARK,
+  // NOLINTEND(readability-identifier-naming)
 } FlColorScheme;
 
 /**
diff --git a/shell/platform/linux/fl_standard_message_codec.cc b/shell/platform/linux/fl_standard_message_codec.cc
index 9fb31d1cc8486c575e45d9c3d8961eb82cf32e39..9ae6aafb37062cee2834dac59ebc24ed565c60a3 100644
--- a/shell/platform/linux/fl_standard_message_codec.cc
+++ b/shell/platform/linux/fl_standard_message_codec.cc
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "flutter/shell/platform/linux/public/flutter_linux/fl_standard_message_codec.h"
-#include "flutter/shell/platform/linux/fl_standard_message_codec_private.h"
 
 #include <gmodule.h>
 
@@ -28,10 +27,6 @@ static constexpr int kValueList = 12;
 static constexpr int kValueMap = 13;
 static constexpr int kValueFloat32List = 14;
 
-struct _FlStandardMessageCodec {
-  FlMessageCodec parent_instance;
-};
-
 G_DEFINE_TYPE(FlStandardMessageCodec,
               fl_standard_message_codec,
               fl_message_codec_get_type())
@@ -420,6 +415,10 @@ static GBytes* fl_standard_message_codec_encode_message(FlMessageCodec* codec,
 static FlValue* fl_standard_message_codec_decode_message(FlMessageCodec* codec,
                                                          GBytes* message,
                                                          GError** error) {
+  if (g_bytes_get_size(message) == 0) {
+    return fl_value_new_null();
+  }
+
   FlStandardMessageCodec* self =
       reinterpret_cast<FlStandardMessageCodec*>(codec);
 
@@ -441,66 +440,12 @@ static FlValue* fl_standard_message_codec_decode_message(FlMessageCodec* codec,
   return fl_value_ref(value);
 }
 
-static void fl_standard_message_codec_class_init(
-    FlStandardMessageCodecClass* klass) {
-  FL_MESSAGE_CODEC_CLASS(klass)->encode_message =
-      fl_standard_message_codec_encode_message;
-  FL_MESSAGE_CODEC_CLASS(klass)->decode_message =
-      fl_standard_message_codec_decode_message;
-}
-
-static void fl_standard_message_codec_init(FlStandardMessageCodec* self) {}
-
-G_MODULE_EXPORT FlStandardMessageCodec* fl_standard_message_codec_new() {
-  return static_cast<FlStandardMessageCodec*>(
-      g_object_new(fl_standard_message_codec_get_type(), nullptr));
-}
-
-void fl_standard_message_codec_write_size(FlStandardMessageCodec* codec,
-                                          GByteArray* buffer,
-                                          uint32_t size) {
-  if (size < 254) {
-    write_uint8(buffer, size);
-  } else if (size <= 0xffff) {
-    write_uint8(buffer, 254);
-    write_uint16(buffer, size);
-  } else {
-    write_uint8(buffer, 255);
-    write_uint32(buffer, size);
-  }
-}
-
-gboolean fl_standard_message_codec_read_size(FlStandardMessageCodec* codec,
-                                             GBytes* buffer,
-                                             size_t* offset,
-                                             uint32_t* value,
-                                             GError** error) {
-  uint8_t value8;
-  if (!read_uint8(buffer, offset, &value8, error)) {
-    return FALSE;
-  }
-
-  if (value8 == 255) {
-    if (!read_uint32(buffer, offset, value, error)) {
-      return FALSE;
-    }
-  } else if (value8 == 254) {
-    uint16_t value16;
-    if (!read_uint16(buffer, offset, &value16, error)) {
-      return FALSE;
-    }
-    *value = value16;
-  } else {
-    *value = value8;
-  }
-
-  return TRUE;
-}
-
-gboolean fl_standard_message_codec_write_value(FlStandardMessageCodec* self,
-                                               GByteArray* buffer,
-                                               FlValue* value,
-                                               GError** error) {
+// Implements FlStandardMessageCodec::write_value.
+static gboolean fl_standard_message_codec_real_write_value(
+    FlStandardMessageCodec* self,
+    GByteArray* buffer,
+    FlValue* value,
+    GError** error) {
   if (value == nullptr) {
     write_uint8(buffer, kValueNull);
     return TRUE;
@@ -618,6 +563,11 @@ gboolean fl_standard_message_codec_write_value(FlStandardMessageCodec* self,
         }
       }
       return TRUE;
+    case FL_VALUE_TYPE_CUSTOM:
+      g_set_error(error, FL_MESSAGE_CODEC_ERROR,
+                  FL_MESSAGE_CODEC_ERROR_UNSUPPORTED_TYPE,
+                  "Custom value not implemented");
+      return FALSE;
   }
 
   g_set_error(error, FL_MESSAGE_CODEC_ERROR,
@@ -626,15 +576,13 @@ gboolean fl_standard_message_codec_write_value(FlStandardMessageCodec* self,
   return FALSE;
 }
 
-FlValue* fl_standard_message_codec_read_value(FlStandardMessageCodec* self,
-                                              GBytes* buffer,
-                                              size_t* offset,
-                                              GError** error) {
-  uint8_t type;
-  if (!read_uint8(buffer, offset, &type, error)) {
-    return nullptr;
-  }
-
+// Implements FlStandardMessageCodec::read_value_of_type.
+static FlValue* fl_standard_message_codec_read_value_of_type(
+    FlStandardMessageCodec* self,
+    GBytes* buffer,
+    size_t* offset,
+    int type,
+    GError** error) {
   g_autoptr(FlValue) value = nullptr;
   if (type == kValueNull) {
     return fl_value_new_null();
@@ -673,3 +621,86 @@ FlValue* fl_standard_message_codec_read_value(FlStandardMessageCodec* self,
 
   return value == nullptr ? nullptr : fl_value_ref(value);
 }
+
+static void fl_standard_message_codec_class_init(
+    FlStandardMessageCodecClass* klass) {
+  FL_MESSAGE_CODEC_CLASS(klass)->encode_message =
+      fl_standard_message_codec_encode_message;
+  FL_MESSAGE_CODEC_CLASS(klass)->decode_message =
+      fl_standard_message_codec_decode_message;
+  klass->write_value = fl_standard_message_codec_real_write_value;
+  klass->read_value_of_type = fl_standard_message_codec_read_value_of_type;
+}
+
+static void fl_standard_message_codec_init(FlStandardMessageCodec* self) {}
+
+G_MODULE_EXPORT FlStandardMessageCodec* fl_standard_message_codec_new() {
+  return static_cast<FlStandardMessageCodec*>(
+      g_object_new(fl_standard_message_codec_get_type(), nullptr));
+}
+
+G_MODULE_EXPORT void fl_standard_message_codec_write_size(
+    FlStandardMessageCodec* codec,
+    GByteArray* buffer,
+    uint32_t size) {
+  if (size < 254) {
+    write_uint8(buffer, size);
+  } else if (size <= 0xffff) {
+    write_uint8(buffer, 254);
+    write_uint16(buffer, size);
+  } else {
+    write_uint8(buffer, 255);
+    write_uint32(buffer, size);
+  }
+}
+
+G_MODULE_EXPORT gboolean fl_standard_message_codec_read_size(
+    FlStandardMessageCodec* codec,
+    GBytes* buffer,
+    size_t* offset,
+    uint32_t* value,
+    GError** error) {
+  uint8_t value8;
+  if (!read_uint8(buffer, offset, &value8, error)) {
+    return FALSE;
+  }
+
+  if (value8 == 255) {
+    if (!read_uint32(buffer, offset, value, error)) {
+      return FALSE;
+    }
+  } else if (value8 == 254) {
+    uint16_t value16;
+    if (!read_uint16(buffer, offset, &value16, error)) {
+      return FALSE;
+    }
+    *value = value16;
+  } else {
+    *value = value8;
+  }
+
+  return TRUE;
+}
+
+G_MODULE_EXPORT gboolean fl_standard_message_codec_write_value(
+    FlStandardMessageCodec* self,
+    GByteArray* buffer,
+    FlValue* value,
+    GError** error) {
+  return FL_STANDARD_MESSAGE_CODEC_GET_CLASS(self)->write_value(self, buffer,
+                                                                value, error);
+}
+
+G_MODULE_EXPORT FlValue* fl_standard_message_codec_read_value(
+    FlStandardMessageCodec* self,
+    GBytes* buffer,
+    size_t* offset,
+    GError** error) {
+  uint8_t type;
+  if (!read_uint8(buffer, offset, &type, error)) {
+    return nullptr;
+  }
+
+  return FL_STANDARD_MESSAGE_CODEC_GET_CLASS(self)->read_value_of_type(
+      self, buffer, offset, type, error);
+}
diff --git a/shell/platform/linux/fl_standard_message_codec_private.h b/shell/platform/linux/fl_standard_message_codec_private.h
deleted file mode 100644
index 82cebef73f0ae1d5311751c9276cdb09a559c6c0..0000000000000000000000000000000000000000
--- a/shell/platform/linux/fl_standard_message_codec_private.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_SHELL_PLATFORM_LINUX_FL_STANDARD_MESSAGE_CODEC_PRIVATE_H_
-#define FLUTTER_SHELL_PLATFORM_LINUX_FL_STANDARD_MESSAGE_CODEC_PRIVATE_H_
-
-#include "flutter/shell/platform/linux/public/flutter_linux/fl_standard_message_codec.h"
-
-G_BEGIN_DECLS
-
-/**
- * fl_standard_message_codec_write_size:
- * @codec: an #FlStandardMessageCodec.
- * @buffer: buffer to write into.
- * @size: size value to write.
- *
- * Writes a size field in Flutter Standard encoding.
- */
-void fl_standard_message_codec_write_size(FlStandardMessageCodec* codec,
-                                          GByteArray* buffer,
-                                          uint32_t size);
-
-/**
- * fl_standard_message_codec_read_size:
- * @codec: an #FlStandardMessageCodec.
- * @buffer: buffer to read from.
- * @offset: (inout): read position in @buffer.
- * @value: location to read size.
- * @error: (allow-none): #GError location to store the error occurring, or
- * %NULL.
- *
- * Reads a size field in Flutter Standard encoding.
- *
- * Returns: %TRUE on success.
- */
-gboolean fl_standard_message_codec_read_size(FlStandardMessageCodec* codec,
-                                             GBytes* buffer,
-                                             size_t* offset,
-                                             uint32_t* value,
-                                             GError** error);
-
-/**
- * fl_standard_message_codec_write_value:
- * @codec: an #FlStandardMessageCodec.
- * @buffer: buffer to write into.
- * @value: (allow-none): value to write.
- * @error: (allow-none): #GError location to store the error occurring, or
- * %NULL.
- *
- * Writes an #FlValue in Flutter Standard encoding.
- *
- * Returns: %TRUE on success.
- */
-gboolean fl_standard_message_codec_write_value(FlStandardMessageCodec* codec,
-                                               GByteArray* buffer,
-                                               FlValue* value,
-                                               GError** error);
-
-/**
- * fl_standard_message_codec_read_value:
- * @codec: an #FlStandardMessageCodec.
- * @buffer: buffer to read from.
- * @offset: (inout): read position in @buffer.
- * @value: location to read size.
- * @error: (allow-none): #GError location to store the error occurring, or
- * %NULL.
- *
- * Reads an #FlValue in Flutter Standard encoding.
- *
- * Returns: a new #FlValue or %NULL on error.
- */
-FlValue* fl_standard_message_codec_read_value(FlStandardMessageCodec* codec,
-                                              GBytes* buffer,
-                                              size_t* offset,
-                                              GError** error);
-
-G_END_DECLS
-
-#endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_STANDARD_MESSAGE_CODEC_PRIVATE_H_
diff --git a/shell/platform/linux/fl_standard_message_codec_test.cc b/shell/platform/linux/fl_standard_message_codec_test.cc
index b3b13a5a5c55735095db75a00dfdb86c642ad10d..b8986c66a3ca67d9f92aa01037466c8507672eee 100644
--- a/shell/platform/linux/fl_standard_message_codec_test.cc
+++ b/shell/platform/linux/fl_standard_message_codec_test.cc
@@ -9,32 +9,45 @@
 // NOTE(robert-ancell) These test cases assumes a little-endian architecture.
 // These tests will need to be updated if tested on a big endian architecture.
 
-// Encodes a message using a FlStandardMessageCodec. Return a hex string with
+// Encodes a message using the supplied codec. Return a hex string with
 // the encoded binary output.
-static gchar* encode_message(FlValue* value) {
-  g_autoptr(FlStandardMessageCodec) codec = fl_standard_message_codec_new();
+static gchar* encode_message_with_codec(FlValue* value, FlMessageCodec* codec) {
   g_autoptr(GError) error = nullptr;
   g_autoptr(GBytes) message =
-      fl_message_codec_encode_message(FL_MESSAGE_CODEC(codec), value, &error);
+      fl_message_codec_encode_message(codec, value, &error);
   EXPECT_NE(message, nullptr);
   EXPECT_EQ(error, nullptr);
 
   return bytes_to_hex_string(message);
 }
 
-// Decodes a message using a FlStandardMessageCodec. The binary data is given in
-// the form of a hex string.
-static FlValue* decode_message(const char* hex_string) {
+// Encodes a message using a FlStandardMessageCodec. Return a hex string with
+// the encoded binary output.
+static gchar* encode_message(FlValue* value) {
   g_autoptr(FlStandardMessageCodec) codec = fl_standard_message_codec_new();
+  return encode_message_with_codec(value, FL_MESSAGE_CODEC(codec));
+}
+
+// Decodes a message using the supplied codec. The binary data is given in
+// the form of a hex string.
+static FlValue* decode_message_with_codec(const char* hex_string,
+                                          FlMessageCodec* codec) {
   g_autoptr(GBytes) data = hex_string_to_bytes(hex_string);
   g_autoptr(GError) error = nullptr;
   g_autoptr(FlValue) value =
-      fl_message_codec_decode_message(FL_MESSAGE_CODEC(codec), data, &error);
+      fl_message_codec_decode_message(codec, data, &error);
   EXPECT_EQ(error, nullptr);
   EXPECT_NE(value, nullptr);
   return fl_value_ref(value);
 }
 
+// Decodes a message using a FlStandardMessageCodec. The binary data is given in
+// the form of a hex string.
+static FlValue* decode_message(const char* hex_string) {
+  g_autoptr(FlStandardMessageCodec) codec = fl_standard_message_codec_new();
+  return decode_message_with_codec(hex_string, FL_MESSAGE_CODEC(codec));
+}
+
 // Decodes a message using a FlStandardMessageCodec. The binary data is given in
 // the form of a hex string. Expect the given error.
 static void decode_error_value(const char* hex_string,
@@ -60,6 +73,19 @@ TEST(FlStandardMessageCodecTest, EncodeNull) {
   EXPECT_STREQ(hex_string, "00");
 }
 
+TEST(FlStandardMessageCodecTest, DecodeNull) {
+  // Regression test for https://github.com/flutter/flutter/issues/128704.
+
+  g_autoptr(FlStandardMessageCodec) codec = fl_standard_message_codec_new();
+  g_autoptr(GBytes) data = g_bytes_new(nullptr, 0);
+  g_autoptr(GError) error = nullptr;
+  g_autoptr(FlValue) value =
+      fl_message_codec_decode_message(FL_MESSAGE_CODEC(codec), data, &error);
+
+  EXPECT_FALSE(value == nullptr);
+  EXPECT_EQ(fl_value_get_type(value), FL_VALUE_TYPE_NULL);
+}
+
 static gchar* encode_bool(gboolean value) {
   g_autoptr(FlValue) v = fl_value_new_bool(value);
   return encode_message(v);
@@ -1064,6 +1090,178 @@ TEST(FlStandardMessageCodecTest, DecodeUnknownType) {
                      FL_MESSAGE_CODEC_ERROR_UNSUPPORTED_TYPE);
 }
 
+G_DECLARE_FINAL_TYPE(FlTestStandardMessageCodec,
+                     fl_test_standard_message_codec,
+                     FL,
+                     TEST_STANDARD_MESSAGE_CODEC,
+                     FlStandardMessageCodec)
+
+struct _FlTestStandardMessageCodec {
+  FlStandardMessageCodec parent_instance;
+};
+
+G_DEFINE_TYPE(FlTestStandardMessageCodec,
+              fl_test_standard_message_codec,
+              fl_standard_message_codec_get_type())
+
+static gboolean write_custom_value1(FlStandardMessageCodec* codec,
+                                    GByteArray* buffer,
+                                    FlValue* value,
+                                    GError** error) {
+  const gchar* text =
+      static_cast<const gchar*>(fl_value_get_custom_value(value));
+  size_t length = strlen(text);
+
+  uint8_t type = 128;
+  g_byte_array_append(buffer, &type, sizeof(uint8_t));
+  fl_standard_message_codec_write_size(codec, buffer, length);
+  g_byte_array_append(buffer, reinterpret_cast<const uint8_t*>(text), length);
+  return TRUE;
+}
+
+static gboolean write_custom_value2(FlStandardMessageCodec* codec,
+                                    GByteArray* buffer,
+                                    FlValue* value,
+                                    GError** error) {
+  uint8_t type = 129;
+  g_byte_array_append(buffer, &type, sizeof(uint8_t));
+  return TRUE;
+}
+
+static gboolean fl_test_standard_message_codec_write_value(
+    FlStandardMessageCodec* codec,
+    GByteArray* buffer,
+    FlValue* value,
+    GError** error) {
+  if (fl_value_get_type(value) == FL_VALUE_TYPE_CUSTOM &&
+      fl_value_get_custom_type(value) == 128) {
+    return write_custom_value1(codec, buffer, value, error);
+  } else if (fl_value_get_type(value) == FL_VALUE_TYPE_CUSTOM &&
+             fl_value_get_custom_type(value) == 129) {
+    return write_custom_value2(codec, buffer, value, error);
+  } else {
+    return FL_STANDARD_MESSAGE_CODEC_CLASS(
+               fl_test_standard_message_codec_parent_class)
+        ->write_value(codec, buffer, value, error);
+  }
+}
+
+static FlValue* read_custom_value1(FlStandardMessageCodec* codec,
+                                   GBytes* buffer,
+                                   size_t* offset,
+                                   GError** error) {
+  uint32_t length;
+  if (!fl_standard_message_codec_read_size(codec, buffer, offset, &length,
+                                           error)) {
+    return nullptr;
+  }
+  if (*offset + length > g_bytes_get_size(buffer)) {
+    g_set_error(error, FL_MESSAGE_CODEC_ERROR,
+                FL_MESSAGE_CODEC_ERROR_OUT_OF_DATA, "Unexpected end of data");
+    return nullptr;
+  }
+  FlValue* value = fl_value_new_custom(
+      128,
+      g_strndup(static_cast<const gchar*>(g_bytes_get_data(buffer, nullptr)) +
+                    *offset,
+                length),
+      g_free);
+  *offset += length;
+
+  return value;
+}
+
+static FlValue* read_custom_value2(FlStandardMessageCodec* codec,
+                                   GBytes* buffer,
+                                   size_t* offset,
+                                   GError** error) {
+  return fl_value_new_custom(129, nullptr, nullptr);
+}
+
+static FlValue* fl_test_standard_message_codec_read_value_of_type(
+    FlStandardMessageCodec* codec,
+    GBytes* buffer,
+    size_t* offset,
+    int type,
+    GError** error) {
+  if (type == 128) {
+    return read_custom_value1(codec, buffer, offset, error);
+  } else if (type == 129) {
+    return read_custom_value2(codec, buffer, offset, error);
+  } else {
+    return FL_STANDARD_MESSAGE_CODEC_CLASS(
+               fl_test_standard_message_codec_parent_class)
+        ->read_value_of_type(codec, buffer, offset, type, error);
+  }
+}
+
+static void fl_test_standard_message_codec_class_init(
+    FlTestStandardMessageCodecClass* klass) {
+  FL_STANDARD_MESSAGE_CODEC_CLASS(klass)->write_value =
+      fl_test_standard_message_codec_write_value;
+  FL_STANDARD_MESSAGE_CODEC_CLASS(klass)->read_value_of_type =
+      fl_test_standard_message_codec_read_value_of_type;
+}
+
+static void fl_test_standard_message_codec_init(
+    FlTestStandardMessageCodec* self) {
+  // The following line suppresses a warning for unused function
+  FL_IS_TEST_STANDARD_MESSAGE_CODEC(self);
+}
+
+static FlTestStandardMessageCodec* fl_test_standard_message_codec_new() {
+  return FL_TEST_STANDARD_MESSAGE_CODEC(
+      g_object_new(fl_test_standard_message_codec_get_type(), nullptr));
+}
+
+TEST(FlStandardMessageCodecTest, DecodeCustomType) {
+  g_autoptr(FlTestStandardMessageCodec) codec =
+      fl_test_standard_message_codec_new();
+  g_autoptr(FlValue) value =
+      decode_message_with_codec("800568656c6c6f", FL_MESSAGE_CODEC(codec));
+  ASSERT_EQ(fl_value_get_type(value), FL_VALUE_TYPE_CUSTOM);
+  ASSERT_EQ(fl_value_get_custom_type(value), 128);
+  EXPECT_STREQ(static_cast<const gchar*>(fl_value_get_custom_value(value)),
+               "hello");
+}
+
+TEST(FlStandardMessageCodecTest, DecodeCustomTypes) {
+  g_autoptr(FlTestStandardMessageCodec) codec =
+      fl_test_standard_message_codec_new();
+  g_autoptr(FlValue) value = decode_message_with_codec("0c02800568656c6c6f81",
+                                                       FL_MESSAGE_CODEC(codec));
+  ASSERT_EQ(fl_value_get_type(value), FL_VALUE_TYPE_LIST);
+  EXPECT_EQ(fl_value_get_length(value), static_cast<size_t>(2));
+  FlValue* value1 = fl_value_get_list_value(value, 0);
+  ASSERT_EQ(fl_value_get_type(value1), FL_VALUE_TYPE_CUSTOM);
+  ASSERT_EQ(fl_value_get_custom_type(value1), 128);
+  EXPECT_STREQ(static_cast<const gchar*>(fl_value_get_custom_value(value1)),
+               "hello");
+  FlValue* value2 = fl_value_get_list_value(value, 1);
+  ASSERT_EQ(fl_value_get_type(value2), FL_VALUE_TYPE_CUSTOM);
+  ASSERT_EQ(fl_value_get_custom_type(value2), 129);
+}
+
+TEST(FlStandardMessageCodecTest, EncodeCustomType) {
+  g_autoptr(FlValue) value = fl_value_new_custom(128, "hello", nullptr);
+  g_autoptr(FlTestStandardMessageCodec) codec =
+      fl_test_standard_message_codec_new();
+  g_autofree gchar* hex_string =
+      encode_message_with_codec(value, FL_MESSAGE_CODEC(codec));
+  EXPECT_STREQ(hex_string, "800568656c6c6f");
+}
+
+TEST(FlStandardMessageCodecTest, EncodeCustomTypes) {
+  g_autoptr(FlValue) value = fl_value_new_list();
+  fl_value_append_take(value, fl_value_new_custom(128, "hello", nullptr));
+  fl_value_append_take(value, fl_value_new_custom(129, nullptr, nullptr));
+  g_autoptr(FlTestStandardMessageCodec) codec =
+      fl_test_standard_message_codec_new();
+  g_autofree gchar* hex_string =
+      encode_message_with_codec(value, FL_MESSAGE_CODEC(codec));
+  EXPECT_STREQ(hex_string, "0c02800568656c6c6f81");
+}
+
 TEST(FlStandardMessageCodecTest, EncodeDecode) {
   g_autoptr(FlStandardMessageCodec) codec = fl_standard_message_codec_new();
 
diff --git a/shell/platform/linux/fl_standard_method_codec.cc b/shell/platform/linux/fl_standard_method_codec.cc
index 6d8bc78fb3a42b1932abb2fc2f0ba3bec46fa926..46a803a041aaae5ec3a7ecdfa35f519dadce78fd 100644
--- a/shell/platform/linux/fl_standard_method_codec.cc
+++ b/shell/platform/linux/fl_standard_method_codec.cc
@@ -6,7 +6,6 @@
 
 #include <gmodule.h>
 
-#include "flutter/shell/platform/linux/fl_standard_message_codec_private.h"
 #include "flutter/shell/platform/linux/public/flutter_linux/fl_standard_message_codec.h"
 
 // See lib/src/services/message_codecs.dart in Flutter source for description of
@@ -19,17 +18,52 @@ static constexpr guint8 kEnvelopeTypeError = 1;
 struct _FlStandardMethodCodec {
   FlMethodCodec parent_instance;
 
-  FlStandardMessageCodec* codec;
+  FlStandardMessageCodec* message_codec;
 };
 
+enum { kPropMessageCodec = 1, kPropLast };
+
 G_DEFINE_TYPE(FlStandardMethodCodec,
               fl_standard_method_codec,
               fl_method_codec_get_type())
 
+static void fl_standard_method_codec_set_property(GObject* object,
+                                                  guint prop_id,
+                                                  const GValue* value,
+                                                  GParamSpec* pspec) {
+  FlStandardMethodCodec* self = FL_STANDARD_METHOD_CODEC(object);
+
+  switch (prop_id) {
+    case kPropMessageCodec:
+      g_set_object(&self->message_codec,
+                   FL_STANDARD_MESSAGE_CODEC(g_value_get_object(value)));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+      break;
+  }
+}
+
+static void fl_standard_method_codec_get_property(GObject* object,
+                                                  guint prop_id,
+                                                  GValue* value,
+                                                  GParamSpec* pspec) {
+  FlStandardMethodCodec* self = FL_STANDARD_METHOD_CODEC(object);
+
+  switch (prop_id) {
+    case kPropMessageCodec:
+      g_value_set_object(value, self->message_codec);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+      break;
+  }
+}
+
 static void fl_standard_method_codec_dispose(GObject* object) {
   FlStandardMethodCodec* self = FL_STANDARD_METHOD_CODEC(object);
 
-  g_clear_object(&self->codec);
+  g_clear_object(&self->message_codec);
 
   G_OBJECT_CLASS(fl_standard_method_codec_parent_class)->dispose(object);
 }
@@ -43,11 +77,11 @@ static GBytes* fl_standard_method_codec_encode_method_call(FlMethodCodec* codec,
 
   g_autoptr(GByteArray) buffer = g_byte_array_new();
   g_autoptr(FlValue) name_value = fl_value_new_string(name);
-  if (!fl_standard_message_codec_write_value(self->codec, buffer, name_value,
-                                             error)) {
+  if (!fl_standard_message_codec_write_value(self->message_codec, buffer,
+                                             name_value, error)) {
     return nullptr;
   }
-  if (!fl_standard_message_codec_write_value(self->codec, buffer, args,
+  if (!fl_standard_message_codec_write_value(self->message_codec, buffer, args,
                                              error)) {
     return nullptr;
   }
@@ -67,7 +101,7 @@ static gboolean fl_standard_method_codec_decode_method_call(
 
   size_t offset = 0;
   g_autoptr(FlValue) name_value = fl_standard_message_codec_read_value(
-      self->codec, message, &offset, error);
+      self->message_codec, message, &offset, error);
   if (name_value == nullptr) {
     return FALSE;
   }
@@ -78,7 +112,7 @@ static gboolean fl_standard_method_codec_decode_method_call(
   }
 
   g_autoptr(FlValue) args_value = fl_standard_message_codec_read_value(
-      self->codec, message, &offset, error);
+      self->message_codec, message, &offset, error);
   if (args_value == nullptr) {
     return FALSE;
   }
@@ -105,8 +139,8 @@ static GBytes* fl_standard_method_codec_encode_success_envelope(
   g_autoptr(GByteArray) buffer = g_byte_array_new();
   guint8 type = kEnvelopeTypeSuccess;
   g_byte_array_append(buffer, &type, 1);
-  if (!fl_standard_message_codec_write_value(self->codec, buffer, result,
-                                             error)) {
+  if (!fl_standard_message_codec_write_value(self->message_codec, buffer,
+                                             result, error)) {
     return nullptr;
   }
 
@@ -127,18 +161,18 @@ static GBytes* fl_standard_method_codec_encode_error_envelope(
   guint8 type = kEnvelopeTypeError;
   g_byte_array_append(buffer, &type, 1);
   g_autoptr(FlValue) code_value = fl_value_new_string(code);
-  if (!fl_standard_message_codec_write_value(self->codec, buffer, code_value,
-                                             error)) {
+  if (!fl_standard_message_codec_write_value(self->message_codec, buffer,
+                                             code_value, error)) {
     return nullptr;
   }
   g_autoptr(FlValue) message_value =
       message != nullptr ? fl_value_new_string(message) : nullptr;
-  if (!fl_standard_message_codec_write_value(self->codec, buffer, message_value,
-                                             error)) {
+  if (!fl_standard_message_codec_write_value(self->message_codec, buffer,
+                                             message_value, error)) {
     return nullptr;
   }
-  if (!fl_standard_message_codec_write_value(self->codec, buffer, details,
-                                             error)) {
+  if (!fl_standard_message_codec_write_value(self->message_codec, buffer,
+                                             details, error)) {
     return nullptr;
   }
 
@@ -168,7 +202,7 @@ static FlMethodResponse* fl_standard_method_codec_decode_response(
   g_autoptr(FlMethodResponse) response = nullptr;
   if (type == kEnvelopeTypeError) {
     g_autoptr(FlValue) code = fl_standard_message_codec_read_value(
-        self->codec, message, &offset, error);
+        self->message_codec, message, &offset, error);
     if (code == nullptr) {
       return nullptr;
     }
@@ -179,7 +213,7 @@ static FlMethodResponse* fl_standard_method_codec_decode_response(
     }
 
     g_autoptr(FlValue) error_message = fl_standard_message_codec_read_value(
-        self->codec, message, &offset, error);
+        self->message_codec, message, &offset, error);
     if (error_message == nullptr) {
       return nullptr;
     }
@@ -191,7 +225,7 @@ static FlMethodResponse* fl_standard_method_codec_decode_response(
     }
 
     g_autoptr(FlValue) details = fl_standard_message_codec_read_value(
-        self->codec, message, &offset, error);
+        self->message_codec, message, &offset, error);
     if (details == nullptr) {
       return nullptr;
     }
@@ -204,7 +238,7 @@ static FlMethodResponse* fl_standard_method_codec_decode_response(
         fl_value_get_type(details) != FL_VALUE_TYPE_NULL ? details : nullptr));
   } else if (type == kEnvelopeTypeSuccess) {
     g_autoptr(FlValue) result = fl_standard_message_codec_read_value(
-        self->codec, message, &offset, error);
+        self->message_codec, message, &offset, error);
 
     if (result == nullptr) {
       return nullptr;
@@ -228,7 +262,10 @@ static FlMethodResponse* fl_standard_method_codec_decode_response(
 
 static void fl_standard_method_codec_class_init(
     FlStandardMethodCodecClass* klass) {
+  G_OBJECT_CLASS(klass)->set_property = fl_standard_method_codec_set_property;
+  G_OBJECT_CLASS(klass)->get_property = fl_standard_method_codec_get_property;
   G_OBJECT_CLASS(klass)->dispose = fl_standard_method_codec_dispose;
+
   FL_METHOD_CODEC_CLASS(klass)->encode_method_call =
       fl_standard_method_codec_encode_method_call;
   FL_METHOD_CODEC_CLASS(klass)->decode_method_call =
@@ -239,13 +276,28 @@ static void fl_standard_method_codec_class_init(
       fl_standard_method_codec_encode_error_envelope;
   FL_METHOD_CODEC_CLASS(klass)->decode_response =
       fl_standard_method_codec_decode_response;
-}
 
-static void fl_standard_method_codec_init(FlStandardMethodCodec* self) {
-  self->codec = fl_standard_message_codec_new();
+  g_object_class_install_property(
+      G_OBJECT_CLASS(klass), kPropMessageCodec,
+      g_param_spec_object(
+          "message-codec", "message-codec", "Message codec to use",
+          fl_message_codec_get_type(),
+          static_cast<GParamFlags>(G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+                                   G_PARAM_STATIC_STRINGS)));
 }
 
+static void fl_standard_method_codec_init(FlStandardMethodCodec* self) {}
+
 G_MODULE_EXPORT FlStandardMethodCodec* fl_standard_method_codec_new() {
+  g_autoptr(FlStandardMessageCodec) message_codec =
+      fl_standard_message_codec_new();
+  return fl_standard_method_codec_new_with_message_codec(message_codec);
+}
+
+G_MODULE_EXPORT FlStandardMethodCodec*
+fl_standard_method_codec_new_with_message_codec(
+    FlStandardMessageCodec* message_codec) {
   return FL_STANDARD_METHOD_CODEC(
-      g_object_new(fl_standard_method_codec_get_type(), nullptr));
+      g_object_new(fl_standard_method_codec_get_type(), "message-codec",
+                   message_codec, nullptr));
 }
diff --git a/shell/platform/linux/fl_standard_method_codec_test.cc b/shell/platform/linux/fl_standard_method_codec_test.cc
index 8309b7bccc2db1df3dd4dab53f0b5d6edef7bae3..1685a7bf7de4df652e368e7795ba2409f56a3666 100644
--- a/shell/platform/linux/fl_standard_method_codec_test.cc
+++ b/shell/platform/linux/fl_standard_method_codec_test.cc
@@ -5,9 +5,112 @@
 #include "flutter/shell/platform/linux/public/flutter_linux/fl_standard_method_codec.h"
 #include "flutter/shell/platform/linux/fl_method_codec_private.h"
 #include "flutter/shell/platform/linux/public/flutter_linux/fl_message_codec.h"
+#include "flutter/shell/platform/linux/public/flutter_linux/fl_standard_message_codec.h"
 #include "flutter/shell/platform/linux/testing/fl_test.h"
 #include "gtest/gtest.h"
 
+G_DECLARE_FINAL_TYPE(FlTestMethodMessageCodec,
+                     fl_test_method_message_codec,
+                     FL,
+                     TEST_METHOD_MESSAGE_CODEC,
+                     FlStandardMessageCodec)
+
+struct _FlTestMethodMessageCodec {
+  FlStandardMessageCodec parent_instance;
+};
+
+G_DEFINE_TYPE(FlTestMethodMessageCodec,
+              fl_test_method_message_codec,
+              fl_standard_message_codec_get_type())
+
+static gboolean write_custom_value(FlStandardMessageCodec* codec,
+                                   GByteArray* buffer,
+                                   FlValue* value,
+                                   GError** error) {
+  const gchar* text =
+      static_cast<const gchar*>(fl_value_get_custom_value(value));
+  size_t length = strlen(text);
+
+  uint8_t type = 128;
+  g_byte_array_append(buffer, &type, sizeof(uint8_t));
+  fl_standard_message_codec_write_size(codec, buffer, length);
+  g_byte_array_append(buffer, reinterpret_cast<const uint8_t*>(text), length);
+  return TRUE;
+}
+
+static gboolean fl_test_method_message_codec_write_value(
+    FlStandardMessageCodec* codec,
+    GByteArray* buffer,
+    FlValue* value,
+    GError** error) {
+  if (fl_value_get_type(value) == FL_VALUE_TYPE_CUSTOM &&
+      fl_value_get_custom_type(value) == 128) {
+    return write_custom_value(codec, buffer, value, error);
+  } else {
+    return FL_STANDARD_MESSAGE_CODEC_CLASS(
+               fl_test_method_message_codec_parent_class)
+        ->write_value(codec, buffer, value, error);
+  }
+}
+
+static FlValue* read_custom_value(FlStandardMessageCodec* codec,
+                                  GBytes* buffer,
+                                  size_t* offset,
+                                  GError** error) {
+  uint32_t length;
+  if (!fl_standard_message_codec_read_size(codec, buffer, offset, &length,
+                                           error)) {
+    return nullptr;
+  }
+  if (*offset + length > g_bytes_get_size(buffer)) {
+    g_set_error(error, FL_MESSAGE_CODEC_ERROR,
+                FL_MESSAGE_CODEC_ERROR_OUT_OF_DATA, "Unexpected end of data");
+    return nullptr;
+  }
+  FlValue* value = fl_value_new_custom(
+      128,
+      g_strndup(static_cast<const gchar*>(g_bytes_get_data(buffer, nullptr)) +
+                    *offset,
+                length),
+      g_free);
+  *offset += length;
+
+  return value;
+}
+
+static FlValue* fl_test_method_message_codec_read_value_of_type(
+    FlStandardMessageCodec* codec,
+    GBytes* buffer,
+    size_t* offset,
+    int type,
+    GError** error) {
+  if (type == 128) {
+    return read_custom_value(codec, buffer, offset, error);
+  } else {
+    return FL_STANDARD_MESSAGE_CODEC_CLASS(
+               fl_test_method_message_codec_parent_class)
+        ->read_value_of_type(codec, buffer, offset, type, error);
+  }
+}
+
+static void fl_test_method_message_codec_class_init(
+    FlTestMethodMessageCodecClass* klass) {
+  FL_STANDARD_MESSAGE_CODEC_CLASS(klass)->write_value =
+      fl_test_method_message_codec_write_value;
+  FL_STANDARD_MESSAGE_CODEC_CLASS(klass)->read_value_of_type =
+      fl_test_method_message_codec_read_value_of_type;
+}
+
+static void fl_test_method_message_codec_init(FlTestMethodMessageCodec* self) {
+  // The following line suppresses a warning for unused function
+  FL_IS_TEST_METHOD_MESSAGE_CODEC(self);
+}
+
+static FlTestMethodMessageCodec* fl_test_method_message_codec_new() {
+  return FL_TEST_METHOD_MESSAGE_CODEC(
+      g_object_new(fl_test_method_message_codec_get_type(), nullptr));
+}
+
 // NOTE(robert-ancell) These test cases assumes a little-endian architecture.
 // These tests will need to be updated if tested on a big endian architecture.
 
@@ -375,3 +478,32 @@ TEST(FlStandardMethodCodecTest, DecodeResponseUnknownEnvelope) {
   decode_error_response("02", FL_MESSAGE_CODEC_ERROR,
                         FL_MESSAGE_CODEC_ERROR_FAILED);
 }
+
+TEST(FlStandardMethodCodecTest, CustomMessageCodec) {
+  g_autoptr(FlTestMethodMessageCodec) message_codec =
+      fl_test_method_message_codec_new();
+  g_autoptr(FlStandardMethodCodec) codec =
+      fl_standard_method_codec_new_with_message_codec(
+          FL_STANDARD_MESSAGE_CODEC(message_codec));
+
+  g_autoptr(GError) error = nullptr;
+  g_autoptr(FlValue) value = fl_value_new_custom(128, "hello", nullptr);
+  g_autoptr(GBytes) message = fl_method_codec_encode_success_envelope(
+      FL_METHOD_CODEC(codec), value, &error);
+  EXPECT_NE(message, nullptr);
+  EXPECT_EQ(error, nullptr);
+  g_autofree gchar* hex_string = bytes_to_hex_string(message);
+  EXPECT_STREQ(hex_string, "00800568656c6c6f");
+
+  g_autoptr(FlMethodResponse) response =
+      fl_method_codec_decode_response(FL_METHOD_CODEC(codec), message, &error);
+  EXPECT_NE(response, nullptr);
+  EXPECT_EQ(error, nullptr);
+  EXPECT_TRUE(FL_IS_METHOD_SUCCESS_RESPONSE(response));
+  FlValue* result = fl_method_success_response_get_result(
+      FL_METHOD_SUCCESS_RESPONSE(response));
+  ASSERT_EQ(fl_value_get_type(result), FL_VALUE_TYPE_CUSTOM);
+  ASSERT_EQ(fl_value_get_custom_type(result), 128);
+  EXPECT_STREQ(static_cast<const gchar*>(fl_value_get_custom_value(result)),
+               "hello");
+}
diff --git a/shell/platform/linux/fl_text_input_plugin.cc b/shell/platform/linux/fl_text_input_plugin.cc
index bdc0762fe1f461e21fb80b6b5955aff7dbf17b95..2d5fa0c9f58f6eb245bb4c0983a6c807c8df773e 100644
--- a/shell/platform/linux/fl_text_input_plugin.cc
+++ b/shell/platform/linux/fl_text_input_plugin.cc
@@ -47,6 +47,8 @@ static constexpr char kTextAffinityDownstream[] = "TextAffinity.downstream";
 static constexpr char kMultilineInputType[] = "TextInputType.multiline";
 static constexpr char kNoneInputType[] = "TextInputType.none";
 
+static constexpr char kNewlineInputAction[] = "TextInputAction.newline";
+
 static constexpr int64_t kClientIdUnset = -1;
 
 typedef enum {
@@ -261,6 +263,8 @@ static void im_preedit_changed_cb(FlTextInputPlugin* self) {
   FlTextInputPluginPrivate* priv = static_cast<FlTextInputPluginPrivate*>(
       fl_text_input_plugin_get_instance_private(self));
   std::string text_before_change = priv->text_model->GetText();
+  flutter::TextRange composing_before_change =
+      priv->text_model->composing_range();
   g_autofree gchar* buf = nullptr;
   gint cursor_offset = 0;
   gtk_im_context_get_preedit_string(priv->im_context, &buf, nullptr,
@@ -276,7 +280,7 @@ static void im_preedit_changed_cb(FlTextInputPlugin* self) {
   if (priv->enable_delta_model) {
     std::string text(buf);
     flutter::TextEditingDelta delta = flutter::TextEditingDelta(
-        text_before_change, priv->text_model->composing_range(), text);
+        text_before_change, composing_before_change, text);
     update_editing_state_with_delta(self, &delta);
   } else {
     update_editing_state(self);
@@ -288,7 +292,10 @@ static void im_commit_cb(FlTextInputPlugin* self, const gchar* text) {
   FlTextInputPluginPrivate* priv = static_cast<FlTextInputPluginPrivate*>(
       fl_text_input_plugin_get_instance_private(self));
   std::string text_before_change = priv->text_model->GetText();
+  flutter::TextRange composing_before_change =
+      priv->text_model->composing_range();
   flutter::TextRange selection_before_change = priv->text_model->selection();
+  gboolean was_composing = priv->text_model->composing();
 
   priv->text_model->AddText(text);
   if (priv->text_model->composing()) {
@@ -296,9 +303,12 @@ static void im_commit_cb(FlTextInputPlugin* self, const gchar* text) {
   }
 
   if (priv->enable_delta_model) {
-    flutter::TextEditingDelta delta = flutter::TextEditingDelta(
-        text_before_change, selection_before_change, text);
-    update_editing_state_with_delta(self, &delta);
+    flutter::TextRange replace_range =
+        was_composing ? composing_before_change : selection_before_change;
+    std::unique_ptr<flutter::TextEditingDelta> delta =
+        std::make_unique<flutter::TextEditingDelta>(text_before_change,
+                                                    replace_range, text);
+    update_editing_state_with_delta(self, delta.get());
   } else {
     update_editing_state(self);
   }
@@ -310,8 +320,8 @@ static void im_preedit_end_cb(FlTextInputPlugin* self) {
       fl_text_input_plugin_get_instance_private(self));
   priv->text_model->EndComposing();
   if (priv->enable_delta_model) {
-    flutter::TextEditingDelta delta = flutter::TextEditingDelta(
-        "", flutter::TextRange(-1, -1), priv->text_model->GetText());
+    flutter::TextEditingDelta delta =
+        flutter::TextEditingDelta(priv->text_model->GetText());
     update_editing_state_with_delta(self, &delta);
   } else {
     update_editing_state(self);
@@ -616,8 +626,8 @@ static gboolean fl_text_input_plugin_filter_keypress_default(
     return FALSE;
   }
 
-  GdkEventKey* key_event = reinterpret_cast<GdkEventKey*>(event->origin);
-  if (gtk_im_context_filter_keypress(priv->im_context, key_event)) {
+  if (gtk_im_context_filter_keypress(
+          priv->im_context, reinterpret_cast<GdkEventKey*>(event->origin))) {
     return TRUE;
   }
 
@@ -642,7 +652,8 @@ static gboolean fl_text_input_plugin_filter_keypress_default(
       case GDK_KEY_Return:
       case GDK_KEY_KP_Enter:
       case GDK_KEY_ISO_Enter:
-        if (priv->input_type == kFlTextInputTypeMultiline) {
+        if (priv->input_type == kFlTextInputTypeMultiline &&
+            strcmp(priv->input_action, kNewlineInputAction) == 0) {
           priv->text_model->AddCodePoint('\n');
           text = "\n";
           changed = TRUE;
diff --git a/shell/platform/linux/fl_text_input_plugin.h b/shell/platform/linux/fl_text_input_plugin.h
index d2c25ebb16b5039cada41b6f0bcf53d991e5fbf3..17a33c9114e15dd17e26ba2a4d48359ab916d167 100644
--- a/shell/platform/linux/fl_text_input_plugin.h
+++ b/shell/platform/linux/fl_text_input_plugin.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_TEXT_INPUT_LINUX_FL_TEXT_INPUT_PLUGIN_H_
-#define FLUTTER_SHELL_TEXT_INPUT_LINUX_FL_TEXT_INPUT_PLUGIN_H_
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_FL_TEXT_INPUT_PLUGIN_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_FL_TEXT_INPUT_PLUGIN_H_
 
 #include <gtk/gtk.h>
 
@@ -65,4 +65,4 @@ gboolean fl_text_input_plugin_filter_keypress(FlTextInputPlugin* plugin,
 
 G_END_DECLS
 
-#endif  // FLUTTER_SHELL_TEXT_INPUT_LINUX_FL_TEXT_INPUT_PLUGIN_H_
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_TEXT_INPUT_PLUGIN_H_
diff --git a/shell/platform/linux/fl_text_input_plugin_test.cc b/shell/platform/linux/fl_text_input_plugin_test.cc
index 6f952d7ede52dae2ac8473a993d5b869ce3a149a..d01fa7642f8ba793ccdf1d80d448f73dac49bd35 100644
--- a/shell/platform/linux/fl_text_input_plugin_test.cc
+++ b/shell/platform/linux/fl_text_input_plugin_test.cc
@@ -372,6 +372,71 @@ TEST(FlTextInputPluginTest, PerformAction) {
   send_key_event(plugin, GDK_KEY_Return);
 }
 
+// Regression test for https://github.com/flutter/flutter/issues/125879.
+TEST(FlTextInputPluginTest, MultilineWithSendAction) {
+  ::testing::NiceMock<flutter::testing::MockBinaryMessenger> messenger;
+  ::testing::NiceMock<flutter::testing::MockIMContext> context;
+  ::testing::NiceMock<flutter::testing::MockTextInputViewDelegate> delegate;
+
+  g_autoptr(FlTextInputPlugin) plugin =
+      fl_text_input_plugin_new(messenger, context, delegate);
+  EXPECT_NE(plugin, nullptr);
+
+  // Set input config.
+  g_autoptr(FlValue) config = build_input_config({
+      .client_id = 1,
+      .input_type = "TextInputType.multiline",
+      .input_action = "TextInputAction.send",
+  });
+  g_autoptr(FlJsonMethodCodec) codec = fl_json_method_codec_new();
+  g_autoptr(GBytes) set_client = fl_method_codec_encode_method_call(
+      FL_METHOD_CODEC(codec), "TextInput.setClient", config, nullptr);
+
+  g_autoptr(FlValue) null = fl_value_new_null();
+  EXPECT_CALL(messenger, fl_binary_messenger_send_response(
+                             ::testing::Eq<FlBinaryMessenger*>(messenger),
+                             ::testing::_, SuccessResponse(null), ::testing::_))
+      .WillOnce(::testing::Return(true));
+
+  messenger.ReceiveMessage("flutter/textinput", set_client);
+
+  // Set editing state.
+  g_autoptr(FlValue) state = build_editing_state({
+      .text = "Flutter",
+      .selection_base = 7,
+      .selection_extent = 7,
+  });
+  g_autoptr(GBytes) set_state = fl_method_codec_encode_method_call(
+      FL_METHOD_CODEC(codec), "TextInput.setEditingState", state, nullptr);
+
+  EXPECT_CALL(messenger, fl_binary_messenger_send_response(
+                             ::testing::Eq<FlBinaryMessenger*>(messenger),
+                             ::testing::_, SuccessResponse(null), ::testing::_))
+      .WillOnce(::testing::Return(true));
+
+  messenger.ReceiveMessage("flutter/textinput", set_state);
+
+  // Perform action.
+  g_autoptr(FlValue) action = build_list({
+      fl_value_new_int(1),  // client_id
+      fl_value_new_string("TextInputAction.send"),
+  });
+
+  // Because the input action is not set to TextInputAction.newline, the next
+  // expected call is "TextInputClient.performAction". If the input action was
+  // set to TextInputAction.newline the next call would be
+  // "TextInputClient.updateEditingState" (this case is tested in the test named
+  // 'PerformAction').
+  EXPECT_CALL(messenger, fl_binary_messenger_send_on_channel(
+                             ::testing::Eq<FlBinaryMessenger*>(messenger),
+                             ::testing::StrEq("flutter/textinput"),
+                             MethodCall("TextInputClient.performAction",
+                                        FlValueEq(action)),
+                             ::testing::_, ::testing::_, ::testing::_));
+
+  send_key_event(plugin, GDK_KEY_Return);
+}
+
 TEST(FlTextInputPluginTest, MoveCursor) {
   ::testing::NiceMock<flutter::testing::MockBinaryMessenger> messenger;
   ::testing::NiceMock<flutter::testing::MockIMContext> context;
@@ -893,6 +958,8 @@ TEST(FlTextInputPluginTest, ComposingDelta) {
 
   messenger.ReceiveMessage("flutter/textinput", set_client);
 
+  g_signal_emit_by_name(context, "preedit-start", nullptr);
+
   // update
   EXPECT_CALL(context,
               gtk_im_context_get_preedit_string(
@@ -911,7 +978,7 @@ TEST(FlTextInputPluginTest, ComposingDelta) {
                   .old_text = "",
                   .delta_text = "Flutter ",
                   .delta_start = 0,
-                  .delta_end = 8,
+                  .delta_end = 0,
                   .selection_base = 8,
                   .selection_extent = 8,
                   .composing_base = 0,
@@ -939,13 +1006,13 @@ TEST(FlTextInputPluginTest, ComposingDelta) {
           build_list({
               build_editing_delta({
                   .old_text = "Flutter ",
-                  .delta_text = "engine",
-                  .delta_start = 8,
+                  .delta_text = "Flutter engine",
+                  .delta_start = 0,
                   .delta_end = 8,
                   .selection_base = 14,
                   .selection_extent = 14,
-                  .composing_base = 0,
-                  .composing_extent = 8,
+                  .composing_base = -1,
+                  .composing_extent = -1,
               }),
           }),
       }}),
@@ -959,7 +1026,7 @@ TEST(FlTextInputPluginTest, ComposingDelta) {
                              FlValueEq(commit)),
                   ::testing::_, ::testing::_, ::testing::_));
 
-  g_signal_emit_by_name(context, "commit", "engine", nullptr);
+  g_signal_emit_by_name(context, "commit", "Flutter engine", nullptr);
 
   // end
   g_autoptr(FlValue) end = build_list({
@@ -968,7 +1035,7 @@ TEST(FlTextInputPluginTest, ComposingDelta) {
           "deltas",
           build_list({
               build_editing_delta({
-                  .delta_text = "Flutter engine",
+                  .old_text = "Flutter engine",
                   .selection_base = 14,
                   .selection_extent = 14,
               }),
@@ -986,3 +1053,241 @@ TEST(FlTextInputPluginTest, ComposingDelta) {
 
   g_signal_emit_by_name(context, "preedit-end", nullptr);
 }
+
+TEST(FlTextInputPluginTest, NonComposingDelta) {
+  ::testing::NiceMock<flutter::testing::MockBinaryMessenger> messenger;
+  ::testing::NiceMock<flutter::testing::MockIMContext> context;
+  ::testing::NiceMock<flutter::testing::MockTextInputViewDelegate> delegate;
+
+  g_autoptr(FlTextInputPlugin) plugin =
+      fl_text_input_plugin_new(messenger, context, delegate);
+  EXPECT_NE(plugin, nullptr);
+
+  // set config
+  g_autoptr(FlValue) args = build_input_config({
+      .client_id = 1,
+      .enable_delta_model = true,
+  });
+  g_autoptr(FlJsonMethodCodec) codec = fl_json_method_codec_new();
+  g_autoptr(GBytes) set_client = fl_method_codec_encode_method_call(
+      FL_METHOD_CODEC(codec), "TextInput.setClient", args, nullptr);
+
+  g_autoptr(FlValue) null = fl_value_new_null();
+  EXPECT_CALL(messenger, fl_binary_messenger_send_response(
+                             ::testing::Eq<FlBinaryMessenger*>(messenger),
+                             ::testing::A<FlBinaryMessengerResponseHandle*>(),
+                             SuccessResponse(null), ::testing::A<GError**>()))
+      .WillOnce(::testing::Return(true));
+
+  messenger.ReceiveMessage("flutter/textinput", set_client);
+
+  // commit F
+  g_autoptr(FlValue) commit = build_list({
+      fl_value_new_int(1),  // client_id
+      build_map({{
+          "deltas",
+          build_list({
+              build_editing_delta({
+                  .old_text = "",
+                  .delta_text = "F",
+                  .delta_start = 0,
+                  .delta_end = 0,
+                  .selection_base = 1,
+                  .selection_extent = 1,
+                  .composing_base = -1,
+                  .composing_extent = -1,
+              }),
+          }),
+      }}),
+  });
+
+  EXPECT_CALL(messenger,
+              fl_binary_messenger_send_on_channel(
+                  ::testing::Eq<FlBinaryMessenger*>(messenger),
+                  ::testing::StrEq("flutter/textinput"),
+                  MethodCall("TextInputClient.updateEditingStateWithDeltas",
+                             FlValueEq(commit)),
+                  ::testing::_, ::testing::_, ::testing::_));
+
+  g_signal_emit_by_name(context, "commit", "F", nullptr);
+
+  // commit l
+  g_autoptr(FlValue) commitL = build_list({
+      fl_value_new_int(1),  // client_id
+      build_map({{
+          "deltas",
+          build_list({
+              build_editing_delta({
+                  .old_text = "F",
+                  .delta_text = "l",
+                  .delta_start = 1,
+                  .delta_end = 1,
+                  .selection_base = 2,
+                  .selection_extent = 2,
+                  .composing_base = -1,
+                  .composing_extent = -1,
+              }),
+          }),
+      }}),
+  });
+
+  EXPECT_CALL(messenger,
+              fl_binary_messenger_send_on_channel(
+                  ::testing::Eq<FlBinaryMessenger*>(messenger),
+                  ::testing::StrEq("flutter/textinput"),
+                  MethodCall("TextInputClient.updateEditingStateWithDeltas",
+                             FlValueEq(commitL)),
+                  ::testing::_, ::testing::_, ::testing::_));
+
+  g_signal_emit_by_name(context, "commit", "l", nullptr);
+
+  // commit u
+  g_autoptr(FlValue) commitU = build_list({
+      fl_value_new_int(1),  // client_id
+      build_map({{
+          "deltas",
+          build_list({
+              build_editing_delta({
+                  .old_text = "Fl",
+                  .delta_text = "u",
+                  .delta_start = 2,
+                  .delta_end = 2,
+                  .selection_base = 3,
+                  .selection_extent = 3,
+                  .composing_base = -1,
+                  .composing_extent = -1,
+              }),
+          }),
+      }}),
+  });
+
+  EXPECT_CALL(messenger,
+              fl_binary_messenger_send_on_channel(
+                  ::testing::Eq<FlBinaryMessenger*>(messenger),
+                  ::testing::StrEq("flutter/textinput"),
+                  MethodCall("TextInputClient.updateEditingStateWithDeltas",
+                             FlValueEq(commitU)),
+                  ::testing::_, ::testing::_, ::testing::_));
+
+  g_signal_emit_by_name(context, "commit", "u", nullptr);
+
+  // commit t
+  g_autoptr(FlValue) commitTa = build_list({
+      fl_value_new_int(1),  // client_id
+      build_map({{
+          "deltas",
+          build_list({
+              build_editing_delta({
+                  .old_text = "Flu",
+                  .delta_text = "t",
+                  .delta_start = 3,
+                  .delta_end = 3,
+                  .selection_base = 4,
+                  .selection_extent = 4,
+                  .composing_base = -1,
+                  .composing_extent = -1,
+              }),
+          }),
+      }}),
+  });
+
+  EXPECT_CALL(messenger,
+              fl_binary_messenger_send_on_channel(
+                  ::testing::Eq<FlBinaryMessenger*>(messenger),
+                  ::testing::StrEq("flutter/textinput"),
+                  MethodCall("TextInputClient.updateEditingStateWithDeltas",
+                             FlValueEq(commitTa)),
+                  ::testing::_, ::testing::_, ::testing::_));
+
+  g_signal_emit_by_name(context, "commit", "t", nullptr);
+
+  // commit t again
+  g_autoptr(FlValue) commitTb = build_list({
+      fl_value_new_int(1),  // client_id
+      build_map({{
+          "deltas",
+          build_list({
+              build_editing_delta({
+                  .old_text = "Flut",
+                  .delta_text = "t",
+                  .delta_start = 4,
+                  .delta_end = 4,
+                  .selection_base = 5,
+                  .selection_extent = 5,
+                  .composing_base = -1,
+                  .composing_extent = -1,
+              }),
+          }),
+      }}),
+  });
+
+  EXPECT_CALL(messenger,
+              fl_binary_messenger_send_on_channel(
+                  ::testing::Eq<FlBinaryMessenger*>(messenger),
+                  ::testing::StrEq("flutter/textinput"),
+                  MethodCall("TextInputClient.updateEditingStateWithDeltas",
+                             FlValueEq(commitTb)),
+                  ::testing::_, ::testing::_, ::testing::_));
+
+  g_signal_emit_by_name(context, "commit", "t", nullptr);
+
+  // commit e
+  g_autoptr(FlValue) commitE = build_list({
+      fl_value_new_int(1),  // client_id
+      build_map({{
+          "deltas",
+          build_list({
+              build_editing_delta({
+                  .old_text = "Flutt",
+                  .delta_text = "e",
+                  .delta_start = 5,
+                  .delta_end = 5,
+                  .selection_base = 6,
+                  .selection_extent = 6,
+                  .composing_base = -1,
+                  .composing_extent = -1,
+              }),
+          }),
+      }}),
+  });
+
+  EXPECT_CALL(messenger,
+              fl_binary_messenger_send_on_channel(
+                  ::testing::Eq<FlBinaryMessenger*>(messenger),
+                  ::testing::StrEq("flutter/textinput"),
+                  MethodCall("TextInputClient.updateEditingStateWithDeltas",
+                             FlValueEq(commitE)),
+                  ::testing::_, ::testing::_, ::testing::_));
+
+  g_signal_emit_by_name(context, "commit", "e", nullptr);
+
+  // commit r
+  g_autoptr(FlValue) commitR = build_list({
+      fl_value_new_int(1),  // client_id
+      build_map({{
+          "deltas",
+          build_list({
+              build_editing_delta({
+                  .old_text = "Flutte",
+                  .delta_text = "r",
+                  .delta_start = 6,
+                  .delta_end = 6,
+                  .selection_base = 7,
+                  .selection_extent = 7,
+                  .composing_base = -1,
+                  .composing_extent = -1,
+              }),
+          }),
+      }}),
+  });
+
+  EXPECT_CALL(messenger,
+              fl_binary_messenger_send_on_channel(
+                  ::testing::Eq<FlBinaryMessenger*>(messenger),
+                  ::testing::StrEq("flutter/textinput"),
+                  MethodCall("TextInputClient.updateEditingStateWithDeltas",
+                             FlValueEq(commitR)),
+                  ::testing::_, ::testing::_, ::testing::_));
+
+  g_signal_emit_by_name(context, "commit", "r", nullptr);
+}
diff --git a/shell/platform/linux/fl_texture.cc b/shell/platform/linux/fl_texture.cc
index ff26adc31bda398b7e355ad65626705aecc9ed01..6c0afcf9acd0a4337d0c5c3cea9c187de0fd1d4f 100644
--- a/shell/platform/linux/fl_texture.cc
+++ b/shell/platform/linux/fl_texture.cc
@@ -8,14 +8,16 @@
 #include <gmodule.h>
 #include <cstdio>
 
-// Added here to stop the compiler from optimising this function away.
-G_MODULE_EXPORT GType fl_texture_get_type();
-
 G_DEFINE_INTERFACE(FlTexture, fl_texture, G_TYPE_OBJECT)
 
 static void fl_texture_default_init(FlTextureInterface* self) {}
 
-int64_t fl_texture_get_texture_id(FlTexture* self) {
+void fl_texture_set_id(FlTexture* self, int64_t id) {
+  g_return_if_fail(FL_IS_TEXTURE(self));
+  FL_TEXTURE_GET_IFACE(self)->set_id(self, id);
+}
+
+G_MODULE_EXPORT int64_t fl_texture_get_id(FlTexture* self) {
   g_return_val_if_fail(FL_IS_TEXTURE(self), -1);
-  return reinterpret_cast<int64_t>(self);
+  return FL_TEXTURE_GET_IFACE(self)->get_id(self);
 }
diff --git a/shell/platform/linux/fl_texture_gl.cc b/shell/platform/linux/fl_texture_gl.cc
index c447ccc7eb9f1d99539e30b5983d153eb69b9896..f91922a952f37ae4002a47a27f4e08d7a18f5382 100644
--- a/shell/platform/linux/fl_texture_gl.cc
+++ b/shell/platform/linux/fl_texture_gl.cc
@@ -9,16 +9,39 @@
 #include <gmodule.h>
 #include <cstdio>
 
-// Added here to stop the compiler from optimising this function away.
-G_MODULE_EXPORT GType fl_texture_gl_get_type();
+typedef struct {
+  int64_t id;
+} FlTextureGLPrivate;
 
-static void fl_texture_gl_texture_iface_init(FlTextureInterface* iface) {}
+static void fl_texture_gl_texture_iface_init(FlTextureInterface* iface);
 
 G_DEFINE_TYPE_WITH_CODE(FlTextureGL,
                         fl_texture_gl,
                         G_TYPE_OBJECT,
                         G_IMPLEMENT_INTERFACE(fl_texture_get_type(),
-                                              fl_texture_gl_texture_iface_init))
+                                              fl_texture_gl_texture_iface_init);
+                        G_ADD_PRIVATE(FlTextureGL))
+
+// Implements FlTexture::set_id
+static void fl_texture_gl_set_id(FlTexture* texture, int64_t id) {
+  FlTextureGL* self = FL_TEXTURE_GL(texture);
+  FlTextureGLPrivate* priv = reinterpret_cast<FlTextureGLPrivate*>(
+      fl_texture_gl_get_instance_private(self));
+  priv->id = id;
+}
+
+// Implements FlTexture::set_id
+static int64_t fl_texture_gl_get_id(FlTexture* texture) {
+  FlTextureGL* self = FL_TEXTURE_GL(texture);
+  FlTextureGLPrivate* priv = reinterpret_cast<FlTextureGLPrivate*>(
+      fl_texture_gl_get_instance_private(self));
+  return priv->id;
+}
+
+static void fl_texture_gl_texture_iface_init(FlTextureInterface* iface) {
+  iface->set_id = fl_texture_gl_set_id;
+  iface->get_id = fl_texture_gl_get_id;
+}
 
 static void fl_texture_gl_class_init(FlTextureGLClass* klass) {}
 
diff --git a/shell/platform/linux/fl_texture_gl_test.cc b/shell/platform/linux/fl_texture_gl_test.cc
index 14d0b888e8c1396560ce80e0c1555a5bdf77f025..275d0cd64eb81ffbecd31d54f9bb33bbd09cd2f6 100644
--- a/shell/platform/linux/fl_texture_gl_test.cc
+++ b/shell/platform/linux/fl_texture_gl_test.cc
@@ -59,15 +59,14 @@ static FlTestTexture* fl_test_texture_new() {
 }
 
 // Test that getting the texture ID works.
-TEST(FlTextureTest, TextureID) {
-  // Texture ID is not assigned until the testure is populated.
+TEST(FlTextureGLTest, TextureID) {
   g_autoptr(FlTexture) texture = FL_TEXTURE(fl_test_texture_new());
-  EXPECT_EQ(fl_texture_get_texture_id(texture),
-            reinterpret_cast<int64_t>(texture));
+  fl_texture_set_id(texture, 42);
+  EXPECT_EQ(fl_texture_get_id(texture), static_cast<int64_t>(42));
 }
 
 // Test that populating an OpenGL texture works.
-TEST(FlTextureTest, PopulateTexture) {
+TEST(FlTextureGLTest, PopulateTexture) {
   g_autoptr(FlTextureGL) texture = FL_TEXTURE_GL(fl_test_texture_new());
   FlutterOpenGLTexture opengl_texture = {0};
   g_autoptr(GError) error = nullptr;
diff --git a/shell/platform/linux/fl_texture_private.h b/shell/platform/linux/fl_texture_private.h
index 0bf304eb524d7c1391433d9b2a2cd3cfa4b5d142..892ff7440b3a284191bcdec9f727f8470f93ea85 100644
--- a/shell/platform/linux/fl_texture_private.h
+++ b/shell/platform/linux/fl_texture_private.h
@@ -11,14 +11,13 @@
 G_BEGIN_DECLS
 
 /**
- * fl_texture_get_texture_id:
+ * fl_texture_set_id:
  * @texture: an #FlTexture.
+ * @id: a texture ID.
  *
- * Retrieves the unique id of this texture.
- *
- * Returns: the unique id of this texture.
+ * Set the ID for a texture.
  */
-int64_t fl_texture_get_texture_id(FlTexture* texture);
+void fl_texture_set_id(FlTexture* texture, int64_t id);
 
 G_END_DECLS
 
diff --git a/shell/platform/linux/fl_texture_registrar.cc b/shell/platform/linux/fl_texture_registrar.cc
index a2a6669a5ed08edd4e954041b6dcaab71240a2ba..7ef0f85a04fd4ea0d6da9f1e77f0e7178ea09aca 100644
--- a/shell/platform/linux/fl_texture_registrar.cc
+++ b/shell/platform/linux/fl_texture_registrar.cc
@@ -25,12 +25,18 @@ struct _FlTextureRegistrarImpl {
   // Weak reference to the engine this texture registrar is created for.
   FlEngine* engine;
 
+  // ID to assign to the next new texture.
+  int64_t next_id;
+
   // Internal record for registered textures.
   //
   // It is a map from Flutter texture ID to #FlTexture instance created by
   // plugins.  The keys are directly stored int64s. The values are stored
   // pointer to #FlTexture.  This table is freed by the responder.
   GHashTable* textures;
+
+  // The mutex guard to make `textures` thread-safe.
+  GMutex textures_mutex;
 };
 
 static void fl_texture_registrar_impl_iface_init(
@@ -54,21 +60,26 @@ static void engine_weak_notify_cb(gpointer user_data,
   self->engine = nullptr;
 
   // Unregister any textures.
+  g_mutex_lock(&self->textures_mutex);
   g_autoptr(GHashTable) textures = self->textures;
   self->textures = g_hash_table_new_full(g_direct_hash, g_direct_equal, nullptr,
                                          g_object_unref);
   g_hash_table_remove_all(textures);
+  g_mutex_unlock(&self->textures_mutex);
 }
 
 static void fl_texture_registrar_impl_dispose(GObject* object) {
   FlTextureRegistrarImpl* self = FL_TEXTURE_REGISTRAR_IMPL(object);
 
+  g_mutex_lock(&self->textures_mutex);
   g_clear_pointer(&self->textures, g_hash_table_unref);
+  g_mutex_unlock(&self->textures_mutex);
 
   if (self->engine != nullptr) {
     g_object_weak_unref(G_OBJECT(self->engine), engine_weak_notify_cb, self);
     self->engine = nullptr;
   }
+  g_mutex_clear(&self->textures_mutex);
 
   G_OBJECT_CLASS(fl_texture_registrar_impl_parent_class)->dispose(object);
 }
@@ -83,16 +94,26 @@ static gboolean register_texture(FlTextureRegistrar* registrar,
   FlTextureRegistrarImpl* self = FL_TEXTURE_REGISTRAR_IMPL(registrar);
 
   if (FL_IS_TEXTURE_GL(texture) || FL_IS_PIXEL_BUFFER_TEXTURE(texture)) {
-    g_hash_table_insert(self->textures,
-                        GINT_TO_POINTER(fl_texture_get_texture_id(texture)),
-                        g_object_ref(texture));
-
     if (self->engine == nullptr) {
       return FALSE;
     }
 
-    return fl_engine_register_external_texture(
-        self->engine, fl_texture_get_texture_id(texture));
+    // We ideally would use numeric IDs, but for backwards compatibility with
+    // existing code use the address of the texture. Once all code uses
+    // fl_texture_get_id we can re-enable this method. See
+    // https://github.com/flutter/flutter/issues/124009 int64_t id =
+    // self->next_id++;
+    int64_t id = reinterpret_cast<int64_t>(texture);
+    if (fl_engine_register_external_texture(self->engine, id)) {
+      fl_texture_set_id(texture, id);
+      g_mutex_lock(&self->textures_mutex);
+      g_hash_table_insert(self->textures, GINT_TO_POINTER(id),
+                          g_object_ref(texture));
+      g_mutex_unlock(&self->textures_mutex);
+      return TRUE;
+    } else {
+      return FALSE;
+    }
   } else {
     // We currently only support #FlTextureGL and #FlPixelBufferTexture.
     return FALSE;
@@ -102,8 +123,11 @@ static gboolean register_texture(FlTextureRegistrar* registrar,
 static FlTexture* lookup_texture(FlTextureRegistrar* registrar,
                                  int64_t texture_id) {
   FlTextureRegistrarImpl* self = FL_TEXTURE_REGISTRAR_IMPL(registrar);
-  return reinterpret_cast<FlTexture*>(
+  g_mutex_lock(&self->textures_mutex);
+  FlTexture* texture = reinterpret_cast<FlTexture*>(
       g_hash_table_lookup(self->textures, GINT_TO_POINTER(texture_id)));
+  g_mutex_unlock(&self->textures_mutex);
+  return texture;
 }
 
 static gboolean mark_texture_frame_available(FlTextureRegistrar* registrar,
@@ -114,33 +138,29 @@ static gboolean mark_texture_frame_available(FlTextureRegistrar* registrar,
     return FALSE;
   }
 
-  if (lookup_texture(registrar, fl_texture_get_texture_id(texture)) ==
-      nullptr) {
-    g_warning("Unregistered texture %p", texture);
-    return FALSE;
-  }
-
-  return fl_engine_mark_texture_frame_available(
-      self->engine, fl_texture_get_texture_id(texture));
+  return fl_engine_mark_texture_frame_available(self->engine,
+                                                fl_texture_get_id(texture));
 }
 
 static gboolean unregister_texture(FlTextureRegistrar* registrar,
                                    FlTexture* texture) {
   FlTextureRegistrarImpl* self = FL_TEXTURE_REGISTRAR_IMPL(registrar);
 
-  if (!g_hash_table_remove(
-          self->textures,
-          GINT_TO_POINTER(fl_texture_get_texture_id(texture)))) {
-    g_warning("Unregistering a non-existent texture %p", texture);
+  if (self->engine == nullptr) {
     return FALSE;
   }
 
-  if (self->engine == nullptr) {
-    return FALSE;
+  gboolean result = fl_engine_unregister_external_texture(
+      self->engine, fl_texture_get_id(texture));
+
+  g_mutex_lock(&self->textures_mutex);
+  if (!g_hash_table_remove(self->textures,
+                           GINT_TO_POINTER(fl_texture_get_id(texture)))) {
+    g_warning("Unregistering a non-existent texture %p", texture);
   }
+  g_mutex_unlock(&self->textures_mutex);
 
-  return fl_engine_unregister_external_texture(
-      self->engine, fl_texture_get_texture_id(texture));
+  return result;
 }
 
 static void fl_texture_registrar_impl_iface_init(
@@ -152,13 +172,16 @@ static void fl_texture_registrar_impl_iface_init(
 }
 
 static void fl_texture_registrar_impl_init(FlTextureRegistrarImpl* self) {
+  self->next_id = 1;
   self->textures = g_hash_table_new_full(g_direct_hash, g_direct_equal, nullptr,
                                          g_object_unref);
+  // Initialize the mutex for textures.
+  g_mutex_init(&self->textures_mutex);
 }
 
-G_MODULE_EXPORT gboolean
-fl_texture_registrar_register_texture(FlTextureRegistrar* self,
-                                      FlTexture* texture) {
+G_MODULE_EXPORT gboolean fl_texture_registrar_register_texture(
+    FlTextureRegistrar* self,
+    FlTexture* texture) {
   g_return_val_if_fail(FL_IS_TEXTURE_REGISTRAR(self), FALSE);
   g_return_val_if_fail(FL_IS_TEXTURE(texture), FALSE);
 
@@ -172,18 +195,18 @@ FlTexture* fl_texture_registrar_lookup_texture(FlTextureRegistrar* self,
   return FL_TEXTURE_REGISTRAR_GET_IFACE(self)->lookup_texture(self, texture_id);
 }
 
-G_MODULE_EXPORT gboolean
-fl_texture_registrar_mark_texture_frame_available(FlTextureRegistrar* self,
-                                                  FlTexture* texture) {
+G_MODULE_EXPORT gboolean fl_texture_registrar_mark_texture_frame_available(
+    FlTextureRegistrar* self,
+    FlTexture* texture) {
   g_return_val_if_fail(FL_IS_TEXTURE_REGISTRAR(self), FALSE);
 
   return FL_TEXTURE_REGISTRAR_GET_IFACE(self)->mark_texture_frame_available(
       self, texture);
 }
 
-G_MODULE_EXPORT gboolean
-fl_texture_registrar_unregister_texture(FlTextureRegistrar* self,
-                                        FlTexture* texture) {
+G_MODULE_EXPORT gboolean fl_texture_registrar_unregister_texture(
+    FlTextureRegistrar* self,
+    FlTexture* texture) {
   g_return_val_if_fail(FL_IS_TEXTURE_REGISTRAR(self), FALSE);
 
   return FL_TEXTURE_REGISTRAR_GET_IFACE(self)->unregister_texture(self,
diff --git a/shell/platform/linux/fl_texture_registrar_test.cc b/shell/platform/linux/fl_texture_registrar_test.cc
index 3b41d1ac1d6363430c8153c4bc01e6235e5279c1..23e0b7f84c1236be67d3c0dd99cb80cc0706c21d 100644
--- a/shell/platform/linux/fl_texture_registrar_test.cc
+++ b/shell/platform/linux/fl_texture_registrar_test.cc
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "flutter/shell/platform/linux/public/flutter_linux/fl_texture_registrar.h"
-#include "flutter/shell/platform/linux/fl_texture_private.h"
 #include "flutter/shell/platform/linux/fl_texture_registrar_private.h"
 #include "flutter/shell/platform/linux/public/flutter_linux/fl_pixel_buffer_texture.h"
 #include "flutter/shell/platform/linux/public/flutter_linux/fl_texture_gl.h"
@@ -14,11 +13,13 @@
 #include <epoxy/gl.h>
 
 #include <gmodule.h>
+#include <pthread.h>
 
 static constexpr uint32_t kBufferWidth = 4u;
 static constexpr uint32_t kBufferHeight = 4u;
 static constexpr uint32_t kRealBufferWidth = 2u;
 static constexpr uint32_t kRealBufferHeight = 2u;
+static constexpr uint64_t kThreadCount = 16u;
 
 G_DECLARE_FINAL_TYPE(FlTestRegistrarTexture,
                      fl_test_registrar_texture,
@@ -65,6 +66,16 @@ static FlTestRegistrarTexture* fl_test_registrar_texture_new() {
       g_object_new(fl_test_registrar_texture_get_type(), nullptr));
 }
 
+static void* add_mock_texture_to_registrar(void* pointer) {
+  g_return_val_if_fail(FL_TEXTURE_REGISTRAR(pointer), ((void*)NULL));
+  FlTextureRegistrar* registrar = FL_TEXTURE_REGISTRAR(pointer);
+  g_autoptr(FlTexture) texture = FL_TEXTURE(fl_test_registrar_texture_new());
+  fl_texture_registrar_register_texture(registrar, texture);
+  int64_t* id = static_cast<int64_t*>(malloc(sizeof(int64_t)));
+  id[0] = fl_texture_get_id(texture);
+  pthread_exit(id);
+}
+
 // Checks can make a mock registrar.
 TEST(FlTextureRegistrarTest, MockRegistrar) {
   g_autoptr(FlTexture) texture = FL_TEXTURE(fl_test_registrar_texture_new());
@@ -74,10 +85,6 @@ TEST(FlTextureRegistrarTest, MockRegistrar) {
   EXPECT_TRUE(fl_texture_registrar_register_texture(
       FL_TEXTURE_REGISTRAR(registrar), texture));
   EXPECT_EQ(fl_mock_texture_registrar_get_texture(registrar), texture);
-  EXPECT_EQ(
-      fl_texture_registrar_lookup_texture(FL_TEXTURE_REGISTRAR(registrar),
-                                          fl_texture_get_texture_id(texture)),
-      texture);
   EXPECT_TRUE(fl_texture_registrar_mark_texture_frame_available(
       FL_TEXTURE_REGISTRAR(registrar), texture));
   EXPECT_TRUE(fl_mock_texture_registrar_get_frame_available(registrar));
@@ -109,3 +116,31 @@ TEST(FlTextureRegistrarTest, MarkTextureFrameAvailable) {
   EXPECT_TRUE(
       fl_texture_registrar_mark_texture_frame_available(registrar, texture));
 }
+
+// Test the textures can be accessed via multiple threads without
+// synchronization issues.
+// TODO(robert-ancell): Re-enable when no longer flaky
+// https://github.com/flutter/flutter/issues/138197
+TEST(FlTextureRegistrarTest,
+     DISABLED_RegistrarRegisterTextureInMultipleThreads) {
+  g_autoptr(FlEngine) engine = make_mock_engine();
+  g_autoptr(FlTextureRegistrar) registrar = fl_texture_registrar_new(engine);
+  pthread_t threads[kThreadCount];
+  int64_t ids[kThreadCount];
+
+  for (uint64_t t = 0; t < kThreadCount; t++) {
+    EXPECT_EQ(pthread_create(&threads[t], NULL, add_mock_texture_to_registrar,
+                             (void*)registrar),
+              0);
+  }
+  for (uint64_t t = 0; t < kThreadCount; t++) {
+    void* id;
+    pthread_join(threads[t], &id);
+    ids[t] = static_cast<int64_t*>(id)[0];
+    free(id);
+  };
+  // Check all the textures were created.
+  for (uint64_t t = 0; t < kThreadCount; t++) {
+    EXPECT_TRUE(fl_texture_registrar_lookup_texture(registrar, ids[t]) != NULL);
+  };
+}
diff --git a/shell/platform/linux/fl_value.cc b/shell/platform/linux/fl_value.cc
index 46e7218cfa2d08a52171cafb30d745ac7d9b656a..d55f76d464c944d55251d917f43702329db4b32f 100644
--- a/shell/platform/linux/fl_value.cc
+++ b/shell/platform/linux/fl_value.cc
@@ -74,6 +74,13 @@ typedef struct {
   GPtrArray* values;
 } FlValueMap;
 
+typedef struct {
+  FlValue parent;
+  int type;
+  gconstpointer value;
+  GDestroyNotify destroy_notify;
+} FlValueCustom;
+
 static FlValue* fl_value_new(FlValueType type, size_t size) {
   FlValue* self = static_cast<FlValue*>(g_malloc0(size));
   self->type = type;
@@ -232,6 +239,10 @@ static void value_to_string(FlValue* value, GString* buffer) {
       g_string_append(buffer, "}");
       return;
     }
+    case FL_VALUE_TYPE_CUSTOM:
+      g_string_append_printf(buffer, "(custom %d)",
+                             fl_value_get_custom_type(value));
+      return;
     default:
       g_string_append_printf(buffer, "<unknown type %d>", value->type);
   }
@@ -360,6 +371,26 @@ G_MODULE_EXPORT FlValue* fl_value_new_map() {
   return reinterpret_cast<FlValue*>(self);
 }
 
+G_MODULE_EXPORT FlValue* fl_value_new_custom(int type,
+                                             gconstpointer value,
+                                             GDestroyNotify destroy_notify) {
+  FlValueCustom* self = reinterpret_cast<FlValueCustom*>(
+      fl_value_new(FL_VALUE_TYPE_CUSTOM, sizeof(FlValueCustom)));
+  self->type = type;
+  self->value = value;
+  self->destroy_notify = destroy_notify;
+  return reinterpret_cast<FlValue*>(self);
+}
+
+G_MODULE_EXPORT FlValue* fl_value_new_custom_object(int type, GObject* object) {
+  return fl_value_new_custom(type, g_object_ref(object), g_object_unref);
+}
+
+G_MODULE_EXPORT FlValue* fl_value_new_custom_object_take(int type,
+                                                         GObject* object) {
+  return fl_value_new_custom(type, object, g_object_unref);
+}
+
 G_MODULE_EXPORT FlValue* fl_value_ref(FlValue* self) {
   g_return_val_if_fail(self != nullptr, nullptr);
   self->ref_count++;
@@ -416,6 +447,13 @@ G_MODULE_EXPORT void fl_value_unref(FlValue* self) {
       g_ptr_array_unref(v->values);
       break;
     }
+    case FL_VALUE_TYPE_CUSTOM: {
+      FlValueCustom* v = reinterpret_cast<FlValueCustom*>(self);
+      if (v->destroy_notify != nullptr) {
+        v->destroy_notify((gpointer)v->value);
+      }
+      break;
+    }
     case FL_VALUE_TYPE_NULL:
     case FL_VALUE_TYPE_BOOL:
     case FL_VALUE_TYPE_INT:
@@ -546,6 +584,8 @@ G_MODULE_EXPORT bool fl_value_equal(FlValue* a, FlValue* b) {
       }
       return true;
     }
+    case FL_VALUE_TYPE_CUSTOM:
+      return false;
   }
 }
 
@@ -726,6 +766,7 @@ G_MODULE_EXPORT size_t fl_value_get_length(FlValue* self) {
     case FL_VALUE_TYPE_INT:
     case FL_VALUE_TYPE_FLOAT:
     case FL_VALUE_TYPE_STRING:
+    case FL_VALUE_TYPE_CUSTOM:
       return 0;
   }
 
@@ -778,6 +819,30 @@ G_MODULE_EXPORT FlValue* fl_value_lookup_string(FlValue* self,
   return value;
 }
 
+G_MODULE_EXPORT int fl_value_get_custom_type(FlValue* self) {
+  g_return_val_if_fail(self != nullptr, -1);
+  g_return_val_if_fail(self->type == FL_VALUE_TYPE_CUSTOM, -1);
+
+  FlValueCustom* v = reinterpret_cast<FlValueCustom*>(self);
+  return v->type;
+}
+
+G_MODULE_EXPORT gconstpointer fl_value_get_custom_value(FlValue* self) {
+  g_return_val_if_fail(self != nullptr, nullptr);
+  g_return_val_if_fail(self->type == FL_VALUE_TYPE_CUSTOM, nullptr);
+
+  FlValueCustom* v = reinterpret_cast<FlValueCustom*>(self);
+  return v->value;
+}
+
+G_MODULE_EXPORT GObject* fl_value_get_custom_value_object(FlValue* self) {
+  g_return_val_if_fail(self != nullptr, nullptr);
+  g_return_val_if_fail(self->type == FL_VALUE_TYPE_CUSTOM, nullptr);
+
+  FlValueCustom* v = reinterpret_cast<FlValueCustom*>(self);
+  return G_OBJECT(v->value);
+}
+
 G_MODULE_EXPORT gchar* fl_value_to_string(FlValue* value) {
   GString* buffer = g_string_new("");
   value_to_string(value, buffer);
diff --git a/shell/platform/linux/fl_value_test.cc b/shell/platform/linux/fl_value_test.cc
index c234483be0d1544e9660471551afa9c29168c6f9..98e58b931a9d73d026a5e2768cc2a9b3710157c9 100644
--- a/shell/platform/linux/fl_value_test.cc
+++ b/shell/platform/linux/fl_value_test.cc
@@ -885,6 +885,51 @@ TEST(FlValueTest, MapToString) {
                "int64_list, []: float_list, []: list, {}: map}");
 }
 
+TEST(FlDartProjectTest, Custom) {
+  g_autoptr(FlValue) value =
+      fl_value_new_custom(128, g_strdup("Hello World"), g_free);
+  ASSERT_EQ(fl_value_get_type(value), FL_VALUE_TYPE_CUSTOM);
+  ASSERT_EQ(fl_value_get_custom_type(value), 128);
+  ASSERT_STREQ(reinterpret_cast<const gchar*>(fl_value_get_custom_value(value)),
+               "Hello World");
+}
+
+TEST(FlDartProjectTest, CustomNoDestroyNotify) {
+  g_autoptr(FlValue) value = fl_value_new_custom(128, "Hello World", nullptr);
+  ASSERT_EQ(fl_value_get_type(value), FL_VALUE_TYPE_CUSTOM);
+  ASSERT_EQ(fl_value_get_custom_type(value), 128);
+  ASSERT_STREQ(reinterpret_cast<const gchar*>(fl_value_get_custom_value(value)),
+               "Hello World");
+}
+
+TEST(FlDartProjectTest, CustomObject) {
+  g_autoptr(GObject) v = G_OBJECT(g_object_new(G_TYPE_OBJECT, nullptr));
+  g_autoptr(FlValue) value = fl_value_new_custom_object(128, v);
+  ASSERT_EQ(fl_value_get_type(value), FL_VALUE_TYPE_CUSTOM);
+  ASSERT_EQ(fl_value_get_custom_type(value), 128);
+  ASSERT_TRUE(G_IS_OBJECT(fl_value_get_custom_value_object(value)));
+}
+
+TEST(FlDartProjectTest, CustomObjectTake) {
+  g_autoptr(FlValue) value = fl_value_new_custom_object_take(
+      128, G_OBJECT(g_object_new(G_TYPE_OBJECT, nullptr)));
+  ASSERT_EQ(fl_value_get_type(value), FL_VALUE_TYPE_CUSTOM);
+  ASSERT_EQ(fl_value_get_custom_type(value), 128);
+  ASSERT_TRUE(G_IS_OBJECT(fl_value_get_custom_value_object(value)));
+}
+
+TEST(FlValueTest, CustomEqual) {
+  g_autoptr(FlValue) value1 = fl_value_new_custom(128, "Hello World", nullptr);
+  g_autoptr(FlValue) value2 = fl_value_new_custom(128, "Hello World", nullptr);
+  EXPECT_FALSE(fl_value_equal(value1, value2));
+}
+
+TEST(FlValueTest, CustomToString) {
+  g_autoptr(FlValue) value = fl_value_new_custom(128, nullptr, nullptr);
+  g_autofree gchar* text = fl_value_to_string(value);
+  EXPECT_STREQ(text, "(custom 128)");
+}
+
 TEST(FlValueTest, EqualSameObject) {
   g_autoptr(FlValue) value = fl_value_new_null();
   EXPECT_TRUE(fl_value_equal(value, value));
diff --git a/shell/platform/linux/fl_view.cc b/shell/platform/linux/fl_view.cc
index 69fea7ccafe6f2d0a7f49491e311577459a35426..0d1fb4709f7032d7837e1483491c5867ac40c7f9 100644
--- a/shell/platform/linux/fl_view.cc
+++ b/shell/platform/linux/fl_view.cc
@@ -8,7 +8,7 @@
 
 #include <cstring>
 
-#include "flutter/shell/platform/linux/fl_accessibility_plugin.h"
+#include "flutter/shell/platform/linux/fl_backing_store_provider.h"
 #include "flutter/shell/platform/linux/fl_engine_private.h"
 #include "flutter/shell/platform/linux/fl_key_event.h"
 #include "flutter/shell/platform/linux/fl_keyboard_manager.h"
@@ -16,7 +16,7 @@
 #include "flutter/shell/platform/linux/fl_mouse_cursor_plugin.h"
 #include "flutter/shell/platform/linux/fl_platform_plugin.h"
 #include "flutter/shell/platform/linux/fl_plugin_registrar_private.h"
-#include "flutter/shell/platform/linux/fl_renderer_gl.h"
+#include "flutter/shell/platform/linux/fl_renderer_gdk.h"
 #include "flutter/shell/platform/linux/fl_scrolling_manager.h"
 #include "flutter/shell/platform/linux/fl_scrolling_view_delegate.h"
 #include "flutter/shell/platform/linux/fl_text_input_plugin.h"
@@ -28,13 +28,13 @@
 static constexpr int kMicrosecondsPerMillisecond = 1000;
 
 struct _FlView {
-  GtkContainer parent_instance;
+  GtkBox parent_instance;
 
   // Project being run.
   FlDartProject* project;
 
   // Rendering output.
-  FlRenderer* renderer;
+  FlRendererGdk* renderer;
 
   // Engine running @project.
   FlEngine* engine;
@@ -42,21 +42,18 @@ struct _FlView {
   // Pointer button state recorded for sending status updates.
   int64_t button_state;
 
+  // Current state information for the window associated with this view.
+  GdkWindowState window_state;
+
   // Flutter system channel handlers.
-  FlAccessibilityPlugin* accessibility_plugin;
   FlKeyboardManager* keyboard_manager;
   FlScrollingManager* scrolling_manager;
   FlTextInputPlugin* text_input_plugin;
   FlMouseCursorPlugin* mouse_cursor_plugin;
   FlPlatformPlugin* platform_plugin;
 
-  GList* gl_area_list;
-  GList* used_area_list;
-
   GtkWidget* event_box;
-
-  GList* children_list;
-  GList* pending_children_list;
+  GtkGLArea* gl_area;
 
   // Tracks whether mouse pointer is inside the view.
   gboolean pointer_inside;
@@ -64,14 +61,11 @@ struct _FlView {
   /* FlKeyboardViewDelegate related properties */
   KeyboardLayoutNotifier keyboard_layout_notifier;
   GdkKeymap* keymap;
-  gulong keymap_keys_changed_cb_id;  // Signal connection ID.
+  gulong keymap_keys_changed_cb_id;  // Signal connection ID for
+                                     // keymap-keys-changed
+  gulong window_state_cb_id;  // Signal connection ID for window-state-changed
 };
 
-typedef struct _FlViewChild {
-  GtkWidget* widget;
-  GdkRectangle geometry;
-} FlViewChild;
-
 enum { kPropFlutterProject = 1, kPropLast };
 
 static void fl_view_plugin_registry_iface_init(
@@ -89,7 +83,7 @@ static void fl_view_text_input_delegate_iface_init(
 G_DEFINE_TYPE_WITH_CODE(
     FlView,
     fl_view,
-    GTK_TYPE_CONTAINER,
+    GTK_TYPE_BOX,
     G_IMPLEMENT_INTERFACE(fl_plugin_registry_get_type(),
                           fl_view_plugin_registry_iface_init)
         G_IMPLEMENT_INTERFACE(fl_keyboard_view_delegate_get_type(),
@@ -99,6 +93,13 @@ G_DEFINE_TYPE_WITH_CODE(
                 G_IMPLEMENT_INTERFACE(fl_text_input_view_delegate_get_type(),
                                       fl_view_text_input_delegate_iface_init))
 
+// Signal handler for GtkWidget::delete-event
+static gboolean window_delete_event_cb(FlView* self) {
+  fl_platform_plugin_request_app_exit(self->platform_plugin);
+  // Stop the event from propagating.
+  return TRUE;
+}
+
 // Initialize keyboard manager.
 static void init_keyboard(FlView* self) {
   FlBinaryMessenger* messenger = fl_engine_get_binary_messenger(self->engine);
@@ -109,21 +110,33 @@ static void init_keyboard(FlView* self) {
   g_autoptr(GtkIMContext) im_context = gtk_im_multicontext_new();
   gtk_im_context_set_client_window(im_context, window);
 
+  g_clear_object(&self->text_input_plugin);
   self->text_input_plugin = fl_text_input_plugin_new(
       messenger, im_context, FL_TEXT_INPUT_VIEW_DELEGATE(self));
+  g_clear_object(&self->keyboard_manager);
   self->keyboard_manager =
-      fl_keyboard_manager_new(FL_KEYBOARD_VIEW_DELEGATE(self));
+      fl_keyboard_manager_new(messenger, FL_KEYBOARD_VIEW_DELEGATE(self));
 }
 
 static void init_scrolling(FlView* self) {
+  g_clear_object(&self->scrolling_manager);
   self->scrolling_manager =
       fl_scrolling_manager_new(FL_SCROLLING_VIEW_DELEGATE(self));
 }
 
 // Converts a GDK button event into a Flutter event and sends it to the engine.
-static gboolean send_pointer_button_event(FlView* self, GdkEventButton* event) {
+static gboolean send_pointer_button_event(FlView* self, GdkEvent* event) {
+  guint event_time = gdk_event_get_time(event);
+  GdkEventType event_type = gdk_event_get_event_type(event);
+  GdkModifierType event_state = static_cast<GdkModifierType>(0);
+  gdk_event_get_state(event, &event_state);
+  guint event_button = 0;
+  gdk_event_get_button(event, &event_button);
+  gdouble event_x = 0.0, event_y = 0.0;
+  gdk_event_get_coords(event, &event_x, &event_y);
+
   int64_t button;
-  switch (event->button) {
+  switch (event_button) {
     case 1:
       button = kFlutterPointerButtonMousePrimary;
       break;
@@ -138,7 +151,7 @@ static gboolean send_pointer_button_event(FlView* self, GdkEventButton* event) {
   }
   int old_button_state = self->button_state;
   FlutterPointerPhase phase = kMove;
-  if (event->type == GDK_BUTTON_PRESS) {
+  if (event_type == GDK_BUTTON_PRESS) {
     // Drop the event if Flutter already thinks the button is down.
     if ((self->button_state & button) != 0) {
       return FALSE;
@@ -146,7 +159,7 @@ static gboolean send_pointer_button_event(FlView* self, GdkEventButton* event) {
     self->button_state ^= button;
 
     phase = old_button_state == 0 ? kDown : kMove;
-  } else if (event->type == GDK_BUTTON_RELEASE) {
+  } else if (event_type == GDK_BUTTON_RELEASE) {
     // Drop the event if Flutter already thinks the button is up.
     if ((self->button_state & button) == 0) {
       return FALSE;
@@ -161,32 +174,30 @@ static gboolean send_pointer_button_event(FlView* self, GdkEventButton* event) {
   }
 
   gint scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(self));
-  fl_scrolling_manager_set_last_mouse_position(self->scrolling_manager,
-                                               event->x * scale_factor,
-                                               event->y * scale_factor);
+  fl_scrolling_manager_set_last_mouse_position(
+      self->scrolling_manager, event_x * scale_factor, event_y * scale_factor);
   fl_keyboard_manager_sync_modifier_if_needed(self->keyboard_manager,
-                                              event->state, event->time);
+                                              event_state, event_time);
   fl_engine_send_mouse_pointer_event(
-      self->engine, phase, event->time * kMicrosecondsPerMillisecond,
-      event->x * scale_factor, event->y * scale_factor, 0, 0,
-      self->button_state);
+      self->engine, phase, event_time * kMicrosecondsPerMillisecond,
+      event_x * scale_factor, event_y * scale_factor, 0, 0, self->button_state);
 
   return TRUE;
 }
 
 // Generates a mouse pointer event if the pointer appears inside the window.
-static void check_pointer_inside(FlView* view, GdkEvent* event) {
-  if (!view->pointer_inside) {
-    view->pointer_inside = TRUE;
+static void check_pointer_inside(FlView* self, GdkEvent* event) {
+  if (!self->pointer_inside) {
+    self->pointer_inside = TRUE;
 
     gdouble x, y;
     if (gdk_event_get_coords(event, &x, &y)) {
-      gint scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(view));
+      gint scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(self));
 
       fl_engine_send_mouse_pointer_event(
-          view->engine, kAdd,
+          self->engine, kAdd,
           gdk_event_get_time(event) * kMicrosecondsPerMillisecond,
-          x * scale_factor, y * scale_factor, 0, 0, view->button_state);
+          x * scale_factor, y * scale_factor, 0, 0, self->button_state);
     }
   }
 }
@@ -200,45 +211,29 @@ static void handle_geometry_changed(FlView* self) {
       self->engine, allocation.width * scale_factor,
       allocation.height * scale_factor, scale_factor);
 
-  fl_renderer_wait_for_frame(self->renderer, allocation.width * scale_factor,
-                             allocation.height * scale_factor);
-}
-
-// Adds a widget to render in this view.
-static void add_pending_child(FlView* self,
-                              GtkWidget* widget,
-                              GdkRectangle* geometry) {
-  FlViewChild* child = g_new(FlViewChild, 1);
-  child->widget = widget;
-  if (geometry) {
-    child->geometry = *geometry;
-  } else {
-    child->geometry = {0, 0, 0, 0};
+  // Make sure the view has been realized and its size has been allocated before
+  // waiting for a frame. `fl_view_realize()` and `fl_view_size_allocate()` may
+  // be called in either order depending on the order in which the window is
+  // shown and the view is added to a container in the app runner.
+  //
+  // Note: `gtk_widget_init()` initializes the size allocation to 1x1.
+  if (allocation.width > 1 && allocation.height > 1 &&
+      gtk_widget_get_realized(GTK_WIDGET(self))) {
+    fl_renderer_wait_for_frame(FL_RENDERER(self->renderer),
+                               allocation.width * scale_factor,
+                               allocation.height * scale_factor);
   }
-
-  self->pending_children_list =
-      g_list_append(self->pending_children_list, child);
 }
 
-// Finds the node with the specified widget in a list of FlViewChild.
-static GList* find_child(GList* list, GtkWidget* widget) {
-  for (GList* i = list; i; i = i->next) {
-    FlViewChild* child = reinterpret_cast<FlViewChild*>(i->data);
-    if (child && child->widget == widget) {
-      return i;
-    }
-  }
-  return nullptr;
-}
-
-// Called when the engine updates accessibility nodes.
-static void update_semantics_node_cb(FlEngine* engine,
-                                     const FlutterSemanticsNode* node,
-                                     gpointer user_data) {
+// Called when the engine updates accessibility.
+static void update_semantics_cb(FlEngine* engine,
+                                const FlutterSemanticsUpdate2* update,
+                                gpointer user_data) {
   FlView* self = FL_VIEW(user_data);
 
-  fl_accessibility_plugin_handle_update_semantics_node(
-      self->accessibility_plugin, node);
+  AtkObject* accessible = gtk_widget_get_accessible(GTK_WIDGET(self));
+  fl_view_accessible_handle_update_semantics(FL_VIEW_ACCESSIBLE(accessible),
+                                             update);
 }
 
 // Invoked by the engine right before the engine is restarted.
@@ -249,9 +244,6 @@ static void update_semantics_node_cb(FlEngine* engine,
 static void on_pre_engine_restart_cb(FlEngine* engine, gpointer user_data) {
   FlView* self = FL_VIEW(user_data);
 
-  g_clear_object(&self->keyboard_manager);
-  g_clear_object(&self->text_input_plugin);
-  g_clear_object(&self->scrolling_manager);
   init_keyboard(self);
   init_scrolling(self);
 }
@@ -297,10 +289,10 @@ static void fl_view_keyboard_delegate_iface_init(
   iface->redispatch_event = [](FlKeyboardViewDelegate* view_delegate,
                                std::unique_ptr<FlKeyEvent> in_event) {
     FlKeyEvent* event = in_event.release();
-    GdkEvent* gdk_event = reinterpret_cast<GdkEvent*>(event->origin);
-    GdkEventType type = gdk_event->type;
-    g_return_if_fail(type == GDK_KEY_PRESS || type == GDK_KEY_RELEASE);
-    gdk_event_put(gdk_event);
+    GdkEventType event_type = gdk_event_get_event_type(event->origin);
+    g_return_if_fail(event_type == GDK_KEY_PRESS ||
+                     event_type == GDK_KEY_RELEASE);
+    gdk_event_put(event->origin);
     fl_key_event_dispose(event);
   };
 
@@ -316,6 +308,12 @@ static void fl_view_keyboard_delegate_iface_init(
     g_return_val_if_fail(self->keymap != nullptr, 0);
     return gdk_keymap_lookup_key(self->keymap, key);
   };
+
+  iface->get_keyboard_state =
+      [](FlKeyboardViewDelegate* view_delegate) -> GHashTable* {
+    FlView* self = FL_VIEW(view_delegate);
+    return fl_view_get_keyboard_state(self);
+  };
 }
 
 static void fl_view_scrolling_delegate_iface_init(
@@ -357,199 +355,269 @@ static void fl_view_text_input_delegate_iface_init(
 }
 
 // Signal handler for GtkWidget::button-press-event
-static gboolean button_press_event_cb(GtkWidget* widget,
-                                      GdkEventButton* event,
-                                      FlView* view) {
+static gboolean button_press_event_cb(FlView* self,
+                                      GdkEventButton* button_event) {
+  GdkEvent* event = reinterpret_cast<GdkEvent*>(button_event);
+
   // Flutter doesn't handle double and triple click events.
-  if (event->type == GDK_DOUBLE_BUTTON_PRESS ||
-      event->type == GDK_TRIPLE_BUTTON_PRESS) {
+  GdkEventType event_type = gdk_event_get_event_type(event);
+  if (event_type == GDK_DOUBLE_BUTTON_PRESS ||
+      event_type == GDK_TRIPLE_BUTTON_PRESS) {
     return FALSE;
   }
 
-  if (!gtk_widget_has_focus(GTK_WIDGET(view))) {
-    gtk_widget_grab_focus(GTK_WIDGET(view));
-  }
+  check_pointer_inside(self, event);
 
-  return send_pointer_button_event(view, event);
+  return send_pointer_button_event(self, event);
 }
 
 // Signal handler for GtkWidget::button-release-event
-static gboolean button_release_event_cb(GtkWidget* widget,
-                                        GdkEventButton* event,
-                                        FlView* view) {
-  return send_pointer_button_event(view, event);
+static gboolean button_release_event_cb(FlView* self,
+                                        GdkEventButton* button_event) {
+  GdkEvent* event = reinterpret_cast<GdkEvent*>(button_event);
+  return send_pointer_button_event(self, event);
 }
 
 // Signal handler for GtkWidget::scroll-event
-static gboolean scroll_event_cb(GtkWidget* widget,
-                                GdkEventScroll* event,
-                                FlView* view) {
+static gboolean scroll_event_cb(FlView* self, GdkEventScroll* event) {
   // TODO(robert-ancell): Update to use GtkEventControllerScroll when we can
   // depend on GTK 3.24.
 
   fl_scrolling_manager_handle_scroll_event(
-      view->scrolling_manager, event,
-      gtk_widget_get_scale_factor(GTK_WIDGET(view)));
+      self->scrolling_manager, event,
+      gtk_widget_get_scale_factor(GTK_WIDGET(self)));
   return TRUE;
 }
 
 // Signal handler for GtkWidget::motion-notify-event
-static gboolean motion_notify_event_cb(GtkWidget* widget,
-                                       GdkEventMotion* event,
-                                       FlView* view) {
-  if (view->engine == nullptr) {
+static gboolean motion_notify_event_cb(FlView* self,
+                                       GdkEventMotion* motion_event) {
+  GdkEvent* event = reinterpret_cast<GdkEvent*>(motion_event);
+
+  if (self->engine == nullptr) {
     return FALSE;
   }
 
-  check_pointer_inside(view, reinterpret_cast<GdkEvent*>(event));
+  guint event_time = gdk_event_get_time(event);
+  GdkModifierType event_state = static_cast<GdkModifierType>(0);
+  gdk_event_get_state(event, &event_state);
+  gdouble event_x = 0.0, event_y = 0.0;
+  gdk_event_get_coords(event, &event_x, &event_y);
+
+  check_pointer_inside(self, event);
 
-  gint scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(view));
+  gint scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(self));
 
-  fl_keyboard_manager_sync_modifier_if_needed(view->keyboard_manager,
-                                              event->state, event->time);
+  fl_keyboard_manager_sync_modifier_if_needed(self->keyboard_manager,
+                                              event_state, event_time);
   fl_engine_send_mouse_pointer_event(
-      view->engine, view->button_state != 0 ? kMove : kHover,
-      event->time * kMicrosecondsPerMillisecond, event->x * scale_factor,
-      event->y * scale_factor, 0, 0, view->button_state);
+      self->engine, self->button_state != 0 ? kMove : kHover,
+      event_time * kMicrosecondsPerMillisecond, event_x * scale_factor,
+      event_y * scale_factor, 0, 0, self->button_state);
 
   return TRUE;
 }
 
 // Signal handler for GtkWidget::enter-notify-event
-static gboolean enter_notify_event_cb(GtkWidget* widget,
-                                      GdkEventCrossing* event,
-                                      FlView* view) {
-  if (view->engine == nullptr) {
+static gboolean enter_notify_event_cb(FlView* self,
+                                      GdkEventCrossing* crossing_event) {
+  GdkEvent* event = reinterpret_cast<GdkEvent*>(crossing_event);
+
+  if (self->engine == nullptr) {
     return FALSE;
   }
 
-  check_pointer_inside(view, reinterpret_cast<GdkEvent*>(event));
+  check_pointer_inside(self, event);
 
   return TRUE;
 }
 
 // Signal handler for GtkWidget::leave-notify-event
-static gboolean leave_notify_event_cb(GtkWidget* widget,
-                                      GdkEventCrossing* event,
-                                      FlView* view) {
-  if (view->engine == nullptr) {
+static gboolean leave_notify_event_cb(FlView* self,
+                                      GdkEventCrossing* crossing_event) {
+  GdkEvent* event = reinterpret_cast<GdkEvent*>(crossing_event);
+
+  guint event_time = gdk_event_get_time(event);
+  gdouble event_x = 0.0, event_y = 0.0;
+  gdk_event_get_coords(event, &event_x, &event_y);
+
+  if (crossing_event->mode != GDK_CROSSING_NORMAL) {
+    return FALSE;
+  }
+
+  if (self->engine == nullptr) {
     return FALSE;
   }
 
   // Don't remove pointer while button is down; In case of dragging outside of
   // window with mouse grab active Gtk will send another leave notify on
   // release.
-  if (view->pointer_inside && view->button_state == 0) {
-    gint scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(view));
+  if (self->pointer_inside && self->button_state == 0) {
+    gint scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(self));
     fl_engine_send_mouse_pointer_event(
-        view->engine, kRemove, event->time * kMicrosecondsPerMillisecond,
-        event->x * scale_factor, event->y * scale_factor, 0, 0,
-        view->button_state);
-    view->pointer_inside = FALSE;
+        self->engine, kRemove, event_time * kMicrosecondsPerMillisecond,
+        event_x * scale_factor, event_y * scale_factor, 0, 0,
+        self->button_state);
+    self->pointer_inside = FALSE;
   }
 
   return TRUE;
 }
 
-static void keymap_keys_changed_cb(GdkKeymap* self, FlView* view) {
-  if (view->keyboard_layout_notifier == nullptr) {
+static void keymap_keys_changed_cb(FlView* self) {
+  if (self->keyboard_layout_notifier == nullptr) {
     return;
   }
 
-  view->keyboard_layout_notifier();
+  self->keyboard_layout_notifier();
 }
 
-static void gesture_rotation_begin_cb(GtkGestureRotate* gesture,
-                                      GdkEventSequence* sequence,
-                                      FlView* view) {
-  fl_scrolling_manager_handle_rotation_begin(view->scrolling_manager);
+static void gesture_rotation_begin_cb(FlView* self) {
+  fl_scrolling_manager_handle_rotation_begin(self->scrolling_manager);
 }
 
-static void gesture_rotation_update_cb(GtkGestureRotate* widget,
+static void gesture_rotation_update_cb(FlView* self,
                                        gdouble rotation,
-                                       gdouble delta,
-                                       FlView* view) {
-  fl_scrolling_manager_handle_rotation_update(view->scrolling_manager,
+                                       gdouble delta) {
+  fl_scrolling_manager_handle_rotation_update(self->scrolling_manager,
                                               rotation);
 }
 
-static void gesture_rotation_end_cb(GtkGestureRotate* gesture,
-                                    GdkEventSequence* sequence,
-                                    FlView* view) {
-  fl_scrolling_manager_handle_rotation_end(view->scrolling_manager);
+static void gesture_rotation_end_cb(FlView* self) {
+  fl_scrolling_manager_handle_rotation_end(self->scrolling_manager);
 }
 
-static void gesture_zoom_begin_cb(GtkGestureZoom* gesture,
-                                  GdkEventSequence* sequence,
-                                  FlView* view) {
-  fl_scrolling_manager_handle_zoom_begin(view->scrolling_manager);
+static void gesture_zoom_begin_cb(FlView* self) {
+  fl_scrolling_manager_handle_zoom_begin(self->scrolling_manager);
 }
 
-static void gesture_zoom_update_cb(GtkGestureZoom* widget,
-                                   gdouble scale,
-                                   FlView* view) {
-  fl_scrolling_manager_handle_zoom_update(view->scrolling_manager, scale);
+static void gesture_zoom_update_cb(FlView* self, gdouble scale) {
+  fl_scrolling_manager_handle_zoom_update(self->scrolling_manager, scale);
 }
 
-static void gesture_zoom_end_cb(GtkGestureZoom* gesture,
-                                GdkEventSequence* sequence,
-                                FlView* view) {
-  fl_scrolling_manager_handle_zoom_end(view->scrolling_manager);
+static void gesture_zoom_end_cb(FlView* self) {
+  fl_scrolling_manager_handle_zoom_end(self->scrolling_manager);
 }
 
-static void fl_view_constructed(GObject* object) {
-  FlView* self = FL_VIEW(object);
+static gboolean window_state_event_cb(FlView* self, GdkEvent* event) {
+  g_return_val_if_fail(FL_IS_ENGINE(self->engine), FALSE);
 
-  self->renderer = FL_RENDERER(fl_renderer_gl_new());
-  self->engine = fl_engine_new(self->project, self->renderer);
-  fl_engine_set_update_semantics_node_handler(
-      self->engine, update_semantics_node_cb, self, nullptr);
+  GdkWindowState state = event->window_state.new_window_state;
+  GdkWindowState previous_state = self->window_state;
+  self->window_state = state;
+  bool was_visible = !((previous_state & GDK_WINDOW_STATE_WITHDRAWN) ||
+                       (previous_state & GDK_WINDOW_STATE_ICONIFIED));
+  bool is_visible = !((state & GDK_WINDOW_STATE_WITHDRAWN) ||
+                      (state & GDK_WINDOW_STATE_ICONIFIED));
+  bool was_focused = (previous_state & GDK_WINDOW_STATE_FOCUSED);
+  bool is_focused = (state & GDK_WINDOW_STATE_FOCUSED);
+  if (was_visible != is_visible || was_focused != is_focused) {
+    if (self->engine != nullptr) {
+      fl_engine_send_window_state_event(FL_ENGINE(self->engine), is_visible,
+                                        is_focused);
+    }
+  }
+  return FALSE;
+}
+
+static GdkGLContext* create_context_cb(FlView* self) {
+  self->renderer =
+      fl_renderer_gdk_new(gtk_widget_get_parent_window(GTK_WIDGET(self)));
+  self->engine = fl_engine_new(self->project, FL_RENDERER(self->renderer));
+  fl_engine_set_update_semantics_handler(self->engine, update_semantics_cb,
+                                         self, nullptr);
   fl_engine_set_on_pre_engine_restart_handler(
       self->engine, on_pre_engine_restart_cb, self, nullptr);
 
   // Must initialize the keymap before the keyboard.
   self->keymap = gdk_keymap_get_for_display(gdk_display_get_default());
+  self->keymap_keys_changed_cb_id = g_signal_connect_swapped(
+      self->keymap, "keys-changed", G_CALLBACK(keymap_keys_changed_cb), self);
 
   // Create system channel handlers.
   FlBinaryMessenger* messenger = fl_engine_get_binary_messenger(self->engine);
-  self->accessibility_plugin = fl_accessibility_plugin_new(self);
   init_scrolling(self);
   self->mouse_cursor_plugin = fl_mouse_cursor_plugin_new(messenger, self);
   self->platform_plugin = fl_platform_plugin_new(messenger);
 
-  self->event_box = gtk_event_box_new();
-  gtk_widget_set_parent(self->event_box, GTK_WIDGET(self));
-  gtk_widget_show(self->event_box);
-  gtk_widget_add_events(self->event_box,
-                        GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK |
-                            GDK_BUTTON_RELEASE_MASK | GDK_SCROLL_MASK |
-                            GDK_SMOOTH_SCROLL_MASK);
+  g_autoptr(GError) error = nullptr;
+  if (!fl_renderer_gdk_create_contexts(self->renderer, &error)) {
+    gtk_gl_area_set_error(self->gl_area, error);
+    return nullptr;
+  }
 
-  g_signal_connect(self->event_box, "button-press-event",
-                   G_CALLBACK(button_press_event_cb), self);
-  g_signal_connect(self->event_box, "button-release-event",
-                   G_CALLBACK(button_release_event_cb), self);
-  g_signal_connect(self->event_box, "scroll-event", G_CALLBACK(scroll_event_cb),
-                   self);
-  g_signal_connect(self->event_box, "motion-notify-event",
-                   G_CALLBACK(motion_notify_event_cb), self);
-  g_signal_connect(self->event_box, "enter-notify-event",
-                   G_CALLBACK(enter_notify_event_cb), self);
-  g_signal_connect(self->event_box, "leave-notify-event",
-                   G_CALLBACK(leave_notify_event_cb), self);
-  self->keymap_keys_changed_cb_id = g_signal_connect(
-      self->keymap, "keys-changed", G_CALLBACK(keymap_keys_changed_cb), self);
-  GtkGesture* zoom = gtk_gesture_zoom_new(self->event_box);
-  g_signal_connect(zoom, "begin", G_CALLBACK(gesture_zoom_begin_cb), self);
-  g_signal_connect(zoom, "scale-changed", G_CALLBACK(gesture_zoom_update_cb),
-                   self);
-  g_signal_connect(zoom, "end", G_CALLBACK(gesture_zoom_end_cb), self);
-  GtkGesture* rotate = gtk_gesture_rotate_new(self->event_box);
-  g_signal_connect(rotate, "begin", G_CALLBACK(gesture_rotation_begin_cb),
-                   self);
-  g_signal_connect(rotate, "angle-changed",
-                   G_CALLBACK(gesture_rotation_update_cb), self);
-  g_signal_connect(rotate, "end", G_CALLBACK(gesture_rotation_end_cb), self);
+  return GDK_GL_CONTEXT(
+      g_object_ref(fl_renderer_gdk_get_context(self->renderer)));
+}
+
+static void realize_cb(FlView* self) {
+  g_autoptr(GError) error = nullptr;
+
+  fl_renderer_make_current(FL_RENDERER(self->renderer));
+
+  GError* gl_error = gtk_gl_area_get_error(self->gl_area);
+  if (gl_error != NULL) {
+    g_warning("Failed to initialize GLArea: %s", gl_error->message);
+    return;
+  }
+
+  fl_renderer_setup(FL_RENDERER(self->renderer));
+
+  // Handle requests by the user to close the application.
+  GtkWidget* toplevel_window = gtk_widget_get_toplevel(GTK_WIDGET(self));
+
+  // Listen to window state changes.
+  self->window_state_cb_id =
+      g_signal_connect_swapped(toplevel_window, "window-state-event",
+                               G_CALLBACK(window_state_event_cb), self);
+  self->window_state =
+      gdk_window_get_state(gtk_widget_get_window(toplevel_window));
+
+  g_signal_connect_swapped(toplevel_window, "delete-event",
+                           G_CALLBACK(window_delete_event_cb), self);
+
+  init_keyboard(self);
+
+  fl_renderer_start(FL_RENDERER(FL_RENDERER(self->renderer)), self);
+
+  if (!fl_engine_start(self->engine, &error)) {
+    g_warning("Failed to start Flutter engine: %s", error->message);
+    return;
+  }
+
+  handle_geometry_changed(self);
+}
+
+static gboolean render_cb(FlView* self, GdkGLContext* context) {
+  if (gtk_gl_area_get_error(self->gl_area) != NULL) {
+    return FALSE;
+  }
+
+  int width = gtk_widget_get_allocated_width(GTK_WIDGET(self->gl_area));
+  int height = gtk_widget_get_allocated_height(GTK_WIDGET(self->gl_area));
+  gint scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(self->gl_area));
+  fl_renderer_render(FL_RENDERER(self->renderer), width * scale_factor,
+                     height * scale_factor);
+
+  return TRUE;
+}
+
+static void unrealize_cb(FlView* self) {
+  g_autoptr(GError) error = nullptr;
+
+  fl_renderer_make_current(FL_RENDERER(self->renderer));
+
+  GError* gl_error = gtk_gl_area_get_error(self->gl_area);
+  if (gl_error != NULL) {
+    g_warning("Failed to uninitialize GLArea: %s", gl_error->message);
+    return;
+  }
+
+  fl_renderer_cleanup(FL_RENDERER(self->renderer));
+}
+
+static void size_allocate_cb(FlView* self) {
+  handle_geometry_changed(self);
 }
 
 static void fl_view_set_property(GObject* object,
@@ -601,16 +669,21 @@ static void fl_view_dispose(GObject* object) {
   FlView* self = FL_VIEW(object);
 
   if (self->engine != nullptr) {
-    fl_engine_set_update_semantics_node_handler(self->engine, nullptr, nullptr,
-                                                nullptr);
+    fl_engine_set_update_semantics_handler(self->engine, nullptr, nullptr,
+                                           nullptr);
     fl_engine_set_on_pre_engine_restart_handler(self->engine, nullptr, nullptr,
                                                 nullptr);
   }
 
+  if (self->window_state_cb_id != 0) {
+    GtkWidget* toplevel_window = gtk_widget_get_toplevel(GTK_WIDGET(self));
+    g_signal_handler_disconnect(toplevel_window, self->window_state_cb_id);
+    self->window_state_cb_id = 0;
+  }
+
   g_clear_object(&self->project);
   g_clear_object(&self->renderer);
   g_clear_object(&self->engine);
-  g_clear_object(&self->accessibility_plugin);
   g_clear_object(&self->keyboard_manager);
   if (self->keymap_keys_changed_cb_id != 0) {
     g_signal_handler_disconnect(self->keymap, self->keymap_keys_changed_cb_id);
@@ -618,171 +691,10 @@ static void fl_view_dispose(GObject* object) {
   }
   g_clear_object(&self->mouse_cursor_plugin);
   g_clear_object(&self->platform_plugin);
-  g_list_free_full(self->gl_area_list, g_object_unref);
-  self->gl_area_list = nullptr;
 
   G_OBJECT_CLASS(fl_view_parent_class)->dispose(object);
 }
 
-// Implements GtkWidget::realize.
-static void fl_view_realize(GtkWidget* widget) {
-  FlView* self = FL_VIEW(widget);
-  g_autoptr(GError) error = nullptr;
-
-  GtkAllocation allocation;
-  gtk_widget_get_allocation(widget, &allocation);
-
-  gtk_widget_set_realized(widget, TRUE);
-
-  GdkWindowAttr attributes;
-  attributes.window_type = GDK_WINDOW_CHILD;
-  attributes.x = allocation.x;
-  attributes.y = allocation.y;
-  attributes.width = allocation.width;
-  attributes.height = allocation.height;
-  attributes.wclass = GDK_INPUT_OUTPUT;
-  attributes.visual = gtk_widget_get_visual(widget);
-  attributes.event_mask =
-      gtk_widget_get_events(widget) | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK;
-  gint attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
-  GdkWindow* window = gdk_window_new(gtk_widget_get_parent_window(widget),
-                                     &attributes, attributes_mask);
-  gtk_widget_set_window(widget, window);
-  gtk_widget_register_window(widget, window);
-
-  init_keyboard(self);
-
-  if (!fl_renderer_start(self->renderer, self, &error)) {
-    g_warning("Failed to start Flutter renderer: %s", error->message);
-    return;
-  }
-
-  if (!fl_engine_start(self->engine, &error)) {
-    g_warning("Failed to start Flutter engine: %s", error->message);
-    return;
-  }
-}
-
-// Implements GtkWidget::get-preferred-width
-static void fl_view_get_preferred_width(GtkWidget* widget,
-                                        gint* minimum,
-                                        gint* natural) {
-  FlView* self = FL_VIEW(widget);
-  gint child_min, child_nat;
-
-  *minimum = 0;
-  *natural = 0;
-
-  for (GList* iterator = self->children_list; iterator;
-       iterator = iterator->next) {
-    FlViewChild* child = reinterpret_cast<FlViewChild*>(iterator->data);
-
-    if (!gtk_widget_get_visible(child->widget)) {
-      continue;
-    }
-
-    gtk_widget_get_preferred_width(child->widget, &child_min, &child_nat);
-
-    *minimum = MAX(*minimum, child->geometry.x + child_min);
-    *natural = MAX(*natural, child->geometry.x + child_nat);
-  }
-}
-
-// Implements GtkWidget::get-preferred-height
-static void fl_view_get_preferred_height(GtkWidget* widget,
-                                         gint* minimum,
-                                         gint* natural) {
-  FlView* self = FL_VIEW(widget);
-  gint child_min, child_nat;
-
-  *minimum = 0;
-  *natural = 0;
-
-  for (GList* iterator = self->children_list; iterator;
-       iterator = iterator->next) {
-    FlViewChild* child = reinterpret_cast<FlViewChild*>(iterator->data);
-
-    if (!gtk_widget_get_visible(child->widget)) {
-      continue;
-    }
-
-    gtk_widget_get_preferred_height(child->widget, &child_min, &child_nat);
-
-    *minimum = MAX(*minimum, child->geometry.y + child_min);
-    *natural = MAX(*natural, child->geometry.y + child_nat);
-  }
-}
-
-// Implements GtkWidget::size-allocate.
-static void fl_view_size_allocate(GtkWidget* widget,
-                                  GtkAllocation* allocation) {
-  FlView* self = FL_VIEW(widget);
-
-  gtk_widget_set_allocation(widget, allocation);
-
-  if (gtk_widget_get_has_window(widget)) {
-    if (gtk_widget_get_realized(widget)) {
-      gdk_window_move_resize(gtk_widget_get_window(widget), allocation->x,
-                             allocation->y, allocation->width,
-                             allocation->height);
-    }
-  }
-
-  for (GList* iterator = self->children_list; iterator;
-       iterator = iterator->next) {
-    FlViewChild* child = reinterpret_cast<FlViewChild*>(iterator->data);
-    if (!gtk_widget_get_visible(child->widget)) {
-      continue;
-    }
-
-    GtkAllocation child_allocation = child->geometry;
-    GtkRequisition child_requisition;
-    gtk_widget_get_preferred_size(child->widget, &child_requisition, NULL);
-
-    if (!gtk_widget_get_has_window(widget)) {
-      child_allocation.x += allocation->x;
-      child_allocation.y += allocation->y;
-    }
-
-    if (child_allocation.width == 0 && child_allocation.height == 0) {
-      child_allocation.width = allocation->width;
-      child_allocation.height = allocation->height;
-    }
-
-    gtk_widget_size_allocate(child->widget, &child_allocation);
-  }
-
-  GtkAllocation event_box_allocation = {
-      .x = 0,
-      .y = 0,
-      .width = allocation->width,
-      .height = allocation->height,
-  };
-  if (!gtk_widget_get_has_window(self->event_box)) {
-    event_box_allocation.x += allocation->x;
-    event_box_allocation.y += allocation->y;
-  }
-  gtk_widget_size_allocate(self->event_box, &event_box_allocation);
-
-  handle_geometry_changed(self);
-}
-
-struct _ReorderData {
-  GdkWindow* parent_window;
-  GdkWindow* last_window;
-};
-
-static void fl_view_reorder_forall(GtkWidget* widget, gpointer user_data) {
-  _ReorderData* data = reinterpret_cast<_ReorderData*>(user_data);
-  GdkWindow* window = gtk_widget_get_window(widget);
-  if (window && window != data->parent_window) {
-    if (data->last_window) {
-      gdk_window_restack(window, data->last_window, TRUE);
-    }
-    data->last_window = window;
-  }
-}
-
 // Implements GtkWidget::key_press_event.
 static gboolean fl_view_key_press_event(GtkWidget* widget, GdkEventKey* event) {
   FlView* self = FL_VIEW(widget);
@@ -801,110 +713,17 @@ static gboolean fl_view_key_release_event(GtkWidget* widget,
                                   reinterpret_cast<GdkEvent*>(event))));
 }
 
-static void put_widget(FlView* self,
-                       GtkWidget* widget,
-                       GdkRectangle* geometry) {
-  FlViewChild* child = g_new(FlViewChild, 1);
-  child->widget = widget;
-  child->geometry = *geometry;
-
-  gtk_widget_set_parent(widget, GTK_WIDGET(self));
-  self->children_list = g_list_append(self->children_list, child);
-}
-
-// Implements GtkContainer::add
-static void fl_view_add(GtkContainer* container, GtkWidget* widget) {
-  GdkRectangle geometry = {
-      .x = 0,
-      .y = 0,
-      .width = 0,
-      .height = 0,
-  };
-  put_widget(FL_VIEW(container), widget, &geometry);
-}
-
-// Implements GtkContainer::remove
-static void fl_view_remove(GtkContainer* container, GtkWidget* widget) {
-  FlView* self = FL_VIEW(container);
-  for (GList* iterator = self->children_list; iterator;
-       iterator = iterator->next) {
-    FlViewChild* child = reinterpret_cast<FlViewChild*>(iterator->data);
-    if (child->widget == widget) {
-      g_object_ref(widget);
-      gtk_widget_unparent(widget);
-      self->children_list = g_list_remove_link(self->children_list, iterator);
-      g_list_free(iterator);
-      g_free(child);
-
-      break;
-    }
-  }
-
-  if (widget == GTK_WIDGET(self->event_box)) {
-    g_clear_object(&self->event_box);
-  }
-}
-
-// Implements GtkContainer::forall
-static void fl_view_forall(GtkContainer* container,
-                           gboolean include_internals,
-                           GtkCallback callback,
-                           gpointer callback_data) {
-  FlView* self = FL_VIEW(container);
-  for (GList* iterator = self->children_list; iterator;
-       iterator = iterator->next) {
-    FlViewChild* child = reinterpret_cast<FlViewChild*>(iterator->data);
-    (*callback)(child->widget, callback_data);
-  }
-
-  if (include_internals) {
-    (*callback)(self->event_box, callback_data);
-  }
-}
-
-// Implements GtkContainer::child_type
-static GType fl_view_child_type(GtkContainer* container) {
-  return GTK_TYPE_WIDGET;
-}
-
-// Implements GtkContainer::set_child_property
-static void fl_view_set_child_property(GtkContainer* container,
-                                       GtkWidget* child,
-                                       guint property_id,
-                                       const GValue* value,
-                                       GParamSpec* pspec) {}
-
-// Implements GtkContainer::get_child_property
-static void fl_view_get_child_property(GtkContainer* container,
-                                       GtkWidget* child,
-                                       guint property_id,
-                                       GValue* value,
-                                       GParamSpec* pspec) {}
-
 static void fl_view_class_init(FlViewClass* klass) {
   GObjectClass* object_class = G_OBJECT_CLASS(klass);
-  object_class->constructed = fl_view_constructed;
   object_class->set_property = fl_view_set_property;
   object_class->get_property = fl_view_get_property;
   object_class->notify = fl_view_notify;
   object_class->dispose = fl_view_dispose;
 
   GtkWidgetClass* widget_class = GTK_WIDGET_CLASS(klass);
-  widget_class->realize = fl_view_realize;
-  widget_class->get_preferred_width = fl_view_get_preferred_width;
-  widget_class->get_preferred_height = fl_view_get_preferred_height;
-  widget_class->size_allocate = fl_view_size_allocate;
   widget_class->key_press_event = fl_view_key_press_event;
   widget_class->key_release_event = fl_view_key_release_event;
 
-  GtkContainerClass* container_class = GTK_CONTAINER_CLASS(klass);
-  container_class->add = fl_view_add;
-  container_class->remove = fl_view_remove;
-  container_class->forall = fl_view_forall;
-  container_class->child_type = fl_view_child_type;
-  container_class->set_child_property = fl_view_set_child_property;
-  container_class->get_child_property = fl_view_get_child_property;
-
   g_object_class_install_property(
       G_OBJECT_CLASS(klass), kPropFlutterProject,
       g_param_spec_object(
@@ -919,6 +738,58 @@ static void fl_view_class_init(FlViewClass* klass) {
 
 static void fl_view_init(FlView* self) {
   gtk_widget_set_can_focus(GTK_WIDGET(self), TRUE);
+
+  self->event_box = gtk_event_box_new();
+  gtk_widget_set_hexpand(self->event_box, TRUE);
+  gtk_widget_set_vexpand(self->event_box, TRUE);
+  gtk_container_add(GTK_CONTAINER(self), self->event_box);
+  gtk_widget_show(self->event_box);
+  gtk_widget_add_events(self->event_box,
+                        GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK |
+                            GDK_BUTTON_RELEASE_MASK | GDK_SCROLL_MASK |
+                            GDK_SMOOTH_SCROLL_MASK);
+
+  g_signal_connect_swapped(self->event_box, "button-press-event",
+                           G_CALLBACK(button_press_event_cb), self);
+  g_signal_connect_swapped(self->event_box, "button-release-event",
+                           G_CALLBACK(button_release_event_cb), self);
+  g_signal_connect_swapped(self->event_box, "scroll-event",
+                           G_CALLBACK(scroll_event_cb), self);
+  g_signal_connect_swapped(self->event_box, "motion-notify-event",
+                           G_CALLBACK(motion_notify_event_cb), self);
+  g_signal_connect_swapped(self->event_box, "enter-notify-event",
+                           G_CALLBACK(enter_notify_event_cb), self);
+  g_signal_connect_swapped(self->event_box, "leave-notify-event",
+                           G_CALLBACK(leave_notify_event_cb), self);
+  GtkGesture* zoom = gtk_gesture_zoom_new(self->event_box);
+  g_signal_connect_swapped(zoom, "begin", G_CALLBACK(gesture_zoom_begin_cb),
+                           self);
+  g_signal_connect_swapped(zoom, "scale-changed",
+                           G_CALLBACK(gesture_zoom_update_cb), self);
+  g_signal_connect_swapped(zoom, "end", G_CALLBACK(gesture_zoom_end_cb), self);
+  GtkGesture* rotate = gtk_gesture_rotate_new(self->event_box);
+  g_signal_connect_swapped(rotate, "begin",
+                           G_CALLBACK(gesture_rotation_begin_cb), self);
+  g_signal_connect_swapped(rotate, "angle-changed",
+                           G_CALLBACK(gesture_rotation_update_cb), self);
+  g_signal_connect_swapped(rotate, "end", G_CALLBACK(gesture_rotation_end_cb),
+                           self);
+
+  self->gl_area = GTK_GL_AREA(gtk_gl_area_new());
+  gtk_widget_show(GTK_WIDGET(self->gl_area));
+  gtk_container_add(GTK_CONTAINER(self->event_box), GTK_WIDGET(self->gl_area));
+
+  g_signal_connect_swapped(self->gl_area, "create-context",
+                           G_CALLBACK(create_context_cb), self);
+  g_signal_connect_swapped(self->gl_area, "realize", G_CALLBACK(realize_cb),
+                           self);
+  g_signal_connect_swapped(self->gl_area, "render", G_CALLBACK(render_cb),
+                           self);
+  g_signal_connect_swapped(self->gl_area, "unrealize", G_CALLBACK(unrealize_cb),
+                           self);
+
+  g_signal_connect_swapped(self, "size-allocate", G_CALLBACK(size_allocate_cb),
+                           self);
 }
 
 G_MODULE_EXPORT FlView* fl_view_new(FlDartProject* project) {
@@ -926,84 +797,17 @@ G_MODULE_EXPORT FlView* fl_view_new(FlDartProject* project) {
       g_object_new(fl_view_get_type(), "flutter-project", project, nullptr));
 }
 
-G_MODULE_EXPORT FlEngine* fl_view_get_engine(FlView* view) {
-  g_return_val_if_fail(FL_IS_VIEW(view), nullptr);
-  return view->engine;
-}
-
-void fl_view_begin_frame(FlView* view) {
-  g_return_if_fail(FL_IS_VIEW(view));
-  FlView* self = FL_VIEW(view);
-
-  self->used_area_list = self->gl_area_list;
-  g_list_free_full(self->pending_children_list, g_free);
-  self->pending_children_list = nullptr;
-}
-
-void fl_view_add_gl_area(FlView* view,
-                         GdkGLContext* context,
-                         FlBackingStoreProvider* texture) {
-  g_return_if_fail(FL_IS_VIEW(view));
-
-  FlGLArea* area;
-  if (view->used_area_list) {
-    area = reinterpret_cast<FlGLArea*>(view->used_area_list->data);
-    view->used_area_list = view->used_area_list->next;
-  } else {
-    area = FL_GL_AREA(fl_gl_area_new(context));
-    view->gl_area_list = g_list_append(view->gl_area_list, area);
-  }
-
-  gtk_widget_show(GTK_WIDGET(area));
-  add_pending_child(view, GTK_WIDGET(area), nullptr);
-  fl_gl_area_queue_render(area, texture);
+G_MODULE_EXPORT FlEngine* fl_view_get_engine(FlView* self) {
+  g_return_val_if_fail(FL_IS_VIEW(self), nullptr);
+  return self->engine;
 }
 
-void fl_view_add_widget(FlView* view,
-                        GtkWidget* widget,
-                        GdkRectangle* geometry) {
-  gtk_widget_show(widget);
-  add_pending_child(view, widget, geometry);
+void fl_view_redraw(FlView* self) {
+  g_return_if_fail(FL_IS_VIEW(self));
+  gtk_widget_queue_draw(GTK_WIDGET(self->gl_area));
 }
 
-void fl_view_end_frame(FlView* view) {
-  for (GList* pending_child = view->pending_children_list; pending_child;
-       pending_child = pending_child->next) {
-    FlViewChild* pending_view_child =
-        reinterpret_cast<FlViewChild*>(pending_child->data);
-    GList* child = find_child(view->children_list, pending_view_child->widget);
-
-    if (child) {
-      // existing child
-      g_free(child->data);
-      child->data = nullptr;
-    } else {
-      // newly added child
-      gtk_widget_set_parent(pending_view_child->widget, GTK_WIDGET(view));
-    }
-  }
-
-  for (GList* child = view->children_list; child; child = child->next) {
-    FlViewChild* view_child = reinterpret_cast<FlViewChild*>(child->data);
-    if (view_child) {
-      // removed child
-      g_object_ref(view_child->widget);
-      gtk_widget_unparent(view_child->widget);
-      g_free(view_child);
-      child->data = nullptr;
-    }
-  }
-
-  g_list_free(view->children_list);
-  view->children_list = view->pending_children_list;
-  view->pending_children_list = nullptr;
-
-  struct _ReorderData data = {
-      .parent_window = gtk_widget_get_window(GTK_WIDGET(view)),
-      .last_window = nullptr,
-  };
-
-  gtk_container_forall(GTK_CONTAINER(view), fl_view_reorder_forall, &data);
-
-  gtk_widget_queue_draw(GTK_WIDGET(view));
+GHashTable* fl_view_get_keyboard_state(FlView* self) {
+  g_return_val_if_fail(FL_IS_VIEW(self), nullptr);
+  return fl_keyboard_manager_get_pressed_state(self->keyboard_manager);
 }
diff --git a/shell/platform/linux/fl_view_accessible.cc b/shell/platform/linux/fl_view_accessible.cc
index 19d81c18050f69a3536082a01dc147caa5f5ea4a..7ddefe0b0bbfb50cb8a4b19bce1cf03465bb2a69 100644
--- a/shell/platform/linux/fl_view_accessible.cc
+++ b/shell/platform/linux/fl_view_accessible.cc
@@ -15,9 +15,6 @@ struct _FlViewAccessible {
 
   // Semantics nodes keyed by ID
   GHashTable* semantics_nodes_by_id;
-
-  // Child IDs stored until commit_updates is called
-  GHashTable* pending_children;
 };
 
 enum { kProp0, kPropEngine, kPropLast };
@@ -42,7 +39,7 @@ static FlEngine* get_engine(FlViewAccessible* self) {
 }
 
 static FlAccessibleNode* create_node(FlViewAccessible* self,
-                                     const FlutterSemanticsNode* semantics) {
+                                     FlutterSemanticsNode2* semantics) {
   FlEngine* engine = get_engine(self);
 
   if (semantics->flags & kFlutterSemanticsFlagIsTextField) {
@@ -60,7 +57,7 @@ static FlAccessibleNode* lookup_node(FlViewAccessible* self, int32_t id) {
 // Gets the ATK node for the given id.
 // If the node doesn't exist it will be created.
 static FlAccessibleNode* get_node(FlViewAccessible* self,
-                                  const FlutterSemanticsNode* semantics) {
+                                  FlutterSemanticsNode2* semantics) {
   FlAccessibleNode* node = lookup_node(self, semantics->id);
   if (node != nullptr) {
     return node;
@@ -78,33 +75,6 @@ static FlAccessibleNode* get_node(FlViewAccessible* self,
   return node;
 }
 
-static void commit_updates(FlViewAccessible* self) {
-  g_hash_table_foreach_remove(
-      self->pending_children,
-      [](gpointer key, gpointer value, gpointer user_data) -> gboolean {
-        FlViewAccessible* self = FL_VIEW_ACCESSIBLE(user_data);
-
-        FlAccessibleNode* parent = FL_ACCESSIBLE_NODE(key);
-
-        size_t child_count = fl_value_get_length(static_cast<FlValue*>(value));
-        const int32_t* children_in_traversal_order =
-            fl_value_get_int32_list(static_cast<FlValue*>(value));
-
-        g_autoptr(GPtrArray) children = g_ptr_array_new();
-        for (size_t i = 0; i < child_count; i++) {
-          FlAccessibleNode* child =
-              lookup_node(self, children_in_traversal_order[i]);
-          g_assert(child != nullptr);
-          fl_accessible_node_set_parent(child, ATK_OBJECT(parent), i);
-          g_ptr_array_add(children, child);
-        }
-        fl_accessible_node_set_children(parent, children);
-
-        return true;
-      },
-      self);
-}
-
 // Implements AtkObject::get_n_children
 static gint fl_view_accessible_get_n_children(AtkObject* accessible) {
   FlViewAccessible* self = FL_VIEW_ACCESSIBLE(accessible);
@@ -154,7 +124,6 @@ static void fl_view_accessible_dispose(GObject* object) {
   FlViewAccessible* self = FL_VIEW_ACCESSIBLE(object);
 
   g_clear_pointer(&self->semantics_nodes_by_id, g_hash_table_unref);
-  g_clear_pointer(&self->pending_children, g_hash_table_unref);
 
   if (self->engine != nullptr) {
     g_object_remove_weak_pointer(object,
@@ -184,33 +153,58 @@ static void fl_view_accessible_class_init(FlViewAccessibleClass* klass) {
 static void fl_view_accessible_init(FlViewAccessible* self) {
   self->semantics_nodes_by_id = g_hash_table_new_full(
       g_direct_hash, g_direct_equal, nullptr, g_object_unref);
-  self->pending_children =
-      g_hash_table_new_full(g_direct_hash, g_direct_equal, nullptr,
-                            reinterpret_cast<GDestroyNotify>(fl_value_unref));
 }
 
-void fl_view_accessible_handle_update_semantics_node(
+void fl_view_accessible_handle_update_semantics(
     FlViewAccessible* self,
-    const FlutterSemanticsNode* node) {
-  if (node->id == kFlutterSemanticsNodeIdBatchEnd) {
-    commit_updates(self);
-    return;
+    const FlutterSemanticsUpdate2* update) {
+  g_autoptr(GHashTable) pending_children =
+      g_hash_table_new_full(g_direct_hash, g_direct_equal, nullptr,
+                            reinterpret_cast<GDestroyNotify>(fl_value_unref));
+
+  for (size_t i = 0; i < update->node_count; i++) {
+    FlutterSemanticsNode2* node = update->nodes[i];
+    FlAccessibleNode* atk_node = get_node(self, node);
+
+    fl_accessible_node_set_flags(atk_node, node->flags);
+    fl_accessible_node_set_actions(atk_node, node->actions);
+    fl_accessible_node_set_name(atk_node, node->label);
+    fl_accessible_node_set_extents(
+        atk_node, node->rect.left + node->transform.transX,
+        node->rect.top + node->transform.transY,
+        node->rect.right - node->rect.left, node->rect.bottom - node->rect.top);
+    fl_accessible_node_set_value(atk_node, node->value);
+    fl_accessible_node_set_text_selection(atk_node, node->text_selection_base,
+                                          node->text_selection_extent);
+    fl_accessible_node_set_text_direction(atk_node, node->text_direction);
+
+    FlValue* children = fl_value_new_int32_list(
+        node->children_in_traversal_order, node->child_count);
+    g_hash_table_insert(pending_children, atk_node, children);
   }
 
-  FlAccessibleNode* atk_node = get_node(self, node);
-
-  fl_accessible_node_set_flags(atk_node, node->flags);
-  fl_accessible_node_set_actions(atk_node, node->actions);
-  fl_accessible_node_set_name(atk_node, node->label);
-  fl_accessible_node_set_extents(
-      atk_node, node->rect.left + node->transform.transX,
-      node->rect.top + node->transform.transY,
-      node->rect.right - node->rect.left, node->rect.bottom - node->rect.top);
-  fl_accessible_node_set_value(atk_node, node->value);
-  fl_accessible_node_set_text_selection(atk_node, node->text_selection_base,
-                                        node->text_selection_extent);
-
-  FlValue* children = fl_value_new_int32_list(node->children_in_traversal_order,
-                                              node->child_count);
-  g_hash_table_insert(self->pending_children, atk_node, children);
+  g_hash_table_foreach_remove(
+      pending_children,
+      [](gpointer key, gpointer value, gpointer user_data) -> gboolean {
+        FlViewAccessible* self = FL_VIEW_ACCESSIBLE(user_data);
+
+        FlAccessibleNode* parent = FL_ACCESSIBLE_NODE(key);
+
+        size_t child_count = fl_value_get_length(static_cast<FlValue*>(value));
+        const int32_t* children_in_traversal_order =
+            fl_value_get_int32_list(static_cast<FlValue*>(value));
+
+        g_autoptr(GPtrArray) children = g_ptr_array_new();
+        for (size_t i = 0; i < child_count; i++) {
+          FlAccessibleNode* child =
+              lookup_node(self, children_in_traversal_order[i]);
+          g_assert(child != nullptr);
+          fl_accessible_node_set_parent(child, ATK_OBJECT(parent), i);
+          g_ptr_array_add(children, child);
+        }
+        fl_accessible_node_set_children(parent, children);
+
+        return true;
+      },
+      self);
 }
diff --git a/shell/platform/linux/fl_view_accessible.h b/shell/platform/linux/fl_view_accessible.h
index e9ed68e929b33ca7acd4d15c5e7593dc1a05b967..0c45d7b2b85a6bedce18330360c2ac9402555fe8 100644
--- a/shell/platform/linux/fl_view_accessible.h
+++ b/shell/platform/linux/fl_view_accessible.h
@@ -29,15 +29,15 @@ G_DECLARE_FINAL_TYPE(FlViewAccessible,
  */
 
 /**
- * fl_view_accessible_handle_update_semantics_node:
+ * fl_view_accessible_handle_update_semantics:
  * @accessible: an #FlViewAccessible.
- * @node: semantic node information.
+ * @update: semantic update information.
  *
- * Handle a semantics node update from Flutter.
+ * Handle a semantics update from Flutter.
  */
-void fl_view_accessible_handle_update_semantics_node(
+void fl_view_accessible_handle_update_semantics(
     FlViewAccessible* accessible,
-    const FlutterSemanticsNode* node);
+    const FlutterSemanticsUpdate2* update);
 
 G_END_DECLS
 
diff --git a/shell/platform/linux/fl_view_accessible_test.cc b/shell/platform/linux/fl_view_accessible_test.cc
index bb34774f98c0156ecdd5ae75435058f902e31f4a..be4495e7ebf2c23063826c6a7b4504e258230a23 100644
--- a/shell/platform/linux/fl_view_accessible_test.cc
+++ b/shell/platform/linux/fl_view_accessible_test.cc
@@ -10,30 +10,23 @@
 #include "flutter/shell/platform/linux/testing/fl_test.h"
 #include "flutter/shell/platform/linux/testing/mock_signal_handler.h"
 
-static const FlutterSemanticsNode kBatchEndNode = {
-    .id = kFlutterSemanticsNodeIdBatchEnd};
-
 TEST(FlViewAccessibleTest, BuildTree) {
   g_autoptr(FlEngine) engine = make_mock_engine();
   g_autoptr(FlViewAccessible) accessible = FL_VIEW_ACCESSIBLE(
       g_object_new(fl_view_accessible_get_type(), "engine", engine, nullptr));
 
-  const int32_t children[] = {111, 222};
-  const FlutterSemanticsNode root_node = {
+  int32_t children[] = {111, 222};
+  FlutterSemanticsNode2 root_node = {
       .id = 0,
       .label = "root",
       .child_count = 2,
       .children_in_traversal_order = children,
   };
-  fl_view_accessible_handle_update_semantics_node(accessible, &root_node);
-
-  const FlutterSemanticsNode child1_node = {.id = 111, .label = "child 1"};
-  fl_view_accessible_handle_update_semantics_node(accessible, &child1_node);
-
-  const FlutterSemanticsNode child2_node = {.id = 222, .label = "child 2"};
-  fl_view_accessible_handle_update_semantics_node(accessible, &child2_node);
-
-  fl_view_accessible_handle_update_semantics_node(accessible, &kBatchEndNode);
+  FlutterSemanticsNode2 child1_node = {.id = 111, .label = "child 1"};
+  FlutterSemanticsNode2 child2_node = {.id = 222, .label = "child 2"};
+  FlutterSemanticsNode2* nodes[3] = {&root_node, &child1_node, &child2_node};
+  FlutterSemanticsUpdate2 update = {.node_count = 3, .nodes = nodes};
+  fl_view_accessible_handle_update_semantics(accessible, &update);
 
   AtkObject* root_object =
       atk_object_ref_accessible_child(ATK_OBJECT(accessible), 0);
@@ -59,14 +52,14 @@ TEST(FlViewAccessibleTest, AddRemoveChildren) {
   g_autoptr(FlViewAccessible) accessible = FL_VIEW_ACCESSIBLE(
       g_object_new(fl_view_accessible_get_type(), "engine", engine, nullptr));
 
-  FlutterSemanticsNode root_node = {
+  FlutterSemanticsNode2 root_node = {
       .id = 0,
       .label = "root",
       .child_count = 0,
   };
-  fl_view_accessible_handle_update_semantics_node(accessible, &root_node);
-
-  fl_view_accessible_handle_update_semantics_node(accessible, &kBatchEndNode);
+  FlutterSemanticsNode2* nodes[1] = {&root_node};
+  FlutterSemanticsUpdate2 update = {.node_count = 1, .nodes = nodes};
+  fl_view_accessible_handle_update_semantics(accessible, &update);
 
   AtkObject* root_object =
       atk_object_ref_accessible_child(ATK_OBJECT(accessible), 0);
@@ -74,21 +67,19 @@ TEST(FlViewAccessibleTest, AddRemoveChildren) {
 
   // add child1
   AtkObject* child1_object = nullptr;
+  FlutterSemanticsNode2 child1_node = {.id = 111, .label = "child 1"};
   {
     flutter::testing::MockSignalHandler2<gint, AtkObject*> child1_added(
         root_object, "children-changed::add");
     EXPECT_SIGNAL2(child1_added, ::testing::Eq(0), ::testing::A<AtkObject*>())
         .WillOnce(::testing::SaveArg<1>(&child1_object));
 
-    const int32_t children[] = {111};
+    int32_t children[] = {111};
     root_node.child_count = 1;
     root_node.children_in_traversal_order = children;
-    fl_view_accessible_handle_update_semantics_node(accessible, &root_node);
-
-    const FlutterSemanticsNode child1_node = {.id = 111, .label = "child 1"};
-    fl_view_accessible_handle_update_semantics_node(accessible, &child1_node);
-
-    fl_view_accessible_handle_update_semantics_node(accessible, &kBatchEndNode);
+    FlutterSemanticsNode2* nodes[2] = {&root_node, &child1_node};
+    FlutterSemanticsUpdate2 update = {.node_count = 2, .nodes = nodes};
+    fl_view_accessible_handle_update_semantics(accessible, &update);
   }
 
   EXPECT_EQ(atk_object_get_n_accessible_children(root_object), 1);
@@ -101,21 +92,19 @@ TEST(FlViewAccessibleTest, AddRemoveChildren) {
 
   // add child2
   AtkObject* child2_object = nullptr;
+  FlutterSemanticsNode2 child2_node = {.id = 222, .label = "child 2"};
   {
     flutter::testing::MockSignalHandler2<gint, AtkObject*> child2_added(
         root_object, "children-changed::add");
     EXPECT_SIGNAL2(child2_added, ::testing::Eq(1), ::testing::A<AtkObject*>())
         .WillOnce(::testing::SaveArg<1>(&child2_object));
 
-    const int32_t children[] = {111, 222};
+    int32_t children[] = {111, 222};
     root_node.child_count = 2;
     root_node.children_in_traversal_order = children;
-    fl_view_accessible_handle_update_semantics_node(accessible, &root_node);
-
-    const FlutterSemanticsNode child2_node = {.id = 222, .label = "child 2"};
-    fl_view_accessible_handle_update_semantics_node(accessible, &child2_node);
-
-    fl_view_accessible_handle_update_semantics_node(accessible, &kBatchEndNode);
+    FlutterSemanticsNode2* nodes[3] = {&root_node, &child1_node, &child2_node};
+    FlutterSemanticsUpdate2 update = {.node_count = 3, .nodes = nodes};
+    fl_view_accessible_handle_update_semantics(accessible, &update);
   }
 
   EXPECT_EQ(atk_object_get_n_accessible_children(root_object), 2);
@@ -142,9 +131,9 @@ TEST(FlViewAccessibleTest, AddRemoveChildren) {
     const int32_t children[] = {222};
     root_node.child_count = 1;
     root_node.children_in_traversal_order = children;
-    fl_view_accessible_handle_update_semantics_node(accessible, &root_node);
-
-    fl_view_accessible_handle_update_semantics_node(accessible, &kBatchEndNode);
+    FlutterSemanticsNode2* nodes[3] = {&root_node, &child2_node};
+    FlutterSemanticsUpdate2 update = {.node_count = 2, .nodes = nodes};
+    fl_view_accessible_handle_update_semantics(accessible, &update);
   }
 
   EXPECT_EQ(atk_object_get_n_accessible_children(root_object), 1);
@@ -163,9 +152,9 @@ TEST(FlViewAccessibleTest, AddRemoveChildren) {
                    ::testing::Eq(child2_object));
 
     root_node.child_count = 0;
-    fl_view_accessible_handle_update_semantics_node(accessible, &root_node);
-
-    fl_view_accessible_handle_update_semantics_node(accessible, &kBatchEndNode);
+    FlutterSemanticsNode2* nodes[1] = {&root_node};
+    FlutterSemanticsUpdate2 update = {.node_count = 1, .nodes = nodes};
+    fl_view_accessible_handle_update_semantics(accessible, &update);
   }
 
   EXPECT_EQ(atk_object_get_n_accessible_children(root_object), 0);
diff --git a/shell/platform/linux/fl_view_private.h b/shell/platform/linux/fl_view_private.h
index 693c937231528b47c9170a8c0e843b75c9bd9eec..de3fc9c9118760df7f69a7efc8bb690e42f8e035 100644
--- a/shell/platform/linux/fl_view_private.h
+++ b/shell/platform/linux/fl_view_private.h
@@ -7,49 +7,21 @@
 
 #include "flutter/shell/platform/linux/public/flutter_linux/fl_view.h"
 
-#include "flutter/shell/platform/linux/fl_gl_area.h"
-
-/**
- * fl_view_begin_frame:
- * @view: an #FlView.
- *
- * Reset children of #FlView a stacked #GtkContainer.
- * This function is always paired with fl_view_end_frame.
- */
-void fl_view_begin_frame(FlView* view);
-
-/**
- * fl_view_add_gl_area:
- * @view: an #FlView.
- * @context: (transfer full): a #GdkGLContext, for #FlGLArea to render.
- * @texture: (transfer full): texture for OpenGL area to render.
- *
- * Append an #FlGLArea at top of stacked children of #FlView.
- * This function must be called after fl_view_begin_frame, and
- * before fl_view_end_frame.
- */
-void fl_view_add_gl_area(FlView* view,
-                         GdkGLContext* context,
-                         FlBackingStoreProvider* texture);
-
 /**
- * fl_view_add_widget:
+ * fl_view_redraw:
  * @view: an #FlView.
- * @widget: a #GtkWidget.
- * @geometry: geometry of the widget.
  *
- * Append a #GtkWidget at top of stacked children of #FlView.
+ * Indicate the view needs to redraw.
  */
-void fl_view_add_widget(FlView* view,
-                        GtkWidget* widget,
-                        GdkRectangle* geometry);
+void fl_view_redraw(FlView* view);
 
 /**
- * fl_view_end_frame:
+ * fl_view_get_keyboard_state:
  * @view: an #FlView.
  *
- * Apply changes made by fl_view_add_gl_area and fl_view_add_widget.
+ * Returns the keyboard pressed state. The hash table contains one entry per
+ * pressed keys, mapping from the logical key to the physical key.*
  */
-void fl_view_end_frame(FlView* view);
+GHashTable* fl_view_get_keyboard_state(FlView* view);
 
 #endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_VIEW_PRIVATE_H_
diff --git a/shell/platform/linux/fl_view_test.cc b/shell/platform/linux/fl_view_test.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c36323cb04aca6b861134f1e779250edd42e05a1
--- /dev/null
+++ b/shell/platform/linux/fl_view_test.cc
@@ -0,0 +1,20 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/platform/linux/public/flutter_linux/fl_view.h"
+#include "flutter/shell/platform/linux/testing/fl_test_gtk_logs.h"
+
+#include "gtest/gtest.h"
+
+TEST(FlViewTest, StateUpdateDoesNotHappenInInit) {
+  flutter::testing::fl_ensure_gtk_init();
+  g_autoptr(FlDartProject) project = fl_dart_project_new();
+  g_autoptr(FlView) view = fl_view_new(project);
+  // Check that creating a view doesn't try to query the window state in
+  // initialization, causing a critical log to be issued.
+  EXPECT_EQ(
+      flutter::testing::fl_get_received_gtk_log_levels() & G_LOG_LEVEL_CRITICAL,
+      (GLogLevelFlags)0x0);
+  g_object_ref_sink(view);
+}
diff --git a/shell/platform/linux/key_mapping.g.cc b/shell/platform/linux/key_mapping.g.cc
index ed08c3512b3478a94c171f3112b7819c043df565..a5a7643930c7b388bbfdd694f5e0baadd3e34e6c 100644
--- a/shell/platform/linux/key_mapping.g.cc
+++ b/shell/platform/linux/key_mapping.g.cc
@@ -460,6 +460,7 @@ void initialize_lock_bit_to_checked_keys(GHashTable* table) {
 }
 
 const std::vector<LayoutGoal> layout_goals = {
+    LayoutGoal{0x41, 0x20, false},         // Space
     LayoutGoal{0x30, 0x22, false},         // Quote
     LayoutGoal{0x3b, 0x2c, false},         // Comma
     LayoutGoal{0x14, 0x2d, false},         // Minus
diff --git a/shell/platform/linux/key_mapping.h b/shell/platform/linux/key_mapping.h
index cd425c65288fdbf166ab4a00948a45ddcececbfb..9b1468586f9a911a43a3f41af692765cf317811f 100644
--- a/shell/platform/linux/key_mapping.h
+++ b/shell/platform/linux/key_mapping.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef KEYBOARD_MAP_H_
-#define KEYBOARD_MAP_H_
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_KEY_MAPPING_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_KEY_MAPPING_H_
 
 #include <gdk/gdk.h>
 #include <cinttypes>
@@ -49,6 +49,7 @@ typedef struct {
   bool mandatory;
 } LayoutGoal;
 
+// NOLINTNEXTLINE(readability-identifier-naming)
 extern const std::vector<LayoutGoal> layout_goals;
 
-#endif  // KEYBOARD_MAP_H_
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_KEY_MAPPING_H_
diff --git a/shell/platform/linux/key_mapping_test.cc b/shell/platform/linux/key_mapping_test.cc
new file mode 100644
index 0000000000000000000000000000000000000000..7ecc3777e2dfd0422f2ec2b213aa08b47bae0d44
--- /dev/null
+++ b/shell/platform/linux/key_mapping_test.cc
@@ -0,0 +1,40 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "key_mapping.h"
+#include <gmodule.h>
+#include <algorithm>
+#include <vector>
+
+#include "gtest/gtest.h"
+
+bool operator==(const LayoutGoal& a, const LayoutGoal& b) {
+  return a.keycode == b.keycode && a.logical_key == b.logical_key &&
+         a.mandatory == b.mandatory;
+}
+
+// Spot check some expected values so that we know that some classes of key
+// aren't excluded.
+TEST(KeyMappingTest, HasExpectedValues) {
+  // Has Space
+  EXPECT_NE(std::find(layout_goals.begin(), layout_goals.end(),
+                      LayoutGoal{0x41, 0x20, false}),
+            layout_goals.end());
+  // Has Digit0
+  EXPECT_NE(std::find(layout_goals.begin(), layout_goals.end(),
+                      LayoutGoal{0x13, 0x30, true}),
+            layout_goals.end());
+  // Has KeyA
+  EXPECT_NE(std::find(layout_goals.begin(), layout_goals.end(),
+                      LayoutGoal{0x26, 0x61, true}),
+            layout_goals.end());
+  // Has Equal
+  EXPECT_NE(std::find(layout_goals.begin(), layout_goals.end(),
+                      LayoutGoal{0x15, 0x3d, false}),
+            layout_goals.end());
+  // Has IntlBackslash
+  EXPECT_NE(std::find(layout_goals.begin(), layout_goals.end(),
+                      LayoutGoal{0x5e, 0x200000020, false}),
+            layout_goals.end());
+}
diff --git a/shell/platform/linux/public/flutter_linux/fl_basic_message_channel.h b/shell/platform/linux/public/flutter_linux/fl_basic_message_channel.h
index b9fec0160c7c16895f2635895dd5973049c1d88c..44a4217920e67a7d7ee45154f45541fb5730cf70 100644
--- a/shell/platform/linux/public/flutter_linux/fl_basic_message_channel.h
+++ b/shell/platform/linux/public/flutter_linux/fl_basic_message_channel.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_LINUX_FL_BASIC_MESSAGE_CHANNEL_H_
-#define FLUTTER_SHELL_PLATFORM_LINUX_FL_BASIC_MESSAGE_CHANNEL_H_
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_BASIC_MESSAGE_CHANNEL_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_BASIC_MESSAGE_CHANNEL_H_
 
 #if !defined(__FLUTTER_LINUX_INSIDE__) && !defined(FLUTTER_LINUX_COMPILATION)
 #error "Only <flutter_linux/flutter_linux.h> can be included directly."
@@ -11,18 +11,21 @@
 
 #include <gio/gio.h>
 #include <glib-object.h>
+#include <gmodule.h>
 
 #include "fl_binary_messenger.h"
 #include "fl_message_codec.h"
 
 G_BEGIN_DECLS
 
+G_MODULE_EXPORT
 G_DECLARE_FINAL_TYPE(FlBasicMessageChannel,
                      fl_basic_message_channel,
                      FL,
                      BASIC_MESSAGE_CHANNEL,
                      GObject)
 
+G_MODULE_EXPORT
 G_DECLARE_FINAL_TYPE(FlBasicMessageChannelResponseHandle,
                      fl_basic_message_channel_response_handle,
                      FL,
@@ -171,7 +174,8 @@ gboolean fl_basic_message_channel_respond(
 /**
  * fl_basic_message_channel_send:
  * @channel: an #FlBasicMessageChannel.
- * @message: message to send, must match what the #FlMessageCodec supports.
+ * @message: (allow-none): message to send, must match what the #FlMessageCodec
+ * supports.
  * @cancellable: (allow-none): a #GCancellable or %NULL.
  * @callback: (scope async): (allow-none): a #GAsyncReadyCallback to call when
  * the request is satisfied or %NULL to ignore the response.
@@ -202,4 +206,4 @@ FlValue* fl_basic_message_channel_send_finish(FlBasicMessageChannel* channel,
 
 G_END_DECLS
 
-#endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_BASIC_MESSAGE_CHANNEL_H_
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_BASIC_MESSAGE_CHANNEL_H_
diff --git a/shell/platform/linux/public/flutter_linux/fl_binary_codec.h b/shell/platform/linux/public/flutter_linux/fl_binary_codec.h
index e7223d8dfa272a4a4427042aa6c8dea68fe41810..c8febfd583ed260aaab91bf5bac90e6f17eabed9 100644
--- a/shell/platform/linux/public/flutter_linux/fl_binary_codec.h
+++ b/shell/platform/linux/public/flutter_linux/fl_binary_codec.h
@@ -2,17 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_LINUX_FL_BINARY_CODEC_H_
-#define FLUTTER_SHELL_PLATFORM_LINUX_FL_BINARY_CODEC_H_
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_BINARY_CODEC_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_BINARY_CODEC_H_
 
 #if !defined(__FLUTTER_LINUX_INSIDE__) && !defined(FLUTTER_LINUX_COMPILATION)
 #error "Only <flutter_linux/flutter_linux.h> can be included directly."
 #endif
 
+#include <gmodule.h>
+
 #include "fl_message_codec.h"
 
 G_BEGIN_DECLS
 
+G_MODULE_EXPORT
 G_DECLARE_FINAL_TYPE(FlBinaryCodec,
                      fl_binary_codec,
                      FL,
@@ -42,4 +45,4 @@ FlBinaryCodec* fl_binary_codec_new();
 
 G_END_DECLS
 
-#endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_BINARY_CODEC_H_
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_BINARY_CODEC_H_
diff --git a/shell/platform/linux/public/flutter_linux/fl_binary_messenger.h b/shell/platform/linux/public/flutter_linux/fl_binary_messenger.h
index 84af654cada90fd6bfafe6868b797bcc9ebc33aa..4ac81862ed224388d0813b9e008838b117de560d 100644
--- a/shell/platform/linux/public/flutter_linux/fl_binary_messenger.h
+++ b/shell/platform/linux/public/flutter_linux/fl_binary_messenger.h
@@ -2,15 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_LINUX_FL_BINARY_MESSENGER_H_
-#define FLUTTER_SHELL_PLATFORM_LINUX_FL_BINARY_MESSENGER_H_
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_BINARY_MESSENGER_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_BINARY_MESSENGER_H_
 
 #if !defined(__FLUTTER_LINUX_INSIDE__) && !defined(FLUTTER_LINUX_COMPILATION)
 #error "Only <flutter_linux/flutter_linux.h> can be included directly."
 #endif
 
+#include "fl_value.h"
+
 #include <gio/gio.h>
 #include <glib-object.h>
+#include <gmodule.h>
 
 G_BEGIN_DECLS
 
@@ -24,17 +27,22 @@ G_BEGIN_DECLS
 #define FL_BINARY_MESSENGER_ERROR fl_binary_messenger_codec_error_quark()
 
 typedef enum {
+  // Part of the public API, so fixing the name is a breaking change.
+  // NOLINTNEXTLINE(readability-identifier-naming)
   FL_BINARY_MESSENGER_ERROR_ALREADY_RESPONDED,
 } FlBinaryMessengerError;
 
+G_MODULE_EXPORT
 GQuark fl_binary_messenger_codec_error_quark(void) G_GNUC_CONST;
 
+G_MODULE_EXPORT
 G_DECLARE_INTERFACE(FlBinaryMessenger,
                     fl_binary_messenger,
                     FL,
                     BINARY_MESSENGER,
                     GObject)
 
+G_MODULE_EXPORT
 G_DECLARE_DERIVABLE_TYPE(FlBinaryMessengerResponseHandle,
                          fl_binary_messenger_response_handle,
                          FL,
@@ -88,6 +96,14 @@ struct _FlBinaryMessengerInterface {
   GBytes* (*send_on_channel_finish)(FlBinaryMessenger* messenger,
                                     GAsyncResult* result,
                                     GError** error);
+
+  void (*resize_channel)(FlBinaryMessenger* messenger,
+                         const gchar* channel,
+                         int64_t new_size);
+
+  void (*set_warns_on_channel_overflow)(FlBinaryMessenger* messenger,
+                                        const gchar* channel,
+                                        bool warns);
 };
 
 struct _FlBinaryMessengerResponseHandleClass {
@@ -140,7 +156,7 @@ void fl_binary_messenger_set_message_handler_on_channel(
  * @error: (allow-none): #GError location to store the error occurring, or %NULL
  * to ignore.
  *
- * Responds to a platform message.
+ * Responds to a platform message. This function is thread-safe.
  *
  * Returns: %TRUE on success.
  */
@@ -171,7 +187,7 @@ void fl_binary_messenger_send_on_channel(FlBinaryMessenger* messenger,
 
 /**
  * fl_binary_messenger_send_on_channel_finish:
- * @binary_messenger: an #FlBinaryMessenger.
+ * @messenger: an #FlBinaryMessenger.
  * @result: a #GAsyncResult.
  * @error: (allow-none): #GError location to store the error occurring, or %NULL
  * to ignore.
@@ -184,6 +200,33 @@ GBytes* fl_binary_messenger_send_on_channel_finish(FlBinaryMessenger* messenger,
                                                    GAsyncResult* result,
                                                    GError** error);
 
+/**
+ * fl_binary_messenger_resize_channel:
+ * @binary_messenger: an #FlBinaryMessenger.
+ * @channel: channel to be resize.
+ * @new_size: the new size for the channel buffer.
+ *
+ * Sends a message to the control channel asking to resize a channel buffer.
+ */
+void fl_binary_messenger_resize_channel(FlBinaryMessenger* messenger,
+                                        const gchar* channel,
+                                        int64_t new_size);
+
+/**
+ * fl_binary_messenger_set_warns_on_channel_overflow:
+ * @messenger: an #FlBinaryMessenger.
+ * @channel: channel to be allowed to overflow silently.
+ * @warns: when false, the channel is expected to overflow and warning messages
+ * will not be shown.
+ *
+ * Sends a message to the control channel asking to allow or disallow a channel
+ * to overflow silently.
+ */
+void fl_binary_messenger_set_warns_on_channel_overflow(
+    FlBinaryMessenger* messenger,
+    const gchar* channel,
+    bool warns);
+
 G_END_DECLS
 
-#endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_BINARY_MESSENGER_H_
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_BINARY_MESSENGER_H_
diff --git a/shell/platform/linux/public/flutter_linux/fl_dart_project.h b/shell/platform/linux/public/flutter_linux/fl_dart_project.h
index 1b56e24c32627ed6129195f50d69423a898716b9..e6e1736735702c519269249ddc1e76e86f8dcc16 100644
--- a/shell/platform/linux/public/flutter_linux/fl_dart_project.h
+++ b/shell/platform/linux/public/flutter_linux/fl_dart_project.h
@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_LINUX_FL_DART_PROJECT_H_
-#define FLUTTER_SHELL_PLATFORM_LINUX_FL_DART_PROJECT_H_
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_DART_PROJECT_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_DART_PROJECT_H_
 
 #include <glib-object.h>
+#include <gmodule.h>
 
 #if !defined(__FLUTTER_LINUX_INSIDE__) && !defined(FLUTTER_LINUX_COMPILATION)
 #error "Only <flutter_linux/flutter_linux.h> can be included directly."
@@ -13,6 +14,7 @@
 
 G_BEGIN_DECLS
 
+G_MODULE_EXPORT
 G_DECLARE_FINAL_TYPE(FlDartProject, fl_dart_project, FL, DART_PROJECT, GObject)
 
 /**
@@ -36,31 +38,16 @@ G_DECLARE_FINAL_TYPE(FlDartProject, fl_dart_project, FL, DART_PROJECT, GObject)
 FlDartProject* fl_dart_project_new();
 
 /**
- * fl_dart_project_set_enable_mirrors:
+ * fl_dart_project_set_aot_library_path:
  * @project: an #FlDartProject.
- * @enable_mirrors: %TRUE if the dart:mirrors library should be used.
+ * @path: the absolute path to the AOT library in the Flutter application.
  *
- * Sets if this Flutter project can use the dart:mirrors library.
- *
- * Deprecated: This function is temporary and will be removed in a future
- * release.
+ * Sets the path to the AOT library in the Flutter application, which is
+ * the path to libapp.so. By default this is lib/libapp.so relative to the
+ * executable directory.
  */
-void fl_dart_project_set_enable_mirrors(FlDartProject* project,
-                                        gboolean enable_mirrors) G_DEPRECATED;
-
-/**
- * fl_dart_project_get_enable_mirrors:
- * @project: an #FlDartProject.
- *
- * Gets if this Flutter project can use the dart:mirrors library.
- *
- * Returns: %TRUE if the dart:mirrors library can be used.
- *
- * Deprecated: This function is temporary and will be removed in a future
- * release.
- */
-gboolean fl_dart_project_get_enable_mirrors(FlDartProject* project)
-    G_DEPRECATED;
+void fl_dart_project_set_aot_library_path(FlDartProject* project,
+                                          const gchar* path);
 
 /**
  * fl_dart_project_get_aot_library_path:
@@ -73,6 +60,17 @@ gboolean fl_dart_project_get_enable_mirrors(FlDartProject* project)
  */
 const gchar* fl_dart_project_get_aot_library_path(FlDartProject* project);
 
+/**
+ * fl_dart_project_set_assets_path:
+ * @project: an #FlDartProject.
+ * @path: the absolute path to the assets directory.
+ *
+ * Sets the path to the directory containing the assets used in the Flutter
+ * application. By default, this is the data/flutter_assets subdirectory
+ * relative to the executable directory.
+ */
+void fl_dart_project_set_assets_path(FlDartProject* project, gchar* path);
+
 /**
  * fl_dart_project_get_assets_path:
  * @project: an #FlDartProject.
@@ -85,6 +83,16 @@ const gchar* fl_dart_project_get_aot_library_path(FlDartProject* project);
  */
 const gchar* fl_dart_project_get_assets_path(FlDartProject* project);
 
+/**
+ * fl_dart_project_set_icu_data_path:
+ * @project: an #FlDartProject.
+ * @path: the absolute path to the ICU data file.
+ *
+ * Sets the path to the ICU data file used in the Flutter application. By
+ * default, this is data/icudtl.dat relative to the executable directory.
+ */
+void fl_dart_project_set_icu_data_path(FlDartProject* project, gchar* path);
+
 /**
  * fl_dart_project_get_icu_data_path:
  * @project: an #FlDartProject.
@@ -122,4 +130,4 @@ gchar** fl_dart_project_get_dart_entrypoint_arguments(FlDartProject* project);
 
 G_END_DECLS
 
-#endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_DART_PROJECT_H_
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_DART_PROJECT_H_
diff --git a/shell/platform/linux/public/flutter_linux/fl_engine.h b/shell/platform/linux/public/flutter_linux/fl_engine.h
index 6740c0bd8cd81dc0a16d2fede7b6173e375f7425..f5ba7caa5fd20f2a5600b9b4c1734695a9cb4a14 100644
--- a/shell/platform/linux/public/flutter_linux/fl_engine.h
+++ b/shell/platform/linux/public/flutter_linux/fl_engine.h
@@ -2,14 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_LINUX_FL_ENGINE_H_
-#define FLUTTER_SHELL_PLATFORM_LINUX_FL_ENGINE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_ENGINE_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_ENGINE_H_
 
 #if !defined(__FLUTTER_LINUX_INSIDE__) && !defined(FLUTTER_LINUX_COMPILATION)
 #error "Only <flutter_linux/flutter_linux.h> can be included directly."
 #endif
 
 #include <glib-object.h>
+#include <gmodule.h>
 
 #include "fl_binary_messenger.h"
 #include "fl_dart_project.h"
@@ -17,6 +18,7 @@
 
 G_BEGIN_DECLS
 
+G_MODULE_EXPORT
 G_DECLARE_FINAL_TYPE(FlEngine, fl_engine, FL, ENGINE, GObject)
 
 /**
@@ -57,4 +59,4 @@ FlTextureRegistrar* fl_engine_get_texture_registrar(FlEngine* engine);
 
 G_END_DECLS
 
-#endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_ENGINE_H_
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_ENGINE_H_
diff --git a/shell/platform/linux/public/flutter_linux/fl_event_channel.h b/shell/platform/linux/public/flutter_linux/fl_event_channel.h
index 7141defbed72b93169fddd1b0faad15a9607590c..6d1da56381c7fe4927b886ffb2151dd8953b1cd2 100644
--- a/shell/platform/linux/public/flutter_linux/fl_event_channel.h
+++ b/shell/platform/linux/public/flutter_linux/fl_event_channel.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_LINUX_FL_EVENT_CHANNEL_H_
-#define FLUTTER_SHELL_PLATFORM_LINUX_FL_EVENT_CHANNEL_H_
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_EVENT_CHANNEL_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_EVENT_CHANNEL_H_
 
 #if !defined(__FLUTTER_LINUX_INSIDE__) && !defined(FLUTTER_LINUX_COMPILATION)
 #error "Only <flutter_linux/flutter_linux.h> can be included directly."
@@ -11,6 +11,7 @@
 
 #include <gio/gio.h>
 #include <glib-object.h>
+#include <gmodule.h>
 
 #include "fl_binary_messenger.h"
 #include "fl_method_channel.h"
@@ -18,6 +19,7 @@
 
 G_BEGIN_DECLS
 
+G_MODULE_EXPORT
 G_DECLARE_FINAL_TYPE(FlEventChannel,
                      fl_event_channel,
                      FL,
@@ -184,4 +186,4 @@ gboolean fl_event_channel_send_end_of_stream(FlEventChannel* channel,
 
 G_END_DECLS
 
-#endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_EVENT_CHANNEL_H_
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_EVENT_CHANNEL_H_
diff --git a/shell/platform/linux/public/flutter_linux/fl_json_message_codec.h b/shell/platform/linux/public/flutter_linux/fl_json_message_codec.h
index ddf68189ac357d4327914f673bfda974adfce807..9ffe7ea9526ce1b3d0b79e84418ef2a85711543e 100644
--- a/shell/platform/linux/public/flutter_linux/fl_json_message_codec.h
+++ b/shell/platform/linux/public/flutter_linux/fl_json_message_codec.h
@@ -2,13 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_LINUX_FL_JSON_MESSAGE_CODEC_H_
-#define FLUTTER_SHELL_PLATFORM_LINUX_FL_JSON_MESSAGE_CODEC_H_
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_JSON_MESSAGE_CODEC_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_JSON_MESSAGE_CODEC_H_
 
 #if !defined(__FLUTTER_LINUX_INSIDE__) && !defined(FLUTTER_LINUX_COMPILATION)
 #error "Only <flutter_linux/flutter_linux.h> can be included directly."
 #endif
 
+#include <gmodule.h>
+
 #include "fl_message_codec.h"
 
 G_BEGIN_DECLS
@@ -25,13 +27,17 @@ G_BEGIN_DECLS
 #define FL_JSON_MESSAGE_CODEC_ERROR fl_json_message_codec_error_quark()
 
 typedef enum {
+  // NOLINTBEGIN(readability-identifier-naming)
   FL_JSON_MESSAGE_CODEC_ERROR_INVALID_UTF8,
   FL_JSON_MESSAGE_CODEC_ERROR_INVALID_JSON,
   FL_JSON_MESSAGE_CODEC_ERROR_INVALID_OBJECT_KEY_TYPE,
+  // NOLINTEND(readability-identifier-naming)
 } FlJsonMessageCodecError;
 
+G_MODULE_EXPORT
 GQuark fl_json_message_codec_error_quark(void) G_GNUC_CONST;
 
+G_MODULE_EXPORT
 G_DECLARE_FINAL_TYPE(FlJsonMessageCodec,
                      fl_json_message_codec,
                      FL,
@@ -93,4 +99,4 @@ FlValue* fl_json_message_codec_decode(FlJsonMessageCodec* codec,
 
 G_END_DECLS
 
-#endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_JSON_MESSAGE_CODEC_H_
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_JSON_MESSAGE_CODEC_H_
diff --git a/shell/platform/linux/public/flutter_linux/fl_json_method_codec.h b/shell/platform/linux/public/flutter_linux/fl_json_method_codec.h
index 70ddf793b1039268038eaf2b702fe10fbb22f808..a79c6666764c12b3486ac7326a94792d0a8a671a 100644
--- a/shell/platform/linux/public/flutter_linux/fl_json_method_codec.h
+++ b/shell/platform/linux/public/flutter_linux/fl_json_method_codec.h
@@ -2,17 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_LINUX_FL_JSON_METHOD_CODEC_H_
-#define FLUTTER_SHELL_PLATFORM_LINUX_FL_JSON_METHOD_CODEC_H_
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_JSON_METHOD_CODEC_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_JSON_METHOD_CODEC_H_
 
 #if !defined(__FLUTTER_LINUX_INSIDE__) && !defined(FLUTTER_LINUX_COMPILATION)
 #error "Only <flutter_linux/flutter_linux.h> can be included directly."
 #endif
 
+#include <gmodule.h>
+
 #include "fl_method_codec.h"
 
 G_BEGIN_DECLS
 
+G_MODULE_EXPORT
 G_DECLARE_FINAL_TYPE(FlJsonMethodCodec,
                      fl_json_method_codec,
                      FL,
@@ -41,4 +44,4 @@ FlJsonMethodCodec* fl_json_method_codec_new();
 
 G_END_DECLS
 
-#endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_JSON_METHOD_CODEC_H_
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_JSON_METHOD_CODEC_H_
diff --git a/shell/platform/linux/public/flutter_linux/fl_message_codec.h b/shell/platform/linux/public/flutter_linux/fl_message_codec.h
index b74aad264b78d247008dd5dc38dac360901e7aed..fd93345e79e7348debb9326bd829136ee17fca36 100644
--- a/shell/platform/linux/public/flutter_linux/fl_message_codec.h
+++ b/shell/platform/linux/public/flutter_linux/fl_message_codec.h
@@ -2,14 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_LINUX_FL_MESSAGE_CODEC_H_
-#define FLUTTER_SHELL_PLATFORM_LINUX_FL_MESSAGE_CODEC_H_
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_MESSAGE_CODEC_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_MESSAGE_CODEC_H_
 
 #if !defined(__FLUTTER_LINUX_INSIDE__) && !defined(FLUTTER_LINUX_COMPILATION)
 #error "Only <flutter_linux/flutter_linux.h> can be included directly."
 #endif
 
 #include <glib-object.h>
+#include <gmodule.h>
 
 #include "fl_value.h"
 
@@ -29,14 +30,18 @@ G_BEGIN_DECLS
 #define FL_MESSAGE_CODEC_ERROR fl_message_codec_error_quark()
 
 typedef enum {
+  // NOLINTBEGIN(readability-identifier-naming)
   FL_MESSAGE_CODEC_ERROR_FAILED,
   FL_MESSAGE_CODEC_ERROR_OUT_OF_DATA,
   FL_MESSAGE_CODEC_ERROR_ADDITIONAL_DATA,
   FL_MESSAGE_CODEC_ERROR_UNSUPPORTED_TYPE,
+  // NOLINTEND(readability-identifier-naming)
 } FlMessageCodecError;
 
+G_MODULE_EXPORT
 GQuark fl_message_codec_error_quark(void) G_GNUC_CONST;
 
+G_MODULE_EXPORT
 G_DECLARE_DERIVABLE_TYPE(FlMessageCodec,
                          fl_message_codec,
                          FL,
@@ -59,7 +64,7 @@ struct _FlMessageCodecClass {
 
   /**
    * FlMessageCodec::encode_message:
-   * @codec: A #FlMessageCodec.
+   * @codec: an #FlMessageCodec.
    * @message: message to encode or %NULL to encode the null value.
    * @error: (allow-none): #GError location to store the error occurring, or
    * %NULL.
@@ -126,4 +131,4 @@ FlValue* fl_message_codec_decode_message(FlMessageCodec* codec,
 
 G_END_DECLS
 
-#endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_MESSAGE_CODEC_H_
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_MESSAGE_CODEC_H_
diff --git a/shell/platform/linux/public/flutter_linux/fl_method_call.h b/shell/platform/linux/public/flutter_linux/fl_method_call.h
index 5a5ebc7419af2f15b02b0ee9166c2baeccbe0db4..93d424cb5f34c409a98340f8b8a049db01951a90 100644
--- a/shell/platform/linux/public/flutter_linux/fl_method_call.h
+++ b/shell/platform/linux/public/flutter_linux/fl_method_call.h
@@ -2,20 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_LINUX_FL_METHOD_CALL_H_
-#define FLUTTER_SHELL_PLATFORM_LINUX_FL_METHOD_CALL_H_
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_METHOD_CALL_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_METHOD_CALL_H_
 
 #if !defined(__FLUTTER_LINUX_INSIDE__) && !defined(FLUTTER_LINUX_COMPILATION)
 #error "Only <flutter_linux/flutter_linux.h> can be included directly."
 #endif
 
 #include <glib-object.h>
+#include <gmodule.h>
 
 #include "fl_method_response.h"
 #include "fl_value.h"
 
 G_BEGIN_DECLS
 
+G_MODULE_EXPORT
 G_DECLARE_FINAL_TYPE(FlMethodCall, fl_method_call, FL, METHOD_CALL, GObject)
 
 /**
@@ -112,4 +114,4 @@ gboolean fl_method_call_respond_not_implemented(FlMethodCall* method_call,
 
 G_END_DECLS
 
-#endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_METHOD_CALL_H_
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_METHOD_CALL_H_
diff --git a/shell/platform/linux/public/flutter_linux/fl_method_channel.h b/shell/platform/linux/public/flutter_linux/fl_method_channel.h
index e03254bf941bf3e66b068616872dd156df963a25..224f94bfd73273611a34151b12f56e13367e68da 100644
--- a/shell/platform/linux/public/flutter_linux/fl_method_channel.h
+++ b/shell/platform/linux/public/flutter_linux/fl_method_channel.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_LINUX_FL_METHOD_CHANNEL_H_
-#define FLUTTER_SHELL_PLATFORM_LINUX_FL_METHOD_CHANNEL_H_
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_METHOD_CHANNEL_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_METHOD_CHANNEL_H_
 
 #if !defined(__FLUTTER_LINUX_INSIDE__) && !defined(FLUTTER_LINUX_COMPILATION)
 #error "Only <flutter_linux/flutter_linux.h> can be included directly."
@@ -11,6 +11,7 @@
 
 #include <gio/gio.h>
 #include <glib-object.h>
+#include <gmodule.h>
 
 #include "fl_binary_messenger.h"
 #include "fl_method_call.h"
@@ -19,6 +20,7 @@
 
 G_BEGIN_DECLS
 
+G_MODULE_EXPORT
 G_DECLARE_FINAL_TYPE(FlMethodChannel,
                      fl_method_channel,
                      FL,
@@ -44,14 +46,19 @@ G_DECLARE_FINAL_TYPE(FlMethodChannel,
  *     g_autoptr(GError) bar_error = NULL;
  *     g_autoptr(FlValue) result =
  *         do_bar (fl_method_call_get_args (method_call), &bar_error);
- *     if (result == NULL)
+ *     if (result == NULL) {
  *       response =
  *         FL_METHOD_RESPONSE (fl_method_error_response_new ("bar error",
- *                                                           bar_error->message));
- *     else
- *       response = FL_METHOD_RESPONSE (fl_method_success_response_new
- * (result)); } else response = FL_METHOD_RESPONSE
- * (fl_method_not_implemented_response_new ());
+ *                                                           bar_error->message,
+ *                                                           nullptr);
+ *     } else {
+ *       response =
+ *         FL_METHOD_RESPONSE (fl_method_success_response_new (result));
+ *     }
+ *   } else {
+ *     response =
+ *       FL_METHOD_RESPONSE (fl_method_not_implemented_response_new ());
+ *   }
  *
  *   g_autoptr(GError) error = NULL;
  *   if (!fl_method_call_respond(method_call, response, &error))
@@ -187,4 +194,4 @@ FlMethodResponse* fl_method_channel_invoke_method_finish(
 
 G_END_DECLS
 
-#endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_METHOD_CHANNEL_H_
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_METHOD_CHANNEL_H_
diff --git a/shell/platform/linux/public/flutter_linux/fl_method_codec.h b/shell/platform/linux/public/flutter_linux/fl_method_codec.h
index 97bf8e929b6e1ab14700dfb4da52d804aeff97e2..3c741c8f5191cbded14e20bdca26d746375ddbd9 100644
--- a/shell/platform/linux/public/flutter_linux/fl_method_codec.h
+++ b/shell/platform/linux/public/flutter_linux/fl_method_codec.h
@@ -2,20 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_LINUX_FL_METHOD_CODEC_H_
-#define FLUTTER_SHELL_PLATFORM_LINUX_FL_METHOD_CODEC_H_
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_METHOD_CODEC_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_METHOD_CODEC_H_
 
 #if !defined(__FLUTTER_LINUX_INSIDE__) && !defined(FLUTTER_LINUX_COMPILATION)
 #error "Only <flutter_linux/flutter_linux.h> can be included directly."
 #endif
 
 #include <glib-object.h>
+#include <gmodule.h>
 
 #include "fl_method_response.h"
 #include "fl_value.h"
 
 G_BEGIN_DECLS
 
+G_MODULE_EXPORT
 G_DECLARE_DERIVABLE_TYPE(FlMethodCodec,
                          fl_method_codec,
                          FL,
@@ -128,4 +130,4 @@ struct _FlMethodCodecClass {
 
 G_END_DECLS
 
-#endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_METHOD_CODEC_H_
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_METHOD_CODEC_H_
diff --git a/shell/platform/linux/public/flutter_linux/fl_method_response.h b/shell/platform/linux/public/flutter_linux/fl_method_response.h
index 90c4b9cc075db3cfd114078d76d26f172239d6ed..5e595a2a6fa441e7c97612cbb983b17131f40bdf 100644
--- a/shell/platform/linux/public/flutter_linux/fl_method_response.h
+++ b/shell/platform/linux/public/flutter_linux/fl_method_response.h
@@ -2,14 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_LINUX_FL_METHOD_RESPONSE_H_
-#define FLUTTER_SHELL_PLATFORM_LINUX_FL_METHOD_RESPONSE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_METHOD_RESPONSE_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_METHOD_RESPONSE_H_
 
 #if !defined(__FLUTTER_LINUX_INSIDE__) && !defined(FLUTTER_LINUX_COMPILATION)
 #error "Only <flutter_linux/flutter_linux.h> can be included directly."
 #endif
 
 #include <glib-object.h>
+#include <gmodule.h>
 
 #include "fl_value.h"
 
@@ -29,13 +30,17 @@ G_BEGIN_DECLS
 #define FL_METHOD_RESPONSE_ERROR fl_method_response_error_quark()
 
 typedef enum {
+  // NOLINTBEGIN(readability-identifier-naming)
   FL_METHOD_RESPONSE_ERROR_FAILED,
   FL_METHOD_RESPONSE_ERROR_REMOTE_ERROR,
   FL_METHOD_RESPONSE_ERROR_NOT_IMPLEMENTED,
+  // NOLINTEND(readability-identifier-naming)
 } FlMethodResponseError;
 
+G_MODULE_EXPORT
 GQuark fl_method_response_error_quark(void) G_GNUC_CONST;
 
+G_MODULE_EXPORT
 G_DECLARE_DERIVABLE_TYPE(FlMethodResponse,
                          fl_method_response,
                          FL,
@@ -46,18 +51,21 @@ struct _FlMethodResponseClass {
   GObjectClass parent_class;
 };
 
+G_MODULE_EXPORT
 G_DECLARE_FINAL_TYPE(FlMethodSuccessResponse,
                      fl_method_success_response,
                      FL,
                      METHOD_SUCCESS_RESPONSE,
                      FlMethodResponse)
 
+G_MODULE_EXPORT
 G_DECLARE_FINAL_TYPE(FlMethodErrorResponse,
                      fl_method_error_response,
                      FL,
                      METHOD_ERROR_RESPONSE,
                      FlMethodResponse)
 
+G_MODULE_EXPORT
 G_DECLARE_FINAL_TYPE(FlMethodNotImplementedResponse,
                      fl_method_not_implemented_response,
                      FL,
@@ -209,4 +217,4 @@ FlMethodNotImplementedResponse* fl_method_not_implemented_response_new();
 
 G_END_DECLS
 
-#endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_METHOD_RESPONSE_H_
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_METHOD_RESPONSE_H_
diff --git a/shell/platform/linux/public/flutter_linux/fl_pixel_buffer_texture.h b/shell/platform/linux/public/flutter_linux/fl_pixel_buffer_texture.h
index adddd7728c5d4535e973134a449e3d78ca5bfcf4..8364994792b279cb245859188b6a6b807e25cdc0 100644
--- a/shell/platform/linux/public/flutter_linux/fl_pixel_buffer_texture.h
+++ b/shell/platform/linux/public/flutter_linux/fl_pixel_buffer_texture.h
@@ -2,17 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_LINUX_FL_PIXEL_BUFFER_TEXTURE_H_
-#define FLUTTER_SHELL_PLATFORM_LINUX_FL_PIXEL_BUFFER_TEXTURE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_PIXEL_BUFFER_TEXTURE_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_PIXEL_BUFFER_TEXTURE_H_
 
 #if !defined(__FLUTTER_LINUX_INSIDE__) && !defined(FLUTTER_LINUX_COMPILATION)
 #error "Only <flutter_linux/flutter_linux.h> can be included directly."
 #endif
 
+#include <gmodule.h>
+
 #include "fl_texture.h"
 
 G_BEGIN_DECLS
 
+G_MODULE_EXPORT
 G_DECLARE_DERIVABLE_TYPE(FlPixelBufferTexture,
                          fl_pixel_buffer_texture,
                          FL,
@@ -27,24 +30,22 @@ G_DECLARE_DERIVABLE_TYPE(FlPixelBufferTexture,
  *
  * The following example shows how to implement an #FlPixelBufferTexture.
  * ![<!-- language="C" -->
- *   // Type definition, constructor, init, destructor and class_init are
- *   // omitted.
- *   struct _VideoPixelBufferTexture {  // extends FlPixelBufferTexture
+ *   struct _MyTexture {
  *     FlPixelBufferTexture parent_instance;
  *
  *     uint8_t *buffer;  // your pixel buffer.
  *   }
  *
- *   G_DEFINE_TYPE(VideoTexture,
- *                 video_texture,
+ *   G_DEFINE_TYPE(MyTexture,
+ *                 my_texture,
  *                 fl_pixel_buffer_texture_get_type ())
  *
  *   static gboolean
- *   video_texture_copy_pixels (FlPixelBufferTexture* texture,
- *                              const uint8_t** out_buffer,
- *                              uint32_t* width,
- *                              uint32_t* height,
- *                              GError** error) {
+ *   my_texture_copy_pixels (FlPixelBufferTexture* texture,
+ *                           const uint8_t** out_buffer,
+ *                           uint32_t* width,
+ *                           uint32_t* height,
+ *                           GError** error) {
  *     // This method is called on Render Thread. Be careful with your
  *     // cross-thread operation.
  *
@@ -72,6 +73,13 @@ G_DECLARE_DERIVABLE_TYPE(FlPixelBufferTexture,
  *       return FALSE;
  *     }
  *   }
+ *
+ *   static void my_texture_class_init(MyTextureClass* klass) {
+ *     FL_PIXEL_BUFFER_TEXTURE_CLASS(klass)->copy_pixels =
+ * my_texture_copy_pixels;
+ *   }
+ *
+ *   static void my_texture_init(MyTexture* self) {}
  * ]|
  */
 
@@ -104,4 +112,4 @@ struct _FlPixelBufferTextureClass {
 
 G_END_DECLS
 
-#endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_PIXEL_BUFFER_TEXTURE_H_
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_PIXEL_BUFFER_TEXTURE_H_
diff --git a/shell/platform/linux/public/flutter_linux/fl_plugin_registrar.h b/shell/platform/linux/public/flutter_linux/fl_plugin_registrar.h
index 6382804024e713248dda2a68310d92ab0e24bb25..a9200ea72485f3ada8f40ad7000b13196692ec50 100644
--- a/shell/platform/linux/public/flutter_linux/fl_plugin_registrar.h
+++ b/shell/platform/linux/public/flutter_linux/fl_plugin_registrar.h
@@ -2,14 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_LINUX_FL_PLUGIN_REGISTRAR_H_
-#define FLUTTER_SHELL_PLATFORM_LINUX_FL_PLUGIN_REGISTRAR_H_
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_PLUGIN_REGISTRAR_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_PLUGIN_REGISTRAR_H_
 
 #if !defined(__FLUTTER_LINUX_INSIDE__) && !defined(FLUTTER_LINUX_COMPILATION)
 #error "Only <flutter_linux/flutter_linux.h> can be included directly."
 #endif
 
 #include <glib-object.h>
+#include <gmodule.h>
 
 #include "fl_binary_messenger.h"
 #include "fl_texture_registrar.h"
@@ -17,6 +18,7 @@
 
 G_BEGIN_DECLS
 
+G_MODULE_EXPORT
 G_DECLARE_INTERFACE(FlPluginRegistrar,
                     fl_plugin_registrar,
                     FL,
@@ -73,4 +75,4 @@ FlView* fl_plugin_registrar_get_view(FlPluginRegistrar* registrar);
 
 G_END_DECLS
 
-#endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_PLUGIN_REGISTRAR_H_
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_PLUGIN_REGISTRAR_H_
diff --git a/shell/platform/linux/public/flutter_linux/fl_plugin_registry.h b/shell/platform/linux/public/flutter_linux/fl_plugin_registry.h
index ac16aba26adac1af63d119d3e37136eeaaeab716..e8c805781ae592bcce1c15a844785dba90b20309 100644
--- a/shell/platform/linux/public/flutter_linux/fl_plugin_registry.h
+++ b/shell/platform/linux/public/flutter_linux/fl_plugin_registry.h
@@ -2,19 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_LINUX_FL_PLUGIN_REGISTRY_H_
-#define FLUTTER_SHELL_PLATFORM_LINUX_FL_PLUGIN_REGISTRY_H_
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_PLUGIN_REGISTRY_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_PLUGIN_REGISTRY_H_
 
 #if !defined(__FLUTTER_LINUX_INSIDE__) && !defined(FLUTTER_LINUX_COMPILATION)
 #error "Only <flutter_linux/flutter_linux.h> can be included directly."
 #endif
 
 #include <glib-object.h>
+#include <gmodule.h>
 
 #include "fl_plugin_registrar.h"
 
 G_BEGIN_DECLS
 
+G_MODULE_EXPORT
 G_DECLARE_INTERFACE(FlPluginRegistry,
                     fl_plugin_registry,
                     FL,
@@ -58,4 +60,4 @@ FlPluginRegistrar* fl_plugin_registry_get_registrar_for_plugin(
 
 G_END_DECLS
 
-#endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_PLUGIN_REGISTRY_H_
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_PLUGIN_REGISTRY_H_
diff --git a/shell/platform/linux/public/flutter_linux/fl_standard_message_codec.h b/shell/platform/linux/public/flutter_linux/fl_standard_message_codec.h
index 2af7b83b863480a96ad66ee893c8a59090fac536..2115fd6aab8254e242d152abf9fde6f0618d4a5d 100644
--- a/shell/platform/linux/public/flutter_linux/fl_standard_message_codec.h
+++ b/shell/platform/linux/public/flutter_linux/fl_standard_message_codec.h
@@ -2,22 +2,25 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_LINUX_FL_STANDARD_MESSAGE_CODEC_H_
-#define FLUTTER_SHELL_PLATFORM_LINUX_FL_STANDARD_MESSAGE_CODEC_H_
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_STANDARD_MESSAGE_CODEC_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_STANDARD_MESSAGE_CODEC_H_
 
 #if !defined(__FLUTTER_LINUX_INSIDE__) && !defined(FLUTTER_LINUX_COMPILATION)
 #error "Only <flutter_linux/flutter_linux.h> can be included directly."
 #endif
 
+#include <gmodule.h>
+
 #include "fl_message_codec.h"
 
 G_BEGIN_DECLS
 
-G_DECLARE_FINAL_TYPE(FlStandardMessageCodec,
-                     fl_standard_message_codec,
-                     FL,
-                     STANDARD_CODEC,
-                     FlMessageCodec)
+G_MODULE_EXPORT
+G_DECLARE_DERIVABLE_TYPE(FlStandardMessageCodec,
+                         fl_standard_message_codec,
+                         FL,
+                         STANDARD_MESSAGE_CODEC,
+                         FlMessageCodec)
 
 /**
  * FlStandardMessageCodec:
@@ -29,10 +32,61 @@ G_DECLARE_FINAL_TYPE(FlStandardMessageCodec,
  * #FL_VALUE_TYPE_INT32_LIST, #FL_VALUE_TYPE_INT64_LIST,
  * #FL_VALUE_TYPE_FLOAT_LIST, #FL_VALUE_TYPE_LIST, and #FL_VALUE_TYPE_MAP.
  *
+ * If other values types are required to be supported create a new subclass that
+ * overrides write_value and read_value_of_type.
+ *
  * #FlStandardMessageCodec matches the StandardCodec class in the Flutter
  * services library.
  */
 
+struct _FlStandardMessageCodecClass {
+  FlMessageCodecClass parent_class;
+
+  /**
+   * FlStandardMessageCodec::write_value:
+   * @codec: an #FlStandardMessageCodec.
+   * @buffer: a buffer to write into.
+   * @value: (allow-none): value to write.
+   * @error: (allow-none): #GError location to store the error occurring, or
+   * %NULL.
+   *
+   * Virtual method to write an #FlValue in Flutter Standard encoding.
+   *
+   * If a codec needs to support custom #FlValue objects it must override this
+   * method to encode those values. For non-custom values the parent method
+   * should be called.
+   *
+   * Returns: %TRUE on success.
+   */
+  gboolean (*write_value)(FlStandardMessageCodec* codec,
+                          GByteArray* buffer,
+                          FlValue* value,
+                          GError** error);
+
+  /**
+   * FlStandardMessageCodec::read_value_of_type:
+   * @codec: an #FlStandardMessageCodec.
+   * @buffer: buffer to read from.
+   * @offset: (inout): read position in @buffer.
+   * @type: the type of the value.
+   * @error: (allow-none): #GError location to store the error occurring, or
+   * %NULL.
+   *
+   * Virtual method to read an #FlValue in Flutter Standard encoding.
+   *
+   * If a codec needs to support custom #FlValue objects it must override this
+   * method to decode those values. For non-custom values the parent method
+   * should be called.
+   *
+   * Returns: an #FlValue or %NULL on error.
+   */
+  FlValue* (*read_value_of_type)(FlStandardMessageCodec* codec,
+                                 GBytes* buffer,
+                                 size_t* offset,
+                                 int type,
+                                 GError** error);
+};
+
 /*
  * fl_standard_message_codec_new:
  *
@@ -42,6 +96,81 @@ G_DECLARE_FINAL_TYPE(FlStandardMessageCodec,
  */
 FlStandardMessageCodec* fl_standard_message_codec_new();
 
+/**
+ * fl_standard_message_codec_write_size:
+ * @codec: an #FlStandardMessageCodec.
+ * @buffer: buffer to write into.
+ * @size: size value to write.
+ *
+ * Writes a size field in Flutter Standard encoding.
+ */
+void fl_standard_message_codec_write_size(FlStandardMessageCodec* codec,
+                                          GByteArray* buffer,
+                                          uint32_t size);
+
+/**
+ * fl_standard_message_codec_read_size:
+ * @codec: an #FlStandardMessageCodec.
+ * @buffer: buffer to read from.
+ * @offset: (inout): read position in @buffer.
+ * @value: location to read size.
+ * @error: (allow-none): #GError location to store the error occurring, or
+ * %NULL.
+ *
+ * Reads a size field in Flutter Standard encoding.
+ *
+ * This method is intended for use by subclasses overriding
+ * FlStandardMessageCodec::read_value_of_type.
+ *
+ * Returns: %TRUE on success.
+ */
+gboolean fl_standard_message_codec_read_size(FlStandardMessageCodec* codec,
+                                             GBytes* buffer,
+                                             size_t* offset,
+                                             uint32_t* value,
+                                             GError** error);
+
+/**
+ * fl_standard_message_codec_write_value:
+ * @codec: an #FlStandardMessageCodec.
+ * @buffer: buffer to write into.
+ * @value: (allow-none): value to write.
+ * @error: (allow-none): #GError location to store the error occurring, or
+ * %NULL.
+ *
+ * Writes an #FlValue in Flutter Standard encoding.
+ *
+ * This method is intended for use by subclasses overriding
+ * FlStandardMessageCodec::write_value.
+ *
+ * Returns: %TRUE on success.
+ */
+gboolean fl_standard_message_codec_write_value(FlStandardMessageCodec* codec,
+                                               GByteArray* buffer,
+                                               FlValue* value,
+                                               GError** error);
+
+/**
+ * fl_standard_message_codec_read_value:
+ * @codec: an #FlStandardMessageCodec.
+ * @buffer: buffer to read from.
+ * @offset: (inout): read position in @buffer.
+ * @value: location to read size.
+ * @error: (allow-none): #GError location to store the error occurring, or
+ * %NULL.
+ *
+ * Reads an #FlValue in Flutter Standard encoding.
+ *
+ * This method is intended for use by subclasses overriding
+ * FlStandardMessageCodec::read_value_of_type.
+ *
+ * Returns: a new #FlValue or %NULL on error.
+ */
+FlValue* fl_standard_message_codec_read_value(FlStandardMessageCodec* codec,
+                                              GBytes* buffer,
+                                              size_t* offset,
+                                              GError** error);
+
 G_END_DECLS
 
-#endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_STANDARD_MESSAGE_CODEC_H_
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_STANDARD_MESSAGE_CODEC_H_
diff --git a/shell/platform/linux/public/flutter_linux/fl_standard_method_codec.h b/shell/platform/linux/public/flutter_linux/fl_standard_method_codec.h
index 1685ebced98308dd9757548b4faf8d8ddd82b58b..ba3447bfe2ab5bd0f91c0ee1e9a5dcacff2af7d5 100644
--- a/shell/platform/linux/public/flutter_linux/fl_standard_method_codec.h
+++ b/shell/platform/linux/public/flutter_linux/fl_standard_method_codec.h
@@ -2,17 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_LINUX_FL_STANDARD_METHOD_CODEC_H_
-#define FLUTTER_SHELL_PLATFORM_LINUX_FL_STANDARD_METHOD_CODEC_H_
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_STANDARD_METHOD_CODEC_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_STANDARD_METHOD_CODEC_H_
 
 #if !defined(__FLUTTER_LINUX_INSIDE__) && !defined(FLUTTER_LINUX_COMPILATION)
 #error "Only <flutter_linux/flutter_linux.h> can be included directly."
 #endif
 
+#include <gmodule.h>
+
 #include "fl_method_codec.h"
+#include "fl_standard_message_codec.h"
 
 G_BEGIN_DECLS
 
+G_MODULE_EXPORT
 G_DECLARE_FINAL_TYPE(FlStandardMethodCodec,
                      fl_standard_method_codec,
                      FL,
@@ -39,6 +43,17 @@ G_DECLARE_FINAL_TYPE(FlStandardMethodCodec,
  */
 FlStandardMethodCodec* fl_standard_method_codec_new();
 
+/**
+ * fl_standard_method_codec_new:
+ * @message_codec: A #FlMessageCodec.
+ *
+ * Creates an #FlStandardMethodCodec with a custom message codec.
+ *
+ * Returns: a new #FlStandardMethodCodec.
+ */
+FlStandardMethodCodec* fl_standard_method_codec_new_with_message_codec(
+    FlStandardMessageCodec* message_codec);
+
 G_END_DECLS
 
-#endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_STANDARD_METHOD_CODEC_H_
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_STANDARD_METHOD_CODEC_H_
diff --git a/shell/platform/linux/public/flutter_linux/fl_string_codec.h b/shell/platform/linux/public/flutter_linux/fl_string_codec.h
index 8f49e9fe0065ddd2eb924b93a8c99932d76b5c24..e13beb4f454829a9b10dac2bcef3ff7b8e812997 100644
--- a/shell/platform/linux/public/flutter_linux/fl_string_codec.h
+++ b/shell/platform/linux/public/flutter_linux/fl_string_codec.h
@@ -2,17 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_LINUX_FL_STRING_CODEC_H_
-#define FLUTTER_SHELL_PLATFORM_LINUX_FL_STRING_CODEC_H_
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_STRING_CODEC_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_STRING_CODEC_H_
 
 #if !defined(__FLUTTER_LINUX_INSIDE__) && !defined(FLUTTER_LINUX_COMPILATION)
 #error "Only <flutter_linux/flutter_linux.h> can be included directly."
 #endif
 
+#include <gmodule.h>
+
 #include "fl_message_codec.h"
 
 G_BEGIN_DECLS
 
+G_MODULE_EXPORT
 G_DECLARE_FINAL_TYPE(FlStringCodec,
                      fl_string_codec,
                      FL,
@@ -41,4 +44,4 @@ FlStringCodec* fl_string_codec_new();
 
 G_END_DECLS
 
-#endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_STRING_CODEC_H_
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_STRING_CODEC_H_
diff --git a/shell/platform/linux/public/flutter_linux/fl_texture.h b/shell/platform/linux/public/flutter_linux/fl_texture.h
index 45ceb514785ba9251769cfbb964ad8f5cc8b6a8b..86b14dee3906eaff67cc37c64f46108864da83ae 100644
--- a/shell/platform/linux/public/flutter_linux/fl_texture.h
+++ b/shell/platform/linux/public/flutter_linux/fl_texture.h
@@ -2,18 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_LINUX_FL_TEXTURE_H_
-#define FLUTTER_SHELL_PLATFORM_LINUX_FL_TEXTURE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_TEXTURE_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_TEXTURE_H_
 
 #if !defined(__FLUTTER_LINUX_INSIDE__) && !defined(FLUTTER_LINUX_COMPILATION)
 #error "Only <flutter_linux/flutter_linux.h> can be included directly."
 #endif
 
 #include <glib-object.h>
+#include <gmodule.h>
 #include <stdint.h>
 
 G_BEGIN_DECLS
 
+G_MODULE_EXPORT
 G_DECLARE_INTERFACE(FlTexture, fl_texture, FL, TEXTURE, GObject)
 
 /**
@@ -28,8 +30,23 @@ G_DECLARE_INTERFACE(FlTexture, fl_texture, FL, TEXTURE, GObject)
 
 struct _FlTextureInterface {
   GTypeInterface g_iface;
+
+  void (*set_id)(FlTexture* texture, int64_t id);
+
+  int64_t (*get_id)(FlTexture* texture);
 };
 
+/**
+ * fl_texture_get_id:
+ * @texture: a #FlTexture.
+ *
+ * Get the ID for this texture, which can be passed to Flutter code to refer to
+ * this texture.
+ *
+ * Returns: a texture ID.
+ */
+int64_t fl_texture_get_id(FlTexture* texture);
+
 G_END_DECLS
 
-#endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_TEXTURE_H_
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_TEXTURE_H_
diff --git a/shell/platform/linux/public/flutter_linux/fl_texture_gl.h b/shell/platform/linux/public/flutter_linux/fl_texture_gl.h
index 949f4afba5ac1fd8090b6992b3ec0c11f34dfd30..fc80eb7489c2426074521015916ea420b32e08b2 100644
--- a/shell/platform/linux/public/flutter_linux/fl_texture_gl.h
+++ b/shell/platform/linux/public/flutter_linux/fl_texture_gl.h
@@ -2,19 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_LINUX_FL_TEXTURE_GL_H_
-#define FLUTTER_SHELL_PLATFORM_LINUX_FL_TEXTURE_GL_H_
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_TEXTURE_GL_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_TEXTURE_GL_H_
 
 #if !defined(__FLUTTER_LINUX_INSIDE__) && !defined(FLUTTER_LINUX_COMPILATION)
 #error "Only <flutter_linux/flutter_linux.h> can be included directly."
 #endif
 
 #include <glib-object.h>
+#include <gmodule.h>
 #include <stdint.h>
 #include "fl_texture.h"
 
 G_BEGIN_DECLS
 
+G_MODULE_EXPORT
 G_DECLARE_DERIVABLE_TYPE(FlTextureGL, fl_texture_gl, FL, TEXTURE_GL, GObject)
 
 /**
@@ -30,26 +32,24 @@ G_DECLARE_DERIVABLE_TYPE(FlTextureGL, fl_texture_gl, FL, TEXTURE_GL, GObject)
  * ![<!-- language="C" -->
  *   #include <epoxy/gl.h>
  *
- *   // Type definition, constructor, init, destructor, and class_init are
- *   // omitted.
- *   struct _VideoTextureGL { // extends FlTextureGL
+ *   struct _MyTextureGL {
  *     FlTextureGL parent_instance;
  *
  *     GLuint texture_id;
  *   };
  *
- *   G_DEFINE_TYPE(VideoTexture,
- *                 video_texture,
+ *   G_DEFINE_TYPE(MyTextureGL,
+ *                 my_texture_gl,
  *                 fl_texture_gl_get_type ())
  *
  *   static gboolean
- *   video_texture_populate (FlTextureGL *texture,
+ *   my_texture_gl_populate (FlTextureGL *texture,
  *                           uint32_t *target,
  *                           uint32_t *name,
  *                           uint32_t *width,
  *                           uint32_t *height,
  *                           GError **error) {
- *     VideoTextureGL *self = VIDEO_TEXTURE_GL (texture);
+ *     MyTextureGL *self = MY_TEXTURE_GL (texture);
  *     if (self->texture_id == 0) {
  *       glGenTextures (1, &self->texture_id);
  *       glBindTexture (GL_TEXTURE_2D, self->texture_id);
@@ -71,6 +71,12 @@ G_DECLARE_DERIVABLE_TYPE(FlTextureGL, fl_texture_gl, FL, TEXTURE_GL, GObject)
  *
  *     return TRUE;
  *   }
+ *
+ *   static void my_texture_class_init(MyTextureClass* klass) {
+ *     FL_TEXTURE_GL_CLASS(klass)->populate = my_texture_gl_populate;
+ *   }
+ *
+ *   static void my_texture_init(MyTexture* self) {}
  * ]|
  */
 
@@ -100,4 +106,4 @@ struct _FlTextureGLClass {
 
 G_END_DECLS
 
-#endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_TEXTURE_H_
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_TEXTURE_GL_H_
diff --git a/shell/platform/linux/public/flutter_linux/fl_texture_registrar.h b/shell/platform/linux/public/flutter_linux/fl_texture_registrar.h
index 1c03cdc3ec731777fdf227c7c8c0ccff14cc4f51..0034d345e902f418ff0e754a914c8d48fc0d20f1 100644
--- a/shell/platform/linux/public/flutter_linux/fl_texture_registrar.h
+++ b/shell/platform/linux/public/flutter_linux/fl_texture_registrar.h
@@ -2,20 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_LINUX_FL_TEXTURE_REGISTRAR_H_
-#define FLUTTER_SHELL_PLATFORM_LINUX_FL_TEXTURE_REGISTRAR_H_
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_TEXTURE_REGISTRAR_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_TEXTURE_REGISTRAR_H_
 
 #if !defined(__FLUTTER_LINUX_INSIDE__) && !defined(FLUTTER_LINUX_COMPILATION)
 #error "Only <flutter_linux/flutter_linux.h> can be included directly."
 #endif
 
 #include <glib-object.h>
+#include <gmodule.h>
 #include <stdint.h>
 
 #include "fl_texture.h"
 
 G_BEGIN_DECLS
 
+G_MODULE_EXPORT
 G_DECLARE_INTERFACE(FlTextureRegistrar,
                     fl_texture_registrar,
                     FL,
@@ -88,4 +90,4 @@ gboolean fl_texture_registrar_unregister_texture(FlTextureRegistrar* registrar,
 
 G_END_DECLS
 
-#endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_TEXTURE_REGISTRAR_H_
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_TEXTURE_REGISTRAR_H_
diff --git a/shell/platform/linux/public/flutter_linux/fl_value.h b/shell/platform/linux/public/flutter_linux/fl_value.h
index 7365d464c25b92fcd5f506dced5a8121440b53b1..a3b5616fdaa9e6dcbe32deabf5f43530759a0ca4 100644
--- a/shell/platform/linux/public/flutter_linux/fl_value.h
+++ b/shell/platform/linux/public/flutter_linux/fl_value.h
@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_LINUX_FL_VALUE_H_
-#define FLUTTER_SHELL_PLATFORM_LINUX_FL_VALUE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_VALUE_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_VALUE_H_
 
+#include <glib-object.h>
 #include <glib.h>
 #include <stdbool.h>
 #include <stdint.h>
@@ -34,6 +35,7 @@ G_BEGIN_DECLS
  * - #FL_VALUE_TYPE_FLOAT_LIST: Float64List
  * - #FL_VALUE_TYPE_LIST: List<dynamic>
  * - #FL_VALUE_TYPE_MAP: Map<dynamic>
+ * - #FL_VALUE_TYPE_CUSTOM: (custom type)
  *
  * See #FlMessageCodec to encode and decode these values.
  */
@@ -53,10 +55,13 @@ typedef struct _FlValue FlValue;
  * @FL_VALUE_TYPE_LIST: An ordered list of #FlValue objects.
  * @FL_VALUE_TYPE_MAP: A map of #FlValue objects keyed by #FlValue object.
  * @FL_VALUE_TYPE_FLOAT32_LIST: An ordered list of 32bit floating point numbers.
+ * @FL_VALUE_TYPE_CUSTOM: A custom value.
  *
  * Types of #FlValue.
  */
 typedef enum {
+  // Parts of the public API, so fixing the names is a breaking change.
+  // NOLINTBEGIN(readability-identifier-naming)
   FL_VALUE_TYPE_NULL,
   FL_VALUE_TYPE_BOOL,
   FL_VALUE_TYPE_INT,
@@ -69,6 +74,8 @@ typedef enum {
   FL_VALUE_TYPE_LIST,
   FL_VALUE_TYPE_MAP,
   FL_VALUE_TYPE_FLOAT32_LIST,
+  FL_VALUE_TYPE_CUSTOM,
+  // NOLINTEND(readability-identifier-naming)
 } FlValueType;
 
 /**
@@ -284,6 +291,45 @@ FlValue* fl_value_new_list_from_strv(const gchar* const* value);
  */
 FlValue* fl_value_new_map();
 
+/**
+ * fl_value_new_custom:
+ * @type: an ID for this type.
+ * @value: pointer to the custom value.
+ * @destroy_notify: function to call when @value is no longer required.
+ *
+ * Creates a new custom data type. The Dart side of the channel must have
+ * equivalent custom code to access this object.
+ *
+ * Returns: a new #FlValue.
+ */
+FlValue* fl_value_new_custom(int type,
+                             gconstpointer value,
+                             GDestroyNotify destroy_notify);
+
+/**
+ * fl_value_new_custom_object:
+ * @type: an ID for this type.
+ * @object: the custom object.
+ *
+ * Creates a new custom data type. The Dart side of the channel must have
+ * equivalent custom code to access this object.
+ *
+ * Returns: a new #FlValue.
+ */
+FlValue* fl_value_new_custom_object(int type, GObject* object);
+
+/**
+ * fl_value_new_custom_object_take:
+ * @type: an ID for this type.
+ * @object: (transfer full): the custom object.
+ *
+ * Creates a new custom data type. The Dart side of the channel must have
+ * equivalent custom code to access this object. Ownership of @object is taken.
+ *
+ * Returns: a new #FlValue.
+ */
+FlValue* fl_value_new_custom_object_take(int type, GObject* object);
+
 /**
  * fl_value_ref:
  * @value: an #FlValue.
@@ -596,6 +642,36 @@ FlValue* fl_value_lookup(FlValue* value, FlValue* key);
  */
 FlValue* fl_value_lookup_string(FlValue* value, const gchar* key);
 
+/**
+ * fl_value_get_custom_type:
+ * @value: an #FlValue of type #FL_VALUE_TYPE_CUSTOM.
+ *
+ * Gets the type ID for this custom type.
+ *
+ * Returns: a type ID.
+ */
+int fl_value_get_custom_type(FlValue* value);
+
+/**
+ * fl_value_get_custom_value:
+ * @value: an #FlValue of type #FL_VALUE_TYPE_CUSTOM.
+ *
+ * Gets the address of the custom value.
+ *
+ * Returns: a pointer to the custom value.
+ */
+gconstpointer fl_value_get_custom_value(FlValue* value);
+
+/**
+ * fl_value_get_custom_value_object:
+ * @value: an #FlValue of type #FL_VALUE_TYPE_CUSTOM.
+ *
+ * Gets the custom value as an object.
+ *
+ * Returns: an object.
+ */
+GObject* fl_value_get_custom_value_object(FlValue* value);
+
 /**
  * fl_value_to_string:
  * @value: an #FlValue.
@@ -611,4 +687,4 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(FlValue, fl_value_unref)
 
 G_END_DECLS
 
-#endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_VALUE_H_
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_VALUE_H_
diff --git a/shell/platform/linux/public/flutter_linux/fl_view.h b/shell/platform/linux/public/flutter_linux/fl_view.h
index f93f385a4af6583fc8a10f671a05f308b2af5e9c..34e9acf1743f450f74a5114b670c311136615d50 100644
--- a/shell/platform/linux/public/flutter_linux/fl_view.h
+++ b/shell/platform/linux/public/flutter_linux/fl_view.h
@@ -2,13 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_LINUX_FL_VIEW_H_
-#define FLUTTER_SHELL_PLATFORM_LINUX_FL_VIEW_H_
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_VIEW_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_VIEW_H_
 
 #if !defined(__FLUTTER_LINUX_INSIDE__) && !defined(FLUTTER_LINUX_COMPILATION)
 #error "Only <flutter_linux/flutter_linux.h> can be included directly."
 #endif
 
+#include <gmodule.h>
 #include <gtk/gtk.h>
 
 #include "fl_dart_project.h"
@@ -16,7 +17,8 @@
 
 G_BEGIN_DECLS
 
-G_DECLARE_FINAL_TYPE(FlView, fl_view, FL, VIEW, GtkContainer)
+G_MODULE_EXPORT
+G_DECLARE_FINAL_TYPE(FlView, fl_view, FL, VIEW, GtkBox)
 
 /**
  * FlView:
@@ -58,4 +60,4 @@ FlEngine* fl_view_get_engine(FlView* view);
 
 G_END_DECLS
 
-#endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_VIEW_H_
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FL_VIEW_H_
diff --git a/shell/platform/linux/public/flutter_linux/flutter_linux.h b/shell/platform/linux/public/flutter_linux/flutter_linux.h
index 2d9317ddf53426be199fe53f3b7a91eae6ecdec5..715cb5597bae29067880b68bcb98f5deaa4a4079 100644
--- a/shell/platform/linux/public/flutter_linux/flutter_linux.h
+++ b/shell/platform/linux/public/flutter_linux/flutter_linux.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_LINUX_FLUTTER_LINUX_H_
-#define FLUTTER_SHELL_PLATFORM_LINUX_FLUTTER_LINUX_H_
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FLUTTER_LINUX_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FLUTTER_LINUX_H_
 
 #define __FLUTTER_LINUX_INSIDE__
 
@@ -34,4 +34,4 @@
 
 #undef __FLUTTER_LINUX_INSIDE__
 
-#endif  // FLUTTER_SHELL_PLATFORM_LINUX_FLUTTER_LINUX_H_
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_PUBLIC_FLUTTER_LINUX_FLUTTER_LINUX_H_
diff --git a/shell/platform/linux/testing/fl_test.h b/shell/platform/linux/testing/fl_test.h
index 9fcb3ac679af2db41f25648a8a7a06fc80c68ac7..51b4cb349a6e62f0b5121c48f6dd3c96d01bb954 100644
--- a/shell/platform/linux/testing/fl_test.h
+++ b/shell/platform/linux/testing/fl_test.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_LINUX_FL_TEST_H_
-#define FLUTTER_SHELL_PLATFORM_LINUX_FL_TEST_H_
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_TESTING_FL_TEST_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_TESTING_FL_TEST_H_
 
 #include "flutter/shell/platform/linux/public/flutter_linux/fl_engine.h"
 #include "flutter/shell/platform/linux/public/flutter_linux/fl_value.h"
@@ -34,4 +34,4 @@ void PrintTo(FlValue* v, std::ostream* os);
 
 G_END_DECLS
 
-#endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_TEST_H_
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_TESTING_FL_TEST_H_
diff --git a/shell/platform/linux/testing/fl_test_gtk_logs.cc b/shell/platform/linux/testing/fl_test_gtk_logs.cc
new file mode 100644
index 0000000000000000000000000000000000000000..db25f306f92e332bd9b9571b0836155d15f0cab6
--- /dev/null
+++ b/shell/platform/linux/testing/fl_test_gtk_logs.cc
@@ -0,0 +1,54 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "fl_test_gtk_logs.h"
+#include "gtest/gtest.h"
+
+namespace flutter {
+namespace testing {
+
+namespace {
+
+bool gtk_initialized = false;
+GLogWriterFunc log_writer_cb = nullptr;
+GLogLevelFlags fl_received_log_levels = (GLogLevelFlags)0x0;
+
+GLogWriterOutput log_writer(GLogLevelFlags log_level,
+                            const GLogField* fields,
+                            gsize n_fields,
+                            gpointer user_data) {
+  fl_received_log_levels = (GLogLevelFlags)(log_level | fl_received_log_levels);
+  if (log_writer_cb == nullptr) {
+    return g_log_writer_default(log_level, fields, n_fields, user_data);
+  }
+  GLogWriterOutput result =
+      log_writer_cb(log_level, fields, n_fields, user_data);
+  if (result != G_LOG_WRITER_HANDLED) {
+    return g_log_writer_default(log_level, fields, n_fields, user_data);
+  }
+  return result;
+}
+
+}  // namespace
+
+void fl_ensure_gtk_init(GLogWriterFunc writer) {
+  if (!gtk_initialized) {
+    gtk_init(0, nullptr);
+    g_log_set_writer_func(log_writer, nullptr, nullptr);
+    gtk_initialized = true;
+  }
+  fl_reset_received_gtk_log_levels();
+  log_writer_cb = writer;
+}
+
+void fl_reset_received_gtk_log_levels() {
+  fl_received_log_levels = (GLogLevelFlags)0x0;
+}
+
+GLogLevelFlags fl_get_received_gtk_log_levels() {
+  return fl_received_log_levels;
+}
+
+}  // namespace testing
+}  // namespace flutter
\ No newline at end of file
diff --git a/shell/platform/linux/testing/fl_test_gtk_logs.h b/shell/platform/linux/testing/fl_test_gtk_logs.h
new file mode 100644
index 0000000000000000000000000000000000000000..29d0988758e3b0444d2dced792953a528af0dbf0
--- /dev/null
+++ b/shell/platform/linux/testing/fl_test_gtk_logs.h
@@ -0,0 +1,49 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_TESTING_FL_TEST_GTK_LOGS_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_TESTING_FL_TEST_GTK_LOGS_H_
+
+#include <gtk/gtk.h>
+
+namespace flutter {
+namespace testing {
+
+/**
+ * Ensures that GTK has been initialized. If GTK has not been initialized, it
+ * will be initialized using `gtk_init()`. It will also set the GTK log writer
+ * function to monitor the log output, recording the log levels that have been
+ * received in a bitfield accessible via {@link fl_get_received_gtk_log_levels}
+ *
+ * To retrieve the bitfield of recorded log levels, use
+ * `fl_get_received_gtk_log_levels()`.
+ *
+ * @param[in] writer The custom log writer function to use. If `nullptr`, or it
+ *      returns G_LOG_WRITER_UNHANDLED, the default log writer function will be
+ *      called.
+ *
+ * @brief Ensures that GTK has been initialized and starts monitoring logs.
+ */
+void fl_ensure_gtk_init(GLogWriterFunc writer = nullptr);
+
+/**
+ * Resets the recorded GTK log levels to zero.
+ *
+ * @brief Resets the recorded log levels.
+ */
+void fl_reset_received_gtk_log_levels();
+
+/**
+ * Returns a bitfield containing the GTK log levels that have been seen since
+ * the last time they were reset.
+ *
+ * @brief Returns the recorded log levels.
+ *
+ * @return A `GLogLevelFlags` bitfield representing the recorded log levels.
+ */
+GLogLevelFlags fl_get_received_gtk_log_levels();
+
+}  // namespace testing
+}  // namespace flutter
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_TESTING_FL_TEST_GTK_LOGS_H_
diff --git a/shell/platform/linux/testing/mock_binary_messenger.cc b/shell/platform/linux/testing/mock_binary_messenger.cc
index cc9b54f696dce25959fce64f22492138242d85d1..ac1b05af3386a26cee4c4deca972fe21057bdfcd 100644
--- a/shell/platform/linux/testing/mock_binary_messenger.cc
+++ b/shell/platform/linux/testing/mock_binary_messenger.cc
@@ -40,26 +40,26 @@ MockBinaryMessenger::operator FlBinaryMessenger*() {
 }
 
 bool MockBinaryMessenger::HasMessageHandler(const gchar* channel) const {
-  return message_handlers.at(channel) != nullptr;
+  return message_handlers_.at(channel) != nullptr;
 }
 
 void MockBinaryMessenger::SetMessageHandler(
     const gchar* channel,
     FlBinaryMessengerMessageHandler handler,
     gpointer user_data) {
-  message_handlers[channel] = handler;
-  user_datas[channel] = user_data;
+  message_handlers_[channel] = handler;
+  user_datas_[channel] = user_data;
 }
 
 void MockBinaryMessenger::ReceiveMessage(const gchar* channel,
                                          GBytes* message) {
-  FlBinaryMessengerMessageHandler handler = message_handlers[channel];
-  if (response_handles[channel] == nullptr) {
-    response_handles[channel] = FL_BINARY_MESSENGER_RESPONSE_HANDLE(
+  FlBinaryMessengerMessageHandler handler = message_handlers_[channel];
+  if (response_handles_[channel] == nullptr) {
+    response_handles_[channel] = FL_BINARY_MESSENGER_RESPONSE_HANDLE(
         fl_mock_binary_messenger_response_handle_new());
   }
-  handler(instance_, channel, message, response_handles[channel],
-          user_datas[channel]);
+  handler(instance_, channel, message, response_handles_[channel],
+          user_datas_[channel]);
 }
 
 static void fl_mock_binary_messenger_iface_init(
@@ -122,6 +122,25 @@ static GBytes* fl_mock_binary_messenger_send_on_channel_finish(
                                                                 result, error);
 }
 
+static void fl_mock_binary_messenger_resize_channel(
+    FlBinaryMessenger* messenger,
+    const gchar* channel,
+    int64_t new_size) {
+  g_return_if_fail(FL_IS_MOCK_BINARY_MESSENGER(messenger));
+  FlMockBinaryMessenger* self = FL_MOCK_BINARY_MESSENGER(messenger);
+  self->mock->fl_binary_messenger_resize_channel(messenger, channel, new_size);
+}
+
+static void fl_mock_binary_messenger_set_warns_on_channel_overflow(
+    FlBinaryMessenger* messenger,
+    const gchar* channel,
+    bool warns) {
+  g_return_if_fail(FL_IS_MOCK_BINARY_MESSENGER(messenger));
+  FlMockBinaryMessenger* self = FL_MOCK_BINARY_MESSENGER(messenger);
+  self->mock->fl_binary_messenger_set_warns_on_channel_overflow(messenger,
+                                                                channel, warns);
+}
+
 static void fl_mock_binary_messenger_iface_init(
     FlBinaryMessengerInterface* iface) {
   iface->set_message_handler_on_channel =
@@ -130,6 +149,9 @@ static void fl_mock_binary_messenger_iface_init(
   iface->send_on_channel = fl_mock_binary_messenger_send_on_channel;
   iface->send_on_channel_finish =
       fl_mock_binary_messenger_send_on_channel_finish;
+  iface->resize_channel = fl_mock_binary_messenger_resize_channel;
+  iface->set_warns_on_channel_overflow =
+      fl_mock_binary_messenger_set_warns_on_channel_overflow;
 }
 
 static void fl_mock_binary_messenger_init(FlMockBinaryMessenger* self) {}
diff --git a/shell/platform/linux/testing/mock_binary_messenger.h b/shell/platform/linux/testing/mock_binary_messenger.h
index 50385279efdec313916d8aeaa4c1754b20e5eab2..394e55882ed2daf5a4240ab153a46cca0079e9d0 100644
--- a/shell/platform/linux/testing/mock_binary_messenger.h
+++ b/shell/platform/linux/testing/mock_binary_messenger.h
@@ -20,33 +20,53 @@ class MockBinaryMessenger {
   MockBinaryMessenger();
   ~MockBinaryMessenger();
 
+  // This was an existing use of operator overloading. It's against our style
+  // guide but enabling clang tidy on header files is a higher priority than
+  // fixing this.
+  // NOLINTNEXTLINE(google-explicit-constructor)
   operator FlBinaryMessenger*();
 
-  MOCK_METHOD5(fl_binary_messenger_set_message_handler_on_channel,
-               void(FlBinaryMessenger* messenger,
-                    const gchar* channel,
-                    FlBinaryMessengerMessageHandler handler,
-                    gpointer user_data,
-                    GDestroyNotify destroy_notify));
-
-  MOCK_METHOD4(fl_binary_messenger_send_response,
-               gboolean(FlBinaryMessenger* messenger,
-                        FlBinaryMessengerResponseHandle* response_handle,
-                        GBytes* response,
-                        GError** error));
-
-  MOCK_METHOD6(fl_binary_messenger_send_on_channel,
-               void(FlBinaryMessenger* messenger,
-                    const gchar* channel,
-                    GBytes* message,
-                    GCancellable* cancellable,
-                    GAsyncReadyCallback callback,
-                    gpointer user_data));
-
-  MOCK_METHOD3(fl_binary_messenger_send_on_channel_finish,
-               GBytes*(FlBinaryMessenger* messenger,
-                       GAsyncResult* result,
-                       GError** error));
+  MOCK_METHOD(void,
+              fl_binary_messenger_set_message_handler_on_channel,
+              (FlBinaryMessenger * messenger,
+               const gchar* channel,
+               FlBinaryMessengerMessageHandler handler,
+               gpointer user_data,
+               GDestroyNotify destroy_notify));
+
+  MOCK_METHOD(gboolean,
+              fl_binary_messenger_send_response,
+              (FlBinaryMessenger * messenger,
+               FlBinaryMessengerResponseHandle* response_handle,
+               GBytes* response,
+               GError** error));
+
+  MOCK_METHOD(void,
+              fl_binary_messenger_send_on_channel,
+              (FlBinaryMessenger * messenger,
+               const gchar* channel,
+               GBytes* message,
+               GCancellable* cancellable,
+               GAsyncReadyCallback callback,
+               gpointer user_data));
+
+  MOCK_METHOD(GBytes*,
+              fl_binary_messenger_send_on_channel_finish,
+              (FlBinaryMessenger * messenger,
+               GAsyncResult* result,
+               GError** error));
+
+  MOCK_METHOD(void,
+              fl_binary_messenger_resize_channel,
+              (FlBinaryMessenger * messenger,
+               const gchar* channel,
+               int64_t new_size));
+
+  MOCK_METHOD(void,
+              fl_binary_messenger_set_warns_on_channel_overflow,
+              (FlBinaryMessenger * messenger,
+               const gchar* channel,
+               bool warns));
 
   bool HasMessageHandler(const gchar* channel) const;
 
@@ -59,10 +79,10 @@ class MockBinaryMessenger {
  private:
   FlBinaryMessenger* instance_ = nullptr;
   std::unordered_map<std::string, FlBinaryMessengerMessageHandler>
-      message_handlers;
+      message_handlers_;
   std::unordered_map<std::string, FlBinaryMessengerResponseHandle*>
-      response_handles;
-  std::unordered_map<std::string, gpointer> user_datas;
+      response_handles_;
+  std::unordered_map<std::string, gpointer> user_datas_;
 };
 
 }  // namespace testing
diff --git a/shell/platform/linux/testing/mock_binary_messenger_response_handle.h b/shell/platform/linux/testing/mock_binary_messenger_response_handle.h
index 66372c7109249ec16c935080b5052cac374216e1..42d86cc80fa9c8cafa381284b91b3a49fa0ea00d 100644
--- a/shell/platform/linux/testing/mock_binary_messenger_response_handle.h
+++ b/shell/platform/linux/testing/mock_binary_messenger_response_handle.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_TESTING_MOCK_BINARY_MESSENGER_RESPONSE_HANDLE_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_TESTING_MOCK_BINARY_MESSENGER_RESPONSE_HANDLE_H_
+
 #include "flutter/shell/platform/linux/fl_binary_messenger_private.h"
 
 G_BEGIN_DECLS
@@ -16,3 +19,5 @@ FlMockBinaryMessengerResponseHandle*
 fl_mock_binary_messenger_response_handle_new();
 
 G_END_DECLS
+
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_TESTING_MOCK_BINARY_MESSENGER_RESPONSE_HANDLE_H_
diff --git a/shell/platform/linux/testing/mock_engine.cc b/shell/platform/linux/testing/mock_engine.cc
index dc3772e9bac2822c523bce882d043097eda3d033..eac0cb3809cc974dc1ac4bc1c76a2fd87b5ea0e8 100644
--- a/shell/platform/linux/testing/mock_engine.cc
+++ b/shell/platform/linux/testing/mock_engine.cc
@@ -505,6 +505,10 @@ FlutterEngineResult FlutterEngineMarkExternalTextureFrameAvailable(
 FlutterEngineResult FlutterEngineUnregisterExternalTexture(
     FLUTTER_API_SYMBOL(FlutterEngine) engine,
     int64_t texture_identifier) {
+  auto val = engine->textures.find(texture_identifier);
+  if (val == std::end(engine->textures)) {
+    return kInvalidArguments;
+  }
   engine->textures.erase(texture_identifier);
   return kSuccess;
 }
diff --git a/shell/platform/linux/testing/mock_epoxy.cc b/shell/platform/linux/testing/mock_epoxy.cc
index 91a3cca60b5db93838df1dfe812eae7f175a367f..e89517d3febeb1d0fb2bf60351f73c2bf49a1ec4 100644
--- a/shell/platform/linux/testing/mock_epoxy.cc
+++ b/shell/platform/linux/testing/mock_epoxy.cc
@@ -394,14 +394,15 @@ int epoxy_gl_version(void) {
 #define CONSTRUCT(_func) static void _func(void) __attribute__((constructor));
 #define DESTRUCT(_func) static void _func(void) __attribute__((destructor));
 #elif defined(_MSC_VER) && (_MSC_VER >= 1500)
-#define CONSTRUCT(_func)                                   \
-  static void _func(void);                                 \
-  static int _func##_wrapper(void) {                       \
-    _func();                                               \
-    return 0;                                              \
-  }                                                        \
-  __pragma(section(".CRT$XCU", read)) __declspec(allocate( \
-      ".CRT$XCU")) static int (*_array##_func)(void) = _func##_wrapper;
+#define CONSTRUCT(_func)                                                   \
+  static void _func(void);                                                 \
+  static int _func##_wrapper(void) {                                       \
+    _func();                                                               \
+    return 0;                                                              \
+  }                                                                        \
+  __pragma(section(".CRT$XCU", read))                                      \
+      __declspec(allocate(".CRT$XCU")) static int (*_array##_func)(void) = \
+          _func##_wrapper;
 
 #else
 #error "You will need constructor support for your compiler"
diff --git a/shell/platform/linux/testing/mock_im_context.h b/shell/platform/linux/testing/mock_im_context.h
index 40dd0128ad6efd100f46178568831b9b22e52819..243030cc8ac0e99b636db7d8564d54de09be6eb6 100644
--- a/shell/platform/linux/testing/mock_im_context.h
+++ b/shell/platform/linux/testing/mock_im_context.h
@@ -16,33 +16,40 @@ class MockIMContext {
  public:
   ~MockIMContext();
 
+  // This was an existing use of operator overloading. It's against our style
+  // guide but enabling clang tidy on header files is a higher priority than
+  // fixing this.
+  // NOLINTNEXTLINE(google-explicit-constructor)
   operator GtkIMContext*();
 
-  MOCK_METHOD2(gtk_im_context_set_client_window,
-               void(GtkIMContext* context, GdkWindow* window));
-  MOCK_METHOD4(gtk_im_context_get_preedit_string,
-               void(GtkIMContext* context,
-                    gchar** str,
-                    PangoAttrList** attrs,
-                    gint* cursor_pos));
-  MOCK_METHOD2(gtk_im_context_filter_keypress,
-               gboolean(GtkIMContext* context, GdkEventKey* event));
-  MOCK_METHOD1(gtk_im_context_focus_in, gboolean(GtkIMContext* context));
-  MOCK_METHOD1(gtk_im_context_focus_out, void(GtkIMContext* context));
-  MOCK_METHOD1(gtk_im_context_reset, void(GtkIMContext* context));
-  MOCK_METHOD2(gtk_im_context_set_cursor_location,
-               void(GtkIMContext* context, GdkRectangle* area));
-  MOCK_METHOD2(gtk_im_context_set_use_preedit,
-               void(GtkIMContext* context, gboolean use_preedit));
-  MOCK_METHOD4(gtk_im_context_set_surrounding,
-               void(GtkIMContext* context,
-                    const gchar* text,
-                    gint len,
-                    gint cursor_index));
-  MOCK_METHOD3(gtk_im_context_get_surrounding,
-               gboolean(GtkIMContext* context,
-                        gchar** text,
-                        gint* cursor_index));
+  MOCK_METHOD(void,
+              gtk_im_context_set_client_window,
+              (GtkIMContext * context, GdkWindow* window));
+  MOCK_METHOD(void,
+              gtk_im_context_get_preedit_string,
+              (GtkIMContext * context,
+               gchar** str,
+               PangoAttrList** attrs,
+               gint* cursor_pos));
+  MOCK_METHOD(gboolean,
+              gtk_im_context_filter_keypress,
+              (GtkIMContext * context, GdkEventKey* event));
+  MOCK_METHOD(gboolean, gtk_im_context_focus_in, (GtkIMContext * context));
+  MOCK_METHOD(void, gtk_im_context_focus_out, (GtkIMContext * context));
+  MOCK_METHOD(void, gtk_im_context_reset, (GtkIMContext * context));
+  MOCK_METHOD(void,
+              gtk_im_context_set_cursor_location,
+              (GtkIMContext * context, GdkRectangle* area));
+  MOCK_METHOD(void,
+              gtk_im_context_set_use_preedit,
+              (GtkIMContext * context, gboolean use_preedit));
+  MOCK_METHOD(
+      void,
+      gtk_im_context_set_surrounding,
+      (GtkIMContext * context, const gchar* text, gint len, gint cursor_index));
+  MOCK_METHOD(gboolean,
+              gtk_im_context_get_surrounding,
+              (GtkIMContext * context, gchar** text, gint* cursor_index));
 
  private:
   GtkIMContext* instance_ = nullptr;
diff --git a/shell/platform/linux/testing/mock_plugin_registrar.h b/shell/platform/linux/testing/mock_plugin_registrar.h
index dba77d6535c556ae8c204cc91f517893eb9e3c8a..6207083c8ef285ee39fe6047a2439e0982e0ce61 100644
--- a/shell/platform/linux/testing/mock_plugin_registrar.h
+++ b/shell/platform/linux/testing/mock_plugin_registrar.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_TESTING_MOCK_PLUGIN_REGISTRAR_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_TESTING_MOCK_PLUGIN_REGISTRAR_H_
+
 #include "flutter/shell/platform/linux/public/flutter_linux/fl_binary_messenger.h"
 #include "flutter/shell/platform/linux/public/flutter_linux/fl_plugin_registrar.h"
 #include "flutter/shell/platform/linux/public/flutter_linux/fl_texture_registrar.h"
@@ -19,3 +22,5 @@ FlPluginRegistrar* fl_mock_plugin_registrar_new(
     FlTextureRegistrar* texture_registrar);
 
 G_END_DECLS
+
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_TESTING_MOCK_PLUGIN_REGISTRAR_H_
diff --git a/shell/platform/linux/testing/mock_renderer.cc b/shell/platform/linux/testing/mock_renderer.cc
index ce801724ec3c8fa848bf1deb71b9070da16dc331..91d87b460cf3d70dddf47261ce873eb26fa975f0 100644
--- a/shell/platform/linux/testing/mock_renderer.cc
+++ b/shell/platform/linux/testing/mock_renderer.cc
@@ -10,44 +10,20 @@ struct _FlMockRenderer {
 
 G_DEFINE_TYPE(FlMockRenderer, fl_mock_renderer, fl_renderer_get_type())
 
-// Implements FlRenderer::create_contexts.
-static gboolean fl_mock_renderer_create_contexts(FlRenderer* renderer,
-                                                 GtkWidget* widget,
-                                                 GdkGLContext** visible,
-                                                 GdkGLContext** resource,
-                                                 GError** error) {
-  return TRUE;
-}
+// Implements FlRenderer::make_current.
+static void fl_mock_renderer_make_current(FlRenderer* renderer) {}
 
-// Implements FlRenderer::create_backing_store.
-static gboolean fl_mock_renderer_create_backing_store(
-    FlRenderer* renderer,
-    const FlutterBackingStoreConfig* config,
-    FlutterBackingStore* backing_store_out) {
-  return TRUE;
-}
+// Implements FlRenderer::make_resource_current.
+static void fl_mock_renderer_make_resource_current(FlRenderer* renderer) {}
 
-// Implements FlRenderer::collect_backing_store.
-static gboolean fl_mock_renderer_collect_backing_store(
-    FlRenderer* self,
-    const FlutterBackingStore* backing_store) {
-  return TRUE;
-}
-
-// Implements FlRenderer::present_layers.
-static gboolean fl_mock_renderer_present_layers(FlRenderer* self,
-                                                const FlutterLayer** layers,
-                                                size_t layers_count) {
-  return TRUE;
-}
+// Implements FlRenderer::clear_current.
+static void fl_mock_renderer_clear_current(FlRenderer* renderer) {}
 
 static void fl_mock_renderer_class_init(FlMockRendererClass* klass) {
-  FL_RENDERER_CLASS(klass)->create_contexts = fl_mock_renderer_create_contexts;
-  FL_RENDERER_CLASS(klass)->create_backing_store =
-      fl_mock_renderer_create_backing_store;
-  FL_RENDERER_CLASS(klass)->collect_backing_store =
-      fl_mock_renderer_collect_backing_store;
-  FL_RENDERER_CLASS(klass)->present_layers = fl_mock_renderer_present_layers;
+  FL_RENDERER_CLASS(klass)->make_current = fl_mock_renderer_make_current;
+  FL_RENDERER_CLASS(klass)->make_resource_current =
+      fl_mock_renderer_make_resource_current;
+  FL_RENDERER_CLASS(klass)->clear_current = fl_mock_renderer_clear_current;
 }
 
 static void fl_mock_renderer_init(FlMockRenderer* self) {}
diff --git a/shell/platform/linux/testing/mock_renderer.h b/shell/platform/linux/testing/mock_renderer.h
index 19268683cf18719ac277bc01dbd141981fdf658b..5369a37b39b6f02e6550bae688d3b2a72783514d 100644
--- a/shell/platform/linux/testing/mock_renderer.h
+++ b/shell/platform/linux/testing/mock_renderer.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_TESTING_MOCK_RENDERER_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_TESTING_MOCK_RENDERER_H_
+
 #include "flutter/shell/platform/linux/fl_renderer.h"
 
 G_BEGIN_DECLS
@@ -15,3 +18,5 @@ G_DECLARE_FINAL_TYPE(FlMockRenderer,
 FlMockRenderer* fl_mock_renderer_new();
 
 G_END_DECLS
+
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_TESTING_MOCK_RENDERER_H_
diff --git a/shell/platform/linux/testing/mock_settings.h b/shell/platform/linux/testing/mock_settings.h
index 57636b3ad11ff78bd6778261b54b8242bf47c231..790229eb8c79544ad4269fc489f825f300109960 100644
--- a/shell/platform/linux/testing/mock_settings.h
+++ b/shell/platform/linux/testing/mock_settings.h
@@ -18,20 +18,27 @@ class MockSettings {
   MockSettings();
   ~MockSettings();
 
+  // This was an existing use of operator overloading. It's against our style
+  // guide but enabling clang tidy on header files is a higher priority than
+  // fixing this.
+  // NOLINTNEXTLINE(google-explicit-constructor)
   operator FlSettings*();
 
-  MOCK_METHOD1(fl_settings_get_clock_format,
-               FlClockFormat(FlSettings* settings));
+  MOCK_METHOD(FlClockFormat,
+              fl_settings_get_clock_format,
+              (FlSettings * settings));
 
-  MOCK_METHOD1(fl_settings_get_color_scheme,
-               FlColorScheme(FlSettings* settings));
+  MOCK_METHOD(FlColorScheme,
+              fl_settings_get_color_scheme,
+              (FlSettings * settings));
 
-  MOCK_METHOD1(fl_settings_get_enable_animations, bool(FlSettings* settings));
+  MOCK_METHOD(bool, fl_settings_get_enable_animations, (FlSettings * settings));
 
-  MOCK_METHOD1(fl_settings_get_high_contrast, bool(FlSettings* settings));
+  MOCK_METHOD(bool, fl_settings_get_high_contrast, (FlSettings * settings));
 
-  MOCK_METHOD1(fl_settings_get_text_scaling_factor,
-               gdouble(FlSettings* settings));
+  MOCK_METHOD(gdouble,
+              fl_settings_get_text_scaling_factor,
+              (FlSettings * settings));
 
  private:
   FlSettings* instance_ = nullptr;
diff --git a/shell/platform/linux/testing/mock_signal_handler.h b/shell/platform/linux/testing/mock_signal_handler.h
index e1e92895da4bdbd9065df8fb10e69efa6dc50dc9..98013015d8649fbb10cd24331cb94246fa1d5451 100644
--- a/shell/platform/linux/testing/mock_signal_handler.h
+++ b/shell/platform/linux/testing/mock_signal_handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_LINUX_MOCK_SIGNAL_HANDLER_H_
-#define FLUTTER_SHELL_PLATFORM_LINUX_MOCK_SIGNAL_HANDLER_H_
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_TESTING_MOCK_SIGNAL_HANDLER_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_TESTING_MOCK_SIGNAL_HANDLER_H_
 
 #include <glib-object.h>
 #include <glib.h>
@@ -50,7 +50,7 @@ class MockSignalHandler : public SignalHandler {
   MockSignalHandler(gpointer instance, const gchar* name)
       : SignalHandler(instance, name, G_CALLBACK(OnSignal)) {}
 
-  MOCK_METHOD0(Handler, void());
+  MOCK_METHOD(void, Handler, ());
 
  private:
   static void OnSignal(MockSignalHandler* mock) { mock->Handler(); }
@@ -63,7 +63,7 @@ class MockSignalHandler1 : public SignalHandler {
   MockSignalHandler1(gpointer instance, const gchar* name)
       : SignalHandler(instance, name, G_CALLBACK(OnSignal1)) {}
 
-  MOCK_METHOD1(Handler1, void(A1 a1));
+  MOCK_METHOD(void, Handler1, (A1 a1));
 
  private:
   static void OnSignal1(MockSignalHandler1* mock, A1 a1) { mock->Handler1(a1); }
@@ -76,7 +76,7 @@ class MockSignalHandler2 : public SignalHandler {
   MockSignalHandler2(gpointer instance, const gchar* name)
       : SignalHandler(instance, name, G_CALLBACK(OnSignal2)) {}
 
-  MOCK_METHOD2(Handler2, void(A1 a1, A2 a2));
+  MOCK_METHOD(void, Handler2, (A1 a1, A2 a2));
 
  private:
   static void OnSignal2(MockSignalHandler2* mock, A1 a1, A2 a2) {
@@ -87,4 +87,4 @@ class MockSignalHandler2 : public SignalHandler {
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_LINUX_MOCK_SIGNAL_HANDLER_H_
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_TESTING_MOCK_SIGNAL_HANDLER_H_
diff --git a/shell/platform/linux/testing/mock_text_input_view_delegate.h b/shell/platform/linux/testing/mock_text_input_view_delegate.h
index ae43045e15d92dd7886c0389ccfde99195cd190d..0f5b2811a2837b4d3a43a8d87fc8e763002e7cc2 100644
--- a/shell/platform/linux/testing/mock_text_input_view_delegate.h
+++ b/shell/platform/linux/testing/mock_text_input_view_delegate.h
@@ -20,14 +20,16 @@ class MockTextInputViewDelegate {
   MockTextInputViewDelegate();
   ~MockTextInputViewDelegate();
 
+  // NOLINTNEXTLINE(google-explicit-constructor)
   operator FlTextInputViewDelegate*();
 
-  MOCK_METHOD5(fl_text_input_view_delegate_translate_coordinates,
-               void(FlTextInputViewDelegate* delegate,
-                    gint view_x,
-                    gint view_y,
-                    gint* window_x,
-                    gint* window_y));
+  MOCK_METHOD(void,
+              fl_text_input_view_delegate_translate_coordinates,
+              (FlTextInputViewDelegate * delegate,
+               gint view_x,
+               gint view_y,
+               gint* window_x,
+               gint* window_y));
 
  private:
   FlTextInputViewDelegate* instance_ = nullptr;
diff --git a/shell/platform/linux/testing/mock_texture_registrar.cc b/shell/platform/linux/testing/mock_texture_registrar.cc
index 66b5b8cfab9e9fb9d7e2acb603e1b1368fbe86c1..0a91d24fbbc5235336f22bf4fcc5c950185a0057 100644
--- a/shell/platform/linux/testing/mock_texture_registrar.cc
+++ b/shell/platform/linux/testing/mock_texture_registrar.cc
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "flutter/shell/platform/linux/testing/mock_texture_registrar.h"
-#include "flutter/shell/platform/linux/fl_texture_private.h"
 
 struct _FlMockTextureRegistrar {
   GObject parent_instance;
@@ -35,7 +34,7 @@ static FlTexture* lookup_texture(FlTextureRegistrar* registrar,
                                  int64_t texture_id) {
   FlMockTextureRegistrar* self = FL_MOCK_TEXTURE_REGISTRAR(registrar);
   if (self->texture != nullptr &&
-      fl_texture_get_texture_id(self->texture) == texture_id) {
+      fl_texture_get_id(self->texture) == texture_id) {
     return self->texture;
   }
   return nullptr;
@@ -44,8 +43,7 @@ static FlTexture* lookup_texture(FlTextureRegistrar* registrar,
 static gboolean mark_texture_frame_available(FlTextureRegistrar* registrar,
                                              FlTexture* texture) {
   FlMockTextureRegistrar* self = FL_MOCK_TEXTURE_REGISTRAR(registrar);
-  if (lookup_texture(registrar, fl_texture_get_texture_id(texture)) ==
-      nullptr) {
+  if (lookup_texture(registrar, fl_texture_get_id(texture)) == nullptr) {
     return FALSE;
   }
   self->frame_available = TRUE;
diff --git a/shell/platform/linux/testing/mock_texture_registrar.h b/shell/platform/linux/testing/mock_texture_registrar.h
index 65c617da128bef48ad72c6336e8b9f9655cd556b..13d59753bd05f60b3226cfc93732097fe59ce94a 100644
--- a/shell/platform/linux/testing/mock_texture_registrar.h
+++ b/shell/platform/linux/testing/mock_texture_registrar.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_SHELL_PLATFORM_LINUX_TESTING_MOCK_TEXTURE_REGISTRAR_H_
+#define FLUTTER_SHELL_PLATFORM_LINUX_TESTING_MOCK_TEXTURE_REGISTRAR_H_
+
 #include "flutter/shell/platform/linux/fl_texture_registrar_private.h"
 
 G_BEGIN_DECLS
@@ -21,3 +24,5 @@ gboolean fl_mock_texture_registrar_get_frame_available(
     FlMockTextureRegistrar* registrar);
 
 G_END_DECLS
+
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_TESTING_MOCK_TEXTURE_REGISTRAR_H_
diff --git a/shell/platform/ohos/BUILD.gn b/shell/platform/ohos/BUILD.gn
index c9c6d05810ce04ff4450baed87c2699694181c44..3d8f5b58af3a45f141fcb7304554101cee83d1e9 100644
--- a/shell/platform/ohos/BUILD.gn
+++ b/shell/platform/ohos/BUILD.gn
@@ -23,10 +23,10 @@ import("//flutter/testing/testing.gni")
 
 group("ohos") {
   deps = [
-    ":flutter_shell_native",
     #":publish_headers_ohos",
     #":ohos_har",
     ":flutter_har_zip",
+    ":flutter_shell_native",
     ":ohos_symbols",
   ]
   if (target_cpu != "x86") {
@@ -36,9 +36,10 @@ group("ohos") {
 shell_gpu_configuration("ohos_gpu_configuration") {
   enable_software = true
   enable_gl = true
-  enable_vulkan = false
+  enable_vulkan = true
   enable_metal = false
 }
+
 # Temporary workaround for the issue describe in
 # https://github.com/flutter/flutter/issues/14509 and
 # https://github.com/flutter/flutter/issues/14438
@@ -56,9 +57,7 @@ _public_headers = [
 ]
 
 config("relative_flutter_ohos_headers") {
-  include_dirs = [ "public",
-                    
-                     ]
+  include_dirs = [ "public" ]
 }
 
 source_set("flutter_ohos_sources") {
@@ -71,7 +70,7 @@ source_set("flutter_ohos_sources") {
              "platform_message_response_ohos.h",
              "platform_message_handler_ohos.h",
              "vsync_waiter_ohos.h",
-             "ohos_logger.h" ,
+             "ohos_logger.h",
              "ohos_display.h",
              "ohos_surface_software.h",
              "./context/ohos_context.h",
@@ -79,49 +78,54 @@ source_set("flutter_ohos_sources") {
              "./surface/ohos_surface.h",
              "ohos_touch_processor.h",
              "ohos_context_gl_skia.h",
+             "ohos_context_vulkan_impeller.h",
              "ohos_egl_surface.h",
              "ohos_environment_gl.h",
              "ohos_surface_gl_skia.h",
+             "ohos_surface_vulkan_impeller.h",
              "types.h",
            ]
 
   #configs += [ "//flutter/shell/platform/ohos/config:gtk" ]
 
   sources = [
-      "library_loader.cpp"  ,
-      "ohos_xcomponent_adapter.cpp",
-      "./napi/platform_view_ohos_napi.cpp",
-      "ohos_shell_holder.cpp",
-      "platform_view_ohos.cpp",
-      "ohos_display.cpp",
-      "ohos_surface_software.cpp",
-      "platform_message_handler_ohos.cpp",
-      "platform_message_response_ohos.cpp",
-      "vsync_waiter_ohos.cpp",
-      "./surface/ohos_native_window.cpp",
-      "./surface/ohos_surface.cpp",
-      "./context/ohos_context.cpp",
-      "ohos_asset_provider.cpp",
-      "ohos_touch_processor.cpp",
-      "ohos_main.cpp" ,
-      "ohos_logger.c" ,
-      "ohos_context_gl_impeller.cpp",
-      "ohos_surface_gl_impeller.cpp",
-      # "//flutter/impeller/toolkit/egl/display.cc",
-      "ohos_context_gl_skia.cpp" ,
-      "ohos_egl_surface.cpp" ,
-      "ohos_environment_gl.cpp",
-      "ohos_surface_gl_skia.cpp",
-      "ohos_image_generator.cpp",
-      "ohos_external_texture_gl.cpp",
-      "./surface/ohos_snapshot_surface_producer.cpp",
+    "./context/ohos_context.cpp",
+    "./napi/platform_view_ohos_napi.cpp",
+    "./surface/ohos_native_window.cpp",
+    "./surface/ohos_snapshot_surface_producer.cpp",
+    "./surface/ohos_surface.cpp",
+    "library_loader.cpp",
+    "ohos_asset_provider.cpp",
+    "ohos_context_gl_impeller.cpp",
+    "ohos_context_vulkan_impeller.cpp",
+
+    # "//flutter/impeller/toolkit/egl/display.cc",
+    "ohos_context_gl_skia.cpp",
+    "ohos_display.cpp",
+    "ohos_egl_surface.cpp",
+    "ohos_environment_gl.cpp",
+    "ohos_external_texture_gl.cpp",
+    "ohos_image_generator.cpp",
+    "ohos_logger.c",
+    "ohos_main.cpp",
+    "ohos_shell_holder.cpp",
+    "ohos_surface_gl_impeller.cpp",
+    "ohos_surface_gl_skia.cpp",
+    "ohos_surface_software.cpp",
+    "ohos_surface_vulkan_impeller.cpp",
+    "ohos_touch_processor.cpp",
+    "ohos_xcomponent_adapter.cpp",
+    "platform_message_handler_ohos.cpp",
+    "platform_message_response_ohos.cpp",
+    "platform_view_ohos.cpp",
+    "vsync_waiter_ohos.cpp",
   ]
 
   # Set flag to stop headers being directly included (library users should not do this)
   defines = [
     "FLUTTER_LINUX_COMPILATION",
     "FLUTTER_ENGINE_NO_PROTOTYPES",
-    "OHOS_PLATFORM" ,
+    "OHOS_PLATFORM",
     "__MUSL__",
   ]
 
@@ -129,7 +133,7 @@ source_set("flutter_ohos_sources") {
     "//flutter/shell/platform/common:common_cpp_input",
     "//flutter/shell/platform/common:common_cpp_switches",
     "//flutter/shell/platform/embedder:embedder_headers",
-    "//third_party/rapidjson",
+    "//flutter/third_party/rapidjson",
   ]
 
   public_deps = [
@@ -145,13 +149,10 @@ source_set("flutter_ohos_sources") {
     "//flutter/runtime",
     "//flutter/runtime:libdart",
     "//flutter/shell/common",
+
     #"//flutter/vulkan",
-    "//third_party/skia",
-    "//flutter/shell/gpu:gpu_surface_gl",
-  
-  
+    "//flutter/skia",
   ]
-
 }
 
 source_set("flutter_ohos_src") {
@@ -162,7 +163,7 @@ source_set("flutter_ohos_src") {
 
   defines = [ "FLUTTER_ENGINE_NO_PROTOTYPES" ]
 
-  public_deps = [ ":flutter_ohos_sources"]
+  public_deps = [ ":flutter_ohos_sources" ]
 
   deps = [ "//flutter/shell/platform/embedder:embedder_as_internal_library" ]
 }
@@ -171,17 +172,16 @@ test_fixtures("flutter_ohos_fixtures") {
   fixtures = []
 }
 
-
 executable("flutter_ohos_unittests") {
   testonly = true
 
   sources = [
     #"testing/mock_texture_registrar.cc",
+    "ohos_asset_provider_unittests.cpp",
   ]
 
   public_configs = [ "//flutter:config" ]
 
-
   defines = [
     "FLUTTER_ENGINE_NO_PROTOTYPES",
 
@@ -197,41 +197,72 @@ executable("flutter_ohos_unittests") {
     "//flutter/shell/platform/embedder:embedder_headers",
     "//flutter/shell/platform/embedder:embedder_test_utils",
     "//flutter/testing",
+    "//flutter/third_party/googletest:gmock",
+    "//flutter/third_party/googletest:gtest",
   ]
+
+  ldflags = [
+    "--rtlib=compiler-rt",
+    "-fuse-ld=lld",
+    "-static-libstdc++",
+  ]
+
+  ldflags += [ "-lnative_window" ]
+  ldflags += [ "-lnative_vsync" ]
+  ldflags += [ "-lace_napi.z" ]
+  ldflags += [ "-lace_ndk.z" ]
+  ldflags += [ "-lhilog_ndk.z" ]
+  ldflags += [ "-luv" ]
+  ldflags += [ "-lrawfile.z" ]
+  ldflags += [ "-lEGL" ]
+  ldflags += [ "-lGLESv3" ]
+
+  ldflags += [ "-limage_ndk.z" ]
+  ldflags += [ "-lnative_image" ]
+
+  ldflags += [ "-lm" ]
+  ldflags += [ "-lpthread" ]
+  ldflags += [ "-lpixelmap_ndk.z" ]
+  ldflags += ["-lqos"]
+
 }
 
 shared_library("flutter_shell_native") {
   output_name = "flutter"
   deps = [ ":flutter_ohos_src" ]
 
-  ldflags = ["--rtlib=compiler-rt",
-  "-fuse-ld=lld",
-  "-static-libstdc++",
-#  "-Wl", "--build-id=sha1",
-#  "-Wl,","--warn-shared-textrel",
-#  "-Wl,","--fatal-warnings -lunwind",
-#  "-Wl,","--no-undefined -Qunused-arguments",
-#  "-Wl,","-z,noexecstack"
+  ldflags = [
+    "--rtlib=compiler-rt",
+    "-fuse-ld=lld",
+    "-static-libstdc++",
+
+    #  "-Wl", "--build-id=sha1",
+    #  "-Wl,","--warn-shared-textrel",
+    #  "-Wl,","--fatal-warnings -lunwind",
+    #  "-Wl,","--no-undefined -Qunused-arguments",
+    #  "-Wl,","-z,noexecstack"
   ]
 
   #ldflags = [ "-Wl,-rpath,\$ORIGIN" ]
   #ldflags += ["-L{$OHOS_NDK_LIB}","-lnative_window"]
-  ldflags += ["-lnative_window"]
-  ldflags += ["-lnative_vsync"]
-  ldflags += ["-lace_napi.z"]
-  ldflags += ["-lace_ndk.z"]
-  ldflags += ["-lhilog_ndk.z"]
-  ldflags += ["-luv"]
-  ldflags += ["-lrawfile.z"]
-  ldflags += ["-lEGL"]
-  ldflags += ["-lGLESv3"]
+  ldflags += [ "-lnative_window" ]
+  ldflags += [ "-lnative_vsync" ]
+  ldflags += [ "-lace_napi.z" ]
+  ldflags += [ "-lace_ndk.z" ]
+  ldflags += [ "-lhilog_ndk.z" ]
+  ldflags += [ "-luv" ]
+  ldflags += [ "-lrawfile.z" ]
+  ldflags += [ "-lEGL" ]
+  ldflags += [ "-lGLESv3" ]
+
   # ldflags += ["-lGLESv2"]
-  ldflags += ["-limage_ndk.z"]
-  ldflags += ["-lnative_image"]
+  ldflags += [ "-limage_ndk.z" ]
+  ldflags += [ "-lnative_image" ]
 
-  ldflags += ["-lm"]
-  ldflags += ["-lpthread"]
-  ldflags += ["-lpixelmap_ndk.z"]
+  ldflags += [ "-lm" ]
+  ldflags += [ "-lpthread" ]
+  ldflags += [ "-lpixelmap_ndk.z" ]
+  ldflags += ["-lqos"]
 
   public_configs = [ "//flutter:config" ]
 }
@@ -288,11 +319,11 @@ declare_args() {
   if (flutter_runtime_mode != "debug") {
     ohos_zip_archive_dir += "-$flutter_runtime_mode"
   }
-  ohos_api_int = 11
+  ohos_api_int = 12
 }
 
 action("ohos_har") {
-  script = "//build/ohos/ohos_create_flutter_har.py"
+  script = "//flutter/attachment/scripts/ohos_create_flutter_har.py"
 
   if (stripped_symbols) {
     engine_library = "libflutter.so"
@@ -324,12 +355,10 @@ action("ohos_har") {
     "--ohos_abi",
     ohos_app_abi,
     "--ohos_api_int",
-    ohos_api_int
+    "$ohos_api_int",
   ]
 
-  deps = [
-    ":flutter_shell_native"
-  ]
+  deps = [ ":flutter_shell_native" ]
 
   if (flutter_runtime_mode == "profile") {
     deps += [ "//flutter/shell/vmservice:vmservice_snapshot" ]
@@ -349,7 +378,7 @@ zip_bundle("flutter_har_zip") {
     {
       source = "$root_build_dir/flutter.har"
       destination = "flutter.har"
-    }
+    },
   ]
 
   deps = [ ":ohos_har" ]
diff --git a/shell/platform/ohos/context/ohos_context.cpp b/shell/platform/ohos/context/ohos_context.cpp
index e436459390a0f9e7a2af97d33822c1026cd5f056..cd2ea24def004779c5d4a5eccba67a03ecc96380 100644
--- a/shell/platform/ohos/context/ohos_context.cpp
+++ b/shell/platform/ohos/context/ohos_context.cpp
@@ -43,4 +43,13 @@ sk_sp<GrDirectContext> OHOSContext::GetMainSkiaContext() const {
   return main_context_;
 }
 
+std::shared_ptr<impeller::Context> OHOSContext::GetImpellerContext() const {
+  return impeller_context_;
+}
+
+void OHOSContext::SetImpellerContext(
+    const std::shared_ptr<impeller::Context>& context) {
+  impeller_context_ = context;
+}
+
 }  // namespace flutter
\ No newline at end of file
diff --git a/shell/platform/ohos/context/ohos_context.h b/shell/platform/ohos/context/ohos_context.h
index 84cdeb5820f055aab74deaaf36f7981878110468..5b8364adb9dfe427e99de9a6a797bc8e1519cbfc 100644
--- a/shell/platform/ohos/context/ohos_context.h
+++ b/shell/platform/ohos/context/ohos_context.h
@@ -13,20 +13,17 @@
  * limitations under the License.
  */
 
-#ifndef OHOS_CONTEXT_H
-#define OHOS_CONTEXT_H
+#ifndef FLUTTER_SHELL_PLATFORM_OHOS_CONTEXT_OHOS_CONTEXT_H_
+#define FLUTTER_SHELL_PLATFORM_OHOS_CONTEXT_OHOS_CONTEXT_H_
 
+#include "common/settings.h"
 #include "flutter/fml/macros.h"
 #include "flutter/fml/task_runner.h"
+#include "flutter/impeller/renderer/context.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
 
 namespace flutter {
 
-enum class OHOSRenderingAPI {
-  kSoftware,
-  kOpenGLES,
-};
-
 class OHOSContext {
  public:
   explicit OHOSContext(OHOSRenderingAPI rendering_api);
@@ -41,14 +38,27 @@ class OHOSContext {
 
   sk_sp<GrDirectContext> GetMainSkiaContext() const;
 
+  //----------------------------------------------------------------------------
+  /// @brief      Accessor for the Impeller context associated with
+  ///             AndroidSurfaces and the raster thread.
+  ///
+  std::shared_ptr<impeller::Context> GetImpellerContext() const;
+
+ protected:
+  /// Intended to be called from a subclass constructor after setup work for the
+  /// context has completed.
+  void SetImpellerContext(const std::shared_ptr<impeller::Context>& context);
+
  private:
   const OHOSRenderingAPI rendering_api_;
 
   // This is the Skia context used for on-screen rendering.
   sk_sp<GrDirectContext> main_context_;
 
+  std::shared_ptr<impeller::Context> impeller_context_;
+
   FML_DISALLOW_COPY_AND_ASSIGN(OHOSContext);
 };
 
 }  // namespace flutter
-#endif
\ No newline at end of file
+#endif  // FLUTTER_SHELL_PLATFORM_OHOS_CONTEXT_OHOS_CONTEXT_H_
diff --git a/shell/platform/ohos/flutter_embedding/build-profile.json5 b/shell/platform/ohos/flutter_embedding/build-profile.json5
index 2d2ee025698136d74f0a9ec4e9472bb263df8834..57fe0320239a6a463ce1870d9fab0d1f8fe8568b 100755
--- a/shell/platform/ohos/flutter_embedding/build-profile.json5
+++ b/shell/platform/ohos/flutter_embedding/build-profile.json5
@@ -20,8 +20,7 @@
       {
         "name": "default",
         "signingConfig": "default",
-        "compileSdkVersion": "4.1.0(11)",
-        "compatibleSdkVersion": "4.1.0(11)",
+        "compatibleSdkVersion": "5.0.0(12)",
         "runtimeOS": "HarmonyOS",
       }
     ],
diff --git a/shell/platform/ohos/flutter_embedding/dependencies/hvigor-4.3.0.tgz b/shell/platform/ohos/flutter_embedding/dependencies/hvigor-4.3.0.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..4331aad9655febd81e50650043a8c35768b37d99
Binary files /dev/null and b/shell/platform/ohos/flutter_embedding/dependencies/hvigor-4.3.0.tgz differ
diff --git a/shell/platform/ohos/flutter_embedding/dependencies/hvigor-ohos-plugin-4.3.0.tgz b/shell/platform/ohos/flutter_embedding/dependencies/hvigor-ohos-plugin-4.3.0.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..6fb89f742046445191bf6616c572f40c1793b12f
Binary files /dev/null and b/shell/platform/ohos/flutter_embedding/dependencies/hvigor-ohos-plugin-4.3.0.tgz differ
diff --git a/shell/platform/ohos/flutter_embedding/flutter/index.ets b/shell/platform/ohos/flutter_embedding/flutter/index.ets
index aacaefda7355dc9e70c48fd5d9182224aab71911..b29b7575e2f561465982266bf3037a526d776635 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/index.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/index.ets
@@ -13,214 +13,99 @@
 * limitations under the License.
 */
 
-import FlutterInjector from './src/main/ets/FlutterInjector';
-import FlutterPluginRegistry from './src/main/ets/app/FlutterPluginRegistry';
-import FlutterComponent from './src/main/ets/component/FlutterComponent';
-import FlutterEngine from './src/main/ets/embedding/engine/FlutterEngine';
-import FlutterEngineCache from './src/main/ets/embedding/engine/FlutterEngineCache';
-import FlutterEngineConnectionRegistry from './src/main/ets/embedding/engine/FlutterEngineConnectionRegistry';
-import FlutterEngineGroup from './src/main/ets/embedding/engine/FlutterEngineGroup';
-import FlutterEngineGroupCache from './src/main/ets/embedding/engine/FlutterEngineGroupCache';
-import FlutterNapi from './src/main/ets/embedding/engine/FlutterNapi';
-import { FlutterOverlaySurface } from './src/main/ets/embedding/engine/FlutterOverlaySurface';
-import FlutterShellArgs from './src/main/ets/embedding/engine/FlutterShellArgs';
-import DartExecutor from './src/main/ets/embedding/engine/dart/DartExecutor';
-import { DartMessenger } from './src/main/ets/embedding/engine/dart/DartMessenger';
-import { PlatformMessageHandler } from './src/main/ets/embedding/engine/dart/PlatformMessageHandler';
-import ApplicationInfoLoader from './src/main/ets/embedding/engine/loader/ApplicationInfoLoader';
-import FlutterApplicationInfo from './src/main/ets/embedding/engine/loader/FlutterApplicationInfo';
-import FlutterLoader from './src/main/ets/embedding/engine/loader/FlutterLoader';
-import { FlutterMutatorView } from './src/main/ets/embedding/engine/mutatorsstack/FlutterMutatorView';
-import { FlutterMutatorsStack } from './src/main/ets/embedding/engine/mutatorsstack/FlutterMutatorsStack';
-import { FlutterPlugin, FlutterPluginBinding, FlutterAssets } from './src/main/ets/embedding/engine/plugins/FlutterPlugin';
-import PluginRegistry from './src/main/ets/embedding/engine/plugins/PluginRegistry';
-import AbilityAware from './src/main/ets/embedding/engine/plugins/ability/AbilityAware';
-import AbilityControlSurface from './src/main/ets/embedding/engine/plugins/ability/AbilityControlSurface';
-import {
-  AbilityPluginBinding,
-  NewWantListener,
-  WindowFocusChangedListener,
-  OnSaveStateListener,
-} from './src/main/ets/embedding/engine/plugins/ability/AbilityPluginBinding';
-import { FlutterRenderer, SurfaceTextureRegistryEntry } from './src/main/ets/embedding/engine/renderer/FlutterRenderer';
-import { FlutterUiDisplayListener } from './src/main/ets/embedding/engine/renderer/FlutterUiDisplayListener';
-import { SurfaceTextureWrapper } from './src/main/ets/embedding/engine/renderer/SurfaceTextureWrapper'; 
-import AccessibilityChannel from './src/main/ets/embedding/engine/systemchannels/AccessibilityChannel';
-import KeyEventChannel from './src/main/ets/embedding/engine/systemchannels/KeyEventChannel';
-import LifecycleChannel from './src/main/ets/embedding/engine/systemchannels/LifecycleChannel';
-import LocalizationChannel from './src/main/ets/embedding/engine/systemchannels/LocalizationChannel';
-import MouseCursorChannel from './src/main/ets/embedding/engine/systemchannels/MouseCursorChannel';
-import NavigationChannel from './src/main/ets/embedding/engine/systemchannels/NavigationChannel';
-import PlatformChannel from './src/main/ets/embedding/engine/systemchannels/PlatformChannel';
-import PlatformViewsChannel from './src/main/ets/embedding/engine/systemchannels/PlatformViewsChannel';
-import RestorationChannel from './src/main/ets/embedding/engine/systemchannels/RestorationChannel';
-import SettingsChannel from './src/main/ets/embedding/engine/systemchannels/SettingsChannel';
-import SystemChannel from './src/main/ets/embedding/engine/systemchannels/SystemChannel';
-import TestChannel from './src/main/ets/embedding/engine/systemchannels/TestChannel';
-import TextInputChannel from './src/main/ets/embedding/engine/systemchannels/TextInputChannel';
-import ExclusiveAppComponent from './src/main/ets/embedding/ohos/ExclusiveAppComponent';
-import { FlutterAbility } from './src/main/ets/embedding/ohos/FlutterAbility';
-import { FlutterAbilityAndEntryDelegate, Host } from './src/main/ets/embedding/ohos/FlutterAbilityAndEntryDelegate';
-import FlutterAbilityLaunchConfigs from './src/main/ets/embedding/ohos/FlutterAbilityLaunchConfigs';
-import FlutterEngineConfigurator from './src/main/ets/embedding/ohos/FlutterEngineConfigurator';
-import FlutterEngineProvider from './src/main/ets/embedding/ohos/FlutterEngineProvider';
-import FlutterEntry from './src/main/ets/embedding/ohos/FlutterEntry';
-import FlutterManager from './src/main/ets/embedding/ohos/FlutterManager';
-import { FlutterPage } from './src/main/ets/embedding/ohos/FlutterPage';
-import KeyboardManager from './src/main/ets/embedding/ohos/KeyboardManager';
-import OhosTouchProcessor from './src/main/ets/embedding/ohos/OhosTouchProcessor';
-import Settings from './src/main/ets/embedding/ohos/Settings';
-import { TouchEventTracker } from './src/main/ets/embedding/ohos/TouchEventTracker';
-import WindowInfoRepositoryCallbackAdapterWrapper
-  from './src/main/ets/embedding/ohos/WindowInfoRepositoryCallbackAdapterWrapper';
-import PlatformPlugin from './src/main/ets/plugin/PlatformPlugin';
-import BasicMessageChannel from './src/main/ets/plugin/common/BasicMessageChannel';
-import BinaryCodec from './src/main/ets/plugin/common/BinaryCodec';
-import { BinaryMessenger } from './src/main/ets/plugin/common/BinaryMessenger';
-import EventChannel from './src/main/ets/plugin/common/EventChannel';
-import FlutterException from './src/main/ets/plugin/common/FlutterException';
-import JSONMessageCodec from './src/main/ets/plugin/common/JSONMessageCodec';
-import JSONMethodCodec from './src/main/ets/plugin/common/JSONMethodCodec';
-import MessageCodec from './src/main/ets/plugin/common/MessageCodec';
-import MethodCall from './src/main/ets/plugin/common/MethodCall';
-import MethodChannel, { MethodCallHandler, MethodResult } from './src/main/ets/plugin/common/MethodChannel';
-import MethodCodec from './src/main/ets/plugin/common/MethodCodec';
-import StandardMessageCodec from './src/main/ets/plugin/common/StandardMessageCodec';
-import StandardMethodCodec from './src/main/ets/plugin/common/StandardMethodCodec';
-import StringCodec from './src/main/ets/plugin/common/StringCodec';
-import { ListenableEditingState } from './src/main/ets/plugin/editing/ListenableEditingState';
-import { TextEditingDelta } from './src/main/ets/plugin/editing/TextEditingDelta';
-import TextInputPlugin from './src/main/ets/plugin/editing/TextInputPlugin';
-import LocalizationPlugin from './src/main/ets/plugin/localization/LocalizationPlugin';
-import MouseCursorPlugin from './src/main/ets/plugin/mouse/MouseCursorPlugin';
-import { AccessibilityEventsDelegate } from './src/main/ets/plugin/platform/AccessibilityEventsDelegate';
-import { PlatformOverlayView } from './src/main/ets/plugin/platform/PlatformOverlayView';
-import PlatformView from './src/main/ets/plugin/platform/PlatformView';
-import PlatformViewFactory from './src/main/ets/plugin/platform/PlatformViewFactory';
-import PlatformViewRegistry from './src/main/ets/plugin/platform/PlatformViewRegistry';
-import PlatformViewRegistryImpl from './src/main/ets/plugin/platform/PlatformViewRegistryImpl';
-import { PlatformViewWrapper } from './src/main/ets/plugin/platform/PlatformViewWrapper';
-import { PlatformViewsAccessibilityDelegate } from './src/main/ets/plugin/platform/PlatformViewsAccessibilityDelegate';
-import PlatformViewsController from './src/main/ets/plugin/platform/PlatformViewsController';
-import AccessibilityBridge from './src/main/ets/view/AccessibilityBridge';
-import { FlutterCallbackInformation } from './src/main/ets/view/FlutterCallbackInformation';
-import FlutterRunArguments from './src/main/ets/view/FlutterRunArguments';
-import { FirstFrameListener, FlutterView } from './src/main/ets/view/FlutterView';
-import { TextureRegistry } from './src/main/ets/view/TextureRegistry';
-import { ByteBuffer } from './src/main/ets/util/ByteBuffer';
-import Log from './src/main/ets/util/Log';
-import MessageChannelUtils from './src/main/ets/util/MessageChannelUtils';
-import PathUtils from './src/main/ets/util/PathUtils';
-import StringUtils from './src/main/ets/util/StringUtils';
-import ToolUtils from './src/main/ets/util/ToolUtils';
-import { TraceSection } from './src/main/ets/util/TraceSection';
-import Any from './src/main/ets/plugin/common/Any';
-
-export {
-  FlutterInjector,
-  FlutterPluginRegistry,
-  FlutterComponent,
-  FlutterEngine,
-  FlutterEngineCache,
-  FlutterEngineConnectionRegistry,
-  FlutterEngineGroup,
-  FlutterEngineGroupCache,
-  FlutterNapi,
-  FlutterOverlaySurface,
-  FlutterShellArgs,
-  DartExecutor,
-  DartMessenger,
-  PlatformMessageHandler,
-  ApplicationInfoLoader,
-  FlutterApplicationInfo,
-  FlutterLoader,
-  FlutterMutatorView,
-  FlutterMutatorsStack,
-  FlutterPlugin,
-  FlutterPluginBinding,
-  FlutterAssets,
-  PluginRegistry,
-  AbilityAware,
-  AbilityControlSurface,
-  AbilityPluginBinding,
-  NewWantListener,
-  WindowFocusChangedListener,
-  OnSaveStateListener,
-  FlutterRenderer,
-  SurfaceTextureRegistryEntry,
-  FlutterUiDisplayListener,
-  SurfaceTextureWrapper,
-  AccessibilityChannel,
-  KeyEventChannel,
-  LifecycleChannel,
-  LocalizationChannel,
-  MouseCursorChannel,
-  NavigationChannel,
-  PlatformChannel,
-  PlatformViewsChannel,
-  RestorationChannel,
-  SettingsChannel,
-  SystemChannel,
-  TestChannel,
-  TextInputChannel,
-  ExclusiveAppComponent,
-  FlutterAbility,
-  FlutterAbilityAndEntryDelegate,
-  Host,
-  FlutterAbilityLaunchConfigs,
-  FlutterEngineConfigurator,
-  FlutterEngineProvider,
-  FlutterEntry,
-  FlutterManager,
-  FlutterPage,
-  KeyboardManager,
-  OhosTouchProcessor,
-  Settings,
-  TouchEventTracker,
-  WindowInfoRepositoryCallbackAdapterWrapper,
-  PlatformPlugin,
-  BasicMessageChannel,
-  BinaryCodec,
-  BinaryMessenger,
-  EventChannel,
-  FlutterException,
-  JSONMessageCodec,
-  JSONMethodCodec,
-  MessageCodec,
-  MethodCall,
-  MethodCallHandler,
-  MethodChannel,
-  MethodResult,
-  MethodCodec,
-  StandardMessageCodec,
-  StandardMethodCodec,
-  StringCodec,
-  ListenableEditingState,
-  TextEditingDelta,
-  TextInputPlugin,
-  LocalizationPlugin,
-  MouseCursorPlugin,
-  AccessibilityEventsDelegate,
-  PlatformOverlayView,
-  PlatformView,
-  PlatformViewFactory,
-  PlatformViewRegistry,
-  PlatformViewRegistryImpl,
-  PlatformViewWrapper,
-  PlatformViewsAccessibilityDelegate,
-  PlatformViewsController,
-  AccessibilityBridge,
-  FlutterCallbackInformation,
-  FlutterRunArguments,
-  FlutterView,
-  TextureRegistry,
-  ByteBuffer,
-  Log,
-  MessageChannelUtils,
-  PathUtils,
-  StringUtils,
-  ToolUtils,
-  TraceSection,
-  Any,
-  FirstFrameListener,
-}
+export { default as FlutterInjector } from './src/main/ets/FlutterInjector';
+export { default as FlutterPluginRegistry } from './src/main/ets/app/FlutterPluginRegistry';
+export { default as FlutterComponent } from './src/main/ets/component/FlutterComponent';
+export { default as FlutterEngine } from './src/main/ets/embedding/engine/FlutterEngine';
+export { default as FlutterEngineCache } from './src/main/ets/embedding/engine/FlutterEngineCache';
+export { default as FlutterEngineConnectionRegistry } from './src/main/ets/embedding/engine/FlutterEngineConnectionRegistry';
+export { default as FlutterEngineGroup } from './src/main/ets/embedding/engine/FlutterEngineGroup';
+export { default as FlutterEngineGroupCache } from './src/main/ets/embedding/engine/FlutterEngineGroupCache';
+export { default as FlutterNapi } from './src/main/ets/embedding/engine/FlutterNapi';
+export * from './src/main/ets/embedding/engine/FlutterOverlaySurface';
+export { default as FlutterShellArgs } from './src/main/ets/embedding/engine/FlutterShellArgs';
+export { default as DartExecutor } from './src/main/ets/embedding/engine/dart/DartExecutor';
+export * from './src/main/ets/embedding/engine/dart/DartMessenger';
+export * from './src/main/ets/embedding/engine/dart/PlatformMessageHandler';
+export { default as ApplicationInfoLoader } from './src/main/ets/embedding/engine/loader/ApplicationInfoLoader';
+export { default as FlutterApplicationInfo } from './src/main/ets/embedding/engine/loader/FlutterApplicationInfo';
+export { default as FlutterLoader } from './src/main/ets/embedding/engine/loader/FlutterLoader';
+export * from './src/main/ets/embedding/engine/mutatorsstack/FlutterMutatorView';
+export * from './src/main/ets/embedding/engine/mutatorsstack/FlutterMutatorsStack';
+export * from './src/main/ets/embedding/engine/plugins/FlutterPlugin';
+export { default as PluginRegistry } from './src/main/ets/embedding/engine/plugins/PluginRegistry';
+export { default as AbilityAware } from './src/main/ets/embedding/engine/plugins/ability/AbilityAware';
+export { default as AbilityControlSurface } from './src/main/ets/embedding/engine/plugins/ability/AbilityControlSurface';
+export * from './src/main/ets/embedding/engine/plugins/ability/AbilityPluginBinding';
+export * from './src/main/ets/embedding/engine/renderer/FlutterRenderer';
+export * from './src/main/ets/embedding/engine/renderer/FlutterUiDisplayListener';
+export { default as AccessibilityChannel } from './src/main/ets/embedding/engine/systemchannels/AccessibilityChannel';
+export { default as KeyEventChannel } from './src/main/ets/embedding/engine/systemchannels/KeyEventChannel';
+export { default as LifecycleChannel } from './src/main/ets/embedding/engine/systemchannels/LifecycleChannel';
+export { default as LocalizationChannel } from './src/main/ets/embedding/engine/systemchannels/LocalizationChannel';
+export { default as MouseCursorChannel } from './src/main/ets/embedding/engine/systemchannels/MouseCursorChannel';
+export { default as NavigationChannel } from './src/main/ets/embedding/engine/systemchannels/NavigationChannel';
+export { default as PlatformChannel } from './src/main/ets/embedding/engine/systemchannels/PlatformChannel';
+export { default as PlatformViewsChannel } from './src/main/ets/embedding/engine/systemchannels/PlatformViewsChannel';
+export { default as RestorationChannel } from './src/main/ets/embedding/engine/systemchannels/RestorationChannel';
+export { default as SettingsChannel } from './src/main/ets/embedding/engine/systemchannels/SettingsChannel';
+export { default as SystemChannel } from './src/main/ets/embedding/engine/systemchannels/SystemChannel';
+export { default as TestChannel } from './src/main/ets/embedding/engine/systemchannels/TestChannel';
+export { default as TextInputChannel } from './src/main/ets/embedding/engine/systemchannels/TextInputChannel';
+export { default as ExclusiveAppComponent } from './src/main/ets/embedding/ohos/ExclusiveAppComponent';
+export * from './src/main/ets/embedding/ohos/FlutterAbility';
+export * from './src/main/ets/embedding/ohos/FlutterAbilityAndEntryDelegate';
+export { default as FlutterAbilityLaunchConfigs } from './src/main/ets/embedding/ohos/FlutterAbilityLaunchConfigs';
+export { default as FlutterEngineConfigurator } from './src/main/ets/embedding/ohos/FlutterEngineConfigurator';
+export { default as FlutterEngineProvider } from './src/main/ets/embedding/ohos/FlutterEngineProvider';
+export { default as FlutterEntry } from './src/main/ets/embedding/ohos/FlutterEntry';
+export { default as FlutterManager } from './src/main/ets/embedding/ohos/FlutterManager';
+export * from './src/main/ets/embedding/ohos/FlutterPage';
+export { default as KeyboardManager } from './src/main/ets/embedding/ohos/KeyboardManager';
+export { default as OhosTouchProcessor } from './src/main/ets/embedding/ohos/OhosTouchProcessor';
+export { default as Settings } from './src/main/ets/embedding/ohos/Settings';
+export * from './src/main/ets/embedding/ohos/TouchEventTracker';
+export { default as WindowInfoRepositoryCallbackAdapterWrapper } from './src/main/ets/embedding/ohos/WindowInfoRepositoryCallbackAdapterWrapper';
+export { default as PlatformPlugin } from './src/main/ets/plugin/PlatformPlugin';
+export { default as BasicMessageChannel } from './src/main/ets/plugin/common/BasicMessageChannel';
+export { default as BinaryCodec } from './src/main/ets/plugin/common/BinaryCodec';
+export * from './src/main/ets/plugin/common/BinaryMessenger';
+export { default as EventChannel } from './src/main/ets/plugin/common/EventChannel';
+export { default as FlutterException } from './src/main/ets/plugin/common/FlutterException';
+export { default as JSONMessageCodec } from './src/main/ets/plugin/common/JSONMessageCodec';
+export { default as JSONMethodCodec } from './src/main/ets/plugin/common/JSONMethodCodec';
+export { default as MessageCodec } from './src/main/ets/plugin/common/MessageCodec';
+export { default as MethodCall } from './src/main/ets/plugin/common/MethodCall';
+export * from './src/main/ets/plugin/common/MethodChannel';
+export { default as MethodChannel } from './src/main/ets/plugin/common/MethodChannel';
+export { default as MethodCodec } from './src/main/ets/plugin/common/MethodCodec';
+export { default as StandardMessageCodec } from './src/main/ets/plugin/common/StandardMessageCodec';
+export { default as StandardMethodCodec } from './src/main/ets/plugin/common/StandardMethodCodec';
+export { default as StringCodec } from './src/main/ets/plugin/common/StringCodec';
+export * from './src/main/ets/plugin/editing/ListenableEditingState';
+export * from './src/main/ets/plugin/editing/TextEditingDelta';
+export { default as TextInputPlugin } from './src/main/ets/plugin/editing/TextInputPlugin';
+export { default as LocalizationPlugin } from './src/main/ets/plugin/localization/LocalizationPlugin';
+export { default as MouseCursorPlugin } from './src/main/ets/plugin/mouse/MouseCursorPlugin';
+export * from './src/main/ets/plugin/platform/AccessibilityEventsDelegate';
+export * from './src/main/ets/plugin/platform/PlatformOverlayView';
+export { default as PlatformView } from './src/main/ets/plugin/platform/PlatformView';
+export { default as PlatformViewFactory } from './src/main/ets/plugin/platform/PlatformViewFactory';
+export { default as PlatformViewRegistry } from './src/main/ets/plugin/platform/PlatformViewRegistry';
+export { default as PlatformViewRegistryImpl } from './src/main/ets/plugin/platform/PlatformViewRegistryImpl';
+export * from './src/main/ets/plugin/platform/PlatformViewWrapper';
+export * from './src/main/ets/plugin/platform/PlatformViewsAccessibilityDelegate';
+export { default as PlatformViewsController } from './src/main/ets/plugin/platform/PlatformViewsController';
+export { default as AccessibilityBridge } from './src/main/ets/view/AccessibilityBridge';
+export * from './src/main/ets/view/FlutterCallbackInformation';
+export { default as FlutterRunArguments } from './src/main/ets/view/FlutterRunArguments';
+export * from './src/main/ets/view/FlutterView';
+export * from './src/main/ets/view/TextureRegistry';
+export * from './src/main/ets/util/ByteBuffer';
+export { default as Log } from './src/main/ets/util/Log';
+export { default as MessageChannelUtils } from './src/main/ets/util/MessageChannelUtils';
+export { default as PathUtils } from './src/main/ets/util/PathUtils';
+export { default as StringUtils } from './src/main/ets/util/StringUtils';
+export { default as ToolUtils } from './src/main/ets/util/ToolUtils';
+export * from './src/main/ets/util/TraceSection';
+export { default as Any } from './src/main/ets/plugin/common/Any';
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/cpp/types/libflutter/index.d.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/cpp/types/libflutter/index.d.ets
index 6cb09bd9f02b4c6798e4778451f57c48ec925b0d..45fb5ff7d23f06e0cd68734758ee11e2457d068e 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/cpp/types/libflutter/index.d.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/cpp/types/libflutter/index.d.ets
@@ -33,6 +33,15 @@ export const nativeUpdateRefreshRate: (
   ate: number
 ) => void;
 
+export const nativeUpdateSize: (
+  width: number,
+  height: number
+) => void;
+
+export const nativeUpdateDensity: (
+  densityPixels: number
+) => void;
+
 /**
  * 初始化dart vm和flutter engine
  */
@@ -42,7 +51,8 @@ export const nativeInit: (
   bundlePath: string,
   appStoragePath: string,
   engineCachesPath: string,
-  initTimeMillis: number
+  initTimeMillis: number,
+  productModel: string
 ) => void;
 
 export const nativeAttach: (napi: FlutterNapi) => number;
@@ -89,9 +99,9 @@ export const nativeImageDecodeCallback: (width: number, height: number, imageGen
 
 export const nativeGetSystemLanguages: (nativeShellHolderId: number, languages: Array<string>) => void;
 
-export const nativeXComponentAttachFlutterEngine: (xcomponentId: number, nativeShellHolderId: number) => void;
+export const nativeXComponentAttachFlutterEngine: (xcomponentId: string, nativeShellHolderId: number) => void;
 
-export const nativeXComponentDetachFlutterEngine: (xcomponentId: number, nativeShellHolderId: number) => void;
+export const nativeXComponentDetachFlutterEngine: (xcomponentId: string, nativeShellHolderId: number) => void;
 
 /**
  * Detaches flutterNapi和engine之间的关联
@@ -101,7 +111,6 @@ export const nativeDestroy: (
   nativeShellHolderId: number
 ) => void;
 
-export const nativeInitNativeImage: (nativeShellHolderId: number, textureId: number, aImage: image.Image) => void;
 
 export const nativeUnregisterTexture: (nativeShellHolderId: number, textureId: number) => void;
 
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/cpp/types/libflutter/index_actual.d.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/cpp/types/libflutter/index_actual.d.ets
index d3f5c0a65d28cebdd24c8c79f062c64e0d490e65..ddace4c3eb55edca6f8fa0a46172eca8663c8ff8 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/cpp/types/libflutter/index_actual.d.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/cpp/types/libflutter/index_actual.d.ets
@@ -25,6 +25,15 @@ export const nativeUpdateRefreshRate: (
   ate: number
 ) => void;
 
+export const nativeUpdateSize: (
+  width: number,
+  height: number
+) => void;
+
+export const nativeUpdateDensity: (
+  densityPixels: number
+) => void;
+
 /**
  * 初始化dart vm和flutter engine
  */
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/FlutterEngine.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/FlutterEngine.ets
index f6950fde1e1386b9d9f89607ea1c8f1cfa0e8e44..ad6757c2fb6fa3479154e8869ac17753087389ae 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/FlutterEngine.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/FlutterEngine.ets
@@ -102,7 +102,7 @@ export default class FlutterEngine implements EngineLifecycleListener{
       platformViewsController = new PlatformViewsController();
     }
     this.platformViewsController = platformViewsController;
-    this.platformViewsController.attach(context, null, this.dartExecutor);
+    this.platformViewsController.attach(context, this.renderer, this.dartExecutor);
   }
 
   async init(context: common.Context, dartVmArgs: Array<string> | null, waitForRestorationData: boolean) {
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/FlutterEngineConnectionRegistry.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/FlutterEngineConnectionRegistry.ets
index ca424fc894cc3241269a88044e87c805ec257195..b864a5b3fa64102f84526247b05076e2640c8312 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/FlutterEngineConnectionRegistry.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/FlutterEngineConnectionRegistry.ets
@@ -149,7 +149,11 @@ export default class FlutterEngineConnectionRegistry implements PluginRegistry,
 
   detachFromAbility(): void {
     if (this.isAttachedToAbility()) {
-      this.abilityAwarePlugins.forEach(abilityAware => abilityAware.onDetachedFromAbility())
+      try {
+        this.abilityAwarePlugins.forEach(abilityAware => abilityAware.onDetachedFromAbility())
+      } catch (e) {
+        Log.e(TAG, "abilityAwarePlugins DetachedFromAbility failed, msg:" + e);
+      }
       this.detachFromAbilityInternal();
     } else {
       Log.e(TAG, "Attempted to detach plugins from an Ability when no Ability was attached.");
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/FlutterNapi.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/FlutterNapi.ets
index 428859ce4776efd9e9f0bc163864213de8ff0f86..ccf8f5c4f5f784ae1b6d3051b54b874c18e98bdd 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/FlutterNapi.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/FlutterNapi.ets
@@ -27,6 +27,7 @@ import LocalizationPlugin from '../../plugin/localization/LocalizationPlugin';
 import i18n from '@ohos.i18n';
 import Any from '../../plugin/common/Any';
 import FlutterManager from '../ohos/FlutterManager';
+import deviceInfo from '@ohos.deviceInfo';
 
 const TAG = "FlutterNapi";
 
@@ -59,6 +60,14 @@ export default class FlutterNapi {
     flutter.nativeUpdateRefreshRate(refreshRateFPS);
   }
 
+  updateSize(width : number, height : number) {
+    flutter.nativeUpdateSize(width, height);
+  }
+
+  updateDensity(densityPixels : number) {
+    flutter.nativeUpdateDensity(densityPixels);
+  }
+
   init(context: common.Context,
        args: Array<string>,
        bundlePath: string,
@@ -70,7 +79,7 @@ export default class FlutterNapi {
     }
     this.hasInit = true;
     Log.w(TAG, "init: bundlePath=" + bundlePath + "  appStoragePath=" + appStoragePath + "  engineCachesPath=" + engineCachesPath + "  args=" + JSON.stringify(args));
-    flutter.nativeInit(context, args, bundlePath, appStoragePath, engineCachesPath, initTimeMillis);
+    flutter.nativeInit(context, args, bundlePath, appStoragePath, engineCachesPath, initTimeMillis, deviceInfo.productModel);
   }
 
   attachToNative(): void {
@@ -275,22 +284,26 @@ export default class FlutterNapi {
   }
 
   decodeImage(buffer: ArrayBuffer, imageGeneratorAddress: number): void {
-    Log.d(TAG, "called decodeImage=" + buffer.byteLength)
-    const imageSourceApi = image.createImageSource(buffer);
-    let tempPixelMap: image.PixelMap | null = null;
-    imageSourceApi.createPixelMap({
-      desiredPixelFormat: image.PixelMapFormat.RGBA_8888
-    }).then(pixelMap => {
-      Log.d(TAG, "called createPixelMap end " + pixelMap.getPixelBytesNumber())
-      tempPixelMap = pixelMap
-      return pixelMap.getImageInfo()
-    }).then(imageInfo => {
-      Log.d(TAG, `nativeImageHeaderCallback width=${imageInfo.size.width}  height=${imageInfo.size.height} imageGeneratorAddress=${imageGeneratorAddress}`)
-      flutter.nativeImageDecodeCallback(imageInfo.size.width, imageInfo.size.height, imageGeneratorAddress, tempPixelMap)
-    }).catch((error: Any) => {
-      Log.d(TAG, "decodeImage error=" + JSON.stringify(error))
+    if (buffer) {
+      Log.d(TAG, "called decodeImage=" + buffer.byteLength)
+      const imageSourceApi = image.createImageSource(buffer);
+      let tempPixelMap: image.PixelMap | null = null;
+      imageSourceApi.createPixelMap({
+        desiredPixelFormat: image.PixelMapFormat.RGBA_8888
+      }).then(pixelMap => {
+        Log.d(TAG, "called createPixelMap end " + pixelMap.getPixelBytesNumber())
+        tempPixelMap = pixelMap
+        return pixelMap.getImageInfo()
+      }).then(imageInfo => {
+        Log.d(TAG, `nativeImageHeaderCallback width=${imageInfo.size.width}  height=${imageInfo.size.height} imageGeneratorAddress=${imageGeneratorAddress}`)
+        flutter.nativeImageDecodeCallback(imageInfo.size.width, imageInfo.size.height, imageGeneratorAddress, tempPixelMap)
+      }).catch((error: Any) => {
+        Log.d(TAG, "decodeImage error=" + JSON.stringify(error))
+        flutter.nativeImageDecodeCallback(0, 0, imageGeneratorAddress, null);
+      })
+    } else {
       flutter.nativeImageDecodeCallback(0, 0, imageGeneratorAddress, null);
-    })
+    }
   }
 
   setSemanticsEnabled(enabled: boolean, responseId: number): void {
@@ -366,7 +379,7 @@ export default class FlutterNapi {
    * xcomponet绑定flutterEngine
    * @param xcomponentId
    */
-  xComponentAttachFlutterEngine(xcomponentId: number) {
+  xComponentAttachFlutterEngine(xcomponentId: string) {
     flutter.nativeXComponentAttachFlutterEngine(xcomponentId, this.nativeShellHolderId!);
   }
 
@@ -374,7 +387,7 @@ export default class FlutterNapi {
    * xcomponet解除绑定flutterEngine
    * @param xcomponentId
    */
-  xComponentDetachFlutterEngine(xcomponentId: number) {
+  xComponentDetachFlutterEngine(xcomponentId: string) {
     flutter.nativeXComponentDetachFlutterEngine(xcomponentId, this.nativeShellHolderId!);
   }
 
@@ -382,10 +395,6 @@ export default class FlutterNapi {
     flutter.nativeDestroy(this.nativeShellHolderId!!);
   }
 
-  initNativeImage(textureId: number, aImage: image.Image) {
-    Log.d(TAG, "called initNativeImage ");
-    flutter.nativeInitNativeImage(this.nativeShellHolderId!, textureId, aImage);
-  }
 
   unregisterTexture(textureId: number): void {
     Log.d(TAG, "called unregisterTexture ");
@@ -398,7 +407,7 @@ export default class FlutterNapi {
   }
 
   registerTexture(textureId: number): number {
-    Log.d(TAG, "called unregisterTexture ");
+    Log.d(TAG, "called registerTexture ");
     return flutter.nativeRegisterTexture(this.nativeShellHolderId!, textureId);
   }
 }
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/renderer/FlutterRenderer.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/renderer/FlutterRenderer.ets
index f1624aaa4d9ef4b4cbcee420e3d0d6645ad4365a..88742c9693f3f4404daaeae10daa78061f5f7e77 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/renderer/FlutterRenderer.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/renderer/FlutterRenderer.ets
@@ -18,7 +18,6 @@ import { BusinessError } from '@ohos.base';
 import { SurfaceTextureEntry, TextureRegistry } from '../../../view/TextureRegistry';
 import { FlutterAbility } from '../../ohos/FlutterAbility';
 import FlutterNapi from '../FlutterNapi';
-import { SurfaceTextureWrapper } from './SurfaceTextureWrapper';
 import Log from '../../../util/Log';
 
 const TAG = "FlutterRenderer"
@@ -29,10 +28,6 @@ export class FlutterRenderer implements TextureRegistry {
   constructor(flutterNapi: FlutterNapi) {
     this.flutterNapi = flutterNapi;
   }
-  createSurfaceTexture(): SurfaceTextureEntry {
-    let receiver: image.ImageReceiver = this.getImageReceiver();
-    return this.registerSurfaceTexture(receiver);
-  }
 
   getTextureId(): number {
     this.nextTextureId = this.nextTextureId + 1;
@@ -48,13 +43,6 @@ export class FlutterRenderer implements TextureRegistry {
     return surfaceTextureRegistryEntry;
   }
 
-  registerSurfaceTexture(receiver: image.ImageReceiver): SurfaceTextureEntry {
-    this.nextTextureId = this.nextTextureId + 1;
-    let surfaceTextureRegistryEntry = new SurfaceTextureRegistryEntry(this.nextTextureId);
-    surfaceTextureRegistryEntry.setImageReceiver(receiver);
-    this.registerImage(surfaceTextureRegistryEntry.getTextureId(), surfaceTextureRegistryEntry.textureWrapper());
-    return surfaceTextureRegistryEntry;
-  }
 
   registerPixelMap(pixelMap: PixelMap): number {
     this.nextTextureId = this.nextTextureId + 1;
@@ -68,55 +56,17 @@ export class FlutterRenderer implements TextureRegistry {
   onTrimMemory(level: number) {
     throw new Error('Method not implemented.');
   }
-
-  private getImageReceiver(): image.ImageReceiver {
-    let receiver: image.ImageReceiver = image.createImageReceiver(640, 480, 4, 8);
-    if (receiver !== undefined) {
-      console.info('[camera test] ImageReceiver is ok');
-    } else {
-      console.info('[camera test] ImageReceiver is not ok');
-    }
-    return receiver;
-  }
-  private registerImage(textureId: number, surfaceTextureWrapper: SurfaceTextureWrapper): void {
-    let receiver = surfaceTextureWrapper.getImageReceiver();
-    receiver.on('imageArrival', () => {
-      receiver.readNextImage((err: BusinessError, nextImage: image.Image) => {
-        if (err || nextImage === undefined) {
-          return;
-        }
-        this.flutterNapi.initNativeImage(textureId, nextImage);
-        console.log("[camera test] format: " + nextImage.format);
-        nextImage.release((err : BusinessError) =>{
-          if (err != undefined) {
-            console.log('Failed to release the image source instance.');
-          } else {
-            console.log('Succeeded in releasing the image source instance.');
-          }
-        });
-      })
-    })
-  }
 }
 
 export class SurfaceTextureRegistryEntry implements SurfaceTextureEntry {
   private textureId: number = 0;
   private surfaceId: number = 0;
-  private surfaceTextureWrapper: SurfaceTextureWrapper | null = null;
   private released: boolean = false;
 
   constructor(id: number) {
     this.textureId = id;
   }
 
-  getImageReceiver(): image.ImageReceiver {
-    return this.surfaceTextureWrapper!.getImageReceiver();
-  }
-
-  setImageReceiver(receiver: image.ImageReceiver): void {
-    this.surfaceTextureWrapper = new SurfaceTextureWrapper(receiver);
-  }
-
   getTextureId(): number {
     return this.textureId;
   }
@@ -129,9 +79,6 @@ export class SurfaceTextureRegistryEntry implements SurfaceTextureEntry {
     this.surfaceId = surfaceId;
   }
 
-  textureWrapper(): SurfaceTextureWrapper {
-    return this.surfaceTextureWrapper!;
-  }
   release() {
     throw new Error('Method not implemented.');
   }
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/LocalizationChannel.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/LocalizationChannel.ets
index 4834b04653d84ccdb9a84076c4bd2e1fcba96752..f8d8d27c935626c1e6962720fbc825a884e88a0d 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/LocalizationChannel.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/LocalizationChannel.ets
@@ -62,7 +62,15 @@ export default class LocalizationChannel implements MethodCallHandler{
   }
 
   sendLocales(locales: Array<string>): void {
-    this.channel.invokeMethod("setLocale", locales);
+    let data: Array<string> = [];
+    for (let i = 0 ; i < locales.length ; i++) {
+      let locale = new intl.Locale(locales[i]);
+      data.push(locale.language);
+      data.push(locale.region);
+      data.push(locale.script);
+      data.push(''); // locale.getVariant locale的一种变体
+    }
+    this.channel.invokeMethod("setLocale", data);
   }
 }
 
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/PlatformChannel.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/PlatformChannel.ets
index 3cde964f7c085eaf20d35897bc65932bf1b13c3a..4962397bb91da81aad8d411c8b19257696884292 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/PlatformChannel.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/PlatformChannel.ets
@@ -76,7 +76,7 @@ export default class PlatformChannel {
       case 0x01:
         return window.Orientation.PORTRAIT;
       case 0x02:
-        return window.Orientation.LANDSCAPE;
+        return window.Orientation.LANDSCAPE_INVERTED;
       case 0x03:
       case 0x04:
         return window.Orientation.PORTRAIT_INVERTED;
@@ -85,7 +85,7 @@ export default class PlatformChannel {
       case 0x06:
       case 0x07:
       case 0x08:
-        return window.Orientation.LANDSCAPE_INVERTED;
+        return window.Orientation.LANDSCAPE;
       case 0x09:
       case 0x0a:
         return window.Orientation.AUTO_ROTATION_LANDSCAPE;
@@ -98,11 +98,11 @@ export default class PlatformChannel {
               case 0x01:
                 return bundleManager.DisplayOrientation.PORTRAIT;
               case 0x02:
-                return bundleManager.DisplayOrientation.LANDSCAPE;
+                return bundleManager.DisplayOrientation.LANDSCAPE_INVERTED;
               case 0x04:
                 return bundleManager.DisplayOrientation.PORTRAIT_INVERTED;
               case 0x08:
-                return bundleManager.DisplayOrientation.LANDSCAPE_INVERTED;
+                return bundleManager.DisplayOrientation.LANDSCAPE;
             }
       case 0x0f:
     }
@@ -189,7 +189,7 @@ export interface PlatformMessageHandler {
 
   vibrateHapticFeedback(feedbackType: HapticFeedbackType): void;
 
-  setPreferredOrientations(ohosOrientation: number): void;
+  setPreferredOrientations(ohosOrientation: number, result: MethodResult): void;
 
   setApplicationSwitcherDescription(description: AppSwitcherDescription): void;
 
@@ -205,9 +205,9 @@ export interface PlatformMessageHandler {
 
   popSystemNavigator(): void;
 
-  getClipboardData(format: ClipboardContentFormat): string;
+  getClipboardData(result: MethodResult): void;
 
-  setClipboardData(text: string): void;
+  setClipboardData(text: string, result: MethodResult): void;
 
   clipboardHasStrings(): boolean;
 }
@@ -314,15 +314,8 @@ class PlatformMethodCallback implements MethodCallHandler {
           break;
         case "SystemChrome.setPreferredOrientations":
           Log.d(PlatformMethodCallback.TAG, "setPreferredOrientations: " + JSON.stringify(args));
-          try {
-            let ohosOrientation = this.platform.decodeOrientations(args as string[]);
-            this.platform.platformMessageHandler.setPreferredOrientations(ohosOrientation);
-            result.success(null);
-          } catch (err) {
-            Log.e(PlatformMethodCallback.TAG, "setPreferredOrientations err:" + JSON.stringify(err));
-            result.error("error", JSON.stringify(err), null);
-          }
-
+          let ohosOrientation = this.platform.decodeOrientations(args as string[]);
+          this.platform.platformMessageHandler.setPreferredOrientations(ohosOrientation, result);
           break;
         case "SystemChrome.setApplicationSwitcherDescription":
           Log.d(PlatformMethodCallback.TAG, "setApplicationSwitcherDescription: " + JSON.stringify(args));
@@ -379,20 +372,11 @@ class PlatformMethodCallback implements MethodCallHandler {
           result.success(null);
           break;
         case "Clipboard.getData":
-          let pasteBoard = pasteboard.getSystemPasteboard();
-          pasteBoard.getData().then((pasteData) => {
-            let text = pasteData.getPrimaryText();
-            let response: Any = new Map().set("text", "");
-            response.text = text;
-            result.success(response);
-          }).catch((err: Any) => {
-            Log.e(PlatformMethodCallback.TAG, "Failed to get PasteData. Cause: " + JSON.stringify(err));
-          });
+          this.platform.platformMessageHandler.getClipboardData(result);
           break;
         case "Clipboard.setData":
-          let clipboardContent: string = args.text;
-          this.platform.platformMessageHandler.setClipboardData(clipboardContent);
-          result.success(null);
+          let clipboardContent: string = args.get('text');
+          this.platform.platformMessageHandler.setClipboardData(clipboardContent, result);
           break;
         case "Clipboard.hasStrings":
           let hasStrings: boolean = false;
@@ -400,7 +384,7 @@ class PlatformMethodCallback implements MethodCallHandler {
           let systemPasteboard = pasteboard.getSystemPasteboard();
           systemPasteboard.hasData().then((hasData) => {
             if (!hasData) {
-              response.value = hasData;
+              response.set("value", hasData);
               result.success(response);
             }
           }).catch((err: Any) => {
@@ -408,7 +392,7 @@ class PlatformMethodCallback implements MethodCallHandler {
           })
           systemPasteboard.getData().then((pasteData) => {
             hasStrings = pasteData.hasType(pasteboard.MIMETYPE_TEXT_PLAIN);
-            response.value = hasStrings;
+            response.set("value", hasStrings);
             result.success(response);
           }).catch((err: Any) => {
             Log.e(PlatformMethodCallback.TAG, "getData err: " + JSON.stringify(err));
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/PlatformViewsChannel.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/PlatformViewsChannel.ets
index 66531efde816b11f903d4d946dc697051d5f5c3a..0b602e31d8b92990082db1fd326c09496af0caa2 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/PlatformViewsChannel.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/PlatformViewsChannel.ets
@@ -307,7 +307,7 @@ export interface  PlatformViewsHandler {
    * The Flutter application would like to change the layout direction of an existing Android
    * {@code View}, i.e., platform view.
    */
-  setDirection(viewId: number, direction: number): void;
+  setDirection(viewId: number, direction: Direction): void;
 
   /** Clears the focus from the platform view with a give id if it is currently focused. */
   clearFocus(viewId: number): void;
@@ -355,7 +355,7 @@ export class PlatformViewCreationRequest {
   /**
    * The layout direction of the new platform view.
    */
-  public direction: number;
+  public direction: Direction;
   public displayMode: RequestedDisplayMode;
 
   /** Custom parameters that are unique to the desired platform view. */
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/TextInputChannel.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/TextInputChannel.ets
index fdbbe4745f042922db5aa0aea31aaf182cc1d820..f215947be41565a6b4a3cd13f6cad427c7b8124e 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/TextInputChannel.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/TextInputChannel.ets
@@ -252,6 +252,8 @@ export class Configuration {
         return inputMethod.EnterKeyType.NEXT
       case "TextInputAction.newline":
         return inputMethod.EnterKeyType.NONE
+      case "TextInputAction.done":
+        return inputMethod.EnterKeyType.DONE
       default:
       // Present default key if bad input type is given.
         return inputMethod.EnterKeyType.UNSPECIFIED
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/EmbeddingNodeController.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/EmbeddingNodeController.ets
new file mode 100644
index 0000000000000000000000000000000000000000..99019c3a82b0639cdcf132aac339df6e0581cead
--- /dev/null
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/EmbeddingNodeController.ets
@@ -0,0 +1,102 @@
+/*
+* Copyright (c) 2024 Hunan OpenValley Digital Industry Development Co., Ltd.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+import { BuilderNode, FrameNode, NodeController, NodeRenderType } from '@kit.ArkUI';
+import Any from '../../plugin/common/Any';
+import PlatformView, { Params } from '../../plugin/platform/PlatformView';
+import Log from '../../util/Log';
+import { DVModel, DVModelChildren, DynamicView } from '../../view/DynamicView/dynamicView';
+
+
+declare class nodeControllerParams {
+  surfaceId : string
+  type : string
+  renderType : NodeRenderType
+  embedId : string
+  width : number
+  height : number
+}
+
+const TAG = 'EmbeddingNodeController'
+export class EmbeddingNodeController extends NodeController {
+  private rootNode: BuilderNode<[Params]> | undefined | null = null;
+  private wrappedBuilder: WrappedBuilder<[Params]> | null = null;
+  private platformView: PlatformView | undefined = undefined;
+  private embedId : string = "";
+  private surfaceId : string = "";
+  private renderType :NodeRenderType = NodeRenderType.RENDER_TYPE_DISPLAY;
+  private direction: Direction = Direction.Auto;
+  private isDestroy : boolean = false;
+
+  setRenderOption(platformView: PlatformView, surfaceId: string, renderType: NodeRenderType, direction: Direction) {
+    if (platformView == undefined) {
+      Log.e(TAG, "platformView undefined");
+    } else {
+      this.wrappedBuilder = platformView.getView();
+    }
+    this.platformView = platformView;
+    this.surfaceId = surfaceId;
+    this.renderType = renderType;
+    this.direction = direction;
+  }
+
+  makeNode(uiContext: UIContext): FrameNode | null{
+    this.rootNode = new BuilderNode(uiContext, { surfaceId: this.surfaceId, type: this.renderType});
+    if (this.wrappedBuilder) {
+      this.rootNode.build(this.wrappedBuilder, {direction: this.direction, platformView: this.platformView});
+    }
+    return this.rootNode.getFrameNode();
+  }
+
+  setBuilderNode(rootNode: BuilderNode<Params[]> | null): void{
+    this.rootNode = rootNode;
+  }
+
+  getBuilderNode(): BuilderNode<[Params]> | undefined | null{
+    return this.rootNode;
+  }
+
+  updateNode(arg: Object): void {
+    this.rootNode?.update(arg);
+  }
+  getEmbedId() : string {
+    return this.embedId;
+  }
+
+  setDestroy(isDestroy : boolean) : void {
+    this.isDestroy = isDestroy;
+    if (this.isDestroy) {
+      this.rootNode = null;
+    }
+  }
+
+  postEvent(event: TouchEvent | undefined) : boolean {
+    if (event != undefined) {
+      let changedTouchLen = event.changedTouches.length;
+      for (let i = 0; i< changedTouchLen; i++) {
+        event.changedTouches[i].displayX = vp2px(event.changedTouches[i].displayX);
+        event.changedTouches[i].displayY = vp2px(event.changedTouches[i].displayY);
+        event.changedTouches[i].windowX = vp2px(event.changedTouches[i].windowX);
+        event.changedTouches[i].windowY = vp2px(event.changedTouches[i].windowY);
+        event.changedTouches[i].screenX = vp2px(event.changedTouches[i].screenX);
+        event.changedTouches[i].screenY = vp2px(event.changedTouches[i].screenY);
+        event.changedTouches[i].x = vp2px(event.changedTouches[i].x);
+        event.changedTouches[i].y = vp2px(event.changedTouches[i].y);
+      }
+      return this.rootNode?.postTouchEvent(event) as boolean
+    } else {
+      return false;
+    }
+  }
+}
\ No newline at end of file
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterAbility.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterAbility.ets
index 41cec5eb1f0d9d5963824878a2e47a878be16086..094657055fbf2e2c2104e757597ad5acf843f2b8 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterAbility.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterAbility.ets
@@ -36,6 +36,7 @@ import errorManager from '@ohos.app.ability.errorManager';
 import appRecovery from '@ohos.app.ability.appRecovery';
 import FlutterManager from './FlutterManager';
 import { FlutterView } from '../../view/FlutterView';
+import ApplicationInfoLoader from '../engine/loader/ApplicationInfoLoader';
 
 const TAG = "FlutterAbility";
 const EVENT_BACK_PRESS = 'EVENT_BACK_PRESS';
@@ -81,14 +82,11 @@ export class FlutterAbility extends UIAbility implements Host {
       this.delegate?.onCreate();
     }
 
-    if (this.stillAttachedForEvent("onWindowStageCreate")) {
-      this?.delegate?.onWindowStageCreate();
-    }
-
     console.log('MyAbility onCreate');
 
     this.context.eventHub.on(EVENT_BACK_PRESS, () => {
       this.delegate?.flutterEngine?.getNavigationChannel()?.popRoute();
+      this.delegate?.flutterEngine?.getPlatformViewsController()?.setBackNodeControllers();
     });
     let observer:errorManager.ErrorObserver = {
       onUnhandledException(errorMsg) {
@@ -127,6 +125,7 @@ export class FlutterAbility extends UIAbility implements Host {
    */
   onWindowStageCreate(windowStage: window.WindowStage) {
     FlutterManager.getInstance().pushWindowStage(this, windowStage);
+    this.delegate?.onWindowStageCreate();
     this.mainWindow = windowStage.getMainWindowSync();
     try {
       windowStage.on('windowStageEvent', (data) => {
@@ -361,6 +360,10 @@ export class FlutterAbility extends UIAbility implements Host {
       .setAlwaysUse24HourFormat(I18n.System.is24HourClock())
       .setPlatformBrightness(config.colorMode != ConfigurationConstant.ColorMode.COLOR_MODE_DARK
         ? PlatformBrightness.LIGHT : PlatformBrightness.DARK);
+
+    if (config.language != '') {
+      this.getFlutterEngine()?.getLocalizationPlugin()?.sendLocaleToFlutter();
+    }
   }
 
   getFlutterEngine(): FlutterEngine | null {
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterAbilityAndEntryDelegate.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterAbilityAndEntryDelegate.ets
index 0d0310a565296649a7f9b4d1c8d51efa9dbf80a5..0868bd774b6486b3fce31e489f75317f1fef5855 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterAbilityAndEntryDelegate.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterAbilityAndEntryDelegate.ets
@@ -35,7 +35,6 @@ import FlutterEngineGroup, { Options } from '../engine/FlutterEngineGroup';
 import FlutterNapi from '../engine/FlutterNapi';
 import { FlutterView } from '../../view/FlutterView';
 import FlutterManager from './FlutterManager';
-import router from '@ohos.router';
 import Any from '../../plugin/common/Any';
 
 const TAG = "FlutterAbilityDelegate";
@@ -97,11 +96,6 @@ class FlutterAbilityAndEntryDelegate implements ExclusiveAppComponent<UIAbility>
     this.host?.configureFlutterEngine(this.flutterEngine!!);
   }
 
-  popSystemNavigator(): boolean {
-    router.back();
-    return true;
-  }
-
   /**
    * 加载app.so资源或者snapshot
    */
@@ -328,6 +322,7 @@ class FlutterAbilityAndEntryDelegate implements ExclusiveAppComponent<UIAbility>
 
   onWindowStageCreate() {
     this.ensureAlive();
+    this.initWindow();
     this.doInitialFlutterViewRun();
     if (this.shouldDispatchAppLifecycleState()) {
       this.flutterEngine?.getLifecycleChannel()?.appIsResumed();
@@ -352,6 +347,7 @@ class FlutterAbilityAndEntryDelegate implements ExclusiveAppComponent<UIAbility>
   onForeground() {
     this.ensureAlive();
     if (this.shouldDispatchAppLifecycleState()) {
+      this.flutterEngine?.getLifecycleChannel()?.aWindowIsFocused();
       this.flutterEngine?.getLifecycleChannel()?.appIsResumed();
     }
   }
@@ -458,6 +454,12 @@ class FlutterAbilityAndEntryDelegate implements ExclusiveAppComponent<UIAbility>
   isFlutterEngineFromHost(): boolean {
     return this.isFlutterEngineFromHostOrCache;
   }
+
+  initWindow() {
+    if (this.flutterEngine && this.isAttached) {
+      this.platformPlugin?.initWindow()
+    }
+  }
 }
 
 
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterManager.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterManager.ets
index 43f42053b87b839be3ec8d765e3993e64bf7ee56..086d11979b5c04f8e1aaf48ec373c3130e935764 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterManager.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterManager.ets
@@ -80,8 +80,12 @@ export default class FlutterManager {
     }
   }
 
+  /**
+   * It's suggested to keep 'oh_flutter_' as the prefix for xcomponent_id.
+   * Otherwise it might affect the performance.
+   */
   createFlutterView(context: Context): FlutterView {
-    let flutterView = new FlutterView((this.flutterViewIndex++).toString(), context);
+    let flutterView = new FlutterView(`oh_flutter_${this.flutterViewIndex++}`, context);
     this.putFlutterView(flutterView.getId(), flutterView);
     return flutterView;
   }
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterPage.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterPage.ets
index c14e38b02f4775a4ddbdb417c88663fd5da83712..835f182b3396b317dccaf93e66e7452dfe247a74 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterPage.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterPage.ets
@@ -12,10 +12,10 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-import Any from '../../plugin/common/Any';
+
 import Log from '../../util/Log';
-import { DVModel, DVModelChildren, DynamicView } from '../../view/DynamicView/dynamicView';
 import { FlutterView } from '../../view/FlutterView';
+import { EmbeddingNodeController } from './EmbeddingNodeController';
 import FlutterManager from './FlutterManager';
 
 const TAG = "FlutterPage";
@@ -25,19 +25,21 @@ const TAG = "FlutterPage";
  */
 @Component
 export struct FlutterPage {
-  @State rootDvModel: DVModelChildren | undefined = undefined
   @Prop viewId: string = ""
-  @Prop xComponentType: XComponentType = XComponentType.TEXTURE
+  @Prop xComponentType: XComponentType = XComponentType.SURFACE
 
   @Builder doNothingBuilder() {}
   @BuilderParam splashScreenView: () => void = this.doNothingBuilder;
   @State showSplashScreen: boolean = true;
+  @StorageLink('nodeWidth') storageLinkWidth: number = 0;
+  @StorageLink('nodeHeight') storageLinkHeight: number = 0;
+  @StorageLink('nodeController') nodeController: EmbeddingNodeController = new EmbeddingNodeController;
 
   private flutterView?: FlutterView | null
+  private lastArea?: Area;
 
   aboutToAppear() {
     this.flutterView = FlutterManager.getInstance().getFlutterView(this.viewId);
-    this.rootDvModel = this.flutterView!!.getDVModel().children
     this.flutterView?.addFirstFrameListener(this)
   }
 
@@ -51,6 +53,16 @@ export struct FlutterPage {
 
   build() {
     Stack() {
+      NodeContainer(this.nodeController)
+        .width(this.storageLinkWidth)
+        .height(this.storageLinkHeight)
+
+      Text('')
+        .id('emptyFocusText' + this.viewId)
+        .size({ width: 0, height: 0 })
+        .opacity(0)
+        .focusable(true)
+
       XComponent({ id: this.viewId, type: this.xComponentType, libraryname: 'flutter' })
         .focusable(true)
         .focusOnTouch(true)
@@ -64,23 +76,18 @@ export struct FlutterPage {
         })
         .backgroundColor(Color.Transparent)
 
-      ForEach(this.rootDvModel!!, (child: Any) => {
-        DynamicView({
-          model: child as DVModel,
-          params: child.params,
-          events: child.events,
-          children: child.children,
-          customBuilder: child.builder
-        })
-      })
-
       if (this.showSplashScreen) {
         this.splashScreenView();
       }
     }
     .onAreaChange((oldValue: Area, newValue: Area) => {
-      Log.d(TAG, "onAreaChange ");
-      this.flutterView?.onAreaChange(newValue)
+      if (!this.lastArea || oldValue.width != newValue.width
+        || oldValue.height != newValue.height) {
+        Log.d(TAG, "onAreaChange, old=" + JSON.stringify(oldValue));
+        Log.d(TAG, "onAreaChange, new=" + JSON.stringify(newValue));
+        this.lastArea = newValue;
+        this.flutterView?.onAreaChange(newValue)
+      }
     })
     .onKeyEvent((event: KeyEvent) => {
       Log.d(TAG, "onKeyEvent " + event.type);
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/PlatformViewInfo.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/PlatformViewInfo.ets
new file mode 100644
index 0000000000000000000000000000000000000000..82cccfaefec069b15c723e0f31d5ca7b602c298a
--- /dev/null
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/PlatformViewInfo.ets
@@ -0,0 +1,28 @@
+/*
+* Copyright (c) 2024 Hunan OpenValley Digital Industry Development Co., Ltd.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+import { EmbeddingNodeController } from './EmbeddingNodeController'
+
+export class PlatformViewInfo {
+  public nodeController: EmbeddingNodeController;
+  public width: number;
+  public height: number;
+
+  constructor(nodeController: EmbeddingNodeController, width: number, height: number) {
+    this.nodeController = nodeController;
+    this.width = width;
+    this.height = height;
+  }
+}
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/PlatformPlugin.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/PlatformPlugin.ets
index 1bec332a6369f5618ca8e46887edc490642eff76..c837388f4655a7ccba308ab907359db9fc1eb4fc 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/PlatformPlugin.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/PlatformPlugin.ets
@@ -12,6 +12,8 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+import abilityAccessCtrl from '@ohos.abilityAccessCtrl';
+import { BusinessError } from '@kit.BasicServicesKit';
 import PlatformChannel, {
   AppSwitcherDescription,
   Brightness,
@@ -29,6 +31,8 @@ import Log from '../util/Log';
 import vibrator from '@ohos.vibrator';
 import window from '@ohos.window';
 import common from '@ohos.app.ability.common';
+import { MethodResult } from './common/MethodChannel';
+import Any from './common/Any';
 
 /**
  * ohos实现platform plugin
@@ -42,8 +46,13 @@ export default class PlatformPlugin {
     this.callback.context = context;
     this.callback.applicationContext = context?.getApplicationContext();
     this.callback.platform = this;
+    this.callback.platformPluginDelegate = platformPluginDelegate ?? null;
+    this.callback.platformChannel?.setPlatformMessageHandler(this.callback);
+  }
 
+  initWindow() {
     try {
+      let context = this.callback.context!!
       window.getLastWindow(context, (err, data) => {
         if (err.code) {
           Log.e(PlatformPlugin.TAG, "Failed to obtain the top window. Cause: " + JSON.stringify(err));
@@ -57,8 +66,6 @@ export default class PlatformPlugin {
     } catch (err) {
       Log.e(PlatformPlugin.TAG, "Failed to obtain the top window. Cause: " + JSON.stringify(err));
     }
-    this.callback.platformPluginDelegate = platformPluginDelegate ?? null;
-    this.callback.platformChannel?.setPlatformMessageHandler(this.callback);
   }
 
 
@@ -138,9 +145,22 @@ export class PlatformPluginCallback implements PlatformMessageHandler {
     }
   }
 
-  setPreferredOrientations(ohosOrientation: number) {
-    Log.d(PlatformPluginCallback.TAG, "ohosOrientation: " + ohosOrientation);
-    this.mainWindow?.setPreferredOrientation(ohosOrientation);
+  setPreferredOrientations(ohosOrientation: number, result: MethodResult) {
+    try {
+      Log.d(PlatformPluginCallback.TAG, "ohosOrientation: " + ohosOrientation);
+      this.mainWindow!.setPreferredOrientation(ohosOrientation, (err: BusinessError) => {
+        const errCode: number = err.code;
+        if (errCode) {
+          Log.e(PlatformPluginCallback.TAG, "Failed to set window orientation:" + JSON.stringify(err));
+          result.error("error", JSON.stringify(err), null);
+          return;
+        }
+        result.success(null);
+      });
+    } catch (exception) {
+      Log.e(PlatformPluginCallback.TAG, "Failed to set window orientation:" + JSON.stringify(exception));
+      result.error("error", JSON.stringify(exception), null);
+    }
   }
 
   setApplicationSwitcherDescription(description: AppSwitcherDescription) {
@@ -185,15 +205,70 @@ export class PlatformPluginCallback implements PlatformMessageHandler {
     }
   }
 
-  getClipboardData(format: ClipboardContentFormat): string {
-    // todo
-    return "";
+  getClipboardData(result: MethodResult): void {
+    let atManager = abilityAccessCtrl.createAtManager();
+    atManager.requestPermissionsFromUser(this.uiAbilityContext, ['ohos.permission.READ_PASTEBOARD']).then((data) => {
+      // https://developer.huawei.com/consumer/cn/doc/harmonyos-references-V5/js-apis-permissionrequestresult-V5
+      // 相应请求权限的结果：
+      // -1：未授权，表示权限已设置，无需弹窗，需要用户在"设置"中修改
+      //  0：已授权
+      //  2：未授权，表示请求无效，可能原因有：
+      //   -未在设置文件中声明目标权限。
+      //   -权限名非法。
+      //   -部分权限存在特殊申请条件，在申请对应权限时未满足其指定的条件
+      enum AuthResultStatus {
+        NOT_CONFIGURED = -1,
+        GRANTED = 0,
+        INVALID_REQ = 2
+      }
+      let message: string = 'Failed to request permissions from user.';
+      let authResult: number = data.authResults[0];
+      switch (authResult) {
+        case AuthResultStatus.GRANTED: {
+          let systemPasteboard: pasteboard.SystemPasteboard = pasteboard.getSystemPasteboard();
+          systemPasteboard.getData().then((pasteData: pasteboard.PasteData) => {
+            let text: string = pasteData.getPrimaryText();
+            let response: Any = new Map().set("text", text);
+            result.success(response);
+          }).catch((err: BusinessError) => {
+            Log.e(PlatformPluginCallback.TAG, "Failed to get PasteData. Cause: " + JSON.stringify(err));
+            result.error("error", JSON.stringify(err), null);
+          });
+          break;
+        }
+        case AuthResultStatus.NOT_CONFIGURED: {
+          message += 'Cause: Not configured in Settings';
+          Log.e(PlatformPluginCallback.TAG, message);
+          result.error("error", message, null);
+          break;
+        }
+        case AuthResultStatus.INVALID_REQ: {
+          message += 'Cause: Invalid request';
+          Log.e(PlatformPluginCallback.TAG, message);
+          result.error("error", message, null);
+          break;
+        }
+        default: {
+          message += `Unknown error: authResult=${authResult}`;
+          result.error("error", message, null);
+          break;
+        }
+      }
+    }).catch((err: BusinessError) => {
+      Log.e(PlatformPluginCallback.TAG, "Failed to request permissions from user. Cause: " + JSON.stringify(err));
+      result.error("error", JSON.stringify(err), null);
+    })
   }
 
-  setClipboardData(text: string) {
+  setClipboardData(text: string, result: MethodResult) {
     let pasteData = pasteboard.createData(pasteboard.MIMETYPE_TEXT_PLAIN, text);
-    let clipboard = pasteboard.getSystemPasteboard();
-    clipboard.setData(pasteData);
+    let systemPasteboard: pasteboard.SystemPasteboard = pasteboard.getSystemPasteboard();
+    systemPasteboard.setData(pasteData).then((data: void) => {
+      result.success(null);
+    }).catch((err: BusinessError) => {
+      Log.d(PlatformPluginCallback.TAG, "Failed to set PasteData. Cause: " + JSON.stringify(err));
+      result.error("error", JSON.stringify(err), null);
+    });
   }
 
   clipboardHasStrings(): boolean {
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/editing/ListenableEditingState.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/editing/ListenableEditingState.ets
index 47ed15f93fe61aa00c9b1ba162a55b871a9252b7..837253925b36ccecde2d1c0b3c9beda366918781 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/editing/ListenableEditingState.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/editing/ListenableEditingState.ets
@@ -260,11 +260,15 @@ export class ListenableEditingState {
       if (start == 0 && end == 0) {
         return;
       }
-      const startData = start == end ? start - 1 : start;
-      const tbEnd = start == end ? -1 : 0;
-      this.replace(startData, end, "", 0, tbEnd);
-      this.mSelectionStartCache = startData;
-      let tempStr: string = this.mStringCache.slice(0, startData) + this.mStringCache.slice(end);
+      let tbStart = start == end ? start - 1 : start;
+      let tbEnd = start == end ? -1 : 0;
+      let crCode: number = this.mStringCache.charCodeAt(tbStart)
+      if ( 0xdc00 <= crCode && crCode <= 0xdffff ) {
+        tbStart = tbStart - 1
+      }
+      this.replace(tbStart, end, "", 0, tbEnd);
+      this.mSelectionStartCache = tbStart;
+      let tempStr: string = this.mStringCache.slice(0, tbStart) + this.mStringCache.slice(end);
       this.mStringCache = tempStr;
       this.mSelectionEndCache = this.mSelectionStartCache;
     } else if (leftOrRight == true) {
@@ -272,7 +276,11 @@ export class ListenableEditingState {
       if (start == this.mStringCache.length) {
         return;
       }
-      const tbStart = start == end ? 1 : 0;
+      let tbStart = start == end ? 1 : 0;
+      let crCode: number = this.mStringCache.charCodeAt(tbStart)
+      if ( 0xdc00 <= crCode && crCode <= 0xdffff ) {
+        tbStart = tbStart - 1
+      }
       this.replace(start, end, "", tbStart, 0);
       this.mSelectionEndCache = start;
       let tempStr: string = this.mStringCache.slice(0, start) + (end + 1 >= this.mStringCache.length ? "" : this.mStringCache.slice(end + 1));
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/editing/TextInputPlugin.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/editing/TextInputPlugin.ets
index f10ae4bc6037ea9f21e2248e5bd9749e57ba0d92..637c9856fdc3ae61b26c3e77f9fbaa18958cd617 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/editing/TextInputPlugin.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/editing/TextInputPlugin.ets
@@ -76,7 +76,6 @@ class TextInputMethodHandlerImpl implements TextInputMethodHandler {
   mEditable: ListenableEditingState;
   private mRestartInputPending: boolean = false;
   private plugin: EditingStateWatcher | Any;
-  private keyboardStatus: inputMethod.KeyboardStatus = KeyboardStatus.NONE;
   private imcFlag: boolean = false;
 
   constructor(plugin: TextInputPlugin | Any) {
@@ -92,16 +91,11 @@ class TextInputMethodHandlerImpl implements TextInputMethodHandler {
   }
 
   show(): void {
-    if (this.keyboardStatus == KeyboardStatus.SHOW) {
-      return;
-    }
     this.showTextInput();
-    this.keyboardStatus = KeyboardStatus.SHOW;
   }
 
   hide(): void {
     this.hideTextInput();
-    this.keyboardStatus = KeyboardStatus.HIDE;
   }
 
   requestAutofill(): void {
@@ -239,9 +233,10 @@ class TextInputMethodHandlerImpl implements TextInputMethodHandler {
 
     try {
       this.inputMethodController.on('sendKeyboardStatus', (state) => {
-        if (state == KeyboardStatus.HIDE) {
-          this.keyboardStatus = KeyboardStatus.HIDE;
+        if (state == inputMethod.KeyboardStatus.HIDE) {
           this.plugin.textInputChannel.onConnectionClosed(this.inputTarget.id);
+          this.inputMethodController.detach();
+          this.cancelListenKeyBoardEvent();
         }
       })
     } catch (err) {
@@ -268,7 +263,9 @@ class TextInputMethodHandlerImpl implements TextInputMethodHandler {
     this.inputMethodController.off('deleteLeft');
     this.inputMethodController.off('deleteRight');
     this.inputMethodController.off('sendFunctionKey');
+    this.inputMethodController.off('sendKeyboardStatus');
     this.inputMethodController.off('selectByRange');
+    this.imcFlag = false;
   }
 
   public clearTextInputClient(): void {
@@ -291,13 +288,6 @@ enum Type {
   PHYSICAL_DISPLAY_PLATFORM_VIEW,
 }
 
-enum KeyboardStatus {
-  NONE = 0,
-  HIDE = 1,
-  SHOW = 2,
-}
-
-
 export class InputTarget {
   type: Type;
   id: number;
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/localization/LocalizationPlugin.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/localization/LocalizationPlugin.ets
index 78ed1c729717344a6e387d3d3dbe62fb4e4df86c..e2426593cc271f951fcb47fa8e577f094ec5c0f4 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/localization/LocalizationPlugin.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/localization/LocalizationPlugin.ets
@@ -55,7 +55,15 @@ export default class LocalizationPlugin {
   }
 
   sendLocaleToFlutter(): void {
+    let currentLanguage = i18n.System.getSystemLanguage();
     let systemLanguages = i18n.System.getSystemLanguages();
+    let index = systemLanguages.indexOf(currentLanguage);
+    
+    if (index != 0 && index != -1) {
+      let languages = systemLanguages[0];
+      systemLanguages[0] = systemLanguages[index];
+      systemLanguages[index] = languages;
+    }
     this.localizationChannel.sendLocales(systemLanguages);
   }
 }
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/platform/CustomTouchEvent.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/platform/CustomTouchEvent.ets
new file mode 100644
index 0000000000000000000000000000000000000000..77385c6aa7592697047512b7b61a44e7d21d15d5
--- /dev/null
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/platform/CustomTouchEvent.ets
@@ -0,0 +1,101 @@
+/*
+* Copyright (c) 2024 Hunan OpenValley Digital Industry Development Co., Ltd.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+export class CustomTouchEvent implements TouchEvent {
+  type: TouchType = 0;
+  touches: CustomTouchObject[];
+  changedTouches: CustomTouchObject[];
+  stopPropagation: () => void = () => {};
+
+  timestamp: number;
+  source: SourceType;
+  pressure: number;
+  tiltX: number;
+  tiltY: number;
+  sourceTool: SourceTool;
+
+  constructor(type: TouchType, touches: CustomTouchObject[], changedTouches: CustomTouchObject[], timestamp: number, source: SourceType, pressure: number, tiltX: number, tiltY: number, sourceTool: SourceTool) {
+    this.type = type;
+    this.touches = touches;
+    this.changedTouches = changedTouches;
+    this.timestamp = timestamp;
+    this.source = source;
+    this.pressure = pressure;
+    this.tiltX = tiltX;
+    this.tiltY = tiltY;
+    this.sourceTool = sourceTool;
+  }
+
+  preventDefault: () => void = () => {};
+
+  getModifierKeyState(keys: string[]): boolean {
+    throw new Error('Method not implemented.');
+  }
+
+  target: EventTarget = new CustomEventTarget(new CustomArea(0, 0, {x: 0, y: 0}, {x: 0, y: 0}));
+
+  getHistoricalPoints(): HistoricalPoint[] {
+    throw new Error('Method not implemented.');
+  }
+}
+
+class CustomEventTarget implements EventTarget {
+  area: Area = new CustomArea(0, 0, {x: 0, y: 0}, {x: 0, y: 0});
+
+  constructor(area: Area) {
+    this.area = area;
+  }
+}
+
+class CustomArea implements Area {
+  width: Length = 0;
+  height: Length = 0;
+  position: Position = {x: 0, y: 0};
+  globalPosition: Position = {x: 0, y: 0};
+
+  constructor(width: Length, height: Length, position: Position, globalPosition: Position ) {
+    this.width = width;
+    this.height = height;
+    this.position = position;
+    this.globalPosition = globalPosition;
+  }
+}
+
+
+export class CustomTouchObject implements TouchObject {
+  type: TouchType;
+  id: number;
+  displayX: number;
+  displayY: number;
+  windowX: number;
+  windowY: number;
+  screenX: number;
+  screenY: number;
+  x: number;
+  y: number;
+
+  constructor(type: TouchType, id: number, displayX: number, displayY: number, windowX: number, windowY: number, screenX: number, screenY: number, x: number, y: number) {
+    this.type = type;
+    this.id = id;
+    this.displayX = displayX;
+    this.displayY = displayY;
+    this.windowX = windowX;
+    this.windowY = windowY;
+    this.screenX = screenX;
+    this.screenY = screenY;
+    this.x = x;
+    this.y = y;
+  }
+}
\ No newline at end of file
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/platform/PlatformView.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/platform/PlatformView.ets
index ddf5f59a71c4d1c7d51082bcf104990e0faa08c6..320e5e973d4e0b4452856a676f20c8b1156aa9a0 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/platform/PlatformView.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/platform/PlatformView.ets
@@ -15,11 +15,15 @@
 
 import { DVModel, DynamicView } from '../../view/DynamicView/dynamicView'
 
+export declare class Params {
+  direction: Direction
+  platformView : PlatformView
+}
+
 /** A handle to an DynamicView to be embedded in the Flutter hierarchy. */
 export default abstract class PlatformView {
   /** Returns the DynamicView to be embedded in the Flutter hierarchy. */
-  abstract getView(): DVModel;
-
+  abstract getView(): WrappedBuilder<[Params]>;
   /**
    * Called by the {@link io.flutter.embedding.engine.FlutterEngine} that owns this {@code
    * PlatformView} when the DynamicView responsible for rendering a Flutter UI is
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/platform/PlatformViewsController.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/platform/PlatformViewsController.ets
index 82c87cd521a6a5a4dc661e8b8df8238430437d5e..c316c2f6b40d0a3472cd0bdad7b501daf0de8baa 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/platform/PlatformViewsController.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/platform/PlatformViewsController.ets
@@ -20,7 +20,7 @@ import PlatformViewsChannel, {
   PlatformViewResizeRequest,
   PlatformViewsHandler, PlatformViewTouch, PlatformViewBufferSize
 } from '../../../ets/embedding/engine/systemchannels/PlatformViewsChannel';
-import PlatformView from './PlatformView';
+import PlatformView, { Params } from './PlatformView';
 import { DVModel, DVModelContainer, DVModelParameters, DynamicView } from '../../view/DynamicView/dynamicView';
 import display from '@ohos.display';
 import { FlutterView } from '../../view/FlutterView';
@@ -42,9 +42,16 @@ import OhosTouchProcessor from '../../embedding/ohos/OhosTouchProcessor'
 import PlatformViewFactory from './PlatformViewFactory'
 import { ByteBuffer } from '../../util/ByteBuffer';
 import Any from '../common/Any';
+import { RawPointerCoords } from './RawPointerCoord';
+import { ArrayList, Stack } from '@kit.ArkTS';
+import { CustomTouchEvent, CustomTouchObject } from './CustomTouchEvent';
+import { NodeRenderType } from '@kit.ArkUI';
+import { PlatformViewInfo } from '../../embedding/ohos/PlatformViewInfo';
+import { EmbeddingNodeController } from '../../embedding/ohos/EmbeddingNodeController';
 
-const TAG = "PlatformViewsController"
 
+const TAG = "PlatformViewsController"
+let timeStamp: number = 52086377781000
 export default class PlatformViewsController implements PlatformViewsAccessibilityDelegate, PlatformViewsHandler {
   private registry: PlatformViewRegistryImpl;
   private context: Context | null = null;
@@ -57,11 +64,14 @@ export default class PlatformViewsController implements PlatformViewsAccessibili
   private usesSoftwareRendering: boolean = false;
 
   private platformViews: Map<number, PlatformView>;
+  private viewIdWithTextureId: Map<number, number>;
+  private viewIdWithNodeController: Map<number, EmbeddingNodeController>;
   private overlayLayerViews: Map<number, PlatformOverlayView>;
   private viewWrappers: Map<number, PlatformViewWrapper>;
   private currentFrameUsedOverlayLayerIds: HashSet<number>;
   private currentFrameUsedPlatformViewIds: HashSet<number>;
   private platformViewParent: Map<number, FlutterMutatorView>;
+  private nodeControllers: Stack<PlatformViewInfo>;
 
   constructor() {
     this.registry = new PlatformViewRegistryImpl();
@@ -71,7 +81,10 @@ export default class PlatformViewsController implements PlatformViewsAccessibili
     this.currentFrameUsedPlatformViewIds = new HashSet();
     this.viewWrappers = new Map();
     this.platformViews = new Map();
+    this.viewIdWithTextureId = new Map();
+    this.viewIdWithNodeController = new Map();
     this.platformViewParent = new Map();
+    this.nodeControllers = new Stack<PlatformViewInfo>();
   }
 
 
@@ -95,7 +108,7 @@ export default class PlatformViewsController implements PlatformViewsAccessibili
     Log.i(TAG, "Enter createForPlatformViewLayer");
     this.ensureValidRequest(request);
 
-    let platformView: PlatformView = this.createPlatformView(request, false);
+    let platformView: PlatformView = this.createPlatformView(request);
 
     this.configureForHybridComposition(platformView, request);
   }
@@ -107,6 +120,11 @@ export default class PlatformViewsController implements PlatformViewsAccessibili
       return;
     }
     this.platformViews.delete(viewId);
+    let textureId = this.viewIdWithTextureId.get(viewId);
+
+    if (textureId != undefined) {
+      this.textureRegistry!.unregisterTexture(textureId);
+    }
 
     try {
       platformView.dispose();
@@ -114,21 +132,7 @@ export default class PlatformViewsController implements PlatformViewsAccessibili
       Log.e(TAG, "Disposing platform view threw an exception", err);
     }
 
-    let viewWrapper: PlatformViewWrapper | null = this.viewWrappers.get(viewId) || null;
-    if (viewWrapper != null) {
-      let children = viewWrapper.getDvModel().children;
-      if (this.flutterView) {
-        let index = this.flutterView.getDVModel().children.indexOf(viewWrapper.getDvModel());
-        children.splice(0, children.length);
-        this.flutterView.getDVModel().children.splice(index, 1);
-      }
-      this.viewWrappers.delete(viewId);
-    }
 
-    let parentView: FlutterMutatorView | null = this.platformViewParent.get(viewId) || null;
-    if (parentView != null) {
-      this.platformViewParent.delete(viewId);
-    }
   }
 
   setParams: (params: DVModelParameters, key: string, element: Any ) => void = (params: DVModelParameters, key: string, element: Any): void => {
@@ -141,96 +145,56 @@ export default class PlatformViewsController implements PlatformViewsAccessibili
     let physicalHeight: number = this.toPhysicalPixels(request.newLogicalHeight);
     let viewId: number = request.viewId;
     Log.i(TAG, `Resize viewId ${viewId}, pw:${physicalWidth}, ph:${physicalHeight},lw:${request.newLogicalWidth}, lh:${request.newLogicalHeight}`);
-
-    let platformView: PlatformView | null = this.platformViews.get(viewId) || null;
-    let viewWrapper: PlatformViewWrapper | null = this.viewWrappers.get(viewId) || null;
-    if (platformView == null || viewWrapper == null) {
-      Log.e(TAG, "Resizing unknown platform view with id: " + viewId);
+ 
+    let nodeWidthLink: SubscribedAbstractProperty<number> = AppStorage.link('nodeWidth');
+    let nodeHeightLink: SubscribedAbstractProperty<number> = AppStorage.link('nodeHeight');
+    let oldNodeWidth: number = AppStorage.get('nodeWidth')!
+    let oldNodeHeight: number = AppStorage.get('nodeHeight')!
+    if (oldNodeWidth == physicalWidth) {
+      onComplete.run(new PlatformViewBufferSize(oldNodeWidth, oldNodeHeight));
       return;
     }
+    nodeWidthLink.set(physicalWidth);
+    nodeHeightLink.set(physicalHeight);
+    let nodeController: EmbeddingNodeController = this.viewIdWithNodeController.get(viewId)!;
+    nodeController.rebuild();
 
-    let viewWrapperLayoutParams: DVModelParameters | undefined = viewWrapper.getDvModel()?.getLayoutParams();
-    if (physicalWidth && viewWrapperLayoutParams) {
-      this.setParams(viewWrapperLayoutParams, "width", physicalWidth);
-      // viewWrapperLayoutParams.width = physicalWidth;
-    }
-
-    if (physicalHeight && viewWrapperLayoutParams) {
-      this.setParams(viewWrapperLayoutParams, "height", physicalHeight);
-      // viewWrapperLayoutParams.height = physicalHeight;
-    }
-
-    let embeddedView: DVModel = platformView.getView();
-    if (embeddedView != null) {
-      let embeddedViewLayoutParams = embeddedView.getLayoutParams();
-      if (physicalWidth) {
-        this.setParams(embeddedViewLayoutParams, "width", physicalWidth);
-        // embeddedViewLayoutParams.width = physicalWidth;
-      }
-
-      if (physicalHeight) {
-        this.setParams(embeddedViewLayoutParams, "height", physicalHeight);
-        // embeddedViewLayoutParams.height = physicalHeight;
-      }
-    }
-
-    onComplete.run(new PlatformViewBufferSize(request.newLogicalWidth, request.newLogicalHeight));
+    onComplete.run(new PlatformViewBufferSize(physicalWidth, physicalHeight));
   }
 
   offset(viewId: number, top: number, left: number): void {
     Log.i(TAG, `Offset is id${viewId}, t:${top}, l:${left}`);
-    let viewWrapper: PlatformViewWrapper | null = this.viewWrappers.get(viewId) || null;
-    if (viewWrapper == null) {
-      Log.e(TAG, "Setting offset for an unknown platform view with id: " + viewId);
-      return;
-    }
-
-    let physicalTop = this.toPhysicalPixels(top);
-    let physicalLeft = this.toPhysicalPixels(left);
-    let params = viewWrapper.getDvModel()!.params;
-    this.setParams(params!, "marginTop", physicalTop);
-    this.setParams(params!, "marginLeft", physicalLeft);
-    viewWrapper.setLayoutParams(params!);
   }
 
   onTouch(touch: PlatformViewTouch): void {
-    let viewId: number = touch.viewId;
-    let density: number = display.getDefaultDisplaySync().densityDPI;
+    console.log("nodeController onTouch:")
+    let pointX = 0;
+    let pointY = 0;
+    let rawPointerCoords1: Array<ESObject> = touch.rawPointerCoords as Array<ESObject> ;
+    rawPointerCoords1.forEach((item: ESObject) => {
+      let rawPoints: ArrayList<ESObject> = item as ArrayList<ESObject>;
+      let length = rawPoints.length
+      pointX = rawPoints[length - 2];
+      pointY = rawPoints[length - 1];
+    })
 
-    let platformView: PlatformView | null = this.platformViews.get(viewId) ?? null;
-    if (platformView == null) {
-      Log.e(TAG, "Sending touch to an unknown platform view with id: " + viewId);
-      return;
-    }
-    let dvModel: DVModel = platformView.getView();
-    if (dvModel == null) {
-      Log.e(TAG, "Sending touch to a null dv model with id: " + viewId);
-    }
-    Log.e(TAG, "Sending touch to a dv model with id: " + viewId.toString());
-    sendEventByKey(viewId.toString(), 10, "");
-  }
 
-  setDirection(viewId: number, direction: number): void {
-    if (!this.validateDirection(direction)) {
-      throw new Error("Trying to set unknown direction value: "
-        + direction
-        + "(view id: "
-        + viewId
-        + ")");
-    }
+    timeStamp = timeStamp + 10000;
+    let touches1: CustomTouchObject = new CustomTouchObject(touch.action, 0, pointX, pointY, pointX, pointY, pointX, pointY, pointX, pointY);
+    let changedTouches1: CustomTouchObject = new CustomTouchObject(touch.action, 0, pointX, pointY, pointX, pointY, pointX, pointY, pointX, pointY);
+    let customTouchEvent1: CustomTouchEvent = new CustomTouchEvent(touch.action, [touches1], [changedTouches1], timeStamp, 2, 1, 0, 0, 1)
 
-    const platformView = this.platformViews.get(viewId);
-    if (platformView == null) {
-      Log.e(TAG, "Setting direction to an unknown view with id: " + viewId);
-      return;
+    if (this.flutterView == null) {
+      Log.e(TAG, "flutterView is null")
     }
-    const embeddedView = platformView.getView();
-    if (embeddedView == null) {
-      Log.e(TAG, "Setting direction to a null view with id: " + viewId);
-      return;
-    }
-    this.setParams(embeddedView.params, "direction", direction);
-    // embeddedView.params.direction = direction;
+
+    let nodeController: EmbeddingNodeController = this.viewIdWithNodeController.get(touch.viewId)!;
+    nodeController.postEvent(customTouchEvent1);
+  }
+
+  setDirection(viewId: number, direction: Direction): void {
+    this.flutterView!.getEmbeddingNodeController().setRenderOption(this.flutterView!.getPlatformView()!, this.flutterView!.getSurfaceId(), NodeRenderType.RENDER_TYPE_TEXTURE, direction);
+    this.flutterView!.getEmbeddingNodeController().rebuild();
   }
 
   validateDirection(direction:number):boolean {
@@ -248,7 +212,7 @@ export default class PlatformViewsController implements PlatformViewsAccessibili
       Log.e(TAG, "Setting direction to a null view with id: " + viewId);
       return;
     }
-    focusControl.requestFocus("flutterXComponent");
+    focusControl.requestFocus('emptyFocusText' + this.flutterView?.getId());
   }
   synchronizeToNativeViewHierarchy(yes: boolean): void {
     throw new Error('Method not implemented.');
@@ -258,15 +222,10 @@ export default class PlatformViewsController implements PlatformViewsAccessibili
     Log.i(TAG, "Enter createForTextureLayer");
     this.ensureValidRequest(request);
 
-    let viewId: number = request.viewId;
-    if (this.viewWrappers.get(request.viewId) != null) {
-      throw new Error(
-        "Trying to create an already created platform view, view id: " + viewId);
-    }
-
-    let platformView: PlatformView = this.createPlatformView(request, true);
-    let dynamicView: DVModel = platformView.getView();
-    return this.configureForTextureLayerComposition(platformView, request);
+    let platformView: PlatformView = this.createPlatformView(request);
+    let textureId = this.configureForTextureLayerComposition(platformView, request);
+    this.viewIdWithTextureId.set(request.viewId, textureId);
+    return textureId;
   }
 
   private ensureValidRequest(request: PlatformViewCreationRequest): void {
@@ -279,8 +238,8 @@ export default class PlatformViewsController implements PlatformViewsAccessibili
     }
   }
 
-  private createPlatformView(request: PlatformViewCreationRequest, wrapContext: boolean): PlatformView {
-    Log.i(TAG, "Enter createPlatformView");
+  private createPlatformView(request: PlatformViewCreationRequest): PlatformView {
+    Log.i(TAG, "begin createPlatformView");
     const viewFactory: PlatformViewFactory = this.registry.getFactory(request.viewType);
     if (viewFactory == null) {
       throw new Error("Trying to create a platform view of unregistered type: " + request.viewType)
@@ -297,13 +256,11 @@ export default class PlatformViewsController implements PlatformViewsAccessibili
     }
     let platformView = viewFactory.create(this.context, request.viewId, createParams);
 
-    let embeddedView: DVModel =  platformView.getView();
+    let embeddedView: WrappedBuilder<[Params]> = platformView.getView();
     if (embeddedView == null) {
-      throw new Error("PlatformView#getView() returned null, but an dynamic view reference was expected.");
+      throw new Error("PlatformView#getView() returned null, but an WrappedBuilder reference was expected.");
     }
 
-    this.setParams(embeddedView.params, "direction", request.direction);
-    // embeddedView.params.direction = request.direction;
 
     this.platformViews.set(request.viewId, platformView);
     return platformView;
@@ -316,44 +273,31 @@ export default class PlatformViewsController implements PlatformViewsAccessibili
 
   private configureForTextureLayerComposition(platformView: PlatformView, request: PlatformViewCreationRequest): number {
     Log.i(TAG, "Hosting view in view hierarchy for platform view: " + request.viewId);
-
-    let viewWrapper: PlatformViewWrapper = new PlatformViewWrapper();
+    let surfaceId: string  = '0';
     let textureId: number = 0;
-
-    let physicalTop: number = this.toPhysicalPixels(request.logicalTop);
-    let physicalLeft: number = this.toPhysicalPixels(request.logicalLeft);
-
-    Log.i(TAG, `View pW:${request.logicalWidth}, pH:${request.logicalHeight}, pT:${physicalTop}, pL:${physicalLeft}`);
-
-    let param: DVModelParameters = new DVModelParameters();
-
-    this.setParams(param, "marginLeft", physicalLeft);
-    this.setParams(param, "marginTop", physicalTop);
-    // param.marginLeft = physicalLeft;
-    // param.marginTop = physicalTop;
-
-    let model = platformView.getView();
-    if (request.logicalWidth != null) {
-      let physicalWidth: number = this.toPhysicalPixels(request.logicalWidth);
-      this.setParams(model.params, "width", physicalWidth);
-      this.setParams(param, "width", physicalWidth);
-      // model.params.width = physicalWidth;
-      // param.width = physicalWidth;
-    }
-
-    if (request.logicalHeight != null) {
-      let physicalHeight: number = this.toPhysicalPixels(request.logicalHeight);
-      this.setParams(model.params, "height", physicalHeight);
-      this.setParams(param, "height", physicalHeight);
-      // model.params.height = physicalHeight;
-      // param.height = physicalHeight;
-    }
-
-    viewWrapper.setLayoutParams(param);
-    viewWrapper.addDvModel(model);
-
-    this.flutterView?.getDVModel().children.push(viewWrapper.getDvModel()!);
-    this.viewWrappers.set(request.viewId, viewWrapper);
+    if (this.textureRegistry != null) {
+      textureId = this.textureRegistry!.getTextureId();
+      surfaceId = this.textureRegistry!.registerTexture(textureId).getSurfaceId().toString();
+      Log.i(TAG, "nodeController getSurfaceId: " + surfaceId);
+      this.flutterView!.setSurfaceId(surfaceId);
+    }
+
+    let wrappedBuilder: WrappedBuilder<[Params]> = platformView.getView();
+    this.flutterView?.setWrappedBuilder(wrappedBuilder);
+    this.flutterView?.setPlatformView(platformView);
+    let nodeWidthLink: SubscribedAbstractProperty<number> = AppStorage.link('nodeWidth');
+    let nodeHeightLink: SubscribedAbstractProperty<number> = AppStorage.link('nodeHeight');
+    let physicalWidth: number = this.toPhysicalPixels(request.logicalWidth);
+    let physicalHeight: number = this.toPhysicalPixels(request.logicalHeight);
+    nodeWidthLink.set(physicalWidth);
+    nodeHeightLink.set(physicalHeight);
+    let nodeControllerLink: SubscribedAbstractProperty<EmbeddingNodeController> = AppStorage.link('nodeController');
+    let nodeController = new EmbeddingNodeController();
+    nodeController.setRenderOption(platformView, surfaceId, NodeRenderType.RENDER_TYPE_TEXTURE, request.direction);
+    nodeControllerLink.set(nodeController);
+    this.viewIdWithNodeController.set(request.viewId, nodeController);
+    let platformViewInfo: PlatformViewInfo = new PlatformViewInfo(nodeController, physicalWidth, physicalHeight);
+    this.nodeControllers.push(platformViewInfo);
     Log.i(TAG, "Create platform view success");
 
     return textureId;
@@ -424,6 +368,19 @@ export default class PlatformViewsController implements PlatformViewsAccessibili
     return this.registry;
   }
 
+  public setBackNodeControllers(): void {
+    this.nodeControllers.pop();
+    let nodeControllerLink: SubscribedAbstractProperty<EmbeddingNodeController> = AppStorage.link('nodeController');
+    let nodeWidthLink: SubscribedAbstractProperty<number> = AppStorage.link('nodeWidth');
+    let nodeHeightLink: SubscribedAbstractProperty<number> = AppStorage.link('nodeHeight');
+    let platformViewInfo: PlatformViewInfo = this.nodeControllers.peek();
+    if (platformViewInfo != undefined && platformViewInfo.nodeController != undefined) {
+      nodeControllerLink.set(platformViewInfo.nodeController);
+      nodeWidthLink.set(platformViewInfo.width);
+      nodeHeightLink.set(platformViewInfo.height);
+    }
+  }
+
   public onDetachedFromNapi(): void {
     this.diposeAllViews();
   }
@@ -454,28 +411,6 @@ export default class PlatformViewsController implements PlatformViewsAccessibili
   private initializeRootImageViewIfNeeded(): void {
   }
 
-  initializePlatformViewIfNeeded(viewId: number): void {
-    let platformView: PlatformView = this.platformViews[viewId];
-    if (platformView == null) {
-      throw new Error("Platform view hasn't been initialized from the platform view channel.");
-    }
-    if (this.platformViewParent[viewId] == null) {
-      return;
-    }
-    let dvModel: DVModel = platformView.getView();
-    if (dvModel == null) {
-      throw new Error("PlatformView#getView() returned null, but an ohos dv model reference was expected.");
-    }
-    let parentView: FlutterMutatorView = new FlutterMutatorView();
-    parentView.setOnDescendantFocusChangeListener(() => {
-      this.platformViewsChannel?.invokeViewFocused(viewId);
-    }, () => {
-      if (this.textInputPlugin != null) {
-        this.textInputPlugin.clearTextInputClient();
-      }
-    });
-  }
-
   public onDisplayOverlaySurface(id: number, x: number, y: number, width: number, height: number): void {
   }
 
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/platform/RawPointerCoord.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/platform/RawPointerCoord.ets
new file mode 100644
index 0000000000000000000000000000000000000000..4c5f78a8e55da0849e353eaf7ba400196cc0e86a
--- /dev/null
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/platform/RawPointerCoord.ets
@@ -0,0 +1,48 @@
+/*
+* Copyright (c) 2024 Hunan OpenValley Digital Industry Development Co., Ltd.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+export class RawPointerCoords {
+  private orientation: number = 0;
+  private pressure: number = 0;
+  private size: number = 0;
+  private toolMajor: number = 0;
+  private toolMinor: number = 0;
+  private touchMajor: number = 0;
+  private touchMinor: number = 0;
+  private x: number = 0;
+  private y: number = 0;
+
+  constructor(orientation: number, pressure: number, size: number, toolMajor: number, toolMinor: number,
+              touchMajor: number, touchMinor: number, x: number, y: number) {
+    this.orientation = orientation;
+    this.pressure = pressure;
+    this.size = size;
+    this.toolMajor = toolMajor;
+    this.toolMinor = toolMinor;
+    this.touchMajor = touchMajor;
+    this.touchMinor = touchMinor;
+    this.x = x;
+    this.y = y;
+  }
+
+  getX(): number {
+    return this.x;
+  }
+
+  getY(): number {
+    return this.y;
+  }
+
+}
\ No newline at end of file
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/view/FlutterView.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/view/FlutterView.ets
index d092c6c5d33f835ad82a6ea2b20891cdf41b1f90..e43e8b0c6ea517f88520d2e54690956f78480bb5 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/view/FlutterView.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/view/FlutterView.ets
@@ -23,6 +23,8 @@ import MouseCursorPlugin from '../plugin/mouse/MouseCursorPlugin';
 import Any from '../plugin/common/Any';
 import Settings from '../embedding/ohos/Settings';
 import ArrayList from '@ohos.util.ArrayList';
+import { EmbeddingNodeController } from '../embedding/ohos/EmbeddingNodeController';
+import PlatformView, { Params } from '../plugin/platform/PlatformView';
 
 const TAG = "FlutterView";
 
@@ -45,10 +47,17 @@ class ViewportMetrics {
   physicalTouchSlop = -1;
 }
 
+export class PlatformViewParas {
+  width: number = 0;
+  height: number = 0;
+  direction: Direction = Direction.Auto;
+}
 export class FlutterView {
   private flutterEngine: FlutterEngine | null = null
   private id: string = ""
   private dVModel: DVModel = new DVModel("Stack", new DVModelParameters(), new DVModelEvents(), new DVModelChildren(), null);
+  private wrapBuilder: WrappedBuilder<[Params]> | undefined = undefined;
+  private platformView: PlatformView | undefined = undefined;
   private isSurfaceAvailableForRendering: boolean = false
   private viewportMetrics = new ViewportMetrics();
   private displayInfo?: display.Display;
@@ -59,6 +68,9 @@ export class FlutterView {
   private settings?: Settings;
   private mFirstFrameListeners: ArrayList<FirstFrameListener>;
   private isFlutterUiDisplayed: boolean = false;
+  private surfaceId: string = "0";
+  private nodeController: EmbeddingNodeController = new EmbeddingNodeController();
+  private platformViewSize: PlatformViewParas = new PlatformViewParas();
 
   constructor(viewId: string, context: Context) {
     this.id = viewId
@@ -91,6 +103,38 @@ export class FlutterView {
     return this.id
   }
 
+  setSurfaceId(surfaceId: string): void {
+    this.surfaceId = surfaceId;
+  }
+
+  getSurfaceId(): string {
+    return this.surfaceId;
+  }
+
+  getEmbeddingNodeController(): EmbeddingNodeController {
+    return this.nodeController;
+  }
+
+  setWrappedBuilder(wrappedBuilder: WrappedBuilder<[Params]>) {
+    this.wrapBuilder = wrappedBuilder;
+  }
+
+  getWrappedBuilder(): WrappedBuilder<[Params]> | undefined {
+    return this.wrapBuilder;
+  }
+
+  setPlatformView(platformView: PlatformView) {
+    this.platformView = platformView;
+  }
+
+  getPlatformView(): PlatformView | undefined {
+    return this.platformView;
+  }
+
+  getPlatformViewSize(): PlatformViewParas {
+    return this.platformViewSize;
+  }
+
   getDVModel() {
     return this.dVModel
   }
@@ -121,9 +165,11 @@ export class FlutterView {
     this.flutterEngine = flutterEngine;
     this.keyboardManager = new KeyboardManager(flutterEngine);
     if (this.isSurfaceAvailableForRendering) {
-      this.flutterEngine.getFlutterNapi().xComponentAttachFlutterEngine(Number(this.id))
+      this.flutterEngine.getFlutterNapi().xComponentAttachFlutterEngine(this.id)
     }
     this.flutterEngine?.getFlutterNapi()?.updateRefreshRate(this.displayInfo!.refreshRate)
+    this.flutterEngine?.getFlutterNapi()?.updateSize(this.displayInfo!.width, this.displayInfo!.height)
+    this.flutterEngine?.getFlutterNapi()?.updateDensity(this.displayInfo!.densityPixels)
     flutterEngine.getPlatformViewsController()?.attachToView(this);
     this.updateViewportMetrics()
     let windowId = this.mainWindow?.getWindowProperties()?.id
@@ -143,7 +189,7 @@ export class FlutterView {
       return;
     }
     if (this.isSurfaceAvailableForRendering) {
-      this.flutterEngine!!.getFlutterNapi().xComponentDetachFlutterEngine(Number(this.id))
+      this.flutterEngine!!.getFlutterNapi().xComponentDetachFlutterEngine(this.id)
     }
     this.flutterEngine?.getPlatformViewsController()?.detachFromView();
     this.flutterEngine = null;
@@ -169,14 +215,14 @@ export class FlutterView {
   onSurfaceCreated() {
     this.isSurfaceAvailableForRendering = true;
     if (this.isAttachedToFlutterEngine()) {
-      this.flutterEngine!!.getFlutterNapi().xComponentAttachFlutterEngine(Number(this.id))
+      this.flutterEngine!!.getFlutterNapi().xComponentAttachFlutterEngine(this.id)
     }
   }
 
   onSurfaceDestroyed() {
     this.isSurfaceAvailableForRendering = false;
     if (this.isAttachedToFlutterEngine()) {
-      this.flutterEngine!!.getFlutterNapi().xComponentDetachFlutterEngine(Number(this.id))
+      this.flutterEngine!!.getFlutterNapi().xComponentDetachFlutterEngine(this.id)
     }
   }
 
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/view/TextureRegistry.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/view/TextureRegistry.ets
index fa79eb238c0781f3f23b690e00d08101a0969830..a0143aadf8682779e90a08bae6e4a54480aaefa9 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/view/TextureRegistry.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/view/TextureRegistry.ets
@@ -16,10 +16,8 @@ import image from '@ohos.multimedia.image';
 
 export interface TextureRegistry {
 
-  createSurfaceTexture(): SurfaceTextureEntry;
   getTextureId(): number;
   registerTexture(textureId: number): SurfaceTextureEntry;
-  registerSurfaceTexture(receiver: image.ImageReceiver): SurfaceTextureEntry;
   registerPixelMap(pixelMap: PixelMap): number;
   unregisterTexture(textureId: number): void;
   onTrimMemory(level: number) : void;
@@ -30,8 +28,6 @@ export interface SurfaceTextureEntry {
 
   getSurfaceId(): number;
 
-  getImageReceiver(): image.ImageReceiver;
-
   release(): void;
 }
 
diff --git a/shell/platform/ohos/flutter_embedding/hvigor/hvigor-config.json5 b/shell/platform/ohos/flutter_embedding/hvigor/hvigor-config.json5
index d9d099d20e735c330b96d10133b99c12e0ea75cf..d22352bc99e206c83ec444257a684349ed79107f 100755
--- a/shell/platform/ohos/flutter_embedding/hvigor/hvigor-config.json5
+++ b/shell/platform/ohos/flutter_embedding/hvigor/hvigor-config.json5
@@ -14,8 +14,9 @@
 */
 
 {
-  "hvigorVersion": "4.1.2",
+  "modelVersion": "5.0.0",
+  "hvigorVersion": "file:../dependencies/hvigor-4.3.0.tgz",
   "dependencies": {
-    "@ohos/hvigor-ohos-plugin": "4.1.2"
+    "@ohos/hvigor-ohos-plugin": "file:../dependencies/hvigor-ohos-plugin-4.3.0.tgz"
   }
 }
diff --git a/shell/platform/ohos/flutter_embedding/hvigor/hvigor-wrapper.js b/shell/platform/ohos/flutter_embedding/hvigor/hvigor-wrapper.js
index 9809b36c4e57180c34bf2c3b8a6309548936ba73..1b83395c99abd4b8ff29ed95b4df9aae8685d660 100755
--- a/shell/platform/ohos/flutter_embedding/hvigor/hvigor-wrapper.js
+++ b/shell/platform/ohos/flutter_embedding/hvigor/hvigor-wrapper.js
@@ -1,2 +1 @@
-"use strict";var e=require("path"),t=require("os"),n=require("fs"),r=require("child_process"),u=require("process"),o=require("tty"),i=require("util"),s=require("url"),a=require("constants"),c=require("stream"),l=require("assert"),f=require("zlib"),D=require("net"),d=require("crypto"),p="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},E={},h={},C=p&&p.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(h,"__esModule",{value:!0}),h.maxPathLength=h.isMac=h.isLinux=h.isWindows=void 0;const m=C(t),F="Windows_NT",y="Darwin";function g(){return m.default.type()===F}function A(){return m.default.type()===y}h.isWindows=g,h.isLinux=function(){return"Linux"===m.default.type()},h.isMac=A,h.maxPathLength=function(){return A()?1016:g()?259:4095},function(n){var r=p&&p.__createBinding||(Object.create?function(e,t,n,r){void 0===r&&(r=n);var u=Object.getOwnPropertyDescriptor(t,n);u&&!("get"in u?!t.__esModule:u.writable||u.configurable)||(u={enumerable:!0,get:function(){return t[n]}}),Object.defineProperty(e,r,u)}:function(e,t,n,r){void 0===r&&(r=n),e[r]=t[n]}),u=p&&p.__setModuleDefault||(Object.create?function(e,t){Object.defineProperty(e,"default",{enumerable:!0,value:t})}:function(e,t){e.default=t}),o=p&&p.__importStar||function(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)"default"!==n&&Object.prototype.hasOwnProperty.call(e,n)&&r(t,e,n);return u(t,e),t};Object.defineProperty(n,"__esModule",{value:!0}),n.LOG_LEVEL=n.ANALYZE=n.PARALLEL=n.INCREMENTAL=n.DAEMON=n.DOT=n.PROPERTIES=n.HVIGOR_POOL_CACHE_TTL=n.HVIGOR_POOL_CACHE_CAPACITY=n.HVIGOR_POOL_MAX_CORE_SIZE=n.HVIGOR_POOL_MAX_SIZE=n.ENABLE_SIGN_TASK_KEY=n.HVIGOR_CACHE_DIR_KEY=n.WORK_SPACE=n.HVIGOR_PROJECT_WRAPPER_HOME=n.HVIGOR_PROJECT_ROOT_DIR=n.HVIGOR_PROJECT_CACHES_HOME=n.HVIGOR_PNPM_STORE_PATH=n.HVIGOR_WRAPPER_PNPM_SCRIPT_PATH=n.PROJECT_CACHES=n.HVIGOR_WRAPPER_TOOLS_HOME=n.HVIGOR_USER_HOME=n.DEFAULT_PACKAGE_JSON=n.DEFAULT_HVIGOR_CONFIG_JSON_FILE_NAME=n.PNPM=n.HVIGOR=n.NPM_TOOL=n.PNPM_TOOL=n.HVIGOR_ENGINE_PACKAGE_NAME=void 0;const i=o(t),s=o(e),a=h;n.HVIGOR_ENGINE_PACKAGE_NAME="@ohos/hvigor",n.PNPM_TOOL=(0,a.isWindows)()?"pnpm.cmd":"pnpm",n.NPM_TOOL=(0,a.isWindows)()?"npm.cmd":"npm",n.HVIGOR="hvigor",n.PNPM="pnpm",n.DEFAULT_HVIGOR_CONFIG_JSON_FILE_NAME="hvigor-config.json5",n.DEFAULT_PACKAGE_JSON="package.json",n.HVIGOR_USER_HOME=s.resolve(i.homedir(),".hvigor"),n.HVIGOR_WRAPPER_TOOLS_HOME=s.resolve(n.HVIGOR_USER_HOME,"wrapper","tools"),n.PROJECT_CACHES="project_caches",n.HVIGOR_WRAPPER_PNPM_SCRIPT_PATH=s.resolve(n.HVIGOR_WRAPPER_TOOLS_HOME,"node_modules",".bin",n.PNPM_TOOL),n.HVIGOR_PNPM_STORE_PATH=s.resolve(n.HVIGOR_USER_HOME,"caches"),n.HVIGOR_PROJECT_CACHES_HOME=s.resolve(n.HVIGOR_USER_HOME,n.PROJECT_CACHES),n.HVIGOR_PROJECT_ROOT_DIR=process.cwd(),n.HVIGOR_PROJECT_WRAPPER_HOME=s.resolve(n.HVIGOR_PROJECT_ROOT_DIR,n.HVIGOR),n.WORK_SPACE="workspace",n.HVIGOR_CACHE_DIR_KEY="hvigor.cacheDir",n.ENABLE_SIGN_TASK_KEY="enableSignTask",n.HVIGOR_POOL_MAX_SIZE="hvigor.pool.maxSize",n.HVIGOR_POOL_MAX_CORE_SIZE="hvigor.pool.maxCoreSize",n.HVIGOR_POOL_CACHE_CAPACITY="hvigor.pool.cache.capacity",n.HVIGOR_POOL_CACHE_TTL="hvigor.pool.cache.ttl",n.PROPERTIES="properties",n.DOT=".",n.DAEMON="daemon",n.INCREMENTAL="incremental",n.PARALLEL="typeCheck",n.ANALYZE="analyze",n.LOG_LEVEL="logLevel"}(E);var v={},S={};Object.defineProperty(S,"__esModule",{value:!0}),S.logError=S.logInfo=S.logErrorAndExit=void 0,S.logErrorAndExit=function(e){e instanceof Error?console.error(e.message):console.error(e),process.exit(-1)},S.logInfo=function(e){console.log(e)},S.logError=function(e){console.error(e)};var w=p&&p.__createBinding||(Object.create?function(e,t,n,r){void 0===r&&(r=n);var u=Object.getOwnPropertyDescriptor(t,n);u&&!("get"in u?!t.__esModule:u.writable||u.configurable)||(u={enumerable:!0,get:function(){return t[n]}}),Object.defineProperty(e,r,u)}:function(e,t,n,r){void 0===r&&(r=n),e[r]=t[n]}),O=p&&p.__setModuleDefault||(Object.create?function(e,t){Object.defineProperty(e,"default",{enumerable:!0,value:t})}:function(e,t){e.default=t}),_=p&&p.__importStar||function(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)"default"!==n&&Object.prototype.hasOwnProperty.call(e,n)&&w(t,e,n);return O(t,e),t};Object.defineProperty(v,"__esModule",{value:!0});var b=v.executeBuild=void 0;const B=_(n),x=_(e),P=S,I=r;b=v.executeBuild=function(e){const t=x.resolve(e,"node_modules","@ohos","hvigor","bin","hvigor.js");try{const e=B.realpathSync(t),n=process.argv.slice(2),r=(0,I.spawn)("node",[e,...n],{env:process.env});r.stdout.on("data",(e=>{(0,P.logInfo)(`${e.toString().trim()}`)})),r.stderr.on("data",(e=>{(0,P.logError)(`${e.toString().trim()}`)})),r.on("exit",((e,t)=>{process.exit(null!=e?e:-1)}))}catch(n){(0,P.logErrorAndExit)(`Error: ENOENT: no such file ${t},delete ${e} and retry.`)}};var N,T,k,R,M,L={},j={},$={exports:{}},H={exports:{}};function G(){if(T)return N;T=1;var e=1e3,t=60*e,n=60*t,r=24*n,u=7*r,o=365.25*r;function i(e,t,n,r){var u=t>=1.5*n;return Math.round(e/n)+" "+r+(u?"s":"")}return N=function(s,a){a=a||{};var c=typeof s;if("string"===c&&s.length>0)return function(i){if((i=String(i)).length>100)return;var s=/^(-?(?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|weeks?|w|years?|yrs?|y)?$/i.exec(i);if(!s)return;var a=parseFloat(s[1]);switch((s[2]||"ms").toLowerCase()){case"years":case"year":case"yrs":case"yr":case"y":return a*o;case"weeks":case"week":case"w":return a*u;case"days":case"day":case"d":return a*r;case"hours":case"hour":case"hrs":case"hr":case"h":return a*n;case"minutes":case"minute":case"mins":case"min":case"m":return a*t;case"seconds":case"second":case"secs":case"sec":case"s":return a*e;case"milliseconds":case"millisecond":case"msecs":case"msec":case"ms":return a;default:return}}(s);if("number"===c&&isFinite(s))return a.long?function(u){var o=Math.abs(u);if(o>=r)return i(u,o,r,"day");if(o>=n)return i(u,o,n,"hour");if(o>=t)return i(u,o,t,"minute");if(o>=e)return i(u,o,e,"second");return u+" ms"}(s):function(u){var o=Math.abs(u);if(o>=r)return Math.round(u/r)+"d";if(o>=n)return Math.round(u/n)+"h";if(o>=t)return Math.round(u/t)+"m";if(o>=e)return Math.round(u/e)+"s";return u+"ms"}(s);throw new Error("val is not a non-empty string or a valid number. val="+JSON.stringify(s))}}function V(){if(R)return k;return R=1,k=function(e){function t(e){let r,u,o,i=null;function s(...e){if(!s.enabled)return;const n=s,u=Number(new Date),o=u-(r||u);n.diff=o,n.prev=r,n.curr=u,r=u,e[0]=t.coerce(e[0]),"string"!=typeof e[0]&&e.unshift("%O");let i=0;e[0]=e[0].replace(/%([a-zA-Z%])/g,((r,u)=>{if("%%"===r)return"%";i++;const o=t.formatters[u];if("function"==typeof o){const t=e[i];r=o.call(n,t),e.splice(i,1),i--}return r})),t.formatArgs.call(n,e);(n.log||t.log).apply(n,e)}return s.namespace=e,s.useColors=t.useColors(),s.color=t.selectColor(e),s.extend=n,s.destroy=t.destroy,Object.defineProperty(s,"enabled",{enumerable:!0,configurable:!1,get:()=>null!==i?i:(u!==t.namespaces&&(u=t.namespaces,o=t.enabled(e)),o),set:e=>{i=e}}),"function"==typeof t.init&&t.init(s),s}function n(e,n){const r=t(this.namespace+(void 0===n?":":n)+e);return r.log=this.log,r}function r(e){return e.toString().substring(2,e.toString().length-2).replace(/\.\*\?$/,"*")}return t.debug=t,t.default=t,t.coerce=function(e){if(e instanceof Error)return e.stack||e.message;return e},t.disable=function(){const e=[...t.names.map(r),...t.skips.map(r).map((e=>"-"+e))].join(",");return t.enable(""),e},t.enable=function(e){let n;t.save(e),t.namespaces=e,t.names=[],t.skips=[];const r=("string"==typeof e?e:"").split(/[\s,]+/),u=r.length;for(n=0;n<u;n++)r[n]&&("-"===(e=r[n].replace(/\*/g,".*?"))[0]?t.skips.push(new RegExp("^"+e.slice(1)+"$")):t.names.push(new RegExp("^"+e+"$")))},t.enabled=function(e){if("*"===e[e.length-1])return!0;let n,r;for(n=0,r=t.skips.length;n<r;n++)if(t.skips[n].test(e))return!1;for(n=0,r=t.names.length;n<r;n++)if(t.names[n].test(e))return!0;return!1},t.humanize=G(),t.destroy=function(){console.warn("Instance method `debug.destroy()` is deprecated and no longer does anything. It will be removed in the next major version of `debug`.")},Object.keys(e).forEach((n=>{t[n]=e[n]})),t.names=[],t.skips=[],t.formatters={},t.selectColor=function(e){let n=0;for(let t=0;t<e.length;t++)n=(n<<5)-n+e.charCodeAt(t),n|=0;return t.colors[Math.abs(n)%t.colors.length]},t.enable(t.load()),t},k}var J,U,W,z,K,q,Y={exports:{}};function Z(){return U||(U=1,J=(e,t)=>{t=t||process.argv;const n=e.startsWith("-")?"":1===e.length?"-":"--",r=t.indexOf(n+e),u=t.indexOf("--");return-1!==r&&(-1===u||r<u)}),J}function X(){if(z)return W;z=1;const e=t,n=Z(),r=process.env;let u;function o(t){const o=function(t){if(!1===u)return 0;if(n("color=16m")||n("color=full")||n("color=truecolor"))return 3;if(n("color=256"))return 2;if(t&&!t.isTTY&&!0!==u)return 0;const o=u?1:0;if("win32"===process.platform){const t=e.release().split(".");return Number(process.versions.node.split(".")[0])>=8&&Number(t[0])>=10&&Number(t[2])>=10586?Number(t[2])>=14931?3:2:1}if("CI"in r)return["TRAVIS","CIRCLECI","APPVEYOR","GITLAB_CI"].some((e=>e in r))||"codeship"===r.CI_NAME?1:o;if("TEAMCITY_VERSION"in r)return/^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(r.TEAMCITY_VERSION)?1:0;if("truecolor"===r.COLORTERM)return 3;if("TERM_PROGRAM"in r){const e=parseInt((r.TERM_PROGRAM_VERSION||"").split(".")[0],10);switch(r.TERM_PROGRAM){case"iTerm.app":return e>=3?3:2;case"Apple_Terminal":return 2}}return/-256(color)?$/i.test(r.TERM)?2:/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(r.TERM)||"COLORTERM"in r?1:(r.TERM,o)}(t);return function(e){return 0!==e&&{level:e,hasBasic:!0,has256:e>=2,has16m:e>=3}}(o)}return n("no-color")||n("no-colors")||n("color=false")?u=!1:(n("color")||n("colors")||n("color=true")||n("color=always"))&&(u=!0),"FORCE_COLOR"in r&&(u=0===r.FORCE_COLOR.length||0!==parseInt(r.FORCE_COLOR,10)),W={supportsColor:o,stdout:o(process.stdout),stderr:o(process.stderr)}}function Q(){return K||(K=1,function(e,t){const n=o,r=i;t.init=function(e){e.inspectOpts={};const n=Object.keys(t.inspectOpts);for(let r=0;r<n.length;r++)e.inspectOpts[n[r]]=t.inspectOpts[n[r]]},t.log=function(...e){return process.stderr.write(r.format(...e)+"\n")},t.formatArgs=function(n){const{namespace:r,useColors:u}=this;if(u){const t=this.color,u="[3"+(t<8?t:"8;5;"+t),o=`  ${u};1m${r} `;n[0]=o+n[0].split("\n").join("\n"+o),n.push(u+"m+"+e.exports.humanize(this.diff)+"")}else n[0]=function(){if(t.inspectOpts.hideDate)return"";return(new Date).toISOString()+" "}()+r+" "+n[0]},t.save=function(e){e?process.env.DEBUG=e:delete process.env.DEBUG},t.load=function(){return process.env.DEBUG},t.useColors=function(){return"colors"in t.inspectOpts?Boolean(t.inspectOpts.colors):n.isatty(process.stderr.fd)},t.destroy=r.deprecate((()=>{}),"Instance method `debug.destroy()` is deprecated and no longer does anything. It will be removed in the next major version of `debug`."),t.colors=[6,2,3,4,5,1];try{const e=X();e&&(e.stderr||e).level>=2&&(t.colors=[20,21,26,27,32,33,38,39,40,41,42,43,44,45,56,57,62,63,68,69,74,75,76,77,78,79,80,81,92,93,98,99,112,113,128,129,134,135,148,149,160,161,162,163,164,165,166,167,168,169,170,171,172,173,178,179,184,185,196,197,198,199,200,201,202,203,204,205,206,207,208,209,214,215,220,221])}catch(e){}t.inspectOpts=Object.keys(process.env).filter((e=>/^debug_/i.test(e))).reduce(((e,t)=>{const n=t.substring(6).toLowerCase().replace(/_([a-z])/g,((e,t)=>t.toUpperCase()));let r=process.env[t];return r=!!/^(yes|on|true|enabled)$/i.test(r)||!/^(no|off|false|disabled)$/i.test(r)&&("null"===r?null:Number(r)),e[n]=r,e}),{}),e.exports=V()(t);const{formatters:u}=e.exports;u.o=function(e){return this.inspectOpts.colors=this.useColors,r.inspect(e,this.inspectOpts).split("\n").map((e=>e.trim())).join(" ")},u.O=function(e){return this.inspectOpts.colors=this.useColors,r.inspect(e,this.inspectOpts)}}(Y,Y.exports)),Y.exports}q=$,"undefined"==typeof process||"renderer"===process.type||!0===process.browser||process.__nwjs?q.exports=(M||(M=1,function(e,t){t.formatArgs=function(t){if(t[0]=(this.useColors?"%c":"")+this.namespace+(this.useColors?" %c":" ")+t[0]+(this.useColors?"%c ":" ")+"+"+e.exports.humanize(this.diff),!this.useColors)return;const n="color: "+this.color;t.splice(1,0,n,"color: inherit");let r=0,u=0;t[0].replace(/%[a-zA-Z%]/g,(e=>{"%%"!==e&&(r++,"%c"===e&&(u=r))})),t.splice(u,0,n)},t.save=function(e){try{e?t.storage.setItem("debug",e):t.storage.removeItem("debug")}catch(e){}},t.load=function(){let e;try{e=t.storage.getItem("debug")}catch(e){}return!e&&"undefined"!=typeof process&&"env"in process&&(e=process.env.DEBUG),e},t.useColors=function(){return!("undefined"==typeof window||!window.process||"renderer"!==window.process.type&&!window.process.__nwjs)||("undefined"==typeof navigator||!navigator.userAgent||!navigator.userAgent.toLowerCase().match(/(edge|trident)\/(\d+)/))&&("undefined"!=typeof document&&document.documentElement&&document.documentElement.style&&document.documentElement.style.WebkitAppearance||"undefined"!=typeof window&&window.console&&(window.console.firebug||window.console.exception&&window.console.table)||"undefined"!=typeof navigator&&navigator.userAgent&&navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/)&&parseInt(RegExp.$1,10)>=31||"undefined"!=typeof navigator&&navigator.userAgent&&navigator.userAgent.toLowerCase().match(/applewebkit\/(\d+)/))},t.storage=function(){try{return localStorage}catch(e){}}(),t.destroy=(()=>{let e=!1;return()=>{e||(e=!0,console.warn("Instance method `debug.destroy()` is deprecated and no longer does anything. It will be removed in the next major version of `debug`."))}})(),t.colors=["#0000CC","#0000FF","#0033CC","#0033FF","#0066CC","#0066FF","#0099CC","#0099FF","#00CC00","#00CC33","#00CC66","#00CC99","#00CCCC","#00CCFF","#3300CC","#3300FF","#3333CC","#3333FF","#3366CC","#3366FF","#3399CC","#3399FF","#33CC00","#33CC33","#33CC66","#33CC99","#33CCCC","#33CCFF","#6600CC","#6600FF","#6633CC","#6633FF","#66CC00","#66CC33","#9900CC","#9900FF","#9933CC","#9933FF","#99CC00","#99CC33","#CC0000","#CC0033","#CC0066","#CC0099","#CC00CC","#CC00FF","#CC3300","#CC3333","#CC3366","#CC3399","#CC33CC","#CC33FF","#CC6600","#CC6633","#CC9900","#CC9933","#CCCC00","#CCCC33","#FF0000","#FF0033","#FF0066","#FF0099","#FF00CC","#FF00FF","#FF3300","#FF3333","#FF3366","#FF3399","#FF33CC","#FF33FF","#FF6600","#FF6633","#FF9900","#FF9933","#FFCC00","#FFCC33"],t.log=console.debug||console.log||(()=>{}),e.exports=V()(t);const{formatters:n}=e.exports;n.j=function(e){try{return JSON.stringify(e)}catch(e){return"[UnexpectedJSONParseError]: "+e.message}}}(H,H.exports)),H.exports):q.exports=Q();var ee=function(e){return(e=e||{}).circles?function(e){var t=[],n=[];return e.proto?function e(u){if("object"!=typeof u||null===u)return u;if(u instanceof Date)return new Date(u);if(Array.isArray(u))return r(u,e);if(u instanceof Map)return new Map(r(Array.from(u),e));if(u instanceof Set)return new Set(r(Array.from(u),e));var o={};for(var i in t.push(u),n.push(o),u){var s=u[i];if("object"!=typeof s||null===s)o[i]=s;else if(s instanceof Date)o[i]=new Date(s);else if(s instanceof Map)o[i]=new Map(r(Array.from(s),e));else if(s instanceof Set)o[i]=new Set(r(Array.from(s),e));else if(ArrayBuffer.isView(s))o[i]=te(s);else{var a=t.indexOf(s);o[i]=-1!==a?n[a]:e(s)}}return t.pop(),n.pop(),o}:function e(u){if("object"!=typeof u||null===u)return u;if(u instanceof Date)return new Date(u);if(Array.isArray(u))return r(u,e);if(u instanceof Map)return new Map(r(Array.from(u),e));if(u instanceof Set)return new Set(r(Array.from(u),e));var o={};for(var i in t.push(u),n.push(o),u)if(!1!==Object.hasOwnProperty.call(u,i)){var s=u[i];if("object"!=typeof s||null===s)o[i]=s;else if(s instanceof Date)o[i]=new Date(s);else if(s instanceof Map)o[i]=new Map(r(Array.from(s),e));else if(s instanceof Set)o[i]=new Set(r(Array.from(s),e));else if(ArrayBuffer.isView(s))o[i]=te(s);else{var a=t.indexOf(s);o[i]=-1!==a?n[a]:e(s)}}return t.pop(),n.pop(),o};function r(e,r){for(var u=Object.keys(e),o=new Array(u.length),i=0;i<u.length;i++){var s=u[i],a=e[s];if("object"!=typeof a||null===a)o[s]=a;else if(a instanceof Date)o[s]=new Date(a);else if(ArrayBuffer.isView(a))o[s]=te(a);else{var c=t.indexOf(a);o[s]=-1!==c?n[c]:r(a)}}return o}}(e):e.proto?function e(n){if("object"!=typeof n||null===n)return n;if(n instanceof Date)return new Date(n);if(Array.isArray(n))return t(n,e);if(n instanceof Map)return new Map(t(Array.from(n),e));if(n instanceof Set)return new Set(t(Array.from(n),e));var r={};for(var u in n){var o=n[u];"object"!=typeof o||null===o?r[u]=o:o instanceof Date?r[u]=new Date(o):o instanceof Map?r[u]=new Map(t(Array.from(o),e)):o instanceof Set?r[u]=new Set(t(Array.from(o),e)):ArrayBuffer.isView(o)?r[u]=te(o):r[u]=e(o)}return r}:n;function t(e,t){for(var n=Object.keys(e),r=new Array(n.length),u=0;u<n.length;u++){var o=n[u],i=e[o];"object"!=typeof i||null===i?r[o]=i:i instanceof Date?r[o]=new Date(i):ArrayBuffer.isView(i)?r[o]=te(i):r[o]=t(i)}return r}function n(e){if("object"!=typeof e||null===e)return e;if(e instanceof Date)return new Date(e);if(Array.isArray(e))return t(e,n);if(e instanceof Map)return new Map(t(Array.from(e),n));if(e instanceof Set)return new Set(t(Array.from(e),n));var r={};for(var u in e)if(!1!==Object.hasOwnProperty.call(e,u)){var o=e[u];"object"!=typeof o||null===o?r[u]=o:o instanceof Date?r[u]=new Date(o):o instanceof Map?r[u]=new Map(t(Array.from(o),n)):o instanceof Set?r[u]=new Set(t(Array.from(o),n)):ArrayBuffer.isView(o)?r[u]=te(o):r[u]=n(o)}return r}};function te(e){return e instanceof Buffer?Buffer.from(e):new e.constructor(e.buffer.slice(),e.byteOffset,e.length)}const ne=i,re=$.exports("log4js:configuration"),ue=[],oe=[],ie=e=>!e,se=e=>e&&"object"==typeof e&&!Array.isArray(e),ae=(e,t,n)=>{(Array.isArray(t)?t:[t]).forEach((t=>{if(t)throw new Error(`Problem with log4js configuration: (${ne.inspect(e,{depth:5})}) - ${n}`)}))};var ce={configure:e=>{re("New configuration to be validated: ",e),ae(e,ie(se(e)),"must be an object."),re(`Calling pre-processing listeners (${ue.length})`),ue.forEach((t=>t(e))),re("Configuration pre-processing finished."),re(`Calling configuration listeners (${oe.length})`),oe.forEach((t=>t(e))),re("Configuration finished.")},addListener:e=>{oe.push(e),re(`Added listener, now ${oe.length} listeners`)},addPreProcessingListener:e=>{ue.push(e),re(`Added pre-processing listener, now ${ue.length} listeners`)},throwExceptionIf:ae,anObject:se,anInteger:e=>e&&"number"==typeof e&&Number.isInteger(e),validIdentifier:e=>/^[A-Za-z][A-Za-z0-9_]*$/g.test(e),not:ie},le={exports:{}};!function(e){function t(e,t){for(var n=e.toString();n.length<t;)n="0"+n;return n}function n(e){return t(e,2)}function r(r,u){"string"!=typeof r&&(u=r,r=e.exports.ISO8601_FORMAT),u||(u=e.exports.now());var o=n(u.getDate()),i=n(u.getMonth()+1),s=n(u.getFullYear()),a=n(s.substring(2,4)),c=r.indexOf("yyyy")>-1?s:a,l=n(u.getHours()),f=n(u.getMinutes()),D=n(u.getSeconds()),d=t(u.getMilliseconds(),3),p=function(e){var t=Math.abs(e),n=String(Math.floor(t/60)),r=String(t%60);return n=("0"+n).slice(-2),r=("0"+r).slice(-2),0===e?"Z":(e<0?"+":"-")+n+":"+r}(u.getTimezoneOffset());return r.replace(/dd/g,o).replace(/MM/g,i).replace(/y{1,4}/g,c).replace(/hh/g,l).replace(/mm/g,f).replace(/ss/g,D).replace(/SSS/g,d).replace(/O/g,p)}function u(e,t,n,r){e["set"+(r?"":"UTC")+t](n)}e.exports=r,e.exports.asString=r,e.exports.parse=function(t,n,r){if(!t)throw new Error("pattern must be supplied");return function(t,n,r){var o=t.indexOf("O")<0,i=!1,s=[{pattern:/y{1,4}/,regexp:"\\d{1,4}",fn:function(e,t){u(e,"FullYear",t,o)}},{pattern:/MM/,regexp:"\\d{1,2}",fn:function(e,t){u(e,"Month",t-1,o),e.getMonth()!==t-1&&(i=!0)}},{pattern:/dd/,regexp:"\\d{1,2}",fn:function(e,t){i&&u(e,"Month",e.getMonth()-1,o),u(e,"Date",t,o)}},{pattern:/hh/,regexp:"\\d{1,2}",fn:function(e,t){u(e,"Hours",t,o)}},{pattern:/mm/,regexp:"\\d\\d",fn:function(e,t){u(e,"Minutes",t,o)}},{pattern:/ss/,regexp:"\\d\\d",fn:function(e,t){u(e,"Seconds",t,o)}},{pattern:/SSS/,regexp:"\\d\\d\\d",fn:function(e,t){u(e,"Milliseconds",t,o)}},{pattern:/O/,regexp:"[+-]\\d{1,2}:?\\d{2}?|Z",fn:function(e,t){t="Z"===t?0:t.replace(":","");var n=Math.abs(t),r=(t>0?-1:1)*(n%100+60*Math.floor(n/100));e.setUTCMinutes(e.getUTCMinutes()+r)}}],a=s.reduce((function(e,t){return t.pattern.test(e.regexp)?(t.index=e.regexp.match(t.pattern).index,e.regexp=e.regexp.replace(t.pattern,"("+t.regexp+")")):t.index=-1,e}),{regexp:t,index:[]}),c=s.filter((function(e){return e.index>-1}));c.sort((function(e,t){return e.index-t.index}));var l=new RegExp(a.regexp).exec(n);if(l){var f=r||e.exports.now();return c.forEach((function(e,t){e.fn(f,l[t+1])})),f}throw new Error("String '"+n+"' could not be parsed as '"+t+"'")}(t,n,r)},e.exports.now=function(){return new Date},e.exports.ISO8601_FORMAT="yyyy-MM-ddThh:mm:ss.SSS",e.exports.ISO8601_WITH_TZ_OFFSET_FORMAT="yyyy-MM-ddThh:mm:ss.SSSO",e.exports.DATETIME_FORMAT="dd MM yyyy hh:mm:ss.SSS",e.exports.ABSOLUTETIME_FORMAT="hh:mm:ss.SSS"}(le);const fe=le.exports,De=t,de=i,pe=e,Ee=s,he=$.exports("log4js:layouts"),Ce={bold:[1,22],italic:[3,23],underline:[4,24],inverse:[7,27],white:[37,39],grey:[90,39],black:[90,39],blue:[34,39],cyan:[36,39],green:[32,39],magenta:[35,39],red:[91,39],yellow:[33,39]};function me(e){return e?`[${Ce[e][0]}m`:""}function Fe(e){return e?`[${Ce[e][1]}m`:""}function ye(e,t){return n=de.format("[%s] [%s] %s - ",fe.asString(e.startTime),e.level.toString(),e.categoryName),me(r=t)+n+Fe(r);var n,r}function ge(e){return ye(e)+de.format(...e.data)}function Ae(e){return ye(e,e.level.colour)+de.format(...e.data)}function ve(e){return de.format(...e.data)}function Se(e){return e.data[0]}function we(e,t){const n=/%(-?[0-9]+)?(\.?-?[0-9]+)?([[\]cdhmnprzxXyflosCMAF%])(\{([^}]+)\})?|([^%]+)/;function r(e){return e&&e.pid?e.pid.toString():process.pid.toString()}e=e||"%r %p %c - %m%n";const u={c:function(e,t){let n=e.categoryName;if(t){const e=parseInt(t,10),r=n.split(".");e<r.length&&(n=r.slice(r.length-e).join("."))}return n},d:function(e,t){let n=fe.ISO8601_FORMAT;if(t)switch(n=t,n){case"ISO8601":case"ISO8601_FORMAT":n=fe.ISO8601_FORMAT;break;case"ISO8601_WITH_TZ_OFFSET":case"ISO8601_WITH_TZ_OFFSET_FORMAT":n=fe.ISO8601_WITH_TZ_OFFSET_FORMAT;break;case"ABSOLUTE":process.emitWarning("Pattern %d{ABSOLUTE} is deprecated in favor of %d{ABSOLUTETIME}. Please use %d{ABSOLUTETIME} instead.","DeprecationWarning","log4js-node-DEP0003"),he("[log4js-node-DEP0003]","DEPRECATION: Pattern %d{ABSOLUTE} is deprecated and replaced by %d{ABSOLUTETIME}.");case"ABSOLUTETIME":case"ABSOLUTETIME_FORMAT":n=fe.ABSOLUTETIME_FORMAT;break;case"DATE":process.emitWarning("Pattern %d{DATE} is deprecated due to the confusion it causes when used. Please use %d{DATETIME} instead.","DeprecationWarning","log4js-node-DEP0004"),he("[log4js-node-DEP0004]","DEPRECATION: Pattern %d{DATE} is deprecated and replaced by %d{DATETIME}.");case"DATETIME":case"DATETIME_FORMAT":n=fe.DATETIME_FORMAT}return fe.asString(n,e.startTime)},h:function(){return De.hostname().toString()},m:function(e){return de.format(...e.data)},n:function(){return De.EOL},p:function(e){return e.level.toString()},r:function(e){return fe.asString("hh:mm:ss",e.startTime)},"[":function(e){return me(e.level.colour)},"]":function(e){return Fe(e.level.colour)},y:function(){return r()},z:r,"%":function(){return"%"},x:function(e,n){return void 0!==t[n]?"function"==typeof t[n]?t[n](e):t[n]:null},X:function(e,t){const n=e.context[t];return void 0!==n?"function"==typeof n?n(e):n:null},f:function(e,t){let n=e.fileName||"";if(n=function(e){const t="file://";return e.startsWith(t)&&("function"==typeof Ee.fileURLToPath?e=Ee.fileURLToPath(e):(e=pe.normalize(e.replace(new RegExp(`^${t}`),"")),"win32"===process.platform&&(e=e.startsWith("\\")?e.slice(1):pe.sep+pe.sep+e))),e}(n),t){const e=parseInt(t,10),r=n.split(pe.sep);r.length>e&&(n=r.slice(-e).join(pe.sep))}return n},l:function(e){return e.lineNumber?`${e.lineNumber}`:""},o:function(e){return e.columnNumber?`${e.columnNumber}`:""},s:function(e){return e.callStack||""},C:function(e){return e.className||""},M:function(e){return e.functionName||""},A:function(e){return e.functionAlias||""},F:function(e){return e.callerName||""}};function o(e,t,n){return u[e](t,n)}function i(e,t,n){let r=e;return r=function(e,t){let n;return e?(n=parseInt(e.slice(1),10),n>0?t.slice(0,n):t.slice(n)):t}(t,r),r=function(e,t){let n;if(e)if("-"===e.charAt(0))for(n=parseInt(e.slice(1),10);t.length<n;)t+=" ";else for(n=parseInt(e,10);t.length<n;)t=` ${t}`;return t}(n,r),r}return function(t){let r,u="",s=e;for(;null!==(r=n.exec(s));){const e=r[1],n=r[2],a=r[3],c=r[5],l=r[6];if(l)u+=l.toString();else{u+=i(o(a,t,c),n,e)}s=s.slice(r.index+r[0].length)}return u}}const Oe={messagePassThrough:()=>ve,basic:()=>ge,colored:()=>Ae,coloured:()=>Ae,pattern:e=>we(e&&e.pattern,e&&e.tokens),dummy:()=>Se};var _e={basicLayout:ge,messagePassThroughLayout:ve,patternLayout:we,colouredLayout:Ae,coloredLayout:Ae,dummyLayout:Se,addLayout(e,t){Oe[e]=t},layout:(e,t)=>Oe[e]&&Oe[e](t)};const be=ce,Be=["white","grey","black","blue","cyan","green","magenta","red","yellow"];class xe{constructor(e,t,n){this.level=e,this.levelStr=t,this.colour=n}toString(){return this.levelStr}static getLevel(e,t){return e?e instanceof xe?e:(e instanceof Object&&e.levelStr&&(e=e.levelStr),xe[e.toString().toUpperCase()]||t):t}static addLevels(e){if(e){Object.keys(e).forEach((t=>{const n=t.toUpperCase();xe[n]=new xe(e[t].value,n,e[t].colour);const r=xe.levels.findIndex((e=>e.levelStr===n));r>-1?xe.levels[r]=xe[n]:xe.levels.push(xe[n])})),xe.levels.sort(((e,t)=>e.level-t.level))}}isLessThanOrEqualTo(e){return"string"==typeof e&&(e=xe.getLevel(e)),this.level<=e.level}isGreaterThanOrEqualTo(e){return"string"==typeof e&&(e=xe.getLevel(e)),this.level>=e.level}isEqualTo(e){return"string"==typeof e&&(e=xe.getLevel(e)),this.level===e.level}}xe.levels=[],xe.addLevels({ALL:{value:Number.MIN_VALUE,colour:"grey"},TRACE:{value:5e3,colour:"blue"},DEBUG:{value:1e4,colour:"cyan"},INFO:{value:2e4,colour:"green"},WARN:{value:3e4,colour:"yellow"},ERROR:{value:4e4,colour:"red"},FATAL:{value:5e4,colour:"magenta"},MARK:{value:9007199254740992,colour:"grey"},OFF:{value:Number.MAX_VALUE,colour:"grey"}}),be.addListener((e=>{const t=e.levels;if(t){be.throwExceptionIf(e,be.not(be.anObject(t)),"levels must be an object");Object.keys(t).forEach((n=>{be.throwExceptionIf(e,be.not(be.validIdentifier(n)),`level name "${n}" is not a valid identifier (must start with a letter, only contain A-Z,a-z,0-9,_)`),be.throwExceptionIf(e,be.not(be.anObject(t[n])),`level "${n}" must be an object`),be.throwExceptionIf(e,be.not(t[n].value),`level "${n}" must have a 'value' property`),be.throwExceptionIf(e,be.not(be.anInteger(t[n].value)),`level "${n}".value must have an integer value`),be.throwExceptionIf(e,be.not(t[n].colour),`level "${n}" must have a 'colour' property`),be.throwExceptionIf(e,be.not(Be.indexOf(t[n].colour)>-1),`level "${n}".colour must be one of ${Be.join(", ")}`)}))}})),be.addListener((e=>{xe.addLevels(e.levels)}));var Pe=xe,Ie={exports:{}},Ne={};/*! (c) 2020 Andrea Giammarchi */
-const{parse:Te,stringify:ke}=JSON,{keys:Re}=Object,Me=String,Le="string",je={},$e="object",He=(e,t)=>t,Ge=e=>e instanceof Me?Me(e):e,Ve=(e,t)=>typeof t===Le?new Me(t):t,Je=(e,t,n,r)=>{const u=[];for(let o=Re(n),{length:i}=o,s=0;s<i;s++){const i=o[s],a=n[i];if(a instanceof Me){const o=e[a];typeof o!==$e||t.has(o)?n[i]=r.call(n,i,o):(t.add(o),n[i]=je,u.push({k:i,a:[e,t,o,r]}))}else n[i]!==je&&(n[i]=r.call(n,i,a))}for(let{length:e}=u,t=0;t<e;t++){const{k:e,a:o}=u[t];n[e]=r.call(n,e,Je.apply(null,o))}return n},Ue=(e,t,n)=>{const r=Me(t.push(n)-1);return e.set(n,r),r},We=(e,t)=>{const n=Te(e,Ve).map(Ge),r=n[0],u=t||He,o=typeof r===$e&&r?Je(n,new Set,r,u):r;return u.call({"":o},"",o)};Ne.parse=We;const ze=(e,t,n)=>{const r=t&&typeof t===$e?(e,n)=>""===e||-1<t.indexOf(e)?n:void 0:t||He,u=new Map,o=[],i=[];let s=+Ue(u,o,r.call({"":e},"",e)),a=!s;for(;s<o.length;)a=!0,i[s]=ke(o[s++],c,n);return"["+i.join(",")+"]";function c(e,t){if(a)return a=!a,t;const n=r.call(this,e,t);switch(typeof n){case $e:if(null===n)return n;case Le:return u.get(n)||Ue(u,o,n)}return n}};Ne.stringify=ze;Ne.toJSON=e=>Te(ze(e));Ne.fromJSON=e=>We(ke(e));const Ke=Ne,qe=Pe;const Ye=new class{constructor(){const e={__LOG4JS_undefined__:void 0,__LOG4JS_NaN__:Number("abc"),__LOG4JS_Infinity__:1/0,"__LOG4JS_-Infinity__":-1/0};this.deMap=e,this.serMap={},Object.keys(this.deMap).forEach((e=>{const t=this.deMap[e];this.serMap[t]=e}))}canSerialise(e){return"string"!=typeof e&&e in this.serMap}serialise(e){return this.canSerialise(e)?this.serMap[e]:e}canDeserialise(e){return e in this.deMap}deserialise(e){return this.canDeserialise(e)?this.deMap[e]:e}};let Ze=class{constructor(e,t,n,r,u,o){if(this.startTime=new Date,this.categoryName=e,this.data=n,this.level=t,this.context=Object.assign({},r),this.pid=process.pid,this.error=o,void 0!==u){if(!u||"object"!=typeof u||Array.isArray(u))throw new TypeError("Invalid location type passed to LoggingEvent constructor");this.constructor._getLocationKeys().forEach((e=>{void 0!==u[e]&&(this[e]=u[e])}))}}static _getLocationKeys(){return["fileName","lineNumber","columnNumber","callStack","className","functionName","functionAlias","callerName"]}serialise(){return Ke.stringify(this,((e,t)=>(t instanceof Error&&(t=Object.assign({message:t.message,stack:t.stack},t)),Ye.serialise(t))))}static deserialise(e){let t;try{const n=Ke.parse(e,((e,t)=>{if(t&&t.message&&t.stack){const e=new Error(t);Object.keys(t).forEach((n=>{e[n]=t[n]})),t=e}return Ye.deserialise(t)}));this._getLocationKeys().forEach((e=>{void 0!==n[e]&&(n.location||(n.location={}),n.location[e]=n[e])})),t=new Ze(n.categoryName,qe.getLevel(n.level.levelStr),n.data,n.context,n.location,n.error),t.startTime=new Date(n.startTime),t.pid=n.pid,n.cluster&&(t.cluster=n.cluster)}catch(n){t=new Ze("log4js",qe.ERROR,["Unable to parse log:",e,"because: ",n])}return t}};var Xe=Ze;const Qe=$.exports("log4js:clustering"),et=Xe,tt=ce;let nt=!1,rt=null;try{rt=require("cluster")}catch(e){Qe("cluster module not present"),nt=!0}const ut=[];let ot=!1,it="NODE_APP_INSTANCE";const st=()=>ot&&"0"===process.env[it],at=()=>nt||rt&&rt.isMaster||st(),ct=e=>{ut.forEach((t=>t(e)))},lt=(e,t)=>{if(Qe("cluster message received from worker ",e,": ",t),e.topic&&e.data&&(t=e,e=void 0),t&&t.topic&&"log4js:message"===t.topic){Qe("received message: ",t.data);const e=et.deserialise(t.data);ct(e)}};nt||tt.addListener((e=>{ut.length=0,({pm2:ot,disableClustering:nt,pm2InstanceVar:it="NODE_APP_INSTANCE"}=e),Qe(`clustering disabled ? ${nt}`),Qe(`cluster.isMaster ? ${rt&&rt.isMaster}`),Qe(`pm2 enabled ? ${ot}`),Qe(`pm2InstanceVar = ${it}`),Qe(`process.env[${it}] = ${process.env[it]}`),ot&&process.removeListener("message",lt),rt&&rt.removeListener&&rt.removeListener("message",lt),nt||e.disableClustering?Qe("Not listening for cluster messages, because clustering disabled."):st()?(Qe("listening for PM2 broadcast messages"),process.on("message",lt)):rt&&rt.isMaster?(Qe("listening for cluster messages"),rt.on("message",lt)):Qe("not listening for messages, because we are not a master process")}));var ft={onlyOnMaster:(e,t)=>at()?e():t,isMaster:at,send:e=>{at()?ct(e):(ot||(e.cluster={workerId:rt.worker.id,worker:process.pid}),process.send({topic:"log4js:message",data:e.serialise()}))},onMessage:e=>{ut.push(e)}},Dt={};function dt(e){if("number"==typeof e&&Number.isInteger(e))return e;const t={K:1024,M:1048576,G:1073741824},n=Object.keys(t),r=e.slice(-1).toLocaleUpperCase(),u=e.slice(0,-1).trim();if(n.indexOf(r)<0||!Number.isInteger(Number(u)))throw Error(`maxLogSize: "${e}" is invalid`);return u*t[r]}function pt(e){return function(e,t){const n=Object.assign({},t);return Object.keys(e).forEach((r=>{n[r]&&(n[r]=e[r](t[r]))})),n}({maxLogSize:dt},e)}const Et={dateFile:pt,file:pt,fileSync:pt};Dt.modifyConfig=e=>Et[e.type]?Et[e.type](e):e;var ht={};const Ct=console.log.bind(console);ht.configure=function(e,t){let n=t.colouredLayout;return e.layout&&(n=t.layout(e.layout.type,e.layout)),function(e,t){return n=>{Ct(e(n,t))}}(n,e.timezoneOffset)};var mt={};mt.configure=function(e,t){let n=t.colouredLayout;return e.layout&&(n=t.layout(e.layout.type,e.layout)),function(e,t){return n=>{process.stdout.write(`${e(n,t)}\n`)}}(n,e.timezoneOffset)};var Ft={};Ft.configure=function(e,t){let n=t.colouredLayout;return e.layout&&(n=t.layout(e.layout.type,e.layout)),function(e,t){return n=>{process.stderr.write(`${e(n,t)}\n`)}}(n,e.timezoneOffset)};var yt={};yt.configure=function(e,t,n,r){const u=n(e.appender);return function(e,t,n,r){const u=r.getLevel(e),o=r.getLevel(t,r.FATAL);return e=>{const t=e.level;u.isLessThanOrEqualTo(t)&&o.isGreaterThanOrEqualTo(t)&&n(e)}}(e.level,e.maxLevel,u,r)};var gt={};const At=$.exports("log4js:categoryFilter");gt.configure=function(e,t,n){const r=n(e.appender);return function(e,t){return"string"==typeof e&&(e=[e]),n=>{At(`Checking ${n.categoryName} against ${e}`),-1===e.indexOf(n.categoryName)&&(At("Not excluded, sending to appender"),t(n))}}(e.exclude,r)};var vt={};const St=$.exports("log4js:noLogFilter");vt.configure=function(e,t,n){const r=n(e.appender);return function(e,t){return n=>{St(`Checking data: ${n.data} against filters: ${e}`),"string"==typeof e&&(e=[e]),e=e.filter((e=>null!=e&&""!==e));const r=new RegExp(e.join("|"),"i");(0===e.length||n.data.findIndex((e=>r.test(e)))<0)&&(St("Not excluded, sending to appender"),t(n))}}(e.exclude,r)};var wt={},Ot={exports:{}},_t={},bt={fromCallback:function(e){return Object.defineProperty((function(){if("function"!=typeof arguments[arguments.length-1])return new Promise(((t,n)=>{arguments[arguments.length]=(e,r)=>{if(e)return n(e);t(r)},arguments.length++,e.apply(this,arguments)}));e.apply(this,arguments)}),"name",{value:e.name})},fromPromise:function(e){return Object.defineProperty((function(){const t=arguments[arguments.length-1];if("function"!=typeof t)return e.apply(this,arguments);e.apply(this,arguments).then((e=>t(null,e)),t)}),"name",{value:e.name})}},Bt=a,xt=process.cwd,Pt=null,It=process.env.GRACEFUL_FS_PLATFORM||process.platform;process.cwd=function(){return Pt||(Pt=xt.call(process)),Pt};try{process.cwd()}catch(e){}if("function"==typeof process.chdir){var Nt=process.chdir;process.chdir=function(e){Pt=null,Nt.call(process,e)},Object.setPrototypeOf&&Object.setPrototypeOf(process.chdir,Nt)}var Tt=function(e){Bt.hasOwnProperty("O_SYMLINK")&&process.version.match(/^v0\.6\.[0-2]|^v0\.5\./)&&function(e){e.lchmod=function(t,n,r){e.open(t,Bt.O_WRONLY|Bt.O_SYMLINK,n,(function(t,u){t?r&&r(t):e.fchmod(u,n,(function(t){e.close(u,(function(e){r&&r(t||e)}))}))}))},e.lchmodSync=function(t,n){var r,u=e.openSync(t,Bt.O_WRONLY|Bt.O_SYMLINK,n),o=!0;try{r=e.fchmodSync(u,n),o=!1}finally{if(o)try{e.closeSync(u)}catch(e){}else e.closeSync(u)}return r}}(e);e.lutimes||function(e){Bt.hasOwnProperty("O_SYMLINK")&&e.futimes?(e.lutimes=function(t,n,r,u){e.open(t,Bt.O_SYMLINK,(function(t,o){t?u&&u(t):e.futimes(o,n,r,(function(t){e.close(o,(function(e){u&&u(t||e)}))}))}))},e.lutimesSync=function(t,n,r){var u,o=e.openSync(t,Bt.O_SYMLINK),i=!0;try{u=e.futimesSync(o,n,r),i=!1}finally{if(i)try{e.closeSync(o)}catch(e){}else e.closeSync(o)}return u}):e.futimes&&(e.lutimes=function(e,t,n,r){r&&process.nextTick(r)},e.lutimesSync=function(){})}(e);e.chown=r(e.chown),e.fchown=r(e.fchown),e.lchown=r(e.lchown),e.chmod=t(e.chmod),e.fchmod=t(e.fchmod),e.lchmod=t(e.lchmod),e.chownSync=u(e.chownSync),e.fchownSync=u(e.fchownSync),e.lchownSync=u(e.lchownSync),e.chmodSync=n(e.chmodSync),e.fchmodSync=n(e.fchmodSync),e.lchmodSync=n(e.lchmodSync),e.stat=o(e.stat),e.fstat=o(e.fstat),e.lstat=o(e.lstat),e.statSync=i(e.statSync),e.fstatSync=i(e.fstatSync),e.lstatSync=i(e.lstatSync),e.chmod&&!e.lchmod&&(e.lchmod=function(e,t,n){n&&process.nextTick(n)},e.lchmodSync=function(){});e.chown&&!e.lchown&&(e.lchown=function(e,t,n,r){r&&process.nextTick(r)},e.lchownSync=function(){});"win32"===It&&(e.rename="function"!=typeof e.rename?e.rename:function(t){function n(n,r,u){var o=Date.now(),i=0;t(n,r,(function s(a){if(a&&("EACCES"===a.code||"EPERM"===a.code||"EBUSY"===a.code)&&Date.now()-o<6e4)return setTimeout((function(){e.stat(r,(function(e,o){e&&"ENOENT"===e.code?t(n,r,s):u(a)}))}),i),void(i<100&&(i+=10));u&&u(a)}))}return Object.setPrototypeOf&&Object.setPrototypeOf(n,t),n}(e.rename));function t(t){return t?function(n,r,u){return t.call(e,n,r,(function(e){s(e)&&(e=null),u&&u.apply(this,arguments)}))}:t}function n(t){return t?function(n,r){try{return t.call(e,n,r)}catch(e){if(!s(e))throw e}}:t}function r(t){return t?function(n,r,u,o){return t.call(e,n,r,u,(function(e){s(e)&&(e=null),o&&o.apply(this,arguments)}))}:t}function u(t){return t?function(n,r,u){try{return t.call(e,n,r,u)}catch(e){if(!s(e))throw e}}:t}function o(t){return t?function(n,r,u){function o(e,t){t&&(t.uid<0&&(t.uid+=4294967296),t.gid<0&&(t.gid+=4294967296)),u&&u.apply(this,arguments)}return"function"==typeof r&&(u=r,r=null),r?t.call(e,n,r,o):t.call(e,n,o)}:t}function i(t){return t?function(n,r){var u=r?t.call(e,n,r):t.call(e,n);return u&&(u.uid<0&&(u.uid+=4294967296),u.gid<0&&(u.gid+=4294967296)),u}:t}function s(e){return!e||("ENOSYS"===e.code||!(process.getuid&&0===process.getuid()||"EINVAL"!==e.code&&"EPERM"!==e.code))}e.read="function"!=typeof e.read?e.read:function(t){function n(n,r,u,o,i,s){var a;if(s&&"function"==typeof s){var c=0;a=function(l,f,D){if(l&&"EAGAIN"===l.code&&c<10)return c++,t.call(e,n,r,u,o,i,a);s.apply(this,arguments)}}return t.call(e,n,r,u,o,i,a)}return Object.setPrototypeOf&&Object.setPrototypeOf(n,t),n}(e.read),e.readSync="function"!=typeof e.readSync?e.readSync:(a=e.readSync,function(t,n,r,u,o){for(var i=0;;)try{return a.call(e,t,n,r,u,o)}catch(e){if("EAGAIN"===e.code&&i<10){i++;continue}throw e}});var a};var kt=c.Stream,Rt=function(e){return{ReadStream:function t(n,r){if(!(this instanceof t))return new t(n,r);kt.call(this);var u=this;this.path=n,this.fd=null,this.readable=!0,this.paused=!1,this.flags="r",this.mode=438,this.bufferSize=65536,r=r||{};for(var o=Object.keys(r),i=0,s=o.length;i<s;i++){var a=o[i];this[a]=r[a]}this.encoding&&this.setEncoding(this.encoding);if(void 0!==this.start){if("number"!=typeof this.start)throw TypeError("start must be a Number");if(void 0===this.end)this.end=1/0;else if("number"!=typeof this.end)throw TypeError("end must be a Number");if(this.start>this.end)throw new Error("start must be <= end");this.pos=this.start}if(null!==this.fd)return void process.nextTick((function(){u._read()}));e.open(this.path,this.flags,this.mode,(function(e,t){if(e)return u.emit("error",e),void(u.readable=!1);u.fd=t,u.emit("open",t),u._read()}))},WriteStream:function t(n,r){if(!(this instanceof t))return new t(n,r);kt.call(this),this.path=n,this.fd=null,this.writable=!0,this.flags="w",this.encoding="binary",this.mode=438,this.bytesWritten=0,r=r||{};for(var u=Object.keys(r),o=0,i=u.length;o<i;o++){var s=u[o];this[s]=r[s]}if(void 0!==this.start){if("number"!=typeof this.start)throw TypeError("start must be a Number");if(this.start<0)throw new Error("start must be >= zero");this.pos=this.start}this.busy=!1,this._queue=[],null===this.fd&&(this._open=e.open,this._queue.push([this._open,this.path,this.flags,this.mode,void 0]),this.flush())}}};var Mt=function(e){if(null===e||"object"!=typeof e)return e;if(e instanceof Object)var t={__proto__:Lt(e)};else t=Object.create(null);return Object.getOwnPropertyNames(e).forEach((function(n){Object.defineProperty(t,n,Object.getOwnPropertyDescriptor(e,n))})),t},Lt=Object.getPrototypeOf||function(e){return e.__proto__};var jt,$t,Ht=n,Gt=Tt,Vt=Rt,Jt=Mt,Ut=i;function Wt(e,t){Object.defineProperty(e,jt,{get:function(){return t}})}"function"==typeof Symbol&&"function"==typeof Symbol.for?(jt=Symbol.for("graceful-fs.queue"),$t=Symbol.for("graceful-fs.previous")):(jt="___graceful-fs.queue",$t="___graceful-fs.previous");var zt=function(){};if(Ut.debuglog?zt=Ut.debuglog("gfs4"):/\bgfs4\b/i.test(process.env.NODE_DEBUG||"")&&(zt=function(){var e=Ut.format.apply(Ut,arguments);e="GFS4: "+e.split(/\n/).join("\nGFS4: "),console.error(e)}),!Ht[jt]){var Kt=p[jt]||[];Wt(Ht,Kt),Ht.close=function(e){function t(t,n){return e.call(Ht,t,(function(e){e||Qt(),"function"==typeof n&&n.apply(this,arguments)}))}return Object.defineProperty(t,$t,{value:e}),t}(Ht.close),Ht.closeSync=function(e){function t(t){e.apply(Ht,arguments),Qt()}return Object.defineProperty(t,$t,{value:e}),t}(Ht.closeSync),/\bgfs4\b/i.test(process.env.NODE_DEBUG||"")&&process.on("exit",(function(){zt(Ht[jt]),l.equal(Ht[jt].length,0)}))}p[jt]||Wt(p,Ht[jt]);var qt,Yt=Zt(Jt(Ht));function Zt(e){Gt(e),e.gracefulify=Zt,e.createReadStream=function(t,n){return new e.ReadStream(t,n)},e.createWriteStream=function(t,n){return new e.WriteStream(t,n)};var t=e.readFile;e.readFile=function(e,n,r){"function"==typeof n&&(r=n,n=null);return function e(n,r,u,o){return t(n,r,(function(t){!t||"EMFILE"!==t.code&&"ENFILE"!==t.code?"function"==typeof u&&u.apply(this,arguments):Xt([e,[n,r,u],t,o||Date.now(),Date.now()])}))}(e,n,r)};var n=e.writeFile;e.writeFile=function(e,t,r,u){"function"==typeof r&&(u=r,r=null);return function e(t,r,u,o,i){return n(t,r,u,(function(n){!n||"EMFILE"!==n.code&&"ENFILE"!==n.code?"function"==typeof o&&o.apply(this,arguments):Xt([e,[t,r,u,o],n,i||Date.now(),Date.now()])}))}(e,t,r,u)};var r=e.appendFile;r&&(e.appendFile=function(e,t,n,u){"function"==typeof n&&(u=n,n=null);return function e(t,n,u,o,i){return r(t,n,u,(function(r){!r||"EMFILE"!==r.code&&"ENFILE"!==r.code?"function"==typeof o&&o.apply(this,arguments):Xt([e,[t,n,u,o],r,i||Date.now(),Date.now()])}))}(e,t,n,u)});var u=e.copyFile;u&&(e.copyFile=function(e,t,n,r){"function"==typeof n&&(r=n,n=0);return function e(t,n,r,o,i){return u(t,n,r,(function(u){!u||"EMFILE"!==u.code&&"ENFILE"!==u.code?"function"==typeof o&&o.apply(this,arguments):Xt([e,[t,n,r,o],u,i||Date.now(),Date.now()])}))}(e,t,n,r)});var o=e.readdir;e.readdir=function(e,t,n){"function"==typeof t&&(n=t,t=null);var r=i.test(process.version)?function(e,t,n,r){return o(e,u(e,t,n,r))}:function(e,t,n,r){return o(e,t,u(e,t,n,r))};return r(e,t,n);function u(e,t,n,u){return function(o,i){!o||"EMFILE"!==o.code&&"ENFILE"!==o.code?(i&&i.sort&&i.sort(),"function"==typeof n&&n.call(this,o,i)):Xt([r,[e,t,n],o,u||Date.now(),Date.now()])}}};var i=/^v[0-5]\./;if("v0.8"===process.version.substr(0,4)){var s=Vt(e);D=s.ReadStream,d=s.WriteStream}var a=e.ReadStream;a&&(D.prototype=Object.create(a.prototype),D.prototype.open=function(){var e=this;E(e.path,e.flags,e.mode,(function(t,n){t?(e.autoClose&&e.destroy(),e.emit("error",t)):(e.fd=n,e.emit("open",n),e.read())}))});var c=e.WriteStream;c&&(d.prototype=Object.create(c.prototype),d.prototype.open=function(){var e=this;E(e.path,e.flags,e.mode,(function(t,n){t?(e.destroy(),e.emit("error",t)):(e.fd=n,e.emit("open",n))}))}),Object.defineProperty(e,"ReadStream",{get:function(){return D},set:function(e){D=e},enumerable:!0,configurable:!0}),Object.defineProperty(e,"WriteStream",{get:function(){return d},set:function(e){d=e},enumerable:!0,configurable:!0});var l=D;Object.defineProperty(e,"FileReadStream",{get:function(){return l},set:function(e){l=e},enumerable:!0,configurable:!0});var f=d;function D(e,t){return this instanceof D?(a.apply(this,arguments),this):D.apply(Object.create(D.prototype),arguments)}function d(e,t){return this instanceof d?(c.apply(this,arguments),this):d.apply(Object.create(d.prototype),arguments)}Object.defineProperty(e,"FileWriteStream",{get:function(){return f},set:function(e){f=e},enumerable:!0,configurable:!0});var p=e.open;function E(e,t,n,r){return"function"==typeof n&&(r=n,n=null),function e(t,n,r,u,o){return p(t,n,r,(function(i,s){!i||"EMFILE"!==i.code&&"ENFILE"!==i.code?"function"==typeof u&&u.apply(this,arguments):Xt([e,[t,n,r,u],i,o||Date.now(),Date.now()])}))}(e,t,n,r)}return e.open=E,e}function Xt(e){zt("ENQUEUE",e[0].name,e[1]),Ht[jt].push(e),en()}function Qt(){for(var e=Date.now(),t=0;t<Ht[jt].length;++t)Ht[jt][t].length>2&&(Ht[jt][t][3]=e,Ht[jt][t][4]=e);en()}function en(){if(clearTimeout(qt),qt=void 0,0!==Ht[jt].length){var e=Ht[jt].shift(),t=e[0],n=e[1],r=e[2],u=e[3],o=e[4];if(void 0===u)zt("RETRY",t.name,n),t.apply(null,n);else if(Date.now()-u>=6e4){zt("TIMEOUT",t.name,n);var i=n.pop();"function"==typeof i&&i.call(null,r)}else{var s=Date.now()-o,a=Math.max(o-u,1);s>=Math.min(1.2*a,100)?(zt("RETRY",t.name,n),t.apply(null,n.concat([u]))):Ht[jt].push(e)}void 0===qt&&(qt=setTimeout(en,0))}}process.env.TEST_GRACEFUL_FS_GLOBAL_PATCH&&!Ht.__patched&&(Yt=Zt(Ht),Ht.__patched=!0),function(e){const t=bt.fromCallback,n=Yt,r=["access","appendFile","chmod","chown","close","copyFile","fchmod","fchown","fdatasync","fstat","fsync","ftruncate","futimes","lchown","lchmod","link","lstat","mkdir","mkdtemp","open","readFile","readdir","readlink","realpath","rename","rmdir","stat","symlink","truncate","unlink","utimes","writeFile"].filter((e=>"function"==typeof n[e]));Object.keys(n).forEach((t=>{"promises"!==t&&(e[t]=n[t])})),r.forEach((r=>{e[r]=t(n[r])})),e.exists=function(e,t){return"function"==typeof t?n.exists(e,t):new Promise((t=>n.exists(e,t)))},e.read=function(e,t,r,u,o,i){return"function"==typeof i?n.read(e,t,r,u,o,i):new Promise(((i,s)=>{n.read(e,t,r,u,o,((e,t,n)=>{if(e)return s(e);i({bytesRead:t,buffer:n})}))}))},e.write=function(e,t,...r){return"function"==typeof r[r.length-1]?n.write(e,t,...r):new Promise(((u,o)=>{n.write(e,t,...r,((e,t,n)=>{if(e)return o(e);u({bytesWritten:t,buffer:n})}))}))},"function"==typeof n.realpath.native&&(e.realpath.native=t(n.realpath.native))}(_t);const tn=e;function nn(e){return(e=tn.normalize(tn.resolve(e)).split(tn.sep)).length>0?e[0]:null}const rn=/[<>:"|?*]/;var un=function(e){const t=nn(e);return e=e.replace(t,""),rn.test(e)};const on=Yt,sn=e,an=un,cn=parseInt("0777",8);var ln=function e(t,n,r,u){if("function"==typeof n?(r=n,n={}):n&&"object"==typeof n||(n={mode:n}),"win32"===process.platform&&an(t)){const e=new Error(t+" contains invalid WIN32 path characters.");return e.code="EINVAL",r(e)}let o=n.mode;const i=n.fs||on;void 0===o&&(o=cn&~process.umask()),u||(u=null),r=r||function(){},t=sn.resolve(t),i.mkdir(t,o,(o=>{if(!o)return r(null,u=u||t);if("ENOENT"===o.code){if(sn.dirname(t)===t)return r(o);e(sn.dirname(t),n,((u,o)=>{u?r(u,o):e(t,n,r,o)}))}else i.stat(t,((e,t)=>{e||!t.isDirectory()?r(o,u):r(null,u)}))}))};const fn=Yt,Dn=e,dn=un,pn=parseInt("0777",8);var En=function e(t,n,r){n&&"object"==typeof n||(n={mode:n});let u=n.mode;const o=n.fs||fn;if("win32"===process.platform&&dn(t)){const e=new Error(t+" contains invalid WIN32 path characters.");throw e.code="EINVAL",e}void 0===u&&(u=pn&~process.umask()),r||(r=null),t=Dn.resolve(t);try{o.mkdirSync(t,u),r=r||t}catch(u){if("ENOENT"===u.code){if(Dn.dirname(t)===t)throw u;r=e(Dn.dirname(t),n,r),e(t,n,r)}else{let e;try{e=o.statSync(t)}catch(e){throw u}if(!e.isDirectory())throw u}}return r};const hn=(0,bt.fromCallback)(ln);var Cn={mkdirs:hn,mkdirsSync:En,mkdirp:hn,mkdirpSync:En,ensureDir:hn,ensureDirSync:En};const mn=Yt;var Fn=function(e,t,n,r){mn.open(e,"r+",((e,u)=>{if(e)return r(e);mn.futimes(u,t,n,(e=>{mn.close(u,(t=>{r&&r(e||t)}))}))}))},yn=function(e,t,n){const r=mn.openSync(e,"r+");return mn.futimesSync(r,t,n),mn.closeSync(r)};const gn=Yt,An=e,vn=10,Sn=5,wn=0,On=process.versions.node.split("."),_n=Number.parseInt(On[0],10),bn=Number.parseInt(On[1],10),Bn=Number.parseInt(On[2],10);function xn(){if(_n>vn)return!0;if(_n===vn){if(bn>Sn)return!0;if(bn===Sn&&Bn>=wn)return!0}return!1}function Pn(e,t){const n=An.resolve(e).split(An.sep).filter((e=>e)),r=An.resolve(t).split(An.sep).filter((e=>e));return n.reduce(((e,t,n)=>e&&r[n]===t),!0)}function In(e,t,n){return`Cannot ${n} '${e}' to a subdirectory of itself, '${t}'.`}var Nn,Tn,kn={checkPaths:function(e,t,n,r){!function(e,t,n){xn()?gn.stat(e,{bigint:!0},((e,r)=>{if(e)return n(e);gn.stat(t,{bigint:!0},((e,t)=>e?"ENOENT"===e.code?n(null,{srcStat:r,destStat:null}):n(e):n(null,{srcStat:r,destStat:t})))})):gn.stat(e,((e,r)=>{if(e)return n(e);gn.stat(t,((e,t)=>e?"ENOENT"===e.code?n(null,{srcStat:r,destStat:null}):n(e):n(null,{srcStat:r,destStat:t})))}))}(e,t,((u,o)=>{if(u)return r(u);const{srcStat:i,destStat:s}=o;return s&&s.ino&&s.dev&&s.ino===i.ino&&s.dev===i.dev?r(new Error("Source and destination must not be the same.")):i.isDirectory()&&Pn(e,t)?r(new Error(In(e,t,n))):r(null,{srcStat:i,destStat:s})}))},checkPathsSync:function(e,t,n){const{srcStat:r,destStat:u}=function(e,t){let n,r;n=xn()?gn.statSync(e,{bigint:!0}):gn.statSync(e);try{r=xn()?gn.statSync(t,{bigint:!0}):gn.statSync(t)}catch(e){if("ENOENT"===e.code)return{srcStat:n,destStat:null};throw e}return{srcStat:n,destStat:r}}(e,t);if(u&&u.ino&&u.dev&&u.ino===r.ino&&u.dev===r.dev)throw new Error("Source and destination must not be the same.");if(r.isDirectory()&&Pn(e,t))throw new Error(In(e,t,n));return{srcStat:r,destStat:u}},checkParentPaths:function e(t,n,r,u,o){const i=An.resolve(An.dirname(t)),s=An.resolve(An.dirname(r));if(s===i||s===An.parse(s).root)return o();xn()?gn.stat(s,{bigint:!0},((i,a)=>i?"ENOENT"===i.code?o():o(i):a.ino&&a.dev&&a.ino===n.ino&&a.dev===n.dev?o(new Error(In(t,r,u))):e(t,n,s,u,o))):gn.stat(s,((i,a)=>i?"ENOENT"===i.code?o():o(i):a.ino&&a.dev&&a.ino===n.ino&&a.dev===n.dev?o(new Error(In(t,r,u))):e(t,n,s,u,o)))},checkParentPathsSync:function e(t,n,r,u){const o=An.resolve(An.dirname(t)),i=An.resolve(An.dirname(r));if(i===o||i===An.parse(i).root)return;let s;try{s=xn()?gn.statSync(i,{bigint:!0}):gn.statSync(i)}catch(e){if("ENOENT"===e.code)return;throw e}if(s.ino&&s.dev&&s.ino===n.ino&&s.dev===n.dev)throw new Error(In(t,r,u));return e(t,n,i,u)},isSrcSubdir:Pn};const Rn=Yt,Mn=e,Ln=Cn.mkdirsSync,jn=yn,$n=kn;function Hn(e,t,n,r){if(!r.filter||r.filter(t,n))return function(e,t,n,r){const u=r.dereference?Rn.statSync:Rn.lstatSync,o=u(t);if(o.isDirectory())return function(e,t,n,r,u){if(!t)return function(e,t,n,r){return Rn.mkdirSync(n),Vn(t,n,r),Rn.chmodSync(n,e.mode)}(e,n,r,u);if(t&&!t.isDirectory())throw new Error(`Cannot overwrite non-directory '${r}' with directory '${n}'.`);return Vn(n,r,u)}(o,e,t,n,r);if(o.isFile()||o.isCharacterDevice()||o.isBlockDevice())return function(e,t,n,r,u){return t?function(e,t,n,r){if(r.overwrite)return Rn.unlinkSync(n),Gn(e,t,n,r);if(r.errorOnExist)throw new Error(`'${n}' already exists`)}(e,n,r,u):Gn(e,n,r,u)}(o,e,t,n,r);if(o.isSymbolicLink())return function(e,t,n,r){let u=Rn.readlinkSync(t);r.dereference&&(u=Mn.resolve(process.cwd(),u));if(e){let e;try{e=Rn.readlinkSync(n)}catch(e){if("EINVAL"===e.code||"UNKNOWN"===e.code)return Rn.symlinkSync(u,n);throw e}if(r.dereference&&(e=Mn.resolve(process.cwd(),e)),$n.isSrcSubdir(u,e))throw new Error(`Cannot copy '${u}' to a subdirectory of itself, '${e}'.`);if(Rn.statSync(n).isDirectory()&&$n.isSrcSubdir(e,u))throw new Error(`Cannot overwrite '${e}' with '${u}'.`);return function(e,t){return Rn.unlinkSync(t),Rn.symlinkSync(e,t)}(u,n)}return Rn.symlinkSync(u,n)}(e,t,n,r)}(e,t,n,r)}function Gn(e,t,n,r){return"function"==typeof Rn.copyFileSync?(Rn.copyFileSync(t,n),Rn.chmodSync(n,e.mode),r.preserveTimestamps?jn(n,e.atime,e.mtime):void 0):function(e,t,n,r){const u=65536,o=(Tn?Nn:(Tn=1,Nn=function(e){if("function"==typeof Buffer.allocUnsafe)try{return Buffer.allocUnsafe(e)}catch(t){return new Buffer(e)}return new Buffer(e)}))(u),i=Rn.openSync(t,"r"),s=Rn.openSync(n,"w",e.mode);let a=0;for(;a<e.size;){const e=Rn.readSync(i,o,0,u,a);Rn.writeSync(s,o,0,e),a+=e}r.preserveTimestamps&&Rn.futimesSync(s,e.atime,e.mtime);Rn.closeSync(i),Rn.closeSync(s)}(e,t,n,r)}function Vn(e,t,n){Rn.readdirSync(e).forEach((r=>function(e,t,n,r){const u=Mn.join(t,e),o=Mn.join(n,e),{destStat:i}=$n.checkPathsSync(u,o,"copy");return Hn(i,u,o,r)}(r,e,t,n)))}var Jn=function(e,t,n){"function"==typeof n&&(n={filter:n}),(n=n||{}).clobber=!("clobber"in n)||!!n.clobber,n.overwrite="overwrite"in n?!!n.overwrite:n.clobber,n.preserveTimestamps&&"ia32"===process.arch&&console.warn("fs-extra: Using the preserveTimestamps option in 32-bit node is not recommended;\n\n    see https://github.com/jprichardson/node-fs-extra/issues/269");const{srcStat:r,destStat:u}=$n.checkPathsSync(e,t,"copy");return $n.checkParentPathsSync(e,r,t,"copy"),function(e,t,n,r){if(r.filter&&!r.filter(t,n))return;const u=Mn.dirname(n);Rn.existsSync(u)||Ln(u);return Hn(e,t,n,r)}(u,e,t,n)},Un={copySync:Jn};const Wn=bt.fromPromise,zn=_t;var Kn={pathExists:Wn((function(e){return zn.access(e).then((()=>!0)).catch((()=>!1))})),pathExistsSync:zn.existsSync};const qn=Yt,Yn=e,Zn=Cn.mkdirs,Xn=Kn.pathExists,Qn=Fn,er=kn;function tr(e,t,n,r,u){const o=Yn.dirname(n);Xn(o,((i,s)=>i?u(i):s?rr(e,t,n,r,u):void Zn(o,(o=>o?u(o):rr(e,t,n,r,u)))))}function nr(e,t,n,r,u,o){Promise.resolve(u.filter(n,r)).then((i=>i?e(t,n,r,u,o):o()),(e=>o(e)))}function rr(e,t,n,r,u){return r.filter?nr(ur,e,t,n,r,u):ur(e,t,n,r,u)}function ur(e,t,n,r,u){(r.dereference?qn.stat:qn.lstat)(t,((o,i)=>o?u(o):i.isDirectory()?function(e,t,n,r,u,o){if(!t)return function(e,t,n,r,u){qn.mkdir(n,(o=>{if(o)return u(o);sr(t,n,r,(t=>t?u(t):qn.chmod(n,e.mode,u)))}))}(e,n,r,u,o);if(t&&!t.isDirectory())return o(new Error(`Cannot overwrite non-directory '${r}' with directory '${n}'.`));return sr(n,r,u,o)}(i,e,t,n,r,u):i.isFile()||i.isCharacterDevice()||i.isBlockDevice()?function(e,t,n,r,u,o){return t?function(e,t,n,r,u){if(!r.overwrite)return r.errorOnExist?u(new Error(`'${n}' already exists`)):u();qn.unlink(n,(o=>o?u(o):or(e,t,n,r,u)))}(e,n,r,u,o):or(e,n,r,u,o)}(i,e,t,n,r,u):i.isSymbolicLink()?function(e,t,n,r,u){qn.readlink(t,((t,o)=>t?u(t):(r.dereference&&(o=Yn.resolve(process.cwd(),o)),e?void qn.readlink(n,((t,i)=>t?"EINVAL"===t.code||"UNKNOWN"===t.code?qn.symlink(o,n,u):u(t):(r.dereference&&(i=Yn.resolve(process.cwd(),i)),er.isSrcSubdir(o,i)?u(new Error(`Cannot copy '${o}' to a subdirectory of itself, '${i}'.`)):e.isDirectory()&&er.isSrcSubdir(i,o)?u(new Error(`Cannot overwrite '${i}' with '${o}'.`)):function(e,t,n){qn.unlink(t,(r=>r?n(r):qn.symlink(e,t,n)))}(o,n,u)))):qn.symlink(o,n,u))))}(e,t,n,r,u):void 0))}function or(e,t,n,r,u){return"function"==typeof qn.copyFile?qn.copyFile(t,n,(t=>t?u(t):ir(e,n,r,u))):function(e,t,n,r,u){const o=qn.createReadStream(t);o.on("error",(e=>u(e))).once("open",(()=>{const t=qn.createWriteStream(n,{mode:e.mode});t.on("error",(e=>u(e))).on("open",(()=>o.pipe(t))).once("close",(()=>ir(e,n,r,u)))}))}(e,t,n,r,u)}function ir(e,t,n,r){qn.chmod(t,e.mode,(u=>u?r(u):n.preserveTimestamps?Qn(t,e.atime,e.mtime,r):r()))}function sr(e,t,n,r){qn.readdir(e,((u,o)=>u?r(u):ar(o,e,t,n,r)))}function ar(e,t,n,r,u){const o=e.pop();return o?function(e,t,n,r,u,o){const i=Yn.join(n,t),s=Yn.join(r,t);er.checkPaths(i,s,"copy",((t,a)=>{if(t)return o(t);const{destStat:c}=a;rr(c,i,s,u,(t=>t?o(t):ar(e,n,r,u,o)))}))}(e,o,t,n,r,u):u()}var cr=function(e,t,n,r){"function"!=typeof n||r?"function"==typeof n&&(n={filter:n}):(r=n,n={}),r=r||function(){},(n=n||{}).clobber=!("clobber"in n)||!!n.clobber,n.overwrite="overwrite"in n?!!n.overwrite:n.clobber,n.preserveTimestamps&&"ia32"===process.arch&&console.warn("fs-extra: Using the preserveTimestamps option in 32-bit node is not recommended;\n\n    see https://github.com/jprichardson/node-fs-extra/issues/269"),er.checkPaths(e,t,"copy",((u,o)=>{if(u)return r(u);const{srcStat:i,destStat:s}=o;er.checkParentPaths(e,i,t,"copy",(u=>u?r(u):n.filter?nr(tr,s,e,t,n,r):tr(s,e,t,n,r)))}))};var lr={copy:(0,bt.fromCallback)(cr)};const fr=Yt,Dr=e,dr=l,pr="win32"===process.platform;function Er(e){["unlink","chmod","stat","lstat","rmdir","readdir"].forEach((t=>{e[t]=e[t]||fr[t],e[t+="Sync"]=e[t]||fr[t]})),e.maxBusyTries=e.maxBusyTries||3}function hr(e,t,n){let r=0;"function"==typeof t&&(n=t,t={}),dr(e,"rimraf: missing path"),dr.strictEqual(typeof e,"string","rimraf: path should be a string"),dr.strictEqual(typeof n,"function","rimraf: callback function required"),dr(t,"rimraf: invalid options argument provided"),dr.strictEqual(typeof t,"object","rimraf: options should be object"),Er(t),Cr(e,t,(function u(o){if(o){if(("EBUSY"===o.code||"ENOTEMPTY"===o.code||"EPERM"===o.code)&&r<t.maxBusyTries){r++;return setTimeout((()=>Cr(e,t,u)),100*r)}"ENOENT"===o.code&&(o=null)}n(o)}))}function Cr(e,t,n){dr(e),dr(t),dr("function"==typeof n),t.lstat(e,((r,u)=>r&&"ENOENT"===r.code?n(null):r&&"EPERM"===r.code&&pr?mr(e,t,r,n):u&&u.isDirectory()?yr(e,t,r,n):void t.unlink(e,(r=>{if(r){if("ENOENT"===r.code)return n(null);if("EPERM"===r.code)return pr?mr(e,t,r,n):yr(e,t,r,n);if("EISDIR"===r.code)return yr(e,t,r,n)}return n(r)}))))}function mr(e,t,n,r){dr(e),dr(t),dr("function"==typeof r),n&&dr(n instanceof Error),t.chmod(e,438,(u=>{u?r("ENOENT"===u.code?null:n):t.stat(e,((u,o)=>{u?r("ENOENT"===u.code?null:n):o.isDirectory()?yr(e,t,n,r):t.unlink(e,r)}))}))}function Fr(e,t,n){let r;dr(e),dr(t),n&&dr(n instanceof Error);try{t.chmodSync(e,438)}catch(e){if("ENOENT"===e.code)return;throw n}try{r=t.statSync(e)}catch(e){if("ENOENT"===e.code)return;throw n}r.isDirectory()?Ar(e,t,n):t.unlinkSync(e)}function yr(e,t,n,r){dr(e),dr(t),n&&dr(n instanceof Error),dr("function"==typeof r),t.rmdir(e,(u=>{!u||"ENOTEMPTY"!==u.code&&"EEXIST"!==u.code&&"EPERM"!==u.code?u&&"ENOTDIR"===u.code?r(n):r(u):function(e,t,n){dr(e),dr(t),dr("function"==typeof n),t.readdir(e,((r,u)=>{if(r)return n(r);let o,i=u.length;if(0===i)return t.rmdir(e,n);u.forEach((r=>{hr(Dr.join(e,r),t,(r=>{if(!o)return r?n(o=r):void(0==--i&&t.rmdir(e,n))}))}))}))}(e,t,r)}))}function gr(e,t){let n;Er(t=t||{}),dr(e,"rimraf: missing path"),dr.strictEqual(typeof e,"string","rimraf: path should be a string"),dr(t,"rimraf: missing options"),dr.strictEqual(typeof t,"object","rimraf: options should be object");try{n=t.lstatSync(e)}catch(n){if("ENOENT"===n.code)return;"EPERM"===n.code&&pr&&Fr(e,t,n)}try{n&&n.isDirectory()?Ar(e,t,null):t.unlinkSync(e)}catch(n){if("ENOENT"===n.code)return;if("EPERM"===n.code)return pr?Fr(e,t,n):Ar(e,t,n);if("EISDIR"!==n.code)throw n;Ar(e,t,n)}}function Ar(e,t,n){dr(e),dr(t),n&&dr(n instanceof Error);try{t.rmdirSync(e)}catch(r){if("ENOTDIR"===r.code)throw n;if("ENOTEMPTY"===r.code||"EEXIST"===r.code||"EPERM"===r.code)!function(e,t){if(dr(e),dr(t),t.readdirSync(e).forEach((n=>gr(Dr.join(e,n),t))),!pr){return t.rmdirSync(e,t)}{const n=Date.now();do{try{return t.rmdirSync(e,t)}catch(e){}}while(Date.now()-n<500)}}(e,t);else if("ENOENT"!==r.code)throw r}}var vr=hr;hr.sync=gr;const Sr=vr;var wr={remove:(0,bt.fromCallback)(Sr),removeSync:Sr.sync};const Or=bt.fromCallback,_r=Yt,br=e,Br=Cn,xr=wr,Pr=Or((function(e,t){t=t||function(){},_r.readdir(e,((n,r)=>{if(n)return Br.mkdirs(e,t);r=r.map((t=>br.join(e,t))),function e(){const n=r.pop();if(!n)return t();xr.remove(n,(n=>{if(n)return t(n);e()}))}()}))}));function Ir(e){let t;try{t=_r.readdirSync(e)}catch(t){return Br.mkdirsSync(e)}t.forEach((t=>{t=br.join(e,t),xr.removeSync(t)}))}var Nr={emptyDirSync:Ir,emptydirSync:Ir,emptyDir:Pr,emptydir:Pr};const Tr=bt.fromCallback,kr=e,Rr=Yt,Mr=Cn,Lr=Kn.pathExists;var jr={createFile:Tr((function(e,t){function n(){Rr.writeFile(e,"",(e=>{if(e)return t(e);t()}))}Rr.stat(e,((r,u)=>{if(!r&&u.isFile())return t();const o=kr.dirname(e);Lr(o,((e,r)=>e?t(e):r?n():void Mr.mkdirs(o,(e=>{if(e)return t(e);n()}))))}))})),createFileSync:function(e){let t;try{t=Rr.statSync(e)}catch(e){}if(t&&t.isFile())return;const n=kr.dirname(e);Rr.existsSync(n)||Mr.mkdirsSync(n),Rr.writeFileSync(e,"")}};const $r=bt.fromCallback,Hr=e,Gr=Yt,Vr=Cn,Jr=Kn.pathExists;var Ur={createLink:$r((function(e,t,n){function r(e,t){Gr.link(e,t,(e=>{if(e)return n(e);n(null)}))}Jr(t,((u,o)=>u?n(u):o?n(null):void Gr.lstat(e,(u=>{if(u)return u.message=u.message.replace("lstat","ensureLink"),n(u);const o=Hr.dirname(t);Jr(o,((u,i)=>u?n(u):i?r(e,t):void Vr.mkdirs(o,(u=>{if(u)return n(u);r(e,t)}))))}))))})),createLinkSync:function(e,t){if(Gr.existsSync(t))return;try{Gr.lstatSync(e)}catch(e){throw e.message=e.message.replace("lstat","ensureLink"),e}const n=Hr.dirname(t);return Gr.existsSync(n)||Vr.mkdirsSync(n),Gr.linkSync(e,t)}};const Wr=e,zr=Yt,Kr=Kn.pathExists;var qr={symlinkPaths:function(e,t,n){if(Wr.isAbsolute(e))return zr.lstat(e,(t=>t?(t.message=t.message.replace("lstat","ensureSymlink"),n(t)):n(null,{toCwd:e,toDst:e})));{const r=Wr.dirname(t),u=Wr.join(r,e);return Kr(u,((t,o)=>t?n(t):o?n(null,{toCwd:u,toDst:e}):zr.lstat(e,(t=>t?(t.message=t.message.replace("lstat","ensureSymlink"),n(t)):n(null,{toCwd:e,toDst:Wr.relative(r,e)})))))}},symlinkPathsSync:function(e,t){let n;if(Wr.isAbsolute(e)){if(n=zr.existsSync(e),!n)throw new Error("absolute srcpath does not exist");return{toCwd:e,toDst:e}}{const r=Wr.dirname(t),u=Wr.join(r,e);if(n=zr.existsSync(u),n)return{toCwd:u,toDst:e};if(n=zr.existsSync(e),!n)throw new Error("relative srcpath does not exist");return{toCwd:e,toDst:Wr.relative(r,e)}}}};const Yr=Yt;var Zr={symlinkType:function(e,t,n){if(n="function"==typeof t?t:n,t="function"!=typeof t&&t)return n(null,t);Yr.lstat(e,((e,r)=>{if(e)return n(null,"file");t=r&&r.isDirectory()?"dir":"file",n(null,t)}))},symlinkTypeSync:function(e,t){let n;if(t)return t;try{n=Yr.lstatSync(e)}catch(e){return"file"}return n&&n.isDirectory()?"dir":"file"}};const Xr=bt.fromCallback,Qr=e,eu=Yt,tu=Cn.mkdirs,nu=Cn.mkdirsSync,ru=qr.symlinkPaths,uu=qr.symlinkPathsSync,ou=Zr.symlinkType,iu=Zr.symlinkTypeSync,su=Kn.pathExists;var au={createSymlink:Xr((function(e,t,n,r){r="function"==typeof n?n:r,n="function"!=typeof n&&n,su(t,((u,o)=>u?r(u):o?r(null):void ru(e,t,((u,o)=>{if(u)return r(u);e=o.toDst,ou(o.toCwd,n,((n,u)=>{if(n)return r(n);const o=Qr.dirname(t);su(o,((n,i)=>n?r(n):i?eu.symlink(e,t,u,r):void tu(o,(n=>{if(n)return r(n);eu.symlink(e,t,u,r)}))))}))}))))})),createSymlinkSync:function(e,t,n){if(eu.existsSync(t))return;const r=uu(e,t);e=r.toDst,n=iu(r.toCwd,n);const u=Qr.dirname(t);return eu.existsSync(u)||nu(u),eu.symlinkSync(e,t,n)}};var cu,lu={createFile:jr.createFile,createFileSync:jr.createFileSync,ensureFile:jr.createFile,ensureFileSync:jr.createFileSync,createLink:Ur.createLink,createLinkSync:Ur.createLinkSync,ensureLink:Ur.createLink,ensureLinkSync:Ur.createLinkSync,createSymlink:au.createSymlink,createSymlinkSync:au.createSymlinkSync,ensureSymlink:au.createSymlink,ensureSymlinkSync:au.createSymlinkSync};try{cu=Yt}catch(e){cu=n}function fu(e,t){var n,r="\n";return"object"==typeof t&&null!==t&&(t.spaces&&(n=t.spaces),t.EOL&&(r=t.EOL)),JSON.stringify(e,t?t.replacer:null,n).replace(/\n/g,r)+r}function Du(e){return Buffer.isBuffer(e)&&(e=e.toString("utf8")),e=e.replace(/^\uFEFF/,"")}var du={readFile:function(e,t,n){null==n&&(n=t,t={}),"string"==typeof t&&(t={encoding:t});var r=(t=t||{}).fs||cu,u=!0;"throws"in t&&(u=t.throws),r.readFile(e,t,(function(r,o){if(r)return n(r);var i;o=Du(o);try{i=JSON.parse(o,t?t.reviver:null)}catch(t){return u?(t.message=e+": "+t.message,n(t)):n(null,null)}n(null,i)}))},readFileSync:function(e,t){"string"==typeof(t=t||{})&&(t={encoding:t});var n=t.fs||cu,r=!0;"throws"in t&&(r=t.throws);try{var u=n.readFileSync(e,t);return u=Du(u),JSON.parse(u,t.reviver)}catch(t){if(r)throw t.message=e+": "+t.message,t;return null}},writeFile:function(e,t,n,r){null==r&&(r=n,n={});var u=(n=n||{}).fs||cu,o="";try{o=fu(t,n)}catch(e){return void(r&&r(e,null))}u.writeFile(e,o,n,r)},writeFileSync:function(e,t,n){var r=(n=n||{}).fs||cu,u=fu(t,n);return r.writeFileSync(e,u,n)}},pu=du;const Eu=bt.fromCallback,hu=pu;var Cu={readJson:Eu(hu.readFile),readJsonSync:hu.readFileSync,writeJson:Eu(hu.writeFile),writeJsonSync:hu.writeFileSync};const mu=e,Fu=Cn,yu=Kn.pathExists,gu=Cu;var Au=function(e,t,n,r){"function"==typeof n&&(r=n,n={});const u=mu.dirname(e);yu(u,((o,i)=>o?r(o):i?gu.writeJson(e,t,n,r):void Fu.mkdirs(u,(u=>{if(u)return r(u);gu.writeJson(e,t,n,r)}))))};const vu=Yt,Su=e,wu=Cn,Ou=Cu;var _u=function(e,t,n){const r=Su.dirname(e);vu.existsSync(r)||wu.mkdirsSync(r),Ou.writeJsonSync(e,t,n)};const bu=bt.fromCallback,Bu=Cu;Bu.outputJson=bu(Au),Bu.outputJsonSync=_u,Bu.outputJSON=Bu.outputJson,Bu.outputJSONSync=Bu.outputJsonSync,Bu.writeJSON=Bu.writeJson,Bu.writeJSONSync=Bu.writeJsonSync,Bu.readJSON=Bu.readJson,Bu.readJSONSync=Bu.readJsonSync;var xu=Bu;const Pu=Yt,Iu=e,Nu=Un.copySync,Tu=wr.removeSync,ku=Cn.mkdirpSync,Ru=kn;function Mu(e,t,n){try{Pu.renameSync(e,t)}catch(r){if("EXDEV"!==r.code)throw r;return function(e,t,n){const r={overwrite:n,errorOnExist:!0};return Nu(e,t,r),Tu(e)}(e,t,n)}}var Lu=function(e,t,n){const r=(n=n||{}).overwrite||n.clobber||!1,{srcStat:u}=Ru.checkPathsSync(e,t,"move");return Ru.checkParentPathsSync(e,u,t,"move"),ku(Iu.dirname(t)),function(e,t,n){if(n)return Tu(t),Mu(e,t,n);if(Pu.existsSync(t))throw new Error("dest already exists.");return Mu(e,t,n)}(e,t,r)},ju={moveSync:Lu};const $u=Yt,Hu=e,Gu=lr.copy,Vu=wr.remove,Ju=Cn.mkdirp,Uu=Kn.pathExists,Wu=kn;function zu(e,t,n,r){$u.rename(e,t,(u=>u?"EXDEV"!==u.code?r(u):function(e,t,n,r){const u={overwrite:n,errorOnExist:!0};Gu(e,t,u,(t=>t?r(t):Vu(e,r)))}(e,t,n,r):r()))}var Ku=function(e,t,n,r){"function"==typeof n&&(r=n,n={});const u=n.overwrite||n.clobber||!1;Wu.checkPaths(e,t,"move",((n,o)=>{if(n)return r(n);const{srcStat:i}=o;Wu.checkParentPaths(e,i,t,"move",(n=>{if(n)return r(n);Ju(Hu.dirname(t),(n=>n?r(n):function(e,t,n,r){if(n)return Vu(t,(u=>u?r(u):zu(e,t,n,r)));Uu(t,((u,o)=>u?r(u):o?r(new Error("dest already exists.")):zu(e,t,n,r)))}(e,t,u,r)))}))}))};var qu={move:(0,bt.fromCallback)(Ku)};const Yu=bt.fromCallback,Zu=Yt,Xu=e,Qu=Cn,eo=Kn.pathExists;var to={outputFile:Yu((function(e,t,n,r){"function"==typeof n&&(r=n,n="utf8");const u=Xu.dirname(e);eo(u,((o,i)=>o?r(o):i?Zu.writeFile(e,t,n,r):void Qu.mkdirs(u,(u=>{if(u)return r(u);Zu.writeFile(e,t,n,r)}))))})),outputFileSync:function(e,...t){const n=Xu.dirname(e);if(Zu.existsSync(n))return Zu.writeFileSync(e,...t);Qu.mkdirsSync(n),Zu.writeFileSync(e,...t)}};!function(e){e.exports=Object.assign({},_t,Un,lr,Nr,lu,xu,Cn,ju,qu,to,Kn,wr);const t=n;Object.getOwnPropertyDescriptor(t,"promises")&&Object.defineProperty(e.exports,"promises",{get:()=>t.promises})}(Ot);const no=$.exports("streamroller:fileNameFormatter"),ro=e;const uo=$.exports("streamroller:fileNameParser"),oo=le.exports;const io=$.exports("streamroller:moveAndMaybeCompressFile"),so=Ot.exports,ao=f;var co=async(e,t,n)=>{if(n=function(e){const t={mode:parseInt("0600",8),compress:!1},n=Object.assign({},t,e);return io(`_parseOption: moveAndMaybeCompressFile called with option=${JSON.stringify(n)}`),n}(n),e!==t){if(await so.pathExists(e))if(io(`moveAndMaybeCompressFile: moving file from ${e} to ${t} ${n.compress?"with":"without"} compress`),n.compress)await new Promise(((r,u)=>{let o=!1;const i=so.createWriteStream(t,{mode:n.mode,flags:"wx"}).on("open",(()=>{o=!0;const t=so.createReadStream(e).on("open",(()=>{t.pipe(ao.createGzip()).pipe(i)})).on("error",(t=>{io(`moveAndMaybeCompressFile: error reading ${e}`,t),i.destroy(t)}))})).on("finish",(()=>{io(`moveAndMaybeCompressFile: finished compressing ${t}, deleting ${e}`),so.unlink(e).then(r).catch((t=>{io(`moveAndMaybeCompressFile: error deleting ${e}, truncating instead`,t),so.truncate(e).then(r).catch((t=>{io(`moveAndMaybeCompressFile: error truncating ${e}`,t),u(t)}))}))})).on("error",(e=>{o?(io(`moveAndMaybeCompressFile: error writing ${t}, deleting`,e),so.unlink(t).then((()=>{u(e)})).catch((e=>{io(`moveAndMaybeCompressFile: error deleting ${t}`,e),u(e)}))):(io(`moveAndMaybeCompressFile: error creating ${t}`,e),u(e))}))})).catch((()=>{}));else{io(`moveAndMaybeCompressFile: renaming ${e} to ${t}`);try{await so.move(e,t,{overwrite:!0})}catch(n){if(io(`moveAndMaybeCompressFile: error renaming ${e} to ${t}`,n),"ENOENT"!==n.code){io("moveAndMaybeCompressFile: trying copy+truncate instead");try{await so.copy(e,t,{overwrite:!0}),await so.truncate(e)}catch(e){io("moveAndMaybeCompressFile: error copy+truncate",e)}}}}}else io("moveAndMaybeCompressFile: source and target are the same, not doing anything")};const lo=$.exports("streamroller:RollingFileWriteStream"),fo=Ot.exports,Do=e,po=t,Eo=()=>new Date,ho=le.exports,{Writable:Co}=c,mo=({file:e,keepFileExt:t,needsIndex:n,alwaysIncludeDate:r,compress:u,fileNameSep:o})=>{let i=o||".";const s=ro.join(e.dir,e.name),a=t=>t+e.ext,c=(e,t,r)=>!n&&r||!t?e:e+i+t,l=(e,t,n)=>(t>0||r)&&n?e+i+n:e,f=(e,t)=>t&&u?e+".gz":e,D=t?[l,c,a,f]:[a,l,c,f];return({date:e,index:t})=>(no(`_formatFileName: date=${e}, index=${t}`),D.reduce(((n,r)=>r(n,t,e)),s))},Fo=({file:e,keepFileExt:t,pattern:n,fileNameSep:r})=>{let u=r||".";const o="__NOT_MATCHING__";let i=[(e,t)=>e.endsWith(".gz")?(uo("it is gzipped"),t.isCompressed=!0,e.slice(0,-3)):e,t?t=>t.startsWith(e.name)&&t.endsWith(e.ext)?(uo("it starts and ends with the right things"),t.slice(e.name.length+1,-1*e.ext.length)):o:t=>t.startsWith(e.base)?(uo("it starts with the right things"),t.slice(e.base.length+1)):o,n?(e,t)=>{const r=e.split(u);let o=r[r.length-1];uo("items: ",r,", indexStr: ",o);let i=e;void 0!==o&&o.match(/^\d+$/)?(i=e.slice(0,-1*(o.length+1)),uo(`dateStr is ${i}`),n&&!i&&(i=o,o="0")):o="0";try{const r=oo.parse(n,i,new Date(0,0));return oo.asString(n,r)!==i?e:(t.index=parseInt(o,10),t.date=i,t.timestamp=r.getTime(),"")}catch(t){return uo(`Problem parsing ${i} as ${n}, error was: `,t),e}}:(e,t)=>e.match(/^\d+$/)?(uo("it has an index"),t.index=parseInt(e,10),""):e];return e=>{let t={filename:e,index:0,isCompressed:!1};return i.reduce(((e,n)=>n(e,t)),e)?null:t}},yo=co;var go=class extends Co{constructor(e,t){if(lo(`constructor: creating RollingFileWriteStream. path=${e}`),"string"!=typeof e||0===e.length)throw new Error(`Invalid filename: ${e}`);if(e.endsWith(Do.sep))throw new Error(`Filename is a directory: ${e}`);0===e.indexOf(`~${Do.sep}`)&&(e=e.replace("~",po.homedir())),super(t),this.options=this._parseOption(t),this.fileObject=Do.parse(e),""===this.fileObject.dir&&(this.fileObject=Do.parse(Do.join(process.cwd(),e))),this.fileFormatter=mo({file:this.fileObject,alwaysIncludeDate:this.options.alwaysIncludePattern,needsIndex:this.options.maxSize<Number.MAX_SAFE_INTEGER,compress:this.options.compress,keepFileExt:this.options.keepFileExt,fileNameSep:this.options.fileNameSep}),this.fileNameParser=Fo({file:this.fileObject,keepFileExt:this.options.keepFileExt,pattern:this.options.pattern,fileNameSep:this.options.fileNameSep}),this.state={currentSize:0},this.options.pattern&&(this.state.currentDate=ho(this.options.pattern,Eo())),this.filename=this.fileFormatter({index:0,date:this.state.currentDate}),["a","a+","as","as+"].includes(this.options.flags)&&this._setExistingSizeAndDate(),lo(`constructor: create new file ${this.filename}, state=${JSON.stringify(this.state)}`),this._renewWriteStream()}_setExistingSizeAndDate(){try{const e=fo.statSync(this.filename);this.state.currentSize=e.size,this.options.pattern&&(this.state.currentDate=ho(this.options.pattern,e.mtime))}catch(e){return}}_parseOption(e){const t={maxSize:0,numToKeep:Number.MAX_SAFE_INTEGER,encoding:"utf8",mode:parseInt("0600",8),flags:"a",compress:!1,keepFileExt:!1,alwaysIncludePattern:!1},n=Object.assign({},t,e);if(n.maxSize){if(n.maxSize<=0)throw new Error(`options.maxSize (${n.maxSize}) should be > 0`)}else delete n.maxSize;if(n.numBackups||0===n.numBackups){if(n.numBackups<0)throw new Error(`options.numBackups (${n.numBackups}) should be >= 0`);if(n.numBackups>=Number.MAX_SAFE_INTEGER)throw new Error(`options.numBackups (${n.numBackups}) should be < Number.MAX_SAFE_INTEGER`);n.numToKeep=n.numBackups+1}else if(n.numToKeep<=0)throw new Error(`options.numToKeep (${n.numToKeep}) should be > 0`);return lo(`_parseOption: creating stream with option=${JSON.stringify(n)}`),n}_final(e){this.currentFileStream.end("",this.options.encoding,e)}_write(e,t,n){this._shouldRoll().then((()=>{lo(`_write: writing chunk. file=${this.currentFileStream.path} state=${JSON.stringify(this.state)} chunk=${e}`),this.currentFileStream.write(e,t,(t=>{this.state.currentSize+=e.length,n(t)}))}))}async _shouldRoll(){(this._dateChanged()||this._tooBig())&&(lo(`_shouldRoll: rolling because dateChanged? ${this._dateChanged()} or tooBig? ${this._tooBig()}`),await this._roll())}_dateChanged(){return this.state.currentDate&&this.state.currentDate!==ho(this.options.pattern,Eo())}_tooBig(){return this.state.currentSize>=this.options.maxSize}_roll(){return lo("_roll: closing the current stream"),new Promise(((e,t)=>{this.currentFileStream.end("",this.options.encoding,(()=>{this._moveOldFiles().then(e).catch(t)}))}))}async _moveOldFiles(){const e=await this._getExistingFiles();for(let t=(this.state.currentDate?e.filter((e=>e.date===this.state.currentDate)):e).length;t>=0;t--){lo(`_moveOldFiles: i = ${t}`);const e=this.fileFormatter({date:this.state.currentDate,index:t}),n=this.fileFormatter({date:this.state.currentDate,index:t+1}),r={compress:this.options.compress&&0===t,mode:this.options.mode};await yo(e,n,r)}this.state.currentSize=0,this.state.currentDate=this.state.currentDate?ho(this.options.pattern,Eo()):null,lo(`_moveOldFiles: finished rolling files. state=${JSON.stringify(this.state)}`),this._renewWriteStream(),await new Promise(((e,t)=>{this.currentFileStream.write("","utf8",(()=>{this._clean().then(e).catch(t)}))}))}async _getExistingFiles(){const e=await fo.readdir(this.fileObject.dir).catch((()=>[]));lo(`_getExistingFiles: files=${e}`);const t=e.map((e=>this.fileNameParser(e))).filter((e=>e)),n=e=>(e.timestamp?e.timestamp:Eo().getTime())-e.index;return t.sort(((e,t)=>n(e)-n(t))),t}_renewWriteStream(){const e=this.fileFormatter({date:this.state.currentDate,index:0}),t=e=>{try{return fo.mkdirSync(e,{recursive:!0})}catch(n){if("ENOENT"===n.code)return t(Do.dirname(e)),t(e);if("EEXIST"!==n.code&&"EROFS"!==n.code)throw n;try{if(fo.statSync(e).isDirectory())return e;throw n}catch(e){throw n}}};t(this.fileObject.dir);const n={flags:this.options.flags,encoding:this.options.encoding,mode:this.options.mode};var r,u;fo.appendFileSync(e,"",(r={...n},u="flags",r["flag"]=r[u],delete r[u],r)),this.currentFileStream=fo.createWriteStream(e,n),this.currentFileStream.on("error",(e=>{this.emit("error",e)}))}async _clean(){const e=await this._getExistingFiles();if(lo(`_clean: numToKeep = ${this.options.numToKeep}, existingFiles = ${e.length}`),lo("_clean: existing files are: ",e),this._tooManyFiles(e.length)){const n=e.slice(0,e.length-this.options.numToKeep).map((e=>Do.format({dir:this.fileObject.dir,base:e.filename})));await(t=n,lo(`deleteFiles: files to delete: ${t}`),Promise.all(t.map((e=>fo.unlink(e).catch((t=>{lo(`deleteFiles: error when unlinking ${e}, ignoring. Error was ${t}`)}))))))}var t}_tooManyFiles(e){return this.options.numToKeep>0&&e>this.options.numToKeep}};const Ao=go;var vo=class extends Ao{constructor(e,t,n,r){r||(r={}),t&&(r.maxSize=t),r.numBackups||0===r.numBackups||(n||0===n||(n=1),r.numBackups=n),super(e,r),this.backups=r.numBackups,this.size=this.options.maxSize}get theStream(){return this.currentFileStream}};const So=go;var wo={RollingFileWriteStream:go,RollingFileStream:vo,DateRollingFileStream:class extends So{constructor(e,t,n){t&&"object"==typeof t&&(n=t,t=null),n||(n={}),t||(t="yyyy-MM-dd"),n.pattern=t,n.numBackups||0===n.numBackups?n.daysToKeep=n.numBackups:(n.daysToKeep||0===n.daysToKeep?process.emitWarning("options.daysToKeep is deprecated due to the confusion it causes when used together with file size rolling. Please use options.numBackups instead.","DeprecationWarning","streamroller-DEP0001"):n.daysToKeep=1,n.numBackups=n.daysToKeep),super(e,n),this.mode=this.options.mode}get theStream(){return this.currentFileStream}}};const Oo=$.exports("log4js:file"),_o=e,bo=wo,Bo=t,xo=Bo.EOL;let Po=!1;const Io=new Set;function No(){Io.forEach((e=>{e.sighupHandler()}))}wt.configure=function(e,t){let n=t.basicLayout;return e.layout&&(n=t.layout(e.layout.type,e.layout)),e.mode=e.mode||384,function(e,t,n,r,u,o){if("string"!=typeof e||0===e.length)throw new Error(`Invalid filename: ${e}`);if(e.endsWith(_o.sep))throw new Error(`Filename is a directory: ${e}`);function i(e,t,n,r){const u=new bo.RollingFileStream(e,t,n,r);return u.on("error",(t=>{console.error("log4js.fileAppender - Writing to file %s, error happened ",e,t)})),u.on("drain",(()=>{process.emit("log4js:pause",!1)})),u}e=e.replace(new RegExp(`^~(?=${_o.sep}.+)`),Bo.homedir()),e=_o.normalize(e),Oo("Creating file appender (",e,", ",n,", ",r=r||0===r?r:5,", ",u,", ",o,")");let s=i(e,n,r,u);const a=function(e){if(s.writable){if(!0===u.removeColor){const t=/\x1b[[0-9;]*m/g;e.data=e.data.map((e=>"string"==typeof e?e.replace(t,""):e))}s.write(t(e,o)+xo,"utf8")||process.emit("log4js:pause",!0)}};return a.reopen=function(){s.end((()=>{s=i(e,n,r,u)}))},a.sighupHandler=function(){Oo("SIGHUP handler called."),a.reopen()},a.shutdown=function(e){Io.delete(a),0===Io.size&&Po&&(process.removeListener("SIGHUP",No),Po=!1),s.end("","utf-8",e)},Io.add(a),Po||(process.on("SIGHUP",No),Po=!0),a}(e.filename,n,e.maxLogSize,e.backups,e,e.timezoneOffset)};var To={};const ko=wo,Ro=t.EOL;function Mo(e,t,n,r,u){r.maxSize=r.maxLogSize;const o=function(e,t,n){const r=new ko.DateRollingFileStream(e,t,n);return r.on("error",(t=>{console.error("log4js.dateFileAppender - Writing to file %s, error happened ",e,t)})),r.on("drain",(()=>{process.emit("log4js:pause",!1)})),r}(e,t,r),i=function(e){o.writable&&(o.write(n(e,u)+Ro,"utf8")||process.emit("log4js:pause",!0))};return i.shutdown=function(e){o.end("","utf-8",e)},i}To.configure=function(e,t){let n=t.basicLayout;return e.layout&&(n=t.layout(e.layout.type,e.layout)),e.alwaysIncludePattern||(e.alwaysIncludePattern=!1),e.mode=e.mode||384,Mo(e.filename,e.pattern,n,e,e.timezoneOffset)};var Lo={};const jo=$.exports("log4js:fileSync"),$o=e,Ho=n,Go=t,Vo=Go.EOL;function Jo(e,t){const n=e=>{try{return Ho.mkdirSync(e,{recursive:!0})}catch(t){if("ENOENT"===t.code)return n($o.dirname(e)),n(e);if("EEXIST"!==t.code&&"EROFS"!==t.code)throw t;try{if(Ho.statSync(e).isDirectory())return e;throw t}catch(e){throw t}}};n($o.dirname(e)),Ho.appendFileSync(e,"",{mode:t.mode,flag:t.flags})}class Uo{constructor(e,t,n,r){if(jo("In RollingFileStream"),t<0)throw new Error(`maxLogSize (${t}) should be > 0`);this.filename=e,this.size=t,this.backups=n,this.options=r,this.currentSize=0,this.currentSize=function(e){let t=0;try{t=Ho.statSync(e).size}catch(t){Jo(e,r)}return t}(this.filename)}shouldRoll(){return jo("should roll with current size %d, and max size %d",this.currentSize,this.size),this.currentSize>=this.size}roll(e){const t=this,n=new RegExp(`^${$o.basename(e)}`);function r(e){return n.test(e)}function u(t){return parseInt(t.slice(`${$o.basename(e)}.`.length),10)||0}function o(e,t){return u(e)-u(t)}function i(n){const r=u(n);if(jo(`Index of ${n} is ${r}`),0===t.backups)Ho.truncateSync(e,0);else if(r<t.backups){try{Ho.unlinkSync(`${e}.${r+1}`)}catch(e){}jo(`Renaming ${n} -> ${e}.${r+1}`),Ho.renameSync($o.join($o.dirname(e),n),`${e}.${r+1}`)}}jo("Rolling, rolling, rolling"),jo("Renaming the old files"),Ho.readdirSync($o.dirname(e)).filter(r).sort(o).reverse().forEach(i)}write(e,t){const n=this;jo("in write"),this.shouldRoll()&&(this.currentSize=0,this.roll(this.filename)),jo("writing the chunk to the file"),n.currentSize+=e.length,Ho.appendFileSync(n.filename,e)}}Lo.configure=function(e,t){let n=t.basicLayout;e.layout&&(n=t.layout(e.layout.type,e.layout));const r={flags:e.flags||"a",encoding:e.encoding||"utf8",mode:e.mode||384};return function(e,t,n,r,u,o){if("string"!=typeof e||0===e.length)throw new Error(`Invalid filename: ${e}`);if(e.endsWith($o.sep))throw new Error(`Filename is a directory: ${e}`);e=e.replace(new RegExp(`^~(?=${$o.sep}.+)`),Go.homedir()),e=$o.normalize(e),jo("Creating fileSync appender (",e,", ",n,", ",r=r||0===r?r:5,", ",u,", ",o,")");const i=function(e,t,n){let r;var o;return t?r=new Uo(e,t,n,u):(Jo(o=e,u),r={write(e){Ho.appendFileSync(o,e)}}),r}(e,n,r);return e=>{i.write(t(e,o)+Vo)}}(e.filename,n,e.maxLogSize,e.backups,r,e.timezoneOffset)};var Wo={};const zo=$.exports("log4js:tcp"),Ko=D;Wo.configure=function(e,t){zo(`configure with config = ${e}`);let n=function(e){return e.serialise()};return e.layout&&(n=t.layout(e.layout.type,e.layout)),function(e,t){let n=!1;const r=[];let u,o=3,i="__LOG4JS__";function s(e){zo("Writing log event to socket"),n=u.write(`${t(e)}${i}`,"utf8")}function a(){let e;for(zo("emptying buffer");e=r.shift();)s(e)}function c(e){n?s(e):(zo("buffering log event because it cannot write at the moment"),r.push(e))}return function t(){zo(`appender creating socket to ${e.host||"localhost"}:${e.port||5e3}`),i=`${e.endMsg||"__LOG4JS__"}`,u=Ko.createConnection(e.port||5e3,e.host||"localhost"),u.on("connect",(()=>{zo("socket connected"),a(),n=!0})),u.on("drain",(()=>{zo("drain event received, emptying buffer"),n=!0,a()})),u.on("timeout",u.end.bind(u)),u.on("error",(e=>{zo("connection error",e),n=!1,a()})),u.on("close",t)}(),c.shutdown=function(e){zo("shutdown called"),r.length&&o?(zo("buffer has items, waiting 100ms to empty"),o-=1,setTimeout((()=>{c.shutdown(e)}),100)):(u.removeAllListeners("close"),u.end(e))},c}(e,n)};const qo=e,Yo=$.exports("log4js:appenders"),Zo=ce,Xo=ft,Qo=Pe,ei=_e,ti=Dt,ni=new Map;ni.set("console",ht),ni.set("stdout",mt),ni.set("stderr",Ft),ni.set("logLevelFilter",yt),ni.set("categoryFilter",gt),ni.set("noLogFilter",vt),ni.set("file",wt),ni.set("dateFile",To),ni.set("fileSync",Lo),ni.set("tcp",Wo);const ri=new Map,ui=(e,t)=>{let n;try{const t=`${e}.cjs`;n=require.resolve(t),Yo("Loading module from ",t)}catch(t){n=e,Yo("Loading module from ",e)}try{return require(n)}catch(n){return void Zo.throwExceptionIf(t,"MODULE_NOT_FOUND"!==n.code,`appender "${e}" could not be loaded (error was: ${n})`)}},oi=new Set,ii=(e,t)=>{if(ri.has(e))return ri.get(e);if(!t.appenders[e])return!1;if(oi.has(e))throw new Error(`Dependency loop detected for appender ${e}.`);oi.add(e),Yo(`Creating appender ${e}`);const n=si(e,t);return oi.delete(e),ri.set(e,n),n},si=(e,t)=>{const n=t.appenders[e],r=n.type.configure?n.type:((e,t)=>ni.get(e)||ui(`./${e}`,t)||ui(e,t)||require.main&&require.main.filename&&ui(qo.join(qo.dirname(require.main.filename),e),t)||ui(qo.join(process.cwd(),e),t))(n.type,t);return Zo.throwExceptionIf(t,Zo.not(r),`appender "${e}" is not valid (type "${n.type}" could not be found)`),r.appender&&(process.emitWarning(`Appender ${n.type} exports an appender function.`,"DeprecationWarning","log4js-node-DEP0001"),Yo("[log4js-node-DEP0001]",`DEPRECATION: Appender ${n.type} exports an appender function.`)),r.shutdown&&(process.emitWarning(`Appender ${n.type} exports a shutdown function.`,"DeprecationWarning","log4js-node-DEP0002"),Yo("[log4js-node-DEP0002]",`DEPRECATION: Appender ${n.type} exports a shutdown function.`)),Yo(`${e}: clustering.isMaster ? ${Xo.isMaster()}`),Yo(`${e}: appenderModule is ${i.inspect(r)}`),Xo.onlyOnMaster((()=>(Yo(`calling appenderModule.configure for ${e} / ${n.type}`),r.configure(ti.modifyConfig(n),ei,(e=>ii(e,t)),Qo))),(()=>{}))},ai=e=>{if(ri.clear(),oi.clear(),!e)return;const t=[];Object.values(e.categories).forEach((e=>{t.push(...e.appenders)})),Object.keys(e.appenders).forEach((n=>{(t.includes(n)||"tcp-server"===e.appenders[n].type||"multiprocess"===e.appenders[n].type)&&ii(n,e)}))},ci=()=>{ai()};ci(),Zo.addListener((e=>{Zo.throwExceptionIf(e,Zo.not(Zo.anObject(e.appenders)),'must have a property "appenders" of type object.');const t=Object.keys(e.appenders);Zo.throwExceptionIf(e,Zo.not(t.length),"must define at least one appender."),t.forEach((t=>{Zo.throwExceptionIf(e,Zo.not(e.appenders[t].type),`appender "${t}" is not valid (must be an object with property "type")`)}))})),Zo.addListener(ai),Ie.exports=ri,Ie.exports.init=ci;var li={exports:{}};!function(e){const t=$.exports("log4js:categories"),n=ce,r=Pe,u=Ie.exports,o=new Map;function i(e,t,n){if(!1===t.inherit)return;const r=n.lastIndexOf(".");if(r<0)return;const u=n.slice(0,r);let o=e.categories[u];o||(o={inherit:!0,appenders:[]}),i(e,o,u),!e.categories[u]&&o.appenders&&o.appenders.length&&o.level&&(e.categories[u]=o),t.appenders=t.appenders||[],t.level=t.level||o.level,o.appenders.forEach((e=>{t.appenders.includes(e)||t.appenders.push(e)})),t.parent=o}function s(e){if(!e.categories)return;Object.keys(e.categories).forEach((t=>{const n=e.categories[t];i(e,n,t)}))}n.addPreProcessingListener((e=>s(e))),n.addListener((e=>{n.throwExceptionIf(e,n.not(n.anObject(e.categories)),'must have a property "categories" of type object.');const t=Object.keys(e.categories);n.throwExceptionIf(e,n.not(t.length),"must define at least one category."),t.forEach((t=>{const o=e.categories[t];n.throwExceptionIf(e,[n.not(o.appenders),n.not(o.level)],`category "${t}" is not valid (must be an object with properties "appenders" and "level")`),n.throwExceptionIf(e,n.not(Array.isArray(o.appenders)),`category "${t}" is not valid (appenders must be an array of appender names)`),n.throwExceptionIf(e,n.not(o.appenders.length),`category "${t}" is not valid (appenders must contain at least one appender name)`),Object.prototype.hasOwnProperty.call(o,"enableCallStack")&&n.throwExceptionIf(e,"boolean"!=typeof o.enableCallStack,`category "${t}" is not valid (enableCallStack must be boolean type)`),o.appenders.forEach((r=>{n.throwExceptionIf(e,n.not(u.get(r)),`category "${t}" is not valid (appender "${r}" is not defined)`)})),n.throwExceptionIf(e,n.not(r.getLevel(o.level)),`category "${t}" is not valid (level "${o.level}" not recognised; valid levels are ${r.levels.join(", ")})`)})),n.throwExceptionIf(e,n.not(e.categories.default),'must define a "default" category.')}));const a=e=>{if(o.clear(),!e)return;Object.keys(e.categories).forEach((n=>{const i=e.categories[n],s=[];i.appenders.forEach((e=>{s.push(u.get(e)),t(`Creating category ${n}`),o.set(n,{appenders:s,level:r.getLevel(i.level),enableCallStack:i.enableCallStack||!1})}))}))},c=()=>{a()};c(),n.addListener(a);const l=e=>{if(t(`configForCategory: searching for config for ${e}`),o.has(e))return t(`configForCategory: ${e} exists in config, returning it`),o.get(e);let n;return e.indexOf(".")>0?(t(`configForCategory: ${e} has hierarchy, cloning from parents`),n={...l(e.slice(0,e.lastIndexOf(".")))}):(o.has("default")||a({categories:{default:{appenders:["out"],level:"OFF"}}}),t("configForCategory: cloning default category"),n={...o.get("default")}),o.set(e,n),n};e.exports=o,e.exports=Object.assign(e.exports,{appendersForCategory:e=>l(e).appenders,getLevelForCategory:e=>l(e).level,setLevelForCategory:(e,t)=>{l(e).level=t},getEnableCallStackForCategory:e=>!0===l(e).enableCallStack,setEnableCallStackForCategory:(e,t)=>{l(e).enableCallStack=t},init:c})}(li);const fi=$.exports("log4js:logger"),Di=Xe,di=Pe,pi=ft,Ei=li.exports,hi=ce,Ci=/at (?:(.+)\s+\()?(?:(.+?):(\d+)(?::(\d+))?|([^)]+))\)?/;function mi(e,t=4){try{const n=e.stack.split("\n").slice(t);if(!n.length)return null;const r=Ci.exec(n[0]);if(r&&6===r.length){let e="",t="",u="";return r[1]&&""!==r[1]&&([t,u]=r[1].replace(/[[\]]/g,"").split(" as "),u=u||"",t.includes(".")&&([e,t]=t.split("."))),{fileName:r[2],lineNumber:parseInt(r[3],10),columnNumber:parseInt(r[4],10),callStack:n.join("\n"),className:e,functionName:t,functionAlias:u,callerName:r[1]||""}}console.error("log4js.logger - defaultParseCallStack error")}catch(e){console.error("log4js.logger - defaultParseCallStack error",e)}return null}let Fi=class{constructor(e){if(!e)throw new Error("No category provided.");this.category=e,this.context={},this.callStackSkipIndex=0,this.parseCallStack=mi,fi(`Logger created (${this.category}, ${this.level})`)}get level(){return di.getLevel(Ei.getLevelForCategory(this.category),di.OFF)}set level(e){Ei.setLevelForCategory(this.category,di.getLevel(e,this.level))}get useCallStack(){return Ei.getEnableCallStackForCategory(this.category)}set useCallStack(e){Ei.setEnableCallStackForCategory(this.category,!0===e)}get callStackLinesToSkip(){return this.callStackSkipIndex}set callStackLinesToSkip(e){if("number"!=typeof e)throw new TypeError("Must be a number");if(e<0)throw new RangeError("Must be >= 0");this.callStackSkipIndex=e}log(e,...t){const n=di.getLevel(e);n?this.isLevelEnabled(n)&&this._log(n,t):hi.validIdentifier(e)&&t.length>0?(this.log(di.WARN,"log4js:logger.log: valid log-level not found as first parameter given:",e),this.log(di.INFO,`[${e}]`,...t)):this.log(di.INFO,e,...t)}isLevelEnabled(e){return this.level.isLessThanOrEqualTo(e)}_log(e,t){fi(`sending log data (${e}) to appenders`);const n=t.find((e=>e instanceof Error));let r;if(this.useCallStack){try{n&&(r=this.parseCallStack(n,this.callStackSkipIndex+1))}catch(e){}r=r||this.parseCallStack(new Error,this.callStackSkipIndex+3+1)}const u=new Di(this.category,e,t,this.context,r,n);pi.send(u)}addContext(e,t){this.context[e]=t}removeContext(e){delete this.context[e]}clearContext(){this.context={}}setParseCallStackFunction(e){if("function"==typeof e)this.parseCallStack=e;else{if(void 0!==e)throw new TypeError("Invalid type passed to setParseCallStackFunction");this.parseCallStack=mi}}};function yi(e){const t=di.getLevel(e),n=t.toString().toLowerCase().replace(/_([a-z])/g,(e=>e[1].toUpperCase())),r=n[0].toUpperCase()+n.slice(1);Fi.prototype[`is${r}Enabled`]=function(){return this.isLevelEnabled(t)},Fi.prototype[n]=function(...e){this.log(t,...e)}}di.levels.forEach(yi),hi.addListener((()=>{di.levels.forEach(yi)}));var gi=Fi;const Ai=Pe;function vi(e){return e.originalUrl||e.url}function Si(e,t){for(let n=0;n<t.length;n++)e=e.replace(t[n].token,t[n].replacement);return e}const wi=$.exports("log4js:recording"),Oi=[];function _i(){return Oi.slice()}function bi(){Oi.length=0}var Bi={configure:function(){return function(e){wi(`received logEvent, number of events now ${Oi.length+1}`),wi("log event was ",e),Oi.push(e)}},replay:_i,playback:_i,reset:bi,erase:bi};const xi=$.exports("log4js:main"),Pi=n,Ii=ee({proto:!0}),Ni=ce,Ti=_e,ki=Pe,Ri=Ie.exports,Mi=li.exports,Li=gi,ji=ft,$i=function(e,t){t="string"==typeof t||"function"==typeof t?{format:t}:t||{};const n=e;let r=Ai.getLevel(t.level,Ai.INFO);const u=t.format||':remote-addr - - ":method :url HTTP/:http-version" :status :content-length ":referrer" ":user-agent"';return(e,o,i)=>{if(void 0!==e._logging)return i();if("function"!=typeof t.nolog){const n=function(e){let t=null;if(e instanceof RegExp&&(t=e),"string"==typeof e&&(t=new RegExp(e)),Array.isArray(e)){const n=e.map((e=>e.source?e.source:e));t=new RegExp(n.join("|"))}return t}(t.nolog);if(n&&n.test(e.originalUrl))return i()}if(n.isLevelEnabled(r)||"auto"===t.level){const i=new Date,{writeHead:s}=o;e._logging=!0,o.writeHead=(e,t)=>{o.writeHead=s,o.writeHead(e,t),o.__statusCode=e,o.__headers=t||{}};let a=!1;const c=()=>{if(a)return;if(a=!0,"function"==typeof t.nolog&&!0===t.nolog(e,o))return void(e._logging=!1);o.responseTime=new Date-i,o.statusCode&&"auto"===t.level&&(r=Ai.INFO,o.statusCode>=300&&(r=Ai.WARN),o.statusCode>=400&&(r=Ai.ERROR)),r=function(e,t,n){let r=t;if(n){const t=n.find((t=>{let n=!1;return n=t.from&&t.to?e>=t.from&&e<=t.to:-1!==t.codes.indexOf(e),n}));t&&(r=Ai.getLevel(t.level,r))}return r}(o.statusCode,r,t.statusRules);const s=function(e,t,n){const r=[];return r.push({token:":url",replacement:vi(e)}),r.push({token:":protocol",replacement:e.protocol}),r.push({token:":hostname",replacement:e.hostname}),r.push({token:":method",replacement:e.method}),r.push({token:":status",replacement:t.__statusCode||t.statusCode}),r.push({token:":response-time",replacement:t.responseTime}),r.push({token:":date",replacement:(new Date).toUTCString()}),r.push({token:":referrer",replacement:e.headers.referer||e.headers.referrer||""}),r.push({token:":http-version",replacement:`${e.httpVersionMajor}.${e.httpVersionMinor}`}),r.push({token:":remote-addr",replacement:e.headers["x-forwarded-for"]||e.ip||e._remoteAddress||e.socket&&(e.socket.remoteAddress||e.socket.socket&&e.socket.socket.remoteAddress)}),r.push({token:":user-agent",replacement:e.headers["user-agent"]}),r.push({token:":content-length",replacement:t.getHeader("content-length")||t.__headers&&t.__headers["Content-Length"]||"-"}),r.push({token:/:req\[([^\]]+)]/g,replacement:(t,n)=>e.headers[n.toLowerCase()]}),r.push({token:/:res\[([^\]]+)]/g,replacement:(e,n)=>t.getHeader(n.toLowerCase())||t.__headers&&t.__headers[n]}),(e=>{const t=e.concat();for(let e=0;e<t.length;++e)for(let n=e+1;n<t.length;++n)t[e].token==t[n].token&&t.splice(n--,1);return t})(n.concat(r))}(e,o,t.tokens||[]);if(t.context&&n.addContext("res",o),"function"==typeof u){const t=u(e,o,(e=>Si(e,s)));t&&n.log(r,t)}else n.log(r,Si(u,s));t.context&&n.removeContext("res")};o.on("end",c),o.on("finish",c),o.on("error",c),o.on("close",c)}return i()}},Hi=Bi;let Gi=!1;function Vi(e){if(!Gi)return;xi("Received log event ",e);Mi.appendersForCategory(e.categoryName).forEach((t=>{t(e)}))}function Ji(e){Gi&&Ui();let t=e;return"string"==typeof t&&(t=function(e){xi(`Loading configuration from ${e}`);try{return JSON.parse(Pi.readFileSync(e,"utf8"))}catch(t){throw new Error(`Problem reading config from file "${e}". Error was ${t.message}`,t)}}(e)),xi(`Configuration is ${t}`),Ni.configure(Ii(t)),ji.onMessage(Vi),Gi=!0,Wi}function Ui(e=(()=>{})){if("function"!=typeof e)throw new TypeError("Invalid callback passed to shutdown");xi("Shutdown called. Disabling all log writing."),Gi=!1;const t=Array.from(Ri.values());Ri.init(),Mi.init();const n=t.reduce(((e,t)=>t.shutdown?e+1:e),0);0===n&&(xi("No appenders with shutdown functions found."),e());let r,u=0;function o(t){r=r||t,u+=1,xi(`Appender shutdowns complete: ${u} / ${n}`),u>=n&&(xi("All shutdown functions completed."),e(r))}xi(`Found ${n} appenders with shutdown functions.`),t.filter((e=>e.shutdown)).forEach((e=>e.shutdown(o)))}const Wi={getLogger:function(e){return Gi||Ji(process.env.LOG4JS_CONFIG||{appenders:{out:{type:"stdout"}},categories:{default:{appenders:["out"],level:"OFF"}}}),new Li(e||"default")},configure:Ji,shutdown:Ui,connectLogger:$i,levels:ki,addLayout:Ti.addLayout,recording:function(){return Hi}};var zi=Wi;!function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.addCustomPLlugin=e.addCustomTask=e.hvigorTrace=void 0;const t=zi;e.hvigorTrace={totalTime:0,moduleNum:0,taskTime:{},isIncremental:!0,hasIncremental:!1,isParallel:!0,IS_DAEMON:!0,LOG_LEVEL:t.levels.INFO.levelStr,IS_HVIGORFILE_TYPE_CHECK:!1},e.addCustomTask=function(t){var n;let r=null!==(n=e.hvigorTrace.CUSTOM_TASKS)&&void 0!==n?n:[];r.length>0&&(r=r.filter((e=>e.NAME!==t.NAME))),r.push(t),e.hvigorTrace.CUSTOM_TASKS=r},e.addCustomPLlugin=function(t){var n;let r=null!==(n=e.hvigorTrace.CUSTOM_PLUGINS)&&void 0!==n?n:[];r.length>0&&(r=r.filter((e=>e.PLUGIN_ID!==t.PLUGIN_ID))),r.push({PLUGIN_ID:t.PLUGIN_ID}),e.hvigorTrace.CUSTOM_PLUGINS=r}}(j);var Ki={};!function(e){var t=p&&p.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(e,"__esModule",{value:!0}),e.hashFile=e.hash=e.createHash=void 0;const r=t(d),u=t(n);e.createHash=(e="MD5")=>r.default.createHash(e);e.hash=(t,n)=>(0,e.createHash)(n).update(t).digest("hex");e.hashFile=(t,n)=>{if(u.default.existsSync(t))return(0,e.hash)(u.default.readFileSync(t,"utf-8"),n)}}(Ki);var qi={},Yi={},Zi={};Object.defineProperty(Zi,"__esModule",{value:!0}),Zi.Unicode=void 0;class Xi{}Zi.Unicode=Xi,Xi.SPACE_SEPARATOR=/[\u1680\u2000-\u200A\u202F\u205F\u3000]/,Xi.ID_START=/[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u0860-\u086A\u08A0-\u08B4\u08B6-\u08BD\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u09FC\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0AF9\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58-\u0C5A\u0C60\u0C61\u0C80\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D54-\u0D56\u0D5F-\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u1884\u1887-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1C80-\u1C88\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312E\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FEA\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AE\uA7B0-\uA7B7\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA8FD\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDE80-\uDE9C\uDEA0-\uDED0\uDF00-\uDF1F\uDF2D-\uDF4A\uDF50-\uDF75\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDCB0-\uDCD3\uDCD8-\uDCFB\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDCE0-\uDCF2\uDCF4\uDCF5\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00\uDE10-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE4\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2]|\uD804[\uDC03-\uDC37\uDC83-\uDCAF\uDCD0-\uDCE8\uDD03-\uDD26\uDD50-\uDD72\uDD76\uDD83-\uDDB2\uDDC1-\uDDC4\uDDDA\uDDDC\uDE00-\uDE11\uDE13-\uDE2B\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEDE\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3D\uDF50\uDF5D-\uDF61]|\uD805[\uDC00-\uDC34\uDC47-\uDC4A\uDC80-\uDCAF\uDCC4\uDCC5\uDCC7\uDD80-\uDDAE\uDDD8-\uDDDB\uDE00-\uDE2F\uDE44\uDE80-\uDEAA\uDF00-\uDF19]|\uD806[\uDCA0-\uDCDF\uDCFF\uDE00\uDE0B-\uDE32\uDE3A\uDE50\uDE5C-\uDE83\uDE86-\uDE89\uDEC0-\uDEF8]|\uD807[\uDC00-\uDC08\uDC0A-\uDC2E\uDC40\uDC72-\uDC8F\uDD00-\uDD06\uDD08\uDD09\uDD0B-\uDD30\uDD46]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|[\uD80C\uD81C-\uD820\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872\uD874-\uD879][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDED0-\uDEED\uDF00-\uDF2F\uDF40-\uDF43\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50\uDF93-\uDF9F\uDFE0\uDFE1]|\uD821[\uDC00-\uDFEC]|\uD822[\uDC00-\uDEF2]|\uD82C[\uDC00-\uDD1E\uDD70-\uDEFB]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB]|\uD83A[\uDC00-\uDCC4\uDD00-\uDD43]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1\uDEB0-\uDFFF]|\uD87A[\uDC00-\uDFE0]|\uD87E[\uDC00-\uDE1D]/,Xi.ID_CONTINUE=/[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u05D0-\u05EA\u05F0-\u05F2\u0610-\u061A\u0620-\u0669\u066E-\u06D3\u06D5-\u06DC\u06DF-\u06E8\u06EA-\u06FC\u06FF\u0710-\u074A\u074D-\u07B1\u07C0-\u07F5\u07FA\u0800-\u082D\u0840-\u085B\u0860-\u086A\u08A0-\u08B4\u08B6-\u08BD\u08D4-\u08E1\u08E3-\u0963\u0966-\u096F\u0971-\u0983\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BC-\u09C4\u09C7\u09C8\u09CB-\u09CE\u09D7\u09DC\u09DD\u09DF-\u09E3\u09E6-\u09F1\u09FC\u0A01-\u0A03\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A59-\u0A5C\u0A5E\u0A66-\u0A75\u0A81-\u0A83\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABC-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AD0\u0AE0-\u0AE3\u0AE6-\u0AEF\u0AF9-\u0AFF\u0B01-\u0B03\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3C-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B5C\u0B5D\u0B5F-\u0B63\u0B66-\u0B6F\u0B71\u0B82\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD0\u0BD7\u0BE6-\u0BEF\u0C00-\u0C03\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C58-\u0C5A\u0C60-\u0C63\u0C66-\u0C6F\u0C80-\u0C83\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBC-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CDE\u0CE0-\u0CE3\u0CE6-\u0CEF\u0CF1\u0CF2\u0D00-\u0D03\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D44\u0D46-\u0D48\u0D4A-\u0D4E\u0D54-\u0D57\u0D5F-\u0D63\u0D66-\u0D6F\u0D7A-\u0D7F\u0D82\u0D83\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DE6-\u0DEF\u0DF2\u0DF3\u0E01-\u0E3A\u0E40-\u0E4E\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB9\u0EBB-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F18\u0F19\u0F20-\u0F29\u0F35\u0F37\u0F39\u0F3E-\u0F47\u0F49-\u0F6C\u0F71-\u0F84\u0F86-\u0F97\u0F99-\u0FBC\u0FC6\u1000-\u1049\u1050-\u109D\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u135D-\u135F\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176C\u176E-\u1770\u1772\u1773\u1780-\u17D3\u17D7\u17DC\u17DD\u17E0-\u17E9\u180B-\u180D\u1810-\u1819\u1820-\u1877\u1880-\u18AA\u18B0-\u18F5\u1900-\u191E\u1920-\u192B\u1930-\u193B\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19D9\u1A00-\u1A1B\u1A20-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AA7\u1AB0-\u1ABD\u1B00-\u1B4B\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1BF3\u1C00-\u1C37\u1C40-\u1C49\u1C4D-\u1C7D\u1C80-\u1C88\u1CD0-\u1CD2\u1CD4-\u1CF9\u1D00-\u1DF9\u1DFB-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u203F\u2040\u2054\u2071\u207F\u2090-\u209C\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D7F-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2DE0-\u2DFF\u2E2F\u3005-\u3007\u3021-\u302F\u3031-\u3035\u3038-\u303C\u3041-\u3096\u3099\u309A\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312E\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FEA\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66F\uA674-\uA67D\uA67F-\uA6F1\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AE\uA7B0-\uA7B7\uA7F7-\uA827\uA840-\uA873\uA880-\uA8C5\uA8D0-\uA8D9\uA8E0-\uA8F7\uA8FB\uA8FD\uA900-\uA92D\uA930-\uA953\uA960-\uA97C\uA980-\uA9C0\uA9CF-\uA9D9\uA9E0-\uA9FE\uAA00-\uAA36\uAA40-\uAA4D\uAA50-\uAA59\uAA60-\uAA76\uAA7A-\uAAC2\uAADB-\uAADD\uAAE0-\uAAEF\uAAF2-\uAAF6\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABEA\uABEC\uABED\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE00-\uFE0F\uFE20-\uFE2F\uFE33\uFE34\uFE4D-\uFE4F\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF3F\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDDFD\uDE80-\uDE9C\uDEA0-\uDED0\uDEE0\uDF00-\uDF1F\uDF2D-\uDF4A\uDF50-\uDF7A\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDCA0-\uDCA9\uDCB0-\uDCD3\uDCD8-\uDCFB\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDCE0-\uDCF2\uDCF4\uDCF5\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00-\uDE03\uDE05\uDE06\uDE0C-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE38-\uDE3A\uDE3F\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE6\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2]|\uD804[\uDC00-\uDC46\uDC66-\uDC6F\uDC7F-\uDCBA\uDCD0-\uDCE8\uDCF0-\uDCF9\uDD00-\uDD34\uDD36-\uDD3F\uDD50-\uDD73\uDD76\uDD80-\uDDC4\uDDCA-\uDDCC\uDDD0-\uDDDA\uDDDC\uDE00-\uDE11\uDE13-\uDE37\uDE3E\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEEA\uDEF0-\uDEF9\uDF00-\uDF03\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3C-\uDF44\uDF47\uDF48\uDF4B-\uDF4D\uDF50\uDF57\uDF5D-\uDF63\uDF66-\uDF6C\uDF70-\uDF74]|\uD805[\uDC00-\uDC4A\uDC50-\uDC59\uDC80-\uDCC5\uDCC7\uDCD0-\uDCD9\uDD80-\uDDB5\uDDB8-\uDDC0\uDDD8-\uDDDD\uDE00-\uDE40\uDE44\uDE50-\uDE59\uDE80-\uDEB7\uDEC0-\uDEC9\uDF00-\uDF19\uDF1D-\uDF2B\uDF30-\uDF39]|\uD806[\uDCA0-\uDCE9\uDCFF\uDE00-\uDE3E\uDE47\uDE50-\uDE83\uDE86-\uDE99\uDEC0-\uDEF8]|\uD807[\uDC00-\uDC08\uDC0A-\uDC36\uDC38-\uDC40\uDC50-\uDC59\uDC72-\uDC8F\uDC92-\uDCA7\uDCA9-\uDCB6\uDD00-\uDD06\uDD08\uDD09\uDD0B-\uDD36\uDD3A\uDD3C\uDD3D\uDD3F-\uDD47\uDD50-\uDD59]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|[\uD80C\uD81C-\uD820\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872\uD874-\uD879][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDE60-\uDE69\uDED0-\uDEED\uDEF0-\uDEF4\uDF00-\uDF36\uDF40-\uDF43\uDF50-\uDF59\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50-\uDF7E\uDF8F-\uDF9F\uDFE0\uDFE1]|\uD821[\uDC00-\uDFEC]|\uD822[\uDC00-\uDEF2]|\uD82C[\uDC00-\uDD1E\uDD70-\uDEFB]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99\uDC9D\uDC9E]|\uD834[\uDD65-\uDD69\uDD6D-\uDD72\uDD7B-\uDD82\uDD85-\uDD8B\uDDAA-\uDDAD\uDE42-\uDE44]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB\uDFCE-\uDFFF]|\uD836[\uDE00-\uDE36\uDE3B-\uDE6C\uDE75\uDE84\uDE9B-\uDE9F\uDEA1-\uDEAF]|\uD838[\uDC00-\uDC06\uDC08-\uDC18\uDC1B-\uDC21\uDC23\uDC24\uDC26-\uDC2A]|\uD83A[\uDC00-\uDCC4\uDCD0-\uDCD6\uDD00-\uDD4A\uDD50-\uDD59]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1\uDEB0-\uDFFF]|\uD87A[\uDC00-\uDFE0]|\uD87E[\uDC00-\uDE1D]|\uDB40[\uDD00-\uDDEF]/,Object.defineProperty(Yi,"__esModule",{value:!0}),Yi.JudgeUtil=void 0;const Qi=Zi;Yi.JudgeUtil=class{static isIgnoreChar(e){return"string"==typeof e&&("\t"===e||"\v"===e||"\f"===e||" "===e||" "===e||"\ufeff"===e||"\n"===e||"\r"===e||"\u2028"===e||"\u2029"===e)}static isSpaceSeparator(e){return"string"==typeof e&&Qi.Unicode.SPACE_SEPARATOR.test(e)}static isIdStartChar(e){return"string"==typeof e&&(e>="a"&&e<="z"||e>="A"&&e<="Z"||"$"===e||"_"===e||Qi.Unicode.ID_START.test(e))}static isIdContinueChar(e){return"string"==typeof e&&(e>="a"&&e<="z"||e>="A"&&e<="Z"||e>="0"&&e<="9"||"$"===e||"_"===e||"‌"===e||"‍"===e||Qi.Unicode.ID_CONTINUE.test(e))}static isDigitWithoutZero(e){return/[1-9]/.test(e)}static isDigit(e){return"string"==typeof e&&/[0-9]/.test(e)}static isHexDigit(e){return"string"==typeof e&&/[0-9A-Fa-f]/.test(e)}};var es=p&&p.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(qi,"__esModule",{value:!0}),qi.parseJsonText=qi.parseJsonFile=void 0;const ts=es(n),ns=es(t),rs=es(e),us=Yi;var os;!function(e){e[e.Char=0]="Char",e[e.EOF=1]="EOF",e[e.Identifier=2]="Identifier"}(os||(os={}));let is,ss,as,cs,ls,fs,Ds="start",ds=[],ps=0,Es=1,hs=0,Cs=!1,ms="default",Fs="'",ys=1;function gs(e,t=!1){ss=String(e),Ds="start",ds=[],ps=0,Es=1,hs=0,cs=void 0,Cs=t;do{is=As(),Bs[Ds]()}while("eof"!==is.type);return cs}function As(){for(ms="default",ls="",Fs="'",ys=1;;){fs=vs();const e=ws[ms]();if(e)return e}}function vs(){if(ss[ps])return String.fromCodePoint(ss.codePointAt(ps))}function Ss(){const e=vs();return"\n"===e?(Es++,hs=0):e?hs+=e.length:hs++,e&&(ps+=e.length),e}qi.parseJsonFile=function(e,t=!1,n="utf-8"){const r=ts.default.readFileSync(rs.default.resolve(e),{encoding:n});try{return gs(r,t)}catch(t){if(t instanceof SyntaxError){const n=t.message.split("at");if(2===n.length)throw new Error(`${n[0].trim()}${ns.default.EOL}\t at ${e}:${n[1].trim()}`)}throw new Error(`${e} is not in valid JSON/JSON5 format.`)}},qi.parseJsonText=gs;const ws={default(){switch(fs){case"/":return Ss(),void(ms="comment");case void 0:return Ss(),Os("eof")}if(!us.JudgeUtil.isIgnoreChar(fs)&&!us.JudgeUtil.isSpaceSeparator(fs))return ws[Ds]();Ss()},start(){ms="value"},beforePropertyName(){switch(fs){case"$":case"_":return ls=Ss(),void(ms="identifierName");case"\\":return Ss(),void(ms="identifierNameStartEscape");case"}":return Os("punctuator",Ss());case'"':case"'":return Fs=fs,Ss(),void(ms="string")}if(us.JudgeUtil.isIdStartChar(fs))return ls+=Ss(),void(ms="identifierName");throw Ns(os.Char,Ss())},afterPropertyName(){if(":"===fs)return Os("punctuator",Ss());throw Ns(os.Char,Ss())},beforePropertyValue(){ms="value"},afterPropertyValue(){switch(fs){case",":case"}":return Os("punctuator",Ss())}throw Ns(os.Char,Ss())},beforeArrayValue(){if("]"===fs)return Os("punctuator",Ss());ms="value"},afterArrayValue(){switch(fs){case",":case"]":return Os("punctuator",Ss())}throw Ns(os.Char,Ss())},end(){throw Ns(os.Char,Ss())},comment(){switch(fs){case"*":return Ss(),void(ms="multiLineComment");case"/":return Ss(),void(ms="singleLineComment")}throw Ns(os.Char,Ss())},multiLineComment(){switch(fs){case"*":return Ss(),void(ms="multiLineCommentAsterisk");case void 0:throw Ns(os.Char,Ss())}Ss()},multiLineCommentAsterisk(){switch(fs){case"*":return void Ss();case"/":return Ss(),void(ms="default");case void 0:throw Ns(os.Char,Ss())}Ss(),ms="multiLineComment"},singleLineComment(){switch(fs){case"\n":case"\r":case"\u2028":case"\u2029":return Ss(),void(ms="default");case void 0:return Ss(),Os("eof")}Ss()},value(){switch(fs){case"{":case"[":return Os("punctuator",Ss());case"n":return Ss(),_s("ull"),Os("null",null);case"t":return Ss(),_s("rue"),Os("boolean",!0);case"f":return Ss(),_s("alse"),Os("boolean",!1);case"-":case"+":return"-"===Ss()&&(ys=-1),void(ms="numerical");case".":case"0":case"I":case"N":return void(ms="numerical");case'"':case"'":return Fs=fs,Ss(),ls="",void(ms="string")}if(void 0===fs||!us.JudgeUtil.isDigitWithoutZero(fs))throw Ns(os.Char,Ss());ms="numerical"},numerical(){switch(fs){case".":return ls=Ss(),void(ms="decimalPointLeading");case"0":return ls=Ss(),void(ms="zero");case"I":return Ss(),_s("nfinity"),Os("numeric",ys*(1/0));case"N":return Ss(),_s("aN"),Os("numeric",NaN)}if(void 0!==fs&&us.JudgeUtil.isDigitWithoutZero(fs))return ls=Ss(),void(ms="decimalInteger");throw Ns(os.Char,Ss())},zero(){switch(fs){case".":case"e":case"E":return void(ms="decimal");case"x":case"X":return ls+=Ss(),void(ms="hexadecimal")}return Os("numeric",0)},decimalInteger(){switch(fs){case".":case"e":case"E":return void(ms="decimal")}if(!us.JudgeUtil.isDigit(fs))return Os("numeric",ys*Number(ls));ls+=Ss()},decimal(){switch(fs){case".":ls+=Ss(),ms="decimalFraction";break;case"e":case"E":ls+=Ss(),ms="decimalExponent"}},decimalPointLeading(){if(us.JudgeUtil.isDigit(fs))return ls+=Ss(),void(ms="decimalFraction");throw Ns(os.Char,Ss())},decimalFraction(){switch(fs){case"e":case"E":return ls+=Ss(),void(ms="decimalExponent")}if(!us.JudgeUtil.isDigit(fs))return Os("numeric",ys*Number(ls));ls+=Ss()},decimalExponent(){switch(fs){case"+":case"-":return ls+=Ss(),void(ms="decimalExponentSign")}if(us.JudgeUtil.isDigit(fs))return ls+=Ss(),void(ms="decimalExponentInteger");throw Ns(os.Char,Ss())},decimalExponentSign(){if(us.JudgeUtil.isDigit(fs))return ls+=Ss(),void(ms="decimalExponentInteger");throw Ns(os.Char,Ss())},decimalExponentInteger(){if(!us.JudgeUtil.isDigit(fs))return Os("numeric",ys*Number(ls));ls+=Ss()},hexadecimal(){if(us.JudgeUtil.isHexDigit(fs))return ls+=Ss(),void(ms="hexadecimalInteger");throw Ns(os.Char,Ss())},hexadecimalInteger(){if(!us.JudgeUtil.isHexDigit(fs))return Os("numeric",ys*Number(ls));ls+=Ss()},identifierNameStartEscape(){if("u"!==fs)throw Ns(os.Char,Ss());Ss();const e=bs();switch(e){case"$":case"_":break;default:if(!us.JudgeUtil.isIdStartChar(e))throw Ns(os.Identifier)}ls+=e,ms="identifierName"},identifierName(){switch(fs){case"$":case"_":case"‌":case"‍":return void(ls+=Ss());case"\\":return Ss(),void(ms="identifierNameEscape")}if(!us.JudgeUtil.isIdContinueChar(fs))return Os("identifier",ls);ls+=Ss()},identifierNameEscape(){if("u"!==fs)throw Ns(os.Char,Ss());Ss();const e=bs();switch(e){case"$":case"_":case"‌":case"‍":break;default:if(!us.JudgeUtil.isIdContinueChar(e))throw Ns(os.Identifier)}ls+=e,ms="identifierName"},string(){switch(fs){case"\\":return Ss(),void(ls+=function(){const e=vs(),t=function(){switch(vs()){case"b":return Ss(),"\b";case"f":return Ss(),"\f";case"n":return Ss(),"\n";case"r":return Ss(),"\r";case"t":return Ss(),"\t";case"v":return Ss(),"\v"}return}();if(t)return t;switch(e){case"0":if(Ss(),us.JudgeUtil.isDigit(vs()))throw Ns(os.Char,Ss());return"\0";case"x":return Ss(),function(){let e="",t=vs();if(!us.JudgeUtil.isHexDigit(t))throw Ns(os.Char,Ss());if(e+=Ss(),t=vs(),!us.JudgeUtil.isHexDigit(t))throw Ns(os.Char,Ss());return e+=Ss(),String.fromCodePoint(parseInt(e,16))}();case"u":return Ss(),bs();case"\n":case"\u2028":case"\u2029":return Ss(),"";case"\r":return Ss(),"\n"===vs()&&Ss(),""}if(void 0===e||us.JudgeUtil.isDigitWithoutZero(e))throw Ns(os.Char,Ss());return Ss()}());case'"':case"'":if(fs===Fs){const e=Os("string",ls);return Ss(),e}return void(ls+=Ss());case"\n":case"\r":case void 0:throw Ns(os.Char,Ss());case"\u2028":case"\u2029":!function(e){console.warn(`JSON5: '${Is(e)}' in strings is not valid ECMAScript; consider escaping.`)}(fs)}ls+=Ss()}};function Os(e,t){return{type:e,value:t,line:Es,column:hs}}function _s(e){for(const t of e){if(vs()!==t)throw Ns(os.Char,Ss());Ss()}}function bs(){let e="",t=4;for(;t-- >0;){const t=vs();if(!us.JudgeUtil.isHexDigit(t))throw Ns(os.Char,Ss());e+=Ss()}return String.fromCodePoint(parseInt(e,16))}const Bs={start(){if("eof"===is.type)throw Ns(os.EOF);xs()},beforePropertyName(){switch(is.type){case"identifier":case"string":return as=is.value,void(Ds="afterPropertyName");case"punctuator":return void Ps();case"eof":throw Ns(os.EOF)}},afterPropertyName(){if("eof"===is.type)throw Ns(os.EOF);Ds="beforePropertyValue"},beforePropertyValue(){if("eof"===is.type)throw Ns(os.EOF);xs()},afterPropertyValue(){if("eof"===is.type)throw Ns(os.EOF);switch(is.value){case",":return void(Ds="beforePropertyName");case"}":Ps()}},beforeArrayValue(){if("eof"===is.type)throw Ns(os.EOF);"punctuator"!==is.type||"]"!==is.value?xs():Ps()},afterArrayValue(){if("eof"===is.type)throw Ns(os.EOF);switch(is.value){case",":return void(Ds="beforeArrayValue");case"]":Ps()}},end(){}};function xs(){const e=function(){let e;switch(is.type){case"punctuator":switch(is.value){case"{":e={};break;case"[":e=[]}break;case"null":case"boolean":case"numeric":case"string":e=is.value}return e}();if(Cs&&"object"==typeof e&&(e._line=Es,e._column=hs),void 0===cs)cs=e;else{const t=ds[ds.length-1];Array.isArray(t)?Cs&&"object"!=typeof e?t.push({value:e,_line:Es,_column:hs}):t.push(e):t[as]=Cs&&"object"!=typeof e?{value:e,_line:Es,_column:hs}:e}!function(e){if(e&&"object"==typeof e)ds.push(e),Ds=Array.isArray(e)?"beforeArrayValue":"beforePropertyName";else{const e=ds[ds.length-1];Ds=e?Array.isArray(e)?"afterArrayValue":"afterPropertyValue":"end"}}(e)}function Ps(){ds.pop();const e=ds[ds.length-1];Ds=e?Array.isArray(e)?"afterArrayValue":"afterPropertyValue":"end"}function Is(e){const t={"'":"\\'",'"':'\\"',"\\":"\\\\","\b":"\\b","\f":"\\f","\n":"\\n","\r":"\\r","\t":"\\t","\v":"\\v","\0":"\\0","\u2028":"\\u2028","\u2029":"\\u2029"};if(t[e])return t[e];if(e<" "){const t=e.charCodeAt(0).toString(16);return`\\x${`00${t}`.substring(t.length)}`}return e}function Ns(e,t){let n="";switch(e){case os.Char:n=void 0===t?`JSON5: invalid end of input at ${Es}:${hs}`:`JSON5: invalid character '${Is(t)}' at ${Es}:${hs}`;break;case os.EOF:n=`JSON5: invalid end of input at ${Es}:${hs}`;break;case os.Identifier:hs-=5,n=`JSON5: invalid identifier character at ${Es}:${hs}`}const r=new Ts(n);return r.lineNumber=Es,r.columnNumber=hs,r}class Ts extends SyntaxError{}var ks={},Rs=p&&p.__createBinding||(Object.create?function(e,t,n,r){void 0===r&&(r=n);var u=Object.getOwnPropertyDescriptor(t,n);u&&!("get"in u?!t.__esModule:u.writable||u.configurable)||(u={enumerable:!0,get:function(){return t[n]}}),Object.defineProperty(e,r,u)}:function(e,t,n,r){void 0===r&&(r=n),e[r]=t[n]}),Ms=p&&p.__setModuleDefault||(Object.create?function(e,t){Object.defineProperty(e,"default",{enumerable:!0,value:t})}:function(e,t){e.default=t}),Ls=p&&p.__importStar||function(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)"default"!==n&&Object.prototype.hasOwnProperty.call(e,n)&&Rs(t,e,n);return Ms(t,e),t},js=p&&p.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(ks,"__esModule",{value:!0}),ks.isFileExists=ks.offlinePluginConversion=ks.executeCommand=ks.getNpmPath=ks.hasNpmPackInPaths=void 0;const $s=r,Hs=js(n),Gs=Ls(e),Vs=E,Js=S;ks.hasNpmPackInPaths=function(e,t){try{return require.resolve(e,{paths:[...t]}),!0}catch(e){return!1}},ks.getNpmPath=function(){const e=process.execPath;return Gs.join(Gs.dirname(e),Vs.NPM_TOOL)},ks.executeCommand=function(e,t,n){0!==(0,$s.spawnSync)(e,t,n).status&&(0,Js.logErrorAndExit)(`Error: ${e} ${t} execute failed.See above for details.`)},ks.offlinePluginConversion=function(e,t){return t.startsWith("file:")||t.endsWith(".tgz")?Gs.resolve(e,Vs.HVIGOR,t.replace("file:","")):t},ks.isFileExists=function(e){return Hs.default.existsSync(e)&&Hs.default.statSync(e).isFile()};var Us={};!function(u){var o=p&&p.__createBinding||(Object.create?function(e,t,n,r){void 0===r&&(r=n);var u=Object.getOwnPropertyDescriptor(t,n);u&&!("get"in u?!t.__esModule:u.writable||u.configurable)||(u={enumerable:!0,get:function(){return t[n]}}),Object.defineProperty(e,r,u)}:function(e,t,n,r){void 0===r&&(r=n),e[r]=t[n]}),i=p&&p.__setModuleDefault||(Object.create?function(e,t){Object.defineProperty(e,"default",{enumerable:!0,value:t})}:function(e,t){e.default=t}),s=p&&p.__importStar||function(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)"default"!==n&&Object.prototype.hasOwnProperty.call(e,n)&&o(t,e,n);return i(t,e),t},a=p&&p.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(u,"__esModule",{value:!0}),u.executeInstallPnpm=u.isPnpmInstalled=u.environmentHandler=u.checkNpmConifg=u.PNPM_VERSION=void 0;const c=r,l=s(n),f=a(t),D=s(e),d=E,h=S,C=ks;u.PNPM_VERSION="7.30.0",u.checkNpmConifg=function(){const e=D.resolve(d.HVIGOR_PROJECT_ROOT_DIR,".npmrc"),t=D.resolve(f.default.homedir(),".npmrc");if((0,C.isFileExists)(e)||(0,C.isFileExists)(t))return;const n=(0,C.getNpmPath)(),r=(0,c.spawnSync)(n,["config","get","prefix"],{cwd:d.HVIGOR_PROJECT_ROOT_DIR});if(0!==r.status||!r.stdout)return void(0,h.logErrorAndExit)("Error: The hvigor depends on the npmrc file. Configure the npmrc file first.");const u=D.resolve(`${r.stdout}`.replace(/[\r\n]/gi,""),".npmrc");(0,C.isFileExists)(u)||(0,h.logErrorAndExit)("Error: The hvigor depends on the npmrc file. Configure the npmrc file first.")},u.environmentHandler=function(){process.env["npm_config_update-notifier"]="false"},u.isPnpmInstalled=function(){return!!l.existsSync(d.HVIGOR_WRAPPER_PNPM_SCRIPT_PATH)&&(0,C.hasNpmPackInPaths)("pnpm",[d.HVIGOR_WRAPPER_TOOLS_HOME])},u.executeInstallPnpm=function(){(0,h.logInfo)(`Installing pnpm@${u.PNPM_VERSION}...`);const e=(0,C.getNpmPath)();!function(){const e=D.resolve(d.HVIGOR_WRAPPER_TOOLS_HOME,d.DEFAULT_PACKAGE_JSON);try{l.existsSync(d.HVIGOR_WRAPPER_TOOLS_HOME)||l.mkdirSync(d.HVIGOR_WRAPPER_TOOLS_HOME,{recursive:!0});const t={dependencies:{}};t.dependencies[d.PNPM]=u.PNPM_VERSION,l.writeFileSync(e,JSON.stringify(t))}catch(t){(0,h.logErrorAndExit)(`Error: EPERM: operation not permitted,create ${e} failed.`)}}(),(0,C.executeCommand)(e,["install","pnpm"],{cwd:d.HVIGOR_WRAPPER_TOOLS_HOME,stdio:["inherit","inherit","inherit"],env:process.env}),(0,h.logInfo)("Pnpm install success.")}}(Us);var Ws=p&&p.__createBinding||(Object.create?function(e,t,n,r){void 0===r&&(r=n);var u=Object.getOwnPropertyDescriptor(t,n);u&&!("get"in u?!t.__esModule:u.writable||u.configurable)||(u={enumerable:!0,get:function(){return t[n]}}),Object.defineProperty(e,r,u)}:function(e,t,n,r){void 0===r&&(r=n),e[r]=t[n]}),zs=p&&p.__setModuleDefault||(Object.create?function(e,t){Object.defineProperty(e,"default",{enumerable:!0,value:t})}:function(e,t){e.default=t}),Ks=p&&p.__importStar||function(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)"default"!==n&&Object.prototype.hasOwnProperty.call(e,n)&&Ws(t,e,n);return zs(t,e),t},qs=p&&p.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(L,"__esModule",{value:!0});var Ys=L.initProjectWorkSpace=void 0;const Zs=Ks(n),Xs=qs(t),Qs=Ks(e),ea=qs(u),ta=j,na=E,ra=Ki,ua=qi,oa=S,ia=ks,sa=Us;let aa,ca,la;function fa(e,t,n){return void 0!==n.dependencies&&(0,ia.offlinePluginConversion)(na.HVIGOR_PROJECT_ROOT_DIR,t.dependencies[e])===Qs.normalize(n.dependencies[e])}Ys=L.initProjectWorkSpace=function(){if(aa=function(){const e=Qs.resolve(na.HVIGOR_PROJECT_WRAPPER_HOME,na.DEFAULT_HVIGOR_CONFIG_JSON_FILE_NAME);Zs.existsSync(e)||(0,oa.logErrorAndExit)(`Error: Hvigor config file ${e} does not exist.`);return(0,ua.parseJsonFile)(e)}(),la=function(e){let t;t=function(e){const t=e.hvigorVersion;if(t.startsWith("file:")||t.endsWith(".tgz"))return!1;const n=e.dependencies,r=Object.getOwnPropertyNames(n);for(const e of r){const t=n[e];if(t.startsWith("file:")||t.endsWith(".tgz"))return!1}if(1===r.length&&"@ohos/hvigor-ohos-plugin"===r[0])return t>"2.5.0";return!1}(e)?function(e){let t=`${na.HVIGOR_ENGINE_PACKAGE_NAME}@${e.hvigorVersion}`;const n=e.dependencies;if(n){Object.getOwnPropertyNames(n).sort().forEach((e=>{t+=`,${e}@${n[e]}`}))}return(0,ra.hash)(t)}(e):(0,ra.hash)(ea.default.cwd());return Qs.resolve(Xs.default.homedir(),".hvigor","project_caches",t)}(aa),ca=function(){const e=Qs.resolve(la,na.WORK_SPACE,na.DEFAULT_PACKAGE_JSON);return Zs.existsSync(e)?(0,ua.parseJsonFile)(e):{dependencies:{}}}(),function(){const e=Qs.resolve(na.HVIGOR_USER_HOME,na.DEFAULT_HVIGOR_CONFIG_JSON_FILE_NAME);if(Zs.existsSync(e))(0,ua.parseJsonFile)(e)}(),!(0,ia.hasNpmPackInPaths)(na.HVIGOR_ENGINE_PACKAGE_NAME,[Qs.join(la,na.WORK_SPACE)])||(0,ia.offlinePluginConversion)(na.HVIGOR_PROJECT_ROOT_DIR,aa.hvigorVersion)!==ca.dependencies[na.HVIGOR_ENGINE_PACKAGE_NAME]||!function(){function e(e){const t=null==e?void 0:e.dependencies;return void 0===t?0:Object.getOwnPropertyNames(t).length}const t=e(aa),n=e(ca);if(t+1!==n)return!1;for(const e in null==aa?void 0:aa.dependencies)if(!(0,ia.hasNpmPackInPaths)(e,[Qs.join(la,na.WORK_SPACE)])||!fa(e,aa,ca))return!1;return!0}())try{const e=ea.default.hrtime();(0,sa.checkNpmConifg)(),function(){(0,oa.logInfo)("Hvigor installing...");for(const e in aa.dependencies)aa.dependencies[e]&&(aa.dependencies[e]=(0,ia.offlinePluginConversion)(na.HVIGOR_PROJECT_ROOT_DIR,aa.dependencies[e]));const e={dependencies:{...aa.dependencies}};e.dependencies[na.HVIGOR_ENGINE_PACKAGE_NAME]=(0,ia.offlinePluginConversion)(na.HVIGOR_PROJECT_ROOT_DIR,aa.hvigorVersion);const t=Qs.join(la,na.WORK_SPACE);try{Zs.mkdirSync(t,{recursive:!0});const n=Qs.resolve(t,na.DEFAULT_PACKAGE_JSON);Zs.writeFileSync(n,JSON.stringify(e))}catch(e){(0,oa.logErrorAndExit)(e)}(function(){const e=["config","set","store-dir",na.HVIGOR_PNPM_STORE_PATH],t={cwd:Qs.join(la,na.WORK_SPACE),stdio:["inherit","inherit","inherit"]};(0,ia.executeCommand)(na.HVIGOR_WRAPPER_PNPM_SCRIPT_PATH,e,t)})(),function(){const e=["install"],t={cwd:Qs.join(la,na.WORK_SPACE),stdio:["inherit","inherit","inherit"]};(0,ia.executeCommand)(na.HVIGOR_WRAPPER_PNPM_SCRIPT_PATH,e,t)}(),(0,oa.logInfo)("Hvigor install success.")}();const t=ea.default.hrtime(e);ta.hvigorTrace.HVIGOR_INSTALL_TIME=1e9*t[0]+t[1]}catch(e){!function(){const e=Qs.join(la,na.WORK_SPACE);if((0,oa.logInfo)("Hvigor cleaning..."),!Zs.existsSync(e))return;const t=Zs.readdirSync(e);if(!t||0===t.length)return;const n=Qs.resolve(la,"node_modules","@ohos","hvigor","bin","hvigor.js");Zs.existsSync(n)&&(0,ia.executeCommand)(ea.default.argv[0],[n,"--stop-daemon"],{});try{t.forEach((t=>{Zs.rmSync(Qs.resolve(e,t),{recursive:!0})}))}catch(t){(0,oa.logErrorAndExit)(`The hvigor build tool cannot be installed. Please manually clear the workspace directory and synchronize the project again.\n\n      Workspace Path: ${e}.`)}}()}return la},function(){Us.environmentHandler(),Us.isPnpmInstalled()||(Us.checkNpmConifg(),Us.executeInstallPnpm());const t=Ys();b(e.join(t,E.WORK_SPACE))}();
\ No newline at end of file
+"use strict";var e=require("path"),t=require("os"),n=require("fs"),r=require("child_process"),u=require("constants"),o=require("stream"),i=require("util"),s=require("assert"),c=require("process"),a=require("tty"),l=require("url"),f=require("zlib"),d=require("net"),D=require("crypto"),p="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},h={},E={},m=p&&p.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(E,"__esModule",{value:!0}),E.maxPathLength=E.isMac=E.isLinux=E.isWindows=void 0;const y=m(t),C="Windows_NT",F="Darwin";function g(){return y.default.type()===C}function A(){return y.default.type()===F}E.isWindows=g,E.isLinux=function(){return"Linux"===y.default.type()},E.isMac=A,E.maxPathLength=function(){return A()?1016:g()?259:4095},Object.defineProperty(h,"__esModule",{value:!0}),h.LOG_LEVEL=h.ANALYZE=h.PARALLEL=h.INCREMENTAL=h.DAEMON=h.DOT=h.PROPERTIES=h.OHOS_ARK_COMPILE_MAX_SIZE=h.HVIGOR_POOL_CACHE_TTL=h.HVIGOR_POOL_CACHE_CAPACITY=h.HVIGOR_POOL_MAX_CORE_SIZE=h.HVIGOR_POOL_MAX_SIZE=h.BUILD_CACHE_DIR=h.ENABLE_SIGN_TASK_KEY=h.HVIGOR_CACHE_DIR_KEY=h.WORK_SPACE=h.PROJECT_CACHES=h.HVIGOR_USER_HOME_DIR_NAME=h.DEFAULT_PACKAGE_JSON=h.DEFAULT_HVIGOR_CONFIG_JSON_FILE_NAME=h.PNPM=h.HVIGOR=h.NPM_TOOL=h.PNPM_TOOL=h.HVIGOR_ENGINE_PACKAGE_NAME=void 0;const v=E;h.HVIGOR_ENGINE_PACKAGE_NAME="@ohos/hvigor",h.PNPM_TOOL=(0,v.isWindows)()?"pnpm.cmd":"pnpm",h.NPM_TOOL=(0,v.isWindows)()?"npm.cmd":"npm",h.HVIGOR="hvigor",h.PNPM="pnpm",h.DEFAULT_HVIGOR_CONFIG_JSON_FILE_NAME="hvigor-config.json5",h.DEFAULT_PACKAGE_JSON="package.json",h.HVIGOR_USER_HOME_DIR_NAME=".hvigor",h.PROJECT_CACHES="project_caches";var S=h.WORK_SPACE="workspace";h.HVIGOR_CACHE_DIR_KEY="hvigor.cacheDir",h.ENABLE_SIGN_TASK_KEY="enableSignTask",h.BUILD_CACHE_DIR="build-cache-dir",h.HVIGOR_POOL_MAX_SIZE="hvigor.pool.maxSize",h.HVIGOR_POOL_MAX_CORE_SIZE="hvigor.pool.maxCoreSize",h.HVIGOR_POOL_CACHE_CAPACITY="hvigor.pool.cache.capacity",h.HVIGOR_POOL_CACHE_TTL="hvigor.pool.cache.ttl",h.OHOS_ARK_COMPILE_MAX_SIZE="ohos.arkCompile.maxSize",h.PROPERTIES="properties",h.DOT=".",h.DAEMON="daemon",h.INCREMENTAL="incremental",h.PARALLEL="typeCheck",h.ANALYZE="analyze",h.LOG_LEVEL="logLevel";var w={},O={};Object.defineProperty(O,"__esModule",{value:!0}),O.logError=O.logInfo=O.logErrorAndExit=void 0,O.logErrorAndExit=function(e){e instanceof Error?console.error(e.message):console.error(e),process.exit(-1)},O.logInfo=function(e){console.log(e)},O.logError=function(e){console.error(e)};var _=p&&p.__createBinding||(Object.create?function(e,t,n,r){void 0===r&&(r=n);var u=Object.getOwnPropertyDescriptor(t,n);u&&!("get"in u?!t.__esModule:u.writable||u.configurable)||(u={enumerable:!0,get:function(){return t[n]}}),Object.defineProperty(e,r,u)}:function(e,t,n,r){void 0===r&&(r=n),e[r]=t[n]}),b=p&&p.__setModuleDefault||(Object.create?function(e,t){Object.defineProperty(e,"default",{enumerable:!0,value:t})}:function(e,t){e.default=t}),B=p&&p.__importStar||function(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)"default"!==n&&Object.prototype.hasOwnProperty.call(e,n)&&_(t,e,n);return b(t,e),t};Object.defineProperty(w,"__esModule",{value:!0});var P=w.executeBuild=void 0;const I=B(n),k=B(e),x=O,N=r;P=w.executeBuild=function(e){const t=k.resolve(e,"node_modules","@ohos","hvigor","bin","hvigor.js");try{const e=I.realpathSync(t),n=process.argv.slice(2),r=(0,N.spawn)("node",[e,...n],{env:process.env});r.stdout.on("data",(e=>{(0,x.logInfo)(`${e.toString().trim()}`)})),r.stderr.on("data",(e=>{(0,x.logError)(`${e.toString().trim()}`)})),r.on("exit",((e,t)=>{process.exit(null!=e?e:-1)}))}catch(n){(0,x.logErrorAndExit)(`Error: ENOENT: no such file ${t},delete ${e} and retry.`)}};var R={},T={},M={fromCallback:function(e){return Object.defineProperty((function(...t){if("function"!=typeof t[t.length-1])return new Promise(((n,r)=>{t.push(((e,t)=>null!=e?r(e):n(t))),e.apply(this,t)}));e.apply(this,t)}),"name",{value:e.name})},fromPromise:function(e){return Object.defineProperty((function(...t){const n=t[t.length-1];if("function"!=typeof n)return e.apply(this,t);t.pop(),e.apply(this,t).then((e=>n(null,e)),n)}),"name",{value:e.name})}},L=u,j=process.cwd,$=null,H=process.env.GRACEFUL_FS_PLATFORM||process.platform;process.cwd=function(){return $||($=j.call(process)),$};try{process.cwd()}catch(e){}if("function"==typeof process.chdir){var G=process.chdir;process.chdir=function(e){$=null,G.call(process,e)},Object.setPrototypeOf&&Object.setPrototypeOf(process.chdir,G)}var V=function(e){L.hasOwnProperty("O_SYMLINK")&&process.version.match(/^v0\.6\.[0-2]|^v0\.5\./)&&function(e){e.lchmod=function(t,n,r){e.open(t,L.O_WRONLY|L.O_SYMLINK,n,(function(t,u){t?r&&r(t):e.fchmod(u,n,(function(t){e.close(u,(function(e){r&&r(t||e)}))}))}))},e.lchmodSync=function(t,n){var r,u=e.openSync(t,L.O_WRONLY|L.O_SYMLINK,n),o=!0;try{r=e.fchmodSync(u,n),o=!1}finally{if(o)try{e.closeSync(u)}catch(e){}else e.closeSync(u)}return r}}(e);e.lutimes||function(e){L.hasOwnProperty("O_SYMLINK")&&e.futimes?(e.lutimes=function(t,n,r,u){e.open(t,L.O_SYMLINK,(function(t,o){t?u&&u(t):e.futimes(o,n,r,(function(t){e.close(o,(function(e){u&&u(t||e)}))}))}))},e.lutimesSync=function(t,n,r){var u,o=e.openSync(t,L.O_SYMLINK),i=!0;try{u=e.futimesSync(o,n,r),i=!1}finally{if(i)try{e.closeSync(o)}catch(e){}else e.closeSync(o)}return u}):e.futimes&&(e.lutimes=function(e,t,n,r){r&&process.nextTick(r)},e.lutimesSync=function(){})}(e);e.chown=r(e.chown),e.fchown=r(e.fchown),e.lchown=r(e.lchown),e.chmod=t(e.chmod),e.fchmod=t(e.fchmod),e.lchmod=t(e.lchmod),e.chownSync=u(e.chownSync),e.fchownSync=u(e.fchownSync),e.lchownSync=u(e.lchownSync),e.chmodSync=n(e.chmodSync),e.fchmodSync=n(e.fchmodSync),e.lchmodSync=n(e.lchmodSync),e.stat=o(e.stat),e.fstat=o(e.fstat),e.lstat=o(e.lstat),e.statSync=i(e.statSync),e.fstatSync=i(e.fstatSync),e.lstatSync=i(e.lstatSync),e.chmod&&!e.lchmod&&(e.lchmod=function(e,t,n){n&&process.nextTick(n)},e.lchmodSync=function(){});e.chown&&!e.lchown&&(e.lchown=function(e,t,n,r){r&&process.nextTick(r)},e.lchownSync=function(){});"win32"===H&&(e.rename="function"!=typeof e.rename?e.rename:function(t){function n(n,r,u){var o=Date.now(),i=0;t(n,r,(function s(c){if(c&&("EACCES"===c.code||"EPERM"===c.code||"EBUSY"===c.code)&&Date.now()-o<6e4)return setTimeout((function(){e.stat(r,(function(e,o){e&&"ENOENT"===e.code?t(n,r,s):u(c)}))}),i),void(i<100&&(i+=10));u&&u(c)}))}return Object.setPrototypeOf&&Object.setPrototypeOf(n,t),n}(e.rename));function t(t){return t?function(n,r,u){return t.call(e,n,r,(function(e){s(e)&&(e=null),u&&u.apply(this,arguments)}))}:t}function n(t){return t?function(n,r){try{return t.call(e,n,r)}catch(e){if(!s(e))throw e}}:t}function r(t){return t?function(n,r,u,o){return t.call(e,n,r,u,(function(e){s(e)&&(e=null),o&&o.apply(this,arguments)}))}:t}function u(t){return t?function(n,r,u){try{return t.call(e,n,r,u)}catch(e){if(!s(e))throw e}}:t}function o(t){return t?function(n,r,u){function o(e,t){t&&(t.uid<0&&(t.uid+=4294967296),t.gid<0&&(t.gid+=4294967296)),u&&u.apply(this,arguments)}return"function"==typeof r&&(u=r,r=null),r?t.call(e,n,r,o):t.call(e,n,o)}:t}function i(t){return t?function(n,r){var u=r?t.call(e,n,r):t.call(e,n);return u&&(u.uid<0&&(u.uid+=4294967296),u.gid<0&&(u.gid+=4294967296)),u}:t}function s(e){return!e||("ENOSYS"===e.code||!(process.getuid&&0===process.getuid()||"EINVAL"!==e.code&&"EPERM"!==e.code))}e.read="function"!=typeof e.read?e.read:function(t){function n(n,r,u,o,i,s){var c;if(s&&"function"==typeof s){var a=0;c=function(l,f,d){if(l&&"EAGAIN"===l.code&&a<10)return a++,t.call(e,n,r,u,o,i,c);s.apply(this,arguments)}}return t.call(e,n,r,u,o,i,c)}return Object.setPrototypeOf&&Object.setPrototypeOf(n,t),n}(e.read),e.readSync="function"!=typeof e.readSync?e.readSync:(c=e.readSync,function(t,n,r,u,o){for(var i=0;;)try{return c.call(e,t,n,r,u,o)}catch(e){if("EAGAIN"===e.code&&i<10){i++;continue}throw e}});var c};var U=o.Stream,J=function(e){return{ReadStream:function t(n,r){if(!(this instanceof t))return new t(n,r);U.call(this);var u=this;this.path=n,this.fd=null,this.readable=!0,this.paused=!1,this.flags="r",this.mode=438,this.bufferSize=65536,r=r||{};for(var o=Object.keys(r),i=0,s=o.length;i<s;i++){var c=o[i];this[c]=r[c]}this.encoding&&this.setEncoding(this.encoding);if(void 0!==this.start){if("number"!=typeof this.start)throw TypeError("start must be a Number");if(void 0===this.end)this.end=1/0;else if("number"!=typeof this.end)throw TypeError("end must be a Number");if(this.start>this.end)throw new Error("start must be <= end");this.pos=this.start}if(null!==this.fd)return void process.nextTick((function(){u._read()}));e.open(this.path,this.flags,this.mode,(function(e,t){if(e)return u.emit("error",e),void(u.readable=!1);u.fd=t,u.emit("open",t),u._read()}))},WriteStream:function t(n,r){if(!(this instanceof t))return new t(n,r);U.call(this),this.path=n,this.fd=null,this.writable=!0,this.flags="w",this.encoding="binary",this.mode=438,this.bytesWritten=0,r=r||{};for(var u=Object.keys(r),o=0,i=u.length;o<i;o++){var s=u[o];this[s]=r[s]}if(void 0!==this.start){if("number"!=typeof this.start)throw TypeError("start must be a Number");if(this.start<0)throw new Error("start must be >= zero");this.pos=this.start}this.busy=!1,this._queue=[],null===this.fd&&(this._open=e.open,this._queue.push([this._open,this.path,this.flags,this.mode,void 0]),this.flush())}}};var W=function(e){if(null===e||"object"!=typeof e)return e;if(e instanceof Object)var t={__proto__:z(e)};else t=Object.create(null);return Object.getOwnPropertyNames(e).forEach((function(n){Object.defineProperty(t,n,Object.getOwnPropertyDescriptor(e,n))})),t},z=Object.getPrototypeOf||function(e){return e.__proto__};var K,q,Y=n,Z=V,X=J,Q=W,ee=i;function te(e,t){Object.defineProperty(e,K,{get:function(){return t}})}"function"==typeof Symbol&&"function"==typeof Symbol.for?(K=Symbol.for("graceful-fs.queue"),q=Symbol.for("graceful-fs.previous")):(K="___graceful-fs.queue",q="___graceful-fs.previous");var ne=function(){};if(ee.debuglog?ne=ee.debuglog("gfs4"):/\bgfs4\b/i.test(process.env.NODE_DEBUG||"")&&(ne=function(){var e=ee.format.apply(ee,arguments);e="GFS4: "+e.split(/\n/).join("\nGFS4: "),console.error(e)}),!Y[K]){var re=p[K]||[];te(Y,re),Y.close=function(e){function t(t,n){return e.call(Y,t,(function(e){e||ce(),"function"==typeof n&&n.apply(this,arguments)}))}return Object.defineProperty(t,q,{value:e}),t}(Y.close),Y.closeSync=function(e){function t(t){e.apply(Y,arguments),ce()}return Object.defineProperty(t,q,{value:e}),t}(Y.closeSync),/\bgfs4\b/i.test(process.env.NODE_DEBUG||"")&&process.on("exit",(function(){ne(Y[K]),s.equal(Y[K].length,0)}))}p[K]||te(p,Y[K]);var ue,oe=ie(Q(Y));function ie(e){Z(e),e.gracefulify=ie,e.createReadStream=function(t,n){return new e.ReadStream(t,n)},e.createWriteStream=function(t,n){return new e.WriteStream(t,n)};var t=e.readFile;e.readFile=function(e,n,r){"function"==typeof n&&(r=n,n=null);return function e(n,r,u,o){return t(n,r,(function(t){!t||"EMFILE"!==t.code&&"ENFILE"!==t.code?"function"==typeof u&&u.apply(this,arguments):se([e,[n,r,u],t,o||Date.now(),Date.now()])}))}(e,n,r)};var n=e.writeFile;e.writeFile=function(e,t,r,u){"function"==typeof r&&(u=r,r=null);return function e(t,r,u,o,i){return n(t,r,u,(function(n){!n||"EMFILE"!==n.code&&"ENFILE"!==n.code?"function"==typeof o&&o.apply(this,arguments):se([e,[t,r,u,o],n,i||Date.now(),Date.now()])}))}(e,t,r,u)};var r=e.appendFile;r&&(e.appendFile=function(e,t,n,u){"function"==typeof n&&(u=n,n=null);return function e(t,n,u,o,i){return r(t,n,u,(function(r){!r||"EMFILE"!==r.code&&"ENFILE"!==r.code?"function"==typeof o&&o.apply(this,arguments):se([e,[t,n,u,o],r,i||Date.now(),Date.now()])}))}(e,t,n,u)});var u=e.copyFile;u&&(e.copyFile=function(e,t,n,r){"function"==typeof n&&(r=n,n=0);return function e(t,n,r,o,i){return u(t,n,r,(function(u){!u||"EMFILE"!==u.code&&"ENFILE"!==u.code?"function"==typeof o&&o.apply(this,arguments):se([e,[t,n,r,o],u,i||Date.now(),Date.now()])}))}(e,t,n,r)});var o=e.readdir;e.readdir=function(e,t,n){"function"==typeof t&&(n=t,t=null);var r=i.test(process.version)?function(e,t,n,r){return o(e,u(e,t,n,r))}:function(e,t,n,r){return o(e,t,u(e,t,n,r))};return r(e,t,n);function u(e,t,n,u){return function(o,i){!o||"EMFILE"!==o.code&&"ENFILE"!==o.code?(i&&i.sort&&i.sort(),"function"==typeof n&&n.call(this,o,i)):se([r,[e,t,n],o,u||Date.now(),Date.now()])}}};var i=/^v[0-5]\./;if("v0.8"===process.version.substr(0,4)){var s=X(e);d=s.ReadStream,D=s.WriteStream}var c=e.ReadStream;c&&(d.prototype=Object.create(c.prototype),d.prototype.open=function(){var e=this;h(e.path,e.flags,e.mode,(function(t,n){t?(e.autoClose&&e.destroy(),e.emit("error",t)):(e.fd=n,e.emit("open",n),e.read())}))});var a=e.WriteStream;a&&(D.prototype=Object.create(a.prototype),D.prototype.open=function(){var e=this;h(e.path,e.flags,e.mode,(function(t,n){t?(e.destroy(),e.emit("error",t)):(e.fd=n,e.emit("open",n))}))}),Object.defineProperty(e,"ReadStream",{get:function(){return d},set:function(e){d=e},enumerable:!0,configurable:!0}),Object.defineProperty(e,"WriteStream",{get:function(){return D},set:function(e){D=e},enumerable:!0,configurable:!0});var l=d;Object.defineProperty(e,"FileReadStream",{get:function(){return l},set:function(e){l=e},enumerable:!0,configurable:!0});var f=D;function d(e,t){return this instanceof d?(c.apply(this,arguments),this):d.apply(Object.create(d.prototype),arguments)}function D(e,t){return this instanceof D?(a.apply(this,arguments),this):D.apply(Object.create(D.prototype),arguments)}Object.defineProperty(e,"FileWriteStream",{get:function(){return f},set:function(e){f=e},enumerable:!0,configurable:!0});var p=e.open;function h(e,t,n,r){return"function"==typeof n&&(r=n,n=null),function e(t,n,r,u,o){return p(t,n,r,(function(i,s){!i||"EMFILE"!==i.code&&"ENFILE"!==i.code?"function"==typeof u&&u.apply(this,arguments):se([e,[t,n,r,u],i,o||Date.now(),Date.now()])}))}(e,t,n,r)}return e.open=h,e}function se(e){ne("ENQUEUE",e[0].name,e[1]),Y[K].push(e),ae()}function ce(){for(var e=Date.now(),t=0;t<Y[K].length;++t)Y[K][t].length>2&&(Y[K][t][3]=e,Y[K][t][4]=e);ae()}function ae(){if(clearTimeout(ue),ue=void 0,0!==Y[K].length){var e=Y[K].shift(),t=e[0],n=e[1],r=e[2],u=e[3],o=e[4];if(void 0===u)ne("RETRY",t.name,n),t.apply(null,n);else if(Date.now()-u>=6e4){ne("TIMEOUT",t.name,n);var i=n.pop();"function"==typeof i&&i.call(null,r)}else{var s=Date.now()-o,c=Math.max(o-u,1);s>=Math.min(1.2*c,100)?(ne("RETRY",t.name,n),t.apply(null,n.concat([u]))):Y[K].push(e)}void 0===ue&&(ue=setTimeout(ae,0))}}process.env.TEST_GRACEFUL_FS_GLOBAL_PATCH&&!Y.__patched&&(oe=ie(Y),Y.__patched=!0),function(e){const t=M.fromCallback,n=oe,r=["access","appendFile","chmod","chown","close","copyFile","fchmod","fchown","fdatasync","fstat","fsync","ftruncate","futimes","lchmod","lchown","link","lstat","mkdir","mkdtemp","open","opendir","readdir","readFile","readlink","realpath","rename","rm","rmdir","stat","symlink","truncate","unlink","utimes","writeFile"].filter((e=>"function"==typeof n[e]));Object.assign(e,n),r.forEach((r=>{e[r]=t(n[r])})),e.exists=function(e,t){return"function"==typeof t?n.exists(e,t):new Promise((t=>n.exists(e,t)))},e.read=function(e,t,r,u,o,i){return"function"==typeof i?n.read(e,t,r,u,o,i):new Promise(((i,s)=>{n.read(e,t,r,u,o,((e,t,n)=>{if(e)return s(e);i({bytesRead:t,buffer:n})}))}))},e.write=function(e,t,...r){return"function"==typeof r[r.length-1]?n.write(e,t,...r):new Promise(((u,o)=>{n.write(e,t,...r,((e,t,n)=>{if(e)return o(e);u({bytesWritten:t,buffer:n})}))}))},e.readv=function(e,t,...r){return"function"==typeof r[r.length-1]?n.readv(e,t,...r):new Promise(((u,o)=>{n.readv(e,t,...r,((e,t,n)=>{if(e)return o(e);u({bytesRead:t,buffers:n})}))}))},e.writev=function(e,t,...r){return"function"==typeof r[r.length-1]?n.writev(e,t,...r):new Promise(((u,o)=>{n.writev(e,t,...r,((e,t,n)=>{if(e)return o(e);u({bytesWritten:t,buffers:n})}))}))},"function"==typeof n.realpath.native?e.realpath.native=t(n.realpath.native):process.emitWarning("fs.realpath.native is not a function. Is fs being monkey-patched?","Warning","fs-extra-WARN0003")}(T);var le={},fe={};const de=e;fe.checkPath=function(e){if("win32"===process.platform){if(/[<>:"|?*]/.test(e.replace(de.parse(e).root,""))){const t=new Error(`Path contains invalid characters: ${e}`);throw t.code="EINVAL",t}}};const De=T,{checkPath:pe}=fe,he=e=>"number"==typeof e?e:{mode:511,...e}.mode;le.makeDir=async(e,t)=>(pe(e),De.mkdir(e,{mode:he(t),recursive:!0})),le.makeDirSync=(e,t)=>(pe(e),De.mkdirSync(e,{mode:he(t),recursive:!0}));const Ee=M.fromPromise,{makeDir:me,makeDirSync:ye}=le,Ce=Ee(me);var Fe={mkdirs:Ce,mkdirsSync:ye,mkdirp:Ce,mkdirpSync:ye,ensureDir:Ce,ensureDirSync:ye};const ge=M.fromPromise,Ae=T;var ve={pathExists:ge((function(e){return Ae.access(e).then((()=>!0)).catch((()=>!1))})),pathExistsSync:Ae.existsSync};const Se=oe;var we=function(e,t,n,r){Se.open(e,"r+",((e,u)=>{if(e)return r(e);Se.futimes(u,t,n,(e=>{Se.close(u,(t=>{r&&r(e||t)}))}))}))},Oe=function(e,t,n){const r=Se.openSync(e,"r+");return Se.futimesSync(r,t,n),Se.closeSync(r)};const _e=T,be=e,Be=i;function Pe(e,t,n){const r=n.dereference?e=>_e.stat(e,{bigint:!0}):e=>_e.lstat(e,{bigint:!0});return Promise.all([r(e),r(t).catch((e=>{if("ENOENT"===e.code)return null;throw e}))]).then((([e,t])=>({srcStat:e,destStat:t})))}function Ie(e,t){return t.ino&&t.dev&&t.ino===e.ino&&t.dev===e.dev}function ke(e,t){const n=be.resolve(e).split(be.sep).filter((e=>e)),r=be.resolve(t).split(be.sep).filter((e=>e));return n.reduce(((e,t,n)=>e&&r[n]===t),!0)}function xe(e,t,n){return`Cannot ${n} '${e}' to a subdirectory of itself, '${t}'.`}var Ne={checkPaths:function(e,t,n,r,u){Be.callbackify(Pe)(e,t,r,((r,o)=>{if(r)return u(r);const{srcStat:i,destStat:s}=o;if(s){if(Ie(i,s)){const r=be.basename(e),o=be.basename(t);return"move"===n&&r!==o&&r.toLowerCase()===o.toLowerCase()?u(null,{srcStat:i,destStat:s,isChangingCase:!0}):u(new Error("Source and destination must not be the same."))}if(i.isDirectory()&&!s.isDirectory())return u(new Error(`Cannot overwrite non-directory '${t}' with directory '${e}'.`));if(!i.isDirectory()&&s.isDirectory())return u(new Error(`Cannot overwrite directory '${t}' with non-directory '${e}'.`))}return i.isDirectory()&&ke(e,t)?u(new Error(xe(e,t,n))):u(null,{srcStat:i,destStat:s})}))},checkPathsSync:function(e,t,n,r){const{srcStat:u,destStat:o}=function(e,t,n){let r;const u=n.dereference?e=>_e.statSync(e,{bigint:!0}):e=>_e.lstatSync(e,{bigint:!0}),o=u(e);try{r=u(t)}catch(e){if("ENOENT"===e.code)return{srcStat:o,destStat:null};throw e}return{srcStat:o,destStat:r}}(e,t,r);if(o){if(Ie(u,o)){const r=be.basename(e),i=be.basename(t);if("move"===n&&r!==i&&r.toLowerCase()===i.toLowerCase())return{srcStat:u,destStat:o,isChangingCase:!0};throw new Error("Source and destination must not be the same.")}if(u.isDirectory()&&!o.isDirectory())throw new Error(`Cannot overwrite non-directory '${t}' with directory '${e}'.`);if(!u.isDirectory()&&o.isDirectory())throw new Error(`Cannot overwrite directory '${t}' with non-directory '${e}'.`)}if(u.isDirectory()&&ke(e,t))throw new Error(xe(e,t,n));return{srcStat:u,destStat:o}},checkParentPaths:function e(t,n,r,u,o){const i=be.resolve(be.dirname(t)),s=be.resolve(be.dirname(r));if(s===i||s===be.parse(s).root)return o();_e.stat(s,{bigint:!0},((i,c)=>i?"ENOENT"===i.code?o():o(i):Ie(n,c)?o(new Error(xe(t,r,u))):e(t,n,s,u,o)))},checkParentPathsSync:function e(t,n,r,u){const o=be.resolve(be.dirname(t)),i=be.resolve(be.dirname(r));if(i===o||i===be.parse(i).root)return;let s;try{s=_e.statSync(i,{bigint:!0})}catch(e){if("ENOENT"===e.code)return;throw e}if(Ie(n,s))throw new Error(xe(t,r,u));return e(t,n,i,u)},isSrcSubdir:ke,areIdentical:Ie};const Re=oe,Te=e,Me=Fe.mkdirs,Le=ve.pathExists,je=we,$e=Ne;function He(e,t,n,r){if(!n.filter)return r(null,!0);Promise.resolve(n.filter(e,t)).then((e=>r(null,e)),(e=>r(e)))}function Ge(e,t,n,r,u){(r.dereference?Re.stat:Re.lstat)(t,((o,i)=>o?u(o):i.isDirectory()?function(e,t,n,r,u,o){return t?We(n,r,u,o):function(e,t,n,r,u){Re.mkdir(n,(o=>{if(o)return u(o);We(t,n,r,(t=>t?u(t):Je(n,e,u)))}))}(e.mode,n,r,u,o)}(i,e,t,n,r,u):i.isFile()||i.isCharacterDevice()||i.isBlockDevice()?function(e,t,n,r,u,o){return t?function(e,t,n,r,u){if(!r.overwrite)return r.errorOnExist?u(new Error(`'${n}' already exists`)):u();Re.unlink(n,(o=>o?u(o):Ve(e,t,n,r,u)))}(e,n,r,u,o):Ve(e,n,r,u,o)}(i,e,t,n,r,u):i.isSymbolicLink()?function(e,t,n,r,u){Re.readlink(t,((t,o)=>t?u(t):(r.dereference&&(o=Te.resolve(process.cwd(),o)),e?void Re.readlink(n,((e,t)=>e?"EINVAL"===e.code||"UNKNOWN"===e.code?Re.symlink(o,n,u):u(e):(r.dereference&&(t=Te.resolve(process.cwd(),t)),$e.isSrcSubdir(o,t)?u(new Error(`Cannot copy '${o}' to a subdirectory of itself, '${t}'.`)):$e.isSrcSubdir(t,o)?u(new Error(`Cannot overwrite '${t}' with '${o}'.`)):function(e,t,n){Re.unlink(t,(r=>r?n(r):Re.symlink(e,t,n)))}(o,n,u)))):Re.symlink(o,n,u))))}(e,t,n,r,u):i.isSocket()?u(new Error(`Cannot copy a socket file: ${t}`)):i.isFIFO()?u(new Error(`Cannot copy a FIFO pipe: ${t}`)):u(new Error(`Unknown file: ${t}`))))}function Ve(e,t,n,r,u){Re.copyFile(t,n,(o=>o?u(o):r.preserveTimestamps?function(e,t,n,r){if(function(e){return!(128&e)}(e))return function(e,t,n){return Je(e,128|t,n)}(n,e,(u=>u?r(u):Ue(e,t,n,r)));return Ue(e,t,n,r)}(e.mode,t,n,u):Je(n,e.mode,u)))}function Ue(e,t,n,r){!function(e,t,n){Re.stat(e,((e,r)=>e?n(e):je(t,r.atime,r.mtime,n)))}(t,n,(t=>t?r(t):Je(n,e,r)))}function Je(e,t,n){return Re.chmod(e,t,n)}function We(e,t,n,r){Re.readdir(e,((u,o)=>u?r(u):ze(o,e,t,n,r)))}function ze(e,t,n,r,u){const o=e.pop();return o?function(e,t,n,r,u,o){const i=Te.join(n,t),s=Te.join(r,t);He(i,s,u,((t,c)=>t?o(t):c?void $e.checkPaths(i,s,"copy",u,((t,c)=>{if(t)return o(t);const{destStat:a}=c;Ge(a,i,s,u,(t=>t?o(t):ze(e,n,r,u,o)))})):ze(e,n,r,u,o)))}(e,o,t,n,r,u):u()}var Ke=function(e,t,n,r){"function"!=typeof n||r?"function"==typeof n&&(n={filter:n}):(r=n,n={}),r=r||function(){},(n=n||{}).clobber=!("clobber"in n)||!!n.clobber,n.overwrite="overwrite"in n?!!n.overwrite:n.clobber,n.preserveTimestamps&&"ia32"===process.arch&&process.emitWarning("Using the preserveTimestamps option in 32-bit node is not recommended;\n\n\tsee https://github.com/jprichardson/node-fs-extra/issues/269","Warning","fs-extra-WARN0001"),$e.checkPaths(e,t,"copy",n,((u,o)=>{if(u)return r(u);const{srcStat:i,destStat:s}=o;$e.checkParentPaths(e,i,t,"copy",(u=>{if(u)return r(u);He(e,t,n,((u,o)=>u?r(u):o?void function(e,t,n,r,u){const o=Te.dirname(n);Le(o,((i,s)=>i?u(i):s?Ge(e,t,n,r,u):void Me(o,(o=>o?u(o):Ge(e,t,n,r,u)))))}(s,e,t,n,r):r()))}))}))};const qe=oe,Ye=e,Ze=Fe.mkdirsSync,Xe=Oe,Qe=Ne;function et(e,t,n,r){const u=(r.dereference?qe.statSync:qe.lstatSync)(t);if(u.isDirectory())return function(e,t,n,r,u){return t?rt(n,r,u):function(e,t,n,r){return qe.mkdirSync(n),rt(t,n,r),nt(n,e)}(e.mode,n,r,u)}(u,e,t,n,r);if(u.isFile()||u.isCharacterDevice()||u.isBlockDevice())return function(e,t,n,r,u){return t?function(e,t,n,r){if(r.overwrite)return qe.unlinkSync(n),tt(e,t,n,r);if(r.errorOnExist)throw new Error(`'${n}' already exists`)}(e,n,r,u):tt(e,n,r,u)}(u,e,t,n,r);if(u.isSymbolicLink())return function(e,t,n,r){let u=qe.readlinkSync(t);r.dereference&&(u=Ye.resolve(process.cwd(),u));if(e){let e;try{e=qe.readlinkSync(n)}catch(e){if("EINVAL"===e.code||"UNKNOWN"===e.code)return qe.symlinkSync(u,n);throw e}if(r.dereference&&(e=Ye.resolve(process.cwd(),e)),Qe.isSrcSubdir(u,e))throw new Error(`Cannot copy '${u}' to a subdirectory of itself, '${e}'.`);if(Qe.isSrcSubdir(e,u))throw new Error(`Cannot overwrite '${e}' with '${u}'.`);return function(e,t){return qe.unlinkSync(t),qe.symlinkSync(e,t)}(u,n)}return qe.symlinkSync(u,n)}(e,t,n,r);if(u.isSocket())throw new Error(`Cannot copy a socket file: ${t}`);if(u.isFIFO())throw new Error(`Cannot copy a FIFO pipe: ${t}`);throw new Error(`Unknown file: ${t}`)}function tt(e,t,n,r){return qe.copyFileSync(t,n),r.preserveTimestamps&&function(e,t,n){(function(e){return!(128&e)})(e)&&function(e,t){nt(e,128|t)}(n,e);(function(e,t){const n=qe.statSync(e);Xe(t,n.atime,n.mtime)})(t,n)}(e.mode,t,n),nt(n,e.mode)}function nt(e,t){return qe.chmodSync(e,t)}function rt(e,t,n){qe.readdirSync(e).forEach((r=>function(e,t,n,r){const u=Ye.join(t,e),o=Ye.join(n,e);if(r.filter&&!r.filter(u,o))return;const{destStat:i}=Qe.checkPathsSync(u,o,"copy",r);return et(i,u,o,r)}(r,e,t,n)))}var ut=function(e,t,n){"function"==typeof n&&(n={filter:n}),(n=n||{}).clobber=!("clobber"in n)||!!n.clobber,n.overwrite="overwrite"in n?!!n.overwrite:n.clobber,n.preserveTimestamps&&"ia32"===process.arch&&process.emitWarning("Using the preserveTimestamps option in 32-bit node is not recommended;\n\n\tsee https://github.com/jprichardson/node-fs-extra/issues/269","Warning","fs-extra-WARN0002");const{srcStat:r,destStat:u}=Qe.checkPathsSync(e,t,"copy",n);if(Qe.checkParentPathsSync(e,r,t,"copy"),n.filter&&!n.filter(e,t))return;const o=Ye.dirname(t);return qe.existsSync(o)||Ze(o),et(u,e,t,n)};var ot={copy:(0,M.fromCallback)(Ke),copySync:ut};const it=oe;var st={remove:(0,M.fromCallback)((function(e,t){it.rm(e,{recursive:!0,force:!0},t)})),removeSync:function(e){it.rmSync(e,{recursive:!0,force:!0})}};const ct=M.fromPromise,at=T,lt=e,ft=Fe,dt=st,Dt=ct((async function(e){let t;try{t=await at.readdir(e)}catch{return ft.mkdirs(e)}return Promise.all(t.map((t=>dt.remove(lt.join(e,t)))))}));function pt(e){let t;try{t=at.readdirSync(e)}catch{return ft.mkdirsSync(e)}t.forEach((t=>{t=lt.join(e,t),dt.removeSync(t)}))}var ht={emptyDirSync:pt,emptydirSync:pt,emptyDir:Dt,emptydir:Dt};const Et=M.fromCallback,mt=e,yt=oe,Ct=Fe;var Ft={createFile:Et((function(e,t){function n(){yt.writeFile(e,"",(e=>{if(e)return t(e);t()}))}yt.stat(e,((r,u)=>{if(!r&&u.isFile())return t();const o=mt.dirname(e);yt.stat(o,((e,r)=>{if(e)return"ENOENT"===e.code?Ct.mkdirs(o,(e=>{if(e)return t(e);n()})):t(e);r.isDirectory()?n():yt.readdir(o,(e=>{if(e)return t(e)}))}))}))})),createFileSync:function(e){let t;try{t=yt.statSync(e)}catch{}if(t&&t.isFile())return;const n=mt.dirname(e);try{yt.statSync(n).isDirectory()||yt.readdirSync(n)}catch(e){if(!e||"ENOENT"!==e.code)throw e;Ct.mkdirsSync(n)}yt.writeFileSync(e,"")}};const gt=M.fromCallback,At=e,vt=oe,St=Fe,wt=ve.pathExists,{areIdentical:Ot}=Ne;var _t={createLink:gt((function(e,t,n){function r(e,t){vt.link(e,t,(e=>{if(e)return n(e);n(null)}))}vt.lstat(t,((u,o)=>{vt.lstat(e,((u,i)=>{if(u)return u.message=u.message.replace("lstat","ensureLink"),n(u);if(o&&Ot(i,o))return n(null);const s=At.dirname(t);wt(s,((u,o)=>u?n(u):o?r(e,t):void St.mkdirs(s,(u=>{if(u)return n(u);r(e,t)}))))}))}))})),createLinkSync:function(e,t){let n;try{n=vt.lstatSync(t)}catch{}try{const t=vt.lstatSync(e);if(n&&Ot(t,n))return}catch(e){throw e.message=e.message.replace("lstat","ensureLink"),e}const r=At.dirname(t);return vt.existsSync(r)||St.mkdirsSync(r),vt.linkSync(e,t)}};const bt=e,Bt=oe,Pt=ve.pathExists;var It={symlinkPaths:function(e,t,n){if(bt.isAbsolute(e))return Bt.lstat(e,(t=>t?(t.message=t.message.replace("lstat","ensureSymlink"),n(t)):n(null,{toCwd:e,toDst:e})));{const r=bt.dirname(t),u=bt.join(r,e);return Pt(u,((t,o)=>t?n(t):o?n(null,{toCwd:u,toDst:e}):Bt.lstat(e,(t=>t?(t.message=t.message.replace("lstat","ensureSymlink"),n(t)):n(null,{toCwd:e,toDst:bt.relative(r,e)})))))}},symlinkPathsSync:function(e,t){let n;if(bt.isAbsolute(e)){if(n=Bt.existsSync(e),!n)throw new Error("absolute srcpath does not exist");return{toCwd:e,toDst:e}}{const r=bt.dirname(t),u=bt.join(r,e);if(n=Bt.existsSync(u),n)return{toCwd:u,toDst:e};if(n=Bt.existsSync(e),!n)throw new Error("relative srcpath does not exist");return{toCwd:e,toDst:bt.relative(r,e)}}}};const kt=oe;var xt={symlinkType:function(e,t,n){if(n="function"==typeof t?t:n,t="function"!=typeof t&&t)return n(null,t);kt.lstat(e,((e,r)=>{if(e)return n(null,"file");t=r&&r.isDirectory()?"dir":"file",n(null,t)}))},symlinkTypeSync:function(e,t){let n;if(t)return t;try{n=kt.lstatSync(e)}catch{return"file"}return n&&n.isDirectory()?"dir":"file"}};const Nt=M.fromCallback,Rt=e,Tt=T,Mt=Fe.mkdirs,Lt=Fe.mkdirsSync,jt=It.symlinkPaths,$t=It.symlinkPathsSync,Ht=xt.symlinkType,Gt=xt.symlinkTypeSync,Vt=ve.pathExists,{areIdentical:Ut}=Ne;function Jt(e,t,n,r){jt(e,t,((u,o)=>{if(u)return r(u);e=o.toDst,Ht(o.toCwd,n,((n,u)=>{if(n)return r(n);const o=Rt.dirname(t);Vt(o,((n,i)=>n?r(n):i?Tt.symlink(e,t,u,r):void Mt(o,(n=>{if(n)return r(n);Tt.symlink(e,t,u,r)}))))}))}))}var Wt={createSymlink:Nt((function(e,t,n,r){r="function"==typeof n?n:r,n="function"!=typeof n&&n,Tt.lstat(t,((u,o)=>{!u&&o.isSymbolicLink()?Promise.all([Tt.stat(e),Tt.stat(t)]).then((([u,o])=>{if(Ut(u,o))return r(null);Jt(e,t,n,r)})):Jt(e,t,n,r)}))})),createSymlinkSync:function(e,t,n){let r;try{r=Tt.lstatSync(t)}catch{}if(r&&r.isSymbolicLink()){const n=Tt.statSync(e),r=Tt.statSync(t);if(Ut(n,r))return}const u=$t(e,t);e=u.toDst,n=Gt(u.toCwd,n);const o=Rt.dirname(t);return Tt.existsSync(o)||Lt(o),Tt.symlinkSync(e,t,n)}};const{createFile:zt,createFileSync:Kt}=Ft,{createLink:qt,createLinkSync:Yt}=_t,{createSymlink:Zt,createSymlinkSync:Xt}=Wt;var Qt={createFile:zt,createFileSync:Kt,ensureFile:zt,ensureFileSync:Kt,createLink:qt,createLinkSync:Yt,ensureLink:qt,ensureLinkSync:Yt,createSymlink:Zt,createSymlinkSync:Xt,ensureSymlink:Zt,ensureSymlinkSync:Xt};var en={stringify:function(e,{EOL:t="\n",finalEOL:n=!0,replacer:r=null,spaces:u}={}){const o=n?t:"";return JSON.stringify(e,r,u).replace(/\n/g,t)+o},stripBom:function(e){return Buffer.isBuffer(e)&&(e=e.toString("utf8")),e.replace(/^\uFEFF/,"")}};let tn;try{tn=oe}catch(e){tn=n}const nn=M,{stringify:rn,stripBom:un}=en;const on=nn.fromPromise((async function(e,t={}){"string"==typeof t&&(t={encoding:t});const n=t.fs||tn,r=!("throws"in t)||t.throws;let u,o=await nn.fromCallback(n.readFile)(e,t);o=un(o);try{u=JSON.parse(o,t?t.reviver:null)}catch(t){if(r)throw t.message=`${e}: ${t.message}`,t;return null}return u}));const sn=nn.fromPromise((async function(e,t,n={}){const r=n.fs||tn,u=rn(t,n);await nn.fromCallback(r.writeFile)(e,u,n)}));const cn={readFile:on,readFileSync:function(e,t={}){"string"==typeof t&&(t={encoding:t});const n=t.fs||tn,r=!("throws"in t)||t.throws;try{let r=n.readFileSync(e,t);return r=un(r),JSON.parse(r,t.reviver)}catch(t){if(r)throw t.message=`${e}: ${t.message}`,t;return null}},writeFile:sn,writeFileSync:function(e,t,n={}){const r=n.fs||tn,u=rn(t,n);return r.writeFileSync(e,u,n)}};var an={readJson:cn.readFile,readJsonSync:cn.readFileSync,writeJson:cn.writeFile,writeJsonSync:cn.writeFileSync};const ln=M.fromCallback,fn=oe,dn=e,Dn=Fe,pn=ve.pathExists;var hn={outputFile:ln((function(e,t,n,r){"function"==typeof n&&(r=n,n="utf8");const u=dn.dirname(e);pn(u,((o,i)=>o?r(o):i?fn.writeFile(e,t,n,r):void Dn.mkdirs(u,(u=>{if(u)return r(u);fn.writeFile(e,t,n,r)}))))})),outputFileSync:function(e,...t){const n=dn.dirname(e);if(fn.existsSync(n))return fn.writeFileSync(e,...t);Dn.mkdirsSync(n),fn.writeFileSync(e,...t)}};const{stringify:En}=en,{outputFile:mn}=hn;var yn=async function(e,t,n={}){const r=En(t,n);await mn(e,r,n)};const{stringify:Cn}=en,{outputFileSync:Fn}=hn;var gn=function(e,t,n){const r=Cn(t,n);Fn(e,r,n)};const An=M.fromPromise,vn=an;vn.outputJson=An(yn),vn.outputJsonSync=gn,vn.outputJSON=vn.outputJson,vn.outputJSONSync=vn.outputJsonSync,vn.writeJSON=vn.writeJson,vn.writeJSONSync=vn.writeJsonSync,vn.readJSON=vn.readJson,vn.readJSONSync=vn.readJsonSync;var Sn=vn;const wn=oe,On=e,_n=ot.copy,bn=st.remove,Bn=Fe.mkdirp,Pn=ve.pathExists,In=Ne;function kn(e,t,n,r,u){return r?xn(e,t,n,u):n?bn(t,(r=>r?u(r):xn(e,t,n,u))):void Pn(t,((r,o)=>r?u(r):o?u(new Error("dest already exists.")):xn(e,t,n,u)))}function xn(e,t,n,r){wn.rename(e,t,(u=>u?"EXDEV"!==u.code?r(u):function(e,t,n,r){const u={overwrite:n,errorOnExist:!0};_n(e,t,u,(t=>t?r(t):bn(e,r)))}(e,t,n,r):r()))}var Nn=function(e,t,n,r){"function"==typeof n&&(r=n,n={});const u=(n=n||{}).overwrite||n.clobber||!1;In.checkPaths(e,t,"move",n,((n,o)=>{if(n)return r(n);const{srcStat:i,isChangingCase:s=!1}=o;In.checkParentPaths(e,i,t,"move",(n=>n?r(n):function(e){const t=On.dirname(e);return On.parse(t).root===t}(t)?kn(e,t,u,s,r):void Bn(On.dirname(t),(n=>n?r(n):kn(e,t,u,s,r)))))}))};const Rn=oe,Tn=e,Mn=ot.copySync,Ln=st.removeSync,jn=Fe.mkdirpSync,$n=Ne;function Hn(e,t,n){try{Rn.renameSync(e,t)}catch(r){if("EXDEV"!==r.code)throw r;return function(e,t,n){const r={overwrite:n,errorOnExist:!0};return Mn(e,t,r),Ln(e)}(e,t,n)}}var Gn=function(e,t,n){const r=(n=n||{}).overwrite||n.clobber||!1,{srcStat:u,isChangingCase:o=!1}=$n.checkPathsSync(e,t,"move",n);return $n.checkParentPathsSync(e,u,t,"move"),function(e){const t=Tn.dirname(e);return Tn.parse(t).root===t}(t)||jn(Tn.dirname(t)),function(e,t,n,r){if(r)return Hn(e,t,n);if(n)return Ln(t),Hn(e,t,n);if(Rn.existsSync(t))throw new Error("dest already exists.");return Hn(e,t,n)}(e,t,r,o)};var Vn,Un,Jn,Wn,zn,Kn={move:(0,M.fromCallback)(Nn),moveSync:Gn},qn={...T,...ot,...ht,...Qt,...Sn,...Fe,...Kn,...hn,...ve,...st},Yn={},Zn={exports:{}},Xn={exports:{}};function Qn(){if(Un)return Vn;Un=1;var e=1e3,t=60*e,n=60*t,r=24*n,u=7*r,o=365.25*r;function i(e,t,n,r){var u=t>=1.5*n;return Math.round(e/n)+" "+r+(u?"s":"")}return Vn=function(s,c){c=c||{};var a=typeof s;if("string"===a&&s.length>0)return function(i){if((i=String(i)).length>100)return;var s=/^(-?(?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|weeks?|w|years?|yrs?|y)?$/i.exec(i);if(!s)return;var c=parseFloat(s[1]);switch((s[2]||"ms").toLowerCase()){case"years":case"year":case"yrs":case"yr":case"y":return c*o;case"weeks":case"week":case"w":return c*u;case"days":case"day":case"d":return c*r;case"hours":case"hour":case"hrs":case"hr":case"h":return c*n;case"minutes":case"minute":case"mins":case"min":case"m":return c*t;case"seconds":case"second":case"secs":case"sec":case"s":return c*e;case"milliseconds":case"millisecond":case"msecs":case"msec":case"ms":return c;default:return}}(s);if("number"===a&&isFinite(s))return c.long?function(u){var o=Math.abs(u);if(o>=r)return i(u,o,r,"day");if(o>=n)return i(u,o,n,"hour");if(o>=t)return i(u,o,t,"minute");if(o>=e)return i(u,o,e,"second");return u+" ms"}(s):function(u){var o=Math.abs(u);if(o>=r)return Math.round(u/r)+"d";if(o>=n)return Math.round(u/n)+"h";if(o>=t)return Math.round(u/t)+"m";if(o>=e)return Math.round(u/e)+"s";return u+"ms"}(s);throw new Error("val is not a non-empty string or a valid number. val="+JSON.stringify(s))}}function er(){if(Wn)return Jn;return Wn=1,Jn=function(e){function t(e){let r,u,o,i=null;function s(...e){if(!s.enabled)return;const n=s,u=Number(new Date),o=u-(r||u);n.diff=o,n.prev=r,n.curr=u,r=u,e[0]=t.coerce(e[0]),"string"!=typeof e[0]&&e.unshift("%O");let i=0;e[0]=e[0].replace(/%([a-zA-Z%])/g,((r,u)=>{if("%%"===r)return"%";i++;const o=t.formatters[u];if("function"==typeof o){const t=e[i];r=o.call(n,t),e.splice(i,1),i--}return r})),t.formatArgs.call(n,e);(n.log||t.log).apply(n,e)}return s.namespace=e,s.useColors=t.useColors(),s.color=t.selectColor(e),s.extend=n,s.destroy=t.destroy,Object.defineProperty(s,"enabled",{enumerable:!0,configurable:!1,get:()=>null!==i?i:(u!==t.namespaces&&(u=t.namespaces,o=t.enabled(e)),o),set:e=>{i=e}}),"function"==typeof t.init&&t.init(s),s}function n(e,n){const r=t(this.namespace+(void 0===n?":":n)+e);return r.log=this.log,r}function r(e){return e.toString().substring(2,e.toString().length-2).replace(/\.\*\?$/,"*")}return t.debug=t,t.default=t,t.coerce=function(e){if(e instanceof Error)return e.stack||e.message;return e},t.disable=function(){const e=[...t.names.map(r),...t.skips.map(r).map((e=>"-"+e))].join(",");return t.enable(""),e},t.enable=function(e){let n;t.save(e),t.namespaces=e,t.names=[],t.skips=[];const r=("string"==typeof e?e:"").split(/[\s,]+/),u=r.length;for(n=0;n<u;n++)r[n]&&("-"===(e=r[n].replace(/\*/g,".*?"))[0]?t.skips.push(new RegExp("^"+e.slice(1)+"$")):t.names.push(new RegExp("^"+e+"$")))},t.enabled=function(e){if("*"===e[e.length-1])return!0;let n,r;for(n=0,r=t.skips.length;n<r;n++)if(t.skips[n].test(e))return!1;for(n=0,r=t.names.length;n<r;n++)if(t.names[n].test(e))return!0;return!1},t.humanize=Qn(),t.destroy=function(){console.warn("Instance method `debug.destroy()` is deprecated and no longer does anything. It will be removed in the next major version of `debug`.")},Object.keys(e).forEach((n=>{t[n]=e[n]})),t.names=[],t.skips=[],t.formatters={},t.selectColor=function(e){let n=0;for(let t=0;t<e.length;t++)n=(n<<5)-n+e.charCodeAt(t),n|=0;return t.colors[Math.abs(n)%t.colors.length]},t.enable(t.load()),t},Jn}var tr,nr,rr,ur,or,ir,sr={exports:{}};function cr(){return nr||(nr=1,tr=(e,t)=>{t=t||process.argv;const n=e.startsWith("-")?"":1===e.length?"-":"--",r=t.indexOf(n+e),u=t.indexOf("--");return-1!==r&&(-1===u||r<u)}),tr}function ar(){if(ur)return rr;ur=1;const e=t,n=cr(),r=process.env;let u;function o(t){const o=function(t){if(!1===u)return 0;if(n("color=16m")||n("color=full")||n("color=truecolor"))return 3;if(n("color=256"))return 2;if(t&&!t.isTTY&&!0!==u)return 0;const o=u?1:0;if("win32"===process.platform){const t=e.release().split(".");return Number(process.versions.node.split(".")[0])>=8&&Number(t[0])>=10&&Number(t[2])>=10586?Number(t[2])>=14931?3:2:1}if("CI"in r)return["TRAVIS","CIRCLECI","APPVEYOR","GITLAB_CI"].some((e=>e in r))||"codeship"===r.CI_NAME?1:o;if("TEAMCITY_VERSION"in r)return/^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(r.TEAMCITY_VERSION)?1:0;if("truecolor"===r.COLORTERM)return 3;if("TERM_PROGRAM"in r){const e=parseInt((r.TERM_PROGRAM_VERSION||"").split(".")[0],10);switch(r.TERM_PROGRAM){case"iTerm.app":return e>=3?3:2;case"Apple_Terminal":return 2}}return/-256(color)?$/i.test(r.TERM)?2:/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(r.TERM)||"COLORTERM"in r?1:(r.TERM,o)}(t);return function(e){return 0!==e&&{level:e,hasBasic:!0,has256:e>=2,has16m:e>=3}}(o)}return n("no-color")||n("no-colors")||n("color=false")?u=!1:(n("color")||n("colors")||n("color=true")||n("color=always"))&&(u=!0),"FORCE_COLOR"in r&&(u=0===r.FORCE_COLOR.length||0!==parseInt(r.FORCE_COLOR,10)),rr={supportsColor:o,stdout:o(process.stdout),stderr:o(process.stderr)}}function lr(){return or||(or=1,function(e,t){const n=a,r=i;t.init=function(e){e.inspectOpts={};const n=Object.keys(t.inspectOpts);for(let r=0;r<n.length;r++)e.inspectOpts[n[r]]=t.inspectOpts[n[r]]},t.log=function(...e){return process.stderr.write(r.format(...e)+"\n")},t.formatArgs=function(n){const{namespace:r,useColors:u}=this;if(u){const t=this.color,u="[3"+(t<8?t:"8;5;"+t),o=`  ${u};1m${r} `;n[0]=o+n[0].split("\n").join("\n"+o),n.push(u+"m+"+e.exports.humanize(this.diff)+"")}else n[0]=function(){if(t.inspectOpts.hideDate)return"";return(new Date).toISOString()+" "}()+r+" "+n[0]},t.save=function(e){e?process.env.DEBUG=e:delete process.env.DEBUG},t.load=function(){return process.env.DEBUG},t.useColors=function(){return"colors"in t.inspectOpts?Boolean(t.inspectOpts.colors):n.isatty(process.stderr.fd)},t.destroy=r.deprecate((()=>{}),"Instance method `debug.destroy()` is deprecated and no longer does anything. It will be removed in the next major version of `debug`."),t.colors=[6,2,3,4,5,1];try{const e=ar();e&&(e.stderr||e).level>=2&&(t.colors=[20,21,26,27,32,33,38,39,40,41,42,43,44,45,56,57,62,63,68,69,74,75,76,77,78,79,80,81,92,93,98,99,112,113,128,129,134,135,148,149,160,161,162,163,164,165,166,167,168,169,170,171,172,173,178,179,184,185,196,197,198,199,200,201,202,203,204,205,206,207,208,209,214,215,220,221])}catch(e){}t.inspectOpts=Object.keys(process.env).filter((e=>/^debug_/i.test(e))).reduce(((e,t)=>{const n=t.substring(6).toLowerCase().replace(/_([a-z])/g,((e,t)=>t.toUpperCase()));let r=process.env[t];return r=!!/^(yes|on|true|enabled)$/i.test(r)||!/^(no|off|false|disabled)$/i.test(r)&&("null"===r?null:Number(r)),e[n]=r,e}),{}),e.exports=er()(t);const{formatters:u}=e.exports;u.o=function(e){return this.inspectOpts.colors=this.useColors,r.inspect(e,this.inspectOpts).split("\n").map((e=>e.trim())).join(" ")},u.O=function(e){return this.inspectOpts.colors=this.useColors,r.inspect(e,this.inspectOpts)}}(sr,sr.exports)),sr.exports}ir=Zn,"undefined"==typeof process||"renderer"===process.type||!0===process.browser||process.__nwjs?ir.exports=(zn||(zn=1,function(e,t){t.formatArgs=function(t){if(t[0]=(this.useColors?"%c":"")+this.namespace+(this.useColors?" %c":" ")+t[0]+(this.useColors?"%c ":" ")+"+"+e.exports.humanize(this.diff),!this.useColors)return;const n="color: "+this.color;t.splice(1,0,n,"color: inherit");let r=0,u=0;t[0].replace(/%[a-zA-Z%]/g,(e=>{"%%"!==e&&(r++,"%c"===e&&(u=r))})),t.splice(u,0,n)},t.save=function(e){try{e?t.storage.setItem("debug",e):t.storage.removeItem("debug")}catch(e){}},t.load=function(){let e;try{e=t.storage.getItem("debug")}catch(e){}return!e&&"undefined"!=typeof process&&"env"in process&&(e=process.env.DEBUG),e},t.useColors=function(){return!("undefined"==typeof window||!window.process||"renderer"!==window.process.type&&!window.process.__nwjs)||("undefined"==typeof navigator||!navigator.userAgent||!navigator.userAgent.toLowerCase().match(/(edge|trident)\/(\d+)/))&&("undefined"!=typeof document&&document.documentElement&&document.documentElement.style&&document.documentElement.style.WebkitAppearance||"undefined"!=typeof window&&window.console&&(window.console.firebug||window.console.exception&&window.console.table)||"undefined"!=typeof navigator&&navigator.userAgent&&navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/)&&parseInt(RegExp.$1,10)>=31||"undefined"!=typeof navigator&&navigator.userAgent&&navigator.userAgent.toLowerCase().match(/applewebkit\/(\d+)/))},t.storage=function(){try{return localStorage}catch(e){}}(),t.destroy=(()=>{let e=!1;return()=>{e||(e=!0,console.warn("Instance method `debug.destroy()` is deprecated and no longer does anything. It will be removed in the next major version of `debug`."))}})(),t.colors=["#0000CC","#0000FF","#0033CC","#0033FF","#0066CC","#0066FF","#0099CC","#0099FF","#00CC00","#00CC33","#00CC66","#00CC99","#00CCCC","#00CCFF","#3300CC","#3300FF","#3333CC","#3333FF","#3366CC","#3366FF","#3399CC","#3399FF","#33CC00","#33CC33","#33CC66","#33CC99","#33CCCC","#33CCFF","#6600CC","#6600FF","#6633CC","#6633FF","#66CC00","#66CC33","#9900CC","#9900FF","#9933CC","#9933FF","#99CC00","#99CC33","#CC0000","#CC0033","#CC0066","#CC0099","#CC00CC","#CC00FF","#CC3300","#CC3333","#CC3366","#CC3399","#CC33CC","#CC33FF","#CC6600","#CC6633","#CC9900","#CC9933","#CCCC00","#CCCC33","#FF0000","#FF0033","#FF0066","#FF0099","#FF00CC","#FF00FF","#FF3300","#FF3333","#FF3366","#FF3399","#FF33CC","#FF33FF","#FF6600","#FF6633","#FF9900","#FF9933","#FFCC00","#FFCC33"],t.log=console.debug||console.log||(()=>{}),e.exports=er()(t);const{formatters:n}=e.exports;n.j=function(e){try{return JSON.stringify(e)}catch(e){return"[UnexpectedJSONParseError]: "+e.message}}}(Xn,Xn.exports)),Xn.exports):ir.exports=lr();var fr=function(e){return(e=e||{}).circles?function(e){var t=[],n=[];return e.proto?function e(u){if("object"!=typeof u||null===u)return u;if(u instanceof Date)return new Date(u);if(Array.isArray(u))return r(u,e);if(u instanceof Map)return new Map(r(Array.from(u),e));if(u instanceof Set)return new Set(r(Array.from(u),e));var o={};for(var i in t.push(u),n.push(o),u){var s=u[i];if("object"!=typeof s||null===s)o[i]=s;else if(s instanceof Date)o[i]=new Date(s);else if(s instanceof Map)o[i]=new Map(r(Array.from(s),e));else if(s instanceof Set)o[i]=new Set(r(Array.from(s),e));else if(ArrayBuffer.isView(s))o[i]=dr(s);else{var c=t.indexOf(s);o[i]=-1!==c?n[c]:e(s)}}return t.pop(),n.pop(),o}:function e(u){if("object"!=typeof u||null===u)return u;if(u instanceof Date)return new Date(u);if(Array.isArray(u))return r(u,e);if(u instanceof Map)return new Map(r(Array.from(u),e));if(u instanceof Set)return new Set(r(Array.from(u),e));var o={};for(var i in t.push(u),n.push(o),u)if(!1!==Object.hasOwnProperty.call(u,i)){var s=u[i];if("object"!=typeof s||null===s)o[i]=s;else if(s instanceof Date)o[i]=new Date(s);else if(s instanceof Map)o[i]=new Map(r(Array.from(s),e));else if(s instanceof Set)o[i]=new Set(r(Array.from(s),e));else if(ArrayBuffer.isView(s))o[i]=dr(s);else{var c=t.indexOf(s);o[i]=-1!==c?n[c]:e(s)}}return t.pop(),n.pop(),o};function r(e,r){for(var u=Object.keys(e),o=new Array(u.length),i=0;i<u.length;i++){var s=u[i],c=e[s];if("object"!=typeof c||null===c)o[s]=c;else if(c instanceof Date)o[s]=new Date(c);else if(ArrayBuffer.isView(c))o[s]=dr(c);else{var a=t.indexOf(c);o[s]=-1!==a?n[a]:r(c)}}return o}}(e):e.proto?function e(n){if("object"!=typeof n||null===n)return n;if(n instanceof Date)return new Date(n);if(Array.isArray(n))return t(n,e);if(n instanceof Map)return new Map(t(Array.from(n),e));if(n instanceof Set)return new Set(t(Array.from(n),e));var r={};for(var u in n){var o=n[u];"object"!=typeof o||null===o?r[u]=o:o instanceof Date?r[u]=new Date(o):o instanceof Map?r[u]=new Map(t(Array.from(o),e)):o instanceof Set?r[u]=new Set(t(Array.from(o),e)):ArrayBuffer.isView(o)?r[u]=dr(o):r[u]=e(o)}return r}:n;function t(e,t){for(var n=Object.keys(e),r=new Array(n.length),u=0;u<n.length;u++){var o=n[u],i=e[o];"object"!=typeof i||null===i?r[o]=i:i instanceof Date?r[o]=new Date(i):ArrayBuffer.isView(i)?r[o]=dr(i):r[o]=t(i)}return r}function n(e){if("object"!=typeof e||null===e)return e;if(e instanceof Date)return new Date(e);if(Array.isArray(e))return t(e,n);if(e instanceof Map)return new Map(t(Array.from(e),n));if(e instanceof Set)return new Set(t(Array.from(e),n));var r={};for(var u in e)if(!1!==Object.hasOwnProperty.call(e,u)){var o=e[u];"object"!=typeof o||null===o?r[u]=o:o instanceof Date?r[u]=new Date(o):o instanceof Map?r[u]=new Map(t(Array.from(o),n)):o instanceof Set?r[u]=new Set(t(Array.from(o),n)):ArrayBuffer.isView(o)?r[u]=dr(o):r[u]=n(o)}return r}};function dr(e){return e instanceof Buffer?Buffer.from(e):new e.constructor(e.buffer.slice(),e.byteOffset,e.length)}const Dr=i,pr=Zn.exports("log4js:configuration"),hr=[],Er=[],mr=e=>!e,yr=e=>e&&"object"==typeof e&&!Array.isArray(e),Cr=(e,t,n)=>{(Array.isArray(t)?t:[t]).forEach((t=>{if(t)throw new Error(`Problem with log4js configuration: (${Dr.inspect(e,{depth:5})}) - ${n}`)}))};var Fr={configure:e=>{pr("New configuration to be validated: ",e),Cr(e,mr(yr(e)),"must be an object."),pr(`Calling pre-processing listeners (${hr.length})`),hr.forEach((t=>t(e))),pr("Configuration pre-processing finished."),pr(`Calling configuration listeners (${Er.length})`),Er.forEach((t=>t(e))),pr("Configuration finished.")},addListener:e=>{Er.push(e),pr(`Added listener, now ${Er.length} listeners`)},addPreProcessingListener:e=>{hr.push(e),pr(`Added pre-processing listener, now ${hr.length} listeners`)},throwExceptionIf:Cr,anObject:yr,anInteger:e=>e&&"number"==typeof e&&Number.isInteger(e),validIdentifier:e=>/^[A-Za-z][A-Za-z0-9_]*$/g.test(e),not:mr},gr={exports:{}};!function(e){function t(e,t){for(var n=e.toString();n.length<t;)n="0"+n;return n}function n(e){return t(e,2)}function r(r,u){"string"!=typeof r&&(u=r,r=e.exports.ISO8601_FORMAT),u||(u=e.exports.now());var o=n(u.getDate()),i=n(u.getMonth()+1),s=n(u.getFullYear()),c=n(s.substring(2,4)),a=r.indexOf("yyyy")>-1?s:c,l=n(u.getHours()),f=n(u.getMinutes()),d=n(u.getSeconds()),D=t(u.getMilliseconds(),3),p=function(e){var t=Math.abs(e),n=String(Math.floor(t/60)),r=String(t%60);return n=("0"+n).slice(-2),r=("0"+r).slice(-2),0===e?"Z":(e<0?"+":"-")+n+":"+r}(u.getTimezoneOffset());return r.replace(/dd/g,o).replace(/MM/g,i).replace(/y{1,4}/g,a).replace(/hh/g,l).replace(/mm/g,f).replace(/ss/g,d).replace(/SSS/g,D).replace(/O/g,p)}function u(e,t,n,r){e["set"+(r?"":"UTC")+t](n)}e.exports=r,e.exports.asString=r,e.exports.parse=function(t,n,r){if(!t)throw new Error("pattern must be supplied");return function(t,n,r){var o=t.indexOf("O")<0,i=!1,s=[{pattern:/y{1,4}/,regexp:"\\d{1,4}",fn:function(e,t){u(e,"FullYear",t,o)}},{pattern:/MM/,regexp:"\\d{1,2}",fn:function(e,t){u(e,"Month",t-1,o),e.getMonth()!==t-1&&(i=!0)}},{pattern:/dd/,regexp:"\\d{1,2}",fn:function(e,t){i&&u(e,"Month",e.getMonth()-1,o),u(e,"Date",t,o)}},{pattern:/hh/,regexp:"\\d{1,2}",fn:function(e,t){u(e,"Hours",t,o)}},{pattern:/mm/,regexp:"\\d\\d",fn:function(e,t){u(e,"Minutes",t,o)}},{pattern:/ss/,regexp:"\\d\\d",fn:function(e,t){u(e,"Seconds",t,o)}},{pattern:/SSS/,regexp:"\\d\\d\\d",fn:function(e,t){u(e,"Milliseconds",t,o)}},{pattern:/O/,regexp:"[+-]\\d{1,2}:?\\d{2}?|Z",fn:function(e,t){t="Z"===t?0:t.replace(":","");var n=Math.abs(t),r=(t>0?-1:1)*(n%100+60*Math.floor(n/100));e.setUTCMinutes(e.getUTCMinutes()+r)}}],c=s.reduce((function(e,t){return t.pattern.test(e.regexp)?(t.index=e.regexp.match(t.pattern).index,e.regexp=e.regexp.replace(t.pattern,"("+t.regexp+")")):t.index=-1,e}),{regexp:t,index:[]}),a=s.filter((function(e){return e.index>-1}));a.sort((function(e,t){return e.index-t.index}));var l=new RegExp(c.regexp).exec(n);if(l){var f=r||e.exports.now();return a.forEach((function(e,t){e.fn(f,l[t+1])})),f}throw new Error("String '"+n+"' could not be parsed as '"+t+"'")}(t,n,r)},e.exports.now=function(){return new Date},e.exports.ISO8601_FORMAT="yyyy-MM-ddThh:mm:ss.SSS",e.exports.ISO8601_WITH_TZ_OFFSET_FORMAT="yyyy-MM-ddThh:mm:ss.SSSO",e.exports.DATETIME_FORMAT="dd MM yyyy hh:mm:ss.SSS",e.exports.ABSOLUTETIME_FORMAT="hh:mm:ss.SSS"}(gr);const Ar=gr.exports,vr=t,Sr=i,wr=e,Or=l,_r=Zn.exports("log4js:layouts"),br={bold:[1,22],italic:[3,23],underline:[4,24],inverse:[7,27],white:[37,39],grey:[90,39],black:[90,39],blue:[34,39],cyan:[36,39],green:[32,39],magenta:[35,39],red:[91,39],yellow:[33,39]};function Br(e){return e?`[${br[e][0]}m`:""}function Pr(e){return e?`[${br[e][1]}m`:""}function Ir(e,t){return n=Sr.format("[%s] [%s] %s - ",Ar.asString(e.startTime),e.level.toString(),e.categoryName),Br(r=t)+n+Pr(r);var n,r}function kr(e){return Ir(e)+Sr.format(...e.data)}function xr(e){return Ir(e,e.level.colour)+Sr.format(...e.data)}function Nr(e){return Sr.format(...e.data)}function Rr(e){return e.data[0]}function Tr(e,t){const n=/%(-?[0-9]+)?(\.?-?[0-9]+)?([[\]cdhmnprzxXyflosCMAF%])(\{([^}]+)\})?|([^%]+)/;function r(e){return e&&e.pid?e.pid.toString():process.pid.toString()}e=e||"%r %p %c - %m%n";const u={c:function(e,t){let n=e.categoryName;if(t){const e=parseInt(t,10),r=n.split(".");e<r.length&&(n=r.slice(r.length-e).join("."))}return n},d:function(e,t){let n=Ar.ISO8601_FORMAT;if(t)switch(n=t,n){case"ISO8601":case"ISO8601_FORMAT":n=Ar.ISO8601_FORMAT;break;case"ISO8601_WITH_TZ_OFFSET":case"ISO8601_WITH_TZ_OFFSET_FORMAT":n=Ar.ISO8601_WITH_TZ_OFFSET_FORMAT;break;case"ABSOLUTE":process.emitWarning("Pattern %d{ABSOLUTE} is deprecated in favor of %d{ABSOLUTETIME}. Please use %d{ABSOLUTETIME} instead.","DeprecationWarning","log4js-node-DEP0003"),_r("[log4js-node-DEP0003]","DEPRECATION: Pattern %d{ABSOLUTE} is deprecated and replaced by %d{ABSOLUTETIME}.");case"ABSOLUTETIME":case"ABSOLUTETIME_FORMAT":n=Ar.ABSOLUTETIME_FORMAT;break;case"DATE":process.emitWarning("Pattern %d{DATE} is deprecated due to the confusion it causes when used. Please use %d{DATETIME} instead.","DeprecationWarning","log4js-node-DEP0004"),_r("[log4js-node-DEP0004]","DEPRECATION: Pattern %d{DATE} is deprecated and replaced by %d{DATETIME}.");case"DATETIME":case"DATETIME_FORMAT":n=Ar.DATETIME_FORMAT}return Ar.asString(n,e.startTime)},h:function(){return vr.hostname().toString()},m:function(e){return Sr.format(...e.data)},n:function(){return vr.EOL},p:function(e){return e.level.toString()},r:function(e){return Ar.asString("hh:mm:ss",e.startTime)},"[":function(e){return Br(e.level.colour)},"]":function(e){return Pr(e.level.colour)},y:function(){return r()},z:r,"%":function(){return"%"},x:function(e,n){return void 0!==t[n]?"function"==typeof t[n]?t[n](e):t[n]:null},X:function(e,t){const n=e.context[t];return void 0!==n?"function"==typeof n?n(e):n:null},f:function(e,t){let n=e.fileName||"";if(n=function(e){const t="file://";return e.startsWith(t)&&("function"==typeof Or.fileURLToPath?e=Or.fileURLToPath(e):(e=wr.normalize(e.replace(new RegExp(`^${t}`),"")),"win32"===process.platform&&(e=e.startsWith("\\")?e.slice(1):wr.sep+wr.sep+e))),e}(n),t){const e=parseInt(t,10),r=n.split(wr.sep);r.length>e&&(n=r.slice(-e).join(wr.sep))}return n},l:function(e){return e.lineNumber?`${e.lineNumber}`:""},o:function(e){return e.columnNumber?`${e.columnNumber}`:""},s:function(e){return e.callStack||""},C:function(e){return e.className||""},M:function(e){return e.functionName||""},A:function(e){return e.functionAlias||""},F:function(e){return e.callerName||""}};function o(e,t,n){return u[e](t,n)}function i(e,t,n){let r=e;return r=function(e,t){let n;return e?(n=parseInt(e.slice(1),10),n>0?t.slice(0,n):t.slice(n)):t}(t,r),r=function(e,t){let n;if(e)if("-"===e.charAt(0))for(n=parseInt(e.slice(1),10);t.length<n;)t+=" ";else for(n=parseInt(e,10);t.length<n;)t=` ${t}`;return t}(n,r),r}return function(t){let r,u="",s=e;for(;null!==(r=n.exec(s));){const e=r[1],n=r[2],c=r[3],a=r[5],l=r[6];if(l)u+=l.toString();else{u+=i(o(c,t,a),n,e)}s=s.slice(r.index+r[0].length)}return u}}const Mr={messagePassThrough:()=>Nr,basic:()=>kr,colored:()=>xr,coloured:()=>xr,pattern:e=>Tr(e&&e.pattern,e&&e.tokens),dummy:()=>Rr};var Lr={basicLayout:kr,messagePassThroughLayout:Nr,patternLayout:Tr,colouredLayout:xr,coloredLayout:xr,dummyLayout:Rr,addLayout(e,t){Mr[e]=t},layout:(e,t)=>Mr[e]&&Mr[e](t)};const jr=Fr,$r=["white","grey","black","blue","cyan","green","magenta","red","yellow"];class Hr{constructor(e,t,n){this.level=e,this.levelStr=t,this.colour=n}toString(){return this.levelStr}static getLevel(e,t){return e?e instanceof Hr?e:(e instanceof Object&&e.levelStr&&(e=e.levelStr),Hr[e.toString().toUpperCase()]||t):t}static addLevels(e){if(e){Object.keys(e).forEach((t=>{const n=t.toUpperCase();Hr[n]=new Hr(e[t].value,n,e[t].colour);const r=Hr.levels.findIndex((e=>e.levelStr===n));r>-1?Hr.levels[r]=Hr[n]:Hr.levels.push(Hr[n])})),Hr.levels.sort(((e,t)=>e.level-t.level))}}isLessThanOrEqualTo(e){return"string"==typeof e&&(e=Hr.getLevel(e)),this.level<=e.level}isGreaterThanOrEqualTo(e){return"string"==typeof e&&(e=Hr.getLevel(e)),this.level>=e.level}isEqualTo(e){return"string"==typeof e&&(e=Hr.getLevel(e)),this.level===e.level}}Hr.levels=[],Hr.addLevels({ALL:{value:Number.MIN_VALUE,colour:"grey"},TRACE:{value:5e3,colour:"blue"},DEBUG:{value:1e4,colour:"cyan"},INFO:{value:2e4,colour:"green"},WARN:{value:3e4,colour:"yellow"},ERROR:{value:4e4,colour:"red"},FATAL:{value:5e4,colour:"magenta"},MARK:{value:9007199254740992,colour:"grey"},OFF:{value:Number.MAX_VALUE,colour:"grey"}}),jr.addListener((e=>{const t=e.levels;if(t){jr.throwExceptionIf(e,jr.not(jr.anObject(t)),"levels must be an object");Object.keys(t).forEach((n=>{jr.throwExceptionIf(e,jr.not(jr.validIdentifier(n)),`level name "${n}" is not a valid identifier (must start with a letter, only contain A-Z,a-z,0-9,_)`),jr.throwExceptionIf(e,jr.not(jr.anObject(t[n])),`level "${n}" must be an object`),jr.throwExceptionIf(e,jr.not(t[n].value),`level "${n}" must have a 'value' property`),jr.throwExceptionIf(e,jr.not(jr.anInteger(t[n].value)),`level "${n}".value must have an integer value`),jr.throwExceptionIf(e,jr.not(t[n].colour),`level "${n}" must have a 'colour' property`),jr.throwExceptionIf(e,jr.not($r.indexOf(t[n].colour)>-1),`level "${n}".colour must be one of ${$r.join(", ")}`)}))}})),jr.addListener((e=>{Hr.addLevels(e.levels)}));var Gr=Hr,Vr={exports:{}},Ur={};const{parse:Jr,stringify:Wr}=JSON,{keys:zr}=Object,Kr=String,qr="string",Yr={},Zr="object",Xr=(e,t)=>t,Qr=e=>e instanceof Kr?Kr(e):e,eu=(e,t)=>typeof t===qr?new Kr(t):t,tu=(e,t,n,r)=>{const u=[];for(let o=zr(n),{length:i}=o,s=0;s<i;s++){const i=o[s],c=n[i];if(c instanceof Kr){const o=e[c];typeof o!==Zr||t.has(o)?n[i]=r.call(n,i,o):(t.add(o),n[i]=Yr,u.push({k:i,a:[e,t,o,r]}))}else n[i]!==Yr&&(n[i]=r.call(n,i,c))}for(let{length:e}=u,t=0;t<e;t++){const{k:e,a:o}=u[t];n[e]=r.call(n,e,tu.apply(null,o))}return n},nu=(e,t,n)=>{const r=Kr(t.push(n)-1);return e.set(n,r),r},ru=(e,t)=>{const n=Jr(e,eu).map(Qr),r=n[0],u=t||Xr,o=typeof r===Zr&&r?tu(n,new Set,r,u):r;return u.call({"":o},"",o)};Ur.parse=ru;const uu=(e,t,n)=>{const r=t&&typeof t===Zr?(e,n)=>""===e||-1<t.indexOf(e)?n:void 0:t||Xr,u=new Map,o=[],i=[];let s=+nu(u,o,r.call({"":e},"",e)),c=!s;for(;s<o.length;)c=!0,i[s]=Wr(o[s++],a,n);return"["+i.join(",")+"]";function a(e,t){if(c)return c=!c,t;const n=r.call(this,e,t);switch(typeof n){case Zr:if(null===n)return n;case qr:return u.get(n)||nu(u,o,n)}return n}};Ur.stringify=uu;Ur.toJSON=e=>Jr(uu(e));Ur.fromJSON=e=>ru(Wr(e));const ou=Ur,iu=Gr;const su=new class{constructor(){const e={__LOG4JS_undefined__:void 0,__LOG4JS_NaN__:Number("abc"),__LOG4JS_Infinity__:1/0,"__LOG4JS_-Infinity__":-1/0};this.deMap=e,this.serMap={},Object.keys(this.deMap).forEach((e=>{const t=this.deMap[e];this.serMap[t]=e}))}canSerialise(e){return"string"!=typeof e&&e in this.serMap}serialise(e){return this.canSerialise(e)?this.serMap[e]:e}canDeserialise(e){return e in this.deMap}deserialise(e){return this.canDeserialise(e)?this.deMap[e]:e}};let cu=class{constructor(e,t,n,r,u,o){if(this.startTime=new Date,this.categoryName=e,this.data=n,this.level=t,this.context=Object.assign({},r),this.pid=process.pid,this.error=o,void 0!==u){if(!u||"object"!=typeof u||Array.isArray(u))throw new TypeError("Invalid location type passed to LoggingEvent constructor");this.constructor._getLocationKeys().forEach((e=>{void 0!==u[e]&&(this[e]=u[e])}))}}static _getLocationKeys(){return["fileName","lineNumber","columnNumber","callStack","className","functionName","functionAlias","callerName"]}serialise(){return ou.stringify(this,((e,t)=>(t instanceof Error&&(t=Object.assign({message:t.message,stack:t.stack},t)),su.serialise(t))))}static deserialise(e){let t;try{const n=ou.parse(e,((e,t)=>{if(t&&t.message&&t.stack){const e=new Error(t);Object.keys(t).forEach((n=>{e[n]=t[n]})),t=e}return su.deserialise(t)}));this._getLocationKeys().forEach((e=>{void 0!==n[e]&&(n.location||(n.location={}),n.location[e]=n[e])})),t=new cu(n.categoryName,iu.getLevel(n.level.levelStr),n.data,n.context,n.location,n.error),t.startTime=new Date(n.startTime),t.pid=n.pid,n.cluster&&(t.cluster=n.cluster)}catch(n){t=new cu("log4js",iu.ERROR,["Unable to parse log:",e,"because: ",n])}return t}};var au=cu;const lu=Zn.exports("log4js:clustering"),fu=au,du=Fr;let Du=!1,pu=null;try{pu=require("cluster")}catch(e){lu("cluster module not present"),Du=!0}const hu=[];let Eu=!1,mu="NODE_APP_INSTANCE";const yu=()=>Eu&&"0"===process.env[mu],Cu=()=>Du||pu&&pu.isMaster||yu(),Fu=e=>{hu.forEach((t=>t(e)))},gu=(e,t)=>{if(lu("cluster message received from worker ",e,": ",t),e.topic&&e.data&&(t=e,e=void 0),t&&t.topic&&"log4js:message"===t.topic){lu("received message: ",t.data);const e=fu.deserialise(t.data);Fu(e)}};Du||du.addListener((e=>{hu.length=0,({pm2:Eu,disableClustering:Du,pm2InstanceVar:mu="NODE_APP_INSTANCE"}=e),lu(`clustering disabled ? ${Du}`),lu(`cluster.isMaster ? ${pu&&pu.isMaster}`),lu(`pm2 enabled ? ${Eu}`),lu(`pm2InstanceVar = ${mu}`),lu(`process.env[${mu}] = ${process.env[mu]}`),Eu&&process.removeListener("message",gu),pu&&pu.removeListener&&pu.removeListener("message",gu),Du||e.disableClustering?lu("Not listening for cluster messages, because clustering disabled."):yu()?(lu("listening for PM2 broadcast messages"),process.on("message",gu)):pu&&pu.isMaster?(lu("listening for cluster messages"),pu.on("message",gu)):lu("not listening for messages, because we are not a master process")}));var Au={onlyOnMaster:(e,t)=>Cu()?e():t,isMaster:Cu,send:e=>{Cu()?Fu(e):(Eu||(e.cluster={workerId:pu.worker.id,worker:process.pid}),process.send({topic:"log4js:message",data:e.serialise()}))},onMessage:e=>{hu.push(e)}},vu={};function Su(e){if("number"==typeof e&&Number.isInteger(e))return e;const t={K:1024,M:1048576,G:1073741824},n=Object.keys(t),r=e.slice(-1).toLocaleUpperCase(),u=e.slice(0,-1).trim();if(n.indexOf(r)<0||!Number.isInteger(Number(u)))throw Error(`maxLogSize: "${e}" is invalid`);return u*t[r]}function wu(e){return function(e,t){const n=Object.assign({},t);return Object.keys(e).forEach((r=>{n[r]&&(n[r]=e[r](t[r]))})),n}({maxLogSize:Su},e)}const Ou={dateFile:wu,file:wu,fileSync:wu};vu.modifyConfig=e=>Ou[e.type]?Ou[e.type](e):e;var _u={};const bu=console.log.bind(console);_u.configure=function(e,t){let n=t.colouredLayout;return e.layout&&(n=t.layout(e.layout.type,e.layout)),function(e,t){return n=>{bu(e(n,t))}}(n,e.timezoneOffset)};var Bu={};Bu.configure=function(e,t){let n=t.colouredLayout;return e.layout&&(n=t.layout(e.layout.type,e.layout)),function(e,t){return n=>{process.stdout.write(`${e(n,t)}\n`)}}(n,e.timezoneOffset)};var Pu={};Pu.configure=function(e,t){let n=t.colouredLayout;return e.layout&&(n=t.layout(e.layout.type,e.layout)),function(e,t){return n=>{process.stderr.write(`${e(n,t)}\n`)}}(n,e.timezoneOffset)};var Iu={};Iu.configure=function(e,t,n,r){const u=n(e.appender);return function(e,t,n,r){const u=r.getLevel(e),o=r.getLevel(t,r.FATAL);return e=>{const t=e.level;u.isLessThanOrEqualTo(t)&&o.isGreaterThanOrEqualTo(t)&&n(e)}}(e.level,e.maxLevel,u,r)};var ku={};const xu=Zn.exports("log4js:categoryFilter");ku.configure=function(e,t,n){const r=n(e.appender);return function(e,t){return"string"==typeof e&&(e=[e]),n=>{xu(`Checking ${n.categoryName} against ${e}`),-1===e.indexOf(n.categoryName)&&(xu("Not excluded, sending to appender"),t(n))}}(e.exclude,r)};var Nu={};const Ru=Zn.exports("log4js:noLogFilter");Nu.configure=function(e,t,n){const r=n(e.appender);return function(e,t){return n=>{Ru(`Checking data: ${n.data} against filters: ${e}`),"string"==typeof e&&(e=[e]),e=e.filter((e=>null!=e&&""!==e));const r=new RegExp(e.join("|"),"i");(0===e.length||n.data.findIndex((e=>r.test(e)))<0)&&(Ru("Not excluded, sending to appender"),t(n))}}(e.exclude,r)};var Tu={},Mu={exports:{}},Lu={},ju={fromCallback:function(e){return Object.defineProperty((function(){if("function"!=typeof arguments[arguments.length-1])return new Promise(((t,n)=>{arguments[arguments.length]=(e,r)=>{if(e)return n(e);t(r)},arguments.length++,e.apply(this,arguments)}));e.apply(this,arguments)}),"name",{value:e.name})},fromPromise:function(e){return Object.defineProperty((function(){const t=arguments[arguments.length-1];if("function"!=typeof t)return e.apply(this,arguments);e.apply(this,arguments).then((e=>t(null,e)),t)}),"name",{value:e.name})}};!function(e){const t=ju.fromCallback,n=oe,r=["access","appendFile","chmod","chown","close","copyFile","fchmod","fchown","fdatasync","fstat","fsync","ftruncate","futimes","lchown","lchmod","link","lstat","mkdir","mkdtemp","open","readFile","readdir","readlink","realpath","rename","rmdir","stat","symlink","truncate","unlink","utimes","writeFile"].filter((e=>"function"==typeof n[e]));Object.keys(n).forEach((t=>{"promises"!==t&&(e[t]=n[t])})),r.forEach((r=>{e[r]=t(n[r])})),e.exists=function(e,t){return"function"==typeof t?n.exists(e,t):new Promise((t=>n.exists(e,t)))},e.read=function(e,t,r,u,o,i){return"function"==typeof i?n.read(e,t,r,u,o,i):new Promise(((i,s)=>{n.read(e,t,r,u,o,((e,t,n)=>{if(e)return s(e);i({bytesRead:t,buffer:n})}))}))},e.write=function(e,t,...r){return"function"==typeof r[r.length-1]?n.write(e,t,...r):new Promise(((u,o)=>{n.write(e,t,...r,((e,t,n)=>{if(e)return o(e);u({bytesWritten:t,buffer:n})}))}))},"function"==typeof n.realpath.native&&(e.realpath.native=t(n.realpath.native))}(Lu);const $u=e;function Hu(e){return(e=$u.normalize($u.resolve(e)).split($u.sep)).length>0?e[0]:null}const Gu=/[<>:"|?*]/;var Vu=function(e){const t=Hu(e);return e=e.replace(t,""),Gu.test(e)};const Uu=oe,Ju=e,Wu=Vu,zu=parseInt("0777",8);var Ku=function e(t,n,r,u){if("function"==typeof n?(r=n,n={}):n&&"object"==typeof n||(n={mode:n}),"win32"===process.platform&&Wu(t)){const e=new Error(t+" contains invalid WIN32 path characters.");return e.code="EINVAL",r(e)}let o=n.mode;const i=n.fs||Uu;void 0===o&&(o=zu&~process.umask()),u||(u=null),r=r||function(){},t=Ju.resolve(t),i.mkdir(t,o,(o=>{if(!o)return r(null,u=u||t);if("ENOENT"===o.code){if(Ju.dirname(t)===t)return r(o);e(Ju.dirname(t),n,((u,o)=>{u?r(u,o):e(t,n,r,o)}))}else i.stat(t,((e,t)=>{e||!t.isDirectory()?r(o,u):r(null,u)}))}))};const qu=oe,Yu=e,Zu=Vu,Xu=parseInt("0777",8);var Qu=function e(t,n,r){n&&"object"==typeof n||(n={mode:n});let u=n.mode;const o=n.fs||qu;if("win32"===process.platform&&Zu(t)){const e=new Error(t+" contains invalid WIN32 path characters.");throw e.code="EINVAL",e}void 0===u&&(u=Xu&~process.umask()),r||(r=null),t=Yu.resolve(t);try{o.mkdirSync(t,u),r=r||t}catch(u){if("ENOENT"===u.code){if(Yu.dirname(t)===t)throw u;r=e(Yu.dirname(t),n,r),e(t,n,r)}else{let e;try{e=o.statSync(t)}catch(e){throw u}if(!e.isDirectory())throw u}}return r};const eo=(0,ju.fromCallback)(Ku);var to={mkdirs:eo,mkdirsSync:Qu,mkdirp:eo,mkdirpSync:Qu,ensureDir:eo,ensureDirSync:Qu};const no=oe;var ro=function(e,t,n,r){no.open(e,"r+",((e,u)=>{if(e)return r(e);no.futimes(u,t,n,(e=>{no.close(u,(t=>{r&&r(e||t)}))}))}))},uo=function(e,t,n){const r=no.openSync(e,"r+");return no.futimesSync(r,t,n),no.closeSync(r)};const oo=oe,io=e,so=10,co=5,ao=0,lo=process.versions.node.split("."),fo=Number.parseInt(lo[0],10),Do=Number.parseInt(lo[1],10),po=Number.parseInt(lo[2],10);function ho(){if(fo>so)return!0;if(fo===so){if(Do>co)return!0;if(Do===co&&po>=ao)return!0}return!1}function Eo(e,t){const n=io.resolve(e).split(io.sep).filter((e=>e)),r=io.resolve(t).split(io.sep).filter((e=>e));return n.reduce(((e,t,n)=>e&&r[n]===t),!0)}function mo(e,t,n){return`Cannot ${n} '${e}' to a subdirectory of itself, '${t}'.`}var yo,Co,Fo={checkPaths:function(e,t,n,r){!function(e,t,n){ho()?oo.stat(e,{bigint:!0},((e,r)=>{if(e)return n(e);oo.stat(t,{bigint:!0},((e,t)=>e?"ENOENT"===e.code?n(null,{srcStat:r,destStat:null}):n(e):n(null,{srcStat:r,destStat:t})))})):oo.stat(e,((e,r)=>{if(e)return n(e);oo.stat(t,((e,t)=>e?"ENOENT"===e.code?n(null,{srcStat:r,destStat:null}):n(e):n(null,{srcStat:r,destStat:t})))}))}(e,t,((u,o)=>{if(u)return r(u);const{srcStat:i,destStat:s}=o;return s&&s.ino&&s.dev&&s.ino===i.ino&&s.dev===i.dev?r(new Error("Source and destination must not be the same.")):i.isDirectory()&&Eo(e,t)?r(new Error(mo(e,t,n))):r(null,{srcStat:i,destStat:s})}))},checkPathsSync:function(e,t,n){const{srcStat:r,destStat:u}=function(e,t){let n,r;n=ho()?oo.statSync(e,{bigint:!0}):oo.statSync(e);try{r=ho()?oo.statSync(t,{bigint:!0}):oo.statSync(t)}catch(e){if("ENOENT"===e.code)return{srcStat:n,destStat:null};throw e}return{srcStat:n,destStat:r}}(e,t);if(u&&u.ino&&u.dev&&u.ino===r.ino&&u.dev===r.dev)throw new Error("Source and destination must not be the same.");if(r.isDirectory()&&Eo(e,t))throw new Error(mo(e,t,n));return{srcStat:r,destStat:u}},checkParentPaths:function e(t,n,r,u,o){const i=io.resolve(io.dirname(t)),s=io.resolve(io.dirname(r));if(s===i||s===io.parse(s).root)return o();ho()?oo.stat(s,{bigint:!0},((i,c)=>i?"ENOENT"===i.code?o():o(i):c.ino&&c.dev&&c.ino===n.ino&&c.dev===n.dev?o(new Error(mo(t,r,u))):e(t,n,s,u,o))):oo.stat(s,((i,c)=>i?"ENOENT"===i.code?o():o(i):c.ino&&c.dev&&c.ino===n.ino&&c.dev===n.dev?o(new Error(mo(t,r,u))):e(t,n,s,u,o)))},checkParentPathsSync:function e(t,n,r,u){const o=io.resolve(io.dirname(t)),i=io.resolve(io.dirname(r));if(i===o||i===io.parse(i).root)return;let s;try{s=ho()?oo.statSync(i,{bigint:!0}):oo.statSync(i)}catch(e){if("ENOENT"===e.code)return;throw e}if(s.ino&&s.dev&&s.ino===n.ino&&s.dev===n.dev)throw new Error(mo(t,r,u));return e(t,n,i,u)},isSrcSubdir:Eo};const go=oe,Ao=e,vo=to.mkdirsSync,So=uo,wo=Fo;function Oo(e,t,n,r){if(!r.filter||r.filter(t,n))return function(e,t,n,r){const u=r.dereference?go.statSync:go.lstatSync,o=u(t);if(o.isDirectory())return function(e,t,n,r,u){if(!t)return function(e,t,n,r){return go.mkdirSync(n),bo(t,n,r),go.chmodSync(n,e.mode)}(e,n,r,u);if(t&&!t.isDirectory())throw new Error(`Cannot overwrite non-directory '${r}' with directory '${n}'.`);return bo(n,r,u)}(o,e,t,n,r);if(o.isFile()||o.isCharacterDevice()||o.isBlockDevice())return function(e,t,n,r,u){return t?function(e,t,n,r){if(r.overwrite)return go.unlinkSync(n),_o(e,t,n,r);if(r.errorOnExist)throw new Error(`'${n}' already exists`)}(e,n,r,u):_o(e,n,r,u)}(o,e,t,n,r);if(o.isSymbolicLink())return function(e,t,n,r){let u=go.readlinkSync(t);r.dereference&&(u=Ao.resolve(process.cwd(),u));if(e){let e;try{e=go.readlinkSync(n)}catch(e){if("EINVAL"===e.code||"UNKNOWN"===e.code)return go.symlinkSync(u,n);throw e}if(r.dereference&&(e=Ao.resolve(process.cwd(),e)),wo.isSrcSubdir(u,e))throw new Error(`Cannot copy '${u}' to a subdirectory of itself, '${e}'.`);if(go.statSync(n).isDirectory()&&wo.isSrcSubdir(e,u))throw new Error(`Cannot overwrite '${e}' with '${u}'.`);return function(e,t){return go.unlinkSync(t),go.symlinkSync(e,t)}(u,n)}return go.symlinkSync(u,n)}(e,t,n,r)}(e,t,n,r)}function _o(e,t,n,r){return"function"==typeof go.copyFileSync?(go.copyFileSync(t,n),go.chmodSync(n,e.mode),r.preserveTimestamps?So(n,e.atime,e.mtime):void 0):function(e,t,n,r){const u=65536,o=(Co?yo:(Co=1,yo=function(e){if("function"==typeof Buffer.allocUnsafe)try{return Buffer.allocUnsafe(e)}catch(t){return new Buffer(e)}return new Buffer(e)}))(u),i=go.openSync(t,"r"),s=go.openSync(n,"w",e.mode);let c=0;for(;c<e.size;){const e=go.readSync(i,o,0,u,c);go.writeSync(s,o,0,e),c+=e}r.preserveTimestamps&&go.futimesSync(s,e.atime,e.mtime);go.closeSync(i),go.closeSync(s)}(e,t,n,r)}function bo(e,t,n){go.readdirSync(e).forEach((r=>function(e,t,n,r){const u=Ao.join(t,e),o=Ao.join(n,e),{destStat:i}=wo.checkPathsSync(u,o,"copy");return Oo(i,u,o,r)}(r,e,t,n)))}var Bo=function(e,t,n){"function"==typeof n&&(n={filter:n}),(n=n||{}).clobber=!("clobber"in n)||!!n.clobber,n.overwrite="overwrite"in n?!!n.overwrite:n.clobber,n.preserveTimestamps&&"ia32"===process.arch&&console.warn("fs-extra: Using the preserveTimestamps option in 32-bit node is not recommended;\n\n    see https://github.com/jprichardson/node-fs-extra/issues/269");const{srcStat:r,destStat:u}=wo.checkPathsSync(e,t,"copy");return wo.checkParentPathsSync(e,r,t,"copy"),function(e,t,n,r){if(r.filter&&!r.filter(t,n))return;const u=Ao.dirname(n);go.existsSync(u)||vo(u);return Oo(e,t,n,r)}(u,e,t,n)},Po={copySync:Bo};const Io=ju.fromPromise,ko=Lu;var xo={pathExists:Io((function(e){return ko.access(e).then((()=>!0)).catch((()=>!1))})),pathExistsSync:ko.existsSync};const No=oe,Ro=e,To=to.mkdirs,Mo=xo.pathExists,Lo=ro,jo=Fo;function $o(e,t,n,r,u){const o=Ro.dirname(n);Mo(o,((i,s)=>i?u(i):s?Go(e,t,n,r,u):void To(o,(o=>o?u(o):Go(e,t,n,r,u)))))}function Ho(e,t,n,r,u,o){Promise.resolve(u.filter(n,r)).then((i=>i?e(t,n,r,u,o):o()),(e=>o(e)))}function Go(e,t,n,r,u){return r.filter?Ho(Vo,e,t,n,r,u):Vo(e,t,n,r,u)}function Vo(e,t,n,r,u){(r.dereference?No.stat:No.lstat)(t,((o,i)=>o?u(o):i.isDirectory()?function(e,t,n,r,u,o){if(!t)return function(e,t,n,r,u){No.mkdir(n,(o=>{if(o)return u(o);Wo(t,n,r,(t=>t?u(t):No.chmod(n,e.mode,u)))}))}(e,n,r,u,o);if(t&&!t.isDirectory())return o(new Error(`Cannot overwrite non-directory '${r}' with directory '${n}'.`));return Wo(n,r,u,o)}(i,e,t,n,r,u):i.isFile()||i.isCharacterDevice()||i.isBlockDevice()?function(e,t,n,r,u,o){return t?function(e,t,n,r,u){if(!r.overwrite)return r.errorOnExist?u(new Error(`'${n}' already exists`)):u();No.unlink(n,(o=>o?u(o):Uo(e,t,n,r,u)))}(e,n,r,u,o):Uo(e,n,r,u,o)}(i,e,t,n,r,u):i.isSymbolicLink()?function(e,t,n,r,u){No.readlink(t,((t,o)=>t?u(t):(r.dereference&&(o=Ro.resolve(process.cwd(),o)),e?void No.readlink(n,((t,i)=>t?"EINVAL"===t.code||"UNKNOWN"===t.code?No.symlink(o,n,u):u(t):(r.dereference&&(i=Ro.resolve(process.cwd(),i)),jo.isSrcSubdir(o,i)?u(new Error(`Cannot copy '${o}' to a subdirectory of itself, '${i}'.`)):e.isDirectory()&&jo.isSrcSubdir(i,o)?u(new Error(`Cannot overwrite '${i}' with '${o}'.`)):function(e,t,n){No.unlink(t,(r=>r?n(r):No.symlink(e,t,n)))}(o,n,u)))):No.symlink(o,n,u))))}(e,t,n,r,u):void 0))}function Uo(e,t,n,r,u){return"function"==typeof No.copyFile?No.copyFile(t,n,(t=>t?u(t):Jo(e,n,r,u))):function(e,t,n,r,u){const o=No.createReadStream(t);o.on("error",(e=>u(e))).once("open",(()=>{const t=No.createWriteStream(n,{mode:e.mode});t.on("error",(e=>u(e))).on("open",(()=>o.pipe(t))).once("close",(()=>Jo(e,n,r,u)))}))}(e,t,n,r,u)}function Jo(e,t,n,r){No.chmod(t,e.mode,(u=>u?r(u):n.preserveTimestamps?Lo(t,e.atime,e.mtime,r):r()))}function Wo(e,t,n,r){No.readdir(e,((u,o)=>u?r(u):zo(o,e,t,n,r)))}function zo(e,t,n,r,u){const o=e.pop();return o?function(e,t,n,r,u,o){const i=Ro.join(n,t),s=Ro.join(r,t);jo.checkPaths(i,s,"copy",((t,c)=>{if(t)return o(t);const{destStat:a}=c;Go(a,i,s,u,(t=>t?o(t):zo(e,n,r,u,o)))}))}(e,o,t,n,r,u):u()}var Ko=function(e,t,n,r){"function"!=typeof n||r?"function"==typeof n&&(n={filter:n}):(r=n,n={}),r=r||function(){},(n=n||{}).clobber=!("clobber"in n)||!!n.clobber,n.overwrite="overwrite"in n?!!n.overwrite:n.clobber,n.preserveTimestamps&&"ia32"===process.arch&&console.warn("fs-extra: Using the preserveTimestamps option in 32-bit node is not recommended;\n\n    see https://github.com/jprichardson/node-fs-extra/issues/269"),jo.checkPaths(e,t,"copy",((u,o)=>{if(u)return r(u);const{srcStat:i,destStat:s}=o;jo.checkParentPaths(e,i,t,"copy",(u=>u?r(u):n.filter?Ho($o,s,e,t,n,r):$o(s,e,t,n,r)))}))};var qo={copy:(0,ju.fromCallback)(Ko)};const Yo=oe,Zo=e,Xo=s,Qo="win32"===process.platform;function ei(e){["unlink","chmod","stat","lstat","rmdir","readdir"].forEach((t=>{e[t]=e[t]||Yo[t],e[t+="Sync"]=e[t]||Yo[t]})),e.maxBusyTries=e.maxBusyTries||3}function ti(e,t,n){let r=0;"function"==typeof t&&(n=t,t={}),Xo(e,"rimraf: missing path"),Xo.strictEqual(typeof e,"string","rimraf: path should be a string"),Xo.strictEqual(typeof n,"function","rimraf: callback function required"),Xo(t,"rimraf: invalid options argument provided"),Xo.strictEqual(typeof t,"object","rimraf: options should be object"),ei(t),ni(e,t,(function u(o){if(o){if(("EBUSY"===o.code||"ENOTEMPTY"===o.code||"EPERM"===o.code)&&r<t.maxBusyTries){r++;return setTimeout((()=>ni(e,t,u)),100*r)}"ENOENT"===o.code&&(o=null)}n(o)}))}function ni(e,t,n){Xo(e),Xo(t),Xo("function"==typeof n),t.lstat(e,((r,u)=>r&&"ENOENT"===r.code?n(null):r&&"EPERM"===r.code&&Qo?ri(e,t,r,n):u&&u.isDirectory()?oi(e,t,r,n):void t.unlink(e,(r=>{if(r){if("ENOENT"===r.code)return n(null);if("EPERM"===r.code)return Qo?ri(e,t,r,n):oi(e,t,r,n);if("EISDIR"===r.code)return oi(e,t,r,n)}return n(r)}))))}function ri(e,t,n,r){Xo(e),Xo(t),Xo("function"==typeof r),n&&Xo(n instanceof Error),t.chmod(e,438,(u=>{u?r("ENOENT"===u.code?null:n):t.stat(e,((u,o)=>{u?r("ENOENT"===u.code?null:n):o.isDirectory()?oi(e,t,n,r):t.unlink(e,r)}))}))}function ui(e,t,n){let r;Xo(e),Xo(t),n&&Xo(n instanceof Error);try{t.chmodSync(e,438)}catch(e){if("ENOENT"===e.code)return;throw n}try{r=t.statSync(e)}catch(e){if("ENOENT"===e.code)return;throw n}r.isDirectory()?si(e,t,n):t.unlinkSync(e)}function oi(e,t,n,r){Xo(e),Xo(t),n&&Xo(n instanceof Error),Xo("function"==typeof r),t.rmdir(e,(u=>{!u||"ENOTEMPTY"!==u.code&&"EEXIST"!==u.code&&"EPERM"!==u.code?u&&"ENOTDIR"===u.code?r(n):r(u):function(e,t,n){Xo(e),Xo(t),Xo("function"==typeof n),t.readdir(e,((r,u)=>{if(r)return n(r);let o,i=u.length;if(0===i)return t.rmdir(e,n);u.forEach((r=>{ti(Zo.join(e,r),t,(r=>{if(!o)return r?n(o=r):void(0==--i&&t.rmdir(e,n))}))}))}))}(e,t,r)}))}function ii(e,t){let n;ei(t=t||{}),Xo(e,"rimraf: missing path"),Xo.strictEqual(typeof e,"string","rimraf: path should be a string"),Xo(t,"rimraf: missing options"),Xo.strictEqual(typeof t,"object","rimraf: options should be object");try{n=t.lstatSync(e)}catch(n){if("ENOENT"===n.code)return;"EPERM"===n.code&&Qo&&ui(e,t,n)}try{n&&n.isDirectory()?si(e,t,null):t.unlinkSync(e)}catch(n){if("ENOENT"===n.code)return;if("EPERM"===n.code)return Qo?ui(e,t,n):si(e,t,n);if("EISDIR"!==n.code)throw n;si(e,t,n)}}function si(e,t,n){Xo(e),Xo(t),n&&Xo(n instanceof Error);try{t.rmdirSync(e)}catch(r){if("ENOTDIR"===r.code)throw n;if("ENOTEMPTY"===r.code||"EEXIST"===r.code||"EPERM"===r.code)!function(e,t){if(Xo(e),Xo(t),t.readdirSync(e).forEach((n=>ii(Zo.join(e,n),t))),!Qo){return t.rmdirSync(e,t)}{const n=Date.now();do{try{return t.rmdirSync(e,t)}catch(e){}}while(Date.now()-n<500)}}(e,t);else if("ENOENT"!==r.code)throw r}}var ci=ti;ti.sync=ii;const ai=ci;var li={remove:(0,ju.fromCallback)(ai),removeSync:ai.sync};const fi=ju.fromCallback,di=oe,Di=e,pi=to,hi=li,Ei=fi((function(e,t){t=t||function(){},di.readdir(e,((n,r)=>{if(n)return pi.mkdirs(e,t);r=r.map((t=>Di.join(e,t))),function e(){const n=r.pop();if(!n)return t();hi.remove(n,(n=>{if(n)return t(n);e()}))}()}))}));function mi(e){let t;try{t=di.readdirSync(e)}catch(t){return pi.mkdirsSync(e)}t.forEach((t=>{t=Di.join(e,t),hi.removeSync(t)}))}var yi={emptyDirSync:mi,emptydirSync:mi,emptyDir:Ei,emptydir:Ei};const Ci=ju.fromCallback,Fi=e,gi=oe,Ai=to,vi=xo.pathExists;var Si={createFile:Ci((function(e,t){function n(){gi.writeFile(e,"",(e=>{if(e)return t(e);t()}))}gi.stat(e,((r,u)=>{if(!r&&u.isFile())return t();const o=Fi.dirname(e);vi(o,((e,r)=>e?t(e):r?n():void Ai.mkdirs(o,(e=>{if(e)return t(e);n()}))))}))})),createFileSync:function(e){let t;try{t=gi.statSync(e)}catch(e){}if(t&&t.isFile())return;const n=Fi.dirname(e);gi.existsSync(n)||Ai.mkdirsSync(n),gi.writeFileSync(e,"")}};const wi=ju.fromCallback,Oi=e,_i=oe,bi=to,Bi=xo.pathExists;var Pi={createLink:wi((function(e,t,n){function r(e,t){_i.link(e,t,(e=>{if(e)return n(e);n(null)}))}Bi(t,((u,o)=>u?n(u):o?n(null):void _i.lstat(e,(u=>{if(u)return u.message=u.message.replace("lstat","ensureLink"),n(u);const o=Oi.dirname(t);Bi(o,((u,i)=>u?n(u):i?r(e,t):void bi.mkdirs(o,(u=>{if(u)return n(u);r(e,t)}))))}))))})),createLinkSync:function(e,t){if(_i.existsSync(t))return;try{_i.lstatSync(e)}catch(e){throw e.message=e.message.replace("lstat","ensureLink"),e}const n=Oi.dirname(t);return _i.existsSync(n)||bi.mkdirsSync(n),_i.linkSync(e,t)}};const Ii=e,ki=oe,xi=xo.pathExists;var Ni={symlinkPaths:function(e,t,n){if(Ii.isAbsolute(e))return ki.lstat(e,(t=>t?(t.message=t.message.replace("lstat","ensureSymlink"),n(t)):n(null,{toCwd:e,toDst:e})));{const r=Ii.dirname(t),u=Ii.join(r,e);return xi(u,((t,o)=>t?n(t):o?n(null,{toCwd:u,toDst:e}):ki.lstat(e,(t=>t?(t.message=t.message.replace("lstat","ensureSymlink"),n(t)):n(null,{toCwd:e,toDst:Ii.relative(r,e)})))))}},symlinkPathsSync:function(e,t){let n;if(Ii.isAbsolute(e)){if(n=ki.existsSync(e),!n)throw new Error("absolute srcpath does not exist");return{toCwd:e,toDst:e}}{const r=Ii.dirname(t),u=Ii.join(r,e);if(n=ki.existsSync(u),n)return{toCwd:u,toDst:e};if(n=ki.existsSync(e),!n)throw new Error("relative srcpath does not exist");return{toCwd:e,toDst:Ii.relative(r,e)}}}};const Ri=oe;var Ti={symlinkType:function(e,t,n){if(n="function"==typeof t?t:n,t="function"!=typeof t&&t)return n(null,t);Ri.lstat(e,((e,r)=>{if(e)return n(null,"file");t=r&&r.isDirectory()?"dir":"file",n(null,t)}))},symlinkTypeSync:function(e,t){let n;if(t)return t;try{n=Ri.lstatSync(e)}catch(e){return"file"}return n&&n.isDirectory()?"dir":"file"}};const Mi=ju.fromCallback,Li=e,ji=oe,$i=to.mkdirs,Hi=to.mkdirsSync,Gi=Ni.symlinkPaths,Vi=Ni.symlinkPathsSync,Ui=Ti.symlinkType,Ji=Ti.symlinkTypeSync,Wi=xo.pathExists;var zi={createSymlink:Mi((function(e,t,n,r){r="function"==typeof n?n:r,n="function"!=typeof n&&n,Wi(t,((u,o)=>u?r(u):o?r(null):void Gi(e,t,((u,o)=>{if(u)return r(u);e=o.toDst,Ui(o.toCwd,n,((n,u)=>{if(n)return r(n);const o=Li.dirname(t);Wi(o,((n,i)=>n?r(n):i?ji.symlink(e,t,u,r):void $i(o,(n=>{if(n)return r(n);ji.symlink(e,t,u,r)}))))}))}))))})),createSymlinkSync:function(e,t,n){if(ji.existsSync(t))return;const r=Vi(e,t);e=r.toDst,n=Ji(r.toCwd,n);const u=Li.dirname(t);return ji.existsSync(u)||Hi(u),ji.symlinkSync(e,t,n)}};var Ki,qi={createFile:Si.createFile,createFileSync:Si.createFileSync,ensureFile:Si.createFile,ensureFileSync:Si.createFileSync,createLink:Pi.createLink,createLinkSync:Pi.createLinkSync,ensureLink:Pi.createLink,ensureLinkSync:Pi.createLinkSync,createSymlink:zi.createSymlink,createSymlinkSync:zi.createSymlinkSync,ensureSymlink:zi.createSymlink,ensureSymlinkSync:zi.createSymlinkSync};try{Ki=oe}catch(e){Ki=n}function Yi(e,t){var n,r="\n";return"object"==typeof t&&null!==t&&(t.spaces&&(n=t.spaces),t.EOL&&(r=t.EOL)),JSON.stringify(e,t?t.replacer:null,n).replace(/\n/g,r)+r}function Zi(e){return Buffer.isBuffer(e)&&(e=e.toString("utf8")),e=e.replace(/^\uFEFF/,"")}var Xi={readFile:function(e,t,n){null==n&&(n=t,t={}),"string"==typeof t&&(t={encoding:t});var r=(t=t||{}).fs||Ki,u=!0;"throws"in t&&(u=t.throws),r.readFile(e,t,(function(r,o){if(r)return n(r);var i;o=Zi(o);try{i=JSON.parse(o,t?t.reviver:null)}catch(t){return u?(t.message=e+": "+t.message,n(t)):n(null,null)}n(null,i)}))},readFileSync:function(e,t){"string"==typeof(t=t||{})&&(t={encoding:t});var n=t.fs||Ki,r=!0;"throws"in t&&(r=t.throws);try{var u=n.readFileSync(e,t);return u=Zi(u),JSON.parse(u,t.reviver)}catch(t){if(r)throw t.message=e+": "+t.message,t;return null}},writeFile:function(e,t,n,r){null==r&&(r=n,n={});var u=(n=n||{}).fs||Ki,o="";try{o=Yi(t,n)}catch(e){return void(r&&r(e,null))}u.writeFile(e,o,n,r)},writeFileSync:function(e,t,n){var r=(n=n||{}).fs||Ki,u=Yi(t,n);return r.writeFileSync(e,u,n)}},Qi=Xi;const es=ju.fromCallback,ts=Qi;var ns={readJson:es(ts.readFile),readJsonSync:ts.readFileSync,writeJson:es(ts.writeFile),writeJsonSync:ts.writeFileSync};const rs=e,us=to,os=xo.pathExists,is=ns;var ss=function(e,t,n,r){"function"==typeof n&&(r=n,n={});const u=rs.dirname(e);os(u,((o,i)=>o?r(o):i?is.writeJson(e,t,n,r):void us.mkdirs(u,(u=>{if(u)return r(u);is.writeJson(e,t,n,r)}))))};const cs=oe,as=e,ls=to,fs=ns;var ds=function(e,t,n){const r=as.dirname(e);cs.existsSync(r)||ls.mkdirsSync(r),fs.writeJsonSync(e,t,n)};const Ds=ju.fromCallback,ps=ns;ps.outputJson=Ds(ss),ps.outputJsonSync=ds,ps.outputJSON=ps.outputJson,ps.outputJSONSync=ps.outputJsonSync,ps.writeJSON=ps.writeJson,ps.writeJSONSync=ps.writeJsonSync,ps.readJSON=ps.readJson,ps.readJSONSync=ps.readJsonSync;var hs=ps;const Es=oe,ms=e,ys=Po.copySync,Cs=li.removeSync,Fs=to.mkdirpSync,gs=Fo;function As(e,t,n){try{Es.renameSync(e,t)}catch(r){if("EXDEV"!==r.code)throw r;return function(e,t,n){const r={overwrite:n,errorOnExist:!0};return ys(e,t,r),Cs(e)}(e,t,n)}}var vs=function(e,t,n){const r=(n=n||{}).overwrite||n.clobber||!1,{srcStat:u}=gs.checkPathsSync(e,t,"move");return gs.checkParentPathsSync(e,u,t,"move"),Fs(ms.dirname(t)),function(e,t,n){if(n)return Cs(t),As(e,t,n);if(Es.existsSync(t))throw new Error("dest already exists.");return As(e,t,n)}(e,t,r)},Ss={moveSync:vs};const ws=oe,Os=e,_s=qo.copy,bs=li.remove,Bs=to.mkdirp,Ps=xo.pathExists,Is=Fo;function ks(e,t,n,r){ws.rename(e,t,(u=>u?"EXDEV"!==u.code?r(u):function(e,t,n,r){const u={overwrite:n,errorOnExist:!0};_s(e,t,u,(t=>t?r(t):bs(e,r)))}(e,t,n,r):r()))}var xs=function(e,t,n,r){"function"==typeof n&&(r=n,n={});const u=n.overwrite||n.clobber||!1;Is.checkPaths(e,t,"move",((n,o)=>{if(n)return r(n);const{srcStat:i}=o;Is.checkParentPaths(e,i,t,"move",(n=>{if(n)return r(n);Bs(Os.dirname(t),(n=>n?r(n):function(e,t,n,r){if(n)return bs(t,(u=>u?r(u):ks(e,t,n,r)));Ps(t,((u,o)=>u?r(u):o?r(new Error("dest already exists.")):ks(e,t,n,r)))}(e,t,u,r)))}))}))};var Ns={move:(0,ju.fromCallback)(xs)};const Rs=ju.fromCallback,Ts=oe,Ms=e,Ls=to,js=xo.pathExists;var $s={outputFile:Rs((function(e,t,n,r){"function"==typeof n&&(r=n,n="utf8");const u=Ms.dirname(e);js(u,((o,i)=>o?r(o):i?Ts.writeFile(e,t,n,r):void Ls.mkdirs(u,(u=>{if(u)return r(u);Ts.writeFile(e,t,n,r)}))))})),outputFileSync:function(e,...t){const n=Ms.dirname(e);if(Ts.existsSync(n))return Ts.writeFileSync(e,...t);Ls.mkdirsSync(n),Ts.writeFileSync(e,...t)}};!function(e){e.exports=Object.assign({},Lu,Po,qo,yi,qi,hs,to,Ss,Ns,$s,xo,li);const t=n;Object.getOwnPropertyDescriptor(t,"promises")&&Object.defineProperty(e.exports,"promises",{get:()=>t.promises})}(Mu);const Hs=Zn.exports("streamroller:fileNameFormatter"),Gs=e;const Vs=Zn.exports("streamroller:fileNameParser"),Us=gr.exports;const Js=Zn.exports("streamroller:moveAndMaybeCompressFile"),Ws=Mu.exports,zs=f;var Ks=async(e,t,n)=>{if(n=function(e){const t={mode:parseInt("0600",8),compress:!1},n=Object.assign({},t,e);return Js(`_parseOption: moveAndMaybeCompressFile called with option=${JSON.stringify(n)}`),n}(n),e!==t){if(await Ws.pathExists(e))if(Js(`moveAndMaybeCompressFile: moving file from ${e} to ${t} ${n.compress?"with":"without"} compress`),n.compress)await new Promise(((r,u)=>{let o=!1;const i=Ws.createWriteStream(t,{mode:n.mode,flags:"wx"}).on("open",(()=>{o=!0;const t=Ws.createReadStream(e).on("open",(()=>{t.pipe(zs.createGzip()).pipe(i)})).on("error",(t=>{Js(`moveAndMaybeCompressFile: error reading ${e}`,t),i.destroy(t)}))})).on("finish",(()=>{Js(`moveAndMaybeCompressFile: finished compressing ${t}, deleting ${e}`),Ws.unlink(e).then(r).catch((t=>{Js(`moveAndMaybeCompressFile: error deleting ${e}, truncating instead`,t),Ws.truncate(e).then(r).catch((t=>{Js(`moveAndMaybeCompressFile: error truncating ${e}`,t),u(t)}))}))})).on("error",(e=>{o?(Js(`moveAndMaybeCompressFile: error writing ${t}, deleting`,e),Ws.unlink(t).then((()=>{u(e)})).catch((e=>{Js(`moveAndMaybeCompressFile: error deleting ${t}`,e),u(e)}))):(Js(`moveAndMaybeCompressFile: error creating ${t}`,e),u(e))}))})).catch((()=>{}));else{Js(`moveAndMaybeCompressFile: renaming ${e} to ${t}`);try{await Ws.move(e,t,{overwrite:!0})}catch(n){if(Js(`moveAndMaybeCompressFile: error renaming ${e} to ${t}`,n),"ENOENT"!==n.code){Js("moveAndMaybeCompressFile: trying copy+truncate instead");try{await Ws.copy(e,t,{overwrite:!0}),await Ws.truncate(e)}catch(e){Js("moveAndMaybeCompressFile: error copy+truncate",e)}}}}}else Js("moveAndMaybeCompressFile: source and target are the same, not doing anything")};const qs=Zn.exports("streamroller:RollingFileWriteStream"),Ys=Mu.exports,Zs=e,Xs=t,Qs=()=>new Date,ec=gr.exports,{Writable:tc}=o,nc=({file:e,keepFileExt:t,needsIndex:n,alwaysIncludeDate:r,compress:u,fileNameSep:o})=>{let i=o||".";const s=Gs.join(e.dir,e.name),c=t=>t+e.ext,a=(e,t,r)=>!n&&r||!t?e:e+i+t,l=(e,t,n)=>(t>0||r)&&n?e+i+n:e,f=(e,t)=>t&&u?e+".gz":e,d=t?[l,a,c,f]:[c,l,a,f];return({date:e,index:t})=>(Hs(`_formatFileName: date=${e}, index=${t}`),d.reduce(((n,r)=>r(n,t,e)),s))},rc=({file:e,keepFileExt:t,pattern:n,fileNameSep:r})=>{let u=r||".";const o="__NOT_MATCHING__";let i=[(e,t)=>e.endsWith(".gz")?(Vs("it is gzipped"),t.isCompressed=!0,e.slice(0,-3)):e,t?t=>t.startsWith(e.name)&&t.endsWith(e.ext)?(Vs("it starts and ends with the right things"),t.slice(e.name.length+1,-1*e.ext.length)):o:t=>t.startsWith(e.base)?(Vs("it starts with the right things"),t.slice(e.base.length+1)):o,n?(e,t)=>{const r=e.split(u);let o=r[r.length-1];Vs("items: ",r,", indexStr: ",o);let i=e;void 0!==o&&o.match(/^\d+$/)?(i=e.slice(0,-1*(o.length+1)),Vs(`dateStr is ${i}`),n&&!i&&(i=o,o="0")):o="0";try{const r=Us.parse(n,i,new Date(0,0));return Us.asString(n,r)!==i?e:(t.index=parseInt(o,10),t.date=i,t.timestamp=r.getTime(),"")}catch(t){return Vs(`Problem parsing ${i} as ${n}, error was: `,t),e}}:(e,t)=>e.match(/^\d+$/)?(Vs("it has an index"),t.index=parseInt(e,10),""):e];return e=>{let t={filename:e,index:0,isCompressed:!1};return i.reduce(((e,n)=>n(e,t)),e)?null:t}},uc=Ks;var oc=class extends tc{constructor(e,t){if(qs(`constructor: creating RollingFileWriteStream. path=${e}`),"string"!=typeof e||0===e.length)throw new Error(`Invalid filename: ${e}`);if(e.endsWith(Zs.sep))throw new Error(`Filename is a directory: ${e}`);0===e.indexOf(`~${Zs.sep}`)&&(e=e.replace("~",Xs.homedir())),super(t),this.options=this._parseOption(t),this.fileObject=Zs.parse(e),""===this.fileObject.dir&&(this.fileObject=Zs.parse(Zs.join(process.cwd(),e))),this.fileFormatter=nc({file:this.fileObject,alwaysIncludeDate:this.options.alwaysIncludePattern,needsIndex:this.options.maxSize<Number.MAX_SAFE_INTEGER,compress:this.options.compress,keepFileExt:this.options.keepFileExt,fileNameSep:this.options.fileNameSep}),this.fileNameParser=rc({file:this.fileObject,keepFileExt:this.options.keepFileExt,pattern:this.options.pattern,fileNameSep:this.options.fileNameSep}),this.state={currentSize:0},this.options.pattern&&(this.state.currentDate=ec(this.options.pattern,Qs())),this.filename=this.fileFormatter({index:0,date:this.state.currentDate}),["a","a+","as","as+"].includes(this.options.flags)&&this._setExistingSizeAndDate(),qs(`constructor: create new file ${this.filename}, state=${JSON.stringify(this.state)}`),this._renewWriteStream()}_setExistingSizeAndDate(){try{const e=Ys.statSync(this.filename);this.state.currentSize=e.size,this.options.pattern&&(this.state.currentDate=ec(this.options.pattern,e.mtime))}catch(e){return}}_parseOption(e){const t={maxSize:0,numToKeep:Number.MAX_SAFE_INTEGER,encoding:"utf8",mode:parseInt("0600",8),flags:"a",compress:!1,keepFileExt:!1,alwaysIncludePattern:!1},n=Object.assign({},t,e);if(n.maxSize){if(n.maxSize<=0)throw new Error(`options.maxSize (${n.maxSize}) should be > 0`)}else delete n.maxSize;if(n.numBackups||0===n.numBackups){if(n.numBackups<0)throw new Error(`options.numBackups (${n.numBackups}) should be >= 0`);if(n.numBackups>=Number.MAX_SAFE_INTEGER)throw new Error(`options.numBackups (${n.numBackups}) should be < Number.MAX_SAFE_INTEGER`);n.numToKeep=n.numBackups+1}else if(n.numToKeep<=0)throw new Error(`options.numToKeep (${n.numToKeep}) should be > 0`);return qs(`_parseOption: creating stream with option=${JSON.stringify(n)}`),n}_final(e){this.currentFileStream.end("",this.options.encoding,e)}_write(e,t,n){this._shouldRoll().then((()=>{qs(`_write: writing chunk. file=${this.currentFileStream.path} state=${JSON.stringify(this.state)} chunk=${e}`),this.currentFileStream.write(e,t,(t=>{this.state.currentSize+=e.length,n(t)}))}))}async _shouldRoll(){(this._dateChanged()||this._tooBig())&&(qs(`_shouldRoll: rolling because dateChanged? ${this._dateChanged()} or tooBig? ${this._tooBig()}`),await this._roll())}_dateChanged(){return this.state.currentDate&&this.state.currentDate!==ec(this.options.pattern,Qs())}_tooBig(){return this.state.currentSize>=this.options.maxSize}_roll(){return qs("_roll: closing the current stream"),new Promise(((e,t)=>{this.currentFileStream.end("",this.options.encoding,(()=>{this._moveOldFiles().then(e).catch(t)}))}))}async _moveOldFiles(){const e=await this._getExistingFiles();for(let t=(this.state.currentDate?e.filter((e=>e.date===this.state.currentDate)):e).length;t>=0;t--){qs(`_moveOldFiles: i = ${t}`);const e=this.fileFormatter({date:this.state.currentDate,index:t}),n=this.fileFormatter({date:this.state.currentDate,index:t+1}),r={compress:this.options.compress&&0===t,mode:this.options.mode};await uc(e,n,r)}this.state.currentSize=0,this.state.currentDate=this.state.currentDate?ec(this.options.pattern,Qs()):null,qs(`_moveOldFiles: finished rolling files. state=${JSON.stringify(this.state)}`),this._renewWriteStream(),await new Promise(((e,t)=>{this.currentFileStream.write("","utf8",(()=>{this._clean().then(e).catch(t)}))}))}async _getExistingFiles(){const e=await Ys.readdir(this.fileObject.dir).catch((()=>[]));qs(`_getExistingFiles: files=${e}`);const t=e.map((e=>this.fileNameParser(e))).filter((e=>e)),n=e=>(e.timestamp?e.timestamp:Qs().getTime())-e.index;return t.sort(((e,t)=>n(e)-n(t))),t}_renewWriteStream(){const e=this.fileFormatter({date:this.state.currentDate,index:0}),t=e=>{try{return Ys.mkdirSync(e,{recursive:!0})}catch(n){if("ENOENT"===n.code)return t(Zs.dirname(e)),t(e);if("EEXIST"!==n.code&&"EROFS"!==n.code)throw n;try{if(Ys.statSync(e).isDirectory())return e;throw n}catch(e){throw n}}};t(this.fileObject.dir);const n={flags:this.options.flags,encoding:this.options.encoding,mode:this.options.mode};var r,u;Ys.appendFileSync(e,"",(r={...n},u="flags",r["flag"]=r[u],delete r[u],r)),this.currentFileStream=Ys.createWriteStream(e,n),this.currentFileStream.on("error",(e=>{this.emit("error",e)}))}async _clean(){const e=await this._getExistingFiles();if(qs(`_clean: numToKeep = ${this.options.numToKeep}, existingFiles = ${e.length}`),qs("_clean: existing files are: ",e),this._tooManyFiles(e.length)){const n=e.slice(0,e.length-this.options.numToKeep).map((e=>Zs.format({dir:this.fileObject.dir,base:e.filename})));await(t=n,qs(`deleteFiles: files to delete: ${t}`),Promise.all(t.map((e=>Ys.unlink(e).catch((t=>{qs(`deleteFiles: error when unlinking ${e}, ignoring. Error was ${t}`)}))))))}var t}_tooManyFiles(e){return this.options.numToKeep>0&&e>this.options.numToKeep}};const ic=oc;var sc=class extends ic{constructor(e,t,n,r){r||(r={}),t&&(r.maxSize=t),r.numBackups||0===r.numBackups||(n||0===n||(n=1),r.numBackups=n),super(e,r),this.backups=r.numBackups,this.size=this.options.maxSize}get theStream(){return this.currentFileStream}};const cc=oc;var ac={RollingFileWriteStream:oc,RollingFileStream:sc,DateRollingFileStream:class extends cc{constructor(e,t,n){t&&"object"==typeof t&&(n=t,t=null),n||(n={}),t||(t="yyyy-MM-dd"),n.pattern=t,n.numBackups||0===n.numBackups?n.daysToKeep=n.numBackups:(n.daysToKeep||0===n.daysToKeep?process.emitWarning("options.daysToKeep is deprecated due to the confusion it causes when used together with file size rolling. Please use options.numBackups instead.","DeprecationWarning","streamroller-DEP0001"):n.daysToKeep=1,n.numBackups=n.daysToKeep),super(e,n),this.mode=this.options.mode}get theStream(){return this.currentFileStream}}};const lc=Zn.exports("log4js:file"),fc=e,dc=ac,Dc=t,pc=Dc.EOL;let hc=!1;const Ec=new Set;function mc(){Ec.forEach((e=>{e.sighupHandler()}))}Tu.configure=function(e,t){let n=t.basicLayout;return e.layout&&(n=t.layout(e.layout.type,e.layout)),e.mode=e.mode||384,function(e,t,n,r,u,o){if("string"!=typeof e||0===e.length)throw new Error(`Invalid filename: ${e}`);if(e.endsWith(fc.sep))throw new Error(`Filename is a directory: ${e}`);function i(e,t,n,r){const u=new dc.RollingFileStream(e,t,n,r);return u.on("error",(t=>{console.error("log4js.fileAppender - Writing to file %s, error happened ",e,t)})),u.on("drain",(()=>{process.emit("log4js:pause",!1)})),u}e=e.replace(new RegExp(`^~(?=${fc.sep}.+)`),Dc.homedir()),e=fc.normalize(e),lc("Creating file appender (",e,", ",n,", ",r=r||0===r?r:5,", ",u,", ",o,")");let s=i(e,n,r,u);const c=function(e){if(s.writable){if(!0===u.removeColor){const t=/\x1b[[0-9;]*m/g;e.data=e.data.map((e=>"string"==typeof e?e.replace(t,""):e))}s.write(t(e,o)+pc,"utf8")||process.emit("log4js:pause",!0)}};return c.reopen=function(){s.end((()=>{s=i(e,n,r,u)}))},c.sighupHandler=function(){lc("SIGHUP handler called."),c.reopen()},c.shutdown=function(e){Ec.delete(c),0===Ec.size&&hc&&(process.removeListener("SIGHUP",mc),hc=!1),s.end("","utf-8",e)},Ec.add(c),hc||(process.on("SIGHUP",mc),hc=!0),c}(e.filename,n,e.maxLogSize,e.backups,e,e.timezoneOffset)};var yc={};const Cc=ac,Fc=t.EOL;function gc(e,t,n,r,u){r.maxSize=r.maxLogSize;const o=function(e,t,n){const r=new Cc.DateRollingFileStream(e,t,n);return r.on("error",(t=>{console.error("log4js.dateFileAppender - Writing to file %s, error happened ",e,t)})),r.on("drain",(()=>{process.emit("log4js:pause",!1)})),r}(e,t,r),i=function(e){o.writable&&(o.write(n(e,u)+Fc,"utf8")||process.emit("log4js:pause",!0))};return i.shutdown=function(e){o.end("","utf-8",e)},i}yc.configure=function(e,t){let n=t.basicLayout;return e.layout&&(n=t.layout(e.layout.type,e.layout)),e.alwaysIncludePattern||(e.alwaysIncludePattern=!1),e.mode=e.mode||384,gc(e.filename,e.pattern,n,e,e.timezoneOffset)};var Ac={};const vc=Zn.exports("log4js:fileSync"),Sc=e,wc=n,Oc=t,_c=Oc.EOL;function bc(e,t){const n=e=>{try{return wc.mkdirSync(e,{recursive:!0})}catch(t){if("ENOENT"===t.code)return n(Sc.dirname(e)),n(e);if("EEXIST"!==t.code&&"EROFS"!==t.code)throw t;try{if(wc.statSync(e).isDirectory())return e;throw t}catch(e){throw t}}};n(Sc.dirname(e)),wc.appendFileSync(e,"",{mode:t.mode,flag:t.flags})}class Bc{constructor(e,t,n,r){if(vc("In RollingFileStream"),t<0)throw new Error(`maxLogSize (${t}) should be > 0`);this.filename=e,this.size=t,this.backups=n,this.options=r,this.currentSize=0,this.currentSize=function(e){let t=0;try{t=wc.statSync(e).size}catch(t){bc(e,r)}return t}(this.filename)}shouldRoll(){return vc("should roll with current size %d, and max size %d",this.currentSize,this.size),this.currentSize>=this.size}roll(e){const t=this,n=new RegExp(`^${Sc.basename(e)}`);function r(e){return n.test(e)}function u(t){return parseInt(t.slice(`${Sc.basename(e)}.`.length),10)||0}function o(e,t){return u(e)-u(t)}function i(n){const r=u(n);if(vc(`Index of ${n} is ${r}`),0===t.backups)wc.truncateSync(e,0);else if(r<t.backups){try{wc.unlinkSync(`${e}.${r+1}`)}catch(e){}vc(`Renaming ${n} -> ${e}.${r+1}`),wc.renameSync(Sc.join(Sc.dirname(e),n),`${e}.${r+1}`)}}vc("Rolling, rolling, rolling"),vc("Renaming the old files"),wc.readdirSync(Sc.dirname(e)).filter(r).sort(o).reverse().forEach(i)}write(e,t){const n=this;vc("in write"),this.shouldRoll()&&(this.currentSize=0,this.roll(this.filename)),vc("writing the chunk to the file"),n.currentSize+=e.length,wc.appendFileSync(n.filename,e)}}Ac.configure=function(e,t){let n=t.basicLayout;e.layout&&(n=t.layout(e.layout.type,e.layout));const r={flags:e.flags||"a",encoding:e.encoding||"utf8",mode:e.mode||384};return function(e,t,n,r,u,o){if("string"!=typeof e||0===e.length)throw new Error(`Invalid filename: ${e}`);if(e.endsWith(Sc.sep))throw new Error(`Filename is a directory: ${e}`);e=e.replace(new RegExp(`^~(?=${Sc.sep}.+)`),Oc.homedir()),e=Sc.normalize(e),vc("Creating fileSync appender (",e,", ",n,", ",r=r||0===r?r:5,", ",u,", ",o,")");const i=function(e,t,n){let r;var o;return t?r=new Bc(e,t,n,u):(bc(o=e,u),r={write(e){wc.appendFileSync(o,e)}}),r}(e,n,r);return e=>{i.write(t(e,o)+_c)}}(e.filename,n,e.maxLogSize,e.backups,r,e.timezoneOffset)};var Pc={};const Ic=Zn.exports("log4js:tcp"),kc=d;Pc.configure=function(e,t){Ic(`configure with config = ${e}`);let n=function(e){return e.serialise()};return e.layout&&(n=t.layout(e.layout.type,e.layout)),function(e,t){let n=!1;const r=[];let u,o=3,i="__LOG4JS__";function s(e){Ic("Writing log event to socket"),n=u.write(`${t(e)}${i}`,"utf8")}function c(){let e;for(Ic("emptying buffer");e=r.shift();)s(e)}function a(e){n?s(e):(Ic("buffering log event because it cannot write at the moment"),r.push(e))}return function t(){Ic(`appender creating socket to ${e.host||"localhost"}:${e.port||5e3}`),i=`${e.endMsg||"__LOG4JS__"}`,u=kc.createConnection(e.port||5e3,e.host||"localhost"),u.on("connect",(()=>{Ic("socket connected"),c(),n=!0})),u.on("drain",(()=>{Ic("drain event received, emptying buffer"),n=!0,c()})),u.on("timeout",u.end.bind(u)),u.on("error",(e=>{Ic("connection error",e),n=!1,c()})),u.on("close",t)}(),a.shutdown=function(e){Ic("shutdown called"),r.length&&o?(Ic("buffer has items, waiting 100ms to empty"),o-=1,setTimeout((()=>{a.shutdown(e)}),100)):(u.removeAllListeners("close"),u.end(e))},a}(e,n)};const xc=e,Nc=Zn.exports("log4js:appenders"),Rc=Fr,Tc=Au,Mc=Gr,Lc=Lr,jc=vu,$c=new Map;$c.set("console",_u),$c.set("stdout",Bu),$c.set("stderr",Pu),$c.set("logLevelFilter",Iu),$c.set("categoryFilter",ku),$c.set("noLogFilter",Nu),$c.set("file",Tu),$c.set("dateFile",yc),$c.set("fileSync",Ac),$c.set("tcp",Pc);const Hc=new Map,Gc=(e,t)=>{let n;try{const t=`${e}.cjs`;n=require.resolve(t),Nc("Loading module from ",t)}catch(t){n=e,Nc("Loading module from ",e)}try{return require(n)}catch(n){return void Rc.throwExceptionIf(t,"MODULE_NOT_FOUND"!==n.code,`appender "${e}" could not be loaded (error was: ${n})`)}},Vc=new Set,Uc=(e,t)=>{if(Hc.has(e))return Hc.get(e);if(!t.appenders[e])return!1;if(Vc.has(e))throw new Error(`Dependency loop detected for appender ${e}.`);Vc.add(e),Nc(`Creating appender ${e}`);const n=Jc(e,t);return Vc.delete(e),Hc.set(e,n),n},Jc=(e,t)=>{const n=t.appenders[e],r=n.type.configure?n.type:((e,t)=>$c.get(e)||Gc(`./${e}`,t)||Gc(e,t)||require.main&&require.main.filename&&Gc(xc.join(xc.dirname(require.main.filename),e),t)||Gc(xc.join(process.cwd(),e),t))(n.type,t);return Rc.throwExceptionIf(t,Rc.not(r),`appender "${e}" is not valid (type "${n.type}" could not be found)`),r.appender&&(process.emitWarning(`Appender ${n.type} exports an appender function.`,"DeprecationWarning","log4js-node-DEP0001"),Nc("[log4js-node-DEP0001]",`DEPRECATION: Appender ${n.type} exports an appender function.`)),r.shutdown&&(process.emitWarning(`Appender ${n.type} exports a shutdown function.`,"DeprecationWarning","log4js-node-DEP0002"),Nc("[log4js-node-DEP0002]",`DEPRECATION: Appender ${n.type} exports a shutdown function.`)),Nc(`${e}: clustering.isMaster ? ${Tc.isMaster()}`),Nc(`${e}: appenderModule is ${i.inspect(r)}`),Tc.onlyOnMaster((()=>(Nc(`calling appenderModule.configure for ${e} / ${n.type}`),r.configure(jc.modifyConfig(n),Lc,(e=>Uc(e,t)),Mc))),(()=>{}))},Wc=e=>{if(Hc.clear(),Vc.clear(),!e)return;const t=[];Object.values(e.categories).forEach((e=>{t.push(...e.appenders)})),Object.keys(e.appenders).forEach((n=>{(t.includes(n)||"tcp-server"===e.appenders[n].type||"multiprocess"===e.appenders[n].type)&&Uc(n,e)}))},zc=()=>{Wc()};zc(),Rc.addListener((e=>{Rc.throwExceptionIf(e,Rc.not(Rc.anObject(e.appenders)),'must have a property "appenders" of type object.');const t=Object.keys(e.appenders);Rc.throwExceptionIf(e,Rc.not(t.length),"must define at least one appender."),t.forEach((t=>{Rc.throwExceptionIf(e,Rc.not(e.appenders[t].type),`appender "${t}" is not valid (must be an object with property "type")`)}))})),Rc.addListener(Wc),Vr.exports=Hc,Vr.exports.init=zc;var Kc={exports:{}};!function(e){const t=Zn.exports("log4js:categories"),n=Fr,r=Gr,u=Vr.exports,o=new Map;function i(e,t,n){if(!1===t.inherit)return;const r=n.lastIndexOf(".");if(r<0)return;const u=n.slice(0,r);let o=e.categories[u];o||(o={inherit:!0,appenders:[]}),i(e,o,u),!e.categories[u]&&o.appenders&&o.appenders.length&&o.level&&(e.categories[u]=o),t.appenders=t.appenders||[],t.level=t.level||o.level,o.appenders.forEach((e=>{t.appenders.includes(e)||t.appenders.push(e)})),t.parent=o}function s(e){if(!e.categories)return;Object.keys(e.categories).forEach((t=>{const n=e.categories[t];i(e,n,t)}))}n.addPreProcessingListener((e=>s(e))),n.addListener((e=>{n.throwExceptionIf(e,n.not(n.anObject(e.categories)),'must have a property "categories" of type object.');const t=Object.keys(e.categories);n.throwExceptionIf(e,n.not(t.length),"must define at least one category."),t.forEach((t=>{const o=e.categories[t];n.throwExceptionIf(e,[n.not(o.appenders),n.not(o.level)],`category "${t}" is not valid (must be an object with properties "appenders" and "level")`),n.throwExceptionIf(e,n.not(Array.isArray(o.appenders)),`category "${t}" is not valid (appenders must be an array of appender names)`),n.throwExceptionIf(e,n.not(o.appenders.length),`category "${t}" is not valid (appenders must contain at least one appender name)`),Object.prototype.hasOwnProperty.call(o,"enableCallStack")&&n.throwExceptionIf(e,"boolean"!=typeof o.enableCallStack,`category "${t}" is not valid (enableCallStack must be boolean type)`),o.appenders.forEach((r=>{n.throwExceptionIf(e,n.not(u.get(r)),`category "${t}" is not valid (appender "${r}" is not defined)`)})),n.throwExceptionIf(e,n.not(r.getLevel(o.level)),`category "${t}" is not valid (level "${o.level}" not recognised; valid levels are ${r.levels.join(", ")})`)})),n.throwExceptionIf(e,n.not(e.categories.default),'must define a "default" category.')}));const c=e=>{if(o.clear(),!e)return;Object.keys(e.categories).forEach((n=>{const i=e.categories[n],s=[];i.appenders.forEach((e=>{s.push(u.get(e)),t(`Creating category ${n}`),o.set(n,{appenders:s,level:r.getLevel(i.level),enableCallStack:i.enableCallStack||!1})}))}))},a=()=>{c()};a(),n.addListener(c);const l=e=>{if(t(`configForCategory: searching for config for ${e}`),o.has(e))return t(`configForCategory: ${e} exists in config, returning it`),o.get(e);let n;return e.indexOf(".")>0?(t(`configForCategory: ${e} has hierarchy, cloning from parents`),n={...l(e.slice(0,e.lastIndexOf(".")))}):(o.has("default")||c({categories:{default:{appenders:["out"],level:"OFF"}}}),t("configForCategory: cloning default category"),n={...o.get("default")}),o.set(e,n),n};e.exports=o,e.exports=Object.assign(e.exports,{appendersForCategory:e=>l(e).appenders,getLevelForCategory:e=>l(e).level,setLevelForCategory:(e,t)=>{l(e).level=t},getEnableCallStackForCategory:e=>!0===l(e).enableCallStack,setEnableCallStackForCategory:(e,t)=>{l(e).enableCallStack=t},init:a})}(Kc);const qc=Zn.exports("log4js:logger"),Yc=au,Zc=Gr,Xc=Au,Qc=Kc.exports,ea=Fr,ta=/at (?:(.+)\s+\()?(?:(.+?):(\d+)(?::(\d+))?|([^)]+))\)?/;function na(e,t=4){try{const n=e.stack.split("\n").slice(t);if(!n.length)return null;const r=ta.exec(n[0]);if(r&&6===r.length){let e="",t="",u="";return r[1]&&""!==r[1]&&([t,u]=r[1].replace(/[[\]]/g,"").split(" as "),u=u||"",t.includes(".")&&([e,t]=t.split("."))),{fileName:r[2],lineNumber:parseInt(r[3],10),columnNumber:parseInt(r[4],10),callStack:n.join("\n"),className:e,functionName:t,functionAlias:u,callerName:r[1]||""}}console.error("log4js.logger - defaultParseCallStack error")}catch(e){console.error("log4js.logger - defaultParseCallStack error",e)}return null}let ra=class{constructor(e){if(!e)throw new Error("No category provided.");this.category=e,this.context={},this.callStackSkipIndex=0,this.parseCallStack=na,qc(`Logger created (${this.category}, ${this.level})`)}get level(){return Zc.getLevel(Qc.getLevelForCategory(this.category),Zc.OFF)}set level(e){Qc.setLevelForCategory(this.category,Zc.getLevel(e,this.level))}get useCallStack(){return Qc.getEnableCallStackForCategory(this.category)}set useCallStack(e){Qc.setEnableCallStackForCategory(this.category,!0===e)}get callStackLinesToSkip(){return this.callStackSkipIndex}set callStackLinesToSkip(e){if("number"!=typeof e)throw new TypeError("Must be a number");if(e<0)throw new RangeError("Must be >= 0");this.callStackSkipIndex=e}log(e,...t){const n=Zc.getLevel(e);n?this.isLevelEnabled(n)&&this._log(n,t):ea.validIdentifier(e)&&t.length>0?(this.log(Zc.WARN,"log4js:logger.log: valid log-level not found as first parameter given:",e),this.log(Zc.INFO,`[${e}]`,...t)):this.log(Zc.INFO,e,...t)}isLevelEnabled(e){return this.level.isLessThanOrEqualTo(e)}_log(e,t){qc(`sending log data (${e}) to appenders`);const n=t.find((e=>e instanceof Error));let r;if(this.useCallStack){try{n&&(r=this.parseCallStack(n,this.callStackSkipIndex+1))}catch(e){}r=r||this.parseCallStack(new Error,this.callStackSkipIndex+3+1)}const u=new Yc(this.category,e,t,this.context,r,n);Xc.send(u)}addContext(e,t){this.context[e]=t}removeContext(e){delete this.context[e]}clearContext(){this.context={}}setParseCallStackFunction(e){if("function"==typeof e)this.parseCallStack=e;else{if(void 0!==e)throw new TypeError("Invalid type passed to setParseCallStackFunction");this.parseCallStack=na}}};function ua(e){const t=Zc.getLevel(e),n=t.toString().toLowerCase().replace(/_([a-z])/g,(e=>e[1].toUpperCase())),r=n[0].toUpperCase()+n.slice(1);ra.prototype[`is${r}Enabled`]=function(){return this.isLevelEnabled(t)},ra.prototype[n]=function(...e){this.log(t,...e)}}Zc.levels.forEach(ua),ea.addListener((()=>{Zc.levels.forEach(ua)}));var oa=ra;const ia=Gr;function sa(e){return e.originalUrl||e.url}function ca(e,t){for(let n=0;n<t.length;n++)e=e.replace(t[n].token,t[n].replacement);return e}const aa=Zn.exports("log4js:recording"),la=[];function fa(){return la.slice()}function da(){la.length=0}var Da={configure:function(){return function(e){aa(`received logEvent, number of events now ${la.length+1}`),aa("log event was ",e),la.push(e)}},replay:fa,playback:fa,reset:da,erase:da};const pa=Zn.exports("log4js:main"),ha=n,Ea=fr({proto:!0}),ma=Fr,ya=Lr,Ca=Gr,Fa=Vr.exports,ga=Kc.exports,Aa=oa,va=Au,Sa=function(e,t){t="string"==typeof t||"function"==typeof t?{format:t}:t||{};const n=e;let r=ia.getLevel(t.level,ia.INFO);const u=t.format||':remote-addr - - ":method :url HTTP/:http-version" :status :content-length ":referrer" ":user-agent"';return(e,o,i)=>{if(void 0!==e._logging)return i();if("function"!=typeof t.nolog){const n=function(e){let t=null;if(e instanceof RegExp&&(t=e),"string"==typeof e&&(t=new RegExp(e)),Array.isArray(e)){const n=e.map((e=>e.source?e.source:e));t=new RegExp(n.join("|"))}return t}(t.nolog);if(n&&n.test(e.originalUrl))return i()}if(n.isLevelEnabled(r)||"auto"===t.level){const i=new Date,{writeHead:s}=o;e._logging=!0,o.writeHead=(e,t)=>{o.writeHead=s,o.writeHead(e,t),o.__statusCode=e,o.__headers=t||{}};let c=!1;const a=()=>{if(c)return;if(c=!0,"function"==typeof t.nolog&&!0===t.nolog(e,o))return void(e._logging=!1);o.responseTime=new Date-i,o.statusCode&&"auto"===t.level&&(r=ia.INFO,o.statusCode>=300&&(r=ia.WARN),o.statusCode>=400&&(r=ia.ERROR)),r=function(e,t,n){let r=t;if(n){const t=n.find((t=>{let n=!1;return n=t.from&&t.to?e>=t.from&&e<=t.to:-1!==t.codes.indexOf(e),n}));t&&(r=ia.getLevel(t.level,r))}return r}(o.statusCode,r,t.statusRules);const s=function(e,t,n){const r=[];return r.push({token:":url",replacement:sa(e)}),r.push({token:":protocol",replacement:e.protocol}),r.push({token:":hostname",replacement:e.hostname}),r.push({token:":method",replacement:e.method}),r.push({token:":status",replacement:t.__statusCode||t.statusCode}),r.push({token:":response-time",replacement:t.responseTime}),r.push({token:":date",replacement:(new Date).toUTCString()}),r.push({token:":referrer",replacement:e.headers.referer||e.headers.referrer||""}),r.push({token:":http-version",replacement:`${e.httpVersionMajor}.${e.httpVersionMinor}`}),r.push({token:":remote-addr",replacement:e.headers["x-forwarded-for"]||e.ip||e._remoteAddress||e.socket&&(e.socket.remoteAddress||e.socket.socket&&e.socket.socket.remoteAddress)}),r.push({token:":user-agent",replacement:e.headers["user-agent"]}),r.push({token:":content-length",replacement:t.getHeader("content-length")||t.__headers&&t.__headers["Content-Length"]||"-"}),r.push({token:/:req\[([^\]]+)]/g,replacement:(t,n)=>e.headers[n.toLowerCase()]}),r.push({token:/:res\[([^\]]+)]/g,replacement:(e,n)=>t.getHeader(n.toLowerCase())||t.__headers&&t.__headers[n]}),(e=>{const t=e.concat();for(let e=0;e<t.length;++e)for(let n=e+1;n<t.length;++n)t[e].token==t[n].token&&t.splice(n--,1);return t})(n.concat(r))}(e,o,t.tokens||[]);if(t.context&&n.addContext("res",o),"function"==typeof u){const t=u(e,o,(e=>ca(e,s)));t&&n.log(r,t)}else n.log(r,ca(u,s));t.context&&n.removeContext("res")};o.on("end",a),o.on("finish",a),o.on("error",a),o.on("close",a)}return i()}},wa=Da;let Oa=!1;function _a(e){if(!Oa)return;pa("Received log event ",e);ga.appendersForCategory(e.categoryName).forEach((t=>{t(e)}))}function ba(e){Oa&&Ba();let t=e;return"string"==typeof t&&(t=function(e){pa(`Loading configuration from ${e}`);try{return JSON.parse(ha.readFileSync(e,"utf8"))}catch(t){throw new Error(`Problem reading config from file "${e}". Error was ${t.message}`,t)}}(e)),pa(`Configuration is ${t}`),ma.configure(Ea(t)),va.onMessage(_a),Oa=!0,Pa}function Ba(e=(()=>{})){if("function"!=typeof e)throw new TypeError("Invalid callback passed to shutdown");pa("Shutdown called. Disabling all log writing."),Oa=!1;const t=Array.from(Fa.values());Fa.init(),ga.init();const n=t.reduce(((e,t)=>t.shutdown?e+1:e),0);0===n&&(pa("No appenders with shutdown functions found."),e());let r,u=0;function o(t){r=r||t,u+=1,pa(`Appender shutdowns complete: ${u} / ${n}`),u>=n&&(pa("All shutdown functions completed."),e(r))}pa(`Found ${n} appenders with shutdown functions.`),t.filter((e=>e.shutdown)).forEach((e=>e.shutdown(o)))}const Pa={getLogger:function(e){return Oa||ba(process.env.LOG4JS_CONFIG||{appenders:{out:{type:"stdout"}},categories:{default:{appenders:["out"],level:"OFF"}}}),new Aa(e||"default")},configure:ba,shutdown:Ba,connectLogger:Sa,levels:Ca,addLayout:ya.addLayout,recording:function(){return wa}};var Ia=Pa;!function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.addCustomPlugin=e.addCustomTask=e.hvigorTrace=void 0;const t=Ia;e.hvigorTrace={totalTime:0,moduleNum:0,taskTime:{},isIncremental:!0,hasIncremental:!1,isParallel:!0,IS_DAEMON:!0,LOG_LEVEL:t.levels.INFO.levelStr,IS_HVIGORFILE_TYPE_CHECK:!1},e.addCustomTask=function(t){var n;let r=null!==(n=e.hvigorTrace.CUSTOM_TASKS)&&void 0!==n?n:[];r.length>0&&(r=r.filter((e=>e.NAME!==t.NAME))),r.push(t),e.hvigorTrace.CUSTOM_TASKS=r},e.addCustomPlugin=function(t){var n;let r=null!==(n=e.hvigorTrace.CUSTOM_PLUGINS)&&void 0!==n?n:[];r.length>0&&(r=r.filter((e=>e.PLUGIN_ID!==t.PLUGIN_ID))),r.push({PLUGIN_ID:t.PLUGIN_ID}),e.hvigorTrace.CUSTOM_PLUGINS=r}}(Yn);var ka,xa={};ka=xa,Object.defineProperty(ka,"__esModule",{value:!0}),ka.isCI=void 0,ka.isCI=function(){return!("false"===process.env.CI||!(process.env.BUILD_ID||process.env.BUILD_NUMBER||process.env.CI||process.env.CI_APP_ID||process.env.CI_BUILD_ID||process.env.CI_BUILD_NUMBER||process.env.CI_NAME||process.env.CONTINUOUS_INTEGRATION||process.env.RUN_ID||ka.name))};var Na={};!function(e){var t=p&&p.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(e,"__esModule",{value:!0}),e.hashFile=e.hash=e.createHash=void 0;const r=t(D),u=t(n);e.createHash=(e="MD5")=>r.default.createHash(e);e.hash=(t,n)=>(0,e.createHash)(n).update(t).digest("hex");e.hashFile=(t,n)=>{if(u.default.existsSync(t))return(0,e.hash)(u.default.readFileSync(t,"utf-8"),n)}}(Na);var Ra={},Ta={},Ma={};Object.defineProperty(Ma,"__esModule",{value:!0}),Ma.Unicode=void 0;class La{}Ma.Unicode=La,La.SPACE_SEPARATOR=/[\u1680\u2000-\u200A\u202F\u205F\u3000]/,La.ID_START=/[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u0860-\u086A\u08A0-\u08B4\u08B6-\u08BD\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u09FC\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0AF9\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58-\u0C5A\u0C60\u0C61\u0C80\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D54-\u0D56\u0D5F-\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u1884\u1887-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1C80-\u1C88\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312E\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FEA\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AE\uA7B0-\uA7B7\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA8FD\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDE80-\uDE9C\uDEA0-\uDED0\uDF00-\uDF1F\uDF2D-\uDF4A\uDF50-\uDF75\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDCB0-\uDCD3\uDCD8-\uDCFB\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDCE0-\uDCF2\uDCF4\uDCF5\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00\uDE10-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE4\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2]|\uD804[\uDC03-\uDC37\uDC83-\uDCAF\uDCD0-\uDCE8\uDD03-\uDD26\uDD50-\uDD72\uDD76\uDD83-\uDDB2\uDDC1-\uDDC4\uDDDA\uDDDC\uDE00-\uDE11\uDE13-\uDE2B\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEDE\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3D\uDF50\uDF5D-\uDF61]|\uD805[\uDC00-\uDC34\uDC47-\uDC4A\uDC80-\uDCAF\uDCC4\uDCC5\uDCC7\uDD80-\uDDAE\uDDD8-\uDDDB\uDE00-\uDE2F\uDE44\uDE80-\uDEAA\uDF00-\uDF19]|\uD806[\uDCA0-\uDCDF\uDCFF\uDE00\uDE0B-\uDE32\uDE3A\uDE50\uDE5C-\uDE83\uDE86-\uDE89\uDEC0-\uDEF8]|\uD807[\uDC00-\uDC08\uDC0A-\uDC2E\uDC40\uDC72-\uDC8F\uDD00-\uDD06\uDD08\uDD09\uDD0B-\uDD30\uDD46]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|[\uD80C\uD81C-\uD820\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872\uD874-\uD879][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDED0-\uDEED\uDF00-\uDF2F\uDF40-\uDF43\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50\uDF93-\uDF9F\uDFE0\uDFE1]|\uD821[\uDC00-\uDFEC]|\uD822[\uDC00-\uDEF2]|\uD82C[\uDC00-\uDD1E\uDD70-\uDEFB]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB]|\uD83A[\uDC00-\uDCC4\uDD00-\uDD43]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1\uDEB0-\uDFFF]|\uD87A[\uDC00-\uDFE0]|\uD87E[\uDC00-\uDE1D]/,La.ID_CONTINUE=/[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u05D0-\u05EA\u05F0-\u05F2\u0610-\u061A\u0620-\u0669\u066E-\u06D3\u06D5-\u06DC\u06DF-\u06E8\u06EA-\u06FC\u06FF\u0710-\u074A\u074D-\u07B1\u07C0-\u07F5\u07FA\u0800-\u082D\u0840-\u085B\u0860-\u086A\u08A0-\u08B4\u08B6-\u08BD\u08D4-\u08E1\u08E3-\u0963\u0966-\u096F\u0971-\u0983\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BC-\u09C4\u09C7\u09C8\u09CB-\u09CE\u09D7\u09DC\u09DD\u09DF-\u09E3\u09E6-\u09F1\u09FC\u0A01-\u0A03\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A59-\u0A5C\u0A5E\u0A66-\u0A75\u0A81-\u0A83\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABC-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AD0\u0AE0-\u0AE3\u0AE6-\u0AEF\u0AF9-\u0AFF\u0B01-\u0B03\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3C-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B5C\u0B5D\u0B5F-\u0B63\u0B66-\u0B6F\u0B71\u0B82\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD0\u0BD7\u0BE6-\u0BEF\u0C00-\u0C03\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C58-\u0C5A\u0C60-\u0C63\u0C66-\u0C6F\u0C80-\u0C83\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBC-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CDE\u0CE0-\u0CE3\u0CE6-\u0CEF\u0CF1\u0CF2\u0D00-\u0D03\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D44\u0D46-\u0D48\u0D4A-\u0D4E\u0D54-\u0D57\u0D5F-\u0D63\u0D66-\u0D6F\u0D7A-\u0D7F\u0D82\u0D83\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DE6-\u0DEF\u0DF2\u0DF3\u0E01-\u0E3A\u0E40-\u0E4E\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB9\u0EBB-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F18\u0F19\u0F20-\u0F29\u0F35\u0F37\u0F39\u0F3E-\u0F47\u0F49-\u0F6C\u0F71-\u0F84\u0F86-\u0F97\u0F99-\u0FBC\u0FC6\u1000-\u1049\u1050-\u109D\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u135D-\u135F\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176C\u176E-\u1770\u1772\u1773\u1780-\u17D3\u17D7\u17DC\u17DD\u17E0-\u17E9\u180B-\u180D\u1810-\u1819\u1820-\u1877\u1880-\u18AA\u18B0-\u18F5\u1900-\u191E\u1920-\u192B\u1930-\u193B\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19D9\u1A00-\u1A1B\u1A20-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AA7\u1AB0-\u1ABD\u1B00-\u1B4B\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1BF3\u1C00-\u1C37\u1C40-\u1C49\u1C4D-\u1C7D\u1C80-\u1C88\u1CD0-\u1CD2\u1CD4-\u1CF9\u1D00-\u1DF9\u1DFB-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u203F\u2040\u2054\u2071\u207F\u2090-\u209C\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D7F-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2DE0-\u2DFF\u2E2F\u3005-\u3007\u3021-\u302F\u3031-\u3035\u3038-\u303C\u3041-\u3096\u3099\u309A\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312E\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FEA\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66F\uA674-\uA67D\uA67F-\uA6F1\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AE\uA7B0-\uA7B7\uA7F7-\uA827\uA840-\uA873\uA880-\uA8C5\uA8D0-\uA8D9\uA8E0-\uA8F7\uA8FB\uA8FD\uA900-\uA92D\uA930-\uA953\uA960-\uA97C\uA980-\uA9C0\uA9CF-\uA9D9\uA9E0-\uA9FE\uAA00-\uAA36\uAA40-\uAA4D\uAA50-\uAA59\uAA60-\uAA76\uAA7A-\uAAC2\uAADB-\uAADD\uAAE0-\uAAEF\uAAF2-\uAAF6\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABEA\uABEC\uABED\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE00-\uFE0F\uFE20-\uFE2F\uFE33\uFE34\uFE4D-\uFE4F\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF3F\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDDFD\uDE80-\uDE9C\uDEA0-\uDED0\uDEE0\uDF00-\uDF1F\uDF2D-\uDF4A\uDF50-\uDF7A\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDCA0-\uDCA9\uDCB0-\uDCD3\uDCD8-\uDCFB\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDCE0-\uDCF2\uDCF4\uDCF5\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00-\uDE03\uDE05\uDE06\uDE0C-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE38-\uDE3A\uDE3F\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE6\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2]|\uD804[\uDC00-\uDC46\uDC66-\uDC6F\uDC7F-\uDCBA\uDCD0-\uDCE8\uDCF0-\uDCF9\uDD00-\uDD34\uDD36-\uDD3F\uDD50-\uDD73\uDD76\uDD80-\uDDC4\uDDCA-\uDDCC\uDDD0-\uDDDA\uDDDC\uDE00-\uDE11\uDE13-\uDE37\uDE3E\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEEA\uDEF0-\uDEF9\uDF00-\uDF03\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3C-\uDF44\uDF47\uDF48\uDF4B-\uDF4D\uDF50\uDF57\uDF5D-\uDF63\uDF66-\uDF6C\uDF70-\uDF74]|\uD805[\uDC00-\uDC4A\uDC50-\uDC59\uDC80-\uDCC5\uDCC7\uDCD0-\uDCD9\uDD80-\uDDB5\uDDB8-\uDDC0\uDDD8-\uDDDD\uDE00-\uDE40\uDE44\uDE50-\uDE59\uDE80-\uDEB7\uDEC0-\uDEC9\uDF00-\uDF19\uDF1D-\uDF2B\uDF30-\uDF39]|\uD806[\uDCA0-\uDCE9\uDCFF\uDE00-\uDE3E\uDE47\uDE50-\uDE83\uDE86-\uDE99\uDEC0-\uDEF8]|\uD807[\uDC00-\uDC08\uDC0A-\uDC36\uDC38-\uDC40\uDC50-\uDC59\uDC72-\uDC8F\uDC92-\uDCA7\uDCA9-\uDCB6\uDD00-\uDD06\uDD08\uDD09\uDD0B-\uDD36\uDD3A\uDD3C\uDD3D\uDD3F-\uDD47\uDD50-\uDD59]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|[\uD80C\uD81C-\uD820\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872\uD874-\uD879][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDE60-\uDE69\uDED0-\uDEED\uDEF0-\uDEF4\uDF00-\uDF36\uDF40-\uDF43\uDF50-\uDF59\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50-\uDF7E\uDF8F-\uDF9F\uDFE0\uDFE1]|\uD821[\uDC00-\uDFEC]|\uD822[\uDC00-\uDEF2]|\uD82C[\uDC00-\uDD1E\uDD70-\uDEFB]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99\uDC9D\uDC9E]|\uD834[\uDD65-\uDD69\uDD6D-\uDD72\uDD7B-\uDD82\uDD85-\uDD8B\uDDAA-\uDDAD\uDE42-\uDE44]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB\uDFCE-\uDFFF]|\uD836[\uDE00-\uDE36\uDE3B-\uDE6C\uDE75\uDE84\uDE9B-\uDE9F\uDEA1-\uDEAF]|\uD838[\uDC00-\uDC06\uDC08-\uDC18\uDC1B-\uDC21\uDC23\uDC24\uDC26-\uDC2A]|\uD83A[\uDC00-\uDCC4\uDCD0-\uDCD6\uDD00-\uDD4A\uDD50-\uDD59]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1\uDEB0-\uDFFF]|\uD87A[\uDC00-\uDFE0]|\uD87E[\uDC00-\uDE1D]|\uDB40[\uDD00-\uDDEF]/,Object.defineProperty(Ta,"__esModule",{value:!0}),Ta.JudgeUtil=void 0;const ja=Ma;Ta.JudgeUtil=class{static isIgnoreChar(e){return"string"==typeof e&&("\t"===e||"\v"===e||"\f"===e||" "===e||" "===e||"\ufeff"===e||"\n"===e||"\r"===e||"\u2028"===e||"\u2029"===e)}static isSpaceSeparator(e){return"string"==typeof e&&ja.Unicode.SPACE_SEPARATOR.test(e)}static isIdStartChar(e){return"string"==typeof e&&(e>="a"&&e<="z"||e>="A"&&e<="Z"||"$"===e||"_"===e||ja.Unicode.ID_START.test(e))}static isIdContinueChar(e){return"string"==typeof e&&(e>="a"&&e<="z"||e>="A"&&e<="Z"||e>="0"&&e<="9"||"$"===e||"_"===e||"‌"===e||"‍"===e||ja.Unicode.ID_CONTINUE.test(e))}static isDigitWithoutZero(e){return/[1-9]/.test(e)}static isDigit(e){return"string"==typeof e&&/[0-9]/.test(e)}static isHexDigit(e){return"string"==typeof e&&/[0-9A-Fa-f]/.test(e)}};var $a=p&&p.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(Ra,"__esModule",{value:!0}),Ra.parseJsonText=Ra.parseJsonFile=void 0;const Ha=$a(n),Ga=$a(t),Va=$a(e),Ua=Ta;var Ja;!function(e){e[e.Char=0]="Char",e[e.EOF=1]="EOF",e[e.Identifier=2]="Identifier"}(Ja||(Ja={}));let Wa,za,Ka,qa,Ya,Za,Xa="start",Qa=[],el=0,tl=1,nl=0,rl=!1,ul="default",ol="'",il=1;function sl(e,t=!1){za=String(e),Xa="start",Qa=[],el=0,tl=1,nl=0,qa=void 0,rl=t;do{Wa=cl(),hl[Xa]()}while("eof"!==Wa.type);return qa}function cl(){for(ul="default",Ya="",ol="'",il=1;;){Za=al();const e=fl[ul]();if(e)return e}}function al(){if(za[el])return String.fromCodePoint(za.codePointAt(el))}function ll(){const e=al();return"\n"===e?(tl++,nl=0):e?nl+=e.length:nl++,e&&(el+=e.length),e}Ra.parseJsonFile=function(e,t=!1,n="utf-8"){const r=Ha.default.readFileSync(Va.default.resolve(e),{encoding:n});try{return sl(r,t)}catch(t){if(t instanceof SyntaxError){const n=t.message.split("at");if(2===n.length)throw new Error(`${n[0].trim()}${Ga.default.EOL}\t at ${e}:${n[1].trim()}`)}throw new Error(`${e} is not in valid JSON/JSON5 format.`)}},Ra.parseJsonText=sl;const fl={default(){switch(Za){case"/":return ll(),void(ul="comment");case void 0:return ll(),dl("eof")}if(!Ua.JudgeUtil.isIgnoreChar(Za)&&!Ua.JudgeUtil.isSpaceSeparator(Za))return fl[Xa]();ll()},start(){ul="value"},beforePropertyName(){switch(Za){case"$":case"_":return Ya=ll(),void(ul="identifierName");case"\\":return ll(),void(ul="identifierNameStartEscape");case"}":return dl("punctuator",ll());case'"':case"'":return ol=Za,ll(),void(ul="string")}if(Ua.JudgeUtil.isIdStartChar(Za))return Ya+=ll(),void(ul="identifierName");throw Cl(Ja.Char,ll())},afterPropertyName(){if(":"===Za)return dl("punctuator",ll());throw Cl(Ja.Char,ll())},beforePropertyValue(){ul="value"},afterPropertyValue(){switch(Za){case",":case"}":return dl("punctuator",ll())}throw Cl(Ja.Char,ll())},beforeArrayValue(){if("]"===Za)return dl("punctuator",ll());ul="value"},afterArrayValue(){switch(Za){case",":case"]":return dl("punctuator",ll())}throw Cl(Ja.Char,ll())},end(){throw Cl(Ja.Char,ll())},comment(){switch(Za){case"*":return ll(),void(ul="multiLineComment");case"/":return ll(),void(ul="singleLineComment")}throw Cl(Ja.Char,ll())},multiLineComment(){switch(Za){case"*":return ll(),void(ul="multiLineCommentAsterisk");case void 0:throw Cl(Ja.Char,ll())}ll()},multiLineCommentAsterisk(){switch(Za){case"*":return void ll();case"/":return ll(),void(ul="default");case void 0:throw Cl(Ja.Char,ll())}ll(),ul="multiLineComment"},singleLineComment(){switch(Za){case"\n":case"\r":case"\u2028":case"\u2029":return ll(),void(ul="default");case void 0:return ll(),dl("eof")}ll()},value(){switch(Za){case"{":case"[":return dl("punctuator",ll());case"n":return ll(),Dl("ull"),dl("null",null);case"t":return ll(),Dl("rue"),dl("boolean",!0);case"f":return ll(),Dl("alse"),dl("boolean",!1);case"-":case"+":return"-"===ll()&&(il=-1),void(ul="numerical");case".":case"0":case"I":case"N":return void(ul="numerical");case'"':case"'":return ol=Za,ll(),Ya="",void(ul="string")}if(void 0===Za||!Ua.JudgeUtil.isDigitWithoutZero(Za))throw Cl(Ja.Char,ll());ul="numerical"},numerical(){switch(Za){case".":return Ya=ll(),void(ul="decimalPointLeading");case"0":return Ya=ll(),void(ul="zero");case"I":return ll(),Dl("nfinity"),dl("numeric",il*(1/0));case"N":return ll(),Dl("aN"),dl("numeric",NaN)}if(void 0!==Za&&Ua.JudgeUtil.isDigitWithoutZero(Za))return Ya=ll(),void(ul="decimalInteger");throw Cl(Ja.Char,ll())},zero(){switch(Za){case".":case"e":case"E":return void(ul="decimal");case"x":case"X":return Ya+=ll(),void(ul="hexadecimal")}return dl("numeric",0)},decimalInteger(){switch(Za){case".":case"e":case"E":return void(ul="decimal")}if(!Ua.JudgeUtil.isDigit(Za))return dl("numeric",il*Number(Ya));Ya+=ll()},decimal(){switch(Za){case".":Ya+=ll(),ul="decimalFraction";break;case"e":case"E":Ya+=ll(),ul="decimalExponent"}},decimalPointLeading(){if(Ua.JudgeUtil.isDigit(Za))return Ya+=ll(),void(ul="decimalFraction");throw Cl(Ja.Char,ll())},decimalFraction(){switch(Za){case"e":case"E":return Ya+=ll(),void(ul="decimalExponent")}if(!Ua.JudgeUtil.isDigit(Za))return dl("numeric",il*Number(Ya));Ya+=ll()},decimalExponent(){switch(Za){case"+":case"-":return Ya+=ll(),void(ul="decimalExponentSign")}if(Ua.JudgeUtil.isDigit(Za))return Ya+=ll(),void(ul="decimalExponentInteger");throw Cl(Ja.Char,ll())},decimalExponentSign(){if(Ua.JudgeUtil.isDigit(Za))return Ya+=ll(),void(ul="decimalExponentInteger");throw Cl(Ja.Char,ll())},decimalExponentInteger(){if(!Ua.JudgeUtil.isDigit(Za))return dl("numeric",il*Number(Ya));Ya+=ll()},hexadecimal(){if(Ua.JudgeUtil.isHexDigit(Za))return Ya+=ll(),void(ul="hexadecimalInteger");throw Cl(Ja.Char,ll())},hexadecimalInteger(){if(!Ua.JudgeUtil.isHexDigit(Za))return dl("numeric",il*Number(Ya));Ya+=ll()},identifierNameStartEscape(){if("u"!==Za)throw Cl(Ja.Char,ll());ll();const e=pl();switch(e){case"$":case"_":break;default:if(!Ua.JudgeUtil.isIdStartChar(e))throw Cl(Ja.Identifier)}Ya+=e,ul="identifierName"},identifierName(){switch(Za){case"$":case"_":case"‌":case"‍":return void(Ya+=ll());case"\\":return ll(),void(ul="identifierNameEscape")}if(!Ua.JudgeUtil.isIdContinueChar(Za))return dl("identifier",Ya);Ya+=ll()},identifierNameEscape(){if("u"!==Za)throw Cl(Ja.Char,ll());ll();const e=pl();switch(e){case"$":case"_":case"‌":case"‍":break;default:if(!Ua.JudgeUtil.isIdContinueChar(e))throw Cl(Ja.Identifier)}Ya+=e,ul="identifierName"},string(){switch(Za){case"\\":return ll(),void(Ya+=function(){const e=al(),t=function(){switch(al()){case"b":return ll(),"\b";case"f":return ll(),"\f";case"n":return ll(),"\n";case"r":return ll(),"\r";case"t":return ll(),"\t";case"v":return ll(),"\v"}return}();if(t)return t;switch(e){case"0":if(ll(),Ua.JudgeUtil.isDigit(al()))throw Cl(Ja.Char,ll());return"\0";case"x":return ll(),function(){let e="",t=al();if(!Ua.JudgeUtil.isHexDigit(t))throw Cl(Ja.Char,ll());if(e+=ll(),t=al(),!Ua.JudgeUtil.isHexDigit(t))throw Cl(Ja.Char,ll());return e+=ll(),String.fromCodePoint(parseInt(e,16))}();case"u":return ll(),pl();case"\n":case"\u2028":case"\u2029":return ll(),"";case"\r":return ll(),"\n"===al()&&ll(),""}if(void 0===e||Ua.JudgeUtil.isDigitWithoutZero(e))throw Cl(Ja.Char,ll());return ll()}());case'"':case"'":if(Za===ol){const e=dl("string",Ya);return ll(),e}return void(Ya+=ll());case"\n":case"\r":case void 0:throw Cl(Ja.Char,ll());case"\u2028":case"\u2029":!function(e){console.warn(`JSON5: '${yl(e)}' in strings is not valid ECMAScript; consider escaping.`)}(Za)}Ya+=ll()}};function dl(e,t){return{type:e,value:t,line:tl,column:nl}}function Dl(e){for(const t of e){if(al()!==t)throw Cl(Ja.Char,ll());ll()}}function pl(){let e="",t=4;for(;t-- >0;){const t=al();if(!Ua.JudgeUtil.isHexDigit(t))throw Cl(Ja.Char,ll());e+=ll()}return String.fromCodePoint(parseInt(e,16))}const hl={start(){if("eof"===Wa.type)throw Cl(Ja.EOF);El()},beforePropertyName(){switch(Wa.type){case"identifier":case"string":return Ka=Wa.value,void(Xa="afterPropertyName");case"punctuator":return void ml();case"eof":throw Cl(Ja.EOF)}},afterPropertyName(){if("eof"===Wa.type)throw Cl(Ja.EOF);Xa="beforePropertyValue"},beforePropertyValue(){if("eof"===Wa.type)throw Cl(Ja.EOF);El()},afterPropertyValue(){if("eof"===Wa.type)throw Cl(Ja.EOF);switch(Wa.value){case",":return void(Xa="beforePropertyName");case"}":ml()}},beforeArrayValue(){if("eof"===Wa.type)throw Cl(Ja.EOF);"punctuator"!==Wa.type||"]"!==Wa.value?El():ml()},afterArrayValue(){if("eof"===Wa.type)throw Cl(Ja.EOF);switch(Wa.value){case",":return void(Xa="beforeArrayValue");case"]":ml()}},end(){}};function El(){const e=function(){let e;switch(Wa.type){case"punctuator":switch(Wa.value){case"{":e={};break;case"[":e=[]}break;case"null":case"boolean":case"numeric":case"string":e=Wa.value}return e}();if(rl&&"object"==typeof e&&(e._line=tl,e._column=nl),void 0===qa)qa=e;else{const t=Qa[Qa.length-1];Array.isArray(t)?rl&&"object"!=typeof e?t.push({value:e,_line:tl,_column:nl}):t.push(e):t[Ka]=rl&&"object"!=typeof e?{value:e,_line:tl,_column:nl}:e}!function(e){if(e&&"object"==typeof e)Qa.push(e),Xa=Array.isArray(e)?"beforeArrayValue":"beforePropertyName";else{const e=Qa[Qa.length-1];Xa=e?Array.isArray(e)?"afterArrayValue":"afterPropertyValue":"end"}}(e)}function ml(){Qa.pop();const e=Qa[Qa.length-1];Xa=e?Array.isArray(e)?"afterArrayValue":"afterPropertyValue":"end"}function yl(e){const t={"'":"\\'",'"':'\\"',"\\":"\\\\","\b":"\\b","\f":"\\f","\n":"\\n","\r":"\\r","\t":"\\t","\v":"\\v","\0":"\\0","\u2028":"\\u2028","\u2029":"\\u2029"};if(t[e])return t[e];if(e<" "){const t=e.charCodeAt(0).toString(16);return`\\x${`00${t}`.substring(t.length)}`}return e}function Cl(e,t){let n="";switch(e){case Ja.Char:n=void 0===t?`JSON5: invalid end of input at ${tl}:${nl}`:`JSON5: invalid character '${yl(t)}' at ${tl}:${nl}`;break;case Ja.EOF:n=`JSON5: invalid end of input at ${tl}:${nl}`;break;case Ja.Identifier:nl-=5,n=`JSON5: invalid identifier character at ${tl}:${nl}`}const r=new Fl(n);return r.lineNumber=tl,r.columnNumber=nl,r}class Fl extends SyntaxError{}var gl={},Al={},vl={},Sl=p&&p.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(vl,"__esModule",{value:!0}),vl.getHvigorUserHomeCacheDir=void 0;const wl=Sl(qn),Ol=Sl(t),_l=Sl(e),bl=h;vl.getHvigorUserHomeCacheDir=function(){const e=_l.default.resolve(Ol.default.homedir(),bl.HVIGOR_USER_HOME_DIR_NAME),t=process.env.HVIGOR_USER_HOME;return void 0!==t&&_l.default.isAbsolute(t)?(wl.default.ensureDirSync(t),t):e},function(t){var n=p&&p.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(t,"__esModule",{value:!0}),t.HVIGOR_PROJECT_WRAPPER_HOME=t.HVIGOR_PROJECT_ROOT_DIR=t.HVIGOR_PROJECT_CACHES_HOME=t.HVIGOR_PNPM_STORE_PATH=t.HVIGOR_WRAPPER_PNPM_SCRIPT_PATH=t.HVIGOR_WRAPPER_TOOLS_HOME=t.HVIGOR_USER_HOME=void 0;const r=n(e),u=vl,o=h;t.HVIGOR_USER_HOME=(0,u.getHvigorUserHomeCacheDir)(),t.HVIGOR_WRAPPER_TOOLS_HOME=r.default.resolve(t.HVIGOR_USER_HOME,"wrapper","tools"),t.HVIGOR_WRAPPER_PNPM_SCRIPT_PATH=r.default.resolve(t.HVIGOR_WRAPPER_TOOLS_HOME,"node_modules",".bin",o.PNPM_TOOL),t.HVIGOR_PNPM_STORE_PATH=r.default.resolve(t.HVIGOR_USER_HOME,"caches"),t.HVIGOR_PROJECT_CACHES_HOME=r.default.resolve(t.HVIGOR_USER_HOME,o.PROJECT_CACHES),t.HVIGOR_PROJECT_ROOT_DIR=process.cwd(),t.HVIGOR_PROJECT_WRAPPER_HOME=r.default.resolve(t.HVIGOR_PROJECT_ROOT_DIR,o.HVIGOR)}(Al);var Bl={},Pl=p&&p.__createBinding||(Object.create?function(e,t,n,r){void 0===r&&(r=n);var u=Object.getOwnPropertyDescriptor(t,n);u&&!("get"in u?!t.__esModule:u.writable||u.configurable)||(u={enumerable:!0,get:function(){return t[n]}}),Object.defineProperty(e,r,u)}:function(e,t,n,r){void 0===r&&(r=n),e[r]=t[n]}),Il=p&&p.__setModuleDefault||(Object.create?function(e,t){Object.defineProperty(e,"default",{enumerable:!0,value:t})}:function(e,t){e.default=t}),kl=p&&p.__importStar||function(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)"default"!==n&&Object.prototype.hasOwnProperty.call(e,n)&&Pl(t,e,n);return Il(t,e),t},xl=p&&p.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(Bl,"__esModule",{value:!0}),Bl.isFileExists=Bl.offlinePluginConversion=Bl.executeCommand=Bl.getNpmPath=Bl.hasNpmPackInPaths=void 0;const Nl=r,Rl=xl(n),Tl=kl(e),Ml=h,Ll=O;Bl.hasNpmPackInPaths=function(e,t){try{return require.resolve(e,{paths:[...t]}),!0}catch(e){return!1}},Bl.getNpmPath=function(){const e=process.execPath;return Tl.join(Tl.dirname(e),Ml.NPM_TOOL)},Bl.executeCommand=function(e,t,n){0!==(0,Nl.spawnSync)(e,t,n).status&&(0,Ll.logErrorAndExit)(`Error: ${e} ${t} execute failed.See above for details.`)},Bl.offlinePluginConversion=function(e,t){return t.startsWith("file:")||t.endsWith(".tgz")?Tl.resolve(e,Ml.HVIGOR,t.replace("file:","")):t},Bl.isFileExists=function(e){return Rl.default.existsSync(e)&&Rl.default.statSync(e).isFile()},function(u){var o=p&&p.__createBinding||(Object.create?function(e,t,n,r){void 0===r&&(r=n);var u=Object.getOwnPropertyDescriptor(t,n);u&&!("get"in u?!t.__esModule:u.writable||u.configurable)||(u={enumerable:!0,get:function(){return t[n]}}),Object.defineProperty(e,r,u)}:function(e,t,n,r){void 0===r&&(r=n),e[r]=t[n]}),i=p&&p.__setModuleDefault||(Object.create?function(e,t){Object.defineProperty(e,"default",{enumerable:!0,value:t})}:function(e,t){e.default=t}),s=p&&p.__importStar||function(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)"default"!==n&&Object.prototype.hasOwnProperty.call(e,n)&&o(t,e,n);return i(t,e),t},c=p&&p.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(u,"__esModule",{value:!0}),u.executeInstallPnpm=u.isPnpmInstalled=u.environmentHandler=u.checkNpmConifg=u.PNPM_VERSION=void 0;const a=r,l=s(n),f=c(t),d=s(e),D=h,E=Al,m=Al,y=O,C=Bl;u.PNPM_VERSION="7.30.0",u.checkNpmConifg=function(){const e=d.resolve(E.HVIGOR_PROJECT_ROOT_DIR,".npmrc"),t=d.resolve(f.default.homedir(),".npmrc");if((0,C.isFileExists)(e)||(0,C.isFileExists)(t))return;const n=(0,C.getNpmPath)(),r=(0,a.spawnSync)(n,["config","get","prefix"],{cwd:E.HVIGOR_PROJECT_ROOT_DIR});if(0!==r.status||!r.stdout)return void(0,y.logErrorAndExit)("Error: The hvigor depends on the npmrc file. Configure the npmrc file first.");const u=d.resolve(`${r.stdout}`.replace(/[\r\n]/gi,""),".npmrc");(0,C.isFileExists)(u)||(0,y.logErrorAndExit)("Error: The hvigor depends on the npmrc file. Configure the npmrc file first.")},u.environmentHandler=function(){process.env["npm_config_update-notifier"]="false"},u.isPnpmInstalled=function(){return!!l.existsSync(m.HVIGOR_WRAPPER_PNPM_SCRIPT_PATH)&&(0,C.hasNpmPackInPaths)("pnpm",[m.HVIGOR_WRAPPER_TOOLS_HOME])},u.executeInstallPnpm=function(){(0,y.logInfo)(`Installing pnpm@${u.PNPM_VERSION}...`);const e=(0,C.getNpmPath)();!function(){const e=d.resolve(m.HVIGOR_WRAPPER_TOOLS_HOME,D.DEFAULT_PACKAGE_JSON);try{l.existsSync(m.HVIGOR_WRAPPER_TOOLS_HOME)||l.mkdirSync(m.HVIGOR_WRAPPER_TOOLS_HOME,{recursive:!0});const t={dependencies:{}};t.dependencies[D.PNPM]=u.PNPM_VERSION,l.writeFileSync(e,JSON.stringify(t))}catch(t){(0,y.logErrorAndExit)(`Error: EPERM: operation not permitted,create ${e} failed.`)}}(),(0,C.executeCommand)(e,["install","pnpm"],{cwd:m.HVIGOR_WRAPPER_TOOLS_HOME,stdio:["inherit","inherit","inherit"],env:process.env}),(0,y.logInfo)("Pnpm install success.")}}(gl);var jl={},$l={},Hl=p&&p.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty($l,"__esModule",{value:!0}),$l.getHvigorUserHomeCacheDir=void 0;const Gl=Hl(qn),Vl=Hl(t),Ul=Hl(e),Jl=h,Wl=O;let zl=!1;$l.getHvigorUserHomeCacheDir=function(){const e=Ul.default.resolve(Vl.default.homedir(),Jl.HVIGOR_USER_HOME_DIR_NAME),t=process.env.HVIGOR_USER_HOME;return void 0===t?e:Ul.default.isAbsolute(t)?Gl.default.existsSync(t)&&Gl.default.statSync(t).isFile()?((0,Wl.logInfo)(`File already exists: ${t}`),e):(Gl.default.ensureDirSync(t),t):(zl||((0,Wl.logInfo)(`Invalid custom userhome hvigor data dir:${t}`),zl=!0),e)},function(t){var n=p&&p.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(t,"__esModule",{value:!0}),t.HVIGOR_PROJECT_WRAPPER_HOME=t.HVIGOR_PROJECT_ROOT_DIR=t.HVIGOR_PNPM_STORE_PATH=t.HVIGOR_WRAPPER_PNPM_SCRIPT_PATH=t.HVIGOR_WRAPPER_TOOLS_HOME=t.HVIGOR_USER_HOME=void 0;const r=n(e),u=h,o=$l;t.HVIGOR_USER_HOME=(0,o.getHvigorUserHomeCacheDir)(),t.HVIGOR_WRAPPER_TOOLS_HOME=r.default.resolve(t.HVIGOR_USER_HOME,"wrapper","tools"),t.HVIGOR_WRAPPER_PNPM_SCRIPT_PATH=r.default.resolve(t.HVIGOR_WRAPPER_TOOLS_HOME,"node_modules",".bin",u.PNPM_TOOL),t.HVIGOR_PNPM_STORE_PATH=r.default.resolve(t.HVIGOR_USER_HOME,"caches"),t.HVIGOR_PROJECT_ROOT_DIR=process.cwd(),t.HVIGOR_PROJECT_WRAPPER_HOME=r.default.resolve(t.HVIGOR_PROJECT_ROOT_DIR,u.HVIGOR)}(jl);var Kl=p&&p.__createBinding||(Object.create?function(e,t,n,r){void 0===r&&(r=n);var u=Object.getOwnPropertyDescriptor(t,n);u&&!("get"in u?!t.__esModule:u.writable||u.configurable)||(u={enumerable:!0,get:function(){return t[n]}}),Object.defineProperty(e,r,u)}:function(e,t,n,r){void 0===r&&(r=n),e[r]=t[n]}),ql=p&&p.__setModuleDefault||(Object.create?function(e,t){Object.defineProperty(e,"default",{enumerable:!0,value:t})}:function(e,t){e.default=t}),Yl=p&&p.__importStar||function(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)"default"!==n&&Object.prototype.hasOwnProperty.call(e,n)&&Kl(t,e,n);return ql(t,e),t},Zl=p&&p.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(R,"__esModule",{value:!0});var Xl=R.initProjectWorkSpace=void 0;const Ql=Yl(n),ef=Zl(qn),tf=Zl(t),nf=Yl(e),rf=Zl(c),uf=Yn,of=h,sf=xa,cf=Na,af=Ra,lf=O,ff=gl,df=Bl,Df=jl;let pf,hf,Ef;function mf(e,t,n){return void 0!==n.dependencies&&(0,df.offlinePluginConversion)(Df.HVIGOR_PROJECT_ROOT_DIR,t.dependencies[e])===nf.normalize(n.dependencies[e])}Xl=R.initProjectWorkSpace=function(){if(pf=function(){const e=nf.resolve(Df.HVIGOR_PROJECT_WRAPPER_HOME,of.DEFAULT_HVIGOR_CONFIG_JSON_FILE_NAME);Ql.existsSync(e)||(0,lf.logErrorAndExit)(`Error: Hvigor config file ${e} does not exist.`);return(0,af.parseJsonFile)(e)}(),Ef=function(e){let t;t=!(0,sf.isCI)()&&function(e){const t=e.hvigorVersion;if(t.startsWith("file:")||t.endsWith(".tgz"))return!1;const n=e.dependencies,r=Object.getOwnPropertyNames(n);for(const e of r){const t=n[e];if(t.startsWith("file:")||t.endsWith(".tgz"))return!1}if(1===r.length&&"@ohos/hvigor-ohos-plugin"===r[0])return t>"2.5.0";return!1}(e)?function(e){let t=`${of.HVIGOR_ENGINE_PACKAGE_NAME}@${e.hvigorVersion}`;const n=e.dependencies;if(n){Object.getOwnPropertyNames(n).sort().forEach((e=>{t+=`,${e}@${n[e]}`}))}return(0,cf.hash)(t)}(e):(0,cf.hash)(rf.default.cwd());return nf.resolve(Df.HVIGOR_USER_HOME,"project_caches",t)}(pf),hf=function(){const e=nf.resolve(Ef,of.WORK_SPACE,of.DEFAULT_PACKAGE_JSON);return Ql.existsSync(e)?(0,af.parseJsonFile)(e):{dependencies:{}}}(),function(){const e=nf.resolve(Df.HVIGOR_USER_HOME,of.DEFAULT_HVIGOR_CONFIG_JSON_FILE_NAME);if(Ql.existsSync(e))(0,af.parseJsonFile)(e)}(),!(0,df.hasNpmPackInPaths)(of.HVIGOR_ENGINE_PACKAGE_NAME,[nf.join(Ef,of.WORK_SPACE)])||(0,df.offlinePluginConversion)(Df.HVIGOR_PROJECT_ROOT_DIR,pf.hvigorVersion)!==hf.dependencies[of.HVIGOR_ENGINE_PACKAGE_NAME]||!function(){function e(e){const t=null==e?void 0:e.dependencies;return void 0===t?0:Object.getOwnPropertyNames(t).length}const t=e(pf),n=e(hf);if(t+1!==n)return!1;for(const e in null==pf?void 0:pf.dependencies)if(!(0,df.hasNpmPackInPaths)(e,[nf.join(Ef,of.WORK_SPACE)])||!mf(e,pf,hf))return!1;return!0}())try{const e=rf.default.hrtime();(0,ff.checkNpmConifg)(),function(){(0,lf.logInfo)("Hvigor installing...");for(const e in pf.dependencies)pf.dependencies[e]&&(pf.dependencies[e]=(0,df.offlinePluginConversion)(Df.HVIGOR_PROJECT_ROOT_DIR,pf.dependencies[e]));const e={dependencies:{...pf.dependencies}};e.dependencies[of.HVIGOR_ENGINE_PACKAGE_NAME]=(0,df.offlinePluginConversion)(Df.HVIGOR_PROJECT_ROOT_DIR,pf.hvigorVersion);const t=nf.join(Ef,of.WORK_SPACE);try{Ql.mkdirSync(t,{recursive:!0});const n=nf.resolve(t,of.DEFAULT_PACKAGE_JSON);Ql.writeFileSync(n,JSON.stringify(e))}catch(e){(0,lf.logErrorAndExit)(e)}(function(){const e=["config","set","store-dir",Df.HVIGOR_PNPM_STORE_PATH],t={cwd:nf.join(Ef,of.WORK_SPACE),stdio:["inherit","inherit","inherit"]};(0,df.executeCommand)(Df.HVIGOR_WRAPPER_PNPM_SCRIPT_PATH,e,t)})(),function(){const e=["install"];(0,sf.isCI)()&&e.push("--no-frozen-lockfile");ef.default.existsSync(nf.resolve(Df.HVIGOR_PROJECT_ROOT_DIR,".npmrc"))&&(rf.default.env.npm_config_userconfig=function(e){const t=nf.resolve(Df.HVIGOR_USER_HOME,"project_caches",(0,cf.hash)(rf.default.cwd()),".npmrc");try{const n=ef.default.readFileSync(nf.resolve(tf.default.homedir(),".npmrc"),"utf-8"),r=`${n}\n${ef.default.readFileSync(e,"utf-8")}`;ef.default.ensureFileSync(t),ef.default.writeFileSync(t,r)}catch(e){(0,lf.logErrorAndExit)(e)}return t}(nf.resolve(Df.HVIGOR_PROJECT_ROOT_DIR,".npmrc")));const t={cwd:nf.join(Ef,of.WORK_SPACE),stdio:["inherit","inherit","inherit"],env:rf.default.env};(0,df.executeCommand)(Df.HVIGOR_WRAPPER_PNPM_SCRIPT_PATH,e,t)}(),(0,lf.logInfo)("Hvigor install success.")}();const t=rf.default.hrtime(e);uf.hvigorTrace.HVIGOR_INSTALL_TIME=1e9*t[0]+t[1]}catch(e){!function(){const e=nf.join(Ef,of.WORK_SPACE);if((0,lf.logInfo)("Hvigor cleaning..."),!Ql.existsSync(e))return;const t=Ql.readdirSync(e);if(!t||0===t.length)return;const n=nf.resolve(Ef,"node_modules","@ohos","hvigor","bin","hvigor.js");Ql.existsSync(n)&&(0,df.executeCommand)(rf.default.argv[0],[n,"--stop-daemon"],{});try{t.forEach((t=>{Ql.rmSync(nf.resolve(e,t),{recursive:!0})}))}catch(t){(0,lf.logErrorAndExit)(`The hvigor build tool cannot be installed. Please manually clear the workspace directory and synchronize the project again.\n\n      Workspace Path: ${e}.`)}}()}return Ef},function(){gl.environmentHandler(),gl.isPnpmInstalled()||(gl.checkNpmConifg(),gl.executeInstallPnpm());const t=Xl();P(e.join(t,S))}();
\ No newline at end of file
diff --git a/shell/platform/ohos/flutter_embedding/oh-package.json5 b/shell/platform/ohos/flutter_embedding/oh-package.json5
index fc9afd9a539c96e38bd1356c0d9e56e0a9a71eaf..6990a41a16d7d0cedbfca94edf2f197f6d33cdd5 100755
--- a/shell/platform/ohos/flutter_embedding/oh-package.json5
+++ b/shell/platform/ohos/flutter_embedding/oh-package.json5
@@ -14,6 +14,7 @@
 */
 
 {
+  "modelVersion": "5.0.0",
   "name": "config",
   "version": "1.0.0",
   "description": "Please describe the basic information.",
diff --git a/shell/platform/ohos/library_loader.cpp b/shell/platform/ohos/library_loader.cpp
index 415bf46a65e371659b21f32fab0a1553b11a090e..54dfdbdb7a2f669607c76eb58330ef9b8568f98e 100644
--- a/shell/platform/ohos/library_loader.cpp
+++ b/shell/platform/ohos/library_loader.cpp
@@ -32,6 +32,10 @@ static napi_value Init(napi_env env, napi_value exports) {
       DECLARE_NAPI_FUNCTION(
           "nativeUpdateRefreshRate",
           flutter::PlatformViewOHOSNapi::nativeUpdateRefreshRate),
+      DECLARE_NAPI_FUNCTION("nativeUpdateSize",
+                            flutter::PlatformViewOHOSNapi::nativeUpdateSize),
+      DECLARE_NAPI_FUNCTION("nativeUpdateDensity",
+                            flutter::PlatformViewOHOSNapi::nativeUpdateDensity),
       DECLARE_NAPI_FUNCTION(
           "nativeRunBundleAndSnapshotFromLibrary",
           flutter::PlatformViewOHOSNapi::nativeRunBundleAndSnapshotFromLibrary),
@@ -107,9 +111,6 @@ static napi_value Init(napi_env env, napi_value exports) {
       DECLARE_NAPI_FUNCTION(
           "nativeXComponentDetachFlutterEngine",
           flutter::PlatformViewOHOSNapi::nativeXComponentDetachFlutterEngine),
-      DECLARE_NAPI_FUNCTION(
-          "nativeInitNativeImage",
-          flutter::PlatformViewOHOSNapi::nativeInitNativeImage),
       DECLARE_NAPI_FUNCTION(
           "nativeRegisterTexture",
           flutter::PlatformViewOHOSNapi::nativeRegisterTexture),
diff --git a/shell/platform/ohos/napi/platform_view_ohos_napi.cpp b/shell/platform/ohos/napi/platform_view_ohos_napi.cpp
index 25247c4157bbe4bdadce6d0b83ceb3cb385fa2eb..ffc02f314b3ec4d62fc4c92ee5c080dabb24d292 100644
--- a/shell/platform/ohos/napi/platform_view_ohos_napi.cpp
+++ b/shell/platform/ohos/napi/platform_view_ohos_napi.cpp
@@ -23,18 +23,24 @@
 #include <rawfile/raw_file_manager.h>
 #include <string>
 
+#include "flutter/common/constants.h"
 #include "flutter/fml/make_copyable.h"
 #include "flutter/fml/platform/ohos/napi_util.h"
 #include "flutter/shell/platform/ohos/ohos_main.h"
 #include "flutter/shell/platform/ohos/ohos_shell_holder.h"
+#include "flutter/shell/platform/ohos/ohos_xcomponent_adapter.h"
 #include "flutter/shell/platform/ohos/surface/ohos_native_window.h"
 #include "flutter/shell/platform/ohos/types.h"
 #include "unicode/uchar.h"
-#include "flutter/shell/platform/ohos/ohos_xcomponent_adapter.h"
 
 #define OHOS_SHELL_HOLDER (reinterpret_cast<OHOSShellHolder*>(shell_holder))
 namespace flutter {
 
+int64_t PlatformViewOHOSNapi::display_width = 0;
+int64_t PlatformViewOHOSNapi::display_height = 0;
+int64_t PlatformViewOHOSNapi::display_refresh_rate = 60;
+double PlatformViewOHOSNapi::display_density_pixels = 1.0;
+
 napi_env PlatformViewOHOSNapi::env_;
 std::vector<std::string> PlatformViewOHOSNapi::system_languages;
 
@@ -301,6 +307,7 @@ void PlatformViewOHOSNapi::FlutterViewHandlePlatformMessage(
   if (message->hasData()) {
     fml::MallocMapping mapping = message->releaseData();
     char* mapData = (char*)mapping.Release();
+    mapData[mapping.GetSize()] = '\0';
     status = napi_create_string_utf8(env_, mapData, strlen(mapData),
                                      &callbackParam[3]);
     if (status != napi_ok) {
@@ -413,9 +420,10 @@ void PlatformViewOHOSNapi::DecodeImage(int64_t imageGeneratorAddress,
                                        void* inputData,
                                        size_t dataSize) {
   FML_DLOG(INFO) << "start decodeImage";
-  platform_task_runner_->PostTask(fml::MakeCopyable(
-      [imageGeneratorAddress_ = imageGeneratorAddress,
-       inputData_ = std::move(inputData), dataSize_ = dataSize, this]() mutable {
+  platform_task_runner_->PostTask(
+      fml::MakeCopyable([imageGeneratorAddress_ = imageGeneratorAddress,
+                         inputData_ = std::move(inputData),
+                         dataSize_ = dataSize, this]() mutable {
         napi_value callbackParam[2];
 
         callbackParam[0] =
@@ -460,11 +468,14 @@ napi_value PlatformViewOHOSNapi::nativeAttach(napi_env env,
     FML_DLOG(ERROR) << "nativeAttach napi_get_uv_event_loop  fail";
   }
 
+  if (napi_facade == nullptr) {
+    FML_DLOG(ERROR) << "napi_facade get nullptr";
+  }
+
   auto shell_holder = std::make_unique<OHOSShellHolder>(
       OhosMain::Get().GetSettings(), napi_facade, platform_loop);
   if (shell_holder->IsValid()) {
-    int64_t shell_holder_value =
-        reinterpret_cast<int64_t>(shell_holder.get());
+    int64_t shell_holder_value = reinterpret_cast<int64_t>(shell_holder.get());
     FML_DLOG(INFO) << "PlatformViewOHOSNapi shell_holder:"
                    << shell_holder_value;
     napi_value id;
@@ -574,7 +585,8 @@ napi_value PlatformViewOHOSNapi::nativeGetPixelMap(napi_env env,
 /**
  * 从当前的flutterNapi复制一个新的实例
  */
-napi_value PlatformViewOHOSNapi::nativeSpawn(napi_env env, napi_callback_info info) {
+napi_value PlatformViewOHOSNapi::nativeSpawn(napi_env env,
+                                             napi_callback_info info) {
   napi_status ret;
   size_t argc = 6;
   napi_value args[6] = {nullptr};
@@ -614,12 +626,14 @@ napi_value PlatformViewOHOSNapi::nativeSpawn(napi_env env, napi_callback_info in
   LOGD(" initialRoute: %{public}s", initial_route.c_str());
 
   std::vector<std::string> entrypoint_args;
-  if (fml::napi::SUCCESS != fml::napi::GetArrayString(env, args[4], entrypoint_args)) {
+  if (fml::napi::SUCCESS !=
+      fml::napi::GetArrayString(env, args[4], entrypoint_args)) {
     LOGE("nativeRunBundleAndSnapshotFromLibrary GetArrayString error");
     return nullptr;
   }
 
-  std::shared_ptr<PlatformViewOHOSNapi> napi_facade = std::make_shared<PlatformViewOHOSNapi>(env);
+  std::shared_ptr<PlatformViewOHOSNapi> napi_facade =
+      std::make_shared<PlatformViewOHOSNapi>(env);
   napi_create_reference(env, args[5], 1, &(napi_facade->ref_napi_obj_));
 
   auto spawned_shell_holder = OHOS_SHELL_HOLDER->Spawn(
@@ -631,7 +645,9 @@ napi_value PlatformViewOHOSNapi::nativeSpawn(napi_env env, napi_callback_info in
   }
 
   napi_value shell_holder_id;
-  napi_create_int64(env, reinterpret_cast<int64_t>(spawned_shell_holder.release()), &shell_holder_id);
+  napi_create_int64(env,
+                    reinterpret_cast<int64_t>(spawned_shell_holder.release()),
+                    &shell_holder_id);
   return shell_holder_id;
 }
 
@@ -954,9 +970,11 @@ napi_value PlatformViewOHOSNapi::nativeSetViewportMetrics(
       std::vector<int>(displayFeaturesType.begin(), displayFeaturesType.end()),
       std::vector<int>(displayFeaturesState.begin(),
                        displayFeaturesState.end()),
+      0,  // Display ID
   };
 
-  OHOS_SHELL_HOLDER->GetPlatformView()->SetViewportMetrics(metrics);
+  OHOS_SHELL_HOLDER->GetPlatformView()->SetViewportMetrics(
+      kFlutterImplicitViewId, metrics);
 
   return nullptr;
 }
@@ -974,14 +992,14 @@ napi_value PlatformViewOHOSNapi::nativeCleanupMessageData(
   napi_value args[1] = {nullptr};
   ret = napi_get_cb_info(env, info, &argc, args, nullptr, nullptr);
   if (ret != napi_ok) {
-    LOGE("nativeUpdateRefreshRate napi_get_cb_info error");
+    LOGE("nativeCleanupMessageData napi_get_cb_info error");
     return nullptr;
   }
 
   int64_t messageData;
   ret = napi_get_value_int64(env, args[0], &messageData);
   if (ret != napi_ok) {
-    LOGE("nativeUpdateRefreshRate napi_get_value_int64 error");
+    LOGE("nativeCleanupMessageData napi_get_value_int64 error");
     return nullptr;
   }
 
@@ -1018,6 +1036,75 @@ napi_value PlatformViewOHOSNapi::nativeUpdateRefreshRate(
        refreshRate);
   FML_DCHECK(refreshRate > 0);
   VsyncWaiterOHOS::OnUpdateRefreshRate(refreshRate);
+  display_refresh_rate = refreshRate;
+  return nullptr;
+}
+
+/**
+ *   设置屏幕尺寸
+ */
+napi_value PlatformViewOHOSNapi::nativeUpdateSize(napi_env env,
+                                                  napi_callback_info info) {
+  LOGD("PlatformViewOHOSNapi::nativeUpdateSize");
+
+  int64_t width;
+  int64_t height;
+  napi_status ret;
+  size_t argc = 2;
+  napi_value args[2] = {nullptr};
+  ret = napi_get_cb_info(env, info, &argc, args, nullptr, nullptr);
+  if (ret != napi_ok) {
+    LOGE("nativeUpdateSize napi_get_cb_info error");
+    return nullptr;
+  }
+
+  ret = napi_get_value_int64(env, args[0], &width);
+  if (ret != napi_ok) {
+    LOGE("nativeUpdateSize napi_get_value_int64 error");
+    return nullptr;
+  }
+
+  ret = napi_get_value_int64(env, args[0], &height);
+  if (ret != napi_ok) {
+    LOGE("nativeUpdateSize napi_get_value_int64 error");
+    return nullptr;
+  }
+
+  LOGD("PlatformViewOHOSNapi::nativeUpdateSize: %{public}ld %{public}ld", width,
+       height);
+  FML_DCHECK(width > 0);
+  FML_DCHECK(height > 0);
+  display_width = width;
+  display_height = height;
+  return nullptr;
+}
+
+/**
+ *   设置屏幕像素密度（也就是缩放系数）
+ */
+napi_value PlatformViewOHOSNapi::nativeUpdateDensity(napi_env env,
+                                                     napi_callback_info info) {
+  LOGD("PlatformViewOHOSNapi::nativeUpdateDensity");
+
+  double densityPixels;
+  napi_status ret;
+  size_t argc = 1;
+  napi_value args[1] = {nullptr};
+  ret = napi_get_cb_info(env, info, &argc, args, nullptr, nullptr);
+  if (ret != napi_ok) {
+    LOGE("nativeUpdateDensity napi_get_cb_info error");
+    return nullptr;
+  }
+
+  ret = napi_get_value_double(env, args[0], &densityPixels);
+  if (ret != napi_ok) {
+    LOGE("nativeUpdateDensity napi_get_value_double error");
+    return nullptr;
+  }
+
+  LOGD("PlatformViewOHOSNapi::nativeUpdateDensity: %{public}lf", densityPixels);
+  FML_DCHECK(densityPixels > 0);
+  display_density_pixels = densityPixels;
   return nullptr;
 }
 
@@ -1029,7 +1116,7 @@ napi_value PlatformViewOHOSNapi::nativePrefetchDefaultFontManager(
     napi_callback_info info) {
   LOGD("PlatformViewOHOSNapi::nativePrefetchDefaultFontManager");
 
-  SkFontMgr::RefDefault();
+  SkFontMgr::RefEmpty();
   return nullptr;
 }
 
@@ -1423,29 +1510,10 @@ napi_value PlatformViewOHOSNapi::nativeGetSystemLanguages(
   return nullptr;
 }
 
-napi_value PlatformViewOHOSNapi::nativeInitNativeImage(
-    napi_env env,
-    napi_callback_info info)
-{
-  FML_DLOG(INFO)<<"PlatformViewOHOSNapi::nativeInitNativeImage";
-  size_t argc = 3;
-  napi_value args[3] = {nullptr};
-  int64_t shell_holder;
-  int64_t textureId;
-  NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, nullptr, nullptr));
-  NAPI_CALL(env, napi_get_value_int64(env, args[0], &shell_holder));
-  NAPI_CALL(env, napi_get_value_int64(env, args[1], &textureId));
-  ImageNative *imageNative = OH_Image_InitImageNative(env, args[2]);
-  // std::unique_ptr<ImageNative> uImage;
-  OHOS_SHELL_HOLDER->GetPlatformView()->RegisterExternalTextureByImage(textureId, imageNative);
-  return nullptr;
-}
-
 napi_value PlatformViewOHOSNapi::nativeRegisterTexture(
     napi_env env,
-    napi_callback_info info)
-{
-  FML_DLOG(INFO)<<"PlatformViewOHOSNapi::nativeRegisterTexture";
+    napi_callback_info info) {
+  FML_DLOG(INFO) << "PlatformViewOHOSNapi::nativeRegisterTexture";
   size_t argc = 2;
   napi_value args[2] = {nullptr};
   int64_t shell_holder;
@@ -1453,17 +1521,17 @@ napi_value PlatformViewOHOSNapi::nativeRegisterTexture(
   NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, nullptr, nullptr));
   NAPI_CALL(env, napi_get_value_int64(env, args[0], &shell_holder));
   NAPI_CALL(env, napi_get_value_int64(env, args[1], &textureId));
-  int64_t surfaceId = OHOS_SHELL_HOLDER->GetPlatformView()->RegisterExternalTexture(textureId);
+  int64_t surfaceId =
+      OHOS_SHELL_HOLDER->GetPlatformView()->RegisterExternalTexture(textureId);
   napi_value res;
   napi_create_int64(env, surfaceId, &res);
   return res;
 }
 
 napi_value PlatformViewOHOSNapi::nativeUnregisterTexture(
-  napi_env env,
-  napi_callback_info info)
-{
-  FML_DLOG(INFO)<<"PlatformViewOHOSNapi::nativeUnregisterTexture";
+    napi_env env,
+    napi_callback_info info) {
+  FML_DLOG(INFO) << "PlatformViewOHOSNapi::nativeUnregisterTexture";
   size_t argc = 2;
   napi_value args[2] = {nullptr};
   int64_t shell_holder;
@@ -1476,9 +1544,8 @@ napi_value PlatformViewOHOSNapi::nativeUnregisterTexture(
 }
 
 napi_value PlatformViewOHOSNapi::nativeMarkTextureFrameAvailable(
-  napi_env env,
-  napi_callback_info info)
-{
+    napi_env env,
+    napi_callback_info info) {
   size_t argc = 2;
   napi_value args[2] = {nullptr};
   int64_t shell_holder;
@@ -1491,10 +1558,9 @@ napi_value PlatformViewOHOSNapi::nativeMarkTextureFrameAvailable(
 }
 
 napi_value PlatformViewOHOSNapi::nativeRegisterPixelMap(
-  napi_env env,
-  napi_callback_info info)
-{
-  FML_DLOG(INFO)<<"PlatformViewOHOSNapi::nativeRegisterPixelMap";
+    napi_env env,
+    napi_callback_info info) {
+  FML_DLOG(INFO) << "PlatformViewOHOSNapi::nativeRegisterPixelMap";
   size_t argc = 3;
   napi_value args[3] = {nullptr};
   int64_t shell_holder;
@@ -1502,8 +1568,9 @@ napi_value PlatformViewOHOSNapi::nativeRegisterPixelMap(
   NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, nullptr, nullptr));
   NAPI_CALL(env, napi_get_value_int64(env, args[0], &shell_holder));
   NAPI_CALL(env, napi_get_value_int64(env, args[1], &textureId));
-  NativePixelMap *nativePixelMap = OH_PixelMap_InitNativePixelMap(env, args[2]);
-  OHOS_SHELL_HOLDER->GetPlatformView()->RegisterExternalTextureByPixelMap(textureId, nativePixelMap);
+  NativePixelMap* nativePixelMap = OH_PixelMap_InitNativePixelMap(env, args[2]);
+  OHOS_SHELL_HOLDER->GetPlatformView()->RegisterExternalTextureByPixelMap(
+      textureId, nativePixelMap);
   return nullptr;
 }
 
@@ -1513,17 +1580,13 @@ void PlatformViewOHOSNapi::SurfaceCreated(int64_t shell_holder, void* window) {
   OHOS_SHELL_HOLDER->GetPlatformView()->NotifyCreate(std::move(native_window));
 }
 
-void PlatformViewOHOSNapi::SurfaceWindowChanged(int64_t shell_holder, void* window) {
-  auto native_window = fml::MakeRefCounted<OHOSNativeWindow>(
-          static_cast<OHNativeWindow*>(window));
-  OHOS_SHELL_HOLDER->GetPlatformView()->NotifySurfaceWindowChanged(std::move(native_window));
-}
-
 void PlatformViewOHOSNapi::SurfaceChanged(int64_t shell_holder,
                                           int32_t width,
                                           int32_t height) {
   OHOS_SHELL_HOLDER->GetPlatformView()->NotifyChanged(
       SkISize::Make(width, height));
+  display_width = width;
+  display_height = height;
 }
 
 void PlatformViewOHOSNapi::SurfaceDestroyed(int64_t shell_holder) {
@@ -1544,37 +1607,41 @@ void PlatformViewOHOSNapi::SetPlatformTaskRunner(
  */
 napi_value PlatformViewOHOSNapi::nativeXComponentAttachFlutterEngine(
     napi_env env,
-    napi_callback_info info){
-    napi_status ret;
-    size_t argc = 2;
-    napi_value args[2] = {nullptr};
-    int64_t xcomponent_id;
-    int64_t shell_holder;
-    ret = napi_get_cb_info(env, info, &argc, args, nullptr, nullptr);
-    if (ret != napi_ok) {
-        FML_DLOG(ERROR) << "nativeXComponentAttachFlutterEngine napi_get_cb_info error:"
-                        << ret;
-        return nullptr;
-    }
-    ret = napi_get_value_int64(env, args[0], &xcomponent_id);
-    if (ret != napi_ok) {
-        FML_DLOG(ERROR) << "nativeXComponentAttachFlutterEngine xcomponent_id napi_get_value_int64 error";
-        return nullptr;
-    }
-    ret = napi_get_value_int64(env, args[1], &shell_holder);
-    if (ret != napi_ok) {
-        FML_DLOG(ERROR) << "nativeXComponentAttachFlutterEngine shell_holder napi_get_value_int64 error";
-        return nullptr;
-    }
-    std::string xcomponent_id_str = std::to_string(xcomponent_id);
-    std::string shell_holder_str = std::to_string(shell_holder);
+    napi_callback_info info) {
+  napi_status ret;
+  size_t argc = 2;
+  napi_value args[2] = {nullptr};
+  std::string xcomponent_id;
+  int64_t shell_holder;
+  ret = napi_get_cb_info(env, info, &argc, args, nullptr, nullptr);
+  if (ret != napi_ok) {
+    FML_DLOG(ERROR)
+        << "nativeXComponentAttachFlutterEngine napi_get_cb_info error:" << ret;
+    return nullptr;
+  }
 
-    LOGD("nativeXComponentAttachFlutterEngine xcomponent_id: %{public}ld , shell_holder: %{public}ld ",
-         xcomponent_id, shell_holder);
+  if (fml::napi::GetString(env, args[0], xcomponent_id) != 0) {
+    FML_DLOG(ERROR)
+        << "nativeXComponentAttachFlutterEngine xcomponent_id GetString error";
+    return nullptr;
+  }
 
-    XComponentAdapter::GetInstance()->AttachFlutterEngine(xcomponent_id_str,
-                                                          shell_holder_str);
+  ret = napi_get_value_int64(env, args[1], &shell_holder);
+  if (ret != napi_ok) {
+    FML_DLOG(ERROR) << "nativeXComponentAttachFlutterEngine shell_holder "
+                       "napi_get_value_int64 error";
     return nullptr;
+  }
+  std::string shell_holder_str = std::to_string(shell_holder);
+
+  LOGD(
+      "nativeXComponentAttachFlutterEngine xcomponent_id: %{public}s, "
+      "shell_holder: %{public}ld ",
+      xcomponent_id.c_str(), shell_holder);
+
+  XComponentAdapter::GetInstance()->AttachFlutterEngine(xcomponent_id,
+                                                        shell_holder_str);
+  return nullptr;
 }
 /**
  * @brief xcomponent解除flutter引擎绑定
@@ -1585,34 +1652,34 @@ napi_value PlatformViewOHOSNapi::nativeXComponentAttachFlutterEngine(
  */
 napi_value PlatformViewOHOSNapi::nativeXComponentDetachFlutterEngine(
     napi_env env,
-    napi_callback_info info){
-    napi_status ret;
-    size_t argc = 2;
-    napi_value args[2] = {nullptr};
-    int64_t xcomponent_id;
-    int64_t shell_holder;
-    ret = napi_get_cb_info(env, info, &argc, args, nullptr, nullptr);
-    if (ret != napi_ok) {
-        FML_DLOG(ERROR) << "nativeXComponentAttachFlutterEngine napi_get_cb_info error:"
-                        << ret;
-        return nullptr;
-    }
-    ret = napi_get_value_int64(env, args[0], &xcomponent_id);
-    if (ret != napi_ok) {
-        FML_DLOG(ERROR) << "nativeXComponentAttachFlutterEngine xcomponent_id napi_get_value_int64 error";
-        return nullptr;
-    }
-    ret = napi_get_value_int64(env, args[1], &shell_holder);
-    if (ret != napi_ok) {
-        FML_DLOG(ERROR) << "nativeXComponentAttachFlutterEngine shell_holder napi_get_value_int64 error";
-        return nullptr;
-    }
-    std::string xcomponent_id_str = std::to_string(xcomponent_id);
-
-    LOGD("nativeXComponentDetachFlutterEngine xcomponent_id: %{public}ld",
-         xcomponent_id);
-    XComponentAdapter::GetInstance()->DetachFlutterEngine(xcomponent_id_str);
+    napi_callback_info info) {
+  napi_status ret;
+  size_t argc = 2;
+  napi_value args[2] = {nullptr};
+  std::string xcomponent_id;
+  int64_t shell_holder;
+  ret = napi_get_cb_info(env, info, &argc, args, nullptr, nullptr);
+  if (ret != napi_ok) {
+    FML_DLOG(ERROR)
+        << "nativeXComponentAttachFlutterEngine napi_get_cb_info error:" << ret;
+    return nullptr;
+  }
+  if (fml::napi::GetString(env, args[0], xcomponent_id) != 0) {
+    FML_DLOG(ERROR)
+        << "nativeXComponentAttachFlutterEngine xcomponent_id GetString error";
+    return nullptr;
+  }
+  ret = napi_get_value_int64(env, args[1], &shell_holder);
+  if (ret != napi_ok) {
+    FML_DLOG(ERROR) << "nativeXComponentAttachFlutterEngine shell_holder "
+                       "napi_get_value_int64 error";
     return nullptr;
+  }
+
+  LOGD("nativeXComponentDetachFlutterEngine xcomponent_id: %{public}s",
+       xcomponent_id.c_str());
+  XComponentAdapter::GetInstance()->DetachFlutterEngine(xcomponent_id);
+  return nullptr;
 }
 
-}  // namespace flutter
\ No newline at end of file
+}  // namespace flutter
diff --git a/shell/platform/ohos/napi/platform_view_ohos_napi.h b/shell/platform/ohos/napi/platform_view_ohos_napi.h
index 8bcc4a683d24f08f7d1673292fb27908619f7490..20a2624e2b6e353484c91b10c6838c83cebd33b9 100644
--- a/shell/platform/ohos/napi/platform_view_ohos_napi.h
+++ b/shell/platform/ohos/napi/platform_view_ohos_napi.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef PLATFORM_VIEW_OHOS_NAPI_H
-#define PLATFORM_VIEW_OHOS_NAPI_H
+#ifndef FLUTTER_SHELL_PLATFORM_OHOS_NAPI_PLATFORM_VIEW_OHOS_NAPI_H_
+#define FLUTTER_SHELL_PLATFORM_OHOS_NAPI_PLATFORM_VIEW_OHOS_NAPI_H_
 #include <memory>
 #include "flutter/assets/directory_asset_bundle.h"
 #include "flutter/common/settings.h"
@@ -75,6 +75,11 @@ class PlatformViewOHOSNapi {
   static napi_value nativeUpdateRefreshRate(
       napi_env env,
       napi_callback_info info);  // 设置刷新率
+  static napi_value nativeUpdateSize(napi_env env,
+                                     napi_callback_info info);  // 设置屏幕尺寸
+  static napi_value nativeUpdateDensity(
+      napi_env env,
+      napi_callback_info info);  // 设置屏幕像素密度（也就是缩放系数）
   static napi_value nativeRunBundleAndSnapshotFromLibrary(
       napi_env env,
       napi_callback_info info);  // 加载dart工程构建产物
@@ -143,35 +148,24 @@ class PlatformViewOHOSNapi {
       napi_env env,
       napi_callback_info info);  // 应用下发系统语言设置
 
-  static napi_value nativeInitNativeImage(
-      napi_env env,
-      napi_callback_info info);
+  static napi_value nativeUnregisterTexture(napi_env env,
+                                            napi_callback_info info);
 
-  static napi_value nativeUnregisterTexture(
-      napi_env env,
-      napi_callback_info info);
-
-  static napi_value nativeMarkTextureFrameAvailable(
-      napi_env env,
-      napi_callback_info info);
+  static napi_value nativeMarkTextureFrameAvailable(napi_env env,
+                                                    napi_callback_info info);
 
-  static napi_value nativeRegisterPixelMap(
-      napi_env env,
-      napi_callback_info info);
+  static napi_value nativeRegisterPixelMap(napi_env env,
+                                           napi_callback_info info);
 
-  static napi_value nativeRegisterTexture(
-      napi_env env,
-      napi_callback_info info);
+  static napi_value nativeRegisterTexture(napi_env env,
+                                          napi_callback_info info);
 
   // Surface相关，XComponent调用
   static void SurfaceCreated(int64_t shell_holder, void* window);
 
-  static void SurfaceWindowChanged(int64_t shell_holder, void* window);
-
-  static void SurfaceChanged(
-      int64_t shell_holder,
-      int32_t width,
-      int32_t height);
+  static void SurfaceChanged(int64_t shell_holder,
+                             int32_t width,
+                             int32_t height);
 
   static void SurfaceDestroyed(int64_t shell_holder);
   static int64_t GetShellHolder();
@@ -182,6 +176,11 @@ class PlatformViewOHOSNapi {
       napi_env env,
       napi_callback_info info);
 
+  static int64_t display_width;
+  static int64_t display_height;
+  static int64_t display_refresh_rate;
+  static double display_density_pixels;
+
  private:
   static napi_env env_;
   napi_ref ref_napi_obj_;
@@ -190,4 +189,4 @@ class PlatformViewOHOSNapi {
 };
 
 }  // namespace flutter
-#endif
+#endif  // FLUTTER_SHELL_PLATFORM_OHOS_NAPI_PLATFORM_VIEW_OHOS_NAPI_H_
diff --git a/shell/platform/ohos/napi_common.h b/shell/platform/ohos/napi_common.h
index 43b2b3cbef7ebbd12ede9ccaf7509bc208e12d96..ce80da3f5d5fe53f22abe16bbf684c01a902ed27 100644
--- a/shell/platform/ohos/napi_common.h
+++ b/shell/platform/ohos/napi_common.h
@@ -19,8 +19,8 @@
 // Node APIs are not fully supported. To solve the compilation error of the
 // interface cannot be found, please include "napi/native_api.h".
 
-#ifndef XComponentDemo_native_common_H
-#define XComponentDemo_native_common_H
+#ifndef FLUTTER_SHELL_PLATFORM_OHOS_NAPI_COMMON_H_
+#define FLUTTER_SHELL_PLATFORM_OHOS_NAPI_COMMON_H_
 
 #include <hilog/log.h>
 #define APP_LOG_DOMAIN 0x0000
@@ -115,4 +115,4 @@
         nullptr                                                          \
   }
 
-#endif  // XComponentDemo_native_common_H
+#endif  // FLUTTER_SHELL_PLATFORM_OHOS_NAPI_COMMON_H_
diff --git a/shell/platform/ohos/ohos_asset_provider.cpp b/shell/platform/ohos/ohos_asset_provider.cpp
index 8cabce185ea2bd5b0ca89114493b473a11160a06..f7c1aac495fa04d5493129df754b1a1817883949 100755
--- a/shell/platform/ohos/ohos_asset_provider.cpp
+++ b/shell/platform/ohos/ohos_asset_provider.cpp
@@ -105,6 +105,11 @@ OHOSAssetProvider::OHOSAssetProvider(void* assetHandle, const std::string& dir)
   LOGD("assets dir:%{public}s", dir.c_str());
 }
 
+OHOSAssetProvider::OHOSAssetProvider(
+    std::shared_ptr<OHOSAssetProviderInternal> handle)
+    : assetHandle_(handle.get()) {
+}
+
 bool OHOSAssetProvider::IsValid() const {
   return (assetHandle_ != nullptr);
 }
@@ -150,4 +155,12 @@ std::unique_ptr<OHOSAssetProvider> OHOSAssetProvider::Clone() const {
   return std::make_unique<OHOSAssetProvider>(assetHandle_);
 }
 
+bool OHOSAssetProvider::operator==(const AssetResolver& other) const {
+  auto other_provider = other.as_ohos_asset_provider();
+  if (!other_provider) {
+    return false;
+  }
+  return assetHandle_ == other_provider->assetHandle_;
+}
+
 }  // namespace flutter
diff --git a/shell/platform/ohos/ohos_asset_provider.h b/shell/platform/ohos/ohos_asset_provider.h
index 666aeb69b66cedb6e7859821efeb6c9fec59965a..897b60119758deb17c1576fd147b73d67e016aa6 100755
--- a/shell/platform/ohos/ohos_asset_provider.h
+++ b/shell/platform/ohos/ohos_asset_provider.h
@@ -13,23 +13,38 @@
  * limitations under the License.
  */
 
-#ifndef OHOS_ASSET_PROVIDER_H
-#define OHOS_ASSET_PROVIDER_H
+#ifndef FLUTTER_SHELL_PLATFORM_OHOS_OHOS_ASSET_PROVIDER_H_
+#define FLUTTER_SHELL_PLATFORM_OHOS_OHOS_ASSET_PROVIDER_H_
 
 #include "flutter/assets/asset_resolver.h"
 #include "flutter/fml/memory/ref_counted.h"
 
 namespace flutter {
 
+class OHOSAssetProviderInternal {
+  public:
+    virtual std::unique_ptr<fml::Mapping> GetAsMapping(
+      const std::string& asset_name) const = 0;
+  protected:
+    virtual ~OHOSAssetProviderInternal() = default;
+};
+
 // ohos平台的文件管理 ，必须通过NativeResourceManager* 指针对它进行初始化
 class OHOSAssetProvider final : public AssetResolver {
  public:
   explicit OHOSAssetProvider(void* assetHandle,
                              const std::string& dir = "flutter_assets");
+
+  explicit OHOSAssetProvider(std::shared_ptr<OHOSAssetProviderInternal> assetHandle_);
+
   ~OHOSAssetProvider() = default;
 
   std::unique_ptr<OHOSAssetProvider> Clone() const;
 
+  void* GetHandle() const { return assetHandle_; }
+
+  bool operator==(const AssetResolver& other) const override;
+
  private:
   void* assetHandle_;
   std::string dir_;
@@ -42,6 +57,13 @@ class OHOSAssetProvider final : public AssetResolver {
 
   std::unique_ptr<fml::Mapping> GetAsMapping(
       const std::string& asset_name) const override;
+
+  // |AssetResolver|
+  const OHOSAssetProvider* as_ohos_asset_provider() const override {
+    return this;
+  }
+
+  FML_DISALLOW_COPY_AND_ASSIGN(OHOSAssetProvider);
 };
 }  // namespace flutter
-#endif
\ No newline at end of file
+#endif  // FLUTTER_SHELL_PLATFORM_OHOS_OHOS_ASSET_PROVIDER_H_
\ No newline at end of file
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/renderer/SurfaceTextureWrapper.ets b/shell/platform/ohos/ohos_asset_provider_unittests.cpp
similarity index 37%
rename from shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/renderer/SurfaceTextureWrapper.ets
rename to shell/platform/ohos/ohos_asset_provider_unittests.cpp
index b1da18061bc2398f9ce0acd5f9f2c42e248b9204..b1a61cef8a1b4fc940b1702e715eae0d9d721130 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/renderer/SurfaceTextureWrapper.ets
+++ b/shell/platform/ohos/ohos_asset_provider_unittests.cpp
@@ -12,19 +12,33 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
-import image from '@ohos.multimedia.image';
 
-export class SurfaceTextureWrapper {
-  private receiver: image.ImageReceiver;
-  private released: boolean = false;
-  private attached: boolean = false;
+#include "flutter/shell/platform/ohos/ohos_asset_provider.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
 
-  constructor(receiver: image.ImageReceiver) {
-    this.receiver = receiver;
-  }
+namespace flutter {
+namespace testing {
 
-  getImageReceiver(): image.ImageReceiver {
-    return this.receiver;
-  }
-}
\ No newline at end of file
+class MockOHOSAssetProviderImpl : public OHOSAssetProviderInternal {
+  public:
+  MOCK_METHOD(std::unique_ptr<fml::Mapping>,
+              GetAsMapping,
+              (const std::string& asset_name),
+              (const, override));
+};
+
+TEST(OHOSAssetProvider, CloneAndEquals) {
+  auto mockHandle1 = std::make_shared<MockOHOSAssetProviderImpl>();
+  auto mockHandle2 = std::make_shared<MockOHOSAssetProviderImpl>();
+  auto first_provider = std::make_unique<OHOSAssetProvider>(mockHandle1);
+  auto second_provider = std::make_unique<OHOSAssetProvider>(mockHandle2);
+  auto third_provider = first_provider->Clone();
+
+  ASSERT_NE(first_provider->GetHandle(), second_provider->GetHandle());
+  ASSERT_EQ(first_provider->GetHandle(), third_provider->GetHandle());
+  ASSERT_FALSE(*first_provider == *second_provider);
+  ASSERT_TRUE(*first_provider == *third_provider);
+}
+}  // namespace testing
+}  // namespace flutter
diff --git a/shell/platform/ohos/ohos_context_gl_impeller.h b/shell/platform/ohos/ohos_context_gl_impeller.h
index 9be28a018c788ccd7f27c9a811bd16169257c5e4..7851bb64b965ecb77bbf581ea8bbb30ad53b9d0a 100755
--- a/shell/platform/ohos/ohos_context_gl_impeller.h
+++ b/shell/platform/ohos/ohos_context_gl_impeller.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef OHOS_CONTEXT_GL_IMPELLER_H
-#define OHOS_CONTEXT_GL_IMPELLER_H
+#ifndef FLUTTER_SHELL_PLATFORM_OHOS_OHOS_CONTEXT_GL_IMPELLER_H_
+#define FLUTTER_SHELL_PLATFORM_OHOS_OHOS_CONTEXT_GL_IMPELLER_H_
 #include "context/ohos_context.h"
 #include "flutter/fml/macros.h"
 
@@ -31,4 +31,4 @@ class OHOSContextGLImpeller : public OHOSContext {
   FML_DISALLOW_COPY_AND_ASSIGN(OHOSContextGLImpeller);
 };
 }  // namespace flutter
-#endif
\ No newline at end of file
+#endif  // FLUTTER_SHELL_PLATFORM_OHOS_OHOS_CONTEXT_GL_IMPELLER_H_
\ No newline at end of file
diff --git a/shell/platform/ohos/ohos_context_gl_skia.cpp b/shell/platform/ohos/ohos_context_gl_skia.cpp
old mode 100755
new mode 100644
index 2dbd1a971833dc6f5d6d5bbd3ab90b921c1dfe96..da4dffc2dc6620b6fe63e5ee31712f1371f1857c
--- a/shell/platform/ohos/ohos_context_gl_skia.cpp
+++ b/shell/platform/ohos/ohos_context_gl_skia.cpp
@@ -98,7 +98,7 @@ OhosContextGLSkia::OhosContextGLSkia(OHOSRenderingAPI rendering_api,
     LogLastEGLError();
     return;
   }
-
+  FML_LOG(INFO) << "create gl context";
   // Create a context for the configuration.
   std::tie(success, context_) =
       CreateContext(environment_->Display(), config_, EGL_NO_CONTEXT);
@@ -166,6 +166,8 @@ std::unique_ptr<OhosEGLSurface> OhosContextGLSkia::CreateOnscreenSurface(
     EGLSurface surface = eglCreateWindowSurface(
         display, config_,
         reinterpret_cast<EGLNativeWindowType>(window->handle()), attribs);
+    FML_LOG(INFO) << "create EGLSurface " << eglGetError() << "  " << surface
+                  << "  " << context_;
     return std::make_unique<OhosEGLSurface>(surface, display, context_);
   }
 }
diff --git a/shell/platform/ohos/ohos_context_gl_skia.h b/shell/platform/ohos/ohos_context_gl_skia.h
index c30a24da87310f8b2e02f62c53de08875e1152d6..c29404bf073577309be866471d4bf938e2017fa6 100755
--- a/shell/platform/ohos/ohos_context_gl_skia.h
+++ b/shell/platform/ohos/ohos_context_gl_skia.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_CONTEXT_GL_SKIA_H_
-#define FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_CONTEXT_GL_SKIA_H_
+#ifndef FLUTTER_SHELL_PLATFORM_OHOS_OHOS_CONTEXT_GL_SKIA_H_
+#define FLUTTER_SHELL_PLATFORM_OHOS_OHOS_CONTEXT_GL_SKIA_H_
 
 #include "flutter/fml/macros.h"
 #include "flutter/fml/memory/ref_counted.h"
@@ -112,4 +112,4 @@ class OhosContextGLSkia : public OHOSContext {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_CONTEXT_GL_SKIA_H_
+#endif  // FLUTTER_SHELL_PLATFORM_OHOS_OHOS_CONTEXT_GL_SKIA_H_
diff --git a/shell/platform/ohos/ohos_context_vulkan_impeller.cpp b/shell/platform/ohos/ohos_context_vulkan_impeller.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..abfc5543d3fe772edb6aacde92843c431ed512cd
--- /dev/null
+++ b/shell/platform/ohos/ohos_context_vulkan_impeller.cpp
@@ -0,0 +1,92 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/platform/ohos/ohos_context_vulkan_impeller.h"
+
+#include "flutter/fml/paths.h"
+#include "flutter/impeller/entity/vk/entity_shaders_vk.h"
+#include "flutter/impeller/entity/vk/framebuffer_blend_shaders_vk.h"
+#include "flutter/impeller/entity/vk/modern_shaders_vk.h"
+#include "flutter/impeller/renderer/backend/vulkan/context_vk.h"
+#include "shell/platform/ohos/context/ohos_context.h"
+
+#if IMPELLER_ENABLE_3D
+#include "flutter/impeller/scene/shaders/vk/scene_shaders_vk.h"  // nogncheck
+#endif  // IMPELLER_ENABLE_3D
+
+namespace flutter {
+
+static std::shared_ptr<impeller::Context> CreateImpellerContext(
+    const fml::RefPtr<fml::NativeLibrary>& vulkan_dylib,
+    bool enable_vulkan_validation,
+    bool enable_gpu_tracing,
+    bool quiet) {
+  if (!vulkan_dylib) {
+    VALIDATION_LOG << "Could not open the Vulkan dylib.";
+    return nullptr;
+  }
+
+  std::vector<std::shared_ptr<fml::Mapping>> shader_mappings = {
+      std::make_shared<fml::NonOwnedMapping>(impeller_entity_shaders_vk_data,
+                                             impeller_entity_shaders_vk_length),
+      std::make_shared<fml::NonOwnedMapping>(
+          impeller_framebuffer_blend_shaders_vk_data,
+          impeller_framebuffer_blend_shaders_vk_length),
+#if IMPELLER_ENABLE_3D
+      std::make_shared<fml::NonOwnedMapping>(impeller_scene_shaders_vk_data,
+                                             impeller_scene_shaders_vk_length),
+#endif
+      std::make_shared<fml::NonOwnedMapping>(impeller_modern_shaders_vk_data,
+                                             impeller_modern_shaders_vk_length),
+  };
+
+  auto instance_proc_addr =
+      vulkan_dylib->ResolveFunction<PFN_vkGetInstanceProcAddr>(
+          "vkGetInstanceProcAddr");
+
+  if (!instance_proc_addr.has_value()) {
+    VALIDATION_LOG << "Could not setup Vulkan proc table.";
+    return nullptr;
+  }
+
+  impeller::ContextVK::Settings settings;
+  settings.proc_address_callback = instance_proc_addr.value();
+  settings.shader_libraries_data = std::move(shader_mappings);
+  settings.cache_directory = fml::paths::GetCachesDirectory();
+  settings.enable_validation = enable_vulkan_validation;
+  settings.enable_gpu_tracing = enable_gpu_tracing;
+
+  auto context = impeller::ContextVK::Create(std::move(settings));
+
+  if (!quiet) {
+    if (context && impeller::CapabilitiesVK::Cast(*context->GetCapabilities())
+                       .AreValidationsEnabled()) {
+      FML_LOG(IMPORTANT) << "Using the Impeller rendering backend (Vulkan with "
+                            "Validation Layers).";
+    } else {
+      FML_LOG(IMPORTANT) << "Using the Impeller rendering backend (Vulkan).";
+    }
+  }
+
+  return context;
+}
+
+OHOSContextVulkanImpeller::OHOSContextVulkanImpeller(bool enable_validation,
+                                                     bool enable_gpu_tracing,
+                                                     bool quiet)
+    : OHOSContext(OHOSRenderingAPI::kImpellerVulkan),
+      vulkan_dylib_(fml::NativeLibrary::Create("libvulkan.so")) {
+  auto impeller_context = CreateImpellerContext(
+      vulkan_dylib_, enable_validation, enable_gpu_tracing, quiet);
+  SetImpellerContext(impeller_context);
+  is_valid_ = !!impeller_context;
+}
+
+OHOSContextVulkanImpeller::~OHOSContextVulkanImpeller() = default;
+
+bool OHOSContextVulkanImpeller::IsValid() const {
+  return is_valid_;
+}
+
+}  // namespace flutter
diff --git a/shell/platform/ohos/ohos_context_vulkan_impeller.h b/shell/platform/ohos/ohos_context_vulkan_impeller.h
new file mode 100644
index 0000000000000000000000000000000000000000..791521a6e2608dd6295e2e0c9ac89e8ff3ad4f94
--- /dev/null
+++ b/shell/platform/ohos/ohos_context_vulkan_impeller.h
@@ -0,0 +1,34 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_OHOS_OHOS_CONTEXT_VULKAN_IMPELLER_H_
+#define FLUTTER_SHELL_PLATFORM_OHOS_OHOS_CONTEXT_VULKAN_IMPELLER_H_
+
+#include "flutter/fml/macros.h"
+#include "flutter/fml/native_library.h"
+#include "flutter/shell/platform/ohos/context/ohos_context.h"
+
+namespace flutter {
+
+class OHOSContextVulkanImpeller : public OHOSContext {
+ public:
+  OHOSContextVulkanImpeller(bool enable_validation,
+                            bool enable_gpu_tracing,
+                            bool quiet = false);
+
+  ~OHOSContextVulkanImpeller();
+
+  // |OHOSContext|
+  bool IsValid() const override;
+
+ private:
+  fml::RefPtr<fml::NativeLibrary> vulkan_dylib_;
+  bool is_valid_ = false;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(OHOSContextVulkanImpeller);
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_OHOS_OHOS_CONTEXT_VULKAN_IMPELLER_H_
diff --git a/shell/platform/ohos/ohos_display.cpp b/shell/platform/ohos/ohos_display.cpp
index 3f23e95b007803dcf71befb620d0a0043e46a6ba..5813baf58483a745ee8d844e9a7633c01bb4c53f 100644
--- a/shell/platform/ohos/ohos_display.cpp
+++ b/shell/platform/ohos/ohos_display.cpp
@@ -17,13 +17,28 @@
 
 namespace flutter {
 
-const double defaultFPS = 60;
-
 OHOSDisplay::OHOSDisplay(std::shared_ptr<PlatformViewOHOSNapi> napi_facade)
-    : Display(defaultFPS), napi_facade_(std::move(napi_facade)) {}
+    : Display(0,
+              napi_facade_->display_refresh_rate,
+              napi_facade_->display_width,
+              napi_facade_->display_height,
+              napi_facade_->display_density_pixels),
+      napi_facade_(std::move(napi_facade)) {}
 
 double OHOSDisplay::GetRefreshRate() const {
-  return defaultFPS;
+  return (double)napi_facade_->display_refresh_rate;
+}
+
+double OHOSDisplay::GetWidth() const {
+  return (double)napi_facade_->display_width;
+}
+
+double OHOSDisplay::GetHeight() const {
+  return (double)napi_facade_->display_height;
+}
+
+double OHOSDisplay::GetDevicePixelRatio() const {
+  return napi_facade_->display_density_pixels;
 }
 
 }  // namespace flutter
\ No newline at end of file
diff --git a/shell/platform/ohos/ohos_display.h b/shell/platform/ohos/ohos_display.h
index 873f2cff90e15467199eda7890a68b7c66229b62..84a003614a8fb190072ca71574ff3ae870524297 100644
--- a/shell/platform/ohos/ohos_display.h
+++ b/shell/platform/ohos/ohos_display.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef OHOS_DISPLAY_H
-#define OHOS_DISPLAY_H
+#ifndef FLUTTER_SHELL_PLATFORM_OHOS_OHOS_DISPLAY_H_
+#define FLUTTER_SHELL_PLATFORM_OHOS_OHOS_DISPLAY_H_
 
 #include <cstdint>
 
@@ -30,9 +30,18 @@ class OHOSDisplay : public Display {
 
   double GetRefreshRate() const override;
 
+  // |Display|
+  virtual double GetWidth() const override;
+
+  // |Display|
+  virtual double GetHeight() const override;
+
+  // |Display|
+  virtual double GetDevicePixelRatio() const override;
+
  private:
   std::shared_ptr<PlatformViewOHOSNapi> napi_facade_;
   FML_DISALLOW_COPY_AND_ASSIGN(OHOSDisplay);
 };
 }  // namespace flutter
-#endif
\ No newline at end of file
+#endif  // FLUTTER_SHELL_PLATFORM_OHOS_OHOS_DISPLAY_H_
\ No newline at end of file
diff --git a/shell/platform/ohos/ohos_egl_surface.cpp b/shell/platform/ohos/ohos_egl_surface.cpp
index e7ee3d9a8f426f7e27c216da81be5ab2afd384ec..a9e5ece5cb4a2f49c44c203b31e09adf7f5e21b8 100755
--- a/shell/platform/ohos/ohos_egl_surface.cpp
+++ b/shell/platform/ohos/ohos_egl_surface.cpp
@@ -81,19 +81,21 @@ class OhosEGLSurfaceDamage {
       set_damage_region_ = reinterpret_cast<PFNEGLSETDAMAGEREGIONKHRPROC>(
           eglGetProcAddress("eglSetDamageRegionKHR"));
     }
-    // ohos 暂没公开拓展，但支持接口调用
-    swap_buffers_with_damage_ =
-        reinterpret_cast<PFNEGLSWAPBUFFERSWITHDAMAGEEXTPROC>(
-            eglGetProcAddress("eglSwapBuffersWithDamageKHR"));
+    if (HasExtension(extensions, "EGL_EXT_swap_buffers_with_damage")) {
+        swap_buffers_with_damage_ = reinterpret_cast<PFNEGLSWAPBUFFERSWITHDAMAGEEXTPROC>(
+              eglGetProcAddress("eglSwapBuffersWithDamageEXT"));
+    } else if (HasExtension(extensions, "EGL_KHR_swap_buffers_with_damage")) {
+        swap_buffers_with_damage_ = reinterpret_cast<PFNEGLSWAPBUFFERSWITHDAMAGEEXTPROC>(
+              eglGetProcAddress("eglSwapBuffersWithDamageKHR"));
+    }
 
-    partial_redraw_supported_ =
-        set_damage_region_ != nullptr && swap_buffers_with_damage_ != nullptr;
+    partial_redraw_supported_ = false;
   }
 
   void SetDamageRegion(EGLDisplay display,
                        EGLSurface surface,
                        const std::optional<SkIRect>& region) {
-    if (set_damage_region_ && region) {
+    if (partial_redraw_supported_ && set_damage_region_ && region) {
       auto rects = RectToInts(display, surface, *region);
       set_damage_region_(display, surface, rects.data(), 1);
     }
@@ -130,7 +132,7 @@ class OhosEGLSurfaceDamage {
   bool SwapBuffersWithDamage(EGLDisplay display,
                              EGLSurface surface,
                              const std::optional<SkIRect>& damage) {
-    if (swap_buffers_with_damage_ && damage) {
+    if (partial_redraw_supported_ && swap_buffers_with_damage_ && damage) {
       damage_history_.push_back(*damage);
       if (damage_history_.size() > kMaxHistorySize) {
         damage_history_.pop_front();
diff --git a/shell/platform/ohos/ohos_egl_surface.h b/shell/platform/ohos/ohos_egl_surface.h
index a2f98f90a40b295fe836e065c890a491e4b1df6f..f696d3fba4c0fbc2412f275d1abaad3ffab38dbf 100755
--- a/shell/platform/ohos/ohos_egl_surface.h
+++ b/shell/platform/ohos/ohos_egl_surface.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef FLUTTER_SHELL_PLATFORM_OHOS_EGL_SURFACE_H_
-#define FLUTTER_SHELL_PLATFORM_OHOS_EGL_SURFACE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_OHOS_OHOS_EGL_SURFACE_H_
+#define FLUTTER_SHELL_PLATFORM_OHOS_OHOS_EGL_SURFACE_H_
 
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
@@ -124,4 +124,4 @@ class OhosEGLSurface {
 
 }  // namespace flutter
 
-#endif
+#endif  // FLUTTER_SHELL_PLATFORM_OHOS_OHOS_EGL_SURFACE_H_
diff --git a/shell/platform/ohos/ohos_environment_gl.h b/shell/platform/ohos/ohos_environment_gl.h
index a2e925f61284b27471b703a6c903558758ac4c30..ddd322075f2b4408e65ed9cc87b4f30df2353e85 100755
--- a/shell/platform/ohos/ohos_environment_gl.h
+++ b/shell/platform/ohos/ohos_environment_gl.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef FLUTTER_SHELL_PLATFORM_OHOS_ENVIRONMENT_GL_H_
-#define FLUTTER_SHELL_PLATFORM_OHOS_ENVIRONMENT_GL_H_
+#ifndef FLUTTER_SHELL_PLATFORM_OHOS_OHOS_ENVIRONMENT_GL_H_
+#define FLUTTER_SHELL_PLATFORM_OHOS_OHOS_ENVIRONMENT_GL_H_
 
 #include "flutter/fml/macros.h"
 #include "flutter/fml/memory/ref_counted.h"
@@ -47,4 +47,4 @@ class OhosEnvironmentGL : public fml::RefCountedThreadSafe<OhosEnvironmentGL> {
 
 }  // namespace flutter
 
-#endif
+#endif  // FLUTTER_SHELL_PLATFORM_OHOS_OHOS_ENVIRONMENT_GL_H_
diff --git a/shell/platform/ohos/ohos_external_texture_gl.cpp b/shell/platform/ohos/ohos_external_texture_gl.cpp
index e59276ac77994c1ef88c5b31079cef949d18f1cf..6706fb224e13c3696a43cc7766caf795af9d883e 100755
--- a/shell/platform/ohos/ohos_external_texture_gl.cpp
+++ b/shell/platform/ohos/ohos_external_texture_gl.cpp
@@ -19,55 +19,65 @@
 #include <sys/mman.h>
 #include <utility>
 
+#include "ohos_main.h"
 #include "third_party/skia/include/core/SkAlphaType.h"
 #include "third_party/skia/include/core/SkColorSpace.h"
 #include "third_party/skia/include/core/SkColorType.h"
 #include "third_party/skia/include/core/SkImage.h"
-#include "third_party/skia/include/gpu/GrBackendSurface.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
+#include "third_party/skia/include/gpu/ganesh/SkImageGanesh.h"
+#include "third_party/skia/include/gpu/ganesh/gl/GrGLBackendSurface.h"
 
-#define EGL_PLATFORM_OHOS_KHR             0x34E0
+#define EGL_PLATFORM_OHOS_KHR 0x34E0
 
-const int PIXEL_SIZE = 4; // 像素点占用4个字节
+const int PIXEL_SIZE = 4;  // 像素点占用4个字节
 
 namespace flutter {
 using GetPlatformDisplayExt = PFNEGLGETPLATFORMDISPLAYEXTPROC;
 constexpr char CHARACTER_WHITESPACE = ' ';
-constexpr const char *CHARACTER_STRING_WHITESPACE = " ";
-constexpr const char *EGL_EXT_PLATFORM_WAYLAND = "EGL_EXT_platform_wayland";
-constexpr const char *EGL_KHR_PLATFORM_WAYLAND = "EGL_KHR_platform_wayland";
-constexpr const char *EGL_GET_PLATFORM_DISPLAY_EXT = "eglGetPlatformDisplayEXT";
-
-OHOSExternalTextureGL::OHOSExternalTextureGL(int64_t id, const std::shared_ptr<OHOSSurface>& ohos_surface)
-  : Texture(id), ohos_surface_(std::move(ohos_surface)), transform(SkMatrix::I())
-{
+constexpr const char* CHARACTER_STRING_WHITESPACE = " ";
+constexpr const char* EGL_EXT_PLATFORM_WAYLAND = "EGL_EXT_platform_wayland";
+constexpr const char* EGL_KHR_PLATFORM_WAYLAND = "EGL_KHR_platform_wayland";
+constexpr const char* EGL_GET_PLATFORM_DISPLAY_EXT = "eglGetPlatformDisplayEXT";
+
+OHOSExternalTextureGL::OHOSExternalTextureGL(
+    int64_t id,
+    const std::shared_ptr<OHOSSurface>& ohos_surface)
+    : Texture(id),
+      ohos_surface_(std::move(ohos_surface)),
+      transform_(SkMatrix::I()) {
     nativeImage_ = nullptr;
+    backGroundNativeImage_ = nullptr;
     nativeWindow_ = nullptr;
-    eglContext_ =  EGL_NO_CONTEXT;
+    backGroundNativeWindow_ = nullptr;
+    eglContext_ = EGL_NO_CONTEXT;
     eglDisplay_ = EGL_NO_DISPLAY;
     buffer_ = nullptr;
+    backGroundBuffer_ = nullptr;
     pixelMap_ = nullptr;
     lastImage_ = nullptr;
+    isEmulator_ = OhosMain::IsEmulator();
 }
 
-OHOSExternalTextureGL::~OHOSExternalTextureGL()
-{
+OHOSExternalTextureGL::~OHOSExternalTextureGL() {
   if (state_ == AttachmentState::attached) {
     glDeleteTextures(1, &texture_name_);
   }
 }
 
-void OHOSExternalTextureGL::Attach()
-{
+void OHOSExternalTextureGL::Attach() {
   OHOSSurface* ohos_surface_ptr = ohos_surface_.get();
   OhosSurfaceGLSkia* ohosSurfaceGLSkia_ = (OhosSurfaceGLSkia*)ohos_surface_ptr;
   auto result = ohosSurfaceGLSkia_->GLContextMakeCurrent();
   if (result->GetResult()) {
-    FML_DLOG(INFO)<<"ResourceContextMakeCurrent successed";
+    FML_DLOG(INFO) << "ResourceContextMakeCurrent successed";
     glGenTextures(1, &texture_name_);
-    FML_DLOG(INFO) << "OHOSExternalTextureGL::Paint, glGenTextures texture_name_=" << texture_name_;
+    FML_DLOG(INFO)
+        << "OHOSExternalTextureGL::Paint, glGenTextures texture_name_="
+        << texture_name_;
     if (nativeImage_ == nullptr) {
-      nativeImage_ = OH_NativeImage_Create(texture_name_, GL_TEXTURE_EXTERNAL_OES);
+      nativeImage_ =
+          OH_NativeImage_Create(texture_name_, GL_TEXTURE_EXTERNAL_OES);
       if (nativeImage_ == nullptr) {
         FML_DLOG(ERROR) << "Error with OH_NativeImage_Create";
         return;
@@ -81,103 +91,121 @@ void OHOSExternalTextureGL::Attach()
 
     int32_t ret = OH_NativeImage_AttachContext(nativeImage_, texture_name_);
     if (ret != 0) {
-      FML_DLOG(FATAL)<<"OHOSExternalTextureGL OH_NativeImage_AttachContext err code:"<< ret;
+      FML_DLOG(FATAL)
+          << "OHOSExternalTextureGL OH_NativeImage_AttachContext err code:"
+          << ret;
     }
     state_ = AttachmentState::attached;
   } else {
-    FML_DLOG(FATAL)<<"ResourceContextMakeCurrent failed";
+    FML_DLOG(FATAL) << "ResourceContextMakeCurrent failed";
   }
 }
 
 void OHOSExternalTextureGL::Paint(PaintContext& context,
                                   const SkRect& bounds,
                                   bool freeze,
-                                  const SkSamplingOptions& sampling)
-{
+                                  DlImageSampling sampling) {
   if (state_ == AttachmentState::detached) {
     FML_DLOG(ERROR) << "OHOSExternalTextureGL::Paint";
     return;
   }
   if (state_ == AttachmentState::uninitialized) {
     Attach();
-  }
-  if (!freeze && new_frame_ready_) {
-    Update();
+    if (!freeze && new_frame_ready_ && pixelMap_ != nullptr) {
+      ProducePixelMapToNativeImage();
+      Update();
+	}
     new_frame_ready_ = false;
   }
 
-  GrGLTextureInfo textureInfo = {
-    GL_TEXTURE_EXTERNAL_OES, texture_name_, GL_RGBA8_OES};
-  GrBackendTexture backendTexture(1, 1, GrMipMapped::kNo, textureInfo);
-  sk_sp<SkImage> image = SkImage::MakeFromTexture(
+  GrGLTextureInfo textureInfo;
+
+  if (!freeze && !first_update_ && !isEmulator_ && !new_frame_ready_ && pixelMap_ == nullptr) {
+    setBackground(bounds.width(), bounds.height());
+    textureInfo = {GL_TEXTURE_EXTERNAL_OES, backGroundTextureName_, GL_RGBA8_OES};
+  } else {
+    textureInfo = {GL_TEXTURE_EXTERNAL_OES, texture_name_, GL_RGBA8_OES};
+  }
+  FML_CHECK(state_ == AttachmentState::attached);
+
+  auto backendTexture =
+      GrBackendTextures::MakeGL(1, 1, skgpu::Mipmapped::kNo, textureInfo);
+  sk_sp<SkImage> image = SkImages::BorrowTextureFrom(
       context.gr_context, backendTexture, kTopLeft_GrSurfaceOrigin,
       kRGBA_8888_SkColorType, kPremul_SkAlphaType, nullptr);
-  if (image) {
-    SkAutoCanvasRestore autoRestore(context.canvas, true);
+  sk_sp<flutter::DlImage> dl_image_ = DlImage::Make(image);
+
+  if (dl_image_) {
+    DlAutoCanvasRestore autoRestore(context.canvas, true);
 
     // The incoming texture is vertically flipped, so we flip it
     // back. OpenGL's coordinate system has Positive Y equivalent to up, while
     // Skia's coordinate system has Negative Y equvalent to up.
-    context.canvas->translate(bounds.x(), bounds.y());
-    context.canvas->scale(bounds.width(), bounds.height());
+    // 模拟器和真机在外接纹理功能的表现不一致，需要进行适配
+    if (isEmulator_) {
+      context.canvas->Translate(bounds.x(), bounds.y());
+      context.canvas->Scale(bounds.width(), bounds.height());
+    } else {
+      context.canvas->Translate(bounds.x(), bounds.y() + bounds.height());
+      context.canvas->Scale(bounds.width(), -bounds.height());
+    }
 
-    if (!transform.isIdentity()) {
-      sk_sp<SkShader> shader = image->makeShader(
-          SkTileMode::kRepeat, SkTileMode::kRepeat, sampling, transform);
+    if (!transform_.isIdentity()) {
+      DlImageColorSource source(dl_image_, DlTileMode::kClamp,
+                                DlTileMode::kClamp, sampling, &transform_);
 
-      SkPaint paintWithShader;
-      if (context.sk_paint) {
-        paintWithShader = *context.sk_paint;
+      DlPaint paintWithShader;
+      if (context.paint) {
+        paintWithShader = *context.paint;
       }
-      paintWithShader.setShader(shader);
-      context.canvas->drawRect(SkRect::MakeWH(1, 1), paintWithShader);
+      paintWithShader.setColorSource(&source);
+      context.canvas->DrawRect(SkRect::MakeWH(1, 1), paintWithShader);
     } else {
-      context.canvas->drawImage(image, 0, 0, sampling, context.sk_paint);
+      context.canvas->DrawImage(dl_image_, {0, 0}, sampling, context.paint);
     }
   }
 }
 
-void OHOSExternalTextureGL::OnGrContextCreated()
-{
-  FML_DLOG(INFO)<<" OHOSExternalTextureGL::OnGrContextCreated";
+void OHOSExternalTextureGL::OnGrContextCreated() {
+  FML_DLOG(INFO) << " OHOSExternalTextureGL::OnGrContextCreated";
   state_ = AttachmentState::uninitialized;
 }
 
-void OHOSExternalTextureGL::OnGrContextDestroyed()
-{
-  FML_DLOG(INFO)<<" OHOSExternalTextureGL::OnGrContextDestroyed";
+void OHOSExternalTextureGL::OnGrContextDestroyed() {
+  FML_DLOG(INFO) << " OHOSExternalTextureGL::OnGrContextDestroyed";
   if (state_ == AttachmentState::attached) {
     Detach();
     glDeleteTextures(1, &texture_name_);
-    OH_NativeImage_Destroy(&nativeImage_);
   }
   state_ = AttachmentState::detached;
 }
 
-void OHOSExternalTextureGL::MarkNewFrameAvailable()
-{
-  FML_DLOG(INFO)<<" OHOSExternalTextureGL::MarkNewFrameAvailable";
+void OHOSExternalTextureGL::MarkNewFrameAvailable() {
+  FML_DLOG(INFO) << " OHOSExternalTextureGL::MarkNewFrameAvailable";
   new_frame_ready_ = true;
+  Update();
 }
 
-void OHOSExternalTextureGL::OnTextureUnregistered()
-{
-  FML_DLOG(INFO)<<" OHOSExternalTextureGL::OnTextureUnregistered";
-  // do nothing
+void OHOSExternalTextureGL::OnTextureUnregistered() {
+  FML_DLOG(INFO) << " OHOSExternalTextureGL::OnTextureUnregistered";
+  first_update_ = false;
+  OH_NativeImage_UnsetOnFrameAvailableListener(nativeImage_);
+  OH_NativeImage_Destroy(&nativeImage_);
 }
 
-void OHOSExternalTextureGL::Update()
-{
-  ProducePixelMapToNativeImage();
+void OHOSExternalTextureGL::Update() {
   int32_t ret = OH_NativeImage_UpdateSurfaceImage(nativeImage_);
   if (ret != 0) {
-    FML_DLOG(FATAL)<<"OHOSExternalTextureGL OH_NativeImage_UpdateSurfaceImage err code:"<< ret;
+    FML_DLOG(FATAL)
+        << "OHOSExternalTextureGL OH_NativeImage_UpdateSurfaceImage err code:"
+        << ret;
+    return;
   }
+  first_update_ = true;
   UpdateTransform();
 }
 
-void OHOSExternalTextureGL::Detach()
-{
+void OHOSExternalTextureGL::Detach() {
   OH_NativeImage_DetachContext(nativeImage_);
   OH_NativeWindow_DestroyNativeWindow(nativeWindow_);
 }
@@ -185,55 +213,135 @@ void OHOSExternalTextureGL::Detach()
 void OHOSExternalTextureGL::UpdateTransform()
 {
   float m[16] = { 0.0f };
-  int32_t ret = OH_NativeImage_GetTransformMatrix(nativeImage_, m);
+  int32_t ret = OH_NativeImage_GetTransformMatrixV2(nativeImage_, m);
   if (ret != 0) {
-    FML_DLOG(FATAL)<<"OHOSExternalTextureGL OH_NativeImage_GetTransformMatrix err code:"<< ret;
+    FML_DLOG(FATAL)<<"OHOSExternalTextureGL OH_NativeImage_GetTransformMatrixV2 err code:"<< ret;
   }
-  // transform ohos 4x4 matrix to skia 3x3 matrix
+  // transform_ ohos 4x4 matrix to skia 3x3 matrix
   SkScalar matrix3[] = {
-    m[0], m[4], m[12],  //
-    m[1], m[5], m[13],  //
-    m[3], m[7], m[15],  //
+      m[0], m[4], m[12],  //
+      m[1], m[5], m[13],  //
+      m[3], m[7], m[15],  //
   };
-  transform.set9(matrix3);
+  transform_.set9(matrix3);
   SkMatrix inverted;
-  if (!transform.invert(&inverted)) {
-    FML_LOG(FATAL) << "OHOSExternalTextureGL Invalid SurfaceTexture transformation matrix";
+  if (!transform_.invert(&inverted)) {
+    FML_LOG(FATAL) << "OHOSExternalTextureGL Invalid SurfaceTexture "
+                      "transform_ation matrix";
   }
-  transform = inverted;
+  transform_ = inverted;
 }
 
-void OHOSExternalTextureGL::DispatchImage(ImageNative* image)
-{
+void OHOSExternalTextureGL::DispatchImage(ImageNative* image) {
   lastImage_ = image;
 }
 
-void OHOSExternalTextureGL::HandlePixelMapBuffer()
+void OHOSExternalTextureGL::setBackground(int32_t width, int32_t height)
 {
-  BufferHandle *handle = OH_NativeWindow_GetBufferHandleFromNative(buffer_);
+  FML_DLOG(INFO)<<" OHOSExternalTextureGL::setBackground";
+  if (backGroundNativeImage_ != nullptr) {
+    return;
+  }
+
+  OHOSSurface* ohos_surface_ptr = ohos_surface_.get();
+  OhosSurfaceGLSkia* ohosSurfaceGLSkia_ = (OhosSurfaceGLSkia*)ohos_surface_ptr;
+  auto result = ohosSurfaceGLSkia_->GLContextMakeCurrent();
+  if (result->GetResult()) {
+    FML_DLOG(INFO)<<"ResourceContextMakeCurrent successed";
+    glGenTextures(1, &backGroundTextureName_);
+    FML_DLOG(INFO) << "OHOSExternalTextureGL::setBackground, glGenTextures backGroundTextureName_=" << backGroundTextureName_;
+    if (backGroundNativeImage_ == nullptr) {
+      backGroundNativeImage_ = OH_NativeImage_Create(backGroundTextureName_, GL_TEXTURE_EXTERNAL_OES);
+      if (backGroundNativeImage_ == nullptr) {
+        FML_DLOG(ERROR) << "Error with OH_NativeImage_Create";
+        return;
+      }
+      backGroundNativeWindow_ = OH_NativeImage_AcquireNativeWindow(backGroundNativeImage_);
+      if (backGroundNativeWindow_ == nullptr) {
+        FML_DLOG(ERROR) << "Error with OH_NativeImage_AcquireNativeWindow";
+        return;
+      }
+    }
+  } else {
+    FML_DLOG(FATAL)<<"ResourceContextMakeCurrent failed";
+  }
+
+  int code = SET_BUFFER_GEOMETRY;
+  int32_t ret = OH_NativeWindow_NativeWindowHandleOpt(backGroundNativeWindow_, code, width, height);
+  if (ret != 0) {
+    FML_DLOG(ERROR) << "OHOSExternalTextureGL::setBackground OH_NativeWindow_NativeWindowHandleOpt err:" << ret;
+    return;
+  }
+
+  ret = OH_NativeWindow_NativeWindowRequestBuffer(backGroundNativeWindow_, &backGroundBuffer_, &backGroundFenceFd);
+  if (ret != 0) {
+    FML_DLOG(ERROR) << "OHOSExternalTextureGL::setBackground OH_NativeWindow_NativeWindowRequestBuffer err:" << ret;
+    return;
+  }
+
+  BufferHandle *handle = OH_NativeWindow_GetBufferHandleFromNative(backGroundBuffer_);
+  void *mappedAddr = mmap(handle->virAddr, handle->size, PROT_READ | PROT_WRITE, MAP_SHARED, handle->fd, 0);
+  if (mappedAddr == MAP_FAILED) {
+    FML_DLOG(FATAL)<<"OHOSExternalTextureGL::setBackground mmap failed";
+    return;
+  }
+
+  uint32_t* destAddr = static_cast<uint32_t *>(mappedAddr);
+  uint32_t value = 0xFFFFFFFF;
+
+  for(int32_t x = 0; x < handle->width; x++) {
+    for (int32_t y = 0; y < handle->height; y++) {
+      *destAddr++ = value;
+    }
+  }
+
+    // munmap after use
+  ret = munmap(mappedAddr, handle->size);
+  if (ret == -1) {
+    FML_DLOG(FATAL)<<"OHOSExternalTextureGL in setBackground munmap failed";
+    return;
+  }
+
+  Region region{nullptr, 0};
+  ret = OH_NativeWindow_NativeWindowFlushBuffer(backGroundNativeWindow_, backGroundBuffer_, backGroundFenceFd, region);
+  if (ret != 0) {
+    FML_DLOG(FATAL)<<"OHOSExternalTextureGL::setBackground OH_NativeWindow_NativeWindowFlushBuffer err:"<< ret;
+  }
+
+  ret = OH_NativeImage_UpdateSurfaceImage(backGroundNativeImage_);
+  if (ret != 0) {
+    FML_DLOG(FATAL)<<"OHOSExternalTextureGL::setBackground OH_NativeImage_UpdateSurfaceImage err code:"<< ret;
+  }
+}
+
+void OHOSExternalTextureGL::HandlePixelMapBuffer() {
+  BufferHandle* handle = OH_NativeWindow_GetBufferHandleFromNative(buffer_);
   // get virAddr of bufferHandl by mmap sys interface
   uint32_t stride = handle->stride;
   FML_DLOG(INFO) << "OHOSExternalTextureGL stride:" << stride;
-  void *mappedAddr = mmap(handle->virAddr, handle->size, PROT_READ | PROT_WRITE, MAP_SHARED, handle->fd, 0);
+  void* mappedAddr = mmap(handle->virAddr, handle->size, PROT_READ | PROT_WRITE,
+                          MAP_SHARED, handle->fd, 0);
   if (mappedAddr == MAP_FAILED) {
-    FML_DLOG(FATAL)<<"OHOSExternalTextureGL mmap failed";
+    FML_DLOG(FATAL) << "OHOSExternalTextureGL mmap failed";
     return;
   }
 
-  void *pixelAddr = nullptr;
+  void* pixelAddr = nullptr;
   int64_t ret = OH_PixelMap_AccessPixels(pixelMap_, &pixelAddr);
   if (ret != IMAGE_RESULT_SUCCESS) {
-    FML_DLOG(FATAL)<<"OHOSExternalTextureGL OH_PixelMap_AccessPixels err:"<< ret;
+    FML_DLOG(FATAL) << "OHOSExternalTextureGL OH_PixelMap_AccessPixels err:"
+                    << ret;
     return;
   }
 
-  uint32_t *pixel = static_cast<uint32_t *>(pixelAddr);
-  uint32_t *destAddr = static_cast<uint32_t *>(mappedAddr);
+  uint32_t* pixel = static_cast<uint32_t*>(pixelAddr);
+  uint32_t* destAddr = static_cast<uint32_t*>(mappedAddr);
 
-  FML_DLOG(INFO) << "OHOSExternalTextureGL pixelMapInfo w:" << pixelMapInfo.width
-    << " h:" << pixelMapInfo.height;
-  FML_DLOG(INFO) << "OHOSExternalTextureGL pixelMapInfo rowSize:" << pixelMapInfo.rowSize
-    << " format:" << pixelMapInfo.pixelFormat;
+  FML_DLOG(INFO) << "OHOSExternalTextureGL pixelMapInfo w:"
+                 << pixelMapInfo.width << " h:" << pixelMapInfo.height;
+  FML_DLOG(INFO) << "OHOSExternalTextureGL pixelMapInfo rowSize:"
+                 << pixelMapInfo.rowSize
+                 << " format:" << pixelMapInfo.pixelFormat;
 
   // 复制图片纹理数据到内存中，需要处理DMA内存补齐相关的逻辑
   if (pixelMapInfo.width * PIXEL_SIZE != pixelMapInfo.rowSize) {
@@ -251,17 +359,12 @@ void OHOSExternalTextureGL::HandlePixelMapBuffer()
   // munmap after use
   ret = munmap(mappedAddr, handle->size);
   if (ret == -1) {
-    FML_DLOG(FATAL)<<"OHOSExternalTextureGL munmap failed";
+    FML_DLOG(FATAL) << "OHOSExternalTextureGL munmap failed";
     return;
   }
 }
 
-void OHOSExternalTextureGL::ProducePixelMapToNativeImage()
-{
-  if (pixelMap_ == nullptr) {
-    FML_DLOG(ERROR) << "OHOSExternalTextureGL pixelMap in null";
-    return;
-  }
+void OHOSExternalTextureGL::ProducePixelMapToNativeImage() {
   if (state_ == AttachmentState::detached) {
     FML_DLOG(ERROR) << "OHOSExternalTextureGL AttachmentState err";
     return;
@@ -269,34 +372,45 @@ void OHOSExternalTextureGL::ProducePixelMapToNativeImage()
   int32_t ret = -1;
   ret = OH_PixelMap_GetImageInfo(pixelMap_, &pixelMapInfo);
   if (ret != 0) {
-    FML_DLOG(ERROR) << "OHOSExternalTextureGL OH_PixelMap_GetImageInfo err:" << ret;
+    FML_DLOG(ERROR) << "OHOSExternalTextureGL OH_PixelMap_GetImageInfo err:"
+                    << ret;
   }
-  
+
   int code = SET_BUFFER_GEOMETRY;
-  ret = OH_NativeWindow_NativeWindowHandleOpt(nativeWindow_, code, pixelMapInfo.width, pixelMapInfo.height);
+  ret = OH_NativeWindow_NativeWindowHandleOpt(
+      nativeWindow_, code, pixelMapInfo.width, pixelMapInfo.height);
   if (ret != 0) {
-    FML_DLOG(ERROR) << "OHOSExternalTextureGL OH_NativeWindow_NativeWindowHandleOpt err:" << ret;
+    FML_DLOG(ERROR)
+        << "OHOSExternalTextureGL OH_NativeWindow_NativeWindowHandleOpt err:"
+        << ret;
   }
 
   if (buffer_ != nullptr) {
     OH_NativeWindow_NativeWindowAbortBuffer(nativeWindow_, buffer_);
     buffer_ = nullptr;
   }
-  ret = OH_NativeWindow_NativeWindowRequestBuffer(nativeWindow_, &buffer_, &fenceFd);
+  ret = OH_NativeWindow_NativeWindowRequestBuffer(nativeWindow_, &buffer_,
+                                                  &fenceFd);
   if (ret != 0) {
-    FML_DLOG(ERROR) << "OHOSExternalTextureGL OH_NativeWindow_NativeWindowRequestBuffer err:" << ret;
+    FML_DLOG(ERROR) << "OHOSExternalTextureGL "
+                       "OH_NativeWindow_NativeWindowRequestBuffer err:"
+                    << ret;
   }
   HandlePixelMapBuffer();
   Region region{nullptr, 0};
-  ret = OH_NativeWindow_NativeWindowFlushBuffer(nativeWindow_, buffer_, fenceFd, region);
+  ret = OH_NativeWindow_NativeWindowFlushBuffer(nativeWindow_, buffer_, fenceFd,
+                                                region);
   if (ret != 0) {
-    FML_DLOG(FATAL)<<"OHOSExternalTextureGL OH_NativeWindow_NativeWindowFlushBuffer err:"<< ret;
+    FML_DLOG(FATAL)
+        << "OHOSExternalTextureGL OH_NativeWindow_NativeWindowFlushBuffer err:"
+        << ret;
   }
 }
 
-EGLDisplay OHOSExternalTextureGL::GetPlatformEglDisplay(EGLenum platform, void *native_display,
-    const EGLint *attrib_list)
-{
+EGLDisplay OHOSExternalTextureGL::GetPlatformEglDisplay(
+    EGLenum platform,
+    void* native_display,
+    const EGLint* attrib_list) {
   GetPlatformDisplayExt eglGetPlatformDisplayExt = NULL;
 
   if (!eglGetPlatformDisplayExt) {
@@ -304,7 +418,8 @@ EGLDisplay OHOSExternalTextureGL::GetPlatformEglDisplay(EGLenum platform, void *
     if (extensions &&
         (CheckEglExtension(extensions, EGL_EXT_PLATFORM_WAYLAND) ||
          CheckEglExtension(extensions, EGL_KHR_PLATFORM_WAYLAND))) {
-      eglGetPlatformDisplayExt = (GetPlatformDisplayExt)eglGetProcAddress(EGL_GET_PLATFORM_DISPLAY_EXT);
+      eglGetPlatformDisplayExt = (GetPlatformDisplayExt)eglGetProcAddress(
+          EGL_GET_PLATFORM_DISPLAY_EXT);
     }
   }
 
@@ -315,27 +430,26 @@ EGLDisplay OHOSExternalTextureGL::GetPlatformEglDisplay(EGLenum platform, void *
   return eglGetDisplay((EGLNativeDisplayType)native_display);
 }
 
-bool OHOSExternalTextureGL::CheckEglExtension(const char *extensions, const char *extension)
-{
+bool OHOSExternalTextureGL::CheckEglExtension(const char* extensions,
+                                              const char* extension) {
   size_t extlen = strlen(extension);
-  const char *end = extensions + strlen(extensions);
+  const char* end = extensions + strlen(extensions);
   while (extensions < end) {
     size_t n = 0;
     if (*extensions == CHARACTER_WHITESPACE) {
-        extensions++;
-        continue;
-      }
-      n = strcspn(extensions, CHARACTER_STRING_WHITESPACE);
-      if (n == extlen && strncmp(extension, extensions, n) == 0) {
-        return true;
+      extensions++;
+      continue;
+    }
+    n = strcspn(extensions, CHARACTER_STRING_WHITESPACE);
+    if (n == extlen && strncmp(extension, extensions, n) == 0) {
+      return true;
     }
     extensions += n;
   }
   return false;
 }
 
-void OHOSExternalTextureGL::DispatchPixelMap(NativePixelMap* pixelMap)
-{
+void OHOSExternalTextureGL::DispatchPixelMap(NativePixelMap* pixelMap) {
   if (pixelMap != nullptr) {
     pixelMap_ = pixelMap;
   }
diff --git a/shell/platform/ohos/ohos_external_texture_gl.h b/shell/platform/ohos/ohos_external_texture_gl.h
index 88949d3dbd747fbd2d09f6be0af7feb36fb85a81..b257ebeba54463961e5a849b82df1524d4be7021 100755
--- a/shell/platform/ohos/ohos_external_texture_gl.h
+++ b/shell/platform/ohos/ohos_external_texture_gl.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef OHOS_EXTERNAL_TEXTURE_GL_H
-#define OHOS_EXTERNAL_TEXTURE_GL_H
+#ifndef FLUTTER_SHELL_PLATFORM_OHOS_OHOS_EXTERNAL_TEXTURE_GL_H_
+#define FLUTTER_SHELL_PLATFORM_OHOS_OHOS_EXTERNAL_TEXTURE_GL_H_
 
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
@@ -23,8 +23,8 @@
 #include <multimedia/image_framework/image_mdk.h>
 #include <multimedia/image_framework/image_pixel_map_mdk.h>
 #include <native_buffer/native_buffer.h>
-#include <native_window/external_window.h>
 #include <native_image/native_image.h>
+#include <native_window/external_window.h>
 
 #include "flutter/common/graphics/texture.h"
 #include "flutter/shell/platform/ohos/napi/platform_view_ohos_napi.h"
@@ -36,16 +36,22 @@ namespace flutter {
 
 class OHOSExternalTextureGL : public flutter::Texture {
  public:
-  explicit OHOSExternalTextureGL(int64_t id, const std::shared_ptr<OHOSSurface>& ohos_surface);
+  explicit OHOSExternalTextureGL(
+      int64_t id,
+      const std::shared_ptr<OHOSSurface>& ohos_surface);
 
   ~OHOSExternalTextureGL() override;
 
-  OH_NativeImage *nativeImage_;
+  OH_NativeImage* nativeImage_;
+
+  OH_NativeImage* backGroundNativeImage_;
+
+  bool first_update_ = false;
 
   void Paint(PaintContext& context,
              const SkRect& bounds,
              bool freeze,
-             const SkSamplingOptions& sampling) override;
+             DlImageSampling sampling) override;
 
   void OnGrContextCreated() override;
 
@@ -57,6 +63,8 @@ class OHOSExternalTextureGL : public flutter::Texture {
 
   void DispatchImage(ImageNative* image);
 
+  void setBackground(int32_t width, int32_t height);
+
   void DispatchPixelMap(NativePixelMap* pixelMap);
 
  private:
@@ -68,9 +76,11 @@ class OHOSExternalTextureGL : public flutter::Texture {
 
   void UpdateTransform();
 
-  EGLDisplay GetPlatformEglDisplay(EGLenum platform, void *native_display, const EGLint *attrib_list);
+  EGLDisplay GetPlatformEglDisplay(EGLenum platform,
+                                   void* native_display,
+                                   const EGLint* attrib_list);
 
-  bool CheckEglExtension(const char *extensions, const char *extension);
+  bool CheckEglExtension(const char* extensions, const char* extension);
 
   void HandlePixelMapBuffer();
 
@@ -84,26 +94,36 @@ class OHOSExternalTextureGL : public flutter::Texture {
 
   GLuint texture_name_ = 0;
 
+  GLuint backGroundTextureName_ = 0;
+
   std::shared_ptr<OHOSSurface> ohos_surface_;
 
-  SkMatrix transform;
+  SkMatrix transform_;
+
+  OHNativeWindow* nativeWindow_;
+
+  OHNativeWindow* backGroundNativeWindow_;
 
-  OHNativeWindow *nativeWindow_;
+  OHNativeWindowBuffer* buffer_;
 
-  OHNativeWindowBuffer *buffer_;
+  OHNativeWindowBuffer* backGroundBuffer_;
 
   NativePixelMap* pixelMap_;
 
   ImageNative* lastImage_;
 
+  bool isEmulator_;
+
   OhosPixelMapInfos pixelMapInfo;
 
   int fenceFd = -1;
 
+  int backGroundFenceFd = -1;
+
   EGLContext eglContext_;
   EGLDisplay eglDisplay_;
 
   FML_DISALLOW_COPY_AND_ASSIGN(OHOSExternalTextureGL);
 };
 }  // namespace flutter
-#endif
\ No newline at end of file
+#endif  // FLUTTER_SHELL_PLATFORM_OHOS_OHOS_EXTERNAL_TEXTURE_GL_H_
\ No newline at end of file
diff --git a/shell/platform/ohos/ohos_image_generator.cpp b/shell/platform/ohos/ohos_image_generator.cpp
index 46211d3d751df61c4e3f26fae8e9c123d085437d..744be2ec9117f400bb0dc9983d4152ea1e22bb4e 100755
--- a/shell/platform/ohos/ohos_image_generator.cpp
+++ b/shell/platform/ohos/ohos_image_generator.cpp
@@ -59,7 +59,7 @@ unsigned int OHOSImageGenerator::GetPlayCount() const {
 
 // |ImageGenerator|
 const ImageGenerator::FrameInfo OHOSImageGenerator::GetFrameInfo(
-    unsigned int frame_index) const {
+    unsigned int frame_index) {
   return {.required_frame = std::nullopt,
           .duration = 0,
           .disposal_method = SkCodecAnimation::DisposalMethod::kKeep};
@@ -117,6 +117,12 @@ std::shared_ptr<ImageGenerator> OHOSImageGenerator::MakeFromData(
     sk_sp<SkData> data,
     const fml::RefPtr<fml::TaskRunner>& task_runner,
     std::shared_ptr<PlatformViewOHOSNapi> napi_facade) {
+  // Return directly if the image data is empty.
+  // https://gitee.com/openharmony-sig/flutter_engine/issues/I9NX5N
+  if (!data->data() || !data->size()) {
+    return nullptr;
+  }
+
   // contructer is private,
   std::shared_ptr<OHOSImageGenerator> generator(
       new OHOSImageGenerator(std::move(data), napi_facade));
diff --git a/shell/platform/ohos/ohos_image_generator.h b/shell/platform/ohos/ohos_image_generator.h
index d2762a74e80319ba419ff1807bf2e3952a67dd06..d892e7392892aea835e03c83956876d4a2d79cab 100755
--- a/shell/platform/ohos/ohos_image_generator.h
+++ b/shell/platform/ohos/ohos_image_generator.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef FLUTTER_IMAGE_GENERATOR_H
-#define FLUTTER_IMAGE_GENERATOR_H
+#ifndef FLUTTER_SHELL_PLATFORM_OHOS_OHOS_IMAGE_GENERATOR_H_
+#define FLUTTER_SHELL_PLATFORM_OHOS_OHOS_IMAGE_GENERATOR_H_
 
 #include "flutter/fml/memory/ref_ptr.h"
 #include "flutter/fml/synchronization/waitable_event.h"
@@ -54,7 +54,7 @@ class OHOSImageGenerator : public ImageGenerator {
 
   // |ImageGenerator|
   const ImageGenerator::FrameInfo GetFrameInfo(
-      unsigned int frame_index) const override;
+      unsigned int frame_index) override;
 
   // |ImageGenerator|
   SkISize GetScaledDimensions(float desired_scale) override;
@@ -98,4 +98,4 @@ class OHOSImageGenerator : public ImageGenerator {
   FML_DISALLOW_COPY_ASSIGN_AND_MOVE(OHOSImageGenerator);
 };
 }  // namespace flutter
-#endif
\ No newline at end of file
+#endif  // FLUTTER_SHELL_PLATFORM_OHOS_OHOS_IMAGE_GENERATOR_H_
\ No newline at end of file
diff --git a/shell/platform/ohos/ohos_logger.h b/shell/platform/ohos/ohos_logger.h
index da4bd255817d551bd9db9c74962a7a0d5195d803..39429b5cefce1752dd2d222a9d2a232339503427 100644
--- a/shell/platform/ohos/ohos_logger.h
+++ b/shell/platform/ohos/ohos_logger.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef __OHOS__LOGGER_H
-#define __OHOS__LOGGER_H
+#ifndef FLUTTER_SHELL_PLATFORM_OHOS_OHOS_LOGGER_H_
+#define FLUTTER_SHELL_PLATFORM_OHOS_OHOS_LOGGER_H_
 #include <hilog/log.h>
 #include <pthread.h>
 #include <stdio.h>
@@ -43,4 +43,4 @@ extern int ohos_log(OhosLogLevel level, const char* fmt, ...);
 }  // end extern
 #endif
 
-#endif
+#endif  // FLUTTER_SHELL_PLATFORM_OHOS_OHOS_LOGGER_H_
diff --git a/shell/platform/ohos/ohos_main.cpp b/shell/platform/ohos/ohos_main.cpp
index ddc429e0b4e20da1aa3dfa307cc3b8726c883415..ba3b8f15cd2adcc75a9ea18238170c6441f7ef53 100644
--- a/shell/platform/ohos/ohos_main.cpp
+++ b/shell/platform/ohos/ohos_main.cpp
@@ -15,6 +15,7 @@
 
 #include "flutter/shell/platform/ohos/ohos_main.h"
 
+#include "common/settings.h"
 #include "flutter/fml/command_line.h"
 #include "flutter/fml/file.h"
 #include "flutter/fml/logging.h"
@@ -74,6 +75,7 @@ OhosMain::OhosMain(const flutter::Settings& settings)
 OhosMain::~OhosMain() = default;
 
 static std::unique_ptr<OhosMain> g_flutter_main;
+static std::string productModel_;
 
 OhosMain& OhosMain::Get() {
   FML_CHECK(g_flutter_main) << "ensureInitializationComplete must have already "
@@ -93,19 +95,25 @@ const flutter::Settings& OhosMain::GetSettings() const {
  * @return void
  */
 void OhosMain::Init(napi_env env, napi_callback_info info) {
-  size_t argc = 6;
-  napi_value param[6];
+  size_t argc = 7;
+  napi_value param[7];
   std::string kernelPath, appStoragePath, engineCachesPath;
   int64_t initTimeMillis;
+  std::string productModel;
   napi_get_cb_info(env, info, &argc, param, nullptr, nullptr);
   napi_get_value_int64(env, param[5], &initTimeMillis);
   fml::napi::GetString(env, param[2], kernelPath);
   fml::napi::GetString(env, param[3], appStoragePath);
   fml::napi::GetString(env, param[4], engineCachesPath);
+  fml::napi::GetString(env, param[6], productModel);
+  productModel_ = productModel;
+
   FML_DLOG(INFO) << "INIT kernelPath:" << kernelPath;
   FML_DLOG(INFO) << "appStoragePath:" << appStoragePath;
   FML_DLOG(INFO) << "engineCachesPath:" << engineCachesPath;
   FML_DLOG(INFO) << "initTimeMillis:" << initTimeMillis;
+  FML_DLOG(INFO) << "productModel:" << productModel;
+
   std::vector<std::string> args;
   args.push_back("flutter");
   fml::napi::GetArrayString(env, param[1], args);
@@ -140,6 +148,27 @@ void OhosMain::Init(napi_env env, napi_callback_info info) {
     LOGI("%{public}s %{public}s", tag.c_str(), message.c_str());
   };
 
+  if (settings.enable_software_rendering) {
+    FML_CHECK(!settings.enable_impeller)
+        << "Impeller does not support software rendering. Either disable "
+           "software rendering or disable impeller.";
+    settings.ohos_rendering_api = OHOSRenderingAPI::kSoftware;
+  }
+  if (settings.enable_impeller) {
+    settings.ohos_rendering_api = OHOSRenderingAPI::kImpellerVulkan;
+  } else {
+    settings.ohos_rendering_api = OHOSRenderingAPI::kOpenGLES;
+  }
+  switch (settings.ohos_rendering_api) {
+    case OHOSRenderingAPI::kSoftware:
+    case OHOSRenderingAPI::kOpenGLES:
+      settings.enable_impeller = false;
+      break;
+    case OHOSRenderingAPI::kImpellerVulkan:
+      settings.enable_impeller = true;
+      break;
+  }
+
   g_flutter_main.reset(new OhosMain(settings));
   // TODO : g_flutter_main->SetupObservatoryUriCallback(env);
 }
@@ -150,4 +179,9 @@ napi_value OhosMain::NativeInit(napi_env env, napi_callback_info info) {
   return nullptr;
 }
 
+bool OhosMain::IsEmulator()
+{
+  return productModel_ == "emulator";
+}
+
 }  // namespace flutter
diff --git a/shell/platform/ohos/ohos_main.h b/shell/platform/ohos/ohos_main.h
index 22c2abaef735713d44bae552902db911fb7cf47a..6614b40d58f3b01d488f413e4193f87ba260ed14 100644
--- a/shell/platform/ohos/ohos_main.h
+++ b/shell/platform/ohos/ohos_main.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef __OHOS__MAIN__H
-#define __OHOS__MAIN__H
+#ifndef FLUTTER_SHELL_PLATFORM_OHOS_OHOS_MAIN_H_
+#define FLUTTER_SHELL_PLATFORM_OHOS_OHOS_MAIN_H_
 #define FML_USED_ON_EMBEDDER
 #include "flutter/common/settings.h"
 #include "flutter/fml/macros.h"
@@ -30,6 +30,7 @@ class OhosMain {
   static OhosMain& Get();
   const flutter::Settings& GetSettings() const;
   static napi_value NativeInit(napi_env env, napi_callback_info info);
+  static bool IsEmulator();
 
  private:
   const flutter::Settings settings_;
@@ -43,4 +44,4 @@ class OhosMain {
   FML_DISALLOW_COPY_AND_ASSIGN(OhosMain);
 };
 }  // namespace flutter
-#endif
+#endif  // FLUTTER_SHELL_PLATFORM_OHOS_OHOS_MAIN_H_
diff --git a/shell/platform/ohos/ohos_shell_holder.cpp b/shell/platform/ohos/ohos_shell_holder.cpp
index cbc08c05a68fd33c96102c547b6fde23c9796fc7..7ffcf882c84f54f30211897808654e29de04dd6a 100644
--- a/shell/platform/ohos/ohos_shell_holder.cpp
+++ b/shell/platform/ohos/ohos_shell_holder.cpp
@@ -24,6 +24,7 @@
 
 #include <sys/resource.h>
 #include <sys/time.h>
+#include <qos/qos.h>
 
 namespace flutter {
 
@@ -32,35 +33,24 @@ static void OHOSPlatformThreadConfigSetter(
   fml::Thread::SetCurrentThreadName(config);
   // set thread priority
   switch (config.priority) {
-    case fml::Thread::ThreadPriority::BACKGROUND: {
-      if (::setpriority(PRIO_PROCESS, 0, 10) != 0) {
-        FML_DLOG(ERROR) << "Failed to set IO task runner priority";
-      }
-      break;
+    case fml::Thread::ThreadPriority::kBackground: {
+        int ret = OH_QoS_SetThreadQoS(QoS_Level::QOS_BACKGROUND);
+        FML_DLOG(INFO) << "qos set background result:" << ret << ",tid:" << gettid();
+        break;
     }
-    case fml::Thread::ThreadPriority::DISPLAY: {
-      if (::setpriority(PRIO_PROCESS, 0, -1) != 0) {
-        FML_DLOG(ERROR) << "Failed to set UI task runner priority";
-      }
-      break;
+    case fml::Thread::ThreadPriority::kDisplay: {
+        int ret = OH_QoS_SetThreadQoS(QoS_Level::QOS_USER_INTERACTIVE);
+        FML_DLOG(INFO) << "qos set display result:" << ret << ",tid:" << gettid();
+        break;
     }
-    case fml::Thread::ThreadPriority::RASTER: {
-      // Android describes -8 as "most important display threads, for
-      // compositing the screen and retrieving input events". Conservatively
-      // set the raster thread to slightly lower priority than it.
-      if (::setpriority(PRIO_PROCESS, 0, -5) != 0) {
-        // Defensive fallback. Depending on the OEM, it may not be possible
-        // to set priority to -5.
-        if (::setpriority(PRIO_PROCESS, 0, -2) != 0) {
-          FML_DLOG(ERROR) << "Failed to set raster task runner priority";
-        }
-      }
-      break;
+    case fml::Thread::ThreadPriority::kRaster: {
+        int ret = OH_QoS_SetThreadQoS(QoS_Level::QOS_USER_INTERACTIVE);
+        FML_DLOG(INFO) << "qos set raster result:" << ret << ",tid:" << gettid();
+        break;
     }
     default:
-      if (::setpriority(PRIO_PROCESS, 0, 0) != 0) {
-        FML_DLOG(ERROR) << "Failed to set priority";
-      }
+        int ret = OH_QoS_SetThreadQoS(QoS_Level::QOS_DEFAULT);
+        FML_DLOG(INFO) << "qos set default result:" << ret << ",tid:" << gettid();
   }
 }
 
@@ -81,22 +71,22 @@ OHOSShellHolder::OHOSShellHolder(
   auto thread_label = std::to_string(thread_host_count++);
 
   auto mask =
-      ThreadHost::Type::UI | ThreadHost::Type::RASTER | ThreadHost::Type::IO;
+      ThreadHost::Type::kUi | ThreadHost::Type::kRaster | ThreadHost::Type::kIo;
 
   flutter::ThreadHost::ThreadHostConfig host_config(
       thread_label, mask, OHOSPlatformThreadConfigSetter);
   host_config.ui_config = fml::Thread::ThreadConfig(
       flutter::ThreadHost::ThreadHostConfig::MakeThreadName(
-          flutter::ThreadHost::Type::UI, thread_label),
-      fml::Thread::ThreadPriority::DISPLAY);
+          flutter::ThreadHost::Type::kUi, thread_label),
+      fml::Thread::ThreadPriority::kDisplay);
   host_config.raster_config = fml::Thread::ThreadConfig(
       flutter::ThreadHost::ThreadHostConfig::MakeThreadName(
-          flutter::ThreadHost::Type::RASTER, thread_label),
-      fml::Thread::ThreadPriority::RASTER);
+          flutter::ThreadHost::Type::kRaster, thread_label),
+      fml::Thread::ThreadPriority::kRaster);
   host_config.io_config = fml::Thread::ThreadConfig(
       flutter::ThreadHost::ThreadHostConfig::MakeThreadName(
-          flutter::ThreadHost::Type::IO, thread_label),
-      fml::Thread::ThreadPriority::NORMAL);
+          flutter::ThreadHost::Type::kIo, thread_label),
+      fml::Thread::ThreadPriority::kNormal);
 
   thread_host_ = std::make_shared<ThreadHost>(host_config);
   FML_DLOG(INFO) << "thred host config finish";
@@ -119,12 +109,11 @@ OHOSShellHolder::OHOSShellHolder(
         weak_platform_view = platform_view_OHOS->GetWeakPtr();
         LOGI("on_create_platform_view LOGI2");
         FML_LOG(INFO) << "on_create_platform_view end1";
-        std::vector<std::unique_ptr<Display>> displays;
-        displays.push_back(std::make_unique<OHOSDisplay>(napi_facade));
-        FML_DLOG(INFO) << "on_create_platform_view LOGI3";
-        FML_LOG(INFO) << "on_create_platform_view end3";
-        shell.OnDisplayUpdates(DisplayUpdateType::kStartup,
-                               std::move(displays));
+        // std::vector<std::unique_ptr<Display>> displays;
+        // displays.push_back(std::make_unique<OHOSDisplay>(napi_facade));
+        // FML_DLOG(INFO) << "on_create_platform_view LOGI3";
+        // FML_LOG(INFO) << "on_create_platform_view end3---here";
+        // shell.OnDisplayUpdates(std::move(displays));
         LOGI("on_create_platform_view LOGI4");
         FML_LOG(INFO) << "on_create_platform_view end3";
         return platform_view_OHOS;
@@ -180,7 +169,7 @@ OHOSShellHolder::OHOSShellHolder(
         },
         -1);
 
-    FML_DLOG(INFO) << "Registered Android SDK image decoder (API level 28+)";
+    FML_DLOG(INFO) << "Registered ohos image decoder";
   }
 
   platform_view_ = weak_platform_view;
@@ -246,8 +235,8 @@ std::unique_ptr<OHOSShellHolder> OHOSShellHolder::Spawn(
         platform_view_ohos = std::make_unique<PlatformViewOHOS>(
             shell,                   // delegate
             shell.GetTaskRunners(),  // task runners
-            napi_facade,              // JNI interop
-            ohos_context          // Ohos context
+            napi_facade,             // JNI interop
+            ohos_context             // Ohos context
         );
         weak_platform_view = platform_view_ohos->GetWeakPtr();
         return platform_view_ohos;
@@ -300,6 +289,11 @@ void OHOSShellHolder::Launch(
   if (!config) {
     return;
   }
+  std::vector<std::unique_ptr<Display>> displays;
+  displays.push_back(std::make_unique<OHOSDisplay>(napi_facade_));
+  FML_DLOG(INFO) << "on_create_platform_view LOGI3";
+  FML_LOG(INFO) << "on_create_platform_view end3---here";
+  shell_->OnDisplayUpdates(std::move(displays));
   FML_LOG(INFO) << "start RunEngine";
   shell_->RunEngine(std::move(config.value()));
   FML_LOG(INFO) << "end Launch";
diff --git a/shell/platform/ohos/ohos_shell_holder.h b/shell/platform/ohos/ohos_shell_holder.h
index a1d83ab44db5c253960832fa061e4bf4219847be..bf2d40eb2322deea0a4e09dccec750aa90f58fae 100644
--- a/shell/platform/ohos/ohos_shell_holder.h
+++ b/shell/platform/ohos/ohos_shell_holder.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef OHOS_SHELL_HOLDER_H
-#define OHOS_SHELL_HOLDER_H
+#ifndef FLUTTER_SHELL_PLATFORM_OHOS_OHOS_SHELL_HOLDER_H_
+#define FLUTTER_SHELL_PLATFORM_OHOS_OHOS_SHELL_HOLDER_H_
 #define FML_USED_ON_EMBEDDER
 #include "flutter/assets/asset_manager.h"
 #include "flutter/fml/macros.h"
@@ -99,4 +99,4 @@ class OHOSShellHolder {
 };
 }  // namespace flutter
 
-#endif
+#endif  // FLUTTER_SHELL_PLATFORM_OHOS_OHOS_SHELL_HOLDER_H_
diff --git a/shell/platform/ohos/ohos_surface_gl_impeller.cpp b/shell/platform/ohos/ohos_surface_gl_impeller.cpp
index b50e8c8d7b6e812216114ea2e2af98041967a319..16425a53c1e550a47eae086950c634230d614c32 100755
--- a/shell/platform/ohos/ohos_surface_gl_impeller.cpp
+++ b/shell/platform/ohos/ohos_surface_gl_impeller.cpp
@@ -58,7 +58,8 @@ class OHOSSurfaceGLImpeller::ReactorWorker final
 
 // for init use
 static std::shared_ptr<impeller::Context> CreateImpellerContext(
-    const std::shared_ptr<impeller::ReactorGLES::Worker>& worker) {
+    const std::shared_ptr<impeller::ReactorGLES::Worker>& worker,
+    bool enable_gpu_tracing) {
   auto proc_table = std::make_unique<impeller::ProcTableGLES>(
       impeller::egl::CreateProcAddressResolver());
 
@@ -73,8 +74,8 @@ static std::shared_ptr<impeller::Context> CreateImpellerContext(
           impeller_entity_shaders_gles_length),
   };
 
-  auto context =
-      impeller::ContextGLES::Create(std::move(proc_table), shader_mappings);
+  auto context = impeller::ContextGLES::Create(
+      std::move(proc_table), shader_mappings, enable_gpu_tracing);
   if (!context) {
     FML_LOG(ERROR) << "Could not create OpenGLES Impeller Context.";
     return nullptr;
@@ -90,7 +91,8 @@ static std::shared_ptr<impeller::Context> CreateImpellerContext(
 }
 
 OHOSSurfaceGLImpeller::OHOSSurfaceGLImpeller(
-    const std::shared_ptr<OHOSContext>& ohos_context)
+    const std::shared_ptr<OHOSContext>& ohos_context,
+    bool enable_gpu_tracing)
     : OHOSSurface(ohos_context),
       reactor_worker_(std::make_shared<ReactorWorker>()) {
   auto display = std::make_unique<impeller::egl::Display>();
@@ -145,7 +147,8 @@ OHOSSurfaceGLImpeller::OHOSSurfaceGLImpeller(
     return;
   }
 
-  auto impeller_context = CreateImpellerContext(reactor_worker_);
+  auto impeller_context =
+      CreateImpellerContext(reactor_worker_, enable_gpu_tracing);
 
   if (!impeller_context) {
     FML_DLOG(ERROR) << "Could not create Impeller context.";
@@ -199,8 +202,9 @@ bool OHOSSurfaceGLImpeller::IsValid() const {
 std::unique_ptr<Surface> OHOSSurfaceGLImpeller::CreateGPUSurface(
     GrDirectContext* gr_context) {
   auto surface =
-      std::make_unique<GPUSurfaceGLImpeller>(this,              // delegate
-                                             impeller_context_  // context
+      std::make_unique<GPUSurfaceGLImpeller>(this,               // delegate
+                                             impeller_context_,  // context
+                                             true  // bool render_to_surface
       );
   if (!surface->IsValid()) {
     return nullptr;
@@ -336,26 +340,3 @@ bool OHOSSurfaceGLImpeller::
 }
 
 }  // namespace flutter
-
-// todo //flutter/impeller/toolkit/egl/display.cc
-// 中的该方法一直链接不上，其他方法都可以，无奈之举
-namespace impeller {
-namespace egl {
-std::unique_ptr<Surface> Display::CreateWindowSurface(
-    const Config& config,
-    EGLNativeWindowType window) {
-  const EGLint attribs[] = {EGL_NONE};
-  auto surface = ::eglCreateWindowSurface(display_,            // display
-                                          config.GetHandle(),  // config
-                                          window,              // window
-                                          attribs              // attrib_list
-  );
-  if (surface == EGL_NO_SURFACE) {
-    IMPELLER_LOG_EGL_ERROR;
-    return nullptr;
-  }
-  return std::make_unique<Surface>(display_, surface);
-}
-
-}  // namespace egl
-}  // namespace impeller
diff --git a/shell/platform/ohos/ohos_surface_gl_impeller.h b/shell/platform/ohos/ohos_surface_gl_impeller.h
index 87b2fa4bf601f51700c3c24c6829518f035cbec4..d804dd452a6a8cd1fc45183c00b12e0976e334e6 100755
--- a/shell/platform/ohos/ohos_surface_gl_impeller.h
+++ b/shell/platform/ohos/ohos_surface_gl_impeller.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef OHOS_SURFACE_GL_IMPELLER_H
-#define OHOS_SURFACE_GL_IMPELLER_H
+#ifndef FLUTTER_SHELL_PLATFORM_OHOS_OHOS_SURFACE_GL_IMPELLER_H_
+#define FLUTTER_SHELL_PLATFORM_OHOS_OHOS_SURFACE_GL_IMPELLER_H_
 
 #include "flutter/fml/macros.h"
 #include "flutter/impeller/renderer/context.h"
@@ -28,7 +28,8 @@ namespace flutter {
 class OHOSSurfaceGLImpeller final : public GPUSurfaceGLDelegate,
                                     public OHOSSurface {
  public:
-  OHOSSurfaceGLImpeller(const std::shared_ptr<OHOSContext>& ohos_context);
+  OHOSSurfaceGLImpeller(const std::shared_ptr<OHOSContext>& ohos_context,
+                        bool enable_gpu_tracing);
 
   ~OHOSSurfaceGLImpeller() override;
 
@@ -104,4 +105,4 @@ class OHOSSurfaceGLImpeller final : public GPUSurfaceGLDelegate,
 };
 
 }  // namespace flutter
-#endif
\ No newline at end of file
+#endif  // FLUTTER_SHELL_PLATFORM_OHOS_OHOS_SURFACE_GL_IMPELLER_H_
\ No newline at end of file
diff --git a/shell/platform/ohos/ohos_surface_gl_skia.cpp b/shell/platform/ohos/ohos_surface_gl_skia.cpp
old mode 100755
new mode 100644
index dcd4a06481b5af212cecd5aa143bfdd529de6162..e325b513112e7dcee84e1c660251d842d1bbbbbb
--- a/shell/platform/ohos/ohos_surface_gl_skia.cpp
+++ b/shell/platform/ohos/ohos_surface_gl_skia.cpp
@@ -16,6 +16,7 @@
 #include "flutter/shell/platform/ohos/ohos_surface_gl_skia.h"
 
 #include <GLES2/gl2.h>
+#include <cstddef>
 
 #include "flutter/fml/logging.h"
 #include "flutter/fml/memory/ref_ptr.h"
@@ -73,7 +74,9 @@ std::unique_ptr<Surface> OhosSurfaceGLSkia::CreateGPUSurface(
         GLContextPtr()->GetMainSkiaContext();
     if (!main_skia_context) {
       main_skia_context = GPUSurfaceGLSkia::MakeGLContext(this);
-      FML_LOG(ERROR) << "Could not make main_skia_context";
+      if (main_skia_context == nullptr) {
+        FML_LOG(ERROR) << "Could not make main_skia_context ";
+      }
       GLContextPtr()->SetMainSkiaContext(main_skia_context);
     }
     return std::make_unique<GPUSurfaceGLSkia>(main_skia_context, this, true);
@@ -125,6 +128,7 @@ bool OhosSurfaceGLSkia::SetNativeWindow(fml::RefPtr<OHOSNativeWindow> window) {
   // creating a new onscreen surface.
   onscreen_surface_ = nullptr;
   // Create the onscreen surface.
+  FML_LOG(INFO) << "SetNativeWindow create onscreensurface";
   onscreen_surface_ = GLContextPtr()->CreateOnscreenSurface(window);
   if (!onscreen_surface_->IsValid()) {
     return false;
@@ -183,7 +187,6 @@ GLFBOInfo OhosSurfaceGLSkia::GLContextFBO(GLFrameInfo frame_info) const {
   // The default window bound framebuffer on Ohos.
   return GLFBOInfo{
       .fbo_id = 0,
-      .partial_repaint_enabled = onscreen_surface_->SupportsPartialRepaint(),
       .existing_damage = onscreen_surface_->InitialDamage(),
   };
 }
@@ -238,6 +241,8 @@ std::unique_ptr<Surface> OhosSurfaceGLSkia::CreateSnapshotSurface() {
       GLContextPtr()->GetMainSkiaContext();
   if (!main_skia_context) {
     main_skia_context = GPUSurfaceGLSkia::MakeGLContext(this);
+    FML_DLOG(INFO) << "CreateSnapshotSurface create and make skia context "
+                   << main_skia_context;
     GLContextPtr()->SetMainSkiaContext(main_skia_context);
   }
 
diff --git a/shell/platform/ohos/ohos_surface_gl_skia.h b/shell/platform/ohos/ohos_surface_gl_skia.h
index 4a99529433248f7f0a6677120d5e5b61cb896c66..b1adfdaa6196604b2a86cdad0a46c68939449ae6 100755
--- a/shell/platform/ohos/ohos_surface_gl_skia.h
+++ b/shell/platform/ohos/ohos_surface_gl_skia.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef OHOS_SURFACE_GL_SKIA_H
-#define OHOS_SURFACE_GL_SKIA_H
+#ifndef FLUTTER_SHELL_PLATFORM_OHOS_OHOS_SURFACE_GL_SKIA_H_
+#define FLUTTER_SHELL_PLATFORM_OHOS_OHOS_SURFACE_GL_SKIA_H_
 
 #include <memory>
 
@@ -102,4 +102,4 @@ class OhosSurfaceGLSkia final : public GPUSurfaceGLDelegate,
 
 }  // namespace flutter
 
-#endif
+#endif  // FLUTTER_SHELL_PLATFORM_OHOS_OHOS_SURFACE_GL_SKIA_H_
diff --git a/shell/platform/ohos/ohos_surface_software.cpp b/shell/platform/ohos/ohos_surface_software.cpp
index b5c9271596b959574ed4d01d1d78df0d6e5d03a7..3c3b1650b7c4f623d854d03beab4c84428d0c3a2 100644
--- a/shell/platform/ohos/ohos_surface_software.cpp
+++ b/shell/platform/ohos/ohos_surface_software.cpp
@@ -19,6 +19,7 @@
 #include "flutter/fml/logging.h"
 #include "napi_common.h"
 #include "third_party/skia/include/core/SkImage.h"
+#include "third_party/skia/include/core/SkSurface.h"
 #include "types.h"
 
 namespace flutter {
@@ -125,7 +126,7 @@ sk_sp<SkSurface> OHOSSurfaceSoftware::AcquireBackingStore(const SkISize& size) {
                         target_alpha_type_, SkColorSpace::MakeSRGB());
 
   FML_DLOG(INFO) << "AcquireBackingStore...MakeRaster ";
-  sk_surface_ = SkSurface::MakeRaster(image_info);
+  sk_surface_ = SkSurfaces::Raster(image_info);
 
   LOGD("AcquireBackingStore end");
   return sk_surface_;
diff --git a/shell/platform/ohos/ohos_surface_software.h b/shell/platform/ohos/ohos_surface_software.h
index a0dfd8ae0044bac6d03d3b523453a3c91beae9aa..10a3c8ec95e0073a5b764a987ef614ba95cb9c54 100644
--- a/shell/platform/ohos/ohos_surface_software.h
+++ b/shell/platform/ohos/ohos_surface_software.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef OHOS_SURFACE_SOFTWARE_H
-#define OHOS_SURFACE_SOFTWARE_H
+#ifndef FLUTTER_SHELL_PLATFORM_OHOS_OHOS_SURFACE_SOFTWARE_H_
+#define FLUTTER_SHELL_PLATFORM_OHOS_OHOS_SURFACE_SOFTWARE_H_
 
 #include "flutter/fml/macros.h"
 #include "flutter/shell/gpu/gpu_surface_software.h"
@@ -66,4 +66,4 @@ class OHOSSurfaceSoftware final : public OHOSSurface,
   FML_DISALLOW_COPY_AND_ASSIGN(OHOSSurfaceSoftware);
 };
 }  // namespace flutter
-#endif
\ No newline at end of file
+#endif  // FLUTTER_SHELL_PLATFORM_OHOS_OHOS_SURFACE_SOFTWARE_H_
\ No newline at end of file
diff --git a/shell/platform/ohos/ohos_surface_vulkan_impeller.cpp b/shell/platform/ohos/ohos_surface_vulkan_impeller.cpp
old mode 100755
new mode 100644
index 3e6a3937fc39c33d7ec8526253fb0b7dc7883f1e..70e1731572aa6105dcdfbf931068280b82a3baad
--- a/shell/platform/ohos/ohos_surface_vulkan_impeller.cpp
+++ b/shell/platform/ohos/ohos_surface_vulkan_impeller.cpp
@@ -18,49 +18,20 @@
 #include <memory>
 #include <utility>
 
-#include "flutter/fml/concurrent_message_loop.h"
 #include "flutter/fml/logging.h"
 #include "flutter/fml/memory/ref_ptr.h"
 #include "flutter/impeller/renderer/backend/vulkan/context_vk.h"
 #include "flutter/shell/gpu/gpu_surface_vulkan_impeller.h"
-#include "flutter/vulkan/vulkan_native_surface_android.h"
-#include "impeller/entity/vk/entity_shaders_vk.h"
-#include "impeller/entity/vk/modern_shaders_vk.h"
 
 namespace flutter {
 
-std::shared_ptr<impeller::Context> CreateImpellerContext(
-    const fml::RefPtr<vulkan::VulkanProcTable>& proc_table,
-    const std::shared_ptr<fml::ConcurrentMessageLoop>& concurrent_loop) {
-  std::vector<std::shared_ptr<fml::Mapping>> shader_mappings = {
-      std::make_shared<fml::NonOwnedMapping>(impeller_entity_shaders_vk_data,
-                                             impeller_entity_shaders_vk_length),
-      std::make_shared<fml::NonOwnedMapping>(impeller_modern_shaders_vk_data,
-                                             impeller_modern_shaders_vk_length),
-  };
-
-  PFN_vkGetInstanceProcAddr instance_proc_addr =
-      proc_table->NativeGetInstanceProcAddr();
-
-  auto context =
-      impeller::ContextVK::Create(instance_proc_addr,                //
-                                  shader_mappings,                   //
-                                  nullptr,                           //
-                                  concurrent_loop->GetTaskRunner(),  //
-                                  "Android Impeller Vulkan Lib"      //
-      );
-
-  return context;
-}
-
 OHOSSurfaceVulkanImpeller::OHOSSurfaceVulkanImpeller(
     const std::shared_ptr<OHOSContext>& ohos_context)
-    : OHOSSurface(ohos_context),
-      proc_table_(fml::MakeRefCounted<vulkan::VulkanProcTable>()),
-      workers_(fml::ConcurrentMessageLoop::Create()) {
-  impeller_context_ = CreateImpellerContext(proc_table_, workers_);
-  is_valid_ =
-      proc_table_->HasAcquiredMandatoryProcAddresses() && impeller_context_;
+    : OHOSSurface(ohos_context) {
+  is_valid_ = ohos_context->IsValid();
+  auto& context_vk =
+      impeller::ContextVK::Cast(*ohos_context->GetImpellerContext());
+  surface_context_vk_ = context_vk.CreateSurfaceContext();
 }
 
 OHOSSurfaceVulkanImpeller::~OHOSSurfaceVulkanImpeller() {}
@@ -82,7 +53,7 @@ std::unique_ptr<Surface> OHOSSurfaceVulkanImpeller::CreateGPUSurface(
   }
 
   std::unique_ptr<GPUSurfaceVulkanImpeller> gpu_surface =
-      std::make_unique<GPUSurfaceVulkanImpeller>(impeller_context_);
+      std::make_unique<GPUSurfaceVulkanImpeller>(surface_context_vk_);
 
   if (!gpu_surface->IsValid()) {
     return nullptr;
@@ -98,47 +69,49 @@ void OHOSSurfaceVulkanImpeller::TeardownOnScreenContext() {
 
 // |OHOSSurface|
 bool OHOSSurfaceVulkanImpeller::OnScreenSurfaceResize(const SkISize& size) {
+  surface_context_vk_->UpdateSurfaceSize(
+      impeller::ISize{size.width(), size.height()});
   return true;
 }
 
 // |OHOSSurface|
 bool OHOSSurfaceVulkanImpeller::ResourceContextMakeCurrent() {
-  // not support
-  return false;
+  // do nothing (it is not opengl)
+  return true;
 }
 
 // |OHOSSurface|
 bool OHOSSurfaceVulkanImpeller::ResourceContextClearCurrent() {
-  // not support
-  return false;
-}
-
-// |OHOSSurface|
-std::shared_ptr<impeller::Context>
-OHOSSurfaceVulkanImpeller::GetImpellerContext() {
-  return impeller_context_;
+  // do nothing (it is not opengl)
+  return true;
 }
 
 // |OHOSSurface|
 bool OHOSSurfaceVulkanImpeller::SetNativeWindow(
     fml::RefPtr<OHOSNativeWindow> window) {
+  native_window_ = std::move(window);
   bool success = native_window_ && native_window_->IsValid();
 
   if (success) {
-    auto& context_vk = impeller::ContextVK::Cast(*impeller_context_);
-    auto surface = context_vk.CreateAndroidSurface(native_window_->Gethandle());
+    auto surface =
+        surface_context_vk_->CreateOHOSSurface(native_window_->Gethandle());
 
     if (!surface) {
       FML_LOG(ERROR) << "Could not create a vulkan surface.";
       return false;
     }
-
-    context_vk.SetupSwapchain(std::move(surface));
-    return true;
+    auto size = native_window_->GetSize();
+    return surface_context_vk_->SetWindowSurface(
+        std::move(surface), impeller::ISize{size.width(), size.height()});
   }
 
   native_window_ = nullptr;
   return false;
 }
 
+std::shared_ptr<impeller::Context>
+OHOSSurfaceVulkanImpeller::GetImpellerContext() {
+  return surface_context_vk_;
+}
+
 }  // namespace flutter
\ No newline at end of file
diff --git a/shell/platform/ohos/ohos_surface_vulkan_impeller.h b/shell/platform/ohos/ohos_surface_vulkan_impeller.h
old mode 100755
new mode 100644
index b5bbb42e7a123c0804503a450906210f26edfdee..2b0cd7b309105ad6f05ebed265fd4cfeb74bb95b
--- a/shell/platform/ohos/ohos_surface_vulkan_impeller.h
+++ b/shell/platform/ohos/ohos_surface_vulkan_impeller.h
@@ -13,14 +13,15 @@
  * limitations under the License.
  */
 
-#ifndef OHOS_SURFACE_VULKAN_IMPELLER_H
-#define OHOS_SURFACE_VULKAN_IMPELLER_H
+#ifndef FLUTTER_SHELL_PLATFORM_OHOS_OHOS_SURFACE_VULKAN_IMPELLER_H_
+#define FLUTTER_SHELL_PLATFORM_OHOS_OHOS_SURFACE_VULKAN_IMPELLER_H_
 
 #include "flutter/fml/concurrent_message_loop.h"
 #include "flutter/fml/macros.h"
+#include "flutter/impeller/renderer/backend/vulkan/surface_context_vk.h"
 #include "flutter/impeller/renderer/context.h"
-#include "flutter/vulkan/procs/vulkan_proc_table.h"
 
+#include "shell/platform/ohos/ohos_context_vulkan_impeller.h"
 #include "surface/ohos_native_window.h"
 #include "surface/ohos_surface.h"
 
@@ -28,7 +29,8 @@ namespace flutter {
 
 class OHOSSurfaceVulkanImpeller : public OHOSSurface {
  public:
-  OHOSSurfaceVulkanImpeller(const std::shared_ptr<OHOSContext>& ohos_context);
+  explicit OHOSSurfaceVulkanImpeller(
+      const std::shared_ptr<OHOSContext>& ohos_context);
 
   ~OHOSSurfaceVulkanImpeller() override;
 
@@ -58,13 +60,11 @@ class OHOSSurfaceVulkanImpeller : public OHOSSurface {
   bool SetNativeWindow(fml::RefPtr<OHOSNativeWindow> window) override;
 
  private:
-  fml::RefPtr<vulkan::VulkanProcTable> proc_table_;
   fml::RefPtr<OHOSNativeWindow> native_window_;
-  std::shared_ptr<fml::ConcurrentMessageLoop> workers_;
-  std::shared_ptr<impeller::Context> impeller_context_;
+  std::shared_ptr<impeller::SurfaceContextVK> surface_context_vk_;
   bool is_valid_ = false;
 
   FML_DISALLOW_COPY_AND_ASSIGN(OHOSSurfaceVulkanImpeller);
 };
 }  // namespace flutter
-#endif
\ No newline at end of file
+#endif  // FLUTTER_SHELL_PLATFORM_OHOS_OHOS_SURFACE_VULKAN_IMPELLER_H_
\ No newline at end of file
diff --git a/shell/platform/ohos/ohos_touch_processor.h b/shell/platform/ohos/ohos_touch_processor.h
index 68873848fd417a47be9cf048feb04a5633174a5a..f915b5b4f9f1017f39dc426346328d232904931d 100644
--- a/shell/platform/ohos/ohos_touch_processor.h
+++ b/shell/platform/ohos/ohos_touch_processor.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef OHOS_TOUCH_PROCESSOR_H
-#define OHOS_TOUCH_PROCESSOR_H
+#ifndef FLUTTER_SHELL_PLATFORM_OHOS_OHOS_TOUCH_PROCESSOR_H_
+#define FLUTTER_SHELL_PLATFORM_OHOS_OHOS_TOUCH_PROCESSOR_H_
 #include <ace/xcomponent/native_interface_xcomponent.h>
 #include <vector>
 #include "flutter/lib/ui/window/pointer_data.h"
@@ -37,4 +37,4 @@ class OhosTouchProcessor {
  private:
 };
 }  // namespace flutter
-#endif  // XComponent_OhosTouchProcessor_H
\ No newline at end of file
+#endif  // FLUTTER_SHELL_PLATFORM_OHOS_OHOS_TOUCH_PROCESSOR_H_
\ No newline at end of file
diff --git a/shell/platform/ohos/ohos_unified_surface.h b/shell/platform/ohos/ohos_unified_surface.h
index 591ba0dddfc5c9e80c6c6d811626a0d82e19fcc8..d3de35ac455cb419f74ab9ca0af4c77dc4493671 100644
--- a/shell/platform/ohos/ohos_unified_surface.h
+++ b/shell/platform/ohos/ohos_unified_surface.h
@@ -13,23 +13,22 @@
  * limitations under the License.
  */
 
-#ifndef OHOS_UNIFIED_SURFACE_H
-#define OHOS_UNIFIED_SURFACE_H
+#ifndef FLUTTER_SHELL_PLATFORM_OHOS_OHOS_UNIFIED_SURFACE_H_
+#define FLUTTER_SHELL_PLATFORM_OHOS_OHOS_UNIFIED_SURFACE_H_
 
 #include <memory>
 #include "flutter/flow/surface.h"
 #include "flutter/shell/platform/ohos/context/ohos_context.h"
+#include "flutter/shell/platform/ohos/ohos_surface_gl_skia.h"
 #include "flutter/shell/platform/ohos/surface/ohos_native_window.h"
 #include "flutter/shell/platform/ohos/surface/ohos_surface.h"
-#include "flutter/shell/platform/ohos/ohos_surface_gl_skia.h"
 #include "third_party/skia/include/core/SkSize.h"
 
 namespace flutter {
 
-class OHOSUnifiedSurface : public GPUSurfaceGLDelegate,
-                           public OHOSSurface {
+class OHOSUnifiedSurface : public GPUSurfaceGLDelegate, public OHOSSurface {
  public:
-   ~OHOSUnifiedSurface() {}
+  ~OHOSUnifiedSurface() {}
   bool IsValid() {}
   void TeardownOnScreenContext() {}
 
@@ -43,8 +42,8 @@ class OHOSUnifiedSurface : public GPUSurfaceGLDelegate,
 
   std::unique_ptr<Surface> CreateSnapshotSurface()
 
-  std::unique_ptr<Surface> CreateGPUSurface(
-      GrDirectContext* gr_context = nullptr) {}
+      std::unique_ptr<Surface> CreateGPUSurface(
+          GrDirectContext* gr_context = nullptr) {}
 
   std::shared_ptr<impeller::Context> GetImpellerContext() {}
 
@@ -68,13 +67,12 @@ class OHOSUnifiedSurface : public GPUSurfaceGLDelegate,
 
   static sk_sp<const GrGLInterface> GetDefaultPlatformGLInterface() {}
 
-  using GLProcResolver =
-      std::function<void* (const char*)>;
- 
+  using GLProcResolver = std::function<void*(const char*)>;
+
   GLProcResolver GetGLProcResolver() {}
 
   bool AllowsDrawingWhenGpuDisabled() {}
 };
 }  // namespace flutter
 
-#endif
\ No newline at end of file
+#endif  // FLUTTER_SHELL_PLATFORM_OHOS_OHOS_UNIFIED_SURFACE_H_
\ No newline at end of file
diff --git a/shell/platform/ohos/ohos_xcomponent_adapter.cpp b/shell/platform/ohos/ohos_xcomponent_adapter.cpp
index 991e57f6b5a09e857b8f672fd35e352e25c5af5c..b13e9959931ebf7689dd62a484fc63d15aa693bc 100644
--- a/shell/platform/ohos/ohos_xcomponent_adapter.cpp
+++ b/shell/platform/ohos/ohos_xcomponent_adapter.cpp
@@ -14,9 +14,9 @@
  */
 
 #include "ohos_xcomponent_adapter.h"
+#include <functional>
 #include "flutter/shell/platform/ohos/napi/platform_view_ohos_napi.h"
 #include "types.h"
-#include <functional>
 namespace flutter {
 
 XComponentAdapter XComponentAdapter::mXComponentAdapter;
@@ -147,7 +147,8 @@ static int32_t SetNativeWindowOpt(OHNativeWindow* nativeWindow,
                                   int height) {
   // Set the read and write scenarios of the native window buffer.
   int code = SET_USAGE;
-  int32_t ret = OH_NativeWindow_NativeWindowHandleOpt(nativeWindow, code, BUFFER_USAGE_MEM_DMA);
+  int32_t ret = OH_NativeWindow_NativeWindowHandleOpt(nativeWindow, code,
+                                                      BUFFER_USAGE_MEM_DMA);
   if (ret) {
     LOGE(
         "Set NativeWindow Usage Failed :window:%{public}p ,w:%{public}d x "
@@ -189,28 +190,25 @@ static int32_t SetNativeWindowOpt(OHNativeWindow* nativeWindow,
 }
 
 void OnSurfaceCreatedCB(OH_NativeXComponent* component, void* window) {
-  for(auto it: XComponentAdapter::GetInstance()->xcomponetMap_)
-  {
-    if(it.second->nativeXComponent_ == component) {
+  for (auto it : XComponentAdapter::GetInstance()->xcomponetMap_) {
+    if (it.second->nativeXComponent_ == component) {
       it.second->OnSurfaceCreated(component, window);
     }
   }
 }
 
 void OnSurfaceChangedCB(OH_NativeXComponent* component, void* window) {
-  for(auto it: XComponentAdapter::GetInstance()->xcomponetMap_)
-  {
-    if(it.second->nativeXComponent_ == component) {
+  for (auto it : XComponentAdapter::GetInstance()->xcomponetMap_) {
+    if (it.second->nativeXComponent_ == component) {
       it.second->OnSurfaceChanged(component, window);
     }
   }
 }
 
 void OnSurfaceDestroyedCB(OH_NativeXComponent* component, void* window) {
-  for(auto it = XComponentAdapter::GetInstance()->xcomponetMap_.begin(); 
-    it != XComponentAdapter::GetInstance()->xcomponetMap_.end();)
-  {
-    if(it->second->nativeXComponent_ == component) {
+  for (auto it = XComponentAdapter::GetInstance()->xcomponetMap_.begin();
+       it != XComponentAdapter::GetInstance()->xcomponetMap_.end();) {
+    if (it->second->nativeXComponent_ == component) {
       it->second->OnSurfaceDestroyed(component, window);
       delete it->second;
       it = XComponentAdapter::GetInstance()->xcomponetMap_.erase(it);
@@ -218,12 +216,10 @@ void OnSurfaceDestroyedCB(OH_NativeXComponent* component, void* window) {
       ++it;
     }
   }
-
 }
 void DispatchTouchEventCB(OH_NativeXComponent* component, void* window) {
-  for(auto it: XComponentAdapter::GetInstance()->xcomponetMap_)
-  {
-    if(it.second->nativeXComponent_ == component) {
+  for (auto it : XComponentAdapter::GetInstance()->xcomponetMap_) {
+    if (it.second->nativeXComponent_ == component) {
       it.second->OnDispatchTouchEvent(component, window);
     }
   }
@@ -236,10 +232,9 @@ void XComponentBase::BindXComponentCallback() {
   callback_.DispatchTouchEvent = DispatchTouchEventCB;
 }
 
-XComponentBase::XComponentBase(std::string id){
+XComponentBase::XComponentBase(std::string id) {
   id_ = id;
   isEngineAttached_ = false;
-  isSurfaceCreated_ = false;
 }
 
 XComponentBase::~XComponentBase() {}
@@ -249,26 +244,12 @@ void XComponentBase::AttachFlutterEngine(std::string shellholderId) {
       "XComponentManger::AttachFlutterEngine xcomponentId:%{public}s, "
       "shellholderId:%{public}s",
       id_.c_str(), shellholderId.c_str());
-  isEngineAttached_ = true;
-
-  if (shellholderId_ == shellholderId && isSurfaceCreated_) {
-    LOGI("XComponentManger::AttachFlutterEngine XComponentId:%{public}s shellHolderId:%{public}s Surface has been created.", id_.c_str(), shellholderId.c_str());
-    PlatformViewOHOSNapi::SurfaceWindowChanged(std::stoll(shellholderId_), window_);
-    return;
-  }
-
-  if (!shellholderId_.empty() && shellholderId_ != shellholderId) {
-    if (window_ != nullptr) {
-      PlatformViewOHOSNapi::SurfaceDestroyed(std::stoll(shellholderId_));
-    }
-  }
-
   shellholderId_ = shellholderId;
+  isEngineAttached_ = true;
   if (window_ != nullptr) {
     PlatformViewOHOSNapi::SurfaceCreated(std::stoll(shellholderId_), window_);
-    isSurfaceCreated_ = true;
   } else {
-    LOGE("OnSurfaceCreated XComponentBase is not attached");
+    LOGE("AttachFlutterEngine XComponentBase is not attached");
   }
 }
 
@@ -277,10 +258,17 @@ void XComponentBase::DetachFlutterEngine() {
       "XComponentManger::DetachFlutterEngine xcomponentId:%{public}s, "
       "shellholderId:%{public}s",
       id_.c_str(), shellholderId_.c_str());
+  if (window_ != nullptr) {
+    PlatformViewOHOSNapi::SurfaceDestroyed(std::stoll(shellholderId_));
+  } else {
+    LOGE("DetachFlutterEngine XComponentBase is not attached");
+  }
+  shellholderId_ = "";
   isEngineAttached_ = false;
 }
 
-void XComponentBase::SetNativeXComponent(OH_NativeXComponent* nativeXComponent){
+void XComponentBase::SetNativeXComponent(
+    OH_NativeXComponent* nativeXComponent) {
   nativeXComponent_ = nativeXComponent;
   if (nativeXComponent_ != nullptr) {
     BindXComponentCallback();
@@ -294,7 +282,7 @@ void XComponentBase::OnSurfaceCreated(OH_NativeXComponent* component,
       "XComponentManger::OnSurfaceCreated window = %{public}p component = "
       "%{public}p",
       window, component);
-      window_ = window;
+  window_ = window;
   int32_t ret = OH_NativeXComponent_GetXComponentSize(component, window,
                                                       &width_, &height_);
   if (ret == OH_NATIVEXCOMPONENT_RESULT_SUCCESS) {
@@ -317,8 +305,8 @@ void XComponentBase::OnSurfaceCreated(OH_NativeXComponent* component,
   }
 }
 
-void XComponentBase::OnSurfaceChanged(OH_NativeXComponent* component, void* window)
-{
+void XComponentBase::OnSurfaceChanged(OH_NativeXComponent* component,
+                                      void* window) {
   LOGD("XComponentManger::OnSurfaceChanged ");
   int32_t ret = OH_NativeXComponent_GetXComponentSize(component, window,
                                                       &width_, &height_);
@@ -352,7 +340,7 @@ void XComponentBase::OnDispatchTouchEvent(OH_NativeXComponent* component,
       OH_NativeXComponent_GetTouchEvent(component, window, &touchEvent_);
   if (ret == OH_NATIVEXCOMPONENT_RESULT_SUCCESS) {
     if (isEngineAttached_) {
-       LOGD("XComponentManger::HandleTouchEvent");
+      LOGD("XComponentManger::HandleTouchEvent");
       ohosTouchProcessor_.HandleTouchEvent(std::stoll(shellholderId_),
                                            component, &touchEvent_);
     } else {
diff --git a/shell/platform/ohos/ohos_xcomponent_adapter.h b/shell/platform/ohos/ohos_xcomponent_adapter.h
index af3175f0e51f4b986fa058e32fb6b634c3ce000b..1c88f7459f076c490d7d5afe9873076b8e1ef72c 100644
--- a/shell/platform/ohos/ohos_xcomponent_adapter.h
+++ b/shell/platform/ohos/ohos_xcomponent_adapter.h
@@ -13,22 +13,21 @@
  * limitations under the License.
  */
 
-#ifndef OHOS_XCOMPONENT_ADAPTER_H
-#define OHOS_XCOMPONENT_ADAPTER_H
+#ifndef FLUTTER_SHELL_PLATFORM_OHOS_OHOS_XCOMPONENT_ADAPTER_H_
+#define FLUTTER_SHELL_PLATFORM_OHOS_OHOS_XCOMPONENT_ADAPTER_H_
 #include <ace/xcomponent/native_interface_xcomponent.h>
+#include <map>
 #include <string>
 #include "flutter/shell/platform/ohos/ohos_touch_processor.h"
 #include "napi/native_api.h"
 #include "napi_common.h"
-#include <map>
 namespace flutter {
 
-class XComponentBase
-{
-private:
+class XComponentBase {
+ private:
   void BindXComponentCallback();
-  
-public:
+
+ public:
   XComponentBase(std::string id);
   ~XComponentBase();
 
@@ -48,13 +47,11 @@ public:
   std::string shellholderId_;
   bool isEngineAttached_;
   bool isWindowAttached_;
-  bool isSurfaceCreated_;
   OH_NativeXComponent* nativeXComponent_;
   void* window_;
   uint64_t width_;
   uint64_t height_;
   OhosTouchProcessor ohosTouchProcessor_;
-
 };
 
 class XComponentAdapter {
@@ -77,4 +74,4 @@ class XComponentAdapter {
 
 }  // namespace flutter
 
-#endif
\ No newline at end of file
+#endif  // FLUTTER_SHELL_PLATFORM_OHOS_OHOS_XCOMPONENT_ADAPTER_H_
\ No newline at end of file
diff --git a/shell/platform/ohos/platform_message_handler_ohos.h b/shell/platform/ohos/platform_message_handler_ohos.h
index 5536f269015b8f3dfe29b88ccc1c09d628a96f67..4e1aa01300e496563e02ed8c3d0fddfc060e40fa 100644
--- a/shell/platform/ohos/platform_message_handler_ohos.h
+++ b/shell/platform/ohos/platform_message_handler_ohos.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef PLATFORM_MESSAGE_HANDLER_OHOS_H
-#define PLATFORM_MESSAGE_HANDLER_OHOS_H
+#ifndef FLUTTER_SHELL_PLATFORM_OHOS_PLATFORM_MESSAGE_HANDLER_OHOS_H_
+#define FLUTTER_SHELL_PLATFORM_OHOS_PLATFORM_MESSAGE_HANDLER_OHOS_H_
 #include <memory>
 #include <mutex>
 #include <unordered_map>
@@ -51,4 +51,4 @@ class PlatformMessageHandlerOHOS : public PlatformMessageHandler {
 };
 
 }  // namespace flutter
-#endif
\ No newline at end of file
+#endif  // FLUTTER_SHELL_PLATFORM_OHOS_PLATFORM_MESSAGE_HANDLER_OHOS_H_
\ No newline at end of file
diff --git a/shell/platform/ohos/platform_message_response_ohos.h b/shell/platform/ohos/platform_message_response_ohos.h
index eaf144f10cb5080f3eddc73b74dea47f1c542567..fedde2a8c52b428a23f86e6626151138e1d6b785 100644
--- a/shell/platform/ohos/platform_message_response_ohos.h
+++ b/shell/platform/ohos/platform_message_response_ohos.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef PLATFORM_MESSAGE_REPONSE_OHOS_H
-#define PLATFORM_MESSAGE_REPONSE_OHOS_H
+#ifndef FLUTTER_SHELL_PLATFORM_OHOS_PLATFORM_MESSAGE_RESPONSE_OHOS_H_
+#define FLUTTER_SHELL_PLATFORM_OHOS_PLATFORM_MESSAGE_RESPONSE_OHOS_H_
 
 #include "flutter/fml/macros.h"
 #include "flutter/fml/task_runner.h"
@@ -50,4 +50,4 @@ class PlatformMessageResponseOHOS : public flutter::PlatformMessageResponse {
 };
 
 }  // namespace flutter
-#endif
\ No newline at end of file
+#endif  // FLUTTER_SHELL_PLATFORM_OHOS_PLATFORM_MESSAGE_RESPONSE_OHOS_H_
\ No newline at end of file
diff --git a/shell/platform/ohos/platform_view_ohos.cpp b/shell/platform/ohos/platform_view_ohos.cpp
index bf65b2252ee32a708afe16d495c2a0f3c989d361..0d377f97a6ee94800dfd7e240cc8735495abe1ab 100644
--- a/shell/platform/ohos/platform_view_ohos.cpp
+++ b/shell/platform/ohos/platform_view_ohos.cpp
@@ -24,31 +24,33 @@
 #include "flutter/shell/platform/ohos/platform_message_response_ohos.h"
 #include "napi_common.h"
 #include "ohos_context_gl_impeller.h"
-#include "ohos_surface_gl_impeller.h"
 #include "ohos_external_texture_gl.h"
+#include "ohos_surface_gl_impeller.h"
+#include "shell/platform/ohos/context/ohos_context.h"
+#include "shell/platform/ohos/ohos_surface_vulkan_impeller.h"
 
 #include <GLES2/gl2ext.h>
 
 namespace flutter {
 
 OhosSurfaceFactoryImpl::OhosSurfaceFactoryImpl(
-    const std::shared_ptr<OHOSContext>& context,
-    bool enable_impeller)
-    : ohos_context_(context), enable_impeller_(enable_impeller) {}
+    const std::shared_ptr<OHOSContext>& context)
+    : ohos_context_(context) {}
 
 OhosSurfaceFactoryImpl::~OhosSurfaceFactoryImpl() = default;
 
 std::unique_ptr<OHOSSurface> OhosSurfaceFactoryImpl::CreateSurface() {
   switch (ohos_context_->RenderingApi()) {
     case OHOSRenderingAPI::kSoftware:
+      FML_LOG(INFO) << "OhosSurfaceFactoryImpl::CreateSurface use software";
       return std::make_unique<OHOSSurfaceSoftware>(ohos_context_);
     case OHOSRenderingAPI::kOpenGLES:
-      if (enable_impeller_) {
-        return std::make_unique<OHOSSurfaceGLImpeller>(ohos_context_);
-      } else {
-        FML_LOG(INFO) << "OhosSurfaceFactoryImpl::OhosSurfaceGLSkia ";
-        return std::make_unique<OhosSurfaceGLSkia>(ohos_context_);
-      }
+      FML_LOG(INFO) << "OhosSurfaceFactoryImpl::CreateSurface use skia-gl";
+      return std::make_unique<OhosSurfaceGLSkia>(ohos_context_);
+    case flutter::OHOSRenderingAPI::kImpellerVulkan:
+      FML_LOG(INFO)
+          << "OhosSurfaceFactoryImpl::CreateSurface use impeller-vulkan";
+      return std::make_unique<OHOSSurfaceVulkanImpeller>(ohos_context_);
     default:
       FML_DCHECK(false);
       return nullptr;
@@ -56,20 +58,26 @@ std::unique_ptr<OHOSSurface> OhosSurfaceFactoryImpl::CreateSurface() {
 }
 
 std::unique_ptr<OHOSContext> CreateOHOSContext(
-    bool use_software_rendering,
     const flutter::TaskRunners& task_runners,
     uint8_t msaa_samples,
-    bool enable_impeller) {
-  if (use_software_rendering) {
-    return std::make_unique<OHOSContext>(OHOSRenderingAPI::kSoftware);
-  }
-  if (enable_impeller) {
-    return std::make_unique<OHOSContextGLImpeller>();
+    OHOSRenderingAPI rendering_api,
+    bool enable_vulkan_validation,
+    bool enable_opengl_gpu_tracing,
+    bool enable_vulkan_gpu_tracing) {
+  switch (rendering_api) {
+    case OHOSRenderingAPI::kSoftware:
+      return std::make_unique<OHOSContext>(OHOSRenderingAPI::kSoftware);
+    case OHOSRenderingAPI::kOpenGLES:
+      return std::make_unique<OhosContextGLSkia>(
+          OHOSRenderingAPI::kOpenGLES, fml::MakeRefCounted<OhosEnvironmentGL>(),
+          task_runners, msaa_samples);
+    case OHOSRenderingAPI::kImpellerVulkan:
+      return std::make_unique<OHOSContextVulkanImpeller>(
+          enable_vulkan_validation, enable_vulkan_gpu_tracing);
+    default:
+      FML_DCHECK(false);
+      return nullptr;
   }
-
-  return std::make_unique<OhosContextGLSkia>(
-      OHOSRenderingAPI::kOpenGLES, fml::MakeRefCounted<OhosEnvironmentGL>(),
-      task_runners, msaa_samples);
 }
 
 PlatformViewOHOS::PlatformViewOHOS(
@@ -83,10 +91,13 @@ PlatformViewOHOS::PlatformViewOHOS(
           task_runners,
           napi_facade,
           CreateOHOSContext(
-              use_software_rendering,
               task_runners,
               msaa_samples,
-              delegate.OnPlatformViewGetSettings().enable_impeller)) {}
+              delegate.OnPlatformViewGetSettings().ohos_rendering_api,
+              delegate.OnPlatformViewGetSettings().enable_vulkan_validation,
+              delegate.OnPlatformViewGetSettings().enable_opengl_gpu_tracing,
+              delegate.OnPlatformViewGetSettings().enable_vulkan_gpu_tracing)) {
+}
 
 PlatformViewOHOS::PlatformViewOHOS(
     PlatformView::Delegate& delegate,
@@ -103,8 +114,7 @@ PlatformViewOHOS::PlatformViewOHOS(
     FML_CHECK(ohos_context_->IsValid())
         << "Could not create surface from invalid Android context.";
     LOGI("ohos_surface_ end 1");
-    surface_factory_ = std::make_shared<OhosSurfaceFactoryImpl>(
-        ohos_context_, delegate.OnPlatformViewGetSettings().enable_impeller);
+    surface_factory_ = std::make_shared<OhosSurfaceFactoryImpl>(ohos_context_);
     LOGI("ohos_surface_ end 2");
     ohos_surface_ = surface_factory_->CreateSurface();
     LOGI("ohos_surface_ end 3");
@@ -115,11 +125,23 @@ PlatformViewOHOS::PlatformViewOHOS(
   }
 }
 
-PlatformViewOHOS::~PlatformViewOHOS() {}
+PlatformViewOHOS::~PlatformViewOHOS() {
+  FML_LOG(INFO) << "PlatformViewOHOS::~PlatformViewOHOS";
+  for (std::map<int64_t, void*>::iterator it = contextDatas_.begin(); it != contextDatas_.end(); ++it) {
+    if (it->second != nullptr) {
+      OhosImageFrameData* data = reinterpret_cast<OhosImageFrameData *>(it->second);
+      delete data;
+      data = nullptr;
+      it->second = nullptr;
+    }
+  }
+  contextDatas_.clear();
+}
 
 void PlatformViewOHOS::NotifyCreate(
     fml::RefPtr<OHOSNativeWindow> native_window) {
   LOGI("NotifyCreate start");
+  SetDestroyed(false);
   if (ohos_surface_) {
     InstallFirstFrameCallback();
     LOGI("NotifyCreate start1");
@@ -138,23 +160,6 @@ void PlatformViewOHOS::NotifyCreate(
   PlatformView::NotifyCreated();
 }
 
-void PlatformViewOHOS::NotifySurfaceWindowChanged(
-    fml::RefPtr<OHOSNativeWindow> native_window) {
-  LOGI("PlatformViewOHOS NotifySurfaceWindowChanged enter");
-  if (ohos_surface_) {
-    fml::AutoResetWaitableEvent latch;
-    fml::TaskRunner::RunNowOrPostTask(
-        task_runners_.GetRasterTaskRunner(),
-        [&latch, surface = ohos_surface_.get(),
-         native_window = std::move(native_window)]() {
-          surface->TeardownOnScreenContext();
-          surface->SetNativeWindow(native_window);
-          latch.Signal();
-        });
-    latch.Wait();
-  }
-}
-
 void PlatformViewOHOS::NotifyChanged(const SkISize& size) {
   LOGI("PlatformViewOHOS NotifyChanged enter");
   if (ohos_surface_) {
@@ -169,9 +174,27 @@ void PlatformViewOHOS::NotifyChanged(const SkISize& size) {
   }
 }
 
+pthread_mutex_t PlatformViewOHOS::mutex_;
+bool PlatformViewOHOS::isDestroyed_ = false;
+
+bool PlatformViewOHOS::GetDestroyed() {
+  bool ret;
+  pthread_mutex_lock(&mutex_);
+  ret = isDestroyed_;
+  pthread_mutex_unlock(&mutex_);
+  return ret;
+}
+
+void PlatformViewOHOS::SetDestroyed(bool isDestroyed) {
+  pthread_mutex_lock(&mutex_);
+  isDestroyed_ = isDestroyed;
+  pthread_mutex_unlock(&mutex_);
+}
+
 // |PlatformView|
 void PlatformViewOHOS::NotifyDestroyed()
 {
+  SetDestroyed(true);
   LOGI("PlatformViewOHOS NotifyDestroyed enter");
   PlatformView::NotifyDestroyed();
   if (ohos_surface_) {
@@ -208,8 +231,8 @@ void PlatformViewOHOS::DispatchPlatformMessage(std::string name,
 
 void PlatformViewOHOS::DispatchEmptyPlatformMessage(std::string name,
                                                     int reponseId) {
-  FML_DLOG(INFO) << "DispatchEmptyPlatformMessage（" << name << ""
-                 << "," << reponseId;
+  FML_DLOG(INFO) << "DispatchEmptyPlatformMessage（" << name << "" << ","
+                 << reponseId;
   fml::RefPtr<flutter::PlatformMessageResponse> response;
   response = fml::MakeRefCounted<PlatformMessageResponseOHOS>(
       reponseId, napi_facade_, task_runners_.GetPlatformTaskRunner());
@@ -391,46 +414,33 @@ void PlatformViewOHOS::FireFirstFrameCallback() {
   napi_facade_->FlutterViewOnFirstFrame();
 }
 
-void PlatformViewOHOS::RegisterExternalTextureByImage(
-    int64_t texture_id,
-    ImageNative* image)
-{
-  if (ohos_context_->RenderingApi() == OHOSRenderingAPI::kOpenGLES) {
-    auto iter = external_texture_gl_.find(texture_id);
-    if (iter != external_texture_gl_.end()) {
-      iter->second->DispatchImage(image);
-    } else {
-      std::shared_ptr<OHOSExternalTextureGL> ohos_external_gl =
-        std::make_shared<OHOSExternalTextureGL>(texture_id, ohos_surface_);
-      external_texture_gl_[texture_id] = ohos_external_gl;
-      RegisterTexture(ohos_external_gl);
-      ohos_external_gl->DispatchImage(image);
-    }
-  }
-}
-
-uint64_t PlatformViewOHOS::RegisterExternalTexture(int64_t texture_id)
-{
+uint64_t PlatformViewOHOS::RegisterExternalTexture(int64_t texture_id) {
   uint64_t surface_id = 0;
   int ret = -1;
   if (ohos_context_->RenderingApi() == OHOSRenderingAPI::kOpenGLES) {
     std::shared_ptr<OHOSExternalTextureGL> ohos_external_gl =
-      std::make_shared<OHOSExternalTextureGL>(texture_id, ohos_surface_);
-    ohos_external_gl->nativeImage_ = OH_NativeImage_Create(texture_id, GL_TEXTURE_EXTERNAL_OES);
+        std::make_shared<OHOSExternalTextureGL>(texture_id, ohos_surface_);
+    ohos_external_gl->nativeImage_ =
+        OH_NativeImage_Create(texture_id, GL_TEXTURE_EXTERNAL_OES);
     if (ohos_external_gl->nativeImage_ == nullptr) {
       FML_DLOG(ERROR) << "Error with OH_NativeImage_Create";
       return surface_id;
     }
     void* contextData = new OhosImageFrameData(this, texture_id);
+    contextDatas_.insert(std::pair<int64_t, void*>(texture_id, contextData));
     OH_OnFrameAvailableListener listener;
     listener.context = contextData;
     listener.onFrameAvailable = &PlatformViewOHOS::OnNativeImageFrameAvailable;
-    ret = OH_NativeImage_SetOnFrameAvailableListener(ohos_external_gl->nativeImage_, listener);
+    ret = OH_NativeImage_SetOnFrameAvailableListener(
+        ohos_external_gl->nativeImage_, listener);
     if (ret != 0) {
-      FML_DLOG(ERROR) << "Error with OH_NativeImage_SetOnFrameAvailableListener";
+      FML_DLOG(ERROR)
+          << "Error with OH_NativeImage_SetOnFrameAvailableListener";
       return surface_id;
     }
-    ret = OH_NativeImage_GetSurfaceId(ohos_external_gl->nativeImage_, &surface_id);
+    ret = OH_NativeImage_GetSurfaceId(ohos_external_gl->nativeImage_,
+                                      &surface_id);
+    ohos_external_gl->first_update_ = false;
     if (ret != 0) {
       FML_DLOG(ERROR) << "Error with OH_NativeImage_GetSurfaceId";
       return surface_id;
@@ -440,32 +450,57 @@ uint64_t PlatformViewOHOS::RegisterExternalTexture(int64_t texture_id)
   return surface_id;
 }
 
-void PlatformViewOHOS::OnNativeImageFrameAvailable(void *data)
-{
-  auto frameData = reinterpret_cast<OhosImageFrameData *>(data);
+void PlatformViewOHOS::OnNativeImageFrameAvailable(void* data) {
+  auto frameData = reinterpret_cast<OhosImageFrameData*>(data);
   if (frameData == nullptr || frameData->context_ == nullptr) {
-    FML_DLOG(ERROR) << "OnNativeImageFrameAvailable, frameData or context_ is null.";
+    FML_DLOG(ERROR)
+        << "OnNativeImageFrameAvailable, frameData or context_ is null.";
+    return;
+  }
+
+  if (frameData->context_->GetDestroyed()) {
+    FML_LOG(ERROR) << "OnNativeImageFrameAvailable NotifyDstroyed, will not MarkTextureFrameAvailable";
     return;
   }
-  std::shared_ptr<OHOSSurface> ohos_surface = frameData->context_->ohos_surface_;
+
+  std::shared_ptr<OHOSSurface> ohos_surface =
+      frameData->context_->ohos_surface_;
   const TaskRunners task_runners = frameData->context_->task_runners_;
   if (ohos_surface) {
     fml::TaskRunner::RunNowOrPostTask(
-        task_runners.GetPlatformTaskRunner(),
-        [frameData]() {
-          frameData->context_->MarkTextureFrameAvailable(frameData->texture_id_);
+        task_runners.GetPlatformTaskRunner(), [frameData]() {
+          if (frameData->context_->GetDestroyed()) {
+            FML_LOG(ERROR) << "OnNativeImageFrameAvailable NotifyDstroyed, will not MarkTextureFrameAvailable";
+            return;
+          }
+          frameData->context_->MarkTextureFrameAvailable(
+              frameData->texture_id_);
         });
   }
 }
 
-void PlatformViewOHOS::UnRegisterExternalTexture(int64_t texture_id)
-{
+void PlatformViewOHOS::UnRegisterExternalTexture(int64_t texture_id) {
   external_texture_gl_.erase(texture_id);
   UnregisterTexture(texture_id);
+  std::map<int64_t, void*>::iterator it = contextDatas_.find(texture_id);
+  if (it != contextDatas_.end()) {
+    if (it->second != nullptr) {
+      OhosImageFrameData* data = reinterpret_cast<OhosImageFrameData *>(it->second);
+      task_runners_.GetPlatformTaskRunner()->PostDelayedTask(
+      [data_ = data]() {
+        delete data_;
+      },
+      fml::TimeDelta::FromSeconds(2));
+      data = nullptr;
+      it->second = nullptr;
+    }
+    contextDatas_.erase(texture_id);
+  }
 }
 
-void PlatformViewOHOS::RegisterExternalTextureByPixelMap(int64_t texture_id, NativePixelMap* pixelMap)
-{
+void PlatformViewOHOS::RegisterExternalTextureByPixelMap(
+    int64_t texture_id,
+    NativePixelMap* pixelMap) {
   if (ohos_context_->RenderingApi() == OHOSRenderingAPI::kOpenGLES) {
     auto iter = external_texture_gl_.find(texture_id);
     if (iter != external_texture_gl_.end()) {
@@ -481,9 +516,8 @@ void PlatformViewOHOS::RegisterExternalTextureByPixelMap(int64_t texture_id, Nat
   }
 }
 
-OhosImageFrameData::OhosImageFrameData(
-    PlatformViewOHOS* context,
-    int64_t texture_id)
+OhosImageFrameData::OhosImageFrameData(PlatformViewOHOS* context,
+                                       int64_t texture_id)
     : context_(context), texture_id_(texture_id) {}
 
 OhosImageFrameData::~OhosImageFrameData() = default;
diff --git a/shell/platform/ohos/platform_view_ohos.h b/shell/platform/ohos/platform_view_ohos.h
index a9793dd73a0cbc3d582a351ebd0700c75994cb87..4f08dd8653b6e1335247ee5a8b7be460fe4e1323 100644
--- a/shell/platform/ohos/platform_view_ohos.h
+++ b/shell/platform/ohos/platform_view_ohos.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef OHOS_PLATFORM_VIEW_H
-#define OHOS_PLATFORM_VIEW_H
+#ifndef FLUTTER_SHELL_PLATFORM_OHOS_PLATFORM_VIEW_OHOS_H_
+#define FLUTTER_SHELL_PLATFORM_OHOS_PLATFORM_VIEW_OHOS_H_
 
 #include <memory>
 #include <string>
@@ -40,8 +40,7 @@ namespace flutter {
 
 class OhosSurfaceFactoryImpl : public OhosSurfaceFactory {
  public:
-  OhosSurfaceFactoryImpl(const std::shared_ptr<OHOSContext>& context,
-                         bool enable_impeller);
+  OhosSurfaceFactoryImpl(const std::shared_ptr<OHOSContext>& context);
 
   ~OhosSurfaceFactoryImpl() override;
 
@@ -49,7 +48,6 @@ class OhosSurfaceFactoryImpl : public OhosSurfaceFactory {
 
  private:
   const std::shared_ptr<OHOSContext>& ohos_context_;
-  const bool enable_impeller_;
 };
 
 class PlatformViewOHOS final : public PlatformView {
@@ -69,8 +67,6 @@ class PlatformViewOHOS final : public PlatformView {
 
   void NotifyCreate(fml::RefPtr<OHOSNativeWindow> native_window);
 
-  void NotifySurfaceWindowChanged(fml::RefPtr<OHOSNativeWindow> native_window);
-
   void NotifyChanged(const SkISize& size);
 
   // |PlatformView|
@@ -88,13 +84,11 @@ class PlatformViewOHOS final : public PlatformView {
                                int action,
                                void* actionData,
                                int actionDataLenth);
-  void RegisterExternalTextureByImage(
-      int64_t texture_id,
-      ImageNative* image);
 
   uint64_t RegisterExternalTexture(int64_t texture_id);
 
-  void RegisterExternalTextureByPixelMap(int64_t texture_id, NativePixelMap* pixelMap);
+  void RegisterExternalTextureByPixelMap(int64_t texture_id,
+                                         NativePixelMap* pixelMap);
 
   void UnRegisterExternalTexture(int64_t texture_id);
 
@@ -113,9 +107,7 @@ class PlatformViewOHOS final : public PlatformView {
       std::unique_ptr<AssetResolver> updated_asset_resolver,
       AssetResolver::AssetResolverType type) override;
 
-  const std::shared_ptr<OHOSContext>& GetOHOSContext() {
-    return ohos_context_;
-  }
+  const std::shared_ptr<OHOSContext>& GetOHOSContext() { return ohos_context_; }
 
   std::shared_ptr<PlatformMessageHandler> GetPlatformMessageHandler()
       const override {
@@ -130,8 +122,16 @@ class PlatformViewOHOS final : public PlatformView {
   std::shared_ptr<PlatformMessageHandlerOHOS> platform_message_handler_;
 
   std::shared_ptr<OhosSurfaceFactoryImpl> surface_factory_;
-  std::map<int64_t, std::shared_ptr<OHOSExternalTextureGL>> external_texture_gl_;
+  std::map<int64_t, std::shared_ptr<OHOSExternalTextureGL>>
+      external_texture_gl_;
+  std::map<int64_t, void*> contextDatas_;
+
+  static bool isDestroyed_;
+  static pthread_mutex_t mutex_;
+
+  static bool GetDestroyed();
 
+  static void SetDestroyed(bool isDestroyed_);
   // |PlatformView|
   void UpdateSemantics(
       flutter::SemanticsNodeUpdates update,
@@ -179,13 +179,12 @@ class PlatformViewOHOS final : public PlatformView {
 
   FML_DISALLOW_COPY_AND_ASSIGN(PlatformViewOHOS);
 
-  static void OnNativeImageFrameAvailable(void *data);
+  static void OnNativeImageFrameAvailable(void* data);
 };
 
 class OhosImageFrameData {
  public:
-  OhosImageFrameData(PlatformViewOHOS* context,
-                     int64_t texture_id);
+  OhosImageFrameData(PlatformViewOHOS* context, int64_t texture_id);
 
   ~OhosImageFrameData();
 
@@ -195,4 +194,4 @@ class OhosImageFrameData {
 };
 
 }  // namespace flutter
-#endif
+#endif  // FLUTTER_SHELL_PLATFORM_OHOS_PLATFORM_VIEW_OHOS_H_
\ No newline at end of file
diff --git a/shell/platform/ohos/surface/ohos_native_window.cpp b/shell/platform/ohos/surface/ohos_native_window.cpp
index 4e256eb7d67ecfaec08daad9bef4e5929c9767bc..97c4264e5d6f0a7d120fb105a808b5fd5a2ceb8e 100644
--- a/shell/platform/ohos/surface/ohos_native_window.cpp
+++ b/shell/platform/ohos/surface/ohos_native_window.cpp
@@ -23,6 +23,9 @@ OHOSNativeWindow::OHOSNativeWindow(Handle window)
   FML_LOG(INFO) << " native_window:" << (int64_t)window_;
 }
 
+OHOSNativeWindow::OHOSNativeWindow(Handle window, bool is_fake_window)
+    : window_(window), is_fake_window_(is_fake_window) {}
+
 OHOSNativeWindow::~OHOSNativeWindow() {
   if (window_ != nullptr) {
     window_ = nullptr;
@@ -35,31 +38,19 @@ bool OHOSNativeWindow::IsValid() const {
 
 SkISize OHOSNativeWindow::GetSize() const {
   if (window_ != nullptr) {
-    return SkISize::Make(width_, height_);
+    int32_t width, height;
+    int ret = OH_NativeWindow_NativeWindowHandleOpt(
+        window_, GET_BUFFER_GEOMETRY, &width, &height);
+    if (ret != 0) {
+      FML_LOG(ERROR) << "OH_NativeWindow_NativeWindowHandleOpt GetSize err:"
+                     << ret;
+      return SkISize::Make(0, 0);
+    }
+    return SkISize::Make(width, height);
   }
-
   return SkISize::Make(0, 0);
 }
 
-void OHOSNativeWindow::SetWindowHeight(double height) {
-  height_ = height;
-}
-
-void OHOSNativeWindow::SetWindowWidth(double width) {
-  width_ = width;
-}
-
-bool OHOSNativeWindow::GetWindowWithAndHeight(double* height, double* width) {
-  if (window_ == nullptr) {
-    return false;
-  }
-
-  *height = height_;
-  *width = width_;
-
-  return true;
-}
-
 OHOSNativeWindow::Handle OHOSNativeWindow::Gethandle() const {
   return window_;
 }
diff --git a/shell/platform/ohos/surface/ohos_native_window.h b/shell/platform/ohos/surface/ohos_native_window.h
index 29ecfee97a64e0e23663778039505be0fd342cb7..69807210166ff679bc3df9039d8f09e5e06fd1df 100644
--- a/shell/platform/ohos/surface/ohos_native_window.h
+++ b/shell/platform/ohos/surface/ohos_native_window.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef OHOS_NATIVE_WINDOW_H
-#define OHOS_NATIVE_WINDOW_H
+#ifndef FLUTTER_SHELL_PLATFORM_OHOS_SURFACE_OHOS_NATIVE_WINDOW_H_
+#define FLUTTER_SHELL_PLATFORM_OHOS_SURFACE_OHOS_NATIVE_WINDOW_H_
 
 #include "flutter/fml/macros.h"
 #include "flutter/fml/memory/ref_counted.h"
@@ -43,19 +43,12 @@ class OHOSNativeWindow : public fml::RefCountedThreadSafe<OHOSNativeWindow> {
   /// (used for testing).
   bool IsFakeWindow() const { return is_fake_window_; }
 
-  void SetWindowHeight(double height);
-
-  void SetWindowWidth(double width);
-
-  bool GetWindowWithAndHeight(double* height, double* width);
-
  private:
   Handle window_;
-  double height_;
-  double width_;
   const bool is_fake_window_;
 
   explicit OHOSNativeWindow(Handle window);
+  explicit OHOSNativeWindow(Handle window, bool is_fake_window);
 
   ~OHOSNativeWindow();
 
@@ -65,4 +58,4 @@ class OHOSNativeWindow : public fml::RefCountedThreadSafe<OHOSNativeWindow> {
 };
 }  // namespace flutter
 
-#endif
\ No newline at end of file
+#endif  // FLUTTER_SHELL_PLATFORM_OHOS_SURFACE_OHOS_NATIVE_WINDOW_H_
diff --git a/shell/platform/ohos/types.h b/shell/platform/ohos/types.h
index 9be037096beb0ab63c0aeacae7d04ff0dd1ba6cd..38a3ab07b1fd3991a687f051fc58b4e1ea8bbb21 100644
--- a/shell/platform/ohos/types.h
+++ b/shell/platform/ohos/types.h
@@ -12,8 +12,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef OHOS_TYPES_H
-#define OHOS_TYPES_H
+#ifndef FLUTTER_SHELL_PLATFORM_OHOS_TYPES_H_
+#define FLUTTER_SHELL_PLATFORM_OHOS_TYPES_H_
 namespace flutter {
 
 constexpr int PIXEL_FMT_RGBA_8888 = 12;
@@ -25,4 +25,4 @@ enum Locales {
 };
 
 }  // namespace flutter
-#endif
\ No newline at end of file
+#endif  // FLUTTER_SHELL_PLATFORM_OHOS_TYPES_H_
\ No newline at end of file
diff --git a/shell/platform/ohos/vsync_waiter_ohos.h b/shell/platform/ohos/vsync_waiter_ohos.h
index 5650a7f64cf11421e001a119f322af57291a9255..4b674c415f34b0e0d52bea9f1b610a667e2078ff 100644
--- a/shell/platform/ohos/vsync_waiter_ohos.h
+++ b/shell/platform/ohos/vsync_waiter_ohos.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef VSYNC_WAITER_OHOS_H
-#define VSYNC_WAITER_OHOS_H
+#ifndef FLUTTER_SHELL_PLATFORM_OHOS_VSYNC_WAITER_OHOS_H_
+#define FLUTTER_SHELL_PLATFORM_OHOS_VSYNC_WAITER_OHOS_H_
 #include <memory>
 
 #include <native_vsync/native_vsync.h>
@@ -43,4 +43,4 @@ class VsyncWaiterOHOS final : public VsyncWaiter {
   FML_DISALLOW_COPY_AND_ASSIGN(VsyncWaiterOHOS);
 };
 }  // namespace flutter
-#endif
+#endif  // FLUTTER_SHELL_PLATFORM_OHOS_VSYNC_WAITER_OHOS_H_
\ No newline at end of file
diff --git a/shell/platform/windows/BUILD.gn b/shell/platform/windows/BUILD.gn
index 8e6af332d7ad58bf337da40e840b3bea47da09e2..bed6b8f8d7a5a20196d99110a88a4c75d343f9f1 100644
--- a/shell/platform/windows/BUILD.gn
+++ b/shell/platform/windows/BUILD.gn
@@ -8,9 +8,10 @@ import("//flutter/shell/platform/glfw/config.gni")
 import("//flutter/testing/testing.gni")
 
 _public_headers = [ "public/flutter_windows.h" ]
+_internal_headers = [ "flutter_windows_internal.h" ]
 
 config("relative_angle_headers") {
-  include_dirs = [ "//third_party/angle/include" ]
+  include_dirs = [ "//flutter/third_party/angle/include" ]
 }
 
 # Any files that are built by clients (client_wrapper code, library headers for
@@ -24,7 +25,7 @@ config("relative_flutter_windows_headers") {
 # The headers are a separate source set since the client wrapper is allowed
 # to depend on the public headers, but none of the rest of the code.
 source_set("flutter_windows_headers") {
-  public = _public_headers
+  public = _public_headers + _internal_headers
 
   public_deps = [ "//flutter/shell/platform/common:common_cpp_library_headers" ]
 
@@ -38,20 +39,33 @@ source_set("flutter_windows_headers") {
 source_set("flutter_windows_source") {
   # Common Windows sources.
   sources = [
-    "accessibility_alert.cc",
-    "accessibility_alert.h",
     "accessibility_bridge_windows.cc",
     "accessibility_bridge_windows.h",
-    "accessibility_root_node.cc",
-    "accessibility_root_node.h",
-    "angle_surface_manager.cc",
-    "angle_surface_manager.h",
+    "accessibility_plugin.cc",
+    "accessibility_plugin.h",
+    "compositor.h",
+    "compositor_opengl.cc",
+    "compositor_opengl.h",
+    "compositor_software.cc",
+    "compositor_software.h",
     "cursor_handler.cc",
     "cursor_handler.h",
     "direct_manipulation.cc",
     "direct_manipulation.h",
     "dpi_utils.cc",
     "dpi_utils.h",
+    "egl/context.cc",
+    "egl/context.h",
+    "egl/egl.cc",
+    "egl/egl.h",
+    "egl/manager.cc",
+    "egl/manager.h",
+    "egl/proc_table.cc",
+    "egl/proc_table.h",
+    "egl/surface.cc",
+    "egl/surface.h",
+    "egl/window_surface.cc",
+    "egl/window_surface.h",
     "event_watcher.cc",
     "event_watcher.h",
     "external_texture.h",
@@ -73,6 +87,7 @@ source_set("flutter_windows_source") {
     "flutter_windows_texture_registrar.h",
     "flutter_windows_view.cc",
     "flutter_windows_view.h",
+    "flutter_windows_view_controller.h",
     "keyboard_handler_base.h",
     "keyboard_key_channel_handler.cc",
     "keyboard_key_channel_handler.h",
@@ -86,6 +101,10 @@ source_set("flutter_windows_source") {
     "keyboard_utils.h",
     "platform_handler.cc",
     "platform_handler.h",
+    "platform_view_manager.cc",
+    "platform_view_manager.h",
+    "platform_view_plugin.cc",
+    "platform_view_plugin.h",
     "sequential_id_generator.cc",
     "sequential_id_generator.h",
     "settings_plugin.cc",
@@ -100,17 +119,16 @@ source_set("flutter_windows_source") {
     "text_input_manager.h",
     "text_input_plugin.cc",
     "text_input_plugin.h",
-    "window.cc",
-    "window.h",
     "window_binding_handler.h",
     "window_binding_handler_delegate.h",
     "window_proc_delegate_manager.cc",
     "window_proc_delegate_manager.h",
     "window_state.h",
+    "windows_lifecycle_manager.cc",
+    "windows_lifecycle_manager.h",
     "windows_proc_table.cc",
     "windows_proc_table.h",
-    "windows_registry.cc",
-    "windows_registry.h",
+    "windowsx_shim.h",
   ]
 
   libs = [
@@ -120,7 +138,7 @@ source_set("flutter_windows_source") {
 
   configs += [
     "//flutter/shell/platform/common:desktop_library_implementation",
-    "//third_party/angle:gl_prototypes",
+    "//flutter/third_party/angle:gl_prototypes",
   ]
 
   public_configs = [ ":relative_angle_headers" ]
@@ -130,24 +148,26 @@ source_set("flutter_windows_source") {
   public_deps = [
     "//flutter/fml:string_conversion",
     "//flutter/shell/platform/common:common_cpp_accessibility",
+    "//flutter/shell/platform/common:common_cpp_enums",
   ]
 
   deps = [
     ":flutter_windows_headers",
     "//flutter/fml:fml",
+    "//flutter/impeller/renderer/backend/gles",
     "//flutter/shell/platform/common:common_cpp",
     "//flutter/shell/platform/common:common_cpp_input",
     "//flutter/shell/platform/common:common_cpp_switches",
     "//flutter/shell/platform/common/client_wrapper:client_wrapper",
     "//flutter/shell/platform/embedder:embedder_as_internal_library",
     "//flutter/shell/platform/windows/client_wrapper:client_wrapper_windows",
-    "//third_party/angle:libEGL_static",  # the order of libEGL_static and
-                                          # libGLESv2_static is important.. if
-                                          # reversed, will cause a linker error
-                                          # DllMain already defined in
-                                          # LIBCMTD.lib
-    "//third_party/angle:libGLESv2_static",
-    "//third_party/rapidjson",
+
+    # libEGL_static MUST be ordered before libGLESv2_static in this list. If
+    # reversed, a linker error will occur, reporting DllMain already defined in
+    # LIBCMTD.lib
+    "//flutter/third_party/angle:libEGL_static",
+    "//flutter/third_party/angle:libGLESv2_static",
+    "//flutter/third_party/rapidjson",
   ]
 }
 
@@ -176,6 +196,9 @@ executable("flutter_windows_unittests") {
   # Common Windows test sources.
   sources = [
     "accessibility_bridge_windows_unittests.cc",
+    "compositor_opengl_unittests.cc",
+    "compositor_software_unittests.cc",
+    "cursor_handler_unittests.cc",
     "direct_manipulation_unittests.cc",
     "dpi_utils_unittests.cc",
     "flutter_project_bundle_unittests.cc",
@@ -194,11 +217,15 @@ executable("flutter_windows_unittests") {
     "settings_plugin_unittests.cc",
     "system_utils_unittests.cc",
     "task_runner_unittests.cc",
+    "testing/egl/mock_context.h",
+    "testing/egl/mock_manager.h",
+    "testing/egl/mock_proc_table.h",
+    "testing/egl/mock_window_surface.h",
     "testing/engine_modifier.h",
-    "testing/flutter_window_test.cc",
-    "testing/flutter_window_test.h",
+    "testing/flutter_windows_engine_builder.cc",
+    "testing/flutter_windows_engine_builder.h",
     "testing/mock_direct_manipulation.h",
-    "testing/mock_gl_functions.h",
+    "testing/mock_platform_view_manager.h",
     "testing/mock_text_input_manager.cc",
     "testing/mock_text_input_manager.h",
     "testing/mock_window.cc",
@@ -209,6 +236,7 @@ executable("flutter_windows_unittests") {
     "testing/test_keyboard.cc",
     "testing/test_keyboard.h",
     "testing/test_keyboard_unittests.cc",
+    "testing/view_modifier.h",
     "testing/windows_test.cc",
     "testing/windows_test.h",
     "testing/windows_test_config_builder.cc",
@@ -220,6 +248,7 @@ executable("flutter_windows_unittests") {
     "text_input_plugin_unittest.cc",
     "window_proc_delegate_manager_unittests.cc",
     "window_unittests.cc",
+    "windows_lifecycle_manager_unittests.cc",
   ]
 
   configs +=
@@ -231,13 +260,15 @@ executable("flutter_windows_unittests") {
     ":flutter_windows_fixtures",
     ":flutter_windows_headers",
     ":flutter_windows_source",
+    "//flutter/impeller/renderer/backend/gles",
     "//flutter/shell/platform/common:common_cpp",
+    "//flutter/shell/platform/common/client_wrapper:client_wrapper",
     "//flutter/shell/platform/embedder:embedder_as_internal_library",
     "//flutter/shell/platform/embedder:embedder_test_utils",
     "//flutter/testing",
     "//flutter/testing:dart",
+    "//flutter/third_party/rapidjson",
     "//flutter/third_party/tonic",
-    "//third_party/rapidjson",
   ]
 }
 
diff --git a/shell/platform/windows/README.md b/shell/platform/windows/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..56c8d596f9259a3dd80f17db4c11f8eea861478c
--- /dev/null
+++ b/shell/platform/windows/README.md
@@ -0,0 +1,42 @@
+# Windows Platform Embedder
+
+This code is the glue between the Flutter engine and the Windows platform.
+It is responsible for:
+
+1. Launching the Flutter engine.
+2. Providing a view for the Flutter engine to render into.
+3. Dispatching events to the Flutter engine.
+
+For more information on embedders, see the
+[Flutter architectural overview](https://docs.flutter.dev/resources/architectural-overview).
+
+> [!CAUTION]
+> This is a best effort attempt to document the Windows embedder. It is not
+> guaranteed to be up to date or complete. If you find a discrepancy, please
+> [send a pull request](https://github.com/flutter/engine/compare)!
+
+See also:
+
+1. [Flutter tool's Windows logic](https://github.com/flutter/flutter/tree/master/packages/flutter_tools/lib/src/windows) - Builds and runs Flutter Windows apps on
+the command line.
+1. [Windows app template](https://github.com/flutter/flutter/tree/master/packages/flutter_tools/templates/app_shared/windows.tmpl) - The entrypoint for Flutter Windows app. This
+launches the Windows embedder.
+1. [`platform-windows` GitHub issues label](https://github.com/flutter/flutter/issues?q=is%3Aopen+label%3Aplatform-windows+sort%3Aupdated-desc)
+1. [`#hackers-desktop` Discord channel](https://discord.com/channels/608014603317936148/608020180177780791)
+
+## Developing
+
+See:
+
+1. [Setting up the Engine development environment](https://github.com/flutter/flutter/wiki/Setting-up-the-Engine-development-environment)
+2. [Compiling for Windows](https://github.com/flutter/flutter/wiki/Compiling-the-engine#compiling-for-windows)
+3. [Debugging Windows builds with Visual Studio](https://github.com/flutter/flutter/wiki/Debugging-the-engine#debugging-windows-builds-with-visual-studio)
+
+### Notable files
+
+Some notable files include:
+
+1. [`flutter_windows_engine.h`](https://github.com/flutter/engine/blob/main/shell/platform/windows/flutter_windows_engine.h) - Connects the Windows embedder to the Flutter engine.
+1. [`flutter_windows_view.h`](https://github.com/flutter/engine/blob/main/shell/platform/windows/flutter_windows_view.h) - The logic for a Flutter view.
+1. [`flutter_window.h`](https://github.com/flutter/engine/blob/main/shell/platform/windows/flutter_window.h) - Integrates a Flutter view with Windows (using a win32 child window).
+1. [`//shell/platform/embedder/embedder.h`](https://github.com/flutter/engine/blob/main/shell/platform/embedder/embedder.h) - The API boundary between the Windows embedder and the Flutter engine.
diff --git a/shell/platform/windows/accessibility_alert.cc b/shell/platform/windows/accessibility_alert.cc
deleted file mode 100644
index f0dc623e6f7cfdf72232b584c67a827380f9048e..0000000000000000000000000000000000000000
--- a/shell/platform/windows/accessibility_alert.cc
+++ /dev/null
@@ -1,187 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "flutter/shell/platform/windows/accessibility_alert.h"
-
-#include "flutter/shell/platform/windows/accessibility_root_node.h"
-
-namespace flutter {
-
-AccessibilityAlert::AccessibilityAlert() : text_(L""), parent_(nullptr) {}
-
-// IAccessible methods.
-
-IFACEMETHODIMP AccessibilityAlert::accHitTest(LONG screen_physical_pixel_x,
-                                              LONG screen_physical_pixel_y,
-                                              VARIANT* child) {
-  child->vt = VT_EMPTY;
-  return S_FALSE;
-}
-
-// Performs the object's default action.
-IFACEMETHODIMP AccessibilityAlert::accDoDefaultAction(VARIANT var_id) {
-  return E_FAIL;
-}
-
-// Retrieves an IDispatch interface pointer for the specified child.
-IFACEMETHODIMP AccessibilityAlert::get_accChild(VARIANT var_child,
-                                                IDispatch** disp_child) {
-  if (V_VT(&var_child) == VT_I4 && V_I4(&var_child) == CHILDID_SELF) {
-    *disp_child = this;
-    AddRef();
-    return S_OK;
-  }
-  *disp_child = nullptr;
-  return E_FAIL;
-}
-
-// Retrieves the number of accessible children.
-IFACEMETHODIMP AccessibilityAlert::get_accChildCount(LONG* child_count) {
-  *child_count = 0;
-  return S_OK;
-}
-
-// Retrieves the tooltip description.
-IFACEMETHODIMP AccessibilityAlert::get_accDescription(VARIANT var_id,
-                                                      BSTR* desc) {
-  *desc = SysAllocString(text_.c_str());
-  return S_OK;
-}
-
-// Retrieves the name of the specified object.
-IFACEMETHODIMP AccessibilityAlert::get_accName(VARIANT var_id, BSTR* name) {
-  *name = SysAllocString(text_.c_str());
-  return S_OK;
-}
-
-// Retrieves the IDispatch interface of the object's parent.
-IFACEMETHODIMP AccessibilityAlert::get_accParent(IDispatch** disp_parent) {
-  *disp_parent = parent_;
-  if (*disp_parent) {
-    (*disp_parent)->AddRef();
-    return S_OK;
-  }
-  return S_FALSE;
-}
-
-// Retrieves information describing the role of the specified object.
-IFACEMETHODIMP AccessibilityAlert::get_accRole(VARIANT var_id, VARIANT* role) {
-  *role = {.vt = VT_I4, .lVal = ROLE_SYSTEM_ALERT};
-  return S_OK;
-}
-
-// Retrieves the current state of the specified object.
-IFACEMETHODIMP AccessibilityAlert::get_accState(VARIANT var_id,
-                                                VARIANT* state) {
-  *state = {.vt = VT_I4, .lVal = STATE_SYSTEM_DEFAULT};
-  return S_OK;
-}
-
-// Gets the help string for the specified object.
-IFACEMETHODIMP AccessibilityAlert::get_accHelp(VARIANT var_id, BSTR* help) {
-  *help = SysAllocString(L"");
-  return S_OK;
-}
-
-// Retrieve or set the string value associated with the specified object.
-// Setting the value is not typically used by screen readers, but it's
-// used frequently by automation software.
-IFACEMETHODIMP AccessibilityAlert::get_accValue(VARIANT var_id, BSTR* value) {
-  *value = SysAllocString(text_.c_str());
-  return S_OK;
-}
-
-// IAccessible methods not implemented.
-IFACEMETHODIMP AccessibilityAlert::get_accSelection(VARIANT* selected) {
-  selected->vt = VT_EMPTY;
-  return E_NOTIMPL;
-}
-
-IFACEMETHODIMP AccessibilityAlert::accSelect(LONG flags_sel, VARIANT var_id) {
-  return E_NOTIMPL;
-}
-
-IFACEMETHODIMP AccessibilityAlert::put_accValue(VARIANT var_id,
-                                                BSTR new_value) {
-  return E_NOTIMPL;
-}
-
-IFACEMETHODIMP AccessibilityAlert::get_accFocus(VARIANT* focus_child) {
-  focus_child->vt = VT_EMPTY;
-  return E_NOTIMPL;
-}
-
-IFACEMETHODIMP AccessibilityAlert::get_accHelpTopic(BSTR* help_file,
-                                                    VARIANT var_id,
-                                                    LONG* topic_id) {
-  if (help_file) {
-    *help_file = nullptr;
-  }
-  if (topic_id) {
-    *topic_id = 0;
-  }
-  return E_NOTIMPL;
-}
-
-IFACEMETHODIMP AccessibilityAlert::put_accName(VARIANT var_id, BSTR put_name) {
-  return E_NOTIMPL;
-}
-
-IFACEMETHODIMP AccessibilityAlert::get_accKeyboardShortcut(VARIANT var_id,
-                                                           BSTR* access_key) {
-  *access_key = nullptr;
-  return E_NOTIMPL;
-}
-
-IFACEMETHODIMP AccessibilityAlert::accLocation(LONG* physical_pixel_left,
-                                               LONG* physical_pixel_top,
-                                               LONG* width,
-                                               LONG* height,
-                                               VARIANT var_id) {
-  return E_NOTIMPL;
-}
-
-IFACEMETHODIMP AccessibilityAlert::accNavigate(LONG nav_dir,
-                                               VARIANT start,
-                                               VARIANT* end) {
-  end->vt = VT_EMPTY;
-  return E_NOTIMPL;
-}
-
-IFACEMETHODIMP AccessibilityAlert::get_accDefaultAction(VARIANT var_id,
-                                                        BSTR* default_action) {
-  *default_action = nullptr;
-  return E_NOTIMPL;
-}
-
-// End of IAccessible methods.
-
-//
-// IServiceProvider implementation.
-//
-
-IFACEMETHODIMP AccessibilityAlert::QueryService(REFGUID guidService,
-                                                REFIID riid,
-                                                void** object) {
-  if (!object) {
-    return E_INVALIDARG;
-  }
-
-  if (guidService == IID_IAccessible) {
-    return QueryInterface(riid, object);
-  }
-
-  *object = nullptr;
-  return E_FAIL;
-}
-
-void AccessibilityAlert::SetText(const std::wstring& text) {
-  text_ = text;
-}
-
-void AccessibilityAlert::SetParent(AccessibilityRootNode* parent) {
-  parent_ = parent;
-}
-
-}  // namespace flutter
diff --git a/shell/platform/windows/accessibility_alert.h b/shell/platform/windows/accessibility_alert.h
deleted file mode 100644
index cb5afba907ad6208aff61662dba3065a0e427c85..0000000000000000000000000000000000000000
--- a/shell/platform/windows/accessibility_alert.h
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_ACCESSIBILITY_ALERT_H_
-#define FLUTTER_SHELL_PLATFORM_WINDOWS_ACCESSIBILITY_ALERT_H_
-
-#include <atlbase.h>
-#include <atlcom.h>
-#include <oleacc.h>
-
-#include <string>
-
-namespace flutter {
-
-class AccessibilityRootNode;
-
-// An IAccessible node representing an alert read to the screen reader.
-// When an announcement is requested by the framework, an instance of
-// this class, if none exists already, is created and made a child of
-// the root AccessibilityRootNode node, and is therefore also a sibling
-// of the window's root node.
-// This node is not interactable to the user.
-class __declspec(uuid("778c1bd8-383f-4d49-b6be-8937e12b6a32"))
-    AccessibilityAlert : public CComObjectRootEx<CComMultiThreadModel>,
-                         public IDispatchImpl<IAccessible>,
-                         public IServiceProvider {
- public:
-  BEGIN_COM_MAP(AccessibilityAlert)
-  COM_INTERFACE_ENTRY(AccessibilityAlert)
-  COM_INTERFACE_ENTRY(IAccessible)
-  COM_INTERFACE_ENTRY(IDispatch)
-  COM_INTERFACE_ENTRY(IServiceProvider)
-  END_COM_MAP()
-  //
-  // IAccessible methods.
-  //
-
-  // Retrieves the child element or child object at a given point on the screen.
-  IFACEMETHODIMP accHitTest(LONG screen_physical_pixel_x,
-                            LONG screen_physical_pixel_y,
-                            VARIANT* child) override;
-
-  // Retrieves an IDispatch interface pointer for the specified child.
-  IFACEMETHODIMP get_accChild(VARIANT var_child,
-                              IDispatch** disp_child) override;
-
-  // Retrieves the number of accessible children.
-  IFACEMETHODIMP get_accChildCount(LONG* child_count) override;
-
-  // Retrieves a string that describes the object's default action.
-  IFACEMETHODIMP get_accDefaultAction(VARIANT var_id,
-                                      BSTR* default_action) override;
-
-  // Retrieves the tooltip description.
-  IFACEMETHODIMP get_accDescription(VARIANT var_id, BSTR* desc) override;
-
-  // Retrieves the name of the specified object.
-  IFACEMETHODIMP get_accName(VARIANT var_id, BSTR* name) override;
-
-  // Retrieves the IDispatch interface of the object's parent.
-  IFACEMETHODIMP get_accParent(IDispatch** disp_parent) override;
-
-  // Retrieves information describing the role of the specified object.
-  IFACEMETHODIMP get_accRole(VARIANT var_id, VARIANT* role) override;
-
-  // Retrieves the current state of the specified object.
-  IFACEMETHODIMP get_accState(VARIANT var_id, VARIANT* state) override;
-
-  // Gets the help string for the specified object.
-  IFACEMETHODIMP get_accHelp(VARIANT var_id, BSTR* help) override;
-
-  // Retrieve the string value associated with the specified object.
-  IFACEMETHODIMP get_accValue(VARIANT var_id, BSTR* value) override;
-
-  // IAccessible methods not implemented.
-  IFACEMETHODIMP accLocation(LONG* physical_pixel_left,
-                             LONG* physical_pixel_top,
-                             LONG* width,
-                             LONG* height,
-                             VARIANT var_id) override;
-  IFACEMETHODIMP accNavigate(LONG nav_dir,
-                             VARIANT start,
-                             VARIANT* end) override;
-  IFACEMETHODIMP accDoDefaultAction(VARIANT var_id) override;
-  IFACEMETHODIMP get_accFocus(VARIANT* focus_child) override;
-  IFACEMETHODIMP get_accKeyboardShortcut(VARIANT var_id,
-                                         BSTR* access_key) override;
-  IFACEMETHODIMP get_accSelection(VARIANT* selected) override;
-  IFACEMETHODIMP accSelect(LONG flags_sel, VARIANT var_id) override;
-  IFACEMETHODIMP get_accHelpTopic(BSTR* help_file,
-                                  VARIANT var_id,
-                                  LONG* topic_id) override;
-  IFACEMETHODIMP put_accName(VARIANT var_id, BSTR put_name) override;
-  IFACEMETHODIMP put_accValue(VARIANT var_id, BSTR new_value) override;
-
-  // End of IAccessible methods.
-
-  //
-  // IServiceProvider method.
-  //
-
-  IFACEMETHODIMP QueryService(REFGUID guidService,
-                              REFIID riid,
-                              void** object) override;
-
-  AccessibilityAlert();
-  ~AccessibilityAlert() = default;
-
-  // Sets the text of this alert to the provided message.
-  void SetText(const std::wstring& text);
-
-  void SetParent(AccessibilityRootNode* parent);
-
- private:
-  std::wstring text_;
-
-  AccessibilityRootNode* parent_;
-};
-
-}  // namespace flutter
-
-#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_ACCESSIBILITY_ALERT_H_
diff --git a/shell/platform/windows/accessibility_bridge_windows.cc b/shell/platform/windows/accessibility_bridge_windows.cc
index add1fc7f7c0369985464b22fc2709e9f0295dc72..3c8ee215b09e9e87b72b4ff72f37607477bcedf5 100644
--- a/shell/platform/windows/accessibility_bridge_windows.cc
+++ b/shell/platform/windows/accessibility_bridge_windows.cc
@@ -4,17 +4,15 @@
 
 #include "flutter/shell/platform/windows/accessibility_bridge_windows.h"
 
+#include "flutter/fml/logging.h"
 #include "flutter/shell/platform/windows/flutter_platform_node_delegate_windows.h"
 #include "flutter/third_party/accessibility/ax/platform/ax_platform_node_delegate_base.h"
 
 namespace flutter {
 
-AccessibilityBridgeWindows::AccessibilityBridgeWindows(
-    FlutterWindowsEngine* engine,
-    FlutterWindowsView* view)
-    : engine_(engine), view_(view) {
-  assert(engine_);
-  assert(view_);
+AccessibilityBridgeWindows::AccessibilityBridgeWindows(FlutterWindowsView* view)
+    : view_(view) {
+  FML_DCHECK(view_);
 }
 
 void AccessibilityBridgeWindows::OnAccessibilityEvent(
@@ -24,60 +22,86 @@ void AccessibilityBridgeWindows::OnAccessibilityEvent(
 
   auto node_delegate =
       GetFlutterPlatformNodeDelegateFromID(ax_node->id()).lock();
-  assert(node_delegate);
+  FML_DCHECK(node_delegate)
+      << "No FlutterPlatformNodeDelegate found for node ID " << ax_node->id();
   std::shared_ptr<FlutterPlatformNodeDelegateWindows> win_delegate =
       std::static_pointer_cast<FlutterPlatformNodeDelegateWindows>(
           node_delegate);
 
   switch (event_type) {
     case ui::AXEventGenerator::Event::ALERT:
-      DispatchWinAccessibilityEvent(win_delegate, EVENT_SYSTEM_ALERT);
+      DispatchWinAccessibilityEvent(win_delegate, ax::mojom::Event::kAlert);
       break;
     case ui::AXEventGenerator::Event::CHECKED_STATE_CHANGED:
-      DispatchWinAccessibilityEvent(win_delegate, EVENT_OBJECT_VALUECHANGE);
+      DispatchWinAccessibilityEvent(win_delegate,
+                                    ax::mojom::Event::kValueChanged);
       break;
     case ui::AXEventGenerator::Event::CHILDREN_CHANGED:
-      DispatchWinAccessibilityEvent(win_delegate, EVENT_OBJECT_REORDER);
+      DispatchWinAccessibilityEvent(win_delegate,
+                                    ax::mojom::Event::kChildrenChanged);
+      break;
+    case ui::AXEventGenerator::Event::DOCUMENT_SELECTION_CHANGED: {
+      // An event indicating a change in document selection should be fired
+      // only for the focused node whose selection has changed. If a valid
+      // caret and selection exist in the app tree, they must both be within
+      // the focus node.
+      auto focus_delegate = GetFocusedNode().lock();
+      if (focus_delegate) {
+        win_delegate =
+            std::static_pointer_cast<FlutterPlatformNodeDelegateWindows>(
+                focus_delegate);
+      }
+      DispatchWinAccessibilityEvent(
+          win_delegate, ax::mojom::Event::kDocumentSelectionChanged);
       break;
+    }
     case ui::AXEventGenerator::Event::FOCUS_CHANGED:
-      DispatchWinAccessibilityEvent(win_delegate, EVENT_OBJECT_FOCUS);
+      DispatchWinAccessibilityEvent(win_delegate, ax::mojom::Event::kFocus);
       SetFocus(win_delegate);
       break;
     case ui::AXEventGenerator::Event::IGNORED_CHANGED:
       if (ax_node->IsIgnored()) {
-        DispatchWinAccessibilityEvent(win_delegate, EVENT_OBJECT_HIDE);
+        DispatchWinAccessibilityEvent(win_delegate, ax::mojom::Event::kHide);
       }
       break;
     case ui::AXEventGenerator::Event::IMAGE_ANNOTATION_CHANGED:
-      DispatchWinAccessibilityEvent(win_delegate, EVENT_OBJECT_NAMECHANGE);
+      DispatchWinAccessibilityEvent(win_delegate,
+                                    ax::mojom::Event::kTextChanged);
       break;
     case ui::AXEventGenerator::Event::LIVE_REGION_CHANGED:
       DispatchWinAccessibilityEvent(win_delegate,
-                                    EVENT_OBJECT_LIVEREGIONCHANGED);
+                                    ax::mojom::Event::kLiveRegionChanged);
       break;
     case ui::AXEventGenerator::Event::NAME_CHANGED:
-      DispatchWinAccessibilityEvent(win_delegate, EVENT_OBJECT_NAMECHANGE);
+      DispatchWinAccessibilityEvent(win_delegate,
+                                    ax::mojom::Event::kTextChanged);
       break;
     case ui::AXEventGenerator::Event::SCROLL_HORIZONTAL_POSITION_CHANGED:
-      DispatchWinAccessibilityEvent(win_delegate, EVENT_SYSTEM_SCROLLINGEND);
+      DispatchWinAccessibilityEvent(win_delegate,
+                                    ax::mojom::Event::kScrollPositionChanged);
       break;
     case ui::AXEventGenerator::Event::SCROLL_VERTICAL_POSITION_CHANGED:
-      DispatchWinAccessibilityEvent(win_delegate, EVENT_SYSTEM_SCROLLINGEND);
+      DispatchWinAccessibilityEvent(win_delegate,
+                                    ax::mojom::Event::kScrollPositionChanged);
       break;
     case ui::AXEventGenerator::Event::SELECTED_CHANGED:
-      DispatchWinAccessibilityEvent(win_delegate, EVENT_OBJECT_VALUECHANGE);
+      DispatchWinAccessibilityEvent(win_delegate,
+                                    ax::mojom::Event::kValueChanged);
       break;
     case ui::AXEventGenerator::Event::SELECTED_CHILDREN_CHANGED:
-      DispatchWinAccessibilityEvent(win_delegate, EVENT_OBJECT_SELECTIONWITHIN);
+      DispatchWinAccessibilityEvent(win_delegate,
+                                    ax::mojom::Event::kSelectedChildrenChanged);
       break;
     case ui::AXEventGenerator::Event::SUBTREE_CREATED:
-      DispatchWinAccessibilityEvent(win_delegate, EVENT_OBJECT_SHOW);
+      DispatchWinAccessibilityEvent(win_delegate, ax::mojom::Event::kShow);
       break;
     case ui::AXEventGenerator::Event::VALUE_CHANGED:
-      DispatchWinAccessibilityEvent(win_delegate, EVENT_OBJECT_VALUECHANGE);
+      DispatchWinAccessibilityEvent(win_delegate,
+                                    ax::mojom::Event::kValueChanged);
       break;
     case ui::AXEventGenerator::Event::WIN_IACCESSIBLE_STATE_CHANGED:
-      DispatchWinAccessibilityEvent(win_delegate, EVENT_OBJECT_STATECHANGE);
+      DispatchWinAccessibilityEvent(win_delegate,
+                                    ax::mojom::Event::kStateChanged);
       break;
     case ui::AXEventGenerator::Event::ACCESS_KEY_CHANGED:
     case ui::AXEventGenerator::Event::ACTIVE_DESCENDANT_CHANGED:
@@ -90,7 +114,6 @@ void AccessibilityBridgeWindows::OnAccessibilityEvent(
     case ui::AXEventGenerator::Event::CONTROLS_CHANGED:
     case ui::AXEventGenerator::Event::DESCRIBED_BY_CHANGED:
     case ui::AXEventGenerator::Event::DESCRIPTION_CHANGED:
-    case ui::AXEventGenerator::Event::DOCUMENT_SELECTION_CHANGED:
     case ui::AXEventGenerator::Event::DOCUMENT_TITLE_CHANGED:
     case ui::AXEventGenerator::Event::DROPEFFECT_CHANGED:
     case ui::AXEventGenerator::Event::ENABLED_CHANGED:
@@ -140,7 +163,7 @@ void AccessibilityBridgeWindows::DispatchAccessibilityAction(
     AccessibilityNodeId target,
     FlutterSemanticsAction action,
     fml::MallocMapping data) {
-  engine_->DispatchSemanticsAction(target, action, std::move(data));
+  view_->GetEngine()->DispatchSemanticsAction(target, action, std::move(data));
 }
 
 std::shared_ptr<FlutterPlatformNodeDelegate>
@@ -151,7 +174,7 @@ AccessibilityBridgeWindows::CreateFlutterPlatformNodeDelegate() {
 
 void AccessibilityBridgeWindows::DispatchWinAccessibilityEvent(
     std::shared_ptr<FlutterPlatformNodeDelegateWindows> node_delegate,
-    DWORD event_type) {
+    ax::mojom::Event event_type) {
   node_delegate->DispatchWinAccessibilityEvent(event_type);
 }
 
@@ -160,4 +183,29 @@ void AccessibilityBridgeWindows::SetFocus(
   node_delegate->SetFocus();
 }
 
+gfx::NativeViewAccessible
+AccessibilityBridgeWindows::GetChildOfAXFragmentRoot() {
+  ui::AXPlatformNodeDelegate* root_delegate = RootDelegate();
+  if (!root_delegate) {
+    return nullptr;
+  }
+
+  return root_delegate->GetNativeViewAccessible();
+}
+
+gfx::NativeViewAccessible
+AccessibilityBridgeWindows::GetParentOfAXFragmentRoot() {
+  return nullptr;
+}
+
+bool AccessibilityBridgeWindows::IsAXFragmentRootAControlElement() {
+  return true;
+}
+
+std::weak_ptr<FlutterPlatformNodeDelegate>
+AccessibilityBridgeWindows::GetFocusedNode() {
+  ui::AXNode::AXID focus_id = GetAXTreeData().sel_focus_object_id;
+  return GetFlutterPlatformNodeDelegateFromID(focus_id);
+}
+
 }  // namespace flutter
diff --git a/shell/platform/windows/accessibility_bridge_windows.h b/shell/platform/windows/accessibility_bridge_windows.h
index 68f75298a83e9768ad495bd4beaedb7613d03b3c..efb2f8a47aac684722271883002e04dcfc8b8533 100644
--- a/shell/platform/windows/accessibility_bridge_windows.h
+++ b/shell/platform/windows/accessibility_bridge_windows.h
@@ -5,14 +5,14 @@
 #ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_ACCESSIBILITY_BRIDGE_WINDOWS_H_
 #define FLUTTER_SHELL_PLATFORM_WINDOWS_ACCESSIBILITY_BRIDGE_WINDOWS_H_
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/common/accessibility_bridge.h"
-
-#include "flutter/shell/platform/windows/flutter_windows_engine.h"
-#include "flutter/shell/platform/windows/flutter_windows_view.h"
+#include "flutter/third_party/accessibility/ax/platform/ax_fragment_root_delegate_win.h"
 
 namespace flutter {
 
 class FlutterWindowsEngine;
+class FlutterWindowsView;
 class FlutterPlatformNodeDelegateWindows;
 
 // The Win32 implementation of AccessibilityBridge.
@@ -24,10 +24,10 @@ class FlutterPlatformNodeDelegateWindows;
 ///
 /// AccessibilityBridgeWindows must be created as a shared_ptr, since some
 /// methods acquires its weak_ptr.
-class AccessibilityBridgeWindows : public AccessibilityBridge {
+class AccessibilityBridgeWindows : public AccessibilityBridge,
+                                   public ui::AXFragmentRootDelegateWin {
  public:
-  AccessibilityBridgeWindows(FlutterWindowsEngine* engine,
-                             FlutterWindowsView* view);
+  AccessibilityBridgeWindows(FlutterWindowsView* view);
   virtual ~AccessibilityBridgeWindows() = default;
 
   // |AccessibilityBridge|
@@ -41,7 +41,7 @@ class AccessibilityBridgeWindows : public AccessibilityBridge {
   // This is a virtual method for the convenience of unit tests.
   virtual void DispatchWinAccessibilityEvent(
       std::shared_ptr<FlutterPlatformNodeDelegateWindows> node_delegate,
-      DWORD event_type);
+      ax::mojom::Event event_type);
 
   // Sets the accessibility focus to the accessibility node associated with the
   // specified semantics node.
@@ -50,6 +50,15 @@ class AccessibilityBridgeWindows : public AccessibilityBridge {
   virtual void SetFocus(
       std::shared_ptr<FlutterPlatformNodeDelegateWindows> node_delegate);
 
+  // |AXFragmentRootDelegateWin|
+  gfx::NativeViewAccessible GetChildOfAXFragmentRoot() override;
+
+  // |AXFragmentRootDelegateWin|
+  gfx::NativeViewAccessible GetParentOfAXFragmentRoot() override;
+
+  // |AXFragmentRootDelegateWin|
+  bool IsAXFragmentRootAControlElement() override;
+
  protected:
   // |AccessibilityBridge|
   void OnAccessibilityEvent(
@@ -59,9 +68,13 @@ class AccessibilityBridgeWindows : public AccessibilityBridge {
   std::shared_ptr<FlutterPlatformNodeDelegate>
   CreateFlutterPlatformNodeDelegate() override;
 
+  // Retrieve the focused node for accessibility events.
+  virtual std::weak_ptr<FlutterPlatformNodeDelegate> GetFocusedNode();
+
  private:
-  FlutterWindowsEngine* engine_;
   FlutterWindowsView* view_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(AccessibilityBridgeWindows);
 };
 
 }  // namespace flutter
diff --git a/shell/platform/windows/accessibility_bridge_windows_unittests.cc b/shell/platform/windows/accessibility_bridge_windows_unittests.cc
index 2dae9d8b41e016926f49a66cdf970648d753ee53..f2244bb0eaf2e16a979581c33b40fef38362d8e7 100644
--- a/shell/platform/windows/accessibility_bridge_windows_unittests.cc
+++ b/shell/platform/windows/accessibility_bridge_windows_unittests.cc
@@ -10,6 +10,7 @@
 
 #include <vector>
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/embedder/embedder.h"
 #include "flutter/shell/platform/embedder/test_utils/proc_table_replacement.h"
 #include "flutter/shell/platform/windows/flutter_platform_node_delegate_windows.h"
@@ -25,11 +26,12 @@ namespace flutter {
 namespace testing {
 
 namespace {
+using ::testing::NiceMock;
 
 // A structure representing a Win32 MSAA event targeting a specified node.
 struct MsaaEvent {
   std::shared_ptr<FlutterPlatformNodeDelegateWindows> node_delegate;
-  DWORD event_type;
+  ax::mojom::Event event_type;
 };
 
 // Accessibility bridge delegate that captures events dispatched to the OS.
@@ -39,17 +41,17 @@ class AccessibilityBridgeWindowsSpy : public AccessibilityBridgeWindows {
 
   explicit AccessibilityBridgeWindowsSpy(FlutterWindowsEngine* engine,
                                          FlutterWindowsView* view)
-      : AccessibilityBridgeWindows(engine, view) {}
+      : AccessibilityBridgeWindows(view) {}
 
   void DispatchWinAccessibilityEvent(
       std::shared_ptr<FlutterPlatformNodeDelegateWindows> node_delegate,
-      DWORD event_type) override {
+      ax::mojom::Event event_type) override {
     dispatched_events_.push_back({node_delegate, event_type});
   }
 
   void SetFocus(std::shared_ptr<FlutterPlatformNodeDelegateWindows>
                     node_delegate) override {
-    focused_nodes_.push_back(node_delegate->GetAXNode()->id());
+    focused_nodes_.push_back(std::move(node_delegate));
   }
 
   void ResetRecords() {
@@ -61,38 +63,56 @@ class AccessibilityBridgeWindowsSpy : public AccessibilityBridgeWindows {
     return dispatched_events_;
   }
 
-  const std::vector<int32_t> focused_nodes() const { return focused_nodes_; }
+  const std::vector<int32_t> focused_nodes() const {
+    std::vector<int32_t> ids;
+    std::transform(focused_nodes_.begin(), focused_nodes_.end(),
+                   std::back_inserter(ids),
+                   [](std::shared_ptr<FlutterPlatformNodeDelegate> node) {
+                     return node->GetAXNode()->id();
+                   });
+    return ids;
+  }
+
+ protected:
+  std::weak_ptr<FlutterPlatformNodeDelegate> GetFocusedNode() override {
+    return focused_nodes_.back();
+  }
 
  private:
   std::vector<MsaaEvent> dispatched_events_;
-  std::vector<int32_t> focused_nodes_;
+  std::vector<std::shared_ptr<FlutterPlatformNodeDelegate>> focused_nodes_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(AccessibilityBridgeWindowsSpy);
 };
 
-// A FlutterWindowsEngine whose accessibility bridge is a
+// A FlutterWindowsView whose accessibility bridge is an
 // AccessibilityBridgeWindowsSpy.
-class FlutterWindowsEngineSpy : public FlutterWindowsEngine {
+class FlutterWindowsViewSpy : public FlutterWindowsView {
  public:
-  explicit FlutterWindowsEngineSpy(const FlutterProjectBundle& project)
-      : FlutterWindowsEngine(project) {}
+  FlutterWindowsViewSpy(FlutterWindowsEngine* engine,
+                        std::unique_ptr<WindowBindingHandler> handler)
+      : FlutterWindowsView(kImplicitViewId, engine, std::move(handler)) {}
 
  protected:
-  virtual std::shared_ptr<AccessibilityBridge> CreateAccessibilityBridge(
-      FlutterWindowsEngine* engine,
-      FlutterWindowsView* view) override {
-    return std::make_shared<AccessibilityBridgeWindowsSpy>(engine, view);
+  virtual std::shared_ptr<AccessibilityBridgeWindows>
+  CreateAccessibilityBridge() override {
+    return std::make_shared<AccessibilityBridgeWindowsSpy>(GetEngine(), this);
   }
+
+ private:
+  FML_DISALLOW_COPY_AND_ASSIGN(FlutterWindowsViewSpy);
 };
 
 // Returns an engine instance configured with dummy project path values, and
 // overridden methods for sending platform messages, so that the engine can
 // respond as if the framework were connected.
-std::unique_ptr<FlutterWindowsEngineSpy> GetTestEngine() {
+std::unique_ptr<FlutterWindowsEngine> GetTestEngine() {
   FlutterDesktopEngineProperties properties = {};
   properties.assets_path = L"C:\\foo\\flutter_assets";
   properties.icu_data_path = L"C:\\foo\\icudtl.dat";
   properties.aot_library_path = L"C:\\foo\\aot.so";
   FlutterProjectBundle project(properties);
-  auto engine = std::make_unique<FlutterWindowsEngineSpy>(project);
+  auto engine = std::make_unique<FlutterWindowsEngine>(project);
 
   EngineModifier modifier(engine.get());
   modifier.embedder_api().UpdateSemanticsEnabled =
@@ -119,37 +139,37 @@ std::unique_ptr<FlutterWindowsEngineSpy> GetTestEngine() {
 // node4 is a static text node with no text, and hence has the "ignored" state.
 void PopulateAXTree(std::shared_ptr<AccessibilityBridge> bridge) {
   // Add node 0: root.
-  FlutterSemanticsNode node0{sizeof(FlutterSemanticsNode), 0};
+  FlutterSemanticsNode2 node0{sizeof(FlutterSemanticsNode2), 0};
   std::vector<int32_t> node0_children{1, 2};
   node0.child_count = node0_children.size();
   node0.children_in_traversal_order = node0_children.data();
   node0.children_in_hit_test_order = node0_children.data();
 
   // Add node 1: text child of node 0.
-  FlutterSemanticsNode node1{sizeof(FlutterSemanticsNode), 1};
+  FlutterSemanticsNode2 node1{sizeof(FlutterSemanticsNode2), 1};
   node1.label = "prefecture";
   node1.value = "Kyoto";
 
   // Add node 2: subtree child of node 0.
-  FlutterSemanticsNode node2{sizeof(FlutterSemanticsNode), 2};
+  FlutterSemanticsNode2 node2{sizeof(FlutterSemanticsNode2), 2};
   std::vector<int32_t> node2_children{3, 4};
   node2.child_count = node2_children.size();
   node2.children_in_traversal_order = node2_children.data();
   node2.children_in_hit_test_order = node2_children.data();
 
   // Add node 3: text child of node 2.
-  FlutterSemanticsNode node3{sizeof(FlutterSemanticsNode), 3};
+  FlutterSemanticsNode2 node3{sizeof(FlutterSemanticsNode2), 3};
   node3.label = "city";
   node3.value = "Uji";
 
   // Add node 4: text child (with no text) of node 2.
-  FlutterSemanticsNode node4{sizeof(FlutterSemanticsNode), 4};
+  FlutterSemanticsNode2 node4{sizeof(FlutterSemanticsNode2), 4};
 
-  bridge->AddFlutterSemanticsNodeUpdate(&node0);
-  bridge->AddFlutterSemanticsNodeUpdate(&node1);
-  bridge->AddFlutterSemanticsNodeUpdate(&node2);
-  bridge->AddFlutterSemanticsNodeUpdate(&node3);
-  bridge->AddFlutterSemanticsNodeUpdate(&node4);
+  bridge->AddFlutterSemanticsNodeUpdate(node0);
+  bridge->AddFlutterSemanticsNodeUpdate(node1);
+  bridge->AddFlutterSemanticsNodeUpdate(node2);
+  bridge->AddFlutterSemanticsNodeUpdate(node3);
+  bridge->AddFlutterSemanticsNodeUpdate(node4);
   bridge->CommitUpdates();
 }
 
@@ -160,42 +180,69 @@ ui::AXNode* AXNodeFromID(std::shared_ptr<AccessibilityBridge> bridge,
 }
 
 std::shared_ptr<AccessibilityBridgeWindowsSpy> GetAccessibilityBridgeSpy(
-    FlutterWindowsEngine* engine) {
-  FlutterWindowsEngineSpy* engine_spy =
-      reinterpret_cast<FlutterWindowsEngineSpy*>(engine);
-  return std::reinterpret_pointer_cast<AccessibilityBridgeWindowsSpy>(
-      engine_spy->accessibility_bridge().lock());
+    FlutterWindowsView& view) {
+  return std::static_pointer_cast<AccessibilityBridgeWindowsSpy>(
+      view.accessibility_bridge().lock());
 }
 
 void ExpectWinEventFromAXEvent(int32_t node_id,
                                ui::AXEventGenerator::Event ax_event,
-                               DWORD expected_event) {
-  auto window_binding_handler =
-      std::make_unique<::testing::NiceMock<MockWindowBindingHandler>>();
-  FlutterWindowsView view(std::move(window_binding_handler));
-  view.SetEngine(GetTestEngine());
+                               ax::mojom::Event expected_event) {
+  auto engine = GetTestEngine();
+  FlutterWindowsViewSpy view{
+      engine.get(), std::make_unique<NiceMock<MockWindowBindingHandler>>()};
+  EngineModifier modifier{engine.get()};
+  modifier.SetImplicitView(&view);
+  view.OnUpdateSemanticsEnabled(true);
+
+  auto bridge = GetAccessibilityBridgeSpy(view);
+  PopulateAXTree(bridge);
+
+  bridge->ResetRecords();
+  bridge->OnAccessibilityEvent({AXNodeFromID(bridge, node_id),
+                                {ax_event, ax::mojom::EventFrom::kNone, {}}});
+  ASSERT_EQ(bridge->dispatched_events().size(), 1);
+  EXPECT_EQ(bridge->dispatched_events()[0].event_type, expected_event);
+}
+
+void ExpectWinEventFromAXEventOnFocusNode(int32_t node_id,
+                                          ui::AXEventGenerator::Event ax_event,
+                                          ax::mojom::Event expected_event,
+                                          int32_t focus_id) {
+  auto engine = GetTestEngine();
+  FlutterWindowsViewSpy view{
+      engine.get(), std::make_unique<NiceMock<MockWindowBindingHandler>>()};
+  EngineModifier modifier{engine.get()};
+  modifier.SetImplicitView(&view);
   view.OnUpdateSemanticsEnabled(true);
 
-  auto bridge = GetAccessibilityBridgeSpy(view.GetEngine());
+  auto bridge = GetAccessibilityBridgeSpy(view);
   PopulateAXTree(bridge);
 
   bridge->ResetRecords();
+  auto focus_delegate =
+      bridge->GetFlutterPlatformNodeDelegateFromID(focus_id).lock();
+  bridge->SetFocus(std::static_pointer_cast<FlutterPlatformNodeDelegateWindows>(
+      focus_delegate));
   bridge->OnAccessibilityEvent({AXNodeFromID(bridge, node_id),
                                 {ax_event, ax::mojom::EventFrom::kNone, {}}});
   ASSERT_EQ(bridge->dispatched_events().size(), 1);
   EXPECT_EQ(bridge->dispatched_events()[0].event_type, expected_event);
+  EXPECT_EQ(bridge->dispatched_events()[0].node_delegate->GetAXNode()->id(),
+            focus_id);
 }
 
 }  // namespace
 
 TEST(AccessibilityBridgeWindows, GetParent) {
-  auto window_binding_handler =
-      std::make_unique<::testing::NiceMock<MockWindowBindingHandler>>();
-  FlutterWindowsView view(std::move(window_binding_handler));
-  view.SetEngine(GetTestEngine());
+  auto engine = GetTestEngine();
+  FlutterWindowsViewSpy view{
+      engine.get(), std::make_unique<NiceMock<MockWindowBindingHandler>>()};
+  EngineModifier modifier{engine.get()};
+  modifier.SetImplicitView(&view);
   view.OnUpdateSemanticsEnabled(true);
 
-  auto bridge = view.GetEngine()->accessibility_bridge().lock();
+  auto bridge = view.accessibility_bridge().lock();
   PopulateAXTree(bridge);
 
   auto node0_delegate = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
@@ -205,13 +252,14 @@ TEST(AccessibilityBridgeWindows, GetParent) {
 }
 
 TEST(AccessibilityBridgeWindows, GetParentOnRootRetunsNullptr) {
-  auto window_binding_handler =
-      std::make_unique<::testing::NiceMock<MockWindowBindingHandler>>();
-  FlutterWindowsView view(std::move(window_binding_handler));
-  view.SetEngine(GetTestEngine());
+  auto engine = GetTestEngine();
+  FlutterWindowsViewSpy view{
+      engine.get(), std::make_unique<NiceMock<MockWindowBindingHandler>>()};
+  EngineModifier modifier{engine.get()};
+  modifier.SetImplicitView(&view);
   view.OnUpdateSemanticsEnabled(true);
 
-  auto bridge = view.GetEngine()->accessibility_bridge().lock();
+  auto bridge = view.accessibility_bridge().lock();
   PopulateAXTree(bridge);
 
   auto node0_delegate = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
@@ -219,17 +267,17 @@ TEST(AccessibilityBridgeWindows, GetParentOnRootRetunsNullptr) {
 }
 
 TEST(AccessibilityBridgeWindows, DispatchAccessibilityAction) {
-  auto window_binding_handler =
-      std::make_unique<::testing::NiceMock<MockWindowBindingHandler>>();
-  FlutterWindowsView view(std::move(window_binding_handler));
-  view.SetEngine(GetTestEngine());
+  auto engine = GetTestEngine();
+  FlutterWindowsViewSpy view{
+      engine.get(), std::make_unique<NiceMock<MockWindowBindingHandler>>()};
+  EngineModifier modifier{engine.get()};
+  modifier.SetImplicitView(&view);
   view.OnUpdateSemanticsEnabled(true);
 
-  auto bridge = view.GetEngine()->accessibility_bridge().lock();
+  auto bridge = view.accessibility_bridge().lock();
   PopulateAXTree(bridge);
 
   FlutterSemanticsAction actual_action = kFlutterSemanticsActionTap;
-  EngineModifier modifier(view.GetEngine());
   modifier.embedder_api().DispatchSemanticsAction = MOCK_ENGINE_PROC(
       DispatchSemanticsAction,
       ([&actual_action](FLUTTER_API_SYMBOL(FlutterEngine) engine, uint64_t id,
@@ -239,29 +287,30 @@ TEST(AccessibilityBridgeWindows, DispatchAccessibilityAction) {
         return kSuccess;
       }));
 
-  AccessibilityBridgeWindows delegate(view.GetEngine(), &view);
+  AccessibilityBridgeWindows delegate(&view);
   delegate.DispatchAccessibilityAction(1, kFlutterSemanticsActionCopy, {});
   EXPECT_EQ(actual_action, kFlutterSemanticsActionCopy);
 }
 
 TEST(AccessibilityBridgeWindows, OnAccessibilityEventAlert) {
   ExpectWinEventFromAXEvent(0, ui::AXEventGenerator::Event::ALERT,
-                            EVENT_SYSTEM_ALERT);
+                            ax::mojom::Event::kAlert);
 }
 
 TEST(AccessibilityBridgeWindows, OnAccessibilityEventChildrenChanged) {
   ExpectWinEventFromAXEvent(0, ui::AXEventGenerator::Event::CHILDREN_CHANGED,
-                            EVENT_OBJECT_REORDER);
+                            ax::mojom::Event::kChildrenChanged);
 }
 
 TEST(AccessibilityBridgeWindows, OnAccessibilityEventFocusChanged) {
-  auto window_binding_handler =
-      std::make_unique<::testing::NiceMock<MockWindowBindingHandler>>();
-  FlutterWindowsView view(std::move(window_binding_handler));
-  view.SetEngine(GetTestEngine());
+  auto engine = GetTestEngine();
+  FlutterWindowsViewSpy view{
+      engine.get(), std::make_unique<NiceMock<MockWindowBindingHandler>>()};
+  EngineModifier modifier{engine.get()};
+  modifier.SetImplicitView(&view);
   view.OnUpdateSemanticsEnabled(true);
 
-  auto bridge = GetAccessibilityBridgeSpy(view.GetEngine());
+  auto bridge = GetAccessibilityBridgeSpy(view);
   PopulateAXTree(bridge);
 
   bridge->ResetRecords();
@@ -270,7 +319,8 @@ TEST(AccessibilityBridgeWindows, OnAccessibilityEventFocusChanged) {
                                  ax::mojom::EventFrom::kNone,
                                  {}}});
   ASSERT_EQ(bridge->dispatched_events().size(), 1);
-  EXPECT_EQ(bridge->dispatched_events()[0].event_type, EVENT_OBJECT_FOCUS);
+  EXPECT_EQ(bridge->dispatched_events()[0].event_type,
+            ax::mojom::Event::kFocus);
 
   ASSERT_EQ(bridge->focused_nodes().size(), 1);
   EXPECT_EQ(bridge->focused_nodes()[0], 1);
@@ -279,62 +329,68 @@ TEST(AccessibilityBridgeWindows, OnAccessibilityEventFocusChanged) {
 TEST(AccessibilityBridgeWindows, OnAccessibilityEventIgnoredChanged) {
   // Static test nodes with no text, hint, or scrollability are ignored.
   ExpectWinEventFromAXEvent(4, ui::AXEventGenerator::Event::IGNORED_CHANGED,
-                            EVENT_OBJECT_HIDE);
+                            ax::mojom::Event::kHide);
 }
 
 TEST(AccessibilityBridgeWindows, OnAccessibilityImageAnnotationChanged) {
   ExpectWinEventFromAXEvent(
       1, ui::AXEventGenerator::Event::IMAGE_ANNOTATION_CHANGED,
-      EVENT_OBJECT_NAMECHANGE);
+      ax::mojom::Event::kTextChanged);
 }
 
 TEST(AccessibilityBridgeWindows, OnAccessibilityLiveRegionChanged) {
   ExpectWinEventFromAXEvent(1, ui::AXEventGenerator::Event::LIVE_REGION_CHANGED,
-                            EVENT_OBJECT_LIVEREGIONCHANGED);
+                            ax::mojom::Event::kLiveRegionChanged);
 }
 
 TEST(AccessibilityBridgeWindows, OnAccessibilityNameChanged) {
   ExpectWinEventFromAXEvent(1, ui::AXEventGenerator::Event::NAME_CHANGED,
-                            EVENT_OBJECT_NAMECHANGE);
+                            ax::mojom::Event::kTextChanged);
 }
 
 TEST(AccessibilityBridgeWindows, OnAccessibilityHScrollPosChanged) {
   ExpectWinEventFromAXEvent(
       1, ui::AXEventGenerator::Event::SCROLL_HORIZONTAL_POSITION_CHANGED,
-      EVENT_SYSTEM_SCROLLINGEND);
+      ax::mojom::Event::kScrollPositionChanged);
 }
 
 TEST(AccessibilityBridgeWindows, OnAccessibilityVScrollPosChanged) {
   ExpectWinEventFromAXEvent(
       1, ui::AXEventGenerator::Event::SCROLL_VERTICAL_POSITION_CHANGED,
-      EVENT_SYSTEM_SCROLLINGEND);
+      ax::mojom::Event::kScrollPositionChanged);
 }
 
 TEST(AccessibilityBridgeWindows, OnAccessibilitySelectedChanged) {
   ExpectWinEventFromAXEvent(1, ui::AXEventGenerator::Event::SELECTED_CHANGED,
-                            EVENT_OBJECT_VALUECHANGE);
+                            ax::mojom::Event::kValueChanged);
 }
 
 TEST(AccessibilityBridgeWindows, OnAccessibilitySelectedChildrenChanged) {
   ExpectWinEventFromAXEvent(
       2, ui::AXEventGenerator::Event::SELECTED_CHILDREN_CHANGED,
-      EVENT_OBJECT_SELECTIONWITHIN);
+      ax::mojom::Event::kSelectedChildrenChanged);
 }
 
 TEST(AccessibilityBridgeWindows, OnAccessibilitySubtreeCreated) {
   ExpectWinEventFromAXEvent(0, ui::AXEventGenerator::Event::SUBTREE_CREATED,
-                            EVENT_OBJECT_SHOW);
+                            ax::mojom::Event::kShow);
 }
 
 TEST(AccessibilityBridgeWindows, OnAccessibilityValueChanged) {
   ExpectWinEventFromAXEvent(1, ui::AXEventGenerator::Event::VALUE_CHANGED,
-                            EVENT_OBJECT_VALUECHANGE);
+                            ax::mojom::Event::kValueChanged);
 }
 
 TEST(AccessibilityBridgeWindows, OnAccessibilityStateChanged) {
   ExpectWinEventFromAXEvent(
       1, ui::AXEventGenerator::Event::WIN_IACCESSIBLE_STATE_CHANGED,
-      EVENT_OBJECT_STATECHANGE);
+      ax::mojom::Event::kStateChanged);
+}
+
+TEST(AccessibilityBridgeWindows, OnDocumentSelectionChanged) {
+  ExpectWinEventFromAXEventOnFocusNode(
+      1, ui::AXEventGenerator::Event::DOCUMENT_SELECTION_CHANGED,
+      ax::mojom::Event::kDocumentSelectionChanged, 2);
 }
 
 }  // namespace testing
diff --git a/shell/platform/windows/accessibility_plugin.cc b/shell/platform/windows/accessibility_plugin.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a1fe9fc21d060c22ccfb2f0eb126651c9f2eb329
--- /dev/null
+++ b/shell/platform/windows/accessibility_plugin.cc
@@ -0,0 +1,108 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/platform/windows/accessibility_plugin.h"
+
+#include <variant>
+
+#include "flutter/fml/logging.h"
+#include "flutter/fml/platform/win/wstring_conversion.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_message_codec.h"
+#include "flutter/shell/platform/windows/flutter_windows_engine.h"
+#include "flutter/shell/platform/windows/flutter_windows_view.h"
+
+namespace flutter {
+
+namespace {
+
+static constexpr char kAccessibilityChannelName[] = "flutter/accessibility";
+static constexpr char kTypeKey[] = "type";
+static constexpr char kDataKey[] = "data";
+static constexpr char kMessageKey[] = "message";
+static constexpr char kAnnounceValue[] = "announce";
+
+// Handles messages like:
+// {"type": "announce", "data": {"message": "Hello"}}
+void HandleMessage(AccessibilityPlugin* plugin, const EncodableValue& message) {
+  const auto* map = std::get_if<EncodableMap>(&message);
+  if (!map) {
+    FML_LOG(ERROR) << "Accessibility message must be a map.";
+    return;
+  }
+  const auto& type_itr = map->find(EncodableValue{kTypeKey});
+  const auto& data_itr = map->find(EncodableValue{kDataKey});
+  if (type_itr == map->end()) {
+    FML_LOG(ERROR) << "Accessibility message must have a 'type' property.";
+    return;
+  }
+  if (data_itr == map->end()) {
+    FML_LOG(ERROR) << "Accessibility message must have a 'data' property.";
+    return;
+  }
+  const auto* type = std::get_if<std::string>(&type_itr->second);
+  const auto* data = std::get_if<EncodableMap>(&data_itr->second);
+  if (!type) {
+    FML_LOG(ERROR) << "Accessibility message 'type' property must be a string.";
+    return;
+  }
+  if (!data) {
+    FML_LOG(ERROR) << "Accessibility message 'data' property must be a map.";
+    return;
+  }
+
+  if (type->compare(kAnnounceValue) == 0) {
+    const auto& message_itr = data->find(EncodableValue{kMessageKey});
+    if (message_itr == data->end()) {
+      return;
+    }
+    const auto* message = std::get_if<std::string>(&message_itr->second);
+    if (!message) {
+      return;
+    }
+
+    plugin->Announce(*message);
+  } else {
+    FML_LOG(WARNING) << "Accessibility message type '" << *type
+                     << "' is not supported.";
+  }
+}
+
+}  // namespace
+
+AccessibilityPlugin::AccessibilityPlugin(FlutterWindowsEngine* engine)
+    : engine_(engine) {}
+
+void AccessibilityPlugin::SetUp(BinaryMessenger* binary_messenger,
+                                AccessibilityPlugin* plugin) {
+  BasicMessageChannel<> channel{binary_messenger, kAccessibilityChannelName,
+                                &StandardMessageCodec::GetInstance()};
+
+  channel.SetMessageHandler(
+      [plugin](const EncodableValue& message,
+               const MessageReply<EncodableValue>& reply) {
+        HandleMessage(plugin, message);
+
+        // The accessibility channel does not support error handling.
+        // Always return an empty response even on failure.
+        reply(EncodableValue{std::monostate{}});
+      });
+}
+
+void AccessibilityPlugin::Announce(const std::string_view message) {
+  if (!engine_->semantics_enabled()) {
+    return;
+  }
+
+  // TODO(loicsharma): Remove implicit view assumption.
+  // https://github.com/flutter/flutter/issues/142845
+  auto view = engine_->view(kImplicitViewId);
+  if (!view) {
+    return;
+  }
+
+  std::wstring wide_text = fml::Utf8ToWideString(message);
+  view->AnnounceAlert(wide_text);
+}
+
+}  // namespace flutter
diff --git a/shell/platform/windows/accessibility_plugin.h b/shell/platform/windows/accessibility_plugin.h
new file mode 100644
index 0000000000000000000000000000000000000000..cd0c24ead86458716119dc669632476d50dd68a3
--- /dev/null
+++ b/shell/platform/windows/accessibility_plugin.h
@@ -0,0 +1,41 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_ACCESSIBILITY_PLUGIN_H_
+#define FLUTTER_SHELL_PLATFORM_WINDOWS_ACCESSIBILITY_PLUGIN_H_
+
+#include <string_view>
+
+#include "flutter/fml/macros.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h"
+
+namespace flutter {
+
+class FlutterWindowsEngine;
+
+// Handles messages on the flutter/accessibility channel.
+//
+// See:
+// https://api.flutter.dev/flutter/semantics/SemanticsService-class.html
+class AccessibilityPlugin {
+ public:
+  explicit AccessibilityPlugin(FlutterWindowsEngine* engine);
+
+  // Begin handling accessibility messages on the `binary_messenger`.
+  static void SetUp(BinaryMessenger* binary_messenger,
+                    AccessibilityPlugin* plugin);
+
+  // Announce a message through the assistive technology.
+  virtual void Announce(const std::string_view message);
+
+ private:
+  // The engine that owns this plugin.
+  FlutterWindowsEngine* engine_ = nullptr;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(AccessibilityPlugin);
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_ACCESSIBILITY_PLUGIN_H_
diff --git a/shell/platform/windows/accessibility_root_node.cc b/shell/platform/windows/accessibility_root_node.cc
deleted file mode 100644
index caac7f76493b1ae9e569b3d78e0d28836773f531..0000000000000000000000000000000000000000
--- a/shell/platform/windows/accessibility_root_node.cc
+++ /dev/null
@@ -1,306 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "flutter/shell/platform/windows/accessibility_root_node.h"
-
-#include "flutter/fml/logging.h"
-#include "flutter/third_party/accessibility/base/win/atl_module.h"
-
-namespace flutter {
-
-static constexpr LONG kWindowChildId = 1;
-static constexpr LONG kInvalidChildId = 3;
-
-AccessibilityRootNode::AccessibilityRootNode() : alert_accessible_(nullptr) {}
-
-AccessibilityRootNode::~AccessibilityRootNode() {
-  if (alert_accessible_) {
-    alert_accessible_->Release();
-    alert_accessible_ = nullptr;
-  }
-}
-
-IAccessible* AccessibilityRootNode::GetTargetAndChildID(VARIANT* var_id) {
-  LONG& child_id = var_id->lVal;
-  if (V_VT(var_id) != VT_I4) {
-    child_id = kInvalidChildId;
-    return nullptr;
-  }
-  child_id = V_I4(var_id);
-  if (!window_accessible_) {
-    return nullptr;
-  }
-  if (child_id == CHILDID_SELF || child_id == kWindowChildId) {
-    child_id = CHILDID_SELF;
-    return window_accessible_;
-  }
-  if (child_id == kAlertChildId && alert_accessible_) {
-    child_id = CHILDID_SELF;
-    return alert_accessible_;
-  }
-  // A negative child ID can be used to refer to an AX node directly by its ID.
-  if (child_id < 0) {
-    return window_accessible_;
-  }
-  return nullptr;
-}
-
-IFACEMETHODIMP AccessibilityRootNode::accHitTest(LONG screen_physical_pixel_x,
-                                                 LONG screen_physical_pixel_y,
-                                                 VARIANT* child) {
-  if (window_accessible_) {
-    return window_accessible_->accHitTest(screen_physical_pixel_x,
-                                          screen_physical_pixel_y, child);
-  }
-  child->vt = VT_EMPTY;
-  return S_FALSE;
-}
-
-IFACEMETHODIMP AccessibilityRootNode::accDoDefaultAction(VARIANT var_id) {
-  IAccessible* target;
-  if ((target = GetTargetAndChildID(&var_id))) {
-    return target->accDoDefaultAction(var_id);
-  }
-  return E_FAIL;
-}
-
-IFACEMETHODIMP AccessibilityRootNode::accLocation(LONG* physical_pixel_left,
-                                                  LONG* physical_pixel_top,
-                                                  LONG* width,
-                                                  LONG* height,
-                                                  VARIANT var_id) {
-  IAccessible* target;
-  if ((target = GetTargetAndChildID(&var_id))) {
-    return target->accLocation(physical_pixel_left, physical_pixel_top, width,
-                               height, var_id);
-  }
-  return S_FALSE;
-}
-
-IFACEMETHODIMP AccessibilityRootNode::accNavigate(LONG nav_dir,
-                                                  VARIANT start,
-                                                  VARIANT* end) {
-  IAccessible* target;
-  if ((target = GetTargetAndChildID(&start))) {
-    return target->accNavigate(nav_dir, start, end);
-  }
-  return S_FALSE;
-}
-
-IFACEMETHODIMP AccessibilityRootNode::get_accChild(VARIANT var_child,
-                                                   IDispatch** disp_child) {
-  if (V_VT(&var_child) != VT_I4) {
-    return E_FAIL;
-  }
-  LONG child_id = V_I4(&var_child);
-  if (child_id == CHILDID_SELF) {
-    *disp_child = this;
-  } else if (!window_accessible_) {
-    return E_FAIL;
-  } else if (child_id == kWindowChildId) {
-    *disp_child = window_accessible_;
-  } else if (child_id == kAlertChildId && alert_accessible_) {
-    *disp_child = alert_accessible_;
-  } else if (child_id < 0) {
-    // A negative child ID can be used to refer to an AX node directly by its
-    // ID.
-    return window_accessible_->get_accChild(var_child, disp_child);
-  } else {
-    return E_FAIL;
-  }
-  (*disp_child)->AddRef();
-  return S_OK;
-}
-
-IFACEMETHODIMP AccessibilityRootNode::get_accChildCount(LONG* child_count) {
-  LONG children = 0;
-  if (window_accessible_) {
-    children++;
-  }
-  if (alert_accessible_) {
-    children++;
-  }
-  *child_count = children;
-  return S_OK;
-}
-
-IFACEMETHODIMP AccessibilityRootNode::get_accDefaultAction(VARIANT var_id,
-                                                           BSTR* def_action) {
-  IAccessible* target;
-  if ((target = GetTargetAndChildID(&var_id))) {
-    return target->get_accDefaultAction(var_id, def_action);
-  }
-  *def_action = nullptr;
-  return S_FALSE;
-}
-
-IFACEMETHODIMP AccessibilityRootNode::get_accDescription(VARIANT var_id,
-                                                         BSTR* desc) {
-  IAccessible* target;
-  if ((target = GetTargetAndChildID(&var_id))) {
-    return target->get_accDescription(var_id, desc);
-  }
-  return E_FAIL;
-}
-
-IFACEMETHODIMP AccessibilityRootNode::get_accFocus(VARIANT* focus_child) {
-  if (window_accessible_) {
-    return window_accessible_->get_accFocus(focus_child);
-  }
-  focus_child->vt = VT_EMPTY;
-  return S_OK;
-}
-
-IFACEMETHODIMP AccessibilityRootNode::get_accKeyboardShortcut(VARIANT var_id,
-                                                              BSTR* acc_key) {
-  IAccessible* target;
-  if ((target = GetTargetAndChildID(&var_id))) {
-    return target->get_accKeyboardShortcut(var_id, acc_key);
-  }
-  return E_FAIL;
-}
-
-IFACEMETHODIMP AccessibilityRootNode::get_accName(VARIANT var_id,
-                                                  BSTR* name_bstr) {
-  if (V_I4(&var_id) == CHILDID_SELF) {
-    std::wstring name = L"ROOT_NODE_VIEW";
-    *name_bstr = SysAllocString(name.c_str());
-    return S_OK;
-  }
-  IAccessible* target;
-  if ((target = GetTargetAndChildID(&var_id))) {
-    return target->get_accName(var_id, name_bstr);
-  }
-  return S_FALSE;
-}
-
-IFACEMETHODIMP AccessibilityRootNode::get_accParent(IDispatch** disp_parent) {
-  return S_FALSE;
-}
-
-IFACEMETHODIMP AccessibilityRootNode::get_accRole(VARIANT var_id,
-                                                  VARIANT* role) {
-  IAccessible* target;
-  if ((target = GetTargetAndChildID(&var_id))) {
-    return target->get_accRole(var_id, role);
-  }
-  return E_FAIL;
-}
-
-IFACEMETHODIMP AccessibilityRootNode::get_accState(VARIANT var_id,
-                                                   VARIANT* state) {
-  IAccessible* target;
-  if ((target = GetTargetAndChildID(&var_id))) {
-    return target->get_accState(var_id, state);
-  }
-  return E_FAIL;
-}
-
-IFACEMETHODIMP AccessibilityRootNode::get_accHelp(VARIANT var_id, BSTR* help) {
-  if (!help) {
-    return E_INVALIDARG;
-  }
-  *help = {};
-  return S_FALSE;
-}
-
-IFACEMETHODIMP AccessibilityRootNode::get_accValue(VARIANT var_id,
-                                                   BSTR* value) {
-  IAccessible* target;
-  if ((target = GetTargetAndChildID(&var_id))) {
-    return target->get_accValue(var_id, value);
-  }
-  return E_FAIL;
-}
-
-IFACEMETHODIMP AccessibilityRootNode::put_accValue(VARIANT var_id,
-                                                   BSTR new_value) {
-  IAccessible* target;
-  if ((target = GetTargetAndChildID(&var_id))) {
-    return target->put_accValue(var_id, new_value);
-  }
-  return E_FAIL;
-}
-
-IFACEMETHODIMP AccessibilityRootNode::get_accSelection(VARIANT* selected) {
-  selected->vt = VT_EMPTY;
-  return S_OK;
-}
-
-IFACEMETHODIMP AccessibilityRootNode::accSelect(LONG flagsSelect,
-                                                VARIANT var_id) {
-  IAccessible* target;
-  if ((target = GetTargetAndChildID(&var_id))) {
-    return target->accSelect(flagsSelect, var_id);
-  }
-  return E_FAIL;
-}
-
-IFACEMETHODIMP AccessibilityRootNode::get_accHelpTopic(BSTR* help_file,
-                                                       VARIANT var_id,
-                                                       LONG* topic_id) {
-  if (help_file) {
-    *help_file = nullptr;
-  }
-  if (topic_id) {
-    *topic_id = -1;
-  }
-  return E_NOTIMPL;
-}
-
-IFACEMETHODIMP AccessibilityRootNode::put_accName(VARIANT var_id,
-                                                  BSTR put_name) {
-  return E_NOTIMPL;
-}
-
-//
-// IServiceProvider implementation.
-//
-
-IFACEMETHODIMP AccessibilityRootNode::QueryService(REFGUID guidService,
-                                                   REFIID riid,
-                                                   void** object) {
-  if (!object) {
-    return E_INVALIDARG;
-  }
-
-  if (guidService == IID_IAccessible) {
-    return QueryInterface(riid, object);
-  }
-
-  *object = nullptr;
-  return E_FAIL;
-}
-
-void AccessibilityRootNode::SetWindow(IAccessible* window) {
-  window_accessible_ = window;
-}
-
-AccessibilityAlert* AccessibilityRootNode::GetOrCreateAlert() {
-  if (!alert_accessible_) {
-    CComObject<AccessibilityAlert>* instance = nullptr;
-    HRESULT hr = CComObject<AccessibilityAlert>::CreateInstance(&instance);
-    if (!SUCCEEDED(hr)) {
-      FML_LOG(FATAL) << "Failed to create alert accessible";
-    }
-    instance->AddRef();
-    instance->SetParent(this);
-    alert_accessible_ = instance;
-  }
-  return alert_accessible_;
-}
-
-// static
-AccessibilityRootNode* AccessibilityRootNode::Create() {
-  ui::win::CreateATLModuleIfNeeded();
-  CComObject<AccessibilityRootNode>* instance = nullptr;
-  HRESULT hr = CComObject<AccessibilityRootNode>::CreateInstance(&instance);
-  if (!SUCCEEDED(hr) || !instance) {
-    FML_LOG(FATAL) << "Failed to create accessibility root node";
-  }
-  instance->AddRef();
-  return instance;
-}
-
-}  // namespace flutter
diff --git a/shell/platform/windows/accessibility_root_node.h b/shell/platform/windows/accessibility_root_node.h
deleted file mode 100644
index 5d01e83cfe4be10f4f01240ee9219870338cb649..0000000000000000000000000000000000000000
--- a/shell/platform/windows/accessibility_root_node.h
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_ACCESSIBILITY_ROOT_NODE_H_
-#define FLUTTER_SHELL_PLATFORM_WINDOWS_ACCESSIBILITY_ROOT_NODE_H_
-
-#include <atlbase.h>
-#include <atlcom.h>
-#include <oleacc.h>
-
-#include <memory>
-
-#include "flutter/shell/platform/windows/accessibility_alert.h"
-
-namespace flutter {
-
-// A parent node that wraps the window IAccessible node.
-class __declspec(uuid("fedb8280-ea4f-47a9-98fe-5d1a557fe4b3"))
-    AccessibilityRootNode : public CComObjectRootEx<CComMultiThreadModel>,
-                            public IDispatchImpl<IAccessible>,
-                            public IServiceProvider {
- public:
-  static constexpr LONG kAlertChildId = 2;
-
-  BEGIN_COM_MAP(AccessibilityRootNode)
-  COM_INTERFACE_ENTRY(AccessibilityRootNode)
-  COM_INTERFACE_ENTRY(IAccessible)
-  COM_INTERFACE_ENTRY(IDispatch)
-  COM_INTERFACE_ENTRY(IServiceProvider)
-  END_COM_MAP()
-
-  //
-  // IAccessible methods.
-  //
-
-  // Retrieves the child element or child object at a given point on the screen.
-  IFACEMETHODIMP accHitTest(LONG screen_physical_pixel_x,
-                            LONG screen_physical_pixel_y,
-                            VARIANT* child) override;
-
-  // Performs the object's default action.
-  IFACEMETHODIMP accDoDefaultAction(VARIANT var_id) override;
-
-  // Retrieves the specified object's current screen location.
-  IFACEMETHODIMP accLocation(LONG* physical_pixel_left,
-                             LONG* physical_pixel_top,
-                             LONG* width,
-                             LONG* height,
-                             VARIANT var_id) override;
-
-  // Traverses to another UI element and retrieves the object.
-  IFACEMETHODIMP accNavigate(LONG nav_dir,
-                             VARIANT start,
-                             VARIANT* end) override;
-
-  // Retrieves an IDispatch interface pointer for the specified child.
-  IFACEMETHODIMP get_accChild(VARIANT var_child,
-                              IDispatch** disp_child) override;
-
-  // Retrieves the number of accessible children.
-  IFACEMETHODIMP get_accChildCount(LONG* child_count) override;
-
-  // Retrieves a string that describes the object's default action.
-  IFACEMETHODIMP get_accDefaultAction(VARIANT var_id,
-                                      BSTR* default_action) override;
-
-  // Retrieves the tooltip description.
-  IFACEMETHODIMP get_accDescription(VARIANT var_id, BSTR* desc) override;
-
-  // Retrieves the object that has the keyboard focus.
-  IFACEMETHODIMP get_accFocus(VARIANT* focus_child) override;
-
-  // Retrieves the specified object's shortcut.
-  IFACEMETHODIMP get_accKeyboardShortcut(VARIANT var_id,
-                                         BSTR* access_key) override;
-
-  // Retrieves the name of the specified object.
-  IFACEMETHODIMP get_accName(VARIANT var_id, BSTR* name) override;
-
-  // Retrieves the IDispatch interface of the object's parent.
-  IFACEMETHODIMP get_accParent(IDispatch** disp_parent) override;
-
-  // Retrieves information describing the role of the specified object.
-  IFACEMETHODIMP get_accRole(VARIANT var_id, VARIANT* role) override;
-
-  // Retrieves the current state of the specified object.
-  IFACEMETHODIMP get_accState(VARIANT var_id, VARIANT* state) override;
-
-  // Gets the help string for the specified object.
-  IFACEMETHODIMP get_accHelp(VARIANT var_id, BSTR* help) override;
-
-  // Retrieve or set the string value associated with the specified object.
-  // Setting the value is not typically used by screen readers, but it's
-  // used frequently by automation software.
-  IFACEMETHODIMP get_accValue(VARIANT var_id, BSTR* value) override;
-  IFACEMETHODIMP put_accValue(VARIANT var_id, BSTR new_value) override;
-
-  // IAccessible methods not implemented.
-  IFACEMETHODIMP get_accSelection(VARIANT* selected) override;
-  IFACEMETHODIMP accSelect(LONG flags_sel, VARIANT var_id) override;
-  IFACEMETHODIMP get_accHelpTopic(BSTR* help_file,
-                                  VARIANT var_id,
-                                  LONG* topic_id) override;
-  IFACEMETHODIMP put_accName(VARIANT var_id, BSTR put_name) override;
-
-  //
-  // IServiceProvider method.
-  //
-
-  IFACEMETHODIMP QueryService(REFGUID guidService,
-                              REFIID riid,
-                              void** object) override;
-
-  AccessibilityRootNode();
-  virtual ~AccessibilityRootNode();
-
-  void SetWindow(IAccessible* window);
-
-  void SetAlert(AccessibilityAlert* alert);
-
-  AccessibilityAlert* GetOrCreateAlert();
-
-  static AccessibilityRootNode* Create();
-
- private:
-  // Helper method to redirect method calls to the contained window or alert.
-  IAccessible* GetTargetAndChildID(VARIANT* var_id);
-
-  IAccessible* window_accessible_;
-
-  AccessibilityAlert* alert_accessible_;
-};
-
-}  // namespace flutter
-
-#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_ACCESSIBILITY_ROOT_NODE_H_
diff --git a/shell/platform/windows/angle_surface_manager.h b/shell/platform/windows/angle_surface_manager.h
deleted file mode 100644
index 3e9f21262babf9ad258ab03cd336b7739d3ceaf2..0000000000000000000000000000000000000000
--- a/shell/platform/windows/angle_surface_manager.h
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_ANGLE_SURFACE_MANAGER_H_
-#define FLUTTER_SHELL_PLATFORM_WINDOWS_ANGLE_SURFACE_MANAGER_H_
-
-// OpenGL ES and EGL includes
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
-#include <EGL/eglplatform.h>
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
-
-// Windows platform specific includes
-#include <d3d11.h>
-#include <windows.h>
-#include <wrl/client.h>
-#include <memory>
-
-#include "window_binding_handler.h"
-
-namespace flutter {
-
-// A manager for inializing ANGLE correctly and using it to create and
-// destroy surfaces
-class AngleSurfaceManager {
- public:
-  static std::unique_ptr<AngleSurfaceManager> Create();
-  ~AngleSurfaceManager();
-
-  // Disallow copy/move.
-  AngleSurfaceManager(const AngleSurfaceManager&) = delete;
-  AngleSurfaceManager& operator=(const AngleSurfaceManager&) = delete;
-
-  // Creates an EGLSurface wrapper and backing DirectX 11 SwapChain
-  // associated with window, in the appropriate format for display.
-  // Target represents the visual entity to bind to.  Width and
-  // height represent dimensions surface is created at.
-  bool CreateSurface(WindowsRenderTarget* render_target,
-                     EGLint width,
-                     EGLint height);
-
-  // Resizes backing surface from current size to newly requested size
-  // based on width and height for the specific case when width and height do
-  // not match current surface dimensions.  Target represents the visual entity
-  // to bind to.
-  void ResizeSurface(WindowsRenderTarget* render_target,
-                     EGLint width,
-                     EGLint height);
-
-  // queries EGL for the dimensions of surface in physical
-  // pixels returning width and height as out params.
-  void GetSurfaceDimensions(EGLint* width, EGLint* height);
-
-  // Releases the pass-in EGLSurface wrapping and backing resources if not null.
-  void DestroySurface();
-
-  // Binds egl_context_ to the current rendering thread and to the draw and read
-  // surfaces returning a boolean result reflecting success.
-  bool MakeCurrent();
-
-  // Clears current egl_context_
-  bool ClearContext();
-
-  // Binds egl_resource_context_ to the current rendering thread and to the draw
-  // and read surfaces returning a boolean result reflecting success.
-  bool MakeResourceCurrent();
-
-  // Swaps the front and back buffers of the DX11 swapchain backing surface if
-  // not null.
-  EGLBoolean SwapBuffers();
-
-  // Creates a |EGLSurface| from the provided handle.
-  EGLSurface CreateSurfaceFromHandle(EGLenum handle_type,
-                                     EGLClientBuffer handle,
-                                     const EGLint* attributes) const;
-
-  // Gets the |EGLDisplay|.
-  EGLDisplay egl_display() const { return egl_display_; };
-
-  // Gets the |ID3D11Device| chosen by ANGLE.
-  bool GetDevice(ID3D11Device** device);
-
- private:
-  // Creates a new surface manager retaining reference to the passed-in target
-  // for the lifetime of the manager.
-  AngleSurfaceManager();
-
-  bool Initialize();
-  void CleanUp();
-
-  // Attempts to initialize EGL using ANGLE.
-  bool InitializeEGL(
-      PFNEGLGETPLATFORMDISPLAYEXTPROC egl_get_platform_display_EXT,
-      const EGLint* config,
-      bool should_log);
-
-  // EGL representation of native display.
-  EGLDisplay egl_display_;
-
-  // EGL representation of current rendering context.
-  EGLContext egl_context_;
-
-  // EGL representation of current rendering context used for async texture
-  // uploads.
-  EGLContext egl_resource_context_;
-
-  // current frame buffer configuration.
-  EGLConfig egl_config_;
-
-  // State representing success or failure of display initialization used when
-  // creating surfaces.
-  bool initialize_succeeded_;
-
-  // Current render_surface that engine will draw into.
-  EGLSurface render_surface_ = EGL_NO_SURFACE;
-
-  // Requested dimensions for current surface
-  EGLint surface_width_ = 0;
-  EGLint surface_height_ = 0;
-
-  // The current D3D device.
-  Microsoft::WRL::ComPtr<ID3D11Device> resolved_device_;
-
-  // Number of active instances of AngleSurfaceManager
-  static int instance_count_;
-};
-
-}  // namespace flutter
-
-#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_ANGLE_SURFACE_MANAGER_H_
diff --git a/shell/platform/windows/client_wrapper/BUILD.gn b/shell/platform/windows/client_wrapper/BUILD.gn
index 02724a5083f314a9b7e8f11e43cfe3008012adc3..1d40c3c1314fb50668997e845eb8be4f815cad42 100644
--- a/shell/platform/windows/client_wrapper/BUILD.gn
+++ b/shell/platform/windows/client_wrapper/BUILD.gn
@@ -95,7 +95,7 @@ executable("client_wrapper_windows_unittests") {
     # TODO(chunhtai): Consider refactoring flutter_root/testing so that there's a testing
     # target that doesn't require a Dart runtime to be linked in.
     # https://github.com/flutter/flutter/issues/41414.
-    "//third_party/dart/runtime:libdart_jit",
+    "$dart_src/runtime:libdart_jit",
   ]
 }
 
@@ -113,31 +113,33 @@ win_client_wrapper_file_archive_list = [
 ]
 
 zip_bundle("client_wrapper_archive") {
-  output = "$full_platform_name/flutter-cpp-client-wrapper.zip"
+  output = "$full_target_platform_name/flutter-cpp-client-wrapper.zip"
   deps = [
     ":client_wrapper_windows",
     ":publish_wrapper_windows",
     "//flutter/shell/platform/common/client_wrapper:client_wrapper",
   ]
   tmp_files = []
-  foreach(source, client_wrapper_file_archive_list) {
+  foreach(source_file, client_wrapper_file_archive_list) {
     tmp_files += [
       {
-        source = "//flutter/shell/platform/common/client_wrapper/$source"
-        destination = "cpp_client_wrapper/$source"
+        source = "//flutter/shell/platform/common/client_wrapper/$source_file"
+        destination = "cpp_client_wrapper/$source_file"
       },
     ]
   }
 
   # Windows specific source code files
-  foreach(source, win_client_wrapper_file_archive_list) {
+  foreach(source_file, win_client_wrapper_file_archive_list) {
     tmp_files += [
       {
-        source = "//flutter/shell/platform/windows/client_wrapper/$source"
-        destination = "cpp_client_wrapper/$source"
+        source = "//flutter/shell/platform/windows/client_wrapper/$source_file"
+        destination = "cpp_client_wrapper/$source_file"
       },
     ]
   }
+
+  # Headers
   headers = core_cpp_client_wrapper_includes +
             core_cpp_client_wrapper_internal_headers
   foreach(header, headers) {
@@ -150,5 +152,18 @@ zip_bundle("client_wrapper_archive") {
       },
     ]
   }
+
+  # Wrapper includes
+  foreach(header, _wrapper_includes) {
+    rebased_path =
+        rebase_path("//flutter/shell/platform/windows/client_wrapper/$header",
+                    "//flutter/shell/platform/windows/client_wrapper")
+    tmp_files += [
+      {
+        source = header
+        destination = "cpp_client_wrapper/$rebased_path"
+      },
+    ]
+  }
   files = tmp_files
 }
diff --git a/shell/platform/windows/client_wrapper/flutter_engine.cc b/shell/platform/windows/client_wrapper/flutter_engine.cc
index 00ccbbcff7cabd93689ed1248388688022c7dfdd..53d32f443f88f5831e94d9648486900dc5ff6e48 100644
--- a/shell/platform/windows/client_wrapper/flutter_engine.cc
+++ b/shell/platform/windows/client_wrapper/flutter_engine.cc
@@ -100,6 +100,19 @@ void FlutterEngine::SetNextFrameCallback(std::function<void()> callback) {
       this);
 }
 
+std::optional<LRESULT> FlutterEngine::ProcessExternalWindowMessage(
+    HWND hwnd,
+    UINT message,
+    WPARAM wparam,
+    LPARAM lparam) {
+  LRESULT result;
+  if (FlutterDesktopEngineProcessExternalWindowMessage(
+          engine_, hwnd, message, wparam, lparam, &result)) {
+    return result;
+  }
+  return std::nullopt;
+}
+
 FlutterDesktopEngineRef FlutterEngine::RelinquishEngine() {
   owns_engine_ = false;
   return engine_;
diff --git a/shell/platform/windows/client_wrapper/flutter_engine_unittests.cc b/shell/platform/windows/client_wrapper/flutter_engine_unittests.cc
index a1274998eadce3e67c80160d18ede24223fa596d..78ad17b1efdf18357cee9ed98a476358392af036 100644
--- a/shell/platform/windows/client_wrapper/flutter_engine_unittests.cc
+++ b/shell/platform/windows/client_wrapper/flutter_engine_unittests.cc
@@ -56,6 +56,17 @@ class TestFlutterWindowsApi : public testing::StubFlutterWindowsApi {
   // |flutter::testing::StubFlutterWindowsApi|
   void EngineReloadSystemFonts() override { reload_fonts_called_ = true; }
 
+  // |flutter::testing::StubFlutterWindowsApi|
+  bool EngineProcessExternalWindowMessage(FlutterDesktopEngineRef engine,
+                                          HWND hwnd,
+                                          UINT message,
+                                          WPARAM wparam,
+                                          LPARAM lparam,
+                                          LRESULT* result) override {
+    last_external_message_ = message;
+    return false;
+  }
+
   bool create_called() { return create_called_; }
 
   bool run_called() { return run_called_; }
@@ -74,6 +85,8 @@ class TestFlutterWindowsApi : public testing::StubFlutterWindowsApi {
     next_frame_callback_ = nullptr;
   }
 
+  UINT last_external_message() { return last_external_message_; }
+
  private:
   bool create_called_ = false;
   bool run_called_ = false;
@@ -82,6 +95,7 @@ class TestFlutterWindowsApi : public testing::StubFlutterWindowsApi {
   std::vector<std::string> dart_entrypoint_arguments_;
   VoidCallback next_frame_callback_ = nullptr;
   void* next_frame_user_data_ = nullptr;
+  UINT last_external_message_ = 0;
 };
 
 }  // namespace
@@ -201,4 +215,16 @@ TEST(FlutterEngineTest, SetNextFrameCallback) {
   EXPECT_TRUE(success);
 }
 
+TEST(FlutterEngineTest, ProcessExternalWindowMessage) {
+  testing::ScopedStubFlutterWindowsApi scoped_api_stub(
+      std::make_unique<TestFlutterWindowsApi>());
+  auto test_api = static_cast<TestFlutterWindowsApi*>(scoped_api_stub.stub());
+
+  FlutterEngine engine(DartProject(L"fake/project/path"));
+
+  engine.ProcessExternalWindowMessage(reinterpret_cast<HWND>(1), 1234, 0, 0);
+
+  EXPECT_EQ(test_api->last_external_message(), 1234);
+}
+
 }  // namespace flutter
diff --git a/shell/platform/windows/client_wrapper/flutter_view_controller.cc b/shell/platform/windows/client_wrapper/flutter_view_controller.cc
index 5cb9fe98623e139f6d0c848b5975244b6df94c69..3f59964f2dc1be9c850fd207ae8d5644415e83bf 100644
--- a/shell/platform/windows/client_wrapper/flutter_view_controller.cc
+++ b/shell/platform/windows/client_wrapper/flutter_view_controller.cc
@@ -29,6 +29,16 @@ FlutterViewController::~FlutterViewController() {
   }
 }
 
+FlutterViewId FlutterViewController::view_id() const {
+  auto view_id = FlutterDesktopViewControllerGetViewId(controller_);
+
+  return static_cast<FlutterViewId>(view_id);
+}
+
+void FlutterViewController::ForceRedraw() {
+  FlutterDesktopViewControllerForceRedraw(controller_);
+}
+
 std::optional<LRESULT> FlutterViewController::HandleTopLevelWindowProc(
     HWND hwnd,
     UINT message,
diff --git a/shell/platform/windows/client_wrapper/flutter_view_controller_unittests.cc b/shell/platform/windows/client_wrapper/flutter_view_controller_unittests.cc
index 264a998c29138865b3439f2663cc4024edebe7e8..837c2e13e583d755bfb6020ff9b1db91e227af26 100644
--- a/shell/platform/windows/client_wrapper/flutter_view_controller_unittests.cc
+++ b/shell/platform/windows/client_wrapper/flutter_view_controller_unittests.cc
@@ -27,6 +27,11 @@ class TestWindowsApi : public testing::StubFlutterWindowsApi {
   // |flutter::testing::StubFlutterWindowsApi|
   void ViewControllerDestroy() override { view_controller_destroyed_ = true; }
 
+  // |flutter::testing::StubFlutterWindowsApi|
+  void ViewControllerForceRedraw() override {
+    view_controller_force_redrawed_ = true;
+  }
+
   // |flutter::testing::StubFlutterWindowsApi|
   FlutterDesktopEngineRef EngineCreate(
       const FlutterDesktopEngineProperties& engine_properties) override {
@@ -41,10 +46,14 @@ class TestWindowsApi : public testing::StubFlutterWindowsApi {
 
   bool engine_destroyed() { return engine_destroyed_; }
   bool view_controller_destroyed() { return view_controller_destroyed_; }
+  bool view_controller_force_redrawed() {
+    return view_controller_force_redrawed_;
+  }
 
  private:
   bool engine_destroyed_ = false;
   bool view_controller_destroyed_ = false;
+  bool view_controller_force_redrawed_ = false;
 };
 
 }  // namespace
@@ -61,6 +70,15 @@ TEST(FlutterViewControllerTest, CreateDestroy) {
   EXPECT_FALSE(test_api->engine_destroyed());
 }
 
+TEST(FlutterViewControllerTest, GetViewId) {
+  DartProject project(L"data");
+  testing::ScopedStubFlutterWindowsApi scoped_api_stub(
+      std::make_unique<TestWindowsApi>());
+  auto test_api = static_cast<TestWindowsApi*>(scoped_api_stub.stub());
+  FlutterViewController controller(100, 100, project);
+  EXPECT_EQ(controller.view_id(), 1);
+}
+
 TEST(FlutterViewControllerTest, GetEngine) {
   DartProject project(L"data");
   testing::ScopedStubFlutterWindowsApi scoped_api_stub(
@@ -79,4 +97,15 @@ TEST(FlutterViewControllerTest, GetView) {
   EXPECT_NE(controller.view(), nullptr);
 }
 
+TEST(FlutterViewControllerTest, ForceRedraw) {
+  DartProject project(L"data");
+  testing::ScopedStubFlutterWindowsApi scoped_api_stub(
+      std::make_unique<TestWindowsApi>());
+  auto test_api = static_cast<TestWindowsApi*>(scoped_api_stub.stub());
+  FlutterViewController controller(100, 100, project);
+
+  controller.ForceRedraw();
+  EXPECT_TRUE(test_api->view_controller_force_redrawed());
+}
+
 }  // namespace flutter
diff --git a/shell/platform/windows/client_wrapper/include/flutter/flutter_engine.h b/shell/platform/windows/client_wrapper/include/flutter/flutter_engine.h
index 63a820ce2d6bdd6af698e7c5e0ebc55245b42cc1..61bda1597ca8253e5264920cf6a83fc3309db5f9 100644
--- a/shell/platform/windows/client_wrapper/include/flutter/flutter_engine.h
+++ b/shell/platform/windows/client_wrapper/include/flutter/flutter_engine.h
@@ -9,6 +9,7 @@
 
 #include <chrono>
 #include <memory>
+#include <optional>
 #include <string>
 
 #include "binary_messenger.h"
@@ -84,6 +85,15 @@ class FlutterEngine : public PluginRegistry {
   // once on the platform thread.
   void SetNextFrameCallback(std::function<void()> callback);
 
+  // Called to pass an external window message to the engine for lifecycle
+  // state updates. Non-Flutter windows must call this method in their WndProc
+  // in order to be included in the logic for application lifecycle state
+  // updates. Returns a result if the message should be consumed.
+  std::optional<LRESULT> ProcessExternalWindowMessage(HWND hwnd,
+                                                      UINT message,
+                                                      WPARAM wparam,
+                                                      LPARAM lparam);
+
  private:
   // For access to RelinquishEngine.
   friend class FlutterViewController;
diff --git a/shell/platform/windows/client_wrapper/include/flutter/flutter_view.h b/shell/platform/windows/client_wrapper/include/flutter/flutter_view.h
index c5cc649be024e3e391e97bf463b2ddcbae47899e..48e7607c966fc3b2db5ea49c4cbd559e343e4e62 100644
--- a/shell/platform/windows/client_wrapper/include/flutter/flutter_view.h
+++ b/shell/platform/windows/client_wrapper/include/flutter/flutter_view.h
@@ -9,11 +9,15 @@
 
 namespace flutter {
 
+// The unique identifier for a view.
+typedef int64_t FlutterViewId;
+
 // A view displaying Flutter content.
 class FlutterView {
  public:
   explicit FlutterView(FlutterDesktopViewRef view) : view_(view) {}
 
+  // Destroys this reference to the view. The underlying view is not destroyed.
   virtual ~FlutterView() = default;
 
   // Prevent copying.
diff --git a/shell/platform/windows/client_wrapper/include/flutter/flutter_view_controller.h b/shell/platform/windows/client_wrapper/include/flutter/flutter_view_controller.h
index 9b08d03f6504d335741b906a95aa7b646c25ae5f..4c658f479967a151ffe85dfec62ab8cebd1146c8 100644
--- a/shell/platform/windows/client_wrapper/include/flutter/flutter_view_controller.h
+++ b/shell/platform/windows/client_wrapper/include/flutter/flutter_view_controller.h
@@ -38,11 +38,17 @@ class FlutterViewController {
   FlutterViewController(FlutterViewController const&) = delete;
   FlutterViewController& operator=(FlutterViewController const&) = delete;
 
+  // Returns the view controller's view ID.
+  FlutterViewId view_id() const;
+
   // Returns the engine running Flutter content in this view.
-  FlutterEngine* engine() { return engine_.get(); }
+  FlutterEngine* engine() const { return engine_.get(); }
 
   // Returns the view managed by this controller.
-  FlutterView* view() { return view_.get(); }
+  FlutterView* view() const { return view_.get(); }
+
+  // Requests new frame from the engine and repaints the view.
+  void ForceRedraw();
 
   // Allows the Flutter engine and any interested plugins an opportunity to
   // handle the given message.
diff --git a/shell/platform/windows/client_wrapper/include/flutter/plugin_registrar_windows.h b/shell/platform/windows/client_wrapper/include/flutter/plugin_registrar_windows.h
index 851971eae9fbc97765ff8297967075b25415f3c0..7655b31ff04a8e95e77f562065b8d9b1a8ed28d6 100644
--- a/shell/platform/windows/client_wrapper/include/flutter/plugin_registrar_windows.h
+++ b/shell/platform/windows/client_wrapper/include/flutter/plugin_registrar_windows.h
@@ -32,22 +32,45 @@ class PluginRegistrarWindows : public PluginRegistrar {
   explicit PluginRegistrarWindows(
       FlutterDesktopPluginRegistrarRef core_registrar)
       : PluginRegistrar(core_registrar) {
-    view_ = std::make_unique<FlutterView>(
-        FlutterDesktopPluginRegistrarGetView(core_registrar));
+    FlutterDesktopViewRef implicit_view =
+        FlutterDesktopPluginRegistrarGetView(core_registrar);
+    if (implicit_view) {
+      implicit_view_ = std::make_unique<FlutterView>(implicit_view);
+    }
   }
 
   virtual ~PluginRegistrarWindows() {
     // Must be the first call.
     ClearPlugins();
     // Explicitly cleared to facilitate destruction order testing.
-    view_.reset();
+    implicit_view_.reset();
   }
 
   // Prevent copying.
   PluginRegistrarWindows(PluginRegistrarWindows const&) = delete;
   PluginRegistrarWindows& operator=(PluginRegistrarWindows const&) = delete;
 
-  FlutterView* GetView() { return view_.get(); }
+  // Returns the implicit view, or nullptr if there is no implicit view.
+  //
+  // See:
+  // https://api.flutter.dev/flutter/dart-ui/PlatformDispatcher/implicitView.html
+  //
+  // DEPRECATED: Use |GetViewById| instead.
+  FlutterView* GetView() { return implicit_view_.get(); }
+
+  // Returns the view with the given ID, or nullptr if the view does not exist.
+  //
+  // Destroying the shared pointer destroys the reference to the view; it does
+  // not destroy the underlying view.
+  std::shared_ptr<FlutterView> GetViewById(FlutterViewId view_id) const {
+    FlutterDesktopViewRef view =
+        FlutterDesktopPluginRegistrarGetViewById(registrar(), view_id);
+    if (!view) {
+      return nullptr;
+    }
+
+    return std::make_shared<FlutterView>(view);
+  }
 
   // Registers |delegate| to receive WindowProc callbacks for the top-level
   // window containing this Flutter instance. Returns an ID that can be used to
@@ -115,7 +138,7 @@ class PluginRegistrarWindows : public PluginRegistrar {
   }
 
   // The associated FlutterView, if any.
-  std::unique_ptr<FlutterView> view_;
+  std::unique_ptr<FlutterView> implicit_view_;
 
   // The next ID to return from RegisterWindowProcDelegate.
   int next_window_proc_delegate_id_ = 1;
diff --git a/shell/platform/windows/client_wrapper/plugin_registrar_windows_unittests.cc b/shell/platform/windows/client_wrapper/plugin_registrar_windows_unittests.cc
index 0c9bdb961890757591de37057cc36ae92c1f42f6..f1d08c5fb960edcd7769ac71ec4204af5daea618 100644
--- a/shell/platform/windows/client_wrapper/plugin_registrar_windows_unittests.cc
+++ b/shell/platform/windows/client_wrapper/plugin_registrar_windows_unittests.cc
@@ -7,12 +7,15 @@
 
 #include "flutter/shell/platform/windows/client_wrapper/include/flutter/plugin_registrar_windows.h"
 #include "flutter/shell/platform/windows/client_wrapper/testing/stub_flutter_windows_api.h"
+#include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
 namespace flutter {
 
 namespace {
 
+using ::testing::Return;
+
 // Stub implementation to validate calls to the API.
 class TestWindowsApi : public testing::StubFlutterWindowsApi {
  public:
@@ -24,6 +27,12 @@ class TestWindowsApi : public testing::StubFlutterWindowsApi {
     last_registered_user_data_ = user_data;
   }
 
+  MOCK_METHOD(FlutterDesktopViewRef, PluginRegistrarGetView, (), (override));
+  MOCK_METHOD(FlutterDesktopViewRef,
+              PluginRegistrarGetViewById,
+              (FlutterDesktopViewId),
+              (override));
+
   void PluginRegistrarUnregisterTopLevelWindowProcDelegate(
       FlutterDesktopWindowProcCallback delegate) override {
     --registered_delegate_count_;
@@ -65,16 +74,47 @@ class TestPlugin : public Plugin {
 }  // namespace
 
 TEST(PluginRegistrarWindowsTest, GetView) {
-  testing::ScopedStubFlutterWindowsApi scoped_api_stub(
-      std::make_unique<TestWindowsApi>());
+  auto windows_api = std::make_unique<TestWindowsApi>();
+  EXPECT_CALL(*windows_api, PluginRegistrarGetView)
+      .WillOnce(Return(reinterpret_cast<FlutterDesktopViewRef>(1)));
+
+  testing::ScopedStubFlutterWindowsApi scoped_api_stub(std::move(windows_api));
   auto test_api = static_cast<TestWindowsApi*>(scoped_api_stub.stub());
   PluginRegistrarWindows registrar(
       reinterpret_cast<FlutterDesktopPluginRegistrarRef>(1));
+
   EXPECT_NE(registrar.GetView(), nullptr);
 }
 
+TEST(PluginRegistrarWindowsTest, GetViewById) {
+  auto windows_api = std::make_unique<TestWindowsApi>();
+  EXPECT_CALL(*windows_api, PluginRegistrarGetView)
+      .WillRepeatedly(Return(nullptr));
+  EXPECT_CALL(*windows_api, PluginRegistrarGetViewById(123))
+      .WillOnce(Return(reinterpret_cast<FlutterDesktopViewRef>(1)));
+  EXPECT_CALL(*windows_api, PluginRegistrarGetViewById(456))
+      .WillOnce(Return(nullptr));
+
+  testing::ScopedStubFlutterWindowsApi scoped_api_stub(std::move(windows_api));
+  auto test_api = static_cast<TestWindowsApi*>(scoped_api_stub.stub());
+  PluginRegistrarWindows registrar(
+      reinterpret_cast<FlutterDesktopPluginRegistrarRef>(1));
+
+  EXPECT_EQ(registrar.GetView(), nullptr);
+  EXPECT_NE(registrar.GetViewById(123).get(), nullptr);
+  EXPECT_EQ(registrar.GetViewById(456).get(), nullptr);
+}
+
 // Tests that the registrar runs plugin destructors before its own teardown.
 TEST(PluginRegistrarWindowsTest, PluginDestroyedBeforeRegistrar) {
+  auto windows_api = std::make_unique<TestWindowsApi>();
+  EXPECT_CALL(*windows_api, PluginRegistrarGetView)
+      .WillRepeatedly(Return(reinterpret_cast<FlutterDesktopViewRef>(1)));
+  testing::ScopedStubFlutterWindowsApi scoped_api_stub(std::move(windows_api));
+  auto test_api = static_cast<TestWindowsApi*>(scoped_api_stub.stub());
+  PluginRegistrarWindows registrar(
+      reinterpret_cast<FlutterDesktopPluginRegistrarRef>(1));
+
   auto dummy_registrar_handle =
       reinterpret_cast<FlutterDesktopPluginRegistrarRef>(1);
   bool registrar_valid_at_destruction = false;
@@ -89,8 +129,9 @@ TEST(PluginRegistrarWindowsTest, PluginDestroyedBeforeRegistrar) {
 }
 
 TEST(PluginRegistrarWindowsTest, RegisterUnregister) {
-  testing::ScopedStubFlutterWindowsApi scoped_api_stub(
-      std::make_unique<TestWindowsApi>());
+  auto windows_api = std::make_unique<TestWindowsApi>();
+  EXPECT_CALL(*windows_api, PluginRegistrarGetView).WillOnce(Return(nullptr));
+  testing::ScopedStubFlutterWindowsApi scoped_api_stub(std::move(windows_api));
   auto test_api = static_cast<TestWindowsApi*>(scoped_api_stub.stub());
   PluginRegistrarWindows registrar(
       reinterpret_cast<FlutterDesktopPluginRegistrarRef>(1));
@@ -118,8 +159,9 @@ TEST(PluginRegistrarWindowsTest, RegisterUnregister) {
 }
 
 TEST(PluginRegistrarWindowsTest, CallsRegisteredDelegates) {
-  testing::ScopedStubFlutterWindowsApi scoped_api_stub(
-      std::make_unique<TestWindowsApi>());
+  auto windows_api = std::make_unique<TestWindowsApi>();
+  EXPECT_CALL(*windows_api, PluginRegistrarGetView).WillOnce(Return(nullptr));
+  testing::ScopedStubFlutterWindowsApi scoped_api_stub(std::move(windows_api));
   auto test_api = static_cast<TestWindowsApi*>(scoped_api_stub.stub());
   PluginRegistrarWindows registrar(
       reinterpret_cast<FlutterDesktopPluginRegistrarRef>(1));
@@ -154,8 +196,9 @@ TEST(PluginRegistrarWindowsTest, CallsRegisteredDelegates) {
 }
 
 TEST(PluginRegistrarWindowsTest, StopsOnceHandled) {
-  testing::ScopedStubFlutterWindowsApi scoped_api_stub(
-      std::make_unique<TestWindowsApi>());
+  auto windows_api = std::make_unique<TestWindowsApi>();
+  EXPECT_CALL(*windows_api, PluginRegistrarGetView).WillOnce(Return(nullptr));
+  testing::ScopedStubFlutterWindowsApi scoped_api_stub(std::move(windows_api));
   auto test_api = static_cast<TestWindowsApi*>(scoped_api_stub.stub());
   PluginRegistrarWindows registrar(
       reinterpret_cast<FlutterDesktopPluginRegistrarRef>(1));
diff --git a/shell/platform/windows/client_wrapper/testing/stub_flutter_windows_api.cc b/shell/platform/windows/client_wrapper/testing/stub_flutter_windows_api.cc
index 8028bbb78e398d06e0503a9355cf64938b016bd3..f51d7f14ad879113259f23a42cfb8dd1f06e95ed 100644
--- a/shell/platform/windows/client_wrapper/testing/stub_flutter_windows_api.cc
+++ b/shell/platform/windows/client_wrapper/testing/stub_flutter_windows_api.cc
@@ -52,6 +52,12 @@ void FlutterDesktopViewControllerDestroy(
   }
 }
 
+FlutterDesktopViewId FlutterDesktopViewControllerGetViewId(
+    FlutterDesktopViewControllerRef controller) {
+  // The stub ignores this, so just return an arbitrary non-zero value.
+  return static_cast<FlutterDesktopViewId>(1);
+}
+
 FlutterDesktopEngineRef FlutterDesktopViewControllerGetEngine(
     FlutterDesktopViewControllerRef controller) {
   // The stub ignores this, so just return an arbitrary non-zero value.
@@ -65,7 +71,11 @@ FlutterDesktopViewRef FlutterDesktopViewControllerGetView(
 }
 
 void FlutterDesktopViewControllerForceRedraw(
-    FlutterDesktopViewControllerRef controller) {}
+    FlutterDesktopViewControllerRef controller) {
+  if (s_stub_implementation) {
+    s_stub_implementation->ViewControllerForceRedraw();
+  }
+}
 
 bool FlutterDesktopViewControllerHandleTopLevelWindowProc(
     FlutterDesktopViewControllerRef controller,
@@ -158,10 +168,45 @@ IDXGIAdapter* FlutterDesktopViewGetGraphicsAdapter(FlutterDesktopViewRef view) {
   return nullptr;
 }
 
+bool FlutterDesktopEngineProcessExternalWindowMessage(
+    FlutterDesktopEngineRef engine,
+    HWND hwnd,
+    UINT message,
+    WPARAM wparam,
+    LPARAM lparam,
+    LRESULT* result) {
+  if (s_stub_implementation) {
+    return s_stub_implementation->EngineProcessExternalWindowMessage(
+        engine, hwnd, message, wparam, lparam, result);
+  }
+  return false;
+}
+
+void FlutterDesktopEngineRegisterPlatformViewType(
+    FlutterDesktopEngineRef engine,
+    const char* view_type_name,
+    FlutterPlatformViewTypeEntry view_type) {
+  if (s_stub_implementation) {
+    s_stub_implementation->EngineRegisterPlatformViewType(view_type_name,
+                                                          view_type);
+  }
+}
+
 FlutterDesktopViewRef FlutterDesktopPluginRegistrarGetView(
     FlutterDesktopPluginRegistrarRef controller) {
-  // The stub ignores this, so just return an arbitrary non-zero value.
-  return reinterpret_cast<FlutterDesktopViewRef>(1);
+  if (s_stub_implementation) {
+    return s_stub_implementation->PluginRegistrarGetView();
+  }
+  return nullptr;
+}
+
+FlutterDesktopViewRef FlutterDesktopPluginRegistrarGetViewById(
+    FlutterDesktopPluginRegistrarRef controller,
+    FlutterDesktopViewId view_id) {
+  if (s_stub_implementation) {
+    return s_stub_implementation->PluginRegistrarGetViewById(view_id);
+  }
+  return nullptr;
 }
 
 void FlutterDesktopPluginRegistrarRegisterTopLevelWindowProcDelegate(
diff --git a/shell/platform/windows/client_wrapper/testing/stub_flutter_windows_api.h b/shell/platform/windows/client_wrapper/testing/stub_flutter_windows_api.h
index 247255c5668e96f29c9e2eced61cbbccc4ed8819..8f3eb0905ac7ac0da46f3f19142652d46fb6628e 100644
--- a/shell/platform/windows/client_wrapper/testing/stub_flutter_windows_api.h
+++ b/shell/platform/windows/client_wrapper/testing/stub_flutter_windows_api.h
@@ -2,11 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_WRAPPER_TESTING_STUB_FLUTTER_WINDOWS_API_H_
-#define FLUTTER_SHELL_PLATFORM_WINDOWS_WRAPPER_TESTING_STUB_FLUTTER_WINDOWS_API_H_
+#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_CLIENT_WRAPPER_TESTING_STUB_FLUTTER_WINDOWS_API_H_
+#define FLUTTER_SHELL_PLATFORM_WINDOWS_CLIENT_WRAPPER_TESTING_STUB_FLUTTER_WINDOWS_API_H_
 
 #include <memory>
 
+#include "flutter/shell/platform/windows/flutter_windows_internal.h"
 #include "flutter/shell/platform/windows/public/flutter_windows.h"
 
 namespace flutter {
@@ -38,6 +39,9 @@ class StubFlutterWindowsApi {
   // Called for FlutterDesktopViewControllerDestroy.
   virtual void ViewControllerDestroy() {}
 
+  // Called for FlutterDesktopViewControllerForceRedraw.
+  virtual void ViewControllerForceRedraw() {}
+
   // Called for FlutterDesktopViewControllerHandleTopLevelWindowProc.
   virtual bool ViewControllerHandleTopLevelWindowProc(HWND hwnd,
                                                       UINT message,
@@ -69,6 +73,11 @@ class StubFlutterWindowsApi {
   // Called for FlutterDesktopEngineReloadSystemFonts.
   virtual void EngineReloadSystemFonts() {}
 
+  // Called for FlutterDesktopEngineRegisterPlatformViewType.
+  virtual void EngineRegisterPlatformViewType(
+      const char* view_type_name,
+      FlutterPlatformViewTypeEntry view_type) {}
+
   // Called for FlutterDesktopViewGetHWND.
   virtual HWND ViewGetHWND() { return reinterpret_cast<HWND>(1); }
 
@@ -77,6 +86,15 @@ class StubFlutterWindowsApi {
     return reinterpret_cast<IDXGIAdapter*>(2);
   }
 
+  // Called for FlutterDesktopPluginRegistrarGetView.
+  virtual FlutterDesktopViewRef PluginRegistrarGetView() { return nullptr; }
+
+  // Called for FlutterDesktopPluginRegistrarGetViewById.
+  virtual FlutterDesktopViewRef PluginRegistrarGetViewById(
+      FlutterDesktopViewId view_id) {
+    return nullptr;
+  }
+
   // Called for FlutterDesktopPluginRegistrarRegisterTopLevelWindowProcDelegate.
   virtual void PluginRegistrarRegisterTopLevelWindowProcDelegate(
       FlutterDesktopWindowProcCallback delegate,
@@ -86,6 +104,17 @@ class StubFlutterWindowsApi {
   // FlutterDesktopPluginRegistrarUnregisterTopLevelWindowProcDelegate.
   virtual void PluginRegistrarUnregisterTopLevelWindowProcDelegate(
       FlutterDesktopWindowProcCallback delegate) {}
+
+  // Called for FlutterDesktopEngineProcessExternalWindowMessage.
+  virtual bool EngineProcessExternalWindowMessage(
+      FlutterDesktopEngineRef engine,
+      HWND hwnd,
+      UINT message,
+      WPARAM wparam,
+      LPARAM lparam,
+      LRESULT* result) {
+    return false;
+  }
 };
 
 // A test helper that owns a stub implementation, making it the test stub for
diff --git a/shell/platform/windows/compositor.h b/shell/platform/windows/compositor.h
new file mode 100644
index 0000000000000000000000000000000000000000..8ba7737844e3dc976a616b383730bf394ec0e641
--- /dev/null
+++ b/shell/platform/windows/compositor.h
@@ -0,0 +1,41 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_COMPOSITOR_H_
+#define FLUTTER_SHELL_PLATFORM_WINDOWS_COMPOSITOR_H_
+
+#include "flutter/shell/platform/embedder/embedder.h"
+
+namespace flutter {
+
+// Enables the Flutter engine to render content on Windows.
+//
+// The engine uses this to:
+//
+// 1. Create backing stores used for rendering Flutter content
+// 2. Composite and present Flutter content and platform views onto a view
+//
+// Platform views are not yet supported.
+class Compositor {
+ public:
+  virtual ~Compositor() = default;
+
+  // Creates a backing store used for rendering Flutter content.
+  //
+  // The backing store's configuration is stored in |backing_store_out|.
+  virtual bool CreateBackingStore(const FlutterBackingStoreConfig& config,
+                                  FlutterBackingStore* backing_store_out) = 0;
+
+  // Destroys a backing store and releases its resources.
+  virtual bool CollectBackingStore(const FlutterBackingStore* store) = 0;
+
+  // Present Flutter content and platform views onto the view.
+  virtual bool Present(FlutterViewId view_id,
+                       const FlutterLayer** layers,
+                       size_t layers_count) = 0;
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_COMPOSITOR_H_
diff --git a/shell/platform/windows/compositor_opengl.cc b/shell/platform/windows/compositor_opengl.cc
new file mode 100644
index 0000000000000000000000000000000000000000..3cf5e9e802c8508d2e56540776d8bdd45c73f466
--- /dev/null
+++ b/shell/platform/windows/compositor_opengl.cc
@@ -0,0 +1,224 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/platform/windows/compositor_opengl.h"
+
+#include "GLES3/gl3.h"
+#include "flutter/shell/platform/windows/flutter_windows_engine.h"
+#include "flutter/shell/platform/windows/flutter_windows_view.h"
+
+namespace flutter {
+
+namespace {
+
+constexpr uint32_t kWindowFrameBufferId = 0;
+
+// The metadata for an OpenGL framebuffer backing store.
+struct FramebufferBackingStore {
+  uint32_t framebuffer_id;
+  uint32_t texture_id;
+};
+
+// Based off Skia's logic:
+// https://github.com/google/skia/blob/4738ed711e03212aceec3cd502a4adb545f38e63/src/gpu/ganesh/gl/GrGLCaps.cpp#L1963-L2116
+int GetSupportedTextureFormat(const impeller::DescriptionGLES* description) {
+  if (description->HasExtension("GL_EXT_texture_format_BGRA8888")) {
+    return GL_BGRA8_EXT;
+  } else if (description->HasExtension("GL_APPLE_texture_format_BGRA8888") &&
+             description->GetGlVersion().IsAtLeast(impeller::Version(3, 0))) {
+    return GL_BGRA8_EXT;
+  } else {
+    return GL_RGBA8;
+  }
+}
+
+}  // namespace
+
+CompositorOpenGL::CompositorOpenGL(FlutterWindowsEngine* engine,
+                                   impeller::ProcTableGLES::Resolver resolver)
+    : engine_(engine), resolver_(resolver) {}
+
+bool CompositorOpenGL::CreateBackingStore(
+    const FlutterBackingStoreConfig& config,
+    FlutterBackingStore* result) {
+  if (!is_initialized_ && !Initialize()) {
+    return false;
+  }
+
+  auto store = std::make_unique<FramebufferBackingStore>();
+
+  gl_->GenTextures(1, &store->texture_id);
+  gl_->GenFramebuffers(1, &store->framebuffer_id);
+
+  gl_->BindFramebuffer(GL_FRAMEBUFFER, store->framebuffer_id);
+
+  gl_->BindTexture(GL_TEXTURE_2D, store->texture_id);
+  gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+  gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+  gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+  gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+  gl_->TexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, config.size.width,
+                  config.size.height, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
+  gl_->BindTexture(GL_TEXTURE_2D, 0);
+
+  gl_->FramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0_EXT,
+                            GL_TEXTURE_2D, store->texture_id, 0);
+
+  result->type = kFlutterBackingStoreTypeOpenGL;
+  result->open_gl.type = kFlutterOpenGLTargetTypeFramebuffer;
+  result->open_gl.framebuffer.name = store->framebuffer_id;
+  result->open_gl.framebuffer.target = format_;
+  result->open_gl.framebuffer.user_data = store.release();
+  result->open_gl.framebuffer.destruction_callback = [](void* user_data) {
+    // Backing store destroyed in `CompositorOpenGL::CollectBackingStore`, set
+    // on FlutterCompositor.collect_backing_store_callback during engine start.
+  };
+  return true;
+}
+
+bool CompositorOpenGL::CollectBackingStore(const FlutterBackingStore* store) {
+  FML_DCHECK(is_initialized_);
+  FML_DCHECK(store->type == kFlutterBackingStoreTypeOpenGL);
+  FML_DCHECK(store->open_gl.type == kFlutterOpenGLTargetTypeFramebuffer);
+
+  auto user_data = static_cast<FramebufferBackingStore*>(
+      store->open_gl.framebuffer.user_data);
+
+  gl_->DeleteFramebuffers(1, &user_data->framebuffer_id);
+  gl_->DeleteTextures(1, &user_data->texture_id);
+
+  delete user_data;
+  return true;
+}
+
+bool CompositorOpenGL::Present(FlutterViewId view_id,
+                               const FlutterLayer** layers,
+                               size_t layers_count) {
+  FlutterWindowsView* view = engine_->view(view_id);
+  if (!view) {
+    return false;
+  }
+
+  // Clear the view if there are no layers to present.
+  if (layers_count == 0) {
+    // Normally the compositor is initialized when the first backing store is
+    // created. However, on an empty frame no backing stores are created and
+    // the present needs to initialize the compositor.
+    if (!is_initialized_ && !Initialize()) {
+      return false;
+    }
+
+    return Clear(view);
+  }
+
+  // TODO: Support compositing layers and platform views.
+  // See: https://github.com/flutter/flutter/issues/31713
+  FML_DCHECK(is_initialized_);
+  FML_DCHECK(layers_count == 1);
+  FML_DCHECK(layers[0]->offset.x == 0 && layers[0]->offset.y == 0);
+  FML_DCHECK(layers[0]->type == kFlutterLayerContentTypeBackingStore);
+  FML_DCHECK(layers[0]->backing_store->type == kFlutterBackingStoreTypeOpenGL);
+  FML_DCHECK(layers[0]->backing_store->open_gl.type ==
+             kFlutterOpenGLTargetTypeFramebuffer);
+
+  auto width = layers[0]->size.width;
+  auto height = layers[0]->size.height;
+
+  // Check if this frame can be presented. This resizes the surface if a resize
+  // is pending and |width| and |height| match the target size.
+  if (!view->OnFrameGenerated(width, height)) {
+    return false;
+  }
+
+  // |OnFrameGenerated| should return false if the surface isn't valid.
+  FML_DCHECK(view->surface() != nullptr);
+  FML_DCHECK(view->surface()->IsValid());
+
+  egl::WindowSurface* surface = view->surface();
+  if (!surface->MakeCurrent()) {
+    return false;
+  }
+
+  auto source_id = layers[0]->backing_store->open_gl.framebuffer.name;
+
+  // Disable the scissor test as it can affect blit operations.
+  // Prevents regressions like: https://github.com/flutter/flutter/issues/140828
+  // See OpenGL specification version 4.6, section 18.3.1.
+  gl_->Disable(GL_SCISSOR_TEST);
+
+  gl_->BindFramebuffer(GL_READ_FRAMEBUFFER, source_id);
+  gl_->BindFramebuffer(GL_DRAW_FRAMEBUFFER, kWindowFrameBufferId);
+
+  gl_->BlitFramebuffer(0,                    // srcX0
+                       0,                    // srcY0
+                       width,                // srcX1
+                       height,               // srcY1
+                       0,                    // dstX0
+                       0,                    // dstY0
+                       width,                // dstX1
+                       height,               // dstY1
+                       GL_COLOR_BUFFER_BIT,  // mask
+                       GL_NEAREST            // filter
+  );
+
+  if (!surface->SwapBuffers()) {
+    return false;
+  }
+
+  view->OnFramePresented();
+  return true;
+}
+
+bool CompositorOpenGL::Initialize() {
+  FML_DCHECK(!is_initialized_);
+
+  egl::Manager* manager = engine_->egl_manager();
+  if (!manager) {
+    return false;
+  }
+
+  if (!manager->render_context()->MakeCurrent()) {
+    return false;
+  }
+
+  gl_ = std::make_unique<impeller::ProcTableGLES>(resolver_);
+  if (!gl_->IsValid()) {
+    gl_.reset();
+    return false;
+  }
+
+  format_ = GetSupportedTextureFormat(gl_->GetDescription());
+  is_initialized_ = true;
+  return true;
+}
+
+bool CompositorOpenGL::Clear(FlutterWindowsView* view) {
+  FML_DCHECK(is_initialized_);
+
+  // Check if this frame can be presented. This resizes the surface if needed.
+  if (!view->OnEmptyFrameGenerated()) {
+    return false;
+  }
+
+  // |OnEmptyFrameGenerated| should return false if the surface isn't valid.
+  FML_DCHECK(view->surface() != nullptr);
+  FML_DCHECK(view->surface()->IsValid());
+
+  egl::WindowSurface* surface = view->surface();
+  if (!surface->MakeCurrent()) {
+    return false;
+  }
+
+  gl_->ClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+  gl_->Clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+
+  if (!surface->SwapBuffers()) {
+    return false;
+  }
+
+  view->OnFramePresented();
+  return true;
+}
+
+}  // namespace flutter
diff --git a/shell/platform/windows/compositor_opengl.h b/shell/platform/windows/compositor_opengl.h
new file mode 100644
index 0000000000000000000000000000000000000000..1ea5c5045dfec0c6926db79e2fb78263df44f92a
--- /dev/null
+++ b/shell/platform/windows/compositor_opengl.h
@@ -0,0 +1,63 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_COMPOSITOR_OPENGL_H_
+#define FLUTTER_SHELL_PLATFORM_WINDOWS_COMPOSITOR_OPENGL_H_
+
+#include <memory>
+
+#include "flutter/impeller/renderer/backend/gles/proc_table_gles.h"
+#include "flutter/shell/platform/embedder/embedder.h"
+#include "flutter/shell/platform/windows/compositor.h"
+#include "flutter/shell/platform/windows/flutter_windows_engine.h"
+
+namespace flutter {
+
+// Enables the Flutter engine to render content on Windows using OpenGL.
+class CompositorOpenGL : public Compositor {
+ public:
+  CompositorOpenGL(FlutterWindowsEngine* engine,
+                   impeller::ProcTableGLES::Resolver resolver);
+
+  /// |Compositor|
+  bool CreateBackingStore(const FlutterBackingStoreConfig& config,
+                          FlutterBackingStore* result) override;
+
+  /// |Compositor|
+  bool CollectBackingStore(const FlutterBackingStore* store) override;
+
+  /// |Compositor|
+  bool Present(FlutterViewId view_id,
+               const FlutterLayer** layers,
+               size_t layers_count) override;
+
+ private:
+  // The Flutter engine that manages the views to render.
+  FlutterWindowsEngine* engine_;
+
+ private:
+  // The compositor initializes itself lazily once |CreateBackingStore| is
+  // called. True if initialization completed successfully.
+  bool is_initialized_ = false;
+
+  // Function used to resolve GLES functions.
+  impeller::ProcTableGLES::Resolver resolver_ = nullptr;
+
+  // Table of resolved GLES functions. Null until the compositor is initialized.
+  std::unique_ptr<impeller::ProcTableGLES> gl_ = nullptr;
+
+  // The OpenGL texture target format for backing stores. Invalid value until
+  // the compositor is initialized.
+  uint32_t format_ = 0;
+
+  // Initialize the compositor. This must run on the raster thread.
+  bool Initialize();
+
+  // Clear the view's surface and removes any previously presented layers.
+  bool Clear(FlutterWindowsView* view);
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_COMPOSITOR_OPENGL_H_
diff --git a/shell/platform/windows/compositor_opengl_unittests.cc b/shell/platform/windows/compositor_opengl_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c8396984bfd85be2e36840ea8ff40f883040250a
--- /dev/null
+++ b/shell/platform/windows/compositor_opengl_unittests.cc
@@ -0,0 +1,259 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <memory>
+#include <vector>
+
+#include "flutter/impeller/renderer/backend/gles/gles.h"
+#include "flutter/shell/platform/windows/compositor_opengl.h"
+#include "flutter/shell/platform/windows/egl/manager.h"
+#include "flutter/shell/platform/windows/flutter_windows_view.h"
+#include "flutter/shell/platform/windows/testing/egl/mock_context.h"
+#include "flutter/shell/platform/windows/testing/egl/mock_manager.h"
+#include "flutter/shell/platform/windows/testing/egl/mock_window_surface.h"
+#include "flutter/shell/platform/windows/testing/engine_modifier.h"
+#include "flutter/shell/platform/windows/testing/flutter_windows_engine_builder.h"
+#include "flutter/shell/platform/windows/testing/mock_window_binding_handler.h"
+#include "flutter/shell/platform/windows/testing/view_modifier.h"
+#include "flutter/shell/platform/windows/testing/windows_test.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+namespace flutter {
+namespace testing {
+
+namespace {
+using ::testing::AnyNumber;
+using ::testing::Return;
+
+const unsigned char* MockGetString(GLenum name) {
+  switch (name) {
+    case GL_VERSION:
+    case GL_SHADING_LANGUAGE_VERSION:
+      return reinterpret_cast<const unsigned char*>("3.0");
+    default:
+      return reinterpret_cast<const unsigned char*>("");
+  }
+}
+
+void MockGetIntegerv(GLenum name, int* value) {
+  *value = 0;
+}
+
+GLenum MockGetError() {
+  return GL_NO_ERROR;
+}
+
+void DoNothing() {}
+
+const impeller::ProcTableGLES::Resolver kMockResolver = [](const char* name) {
+  std::string function_name{name};
+
+  if (function_name == "glGetString") {
+    return reinterpret_cast<void*>(&MockGetString);
+  } else if (function_name == "glGetIntegerv") {
+    return reinterpret_cast<void*>(&MockGetIntegerv);
+  } else if (function_name == "glGetError") {
+    return reinterpret_cast<void*>(&MockGetError);
+  } else {
+    return reinterpret_cast<void*>(&DoNothing);
+  }
+};
+
+class CompositorOpenGLTest : public WindowsTest {
+ public:
+  CompositorOpenGLTest() = default;
+  virtual ~CompositorOpenGLTest() = default;
+
+ protected:
+  FlutterWindowsEngine* engine() { return engine_.get(); }
+  FlutterWindowsView* view() { return view_.get(); }
+  egl::MockManager* egl_manager() { return egl_manager_; }
+  egl::MockContext* render_context() { return render_context_.get(); }
+  egl::MockWindowSurface* surface() { return surface_; }
+
+  void UseHeadlessEngine() {
+    auto egl_manager = std::make_unique<egl::MockManager>();
+    render_context_ = std::make_unique<egl::MockContext>();
+    egl_manager_ = egl_manager.get();
+
+    EXPECT_CALL(*egl_manager_, render_context)
+        .Times(AnyNumber())
+        .WillRepeatedly(Return(render_context_.get()));
+
+    FlutterWindowsEngineBuilder builder{GetContext()};
+
+    engine_ = builder.Build();
+    EngineModifier modifier{engine_.get()};
+    modifier.SetEGLManager(std::move(egl_manager));
+  }
+
+  void UseEngineWithView(bool add_surface = true) {
+    UseHeadlessEngine();
+
+    auto window = std::make_unique<MockWindowBindingHandler>();
+    EXPECT_CALL(*window.get(), SetView).Times(1);
+    EXPECT_CALL(*window.get(), GetWindowHandle).WillRepeatedly(Return(nullptr));
+
+    view_ = std::make_unique<FlutterWindowsView>(kImplicitViewId, engine_.get(),
+                                                 std::move(window));
+
+    if (add_surface) {
+      auto surface = std::make_unique<egl::MockWindowSurface>();
+      surface_ = surface.get();
+
+      EXPECT_CALL(*surface_, Destroy).Times(AnyNumber());
+
+      ViewModifier modifier{view_.get()};
+      modifier.SetSurface(std::move(surface));
+    }
+
+    EngineModifier modifier{engine_.get()};
+    modifier.SetImplicitView(view_.get());
+  }
+
+ private:
+  std::unique_ptr<FlutterWindowsEngine> engine_;
+  std::unique_ptr<FlutterWindowsView> view_;
+  std::unique_ptr<egl::MockContext> render_context_;
+  egl::MockWindowSurface* surface_;
+  egl::MockManager* egl_manager_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(CompositorOpenGLTest);
+};
+
+}  // namespace
+
+TEST_F(CompositorOpenGLTest, CreateBackingStore) {
+  UseHeadlessEngine();
+
+  auto compositor = CompositorOpenGL{engine(), kMockResolver};
+
+  FlutterBackingStoreConfig config = {};
+  FlutterBackingStore backing_store = {};
+
+  EXPECT_CALL(*render_context(), MakeCurrent).WillOnce(Return(true));
+  ASSERT_TRUE(compositor.CreateBackingStore(config, &backing_store));
+  ASSERT_TRUE(compositor.CollectBackingStore(&backing_store));
+}
+
+TEST_F(CompositorOpenGLTest, InitializationFailure) {
+  UseHeadlessEngine();
+
+  auto compositor = CompositorOpenGL{engine(), kMockResolver};
+
+  FlutterBackingStoreConfig config = {};
+  FlutterBackingStore backing_store = {};
+
+  EXPECT_CALL(*render_context(), MakeCurrent).WillOnce(Return(false));
+  EXPECT_FALSE(compositor.CreateBackingStore(config, &backing_store));
+}
+
+TEST_F(CompositorOpenGLTest, Present) {
+  UseEngineWithView();
+
+  auto compositor = CompositorOpenGL{engine(), kMockResolver};
+
+  FlutterBackingStoreConfig config = {};
+  FlutterBackingStore backing_store = {};
+
+  EXPECT_CALL(*render_context(), MakeCurrent).WillOnce(Return(true));
+  ASSERT_TRUE(compositor.CreateBackingStore(config, &backing_store));
+
+  FlutterLayer layer = {};
+  layer.type = kFlutterLayerContentTypeBackingStore;
+  layer.backing_store = &backing_store;
+  const FlutterLayer* layer_ptr = &layer;
+
+  EXPECT_CALL(*surface(), IsValid).WillRepeatedly(Return(true));
+  EXPECT_CALL(*surface(), MakeCurrent).WillOnce(Return(true));
+  EXPECT_CALL(*surface(), SwapBuffers).WillOnce(Return(true));
+  EXPECT_TRUE(compositor.Present(view()->view_id(), &layer_ptr, 1));
+
+  ASSERT_TRUE(compositor.CollectBackingStore(&backing_store));
+}
+
+TEST_F(CompositorOpenGLTest, PresentEmpty) {
+  UseEngineWithView();
+
+  auto compositor = CompositorOpenGL{engine(), kMockResolver};
+
+  // The context will be bound twice: first to initialize the compositor, second
+  // to clear the surface.
+  EXPECT_CALL(*render_context(), MakeCurrent).WillOnce(Return(true));
+  EXPECT_CALL(*surface(), IsValid).WillRepeatedly(Return(true));
+  EXPECT_CALL(*surface(), MakeCurrent).WillOnce(Return(true));
+  EXPECT_CALL(*surface(), SwapBuffers).WillOnce(Return(true));
+  EXPECT_TRUE(compositor.Present(view()->view_id(), nullptr, 0));
+}
+
+TEST_F(CompositorOpenGLTest, HeadlessPresentIgnored) {
+  UseHeadlessEngine();
+
+  auto compositor = CompositorOpenGL{engine(), kMockResolver};
+
+  FlutterBackingStoreConfig config = {};
+  FlutterBackingStore backing_store = {};
+
+  EXPECT_CALL(*render_context(), MakeCurrent).WillOnce(Return(true));
+  ASSERT_TRUE(compositor.CreateBackingStore(config, &backing_store));
+
+  FlutterLayer layer = {};
+  layer.type = kFlutterLayerContentTypeBackingStore;
+  layer.backing_store = &backing_store;
+  const FlutterLayer* layer_ptr = &layer;
+
+  EXPECT_FALSE(compositor.Present(kImplicitViewId, &layer_ptr, 1));
+
+  ASSERT_TRUE(compositor.CollectBackingStore(&backing_store));
+}
+
+TEST_F(CompositorOpenGLTest, UnknownViewIgnored) {
+  UseEngineWithView();
+
+  auto compositor = CompositorOpenGL{engine(), kMockResolver};
+
+  FlutterBackingStoreConfig config = {};
+  FlutterBackingStore backing_store = {};
+
+  EXPECT_CALL(*render_context(), MakeCurrent).WillOnce(Return(true));
+  ASSERT_TRUE(compositor.CreateBackingStore(config, &backing_store));
+
+  FlutterLayer layer = {};
+  layer.type = kFlutterLayerContentTypeBackingStore;
+  layer.backing_store = &backing_store;
+  const FlutterLayer* layer_ptr = &layer;
+
+  FlutterViewId unknown_view_id = 123;
+  ASSERT_NE(view()->view_id(), unknown_view_id);
+  ASSERT_EQ(engine()->view(unknown_view_id), nullptr);
+
+  EXPECT_FALSE(compositor.Present(unknown_view_id, &layer_ptr, 1));
+
+  ASSERT_TRUE(compositor.CollectBackingStore(&backing_store));
+}
+
+TEST_F(CompositorOpenGLTest, NoSurfaceIgnored) {
+  UseEngineWithView(/*add_surface = */ false);
+
+  auto compositor = CompositorOpenGL{engine(), kMockResolver};
+
+  FlutterBackingStoreConfig config = {};
+  FlutterBackingStore backing_store = {};
+
+  EXPECT_CALL(*render_context(), MakeCurrent).WillOnce(Return(true));
+  ASSERT_TRUE(compositor.CreateBackingStore(config, &backing_store));
+
+  FlutterLayer layer = {};
+  layer.type = kFlutterLayerContentTypeBackingStore;
+  layer.backing_store = &backing_store;
+  const FlutterLayer* layer_ptr = &layer;
+
+  EXPECT_FALSE(compositor.Present(view()->view_id(), &layer_ptr, 1));
+
+  ASSERT_TRUE(compositor.CollectBackingStore(&backing_store));
+}
+
+}  // namespace testing
+}  // namespace flutter
diff --git a/shell/platform/windows/compositor_software.cc b/shell/platform/windows/compositor_software.cc
new file mode 100644
index 0000000000000000000000000000000000000000..d171be71c5b0423a6f24ef1f7d10a7ed6b8c55bc
--- /dev/null
+++ b/shell/platform/windows/compositor_software.cc
@@ -0,0 +1,68 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/platform/windows/compositor_software.h"
+
+#include "flutter/shell/platform/windows/flutter_windows_engine.h"
+#include "flutter/shell/platform/windows/flutter_windows_view.h"
+
+namespace flutter {
+
+CompositorSoftware::CompositorSoftware(FlutterWindowsEngine* engine)
+    : engine_(engine) {}
+
+bool CompositorSoftware::CreateBackingStore(
+    const FlutterBackingStoreConfig& config,
+    FlutterBackingStore* result) {
+  size_t size = config.size.width * config.size.height * 4;
+  void* allocation = std::calloc(size, sizeof(uint8_t));
+  if (!allocation) {
+    return false;
+  }
+
+  result->type = kFlutterBackingStoreTypeSoftware;
+  result->software.allocation = allocation;
+  result->software.height = config.size.height;
+  result->software.row_bytes = config.size.width * 4;
+  result->software.user_data = nullptr;
+  result->software.destruction_callback = [](void* user_data) {
+    // Backing store destroyed in `CompositorSoftware::CollectBackingStore`, set
+    // on FlutterCompositor.collect_backing_store_callback during engine start.
+  };
+  return true;
+}
+
+bool CompositorSoftware::CollectBackingStore(const FlutterBackingStore* store) {
+  std::free(const_cast<void*>(store->software.allocation));
+  return true;
+}
+
+bool CompositorSoftware::Present(FlutterViewId view_id,
+                                 const FlutterLayer** layers,
+                                 size_t layers_count) {
+  FlutterWindowsView* view = engine_->view(view_id);
+  if (!view) {
+    return false;
+  }
+
+  // Clear the view if there are no layers to present.
+  if (layers_count == 0) {
+    return view->ClearSoftwareBitmap();
+  }
+
+  // TODO: Support compositing layers and platform views.
+  // See: https://github.com/flutter/flutter/issues/31713
+  FML_DCHECK(layers_count == 1);
+  FML_DCHECK(layers[0]->offset.x == 0 && layers[0]->offset.y == 0);
+  FML_DCHECK(layers[0]->type == kFlutterLayerContentTypeBackingStore);
+  FML_DCHECK(layers[0]->backing_store->type ==
+             kFlutterBackingStoreTypeSoftware);
+
+  const auto& backing_store = layers[0]->backing_store->software;
+
+  return view->PresentSoftwareBitmap(
+      backing_store.allocation, backing_store.row_bytes, backing_store.height);
+}
+
+}  // namespace flutter
diff --git a/shell/platform/windows/compositor_software.h b/shell/platform/windows/compositor_software.h
new file mode 100644
index 0000000000000000000000000000000000000000..cdc5781673ccb7dcba3a53f97b7e77c25220974a
--- /dev/null
+++ b/shell/platform/windows/compositor_software.h
@@ -0,0 +1,37 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_COMPOSITOR_SOFTWARE_H_
+#define FLUTTER_SHELL_PLATFORM_WINDOWS_COMPOSITOR_SOFTWARE_H_
+
+#include "flutter/shell/platform/embedder/embedder.h"
+#include "flutter/shell/platform/windows/compositor.h"
+#include "flutter/shell/platform/windows/flutter_windows_engine.h"
+
+namespace flutter {
+
+// Enables the Flutter engine to render content on Windows using software
+// rasterization and bitmaps.
+class CompositorSoftware : public Compositor {
+ public:
+  CompositorSoftware(FlutterWindowsEngine* engine);
+
+  /// |Compositor|
+  bool CreateBackingStore(const FlutterBackingStoreConfig& config,
+                          FlutterBackingStore* result) override;
+  /// |Compositor|
+  bool CollectBackingStore(const FlutterBackingStore* store) override;
+
+  /// |Compositor|
+  bool Present(FlutterViewId view_id,
+               const FlutterLayer** layers,
+               size_t layers_count) override;
+
+ private:
+  FlutterWindowsEngine* engine_;
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_COMPOSITOR_SOFTWARE_H_
diff --git a/shell/platform/windows/compositor_software_unittests.cc b/shell/platform/windows/compositor_software_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..f8f78ab1a621fe21272c285376dbd001f7b532cf
--- /dev/null
+++ b/shell/platform/windows/compositor_software_unittests.cc
@@ -0,0 +1,166 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <memory>
+#include <vector>
+
+#include "flutter/shell/platform/windows/compositor_software.h"
+#include "flutter/shell/platform/windows/flutter_windows_view.h"
+#include "flutter/shell/platform/windows/testing/engine_modifier.h"
+#include "flutter/shell/platform/windows/testing/flutter_windows_engine_builder.h"
+#include "flutter/shell/platform/windows/testing/mock_window_binding_handler.h"
+#include "flutter/shell/platform/windows/testing/windows_test.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+namespace flutter {
+namespace testing {
+
+namespace {
+using ::testing::Return;
+
+class MockFlutterWindowsView : public FlutterWindowsView {
+ public:
+  MockFlutterWindowsView(FlutterWindowsEngine* engine,
+                         std::unique_ptr<WindowBindingHandler> window)
+      : FlutterWindowsView(kImplicitViewId, engine, std::move(window)) {}
+  virtual ~MockFlutterWindowsView() = default;
+
+  MOCK_METHOD(bool,
+              PresentSoftwareBitmap,
+              (const void* allocation, size_t row_bytes, size_t height),
+              (override));
+  MOCK_METHOD(bool, ClearSoftwareBitmap, (), (override));
+
+ private:
+  FML_DISALLOW_COPY_AND_ASSIGN(MockFlutterWindowsView);
+};
+
+class CompositorSoftwareTest : public WindowsTest {
+ public:
+  CompositorSoftwareTest() = default;
+  virtual ~CompositorSoftwareTest() = default;
+
+ protected:
+  FlutterWindowsEngine* engine() { return engine_.get(); }
+  MockFlutterWindowsView* view() { return view_.get(); }
+
+  void UseHeadlessEngine() {
+    FlutterWindowsEngineBuilder builder{GetContext()};
+
+    engine_ = builder.Build();
+  }
+
+  void UseEngineWithView() {
+    FlutterWindowsEngineBuilder builder{GetContext()};
+
+    auto window = std::make_unique<MockWindowBindingHandler>();
+    EXPECT_CALL(*window.get(), SetView).Times(1);
+    EXPECT_CALL(*window.get(), GetWindowHandle).WillRepeatedly(Return(nullptr));
+
+    engine_ = builder.Build();
+    view_ = std::make_unique<MockFlutterWindowsView>(engine_.get(),
+                                                     std::move(window));
+
+    EngineModifier modifier{engine_.get()};
+    modifier.SetImplicitView(view_.get());
+  }
+
+ private:
+  std::unique_ptr<FlutterWindowsEngine> engine_;
+  std::unique_ptr<MockFlutterWindowsView> view_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(CompositorSoftwareTest);
+};
+
+}  // namespace
+
+TEST_F(CompositorSoftwareTest, CreateBackingStore) {
+  UseHeadlessEngine();
+
+  auto compositor = CompositorSoftware{engine()};
+
+  FlutterBackingStoreConfig config = {};
+  FlutterBackingStore backing_store = {};
+
+  ASSERT_TRUE(compositor.CreateBackingStore(config, &backing_store));
+  ASSERT_TRUE(compositor.CollectBackingStore(&backing_store));
+}
+
+TEST_F(CompositorSoftwareTest, Present) {
+  UseEngineWithView();
+
+  auto compositor = CompositorSoftware{engine()};
+
+  FlutterBackingStoreConfig config = {};
+  FlutterBackingStore backing_store = {};
+
+  ASSERT_TRUE(compositor.CreateBackingStore(config, &backing_store));
+
+  FlutterLayer layer = {};
+  layer.type = kFlutterLayerContentTypeBackingStore;
+  layer.backing_store = &backing_store;
+  const FlutterLayer* layer_ptr = &layer;
+
+  EXPECT_CALL(*view(), PresentSoftwareBitmap).WillOnce(Return(true));
+  EXPECT_TRUE(compositor.Present(view()->view_id(), &layer_ptr, 1));
+
+  ASSERT_TRUE(compositor.CollectBackingStore(&backing_store));
+}
+
+TEST_F(CompositorSoftwareTest, PresentEmpty) {
+  UseEngineWithView();
+
+  auto compositor = CompositorSoftware{engine()};
+
+  EXPECT_CALL(*view(), ClearSoftwareBitmap).WillOnce(Return(true));
+  EXPECT_TRUE(compositor.Present(view()->view_id(), nullptr, 0));
+}
+
+TEST_F(CompositorSoftwareTest, UnknownViewIgnored) {
+  UseEngineWithView();
+
+  auto compositor = CompositorSoftware{engine()};
+
+  FlutterBackingStoreConfig config = {};
+  FlutterBackingStore backing_store = {};
+
+  ASSERT_TRUE(compositor.CreateBackingStore(config, &backing_store));
+
+  FlutterLayer layer = {};
+  layer.type = kFlutterLayerContentTypeBackingStore;
+  layer.backing_store = &backing_store;
+  const FlutterLayer* layer_ptr = &layer;
+
+  FlutterViewId unknown_view_id = 123;
+  ASSERT_NE(view()->view_id(), unknown_view_id);
+  ASSERT_EQ(engine()->view(unknown_view_id), nullptr);
+
+  EXPECT_FALSE(compositor.Present(unknown_view_id, &layer_ptr, 1));
+
+  ASSERT_TRUE(compositor.CollectBackingStore(&backing_store));
+}
+
+TEST_F(CompositorSoftwareTest, HeadlessPresentIgnored) {
+  UseHeadlessEngine();
+
+  auto compositor = CompositorSoftware{engine()};
+
+  FlutterBackingStoreConfig config = {};
+  FlutterBackingStore backing_store = {};
+
+  ASSERT_TRUE(compositor.CreateBackingStore(config, &backing_store));
+
+  FlutterLayer layer = {};
+  layer.type = kFlutterLayerContentTypeBackingStore;
+  layer.backing_store = &backing_store;
+  const FlutterLayer* layer_ptr = &layer;
+
+  EXPECT_FALSE(compositor.Present(kImplicitViewId, &layer_ptr, 1));
+
+  ASSERT_TRUE(compositor.CollectBackingStore(&backing_store));
+}
+
+}  // namespace testing
+}  // namespace flutter
diff --git a/shell/platform/windows/cursor_handler.cc b/shell/platform/windows/cursor_handler.cc
index 9e43b051be973c985680ad952ea99dbcfda5beec..19cd90567a695b28b3e08b94f5c00d7576d26368 100644
--- a/shell/platform/windows/cursor_handler.cc
+++ b/shell/platform/windows/cursor_handler.cc
@@ -7,22 +7,53 @@
 #include <windows.h>
 
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_method_codec.h"
+#include "flutter/shell/platform/windows/flutter_windows_engine.h"
+#include "flutter/shell/platform/windows/flutter_windows_view.h"
 
 static constexpr char kChannelName[] = "flutter/mousecursor";
 
 static constexpr char kActivateSystemCursorMethod[] = "activateSystemCursor";
-
 static constexpr char kKindKey[] = "kind";
 
+// This method allows creating a custom cursor with rawBGRA buffer, returns a
+// string to identify the cursor.
+static constexpr char kCreateCustomCursorMethod[] =
+    "createCustomCursor/windows";
+// A string, the custom cursor's name.
+static constexpr char kCustomCursorNameKey[] = "name";
+// A list of bytes, the custom cursor's rawBGRA buffer.
+static constexpr char kCustomCursorBufferKey[] = "buffer";
+// A double, the x coordinate of the custom cursor's hotspot, starting from
+// left.
+static constexpr char kCustomCursorHotXKey[] = "hotX";
+// A double, the y coordinate of the custom cursor's hotspot, starting from top.
+static constexpr char kCustomCursorHotYKey[] = "hotY";
+// An int value for the width of the custom cursor.
+static constexpr char kCustomCursorWidthKey[] = "width";
+// An int value for the height of the custom cursor.
+static constexpr char kCustomCursorHeightKey[] = "height";
+
+// This method also has an argument `kCustomCursorNameKey` for the name
+// of the cursor to activate.
+static constexpr char kSetCustomCursorMethod[] = "setCustomCursor/windows";
+
+// This method also has an argument `kCustomCursorNameKey` for the name
+// of the cursor to delete.
+static constexpr char kDeleteCustomCursorMethod[] =
+    "deleteCustomCursor/windows";
+
+// Error codes used for responses.
+static constexpr char kCursorError[] = "Cursor error";
+
 namespace flutter {
 
 CursorHandler::CursorHandler(BinaryMessenger* messenger,
-                             WindowBindingHandler* delegate)
+                             FlutterWindowsEngine* engine)
     : channel_(std::make_unique<MethodChannel<EncodableValue>>(
           messenger,
           kChannelName,
           &StandardMethodCodec::GetInstance())),
-      delegate_(delegate) {
+      engine_(engine) {
   channel_->SetMethodCallHandler(
       [this](const MethodCall<EncodableValue>& call,
              std::unique_ptr<MethodResult<EncodableValue>> result) {
@@ -43,11 +74,212 @@ void CursorHandler::HandleMethodCall(
       return;
     }
     const auto& kind = std::get<std::string>(kind_iter->second);
-    delegate_->UpdateFlutterCursor(kind);
+
+    // TODO(loicsharma): Remove implicit view assumption.
+    // https://github.com/flutter/flutter/issues/142845
+    FlutterWindowsView* view = engine_->view(kImplicitViewId);
+    if (view == nullptr) {
+      result->Error(kCursorError,
+                    "Cursor is not available in Windows headless mode");
+      return;
+    }
+    view->UpdateFlutterCursor(kind);
+    result->Success();
+  } else if (method.compare(kCreateCustomCursorMethod) == 0) {
+    const auto& arguments = std::get<EncodableMap>(*method_call.arguments());
+    auto name_iter =
+        arguments.find(EncodableValue(std::string(kCustomCursorNameKey)));
+    if (name_iter == arguments.end()) {
+      result->Error(
+          "Argument error",
+          "Missing argument name while trying to customize system cursor");
+      return;
+    }
+    auto name = std::get<std::string>(name_iter->second);
+    auto buffer_iter =
+        arguments.find(EncodableValue(std::string(kCustomCursorBufferKey)));
+    if (buffer_iter == arguments.end()) {
+      result->Error(
+          "Argument error",
+          "Missing argument buffer while trying to customize system cursor");
+      return;
+    }
+    auto buffer = std::get<std::vector<uint8_t>>(buffer_iter->second);
+    auto width_iter =
+        arguments.find(EncodableValue(std::string(kCustomCursorWidthKey)));
+    if (width_iter == arguments.end()) {
+      result->Error(
+          "Argument error",
+          "Missing argument width while trying to customize system cursor");
+      return;
+    }
+    auto width = std::get<int>(width_iter->second);
+    auto height_iter =
+        arguments.find(EncodableValue(std::string(kCustomCursorHeightKey)));
+    if (height_iter == arguments.end()) {
+      result->Error(
+          "Argument error",
+          "Missing argument height while trying to customize system cursor");
+      return;
+    }
+    auto height = std::get<int>(height_iter->second);
+    auto hot_x_iter =
+        arguments.find(EncodableValue(std::string(kCustomCursorHotXKey)));
+    if (hot_x_iter == arguments.end()) {
+      result->Error(
+          "Argument error",
+          "Missing argument hotX while trying to customize system cursor");
+      return;
+    }
+    auto hot_x = std::get<double>(hot_x_iter->second);
+    auto hot_y_iter =
+        arguments.find(EncodableValue(std::string(kCustomCursorHotYKey)));
+    if (hot_y_iter == arguments.end()) {
+      result->Error(
+          "Argument error",
+          "Missing argument hotY while trying to customize system cursor");
+      return;
+    }
+    auto hot_y = std::get<double>(hot_y_iter->second);
+    HCURSOR cursor = GetCursorFromBuffer(buffer, hot_x, hot_y, width, height);
+    if (cursor == nullptr) {
+      result->Error("Argument error",
+                    "Argument must contains a valid rawBGRA bitmap");
+      return;
+    }
+    // Push the cursor into the cache map.
+    custom_cursors_.emplace(name, std::move(cursor));
+    result->Success(flutter::EncodableValue(std::move(name)));
+  } else if (method.compare(kSetCustomCursorMethod) == 0) {
+    const auto& arguments = std::get<EncodableMap>(*method_call.arguments());
+    auto name_iter =
+        arguments.find(EncodableValue(std::string(kCustomCursorNameKey)));
+    if (name_iter == arguments.end()) {
+      result->Error("Argument error",
+                    "Missing argument key while trying to set a custom cursor");
+      return;
+    }
+    auto name = std::get<std::string>(name_iter->second);
+    if (custom_cursors_.find(name) == custom_cursors_.end()) {
+      result->Error(
+          "Argument error",
+          "The custom cursor identified by the argument key cannot be found");
+      return;
+    }
+    HCURSOR cursor = custom_cursors_[name];
+
+    // TODO(loicsharma): Remove implicit view assumption.
+    // https://github.com/flutter/flutter/issues/142845
+    FlutterWindowsView* view = engine_->view(kImplicitViewId);
+    if (view == nullptr) {
+      result->Error(kCursorError,
+                    "Cursor is not available in Windows headless mode");
+      return;
+    }
+    view->SetFlutterCursor(cursor);
+    result->Success();
+  } else if (method.compare(kDeleteCustomCursorMethod) == 0) {
+    const auto& arguments = std::get<EncodableMap>(*method_call.arguments());
+    auto name_iter =
+        arguments.find(EncodableValue(std::string(kCustomCursorNameKey)));
+    if (name_iter == arguments.end()) {
+      result->Error(
+          "Argument error",
+          "Missing argument key while trying to delete a custom cursor");
+      return;
+    }
+    auto name = std::get<std::string>(name_iter->second);
+    auto it = custom_cursors_.find(name);
+    // If the specified cursor name is not found, the deletion is a noop and
+    // returns success.
+    if (it != custom_cursors_.end()) {
+      DeleteObject(it->second);
+      custom_cursors_.erase(it);
+    }
     result->Success();
   } else {
     result->NotImplemented();
   }
 }
 
+HCURSOR GetCursorFromBuffer(const std::vector<uint8_t>& buffer,
+                            double hot_x,
+                            double hot_y,
+                            int width,
+                            int height) {
+  HCURSOR cursor = nullptr;
+  HDC display_dc = GetDC(NULL);
+  // Flutter should returns rawBGRA, which has 8bits * 4channels.
+  BITMAPINFO bmi;
+  memset(&bmi, 0, sizeof(bmi));
+  bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
+  bmi.bmiHeader.biWidth = width;
+  bmi.bmiHeader.biHeight = -height;
+  bmi.bmiHeader.biPlanes = 1;
+  bmi.bmiHeader.biBitCount = 32;
+  bmi.bmiHeader.biCompression = BI_RGB;
+  bmi.bmiHeader.biSizeImage = width * height * 4;
+  // Create the pixmap DIB section
+  uint8_t* pixels = 0;
+  HBITMAP bitmap =
+      CreateDIBSection(display_dc, &bmi, DIB_RGB_COLORS, (void**)&pixels, 0, 0);
+  ReleaseDC(0, display_dc);
+  if (!bitmap || !pixels) {
+    return nullptr;
+  }
+  int bytes_per_line = width * 4;
+  for (int y = 0; y < height; ++y) {
+    memcpy(pixels + y * bytes_per_line, &buffer[bytes_per_line * y],
+           bytes_per_line);
+  }
+  HBITMAP mask;
+  GetMaskBitmaps(bitmap, mask);
+  ICONINFO icon_info;
+  icon_info.fIcon = 0;
+  icon_info.xHotspot = hot_x;
+  icon_info.yHotspot = hot_y;
+  icon_info.hbmMask = mask;
+  icon_info.hbmColor = bitmap;
+  cursor = CreateIconIndirect(&icon_info);
+  DeleteObject(mask);
+  DeleteObject(bitmap);
+  return cursor;
+}
+
+void GetMaskBitmaps(HBITMAP bitmap, HBITMAP& mask_bitmap) {
+  HDC h_dc = ::GetDC(NULL);
+  HDC h_main_dc = ::CreateCompatibleDC(h_dc);
+  HDC h_and_mask_dc = ::CreateCompatibleDC(h_dc);
+
+  // Get the dimensions of the source bitmap
+  BITMAP bm;
+  ::GetObject(bitmap, sizeof(BITMAP), &bm);
+  mask_bitmap = ::CreateCompatibleBitmap(h_dc, bm.bmWidth, bm.bmHeight);
+
+  // Select the bitmaps to DC
+  HBITMAP h_old_main_bitmap = (HBITMAP)::SelectObject(h_main_dc, bitmap);
+  HBITMAP h_old_and_mask_bitmap =
+      (HBITMAP)::SelectObject(h_and_mask_dc, mask_bitmap);
+
+  // Scan each pixel of the souce bitmap and create the masks
+  COLORREF main_bit_pixel;
+  for (int x = 0; x < bm.bmWidth; ++x) {
+    for (int y = 0; y < bm.bmHeight; ++y) {
+      main_bit_pixel = ::GetPixel(h_main_dc, x, y);
+      if (main_bit_pixel == RGB(0, 0, 0)) {
+        ::SetPixel(h_and_mask_dc, x, y, RGB(255, 255, 255));
+      } else {
+        ::SetPixel(h_and_mask_dc, x, y, RGB(0, 0, 0));
+      }
+    }
+  }
+  ::SelectObject(h_main_dc, h_old_main_bitmap);
+  ::SelectObject(h_and_mask_dc, h_old_and_mask_bitmap);
+
+  ::DeleteDC(h_and_mask_dc);
+  ::DeleteDC(h_main_dc);
+
+  ::ReleaseDC(NULL, h_dc);
+}
+
 }  // namespace flutter
diff --git a/shell/platform/windows/cursor_handler.h b/shell/platform/windows/cursor_handler.h
index 7aa75e9dc94ebe4fd06c5b4f84483eec0028b3d6..a01bc61c26f75c3a1e20caeee99a047430a5025e 100644
--- a/shell/platform/windows/cursor_handler.h
+++ b/shell/platform/windows/cursor_handler.h
@@ -5,6 +5,9 @@
 #ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_CURSOR_HANDLER_H_
 #define FLUTTER_SHELL_PLATFORM_WINDOWS_CURSOR_HANDLER_H_
 
+#include <unordered_map>
+
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h"
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/encodable_value.h"
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/method_channel.h"
@@ -13,11 +16,13 @@
 
 namespace flutter {
 
+class FlutterWindowsEngine;
+
 // Handler for the cursor system channel.
 class CursorHandler {
  public:
   explicit CursorHandler(flutter::BinaryMessenger* messenger,
-                         WindowBindingHandler* delegate);
+                         flutter::FlutterWindowsEngine* engine);
 
  private:
   // Called when a method is called on |channel_|;
@@ -28,10 +33,25 @@ class CursorHandler {
   // The MethodChannel used for communication with the Flutter engine.
   std::unique_ptr<flutter::MethodChannel<EncodableValue>> channel_;
 
-  // The delegate for cursor updates.
-  WindowBindingHandler* delegate_;
+  // The Flutter engine that will be notified for cursor updates.
+  FlutterWindowsEngine* engine_;
+
+  // The cache map for custom cursors.
+  std::unordered_map<std::string, HCURSOR> custom_cursors_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(CursorHandler);
 };
 
+// Create a cursor from a rawBGRA buffer and the cursor info.
+HCURSOR GetCursorFromBuffer(const std::vector<uint8_t>& buffer,
+                            double hot_x,
+                            double hot_y,
+                            int width,
+                            int height);
+
+// Get the corresponding mask bitmap from the source bitmap.
+void GetMaskBitmaps(HBITMAP bitmap, HBITMAP& mask_bitmap);
+
 }  // namespace flutter
 
 #endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_CURSOR_HANDLER_H_
diff --git a/shell/platform/windows/cursor_handler_unittests.cc b/shell/platform/windows/cursor_handler_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..f6bc9c50a8126f737242d5e801fa397807a98788
--- /dev/null
+++ b/shell/platform/windows/cursor_handler_unittests.cc
@@ -0,0 +1,353 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+#include "flutter/shell/platform/windows/cursor_handler.h"
+
+#include <memory>
+#include <vector>
+
+#include "flutter/fml/macros.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_result_functions.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_message_codec.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_method_codec.h"
+#include "flutter/shell/platform/windows/flutter_windows_view.h"
+#include "flutter/shell/platform/windows/testing/engine_modifier.h"
+#include "flutter/shell/platform/windows/testing/flutter_windows_engine_builder.h"
+#include "flutter/shell/platform/windows/testing/mock_window_binding_handler.h"
+#include "flutter/shell/platform/windows/testing/test_binary_messenger.h"
+#include "flutter/shell/platform/windows/testing/windows_test.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+namespace flutter {
+namespace testing {
+
+namespace {
+using ::testing::_;
+using ::testing::NotNull;
+using ::testing::Return;
+
+static constexpr char kChannelName[] = "flutter/mousecursor";
+
+static constexpr char kActivateSystemCursorMethod[] = "activateSystemCursor";
+static constexpr char kCreateCustomCursorMethod[] =
+    "createCustomCursor/windows";
+static constexpr char kSetCustomCursorMethod[] = "setCustomCursor/windows";
+static constexpr char kDeleteCustomCursorMethod[] =
+    "deleteCustomCursor/windows";
+
+void SimulateCursorMessage(TestBinaryMessenger* messenger,
+                           const std::string& method_name,
+                           std::unique_ptr<EncodableValue> arguments,
+                           MethodResult<EncodableValue>* result_handler) {
+  MethodCall<> call(method_name, std::move(arguments));
+
+  auto message = StandardMethodCodec::GetInstance().EncodeMethodCall(call);
+
+  EXPECT_TRUE(messenger->SimulateEngineMessage(
+      kChannelName, message->data(), message->size(),
+      [&result_handler](const uint8_t* reply, size_t reply_size) {
+        StandardMethodCodec::GetInstance().DecodeAndProcessResponseEnvelope(
+            reply, reply_size, result_handler);
+      }));
+}
+
+}  // namespace
+
+class CursorHandlerTest : public WindowsTest {
+ public:
+  CursorHandlerTest() = default;
+  virtual ~CursorHandlerTest() = default;
+
+ protected:
+  FlutterWindowsEngine* engine() { return engine_.get(); }
+  FlutterWindowsView* view() { return view_.get(); }
+  MockWindowBindingHandler* window() { return window_; }
+
+  void UseHeadlessEngine() {
+    FlutterWindowsEngineBuilder builder{GetContext()};
+
+    engine_ = builder.Build();
+  }
+
+  void UseEngineWithView() {
+    FlutterWindowsEngineBuilder builder{GetContext()};
+
+    auto window = std::make_unique<MockWindowBindingHandler>();
+    EXPECT_CALL(*window.get(), SetView).Times(1);
+    EXPECT_CALL(*window.get(), GetWindowHandle).WillRepeatedly(Return(nullptr));
+
+    window_ = window.get();
+    engine_ = builder.Build();
+    view_ = std::make_unique<FlutterWindowsView>(kImplicitViewId, engine_.get(),
+                                                 std::move(window));
+
+    EngineModifier modifier{engine_.get()};
+    modifier.SetImplicitView(view_.get());
+  }
+
+ private:
+  std::unique_ptr<FlutterWindowsEngine> engine_;
+  std::unique_ptr<FlutterWindowsView> view_;
+  MockWindowBindingHandler* window_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(CursorHandlerTest);
+};
+
+TEST_F(CursorHandlerTest, ActivateSystemCursor) {
+  UseEngineWithView();
+
+  TestBinaryMessenger messenger;
+  CursorHandler cursor_handler(&messenger, engine());
+
+  EXPECT_CALL(*window(), UpdateFlutterCursor("click")).Times(1);
+
+  bool success = false;
+  MethodResultFunctions<> result_handler(
+      [&success](const EncodableValue* result) {
+        success = true;
+        EXPECT_EQ(result, nullptr);
+      },
+      nullptr, nullptr);
+
+  SimulateCursorMessage(&messenger, kActivateSystemCursorMethod,
+                        std::make_unique<EncodableValue>(EncodableMap{
+                            {EncodableValue("device"), EncodableValue(0)},
+                            {EncodableValue("kind"), EncodableValue("click")},
+                        }),
+                        &result_handler);
+
+  EXPECT_TRUE(success);
+}
+
+TEST_F(CursorHandlerTest, ActivateSystemCursorRequiresView) {
+  UseHeadlessEngine();
+
+  TestBinaryMessenger messenger;
+  CursorHandler cursor_handler(&messenger, engine());
+
+  bool error = false;
+  MethodResultFunctions<> result_handler(
+      nullptr,
+      [&error](const std::string& error_code, const std::string& error_message,
+               const EncodableValue* value) {
+        error = true;
+        EXPECT_EQ(error_message,
+                  "Cursor is not available in Windows headless mode");
+      },
+      nullptr);
+
+  SimulateCursorMessage(&messenger, kActivateSystemCursorMethod,
+                        std::make_unique<EncodableValue>(EncodableMap{
+                            {EncodableValue("device"), EncodableValue(0)},
+                            {EncodableValue("kind"), EncodableValue("click")},
+                        }),
+                        &result_handler);
+
+  EXPECT_TRUE(error);
+}
+
+TEST_F(CursorHandlerTest, CreateCustomCursor) {
+  UseEngineWithView();
+
+  TestBinaryMessenger messenger;
+  CursorHandler cursor_handler(&messenger, engine());
+
+  // Create a 4x4 raw BGRA test cursor buffer.
+  std::vector<uint8_t> buffer(4 * 4 * 4, 0);
+
+  bool success = false;
+  MethodResultFunctions<> result_handler(
+      [&success](const EncodableValue* result) {
+        success = true;
+        EXPECT_EQ(std::get<std::string>(*result), "hello");
+      },
+      nullptr, nullptr);
+
+  SimulateCursorMessage(&messenger, kCreateCustomCursorMethod,
+                        std::make_unique<EncodableValue>(EncodableMap{
+                            {EncodableValue("name"), EncodableValue("hello")},
+                            {EncodableValue("buffer"), EncodableValue(buffer)},
+                            {EncodableValue("width"), EncodableValue(4)},
+                            {EncodableValue("height"), EncodableValue(4)},
+                            {EncodableValue("hotX"), EncodableValue(0.0)},
+                            {EncodableValue("hotY"), EncodableValue(0.0)},
+                        }),
+                        &result_handler);
+
+  EXPECT_TRUE(success);
+}
+
+TEST_F(CursorHandlerTest, SetCustomCursor) {
+  UseEngineWithView();
+
+  TestBinaryMessenger messenger;
+  CursorHandler cursor_handler(&messenger, engine());
+
+  // Create a 4x4 raw BGRA test cursor buffer.
+  std::vector<uint8_t> buffer(4 * 4 * 4, 0);
+
+  bool success = false;
+  MethodResultFunctions<> create_result_handler(nullptr, nullptr, nullptr);
+  MethodResultFunctions<> set_result_handler(
+      [&success](const EncodableValue* result) {
+        success = true;
+        EXPECT_EQ(result, nullptr);
+      },
+      nullptr, nullptr);
+
+  EXPECT_CALL(*window(), SetFlutterCursor(/*cursor=*/NotNull())).Times(1);
+
+  SimulateCursorMessage(&messenger, kCreateCustomCursorMethod,
+                        std::make_unique<EncodableValue>(EncodableMap{
+                            {EncodableValue("name"), EncodableValue("hello")},
+                            {EncodableValue("buffer"), EncodableValue(buffer)},
+                            {EncodableValue("width"), EncodableValue(4)},
+                            {EncodableValue("height"), EncodableValue(4)},
+                            {EncodableValue("hotX"), EncodableValue(0.0)},
+                            {EncodableValue("hotY"), EncodableValue(0.0)},
+                        }),
+                        &create_result_handler);
+
+  SimulateCursorMessage(&messenger, kSetCustomCursorMethod,
+                        std::make_unique<EncodableValue>(EncodableMap{
+                            {EncodableValue("name"), EncodableValue("hello")},
+                        }),
+                        &set_result_handler);
+
+  EXPECT_TRUE(success);
+}
+
+TEST_F(CursorHandlerTest, SetCustomCursorRequiresView) {
+  UseHeadlessEngine();
+
+  TestBinaryMessenger messenger;
+  CursorHandler cursor_handler(&messenger, engine());
+
+  // Create a 4x4 raw BGRA test cursor buffer.
+  std::vector<uint8_t> buffer(4 * 4 * 4, 0);
+
+  bool error = false;
+  MethodResultFunctions<> create_result_handler(nullptr, nullptr, nullptr);
+  MethodResultFunctions<> set_result_handler(
+      nullptr,
+      [&error](const std::string& error_code, const std::string& error_message,
+               const EncodableValue* value) {
+        error = true;
+        EXPECT_EQ(error_message,
+                  "Cursor is not available in Windows headless mode");
+      },
+      nullptr);
+
+  SimulateCursorMessage(&messenger, kCreateCustomCursorMethod,
+                        std::make_unique<EncodableValue>(EncodableMap{
+                            {EncodableValue("name"), EncodableValue("hello")},
+                            {EncodableValue("buffer"), EncodableValue(buffer)},
+                            {EncodableValue("width"), EncodableValue(4)},
+                            {EncodableValue("height"), EncodableValue(4)},
+                            {EncodableValue("hotX"), EncodableValue(0.0)},
+                            {EncodableValue("hotY"), EncodableValue(0.0)},
+                        }),
+                        &create_result_handler);
+
+  SimulateCursorMessage(&messenger, kSetCustomCursorMethod,
+                        std::make_unique<EncodableValue>(EncodableMap{
+                            {EncodableValue("name"), EncodableValue("hello")},
+                        }),
+                        &set_result_handler);
+
+  EXPECT_TRUE(error);
+}
+
+TEST_F(CursorHandlerTest, SetNonexistentCustomCursor) {
+  UseEngineWithView();
+
+  TestBinaryMessenger messenger;
+  CursorHandler cursor_handler(&messenger, engine());
+
+  bool error = false;
+  MethodResultFunctions<> result_handler(
+      nullptr,
+      [&error](const std::string& error_code, const std::string& error_message,
+               const EncodableValue* value) {
+        error = true;
+        EXPECT_EQ(
+            error_message,
+            "The custom cursor identified by the argument key cannot be found");
+      },
+      nullptr);
+
+  EXPECT_CALL(*window(), SetFlutterCursor).Times(0);
+
+  SimulateCursorMessage(&messenger, kSetCustomCursorMethod,
+                        std::make_unique<EncodableValue>(EncodableMap{
+                            {EncodableValue("name"), EncodableValue("hello")},
+                        }),
+                        &result_handler);
+
+  EXPECT_TRUE(error);
+}
+
+TEST_F(CursorHandlerTest, DeleteCustomCursor) {
+  UseEngineWithView();
+
+  TestBinaryMessenger messenger;
+  CursorHandler cursor_handler(&messenger, engine());
+
+  // Create a 4x4 raw BGRA test cursor buffer.
+  std::vector<uint8_t> buffer(4 * 4 * 4, 0);
+
+  bool success = false;
+  MethodResultFunctions<> create_result_handler(nullptr, nullptr, nullptr);
+  MethodResultFunctions<> delete_result_handler(
+      [&success](const EncodableValue* result) {
+        success = true;
+        EXPECT_EQ(result, nullptr);
+      },
+      nullptr, nullptr);
+
+  SimulateCursorMessage(&messenger, kCreateCustomCursorMethod,
+                        std::make_unique<EncodableValue>(EncodableMap{
+                            {EncodableValue("name"), EncodableValue("hello")},
+                            {EncodableValue("buffer"), EncodableValue(buffer)},
+                            {EncodableValue("width"), EncodableValue(4)},
+                            {EncodableValue("height"), EncodableValue(4)},
+                            {EncodableValue("hotX"), EncodableValue(0.0)},
+                            {EncodableValue("hotY"), EncodableValue(0.0)},
+                        }),
+                        &create_result_handler);
+
+  SimulateCursorMessage(&messenger, kDeleteCustomCursorMethod,
+                        std::make_unique<EncodableValue>(EncodableMap{
+                            {EncodableValue("name"), EncodableValue("hello")},
+                        }),
+                        &delete_result_handler);
+
+  EXPECT_TRUE(success);
+}
+
+TEST_F(CursorHandlerTest, DeleteNonexistentCustomCursor) {
+  UseEngineWithView();
+
+  TestBinaryMessenger messenger;
+  CursorHandler cursor_handler(&messenger, engine());
+
+  bool success = false;
+  MethodResultFunctions<> result_handler(
+      [&success](const EncodableValue* result) {
+        success = true;
+        EXPECT_EQ(result, nullptr);
+      },
+      nullptr, nullptr);
+
+  SimulateCursorMessage(&messenger, kDeleteCustomCursorMethod,
+                        std::make_unique<EncodableValue>(EncodableMap{
+                            {EncodableValue("name"), EncodableValue("fake")},
+                        }),
+                        &result_handler);
+
+  EXPECT_TRUE(success);
+}
+
+}  // namespace testing
+}  // namespace flutter
diff --git a/shell/platform/windows/direct_manipulation.cc b/shell/platform/windows/direct_manipulation.cc
index 72e676a1b32833d0d208898b65c97ae4e016e219..81c2fc01b789cd60f00543547aff347e3238cd00 100644
--- a/shell/platform/windows/direct_manipulation.cc
+++ b/shell/platform/windows/direct_manipulation.cc
@@ -7,7 +7,7 @@
 #include <algorithm>
 
 #include "flutter/shell/platform/windows/direct_manipulation.h"
-#include "flutter/shell/platform/windows/window.h"
+#include "flutter/shell/platform/windows/flutter_window.h"
 #include "flutter/shell/platform/windows/window_binding_handler_delegate.h"
 
 #define RETURN_IF_FAILED(operation)            \
@@ -172,7 +172,7 @@ ULONG STDMETHODCALLTYPE DirectManipulationEventHandler::Release() {
   return 0;
 }
 
-DirectManipulationOwner::DirectManipulationOwner(Window* window)
+DirectManipulationOwner::DirectManipulationOwner(FlutterWindow* window)
     : window_(window) {}
 
 int DirectManipulationOwner::Init(unsigned int width, unsigned int height) {
diff --git a/shell/platform/windows/direct_manipulation.h b/shell/platform/windows/direct_manipulation.h
index 6270015fa6f4c2e33d2f88703ce0a1b0c253286e..22efae4ab3c5a9739c8b15d333dfb4e30ceac484 100644
--- a/shell/platform/windows/direct_manipulation.h
+++ b/shell/platform/windows/direct_manipulation.h
@@ -12,7 +12,7 @@
 
 namespace flutter {
 
-class Window;
+class FlutterWindow;
 class WindowBindingHandlerDelegate;
 
 class DirectManipulationEventHandler;
@@ -21,7 +21,7 @@ class DirectManipulationEventHandler;
 // DirectManipulation and WindowBindingHandlerDelegate.
 class DirectManipulationOwner {
  public:
-  explicit DirectManipulationOwner(Window* window);
+  explicit DirectManipulationOwner(FlutterWindow* window);
   virtual ~DirectManipulationOwner() = default;
   // Initialize a DirectManipulation viewport with specified width and height.
   // These should match the width and height of the application window.
@@ -47,7 +47,7 @@ class DirectManipulationOwner {
 
  private:
   // The window gesture input is occuring on.
-  Window* window_;
+  FlutterWindow* window_;
   // Cookie needed to register child event handler with viewport.
   DWORD viewportHandlerCookie_;
   // Object needed for operation of the DirectManipulation API.
@@ -86,24 +86,24 @@ class DirectManipulationEventHandler
   ULONG STDMETHODCALLTYPE Release() override;
 
   // |IDirectManipulationViewportEventHandler|
-  HRESULT STDMETHODCALLTYPE
-  OnViewportStatusChanged(IDirectManipulationViewport* viewport,
-                          DIRECTMANIPULATION_STATUS current,
-                          DIRECTMANIPULATION_STATUS previous) override;
+  HRESULT STDMETHODCALLTYPE OnViewportStatusChanged(
+      IDirectManipulationViewport* viewport,
+      DIRECTMANIPULATION_STATUS current,
+      DIRECTMANIPULATION_STATUS previous) override;
 
   // |IDirectManipulationViewportEventHandler|
-  HRESULT STDMETHODCALLTYPE
-  OnViewportUpdated(IDirectManipulationViewport* viewport) override;
+  HRESULT STDMETHODCALLTYPE OnViewportUpdated(
+      IDirectManipulationViewport* viewport) override;
 
   // |IDirectManipulationViewportEventHandler|
-  HRESULT STDMETHODCALLTYPE
-  OnContentUpdated(IDirectManipulationViewport* viewport,
-                   IDirectManipulationContent* content) override;
+  HRESULT STDMETHODCALLTYPE OnContentUpdated(
+      IDirectManipulationViewport* viewport,
+      IDirectManipulationContent* content) override;
 
   // |IDirectManipulationInteractionEventHandler|
-  HRESULT STDMETHODCALLTYPE
-  OnInteraction(IDirectManipulationViewport2* viewport,
-                DIRECTMANIPULATION_INTERACTION_TYPE interaction) override;
+  HRESULT STDMETHODCALLTYPE OnInteraction(
+      IDirectManipulationViewport2* viewport,
+      DIRECTMANIPULATION_INTERACTION_TYPE interaction) override;
 
  private:
   struct GestureData {
diff --git a/shell/platform/windows/direct_manipulation_unittests.cc b/shell/platform/windows/direct_manipulation_unittests.cc
index 5b1e687ba5225a24108f04be05daea3cf0a51317..323125141edb19486c69ffadf2cbbd14e5e8da07 100644
--- a/shell/platform/windows/direct_manipulation_unittests.cc
+++ b/shell/platform/windows/direct_manipulation_unittests.cc
@@ -3,8 +3,9 @@
 // found in the LICENSE file.
 
 #include "flutter/shell/platform/windows/direct_manipulation.h"
-#include "flutter/shell/platform/windows/testing/mock_window_binding_handler_delegate.h"
 
+#include "flutter/fml/macros.h"
+#include "flutter/shell/platform/windows/testing/mock_window_binding_handler_delegate.h"
 #include "gtest/gtest.h"
 
 using testing::_;
@@ -16,11 +17,6 @@ class MockIDirectManipulationViewport : public IDirectManipulationViewport {
  public:
   MockIDirectManipulationViewport() {}
 
-  // Prevent copying.
-  MockIDirectManipulationViewport(MockIDirectManipulationViewport const&) =
-      delete;
-  MockIDirectManipulationViewport& operator=(
-      MockIDirectManipulationViewport const&) = delete;
   MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, AddRef, ULONG());
   MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, Release, ULONG());
   MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
@@ -101,17 +97,15 @@ class MockIDirectManipulationViewport : public IDirectManipulationViewport {
       STDMETHODCALLTYPE,
       ZoomToRect,
       HRESULT(const float, const float, const float, const float, BOOL));
+
+ private:
+  FML_DISALLOW_COPY_AND_ASSIGN(MockIDirectManipulationViewport);
 };
 
 class MockIDirectManipulationContent : public IDirectManipulationContent {
  public:
   MockIDirectManipulationContent() {}
 
-  // Prevent copying.
-  MockIDirectManipulationContent(MockIDirectManipulationContent const&) =
-      delete;
-  MockIDirectManipulationContent& operator=(
-      MockIDirectManipulationContent const&) = delete;
   MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, AddRef, ULONG());
   MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, Release, ULONG());
   MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
@@ -139,6 +133,9 @@ class MockIDirectManipulationContent : public IDirectManipulationContent {
   MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
                              SyncContentTransform,
                              HRESULT(const float*, DWORD));
+
+ private:
+  FML_DISALLOW_COPY_AND_ASSIGN(MockIDirectManipulationContent);
 };
 
 TEST(DirectManipulationTest, TestGesture) {
diff --git a/shell/platform/windows/dpi_utils.cc b/shell/platform/windows/dpi_utils.cc
index cd147f03470d4bc8d525d575bd0143556f97b0a4..81fece664d146c26e2f2df50c5a8ae5ef9aebf2d 100644
--- a/shell/platform/windows/dpi_utils.cc
+++ b/shell/platform/windows/dpi_utils.cc
@@ -4,6 +4,8 @@
 
 #include "dpi_utils.h"
 
+#include "flutter/fml/macros.h"
+
 namespace flutter {
 
 namespace {
@@ -58,6 +60,8 @@ class DpiHelper {
   HMODULE shlib_module_ = nullptr;
   bool dpi_for_window_supported_ = false;
   bool dpi_for_monitor_supported_ = false;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(DpiHelper);
 };
 
 DpiHelper::DpiHelper() {
diff --git a/shell/platform/windows/egl/context.cc b/shell/platform/windows/egl/context.cc
new file mode 100644
index 0000000000000000000000000000000000000000..235b3597d20dcdb8bfc3b7befb827a12a99c3054
--- /dev/null
+++ b/shell/platform/windows/egl/context.cc
@@ -0,0 +1,56 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/platform/windows/egl/context.h"
+
+#include "flutter/shell/platform/windows/egl/egl.h"
+
+namespace flutter {
+namespace egl {
+
+Context::Context(EGLDisplay display, EGLContext context)
+    : display_(display), context_(context) {}
+
+Context::~Context() {
+  if (display_ == EGL_NO_DISPLAY && context_ == EGL_NO_CONTEXT) {
+    return;
+  }
+
+  if (::eglDestroyContext(display_, context_) != EGL_TRUE) {
+    WINDOWS_LOG_EGL_ERROR;
+  }
+}
+
+bool Context::IsCurrent() const {
+  return ::eglGetCurrentContext() == context_;
+}
+
+bool Context::MakeCurrent() const {
+  const auto result =
+      ::eglMakeCurrent(display_, EGL_NO_SURFACE, EGL_NO_SURFACE, context_);
+  if (result != EGL_TRUE) {
+    WINDOWS_LOG_EGL_ERROR;
+    return false;
+  }
+
+  return true;
+}
+
+bool Context::ClearCurrent() const {
+  const auto result = ::eglMakeCurrent(display_, EGL_NO_SURFACE, EGL_NO_SURFACE,
+                                       EGL_NO_CONTEXT);
+  if (result != EGL_TRUE) {
+    WINDOWS_LOG_EGL_ERROR;
+    return false;
+  }
+
+  return true;
+}
+
+const EGLContext& Context::GetHandle() const {
+  return context_;
+}
+
+}  // namespace egl
+}  // namespace flutter
diff --git a/shell/platform/windows/egl/context.h b/shell/platform/windows/egl/context.h
new file mode 100644
index 0000000000000000000000000000000000000000..acbff12a8d14044a9e600561995e36e022a5c99d
--- /dev/null
+++ b/shell/platform/windows/egl/context.h
@@ -0,0 +1,51 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_EGL_CONTEXT_H_
+#define FLUTTER_SHELL_PLATFORM_WINDOWS_EGL_CONTEXT_H_
+
+#include <EGL/egl.h>
+
+#include "flutter/fml/macros.h"
+
+namespace flutter {
+namespace egl {
+
+// An EGL context to interact with OpenGL.
+//
+// This enables automatic error logging and mocking.
+//
+// Flutter Windows uses this to create render and resource contexts.
+class Context {
+ public:
+  Context(EGLDisplay display, EGLContext context);
+  ~Context();
+
+  // Check if this context is currently bound to the thread.
+  virtual bool IsCurrent() const;
+
+  // Bind the context to the thread without any read or draw surfaces.
+  //
+  // Returns true on success.
+  virtual bool MakeCurrent() const;
+
+  // Unbind any context and surfaces from the thread.
+  //
+  // Returns true on success.
+  virtual bool ClearCurrent() const;
+
+  // Get the raw EGL context.
+  virtual const EGLContext& GetHandle() const;
+
+ private:
+  EGLDisplay display_ = EGL_NO_DISPLAY;
+  EGLContext context_ = EGL_NO_CONTEXT;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(Context);
+};
+
+}  // namespace egl
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_EGL_CONTEXT_H_
diff --git a/shell/platform/windows/egl/egl.cc b/shell/platform/windows/egl/egl.cc
new file mode 100644
index 0000000000000000000000000000000000000000..85af46f6858a3050036d7225327184cb0b319c58
--- /dev/null
+++ b/shell/platform/windows/egl/egl.cc
@@ -0,0 +1,68 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/platform/windows/egl/egl.h"
+
+#include <EGL/egl.h>
+
+#include "flutter/fml/logging.h"
+
+namespace flutter {
+namespace egl {
+
+namespace {
+
+const char* EGLErrorToString(EGLint error) {
+  switch (error) {
+    case EGL_SUCCESS:
+      return "Success";
+    case EGL_NOT_INITIALIZED:
+      return "Not Initialized";
+    case EGL_BAD_ACCESS:
+      return "Bad Access";
+    case EGL_BAD_ALLOC:
+      return "Bad Alloc";
+    case EGL_BAD_ATTRIBUTE:
+      return "Bad Attribute";
+    case EGL_BAD_CONTEXT:
+      return "Bad Context";
+    case EGL_BAD_CONFIG:
+      return "Bad Config";
+    case EGL_BAD_CURRENT_SURFACE:
+      return "Bad Current Surface";
+    case EGL_BAD_DISPLAY:
+      return "Bad Display";
+    case EGL_BAD_SURFACE:
+      return "Bad Surface";
+    case EGL_BAD_MATCH:
+      return "Bad Match";
+    case EGL_BAD_PARAMETER:
+      return "Bad Parameter";
+    case EGL_BAD_NATIVE_PIXMAP:
+      return "Bad Native Pixmap";
+    case EGL_BAD_NATIVE_WINDOW:
+      return "Bad Native Window";
+    case EGL_CONTEXT_LOST:
+      return "Context Lost";
+  }
+  FML_UNREACHABLE();
+  return "Unknown";
+}
+
+}  // namespace
+
+void LogEGLError(std::string_view message) {
+  const EGLint error = ::eglGetError();
+  return FML_LOG(ERROR) << "EGL Error: " << EGLErrorToString(error) << " ("
+                        << error << ") " << message;
+}
+
+void LogEGLError(std::string_view file, int line) {
+  std::stringstream stream;
+  stream << "in " << file << ":" << line;
+  LogEGLError(stream.str());
+}
+
+}  // namespace egl
+}  // namespace flutter
diff --git a/shell/platform/windows/egl/egl.h b/shell/platform/windows/egl/egl.h
new file mode 100644
index 0000000000000000000000000000000000000000..a0c81a2993c9a2c4d4fed68d5dea50b68c5a0fa1
--- /dev/null
+++ b/shell/platform/windows/egl/egl.h
@@ -0,0 +1,24 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_EGL_EGL_H_
+#define FLUTTER_SHELL_PLATFORM_WINDOWS_EGL_EGL_H_
+
+#include <string_view>
+
+namespace flutter {
+namespace egl {
+
+/// Log the last EGL error with an error message.
+void LogEGLError(std::string_view message);
+
+/// Log the last EGL error.
+void LogEGLError(std::string_view file, int line);
+
+#define WINDOWS_LOG_EGL_ERROR LogEGLError(__FILE__, __LINE__);
+
+}  // namespace egl
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_EGL_EGL_H_
diff --git a/shell/platform/windows/angle_surface_manager.cc b/shell/platform/windows/egl/manager.cc
similarity index 32%
rename from shell/platform/windows/angle_surface_manager.cc
rename to shell/platform/windows/egl/manager.cc
index cd8973dad6d16619d28a72fc64a4363d23d47931..2b827f863f8034a9f335b6a68023a7b13b9e0671 100644
--- a/shell/platform/windows/angle_surface_manager.cc
+++ b/shell/platform/windows/egl/manager.cc
@@ -2,82 +2,51 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/windows/angle_surface_manager.h"
+#include "flutter/shell/platform/windows/egl/manager.h"
 
 #include <vector>
 
 #include "flutter/fml/logging.h"
-
-// Logs an EGL error to stderr. This automatically calls eglGetError()
-// and logs the error code.
-static void LogEglError(std::string message) {
-  EGLint error = eglGetError();
-  FML_LOG(ERROR) << "EGL: " << message;
-  FML_LOG(ERROR) << "EGL: eglGetError returned " << error;
-}
+#include "flutter/shell/platform/windows/egl/egl.h"
 
 namespace flutter {
+namespace egl {
 
-int AngleSurfaceManager::instance_count_ = 0;
+int Manager::instance_count_ = 0;
 
-std::unique_ptr<AngleSurfaceManager> AngleSurfaceManager::Create() {
-  std::unique_ptr<AngleSurfaceManager> manager;
-  manager.reset(new AngleSurfaceManager());
-  if (!manager->initialize_succeeded_) {
+std::unique_ptr<Manager> Manager::Create(bool enable_impeller) {
+  std::unique_ptr<Manager> manager;
+  manager.reset(new Manager(enable_impeller));
+  if (!manager->IsValid()) {
     return nullptr;
   }
   return std::move(manager);
 }
 
-AngleSurfaceManager::AngleSurfaceManager()
-    : egl_config_(nullptr),
-      egl_display_(EGL_NO_DISPLAY),
-      egl_context_(EGL_NO_CONTEXT) {
-  initialize_succeeded_ = Initialize();
+Manager::Manager(bool enable_impeller) {
   ++instance_count_;
-}
-
-AngleSurfaceManager::~AngleSurfaceManager() {
-  CleanUp();
-  --instance_count_;
-}
 
-bool AngleSurfaceManager::InitializeEGL(
-    PFNEGLGETPLATFORMDISPLAYEXTPROC egl_get_platform_display_EXT,
-    const EGLint* config,
-    bool should_log) {
-  egl_display_ = egl_get_platform_display_EXT(EGL_PLATFORM_ANGLE_ANGLE,
-                                              EGL_DEFAULT_DISPLAY, config);
+  if (!InitializeDisplay()) {
+    return;
+  }
 
-  if (egl_display_ == EGL_NO_DISPLAY) {
-    if (should_log) {
-      LogEglError("Failed to get a compatible EGLdisplay");
-    }
-    return false;
+  if (!InitializeConfig(enable_impeller)) {
+    return;
   }
 
-  if (eglInitialize(egl_display_, nullptr, nullptr) == EGL_FALSE) {
-    if (should_log) {
-      LogEglError("Failed to initialize EGL via ANGLE");
-    }
-    return false;
+  if (!InitializeContexts()) {
+    return;
   }
 
-  return true;
+  is_valid_ = true;
 }
 
-bool AngleSurfaceManager::Initialize() {
-  // TODO(dnfield): Enable MSAA here, see similar code in android_context_gl.cc
-  // Will need to plumb in argument from project bundle for sampling rate.
-  // https://github.com/flutter/flutter/issues/100392
-  const EGLint config_attributes[] = {EGL_RED_SIZE,   8, EGL_GREEN_SIZE,   8,
-                                      EGL_BLUE_SIZE,  8, EGL_ALPHA_SIZE,   8,
-                                      EGL_DEPTH_SIZE, 8, EGL_STENCIL_SIZE, 8,
-                                      EGL_NONE};
-
-  const EGLint display_context_attributes[] = {EGL_CONTEXT_CLIENT_VERSION, 2,
-                                               EGL_NONE};
+Manager::~Manager() {
+  CleanUp();
+  --instance_count_;
+}
 
+bool Manager::InitializeDisplay() {
   // These are preferred display attributes and request ANGLE's D3D11
   // renderer. eglInitialize will only succeed with these attributes if the
   // hardware supports D3D11 Feature Level 10_0+.
@@ -131,203 +100,228 @@ bool AngleSurfaceManager::Initialize() {
 
   PFNEGLGETPLATFORMDISPLAYEXTPROC egl_get_platform_display_EXT =
       reinterpret_cast<PFNEGLGETPLATFORMDISPLAYEXTPROC>(
-          eglGetProcAddress("eglGetPlatformDisplayEXT"));
+          ::eglGetProcAddress("eglGetPlatformDisplayEXT"));
   if (!egl_get_platform_display_EXT) {
-    LogEglError("eglGetPlatformDisplayEXT not available");
+    LogEGLError("eglGetPlatformDisplayEXT not available");
     return false;
   }
 
   // Attempt to initialize ANGLE's renderer in order of: D3D11, D3D11 Feature
   // Level 9_3 and finally D3D11 WARP.
   for (auto config : display_attributes_configs) {
-    bool should_log = (config == display_attributes_configs.back());
-    if (InitializeEGL(egl_get_platform_display_EXT, config, should_log)) {
-      break;
-    }
-  }
+    bool is_last = (config == display_attributes_configs.back());
 
-  EGLint numConfigs = 0;
-  if ((eglChooseConfig(egl_display_, config_attributes, &egl_config_, 1,
-                       &numConfigs) == EGL_FALSE) ||
-      (numConfigs == 0)) {
-    LogEglError("Failed to choose first context");
-    return false;
-  }
+    display_ = egl_get_platform_display_EXT(EGL_PLATFORM_ANGLE_ANGLE,
+                                            EGL_DEFAULT_DISPLAY, config);
 
-  egl_context_ = eglCreateContext(egl_display_, egl_config_, EGL_NO_CONTEXT,
-                                  display_context_attributes);
-  if (egl_context_ == EGL_NO_CONTEXT) {
-    LogEglError("Failed to create EGL context");
-    return false;
-  }
+    if (display_ == EGL_NO_DISPLAY) {
+      if (is_last) {
+        LogEGLError("Failed to get a compatible EGLdisplay");
+        return false;
+      }
 
-  egl_resource_context_ = eglCreateContext(
-      egl_display_, egl_config_, egl_context_, display_context_attributes);
+      // Try the next config.
+      continue;
+    }
 
-  if (egl_resource_context_ == EGL_NO_CONTEXT) {
-    LogEglError("Failed to create EGL resource context");
-    return false;
+    if (::eglInitialize(display_, nullptr, nullptr) == EGL_FALSE) {
+      if (is_last) {
+        LogEGLError("Failed to initialize EGL via ANGLE");
+        return false;
+      }
+
+      // Try the next config.
+      continue;
+    }
+
+    return true;
   }
 
-  return true;
+  FML_UNREACHABLE();
 }
 
-void AngleSurfaceManager::CleanUp() {
-  EGLBoolean result = EGL_FALSE;
+bool Manager::InitializeConfig(bool enable_impeller) {
+  const EGLint config_attributes[] = {EGL_RED_SIZE,   8, EGL_GREEN_SIZE,   8,
+                                      EGL_BLUE_SIZE,  8, EGL_ALPHA_SIZE,   8,
+                                      EGL_DEPTH_SIZE, 8, EGL_STENCIL_SIZE, 8,
+                                      EGL_NONE};
 
-  // Needs to be reset before destroying the EGLContext.
-  resolved_device_.Reset();
+  const EGLint impeller_config_attributes[] = {
+      EGL_RED_SIZE,       8, EGL_GREEN_SIZE, 8, EGL_BLUE_SIZE,    8,
+      EGL_ALPHA_SIZE,     8, EGL_DEPTH_SIZE, 0, EGL_STENCIL_SIZE, 8,
+      EGL_SAMPLE_BUFFERS, 1, EGL_SAMPLES,    4, EGL_NONE};
+  const EGLint impeller_config_attributes_no_msaa[] = {
+      EGL_RED_SIZE,   8, EGL_GREEN_SIZE, 8, EGL_BLUE_SIZE,    8,
+      EGL_ALPHA_SIZE, 8, EGL_DEPTH_SIZE, 0, EGL_STENCIL_SIZE, 8,
+      EGL_NONE};
+
+  EGLBoolean result;
+  EGLint num_config = 0;
+
+  if (enable_impeller) {
+    // First try the MSAA configuration.
+    result = ::eglChooseConfig(display_, impeller_config_attributes, &config_,
+                               1, &num_config);
+
+    if (result == EGL_TRUE && num_config > 0) {
+      return true;
+    }
 
-  if (egl_display_ != EGL_NO_DISPLAY && egl_context_ != EGL_NO_CONTEXT) {
-    result = eglDestroyContext(egl_display_, egl_context_);
-    egl_context_ = EGL_NO_CONTEXT;
+    // Next fall back to disabled MSAA.
+    result = ::eglChooseConfig(display_, impeller_config_attributes_no_msaa,
+                               &config_, 1, &num_config);
+    if (result == EGL_TRUE && num_config == 0) {
+      return true;
+    }
+  } else {
+    result = ::eglChooseConfig(display_, config_attributes, &config_, 1,
+                               &num_config);
 
-    if (result == EGL_FALSE) {
-      LogEglError("Failed to destroy context");
+    if (result == EGL_TRUE && num_config > 0) {
+      return true;
     }
   }
 
-  if (egl_display_ != EGL_NO_DISPLAY &&
-      egl_resource_context_ != EGL_NO_CONTEXT) {
-    result = eglDestroyContext(egl_display_, egl_resource_context_);
-    egl_resource_context_ = EGL_NO_CONTEXT;
+  LogEGLError("Failed to choose EGL config");
+  return false;
+}
 
-    if (result == EGL_FALSE) {
-      LogEglError("Failed to destroy resource context");
-    }
+bool Manager::InitializeContexts() {
+  const EGLint context_attributes[] = {EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE};
+
+  auto const render_context =
+      ::eglCreateContext(display_, config_, EGL_NO_CONTEXT, context_attributes);
+  if (render_context == EGL_NO_CONTEXT) {
+    LogEGLError("Failed to create EGL render context");
+    return false;
   }
 
-  if (egl_display_ != EGL_NO_DISPLAY) {
-    // Display is reused between instances so only terminate display
-    // if destroying last instance
-    if (instance_count_ == 1) {
-      eglTerminate(egl_display_);
-    }
-    egl_display_ = EGL_NO_DISPLAY;
+  auto const resource_context =
+      ::eglCreateContext(display_, config_, render_context, context_attributes);
+  if (resource_context == EGL_NO_CONTEXT) {
+    LogEGLError("Failed to create EGL resource context");
+    return false;
   }
+
+  render_context_ = std::make_unique<Context>(display_, render_context);
+  resource_context_ = std::make_unique<Context>(display_, resource_context);
+  return true;
 }
 
-bool AngleSurfaceManager::CreateSurface(WindowsRenderTarget* render_target,
-                                        EGLint width,
-                                        EGLint height) {
-  if (!render_target || !initialize_succeeded_) {
+bool Manager::InitializeDevice() {
+  const auto query_display_attrib_EXT =
+      reinterpret_cast<PFNEGLQUERYDISPLAYATTRIBEXTPROC>(
+          ::eglGetProcAddress("eglQueryDisplayAttribEXT"));
+  const auto query_device_attrib_EXT =
+      reinterpret_cast<PFNEGLQUERYDEVICEATTRIBEXTPROC>(
+          ::eglGetProcAddress("eglQueryDeviceAttribEXT"));
+
+  if (query_display_attrib_EXT == nullptr ||
+      query_device_attrib_EXT == nullptr) {
     return false;
   }
 
-  EGLSurface surface = EGL_NO_SURFACE;
+  EGLAttrib egl_device = 0;
+  EGLAttrib angle_device = 0;
 
-  const EGLint surfaceAttributes[] = {
-      EGL_FIXED_SIZE_ANGLE, EGL_TRUE, EGL_WIDTH, width,
-      EGL_HEIGHT,           height,   EGL_NONE};
+  auto result = query_display_attrib_EXT(display_, EGL_DEVICE_EXT, &egl_device);
+  if (result != EGL_TRUE) {
+    return false;
+  }
 
-  surface = eglCreateWindowSurface(
-      egl_display_, egl_config_,
-      static_cast<EGLNativeWindowType>(std::get<HWND>(*render_target)),
-      surfaceAttributes);
-  if (surface == EGL_NO_SURFACE) {
-    LogEglError("Surface creation failed.");
+  result = query_device_attrib_EXT(reinterpret_cast<EGLDeviceEXT>(egl_device),
+                                   EGL_D3D11_DEVICE_ANGLE, &angle_device);
+  if (result != EGL_TRUE) {
+    return false;
   }
 
-  surface_width_ = width;
-  surface_height_ = height;
-  render_surface_ = surface;
+  resolved_device_ = reinterpret_cast<ID3D11Device*>(angle_device);
   return true;
 }
 
-void AngleSurfaceManager::ResizeSurface(WindowsRenderTarget* render_target,
-                                        EGLint width,
-                                        EGLint height) {
-  EGLint existing_width, existing_height;
-  GetSurfaceDimensions(&existing_width, &existing_height);
-  if (width != existing_width || height != existing_height) {
-    surface_width_ = width;
-    surface_height_ = height;
-
-    ClearContext();
-    DestroySurface();
-    if (!CreateSurface(render_target, width, height)) {
-      FML_LOG(ERROR)
-          << "AngleSurfaceManager::ResizeSurface failed to create surface";
-    }
-  }
-}
+void Manager::CleanUp() {
+  EGLBoolean result = EGL_FALSE;
 
-void AngleSurfaceManager::GetSurfaceDimensions(EGLint* width, EGLint* height) {
-  if (render_surface_ == EGL_NO_SURFACE || !initialize_succeeded_) {
-    *width = 0;
-    *height = 0;
-    return;
-  }
+  // Needs to be reset before destroying the contexts.
+  resolved_device_.Reset();
 
-  // Can't use eglQuerySurface here; Because we're not using
-  // EGL_FIXED_SIZE_ANGLE flag anymore, Angle may resize the surface before
-  // Flutter asks it to, which breaks resize redraw synchronization
-  *width = surface_width_;
-  *height = surface_height_;
-}
+  // Needs to be reset before destroying the EGLDisplay.
+  render_context_.reset();
+  resource_context_.reset();
 
-void AngleSurfaceManager::DestroySurface() {
-  if (egl_display_ != EGL_NO_DISPLAY && render_surface_ != EGL_NO_SURFACE) {
-    eglDestroySurface(egl_display_, render_surface_);
+  if (display_ != EGL_NO_DISPLAY) {
+    // Display is reused between instances so only terminate display
+    // if destroying last instance
+    if (instance_count_ == 1) {
+      ::eglTerminate(display_);
+    }
+    display_ = EGL_NO_DISPLAY;
   }
-  render_surface_ = EGL_NO_SURFACE;
 }
 
-bool AngleSurfaceManager::MakeCurrent() {
-  return (eglMakeCurrent(egl_display_, render_surface_, render_surface_,
-                         egl_context_) == EGL_TRUE);
+bool Manager::IsValid() const {
+  return is_valid_;
 }
 
-bool AngleSurfaceManager::ClearContext() {
-  return (eglMakeCurrent(egl_display_, nullptr, nullptr, egl_context_) ==
-          EGL_TRUE);
-}
+std::unique_ptr<WindowSurface> Manager::CreateWindowSurface(HWND hwnd,
+                                                            size_t width,
+                                                            size_t height) {
+  if (!hwnd || !is_valid_) {
+    return nullptr;
+  }
+
+  // Disable ANGLE's automatic surface resizing and provide an explicit size.
+  // The surface will need to be destroyed and re-created if the HWND is
+  // resized.
+  const EGLint surface_attributes[] = {EGL_FIXED_SIZE_ANGLE,
+                                       EGL_TRUE,
+                                       EGL_WIDTH,
+                                       static_cast<EGLint>(width),
+                                       EGL_HEIGHT,
+                                       static_cast<EGLint>(height),
+                                       EGL_NONE};
+
+  auto const surface = ::eglCreateWindowSurface(
+      display_, config_, static_cast<EGLNativeWindowType>(hwnd),
+      surface_attributes);
+  if (surface == EGL_NO_SURFACE) {
+    LogEGLError("Surface creation failed.");
+    return nullptr;
+  }
 
-bool AngleSurfaceManager::MakeResourceCurrent() {
-  return (eglMakeCurrent(egl_display_, EGL_NO_SURFACE, EGL_NO_SURFACE,
-                         egl_resource_context_) == EGL_TRUE);
+  return std::make_unique<WindowSurface>(display_, render_context_->GetHandle(),
+                                         surface, width, height);
 }
 
-EGLBoolean AngleSurfaceManager::SwapBuffers() {
-  return (eglSwapBuffers(egl_display_, render_surface_));
+bool Manager::HasContextCurrent() {
+  return ::eglGetCurrentContext() != EGL_NO_CONTEXT;
 }
 
-EGLSurface AngleSurfaceManager::CreateSurfaceFromHandle(
-    EGLenum handle_type,
-    EGLClientBuffer handle,
-    const EGLint* attributes) const {
-  return eglCreatePbufferFromClientBuffer(egl_display_, handle_type, handle,
-                                          egl_config_, attributes);
+EGLSurface Manager::CreateSurfaceFromHandle(EGLenum handle_type,
+                                            EGLClientBuffer handle,
+                                            const EGLint* attributes) const {
+  return ::eglCreatePbufferFromClientBuffer(display_, handle_type, handle,
+                                            config_, attributes);
 }
 
-bool AngleSurfaceManager::GetDevice(ID3D11Device** device) {
+bool Manager::GetDevice(ID3D11Device** device) {
   if (!resolved_device_) {
-    PFNEGLQUERYDISPLAYATTRIBEXTPROC egl_query_display_attrib_EXT =
-        reinterpret_cast<PFNEGLQUERYDISPLAYATTRIBEXTPROC>(
-            eglGetProcAddress("eglQueryDisplayAttribEXT"));
-
-    PFNEGLQUERYDEVICEATTRIBEXTPROC egl_query_device_attrib_EXT =
-        reinterpret_cast<PFNEGLQUERYDEVICEATTRIBEXTPROC>(
-            eglGetProcAddress("eglQueryDeviceAttribEXT"));
-
-    if (!egl_query_display_attrib_EXT || !egl_query_device_attrib_EXT) {
+    if (!InitializeDevice()) {
       return false;
     }
-
-    EGLAttrib egl_device = 0;
-    EGLAttrib angle_device = 0;
-    if (egl_query_display_attrib_EXT(egl_display_, EGL_DEVICE_EXT,
-                                     &egl_device) == EGL_TRUE) {
-      if (egl_query_device_attrib_EXT(
-              reinterpret_cast<EGLDeviceEXT>(egl_device),
-              EGL_D3D11_DEVICE_ANGLE, &angle_device) == EGL_TRUE) {
-        resolved_device_ = reinterpret_cast<ID3D11Device*>(angle_device);
-      }
-    }
   }
 
   resolved_device_.CopyTo(device);
   return (resolved_device_ != nullptr);
 }
 
+Context* Manager::render_context() const {
+  return render_context_.get();
+}
+
+Context* Manager::resource_context() const {
+  return resource_context_.get();
+}
+
+}  // namespace egl
 }  // namespace flutter
diff --git a/shell/platform/windows/egl/manager.h b/shell/platform/windows/egl/manager.h
new file mode 100644
index 0000000000000000000000000000000000000000..4ef289549d9efb12e0d807cfec7d2124e96573b2
--- /dev/null
+++ b/shell/platform/windows/egl/manager.h
@@ -0,0 +1,121 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_EGL_MANAGER_H_
+#define FLUTTER_SHELL_PLATFORM_WINDOWS_EGL_MANAGER_H_
+
+// OpenGL ES and EGL includes
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+#include <EGL/eglplatform.h>
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+
+// Windows platform specific includes
+#include <d3d11.h>
+#include <windows.h>
+#include <wrl/client.h>
+#include <memory>
+
+#include "flutter/fml/macros.h"
+#include "flutter/shell/platform/windows/egl/context.h"
+#include "flutter/shell/platform/windows/egl/surface.h"
+#include "flutter/shell/platform/windows/egl/window_surface.h"
+
+namespace flutter {
+namespace egl {
+
+// A manager for initializing ANGLE correctly and using it to create and
+// destroy surfaces
+class Manager {
+ public:
+  static std::unique_ptr<Manager> Create(bool enable_impeller);
+
+  virtual ~Manager();
+
+  // Whether the manager is currently valid.
+  bool IsValid() const;
+
+  // Creates an EGL surface that can be used to render a Flutter view into a
+  // win32 HWND.
+  //
+  // After the surface is created, |WindowSurface::SetVSyncEnabled| should be
+  // called on a thread that can make the surface current.
+  //
+  // HWND is the window backing the surface. Width and height are the surface's
+  // physical pixel dimensions.
+  //
+  // Returns nullptr on failure.
+  virtual std::unique_ptr<WindowSurface> CreateWindowSurface(HWND hwnd,
+                                                             size_t width,
+                                                             size_t height);
+
+  // Check if the current thread has a context bound.
+  bool HasContextCurrent();
+
+  // Creates a |EGLSurface| from the provided handle.
+  EGLSurface CreateSurfaceFromHandle(EGLenum handle_type,
+                                     EGLClientBuffer handle,
+                                     const EGLint* attributes) const;
+
+  // Gets the |EGLDisplay|.
+  EGLDisplay egl_display() const { return display_; };
+
+  // Gets the |ID3D11Device| chosen by ANGLE.
+  bool GetDevice(ID3D11Device** device);
+
+  // Get the EGL context used to render Flutter views.
+  virtual Context* render_context() const;
+
+  // Get the EGL context used for async texture uploads.
+  virtual Context* resource_context() const;
+
+ protected:
+  // Creates a new surface manager retaining reference to the passed-in target
+  // for the lifetime of the manager.
+  explicit Manager(bool enable_impeller);
+
+ private:
+  // Number of active instances of Manager
+  static int instance_count_;
+
+  // Initialize the EGL display.
+  bool InitializeDisplay();
+
+  // Initialize the EGL configs.
+  bool InitializeConfig(bool enable_impeller);
+
+  // Initialize the EGL render and resource contexts.
+  bool InitializeContexts();
+
+  // Initialize the D3D11 device.
+  bool InitializeDevice();
+
+  void CleanUp();
+
+  // Whether the manager was initialized successfully.
+  bool is_valid_ = false;
+
+  // EGL representation of native display.
+  EGLDisplay display_ = EGL_NO_DISPLAY;
+
+  // EGL framebuffer configuration.
+  EGLConfig config_ = nullptr;
+
+  // The EGL context used to render Flutter views.
+  std::unique_ptr<Context> render_context_;
+
+  // The EGL context used for async texture uploads.
+  std::unique_ptr<Context> resource_context_;
+
+  // The current D3D device.
+  Microsoft::WRL::ComPtr<ID3D11Device> resolved_device_ = nullptr;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(Manager);
+};
+
+}  // namespace egl
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_EGL_MANAGER_H_
diff --git a/shell/platform/windows/egl/proc_table.cc b/shell/platform/windows/egl/proc_table.cc
new file mode 100644
index 0000000000000000000000000000000000000000..057b09bca25ab4dc088925002b6f44763fadd80a
--- /dev/null
+++ b/shell/platform/windows/egl/proc_table.cc
@@ -0,0 +1,68 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/platform/windows/egl/proc_table.h"
+
+#include <EGL/egl.h>
+
+namespace flutter {
+namespace egl {
+
+std::shared_ptr<ProcTable> ProcTable::Create() {
+  auto gl = std::shared_ptr<ProcTable>(new ProcTable());
+
+  gl->gen_textures_ =
+      reinterpret_cast<GenTexturesProc>(::eglGetProcAddress("glGenTextures"));
+  gl->delete_textures_ = reinterpret_cast<DeleteTexturesProc>(
+      ::eglGetProcAddress("glDeleteTextures"));
+  gl->bind_texture_ =
+      reinterpret_cast<BindTextureProc>(::eglGetProcAddress("glBindTexture"));
+  gl->tex_parameteri_ = reinterpret_cast<TexParameteriProc>(
+      ::eglGetProcAddress("glTexParameteri"));
+  gl->tex_image_2d_ =
+      reinterpret_cast<TexImage2DProc>(::eglGetProcAddress("glTexImage2D"));
+
+  if (!gl->gen_textures_ || !gl->delete_textures_ || !gl->bind_texture_ ||
+      !gl->tex_parameteri_ || !gl->tex_image_2d_) {
+    return nullptr;
+  }
+
+  return gl;
+}
+
+ProcTable::ProcTable() = default;
+
+ProcTable::~ProcTable() = default;
+
+void ProcTable::GenTextures(GLsizei n, GLuint* textures) const {
+  gen_textures_(n, textures);
+}
+
+void ProcTable::DeleteTextures(GLsizei n, const GLuint* textures) const {
+  delete_textures_(n, textures);
+}
+
+void ProcTable::BindTexture(GLenum target, GLuint texture) const {
+  bind_texture_(target, texture);
+}
+
+void ProcTable::TexParameteri(GLenum target, GLenum pname, GLint param) const {
+  tex_parameteri_(target, pname, param);
+}
+
+void ProcTable::TexImage2D(GLenum target,
+                           GLint level,
+                           GLint internalformat,
+                           GLsizei width,
+                           GLsizei height,
+                           GLint border,
+                           GLenum format,
+                           GLenum type,
+                           const void* data) const {
+  tex_image_2d_(target, level, internalformat, width, height, border, format,
+                type, data);
+}
+
+}  // namespace egl
+}  // namespace flutter
diff --git a/shell/platform/windows/egl/proc_table.h b/shell/platform/windows/egl/proc_table.h
new file mode 100644
index 0000000000000000000000000000000000000000..26a177a0e91caf4e557b31ed24914b2074bd54fd
--- /dev/null
+++ b/shell/platform/windows/egl/proc_table.h
@@ -0,0 +1,72 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_EGL_PROC_TABLE_H_
+#define FLUTTER_SHELL_PLATFORM_WINDOWS_EGL_PROC_TABLE_H_
+
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+#include <functional>
+#include <memory>
+
+#include "flutter/fml/macros.h"
+
+namespace flutter {
+namespace egl {
+
+// Lookup table for GLES functions.
+class ProcTable {
+ public:
+  static std::shared_ptr<ProcTable> Create();
+
+  virtual ~ProcTable();
+
+  virtual void GenTextures(GLsizei n, GLuint* textures) const;
+  virtual void DeleteTextures(GLsizei n, const GLuint* textures) const;
+  virtual void BindTexture(GLenum target, GLuint texture) const;
+  virtual void TexParameteri(GLenum target, GLenum pname, GLint param) const;
+  virtual void TexImage2D(GLenum target,
+                          GLint level,
+                          GLint internalformat,
+                          GLsizei width,
+                          GLsizei height,
+                          GLint border,
+                          GLenum format,
+                          GLenum type,
+                          const void* data) const;
+
+ protected:
+  ProcTable();
+
+ private:
+  using GenTexturesProc = void(__stdcall*)(GLsizei n, GLuint* textures);
+  using DeleteTexturesProc = void(__stdcall*)(GLsizei n,
+                                              const GLuint* textures);
+  using BindTextureProc = void(__stdcall*)(GLenum target, GLuint texture);
+  using TexParameteriProc = void(__stdcall*)(GLenum target,
+                                             GLenum pname,
+                                             GLint param);
+  using TexImage2DProc = void(__stdcall*)(GLenum target,
+                                          GLint level,
+                                          GLint internalformat,
+                                          GLsizei width,
+                                          GLsizei height,
+                                          GLint border,
+                                          GLenum format,
+                                          GLenum type,
+                                          const void* data);
+
+  GenTexturesProc gen_textures_;
+  DeleteTexturesProc delete_textures_;
+  BindTextureProc bind_texture_;
+  TexParameteriProc tex_parameteri_;
+  TexImage2DProc tex_image_2d_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(ProcTable);
+};
+
+}  // namespace egl
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_EGL_PROC_TABLE_H_
diff --git a/shell/platform/windows/egl/surface.cc b/shell/platform/windows/egl/surface.cc
new file mode 100644
index 0000000000000000000000000000000000000000..f6534a913a0edc0a7a2b1d39b43bb42717c4cb73
--- /dev/null
+++ b/shell/platform/windows/egl/surface.cc
@@ -0,0 +1,73 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/platform/windows/egl/surface.h"
+
+#include "flutter/shell/platform/windows/egl/egl.h"
+
+namespace flutter {
+namespace egl {
+
+Surface::Surface(EGLDisplay display, EGLContext context, EGLSurface surface)
+    : display_(display), context_(context), surface_(surface) {}
+
+Surface::~Surface() {
+  Destroy();
+}
+
+bool Surface::IsValid() const {
+  return is_valid_;
+}
+
+bool Surface::Destroy() {
+  if (surface_ != EGL_NO_SURFACE) {
+    // Ensure the surface is not current before destroying it.
+    if (::eglMakeCurrent(display_, EGL_NO_SURFACE, EGL_NO_SURFACE,
+                         EGL_NO_CONTEXT) != EGL_TRUE) {
+      WINDOWS_LOG_EGL_ERROR;
+      return false;
+    }
+
+    if (::eglDestroySurface(display_, surface_) != EGL_TRUE) {
+      WINDOWS_LOG_EGL_ERROR;
+      return false;
+    }
+  }
+
+  is_valid_ = false;
+  surface_ = EGL_NO_SURFACE;
+  return true;
+}
+
+bool Surface::IsCurrent() const {
+  return display_ == ::eglGetCurrentDisplay() &&
+         surface_ == ::eglGetCurrentSurface(EGL_DRAW) &&
+         surface_ == ::eglGetCurrentSurface(EGL_READ) &&
+         context_ == ::eglGetCurrentContext();
+}
+
+bool Surface::MakeCurrent() const {
+  if (::eglMakeCurrent(display_, surface_, surface_, context_) != EGL_TRUE) {
+    WINDOWS_LOG_EGL_ERROR;
+    return false;
+  }
+
+  return true;
+}
+
+bool Surface::SwapBuffers() const {
+  if (::eglSwapBuffers(display_, surface_) != EGL_TRUE) {
+    WINDOWS_LOG_EGL_ERROR;
+    return false;
+  }
+
+  return true;
+}
+
+const EGLSurface& Surface::GetHandle() const {
+  return surface_;
+}
+
+}  // namespace egl
+}  // namespace flutter
diff --git a/shell/platform/windows/egl/surface.h b/shell/platform/windows/egl/surface.h
new file mode 100644
index 0000000000000000000000000000000000000000..6f1b107bd6852aa845f7fcb20a7ff21137cf201b
--- /dev/null
+++ b/shell/platform/windows/egl/surface.h
@@ -0,0 +1,60 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_EGL_SURFACE_H_
+#define FLUTTER_SHELL_PLATFORM_WINDOWS_EGL_SURFACE_H_
+
+#include <EGL/egl.h>
+
+#include "flutter/fml/macros.h"
+
+namespace flutter {
+namespace egl {
+
+// An EGL surface. This can be window surface or an off-screen buffer.
+//
+// This enables automatic error logging and mocking.
+class Surface {
+ public:
+  Surface(EGLDisplay display, EGLContext context, EGLSurface surface);
+
+  virtual ~Surface();
+
+  // Destroy the EGL surface and invalidate this object.
+  //
+  // This also unbinds the current context from the thread.
+  virtual bool Destroy();
+
+  // Check whether the EGL surface is valid.
+  virtual bool IsValid() const;
+
+  // Check whether the EGL display, context, and surface are bound
+  // to the current thread.
+  virtual bool IsCurrent() const;
+
+  // Bind the EGL surface's context and read and draw surfaces to the
+  // current thread. Returns true on success.
+  virtual bool MakeCurrent() const;
+
+  // Swap the surface's front the and back buffers. Used to present content.
+  // Returns true on success.
+  virtual bool SwapBuffers() const;
+
+  // Get the raw EGL surface.
+  virtual const EGLSurface& GetHandle() const;
+
+ protected:
+  bool is_valid_ = true;
+
+  EGLDisplay display_ = EGL_NO_DISPLAY;
+  EGLContext context_ = EGL_NO_CONTEXT;
+  EGLSurface surface_ = EGL_NO_SURFACE;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(Surface);
+};
+
+}  // namespace egl
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_EGL_SURFACE_H_
diff --git a/shell/platform/windows/egl/window_surface.cc b/shell/platform/windows/egl/window_surface.cc
new file mode 100644
index 0000000000000000000000000000000000000000..f688c2774a590aed3028d72785bbc53c01e20c72
--- /dev/null
+++ b/shell/platform/windows/egl/window_surface.cc
@@ -0,0 +1,45 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/platform/windows/egl/window_surface.h"
+
+#include "flutter/fml/logging.h"
+#include "flutter/shell/platform/windows/egl/egl.h"
+
+namespace flutter {
+namespace egl {
+
+WindowSurface::WindowSurface(EGLDisplay display,
+                             EGLContext context,
+                             EGLSurface surface,
+                             size_t width,
+                             size_t height)
+    : Surface(display, context, surface), width_(width), height_(height) {}
+
+bool WindowSurface::SetVSyncEnabled(bool enabled) {
+  FML_DCHECK(IsCurrent());
+
+  if (::eglSwapInterval(display_, enabled ? 1 : 0) != EGL_TRUE) {
+    WINDOWS_LOG_EGL_ERROR;
+    return false;
+  }
+
+  vsync_enabled_ = enabled;
+  return true;
+}
+
+size_t WindowSurface::width() const {
+  return width_;
+}
+
+size_t WindowSurface::height() const {
+  return height_;
+}
+
+bool WindowSurface::vsync_enabled() const {
+  return vsync_enabled_;
+}
+
+}  // namespace egl
+}  // namespace flutter
diff --git a/shell/platform/windows/egl/window_surface.h b/shell/platform/windows/egl/window_surface.h
new file mode 100644
index 0000000000000000000000000000000000000000..658e476e4f98625ec23667dc2bd098b3a7b55546
--- /dev/null
+++ b/shell/platform/windows/egl/window_surface.h
@@ -0,0 +1,55 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_EGL_WINDOW_SURFACE_H_
+#define FLUTTER_SHELL_PLATFORM_WINDOWS_EGL_WINDOW_SURFACE_H_
+
+#include <EGL/egl.h>
+
+#include "flutter/fml/macros.h"
+#include "flutter/shell/platform/windows/egl/surface.h"
+
+namespace flutter {
+namespace egl {
+
+// An EGL surface used to render a Flutter view to a win32 HWND.
+//
+// This enables automatic error logging and mocking.
+class WindowSurface : public Surface {
+ public:
+  WindowSurface(EGLDisplay display,
+                EGLContext context,
+                EGLSurface surface,
+                size_t width,
+                size_t height);
+
+  // If enabled, makes the surface's buffer swaps block until the v-blank.
+  //
+  // If disabled, allows one thread to swap multiple buffers per v-blank
+  // but can result in screen tearing if the system compositor is disabled.
+  //
+  // The surface must be current before calling this.
+  virtual bool SetVSyncEnabled(bool enabled);
+
+  // Get the surface's width in physical pixels.
+  virtual size_t width() const;
+
+  // Get the surface's height in physical pixels.
+  virtual size_t height() const;
+
+  // Get whether the surface's buffer swap blocks until the v-blank.
+  virtual bool vsync_enabled() const;
+
+ private:
+  size_t width_ = 0;
+  size_t height_ = 0;
+  bool vsync_enabled_ = true;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(WindowSurface);
+};
+
+}  // namespace egl
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_EGL_WINDOW_SURFACE_H_
diff --git a/shell/platform/windows/event_watcher.h b/shell/platform/windows/event_watcher.h
index b69ecb1d9d1531f5e9514c3c93d0ac1f0e7a47fd..ad26c555790b949efc93316702875a47bf16b8da 100644
--- a/shell/platform/windows/event_watcher.h
+++ b/shell/platform/windows/event_watcher.h
@@ -2,13 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_EVENT_WATCHER_WIN32_H_
-#define FLUTTER_SHELL_PLATFORM_WINDOWS_EVENT_WATCHER_WIN32_H_
+#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_EVENT_WATCHER_H_
+#define FLUTTER_SHELL_PLATFORM_WINDOWS_EVENT_WATCHER_H_
 
 #include <Windows.h>
 
 #include <functional>
 
+#include "flutter/fml/macros.h"
+
 namespace flutter {
 
 // A win32 `HANDLE` wrapper for use as a one-time callback.
@@ -28,10 +30,9 @@ class EventWatcher {
   HANDLE handle_;
   HANDLE handle_for_wait_;
 
-  EventWatcher(const EventWatcher&) = delete;
-  EventWatcher& operator=(const EventWatcher&) = delete;
+  FML_DISALLOW_COPY_AND_ASSIGN(EventWatcher);
 };
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_EVENT_WATCHER_WIN32_H_
+#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_EVENT_WATCHER_H_
diff --git a/shell/platform/windows/external_texture.h b/shell/platform/windows/external_texture.h
index be51f0bdf64870263cad1e770b3c0fb09dd4e38b..26e9287edd43d6e6b62b43553befa6f6b100c9fd 100644
--- a/shell/platform/windows/external_texture.h
+++ b/shell/platform/windows/external_texture.h
@@ -12,30 +12,6 @@
 
 namespace flutter {
 
-typedef void (*glGenTexturesProc)(GLsizei n, GLuint* textures);
-typedef void (*glDeleteTexturesProc)(GLsizei n, const GLuint* textures);
-typedef void (*glBindTextureProc)(GLenum target, GLuint texture);
-typedef void (*glTexParameteriProc)(GLenum target, GLenum pname, GLint param);
-typedef void (*glTexImage2DProc)(GLenum target,
-                                 GLint level,
-                                 GLint internalformat,
-                                 GLsizei width,
-                                 GLsizei height,
-                                 GLint border,
-                                 GLenum format,
-                                 GLenum type,
-                                 const void* data);
-
-// A struct containing pointers to resolved gl* functions.
-struct GlProcs {
-  glGenTexturesProc glGenTextures;
-  glDeleteTexturesProc glDeleteTextures;
-  glBindTextureProc glBindTexture;
-  glTexParameteriProc glTexParameteri;
-  glTexImage2DProc glTexImage2D;
-  bool valid;
-};
-
 // Abstract external texture.
 class ExternalTexture {
  public:
diff --git a/shell/platform/windows/external_texture_d3d.cc b/shell/platform/windows/external_texture_d3d.cc
index 7e5a84b6d5c26e9794726be73d6ec1d2bc5a837c..d09ed3fc07a75e2267fc6425c97a4a03d08aa734 100644
--- a/shell/platform/windows/external_texture_d3d.cc
+++ b/shell/platform/windows/external_texture_d3d.cc
@@ -13,19 +13,19 @@ ExternalTextureD3d::ExternalTextureD3d(
     FlutterDesktopGpuSurfaceType type,
     const FlutterDesktopGpuSurfaceTextureCallback texture_callback,
     void* user_data,
-    const AngleSurfaceManager* surface_manager,
-    const GlProcs& gl_procs)
+    const egl::Manager* egl_manager,
+    std::shared_ptr<egl::ProcTable> gl)
     : type_(type),
       texture_callback_(texture_callback),
       user_data_(user_data),
-      surface_manager_(surface_manager),
-      gl_(gl_procs) {}
+      egl_manager_(egl_manager),
+      gl_(std::move(gl)) {}
 
 ExternalTextureD3d::~ExternalTextureD3d() {
   ReleaseImage();
 
   if (gl_texture_ != 0) {
-    gl_.glDeleteTextures(1, &gl_texture_);
+    gl_->DeleteTextures(1, &gl_texture_);
   }
 }
 
@@ -53,9 +53,9 @@ bool ExternalTextureD3d::PopulateTexture(size_t width,
 
 void ExternalTextureD3d::ReleaseImage() {
   if (egl_surface_ != EGL_NO_SURFACE) {
-    eglReleaseTexImage(surface_manager_->egl_display(), egl_surface_,
+    eglReleaseTexImage(egl_manager_->egl_display(), egl_surface_,
                        EGL_BACK_BUFFER);
-    eglDestroySurface(surface_manager_->egl_display(), egl_surface_);
+    eglDestroySurface(egl_manager_->egl_display(), egl_surface_);
     egl_surface_ = EGL_NO_SURFACE;
   }
 }
@@ -69,15 +69,15 @@ bool ExternalTextureD3d::CreateOrUpdateTexture(
   }
 
   if (gl_texture_ == 0) {
-    gl_.glGenTextures(1, &gl_texture_);
+    gl_->GenTextures(1, &gl_texture_);
 
-    gl_.glBindTexture(GL_TEXTURE_2D, gl_texture_);
-    gl_.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    gl_.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    gl_.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    gl_.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    gl_->BindTexture(GL_TEXTURE_2D, gl_texture_);
+    gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
   } else {
-    gl_.glBindTexture(GL_TEXTURE_2D, gl_texture_);
+    gl_->BindTexture(GL_TEXTURE_2D, gl_texture_);
   }
 
   auto handle = SAFE_ACCESS(descriptor, handle, nullptr);
@@ -95,14 +95,14 @@ bool ExternalTextureD3d::CreateOrUpdateTexture(
         EGL_TEXTURE_RGBA,  // always EGL_TEXTURE_RGBA
         EGL_NONE};
 
-    egl_surface_ = surface_manager_->CreateSurfaceFromHandle(
+    egl_surface_ = egl_manager_->CreateSurfaceFromHandle(
         (type_ == kFlutterDesktopGpuSurfaceTypeD3d11Texture2D)
             ? EGL_D3D_TEXTURE_ANGLE
             : EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE,
         handle, attributes);
 
     if (egl_surface_ == EGL_NO_SURFACE ||
-        eglBindTexImage(surface_manager_->egl_display(), egl_surface_,
+        eglBindTexImage(egl_manager_->egl_display(), egl_surface_,
                         EGL_BACK_BUFFER) == EGL_FALSE) {
       FML_LOG(ERROR) << "Binding D3D surface failed.";
     }
diff --git a/shell/platform/windows/external_texture_d3d.h b/shell/platform/windows/external_texture_d3d.h
index 007484296a1a2b2b98de3caf51d613c44c258115..628c206503ef26b659ec3c6086a720dee1e77b7d 100644
--- a/shell/platform/windows/external_texture_d3d.h
+++ b/shell/platform/windows/external_texture_d3d.h
@@ -5,7 +5,12 @@
 #ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_EXTERNAL_TEXTURE_D3D_H_
 #define FLUTTER_SHELL_PLATFORM_WINDOWS_EXTERNAL_TEXTURE_D3D_H_
 
-#include "flutter/shell/platform/windows/angle_surface_manager.h"
+#include <memory>
+
+#include "flutter/fml/macros.h"
+#include "flutter/shell/platform/common/public/flutter_texture_registrar.h"
+#include "flutter/shell/platform/windows/egl/manager.h"
+#include "flutter/shell/platform/windows/egl/proc_table.h"
 #include "flutter/shell/platform/windows/external_texture.h"
 
 namespace flutter {
@@ -17,8 +22,8 @@ class ExternalTextureD3d : public ExternalTexture {
       FlutterDesktopGpuSurfaceType type,
       const FlutterDesktopGpuSurfaceTextureCallback texture_callback,
       void* user_data,
-      const AngleSurfaceManager* surface_manager,
-      const GlProcs& gl_procs);
+      const egl::Manager* egl_manager,
+      std::shared_ptr<egl::ProcTable> gl);
   virtual ~ExternalTextureD3d();
 
   // |ExternalTexture|
@@ -37,11 +42,13 @@ class ExternalTextureD3d : public ExternalTexture {
   FlutterDesktopGpuSurfaceType type_;
   const FlutterDesktopGpuSurfaceTextureCallback texture_callback_;
   void* const user_data_;
-  const AngleSurfaceManager* surface_manager_;
-  const GlProcs& gl_;
+  const egl::Manager* egl_manager_;
+  std::shared_ptr<egl::ProcTable> gl_;
   GLuint gl_texture_ = 0;
   EGLSurface egl_surface_ = EGL_NO_SURFACE;
   void* last_surface_handle_ = nullptr;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(ExternalTextureD3d);
 };
 
 }  // namespace flutter
diff --git a/shell/platform/windows/external_texture_pixelbuffer.cc b/shell/platform/windows/external_texture_pixelbuffer.cc
index 802eeef9e578cec0f2069649e04693c83943151d..cb41f7d137bd1f2982f0cde9c4e0f09fa85fb1a9 100644
--- a/shell/platform/windows/external_texture_pixelbuffer.cc
+++ b/shell/platform/windows/external_texture_pixelbuffer.cc
@@ -9,14 +9,14 @@ namespace flutter {
 ExternalTexturePixelBuffer::ExternalTexturePixelBuffer(
     const FlutterDesktopPixelBufferTextureCallback texture_callback,
     void* user_data,
-    const GlProcs& gl_procs)
+    std::shared_ptr<egl::ProcTable> gl)
     : texture_callback_(texture_callback),
       user_data_(user_data),
-      gl_(gl_procs) {}
+      gl_(std::move(gl)) {}
 
 ExternalTexturePixelBuffer::~ExternalTexturePixelBuffer() {
   if (gl_texture_ != 0) {
-    gl_.glDeleteTextures(1, &gl_texture_);
+    gl_->DeleteTextures(1, &gl_texture_);
   }
 }
 
@@ -51,20 +51,20 @@ bool ExternalTexturePixelBuffer::CopyPixelBuffer(size_t& width,
   height = pixel_buffer->height;
 
   if (gl_texture_ == 0) {
-    gl_.glGenTextures(1, &gl_texture_);
+    gl_->GenTextures(1, &gl_texture_);
 
-    gl_.glBindTexture(GL_TEXTURE_2D, gl_texture_);
-    gl_.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    gl_.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    gl_.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    gl_.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    gl_->BindTexture(GL_TEXTURE_2D, gl_texture_);
+    gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 
   } else {
-    gl_.glBindTexture(GL_TEXTURE_2D, gl_texture_);
+    gl_->BindTexture(GL_TEXTURE_2D, gl_texture_);
   }
-  gl_.glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, pixel_buffer->width,
-                   pixel_buffer->height, 0, GL_RGBA, GL_UNSIGNED_BYTE,
-                   pixel_buffer->buffer);
+  gl_->TexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, pixel_buffer->width,
+                  pixel_buffer->height, 0, GL_RGBA, GL_UNSIGNED_BYTE,
+                  pixel_buffer->buffer);
   if (pixel_buffer->release_callback) {
     pixel_buffer->release_callback(pixel_buffer->release_context);
   }
diff --git a/shell/platform/windows/external_texture_pixelbuffer.h b/shell/platform/windows/external_texture_pixelbuffer.h
index 3e5e101046d7fc996ad94839b4cdc874df4f1f4c..0bd31b49830872b09ba00c52f976782b741822ea 100644
--- a/shell/platform/windows/external_texture_pixelbuffer.h
+++ b/shell/platform/windows/external_texture_pixelbuffer.h
@@ -5,7 +5,9 @@
 #ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_EXTERNAL_TEXTURE_PIXELBUFFER_H_
 #define FLUTTER_SHELL_PLATFORM_WINDOWS_EXTERNAL_TEXTURE_PIXELBUFFER_H_
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/common/public/flutter_texture_registrar.h"
+#include "flutter/shell/platform/windows/egl/proc_table.h"
 #include "flutter/shell/platform/windows/external_texture.h"
 
 namespace flutter {
@@ -16,7 +18,7 @@ class ExternalTexturePixelBuffer : public ExternalTexture {
   ExternalTexturePixelBuffer(
       const FlutterDesktopPixelBufferTextureCallback texture_callback,
       void* user_data,
-      const GlProcs& gl_procs);
+      std::shared_ptr<egl::ProcTable> gl);
 
   virtual ~ExternalTexturePixelBuffer();
 
@@ -36,8 +38,10 @@ class ExternalTexturePixelBuffer : public ExternalTexture {
 
   const FlutterDesktopPixelBufferTextureCallback texture_callback_ = nullptr;
   void* const user_data_ = nullptr;
-  const GlProcs& gl_;
+  std::shared_ptr<egl::ProcTable> gl_;
   GLuint gl_texture_ = 0;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(ExternalTexturePixelBuffer);
 };
 
 }  // namespace flutter
diff --git a/shell/platform/windows/fixtures/main.dart b/shell/platform/windows/fixtures/main.dart
index 1e8d5a9e278cc5433fbc03f5cc0e2ec8b4d05b6e..5f3d61c9e0a26a18ea207bd7cdd0bc07f673b98f 100644
--- a/shell/platform/windows/fixtures/main.dart
+++ b/shell/platform/windows/fixtures/main.dart
@@ -4,8 +4,9 @@
 
 import 'dart:async';
 import 'dart:io' as io;
-import 'dart:typed_data' show ByteData, Uint8List;
+import 'dart:typed_data' show ByteData, Endian, Uint8List;
 import 'dart:ui' as ui;
+import 'dart:convert';
 
 // Signals a waiting latch in the native test.
 @pragma('vm:external-name', 'Signal')
@@ -42,48 +43,192 @@ void hiPlatformChannels() {
   });
 }
 
+/// Returns a future that completes when
+/// `PlatformDispatcher.instance.onSemanticsEnabledChanged` fires.
+Future<void> get semanticsChanged {
+  final Completer<void> semanticsChanged = Completer<void>();
+  ui.PlatformDispatcher.instance.onSemanticsEnabledChanged =
+      semanticsChanged.complete;
+  return semanticsChanged.future;
+}
+
 @pragma('vm:entry-point')
-void alertPlatformChannel() async {
-  // Serializers for data types are in the framework, so this will be hardcoded.
+void sendAccessibilityAnnouncement() async {
+  // Wait until semantics are enabled.
+  if (!ui.PlatformDispatcher.instance.semanticsEnabled) {
+    await semanticsChanged;
+  }
+
+  // Standard message codec magic number identifiers.
+  // See: https://github.com/flutter/flutter/blob/ee94fe262b63b0761e8e1f889ae52322fef068d2/packages/flutter/lib/src/services/message_codecs.dart#L262
   const int valueMap = 13, valueString = 7;
-  // Corresponds to:
-  // Map<String, Object> data =
-  // {"type": "announce", "data": {"message": ""}};
+
+  // Corresponds to: {"type": "announce", "data": {"message": "hello"}}
+  // See: https://github.com/flutter/flutter/blob/b781da9b5822de1461a769c3b245075359f5464d/packages/flutter/lib/src/semantics/semantics_event.dart#L86
   final Uint8List data = Uint8List.fromList([
-    valueMap, // _valueMap
-    2, // Size
-    // key: "type"
-    valueString,
-    'type'.length,
-    ...'type'.codeUnits,
-    // value: "announce"
-    valueString,
-    'announce'.length,
-    ...'announce'.codeUnits,
-    // key: "data"
-    valueString,
-    'data'.length,
-    ...'data'.codeUnits,
-    // value: map
-    valueMap, // _valueMap
-    1, // Size
-    // key: "message"
-    valueString,
-    'message'.length,
-    ...'message'.codeUnits,
-    // value: ""
-    valueString,
-    0, // Length of empty string == 0.
+    // Map with 2 entries
+    valueMap, 2,
+    // Map key: "type"
+    valueString, 'type'.length, ...'type'.codeUnits,
+    // Map value: "announce"
+    valueString, 'announce'.length, ...'announce'.codeUnits,
+    // Map key: "data"
+    valueString, 'data'.length, ...'data'.codeUnits,
+    // Map value: map with 1 entry
+    valueMap, 1,
+    // Map key: "message"
+    valueString, 'message'.length, ...'message'.codeUnits,
+    // Map value: "hello"
+    valueString, 'hello'.length, ...'hello'.codeUnits,
   ]);
   final ByteData byteData = data.buffer.asByteData();
 
-  final Completer<ByteData?> enabled = Completer<ByteData?>();
-  ui.PlatformDispatcher.instance.sendPlatformMessage('semantics', ByteData(0), (ByteData? reply){
-    enabled.complete(reply);
+  ui.PlatformDispatcher.instance.sendPlatformMessage(
+    'flutter/accessibility',
+    byteData,
+    (ByteData? _) => signal(),
+  );
+}
+
+@pragma('vm:entry-point')
+void sendAccessibilityTooltipEvent() async {
+  // Wait until semantics are enabled.
+  if (!ui.PlatformDispatcher.instance.semanticsEnabled) {
+    await semanticsChanged;
+  }
+
+  // Standard message codec magic number identifiers.
+  // See: https://github.com/flutter/flutter/blob/ee94fe262b63b0761e8e1f889ae52322fef068d2/packages/flutter/lib/src/services/message_codecs.dart#L262
+  const int valueMap = 13, valueString = 7;
+
+  // Corresponds to: {"type": "tooltip", "data": {"message": "hello"}}
+  // See: https://github.com/flutter/flutter/blob/b781da9b5822de1461a769c3b245075359f5464d/packages/flutter/lib/src/semantics/semantics_event.dart#L120
+  final Uint8List data = Uint8List.fromList([
+    // Map with 2 entries
+    valueMap, 2,
+    // Map key: "type"
+    valueString, 'type'.length, ...'type'.codeUnits,
+    // Map value: "tooltip"
+    valueString, 'tooltip'.length, ...'tooltip'.codeUnits,
+    // Map key: "data"
+    valueString, 'data'.length, ...'data'.codeUnits,
+    // Map value: map with 1 entry
+    valueMap, 1,
+    // Map key: "message"
+    valueString, 'message'.length, ...'message'.codeUnits,
+    // Map value: "hello"
+    valueString, 'hello'.length, ...'hello'.codeUnits,
+  ]);
+  final ByteData byteData = data.buffer.asByteData();
+
+  ui.PlatformDispatcher.instance.sendPlatformMessage(
+    'flutter/accessibility',
+    byteData,
+    (ByteData? _) => signal(),
+  );
+}
+
+@pragma('vm:entry-point')
+void exitTestExit() async {
+  final Completer<ByteData?> closed = Completer<ByteData?>();
+  ui.channelBuffers.setListener('flutter/platform', (ByteData? data, ui.PlatformMessageResponseCallback callback) async {
+    final String jsonString = json.encode(<Map<String, String>>[{'response': 'exit'}]);
+    final ByteData responseData = ByteData.sublistView(utf8.encode(jsonString));
+    callback(responseData);
+    closed.complete(data);
+  });
+  await closed.future;
+}
+
+@pragma('vm:entry-point')
+void exitTestCancel() async {
+  final Completer<ByteData?> closed = Completer<ByteData?>();
+  ui.channelBuffers.setListener('flutter/platform', (ByteData? data, ui.PlatformMessageResponseCallback callback) async {
+    final String jsonString = json.encode(<Map<String, String>>[{'response': 'cancel'}]);
+    final ByteData responseData = ByteData.sublistView(utf8.encode(jsonString));
+    callback(responseData);
+    closed.complete(data);
   });
-  await enabled.future;
+  await closed.future;
+
+  // Because the request was canceled, the below shall execute.
+  final Completer<ByteData?> exited = Completer<ByteData?>();
+  final String jsonString = json.encode(<String, dynamic>{
+    'method': 'System.exitApplication',
+    'args': <String, dynamic>{
+      'type': 'required', 'exitCode': 0
+      }
+    });
+  ui.PlatformDispatcher.instance.sendPlatformMessage(
+    'flutter/platform',
+    ByteData.sublistView(utf8.encode(jsonString)),
+    (ByteData? reply) {
+      exited.complete(reply);
+    });
+  await exited.future;
+}
 
-  ui.PlatformDispatcher.instance.sendPlatformMessage('flutter/accessibility', byteData, (ByteData? _){});
+@pragma('vm:entry-point')
+void enableLifecycleTest() async {
+  final Completer<ByteData?> finished = Completer<ByteData?>();
+  ui.channelBuffers.setListener('flutter/lifecycle', (ByteData? data, ui.PlatformMessageResponseCallback callback) async {
+    if (data != null) {
+      ui.PlatformDispatcher.instance.sendPlatformMessage(
+        'flutter/unittest',
+        data,
+        (ByteData? reply) {
+          finished.complete();
+        });
+    }
+  });
+  await finished.future;
+}
+
+@pragma('vm:entry-point')
+void enableLifecycleToFrom() async {
+  ui.channelBuffers.setListener('flutter/lifecycle', (ByteData? data, ui.PlatformMessageResponseCallback callback) async {
+    if (data != null) {
+      ui.PlatformDispatcher.instance.sendPlatformMessage(
+        'flutter/unittest',
+        data,
+        (ByteData? reply) {});
+    }
+  });
+  final Completer<ByteData?> enabledLifecycle = Completer<ByteData?>();
+  ui.PlatformDispatcher.instance.sendPlatformMessage('flutter/platform', ByteData.sublistView(utf8.encode('{"method":"System.initializationComplete"}')), (ByteData? data) {
+    enabledLifecycle.complete(data);
+  });
+}
+
+@pragma('vm:entry-point')
+void sendCreatePlatformViewMethod() async {
+  // The platform view method channel uses the standard method codec.
+  // See https://github.com/flutter/flutter/blob/master/packages/flutter/lib/src/services/message_codecs.dart#L262
+  // for the implementation of the encoding and magic number identifiers.
+  const int valueString = 7;
+  const int valueMap = 13;
+  const int valueInt32 = 3;
+  const String method = 'create';
+  const String typeKey = 'viewType';
+  const String typeValue = 'type';
+  const String idKey = 'id';
+  final List<int> data = <int>[
+    // Method name
+    valueString, method.length, ...utf8.encode(method),
+    // Method arguments: {'type': 'type':, 'id': 0}
+    valueMap, 2,
+    valueString, typeKey.length, ...utf8.encode(typeKey),
+    valueString, typeValue.length, ...utf8.encode(typeValue),
+    valueString, idKey.length, ...utf8.encode(idKey),
+    valueInt32, 0, 0, 0, 0,
+  ];
+
+  final Completer<ByteData?> completed = Completer<ByteData?>();
+  final ByteData bytes = ByteData.sublistView(Uint8List.fromList(data));
+  ui.PlatformDispatcher.instance.sendPlatformMessage('flutter/platform_views', bytes, (ByteData? response) {
+    completed.complete(response);
+  });
+  await completed.future;
 }
 
 @pragma('vm:entry-point')
diff --git a/shell/platform/windows/flutter_desktop_messenger.h b/shell/platform/windows/flutter_desktop_messenger.h
index 8920068e511fe2d8a44fdeb611fffe135713976f..e201d56e40712f711c60b363349e4da462eaacf0 100644
--- a/shell/platform/windows/flutter_desktop_messenger.h
+++ b/shell/platform/windows/flutter_desktop_messenger.h
@@ -8,6 +8,7 @@
 #include <atomic>
 #include <mutex>
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/common/public/flutter_messenger.h"
 
 namespace flutter {
@@ -68,16 +69,15 @@ class FlutterDesktopMessenger {
   /// |FlutterDesktopMessenger| (ie |engine|).
   std::mutex& GetMutex() { return mutex_; }
 
-  FlutterDesktopMessenger(const FlutterDesktopMessenger& value) = delete;
-  FlutterDesktopMessenger& operator=(const FlutterDesktopMessenger& value) =
-      delete;
-
  private:
   // The engine that owns this state object.
   flutter::FlutterWindowsEngine* engine = nullptr;
   std::mutex mutex_;
   std::atomic<int32_t> ref_count_ = 0;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(FlutterDesktopMessenger);
 };
+
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_FLUTTER_WINDOW_STATE_H_
+#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_FLUTTER_DESKTOP_MESSENGER_H_
diff --git a/shell/platform/windows/flutter_key_map.g.cc b/shell/platform/windows/flutter_key_map.g.cc
index 2761edb50150e3cbde3162154746bef5f29b7e84..ccfa74b3d2791e3f8020e11a5806b3fabec90907 100644
--- a/shell/platform/windows/flutter_key_map.g.cc
+++ b/shell/platform/windows/flutter_key_map.g.cc
@@ -2,9 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_FLUTTER_KEY_MAP_H_
-#define FLUTTER_SHELL_PLATFORM_WINDOWS_FLUTTER_KEY_MAP_H_
-
 #include "flutter/shell/platform/windows/keyboard_key_embedder_handler.h"
 
 #include <map>
@@ -335,5 +332,3 @@ const uint64_t KeyboardKeyEmbedderHandler::unicodePlane = 0x00000000000;
 const uint64_t KeyboardKeyEmbedderHandler::windowsPlane = 0x01600000000;
 
 }  // namespace flutter
-
-#endif
diff --git a/shell/platform/windows/flutter_platform_node_delegate_windows.cc b/shell/platform/windows/flutter_platform_node_delegate_windows.cc
index 5f5ad62d4adcd00e3f25c95bd3c32b9ea585e861..56d8547b5d21f6646dc67cbd7154648f95e311d5 100644
--- a/shell/platform/windows/flutter_platform_node_delegate_windows.cc
+++ b/shell/platform/windows/flutter_platform_node_delegate_windows.cc
@@ -6,10 +6,12 @@
 
 #include "flutter/shell/platform/windows/flutter_platform_node_delegate_windows.h"
 
+#include "flutter/fml/logging.h"
 #include "flutter/shell/platform/windows/accessibility_bridge_windows.h"
 #include "flutter/shell/platform/windows/flutter_windows_view.h"
 #include "flutter/third_party/accessibility/ax/ax_clipping_behavior.h"
 #include "flutter/third_party/accessibility/ax/ax_coordinate_system.h"
+#include "flutter/third_party/accessibility/ax/platform/ax_fragment_root_win.h"
 
 namespace flutter {
 
@@ -17,8 +19,9 @@ FlutterPlatformNodeDelegateWindows::FlutterPlatformNodeDelegateWindows(
     std::weak_ptr<AccessibilityBridge> bridge,
     FlutterWindowsView* view)
     : bridge_(bridge), view_(view) {
-  assert(!bridge_.expired());
-  assert(view_);
+  FML_DCHECK(!bridge_.expired())
+      << "Expired AccessibilityBridge passed to node delegate";
+  FML_DCHECK(view_);
 }
 
 FlutterPlatformNodeDelegateWindows::~FlutterPlatformNodeDelegateWindows() {
@@ -32,13 +35,13 @@ void FlutterPlatformNodeDelegateWindows::Init(std::weak_ptr<OwnerBridge> bridge,
                                               ui::AXNode* node) {
   FlutterPlatformNodeDelegate::Init(bridge, node);
   ax_platform_node_ = ui::AXPlatformNode::Create(this);
-  assert(ax_platform_node_);
+  FML_DCHECK(ax_platform_node_) << "Failed to create AXPlatformNode";
 }
 
 // |ui::AXPlatformNodeDelegate|
 gfx::NativeViewAccessible
 FlutterPlatformNodeDelegateWindows::GetNativeViewAccessible() {
-  assert(ax_platform_node_);
+  FML_DCHECK(ax_platform_node_) << "AXPlatformNode hasn't been created";
   return ax_platform_node_->GetNativeViewAccessible();
 }
 
@@ -57,12 +60,13 @@ gfx::NativeViewAccessible FlutterPlatformNodeDelegateWindows::HitTestSync(
 
   // If any child in this node's subtree contains the point, return that child.
   auto bridge = bridge_.lock();
-  assert(bridge);
+  FML_DCHECK(bridge);
   for (const ui::AXNode* child : GetAXNode()->children()) {
     std::shared_ptr<FlutterPlatformNodeDelegateWindows> win_delegate =
         std::static_pointer_cast<FlutterPlatformNodeDelegateWindows>(
             bridge->GetFlutterPlatformNodeDelegateFromID(child->id()).lock());
-    assert(win_delegate);
+    FML_DCHECK(win_delegate)
+        << "No FlutterPlatformNodeDelegate found for node " << child->id();
     auto hit_view = win_delegate->HitTestSync(screen_physical_pixel_x,
                                               screen_physical_pixel_y);
     if (hit_view) {
@@ -83,21 +87,15 @@ gfx::Rect FlutterPlatformNodeDelegateWindows::GetBoundsRect(
       coordinate_system, clipping_behavior, offscreen_result);
   POINT origin{bounds.x(), bounds.y()};
   POINT extent{bounds.x() + bounds.width(), bounds.y() + bounds.height()};
-  ClientToScreen(view_->GetPlatformWindow(), &origin);
-  ClientToScreen(view_->GetPlatformWindow(), &extent);
+  ClientToScreen(view_->GetWindowHandle(), &origin);
+  ClientToScreen(view_->GetWindowHandle(), &extent);
   return gfx::Rect(origin.x, origin.y, extent.x - origin.x,
                    extent.y - origin.y);
 }
 
 void FlutterPlatformNodeDelegateWindows::DispatchWinAccessibilityEvent(
-    DWORD event_type) {
-  HWND hwnd = view_->GetPlatformWindow();
-  if (!hwnd) {
-    return;
-  }
-  assert(ax_platform_node_);
-  ::NotifyWinEvent(event_type, hwnd, OBJID_CLIENT,
-                   -ax_platform_node_->GetUniqueId());
+    ax::mojom::Event event_type) {
+  ax_platform_node_->NotifyAccessibilityEvent(event_type);
 }
 
 void FlutterPlatformNodeDelegateWindows::SetFocus() {
@@ -107,4 +105,14 @@ void FlutterPlatformNodeDelegateWindows::SetFocus() {
   GetNativeViewAccessible()->accSelect(SELFLAG_TAKEFOCUS, varchild);
 }
 
+gfx::AcceleratedWidget
+FlutterPlatformNodeDelegateWindows::GetTargetForNativeAccessibilityEvent() {
+  return view_->GetWindowHandle();
+}
+
+ui::AXPlatformNode* FlutterPlatformNodeDelegateWindows::GetPlatformNode()
+    const {
+  return ax_platform_node_;
+}
+
 }  // namespace flutter
diff --git a/shell/platform/windows/flutter_platform_node_delegate_windows.h b/shell/platform/windows/flutter_platform_node_delegate_windows.h
index 8bac155b9c14da4bfe26680dee7c762168fc261e..af40d6cc24240f0c2f24852d4f6e163d6d88967c 100644
--- a/shell/platform/windows/flutter_platform_node_delegate_windows.h
+++ b/shell/platform/windows/flutter_platform_node_delegate_windows.h
@@ -5,6 +5,7 @@
 #ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_FLUTTER_PLATFORM_NODE_DELEGATE_WINDOWS_H_
 #define FLUTTER_SHELL_PLATFORM_WINDOWS_FLUTTER_PLATFORM_NODE_DELEGATE_WINDOWS_H_
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/common/flutter_platform_node_delegate.h"
 #include "flutter/shell/platform/windows/flutter_windows_view.h"
 #include "flutter/third_party/accessibility/ax/platform/ax_platform_node.h"
@@ -42,16 +43,24 @@ class FlutterPlatformNodeDelegateWindows : public FlutterPlatformNodeDelegate {
   // Dispatches a Windows accessibility event of the specified type, generated
   // by the accessibility node associated with this object. This is a
   // convenience wrapper around |NotifyWinEvent|.
-  virtual void DispatchWinAccessibilityEvent(DWORD event_type);
+  virtual void DispatchWinAccessibilityEvent(ax::mojom::Event event_type);
 
   // Sets the accessibility focus to the accessibility node associated with
   // this object.
   void SetFocus();
 
+  // | AXPlatformNodeDelegate |
+  gfx::AcceleratedWidget GetTargetForNativeAccessibilityEvent() override;
+
+  // | FlutterPlatformNodeDelegate |
+  ui::AXPlatformNode* GetPlatformNode() const override;
+
  private:
   ui::AXPlatformNode* ax_platform_node_;
   std::weak_ptr<AccessibilityBridge> bridge_;
   FlutterWindowsView* view_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(FlutterPlatformNodeDelegateWindows);
 };
 
 }  // namespace flutter
diff --git a/shell/platform/windows/flutter_project_bundle.cc b/shell/platform/windows/flutter_project_bundle.cc
index df289b526a0f4463969f69d63d7c5535525373a8..aab3239ce8291e9ac1742afa012a09c32a68b93d 100644
--- a/shell/platform/windows/flutter_project_bundle.cc
+++ b/shell/platform/windows/flutter_project_bundle.cc
@@ -88,7 +88,17 @@ void FlutterProjectBundle::SetSwitches(
 }
 
 const std::vector<std::string> FlutterProjectBundle::GetSwitches() {
-  return GetSwitchesFromEnvironment();
+  if (engine_switches_.size() == 0) {
+    return GetSwitchesFromEnvironment();
+  }
+  std::vector<std::string> switches;
+  switches.insert(switches.end(), engine_switches_.begin(),
+                  engine_switches_.end());
+
+  auto env_switches = GetSwitchesFromEnvironment();
+  switches.insert(switches.end(), env_switches.begin(), env_switches.end());
+
+  return switches;
 }
 
 }  // namespace flutter
diff --git a/shell/platform/windows/flutter_window.cc b/shell/platform/windows/flutter_window.cc
index c8d3e6a23e67327657632b28cfb524d025749b88..82e6cd9c486e5f6d665d5a50909f41e6c41f41d0 100644
--- a/shell/platform/windows/flutter_window.cc
+++ b/shell/platform/windows/flutter_window.cc
@@ -12,8 +12,10 @@
 
 #include "flutter/fml/logging.h"
 #include "flutter/shell/platform/embedder/embedder.h"
+#include "flutter/shell/platform/windows/dpi_utils.h"
 #include "flutter/shell/platform/windows/flutter_windows_engine.h"
 #include "flutter/shell/platform/windows/flutter_windows_view.h"
+#include "flutter/shell/platform/windows/keyboard_utils.h"
 
 namespace flutter {
 
@@ -23,6 +25,11 @@ namespace {
 // constant for machines running at 100% scaling.
 constexpr int base_dpi = 96;
 
+static const int kMinTouchDeviceId = 0;
+static const int kMaxTouchDeviceId = 128;
+
+static const int kLinesPerScrollWindowsDefault = 3;
+
 // Maps a Flutter cursor name to an HCURSOR.
 //
 // Returns the arrow cursor for unknown constants.
@@ -66,49 +73,24 @@ static HCURSOR GetCursorByName(const std::string& cursor_name) {
   return ::LoadCursor(nullptr, idc_name);
 }
 
-}  // namespace
-
-FlutterWindow::FlutterWindow(int width, int height)
-    : binding_handler_delegate_(nullptr) {
-  Window::InitializeChild("FLUTTERVIEW", width, height);
-  current_cursor_ = ::LoadCursor(nullptr, IDC_ARROW);
-}
-
-FlutterWindow::~FlutterWindow() {}
-
-void FlutterWindow::SetView(WindowBindingHandlerDelegate* window) {
-  binding_handler_delegate_ = window;
-  direct_manipulation_owner_->SetBindingHandlerDelegate(window);
-}
-
-WindowsRenderTarget FlutterWindow::GetRenderTarget() {
-  return WindowsRenderTarget(GetWindowHandle());
-}
-
-PlatformWindow FlutterWindow::GetPlatformWindow() {
-  return GetWindowHandle();
-}
-
-float FlutterWindow::GetDpiScale() {
-  return static_cast<float>(GetCurrentDPI()) / static_cast<float>(base_dpi);
-}
-
-bool FlutterWindow::IsVisible() {
-  return IsWindowVisible(GetWindowHandle());
-}
-
-PhysicalWindowBounds FlutterWindow::GetPhysicalWindowBounds() {
-  return {GetCurrentWidth(), GetCurrentHeight()};
-}
-
-void FlutterWindow::UpdateFlutterCursor(const std::string& cursor_name) {
-  current_cursor_ = GetCursorByName(cursor_name);
-}
-
-void FlutterWindow::OnWindowResized() {
-  // Blocking the raster thread until DWM flushes alleviates glitches where
-  // previous size surface is stretched over current size view.
-  DwmFlush();
+static constexpr int32_t kDefaultPointerDeviceId = 0;
+
+// This method is only valid during a window message related to mouse/touch
+// input.
+// See
+// https://docs.microsoft.com/en-us/windows/win32/tablet/system-events-and-mouse-messages?redirectedfrom=MSDN#distinguishing-pen-input-from-mouse-and-touch.
+static FlutterPointerDeviceKind GetFlutterPointerDeviceKind() {
+  constexpr LPARAM kTouchOrPenSignature = 0xFF515700;
+  constexpr LPARAM kTouchSignature = kTouchOrPenSignature | 0x80;
+  constexpr LPARAM kSignatureMask = 0xFFFFFF00;
+  LPARAM info = GetMessageExtraInfo();
+  if ((info & kSignatureMask) == kTouchOrPenSignature) {
+    if ((info & kTouchSignature) == kTouchSignature) {
+      return kFlutterPointerDeviceKindTouch;
+    }
+    return kFlutterPointerDeviceKindStylus;
+  }
+  return kFlutterPointerDeviceKindMouse;
 }
 
 // Translates button codes from Win32 API to FlutterPointerMouseButtons.
@@ -132,7 +114,78 @@ static uint64_t ConvertWinButtonToFlutterButton(UINT button) {
   return 0;
 }
 
-void FlutterWindow::OnDpiScale(unsigned int dpi){};
+}  // namespace
+
+FlutterWindow::FlutterWindow(
+    int width,
+    int height,
+    std::shared_ptr<WindowsProcTable> windows_proc_table,
+    std::unique_ptr<TextInputManager> text_input_manager)
+    : touch_id_generator_(kMinTouchDeviceId, kMaxTouchDeviceId),
+      windows_proc_table_(std::move(windows_proc_table)),
+      text_input_manager_(std::move(text_input_manager)),
+      ax_fragment_root_(nullptr) {
+  // Get the DPI of the primary monitor as the initial DPI. If Per-Monitor V2 is
+  // supported, |current_dpi_| should be updated in the
+  // kWmDpiChangedBeforeParent message.
+  current_dpi_ = GetDpiForHWND(nullptr);
+
+  // Get initial value for wheel scroll lines
+  // TODO: Listen to changes for this value
+  // https://github.com/flutter/flutter/issues/107248
+  UpdateScrollOffsetMultiplier();
+
+  if (windows_proc_table_ == nullptr) {
+    windows_proc_table_ = std::make_unique<WindowsProcTable>();
+  }
+  if (text_input_manager_ == nullptr) {
+    text_input_manager_ = std::make_unique<TextInputManager>();
+  }
+  keyboard_manager_ = std::make_unique<KeyboardManager>(this);
+
+  InitializeChild("FLUTTERVIEW", width, height);
+  current_cursor_ = ::LoadCursor(nullptr, IDC_ARROW);
+}
+
+// Base constructor for mocks
+FlutterWindow::FlutterWindow()
+    : touch_id_generator_(kMinTouchDeviceId, kMaxTouchDeviceId) {}
+
+FlutterWindow::~FlutterWindow() {
+  Destroy();
+}
+
+void FlutterWindow::SetView(WindowBindingHandlerDelegate* window) {
+  binding_handler_delegate_ = window;
+  if (direct_manipulation_owner_) {
+    direct_manipulation_owner_->SetBindingHandlerDelegate(window);
+  }
+  if (restored_ && window) {
+    OnWindowStateEvent(WindowStateEvent::kShow);
+  }
+  if (focused_ && window) {
+    OnWindowStateEvent(WindowStateEvent::kFocus);
+  }
+}
+
+float FlutterWindow::GetDpiScale() {
+  return static_cast<float>(GetCurrentDPI()) / static_cast<float>(base_dpi);
+}
+
+PhysicalWindowBounds FlutterWindow::GetPhysicalWindowBounds() {
+  return {GetCurrentWidth(), GetCurrentHeight()};
+}
+
+void FlutterWindow::UpdateFlutterCursor(const std::string& cursor_name) {
+  SetFlutterCursor(GetCursorByName(cursor_name));
+}
+
+void FlutterWindow::SetFlutterCursor(HCURSOR cursor) {
+  current_cursor_ = cursor;
+  ::SetCursor(current_cursor_);
+}
+
+void FlutterWindow::OnDpiScale(unsigned int dpi) {};
 
 // When DesktopWindow notifies that a WM_Size message has come in
 // lets FlutterEngine know about the new size.
@@ -151,8 +204,10 @@ void FlutterWindow::OnPaint() {
 void FlutterWindow::OnPointerMove(double x,
                                   double y,
                                   FlutterPointerDeviceKind device_kind,
-                                  int32_t device_id) {
-  binding_handler_delegate_->OnPointerMove(x, y, device_kind, device_id);
+                                  int32_t device_id,
+                                  int modifiers_state) {
+  binding_handler_delegate_->OnPointerMove(x, y, device_kind, device_id,
+                                           modifiers_state);
 }
 
 void FlutterWindow::OnPointerDown(double x,
@@ -253,6 +308,13 @@ void FlutterWindow::OnResetImeComposing() {
   AbortImeComposing();
 }
 
+bool FlutterWindow::OnBitmapSurfaceCleared() {
+  HDC dc = ::GetDC(GetWindowHandle());
+  bool result = ::PatBlt(dc, 0, 0, current_width_, current_height_, BLACKNESS);
+  ::ReleaseDC(GetWindowHandle(), dc);
+  return result;
+}
+
 bool FlutterWindow::OnBitmapSurfaceUpdated(const void* allocation,
                                            size_t row_bytes,
                                            size_t height) {
@@ -265,13 +327,17 @@ bool FlutterWindow::OnBitmapSurfaceUpdated(const void* allocation,
   bmi.bmiHeader.biBitCount = 32;
   bmi.bmiHeader.biCompression = BI_RGB;
   bmi.bmiHeader.biSizeImage = 0;
-  int ret = SetDIBitsToDevice(dc, 0, 0, row_bytes / 4, height, 0, 0, 0, height,
-                              allocation, &bmi, DIB_RGB_COLORS);
+  int ret = ::SetDIBitsToDevice(dc, 0, 0, row_bytes / 4, height, 0, 0, 0,
+                                height, allocation, &bmi, DIB_RGB_COLORS);
   ::ReleaseDC(GetWindowHandle(), dc);
   return ret != 0;
 }
 
 gfx::NativeViewAccessible FlutterWindow::GetNativeViewAccessible() {
+  if (binding_handler_delegate_ == nullptr) {
+    return nullptr;
+  }
+
   return binding_handler_delegate_->GetNativeViewAccessible();
 }
 
@@ -283,19 +349,612 @@ PointerLocation FlutterWindow::GetPrimaryPointerLocation() {
 }
 
 void FlutterWindow::OnThemeChange() {
-  binding_handler_delegate_->UpdateHighContrastEnabled(
-      GetHighContrastEnabled());
+  binding_handler_delegate_->OnHighContrastChanged();
 }
 
-void FlutterWindow::SendInitialAccessibilityFeatures() {
-  OnThemeChange();
+ui::AXFragmentRootDelegateWin* FlutterWindow::GetAxFragmentRootDelegate() {
+  return binding_handler_delegate_->GetAxFragmentRootDelegate();
+}
+
+AlertPlatformNodeDelegate* FlutterWindow::GetAlertDelegate() {
+  CreateAxFragmentRoot();
+  return alert_delegate_.get();
+}
+
+ui::AXPlatformNodeWin* FlutterWindow::GetAlert() {
+  CreateAxFragmentRoot();
+  return alert_node_.get();
+}
+
+void FlutterWindow::OnWindowStateEvent(WindowStateEvent event) {
+  switch (event) {
+    case WindowStateEvent::kShow:
+      restored_ = true;
+      break;
+    case WindowStateEvent::kHide:
+      restored_ = false;
+      focused_ = false;
+      break;
+    case WindowStateEvent::kFocus:
+      focused_ = true;
+      break;
+    case WindowStateEvent::kUnfocus:
+      focused_ = false;
+      break;
+  }
+  HWND hwnd = GetWindowHandle();
+  if (hwnd && binding_handler_delegate_) {
+    binding_handler_delegate_->OnWindowStateEvent(hwnd, event);
+  }
+}
+
+void FlutterWindow::TrackMouseLeaveEvent(HWND hwnd) {
+  if (!tracking_mouse_leave_) {
+    TRACKMOUSEEVENT tme;
+    tme.cbSize = sizeof(tme);
+    tme.hwndTrack = hwnd;
+    tme.dwFlags = TME_LEAVE;
+    TrackMouseEvent(&tme);
+    tracking_mouse_leave_ = true;
+  }
+}
+
+void FlutterWindow::HandleResize(UINT width, UINT height) {
+  current_width_ = width;
+  current_height_ = height;
+  if (direct_manipulation_owner_) {
+    direct_manipulation_owner_->ResizeViewport(width, height);
+  }
+  OnResize(width, height);
+}
+
+FlutterWindow* FlutterWindow::GetThisFromHandle(HWND const window) noexcept {
+  return reinterpret_cast<FlutterWindow*>(
+      GetWindowLongPtr(window, GWLP_USERDATA));
+}
+
+void FlutterWindow::UpdateScrollOffsetMultiplier() {
+  UINT lines_per_scroll = kLinesPerScrollWindowsDefault;
+
+  // Get lines per scroll wheel value from Windows
+  SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, &lines_per_scroll, 0);
+
+  // This logic is based off Chromium's implementation
+  // https://source.chromium.org/chromium/chromium/src/+/main:ui/events/blink/web_input_event_builders_win.cc;l=319-331
+  scroll_offset_multiplier_ =
+      static_cast<float>(lines_per_scroll) * 100.0 / 3.0;
+}
+
+void FlutterWindow::InitializeChild(const char* title,
+                                    unsigned int width,
+                                    unsigned int height) {
+  Destroy();
+  std::wstring converted_title = NarrowToWide(title);
+
+  WNDCLASS window_class = RegisterWindowClass(converted_title);
+
+  auto* result = CreateWindowEx(
+      0, window_class.lpszClassName, converted_title.c_str(),
+      WS_CHILD | WS_VISIBLE, CW_DEFAULT, CW_DEFAULT, width, height,
+      HWND_MESSAGE, nullptr, window_class.hInstance, this);
+
+  if (result == nullptr) {
+    auto error = GetLastError();
+    LPWSTR message = nullptr;
+    size_t size = FormatMessageW(
+        FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM |
+            FORMAT_MESSAGE_IGNORE_INSERTS,
+        NULL, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+        reinterpret_cast<LPWSTR>(&message), 0, NULL);
+    OutputDebugString(message);
+    LocalFree(message);
+  }
+  SetUserObjectInformationA(GetCurrentProcess(),
+                            UOI_TIMERPROC_EXCEPTION_SUPPRESSION, FALSE, 1);
+  // SetTimer is not precise, if a 16 ms interval is requested, it will instead
+  // often fire in an interval of 32 ms. Providing a value of 14 will ensure it
+  // runs every 16 ms, which will allow for 60 Hz trackpad gesture events, which
+  // is the maximal frequency supported by SetTimer.
+  SetTimer(result, kDirectManipulationTimer, 14, nullptr);
+  direct_manipulation_owner_ = std::make_unique<DirectManipulationOwner>(this);
+  direct_manipulation_owner_->Init(width, height);
+}
+
+HWND FlutterWindow::GetWindowHandle() {
+  return window_handle_;
+}
+
+BOOL FlutterWindow::Win32PeekMessage(LPMSG lpMsg,
+                                     UINT wMsgFilterMin,
+                                     UINT wMsgFilterMax,
+                                     UINT wRemoveMsg) {
+  return ::PeekMessage(lpMsg, window_handle_, wMsgFilterMin, wMsgFilterMax,
+                       wRemoveMsg);
+}
+
+uint32_t FlutterWindow::Win32MapVkToChar(uint32_t virtual_key) {
+  return ::MapVirtualKey(virtual_key, MAPVK_VK_TO_CHAR);
+}
+
+UINT FlutterWindow::Win32DispatchMessage(UINT Msg,
+                                         WPARAM wParam,
+                                         LPARAM lParam) {
+  return ::SendMessage(window_handle_, Msg, wParam, lParam);
+}
+
+std::wstring FlutterWindow::NarrowToWide(const char* source) {
+  size_t length = strlen(source);
+  size_t outlen = 0;
+  std::wstring wideTitle(length, L'#');
+  mbstowcs_s(&outlen, &wideTitle[0], length + 1, source, length);
+  return wideTitle;
+}
+
+WNDCLASS FlutterWindow::RegisterWindowClass(std::wstring& title) {
+  window_class_name_ = title;
+
+  WNDCLASS window_class{};
+  window_class.hCursor = LoadCursor(nullptr, IDC_ARROW);
+  window_class.lpszClassName = title.c_str();
+  window_class.style = CS_HREDRAW | CS_VREDRAW;
+  window_class.cbClsExtra = 0;
+  window_class.cbWndExtra = 0;
+  window_class.hInstance = GetModuleHandle(nullptr);
+  window_class.hIcon = nullptr;
+  window_class.hbrBackground = 0;
+  window_class.lpszMenuName = nullptr;
+  window_class.lpfnWndProc = WndProc;
+  RegisterClass(&window_class);
+  return window_class;
+}
+
+LRESULT CALLBACK FlutterWindow::WndProc(HWND const window,
+                                        UINT const message,
+                                        WPARAM const wparam,
+                                        LPARAM const lparam) noexcept {
+  if (message == WM_NCCREATE) {
+    auto cs = reinterpret_cast<CREATESTRUCT*>(lparam);
+    SetWindowLongPtr(window, GWLP_USERDATA,
+                     reinterpret_cast<LONG_PTR>(cs->lpCreateParams));
+
+    auto that = static_cast<FlutterWindow*>(cs->lpCreateParams);
+    that->window_handle_ = window;
+    that->text_input_manager_->SetWindowHandle(window);
+    RegisterTouchWindow(window, 0);
+  } else if (FlutterWindow* that = GetThisFromHandle(window)) {
+    return that->HandleMessage(message, wparam, lparam);
+  }
+
+  return DefWindowProc(window, message, wparam, lparam);
+}
+
+LRESULT
+FlutterWindow::HandleMessage(UINT const message,
+                             WPARAM const wparam,
+                             LPARAM const lparam) noexcept {
+  LPARAM result_lparam = lparam;
+  int xPos = 0, yPos = 0;
+  UINT width = 0, height = 0;
+  UINT button_pressed = 0;
+  FlutterPointerDeviceKind device_kind;
+
+  switch (message) {
+    case kWmDpiChangedBeforeParent:
+      current_dpi_ = GetDpiForHWND(window_handle_);
+      OnDpiScale(current_dpi_);
+      return 0;
+    case WM_SIZE:
+      width = LOWORD(lparam);
+      height = HIWORD(lparam);
+
+      current_width_ = width;
+      current_height_ = height;
+      HandleResize(width, height);
+
+      OnWindowStateEvent(width == 0 && height == 0 ? WindowStateEvent::kHide
+                                                   : WindowStateEvent::kShow);
+      break;
+    case WM_PAINT:
+      OnPaint();
+      break;
+    case WM_TOUCH: {
+      UINT num_points = LOWORD(wparam);
+      touch_points_.resize(num_points);
+      auto touch_input_handle = reinterpret_cast<HTOUCHINPUT>(lparam);
+      if (GetTouchInputInfo(touch_input_handle, num_points,
+                            touch_points_.data(), sizeof(TOUCHINPUT))) {
+        for (const auto& touch : touch_points_) {
+          // Generate a mapped ID for the Windows-provided touch ID
+          auto touch_id = touch_id_generator_.GetGeneratedId(touch.dwID);
+
+          POINT pt = {TOUCH_COORD_TO_PIXEL(touch.x),
+                      TOUCH_COORD_TO_PIXEL(touch.y)};
+          ScreenToClient(window_handle_, &pt);
+          auto x = static_cast<double>(pt.x);
+          auto y = static_cast<double>(pt.y);
+
+          if (touch.dwFlags & TOUCHEVENTF_DOWN) {
+            OnPointerDown(x, y, kFlutterPointerDeviceKindTouch, touch_id,
+                          WM_LBUTTONDOWN);
+          } else if (touch.dwFlags & TOUCHEVENTF_MOVE) {
+            OnPointerMove(x, y, kFlutterPointerDeviceKindTouch, touch_id, 0);
+          } else if (touch.dwFlags & TOUCHEVENTF_UP) {
+            OnPointerUp(x, y, kFlutterPointerDeviceKindTouch, touch_id,
+                        WM_LBUTTONDOWN);
+            OnPointerLeave(x, y, kFlutterPointerDeviceKindTouch, touch_id);
+            touch_id_generator_.ReleaseNumber(touch.dwID);
+          }
+        }
+        CloseTouchInputHandle(touch_input_handle);
+      }
+      return 0;
+    }
+    case WM_MOUSEMOVE:
+      device_kind = GetFlutterPointerDeviceKind();
+      if (device_kind == kFlutterPointerDeviceKindMouse) {
+        TrackMouseLeaveEvent(window_handle_);
+
+        xPos = GET_X_LPARAM(lparam);
+        yPos = GET_Y_LPARAM(lparam);
+        mouse_x_ = static_cast<double>(xPos);
+        mouse_y_ = static_cast<double>(yPos);
+
+        int mods = 0;
+        if (wparam & MK_CONTROL) {
+          mods |= kControl;
+        }
+        if (wparam & MK_SHIFT) {
+          mods |= kShift;
+        }
+        OnPointerMove(mouse_x_, mouse_y_, device_kind, kDefaultPointerDeviceId,
+                      mods);
+      }
+      break;
+    case WM_MOUSELEAVE:
+      device_kind = GetFlutterPointerDeviceKind();
+      if (device_kind == kFlutterPointerDeviceKindMouse) {
+        OnPointerLeave(mouse_x_, mouse_y_, device_kind,
+                       kDefaultPointerDeviceId);
+      }
+
+      // Once the tracked event is received, the TrackMouseEvent function
+      // resets. Set to false to make sure it's called once mouse movement is
+      // detected again.
+      tracking_mouse_leave_ = false;
+      break;
+    case WM_SETCURSOR: {
+      UINT hit_test_result = LOWORD(lparam);
+      if (hit_test_result == HTCLIENT) {
+        OnSetCursor();
+        return TRUE;
+      }
+      break;
+    }
+    case WM_SETFOCUS:
+      OnWindowStateEvent(WindowStateEvent::kFocus);
+      ::CreateCaret(window_handle_, nullptr, 1, 1);
+      break;
+    case WM_KILLFOCUS:
+      OnWindowStateEvent(WindowStateEvent::kUnfocus);
+      ::DestroyCaret();
+      break;
+    case WM_LBUTTONDOWN:
+    case WM_RBUTTONDOWN:
+    case WM_MBUTTONDOWN:
+    case WM_XBUTTONDOWN:
+      device_kind = GetFlutterPointerDeviceKind();
+      if (device_kind != kFlutterPointerDeviceKindMouse) {
+        break;
+      }
+
+      if (message == WM_LBUTTONDOWN) {
+        // Capture the pointer in case the user drags outside the client area.
+        // In this case, the "mouse leave" event is delayed until the user
+        // releases the button. It's only activated on left click given that
+        // it's more common for apps to handle dragging with only the left
+        // button.
+        SetCapture(window_handle_);
+      }
+      button_pressed = message;
+      if (message == WM_XBUTTONDOWN) {
+        button_pressed = GET_XBUTTON_WPARAM(wparam);
+      }
+      xPos = GET_X_LPARAM(lparam);
+      yPos = GET_Y_LPARAM(lparam);
+      OnPointerDown(static_cast<double>(xPos), static_cast<double>(yPos),
+                    device_kind, kDefaultPointerDeviceId, button_pressed);
+      break;
+    case WM_LBUTTONUP:
+    case WM_RBUTTONUP:
+    case WM_MBUTTONUP:
+    case WM_XBUTTONUP:
+      device_kind = GetFlutterPointerDeviceKind();
+      if (device_kind != kFlutterPointerDeviceKindMouse) {
+        break;
+      }
+
+      if (message == WM_LBUTTONUP) {
+        ReleaseCapture();
+      }
+      button_pressed = message;
+      if (message == WM_XBUTTONUP) {
+        button_pressed = GET_XBUTTON_WPARAM(wparam);
+      }
+      xPos = GET_X_LPARAM(lparam);
+      yPos = GET_Y_LPARAM(lparam);
+      OnPointerUp(static_cast<double>(xPos), static_cast<double>(yPos),
+                  device_kind, kDefaultPointerDeviceId, button_pressed);
+      break;
+    case WM_MOUSEWHEEL:
+      OnScroll(0.0,
+               -(static_cast<short>(HIWORD(wparam)) /
+                 static_cast<double>(WHEEL_DELTA)),
+               kFlutterPointerDeviceKindMouse, kDefaultPointerDeviceId);
+      break;
+    case WM_MOUSEHWHEEL:
+      OnScroll((static_cast<short>(HIWORD(wparam)) /
+                static_cast<double>(WHEEL_DELTA)),
+               0.0, kFlutterPointerDeviceKindMouse, kDefaultPointerDeviceId);
+      break;
+    case WM_GETOBJECT: {
+      LRESULT lresult = OnGetObject(message, wparam, lparam);
+      if (lresult) {
+        return lresult;
+      }
+      break;
+    }
+    case WM_TIMER:
+      if (wparam == kDirectManipulationTimer) {
+        direct_manipulation_owner_->Update();
+        return 0;
+      }
+      break;
+    case DM_POINTERHITTEST: {
+      if (direct_manipulation_owner_) {
+        UINT contact_id = GET_POINTERID_WPARAM(wparam);
+        POINTER_INPUT_TYPE pointer_type;
+        if (windows_proc_table_->GetPointerType(contact_id, &pointer_type) &&
+            pointer_type == PT_TOUCHPAD) {
+          direct_manipulation_owner_->SetContact(contact_id);
+        }
+      }
+      break;
+    }
+    case WM_INPUTLANGCHANGE:
+      // TODO(cbracken): pass this to TextInputManager to aid with
+      // language-specific issues.
+      break;
+    case WM_IME_SETCONTEXT:
+      OnImeSetContext(message, wparam, lparam);
+      // Strip the ISC_SHOWUICOMPOSITIONWINDOW bit from lparam before passing it
+      // to DefWindowProc() so that the composition window is hidden since
+      // Flutter renders the composing string itself.
+      result_lparam &= ~ISC_SHOWUICOMPOSITIONWINDOW;
+      break;
+    case WM_IME_STARTCOMPOSITION:
+      OnImeStartComposition(message, wparam, lparam);
+      // Suppress further processing by DefWindowProc() so that the default
+      // system IME style isn't used, but rather the one set in the
+      // WM_IME_SETCONTEXT handler.
+      return TRUE;
+    case WM_IME_COMPOSITION:
+      OnImeComposition(message, wparam, lparam);
+      if (lparam & GCS_RESULTSTR || lparam & GCS_COMPSTR) {
+        // Suppress further processing by DefWindowProc() since otherwise it
+        // will emit the result string as WM_CHAR messages on commit. Instead,
+        // committing the composing text to the EditableText string is handled
+        // in TextInputModel::CommitComposing, triggered by
+        // OnImeEndComposition().
+        return TRUE;
+      }
+      break;
+    case WM_IME_ENDCOMPOSITION:
+      OnImeEndComposition(message, wparam, lparam);
+      return TRUE;
+    case WM_IME_REQUEST:
+      OnImeRequest(message, wparam, lparam);
+      break;
+    case WM_UNICHAR: {
+      // Tell third-pary app, we can support Unicode.
+      if (wparam == UNICODE_NOCHAR)
+        return TRUE;
+      // DefWindowProc will send WM_CHAR for this WM_UNICHAR.
+      break;
+    }
+    case WM_THEMECHANGED:
+      OnThemeChange();
+      break;
+    case WM_DEADCHAR:
+    case WM_SYSDEADCHAR:
+    case WM_CHAR:
+    case WM_SYSCHAR:
+    case WM_KEYDOWN:
+    case WM_SYSKEYDOWN:
+    case WM_KEYUP:
+    case WM_SYSKEYUP:
+      if (keyboard_manager_->HandleMessage(message, wparam, lparam)) {
+        return 0;
+      }
+      break;
+  }
+
+  return Win32DefWindowProc(window_handle_, message, wparam, result_lparam);
+}
+
+LRESULT FlutterWindow::OnGetObject(UINT const message,
+                                   WPARAM const wparam,
+                                   LPARAM const lparam) {
+  LRESULT reference_result = static_cast<LRESULT>(0L);
+
+  // Only the lower 32 bits of lparam are valid when checking the object id
+  // because it sometimes gets sign-extended incorrectly (but not always).
+  DWORD obj_id = static_cast<DWORD>(static_cast<DWORD_PTR>(lparam));
+
+  bool is_uia_request = static_cast<DWORD>(UiaRootObjectId) == obj_id;
+  bool is_msaa_request = static_cast<DWORD>(OBJID_CLIENT) == obj_id;
+
+  if (is_uia_request || is_msaa_request) {
+    // On Windows, we don't get a notification that the screen reader has been
+    // enabled or disabled. There is an API to query for screen reader state,
+    // but that state isn't set by all screen readers, including by Narrator,
+    // the screen reader that ships with Windows:
+    // https://docs.microsoft.com/en-us/windows/win32/winauto/screen-reader-parameter
+    //
+    // Instead, we enable semantics in Flutter if Windows issues queries for
+    // Microsoft Active Accessibility (MSAA) COM objects.
+    OnUpdateSemanticsEnabled(true);
+  }
+
+  gfx::NativeViewAccessible root_view = GetNativeViewAccessible();
+  // TODO(schectman): UIA is currently disabled by default.
+  // https://github.com/flutter/flutter/issues/114547
+  if (root_view) {
+    CreateAxFragmentRoot();
+    if (is_uia_request) {
+#ifdef FLUTTER_ENGINE_USE_UIA
+      // Retrieve UIA object for the root view.
+      Microsoft::WRL::ComPtr<IRawElementProviderSimple> root;
+      if (SUCCEEDED(
+              ax_fragment_root_->GetNativeViewAccessible()->QueryInterface(
+                  IID_PPV_ARGS(&root)))) {
+        // Return the UIA object via UiaReturnRawElementProvider(). See:
+        // https://docs.microsoft.com/en-us/windows/win32/winauto/wm-getobject
+        reference_result = UiaReturnRawElementProvider(window_handle_, wparam,
+                                                       lparam, root.Get());
+      } else {
+        FML_LOG(ERROR) << "Failed to query AX fragment root.";
+      }
+#endif  // FLUTTER_ENGINE_USE_UIA
+    } else if (is_msaa_request) {
+      // Create the accessibility root if it does not already exist.
+      // Return the IAccessible for the root view.
+      Microsoft::WRL::ComPtr<IAccessible> root;
+      ax_fragment_root_->GetNativeViewAccessible()->QueryInterface(
+          IID_PPV_ARGS(&root));
+      reference_result = LresultFromObject(IID_IAccessible, wparam, root.Get());
+    }
+  }
+  return reference_result;
+}
+
+void FlutterWindow::OnImeSetContext(UINT const message,
+                                    WPARAM const wparam,
+                                    LPARAM const lparam) {
+  if (wparam != 0) {
+    text_input_manager_->CreateImeWindow();
+  }
+}
+
+void FlutterWindow::OnImeStartComposition(UINT const message,
+                                          WPARAM const wparam,
+                                          LPARAM const lparam) {
+  text_input_manager_->CreateImeWindow();
+  OnComposeBegin();
+}
+
+void FlutterWindow::OnImeComposition(UINT const message,
+                                     WPARAM const wparam,
+                                     LPARAM const lparam) {
+  // Update the IME window position.
+  text_input_manager_->UpdateImeWindow();
+
+  if (lparam == 0) {
+    OnComposeChange(u"", 0);
+    OnComposeCommit();
+  }
+
+  // Process GCS_RESULTSTR at fisrt, because Google Japanese Input and ATOK send
+  // both GCS_RESULTSTR and GCS_COMPSTR to commit composed text and send new
+  // composing text.
+  if (lparam & GCS_RESULTSTR) {
+    // Commit but don't end composing.
+    // Read the committed composing string.
+    long pos = text_input_manager_->GetComposingCursorPosition();
+    std::optional<std::u16string> text = text_input_manager_->GetResultString();
+    if (text) {
+      OnComposeChange(text.value(), pos);
+      OnComposeCommit();
+    }
+  }
+  if (lparam & GCS_COMPSTR) {
+    // Read the in-progress composing string.
+    long pos = text_input_manager_->GetComposingCursorPosition();
+    std::optional<std::u16string> text =
+        text_input_manager_->GetComposingString();
+    if (text) {
+      OnComposeChange(text.value(), pos);
+    }
+  }
+}
+
+void FlutterWindow::OnImeEndComposition(UINT const message,
+                                        WPARAM const wparam,
+                                        LPARAM const lparam) {
+  text_input_manager_->DestroyImeWindow();
+  OnComposeEnd();
+}
+
+void FlutterWindow::OnImeRequest(UINT const message,
+                                 WPARAM const wparam,
+                                 LPARAM const lparam) {
+  // TODO(cbracken): Handle IMR_RECONVERTSTRING, IMR_DOCUMENTFEED,
+  // and IMR_QUERYCHARPOSITION messages.
+  // https://github.com/flutter/flutter/issues/74547
+}
+
+void FlutterWindow::AbortImeComposing() {
+  text_input_manager_->AbortComposing();
+}
+
+void FlutterWindow::UpdateCursorRect(const Rect& rect) {
+  text_input_manager_->UpdateCaretRect(rect);
+}
+
+UINT FlutterWindow::GetCurrentDPI() {
+  return current_dpi_;
+}
+
+UINT FlutterWindow::GetCurrentWidth() {
+  return current_width_;
+}
+
+UINT FlutterWindow::GetCurrentHeight() {
+  return current_height_;
+}
+
+float FlutterWindow::GetScrollOffsetMultiplier() {
+  return scroll_offset_multiplier_;
+}
+
+LRESULT FlutterWindow::Win32DefWindowProc(HWND hWnd,
+                                          UINT Msg,
+                                          WPARAM wParam,
+                                          LPARAM lParam) {
+  return ::DefWindowProc(hWnd, Msg, wParam, lParam);
+}
+
+void FlutterWindow::Destroy() {
+  if (window_handle_) {
+    text_input_manager_->SetWindowHandle(nullptr);
+    DestroyWindow(window_handle_);
+    window_handle_ = nullptr;
+  }
+
+  UnregisterClass(window_class_name_.c_str(), nullptr);
 }
 
-AccessibilityRootNode* FlutterWindow::GetAccessibilityRootNode() {
-  if (!accessibility_root_) {
-    CreateAccessibilityRootNode();
+void FlutterWindow::CreateAxFragmentRoot() {
+  if (ax_fragment_root_) {
+    return;
   }
-  return accessibility_root_;
+  ax_fragment_root_ = std::make_unique<ui::AXFragmentRootWin>(
+      window_handle_, GetAxFragmentRootDelegate());
+  alert_delegate_ =
+      std::make_unique<AlertPlatformNodeDelegate>(*ax_fragment_root_);
+  ui::AXPlatformNode* alert_node =
+      ui::AXPlatformNodeWin::Create(alert_delegate_.get());
+  alert_node_.reset(static_cast<ui::AXPlatformNodeWin*>(alert_node));
+  ax_fragment_root_->SetAlertNode(alert_node_.get());
 }
 
 }  // namespace flutter
diff --git a/shell/platform/windows/flutter_window.h b/shell/platform/windows/flutter_window.h
index 5af03bad9c2134a990e0142ba80535910f5b5bdd..b8560794ec36b031597e8c6da98b75d78b828ac2 100644
--- a/shell/platform/windows/flutter_window.h
+++ b/shell/platform/windows/flutter_window.h
@@ -5,17 +5,26 @@
 #ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_FLUTTER_WINDOW_H_
 #define FLUTTER_SHELL_PLATFORM_WINDOWS_FLUTTER_WINDOW_H_
 
-#include <windowsx.h>
-
-#include <iostream>
 #include <string>
 #include <vector>
 
+#include "flutter/fml/macros.h"
+#include "flutter/shell/platform/common/alert_platform_node_delegate.h"
 #include "flutter/shell/platform/common/geometry.h"
 #include "flutter/shell/platform/embedder/embedder.h"
+#include "flutter/shell/platform/windows/direct_manipulation.h"
 #include "flutter/shell/platform/windows/flutter_windows_view.h"
-#include "flutter/shell/platform/windows/window.h"
+#include "flutter/shell/platform/windows/keyboard_manager.h"
+#include "flutter/shell/platform/windows/sequential_id_generator.h"
+#include "flutter/shell/platform/windows/text_input_manager.h"
 #include "flutter/shell/platform/windows/window_binding_handler.h"
+#include "flutter/shell/platform/windows/windows_lifecycle_manager.h"
+#include "flutter/shell/platform/windows/windows_proc_table.h"
+#include "flutter/shell/platform/windows/windowsx_shim.h"
+#include "flutter/third_party/accessibility/ax/platform/ax_fragment_root_delegate_win.h"
+#include "flutter/third_party/accessibility/ax/platform/ax_fragment_root_win.h"
+#include "flutter/third_party/accessibility/ax/platform/ax_platform_node_win.h"
+#include "flutter/third_party/accessibility/gfx/native_widget_types.h"
 
 namespace flutter {
 
@@ -23,144 +32,359 @@ namespace flutter {
 // the future, there will likely be a CoreWindow-based FlutterWindow as well.
 // At the point may make sense to dependency inject the native window rather
 // than inherit.
-class FlutterWindow : public Window, public WindowBindingHandler {
+class FlutterWindow : public KeyboardManager::WindowDelegate,
+                      public WindowBindingHandler {
  public:
   // Create flutter Window for use as child window
-  FlutterWindow(int width, int height);
+  FlutterWindow(int width,
+                int height,
+                std::shared_ptr<WindowsProcTable> windows_proc_table = nullptr,
+                std::unique_ptr<TextInputManager> text_input_manager = nullptr);
 
   virtual ~FlutterWindow();
 
-  // |Window|
-  void OnDpiScale(unsigned int dpi) override;
-
-  // |Window|
-  void OnResize(unsigned int width, unsigned int height) override;
-
-  // |Window|
-  void OnPaint() override;
-
-  // |Window|
-  void OnPointerMove(double x,
-                     double y,
-                     FlutterPointerDeviceKind device_kind,
-                     int32_t device_id) override;
-
-  // |Window|
-  void OnPointerDown(double x,
-                     double y,
-                     FlutterPointerDeviceKind device_kind,
-                     int32_t device_id,
-                     UINT button) override;
-
-  // |Window|
-  void OnPointerUp(double x,
-                   double y,
-                   FlutterPointerDeviceKind device_kind,
-                   int32_t device_id,
-                   UINT button) override;
-
-  // |Window|
-  void OnPointerLeave(double x,
-                      double y,
-                      FlutterPointerDeviceKind device_kind,
-                      int32_t device_id) override;
-
-  // |Window|
-  void OnSetCursor() override;
-
-  // |Window|
-  void OnText(const std::u16string& text) override;
-
-  // |Window|
-  void OnKey(int key,
-             int scancode,
-             int action,
-             char32_t character,
-             bool extended,
-             bool was_down,
-             KeyEventCallback callback) override;
-
-  // |Window|
-  void OnComposeBegin() override;
-
-  // |Window|
-  void OnComposeCommit() override;
-
-  // |Window|
-  void OnComposeEnd() override;
-
-  // |Window|
-  void OnComposeChange(const std::u16string& text, int cursor_pos) override;
+  // Initializes as a child window with size using |width| and |height| and
+  // |title| to identify the windowclass.  Does not show window, window must be
+  // parented into window hierarchy by caller.
+  void InitializeChild(const char* title,
+                       unsigned int width,
+                       unsigned int height);
+
+  // |KeyboardManager::WindowDelegate|
+  virtual BOOL Win32PeekMessage(LPMSG lpMsg,
+                                UINT wMsgFilterMin,
+                                UINT wMsgFilterMax,
+                                UINT wRemoveMsg) override;
+
+  // |KeyboardManager::WindowDelegate|
+  virtual uint32_t Win32MapVkToChar(uint32_t virtual_key) override;
+
+  // |KeyboardManager::WindowDelegate|
+  virtual UINT Win32DispatchMessage(UINT Msg,
+                                    WPARAM wParam,
+                                    LPARAM lParam) override;
+
+  // Called when the DPI changes either when a
+  // user drags the window between monitors of differing DPI or when the user
+  // manually changes the scale factor.
+  virtual void OnDpiScale(unsigned int dpi);
+
+  // Called when a resize occurs.
+  virtual void OnResize(unsigned int width, unsigned int height);
+
+  // Called when a paint is requested.
+  virtual void OnPaint();
+
+  // Called when the pointer moves within the
+  // window bounds.
+  virtual void OnPointerMove(double x,
+                             double y,
+                             FlutterPointerDeviceKind device_kind,
+                             int32_t device_id,
+                             int modifiers_state);
+
+  // Called when the a mouse button, determined by |button|, goes down.
+  virtual void OnPointerDown(double x,
+                             double y,
+                             FlutterPointerDeviceKind device_kind,
+                             int32_t device_id,
+                             UINT button);
+
+  // Called when the a mouse button, determined by |button|, goes from
+  // down to up
+  virtual void OnPointerUp(double x,
+                           double y,
+                           FlutterPointerDeviceKind device_kind,
+                           int32_t device_id,
+                           UINT button);
+
+  // Called when the mouse leaves the window.
+  virtual void OnPointerLeave(double x,
+                              double y,
+                              FlutterPointerDeviceKind device_kind,
+                              int32_t device_id);
+
+  // Called when the cursor should be set for the client area.
+  virtual void OnSetCursor();
+
+  // |WindowBindingHandlerDelegate|
+  virtual void OnText(const std::u16string& text) override;
+
+  // |WindowBindingHandlerDelegate|
+  virtual void OnKey(int key,
+                     int scancode,
+                     int action,
+                     char32_t character,
+                     bool extended,
+                     bool was_down,
+                     KeyEventCallback callback) override;
+
+  // Called when IME composing begins.
+  virtual void OnComposeBegin();
+
+  // Called when IME composing text is committed.
+  virtual void OnComposeCommit();
+
+  // Called when IME composing ends.
+  virtual void OnComposeEnd();
+
+  // Called when IME composing text or cursor position changes.
+  virtual void OnComposeChange(const std::u16string& text, int cursor_pos);
 
   // |FlutterWindowBindingHandler|
-  void OnCursorRectUpdated(const Rect& rect) override;
+  virtual void OnCursorRectUpdated(const Rect& rect) override;
 
   // |FlutterWindowBindingHandler|
-  void OnResetImeComposing() override;
+  virtual void OnResetImeComposing() override;
 
-  // |Window|
-  void OnUpdateSemanticsEnabled(bool enabled) override;
+  // Called when accessibility support is enabled or disabled.
+  virtual void OnUpdateSemanticsEnabled(bool enabled);
 
-  // |Window|
-  void OnScroll(double delta_x,
-                double delta_y,
-                FlutterPointerDeviceKind device_kind,
-                int32_t device_id) override;
+  // Called when mouse scrollwheel input occurs.
+  virtual void OnScroll(double delta_x,
+                        double delta_y,
+                        FlutterPointerDeviceKind device_kind,
+                        int32_t device_id);
 
-  // |Window|
-  gfx::NativeViewAccessible GetNativeViewAccessible() override;
-
-  // |FlutterWindowBindingHandler|
-  void SetView(WindowBindingHandlerDelegate* view) override;
+  // Returns the root view accessibility node, or nullptr if none.
+  virtual gfx::NativeViewAccessible GetNativeViewAccessible();
 
   // |FlutterWindowBindingHandler|
-  WindowsRenderTarget GetRenderTarget() override;
+  virtual void SetView(WindowBindingHandlerDelegate* view) override;
 
   // |FlutterWindowBindingHandler|
-  PlatformWindow GetPlatformWindow() override;
+  virtual HWND GetWindowHandle() override;
 
   // |FlutterWindowBindingHandler|
-  float GetDpiScale() override;
+  virtual float GetDpiScale() override;
 
   // |FlutterWindowBindingHandler|
-  bool IsVisible() override;
+  virtual PhysicalWindowBounds GetPhysicalWindowBounds() override;
 
   // |FlutterWindowBindingHandler|
-  PhysicalWindowBounds GetPhysicalWindowBounds() override;
+  virtual void UpdateFlutterCursor(const std::string& cursor_name) override;
 
   // |FlutterWindowBindingHandler|
-  void UpdateFlutterCursor(const std::string& cursor_name) override;
+  virtual void SetFlutterCursor(HCURSOR cursor) override;
 
   // |FlutterWindowBindingHandler|
-  void OnWindowResized() override;
+  virtual bool OnBitmapSurfaceCleared() override;
 
   // |FlutterWindowBindingHandler|
-  bool OnBitmapSurfaceUpdated(const void* allocation,
-                              size_t row_bytes,
-                              size_t height) override;
+  virtual bool OnBitmapSurfaceUpdated(const void* allocation,
+                                      size_t row_bytes,
+                                      size_t height) override;
 
   // |FlutterWindowBindingHandler|
-  PointerLocation GetPrimaryPointerLocation() override;
+  virtual PointerLocation GetPrimaryPointerLocation() override;
 
-  // |Window|
-  void OnThemeChange() override;
+  // Called when a theme change message is issued.
+  virtual void OnThemeChange();
 
   // |WindowBindingHandler|
-  void SendInitialAccessibilityFeatures() override;
+  virtual AlertPlatformNodeDelegate* GetAlertDelegate() override;
 
   // |WindowBindingHandler|
-  AccessibilityRootNode* GetAccessibilityRootNode() override;
+  virtual ui::AXPlatformNodeWin* GetAlert() override;
+
+  // Called to obtain a pointer to the fragment root delegate.
+  virtual ui::AXFragmentRootDelegateWin* GetAxFragmentRootDelegate();
+
+  // Called on a resize or focus event.
+  virtual void OnWindowStateEvent(WindowStateEvent event);
+
+ protected:
+  // Base constructor for mocks.
+  FlutterWindow();
+
+  // Win32's DefWindowProc.
+  //
+  // Used as the fallback behavior of HandleMessage. Exposed for dependency
+  // injection.
+  virtual LRESULT Win32DefWindowProc(HWND hWnd,
+                                     UINT Msg,
+                                     WPARAM wParam,
+                                     LPARAM lParam);
+
+  // Converts a c string to a wide unicode string.
+  std::wstring NarrowToWide(const char* source);
+
+  // Processes and route salient window messages for mouse handling,
+  // size change and DPI.  Delegates handling of these to member overloads that
+  // inheriting classes can handle.
+  LRESULT HandleMessage(UINT const message,
+                        WPARAM const wparam,
+                        LPARAM const lparam) noexcept;
+
+  // Called when the OS requests a COM object.
+  //
+  // The primary use of this function is to supply Windows with wrapped
+  // semantics objects for use by Windows accessibility.
+  virtual LRESULT OnGetObject(UINT const message,
+                              WPARAM const wparam,
+                              LPARAM const lparam);
+
+  // Called when a window is activated in order to configure IME support for
+  // multi-step text input.
+  virtual void OnImeSetContext(UINT const message,
+                               WPARAM const wparam,
+                               LPARAM const lparam);
+
+  // Called when multi-step text input begins when using an IME.
+  virtual void OnImeStartComposition(UINT const message,
+                                     WPARAM const wparam,
+                                     LPARAM const lparam);
+
+  // Called when edits/commit of multi-step text input occurs when using an IME.
+  virtual void OnImeComposition(UINT const message,
+                                WPARAM const wparam,
+                                LPARAM const lparam);
+
+  // Called when multi-step text input ends when using an IME.
+  virtual void OnImeEndComposition(UINT const message,
+                                   WPARAM const wparam,
+                                   LPARAM const lparam);
+
+  // Called when the user triggers an IME-specific request such as input
+  // reconversion, where an existing input sequence is returned to composing
+  // mode to select an alternative candidate conversion.
+  virtual void OnImeRequest(UINT const message,
+                            WPARAM const wparam,
+                            LPARAM const lparam);
+
+  // Called when the app ends IME composing, such as when the text input client
+  // is cleared or changed.
+  virtual void AbortImeComposing();
+
+  // Called when the cursor rect has been updated.
+  //
+  // |rect| is in Win32 window coordinates.
+  virtual void UpdateCursorRect(const Rect& rect);
+
+  UINT GetCurrentDPI();
+
+  UINT GetCurrentWidth();
+
+  UINT GetCurrentHeight();
+
+  // Returns the current pixel per scroll tick value.
+  virtual float GetScrollOffsetMultiplier();
+
+  // Delegate to a alert_node_ used to set the announcement text.
+  std::unique_ptr<AlertPlatformNodeDelegate> alert_delegate_;
+
+  // Accessibility node that represents an alert.
+  std::unique_ptr<ui::AXPlatformNodeWin> alert_node_;
+
+  // Handles running DirectManipulation on the window to receive trackpad
+  // gestures.
+  std::unique_ptr<DirectManipulationOwner> direct_manipulation_owner_;
 
  private:
+  // OS callback called by message pump.  Handles the WM_NCCREATE message which
+  // is passed when the non-client area is being created and enables automatic
+  // non-client DPI scaling so that the non-client area automatically
+  // responsponds to changes in DPI.  All other messages are handled by
+  // MessageHandler.
+  static LRESULT CALLBACK WndProc(HWND const window,
+                                  UINT const message,
+                                  WPARAM const wparam,
+                                  LPARAM const lparam) noexcept;
+
+  // WM_DPICHANGED_BEFOREPARENT defined in more recent Windows
+  // SDK
+  static const long kWmDpiChangedBeforeParent = 0x02E2;
+
+  // Timer identifier for DirectManipulation gesture polling.
+  static const int kDirectManipulationTimer = 1;
+
+  // Release OS resources associated with the window.
+  void Destroy();
+
+  // Registers a window class with default style attributes, cursor and
+  // icon.
+  WNDCLASS RegisterWindowClass(std::wstring& title);
+
+  // Retrieves a class instance pointer for |window|
+  static FlutterWindow* GetThisFromHandle(HWND const window) noexcept;
+
+  // Activates tracking for a "mouse leave" event.
+  void TrackMouseLeaveEvent(HWND hwnd);
+
+  // Stores new width and height and calls |OnResize| to notify inheritors
+  void HandleResize(UINT width, UINT height);
+
+  // Updates the cached scroll_offset_multiplier_ value based off OS settings.
+  void UpdateScrollOffsetMultiplier();
+
+  // Creates the ax_fragment_root_, alert_delegate_ and alert_node_ if they do
+  // not yet exist.
+  // Once set, they are not reset to nullptr.
+  void CreateAxFragmentRoot();
+
   // A pointer to a FlutterWindowsView that can be used to update engine
   // windowing and input state.
-  WindowBindingHandlerDelegate* binding_handler_delegate_;
+  WindowBindingHandlerDelegate* binding_handler_delegate_ = nullptr;
 
   // The last cursor set by Flutter. Defaults to the arrow cursor.
   HCURSOR current_cursor_;
 
   // The cursor rect set by Flutter.
   RECT cursor_rect_;
+
+  // The window receives resize and focus messages before its view is set, so
+  // these values cache the state of the window in the meantime so that the
+  // proper application lifecycle state can be updated once the view is set.
+  bool restored_ = false;
+  bool focused_ = false;
+
+  int current_dpi_ = 0;
+  int current_width_ = 0;
+  int current_height_ = 0;
+
+  // Holds the conversion factor from lines scrolled to pixels scrolled.
+  float scroll_offset_multiplier_;
+
+  // Member variable to hold window handle.
+  HWND window_handle_ = nullptr;
+
+  // Member variable to hold the window title.
+  std::wstring window_class_name_;
+
+  // Set to true to be notified when the mouse leaves the window.
+  bool tracking_mouse_leave_ = false;
+
+  // Keeps track of the last key code produced by a WM_KEYDOWN or WM_SYSKEYDOWN
+  // message.
+  int keycode_for_char_message_ = 0;
+
+  // Keeps track of the last mouse coordinates by a WM_MOUSEMOVE message.
+  double mouse_x_ = 0;
+  double mouse_y_ = 0;
+
+  // Generates touch point IDs for touch events.
+  SequentialIdGenerator touch_id_generator_;
+
+  // Abstracts Windows APIs that may not be available on all supported versions
+  // of Windows.
+  std::shared_ptr<WindowsProcTable> windows_proc_table_;
+
+  // Manages IME state.
+  std::unique_ptr<TextInputManager> text_input_manager_;
+
+  // Manages IME state.
+  std::unique_ptr<KeyboardManager> keyboard_manager_;
+
+  // Used for temporarily storing the WM_TOUCH-provided touch points.
+  std::vector<TOUCHINPUT> touch_points_;
+
+  // Implements IRawElementProviderFragmentRoot when UIA is enabled.
+  std::unique_ptr<ui::AXFragmentRootWin> ax_fragment_root_;
+
+  // Allow WindowAXFragmentRootDelegate to access protected method.
+  friend class WindowAXFragmentRootDelegate;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(FlutterWindow);
 };
 
 }  // namespace flutter
diff --git a/shell/platform/windows/flutter_window_unittests.cc b/shell/platform/windows/flutter_window_unittests.cc
index 2d149b6294367b562ccf0e92b9488746f10731cf..4b6d076911d1f06e2e71233994852e367b6d8878 100644
--- a/shell/platform/windows/flutter_window_unittests.cc
+++ b/shell/platform/windows/flutter_window_unittests.cc
@@ -2,109 +2,40 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/common/json_message_codec.h"
-#include "flutter/shell/platform/embedder/embedder.h"
-#include "flutter/shell/platform/embedder/test_utils/proc_table_replacement.h"
-#include "flutter/shell/platform/windows/flutter_windows_engine.h"
-#include "flutter/shell/platform/windows/keyboard_key_channel_handler.h"
-#include "flutter/shell/platform/windows/keyboard_key_handler.h"
-#include "flutter/shell/platform/windows/testing/engine_modifier.h"
-#include "flutter/shell/platform/windows/testing/flutter_window_test.h"
+#include "flutter/fml/macros.h"
+#include "flutter/shell/platform/windows/flutter_window.h"
+#include "flutter/shell/platform/windows/testing/flutter_windows_engine_builder.h"
 #include "flutter/shell/platform/windows/testing/mock_window_binding_handler.h"
 #include "flutter/shell/platform/windows/testing/mock_window_binding_handler_delegate.h"
-#include "flutter/shell/platform/windows/testing/test_keyboard.h"
-#include "flutter/shell/platform/windows/text_input_plugin.h"
-#include "flutter/shell/platform/windows/text_input_plugin_delegate.h"
+#include "flutter/shell/platform/windows/testing/windows_test.h"
+#include "flutter/shell/platform/windows/testing/wm_builders.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-#include <rapidjson/document.h>
-
-using testing::_;
-using testing::Invoke;
-using testing::Return;
-
 namespace flutter {
 namespace testing {
 
+using ::testing::_;
+using ::testing::AnyNumber;
+using ::testing::Invoke;
+using ::testing::Return;
+
 namespace {
 static constexpr int32_t kDefaultPointerDeviceId = 0;
 
-// A key event handler that can be spied on while it forwards calls to the real
-// key event handler.
-class SpyKeyboardKeyHandler : public KeyboardHandlerBase {
- public:
-  SpyKeyboardKeyHandler(flutter::BinaryMessenger* messenger) {
-    real_implementation_ = std::make_unique<KeyboardKeyHandler>();
-    real_implementation_->AddDelegate(
-        std::make_unique<KeyboardKeyChannelHandler>(messenger));
-    ON_CALL(*this, KeyboardHook(_, _, _, _, _, _, _))
-        .WillByDefault(Invoke(real_implementation_.get(),
-                              &KeyboardKeyHandler::KeyboardHook));
-  }
-
-  MOCK_METHOD7(KeyboardHook,
-               void(int key,
-                    int scancode,
-                    int action,
-                    char32_t character,
-                    bool extended,
-                    bool was_down,
-                    KeyEventCallback callback));
-
- private:
-  std::unique_ptr<KeyboardKeyHandler> real_implementation_;
-};
-
-// A text input plugin that can be spied on while it forwards calls to the real
-// text input plugin.
-class SpyTextInputPlugin : public TextInputPlugin,
-                           public TextInputPluginDelegate {
- public:
-  SpyTextInputPlugin(flutter::BinaryMessenger* messenger)
-      : TextInputPlugin(messenger, this) {
-    real_implementation_ = std::make_unique<TextInputPlugin>(messenger, this);
-    ON_CALL(*this, KeyboardHook(_, _, _, _, _, _))
-        .WillByDefault(
-            Invoke(real_implementation_.get(), &TextInputPlugin::KeyboardHook));
-    ON_CALL(*this, TextHook(_))
-        .WillByDefault(
-            Invoke(real_implementation_.get(), &TextInputPlugin::TextHook));
-  }
-
-  MOCK_METHOD6(KeyboardHook,
-               void(int key,
-                    int scancode,
-                    int action,
-                    char32_t character,
-                    bool extended,
-                    bool was_down));
-  MOCK_METHOD1(TextHook, void(const std::u16string& text));
-  MOCK_METHOD0(ComposeBeginHook, void());
-  MOCK_METHOD0(ComposeCommitHook, void());
-  MOCK_METHOD0(ComposeEndHook, void());
-  MOCK_METHOD2(ComposeChangeHook,
-               void(const std::u16string& text, int cursor_pos));
-
-  virtual void OnCursorRectUpdated(const Rect& rect) {}
-  virtual void OnResetImeComposing() {}
-
- private:
-  std::unique_ptr<TextInputPlugin> real_implementation_;
-};
-
 class MockFlutterWindow : public FlutterWindow {
  public:
-  MockFlutterWindow() : FlutterWindow(800, 600) {
+  MockFlutterWindow(bool reset_view_on_exit = true)
+      : reset_view_on_exit_(reset_view_on_exit) {
     ON_CALL(*this, GetDpiScale())
         .WillByDefault(Return(this->FlutterWindow::GetDpiScale()));
   }
-  virtual ~MockFlutterWindow() {}
-
-  // Prevent copying.
-  MockFlutterWindow(MockFlutterWindow const&) = delete;
-  MockFlutterWindow& operator=(MockFlutterWindow const&) = delete;
+  virtual ~MockFlutterWindow() {
+    if (reset_view_on_exit_) {
+      SetView(nullptr);
+    }
+  }
 
   // Wrapper for GetCurrentDPI() which is a protected method.
   UINT GetDpi() { return GetCurrentDPI(); }
@@ -116,27 +47,38 @@ class MockFlutterWindow : public FlutterWindow {
     return HandleMessage(message, wparam, lparam);
   }
 
-  MOCK_METHOD1(OnDpiScale, void(unsigned int));
-  MOCK_METHOD2(OnResize, void(unsigned int, unsigned int));
-  MOCK_METHOD4(OnPointerMove,
-               void(double, double, FlutterPointerDeviceKind, int32_t));
-  MOCK_METHOD5(OnPointerDown,
-               void(double, double, FlutterPointerDeviceKind, int32_t, UINT));
-  MOCK_METHOD5(OnPointerUp,
-               void(double, double, FlutterPointerDeviceKind, int32_t, UINT));
-  MOCK_METHOD4(OnPointerLeave,
-               void(double, double, FlutterPointerDeviceKind, int32_t));
-  MOCK_METHOD0(OnSetCursor, void());
-  MOCK_METHOD0(GetScrollOffsetMultiplier, float());
-  MOCK_METHOD0(GetHighContrastEnabled, bool());
-  MOCK_METHOD0(GetDpiScale, float());
-  MOCK_METHOD0(IsVisible, bool());
-  MOCK_METHOD1(UpdateCursorRect, void(const Rect&));
-  MOCK_METHOD0(OnResetImeComposing, void());
-  MOCK_METHOD3(Win32DispatchMessage, UINT(UINT, WPARAM, LPARAM));
-  MOCK_METHOD4(Win32PeekMessage, BOOL(LPMSG, UINT, UINT, UINT));
-  MOCK_METHOD1(Win32MapVkToChar, uint32_t(uint32_t));
-  MOCK_METHOD0(GetPlatformWindow, HWND());
+  MOCK_METHOD(void, OnDpiScale, (unsigned int), (override));
+  MOCK_METHOD(void, OnResize, (unsigned int, unsigned int), (override));
+  MOCK_METHOD(void,
+              OnPointerMove,
+              (double, double, FlutterPointerDeviceKind, int32_t, int),
+              (override));
+  MOCK_METHOD(void,
+              OnPointerDown,
+              (double, double, FlutterPointerDeviceKind, int32_t, UINT),
+              (override));
+  MOCK_METHOD(void,
+              OnPointerUp,
+              (double, double, FlutterPointerDeviceKind, int32_t, UINT),
+              (override));
+  MOCK_METHOD(void,
+              OnPointerLeave,
+              (double, double, FlutterPointerDeviceKind, int32_t),
+              (override));
+  MOCK_METHOD(void, OnSetCursor, (), (override));
+  MOCK_METHOD(float, GetScrollOffsetMultiplier, (), (override));
+  MOCK_METHOD(float, GetDpiScale, (), (override));
+  MOCK_METHOD(void, UpdateCursorRect, (const Rect&), (override));
+  MOCK_METHOD(void, OnResetImeComposing, (), (override));
+  MOCK_METHOD(UINT, Win32DispatchMessage, (UINT, WPARAM, LPARAM), (override));
+  MOCK_METHOD(BOOL, Win32PeekMessage, (LPMSG, UINT, UINT, UINT), (override));
+  MOCK_METHOD(uint32_t, Win32MapVkToChar, (uint32_t), (override));
+  MOCK_METHOD(HWND, GetWindowHandle, (), (override));
+  MOCK_METHOD(ui::AXFragmentRootDelegateWin*,
+              GetAxFragmentRootDelegate,
+              (),
+              (override));
+  MOCK_METHOD(void, OnWindowStateEvent, (WindowStateEvent), (override));
 
  protected:
   // |KeyboardManager::WindowDelegate|
@@ -146,77 +88,39 @@ class MockFlutterWindow : public FlutterWindow {
                              LPARAM lParam) override {
     return kWmResultDefault;
   }
+
+ private:
+  bool reset_view_on_exit_;
+  FML_DISALLOW_COPY_AND_ASSIGN(MockFlutterWindow);
 };
 
-// A FlutterWindowsView that overrides the RegisterKeyboardHandlers function
-// to register the keyboard hook handlers that can be spied upon.
-class TestFlutterWindowsView : public FlutterWindowsView {
+class MockFlutterWindowsView : public FlutterWindowsView {
  public:
-  TestFlutterWindowsView(std::unique_ptr<WindowBindingHandler> window_binding)
-      : FlutterWindowsView(std::move(window_binding)) {}
-  ~TestFlutterWindowsView() {}
-
-  SpyKeyboardKeyHandler* key_event_handler;
-  SpyTextInputPlugin* text_input_plugin;
-
-  MOCK_METHOD4(NotifyWinEventWrapper, void(DWORD, HWND, LONG, LONG));
-
- protected:
-  std::unique_ptr<KeyboardHandlerBase> CreateKeyboardKeyHandler(
-      flutter::BinaryMessenger* messenger,
-      flutter::KeyboardKeyEmbedderHandler::GetKeyStateHandler get_key_state,
-      KeyboardKeyEmbedderHandler::MapVirtualKeyToScanCode map_vk_to_scan)
-      override {
-    auto spy_key_event_handler =
-        std::make_unique<SpyKeyboardKeyHandler>(messenger);
-    key_event_handler = spy_key_event_handler.get();
-    return spy_key_event_handler;
+  MockFlutterWindowsView(FlutterWindowsEngine* engine,
+                         std::unique_ptr<WindowBindingHandler> window_binding)
+      : FlutterWindowsView(kImplicitViewId, engine, std::move(window_binding)) {
   }
+  ~MockFlutterWindowsView() {}
 
-  std::unique_ptr<TextInputPlugin> CreateTextInputPlugin(
-      flutter::BinaryMessenger* messenger) override {
-    auto spy_key_event_handler =
-        std::make_unique<SpyTextInputPlugin>(messenger);
-    text_input_plugin = spy_key_event_handler.get();
-    return spy_key_event_handler;
-  }
-};
+  MOCK_METHOD(void,
+              NotifyWinEventWrapper,
+              (ui::AXPlatformNodeWin*, ax::mojom::Event),
+              (override));
 
-// The static value to return as the "handled" value from the framework for key
-// events. Individual tests set this to change the framework response that the
-// test engine simulates.
-static bool test_response = false;
-
-// Returns an engine instance configured with dummy project path values, and
-// overridden methods for sending platform messages, so that the engine can
-// respond as if the framework were connected.
-std::unique_ptr<FlutterWindowsEngine> GetTestEngine() {
-  FlutterDesktopEngineProperties properties = {};
-  properties.assets_path = L"C:\\foo\\flutter_assets";
-  properties.icu_data_path = L"C:\\foo\\icudtl.dat";
-  properties.aot_library_path = L"C:\\foo\\aot.so";
-  FlutterProjectBundle project(properties);
-  auto engine = std::make_unique<FlutterWindowsEngine>(project);
-
-  EngineModifier modifier(engine.get());
-  auto key_response_controller = std::make_shared<MockKeyResponseController>();
-  key_response_controller->SetChannelResponse(
-      [](MockKeyResponseController::ResponseCallback callback) {
-        callback(test_response);
-      });
-  MockEmbedderApiForKeyboard(modifier, key_response_controller);
+ private:
+  FML_DISALLOW_COPY_AND_ASSIGN(MockFlutterWindowsView);
+};
 
-  return engine;
-}
+class FlutterWindowTest : public WindowsTest {};
 
 }  // namespace
 
-TEST(FlutterWindowTest, CreateDestroy) {
-  FlutterWindowTest window(800, 600);
+TEST_F(FlutterWindowTest, CreateDestroy) {
+  FlutterWindow window(800, 600);
   ASSERT_TRUE(TRUE);
 }
 
-TEST(FlutterWindowTest, OnBitmapSurfaceUpdated) {
+TEST_F(FlutterWindowTest, OnBitmapSurfaceUpdated) {
   FlutterWindow win32window(100, 100);
   int old_handle_count = GetGuiResources(GetCurrentProcess(), GR_GDIOBJECTS);
 
@@ -233,10 +137,9 @@ TEST(FlutterWindowTest, OnBitmapSurfaceUpdated) {
 // Tests that composing rect updates are transformed from Flutter logical
 // coordinates to device coordinates and passed to the text input manager
 // when the DPI scale is 100% (96 DPI).
-TEST(FlutterWindowTest, OnCursorRectUpdatedRegularDPI) {
+TEST_F(FlutterWindowTest, OnCursorRectUpdatedRegularDPI) {
   MockFlutterWindow win32window;
-  ON_CALL(win32window, GetDpiScale()).WillByDefault(Return(1.0));
-  EXPECT_CALL(win32window, GetDpiScale()).Times(1);
+  EXPECT_CALL(win32window, GetDpiScale()).WillOnce(Return(1.0));
 
   Rect cursor_rect(Point(10, 20), Size(30, 40));
   EXPECT_CALL(win32window, UpdateCursorRect(cursor_rect)).Times(1);
@@ -247,10 +150,9 @@ TEST(FlutterWindowTest, OnCursorRectUpdatedRegularDPI) {
 // Tests that composing rect updates are transformed from Flutter logical
 // coordinates to device coordinates and passed to the text input manager
 // when the DPI scale is 150% (144 DPI).
-TEST(FlutterWindowTest, OnCursorRectUpdatedHighDPI) {
+TEST_F(FlutterWindowTest, OnCursorRectUpdatedHighDPI) {
   MockFlutterWindow win32window;
-  ON_CALL(win32window, GetDpiScale()).WillByDefault(Return(1.5));
-  EXPECT_CALL(win32window, GetDpiScale()).Times(1);
+  EXPECT_CALL(win32window, GetDpiScale()).WillOnce(Return(1.5));
 
   Rect expected_cursor_rect(Point(15, 30), Size(45, 60));
   EXPECT_CALL(win32window, UpdateCursorRect(expected_cursor_rect)).Times(1);
@@ -259,22 +161,24 @@ TEST(FlutterWindowTest, OnCursorRectUpdatedHighDPI) {
   win32window.OnCursorRectUpdated(cursor_rect);
 }
 
-TEST(FlutterWindowTest, OnPointerStarSendsDeviceType) {
+TEST_F(FlutterWindowTest, OnPointerStarSendsDeviceType) {
   FlutterWindow win32window(100, 100);
   MockWindowBindingHandlerDelegate delegate;
+  EXPECT_CALL(delegate, OnWindowStateEvent).Times(AnyNumber());
   win32window.SetView(&delegate);
+
   // Move
   EXPECT_CALL(delegate,
               OnPointerMove(10.0, 10.0, kFlutterPointerDeviceKindMouse,
-                            kDefaultPointerDeviceId))
+                            kDefaultPointerDeviceId, 0))
       .Times(1);
   EXPECT_CALL(delegate,
               OnPointerMove(10.0, 10.0, kFlutterPointerDeviceKindTouch,
-                            kDefaultPointerDeviceId))
+                            kDefaultPointerDeviceId, 0))
       .Times(1);
   EXPECT_CALL(delegate,
               OnPointerMove(10.0, 10.0, kFlutterPointerDeviceKindStylus,
-                            kDefaultPointerDeviceId))
+                            kDefaultPointerDeviceId, 0))
       .Times(1);
 
   // Down
@@ -323,7 +227,7 @@ TEST(FlutterWindowTest, OnPointerStarSendsDeviceType) {
       .Times(1);
 
   win32window.OnPointerMove(10.0, 10.0, kFlutterPointerDeviceKindMouse,
-                            kDefaultPointerDeviceId);
+                            kDefaultPointerDeviceId, 0);
   win32window.OnPointerDown(10.0, 10.0, kFlutterPointerDeviceKindMouse,
                             kDefaultPointerDeviceId, WM_LBUTTONDOWN);
   win32window.OnPointerUp(10.0, 10.0, kFlutterPointerDeviceKindMouse,
@@ -333,7 +237,7 @@ TEST(FlutterWindowTest, OnPointerStarSendsDeviceType) {
 
   // Touch
   win32window.OnPointerMove(10.0, 10.0, kFlutterPointerDeviceKindTouch,
-                            kDefaultPointerDeviceId);
+                            kDefaultPointerDeviceId, 0);
   win32window.OnPointerDown(10.0, 10.0, kFlutterPointerDeviceKindTouch,
                             kDefaultPointerDeviceId, WM_LBUTTONDOWN);
   win32window.OnPointerUp(10.0, 10.0, kFlutterPointerDeviceKindTouch,
@@ -343,25 +247,31 @@ TEST(FlutterWindowTest, OnPointerStarSendsDeviceType) {
 
   // Pen
   win32window.OnPointerMove(10.0, 10.0, kFlutterPointerDeviceKindStylus,
-                            kDefaultPointerDeviceId);
+                            kDefaultPointerDeviceId, 0);
   win32window.OnPointerDown(10.0, 10.0, kFlutterPointerDeviceKindStylus,
                             kDefaultPointerDeviceId, WM_LBUTTONDOWN);
   win32window.OnPointerUp(10.0, 10.0, kFlutterPointerDeviceKindStylus,
                           kDefaultPointerDeviceId, WM_LBUTTONDOWN);
   win32window.OnPointerLeave(10.0, 10.0, kFlutterPointerDeviceKindStylus,
                              kDefaultPointerDeviceId);
+
+  // Destruction of win32window sends a HIDE update. In situ, the window is
+  // owned by the delegate, and so is destructed first. Not so here.
+  win32window.SetView(nullptr);
 }
 
 // Tests that calls to OnScroll in turn calls GetScrollOffsetMultiplier
 // for mapping scroll ticks to pixels.
-TEST(FlutterWindowTest, OnScrollCallsGetScrollOffsetMultiplier) {
+TEST_F(FlutterWindowTest, OnScrollCallsGetScrollOffsetMultiplier) {
   MockFlutterWindow win32window;
   MockWindowBindingHandlerDelegate delegate;
+  EXPECT_CALL(win32window, OnWindowStateEvent).Times(AnyNumber());
   win32window.SetView(&delegate);
 
-  ON_CALL(win32window, GetScrollOffsetMultiplier())
-      .WillByDefault(Return(120.0f));
-  EXPECT_CALL(win32window, GetScrollOffsetMultiplier()).Times(1);
+  EXPECT_CALL(win32window, GetWindowHandle).WillOnce([&win32window]() {
+    return win32window.FlutterWindow::GetWindowHandle();
+  });
+  EXPECT_CALL(win32window, GetScrollOffsetMultiplier).WillOnce(Return(120.0f));
 
   EXPECT_CALL(delegate,
               OnScroll(_, _, 0, 0, 120.0f, kFlutterPointerDeviceKindMouse,
@@ -372,9 +282,10 @@ TEST(FlutterWindowTest, OnScrollCallsGetScrollOffsetMultiplier) {
                        kDefaultPointerDeviceId);
 }
 
-TEST(FlutterWindowTest, OnWindowRepaint) {
+TEST_F(FlutterWindowTest, OnWindowRepaint) {
   MockFlutterWindow win32window;
   MockWindowBindingHandlerDelegate delegate;
+  EXPECT_CALL(win32window, OnWindowStateEvent).Times(AnyNumber());
   win32window.SetView(&delegate);
 
   EXPECT_CALL(delegate, OnWindowRepaint()).Times(1);
@@ -382,43 +293,43 @@ TEST(FlutterWindowTest, OnWindowRepaint) {
   win32window.InjectWindowMessage(WM_PAINT, 0, 0);
 }
 
-TEST(FlutterWindowTest, OnThemeChange) {
+TEST_F(FlutterWindowTest, OnThemeChange) {
   MockFlutterWindow win32window;
   MockWindowBindingHandlerDelegate delegate;
+  EXPECT_CALL(win32window, OnWindowStateEvent).Times(AnyNumber());
   win32window.SetView(&delegate);
 
-  ON_CALL(win32window, GetHighContrastEnabled()).WillByDefault(Return(true));
-  EXPECT_CALL(delegate, UpdateHighContrastEnabled(true)).Times(1);
+  EXPECT_CALL(delegate, OnHighContrastChanged).Times(1);
 
   win32window.InjectWindowMessage(WM_THEMECHANGED, 0, 0);
 }
 
-TEST(FlutterWindowTest, InitialAccessibilityFeatures) {
+// The window should return no root accessibility node if
+// it isn't attached to a view.
+// Regression test for https://github.com/flutter/flutter/issues/129791
+TEST_F(FlutterWindowTest, AccessibilityNodeWithoutView) {
   MockFlutterWindow win32window;
-  MockWindowBindingHandlerDelegate delegate;
-  win32window.SetView(&delegate);
-
-  ON_CALL(win32window, GetHighContrastEnabled()).WillByDefault(Return(true));
-  EXPECT_CALL(delegate, UpdateHighContrastEnabled(true)).Times(1);
 
-  win32window.SendInitialAccessibilityFeatures();
+  EXPECT_EQ(win32window.GetNativeViewAccessible(), nullptr);
 }
 
 // Ensure that announcing the alert propagates the message to the alert node.
 // Different screen readers use different properties for alerts.
-TEST(FlutterWindowTest, AlertNode) {
-  std::unique_ptr<MockFlutterWindow> win32window =
-      std::make_unique<MockFlutterWindow>();
-  ON_CALL(*win32window, GetPlatformWindow()).WillByDefault(Return(nullptr));
-  AccessibilityRootNode* root_node = win32window->GetAccessibilityRootNode();
-  TestFlutterWindowsView view(std::move(win32window));
-  EXPECT_CALL(view,
-              NotifyWinEventWrapper(EVENT_SYSTEM_ALERT, nullptr, OBJID_CLIENT,
-                                    AccessibilityRootNode::kAlertChildId))
-      .Times(1);
+TEST_F(FlutterWindowTest, AlertNode) {
+  std::unique_ptr<FlutterWindowsEngine> engine =
+      FlutterWindowsEngineBuilder{GetContext()}.Build();
+  auto win32window = std::make_unique<MockFlutterWindow>();
+  EXPECT_CALL(*win32window.get(), GetAxFragmentRootDelegate())
+      .WillRepeatedly(Return(nullptr));
+  EXPECT_CALL(*win32window.get(), OnWindowStateEvent).Times(AnyNumber());
+  EXPECT_CALL(*win32window.get(), GetWindowHandle).Times(AnyNumber());
+  MockFlutterWindowsView view{engine.get(), std::move(win32window)};
   std::wstring message = L"Test alert";
+  EXPECT_CALL(view, NotifyWinEventWrapper(_, ax::mojom::Event::kAlert))
+      .Times(1);
   view.AnnounceAlert(message);
-  IAccessible* alert = root_node->GetOrCreateAlert();
+
+  IAccessible* alert = view.AlertNode();
   VARIANT self{.vt = VT_I4, .lVal = CHILDID_SELF};
   BSTR strptr;
   alert->get_accName(self, &strptr);
@@ -436,5 +347,77 @@ TEST(FlutterWindowTest, AlertNode) {
   EXPECT_EQ(role.lVal, ROLE_SYSTEM_ALERT);
 }
 
+TEST_F(FlutterWindowTest, LifecycleFocusMessages) {
+  MockFlutterWindow win32window;
+  EXPECT_CALL(win32window, GetWindowHandle)
+      .WillRepeatedly(Return(reinterpret_cast<HWND>(1)));
+  MockWindowBindingHandlerDelegate delegate;
+
+  WindowStateEvent last_event;
+  EXPECT_CALL(delegate, OnWindowStateEvent)
+      .WillRepeatedly([&last_event](HWND hwnd, WindowStateEvent event) {
+        last_event = event;
+      });
+  EXPECT_CALL(win32window, OnWindowStateEvent)
+      .WillRepeatedly([&](WindowStateEvent event) {
+        win32window.FlutterWindow::OnWindowStateEvent(event);
+      });
+  EXPECT_CALL(win32window, OnResize).Times(AnyNumber());
+
+  win32window.SetView(&delegate);
+
+  win32window.InjectWindowMessage(WM_SIZE, 0, 0);
+  EXPECT_EQ(last_event, WindowStateEvent::kHide);
+
+  win32window.InjectWindowMessage(WM_SIZE, 0, MAKEWORD(1, 1));
+  EXPECT_EQ(last_event, WindowStateEvent::kShow);
+
+  win32window.InjectWindowMessage(WM_SETFOCUS, 0, 0);
+  EXPECT_EQ(last_event, WindowStateEvent::kFocus);
+
+  win32window.InjectWindowMessage(WM_KILLFOCUS, 0, 0);
+  EXPECT_EQ(last_event, WindowStateEvent::kUnfocus);
+}
+
+TEST_F(FlutterWindowTest, CachedLifecycleMessage) {
+  MockFlutterWindow win32window;
+  EXPECT_CALL(win32window, GetWindowHandle)
+      .WillRepeatedly(Return(reinterpret_cast<HWND>(1)));
+  EXPECT_CALL(win32window, OnWindowStateEvent)
+      .WillRepeatedly([&](WindowStateEvent event) {
+        win32window.FlutterWindow::OnWindowStateEvent(event);
+      });
+  EXPECT_CALL(win32window, OnResize).Times(1);
+
+  // Restore
+  win32window.InjectWindowMessage(WM_SIZE, 0, MAKEWORD(1, 1));
+
+  // Focus
+  win32window.InjectWindowMessage(WM_SETFOCUS, 0, 0);
+
+  MockWindowBindingHandlerDelegate delegate;
+  bool focused = false;
+  bool restored = false;
+  EXPECT_CALL(delegate, OnWindowStateEvent)
+      .WillRepeatedly([&](HWND hwnd, WindowStateEvent event) {
+        if (event == WindowStateEvent::kFocus) {
+          focused = true;
+        } else if (event == WindowStateEvent::kShow) {
+          restored = true;
+        }
+      });
+
+  win32window.SetView(&delegate);
+  EXPECT_TRUE(focused);
+  EXPECT_TRUE(restored);
+}
+
+TEST_F(FlutterWindowTest, UpdateCursor) {
+  FlutterWindow win32window(100, 100);
+  win32window.UpdateFlutterCursor("text");
+  HCURSOR cursor = ::GetCursor();
+  EXPECT_EQ(cursor, ::LoadCursor(nullptr, IDC_IBEAM));
+}
+
 }  // namespace testing
 }  // namespace flutter
diff --git a/shell/platform/windows/flutter_windows.cc b/shell/platform/windows/flutter_windows.cc
index ad8754b2ad69d11f406db50fcb1c7215065c648e..874b97d537c224ebefa000448c006871c6b96953 100644
--- a/shell/platform/windows/flutter_windows.cc
+++ b/shell/platform/windows/flutter_windows.cc
@@ -7,11 +7,9 @@
 #include <io.h>
 
 #include <algorithm>
-#include <cassert>
 #include <chrono>
 #include <cstdlib>
 #include <filesystem>
-#include <iostream>
 #include <memory>
 #include <vector>
 
@@ -24,6 +22,7 @@
 #include "flutter/shell/platform/windows/flutter_window.h"
 #include "flutter/shell/platform/windows/flutter_windows_engine.h"
 #include "flutter/shell/platform/windows/flutter_windows_view.h"
+#include "flutter/shell/platform/windows/flutter_windows_view_controller.h"
 #include "flutter/shell/platform/windows/window_binding_handler.h"
 #include "flutter/shell/platform/windows/window_state.h"
 
@@ -41,6 +40,16 @@ static FlutterDesktopEngineRef HandleForEngine(
   return reinterpret_cast<FlutterDesktopEngineRef>(engine);
 }
 
+static flutter::FlutterWindowsViewController* ViewControllerFromHandle(
+    FlutterDesktopViewControllerRef ref) {
+  return reinterpret_cast<flutter::FlutterWindowsViewController*>(ref);
+}
+
+static FlutterDesktopViewControllerRef HandleForViewController(
+    flutter::FlutterWindowsViewController* view_controller) {
+  return reinterpret_cast<FlutterDesktopViewControllerRef>(view_controller);
+}
+
 // Returns the view corresponding to the given opaque API handle.
 static flutter::FlutterWindowsView* ViewFromHandle(FlutterDesktopViewRef ref) {
   return reinterpret_cast<flutter::FlutterWindowsView*>(ref);
@@ -63,61 +72,101 @@ static FlutterDesktopTextureRegistrarRef HandleForTextureRegistrar(
   return reinterpret_cast<FlutterDesktopTextureRegistrarRef>(registrar);
 }
 
-FlutterDesktopViewControllerRef FlutterDesktopViewControllerCreate(
+// Creates a view controller that might own the engine.
+//
+// If `owns_engine` is true, then the returned `FlutterDesktopViewControllerRef`
+// owns `engine_ref` and will deallocate `engine_ref` upon its own destruction.
+static FlutterDesktopViewControllerRef CreateViewController(
+    FlutterDesktopEngineRef engine_ref,
     int width,
     int height,
-    FlutterDesktopEngineRef engine) {
+    bool owns_engine) {
+  flutter::FlutterWindowsEngine* engine_ptr = EngineFromHandle(engine_ref);
   std::unique_ptr<flutter::WindowBindingHandler> window_wrapper =
-      std::make_unique<flutter::FlutterWindow>(width, height);
-
-  auto state = std::make_unique<FlutterDesktopViewControllerState>();
-  state->view =
-      std::make_unique<flutter::FlutterWindowsView>(std::move(window_wrapper));
-  // Take ownership of the engine, starting it if necessary.
-  state->view->SetEngine(
-      std::unique_ptr<flutter::FlutterWindowsEngine>(EngineFromHandle(engine)));
-  state->view->CreateRenderSurface();
-  if (!state->view->GetEngine()->running()) {
-    if (!state->view->GetEngine()->Run()) {
+      std::make_unique<flutter::FlutterWindow>(
+          width, height, engine_ptr->windows_proc_table());
+
+  std::unique_ptr<flutter::FlutterWindowsEngine> engine;
+  if (owns_engine) {
+    engine = std::unique_ptr<flutter::FlutterWindowsEngine>(engine_ptr);
+  }
+
+  std::unique_ptr<flutter::FlutterWindowsView> view =
+      engine_ptr->CreateView(std::move(window_wrapper));
+  auto controller = std::make_unique<flutter::FlutterWindowsViewController>(
+      std::move(engine), std::move(view));
+
+  controller->view()->CreateRenderSurface();
+  if (!controller->engine()->running()) {
+    if (!controller->engine()->Run()) {
       return nullptr;
     }
   }
 
   // Must happen after engine is running.
-  state->view->SendInitialBounds();
-  state->view->SendInitialAccessibilityFeatures();
-  return state.release();
+  controller->view()->SendInitialBounds();
+
+  // The Windows embedder listens to accessibility updates using the
+  // view's HWND. The embedder's accessibility features may be stale if
+  // the app was in headless mode.
+  controller->engine()->UpdateAccessibilityFeatures();
+
+  return HandleForViewController(controller.release());
+}
+
+FlutterDesktopViewControllerRef FlutterDesktopViewControllerCreate(
+    int width,
+    int height,
+    FlutterDesktopEngineRef engine) {
+  return CreateViewController(engine, width, height, /*owns_engine=*/true);
+}
+
+FlutterDesktopViewControllerRef FlutterDesktopEngineCreateViewController(
+    FlutterDesktopEngineRef engine,
+    const FlutterDesktopViewControllerProperties* properties) {
+  return CreateViewController(engine, properties->width, properties->height,
+                              /*owns_engine=*/false);
 }
 
-void FlutterDesktopViewControllerDestroy(
-    FlutterDesktopViewControllerRef controller) {
+void FlutterDesktopViewControllerDestroy(FlutterDesktopViewControllerRef ref) {
+  auto controller = ViewControllerFromHandle(ref);
   delete controller;
 }
 
+FlutterDesktopViewId FlutterDesktopViewControllerGetViewId(
+    FlutterDesktopViewControllerRef ref) {
+  auto controller = ViewControllerFromHandle(ref);
+  return static_cast<FlutterDesktopViewId>(controller->view()->view_id());
+}
+
 FlutterDesktopEngineRef FlutterDesktopViewControllerGetEngine(
-    FlutterDesktopViewControllerRef controller) {
-  return HandleForEngine(controller->view->GetEngine());
+    FlutterDesktopViewControllerRef ref) {
+  auto controller = ViewControllerFromHandle(ref);
+  return HandleForEngine(controller->engine());
 }
 
 FlutterDesktopViewRef FlutterDesktopViewControllerGetView(
-    FlutterDesktopViewControllerRef controller) {
-  return HandleForView(controller->view.get());
+    FlutterDesktopViewControllerRef ref) {
+  auto controller = ViewControllerFromHandle(ref);
+  return HandleForView(controller->view());
 }
 
 void FlutterDesktopViewControllerForceRedraw(
-    FlutterDesktopViewControllerRef controller) {
-  controller->view->ForceRedraw();
+    FlutterDesktopViewControllerRef ref) {
+  auto controller = ViewControllerFromHandle(ref);
+  controller->view()->ForceRedraw();
 }
 
 bool FlutterDesktopViewControllerHandleTopLevelWindowProc(
-    FlutterDesktopViewControllerRef controller,
+    FlutterDesktopViewControllerRef ref,
     HWND hwnd,
     UINT message,
     WPARAM wparam,
     LPARAM lparam,
     LRESULT* result) {
+  auto controller = ViewControllerFromHandle(ref);
   std::optional<LRESULT> delegate_result =
-      controller->view->GetEngine()
+      controller->engine()
           ->window_proc_delegate_manager()
           ->OnTopLevelWindowProc(hwnd, message, wparam, lparam);
   if (delegate_result) {
@@ -190,15 +239,15 @@ void FlutterDesktopEngineSetNextFrameCallback(FlutterDesktopEngineRef engine,
 }
 
 HWND FlutterDesktopViewGetHWND(FlutterDesktopViewRef view) {
-  return ViewFromHandle(view)->GetPlatformWindow();
+  return ViewFromHandle(view)->GetWindowHandle();
 }
 
 IDXGIAdapter* FlutterDesktopViewGetGraphicsAdapter(FlutterDesktopViewRef view) {
-  auto surface_manager = ViewFromHandle(view)->GetEngine()->surface_manager();
-  if (surface_manager) {
+  auto egl_manager = ViewFromHandle(view)->GetEngine()->egl_manager();
+  if (egl_manager) {
     Microsoft::WRL::ComPtr<ID3D11Device> d3d_device;
     Microsoft::WRL::ComPtr<IDXGIDevice> dxgi_device;
-    if (surface_manager->GetDevice(d3d_device.GetAddressOf()) &&
+    if (egl_manager->GetDevice(d3d_device.GetAddressOf()) &&
         SUCCEEDED(d3d_device.As(&dxgi_device))) {
       IDXGIAdapter* adapter;
       if (SUCCEEDED(dxgi_device->GetAdapter(&adapter))) {
@@ -209,9 +258,39 @@ IDXGIAdapter* FlutterDesktopViewGetGraphicsAdapter(FlutterDesktopViewRef view) {
   return nullptr;
 }
 
+bool FlutterDesktopEngineProcessExternalWindowMessage(
+    FlutterDesktopEngineRef engine,
+    HWND hwnd,
+    UINT message,
+    WPARAM wparam,
+    LPARAM lparam,
+    LRESULT* result) {
+  std::optional<LRESULT> lresult =
+      EngineFromHandle(engine)->ProcessExternalWindowMessage(hwnd, message,
+                                                             wparam, lparam);
+  if (result && lresult.has_value()) {
+    *result = lresult.value();
+  }
+  return lresult.has_value();
+}
+
+void FlutterDesktopEngineRegisterPlatformViewType(
+    FlutterDesktopEngineRef engine,
+    const char* view_type_name,
+    FlutterPlatformViewTypeEntry view_type) {
+  // TODO(schectman): forward to platform view manager.
+  // https://github.com/flutter/flutter/issues/143375
+}
+
 FlutterDesktopViewRef FlutterDesktopPluginRegistrarGetView(
     FlutterDesktopPluginRegistrarRef registrar) {
-  return HandleForView(registrar->engine->view());
+  return HandleForView(registrar->engine->view(flutter::kImplicitViewId));
+}
+
+FlutterDesktopViewRef FlutterDesktopPluginRegistrarGetViewById(
+    FlutterDesktopPluginRegistrarRef registrar,
+    FlutterDesktopViewId view_id) {
+  return HandleForView(registrar->engine->view(view_id));
 }
 
 void FlutterDesktopPluginRegistrarRegisterTopLevelWindowProcDelegate(
@@ -267,6 +346,9 @@ bool FlutterDesktopMessengerSendWithReply(FlutterDesktopMessengerRef messenger,
                                           const size_t message_size,
                                           const FlutterDesktopBinaryReply reply,
                                           void* user_data) {
+  FML_DCHECK(FlutterDesktopMessengerIsAvailable(messenger))
+      << "Messenger must reference a running engine to send a message";
+
   return flutter::FlutterDesktopMessenger::FromRef(messenger)
       ->GetEngine()
       ->SendPlatformMessage(channel, message, message_size, reply, user_data);
@@ -285,6 +367,9 @@ void FlutterDesktopMessengerSendResponse(
     const FlutterDesktopMessageResponseHandle* handle,
     const uint8_t* data,
     size_t data_length) {
+  FML_DCHECK(FlutterDesktopMessengerIsAvailable(messenger))
+      << "Messenger must reference a running engine to send a response";
+
   flutter::FlutterDesktopMessenger::FromRef(messenger)
       ->GetEngine()
       ->SendPlatformMessageResponse(handle, data, data_length);
@@ -294,6 +379,9 @@ void FlutterDesktopMessengerSetCallback(FlutterDesktopMessengerRef messenger,
                                         const char* channel,
                                         FlutterDesktopMessageCallback callback,
                                         void* user_data) {
+  FML_DCHECK(FlutterDesktopMessengerIsAvailable(messenger))
+      << "Messenger must reference a running engine to set a callback";
+
   flutter::FlutterDesktopMessenger::FromRef(messenger)
       ->GetEngine()
       ->message_dispatcher()
diff --git a/shell/platform/windows/flutter_windows_engine.cc b/shell/platform/windows/flutter_windows_engine.cc
index 1cd2fc408c330fd717b7ed11879be3c5f7edd1e3..988e1f47954c65e9ea3adfd35147ef9bf367b004 100644
--- a/shell/platform/windows/flutter_windows_engine.cc
+++ b/shell/platform/windows/flutter_windows_engine.cc
@@ -7,7 +7,6 @@
 #include <dwmapi.h>
 
 #include <filesystem>
-#include <iostream>
 #include <sstream>
 
 #include "flutter/fml/logging.h"
@@ -16,8 +15,12 @@
 #include "flutter/shell/platform/common/client_wrapper/binary_messenger_impl.h"
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_message_codec.h"
 #include "flutter/shell/platform/common/path_utils.h"
+#include "flutter/shell/platform/embedder/embedder_struct_macros.h"
 #include "flutter/shell/platform/windows/accessibility_bridge_windows.h"
+#include "flutter/shell/platform/windows/compositor_opengl.h"
+#include "flutter/shell/platform/windows/compositor_software.h"
 #include "flutter/shell/platform/windows/flutter_windows_view.h"
+#include "flutter/shell/platform/windows/keyboard_key_channel_handler.h"
 #include "flutter/shell/platform/windows/system_utils.h"
 #include "flutter/shell/platform/windows/task_runner.h"
 #include "flutter/third_party/accessibility/ax/ax_node.h"
@@ -52,35 +55,23 @@ FlutterRendererConfig GetOpenGLRendererConfig() {
   config.open_gl.struct_size = sizeof(config.open_gl);
   config.open_gl.make_current = [](void* user_data) -> bool {
     auto host = static_cast<FlutterWindowsEngine*>(user_data);
-    if (!host->view()) {
+    if (!host->egl_manager()) {
       return false;
     }
-    return host->view()->MakeCurrent();
+    return host->egl_manager()->render_context()->MakeCurrent();
   };
   config.open_gl.clear_current = [](void* user_data) -> bool {
     auto host = static_cast<FlutterWindowsEngine*>(user_data);
-    if (!host->view()) {
+    if (!host->egl_manager()) {
       return false;
     }
-    return host->view()->ClearContext();
-  };
-  config.open_gl.present = [](void* user_data) -> bool {
-    auto host = static_cast<FlutterWindowsEngine*>(user_data);
-    if (!host->view()) {
-      return false;
-    }
-    return host->view()->SwapBuffers();
+    return host->egl_manager()->render_context()->ClearCurrent();
   };
+  config.open_gl.present = [](void* user_data) -> bool { FML_UNREACHABLE(); };
   config.open_gl.fbo_reset_after_present = true;
   config.open_gl.fbo_with_frame_info_callback =
       [](void* user_data, const FlutterFrameInfo* info) -> uint32_t {
-    auto host = static_cast<FlutterWindowsEngine*>(user_data);
-    if (host->view()) {
-      return host->view()->GetFrameBufferId(info->size.width,
-                                            info->size.height);
-    } else {
-      return kWindowFrameBufferID;
-    }
+    FML_UNREACHABLE();
   };
   config.open_gl.gl_proc_resolver = [](void* user_data,
                                        const char* what) -> void* {
@@ -88,10 +79,10 @@ FlutterRendererConfig GetOpenGLRendererConfig() {
   };
   config.open_gl.make_resource_current = [](void* user_data) -> bool {
     auto host = static_cast<FlutterWindowsEngine*>(user_data);
-    if (!host->view()) {
+    if (!host->egl_manager()) {
       return false;
     }
-    return host->view()->MakeResourceCurrent();
+    return host->egl_manager()->resource_context()->MakeCurrent();
   };
   config.open_gl.gl_external_texture_frame_callback =
       [](void* user_data, int64_t texture_id, size_t width, size_t height,
@@ -114,16 +105,12 @@ FlutterRendererConfig GetSoftwareRendererConfig() {
   FlutterRendererConfig config = {};
   config.type = kSoftware;
   config.software.struct_size = sizeof(config.software);
-  config.software.surface_present_callback = [](void* user_data,
-                                                const void* allocation,
-                                                size_t row_bytes,
-                                                size_t height) {
-    auto host = static_cast<FlutterWindowsEngine*>(user_data);
-    if (!host->view()) {
-      return false;
-    }
-    return host->view()->PresentSoftwareBitmap(allocation, row_bytes, height);
-  };
+  config.software.surface_present_callback =
+      [](void* user_data, const void* allocation, size_t row_bytes,
+         size_t height) {
+        FML_UNREACHABLE();
+        return false;
+      };
   return config;
 }
 
@@ -158,10 +145,17 @@ FlutterLocale CovertToFlutterLocale(const LanguageInfo& info) {
 
 FlutterWindowsEngine::FlutterWindowsEngine(
     const FlutterProjectBundle& project,
-    std::unique_ptr<WindowsRegistry> registry)
+    std::shared_ptr<WindowsProcTable> windows_proc_table)
     : project_(std::make_unique<FlutterProjectBundle>(project)),
+      windows_proc_table_(std::move(windows_proc_table)),
       aot_data_(nullptr, nullptr),
-      windows_registry_(std::move(registry)) {
+      lifecycle_manager_(std::make_unique<WindowsLifecycleManager>(this)) {
+  if (windows_proc_table_ == nullptr) {
+    windows_proc_table_ = std::make_shared<WindowsProcTable>();
+  }
+
+  gl_ = egl::ProcTable::Create();
+
   embedder_api_.struct_size = sizeof(FlutterEngineProcTable);
   FlutterEngineGetProcAddresses(&embedder_api_);
 
@@ -189,24 +183,43 @@ FlutterWindowsEngine::FlutterWindowsEngine(
       std::make_unique<BinaryMessengerImpl>(messenger_->ToRef());
   message_dispatcher_ =
       std::make_unique<IncomingMessageDispatcher>(messenger_->ToRef());
-  message_dispatcher_->SetMessageCallback(
-      kAccessibilityChannelName,
-      [](FlutterDesktopMessengerRef messenger,
-         const FlutterDesktopMessage* message, void* data) {
-        FlutterWindowsEngine* engine = static_cast<FlutterWindowsEngine*>(data);
-        engine->HandleAccessibilityMessage(messenger, message);
-      },
-      static_cast<void*>(this));
 
-  FlutterWindowsTextureRegistrar::ResolveGlFunctions(gl_procs_);
   texture_registrar_ =
-      std::make_unique<FlutterWindowsTextureRegistrar>(this, gl_procs_);
-  surface_manager_ = AngleSurfaceManager::Create();
+      std::make_unique<FlutterWindowsTextureRegistrar>(this, gl_);
+
+  // Check for impeller support.
+  auto& switches = project_->GetSwitches();
+  enable_impeller_ = std::find(switches.begin(), switches.end(),
+                               "--enable-impeller=true") != switches.end();
+
+  egl_manager_ = egl::Manager::Create(enable_impeller_);
   window_proc_delegate_manager_ = std::make_unique<WindowProcDelegateManager>();
+  window_proc_delegate_manager_->RegisterTopLevelWindowProcDelegate(
+      [](HWND hwnd, UINT msg, WPARAM wpar, LPARAM lpar, void* user_data,
+         LRESULT* result) {
+        BASE_DCHECK(user_data);
+        FlutterWindowsEngine* that =
+            static_cast<FlutterWindowsEngine*>(user_data);
+        BASE_DCHECK(that->lifecycle_manager_);
+        return that->lifecycle_manager_->WindowProc(hwnd, msg, wpar, lpar,
+                                                    result);
+      },
+      static_cast<void*>(this));
 
   // Set up internal channels.
   // TODO: Replace this with an embedder.h API. See
   // https://github.com/flutter/flutter/issues/71099
+  internal_plugin_registrar_ =
+      std::make_unique<PluginRegistrar>(plugin_registrar_.get());
+
+  accessibility_plugin_ = std::make_unique<AccessibilityPlugin>(this);
+  AccessibilityPlugin::SetUp(messenger_wrapper_.get(),
+                             accessibility_plugin_.get());
+
+  cursor_handler_ =
+      std::make_unique<CursorHandler>(messenger_wrapper_.get(), this);
+  platform_handler_ =
+      std::make_unique<PlatformHandler>(messenger_wrapper_.get(), this);
   settings_plugin_ = std::make_unique<SettingsPlugin>(messenger_wrapper_.get(),
                                                       task_runner_.get());
 }
@@ -319,24 +332,35 @@ bool FlutterWindowsEngine::Run(std::string_view entrypoint) {
   };
   args.on_pre_engine_restart_callback = [](void* user_data) {
     auto host = static_cast<FlutterWindowsEngine*>(user_data);
-    host->view()->OnPreEngineRestart();
+    host->OnPreEngineRestart();
   };
-  args.update_semantics_callback = [](const FlutterSemanticsUpdate* update,
-                                      void* user_data) {
+  args.update_semantics_callback2 = [](const FlutterSemanticsUpdate2* update,
+                                       void* user_data) {
     auto host = static_cast<FlutterWindowsEngine*>(user_data);
 
-    for (size_t i = 0; i < update->nodes_count; i++) {
-      const FlutterSemanticsNode* node = &update->nodes[i];
-      host->accessibility_bridge_->AddFlutterSemanticsNodeUpdate(node);
+    // TODO(loicsharma): Remove implicit view assumption.
+    // https://github.com/flutter/flutter/issues/142845
+    auto view = host->view(kImplicitViewId);
+    if (!view) {
+      return;
+    }
+
+    auto accessibility_bridge = view->accessibility_bridge().lock();
+    if (!accessibility_bridge) {
+      return;
     }
 
-    for (size_t i = 0; i < update->custom_actions_count; i++) {
-      const FlutterSemanticsCustomAction* action = &update->custom_actions[i];
-      host->accessibility_bridge_->AddFlutterSemanticsCustomActionUpdate(
-          action);
+    for (size_t i = 0; i < update->node_count; i++) {
+      const FlutterSemanticsNode2* node = update->nodes[i];
+      accessibility_bridge->AddFlutterSemanticsNodeUpdate(*node);
     }
 
-    host->accessibility_bridge_->CommitUpdates();
+    for (size_t i = 0; i < update->custom_action_count; i++) {
+      const FlutterSemanticsCustomAction2* action = update->custom_actions[i];
+      accessibility_bridge->AddFlutterSemanticsCustomActionUpdate(*action);
+    }
+
+    accessibility_bridge->CommitUpdates();
   };
   args.root_isolate_create_callback = [](void* user_data) {
     auto host = static_cast<FlutterWindowsEngine*>(user_data);
@@ -344,16 +368,84 @@ bool FlutterWindowsEngine::Run(std::string_view entrypoint) {
       host->root_isolate_create_callback_();
     }
   };
+  args.channel_update_callback = [](const FlutterChannelUpdate* update,
+                                    void* user_data) {
+    auto host = static_cast<FlutterWindowsEngine*>(user_data);
+    if (SAFE_ACCESS(update, channel, nullptr) != nullptr) {
+      std::string channel_name(update->channel);
+      host->OnChannelUpdate(std::move(channel_name),
+                            SAFE_ACCESS(update, listening, false));
+    }
+  };
 
   args.custom_task_runners = &custom_task_runners;
 
+  if (!platform_view_plugin_) {
+    platform_view_plugin_ = std::make_unique<PlatformViewPlugin>(
+        messenger_wrapper_.get(), task_runner_.get());
+  }
+  if (egl_manager_) {
+    auto resolver = [](const char* name) -> void* {
+      return reinterpret_cast<void*>(::eglGetProcAddress(name));
+    };
+
+    // TODO(schectman) Pass the platform view manager to the compositor
+    // constructors: https://github.com/flutter/flutter/issues/143375
+    compositor_ = std::make_unique<CompositorOpenGL>(this, resolver);
+  } else {
+    compositor_ = std::make_unique<CompositorSoftware>(this);
+  }
+
+  FlutterCompositor compositor = {};
+  compositor.struct_size = sizeof(FlutterCompositor);
+  compositor.user_data = this;
+  compositor.create_backing_store_callback =
+      [](const FlutterBackingStoreConfig* config,
+         FlutterBackingStore* backing_store_out, void* user_data) -> bool {
+    auto host = static_cast<FlutterWindowsEngine*>(user_data);
+
+    return host->compositor_->CreateBackingStore(*config, backing_store_out);
+  };
+
+  compositor.collect_backing_store_callback =
+      [](const FlutterBackingStore* backing_store, void* user_data) -> bool {
+    auto host = static_cast<FlutterWindowsEngine*>(user_data);
+
+    return host->compositor_->CollectBackingStore(backing_store);
+  };
+
+  compositor.present_view_callback =
+      [](const FlutterPresentViewInfo* info) -> bool {
+    auto host = static_cast<FlutterWindowsEngine*>(info->user_data);
+
+    return host->compositor_->Present(info->view_id, info->layers,
+                                      info->layers_count);
+  };
+  args.compositor = &compositor;
+
   if (aot_data_) {
     args.aot_data = aot_data_.get();
   }
 
-  FlutterRendererConfig renderer_config = surface_manager_
-                                              ? GetOpenGLRendererConfig()
-                                              : GetSoftwareRendererConfig();
+  // The platform thread creates OpenGL contexts. These
+  // must be released to be used by the engine's threads.
+  FML_DCHECK(!egl_manager_ || !egl_manager_->HasContextCurrent());
+
+  FlutterRendererConfig renderer_config;
+
+  if (enable_impeller_) {
+    // Impeller does not support a Software backend. Avoid falling back and
+    // confusing the engine on which renderer is selected.
+    if (!egl_manager_) {
+      FML_LOG(ERROR) << "Could not create surface manager. Impeller backend "
+                        "does not support software rendering.";
+      return false;
+    }
+    renderer_config = GetOpenGLRendererConfig();
+  } else {
+    renderer_config =
+        egl_manager_ ? GetOpenGLRendererConfig() : GetSoftwareRendererConfig();
+  }
 
   auto result = embedder_api_.Run(FLUTTER_ENGINE_VERSION, &renderer_config,
                                   &args, this, &engine_);
@@ -376,6 +468,7 @@ bool FlutterWindowsEngine::Run(std::string_view entrypoint) {
                                     displays.data(), displays.size());
 
   SendSystemLocales();
+  SetLifecycleState(flutter::AppLifecycleState::kResumed);
 
   settings_plugin_->StartWatching();
   settings_plugin_->SendSettings();
@@ -396,8 +489,17 @@ bool FlutterWindowsEngine::Stop() {
   return false;
 }
 
-void FlutterWindowsEngine::SetView(FlutterWindowsView* view) {
-  view_ = view;
+std::unique_ptr<FlutterWindowsView> FlutterWindowsEngine::CreateView(
+    std::unique_ptr<WindowBindingHandler> window) {
+  // TODO(loicsharma): Remove implicit view assumption.
+  // https://github.com/flutter/flutter/issues/142845
+  auto view = std::make_unique<FlutterWindowsView>(
+      kImplicitViewId, this, std::move(window), windows_proc_table_);
+
+  views_[kImplicitViewId] = view.get();
+  InitializeKeyboard();
+
+  return std::move(view);
 }
 
 void FlutterWindowsEngine::OnVsync(intptr_t baton) {
@@ -428,6 +530,15 @@ std::chrono::nanoseconds FlutterWindowsEngine::FrameInterval() {
   return std::chrono::nanoseconds(interval);
 }
 
+FlutterWindowsView* FlutterWindowsEngine::view(FlutterViewId view_id) const {
+  auto iterator = views_.find(view_id);
+  if (iterator == views_.end()) {
+    return nullptr;
+  }
+
+  return iterator->second;
+}
+
 // Returns the currently configured Plugin Registrar.
 FlutterDesktopPluginRegistrarRef FlutterWindowsEngine::GetRegistrar() {
   return plugin_registrar_.get();
@@ -512,8 +623,7 @@ void FlutterWindowsEngine::HandlePlatformMessage(
 
   auto message = ConvertToDesktopMessage(*engine_message);
 
-  message_dispatcher_->HandleMessage(
-      message, [this] {}, [this] {});
+  message_dispatcher_->HandleMessage(message, [this] {}, [this] {});
 }
 
 void FlutterWindowsEngine::ReloadSystemFonts() {
@@ -540,9 +650,15 @@ void FlutterWindowsEngine::SetNextFrameCallback(fml::closure callback) {
       this);
 }
 
+void FlutterWindowsEngine::SetLifecycleState(flutter::AppLifecycleState state) {
+  if (lifecycle_manager_) {
+    lifecycle_manager_->SetLifecycleState(state);
+  }
+}
+
 void FlutterWindowsEngine::SendSystemLocales() {
   std::vector<LanguageInfo> languages =
-      GetPreferredLanguageInfo(*windows_registry_);
+      GetPreferredLanguageInfo(*windows_proc_table_);
   std::vector<FlutterLocale> flutter_locales;
   flutter_locales.reserve(languages.size());
   for (const auto& info : languages) {
@@ -558,6 +674,48 @@ void FlutterWindowsEngine::SendSystemLocales() {
                               flutter_locale_list.size());
 }
 
+void FlutterWindowsEngine::InitializeKeyboard() {
+  if (views_.empty()) {
+    FML_LOG(ERROR) << "Cannot initialize keyboard on Windows headless mode.";
+  }
+
+  auto internal_plugin_messenger = internal_plugin_registrar_->messenger();
+  KeyboardKeyEmbedderHandler::GetKeyStateHandler get_key_state = GetKeyState;
+  KeyboardKeyEmbedderHandler::MapVirtualKeyToScanCode map_vk_to_scan =
+      [](UINT virtual_key, bool extended) {
+        return MapVirtualKey(virtual_key,
+                             extended ? MAPVK_VK_TO_VSC_EX : MAPVK_VK_TO_VSC);
+      };
+  keyboard_key_handler_ = std::move(CreateKeyboardKeyHandler(
+      internal_plugin_messenger, get_key_state, map_vk_to_scan));
+  text_input_plugin_ =
+      std::move(CreateTextInputPlugin(internal_plugin_messenger));
+}
+
+std::unique_ptr<KeyboardHandlerBase>
+FlutterWindowsEngine::CreateKeyboardKeyHandler(
+    BinaryMessenger* messenger,
+    KeyboardKeyEmbedderHandler::GetKeyStateHandler get_key_state,
+    KeyboardKeyEmbedderHandler::MapVirtualKeyToScanCode map_vk_to_scan) {
+  auto keyboard_key_handler = std::make_unique<KeyboardKeyHandler>(messenger);
+  keyboard_key_handler->AddDelegate(
+      std::make_unique<KeyboardKeyEmbedderHandler>(
+          [this](const FlutterKeyEvent& event, FlutterKeyEventCallback callback,
+                 void* user_data) {
+            return SendKeyEvent(event, callback, user_data);
+          },
+          get_key_state, map_vk_to_scan));
+  keyboard_key_handler->AddDelegate(
+      std::make_unique<KeyboardKeyChannelHandler>(messenger));
+  keyboard_key_handler->InitKeyboardChannel();
+  return keyboard_key_handler;
+}
+
+std::unique_ptr<TextInputPlugin> FlutterWindowsEngine::CreateTextInputPlugin(
+    BinaryMessenger* messenger) {
+  return std::make_unique<TextInputPlugin>(messenger, this);
+}
+
 bool FlutterWindowsEngine::RegisterExternalTexture(int64_t texture_id) {
   return (embedder_api_.RegisterExternalTexture(engine_, texture_id) ==
           kSuccess);
@@ -574,7 +732,7 @@ bool FlutterWindowsEngine::MarkExternalTextureFrameAvailable(
               engine_, texture_id) == kSuccess);
 }
 
-bool FlutterWindowsEngine::PostRasterThreadTask(fml::closure callback) {
+bool FlutterWindowsEngine::PostRasterThreadTask(fml::closure callback) const {
   struct Captures {
     fml::closure callback;
   };
@@ -607,32 +765,17 @@ void FlutterWindowsEngine::UpdateSemanticsEnabled(bool enabled) {
   if (engine_ && semantics_enabled_ != enabled) {
     semantics_enabled_ = enabled;
     embedder_api_.UpdateSemanticsEnabled(engine_, enabled);
-
-    if (!semantics_enabled_ && accessibility_bridge_) {
-      accessibility_bridge_.reset();
-    } else if (semantics_enabled_ && !accessibility_bridge_) {
-      accessibility_bridge_ = CreateAccessibilityBridge(this, view());
+    for (auto iterator = views_.begin(); iterator != views_.end(); iterator++) {
+      iterator->second->UpdateSemanticsEnabled(enabled);
     }
   }
 }
 
-std::shared_ptr<AccessibilityBridge>
-FlutterWindowsEngine::CreateAccessibilityBridge(FlutterWindowsEngine* engine,
-                                                FlutterWindowsView* view) {
-  return std::make_shared<AccessibilityBridgeWindows>(engine, view);
-}
-
-gfx::NativeViewAccessible FlutterWindowsEngine::GetNativeAccessibleFromId(
-    AccessibilityNodeId id) {
-  if (!accessibility_bridge_) {
-    return nullptr;
+void FlutterWindowsEngine::OnPreEngineRestart() {
+  // Reset the keyboard's state on hot restart.
+  if (!views_.empty()) {
+    InitializeKeyboard();
   }
-  std::shared_ptr<FlutterPlatformNodeDelegate> node_delegate =
-      accessibility_bridge_->GetFlutterPlatformNodeDelegateFromID(id).lock();
-  if (!node_delegate) {
-    return nullptr;
-  }
-  return node_delegate->GetNativeViewAccessible();
 }
 
 std::string FlutterWindowsEngine::GetExecutableName() const {
@@ -649,54 +792,72 @@ std::string FlutterWindowsEngine::GetExecutableName() const {
   return "Flutter";
 }
 
-void FlutterWindowsEngine::UpdateAccessibilityFeatures(
-    FlutterAccessibilityFeature flags) {
-  embedder_api_.UpdateAccessibilityFeatures(engine_, flags);
+void FlutterWindowsEngine::UpdateAccessibilityFeatures() {
+  UpdateHighContrastMode();
 }
 
-void FlutterWindowsEngine::UpdateHighContrastEnabled(bool enabled) {
-  high_contrast_enabled_ = enabled;
-  int flags = EnabledAccessibilityFeatures();
-  if (enabled) {
-    flags |=
-        FlutterAccessibilityFeature::kFlutterAccessibilityFeatureHighContrast;
-  } else {
-    flags &=
-        ~FlutterAccessibilityFeature::kFlutterAccessibilityFeatureHighContrast;
-  }
-  UpdateAccessibilityFeatures(static_cast<FlutterAccessibilityFeature>(flags));
+void FlutterWindowsEngine::UpdateHighContrastMode() {
+  high_contrast_enabled_ = windows_proc_table_->GetHighContrastEnabled();
+
+  SendAccessibilityFeatures();
+  settings_plugin_->UpdateHighContrastMode(high_contrast_enabled_);
 }
 
-int FlutterWindowsEngine::EnabledAccessibilityFeatures() const {
+void FlutterWindowsEngine::SendAccessibilityFeatures() {
   int flags = 0;
-  if (high_contrast_enabled()) {
+
+  if (high_contrast_enabled_) {
     flags |=
         FlutterAccessibilityFeature::kFlutterAccessibilityFeatureHighContrast;
   }
-  // As more accessibility features are enabled for Windows,
-  // the corresponding checks and flags should be added here.
-  return flags;
-}
-
-void FlutterWindowsEngine::HandleAccessibilityMessage(
-    FlutterDesktopMessengerRef messenger,
-    const FlutterDesktopMessage* message) {
-  const auto& codec = StandardMessageCodec::GetInstance();
-  auto data = codec.DecodeMessage(message->message, message->message_size);
-  EncodableMap map = std::get<EncodableMap>(*data);
-  std::string type = std::get<std::string>(map.at(EncodableValue("type")));
-  if (type.compare("announce") == 0) {
-    if (semantics_enabled_) {
-      EncodableMap data_map =
-          std::get<EncodableMap>(map.at(EncodableValue("data")));
-      std::string text =
-          std::get<std::string>(data_map.at(EncodableValue("message")));
-      std::wstring wide_text = fml::Utf8ToWideString(text);
-      view_->AnnounceAlert(wide_text);
-    }
+
+  embedder_api_.UpdateAccessibilityFeatures(
+      engine_, static_cast<FlutterAccessibilityFeature>(flags));
+}
+
+void FlutterWindowsEngine::RequestApplicationQuit(HWND hwnd,
+                                                  WPARAM wparam,
+                                                  LPARAM lparam,
+                                                  AppExitType exit_type) {
+  platform_handler_->RequestAppExit(hwnd, wparam, lparam, exit_type, 0);
+}
+
+void FlutterWindowsEngine::OnQuit(std::optional<HWND> hwnd,
+                                  std::optional<WPARAM> wparam,
+                                  std::optional<LPARAM> lparam,
+                                  UINT exit_code) {
+  lifecycle_manager_->Quit(hwnd, wparam, lparam, exit_code);
+}
+
+void FlutterWindowsEngine::OnDwmCompositionChanged() {
+  for (auto iterator = views_.begin(); iterator != views_.end(); iterator++) {
+    iterator->second->OnDwmCompositionChanged();
+  }
+}
+
+void FlutterWindowsEngine::OnWindowStateEvent(HWND hwnd,
+                                              WindowStateEvent event) {
+  lifecycle_manager_->OnWindowStateEvent(hwnd, event);
+}
+
+std::optional<LRESULT> FlutterWindowsEngine::ProcessExternalWindowMessage(
+    HWND hwnd,
+    UINT message,
+    WPARAM wparam,
+    LPARAM lparam) {
+  if (lifecycle_manager_) {
+    return lifecycle_manager_->ExternalWindowMessage(hwnd, message, wparam,
+                                                     lparam);
+  }
+  return std::nullopt;
+}
+
+void FlutterWindowsEngine::OnChannelUpdate(std::string name, bool listening) {
+  if (name == "flutter/platform" && listening) {
+    lifecycle_manager_->BeginProcessingExit();
+  } else if (name == "flutter/lifecycle" && listening) {
+    lifecycle_manager_->BeginProcessingLifecycle();
   }
-  SendPlatformMessageResponse(message->response_handle,
-                              reinterpret_cast<const uint8_t*>(""), 0);
 }
 
 }  // namespace flutter
diff --git a/shell/platform/windows/flutter_windows_engine.h b/shell/platform/windows/flutter_windows_engine.h
index 3b6fdf15e91850e3acb0dcced3ad8ffa82395912..018dc82a3c7c3a375865d9ee3d077106fb48af9a 100644
--- a/shell/platform/windows/flutter_windows_engine.h
+++ b/shell/platform/windows/flutter_windows_engine.h
@@ -11,28 +11,48 @@
 #include <optional>
 #include <string>
 #include <string_view>
+#include <unordered_map>
 #include <vector>
 
 #include "flutter/fml/closure.h"
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/common/accessibility_bridge.h"
+#include "flutter/shell/platform/common/app_lifecycle_state.h"
 #include "flutter/shell/platform/common/client_wrapper/binary_messenger_impl.h"
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/basic_message_channel.h"
 #include "flutter/shell/platform/common/incoming_message_dispatcher.h"
 #include "flutter/shell/platform/embedder/embedder.h"
-#include "flutter/shell/platform/windows/angle_surface_manager.h"
+#include "flutter/shell/platform/windows/accessibility_bridge_windows.h"
+#include "flutter/shell/platform/windows/accessibility_plugin.h"
+#include "flutter/shell/platform/windows/compositor.h"
+#include "flutter/shell/platform/windows/cursor_handler.h"
+#include "flutter/shell/platform/windows/egl/manager.h"
+#include "flutter/shell/platform/windows/egl/proc_table.h"
 #include "flutter/shell/platform/windows/flutter_desktop_messenger.h"
 #include "flutter/shell/platform/windows/flutter_project_bundle.h"
 #include "flutter/shell/platform/windows/flutter_windows_texture_registrar.h"
+#include "flutter/shell/platform/windows/keyboard_handler_base.h"
+#include "flutter/shell/platform/windows/keyboard_key_embedder_handler.h"
+#include "flutter/shell/platform/windows/platform_handler.h"
+#include "flutter/shell/platform/windows/platform_view_plugin.h"
 #include "flutter/shell/platform/windows/public/flutter_windows.h"
 #include "flutter/shell/platform/windows/settings_plugin.h"
 #include "flutter/shell/platform/windows/task_runner.h"
+#include "flutter/shell/platform/windows/text_input_plugin.h"
 #include "flutter/shell/platform/windows/window_proc_delegate_manager.h"
 #include "flutter/shell/platform/windows/window_state.h"
-#include "flutter/shell/platform/windows/windows_registry.h"
+#include "flutter/shell/platform/windows/windows_lifecycle_manager.h"
+#include "flutter/shell/platform/windows/windows_proc_table.h"
 #include "third_party/rapidjson/include/rapidjson/document.h"
 
 namespace flutter {
 
+// The implicit view's ID.
+//
+// See:
+// https://api.flutter.dev/flutter/dart-ui/PlatformDispatcher/implicitView.html
+constexpr FlutterViewId kImplicitViewId = 0;
+
 class FlutterWindowsView;
 
 // Update the thread priority for the Windows engine.
@@ -68,20 +88,13 @@ static void WindowsPlatformThreadPrioritySetter(
 // run in headless mode.
 class FlutterWindowsEngine {
  public:
-  // Creates a new Flutter engine with an injectible windows registry.
-  FlutterWindowsEngine(const FlutterProjectBundle& project,
-                       std::unique_ptr<WindowsRegistry> windows_registry);
-
   // Creates a new Flutter engine object configured to run |project|.
-  explicit FlutterWindowsEngine(const FlutterProjectBundle& project)
-      : FlutterWindowsEngine(project, std::make_unique<WindowsRegistry>()) {}
+  FlutterWindowsEngine(
+      const FlutterProjectBundle& project,
+      std::shared_ptr<WindowsProcTable> windows_proc_table = nullptr);
 
   virtual ~FlutterWindowsEngine();
 
-  // Prevent copying.
-  FlutterWindowsEngine(FlutterWindowsEngine const&) = delete;
-  FlutterWindowsEngine& operator=(FlutterWindowsEngine const&) = delete;
-
   // Starts running the entrypoint function specifed in the project bundle. If
   // unspecified, defaults to main().
   //
@@ -100,19 +113,21 @@ class FlutterWindowsEngine {
   bool Run(std::string_view entrypoint);
 
   // Returns true if the engine is currently running.
-  bool running() { return engine_ != nullptr; }
+  virtual bool running() const { return engine_ != nullptr; }
 
   // Stops the engine. This invalidates the pointer returned by engine().
   //
   // Returns false if stopping the engine fails, or if it was not running.
-  bool Stop();
+  virtual bool Stop();
 
-  // Sets the view that is displaying this engine's content.
-  void SetView(FlutterWindowsView* view);
+  // Create a view that can display this engine's content.
+  std::unique_ptr<FlutterWindowsView> CreateView(
+      std::unique_ptr<WindowBindingHandler> window);
 
-  // The view displaying this engine's content, if any. This will be null for
-  // headless engines.
-  FlutterWindowsView* view() { return view_; }
+  // Get a view that displays this engine's content.
+  //
+  // Returns null if the view does not exist.
+  FlutterWindowsView* view(FlutterViewId view_id) const;
 
   // Returns the currently configured Plugin Registrar.
   FlutterDesktopPluginRegistrarRef GetRegistrar();
@@ -133,17 +148,15 @@ class FlutterWindowsEngine {
 
   TaskRunner* task_runner() { return task_runner_.get(); }
 
+  BinaryMessenger* messenger_wrapper() { return messenger_wrapper_.get(); }
+
   FlutterWindowsTextureRegistrar* texture_registrar() {
     return texture_registrar_.get();
   }
 
-  // The ANGLE surface manager object. If this is nullptr, then we are
+  // The EGL manager object. If this is nullptr, then we are
   // rendering using software instead of OpenGL.
-  AngleSurfaceManager* surface_manager() { return surface_manager_.get(); }
-
-  std::weak_ptr<AccessibilityBridge> accessibility_bridge() {
-    return accessibility_bridge_;
-  }
+  egl::Manager* egl_manager() const { return egl_manager_.get(); }
 
   WindowProcDelegateManager* window_proc_delegate_manager() {
     return window_proc_delegate_manager_.get();
@@ -160,6 +173,11 @@ class FlutterWindowsEngine {
                     FlutterKeyEventCallback callback,
                     void* user_data);
 
+  KeyboardHandlerBase* keyboard_key_handler() {
+    return keyboard_key_handler_.get();
+  }
+  TextInputPlugin* text_input_plugin() { return text_input_plugin_.get(); }
+
   // Sends the given message to the engine, calling |reply| with |user_data|
   // when a response is received from the engine if they are non-null.
   bool SendPlatformMessage(const char* channel,
@@ -198,7 +216,7 @@ class FlutterWindowsEngine {
   bool MarkExternalTextureFrameAvailable(int64_t texture_id);
 
   // Posts the given callback onto the raster thread.
-  bool PostRasterThreadTask(fml::closure callback);
+  virtual bool PostRasterThreadTask(fml::closure callback) const;
 
   // Invoke on the embedder's vsync callback to schedule a frame.
   void OnVsync(intptr_t baton);
@@ -214,18 +232,15 @@ class FlutterWindowsEngine {
   // Returns true if the semantics tree is enabled.
   bool semantics_enabled() const { return semantics_enabled_; }
 
-  // Update the high contrast feature state.
-  void UpdateHighContrastEnabled(bool enabled);
+  // Refresh accessibility features and send them to the engine.
+  void UpdateAccessibilityFeatures();
 
-  // Returns the flags for all currently enabled accessibility features
-  int EnabledAccessibilityFeatures() const;
+  // Refresh high contrast accessibility mode and notify the engine.
+  void UpdateHighContrastMode();
 
   // Returns true if the high contrast feature is enabled.
   bool high_contrast_enabled() const { return high_contrast_enabled_; }
 
-  // Returns the native accessibility node with the given id.
-  gfx::NativeViewAccessible GetNativeAccessibleFromId(AccessibilityNodeId id);
-
   // Register a root isolate create callback.
   //
   // The root isolate create callback is invoked at creation of the root Dart
@@ -242,17 +257,67 @@ class FlutterWindowsEngine {
   // Returns the executable name for this process or "Flutter" if unknown.
   std::string GetExecutableName() const;
 
-  // Updates accessibility, e.g. switch to high contrast mode
-  void UpdateAccessibilityFeatures(FlutterAccessibilityFeature flags);
+  // Called when the application quits in response to a quit request.
+  void OnQuit(std::optional<HWND> hwnd,
+              std::optional<WPARAM> wparam,
+              std::optional<LPARAM> lparam,
+              UINT exit_code);
+
+  // Called when a WM_CLOSE message is received.
+  void RequestApplicationQuit(HWND hwnd,
+                              WPARAM wparam,
+                              LPARAM lparam,
+                              AppExitType exit_type);
+
+  // Called when a WM_DWMCOMPOSITIONCHANGED message is received.
+  void OnDwmCompositionChanged();
+
+  // Called when a Window receives an event that may alter the application
+  // lifecycle state.
+  void OnWindowStateEvent(HWND hwnd, WindowStateEvent event);
+
+  // Handle a message from a non-Flutter window in the same application.
+  // Returns a result when the message is consumed and should not be processed
+  // further.
+  std::optional<LRESULT> ProcessExternalWindowMessage(HWND hwnd,
+                                                      UINT message,
+                                                      WPARAM wparam,
+                                                      LPARAM lparam);
+
+  WindowsLifecycleManager* lifecycle_manager() {
+    return lifecycle_manager_.get();
+  }
+
+  std::shared_ptr<WindowsProcTable> windows_proc_table() {
+    return windows_proc_table_;
+  }
 
  protected:
-  // Creates an accessibility bridge with the provided parameters.
+  // Creates the keyboard key handler.
   //
-  // By default this method calls AccessibilityBridge's constructor. Exposing
-  // this method allows unit tests to override in order to capture information.
-  virtual std::shared_ptr<AccessibilityBridge> CreateAccessibilityBridge(
-      FlutterWindowsEngine* engine,
-      FlutterWindowsView* view);
+  // Exposing this method allows unit tests to override in order to
+  // capture information.
+  virtual std::unique_ptr<KeyboardHandlerBase> CreateKeyboardKeyHandler(
+      BinaryMessenger* messenger,
+      KeyboardKeyEmbedderHandler::GetKeyStateHandler get_key_state,
+      KeyboardKeyEmbedderHandler::MapVirtualKeyToScanCode map_vk_to_scan);
+
+  // Creates the text input plugin.
+  //
+  // Exposing this method allows unit tests to override in order to
+  // capture information.
+  virtual std::unique_ptr<TextInputPlugin> CreateTextInputPlugin(
+      BinaryMessenger* messenger);
+
+  // Invoked by the engine right before the engine is restarted.
+  //
+  // This should reset necessary states to as if the engine has just been
+  // created. This is typically caused by a hot restart (Shift-R in CLI.)
+  void OnPreEngineRestart();
+
+  // Invoked by the engine when a listener is set or cleared on a platform
+  // channel.
+  virtual void OnChannelUpdate(std::string name, bool listening);
 
  private:
   // Allows swapping out embedder_api_ calls in tests.
@@ -264,8 +329,17 @@ class FlutterWindowsEngine {
   // system changes.
   void SendSystemLocales();
 
-  void HandleAccessibilityMessage(FlutterDesktopMessengerRef messenger,
-                                  const FlutterDesktopMessage* message);
+  // Sends the current lifecycle state to the framework.
+  void SetLifecycleState(flutter::AppLifecycleState state);
+
+  // Create the keyboard & text input sub-systems.
+  //
+  // This requires that a view is attached to the engine.
+  // Calling this method again resets the keyboard state.
+  void InitializeKeyboard();
+
+  // Send the currently enabled accessibility features to the engine.
+  void SendAccessibilityFeatures();
 
   // The handle to the embedder.h engine instance.
   FLUTTER_API_SYMBOL(FlutterEngine) engine_ = nullptr;
@@ -277,8 +351,8 @@ class FlutterWindowsEngine {
   // AOT data, if any.
   UniqueAotDataPtr aot_data_;
 
-  // The view displaying the content running in this engine, if any.
-  FlutterWindowsView* view_ = nullptr;
+  // The views displaying the content running in this engine, if any.
+  std::unordered_map<FlutterViewId, FlutterWindowsView*> views_;
 
   // Task runner for tasks posted from the engine.
   std::unique_ptr<TaskRunner> task_runner_;
@@ -298,13 +372,32 @@ class FlutterWindowsEngine {
   // The texture registrar.
   std::unique_ptr<FlutterWindowsTextureRegistrar> texture_registrar_;
 
-  // Resolved OpenGL functions used by external texture implementations.
-  GlProcs gl_procs_ = {};
+  // An object used for intializing ANGLE and creating / destroying render
+  // surfaces. If nullptr, ANGLE failed to initialize and software rendering
+  // should be used instead.
+  std::unique_ptr<egl::Manager> egl_manager_;
+
+  // The compositor that creates backing stores for the engine to render into
+  // and then presents them onto views.
+  std::unique_ptr<Compositor> compositor_;
+
+  // The plugin registrar managing internal plugins.
+  std::unique_ptr<PluginRegistrar> internal_plugin_registrar_;
+
+  // Handler for accessibility events.
+  std::unique_ptr<AccessibilityPlugin> accessibility_plugin_;
 
-  // An object used for intializing Angle and creating / destroying render
-  // surfaces. Surface creation functionality requires a valid render_target.
-  // May be nullptr if ANGLE failed to initialize.
-  std::unique_ptr<AngleSurfaceManager> surface_manager_;
+  // Handler for cursor events.
+  std::unique_ptr<CursorHandler> cursor_handler_;
+
+  // Handler for the flutter/platform channel.
+  std::unique_ptr<PlatformHandler> platform_handler_;
+
+  // Handlers for keyboard events from Windows.
+  std::unique_ptr<KeyboardHandlerBase> keyboard_key_handler_;
+
+  // Handlers for text events from Windows.
+  std::unique_ptr<TextInputPlugin> text_input_plugin_;
 
   // The settings plugin.
   std::unique_ptr<SettingsPlugin> settings_plugin_;
@@ -329,7 +422,7 @@ class FlutterWindowsEngine {
 
   bool high_contrast_enabled_ = false;
 
-  std::shared_ptr<AccessibilityBridge> accessibility_bridge_;
+  bool enable_impeller_ = false;
 
   // The manager for WindowProc delegate registration and callbacks.
   std::unique_ptr<WindowProcDelegateManager> window_proc_delegate_manager_;
@@ -340,8 +433,16 @@ class FlutterWindowsEngine {
   // The on frame drawn callback.
   fml::closure next_frame_callback_;
 
-  // Wrapper providing Windows registry access.
-  std::unique_ptr<WindowsRegistry> windows_registry_;
+  // Handler for top level window messages.
+  std::unique_ptr<WindowsLifecycleManager> lifecycle_manager_;
+
+  std::shared_ptr<WindowsProcTable> windows_proc_table_;
+
+  std::shared_ptr<egl::ProcTable> gl_;
+
+  std::unique_ptr<PlatformViewPlugin> platform_view_plugin_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(FlutterWindowsEngine);
 };
 
 }  // namespace flutter
diff --git a/shell/platform/windows/flutter_windows_engine_unittests.cc b/shell/platform/windows/flutter_windows_engine_unittests.cc
index 9714bd876714444f9a9b3cb70f073ea596e36426..f9ebdbc278dfb84b9b5d999e7cd99e4d902aabaf 100644
--- a/shell/platform/windows/flutter_windows_engine_unittests.cc
+++ b/shell/platform/windows/flutter_windows_engine_unittests.cc
@@ -4,13 +4,22 @@
 
 #include "flutter/shell/platform/windows/flutter_windows_engine.h"
 
+#include "flutter/fml/logging.h"
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/embedder/embedder.h"
 #include "flutter/shell/platform/embedder/test_utils/proc_table_replacement.h"
 #include "flutter/shell/platform/windows/flutter_windows_view.h"
+#include "flutter/shell/platform/windows/public/flutter_windows.h"
+#include "flutter/shell/platform/windows/testing/egl/mock_manager.h"
 #include "flutter/shell/platform/windows/testing/engine_modifier.h"
+#include "flutter/shell/platform/windows/testing/flutter_windows_engine_builder.h"
+#include "flutter/shell/platform/windows/testing/mock_platform_view_manager.h"
 #include "flutter/shell/platform/windows/testing/mock_window_binding_handler.h"
+#include "flutter/shell/platform/windows/testing/mock_windows_proc_table.h"
 #include "flutter/shell/platform/windows/testing/test_keyboard.h"
 #include "flutter/shell/platform/windows/testing/windows_test.h"
+#include "flutter/shell/platform/windows/testing/windows_test_config_builder.h"
+#include "flutter/third_party/accessibility/ax/platform/ax_platform_node_win.h"
 #include "fml/synchronization/waitable_event.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
@@ -21,34 +30,30 @@
 namespace flutter {
 namespace testing {
 
-namespace {
+using ::testing::NiceMock;
+using ::testing::Return;
 
-// Returns an engine instance configured with dummy project path values.
-std::unique_ptr<FlutterWindowsEngine> GetTestEngine() {
-  FlutterDesktopEngineProperties properties = {};
-  properties.assets_path = L"C:\\foo\\flutter_assets";
-  properties.icu_data_path = L"C:\\foo\\icudtl.dat";
-  properties.aot_library_path = L"C:\\foo\\aot.so";
-
-  std::vector<const char*> test_arguments = {"arg1", "arg2"};
-  properties.dart_entrypoint_argc = test_arguments.size();
-  properties.dart_entrypoint_argv = test_arguments.data();
+class FlutterWindowsEngineTest : public WindowsTest {};
 
-  FlutterProjectBundle project(properties);
-  auto engine = std::make_unique<FlutterWindowsEngine>(project);
+// The engine can be run without any views.
+TEST_F(FlutterWindowsEngineTest, RunHeadless) {
+  FlutterWindowsEngineBuilder builder{GetContext()};
+  std::unique_ptr<FlutterWindowsEngine> engine = builder.Build();
 
   EngineModifier modifier(engine.get());
-  // Force the non-AOT path unless overridden by the test.
   modifier.embedder_api().RunsAOTCompiledDartCode = []() { return false; };
 
-  return engine;
+  ASSERT_TRUE(engine->Run());
+  ASSERT_EQ(engine->view(kImplicitViewId), nullptr);
+  ASSERT_EQ(engine->view(123), nullptr);
 }
-}  // namespace
-
-class FlutterWindowsEngineTest : public WindowsTest {};
 
 TEST_F(FlutterWindowsEngineTest, RunDoesExpectedInitialization) {
-  std::unique_ptr<FlutterWindowsEngine> engine = GetTestEngine();
+  FlutterWindowsEngineBuilder builder{GetContext()};
+  builder.AddDartEntrypointArgument("arg1");
+  builder.AddDartEntrypointArgument("arg2");
+
+  std::unique_ptr<FlutterWindowsEngine> engine = builder.Build();
   EngineModifier modifier(engine.get());
 
   // The engine should be run with expected configuration values.
@@ -63,12 +68,12 @@ TEST_F(FlutterWindowsEngineTest, RunDoesExpectedInitialization) {
 
         EXPECT_EQ(version, FLUTTER_ENGINE_VERSION);
         EXPECT_NE(config, nullptr);
-        // We have an AngleSurfaceManager, so this should be using OpenGL.
+        // We have an EGL manager, so this should be using OpenGL.
         EXPECT_EQ(config->type, kOpenGL);
         EXPECT_EQ(user_data, engine_instance);
         // Spot-check arguments.
-        EXPECT_STREQ(args->assets_path, "C:\\foo\\flutter_assets");
-        EXPECT_STREQ(args->icu_data_path, "C:\\foo\\icudtl.dat");
+        EXPECT_NE(args->assets_path, nullptr);
+        EXPECT_NE(args->icu_data_path, nullptr);
         EXPECT_EQ(args->dart_entrypoint_argc, 2U);
         EXPECT_EQ(strcmp(args->dart_entrypoint_argv[0], "arg1"), 0);
         EXPECT_EQ(strcmp(args->dart_entrypoint_argv[1], "arg2"), 0);
@@ -77,7 +82,8 @@ TEST_F(FlutterWindowsEngineTest, RunDoesExpectedInitialization) {
         EXPECT_NE(args->custom_task_runners->thread_priority_setter, nullptr);
         EXPECT_EQ(args->custom_dart_entrypoint, nullptr);
         EXPECT_NE(args->vsync_callback, nullptr);
-        EXPECT_NE(args->update_semantics_callback, nullptr);
+        EXPECT_EQ(args->update_semantics_callback, nullptr);
+        EXPECT_NE(args->update_semantics_callback2, nullptr);
         EXPECT_EQ(args->update_semantics_node_callback, nullptr);
         EXPECT_EQ(args->update_semantics_custom_action_callback, nullptr);
 
@@ -142,8 +148,8 @@ TEST_F(FlutterWindowsEngineTest, RunDoesExpectedInitialization) {
         return kSuccess;
       }));
 
-  // Set the AngleSurfaceManager to !nullptr to test ANGLE rendering.
-  modifier.SetSurfaceManager(reinterpret_cast<AngleSurfaceManager*>(1));
+  // Set the EGL manager to !nullptr to test ANGLE rendering.
+  modifier.SetEGLManager(std::make_unique<egl::MockManager>());
 
   engine->Run();
 
@@ -155,11 +161,12 @@ TEST_F(FlutterWindowsEngineTest, RunDoesExpectedInitialization) {
   // Ensure that deallocation doesn't call the actual Shutdown with the bogus
   // engine pointer that the overridden Run returned.
   modifier.embedder_api().Shutdown = [](auto engine) { return kSuccess; };
-  modifier.ReleaseSurfaceManager();
+  modifier.ReleaseEGLManager();
 }
 
 TEST_F(FlutterWindowsEngineTest, ConfiguresFrameVsync) {
-  std::unique_ptr<FlutterWindowsEngine> engine = GetTestEngine();
+  FlutterWindowsEngineBuilder builder{GetContext()};
+  std::unique_ptr<FlutterWindowsEngine> engine = builder.Build();
   EngineModifier modifier(engine.get());
   bool on_vsync_called = false;
 
@@ -185,7 +192,8 @@ TEST_F(FlutterWindowsEngineTest, ConfiguresFrameVsync) {
 }
 
 TEST_F(FlutterWindowsEngineTest, RunWithoutANGLEUsesSoftware) {
-  std::unique_ptr<FlutterWindowsEngine> engine = GetTestEngine();
+  FlutterWindowsEngineBuilder builder{GetContext()};
+  std::unique_ptr<FlutterWindowsEngine> engine = builder.Build();
   EngineModifier modifier(engine.get());
 
   modifier.embedder_api().NotifyDisplayUpdate =
@@ -205,7 +213,7 @@ TEST_F(FlutterWindowsEngineTest, RunWithoutANGLEUsesSoftware) {
                 FLUTTER_API_SYMBOL(FlutterEngine) * engine_out) {
         run_called = true;
         *engine_out = reinterpret_cast<FLUTTER_API_SYMBOL(FlutterEngine)>(1);
-        // We don't have an AngleSurfaceManager, so we should be using software.
+        // We don't have an EGL Manager, so we should be using software.
         EXPECT_EQ(config->type, kSoftware);
         return kSuccess;
       }));
@@ -224,8 +232,8 @@ TEST_F(FlutterWindowsEngineTest, RunWithoutANGLEUsesSoftware) {
       MOCK_ENGINE_PROC(SendPlatformMessage,
                        ([](auto engine, auto message) { return kSuccess; }));
 
-  // Set the AngleSurfaceManager to nullptr to test software fallback path.
-  modifier.SetSurfaceManager(nullptr);
+  // Set the EGL manager to nullptr to test software fallback path.
+  modifier.SetEGLManager(nullptr);
 
   engine->Run();
 
@@ -236,8 +244,44 @@ TEST_F(FlutterWindowsEngineTest, RunWithoutANGLEUsesSoftware) {
   modifier.embedder_api().Shutdown = [](auto engine) { return kSuccess; };
 }
 
+TEST_F(FlutterWindowsEngineTest, RunWithoutANGLEOnImpellerFailsToStart) {
+  FlutterWindowsEngineBuilder builder{GetContext()};
+  builder.SetSwitches({"--enable-impeller=true"});
+  std::unique_ptr<FlutterWindowsEngine> engine = builder.Build();
+  EngineModifier modifier(engine.get());
+
+  modifier.embedder_api().NotifyDisplayUpdate =
+      MOCK_ENGINE_PROC(NotifyDisplayUpdate,
+                       ([engine_instance = engine.get()](
+                            FLUTTER_API_SYMBOL(FlutterEngine) raw_engine,
+                            const FlutterEngineDisplaysUpdateType update_type,
+                            const FlutterEngineDisplay* embedder_displays,
+                            size_t display_count) { return kSuccess; }));
+
+  // Accessibility updates must do nothing when the embedder engine is mocked
+  modifier.embedder_api().UpdateAccessibilityFeatures = MOCK_ENGINE_PROC(
+      UpdateAccessibilityFeatures,
+      [](FLUTTER_API_SYMBOL(FlutterEngine) engine,
+         FlutterAccessibilityFeature flags) { return kSuccess; });
+
+  // Stub out UpdateLocales and SendPlatformMessage as we don't have a fully
+  // initialized engine instance.
+  modifier.embedder_api().UpdateLocales = MOCK_ENGINE_PROC(
+      UpdateLocales, ([](auto engine, const FlutterLocale** locales,
+                         size_t locales_count) { return kSuccess; }));
+  modifier.embedder_api().SendPlatformMessage =
+      MOCK_ENGINE_PROC(SendPlatformMessage,
+                       ([](auto engine, auto message) { return kSuccess; }));
+
+  // Set the EGL manager to nullptr to test software fallback path.
+  modifier.SetEGLManager(nullptr);
+
+  EXPECT_FALSE(engine->Run());
+}
+
 TEST_F(FlutterWindowsEngineTest, SendPlatformMessageWithoutResponse) {
-  std::unique_ptr<FlutterWindowsEngine> engine = GetTestEngine();
+  FlutterWindowsEngineBuilder builder{GetContext()};
+  std::unique_ptr<FlutterWindowsEngine> engine = builder.Build();
   EngineModifier modifier(engine.get());
 
   const char* channel = "test";
@@ -263,14 +307,10 @@ TEST_F(FlutterWindowsEngineTest, SendPlatformMessageWithoutResponse) {
 }
 
 TEST_F(FlutterWindowsEngineTest, PlatformMessageRoundTrip) {
-  FlutterDesktopEngineProperties properties = {};
-  properties.assets_path = GetContext().GetAssetsPath().c_str();
-  properties.icu_data_path = GetContext().GetIcuDataPath().c_str();
-  properties.dart_entrypoint = "hiPlatformChannels";
-
-  FlutterProjectBundle project(properties);
-  auto engine = std::make_unique<FlutterWindowsEngine>(project);
+  FlutterWindowsEngineBuilder builder{GetContext()};
+  builder.SetDartEntrypoint("hiPlatformChannels");
 
+  std::unique_ptr<FlutterWindowsEngine> engine = builder.Build();
   EngineModifier modifier(engine.get());
   modifier.embedder_api().RunsAOTCompiledDartCode = []() { return false; };
 
@@ -312,13 +352,10 @@ TEST_F(FlutterWindowsEngineTest, PlatformMessageRoundTrip) {
 }
 
 TEST_F(FlutterWindowsEngineTest, PlatformMessageRespondOnDifferentThread) {
-  FlutterDesktopEngineProperties properties = {};
-  properties.assets_path = GetContext().GetAssetsPath().c_str();
-  properties.icu_data_path = GetContext().GetIcuDataPath().c_str();
-  properties.dart_entrypoint = "hiPlatformChannels";
+  FlutterWindowsEngineBuilder builder{GetContext()};
+  builder.SetDartEntrypoint("hiPlatformChannels");
 
-  FlutterProjectBundle project(properties);
-  auto engine = std::make_unique<FlutterWindowsEngine>(project);
+  std::unique_ptr<FlutterWindowsEngine> engine = builder.Build();
 
   EngineModifier modifier(engine.get());
   modifier.embedder_api().RunsAOTCompiledDartCode = []() { return false; };
@@ -366,7 +403,8 @@ TEST_F(FlutterWindowsEngineTest, PlatformMessageRespondOnDifferentThread) {
 }
 
 TEST_F(FlutterWindowsEngineTest, SendPlatformMessageWithResponse) {
-  std::unique_ptr<FlutterWindowsEngine> engine = GetTestEngine();
+  FlutterWindowsEngineBuilder builder{GetContext()};
+  std::unique_ptr<FlutterWindowsEngine> engine = builder.Build();
   EngineModifier modifier(engine.get());
 
   const char* channel = "test";
@@ -424,7 +462,8 @@ TEST_F(FlutterWindowsEngineTest, SendPlatformMessageWithResponse) {
 }
 
 TEST_F(FlutterWindowsEngineTest, DispatchSemanticsAction) {
-  std::unique_ptr<FlutterWindowsEngine> engine = GetTestEngine();
+  FlutterWindowsEngineBuilder builder{GetContext()};
+  std::unique_ptr<FlutterWindowsEngine> engine = builder.Build();
   EngineModifier modifier(engine.get());
 
   bool called = false;
@@ -469,7 +508,8 @@ TEST_F(FlutterWindowsEngineTest, SetsThreadPriority) {
 }
 
 TEST_F(FlutterWindowsEngineTest, AddPluginRegistrarDestructionCallback) {
-  std::unique_ptr<FlutterWindowsEngine> engine = GetTestEngine();
+  FlutterWindowsEngineBuilder builder{GetContext()};
+  std::unique_ptr<FlutterWindowsEngine> engine = builder.Build();
   EngineModifier modifier(engine.get());
 
   MockEmbedderApiForKeyboard(modifier,
@@ -499,7 +539,8 @@ TEST_F(FlutterWindowsEngineTest, AddPluginRegistrarDestructionCallback) {
 }
 
 TEST_F(FlutterWindowsEngineTest, ScheduleFrame) {
-  std::unique_ptr<FlutterWindowsEngine> engine = GetTestEngine();
+  FlutterWindowsEngineBuilder builder{GetContext()};
+  std::unique_ptr<FlutterWindowsEngine> engine = builder.Build();
   EngineModifier modifier(engine.get());
 
   bool called = false;
@@ -514,7 +555,8 @@ TEST_F(FlutterWindowsEngineTest, ScheduleFrame) {
 }
 
 TEST_F(FlutterWindowsEngineTest, SetNextFrameCallback) {
-  std::unique_ptr<FlutterWindowsEngine> engine = GetTestEngine();
+  FlutterWindowsEngineBuilder builder{GetContext()};
+  std::unique_ptr<FlutterWindowsEngine> engine = builder.Build();
   EngineModifier modifier(engine.get());
 
   bool called = false;
@@ -529,39 +571,57 @@ TEST_F(FlutterWindowsEngineTest, SetNextFrameCallback) {
 }
 
 TEST_F(FlutterWindowsEngineTest, GetExecutableName) {
-  std::unique_ptr<FlutterWindowsEngine> engine = GetTestEngine();
+  FlutterWindowsEngineBuilder builder{GetContext()};
+  std::unique_ptr<FlutterWindowsEngine> engine = builder.Build();
   EXPECT_EQ(engine->GetExecutableName(), "flutter_windows_unittests.exe");
 }
 
 // Ensure that after setting or resetting the high contrast feature,
 // the corresponding status flag can be retrieved from the engine.
 TEST_F(FlutterWindowsEngineTest, UpdateHighContrastFeature) {
-  std::unique_ptr<FlutterWindowsEngine> engine = GetTestEngine();
+  auto windows_proc_table = std::make_shared<MockWindowsProcTable>();
+  EXPECT_CALL(*windows_proc_table, GetHighContrastEnabled)
+      .WillOnce(Return(true))
+      .WillOnce(Return(false));
+
+  FlutterWindowsEngineBuilder builder{GetContext()};
+  builder.SetWindowsProcTable(windows_proc_table);
+  std::unique_ptr<FlutterWindowsEngine> engine = builder.Build();
   EngineModifier modifier(engine.get());
 
-  bool called = false;
+  std::optional<FlutterAccessibilityFeature> engine_flags;
   modifier.embedder_api().UpdateAccessibilityFeatures = MOCK_ENGINE_PROC(
-      UpdateAccessibilityFeatures, ([&called](auto engine, auto flags) {
-        called = true;
+      UpdateAccessibilityFeatures, ([&engine_flags](auto engine, auto flags) {
+        engine_flags = flags;
         return kSuccess;
       }));
+  modifier.embedder_api().SendPlatformMessage = MOCK_ENGINE_PROC(
+      SendPlatformMessage,
+      [](auto engine, const auto message) { return kSuccess; });
+
+  // 1: High contrast is enabled.
+  engine->UpdateHighContrastMode();
 
-  engine->UpdateHighContrastEnabled(true);
+  EXPECT_TRUE(engine->high_contrast_enabled());
+  EXPECT_TRUE(engine_flags.has_value());
   EXPECT_TRUE(
-      engine->EnabledAccessibilityFeatures() &
+      engine_flags.value() &
       FlutterAccessibilityFeature::kFlutterAccessibilityFeatureHighContrast);
-  EXPECT_TRUE(engine->high_contrast_enabled());
-  EXPECT_TRUE(called);
 
-  engine->UpdateHighContrastEnabled(false);
+  // 2: High contrast is disabled.
+  engine_flags.reset();
+  engine->UpdateHighContrastMode();
+
+  EXPECT_FALSE(engine->high_contrast_enabled());
+  EXPECT_TRUE(engine_flags.has_value());
   EXPECT_FALSE(
-      engine->EnabledAccessibilityFeatures() &
+      engine_flags.value() &
       FlutterAccessibilityFeature::kFlutterAccessibilityFeatureHighContrast);
-  EXPECT_FALSE(engine->high_contrast_enabled());
 }
 
 TEST_F(FlutterWindowsEngineTest, PostRasterThreadTask) {
-  std::unique_ptr<FlutterWindowsEngine> engine = GetTestEngine();
+  FlutterWindowsEngineBuilder builder{GetContext()};
+  std::unique_ptr<FlutterWindowsEngine> engine = builder.Build();
   EngineModifier modifier(engine.get());
 
   modifier.embedder_api().PostRenderThreadTask = MOCK_ENGINE_PROC(
@@ -578,54 +638,629 @@ TEST_F(FlutterWindowsEngineTest, PostRasterThreadTask) {
 
 class MockFlutterWindowsView : public FlutterWindowsView {
  public:
-  MockFlutterWindowsView(std::unique_ptr<WindowBindingHandler> wbh)
-      : FlutterWindowsView(std::move(wbh)) {}
+  MockFlutterWindowsView(FlutterWindowsEngine* engine,
+                         std::unique_ptr<WindowBindingHandler> wbh)
+      : FlutterWindowsView(kImplicitViewId, engine, std::move(wbh)) {}
   ~MockFlutterWindowsView() {}
 
-  MOCK_METHOD4(NotifyWinEventWrapper, void(DWORD, HWND, LONG, LONG));
+  MOCK_METHOD(void,
+              NotifyWinEventWrapper,
+              (ui::AXPlatformNodeWin*, ax::mojom::Event),
+              (override));
+  MOCK_METHOD(HWND, GetWindowHandle, (), (const, override));
+
+ private:
+  FML_DISALLOW_COPY_AND_ASSIGN(MockFlutterWindowsView);
 };
 
-TEST_F(FlutterWindowsEngineTest, AlertPlatformMessage) {
-  FlutterDesktopEngineProperties properties = {};
-  properties.assets_path = GetContext().GetAssetsPath().c_str();
-  properties.icu_data_path = GetContext().GetIcuDataPath().c_str();
-  properties.dart_entrypoint = "alertPlatformChannel";
+// Verify the view is notified of accessibility announcements.
+TEST_F(FlutterWindowsEngineTest, AccessibilityAnnouncement) {
+  auto& context = GetContext();
+  WindowsConfigBuilder builder{context};
+  builder.SetDartEntrypoint("sendAccessibilityAnnouncement");
+
+  bool done = false;
+  auto native_entry =
+      CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) { done = true; });
+  context.AddNativeFunction("Signal", native_entry);
+
+  EnginePtr engine{builder.RunHeadless()};
+  ASSERT_NE(engine, nullptr);
 
-  FlutterProjectBundle project(properties);
+  ui::AXPlatformNodeDelegateBase parent_delegate;
+  AlertPlatformNodeDelegate delegate{parent_delegate};
 
+  auto window_binding_handler =
+      std::make_unique<NiceMock<MockWindowBindingHandler>>();
+  EXPECT_CALL(*window_binding_handler, GetAlertDelegate)
+      .WillOnce(Return(&delegate));
+
+  auto windows_engine = reinterpret_cast<FlutterWindowsEngine*>(engine.get());
+  MockFlutterWindowsView view{windows_engine,
+                              std::move(window_binding_handler)};
+  EngineModifier modifier{windows_engine};
+  modifier.SetImplicitView(&view);
+
+  windows_engine->UpdateSemanticsEnabled(true);
+
+  EXPECT_CALL(view, NotifyWinEventWrapper).Times(1);
+
+  // Rely on timeout mechanism in CI.
+  while (!done) {
+    windows_engine->task_runner()->ProcessTasks();
+  }
+}
+
+// Verify the app can send accessibility announcements while in headless mode.
+TEST_F(FlutterWindowsEngineTest, AccessibilityAnnouncementHeadless) {
+  auto& context = GetContext();
+  WindowsConfigBuilder builder{context};
+  builder.SetDartEntrypoint("sendAccessibilityAnnouncement");
+
+  bool done = false;
+  auto native_entry =
+      CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) { done = true; });
+  context.AddNativeFunction("Signal", native_entry);
+
+  EnginePtr engine{builder.RunHeadless()};
+  ASSERT_NE(engine, nullptr);
+
+  auto windows_engine = reinterpret_cast<FlutterWindowsEngine*>(engine.get());
+  windows_engine->UpdateSemanticsEnabled(true);
+
+  // Rely on timeout mechanism in CI.
+  while (!done) {
+    windows_engine->task_runner()->ProcessTasks();
+  }
+}
+
+// Verify the engine does not crash if it receives an accessibility event
+// it does not support yet.
+TEST_F(FlutterWindowsEngineTest, AccessibilityTooltip) {
+  fml::testing::LogCapture log_capture;
+
+  auto& context = GetContext();
+  WindowsConfigBuilder builder{context};
+  builder.SetDartEntrypoint("sendAccessibilityTooltipEvent");
+
+  bool done = false;
+  auto native_entry =
+      CREATE_NATIVE_ENTRY([&](Dart_NativeArguments args) { done = true; });
+  context.AddNativeFunction("Signal", native_entry);
+
+  ViewControllerPtr controller{builder.Run()};
+  ASSERT_NE(controller, nullptr);
+
+  auto engine = FlutterDesktopViewControllerGetEngine(controller.get());
+  auto windows_engine = reinterpret_cast<FlutterWindowsEngine*>(engine);
+  windows_engine->UpdateSemanticsEnabled(true);
+
+  // Rely on timeout mechanism in CI.
+  while (!done) {
+    windows_engine->task_runner()->ProcessTasks();
+  }
+
+  // Verify no error was logged.
+  // Regression test for:
+  // https://github.com/flutter/flutter/issues/144274
+  EXPECT_EQ(log_capture.str().find("tooltip"), std::string::npos);
+}
+
+class MockWindowsLifecycleManager : public WindowsLifecycleManager {
+ public:
+  MockWindowsLifecycleManager(FlutterWindowsEngine* engine)
+      : WindowsLifecycleManager(engine) {}
+  virtual ~MockWindowsLifecycleManager() {}
+
+  MOCK_METHOD(
+      void,
+      Quit,
+      (std::optional<HWND>, std::optional<WPARAM>, std::optional<LPARAM>, UINT),
+      (override));
+  MOCK_METHOD(void, DispatchMessage, (HWND, UINT, WPARAM, LPARAM), (override));
+  MOCK_METHOD(bool, IsLastWindowOfProcess, (), (override));
+  MOCK_METHOD(void, SetLifecycleState, (AppLifecycleState), (override));
+
+  void BeginProcessingLifecycle() override {
+    WindowsLifecycleManager::BeginProcessingLifecycle();
+    if (begin_processing_callback) {
+      begin_processing_callback();
+    }
+  }
+
+  std::function<void()> begin_processing_callback = nullptr;
+};
+
+TEST_F(FlutterWindowsEngineTest, TestExit) {
+  FlutterWindowsEngineBuilder builder{GetContext()};
+  builder.SetDartEntrypoint("exitTestExit");
+  bool finished = false;
+
+  auto engine = builder.Build();
   auto window_binding_handler =
       std::make_unique<::testing::NiceMock<MockWindowBindingHandler>>();
-  AccessibilityRootNode* root_node = AccessibilityRootNode::Create();
-  ON_CALL(*window_binding_handler, GetAccessibilityRootNode)
-      .WillByDefault(::testing::Return(root_node));
-  MockFlutterWindowsView view(std::move(window_binding_handler));
-  view.SetEngine(std::make_unique<FlutterWindowsEngine>(project));
-  FlutterWindowsEngine* engine = view.GetEngine();
-
-  EngineModifier modifier(engine);
+  MockFlutterWindowsView view(engine.get(), std::move(window_binding_handler));
+
+  EngineModifier modifier(engine.get());
+  modifier.SetImplicitView(&view);
   modifier.embedder_api().RunsAOTCompiledDartCode = []() { return false; };
+  auto handler = std::make_unique<MockWindowsLifecycleManager>(engine.get());
+  EXPECT_CALL(*handler, SetLifecycleState(AppLifecycleState::kResumed));
+  EXPECT_CALL(*handler, Quit)
+      .WillOnce([&finished](std::optional<HWND> hwnd,
+                            std::optional<WPARAM> wparam,
+                            std::optional<LPARAM> lparam,
+                            UINT exit_code) { finished = exit_code == 0; });
+  EXPECT_CALL(*handler, IsLastWindowOfProcess).WillRepeatedly(Return(true));
+  modifier.SetLifecycleManager(std::move(handler));
+
+  engine->lifecycle_manager()->BeginProcessingExit();
+
+  engine->Run();
+
+  engine->window_proc_delegate_manager()->OnTopLevelWindowProc(0, WM_CLOSE, 0,
+                                                               0);
+
+  // The test will only succeed when this while loop exits. Otherwise it will
+  // timeout.
+  while (!finished) {
+    engine->task_runner()->ProcessTasks();
+  }
+}
+
+TEST_F(FlutterWindowsEngineTest, TestExitCancel) {
+  FlutterWindowsEngineBuilder builder{GetContext()};
+  builder.SetDartEntrypoint("exitTestCancel");
+  bool did_call = false;
+
+  auto engine = builder.Build();
+  auto window_binding_handler =
+      std::make_unique<::testing::NiceMock<MockWindowBindingHandler>>();
+  MockFlutterWindowsView view(engine.get(), std::move(window_binding_handler));
+
+  EngineModifier modifier(engine.get());
+  modifier.SetImplicitView(&view);
+  modifier.embedder_api().RunsAOTCompiledDartCode = []() { return false; };
+  auto handler = std::make_unique<MockWindowsLifecycleManager>(engine.get());
+  EXPECT_CALL(*handler, SetLifecycleState(AppLifecycleState::kResumed));
+  EXPECT_CALL(*handler, IsLastWindowOfProcess).WillRepeatedly(Return(true));
+  EXPECT_CALL(*handler, Quit).Times(0);
+  modifier.SetLifecycleManager(std::move(handler));
+  engine->lifecycle_manager()->BeginProcessingExit();
 
   auto binary_messenger =
       std::make_unique<BinaryMessengerImpl>(engine->messenger());
   binary_messenger->SetMessageHandler(
-      "semantics", [&engine](const uint8_t* message, size_t message_size,
-                             BinaryReply reply) {
-        engine->UpdateSemanticsEnabled(true);
+      "flutter/platform", [&did_call](const uint8_t* message,
+                                      size_t message_size, BinaryReply reply) {
+        std::string contents(message, message + message_size);
+        EXPECT_NE(contents.find("\"method\":\"System.exitApplication\""),
+                  std::string::npos);
+        EXPECT_NE(contents.find("\"type\":\"required\""), std::string::npos);
+        EXPECT_NE(contents.find("\"exitCode\":0"), std::string::npos);
+        did_call = true;
         char response[] = "";
         reply(reinterpret_cast<uint8_t*>(response), 0);
       });
 
-  bool did_call = false;
-  ON_CALL(view, NotifyWinEventWrapper)
-      .WillByDefault([&did_call](DWORD event, HWND hwnd, LONG obj, LONG child) {
-        did_call = true;
+  engine->Run();
+
+  engine->window_proc_delegate_manager()->OnTopLevelWindowProc(0, WM_CLOSE, 0,
+                                                               0);
+
+  while (!did_call) {
+    engine->task_runner()->ProcessTasks();
+  }
+}
+
+// Flutter consumes the first WM_CLOSE message to allow the app to cancel the
+// exit. If the app does not cancel the exit, Flutter synthesizes a second
+// WM_CLOSE message.
+TEST_F(FlutterWindowsEngineTest, TestExitSecondCloseMessage) {
+  FlutterWindowsEngineBuilder builder{GetContext()};
+  builder.SetDartEntrypoint("exitTestExit");
+  bool second_close = false;
+
+  auto engine = builder.Build();
+  auto window_binding_handler =
+      std::make_unique<::testing::NiceMock<MockWindowBindingHandler>>();
+  MockFlutterWindowsView view(engine.get(), std::move(window_binding_handler));
+
+  EngineModifier modifier(engine.get());
+  modifier.SetImplicitView(&view);
+  modifier.embedder_api().RunsAOTCompiledDartCode = []() { return false; };
+  auto handler = std::make_unique<MockWindowsLifecycleManager>(engine.get());
+  EXPECT_CALL(*handler, SetLifecycleState(AppLifecycleState::kResumed));
+  EXPECT_CALL(*handler, IsLastWindowOfProcess).WillOnce(Return(true));
+  EXPECT_CALL(*handler, Quit)
+      .WillOnce([handler_ptr = handler.get()](
+                    std::optional<HWND> hwnd, std::optional<WPARAM> wparam,
+                    std::optional<LPARAM> lparam, UINT exit_code) {
+        handler_ptr->WindowsLifecycleManager::Quit(hwnd, wparam, lparam,
+                                                   exit_code);
       });
+  EXPECT_CALL(*handler, DispatchMessage)
+      .WillRepeatedly(
+          [&engine](HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
+            engine->window_proc_delegate_manager()->OnTopLevelWindowProc(
+                hwnd, msg, wparam, lparam);
+          });
+  modifier.SetLifecycleManager(std::move(handler));
+  engine->lifecycle_manager()->BeginProcessingExit();
 
-  engine->UpdateSemanticsEnabled(true);
   engine->Run();
 
-  // Rely on timeout mechanism in CI.
-  while (!did_call) {
+  // This delegate will be registered after the lifecycle manager, so it will be
+  // called only when a message is not consumed by the lifecycle manager. This
+  // should be called on the second, synthesized WM_CLOSE message that the
+  // lifecycle manager posts.
+  engine->window_proc_delegate_manager()->RegisterTopLevelWindowProcDelegate(
+      [](HWND hwnd, UINT message, WPARAM wpar, LPARAM lpar, void* user_data,
+         LRESULT* result) {
+        switch (message) {
+          case WM_CLOSE: {
+            bool* called = reinterpret_cast<bool*>(user_data);
+            *called = true;
+            return true;
+          }
+        }
+        return false;
+      },
+      reinterpret_cast<void*>(&second_close));
+
+  engine->window_proc_delegate_manager()->OnTopLevelWindowProc(0, WM_CLOSE, 0,
+                                                               0);
+
+  while (!second_close) {
+    engine->task_runner()->ProcessTasks();
+  }
+}
+
+TEST_F(FlutterWindowsEngineTest, TestExitCloseMultiWindow) {
+  FlutterWindowsEngineBuilder builder{GetContext()};
+  builder.SetDartEntrypoint("exitTestExit");
+  bool finished = false;
+
+  auto engine = builder.Build();
+  auto window_binding_handler =
+      std::make_unique<::testing::NiceMock<MockWindowBindingHandler>>();
+  MockFlutterWindowsView view(engine.get(), std::move(window_binding_handler));
+
+  EngineModifier modifier(engine.get());
+  modifier.SetImplicitView(&view);
+  modifier.embedder_api().RunsAOTCompiledDartCode = []() { return false; };
+  auto handler = std::make_unique<MockWindowsLifecycleManager>(engine.get());
+  EXPECT_CALL(*handler, SetLifecycleState(AppLifecycleState::kResumed));
+  EXPECT_CALL(*handler, IsLastWindowOfProcess).WillOnce([&finished]() {
+    finished = true;
+    return false;
+  });
+  // Quit should not be called when there is more than one window.
+  EXPECT_CALL(*handler, Quit).Times(0);
+  modifier.SetLifecycleManager(std::move(handler));
+  engine->lifecycle_manager()->BeginProcessingExit();
+
+  engine->Run();
+
+  engine->window_proc_delegate_manager()->OnTopLevelWindowProc(0, WM_CLOSE, 0,
+                                                               0);
+
+  while (!finished) {
+    engine->task_runner()->ProcessTasks();
+  }
+}
+
+TEST_F(FlutterWindowsEngineTest, LifecycleManagerDisabledByDefault) {
+  FlutterWindowsEngineBuilder builder{GetContext()};
+
+  auto engine = builder.Build();
+  auto window_binding_handler =
+      std::make_unique<::testing::NiceMock<MockWindowBindingHandler>>();
+  MockFlutterWindowsView view(engine.get(), std::move(window_binding_handler));
+
+  EngineModifier modifier(engine.get());
+  modifier.SetImplicitView(&view);
+  modifier.embedder_api().RunsAOTCompiledDartCode = []() { return false; };
+  auto handler = std::make_unique<MockWindowsLifecycleManager>(engine.get());
+  EXPECT_CALL(*handler, IsLastWindowOfProcess).Times(0);
+  modifier.SetLifecycleManager(std::move(handler));
+
+  engine->window_proc_delegate_manager()->OnTopLevelWindowProc(0, WM_CLOSE, 0,
+                                                               0);
+}
+
+TEST_F(FlutterWindowsEngineTest, EnableApplicationLifecycle) {
+  FlutterWindowsEngineBuilder builder{GetContext()};
+
+  auto engine = builder.Build();
+  auto window_binding_handler =
+      std::make_unique<::testing::NiceMock<MockWindowBindingHandler>>();
+  MockFlutterWindowsView view(engine.get(), std::move(window_binding_handler));
+
+  EngineModifier modifier(engine.get());
+  modifier.SetImplicitView(&view);
+  modifier.embedder_api().RunsAOTCompiledDartCode = []() { return false; };
+  auto handler = std::make_unique<MockWindowsLifecycleManager>(engine.get());
+  EXPECT_CALL(*handler, IsLastWindowOfProcess).WillOnce(Return(false));
+  modifier.SetLifecycleManager(std::move(handler));
+  engine->lifecycle_manager()->BeginProcessingExit();
+
+  engine->window_proc_delegate_manager()->OnTopLevelWindowProc(0, WM_CLOSE, 0,
+                                                               0);
+}
+
+TEST_F(FlutterWindowsEngineTest, ApplicationLifecycleExternalWindow) {
+  FlutterWindowsEngineBuilder builder{GetContext()};
+
+  auto engine = builder.Build();
+  auto window_binding_handler =
+      std::make_unique<::testing::NiceMock<MockWindowBindingHandler>>();
+  MockFlutterWindowsView view(engine.get(), std::move(window_binding_handler));
+
+  EngineModifier modifier(engine.get());
+  modifier.SetImplicitView(&view);
+  modifier.embedder_api().RunsAOTCompiledDartCode = []() { return false; };
+  auto handler = std::make_unique<MockWindowsLifecycleManager>(engine.get());
+  EXPECT_CALL(*handler, IsLastWindowOfProcess).WillOnce(Return(false));
+  modifier.SetLifecycleManager(std::move(handler));
+  engine->lifecycle_manager()->BeginProcessingExit();
+
+  engine->lifecycle_manager()->ExternalWindowMessage(0, WM_CLOSE, 0, 0);
+}
+
+TEST_F(FlutterWindowsEngineTest, AppStartsInResumedState) {
+  FlutterWindowsEngineBuilder builder{GetContext()};
+
+  auto engine = builder.Build();
+  auto window_binding_handler =
+      std::make_unique<::testing::NiceMock<MockWindowBindingHandler>>();
+  MockFlutterWindowsView view(engine.get(), std::move(window_binding_handler));
+
+  EngineModifier modifier(engine.get());
+  modifier.SetImplicitView(&view);
+  modifier.embedder_api().RunsAOTCompiledDartCode = []() { return false; };
+  auto handler = std::make_unique<MockWindowsLifecycleManager>(engine.get());
+  EXPECT_CALL(*handler, SetLifecycleState(AppLifecycleState::kResumed))
+      .Times(1);
+  modifier.SetLifecycleManager(std::move(handler));
+  engine->Run();
+}
+
+TEST_F(FlutterWindowsEngineTest, LifecycleStateTransition) {
+  FlutterWindowsEngineBuilder builder{GetContext()};
+
+  auto engine = builder.Build();
+  auto window_binding_handler =
+      std::make_unique<::testing::NiceMock<MockWindowBindingHandler>>();
+  MockFlutterWindowsView view(engine.get(), std::move(window_binding_handler));
+
+  EngineModifier modifier(engine.get());
+  modifier.SetImplicitView(&view);
+  modifier.embedder_api().RunsAOTCompiledDartCode = []() { return false; };
+  engine->Run();
+
+  engine->window_proc_delegate_manager()->OnTopLevelWindowProc(
+      (HWND)1, WM_SIZE, SIZE_RESTORED, 0);
+  EXPECT_EQ(engine->lifecycle_manager()->GetLifecycleState(),
+            AppLifecycleState::kResumed);
+
+  engine->window_proc_delegate_manager()->OnTopLevelWindowProc(
+      (HWND)1, WM_SIZE, SIZE_MINIMIZED, 0);
+  EXPECT_EQ(engine->lifecycle_manager()->GetLifecycleState(),
+            AppLifecycleState::kHidden);
+
+  engine->window_proc_delegate_manager()->OnTopLevelWindowProc(
+      (HWND)1, WM_SIZE, SIZE_RESTORED, 0);
+  EXPECT_EQ(engine->lifecycle_manager()->GetLifecycleState(),
+            AppLifecycleState::kInactive);
+}
+
+TEST_F(FlutterWindowsEngineTest, ExternalWindowMessage) {
+  FlutterWindowsEngineBuilder builder{GetContext()};
+
+  auto engine = builder.Build();
+  auto window_binding_handler =
+      std::make_unique<::testing::NiceMock<MockWindowBindingHandler>>();
+  MockFlutterWindowsView view(engine.get(), std::move(window_binding_handler));
+
+  EngineModifier modifier(engine.get());
+  modifier.SetImplicitView(&view);
+  modifier.embedder_api().RunsAOTCompiledDartCode = []() { return false; };
+  // Sets lifecycle state to resumed.
+  engine->Run();
+
+  // Ensure HWND(1) is in the set of visible windows before hiding it.
+  engine->ProcessExternalWindowMessage(reinterpret_cast<HWND>(1), WM_SHOWWINDOW,
+                                       TRUE, NULL);
+  engine->ProcessExternalWindowMessage(reinterpret_cast<HWND>(1), WM_SHOWWINDOW,
+                                       FALSE, NULL);
+
+  EXPECT_EQ(engine->lifecycle_manager()->GetLifecycleState(),
+            AppLifecycleState::kHidden);
+}
+
+TEST_F(FlutterWindowsEngineTest, InnerWindowHidden) {
+  FlutterWindowsEngineBuilder builder{GetContext()};
+  HWND outer = reinterpret_cast<HWND>(1);
+  HWND inner = reinterpret_cast<HWND>(2);
+
+  auto engine = builder.Build();
+  auto window_binding_handler =
+      std::make_unique<::testing::NiceMock<MockWindowBindingHandler>>();
+  MockFlutterWindowsView view(engine.get(), std::move(window_binding_handler));
+  ON_CALL(view, GetWindowHandle).WillByDefault([=]() { return inner; });
+
+  EngineModifier modifier(engine.get());
+  modifier.SetImplicitView(&view);
+  modifier.embedder_api().RunsAOTCompiledDartCode = []() { return false; };
+  // Sets lifecycle state to resumed.
+  engine->Run();
+
+  // Show both top-level and Flutter window.
+  engine->window_proc_delegate_manager()->OnTopLevelWindowProc(
+      outer, WM_SHOWWINDOW, TRUE, NULL);
+  view.OnWindowStateEvent(inner, WindowStateEvent::kShow);
+  view.OnWindowStateEvent(inner, WindowStateEvent::kFocus);
+
+  EXPECT_EQ(engine->lifecycle_manager()->GetLifecycleState(),
+            AppLifecycleState::kResumed);
+
+  // Hide Flutter window, but not top level window.
+  view.OnWindowStateEvent(inner, WindowStateEvent::kHide);
+
+  // The top-level window is still visible, so we ought not enter hidden state.
+  EXPECT_EQ(engine->lifecycle_manager()->GetLifecycleState(),
+            AppLifecycleState::kInactive);
+}
+
+TEST_F(FlutterWindowsEngineTest, EnableLifecycleState) {
+  FlutterWindowsEngineBuilder builder{GetContext()};
+  builder.SetDartEntrypoint("enableLifecycleTest");
+  bool finished = false;
+
+  auto engine = builder.Build();
+  auto window_binding_handler =
+      std::make_unique<::testing::NiceMock<MockWindowBindingHandler>>();
+  MockFlutterWindowsView view(engine.get(), std::move(window_binding_handler));
+
+  EngineModifier modifier(engine.get());
+  modifier.SetImplicitView(&view);
+  modifier.embedder_api().RunsAOTCompiledDartCode = []() { return false; };
+  auto handler = std::make_unique<MockWindowsLifecycleManager>(engine.get());
+  EXPECT_CALL(*handler, SetLifecycleState)
+      .WillRepeatedly([handler_ptr = handler.get()](AppLifecycleState state) {
+        handler_ptr->WindowsLifecycleManager::SetLifecycleState(state);
+      });
+  modifier.SetLifecycleManager(std::move(handler));
+
+  auto binary_messenger =
+      std::make_unique<BinaryMessengerImpl>(engine->messenger());
+  // Mark the test only as completed on receiving an inactive state message.
+  binary_messenger->SetMessageHandler(
+      "flutter/unittest", [&finished](const uint8_t* message,
+                                      size_t message_size, BinaryReply reply) {
+        std::string contents(message, message + message_size);
+        EXPECT_NE(contents.find("AppLifecycleState.inactive"),
+                  std::string::npos);
+        finished = true;
+        char response[] = "";
+        reply(reinterpret_cast<uint8_t*>(response), 0);
+      });
+
+  engine->Run();
+
+  // Test that setting the state before enabling lifecycle does nothing.
+  HWND hwnd = reinterpret_cast<HWND>(1);
+  view.OnWindowStateEvent(hwnd, WindowStateEvent::kShow);
+  view.OnWindowStateEvent(hwnd, WindowStateEvent::kHide);
+  EXPECT_FALSE(finished);
+
+  // Test that we can set the state afterwards.
+
+  engine->lifecycle_manager()->BeginProcessingLifecycle();
+  view.OnWindowStateEvent(hwnd, WindowStateEvent::kShow);
+
+  while (!finished) {
+    engine->task_runner()->ProcessTasks();
+  }
+}
+
+TEST_F(FlutterWindowsEngineTest, LifecycleStateToFrom) {
+  FlutterWindowsEngineBuilder builder{GetContext()};
+  builder.SetDartEntrypoint("enableLifecycleToFrom");
+  bool enabled_lifecycle = false;
+  bool dart_responded = false;
+
+  auto engine = builder.Build();
+  auto window_binding_handler =
+      std::make_unique<::testing::NiceMock<MockWindowBindingHandler>>();
+  MockFlutterWindowsView view(engine.get(), std::move(window_binding_handler));
+
+  EngineModifier modifier(engine.get());
+  modifier.SetImplicitView(&view);
+  modifier.embedder_api().RunsAOTCompiledDartCode = []() { return false; };
+  auto handler = std::make_unique<MockWindowsLifecycleManager>(engine.get());
+  EXPECT_CALL(*handler, SetLifecycleState)
+      .WillRepeatedly([handler_ptr = handler.get()](AppLifecycleState state) {
+        handler_ptr->WindowsLifecycleManager::SetLifecycleState(state);
+      });
+  handler->begin_processing_callback = [&]() { enabled_lifecycle = true; };
+  modifier.SetLifecycleManager(std::move(handler));
+
+  auto binary_messenger =
+      std::make_unique<BinaryMessengerImpl>(engine->messenger());
+  binary_messenger->SetMessageHandler(
+      "flutter/unittest",
+      [&](const uint8_t* message, size_t message_size, BinaryReply reply) {
+        std::string contents(message, message + message_size);
+        EXPECT_NE(contents.find("AppLifecycleState."), std::string::npos);
+        dart_responded = true;
+        char response[] = "";
+        reply(reinterpret_cast<uint8_t*>(response), 0);
+      });
+
+  engine->Run();
+
+  while (!enabled_lifecycle) {
+    engine->task_runner()->ProcessTasks();
+  }
+
+  HWND hwnd = reinterpret_cast<HWND>(1);
+  view.OnWindowStateEvent(hwnd, WindowStateEvent::kShow);
+  view.OnWindowStateEvent(hwnd, WindowStateEvent::kHide);
+
+  while (!dart_responded) {
+    engine->task_runner()->ProcessTasks();
+  }
+}
+
+TEST_F(FlutterWindowsEngineTest, ChannelListenedTo) {
+  FlutterWindowsEngineBuilder builder{GetContext()};
+  builder.SetDartEntrypoint("enableLifecycleToFrom");
+
+  auto engine = builder.Build();
+  auto window_binding_handler =
+      std::make_unique<::testing::NiceMock<MockWindowBindingHandler>>();
+  MockFlutterWindowsView view(engine.get(), std::move(window_binding_handler));
+
+  EngineModifier modifier(engine.get());
+  modifier.SetImplicitView(&view);
+  modifier.embedder_api().RunsAOTCompiledDartCode = []() { return false; };
+
+  bool lifecycle_began = false;
+  auto handler = std::make_unique<MockWindowsLifecycleManager>(engine.get());
+  EXPECT_CALL(*handler, SetLifecycleState).Times(1);
+  handler->begin_processing_callback = [&]() { lifecycle_began = true; };
+  modifier.SetLifecycleManager(std::move(handler));
+
+  engine->Run();
+
+  while (!lifecycle_began) {
+    engine->task_runner()->ProcessTasks();
+  }
+}
+
+TEST_F(FlutterWindowsEngineTest, ReceivePlatformViewMessage) {
+  FlutterWindowsEngineBuilder builder{GetContext()};
+  builder.SetDartEntrypoint("sendCreatePlatformViewMethod");
+  auto engine = builder.Build();
+
+  EngineModifier modifier{engine.get()};
+  modifier.embedder_api().RunsAOTCompiledDartCode = []() { return false; };
+
+  bool received_call = false;
+
+  auto manager = std::make_unique<MockPlatformViewManager>(engine.get());
+  EXPECT_CALL(*manager, AddPlatformView)
+      .WillOnce([&](PlatformViewId id, std::string_view type_name) {
+        received_call = true;
+        return true;
+      });
+  modifier.SetPlatformViewPlugin(std::move(manager));
+
+  engine->Run();
+
+  while (!received_call) {
     engine->task_runner()->ProcessTasks();
   }
 }
diff --git a/shell/platform/windows/flutter_windows_internal.h b/shell/platform/windows/flutter_windows_internal.h
new file mode 100644
index 0000000000000000000000000000000000000000..bb1e6f767905f74a4519c8df1e3a43133956b5b9
--- /dev/null
+++ b/shell/platform/windows/flutter_windows_internal.h
@@ -0,0 +1,72 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_FLUTTER_WINDOWS_INTERNAL_H_
+#define FLUTTER_SHELL_PLATFORM_WINDOWS_FLUTTER_WINDOWS_INTERNAL_H_
+
+#include "flutter/shell/platform/windows/public/flutter_windows.h"
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+// Declare functions that are currently in-progress and shall be exposed to the
+// public facing API upon completion.
+
+// Properties for configuring a Flutter view controller.
+typedef struct {
+  // The view's initial width.
+  int width;
+
+  // The view's initial height.
+  int height;
+} FlutterDesktopViewControllerProperties;
+
+// Creates a view for the given engine.
+//
+// The |engine| will be started if it is not already running.
+//
+// The caller owns the returned reference, and is responsible for calling
+// |FlutterDesktopViewControllerDestroy|. Returns a null pointer in the event of
+// an error.
+//
+// Unlike |FlutterDesktopViewControllerCreate|, this does *not* take ownership
+// of |engine| and |FlutterDesktopEngineDestroy| must be called to destroy
+// the engine.
+FLUTTER_EXPORT FlutterDesktopViewControllerRef
+FlutterDesktopEngineCreateViewController(
+    FlutterDesktopEngineRef engine,
+    const FlutterDesktopViewControllerProperties* properties);
+
+typedef int64_t PlatformViewId;
+
+typedef struct {
+  size_t struct_size;
+  HWND parent_window;
+  const char* platform_view_type;
+  // user_data may hold any necessary additional information for creating a new
+  // platform view. For example, an instance of FlutterWindow.
+  void* user_data;
+  PlatformViewId platform_view_id;
+} FlutterPlatformViewCreationParameters;
+
+typedef HWND (*FlutterPlatformViewFactory)(
+    const FlutterPlatformViewCreationParameters*);
+
+typedef struct {
+  size_t struct_size;
+  FlutterPlatformViewFactory factory;
+  void* user_data;  // Arbitrary user data supplied to the creation struct.
+} FlutterPlatformViewTypeEntry;
+
+FLUTTER_EXPORT void FlutterDesktopEngineRegisterPlatformViewType(
+    FlutterDesktopEngineRef engine,
+    const char* view_type_name,
+    FlutterPlatformViewTypeEntry view_type);
+
+#if defined(__cplusplus)
+}
+#endif
+
+#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_FLUTTER_WINDOWS_INTERNAL_H_
diff --git a/shell/platform/windows/flutter_windows_texture_registrar.cc b/shell/platform/windows/flutter_windows_texture_registrar.cc
index c3371b8d7b5cab6d3f51cf14b398a06eff8424ac..f71da67bd9d998a7b3ea7d3ad626d0d4418e9931 100644
--- a/shell/platform/windows/flutter_windows_texture_registrar.cc
+++ b/shell/platform/windows/flutter_windows_texture_registrar.cc
@@ -20,12 +20,12 @@ namespace flutter {
 
 FlutterWindowsTextureRegistrar::FlutterWindowsTextureRegistrar(
     FlutterWindowsEngine* engine,
-    const GlProcs& gl_procs)
-    : engine_(engine), gl_procs_(gl_procs) {}
+    std::shared_ptr<egl::ProcTable> gl)
+    : engine_(engine), gl_(std::move(gl)) {}
 
 int64_t FlutterWindowsTextureRegistrar::RegisterTexture(
     const FlutterDesktopTextureInfo* texture_info) {
-  if (!gl_procs_.valid) {
+  if (!gl_) {
     return kInvalidTexture;
   }
 
@@ -37,7 +37,7 @@ int64_t FlutterWindowsTextureRegistrar::RegisterTexture(
 
     return EmplaceTexture(std::make_unique<flutter::ExternalTexturePixelBuffer>(
         texture_info->pixel_buffer_config.callback,
-        texture_info->pixel_buffer_config.user_data, gl_procs_));
+        texture_info->pixel_buffer_config.user_data, gl_));
   } else if (texture_info->type == kFlutterDesktopGpuSurfaceTexture) {
     const FlutterDesktopGpuSurfaceTextureConfig* gpu_surface_config =
         &texture_info->gpu_surface_config;
@@ -53,8 +53,7 @@ int64_t FlutterWindowsTextureRegistrar::RegisterTexture(
 
       auto user_data = SAFE_ACCESS(gpu_surface_config, user_data, nullptr);
       return EmplaceTexture(std::make_unique<flutter::ExternalTextureD3d>(
-          surface_type, callback, user_data, engine_->surface_manager(),
-          gl_procs_));
+          surface_type, callback, user_data, engine_->egl_manager(), gl_));
     }
   }
 
@@ -126,21 +125,4 @@ bool FlutterWindowsTextureRegistrar::PopulateTexture(
   return texture->PopulateTexture(width, height, opengl_texture);
 }
 
-void FlutterWindowsTextureRegistrar::ResolveGlFunctions(GlProcs& procs) {
-  procs.glGenTextures =
-      reinterpret_cast<glGenTexturesProc>(eglGetProcAddress("glGenTextures"));
-  procs.glDeleteTextures = reinterpret_cast<glDeleteTexturesProc>(
-      eglGetProcAddress("glDeleteTextures"));
-  procs.glBindTexture =
-      reinterpret_cast<glBindTextureProc>(eglGetProcAddress("glBindTexture"));
-  procs.glTexParameteri = reinterpret_cast<glTexParameteriProc>(
-      eglGetProcAddress("glTexParameteri"));
-  procs.glTexImage2D =
-      reinterpret_cast<glTexImage2DProc>(eglGetProcAddress("glTexImage2D"));
-
-  procs.valid = procs.glGenTextures && procs.glDeleteTextures &&
-                procs.glBindTexture && procs.glTexParameteri &&
-                procs.glTexImage2D;
-}
-
 };  // namespace flutter
diff --git a/shell/platform/windows/flutter_windows_texture_registrar.h b/shell/platform/windows/flutter_windows_texture_registrar.h
index 60534328eee4e8a87d6d19347d0c0683289e5abe..e065f0e7097443b7ddab8dd19f347d5c8d451cc8 100644
--- a/shell/platform/windows/flutter_windows_texture_registrar.h
+++ b/shell/platform/windows/flutter_windows_texture_registrar.h
@@ -10,7 +10,9 @@
 #include <unordered_map>
 
 #include "flutter/fml/closure.h"
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/common/public/flutter_texture_registrar.h"
+#include "flutter/shell/platform/windows/egl/proc_table.h"
 #include "flutter/shell/platform/windows/external_texture.h"
 
 namespace flutter {
@@ -22,7 +24,7 @@ class FlutterWindowsEngine;
 class FlutterWindowsTextureRegistrar {
  public:
   explicit FlutterWindowsTextureRegistrar(FlutterWindowsEngine* engine,
-                                          const GlProcs& gl_procs);
+                                          std::shared_ptr<egl::ProcTable> gl);
 
   // Registers a texture described by the given |texture_info| object.
   // Returns the non-zero, positive texture id or -1 on error.
@@ -43,12 +45,9 @@ class FlutterWindowsTextureRegistrar {
                        size_t height,
                        FlutterOpenGLTexture* texture);
 
-  // Populates the OpenGL function pointers in |gl_procs|.
-  static void ResolveGlFunctions(GlProcs& gl_procs);
-
  private:
   FlutterWindowsEngine* engine_ = nullptr;
-  const GlProcs& gl_procs_;
+  std::shared_ptr<egl::ProcTable> gl_;
 
   // All registered textures, keyed by their IDs.
   std::unordered_map<int64_t, std::unique_ptr<flutter::ExternalTexture>>
@@ -56,6 +55,8 @@ class FlutterWindowsTextureRegistrar {
   std::mutex map_mutex_;
 
   int64_t EmplaceTexture(std::unique_ptr<ExternalTexture> texture);
+
+  FML_DISALLOW_COPY_AND_ASSIGN(FlutterWindowsTextureRegistrar);
 };
 
 };  // namespace flutter
diff --git a/shell/platform/windows/flutter_windows_texture_registrar_unittests.cc b/shell/platform/windows/flutter_windows_texture_registrar_unittests.cc
index af12b41fde6741014d0673295d95ae23c474d332..c79ce54a46b9abadc12047714ad82b426bf9119f 100644
--- a/shell/platform/windows/flutter_windows_texture_registrar_unittests.cc
+++ b/shell/platform/windows/flutter_windows_texture_registrar_unittests.cc
@@ -2,19 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <iostream>
-
 #include "flutter/fml/synchronization/waitable_event.h"
 #include "flutter/shell/platform/embedder/test_utils/proc_table_replacement.h"
+#include "flutter/shell/platform/windows/egl/proc_table.h"
 #include "flutter/shell/platform/windows/flutter_windows_engine.h"
 #include "flutter/shell/platform/windows/flutter_windows_texture_registrar.h"
+#include "flutter/shell/platform/windows/testing/egl/mock_proc_table.h"
 #include "flutter/shell/platform/windows/testing/engine_modifier.h"
-#include "flutter/shell/platform/windows/testing/mock_gl_functions.h"
 #include "gtest/gtest.h"
 
 namespace flutter {
 namespace testing {
 
+using ::testing::_;
+using ::testing::AtLeast;
+
 using Microsoft::WRL::ComPtr;
 
 namespace {
@@ -41,7 +43,7 @@ ComPtr<ID3D11Texture2D> CreateD3dTexture(FlutterWindowsEngine* engine,
                                          UINT height) {
   ComPtr<ID3D11Device> d3d_device;
   ComPtr<ID3D11Texture2D> d3d_texture;
-  if (engine->surface_manager()->GetDevice(d3d_device.GetAddressOf())) {
+  if (engine->egl_manager()->GetDevice(d3d_device.GetAddressOf())) {
     D3D11_TEXTURE2D_DESC texture_description = {};
     texture_description.MipLevels = 1;
     texture_description.SampleDesc.Count = 1;
@@ -64,8 +66,8 @@ ComPtr<ID3D11Texture2D> CreateD3dTexture(FlutterWindowsEngine* engine,
 
 TEST(FlutterWindowsTextureRegistrarTest, CreateDestroy) {
   std::unique_ptr<FlutterWindowsEngine> engine = GetTestEngine();
-  std::unique_ptr<MockGlFunctions> gl = std::make_unique<MockGlFunctions>();
-  FlutterWindowsTextureRegistrar registrar(engine.get(), gl->gl_procs());
+  auto gl = std::make_shared<egl::MockProcTable>();
+  FlutterWindowsTextureRegistrar registrar(engine.get(), gl);
 
   EXPECT_TRUE(true);
 }
@@ -73,9 +75,9 @@ TEST(FlutterWindowsTextureRegistrarTest, CreateDestroy) {
 TEST(FlutterWindowsTextureRegistrarTest, RegisterUnregisterTexture) {
   std::unique_ptr<FlutterWindowsEngine> engine = GetTestEngine();
   EngineModifier modifier(engine.get());
-  std::unique_ptr<MockGlFunctions> gl = std::make_unique<MockGlFunctions>();
+  auto gl = std::make_shared<egl::MockProcTable>();
 
-  FlutterWindowsTextureRegistrar registrar(engine.get(), gl->gl_procs());
+  FlutterWindowsTextureRegistrar registrar(engine.get(), gl);
 
   FlutterDesktopTextureInfo texture_info = {};
   texture_info.type = kFlutterDesktopPixelBufferTexture;
@@ -137,9 +139,9 @@ TEST(FlutterWindowsTextureRegistrarTest, RegisterUnregisterTexture) {
 
 TEST(FlutterWindowsTextureRegistrarTest, RegisterUnknownTextureType) {
   std::unique_ptr<FlutterWindowsEngine> engine = GetTestEngine();
-  std::unique_ptr<MockGlFunctions> gl = std::make_unique<MockGlFunctions>();
+  auto gl = std::make_shared<egl::MockProcTable>();
 
-  FlutterWindowsTextureRegistrar registrar(engine.get(), gl->gl_procs());
+  FlutterWindowsTextureRegistrar registrar(engine.get(), gl);
 
   FlutterDesktopTextureInfo texture_info = {};
   texture_info.type = static_cast<FlutterDesktopTextureType>(1234);
@@ -151,8 +153,9 @@ TEST(FlutterWindowsTextureRegistrarTest, RegisterUnknownTextureType) {
 
 TEST(FlutterWindowsTextureRegistrarTest, PopulatePixelBufferTexture) {
   std::unique_ptr<FlutterWindowsEngine> engine = GetTestEngine();
-  std::unique_ptr<MockGlFunctions> gl = std::make_unique<MockGlFunctions>();
-  FlutterWindowsTextureRegistrar registrar(engine.get(), gl->gl_procs());
+  auto gl = std::make_shared<egl::MockProcTable>();
+
+  FlutterWindowsTextureRegistrar registrar(engine.get(), gl);
 
   bool release_callback_called = false;
   size_t width = 100;
@@ -182,6 +185,14 @@ TEST(FlutterWindowsTextureRegistrarTest, PopulatePixelBufferTexture) {
   auto texture_id = registrar.RegisterTexture(&texture_info);
   EXPECT_NE(texture_id, -1);
 
+  EXPECT_CALL(*gl.get(), GenTextures(1, _))
+      .Times(1)
+      .WillOnce([](GLsizei n, GLuint* textures) { textures[0] = 1; });
+  EXPECT_CALL(*gl.get(), BindTexture).Times(1);
+  EXPECT_CALL(*gl.get(), TexParameteri).Times(AtLeast(1));
+  EXPECT_CALL(*gl.get(), TexImage2D).Times(1);
+  EXPECT_CALL(*gl.get(), DeleteTextures(1, _)).Times(1);
+
   auto result =
       registrar.PopulateTexture(texture_id, 640, 480, &flutter_texture);
   EXPECT_TRUE(result);
@@ -193,8 +204,8 @@ TEST(FlutterWindowsTextureRegistrarTest, PopulatePixelBufferTexture) {
 
 TEST(FlutterWindowsTextureRegistrarTest, PopulateD3dTextureWithHandle) {
   std::unique_ptr<FlutterWindowsEngine> engine = GetTestEngine();
-  std::unique_ptr<MockGlFunctions> gl = std::make_unique<MockGlFunctions>();
-  FlutterWindowsTextureRegistrar registrar(engine.get(), gl->gl_procs());
+  auto gl = std::make_shared<egl::MockProcTable>();
+  FlutterWindowsTextureRegistrar registrar(engine.get(), gl);
 
   UINT width = 100;
   UINT height = 100;
@@ -237,6 +248,13 @@ TEST(FlutterWindowsTextureRegistrarTest, PopulateD3dTextureWithHandle) {
   auto texture_id = registrar.RegisterTexture(&texture_info);
   EXPECT_NE(texture_id, -1);
 
+  EXPECT_CALL(*gl.get(), GenTextures(1, _))
+      .Times(1)
+      .WillOnce([](GLsizei n, GLuint* textures) { textures[0] = 1; });
+  EXPECT_CALL(*gl.get(), BindTexture).Times(1);
+  EXPECT_CALL(*gl.get(), TexParameteri).Times(AtLeast(1));
+  EXPECT_CALL(*gl.get(), DeleteTextures(1, _)).Times(1);
+
   auto result =
       registrar.PopulateTexture(texture_id, 640, 480, &flutter_texture);
   EXPECT_TRUE(result);
@@ -248,8 +266,8 @@ TEST(FlutterWindowsTextureRegistrarTest, PopulateD3dTextureWithHandle) {
 
 TEST(FlutterWindowsTextureRegistrarTest, PopulateD3dTexture) {
   std::unique_ptr<FlutterWindowsEngine> engine = GetTestEngine();
-  std::unique_ptr<MockGlFunctions> gl = std::make_unique<MockGlFunctions>();
-  FlutterWindowsTextureRegistrar registrar(engine.get(), gl->gl_procs());
+  auto gl = std::make_shared<egl::MockProcTable>();
+  FlutterWindowsTextureRegistrar registrar(engine.get(), gl);
 
   UINT width = 100;
   UINT height = 100;
@@ -286,6 +304,13 @@ TEST(FlutterWindowsTextureRegistrarTest, PopulateD3dTexture) {
   auto texture_id = registrar.RegisterTexture(&texture_info);
   EXPECT_NE(texture_id, -1);
 
+  EXPECT_CALL(*gl.get(), GenTextures(1, _))
+      .Times(1)
+      .WillOnce([](GLsizei n, GLuint* textures) { textures[0] = 1; });
+  EXPECT_CALL(*gl.get(), BindTexture).Times(1);
+  EXPECT_CALL(*gl.get(), TexParameteri).Times(AtLeast(1));
+  EXPECT_CALL(*gl.get(), DeleteTextures(1, _)).Times(1);
+
   auto result =
       registrar.PopulateTexture(texture_id, 640, 480, &flutter_texture);
   EXPECT_TRUE(result);
@@ -297,9 +322,9 @@ TEST(FlutterWindowsTextureRegistrarTest, PopulateD3dTexture) {
 
 TEST(FlutterWindowsTextureRegistrarTest, PopulateInvalidTexture) {
   std::unique_ptr<FlutterWindowsEngine> engine = GetTestEngine();
-  std::unique_ptr<MockGlFunctions> gl = std::make_unique<MockGlFunctions>();
+  auto gl = std::make_shared<egl::MockProcTable>();
 
-  FlutterWindowsTextureRegistrar registrar(engine.get(), gl->gl_procs());
+  FlutterWindowsTextureRegistrar registrar(engine.get(), gl);
 
   auto result = registrar.PopulateTexture(1, 640, 480, nullptr);
   EXPECT_FALSE(result);
@@ -308,9 +333,9 @@ TEST(FlutterWindowsTextureRegistrarTest, PopulateInvalidTexture) {
 TEST(FlutterWindowsTextureRegistrarTest,
      UnregisterTextureWithEngineDownInvokesCallback) {
   std::unique_ptr<FlutterWindowsEngine> engine = GetTestEngine();
-  std::unique_ptr<MockGlFunctions> gl = std::make_unique<MockGlFunctions>();
+  auto gl = std::make_shared<egl::MockProcTable>();
 
-  FlutterWindowsTextureRegistrar registrar(engine.get(), gl->gl_procs());
+  FlutterWindowsTextureRegistrar registrar(engine.get(), gl);
 
   fml::AutoResetWaitableEvent latch;
   registrar.UnregisterTexture(1234, [&]() { latch.Signal(); });
diff --git a/shell/platform/windows/flutter_windows_unittests.cc b/shell/platform/windows/flutter_windows_unittests.cc
index 23f2abb89643f6e04dd212b88b77bac9617243a3..37fbbcabd5c24f84783a188ea2e5a07351d4b9ac 100644
--- a/shell/platform/windows/flutter_windows_unittests.cc
+++ b/shell/platform/windows/flutter_windows_unittests.cc
@@ -10,15 +10,45 @@
 
 #include "flutter/fml/synchronization/count_down_latch.h"
 #include "flutter/fml/synchronization/waitable_event.h"
+#include "flutter/shell/platform/common/app_lifecycle_state.h"
+#include "flutter/shell/platform/embedder/test_utils/proc_table_replacement.h"
+#include "flutter/shell/platform/windows/egl/manager.h"
+#include "flutter/shell/platform/windows/testing/engine_modifier.h"
 #include "flutter/shell/platform/windows/testing/windows_test.h"
 #include "flutter/shell/platform/windows/testing/windows_test_config_builder.h"
 #include "flutter/shell/platform/windows/testing/windows_test_context.h"
+#include "flutter/shell/platform/windows/windows_lifecycle_manager.h"
+#include "flutter/testing/stream_capture.h"
+#include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "third_party/tonic/converter/dart_converter.h"
 
 namespace flutter {
 namespace testing {
 
+namespace {
+
+// An EGL manager that initializes EGL but fails to create surfaces.
+class HalfBrokenEGLManager : public egl::Manager {
+ public:
+  HalfBrokenEGLManager() : egl::Manager(/*enable_impeller = */ false) {}
+
+  std::unique_ptr<egl::WindowSurface>
+  CreateWindowSurface(HWND hwnd, size_t width, size_t height) override {
+    return nullptr;
+  }
+};
+
+class MockWindowsLifecycleManager : public WindowsLifecycleManager {
+ public:
+  MockWindowsLifecycleManager(FlutterWindowsEngine* engine)
+      : WindowsLifecycleManager(engine) {}
+
+  MOCK_METHOD(void, SetLifecycleState, (AppLifecycleState), (override));
+};
+
+}  // namespace
+
 // Verify that we can fetch a texture registrar.
 // Prevent regression: https://github.com/flutter/flutter/issues/86617
 TEST(WindowsNoFixtureTest, GetTextureRegistrar) {
@@ -43,27 +73,20 @@ TEST_F(WindowsTest, LaunchMain) {
 // Verify there is no unexpected output from launching main.
 TEST_F(WindowsTest, LaunchMainHasNoOutput) {
   // Replace stdout & stderr stream buffers with our own.
-  std::stringstream cout_buffer;
-  std::stringstream cerr_buffer;
-  std::streambuf* old_cout_buffer = std::cout.rdbuf();
-  std::streambuf* old_cerr_buffer = std::cerr.rdbuf();
-  std::cout.rdbuf(cout_buffer.rdbuf());
-  std::cerr.rdbuf(cerr_buffer.rdbuf());
+  StreamCapture stdout_capture(&std::cout);
+  StreamCapture stderr_capture(&std::cerr);
 
   auto& context = GetContext();
   WindowsConfigBuilder builder(context);
   ViewControllerPtr controller{builder.Run()};
   ASSERT_NE(controller, nullptr);
 
-  // Restore original stdout & stderr stream buffer.
-  std::cout.rdbuf(old_cout_buffer);
-  std::cerr.rdbuf(old_cerr_buffer);
+  stdout_capture.Stop();
+  stderr_capture.Stop();
 
   // Verify stdout & stderr have no output.
-  std::string cout = cout_buffer.str();
-  std::string cerr = cerr_buffer.str();
-  EXPECT_TRUE(cout.empty());
-  EXPECT_TRUE(cerr.empty());
+  EXPECT_TRUE(stdout_capture.GetOutput().empty());
+  EXPECT_TRUE(stderr_capture.GetOutput().empty());
 }
 
 // Verify we can successfully launch a custom entry point.
@@ -93,10 +116,50 @@ TEST_F(WindowsTest, LaunchCustomEntrypointInEngineRunInvocation) {
 TEST_F(WindowsTest, LaunchHeadlessEngine) {
   auto& context = GetContext();
   WindowsConfigBuilder builder(context);
-  EnginePtr engine{builder.InitializeEngine()};
+  EnginePtr engine{builder.RunHeadless()};
+  ASSERT_NE(engine, nullptr);
+}
+
+// Verify that the engine can return to headless mode.
+TEST_F(WindowsTest, EngineCanTransitionToHeadless) {
+  auto& context = GetContext();
+  WindowsConfigBuilder builder(context);
+  EnginePtr engine{builder.RunHeadless()};
   ASSERT_NE(engine, nullptr);
 
-  ASSERT_TRUE(FlutterDesktopEngineRun(engine.get(), nullptr));
+  // Create and then destroy a view controller that does not own its engine.
+  // This causes the engine to transition back to headless mode.
+  {
+    FlutterDesktopViewControllerProperties properties = {};
+    ViewControllerPtr controller{
+        FlutterDesktopEngineCreateViewController(engine.get(), &properties)};
+
+    ASSERT_NE(controller, nullptr);
+  }
+
+  // The engine is back in headless mode now.
+  ASSERT_NE(engine, nullptr);
+}
+
+// Verify that accessibility features are initialized when a view is created.
+TEST_F(WindowsTest, LaunchRefreshesAccessibility) {
+  auto& context = GetContext();
+  WindowsConfigBuilder builder(context);
+  EnginePtr engine{builder.InitializeEngine()};
+  EngineModifier modifier{
+      reinterpret_cast<FlutterWindowsEngine*>(engine.get())};
+
+  auto called = false;
+  modifier.embedder_api().UpdateAccessibilityFeatures = MOCK_ENGINE_PROC(
+      UpdateAccessibilityFeatures, ([&called](auto engine, auto flags) {
+        called = true;
+        return kSuccess;
+      }));
+
+  ViewControllerPtr controller{
+      FlutterDesktopViewControllerCreate(0, 0, engine.release())};
+
+  ASSERT_TRUE(called);
 }
 
 // Verify that engine fails to launch when a conflicting entrypoint in
@@ -265,6 +328,18 @@ TEST_F(WindowsTest, NextFrameCallback) {
   captures.frame_drawn_latch.Wait();
 }
 
+// Implicit view has the implicit view ID.
+TEST_F(WindowsTest, GetViewId) {
+  auto& context = GetContext();
+  WindowsConfigBuilder builder(context);
+  ViewControllerPtr controller{builder.Run()};
+  ASSERT_NE(controller, nullptr);
+  FlutterDesktopViewId view_id =
+      FlutterDesktopViewControllerGetViewId(controller.get());
+
+  ASSERT_EQ(view_id, static_cast<FlutterDesktopViewId>(kImplicitViewId));
+}
+
 TEST_F(WindowsTest, GetGraphicsAdapter) {
   auto& context = GetContext();
   WindowsConfigBuilder builder(context);
@@ -279,5 +354,128 @@ TEST_F(WindowsTest, GetGraphicsAdapter) {
   ASSERT_TRUE(SUCCEEDED(dxgi_adapter->GetDesc(&desc)));
 }
 
+// Implicit view has the implicit view ID.
+TEST_F(WindowsTest, PluginRegistrarGetImplicitView) {
+  auto& context = GetContext();
+  WindowsConfigBuilder builder(context);
+  ViewControllerPtr controller{builder.Run()};
+  ASSERT_NE(controller, nullptr);
+
+  FlutterDesktopEngineRef engine =
+      FlutterDesktopViewControllerGetEngine(controller.get());
+  FlutterDesktopPluginRegistrarRef registrar =
+      FlutterDesktopEngineGetPluginRegistrar(engine, "foo_bar");
+  FlutterDesktopViewRef implicit_view =
+      FlutterDesktopPluginRegistrarGetView(registrar);
+
+  ASSERT_NE(implicit_view, nullptr);
+}
+
+TEST_F(WindowsTest, PluginRegistrarGetView) {
+  auto& context = GetContext();
+  WindowsConfigBuilder builder(context);
+  ViewControllerPtr controller{builder.Run()};
+  ASSERT_NE(controller, nullptr);
+
+  FlutterDesktopEngineRef engine =
+      FlutterDesktopViewControllerGetEngine(controller.get());
+  FlutterDesktopPluginRegistrarRef registrar =
+      FlutterDesktopEngineGetPluginRegistrar(engine, "foo_bar");
+
+  FlutterDesktopViewId view_id =
+      FlutterDesktopViewControllerGetViewId(controller.get());
+  FlutterDesktopViewRef view =
+      FlutterDesktopPluginRegistrarGetViewById(registrar, view_id);
+
+  FlutterDesktopViewRef view_123 = FlutterDesktopPluginRegistrarGetViewById(
+      registrar, static_cast<FlutterDesktopViewId>(123));
+
+  ASSERT_NE(view, nullptr);
+  ASSERT_EQ(view_123, nullptr);
+}
+
+TEST_F(WindowsTest, PluginRegistrarGetViewHeadless) {
+  auto& context = GetContext();
+  WindowsConfigBuilder builder(context);
+  EnginePtr engine{builder.RunHeadless()};
+  ASSERT_NE(engine, nullptr);
+
+  FlutterDesktopPluginRegistrarRef registrar =
+      FlutterDesktopEngineGetPluginRegistrar(engine.get(), "foo_bar");
+
+  FlutterDesktopViewRef implicit_view =
+      FlutterDesktopPluginRegistrarGetView(registrar);
+  FlutterDesktopViewRef view_123 = FlutterDesktopPluginRegistrarGetViewById(
+      registrar, static_cast<FlutterDesktopViewId>(123));
+
+  ASSERT_EQ(implicit_view, nullptr);
+  ASSERT_EQ(view_123, nullptr);
+}
+
+// Verify the app does not crash if EGL initializes successfully but
+// the rendering surface cannot be created.
+TEST_F(WindowsTest, SurfaceOptional) {
+  auto& context = GetContext();
+  WindowsConfigBuilder builder(context);
+  EnginePtr engine{builder.InitializeEngine()};
+  EngineModifier modifier{
+      reinterpret_cast<FlutterWindowsEngine*>(engine.get())};
+
+  auto egl_manager = std::make_unique<HalfBrokenEGLManager>();
+  ASSERT_TRUE(egl_manager->IsValid());
+  modifier.SetEGLManager(std::move(egl_manager));
+
+  ViewControllerPtr controller{
+      FlutterDesktopViewControllerCreate(0, 0, engine.release())};
+
+  ASSERT_NE(controller, nullptr);
+}
+
+// Verify the app produces the expected lifecycle events.
+TEST_F(WindowsTest, Lifecycle) {
+  auto& context = GetContext();
+  WindowsConfigBuilder builder(context);
+  EnginePtr engine{builder.InitializeEngine()};
+  auto windows_engine = reinterpret_cast<FlutterWindowsEngine*>(engine.get());
+  EngineModifier modifier{windows_engine};
+
+  auto lifecycle_manager =
+      std::make_unique<MockWindowsLifecycleManager>(windows_engine);
+  auto lifecycle_manager_ptr = lifecycle_manager.get();
+  modifier.SetLifecycleManager(std::move(lifecycle_manager));
+
+  EXPECT_CALL(*lifecycle_manager_ptr,
+              SetLifecycleState(AppLifecycleState::kResumed))
+      .WillOnce([lifecycle_manager_ptr](AppLifecycleState state) {
+        lifecycle_manager_ptr->WindowsLifecycleManager::SetLifecycleState(
+            state);
+      });
+
+  EXPECT_CALL(*lifecycle_manager_ptr,
+              SetLifecycleState(AppLifecycleState::kHidden))
+      .WillOnce([lifecycle_manager_ptr](AppLifecycleState state) {
+        lifecycle_manager_ptr->WindowsLifecycleManager::SetLifecycleState(
+            state);
+      });
+
+  // Create a controller. This launches the engine and sets the app lifecycle
+  // to the "resumed" state.
+  ViewControllerPtr controller{
+      FlutterDesktopViewControllerCreate(0, 0, engine.release())};
+
+  FlutterDesktopViewRef view =
+      FlutterDesktopViewControllerGetView(controller.get());
+  ASSERT_NE(view, nullptr);
+
+  HWND hwnd = FlutterDesktopViewGetHWND(view);
+  ASSERT_NE(hwnd, nullptr);
+
+  // Give the window a non-zero size to show it. This does not change the app
+  // lifecycle directly. However, destroying the view will now result in a
+  // "hidden" app lifecycle event.
+  ::MoveWindow(hwnd, /* X */ 0, /* Y */ 0, /* nWidth*/ 100, /* nHeight*/ 100,
+               /* bRepaint*/ false);
+}
+
 }  // namespace testing
 }  // namespace flutter
diff --git a/shell/platform/windows/flutter_windows_view.cc b/shell/platform/windows/flutter_windows_view.cc
index 0f04f57bf7ee668d67207e233a3ae9c06d6dc028..f8a87c825979f5e8d65b2443197d35fa497302b4 100644
--- a/shell/platform/windows/flutter_windows_view.cc
+++ b/shell/platform/windows/flutter_windows_view.cc
@@ -6,10 +6,12 @@
 
 #include <chrono>
 
+#include "flutter/common/constants.h"
+#include "flutter/fml/platform/win/wstring_conversion.h"
 #include "flutter/shell/platform/common/accessibility_bridge.h"
 #include "flutter/shell/platform/windows/keyboard_key_channel_handler.h"
-#include "flutter/shell/platform/windows/keyboard_key_embedder_handler.h"
 #include "flutter/shell/platform/windows/text_input_plugin.h"
+#include "flutter/third_party/accessibility/ax/platform/ax_platform_node_win.h"
 
 namespace flutter {
 
@@ -35,85 +37,135 @@ bool SurfaceWillUpdate(size_t cur_width,
       (cur_height != target_height) || (cur_width != target_width);
   return non_zero_target_dims && not_same_size;
 }
+
+/// Update the surface's swap interval to block until the v-blank iff
+/// the system compositor is disabled.
+void UpdateVsync(const FlutterWindowsEngine& engine,
+                 egl::WindowSurface* surface,
+                 bool needs_vsync) {
+  egl::Manager* egl_manager = engine.egl_manager();
+  if (!egl_manager) {
+    return;
+  }
+
+  auto update_vsync = [egl_manager, surface, needs_vsync]() {
+    if (!surface || !surface->IsValid()) {
+      return;
+    }
+
+    if (!surface->MakeCurrent()) {
+      FML_LOG(ERROR) << "Unable to make the render surface current to update "
+                        "the swap interval";
+      return;
+    }
+
+    if (!surface->SetVSyncEnabled(needs_vsync)) {
+      FML_LOG(ERROR) << "Unable to update the render surface's swap interval";
+    }
+
+    if (!egl_manager->render_context()->ClearCurrent()) {
+      FML_LOG(ERROR) << "Unable to clear current surface after updating "
+                        "the swap interval";
+    }
+  };
+
+  // Updating the vsync makes the EGL context and render surface current.
+  // If the engine is running, the render surface should only be made current on
+  // the raster thread. If the engine is initializing, the raster thread doesn't
+  // exist yet and the render surface can be made current on the platform
+  // thread.
+  if (engine.running()) {
+    engine.PostRasterThreadTask(update_vsync);
+  } else {
+    update_vsync();
+  }
+}
+
 }  // namespace
 
 FlutterWindowsView::FlutterWindowsView(
-    std::unique_ptr<WindowBindingHandler> window_binding) {
+    FlutterViewId view_id,
+    FlutterWindowsEngine* engine,
+    std::unique_ptr<WindowBindingHandler> window_binding,
+    std::shared_ptr<WindowsProcTable> windows_proc_table)
+    : view_id_(view_id),
+      engine_(engine),
+      windows_proc_table_(std::move(windows_proc_table)) {
+  if (windows_proc_table_ == nullptr) {
+    windows_proc_table_ = std::make_shared<WindowsProcTable>();
+  }
+
   // Take the binding handler, and give it a pointer back to self.
   binding_handler_ = std::move(window_binding);
   binding_handler_->SetView(this);
-
-  render_target_ = std::make_unique<WindowsRenderTarget>(
-      binding_handler_->GetRenderTarget());
 }
 
 FlutterWindowsView::~FlutterWindowsView() {
-  DestroyRenderSurface();
-}
+  // The view owns the child window.
+  // Notify the engine the view's child window will no longer be visible.
+  engine_->OnWindowStateEvent(GetWindowHandle(), WindowStateEvent::kHide);
 
-void FlutterWindowsView::SetEngine(
-    std::unique_ptr<FlutterWindowsEngine> engine) {
-  engine_ = std::move(engine);
+  // The engine renders into the view's surface. The engine must be
+  // shutdown before the view's resources can be destroyed.
+  engine_->Stop();
 
-  engine_->SetView(this);
-
-  internal_plugin_registrar_ =
-      std::make_unique<PluginRegistrar>(engine_->GetRegistrar());
+  DestroyRenderSurface();
+}
 
-  // Set up the system channel handlers.
-  auto internal_plugin_messenger = internal_plugin_registrar_->messenger();
-  InitializeKeyboard();
-  platform_handler_ =
-      std::make_unique<PlatformHandler>(internal_plugin_messenger, this);
-  cursor_handler_ = std::make_unique<CursorHandler>(internal_plugin_messenger,
-                                                    binding_handler_.get());
+bool FlutterWindowsView::OnEmptyFrameGenerated() {
+  // Called on the raster thread.
+  std::unique_lock<std::mutex> lock(resize_mutex_);
 
-  PhysicalWindowBounds bounds = binding_handler_->GetPhysicalWindowBounds();
+  if (surface_ == nullptr || !surface_->IsValid()) {
+    return false;
+  }
 
-  SendWindowMetrics(bounds.width, bounds.height,
-                    binding_handler_->GetDpiScale());
-}
+  if (resize_status_ != ResizeState::kResizeStarted) {
+    return true;
+  }
 
-std::unique_ptr<KeyboardHandlerBase>
-FlutterWindowsView::CreateKeyboardKeyHandler(
-    BinaryMessenger* messenger,
-    KeyboardKeyEmbedderHandler::GetKeyStateHandler get_key_state,
-    KeyboardKeyEmbedderHandler::MapVirtualKeyToScanCode map_vk_to_scan) {
-  auto keyboard_key_handler = std::make_unique<KeyboardKeyHandler>();
-  keyboard_key_handler->AddDelegate(
-      std::make_unique<KeyboardKeyEmbedderHandler>(
-          [this](const FlutterKeyEvent& event, FlutterKeyEventCallback callback,
-                 void* user_data) {
-            return engine_->SendKeyEvent(event, callback, user_data);
-          },
-          get_key_state, map_vk_to_scan));
-  keyboard_key_handler->AddDelegate(
-      std::make_unique<KeyboardKeyChannelHandler>(messenger));
-  return keyboard_key_handler;
-}
+  if (!ResizeRenderSurface(resize_target_height_, resize_target_width_)) {
+    return false;
+  }
 
-std::unique_ptr<TextInputPlugin> FlutterWindowsView::CreateTextInputPlugin(
-    BinaryMessenger* messenger) {
-  return std::make_unique<TextInputPlugin>(messenger, this);
+  // Platform thread is blocked for the entire duration until the
+  // resize_status_ is set to kDone by |OnFramePresented|.
+  resize_status_ = ResizeState::kFrameGenerated;
+  return true;
 }
 
-uint32_t FlutterWindowsView::GetFrameBufferId(size_t width, size_t height) {
-  // Called on an engine-controlled (non-platform) thread.
+bool FlutterWindowsView::OnFrameGenerated(size_t width, size_t height) {
+  // Called on the raster thread.
   std::unique_lock<std::mutex> lock(resize_mutex_);
 
+  if (surface_ == nullptr || !surface_->IsValid()) {
+    return false;
+  }
+
   if (resize_status_ != ResizeState::kResizeStarted) {
-    return kWindowFrameBufferID;
+    return true;
+  }
+
+  if (resize_target_width_ != width || resize_target_height_ != height) {
+    return false;
   }
 
-  if (resize_target_width_ == width && resize_target_height_ == height) {
-    // Platform thread is blocked for the entire duration until the
-    // resize_status_ is set to kDone.
-    engine_->surface_manager()->ResizeSurface(GetRenderTarget(), width, height);
-    engine_->surface_manager()->MakeCurrent();
-    resize_status_ = ResizeState::kFrameGenerated;
+  if (!ResizeRenderSurface(resize_target_width_, resize_target_height_)) {
+    return false;
   }
 
-  return kWindowFrameBufferID;
+  // Platform thread is blocked for the entire duration until the
+  // resize_status_ is set to kDone by |OnFramePresented|.
+  resize_status_ = ResizeState::kFrameGenerated;
+  return true;
+}
+
+void FlutterWindowsView::UpdateFlutterCursor(const std::string& cursor_name) {
+  binding_handler_->UpdateFlutterCursor(cursor_name);
+}
+
+void FlutterWindowsView::SetFlutterCursor(HCURSOR cursor) {
+  binding_handler_->SetFlutterCursor(cursor);
 }
 
 void FlutterWindowsView::ForceRedraw() {
@@ -123,42 +175,42 @@ void FlutterWindowsView::ForceRedraw() {
   }
 }
 
-void FlutterWindowsView::OnPreEngineRestart() {
-  InitializeKeyboard();
-}
-
-void FlutterWindowsView::OnWindowSizeChanged(size_t width, size_t height) {
+bool FlutterWindowsView::OnWindowSizeChanged(size_t width, size_t height) {
   // Called on the platform thread.
   std::unique_lock<std::mutex> lock(resize_mutex_);
 
-  if (!engine_->surface_manager()) {
+  if (!engine_->egl_manager()) {
     SendWindowMetrics(width, height, binding_handler_->GetDpiScale());
-    return;
+    return true;
   }
 
-  EGLint surface_width, surface_height;
-  engine_->surface_manager()->GetSurfaceDimensions(&surface_width,
-                                                   &surface_height);
+  if (!surface_ || !surface_->IsValid()) {
+    SendWindowMetrics(width, height, binding_handler_->GetDpiScale());
+    return true;
+  }
 
+  // We're using OpenGL rendering. Resizing the surface must happen on the
+  // raster thread.
   bool surface_will_update =
-      SurfaceWillUpdate(surface_width, surface_height, width, height);
-  if (surface_will_update) {
-    resize_status_ = ResizeState::kResizeStarted;
-    resize_target_width_ = width;
-    resize_target_height_ = height;
+      SurfaceWillUpdate(surface_->width(), surface_->height(), width, height);
+  if (!surface_will_update) {
+    SendWindowMetrics(width, height, binding_handler_->GetDpiScale());
+    return true;
   }
 
+  resize_status_ = ResizeState::kResizeStarted;
+  resize_target_width_ = width;
+  resize_target_height_ = height;
+
   SendWindowMetrics(width, height, binding_handler_->GetDpiScale());
 
-  if (surface_will_update) {
-    // Block the platform thread until:
-    //   1. GetFrameBufferId is called with the right frame size.
-    //   2. Any pending SwapBuffers calls have been invoked.
-    resize_cv_.wait_for(lock, kWindowResizeTimeout,
-                        [&resize_status = resize_status_] {
-                          return resize_status == ResizeState::kDone;
-                        });
-  }
+  // Block the platform thread until a frame is presented with the target
+  // size. See |OnFrameGenerated|, |OnEmptyFrameGenerated|, and
+  // |OnFramePresented|.
+  return resize_cv_.wait_for(lock, kWindowResizeTimeout,
+                             [&resize_status = resize_status_] {
+                               return resize_status == ResizeState::kDone;
+                             });
 }
 
 void FlutterWindowsView::OnWindowRepaint() {
@@ -168,7 +220,9 @@ void FlutterWindowsView::OnWindowRepaint() {
 void FlutterWindowsView::OnPointerMove(double x,
                                        double y,
                                        FlutterPointerDeviceKind device_kind,
-                                       int32_t device_id) {
+                                       int32_t device_id,
+                                       int modifiers_state) {
+  engine_->keyboard_key_handler()->SyncModifiersIfNeeded(modifiers_state);
   SendPointerMove(x, y, GetOrCreatePointerState(device_kind, device_id));
 }
 
@@ -274,7 +328,11 @@ void FlutterWindowsView::OnUpdateSemanticsEnabled(bool enabled) {
 }
 
 gfx::NativeViewAccessible FlutterWindowsView::GetNativeViewAccessible() {
-  return engine_->GetNativeAccessibleFromId(AccessibilityBridge::kRootNodeId);
+  if (!accessibility_bridge_) {
+    return nullptr;
+  }
+
+  return accessibility_bridge_->GetChildOfAXFragmentRoot();
 }
 
 void FlutterWindowsView::OnCursorRectUpdated(const Rect& rect) {
@@ -285,22 +343,6 @@ void FlutterWindowsView::OnResetImeComposing() {
   binding_handler_->OnResetImeComposing();
 }
 
-void FlutterWindowsView::InitializeKeyboard() {
-  auto internal_plugin_messenger = internal_plugin_registrar_->messenger();
-  // TODO(cbracken): This can be inlined into KeyboardKeyEmedderHandler once
-  // UWP code is removed. https://github.com/flutter/flutter/issues/102172.
-  KeyboardKeyEmbedderHandler::GetKeyStateHandler get_key_state = GetKeyState;
-  KeyboardKeyEmbedderHandler::MapVirtualKeyToScanCode map_vk_to_scan =
-      [](UINT virtual_key, bool extended) {
-        return MapVirtualKey(virtual_key,
-                             extended ? MAPVK_VK_TO_VSC_EX : MAPVK_VK_TO_VSC);
-      };
-  keyboard_key_handler_ = std::move(CreateKeyboardKeyHandler(
-      internal_plugin_messenger, get_key_state, map_vk_to_scan));
-  text_input_plugin_ =
-      std::move(CreateTextInputPlugin(internal_plugin_messenger));
-}
-
 // Sends new size  information to FlutterEngine.
 void FlutterWindowsView::SendWindowMetrics(size_t width,
                                            size_t height,
@@ -310,6 +352,7 @@ void FlutterWindowsView::SendWindowMetrics(size_t width,
   event.width = width;
   event.height = height;
   event.pixel_ratio = dpiScale;
+  event.view_id = view_id_;
   engine_->SendWindowMetricsEvent(event);
 }
 
@@ -448,7 +491,7 @@ void FlutterWindowsView::SendPointerPanZoomEnd(int32_t device_id) {
 }
 
 void FlutterWindowsView::SendText(const std::u16string& text) {
-  text_input_plugin_->TextHook(text);
+  engine_->text_input_plugin()->TextHook(text);
 }
 
 void FlutterWindowsView::SendKey(int key,
@@ -458,32 +501,32 @@ void FlutterWindowsView::SendKey(int key,
                                  bool extended,
                                  bool was_down,
                                  KeyEventCallback callback) {
-  keyboard_key_handler_->KeyboardHook(
+  engine_->keyboard_key_handler()->KeyboardHook(
       key, scancode, action, character, extended, was_down,
       [=, callback = std::move(callback)](bool handled) {
         if (!handled) {
-          text_input_plugin_->KeyboardHook(key, scancode, action, character,
-                                           extended, was_down);
+          engine_->text_input_plugin()->KeyboardHook(
+              key, scancode, action, character, extended, was_down);
         }
         callback(handled);
       });
 }
 
 void FlutterWindowsView::SendComposeBegin() {
-  text_input_plugin_->ComposeBeginHook();
+  engine_->text_input_plugin()->ComposeBeginHook();
 }
 
 void FlutterWindowsView::SendComposeCommit() {
-  text_input_plugin_->ComposeCommitHook();
+  engine_->text_input_plugin()->ComposeCommitHook();
 }
 
 void FlutterWindowsView::SendComposeEnd() {
-  text_input_plugin_->ComposeEndHook();
+  engine_->text_input_plugin()->ComposeEndHook();
 }
 
 void FlutterWindowsView::SendComposeChange(const std::u16string& text,
                                            int cursor_pos) {
-  text_input_plugin_->ComposeChangeHook(text, cursor_pos);
+  engine_->text_input_plugin()->ComposeChangeHook(text, cursor_pos);
 }
 
 void FlutterWindowsView::SendScroll(double x,
@@ -546,6 +589,7 @@ void FlutterWindowsView::SendPointerEventWithData(
   event.device_kind = state->device_kind;
   event.device = state->pointer_id;
   event.buttons = state->buttons;
+  event.view_id = view_id_;
 
   // Set metadata that's always the same regardless of the event.
   event.struct_size = sizeof(event);
@@ -566,53 +610,42 @@ void FlutterWindowsView::SendPointerEventWithData(
   }
 }
 
-bool FlutterWindowsView::MakeCurrent() {
-  return engine_->surface_manager()->MakeCurrent();
-}
-
-bool FlutterWindowsView::MakeResourceCurrent() {
-  return engine_->surface_manager()->MakeResourceCurrent();
-}
-
-bool FlutterWindowsView::ClearContext() {
-  return engine_->surface_manager()->ClearContext();
-}
-
-bool FlutterWindowsView::SwapBuffers() {
-  // Called on an engine-controlled (non-platform) thread.
+void FlutterWindowsView::OnFramePresented() {
+  // Called on the engine's raster thread.
   std::unique_lock<std::mutex> lock(resize_mutex_);
 
   switch (resize_status_) {
-    // SwapBuffer requests during resize are ignored until the frame with the
-    // right dimensions has been generated. This is marked with
-    // kFrameGenerated resize status.
     case ResizeState::kResizeStarted:
-      return false;
+      // The caller must first call |OnFrameGenerated| or
+      // |OnEmptyFrameGenerated| before calling this method. This
+      // indicates one of the following:
+      //
+      // 1. The caller did not call these methods.
+      // 2. The caller ignored these methods' result.
+      // 3. The platform thread started a resize after the caller called these
+      //    methods. We might have presented a frame of the wrong size to the
+      //    view.
+      return;
     case ResizeState::kFrameGenerated: {
-      bool visible = binding_handler_->IsVisible();
-      bool swap_buffers_result;
-      // For visible windows swap the buffers while resize handler is waiting.
-      // For invisible windows unblock the handler first and then swap buffers.
-      // SwapBuffers waits for vsync and there's no point doing that for
-      // invisible windows.
-      if (visible) {
-        swap_buffers_result = engine_->surface_manager()->SwapBuffers();
-      }
+      // A frame was generated for a pending resize.
+      // Unblock the platform thread.
       resize_status_ = ResizeState::kDone;
       lock.unlock();
       resize_cv_.notify_all();
-      binding_handler_->OnWindowResized();
-      if (!visible) {
-        swap_buffers_result = engine_->surface_manager()->SwapBuffers();
-      }
-      return swap_buffers_result;
+
+      // Blocking the raster thread until DWM flushes alleviates glitches where
+      // previous size surface is stretched over current size view.
+      windows_proc_table_->DwmFlush();
     }
     case ResizeState::kDone:
-    default:
-      return engine_->surface_manager()->SwapBuffers();
+      return;
   }
 }
 
+bool FlutterWindowsView::ClearSoftwareBitmap() {
+  return binding_handler_->OnBitmapSurfaceCleared();
+}
+
 bool FlutterWindowsView::PresentSoftwareBitmap(const void* allocation,
                                                size_t row_bytes,
                                                size_t height) {
@@ -620,61 +653,140 @@ bool FlutterWindowsView::PresentSoftwareBitmap(const void* allocation,
                                                   height);
 }
 
+FlutterViewId FlutterWindowsView::view_id() const {
+  return view_id_;
+}
+
 void FlutterWindowsView::CreateRenderSurface() {
-  if (engine_ && engine_->surface_manager()) {
+  FML_DCHECK(surface_ == nullptr);
+
+  if (engine_->egl_manager()) {
     PhysicalWindowBounds bounds = binding_handler_->GetPhysicalWindowBounds();
-    engine_->surface_manager()->CreateSurface(GetRenderTarget(), bounds.width,
-                                              bounds.height);
+    surface_ = engine_->egl_manager()->CreateWindowSurface(
+        GetWindowHandle(), bounds.width, bounds.height);
+
+    UpdateVsync(*engine_, surface_.get(), NeedsVsync());
+
     resize_target_width_ = bounds.width;
     resize_target_height_ = bounds.height;
   }
 }
 
-void FlutterWindowsView::DestroyRenderSurface() {
-  if (engine_ && engine_->surface_manager()) {
-    engine_->surface_manager()->DestroySurface();
+bool FlutterWindowsView::ResizeRenderSurface(size_t width, size_t height) {
+  FML_DCHECK(surface_ != nullptr);
+
+  // No-op if the surface is already the desired size.
+  if (width == surface_->width() && height == surface_->height()) {
+    return true;
+  }
+
+  auto const existing_vsync = surface_->vsync_enabled();
+
+  // TODO: Destroying the surface and re-creating it is expensive.
+  // Ideally this would use ANGLE's automatic surface sizing instead.
+  // See: https://github.com/flutter/flutter/issues/79427
+  if (!surface_->Destroy()) {
+    FML_LOG(ERROR) << "View resize failed to destroy surface";
+    return false;
+  }
+
+  std::unique_ptr<egl::WindowSurface> resized_surface =
+      engine_->egl_manager()->CreateWindowSurface(GetWindowHandle(), width,
+                                                  height);
+  if (!resized_surface) {
+    FML_LOG(ERROR) << "View resize failed to create surface";
+    return false;
+  }
+
+  if (!resized_surface->MakeCurrent() ||
+      !resized_surface->SetVSyncEnabled(existing_vsync)) {
+    // Surfaces block until the v-blank by default.
+    // Failing to update the vsync might result in unnecessary blocking.
+    // This regresses performance but not correctness.
+    FML_LOG(ERROR) << "View resize failed to set vsync";
   }
+
+  surface_ = std::move(resized_surface);
+  return true;
 }
 
-void FlutterWindowsView::SendInitialAccessibilityFeatures() {
-  binding_handler_->SendInitialAccessibilityFeatures();
+void FlutterWindowsView::DestroyRenderSurface() {
+  if (surface_) {
+    surface_->Destroy();
+  }
 }
 
-void FlutterWindowsView::UpdateHighContrastEnabled(bool enabled) {
-  engine_->UpdateHighContrastEnabled(enabled);
+egl::WindowSurface* FlutterWindowsView::surface() const {
+  return surface_.get();
 }
 
-WindowsRenderTarget* FlutterWindowsView::GetRenderTarget() const {
-  return render_target_.get();
+void FlutterWindowsView::OnHighContrastChanged() {
+  engine_->UpdateHighContrastMode();
 }
 
-PlatformWindow FlutterWindowsView::GetPlatformWindow() const {
-  return binding_handler_->GetPlatformWindow();
+HWND FlutterWindowsView::GetWindowHandle() const {
+  return binding_handler_->GetWindowHandle();
 }
 
-FlutterWindowsEngine* FlutterWindowsView::GetEngine() {
-  return engine_.get();
+FlutterWindowsEngine* FlutterWindowsView::GetEngine() const {
+  return engine_;
 }
 
 void FlutterWindowsView::AnnounceAlert(const std::wstring& text) {
-  AccessibilityRootNode* root_node =
-      binding_handler_->GetAccessibilityRootNode();
-  AccessibilityAlert* alert =
-      binding_handler_->GetAccessibilityRootNode()->GetOrCreateAlert();
-  alert->SetText(text);
-  HWND hwnd = GetPlatformWindow();
-  NotifyWinEventWrapper(EVENT_SYSTEM_ALERT, hwnd, OBJID_CLIENT,
-                        AccessibilityRootNode::kAlertChildId);
-}
-
-void FlutterWindowsView::NotifyWinEventWrapper(DWORD event,
-                                               HWND hwnd,
-                                               LONG idObject,
-                                               LONG idChild) {
-  if (hwnd) {
-    NotifyWinEvent(EVENT_SYSTEM_ALERT, hwnd, OBJID_CLIENT,
-                   AccessibilityRootNode::kAlertChildId);
+  auto alert_delegate = binding_handler_->GetAlertDelegate();
+  if (!alert_delegate) {
+    return;
   }
+  alert_delegate->SetText(fml::WideStringToUtf16(text));
+  ui::AXPlatformNodeWin* alert_node = binding_handler_->GetAlert();
+  NotifyWinEventWrapper(alert_node, ax::mojom::Event::kAlert);
+}
+
+void FlutterWindowsView::NotifyWinEventWrapper(ui::AXPlatformNodeWin* node,
+                                               ax::mojom::Event event) {
+  if (node) {
+    node->NotifyAccessibilityEvent(event);
+  }
+}
+
+ui::AXFragmentRootDelegateWin* FlutterWindowsView::GetAxFragmentRootDelegate() {
+  return accessibility_bridge_.get();
+}
+
+ui::AXPlatformNodeWin* FlutterWindowsView::AlertNode() const {
+  return binding_handler_->GetAlert();
+}
+
+std::shared_ptr<AccessibilityBridgeWindows>
+FlutterWindowsView::CreateAccessibilityBridge() {
+  return std::make_shared<AccessibilityBridgeWindows>(this);
+}
+
+void FlutterWindowsView::UpdateSemanticsEnabled(bool enabled) {
+  if (semantics_enabled_ != enabled) {
+    semantics_enabled_ = enabled;
+
+    if (!semantics_enabled_ && accessibility_bridge_) {
+      accessibility_bridge_.reset();
+    } else if (semantics_enabled_ && !accessibility_bridge_) {
+      accessibility_bridge_ = CreateAccessibilityBridge();
+    }
+  }
+}
+
+void FlutterWindowsView::OnDwmCompositionChanged() {
+  UpdateVsync(*engine_, surface_.get(), NeedsVsync());
+}
+
+void FlutterWindowsView::OnWindowStateEvent(HWND hwnd, WindowStateEvent event) {
+  engine_->OnWindowStateEvent(hwnd, event);
+}
+
+bool FlutterWindowsView::NeedsVsync() const {
+  // If the Desktop Window Manager composition is enabled,
+  // the system itself synchronizes with vsync.
+  // See: https://learn.microsoft.com/windows/win32/dwm/composition-ovw
+  return !windows_proc_table_->DwmIsCompositionEnabled();
 }
 
 }  // namespace flutter
diff --git a/shell/platform/windows/flutter_windows_view.h b/shell/platform/windows/flutter_windows_view.h
index f2b38ed22e72438a11b73b769d4eb0959ff31541..8cd4e5e71312bb152d321cb8610b567863eddf24 100644
--- a/shell/platform/windows/flutter_windows_view.h
+++ b/shell/platform/windows/flutter_windows_view.h
@@ -5,8 +5,6 @@
 #ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_FLUTTER_WINDOWS_VIEW_H_
 #define FLUTTER_SHELL_PLATFORM_WINDOWS_FLUTTER_WINDOWS_VIEW_H_
 
-#include <windowsx.h>
-
 #include <memory>
 #include <mutex>
 #include <string>
@@ -14,44 +12,39 @@
 #include <utility>
 #include <vector>
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/plugin_registrar.h"
 #include "flutter/shell/platform/common/geometry.h"
 #include "flutter/shell/platform/embedder/embedder.h"
-#include "flutter/shell/platform/windows/angle_surface_manager.h"
-#include "flutter/shell/platform/windows/cursor_handler.h"
+#include "flutter/shell/platform/windows/accessibility_bridge_windows.h"
 #include "flutter/shell/platform/windows/flutter_windows_engine.h"
-#include "flutter/shell/platform/windows/keyboard_handler_base.h"
-#include "flutter/shell/platform/windows/keyboard_key_embedder_handler.h"
-#include "flutter/shell/platform/windows/platform_handler.h"
 #include "flutter/shell/platform/windows/public/flutter_windows.h"
-#include "flutter/shell/platform/windows/text_input_plugin.h"
-#include "flutter/shell/platform/windows/text_input_plugin_delegate.h"
 #include "flutter/shell/platform/windows/window_binding_handler.h"
 #include "flutter/shell/platform/windows/window_binding_handler_delegate.h"
 #include "flutter/shell/platform/windows/window_state.h"
+#include "flutter/shell/platform/windows/windows_proc_table.h"
 
 namespace flutter {
 
-// ID for the window frame buffer.
-inline constexpr uint32_t kWindowFrameBufferID = 0;
+// A unique identifier for a view.
+using FlutterViewId = int64_t;
 
-// An OS-windowing neutral abstration for flutter
-// view that works with win32 hwnds and Windows::UI::Composition visuals.
-class FlutterWindowsView : public WindowBindingHandlerDelegate,
-                           public TextInputPluginDelegate {
+// An OS-windowing neutral abstration for a Flutter view that works
+// with win32 HWNDs.
+class FlutterWindowsView : public WindowBindingHandlerDelegate {
  public:
   // Creates a FlutterWindowsView with the given implementor of
   // WindowBindingHandler.
-  //
-  // In order for object to render Flutter content the SetEngine method must be
-  // called with a valid FlutterWindowsEngine instance.
-  FlutterWindowsView(std::unique_ptr<WindowBindingHandler> window_binding);
+  FlutterWindowsView(
+      FlutterViewId view_id,
+      FlutterWindowsEngine* engine,
+      std::unique_ptr<WindowBindingHandler> window_binding,
+      std::shared_ptr<WindowsProcTable> windows_proc_table = nullptr);
 
   virtual ~FlutterWindowsView();
 
-  // Configures the window instance with an instance of a running Flutter
-  // engine.
-  void SetEngine(std::unique_ptr<FlutterWindowsEngine> engine);
+  // Get the view's unique identifier.
+  FlutterViewId view_id() const;
 
   // Creates rendering surface for Flutter engine to draw into.
   // Should be called before calling FlutterEngineRun using this view.
@@ -60,53 +53,65 @@ class FlutterWindowsView : public WindowBindingHandlerDelegate,
   // Destroys current rendering surface if one has been allocated.
   void DestroyRenderSurface();
 
-  // Return the currently configured WindowsRenderTarget.
-  WindowsRenderTarget* GetRenderTarget() const;
+  // Get the EGL surface that backs the Flutter view.
+  //
+  // This might be nullptr or an invalid surface.
+  egl::WindowSurface* surface() const;
 
-  // Return the currently configured PlatformWindow.
-  PlatformWindow GetPlatformWindow() const;
+  // Return the currently configured HWND.
+  virtual HWND GetWindowHandle() const;
 
   // Returns the engine backing this view.
-  FlutterWindowsEngine* GetEngine();
+  FlutterWindowsEngine* GetEngine() const;
 
   // Tells the engine to generate a new frame
   void ForceRedraw();
 
-  // Callbacks for clearing context, settings context and swapping buffers,
-  // these are typically called on an engine-controlled (non-platform) thread.
-  bool ClearContext();
-  bool MakeCurrent();
-  bool MakeResourceCurrent();
-  bool SwapBuffers();
+  // Callback to clear a previously presented software bitmap.
+  virtual bool ClearSoftwareBitmap();
 
   // Callback for presenting a software bitmap.
-  bool PresentSoftwareBitmap(const void* allocation,
-                             size_t row_bytes,
-                             size_t height);
+  virtual bool PresentSoftwareBitmap(const void* allocation,
+                                     size_t row_bytes,
+                                     size_t height);
 
   // Send initial bounds to embedder.  Must occur after engine has initialized.
   void SendInitialBounds();
 
-  // Send the initial accessibility features to the window
-  void SendInitialAccessibilityFeatures();
-
   // Set the text of the alert, and create it if it does not yet exist.
   void AnnounceAlert(const std::wstring& text);
 
   // |WindowBindingHandlerDelegate|
-  void UpdateHighContrastEnabled(bool enabled) override;
+  void OnHighContrastChanged() override;
 
-  // Returns the frame buffer id for the engine to render to.
-  uint32_t GetFrameBufferId(size_t width, size_t height);
+  // Called on the raster thread when |CompositorOpenGL| receives an empty
+  // frame. Returns true if the frame can be presented.
+  //
+  // This destroys and then re-creates the view's surface if a resize is
+  // pending.
+  bool OnEmptyFrameGenerated();
 
-  // Invoked by the engine right before the engine is restarted.
+  // Called on the raster thread when |CompositorOpenGL| receives a frame.
+  // Returns true if the frame can be presented.
   //
-  // This should reset necessary states to as if the view has just been
-  // created. This is typically caused by a hot restart (Shift-R in CLI.)
-  void OnPreEngineRestart();
+  // This destroys and then re-creates the view's surface if a resize is pending
+  // and |width| and |height| match the target size.
+  bool OnFrameGenerated(size_t width, size_t height);
+
+  // Called on the raster thread after |CompositorOpenGL| presents a frame.
+  //
+  // This completes a view resize if one is pending.
+  virtual void OnFramePresented();
+
+  // Sets the cursor that should be used when the mouse is over the Flutter
+  // content. See mouse_cursor.dart for the values and meanings of cursor_name.
+  void UpdateFlutterCursor(const std::string& cursor_name);
+
+  // Sets the cursor directly from a cursor handle.
+  void SetFlutterCursor(HCURSOR cursor);
 
   // |WindowBindingHandlerDelegate|
-  void OnWindowSizeChanged(size_t width, size_t height) override;
+  bool OnWindowSizeChanged(size_t width, size_t height) override;
 
   // |WindowBindingHandlerDelegate|
   void OnWindowRepaint() override;
@@ -115,7 +120,8 @@ class FlutterWindowsView : public WindowBindingHandlerDelegate,
   void OnPointerMove(double x,
                      double y,
                      FlutterPointerDeviceKind device_kind,
-                     int32_t device_id) override;
+                     int32_t device_id,
+                     int modifiers_state) override;
 
   // |WindowBindingHandlerDelegate|
   void OnPointerDown(double x,
@@ -192,34 +198,44 @@ class FlutterWindowsView : public WindowBindingHandlerDelegate,
   // |WindowBindingHandlerDelegate|
   virtual gfx::NativeViewAccessible GetNativeViewAccessible() override;
 
-  // |TextInputPluginDelegate|
-  void OnCursorRectUpdated(const Rect& rect) override;
+  // Notifies the delegate of the updated the cursor rect in Flutter root view
+  // coordinates.
+  virtual void OnCursorRectUpdated(const Rect& rect);
+
+  // Notifies the delegate that the system IME composing state should be reset.
+  virtual void OnResetImeComposing();
+
+  // Called when a WM_ONCOMPOSITIONCHANGED message is received.
+  void OnDwmCompositionChanged();
+
+  // Get a pointer to the alert node for this view.
+  ui::AXPlatformNodeWin* AlertNode() const;
+
+  // |WindowBindingHandlerDelegate|
+  virtual ui::AXFragmentRootDelegateWin* GetAxFragmentRootDelegate() override;
+
+  // Called to re/set the accessibility bridge pointer.
+  virtual void UpdateSemanticsEnabled(bool enabled);
+
+  std::weak_ptr<AccessibilityBridgeWindows> accessibility_bridge() {
+    return accessibility_bridge_;
+  }
 
-  // |TextInputPluginDelegate|
-  void OnResetImeComposing() override;
+  // |WindowBindingHandlerDelegate|
+  void OnWindowStateEvent(HWND hwnd, WindowStateEvent event) override;
 
  protected:
-  // Called to create keyboard key handler.
-  //
-  // The provided |dispatch_event| is where to inject events into the system,
-  // while |get_key_state| is where to acquire keyboard states. They will be
-  // the system APIs in production classes, but might be replaced with mock
-  // functions in unit tests.
-  virtual std::unique_ptr<KeyboardHandlerBase> CreateKeyboardKeyHandler(
-      BinaryMessenger* messenger,
-      KeyboardKeyEmbedderHandler::GetKeyStateHandler get_key_state,
-      KeyboardKeyEmbedderHandler::MapVirtualKeyToScanCode map_vk_to_scan);
-
-  // Called to create text input plugin.
-  virtual std::unique_ptr<TextInputPlugin> CreateTextInputPlugin(
-      BinaryMessenger* messenger);
-
-  virtual void NotifyWinEventWrapper(DWORD event,
-                                     HWND hwnd,
-                                     LONG idObject,
-                                     LONG idChild);
+  virtual void NotifyWinEventWrapper(ui::AXPlatformNodeWin* node,
+                                     ax::mojom::Event event);
+
+  // Create an AccessibilityBridgeWindows using this view.
+  virtual std::shared_ptr<AccessibilityBridgeWindows>
+  CreateAccessibilityBridge();
 
  private:
+  // Allows setting the surface in tests.
+  friend class ViewModifier;
+
   // Struct holding the state of an individual pointer. The engine doesn't keep
   // track of which buttons have been pressed, so it's the embedding's
   // responsibility.
@@ -261,10 +277,16 @@ class FlutterWindowsView : public WindowBindingHandlerDelegate,
     kDone,
   };
 
-  // Initialize states related to keyboard.
+  // Resize the surface to the desired size.
+  //
+  // If the dimensions have changed, this destroys the original surface and
+  // creates a new one.
   //
-  // This is called when the view is first created, or restarted.
-  void InitializeKeyboard();
+  // This must be run on the raster thread. This binds the surface to the
+  // current thread.
+  //
+  // Width and height are the surface's desired physical pixel dimensions.
+  bool ResizeRenderSurface(size_t width, size_t height);
 
   // Sends a window metrics update to the Flutter engine using current window
   // dimensions in physical
@@ -360,31 +382,27 @@ class FlutterWindowsView : public WindowBindingHandlerDelegate,
   void SendPointerEventWithData(const FlutterPointerEvent& event_data,
                                 PointerState* state);
 
-  // Currently configured WindowsRenderTarget for this view used by
-  // surface_manager for creation of render surfaces and bound to the physical
-  // os window.
-  std::unique_ptr<WindowsRenderTarget> render_target_;
+  // If true, rendering to the window should synchronize with the vsync
+  // to prevent screen tearing.
+  bool NeedsVsync() const;
 
-  // The engine associated with this view.
-  std::unique_ptr<FlutterWindowsEngine> engine_;
+  // The view's unique identifier.
+  FlutterViewId view_id_;
 
-  // Keeps track of pointer states in relation to the window.
-  std::unordered_map<int32_t, std::unique_ptr<PointerState>> pointer_states_;
-
-  // The plugin registrar managing internal plugins.
-  std::unique_ptr<PluginRegistrar> internal_plugin_registrar_;
-
-  // Handlers for keyboard events from Windows.
-  std::unique_ptr<KeyboardHandlerBase> keyboard_key_handler_;
+  // The engine associated with this view.
+  FlutterWindowsEngine* engine_ = nullptr;
 
-  // Handlers for text events from Windows.
-  std::unique_ptr<TextInputPlugin> text_input_plugin_;
+  // Mocks win32 APIs.
+  std::shared_ptr<WindowsProcTable> windows_proc_table_;
 
-  // Handler for the flutter/platform channel.
-  std::unique_ptr<PlatformHandler> platform_handler_;
+  // The EGL surface backing the view.
+  //
+  // Null if using software rasterization, the surface hasn't been created yet,
+  // or if surface creation failed.
+  std::unique_ptr<egl::WindowSurface> surface_ = nullptr;
 
-  // Handler for cursor events.
-  std::unique_ptr<CursorHandler> cursor_handler_;
+  // Keeps track of pointer states in relation to the window.
+  std::unordered_map<int32_t, std::unique_ptr<PointerState>> pointer_states_;
 
   // Currently configured WindowBindingHandler for view.
   std::unique_ptr<WindowBindingHandler> binding_handler_;
@@ -408,6 +426,11 @@ class FlutterWindowsView : public WindowBindingHandlerDelegate,
 
   // True when flutter's semantics tree is enabled.
   bool semantics_enabled_ = false;
+
+  // The accessibility bridge associated with this view.
+  std::shared_ptr<AccessibilityBridgeWindows> accessibility_bridge_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(FlutterWindowsView);
 };
 
 }  // namespace flutter
diff --git a/shell/platform/windows/flutter_windows_view_controller.h b/shell/platform/windows/flutter_windows_view_controller.h
new file mode 100644
index 0000000000000000000000000000000000000000..10175fc9546ba6b1f8d7c7780d2bc4f73041b5f3
--- /dev/null
+++ b/shell/platform/windows/flutter_windows_view_controller.h
@@ -0,0 +1,43 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_FLUTTER_WINDOWS_VIEW_CONTROLLER_H_
+#define FLUTTER_SHELL_PLATFORM_WINDOWS_FLUTTER_WINDOWS_VIEW_CONTROLLER_H_
+
+#include <memory>
+
+#include "flutter_windows_engine.h"
+#include "flutter_windows_view.h"
+
+namespace flutter {
+
+/// Controls a view that displays Flutter content.
+class FlutterWindowsViewController {
+ public:
+  FlutterWindowsViewController(std::unique_ptr<FlutterWindowsEngine> engine,
+                               std::unique_ptr<FlutterWindowsView> view)
+      : engine_(std::move(engine)), view_(std::move(view)) {}
+
+  FlutterWindowsEngine* engine() { return view_->GetEngine(); }
+  FlutterWindowsView* view() { return view_.get(); }
+
+ private:
+  // The engine owned by this view controller, if any.
+  //
+  // This is used only if the view controller was created
+  // using |FlutterDesktopViewControllerCreate| as that takes
+  // ownership of the engine. Destroying this view controller
+  // also destroys the engine.
+  //
+  // View controllers created using |FlutterDesktopEngineCreateViewController|
+  // do not take ownership of the engine and this will be null. Destroying
+  // this view controller does not destroy the engine.
+  std::unique_ptr<FlutterWindowsEngine> engine_;
+
+  std::unique_ptr<FlutterWindowsView> view_;
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_FLUTTER_WINDOWS_VIEW_CONTROLLER_H_
diff --git a/shell/platform/windows/flutter_windows_view_unittests.cc b/shell/platform/windows/flutter_windows_view_unittests.cc
index f2699206f0daf71350e372eea94c0357f944b9fa..a11e06f37ce09a2fad654702990515bb524c2608 100644
--- a/shell/platform/windows/flutter_windows_view_unittests.cc
+++ b/shell/platform/windows/flutter_windows_view_unittests.cc
@@ -4,22 +4,28 @@
 
 #include "flutter/shell/platform/windows/flutter_windows_view.h"
 
+#include <UIAutomation.h>
 #include <comdef.h>
 #include <comutil.h>
 #include <oleacc.h>
 
 #include <future>
-#include <iostream>
 #include <vector>
 
+#include "flutter/fml/synchronization/waitable_event.h"
 #include "flutter/shell/platform/common/json_message_codec.h"
 #include "flutter/shell/platform/embedder/test_utils/proc_table_replacement.h"
 #include "flutter/shell/platform/windows/flutter_window.h"
 #include "flutter/shell/platform/windows/flutter_windows_engine.h"
 #include "flutter/shell/platform/windows/flutter_windows_texture_registrar.h"
+#include "flutter/shell/platform/windows/testing/egl/mock_context.h"
+#include "flutter/shell/platform/windows/testing/egl/mock_manager.h"
+#include "flutter/shell/platform/windows/testing/egl/mock_window_surface.h"
 #include "flutter/shell/platform/windows/testing/engine_modifier.h"
 #include "flutter/shell/platform/windows/testing/mock_window_binding_handler.h"
+#include "flutter/shell/platform/windows/testing/mock_windows_proc_table.h"
 #include "flutter/shell/platform/windows/testing/test_keyboard.h"
+#include "flutter/shell/platform/windows/testing/view_modifier.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
@@ -27,6 +33,11 @@
 namespace flutter {
 namespace testing {
 
+using ::testing::_;
+using ::testing::InSequence;
+using ::testing::NiceMock;
+using ::testing::Return;
+
 constexpr uint64_t kScanCodeKeyA = 0x1e;
 constexpr uint64_t kVirtualKeyA = 0x41;
 
@@ -55,16 +66,24 @@ std::unique_ptr<std::vector<uint8_t>> keyHandlingResponse(bool handled) {
   return flutter::JsonMessageCodec::GetInstance().EncodeMessage(document);
 }
 
-// Returns an engine instance configured with dummy project path values, and
-// overridden methods for sending platform messages, so that the engine can
-// respond as if the framework were connected.
-std::unique_ptr<FlutterWindowsEngine> GetTestEngine() {
+// Returns a Flutter project with the required path values to create
+// a test engine.
+FlutterProjectBundle GetTestProject() {
   FlutterDesktopEngineProperties properties = {};
   properties.assets_path = L"C:\\foo\\flutter_assets";
   properties.icu_data_path = L"C:\\foo\\icudtl.dat";
   properties.aot_library_path = L"C:\\foo\\aot.so";
-  FlutterProjectBundle project(properties);
-  auto engine = std::make_unique<FlutterWindowsEngine>(project);
+
+  return FlutterProjectBundle{properties};
+}
+
+// Returns an engine instance configured with test project path values, and
+// overridden methods for sending platform messages, so that the engine can
+// respond as if the framework were connected.
+std::unique_ptr<FlutterWindowsEngine> GetTestEngine(
+    std::shared_ptr<WindowsProcTable> windows_proc_table = nullptr) {
+  auto engine = std::make_unique<FlutterWindowsEngine>(
+      GetTestProject(), std::move(windows_proc_table));
 
   EngineModifier modifier(engine.get());
 
@@ -94,57 +113,168 @@ std::unique_ptr<FlutterWindowsEngine> GetTestEngine() {
   return engine;
 }
 
+class MockFlutterWindowsEngine : public FlutterWindowsEngine {
+ public:
+  explicit MockFlutterWindowsEngine(
+      std::shared_ptr<WindowsProcTable> windows_proc_table = nullptr)
+      : FlutterWindowsEngine(GetTestProject(), std::move(windows_proc_table)) {}
+
+  MOCK_METHOD(bool, running, (), (const));
+  MOCK_METHOD(bool, Stop, (), ());
+  MOCK_METHOD(bool, PostRasterThreadTask, (fml::closure), (const));
+
+ private:
+  FML_DISALLOW_COPY_AND_ASSIGN(MockFlutterWindowsEngine);
+};
+
 }  // namespace
 
-TEST(FlutterWindowsViewTest, KeySequence) {
+// Ensure that submenu buttons have their expanded/collapsed status set
+// apropriately.
+TEST(FlutterWindowsViewTest, SubMenuExpandedState) {
   std::unique_ptr<FlutterWindowsEngine> engine = GetTestEngine();
+  EngineModifier modifier(engine.get());
+  modifier.embedder_api().UpdateSemanticsEnabled =
+      [](FLUTTER_API_SYMBOL(FlutterEngine) engine, bool enabled) {
+        return kSuccess;
+      };
 
-  test_response = false;
+  auto window_binding_handler =
+      std::make_unique<NiceMock<MockWindowBindingHandler>>();
+  std::unique_ptr<FlutterWindowsView> view =
+      engine->CreateView(std::move(window_binding_handler));
+
+  // Enable semantics to instantiate accessibility bridge.
+  view->OnUpdateSemanticsEnabled(true);
+
+  auto bridge = view->accessibility_bridge().lock();
+  ASSERT_TRUE(bridge);
+
+  FlutterSemanticsNode2 root{sizeof(FlutterSemanticsNode2), 0};
+  root.id = 0;
+  root.label = "root";
+  root.hint = "";
+  root.value = "";
+  root.increased_value = "";
+  root.decreased_value = "";
+  root.child_count = 0;
+  root.custom_accessibility_actions_count = 0;
+  root.flags = static_cast<FlutterSemanticsFlag>(
+      FlutterSemanticsFlag::kFlutterSemanticsFlagHasExpandedState |
+      FlutterSemanticsFlag::kFlutterSemanticsFlagIsExpanded);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
+
+  bridge->CommitUpdates();
 
+  {
+    auto root_node = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
+    EXPECT_TRUE(root_node->GetData().HasState(ax::mojom::State::kExpanded));
+
+    // Get the IAccessible for the root node.
+    IAccessible* native_view = root_node->GetNativeViewAccessible();
+    ASSERT_TRUE(native_view != nullptr);
+
+    // Look up against the node itself (not one of its children).
+    VARIANT varchild = {};
+    varchild.vt = VT_I4;
+
+    // Verify the submenu is expanded.
+    varchild.lVal = CHILDID_SELF;
+    VARIANT native_state = {};
+    ASSERT_TRUE(SUCCEEDED(native_view->get_accState(varchild, &native_state)));
+    EXPECT_TRUE(native_state.lVal & STATE_SYSTEM_EXPANDED);
+
+    // Perform similar tests for UIA value;
+    IRawElementProviderSimple* uia_node;
+    native_view->QueryInterface(IID_PPV_ARGS(&uia_node));
+    ASSERT_TRUE(SUCCEEDED(uia_node->GetPropertyValue(
+        UIA_ExpandCollapseExpandCollapseStatePropertyId, &native_state)));
+    EXPECT_EQ(native_state.lVal, ExpandCollapseState_Expanded);
+
+    ASSERT_TRUE(SUCCEEDED(uia_node->GetPropertyValue(
+        UIA_AriaPropertiesPropertyId, &native_state)));
+    EXPECT_NE(std::wcsstr(native_state.bstrVal, L"expanded=true"), nullptr);
+  }
+
+  // Test collapsed too.
+  root.flags = static_cast<FlutterSemanticsFlag>(
+      FlutterSemanticsFlag::kFlutterSemanticsFlagHasExpandedState);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
+  bridge->CommitUpdates();
+
+  {
+    auto root_node = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
+    EXPECT_TRUE(root_node->GetData().HasState(ax::mojom::State::kCollapsed));
+
+    // Get the IAccessible for the root node.
+    IAccessible* native_view = root_node->GetNativeViewAccessible();
+    ASSERT_TRUE(native_view != nullptr);
+
+    // Look up against the node itself (not one of its children).
+    VARIANT varchild = {};
+    varchild.vt = VT_I4;
+
+    // Verify the submenu is collapsed.
+    varchild.lVal = CHILDID_SELF;
+    VARIANT native_state = {};
+    ASSERT_TRUE(SUCCEEDED(native_view->get_accState(varchild, &native_state)));
+    EXPECT_TRUE(native_state.lVal & STATE_SYSTEM_COLLAPSED);
+
+    // Perform similar tests for UIA value;
+    IRawElementProviderSimple* uia_node;
+    native_view->QueryInterface(IID_PPV_ARGS(&uia_node));
+    ASSERT_TRUE(SUCCEEDED(uia_node->GetPropertyValue(
+        UIA_ExpandCollapseExpandCollapseStatePropertyId, &native_state)));
+    EXPECT_EQ(native_state.lVal, ExpandCollapseState_Collapsed);
+
+    ASSERT_TRUE(SUCCEEDED(uia_node->GetPropertyValue(
+        UIA_AriaPropertiesPropertyId, &native_state)));
+    EXPECT_NE(std::wcsstr(native_state.bstrVal, L"expanded=false"), nullptr);
+  }
+}
+
+// The view's surface must be destroyed after the engine is shutdown.
+// See: https://github.com/flutter/flutter/issues/124463
+TEST(FlutterWindowsViewTest, Shutdown) {
+  auto engine = std::make_unique<MockFlutterWindowsEngine>();
   auto window_binding_handler =
-      std::make_unique<::testing::NiceMock<MockWindowBindingHandler>>();
-  FlutterWindowsView view(std::move(window_binding_handler));
-  view.SetEngine(std::move(engine));
+      std::make_unique<NiceMock<MockWindowBindingHandler>>();
+  auto egl_manager = std::make_unique<egl::MockManager>();
+  auto surface = std::make_unique<egl::MockWindowSurface>();
+  auto surface_ptr = surface.get();
 
-  view.OnKey(kVirtualKeyA, kScanCodeKeyA, WM_KEYDOWN, 'a', false, false,
-             [](bool handled) {});
+  EngineModifier modifier{engine.get()};
+  modifier.SetEGLManager(std::move(egl_manager));
 
-  EXPECT_EQ(key_event_logs.size(), 2);
-  EXPECT_EQ(key_event_logs[0], kKeyEventFromEmbedder);
-  EXPECT_EQ(key_event_logs[1], kKeyEventFromChannel);
+  {
+    std::unique_ptr<FlutterWindowsView> view =
+        engine->CreateView(std::move(window_binding_handler));
 
-  key_event_logs.clear();
+    ViewModifier view_modifier{view.get()};
+    view_modifier.SetSurface(std::move(surface));
+
+    // The engine must be stopped before the surface can be destroyed.
+    InSequence s;
+    EXPECT_CALL(*engine.get(), Stop).Times(1);
+    EXPECT_CALL(*surface_ptr, Destroy).Times(1);
+  }
 }
 
-TEST(FlutterWindowsViewTest, RestartClearsKeyboardState) {
+TEST(FlutterWindowsViewTest, KeySequence) {
   std::unique_ptr<FlutterWindowsEngine> engine = GetTestEngine();
 
-  auto window_binding_handler =
-      std::make_unique<::testing::NiceMock<MockWindowBindingHandler>>();
-  FlutterWindowsView view(std::move(window_binding_handler));
-  view.SetEngine(std::move(engine));
-
   test_response = false;
 
-  // Receives a KeyA down. Events are dispatched and decided unhandled. Now the
-  // keyboard key handler is waiting for the redispatched event.
-  view.OnKey(kVirtualKeyA, kScanCodeKeyA, WM_KEYDOWN, 'a', false, false,
-             [](bool handled) {});
-  EXPECT_EQ(key_event_logs.size(), 2);
-  EXPECT_EQ(key_event_logs[0], kKeyEventFromEmbedder);
-  EXPECT_EQ(key_event_logs[1], kKeyEventFromChannel);
-  key_event_logs.clear();
+  std::unique_ptr<FlutterWindowsView> view = engine->CreateView(
+      std::make_unique<NiceMock<MockWindowBindingHandler>>());
 
-  // Resets state so that the keyboard key handler is no longer waiting.
-  view.OnPreEngineRestart();
+  view->OnKey(kVirtualKeyA, kScanCodeKeyA, WM_KEYDOWN, 'a', false, false,
+              [](bool handled) {});
 
-  // Receives another KeyA down. If the state had not been cleared, this event
-  // will be considered the redispatched event and ignored.
-  view.OnKey(kVirtualKeyA, kScanCodeKeyA, WM_KEYDOWN, 'a', false, false,
-             [](bool handled) {});
   EXPECT_EQ(key_event_logs.size(), 2);
   EXPECT_EQ(key_event_logs[0], kKeyEventFromEmbedder);
   EXPECT_EQ(key_event_logs[1], kKeyEventFromChannel);
+
   key_event_logs.clear();
 }
 
@@ -162,15 +292,15 @@ TEST(FlutterWindowsViewTest, EnableSemantics) {
       });
 
   auto window_binding_handler =
-      std::make_unique<::testing::NiceMock<MockWindowBindingHandler>>();
-  FlutterWindowsView view(std::move(window_binding_handler));
-  view.SetEngine(std::move(engine));
+      std::make_unique<NiceMock<MockWindowBindingHandler>>();
+  std::unique_ptr<FlutterWindowsView> view =
+      engine->CreateView(std::move(window_binding_handler));
 
-  view.OnUpdateSemanticsEnabled(true);
+  view->OnUpdateSemanticsEnabled(true);
   EXPECT_TRUE(semantics_enabled);
 }
 
-TEST(FlutterWindowsView, AddSemanticsNodeUpdate) {
+TEST(FlutterWindowsViewTest, AddSemanticsNodeUpdate) {
   std::unique_ptr<FlutterWindowsEngine> engine = GetTestEngine();
   EngineModifier modifier(engine.get());
   modifier.embedder_api().UpdateSemanticsEnabled =
@@ -179,29 +309,26 @@ TEST(FlutterWindowsView, AddSemanticsNodeUpdate) {
       };
 
   auto window_binding_handler =
-      std::make_unique<::testing::NiceMock<MockWindowBindingHandler>>();
-  FlutterWindowsView view(std::move(window_binding_handler));
-  view.SetEngine(std::move(engine));
+      std::make_unique<NiceMock<MockWindowBindingHandler>>();
+  std::unique_ptr<FlutterWindowsView> view =
+      engine->CreateView(std::move(window_binding_handler));
 
   // Enable semantics to instantiate accessibility bridge.
-  view.OnUpdateSemanticsEnabled(true);
+  view->OnUpdateSemanticsEnabled(true);
 
-  auto bridge = view.GetEngine()->accessibility_bridge().lock();
+  auto bridge = view->accessibility_bridge().lock();
   ASSERT_TRUE(bridge);
 
   // Add root node.
-  FlutterSemanticsNode node{sizeof(FlutterSemanticsNode), 0};
+  FlutterSemanticsNode2 node{sizeof(FlutterSemanticsNode2), 0};
   node.label = "name";
   node.value = "value";
   node.platform_view_id = -1;
-  bridge->AddFlutterSemanticsNodeUpdate(&node);
+  bridge->AddFlutterSemanticsNodeUpdate(node);
   bridge->CommitUpdates();
 
   // Look up the root windows node delegate.
-  auto node_delegate = bridge
-                           ->GetFlutterPlatformNodeDelegateFromID(
-                               AccessibilityBridge::kRootNodeId)
-                           .lock();
+  auto node_delegate = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
   ASSERT_TRUE(node_delegate);
   EXPECT_EQ(node_delegate->GetChildCount(), 0);
 
@@ -231,6 +358,33 @@ TEST(FlutterWindowsView, AddSemanticsNodeUpdate) {
   varrole.vt = VT_I4;
   ASSERT_EQ(native_view->get_accRole(varchild, &varrole), S_OK);
   EXPECT_EQ(varrole.lVal, ROLE_SYSTEM_STATICTEXT);
+
+  // Get the IRawElementProviderFragment object.
+  IRawElementProviderSimple* uia_view;
+  native_view->QueryInterface(IID_PPV_ARGS(&uia_view));
+  ASSERT_TRUE(uia_view != nullptr);
+
+  // Verify name property matches our label.
+  VARIANT varname{};
+  ASSERT_EQ(uia_view->GetPropertyValue(UIA_NamePropertyId, &varname), S_OK);
+  EXPECT_EQ(varname.vt, VT_BSTR);
+  name = _com_util::ConvertBSTRToString(varname.bstrVal);
+  EXPECT_EQ(name, "name");
+
+  // Verify value property matches our label.
+  VARIANT varvalue{};
+  ASSERT_EQ(uia_view->GetPropertyValue(UIA_ValueValuePropertyId, &varvalue),
+            S_OK);
+  EXPECT_EQ(varvalue.vt, VT_BSTR);
+  value = _com_util::ConvertBSTRToString(varvalue.bstrVal);
+  EXPECT_EQ(value, "value");
+
+  // Verify node control type is text.
+  varrole = {};
+  ASSERT_EQ(uia_view->GetPropertyValue(UIA_ControlTypePropertyId, &varrole),
+            S_OK);
+  EXPECT_EQ(varrole.vt, VT_I4);
+  EXPECT_EQ(varrole.lVal, UIA_TextControlTypeId);
 }
 
 // Verify the native IAccessible COM object tree is an accurate reflection of
@@ -245,7 +399,7 @@ TEST(FlutterWindowsView, AddSemanticsNodeUpdate) {
 //             node3
 //
 // node0 and node2 are grouping nodes. node1 and node2 are static text nodes.
-TEST(FlutterWindowsView, AddSemanticsNodeUpdateWithChildren) {
+TEST(FlutterWindowsViewTest, AddSemanticsNodeUpdateWithChildren) {
   std::unique_ptr<FlutterWindowsEngine> engine = GetTestEngine();
   EngineModifier modifier(engine.get());
   modifier.embedder_api().UpdateSemanticsEnabled =
@@ -253,47 +407,42 @@ TEST(FlutterWindowsView, AddSemanticsNodeUpdateWithChildren) {
         return kSuccess;
       };
 
-  auto window_binding_handler =
-      std::make_unique<::testing::NiceMock<MockWindowBindingHandler>>();
-  FlutterWindowsView view(std::move(window_binding_handler));
-  view.SetEngine(std::move(engine));
+  std::unique_ptr<FlutterWindowsView> view = engine->CreateView(
+      std::make_unique<NiceMock<MockWindowBindingHandler>>());
 
   // Enable semantics to instantiate accessibility bridge.
-  view.OnUpdateSemanticsEnabled(true);
+  view->OnUpdateSemanticsEnabled(true);
 
-  auto bridge = view.GetEngine()->accessibility_bridge().lock();
+  auto bridge = view->accessibility_bridge().lock();
   ASSERT_TRUE(bridge);
 
   // Add root node.
-  FlutterSemanticsNode node0{sizeof(FlutterSemanticsNode), 0};
+  FlutterSemanticsNode2 node0{sizeof(FlutterSemanticsNode2), 0};
   std::vector<int32_t> node0_children{1, 2};
   node0.child_count = node0_children.size();
   node0.children_in_traversal_order = node0_children.data();
   node0.children_in_hit_test_order = node0_children.data();
 
-  FlutterSemanticsNode node1{sizeof(FlutterSemanticsNode), 1};
+  FlutterSemanticsNode2 node1{sizeof(FlutterSemanticsNode2), 1};
   node1.label = "prefecture";
   node1.value = "Kyoto";
-  FlutterSemanticsNode node2{sizeof(FlutterSemanticsNode), 2};
+  FlutterSemanticsNode2 node2{sizeof(FlutterSemanticsNode2), 2};
   std::vector<int32_t> node2_children{3};
   node2.child_count = node2_children.size();
   node2.children_in_traversal_order = node2_children.data();
   node2.children_in_hit_test_order = node2_children.data();
-  FlutterSemanticsNode node3{sizeof(FlutterSemanticsNode), 3};
+  FlutterSemanticsNode2 node3{sizeof(FlutterSemanticsNode2), 3};
   node3.label = "city";
   node3.value = "Uji";
 
-  bridge->AddFlutterSemanticsNodeUpdate(&node0);
-  bridge->AddFlutterSemanticsNodeUpdate(&node1);
-  bridge->AddFlutterSemanticsNodeUpdate(&node2);
-  bridge->AddFlutterSemanticsNodeUpdate(&node3);
+  bridge->AddFlutterSemanticsNodeUpdate(node0);
+  bridge->AddFlutterSemanticsNodeUpdate(node1);
+  bridge->AddFlutterSemanticsNodeUpdate(node2);
+  bridge->AddFlutterSemanticsNodeUpdate(node3);
   bridge->CommitUpdates();
 
   // Look up the root windows node delegate.
-  auto node_delegate = bridge
-                           ->GetFlutterPlatformNodeDelegateFromID(
-                               AccessibilityBridge::kRootNodeId)
-                           .lock();
+  auto node_delegate = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
   ASSERT_TRUE(node_delegate);
   EXPECT_EQ(node_delegate->GetChildCount(), 2);
 
@@ -437,6 +586,124 @@ TEST(FlutterWindowsView, AddSemanticsNodeUpdateWithChildren) {
   }
 }
 
+// Flutter used to assume that the accessibility root had ID 0.
+// In a multi-view world, each view has its own accessibility root
+// with a globally unique node ID.
+//
+//        node1
+//          |
+//        node2
+//
+// node1 is a grouping node, node0 is a static text node.
+TEST(FlutterWindowsViewTest, NonZeroSemanticsRoot) {
+  std::unique_ptr<FlutterWindowsEngine> engine = GetTestEngine();
+  EngineModifier modifier(engine.get());
+  modifier.embedder_api().UpdateSemanticsEnabled =
+      [](FLUTTER_API_SYMBOL(FlutterEngine) engine, bool enabled) {
+        return kSuccess;
+      };
+
+  std::unique_ptr<FlutterWindowsView> view = engine->CreateView(
+      std::make_unique<NiceMock<MockWindowBindingHandler>>());
+
+  // Enable semantics to instantiate accessibility bridge.
+  view->OnUpdateSemanticsEnabled(true);
+
+  auto bridge = view->accessibility_bridge().lock();
+  ASSERT_TRUE(bridge);
+
+  // Add root node.
+  FlutterSemanticsNode2 node1{sizeof(FlutterSemanticsNode2), 1};
+  std::vector<int32_t> node1_children{2};
+  node1.child_count = node1_children.size();
+  node1.children_in_traversal_order = node1_children.data();
+  node1.children_in_hit_test_order = node1_children.data();
+
+  FlutterSemanticsNode2 node2{sizeof(FlutterSemanticsNode2), 2};
+  node2.label = "prefecture";
+  node2.value = "Kyoto";
+
+  bridge->AddFlutterSemanticsNodeUpdate(node1);
+  bridge->AddFlutterSemanticsNodeUpdate(node2);
+  bridge->CommitUpdates();
+
+  // Look up the root windows node delegate.
+  auto root_delegate = bridge->GetFlutterPlatformNodeDelegateFromID(1).lock();
+  ASSERT_TRUE(root_delegate);
+  EXPECT_EQ(root_delegate->GetChildCount(), 1);
+
+  // Look up the child node delegate
+  auto child_delegate = bridge->GetFlutterPlatformNodeDelegateFromID(2).lock();
+  ASSERT_TRUE(child_delegate);
+  EXPECT_EQ(child_delegate->GetChildCount(), 0);
+
+  // Ensure a node with ID 0 does not exist.
+  auto fake_delegate = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
+  ASSERT_FALSE(fake_delegate);
+
+  // Get the root's native IAccessible object.
+  IAccessible* node1_accessible = root_delegate->GetNativeViewAccessible();
+  ASSERT_TRUE(node1_accessible != nullptr);
+
+  // Property lookups will be made against this node itself.
+  VARIANT varchild{};
+  varchild.vt = VT_I4;
+  varchild.lVal = CHILDID_SELF;
+
+  // Verify node type is a group.
+  VARIANT varrole{};
+  varrole.vt = VT_I4;
+  ASSERT_EQ(node1_accessible->get_accRole(varchild, &varrole), S_OK);
+  EXPECT_EQ(varrole.lVal, ROLE_SYSTEM_GROUPING);
+
+  // Verify child count.
+  long node1_child_count = 0;
+  ASSERT_EQ(node1_accessible->get_accChildCount(&node1_child_count), S_OK);
+  EXPECT_EQ(node1_child_count, 1);
+
+  {
+    // Look up first child of node1 (node0), a static text node.
+    varchild.lVal = 1;
+    IDispatch* node2_dispatch = nullptr;
+    ASSERT_EQ(node1_accessible->get_accChild(varchild, &node2_dispatch), S_OK);
+    ASSERT_TRUE(node2_dispatch != nullptr);
+    IAccessible* node2_accessible = nullptr;
+    ASSERT_EQ(node2_dispatch->QueryInterface(
+                  IID_IAccessible, reinterpret_cast<void**>(&node2_accessible)),
+              S_OK);
+    ASSERT_TRUE(node2_accessible != nullptr);
+
+    // Verify node name matches our label.
+    varchild.lVal = CHILDID_SELF;
+    BSTR bname = nullptr;
+    ASSERT_EQ(node2_accessible->get_accName(varchild, &bname), S_OK);
+    std::string name(_com_util::ConvertBSTRToString(bname));
+    EXPECT_EQ(name, "prefecture");
+
+    // Verify node value matches.
+    BSTR bvalue = nullptr;
+    ASSERT_EQ(node2_accessible->get_accValue(varchild, &bvalue), S_OK);
+    std::string value(_com_util::ConvertBSTRToString(bvalue));
+    EXPECT_EQ(value, "Kyoto");
+
+    // Verify node type is static text.
+    VARIANT varrole{};
+    varrole.vt = VT_I4;
+    ASSERT_EQ(node2_accessible->get_accRole(varchild, &varrole), S_OK);
+    EXPECT_EQ(varrole.lVal, ROLE_SYSTEM_STATICTEXT);
+
+    // Verify the parent node is the root.
+    IDispatch* parent_dispatch;
+    node2_accessible->get_accParent(&parent_dispatch);
+    IAccessible* parent_accessible;
+    ASSERT_EQ(
+        parent_dispatch->QueryInterface(
+            IID_IAccessible, reinterpret_cast<void**>(&parent_accessible)),
+        S_OK);
+    EXPECT_EQ(parent_accessible, node1_accessible);
+  }
+}
+
 // Verify the native IAccessible accHitTest method returns the correct
 // IAccessible COM object for the given coordinates.
 //
@@ -466,19 +733,17 @@ TEST(FlutterWindowsViewTest, AccessibilityHitTesting) {
         return kSuccess;
       };
 
-  auto window_binding_handler =
-      std::make_unique<::testing::NiceMock<MockWindowBindingHandler>>();
-  FlutterWindowsView view(std::move(window_binding_handler));
-  view.SetEngine(std::move(engine));
+  std::unique_ptr<FlutterWindowsView> view = engine->CreateView(
+      std::make_unique<NiceMock<MockWindowBindingHandler>>());
 
   // Enable semantics to instantiate accessibility bridge.
-  view.OnUpdateSemanticsEnabled(true);
+  view->OnUpdateSemanticsEnabled(true);
 
-  auto bridge = view.GetEngine()->accessibility_bridge().lock();
+  auto bridge = view->accessibility_bridge().lock();
   ASSERT_TRUE(bridge);
 
   // Add root node at origin. Size 500x500.
-  FlutterSemanticsNode node0{sizeof(FlutterSemanticsNode), 0};
+  FlutterSemanticsNode2 node0{sizeof(FlutterSemanticsNode2), 0};
   std::vector<int32_t> node0_children{1, 2};
   node0.rect = {0, 0, 500, 500};
   node0.transform = kIdentityTransform;
@@ -487,14 +752,14 @@ TEST(FlutterWindowsViewTest, AccessibilityHitTesting) {
   node0.children_in_hit_test_order = node0_children.data();
 
   // Add node 1 located at 0,0 relative to node 0. Size 250x500.
-  FlutterSemanticsNode node1{sizeof(FlutterSemanticsNode), 1};
+  FlutterSemanticsNode2 node1{sizeof(FlutterSemanticsNode2), 1};
   node1.rect = {0, 0, 250, 500};
   node1.transform = kIdentityTransform;
   node1.label = "prefecture";
   node1.value = "Kyoto";
 
   // Add node 2 located at 250,0 relative to node 0. Size 250x500.
-  FlutterSemanticsNode node2{sizeof(FlutterSemanticsNode), 2};
+  FlutterSemanticsNode2 node2{sizeof(FlutterSemanticsNode2), 2};
   std::vector<int32_t> node2_children{3};
   node2.rect = {0, 0, 250, 500};
   node2.transform = {1, 0, 250, 0, 1, 0, 0, 0, 1};
@@ -503,16 +768,16 @@ TEST(FlutterWindowsViewTest, AccessibilityHitTesting) {
   node2.children_in_hit_test_order = node2_children.data();
 
   // Add node 3 located at 0,250 relative to node 2. Size 250, 250.
-  FlutterSemanticsNode node3{sizeof(FlutterSemanticsNode), 3};
+  FlutterSemanticsNode2 node3{sizeof(FlutterSemanticsNode2), 3};
   node3.rect = {0, 0, 250, 250};
   node3.transform = {1, 0, 0, 0, 1, 250, 0, 0, 1};
   node3.label = "city";
   node3.value = "Uji";
 
-  bridge->AddFlutterSemanticsNodeUpdate(&node0);
-  bridge->AddFlutterSemanticsNodeUpdate(&node1);
-  bridge->AddFlutterSemanticsNodeUpdate(&node2);
-  bridge->AddFlutterSemanticsNodeUpdate(&node3);
+  bridge->AddFlutterSemanticsNodeUpdate(node0);
+  bridge->AddFlutterSemanticsNodeUpdate(node1);
+  bridge->AddFlutterSemanticsNodeUpdate(node2);
+  bridge->AddFlutterSemanticsNodeUpdate(node3);
   bridge->CommitUpdates();
 
   // Look up the root windows node delegate.
@@ -549,42 +814,223 @@ TEST(FlutterWindowsViewTest, AccessibilityHitTesting) {
 }
 
 TEST(FlutterWindowsViewTest, WindowResizeTests) {
+  auto windows_proc_table = std::make_shared<NiceMock<MockWindowsProcTable>>();
+  std::unique_ptr<FlutterWindowsEngine> engine =
+      GetTestEngine(windows_proc_table);
+  EngineModifier engine_modifier{engine.get()};
+
+  auto egl_manager = std::make_unique<egl::MockManager>();
+  auto surface = std::make_unique<egl::MockWindowSurface>();
+  auto resized_surface = std::make_unique<egl::MockWindowSurface>();
+  auto resized_surface_ptr = resized_surface.get();
+
+  EXPECT_CALL(*surface.get(), IsValid).WillRepeatedly(Return(true));
+  EXPECT_CALL(*surface.get(), Destroy).WillOnce(Return(true));
+
+  EXPECT_CALL(*egl_manager.get(),
+              CreateWindowSurface(_, /*width=*/500, /*height=*/500))
+      .WillOnce(Return(std::move((resized_surface))));
+  EXPECT_CALL(*resized_surface_ptr, MakeCurrent).WillOnce(Return(true));
+  EXPECT_CALL(*resized_surface_ptr, SetVSyncEnabled).WillOnce(Return(true));
+  EXPECT_CALL(*windows_proc_table.get(), DwmFlush).WillOnce(Return(S_OK));
+
+  EXPECT_CALL(*resized_surface_ptr, Destroy).WillOnce(Return(true));
+
+  engine_modifier.SetEGLManager(std::move(egl_manager));
+
+  std::unique_ptr<FlutterWindowsView> view = engine->CreateView(
+      std::make_unique<NiceMock<MockWindowBindingHandler>>());
+
+  ViewModifier view_modifier{view.get()};
+  view_modifier.SetSurface(std::move(surface));
+
+  fml::AutoResetWaitableEvent metrics_sent_latch;
+  engine_modifier.embedder_api().SendWindowMetricsEvent = MOCK_ENGINE_PROC(
+      SendWindowMetricsEvent,
+      ([&metrics_sent_latch](auto engine,
+                             const FlutterWindowMetricsEvent* event) {
+        metrics_sent_latch.Signal();
+        return kSuccess;
+      }));
+
+  fml::AutoResetWaitableEvent resized_latch;
+  std::thread([&resized_latch, &view]() {
+    // Start the window resize. This sends the new window metrics
+    // and then blocks until another thread completes the window resize.
+    EXPECT_TRUE(view->OnWindowSizeChanged(500, 500));
+    resized_latch.Signal();
+  }).detach();
+
+  // Wait until the platform thread has started the window resize.
+  metrics_sent_latch.Wait();
+
+  // Complete the window resize by reporting a frame with the new window size.
+  ASSERT_TRUE(view->OnFrameGenerated(500, 500));
+  view->OnFramePresented();
+  resized_latch.Wait();
+}
+
+// Verify that an empty frame completes a view resize.
+TEST(FlutterWindowsViewTest, TestEmptyFrameResizes) {
+  auto windows_proc_table = std::make_shared<NiceMock<MockWindowsProcTable>>();
+  std::unique_ptr<FlutterWindowsEngine> engine =
+      GetTestEngine(windows_proc_table);
+  EngineModifier engine_modifier{engine.get()};
+
+  auto egl_manager = std::make_unique<egl::MockManager>();
+  auto surface = std::make_unique<egl::MockWindowSurface>();
+  auto resized_surface = std::make_unique<egl::MockWindowSurface>();
+  auto resized_surface_ptr = resized_surface.get();
+
+  EXPECT_CALL(*surface.get(), IsValid).WillRepeatedly(Return(true));
+  EXPECT_CALL(*surface.get(), Destroy).WillOnce(Return(true));
+
+  EXPECT_CALL(*egl_manager.get(),
+              CreateWindowSurface(_, /*width=*/500, /*height=*/500))
+      .WillOnce(Return(std::move((resized_surface))));
+  EXPECT_CALL(*resized_surface_ptr, MakeCurrent).WillOnce(Return(true));
+  EXPECT_CALL(*resized_surface_ptr, SetVSyncEnabled).WillOnce(Return(true));
+  EXPECT_CALL(*windows_proc_table.get(), DwmFlush).WillOnce(Return(S_OK));
+
+  EXPECT_CALL(*resized_surface_ptr, Destroy).WillOnce(Return(true));
+
+  fml::AutoResetWaitableEvent metrics_sent_latch;
+  engine_modifier.embedder_api().SendWindowMetricsEvent = MOCK_ENGINE_PROC(
+      SendWindowMetricsEvent,
+      ([&metrics_sent_latch](auto engine,
+                             const FlutterWindowMetricsEvent* event) {
+        metrics_sent_latch.Signal();
+        return kSuccess;
+      }));
+
+  std::unique_ptr<FlutterWindowsView> view = engine->CreateView(
+      std::make_unique<NiceMock<MockWindowBindingHandler>>());
+
+  ViewModifier view_modifier{view.get()};
+  engine_modifier.SetEGLManager(std::move(egl_manager));
+  view_modifier.SetSurface(std::move(surface));
+
+  fml::AutoResetWaitableEvent resized_latch;
+  std::thread([&resized_latch, &view]() {
+    // Start the window resize. This sends the new window metrics
+    // and then blocks until another thread completes the window resize.
+    EXPECT_TRUE(view->OnWindowSizeChanged(500, 500));
+    resized_latch.Signal();
+  }).detach();
+
+  // Wait until the platform thread has started the window resize.
+  metrics_sent_latch.Wait();
+
+  // Complete the window resize by reporting an empty frame.
+  view->OnEmptyFrameGenerated();
+  view->OnFramePresented();
+  resized_latch.Wait();
+}
+
+// A window resize can be interleaved between a frame generation and
+// presentation. This should not crash the app. Regression test for:
+// https://github.com/flutter/flutter/issues/141855
+TEST(FlutterWindowsViewTest, WindowResizeRace) {
+  std::unique_ptr<FlutterWindowsEngine> engine = GetTestEngine();
+  EngineModifier engine_modifier(engine.get());
+
+  auto egl_manager = std::make_unique<egl::MockManager>();
+  auto surface = std::make_unique<egl::MockWindowSurface>();
+
+  EXPECT_CALL(*surface.get(), IsValid).WillRepeatedly(Return(true));
+  EXPECT_CALL(*surface.get(), Destroy).WillOnce(Return(true));
+
+  std::unique_ptr<FlutterWindowsView> view = engine->CreateView(
+      std::make_unique<NiceMock<MockWindowBindingHandler>>());
+
+  ViewModifier view_modifier{view.get()};
+  engine_modifier.SetEGLManager(std::move(egl_manager));
+  view_modifier.SetSurface(std::move(surface));
+
+  // Begin a frame.
+  ASSERT_TRUE(view->OnFrameGenerated(100, 100));
+
+  // Inject a window resize between the frame generation and
+  // frame presentation. The new size invalidates the current frame.
+  fml::AutoResetWaitableEvent resized_latch;
+  std::thread([&resized_latch, &view]() {
+    // The resize is never completed. The view times out and returns false.
+    EXPECT_FALSE(view->OnWindowSizeChanged(500, 500));
+    resized_latch.Signal();
+  }).detach();
+
+  // Wait until the platform thread has started the window resize.
+  resized_latch.Wait();
+
+  // Complete the invalidated frame while a resize is pending. Although this
+  // might mean that we presented a frame with the wrong size, this should not
+  // crash the app.
+  view->OnFramePresented();
+}
+
+// Window resize should succeed even if the render surface could not be created
+// even though EGL initialized successfully.
+TEST(FlutterWindowsViewTest, WindowResizeInvalidSurface) {
+  std::unique_ptr<FlutterWindowsEngine> engine = GetTestEngine();
+  EngineModifier engine_modifier(engine.get());
+
+  auto egl_manager = std::make_unique<egl::MockManager>();
+  auto surface = std::make_unique<egl::MockWindowSurface>();
+
+  EXPECT_CALL(*egl_manager.get(), CreateWindowSurface).Times(0);
+  EXPECT_CALL(*surface.get(), IsValid).WillRepeatedly(Return(false));
+  EXPECT_CALL(*surface.get(), Destroy).WillOnce(Return(false));
+
+  std::unique_ptr<FlutterWindowsView> view = engine->CreateView(
+      std::make_unique<NiceMock<MockWindowBindingHandler>>());
+
+  ViewModifier view_modifier{view.get()};
+  engine_modifier.SetEGLManager(std::move(egl_manager));
+  view_modifier.SetSurface(std::move(surface));
+
+  auto metrics_sent = false;
+  engine_modifier.embedder_api().SendWindowMetricsEvent = MOCK_ENGINE_PROC(
+      SendWindowMetricsEvent,
+      ([&metrics_sent](auto engine, const FlutterWindowMetricsEvent* event) {
+        metrics_sent = true;
+        return kSuccess;
+      }));
+
+  view->OnWindowSizeChanged(500, 500);
+}
+
+// Window resize should succeed even if EGL initialized successfully
+// but the EGL surface could not be created.
+TEST(FlutterWindowsViewTest, WindowResizeWithoutSurface) {
   std::unique_ptr<FlutterWindowsEngine> engine = GetTestEngine();
   EngineModifier modifier(engine.get());
 
-  auto window_binding_handler =
-      std::make_unique<::testing::NiceMock<MockWindowBindingHandler>>();
+  auto egl_manager = std::make_unique<egl::MockManager>();
+
+  EXPECT_CALL(*egl_manager.get(), CreateWindowSurface).Times(0);
+
+  std::unique_ptr<FlutterWindowsView> view = engine->CreateView(
+      std::make_unique<NiceMock<MockWindowBindingHandler>>());
 
-  FlutterWindowsView view(std::move(window_binding_handler));
-  view.SetEngine(std::move(engine));
+  modifier.SetEGLManager(std::move(egl_manager));
 
-  bool send_window_metrics_event_called = false;
+  auto metrics_sent = false;
   modifier.embedder_api().SendWindowMetricsEvent = MOCK_ENGINE_PROC(
       SendWindowMetricsEvent,
-      ([&send_window_metrics_event_called](
-           auto engine, const FlutterWindowMetricsEvent* even) {
-        send_window_metrics_event_called = true;
+      ([&metrics_sent](auto engine, const FlutterWindowMetricsEvent* event) {
+        metrics_sent = true;
         return kSuccess;
       }));
 
-  std::promise<bool> resize_completed;
-  std::thread([&resize_completed, &view]() {
-    view.OnWindowSizeChanged(500, 500);
-    resize_completed.set_value(true);
-  }).detach();
-
-  auto result = resize_completed.get_future().wait_for(std::chrono::seconds(1));
-  EXPECT_EQ(std::future_status::ready, result);
-  EXPECT_TRUE(send_window_metrics_event_called);
+  view->OnWindowSizeChanged(500, 500);
 }
 
 TEST(FlutterWindowsViewTest, WindowRepaintTests) {
   std::unique_ptr<FlutterWindowsEngine> engine = GetTestEngine();
   EngineModifier modifier(engine.get());
 
-  FlutterWindowsView view(std::make_unique<flutter::FlutterWindow>(100, 100));
-  view.SetEngine(std::move(engine));
-  view.CreateRenderSurface();
+  FlutterWindowsView view{kImplicitViewId, engine.get(),
+                          std::make_unique<flutter::FlutterWindow>(100, 100)};
 
   bool schedule_frame_called = false;
   modifier.embedder_api().ScheduleFrame =
@@ -611,18 +1057,16 @@ TEST(FlutterWindowsViewTest, CheckboxNativeState) {
         return kSuccess;
       };
 
-  auto window_binding_handler =
-      std::make_unique<::testing::NiceMock<MockWindowBindingHandler>>();
-  FlutterWindowsView view(std::move(window_binding_handler));
-  view.SetEngine(std::move(engine));
+  std::unique_ptr<FlutterWindowsView> view = engine->CreateView(
+      std::make_unique<NiceMock<MockWindowBindingHandler>>());
 
   // Enable semantics to instantiate accessibility bridge.
-  view.OnUpdateSemanticsEnabled(true);
+  view->OnUpdateSemanticsEnabled(true);
 
-  auto bridge = view.GetEngine()->accessibility_bridge().lock();
+  auto bridge = view->accessibility_bridge().lock();
   ASSERT_TRUE(bridge);
 
-  FlutterSemanticsNode root{sizeof(FlutterSemanticsNode), 0};
+  FlutterSemanticsNode2 root{sizeof(FlutterSemanticsNode2), 0};
   root.id = 0;
   root.label = "root";
   root.hint = "";
@@ -634,15 +1078,12 @@ TEST(FlutterWindowsViewTest, CheckboxNativeState) {
   root.flags = static_cast<FlutterSemanticsFlag>(
       FlutterSemanticsFlag::kFlutterSemanticsFlagHasCheckedState |
       FlutterSemanticsFlag::kFlutterSemanticsFlagIsChecked);
-  bridge->AddFlutterSemanticsNodeUpdate(&root);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
 
   bridge->CommitUpdates();
 
   {
-    auto root_node = bridge
-                         ->GetFlutterPlatformNodeDelegateFromID(
-                             AccessibilityBridge::kRootNodeId)
-                         .lock();
+    auto root_node = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
     EXPECT_EQ(root_node->GetData().role, ax::mojom::Role::kCheckBox);
     EXPECT_EQ(root_node->GetData().GetCheckedState(),
               ax::mojom::CheckedState::kTrue);
@@ -660,19 +1101,27 @@ TEST(FlutterWindowsViewTest, CheckboxNativeState) {
     VARIANT native_state = {};
     ASSERT_TRUE(SUCCEEDED(native_view->get_accState(varchild, &native_state)));
     EXPECT_TRUE(native_state.lVal & STATE_SYSTEM_CHECKED);
+
+    // Perform similar tests for UIA value;
+    IRawElementProviderSimple* uia_node;
+    native_view->QueryInterface(IID_PPV_ARGS(&uia_node));
+    ASSERT_TRUE(SUCCEEDED(uia_node->GetPropertyValue(
+        UIA_ToggleToggleStatePropertyId, &native_state)));
+    EXPECT_EQ(native_state.lVal, ToggleState_On);
+
+    ASSERT_TRUE(SUCCEEDED(uia_node->GetPropertyValue(
+        UIA_AriaPropertiesPropertyId, &native_state)));
+    EXPECT_NE(std::wcsstr(native_state.bstrVal, L"checked=true"), nullptr);
   }
 
   // Test unchecked too.
   root.flags = static_cast<FlutterSemanticsFlag>(
       FlutterSemanticsFlag::kFlutterSemanticsFlagHasCheckedState);
-  bridge->AddFlutterSemanticsNodeUpdate(&root);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
   bridge->CommitUpdates();
 
   {
-    auto root_node = bridge
-                         ->GetFlutterPlatformNodeDelegateFromID(
-                             AccessibilityBridge::kRootNodeId)
-                         .lock();
+    auto root_node = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
     EXPECT_EQ(root_node->GetData().role, ax::mojom::Role::kCheckBox);
     EXPECT_EQ(root_node->GetData().GetCheckedState(),
               ax::mojom::CheckedState::kFalse);
@@ -690,20 +1139,28 @@ TEST(FlutterWindowsViewTest, CheckboxNativeState) {
     VARIANT native_state = {};
     ASSERT_TRUE(SUCCEEDED(native_view->get_accState(varchild, &native_state)));
     EXPECT_FALSE(native_state.lVal & STATE_SYSTEM_CHECKED);
+
+    // Perform similar tests for UIA value;
+    IRawElementProviderSimple* uia_node;
+    native_view->QueryInterface(IID_PPV_ARGS(&uia_node));
+    ASSERT_TRUE(SUCCEEDED(uia_node->GetPropertyValue(
+        UIA_ToggleToggleStatePropertyId, &native_state)));
+    EXPECT_EQ(native_state.lVal, ToggleState_Off);
+
+    ASSERT_TRUE(SUCCEEDED(uia_node->GetPropertyValue(
+        UIA_AriaPropertiesPropertyId, &native_state)));
+    EXPECT_NE(std::wcsstr(native_state.bstrVal, L"checked=false"), nullptr);
   }
 
   // Now check mixed state.
   root.flags = static_cast<FlutterSemanticsFlag>(
       FlutterSemanticsFlag::kFlutterSemanticsFlagHasCheckedState |
       FlutterSemanticsFlag::kFlutterSemanticsFlagIsCheckStateMixed);
-  bridge->AddFlutterSemanticsNodeUpdate(&root);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
   bridge->CommitUpdates();
 
   {
-    auto root_node = bridge
-                         ->GetFlutterPlatformNodeDelegateFromID(
-                             AccessibilityBridge::kRootNodeId)
-                         .lock();
+    auto root_node = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
     EXPECT_EQ(root_node->GetData().role, ax::mojom::Role::kCheckBox);
     EXPECT_EQ(root_node->GetData().GetCheckedState(),
               ax::mojom::CheckedState::kMixed);
@@ -721,6 +1178,17 @@ TEST(FlutterWindowsViewTest, CheckboxNativeState) {
     VARIANT native_state = {};
     ASSERT_TRUE(SUCCEEDED(native_view->get_accState(varchild, &native_state)));
     EXPECT_TRUE(native_state.lVal & STATE_SYSTEM_MIXED);
+
+    // Perform similar tests for UIA value;
+    IRawElementProviderSimple* uia_node;
+    native_view->QueryInterface(IID_PPV_ARGS(&uia_node));
+    ASSERT_TRUE(SUCCEEDED(uia_node->GetPropertyValue(
+        UIA_ToggleToggleStatePropertyId, &native_state)));
+    EXPECT_EQ(native_state.lVal, ToggleState_Indeterminate);
+
+    ASSERT_TRUE(SUCCEEDED(uia_node->GetPropertyValue(
+        UIA_AriaPropertiesPropertyId, &native_state)));
+    EXPECT_NE(std::wcsstr(native_state.bstrVal, L"checked=mixed"), nullptr);
   }
 }
 
@@ -733,18 +1201,16 @@ TEST(FlutterWindowsViewTest, SwitchNativeState) {
         return kSuccess;
       };
 
-  auto window_binding_handler =
-      std::make_unique<::testing::NiceMock<MockWindowBindingHandler>>();
-  FlutterWindowsView view(std::move(window_binding_handler));
-  view.SetEngine(std::move(engine));
+  std::unique_ptr<FlutterWindowsView> view = engine->CreateView(
+      std::make_unique<NiceMock<MockWindowBindingHandler>>());
 
   // Enable semantics to instantiate accessibility bridge.
-  view.OnUpdateSemanticsEnabled(true);
+  view->OnUpdateSemanticsEnabled(true);
 
-  auto bridge = view.GetEngine()->accessibility_bridge().lock();
+  auto bridge = view->accessibility_bridge().lock();
   ASSERT_TRUE(bridge);
 
-  FlutterSemanticsNode root{sizeof(FlutterSemanticsNode), 0};
+  FlutterSemanticsNode2 root{sizeof(FlutterSemanticsNode2), 0};
   root.id = 0;
   root.label = "root";
   root.hint = "";
@@ -756,16 +1222,13 @@ TEST(FlutterWindowsViewTest, SwitchNativeState) {
   root.flags = static_cast<FlutterSemanticsFlag>(
       FlutterSemanticsFlag::kFlutterSemanticsFlagHasToggledState |
       FlutterSemanticsFlag::kFlutterSemanticsFlagIsToggled);
-  bridge->AddFlutterSemanticsNodeUpdate(&root);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
 
   bridge->CommitUpdates();
 
   {
-    auto root_node = bridge
-                         ->GetFlutterPlatformNodeDelegateFromID(
-                             AccessibilityBridge::kRootNodeId)
-                         .lock();
-    EXPECT_EQ(root_node->GetData().role, ax::mojom::Role::kToggleButton);
+    auto root_node = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
+    EXPECT_EQ(root_node->GetData().role, ax::mojom::Role::kSwitch);
     EXPECT_EQ(root_node->GetData().GetCheckedState(),
               ax::mojom::CheckedState::kTrue);
 
@@ -788,20 +1251,33 @@ TEST(FlutterWindowsViewTest, SwitchNativeState) {
     VARIANT native_state = {};
     ASSERT_TRUE(SUCCEEDED(native_view->get_accState(varchild, &native_state)));
     EXPECT_TRUE(native_state.lVal & STATE_SYSTEM_PRESSED);
+    EXPECT_TRUE(native_state.lVal & STATE_SYSTEM_CHECKED);
+
+    // Test similarly on UIA node.
+    IRawElementProviderSimple* uia_node;
+    native_view->QueryInterface(IID_PPV_ARGS(&uia_node));
+    ASSERT_EQ(uia_node->GetPropertyValue(UIA_ControlTypePropertyId, &varrole),
+              S_OK);
+    EXPECT_EQ(varrole.lVal, UIA_ButtonControlTypeId);
+    ASSERT_EQ(uia_node->GetPropertyValue(UIA_ToggleToggleStatePropertyId,
+                                         &native_state),
+              S_OK);
+    EXPECT_EQ(native_state.lVal, ToggleState_On);
+    ASSERT_EQ(
+        uia_node->GetPropertyValue(UIA_AriaPropertiesPropertyId, &native_state),
+        S_OK);
+    EXPECT_NE(std::wcsstr(native_state.bstrVal, L"pressed=true"), nullptr);
   }
 
   // Test unpressed too.
   root.flags = static_cast<FlutterSemanticsFlag>(
       FlutterSemanticsFlag::kFlutterSemanticsFlagHasToggledState);
-  bridge->AddFlutterSemanticsNodeUpdate(&root);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
   bridge->CommitUpdates();
 
   {
-    auto root_node = bridge
-                         ->GetFlutterPlatformNodeDelegateFromID(
-                             AccessibilityBridge::kRootNodeId)
-                         .lock();
-    EXPECT_EQ(root_node->GetData().role, ax::mojom::Role::kToggleButton);
+    auto root_node = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
+    EXPECT_EQ(root_node->GetData().role, ax::mojom::Role::kSwitch);
     EXPECT_EQ(root_node->GetData().GetCheckedState(),
               ax::mojom::CheckedState::kFalse);
 
@@ -818,6 +1294,19 @@ TEST(FlutterWindowsViewTest, SwitchNativeState) {
     VARIANT native_state = {};
     ASSERT_TRUE(SUCCEEDED(native_view->get_accState(varchild, &native_state)));
     EXPECT_FALSE(native_state.lVal & STATE_SYSTEM_PRESSED);
+    EXPECT_FALSE(native_state.lVal & STATE_SYSTEM_CHECKED);
+
+    // Test similarly on UIA node.
+    IRawElementProviderSimple* uia_node;
+    native_view->QueryInterface(IID_PPV_ARGS(&uia_node));
+    ASSERT_EQ(uia_node->GetPropertyValue(UIA_ToggleToggleStatePropertyId,
+                                         &native_state),
+              S_OK);
+    EXPECT_EQ(native_state.lVal, ToggleState_Off);
+    ASSERT_EQ(
+        uia_node->GetPropertyValue(UIA_AriaPropertiesPropertyId, &native_state),
+        S_OK);
+    EXPECT_NE(std::wcsstr(native_state.bstrVal, L"pressed=false"), nullptr);
   }
 }
 
@@ -829,18 +1318,16 @@ TEST(FlutterWindowsViewTest, TooltipNodeData) {
         return kSuccess;
       };
 
-  auto window_binding_handler =
-      std::make_unique<::testing::NiceMock<MockWindowBindingHandler>>();
-  FlutterWindowsView view(std::move(window_binding_handler));
-  view.SetEngine(std::move(engine));
+  std::unique_ptr<FlutterWindowsView> view = engine->CreateView(
+      std::make_unique<NiceMock<MockWindowBindingHandler>>());
 
   // Enable semantics to instantiate accessibility bridge.
-  view.OnUpdateSemanticsEnabled(true);
+  view->OnUpdateSemanticsEnabled(true);
 
-  auto bridge = view.GetEngine()->accessibility_bridge().lock();
+  auto bridge = view->accessibility_bridge().lock();
   ASSERT_TRUE(bridge);
 
-  FlutterSemanticsNode root{sizeof(FlutterSemanticsNode), 0};
+  FlutterSemanticsNode2 root{sizeof(FlutterSemanticsNode2), 0};
   root.id = 0;
   root.label = "root";
   root.hint = "";
@@ -852,16 +1339,243 @@ TEST(FlutterWindowsViewTest, TooltipNodeData) {
   root.custom_accessibility_actions_count = 0;
   root.flags = static_cast<FlutterSemanticsFlag>(
       FlutterSemanticsFlag::kFlutterSemanticsFlagIsTextField);
-  bridge->AddFlutterSemanticsNodeUpdate(&root);
+  bridge->AddFlutterSemanticsNodeUpdate(root);
 
   bridge->CommitUpdates();
-  auto root_node = bridge
-                       ->GetFlutterPlatformNodeDelegateFromID(
-                           AccessibilityBridge::kRootNodeId)
-                       .lock();
+  auto root_node = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock();
   std::string tooltip = root_node->GetData().GetStringAttribute(
       ax::mojom::StringAttribute::kTooltip);
   EXPECT_EQ(tooltip, "tooltip");
+
+  // Check that MSAA name contains the tooltip.
+  IAccessible* native_view = bridge->GetFlutterPlatformNodeDelegateFromID(0)
+                                 .lock()
+                                 ->GetNativeViewAccessible();
+  VARIANT varchild = {.vt = VT_I4, .lVal = CHILDID_SELF};
+  BSTR bname;
+  ASSERT_EQ(native_view->get_accName(varchild, &bname), S_OK);
+  EXPECT_NE(std::wcsstr(bname, L"tooltip"), nullptr);
+
+  // Check that UIA help text is equal to the tooltip.
+  IRawElementProviderSimple* uia_node;
+  native_view->QueryInterface(IID_PPV_ARGS(&uia_node));
+  VARIANT varname{};
+  ASSERT_EQ(uia_node->GetPropertyValue(UIA_HelpTextPropertyId, &varname), S_OK);
+  std::string uia_tooltip = _com_util::ConvertBSTRToString(varname.bstrVal);
+  EXPECT_EQ(uia_tooltip, "tooltip");
+}
+
+// Don't block until the v-blank if it is disabled by the window.
+// The surface is updated on the platform thread at startup.
+TEST(FlutterWindowsViewTest, DisablesVSyncAtStartup) {
+  auto windows_proc_table = std::make_shared<MockWindowsProcTable>();
+  auto engine = std::make_unique<MockFlutterWindowsEngine>(windows_proc_table);
+  auto egl_manager = std::make_unique<egl::MockManager>();
+  egl::MockContext render_context;
+  auto surface = std::make_unique<egl::MockWindowSurface>();
+  auto surface_ptr = surface.get();
+
+  EXPECT_CALL(*engine.get(), running).WillRepeatedly(Return(false));
+  EXPECT_CALL(*engine.get(), PostRasterThreadTask).Times(0);
+
+  EXPECT_CALL(*windows_proc_table.get(), DwmIsCompositionEnabled)
+      .WillOnce(Return(true));
+
+  EXPECT_CALL(*egl_manager.get(), render_context)
+      .WillOnce(Return(&render_context));
+  EXPECT_CALL(*surface_ptr, IsValid).WillOnce(Return(true));
+
+  InSequence s;
+  EXPECT_CALL(*egl_manager.get(), CreateWindowSurface)
+      .WillOnce(Return(std::move(surface)));
+  EXPECT_CALL(*surface_ptr, MakeCurrent).WillOnce(Return(true));
+  EXPECT_CALL(*surface_ptr, SetVSyncEnabled(false)).WillOnce(Return(true));
+  EXPECT_CALL(render_context, ClearCurrent).WillOnce(Return(true));
+
+  EXPECT_CALL(*engine.get(), Stop).Times(1);
+  EXPECT_CALL(*surface_ptr, Destroy).Times(1);
+
+  EngineModifier modifier{engine.get()};
+  modifier.SetEGLManager(std::move(egl_manager));
+
+  std::unique_ptr<FlutterWindowsView> view = engine->CreateView(
+      std::make_unique<NiceMock<MockWindowBindingHandler>>());
+
+  view->CreateRenderSurface();
+}
+
+// Blocks until the v-blank if it is enabled by the window.
+// The surface is updated on the platform thread at startup.
+TEST(FlutterWindowsViewTest, EnablesVSyncAtStartup) {
+  auto windows_proc_table = std::make_shared<MockWindowsProcTable>();
+  auto engine = std::make_unique<MockFlutterWindowsEngine>(windows_proc_table);
+  auto egl_manager = std::make_unique<egl::MockManager>();
+  egl::MockContext render_context;
+  auto surface = std::make_unique<egl::MockWindowSurface>();
+  auto surface_ptr = surface.get();
+
+  EXPECT_CALL(*engine.get(), running).WillRepeatedly(Return(false));
+  EXPECT_CALL(*engine.get(), PostRasterThreadTask).Times(0);
+  EXPECT_CALL(*windows_proc_table.get(), DwmIsCompositionEnabled)
+      .WillOnce(Return(false));
+
+  EXPECT_CALL(*egl_manager.get(), render_context)
+      .WillOnce(Return(&render_context));
+  EXPECT_CALL(*surface_ptr, IsValid).WillOnce(Return(true));
+
+  InSequence s;
+  EXPECT_CALL(*egl_manager.get(), CreateWindowSurface)
+      .WillOnce(Return(std::move(surface)));
+  EXPECT_CALL(*surface_ptr, MakeCurrent).WillOnce(Return(true));
+  EXPECT_CALL(*surface_ptr, SetVSyncEnabled(true)).WillOnce(Return(true));
+  EXPECT_CALL(render_context, ClearCurrent).WillOnce(Return(true));
+
+  EXPECT_CALL(*engine.get(), Stop).Times(1);
+  EXPECT_CALL(*surface_ptr, Destroy).Times(1);
+
+  EngineModifier modifier{engine.get()};
+  modifier.SetEGLManager(std::move(egl_manager));
+
+  std::unique_ptr<FlutterWindowsView> view = engine->CreateView(
+      std::make_unique<NiceMock<MockWindowBindingHandler>>());
+
+  view->CreateRenderSurface();
+}
+
+// Don't block until the v-blank if it is disabled by the window.
+// The surface is updated on the raster thread if the engine is running.
+TEST(FlutterWindowsViewTest, DisablesVSyncAfterStartup) {
+  auto windows_proc_table = std::make_shared<MockWindowsProcTable>();
+  auto engine = std::make_unique<MockFlutterWindowsEngine>(windows_proc_table);
+  auto egl_manager = std::make_unique<egl::MockManager>();
+  egl::MockContext render_context;
+  auto surface = std::make_unique<egl::MockWindowSurface>();
+  auto surface_ptr = surface.get();
+
+  EXPECT_CALL(*engine.get(), running).WillRepeatedly(Return(true));
+  EXPECT_CALL(*windows_proc_table.get(), DwmIsCompositionEnabled)
+      .WillOnce(Return(true));
+
+  EXPECT_CALL(*egl_manager.get(), render_context)
+      .WillOnce(Return(&render_context));
+  EXPECT_CALL(*surface_ptr, IsValid).WillOnce(Return(true));
+
+  InSequence s;
+  EXPECT_CALL(*egl_manager.get(), CreateWindowSurface)
+      .WillOnce(Return(std::move(surface)));
+  EXPECT_CALL(*engine.get(), PostRasterThreadTask)
+      .WillOnce([](fml::closure callback) {
+        callback();
+        return true;
+      });
+  EXPECT_CALL(*surface_ptr, MakeCurrent).WillOnce(Return(true));
+  EXPECT_CALL(*surface_ptr, SetVSyncEnabled(false)).WillOnce(Return(true));
+  EXPECT_CALL(render_context, ClearCurrent).WillOnce(Return(true));
+  EXPECT_CALL(*engine.get(), Stop).Times(1);
+  EXPECT_CALL(*surface_ptr, Destroy).Times(1);
+
+  EngineModifier modifier{engine.get()};
+  modifier.SetEGLManager(std::move(egl_manager));
+
+  std::unique_ptr<FlutterWindowsView> view = engine->CreateView(
+      std::make_unique<NiceMock<MockWindowBindingHandler>>());
+
+  view->CreateRenderSurface();
+}
+
+// Blocks until the v-blank if it is enabled by the window.
+// The surface is updated on the raster thread if the engine is running.
+TEST(FlutterWindowsViewTest, EnablesVSyncAfterStartup) {
+  auto windows_proc_table = std::make_shared<MockWindowsProcTable>();
+  auto engine = std::make_unique<MockFlutterWindowsEngine>(windows_proc_table);
+  auto egl_manager = std::make_unique<egl::MockManager>();
+  egl::MockContext render_context;
+  auto surface = std::make_unique<egl::MockWindowSurface>();
+  auto surface_ptr = surface.get();
+
+  EXPECT_CALL(*engine.get(), running).WillRepeatedly(Return(true));
+
+  EXPECT_CALL(*windows_proc_table.get(), DwmIsCompositionEnabled)
+      .WillOnce(Return(false));
+
+  EXPECT_CALL(*egl_manager.get(), render_context)
+      .WillOnce(Return(&render_context));
+  EXPECT_CALL(*surface_ptr, IsValid).WillOnce(Return(true));
+
+  InSequence s;
+  EXPECT_CALL(*egl_manager.get(), CreateWindowSurface)
+      .WillOnce(Return(std::move(surface)));
+  EXPECT_CALL(*engine.get(), PostRasterThreadTask)
+      .WillOnce([](fml::closure callback) {
+        callback();
+        return true;
+      });
+
+  EXPECT_CALL(*surface_ptr, MakeCurrent).WillOnce(Return(true));
+  EXPECT_CALL(*surface_ptr, SetVSyncEnabled(true)).WillOnce(Return(true));
+  EXPECT_CALL(render_context, ClearCurrent).WillOnce(Return(true));
+  EXPECT_CALL(*engine.get(), Stop).Times(1);
+  EXPECT_CALL(*surface_ptr, Destroy).Times(1);
+
+  EngineModifier modifier{engine.get()};
+  modifier.SetEGLManager(std::move(egl_manager));
+
+  std::unique_ptr<FlutterWindowsView> view = engine->CreateView(
+      std::make_unique<NiceMock<MockWindowBindingHandler>>());
+
+  view->CreateRenderSurface();
+}
+
+// Desktop Window Manager composition can be disabled on Windows 7.
+// If this happens, the app must synchronize with the vsync to prevent
+// screen tearing.
+TEST(FlutterWindowsViewTest, UpdatesVSyncOnDwmUpdates) {
+  auto windows_proc_table = std::make_shared<MockWindowsProcTable>();
+  auto engine = std::make_unique<MockFlutterWindowsEngine>(windows_proc_table);
+  auto egl_manager = std::make_unique<egl::MockManager>();
+  egl::MockContext render_context;
+  auto surface = std::make_unique<egl::MockWindowSurface>();
+  auto surface_ptr = surface.get();
+
+  EXPECT_CALL(*engine.get(), running).WillRepeatedly(Return(true));
+
+  EXPECT_CALL(*engine.get(), PostRasterThreadTask)
+      .WillRepeatedly([](fml::closure callback) {
+        callback();
+        return true;
+      });
+
+  EXPECT_CALL(*windows_proc_table.get(), DwmIsCompositionEnabled)
+      .WillOnce(Return(false))
+      .WillOnce(Return(true));
+
+  EXPECT_CALL(*egl_manager.get(), render_context)
+      .WillRepeatedly(Return(&render_context));
+
+  EXPECT_CALL(*surface_ptr, IsValid).WillRepeatedly(Return(true));
+
+  InSequence s;
+  EXPECT_CALL(*surface_ptr, MakeCurrent).WillOnce(Return(true));
+  EXPECT_CALL(*surface_ptr, SetVSyncEnabled(true)).WillOnce(Return(true));
+  EXPECT_CALL(render_context, ClearCurrent).WillOnce(Return(true));
+
+  EXPECT_CALL(*surface_ptr, MakeCurrent).WillOnce(Return(true));
+  EXPECT_CALL(*surface_ptr, SetVSyncEnabled(false)).WillOnce(Return(true));
+  EXPECT_CALL(render_context, ClearCurrent).WillOnce(Return(true));
+
+  EXPECT_CALL(*engine.get(), Stop).Times(1);
+  EXPECT_CALL(*surface_ptr, Destroy).Times(1);
+
+  EngineModifier engine_modifier{engine.get()};
+  engine_modifier.SetEGLManager(std::move(egl_manager));
+
+  std::unique_ptr<FlutterWindowsView> view = engine->CreateView(
+      std::make_unique<NiceMock<MockWindowBindingHandler>>());
+  ViewModifier view_modifier{view.get()};
+  view_modifier.SetSurface(std::move(surface));
+
+  engine->OnDwmCompositionChanged();
+  engine->OnDwmCompositionChanged();
 }
 
 }  // namespace testing
diff --git a/shell/platform/windows/keyboard_handler_base.h b/shell/platform/windows/keyboard_handler_base.h
index d27ae1a67f872a364f5293192cb7abf130d1ec5f..3572813771fa6bdcb4d05617822cfe80d06bf4a4 100644
--- a/shell/platform/windows/keyboard_handler_base.h
+++ b/shell/platform/windows/keyboard_handler_base.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_KEYBOARD_HOOK_HANDLER_H_
-#define FLUTTER_SHELL_PLATFORM_WINDOWS_KEYBOARD_HOOK_HANDLER_H_
+#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_KEYBOARD_HANDLER_BASE_H_
+#define FLUTTER_SHELL_PLATFORM_WINDOWS_KEYBOARD_HANDLER_BASE_H_
 
 #include <string>
 
@@ -29,8 +29,18 @@ class KeyboardHandlerBase {
                             bool extended,
                             bool was_down,
                             KeyEventCallback callback) = 0;
+
+  // If needed, synthesize modifier keys events by comparing the
+  // given modifiers state to the known pressing state..
+  virtual void SyncModifiersIfNeeded(int modifiers_state) = 0;
+
+  // Returns the keyboard pressed state.
+  //
+  // Returns the keyboard pressed state. The map contains one entry per
+  // pressed keys, mapping from the logical key to the physical key.
+  virtual std::map<uint64_t, uint64_t> GetPressedState() = 0;
 };
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_KEYBOARD_HOOK_HANDLER_H_
+#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_KEYBOARD_HANDLER_BASE_H_
diff --git a/shell/platform/windows/keyboard_key_channel_handler.cc b/shell/platform/windows/keyboard_key_channel_handler.cc
index 94041cdb15d1f8745fd14005012666d669e40127..eaa1a7696b6f321f9e2320ceab058ac09be0245d 100644
--- a/shell/platform/windows/keyboard_key_channel_handler.cc
+++ b/shell/platform/windows/keyboard_key_channel_handler.cc
@@ -109,6 +109,18 @@ KeyboardKeyChannelHandler::KeyboardKeyChannelHandler(
 
 KeyboardKeyChannelHandler::~KeyboardKeyChannelHandler() = default;
 
+void KeyboardKeyChannelHandler::SyncModifiersIfNeeded(int modifiers_state) {
+  // Do nothing.
+}
+
+std::map<uint64_t, uint64_t> KeyboardKeyChannelHandler::GetPressedState() {
+  // Returns an empty state because it will never be called.
+  // KeyboardKeyEmbedderHandler is the only KeyboardKeyHandlerDelegate to handle
+  // GetPressedState() calls.
+  std::map<uint64_t, uint64_t> empty_state;
+  return empty_state;
+}
+
 void KeyboardKeyChannelHandler::KeyboardHook(
     int key,
     int scancode,
diff --git a/shell/platform/windows/keyboard_key_channel_handler.h b/shell/platform/windows/keyboard_key_channel_handler.h
index 57ade1e4e8513a6e2ddfa8faf3e8e8b9dd52ece5..7a5d96f73ac171b70faa1d7dbe419a7c7bf97e4c 100644
--- a/shell/platform/windows/keyboard_key_channel_handler.h
+++ b/shell/platform/windows/keyboard_key_channel_handler.h
@@ -9,6 +9,7 @@
 #include <memory>
 #include <string>
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/basic_message_channel.h"
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h"
 #include "flutter/shell/platform/windows/keyboard_key_handler.h"
@@ -38,9 +39,15 @@ class KeyboardKeyChannelHandler
                     bool was_down,
                     std::function<void(bool)> callback);
 
+  void SyncModifiersIfNeeded(int modifiers_state);
+
+  std::map<uint64_t, uint64_t> GetPressedState();
+
  private:
   // The Flutter system channel for key event messages.
   std::unique_ptr<flutter::BasicMessageChannel<rapidjson::Document>> channel_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(KeyboardKeyChannelHandler);
 };
 
 }  // namespace flutter
diff --git a/shell/platform/windows/keyboard_key_embedder_handler.cc b/shell/platform/windows/keyboard_key_embedder_handler.cc
index 68288b3469b6635ab88c6b03c3859596d587eb9f..efe767794082778c629d99d5cf85ff7aac269b5a 100644
--- a/shell/platform/windows/keyboard_key_embedder_handler.cc
+++ b/shell/platform/windows/keyboard_key_embedder_handler.cc
@@ -4,13 +4,12 @@
 
 #include "flutter/shell/platform/windows/keyboard_key_embedder_handler.h"
 
-#include <assert.h>
 #include <windows.h>
 
 #include <chrono>
-#include <iostream>
 #include <string>
 
+#include "flutter/fml/logging.h"
 #include "flutter/shell/platform/windows/keyboard_utils.h"
 
 namespace flutter {
@@ -38,7 +37,7 @@ char _GetBit(char32_t ch, size_t start, size_t end) {
 
 std::string ConvertChar32ToUtf8(char32_t ch) {
   std::string result;
-  assert(0 <= ch && ch <= 0x10FFFF);
+  FML_DCHECK(0 <= ch && ch <= 0x10FFFF) << "Character out of range";
   if (ch <= 0x007F) {
     result.push_back(ch);
   } else if (ch <= 0x07FF) {
@@ -160,8 +159,8 @@ void KeyboardKeyEmbedderHandler::KeyboardHookImpl(
     std::function<void(bool)> callback) {
   const uint64_t physical_key = GetPhysicalKey(scancode, extended);
   const uint64_t logical_key = GetLogicalKey(key, extended, scancode);
-  assert(action == WM_KEYDOWN || action == WM_KEYUP ||
-         action == WM_SYSKEYDOWN || action == WM_SYSKEYUP);
+  FML_DCHECK(action == WM_KEYDOWN || action == WM_KEYUP ||
+             action == WM_SYSKEYDOWN || action == WM_SYSKEYUP);
 
   auto last_logical_record_iter = pressingRecords_.find(physical_key);
   bool had_record = last_logical_record_iter != pressingRecords_.end();
@@ -187,7 +186,7 @@ void KeyboardKeyEmbedderHandler::KeyboardHookImpl(
   const bool is_event_down = action == WM_KEYDOWN || action == WM_SYSKEYDOWN;
 
   bool event_key_can_be_repeat = true;
-  UpdateLastSeenCritialKey(key, physical_key, sequence_logical_key);
+  UpdateLastSeenCriticalKey(key, physical_key, sequence_logical_key);
   // Synchronize the toggled states of critical keys (such as whether CapsLocks
   // is enabled). Toggled states can only be changed upon a down event, so if
   // the recorded toggled state does not match the true state, this function
@@ -197,16 +196,18 @@ void KeyboardKeyEmbedderHandler::KeyboardHookImpl(
   // After this function, all critical keys will have their toggled state
   // updated to the true state, while the critical keys whose toggled state have
   // been changed will be pressed regardless of their true pressed state.
-  // Updating the pressed state will be done by SynchronizeCritialPressedStates.
-  SynchronizeCritialToggledStates(key, is_event_down, &event_key_can_be_repeat);
+  // Updating the pressed state will be done by
+  // SynchronizeCriticalPressedStates.
+  SynchronizeCriticalToggledStates(key, is_event_down,
+                                   &event_key_can_be_repeat);
   // Synchronize the pressed states of critical keys (such as whether CapsLocks
   // is pressed).
   //
   // After this function, all critical keys except for the target key will have
   // their toggled state and pressed state matched with their true states. The
   // target key's pressed state will be updated immediately after this.
-  SynchronizeCritialPressedStates(key, physical_key, is_event_down,
-                                  event_key_can_be_repeat);
+  SynchronizeCriticalPressedStates(key, physical_key, is_event_down,
+                                   event_key_can_be_repeat);
 
   // Reassess the last logical record in case pressingRecords_ was modified
   // by the above synchronization methods.
@@ -228,7 +229,7 @@ void KeyboardKeyEmbedderHandler::KeyboardHookImpl(
       if (was_down) {
         // A normal repeated key.
         type = kFlutterKeyEventTypeRepeat;
-        assert(had_record);
+        FML_DCHECK(had_record);
         ConvertUtf32ToUtf8_(character_bytes, character);
         eventual_logical_record = last_logical_record;
         result_logical_key = last_logical_record;
@@ -243,7 +244,7 @@ void KeyboardKeyEmbedderHandler::KeyboardHookImpl(
     } else {
       // A normal down event (whether the system event is a repeat or not).
       type = kFlutterKeyEventTypeDown;
-      assert(!had_record);
+      FML_DCHECK(!had_record);
       ConvertUtf32ToUtf8_(character_bytes, character);
       eventual_logical_record = logical_key;
       result_logical_key = logical_key;
@@ -258,7 +259,7 @@ void KeyboardKeyEmbedderHandler::KeyboardHookImpl(
     } else {
       // A normal up event.
       type = kFlutterKeyEventTypeUp;
-      assert(had_record);
+      FML_DCHECK(had_record);
       // Up events never have character.
       character_bytes[0] = '\0';
       eventual_logical_record = 0;
@@ -276,7 +277,7 @@ void KeyboardKeyEmbedderHandler::KeyboardHookImpl(
     if (record_iter != pressingRecords_.end()) {
       pressingRecords_.erase(record_iter);
     } else {
-      assert(false);
+      FML_DCHECK(false);
     }
   }
 
@@ -317,8 +318,8 @@ void KeyboardKeyEmbedderHandler::KeyboardHookImpl(
   // received despite that GetKeyState says that CapsLock is not pressed. In
   // such case, post-event synchronization will synthesize a CapsLock up event
   // after the main event.
-  SynchronizeCritialPressedStates(key, physical_key, is_event_down,
-                                  event_key_can_be_repeat);
+  SynchronizeCriticalPressedStates(key, physical_key, is_event_down,
+                                   event_key_can_be_repeat);
 }
 
 void KeyboardKeyEmbedderHandler::KeyboardHook(
@@ -349,7 +350,11 @@ void KeyboardKeyEmbedderHandler::KeyboardHook(
   }
 }
 
-void KeyboardKeyEmbedderHandler::UpdateLastSeenCritialKey(
+std::map<uint64_t, uint64_t> KeyboardKeyEmbedderHandler::GetPressedState() {
+  return pressingRecords_;
+}
+
+void KeyboardKeyEmbedderHandler::UpdateLastSeenCriticalKey(
     int virtual_key,
     uint64_t physical_key,
     uint64_t logical_key) {
@@ -360,7 +365,7 @@ void KeyboardKeyEmbedderHandler::UpdateLastSeenCritialKey(
   }
 }
 
-void KeyboardKeyEmbedderHandler::SynchronizeCritialToggledStates(
+void KeyboardKeyEmbedderHandler::SynchronizeCriticalToggledStates(
     int event_virtual_key,
     bool is_event_down,
     bool* event_key_can_be_repeat) {
@@ -373,7 +378,7 @@ void KeyboardKeyEmbedderHandler::SynchronizeCritialToggledStates(
       // Never seen this key.
       continue;
     }
-    assert(key_info.logical_key != 0);
+    FML_DCHECK(key_info.logical_key != 0);
 
     // Check toggling state first, because it might alter pressing state.
     if (key_info.check_toggled) {
@@ -415,7 +420,7 @@ void KeyboardKeyEmbedderHandler::SynchronizeCritialToggledStates(
   }
 }
 
-void KeyboardKeyEmbedderHandler::SynchronizeCritialPressedStates(
+void KeyboardKeyEmbedderHandler::SynchronizeCriticalPressedStates(
     int event_virtual_key,
     int event_physical_key,
     bool is_event_down,
@@ -438,7 +443,7 @@ void KeyboardKeyEmbedderHandler::SynchronizeCritialPressedStates(
       // Never seen this key.
       continue;
     }
-    assert(key_info.logical_key != 0);
+    FML_DCHECK(key_info.logical_key != 0);
     if (key_info.check_pressed) {
       SHORT true_pressed = get_key_state_(virtual_key) & kStateMaskPressed;
       auto pressing_record_iter = pressingRecords_.find(key_info.physical_key);
@@ -492,6 +497,72 @@ void KeyboardKeyEmbedderHandler::SynchronizeCritialPressedStates(
   }
 }
 
+void KeyboardKeyEmbedderHandler::SyncModifiersIfNeeded(int modifiers_state) {
+  // TODO(bleroux): consider exposing these constants in flutter_key_map.g.cc?
+  const uint64_t physical_shift_left =
+      windowsToPhysicalMap_.at(kScanCodeShiftLeft);
+  const uint64_t physical_shift_right =
+      windowsToPhysicalMap_.at(kScanCodeShiftRight);
+  const uint64_t logical_shift_left =
+      windowsToLogicalMap_.at(kKeyCodeShiftLeft);
+  const uint64_t physical_control_left =
+      windowsToPhysicalMap_.at(kScanCodeControlLeft);
+  const uint64_t physical_control_right =
+      windowsToPhysicalMap_.at(kScanCodeControlRight);
+  const uint64_t logical_control_left =
+      windowsToLogicalMap_.at(kKeyCodeControlLeft);
+
+  bool shift_pressed = (modifiers_state & kShift) != 0;
+  SynthesizeIfNeeded(physical_shift_left, physical_shift_right,
+                     logical_shift_left, shift_pressed);
+  bool control_pressed = (modifiers_state & kControl) != 0;
+  SynthesizeIfNeeded(physical_control_left, physical_control_right,
+                     logical_control_left, control_pressed);
+}
+
+void KeyboardKeyEmbedderHandler::SynthesizeIfNeeded(uint64_t physical_left,
+                                                    uint64_t physical_right,
+                                                    uint64_t logical_left,
+                                                    bool is_pressed) {
+  auto pressing_record_iter_left = pressingRecords_.find(physical_left);
+  bool left_pressed = pressing_record_iter_left != pressingRecords_.end();
+  auto pressing_record_iter_right = pressingRecords_.find(physical_right);
+  bool right_pressed = pressing_record_iter_right != pressingRecords_.end();
+  bool already_pressed = left_pressed || right_pressed;
+  bool synthesize_down = is_pressed && !already_pressed;
+  bool synthesize_up = !is_pressed && already_pressed;
+
+  if (synthesize_down) {
+    SendSynthesizeDownEvent(physical_left, logical_left);
+  }
+
+  if (synthesize_up && left_pressed) {
+    uint64_t known_logical = pressing_record_iter_left->second;
+    SendSynthesizeUpEvent(physical_left, known_logical);
+  }
+
+  if (synthesize_up && right_pressed) {
+    uint64_t known_logical = pressing_record_iter_right->second;
+    SendSynthesizeUpEvent(physical_right, known_logical);
+  }
+}
+
+void KeyboardKeyEmbedderHandler::SendSynthesizeDownEvent(uint64_t physical,
+                                                         uint64_t logical) {
+  SendEvent(
+      SynthesizeSimpleEvent(kFlutterKeyEventTypeDown, physical, logical, ""),
+      nullptr, nullptr);
+  pressingRecords_[physical] = logical;
+};
+
+void KeyboardKeyEmbedderHandler::SendSynthesizeUpEvent(uint64_t physical,
+                                                       uint64_t logical) {
+  SendEvent(
+      SynthesizeSimpleEvent(kFlutterKeyEventTypeUp, physical, logical, ""),
+      nullptr, nullptr);
+  pressingRecords_.erase(physical);
+};
+
 void KeyboardKeyEmbedderHandler::HandleResponse(bool handled, void* user_data) {
   PendingResponse* pending = reinterpret_cast<PendingResponse*>(user_data);
   auto callback = std::move(pending->callback);
@@ -516,8 +587,6 @@ void KeyboardKeyEmbedderHandler::InitCriticalKeys(
     };
   };
 
-  // TODO(dkwingsmt): Consider adding more critical keys here.
-  // https://github.com/flutter/flutter/issues/76736
   critical_keys_.emplace(VK_LSHIFT,
                          createCheckedKey(VK_LSHIFT, false, true, false));
   critical_keys_.emplace(VK_RSHIFT,
@@ -532,7 +601,6 @@ void KeyboardKeyEmbedderHandler::InitCriticalKeys(
                          createCheckedKey(VK_RMENU, true, true, false));
   critical_keys_.emplace(VK_LWIN, createCheckedKey(VK_LWIN, true, true, false));
   critical_keys_.emplace(VK_RWIN, createCheckedKey(VK_RWIN, true, true, false));
-
   critical_keys_.emplace(VK_CAPITAL,
                          createCheckedKey(VK_CAPITAL, false, true, true));
   critical_keys_.emplace(VK_SCROLL,
diff --git a/shell/platform/windows/keyboard_key_embedder_handler.h b/shell/platform/windows/keyboard_key_embedder_handler.h
index 67ff6490e5fc4d0504cd3ea3a6fed30f37585c02..16dd9c0893db9815f5bfaa352bbe59ede9ef81f5 100644
--- a/shell/platform/windows/keyboard_key_embedder_handler.h
+++ b/shell/platform/windows/keyboard_key_embedder_handler.h
@@ -10,6 +10,7 @@
 #include <memory>
 #include <string>
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/embedder/embedder.h"
 #include "flutter/shell/platform/windows/keyboard_key_handler.h"
 
@@ -70,6 +71,10 @@ class KeyboardKeyEmbedderHandler
                     bool was_down,
                     std::function<void(bool)> callback) override;
 
+  void SyncModifiersIfNeeded(int modifiers_state) override;
+
+  std::map<uint64_t, uint64_t> GetPressedState() override;
+
  private:
   struct PendingResponse {
     std::function<void(bool, uint64_t)> callback;
@@ -109,20 +114,20 @@ class KeyboardKeyEmbedderHandler
   // Assign |critical_keys_| with basic information.
   void InitCriticalKeys(MapVirtualKeyToScanCode map_virtual_key_to_scan_code);
   // Update |critical_keys_| with last seen logical and physical key.
-  void UpdateLastSeenCritialKey(int virtual_key,
-                                uint64_t physical_key,
-                                uint64_t logical_key);
+  void UpdateLastSeenCriticalKey(int virtual_key,
+                                 uint64_t physical_key,
+                                 uint64_t logical_key);
   // Check each key's state from |get_key_state_| and synthesize events
   // if their toggling states have been desynchronized.
-  void SynchronizeCritialToggledStates(int event_virtual_key,
-                                       bool is_event_down,
-                                       bool* event_key_can_be_repeat);
+  void SynchronizeCriticalToggledStates(int event_virtual_key,
+                                        bool is_event_down,
+                                        bool* event_key_can_be_repeat);
   // Check each key's state from |get_key_state_| and synthesize events
   // if their pressing states have been desynchronized.
-  void SynchronizeCritialPressedStates(int event_virtual_key,
-                                       int event_physical_key,
-                                       bool is_event_down,
-                                       bool event_key_can_be_repeat);
+  void SynchronizeCriticalPressedStates(int event_virtual_key,
+                                        int event_physical_key,
+                                        bool is_event_down,
+                                        bool event_key_can_be_repeat);
 
   // Wraps perform_send_event_ with state tracking. Use this instead of
   // |perform_send_event_| to send events to the framework.
@@ -130,6 +135,19 @@ class KeyboardKeyEmbedderHandler
                  FlutterKeyEventCallback callback,
                  void* user_data);
 
+  // Send a synthesized down event and update pressing records.
+  void SendSynthesizeDownEvent(uint64_t physical, uint64_t logical);
+
+  // Send a synthesized up event and update pressing records.
+  void SendSynthesizeUpEvent(uint64_t physical, uint64_t logical);
+
+  // Send a synthesized up or down event depending on the current pressing
+  // state.
+  void SynthesizeIfNeeded(uint64_t physical_left,
+                          uint64_t physical_right,
+                          uint64_t logical_left,
+                          bool is_pressed);
+
   std::function<void(const FlutterKeyEvent&, FlutterKeyEventCallback, void*)>
       perform_send_event_;
   GetKeyStateHandler get_key_state_;
@@ -176,6 +194,8 @@ class KeyboardKeyEmbedderHandler
 
   // The plane value for the private keys defined by the GTK embedding.
   static const uint64_t windowsPlane;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(KeyboardKeyEmbedderHandler);
 };
 
 }  // namespace flutter
diff --git a/shell/platform/windows/keyboard_key_embedder_handler_unittests.cc b/shell/platform/windows/keyboard_key_embedder_handler_unittests.cc
index cf614379c5dca81650f84f79f43d022d81ca5aa3..d8532c2b1173062a416f350db857ccb7bc8db2de 100644
--- a/shell/platform/windows/keyboard_key_embedder_handler_unittests.cc
+++ b/shell/platform/windows/keyboard_key_embedder_handler_unittests.cc
@@ -10,6 +10,7 @@
 #include "flutter/shell/platform/embedder/embedder.h"
 #include "flutter/shell/platform/embedder/test_utils/key_codes.g.h"
 #include "flutter/shell/platform/embedder/test_utils/proc_table_replacement.h"
+#include "flutter/shell/platform/windows/keyboard_utils.h"
 #include "flutter/shell/platform/windows/testing/engine_modifier.h"
 #include "gtest/gtest.h"
 
@@ -513,6 +514,205 @@ TEST(KeyboardKeyEmbedderHandlerTest, ModifierKeysByVirtualKey) {
   results.clear();
 }
 
+// Test if modifiers left key down events are synthesized when left or right
+// keys are not pressed.
+TEST(KeyboardKeyEmbedderHandlerTest,
+     SynthesizeModifierLeftKeyDownWhenNotPressed) {
+  TestKeystate key_state;
+  std::vector<TestFlutterKeyEvent> results;
+  TestFlutterKeyEvent* event;
+  bool last_handled = false;
+
+  std::unique_ptr<KeyboardKeyEmbedderHandler> handler =
+      std::make_unique<KeyboardKeyEmbedderHandler>(
+          [&results](const FlutterKeyEvent& event,
+                     FlutterKeyEventCallback callback, void* user_data) {
+            results.emplace_back(event, callback, user_data);
+          },
+          key_state.Getter(), DefaultMapVkToScan);
+
+  // Should synthesize shift left key down event.
+  handler->SyncModifiersIfNeeded(kShift);
+  EXPECT_EQ(results.size(), 1);
+  event = &results[0];
+  EXPECT_EQ(event->type, kFlutterKeyEventTypeDown);
+  EXPECT_EQ(event->physical, kPhysicalShiftLeft);
+  EXPECT_EQ(event->logical, kLogicalShiftLeft);
+  EXPECT_STREQ(event->character, "");
+  EXPECT_EQ(event->synthesized, true);
+  results.clear();
+
+  // Clear the pressing state.
+  handler->SyncModifiersIfNeeded(0);
+  results.clear();
+
+  // Should synthesize control left key down event.
+  handler->SyncModifiersIfNeeded(kControl);
+  EXPECT_EQ(results.size(), 1);
+  event = &results[0];
+  EXPECT_EQ(event->type, kFlutterKeyEventTypeDown);
+  EXPECT_EQ(event->physical, kPhysicalControlLeft);
+  EXPECT_EQ(event->logical, kLogicalControlLeft);
+  EXPECT_STREQ(event->character, "");
+  EXPECT_EQ(event->synthesized, true);
+}
+
+// Test if modifiers left key down events are not synthesized when left or right
+// keys are pressed.
+TEST(KeyboardKeyEmbedderHandlerTest, DoNotSynthesizeModifierDownWhenPressed) {
+  TestKeystate key_state;
+  std::vector<TestFlutterKeyEvent> results;
+  TestFlutterKeyEvent* event;
+  bool last_handled = false;
+
+  std::unique_ptr<KeyboardKeyEmbedderHandler> handler =
+      std::make_unique<KeyboardKeyEmbedderHandler>(
+          [&results](const FlutterKeyEvent& event,
+                     FlutterKeyEventCallback callback, void* user_data) {
+            results.emplace_back(event, callback, user_data);
+          },
+          key_state.Getter(), DefaultMapVkToScan);
+
+  // Should not synthesize shift left key down event when shift left key
+  // is already pressed.
+  handler->KeyboardHook(
+      VK_LSHIFT, kScanCodeShiftLeft, WM_KEYDOWN, 0, false, true,
+      [&last_handled](bool handled) { last_handled = handled; });
+  results.clear();
+  handler->SyncModifiersIfNeeded(kShift);
+  EXPECT_EQ(results.size(), 0);
+
+  // Should not synthesize shift left key down event when shift right key
+  // is already pressed.
+  handler->KeyboardHook(
+      VK_RSHIFT, kScanCodeShiftRight, WM_KEYDOWN, 0, false, true,
+      [&last_handled](bool handled) { last_handled = handled; });
+  results.clear();
+  handler->SyncModifiersIfNeeded(kShift);
+  EXPECT_EQ(results.size(), 0);
+
+  // Should not synthesize control left key down event when control left key
+  // is already pressed.
+  handler->KeyboardHook(
+      VK_LCONTROL, kScanCodeControlLeft, WM_KEYDOWN, 0, false, true,
+      [&last_handled](bool handled) { last_handled = handled; });
+  results.clear();
+  handler->SyncModifiersIfNeeded(kControl);
+  EXPECT_EQ(results.size(), 0);
+
+  // Should not synthesize control left key down event when control right key
+  // is already pressed .
+  handler->KeyboardHook(
+      VK_RCONTROL, kScanCodeControlRight, WM_KEYDOWN, 0, true, true,
+      [&last_handled](bool handled) { last_handled = handled; });
+  results.clear();
+  handler->SyncModifiersIfNeeded(kControl);
+  EXPECT_EQ(results.size(), 0);
+}
+
+// Test if modifiers keys up events are synthesized when left or right keys
+// are pressed.
+TEST(KeyboardKeyEmbedderHandlerTest, SynthesizeModifierUpWhenPressed) {
+  TestKeystate key_state;
+  std::vector<TestFlutterKeyEvent> results;
+  TestFlutterKeyEvent* event;
+  bool last_handled = false;
+
+  std::unique_ptr<KeyboardKeyEmbedderHandler> handler =
+      std::make_unique<KeyboardKeyEmbedderHandler>(
+          [&results](const FlutterKeyEvent& event,
+                     FlutterKeyEventCallback callback, void* user_data) {
+            results.emplace_back(event, callback, user_data);
+          },
+          key_state.Getter(), DefaultMapVkToScan);
+
+  // Should synthesize shift left key up event when shift left key is
+  // already pressed and modifiers state is zero.
+  handler->KeyboardHook(
+      VK_LSHIFT, kScanCodeShiftLeft, WM_KEYDOWN, 0, false, true,
+      [&last_handled](bool handled) { last_handled = handled; });
+  results.clear();
+  handler->SyncModifiersIfNeeded(0);
+  EXPECT_EQ(results.size(), 1);
+  event = &results[0];
+  EXPECT_EQ(event->type, kFlutterKeyEventTypeUp);
+  EXPECT_EQ(event->physical, kPhysicalShiftLeft);
+  EXPECT_EQ(event->logical, kLogicalShiftLeft);
+  EXPECT_STREQ(event->character, "");
+  EXPECT_EQ(event->synthesized, true);
+  results.clear();
+
+  // Should synthesize shift right key up event when shift right key is
+  // already pressed and modifiers state is zero.
+  handler->KeyboardHook(
+      VK_RSHIFT, kScanCodeShiftRight, WM_KEYDOWN, 0, false, true,
+      [&last_handled](bool handled) { last_handled = handled; });
+  results.clear();
+  handler->SyncModifiersIfNeeded(0);
+  EXPECT_EQ(results.size(), 1);
+  event = &results[0];
+  EXPECT_EQ(event->type, kFlutterKeyEventTypeUp);
+  EXPECT_EQ(event->physical, kPhysicalShiftRight);
+  EXPECT_EQ(event->logical, kLogicalShiftRight);
+  EXPECT_STREQ(event->character, "");
+  EXPECT_EQ(event->synthesized, true);
+  results.clear();
+
+  // Should synthesize control left key up event when control left key is
+  // already pressed and modifiers state is zero.
+  handler->KeyboardHook(
+      VK_LCONTROL, kScanCodeControlLeft, WM_KEYDOWN, 0, false, true,
+      [&last_handled](bool handled) { last_handled = handled; });
+  results.clear();
+  handler->SyncModifiersIfNeeded(0);
+  EXPECT_EQ(results.size(), 1);
+  event = &results[0];
+  EXPECT_EQ(event->type, kFlutterKeyEventTypeUp);
+  EXPECT_EQ(event->physical, kPhysicalControlLeft);
+  EXPECT_EQ(event->logical, kLogicalControlLeft);
+  EXPECT_STREQ(event->character, "");
+  EXPECT_EQ(event->synthesized, true);
+  results.clear();
+
+  // Should synthesize control right key up event when control right key is
+  // already pressed and modifiers state is zero.
+  handler->KeyboardHook(
+      VK_RCONTROL, kScanCodeControlRight, WM_KEYDOWN, 0, true, true,
+      [&last_handled](bool handled) { last_handled = handled; });
+  results.clear();
+  handler->SyncModifiersIfNeeded(0);
+  EXPECT_EQ(results.size(), 1);
+  event = &results[0];
+  EXPECT_EQ(event->type, kFlutterKeyEventTypeUp);
+  EXPECT_EQ(event->physical, kPhysicalControlRight);
+  EXPECT_EQ(event->logical, kLogicalControlRight);
+  EXPECT_STREQ(event->character, "");
+  EXPECT_EQ(event->synthesized, true);
+  results.clear();
+}
+
+// Test if modifiers key up events are not synthesized when left or right
+// keys are not pressed.
+TEST(KeyboardKeyEmbedderHandlerTest, DoNotSynthesizeModifierUpWhenNotPressed) {
+  TestKeystate key_state;
+  std::vector<TestFlutterKeyEvent> results;
+  TestFlutterKeyEvent* event;
+  bool last_handled = false;
+
+  std::unique_ptr<KeyboardKeyEmbedderHandler> handler =
+      std::make_unique<KeyboardKeyEmbedderHandler>(
+          [&results](const FlutterKeyEvent& event,
+                     FlutterKeyEventCallback callback, void* user_data) {
+            results.emplace_back(event, callback, user_data);
+          },
+          key_state.Getter(), DefaultMapVkToScan);
+
+  // Should not synthesize up events when no modifier key is pressed
+  // in pressing state and modifiers state is zero.
+  handler->SyncModifiersIfNeeded(0);
+  EXPECT_EQ(results.size(), 0);
+}
+
 TEST(KeyboardKeyEmbedderHandlerTest, RepeatedDownIsIgnored) {
   TestKeystate key_state;
   std::vector<TestFlutterKeyEvent> results;
diff --git a/shell/platform/windows/keyboard_key_handler.cc b/shell/platform/windows/keyboard_key_handler.cc
index 718c6f2afbcca61f69658afb6de43a8c601f4bdf..f4feebbb3a132a5e0fb40c03242872b327dd3ad9 100644
--- a/shell/platform/windows/keyboard_key_handler.cc
+++ b/shell/platform/windows/keyboard_key_handler.cc
@@ -7,6 +7,7 @@
 #include <windows.h>
 
 #include "flutter/fml/logging.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_method_codec.h"
 #include "flutter/shell/platform/windows/keyboard_utils.h"
 
 namespace flutter {
@@ -17,20 +18,68 @@ namespace {
 // emitting a warning on the console about unhandled events.
 static constexpr int kMaxPendingEvents = 1000;
 
+// The name of the channel for keyboard state queries.
+static constexpr char kChannelName[] = "flutter/keyboard";
+
+static constexpr char kGetKeyboardStateMethod[] = "getKeyboardState";
+
 }  // namespace
 
 KeyboardKeyHandler::KeyboardKeyHandlerDelegate::~KeyboardKeyHandlerDelegate() =
     default;
 
-KeyboardKeyHandler::KeyboardKeyHandler() : last_sequence_id_(1) {}
+KeyboardKeyHandler::KeyboardKeyHandler(flutter::BinaryMessenger* messenger)
+    : last_sequence_id_(1),
+      channel_(std::make_unique<MethodChannel<EncodableValue>>(
+          messenger,
+          kChannelName,
+          &StandardMethodCodec::GetInstance())) {}
 
 KeyboardKeyHandler::~KeyboardKeyHandler() = default;
 
+void KeyboardKeyHandler::InitKeyboardChannel() {
+  channel_->SetMethodCallHandler(
+      [this](const MethodCall<EncodableValue>& call,
+             std::unique_ptr<MethodResult<EncodableValue>> result) {
+        HandleMethodCall(call, std::move(result));
+      });
+}
+
+void KeyboardKeyHandler::HandleMethodCall(
+    const MethodCall<EncodableValue>& method_call,
+    std::unique_ptr<MethodResult<EncodableValue>> result) {
+  const std::string& method = method_call.method_name();
+  if (method.compare(kGetKeyboardStateMethod) == 0) {
+    EncodableMap value;
+    const auto& pressed_state = GetPressedState();
+    for (const auto& pressed_key : pressed_state) {
+      EncodableValue physical_value(static_cast<long long>(pressed_key.first));
+      EncodableValue logical_value(static_cast<long long>(pressed_key.second));
+      value[physical_value] = logical_value;
+    }
+    result->Success(EncodableValue(value));
+  } else {
+    result->NotImplemented();
+  }
+}
+
 void KeyboardKeyHandler::AddDelegate(
     std::unique_ptr<KeyboardKeyHandlerDelegate> delegate) {
   delegates_.push_back(std::move(delegate));
 }
 
+void KeyboardKeyHandler::SyncModifiersIfNeeded(int modifiers_state) {
+  // Only call SyncModifierIfNeeded on the key embedder handler.
+  auto& key_embedder_handler = delegates_.front();
+  key_embedder_handler->SyncModifiersIfNeeded(modifiers_state);
+}
+
+std::map<uint64_t, uint64_t> KeyboardKeyHandler::GetPressedState() {
+  // The embedder responder is the first element in delegates_.
+  auto& key_embedder_handler = delegates_.front();
+  return key_embedder_handler->GetPressedState();
+}
+
 void KeyboardKeyHandler::KeyboardHook(int key,
                                       int scancode,
                                       int action,
@@ -77,7 +126,8 @@ void KeyboardKeyHandler::ResolvePendingEvent(uint64_t sequence_id,
       PendingEvent& event = **iter;
       event.any_handled = event.any_handled || handled;
       event.unreplied -= 1;
-      assert(event.unreplied >= 0);
+      FML_DCHECK(event.unreplied >= 0)
+          << "Pending events must have unreplied count > 0";
       // If all delegates have replied, report if any of them handled the event.
       if (event.unreplied == 0) {
         std::unique_ptr<PendingEvent> event_ptr = std::move(*iter);
@@ -89,7 +139,8 @@ void KeyboardKeyHandler::ResolvePendingEvent(uint64_t sequence_id,
     }
   }
   // The pending event should always be found.
-  assert(false);
+  FML_LOG(FATAL) << "Could not find pending key event for sequence ID "
+                 << sequence_id;
 }
 
 }  // namespace flutter
diff --git a/shell/platform/windows/keyboard_key_handler.h b/shell/platform/windows/keyboard_key_handler.h
index a0a67fad699983312c0a85855842fd1afd54abc3..2752c1045c189ce74be0986f9939e61737a24fed 100644
--- a/shell/platform/windows/keyboard_key_handler.h
+++ b/shell/platform/windows/keyboard_key_handler.h
@@ -7,12 +7,15 @@
 
 #include <windows.h>
 #include <deque>
+#include <map>
 #include <memory>
 #include <string>
 
-#include "flutter/shell/platform/common/client_wrapper/include/flutter/basic_message_channel.h"
+#include "flutter/fml/macros.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/encodable_value.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_channel.h"
 #include "flutter/shell/platform/windows/keyboard_handler_base.h"
-#include "rapidjson/document.h"
 
 namespace flutter {
 
@@ -47,17 +50,28 @@ class KeyboardKeyHandler : public KeyboardHandlerBase {
                               bool was_down,
                               KeyEventCallback callback) = 0;
 
+    virtual void SyncModifiersIfNeeded(int modifiers_state) = 0;
+
+    virtual std::map<uint64_t, uint64_t> GetPressedState() = 0;
+
     virtual ~KeyboardKeyHandlerDelegate();
   };
 
-  // Create a KeyboardKeyHandler.
-  explicit KeyboardKeyHandler();
+  // Create a |KeyboardKeyHandler| by specifying the messenger
+  // through which the messages are sent.
+  explicit KeyboardKeyHandler(flutter::BinaryMessenger* messenger);
 
   ~KeyboardKeyHandler();
 
+  // Init the keyboard channel used to answer to pressed state queries.
+  void InitKeyboardChannel();
+
   // Add a delegate that handles events received by |KeyboardHook|.
   void AddDelegate(std::unique_ptr<KeyboardKeyHandlerDelegate> delegate);
 
+  // Synthesize modifier keys events if needed.
+  void SyncModifiersIfNeeded(int modifiers_state) override;
+
   // Handles a key event.
   //
   // Returns whether this handler claims to handle the event, which is true if
@@ -66,7 +80,7 @@ class KeyboardKeyHandler : public KeyboardHandlerBase {
   // Windows requires a synchronous response of whether a key event should be
   // handled, while the query to Flutter is always asynchronous. This is
   // resolved by the "redispatching" algorithm: by default, the response to a
-  // fresh event is always always true. The event is then sent to the framework.
+  // fresh event is always true. The event is then sent to the framework.
   // If the framework later decides not to handle the event, this class will
   // create an identical event and dispatch it to the system, and remember all
   // synthesized events. The fist time an exact event (by |ComputeEventHash|) is
@@ -91,6 +105,12 @@ class KeyboardKeyHandler : public KeyboardHandlerBase {
                     bool was_down,
                     KeyEventCallback callback) override;
 
+  // Returns the keyboard pressed state.
+  //
+  // Returns the keyboard pressed state. The dictionary contains one entry per
+  // pressed keys, mapping from the logical key to the physical key.
+  std::map<uint64_t, uint64_t> GetPressedState() override;
+
  private:
   struct PendingEvent {
     // Self-incrementing ID attached to an event sent to the framework.
@@ -108,6 +128,11 @@ class KeyboardKeyHandler : public KeyboardHandlerBase {
 
   void ResolvePendingEvent(uint64_t sequence_id, bool handled);
 
+  // Called when a method is called on |channel_|;
+  void HandleMethodCall(
+      const flutter::MethodCall<EncodableValue>& method_call,
+      std::unique_ptr<flutter::MethodResult<EncodableValue>> result);
+
   std::vector<std::unique_ptr<KeyboardKeyHandlerDelegate>> delegates_;
 
   // The queue of key events that have been sent to the framework but have not
@@ -116,6 +141,11 @@ class KeyboardKeyHandler : public KeyboardHandlerBase {
 
   // The sequence_id attached to the last event sent to the framework.
   uint64_t last_sequence_id_;
+
+  // The Flutter system channel for keyboard state messages.
+  std::unique_ptr<flutter::MethodChannel<EncodableValue>> channel_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(KeyboardKeyHandler);
 };
 
 }  // namespace flutter
diff --git a/shell/platform/windows/keyboard_key_handler_unittests.cc b/shell/platform/windows/keyboard_key_handler_unittests.cc
index 5e58739fda5f818beb7b43bcc9f3fcee2d356d42..3b42c9507c85979ecc246dabad23ef93a45ceb84 100644
--- a/shell/platform/windows/keyboard_key_handler_unittests.cc
+++ b/shell/platform/windows/keyboard_key_handler_unittests.cc
@@ -4,8 +4,18 @@
 #include "flutter/shell/platform/windows/keyboard_key_handler.h"
 
 #include <rapidjson/document.h>
+#include <map>
 #include <memory>
-
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_result_functions.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_message_codec.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_method_codec.h"
+#include "flutter/shell/platform/embedder/test_utils/key_codes.g.h"
+#include "flutter/shell/platform/embedder/test_utils/proc_table_replacement.h"
+#include "flutter/shell/platform/windows/keyboard_utils.h"
+#include "flutter/shell/platform/windows/testing/engine_modifier.h"
+#include "flutter/shell/platform/windows/testing/test_binary_messenger.h"
+
+#include "flutter/fml/macros.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
@@ -14,6 +24,63 @@ namespace testing {
 
 namespace {
 
+static constexpr char kChannelName[] = "flutter/keyboard";
+static constexpr char kGetKeyboardStateMethod[] = "getKeyboardState";
+
+constexpr SHORT kStateMaskToggled = 0x01;
+constexpr SHORT kStateMaskPressed = 0x80;
+
+class TestFlutterKeyEvent : public FlutterKeyEvent {
+ public:
+  TestFlutterKeyEvent(const FlutterKeyEvent& src,
+                      FlutterKeyEventCallback callback,
+                      void* user_data)
+      : character_str(src.character), callback(callback), user_data(user_data) {
+    struct_size = src.struct_size;
+    timestamp = src.timestamp;
+    type = src.type;
+    physical = src.physical;
+    logical = src.logical;
+    character = character_str.c_str();
+    synthesized = src.synthesized;
+  }
+
+  TestFlutterKeyEvent(TestFlutterKeyEvent&& source)
+      : FlutterKeyEvent(source),
+        callback(std::move(source.callback)),
+        user_data(source.user_data) {
+    character = character_str.c_str();
+  }
+
+  FlutterKeyEventCallback callback;
+  void* user_data;
+
+ private:
+  const std::string character_str;
+};
+
+class TestKeystate {
+ public:
+  void Set(int virtual_key, bool pressed, bool toggled_on = false) {
+    state_[virtual_key] = (pressed ? kStateMaskPressed : 0) |
+                          (toggled_on ? kStateMaskToggled : 0);
+  }
+
+  SHORT Get(int virtual_key) { return state_[virtual_key]; }
+
+  KeyboardKeyEmbedderHandler::GetKeyStateHandler Getter() {
+    return [this](int virtual_key) { return Get(virtual_key); };
+  }
+
+ private:
+  std::map<int, SHORT> state_;
+};
+
+UINT DefaultMapVkToScan(UINT virtual_key, bool extended) {
+  return MapVirtualKey(virtual_key,
+                       extended ? MAPVK_VK_TO_VSC_EX : MAPVK_VK_TO_VSC);
+}
+
 static constexpr int kHandledScanCode = 20;
 static constexpr int kHandledScanCode2 = 22;
 static constexpr int kUnhandledScanCode = 21;
@@ -22,6 +89,9 @@ constexpr uint64_t kScanCodeShiftRight = 0x36;
 constexpr uint64_t kScanCodeControl = 0x1D;
 constexpr uint64_t kScanCodeAltLeft = 0x38;
 
+constexpr uint64_t kScanCodeKeyA = 0x1e;
+constexpr uint64_t kVirtualKeyA = 0x41;
+
 typedef std::function<void(bool)> Callback;
 typedef std::function<void(Callback&)> CallbackHandler;
 void dont_respond(Callback& callback) {}
@@ -87,9 +157,21 @@ class MockKeyHandlerDelegate
     callback_handler(hook_history->back().callback);
   }
 
+  virtual void SyncModifiersIfNeeded(int modifiers_state) {
+    // Do Nothing
+  }
+
+  virtual std::map<uint64_t, uint64_t> GetPressedState() {
+    std::map<uint64_t, uint64_t> Empty_State;
+    return Empty_State;
+  }
+
   CallbackHandler callback_handler;
   int delegate_id;
   std::list<KeyboardHookCall>* hook_history;
+
+ private:
+  FML_DISALLOW_COPY_AND_ASSIGN(MockKeyHandlerDelegate);
 };
 
 enum KeyEventResponse {
@@ -104,12 +186,33 @@ void OnKeyEventResult(bool handled) {
   key_event_response = handled ? kHandled : kUnhandled;
 }
 
+void SimulateKeyboardMessage(TestBinaryMessenger* messenger,
+                             const std::string& method_name,
+                             std::unique_ptr<EncodableValue> arguments,
+                             MethodResult<EncodableValue>* result_handler) {
+  MethodCall<> call(method_name, std::move(arguments));
+  auto message = StandardMethodCodec::GetInstance().EncodeMethodCall(call);
+
+  EXPECT_TRUE(messenger->SimulateEngineMessage(
+      kChannelName, message->data(), message->size(),
+      [&result_handler](const uint8_t* reply, size_t reply_size) {
+        StandardMethodCodec::GetInstance().DecodeAndProcessResponseEnvelope(
+            reply, reply_size, result_handler);
+      }));
+}
+
 }  // namespace
 
+using namespace ::flutter::testing::keycodes;
+
 TEST(KeyboardKeyHandlerTest, SingleDelegateWithAsyncResponds) {
   std::list<MockKeyHandlerDelegate::KeyboardHookCall> hook_history;
 
-  KeyboardKeyHandler handler;
+  TestBinaryMessenger messenger([](const std::string& channel,
+                                   const uint8_t* message, size_t message_size,
+                                   BinaryReply reply) {});
+  KeyboardKeyHandler handler(&messenger);
+
   // Add one delegate
   auto delegate = std::make_unique<MockKeyHandlerDelegate>(1, &hook_history);
   handler.AddDelegate(std::move(delegate));
@@ -167,7 +270,10 @@ TEST(KeyboardKeyHandlerTest, SingleDelegateWithAsyncResponds) {
 TEST(KeyboardKeyHandlerTest, SingleDelegateWithSyncResponds) {
   std::list<MockKeyHandlerDelegate::KeyboardHookCall> hook_history;
 
-  KeyboardKeyHandler handler;
+  TestBinaryMessenger messenger([](const std::string& channel,
+                                   const uint8_t* message, size_t message_size,
+                                   BinaryReply reply) {});
+  KeyboardKeyHandler handler(&messenger);
   // Add one delegate
   auto delegate = std::make_unique<MockKeyHandlerDelegate>(1, &hook_history);
   CallbackHandler& delegate_handler = delegate->callback_handler;
@@ -202,5 +308,64 @@ TEST(KeyboardKeyHandlerTest, SingleDelegateWithSyncResponds) {
   key_event_response = kNoResponse;
 }
 
+TEST(KeyboardKeyHandlerTest, HandlerGetPressedState) {
+  TestKeystate key_state;
+
+  TestBinaryMessenger messenger([](const std::string& channel,
+                                   const uint8_t* message, size_t message_size,
+                                   BinaryReply reply) {});
+  KeyboardKeyHandler handler(&messenger);
+
+  std::unique_ptr<KeyboardKeyEmbedderHandler> embedder_handler =
+      std::make_unique<KeyboardKeyEmbedderHandler>(
+          [](const FlutterKeyEvent& event, FlutterKeyEventCallback callback,
+             void* user_data) {},
+          key_state.Getter(), DefaultMapVkToScan);
+  handler.AddDelegate(std::move(embedder_handler));
+
+  // Dispatch a key event.
+  handler.KeyboardHook(kVirtualKeyA, kScanCodeKeyA, WM_KEYDOWN, 'a', false,
+                       false, OnKeyEventResult);
+
+  std::map<uint64_t, uint64_t> pressed_state = handler.GetPressedState();
+  EXPECT_EQ(pressed_state.size(), 1);
+  EXPECT_EQ(pressed_state.at(kPhysicalKeyA), kLogicalKeyA);
+}
+
+TEST(KeyboardKeyHandlerTest, KeyboardChannelGetPressedState) {
+  TestKeystate key_state;
+  TestBinaryMessenger messenger;
+  KeyboardKeyHandler handler(&messenger);
+
+  std::unique_ptr<KeyboardKeyEmbedderHandler> embedder_handler =
+      std::make_unique<KeyboardKeyEmbedderHandler>(
+          [](const FlutterKeyEvent& event, FlutterKeyEventCallback callback,
+             void* user_data) {},
+          key_state.Getter(), DefaultMapVkToScan);
+  handler.AddDelegate(std::move(embedder_handler));
+  handler.InitKeyboardChannel();
+
+  // Dispatch a key event.
+  handler.KeyboardHook(kVirtualKeyA, kScanCodeKeyA, WM_KEYDOWN, 'a', false,
+                       false, OnKeyEventResult);
+
+  bool success = false;
+
+  MethodResultFunctions<> result_handler(
+      [&success](const EncodableValue* result) {
+        success = true;
+        auto& map = std::get<EncodableMap>(*result);
+        EXPECT_EQ(map.size(), 1);
+        EncodableValue physical_value(static_cast<long long>(kPhysicalKeyA));
+        EncodableValue logical_value(static_cast<long long>(kLogicalKeyA));
+        EXPECT_EQ(map.at(physical_value), logical_value);
+      },
+      nullptr, nullptr);
+
+  SimulateKeyboardMessage(&messenger, kGetKeyboardStateMethod, nullptr,
+                          &result_handler);
+  EXPECT_TRUE(success);
+}
+
 }  // namespace testing
 }  // namespace flutter
diff --git a/shell/platform/windows/keyboard_manager.cc b/shell/platform/windows/keyboard_manager.cc
index d8891a5a9c9969026c0742de7873ef49ac703e5c..20faa1e12421d85f34161c65db346184007a09e6 100644
--- a/shell/platform/windows/keyboard_manager.cc
+++ b/shell/platform/windows/keyboard_manager.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <assert.h>
 #include <memory>
 #include <string>
 
@@ -16,7 +15,7 @@ namespace {
 
 // The maximum number of pending events to keep before
 // emitting a warning on the console about unhandled events.
-static constexpr int kMaxPendingEvents = 1000;
+constexpr int kMaxPendingEvents = 1000;
 
 // Returns true if this key is an AltRight key down event.
 //
@@ -41,7 +40,7 @@ static constexpr int kMaxPendingEvents = 1000;
 // would be rare, and a misrecognition would only cause a minor consequence
 // where the CtrlLeft is released early; the later, real, CtrlLeft up event will
 // be ignored.
-static bool IsKeyDownAltRight(int action, int virtual_key, bool extended) {
+bool IsKeyDownAltRight(int action, int virtual_key, bool extended) {
   return virtual_key == VK_RMENU && extended &&
          (action == WM_KEYDOWN || action == WM_SYSKEYDOWN);
 }
@@ -49,7 +48,7 @@ static bool IsKeyDownAltRight(int action, int virtual_key, bool extended) {
 // Returns true if this key is a key up event of AltRight.
 //
 // This is used to assist a corner case described in |IsKeyDownAltRight|.
-static bool IsKeyUpAltRight(int action, int virtual_key, bool extended) {
+bool IsKeyUpAltRight(int action, int virtual_key, bool extended) {
   return virtual_key == VK_RMENU && extended &&
          (action == WM_KEYUP || action == WM_SYSKEYUP);
 }
@@ -57,24 +56,22 @@ static bool IsKeyUpAltRight(int action, int virtual_key, bool extended) {
 // Returns true if this key is a key down event of CtrlLeft.
 //
 // This is used to assist a corner case described in |IsKeyDownAltRight|.
-static bool IsKeyDownCtrlLeft(int action, int virtual_key) {
+bool IsKeyDownCtrlLeft(int action, int virtual_key) {
   return virtual_key == VK_LCONTROL &&
          (action == WM_KEYDOWN || action == WM_SYSKEYDOWN);
 }
 
 // Returns if a character sent by Win32 is a dead key.
-static bool IsDeadKey(uint32_t ch) {
+bool IsDeadKey(uint32_t ch) {
   return (ch & kDeadKeyCharMask) != 0;
 }
 
-static char32_t CodePointFromSurrogatePair(wchar_t high, wchar_t low) {
+char32_t CodePointFromSurrogatePair(wchar_t high, wchar_t low) {
   return 0x10000 + ((static_cast<char32_t>(high) & 0x000003FF) << 10) +
          (low & 0x3FF);
 }
 
-static uint16_t ResolveKeyCode(uint16_t original,
-                               bool extended,
-                               uint8_t scancode) {
+uint16_t ResolveKeyCode(uint16_t original, bool extended, uint8_t scancode) {
   switch (original) {
     case VK_SHIFT:
     case VK_LSHIFT:
@@ -90,13 +87,13 @@ static uint16_t ResolveKeyCode(uint16_t original,
   }
 }
 
-static bool IsPrintable(uint32_t c) {
+bool IsPrintable(uint32_t c) {
   constexpr char32_t kMinPrintable = ' ';
   constexpr char32_t kDelete = 0x7F;
   return c >= kMinPrintable && c != kDelete;
 }
 
-static bool IsSysAction(UINT action) {
+bool IsSysAction(UINT action) {
   return action == WM_SYSKEYDOWN || action == WM_SYSKEYUP ||
          action == WM_SYSCHAR || action == WM_SYSDEADCHAR;
 }
@@ -323,7 +320,8 @@ bool KeyboardManager::HandleMessage(UINT const action,
       return !IsSysAction(action);
     }
     default:
-      assert(false);
+      FML_LOG(FATAL) << "No event handler for keyboard event with action "
+                     << action;
   }
   return false;
 }
@@ -336,7 +334,7 @@ void KeyboardManager::ProcessNextEvent() {
   auto pending_event = std::move(pending_events_.front());
   pending_events_.pop_front();
   PerformProcessEvent(std::move(pending_event), [this] {
-    assert(processing_event_);
+    FML_DCHECK(processing_event_);
     processing_event_ = false;
     ProcessNextEvent();
   });
@@ -392,7 +390,7 @@ void KeyboardManager::DispatchText(const PendingEvent& event) {
   // keys defined by `IsPrintable` are certain characters at lower ASCII range.
   // These ASCII control characters are sent as WM_CHAR events for all control
   // key shortcuts.
-  assert(!event.session.empty());
+  FML_DCHECK(!event.session.empty());
   bool is_printable = IsPrintable(event.session.back().wparam);
   bool valid = event.character != 0 && is_printable;
   if (valid) {
diff --git a/shell/platform/windows/keyboard_manager.h b/shell/platform/windows/keyboard_manager.h
index 0b1025bb8bef260d3827018a6a864aebc6c8eb20..b88983e44bac12f36706c9d2d7d8fce19ccecf4f 100644
--- a/shell/platform/windows/keyboard_manager.h
+++ b/shell/platform/windows/keyboard_manager.h
@@ -6,11 +6,14 @@
 #define FLUTTER_SHELL_PLATFORM_WINDOWS_KEYBOARD_MANAGER_H_
 
 #include <windows.h>
+
 #include <atomic>
 #include <deque>
 #include <functional>
 #include <map>
 
+#include "flutter/fml/macros.h"
+
 namespace flutter {
 
 // Handles keyboard and text messages on Win32.
@@ -23,14 +26,14 @@ namespace flutter {
 // system calls (to allow mocking) and where to send the results of key calls
 // and text calls to.
 //
-// Typically, |KeyboardManager| is owned by a |Window|, which also implements
-// the window delegate. The key calls and text calls are forwarded to those of
-// |Window|'s, and consequently, those of |FlutterWindowsView|'s.
+// Typically, |KeyboardManager| is owned by a |FlutterWindow|, which also
+// implements the window delegate. The key calls and text calls are forwarded to
+// the |FlutterWindow|, and consequently, to the |FlutterWindowsView|.
 //
 // ## Terminology
 //
-// The keyboard system follows the following terminology instead of the
-// inconsistent/incomplete one used by Win32:
+// The keyboard system uses the following terminology (which is different
+// than Win32's terminology):
 //
 //  * Message: An invocation of |WndProc|, which consists of an
 //    action, an lparam, and a wparam.
@@ -43,7 +46,7 @@ namespace flutter {
 class KeyboardManager {
  public:
   // Define how the keyboard manager accesses Win32 system calls (to allow
-  // mocking) and sends key calls and and text calls.
+  // mocking) and sends key calls and text calls.
   //
   // Typically implemented by |Window|.
   class WindowDelegate {
@@ -225,6 +228,8 @@ class KeyboardManager {
   // The queue of messages that have been redispatched to the system but have
   // not yet been received for a second time.
   std::deque<Win32Message> pending_redispatches_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(KeyboardManager);
 };
 
 }  // namespace flutter
diff --git a/shell/platform/windows/keyboard_unittests.cc b/shell/platform/windows/keyboard_unittests.cc
index 1d088b9226aacc28111807900dc140f7e74a530e..b4495b9bd085f5ae06211a80704ba2aa4d9a5b12 100644
--- a/shell/platform/windows/keyboard_unittests.cc
+++ b/shell/platform/windows/keyboard_unittests.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "flutter/fml/logging.h"
 #include "flutter/shell/platform/common/json_message_codec.h"
 #include "flutter/shell/platform/embedder/embedder.h"
 #include "flutter/shell/platform/embedder/test_utils/key_codes.g.h"
@@ -12,8 +13,10 @@
 #include "flutter/shell/platform/windows/keyboard_key_handler.h"
 #include "flutter/shell/platform/windows/keyboard_manager.h"
 #include "flutter/shell/platform/windows/testing/engine_modifier.h"
+#include "flutter/shell/platform/windows/testing/flutter_windows_engine_builder.h"
 #include "flutter/shell/platform/windows/testing/mock_window_binding_handler.h"
 #include "flutter/shell/platform/windows/testing/test_keyboard.h"
+#include "flutter/shell/platform/windows/testing/windows_test.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
@@ -103,7 +106,8 @@ class TestKeyboardManager : public KeyboardManager {
 
  protected:
   void RedispatchEvent(std::unique_ptr<PendingEvent> event) override {
-    assert(!during_redispatch_);
+    FML_DCHECK(!during_redispatch_)
+        << "RedispatchEvent called while already redispatching an event";
     during_redispatch_ = true;
     KeyboardManager::RedispatchEvent(std::move(event));
     during_redispatch_ = false;
@@ -111,6 +115,8 @@ class TestKeyboardManager : public KeyboardManager {
 
  private:
   bool during_redispatch_ = false;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(TestKeyboardManager);
 };
 
 // Injecting this kind of keyboard change means that a key state (the true
@@ -235,7 +241,7 @@ class MockKeyboardManagerDelegate : public KeyboardManager::WindowDelegate,
           break;
         }
         default:
-          assert(false);
+          FML_LOG(FATAL) << "Unhandled KeyboardChange type " << change.type;
       }
     }
   }
@@ -310,76 +316,8 @@ class MockKeyboardManagerDelegate : public KeyboardManager::WindowDelegate,
   MapVirtualKeyToChar map_vk_to_char_;
   TestKeystate key_state_;
   std::list<Win32Message> redispatched_messages_;
-};
-
-// A FlutterWindowsView that overrides the RegisterKeyboardHandlers function
-// to register the keyboard hook handlers that can be spied upon.
-class TestFlutterWindowsView : public FlutterWindowsView {
- public:
-  typedef std::function<void(const std::u16string& text)> U16StringHandler;
-
-  TestFlutterWindowsView(
-      U16StringHandler on_text,
-      KeyboardKeyEmbedderHandler::GetKeyStateHandler get_keyboard_state,
-      KeyboardKeyEmbedderHandler::MapVirtualKeyToScanCode map_vk_to_scan)
-      // The WindowBindingHandler is used for window size and such, and doesn't
-      // affect keyboard.
-      : FlutterWindowsView(
-            std::make_unique<::testing::NiceMock<MockWindowBindingHandler>>()),
-        get_keyboard_state_(std::move(get_keyboard_state)),
-        map_vk_to_scan_(std::move(map_vk_to_scan)),
-        on_text_(std::move(on_text)) {}
-
-  void OnText(const std::u16string& text) override { on_text_(text); }
-
-  void HandleMessage(const char* channel,
-                     const char* method,
-                     const char* args) {
-    rapidjson::Document args_doc;
-    args_doc.Parse(args);
-    assert(!args_doc.HasParseError());
-
-    rapidjson::Document message_doc(rapidjson::kObjectType);
-    auto& allocator = message_doc.GetAllocator();
-    message_doc.AddMember("method", rapidjson::Value(method, allocator),
-                          allocator);
-    message_doc.AddMember("args", args_doc, allocator);
-
-    rapidjson::StringBuffer buffer;
-    rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
-    message_doc.Accept(writer);
-
-    std::unique_ptr<std::vector<uint8_t>> data =
-        JsonMessageCodec::GetInstance().EncodeMessage(message_doc);
-    FlutterPlatformMessageResponseHandle response_handle;
-    const FlutterPlatformMessage message = {
-        sizeof(FlutterPlatformMessage),  // struct_size
-        channel,                         // channel
-        data->data(),                    // message
-        data->size(),                    // message_size
-        &response_handle,                // response_handle
-    };
-    GetEngine()->HandlePlatformMessage(&message);
-  }
-
- protected:
-  std::unique_ptr<KeyboardHandlerBase> CreateKeyboardKeyHandler(
-      BinaryMessenger* messenger,
-      KeyboardKeyEmbedderHandler::GetKeyStateHandler get_key_state,
-      KeyboardKeyEmbedderHandler::MapVirtualKeyToScanCode map_vk_to_scan)
-      override {
-    return FlutterWindowsView::CreateKeyboardKeyHandler(
-        messenger,
-        [this](int virtual_key) { return get_keyboard_state_(virtual_key); },
-        [this](int virtual_key, bool extended) {
-          return map_vk_to_scan_(virtual_key, extended);
-        });
-  }
 
- private:
-  U16StringHandler on_text_;
-  KeyboardKeyEmbedderHandler::GetKeyStateHandler get_keyboard_state_;
-  KeyboardKeyEmbedderHandler::MapVirtualKeyToScanCode map_vk_to_scan_;
+  FML_DISALLOW_COPY_AND_ASSIGN(MockKeyboardManagerDelegate);
 };
 
 typedef struct {
@@ -395,56 +333,48 @@ typedef struct {
   std::string text_method_call;  // For kKeyCallTextMethodCall
 } KeyCall;
 
-static std::vector<KeyCall> key_calls;
-
-void clear_key_calls() {
-  for (KeyCall& key_call : key_calls) {
-    if (key_call.type == KeyCall::kKeyCallOnKey &&
-        key_call.key_event.character != nullptr) {
-      delete[] key_call.key_event.character;
-    }
+// A FlutterWindowsView that spies on text.
+class TestFlutterWindowsView : public FlutterWindowsView {
+ public:
+  TestFlutterWindowsView(FlutterWindowsEngine* engine,
+                         std::unique_ptr<WindowBindingHandler> window,
+                         std::function<void(KeyCall)> on_key_call)
+      : on_key_call_(on_key_call),
+        FlutterWindowsView(kImplicitViewId, engine, std::move(window)) {}
+
+  void OnText(const std::u16string& text) override {
+    on_key_call_(KeyCall{
+        .type = KeyCall::kKeyCallOnText,
+        .text = text,
+    });
   }
-  key_calls.clear();
-}
+
+ private:
+  std::function<void(KeyCall)> on_key_call_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(TestFlutterWindowsView);
+};
 
 class KeyboardTester {
  public:
   using ResponseHandler =
       std::function<void(MockKeyResponseController::ResponseCallback)>;
 
-  explicit KeyboardTester()
+  explicit KeyboardTester(WindowsTestContext& context)
       : callback_handler_(RespondValue(false)),
         map_virtual_key_layout_(LayoutDefault) {
+    engine_ = GetTestEngine(context);
     view_ = std::make_unique<TestFlutterWindowsView>(
-        [](const std::u16string& text) {
-          key_calls.push_back(KeyCall{
-              .type = KeyCall::kKeyCallOnText,
-              .text = text,
-          });
-        },
-        [this](int virtual_key) -> SHORT {
-          // `window_` is not initialized yet when this callback is first
-          // called.
-          return window_ ? window_->GetKeyState(virtual_key) : 0;
-        },
-        [this](UINT virtual_key, bool extended) -> SHORT {
-          return map_virtual_key_layout_(
-              virtual_key, extended ? MAPVK_VK_TO_VSC_EX : MAPVK_VK_TO_VSC);
-        });
-    view_->SetEngine(GetTestEngine(
-        [&callback_handler = callback_handler_](
-            const FlutterKeyEvent* event,
-            MockKeyResponseController::ResponseCallback callback) {
-          FlutterKeyEvent clone_event = *event;
-          clone_event.character = event->character == nullptr
-                                      ? nullptr
-                                      : clone_string(event->character);
-          key_calls.push_back(KeyCall{
-              .type = KeyCall::kKeyCallOnKey,
-              .key_event = clone_event,
-          });
-          callback_handler(event, callback);
-        }));
+        engine_.get(),
+        // The WindowBindingHandler is used for window size and such, and
+        // doesn't affect keyboard.
+        std::make_unique<::testing::NiceMock<MockWindowBindingHandler>>(),
+        [this](KeyCall key_call) { key_calls.push_back(key_call); });
+
+    EngineModifier modifier{engine_.get()};
+    modifier.SetImplicitView(view_.get());
+    modifier.InitializeKeyboard();
+
     window_ = std::make_unique<MockKeyboardManagerDelegate>(
         view_.get(), [this](UINT virtual_key) -> SHORT {
           return map_virtual_key_layout_(virtual_key, MAPVK_VK_TO_CHAR);
@@ -454,6 +384,9 @@ class KeyboardTester {
   TestFlutterWindowsView& GetView() { return *view_; }
   MockKeyboardManagerDelegate& GetWindow() { return *window_; }
 
+  // Reset the keyboard by invoking the engine restart handler.
+  void ResetKeyboard() { EngineModifier{engine_.get()}.Restart(); }
+
   // Set all events to be handled (true) or unhandled (false).
   void Responding(bool response) { callback_handler_ = RespondValue(response); }
 
@@ -473,8 +406,39 @@ class KeyboardTester {
   }
 
   void InjectKeyboardChanges(std::vector<KeyboardChange> changes) {
-    assert(window_ != nullptr);
-    window_->InjectKeyboardChanges(changes);
+    FML_DCHECK(window_ != nullptr);
+    window_->InjectKeyboardChanges(std::move(changes));
+  }
+
+  // Simulates receiving a platform message from the framework.
+  void InjectPlatformMessage(const char* channel,
+                             const char* method,
+                             const char* args) {
+    rapidjson::Document args_doc;
+    args_doc.Parse(args);
+    FML_DCHECK(!args_doc.HasParseError());
+
+    rapidjson::Document message_doc(rapidjson::kObjectType);
+    auto& allocator = message_doc.GetAllocator();
+    message_doc.AddMember("method", rapidjson::Value(method, allocator),
+                          allocator);
+    message_doc.AddMember("args", args_doc, allocator);
+
+    rapidjson::StringBuffer buffer;
+    rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
+    message_doc.Accept(writer);
+
+    std::unique_ptr<std::vector<uint8_t>> data =
+        JsonMessageCodec::GetInstance().EncodeMessage(message_doc);
+    FlutterPlatformMessageResponseHandle response_handle;
+    const FlutterPlatformMessage message = {
+        sizeof(FlutterPlatformMessage),  // struct_size
+        channel,                         // channel
+        data->data(),                    // message
+        data->size(),                    // message_size
+        &response_handle,                // response_handle
+    };
+    view_->GetEngine()->HandlePlatformMessage(&message);
   }
 
   // Get the number of redispatched messages since the last clear, then clear
@@ -486,7 +450,20 @@ class KeyboardTester {
     return count;
   }
 
+  void clear_key_calls() {
+    for (KeyCall& key_call : key_calls) {
+      if (key_call.type == KeyCall::kKeyCallOnKey &&
+          key_call.key_event.character != nullptr) {
+        delete[] key_call.key_event.character;
+      }
+    }
+    key_calls.clear();
+  }
+
+  std::vector<KeyCall> key_calls;
+
  private:
+  std::unique_ptr<FlutterWindowsEngine> engine_;
   std::unique_ptr<TestFlutterWindowsView> view_;
   std::unique_ptr<MockKeyboardManagerDelegate> window_;
   MockKeyResponseController::EmbedderCallbackHandler callback_handler_;
@@ -495,24 +472,44 @@ class KeyboardTester {
   // Returns an engine instance configured with dummy project path values, and
   // overridden methods for sending platform messages, so that the engine can
   // respond as if the framework were connected.
-  static std::unique_ptr<FlutterWindowsEngine> GetTestEngine(
-      MockKeyResponseController::EmbedderCallbackHandler
-          embedder_callback_handler) {
-    FlutterDesktopEngineProperties properties = {};
-    properties.assets_path = L"C:\\foo\\flutter_assets";
-    properties.icu_data_path = L"C:\\foo\\icudtl.dat";
-    properties.aot_library_path = L"C:\\foo\\aot.so";
-    FlutterProjectBundle project(properties);
-    auto engine = std::make_unique<FlutterWindowsEngine>(project);
+  std::unique_ptr<FlutterWindowsEngine> GetTestEngine(
+      WindowsTestContext& context) {
+    FlutterWindowsEngineBuilder builder{context};
+
+    builder.SetCreateKeyboardHandlerCallbacks(
+        [this](int virtual_key) -> SHORT {
+          // `window_` is not initialized yet when this callback is first
+          // called.
+          return window_ ? window_->GetKeyState(virtual_key) : 0;
+        },
+        [this](UINT virtual_key, bool extended) -> SHORT {
+          return map_virtual_key_layout_(
+              virtual_key, extended ? MAPVK_VK_TO_VSC_EX : MAPVK_VK_TO_VSC);
+        });
+
+    auto engine = builder.Build();
 
     EngineModifier modifier(engine.get());
 
     auto key_response_controller =
         std::make_shared<MockKeyResponseController>();
     key_response_controller->SetEmbedderResponse(
-        std::move(embedder_callback_handler));
+        [&key_calls = key_calls, &callback_handler = callback_handler_](
+            const FlutterKeyEvent* event,
+            MockKeyResponseController::ResponseCallback callback) {
+          FlutterKeyEvent clone_event = *event;
+          clone_event.character = event->character == nullptr
+                                      ? nullptr
+                                      : clone_string(event->character);
+          key_calls.push_back(KeyCall{
+              .type = KeyCall::kKeyCallOnKey,
+              .key_event = clone_event,
+          });
+          callback_handler(event, callback);
+        });
     key_response_controller->SetTextInputResponse(
-        [](std::unique_ptr<rapidjson::Document> document) {
+        [&key_calls =
+             key_calls](std::unique_ptr<rapidjson::Document> document) {
           rapidjson::StringBuffer buffer;
           rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
           document->Accept(writer);
@@ -521,10 +518,10 @@ class KeyboardTester {
               .text_method_call = buffer.GetString(),
           });
         });
-
     MockEmbedderApiForKeyboard(modifier, key_response_controller);
 
     engine->Run();
+
     return engine;
   }
 
@@ -535,6 +532,18 @@ class KeyboardTester {
       callback(value);
     };
   }
+
+ private:
+  FML_DISALLOW_COPY_AND_ASSIGN(KeyboardTester);
+};
+
+class KeyboardTest : public WindowsTest {
+ public:
+  KeyboardTest() = default;
+  virtual ~KeyboardTest() = default;
+
+ private:
+  FML_DISALLOW_COPY_AND_ASSIGN(KeyboardTest);
 };
 
 }  // namespace
@@ -542,9 +551,11 @@ class KeyboardTester {
 // Define compound `expect` in macros. If they're defined in functions, the
 // stacktrace wouldn't print where the function is called in the unit tests.
 
-#define EXPECT_CALL_IS_EVENT(_key_call, ...)         \
-  EXPECT_EQ(_key_call.type, KeyCall::kKeyCallOnKey); \
-  EXPECT_EVENT_EQUALS(_key_call.key_event, __VA_ARGS__);
+#define EXPECT_CALL_IS_EVENT(_key_call, _type, _physical, _logical,    \
+                             _character, _synthesized)                 \
+  EXPECT_EQ(_key_call.type, KeyCall::kKeyCallOnKey);                   \
+  EXPECT_EVENT_EQUALS(_key_call.key_event, _type, _physical, _logical, \
+                      _character, _synthesized);
 
 #define EXPECT_CALL_IS_TEXT(_key_call, u16_string)    \
   EXPECT_EQ(_key_call.type, KeyCall::kKeyCallOnText); \
@@ -554,8 +565,8 @@ class KeyboardTester {
   EXPECT_EQ(_key_call.type, KeyCall::kKeyCallTextMethodCall);   \
   EXPECT_STREQ(_key_call.text_method_call.c_str(), json_string);
 
-TEST(KeyboardTest, LowerCaseAHandled) {
-  KeyboardTester tester;
+TEST_F(KeyboardTest, LowerCaseAHandled) {
+  KeyboardTester tester{GetContext()};
   tester.Responding(true);
 
   // US Keyboard layout
@@ -567,10 +578,10 @@ TEST(KeyboardTest, LowerCaseAHandled) {
       WmCharInfo{'a', kScanCodeKeyA, kNotExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown, kPhysicalKeyA,
-                       kLogicalKeyA, "a", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
+                       kPhysicalKeyA, kLogicalKeyA, "a", kNotSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 0);
 
   // Release A
@@ -578,15 +589,15 @@ TEST(KeyboardTest, LowerCaseAHandled) {
       WmKeyUpInfo{kVirtualKeyA, kScanCodeKeyA, kNotExtended}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp, kPhysicalKeyA,
-                       kLogicalKeyA, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
+                       kPhysicalKeyA, kLogicalKeyA, "", kNotSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 0);
 }
 
-TEST(KeyboardTest, LowerCaseAUnhandled) {
-  KeyboardTester tester;
+TEST_F(KeyboardTest, LowerCaseAUnhandled) {
+  KeyboardTester tester{GetContext()};
   tester.Responding(false);
 
   // US Keyboard layout
@@ -598,11 +609,11 @@ TEST(KeyboardTest, LowerCaseAUnhandled) {
       WmCharInfo{'a', kScanCodeKeyA, kNotExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown, kPhysicalKeyA,
-                       kLogicalKeyA, "a", kNotSynthesized);
-  EXPECT_CALL_IS_TEXT(key_calls[1], u"a");
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
+                       kPhysicalKeyA, kLogicalKeyA, "a", kNotSynthesized);
+  EXPECT_CALL_IS_TEXT(tester.key_calls[1], u"a");
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 2);
 
   // Release A
@@ -610,15 +621,15 @@ TEST(KeyboardTest, LowerCaseAUnhandled) {
       WmKeyUpInfo{kVirtualKeyA, kScanCodeKeyA, kNotExtended}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp, kPhysicalKeyA,
-                       kLogicalKeyA, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
+                       kPhysicalKeyA, kLogicalKeyA, "", kNotSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 }
 
-TEST(KeyboardTest, ArrowLeftHandled) {
-  KeyboardTester tester;
+TEST_F(KeyboardTest, ArrowLeftHandled) {
+  KeyboardTester tester{GetContext()};
   tester.Responding(true);
 
   // US Keyboard layout
@@ -628,11 +639,11 @@ TEST(KeyboardTest, ArrowLeftHandled) {
       WmKeyDownInfo{VK_LEFT, kScanCodeArrowLeft, kExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown,
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
                        kPhysicalArrowLeft, kLogicalArrowLeft, "",
                        kNotSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 0);
 
   // Release ArrowLeft
@@ -640,15 +651,16 @@ TEST(KeyboardTest, ArrowLeftHandled) {
       WmKeyUpInfo{VK_LEFT, kScanCodeArrowLeft, kExtended}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp, kPhysicalArrowLeft,
-                       kLogicalArrowLeft, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
+                       kPhysicalArrowLeft, kLogicalArrowLeft, "",
+                       kNotSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 0);
 }
 
-TEST(KeyboardTest, ArrowLeftUnhandled) {
-  KeyboardTester tester;
+TEST_F(KeyboardTest, ArrowLeftUnhandled) {
+  KeyboardTester tester{GetContext()};
   tester.Responding(false);
 
   // US Keyboard layout
@@ -658,11 +670,11 @@ TEST(KeyboardTest, ArrowLeftUnhandled) {
       WmKeyDownInfo{VK_LEFT, kScanCodeArrowLeft, kExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown,
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
                        kPhysicalArrowLeft, kLogicalArrowLeft, "",
                        kNotSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   // Release ArrowLeft
@@ -670,15 +682,16 @@ TEST(KeyboardTest, ArrowLeftUnhandled) {
       WmKeyUpInfo{VK_LEFT, kScanCodeArrowLeft, kExtended}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp, kPhysicalArrowLeft,
-                       kLogicalArrowLeft, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
+                       kPhysicalArrowLeft, kLogicalArrowLeft, "",
+                       kNotSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 }
 
-TEST(KeyboardTest, ShiftLeftUnhandled) {
-  KeyboardTester tester;
+TEST_F(KeyboardTest, ShiftLeftUnhandled) {
+  KeyboardTester tester{GetContext()};
   tester.Responding(false);
 
   // US Keyboard layout
@@ -689,11 +702,11 @@ TEST(KeyboardTest, ShiftLeftUnhandled) {
       WmKeyDownInfo{VK_SHIFT, kScanCodeShiftLeft, kNotExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown,
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
                        kPhysicalShiftLeft, kLogicalShiftLeft, "",
                        kNotSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   // Hold ShiftLeft
@@ -701,11 +714,11 @@ TEST(KeyboardTest, ShiftLeftUnhandled) {
       WmKeyDownInfo{VK_SHIFT, kScanCodeShiftLeft, kNotExtended, kWasDown}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeRepeat,
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeRepeat,
                        kPhysicalShiftLeft, kLogicalShiftLeft, "",
                        kNotSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   // Release ShiftLeft
@@ -714,15 +727,16 @@ TEST(KeyboardTest, ShiftLeftUnhandled) {
       WmKeyUpInfo{VK_SHIFT, kScanCodeShiftLeft, kNotExtended}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp, kPhysicalShiftLeft,
-                       kLogicalShiftLeft, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
+                       kPhysicalShiftLeft, kLogicalShiftLeft, "",
+                       kNotSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 }
 
-TEST(KeyboardTest, ShiftRightUnhandled) {
-  KeyboardTester tester;
+TEST_F(KeyboardTest, ShiftRightUnhandled) {
+  KeyboardTester tester{GetContext()};
   tester.Responding(false);
 
   // US Keyboard layout
@@ -733,11 +747,11 @@ TEST(KeyboardTest, ShiftRightUnhandled) {
       WmKeyDownInfo{VK_SHIFT, kScanCodeShiftRight, kNotExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown,
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
                        kPhysicalShiftRight, kLogicalShiftRight, "",
                        kNotSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   // Release ShiftRight
@@ -746,16 +760,16 @@ TEST(KeyboardTest, ShiftRightUnhandled) {
       WmKeyUpInfo{VK_SHIFT, kScanCodeShiftRight, kNotExtended}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp,
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
                        kPhysicalShiftRight, kLogicalShiftRight, "",
                        kNotSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 }
 
-TEST(KeyboardTest, CtrlLeftUnhandled) {
-  KeyboardTester tester;
+TEST_F(KeyboardTest, CtrlLeftUnhandled) {
+  KeyboardTester tester{GetContext()};
   tester.Responding(false);
 
   // US Keyboard layout
@@ -766,11 +780,11 @@ TEST(KeyboardTest, CtrlLeftUnhandled) {
       WmKeyDownInfo{VK_CONTROL, kScanCodeControl, kNotExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown,
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
                        kPhysicalControlLeft, kLogicalControlLeft, "",
                        kNotSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   // Release CtrlLeft
@@ -779,16 +793,16 @@ TEST(KeyboardTest, CtrlLeftUnhandled) {
       WmKeyUpInfo{VK_SHIFT, kScanCodeControl, kNotExtended}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp,
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
                        kPhysicalControlLeft, kLogicalControlLeft, "",
                        kNotSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 }
 
-TEST(KeyboardTest, CtrlRightUnhandled) {
-  KeyboardTester tester;
+TEST_F(KeyboardTest, CtrlRightUnhandled) {
+  KeyboardTester tester{GetContext()};
   tester.Responding(false);
 
   // US Keyboard layout
@@ -799,11 +813,11 @@ TEST(KeyboardTest, CtrlRightUnhandled) {
       WmKeyDownInfo{VK_CONTROL, kScanCodeControl, kExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown,
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
                        kPhysicalControlRight, kLogicalControlRight, "",
                        kNotSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   // Release CtrlRight
@@ -812,16 +826,16 @@ TEST(KeyboardTest, CtrlRightUnhandled) {
       WmKeyUpInfo{VK_CONTROL, kScanCodeControl, kExtended}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp,
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
                        kPhysicalControlRight, kLogicalControlRight, "",
                        kNotSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 }
 
-TEST(KeyboardTest, AltLeftUnhandled) {
-  KeyboardTester tester;
+TEST_F(KeyboardTest, AltLeftUnhandled) {
+  KeyboardTester tester{GetContext()};
   tester.Responding(false);
 
   // US Keyboard layout
@@ -832,10 +846,10 @@ TEST(KeyboardTest, AltLeftUnhandled) {
       WmSysKeyDownInfo{VK_MENU, kScanCodeAlt, kNotExtended, kWasUp}.Build(
           kWmResultDefault)});  // Always pass to the default WndProc.
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown, kPhysicalAltLeft,
-                       kLogicalAltLeft, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
+                       kPhysicalAltLeft, kLogicalAltLeft, "", kNotSynthesized);
+  tester.clear_key_calls();
   // Don't redispatch sys messages.
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 0);
 
@@ -845,16 +859,16 @@ TEST(KeyboardTest, AltLeftUnhandled) {
       WmSysKeyUpInfo{VK_MENU, kScanCodeAlt, kNotExtended}.Build(
           kWmResultDefault)});  // Always pass to the default WndProc.
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp, kPhysicalAltLeft,
-                       kLogicalAltLeft, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
+                       kPhysicalAltLeft, kLogicalAltLeft, "", kNotSynthesized);
+  tester.clear_key_calls();
   // Don't redispatch sys messages.
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 0);
 }
 
-TEST(KeyboardTest, AltRightUnhandled) {
-  KeyboardTester tester;
+TEST_F(KeyboardTest, AltRightUnhandled) {
+  KeyboardTester tester{GetContext()};
   tester.Responding(false);
 
   // US Keyboard layout
@@ -865,11 +879,11 @@ TEST(KeyboardTest, AltRightUnhandled) {
       WmSysKeyDownInfo{VK_MENU, kScanCodeAlt, kExtended, kWasUp}.Build(
           kWmResultDefault)});  // Always pass to the default WndProc.
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown,
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
                        kPhysicalAltRight, kLogicalAltRight, "",
                        kNotSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   // Don't redispatch sys messages.
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 0);
 
@@ -879,16 +893,17 @@ TEST(KeyboardTest, AltRightUnhandled) {
       WmSysKeyUpInfo{VK_MENU, kScanCodeAlt, kExtended}.Build(
           kWmResultDefault)});  // Always pass to the default WndProc.
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp, kPhysicalAltRight,
-                       kLogicalAltRight, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
+                       kPhysicalAltRight, kLogicalAltRight, "",
+                       kNotSynthesized);
+  tester.clear_key_calls();
   // Don't redispatch sys messages.
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 0);
 }
 
-TEST(KeyboardTest, MetaLeftUnhandled) {
-  KeyboardTester tester;
+TEST_F(KeyboardTest, MetaLeftUnhandled) {
+  KeyboardTester tester{GetContext()};
   tester.Responding(false);
 
   // US Keyboard layout
@@ -899,11 +914,11 @@ TEST(KeyboardTest, MetaLeftUnhandled) {
       WmKeyDownInfo{VK_LWIN, kScanCodeMetaLeft, kExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown,
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
                        kPhysicalMetaLeft, kLogicalMetaLeft, "",
                        kNotSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   // Release MetaLeft
@@ -911,15 +926,16 @@ TEST(KeyboardTest, MetaLeftUnhandled) {
       KeyStateChange{VK_LWIN, false, true},
       WmKeyUpInfo{VK_LWIN, kScanCodeMetaLeft, kExtended}.Build(kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp, kPhysicalMetaLeft,
-                       kLogicalMetaLeft, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
+                       kPhysicalMetaLeft, kLogicalMetaLeft, "",
+                       kNotSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 }
 
-TEST(KeyboardTest, MetaRightUnhandled) {
-  KeyboardTester tester;
+TEST_F(KeyboardTest, MetaRightUnhandled) {
+  KeyboardTester tester{GetContext()};
   tester.Responding(false);
 
   // US Keyboard layout
@@ -930,11 +946,11 @@ TEST(KeyboardTest, MetaRightUnhandled) {
       WmKeyDownInfo{VK_RWIN, kScanCodeMetaRight, kExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown,
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
                        kPhysicalMetaRight, kLogicalMetaRight, "",
                        kNotSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   // Release MetaRight
@@ -943,17 +959,78 @@ TEST(KeyboardTest, MetaRightUnhandled) {
       WmKeyUpInfo{VK_RWIN, kScanCodeMetaRight, kExtended}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp, kPhysicalMetaRight,
-                       kLogicalMetaRight, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
+                       kPhysicalMetaRight, kLogicalMetaRight, "",
+                       kNotSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 }
 
+// Press and hold A. This should generate a repeat event.
+TEST_F(KeyboardTest, RepeatA) {
+  KeyboardTester tester{GetContext()};
+  tester.Responding(true);
+
+  // Press A
+  tester.InjectKeyboardChanges(std::vector<KeyboardChange>{
+      WmKeyDownInfo{kVirtualKeyA, kScanCodeKeyA, kNotExtended, kWasUp}.Build(
+          kWmResultZero),
+      WmCharInfo{'a', kScanCodeKeyA, kNotExtended, kWasUp}.Build(
+          kWmResultZero)});
+
+  // Hold A
+  tester.InjectKeyboardChanges(std::vector<KeyboardChange>{
+      WmKeyDownInfo{kVirtualKeyA, kScanCodeKeyA, kNotExtended, kWasDown}.Build(
+          kWmResultZero),
+      WmCharInfo{'a', kScanCodeKeyA, kNotExtended, kWasDown}.Build(
+          kWmResultZero)});
+
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
+                       kPhysicalKeyA, kLogicalKeyA, "a", kNotSynthesized);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[1], kFlutterKeyEventTypeRepeat,
+                       kPhysicalKeyA, kLogicalKeyA, "a", kNotSynthesized);
+  EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 0);
+}
+
+// Press A, hot restart the engine, and hold A.
+// This should reset the keyboard's state and generate
+// two separate key down events.
+TEST_F(KeyboardTest, RestartClearsKeyboardState) {
+  KeyboardTester tester{GetContext()};
+  tester.Responding(true);
+
+  // Press A
+  tester.InjectKeyboardChanges(std::vector<KeyboardChange>{
+      WmKeyDownInfo{kVirtualKeyA, kScanCodeKeyA, kNotExtended, kWasUp}.Build(
+          kWmResultZero),
+      WmCharInfo{'a', kScanCodeKeyA, kNotExtended, kWasUp}.Build(
+          kWmResultZero)});
+
+  // Reset the keyboard's state.
+  tester.ResetKeyboard();
+
+  // Hold A. Notice the message declares the key is already down, however, the
+  // the keyboard does not send a repeat event as its state was reset.
+  tester.InjectKeyboardChanges(std::vector<KeyboardChange>{
+      WmKeyDownInfo{kVirtualKeyA, kScanCodeKeyA, kNotExtended, kWasDown}.Build(
+          kWmResultZero),
+      WmCharInfo{'a', kScanCodeKeyA, kNotExtended, kWasDown}.Build(
+          kWmResultZero)});
+
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
+                       kPhysicalKeyA, kLogicalKeyA, "a", kNotSynthesized);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[1], kFlutterKeyEventTypeDown,
+                       kPhysicalKeyA, kLogicalKeyA, "a", kNotSynthesized);
+  EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 0);
+}
+
 // Press Shift-A. This is special because Win32 gives 'A' as character for the
 // KeyA press.
-TEST(KeyboardTest, ShiftLeftKeyA) {
-  KeyboardTester tester;
+TEST_F(KeyboardTest, ShiftLeftKeyA) {
+  KeyboardTester tester{GetContext()};
   tester.Responding(false);
 
   // US Keyboard layout
@@ -964,11 +1041,11 @@ TEST(KeyboardTest, ShiftLeftKeyA) {
       WmKeyDownInfo{VK_SHIFT, kScanCodeShiftLeft, kNotExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown,
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
                        kPhysicalShiftLeft, kLogicalShiftLeft, "",
                        kNotSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   // Press A
@@ -978,11 +1055,11 @@ TEST(KeyboardTest, ShiftLeftKeyA) {
       WmCharInfo{'A', kScanCodeKeyA, kNotExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown, kPhysicalKeyA,
-                       kLogicalKeyA, "A", kNotSynthesized);
-  EXPECT_CALL_IS_TEXT(key_calls[1], u"A");
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
+                       kPhysicalKeyA, kLogicalKeyA, "A", kNotSynthesized);
+  EXPECT_CALL_IS_TEXT(tester.key_calls[1], u"A");
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 2);
 
   // Release ShiftLeft
@@ -991,10 +1068,11 @@ TEST(KeyboardTest, ShiftLeftKeyA) {
       WmKeyUpInfo{VK_SHIFT, kScanCodeShiftLeft, kNotExtended}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp, kPhysicalShiftLeft,
-                       kLogicalShiftLeft, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
+                       kPhysicalShiftLeft, kLogicalShiftLeft, "",
+                       kNotSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   // Release A
@@ -1002,17 +1080,17 @@ TEST(KeyboardTest, ShiftLeftKeyA) {
       WmKeyUpInfo{kVirtualKeyA, kScanCodeKeyA, kNotExtended}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp, kPhysicalKeyA,
-                       kLogicalKeyA, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
+                       kPhysicalKeyA, kLogicalKeyA, "", kNotSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 }
 
 // Press Ctrl-A. This is special because Win32 gives 0x01 as character for the
 // KeyA press.
-TEST(KeyboardTest, CtrlLeftKeyA) {
-  KeyboardTester tester;
+TEST_F(KeyboardTest, CtrlLeftKeyA) {
+  KeyboardTester tester{GetContext()};
   tester.Responding(false);
 
   // US Keyboard layout
@@ -1023,11 +1101,11 @@ TEST(KeyboardTest, CtrlLeftKeyA) {
       WmKeyDownInfo{VK_CONTROL, kScanCodeControl, kNotExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown,
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
                        kPhysicalControlLeft, kLogicalControlLeft, "",
                        kNotSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   // Press A
@@ -1037,10 +1115,10 @@ TEST(KeyboardTest, CtrlLeftKeyA) {
       WmCharInfo{0x01, kScanCodeKeyA, kNotExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown, kPhysicalKeyA,
-                       kLogicalKeyA, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
+                       kPhysicalKeyA, kLogicalKeyA, "", kNotSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 2);
 
   // Release A
@@ -1048,10 +1126,10 @@ TEST(KeyboardTest, CtrlLeftKeyA) {
       WmKeyUpInfo{kVirtualKeyA, kScanCodeKeyA, kNotExtended}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp, kPhysicalKeyA,
-                       kLogicalKeyA, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
+                       kPhysicalKeyA, kLogicalKeyA, "", kNotSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   // Release ControlLeft
@@ -1060,17 +1138,17 @@ TEST(KeyboardTest, CtrlLeftKeyA) {
       WmKeyUpInfo{VK_CONTROL, kScanCodeControl, kNotExtended}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp,
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
                        kPhysicalControlLeft, kLogicalControlLeft, "",
                        kNotSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 }
 
 // Press Ctrl-1. This is special because it yields no WM_CHAR for the 1.
-TEST(KeyboardTest, CtrlLeftDigit1) {
-  KeyboardTester tester;
+TEST_F(KeyboardTest, CtrlLeftDigit1) {
+  KeyboardTester tester{GetContext()};
   tester.Responding(false);
 
   // US Keyboard layout
@@ -1081,11 +1159,11 @@ TEST(KeyboardTest, CtrlLeftDigit1) {
       WmKeyDownInfo{VK_CONTROL, kScanCodeControl, kNotExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown,
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
                        kPhysicalControlLeft, kLogicalControlLeft, "",
                        kNotSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   // Press 1
@@ -1093,10 +1171,10 @@ TEST(KeyboardTest, CtrlLeftDigit1) {
       WmKeyDownInfo{kVirtualDigit1, kScanCodeDigit1, kNotExtended, kWasUp}
           .Build(kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown, kPhysicalDigit1,
-                       kLogicalDigit1, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
+                       kPhysicalDigit1, kLogicalDigit1, "", kNotSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   // Release 1
@@ -1104,10 +1182,10 @@ TEST(KeyboardTest, CtrlLeftDigit1) {
       WmKeyUpInfo{kVirtualDigit1, kScanCodeDigit1, kNotExtended}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp, kPhysicalDigit1,
-                       kLogicalDigit1, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
+                       kPhysicalDigit1, kLogicalDigit1, "", kNotSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   // Release ControlLeft
@@ -1116,18 +1194,18 @@ TEST(KeyboardTest, CtrlLeftDigit1) {
       WmKeyUpInfo{VK_CONTROL, kScanCodeControl, kNotExtended}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp,
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
                        kPhysicalControlLeft, kLogicalControlLeft, "",
                        kNotSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 }
 
 // Press 1 on a French keyboard. This is special because it yields WM_CHAR
 // with char_code '&'.
-TEST(KeyboardTest, Digit1OnFrenchLayout) {
-  KeyboardTester tester;
+TEST_F(KeyboardTest, Digit1OnFrenchLayout) {
+  KeyboardTester tester{GetContext()};
   tester.Responding(false);
 
   tester.SetLayout(LayoutFrench);
@@ -1139,11 +1217,11 @@ TEST(KeyboardTest, Digit1OnFrenchLayout) {
       WmCharInfo{'&', kScanCodeDigit1, kNotExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown, kPhysicalDigit1,
-                       kLogicalDigit1, "&", kNotSynthesized);
-  EXPECT_CALL_IS_TEXT(key_calls[1], u"&");
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
+                       kPhysicalDigit1, kLogicalDigit1, "&", kNotSynthesized);
+  EXPECT_CALL_IS_TEXT(tester.key_calls[1], u"&");
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 2);
 
   // Release 1
@@ -1151,16 +1229,16 @@ TEST(KeyboardTest, Digit1OnFrenchLayout) {
       WmKeyUpInfo{kVirtualDigit1, kScanCodeDigit1, kNotExtended}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp, kPhysicalDigit1,
-                       kLogicalDigit1, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
+                       kPhysicalDigit1, kLogicalDigit1, "", kNotSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 }
 
 // This tests AltGr-Q on a German keyboard, which should print '@'.
-TEST(KeyboardTest, AltGrModifiedKey) {
-  KeyboardTester tester;
+TEST_F(KeyboardTest, AltGrModifiedKey) {
+  KeyboardTester tester{GetContext()};
   tester.Responding(false);
 
   // German Keyboard layout
@@ -1174,14 +1252,14 @@ TEST(KeyboardTest, AltGrModifiedKey) {
       WmKeyDownInfo{VK_MENU, kScanCodeAlt, kExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown,
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
                        kPhysicalControlLeft, kLogicalControlLeft, "",
                        kNotSynthesized);
-  EXPECT_CALL_IS_EVENT(key_calls[1], kFlutterKeyEventTypeDown,
+  EXPECT_CALL_IS_EVENT(tester.key_calls[1], kFlutterKeyEventTypeDown,
                        kPhysicalAltRight, kLogicalAltRight, "",
                        kNotSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 2);
 
   // Press Q
@@ -1191,11 +1269,11 @@ TEST(KeyboardTest, AltGrModifiedKey) {
       WmCharInfo{'@', kScanCodeKeyQ, kNotExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown, kPhysicalKeyQ,
-                       kLogicalKeyQ, "@", kNotSynthesized);
-  EXPECT_CALL_IS_TEXT(key_calls[1], u"@");
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
+                       kPhysicalKeyQ, kLogicalKeyQ, "@", kNotSynthesized);
+  EXPECT_CALL_IS_TEXT(tester.key_calls[1], u"@");
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 2);
 
   // Release Q
@@ -1203,10 +1281,10 @@ TEST(KeyboardTest, AltGrModifiedKey) {
       WmKeyUpInfo{kVirtualKeyQ, kScanCodeKeyQ, kNotExtended}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp, kPhysicalKeyQ,
-                       kLogicalKeyQ, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
+                       kPhysicalKeyQ, kLogicalKeyQ, "", kNotSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   // Release AltGr. Win32 doesn't dispatch ControlLeft up. Instead Flutter will
@@ -1221,13 +1299,14 @@ TEST(KeyboardTest, AltGrModifiedKey) {
       WmSysKeyUpInfo{VK_MENU, kScanCodeAlt, kExtended}.Build(
           kWmResultDefault)});
 
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp,
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
                        kPhysicalControlLeft, kLogicalControlLeft, "",
                        kNotSynthesized);
-  EXPECT_CALL_IS_EVENT(key_calls[1], kFlutterKeyEventTypeUp, kPhysicalAltRight,
-                       kLogicalAltRight, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_CALL_IS_EVENT(tester.key_calls[1], kFlutterKeyEventTypeUp,
+                       kPhysicalAltRight, kLogicalAltRight, "",
+                       kNotSynthesized);
+  tester.clear_key_calls();
   // The sys key up must not be redispatched. The forged ControlLeft up will.
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 }
@@ -1245,8 +1324,8 @@ TEST(KeyboardTest, AltGrModifiedKey) {
 //
 // This is because pressing AltGr alone causes Win32 to send a fake "CtrlLeft
 // down" event first (see |IsKeyDownAltRight| for detailed explanation).
-TEST(KeyboardTest, AltGrTwice) {
-  KeyboardTester tester;
+TEST_F(KeyboardTest, AltGrTwice) {
+  KeyboardTester tester{GetContext()};
   tester.Responding(false);
 
   // 1. AltGr down.
@@ -1261,14 +1340,14 @@ TEST(KeyboardTest, AltGrTwice) {
       WmKeyDownInfo{VK_MENU, kScanCodeAlt, kExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown,
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
                        kPhysicalControlLeft, kLogicalControlLeft, "",
                        kNotSynthesized);
-  EXPECT_CALL_IS_EVENT(key_calls[1], kFlutterKeyEventTypeDown,
+  EXPECT_CALL_IS_EVENT(tester.key_calls[1], kFlutterKeyEventTypeDown,
                        kPhysicalAltRight, kLogicalAltRight, "",
                        kNotSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 2);
 
   // 2. AltGr up.
@@ -1282,13 +1361,14 @@ TEST(KeyboardTest, AltGrTwice) {
       KeyStateChange{VK_RMENU, false, true},
       WmSysKeyUpInfo{VK_MENU, kScanCodeAlt, kExtended}.Build(
           kWmResultDefault)});
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp,
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
                        kPhysicalControlLeft, kLogicalControlLeft, "",
                        kNotSynthesized);
-  EXPECT_CALL_IS_EVENT(key_calls[1], kFlutterKeyEventTypeUp, kPhysicalAltRight,
-                       kLogicalAltRight, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_CALL_IS_EVENT(tester.key_calls[1], kFlutterKeyEventTypeUp,
+                       kPhysicalAltRight, kLogicalAltRight, "",
+                       kNotSynthesized);
+  tester.clear_key_calls();
   // The sys key up must not be redispatched. The forged ControlLeft up will.
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
@@ -1302,14 +1382,14 @@ TEST(KeyboardTest, AltGrTwice) {
       WmKeyDownInfo{VK_MENU, kScanCodeAlt, kExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown,
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
                        kPhysicalControlLeft, kLogicalControlLeft, "",
                        kNotSynthesized);
-  EXPECT_CALL_IS_EVENT(key_calls[1], kFlutterKeyEventTypeDown,
+  EXPECT_CALL_IS_EVENT(tester.key_calls[1], kFlutterKeyEventTypeDown,
                        kPhysicalAltRight, kLogicalAltRight, "",
                        kNotSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 2);
 
   // 4. AltGr up.
@@ -1323,13 +1403,14 @@ TEST(KeyboardTest, AltGrTwice) {
       KeyStateChange{VK_RMENU, false, false},
       WmSysKeyUpInfo{VK_MENU, kScanCodeAlt, kExtended}.Build(
           kWmResultDefault)});
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp,
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
                        kPhysicalControlLeft, kLogicalControlLeft, "",
                        kNotSynthesized);
-  EXPECT_CALL_IS_EVENT(key_calls[1], kFlutterKeyEventTypeUp, kPhysicalAltRight,
-                       kLogicalAltRight, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_CALL_IS_EVENT(tester.key_calls[1], kFlutterKeyEventTypeUp,
+                       kPhysicalAltRight, kLogicalAltRight, "",
+                       kNotSynthesized);
+  tester.clear_key_calls();
   // The sys key up must not be redispatched. The forged ControlLeft up will.
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
@@ -1337,17 +1418,17 @@ TEST(KeyboardTest, AltGrTwice) {
   tester.InjectKeyboardChanges(std::vector<KeyboardChange>{
       WmKeyUpInfo{VK_CONTROL, kScanCodeControl, kNotExtended}.Build(
           kWmResultZero)});
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown, 0, 0, "",
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown, 0, 0, "",
                        kNotSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 0);
 }
 
 // This tests dead key ^ then E on a French keyboard, which should be combined
 // into ê.
-TEST(KeyboardTest, DeadKeyThatCombines) {
-  KeyboardTester tester;
+TEST_F(KeyboardTest, DeadKeyThatCombines) {
+  KeyboardTester tester{GetContext()};
   tester.Responding(false);
 
   tester.SetLayout(LayoutFrench);
@@ -1359,11 +1440,11 @@ TEST(KeyboardTest, DeadKeyThatCombines) {
       WmDeadCharInfo{'^', kScanCodeBracketLeft, kNotExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown,
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
                        kPhysicalBracketLeft, kLogicalBracketRight, "^",
                        kNotSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 2);
 
   // Release ^¨
@@ -1371,11 +1452,11 @@ TEST(KeyboardTest, DeadKeyThatCombines) {
       WmKeyUpInfo{0xDD, kScanCodeBracketLeft, kNotExtended}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp,
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
                        kPhysicalBracketLeft, kLogicalBracketRight, "",
                        kNotSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   // Press E
@@ -1385,11 +1466,11 @@ TEST(KeyboardTest, DeadKeyThatCombines) {
       WmCharInfo{0xEA, kScanCodeKeyE, kNotExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown, kPhysicalKeyE,
-                       kLogicalKeyE, "ê", kNotSynthesized);
-  EXPECT_CALL_IS_TEXT(key_calls[1], u"ê");
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
+                       kPhysicalKeyE, kLogicalKeyE, "ê", kNotSynthesized);
+  EXPECT_CALL_IS_TEXT(tester.key_calls[1], u"ê");
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 2);
 
   // Release E
@@ -1397,10 +1478,10 @@ TEST(KeyboardTest, DeadKeyThatCombines) {
       WmKeyUpInfo{kVirtualKeyE, kScanCodeKeyE, kNotExtended}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp, kPhysicalKeyE,
-                       kLogicalKeyE, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
+                       kPhysicalKeyE, kLogicalKeyE, "", kNotSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 }
 
@@ -1409,8 +1490,8 @@ TEST(KeyboardTest, DeadKeyThatCombines) {
 //
 // It is different from French AZERTY because the character that the ^ key is
 // mapped to does not contain the dead key character somehow.
-TEST(KeyboardTest, DeadKeyWithoutDeadMaskThatCombines) {
-  KeyboardTester tester;
+TEST_F(KeyboardTest, DeadKeyWithoutDeadMaskThatCombines) {
+  KeyboardTester tester{GetContext()};
   tester.Responding(false);
 
   // Press ShiftLeft
@@ -1419,11 +1500,11 @@ TEST(KeyboardTest, DeadKeyWithoutDeadMaskThatCombines) {
       WmKeyDownInfo{VK_SHIFT, kScanCodeShiftLeft, kNotExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown,
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
                        kPhysicalShiftLeft, kLogicalShiftLeft, "",
                        kNotSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   // Press 6^
@@ -1433,20 +1514,20 @@ TEST(KeyboardTest, DeadKeyWithoutDeadMaskThatCombines) {
       WmDeadCharInfo{'^', kScanCodeDigit6, kNotExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown, kPhysicalDigit6,
-                       kLogicalDigit6, "6", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
+                       kPhysicalDigit6, kLogicalDigit6, "6", kNotSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 2);
 
   // Release 6^
   tester.InjectKeyboardChanges(std::vector<KeyboardChange>{
       WmKeyUpInfo{'6', kScanCodeDigit6, kNotExtended}.Build(kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp, kPhysicalDigit6,
-                       kLogicalDigit6, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
+                       kPhysicalDigit6, kLogicalDigit6, "", kNotSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   // Release ShiftLeft
@@ -1455,10 +1536,11 @@ TEST(KeyboardTest, DeadKeyWithoutDeadMaskThatCombines) {
       WmKeyUpInfo{VK_SHIFT, kScanCodeShiftLeft, kNotExtended}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp, kPhysicalShiftLeft,
-                       kLogicalShiftLeft, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
+                       kPhysicalShiftLeft, kLogicalShiftLeft, "",
+                       kNotSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   // Press E
@@ -1468,11 +1550,11 @@ TEST(KeyboardTest, DeadKeyWithoutDeadMaskThatCombines) {
       WmCharInfo{0xEA, kScanCodeKeyE, kNotExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown, kPhysicalKeyE,
-                       kLogicalKeyE, "ê", kNotSynthesized);
-  EXPECT_CALL_IS_TEXT(key_calls[1], u"ê");
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
+                       kPhysicalKeyE, kLogicalKeyE, "ê", kNotSynthesized);
+  EXPECT_CALL_IS_TEXT(tester.key_calls[1], u"ê");
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 2);
 
   // Release E
@@ -1480,17 +1562,17 @@ TEST(KeyboardTest, DeadKeyWithoutDeadMaskThatCombines) {
       WmKeyUpInfo{kVirtualKeyE, kScanCodeKeyE, kNotExtended}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp, kPhysicalKeyE,
-                       kLogicalKeyE, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
+                       kPhysicalKeyE, kLogicalKeyE, "", kNotSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 }
 
 // This tests dead key ^ then & (US: 1) on a French keyboard, which do not
 // combine and should output "^&".
-TEST(KeyboardTest, DeadKeyThatDoesNotCombine) {
-  KeyboardTester tester;
+TEST_F(KeyboardTest, DeadKeyThatDoesNotCombine) {
+  KeyboardTester tester{GetContext()};
   tester.Responding(false);
 
   tester.SetLayout(LayoutFrench);
@@ -1502,11 +1584,11 @@ TEST(KeyboardTest, DeadKeyThatDoesNotCombine) {
       WmDeadCharInfo{'^', kScanCodeBracketLeft, kNotExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown,
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
                        kPhysicalBracketLeft, kLogicalBracketRight, "^",
                        kNotSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 2);
 
   // Release ^¨
@@ -1514,11 +1596,11 @@ TEST(KeyboardTest, DeadKeyThatDoesNotCombine) {
       WmKeyUpInfo{0xDD, kScanCodeBracketLeft, kNotExtended}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp,
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
                        kPhysicalBracketLeft, kLogicalBracketRight, "",
                        kNotSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   // Press 1
@@ -1530,12 +1612,12 @@ TEST(KeyboardTest, DeadKeyThatDoesNotCombine) {
       WmCharInfo{'&', kScanCodeDigit1, kNotExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 3);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown, kPhysicalDigit1,
-                       kLogicalDigit1, "^", kNotSynthesized);
-  EXPECT_CALL_IS_TEXT(key_calls[1], u"^");
-  EXPECT_CALL_IS_TEXT(key_calls[2], u"&");
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 3);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
+                       kPhysicalDigit1, kLogicalDigit1, "^", kNotSynthesized);
+  EXPECT_CALL_IS_TEXT(tester.key_calls[1], u"^");
+  EXPECT_CALL_IS_TEXT(tester.key_calls[2], u"&");
+  tester.clear_key_calls();
   // TODO(dkwingsmt): This count should probably be 3. Currently the '^'
   // message is redispatched due to being part of the KeyDown session, which is
   // not handled by the framework, while the '&' message is not redispatched
@@ -1548,18 +1630,18 @@ TEST(KeyboardTest, DeadKeyThatDoesNotCombine) {
       WmKeyUpInfo{kVirtualDigit1, kScanCodeDigit1, kNotExtended}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp, kPhysicalDigit1,
-                       kLogicalDigit1, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
+                       kPhysicalDigit1, kLogicalDigit1, "", kNotSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 }
 
 // This tests dead key `, then dead key `, then e.
 //
 // It should output ``e, instead of `è.
-TEST(KeyboardTest, DeadKeyTwiceThenLetter) {
-  KeyboardTester tester;
+TEST_F(KeyboardTest, DeadKeyTwiceThenLetter) {
+  KeyboardTester tester{GetContext()};
   tester.Responding(false);
 
   // US INTL layout.
@@ -1571,11 +1653,11 @@ TEST(KeyboardTest, DeadKeyTwiceThenLetter) {
       WmDeadCharInfo{'`', kScanCodeBackquote, kNotExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown,
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
                        kPhysicalBackquote, kLogicalBackquote, "`",
                        kNotSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 2);
 
   // Release `
@@ -1583,10 +1665,11 @@ TEST(KeyboardTest, DeadKeyTwiceThenLetter) {
       WmKeyUpInfo{0xC0, kScanCodeBackquote, kNotExtended}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp, kPhysicalBackquote,
-                       kLogicalBackquote, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
+                       kPhysicalBackquote, kLogicalBackquote, "",
+                       kNotSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   // Press ` again.
@@ -1609,17 +1692,17 @@ TEST(KeyboardTest, DeadKeyTwiceThenLetter) {
           kWmResultZero)});
 
   EXPECT_EQ(recorded_callbacks.size(), 1);
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown,
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
                        kPhysicalBackquote, kLogicalBackquote, "`",
                        kNotSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   // Key down event responded with false.
   recorded_callbacks.front()(false);
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_TEXT(key_calls[0], u"`");
-  EXPECT_CALL_IS_TEXT(key_calls[1], u"`");
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_TEXT(tester.key_calls[0], u"`");
+  EXPECT_CALL_IS_TEXT(tester.key_calls[1], u"`");
+  tester.clear_key_calls();
   // TODO(dkwingsmt): This count should probably be 3. See the comment above
   // that is marked with the same issue.
   // https://github.com/flutter/flutter/issues/98306
@@ -1632,16 +1715,17 @@ TEST(KeyboardTest, DeadKeyTwiceThenLetter) {
       WmKeyUpInfo{0xC0, kScanCodeBackquote, kNotExtended}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp, kPhysicalBackquote,
-                       kLogicalBackquote, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
+                       kPhysicalBackquote, kLogicalBackquote, "",
+                       kNotSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 }
 
 // This tests when the resulting character needs to be combined with surrogates.
-TEST(KeyboardTest, MultibyteCharacter) {
-  KeyboardTester tester;
+TEST_F(KeyboardTest, MultibyteCharacter) {
+  KeyboardTester tester{GetContext()};
   tester.Responding(false);
 
   // Gothic Keyboard layout. (We need a layout that yields non-BMP characters
@@ -1656,13 +1740,13 @@ TEST(KeyboardTest, MultibyteCharacter) {
       WmCharInfo{0xdf45, kScanCodeKeyW, kNotExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  const char* st = key_calls[0].key_event.character;
+  const char* st = tester.key_calls[0].key_event.character;
 
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown, kPhysicalKeyW,
-                       kLogicalKeyW, "𐍅", kNotSynthesized);
-  EXPECT_CALL_IS_TEXT(key_calls[1], u"𐍅");
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
+                       kPhysicalKeyW, kLogicalKeyW, "𐍅", kNotSynthesized);
+  EXPECT_CALL_IS_TEXT(tester.key_calls[1], u"𐍅");
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 3);
 
   // Release W
@@ -1670,15 +1754,15 @@ TEST(KeyboardTest, MultibyteCharacter) {
       WmKeyUpInfo{kVirtualKeyW, kScanCodeKeyW, kNotExtended}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp, kPhysicalKeyW,
-                       kLogicalKeyW, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
+                       kPhysicalKeyW, kLogicalKeyW, "", kNotSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 }
 
-TEST(KeyboardTest, SynthesizeModifiers) {
-  KeyboardTester tester;
+TEST_F(KeyboardTest, SynthesizeModifiers) {
+  KeyboardTester tester{GetContext()};
   tester.Responding(false);
 
   // Two dummy events used to trigger synthesization.
@@ -1692,187 +1776,187 @@ TEST(KeyboardTest, SynthesizeModifiers) {
   // ShiftLeft
   tester.InjectKeyboardChanges(std::vector<KeyboardChange>{
       KeyStateChange{VK_LSHIFT, true, true}, event1});
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown,
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
                        kPhysicalShiftLeft, kLogicalShiftLeft, "", kSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   tester.InjectKeyboardChanges(std::vector<KeyboardChange>{
       KeyStateChange{VK_LSHIFT, false, true}, event2});
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp, kPhysicalShiftLeft,
-                       kLogicalShiftLeft, "", kSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
+                       kPhysicalShiftLeft, kLogicalShiftLeft, "", kSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   // ShiftRight
   tester.InjectKeyboardChanges(std::vector<KeyboardChange>{
       KeyStateChange{VK_RSHIFT, true, true}, event1});
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown,
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
                        kPhysicalShiftRight, kLogicalShiftRight, "",
                        kSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   tester.InjectKeyboardChanges(std::vector<KeyboardChange>{
       KeyStateChange{VK_RSHIFT, false, true}, event2});
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp,
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
                        kPhysicalShiftRight, kLogicalShiftRight, "",
                        kSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   // ControlLeft
   tester.InjectKeyboardChanges(std::vector<KeyboardChange>{
       KeyStateChange{VK_LCONTROL, true, true}, event1});
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown,
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
                        kPhysicalControlLeft, kLogicalControlLeft, "",
                        kSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   tester.InjectKeyboardChanges(std::vector<KeyboardChange>{
       KeyStateChange{VK_LCONTROL, false, true}, event2});
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp,
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
                        kPhysicalControlLeft, kLogicalControlLeft, "",
                        kSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   // ControlRight
   tester.InjectKeyboardChanges(std::vector<KeyboardChange>{
       KeyStateChange{VK_RCONTROL, true, true}, event1});
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown,
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
                        kPhysicalControlRight, kLogicalControlRight, "",
                        kSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   tester.InjectKeyboardChanges(std::vector<KeyboardChange>{
       KeyStateChange{VK_RCONTROL, false, true}, event2});
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp,
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
                        kPhysicalControlRight, kLogicalControlRight, "",
                        kSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   // AltLeft
   tester.InjectKeyboardChanges(std::vector<KeyboardChange>{
       KeyStateChange{VK_LMENU, true, true}, event1});
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown, kPhysicalAltLeft,
-                       kLogicalAltLeft, "", kSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
+                       kPhysicalAltLeft, kLogicalAltLeft, "", kSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   tester.InjectKeyboardChanges(std::vector<KeyboardChange>{
       KeyStateChange{VK_LMENU, false, true}, event2});
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp, kPhysicalAltLeft,
-                       kLogicalAltLeft, "", kSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
+                       kPhysicalAltLeft, kLogicalAltLeft, "", kSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   // AltRight
   tester.InjectKeyboardChanges(std::vector<KeyboardChange>{
       KeyStateChange{VK_RMENU, true, true}, event1});
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown,
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
                        kPhysicalAltRight, kLogicalAltRight, "", kSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   tester.InjectKeyboardChanges(std::vector<KeyboardChange>{
       KeyStateChange{VK_RMENU, false, true}, event2});
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp, kPhysicalAltRight,
-                       kLogicalAltRight, "", kSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
+                       kPhysicalAltRight, kLogicalAltRight, "", kSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   // MetaLeft
   tester.InjectKeyboardChanges(
       std::vector<KeyboardChange>{KeyStateChange{VK_LWIN, true, true}, event1});
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown,
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
                        kPhysicalMetaLeft, kLogicalMetaLeft, "", kSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   tester.InjectKeyboardChanges(std::vector<KeyboardChange>{
       KeyStateChange{VK_LWIN, false, true}, event2});
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp, kPhysicalMetaLeft,
-                       kLogicalMetaLeft, "", kSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
+                       kPhysicalMetaLeft, kLogicalMetaLeft, "", kSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   // MetaRight
   tester.InjectKeyboardChanges(
       std::vector<KeyboardChange>{KeyStateChange{VK_RWIN, true, true}, event1});
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown,
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
                        kPhysicalMetaRight, kLogicalMetaRight, "", kSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   tester.InjectKeyboardChanges(std::vector<KeyboardChange>{
       KeyStateChange{VK_RWIN, false, true}, event2});
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp, kPhysicalMetaRight,
-                       kLogicalMetaRight, "", kSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
+                       kPhysicalMetaRight, kLogicalMetaRight, "", kSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   // CapsLock, phase 0 -> 2 -> 0.
-  // (For phases, see |SynchronizeCritialToggledStates|.)
+  // (For phases, see |SynchronizeCriticalToggledStates|.)
   tester.InjectKeyboardChanges(std::vector<KeyboardChange>{
       KeyStateChange{VK_CAPITAL, false, true}, event1});
-  EXPECT_EQ(key_calls.size(), 3);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown,
+  EXPECT_EQ(tester.key_calls.size(), 3);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
+                       kPhysicalCapsLock, kLogicalCapsLock, "", kSynthesized);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[1], kFlutterKeyEventTypeUp,
                        kPhysicalCapsLock, kLogicalCapsLock, "", kSynthesized);
-  EXPECT_CALL_IS_EVENT(key_calls[1], kFlutterKeyEventTypeUp, kPhysicalCapsLock,
-                       kLogicalCapsLock, "", kSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   tester.InjectKeyboardChanges(std::vector<KeyboardChange>{
       KeyStateChange{VK_CAPITAL, false, false}, event2});
-  EXPECT_EQ(key_calls.size(), 3);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown,
+  EXPECT_EQ(tester.key_calls.size(), 3);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
                        kPhysicalCapsLock, kLogicalCapsLock, "", kSynthesized);
-  EXPECT_CALL_IS_EVENT(key_calls[1], kFlutterKeyEventTypeUp, kPhysicalCapsLock,
-                       kLogicalCapsLock, "", kSynthesized);
-  clear_key_calls();
+  EXPECT_CALL_IS_EVENT(tester.key_calls[1], kFlutterKeyEventTypeUp,
+                       kPhysicalCapsLock, kLogicalCapsLock, "", kSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   // ScrollLock, phase 0 -> 1 -> 3
   tester.InjectKeyboardChanges(std::vector<KeyboardChange>{
       KeyStateChange{VK_SCROLL, true, true}, event1});
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown,
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
                        kPhysicalScrollLock, kLogicalScrollLock, "",
                        kSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   tester.InjectKeyboardChanges(std::vector<KeyboardChange>{
       KeyStateChange{VK_SCROLL, true, false}, event2});
-  EXPECT_EQ(key_calls.size(), 3);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp,
+  EXPECT_EQ(tester.key_calls.size(), 3);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
                        kPhysicalScrollLock, kLogicalScrollLock, "",
                        kSynthesized);
-  EXPECT_CALL_IS_EVENT(key_calls[1], kFlutterKeyEventTypeDown,
+  EXPECT_CALL_IS_EVENT(tester.key_calls[1], kFlutterKeyEventTypeDown,
                        kPhysicalScrollLock, kLogicalScrollLock, "",
                        kSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   // NumLock, phase 0 -> 3 -> 2
@@ -1882,22 +1966,22 @@ TEST(KeyboardTest, SynthesizeModifiers) {
   // tap and a key down. Fix the algorithm so that the following result becomes
   // 4 keycalls with an extra pair of key down and up.
   // https://github.com/flutter/flutter/issues/98533
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown, kPhysicalNumLock,
-                       kLogicalNumLock, "", kSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
+                       kPhysicalNumLock, kLogicalNumLock, "", kSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   tester.InjectKeyboardChanges(std::vector<KeyboardChange>{
       KeyStateChange{VK_NUMLOCK, false, true}, event2});
-  EXPECT_EQ(key_calls.size(), 4);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp, kPhysicalNumLock,
-                       kLogicalNumLock, "", kSynthesized);
-  EXPECT_CALL_IS_EVENT(key_calls[1], kFlutterKeyEventTypeDown, kPhysicalNumLock,
-                       kLogicalNumLock, "", kSynthesized);
-  EXPECT_CALL_IS_EVENT(key_calls[2], kFlutterKeyEventTypeUp, kPhysicalNumLock,
-                       kLogicalNumLock, "", kSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 4);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
+                       kPhysicalNumLock, kLogicalNumLock, "", kSynthesized);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[1], kFlutterKeyEventTypeDown,
+                       kPhysicalNumLock, kLogicalNumLock, "", kSynthesized);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[2], kFlutterKeyEventTypeUp,
+                       kPhysicalNumLock, kLogicalNumLock, "", kSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 }
 
@@ -1905,8 +1989,8 @@ TEST(KeyboardTest, SynthesizeModifiers) {
 // any events.
 //
 // Regression test for https://github.com/flutter/flutter/issues/95888 .
-TEST(KeyboardTest, ImeExtendedEventsAreIgnored) {
-  KeyboardTester tester;
+TEST_F(KeyboardTest, ImeExtendedEventsAreIgnored) {
+  KeyboardTester tester{GetContext()};
   tester.Responding(false);
 
   // US Keyboard layout.
@@ -1920,10 +2004,10 @@ TEST(KeyboardTest, ImeExtendedEventsAreIgnored) {
       WmKeyDownInfo{VK_PROCESSKEY, kScanCodeControl, kExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown, 0, 0, "",
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown, 0, 0, "",
                        kNotSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 0);
 }
 
@@ -1933,8 +2017,8 @@ TEST(KeyboardTest, ImeExtendedEventsAreIgnored) {
 // Regression test for https://github.com/flutter/flutter/issues/104169. These
 // are real messages recorded when pressing Shift-2 using Microsoft Pinyin IME
 // on Win 10 Enterprise, which crashed the app before the fix.
-TEST(KeyboardTest, UpOnlyImeEventsAreCorrectlyHandled) {
-  KeyboardTester tester;
+TEST_F(KeyboardTest, UpOnlyImeEventsAreCorrectlyHandled) {
+  KeyboardTester tester{GetContext()};
   tester.Responding(true);
 
   // US Keyboard layout.
@@ -1952,17 +2036,18 @@ TEST(KeyboardTest, UpOnlyImeEventsAreCorrectlyHandled) {
       WmKeyUpInfo{'2', kScanCodeDigit2, kNotExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 4);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown,
+  EXPECT_EQ(tester.key_calls.size(), 4);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
                        kPhysicalShiftLeft, kLogicalShiftLeft, "",
                        kNotSynthesized);
-  EXPECT_CALL_IS_EVENT(key_calls[1], kFlutterKeyEventTypeDown, 0, 0, "",
+  EXPECT_CALL_IS_EVENT(tester.key_calls[1], kFlutterKeyEventTypeDown, 0, 0, "",
+                       kNotSynthesized);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[2], kFlutterKeyEventTypeUp,
+                       kPhysicalShiftLeft, kLogicalShiftLeft, "",
                        kNotSynthesized);
-  EXPECT_CALL_IS_EVENT(key_calls[2], kFlutterKeyEventTypeUp, kPhysicalShiftLeft,
-                       kLogicalShiftLeft, "", kNotSynthesized);
-  EXPECT_CALL_IS_EVENT(key_calls[3], kFlutterKeyEventTypeDown, 0, 0, "",
+  EXPECT_CALL_IS_EVENT(tester.key_calls[3], kFlutterKeyEventTypeDown, 0, 0, "",
                        kNotSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
 }
 
 // Regression test for a crash in an earlier implementation.
@@ -1971,8 +2056,8 @@ TEST(KeyboardTest, UpOnlyImeEventsAreCorrectlyHandled) {
 // arrive earlier than the framework response, and if the 2nd event has an
 // identical hash as the one waiting for response, an earlier implementation
 // will crash upon the response.
-TEST(KeyboardTest, SlowFrameworkResponse) {
-  KeyboardTester tester;
+TEST_F(KeyboardTest, SlowFrameworkResponse) {
+  KeyboardTester tester{GetContext()};
 
   std::vector<MockKeyResponseController::ResponseCallback> recorded_callbacks;
 
@@ -1998,28 +2083,28 @@ TEST(KeyboardTest, SlowFrameworkResponse) {
       WmCharInfo{'a', kScanCodeKeyA, kNotExtended, kWasDown}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown, kPhysicalKeyA,
-                       kLogicalKeyA, "a", kNotSynthesized);
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
+                       kPhysicalKeyA, kLogicalKeyA, "a", kNotSynthesized);
   EXPECT_EQ(recorded_callbacks.size(), 1);
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 0);
 
   // The first response.
   recorded_callbacks.front()(false);
 
-  EXPECT_EQ(key_calls.size(), 3);
+  EXPECT_EQ(tester.key_calls.size(), 3);
   EXPECT_EQ(recorded_callbacks.size(), 2);
-  EXPECT_CALL_IS_TEXT(key_calls[1], u"a");
-  EXPECT_CALL_IS_EVENT(key_calls[2], kFlutterKeyEventTypeRepeat, kPhysicalKeyA,
-                       kLogicalKeyA, "a", kNotSynthesized);
+  EXPECT_CALL_IS_TEXT(tester.key_calls[1], u"a");
+  EXPECT_CALL_IS_EVENT(tester.key_calls[2], kFlutterKeyEventTypeRepeat,
+                       kPhysicalKeyA, kLogicalKeyA, "a", kNotSynthesized);
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 2);
 
   // The second response.
   recorded_callbacks.back()(false);
 
-  EXPECT_EQ(key_calls.size(), 4);
-  EXPECT_CALL_IS_TEXT(key_calls[3], u"a");
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 4);
+  EXPECT_CALL_IS_TEXT(tester.key_calls[3], u"a");
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 2);
 }
 
@@ -2034,9 +2119,8 @@ TEST(KeyboardTest, SlowFrameworkResponse) {
 //   KeyA down, KeyA up, (down event responded with false), KeyA down, KeyA up,
 //
 // The code must not take the 2nd real key down events as a redispatched event.
-TEST(KeyboardTest, SlowFrameworkResponseForIdenticalEvents) {
-  KeyboardTester tester;
-
+TEST_F(KeyboardTest, SlowFrameworkResponseForIdenticalEvents) {
+  KeyboardTester tester{GetContext()};
   std::vector<MockKeyResponseController::ResponseCallback> recorded_callbacks;
 
   // Store callbacks to manually call them.
@@ -2054,10 +2138,10 @@ TEST(KeyboardTest, SlowFrameworkResponseForIdenticalEvents) {
       WmCharInfo{'a', kScanCodeKeyA, kNotExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown, kPhysicalKeyA,
-                       kLogicalKeyA, "a", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
+                       kPhysicalKeyA, kLogicalKeyA, "a", kNotSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 0);
 
   // Release A
@@ -2065,18 +2149,18 @@ TEST(KeyboardTest, SlowFrameworkResponseForIdenticalEvents) {
       WmKeyUpInfo{kVirtualKeyA, kScanCodeKeyA, kNotExtended}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 0);
+  EXPECT_EQ(tester.key_calls.size(), 0);
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 0);
 
   // The first down event responded with false.
   EXPECT_EQ(recorded_callbacks.size(), 1);
   recorded_callbacks.front()(false);
 
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_TEXT(key_calls[0], u"a");
-  EXPECT_CALL_IS_EVENT(key_calls[1], kFlutterKeyEventTypeUp, kPhysicalKeyA,
-                       kLogicalKeyA, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_TEXT(tester.key_calls[0], u"a");
+  EXPECT_CALL_IS_EVENT(tester.key_calls[1], kFlutterKeyEventTypeUp,
+                       kPhysicalKeyA, kLogicalKeyA, "", kNotSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 2);
 
   // Press A again
@@ -2089,16 +2173,16 @@ TEST(KeyboardTest, SlowFrameworkResponseForIdenticalEvents) {
   // Nothing more was dispatched because the first up event hasn't been
   // responded yet.
   EXPECT_EQ(recorded_callbacks.size(), 2);
-  EXPECT_EQ(key_calls.size(), 0);
+  EXPECT_EQ(tester.key_calls.size(), 0);
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 0);
 
   // The first up event responded with false, which was redispatched, and caused
   // the down event to be dispatched.
   recorded_callbacks.back()(false);
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown, kPhysicalKeyA,
-                       kLogicalKeyA, "a", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
+                       kPhysicalKeyA, kLogicalKeyA, "a", kNotSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(recorded_callbacks.size(), 3);
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
@@ -2107,17 +2191,17 @@ TEST(KeyboardTest, SlowFrameworkResponseForIdenticalEvents) {
       WmKeyUpInfo{kVirtualKeyA, kScanCodeKeyA, kNotExtended}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 0);
+  EXPECT_EQ(tester.key_calls.size(), 0);
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 0);
 }
 
-TEST(KeyboardTest, TextInputSubmit) {
-  KeyboardTester tester;
+TEST_F(KeyboardTest, TextInputSubmit) {
+  KeyboardTester tester{GetContext()};
   tester.Responding(false);
 
   // US Keyboard layout
 
-  tester.GetView().HandleMessage(
+  tester.InjectPlatformMessage(
       "flutter/textinput", "TextInput.setClient",
       R"|([108, {"inputAction": "TextInputAction.none"}])|");
 
@@ -2128,16 +2212,16 @@ TEST(KeyboardTest, TextInputSubmit) {
       WmCharInfo{'\n', kScanCodeEnter, kNotExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown, kPhysicalEnter,
-                       kLogicalEnter, "", kNotSynthesized);
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
+                       kPhysicalEnter, kLogicalEnter, "", kNotSynthesized);
   EXPECT_CALL_IS_TEXT_METHOD_CALL(
-      key_calls[1],
+      tester.key_calls[1],
       "{"
       R"|("method":"TextInputClient.performAction",)|"
       R"|("args":[108,"TextInputAction.none"])|"
       "}");
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 2);
 
   // Release Enter
@@ -2145,10 +2229,10 @@ TEST(KeyboardTest, TextInputSubmit) {
       WmKeyUpInfo{VK_RETURN, kScanCodeEnter, kNotExtended}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp, kPhysicalEnter,
-                       kLogicalEnter, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
+                       kPhysicalEnter, kLogicalEnter, "", kNotSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   // Make sure OnText is not obstructed after pressing Enter.
@@ -2162,24 +2246,24 @@ TEST(KeyboardTest, TextInputSubmit) {
       WmCharInfo{'a', kScanCodeKeyA, kNotExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown, kPhysicalKeyA,
-                       kLogicalKeyA, "a", kNotSynthesized);
-  EXPECT_CALL_IS_TEXT(key_calls[1], u"a");
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
+                       kPhysicalKeyA, kLogicalKeyA, "a", kNotSynthesized);
+  EXPECT_CALL_IS_TEXT(tester.key_calls[1], u"a");
+  tester.clear_key_calls();
 
   // Release A
   tester.InjectKeyboardChanges(std::vector<KeyboardChange>{
       WmKeyUpInfo{kVirtualKeyA, kScanCodeKeyA, kNotExtended}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp, kPhysicalKeyA,
-                       kLogicalKeyA, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
+                       kPhysicalKeyA, kLogicalKeyA, "", kNotSynthesized);
+  tester.clear_key_calls();
 }
 
-TEST(KeyboardTest, VietnameseTelexAddDiacriticWithFastResponse) {
+TEST_F(KeyboardTest, VietnameseTelexAddDiacriticWithFastResponse) {
   // In this test, the user presses the folloing keys:
   //
   //   Key         Current text
@@ -2189,7 +2273,7 @@ TEST(KeyboardTest, VietnameseTelexAddDiacriticWithFastResponse) {
   //
   // And the Backspace event is responded immediately.
 
-  KeyboardTester tester;
+  KeyboardTester tester{GetContext()};
   tester.Responding(false);
 
   // US Keyboard layout
@@ -2201,11 +2285,11 @@ TEST(KeyboardTest, VietnameseTelexAddDiacriticWithFastResponse) {
       WmCharInfo{'a', kScanCodeKeyA, kNotExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown, kPhysicalKeyA,
-                       kLogicalKeyA, "a", kNotSynthesized);
-  EXPECT_CALL_IS_TEXT(key_calls[1], u"a");
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
+                       kPhysicalKeyA, kLogicalKeyA, "a", kNotSynthesized);
+  EXPECT_CALL_IS_TEXT(tester.key_calls[1], u"a");
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 2);
 
   // Release A
@@ -2213,10 +2297,10 @@ TEST(KeyboardTest, VietnameseTelexAddDiacriticWithFastResponse) {
       WmKeyUpInfo{kVirtualKeyA, kScanCodeKeyA, kNotExtended}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp, kPhysicalKeyA,
-                       kLogicalKeyA, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
+                       kPhysicalKeyA, kLogicalKeyA, "", kNotSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   // Press F, which is translated to:
@@ -2233,14 +2317,15 @@ TEST(KeyboardTest, VietnameseTelexAddDiacriticWithFastResponse) {
       WmCharInfo{0xe0 /*'à'*/, 0, kNotExtended, kWasUp}.Build(kWmResultZero),
       WmKeyUpInfo{VK_PACKET, 0, kNotExtended}.Build(kWmResultDefault)});
 
-  EXPECT_EQ(key_calls.size(), 3);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown,
+  EXPECT_EQ(tester.key_calls.size(), 3);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
+                       kPhysicalBackspace, kLogicalBackspace, "",
+                       kNotSynthesized);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[1], kFlutterKeyEventTypeUp,
                        kPhysicalBackspace, kLogicalBackspace, "",
                        kNotSynthesized);
-  EXPECT_CALL_IS_EVENT(key_calls[1], kFlutterKeyEventTypeUp, kPhysicalBackspace,
-                       kLogicalBackspace, "", kNotSynthesized);
-  EXPECT_CALL_IS_TEXT(key_calls[2], u"à");
-  clear_key_calls();
+  EXPECT_CALL_IS_TEXT(tester.key_calls[2], u"à");
+  tester.clear_key_calls();
   // TODO(dkwingsmt): This count should probably be 4. Currently the CHAR 0x8
   // message is redispatched due to being part of the KeyDown session, which is
   // not handled by the framework, while the 'à' message is not redispatched
@@ -2254,15 +2339,16 @@ TEST(KeyboardTest, VietnameseTelexAddDiacriticWithFastResponse) {
                   /* overwrite_prev_state_0 */ true}
           .Build(kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown, 0, 0, "",
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown, 0, 0, "",
                        kNotSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 0);
 }
 
-void VietnameseTelexAddDiacriticWithSlowResponse(bool backspace_response) {
-  // In this test, the user presses the folloing keys:
+void VietnameseTelexAddDiacriticWithSlowResponse(WindowsTestContext& context,
+                                                 bool backspace_response) {
+  // In this test, the user presses the following keys:
   //
   //   Key         Current text
   //  ===========================
@@ -2271,7 +2357,7 @@ void VietnameseTelexAddDiacriticWithSlowResponse(bool backspace_response) {
   //
   // And the Backspace down event is responded slowly with `backspace_response`.
 
-  KeyboardTester tester;
+  KeyboardTester tester{context};
   tester.Responding(false);
 
   // US Keyboard layout
@@ -2283,11 +2369,11 @@ void VietnameseTelexAddDiacriticWithSlowResponse(bool backspace_response) {
       WmCharInfo{'a', kScanCodeKeyA, kNotExtended, kWasUp}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 2);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown, kPhysicalKeyA,
-                       kLogicalKeyA, "a", kNotSynthesized);
-  EXPECT_CALL_IS_TEXT(key_calls[1], u"a");
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 2);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
+                       kPhysicalKeyA, kLogicalKeyA, "a", kNotSynthesized);
+  EXPECT_CALL_IS_TEXT(tester.key_calls[1], u"a");
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 2);
 
   // Release A
@@ -2295,10 +2381,10 @@ void VietnameseTelexAddDiacriticWithSlowResponse(bool backspace_response) {
       WmKeyUpInfo{kVirtualKeyA, kScanCodeKeyA, kNotExtended}.Build(
           kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp, kPhysicalKeyA,
-                       kLogicalKeyA, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
+                       kPhysicalKeyA, kLogicalKeyA, "", kNotSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   std::vector<MockKeyResponseController::ResponseCallback> recorded_callbacks;
@@ -2328,27 +2414,28 @@ void VietnameseTelexAddDiacriticWithSlowResponse(bool backspace_response) {
   // it will send a setEditingState message that updates the text state that has
   // the last character deleted  (denoted by `string1`). Processing the char
   // message before then will cause the final text to set to `string1`.
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown,
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown,
                        kPhysicalBackspace, kLogicalBackspace, "",
                        kNotSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 0);
 
   EXPECT_EQ(recorded_callbacks.size(), 1);
   recorded_callbacks[0](backspace_response);
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeUp, kPhysicalBackspace,
-                       kLogicalBackspace, "", kNotSynthesized);
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeUp,
+                       kPhysicalBackspace, kLogicalBackspace, "",
+                       kNotSynthesized);
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(),
             backspace_response ? 0 : 2);
 
   recorded_callbacks[1](false);
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_TEXT(key_calls[0], u"à");
-  clear_key_calls();
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_TEXT(tester.key_calls[0], u"à");
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 1);
 
   tester.Responding(false);
@@ -2359,32 +2446,32 @@ void VietnameseTelexAddDiacriticWithSlowResponse(bool backspace_response) {
                   /* overwrite_prev_state_0 */ true}
           .Build(kWmResultZero)});
 
-  EXPECT_EQ(key_calls.size(), 1);
-  EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown, 0, 0, "",
+  EXPECT_EQ(tester.key_calls.size(), 1);
+  EXPECT_CALL_IS_EVENT(tester.key_calls[0], kFlutterKeyEventTypeDown, 0, 0, "",
                        kNotSynthesized);
-  clear_key_calls();
+  tester.clear_key_calls();
   EXPECT_EQ(tester.RedispatchedMessageCountAndClear(), 0);
 }
 
-TEST(KeyboardTest, VietnameseTelexAddDiacriticWithSlowFalseResponse) {
-  VietnameseTelexAddDiacriticWithSlowResponse(false);
+TEST_F(KeyboardTest, VietnameseTelexAddDiacriticWithSlowFalseResponse) {
+  VietnameseTelexAddDiacriticWithSlowResponse(GetContext(), false);
 }
 
-TEST(KeyboardTest, VietnameseTelexAddDiacriticWithSlowTrueResponse) {
-  VietnameseTelexAddDiacriticWithSlowResponse(true);
+TEST_F(KeyboardTest, VietnameseTelexAddDiacriticWithSlowTrueResponse) {
+  VietnameseTelexAddDiacriticWithSlowResponse(GetContext(), true);
 }
 
 // Ensure that the scancode-less key events issued by Narrator
 // when toggling caps lock don't violate assert statements.
-TEST(KeyboardTest, DoubleCapsLock) {
-  KeyboardTester tester;
+TEST_F(KeyboardTest, DoubleCapsLock) {
+  KeyboardTester tester{GetContext()};
   tester.Responding(false);
 
   tester.InjectKeyboardChanges(std::vector<KeyboardChange>{
       WmKeyDownInfo{VK_CAPITAL, 0, kNotExtended}.Build(),
       WmKeyUpInfo{VK_CAPITAL, 0, kNotExtended}.Build()});
 
-  clear_key_calls();
+  tester.clear_key_calls();
 }
 
 }  // namespace testing
diff --git a/shell/platform/windows/keyboard_utils.cc b/shell/platform/windows/keyboard_utils.cc
index 030123b8351f6029d8894d53d3b8a368920baeac..aafdb0b3361addca213591838692ac9e64781cab 100644
--- a/shell/platform/windows/keyboard_utils.cc
+++ b/shell/platform/windows/keyboard_utils.cc
@@ -4,14 +4,16 @@
 
 #include "keyboard_utils.h"
 
+#include "flutter/fml/logging.h"
+
 namespace flutter {
 
 std::u16string EncodeUtf16(char32_t character) {
   // Algorithm: https://en.wikipedia.org/wiki/UTF-16#Description
   std::u16string result;
   // Invalid value.
-  assert(!(character >= 0xD800 && character <= 0xDFFF) &&
-         !(character > 0x10FFFF));
+  FML_DCHECK(!(character >= 0xD800 && character <= 0xDFFF) &&
+             !(character > 0x10FFFF));
   if ((character >= 0xD800 && character <= 0xDFFF) || (character > 0x10FFFF)) {
     return result;
   }
diff --git a/shell/platform/windows/keyboard_utils.h b/shell/platform/windows/keyboard_utils.h
index 9b7ee178961456ce5f67e65f8b62b1e0da098498..62bff6121472971dee67c1ecc1709856716c0fa9 100644
--- a/shell/platform/windows/keyboard_utils.h
+++ b/shell/platform/windows/keyboard_utils.h
@@ -2,15 +2,24 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_KEYBOARD_WIN32_COMMON_H_
-#define FLUTTER_SHELL_PLATFORM_WINDOWS_KEYBOARD_WIN32_COMMON_H_
+#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_KEYBOARD_UTILS_H_
+#define FLUTTER_SHELL_PLATFORM_WINDOWS_KEYBOARD_UTILS_H_
 
-#include <assert.h>
 #include <stdint.h>
+
 #include <string>
 
 namespace flutter {
 
+constexpr int kShift = 1 << 0;
+constexpr int kControl = 1 << 3;
+constexpr int kScanCodeShiftLeft = 0x2a;
+constexpr int kScanCodeShiftRight = 0x36;
+constexpr int kKeyCodeShiftLeft = 0xa0;
+constexpr int kScanCodeControlLeft = 0x1d;
+constexpr int kScanCodeControlRight = 0xe01d;
+constexpr int kKeyCodeControlLeft = 0xa2;
+
 // The bit of a mapped character in a WM_KEYDOWN message that indicates the
 // character is a dead key.
 //
@@ -34,4 +43,4 @@ std::u16string EncodeUtf16(char32_t character);
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_KEYBOARD_WIN32_COMMON_H_
+#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_KEYBOARD_UTILS_H_
diff --git a/shell/platform/windows/platform_handler.cc b/shell/platform/windows/platform_handler.cc
index c73677da1b1f8569ec13520ec94145a9a6c38718..197de59345351790a18a3b1751f49ce893e95677 100644
--- a/shell/platform/windows/platform_handler.cc
+++ b/shell/platform/windows/platform_handler.cc
@@ -10,7 +10,9 @@
 #include <optional>
 
 #include "flutter/fml/logging.h"
+#include "flutter/fml/macros.h"
 #include "flutter/fml/platform/win/wstring_conversion.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_result_functions.h"
 #include "flutter/shell/platform/common/json_method_codec.h"
 #include "flutter/shell/platform/windows/flutter_windows_view.h"
 
@@ -19,8 +21,20 @@ static constexpr char kChannelName[] = "flutter/platform";
 static constexpr char kGetClipboardDataMethod[] = "Clipboard.getData";
 static constexpr char kHasStringsClipboardMethod[] = "Clipboard.hasStrings";
 static constexpr char kSetClipboardDataMethod[] = "Clipboard.setData";
+static constexpr char kExitApplicationMethod[] = "System.exitApplication";
+static constexpr char kRequestAppExitMethod[] = "System.requestAppExit";
+static constexpr char kInitializationCompleteMethod[] =
+    "System.initializationComplete";
 static constexpr char kPlaySoundMethod[] = "SystemSound.play";
 
+static constexpr char kExitCodeKey[] = "exitCode";
+
+static constexpr char kExitTypeKey[] = "type";
+
+static constexpr char kExitResponseKey[] = "response";
+static constexpr char kExitResponseCancel[] = "cancel";
+static constexpr char kExitResponseExit[] = "exit";
+
 static constexpr char kTextPlainFormat[] = "text/plain";
 static constexpr char kTextKey[] = "text";
 static constexpr char kUnknownClipboardFormatMessage[] =
@@ -30,6 +44,10 @@ static constexpr char kValueKey[] = "value";
 static constexpr int kAccessDeniedErrorCode = 5;
 static constexpr int kErrorSuccess = 0;
 
+static constexpr char kExitRequestError[] = "ExitApplication error";
+static constexpr char kInvalidExitRequestMessage[] =
+    "Invalid application exit request";
+
 namespace flutter {
 
 namespace {
@@ -55,10 +73,6 @@ class ScopedGlobalMemory {
     }
   }
 
-  // Prevent copying.
-  ScopedGlobalMemory(ScopedGlobalMemory const&) = delete;
-  ScopedGlobalMemory& operator=(ScopedGlobalMemory const&) = delete;
-
   // Returns the memory pointer, which will be nullptr if allocation failed.
   void* get() { return memory_; }
 
@@ -70,6 +84,8 @@ class ScopedGlobalMemory {
 
  private:
   HGLOBAL memory_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(ScopedGlobalMemory);
 };
 
 // A scoped wrapper for GlobalLock/GlobalUnlock.
@@ -98,10 +114,6 @@ class ScopedGlobalLock {
     }
   }
 
-  // Prevent copying.
-  ScopedGlobalLock(ScopedGlobalLock const&) = delete;
-  ScopedGlobalLock& operator=(ScopedGlobalLock const&) = delete;
-
   // Returns the locked memory pointer, which will be nullptr if acquiring the
   // lock failed.
   void* get() { return locked_memory_; }
@@ -109,6 +121,8 @@ class ScopedGlobalLock {
  private:
   HGLOBAL source_;
   void* locked_memory_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(ScopedGlobalLock);
 };
 
 // A Clipboard wrapper that automatically closes the clipboard when it goes out
@@ -118,10 +132,6 @@ class ScopedClipboard : public ScopedClipboardInterface {
   ScopedClipboard();
   virtual ~ScopedClipboard();
 
-  // Prevent copying.
-  ScopedClipboard(ScopedClipboard const&) = delete;
-  ScopedClipboard& operator=(ScopedClipboard const&) = delete;
-
   int Open(HWND window) override;
 
   bool HasString() override;
@@ -132,6 +142,8 @@ class ScopedClipboard : public ScopedClipboardInterface {
 
  private:
   bool opened_ = false;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(ScopedClipboard);
 };
 
 ScopedClipboard::ScopedClipboard() {}
@@ -159,7 +171,7 @@ bool ScopedClipboard::HasString() {
 }
 
 std::variant<std::wstring, int> ScopedClipboard::GetString() {
-  assert(opened_);
+  FML_DCHECK(opened_) << "Called GetString when clipboard is closed";
 
   HANDLE data = ::GetClipboardData(CF_UNICODETEXT);
   if (data == nullptr) {
@@ -174,7 +186,7 @@ std::variant<std::wstring, int> ScopedClipboard::GetString() {
 }
 
 int ScopedClipboard::SetString(const std::wstring string) {
-  assert(opened_);
+  FML_DCHECK(opened_) << "Called GetString when clipboard is closed";
   if (!::EmptyClipboard()) {
     return ::GetLastError();
   }
@@ -197,16 +209,26 @@ int ScopedClipboard::SetString(const std::wstring string) {
 
 }  // namespace
 
+static AppExitType StringToAppExitType(const std::string& string) {
+  if (string.compare(PlatformHandler::kExitTypeRequired) == 0) {
+    return AppExitType::required;
+  } else if (string.compare(PlatformHandler::kExitTypeCancelable) == 0) {
+    return AppExitType::cancelable;
+  }
+  FML_LOG(ERROR) << string << " is not recognized as a valid exit type.";
+  return AppExitType::required;
+}
+
 PlatformHandler::PlatformHandler(
     BinaryMessenger* messenger,
-    FlutterWindowsView* view,
+    FlutterWindowsEngine* engine,
     std::optional<std::function<std::unique_ptr<ScopedClipboardInterface>()>>
         scoped_clipboard_provider)
     : channel_(std::make_unique<MethodChannel<rapidjson::Document>>(
           messenger,
           kChannelName,
           &JsonMethodCodec::GetInstance())),
-      view_(view) {
+      engine_(engine) {
   channel_->SetMethodCallHandler(
       [this](const MethodCall<rapidjson::Document>& call,
              std::unique_ptr<MethodResult<rapidjson::Document>> result) {
@@ -226,10 +248,19 @@ PlatformHandler::~PlatformHandler() = default;
 void PlatformHandler::GetPlainText(
     std::unique_ptr<MethodResult<rapidjson::Document>> result,
     std::string_view key) {
+  // TODO(loicsharma): Remove implicit view assumption.
+  // https://github.com/flutter/flutter/issues/142845
+  const FlutterWindowsView* view = engine_->view(kImplicitViewId);
+  if (view == nullptr) {
+    result->Error(kClipboardError,
+                  "Clipboard is not available in Windows headless mode");
+    return;
+  }
+
   std::unique_ptr<ScopedClipboardInterface> clipboard =
       scoped_clipboard_provider_();
 
-  int open_result = clipboard->Open(std::get<HWND>(*view_->GetRenderTarget()));
+  int open_result = clipboard->Open(view->GetWindowHandle());
   if (open_result != kErrorSuccess) {
     rapidjson::Document error_code;
     error_code.SetInt(open_result);
@@ -262,11 +293,20 @@ void PlatformHandler::GetPlainText(
 
 void PlatformHandler::GetHasStrings(
     std::unique_ptr<MethodResult<rapidjson::Document>> result) {
+  // TODO(loicsharma): Remove implicit view assumption.
+  // https://github.com/flutter/flutter/issues/142845
+  const FlutterWindowsView* view = engine_->view(kImplicitViewId);
+  if (view == nullptr) {
+    result->Error(kClipboardError,
+                  "Clipboard is not available in Windows headless mode");
+    return;
+  }
+
   std::unique_ptr<ScopedClipboardInterface> clipboard =
       scoped_clipboard_provider_();
 
   bool hasStrings;
-  int open_result = clipboard->Open(std::get<HWND>(*view_->GetRenderTarget()));
+  int open_result = clipboard->Open(view->GetWindowHandle());
   if (open_result != kErrorSuccess) {
     // Swallow errors of type ERROR_ACCESS_DENIED. These happen when the app is
     // not in the foreground and GetHasStrings is irrelevant.
@@ -293,10 +333,19 @@ void PlatformHandler::GetHasStrings(
 void PlatformHandler::SetPlainText(
     const std::string& text,
     std::unique_ptr<MethodResult<rapidjson::Document>> result) {
+  // TODO(loicsharma): Remove implicit view assumption.
+  // https://github.com/flutter/flutter/issues/142845
+  const FlutterWindowsView* view = engine_->view(kImplicitViewId);
+  if (view == nullptr) {
+    result->Error(kClipboardError,
+                  "Clipboard is not available in Windows headless mode");
+    return;
+  }
+
   std::unique_ptr<ScopedClipboardInterface> clipboard =
       scoped_clipboard_provider_();
 
-  int open_result = clipboard->Open(std::get<HWND>(*view_->GetRenderTarget()));
+  int open_result = clipboard->Open(view->GetWindowHandle());
   if (open_result != kErrorSuccess) {
     rapidjson::Document error_code;
     error_code.SetInt(open_result);
@@ -324,11 +373,102 @@ void PlatformHandler::SystemSoundPlay(
   }
 }
 
+void PlatformHandler::SystemExitApplication(
+    AppExitType exit_type,
+    UINT exit_code,
+    std::unique_ptr<MethodResult<rapidjson::Document>> result) {
+  rapidjson::Document result_doc;
+  result_doc.SetObject();
+  if (exit_type == AppExitType::required) {
+    QuitApplication(std::nullopt, std::nullopt, std::nullopt, exit_code);
+    result_doc.GetObjectW().AddMember(kExitResponseKey, kExitResponseExit,
+                                      result_doc.GetAllocator());
+    result->Success(result_doc);
+  } else {
+    RequestAppExit(std::nullopt, std::nullopt, std::nullopt, exit_type,
+                   exit_code);
+    result_doc.GetObjectW().AddMember(kExitResponseKey, kExitResponseCancel,
+                                      result_doc.GetAllocator());
+    result->Success(result_doc);
+  }
+}
+
+// Indicates whether an exit request may be canceled by the framework.
+// These values must be kept in sync with ExitType in platform_handler.h
+static constexpr const char* kExitTypeNames[] = {
+    PlatformHandler::kExitTypeRequired, PlatformHandler::kExitTypeCancelable};
+
+void PlatformHandler::RequestAppExit(std::optional<HWND> hwnd,
+                                     std::optional<WPARAM> wparam,
+                                     std::optional<LPARAM> lparam,
+                                     AppExitType exit_type,
+                                     UINT exit_code) {
+  auto callback = std::make_unique<MethodResultFunctions<rapidjson::Document>>(
+      [this, exit_code, hwnd, wparam,
+       lparam](const rapidjson::Document* response) {
+        RequestAppExitSuccess(hwnd, wparam, lparam, response, exit_code);
+      },
+      nullptr, nullptr);
+  auto args = std::make_unique<rapidjson::Document>();
+  args->SetObject();
+  args->GetObjectW().AddMember(
+      kExitTypeKey, std::string(kExitTypeNames[static_cast<int>(exit_type)]),
+      args->GetAllocator());
+  channel_->InvokeMethod(kRequestAppExitMethod, std::move(args),
+                         std::move(callback));
+}
+
+void PlatformHandler::RequestAppExitSuccess(std::optional<HWND> hwnd,
+                                            std::optional<WPARAM> wparam,
+                                            std::optional<LPARAM> lparam,
+                                            const rapidjson::Document* result,
+                                            UINT exit_code) {
+  rapidjson::Value::ConstMemberIterator itr =
+      result->FindMember(kExitResponseKey);
+  if (itr == result->MemberEnd() || !itr->value.IsString()) {
+    FML_LOG(ERROR) << "Application request response did not contain a valid "
+                      "response value";
+    return;
+  }
+  const std::string& exit_type = itr->value.GetString();
+
+  if (exit_type.compare(kExitResponseExit) == 0) {
+    QuitApplication(hwnd, wparam, lparam, exit_code);
+  }
+}
+
+void PlatformHandler::QuitApplication(std::optional<HWND> hwnd,
+                                      std::optional<WPARAM> wparam,
+                                      std::optional<LPARAM> lparam,
+                                      UINT exit_code) {
+  engine_->OnQuit(hwnd, wparam, lparam, exit_code);
+}
+
 void PlatformHandler::HandleMethodCall(
     const MethodCall<rapidjson::Document>& method_call,
     std::unique_ptr<MethodResult<rapidjson::Document>> result) {
   const std::string& method = method_call.method_name();
-  if (method.compare(kGetClipboardDataMethod) == 0) {
+  if (method.compare(kExitApplicationMethod) == 0) {
+    const rapidjson::Value& arguments = method_call.arguments()[0];
+
+    rapidjson::Value::ConstMemberIterator itr =
+        arguments.FindMember(kExitTypeKey);
+    if (itr == arguments.MemberEnd() || !itr->value.IsString()) {
+      result->Error(kExitRequestError, kInvalidExitRequestMessage);
+      return;
+    }
+    const std::string& exit_type = itr->value.GetString();
+
+    itr = arguments.FindMember(kExitCodeKey);
+    if (itr == arguments.MemberEnd() || !itr->value.IsInt()) {
+      result->Error(kExitRequestError, kInvalidExitRequestMessage);
+      return;
+    }
+    UINT exit_code = arguments[kExitCodeKey].GetInt();
+
+    SystemExitApplication(StringToAppExitType(exit_type), exit_code,
+                          std::move(result));
+  } else if (method.compare(kGetClipboardDataMethod) == 0) {
     // Only one string argument is expected.
     const rapidjson::Value& format = method_call.arguments()[0];
 
@@ -353,12 +493,19 @@ void PlatformHandler::HandleMethodCall(
       result->Error(kClipboardError, kUnknownClipboardFormatMessage);
       return;
     }
+    if (!itr->value.IsString()) {
+      result->Error(kClipboardError, kUnknownClipboardFormatMessage);
+      return;
+    }
     SetPlainText(itr->value.GetString(), std::move(result));
   } else if (method.compare(kPlaySoundMethod) == 0) {
     // Only one string argument is expected.
     const rapidjson::Value& sound_type = method_call.arguments()[0];
 
     SystemSoundPlay(sound_type.GetString(), std::move(result));
+  } else if (method.compare(kInitializationCompleteMethod) == 0) {
+    // Deprecated but should not cause an error.
+    result->Success();
   } else {
     result->NotImplemented();
   }
diff --git a/shell/platform/windows/platform_handler.h b/shell/platform/windows/platform_handler.h
index 4da0ab2180527def781ee42da8c6d5d539547044..8088b16a874773b32faf3273cbae1707e1c34fd5 100644
--- a/shell/platform/windows/platform_handler.h
+++ b/shell/platform/windows/platform_handler.h
@@ -12,26 +12,48 @@
 #include <optional>
 #include <variant>
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h"
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/method_channel.h"
 #include "rapidjson/document.h"
 
 namespace flutter {
 
-class FlutterWindowsView;
+class FlutterWindowsEngine;
 class ScopedClipboardInterface;
 
+// Indicates whether an exit request may be canceled by the framework.
+// These values must be kept in sync with kExitTypeNames in platform_handler.cc
+enum class AppExitType {
+  required,
+  cancelable,
+};
+
 // Handler for internal system channels.
 class PlatformHandler {
  public:
   explicit PlatformHandler(
       BinaryMessenger* messenger,
-      FlutterWindowsView* view,
+      FlutterWindowsEngine* engine,
       std::optional<std::function<std::unique_ptr<ScopedClipboardInterface>()>>
           scoped_clipboard_provider = std::nullopt);
 
   virtual ~PlatformHandler();
 
+  // String values used for encoding/decoding exit requests.
+  static constexpr char kExitTypeCancelable[] = "cancelable";
+  static constexpr char kExitTypeRequired[] = "required";
+
+  // Send a request to the framework to test if a cancelable exit request
+  // should be canceled or honored. hwnd is std::nullopt for a request to quit
+  // the process, otherwise it holds the HWND of the window that initiated the
+  // quit request.
+  virtual void RequestAppExit(std::optional<HWND> hwnd,
+                              std::optional<WPARAM> wparam,
+                              std::optional<LPARAM> lparam,
+                              AppExitType exit_type,
+                              UINT exit_code);
+
  protected:
   // Gets plain text from the clipboard and provides it to |result| as the
   // value in a dictionary with the given |key|.
@@ -54,6 +76,30 @@ class PlatformHandler {
       const std::string& sound_type,
       std::unique_ptr<MethodResult<rapidjson::Document>> result);
 
+  // Handle a request from the framework to exit the application.
+  virtual void SystemExitApplication(
+      AppExitType exit_type,
+      UINT exit_code,
+      std::unique_ptr<MethodResult<rapidjson::Document>> result);
+
+  // Actually quit the application with the provided exit code. hwnd is
+  // std::nullopt for a request to quit the process, otherwise it holds the HWND
+  // of the window that initiated the quit request.
+  virtual void QuitApplication(std::optional<HWND> hwnd,
+                               std::optional<WPARAM> wparam,
+                               std::optional<LPARAM> lparam,
+                               UINT exit_code);
+
+  // Callback from when the cancelable exit request response request is
+  // answered by the framework. hwnd is std::nullopt for a request to quit the
+  // process, otherwise it holds the HWND of the window that initiated the quit
+  // request.
+  virtual void RequestAppExitSuccess(std::optional<HWND> hwnd,
+                                     std::optional<WPARAM> wparam,
+                                     std::optional<LPARAM> lparam,
+                                     const rapidjson::Document* result,
+                                     UINT exit_code);
+
   // A error type to use for error responses.
   static constexpr char kClipboardError[] = "Clipboard error";
 
@@ -68,14 +114,16 @@ class PlatformHandler {
   // The MethodChannel used for communication with the Flutter engine.
   std::unique_ptr<MethodChannel<rapidjson::Document>> channel_;
 
-  // A reference to the Flutter view.
-  FlutterWindowsView* view_;
+  // A reference to the Flutter engine.
+  FlutterWindowsEngine* engine_;
 
   // A scoped clipboard provider that can be passed in for mocking in tests.
   // Use this to acquire clipboard in each operation to avoid blocking clipboard
   // unnecessarily. See flutter/flutter#103205.
   std::function<std::unique_ptr<ScopedClipboardInterface>()>
       scoped_clipboard_provider_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(PlatformHandler);
 };
 
 // A public interface for ScopedClipboard, so that it can be injected into
diff --git a/shell/platform/windows/platform_handler_unittests.cc b/shell/platform/windows/platform_handler_unittests.cc
index 604ffcb0679eba1197a515c01ade4af070ad6dff..7e9f98811c994be4d74bddd001fdb178eaff2eca 100644
--- a/shell/platform/windows/platform_handler_unittests.cc
+++ b/shell/platform/windows/platform_handler_unittests.cc
@@ -6,10 +6,14 @@
 
 #include <memory>
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/common/json_method_codec.h"
 #include "flutter/shell/platform/windows/flutter_windows_view.h"
+#include "flutter/shell/platform/windows/testing/engine_modifier.h"
+#include "flutter/shell/platform/windows/testing/flutter_windows_engine_builder.h"
 #include "flutter/shell/platform/windows/testing/mock_window_binding_handler.h"
 #include "flutter/shell/platform/windows/testing/test_binary_messenger.h"
+#include "flutter/shell/platform/windows/testing/windows_test.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "rapidjson/document.h"
@@ -34,10 +38,21 @@ static constexpr char kClipboardHasStringsFakeContentTypeMessage[] =
     "{\"method\":\"Clipboard.hasStrings\",\"args\":\"text/madeupcontenttype\"}";
 static constexpr char kClipboardSetDataMessage[] =
     "{\"method\":\"Clipboard.setData\",\"args\":{\"text\":\"hello\"}}";
+static constexpr char kClipboardSetDataNullTextMessage[] =
+    "{\"method\":\"Clipboard.setData\",\"args\":{\"text\":null}}";
 static constexpr char kClipboardSetDataUnknownTypeMessage[] =
     "{\"method\":\"Clipboard.setData\",\"args\":{\"madeuptype\":\"hello\"}}";
 static constexpr char kSystemSoundTypeAlertMessage[] =
     "{\"method\":\"SystemSound.play\",\"args\":\"SystemSoundType.alert\"}";
+static constexpr char kSystemExitApplicationRequiredMessage[] =
+    "{\"method\":\"System.exitApplication\",\"args\":{\"type\":\"required\","
+    "\"exitCode\":1}}";
+static constexpr char kSystemExitApplicationCancelableMessage[] =
+    "{\"method\":\"System.exitApplication\",\"args\":{\"type\":\"cancelable\","
+    "\"exitCode\":2}}";
+static constexpr char kExitResponseCancelMessage[] =
+    "[{\"response\":\"cancel\"}]";
+static constexpr char kExitResponseExitMessage[] = "[{\"response\":\"exit\"}]";
 
 static constexpr int kAccessDeniedErrorCode = 5;
 static constexpr int kErrorSuccess = 0;
@@ -49,33 +64,58 @@ class MockPlatformHandler : public PlatformHandler {
  public:
   explicit MockPlatformHandler(
       BinaryMessenger* messenger,
-      FlutterWindowsView* view,
+      FlutterWindowsEngine* engine,
       std::optional<std::function<std::unique_ptr<ScopedClipboardInterface>()>>
           scoped_clipboard_provider = std::nullopt)
-      : PlatformHandler(messenger, view, scoped_clipboard_provider) {}
+      : PlatformHandler(messenger, engine, scoped_clipboard_provider) {}
 
   virtual ~MockPlatformHandler() = default;
 
-  MOCK_METHOD2(GetPlainText,
-               void(std::unique_ptr<MethodResult<rapidjson::Document>>,
-                    std::string_view key));
-  MOCK_METHOD1(GetHasStrings,
-               void(std::unique_ptr<MethodResult<rapidjson::Document>>));
-  MOCK_METHOD2(SetPlainText,
-               void(const std::string&,
-                    std::unique_ptr<MethodResult<rapidjson::Document>>));
-  MOCK_METHOD2(SystemSoundPlay,
-               void(const std::string&,
-                    std::unique_ptr<MethodResult<rapidjson::Document>>));
+  MOCK_METHOD(void,
+              GetPlainText,
+              (std::unique_ptr<MethodResult<rapidjson::Document>>,
+               std::string_view key),
+              (override));
+  MOCK_METHOD(void,
+              GetHasStrings,
+              (std::unique_ptr<MethodResult<rapidjson::Document>>),
+              (override));
+  MOCK_METHOD(void,
+              SetPlainText,
+              (const std::string&,
+               std::unique_ptr<MethodResult<rapidjson::Document>>),
+              (override));
+  MOCK_METHOD(void,
+              SystemSoundPlay,
+              (const std::string&,
+               std::unique_ptr<MethodResult<rapidjson::Document>>),
+              (override));
+
+  MOCK_METHOD(void,
+              QuitApplication,
+              (std::optional<HWND> hwnd,
+               std::optional<WPARAM> wparam,
+               std::optional<LPARAM> lparam,
+               UINT exit_code),
+              (override));
+
+ private:
+  FML_DISALLOW_COPY_AND_ASSIGN(MockPlatformHandler);
 };
 
 // A test version of the private ScopedClipboard.
 class MockScopedClipboard : public ScopedClipboardInterface {
  public:
+  MockScopedClipboard() = default;
+  virtual ~MockScopedClipboard() = default;
+
   MOCK_METHOD(int, Open, (HWND window), (override));
   MOCK_METHOD(bool, HasString, (), (override));
   MOCK_METHOD((std::variant<std::wstring, int>), GetString, (), (override));
   MOCK_METHOD(int, SetString, (const std::wstring string), (override));
+
+ private:
+  FML_DISALLOW_COPY_AND_ASSIGN(MockScopedClipboard);
 };
 
 std::string SimulatePlatformMessage(TestBinaryMessenger* messenger,
@@ -95,12 +135,45 @@ std::string SimulatePlatformMessage(TestBinaryMessenger* messenger,
 
 }  // namespace
 
-TEST(PlatformHandler, GetClipboardData) {
-  TestBinaryMessenger messenger;
-  FlutterWindowsView view(
-      std::make_unique<NiceMock<MockWindowBindingHandler>>());
+class PlatformHandlerTest : public WindowsTest {
+ public:
+  PlatformHandlerTest() = default;
+  virtual ~PlatformHandlerTest() = default;
+
+ protected:
+  FlutterWindowsEngine* engine() { return engine_.get(); }
+
+  void UseHeadlessEngine() {
+    FlutterWindowsEngineBuilder builder{GetContext()};
+
+    engine_ = builder.Build();
+  }
+
+  void UseEngineWithView() {
+    FlutterWindowsEngineBuilder builder{GetContext()};
+
+    auto window = std::make_unique<NiceMock<MockWindowBindingHandler>>();
+
+    engine_ = builder.Build();
+    view_ = std::make_unique<FlutterWindowsView>(kImplicitViewId, engine_.get(),
+                                                 std::move(window));
+
+    EngineModifier modifier{engine_.get()};
+    modifier.SetImplicitView(view_.get());
+  }
 
-  PlatformHandler platform_handler(&messenger, &view, []() {
+ private:
+  std::unique_ptr<FlutterWindowsEngine> engine_;
+  std::unique_ptr<FlutterWindowsView> view_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(PlatformHandlerTest);
+};
+
+TEST_F(PlatformHandlerTest, GetClipboardData) {
+  UseEngineWithView();
+
+  TestBinaryMessenger messenger;
+  PlatformHandler platform_handler(&messenger, engine(), []() {
     auto clipboard = std::make_unique<MockScopedClipboard>();
 
     EXPECT_CALL(*clipboard.get(), Open)
@@ -120,11 +193,11 @@ TEST(PlatformHandler, GetClipboardData) {
   EXPECT_EQ(result, "[{\"text\":\"Hello world\"}]");
 }
 
-TEST(PlatformHandler, GetClipboardDataRejectsUnknownContentType) {
+TEST_F(PlatformHandlerTest, GetClipboardDataRejectsUnknownContentType) {
+  UseEngineWithView();
+
   TestBinaryMessenger messenger;
-  FlutterWindowsView view(
-      std::make_unique<NiceMock<MockWindowBindingHandler>>());
-  PlatformHandler platform_handler(&messenger, &view);
+  PlatformHandler platform_handler(&messenger, engine());
 
   // Requesting an unknown content type is an error.
   std::string result = SimulatePlatformMessage(
@@ -133,12 +206,25 @@ TEST(PlatformHandler, GetClipboardDataRejectsUnknownContentType) {
   EXPECT_EQ(result, "[\"Clipboard error\",\"Unknown clipboard format\",null]");
 }
 
-TEST(PlatformHandler, GetClipboardDataReportsOpenFailure) {
+TEST_F(PlatformHandlerTest, GetClipboardDataRequiresView) {
+  UseHeadlessEngine();
+
   TestBinaryMessenger messenger;
-  FlutterWindowsView view(
-      std::make_unique<NiceMock<MockWindowBindingHandler>>());
+  PlatformHandler platform_handler(&messenger, engine());
 
-  PlatformHandler platform_handler(&messenger, &view, []() {
+  std::string result =
+      SimulatePlatformMessage(&messenger, kClipboardGetDataMessage);
+
+  EXPECT_EQ(result,
+            "[\"Clipboard error\",\"Clipboard is not available in "
+            "Windows headless mode\",null]");
+}
+
+TEST_F(PlatformHandlerTest, GetClipboardDataReportsOpenFailure) {
+  UseEngineWithView();
+
+  TestBinaryMessenger messenger;
+  PlatformHandler platform_handler(&messenger, engine(), []() {
     auto clipboard = std::make_unique<MockScopedClipboard>();
 
     EXPECT_CALL(*clipboard.get(), Open)
@@ -154,12 +240,11 @@ TEST(PlatformHandler, GetClipboardDataReportsOpenFailure) {
   EXPECT_EQ(result, "[\"Clipboard error\",\"Unable to open clipboard\",1]");
 }
 
-TEST(PlatformHandler, GetClipboardDataReportsGetDataFailure) {
-  TestBinaryMessenger messenger;
-  FlutterWindowsView view(
-      std::make_unique<NiceMock<MockWindowBindingHandler>>());
+TEST_F(PlatformHandlerTest, GetClipboardDataReportsGetDataFailure) {
+  UseEngineWithView();
 
-  PlatformHandler platform_handler(&messenger, &view, []() {
+  TestBinaryMessenger messenger;
+  PlatformHandler platform_handler(&messenger, engine(), []() {
     auto clipboard = std::make_unique<MockScopedClipboard>();
 
     EXPECT_CALL(*clipboard.get(), Open)
@@ -179,12 +264,11 @@ TEST(PlatformHandler, GetClipboardDataReportsGetDataFailure) {
   EXPECT_EQ(result, "[\"Clipboard error\",\"Unable to get clipboard data\",1]");
 }
 
-TEST(PlatformHandler, ClipboardHasStrings) {
-  TestBinaryMessenger messenger;
-  FlutterWindowsView view(
-      std::make_unique<NiceMock<MockWindowBindingHandler>>());
+TEST_F(PlatformHandlerTest, ClipboardHasStrings) {
+  UseEngineWithView();
 
-  PlatformHandler platform_handler(&messenger, &view, []() {
+  TestBinaryMessenger messenger;
+  PlatformHandler platform_handler(&messenger, engine(), []() {
     auto clipboard = std::make_unique<MockScopedClipboard>();
 
     EXPECT_CALL(*clipboard.get(), Open)
@@ -201,12 +285,11 @@ TEST(PlatformHandler, ClipboardHasStrings) {
   EXPECT_EQ(result, "[{\"value\":true}]");
 }
 
-TEST(PlatformHandler, ClipboardHasStringsReturnsFalse) {
-  TestBinaryMessenger messenger;
-  FlutterWindowsView view(
-      std::make_unique<NiceMock<MockWindowBindingHandler>>());
+TEST_F(PlatformHandlerTest, ClipboardHasStringsReturnsFalse) {
+  UseEngineWithView();
 
-  PlatformHandler platform_handler(&messenger, &view, []() {
+  TestBinaryMessenger messenger;
+  PlatformHandler platform_handler(&messenger, engine(), []() {
     auto clipboard = std::make_unique<MockScopedClipboard>();
 
     EXPECT_CALL(*clipboard.get(), Open)
@@ -223,11 +306,11 @@ TEST(PlatformHandler, ClipboardHasStringsReturnsFalse) {
   EXPECT_EQ(result, "[{\"value\":false}]");
 }
 
-TEST(PlatformHandler, ClipboardHasStringsRejectsUnknownContentType) {
+TEST_F(PlatformHandlerTest, ClipboardHasStringsRejectsUnknownContentType) {
+  UseEngineWithView();
+
   TestBinaryMessenger messenger;
-  FlutterWindowsView view(
-      std::make_unique<NiceMock<MockWindowBindingHandler>>());
-  PlatformHandler platform_handler(&messenger, &view);
+  PlatformHandler platform_handler(&messenger, engine());
 
   std::string result = SimulatePlatformMessage(
       &messenger, kClipboardHasStringsFakeContentTypeMessage);
@@ -235,13 +318,26 @@ TEST(PlatformHandler, ClipboardHasStringsRejectsUnknownContentType) {
   EXPECT_EQ(result, "[\"Clipboard error\",\"Unknown clipboard format\",null]");
 }
 
-// Regression test for https://github.com/flutter/flutter/issues/95817.
-TEST(PlatformHandler, ClipboardHasStringsIgnoresPermissionErrors) {
+TEST_F(PlatformHandlerTest, ClipboardHasStringsRequiresView) {
+  UseHeadlessEngine();
+
   TestBinaryMessenger messenger;
-  FlutterWindowsView view(
-      std::make_unique<NiceMock<MockWindowBindingHandler>>());
+  PlatformHandler platform_handler(&messenger, engine());
+
+  std::string result =
+      SimulatePlatformMessage(&messenger, kClipboardHasStringsMessage);
+
+  EXPECT_EQ(result,
+            "[\"Clipboard error\",\"Clipboard is not available in Windows "
+            "headless mode\",null]");
+}
+
+// Regression test for https://github.com/flutter/flutter/issues/95817.
+TEST_F(PlatformHandlerTest, ClipboardHasStringsIgnoresPermissionErrors) {
+  UseEngineWithView();
 
-  PlatformHandler platform_handler(&messenger, &view, []() {
+  TestBinaryMessenger messenger;
+  PlatformHandler platform_handler(&messenger, engine(), []() {
     auto clipboard = std::make_unique<MockScopedClipboard>();
 
     EXPECT_CALL(*clipboard.get(), Open)
@@ -257,12 +353,11 @@ TEST(PlatformHandler, ClipboardHasStringsIgnoresPermissionErrors) {
   EXPECT_EQ(result, "[{\"value\":false}]");
 }
 
-TEST(PlatformHandler, ClipboardHasStringsReportsErrors) {
-  TestBinaryMessenger messenger;
-  FlutterWindowsView view(
-      std::make_unique<NiceMock<MockWindowBindingHandler>>());
+TEST_F(PlatformHandlerTest, ClipboardHasStringsReportsErrors) {
+  UseEngineWithView();
 
-  PlatformHandler platform_handler(&messenger, &view, []() {
+  TestBinaryMessenger messenger;
+  PlatformHandler platform_handler(&messenger, engine(), []() {
     auto clipboard = std::make_unique<MockScopedClipboard>();
 
     EXPECT_CALL(*clipboard.get(), Open)
@@ -278,12 +373,11 @@ TEST(PlatformHandler, ClipboardHasStringsReportsErrors) {
   EXPECT_EQ(result, "[\"Clipboard error\",\"Unable to open clipboard\",1]");
 }
 
-TEST(PlatformHandler, ClipboardSetData) {
-  TestBinaryMessenger messenger;
-  FlutterWindowsView view(
-      std::make_unique<NiceMock<MockWindowBindingHandler>>());
+TEST_F(PlatformHandlerTest, ClipboardSetData) {
+  UseEngineWithView();
 
-  PlatformHandler platform_handler(&messenger, &view, []() {
+  TestBinaryMessenger messenger;
+  PlatformHandler platform_handler(&messenger, engine(), []() {
     auto clipboard = std::make_unique<MockScopedClipboard>();
 
     EXPECT_CALL(*clipboard.get(), Open)
@@ -305,11 +399,24 @@ TEST(PlatformHandler, ClipboardSetData) {
   EXPECT_EQ(result, "[null]");
 }
 
-TEST(PlatformHandler, ClipboardSetDataUnknownType) {
+// Regression test for: https://github.com/flutter/flutter/issues/121976
+TEST_F(PlatformHandlerTest, ClipboardSetDataTextMustBeString) {
+  UseEngineWithView();
+
   TestBinaryMessenger messenger;
-  FlutterWindowsView view(
-      std::make_unique<NiceMock<MockWindowBindingHandler>>());
-  PlatformHandler platform_handler(&messenger, &view);
+  PlatformHandler platform_handler(&messenger, engine());
+
+  std::string result =
+      SimulatePlatformMessage(&messenger, kClipboardSetDataNullTextMessage);
+
+  EXPECT_EQ(result, "[\"Clipboard error\",\"Unknown clipboard format\",null]");
+}
+
+TEST_F(PlatformHandlerTest, ClipboardSetDataUnknownType) {
+  UseEngineWithView();
+
+  TestBinaryMessenger messenger;
+  PlatformHandler platform_handler(&messenger, engine());
 
   std::string result =
       SimulatePlatformMessage(&messenger, kClipboardSetDataUnknownTypeMessage);
@@ -317,12 +424,25 @@ TEST(PlatformHandler, ClipboardSetDataUnknownType) {
   EXPECT_EQ(result, "[\"Clipboard error\",\"Unknown clipboard format\",null]");
 }
 
-TEST(PlatformHandler, ClipboardSetDataReportsOpenFailure) {
+TEST_F(PlatformHandlerTest, ClipboardSetDataRequiresView) {
+  UseHeadlessEngine();
+
   TestBinaryMessenger messenger;
-  FlutterWindowsView view(
-      std::make_unique<NiceMock<MockWindowBindingHandler>>());
+  PlatformHandler platform_handler(&messenger, engine());
+
+  std::string result =
+      SimulatePlatformMessage(&messenger, kClipboardSetDataMessage);
 
-  PlatformHandler platform_handler(&messenger, &view, []() {
+  EXPECT_EQ(result,
+            "[\"Clipboard error\",\"Clipboard is not available in Windows "
+            "headless mode\",null]");
+}
+
+TEST_F(PlatformHandlerTest, ClipboardSetDataReportsOpenFailure) {
+  UseEngineWithView();
+
+  TestBinaryMessenger messenger;
+  PlatformHandler platform_handler(&messenger, engine(), []() {
     auto clipboard = std::make_unique<MockScopedClipboard>();
 
     EXPECT_CALL(*clipboard.get(), Open)
@@ -338,12 +458,11 @@ TEST(PlatformHandler, ClipboardSetDataReportsOpenFailure) {
   EXPECT_EQ(result, "[\"Clipboard error\",\"Unable to open clipboard\",1]");
 }
 
-TEST(PlatformHandler, ClipboardSetDataReportsSetDataFailure) {
-  TestBinaryMessenger messenger;
-  FlutterWindowsView view(
-      std::make_unique<NiceMock<MockWindowBindingHandler>>());
+TEST_F(PlatformHandlerTest, ClipboardSetDataReportsSetDataFailure) {
+  UseEngineWithView();
 
-  PlatformHandler platform_handler(&messenger, &view, []() {
+  TestBinaryMessenger messenger;
+  PlatformHandler platform_handler(&messenger, engine(), []() {
     auto clipboard = std::make_unique<MockScopedClipboard>();
 
     EXPECT_CALL(*clipboard.get(), Open)
@@ -362,11 +481,11 @@ TEST(PlatformHandler, ClipboardSetDataReportsSetDataFailure) {
   EXPECT_EQ(result, "[\"Clipboard error\",\"Unable to set clipboard data\",1]");
 }
 
-TEST(PlatformHandler, PlaySystemSound) {
+TEST_F(PlatformHandlerTest, PlaySystemSound) {
+  UseHeadlessEngine();
+
   TestBinaryMessenger messenger;
-  FlutterWindowsView view(
-      std::make_unique<NiceMock<MockWindowBindingHandler>>());
-  MockPlatformHandler platform_handler(&messenger, &view);
+  MockPlatformHandler platform_handler(&messenger, engine());
 
   EXPECT_CALL(platform_handler, SystemSoundPlay("SystemSoundType.alert", _))
       .WillOnce([](const std::string& sound,
@@ -380,5 +499,76 @@ TEST(PlatformHandler, PlaySystemSound) {
   EXPECT_EQ(result, "[null]");
 }
 
+TEST_F(PlatformHandlerTest, SystemExitApplicationRequired) {
+  UseHeadlessEngine();
+  UINT exit_code = 0;
+
+  TestBinaryMessenger messenger([](const std::string& channel,
+                                   const uint8_t* message, size_t size,
+                                   BinaryReply reply) {});
+  MockPlatformHandler platform_handler(&messenger, engine());
+
+  ON_CALL(platform_handler, QuitApplication)
+      .WillByDefault([&exit_code](std::optional<HWND> hwnd,
+                                  std::optional<WPARAM> wparam,
+                                  std::optional<LPARAM> lparam,
+                                  UINT ec) { exit_code = ec; });
+  EXPECT_CALL(platform_handler, QuitApplication).Times(1);
+
+  std::string result = SimulatePlatformMessage(
+      &messenger, kSystemExitApplicationRequiredMessage);
+  EXPECT_EQ(result, "[{\"response\":\"exit\"}]");
+  EXPECT_EQ(exit_code, 1);
+}
+
+TEST_F(PlatformHandlerTest, SystemExitApplicationCancelableCancel) {
+  UseHeadlessEngine();
+  bool called_cancel = false;
+
+  TestBinaryMessenger messenger(
+      [&called_cancel](const std::string& channel, const uint8_t* message,
+                       size_t size, BinaryReply reply) {
+        reply(reinterpret_cast<const uint8_t*>(kExitResponseCancelMessage),
+              sizeof(kExitResponseCancelMessage));
+        called_cancel = true;
+      });
+  MockPlatformHandler platform_handler(&messenger, engine());
+
+  EXPECT_CALL(platform_handler, QuitApplication).Times(0);
+
+  std::string result = SimulatePlatformMessage(
+      &messenger, kSystemExitApplicationCancelableMessage);
+  EXPECT_EQ(result, "[{\"response\":\"cancel\"}]");
+  EXPECT_TRUE(called_cancel);
+}
+
+TEST_F(PlatformHandlerTest, SystemExitApplicationCancelableExit) {
+  UseHeadlessEngine();
+  bool called_cancel = false;
+  UINT exit_code = 0;
+
+  TestBinaryMessenger messenger(
+      [&called_cancel](const std::string& channel, const uint8_t* message,
+                       size_t size, BinaryReply reply) {
+        reply(reinterpret_cast<const uint8_t*>(kExitResponseExitMessage),
+              sizeof(kExitResponseExitMessage));
+        called_cancel = true;
+      });
+  MockPlatformHandler platform_handler(&messenger, engine());
+
+  ON_CALL(platform_handler, QuitApplication)
+      .WillByDefault([&exit_code](std::optional<HWND> hwnd,
+                                  std::optional<WPARAM> wparam,
+                                  std::optional<LPARAM> lparam,
+                                  UINT ec) { exit_code = ec; });
+  EXPECT_CALL(platform_handler, QuitApplication).Times(1);
+
+  std::string result = SimulatePlatformMessage(
+      &messenger, kSystemExitApplicationCancelableMessage);
+  EXPECT_EQ(result, "[{\"response\":\"cancel\"}]");
+  EXPECT_TRUE(called_cancel);
+  EXPECT_EQ(exit_code, 2);
+}
+
 }  // namespace testing
 }  // namespace flutter
diff --git a/shell/platform/windows/platform_view_manager.cc b/shell/platform/windows/platform_view_manager.cc
new file mode 100644
index 0000000000000000000000000000000000000000..cb403673597b6712e37178e44ef76d62cb2b4840
--- /dev/null
+++ b/shell/platform/windows/platform_view_manager.cc
@@ -0,0 +1,84 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/platform/windows/platform_view_manager.h"
+
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_method_codec.h"
+
+namespace flutter {
+
+namespace {
+constexpr char kChannelName[] = "flutter/platform_views";
+constexpr char kCreateMethod[] = "create";
+constexpr char kFocusMethod[] = "focus";
+constexpr char kViewTypeParameter[] = "viewType";
+constexpr char kIdParameter[] = "id";
+constexpr char kDirectionParameter[] = "direction";
+constexpr char kFocusParameter[] = "focus";
+}  // namespace
+
+PlatformViewManager::PlatformViewManager(BinaryMessenger* binary_messenger)
+    : channel_(std::make_unique<MethodChannel<EncodableValue>>(
+          binary_messenger,
+          kChannelName,
+          &StandardMethodCodec::GetInstance())) {
+  channel_->SetMethodCallHandler(
+      [this](const MethodCall<EncodableValue>& call,
+             std::unique_ptr<MethodResult<EncodableValue>> result) {
+        const auto& args = std::get<EncodableMap>(*call.arguments());
+        if (call.method_name() == kCreateMethod) {
+          const auto& type_itr = args.find(EncodableValue(kViewTypeParameter));
+          const auto& id_itr = args.find(EncodableValue(kIdParameter));
+          if (type_itr == args.end()) {
+            result->Error("AddPlatformView", "Parameter viewType is required");
+            return;
+          }
+          if (id_itr == args.end()) {
+            result->Error("AddPlatformView", "Parameter id is required");
+            return;
+          }
+          const auto& type = std::get<std::string>(type_itr->second);
+          const auto& id = std::get<std::int32_t>(id_itr->second);
+          if (AddPlatformView(id, type)) {
+            result->Success();
+          } else {
+            result->Error("AddPlatformView", "Failed to add platform view");
+          }
+          return;
+        } else if (call.method_name() == kFocusMethod) {
+          const auto& id_itr = args.find(EncodableValue(kIdParameter));
+          const auto& direction_itr =
+              args.find(EncodableValue(kDirectionParameter));
+          const auto& focus_itr = args.find(EncodableValue(kFocusParameter));
+          if (id_itr == args.end()) {
+            result->Error("FocusPlatformView", "Parameter id is required");
+            return;
+          }
+          if (direction_itr == args.end()) {
+            result->Error("FocusPlatformView",
+                          "Parameter direction is required");
+            return;
+          }
+          if (focus_itr == args.end()) {
+            result->Error("FocusPlatformView", "Parameter focus is required");
+            return;
+          }
+          const auto& id = std::get<std::int32_t>(id_itr->second);
+          const auto& direction = std::get<std::int32_t>(direction_itr->second);
+          const auto& focus = std::get<bool>(focus_itr->second);
+          if (FocusPlatformView(
+                  id, static_cast<FocusChangeDirection>(direction), focus)) {
+            result->Success();
+          } else {
+            result->Error("FocusPlatformView", "Failed to focus platform view");
+          }
+          return;
+        }
+        result->NotImplemented();
+      });
+}
+
+PlatformViewManager::~PlatformViewManager() {}
+
+}  // namespace flutter
diff --git a/shell/platform/windows/platform_view_manager.h b/shell/platform/windows/platform_view_manager.h
new file mode 100644
index 0000000000000000000000000000000000000000..d4b736f9602fce2234cf8fcf90e02b078362277c
--- /dev/null
+++ b/shell/platform/windows/platform_view_manager.h
@@ -0,0 +1,52 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_PLATFORM_VIEW_MANAGER_H_
+#define FLUTTER_SHELL_PLATFORM_WINDOWS_PLATFORM_VIEW_MANAGER_H_
+
+#include <memory>
+
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_channel.h"
+#include "flutter/shell/platform/windows/flutter_windows_internal.h"
+#include "flutter/shell/platform/windows/task_runner.h"
+
+namespace flutter {
+
+// Possible reasons for change of keyboard focus.
+enum class FocusChangeDirection {
+  kProgrammatic,  // Un-directed focus change.
+  kForward,       // Keyboard focus moves forwards, e.g. TAB key.
+  kBackward       // Keyboard focus moves backwards, e.g. Shift+TAB.
+};
+
+// The platform method handler for platform view related communication between
+// the engine and the framework. This base class is derived by a concrete class
+// (i.e. PlatformViewPlugin) to provide implementation of its abstract virtual
+// methods.
+class PlatformViewManager {
+ public:
+  PlatformViewManager(BinaryMessenger* binary_messenger);
+
+  virtual ~PlatformViewManager();
+
+  // Add a new platform view instance to be lazily instantiated when it is next
+  // composited. The manager will invoke Success when this method returns true,
+  // and invoke Error otherwise.
+  virtual bool AddPlatformView(PlatformViewId id,
+                               std::string_view type_name) = 0;
+
+  // The framework may invoke this method when keyboard focus must be given to
+  // the platform view. The manager will invoke Success when this method returns
+  // true, and invoke Error otherwise.
+  virtual bool FocusPlatformView(PlatformViewId id,
+                                 FocusChangeDirection direction,
+                                 bool focus) = 0;
+
+ private:
+  std::unique_ptr<MethodChannel<EncodableValue>> channel_;
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_PLATFORM_VIEW_MANAGER_H_
diff --git a/shell/platform/windows/platform_view_plugin.cc b/shell/platform/windows/platform_view_plugin.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a54ebfebf1a64b12c9dafab40031a95cf92beb96
--- /dev/null
+++ b/shell/platform/windows/platform_view_plugin.cc
@@ -0,0 +1,47 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/platform/windows/platform_view_plugin.h"
+
+namespace flutter {
+
+PlatformViewPlugin::PlatformViewPlugin(BinaryMessenger* messenger,
+                                       TaskRunner* task_runner)
+    : PlatformViewManager(messenger), task_runner_(task_runner) {}
+
+PlatformViewPlugin::~PlatformViewPlugin() {}
+
+// TODO(schectman): Impelement platform view lookup.
+// https://github.com/flutter/flutter/issues/143375
+std::optional<HWND> PlatformViewPlugin::GetNativeHandleForId(
+    PlatformViewId id) const {
+  return std::nullopt;
+}
+
+// TODO(schectman): Impelement platform view type registration.
+// https://github.com/flutter/flutter/issues/143375
+void PlatformViewPlugin::RegisterPlatformViewType(
+    std::string_view type_name,
+    const FlutterPlatformViewTypeEntry& type) {}
+
+// TODO(schectman): Impelement platform view instantiation.
+// https://github.com/flutter/flutter/issues/143375
+void PlatformViewPlugin::InstantiatePlatformView(PlatformViewId id) {}
+
+// TODO(schectman): Impelement platform view addition.
+// https://github.com/flutter/flutter/issues/143375
+bool PlatformViewPlugin::AddPlatformView(PlatformViewId id,
+                                         std::string_view type_name) {
+  return true;
+}
+
+// TODO(schectman): Impelement platform view focus request.
+// https://github.com/flutter/flutter/issues/143375
+bool PlatformViewPlugin::FocusPlatformView(PlatformViewId id,
+                                           FocusChangeDirection direction,
+                                           bool focus) {
+  return true;
+}
+
+}  // namespace flutter
diff --git a/shell/platform/windows/platform_view_plugin.h b/shell/platform/windows/platform_view_plugin.h
new file mode 100644
index 0000000000000000000000000000000000000000..490d21a8e0ba2705b26a5a97479fe95af30d5668
--- /dev/null
+++ b/shell/platform/windows/platform_view_plugin.h
@@ -0,0 +1,67 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_PLATFORM_VIEW_PLUGIN_H_
+#define FLUTTER_SHELL_PLATFORM_WINDOWS_PLATFORM_VIEW_PLUGIN_H_
+
+#include "flutter/shell/platform/windows/platform_view_manager.h"
+
+#include <functional>
+#include <map>
+#include <optional>
+
+namespace flutter {
+
+// The concrete implementation of PlatformViewManager that keeps track of
+// existing platform view types and instances, and handles their instantiation.
+class PlatformViewPlugin : public PlatformViewManager {
+ public:
+  PlatformViewPlugin(BinaryMessenger* messenger, TaskRunner* task_runner);
+
+  ~PlatformViewPlugin();
+
+  // Find the HWND corresponding to a platform view id. Returns null if the id
+  // has no associated platform view.
+  std::optional<HWND> GetNativeHandleForId(PlatformViewId id) const;
+
+  // The runner-facing API calls this method to register a window type
+  // corresponding to a platform view identifier supplied to the widget tree.
+  void RegisterPlatformViewType(std::string_view type_name,
+                                const FlutterPlatformViewTypeEntry& type);
+
+  // | PlatformViewManager |
+  // type_name must correspond to a string that has already been registered
+  // with RegisterPlatformViewType.
+  bool AddPlatformView(PlatformViewId id, std::string_view type_name) override;
+
+  // Create a queued platform view instance after it has been added.
+  // id must correspond to an identifier that has already been added with
+  // AddPlatformView.
+  // This method will create the platform view within a task queued to the
+  // engine's TaskRunner, which will run on the UI thread.
+  void InstantiatePlatformView(PlatformViewId id);
+
+  // | PlatformViewManager |
+  // id must correspond to an identifier that has already been added with
+  // AddPlatformView.
+  bool FocusPlatformView(PlatformViewId id,
+                         FocusChangeDirection direction,
+                         bool focus) override;
+
+ private:
+  std::unordered_map<std::string, FlutterPlatformViewTypeEntry>
+      platform_view_types_;
+
+  std::unordered_map<PlatformViewId, HWND> platform_views_;
+
+  std::unordered_map<PlatformViewId, std::function<HWND()>>
+      pending_platform_views_;
+
+  // Pointer to the task runner of the associated engine.
+  TaskRunner* task_runner_;
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_PLATFORM_VIEW_PLUGIN_H_
diff --git a/shell/platform/windows/public/flutter_windows.h b/shell/platform/windows/public/flutter_windows.h
index 1498906fe1d9011d5e24bb9471fac761f800a1c2..80d78766f9383af7ae1372d557f909c3a956ef18 100644
--- a/shell/platform/windows/public/flutter_windows.h
+++ b/shell/platform/windows/public/flutter_windows.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_PUBLIC_FLUTTER_H_
-#define FLUTTER_SHELL_PLATFORM_WINDOWS_PUBLIC_FLUTTER_H_
+#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_PUBLIC_FLUTTER_WINDOWS_H_
+#define FLUTTER_SHELL_PLATFORM_WINDOWS_PUBLIC_FLUTTER_WINDOWS_H_
 
 #include <dxgi.h>
 #include <stddef.h>
@@ -20,9 +20,9 @@ extern "C" {
 
 typedef void (*VoidCallback)(void* /* user data */);
 
-// Opaque reference to a Flutter window controller.
-typedef struct FlutterDesktopViewControllerState*
-    FlutterDesktopViewControllerRef;
+// Opaque reference to a Flutter view controller.
+struct FlutterDesktopViewController;
+typedef struct FlutterDesktopViewController* FlutterDesktopViewControllerRef;
 
 // Opaque reference to a Flutter window.
 struct FlutterDesktopView;
@@ -32,6 +32,9 @@ typedef struct FlutterDesktopView* FlutterDesktopViewRef;
 struct FlutterDesktopEngine;
 typedef struct FlutterDesktopEngine* FlutterDesktopEngineRef;
 
+// The unique identifier for a view.
+typedef int64_t FlutterDesktopViewId;
+
 // Properties for configuring a Flutter engine instance.
 typedef struct {
   // The path to the flutter_assets folder for the application to be run.
@@ -97,17 +100,21 @@ FlutterDesktopViewControllerCreate(int width,
 FLUTTER_EXPORT void FlutterDesktopViewControllerDestroy(
     FlutterDesktopViewControllerRef controller);
 
+// Returns the view controller's view ID.
+FLUTTER_EXPORT FlutterDesktopViewId FlutterDesktopViewControllerGetViewId(
+    FlutterDesktopViewControllerRef view_controller);
+
 // Returns the handle for the engine running in FlutterDesktopViewControllerRef.
 //
 // Its lifetime is the same as the |controller|'s.
 FLUTTER_EXPORT FlutterDesktopEngineRef FlutterDesktopViewControllerGetEngine(
     FlutterDesktopViewControllerRef controller);
-// Returns the view managed by the given controller.
 
-FLUTTER_EXPORT FlutterDesktopViewRef
-FlutterDesktopViewControllerGetView(FlutterDesktopViewControllerRef controller);
+// Returns the view managed by the given controller.
+FLUTTER_EXPORT FlutterDesktopViewRef FlutterDesktopViewControllerGetView(
+    FlutterDesktopViewControllerRef controller);
 
-// Requests new frame from engine and repaints the view
+// Requests new frame from the engine and repaints the view.
 FLUTTER_EXPORT void FlutterDesktopViewControllerForceRedraw(
     FlutterDesktopViewControllerRef controller);
 
@@ -167,8 +174,8 @@ FLUTTER_EXPORT bool FlutterDesktopEngineRun(FlutterDesktopEngineRef engine,
 // This should be called on every run of the application-level runloop, and
 // a wait for native events in the runloop should never be longer than the
 // last return value from this function.
-FLUTTER_EXPORT uint64_t
-FlutterDesktopEngineProcessMessages(FlutterDesktopEngineRef engine);
+FLUTTER_EXPORT uint64_t FlutterDesktopEngineProcessMessages(
+    FlutterDesktopEngineRef engine);
 
 FLUTTER_EXPORT void FlutterDesktopEngineReloadSystemFonts(
     FlutterDesktopEngineRef engine);
@@ -187,8 +194,8 @@ FlutterDesktopEngineGetPluginRegistrar(FlutterDesktopEngineRef engine,
 //
 // Callers should use |FlutterDesktopMessengerAddRef| if the returned pointer
 // will potentially outlive 'engine', such as when passing it to another thread.
-FLUTTER_EXPORT FlutterDesktopMessengerRef
-FlutterDesktopEngineGetMessenger(FlutterDesktopEngineRef engine);
+FLUTTER_EXPORT FlutterDesktopMessengerRef FlutterDesktopEngineGetMessenger(
+    FlutterDesktopEngineRef engine);
 
 // Returns the texture registrar associated with the engine.
 FLUTTER_EXPORT FlutterDesktopTextureRegistrarRef
@@ -205,13 +212,25 @@ FLUTTER_EXPORT void FlutterDesktopEngineSetNextFrameCallback(
 
 // ========== View ==========
 
-// Return backing HWND for manipulation in host application.
+// Returns the backing HWND for manipulation in host application.
 FLUTTER_EXPORT HWND FlutterDesktopViewGetHWND(FlutterDesktopViewRef view);
 
 // Returns the DXGI adapter used for rendering or nullptr in case of error.
 FLUTTER_EXPORT IDXGIAdapter* FlutterDesktopViewGetGraphicsAdapter(
     FlutterDesktopViewRef view);
 
+// Called to pass an external window message to the engine for lifecycle
+// state updates. Non-Flutter windows must call this method in their WndProc
+// in order to be included in the logic for application lifecycle state
+// updates. Returns a result if the message should be consumed.
+FLUTTER_EXPORT bool FlutterDesktopEngineProcessExternalWindowMessage(
+    FlutterDesktopEngineRef engine,
+    HWND hwnd,
+    UINT message,
+    WPARAM wparam,
+    LPARAM lparam,
+    LRESULT* result);
+
 // ========== Plugin Registrar (extensions) ==========
 // These are Windows-specific extensions to flutter_plugin_registrar.h
 
@@ -230,10 +249,22 @@ typedef bool (*FlutterDesktopWindowProcCallback)(HWND /* hwnd */,
                                                  void* /* user data */,
                                                  LRESULT* result);
 
-// Returns the view associated with this registrar's engine instance.
+// Returns the implicit view associated with this registrar's engine instance,
+// or null if there is no implicit view.
+//
+// See:
+// https://api.flutter.dev/flutter/dart-ui/PlatformDispatcher/implicitView.html
+//
+// DEPRECATED: Use |FlutterDesktopPluginRegistrarGetViewById| instead.
 FLUTTER_EXPORT FlutterDesktopViewRef FlutterDesktopPluginRegistrarGetView(
     FlutterDesktopPluginRegistrarRef registrar);
 
+// Returns the view associated with the registrar's engine instance, or null if
+// the view does not exist.
+FLUTTER_EXPORT FlutterDesktopViewRef FlutterDesktopPluginRegistrarGetViewById(
+    FlutterDesktopPluginRegistrarRef registrar,
+    FlutterDesktopViewId view_id);
+
 FLUTTER_EXPORT void
 FlutterDesktopPluginRegistrarRegisterTopLevelWindowProcDelegate(
     FlutterDesktopPluginRegistrarRef registrar,
diff --git a/shell/platform/windows/sequential_id_generator.h b/shell/platform/windows/sequential_id_generator.h
index 5efd6d78fe2af90b5f274d0c5e9670464ce21ee3..7811656268daa2d467efb99736c4a66f810da2ed 100644
--- a/shell/platform/windows/sequential_id_generator.h
+++ b/shell/platform/windows/sequential_id_generator.h
@@ -8,6 +8,8 @@
 #include <cstdint>
 #include <unordered_map>
 
+#include "flutter/fml/macros.h"
+
 namespace flutter {
 
 // This is used to generate a series of sequential ID numbers in a way that a
@@ -52,6 +54,8 @@ class SequentialIdGenerator {
   const uint32_t min_id_;
   const uint32_t max_id_;
   uint32_t min_available_id_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(SequentialIdGenerator);
 };
 
 }  // namespace flutter
diff --git a/shell/platform/windows/settings_plugin.cc b/shell/platform/windows/settings_plugin.cc
index 2754516e108be243aad683e7f4989c8e323f2158..094184703a0309238fa1ff865443dfc40a97029e 100644
--- a/shell/platform/windows/settings_plugin.cc
+++ b/shell/platform/windows/settings_plugin.cc
@@ -26,6 +26,32 @@ constexpr wchar_t kGetPreferredBrightnessRegValue[] = L"AppsUseLightTheme";
 constexpr wchar_t kGetTextScaleFactorRegKey[] =
     L"Software\\Microsoft\\Accessibility";
 constexpr wchar_t kGetTextScaleFactorRegValue[] = L"TextScaleFactor";
+
+// Return an approximation of the apparent luminance of a given color.
+int GetLuminance(DWORD color) {
+  int r = GetRValue(color);
+  int g = GetGValue(color);
+  int b = GetBValue(color);
+  return (r + r + r + b + (g << 2)) >> 3;
+}
+
+// Return kLight if light mode for apps is selected, otherwise return kDark.
+SettingsPlugin::PlatformBrightness GetThemeBrightness() {
+  DWORD use_light_theme;
+  DWORD use_light_theme_size = sizeof(use_light_theme);
+  LONG result = RegGetValue(HKEY_CURRENT_USER, kGetPreferredBrightnessRegKey,
+                            kGetPreferredBrightnessRegValue, RRF_RT_REG_DWORD,
+                            nullptr, &use_light_theme, &use_light_theme_size);
+
+  if (result == 0) {
+    return use_light_theme ? SettingsPlugin::PlatformBrightness::kLight
+                           : SettingsPlugin::PlatformBrightness::kDark;
+  } else {
+    // The current OS does not support dark mode. (Older Windows 10 or before
+    // Windows 10)
+    return SettingsPlugin::PlatformBrightness::kLight;
+  }
+}
 }  // namespace
 
 SettingsPlugin::SettingsPlugin(BinaryMessenger* messenger,
@@ -103,19 +129,13 @@ float SettingsPlugin::GetTextScaleFactor() {
 }
 
 SettingsPlugin::PlatformBrightness SettingsPlugin::GetPreferredBrightness() {
-  DWORD use_light_theme;
-  DWORD use_light_theme_size = sizeof(use_light_theme);
-  LONG result = RegGetValue(HKEY_CURRENT_USER, kGetPreferredBrightnessRegKey,
-                            kGetPreferredBrightnessRegValue, RRF_RT_REG_DWORD,
-                            nullptr, &use_light_theme, &use_light_theme_size);
-
-  if (result == 0) {
-    return use_light_theme ? SettingsPlugin::PlatformBrightness::kLight
-                           : SettingsPlugin::PlatformBrightness::kDark;
+  if (is_high_contrast_) {
+    DWORD window_color = GetSysColor(COLOR_WINDOW);
+    int luminance = GetLuminance(window_color);
+    return luminance >= 127 ? SettingsPlugin::PlatformBrightness::kLight
+                            : SettingsPlugin::PlatformBrightness::kDark;
   } else {
-    // The current OS does not support dark mode. (Older Windows 10 or before
-    // Windows 10)
-    return SettingsPlugin::PlatformBrightness::kLight;
+    return GetThemeBrightness();
   }
 }
 
@@ -146,4 +166,9 @@ void SettingsPlugin::WatchTextScaleFactorChanged() {
       text_scale_factor_changed_watcher_->GetHandle(), TRUE);
 }
 
+void SettingsPlugin::UpdateHighContrastMode(bool is_high_contrast) {
+  is_high_contrast_ = is_high_contrast;
+  SendSettings();
+}
+
 }  // namespace flutter
diff --git a/shell/platform/windows/settings_plugin.h b/shell/platform/windows/settings_plugin.h
index 2c663fc048212a455e996415db3c4f46b08adc08..479a45c13c0ae308d64959c5fb3ccfb1f2a1394b 100644
--- a/shell/platform/windows/settings_plugin.h
+++ b/shell/platform/windows/settings_plugin.h
@@ -9,6 +9,7 @@
 
 #include <memory>
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/basic_message_channel.h"
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h"
 #include "flutter/shell/platform/windows/event_watcher.h"
@@ -23,6 +24,8 @@ namespace flutter {
 // These are typically set in the control panel.
 class SettingsPlugin {
  public:
+  enum struct PlatformBrightness { kDark, kLight };
+
   explicit SettingsPlugin(BinaryMessenger* messenger, TaskRunner* task_runner);
 
   virtual ~SettingsPlugin();
@@ -37,9 +40,10 @@ class SettingsPlugin {
   // this automatically.
   virtual void StopWatching();
 
- protected:
-  enum struct PlatformBrightness { kDark, kLight };
+  // Update the high contrast status of the system.
+  virtual void UpdateHighContrastMode(bool is_high_contrast);
 
+ protected:
   // Returns `true` if the user uses 24 hour time.
   virtual bool GetAlwaysUse24HourFormat();
 
@@ -55,6 +59,8 @@ class SettingsPlugin {
   // Starts watching text scale factor changes.
   virtual void WatchTextScaleFactorChanged();
 
+  bool is_high_contrast_ = false;
+
  private:
   std::unique_ptr<BasicMessageChannel<rapidjson::Document>> channel_;
 
@@ -66,8 +72,7 @@ class SettingsPlugin {
 
   TaskRunner* task_runner_;
 
-  SettingsPlugin(const SettingsPlugin&) = delete;
-  SettingsPlugin& operator=(const SettingsPlugin&) = delete;
+  FML_DISALLOW_COPY_AND_ASSIGN(SettingsPlugin);
 };
 
 }  // namespace flutter
diff --git a/shell/platform/windows/settings_plugin_unittests.cc b/shell/platform/windows/settings_plugin_unittests.cc
index 2380f4601701420575a2f2c43d3fd51cf997d2d2..aebe3ff6c256f1c067f8d0b4d3ecb7816038d61f 100644
--- a/shell/platform/windows/settings_plugin_unittests.cc
+++ b/shell/platform/windows/settings_plugin_unittests.cc
@@ -1,8 +1,10 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+
 #include "flutter/shell/platform/windows/settings_plugin.h"
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/windows/task_runner.h"
 #include "flutter/shell/platform/windows/testing/test_binary_messenger.h"
 #include "gmock/gmock.h"
@@ -21,13 +23,18 @@ class MockSettingsPlugin : public SettingsPlugin {
 
   virtual ~MockSettingsPlugin() = default;
 
+  bool is_high_contrast() { return is_high_contrast_; }
+
   // |SettingsPlugin|
-  MOCK_METHOD0(GetAlwaysUse24HourFormat, bool());
-  MOCK_METHOD0(GetTextScaleFactor, float());
-  MOCK_METHOD0(GetPreferredBrightness, PlatformBrightness());
+  MOCK_METHOD(bool, GetAlwaysUse24HourFormat, (), (override));
+  MOCK_METHOD(float, GetTextScaleFactor, (), (override));
+  MOCK_METHOD(PlatformBrightness, GetPreferredBrightness, (), (override));
+
+  MOCK_METHOD(void, WatchPreferredBrightnessChanged, (), (override));
+  MOCK_METHOD(void, WatchTextScaleFactorChanged, (), (override));
 
-  MOCK_METHOD0(WatchPreferredBrightnessChanged, void());
-  MOCK_METHOD0(WatchTextScaleFactorChanged, void());
+ private:
+  FML_DISALLOW_COPY_AND_ASSIGN(MockSettingsPlugin);
 };
 
 }  // namespace
@@ -70,5 +77,24 @@ TEST(SettingsPluginTest, StartWatchingStartsWatchingChanges) {
   settings_plugin.StartWatching();
 }
 
+TEST(SettingsPluginTest, HighContrastModeHonored) {
+  int times = 0;
+  TestBinaryMessenger messenger(
+      [&times](const std::string& channel, const uint8_t* message,
+               size_t message_size, BinaryReply reply) {
+        ASSERT_EQ(channel, "flutter/settings");
+        times++;
+      });
+  ::testing::NiceMock<MockSettingsPlugin> settings_plugin(&messenger, nullptr);
+
+  settings_plugin.UpdateHighContrastMode(true);
+  EXPECT_TRUE(settings_plugin.is_high_contrast());
+
+  settings_plugin.UpdateHighContrastMode(false);
+  EXPECT_FALSE(settings_plugin.is_high_contrast());
+
+  EXPECT_EQ(times, 2);
+}
+
 }  // namespace testing
 }  // namespace flutter
diff --git a/shell/platform/windows/system_utils.cc b/shell/platform/windows/system_utils.cc
index 538330f5226cfffe55c685431bea960f6427feb7..a858042aa3249ff52df80dc5b2f97bac188946e5 100644
--- a/shell/platform/windows/system_utils.cc
+++ b/shell/platform/windows/system_utils.cc
@@ -13,8 +13,9 @@
 namespace flutter {
 
 std::vector<LanguageInfo> GetPreferredLanguageInfo(
-    const WindowsRegistry& registry) {
-  std::vector<std::wstring> languages = GetPreferredLanguages(registry);
+    const WindowsProcTable& windows_proc_table) {
+  std::vector<std::wstring> languages =
+      GetPreferredLanguages(windows_proc_table);
   std::vector<LanguageInfo> language_info;
   language_info.reserve(languages.size());
 
@@ -24,63 +25,29 @@ std::vector<LanguageInfo> GetPreferredLanguageInfo(
   return language_info;
 }
 
-std::wstring GetPreferredLanguagesFromRegistry(const WindowsRegistry& registry,
-                                               ULONG buffer_size) {
-  std::wstring buffer(buffer_size, '\0');
-  if (registry.GetRegistryValue(HKEY_CURRENT_USER, kGetPreferredLanguageRegKey,
-                                kGetPreferredLanguageRegValue,
-                                RRF_RT_REG_MULTI_SZ, NULL, buffer.data(),
-                                &buffer_size) != ERROR_SUCCESS) {
-    return std::wstring();
-  }
-  return buffer;
-}
-
-std::wstring GetPreferredLanguagesFromMUI() {
-  ULONG buffer_size;
+std::wstring GetPreferredLanguagesFromMUI(
+    const WindowsProcTable& windows_proc_table) {
+  ULONG buffer_size = 0;
   ULONG count = 0;
   DWORD flags = MUI_LANGUAGE_NAME | MUI_UI_FALLBACK;
-  if (!GetThreadPreferredUILanguages(flags, &count, nullptr, &buffer_size)) {
+  if (!windows_proc_table.GetThreadPreferredUILanguages(flags, &count, nullptr,
+                                                        &buffer_size)) {
     return std::wstring();
   }
   std::wstring buffer(buffer_size, '\0');
-  if (!GetThreadPreferredUILanguages(flags, &count, buffer.data(),
-                                     &buffer_size)) {
+  if (!windows_proc_table.GetThreadPreferredUILanguages(
+          flags, &count, buffer.data(), &buffer_size)) {
     return std::wstring();
   }
   return buffer;
 }
 
 std::vector<std::wstring> GetPreferredLanguages(
-    const WindowsRegistry& registry) {
+    const WindowsProcTable& windows_proc_table) {
   std::vector<std::wstring> languages;
-  BOOL languages_from_registry = TRUE;
-  ULONG buffer_size = 0;
-  ULONG count = 0;
-  DWORD flags = MUI_LANGUAGE_NAME | MUI_UI_FALLBACK;
-
-  // Determine where languages are defined and get buffer length
-  if (registry.GetRegistryValue(HKEY_CURRENT_USER, kGetPreferredLanguageRegKey,
-                                kGetPreferredLanguageRegValue,
-                                RRF_RT_REG_MULTI_SZ, NULL, NULL,
-                                &buffer_size) != ERROR_SUCCESS) {
-    languages_from_registry = FALSE;
-  }
-
-  // Multi-string must be at least 3-long if non-empty,
-  // as a multi-string is terminated with 2 nulls.
-  //
-  // See:
-  // https://learn.microsoft.com/windows/win32/sysinfo/registry-value-types
-  if (languages_from_registry && buffer_size < 3) {
-    languages_from_registry = FALSE;
-  }
 
   // Initialize the buffer
-  std::wstring buffer =
-      languages_from_registry
-          ? GetPreferredLanguagesFromRegistry(registry, buffer_size)
-          : GetPreferredLanguagesFromMUI();
+  std::wstring buffer = GetPreferredLanguagesFromMUI(windows_proc_table);
 
   // Extract the individual languages from the buffer.
   size_t start = 0;
diff --git a/shell/platform/windows/system_utils.h b/shell/platform/windows/system_utils.h
index d4072912da2c19be313291baedecbbdb7b10692c..9afa1b90ecc39792d3052362e0be72b7c670110a 100644
--- a/shell/platform/windows/system_utils.h
+++ b/shell/platform/windows/system_utils.h
@@ -10,7 +10,7 @@
 #include <string>
 #include <vector>
 
-#include "flutter/shell/platform/windows/windows_registry.h"
+#include "flutter/shell/platform/windows/windows_proc_table.h"
 
 namespace flutter {
 
@@ -29,20 +29,17 @@ struct LanguageInfo {
 // Returns the list of user-preferred languages, in preference order,
 // parsed into LanguageInfo structures.
 std::vector<LanguageInfo> GetPreferredLanguageInfo(
-    const WindowsRegistry& registry);
-
-// Retrieve the preferred languages from the registry.
-std::wstring GetPreferredLanguagesFromRegistry(const WindowsRegistry& registry,
-                                               ULONG buffer_size);
+    const WindowsProcTable& windows_proc_table);
 
 // Retrieve the preferred languages from the MUI API.
-std::wstring GetPreferredLanguagesFromMUI();
+std::wstring GetPreferredLanguagesFromMUI(
+    const WindowsProcTable& windows_proc_table);
 
 // Returns the list of user-preferred languages, in preference order.
 // The language names are as described at:
 // https://docs.microsoft.com/en-us/windows/win32/intl/language-names
 std::vector<std::wstring> GetPreferredLanguages(
-    const WindowsRegistry& registry);
+    const WindowsProcTable& windows_proc_table);
 
 // Parses a Windows language name into its components.
 LanguageInfo ParseLanguageName(std::wstring language_name);
diff --git a/shell/platform/windows/system_utils_unittests.cc b/shell/platform/windows/system_utils_unittests.cc
index dad4bf729c702e842c37b3e8dfec94e5a4b1c63c..1b53ed7748dc8a749621cf6993f47a9e805035ec 100644
--- a/shell/platform/windows/system_utils_unittests.cc
+++ b/shell/platform/windows/system_utils_unittests.cc
@@ -5,43 +5,18 @@
 #include <cstring>
 #include <cwchar>
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/windows/system_utils.h"
+#include "flutter/shell/platform/windows/testing/mock_windows_proc_table.h"
 #include "gtest/gtest.h"
 
 namespace flutter {
 namespace testing {
 
-class MockWindowsRegistry : public WindowsRegistry {
- public:
-  virtual ~MockWindowsRegistry() {}
-
-  virtual LSTATUS GetRegistryValue(HKEY hkey,
-                                   LPCWSTR key,
-                                   LPCWSTR value,
-                                   DWORD flags,
-                                   LPDWORD type,
-                                   PVOID data,
-                                   LPDWORD data_size) const {
-    using namespace std::string_literals;
-    static const std::wstring locales =
-        L"en-US\0zh-Hans-CN\0ja\0zh-Hant-TW\0he\0\0"s;
-    static DWORD locales_len = locales.size() * sizeof(wchar_t);
-    if (data != nullptr) {
-      if (*data_size < locales_len) {
-        return ERROR_MORE_DATA;
-      }
-      std::memcpy(data, locales.data(), locales_len);
-      *data_size = locales_len;
-    } else if (data_size != NULL) {
-      *data_size = locales_len;
-    }
-    return ERROR_SUCCESS;
-  }
-};
-
 TEST(SystemUtils, GetPreferredLanguageInfo) {
-  WindowsRegistry registry;
-  std::vector<LanguageInfo> languages = GetPreferredLanguageInfo(registry);
+  WindowsProcTable proc_table;
+  std::vector<LanguageInfo> languages =
+      GetPreferredLanguageInfo(WindowsProcTable());
   // There should be at least one language.
   ASSERT_GE(languages.size(), 1);
   // The info should have a valid languge.
@@ -49,24 +24,30 @@ TEST(SystemUtils, GetPreferredLanguageInfo) {
 }
 
 TEST(SystemUtils, GetPreferredLanguages) {
-  WindowsRegistry registry;
-  std::vector<std::wstring> languages = GetPreferredLanguages(registry);
+  MockWindowsProcTable proc_table;
+  EXPECT_CALL(proc_table, GetThreadPreferredUILanguages)
+      .WillRepeatedly(
+          [](DWORD flags, PULONG count, PZZWSTR languages, PULONG size) {
+            // Languages string ends in a double-null.
+            static const wchar_t lang[] = L"en-US\0";
+            static const size_t lang_len = sizeof(lang) / sizeof(wchar_t);
+            static const int cnt = 1;
+            if (languages == nullptr) {
+              *size = lang_len;
+              *count = cnt;
+            } else if (*size >= lang_len) {
+              memcpy(languages, lang, lang_len * sizeof(wchar_t));
+            }
+            return TRUE;
+          });
+  std::vector<std::wstring> languages = GetPreferredLanguages(proc_table);
   // There should be at least one language.
   ASSERT_GE(languages.size(), 1);
   // The language should be non-empty.
   EXPECT_FALSE(languages[0].empty());
   // There should not be a trailing null from the parsing step.
   EXPECT_EQ(languages[0].size(), wcslen(languages[0].c_str()));
-
-  // Test mock results
-  MockWindowsRegistry mock_registry;
-  languages = GetPreferredLanguages(mock_registry);
-  ASSERT_EQ(languages.size(), 5);
-  ASSERT_EQ(languages[0], std::wstring(L"en-US"));
-  ASSERT_EQ(languages[1], std::wstring(L"zh-Hans-CN"));
-  ASSERT_EQ(languages[2], std::wstring(L"ja"));
-  ASSERT_EQ(languages[3], std::wstring(L"zh-Hant-TW"));
-  ASSERT_EQ(languages[4], std::wstring(L"he"));
+  EXPECT_EQ(languages[0], L"en-US");
 }
 
 TEST(SystemUtils, ParseLanguageNameGeneric) {
diff --git a/shell/platform/windows/task_runner.h b/shell/platform/windows/task_runner.h
index b211dbedcd42711df5a9a8828defa158a985b315..14195b0c7fb2ab7bb3d653d61a59c4cc4d51bd53 100644
--- a/shell/platform/windows/task_runner.h
+++ b/shell/platform/windows/task_runner.h
@@ -102,8 +102,7 @@ class TaskRunner : public TaskRunnerWindow::Delegate {
   DWORD main_thread_id_;
   std::shared_ptr<TaskRunnerWindow> task_runner_window_;
 
-  TaskRunner(const TaskRunner&) = delete;
-  TaskRunner& operator=(const TaskRunner&) = delete;
+  FML_DISALLOW_COPY_AND_ASSIGN(TaskRunner);
 };
 
 }  // namespace flutter
diff --git a/shell/platform/windows/task_runner_unittests.cc b/shell/platform/windows/task_runner_unittests.cc
index d7d5cc7a4123aa2b2eef9dab4c53b0823880abe7..74175e9d5b4c77c904bfa498af6222981d2b79fa 100644
--- a/shell/platform/windows/task_runner_unittests.cc
+++ b/shell/platform/windows/task_runner_unittests.cc
@@ -4,6 +4,7 @@
 
 #include "flutter/shell/platform/windows/task_runner.h"
 
+#include "flutter/fml/macros.h"
 #include "gtest/gtest.h"
 
 namespace flutter {
@@ -31,6 +32,9 @@ class MockTaskRunner : public TaskRunner {
         std::chrono::duration_cast<std::chrono::steady_clock::duration>(
             std::chrono::nanoseconds(10000)));
   }
+
+ private:
+  FML_DISALLOW_COPY_AND_ASSIGN(MockTaskRunner);
 };
 
 uint64_t MockGetCurrentTime() {
diff --git a/shell/platform/windows/task_runner_window.h b/shell/platform/windows/task_runner_window.h
index ae874f82af71f32661a51f3080927830f8261328..ccb26c92665d38728870ca58a77cb6fa08fefc9d 100644
--- a/shell/platform/windows/task_runner_window.h
+++ b/shell/platform/windows/task_runner_window.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_TASK_RUNNER_WIN32_WINDOW_H_
-#define FLUTTER_SHELL_PLATFORM_WINDOWS_TASK_RUNNER_WIN32_WINDOW_H_
+#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_TASK_RUNNER_WINDOW_H_
+#define FLUTTER_SHELL_PLATFORM_WINDOWS_TASK_RUNNER_WINDOW_H_
 
 #include <windows.h>
 
@@ -12,6 +12,8 @@
 #include <string>
 #include <vector>
 
+#include "flutter/fml/macros.h"
+
 namespace flutter {
 
 // Hidden HWND responsible for processing flutter tasks on main thread
@@ -58,7 +60,9 @@ class TaskRunnerWindow {
   HWND window_handle_;
   std::wstring window_class_name_;
   std::vector<Delegate*> delegates_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(TaskRunnerWindow);
 };
 }  // namespace flutter
 
-#endif
+#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_TASK_RUNNER_WINDOW_H_
diff --git a/shell/platform/windows/testing/egl/mock_context.h b/shell/platform/windows/testing/egl/mock_context.h
new file mode 100644
index 0000000000000000000000000000000000000000..d61a096c36326d50b59c6538578a02d756a3d1b4
--- /dev/null
+++ b/shell/platform/windows/testing/egl/mock_context.h
@@ -0,0 +1,32 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_EGL_MOCK_CONTEXT_H_
+#define FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_EGL_MOCK_CONTEXT_H_
+
+#include "flutter/fml/macros.h"
+#include "flutter/shell/platform/windows/egl/context.h"
+#include "gmock/gmock.h"
+
+namespace flutter {
+namespace testing {
+namespace egl {
+
+/// Mock for the |Context| base class.
+class MockContext : public flutter::egl::Context {
+ public:
+  MockContext() : Context(EGL_NO_DISPLAY, EGL_NO_CONTEXT) {}
+
+  MOCK_METHOD(bool, MakeCurrent, (), (const, override));
+  MOCK_METHOD(bool, ClearCurrent, (), (const, override));
+
+ private:
+  FML_DISALLOW_COPY_AND_ASSIGN(MockContext);
+};
+
+}  // namespace egl
+}  // namespace testing
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_EGL_MOCK_CONTEXT_H_
diff --git a/shell/platform/windows/testing/egl/mock_manager.h b/shell/platform/windows/testing/egl/mock_manager.h
new file mode 100644
index 0000000000000000000000000000000000000000..1bde275416e1666c9af940a5bf5950b0ac9a6530
--- /dev/null
+++ b/shell/platform/windows/testing/egl/mock_manager.h
@@ -0,0 +1,37 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_EGL_MOCK_MANAGER_H_
+#define FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_EGL_MOCK_MANAGER_H_
+
+#include "flutter/fml/macros.h"
+#include "flutter/shell/platform/windows/egl/manager.h"
+#include "gmock/gmock.h"
+
+namespace flutter {
+namespace testing {
+namespace egl {
+
+/// Mock for the |Manager| base class.
+class MockManager : public flutter::egl::Manager {
+ public:
+  MockManager() : Manager(false) {}
+
+  MOCK_METHOD(std::unique_ptr<flutter::egl::WindowSurface>,
+              CreateWindowSurface,
+              (HWND, size_t, size_t),
+              (override));
+
+  MOCK_METHOD(flutter::egl::Context*, render_context, (), (const, override));
+  MOCK_METHOD(flutter::egl::Context*, resource_context, (), (const, override));
+
+ private:
+  FML_DISALLOW_COPY_AND_ASSIGN(MockManager);
+};
+
+}  // namespace egl
+}  // namespace testing
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_EGL_MOCK_MANAGER_H_
diff --git a/shell/platform/windows/testing/egl/mock_proc_table.h b/shell/platform/windows/testing/egl/mock_proc_table.h
new file mode 100644
index 0000000000000000000000000000000000000000..49c71d2f78dfe4801441eae35d815e6ab7d3c24e
--- /dev/null
+++ b/shell/platform/windows/testing/egl/mock_proc_table.h
@@ -0,0 +1,59 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_EGL_MOCK_PROC_TABLE_H_
+#define FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_EGL_MOCK_PROC_TABLE_H_
+
+#include "flutter/fml/macros.h"
+#include "flutter/shell/platform/windows/egl/proc_table.h"
+#include "gmock/gmock.h"
+
+namespace flutter {
+namespace testing {
+namespace egl {
+
+/// Mock for the |ProcTable| base class.
+class MockProcTable : public ::flutter::egl::ProcTable {
+ public:
+  MockProcTable() = default;
+  virtual ~MockProcTable() = default;
+
+  MOCK_METHOD(void,
+              GenTextures,
+              (GLsizei n, GLuint* textures),
+              (const override));
+  MOCK_METHOD(void,
+              DeleteTextures,
+              (GLsizei n, const GLuint* textures),
+              (const override));
+  MOCK_METHOD(void,
+              BindTexture,
+              (GLenum target, GLuint texture),
+              (const override));
+  MOCK_METHOD(void,
+              TexParameteri,
+              (GLenum target, GLenum pname, GLint param),
+              (const override));
+  MOCK_METHOD(void,
+              TexImage2D,
+              (GLenum target,
+               GLint level,
+               GLint internalformat,
+               GLsizei width,
+               GLsizei height,
+               GLint border,
+               GLenum format,
+               GLenum type,
+               const void* data),
+              (const override));
+
+ private:
+  FML_DISALLOW_COPY_AND_ASSIGN(MockProcTable);
+};
+
+}  // namespace egl
+}  // namespace testing
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_EGL_MOCK_PROC_TABLE_H_
diff --git a/shell/platform/windows/testing/egl/mock_window_surface.h b/shell/platform/windows/testing/egl/mock_window_surface.h
new file mode 100644
index 0000000000000000000000000000000000000000..7bfd739c1f20438b09a0e0a1688d1c18a8128ce7
--- /dev/null
+++ b/shell/platform/windows/testing/egl/mock_window_surface.h
@@ -0,0 +1,36 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_EGL_MOCK_WINDOW_SURFACE_H_
+#define FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_EGL_MOCK_WINDOW_SURFACE_H_
+
+#include "flutter/fml/macros.h"
+#include "flutter/shell/platform/windows/egl/window_surface.h"
+#include "gmock/gmock.h"
+
+namespace flutter {
+namespace testing {
+namespace egl {
+
+/// Mock for the |WindowSurface| base class.
+class MockWindowSurface : public flutter::egl::WindowSurface {
+ public:
+  MockWindowSurface()
+      : WindowSurface(EGL_NO_DISPLAY, EGL_NO_CONTEXT, EGL_NO_SURFACE, 0, 0) {}
+
+  MOCK_METHOD(bool, IsValid, (), (const, override));
+  MOCK_METHOD(bool, Destroy, (), (override));
+  MOCK_METHOD(bool, MakeCurrent, (), (const, override));
+  MOCK_METHOD(bool, SwapBuffers, (), (const, override));
+  MOCK_METHOD(bool, SetVSyncEnabled, (bool), (override));
+
+ private:
+  FML_DISALLOW_COPY_AND_ASSIGN(MockWindowSurface);
+};
+
+}  // namespace egl
+}  // namespace testing
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_EGL_MOCK_WINDOW_SURFACE_H_
diff --git a/shell/platform/windows/testing/engine_modifier.h b/shell/platform/windows/testing/engine_modifier.h
index 111b1190149aa96ca7e612fa463f4129c35f49db..de9e5455a46ec2af63760b480a90704654c93468 100644
--- a/shell/platform/windows/testing/engine_modifier.h
+++ b/shell/platform/windows/testing/engine_modifier.h
@@ -9,6 +9,8 @@
 
 #include <chrono>
 
+#include "flutter/fml/macros.h"
+
 namespace flutter {
 
 // A test utility class providing the ability to access and alter various
@@ -27,14 +29,18 @@ class EngineModifier {
   // engine unless overwritten again.
   FlutterEngineProcTable& embedder_api() { return engine_->embedder_api_; }
 
-  // Explicitly sets the SurfaceManager being used by the FlutterWindowsEngine
-  // instance. This allows us to test fallback paths when a SurfaceManager fails
-  // to initialize for whatever reason.
+  // Override the EGL manager used by the engine.
   //
   // Modifications are to the engine, and will last for the lifetime of the
   // engine unless overwritten again.
-  void SetSurfaceManager(AngleSurfaceManager* surface_manager) {
-    engine_->surface_manager_.reset(surface_manager);
+  void SetEGLManager(std::unique_ptr<egl::Manager> egl_manager) {
+    engine_->egl_manager_ = std::move(egl_manager);
+  }
+
+  // Override the engine's implicit view. This is the "default" view
+  // that Flutter apps render to.
+  void SetImplicitView(FlutterWindowsView* view) {
+    engine_->views_[kImplicitViewId] = view;
   }
 
   /// Reset the start_time field that is used to align vsync events.
@@ -51,17 +57,35 @@ class EngineModifier {
         std::optional<std::chrono::nanoseconds>(frame_interval_nanos);
   }
 
-  // Explicitly releases the SurfaceManager being used by the
-  // FlutterWindowsEngine instance. This should be used if SetSurfaceManager is
+  // Explicitly releases the egl::Manager being used by the
+  // FlutterWindowsEngine instance. This should be used if SetEGLManager is
   // used to explicitly set to a non-null value (but not a valid object) to test
   // a successful ANGLE initialization.
   //
   // Modifications are to the engine, and will last for the lifetime of the
   // engine unless overwritten again.
-  void ReleaseSurfaceManager() { engine_->surface_manager_.release(); }
+  void ReleaseEGLManager() { engine_->egl_manager_.release(); }
+
+  // Run the FlutterWindowsEngine's handler that runs right before an engine
+  // restart. This resets the keyboard's state if it exists.
+  void Restart() { engine_->OnPreEngineRestart(); }
+
+  // Initialize they keyboard and text input subsystems or reset them them if
+  // they are already initialized.
+  void InitializeKeyboard() { engine_->InitializeKeyboard(); }
+
+  void SetLifecycleManager(std::unique_ptr<WindowsLifecycleManager>&& handler) {
+    engine_->lifecycle_manager_ = std::move(handler);
+  }
+
+  void SetPlatformViewPlugin(std::unique_ptr<PlatformViewPlugin>&& manager) {
+    engine_->platform_view_plugin_ = std::move(manager);
+  }
 
  private:
   FlutterWindowsEngine* engine_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(EngineModifier);
 };
 
 }  // namespace flutter
diff --git a/shell/platform/windows/testing/flutter_window_test.h b/shell/platform/windows/testing/flutter_window_test.h
deleted file mode 100644
index cc1ec29453128c06e6b8efdef69187dd184ca708..0000000000000000000000000000000000000000
--- a/shell/platform/windows/testing/flutter_window_test.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_WIN32_FLUTTER_WINDOW_TEST_H_
-#define FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_WIN32_FLUTTER_WINDOW_TEST_H_
-
-#include "flutter/shell/platform/windows/flutter_window.h"
-
-namespace flutter {
-namespace testing {
-
-/// Test class for FlutterWindow.
-class FlutterWindowTest : public FlutterWindow {
- public:
-  FlutterWindowTest(int width, int height);
-  virtual ~FlutterWindowTest();
-
-  // Prevent copying.
-  FlutterWindowTest(FlutterWindowTest const&) = delete;
-  FlutterWindowTest& operator=(FlutterWindowTest const&) = delete;
-};
-
-}  // namespace testing
-}  // namespace flutter
-
-#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_WIN32_FLUTTER_WINDOW_TEST_H_
diff --git a/shell/platform/windows/testing/flutter_windows_engine_builder.cc b/shell/platform/windows/testing/flutter_windows_engine_builder.cc
new file mode 100644
index 0000000000000000000000000000000000000000..9e122b35d4e1e132b885c38f2a2b9a8d333d2c10
--- /dev/null
+++ b/shell/platform/windows/testing/flutter_windows_engine_builder.cc
@@ -0,0 +1,108 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/platform/windows/testing/flutter_windows_engine_builder.h"
+
+#include "flutter/fml/macros.h"
+#include "flutter/shell/platform/windows/windows_proc_table.h"
+
+namespace flutter {
+namespace testing {
+
+class TestFlutterWindowsEngine : public FlutterWindowsEngine {
+ public:
+  TestFlutterWindowsEngine(
+      const FlutterProjectBundle& project,
+      KeyboardKeyEmbedderHandler::GetKeyStateHandler get_key_state,
+      KeyboardKeyEmbedderHandler::MapVirtualKeyToScanCode map_vk_to_scan,
+      std::shared_ptr<WindowsProcTable> windows_proc_table = nullptr)
+      : FlutterWindowsEngine(project, std::move(windows_proc_table)),
+        get_key_state_(std::move(get_key_state)),
+        map_vk_to_scan_(std::move(map_vk_to_scan)) {}
+
+ protected:
+  std::unique_ptr<KeyboardHandlerBase> CreateKeyboardKeyHandler(
+      BinaryMessenger* messenger,
+      KeyboardKeyEmbedderHandler::GetKeyStateHandler get_key_state,
+      KeyboardKeyEmbedderHandler::MapVirtualKeyToScanCode map_vk_to_scan) {
+    if (get_key_state_) {
+      get_key_state = get_key_state_;
+    }
+
+    if (map_vk_to_scan_) {
+      map_vk_to_scan = map_vk_to_scan_;
+    }
+
+    return FlutterWindowsEngine::CreateKeyboardKeyHandler(
+        messenger, get_key_state, map_vk_to_scan);
+  }
+
+ private:
+  KeyboardKeyEmbedderHandler::GetKeyStateHandler get_key_state_;
+  KeyboardKeyEmbedderHandler::MapVirtualKeyToScanCode map_vk_to_scan_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(TestFlutterWindowsEngine);
+};
+
+FlutterWindowsEngineBuilder::FlutterWindowsEngineBuilder(
+    WindowsTestContext& context)
+    : context_(context) {
+  properties_.assets_path = context.GetAssetsPath().c_str();
+  properties_.icu_data_path = context.GetIcuDataPath().c_str();
+  properties_.aot_library_path = context.GetAotLibraryPath().c_str();
+}
+
+FlutterWindowsEngineBuilder::~FlutterWindowsEngineBuilder() = default;
+
+void FlutterWindowsEngineBuilder::SetDartEntrypoint(std::string entrypoint) {
+  dart_entrypoint_ = std::move(entrypoint);
+  properties_.dart_entrypoint = dart_entrypoint_.c_str();
+}
+
+void FlutterWindowsEngineBuilder::AddDartEntrypointArgument(std::string arg) {
+  dart_entrypoint_arguments_.emplace_back(std::move(arg));
+}
+
+void FlutterWindowsEngineBuilder::SetSwitches(
+    std::vector<std::string> switches) {
+  switches_ = std::move(switches);
+}
+
+void FlutterWindowsEngineBuilder::SetCreateKeyboardHandlerCallbacks(
+    KeyboardKeyEmbedderHandler::GetKeyStateHandler get_key_state,
+    KeyboardKeyEmbedderHandler::MapVirtualKeyToScanCode map_vk_to_scan) {
+  get_key_state_ = std::move(get_key_state);
+  map_vk_to_scan_ = std::move(map_vk_to_scan);
+}
+
+void FlutterWindowsEngineBuilder::SetWindowsProcTable(
+    std::shared_ptr<WindowsProcTable> windows_proc_table) {
+  windows_proc_table_ = std::move(windows_proc_table);
+}
+
+std::unique_ptr<FlutterWindowsEngine> FlutterWindowsEngineBuilder::Build() {
+  std::vector<const char*> dart_args;
+  dart_args.reserve(dart_entrypoint_arguments_.size());
+
+  for (const auto& arg : dart_entrypoint_arguments_) {
+    dart_args.push_back(arg.c_str());
+  }
+
+  if (!dart_args.empty()) {
+    properties_.dart_entrypoint_argv = dart_args.data();
+    properties_.dart_entrypoint_argc = dart_args.size();
+  } else {
+    properties_.dart_entrypoint_argv = nullptr;
+    properties_.dart_entrypoint_argc = 0;
+  }
+
+  FlutterProjectBundle project(properties_);
+  project.SetSwitches(switches_);
+
+  return std::make_unique<TestFlutterWindowsEngine>(
+      project, get_key_state_, map_vk_to_scan_, std::move(windows_proc_table_));
+}
+
+}  // namespace testing
+}  // namespace flutter
diff --git a/shell/platform/windows/testing/flutter_windows_engine_builder.h b/shell/platform/windows/testing/flutter_windows_engine_builder.h
new file mode 100644
index 0000000000000000000000000000000000000000..da7f3fb27f0457fb5c5fd511b4a8e34fb905d946
--- /dev/null
+++ b/shell/platform/windows/testing/flutter_windows_engine_builder.h
@@ -0,0 +1,55 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_FLUTTER_WINDOWS_ENGINE_BUILDER_H_
+#define FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_FLUTTER_WINDOWS_ENGINE_BUILDER_H_
+
+#include <memory>
+
+#include "flutter/fml/macros.h"
+#include "flutter/shell/platform/windows/flutter_windows_engine.h"
+#include "flutter/shell/platform/windows/keyboard_key_embedder_handler.h"
+#include "flutter/shell/platform/windows/public/flutter_windows.h"
+#include "flutter/shell/platform/windows/testing/windows_test_context.h"
+
+namespace flutter {
+namespace testing {
+
+class FlutterWindowsEngineBuilder {
+ public:
+  explicit FlutterWindowsEngineBuilder(WindowsTestContext& context);
+  ~FlutterWindowsEngineBuilder();
+
+  void SetDartEntrypoint(std::string entrypoint);
+
+  void AddDartEntrypointArgument(std::string arg);
+
+  void SetCreateKeyboardHandlerCallbacks(
+      KeyboardKeyEmbedderHandler::GetKeyStateHandler get_key_state,
+      KeyboardKeyEmbedderHandler::MapVirtualKeyToScanCode map_vk_to_scan);
+
+  void SetSwitches(std::vector<std::string> switches);
+
+  void SetWindowsProcTable(
+      std::shared_ptr<WindowsProcTable> windows_proc_table);
+
+  std::unique_ptr<FlutterWindowsEngine> Build();
+
+ private:
+  WindowsTestContext& context_;
+  FlutterDesktopEngineProperties properties_ = {};
+  std::string dart_entrypoint_;
+  std::vector<std::string> dart_entrypoint_arguments_;
+  std::vector<std::string> switches_;
+  KeyboardKeyEmbedderHandler::GetKeyStateHandler get_key_state_;
+  KeyboardKeyEmbedderHandler::MapVirtualKeyToScanCode map_vk_to_scan_;
+  std::shared_ptr<WindowsProcTable> windows_proc_table_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(FlutterWindowsEngineBuilder);
+};
+
+}  // namespace testing
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_FLUTTER_WINDOWS_ENGINE_BUILDER_H_
diff --git a/shell/platform/windows/testing/mock_direct_manipulation.h b/shell/platform/windows/testing/mock_direct_manipulation.h
index be1fe35027f07314dc35279a32e75a053eab17bb..fc984cbf34fc3d40395bcf3fd37366bb8fe3d6ef 100644
--- a/shell/platform/windows/testing/mock_direct_manipulation.h
+++ b/shell/platform/windows/testing/mock_direct_manipulation.h
@@ -5,6 +5,7 @@
 #ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_MOCK_DIRECT_MANIPULATION_H_
 #define FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_MOCK_DIRECT_MANIPULATION_H_
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/windows/direct_manipulation.h"
 #include "gmock/gmock.h"
 
@@ -14,11 +15,11 @@ namespace testing {
 /// Mock for the |DirectManipulationOwner| base class.
 class MockDirectManipulationOwner : public DirectManipulationOwner {
  public:
-  explicit MockDirectManipulationOwner(Window* window)
+  explicit MockDirectManipulationOwner(FlutterWindow* window)
       : DirectManipulationOwner(window){};
   virtual ~MockDirectManipulationOwner() = default;
 
-  MOCK_METHOD1(SetContact, void(UINT contact_id));
+  MOCK_METHOD(void, SetContact, (UINT contact_id), (override));
 
  private:
   FML_DISALLOW_COPY_AND_ASSIGN(MockDirectManipulationOwner);
diff --git a/shell/platform/windows/testing/mock_gl_functions.h b/shell/platform/windows/testing/mock_gl_functions.h
deleted file mode 100644
index 0d46cbb368d7561811f7ddfb1285db85169be42a..0000000000000000000000000000000000000000
--- a/shell/platform/windows/testing/mock_gl_functions.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_MOCK_GL_FUNCTIONS_H_
-#define FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_MOCK_GL_FUNCTIONS_H_
-
-#include "flutter/shell/platform/windows/external_texture.h"
-
-namespace flutter {
-namespace testing {
-
-// A class providing a mocked subset of OpenGL API functions.
-class MockGlFunctions {
- public:
-  MockGlFunctions() {
-    gl_procs_.glGenTextures = &glGenTextures;
-    gl_procs_.glDeleteTextures = &glDeleteTextures;
-    gl_procs_.glBindTexture = &glBindTexture;
-    gl_procs_.glTexParameteri = &glTexParameteri;
-    gl_procs_.glTexImage2D = &glTexImage2D;
-    gl_procs_.valid = true;
-  }
-
-  const GlProcs& gl_procs() { return gl_procs_; }
-
-  static void glGenTextures(GLsizei n, GLuint* textures) {
-    // The minimum valid texture ID is 1
-    for (auto i = 0; i < n; i++) {
-      textures[i] = i + 1;
-    }
-  }
-
-  static void glDeleteTextures(GLsizei n, const GLuint* textures) {}
-  static void glBindTexture(GLenum target, GLuint texture) {}
-  static void glTexParameteri(GLenum target, GLenum pname, GLint param) {}
-  static void glTexImage2D(GLenum target,
-                           GLint level,
-                           GLint internalformat,
-                           GLsizei width,
-                           GLsizei height,
-                           GLint border,
-                           GLenum format,
-                           GLenum type,
-                           const void* data) {}
-
- private:
-  GlProcs gl_procs_;
-};
-
-}  // namespace testing
-}  // namespace flutter
-
-#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_MOCK_GL_FUNCTIONS_H_
diff --git a/shell/platform/windows/testing/mock_platform_view_manager.h b/shell/platform/windows/testing/mock_platform_view_manager.h
new file mode 100644
index 0000000000000000000000000000000000000000..a3c69222699329e5c576b6548bb1631df55b6a27
--- /dev/null
+++ b/shell/platform/windows/testing/mock_platform_view_manager.h
@@ -0,0 +1,28 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_MOCK_PLATFORM_VIEW_MANAGER_H_
+#define FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_MOCK_PLATFORM_VIEW_MANAGER_H_
+
+#include "flutter/shell/platform/windows/platform_view_plugin.h"
+
+#include "flutter/shell/platform/windows/flutter_windows_engine.h"
+#include "gmock/gmock.h"
+
+namespace flutter {
+
+class MockPlatformViewManager : public PlatformViewPlugin {
+ public:
+  MockPlatformViewManager(FlutterWindowsEngine* engine)
+      : PlatformViewPlugin(engine->messenger_wrapper(), engine->task_runner()) {
+  }
+
+  ~MockPlatformViewManager() {}
+
+  MOCK_METHOD(bool, AddPlatformView, (PlatformViewId id, std::string_view));
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_MOCK_PLATFORM_VIEW_MANAGER_H_
diff --git a/shell/platform/windows/testing/mock_text_input_manager.h b/shell/platform/windows/testing/mock_text_input_manager.h
index 7fefa1ae25170d7eec3dc6198bf3b7fcf2acd8db..d4d611831d62cf2093935ac7135690c9cbe98220 100644
--- a/shell/platform/windows/testing/mock_text_input_manager.h
+++ b/shell/platform/windows/testing/mock_text_input_manager.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_MOCK_TEXT_INPUT_MANAGER_WIN32_H_
-#define FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_MOCK_TEXT_INPUT_MANAGER_WIN32_H_
+#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_MOCK_TEXT_INPUT_MANAGER_H_
+#define FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_MOCK_TEXT_INPUT_MANAGER_H_
 
-#include <windowsx.h>
 #include <cstring>
 #include <optional>
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/windows/text_input_manager.h"
 #include "gmock/gmock.h"
 
@@ -21,16 +21,21 @@ class MockTextInputManager : public TextInputManager {
   MockTextInputManager();
   virtual ~MockTextInputManager();
 
-  // Prevent copying.
-  MockTextInputManager(MockTextInputManager const&) = delete;
-  MockTextInputManager& operator=(MockTextInputManager const&) = delete;
-
-  MOCK_CONST_METHOD0(GetComposingString, std::optional<std::u16string>());
-  MOCK_CONST_METHOD0(GetResultString, std::optional<std::u16string>());
-  MOCK_CONST_METHOD0(GetComposingCursorPosition, long());
+  MOCK_METHOD(std::optional<std::u16string>,
+              GetComposingString,
+              (),
+              (const, override));
+  MOCK_METHOD(std::optional<std::u16string>,
+              GetResultString,
+              (),
+              (const, override));
+  MOCK_METHOD(long, GetComposingCursorPosition, (), (const, override));
+
+ private:
+  FML_DISALLOW_COPY_AND_ASSIGN(MockTextInputManager);
 };
 
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_MOCK_TEXT_INPUT_MANAGER_WIN32_H_
+#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_MOCK_TEXT_INPUT_MANAGER_H_
diff --git a/shell/platform/windows/testing/mock_window.cc b/shell/platform/windows/testing/mock_window.cc
index 9021aecb3352a136990ca9e3328c81ea3314b7ca..d6f8db89887725ea69e0886f68555605be5bd7b6 100644
--- a/shell/platform/windows/testing/mock_window.cc
+++ b/shell/platform/windows/testing/mock_window.cc
@@ -6,10 +6,13 @@
 
 namespace flutter {
 namespace testing {
-MockWindow::MockWindow() : Window(){};
+MockWindow::MockWindow() : FlutterWindow(1, 1){};
 MockWindow::MockWindow(std::unique_ptr<WindowsProcTable> window_proc_table,
                        std::unique_ptr<TextInputManager> text_input_manager)
-    : Window(std::move(window_proc_table), std::move(text_input_manager)){};
+    : FlutterWindow(1,
+                    1,
+                    std::move(window_proc_table),
+                    std::move(text_input_manager)){};
 
 MockWindow::~MockWindow() = default;
 
@@ -49,7 +52,7 @@ void MockWindow::InjectMessageList(int count, const Win32Message* messages) {
 void MockWindow::CallOnImeComposition(UINT const message,
                                       WPARAM const wparam,
                                       LPARAM const lparam) {
-  Window::OnImeComposition(message, wparam, lparam);
+  FlutterWindow::OnImeComposition(message, wparam, lparam);
 }
 
 }  // namespace testing
diff --git a/shell/platform/windows/testing/mock_window.h b/shell/platform/windows/testing/mock_window.h
index fc50235745e3b7f3da06606337c6d3d6cf8e90f2..d62601c619f40873112f2731071854ec641b5abb 100644
--- a/shell/platform/windows/testing/mock_window.h
+++ b/shell/platform/windows/testing/mock_window.h
@@ -2,30 +2,25 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_MOCK_WIN32_WINDOW_H_
-#define FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_MOCK_WIN32_WINDOW_H_
-
-#include <windowsx.h>
+#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_MOCK_WINDOW_H_
+#define FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_MOCK_WINDOW_H_
 
+#include "flutter/fml/macros.h"
+#include "flutter/shell/platform/windows/flutter_window.h"
 #include "flutter/shell/platform/windows/testing/test_keyboard.h"
-#include "flutter/shell/platform/windows/window.h"
 #include "gmock/gmock.h"
 
 namespace flutter {
 namespace testing {
 
-/// Mock for the |Window| base class.
-class MockWindow : public Window {
+/// Mock for the |FlutterWindow| base class.
+class MockWindow : public FlutterWindow {
  public:
   MockWindow();
   MockWindow(std::unique_ptr<WindowsProcTable> windows_proc_table,
              std::unique_ptr<TextInputManager> text_input_manager);
   virtual ~MockWindow();
 
-  // Prevent copying.
-  MockWindow(MockWindow const&) = delete;
-  MockWindow& operator=(MockWindow const&) = delete;
-
   // Wrapper for GetCurrentDPI() which is a protected method.
   UINT GetDpi();
 
@@ -40,32 +35,59 @@ class MockWindow : public Window {
 
   void InjectMessageList(int count, const Win32Message* messages);
 
-  MOCK_METHOD1(OnDpiScale, void(unsigned int));
-  MOCK_METHOD2(OnResize, void(unsigned int, unsigned int));
-  MOCK_METHOD0(OnPaint, void());
-  MOCK_METHOD4(OnPointerMove,
-               void(double, double, FlutterPointerDeviceKind, int32_t));
-  MOCK_METHOD5(OnPointerDown,
-               void(double, double, FlutterPointerDeviceKind, int32_t, UINT));
-  MOCK_METHOD5(OnPointerUp,
-               void(double, double, FlutterPointerDeviceKind, int32_t, UINT));
-  MOCK_METHOD4(OnPointerLeave,
-               void(double, double, FlutterPointerDeviceKind, int32_t));
-  MOCK_METHOD0(OnSetCursor, void());
-  MOCK_METHOD1(OnText, void(const std::u16string&));
-  MOCK_METHOD7(OnKey,
-               void(int, int, int, char32_t, bool, bool, KeyEventCallback));
-  MOCK_METHOD1(OnUpdateSemanticsEnabled, void(bool));
-  MOCK_METHOD0(GetNativeViewAccessible, gfx::NativeViewAccessible());
-  MOCK_METHOD4(OnScroll,
-               void(double, double, FlutterPointerDeviceKind, int32_t));
-  MOCK_METHOD0(OnComposeBegin, void());
-  MOCK_METHOD0(OnComposeCommit, void());
-  MOCK_METHOD0(OnComposeEnd, void());
-  MOCK_METHOD2(OnComposeChange, void(const std::u16string&, int));
-  MOCK_METHOD3(OnImeComposition, void(UINT const, WPARAM const, LPARAM const));
-
-  MOCK_METHOD0(OnThemeChange, void());
+  MOCK_METHOD(void, OnDpiScale, (unsigned int), (override));
+  MOCK_METHOD(void, OnResize, (unsigned int, unsigned int), (override));
+  MOCK_METHOD(void, OnPaint, (), (override));
+  MOCK_METHOD(void,
+              OnPointerMove,
+              (double, double, FlutterPointerDeviceKind, int32_t, int),
+              (override));
+  MOCK_METHOD(void,
+              OnPointerDown,
+              (double, double, FlutterPointerDeviceKind, int32_t, UINT),
+              (override));
+  MOCK_METHOD(void,
+              OnPointerUp,
+              (double, double, FlutterPointerDeviceKind, int32_t, UINT),
+              (override));
+  MOCK_METHOD(void,
+              OnPointerLeave,
+              (double, double, FlutterPointerDeviceKind, int32_t),
+              (override));
+  MOCK_METHOD(void, OnSetCursor, (), (override));
+  MOCK_METHOD(void, OnText, (const std::u16string&), (override));
+  MOCK_METHOD(void,
+              OnKey,
+              (int, int, int, char32_t, bool, bool, KeyEventCallback),
+              (override));
+  MOCK_METHOD(void, OnUpdateSemanticsEnabled, (bool), (override));
+  MOCK_METHOD(gfx::NativeViewAccessible,
+              GetNativeViewAccessible,
+              (),
+              (override));
+  MOCK_METHOD(void,
+              OnScroll,
+              (double, double, FlutterPointerDeviceKind, int32_t),
+              (override));
+  MOCK_METHOD(void, OnComposeBegin, (), (override));
+  MOCK_METHOD(void, OnComposeCommit, (), (override));
+  MOCK_METHOD(void, OnComposeEnd, (), (override));
+  MOCK_METHOD(void, OnComposeChange, (const std::u16string&, int), (override));
+  MOCK_METHOD(void,
+              OnImeComposition,
+              (UINT const, WPARAM const, LPARAM const),
+              (override));
+
+  MOCK_METHOD(void, OnThemeChange, (), (override));
+
+  MOCK_METHOD(ui::AXFragmentRootDelegateWin*,
+              GetAxFragmentRootDelegate,
+              (),
+              (override));
+
+  MOCK_METHOD(LRESULT, OnGetObject, (UINT, WPARAM, LPARAM), (override));
+
+  MOCK_METHOD(void, OnWindowStateEvent, (WindowStateEvent), (override));
 
   void CallOnImeComposition(UINT const message,
                             WPARAM const wparam,
@@ -73,9 +95,12 @@ class MockWindow : public Window {
 
  protected:
   LRESULT Win32DefWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
+
+ private:
+  FML_DISALLOW_COPY_AND_ASSIGN(MockWindow);
 };
 
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_MOCK_WIN32_WINDOW_H_
+#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_MOCK_WINDOW_H_
diff --git a/shell/platform/windows/testing/mock_window_binding_handler.h b/shell/platform/windows/testing/mock_window_binding_handler.h
index 6a191b0e1817bb6d0231a5d50d633d3b049e3b3f..b53cfcbc07cec63af63d549824fa32cec9bbfbb5 100644
--- a/shell/platform/windows/testing/mock_window_binding_handler.h
+++ b/shell/platform/windows/testing/mock_window_binding_handler.h
@@ -5,9 +5,9 @@
 #ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_MOCK_WINDOW_BINDING_HANDLER_H_
 #define FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_MOCK_WINDOW_BINDING_HANDLER_H_
 
-#include <windowsx.h>
-
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/windows/window_binding_handler.h"
+#include "flutter/third_party/accessibility/ax/platform/ax_platform_node_win.h"
 #include "gmock/gmock.h"
 
 namespace flutter {
@@ -19,25 +19,28 @@ class MockWindowBindingHandler : public WindowBindingHandler {
   MockWindowBindingHandler();
   virtual ~MockWindowBindingHandler();
 
-  // Prevent copying.
-  MockWindowBindingHandler(MockWindowBindingHandler const&) = delete;
-  MockWindowBindingHandler& operator=(MockWindowBindingHandler const&) = delete;
-
-  MOCK_METHOD1(SetView, void(WindowBindingHandlerDelegate* view));
-  MOCK_METHOD0(GetRenderTarget, WindowsRenderTarget());
-  MOCK_METHOD0(GetPlatformWindow, PlatformWindow());
-  MOCK_METHOD0(GetDpiScale, float());
-  MOCK_METHOD0(IsVisible, bool());
-  MOCK_METHOD0(OnWindowResized, void());
-  MOCK_METHOD0(GetPhysicalWindowBounds, PhysicalWindowBounds());
-  MOCK_METHOD1(UpdateFlutterCursor, void(const std::string& cursor_name));
-  MOCK_METHOD1(OnCursorRectUpdated, void(const Rect& rect));
-  MOCK_METHOD0(OnResetImeComposing, void());
-  MOCK_METHOD3(OnBitmapSurfaceUpdated,
-               bool(const void* allocation, size_t row_bytes, size_t height));
-  MOCK_METHOD0(GetPrimaryPointerLocation, PointerLocation());
-  MOCK_METHOD0(SendInitialAccessibilityFeatures, void());
-  MOCK_METHOD0(GetAccessibilityRootNode, AccessibilityRootNode*());
+  MOCK_METHOD(void, SetView, (WindowBindingHandlerDelegate * view), (override));
+  MOCK_METHOD(HWND, GetWindowHandle, (), (override));
+  MOCK_METHOD(float, GetDpiScale, (), (override));
+  MOCK_METHOD(PhysicalWindowBounds, GetPhysicalWindowBounds, (), (override));
+  MOCK_METHOD(void,
+              UpdateFlutterCursor,
+              (const std::string& cursor_name),
+              (override));
+  MOCK_METHOD(void, SetFlutterCursor, (HCURSOR cursor_name), (override));
+  MOCK_METHOD(void, OnCursorRectUpdated, (const Rect& rect), (override));
+  MOCK_METHOD(void, OnResetImeComposing, (), (override));
+  MOCK_METHOD(bool, OnBitmapSurfaceCleared, (), (override));
+  MOCK_METHOD(bool,
+              OnBitmapSurfaceUpdated,
+              (const void* allocation, size_t row_bytes, size_t height),
+              (override));
+  MOCK_METHOD(PointerLocation, GetPrimaryPointerLocation, (), (override));
+  MOCK_METHOD(AlertPlatformNodeDelegate*, GetAlertDelegate, (), (override));
+  MOCK_METHOD(ui::AXPlatformNodeWin*, GetAlert, (), (override));
+
+ private:
+  FML_DISALLOW_COPY_AND_ASSIGN(MockWindowBindingHandler);
 };
 
 }  // namespace testing
diff --git a/shell/platform/windows/testing/mock_window_binding_handler_delegate.h b/shell/platform/windows/testing/mock_window_binding_handler_delegate.h
index 03534b2e5ecfd490da729b7a9d094ead2f8d5cde..9cc0ff4d477f11c9078b656c9f700abf3e6e991e 100644
--- a/shell/platform/windows/testing/mock_window_binding_handler_delegate.h
+++ b/shell/platform/windows/testing/mock_window_binding_handler_delegate.h
@@ -5,6 +5,7 @@
 #ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_MOCK_WINDOW_BINDING_HANDLER_DELEGATE_H_
 #define FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_MOCK_WINDOW_BINDING_HANDLER_DELEGATE_H_
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/windows/window_binding_handler_delegate.h"
 #include "gmock/gmock.h"
 
@@ -15,54 +16,69 @@ class MockWindowBindingHandlerDelegate : public WindowBindingHandlerDelegate {
  public:
   MockWindowBindingHandlerDelegate() {}
 
-  // Prevent copying.
-  MockWindowBindingHandlerDelegate(MockWindowBindingHandlerDelegate const&) =
-      delete;
-  MockWindowBindingHandlerDelegate& operator=(
-      MockWindowBindingHandlerDelegate const&) = delete;
+  MOCK_METHOD(bool, OnWindowSizeChanged, (size_t, size_t), (override));
+  MOCK_METHOD(void, OnWindowRepaint, (), (override));
+  MOCK_METHOD(void,
+              OnPointerMove,
+              (double, double, FlutterPointerDeviceKind, int32_t, int),
+              (override));
+  MOCK_METHOD(void,
+              OnPointerDown,
+              (double,
+               double,
+               FlutterPointerDeviceKind,
+               int32_t,
+               FlutterPointerMouseButtons),
+              (override));
+  MOCK_METHOD(void,
+              OnPointerUp,
+              (double,
+               double,
+               FlutterPointerDeviceKind,
+               int32_t,
+               FlutterPointerMouseButtons),
+              (override));
+  MOCK_METHOD(void,
+              OnPointerLeave,
+              (double, double, FlutterPointerDeviceKind, int32_t),
+              (override));
+  MOCK_METHOD(void, OnPointerPanZoomStart, (int32_t), (override));
+  MOCK_METHOD(void,
+              OnPointerPanZoomUpdate,
+              (int32_t, double, double, double, double),
+              (override));
+  MOCK_METHOD(void, OnPointerPanZoomEnd, (int32_t), (override));
+  MOCK_METHOD(void, OnText, (const std::u16string&), (override));
+  MOCK_METHOD(void,
+              OnKey,
+              (int, int, int, char32_t, bool, bool, KeyEventCallback),
+              (override));
+  MOCK_METHOD(void, OnComposeBegin, (), (override));
+  MOCK_METHOD(void, OnComposeCommit, (), (override));
+  MOCK_METHOD(void, OnComposeEnd, (), (override));
+  MOCK_METHOD(void, OnComposeChange, (const std::u16string&, int), (override));
+  MOCK_METHOD(void, OnUpdateSemanticsEnabled, (bool), (override));
+  MOCK_METHOD(gfx::NativeViewAccessible,
+              GetNativeViewAccessible,
+              (),
+              (override));
+  MOCK_METHOD(
+      void,
+      OnScroll,
+      (double, double, double, double, int, FlutterPointerDeviceKind, int32_t),
+      (override));
+  MOCK_METHOD(void, OnScrollInertiaCancel, (int32_t), (override));
+  MOCK_METHOD(void, OnHighContrastChanged, (), (override));
 
-  MOCK_METHOD2(OnWindowSizeChanged, void(size_t, size_t));
-  MOCK_METHOD0(OnWindowRepaint, void());
-  MOCK_METHOD4(OnPointerMove,
-               void(double, double, FlutterPointerDeviceKind, int32_t));
-  MOCK_METHOD5(OnPointerDown,
-               void(double,
-                    double,
-                    FlutterPointerDeviceKind,
-                    int32_t,
-                    FlutterPointerMouseButtons));
-  MOCK_METHOD5(OnPointerUp,
-               void(double,
-                    double,
-                    FlutterPointerDeviceKind,
-                    int32_t,
-                    FlutterPointerMouseButtons));
-  MOCK_METHOD4(OnPointerLeave,
-               void(double, double, FlutterPointerDeviceKind, int32_t));
-  MOCK_METHOD1(OnPointerPanZoomStart, void(int32_t));
-  MOCK_METHOD5(OnPointerPanZoomUpdate,
-               void(int32_t, double, double, double, double));
-  MOCK_METHOD1(OnPointerPanZoomEnd, void(int32_t));
-  MOCK_METHOD1(OnText, void(const std::u16string&));
-  MOCK_METHOD7(OnKey,
-               void(int, int, int, char32_t, bool, bool, KeyEventCallback));
-  MOCK_METHOD0(OnComposeBegin, void());
-  MOCK_METHOD0(OnComposeCommit, void());
-  MOCK_METHOD0(OnComposeEnd, void());
-  MOCK_METHOD2(OnComposeChange, void(const std::u16string&, int));
-  MOCK_METHOD1(OnUpdateSemanticsEnabled, void(bool));
-  MOCK_METHOD0(GetNativeViewAccessible, gfx::NativeViewAccessible());
-  MOCK_METHOD7(OnScroll,
-               void(double,
-                    double,
-                    double,
-                    double,
-                    int,
-                    FlutterPointerDeviceKind,
-                    int32_t));
-  MOCK_METHOD1(OnScrollInertiaCancel, void(int32_t));
-  MOCK_METHOD0(OnPlatformBrightnessChanged, void());
-  MOCK_METHOD1(UpdateHighContrastEnabled, void(bool enabled));
+  MOCK_METHOD(ui::AXFragmentRootDelegateWin*,
+              GetAxFragmentRootDelegate,
+              (),
+              (override));
+
+  MOCK_METHOD(void, OnWindowStateEvent, (HWND, WindowStateEvent), (override));
+
+ private:
+  FML_DISALLOW_COPY_AND_ASSIGN(MockWindowBindingHandlerDelegate);
 };
 
 }  // namespace testing
diff --git a/shell/platform/windows/testing/mock_windows_proc_table.h b/shell/platform/windows/testing/mock_windows_proc_table.h
index 7c136def68654ce7451cafa3a4ff9651203be97c..0d79e67c8e43c1690cf3a52371609ba1e9f9edde 100644
--- a/shell/platform/windows/testing/mock_windows_proc_table.h
+++ b/shell/platform/windows/testing/mock_windows_proc_table.h
@@ -5,6 +5,7 @@
 #ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_MOCK_WINDOWS_PROC_TABLE_H_
 #define FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_MOCK_WINDOWS_PROC_TABLE_H_
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/windows/windows_proc_table.h"
 #include "gmock/gmock.h"
 
@@ -17,8 +18,21 @@ class MockWindowsProcTable : public WindowsProcTable {
   MockWindowsProcTable() = default;
   virtual ~MockWindowsProcTable() = default;
 
-  MOCK_METHOD2(GetPointerType,
-               BOOL(UINT32 pointer_id, POINTER_INPUT_TYPE* pointer_type));
+  MOCK_METHOD(BOOL,
+              GetPointerType,
+              (UINT32 pointer_id, POINTER_INPUT_TYPE* pointer_type),
+              (const, override));
+
+  MOCK_METHOD(LRESULT,
+              GetThreadPreferredUILanguages,
+              (DWORD, PULONG, PZZWSTR, PULONG),
+              (const, override));
+
+  MOCK_METHOD(bool, GetHighContrastEnabled, (), (const, override));
+
+  MOCK_METHOD(bool, DwmIsCompositionEnabled, (), (const, override));
+
+  MOCK_METHOD(HRESULT, DwmFlush, (), (const, override));
 
  private:
   FML_DISALLOW_COPY_AND_ASSIGN(MockWindowsProcTable);
diff --git a/shell/platform/windows/testing/test_binary_messenger.h b/shell/platform/windows/testing/test_binary_messenger.h
index 3cb38e89c1a7c50808649ec1fde841c279bc384d..9b7f2c9b043f15c2d8ac1d7e259d817bc574fd35 100644
--- a/shell/platform/windows/testing/test_binary_messenger.h
+++ b/shell/platform/windows/testing/test_binary_messenger.h
@@ -5,11 +5,12 @@
 #ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_TEST_BINARY_MESSENGER_H_
 #define FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_TEST_BINARY_MESSENGER_H_
 
-#include <cassert>
 #include <functional>
 #include <map>
 #include <string>
 
+#include "flutter/fml/logging.h"
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h"
 
 namespace flutter {
@@ -28,10 +29,6 @@ class TestBinaryMessenger : public BinaryMessenger {
 
   virtual ~TestBinaryMessenger() = default;
 
-  // Prevent copying.
-  TestBinaryMessenger(TestBinaryMessenger const&) = delete;
-  TestBinaryMessenger& operator=(TestBinaryMessenger const&) = delete;
-
   // Simulates a message from the engine on the given channel.
   //
   // Returns false if no handler is registered on that channel.
@@ -53,7 +50,7 @@ class TestBinaryMessenger : public BinaryMessenger {
             size_t message_size,
             BinaryReply reply) const override {
     // If something under test sends a message, the test should be handling it.
-    assert(send_handler_);
+    FML_DCHECK(send_handler_);
     send_handler_(channel, message, message_size, reply);
   }
 
@@ -73,6 +70,8 @@ class TestBinaryMessenger : public BinaryMessenger {
 
   // Mapping of channel name to registered handlers.
   std::map<std::string, BinaryMessageHandler> registered_handlers_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(TestBinaryMessenger);
 };
 
 }  // namespace flutter
diff --git a/shell/platform/windows/testing/test_keyboard.cc b/shell/platform/windows/testing/test_keyboard.cc
index 06a5b86c38409b08171471ffaa5d137d82344eda..4d2109a657108f5d6ec01c9727cfbbf18bdb66e3 100644
--- a/shell/platform/windows/testing/test_keyboard.cc
+++ b/shell/platform/windows/testing/test_keyboard.cc
@@ -3,11 +3,12 @@
 // found in the LICENSE file.
 
 #include "flutter/shell/platform/windows/testing/test_keyboard.h"
-#include "flutter/shell/platform/common/json_message_codec.h"
-#include "flutter/shell/platform/embedder/test_utils/proc_table_replacement.h"
 
 #include <rapidjson/document.h>
-#include <windowsx.h>
+
+#include "flutter/fml/logging.h"
+#include "flutter/shell/platform/common/json_message_codec.h"
+#include "flutter/shell/platform/embedder/test_utils/proc_table_replacement.h"
 
 namespace flutter {
 namespace testing {
@@ -206,7 +207,8 @@ void MockMessageQueue::PushBack(const Win32Message* message) {
 }
 
 LRESULT MockMessageQueue::DispatchFront() {
-  assert(!_pending_messages.empty());
+  FML_DCHECK(!_pending_messages.empty())
+      << "Called DispatchFront while pending message queue is empty";
   Win32Message message = _pending_messages.front();
   _pending_messages.pop_front();
   _sent_messages.push_back(message);
diff --git a/shell/platform/windows/testing/test_keyboard.h b/shell/platform/windows/testing/test_keyboard.h
index 8eddff6bfcd2ae3dc1762c7e0de61ed464ceb091..bcadb6f5126629c5ad37ab5d48926cdd1f7d30ac 100644
--- a/shell/platform/windows/testing/test_keyboard.h
+++ b/shell/platform/windows/testing/test_keyboard.h
@@ -10,6 +10,7 @@
 #include <functional>
 #include <string>
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/embedder/embedder.h"
 #include "flutter/shell/platform/windows/testing/engine_modifier.h"
 #include "flutter/shell/platform/windows/testing/wm_builders.h"
@@ -99,6 +100,8 @@ class MockKeyResponseController {
                                    ResponseCallback callback) {
     callback(false);
   }
+
+  FML_DISALLOW_COPY_AND_ASSIGN(MockKeyResponseController);
 };
 
 void MockEmbedderApiForKeyboard(
@@ -142,13 +145,17 @@ class MockMessageQueue {
 // Expect the |_target| FlutterKeyEvent has the required properties.
 #define EXPECT_EVENT_EQUALS(_target, _type, _physical, _logical, _character, \
                             _synthesized)                                    \
-  EXPECT_PRED_FORMAT2(_EventEquals, _target,                                 \
-                      (FlutterKeyEvent{                                      \
-                          .type = _type,                                     \
-                          .physical = _physical,                             \
-                          .logical = _logical,                               \
-                          .character = _character,                           \
-                          .synthesized = _synthesized,                       \
-                      }));
+  EXPECT_PRED_FORMAT2(                                                       \
+      _EventEquals, _target,                                                 \
+      (FlutterKeyEvent{                                                      \
+          /* struct_size = */ sizeof(FlutterKeyEvent),                       \
+          /* timestamp = */ 0,                                               \
+          /* type = */ _type,                                                \
+          /* physical = */ _physical,                                        \
+          /* logical = */ _logical,                                          \
+          /* character = */ _character,                                      \
+          /* synthesized = */ _synthesized,                                  \
+          /* device_type = */ kFlutterKeyEventDeviceTypeKeyboard,            \
+      }));
 
 #endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_TEST_KEYBOARD_H_
diff --git a/shell/platform/windows/testing/view_modifier.h b/shell/platform/windows/testing/view_modifier.h
new file mode 100644
index 0000000000000000000000000000000000000000..f99f04fe903781f549915c53f80d7b91d0bbc953
--- /dev/null
+++ b/shell/platform/windows/testing/view_modifier.h
@@ -0,0 +1,36 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_VIEW_MODIFIER_H_
+#define FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_VIEW_MODIFIER_H_
+
+#include "flutter/fml/macros.h"
+#include "flutter/shell/platform/windows/egl/window_surface.h"
+#include "flutter/shell/platform/windows/flutter_windows_view.h"
+
+namespace flutter {
+
+// A test utility class providing the ability to access and alter various
+// private fields in a |FlutterWindowsView| instance.
+class ViewModifier {
+ public:
+  explicit ViewModifier(FlutterWindowsView* view) : view_(view) {}
+
+  // Override the EGL surface used by the view.
+  //
+  // Modifications are to the view, and will last for the lifetime of the
+  // view unless overwritten again.
+  void SetSurface(std::unique_ptr<egl::WindowSurface> surface) {
+    view_->surface_ = std::move(surface);
+  }
+
+ private:
+  FlutterWindowsView* view_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(ViewModifier);
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_VIEW_MODIFIER_H_
diff --git a/shell/platform/windows/testing/windows_test_config_builder.cc b/shell/platform/windows/testing/windows_test_config_builder.cc
index 35376e241f062ea5b0fa83611c81db87eacd611e..2395b5ed524a01e39b4ef17c2dce9abd061666a9 100644
--- a/shell/platform/windows/testing/windows_test_config_builder.cc
+++ b/shell/platform/windows/testing/windows_test_config_builder.cc
@@ -68,7 +68,28 @@ FlutterDesktopEngineProperties WindowsConfigBuilder::GetEngineProperties()
 
 EnginePtr WindowsConfigBuilder::InitializeEngine() const {
   FlutterDesktopEngineProperties engine_properties = GetEngineProperties();
-  return EnginePtr(FlutterDesktopEngineCreate(&engine_properties));
+  return EnginePtr{FlutterDesktopEngineCreate(&engine_properties)};
+}
+
+EnginePtr WindowsConfigBuilder::RunHeadless() const {
+  InitializeCOM();
+
+  EnginePtr engine = InitializeEngine();
+  if (!engine) {
+    return {};
+  }
+
+  // Register native functions.
+  FlutterWindowsEngine* windows_engine =
+      reinterpret_cast<FlutterWindowsEngine*>(engine.get());
+  windows_engine->SetRootIsolateCreateCallback(
+      context_.GetRootIsolateCallback());
+
+  if (!FlutterDesktopEngineRun(engine.get(), /* entry_point */ nullptr)) {
+    return {};
+  }
+
+  return engine;
 }
 
 ViewControllerPtr WindowsConfigBuilder::Run() const {
@@ -87,8 +108,10 @@ ViewControllerPtr WindowsConfigBuilder::Run() const {
 
   int width = 600;
   int height = 400;
-  ViewControllerPtr controller(
-      FlutterDesktopViewControllerCreate(width, height, engine.release()));
+
+  // Create a view controller that owns the engine.
+  ViewControllerPtr controller{
+      FlutterDesktopViewControllerCreate(width, height, engine.release())};
   if (!controller) {
     return {};
   }
diff --git a/shell/platform/windows/testing/windows_test_config_builder.h b/shell/platform/windows/testing/windows_test_config_builder.h
index 33b2660b2f14759608561faceb44640337a2ad58..1b54b5e009a404d96c6d13d643286f1ed2c33690 100644
--- a/shell/platform/windows/testing/windows_test_config_builder.h
+++ b/shell/platform/windows/testing/windows_test_config_builder.h
@@ -31,14 +31,14 @@ using EnginePtr = std::unique_ptr<FlutterDesktopEngine, EngineDeleter>;
 // Deleter for FlutterViewControllerRef objects.
 struct ViewControllerDeleter {
   typedef FlutterDesktopViewControllerRef pointer;
-  void operator()(FlutterDesktopViewControllerRef engine) {
-    FlutterDesktopViewControllerDestroy(engine);
+  void operator()(FlutterDesktopViewControllerRef controller) {
+    FlutterDesktopViewControllerDestroy(controller);
   }
 };
 
 // Unique pointer wrapper for FlutterDesktopViewControllerRef.
 using ViewControllerPtr =
-    std::unique_ptr<FlutterDesktopViewControllerState, ViewControllerDeleter>;
+    std::unique_ptr<FlutterDesktopViewController, ViewControllerDeleter>;
 
 // Test configuration builder for WindowsTests.
 //
@@ -64,8 +64,16 @@ class WindowsConfigBuilder {
   // Returns a configured and initialized engine.
   EnginePtr InitializeEngine() const;
 
-  // Returns a configured and initialized view controller running the default
-  // Dart entrypoint.
+  // Returns a configured and initialized engine that runs the configured Dart
+  // entrypoint.
+  //
+  // Returns null on failure.
+  EnginePtr RunHeadless() const;
+
+  // Returns a configured and initialized view controller that runs the
+  // configured Dart entrypoint and owns its engine.
+  //
+  // Returns null on failure.
   ViewControllerPtr Run() const;
 
  private:
diff --git a/shell/platform/windows/testing/windows_test_context.cc b/shell/platform/windows/testing/windows_test_context.cc
index 87ba928fbbe744f6c00a075a1b27831530bf1244..30b62b59d7dbe94d8626f903f53801dd1f495d8f 100644
--- a/shell/platform/windows/testing/windows_test_context.cc
+++ b/shell/platform/windows/testing/windows_test_context.cc
@@ -31,6 +31,10 @@ const std::wstring& WindowsTestContext::GetIcuDataPath() const {
   return icu_data_path_;
 }
 
+const std::wstring& WindowsTestContext::GetAotLibraryPath() const {
+  return aot_library_path_;
+}
+
 void WindowsTestContext::AddNativeFunction(std::string_view name,
                                            Dart_NativeFunction function) {
   native_resolver_->AddNativeCallback(std::string{name}, function);
diff --git a/shell/platform/windows/testing/windows_test_context.h b/shell/platform/windows/testing/windows_test_context.h
index 689a6a98ac39382a137a032ce11eb948da208dc2..f6e37ba2b49c0494610e348bb36983c0b5793ab5 100644
--- a/shell/platform/windows/testing/windows_test_context.h
+++ b/shell/platform/windows/testing/windows_test_context.h
@@ -32,6 +32,9 @@ class WindowsTestContext {
   // Returns the path to the ICU library data file.
   const std::wstring& GetIcuDataPath() const;
 
+  // Returns the path to the application's AOT library file.
+  const std::wstring& GetAotLibraryPath() const;
+
   // Registers a native function callable from Dart code in test fixtures. In
   // the Dart test fixture, the associated function can be declared as:
   //
@@ -48,6 +51,7 @@ class WindowsTestContext {
  private:
   std::wstring assets_path_;
   std::wstring icu_data_path_ = L"icudtl.dat";
+  std::wstring aot_library_path_ = L"aot.so";
   std::vector<fml::closure> isolate_create_callbacks_;
   std::shared_ptr<TestDartNativeResolver> native_resolver_;
 
diff --git a/shell/platform/windows/testing/wm_builders.h b/shell/platform/windows/testing/wm_builders.h
index 6f93b13d1c61ac45dad2d6158a2ce654b3577d44..49b78035b7e01f56ae0df76646a1ea33f09eb626 100644
--- a/shell/platform/windows/testing/wm_builders.h
+++ b/shell/platform/windows/testing/wm_builders.h
@@ -7,7 +7,6 @@
 
 #include <stdint.h>
 #include <windows.h>
-#include <windowsx.h>
 
 namespace flutter {
 namespace testing {
diff --git a/shell/platform/windows/text_input_manager.cc b/shell/platform/windows/text_input_manager.cc
index 2bdc8fb13f4a0424907877b455c548749c3b48d0..bc31ac0e27c334832e73d2f3c389974f7c855fdd 100644
--- a/shell/platform/windows/text_input_manager.cc
+++ b/shell/platform/windows/text_input_manager.cc
@@ -2,17 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
 #include "flutter/shell/platform/windows/text_input_manager.h"
 
 #include <imm.h>
 
-#include <cassert>
 #include <memory>
 
+#include "flutter/fml/logging.h"
+#include "flutter/fml/macros.h"
+
 namespace flutter {
 
 // RAII wrapper for the Win32 Input Method Manager context.
@@ -21,7 +19,7 @@ class ImmContext {
   ImmContext(HWND window_handle)
       : context_(::ImmGetContext(window_handle)),
         window_handle_(window_handle) {
-    assert(window_handle);
+    FML_DCHECK(window_handle);
   }
 
   ~ImmContext() {
@@ -30,22 +28,20 @@ class ImmContext {
     }
   }
 
-  // Prevent copying.
-  ImmContext(const ImmContext& other) = delete;
-  ImmContext& operator=(const ImmContext& other) = delete;
-
   // Returns true if a valid IMM context has been obtained.
   bool IsValid() const { return context_ != nullptr; }
 
   // Returns the IMM context.
   HIMC get() {
-    assert(context_);
+    FML_DCHECK(context_);
     return context_;
   }
 
  private:
   HWND window_handle_;
   HIMC context_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(ImmContext);
 };
 
 void TextInputManager::SetWindowHandle(HWND window_handle) {
diff --git a/shell/platform/windows/text_input_manager.h b/shell/platform/windows/text_input_manager.h
index a283a5123e9c4513657be3a0a380a77806a7c2e9..4e1c262fa31df9af0a805c7dfd6b411d542e563d 100644
--- a/shell/platform/windows/text_input_manager.h
+++ b/shell/platform/windows/text_input_manager.h
@@ -11,6 +11,7 @@
 #include <optional>
 #include <string>
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/common/geometry.h"
 
 namespace flutter {
@@ -30,9 +31,6 @@ class TextInputManager {
   TextInputManager() noexcept = default;
   virtual ~TextInputManager() = default;
 
-  TextInputManager(const TextInputManager&) = delete;
-  TextInputManager& operator=(const TextInputManager&) = delete;
-
   // Sets the window handle with which the IME is associated.
   void SetWindowHandle(HWND window_handle);
 
@@ -100,6 +98,8 @@ class TextInputManager {
 
   // The system caret rect.
   Rect caret_rect_ = {{0, 0}, {0, 0}};
+
+  FML_DISALLOW_COPY_AND_ASSIGN(TextInputManager);
 };
 
 }  // namespace flutter
diff --git a/shell/platform/windows/text_input_plugin.cc b/shell/platform/windows/text_input_plugin.cc
index 6031c4cd41b70f5e4462fedf38ee91afbe761ecf..a67eca476c7e0a2cf939214fbe59ccd7594fe8ac 100644
--- a/shell/platform/windows/text_input_plugin.cc
+++ b/shell/platform/windows/text_input_plugin.cc
@@ -3,14 +3,16 @@
 // found in the LICENSE file.
 
 #include "flutter/shell/platform/windows/text_input_plugin.h"
-#include "flutter/fml/string_conversion.h"
-#include "flutter/shell/platform/common/text_editing_delta.h"
 
 #include <windows.h>
 
 #include <cstdint>
 
+#include "flutter/fml/string_conversion.h"
 #include "flutter/shell/platform/common/json_method_codec.h"
+#include "flutter/shell/platform/common/text_editing_delta.h"
+#include "flutter/shell/platform/windows/flutter_windows_engine.h"
+#include "flutter/shell/platform/windows/flutter_windows_view.h"
 
 static constexpr char kSetEditingStateMethod[] = "TextInput.setEditingState";
 static constexpr char kClearClientMethod[] = "TextInput.clearClient";
@@ -58,6 +60,8 @@ static constexpr char kBadArgumentError[] = "Bad Arguments";
 static constexpr char kInternalConsistencyError[] =
     "Internal Consistency Error";
 
+static constexpr char kInputActionNewline[] = "TextInputAction.newline";
+
 namespace flutter {
 
 void TextInputPlugin::TextHook(const std::u16string& text) {
@@ -101,12 +105,12 @@ void TextInputPlugin::KeyboardHook(int key,
 }
 
 TextInputPlugin::TextInputPlugin(flutter::BinaryMessenger* messenger,
-                                 TextInputPluginDelegate* delegate)
+                                 FlutterWindowsEngine* engine)
     : channel_(std::make_unique<flutter::MethodChannel<rapidjson::Document>>(
           messenger,
           kChannelName,
           &flutter::JsonMethodCodec::GetInstance())),
-      delegate_(delegate),
+      engine_(engine),
       active_model_(nullptr) {
   channel_->SetMethodCallHandler(
       [this](
@@ -193,9 +197,7 @@ void TextInputPlugin::ComposeChangeHook(const std::u16string& text,
   std::string text_before_change = active_model_->GetText();
   TextRange composing_before_change = active_model_->composing_range();
   active_model_->AddText(text);
-  cursor_pos += active_model_->composing_range().extent();
-  active_model_->UpdateComposingText(text);
-  active_model_->SetSelection(TextRange(cursor_pos, cursor_pos));
+  active_model_->UpdateComposingText(text, TextRange(cursor_pos, cursor_pos));
   std::string text_after_change = active_model_->GetText();
   if (enable_delta_model) {
     TextEditingDelta delta = TextEditingDelta(
@@ -214,12 +216,20 @@ void TextInputPlugin::HandleMethodCall(
   if (method.compare(kShowMethod) == 0 || method.compare(kHideMethod) == 0) {
     // These methods are no-ops.
   } else if (method.compare(kClearClientMethod) == 0) {
+    // TODO(loicsharma): Remove implicit view assumption.
+    // https://github.com/flutter/flutter/issues/142845
+    FlutterWindowsView* view = engine_->view(kImplicitViewId);
+    if (view == nullptr) {
+      result->Error(kInternalConsistencyError,
+                    "Text input is not available in Windows headless mode");
+      return;
+    }
     if (active_model_ != nullptr && active_model_->composing()) {
       active_model_->CommitComposing();
       active_model_->EndComposing();
       SendStateUpdate(*active_model_);
     }
-    delegate_->OnResetImeComposing();
+    view->OnResetImeComposing();
     active_model_ = nullptr;
   } else if (method.compare(kSetClientMethod) == 0) {
     if (!method_call.arguments() || method_call.arguments()->IsNull()) {
@@ -318,6 +328,14 @@ void TextInputPlugin::HandleMethodCall(
           TextRange(composing_base, composing_extent), cursor_offset);
     }
   } else if (method.compare(kSetMarkedTextRect) == 0) {
+    // TODO(loicsharma): Remove implicit view assumption.
+    // https://github.com/flutter/flutter/issues/142845
+    FlutterWindowsView* view = engine_->view(kImplicitViewId);
+    if (view == nullptr) {
+      result->Error(kInternalConsistencyError,
+                    "Text input is not available in Windows headless mode");
+      return;
+    }
     if (!method_call.arguments() || method_call.arguments()->IsNull()) {
       result->Error(kBadArgumentError, "Method invoked without args");
       return;
@@ -339,8 +357,16 @@ void TextInputPlugin::HandleMethodCall(
                        {width->value.GetDouble(), height->value.GetDouble()}};
 
     Rect transformed_rect = GetCursorRect();
-    delegate_->OnCursorRectUpdated(transformed_rect);
+    view->OnCursorRectUpdated(transformed_rect);
   } else if (method.compare(kSetEditableSizeAndTransform) == 0) {
+    // TODO(loicsharma): Remove implicit view assumption.
+    // https://github.com/flutter/flutter/issues/142845
+    FlutterWindowsView* view = engine_->view(kImplicitViewId);
+    if (view == nullptr) {
+      result->Error(kInternalConsistencyError,
+                    "Text input is not available in Windows headless mode");
+      return;
+    }
     if (!method_call.arguments() || method_call.arguments()->IsNull()) {
       result->Error(kBadArgumentError, "Method invoked without args");
       return;
@@ -364,7 +390,7 @@ void TextInputPlugin::HandleMethodCall(
       ++i;
     }
     Rect transformed_rect = GetCursorRect();
-    delegate_->OnCursorRectUpdated(transformed_rect);
+    view->OnCursorRectUpdated(transformed_rect);
   } else {
     result->NotImplemented();
     return;
@@ -445,7 +471,8 @@ void TextInputPlugin::SendStateUpdateWithDelta(const TextInputModel& model,
 }
 
 void TextInputPlugin::EnterPressed(TextInputModel* model) {
-  if (input_type_ == kMultilineInputType) {
+  if (input_type_ == kMultilineInputType &&
+      input_action_ == kInputActionNewline) {
     std::u16string text_before_change = fml::Utf8ToUtf16(model->GetText());
     TextRange selection_before_change = model->selection();
     model->AddText(u"\n");
diff --git a/shell/platform/windows/text_input_plugin.h b/shell/platform/windows/text_input_plugin.h
index e9c36c3966eb2e66b5c82a0ecee81c6e390f939d..a452e293d68086d4346ab1d12707f47e49a7898a 100644
--- a/shell/platform/windows/text_input_plugin.h
+++ b/shell/platform/windows/text_input_plugin.h
@@ -9,6 +9,7 @@
 #include <map>
 #include <memory>
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h"
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/method_channel.h"
 #include "flutter/shell/platform/common/geometry.h"
@@ -16,20 +17,22 @@
 #include "flutter/shell/platform/common/text_editing_delta.h"
 #include "flutter/shell/platform/common/text_input_model.h"
 #include "flutter/shell/platform/windows/keyboard_handler_base.h"
-#include "flutter/shell/platform/windows/text_input_plugin_delegate.h"
 
 namespace flutter {
 
+class FlutterWindowsEngine;
+
 // Implements a text input plugin.
 //
 // Specifically handles window events within windows.
 class TextInputPlugin {
  public:
-  explicit TextInputPlugin(flutter::BinaryMessenger* messenger,
-                           TextInputPluginDelegate* delegate);
+  TextInputPlugin(flutter::BinaryMessenger* messenger,
+                  FlutterWindowsEngine* engine);
 
   virtual ~TextInputPlugin();
 
+  // Called when the Flutter engine receives a raw keyboard message.
   virtual void KeyboardHook(int key,
                             int scancode,
                             int action,
@@ -37,14 +40,33 @@ class TextInputPlugin {
                             bool extended,
                             bool was_down);
 
+  // Called when the Flutter engine receives a keyboard character.
   virtual void TextHook(const std::u16string& text);
 
+  // Called on an IME compose begin event.
+  //
+  // Triggered when the user begins editing composing text using a multi-step
+  // input method such as in CJK text input.
   virtual void ComposeBeginHook();
 
+  // Called on an IME compose commit event.
+  //
+  // Triggered when the user triggers a commit of the current composing text
+  // while using a multi-step input method such as in CJK text input. Composing
+  // continues with the next keypress.
   virtual void ComposeCommitHook();
 
+  // Called on an IME compose end event.
+  //
+  // Triggered when the composing ends, for example when the user presses
+  // ESC or when the user triggers a commit of the composing text while using a
+  // multi-step input method such as in CJK text input.
   virtual void ComposeEndHook();
 
+  // Called on an IME composing region change event.
+  //
+  // Triggered when the user edits the composing text while using a multi-step
+  // input method such as in CJK text input.
   virtual void ComposeChangeHook(const std::u16string& text, int cursor_pos);
 
  private:
@@ -70,8 +92,8 @@ class TextInputPlugin {
   // The MethodChannel used for communication with the Flutter engine.
   std::unique_ptr<flutter::MethodChannel<rapidjson::Document>> channel_;
 
-  // The associated |TextInputPluginDelegate|.
-  TextInputPluginDelegate* delegate_;
+  // The associated |FlutterWindowsEngine|.
+  FlutterWindowsEngine* engine_;
 
   // The active client id.
   int client_id_;
@@ -83,7 +105,7 @@ class TextInputPlugin {
   // as TextEditingDeltas or as one TextEditingValue.
   // For more information on the delta model, see:
   // https://master-api.flutter.dev/flutter/services/TextInputConfiguration/enableDeltaModel.html
-  bool enable_delta_model;
+  bool enable_delta_model = false;
 
   // Keyboard type of the client. See available options:
   // https://api.flutter.dev/flutter/services/TextInputType-class.html
@@ -106,6 +128,8 @@ class TextInputPlugin {
       0.0, 0.0, 0.0, 0.0,  //
       0.0, 0.0, 0.0, 0.0,  //
       0.0, 0.0, 0.0, 0.0};
+
+  FML_DISALLOW_COPY_AND_ASSIGN(TextInputPlugin);
 };
 
 }  // namespace flutter
diff --git a/shell/platform/windows/text_input_plugin_delegate.h b/shell/platform/windows/text_input_plugin_delegate.h
deleted file mode 100644
index 0d41ff4bdc3a00f1d1c99f3ae71adb5120f9da4f..0000000000000000000000000000000000000000
--- a/shell/platform/windows/text_input_plugin_delegate.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_TEXT_INPUT_PLUGIN_DELEGATE_H_
-#define FLUTTER_SHELL_PLATFORM_WINDOWS_TEXT_INPUT_PLUGIN_DELEGATE_H_
-
-#include "flutter/shell/platform/common/geometry.h"
-#include "flutter/shell/platform/embedder/embedder.h"
-
-namespace flutter {
-
-class TextInputPluginDelegate {
- public:
-  // Notifies the delegate of the updated the cursor rect in Flutter root view
-  // coordinates.
-  virtual void OnCursorRectUpdated(const Rect& rect) = 0;
-
-  // Notifies the delegate that the system IME composing state should be reset.
-  virtual void OnResetImeComposing() = 0;
-};
-
-}  // namespace flutter
-
-#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_TEXT_INPUT_PLUGIN_DELEGATE_H_
diff --git a/shell/platform/windows/text_input_plugin_unittest.cc b/shell/platform/windows/text_input_plugin_unittest.cc
index 1bb5a2aa2eb8285edfa4d35c1d6eeb004de35f98..d1fb6ee671b1dc51fc3069823ce70680b22b0260 100644
--- a/shell/platform/windows/text_input_plugin_unittest.cc
+++ b/shell/platform/windows/text_input_plugin_unittest.cc
@@ -7,9 +7,15 @@
 #include <windows.h>
 #include <memory>
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/common/json_message_codec.h"
 #include "flutter/shell/platform/common/json_method_codec.h"
+#include "flutter/shell/platform/windows/flutter_windows_view.h"
+#include "flutter/shell/platform/windows/testing/engine_modifier.h"
+#include "flutter/shell/platform/windows/testing/flutter_windows_engine_builder.h"
+#include "flutter/shell/platform/windows/testing/mock_window_binding_handler.h"
 #include "flutter/shell/platform/windows/testing/test_binary_messenger.h"
+#include "flutter/shell/platform/windows/testing/windows_test.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
@@ -17,14 +23,27 @@ namespace flutter {
 namespace testing {
 
 namespace {
+using ::testing::Return;
+
 static constexpr char kScanCodeKey[] = "scanCode";
 static constexpr int kHandledScanCode = 20;
 static constexpr int kUnhandledScanCode = 21;
 static constexpr char kTextPlainFormat[] = "text/plain";
+static constexpr int kDefaultClientId = 42;
 // Should be identical to constants in text_input_plugin.cc.
 static constexpr char kChannelName[] = "flutter/textinput";
 static constexpr char kEnableDeltaModel[] = "enableDeltaModel";
 static constexpr char kSetClientMethod[] = "TextInput.setClient";
+static constexpr char kAffinityDownstream[] = "TextAffinity.downstream";
+static constexpr char kTextKey[] = "text";
+static constexpr char kSelectionBaseKey[] = "selectionBase";
+static constexpr char kSelectionExtentKey[] = "selectionExtent";
+static constexpr char kSelectionAffinityKey[] = "selectionAffinity";
+static constexpr char kSelectionIsDirectionalKey[] = "selectionIsDirectional";
+static constexpr char kComposingBaseKey[] = "composingBase";
+static constexpr char kComposingExtentKey[] = "composingExtent";
+static constexpr char kUpdateEditingStateMethod[] =
+    "TextInputClient.updateEditingState";
 
 static std::unique_ptr<std::vector<uint8_t>> CreateResponse(bool handled) {
   auto response_doc =
@@ -34,23 +53,116 @@ static std::unique_ptr<std::vector<uint8_t>> CreateResponse(bool handled) {
   return JsonMessageCodec::GetInstance().EncodeMessage(*response_doc);
 }
 
-class MockTextInputPluginDelegate : public TextInputPluginDelegate {
+static std::unique_ptr<rapidjson::Document> EncodedClientConfig(
+    std::string type_name,
+    std::string input_action) {
+  auto arguments = std::make_unique<rapidjson::Document>(rapidjson::kArrayType);
+  auto& allocator = arguments->GetAllocator();
+  arguments->PushBack(kDefaultClientId, allocator);
+
+  rapidjson::Value config(rapidjson::kObjectType);
+  config.AddMember("inputAction", input_action, allocator);
+  config.AddMember(kEnableDeltaModel, false, allocator);
+  rapidjson::Value type_info(rapidjson::kObjectType);
+  type_info.AddMember("name", type_name, allocator);
+  config.AddMember("inputType", type_info, allocator);
+  arguments->PushBack(config, allocator);
+
+  return arguments;
+}
+
+static std::unique_ptr<rapidjson::Document> EncodedEditingState(
+    std::string text,
+    TextRange selection) {
+  auto model = std::make_unique<TextInputModel>();
+  model->SetText(text);
+  model->SetSelection(selection);
+
+  auto arguments = std::make_unique<rapidjson::Document>(rapidjson::kArrayType);
+  auto& allocator = arguments->GetAllocator();
+  arguments->PushBack(kDefaultClientId, allocator);
+
+  rapidjson::Value editing_state(rapidjson::kObjectType);
+  editing_state.AddMember(kSelectionAffinityKey, kAffinityDownstream,
+                          allocator);
+  editing_state.AddMember(kSelectionBaseKey, selection.base(), allocator);
+  editing_state.AddMember(kSelectionExtentKey, selection.extent(), allocator);
+  editing_state.AddMember(kSelectionIsDirectionalKey, false, allocator);
+
+  int composing_base =
+      model->composing() ? model->composing_range().base() : -1;
+  int composing_extent =
+      model->composing() ? model->composing_range().extent() : -1;
+  editing_state.AddMember(kComposingBaseKey, composing_base, allocator);
+  editing_state.AddMember(kComposingExtentKey, composing_extent, allocator);
+  editing_state.AddMember(kTextKey,
+                          rapidjson::Value(model->GetText(), allocator).Move(),
+                          allocator);
+  arguments->PushBack(editing_state, allocator);
+
+  return arguments;
+}
+
+class MockFlutterWindowsView : public FlutterWindowsView {
  public:
-  MockTextInputPluginDelegate() {}
-  virtual ~MockTextInputPluginDelegate() = default;
+  MockFlutterWindowsView(FlutterWindowsEngine* engine,
+                         std::unique_ptr<WindowBindingHandler> window)
+      : FlutterWindowsView(kImplicitViewId, engine, std::move(window)) {}
+  virtual ~MockFlutterWindowsView() = default;
 
-  // Prevent copying.
-  MockTextInputPluginDelegate(MockTextInputPluginDelegate const&) = delete;
-  MockTextInputPluginDelegate& operator=(MockTextInputPluginDelegate const&) =
-      delete;
+  MOCK_METHOD(void, OnCursorRectUpdated, (const Rect&), (override));
+  MOCK_METHOD(void, OnResetImeComposing, (), (override));
 
-  MOCK_METHOD1(OnCursorRectUpdated, void(const Rect&));
-  MOCK_METHOD0(OnResetImeComposing, void());
+ private:
+  FML_DISALLOW_COPY_AND_ASSIGN(MockFlutterWindowsView);
 };
 
 }  // namespace
 
-TEST(TextInputPluginTest, TextMethodsWorksWithEmptyModel) {
+class TextInputPluginTest : public WindowsTest {
+ public:
+  TextInputPluginTest() = default;
+  virtual ~TextInputPluginTest() = default;
+
+ protected:
+  FlutterWindowsEngine* engine() { return engine_.get(); }
+  MockFlutterWindowsView* view() { return view_.get(); }
+  MockWindowBindingHandler* window() { return window_; }
+
+  void UseHeadlessEngine() {
+    FlutterWindowsEngineBuilder builder{GetContext()};
+
+    engine_ = builder.Build();
+  }
+
+  void UseEngineWithView() {
+    FlutterWindowsEngineBuilder builder{GetContext()};
+
+    auto window = std::make_unique<MockWindowBindingHandler>();
+
+    window_ = window.get();
+    EXPECT_CALL(*window_, SetView).Times(1);
+    EXPECT_CALL(*window, GetWindowHandle).WillRepeatedly(Return(nullptr));
+
+    engine_ = builder.Build();
+    view_ = std::make_unique<MockFlutterWindowsView>(engine_.get(),
+                                                     std::move(window));
+
+    EngineModifier modifier{engine_.get()};
+    modifier.SetImplicitView(view_.get());
+  }
+
+ private:
+  std::unique_ptr<FlutterWindowsEngine> engine_;
+  std::unique_ptr<MockFlutterWindowsView> view_;
+  MockWindowBindingHandler* window_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(TextInputPluginTest);
+};
+
+TEST_F(TextInputPluginTest, TextMethodsWorksWithEmptyModel) {
+  UseEngineWithView();
+
   auto handled_message = CreateResponse(true);
   auto unhandled_message = CreateResponse(false);
   int received_scancode = 0;
@@ -59,10 +171,9 @@ TEST(TextInputPluginTest, TextMethodsWorksWithEmptyModel) {
       [&received_scancode, &handled_message, &unhandled_message](
           const std::string& channel, const uint8_t* message,
           size_t message_size, BinaryReply reply) {});
-  MockTextInputPluginDelegate delegate;
 
   int redispatch_scancode = 0;
-  TextInputPlugin handler(&messenger, &delegate);
+  TextInputPlugin handler(&messenger, engine());
 
   handler.KeyboardHook(VK_RETURN, 100, WM_KEYDOWN, '\n', false, false);
   handler.ComposeBeginHook();
@@ -74,16 +185,17 @@ TEST(TextInputPluginTest, TextMethodsWorksWithEmptyModel) {
   // Passes if it did not crash
 }
 
-TEST(TextInputPluginTest, ClearClientResetsComposing) {
+TEST_F(TextInputPluginTest, ClearClientResetsComposing) {
+  UseEngineWithView();
+
   TestBinaryMessenger messenger([](const std::string& channel,
                                    const uint8_t* message, size_t message_size,
                                    BinaryReply reply) {});
   BinaryReply reply_handler = [](const uint8_t* reply, size_t reply_size) {};
 
-  MockTextInputPluginDelegate delegate;
-  TextInputPlugin handler(&messenger, &delegate);
+  TextInputPlugin handler(&messenger, engine());
 
-  EXPECT_CALL(delegate, OnResetImeComposing());
+  EXPECT_CALL(*view(), OnResetImeComposing());
 
   auto& codec = JsonMethodCodec::GetInstance();
   auto message = codec.EncodeMethodCall({"TextInput.clearClient", nullptr});
@@ -91,9 +203,37 @@ TEST(TextInputPluginTest, ClearClientResetsComposing) {
                                   message->size(), reply_handler);
 }
 
+// Verify that clear client fails if in headless mode.
+TEST_F(TextInputPluginTest, ClearClientRequiresView) {
+  UseHeadlessEngine();
+
+  TestBinaryMessenger messenger([](const std::string& channel,
+                                   const uint8_t* message, size_t message_size,
+                                   BinaryReply reply) {});
+
+  std::string reply;
+  BinaryReply reply_handler = [&reply](const uint8_t* reply_bytes,
+                                       size_t reply_size) {
+    reply = std::string(reinterpret_cast<const char*>(reply_bytes), reply_size);
+  };
+
+  TextInputPlugin handler(&messenger, engine());
+
+  auto& codec = JsonMethodCodec::GetInstance();
+  auto message = codec.EncodeMethodCall({"TextInput.clearClient", nullptr});
+  messenger.SimulateEngineMessage(kChannelName, message->data(),
+                                  message->size(), reply_handler);
+
+  EXPECT_EQ(reply,
+            "[\"Internal Consistency Error\",\"Text input is not available in "
+            "Windows headless mode\",null]");
+}
+
 // Verify that the embedder sends state update messages to the framework during
 // IME composing.
-TEST(TextInputPluginTest, VerifyComposingSendStateUpdate) {
+TEST_F(TextInputPluginTest, VerifyComposingSendStateUpdate) {
+  UseEngineWithView();
+
   bool sent_message = false;
   TestBinaryMessenger messenger(
       [&sent_message](const std::string& channel, const uint8_t* message,
@@ -101,15 +241,14 @@ TEST(TextInputPluginTest, VerifyComposingSendStateUpdate) {
                       BinaryReply reply) { sent_message = true; });
   BinaryReply reply_handler = [](const uint8_t* reply, size_t reply_size) {};
 
-  MockTextInputPluginDelegate delegate;
-  TextInputPlugin handler(&messenger, &delegate);
+  TextInputPlugin handler(&messenger, engine());
 
   auto& codec = JsonMethodCodec::GetInstance();
 
   // Call TextInput.setClient to initialize the TextInputModel.
   auto arguments = std::make_unique<rapidjson::Document>(rapidjson::kArrayType);
   auto& allocator = arguments->GetAllocator();
-  arguments->PushBack(42, allocator);
+  arguments->PushBack(kDefaultClientId, allocator);
   rapidjson::Value config(rapidjson::kObjectType);
   config.AddMember("inputAction", "done", allocator);
   config.AddMember("inputType", "text", allocator);
@@ -148,7 +287,114 @@ TEST(TextInputPluginTest, VerifyComposingSendStateUpdate) {
   EXPECT_TRUE(sent_message);
 }
 
-TEST(TextInputPluginTest, TextEditingWorksWithDeltaModel) {
+TEST_F(TextInputPluginTest, VerifyInputActionNewlineInsertNewLine) {
+  UseEngineWithView();
+
+  // Store messages as std::string for convenience.
+  std::vector<std::string> messages;
+
+  TestBinaryMessenger messenger(
+      [&messages](const std::string& channel, const uint8_t* message,
+                  size_t message_size, BinaryReply reply) {
+        std::string last_message(reinterpret_cast<const char*>(message),
+                                 message_size);
+        messages.push_back(last_message);
+      });
+  BinaryReply reply_handler = [](const uint8_t* reply, size_t reply_size) {};
+
+  TextInputPlugin handler(&messenger, engine());
+
+  auto& codec = JsonMethodCodec::GetInstance();
+
+  // Call TextInput.setClient to initialize the TextInputModel.
+  auto set_client_arguments =
+      EncodedClientConfig("TextInputType.multiline", "TextInputAction.newline");
+  auto message = codec.EncodeMethodCall(
+      {"TextInput.setClient", std::move(set_client_arguments)});
+  messenger.SimulateEngineMessage("flutter/textinput", message->data(),
+                                  message->size(), reply_handler);
+
+  // Simulate a key down event for '\n'.
+  handler.KeyboardHook(VK_RETURN, 100, WM_KEYDOWN, '\n', false, false);
+
+  // Two messages are expected, the first is TextInput.updateEditingState and
+  // the second is TextInputClient.performAction.
+  EXPECT_EQ(messages.size(), 2);
+
+  // Editing state should have been updated.
+  auto encoded_arguments = EncodedEditingState("\n", TextRange(1));
+  auto update_state_message = codec.EncodeMethodCall(
+      {kUpdateEditingStateMethod, std::move(encoded_arguments)});
+
+  EXPECT_TRUE(std::equal(update_state_message->begin(),
+                         update_state_message->end(),
+                         messages.front().begin()));
+
+  // TextInputClient.performAction should have been called.
+  auto arguments = std::make_unique<rapidjson::Document>(rapidjson::kArrayType);
+  auto& allocator = arguments->GetAllocator();
+  arguments->PushBack(kDefaultClientId, allocator);
+  arguments->PushBack(
+      rapidjson::Value("TextInputAction.newline", allocator).Move(), allocator);
+  auto invoke_action_message = codec.EncodeMethodCall(
+      {"TextInputClient.performAction", std::move(arguments)});
+
+  EXPECT_TRUE(std::equal(invoke_action_message->begin(),
+                         invoke_action_message->end(),
+                         messages.back().begin()));
+}
+
+// Regression test for https://github.com/flutter/flutter/issues/125879.
+TEST_F(TextInputPluginTest, VerifyInputActionSendDoesNotInsertNewLine) {
+  UseEngineWithView();
+
+  std::vector<std::vector<uint8_t>> messages;
+
+  TestBinaryMessenger messenger(
+      [&messages](const std::string& channel, const uint8_t* message,
+                  size_t message_size, BinaryReply reply) {
+        int length = static_cast<int>(message_size);
+        std::vector<uint8_t> last_message(length);
+        memcpy(&last_message[0], &message[0], length * sizeof(uint8_t));
+        messages.push_back(last_message);
+      });
+  BinaryReply reply_handler = [](const uint8_t* reply, size_t reply_size) {};
+
+  TextInputPlugin handler(&messenger, engine());
+
+  auto& codec = JsonMethodCodec::GetInstance();
+
+  // Call TextInput.setClient to initialize the TextInputModel.
+  auto set_client_arguments =
+      EncodedClientConfig("TextInputType.multiline", "TextInputAction.send");
+  auto message = codec.EncodeMethodCall(
+      {"TextInput.setClient", std::move(set_client_arguments)});
+  messenger.SimulateEngineMessage("flutter/textinput", message->data(),
+                                  message->size(), reply_handler);
+
+  // Simulate a key down event for '\n'.
+  handler.KeyboardHook(VK_RETURN, 100, WM_KEYDOWN, '\n', false, false);
+
+  // Only a call to TextInputClient.performAction is expected.
+  EXPECT_EQ(messages.size(), 1);
+
+  // TextInputClient.performAction should have been called.
+  auto arguments = std::make_unique<rapidjson::Document>(rapidjson::kArrayType);
+  auto& allocator = arguments->GetAllocator();
+  arguments->PushBack(kDefaultClientId, allocator);
+  arguments->PushBack(
+      rapidjson::Value("TextInputAction.send", allocator).Move(), allocator);
+  auto invoke_action_message = codec.EncodeMethodCall(
+      {"TextInputClient.performAction", std::move(arguments)});
+
+  EXPECT_TRUE(std::equal(invoke_action_message->begin(),
+                         invoke_action_message->end(),
+                         messages.front().begin()));
+}
+
+TEST_F(TextInputPluginTest, TextEditingWorksWithDeltaModel) {
+  UseEngineWithView();
+
   auto handled_message = CreateResponse(true);
   auto unhandled_message = CreateResponse(false);
   int received_scancode = 0;
@@ -157,10 +403,9 @@ TEST(TextInputPluginTest, TextEditingWorksWithDeltaModel) {
       [&received_scancode, &handled_message, &unhandled_message](
           const std::string& channel, const uint8_t* message,
           size_t message_size, BinaryReply reply) {});
-  MockTextInputPluginDelegate delegate;
 
   int redispatch_scancode = 0;
-  TextInputPlugin handler(&messenger, &delegate);
+  TextInputPlugin handler(&messenger, engine());
 
   auto args = std::make_unique<rapidjson::Document>(rapidjson::kArrayType);
   auto& allocator = args->GetAllocator();
@@ -204,7 +449,69 @@ TEST(TextInputPluginTest, TextEditingWorksWithDeltaModel) {
   // Passes if it did not crash
 }
 
-TEST(TextInputPluginTest, TransformCursorRect) {
+// Regression test for https://github.com/flutter/flutter/issues/123749
+TEST_F(TextInputPluginTest, CompositionCursorPos) {
+  UseEngineWithView();
+
+  int selection_base = -1;
+  TestBinaryMessenger messenger([&](const std::string& channel,
+                                    const uint8_t* message, size_t size,
+                                    BinaryReply reply) {
+    auto method = JsonMethodCodec::GetInstance().DecodeMethodCall(
+        std::vector<uint8_t>(message, message + size));
+    if (method->method_name() == kUpdateEditingStateMethod) {
+      const auto& args = *method->arguments();
+      const auto& editing_state = args[1];
+      auto base = editing_state.FindMember(kSelectionBaseKey);
+      auto extent = editing_state.FindMember(kSelectionExtentKey);
+      ASSERT_NE(base, editing_state.MemberEnd());
+      ASSERT_TRUE(base->value.IsInt());
+      ASSERT_NE(extent, editing_state.MemberEnd());
+      ASSERT_TRUE(extent->value.IsInt());
+      selection_base = base->value.GetInt();
+      EXPECT_EQ(extent->value.GetInt(), selection_base);
+    }
+  });
+
+  TextInputPlugin plugin(&messenger, engine());
+
+  auto args = std::make_unique<rapidjson::Document>(rapidjson::kArrayType);
+  auto& allocator = args->GetAllocator();
+  args->PushBack(123, allocator);  // client_id
+  rapidjson::Value client_config(rapidjson::kObjectType);
+  args->PushBack(client_config, allocator);
+  auto encoded = JsonMethodCodec::GetInstance().EncodeMethodCall(
+      MethodCall<rapidjson::Document>(kSetClientMethod, std::move(args)));
+  EXPECT_TRUE(messenger.SimulateEngineMessage(
+      kChannelName, encoded->data(), encoded->size(),
+      [](const uint8_t* reply, size_t reply_size) {}));
+
+  plugin.ComposeBeginHook();
+  EXPECT_EQ(selection_base, 0);
+  plugin.ComposeChangeHook(u"abc", 3);
+  EXPECT_EQ(selection_base, 3);
+
+  plugin.ComposeCommitHook();
+  plugin.ComposeEndHook();
+  EXPECT_EQ(selection_base, 3);
+
+  plugin.ComposeBeginHook();
+  plugin.ComposeChangeHook(u"1", 1);
+  EXPECT_EQ(selection_base, 4);
+
+  plugin.ComposeChangeHook(u"12", 2);
+  EXPECT_EQ(selection_base, 5);
+
+  plugin.ComposeChangeHook(u"12", 1);
+  EXPECT_EQ(selection_base, 4);
+
+  plugin.ComposeChangeHook(u"12", 2);
+  EXPECT_EQ(selection_base, 5);
+}
+
+TEST_F(TextInputPluginTest, TransformCursorRect) {
+  UseEngineWithView();
+
   // A position of `EditableText`.
   double view_x = 100;
   double view_y = 200;
@@ -227,12 +534,11 @@ TEST(TextInputPluginTest, TransformCursorRect) {
                                    BinaryReply reply) {});
   BinaryReply reply_handler = [](const uint8_t* reply, size_t reply_size) {};
 
-  MockTextInputPluginDelegate delegate;
-  TextInputPlugin handler(&messenger, &delegate);
+  TextInputPlugin handler(&messenger, engine());
 
   auto& codec = JsonMethodCodec::GetInstance();
 
-  EXPECT_CALL(delegate, OnCursorRectUpdated(Rect{{view_x, view_y}, {0, 0}}));
+  EXPECT_CALL(*view(), OnCursorRectUpdated(Rect{{view_x, view_y}, {0, 0}}));
 
   {
     auto arguments =
@@ -253,7 +559,7 @@ TEST(TextInputPluginTest, TransformCursorRect) {
                                     message->size(), reply_handler);
   }
 
-  EXPECT_CALL(delegate,
+  EXPECT_CALL(*view(),
               OnCursorRectUpdated(Rect{{view_x + ime_x, view_y + ime_y},
                                        {ime_width, ime_height}}));
 
@@ -274,5 +580,41 @@ TEST(TextInputPluginTest, TransformCursorRect) {
   }
 }
 
+TEST_F(TextInputPluginTest, SetMarkedTextRectRequiresView) {
+  UseHeadlessEngine();
+
+  TestBinaryMessenger messenger([](const std::string& channel,
+                                   const uint8_t* message, size_t message_size,
+                                   BinaryReply reply) {});
+
+  std::string reply;
+  BinaryReply reply_handler = [&reply](const uint8_t* reply_bytes,
+                                       size_t reply_size) {
+    reply = std::string(reinterpret_cast<const char*>(reply_bytes), reply_size);
+  };
+
+  TextInputPlugin handler(&messenger, engine());
+
+  auto& codec = JsonMethodCodec::GetInstance();
+
+  auto arguments =
+      std::make_unique<rapidjson::Document>(rapidjson::kObjectType);
+  auto& allocator = arguments->GetAllocator();
+
+  arguments->AddMember("x", 0, allocator);
+  arguments->AddMember("y", 0, allocator);
+  arguments->AddMember("width", 0, allocator);
+  arguments->AddMember("height", 0, allocator);
+
+  auto message = codec.EncodeMethodCall(
+      {"TextInput.setMarkedTextRect", std::move(arguments)});
+  messenger.SimulateEngineMessage(kChannelName, message->data(),
+                                  message->size(), reply_handler);
+
+  EXPECT_EQ(reply,
+            "[\"Internal Consistency Error\",\"Text input is not available in "
+            "Windows headless mode\",null]");
+}
+
 }  // namespace testing
 }  // namespace flutter
diff --git a/shell/platform/windows/window.cc b/shell/platform/windows/window.cc
deleted file mode 100644
index a6fe97b0d5383b22687b1c554f39b77cfd5aabd7..0000000000000000000000000000000000000000
--- a/shell/platform/windows/window.cc
+++ /dev/null
@@ -1,661 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "flutter/shell/platform/windows/window.h"
-
-#include "base/win/atl.h"  // NOLINT(build/include_order)
-
-#include <imm.h>
-#include <oleacc.h>
-#include <uiautomationcore.h>
-#include <uiautomationcoreapi.h>
-#include <wrl/client.h>
-
-#include <cstring>
-
-#include "flutter/shell/platform/windows/dpi_utils.h"
-
-namespace flutter {
-
-namespace {
-
-static constexpr int32_t kDefaultPointerDeviceId = 0;
-
-// This method is only valid during a window message related to mouse/touch
-// input.
-// See
-// https://docs.microsoft.com/en-us/windows/win32/tablet/system-events-and-mouse-messages?redirectedfrom=MSDN#distinguishing-pen-input-from-mouse-and-touch.
-static FlutterPointerDeviceKind GetFlutterPointerDeviceKind() {
-  constexpr LPARAM kTouchOrPenSignature = 0xFF515700;
-  constexpr LPARAM kTouchSignature = kTouchOrPenSignature | 0x80;
-  constexpr LPARAM kSignatureMask = 0xFFFFFF00;
-  LPARAM info = GetMessageExtraInfo();
-  if ((info & kSignatureMask) == kTouchOrPenSignature) {
-    if ((info & kTouchSignature) == kTouchSignature) {
-      return kFlutterPointerDeviceKindTouch;
-    }
-    return kFlutterPointerDeviceKindStylus;
-  }
-  return kFlutterPointerDeviceKindMouse;
-}
-
-char32_t CodePointFromSurrogatePair(wchar_t high, wchar_t low) {
-  return 0x10000 + ((static_cast<char32_t>(high) & 0x000003FF) << 10) +
-         (low & 0x3FF);
-}
-
-static const int kMinTouchDeviceId = 0;
-static const int kMaxTouchDeviceId = 128;
-
-static const int kLinesPerScrollWindowsDefault = 3;
-
-}  // namespace
-
-Window::Window() : Window(nullptr, nullptr) {}
-
-Window::Window(std::unique_ptr<WindowsProcTable> windows_proc_table,
-               std::unique_ptr<TextInputManager> text_input_manager)
-    : touch_id_generator_(kMinTouchDeviceId, kMaxTouchDeviceId),
-      windows_proc_table_(std::move(windows_proc_table)),
-      text_input_manager_(std::move(text_input_manager)),
-      accessibility_root_(nullptr) {
-  // Get the DPI of the primary monitor as the initial DPI. If Per-Monitor V2 is
-  // supported, |current_dpi_| should be updated in the
-  // kWmDpiChangedBeforeParent message.
-  current_dpi_ = GetDpiForHWND(nullptr);
-
-  // Get initial value for wheel scroll lines
-  // TODO: Listen to changes for this value
-  // https://github.com/flutter/flutter/issues/107248
-  UpdateScrollOffsetMultiplier();
-
-  if (windows_proc_table_ == nullptr) {
-    windows_proc_table_ = std::make_unique<WindowsProcTable>();
-  }
-  if (text_input_manager_ == nullptr) {
-    text_input_manager_ = std::make_unique<TextInputManager>();
-  }
-  keyboard_manager_ = std::make_unique<KeyboardManager>(this);
-}
-
-Window::~Window() {
-  Destroy();
-}
-
-void Window::InitializeChild(const char* title,
-                             unsigned int width,
-                             unsigned int height) {
-  Destroy();
-  std::wstring converted_title = NarrowToWide(title);
-
-  WNDCLASS window_class = RegisterWindowClass(converted_title);
-
-  auto* result = CreateWindowEx(
-      0, window_class.lpszClassName, converted_title.c_str(),
-      WS_CHILD | WS_VISIBLE, CW_DEFAULT, CW_DEFAULT, width, height,
-      HWND_MESSAGE, nullptr, window_class.hInstance, this);
-
-  if (result == nullptr) {
-    auto error = GetLastError();
-    LPWSTR message = nullptr;
-    size_t size = FormatMessageW(
-        FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM |
-            FORMAT_MESSAGE_IGNORE_INSERTS,
-        NULL, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-        reinterpret_cast<LPWSTR>(&message), 0, NULL);
-    OutputDebugString(message);
-    LocalFree(message);
-  }
-  SetUserObjectInformationA(GetCurrentProcess(),
-                            UOI_TIMERPROC_EXCEPTION_SUPPRESSION, FALSE, 1);
-  // SetTimer is not precise, if a 16 ms interval is requested, it will instead
-  // often fire in an interval of 32 ms. Providing a value of 14 will ensure it
-  // runs every 16 ms, which will allow for 60 Hz trackpad gesture events, which
-  // is the maximal frequency supported by SetTimer.
-  SetTimer(result, kDirectManipulationTimer, 14, nullptr);
-  direct_manipulation_owner_ = std::make_unique<DirectManipulationOwner>(this);
-  direct_manipulation_owner_->Init(width, height);
-}
-
-std::wstring Window::NarrowToWide(const char* source) {
-  size_t length = strlen(source);
-  size_t outlen = 0;
-  std::wstring wideTitle(length, L'#');
-  mbstowcs_s(&outlen, &wideTitle[0], length + 1, source, length);
-  return wideTitle;
-}
-
-WNDCLASS Window::RegisterWindowClass(std::wstring& title) {
-  window_class_name_ = title;
-
-  WNDCLASS window_class{};
-  window_class.hCursor = LoadCursor(nullptr, IDC_ARROW);
-  window_class.lpszClassName = title.c_str();
-  window_class.style = CS_HREDRAW | CS_VREDRAW;
-  window_class.cbClsExtra = 0;
-  window_class.cbWndExtra = 0;
-  window_class.hInstance = GetModuleHandle(nullptr);
-  window_class.hIcon = nullptr;
-  window_class.hbrBackground = 0;
-  window_class.lpszMenuName = nullptr;
-  window_class.lpfnWndProc = WndProc;
-  RegisterClass(&window_class);
-  return window_class;
-}
-
-LRESULT CALLBACK Window::WndProc(HWND const window,
-                                 UINT const message,
-                                 WPARAM const wparam,
-                                 LPARAM const lparam) noexcept {
-  if (message == WM_NCCREATE) {
-    auto cs = reinterpret_cast<CREATESTRUCT*>(lparam);
-    SetWindowLongPtr(window, GWLP_USERDATA,
-                     reinterpret_cast<LONG_PTR>(cs->lpCreateParams));
-
-    auto that = static_cast<Window*>(cs->lpCreateParams);
-    that->window_handle_ = window;
-    that->text_input_manager_->SetWindowHandle(window);
-    RegisterTouchWindow(window, 0);
-  } else if (Window* that = GetThisFromHandle(window)) {
-    return that->HandleMessage(message, wparam, lparam);
-  }
-
-  return DefWindowProc(window, message, wparam, lparam);
-}
-
-void Window::TrackMouseLeaveEvent(HWND hwnd) {
-  if (!tracking_mouse_leave_) {
-    TRACKMOUSEEVENT tme;
-    tme.cbSize = sizeof(tme);
-    tme.hwndTrack = hwnd;
-    tme.dwFlags = TME_LEAVE;
-    TrackMouseEvent(&tme);
-    tracking_mouse_leave_ = true;
-  }
-}
-
-LRESULT Window::OnGetObject(UINT const message,
-                            WPARAM const wparam,
-                            LPARAM const lparam) {
-  LRESULT reference_result = static_cast<LRESULT>(0L);
-
-  // Only the lower 32 bits of lparam are valid when checking the object id
-  // because it sometimes gets sign-extended incorrectly (but not always).
-  DWORD obj_id = static_cast<DWORD>(static_cast<DWORD_PTR>(lparam));
-
-  bool is_uia_request = static_cast<DWORD>(UiaRootObjectId) == obj_id;
-  bool is_msaa_request = static_cast<DWORD>(OBJID_CLIENT) == obj_id;
-
-  if (is_uia_request || is_msaa_request) {
-    // On Windows, we don't get a notification that the screen reader has been
-    // enabled or disabled. There is an API to query for screen reader state,
-    // but that state isn't set by all screen readers, including by Narrator,
-    // the screen reader that ships with Windows:
-    // https://docs.microsoft.com/en-us/windows/win32/winauto/screen-reader-parameter
-    //
-    // Instead, we enable semantics in Flutter if Windows issues queries for
-    // Microsoft Active Accessibility (MSAA) COM objects.
-    OnUpdateSemanticsEnabled(true);
-  }
-
-  gfx::NativeViewAccessible root_view = GetNativeViewAccessible();
-  if (is_uia_request && root_view) {
-    // TODO(cbracken): https://github.com/flutter/flutter/issues/94782
-    // Implement when we adopt UIA support.
-  } else if (is_msaa_request && root_view) {
-    // Create the accessibility root if it does not already exist.
-    if (!accessibility_root_) {
-      CreateAccessibilityRootNode();
-    }
-    // Return the IAccessible for the root view.
-    // Microsoft::WRL::ComPtr<IAccessible> root(root_view);
-    accessibility_root_->SetWindow(root_view);
-    Microsoft::WRL::ComPtr<IAccessible> root(accessibility_root_);
-    LRESULT lresult = LresultFromObject(IID_IAccessible, wparam, root.Get());
-    return lresult;
-  }
-  return 0;
-}
-
-void Window::OnImeSetContext(UINT const message,
-                             WPARAM const wparam,
-                             LPARAM const lparam) {
-  if (wparam != 0) {
-    text_input_manager_->CreateImeWindow();
-  }
-}
-
-void Window::OnImeStartComposition(UINT const message,
-                                   WPARAM const wparam,
-                                   LPARAM const lparam) {
-  text_input_manager_->CreateImeWindow();
-  OnComposeBegin();
-}
-
-void Window::OnImeComposition(UINT const message,
-                              WPARAM const wparam,
-                              LPARAM const lparam) {
-  // Update the IME window position.
-  text_input_manager_->UpdateImeWindow();
-
-  if (lparam == 0) {
-    OnComposeChange(u"", 0);
-    OnComposeCommit();
-  }
-
-  // Process GCS_RESULTSTR at fisrt, because Google Japanese Input and ATOK send
-  // both GCS_RESULTSTR and GCS_COMPSTR to commit composed text and send new
-  // composing text.
-  if (lparam & GCS_RESULTSTR) {
-    // Commit but don't end composing.
-    // Read the committed composing string.
-    long pos = text_input_manager_->GetComposingCursorPosition();
-    std::optional<std::u16string> text = text_input_manager_->GetResultString();
-    if (text) {
-      OnComposeChange(text.value(), pos);
-      OnComposeCommit();
-    }
-  }
-  if (lparam & GCS_COMPSTR) {
-    // Read the in-progress composing string.
-    long pos = text_input_manager_->GetComposingCursorPosition();
-    std::optional<std::u16string> text =
-        text_input_manager_->GetComposingString();
-    if (text) {
-      OnComposeChange(text.value(), pos);
-    }
-  }
-}
-
-void Window::OnImeEndComposition(UINT const message,
-                                 WPARAM const wparam,
-                                 LPARAM const lparam) {
-  text_input_manager_->DestroyImeWindow();
-  OnComposeEnd();
-}
-
-void Window::OnImeRequest(UINT const message,
-                          WPARAM const wparam,
-                          LPARAM const lparam) {
-  // TODO(cbracken): Handle IMR_RECONVERTSTRING, IMR_DOCUMENTFEED,
-  // and IMR_QUERYCHARPOSITION messages.
-  // https://github.com/flutter/flutter/issues/74547
-}
-
-void Window::AbortImeComposing() {
-  text_input_manager_->AbortComposing();
-}
-
-void Window::UpdateCursorRect(const Rect& rect) {
-  text_input_manager_->UpdateCaretRect(rect);
-}
-
-static uint16_t ResolveKeyCode(uint16_t original,
-                               bool extended,
-                               uint8_t scancode) {
-  switch (original) {
-    case VK_SHIFT:
-    case VK_LSHIFT:
-      return MapVirtualKey(scancode, MAPVK_VSC_TO_VK_EX);
-    case VK_MENU:
-    case VK_LMENU:
-      return extended ? VK_RMENU : VK_LMENU;
-    case VK_CONTROL:
-    case VK_LCONTROL:
-      return extended ? VK_RCONTROL : VK_LCONTROL;
-    default:
-      return original;
-  }
-}
-
-static bool IsPrintable(uint32_t c) {
-  constexpr char32_t kMinPrintable = ' ';
-  constexpr char32_t kDelete = 0x7F;
-  return c >= kMinPrintable && c != kDelete;
-}
-
-LRESULT
-Window::HandleMessage(UINT const message,
-                      WPARAM const wparam,
-                      LPARAM const lparam) noexcept {
-  LPARAM result_lparam = lparam;
-  int xPos = 0, yPos = 0;
-  UINT width = 0, height = 0;
-  UINT button_pressed = 0;
-  FlutterPointerDeviceKind device_kind;
-
-  switch (message) {
-    case kWmDpiChangedBeforeParent:
-      current_dpi_ = GetDpiForHWND(window_handle_);
-      OnDpiScale(current_dpi_);
-      return 0;
-    case WM_SIZE:
-      width = LOWORD(lparam);
-      height = HIWORD(lparam);
-
-      current_width_ = width;
-      current_height_ = height;
-      HandleResize(width, height);
-      break;
-    case WM_PAINT:
-      OnPaint();
-      break;
-    case WM_TOUCH: {
-      UINT num_points = LOWORD(wparam);
-      touch_points_.resize(num_points);
-      auto touch_input_handle = reinterpret_cast<HTOUCHINPUT>(lparam);
-      if (GetTouchInputInfo(touch_input_handle, num_points,
-                            touch_points_.data(), sizeof(TOUCHINPUT))) {
-        for (const auto& touch : touch_points_) {
-          // Generate a mapped ID for the Windows-provided touch ID
-          auto touch_id = touch_id_generator_.GetGeneratedId(touch.dwID);
-
-          POINT pt = {TOUCH_COORD_TO_PIXEL(touch.x),
-                      TOUCH_COORD_TO_PIXEL(touch.y)};
-          ScreenToClient(window_handle_, &pt);
-          auto x = static_cast<double>(pt.x);
-          auto y = static_cast<double>(pt.y);
-
-          if (touch.dwFlags & TOUCHEVENTF_DOWN) {
-            OnPointerDown(x, y, kFlutterPointerDeviceKindTouch, touch_id,
-                          WM_LBUTTONDOWN);
-          } else if (touch.dwFlags & TOUCHEVENTF_MOVE) {
-            OnPointerMove(x, y, kFlutterPointerDeviceKindTouch, touch_id);
-          } else if (touch.dwFlags & TOUCHEVENTF_UP) {
-            OnPointerUp(x, y, kFlutterPointerDeviceKindTouch, touch_id,
-                        WM_LBUTTONDOWN);
-            OnPointerLeave(x, y, kFlutterPointerDeviceKindTouch, touch_id);
-            touch_id_generator_.ReleaseNumber(touch.dwID);
-          }
-        }
-        CloseTouchInputHandle(touch_input_handle);
-      }
-      return 0;
-    }
-    case WM_MOUSEMOVE:
-      device_kind = GetFlutterPointerDeviceKind();
-      if (device_kind == kFlutterPointerDeviceKindMouse) {
-        TrackMouseLeaveEvent(window_handle_);
-
-        xPos = GET_X_LPARAM(lparam);
-        yPos = GET_Y_LPARAM(lparam);
-        mouse_x_ = static_cast<double>(xPos);
-        mouse_y_ = static_cast<double>(yPos);
-
-        OnPointerMove(mouse_x_, mouse_y_, device_kind, kDefaultPointerDeviceId);
-      }
-      break;
-    case WM_MOUSELEAVE:
-      device_kind = GetFlutterPointerDeviceKind();
-      if (device_kind == kFlutterPointerDeviceKindMouse) {
-        OnPointerLeave(mouse_x_, mouse_y_, device_kind,
-                       kDefaultPointerDeviceId);
-      }
-
-      // Once the tracked event is received, the TrackMouseEvent function
-      // resets. Set to false to make sure it's called once mouse movement is
-      // detected again.
-      tracking_mouse_leave_ = false;
-      break;
-    case WM_SETCURSOR: {
-      UINT hit_test_result = LOWORD(lparam);
-      if (hit_test_result == HTCLIENT) {
-        OnSetCursor();
-        return TRUE;
-      }
-      break;
-    }
-    case WM_SETFOCUS:
-      ::CreateCaret(window_handle_, nullptr, 1, 1);
-      break;
-    case WM_KILLFOCUS:
-      ::DestroyCaret();
-      break;
-    case WM_LBUTTONDOWN:
-    case WM_RBUTTONDOWN:
-    case WM_MBUTTONDOWN:
-    case WM_XBUTTONDOWN:
-      device_kind = GetFlutterPointerDeviceKind();
-      if (device_kind != kFlutterPointerDeviceKindMouse) {
-        break;
-      }
-
-      if (message == WM_LBUTTONDOWN) {
-        // Capture the pointer in case the user drags outside the client area.
-        // In this case, the "mouse leave" event is delayed until the user
-        // releases the button. It's only activated on left click given that
-        // it's more common for apps to handle dragging with only the left
-        // button.
-        SetCapture(window_handle_);
-      }
-      button_pressed = message;
-      if (message == WM_XBUTTONDOWN) {
-        button_pressed = GET_XBUTTON_WPARAM(wparam);
-      }
-      xPos = GET_X_LPARAM(lparam);
-      yPos = GET_Y_LPARAM(lparam);
-      OnPointerDown(static_cast<double>(xPos), static_cast<double>(yPos),
-                    device_kind, kDefaultPointerDeviceId, button_pressed);
-      break;
-    case WM_LBUTTONUP:
-    case WM_RBUTTONUP:
-    case WM_MBUTTONUP:
-    case WM_XBUTTONUP:
-      device_kind = GetFlutterPointerDeviceKind();
-      if (device_kind != kFlutterPointerDeviceKindMouse) {
-        break;
-      }
-
-      if (message == WM_LBUTTONUP) {
-        ReleaseCapture();
-      }
-      button_pressed = message;
-      if (message == WM_XBUTTONUP) {
-        button_pressed = GET_XBUTTON_WPARAM(wparam);
-      }
-      xPos = GET_X_LPARAM(lparam);
-      yPos = GET_Y_LPARAM(lparam);
-      OnPointerUp(static_cast<double>(xPos), static_cast<double>(yPos),
-                  device_kind, kDefaultPointerDeviceId, button_pressed);
-      break;
-    case WM_MOUSEWHEEL:
-      OnScroll(0.0,
-               -(static_cast<short>(HIWORD(wparam)) /
-                 static_cast<double>(WHEEL_DELTA)),
-               kFlutterPointerDeviceKindMouse, kDefaultPointerDeviceId);
-      break;
-    case WM_MOUSEHWHEEL:
-      OnScroll((static_cast<short>(HIWORD(wparam)) /
-                static_cast<double>(WHEEL_DELTA)),
-               0.0, kFlutterPointerDeviceKindMouse, kDefaultPointerDeviceId);
-      break;
-    case WM_GETOBJECT: {
-      LRESULT lresult = OnGetObject(message, wparam, lparam);
-      if (lresult) {
-        return lresult;
-      }
-      break;
-    }
-    case WM_TIMER:
-      if (wparam == kDirectManipulationTimer) {
-        direct_manipulation_owner_->Update();
-        return 0;
-      }
-      break;
-    case DM_POINTERHITTEST: {
-      if (direct_manipulation_owner_) {
-        UINT contact_id = GET_POINTERID_WPARAM(wparam);
-        POINTER_INPUT_TYPE pointer_type;
-        if (windows_proc_table_->GetPointerType(contact_id, &pointer_type) &&
-            pointer_type == PT_TOUCHPAD) {
-          direct_manipulation_owner_->SetContact(contact_id);
-        }
-      }
-      break;
-    }
-    case WM_INPUTLANGCHANGE:
-      // TODO(cbracken): pass this to TextInputManager to aid with
-      // language-specific issues.
-      break;
-    case WM_IME_SETCONTEXT:
-      OnImeSetContext(message, wparam, lparam);
-      // Strip the ISC_SHOWUICOMPOSITIONWINDOW bit from lparam before passing it
-      // to DefWindowProc() so that the composition window is hidden since
-      // Flutter renders the composing string itself.
-      result_lparam &= ~ISC_SHOWUICOMPOSITIONWINDOW;
-      break;
-    case WM_IME_STARTCOMPOSITION:
-      OnImeStartComposition(message, wparam, lparam);
-      // Suppress further processing by DefWindowProc() so that the default
-      // system IME style isn't used, but rather the one set in the
-      // WM_IME_SETCONTEXT handler.
-      return TRUE;
-    case WM_IME_COMPOSITION:
-      OnImeComposition(message, wparam, lparam);
-      if (lparam & GCS_RESULTSTR || lparam & GCS_COMPSTR) {
-        // Suppress further processing by DefWindowProc() since otherwise it
-        // will emit the result string as WM_CHAR messages on commit. Instead,
-        // committing the composing text to the EditableText string is handled
-        // in TextInputModel::CommitComposing, triggered by
-        // OnImeEndComposition().
-        return TRUE;
-      }
-      break;
-    case WM_IME_ENDCOMPOSITION:
-      OnImeEndComposition(message, wparam, lparam);
-      return TRUE;
-    case WM_IME_REQUEST:
-      OnImeRequest(message, wparam, lparam);
-      break;
-    case WM_UNICHAR: {
-      // Tell third-pary app, we can support Unicode.
-      if (wparam == UNICODE_NOCHAR)
-        return TRUE;
-      // DefWindowProc will send WM_CHAR for this WM_UNICHAR.
-      break;
-    }
-    case WM_THEMECHANGED:
-      OnThemeChange();
-      break;
-    case WM_DEADCHAR:
-    case WM_SYSDEADCHAR:
-    case WM_CHAR:
-    case WM_SYSCHAR:
-    case WM_KEYDOWN:
-    case WM_SYSKEYDOWN:
-    case WM_KEYUP:
-    case WM_SYSKEYUP:
-      if (keyboard_manager_->HandleMessage(message, wparam, lparam)) {
-        return 0;
-      }
-      break;
-  }
-
-  return Win32DefWindowProc(window_handle_, message, wparam, result_lparam);
-}
-
-UINT Window::GetCurrentDPI() {
-  return current_dpi_;
-}
-
-UINT Window::GetCurrentWidth() {
-  return current_width_;
-}
-
-UINT Window::GetCurrentHeight() {
-  return current_height_;
-}
-
-HWND Window::GetWindowHandle() {
-  return window_handle_;
-}
-
-float Window::GetScrollOffsetMultiplier() {
-  return scroll_offset_multiplier_;
-}
-
-void Window::UpdateScrollOffsetMultiplier() {
-  UINT lines_per_scroll = kLinesPerScrollWindowsDefault;
-
-  // Get lines per scroll wheel value from Windows
-  SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, &lines_per_scroll, 0);
-
-  // This logic is based off Chromium's implementation
-  // https://source.chromium.org/chromium/chromium/src/+/main:ui/events/blink/web_input_event_builders_win.cc;l=319-331
-  scroll_offset_multiplier_ =
-      static_cast<float>(lines_per_scroll) * 100.0 / 3.0;
-}
-
-void Window::Destroy() {
-  if (window_handle_) {
-    text_input_manager_->SetWindowHandle(nullptr);
-    DestroyWindow(window_handle_);
-    window_handle_ = nullptr;
-  }
-
-  if (accessibility_root_) {
-    accessibility_root_->Release();
-    accessibility_root_ = nullptr;
-  }
-
-  UnregisterClass(window_class_name_.c_str(), nullptr);
-}
-
-void Window::HandleResize(UINT width, UINT height) {
-  current_width_ = width;
-  current_height_ = height;
-  if (direct_manipulation_owner_) {
-    direct_manipulation_owner_->ResizeViewport(width, height);
-  }
-  OnResize(width, height);
-}
-
-Window* Window::GetThisFromHandle(HWND const window) noexcept {
-  return reinterpret_cast<Window*>(GetWindowLongPtr(window, GWLP_USERDATA));
-}
-
-LRESULT Window::Win32DefWindowProc(HWND hWnd,
-                                   UINT Msg,
-                                   WPARAM wParam,
-                                   LPARAM lParam) {
-  return ::DefWindowProc(hWnd, Msg, wParam, lParam);
-}
-
-BOOL Window::Win32PeekMessage(LPMSG lpMsg,
-                              UINT wMsgFilterMin,
-                              UINT wMsgFilterMax,
-                              UINT wRemoveMsg) {
-  return ::PeekMessage(lpMsg, window_handle_, wMsgFilterMin, wMsgFilterMax,
-                       wRemoveMsg);
-}
-
-uint32_t Window::Win32MapVkToChar(uint32_t virtual_key) {
-  return ::MapVirtualKey(virtual_key, MAPVK_VK_TO_CHAR);
-}
-
-UINT Window::Win32DispatchMessage(UINT Msg, WPARAM wParam, LPARAM lParam) {
-  return ::SendMessage(window_handle_, Msg, wParam, lParam);
-}
-
-bool Window::GetHighContrastEnabled() {
-  HIGHCONTRAST high_contrast = {.cbSize = sizeof(HIGHCONTRAST)};
-  // API call is only supported on Windows 8+
-  if (SystemParametersInfoW(SPI_GETHIGHCONTRAST, sizeof(HIGHCONTRAST),
-                            &high_contrast, 0)) {
-    return high_contrast.dwFlags & HCF_HIGHCONTRASTON;
-  } else {
-    FML_LOG(INFO) << "Failed to get status of high contrast feature,"
-                  << "support only for Windows 8 + ";
-    return false;
-  }
-}
-
-void Window::CreateAccessibilityRootNode() {
-  if (accessibility_root_) {
-    accessibility_root_->Release();
-  }
-  accessibility_root_ = AccessibilityRootNode::Create();
-}
-
-}  // namespace flutter
diff --git a/shell/platform/windows/window.h b/shell/platform/windows/window.h
deleted file mode 100644
index ee9af55950b592038e23a20e690f43e92a838820..0000000000000000000000000000000000000000
--- a/shell/platform/windows/window.h
+++ /dev/null
@@ -1,306 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_FLUTTER_WIN32_WINDOW_H_
-#define FLUTTER_SHELL_PLATFORM_WINDOWS_FLUTTER_WIN32_WINDOW_H_
-
-#include <Windows.h>
-#include <Windowsx.h>
-
-#include <map>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "flutter/shell/platform/embedder/embedder.h"
-#include "flutter/shell/platform/windows/accessibility_root_node.h"
-#include "flutter/shell/platform/windows/direct_manipulation.h"
-#include "flutter/shell/platform/windows/keyboard_manager.h"
-#include "flutter/shell/platform/windows/sequential_id_generator.h"
-#include "flutter/shell/platform/windows/text_input_manager.h"
-#include "flutter/shell/platform/windows/windows_proc_table.h"
-#include "flutter/third_party/accessibility/gfx/native_widget_types.h"
-
-namespace flutter {
-
-// A class abstraction for a high DPI aware Win32 Window.  Intended to be
-// inherited from by classes that wish to specialize with custom
-// rendering and input handling.
-class Window : public KeyboardManager::WindowDelegate {
- public:
-  Window();
-  Window(std::unique_ptr<WindowsProcTable> windows_proc_table,
-         std::unique_ptr<TextInputManager> text_input_manager);
-  virtual ~Window();
-
-  // Initializes as a child window with size using |width| and |height| and
-  // |title| to identify the windowclass.  Does not show window, window must be
-  // parented into window hierarchy by caller.
-  void InitializeChild(const char* title,
-                       unsigned int width,
-                       unsigned int height);
-
-  HWND GetWindowHandle();
-
-  // |KeyboardManager::WindowDelegate|
-  virtual BOOL Win32PeekMessage(LPMSG lpMsg,
-                                UINT wMsgFilterMin,
-                                UINT wMsgFilterMax,
-                                UINT wRemoveMsg) override;
-
-  // |KeyboardManager::WindowDelegate|
-  virtual uint32_t Win32MapVkToChar(uint32_t virtual_key) override;
-
-  // |KeyboardManager::WindowDelegate|
-  virtual UINT Win32DispatchMessage(UINT Msg,
-                                    WPARAM wParam,
-                                    LPARAM lParam) override;
-
- protected:
-  // Converts a c string to a wide unicode string.
-  std::wstring NarrowToWide(const char* source);
-
-  // Registers a window class with default style attributes, cursor and
-  // icon.
-  WNDCLASS RegisterWindowClass(std::wstring& title);
-
-  // OS callback called by message pump.  Handles the WM_NCCREATE message which
-  // is passed when the non-client area is being created and enables automatic
-  // non-client DPI scaling so that the non-client area automatically
-  // responsponds to changes in DPI.  All other messages are handled by
-  // MessageHandler.
-  static LRESULT CALLBACK WndProc(HWND const window,
-                                  UINT const message,
-                                  WPARAM const wparam,
-                                  LPARAM const lparam) noexcept;
-
-  // Processes and route salient window messages for mouse handling,
-  // size change and DPI.  Delegates handling of these to member overloads that
-  // inheriting classes can handle.
-  LRESULT HandleMessage(UINT const message,
-                        WPARAM const wparam,
-                        LPARAM const lparam) noexcept;
-
-  // When WM_DPICHANGE process it using |hWnd|, |wParam|.  If
-  // |top_level| is set, extract the suggested new size from |lParam| and resize
-  // the window to the new suggested size.  If |top_level| is not set, the
-  // |lParam| will not contain a suggested size hence ignore it.
-  LRESULT HandleDpiChange(HWND hWnd,
-                          WPARAM wParam,
-                          LPARAM lParam,
-                          bool top_level);
-
-  // Called when the DPI changes either when a
-  // user drags the window between monitors of differing DPI or when the user
-  // manually changes the scale factor.
-  virtual void OnDpiScale(UINT dpi) = 0;
-
-  // Called when a resize occurs.
-  virtual void OnResize(UINT width, UINT height) = 0;
-
-  // Called when a paint is requested.
-  virtual void OnPaint() = 0;
-
-  // Called when the pointer moves within the
-  // window bounds.
-  virtual void OnPointerMove(double x,
-                             double y,
-                             FlutterPointerDeviceKind device_kind,
-                             int32_t device_id) = 0;
-
-  // Called when the a mouse button, determined by |button|, goes down.
-  virtual void OnPointerDown(double x,
-                             double y,
-                             FlutterPointerDeviceKind device_kind,
-                             int32_t device_id,
-                             UINT button) = 0;
-
-  // Called when the a mouse button, determined by |button|, goes from
-  // down to up
-  virtual void OnPointerUp(double x,
-                           double y,
-                           FlutterPointerDeviceKind device_kind,
-                           int32_t device_id,
-                           UINT button) = 0;
-
-  // Called when the mouse leaves the window.
-  virtual void OnPointerLeave(double x,
-                              double y,
-                              FlutterPointerDeviceKind device_kind,
-                              int32_t device_id) = 0;
-
-  // Called when the cursor should be set for the client area.
-  virtual void OnSetCursor() = 0;
-
-  // Called when the OS requests a COM object.
-  //
-  // The primary use of this function is to supply Windows with wrapped
-  // semantics objects for use by Windows accessibility.
-  LRESULT OnGetObject(UINT const message,
-                      WPARAM const wparam,
-                      LPARAM const lparam);
-
-  // Called when IME composing begins.
-  virtual void OnComposeBegin() = 0;
-
-  // Called when IME composing text is committed.
-  virtual void OnComposeCommit() = 0;
-
-  // Called when IME composing ends.
-  virtual void OnComposeEnd() = 0;
-
-  // Called when IME composing text or cursor position changes.
-  virtual void OnComposeChange(const std::u16string& text, int cursor_pos) = 0;
-
-  // Called when a window is activated in order to configure IME support for
-  // multi-step text input.
-  virtual void OnImeSetContext(UINT const message,
-                               WPARAM const wparam,
-                               LPARAM const lparam);
-
-  // Called when multi-step text input begins when using an IME.
-  virtual void OnImeStartComposition(UINT const message,
-                                     WPARAM const wparam,
-                                     LPARAM const lparam);
-
-  // Called when edits/commit of multi-step text input occurs when using an IME.
-  virtual void OnImeComposition(UINT const message,
-                                WPARAM const wparam,
-                                LPARAM const lparam);
-
-  // Called when multi-step text input ends when using an IME.
-  virtual void OnImeEndComposition(UINT const message,
-                                   WPARAM const wparam,
-                                   LPARAM const lparam);
-
-  // Called when the user triggers an IME-specific request such as input
-  // reconversion, where an existing input sequence is returned to composing
-  // mode to select an alternative candidate conversion.
-  virtual void OnImeRequest(UINT const message,
-                            WPARAM const wparam,
-                            LPARAM const lparam);
-
-  // Called when the app ends IME composing, such as when the text input client
-  // is cleared or changed.
-  virtual void AbortImeComposing();
-
-  // Called when the cursor rect has been updated.
-  //
-  // |rect| is in Win32 window coordinates.
-  virtual void UpdateCursorRect(const Rect& rect);
-
-  // Called when accessibility support is enabled or disabled.
-  virtual void OnUpdateSemanticsEnabled(bool enabled) = 0;
-
-  // Called when mouse scrollwheel input occurs.
-  virtual void OnScroll(double delta_x,
-                        double delta_y,
-                        FlutterPointerDeviceKind device_kind,
-                        int32_t device_id) = 0;
-
-  UINT GetCurrentDPI();
-
-  UINT GetCurrentWidth();
-
-  UINT GetCurrentHeight();
-
-  // Returns the current pixel per scroll tick value.
-  virtual float GetScrollOffsetMultiplier();
-
-  // Check if the high contrast feature is enabled on the OS
-  virtual bool GetHighContrastEnabled();
-
- protected:
-  // Win32's DefWindowProc.
-  //
-  // Used as the fallback behavior of HandleMessage. Exposed for dependency
-  // injection.
-  virtual LRESULT Win32DefWindowProc(HWND hWnd,
-                                     UINT Msg,
-                                     WPARAM wParam,
-                                     LPARAM lParam);
-
-  // Returns the root view accessibility node, or nullptr if none.
-  virtual gfx::NativeViewAccessible GetNativeViewAccessible() = 0;
-
-  // Create the wrapper node.
-  void CreateAccessibilityRootNode();
-
-  // Handles running DirectManipulation on the window to receive trackpad
-  // gestures.
-  std::unique_ptr<DirectManipulationOwner> direct_manipulation_owner_;
-
-  // Called when a theme change message is issued
-  virtual void OnThemeChange() = 0;
-
-  // A parent node wrapping the window root, used for siblings.
-  AccessibilityRootNode* accessibility_root_;
-
- private:
-  // Release OS resources associated with window.
-  void Destroy();
-
-  // Activates tracking for a "mouse leave" event.
-  void TrackMouseLeaveEvent(HWND hwnd);
-
-  // Stores new width and height and calls |OnResize| to notify inheritors
-  void HandleResize(UINT width, UINT height);
-
-  // Retrieves a class instance pointer for |window|
-  static Window* GetThisFromHandle(HWND const window) noexcept;
-
-  // Updates the cached scroll_offset_multiplier_ value based off OS settings.
-  void UpdateScrollOffsetMultiplier();
-
-  int current_dpi_ = 0;
-  int current_width_ = 0;
-  int current_height_ = 0;
-
-  // Holds the conversion factor from lines scrolled to pixels scrolled.
-  float scroll_offset_multiplier_;
-
-  // WM_DPICHANGED_BEFOREPARENT defined in more recent Windows
-  // SDK
-  const static long kWmDpiChangedBeforeParent = 0x02E2;
-
-  // Member variable to hold window handle.
-  HWND window_handle_ = nullptr;
-
-  // Member variable to hold the window title.
-  std::wstring window_class_name_;
-
-  // Set to true to be notified when the mouse leaves the window.
-  bool tracking_mouse_leave_ = false;
-
-  // Keeps track of the last key code produced by a WM_KEYDOWN or WM_SYSKEYDOWN
-  // message.
-  int keycode_for_char_message_ = 0;
-
-  // Keeps track of the last mouse coordinates by a WM_MOUSEMOVE message.
-  double mouse_x_ = 0;
-  double mouse_y_ = 0;
-
-  // Abstracts Windows APIs that may not be available on all supported versions
-  // of Windows.
-  std::unique_ptr<WindowsProcTable> windows_proc_table_;
-
-  // Manages IME state.
-  std::unique_ptr<TextInputManager> text_input_manager_;
-
-  // Manages IME state.
-  std::unique_ptr<KeyboardManager> keyboard_manager_;
-
-  // Used for temporarily storing the WM_TOUCH-provided touch points.
-  std::vector<TOUCHINPUT> touch_points_;
-
-  // Generates touch point IDs for touch events.
-  SequentialIdGenerator touch_id_generator_;
-
-  // Timer identifier for DirectManipulation gesture polling.
-  const static int kDirectManipulationTimer = 1;
-};
-
-}  // namespace flutter
-
-#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_FLUTTER_WIN32_WINDOW_H_
diff --git a/shell/platform/windows/window_binding_handler.h b/shell/platform/windows/window_binding_handler.h
index 13d04eb604b1f810f4bfb28b6c00e336c8d96fef..d0ef4565babb9ee88d2594add0b5db0e9c4f54fc 100644
--- a/shell/platform/windows/window_binding_handler.h
+++ b/shell/platform/windows/window_binding_handler.h
@@ -10,11 +10,15 @@
 #include <string>
 #include <variant>
 
+#include "flutter/shell/platform/common/alert_platform_node_delegate.h"
 #include "flutter/shell/platform/common/geometry.h"
-#include "flutter/shell/platform/windows/accessibility_root_node.h"
 #include "flutter/shell/platform/windows/public/flutter_windows.h"
 #include "flutter/shell/platform/windows/window_binding_handler_delegate.h"
 
+namespace ui {
+class AXPlatformNodeWin;
+}
+
 namespace flutter {
 
 class FlutterWindowsView;
@@ -32,13 +36,6 @@ struct PointerLocation {
   size_t y;
 };
 
-// Type representing an underlying platform window.
-using PlatformWindow = HWND;
-
-// Type representing a platform object that can be accepted by the Angle
-// rendering layer to bind to and render pixels into.
-using WindowsRenderTarget = std::variant<HWND>;
-
 // Abstract class for binding Windows platform windows to Flutter views.
 class WindowBindingHandler {
  public:
@@ -48,34 +45,31 @@ class WindowBindingHandler {
   // such as key presses, mouse position updates etc.
   virtual void SetView(WindowBindingHandlerDelegate* view) = 0;
 
-  // Returns a valid WindowsRenderTarget representing the platform object that
-  // rendering can be bound to by ANGLE rendering backend.
-  virtual WindowsRenderTarget GetRenderTarget() = 0;
-
-  // Returns a valid PlatformWindow representing the backing
-  // window.
-  virtual PlatformWindow GetPlatformWindow() = 0;
+  // Returns the underlying HWND backing the window.
+  virtual HWND GetWindowHandle() = 0;
 
   // Returns the scale factor for the backing window.
   virtual float GetDpiScale() = 0;
 
-  // Returns whether the PlatformWindow is currently visible.
-  virtual bool IsVisible() = 0;
-
   // Returns the bounds of the backing window in physical pixels.
   virtual PhysicalWindowBounds GetPhysicalWindowBounds() = 0;
 
-  // Invoked after the window has been resized.
-  virtual void OnWindowResized() = 0;
-
   // Sets the cursor that should be used when the mouse is over the Flutter
   // content. See mouse_cursor.dart for the values and meanings of cursor_name.
   virtual void UpdateFlutterCursor(const std::string& cursor_name) = 0;
 
+  // Sets the cursor directly from a cursor handle.
+  virtual void SetFlutterCursor(HCURSOR cursor) = 0;
+
   // Invoked when the cursor/composing rect has been updated in the framework.
   virtual void OnCursorRectUpdated(const Rect& rect) = 0;
 
-  // Invoked when the Embedder provides us with new bitmap data for the contents
+  // Invoked when the embedder clears the contents of this Flutter view.
+  //
+  // Returns whether the surface was successfully updated or not.
+  virtual bool OnBitmapSurfaceCleared() = 0;
+
+  // Invoked when the embedder provides us with new bitmap data for the contents
   // of this Flutter view.
   //
   // Returns whether the surface was successfully updated or not.
@@ -91,11 +85,11 @@ class WindowBindingHandler {
   // coordinates.
   virtual PointerLocation GetPrimaryPointerLocation() = 0;
 
-  // Called to set the initial state of accessibility features
-  virtual void SendInitialAccessibilityFeatures() = 0;
+  // Retrieve the delegate for the alert.
+  virtual AlertPlatformNodeDelegate* GetAlertDelegate() = 0;
 
-  // Returns the wrapper parent accessibility node.
-  virtual AccessibilityRootNode* GetAccessibilityRootNode() = 0;
+  // Retrieve the alert node.
+  virtual ui::AXPlatformNodeWin* GetAlert() = 0;
 };
 
 }  // namespace flutter
diff --git a/shell/platform/windows/window_binding_handler_delegate.h b/shell/platform/windows/window_binding_handler_delegate.h
index 485fe4384f3ccad5bca0c9242d9bda6e2f7fde1e..64694c9c1ac1c9c43429b96316a45e955bff2ff8 100644
--- a/shell/platform/windows/window_binding_handler_delegate.h
+++ b/shell/platform/windows/window_binding_handler_delegate.h
@@ -9,6 +9,8 @@
 
 #include "flutter/shell/platform/common/geometry.h"
 #include "flutter/shell/platform/embedder/embedder.h"
+#include "flutter/shell/platform/windows/windows_lifecycle_manager.h"
+#include "flutter/third_party/accessibility/ax/platform/ax_fragment_root_delegate_win.h"
 #include "flutter/third_party/accessibility/gfx/native_widget_types.h"
 
 namespace flutter {
@@ -18,9 +20,12 @@ class WindowBindingHandlerDelegate {
   using KeyEventCallback = std::function<void(bool)>;
 
   // Notifies delegate that backing window size has changed.
-  // Typically called by currently configured WindowBindingHandler, this is
-  // called on the platform thread.
-  virtual void OnWindowSizeChanged(size_t width, size_t height) = 0;
+  //
+  // Called by |FlutterWindow| on the platform thread.
+  //
+  // Returns true if the delegate completed the window resize synchronously.
+  // The return value is exposed for unit testing.
+  virtual bool OnWindowSizeChanged(size_t width, size_t height) = 0;
 
   // Notifies delegate that backing window needs to be repainted.
   // Typically called by currently configured WindowBindingHandler.
@@ -31,7 +36,8 @@ class WindowBindingHandlerDelegate {
   virtual void OnPointerMove(double x,
                              double y,
                              FlutterPointerDeviceKind device_kind,
-                             int32_t device_id) = 0;
+                             int32_t device_id,
+                             int modifiers_state) = 0;
 
   // Notifies delegate that backing window mouse pointer button has been
   // pressed. Typically called by currently configured WindowBindingHandler.
@@ -95,15 +101,16 @@ class WindowBindingHandlerDelegate {
 
   // Notifies the delegate that IME composing region have been committed.
   //
-  // Triggered when the user commits the current composing text while using a
-  // multi-step input method such as in CJK text input. Composing continues with
-  // the next keypress.
+  // Triggered when the user triggers a commit of the current composing text
+  // while using a multi-step input method such as in CJK text input. Composing
+  // continues with the next keypress.
   virtual void OnComposeCommit() = 0;
 
   // Notifies the delegate that IME composing mode has ended.
   //
-  // Triggered when the user commits the composing text while using a multi-step
-  // input method such as in CJK text input.
+  // Triggered when the composing ends, for example when the user presses
+  // ESC or when the user triggers a commit of the composing text while using a
+  // multi-step input method such as in CJK text input.
   virtual void OnComposeEnd() = 0;
 
   // Notifies the delegate that IME composing region contents have changed.
@@ -133,8 +140,19 @@ class WindowBindingHandlerDelegate {
   // Returns the root view accessibility node, or nullptr if none.
   virtual gfx::NativeViewAccessible GetNativeViewAccessible() = 0;
 
-  // Update the status of the high contrast feature
-  virtual void UpdateHighContrastEnabled(bool enabled) = 0;
+  // Update the status of the high contrast feature.
+  virtual void OnHighContrastChanged() = 0;
+
+  // Obtain a pointer to the fragment root delegate.
+  // This is required by UIA in order to obtain the fragment root that
+  // contains a fragment obtained by, for example, a hit test. Unlike
+  // MSAA, UIA elements do not explicitly store or enumerate their
+  // children and parents, so a method such as this is required.
+  virtual ui::AXFragmentRootDelegateWin* GetAxFragmentRootDelegate() = 0;
+
+  // Called when a window receives an event that may alter application lifecycle
+  // state.
+  virtual void OnWindowStateEvent(HWND hwnd, WindowStateEvent event) = 0;
 };
 
 }  // namespace flutter
diff --git a/shell/platform/windows/window_proc_delegate_manager.cc b/shell/platform/windows/window_proc_delegate_manager.cc
index b2aae25958a16ec2ddc9683687a1e926e8d19631..8fab1f6360c8c0e25ced346b760082d12c44a792 100644
--- a/shell/platform/windows/window_proc_delegate_manager.cc
+++ b/shell/platform/windows/window_proc_delegate_manager.cc
@@ -4,6 +4,8 @@
 
 #include "flutter/shell/platform/windows/window_proc_delegate_manager.h"
 
+#include <algorithm>
+
 #include "flutter/shell/platform/embedder/embedder.h"
 
 namespace flutter {
@@ -12,26 +14,37 @@ WindowProcDelegateManager::WindowProcDelegateManager() = default;
 WindowProcDelegateManager::~WindowProcDelegateManager() = default;
 
 void WindowProcDelegateManager::RegisterTopLevelWindowProcDelegate(
-    FlutterDesktopWindowProcCallback delegate,
+    FlutterDesktopWindowProcCallback callback,
     void* user_data) {
-  top_level_window_proc_handlers_[delegate] = user_data;
+  UnregisterTopLevelWindowProcDelegate(callback);
+
+  delegates_.push_back(WindowProcDelegate{
+      .callback = callback,
+      .user_data = user_data,
+  });
 }
 
 void WindowProcDelegateManager::UnregisterTopLevelWindowProcDelegate(
-    FlutterDesktopWindowProcCallback delegate) {
-  top_level_window_proc_handlers_.erase(delegate);
+    FlutterDesktopWindowProcCallback callback) {
+  delegates_.erase(
+      std::remove_if(delegates_.begin(), delegates_.end(),
+                     [&callback](const WindowProcDelegate& delegate) {
+                       return delegate.callback == callback;
+                     }),
+      delegates_.end());
 }
 
 std::optional<LRESULT> WindowProcDelegateManager::OnTopLevelWindowProc(
     HWND hwnd,
     UINT message,
     WPARAM wparam,
-    LPARAM lparam) {
+    LPARAM lparam) const {
   std::optional<LRESULT> result;
-  for (const auto& [handler, user_data] : top_level_window_proc_handlers_) {
+  for (const auto& delegate : delegates_) {
     LPARAM handler_result;
     // Stop as soon as any delegate indicates that it has handled the message.
-    if (handler(hwnd, message, wparam, lparam, user_data, &handler_result)) {
+    if (delegate.callback(hwnd, message, wparam, lparam, delegate.user_data,
+                          &handler_result)) {
       result = handler_result;
       break;
     }
diff --git a/shell/platform/windows/window_proc_delegate_manager.h b/shell/platform/windows/window_proc_delegate_manager.h
index f4cef8f79efa63accfa975a611fe315e76f616c7..e66f343f1a4e8ae325f690737b9b7a364a5064b8 100644
--- a/shell/platform/windows/window_proc_delegate_manager.h
+++ b/shell/platform/windows/window_proc_delegate_manager.h
@@ -2,14 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_WIN32_WINDOW_PROC_DELEGATE_MANAGER_H_
-#define FLUTTER_SHELL_PLATFORM_WINDOWS_WIN32_WINDOW_PROC_DELEGATE_MANAGER_H_
+#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_WINDOW_PROC_DELEGATE_MANAGER_H_
+#define FLUTTER_SHELL_PLATFORM_WINDOWS_WINDOW_PROC_DELEGATE_MANAGER_H_
 
 #include <Windows.h>
 
-#include <map>
 #include <optional>
+#include <vector>
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/windows/public/flutter_windows.h"
 
 namespace flutter {
@@ -21,37 +22,39 @@ class WindowProcDelegateManager {
   explicit WindowProcDelegateManager();
   ~WindowProcDelegateManager();
 
-  // Prevent copying.
-  WindowProcDelegateManager(WindowProcDelegateManager const&) = delete;
-  WindowProcDelegateManager& operator=(WindowProcDelegateManager const&) =
-      delete;
-
-  // Adds |delegate| as a delegate to be called for |OnTopLevelWindowProc|.
+  // Adds |callback| as a delegate to be called for |OnTopLevelWindowProc|.
   //
-  // Multiple calls with the same |delegate| will replace the previous
+  // Multiple calls with the same |callback| will replace the previous
   // registration, even if |user_data| is different.
   void RegisterTopLevelWindowProcDelegate(
-      FlutterDesktopWindowProcCallback delegate,
+      FlutterDesktopWindowProcCallback callback,
       void* user_data);
 
-  // Unregisters |delegate| as a delate for |OnTopLevelWindowProc|.
+  // Unregisters |callback| as a delegate for |OnTopLevelWindowProc|.
   void UnregisterTopLevelWindowProcDelegate(
-      FlutterDesktopWindowProcCallback delegate);
+      FlutterDesktopWindowProcCallback callback);
 
-  // Calls any registered WindowProc delegates.
+  // Calls any registered WindowProc delegates in the order they were
+  // registered.
   //
   // If a result is returned, then the message was handled in such a way that
   // further handling should not be done.
   std::optional<LRESULT> OnTopLevelWindowProc(HWND hwnd,
                                               UINT message,
                                               WPARAM wparam,
-                                              LPARAM lparam);
+                                              LPARAM lparam) const;
 
  private:
-  std::map<FlutterDesktopWindowProcCallback, void*>
-      top_level_window_proc_handlers_;
+  struct WindowProcDelegate {
+    FlutterDesktopWindowProcCallback callback = nullptr;
+    void* user_data = nullptr;
+  };
+
+  std::vector<WindowProcDelegate> delegates_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(WindowProcDelegateManager);
 };
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_WIN32_WINDOW_PROC_DELEGATE_MANAGER_H_
+#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_WINDOW_PROC_DELEGATE_MANAGER_H_
diff --git a/shell/platform/windows/window_proc_delegate_manager_unittests.cc b/shell/platform/windows/window_proc_delegate_manager_unittests.cc
index 195fb5b88cd0eedd65564f6799be44119d44b828..625310e6a6bba0673de76f6197090636223385d0 100644
--- a/shell/platform/windows/window_proc_delegate_manager_unittests.cc
+++ b/shell/platform/windows/window_proc_delegate_manager_unittests.cc
@@ -125,6 +125,41 @@ TEST(WindowProcDelegateManagerTest, RegisterMultiple) {
   EXPECT_TRUE(called_b);
 }
 
+TEST(WindowProcDelegateManagerTest, Ordered) {
+  TestWindowProcDelegate delegate_1 = [](HWND hwnd, UINT message, WPARAM wparam,
+                                         LPARAM lparam) { return 1; };
+  TestWindowProcDelegate delegate_2 = [](HWND hwnd, UINT message, WPARAM wparam,
+                                         LPARAM lparam) { return 2; };
+
+  // Result should be 1 if delegate '1' is registered before delegate '2'.
+  {
+    WindowProcDelegateManager manager;
+    manager.RegisterTopLevelWindowProcDelegate(TestWindowProcCallback,
+                                               &delegate_1);
+    manager.RegisterTopLevelWindowProcDelegate(TestWindowProcCallback2,
+                                               &delegate_2);
+
+    std::optional<LRESULT> result =
+        manager.OnTopLevelWindowProc(nullptr, 0, 0, 0);
+
+    EXPECT_EQ(result, 1);
+  }
+
+  // Result should be 2 if delegate '2' is registered before delegate '1'.
+  {
+    WindowProcDelegateManager manager;
+    manager.RegisterTopLevelWindowProcDelegate(TestWindowProcCallback2,
+                                               &delegate_2);
+    manager.RegisterTopLevelWindowProcDelegate(TestWindowProcCallback,
+                                               &delegate_1);
+
+    std::optional<LRESULT> result =
+        manager.OnTopLevelWindowProc(nullptr, 0, 0, 0);
+
+    EXPECT_EQ(result, 2);
+  }
+}
+
 TEST(WindowProcDelegateManagerTest, ConflictingDelegates) {
   WindowProcDelegateManager manager;
 
diff --git a/shell/platform/windows/window_state.h b/shell/platform/windows/window_state.h
index 13b282a535862a8efe0ab40a3948436daf75586c..fe00a6cd00db86d52f747b37acda49647d11ada0 100644
--- a/shell/platform/windows/window_state.h
+++ b/shell/platform/windows/window_state.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_FLUTTER_WINDOW_STATE_H_
-#define FLUTTER_SHELL_PLATFORM_WINDOWS_FLUTTER_WINDOW_STATE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_WINDOW_STATE_H_
+#define FLUTTER_SHELL_PLATFORM_WINDOWS_WINDOW_STATE_H_
 
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/plugin_registrar.h"
 #include "flutter/shell/platform/common/incoming_message_dispatcher.h"
@@ -16,16 +16,8 @@
 
 namespace flutter {
 struct FlutterWindowsEngine;
-struct FlutterWindowsView;
 }  // namespace flutter
 
-// Wrapper to distinguish the view controller ref from the view ref given out
-// in the C API.
-struct FlutterDesktopViewControllerState {
-  // The view that backs this state object.
-  std::unique_ptr<flutter::FlutterWindowsView> view;
-};
-
 // Wrapper to distinguish the plugin registrar ref from the engine ref given out
 // in the C API.
 struct FlutterDesktopPluginRegistrar {
@@ -33,4 +25,4 @@ struct FlutterDesktopPluginRegistrar {
   flutter::FlutterWindowsEngine* engine = nullptr;
 };
 
-#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_FLUTTER_WINDOW_STATE_H_
+#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_WINDOW_STATE_H_
diff --git a/shell/platform/windows/window_unittests.cc b/shell/platform/windows/window_unittests.cc
index 1557d03b7a6a3cd420e6f71932fab28fe825de53..97b3f70c551274a4eb66e84446468c712ff8f65c 100644
--- a/shell/platform/windows/window_unittests.cc
+++ b/shell/platform/windows/window_unittests.cc
@@ -166,7 +166,7 @@ TEST(MockWindow, MouseLeave) {
   const double mouse_y = 20.0;
 
   EXPECT_CALL(window, OnPointerMove(mouse_x, mouse_y,
-                                    kFlutterPointerDeviceKindMouse, 0))
+                                    kFlutterPointerDeviceKindMouse, 0, 0))
       .Times(1);
   EXPECT_CALL(window, OnPointerLeave(mouse_x, mouse_y,
                                      kFlutterPointerDeviceKindMouse, 0))
@@ -360,5 +360,23 @@ TEST(MockWindow, UnknownPointerTypeSkipsDirectManipulation) {
   window.InjectWindowMessage(DM_POINTERHITTEST, MAKEWPARAM(pointer_id, 0), 0);
 }
 
+// Test that the root UIA object is queried by WM_GETOBJECT.
+TEST(MockWindow, DISABLED_GetObjectUia) {
+  MockWindow window;
+  bool uia_called = false;
+  ON_CALL(window, OnGetObject)
+      .WillByDefault(Invoke([&uia_called](UINT msg, WPARAM wpar, LPARAM lpar) {
+#ifdef FLUTTER_ENGINE_USE_UIA
+        uia_called = true;
+#endif  // FLUTTER_ENGINE_USE_UIA
+        return static_cast<LRESULT>(0);
+      }));
+  EXPECT_CALL(window, OnGetObject).Times(1);
+
+  window.InjectWindowMessage(WM_GETOBJECT, 0, UiaRootObjectId);
+
+  EXPECT_TRUE(uia_called);
+}
+
 }  // namespace testing
 }  // namespace flutter
diff --git a/shell/platform/windows/windows_lifecycle_manager.cc b/shell/platform/windows/windows_lifecycle_manager.cc
new file mode 100644
index 0000000000000000000000000000000000000000..afa571a507fbb8bc9e831b2ad28632a1b70855af
--- /dev/null
+++ b/shell/platform/windows/windows_lifecycle_manager.cc
@@ -0,0 +1,304 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "windows_lifecycle_manager.h"
+
+#include <TlHelp32.h>
+#include <WinUser.h>
+#include <Windows.h>
+#include <tchar.h>
+
+#include "flutter/shell/platform/windows/flutter_windows_engine.h"
+
+namespace flutter {
+
+WindowsLifecycleManager::WindowsLifecycleManager(FlutterWindowsEngine* engine)
+    : engine_(engine) {}
+
+WindowsLifecycleManager::~WindowsLifecycleManager() {}
+
+void WindowsLifecycleManager::Quit(std::optional<HWND> hwnd,
+                                   std::optional<WPARAM> wparam,
+                                   std::optional<LPARAM> lparam,
+                                   UINT exit_code) {
+  if (!hwnd.has_value()) {
+    ::PostQuitMessage(exit_code);
+  } else {
+    BASE_CHECK(wparam.has_value() && lparam.has_value());
+    sent_close_messages_[std::make_tuple(*hwnd, *wparam, *lparam)]++;
+    DispatchMessage(*hwnd, WM_CLOSE, *wparam, *lparam);
+  }
+}
+
+void WindowsLifecycleManager::DispatchMessage(HWND hwnd,
+                                              UINT message,
+                                              WPARAM wparam,
+                                              LPARAM lparam) {
+  PostMessage(hwnd, message, wparam, lparam);
+}
+
+bool WindowsLifecycleManager::HandleCloseMessage(HWND hwnd,
+                                                 WPARAM wparam,
+                                                 LPARAM lparam) {
+  if (!process_exit_) {
+    return false;
+  }
+  auto key = std::make_tuple(hwnd, wparam, lparam);
+  auto itr = sent_close_messages_.find(key);
+  if (itr != sent_close_messages_.end()) {
+    if (itr->second == 1) {
+      sent_close_messages_.erase(itr);
+    } else {
+      sent_close_messages_[key]--;
+    }
+    return false;
+  }
+  if (IsLastWindowOfProcess()) {
+    engine_->RequestApplicationQuit(hwnd, wparam, lparam,
+                                    AppExitType::cancelable);
+    return true;
+  }
+  return false;
+}
+
+bool WindowsLifecycleManager::WindowProc(HWND hwnd,
+                                         UINT msg,
+                                         WPARAM wpar,
+                                         LPARAM lpar,
+                                         LRESULT* result) {
+  switch (msg) {
+    // When WM_CLOSE is received from the final window of an application, we
+    // send a request to the framework to see if the app should exit. If it
+    // is, we re-dispatch a new WM_CLOSE message. In order to allow the new
+    // message to reach other delegates, we ignore it here.
+    case WM_CLOSE:
+      return HandleCloseMessage(hwnd, wpar, lpar);
+
+    // DWM composition can be disabled on Windows 7.
+    // Notify the engine as this can result in screen tearing.
+    case WM_DWMCOMPOSITIONCHANGED:
+      engine_->OnDwmCompositionChanged();
+      break;
+
+    case WM_SIZE:
+      if (wpar == SIZE_MAXIMIZED || wpar == SIZE_RESTORED) {
+        OnWindowStateEvent(hwnd, WindowStateEvent::kShow);
+      } else if (wpar == SIZE_MINIMIZED) {
+        OnWindowStateEvent(hwnd, WindowStateEvent::kHide);
+      }
+      break;
+
+    case WM_SHOWWINDOW:
+      if (!wpar) {
+        OnWindowStateEvent(hwnd, WindowStateEvent::kHide);
+      } else {
+        OnWindowStateEvent(hwnd, WindowStateEvent::kShow);
+      }
+      break;
+
+    case WM_DESTROY:
+      OnWindowStateEvent(hwnd, WindowStateEvent::kHide);
+      break;
+  }
+  return false;
+}
+
+class ThreadSnapshot {
+ public:
+  ThreadSnapshot() {
+    thread_snapshot_ = ::CreateToolhelp32Snapshot(TH32CS_SNAPTHREAD, 0);
+  }
+  ~ThreadSnapshot() {
+    if (thread_snapshot_ != INVALID_HANDLE_VALUE) {
+      ::CloseHandle(thread_snapshot_);
+    }
+  }
+
+  std::optional<THREADENTRY32> GetFirstThread() {
+    if (thread_snapshot_ == INVALID_HANDLE_VALUE) {
+      FML_LOG(ERROR) << "Failed to get thread snapshot";
+      return std::nullopt;
+    }
+    THREADENTRY32 thread;
+    thread.dwSize = sizeof(thread);
+    if (!::Thread32First(thread_snapshot_, &thread)) {
+      DWORD error_num = ::GetLastError();
+      char msg[256];
+      ::FormatMessageA(
+          FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL,
+          error_num, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), msg, 256,
+          nullptr);
+      FML_LOG(ERROR) << "Failed to get thread(" << error_num << "): " << msg;
+      return std::nullopt;
+    }
+    return thread;
+  }
+
+  bool GetNextThread(THREADENTRY32& thread) {
+    if (thread_snapshot_ == INVALID_HANDLE_VALUE) {
+      return false;
+    }
+    return ::Thread32Next(thread_snapshot_, &thread);
+  }
+
+ private:
+  HANDLE thread_snapshot_;
+};
+
+static int64_t NumWindowsForThread(const THREADENTRY32& thread) {
+  int64_t num_windows = 0;
+  ::EnumThreadWindows(
+      thread.th32ThreadID,
+      [](HWND hwnd, LPARAM lparam) {
+        int64_t* windows_ptr = reinterpret_cast<int64_t*>(lparam);
+        if (::GetParent(hwnd) == nullptr) {
+          (*windows_ptr)++;
+        }
+        return *windows_ptr <= 1 ? TRUE : FALSE;
+      },
+      reinterpret_cast<LPARAM>(&num_windows));
+  return num_windows;
+}
+
+bool WindowsLifecycleManager::IsLastWindowOfProcess() {
+  DWORD pid = ::GetCurrentProcessId();
+  ThreadSnapshot thread_snapshot;
+  std::optional<THREADENTRY32> first_thread = thread_snapshot.GetFirstThread();
+  if (!first_thread.has_value()) {
+    FML_LOG(ERROR) << "No first thread found";
+    return true;
+  }
+
+  int num_windows = 0;
+  THREADENTRY32 thread = *first_thread;
+  do {
+    if (thread.th32OwnerProcessID == pid) {
+      num_windows += NumWindowsForThread(thread);
+      if (num_windows > 1) {
+        return false;
+      }
+    }
+  } while (thread_snapshot.GetNextThread(thread));
+
+  return num_windows <= 1;
+}
+
+void WindowsLifecycleManager::BeginProcessingLifecycle() {
+  process_lifecycle_ = true;
+}
+
+void WindowsLifecycleManager::BeginProcessingExit() {
+  process_exit_ = true;
+}
+
+void WindowsLifecycleManager::SetLifecycleState(AppLifecycleState state) {
+  if (state_ == state) {
+    return;
+  }
+  state_ = state;
+  if (engine_ && process_lifecycle_) {
+    const char* state_name = AppLifecycleStateToString(state);
+    engine_->SendPlatformMessage("flutter/lifecycle",
+                                 reinterpret_cast<const uint8_t*>(state_name),
+                                 strlen(state_name), nullptr, nullptr);
+  }
+}
+
+void WindowsLifecycleManager::OnWindowStateEvent(HWND hwnd,
+                                                 WindowStateEvent event) {
+  // Synthesize an unfocus event when a focused window is hidden.
+  if (event == WindowStateEvent::kHide &&
+      focused_windows_.find(hwnd) != focused_windows_.end()) {
+    OnWindowStateEvent(hwnd, WindowStateEvent::kUnfocus);
+  }
+
+  std::lock_guard guard(state_update_lock_);
+  switch (event) {
+    case WindowStateEvent::kShow: {
+      bool first_shown_window = visible_windows_.empty();
+      auto pair = visible_windows_.insert(hwnd);
+      if (first_shown_window && pair.second &&
+          state_ == AppLifecycleState::kHidden) {
+        SetLifecycleState(AppLifecycleState::kInactive);
+      }
+      break;
+    }
+    case WindowStateEvent::kHide: {
+      bool present = visible_windows_.erase(hwnd);
+      bool empty = visible_windows_.empty();
+      if (present && empty &&
+          (state_ == AppLifecycleState::kResumed ||
+           state_ == AppLifecycleState::kInactive)) {
+        SetLifecycleState(AppLifecycleState::kHidden);
+      }
+      break;
+    }
+    case WindowStateEvent::kFocus: {
+      bool first_focused_window = focused_windows_.empty();
+      auto pair = focused_windows_.insert(hwnd);
+      if (first_focused_window && pair.second &&
+          state_ == AppLifecycleState::kInactive) {
+        SetLifecycleState(AppLifecycleState::kResumed);
+      }
+      break;
+    }
+    case WindowStateEvent::kUnfocus: {
+      if (focused_windows_.erase(hwnd) && focused_windows_.empty() &&
+          state_ == AppLifecycleState::kResumed) {
+        SetLifecycleState(AppLifecycleState::kInactive);
+      }
+      break;
+    }
+  }
+}
+
+std::optional<LRESULT> WindowsLifecycleManager::ExternalWindowMessage(
+    HWND hwnd,
+    UINT message,
+    WPARAM wparam,
+    LPARAM lparam) {
+  std::optional<flutter::WindowStateEvent> event = std::nullopt;
+
+  // TODO (schectman): Handle WM_CLOSE messages.
+  // https://github.com/flutter/flutter/issues/131497
+  switch (message) {
+    case WM_SHOWWINDOW:
+      event = wparam ? flutter::WindowStateEvent::kShow
+                     : flutter::WindowStateEvent::kHide;
+      break;
+    case WM_SIZE:
+      switch (wparam) {
+        case SIZE_MINIMIZED:
+          event = flutter::WindowStateEvent::kHide;
+          break;
+        case SIZE_RESTORED:
+        case SIZE_MAXIMIZED:
+          event = flutter::WindowStateEvent::kShow;
+          break;
+      }
+      break;
+    case WM_SETFOCUS:
+      event = flutter::WindowStateEvent::kFocus;
+      break;
+    case WM_KILLFOCUS:
+      event = flutter::WindowStateEvent::kUnfocus;
+      break;
+    case WM_DESTROY:
+      event = flutter::WindowStateEvent::kHide;
+      break;
+    case WM_CLOSE:
+      if (HandleCloseMessage(hwnd, wparam, lparam)) {
+        return NULL;
+      }
+      break;
+  }
+
+  if (event.has_value()) {
+    OnWindowStateEvent(hwnd, *event);
+  }
+
+  return std::nullopt;
+}
+
+}  // namespace flutter
diff --git a/shell/platform/windows/windows_lifecycle_manager.h b/shell/platform/windows/windows_lifecycle_manager.h
new file mode 100644
index 0000000000000000000000000000000000000000..fc20b382467fa6b95168cf555b6d683f2ebed5fb
--- /dev/null
+++ b/shell/platform/windows/windows_lifecycle_manager.h
@@ -0,0 +1,127 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_WINDOWS_LIFECYCLE_MANAGER_H_
+#define FLUTTER_SHELL_PLATFORM_WINDOWS_WINDOWS_LIFECYCLE_MANAGER_H_
+
+#include <Windows.h>
+
+#include <cstdint>
+#include <map>
+#include <mutex>
+#include <optional>
+#include <set>
+
+#include "flutter/shell/platform/common/app_lifecycle_state.h"
+
+namespace flutter {
+
+class FlutterWindowsEngine;
+
+/// An event representing a change in window state that may update the
+// application lifecycle state.
+enum class WindowStateEvent {
+  kShow,
+  kHide,
+  kFocus,
+  kUnfocus,
+};
+
+/// A manager for lifecycle events of the top-level windows.
+///
+/// WndProc is called for window messages of the top-level Flutter window.
+/// ExternalWindowMessage is called for non-flutter top-level window messages.
+/// OnWindowStateEvent is called when the visibility or focus state of a window
+///   is changed, including the FlutterView window.
+class WindowsLifecycleManager {
+ public:
+  WindowsLifecycleManager(FlutterWindowsEngine* engine);
+  virtual ~WindowsLifecycleManager();
+
+  // Called when the engine is notified it should quit, e.g. by an application
+  // call to `exitApplication`. When window is std::nullopt, this quits the
+  // application. Otherwise, it holds the HWND of the window that initiated the
+  // request, and exit_code is unused.
+  virtual void Quit(std::optional<HWND> window,
+                    std::optional<WPARAM> wparam,
+                    std::optional<LPARAM> lparam,
+                    UINT exit_code);
+
+  // Intercept top level window WM_CLOSE message and listen to events that may
+  // update the application lifecycle.
+  bool WindowProc(HWND hwnd, UINT msg, WPARAM w, LPARAM l, LRESULT* result);
+
+  // Signal to start  sending lifecycle state update messages.
+  virtual void BeginProcessingLifecycle();
+
+  // Signal to start consuming WM_CLOSE messages.
+  virtual void BeginProcessingExit();
+
+  // Update the app lifecycle state in response to a change in window state.
+  // When the app lifecycle state actually changes, this sends a platform
+  // message to the framework notifying it of the state change.
+  virtual void SetLifecycleState(AppLifecycleState state);
+
+  // Respond to a change in window state. Transitions as follows:
+  // When the only visible window is hidden, transition from resumed or
+  // inactive to hidden.
+  // When the only focused window is unfocused, transition from resumed to
+  // inactive.
+  // When a window is focused, transition from inactive to resumed.
+  // When a window is shown, transition from hidden to inactive.
+  virtual void OnWindowStateEvent(HWND hwnd, WindowStateEvent event);
+
+  AppLifecycleState GetLifecycleState() { return state_; }
+
+  // Called by the engine when a non-Flutter window receives an event that may
+  // alter the lifecycle state. The logic for external windows must differ from
+  // that used for FlutterWindow instances, because:
+  // - FlutterWindow does not receive WM_SHOW messages,
+  // - When FlutterWindow receives WM_SIZE messages, wparam stores no meaningful
+  //   information, whereas it usually indicates the action which changed the
+  //   window size.
+  // When this returns a result, the message has been consumed and should not be
+  // processed further. Currently, it will always return nullopt.
+  std::optional<LRESULT> ExternalWindowMessage(HWND hwnd,
+                                               UINT message,
+                                               WPARAM wparam,
+                                               LPARAM lparam);
+
+ protected:
+  // Check the number of top-level windows associated with this process, and
+  // return true only if there are 1 or fewer.
+  virtual bool IsLastWindowOfProcess();
+
+  virtual void DispatchMessage(HWND window,
+                               UINT msg,
+                               WPARAM wparam,
+                               LPARAM lparam);
+
+ private:
+  // Pass top-level window close notifications to the application lifecycle
+  // logic. If the last window of the process receives WM_CLOSE and a listener
+  // is registered for WidgetsBindingObserver.didRequestAppExit, the message is
+  // sent to the framework to query whether the application should be allowed
+  // to quit.
+  bool HandleCloseMessage(HWND hwnd, WPARAM wparam, LPARAM lparam);
+
+  FlutterWindowsEngine* engine_;
+
+  std::map<std::tuple<HWND, WPARAM, LPARAM>, int> sent_close_messages_;
+
+  bool process_lifecycle_ = false;
+  bool process_exit_ = false;
+
+  std::set<HWND> visible_windows_;
+
+  std::set<HWND> focused_windows_;
+
+  std::mutex state_update_lock_;
+
+  flutter::AppLifecycleState state_;
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_WINDOWS_LIFECYCLE_MANAGER_H_
diff --git a/shell/platform/windows/windows_lifecycle_manager_unittests.cc b/shell/platform/windows/windows_lifecycle_manager_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..6414d0ade78a087c3f49f523297035d0007914df
--- /dev/null
+++ b/shell/platform/windows/windows_lifecycle_manager_unittests.cc
@@ -0,0 +1,61 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/platform/windows/windows_lifecycle_manager.h"
+
+#include "flutter/shell/platform/windows/testing/windows_test.h"
+#include "gtest/gtest.h"
+
+namespace flutter {
+namespace testing {
+
+class WindowsLifecycleManagerTest : public WindowsTest {};
+
+TEST_F(WindowsLifecycleManagerTest, StateTransitions) {
+  WindowsLifecycleManager manager(nullptr);
+  HWND win1 = reinterpret_cast<HWND>(1);
+  HWND win2 = reinterpret_cast<HWND>(2);
+
+  // Hidden to inactive upon window shown.
+  manager.SetLifecycleState(AppLifecycleState::kHidden);
+  manager.OnWindowStateEvent(win1, WindowStateEvent::kShow);
+  EXPECT_EQ(manager.GetLifecycleState(), AppLifecycleState::kInactive);
+
+  // Showing a second window does not change state.
+  manager.OnWindowStateEvent(win2, WindowStateEvent::kShow);
+  EXPECT_EQ(manager.GetLifecycleState(), AppLifecycleState::kInactive);
+
+  // Inactive to resumed upon window focus.
+  manager.OnWindowStateEvent(win2, WindowStateEvent::kFocus);
+  EXPECT_EQ(manager.GetLifecycleState(), AppLifecycleState::kResumed);
+
+  // Showing a second window does not change state.
+  manager.OnWindowStateEvent(win1, WindowStateEvent::kFocus);
+  EXPECT_EQ(manager.GetLifecycleState(), AppLifecycleState::kResumed);
+
+  // Unfocusing one window does not change state while another is focused.
+  manager.OnWindowStateEvent(win1, WindowStateEvent::kUnfocus);
+  EXPECT_EQ(manager.GetLifecycleState(), AppLifecycleState::kResumed);
+
+  // Unfocusing final remaining focused window transitions to inactive.
+  manager.OnWindowStateEvent(win2, WindowStateEvent::kUnfocus);
+  EXPECT_EQ(manager.GetLifecycleState(), AppLifecycleState::kInactive);
+
+  // Hiding one of two visible windows does not change state.
+  manager.OnWindowStateEvent(win2, WindowStateEvent::kHide);
+  EXPECT_EQ(manager.GetLifecycleState(), AppLifecycleState::kInactive);
+
+  // Hiding only visible window transitions to hidden.
+  manager.OnWindowStateEvent(win1, WindowStateEvent::kHide);
+  EXPECT_EQ(manager.GetLifecycleState(), AppLifecycleState::kHidden);
+
+  // Transition directly from resumed to hidden when the window is hidden.
+  manager.OnWindowStateEvent(win1, WindowStateEvent::kShow);
+  manager.OnWindowStateEvent(win1, WindowStateEvent::kFocus);
+  manager.OnWindowStateEvent(win1, WindowStateEvent::kHide);
+  EXPECT_EQ(manager.GetLifecycleState(), AppLifecycleState::kHidden);
+}
+
+}  // namespace testing
+}  // namespace flutter
diff --git a/shell/platform/windows/windows_proc_table.cc b/shell/platform/windows/windows_proc_table.cc
index d2b5bd99f42647e9028c1140672c2790894b4507..663faaa73e7891493e1ca710ccf28e78e06eb8ed 100644
--- a/shell/platform/windows/windows_proc_table.cc
+++ b/shell/platform/windows/windows_proc_table.cc
@@ -4,6 +4,9 @@
 
 #include "flutter/shell/platform/windows/windows_proc_table.h"
 
+#include <WinUser.h>
+#include <dwmapi.h>
+
 namespace flutter {
 
 WindowsProcTable::WindowsProcTable() {
@@ -17,7 +20,7 @@ WindowsProcTable::~WindowsProcTable() {
 }
 
 BOOL WindowsProcTable::GetPointerType(UINT32 pointer_id,
-                                      POINTER_INPUT_TYPE* pointer_type) {
+                                      POINTER_INPUT_TYPE* pointer_type) const {
   if (!get_pointer_type_.has_value()) {
     return FALSE;
   }
@@ -25,4 +28,34 @@ BOOL WindowsProcTable::GetPointerType(UINT32 pointer_id,
   return get_pointer_type_.value()(pointer_id, pointer_type);
 }
 
+LRESULT WindowsProcTable::GetThreadPreferredUILanguages(DWORD flags,
+                                                        PULONG count,
+                                                        PZZWSTR languages,
+                                                        PULONG length) const {
+  return ::GetThreadPreferredUILanguages(flags, count, languages, length);
+}
+
+bool WindowsProcTable::GetHighContrastEnabled() const {
+  HIGHCONTRAST high_contrast = {.cbSize = sizeof(HIGHCONTRAST)};
+  if (!::SystemParametersInfoW(SPI_GETHIGHCONTRAST, sizeof(HIGHCONTRAST),
+                               &high_contrast, 0)) {
+    return false;
+  }
+
+  return high_contrast.dwFlags & HCF_HIGHCONTRASTON;
+}
+
+bool WindowsProcTable::DwmIsCompositionEnabled() const {
+  BOOL composition_enabled;
+  if (SUCCEEDED(::DwmIsCompositionEnabled(&composition_enabled))) {
+    return composition_enabled;
+  }
+
+  return true;
+}
+
+HRESULT WindowsProcTable::DwmFlush() const {
+  return ::DwmFlush();
+}
+
 }  // namespace flutter
diff --git a/shell/platform/windows/windows_proc_table.h b/shell/platform/windows/windows_proc_table.h
index db6397d2e47815c32092ccdeba22924ceb708bc0..ed0ed04ae6de83cec86e401403371c1a576409da 100644
--- a/shell/platform/windows/windows_proc_table.h
+++ b/shell/platform/windows/windows_proc_table.h
@@ -5,14 +5,15 @@
 #ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_WINDOWS_PROC_TABLE_H_
 #define FLUTTER_SHELL_PLATFORM_WINDOWS_WINDOWS_PROC_TABLE_H_
 
-#include "flutter/fml/native_library.h"
-
 #include <optional>
 
+#include "flutter/fml/macros.h"
+#include "flutter/fml/native_library.h"
+
 namespace flutter {
 
 // Lookup table for Windows APIs that aren't available on all versions of
-// Windows.
+// Windows, or for mocking Windows API calls.
 class WindowsProcTable {
  public:
   WindowsProcTable();
@@ -21,9 +22,40 @@ class WindowsProcTable {
   // Retrieves the pointer type for a specified pointer.
   //
   // Used to react differently to touch or pen inputs. Returns false on failure.
-  // Available in Windows 8 and newer, otherwise returns false.
+  // Available on Windows 8 and newer, otherwise returns false.
   virtual BOOL GetPointerType(UINT32 pointer_id,
-                              POINTER_INPUT_TYPE* pointer_type);
+                              POINTER_INPUT_TYPE* pointer_type) const;
+
+  // Get the preferred languages for the thread, and optionally the process,
+  // and system, in that order, depending on the flags.
+  //
+  // See:
+  // https://learn.microsoft.com/windows/win32/api/winnls/nf-winnls-getthreadpreferreduilanguages
+  virtual LRESULT GetThreadPreferredUILanguages(DWORD flags,
+                                                PULONG count,
+                                                PZZWSTR languages,
+                                                PULONG length) const;
+
+  // Get whether high contrast is enabled.
+  //
+  // Available on Windows 8 and newer, otherwise returns false.
+  //
+  // See:
+  // https://learn.microsoft.com/windows/win32/winauto/high-contrast-parameter
+  virtual bool GetHighContrastEnabled() const;
+
+  // Get whether the system compositor, DWM, is enabled.
+  //
+  // See:
+  // https://learn.microsoft.com/windows/win32/api/dwmapi/nf-dwmapi-dwmiscompositionenabled
+  virtual bool DwmIsCompositionEnabled() const;
+
+  // Issues a flush call that blocks the caller until all of the outstanding
+  // surface updates have been made.
+  //
+  // See:
+  // https://learn.microsoft.com/windows/win32/api/dwmapi/nf-dwmapi-dwmflush
+  virtual HRESULT DwmFlush() const;
 
  private:
   using GetPointerType_ = BOOL __stdcall(UINT32 pointerId,
diff --git a/shell/platform/windows/windows_registry.cc b/shell/platform/windows/windows_registry.cc
deleted file mode 100644
index 0b929981f88b5730551991a08df57ac8023ca600..0000000000000000000000000000000000000000
--- a/shell/platform/windows/windows_registry.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "flutter/shell/platform/windows/windows_registry.h"
-
-namespace flutter {
-
-LSTATUS WindowsRegistry::GetRegistryValue(HKEY hkey,
-                                          LPCWSTR key,
-                                          LPCWSTR value,
-                                          DWORD flags,
-                                          LPDWORD type,
-                                          PVOID data,
-                                          LPDWORD data_size) const {
-  return RegGetValue(hkey, key, value, flags, type, data, data_size);
-}
-
-}  // namespace flutter
diff --git a/shell/platform/windows/windows_registry.h b/shell/platform/windows/windows_registry.h
deleted file mode 100644
index b46fbc2be6268ea746381fb3f3c54376eb999763..0000000000000000000000000000000000000000
--- a/shell/platform/windows/windows_registry.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_WINDOWS_REGISTRY_H_
-#define FLUTTER_SHELL_PLATFORM_WINDOWS_WINDOWS_REGISTRY_H_
-
-#include <Windows.h>
-
-#include "flutter/fml/macros.h"
-
-namespace flutter {
-
-/// A utility class to encapsulate interaction with the Windows registry.
-/// By encapsulating this in a class, we can mock out this functionality
-/// for unit testing.
-class WindowsRegistry {
- public:
-  WindowsRegistry() = default;
-  virtual ~WindowsRegistry() = default;
-
-  // Parameters and return values of this method match those of RegGetValue
-  // See:
-  // https://learn.microsoft.com/windows/win32/api/winreg/nf-winreg-reggetvaluew
-  virtual LSTATUS GetRegistryValue(HKEY hkey,
-                                   LPCWSTR key,
-                                   LPCWSTR value,
-                                   DWORD flags,
-                                   LPDWORD type,
-                                   PVOID data,
-                                   LPDWORD data_size) const;
-
- private:
-  FML_DISALLOW_COPY_AND_ASSIGN(WindowsRegistry);
-};
-
-}  // namespace flutter
-
-#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_WINDOWS_REGISTRY_H_
diff --git a/shell/platform/windows/windowsx_shim.h b/shell/platform/windows/windowsx_shim.h
new file mode 100644
index 0000000000000000000000000000000000000000..d1d5d8bcac330fed0032f38507811d9ad3100e76
--- /dev/null
+++ b/shell/platform/windows/windowsx_shim.h
@@ -0,0 +1,28 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_WINDOWSX_SHIM_H_
+#define FLUTTER_SHELL_PLATFORM_WINDOWS_WINDOWSX_SHIM_H_
+
+// The Win32 platform header <windowsx.h> contains some macros for
+// common function names. To work around that, windowsx.h is not to be
+// included directly, and instead this file should be included. If one
+// of the removed Win32 macros is wanted, use the expanded form
+// manually instead.
+
+#ifdef _INC_WINDOWS_X
+#error "There is an include of windowsx.h in the code. Use windowsx_shim.h"
+#endif  // _INC_WINDOWS_X
+
+#include <windowsx.h>
+
+#undef GetNextSibling  // Same as GetWindow(hwnd, GW_HWNDNEXT)
+#undef GetFirstChild   // Same as GetTopWindow(hwnd)
+#undef IsMaximized     // Defined to IsZoomed, use IsZoomed directly instead
+#undef IsMinimized     // Defined to IsIconic, use IsIconic directly instead
+#undef IsRestored      // Macro to check that neither WS_MINIMIZE, nor
+                       // WS_MAXIMIZE is set in the GetWindowStyle return
+                       // value.
+
+#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_WINDOWSX_SHIM_H_
diff --git a/shell/profiling/sampling_profiler.cc b/shell/profiling/sampling_profiler.cc
index c6058b76cd4c7539ccdc0d22e8f54c9c4f004187..4b5e8d44b7997c1ff0076e5de702ea6756ecd198 100644
--- a/shell/profiling/sampling_profiler.cc
+++ b/shell/profiling/sampling_profiler.cc
@@ -33,7 +33,7 @@ void SamplingProfiler::Start() {
       << num_samples_per_sec_;
   double delay_between_samples = 1.0 / num_samples_per_sec_;
   auto task_delay = fml::TimeDelta::FromSecondsF(delay_between_samples);
-  UpdateObservatoryThreadName();
+  UpdateDartVMServiceThreadName();
   is_running_ = true;
   SampleRepeatedly(task_delay);
 }
@@ -88,7 +88,7 @@ void SamplingProfiler::SampleRepeatedly(fml::TimeDelta task_delay) const {
       task_delay);
 }
 
-void SamplingProfiler::UpdateObservatoryThreadName() const {
+void SamplingProfiler::UpdateDartVMServiceThreadName() const {
   FML_CHECK(profiler_task_runner_);
 
   profiler_task_runner_->PostTask(
diff --git a/shell/profiling/sampling_profiler.h b/shell/profiling/sampling_profiler.h
index d68f88a643d3e5d49d056a2e1561c7cbff907bff..1385613503494ca003236d1bd65c53aa4a899319 100644
--- a/shell/profiling/sampling_profiler.h
+++ b/shell/profiling/sampling_profiler.h
@@ -76,7 +76,7 @@ using Sampler = std::function<ProfileSample(void)>;
  * @brief a Sampling Profiler that runs peridically and calls the `Sampler`
  * which servers as a value function to gather various profiling metrics as
  * represented by `ProfileSample`. These profiling metrics are then posted to
- * the observatory timeline.
+ * the Dart VM Service timeline.
  *
  */
 class SamplingProfiler {
@@ -84,7 +84,7 @@ class SamplingProfiler {
   /**
    * @brief Construct a new Sampling Profiler object
    *
-   * @param thread_label observatory prefix to be set for the profiling task
+   * @param thread_label Dart VM Service prefix to be set for the profiling task
    * runner.
    * @param profiler_task_runner the task runner to service sampling requests.
    * @param sampler the value function to collect the profiling metrics.
@@ -121,10 +121,10 @@ class SamplingProfiler {
   /**
    * @brief This doesn't update the underlying OS thread name for the thread
    * backing `profiler_task_runner_`. Instead, this is just additional metadata
-   * for the Observatory to show the thread name of the isolate.
+   * for the VM Service to show the thread name of the isolate.
    *
    */
-  void UpdateObservatoryThreadName() const;
+  void UpdateDartVMServiceThreadName() const;
 
   FML_DISALLOW_COPY_AND_ASSIGN(SamplingProfiler);
 };
diff --git a/shell/profiling/sampling_profiler_unittest.cc b/shell/profiling/sampling_profiler_unittest.cc
index 784b73206d386a56f2b2f4a0d7245a6808cead6f..6195bb6bd4501f10cdf64b1e410f3fdda9920889 100644
--- a/shell/profiling/sampling_profiler_unittest.cc
+++ b/shell/profiling/sampling_profiler_unittest.cc
@@ -2,9 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/profiling/sampling_profiler.h"
+#include <thread>
+
 #include "flutter/fml/message_loop_impl.h"
 #include "flutter/fml/thread.h"
+#include "flutter/shell/profiling/sampling_profiler.h"
 #include "flutter/testing/testing.h"
 #include "gmock/gmock.h"
 
@@ -18,13 +20,17 @@ class MockTaskRunner : public fml::TaskRunner {
   inline static RefPtr<MockTaskRunner> Create() {
     return AdoptRef(new MockTaskRunner());
   }
-  MOCK_METHOD1(PostTask, void(const fml::closure& task));
-  MOCK_METHOD2(PostTaskForTime,
-               void(const fml::closure& task, fml::TimePoint target_time));
-  MOCK_METHOD2(PostDelayedTask,
-               void(const fml::closure& task, fml::TimeDelta delay));
-  MOCK_METHOD0(RunsTasksOnCurrentThread, bool());
-  MOCK_METHOD0(GetTaskQueueId, TaskQueueId());
+  MOCK_METHOD(void, PostTask, (const fml::closure& task), (override));
+  MOCK_METHOD(void,
+              PostTaskForTime,
+              (const fml::closure& task, fml::TimePoint target_time),
+              (override));
+  MOCK_METHOD(void,
+              PostDelayedTask,
+              (const fml::closure& task, fml::TimeDelta delay),
+              (override));
+  MOCK_METHOD(bool, RunsTasksOnCurrentThread, (), (override));
+  MOCK_METHOD(TaskQueueId, GetTaskQueueId, (), (override));
 
  private:
   MockTaskRunner() : TaskRunner(fml::RefPtr<MessageLoopImpl>()) {}
diff --git a/shell/testing/BUILD.gn b/shell/testing/BUILD.gn
index ec6400ce0763aeb9e4927bbaef300816a06d705d..28a19c75d1bb9c0f15680d3cb1273216a1de2cb2 100644
--- a/shell/testing/BUILD.gn
+++ b/shell/testing/BUILD.gn
@@ -2,19 +2,32 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/fuchsia/sdk.gni")
+import("//flutter/impeller/tools/impeller.gni")
+import("//flutter/shell/gpu/gpu.gni")
+
+if (is_fuchsia) {
+  import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
+}
+
+shell_gpu_configuration("tester_gpu_configuration") {
+  enable_software = true
+  enable_gl = true
+  enable_vulkan = true
+  enable_metal = false
+}
 
 executable("testing") {
   output_name = "flutter_tester"
 
   public_configs = [
     "//flutter:config",
-    "//flutter:export_dynamic_symbols",
+    "//flutter:export_dynamic_test_symbols",
   ]
 
   sources = [ "tester_main.cc" ]
+  libs = []
   if (is_win) {
-    libs = [
+    libs += [
       "psapi.lib",
       "user32.lib",
       "FontSub.lib",
@@ -23,6 +36,8 @@ executable("testing") {
   }
 
   deps = [
+    "$dart_src/runtime:libdart_jit",
+    "$dart_src/runtime/bin:dart_io_api",
     "//flutter/assets",
     "//flutter/common",
     "//flutter/flow",
@@ -30,12 +45,19 @@ executable("testing") {
     "//flutter/lib/snapshot",
     "//flutter/shell/common",
     "//flutter/shell/gpu:gpu_surface_software",
+    "//flutter/skia",
+    "//flutter/third_party/abseil-cpp/absl/base:no_destructor",
     "//flutter/third_party/tonic",
-    "//third_party/dart/runtime:libdart_jit",
-    "//third_party/dart/runtime/bin:dart_io_api",
-    "//third_party/skia",
   ]
 
+  if (impeller_supports_rendering) {
+    deps += [
+      ":tester_gpu_configuration",
+      "//flutter/impeller",
+      "//flutter/third_party/swiftshader/src/Vulkan:swiftshader_libvulkan_static",
+    ]
+  }
+
   metadata = {
     entitlement_file_path = [ "flutter_tester" ]
   }
diff --git a/shell/testing/observatory/launcher.dart b/shell/testing/observatory/launcher.dart
index 2603e359c4b0eefb426af9f08e71e4dd805c7a67..0b4e91e3a51407a2f8f2f740e8af0ea709bac1a4 100644
--- a/shell/testing/observatory/launcher.dart
+++ b/shell/testing/observatory/launcher.dart
@@ -2,25 +2,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-library observatory_sky_shell_launcher;
-
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
 class ShellProcess {
-  final Completer<Uri> _observatoryUriCompleter = Completer<Uri>();
+  final Completer<Uri> _vmServiceUriCompleter = Completer<Uri>();
   final Process _process;
 
   ShellProcess(this._process) {
-    // Scan stdout and scrape the Observatory Uri.
+    // Scan stdout and scrape the VM Service Uri.
     _process.stdout
         .transform(utf8.decoder)
         .transform(const LineSplitter())
         .listen((String line) {
       final uri = _extractVMServiceUri(line);
       if (uri != null) {
-        _observatoryUriCompleter.complete(uri);
+        _vmServiceUriCompleter.complete(uri);
       }
     });
   }
@@ -29,13 +27,13 @@ class ShellProcess {
     return _process.kill();
   }
 
-  Future<Uri> waitForObservatory() async {
-    return _observatoryUriCompleter.future;
+  Future<Uri> waitForVMService() async {
+    return _vmServiceUriCompleter.future;
   }
 
   Uri? _extractVMServiceUri(String str) {
     final listeningMessageRegExp = RegExp(
-      r'(?:Observatory|The Dart VM service is) listening on ((http|//)[a-zA-Z0-9:/=_\-\.\[\]]+)',
+      r'The Dart VM service is listening on ((http|//)[a-zA-Z0-9:/=_\-\.\[\]]+)',
     );
     final match = listeningMessageRegExp.firstMatch(str);
     if (match != null) {
@@ -47,7 +45,7 @@ class ShellProcess {
 
 class ShellLauncher {
   final List<String> args = <String>[
-    '--observatory-port=0',
+    '--vm-service-port=0',
     '--non-interactive',
     '--run-forever',
     '--disable-service-auth-codes',
diff --git a/shell/testing/observatory/service_client.dart b/shell/testing/observatory/service_client.dart
index 160a17795468a812fcd3d172ac490133c9153b09..8d52c6ef1ca2779577ab3627a3e10c84e9ca1fbc 100644
--- a/shell/testing/observatory/service_client.dart
+++ b/shell/testing/observatory/service_client.dart
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-library observatory_sky_shell_service_client;
-
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
diff --git a/shell/testing/observatory/test.dart b/shell/testing/observatory/test.dart
index a351c444e69d90962b68ab47d4cc54d116dbafd5..ad944dfb74210a576117108f9a6fdddf6d5030b7 100644
--- a/shell/testing/observatory/test.dart
+++ b/shell/testing/observatory/test.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// This is a minimal dependency heart beat test for Observatory.
+// This is a minimal dependency heart beat test for the Dart VM Service.
 
 import 'dart:async';
 import 'dart:convert';
@@ -170,14 +170,14 @@ Future<bool> runTests(ShellLauncher launcher, List<TestFunction> tests) async {
   if (process == null) {
     return false;
   }
-  final Uri uri = await process.waitForObservatory();
+  final Uri uri = await process.waitForVMService();
   try {
     for (int i = 0; i < tests.length; i++) {
       print('Executing test ${i + 1}/${tests.length}');
       await tests[i](uri);
     }
   } catch (e, st) {
-    print('Observatory test failure: $e\n$st');
+    print('Dart VM Service test failure: $e\n$st');
     exitCode = -1;
   }
   await process.kill();
diff --git a/shell/testing/tester_main.cc b/shell/testing/tester_main.cc
index 443e22b3a5b93e2065d379ce4533bbd89cdc1bbe..dac86e7c8d33e1733be56a2c0a0a85fba961153e 100644
--- a/shell/testing/tester_main.cc
+++ b/shell/testing/tester_main.cc
@@ -24,8 +24,95 @@
 #include "flutter/shell/common/switches.h"
 #include "flutter/shell/common/thread_host.h"
 #include "flutter/shell/gpu/gpu_surface_software.h"
+#include "flutter/third_party/abseil-cpp/absl/base/no_destructor.h"
+
 #include "third_party/dart/runtime/include/bin/dart_io_api.h"
 #include "third_party/dart/runtime/include/dart_api.h"
+#include "third_party/skia/include/core/SkSurface.h"
+
+// Impeller should only be enabled if the Vulkan backend is enabled.
+#define ALLOW_IMPELLER (IMPELLER_SUPPORTS_RENDERING && IMPELLER_ENABLE_VULKAN)
+
+#if ALLOW_IMPELLER
+#include <vulkan/vulkan.h>                                        // nogncheck
+#include "impeller/entity/vk/entity_shaders_vk.h"                 // nogncheck
+#include "impeller/entity/vk/framebuffer_blend_shaders_vk.h"      // nogncheck
+#include "impeller/entity/vk/modern_shaders_vk.h"                 // nogncheck
+#include "impeller/renderer/backend/vulkan/context_vk.h"          // nogncheck
+#include "impeller/renderer/backend/vulkan/surface_context_vk.h"  // nogncheck
+#include "impeller/renderer/context.h"                            // nogncheck
+#include "impeller/renderer/vk/compute_shaders_vk.h"              // nogncheck
+#include "shell/gpu/gpu_surface_vulkan_impeller.h"                // nogncheck
+#if IMPELLER_ENABLE_3D
+#include "impeller/scene/shaders/vk/scene_shaders_vk.h"  // nogncheck
+#endif                                                   // IMPELLER_ENABLE_3D
+
+static std::vector<std::shared_ptr<fml::Mapping>> ShaderLibraryMappings() {
+  return {
+      std::make_shared<fml::NonOwnedMapping>(impeller_entity_shaders_vk_data,
+                                             impeller_entity_shaders_vk_length),
+      std::make_shared<fml::NonOwnedMapping>(impeller_modern_shaders_vk_data,
+                                             impeller_modern_shaders_vk_length),
+      std::make_shared<fml::NonOwnedMapping>(
+          impeller_framebuffer_blend_shaders_vk_data,
+          impeller_framebuffer_blend_shaders_vk_length),
+#if IMPELLER_ENABLE_3D
+      std::make_shared<fml::NonOwnedMapping>(impeller_scene_shaders_vk_data,
+                                             impeller_scene_shaders_vk_length),
+#endif  // IMPELLER_ENABLE_3D
+      std::make_shared<fml::NonOwnedMapping>(
+          impeller_compute_shaders_vk_data, impeller_compute_shaders_vk_length),
+  };
+}
+
+struct ImpellerVulkanContextHolder {
+  ImpellerVulkanContextHolder() = default;
+  ImpellerVulkanContextHolder(ImpellerVulkanContextHolder&&) = default;
+  std::shared_ptr<impeller::ContextVK> context;
+  std::shared_ptr<impeller::SurfaceContextVK> surface_context;
+
+  bool Initialize(bool enable_validation);
+};
+
+bool ImpellerVulkanContextHolder::Initialize(bool enable_validation) {
+  impeller::ContextVK::Settings context_settings;
+  context_settings.proc_address_callback = &vkGetInstanceProcAddr;
+  context_settings.shader_libraries_data = ShaderLibraryMappings();
+  context_settings.cache_directory = fml::paths::GetCachesDirectory();
+  context_settings.enable_validation = enable_validation;
+
+  context = impeller::ContextVK::Create(std::move(context_settings));
+  if (!context || !context->IsValid()) {
+    VALIDATION_LOG << "Could not create Vulkan context.";
+    return false;
+  }
+
+  impeller::vk::SurfaceKHR vk_surface;
+  impeller::vk::HeadlessSurfaceCreateInfoEXT surface_create_info;
+  auto res = context->GetInstance().createHeadlessSurfaceEXT(
+      &surface_create_info,  // surface create info
+      nullptr,               // allocator
+      &vk_surface            // surface
+  );
+  if (res != impeller::vk::Result::eSuccess) {
+    VALIDATION_LOG << "Could not create surface for tester "
+                   << impeller::vk::to_string(res);
+    return false;
+  }
+
+  impeller::vk::UniqueSurfaceKHR surface{vk_surface, context->GetInstance()};
+  surface_context = context->CreateSurfaceContext();
+  if (!surface_context->SetWindowSurface(std::move(surface),
+                                         impeller::ISize{1, 1})) {
+    VALIDATION_LOG << "Could not set up surface for context.";
+    return false;
+  }
+  return true;
+}
+
+#else
+struct ImpellerVulkanContextHolder {};
+#endif  // IMPELLER_SUPPORTS_RENDERING
 
 #if defined(FML_OS_WIN)
 #include <combaseapi.h>
@@ -37,38 +124,56 @@
 
 namespace flutter {
 
+static absl::NoDestructor<std::unique_ptr<Shell>> g_shell;
+
+static constexpr int64_t kImplicitViewId = 0ll;
+
+static void ConfigureShell(Shell* shell) {
+  auto device_pixel_ratio = 3.0;
+  auto physical_width = 2400.0;   // 800 at 3x resolution.
+  auto physical_height = 1800.0;  // 600 at 3x resolution.
+
+  std::vector<std::unique_ptr<Display>> displays;
+  displays.push_back(std::make_unique<Display>(
+      0, 60, physical_width, physical_height, device_pixel_ratio));
+  shell->OnDisplayUpdates(std::move(displays));
+
+  flutter::ViewportMetrics metrics{};
+  metrics.device_pixel_ratio = device_pixel_ratio;
+  metrics.physical_width = physical_width;
+  metrics.physical_height = physical_height;
+  metrics.display_id = 0;
+  shell->GetPlatformView()->SetViewportMetrics(kImplicitViewId, metrics);
+}
+
 class TesterExternalViewEmbedder : public ExternalViewEmbedder {
   // |ExternalViewEmbedder|
-  SkCanvas* GetRootCanvas() override { return nullptr; }
+  DlCanvas* GetRootCanvas() override { return nullptr; }
 
   // |ExternalViewEmbedder|
   void CancelFrame() override {}
 
   // |ExternalViewEmbedder|
-  void BeginFrame(
-      SkISize frame_size,
-      GrDirectContext* context,
-      double device_pixel_ratio,
-      fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) override {}
+  void BeginFrame(GrDirectContext* context,
+                  const fml::RefPtr<fml::RasterThreadMerger>&
+                      raster_thread_merger) override {}
 
   // |ExternalViewEmbedder|
-  void PrerollCompositeEmbeddedView(
-      int view_id,
-      std::unique_ptr<EmbeddedViewParams> params) override {}
+  void PrepareFlutterView(SkISize frame_size,
+                          double device_pixel_ratio) override {}
 
   // |ExternalViewEmbedder|
-  std::vector<SkCanvas*> GetCurrentCanvases() override { return {&canvas_}; }
-
-  // |ExternalViewEmbedder|
-  std::vector<DisplayListBuilder*> GetCurrentBuilders() override { return {}; }
+  void PrerollCompositeEmbeddedView(
+      int64_t view_id,
+      std::unique_ptr<EmbeddedViewParams> params) override {}
 
   // |ExternalViewEmbedder|
-  EmbedderPaintContext CompositeEmbeddedView(int view_id) override {
-    return {&canvas_, nullptr};
+  DlCanvas* CompositeEmbeddedView(int64_t view_id) override {
+    return &builder_;
   }
 
  private:
-  SkCanvas canvas_;
+  DisplayListBuilder builder_;
 };
 
 class TesterGPUSurfaceSoftware : public GPUSurfaceSoftware {
@@ -83,11 +188,41 @@ class TesterGPUSurfaceSoftware : public GPUSurfaceSoftware {
 class TesterPlatformView : public PlatformView,
                            public GPUSurfaceSoftwareDelegate {
  public:
-  TesterPlatformView(Delegate& delegate, const TaskRunners& task_runners)
-      : PlatformView(delegate, task_runners) {}
+  TesterPlatformView(Delegate& delegate,
+                     const TaskRunners& task_runners,
+                     ImpellerVulkanContextHolder&& impeller_context_holder)
+      : PlatformView(delegate, task_runners),
+        impeller_context_holder_(std::move(impeller_context_holder)) {}
+
+  ~TesterPlatformView() {
+#if ALLOW_IMPELLER
+    if (impeller_context_holder_.context) {
+      impeller_context_holder_.context->Shutdown();
+    }
+#endif
+  }
+
+  // |PlatformView|
+  std::shared_ptr<impeller::Context> GetImpellerContext() const override {
+#if ALLOW_IMPELLER
+    return std::static_pointer_cast<impeller::Context>(
+        impeller_context_holder_.context);
+#else
+    return nullptr;
+#endif  // ALLOW_IMPELLER
+  }
 
   // |PlatformView|
   std::unique_ptr<Surface> CreateRenderingSurface() override {
+#if ALLOW_IMPELLER
+    if (delegate_.OnPlatformViewGetSettings().enable_impeller) {
+      FML_DCHECK(impeller_context_holder_.context);
+      auto surface = std::make_unique<GPUSurfaceVulkanImpeller>(
+          impeller_context_holder_.surface_context);
+      FML_DCHECK(surface->IsValid());
+      return surface;
+    }
+#endif  // ALLOW_IMPELLER
     auto surface = std::make_unique<TesterGPUSurfaceSoftware>(
         this, true /* render to surface */);
     FML_DCHECK(surface->IsValid());
@@ -105,7 +240,7 @@ class TesterPlatformView : public PlatformView,
     SkImageInfo info =
         SkImageInfo::MakeN32(size.fWidth, size.fHeight, kPremul_SkAlphaType,
                              SkColorSpace::MakeSRGB());
-    sk_surface_ = SkSurface::MakeRaster(info, nullptr);
+    sk_surface_ = SkSurfaces::Raster(info, nullptr);
 
     if (sk_surface_ == nullptr) {
       FML_LOG(ERROR)
@@ -128,6 +263,7 @@ class TesterPlatformView : public PlatformView,
 
  private:
   sk_sp<SkSurface> sk_surface_ = nullptr;
+  [[maybe_unused]] ImpellerVulkanContextHolder impeller_context_holder_;
   std::shared_ptr<TesterExternalViewEmbedder> external_view_embedder_ =
       std::make_shared<TesterExternalViewEmbedder>();
 };
@@ -219,8 +355,8 @@ int RunTester(const flutter::Settings& settings,
 
   if (multithreaded) {
     threadhost = std::make_unique<ThreadHost>(
-        thread_label, ThreadHost::Type::Platform | ThreadHost::Type::IO |
-                          ThreadHost::Type::UI | ThreadHost::Type::RASTER);
+        thread_label, ThreadHost::Type::kPlatform | ThreadHost::Type::kIo |
+                          ThreadHost::Type::kUi | ThreadHost::Type::kRaster);
     platform_task_runner = current_task_runner;
     raster_task_runner = threadhost->raster_thread->GetTaskRunner();
     ui_task_runner = threadhost->ui_thread->GetTaskRunner();
@@ -237,23 +373,37 @@ int RunTester(const flutter::Settings& settings,
                                           io_task_runner         // io
   );
 
+  ImpellerVulkanContextHolder impeller_context_holder;
+
+#if ALLOW_IMPELLER
+  if (settings.enable_impeller) {
+    if (!impeller_context_holder.Initialize(
+            settings.enable_vulkan_validation)) {
+      return EXIT_FAILURE;
+    }
+  }
+#endif  // ALLOW_IMPELLER
+
   Shell::CreateCallback<PlatformView> on_create_platform_view =
-      [](Shell& shell) {
-        return std::make_unique<TesterPlatformView>(shell,
-                                                    shell.GetTaskRunners());
-      };
+      fml::MakeCopyable([impeller_context_holder = std::move(
+                             impeller_context_holder)](Shell& shell) mutable {
+        return std::make_unique<TesterPlatformView>(
+            shell, shell.GetTaskRunners(), std::move(impeller_context_holder));
+      });
 
   Shell::CreateCallback<Rasterizer> on_create_rasterizer = [](Shell& shell) {
     return std::make_unique<Rasterizer>(
         shell, Rasterizer::MakeGpuImageBehavior::kBitmap);
   };
 
-  auto shell = Shell::Create(flutter::PlatformData(),  //
-                             task_runners,             //
-                             settings,                 //
-                             on_create_platform_view,  //
-                             on_create_rasterizer      //
-  );
+  g_shell->reset(Shell::Create(flutter::PlatformData(),  //
+                               task_runners,             //
+                               settings,                 //
+                               on_create_platform_view,  //
+                               on_create_rasterizer      //
+                               )
+                     .release());
+  auto shell = g_shell->get();
 
   if (!shell || !shell->IsSetup()) {
     FML_LOG(ERROR) << "Could not set up the shell.";
@@ -343,11 +493,7 @@ int RunTester(const flutter::Settings& settings,
                      }
                    });
 
-  flutter::ViewportMetrics metrics{};
-  metrics.device_pixel_ratio = 3.0;
-  metrics.physical_width = 2400.0;   // 800 at 3x resolution.
-  metrics.physical_height = 1800.0;  // 600 at 3x resolution.
-  shell->GetPlatformView()->SetViewportMetrics(metrics);
+  ConfigureShell(shell);
 
   // Run the message loop and wait for the script to do its thing.
   fml::MessageLoop::GetCurrent().Run();
@@ -357,6 +503,8 @@ int RunTester(const flutter::Settings& settings,
   fml::TaskRunner::RunNowOrPostTask(ui_task_runner, task_observer_remove);
   latch.Wait();
 
+  delete g_shell->release();
+
   if (!engine_did_run) {
     // If the engine itself didn't have a chance to run, there is no point in
     // asking it if there was an error. Signal a failure unconditionally.
@@ -366,6 +514,107 @@ int RunTester(const flutter::Settings& settings,
   return completion_observer.GetExitCodeForLastError();
 }
 
+#ifdef _WIN32
+#define EXPORTED __declspec(dllexport)
+#else
+#define EXPORTED __attribute__((visibility("default")))
+#endif
+
+extern "C" {
+EXPORTED Dart_Handle LoadLibraryFromKernel(const char* path) {
+  std::shared_ptr<fml::FileMapping> mapping =
+      fml::FileMapping::CreateReadOnly(path);
+  if (!mapping) {
+    return Dart_Null();
+  }
+  return DartIsolate::LoadLibraryFromKernel(mapping);
+}
+
+EXPORTED Dart_Handle LookupEntryPoint(const char* uri, const char* name) {
+  if (!uri || !name) {
+    return Dart_Null();
+  }
+  Dart_Handle lib = Dart_LookupLibrary(Dart_NewStringFromCString(uri));
+  if (Dart_IsError(lib)) {
+    return lib;
+  }
+  return Dart_GetField(lib, Dart_NewStringFromCString(name));
+}
+
+EXPORTED void Spawn(const char* entrypoint, const char* route) {
+  auto shell = g_shell->get();
+  auto isolate = Dart_CurrentIsolate();
+  auto spawn_task = [shell, entrypoint = std::string(entrypoint),
+                     route = std::string(route)]() {
+    auto configuration = RunConfiguration::InferFromSettings(
+        shell->GetSettings(), /*io_worker=*/nullptr,
+        /*launch_type=*/IsolateLaunchType::kExistingGroup);
+    configuration.SetEntrypoint(entrypoint);
+
+    Shell::CreateCallback<PlatformView> on_create_platform_view =
+        fml::MakeCopyable([](Shell& shell) mutable {
+          ImpellerVulkanContextHolder impeller_context_holder;
+          return std::make_unique<TesterPlatformView>(
+              shell, shell.GetTaskRunners(),
+              std::move(impeller_context_holder));
+        });
+
+    Shell::CreateCallback<Rasterizer> on_create_rasterizer = [](Shell& shell) {
+      return std::make_unique<Rasterizer>(
+          shell, Rasterizer::MakeGpuImageBehavior::kBitmap);
+    };
+
+    // Spawn a shell, and keep it running until it has no live ports, then
+    // delete it on the platform thread.
+    auto spawned_shell =
+        shell
+            ->Spawn(std::move(configuration), route, on_create_platform_view,
+                    on_create_rasterizer)
+            .release();
+
+    ConfigureShell(spawned_shell);
+
+    fml::TaskRunner::RunNowOrPostTask(
+        spawned_shell->GetTaskRunners().GetUITaskRunner(), [spawned_shell]() {
+          fml::MessageLoop::GetCurrent().AddTaskObserver(
+              reinterpret_cast<intptr_t>(spawned_shell), [spawned_shell]() {
+                if (spawned_shell->EngineHasLivePorts()) {
+                  return;
+                }
+
+                fml::MessageLoop::GetCurrent().RemoveTaskObserver(
+                    reinterpret_cast<intptr_t>(spawned_shell));
+                // Shell must be deleted on the platform task runner.
+                fml::TaskRunner::RunNowOrPostTask(
+                    spawned_shell->GetTaskRunners().GetPlatformTaskRunner(),
+                    [spawned_shell]() { delete spawned_shell; });
+              });
+        });
+  };
+  Dart_ExitIsolate();
+  // The global shell pointer is never deleted, short of application exit.
+  // This UI task runner cannot be latched because it will block spawning a new
+  // shell in the case where flutter_tester is running multithreaded.
+  fml::TaskRunner::RunNowOrPostTask(
+      shell->GetTaskRunners().GetPlatformTaskRunner(), spawn_task);
+
+  Dart_EnterIsolate(isolate);
+}
+
+EXPORTED void ForceShutdownIsolate() {
+  // Enable Isolate.exit().
+  FML_DCHECK(Dart_CurrentIsolate() != nullptr);
+  Dart_Handle isolate_lib = Dart_LookupLibrary(tonic::ToDart("dart:isolate"));
+  FML_CHECK(!tonic::CheckAndHandleError(isolate_lib));
+  Dart_Handle isolate_type = Dart_GetNonNullableType(
+      isolate_lib, tonic::ToDart("Isolate"), 0, nullptr);
+  FML_CHECK(!tonic::CheckAndHandleError(isolate_type));
+  Dart_Handle result =
+      Dart_SetField(isolate_type, tonic::ToDart("_mayExit"), Dart_True());
+  FML_CHECK(!tonic::CheckAndHandleError(result));
+}
+}
+
 }  // namespace flutter
 
 int main(int argc, char* argv[]) {
@@ -391,6 +640,8 @@ int main(int argc, char* argv[]) {
     return EXIT_FAILURE;
   }
 
+  settings.leak_vm = false;
+
   if (settings.icu_data_path.empty()) {
     settings.icu_data_path = "icudtl.dat";
   }
diff --git a/shell/version/version.gni b/shell/version/version.gni
index d397b9c8704fa63250fc8f50e54b21ed6bea45bf..39fa27d3636bc93511d1a5daf958e5748f25e244 100644
--- a/shell/version/version.gni
+++ b/shell/version/version.gni
@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//flutter/build/dart/dart.gni")
+
 declare_args() {
   engine_version = "1a65d409c7a1438a34d21b60bf30a6fd5db59314"
   skia_version = "7e1844439eaa3eb24d00c6314ddc81ca532fdd1b"
@@ -10,39 +12,6 @@ declare_args() {
 
 _flutter_root = "//flutter"
 
-if (engine_version == "") {
-  engine_version_lines =
-      exec_script("//flutter/build/git_revision.py",
-                  [
-                    "--repository",
-                    rebase_path(_flutter_root, "", _flutter_root),
-                  ],
-                  "list lines")
-  engine_version = engine_version_lines[0]
-}
-
-if (skia_version == "") {
-  skia_version_lines =
-      exec_script("//flutter/build/git_revision.py",
-                  [
-                    "--repository",
-                    rebase_path("//third_party/skia", "", _flutter_root),
-                  ],
-                  "list lines")
-  skia_version = skia_version_lines[0]
-}
-
-if (dart_version == "") {
-  dart_version_lines =
-      exec_script("//flutter/build/git_revision.py",
-                  [
-                    "--repository",
-                    rebase_path("//third_party/dart", "", _flutter_root),
-                  ],
-                  "list lines")
-  dart_version = dart_version_lines[0]
-}
-
-print("engine_version:"+engine_version)
-print("dart_version:"+dart_version)
-print("skia_version:"+skia_version)
+assert(engine_version != "", "The engine_version argument must be supplied")
+assert(skia_version != "", "The skia_version argument must be supplied")
+assert(dart_version != "", "The dart_version argument must be supplied")
diff --git a/shell/version/version.h b/shell/version/version.h
index cbf3357d6a1ea43f32adb8a4be0c5ea48795944f..66fbdc75a0e1f43e7655eeb564e0dab6222f2a6e 100644
--- a/shell/version/version.h
+++ b/shell/version/version.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_SHELL_COMMON_VERSION_H_
-#define FLUTTER_SHELL_COMMON_VERSION_H_
+#ifndef FLUTTER_SHELL_VERSION_VERSION_H_
+#define FLUTTER_SHELL_VERSION_VERSION_H_
 
 namespace flutter {
 
@@ -15,4 +15,4 @@ const char* GetDartVersion();
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_COMMON_VERSION_H_
+#endif  // FLUTTER_SHELL_VERSION_VERSION_H_
diff --git a/shell/vmservice/pubspec.yaml b/shell/vmservice/pubspec.yaml
index 7c1f613b34059658476baf4e4b6727afd60ef2fa..c3cffd9d83aad88357ddc16665c5ffdd8bf43aad 100644
--- a/shell/vmservice/pubspec.yaml
+++ b/shell/vmservice/pubspec.yaml
@@ -5,4 +5,4 @@
 name: vmservice_snapshot
 publish_to: none
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=3.2.0-0 <4.0.0'
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..ad99fce2db9287b4bded519ad3779983e635b6f8
--- /dev/null
+++ b/skia/BUILD.gn
@@ -0,0 +1,813 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+_skia_root = "//flutter/third_party/skia"
+
+import("$_skia_root/gn/shared_sources.gni")
+import("$_skia_root/gn/skia.gni")
+import("$_skia_root/gn/toolchain/wasm.gni")
+import("flutter_defines.gni")
+
+if (is_fuchsia) {
+  import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
+}
+
+# Skia public API, generally provided by :skia.
+config("skia_public") {
+  include_dirs = [ "$_skia_root" ]
+
+  defines = [
+    "SK_CODEC_DECODES_BMP",
+    "SK_CODEC_DECODES_WBMP",
+  ]
+  defines += flutter_defines
+
+  cflags_objcc = []
+  if (is_fuchsia || is_linux) {
+    defines += [ "SK_R32_SHIFT=16" ]
+  }
+
+  # TODO(zra): Try using this.
+  if (skia_enable_optimize_size) {
+    defines += [
+      "SK_ENABLE_OPTIMIZE_SIZE",
+      "SK_FORCE_AAA",
+    ]
+  }
+  if (skia_enable_precompile) {
+    defines += [ "SK_ENABLE_PRECOMPILE" ]
+  }
+  if (is_wasm) {
+    defines += wasm_defines
+  }
+  if (skia_gl_standard == "gles") {
+    defines += [ "SK_ASSUME_GL_ES=1" ]
+  } else if (skia_gl_standard == "gl") {
+    defines += [ "SK_ASSUME_GL=1" ]
+  } else if (skia_gl_standard == "webgl") {
+    defines += [
+      "SK_ASSUME_WEBGL=1",
+      "SK_USE_WEBGL",
+    ]
+  }
+  if (skia_enable_ganesh) {
+    defines += [ "SK_GANESH" ]
+  }
+
+  # TODO(zra): Try turning this off.
+  if (skia_use_perfetto) {
+    defines += [ "SK_USE_PERFETTO" ]
+  }
+
+  # Some older versions of the Clang toolchain change the visibility of
+  # symbols decorated with API_AVAILABLE macro to be visible. Users of such
+  # toolchains suppress the use of this macro till toolchain updates are made.
+  if (is_mac || is_ios) {
+    cflags_objcc += [ "-Wno-unguarded-availability" ]
+  }
+}
+
+# Skia internal APIs, used by Skia itself and a few test tools.
+config("skia_private") {
+  visibility = [ "./*" ]
+
+  defines = [ "SK_GAMMA_APPLY_TO_A8" ]
+  if (skia_use_fixed_gamma_text) {
+    defines += [
+      "SK_GAMMA_EXPONENT=1.4",
+      "SK_GAMMA_CONTRAST=0.0",
+    ]
+  }
+  libs = []
+  lib_dirs = []
+  if (skia_use_vma) {
+    defines += [ "SK_USE_VMA" ]
+  }
+}
+
+# Any code that's linked into Skia-the-library should use this config
+# via += skia_library_configs.
+config("skia_library") {
+  visibility = [ "./*" ]
+  defines = [ "SKIA_IMPLEMENTATION=1" ]
+}
+
+skia_library_configs = [
+  ":skia_public",
+  ":skia_private",
+  ":skia_library",
+]
+
+# Use for CPU-specific Skia code that needs particular compiler flags.
+template("opts") {
+  if (invoker.enabled) {
+    skia_source_set(target_name) {
+      visibility = [ ":*" ]
+      check_includes = false
+      configs = skia_library_configs
+      forward_variables_from(invoker, "*")
+      if (defined(invoker.configs)) {
+        configs += invoker.configs
+      }
+    }
+  } else {
+    # If not enabled, a phony empty target that swallows all otherwise unused
+    # variables.
+    skia_source_set(target_name) {
+      visibility = [ ":*" ]
+      check_includes = false
+      forward_variables_from(invoker,
+                             "*",
+                             [
+                               "sources",
+                               "cflags",
+                             ])
+    }
+  }
+}
+
+is_x86 = current_cpu == "x64" || current_cpu == "x86"
+
+opts("hsw") {
+  enabled = is_x86
+  sources = skia_opts.hsw_sources
+  if (is_win) {
+    cflags = [ "/arch:AVX2" ]
+  } else {
+    cflags = [ "-march=haswell" ]
+  }
+}
+
+# Any feature of Skia that requires third-party code should be optional and use
+# this template.
+template("optional") {
+  if (invoker.enabled) {
+    config(target_name + "_public") {
+      if (defined(invoker.public_defines)) {
+        defines = invoker.public_defines
+      }
+      if (defined(invoker.public_configs)) {
+        configs = invoker.public_configs
+      }
+      if (defined(invoker.public_include_dirs)) {
+        include_dirs = invoker.public_include_dirs
+      }
+    }
+    skia_source_set(target_name) {
+      visibility = [ ":*" ]
+
+      # Opted out of check_includes, due to (logically) being part of skia.
+      check_includes = false
+      configs = skia_library_configs
+
+      # "*" clobbers the current scope; append to existing configs
+      forward_variables_from(invoker,
+                             "*",
+                             [
+                               "configs",
+                               "public_defines",
+                               "sources_for_tests",
+                               "sources_when_disabled",
+                             ])
+      if (defined(invoker.configs)) {
+        configs += invoker.configs
+      }
+      all_dependent_configs = [ ":" + target_name + "_public" ]
+    }
+  } else {
+    skia_source_set(target_name) {
+      visibility = [ ":*" ]
+      configs = skia_library_configs
+
+      # "*" clobbers the current scope; append to existing configs
+      forward_variables_from(invoker,
+                             "*",
+                             [
+                               "configs",
+                               "public",
+                               "public_defines",
+                               "public_deps",
+                               "deps",
+                               "libs",
+                               "frameworks",
+                               "sources",
+                               "sources_for_tests",
+                               "sources_when_disabled",
+                             ])
+      if (defined(invoker.configs)) {
+        configs += invoker.configs
+      }
+      if (defined(invoker.sources_when_disabled)) {
+        sources = invoker.sources_when_disabled
+      }
+    }
+    if (defined(invoker.sources_for_tests)) {
+      skia_source_set(target_name + "_tests") {
+        visibility = [ ":*" ]
+      }
+    }
+  }
+}
+
+optional("fontmgr_android") {
+  enabled = skia_enable_fontmgr_android
+  public_defines = [ "SK_FONTMGR_ANDROID_AVAILABLE" ]
+
+  deps = [
+    ":typeface_freetype",
+    "//flutter/third_party/expat",
+  ]
+  public = [ "$_skia_root/include/ports/SkFontMgr_android.h" ]
+  sources = [
+    "$_skia_root/src/ports/SkFontMgr_android.cpp",
+    "$_skia_root/src/ports/SkFontMgr_android_parser.cpp",
+    "$_skia_root/src/ports/SkFontMgr_android_parser.h",
+  ]
+}
+
+optional("fontmgr_ohos") {
+  enabled = skia_enable_fontmgr_ohos
+  deps = [
+    ":typeface_freetype",
+    "//flutter/third_party/expat",
+    "//third_party/jsoncpp:jsoncpp",
+  ]
+  public = [
+    "$_skia_root/src/ports/skia_ohos/FontConfig_ohos.h",
+    "$_skia_root/src/ports/skia_ohos/FontInfo_ohos.h",
+    "$_skia_root/src/ports/skia_ohos/SkFontMgr_ohos.h",
+    "$_skia_root/src/ports/skia_ohos/SkFontStyleSet_ohos.h",
+    "$_skia_root/src/ports/skia_ohos/SkTypeface_ohos.h",
+  ]
+  sources = [
+    "$_skia_root/src/ports/skia_ohos/FontConfig_ohos.cpp",
+    "$_skia_root/src/ports/skia_ohos/SkFontMgr_ohos.cpp",
+    "$_skia_root/src/ports/skia_ohos/SkFontStyleSet_ohos.cpp",
+    "$_skia_root/src/ports/skia_ohos/SkTypeface_ohos.cpp",
+    "//flutter/third_party/vulkan-deps/spirv-headers/src/tools/buildHeaders/jsoncpp/dist/jsoncpp.cpp",
+  ]
+  include_dirs = [
+    "$_skia_root/include/private",
+    "$_skia_root/include/private/base",
+    "$_skia_root/include/ports",
+    "$_skia_root/include/core",
+    "$_skia_root/src/core",
+    "$_skia_root/src/ports",
+    "$_skia_root/src/ports/skia_ohos",
+    "$_skia_root/src/core/SkFontDescriptor.h",
+    "//flutter/third_party/vulkan-deps/spirv-headers/src/tools/buildHeaders/jsoncpp/dist/",
+  ]
+}
+
+optional("fontmgr_custom") {
+  enabled =
+      skia_enable_fontmgr_custom_directory ||
+      skia_enable_fontmgr_custom_embedded || skia_enable_fontmgr_custom_empty
+
+  deps = [ ":typeface_freetype" ]
+  public = [ "$_skia_root/src/ports/SkFontMgr_custom.h" ]
+  sources = [ "$_skia_root/src/ports/SkFontMgr_custom.cpp" ]
+}
+
+optional("fontmgr_custom_directory") {
+  enabled = skia_enable_fontmgr_custom_directory
+  public_defines = [ "SK_FONTMGR_FREETYPE_DIRECTORY_AVAILABLE" ]
+  deps = [
+    ":fontmgr_custom",
+    ":typeface_freetype",
+  ]
+  public = [ "$_skia_root/include/ports/SkFontMgr_directory.h" ]
+  sources = [ "$_skia_root/src/ports/SkFontMgr_custom_directory.cpp" ]
+}
+
+optional("fontmgr_custom_embedded") {
+  enabled = skia_enable_fontmgr_custom_embedded
+  public_defines = [ "SK_FONTMGR_FREETYPE_EMBEDDED_AVAILABLE" ]
+
+  deps = [
+    ":fontmgr_custom",
+    ":typeface_freetype",
+  ]
+  sources = [ "$_skia_root/src/ports/SkFontMgr_custom_embedded.cpp" ]
+}
+
+optional("fontmgr_custom_empty") {
+  enabled = skia_enable_fontmgr_custom_empty
+  public_defines = [ "SK_FONTMGR_FREETYPE_EMPTY_AVAILABLE" ]
+
+  deps = [
+    ":fontmgr_custom",
+    ":typeface_freetype",
+  ]
+  public = [ "$_skia_root/include/ports/SkFontMgr_empty.h" ]
+  sources = [ "$_skia_root/src/ports/SkFontMgr_custom_empty.cpp" ]
+}
+
+optional("fontmgr_fontconfig") {
+  enabled = skia_enable_fontmgr_fontconfig
+  public_defines = [ "SK_FONTMGR_FONTCONFIG_AVAILABLE" ]
+
+  # The public header includes fontconfig.h and uses FcConfig*
+  public_deps = [ "//third_party:fontconfig" ]
+  public = [ "$_skia_root/include/ports/SkFontMgr_fontconfig.h" ]
+  deps = [ ":typeface_freetype" ]
+  sources = [ "$_skia_root/src/ports/SkFontMgr_fontconfig.cpp" ]
+}
+
+optional("fontmgr_fuchsia") {
+  enabled = skia_enable_fontmgr_fuchsia
+  public_defines = [ "SK_FONTMGR_FUCHSIA_AVAILABLE" ]
+
+  deps = []
+
+  if (is_fuchsia) {
+    deps += [ "${fuchsia_sdk}/fidl/fuchsia.fonts" ]
+  } else {
+    deps = [ "//sdk/fidl/fuchsia.fonts" ]
+  }
+  public = [ "$_skia_root/src/ports/SkFontMgr_fuchsia.h" ]
+  sources = [ "$_skia_root/src/ports/SkFontMgr_fuchsia.cpp" ]
+}
+
+optional("fontmgr_mac_ct") {
+  enabled = skia_use_fonthost_mac
+
+  public_defines = [
+    "SK_TYPEFACE_FACTORY_CORETEXT",
+    "SK_FONTMGR_CORETEXT_AVAILABLE",
+  ]
+  public = [
+    "$_skia_root/include/ports/SkFontMgr_mac_ct.h",
+    "$_skia_root/include/ports/SkTypeface_mac.h",
+  ]
+  sources = [
+    "$_skia_root/src/ports/SkFontMgr_mac_ct.cpp",
+    "$_skia_root/src/ports/SkScalerContext_mac_ct.cpp",
+    "$_skia_root/src/ports/SkScalerContext_mac_ct.h",
+    "$_skia_root/src/ports/SkTypeface_mac_ct.cpp",
+    "$_skia_root/src/ports/SkTypeface_mac_ct.h",
+  ]
+
+  if (is_mac) {
+    frameworks = [
+      # AppKit symbols NSFontWeightXXX may be dlsym'ed.
+      "AppKit.framework",
+      "ApplicationServices.framework",
+    ]
+  }
+
+  if (is_ios) {
+    frameworks = [
+      "CoreFoundation.framework",
+      "CoreGraphics.framework",
+      "CoreText.framework",
+
+      # UIKit symbols UIFontWeightXXX may be dlsym'ed.
+      "UIKit.framework",
+    ]
+  }
+}
+
+optional("fontmgr_win") {
+  enabled = skia_enable_fontmgr_win
+
+  public_defines = [
+    "SK_TYPEFACE_FACTORY_DIRECTWRITE",
+    "SK_FONTMGR_DIRECTWRITE_AVAILABLE",
+  ]
+  public = [ "$_skia_root/include/ports/SkTypeface_win.h" ]
+  sources = [
+    "$_skia_root/include/ports/SkFontMgr_indirect.h",
+    "$_skia_root/include/ports/SkRemotableFontMgr.h",
+    "$_skia_root/src/fonts/SkFontMgr_indirect.cpp",
+    "$_skia_root/src/ports/SkFontMgr_win_dw.cpp",
+    "$_skia_root/src/ports/SkScalerContext_win_dw.cpp",
+    "$_skia_root/src/ports/SkScalerContext_win_dw.h",
+    "$_skia_root/src/ports/SkTypeface_win_dw.cpp",
+    "$_skia_root/src/ports/SkTypeface_win_dw.h",
+  ]
+  if (skia_dwritecore_sdk != "") {
+    defines = [ "DWRITE_CORE" ]
+    if (is_win && is_clang) {
+      # Clang complains about these headers, so mark them as system. These
+      # headers are hiding SDK headers of the same name, which are also
+      # included as system headers, so these need to go first in the cflags
+      # "includes" before the SDK. gn appends configs in the order listed,
+      # so these flags will be first.
+      cflags = [
+        "-imsvc",
+        "${skia_dwritecore_sdk}/include",
+      ]
+    } else {
+      include_dirs = [ "${skia_dwritecore_sdk}/include" ]
+    }
+  }
+}
+
+optional("gpu_shared") {
+  enabled = skia_enable_ganesh
+
+  deps = []
+  libs = []
+  public_defines = []
+  public_deps = []
+  frameworks = []
+
+  sources = skia_shared_gpu_sources + skia_sksl_gpu_sources
+
+  if (skia_use_vulkan) {
+    public_defines += [ "SK_VULKAN" ]
+    sources += skia_shared_vk_sources
+    if (skia_enable_vulkan_debug_layers) {
+      public_defines += [ "SK_ENABLE_VK_LAYERS" ]
+    }
+    if (skia_use_vma) {
+      public_deps += [ "$_skia_root/src/gpu/vk/vulkanmemoryallocator" ]
+    }
+  }
+
+  if (skia_use_metal) {
+    public_defines += [ "SK_METAL" ]
+    sources += skia_shared_mtl_sources
+  }
+}
+
+optional("gpu") {
+  enabled = skia_enable_ganesh
+  deps = [ ":gpu_shared" ]
+  public_defines = []
+  public_configs = []
+  public_deps = []
+
+  public = skia_gpu_public
+  sources = skia_ganesh_private
+
+  libs = []
+  frameworks = []
+
+  if (is_android) {
+    sources += skia_gpu_android_private
+  }
+
+  if (skia_use_gl) {
+    public_defines += [ "SK_GL" ]
+    if (is_android) {
+      sources += [
+        "$_skia_root/src/gpu/ganesh/gl/egl/GrGLMakeEGLInterface.cpp",
+        "$_skia_root/src/gpu/ganesh/gl/egl/GrGLMakeNativeInterface_egl.cpp",
+      ]
+      sources += skia_android_gl_sources
+
+      # this lib is required to link against AHardwareBuffer
+      if (defined(ndk_api) && ndk_api >= 26) {
+        libs += [ "android" ]
+      }
+    } else if (is_ohos) {
+      sources += [
+        "$_skia_root/src/gpu/ganesh/gl/egl/GrGLMakeEGLInterface.cpp",
+        "$_skia_root/src/gpu/ganesh/gl/egl/GrGLMakeNativeInterface_egl.cpp",
+      ]
+    } else if (skia_use_webgl) {
+      sources += [
+        "$_skia_root/src/gpu/ganesh/gl/webgl/GrGLMakeNativeInterface_webgl.cpp",
+      ]
+    } else if (is_linux && skia_use_x11) {
+      sources += [
+        "$_skia_root/src/gpu/ganesh/gl/glx/GrGLMakeGLXInterface.cpp",
+        "$_skia_root/src/gpu/ganesh/gl/glx/GrGLMakeNativeInterface_glx.cpp",
+      ]
+      libs += [ "GL" ]
+    } else if (is_win) {
+      sources += [
+        "$_skia_root/src/gpu/ganesh/gl/win/GrGLMakeNativeInterface_win.cpp",
+      ]
+      if (target_cpu != "arm64") {
+        libs += [ "OpenGL32.lib" ]
+      }
+    } else {
+      sources +=
+          [ "$_skia_root/src/gpu/ganesh/gl/GrGLMakeNativeInterface_none.cpp" ]
+    }
+    public += skia_gpu_gl_public
+    sources += skia_gpu_gl_private
+  }
+
+  if (skia_use_vulkan) {
+    public += skia_gpu_vk_public
+    sources += skia_gpu_vk_private
+    if (is_fuchsia) {
+      public_deps += [ "${fuchsia_sdk}/pkg/vulkan" ]
+    }
+    if (is_android) {
+      sources += skia_gpu_vk_android_private
+    }
+  }
+
+  if (is_android && (skia_use_gl || skia_use_vulkan)) {
+    # this lib is required to link against AHardwareBuffer
+    if (defined(ndk_api) && ndk_api >= 26) {
+      libs += [ "android" ]
+    }
+  }
+
+  cflags_objcc = []
+  if (skia_use_metal) {
+    public_defines += [ "SK_METAL" ]
+    public += skia_gpu_metal_public
+    sources += skia_gpu_metal_private
+    sources += skia_gpu_metal_cpp
+    frameworks += [ "Metal.framework" ]
+    frameworks += [ "Foundation.framework" ]
+    if (is_ios) {
+      frameworks += [ "UIKit.framework" ]
+    }
+    cflags_objcc += [ "-fobjc-arc" ]
+  }
+
+  if (is_debug) {
+    public_defines += [ "SK_ENABLE_DUMP_GPU" ]
+  }
+}
+
+optional("jpeg_decode") {
+  enabled = skia_use_libjpeg_turbo_decode
+  public_defines = [ "SK_CODEC_DECODES_JPEG" ]
+
+  deps = [ "//flutter/third_party/libjpeg-turbo:libjpeg" ]
+  sources = [
+    "$_skia_root/src/codec/SkJpegCodec.cpp",
+    "$_skia_root/src/codec/SkJpegDecoderMgr.cpp",
+    "$_skia_root/src/codec/SkJpegSourceMgr.cpp",
+    "$_skia_root/src/codec/SkJpegUtility.cpp",
+  ]
+}
+
+optional("jpeg_encode") {
+  enabled = skia_use_libjpeg_turbo_encode && !skia_use_ndk_images
+
+  deps = [ "//flutter/third_party/libjpeg-turbo:libjpeg" ]
+  public = skia_encode_jpeg_public
+  sources = skia_encode_jpeg_srcs
+}
+
+optional("ndk_images") {
+  enabled = skia_use_ndk_images
+  public_defines = [ "SK_ENABLE_NDK_IMAGES" ]
+  sources = [
+    "$_skia_root/src/ports/SkImageEncoder_NDK.cpp",
+    "$_skia_root/src/ports/SkImageGeneratorNDK.cpp",
+    "$_skia_root/src/ports/SkNDKConversions.cpp",
+  ]
+  libs = [ "jnigraphics" ]
+}
+
+optional("xps") {
+  enabled = skia_use_xps && is_win
+  public_defines = [ "SK_SUPPORT_XPS" ]
+  public = skia_xps_public
+  sources = skia_xps_sources
+}
+
+optional("png_decode") {
+  enabled = skia_use_libpng_decode
+  public_defines = [
+    "SK_CODEC_DECODES_PNG",
+    "SK_CODEC_DECODES_ICO",
+  ]
+
+  deps = [ "//flutter/third_party/libpng" ]
+  sources = [
+    "$_skia_root/src/codec/SkIcoCodec.cpp",
+    "$_skia_root/src/codec/SkPngCodec.cpp",
+  ]
+}
+
+optional("png_encode") {
+  enabled = skia_use_libpng_encode && !skia_use_ndk_images
+  public = skia_encode_png_public
+
+  deps = [ "//flutter/third_party/libpng" ]
+  sources = skia_encode_png_srcs
+}
+
+optional("typeface_freetype") {
+  enabled = skia_use_freetype
+
+  public_defines = [ "SK_TYPEFACE_FACTORY_FREETYPE" ]
+  deps = [ "//flutter/third_party/freetype2" ]
+  sources = [
+    "$_skia_root/src/ports/SkFontHost_FreeType.cpp",
+    "$_skia_root/src/ports/SkFontHost_FreeType_common.cpp",
+    "$_skia_root/src/ports/SkFontHost_FreeType_common.h",
+  ]
+}
+
+optional("webp_decode") {
+  enabled = skia_use_libwebp_decode
+  public_defines = [ "SK_CODEC_DECODES_WEBP" ]
+
+  deps = [ "//flutter/third_party/libwebp" ]
+  sources = [ "$_skia_root/src/codec/SkWebpCodec.cpp" ]
+}
+
+optional("webp_encode") {
+  enabled = skia_use_libwebp_encode && !skia_use_ndk_images
+  public = skia_encode_webp_public
+
+  deps = [ "//flutter/third_party/libwebp" ]
+  sources = skia_encode_webp_srcs
+}
+
+optional("wuffs") {
+  enabled = skia_use_wuffs
+  public_defines = [
+    "SK_HAS_WUFFS_LIBRARY",  # TODO remove after rolling
+                             # http://review.skia.org/811816
+    "SK_CODEC_DECODES_GIF",
+  ]
+
+  deps = [ "//flutter/third_party/wuffs" ]
+  sources = [ "$_skia_root/src/codec/SkWuffsCodec.cpp" ]
+}
+
+optional("xml") {
+  enabled = skia_use_expat || skia_use_jpeg_gainmaps
+  public_defines = [ "SK_XML" ]
+
+  deps = [ "//flutter/third_party/expat" ]
+  sources = skia_xml_sources + skia_codec_xmp + [
+              "$_skia_root/src/svg/SkSVGCanvas.cpp",
+              "$_skia_root/src/svg/SkSVGDevice.cpp",
+            ]
+}
+
+import("$_skia_root/gn/codec.gni")
+
+skia_component("skia") {
+  public_configs = [ ":skia_public" ]
+  configs = skia_library_configs
+
+  # Opted out of check_includes, due to (logically) being part of skia.
+  check_includes = false
+
+  public_deps = [
+    ":fontmgr_android",
+    ":fontmgr_custom_directory",
+    ":fontmgr_custom_embedded",
+    ":fontmgr_custom_empty",
+    ":fontmgr_fontconfig",
+    ":fontmgr_fuchsia",
+    ":fontmgr_mac_ct",
+    ":fontmgr_ohos",
+    ":fontmgr_win",
+    ":gpu",
+    ":jpeg_encode",
+    ":png_encode",
+    ":webp_encode",
+    ":xps",
+  ]
+
+  deps = [
+    ":hsw",
+    ":jpeg_decode",
+    ":ndk_images",
+    ":png_decode",
+    ":webp_decode",
+    ":wuffs",
+    ":xml",
+    "modules/skcms",
+  ]
+
+  public = skia_core_public
+  public += skia_codec_public
+  public += skia_utils_public
+  public += skia_effects_public
+  public += skia_effects_imagefilter_public
+
+  sources = []
+  sources += skia_core_sources
+  sources += skia_utils_private
+  sources += skia_utils_chromium
+  sources += skia_effects_sources
+  sources += skia_colorfilters_sources
+  sources += skia_effects_imagefilter_sources
+  sources += skia_codec_core
+  sources += skia_codec_decode_bmp
+  sources += skia_encode_srcs
+  sources += skia_sksl_sources
+  sources += [
+    "$_skia_root/src/android/SkAndroidFrameworkUtils.cpp",
+    "$_skia_root/src/android/SkAnimatedImage.cpp",
+    "$_skia_root/src/codec/SkAndroidCodec.cpp",
+    "$_skia_root/src/codec/SkAndroidCodecAdapter.cpp",
+    "$_skia_root/src/codec/SkEncodedInfo.cpp",
+    "$_skia_root/src/codec/SkParseEncodedOrigin.cpp",
+    "$_skia_root/src/codec/SkSampledCodec.cpp",
+    "$_skia_root/src/ports/SkDiscardableMemory_none.cpp",
+    "$_skia_root/src/ports/SkGlobalInitialization_default.cpp",
+    "$_skia_root/src/ports/SkMemory_malloc.cpp",
+    "$_skia_root/src/ports/SkOSFile_stdio.cpp",
+    "$_skia_root/src/sfnt/SkOTTable_name.cpp",
+    "$_skia_root/src/sfnt/SkOTUtils.cpp",
+  ]
+
+  defines = []
+  libs = []
+
+  if (skia_use_no_jpeg_encode) {
+    sources += skia_no_encode_jpeg_srcs
+  }
+  if (skia_use_no_png_encode) {
+    sources += skia_no_encode_png_srcs
+  }
+  if (skia_use_no_webp_encode) {
+    sources += skia_no_encode_webp_srcs
+  }
+
+  if (is_win) {
+    sources += [
+      "$_skia_root/src/ports/SkDebug_win.cpp",
+      "$_skia_root/src/ports/SkImageGeneratorWIC.cpp",
+      "$_skia_root/src/ports/SkOSFile_win.cpp",
+      "$_skia_root/src/ports/SkOSLibrary_win.cpp",
+    ]
+    libs += [
+      "Ole32.lib",
+      "OleAut32.lib",
+    ]
+
+    if (!skia_enable_winuwp) {
+      libs += [
+        "FontSub.lib",
+        "User32.lib",
+        "Usp10.lib",
+      ]
+    }
+  } else {
+    sources += [
+      "$_skia_root/src/ports/SkOSFile_posix.cpp",
+      "$_skia_root/src/ports/SkOSLibrary_posix.cpp",
+    ]
+    libs += [ "dl" ]
+  }
+
+  if (is_android) {
+    deps += [ "//flutter/third_party/expat" ]
+    sources += [ "$_skia_root/src/ports/SkDebug_android.cpp" ]
+    libs += [
+      "EGL",
+      "GLESv2",
+      "log",
+    ]
+  }
+
+  if (is_ohos) {
+    sources += [ "$_skia_root/src/ports/SkDebug_ohos.cpp" ]
+    libs += [
+      "EGL",
+      "GLESv3",
+      "hilog_ndk.z",
+    ]
+    defines += [
+      "TARGET_OS_OHOS",
+      "SK_BUILD_FOR_OHOS",
+    ]
+  }
+
+  if (is_linux || is_wasm) {
+    sources += [ "$_skia_root/src/ports/SkDebug_stdio.cpp" ]
+    if (skia_use_egl) {
+      libs += [ "GLESv2" ]
+    }
+  }
+
+  if (is_mac) {
+    public += [ "$_skia_root/include/ports/SkCFObject.h" ]
+    sources += [
+      "$_skia_root/src/ports/SkDebug_stdio.cpp",
+      "$_skia_root/src/ports/SkImageGeneratorCG.cpp",
+    ]
+    frameworks = [
+      "ApplicationServices.framework",
+      "OpenGL.framework",
+    ]
+  }
+
+  if (is_ios) {
+    public += [ "$_skia_root/include/ports/SkCFObject.h" ]
+    sources += [
+      "$_skia_root/src/ports/SkDebug_stdio.cpp",
+      "$_skia_root/src/ports/SkImageGeneratorCG.cpp",
+    ]
+    frameworks = [
+      "CoreFoundation.framework",
+      "ImageIO.framework",
+      "MobileCoreServices.framework",
+    ]
+  }
+
+  if (is_fuchsia) {
+    sources += [ "$_skia_root/src/ports/SkDebug_stdio.cpp" ]
+  }
+}
diff --git a/skia/flutter_defines.gni b/skia/flutter_defines.gni
new file mode 100644
index 0000000000000000000000000000000000000000..650046f712fdf9eec6d68fa74012faeca0e35f6f
--- /dev/null
+++ b/skia/flutter_defines.gni
@@ -0,0 +1,36 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+flutter_defines = [
+  # Flutter always wants this https://github.com/flutter/flutter/issues/11402
+  "SK_ENABLE_DUMP_GPU",
+
+  # Remove software rasterizers to save some code size.
+  "SK_FORCE_AAA",
+
+  # Staging
+  "SK_LEGACY_IGNORE_DRAW_VERTICES_BLEND_WITH_NO_SHADER",
+  "SK_DISABLE_LEGACY_GRDIRECTCONTEXT_BOOLS",
+  "SK_DISABLE_LEGACY_GRDIRECTCONTEXT_FLUSH",
+  "SK_RESOLVE_FILTERS_BEFORE_RESTORE",
+
+  # Fast low-precision software rendering isn't a priority for Flutter.
+  "SK_DISABLE_LEGACY_SHADERCONTEXT",
+  "SK_DISABLE_LOWP_RASTER_PIPELINE",
+  "SK_FORCE_RASTER_PIPELINE_BLITTER",
+
+  # When running Metal, ensure that command buffers are scheduled before
+  # returning from submit.
+  "SK_METAL_WAIT_UNTIL_SCHEDULED",
+
+  # Staging for b/305780908
+  "SK_DEFAULT_TYPEFACE_IS_EMPTY",
+  "SK_DISABLE_LEGACY_DEFAULT_TYPEFACE",
+  "SK_DISABLE_LEGACY_FONTMGR_FACTORY",
+  "SK_DISABLE_LEGACY_FONTMGR_REFDEFAULT",
+]
+
+if (!is_fuchsia) {
+  flutter_defines += [ "SK_DISABLE_EFFECT_DESERIALIZATION" ]
+}
diff --git a/skia/modules/canvaskit/BUILD.gn b/skia/modules/canvaskit/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..30f40c8f8604538561e1830043a5f255d6b7fe03
--- /dev/null
+++ b/skia/modules/canvaskit/BUILD.gn
@@ -0,0 +1,222 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+_skia_root = "//flutter/third_party/skia"
+
+import("$_skia_root/gn/skia.gni")
+import("$_skia_root/gn/toolchain/wasm.gni")
+import("$_skia_root/modules/canvaskit/canvaskit.gni")
+
+# Defines a WASM library target.
+template("canvaskit_wasm_lib") {
+  _vars_to_forward = [
+    "cflags",
+    "check_includes",
+    "ldflags",
+    "defines",
+    "deps",
+    "includes",
+    "sources",
+    "include_dirs",
+    "public_configs",
+    "testonly",
+    "visibility",
+  ]
+
+  _lib_name = target_name
+
+  executable("${_lib_name}_js") {
+    forward_variables_from(invoker, _vars_to_forward)
+    output_extension = "js"
+    output_name = "${_lib_name}"
+  }
+
+  group("$_lib_name") {
+    public_deps = [ ":${_lib_name}_js" ]
+  }
+}
+
+canvaskit_wasm_lib("canvaskit") {
+  # Opted out of check_includes, due to (logically) being part of skia.
+  check_includes = false
+  deps = [ "../..:skia" ]
+  if (skia_canvaskit_enable_paragraph) {
+    deps += [
+      "../../modules/skparagraph:skparagraph",
+      "../../modules/skunicode:skunicode",
+    ]
+  }
+
+  sources = [
+    "$_skia_root/modules/canvaskit/WasmCommon.h",
+    "$_skia_root/modules/canvaskit/canvaskit_bindings.cpp",
+  ]
+  if (skia_canvaskit_enable_paragraph) {
+    sources += [
+      "$_skia_root/modules/canvaskit/paragraph_bindings.cpp",
+      "$_skia_root/modules/canvaskit/paragraph_bindings_gen.cpp",
+    ]
+  }
+
+  ldflags = []
+  if (is_debug) {
+    ldflags += [
+      "-O0",
+      "-sDEMANGLE_SUPPORT=1",
+      "-sASSERTIONS=1",
+      "-sGL_ASSERTIONS=1",
+      "-g3",
+      "--pre-js",
+      rebase_path("$_skia_root/modules/canvaskit/debug.js"),
+    ]
+  } else {
+    externs_path = rebase_path("$_skia_root/modules/canvaskit/externs.js")
+    ldflags += [
+      "-Oz",
+      "--closure=1",
+      "--pre-js",
+      rebase_path("$_skia_root/modules/canvaskit/release.js"),
+      "--closure-args=--externs=$externs_path",
+    ]
+  }
+  if (skia_canvaskit_profile_build) {
+    ldflags += [
+      "--profiling-funcs",
+      "--closure=0",
+    ]
+  }
+  ldflags += [ "-fno-rtti" ]
+
+  if (skia_canvaskit_enable_webgl) {
+    ldflags += [
+      "-lGL",
+      "--pre-js",
+      rebase_path("$_skia_root/modules/canvaskit/cpu.js"),
+      "--pre-js",
+      rebase_path("$_skia_root/modules/canvaskit/webgl.js"),
+      "-sUSE_WEBGL2=1",
+      "-sMAX_WEBGL_VERSION=2",
+    ]
+  } else {
+    ldflags += [
+      "--pre-js",
+      rebase_path("$_skia_root/modules/canvaskit/cpu.js"),
+      "-sUSE_WEBGL2=0",
+    ]
+  }
+
+  ldflags += [
+    "-std=c++17",
+    "--bind",
+    "--no-entry",
+    "--pre-js",
+    rebase_path("$_skia_root/modules/canvaskit/preamble.js"),
+    "--pre-js",
+    rebase_path("$_skia_root/modules/canvaskit/color.js"),
+    "--pre-js",
+    rebase_path("$_skia_root/modules/canvaskit/memory.js"),
+    "--pre-js",
+    rebase_path("$_skia_root/modules/canvaskit/util.js"),
+    "--pre-js",
+    rebase_path("$_skia_root/modules/canvaskit/interface.js"),
+  ]
+
+  ldflags += [
+    "--pre-js",
+    rebase_path("$_skia_root/modules/canvaskit/paragraph.js"),
+  ]
+
+  if (skia_canvaskit_enable_pathops) {
+    ldflags += [
+      "--pre-js",
+      rebase_path("$_skia_root/modules/canvaskit/pathops.js"),
+    ]
+  }
+
+  if (skia_canvaskit_enable_font) {
+    ldflags += [
+      "--pre-js",
+      rebase_path("$_skia_root/modules/canvaskit/font.js"),
+    ]
+  }
+
+  if (skia_canvaskit_enable_skp_serialization) {
+    ldflags += [
+      "--pre-js",
+      rebase_path("$_skia_root/modules/canvaskit/skp.js"),
+    ]
+  }
+
+  if (skia_canvaskit_enable_rt_shader) {
+    ldflags += [
+      "--pre-js",
+      rebase_path("$_skia_root/modules/canvaskit/rt_shader.js"),
+    ]
+  }
+
+  ldflags += [
+    "--pre-js",
+    rebase_path("$_skia_root/modules/canvaskit/postamble.js"),
+    "-sALLOW_MEMORY_GROWTH",
+    "-sDISABLE_EXCEPTION_CATCHING",
+    "-sNODEJS_CATCH_EXIT=0",
+    "-sDYNAMIC_EXECUTION=0",
+    "-sEXPORT_NAME=CanvasKitInit",
+    "-sEXPORTED_FUNCTIONS=[_malloc,_free]",
+    "-sFORCE_FILESYSTEM=0",
+    "-sFILESYSTEM=0",
+    "-sMODULARIZE",
+    "-sNO_EXIT_RUNTIME=1",
+    "-sINITIAL_MEMORY=128MB",
+    "-sWASM",
+    "-sSTRICT=1",
+  ]
+
+  defines = []
+  if (is_debug) {
+    defines += [ "SK_DEBUG" ]
+  } else {
+    defines += [ "SK_RELEASE" ]
+  }
+  if (!is_debug && !skia_canvaskit_force_tracing) {
+    defines += [ "SK_DISABLE_TRACING" ]
+  }
+  defines += [
+    "SK_FORCE_AAA",
+    "SK_FORCE_8_BYTE_ALIGNMENT",
+    "EMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=0",
+    "SK_SHAPER_HARFBUZZ_AVAILABLE",
+  ]
+  if (skia_canvaskit_enable_paragraph) {
+    defines += [ "CK_INCLUDE_PARAGRAPH" ]
+  }
+  if (skia_canvaskit_enable_skp_serialization) {
+    defines += [ "CK_SERIALIZE_SKP" ]
+  }
+  if (skia_enable_ganesh) {
+    defines += [
+      "SK_GANESH",
+      "SK_DISABLE_LEGACY_SHADERCONTEXT",
+    ]
+    if (skia_canvaskit_enable_webgl) {
+      defines += [
+        "SK_GL",
+        "CK_ENABLE_WEBGL",
+      ]
+    }
+  }
+
+  if (skia_canvaskit_enable_pathops) {
+    defines += [ "CK_INCLUDE_PATHOPS" ]
+  }
+  if (skia_canvaskit_enable_rt_shader) {
+    defines += [ "CK_INCLUDE_RUNTIME_EFFECT" ]
+  }
+  if (!skia_canvaskit_enable_alias_font) {
+    defines += [ "CK_NO_ALIAS_FONT" ]
+  }
+  if (!skia_canvaskit_enable_font) {
+    defines += [ "CK_NO_FONTS" ]
+  }
+}
diff --git a/skia/modules/skcms/BUILD.gn b/skia/modules/skcms/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..b9734c2485d769b5d202b203025dca3794950e54
--- /dev/null
+++ b/skia/modules/skcms/BUILD.gn
@@ -0,0 +1,101 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+_skia_root = "//flutter/third_party/skia"
+
+import("$_skia_root/modules/skcms/skcms.gni")
+
+# Use for CPU-specific skcms transform code that needs particular compiler flags.
+# (This is patterned after `opts` in Skia's BUILD.gn.)
+template("arch") {
+  if (invoker.enabled) {
+    source_set(target_name) {
+      visibility = [ ":*" ]
+      check_includes = false
+      forward_variables_from(invoker, "*")
+    }
+  } else {
+    # If not enabled, a phony empty target that swallows all otherwise unused variables.
+    source_set(target_name) {
+      visibility = [ ":*" ]
+      check_includes = false
+      forward_variables_from(invoker,
+                             "*",
+                             [
+                               "sources",
+                               "cflags",
+                               "defines",
+                             ])
+    }
+  }
+}
+
+arch("skcms_TransformHsw") {
+  enabled = current_cpu == "x64" && target_os != "android"
+  sources = skcms_TransformHsw
+  if (is_win) {
+    if (is_clang) {
+      cflags = [
+        "/clang:-mavx2",
+        "/clang:-mf16c",
+        "/clang:-ffp-contract=off",
+      ]
+    } else {
+      cflags = [ "/arch:AVX2" ]
+    }
+  } else {
+    cflags = [
+      "-mavx2",
+      "-mf16c",
+      "-std=c11",
+    ]
+  }
+}
+
+arch("skcms_TransformSkx") {
+  enabled = current_cpu == "x64" && target_os != "android"
+  sources = skcms_TransformSkx
+  if (is_win) {
+    if (is_clang) {
+      cflags = [
+        "/clang:-mavx512f",
+        "/clang:-mavx512dq",
+        "/clang:-mavx512cd",
+        "/clang:-mavx512bw",
+        "/clang:-mavx512vl",
+        "/clang:-ffp-contract=off",
+      ]
+    } else {
+      cflags = [ "/arch:AVX512" ]
+    }
+  } else {
+    cflags = [
+      "-mavx512f",
+      "-mavx512dq",
+      "-mavx512cd",
+      "-mavx512bw",
+      "-mavx512vl",
+      "-std=c11",
+    ]
+  }
+}
+
+static_library("skcms") {
+  cflags = []
+  if (!is_win || is_clang) {
+    cflags += [ "-std=c11" ]
+  }
+  if (target_cpu != "x64" || target_os == "android") {
+    defines = [
+      "SKCMS_DISABLE_HSW",
+      "SKCMS_DISABLE_SKX",
+    ]
+  }
+  public = skcms_public_headers
+  sources = skcms_public + skcms_TransformBaseline
+  deps = [
+    ":skcms_TransformHsw",
+    ":skcms_TransformSkx",
+  ]
+}
diff --git a/skia/modules/skparagraph/BUILD.gn b/skia/modules/skparagraph/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..69c65e6d9c5675ca2d70fbee2d069828688ab18b
--- /dev/null
+++ b/skia/modules/skparagraph/BUILD.gn
@@ -0,0 +1,40 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+_skia_root = "//flutter/third_party/skia"
+
+import("$_skia_root/gn/skia.gni")
+import("$_skia_root/modules/skparagraph/skparagraph.gni")
+import("$_skia_root/modules/skshaper/skshaper.gni")
+import("$_skia_root/modules/skunicode/skunicode.gni")
+
+declare_args() {
+  skia_enable_skparagraph = true
+  paragraph_gms_enabled = true
+  paragraph_tests_enabled = true
+  paragraph_bench_enabled = false
+}
+
+config("public_config") {
+  defines = [ "SK_ENABLE_PARAGRAPH" ]
+  include_dirs = [
+    "$_skia_root/modules/skparagraph/include",
+    "$_skia_root/modules/skparagraph/utils",
+  ]
+}
+
+skia_component("skparagraph") {
+  import("$_skia_root/modules/skparagraph/skparagraph.gni")
+
+  # Opted out of check_includes, due to (logically) being part of skia.
+  check_includes = false
+  public_configs = [ ":public_config" ]
+  public = skparagraph_public
+  sources = skparagraph_sources
+  public_deps = [
+    "../..:skia",
+    "../skunicode",
+  ]
+  deps = [ "../skshaper" ]
+}
diff --git a/skia/modules/skshaper/BUILD.gn b/skia/modules/skshaper/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..751df430fc8c2c9fbf2961fcc9e3fde5e958524c
--- /dev/null
+++ b/skia/modules/skshaper/BUILD.gn
@@ -0,0 +1,62 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+_skia_root = "//flutter/third_party/skia"
+
+import("$_skia_root/gn/skia.gni")
+import("$_skia_root/modules/skshaper/skshaper.gni")
+
+if (skia_enable_skshaper) {
+  config("public_config") {
+    include_dirs = [ "$_skia_root/modules/skshaper/include" ]
+    defines = []
+    if (skia_use_fonthost_mac) {
+      defines += [ "SK_SHAPER_CORETEXT_AVAILABLE" ]
+    }
+    if (skia_use_harfbuzz) {
+      defines += [ "SK_SHAPER_HARFBUZZ_AVAILABLE" ]
+    }
+    if (skia_enable_skunicode) {
+      defines += [ "SK_SHAPER_UNICODE_AVAILABLE" ]
+    }
+  }
+
+  component("skshaper") {
+    # Opted out of check_includes, due to (logically) being part of skia.
+    check_includes = false
+    public_configs = [ ":public_config" ]
+    public = skia_shaper_public
+    deps = [ "../..:skia" ]
+    defines = [ "SKSHAPER_IMPLEMENTATION=1" ]
+    sources = skia_shaper_primitive_sources
+    if (skia_use_fonthost_mac) {
+      sources += skia_shaper_coretext_sources
+      if (is_mac) {
+        frameworks = [ "ApplicationServices.framework" ]
+      }
+
+      if (is_ios) {
+        frameworks = [
+          "CoreFoundation.framework",
+          "CoreText.framework",
+        ]
+      }
+    }
+    if (skia_enable_skunicode) {
+      sources += skia_shaper_skunicode_sources
+      deps += [ "../skunicode" ]
+    }
+    if (skia_use_harfbuzz && skia_enable_skunicode) {
+      sources += skia_shaper_harfbuzz_sources
+      deps += [
+        "../skunicode",
+        "//flutter/third_party/harfbuzz",
+      ]
+    }
+    configs += [ "../../:skia_private" ]
+  }
+} else {
+  group("skshaper") {
+  }
+}
diff --git a/skia/modules/skunicode/BUILD.gn b/skia/modules/skunicode/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..8cb8013f1971f032563ede439cb7463daa4ad2de
--- /dev/null
+++ b/skia/modules/skunicode/BUILD.gn
@@ -0,0 +1,75 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+_skia_root = "//flutter/third_party/skia"
+
+import("$_skia_root/gn/skia.gni")
+import("$_skia_root/modules/skunicode/skunicode.gni")
+
+declare_args() {
+  skia_use_runtime_icu = false
+  skunicode_tests_enabled = true
+}
+
+if (skia_use_icu || skia_use_client_icu || skia_use_libgrapheme) {
+  config("public_config") {
+    include_dirs = [ "$_skia_root/modules/skunicode/include" ]
+    defines = [ "SK_UNICODE_AVAILABLE" ]
+    if (skia_use_icu) {
+      defines += [ "SK_UNICODE_ICU_IMPLEMENTATION" ]
+    }
+    if (skia_use_client_icu) {
+      defines += [ "SK_UNICODE_CLIENT_IMPLEMENTATION" ]
+    }
+    if (skia_use_libgrapheme) {
+      defines += [ "SK_UNICODE_LIBGRAPHEME_IMPLEMENTATION" ]
+    }
+  }
+
+  component("skunicode") {
+    # Opted out of check_includes, due to (logically) being part of skia.
+    check_includes = false
+    public_configs = [ ":public_config" ]
+    public = skia_unicode_public
+    deps = [ "../..:skia" ]
+    defines = [ "SKUNICODE_IMPLEMENTATION=1" ]
+    sources = skia_unicode_sources + skia_unicode_icu_bidi_sources
+    defines += [ "SK_UNICODE_AVAILABLE" ]
+    configs += [ "../../:skia_private" ]
+
+    if (skia_use_icu) {
+      sources += skia_unicode_icu_sources
+      sources += skia_unicode_bidi_full_sources
+      defines += [ "SK_UNICODE_ICU_IMPLEMENTATION" ]
+
+      # only available for Android at the moment
+      if (skia_use_runtime_icu && (is_android || is_linux)) {
+        sources += skia_unicode_runtime_icu_sources
+        deps += [ "//flutter/third_party/icu:headers" ]
+      } else {
+        sources += skia_unicode_builtin_icu_sources
+        deps += [ "//flutter/third_party/icu" ]
+      }
+      configs += [ "$_skia_root/third_party/icu/config:no_cxx" ]
+    }
+    if (skia_use_client_icu || skia_use_libgrapheme) {
+      sources += skia_unicode_bidi_subset_sources
+      deps += [ skia_icu_bidi_third_party_dir ]
+    }
+    if (skia_use_client_icu) {
+      sources += skia_unicode_client_icu_sources
+      defines += [ "SK_UNICODE_CLIENT_IMPLEMENTATION" ]
+    }
+    if (skia_use_libgrapheme) {
+      sources += skia_unicode_libgrapheme_sources
+      defines += [ "SK_UNICODE_LIBGRAPHEME_IMPLEMENTATION" ]
+      deps += [ skia_libgrapheme_third_party_dir ]
+    }
+  }
+} else {
+  group("skunicode") {
+  }
+  group("tests") {
+  }
+}
diff --git a/sky/dist/BUILD.gn b/sky/dist/BUILD.gn
index 54ffa42932cfa823afb0e7ff7778c46cae25da72..cd59f0133a3fe5ed29aff650fed33ae75e64f037 100644
--- a/sky/dist/BUILD.gn
+++ b/sky/dist/BUILD.gn
@@ -21,10 +21,7 @@ if (is_android) {
       rebase_path(dest),
     ]
 
-    deps = [
-      "//flutter/sky/packages/sky_engine",
-      "//flutter/sky/packages/sky_engine:sky_engine_pkg_helper",
-    ]
+    deps = [ "//flutter/sky/packages/sky_engine" ]
   }
 
   zip_bundle("zip") {
diff --git a/sky/packages/sky_engine/BUILD.gn b/sky/packages/sky_engine/BUILD.gn
index 88e059a8dae0846c7de651459376a99f11b21a40..bcef48988934258236da5a10f94fa0648ca5ed42 100644
--- a/sky/packages/sky_engine/BUILD.gn
+++ b/sky/packages/sky_engine/BUILD.gn
@@ -2,29 +2,34 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/fuchsia/sdk.gni")
 import("//flutter/build/dart/rules.gni")
 import("//flutter/lib/ui/dart_ui.gni")
-import("//third_party/dart/sdk/lib/_http/http_sources.gni")
-import(
-    "//third_party/dart/sdk/lib/_internal/js_runtime/interceptors_sources.gni")
-import("//third_party/dart/sdk/lib/async/async_sources.gni")
-import("//third_party/dart/sdk/lib/collection/collection_sources.gni")
-import("//third_party/dart/sdk/lib/convert/convert_sources.gni")
-import("//third_party/dart/sdk/lib/core/core_sources.gni")
-import("//third_party/dart/sdk/lib/developer/developer_sources.gni")
-import("//third_party/dart/sdk/lib/ffi/ffi_sources.gni")
-import("//third_party/dart/sdk/lib/html/html_sources.gni")
-import("//third_party/dart/sdk/lib/internal/internal_sources.gni")
-import("//third_party/dart/sdk/lib/io/io_sources.gni")
-import("//third_party/dart/sdk/lib/isolate/isolate_sources.gni")
-import("//third_party/dart/sdk/lib/js/js_sources.gni")
-import("//third_party/dart/sdk/lib/js_util/js_util_sources.gni")
-import("//third_party/dart/sdk/lib/math/math_sources.gni")
-import("//third_party/dart/sdk/lib/typed_data/typed_data_sources.gni")
-import("//third_party/dart/sdk/lib/wasm/wasm_sources.gni")
-
-if (!is_fuchsia) {
+import("//flutter/web_sdk/web_sdk.gni")
+import("$dart_src/sdk/lib/_http/http_sources.gni")
+import("$dart_src/sdk/lib/_internal/js_runtime/interceptors_sources.gni")
+import("$dart_src/sdk/lib/_internal/js_shared/js_types_sources.gni")
+import("$dart_src/sdk/lib/_internal/vm/lib/vm_internal.gni")
+import("$dart_src/sdk/lib/async/async_sources.gni")
+import("$dart_src/sdk/lib/collection/collection_sources.gni")
+import("$dart_src/sdk/lib/convert/convert_sources.gni")
+import("$dart_src/sdk/lib/core/core_sources.gni")
+import("$dart_src/sdk/lib/developer/developer_sources.gni")
+import("$dart_src/sdk/lib/ffi/ffi_sources.gni")
+import("$dart_src/sdk/lib/html/html_sources.gni")
+import("$dart_src/sdk/lib/internal/internal_sources.gni")
+import("$dart_src/sdk/lib/io/io_sources.gni")
+import("$dart_src/sdk/lib/isolate/isolate_sources.gni")
+import("$dart_src/sdk/lib/js/js_annotations_sources.gni")
+import("$dart_src/sdk/lib/js/js_sources.gni")
+import("$dart_src/sdk/lib/js_interop/js_interop_sources.gni")
+import("$dart_src/sdk/lib/js_interop_unsafe/js_interop_unsafe_sources.gni")
+import("$dart_src/sdk/lib/js_util/js_util_sources.gni")
+import("$dart_src/sdk/lib/math/math_sources.gni")
+import("$dart_src/sdk/lib/typed_data/typed_data_sources.gni")
+
+if (is_fuchsia) {
+  import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
+} else {
   copy("copy_sky_engine_authors") {
     sources = [ "//AUTHORS" ]
 
@@ -32,7 +37,7 @@ if (!is_fuchsia) {
   }
 }
 
-dart_sdk_lib_path = rebase_path("//third_party/dart/sdk/lib")
+dart_sdk_lib_path = rebase_path("$dart_src/sdk/lib")
 
 copy("async") {
   lib_path = rebase_path("async", "", dart_sdk_lib_path)
@@ -85,6 +90,19 @@ copy("_interceptors") {
   ]
 }
 
+copy("_js_annotations") {
+  lib_path = rebase_path("js", "", dart_sdk_lib_path)
+  sources = rebase_path(js_annotations_sdk_sources, "", lib_path)
+  outputs = [ "$root_gen_dir/dart-pkg/sky_engine/lib/_js_annotations/{{source_file_part}}" ]
+}
+
+copy("_js_types") {
+  lib_path = rebase_path("_internal/js_shared", "", dart_sdk_lib_path)
+  sources = rebase_path(js_types_sdk_sources, "", lib_path)
+  outputs =
+      [ "$root_gen_dir/dart-pkg/sky_engine/lib/_js_types/{{source_file_part}}" ]
+}
+
 copy("internal") {
   lib_path = rebase_path("internal", "", dart_sdk_lib_path)
   sources = rebase_path(internal_sdk_sources, "", lib_path)
@@ -92,6 +110,12 @@ copy("internal") {
       [ "$root_gen_dir/dart-pkg/sky_engine/lib/internal/{{source_file_part}}" ]
 }
 
+copy("vm_internal") {
+  lib_path = rebase_path("_internal/vm/lib/", "", dart_sdk_lib_path)
+  sources = rebase_path(vm_internal_sdk_sources, "", lib_path)
+  outputs = [ "$root_gen_dir/dart-pkg/sky_engine/lib/_internal/vm/lib/{{source_file_part}}" ]
+}
+
 copy("io") {
   lib_path = rebase_path("io", "", dart_sdk_lib_path)
   sources = rebase_path(io_sdk_sources, "", lib_path)
@@ -124,6 +148,20 @@ copy("js") {
   outputs = [ "$root_gen_dir/dart-pkg/sky_engine/lib/js/{{source_file_part}}" ]
 }
 
+copy("js_interop") {
+  lib_path = rebase_path("js_interop", "", dart_sdk_lib_path)
+  sources = rebase_path(js_interop_sdk_sources, "", lib_path)
+  outputs = [
+    "$root_gen_dir/dart-pkg/sky_engine/lib/js_interop/{{source_file_part}}",
+  ]
+}
+
+copy("js_interop_unsafe") {
+  lib_path = rebase_path("js_interop_unsafe", "", dart_sdk_lib_path)
+  sources = rebase_path(js_interop_unsafe_sdk_sources, "", lib_path)
+  outputs = [ "$root_gen_dir/dart-pkg/sky_engine/lib/js_interop_unsafe/{{source_file_part}}" ]
+}
+
 copy("js_util") {
   lib_path = rebase_path("js_util", "", dart_sdk_lib_path)
   sources = rebase_path(js_util_sdk_sources, "", lib_path)
@@ -146,21 +184,18 @@ copy("typed_data") {
   ]
 }
 
-copy("wasm") {
-  lib_path = rebase_path("wasm", "", dart_sdk_lib_path)
-  sources = rebase_path(wasm_sdk_sources, "", lib_path)
-  outputs =
-      [ "$root_gen_dir/dart-pkg/sky_engine/lib/wasm/{{source_file_part}}" ]
-}
-
 copy("copy_dart_ui") {
   sources = dart_ui_files
 
   outputs = [ "$root_gen_dir/dart-pkg/sky_engine/lib/ui/{{source_file_part}}" ]
 }
 
+web_ui_ui_web_with_output("copy_dart_ui_web") {
+  output_dir = "$root_gen_dir/dart-pkg/sky_engine/lib/ui_web/"
+}
+
 copy("copy_allowed_experiments") {
-  sources = [ "//third_party/dart/sdk/lib/_internal/allowed_experiments.json" ]
+  sources = [ "$dart_src/sdk/lib/_internal/allowed_experiments.json" ]
 
   outputs = [
     "$root_gen_dir/dart-pkg/sky_engine/lib/_internal/allowed_experiments.json",
@@ -171,6 +206,8 @@ group("copy_dart_sdk") {
   deps = [
     ":_http",
     ":_interceptors",
+    ":_js_annotations",
+    ":_js_types",
     ":async",
     ":collection",
     ":convert",
@@ -183,10 +220,12 @@ group("copy_dart_sdk") {
     ":io",
     ":isolate",
     ":js",
+    ":js_interop",
+    ":js_interop_unsafe",
     ":js_util",
     ":math",
     ":typed_data",
-    ":wasm",
+    ":vm_internal",
   ]
 }
 
@@ -207,11 +246,13 @@ generated_file("_embedder_yaml") {
     "  \"dart:io\": \"io/io.dart\"",
     "  \"dart:isolate\": \"isolate/isolate.dart\"",
     "  \"dart:js\": \"js/js.dart\"",
+    "  \"dart:js_interop\": \"js_interop/js_interop.dart\"",
+    "  \"dart:js_interop_unsafe\": \"js_interop_unsafe/js_interop_unsafe.dart\"",
     "  \"dart:js_util\": \"js_util/js_util.dart\"",
     "  \"dart:math\": \"math/math.dart\"",
     "  \"dart:typed_data\": \"typed_data/typed_data.dart\"",
     "  \"dart:ui\": \"ui/ui.dart\"",
-    "  \"dart:wasm\": \"wasm/wasm_types.dart\"",
+    "  \"dart:ui_web\": \"ui_web/ui_web.dart\"",
     "",
     "  \"dart:_http\": \"_http/http.dart\"",
     "  \"dart:_interceptors\": \"_interceptors/interceptors.dart\"",
@@ -219,11 +260,21 @@ generated_file("_embedder_yaml") {
     "  # public API, e.g. List being Iterable by virtue of implementing",
     "  # EfficientLengthIterable. Not including this library yields analysis errors.",
     "  \"dart:_internal\": \"internal/internal.dart\"",
+    "  # The _js_annotations library is also needed for the same reasons as _internal.",
+    "  \"dart:_js_annotations\": \"_js_annotations/_js_annotations.dart\"",
+    "  # The _js_types library is also needed for the same reasons as _internal.",
+    "  \"dart:_js_types\": \"_js_types/js_types.dart\"",
     "  \"dart:nativewrappers\": \"_empty.dart\"",
   ]
 }
 
-dart_pkg("sky_engine") {
+action("sky_engine") {
+  package_name = "sky_engine"
+  pkg_directory = rebase_path("$root_gen_dir/dart-pkg")
+  package_root = rebase_path("$root_gen_dir/dart-pkg/packages")
+  stamp_file = "$root_gen_dir/dart-pkg/${package_name}.stamp"
+  entries_file = "$root_gen_dir/dart-pkg/${package_name}.entries"
+
   sources = [
     "LICENSE",
     "README.md",
@@ -235,16 +286,46 @@ dart_pkg("sky_engine") {
     ":_embedder_yaml",
     ":copy_dart_sdk",
     ":copy_dart_ui",
+    ":copy_dart_ui_web",
   ]
 
   if (!is_fuchsia) {
     deps += [ ":copy_sky_engine_authors" ]
   }
 
-  service_isolate_dir = "//third_party/dart/sdk/lib/_internal/vm/bin/"
-  sdk_ext_directory = "$root_gen_dir/sky/bindings"
+  service_isolate_dir = "$dart_src/sdk/lib/_internal/vm/bin/"
+  sdk_ext_directory = [ "$root_gen_dir/sky/bindings" ]
   sdk_ext_files = [
     "$service_isolate_dir/vmservice_io.dart",
     "$service_isolate_dir/vmservice_server.dart",
   ]
+
+  outputs = [
+    "$root_gen_dir/dart-pkg/${package_name}",
+    "$root_gen_dir/dart-pkg/${package_name}/pubspec.yaml",
+    "$root_gen_dir/dart-pkg/packages/${package_name}",
+    stamp_file,
+  ]
+
+  script = rebase_path("//flutter/build/dart/tools/dart_pkg.py", ".", "//")
+
+  inputs = [ script ] + rebase_path(sources)
+
+  args = [
+           "--package-name",
+           package_name,
+           "--dart-sdk",
+           rebase_path(dart_sdk_root),
+           "--pkg-directory",
+           pkg_directory,
+           "--package-root",
+           package_root,
+           "--stamp-file",
+           rebase_path(stamp_file),
+           "--entries-file",
+           rebase_path(entries_file),
+           "--package-sources",
+         ] + rebase_path(sources) + [ "--sdk-ext-directories" ] +
+         rebase_path(sdk_ext_directory) + [ "--sdk-ext-files" ] +
+         rebase_path(sdk_ext_files) + [ "--sdk-ext-mappings" ]
 }
diff --git a/sky/packages/sky_engine/LICENSE b/sky/packages/sky_engine/LICENSE
index 6df32e9808ac5c2c502609a8846707efb02819b8..3376a60b8e33aae404a27a7a7ea765820fe792bb 100644
--- a/sky/packages/sky_engine/LICENSE
+++ b/sky/packages/sky_engine/LICENSE
@@ -1,198 +1,268 @@
-smhasher
+icu
+
+#      Copyright (c) 2006-2015 International Business Machines Corporation,
+  #      Apple Inc., and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+vulkan-validation-layers
+
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
 
-All MurmurHash source files are placed in the public domain.
 
-The license below applies to all other code in SMHasher:
+File: layers/external/vma/vk_mem_alloc.h
 
-Copyright (c) 2011 Google, Inc.
 
+Copyright (c) 2017-2022 Advanced Micro Devices, Inc. All rights reserved.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
-
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
-
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 --------------------------------------------------------------------------------
-etc1
-
-Apache License
-
-Version 2.0, January 2004
-
-http://www.apache.org/licenses
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and
-distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the
-copyright owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other
-entities that control, are controlled by, or are under common control with
-that entity. For the purposes of this definition, "control" means (i) the
-power, direct or indirect, to cause the direction or management of such
-entity, whether by contract or otherwise, or (ii) ownership of fifty
-percent (50%) or more of the outstanding shares, or (iii) beneficial
-ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising
-permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications,
-including but not limited to software source code, documentation
-source, and configuration files.
-
-"Object" form shall mean any form resulting from mechanical transformation
-or translation of a Source form, including but not limited to compiled
-object code, generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object
-form, made available under the License, as indicated by a copyright
-notice that is included in or attached to the work (an example is
-provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object
-form, that is based on (or derived from) the Work and for which the
-editorial revisions, annotations, elaborations, or other modifications
-represent, as a whole, an original work of authorship. For the purposes
-of this License, Derivative Works shall not include works that remain
-separable from, or merely link (or bind by name) to the interfaces of,
-the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original
-version of the Work and any modifications or additions to that Work or
-Derivative Works thereof, that is intentionally submitted to Licensor
-for inclusion in the Work by the copyright owner or by an individual or
-Legal Entity authorized to submit on behalf of the copyright owner. For
-the purposes of this definition, "submitted" means any form of electronic,
-verbal, or written communication sent to the Licensor or its
-representatives, including but not limited to communication on electronic
-mailing lists, source code control systems, and issue tracking systems that
-are managed by, or on behalf of, the Licensor for the purpose of discussing
-and improving the Work, but excluding communication that is conspicuously
-marked or otherwise designated in writing by the copyright owner as "Not
-a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on
-behalf of whom a Contribution has been received by Licensor and subsequently
-incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of this
-License, each Contributor hereby grants to You a perpetual, worldwide,
-non-exclusive, no-charge, royalty-free, irrevocable copyright license to
-reproduce, prepare Derivative Works of, publicly display, publicly perform,
-sublicense, and distribute the Work and such Derivative Works in Source or
-Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of this
-License, each Contributor hereby grants to You a perpetual, worldwide,
-non-exclusive, no-charge, royalty-free, irrevocable (except as stated in
-this section) patent license to make, have made, use, offer to sell, sell,
-import, and otherwise transfer the Work, where such license applies only to
-those patent claims licensable by such Contributor that are necessarily
-infringed by their Contribution(s) alone or by combination of their
-Contribution(s) with the Work to which such Contribution(s) was submitted.
-If You institute patent litigation against any entity (including a cross-claim
-or counterclaim in a lawsuit) alleging that the Work or a Contribution
-incorporated within the Work constitutes direct or contributory patent
-infringement, then any patent licenses granted to You under this License
-for that Work shall terminate as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the Work or
-Derivative Works thereof in any medium, with or without modifications, and
-in Source or Object form, provided that You meet the following conditions:
-
-You must give any other recipients of the Work or Derivative Works a copy of
-this License; and
-You must cause any modified files to carry prominent notices stating that
-You changed the files; and
-You must retain, in the Source form of any Derivative Works that You
-distribute, all copyright, patent, trademark, and attribution notices
-from the Source form of the Work, excluding those notices that do not
-pertain to any part of the Derivative Works; and
-If the Work includes a "NOTICE" text file as part of its distribution,
-then any Derivative Works that You distribute must include a readable
-copy of the attribution notices contained within such NOTICE file, excluding
-those notices that do not pertain to any part of the Derivative Works, in
-at least one of the following places: within a NOTICE text file distributed
-as part of the Derivative Works; within the Source form or documentation, if
-provided along with the Derivative Works; or, within a display generated by
-the Derivative Works, if and wherever such third-party notices normally
-appear. The contents of the NOTICE file are for informational purposes
-only and do not modify the License. You may add Your own attribution
-notices within Derivative Works that You distribute, alongside or as
-an addendum to the NOTICE text from the Work, provided that such additional
-attribution notices cannot be construed as modifying the License.
-
-You may add Your own copyright statement to Your modifications and may provide
-additional or different license terms and conditions for use, reproduction, or
-distribution of Your modifications, or for any such Derivative Works as a
-whole, provided Your use, reproduction, and distribution of the Work otherwise
-complies with the conditions stated in this License.
-5. Submission of Contributions. Unless You explicitly state otherwise, any
-Contribution intentionally submitted for inclusion in the Work by You to the
-Licensor shall be under the terms and conditions of this License, without any
-additional terms or conditions. Notwithstanding the above, nothing herein
-shall supersede or modify the terms of any separate license agreement you
-may have executed with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade names,
-trademarks, service marks, or product names of the Licensor, except as
-required for reasonable and customary use in describing the origin of the
-Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or agreed to
-in writing, Licensor provides the Work (and each Contributor provides its
-Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
-ANY KIND, either express or implied, including, without limitation, any
-warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or
-FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining
-the appropriateness of using or redistributing the Work and assume any risks
-associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory, whether in
-tort (including negligence), contract, or otherwise, unless required by
-applicable law (such as deliberate and grossly negligent acts) or agreed to
-in writing, shall any Contributor be liable to You for damages, including
-any direct, indirect, special, incidental, or consequential damages of any
-character arising as a result of this License or out of the use or inability
-to use the Work (including but not limited to damages for loss of goodwill,
-work stoppage, computer failure or malfunction, or any and all other
-commercial damages or losses), even if such Contributor has been advised
-of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing the
-Work or Derivative Works thereof, You may choose to offer, and charge a
-fee for, acceptance of support, warranty, indemnity, or other liability
-obligations and/or rights consistent with this License. However, in accepting
-such obligations, You may act only on Your own behalf and on Your sole
-responsibility, not on behalf of any other Contributor, and only if You
-agree to indemnify, defend, and hold each Contributor harmless for any
-liability incurred by, or claims asserted against, such Contributor by
-reason of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
---------------------------------------------------------------------------------
 flatbuffers
 
 Apache License
 Version 2.0, January 2004
-http://www.apache.org/licenses
+http://www.apache.org/licenses/
 
 TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -394,22 +464,25 @@ limitations under the License.
 --------------------------------------------------------------------------------
 abseil-cpp
 angle
-boringssl
+dart
 etc1
 expat
 flatbuffers
-fuchsia-vulkan
-khronos
-libwebp
-pkg
+fuchsia_sdk
+glslang
+perfetto
+shaderc
+spirv-cross
 txt
 vulkan
-vulkan-deps
+vulkan-headers
+vulkan-utility-libraries
+vulkan-validation-layers
 wuffs
 
 Apache License
 Version 2.0, January 2004
-http://www.apache.org/licenses
+http://www.apache.org/licenses/
 
 TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -603,6 +676,196 @@ You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+--------------------------------------------------------------------------------
+perfetto
+
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+Copyright (c) 2017, The Android Open Source Project
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -614,7 +877,7 @@ libcxxabi
 
 Apache License
 Version 2.0, January 2004
-http://www.apache.org/licenses
+http://www.apache.org/licenses/
 
 TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -814,6 +1077,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
+
 --- LLVM Exceptions to the Apache 2.0 License ----
 
 As an exception, if, as a result of your compiling your source code, portions
@@ -834,7 +1098,7 @@ abseil-cpp
 
 Apache License
 Version 2.0, January 2004
-https://www.apache.org/licenses
+https://www.apache.org/licenses/
 
 TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -1034,6 +1298,164 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 --------------------------------------------------------------------------------
+libpng
+
+COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
+=========================================
+
+PNG Reference Library License version 2
+---------------------------------------
+
+* Copyright (c) 1995-2019 The PNG Reference Library Authors.
+* Copyright (c) 2018-2019 Cosmin Truta.
+* Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
+* Copyright (c) 1996-1997 Andreas Dilger.
+* Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
+
+The software is supplied "as is", without warranty of any kind,
+express or implied, including, without limitation, the warranties
+of merchantability, fitness for a particular purpose, title, and
+non-infringement.  In no event shall the Copyright owners, or
+anyone distributing the software, be liable for any damages or
+other liability, whether in contract, tort or otherwise, arising
+from, out of, or in connection with the software, or the use or
+other dealings in the software, even if advised of the possibility
+of such damage.
+
+Permission is hereby granted to use, copy, modify, and distribute
+this software, or portions hereof, for any purpose, without fee,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you
+    must not claim that you wrote the original software.  If you
+    use this software in a product, an acknowledgment in the product
+    documentation would be appreciated, but is not required.
+
+2. Altered source versions must be plainly marked as such, and must
+    not be misrepresented as being the original software.
+
+3. This Copyright notice may not be removed or altered from any
+    source or altered source distribution.
+
+
+PNG Reference Library License version 1 (for libpng 0.5 through 1.6.35)
+-----------------------------------------------------------------------
+
+libpng versions 1.0.7, July 1, 2000, through 1.6.35, July 15, 2018 are
+Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are
+derived from libpng-1.0.6, and are distributed according to the same
+disclaimer and license as libpng-1.0.6 with the following individuals
+added to the list of Contributing Authors:
+
+    Simon-Pierre Cadieux
+    Eric S. Raymond
+    Mans Rullgard
+    Cosmin Truta
+    Gilles Vollant
+    James Yu
+    Mandar Sahastrabuddhe
+    Google Inc.
+    Vadim Barkov
+
+and with the following additions to the disclaimer:
+
+    There is no warranty against interference with your enjoyment of
+    the library or against infringement.  There is no warranty that our
+    efforts or the library will fulfill any of your particular purposes
+    or needs.  This library is provided with all faults, and the entire
+    risk of satisfactory quality, performance, accuracy, and effort is
+    with the user.
+
+Some files in the "contrib" directory and some configure-generated
+files that are distributed with libpng have other copyright owners, and
+are released under other open source licenses.
+
+libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
+Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
+libpng-0.96, and are distributed according to the same disclaimer and
+license as libpng-0.96, with the following individuals added to the
+list of Contributing Authors:
+
+    Tom Lane
+    Glenn Randers-Pehrson
+    Willem van Schaik
+
+libpng versions 0.89, June 1996, through 0.96, May 1997, are
+Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
+and are distributed according to the same disclaimer and license as
+libpng-0.88, with the following individuals added to the list of
+Contributing Authors:
+
+    John Bowler
+    Kevin Bracey
+    Sam Bushell
+    Magnus Holmgren
+    Greg Roelofs
+    Tom Tanner
+
+Some files in the "scripts" directory have other copyright owners,
+but are released under this license.
+
+libpng versions 0.5, May 1995, through 0.88, January 1996, are
+Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
+
+For the purposes of this copyright and license, "Contributing Authors"
+is defined as the following set of individuals:
+
+    Andreas Dilger
+    Dave Martindale
+    Guy Eric Schalnat
+    Paul Schmidt
+    Tim Wegner
+
+The PNG Reference Library is supplied "AS IS".  The Contributing
+Authors and Group 42, Inc. disclaim all warranties, expressed or
+implied, including, without limitation, the warranties of
+merchantability and of fitness for any purpose.  The Contributing
+Authors and Group 42, Inc. assume no liability for direct, indirect,
+incidental, special, exemplary, or consequential damages, which may
+result from the use of the PNG Reference Library, even if advised of
+the possibility of such damage.
+
+Permission is hereby granted to use, copy, modify, and distribute this
+source code, or portions hereof, for any purpose, without fee, subject
+to the following restrictions:
+
+1. The origin of this source code must not be misrepresented.
+
+2. Altered versions must be plainly marked as such and must not
+    be misrepresented as being the original source.
+
+3. This Copyright notice may not be removed or altered from any
+    source or altered source distribution.
+
+The Contributing Authors and Group 42, Inc. specifically permit,
+without fee, and encourage the use of this source code as a component
+to supporting the PNG file format in commercial products.  If you use
+this source code in a product, acknowledgment is not required but would
+be appreciated.
+--------------------------------------------------------------------------------
+libjpeg-turbo
+
+Copyright (C) 1988 by Jef Poskanzer.
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted, provided
+that the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.  This software is provided "as is" without express or
+implied warranty.
+--------------------------------------------------------------------------------
+libjpeg-turbo
+
+Copyright (C) 1989 by Jef Poskanzer.
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted, provided
+that the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.  This software is provided "as is" without express or
+implied warranty.
+--------------------------------------------------------------------------------
 boringssl
 
 Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
@@ -1150,236 +1572,383 @@ derivative of this code cannot be changed.  i.e. this code cannot simply be
 copied and put under another distribution licence
 [including the GNU Public Licence.]
 --------------------------------------------------------------------------------
-freetype2
-zlib
+icu
 
-Copyright (C) 1995-2003, 2010 Mark Adler
+Copyright (C) 1995-2001, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-zlib
-
-Copyright (C) 1995-2003, 2010 Mark Adler
-Copyright (C) 2017 ARM, Inc.
+icu
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+Copyright (C) 1995-2002, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-zlib
+icu
 
-Copyright (C) 1995-2003, 2010, 2014, 2016 Jean-loup Gailly, Mark Adler
+Copyright (C) 1995-2003, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-freetype2
-zlib
+icu
 
-Copyright (C) 1995-2005, 2010 Mark Adler
+Copyright (C) 1995-2005, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-zlib
+icu
 
-Copyright (C) 1995-2005, 2014, 2016 Jean-loup Gailly, Mark Adler
+Copyright (C) 1995-2006, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-freetype2
+icu
 
-Copyright (C) 1995-2006, 2010, 2011, 2012, 2016 Mark Adler
+Copyright (C) 1995-2007, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-freetype2
-zlib
+icu
 
-Copyright (C) 1995-2011, 2016 Mark Adler
+Copyright (C) 1995-2009, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-freetype2
-zlib
-
-Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+icu
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+Copyright (C) 1995-2010, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-freetype2
+icu
 
-Copyright (C) 1995-2016 Mark Adler
+Copyright (C) 1995-2013, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-freetype2
-zlib
+icu
 
-Copyright (C) 1995-2017 Jean-loup Gailly
+Copyright (C) 1995-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-freetype2
+icu
 
-Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (C) 1995-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
 freetype2
-zlib
 
-Copyright (C) 1995-2017 Mark Adler
+Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
 
 This software is provided 'as-is', without any express or implied
 warranty.  In no event will the authors be held liable for any damages
@@ -1399,7 +1968,7 @@ freely, subject to the following restrictions:
 --------------------------------------------------------------------------------
 zlib
 
-Copyright (C) 1995-2018 Jean-loup Gailly
+Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
 
 This software is provided 'as-is', without any express or implied
 warranty.  In no event will the authors be held liable for any damages
@@ -1417,662 +1986,930 @@ freely, subject to the following restrictions:
    misrepresented as being the original software.
 3. This notice may not be removed or altered from any source distribution.
 --------------------------------------------------------------------------------
-zlib
+icu
 
-Copyright (C) 1995-2019 Mark Adler
+Copyright (C) 1996-2008, International Business Machines Corporation *
+and others. All Rights Reserved.
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-zlib
+icu
 
-Copyright (C) 1995-2021 Jean-loup Gailly
-detect_data_type() function provided freely by Cosmin Truta, 2006
+Copyright (C) 1996-2012, International Business Machines Corporation
+and others. All Rights Reserved.
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-zlib
-
-Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+icu
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+Copyright (C) 1996-2012, International Business Machines Corporation and
+others. All Rights Reserved.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
---------------------------------------------------------------------------------
-zlib
-
-Copyright (C) 1995-2022 Jean-loup Gailly, Mark Adler
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-zlib
+icu
 
-Copyright (C) 1995-2022 Mark Adler
+Copyright (C) 1996-2013, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-zlib
-
-Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
-Modifications for Zip64 support
-Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
-For more info read MiniZip_info.txt
+icu
 
-Condition of use and distribution are the same than zlib :
+Copyright (C) 1996-2013, International Business Machines Corporation
+and others.  All Rights Reserved.
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-zlib
+icu
 
-Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+Copyright (C) 1996-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-Modifications of Unzip for Zip64
-Copyright (C) 2007-2008 Even Rouault
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Modifications for Zip64 support on both zip and unzip
-Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-For more info read MiniZip_info.txt
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
 
-Condition of use and distribution are the same than zlib :
+Copyright (C) 1996-2014, International Business Machines Corporation and
+others. All Rights Reserved.
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-libjpeg-turbo
+icu
 
-Copyright (C) 1999-2006, MIYASAKA Masaru.
+Copyright (C) 1996-2014, International Business Machines Corporation and others.
+All Rights Reserved.
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-freetype2
+icu
 
-Copyright (C) 2000, 2001, 2002, 2003, 2006, 2010 by
-Francesco Zappa Nardelli
+Copyright (C) 1996-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-freetype2
+icu
 
-Copyright (C) 2000-2004, 2006-2011, 2013, 2014 by
-Francesco Zappa Nardelli
+Copyright (C) 1996-2015, International Business Machines Corporation and
+others. All Rights Reserved.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-freetype2
+icu
 
-Copyright (C) 2001, 2002 by
-Francesco Zappa Nardelli
+Copyright (C) 1996-2015, International Business Machines Corporation and others.
+All Rights Reserved.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-freetype2
+icu
 
-Copyright (C) 2001, 2002, 2003, 2004 by
-Francesco Zappa Nardelli
+Copyright (C) 1996-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-freetype2
+icu
 
-Copyright (C) 2001-2008, 2011, 2013, 2014 by
-Francesco Zappa Nardelli
+Copyright (C) 1996-2016, International Business Machines
+Corporation and others. All Rights Reserved.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-freetype2
+icu
 
-Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
+Copyright (C) 1996-2016, International Business Machines Corporation and
+others. All Rights Reserved.
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
---------------------------------------------------------------------------------
-zlib
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
 
-Copyright (C) 2004, 2010 Mark Adler
+Copyright (C) 1997-2000, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-zlib
+icu
 
-Copyright (C) 2004-2017 Mark Adler
+Copyright (C) 1997-2003, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-zlib
+icu
 
-Copyright (C) 2004-2019 Mark Adler
+Copyright (C) 1997-2005, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-angle
+icu
 
-Copyright (C) 2009 Apple Inc. All Rights Reserved.
+Copyright (C) 1997-2005, International Business Machines Corporation and others. All Rights Reserved.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------------------
-libjpeg-turbo
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-Copyright (C) 2009, D. R. Commander.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
 
-Based on the x86 SIMD extension for IJG JPEG library
-Copyright (C) 1999-2006, MIYASAKA Masaru.
+Copyright (C) 1997-2006, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-libjpeg-turbo
-
-Copyright (C) 2009-2011, 2014-2016, D. R. Commander.
-Copyright (C) 2015, Matthieu Darbois.
+icu
 
-Based on the x86 SIMD extension for IJG JPEG library
-Copyright (C) 1999-2006, MIYASAKA Masaru.
+Copyright (C) 1997-2009,2014 International Business Machines
+Corporation and others.  All Rights Reserved.
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-libjpeg-turbo
+icu
 
-Copyright (C) 2009-2011, Nokia Corporation and/or its subsidiary(-ies).
-All Rights Reserved.
-Author: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Copyright (C) 2013-2014, Linaro Limited.  All Rights Reserved.
-Author: Ragesh Radhakrishnan <ragesh.r@linaro.org>
-Copyright (C) 2014-2016, D. R. Commander.  All Rights Reserved.
-Copyright (C) 2015-2016, Matthieu Darbois.  All Rights Reserved.
-Copyright (C) 2016, Siarhei Siamashka.  All Rights Reserved.
+Copyright (C) 1997-2010, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-libjpeg-turbo
+icu
 
-Copyright (C) 2009-2011, Nokia Corporation and/or its subsidiary(-ies).
-All Rights Reserved.
-Author: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Copyright (C) 2014, Siarhei Siamashka.  All Rights Reserved.
-Copyright (C) 2014, Linaro Limited.  All Rights Reserved.
-Copyright (C) 2015, D. R. Commander.  All Rights Reserved.
-Copyright (C) 2015-2016, Matthieu Darbois.  All Rights Reserved.
+Copyright (C) 1997-2010, International Business Machines Corporation and    *
+others. All Rights Reserved.
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-harfbuzz
-
-Copyright (C) 2011  Google, Inc.
+icu
 
- This is part of HarfBuzz, a text shaping library.
+Copyright (C) 1997-2011, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-libjpeg-turbo
-
-Copyright (C) 2011, D. R. Commander.
+icu
 
-Based on the x86 SIMD extension for IJG JPEG library
-Copyright (C) 1999-2006, MIYASAKA Masaru.
+Copyright (C) 1997-2011, International Business Machines Corporation and others.
+All Rights Reserved.
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-harfbuzz
+icu
 
-Copyright (C) 2012 Grigori Goronzy <greg@kinoho.net>
+Copyright (C) 1997-2011,2014-2015 International Business Machines
+Corporation and others.  All Rights Reserved.
 
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-xxhash
+icu
 
-Copyright (C) 2012-2016, Yann Collet
+Copyright (C) 1997-2012, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------------------
-xxhash
-
-Copyright (C) 2012-2016, Yann Collet.
-
-BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-harfbuzz
-
-Copyright (C) 2013  Google, Inc.
+icu
 
- This is part of HarfBuzz, a text shaping library.
+Copyright (C) 1997-2012, International Business Machines Corporation and    *
+others. All Rights Reserved.
 
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-zlib
+glfw
 
-Copyright (C) 2013 Intel Corporation. All rights reserved.
-Authors:
- Wajdi Feghali   <wajdi.k.feghali@intel.com>
- Jim Guilford    <james.guilford@intel.com>
- Vinodh Gopal    <vinodh.gopal@intel.com>
- Erdinc Ozturk   <erdinc.ozturk@intel.com>
- Jim Kukunas     <james.t.kukunas@linux.intel.com>
+Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the
+use of this software.
 
 Permission is granted to anyone to use this software for any purpose,
 including commercial applications, and to alter it and redistribute it
@@ -2080,929 +2917,15517 @@ freely, subject to the following restrictions:
 
 1. The origin of this software must not be misrepresented; you must not
    claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
+
 2. Altered source versions must be plainly marked as such, and must not be
    misrepresented as being the original software.
+
 3. This notice may not be removed or altered from any source distribution.
 --------------------------------------------------------------------------------
-libjpeg-turbo
+icu
 
-Copyright (C) 2013, MIPS Technologies, Inc., California.
-All Rights Reserved.
-Authors:  Teodora Novkovic (teodora.novkovic@imgtec.com)
-          Darko Laus       (darko.laus@imgtec.com)
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+Copyright (C) 1997-2013, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
---------------------------------------------------------------------------------
-libjpeg-turbo
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-Copyright (C) 2013-2014, MIPS Technologies, Inc., California.
-All Rights Reserved.
-Authors:  Teodora Novkovic (teodora.novkovic@imgtec.com)
-          Darko Laus       (darko.laus@imgtec.com)
-Copyright (C) 2015, D. R. Commander.  All Rights Reserved.
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+Copyright (C) 1997-2013, International Business Machines                     *
+Corporation and others. All Rights Reserved.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
---------------------------------------------------------------------------------
-skia
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Copyright (C) 2014 Google Inc. All rights reserved.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
 
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
+Copyright (C) 1997-2013, International Business Machines Corporation and
+others. All Rights Reserved.
 
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-  * Neither the name of the copyright holder nor the names of its
-    contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-libjpeg-turbo
+icu
 
-Copyright (C) 2014, D. R. Commander.  All Rights Reserved.
+Copyright (C) 1997-2013, International Business Machines Corporation and    *
+others. All Rights Reserved.
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-libjpeg-turbo
+icu
 
-Copyright (C) 2014-2015, D. R. Commander.  All Rights Reserved.
+Copyright (C) 1997-2013, International Business Machines Corporation and others.
+All Rights Reserved.
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-libjpeg-turbo
+icu
 
-Copyright (C) 2014-2015, D. R. Commander.  All Rights Reserved.
-Copyright (C) 2014, Jay Foad.  All Rights Reserved.
+Copyright (C) 1997-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-libjpeg-turbo
+icu
 
-Copyright (C) 2015, D. R. Commander.  All Rights Reserved.
+Copyright (C) 1997-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
 icu
 
-Copyright (C) 2016 and later: Unicode, Inc. and others.
-License & terms of use: http://www.unicode.org/copyright.html
-Copyright (c) 2015 International Business Machines Corporation
-and others. All Rights Reserved.
+Copyright (C) 1997-2015, International Business Machines
+Corporation and others. All Rights Reserved.
 
-Project: https://github.com/rober42539/lao-dictionary
-Dictionary: https://github.com/rober42539/lao-dictionary/laodict.txt
-License: https://github.com/rober42539/lao-dictionary/LICENSE.txt
-         (copied below)
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-	This file is derived from the above dictionary version of Nov 22, 2020
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
 
- Copyright (C) 2013 Brian Eugene Wilson, Robert Martin Campbell.
- All rights reserved.
+Copyright (C) 1997-2015, International Business Machines Corporation
+and others. All Rights Reserved.
 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
- Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer. Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions and
- the following disclaimer in the documentation and/or other materials
- provided with the distribution.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-zlib
-
-Copyright (C) 2017 ARM, Inc.
-Copyright 2017 The Chromium Authors. All rights reserved.
+icu
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+Copyright (C) 1997-2015, International Business Machines Corporation and
+others. All Rights Reserved.
 
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------------------
-libtess2
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-Copyright (C) [dates of first publication] Silicon Graphics, Inc.
-All Rights Reserved.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
+Copyright (C) 1997-2015, International Business Machines Corporation and    *
+others. All Rights Reserved.
 
-The above copyright notice including the dates of first publication and either this
-permission notice or a reference to http://oss.sgi.com/projects/FreeB/ shall be
-included in all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL SILICON GRAPHICS, INC.
-BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
-OR OTHER DEALINGS IN THE SOFTWARE.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-Except as contained in this notice, the name of Silicon Graphics, Inc. shall not
-be used in advertising or otherwise to promote the sale, use or other dealings in
-this Software without prior written authorization from Silicon Graphics, Inc.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-libjpeg-turbo
+icu
 
-Copyright (C)2009-2014 D. R. Commander.  All Rights Reserved.
+Copyright (C) 1997-2015, International Business Machines Corporation and others.
+All Rights Reserved.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-- Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-- Neither the name of the libjpeg-turbo Project nor the names of its
-  contributors may be used to endorse or promote products derived from this
-  software without specific prior written permission.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS",
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-libjpeg-turbo
+icu
 
-Copyright (C)2009-2015 D. R. Commander.  All Rights Reserved.
+Copyright (C) 1997-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-- Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-- Neither the name of the libjpeg-turbo Project nor the names of its
-  contributors may be used to endorse or promote products derived from this
-  software without specific prior written permission.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS",
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-libjpeg-turbo
+icu
 
-Copyright (C)2009-2016 D. R. Commander.  All Rights Reserved.
+Copyright (C) 1997-2016, International Business Machines Corporation and
+others. All Rights Reserved.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-- Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-- Neither the name of the libjpeg-turbo Project nor the names of its
-  contributors may be used to endorse or promote products derived from this
-  software without specific prior written permission.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS",
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-libjpeg-turbo
+icu
 
-Copyright (C)2011 D. R. Commander.  All Rights Reserved.
+Copyright (C) 1997-2016, International Business Machines Corporation and    *
+others. All Rights Reserved.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-- Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-- Neither the name of the libjpeg-turbo Project nor the names of its
-  contributors may be used to endorse or promote products derived from this
-  software without specific prior written permission.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS",
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-libjpeg-turbo
+icu
 
-Copyright (C)2011, 2015 D. R. Commander.  All Rights Reserved.
+Copyright (C) 1997-2016, International Business Machines Corporation and others.
+All Rights Reserved.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-- Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-- Neither the name of the libjpeg-turbo Project nor the names of its
-  contributors may be used to endorse or promote products derived from this
-  software without specific prior written permission.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS",
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-libjpeg-turbo
+icu
 
-Copyright (C)2011-2016 D. R. Commander.  All Rights Reserved.
+Copyright (C) 1998-2004, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-- Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-- Neither the name of the libjpeg-turbo Project nor the names of its
-  contributors may be used to endorse or promote products derived from this
-  software without specific prior written permission.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS",
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+zlib
+
+Copyright (C) 1998-2005 Gilles Vollant
 --------------------------------------------------------------------------------
 icu
 
-Copyright (c) 1995-2016 International Business Machines Corporation and others
-All rights reserved.
+Copyright (C) 1998-2005, International Business Machines
+Corporation and others.  All Rights Reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, and/or sell copies of the Software, and to permit persons
-to whom the Software is furnished to do so, provided that the above
-copyright notice(s) and this permission notice appear in all copies of
-the Software and that both the above copyright notice(s) and this
-permission notice appear in supporting documentation.
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY
-SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
 Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-of the copyright holder.
-
-All trademarks and registered trademarks mentioned herein are the
-property of their respective owners.
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-expat
+icu
 
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2000-2004 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2001-2002 Greg Stein <gstein@users.sourceforge.net>
-Copyright (c) 2002-2006 Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2016      Cristian Rodríguez <crrodriguez@opensuse.org>
-Copyright (c) 2016-2019 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
-Copyright (c) 2018      Yury Gribov <tetra2005@gmail.com>
-Licensed under the MIT license:
+Copyright (C) 1998-2006, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-expat
+icu
 
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2000-2005 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2001-2002 Greg Stein <gstein@users.sourceforge.net>
-Copyright (c) 2002-2016 Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2016-2022 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2016      Cristian Rodríguez <crrodriguez@opensuse.org>
-Copyright (c) 2016      Thomas Beutlich <tc@tbeu.de>
-Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
-Copyright (c) 2022      Thijs Schreijer <thijs@thijsschreijer.nl>
-Licensed under the MIT license:
+Copyright (C) 1998-2008, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1998-2011, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1998-2012, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1998-2012, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1998-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1998-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1998-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1998-2016, International Business Machines Corporation
+and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1999-2001, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1999-2003, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1999-2004, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1999-2005, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1999-2006, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1999-2006,2013 IBM Corp. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1999-2007, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1999-2007, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1999-2008, International Business Machines Corporation
+and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1999-2009, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1999-2010, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1999-2010, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1999-2011, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1999-2011, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1999-2012, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1999-2012, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1999-2013, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1999-2013, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1999-2014 International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1999-2014 International Business Machines Corporation   *
+and others. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1999-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1999-2014, International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1999-2015 International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1999-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1999-2015, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1999-2016 International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1999-2016 International Business Machines Corporation
+and others. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1999-2016 International Business Machines Corporation   *
+and others. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1999-2016, International Business Machines
+               Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1999-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1999-2016, International Business Machines Corporation
+              and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1999-2016, International Business Machines Corporation
+and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1999-2016, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 1999-2016, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+freetype2
+
+Copyright (C) 2000, 2001, 2002, 2003, 2006, 2010 by
+Francesco Zappa Nardelli
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2000, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2000-2003, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+freetype2
+
+Copyright (C) 2000-2004, 2006-2011, 2013, 2014 by
+Francesco Zappa Nardelli
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2000-2004, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2000-2004, International Business Machines Corporation
+and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2000-2006, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2000-2007, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2000-2008, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2000-2010, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2000-2011, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2000-2012, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2000-2012, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2000-2013, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2000-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2000-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2000-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2000-2016, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+freetype2
+
+Copyright (C) 2001, 2002 by
+Francesco Zappa Nardelli
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+--------------------------------------------------------------------------------
+freetype2
+
+Copyright (C) 2001, 2002, 2003, 2004 by
+Francesco Zappa Nardelli
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2001, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2001-2003, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2001-2005, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2001-2005, International Business Machines Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2001-2006, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2001-2007, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+freetype2
+
+Copyright (C) 2001-2008, 2011, 2013, 2014 by
+Francesco Zappa Nardelli
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2001-2008, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2001-2008,2010 IBM and others. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2001-2010, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2001-2011 IBM and others. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2001-2011, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2001-2011, International Business Machines                   *
+               Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2001-2011, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2001-2011, International Business Machines Corporation and    *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2001-2011, International Business Machines Corporation.       *
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2001-2011,2014 IBM and others. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2001-2012, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2001-2012, International Business Machines Corporation and    *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2001-2013, International Business Machines
+               Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2001-2014 IBM and others. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2001-2014 International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2001-2014, International Business Machines
+               Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2001-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2001-2014, International Business Machines                   *
+               Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2001-2014, International Business Machines Corporation and    *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2001-2014, International Business Machines Corporation.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2001-2015 IBM and others. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2001-2015, International Business Machines
+               Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2001-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2001-2016, International Business Machines
+               Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2001-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2002-2003, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2012-2013 LunarG, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2012-2013 LunarG, Inc.
+Copyright (C) 2015-2018 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2012-2013 LunarG, Inc.
+Copyright (C) 2017 ARM Limited.
+Copyright (C) 2015-2018 Google, Inc.
+Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2012-2013 LunarG, Inc.
+Copyright (C) 2017 ARM Limited.
+Copyright (C) 2015-2019 Google, Inc.
+Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2012-2013 LunarG, Inc.
+Copyright (C) 2017 ARM Limited.
+Copyright (C) 2018-2020 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2012-2013 LunarG, Inc.
+Copyright (C) 2017 ARM Limited.
+Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2012-2013 LunarG, Inc.
+Copyright (C) 2017, 2022-2024 Arm Limited.
+Copyright (C) 2015-2018 Google, Inc.
+Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2012-2013 LunarG, Inc.
+Copyright (C) 2017, 2022-2024 Arm Limited.
+Copyright (C) 2015-2020 Google, Inc.
+Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2012-2015 LunarG, Inc.
+Copyright (C) 2015-2018 Google, Inc.
+Copyright (C) 2017, 2019 ARM Limited.
+Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2012-2015 LunarG, Inc.
+Copyright (C) 2015-2020 Google, Inc.
+Copyright (C) 2017 ARM Limited.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2012-2016 LunarG, Inc.
+Copyright (C) 2015-2016 Google, Inc.
+Copyright (C) 2017 ARM Limited.
+Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2012-2016 LunarG, Inc.
+Copyright (C) 2015-2020 Google, Inc.
+Copyright (C) 2017, 2022-2024 Arm Limited.
+Modifications Copyright (C) 2020-2021 Advanced Micro Devices, Inc. All rights reserved.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2012-2016 LunarG, Inc.
+Copyright (C) 2017, 2022-2024 Arm Limited.
+Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2013 LunarG, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2013 LunarG, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2013 LunarG, Inc.
+Copyright (C) 2015-2018 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2013 LunarG, Inc.
+Copyright (C) 2015-2018 Google, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2013 LunarG, Inc.
+Copyright (C) 2017 ARM Limited.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2013 LunarG, Inc.
+Copyright (C) 2017 ARM Limited.
+Copyright (C) 2015-2018 Google, Inc.
+Copyright (c) 2023, Mobica Limited
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2013 LunarG, Inc.
+Copyright (C) 2017 ARM Limited.
+Copyright (C) 2020 Google, Inc.
+Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2013 LunarG, Inc.
+Copyright (c) 2002-2010 The ANGLE Project Authors.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2013-2016 LunarG, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2013-2016 LunarG, Inc.
+Copyright (C) 2015-2018 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2013-2016 LunarG, Inc.
+Copyright (C) 2015-2020 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2013-2016 LunarG, Inc.
+Copyright (C) 2016-2020 Google, Inc.
+Modifications Copyright(C) 2021 Advanced Micro Devices, Inc.All rights reserved.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2016 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2016 LunarG, Inc.
+Copyright (C) 2017 ARM Limited.
+Copyright (C) 2015-2018 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+Copyright (C) 2017 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2002-2005, International Business Machines Corporation and    *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2002-2006, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2002-2008 International Business Machines Corporation   *
+and others. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2002-2008, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2002-2010, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2002-2011 International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2002-2011, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2002-2011, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2002-2012, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2002-2013, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2002-2013, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2002-2014 International Business Machines Corporation
+and others. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2002-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2002-2014, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2002-2015 International Business Machines Corporation
+and others. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2002-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2002-2015, International Business Machines Corporation and others.
+    All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2002-2015, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2002-2016 International Business Machines Corporation
+and others. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2002-2016 International Business Machines Corporation   *
+and others. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2002-2016 International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2002-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2002-2016, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2002-2016, International Business Machines Corporation and others.
+    All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2002-2016, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2003 - 2008, International Business Machines Corporation and  *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2003 - 2009, International Business Machines Corporation and  *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2003 - 2013, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2003 - 2013, International Business Machines Corporation and  *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2003-2003, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2003-2004, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2003-2006, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2003-2007, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2003-2008, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2003-2009, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2003-2009,2012,2016 International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2003-2010, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2003-2011, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2003-2012, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2003-2013, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2003-2013, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2003-2013, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2003-2013, International Business Machines Corporation and    *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2003-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2003-2014, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2003-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2003-2015, International Business Machines                   *
+               Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2003-2015, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2003-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2003-2016, International Business Machines                   *
+               Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2003-2016, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2004 - 2008, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2004-2005, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2004-2006, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2004-2007, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2004-2010, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2004-2011, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2004-2012, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2004-2012, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2004-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2004-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2004-2015, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2004-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2005, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2005-2006, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2005-2008, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2005-2011, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2005-2012, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2005-2013, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2005-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2005-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2005-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2006 International Business Machines Corporation        *
+and others. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2006, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2006-2012, International Business Machines Corporation and others. *
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2006-2014, International Business Machines Corporation   *
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2006-2016, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2007, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2007-2008, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2007-2008, International Business Machines Corporation and         *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2007-2008, International Business Machines Corporation and    *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2007-2012, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2007-2012, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2007-2013, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2007-2013, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2007-2013, International Business Machines Corporation and    *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2007-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2007-2014, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2007-2014, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2007-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2007-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2007-2016, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2007-2016, International Business Machines Corporation and    *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2008, Google, International Business Machines Corporation and *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2008, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2008, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2008-2009, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2008-2011, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2008-2011, International Business Machines
+Corporation, Google and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2008-2012, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2008-2012, International Business Machines Corporation         *
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2008-2013, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2008-2013, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2008-2014, Google, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2008-2014, Google, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2008-2015, Google, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2008-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2008-2015, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2008-2015, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2008-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2008-2016, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2008-2016, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2009 International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2009, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2009-2010 IBM Corporation and Others.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2009-2010, Google, International Business Machines Corporation and *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2009-2010, International Business Machines Corporation and         *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2009-2011, International Business Machines
+               Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2009-2011, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2009-2011, International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2009-2011, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+libjpeg-turbo
+
+Copyright (C) 2009-2011, Nokia Corporation and/or its subsidiary(-ies).
+All Rights Reserved.
+Author: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Copyright (C) 2013-2014, Linaro Limited.  All Rights Reserved.
+Author: Ragesh Radhakrishnan <ragesh.r@linaro.org>
+Copyright (C) 2014-2016, D. R. Commander.  All Rights Reserved.
+Copyright (C) 2015-2016, Matthieu Darbois.  All Rights Reserved.
+Copyright (C) 2016, Siarhei Siamashka.  All Rights Reserved.
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+--------------------------------------------------------------------------------
+libjpeg-turbo
+
+Copyright (C) 2009-2011, Nokia Corporation and/or its subsidiary(-ies).
+All Rights Reserved.
+Author: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Copyright (C) 2014, Siarhei Siamashka.  All Rights Reserved.
+Copyright (C) 2014, Linaro Limited.  All Rights Reserved.
+Copyright (C) 2015, D. R. Commander.  All Rights Reserved.
+Copyright (C) 2015-2016, Matthieu Darbois.  All Rights Reserved.
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2009-2012, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2009-2012, International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2009-2012, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2009-2013, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2009-2013, International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2009-2013, International Business Machines Corporation and    *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2009-2014 International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2009-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2009-2014, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2009-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2009-2015, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2009-2015, International Business Machines Corporation and    *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2009-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2009-2016, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2009-2016, International Business Machines Corporation,       *
+Google, and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2009-2017, International Business Machines Corporation,       *
+Google, and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2010 , Yahoo! Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2010, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2010-2011, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2010-2011, International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2010-2012, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2010-2012, International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2010-2012,2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2010-2012,2015 International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2010-2013, International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2010-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2010-2014, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2010-2014, International Business Machines Corporation and    *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2010-2014, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2010-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2010-2015, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2010-2016 International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2010-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2010-2016, International Business Machines Corporation and
+others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2010-2016, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+harfbuzz
+
+Copyright (C) 2011  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+--------------------------------------------------------------------------------
+include
+
+Copyright (C) 2011 Nick Bruun <nick@bruun.co>
+Copyright (C) 2013 Vlad Lazarenko <vlad@lazarenko.me>
+Copyright (C) 2014 Nicolas Pauss <nicolas.pauss@gmail.com>
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2011, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2011-2012, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2011-2012, International Business Machines Corporation and    *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2011-2013, Apple Inc. and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2011-2013, Apple Inc.; Unicode, Inc.; and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2011-2013, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2011-2014 International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2011-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2011-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2011-2015, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2011-2015, International Business Machines Corporation and    *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2011-2016, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+harfbuzz
+
+Copyright (C) 2012 Grigori Goronzy <greg@kinoho.net>
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2012 International Business Machines Corporation
+and others. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2012,2014 International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2012-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2012-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2012-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+xxhash
+
+Copyright (C) 2012-2016, Yann Collet
+
+BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+xxhash
+
+Copyright (C) 2012-2016, Yann Collet.
+
+BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+vulkan-validation-layers
+
+Copyright (C) 2012-2021 Yann Collet
+
+BSD 2-Clause License (https://www.opensource.org/licenses/bsd-license.php)
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+     copyright notice, this list of conditions and the following disclaimer
+     in the documentation and/or other materials provided with the
+     distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+harfbuzz
+
+Copyright (C) 2013  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2013 LunarG, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2013 LunarG, Inc.
+Copyright (C) 2015-2018 Google, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2013 LunarG, Inc.
+Copyright (C) 2017 ARM Limited.
+Copyright (C) 2015-2018 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2013, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2013, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2013, International Business Machines Corporation and         *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2013, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+libjpeg-turbo
+
+Copyright (C) 2013, MIPS Technologies, Inc., California.
+All Rights Reserved.
+Authors:  Teodora Novkovic (teodora.novkovic@imgtec.com)
+          Darko Laus       (darko.laus@imgtec.com)
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2013-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2013-2014, International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2013-2014, International Business Machines Corporation and    *
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2013-2014, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+libjpeg-turbo
+
+Copyright (C) 2013-2014, MIPS Technologies, Inc., California.
+All Rights Reserved.
+Authors:  Teodora Novkovic (teodora.novkovic@imgtec.com)
+          Darko Laus       (darko.laus@imgtec.com)
+Copyright (C) 2015, D. R. Commander.  All Rights Reserved.
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2013-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2013-2015, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2013-2016 LunarG, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2013-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+skia
+
+Copyright (C) 2014 Google Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2014 International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2014 International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2014 LunarG, Inc.
+Copyright (C) 2015-2018 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+libjpeg-turbo
+
+Copyright (C) 2014, D. R. Commander.  All Rights Reserved.
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2014, International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2014-2015 LunarG, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2014-2015 LunarG, Inc.
+Copyright (C) 2015-2018 Google, Inc.
+Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2014-2015 LunarG, Inc.
+Copyright (C) 2015-2020 Google, Inc.
+Copyright (C) 2017 ARM Limited.
+Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2014-2015 LunarG, Inc.
+Copyright (C) 2022-2024 Arm Limited.
+Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+libjpeg-turbo
+
+Copyright (C) 2014-2015, D. R. Commander.  All Rights Reserved.
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+--------------------------------------------------------------------------------
+libjpeg-turbo
+
+Copyright (C) 2014-2015, D. R. Commander.  All Rights Reserved.
+Copyright (C) 2014, Jay Foad.  All Rights Reserved.
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2014-2015, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2014-2016 LunarG, Inc.
+Copyright (C) 2015-2020 Google, Inc.
+Copyright (C) 2017, 2022-2024 Arm Limited.
+Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2014-2016 LunarG, Inc.
+Copyright (C) 2018 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2014-2016 LunarG, Inc.
+Copyright (C) 2018-2020 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2014-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2014-2016, International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2014-2016, International Business Machines Corporation and
+others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2014-2016, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2014-2016, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2015 LunarG, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+rapidjson
+
+Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip-> All rights reserved->
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+--------------------------------------------------------------------------------
+rapidjson
+
+Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+--------------------------------------------------------------------------------
+libjpeg-turbo
+
+Copyright (C) 2015, D. R. Commander.  All Rights Reserved.
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2015, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2015, International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2015, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2015, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2015-2016 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of Google Inc. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2015-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2015-2016, International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2015-2016, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2015-2018 Google, Inc.
+Copyright (C) 2017 ARM Limited.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2016 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2016 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of Google Inc. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2016 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of Google, Inc., nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2016 Google, Inc.
+Copyright (C) 2016 LunarG, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of Google Inc. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2016 Google, Inc.
+Copyright (C) 2016 LunarG, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of Google, Inc., nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2016 Google, Inc.
+Copyright (C) 2019, 2022-2024 Arm Limited.
+Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of Google Inc. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2016 Google, Inc.
+Copyright (C) 2022-2024 Arm Limited.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of Google Inc. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2016 International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2016 LunarG, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2016 LunarG, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of Google Inc. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2016 LunarG, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of Google, Inc., nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2016 and later: Unicode, Inc. and others.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2016, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) 2016, International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2016-2017 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of Google Inc. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2016-2017 Google, Inc.
+Copyright (C) 2020 The Khronos Group Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2016-2017 LunarG, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2016-2018 Google, Inc.
+Copyright (C) 2016 LunarG, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2016-2018 Google, Inc.
+Copyright (C) 2016 LunarG, Inc.
+Copyright (C) 2023 Mobica Limited.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of Google, Inc., nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+zlib
+
+Copyright (C) 2017 ARM, Inc.
+Copyright 2017 The Chromium Authors
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2017 LunarG, Inc.
+Copyright (C) 2018 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2017 LunarG, Inc.
+Copyright (C) 2018 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of Google, Inc., nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2017-2018 Google, Inc.
+Copyright (C) 2017 LunarG, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2018 Google, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2018 The Khronos Group Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2020 The Khronos Group Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of The Khronos Group Inc. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (C) 2023 LunarG, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) The Internet Society (2002).  All Rights Reserved.
+
+This document and translations of it may be copied and furnished to
+others, and derivative works that comment on or otherwise explain it
+or assist in its implementation may be prepared, copied, published
+and distributed, in whole or in part, without restriction of any
+kind, provided that the above copyright notice and this paragraph are
+included on all such copies and derivative works.  However, this
+document itself may not be modified in any way, such as by removing
+the copyright notice or references to the Internet Society or other
+Internet organizations, except as needed for the purpose of
+developing Internet standards in which case the procedures for
+copyrights defined in the Internet Standards process must be
+followed, or as required to translate it into languages other than
+English.
+
+The limited permissions granted above are perpetual and will not be
+revoked by the Internet Society or its successors or assigns.
+
+This document and the information contained herein is provided on an
+"AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
+TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
+BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
+HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+--------------------------------------------------------------------------------
+libtess2
+
+Copyright (C) [dates of first publication] Silicon Graphics, Inc.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice including the dates of first publication and either this
+permission notice or a reference to http://oss.sgi.com/projects/FreeB/ shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL SILICON GRAPHICS, INC.
+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of Silicon Graphics, Inc. shall not
+be used in advertising or otherwise to promote the sale, use or other dealings in
+this Software without prior written authorization from Silicon Graphics, Inc.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (C) {1999-2001}, International Business Machines Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+libjpeg-turbo
+
+Copyright (C)2009-2014 D. R. Commander.  All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+- Neither the name of the libjpeg-turbo Project nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS",
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+libjpeg-turbo
+
+Copyright (C)2009-2015 D. R. Commander.  All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+- Neither the name of the libjpeg-turbo Project nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS",
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+libjpeg-turbo
+
+Copyright (C)2009-2016 D. R. Commander.  All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+- Neither the name of the libjpeg-turbo Project nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS",
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+libjpeg-turbo
+
+Copyright (C)2011 D. R. Commander.  All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+- Neither the name of the libjpeg-turbo Project nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS",
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+libjpeg-turbo
+
+Copyright (C)2011, 2015 D. R. Commander.  All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+- Neither the name of the libjpeg-turbo Project nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS",
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+libjpeg-turbo
+
+Copyright (C)2011-2016 D. R. Commander.  All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+- Neither the name of the libjpeg-turbo Project nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS",
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (c) 1996-2012, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (c) 1996-2014, International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (c) 1996-2015, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (c) 1996-2015, International Business Machines Corporation and others.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (c) 1996-2016, International Business Machines Corporation
+              and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (c) 1996-2016, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+expat
+
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2000-2004 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2001-2002 Greg Stein <gstein@users.sourceforge.net>
+Copyright (c) 2002-2006 Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2016      Cristian Rodríguez <crrodriguez@opensuse.org>
+Copyright (c) 2016-2019 Sebastian Pipping <sebastian@pipping.org>
+Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
+Copyright (c) 2018      Yury Gribov <tetra2005@gmail.com>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+--------------------------------------------------------------------------------
+expat
+
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2000-2005 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2001-2002 Greg Stein <gstein@users.sourceforge.net>
+Copyright (c) 2002-2016 Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2016-2022 Sebastian Pipping <sebastian@pipping.org>
+Copyright (c) 2016      Cristian Rodríguez <crrodriguez@opensuse.org>
+Copyright (c) 2016      Thomas Beutlich <tc@tbeu.de>
+Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
+Copyright (c) 2022      Thijs Schreijer <thijs@thijsschreijer.nl>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+--------------------------------------------------------------------------------
+expat
+
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2000-2006 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2001-2002 Greg Stein <gstein@users.sourceforge.net>
+Copyright (c) 2002-2016 Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2005-2009 Steven Solie <steven@solie.ca>
+Copyright (c) 2016      Eric Rahm <erahm@mozilla.com>
+Copyright (c) 2016-2022 Sebastian Pipping <sebastian@pipping.org>
+Copyright (c) 2016      Gaurav <g.gupta@samsung.com>
+Copyright (c) 2016      Thomas Beutlich <tc@tbeu.de>
+Copyright (c) 2016      Gustavo Grieco <gustavo.grieco@imag.fr>
+Copyright (c) 2016      Pascal Cuoq <cuoq@trust-in-soft.com>
+Copyright (c) 2016      Ed Schouten <ed@nuxi.nl>
+Copyright (c) 2017-2022 Rhodri James <rhodri@wildebeest.org.uk>
+Copyright (c) 2017      Václav Slavík <vaclav@slavik.io>
+Copyright (c) 2017      Viktor Szakats <commit@vsz.me>
+Copyright (c) 2017      Chanho Park <chanho61.park@samsung.com>
+Copyright (c) 2017      Rolf Eike Beer <eike@sf-mail.de>
+Copyright (c) 2017      Hans Wennborg <hans@chromium.org>
+Copyright (c) 2018      Anton Maklakov <antmak.pub@gmail.com>
+Copyright (c) 2018      Benjamin Peterson <benjamin@python.org>
+Copyright (c) 2018      Marco Maggi <marco.maggi-ipsu@poste.it>
+Copyright (c) 2018      Mariusz Zaborski <oshogbo@vexillium.org>
+Copyright (c) 2019      David Loffredo <loffredo@steptools.com>
+Copyright (c) 2019-2020 Ben Wagner <bungeman@chromium.org>
+Copyright (c) 2019      Vadim Zeitlin <vadim@zeitlins.org>
+Copyright (c) 2021      Dong-hee Na <donghee.na@python.org>
+Copyright (c) 2022      Samanta Navarro <ferivoz@riseup.net>
+Copyright (c) 2022      Jeffrey Walton <noloader@gmail.com>
+Copyright (c) 2022      Jann Horn <jannh@google.com>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+--------------------------------------------------------------------------------
+expat
+
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2001-2002 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2006      Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2016-2017 Sebastian Pipping <sebastian@pipping.org>
+Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+--------------------------------------------------------------------------------
+expat
+
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2001-2003 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2002      Greg Stein <gstein@users.sourceforge.net>
+Copyright (c) 2002-2016 Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2005-2009 Steven Solie <steven@solie.ca>
+Copyright (c) 2016-2022 Sebastian Pipping <sebastian@pipping.org>
+Copyright (c) 2016      Pascal Cuoq <cuoq@trust-in-soft.com>
+Copyright (c) 2016      Don Lewis <truckman@apache.org>
+Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
+Copyright (c) 2017      Alexander Bluhm <alexander.bluhm@gmx.net>
+Copyright (c) 2017      Benbuck Nason <bnason@netflix.com>
+Copyright (c) 2017      José Gutiérrez de la Concha <jose@zeroc.com>
+Copyright (c) 2019      David Loffredo <loffredo@steptools.com>
+Copyright (c) 2021      Dong-hee Na <donghee.na@python.org>
+Copyright (c) 2022      Martin Ettl <ettl.martin78@googlemail.com>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+--------------------------------------------------------------------------------
+expat
+
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2001-2003 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2004-2009 Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2005-2007 Steven Solie <steven@solie.ca>
+Copyright (c) 2016-2022 Sebastian Pipping <sebastian@pipping.org>
+Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
+Copyright (c) 2019      David Loffredo <loffredo@steptools.com>
+Copyright (c) 2020      Joe Orton <jorton@redhat.com>
+Copyright (c) 2020      Kleber Tarcísio <klebertarcisio@yahoo.com.br>
+Copyright (c) 2021      Tim Bray <tbray@textuality.com>
+Copyright (c) 2022      Martin Ettl <ettl.martin78@googlemail.com>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+--------------------------------------------------------------------------------
+expat
+
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2001-2004 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2002-2009 Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2016-2017 Sebastian Pipping <sebastian@pipping.org>
+Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
+Copyright (c) 2017      Franek Korta <fkorta@gmail.com>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+--------------------------------------------------------------------------------
+expat
+
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2002-2005 Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2016-2017 Sebastian Pipping <sebastian@pipping.org>
+Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+--------------------------------------------------------------------------------
+expat
+
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2002-2016 Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2016-2022 Sebastian Pipping <sebastian@pipping.org>
+Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
+Copyright (c) 2018      Benjamin Peterson <benjamin@python.org>
+Copyright (c) 2018      Anton Maklakov <antmak.pub@gmail.com>
+Copyright (c) 2019      David Loffredo <loffredo@steptools.com>
+Copyright (c) 2020      Boris Kolpackov <boris@codesynthesis.com>
+Copyright (c) 2022      Martin Ettl <ettl.martin78@googlemail.com>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+--------------------------------------------------------------------------------
+expat
+
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2005      Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2016-2019 Sebastian Pipping <sebastian@pipping.org>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+--------------------------------------------------------------------------------
+expat
+
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2005-2006 Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2016-2019 Sebastian Pipping <sebastian@pipping.org>
+Copyright (c) 2019      David Loffredo <loffredo@steptools.com>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+--------------------------------------------------------------------------------
+expat
+
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2016-2017 Sebastian Pipping <sebastian@pipping.org>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+--------------------------------------------------------------------------------
+expat
+
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2016-2022 Sebastian Pipping <sebastian@pipping.org>
+Copyright (c) 2022      Martin Ettl <ettl.martin78@googlemail.com>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+--------------------------------------------------------------------------------
+expat
+
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2017      Sebastian Pipping <sebastian@pipping.org>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+--------------------------------------------------------------------------------
+expat
+
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2002      Greg Stein <gstein@users.sourceforge.net>
+Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2002-2006 Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2017-2021 Sebastian Pipping <sebastian@pipping.org>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+--------------------------------------------------------------------------------
+expat
+
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2002      Greg Stein <gstein@users.sourceforge.net>
+Copyright (c) 2002-2006 Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2002-2003 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2005-2009 Steven Solie <steven@solie.ca>
+Copyright (c) 2016-2021 Sebastian Pipping <sebastian@pipping.org>
+Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
+Copyright (c) 2019      David Loffredo <loffredo@steptools.com>
+Copyright (c) 2021      Dong-hee Na <donghee.na@python.org>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+--------------------------------------------------------------------------------
+expat
+
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2002      Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2017      Sebastian Pipping <sebastian@pipping.org>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+--------------------------------------------------------------------------------
+expat
+
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2002-2003 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2004-2006 Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2005-2007 Steven Solie <steven@solie.ca>
+Copyright (c) 2016-2021 Sebastian Pipping <sebastian@pipping.org>
+Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
+Copyright (c) 2019      David Loffredo <loffredo@steptools.com>
+Copyright (c) 2021      Dong-hee Na <donghee.na@python.org>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+--------------------------------------------------------------------------------
+expat
+
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2017-2019 Sebastian Pipping <sebastian@pipping.org>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+--------------------------------------------------------------------------------
+expat
+
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2016-2017 Sebastian Pipping <sebastian@pipping.org>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+--------------------------------------------------------------------------------
+expat
+
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2016-2018 Sebastian Pipping <sebastian@pipping.org>
+Copyright (c) 2018      Marco Maggi <marco.maggi-ipsu@poste.it>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
+
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+--------------------------------------------------------------------------------
+expat
+
+Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 2016-2021 Sebastian Pipping <sebastian@pipping.org>
+Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
+
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
 without  limitation the  rights  to use,  copy,  modify, merge,  publish,
 distribute, sublicense, and/or sell copies of the Software, and to permit
 persons  to whom  the Software  is  furnished to  do so,  subject to  the
 following conditions:
 
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
+
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (c) 1997-2011, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (c) 1997-2012, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (c) 1997-2012, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (c) 1997-2015, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (c) 1997-2016, International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+expat
+
+Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper
+Copyright (c) 2001-2022 Expat maintainers
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+--------------------------------------------------------------------------------
+boringssl
+
+Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   openssl-core@openssl.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+boringssl
+
+Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
 
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   openssl-core@openssl.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-expat
+boringssl
 
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2000-2006 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2001-2002 Greg Stein <gstein@users.sourceforge.net>
-Copyright (c) 2002-2016 Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2005-2009 Steven Solie <steven@solie.ca>
-Copyright (c) 2016      Eric Rahm <erahm@mozilla.com>
-Copyright (c) 2016-2022 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2016      Gaurav <g.gupta@samsung.com>
-Copyright (c) 2016      Thomas Beutlich <tc@tbeu.de>
-Copyright (c) 2016      Gustavo Grieco <gustavo.grieco@imag.fr>
-Copyright (c) 2016      Pascal Cuoq <cuoq@trust-in-soft.com>
-Copyright (c) 2016      Ed Schouten <ed@nuxi.nl>
-Copyright (c) 2017-2022 Rhodri James <rhodri@wildebeest.org.uk>
-Copyright (c) 2017      Václav Slavík <vaclav@slavik.io>
-Copyright (c) 2017      Viktor Szakats <commit@vsz.me>
-Copyright (c) 2017      Chanho Park <chanho61.park@samsung.com>
-Copyright (c) 2017      Rolf Eike Beer <eike@sf-mail.de>
-Copyright (c) 2017      Hans Wennborg <hans@chromium.org>
-Copyright (c) 2018      Anton Maklakov <antmak.pub@gmail.com>
-Copyright (c) 2018      Benjamin Peterson <benjamin@python.org>
-Copyright (c) 2018      Marco Maggi <marco.maggi-ipsu@poste.it>
-Copyright (c) 2018      Mariusz Zaborski <oshogbo@vexillium.org>
-Copyright (c) 2019      David Loffredo <loffredo@steptools.com>
-Copyright (c) 2019-2020 Ben Wagner <bungeman@chromium.org>
-Copyright (c) 2019      Vadim Zeitlin <vadim@zeitlins.org>
-Copyright (c) 2021      Dong-hee Na <donghee.na@python.org>
-Copyright (c) 2022      Samanta Navarro <ferivoz@riseup.net>
-Copyright (c) 2022      Jeffrey Walton <noloader@gmail.com>
-Copyright (c) 2022      Jann Horn <jannh@google.com>
-Licensed under the MIT license:
+Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
 
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
 
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
 
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   openssl-core@openssl.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-expat
+boringssl
+
+Copyright (c) 1998-2003 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   openssl-core@openssl.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+boringssl
+
+Copyright (c) 1998-2004 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   openssl-core@openssl.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+boringssl
+
+Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
 
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2001-2002 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2006      Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2016-2017 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
-Licensed under the MIT license:
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
 
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   openssl-core@OpenSSL.org.
 
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
 
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-expat
+boringssl
 
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2001-2003 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2002      Greg Stein <gstein@users.sourceforge.net>
-Copyright (c) 2002-2016 Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2005-2009 Steven Solie <steven@solie.ca>
-Copyright (c) 2016-2022 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2016      Pascal Cuoq <cuoq@trust-in-soft.com>
-Copyright (c) 2016      Don Lewis <truckman@apache.org>
-Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
-Copyright (c) 2017      Alexander Bluhm <alexander.bluhm@gmx.net>
-Copyright (c) 2017      Benbuck Nason <bnason@netflix.com>
-Copyright (c) 2017      José Gutiérrez de la Concha <jose@zeroc.com>
-Copyright (c) 2019      David Loffredo <loffredo@steptools.com>
-Copyright (c) 2021      Dong-hee Na <donghee.na@python.org>
-Copyright (c) 2022      Martin Ettl <ettl.martin78@googlemail.com>
-Licensed under the MIT license:
+Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
 
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
 
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
 
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
---------------------------------------------------------------------------------
-expat
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
 
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2001-2003 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2004-2009 Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2005-2007 Steven Solie <steven@solie.ca>
-Copyright (c) 2016-2022 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
-Copyright (c) 2019      David Loffredo <loffredo@steptools.com>
-Copyright (c) 2020      Joe Orton <jorton@redhat.com>
-Copyright (c) 2020      Kleber Tarcísio <klebertarcisio@yahoo.com.br>
-Copyright (c) 2021      Tim Bray <tbray@textuality.com>
-Copyright (c) 2022      Martin Ettl <ettl.martin78@googlemail.com>
-Licensed under the MIT license:
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
 
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   openssl-core@openssl.org.
 
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
 
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-expat
+boringssl
 
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2001-2004 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2002-2009 Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2016-2017 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
-Copyright (c) 2017      Franek Korta <fkorta@gmail.com>
-Licensed under the MIT license:
+Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
 
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
 
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
 
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
---------------------------------------------------------------------------------
-expat
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
 
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2002-2005 Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2016-2017 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
-Licensed under the MIT license:
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
 
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   openssl-core@openssl.org.
 
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
 
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
---------------------------------------------------------------------------------
-expat
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
 
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2002-2016 Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2016-2022 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
-Copyright (c) 2018      Benjamin Peterson <benjamin@python.org>
-Copyright (c) 2018      Anton Maklakov <antmak.pub@gmail.com>
-Copyright (c) 2019      David Loffredo <loffredo@steptools.com>
-Copyright (c) 2020      Boris Kolpackov <boris@codesynthesis.com>
-Copyright (c) 2022      Martin Ettl <ettl.martin78@googlemail.com>
-Licensed under the MIT license:
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+boringssl
 
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
+Copyright (c) 1998-2007 The OpenSSL Project.  All rights reserved.
 
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
 
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
---------------------------------------------------------------------------------
-expat
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
 
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2005      Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2016-2019 Sebastian Pipping <sebastian@pipping.org>
-Licensed under the MIT license:
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
 
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
 
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   openssl-core@openssl.org.
 
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-expat
+boringssl
 
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2005-2006 Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2016-2019 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2019      David Loffredo <loffredo@steptools.com>
-Licensed under the MIT license:
+Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.
 
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
 
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
 
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
---------------------------------------------------------------------------------
-expat
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
 
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2016-2017 Sebastian Pipping <sebastian@pipping.org>
-Licensed under the MIT license:
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
 
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   openssl-core@openssl.org.
 
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
 
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-expat
+boringssl
 
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2016-2022 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2022      Martin Ettl <ettl.martin78@googlemail.com>
-Licensed under the MIT license:
+Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
 
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
 
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
 
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
---------------------------------------------------------------------------------
-expat
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
 
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2017      Sebastian Pipping <sebastian@pipping.org>
-Licensed under the MIT license:
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
 
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   licensing@OpenSSL.org.
 
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
 
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 expat
 
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
+Copyright (c) 1999-2000 Thai Open Source Software Center Ltd
 Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2002      Greg Stein <gstein@users.sourceforge.net>
 Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2002-2006 Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2017-2021 Sebastian Pipping <sebastian@pipping.org>
+Copyright (c) 2007      Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2017      Sebastian Pipping <sebastian@pipping.org>
+
 Licensed under the MIT license:
 
 Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -3024,213 +18449,369 @@ DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
 OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 USE OR OTHER DEALINGS IN THE SOFTWARE.
 --------------------------------------------------------------------------------
-expat
+boringssl
 
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2002      Greg Stein <gstein@users.sourceforge.net>
-Copyright (c) 2002-2006 Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2002-2003 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2005-2009 Steven Solie <steven@solie.ca>
-Copyright (c) 2016-2021 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
-Copyright (c) 2019      David Loffredo <loffredo@steptools.com>
-Copyright (c) 2021      Dong-hee Na <donghee.na@python.org>
-Licensed under the MIT license:
+Copyright (c) 1999-2002 The OpenSSL Project.  All rights reserved.
 
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
 
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
 
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   licensing@OpenSSL.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-expat
+boringssl
 
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2002      Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2017      Sebastian Pipping <sebastian@pipping.org>
-Licensed under the MIT license:
+Copyright (c) 1999-2003 The OpenSSL Project.  All rights reserved.
 
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
 
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
 
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   licensing@OpenSSL.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-expat
+boringssl
+
+Copyright (c) 1999-2004 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   licensing@OpenSSL.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+boringssl
+
+Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   openssl-core@OpenSSL.org.
+
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+boringssl
+
+Copyright (c) 1999-2007 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
 
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2002-2003 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2004-2006 Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2005-2007 Steven Solie <steven@solie.ca>
-Copyright (c) 2016-2021 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
-Copyright (c) 2019      David Loffredo <loffredo@steptools.com>
-Copyright (c) 2021      Dong-hee Na <donghee.na@python.org>
-Licensed under the MIT license:
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   licensing@OpenSSL.org.
 
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
 
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
 
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-expat
+boringssl
 
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2017-2019 Sebastian Pipping <sebastian@pipping.org>
-Licensed under the MIT license:
+Copyright (c) 1999-2008 The OpenSSL Project.  All rights reserved.
 
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
 
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
 
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
---------------------------------------------------------------------------------
-expat
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
 
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2001-2003 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2004-2006 Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2005-2007 Steven Solie <steven@solie.ca>
-Copyright (c) 2016-2022 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
-Copyright (c) 2019      Zhongyuan Zhou <zhouzhongyuan@huawei.com>
-Licensed under the MIT license:
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
 
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   licensing@OpenSSL.org.
 
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
 
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-expat
+icu
 
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2016-2017 Sebastian Pipping <sebastian@pipping.org>
-Licensed under the MIT license:
+Copyright (c) 1999-2012, International Business Machines Corporation and
+others. All Rights Reserved.
 
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-expat
+icu
 
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2016-2018 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2018      Marco Maggi <marco.maggi-ipsu@poste.it>
-Licensed under the MIT license:
+Copyright (c) 1999-2016, International Business Machines Corporation and
+others. All Rights Reserved.
 
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
 expat
 
-Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2016-2021 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
+Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2002      Greg Stein <gstein@users.sourceforge.net>
+Copyright (c) 2005      Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2017-2021 Sebastian Pipping <sebastian@pipping.org>
+
 Licensed under the MIT license:
 
 Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -3254,31 +18835,33 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 --------------------------------------------------------------------------------
 expat
 
-Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper
-Copyright (c) 2001-2022 Expat maintainers
+Copyright (c) 2000 Clark Cooper <coopercc@users.sourceforge.net>
+Copyright (c) 2017 Sebastian Pipping <sebastian@pipping.org>
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Licensed under the MIT license:
+
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
 
-The above copyright notice and this permission notice shall be included
+The above copyright  notice and this permission notice  shall be included
 in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
 --------------------------------------------------------------------------------
 boringssl
 
-Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.
+Copyright (c) 2000 The OpenSSL Project.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -3295,12 +18878,12 @@ are met:
 3. All advertising materials mentioning features or use of this
    software must display the following acknowledgment:
    "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
 
 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
    endorse or promote products derived from this software without
    prior written permission. For written permission, please contact
-   openssl-core@openssl.org.
+   licensing@OpenSSL.org.
 
 5. Products derived from this software may not be called "OpenSSL"
    nor may "OpenSSL" appear in their names without prior written
@@ -3309,7 +18892,7 @@ are met:
 6. Redistributions of any form whatsoever must retain the following
    acknowledgment:
    "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
 
 THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
 EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -3326,7 +18909,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 boringssl
 
-Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
+Copyright (c) 2000-2002 The OpenSSL Project.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -3343,12 +18926,12 @@ are met:
 3. All advertising materials mentioning features or use of this
    software must display the following acknowledgment:
    "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
 
 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
    endorse or promote products derived from this software without
    prior written permission. For written permission, please contact
-   openssl-core@openssl.org.
+   licensing@OpenSSL.org.
 
 5. Products derived from this software may not be called "OpenSSL"
    nor may "OpenSSL" appear in their names without prior written
@@ -3357,7 +18940,7 @@ are met:
 6. Redistributions of any form whatsoever must retain the following
    acknowledgment:
    "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
 
 THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
 EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -3374,7 +18957,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 boringssl
 
-Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
+Copyright (c) 2000-2003 The OpenSSL Project.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -3391,12 +18974,12 @@ are met:
 3. All advertising materials mentioning features or use of this
    software must display the following acknowledgment:
    "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
 
 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
    endorse or promote products derived from this software without
    prior written permission. For written permission, please contact
-   openssl-core@openssl.org.
+   licensing@OpenSSL.org.
 
 5. Products derived from this software may not be called "OpenSSL"
    nor may "OpenSSL" appear in their names without prior written
@@ -3405,7 +18988,7 @@ are met:
 6. Redistributions of any form whatsoever must retain the following
    acknowledgment:
    "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
 
 THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
 EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -3420,9 +19003,42 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
+icu
+
+Copyright (c) 2000-2004 IBM, Inc. and Others.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
 boringssl
 
-Copyright (c) 1998-2003 The OpenSSL Project.  All rights reserved.
+Copyright (c) 2000-2005 The OpenSSL Project.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -3439,12 +19055,12 @@ are met:
 3. All advertising materials mentioning features or use of this
    software must display the following acknowledgment:
    "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
 
 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
    endorse or promote products derived from this software without
    prior written permission. For written permission, please contact
-   openssl-core@openssl.org.
+   licensing@OpenSSL.org.
 
 5. Products derived from this software may not be called "OpenSSL"
    nor may "OpenSSL" appear in their names without prior written
@@ -3453,7 +19069,7 @@ are met:
 6. Redistributions of any form whatsoever must retain the following
    acknowledgment:
    "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
 
 THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
 EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -3468,9 +19084,77 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
+icu
+
+Copyright (c) 2000-2005, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (c) 2000-2007, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
 boringssl
 
-Copyright (c) 1998-2004 The OpenSSL Project.  All rights reserved.
+Copyright (c) 2001 The OpenSSL Project.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -3487,12 +19171,12 @@ are met:
 3. All advertising materials mentioning features or use of this
    software must display the following acknowledgment:
    "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
 
 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
    endorse or promote products derived from this software without
    prior written permission. For written permission, please contact
-   openssl-core@openssl.org.
+   licensing@OpenSSL.org.
 
 5. Products derived from this software may not be called "OpenSSL"
    nor may "OpenSSL" appear in their names without prior written
@@ -3501,7 +19185,7 @@ are met:
 6. Redistributions of any form whatsoever must retain the following
    acknowledgment:
    "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
 
 THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
 EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -3516,57 +19200,111 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-boringssl
+icu
 
-Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
+Copyright (c) 2001-2005, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
 
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+Copyright (c) 2001-2007, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   openssl-core@OpenSSL.org.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (c) 2001-2010 International Business Machines
+Corporation and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
 boringssl
 
-Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
+Copyright (c) 2001-2011 The OpenSSL Project.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -3612,440 +19350,569 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-boringssl
-
-Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
+icu
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+Copyright (c) 2001-2011, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
 
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   openssl-core@openssl.org.
+Copyright (c) 2001-2012, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-boringssl
-
-Copyright (c) 1998-2007 The OpenSSL Project.  All rights reserved.
+icu
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+Copyright (c) 2001-2012, International Business Machines Corporation
+and others.  All Rights Reserved.
 
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
 
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   openssl-core@openssl.org.
+Copyright (c) 2001-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-boringssl
-
-Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+icu
 
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
+Copyright (c) 2001-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   openssl-core@openssl.org.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
 
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
+Copyright (c) 2001-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
 icu
 
-Copyright (c) 1999 Computer Systems and Communication Lab,
-                   Institute of Information Science, Academia
-  *                    Sinica. All rights reserved.
+Copyright (c) 2001-2016, International Business Machines Corporation and
+others. All Rights Reserved.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-. Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-. Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in
-  the documentation and/or other materials provided with the
-  distribution.
-. Neither the name of the Computer Systems and Communication Lab
-  nor the names of its contributors may be used to endorse or
-  promote products derived from this software without specific
-  prior written permission.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-icu
+glslang
+
+Copyright (c) 2002, NVIDIA Corporation.
+
+NVIDIA Corporation("NVIDIA") supplies this software to you in
+consideration of your agreement to the following terms, and your use,
+installation, modification or redistribution of this NVIDIA software
+constitutes acceptance of these terms.  If you do not agree with these
+terms, please do not use, install, modify or redistribute this NVIDIA
+software.
+
+In consideration of your agreement to abide by the following terms, and
+subject to these terms, NVIDIA grants you a personal, non-exclusive
+license, under NVIDIA's copyrights in this original NVIDIA software (the
+"NVIDIA Software"), to use, reproduce, modify and redistribute the
+NVIDIA Software, with or without modifications, in source and/or binary
+forms; provided that if you redistribute the NVIDIA Software, you must
+retain the copyright notice of NVIDIA, this notice and the following
+text and disclaimers in all such redistributions of the NVIDIA Software.
+Neither the name, trademarks, service marks nor logos of NVIDIA
+Corporation may be used to endorse or promote products derived from the
+NVIDIA Software without specific prior written permission from NVIDIA.
+Except as expressly stated in this notice, no other rights or licenses
+express or implied, are granted by NVIDIA herein, including but not
+limited to any patent rights that may be infringed by your derivative
+works or by other works in which the NVIDIA Software may be
+incorporated. No hardware is licensed hereunder.
+
+THE NVIDIA SOFTWARE IS BEING PROVIDED ON AN "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED,
+INCLUDING WITHOUT LIMITATION, WARRANTIES OR CONDITIONS OF TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
+ITS USE AND OPERATION EITHER ALONE OR IN COMBINATION WITH OTHER
+PRODUCTS.
+
+IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT,
+INCIDENTAL, EXEMPLARY, CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, LOST PROFITS; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) OR ARISING IN ANY WAY
+OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE
+NVIDIA SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT,
+TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
+NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+expat
 
-Copyright (c) 1999 TaBE Project.
-Copyright (c) 1999 Pai-Hsiang Hsiao.
-All rights reserved.
+Copyright (c) 2002-2003 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
+Copyright (c) 2002-2006 Karl Waclawek <karl@waclawek.net>
+Copyright (c) 2003      Greg Stein <gstein@users.sourceforge.net>
+Copyright (c) 2016-2022 Sebastian Pipping <sebastian@pipping.org>
+Copyright (c) 2018      Yury Gribov <tetra2005@gmail.com>
+Copyright (c) 2019      David Loffredo <loffredo@steptools.com>
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+Licensed under the MIT license:
 
-. Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-. Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in
-  the documentation and/or other materials provided with the
-  distribution.
-. Neither the name of the TaBE Project nor the names of its
-  contributors may be used to endorse or promote products derived
-  from this software without specific prior written permission.
+Permission is  hereby granted,  free of charge,  to any  person obtaining
+a  copy  of  this  software   and  associated  documentation  files  (the
+"Software"),  to  deal in  the  Software  without restriction,  including
+without  limitation the  rights  to use,  copy,  modify, merge,  publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons  to whom  the Software  is  furnished to  do so,  subject to  the
+following conditions:
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------------------
-boringssl
+The above copyright  notice and this permission notice  shall be included
+in all copies or substantial portions of the Software.
 
-Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
+THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
+EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+--------------------------------------------------------------------------------
+icu
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+Copyright (c) 2002-2004, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
 
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
+Copyright (c) 2002-2005, International Business Machines Corporation
+and others.  All Rights Reserved.
 
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-expat
+icu
 
-Copyright (c) 1999-2000 Thai Open Source Software Center Ltd
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2002      Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2007      Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2017      Sebastian Pipping <sebastian@pipping.org>
-Licensed under the MIT license:
+Copyright (c) 2002-2005, International Business Machines Corporation and
+others. All Rights Reserved.
 
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-boringssl
+glfw
 
-Copyright (c) 1999-2002 The OpenSSL Project.  All rights reserved.
+Copyright (c) 2002-2006 Marcus Geelnard
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+Copyright (c) 2006-2019 Camilla Löwy
 
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
 
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not
+   be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
    distribution.
+--------------------------------------------------------------------------------
+glfw
 
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+Copyright (c) 2002-2006 Marcus Geelnard
+Copyright (c) 2006-2016 Camilla Löwy <elmindreda@glfw.org>
 
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
 
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
 
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
 
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
+2. Altered source versions must be plainly marked as such, and must not
+   be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+   distribution.
 --------------------------------------------------------------------------------
-boringssl
+glfw
 
-Copyright (c) 1999-2003 The OpenSSL Project.  All rights reserved.
+Copyright (c) 2002-2006 Marcus Geelnard
+Copyright (c) 2006-2017 Camilla Löwy <elmindreda@glfw.org>
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
 
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
 
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not
+   be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
    distribution.
+--------------------------------------------------------------------------------
+glfw
 
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+Copyright (c) 2002-2006 Marcus Geelnard
+Copyright (c) 2006-2018 Camilla Löwy <elmindreda@glfw.org>
 
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
 
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
 
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
 
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
+2. Altered source versions must be plainly marked as such, and must not
+   be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+   distribution.
 --------------------------------------------------------------------------------
-boringssl
+glfw
 
-Copyright (c) 1999-2004 The OpenSSL Project.  All rights reserved.
+Copyright (c) 2002-2006 Marcus Geelnard
+Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
 
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
 
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not
+   be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
    distribution.
+--------------------------------------------------------------------------------
+glfw
 
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+Copyright (c) 2002-2006 Marcus Geelnard
+Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
+Copyright (c) 2012 Torsten Walluhn <tw@mad-cad.net>
 
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
 
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
 
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not
+   be misrepresented as being the original software.
 
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
+3. This notice may not be removed or altered from any source
+   distribution.
 --------------------------------------------------------------------------------
 boringssl
 
-Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.
+Copyright (c) 2002-2006 The OpenSSL Project.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -4062,12 +19929,12 @@ are met:
 3. All advertising materials mentioning features or use of this
    software must display the following acknowledgment:
    "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
 
 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
    endorse or promote products derived from this software without
    prior written permission. For written permission, please contact
-   openssl-core@OpenSSL.org.
+   openssl-core@openssl.org.
 
 5. Products derived from this software may not be called "OpenSSL"
    nor may "OpenSSL" appear in their names without prior written
@@ -4076,7 +19943,7 @@ are met:
 6. Redistributions of any form whatsoever must retain the following
    acknowledgment:
    "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
 
 THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
 EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -4091,330 +19958,485 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-boringssl
-
-Copyright (c) 1999-2007 The OpenSSL Project.  All rights reserved.
+icu
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+Copyright (c) 2002-2006, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
 
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
+Copyright (c) 2002-2006, International Business Machines Corporation and
+others. All Rights Reserved.
 
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-boringssl
-
-Copyright (c) 1999-2008 The OpenSSL Project.  All rights reserved.
+icu
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+Copyright (c) 2002-2007, International Business Machines Corporation
+and others.  All Rights Reserved.
 
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
 
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
+Copyright (c) 2002-2010, International Business Machines Corporation *
+and others.  All Rights Reserved.
 
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-expat
+icu
 
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2001-2003 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2005-2007 Steven Solie <steven@solie.ca>
-Copyright (c) 2005-2006 Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2016-2022 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
-Licensed under the MIT license:
+Copyright (c) 2002-2011, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
 
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
+Copyright (c) 2002-2011, International Business Machines Corporation
+and others.  All Rights Reserved.
 
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-expat
+icu
 
-Copyright (c) 2000      Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2002      Greg Stein <gstein@users.sourceforge.net>
-Copyright (c) 2005      Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2017-2021 Sebastian Pipping <sebastian@pipping.org>
-Licensed under the MIT license:
+Copyright (c) 2002-2012, International Business Machines Corporation
+and others.  All Rights Reserved.
 
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-expat
+icu
 
-Copyright (c) 2000 Clark Cooper <coopercc@users.sourceforge.net>
-Copyright (c) 2017 Sebastian Pipping <sebastian@pipping.org>
-Licensed under the MIT license:
+Copyright (c) 2002-2012, International Business Machines Corporation and
+others. All Rights Reserved.
 
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-boringssl
-
-Copyright (c) 2000 The OpenSSL Project.  All rights reserved.
+icu
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+Copyright (c) 2002-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
 
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
+Copyright (c) 2002-2014, International Business Machines Corporation
+and others.  All Rights Reserved.
 
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-boringssl
-
-Copyright (c) 2000-2002 The OpenSSL Project.  All rights reserved.
+icu
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+Copyright (c) 2002-2014, International Business Machines Corporation and
+others. All Rights Reserved.
 
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
 
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
+Copyright (c) 2002-2015, International Business Machines Corporation and
+others. All Rights Reserved.
 
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-boringssl
-
-Copyright (c) 2000-2003 The OpenSSL Project.  All rights reserved.
+icu
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+Copyright (c) 2002-2016  International Business Machines Corporation and
+others. All Rights Reserved.
 
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
 
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
+Copyright (c) 2002-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
 boringssl
 
-Copyright (c) 2000-2005 The OpenSSL Project.  All rights reserved.
+Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -4460,211 +20482,279 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-expat
+icu
 
-Copyright (c) 2001      Tim Peters <tim.peters@gmail.com>
-Copyright (c) 2001-2005 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2006-2017 Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2007-2022 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2022      Johnny Jazeix <jazeix@gmail.com>
-Licensed under the MIT license:
+Copyright (c) 2003, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-boringssl
-
-Copyright (c) 2001 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+icu
 
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
+Copyright (c) 2003-2004, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-boringssl
+dart
 
-Copyright (c) 2001-2011 The OpenSSL Project.  All rights reserved.
+Copyright (c) 2003-2005  Tom Wu
+Copyright (c) 2012 Adam Singer (adam@solvr.io)
+All Rights Reserved.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
 
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
+THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
 
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+IN NO EVENT SHALL TOM WU BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER
+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF
+THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT
+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   openssl-core@openssl.org.
+In addition, the following condition applies:
 
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
+All redistributions must retain an intact copy of this copyright notice
+and disclaimer.
+--------------------------------------------------------------------------------
+icu
 
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+Copyright (c) 2003-2008, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-expat
+icu
 
-Copyright (c) 2002-2003 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
-Copyright (c) 2002-2006 Karl Waclawek <karl@waclawek.net>
-Copyright (c) 2003      Greg Stein <gstein@users.sourceforge.net>
-Copyright (c) 2016-2022 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2018      Yury Gribov <tetra2005@gmail.com>
-Copyright (c) 2019      David Loffredo <loffredo@steptools.com>
-Licensed under the MIT license:
+Copyright (c) 2003-2010 International Business Machines
+Corporation and others. All Rights Reserved.
 
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-glfw
+icu
 
-Copyright (c) 2002-2006 Marcus Geelnard
-Copyright (c) 2006-2016 Camilla Löwy <elmindreda@glfw.org>
+Copyright (c) 2003-2011, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would
-   be appreciated but is not required.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
 
-2. Altered source versions must be plainly marked as such, and must not
-   be misrepresented as being the original software.
+Copyright (c) 2003-2013, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-3. This notice may not be removed or altered from any source
-   distribution.
---------------------------------------------------------------------------------
-glfw
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Copyright (c) 2002-2006 Marcus Geelnard
-Copyright (c) 2006-2016 Camilla Löwy <elmindreda@glfw.org>
-Copyright (c) 2012 Torsten Walluhn <tw@mad-cad.net>
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+Copyright (c) 2003-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would
-   be appreciated but is not required.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-2. Altered source versions must be plainly marked as such, and must not
-   be misrepresented as being the original software.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-3. This notice may not be removed or altered from any source
-   distribution.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
 boringssl
 
-Copyright (c) 2002-2006 The OpenSSL Project.  All rights reserved.
+Copyright (c) 2004 The OpenSSL Project.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -4681,12 +20771,12 @@ are met:
 3. All advertising materials mentioning features or use of this
    software must display the following acknowledgment:
    "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
 
 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
    endorse or promote products derived from this software without
    prior written permission. For written permission, please contact
-   openssl-core@openssl.org.
+   licensing@OpenSSL.org.
 
 5. Products derived from this software may not be called "OpenSSL"
    nor may "OpenSSL" appear in their names without prior written
@@ -4695,7 +20785,7 @@ are met:
 6. Redistributions of any form whatsoever must retain the following
    acknowledgment:
    "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
 
 THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
 EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -4710,197 +20800,277 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-boringssl
-
-Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
+icu
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+Copyright (c) 2004, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
 
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
+Copyright (c) 2004-2006, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-tcmalloc
+icu
 
-Copyright (c) 2003, Google Inc.
-All rights reserved.
+Copyright (c) 2004-2010, International Business Machines Corporation and
+others. All Rights Reserved.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-dart
+icu
 
-Copyright (c) 2003-2005  Tom Wu
-Copyright (c) 2012 Adam Singer (adam@solvr.io)
-All Rights Reserved.
+Copyright (c) 2004-2014 International Business Machines
+Corporation and others.  All Rights Reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
-EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
-WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-IN NO EVENT SHALL TOM WU BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
-INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF
-THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
 
-In addition, the following condition applies:
+Copyright (c) 2004-2014, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-All redistributions must retain an intact copy of this copyright notice
-and disclaimer.
---------------------------------------------------------------------------------
-boringssl
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-Copyright (c) 2004 Kungliga Tekniska Högskolan
-(Royal Institute of Technology, Stockholm, Sweden).
-All rights reserved.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
 
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
+Copyright (c) 2004-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-3. Neither the name of the Institute nor the names of its contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-boringssl
-
-Copyright (c) 2004 The OpenSSL Project.  All rights reserved.
+icu
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+Copyright (c) 2004-2015, International Business Machines Corporation
+and others. All Rights Reserved.
 
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
 
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
+Copyright (c) 2004-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
 boringssl
 
@@ -4950,91 +21120,6 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-tcmalloc
-
-Copyright (c) 2005, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------------------
-StackWalker
-
-Copyright (c) 2005-2009, Jochen Kalmbach
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-Neither the name of Jochen Kalmbach nor the names of its contributors may be
-used to endorse or promote products derived from this software without
-specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------------------
-StackWalker
-
-Copyright (c) 2005-2013, Jochen Kalmbach
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-Neither the name of Jochen Kalmbach nor the names of its contributors may be
-used to endorse or promote products derived from this software without
-specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------------------
 boringssl
 
 Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
@@ -5162,101 +21247,221 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 glfw
 
-Copyright (c) 2006-2016 Camilla Löwy <elmindreda@glfw.org>
+Copyright (c) 2006-2017 Camilla Löwy <elmindreda@glfw.org>
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not
+   be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+   distribution.
+--------------------------------------------------------------------------------
+glfw
+
+Copyright (c) 2006-2018 Camilla Löwy <elmindreda@glfw.org>
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not
+   be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+   distribution.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (c) 2007-2012, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+Copyright (c) 2007-2012, International Business Machines Corporation and
+others. All Rights Reserved.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would
-   be appreciated but is not required.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-2. Altered source versions must be plainly marked as such, and must not
-   be misrepresented as being the original software.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-3. This notice may not be removed or altered from any source
-   distribution.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-khronos
-
-Copyright (c) 2007-2010 The Khronos Group Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and/or associated documentation files (the
-"Materials"), to deal in the Materials without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Materials, and to
-permit persons to whom the Materials are furnished to do so, subject to
-the following conditions:
+icu
 
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Materials.
+Copyright (c) 2007-2013, International Business Machines Corporation and
+others. All Rights Reserved.
 
-THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-Copyright (C) 1992 Silicon Graphics, Inc. All Rights Reserved.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
+Copyright (c) 2007-2014, International Business Machines Corporation and
+others. All Rights Reserved.
 
-The above copyright notice including the dates of first publication and either
-this permission notice or a reference to http://oss.sgi.com/projects/FreeB
-shall be included in all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL SILICON
-GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-Except as contained in this notice, the name of Silicon Graphics, Inc. shall
-not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from Silicon
-Graphics, Inc.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-khronos
+icu
 
-Copyright (c) 2007-2012 The Khronos Group Inc.
+Copyright (c) 2007-2016, International Business Machines Corporation and
+others. All Rights Reserved.
 
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and/or associated documentation files (the
-"Materials"), to deal in the Materials without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Materials, and to
-permit persons to whom the Materials are furnished to do so, subject to
-the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Materials.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-angle
+libXNVCtrl
 
 Copyright (c) 2008 NVIDIA, Corporation
 
@@ -5327,28 +21532,129 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-khronos
+include
+
+Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern@hoehrmann.de>
+
+Permission is hereby  granted, free of charge, to any  person obtaining a copy
+of this software and associated  documentation files (the "Software"), to deal
+in the Software  without restriction, including without  limitation the rights
+to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
+copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
+IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
+FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
+AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
+LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (c) 2008-2010, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (c) 2008-2011, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+icu
 
-Copyright (c) 2008-2009 The Khronos Group Inc.
+Copyright (c) 2008-2015, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and/or associated documentation files (the
-"Materials"), to deal in the Materials without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Materials, and to
-permit persons to whom the Materials are furnished to do so, subject to
-the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Materials.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
 --------------------------------------------------------------------------------
 angle
 
@@ -5373,23 +21679,27 @@ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
 --------------------------------------------------------------------------------
-libtess2
+include
 
-Copyright (c) 2009 Mikko Mononen memon@inside.org
+Copyright (c) 2009 Florian Loitsch.
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+Permission is hereby  granted, free of charge, to any  person obtaining a copy
+of this software and associated  documentation files (the "Software"), to deal
+in the Software  without restriction, including without  limitation the rights
+to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
+copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
+IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
+FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
+AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
+LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 --------------------------------------------------------------------------------
 accessibility
 
@@ -5421,6 +21731,40 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
+icu
+
+Copyright (c) 2009, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
 libcxx
 libcxxabi
 
@@ -5469,7 +21813,30 @@ freely, subject to the following restrictions:
 --------------------------------------------------------------------------------
 glfw
 
-Copyright (c) 2009-2016 Camilla Löwy <elmindreda@glfw.org>
+Copyright (c) 2009-2019 Camilla Löwy <elmindreda@glfw.org>
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not
+   be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+   distribution.
+--------------------------------------------------------------------------------
+glfw
+
+Copyright (c) 2009-2019 Camilla Löwy <elmindreda@glfw.org>
 Copyright (c) 2012 Torsten Walluhn <tw@mad-cad.net>
 
 This software is provided 'as-is', without any express or implied
@@ -5491,37 +21858,72 @@ freely, subject to the following restrictions:
 3. This notice may not be removed or altered from any source
    distribution.
 --------------------------------------------------------------------------------
-colorama
+libcxx
+libcxxabi
+
+Copyright (c) 2009-2019 by the contributors listed in CREDITS.TXT
 
-Copyright (c) 2010 Jonathan Hartley
 All rights reserved.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+Developed by:
+
+    LLVM Team
 
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
+    University of Illinois at Urbana-Champaign
 
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
+    http://llvm.org
 
-* Neither the name of the copyright holders, nor those of its contributors
-  may be used to endorse or promote products derived from this software without
-  specific prior written permission.
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal with
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimers.
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimers in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the names of the LLVM Team, University of Illinois at
+      Urbana-Champaign, nor the names of its contributors may be used to
+      endorse or promote products derived from this Software without specific
+      prior written permission.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
+SOFTWARE.
 --------------------------------------------------------------------------------
-angle
+glfw
+
+Copyright (c) 2009-2021 Camilla Löwy <elmindreda@glfw.org>
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not
+   be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+   distribution.
+--------------------------------------------------------------------------------
+libXNVCtrl
 
 Copyright (c) 2010 NVIDIA, Corporation
 
@@ -5684,9 +22086,9 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-glfw
+include
 
-Copyright (c) 2010-2016 Camilla Löwy <elmindreda@glfw.org>
+Copyright (c) 2011 - Nick Bruun.
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
@@ -5696,19 +22098,19 @@ Permission is granted to anyone to use this software for any purpose,
 including commercial applications, and to alter it and redistribute it
 freely, subject to the following restrictions:
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would
-   be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and must not
-   be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-   distribution.
+1.  The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+2.  Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+3.  If you meet (any of) the author(s), you're encouraged to buy them a beer,
+    a drink or whatever is suited to the situation, given that you like the
+    software.
+4.  This notice may not be removed or altered from any source
+    distribution.
 --------------------------------------------------------------------------------
 skia
-vulkanmemoryallocator
 
 Copyright (c) 2011 Google Inc. All rights reserved.
 
@@ -5738,6 +22140,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
+libmicrohttpd
 skia
 
 Copyright (c) 2011 Google Inc. All rights reserved.
@@ -5771,8 +22174,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 accessibility
-base
-zlib
+angle
 
 Copyright (c) 2011 The Chromium Authors. All rights reserved.
 
@@ -5928,8 +22330,41 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
+icu
+
+Copyright (c) 2011-2012 International Business Machines Corporation
+and others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
 accessibility
-zlib
 
 Copyright (c) 2012 The Chromium Authors. All rights reserved.
 
@@ -6068,6 +22503,29 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
+glslang
+
+Copyright (c) 2013 The Khronos Group Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and/or associated documentation files (the
+"Materials"), to deal in the Materials without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Materials, and to
+permit persons to whom the Materials are furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Materials.
+
+THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+--------------------------------------------------------------------------------
 boringssl
 
 Copyright (c) 2013 The OpenSSL Project.  All rights reserved.
@@ -6146,7 +22604,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-angle
 khronos
 
 Copyright (c) 2013-2014 The Khronos Group Inc.
@@ -6170,9 +22627,9 @@ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
 --------------------------------------------------------------------------------
-khronos
+angle
 
-Copyright (c) 2013-2016 The Khronos Group Inc.
+Copyright (c) 2013-2017 The Khronos Group Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and/or associated documentation files (the
@@ -6195,7 +22652,7 @@ MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
 --------------------------------------------------------------------------------
 angle
 
-Copyright (c) 2013-2017 The Khronos Group Inc.
+Copyright (c) 2013-2018 The Khronos Group Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and/or associated documentation files (the
@@ -6216,29 +22673,49 @@ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
 --------------------------------------------------------------------------------
-angle
-khronos
+include
 
-Copyright (c) 2013-2018 The Khronos Group Inc.
+Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
 
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and/or associated documentation files (the
-"Materials"), to deal in the Materials without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Materials, and to
-permit persons to whom the Materials are furnished to do so, subject to
-the following conditions:
+Permission is hereby  granted, free of charge, to any  person obtaining a copy
+of this software and associated  documentation files (the "Software"), to deal
+in the Software  without restriction, including without  limitation the rights
+to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
+copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
+furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Materials.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
+IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
+FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
+AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
+LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+--------------------------------------------------------------------------------
+json
+
+Copyright (c) 2013-2022 Niels Lohmann
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 --------------------------------------------------------------------------------
 skia
 
@@ -6272,44 +22749,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-icu
-
-Copyright (c) 2014 International Business Machines Corporation
-and others. All Rights Reserved.
-
-This list is part of a project hosted at:
-  github.com/kanyawtech/myanmar-karen-word-lists
-
-Copyright (c) 2013, LeRoy Benjamin Sharon
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met: Redistributions of source code must retain the above
-copyright notice, this list of conditions and the following
-disclaimer.  Redistributions in binary form must reproduce the
-above copyright notice, this list of conditions and the following
-disclaimer in the documentation and/or other materials provided
-with the distribution.
-
-  Neither the name Myanmar Karen Word Lists, nor the names of its
-  contributors may be used to endorse or promote products derived
-  from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
---------------------------------------------------------------------------------
 glfw
 
 Copyright (c) 2014 Jonas Ådahl <jadahl@gmail.com>
@@ -6363,48 +22802,9 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-boringssl
-
-Copyright (c) 2014 The OpenSSL Project.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. All advertising materials mentioning features or use of this software
-   must display the following acknowledgement:
-   "This product includes cryptographic software written by
-    Eric Young (eay@cryptsoft.com)"
-   The word 'cryptographic' can be left out if the rouines from the library
-   being used are not cryptographic related :-).
-4. If you include any Windows specific code (or a derivative thereof) from
-   the apps directory (application code) you must include an acknowledgement:
-   "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
-
-THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-The licence and distribution terms for any publically available version or
-derivative of this code cannot be changed.  i.e. this code cannot simply be
-copied and put under another distribution licence
-[including the GNU Public Licence.]
---------------------------------------------------------------------------------
 dart
 
-Copyright (c) 2014 The Polymer Authors. All rights reserved.
+Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -6448,6 +22848,40 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
 OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 --------------------------------------------------------------------------------
+icu
+
+Copyright (c) 2014, International Business Machines
+Corporation and others.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
 dart
 
 Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
@@ -6478,6 +22912,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
+glslang
 skia
 
 Copyright (c) 2014-2016 The Khronos Group Inc.
@@ -6491,54 +22926,133 @@ Materials are furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Materials.
+
+MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
+STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
+HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
+
+THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM,OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS
+IN THE MATERIALS.
 --------------------------------------------------------------------------------
-boringssl
+icu
 
-Copyright (c) 2015 The OpenSSL Project.  All rights reserved.
+Copyright (c) 2014-2016, International Business Machines
+Corporation and others.  All Rights Reserved.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
 
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
+glslang
 
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+Copyright (c) 2014-2017 The Khronos Group Inc.
 
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and/or associated documentation files (the "Materials"),
+to deal in the Materials without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Materials, and to permit persons to whom the
+Materials are furnished to do so, subject to the following conditions:
 
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Materials.
 
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
+STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
+HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
 
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
+THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM,OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS
+IN THE MATERIALS.
+--------------------------------------------------------------------------------
+glslang
+spirv-cross
+
+Copyright (c) 2014-2020 The Khronos Group Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and/or associated documentation files (the "Materials"),
+to deal in the Materials without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Materials, and to permit persons to whom the
+Materials are furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Materials.
+
+MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
+STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
+HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
+
+THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM,OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS
+IN THE MATERIALS.
+--------------------------------------------------------------------------------
+glslang
+
+Copyright (c) 2014-2020 The Khronos Group Inc.
+Copyright (C) 2022-2024 Arm Limited.
+Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and/or associated documentation files (the "Materials"),
+to deal in the Materials without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Materials, and to permit persons to whom the
+Materials are furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Materials.
+
+MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
+STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
+HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
+
+THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM,OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS
+IN THE MATERIALS.
 --------------------------------------------------------------------------------
 boringssl
 
@@ -6556,6 +23070,40 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
 OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 --------------------------------------------------------------------------------
+icu
+
+Copyright (c) 2015, International Business Machines Corporation and
+others. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
 dart
 
 Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
@@ -6586,10 +23134,58 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
+fiat
+
+Copyright (c) 2015-2020 the fiat-crypto authors (see
+
+https://github.com/mit-plv/fiat-crypto/blob/master/AUTHORS).
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+--------------------------------------------------------------------------------
 glfw
 
 Copyright (c) 2016 Google Inc.
-Copyright (c) 2006-2016 Camilla Löwy <elmindreda@glfw.org>
+Copyright (c) 2016-2017 Camilla Löwy <elmindreda@glfw.org>
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not
+   be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+   distribution.
+--------------------------------------------------------------------------------
+glfw
+
+Copyright (c) 2016 Google Inc.
+Copyright (c) 2016-2019 Camilla Löwy <elmindreda@glfw.org>
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
@@ -6656,31 +23252,28 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-expat
+glfw
 
-Copyright (c) 2017      José Gutiérrez de la Concha <jose@zeroc.com>
-Copyright (c) 2017-2022 Sebastian Pipping <sebastian@pipping.org>
-Copyright (c) 2017      Franek Korta <fkorta@gmail.com>
-Licensed under the MIT license:
+Copyright (c) 2016-2017 Camilla Löwy <elmindreda@glfw.org>
 
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
 
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
 
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not
+   be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+   distribution.
 --------------------------------------------------------------------------------
 boringssl
 
@@ -6779,6 +23372,7 @@ WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEM
 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 --------------------------------------------------------------------------------
+vulkan-validation-layers
 vulkan_memory_allocator
 
 Copyright (c) 2017-2022 Advanced Micro Devices, Inc. All rights reserved.
@@ -6801,35 +23395,31 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 --------------------------------------------------------------------------------
-vulkan
+glslang
 
-Copyright (c) 2018 Google Inc. All rights reserved.
+Copyright (c) 2018 The Khronos Group Inc.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and/or associated documentation files (the "Materials"),
+to deal in the Materials without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Materials, and to permit persons to whom the
+Materials are furnished to do so, subject to the following conditions:
 
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Materials.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
+STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
+HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
+
+THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM,OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS
+IN THE MATERIALS.
 --------------------------------------------------------------------------------
 boringssl
 
@@ -6924,29 +23514,47 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-expat
+inja
 
-Copyright (c) 2019 Expat development team
-Licensed under the MIT license:
+Copyright (c) 2018-2021 Berscheid
 
-Permission is  hereby granted,  free of charge,  to any  person obtaining
-a  copy  of  this  software   and  associated  documentation  files  (the
-"Software"),  to  deal in  the  Software  without restriction,  including
-without  limitation the  rights  to use,  copy,  modify, merge,  publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons  to whom  the Software  is  furnished to  do so,  subject to  the
-following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-The above copyright  notice and this permission notice  shall be included
-in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-THE  SOFTWARE  IS  PROVIDED  "AS  IS",  WITHOUT  WARRANTY  OF  ANY  KIND,
-EXPRESS  OR IMPLIED,  INCLUDING  BUT  NOT LIMITED  TO  THE WARRANTIES  OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+--------------------------------------------------------------------------------
+inja
+
+Copyright (c) 2018-2021 Lars Berscheid
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 --------------------------------------------------------------------------------
 boringssl
 
@@ -6964,6 +23572,32 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
 OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 --------------------------------------------------------------------------------
+glslang
+
+Copyright (c) 2019, Viktor Latypov
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
 dart
 
 Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
@@ -7009,36 +23643,20 @@ met:
       disclaimer in the documentation and/or other materials provided
       with the distribution.
     * Neither the name of Google LLC nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------------------
-boringssl
-
-Copyright (c) 2020 Google Inc.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 angle
 
@@ -7074,6 +23692,34 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
+glslang
+
+Copyright (c) 2020 The Khronos Group Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and/or associated documentation files (the
+"Materials"), to deal in the Materials without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Materials, and to
+permit persons to whom the Materials are furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Materials.
+
+MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS
+KHRONOS STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS
+SPECIFICATIONS AND HEADER INFORMATION ARE LOCATED AT
+   https://www.khronos.org/registry/
+
+THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+--------------------------------------------------------------------------------
 boringssl
 
 Copyright (c) 2020, Google Inc.
@@ -7090,6 +23736,32 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
 OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 --------------------------------------------------------------------------------
+glslang
+
+Copyright (c) 2020, Travis Fort
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
 dart
 
 Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
@@ -7120,6 +23792,52 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
+etc_decoder
+
+Copyright (c) 2020-2022 Hans-Kristian Arntzen
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+--------------------------------------------------------------------------------
+glfw
+
+Copyright (c) 2021 Camilla Löwy <elmindreda@glfw.org>
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not
+   be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+   distribution.
+--------------------------------------------------------------------------------
 expat
 harfbuzz
 
@@ -7151,6 +23869,54 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
+glslang
+
+Copyright (c) 2021 The Khronos Group Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and/or associated documentation files (the "Materials"),
+to deal in the Materials without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Materials, and to permit persons to whom the
+Materials are furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Materials.
+
+MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
+STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
+HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
+
+THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM,OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS
+IN THE MATERIALS.
+--------------------------------------------------------------------------------
+ceval
+
+Copyright (c) 2021 e_t
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+--------------------------------------------------------------------------------
 boringssl
 
 Copyright (c) 2021, Google Inc.
@@ -7197,6 +23963,55 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
+glslang
+
+Copyright (c) 2022 ARM Limited
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and/or associated documentation files (the "Materials"),
+to deal in the Materials without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Materials, and to permit persons to whom the
+Materials are furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Materials.
+
+MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
+STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
+HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
+
+THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM,OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS
+IN THE MATERIALS.
+--------------------------------------------------------------------------------
+glfw
+
+Copyright (c) 2022 Camilla Löwy <elmindreda@glfw.org>
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would
+   be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not
+   be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+   distribution.
+--------------------------------------------------------------------------------
 web_locale_keymap
 
 Copyright (c) 2022 Google LLC
@@ -7219,35 +24034,37 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 --------------------------------------------------------------------------------
-zlib
+boringssl
 
-Copyright (c) 2022 The Chromium Authors. All rights reserved.
+Copyright (c) 2022, Google Inc.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
 
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+--------------------------------------------------------------------------------
+boringssl
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Copyright (c) 2022, Robert Nagy <robert.nagy@gmail.com>
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 --------------------------------------------------------------------------------
 dart
 
@@ -7279,51 +24096,37 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-icu
-
-Copyright (c) IBM Corporation, 2000-2010.   All rights reserved.
+boringssl
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+Copyright (c) 2023, Google Inc.
 
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google Inc. nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 --------------------------------------------------------------------------------
-icu
+dart
 
-Copyright (c) IBM Corporation, 2000-2011.   All rights reserved.
+Copyright (c) 2023, the Dart project authors.  Please see the AUTHORS file
+for details. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
-
     * Redistributions of source code must retain the above copyright
       notice, this list of conditions and the following disclaimer.
     * Redistributions in binary form must reproduce the above
       copyright notice, this list of conditions and the following
       disclaimer in the documentation and/or other materials provided
       with the distribution.
-    * Neither the name of Google Inc. nor the names of its
+    * Neither the name of Google LLC nor the names of its
       contributors may be used to endorse or promote products derived
       from this software without specific prior written permission.
 
@@ -7339,21 +24142,21 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-icu
+dart
 
-Copyright (c) IBM Corporation, 2000-2012.  All rights reserved.
+Copyright (c) 2023, the Dart project authors. Please see the AUTHORS file
+for details. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
-
     * Redistributions of source code must retain the above copyright
       notice, this list of conditions and the following disclaimer.
     * Redistributions in binary form must reproduce the above
       copyright notice, this list of conditions and the following
       disclaimer in the documentation and/or other materials provided
       with the distribution.
-    * Neither the name of Google Inc. nor the names of its
+    * Neither the name of Google LLC nor the names of its
       contributors may be used to endorse or promote products derived
       from this software without specific prior written permission.
 
@@ -7369,21 +24172,21 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-icu
+dart
 
-Copyright (c) IBM Corporation, 2000-2014.  All rights reserved.
+Copyright (c) 2024, the Dart project authors.  Please see the AUTHORS file
+for details. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
-
     * Redistributions of source code must retain the above copyright
       notice, this list of conditions and the following disclaimer.
     * Redistributions in binary form must reproduce the above
       copyright notice, this list of conditions and the following
       disclaimer in the documentation and/or other materials provided
       with the distribution.
-    * Neither the name of Google Inc. nor the names of its
+    * Neither the name of Google LLC nor the names of its
       contributors may be used to endorse or promote products derived
       from this software without specific prior written permission.
 
@@ -7399,21 +24202,21 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-icu
+dart
 
-Copyright (c) IBM Corporation, 2000-2016.   All rights reserved.
+Copyright (c) 2024, the Dart project authors. Please see the AUTHORS file
+for details. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
-
     * Redistributions of source code must retain the above copyright
       notice, this list of conditions and the following disclaimer.
     * Redistributions in binary form must reproduce the above
       copyright notice, this list of conditions and the following
       disclaimer in the documentation and/or other materials provided
       with the distribution.
-    * Neither the name of Google Inc. nor the names of its
+    * Neither the name of Google LLC nor the names of its
       contributors may be used to endorse or promote products derived
       from this software without specific prior written permission.
 
@@ -7429,6 +24232,85 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
+icu
+
+Copyright (c) IBM Corporation, 2000-2010.   All rights reserved.
+
+This software is made available under the terms of the
+ICU License -- ICU 1.8.1 and later.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (c) IBM Corporation, 2000-2011.   All rights reserved.
+
+This software is made available under the terms of the
+ICU License -- ICU 1.8.1 and later.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (c) IBM Corporation, 2000-2012.  All rights reserved.
+
+This software is made available under the terms of the
+ICU License -- ICU 1.8.1 and later.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (c) IBM Corporation, 2000-2014.  All rights reserved.
+
+This software is made available under the terms of the
+ICU License -- ICU 1.8.1 and later.
+--------------------------------------------------------------------------------
+icu
+
+Copyright (c) IBM Corporation, 2000-2016.   All rights reserved.
+
+This software is made available under the terms of the
+ICU License -- ICU 1.8.1 and later.
+--------------------------------------------------------------------------------
+spring_animation
+
+Copyright (c) Meta Platforms, Inc. and affiliates.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+--------------------------------------------------------------------------------
+harfbuzz
+
+Copyright (c) Microsoft Corporation.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE
+--------------------------------------------------------------------------------
 freetype2
 
 Copyright 1990, 1994, 1998  The Open Group
@@ -7453,10 +24335,6 @@ Except as contained in this notice, the name of The Open Group shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 --------------------------------------------------------------------------------
-icu
-
-Copyright 1991 by the Massachusetts Institute of Technology
---------------------------------------------------------------------------------
 boringssl
 
 Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
@@ -7466,12 +24344,6 @@ this file except in compliance with the License.  You can obtain a copy
 in the file LICENSE in the source distribution or at
 https://www.openssl.org/source/license.html
 --------------------------------------------------------------------------------
-icu
-
-Copyright 1996 Chih-Hao Tsai @ Beckman Institute,
-    University of Illinois
-c-tsai4@uiuc.edu  http://casper.beckman.uiuc.edu/~c-tsai4
---------------------------------------------------------------------------------
 freetype2
 
 Copyright 2000 Computing Research Labs, New Mexico State University
@@ -7543,79 +24415,6 @@ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
 OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
 THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 --------------------------------------------------------------------------------
-icu
-
-Copyright 2000, 2001, 2002, 2003 Nara Institute of Science
-and Technology.  All Rights Reserved.
-
-Use, reproduction, and distribution of this software is permitted.
-Any copy of this software, whether in its original form or modified,
-must include both the above copyright notice and the following
-paragraphs.
-
-Nara Institute of Science and Technology (NAIST),
-the copyright holders, disclaims all warranties with regard to this
-software, including all implied warranties of merchantability and
-fitness, in no event shall NAIST be liable for
-any special, indirect or consequential damages or any damages
-whatsoever resulting from loss of use, data or profits, whether in an
-action of contract, negligence or other tortuous action, arising out
-of or in connection with the use or performance of this software.
-
-A large portion of the dictionary entries
-originate from ICOT Free Software.  The following conditions for ICOT
-Free Software applies to the current dictionary as well.
-
-Each User may also freely distribute the Program, whether in its
-original form or modified, to any third party or parties, PROVIDED
-that the provisions of Section 3 ("NO WARRANTY") will ALWAYS appear
-on, or be attached to, the Program, which is distributed substantially
-in the same form as set out herein and that such intended
-distribution, if actually made, will neither violate or otherwise
-contravene any of the laws and regulations of the countries having
-jurisdiction over the User or the intended distribution itself.
-
-NO WARRANTY
-
-The program was produced on an experimental basis in the course of the
-research and development conducted during the project and is provided
-to users as so produced on an experimental basis.  Accordingly, the
-program is provided without any warranty whatsoever, whether express,
-implied, statutory or otherwise.  The term "warranty" used herein
-includes, but is not limited to, any warranty of the quality,
-performance, merchantability and fitness for a particular purpose of
-the program and the nonexistence of any infringement or violation of
-any right of any third party.
-
-Each user of the program will agree and understand, and be deemed to
-have agreed and understood, that there is no warranty whatsoever for
-the program and, accordingly, the entire risk arising from or
-otherwise connected with the program is assumed by the user.
-
-Therefore, neither ICOT, the copyright holder, or any other
-organization that participated in or was otherwise related to the
-development of the program and their respective officials, directors,
-officers and other employees shall be held liable for any and all
-damages, including, without limitation, general, special, incidental
-and consequential damages, arising out of or otherwise in connection
-with the use or inability to use the program or any product, material
-or result produced or otherwise obtained by using the program,
-regardless of whether they have been advised of, or otherwise had
-knowledge of, the possibility of such damages at any time during the
-project or thereafter.  Each user will be deemed to have agreed to the
-foregoing by his or her commencement of use of the program.  The term
-"use" as used herein includes, but is not limited to, the use,
-modification, copying and distribution of the program and the
-production of secondary products from the program.
-
-In the case where the program, whether in its original form or
-modified, was distributed or delivered to or received by a user from
-any person, organization or entity other than ICOT, unless it makes or
-grants independently of ICOT any specific warranty to the user in
-writing, such person, organization or entity, will also be exempted
-from and not be held liable to the user for any such damages as noted
-above as far as the program is concerned.
---------------------------------------------------------------------------------
 freetype2
 
 Copyright 2000, 2001, 2004 by
@@ -7717,6 +24516,39 @@ this file except in compliance with the License.  You can obtain a copy
 in the file LICENSE in the source distribution or at
 https://www.openssl.org/source/license.html
 --------------------------------------------------------------------------------
+icu
+
+Copyright 2001 and onwards Google Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
 freetype2
 
 Copyright 2001, 2002, 2012 Francesco Zappa Nardelli
@@ -7741,51 +24573,32 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 --------------------------------------------------------------------------------
 boringssl
 
-Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+Copyright 2001-2017 The OpenSSL Project Authors. All Rights Reserved.
 
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
+Licensed under the OpenSSL license (the "License").  You may not use
+this file except in compliance with the License.  You can obtain a copy
+in the file LICENSE in the source distribution or at
+https://www.openssl.org/source/license.html
+--------------------------------------------------------------------------------
+boringssl
 
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
+Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
 
-3. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+Portions of the attached software ("Contribution") are developed by
+SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
 
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   endorse or promote products derived from this software without
-   prior written permission. For written permission, please contact
-   licensing@OpenSSL.org.
+The Contribution is licensed pursuant to the Eric Young open source
+license provided above.
+--------------------------------------------------------------------------------
+boringssl
 
-5. Products derived from this software may not be called "OpenSSL"
-   nor may "OpenSSL" appear in their names without prior written
-   permission of the OpenSSL Project.
+Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
 
-6. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+Portions of the attached software ("Contribution") are developed by
+SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
 
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
+The Contribution is licensed pursuant to the OpenSSL open source
+license provided above.
 --------------------------------------------------------------------------------
 boringssl
 
@@ -7806,12 +24619,12 @@ are met:
 3. All advertising materials mentioning features or use of this
    software must display the following acknowledgment:
    "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+   for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
 
 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
    endorse or promote products derived from this software without
    prior written permission. For written permission, please contact
-   openssl-core@openssl.org.
+   licensing@OpenSSL.org.
 
 5. Products derived from this software may not be called "OpenSSL"
    nor may "OpenSSL" appear in their names without prior written
@@ -7820,7 +24633,7 @@ are met:
 6. Redistributions of any form whatsoever must retain the following
    acknowledgment:
    "This product includes software developed by the OpenSSL Project
-   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+   for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
 
 THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
 EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -7835,6 +24648,18 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
+boringssl
+
+Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ECC cipher suite support in OpenSSL originally developed by
+SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
+--------------------------------------------------------------------------------
+boringssl
+
+Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ECDH support in OpenSSL originally developed by
+SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
+--------------------------------------------------------------------------------
 angle
 
 Copyright 2002 The ANGLE Project Authors. All rights reserved.
@@ -7892,6 +24717,39 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 --------------------------------------------------------------------------------
+icu
+
+Copyright 2004 and onwards Google Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
 boringssl
 
 Copyright 2005 Nokia. All rights reserved.
@@ -7939,37 +24797,6 @@ met:
     contributors may be used to endorse or promote products derived
     from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------------------
-boringssl
-
-Copyright 2005, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -8002,37 +24829,6 @@ met:
     contributors may be used to endorse or promote products derived
     from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------------------
-boringssl
-
-Copyright 2006, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -8049,35 +24845,7 @@ double-conversion
 icu
 
 Copyright 2006-2008 the V8 project authors. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google Inc. nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------------------
-icu
 
-Copyright 2006-2011, the V8 project authors. All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
@@ -8146,6 +24914,39 @@ this file except in compliance with the License.  You can obtain a copy
 in the file LICENSE in the source distribution or at
 https://www.openssl.org/source/license.html
 --------------------------------------------------------------------------------
+icu
+
+Copyright 2007 Google Inc. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+--------------------------------------------------------------------------------
 skia
 
 Copyright 2007 The Android Open Source Project
@@ -8180,22 +24981,32 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 boringssl
 
-Copyright 2007, Google Inc.
-All rights reserved.
+Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved.
+
+Licensed under the OpenSSL license (the "License").  You may not use
+this file except in compliance with the License.  You can obtain a copy
+in the file LICENSE in the source distribution or at
+https://www.openssl.org/source/license.html
+--------------------------------------------------------------------------------
+skia
+
+Copyright 2008 Google Inc.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -8209,18 +25020,9 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-boringssl
-
-Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved.
-
-Licensed under the OpenSSL license (the "License").  You may not use
-this file except in compliance with the License.  You can obtain a copy
-in the file LICENSE in the source distribution or at
-https://www.openssl.org/source/license.html
---------------------------------------------------------------------------------
 skia
 
-Copyright 2008 Google Inc.
+Copyright 2008 The Android Open Source Project
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -8250,24 +25052,50 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-boringssl
+libjpeg-turbo
 
-Copyright 2008 Google Inc.
-All Rights Reserved.
+Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
+Copyright (C) 2010, D. R. Commander.
+
+Based on the x86 SIMD extension for IJG JPEG library - version 1.02
+
+Copyright (C) 1999-2006, MIYASAKA Masaru.
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+--------------------------------------------------------------------------------
+skia
+
+Copyright 2009 The Android Open Source Project
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -8283,7 +25111,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 skia
 
-Copyright 2008 The Android Open Source Project
+Copyright 2009-2015 Google Inc.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -8313,24 +25141,25 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-boringssl
+skia
 
-Copyright 2008, Google Inc.
-All rights reserved.
+Copyright 2010 Google Inc.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -8344,29 +25173,31 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-boringssl
+libwebp
 
-Copyright 2009 Google Inc. All Rights Reserved.
+Copyright 2010 Google Inc. All Rights Reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of Google nor the names of its contributors may
+    be used to endorse or promote products derived from this software
+    without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
@@ -8374,331 +25205,145 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-libjpeg-turbo
-
-Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-
-Based on the x86 SIMD extension for IJG JPEG library
-Copyright (C) 1999-2006, MIYASAKA Masaru.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
---------------------------------------------------------------------------------
-libjpeg-turbo
-
-Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-
-Based on the x86 SIMD extension for IJG JPEG library,
-Copyright (C) 1999-2006, MIYASAKA Masaru.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
---------------------------------------------------------------------------------
-libjpeg-turbo
-
-Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-Copyright (C) 2009, D. R. Commander.
-
-Based on the x86 SIMD extension for IJG JPEG library
-Copyright (C) 1999-2006, MIYASAKA Masaru.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
---------------------------------------------------------------------------------
-libjpeg-turbo
-
-Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-Copyright (C) 2009-2011, 2013-2014, 2016, D. R. Commander.
-Copyright (C) 2015, Matthieu Darbois.
-
-Based on the x86 SIMD extension for IJG JPEG library,
-Copyright (C) 1999-2006, MIYASAKA Masaru.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
---------------------------------------------------------------------------------
-libjpeg-turbo
-
-Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-Copyright (C) 2009-2011, 2013-2014, 2016, D. R. Commander.
-Copyright (C) 2015-2016, Matthieu Darbois.
-
-Based on the x86 SIMD extension for IJG JPEG library,
-Copyright (C) 1999-2006, MIYASAKA Masaru.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
---------------------------------------------------------------------------------
-libjpeg-turbo
-
-Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-Copyright (C) 2009-2011, 2014, 2016, D. R. Commander.
-Copyright (C) 2015, Matthieu Darbois.
-
-Based on the x86 SIMD extension for IJG JPEG library,
-Copyright (C) 1999-2006, MIYASAKA Masaru.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
---------------------------------------------------------------------------------
-libjpeg-turbo
-
-Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-Copyright (C) 2009-2011, 2014, D. R. Commander.
-Copyright (C) 2013-2014, MIPS Technologies, Inc., California.
-Copyright (C) 2015, Matthieu Darbois.
-
-Based on the x86 SIMD extension for IJG JPEG library,
-Copyright (C) 1999-2006, MIYASAKA Masaru.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
---------------------------------------------------------------------------------
-libjpeg-turbo
-
-Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-Copyright (C) 2009-2011, 2014, D. R. Commander.
-Copyright (C) 2015, Matthieu Darbois.
-
-Based on the x86 SIMD extension for IJG JPEG library,
-Copyright (C) 1999-2006, MIYASAKA Masaru.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
---------------------------------------------------------------------------------
-libjpeg-turbo
-
-Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-Copyright (C) 2009-2011, 2014-2015, D. R. Commander.
-Copyright (C) 2015, Matthieu Darbois.
-
-Based on the x86 SIMD extension for IJG JPEG library,
-Copyright (C) 1999-2006, MIYASAKA Masaru.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
---------------------------------------------------------------------------------
-libjpeg-turbo
+angle
 
-Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-Copyright (C) 2010, D. R. Commander.
+Copyright 2010 The ANGLE Project Authors. All rights reserved.
 
-Based on the x86 SIMD extension for IJG JPEG library - version 1.02
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
 
-Copyright (C) 1999-2006, MIYASAKA Masaru.
+    Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+    Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
+    Ltd., nor the names of their contributors may be used to endorse
+    or promote products derived from this software without specific
+    prior written permission.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-libjpeg-turbo
+skia
 
-Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-Copyright (C) 2011, 2014, D. R. Commander.
-Copyright (C) 2015, Matthieu Darbois.
+Copyright 2010 The Android Open Source Project
 
-Based on the x86 SIMD extension for IJG JPEG library,
-Copyright (C) 1999-2006, MIYASAKA Masaru.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+  * Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-libjpeg-turbo
+boringssl
 
-Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-Copyright (C) 2011, 2014-2016, D. R. Commander.
-Copyright (C) 2013-2014, MIPS Technologies, Inc., California.
-Copyright (C) 2014, Linaro Limited.
-Copyright (C) 2015-2016, Matthieu Darbois.
+Copyright 2010 The Chromium Authors
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file
+--------------------------------------------------------------------------------
+double-conversion
+icu
 
-Based on the x86 SIMD extension for IJG JPEG library,
-Copyright (C) 1999-2006, MIYASAKA Masaru.
+Copyright 2010 the V8 project authors. All rights reserved.
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google Inc. nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-libjpeg-turbo
+skia
 
-Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-Copyright (C) 2011, D. R. Commander.
+Copyright 2011 Google Inc.
 
-Based on the x86 SIMD extension for IJG JPEG library
-Copyright (C) 1999-2006, MIYASAKA Masaru.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+  * Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 skia
 
-Copyright 2009 The Android Open Source Project
+Copyright 2011 Google Inc.
+Copyright 2012 Mozilla Foundation
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -8728,57 +25373,75 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-libjpeg-turbo
+libwebp
 
-Copyright 2009, 2012 Pierre Ossman <ossman@cendio.se> for Cendio AB
-Copyright (C) 2009, 2012, D. R. Commander.
+Copyright 2011 Google Inc. All Rights Reserved.
 
-Based on the x86 SIMD extension for IJG JPEG library
-Copyright (C) 1999-2006, MIYASAKA Masaru.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+  * Neither the name of Google nor the names of its contributors may
+    be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-libjpeg-turbo
+angle
 
-Copyright 2009, 2012 Pierre Ossman <ossman@cendio.se> for Cendio AB
-Copyright (C) 2012, D. R. Commander.
+Copyright 2011 The ANGLE Project Authors. All rights reserved.
 
-Based on the x86 SIMD extension for IJG JPEG library
-Copyright (C) 1999-2006, MIYASAKA Masaru.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
 
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
+    Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
 
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
+    Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
 
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
+    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
+    Ltd., nor the names of their contributors may be used to endorse
+    or promote products derived from this software without specific
+    prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 skia
 
-Copyright 2009-2015 Google Inc.
+Copyright 2011 The Android Open Source Project
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -8808,9 +25471,15 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
+boringssl
+
+Copyright 2011 The Chromium Authors
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file
+--------------------------------------------------------------------------------
 skia
 
-Copyright 2010 Google Inc.
+Copyright 2012 Google Inc.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -8842,7 +25511,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 libwebp
 
-Copyright 2010 Google Inc. All Rights Reserved.
+Copyright 2012 Google Inc. All Rights Reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -8872,9 +25541,41 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
+skia
+
+Copyright 2012 Google LLC
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
 angle
 
-Copyright 2010 The ANGLE Project Authors. All rights reserved.
+Copyright 2012 The ANGLE Project Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -8908,7 +25609,7 @@ POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 skia
 
-Copyright 2010 The Android Open Source Project
+Copyright 2012 The Android Open Source Project
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -8938,10 +25639,17 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
+boringssl
+
+Copyright 2012 The Chromium Authors
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file
+--------------------------------------------------------------------------------
 double-conversion
 icu
 
-Copyright 2010 the V8 project authors. All rights reserved.
+Copyright 2012 the V8 project authors. All rights reserved.
+
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
@@ -8968,25 +25676,22 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-skia
+dart
 
-Copyright 2011 Google Inc.
+Copyright 2012, the Dart project authors.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-  * Neither the name of the copyright holder nor the names of its
-    contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission.
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google LLC nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -9000,10 +25705,18 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
+boringssl
+
+Copyright 2012-2016 The OpenSSL Project Authors. All Rights Reserved.
+
+Licensed under the OpenSSL license (the "License").  You may not use
+this file except in compliance with the License.  You can obtain a copy
+in the file LICENSE in the source distribution or at
+https://www.openssl.org/source/license.html
+--------------------------------------------------------------------------------
 skia
 
-Copyright 2011 Google Inc.
-Copyright 2012 Mozilla Foundation
+Copyright 2013 Google Inc.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -9035,7 +25748,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 libwebp
 
-Copyright 2011 Google Inc. All Rights Reserved.
+Copyright 2013 Google Inc. All Rights Reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -9067,7 +25780,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 angle
 
-Copyright 2011 The ANGLE Project Authors. All rights reserved.
+Copyright 2013 The ANGLE Project Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -9101,7 +25814,123 @@ POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 skia
 
-Copyright 2011 The Android Open Source Project
+Copyright 2013 The Android Open Source Project
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+accessibility
+
+Copyright 2013 The Chromium Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+accessibility
+engine
+spring_animation
+tonic
+txt
+web_test_fonts
+web_unicode
+
+Copyright 2013 The Flutter Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google Inc. nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+boringssl
+
+Copyright 2013-2016 The OpenSSL Project Authors. All Rights Reserved.
+Copyright (c) 2012, Intel Corporation. All Rights Reserved.
+
+Licensed under the OpenSSL license (the "License").  You may not use
+this file except in compliance with the License.  You can obtain a copy
+in the file LICENSE in the source distribution or at
+https://www.openssl.org/source/license.html
+--------------------------------------------------------------------------------
+angle
+
+Copyright 2013-2020 The Khronos Group Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+--------------------------------------------------------------------------------
+skia
+
+Copyright 2014 Google Inc.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -9133,7 +25962,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 skia
 
-Copyright 2012 Google Inc.
+Copyright 2014 Google Inc.
+Copyright 2017 ARM Ltd.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -9165,7 +25995,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 libwebp
 
-Copyright 2012 Google Inc. All Rights Reserved.
+Copyright 2014 Google Inc. All Rights Reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -9197,7 +26027,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 angle
 
-Copyright 2012 The ANGLE Project Authors. All rights reserved.
+Copyright 2014 The ANGLE Project Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -9231,7 +26061,7 @@ POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 skia
 
-Copyright 2012 The Android Open Source Project
+Copyright 2014 The Android Open Source Project
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -9261,23 +26091,31 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-double-conversion
+boringssl
+
+Copyright 2014 The Chromium Authors
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file
+--------------------------------------------------------------------------------
+accessibility
+angle
 icu
 
-Copyright 2012 the V8 project authors. All rights reserved.
+Copyright 2014 The Chromium Authors. All rights reserved.
+
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google Inc. nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -9291,22 +26129,20 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-dart
+fuchsia_sdk
 
-Copyright 2012, the Dart project authors.
+Copyright 2014 The Fuchsia Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google LLC nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -9322,7 +26158,46 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 boringssl
 
-Copyright 2012-2016 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved.
+
+Licensed under the OpenSSL license (the "License").  You may not use
+this file except in compliance with the License.  You can obtain a copy
+in the file LICENSE in the source distribution or at
+https://www.openssl.org/source/license.html
+--------------------------------------------------------------------------------
+boringssl
+
+Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved.
+Copyright (c) 2014, Intel Corporation. All Rights Reserved.
+
+Licensed under the OpenSSL license (the "License").  You may not use
+this file except in compliance with the License.  You can obtain a copy
+in the file LICENSE in the source distribution or at
+https://www.openssl.org/source/license.html
+--------------------------------------------------------------------------------
+boringssl
+
+Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved.
+Copyright (c) 2015, Intel Inc.
+
+Licensed under the OpenSSL license (the "License").  You may not use
+this file except in compliance with the License.  You can obtain a copy
+in the file LICENSE in the source distribution or at
+https://www.openssl.org/source/license.html
+--------------------------------------------------------------------------------
+spirv-cross
+
+Copyright 2014-2016,2021 The Khronos Group, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+--------------------------------------------------------------------------------
+boringssl
+
+Copyright 2014-2020 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the OpenSSL license (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
@@ -9331,7 +26206,7 @@ https://www.openssl.org/source/license.html
 --------------------------------------------------------------------------------
 skia
 
-Copyright 2013 Google Inc.
+Copyright 2015 Google Inc.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -9363,7 +26238,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 libwebp
 
-Copyright 2013 Google Inc. All Rights Reserved.
+Copyright 2015 Google Inc. All Rights Reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -9395,7 +26270,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 angle
 
-Copyright 2013 The ANGLE Project Authors. All rights reserved.
+Copyright 2015 The ANGLE Project Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -9429,7 +26304,7 @@ POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 skia
 
-Copyright 2013 The Android Open Source Project
+Copyright 2015 The Android Open Source Project
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -9459,9 +26334,16 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
+boringssl
+
+Copyright 2015 The Chromium Authors
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file
+--------------------------------------------------------------------------------
 accessibility
+skia
 
-Copyright 2013 The Chromium Authors. All rights reserved.
+Copyright 2015 The Chromium Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -9489,52 +26371,34 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-accessibility
-engine
-gpu
-tonic
-txt
-web_unicode
-
-Copyright 2013 The Flutter Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google Inc. nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------------------
 boringssl
 
-Copyright 2013-2016 The OpenSSL Project Authors. All Rights Reserved.
-Copyright (c) 2012, Intel Corporation. All Rights Reserved.
+Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the OpenSSL license (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
 in the file LICENSE in the source distribution or at
 https://www.openssl.org/source/license.html
 --------------------------------------------------------------------------------
+boringssl
+
+Copyright 2016 Brian Smith.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+--------------------------------------------------------------------------------
 skia
 
-Copyright 2014 Google Inc.
+Copyright 2016 Google Inc.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -9564,10 +26428,9 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-skia
+libwebp
 
-Copyright 2014 Google Inc.
-Copyright 2017 ARM Ltd.
+Copyright 2016 Google Inc. All Rights Reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -9581,15 +26444,15 @@ met:
     the documentation and/or other materials provided with the
     distribution.
 
-  * Neither the name of the copyright holder nor the names of its
-    contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission.
+  * Neither the name of Google nor the names of its contributors may
+    be used to endorse or promote products derived from this software
+    without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
@@ -9597,9 +26460,9 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-libwebp
+skia
 
-Copyright 2014 Google Inc. All Rights Reserved.
+Copyright 2016 Mozilla Foundation
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -9613,15 +26476,15 @@ met:
     the documentation and/or other materials provided with the
     distribution.
 
-  * Neither the name of Google nor the names of its contributors may
-    be used to endorse or promote products derived from this software
-    without specific prior written permission.
+  * Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
@@ -9631,7 +26494,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 angle
 
-Copyright 2014 The ANGLE Project Authors. All rights reserved.
+Copyright 2016 The ANGLE Project Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -9665,7 +26528,7 @@ POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 skia
 
-Copyright 2014 The Android Open Source Project
+Copyright 2016 The Android Open Source Project
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -9695,12 +26558,15 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
+boringssl
+
+Copyright 2016 The Chromium Authors
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file
+--------------------------------------------------------------------------------
 accessibility
-base
-icu
-zlib
 
-Copyright 2014 The Chromium Authors. All rights reserved.
+Copyright 2016 The Chromium Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -9730,7 +26596,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 fuchsia_sdk
 
-Copyright 2014 The Fuchsia Authors. All rights reserved.
+Copyright 2016 The Fuchsia Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -9755,38 +26621,41 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-boringssl
+skia
 
-Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017 ARM Ltd.
 
-Licensed under the OpenSSL license (the "License").  You may not use
-this file except in compliance with the License.  You can obtain a copy
-in the file LICENSE in the source distribution or at
-https://www.openssl.org/source/license.html
---------------------------------------------------------------------------------
-boringssl
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
 
-Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved.
-Copyright (c) 2014, Intel Corporation. All Rights Reserved.
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
 
-Licensed under the OpenSSL license (the "License").  You may not use
-this file except in compliance with the License.  You can obtain a copy
-in the file LICENSE in the source distribution or at
-https://www.openssl.org/source/license.html
---------------------------------------------------------------------------------
-boringssl
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
 
-Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved.
-Copyright (c) 2015, Intel Inc.
+  * Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
 
-Licensed under the OpenSSL license (the "License").  You may not use
-this file except in compliance with the License.  You can obtain a copy
-in the file LICENSE in the source distribution or at
-https://www.openssl.org/source/license.html
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 skia
 
-Copyright 2015 Google Inc.
+Copyright 2017 Google Inc.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -9818,7 +26687,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 libwebp
 
-Copyright 2015 Google Inc. All Rights Reserved.
+Copyright 2017 Google Inc. All Rights Reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -9850,7 +26719,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 angle
 
-Copyright 2015 The ANGLE Project Authors. All rights reserved.
+Copyright 2017 The ANGLE Project Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -9882,25 +26751,60 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-skia
+zlib
 
-Copyright 2015 The Android Open Source Project
+Copyright 2017 The Chromium Authors
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
 
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+boringssl
 
-  * Neither the name of the copyright holder nor the names of its
-    contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission.
+Copyright 2017 The Chromium Authors
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file
+--------------------------------------------------------------------------------
+accessibility
+angle
+
+Copyright 2017 The Chromium Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -9914,12 +26818,9 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-accessibility
-icu
-skia
-vulkan-deps
+fuchsia_sdk
 
-Copyright 2015 The Chromium Authors. All rights reserved.
+Copyright 2017 The Fuchsia Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -9931,9 +26832,6 @@ notice, this list of conditions and the following disclaimer.
 copyright notice, this list of conditions and the following disclaimer
 in the documentation and/or other materials provided with the
 distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -9947,24 +26845,25 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-boringssl
+skia
 
-Copyright 2015, Google Inc.
-All rights reserved.
+Copyright 2018 Google Inc.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -9978,34 +26877,41 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-boringssl
+libwebp
 
-Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2018 Google Inc. All Rights Reserved.
 
-Licensed under the OpenSSL license (the "License").  You may not use
-this file except in compliance with the License.  You can obtain a copy
-in the file LICENSE in the source distribution or at
-https://www.openssl.org/source/license.html
---------------------------------------------------------------------------------
-boringssl
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
 
-Copyright 2016 Brian Smith.
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
 
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
 
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  * Neither the name of Google nor the names of its contributors may
+    be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 skia
 
-Copyright 2016 Google Inc.
+Copyright 2018 Google LLC
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -10035,9 +26941,9 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-libwebp
+skia
 
-Copyright 2016 Google Inc. All Rights Reserved.
+Copyright 2018 Google LLC.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -10051,15 +26957,15 @@ met:
     the documentation and/or other materials provided with the
     distribution.
 
-  * Neither the name of Google nor the names of its contributors may
-    be used to endorse or promote products derived from this software
-    without specific prior written permission.
+  * Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
@@ -10069,7 +26975,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 skia
 
-Copyright 2016 Mozilla Foundation
+Copyright 2018 Google, LLC
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -10100,9 +27006,43 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 angle
-base
 
-Copyright 2016 The ANGLE Project Authors. All rights reserved.
+Copyright 2018 The ANGLE Project Authors.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+    Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+
+    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
+    Ltd., nor the names of their contributors may be used to endorse
+    or promote products derived from this software without specific
+    prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+angle
+
+Copyright 2018 The ANGLE Project Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -10136,7 +27076,7 @@ POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 skia
 
-Copyright 2016 The Android Open Source Project
+Copyright 2018 The Android Open Source Project
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -10154,6 +27094,36 @@ met:
     contributors may be used to endorse or promote products derived
     from this software without specific prior written permission.
 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+zlib
+
+Copyright 2018 The Chromium Authors
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -10167,10 +27137,10 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 accessibility
-icu
+angle
 skia
 
-Copyright 2016 The Chromium Authors. All rights reserved.
+Copyright 2018 The Chromium Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -10200,7 +27170,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 fuchsia_sdk
 
-Copyright 2016 The Fuchsia Authors. All rights reserved.
+Copyright 2018 The Fuchsia Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -10225,9 +27195,38 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
+libcxx
+
+Copyright 2018 Ulf Adams
+Copyright (c) Microsoft Corporation. All rights reserved.
+
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+--------------------------------------------------------------------------------
 skia
 
-Copyright 2017 ARM Ltd.
+Copyright 2019 Google Inc.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -10259,7 +27258,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 skia
 
-Copyright 2017 Google Inc.
+Copyright 2019 Google LLC
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -10289,9 +27288,45 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-libwebp
+skia
 
-Copyright 2017 Google Inc. All Rights Reserved.
+Copyright 2019 Google LLC.
+--------------------------------------------------------------------------------
+skia
+
+Copyright 2019 Google LLC.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+skia
+
+Copyright 2019 Google, LLC
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -10300,31 +27335,65 @@ met:
   * Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
 
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+angle
+xxhash
+
+Copyright 2019 The ANGLE Project Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+    Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
 
-  * Neither the name of Google nor the names of its contributors may
-    be used to endorse or promote products derived from this software
-    without specific prior written permission.
+    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
+    Ltd., nor the names of their contributors may be used to endorse
+    or promote products derived from this software without specific
+    prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 angle
-base
 
-Copyright 2017 The ANGLE Project Authors. All rights reserved.
+Copyright 2019 The ANGLE Project. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -10356,11 +27425,41 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-accessibility
-base
+skia
+
+Copyright 2019 The Android Open Source Project
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
 zlib
 
-Copyright 2017 The Chromium Authors. All rights reserved.
+Copyright 2019 The Chromium Authors
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -10388,9 +27487,15 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-fuchsia_sdk
+boringssl
 
-Copyright 2017 The Fuchsia Authors. All rights reserved.
+Copyright 2019 The Chromium Authors
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file
+--------------------------------------------------------------------------------
+accessibility
+
+Copyright 2019 The Chromium Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -10402,6 +27507,9 @@ notice, this list of conditions and the following disclaimer.
 copyright notice, this list of conditions and the following disclaimer
 in the documentation and/or other materials provided with the
 distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -10415,18 +27523,9 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-boringssl
-
-Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
-
-Licensed under the OpenSSL license (the "License").  You may not use
-this file except in compliance with the License.  You can obtain a copy
-in the file LICENSE in the source distribution or at
-https://www.openssl.org/source/license.html
---------------------------------------------------------------------------------
-vulkanmemoryallocator
+fuchsia_sdk
 
-Copyright 2018 Google Inc.
+Copyright 2019 The Fuchsia Authors.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -10438,9 +27537,6 @@ notice, this list of conditions and the following disclaimer.
 copyright notice, this list of conditions and the following disclaimer
 in the documentation and/or other materials provided with the
 distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -10454,25 +27550,20 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-skia
+fuchsia_sdk
 
-Copyright 2018 Google Inc.
+Copyright 2019 The Fuchsia Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-  * Neither the name of the copyright holder nor the names of its
-    contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission.
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -10486,9 +27577,9 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-libwebp
+skia
 
-Copyright 2018 Google Inc. All Rights Reserved.
+Copyright 2020 Google Inc.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -10502,15 +27593,15 @@ met:
     the documentation and/or other materials provided with the
     distribution.
 
-  * Neither the name of Google nor the names of its contributors may
-    be used to endorse or promote products derived from this software
-    without specific prior written permission.
+  * Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
@@ -10520,7 +27611,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 skia
 
-Copyright 2018 Google LLC
+Copyright 2020 Google LLC
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -10552,7 +27643,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 skia
 
-Copyright 2018 Google LLC.
+Copyright 2020 Google LLC.
+--------------------------------------------------------------------------------
+skia
+
+Copyright 2020 Google LLC.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -10584,7 +27679,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 skia
 
-Copyright 2018 Google, LLC
+Copyright 2020 Google, LLC
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -10616,8 +27711,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 angle
 
-Copyright 2018 The ANGLE Project Authors.
-All rights reserved.
+Copyright 2020 The ANGLE Project Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -10651,7 +27745,7 @@ POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 angle
 
-Copyright 2018 The ANGLE Project Authors. All rights reserved.
+Copyright 2020 The ANGLE Project. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -10683,25 +27777,23 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-skia
+accessibility
 
-Copyright 2018 The Android Open Source Project
+Copyright 2020 The Chromium Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-  * Neither the name of the copyright holder nor the names of its
-    contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission.
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -10715,13 +27807,9 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-accessibility
-base
 fuchsia_sdk
-skia
-zlib
 
-Copyright 2018 The Chromium Authors. All rights reserved.
+Copyright 2020 The Fuchsia Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -10733,9 +27821,6 @@ notice, this list of conditions and the following disclaimer.
 copyright notice, this list of conditions and the following disclaimer
 in the documentation and/or other materials provided with the
 distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -10749,20 +27834,25 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-fuchsia_sdk
+skia
 
-Copyright 2018 The Fuchsia Authors. All rights reserved.
+Copyright 2021 Google Inc.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -10776,9 +27866,9 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-skia
+libwebp
 
-Copyright 2019 Google Inc.
+Copyright 2021 Google Inc. All Rights Reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -10792,15 +27882,15 @@ met:
     the documentation and/or other materials provided with the
     distribution.
 
-  * Neither the name of the copyright holder nor the names of its
-    contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission.
+  * Neither the name of Google nor the names of its contributors may
+    be used to endorse or promote products derived from this software
+    without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
@@ -10810,7 +27900,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 skia
 
-Copyright 2019 Google LLC
+Copyright 2021 Google LLC
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -10842,7 +27932,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 skia
 
-Copyright 2019 Google LLC.
+Copyright 2021 Google LLC.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -10874,7 +27964,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 skia
 
-Copyright 2019 Google, LLC
+Copyright 2021 Google, LLC
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -10905,9 +27995,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 angle
-xxhash
 
-Copyright 2019 The ANGLE Project Authors. All rights reserved.
+Copyright 2021 The ANGLE Project Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -10941,7 +28030,7 @@ POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 angle
 
-Copyright 2019 The ANGLE Project. All rights reserved.
+Copyright 2021 The ANGLE Project. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -10953,64 +28042,29 @@ are met:
     Redistributions in binary form must reproduce the above
     copyright notice, this list of conditions and the following
     disclaimer in the documentation and/or other materials provided
-    with the distribution.
-
-    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
-    Ltd., nor the names of their contributors may be used to endorse
-    or promote products derived from this software without specific
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------------------
-skia
-
-Copyright 2019 The Android Open Source Project
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-  * Neither the name of the copyright holder nor the names of its
-    contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission.
+    with the distribution.
+
+    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
+    Ltd., nor the names of their contributors may be used to endorse
+    or promote products derived from this software without specific
+    prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-accessibility
-fuchsia_sdk
-skia
-zlib
+libjxl
 
-Copyright 2019 The Chromium Authors. All rights reserved.
+Copyright 2021 The Chromium Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -11040,7 +28094,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 fuchsia_sdk
 
-Copyright 2019 The Fuchsia Authors.
+Copyright 2021 The Fuchsia Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -11066,50 +28120,58 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 angle
-fuchsia_sdk
 
-Copyright 2019 The Fuchsia Authors. All rights reserved.
+Copyright 2021-2022 The ANGLE Project Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+modification, are permitted provided that the following conditions
+are met:
 
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
+    Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+    Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+
+    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
+    Ltd., nor the names of their contributors may be used to endorse
+    or promote products derived from this software without specific
+    prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-icu
+skia
 
-Copyright 2019 the V8 project authors. All rights reserved.
+Copyright 2022 Google Inc.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google LLC nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -11123,9 +28185,9 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-skia
+libwebp
 
-Copyright 2020 Google Inc.
+Copyright 2022 Google Inc. All Rights Reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -11139,15 +28201,15 @@ met:
     the documentation and/or other materials provided with the
     distribution.
 
-  * Neither the name of the copyright holder nor the names of its
-    contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission.
+  * Neither the name of Google nor the names of its contributors may
+    be used to endorse or promote products derived from this software
+    without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
@@ -11157,7 +28219,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 skia
 
-Copyright 2020 Google LLC
+Copyright 2022 Google LLC
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -11189,7 +28251,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 skia
 
-Copyright 2020 Google LLC.
+Copyright 2022 Google LLC.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -11221,7 +28283,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 skia
 
-Copyright 2020 Google, LLC
+Copyright 2022 Google, LLC
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -11253,41 +28315,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 angle
 
-Copyright 2020 The ANGLE Project Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-    Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.
-
-    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
-    Ltd., nor the names of their contributors may be used to endorse
-    or promote products derived from this software without specific
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------------------
-angle
-
-Copyright 2020 The ANGLE Project. All rights reserved.
+Copyright 2022 The ANGLE Project Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -11319,11 +28347,9 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-abseil-cpp
-accessibility
-skia
+zlib
 
-Copyright 2020 The Chromium Authors. All rights reserved.
+Copyright 2022 The Chromium Authors
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -11351,9 +28377,15 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
+boringssl
+
+Copyright 2022 The Chromium Authors
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file
+--------------------------------------------------------------------------------
 fuchsia_sdk
 
-Copyright 2020 The Fuchsia Authors. All rights reserved.
+Copyright 2022 The Fuchsia Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -11380,7 +28412,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 skia
 
-Copyright 2021 Google Inc.
+Copyright 2023 Google Inc.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -11412,7 +28444,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 skia
 
-Copyright 2021 Google LLC
+Copyright 2023 Google LLC
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -11444,7 +28476,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 skia
 
-Copyright 2021 Google LLC.
+Copyright 2023 Google LLC.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -11476,7 +28508,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 skia
 
-Copyright 2021 Google, LLC
+Copyright 2023 Google, LLC
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -11508,41 +28540,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 angle
 
-Copyright 2021 The ANGLE Project Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-    Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.
-
-    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
-    Ltd., nor the names of their contributors may be used to endorse
-    or promote products derived from this software without specific
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------------------
-angle
-
-Copyright 2021 The ANGLE Project. All rights reserved.
+Copyright 2023 The ANGLE Project Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -11574,26 +28572,25 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-angle
-fuchsia_sdk
-libjxl
 skia
 
-Copyright 2021 The Chromium Authors. All rights reserved.
+Copyright 2023 The Android Open Source Project
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -11604,40 +28601,18 @@ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------------------
-fuchsia_sdk
-
-Copyright 2021 The Flutter Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google Inc. nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+boringssl
+
+Copyright 2023 The Chromium Authors
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file
 --------------------------------------------------------------------------------
 fuchsia_sdk
 
-Copyright 2021 The Fuchsia Authors. All rights reserved.
+Copyright 2023 The Fuchsia Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -11662,43 +28637,9 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-angle
-
-Copyright 2021-2022 The ANGLE Project Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-    Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.
-
-    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
-    Ltd., nor the names of their contributors may be used to endorse
-    or promote products derived from this software without specific
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------------------
 skia
 
-Copyright 2022 Google Inc.
+Copyright 2024 Google Inc.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -11730,7 +28671,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 skia
 
-Copyright 2022 Google LLC
+Copyright 2024 Google LLC
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -11762,7 +28703,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 skia
 
-Copyright 2022 Google LLC.
+Copyright 2024 The Android Open Source Project
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -11792,171 +28733,395 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
-skia
+fuchsia_sdk
+
+Copyright 2024 The Fuchsia Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+boringssl
+
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+--------------------------------------------------------------------------------
+angle
+
+Copyright The ANGLE Project Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+    Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+
+    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
+    Ltd., nor the names of their contributors may be used to endorse
+    or promote products derived from this software without specific
+    prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+harfbuzz
+
+Copyright © 1998-2004  David Turner and Werner Lemberg
+Copyright © 2004,2007,2009  Red Hat, Inc.
+Copyright © 2011,2012  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+--------------------------------------------------------------------------------
+harfbuzz
+
+Copyright © 1998-2004  David Turner and Werner Lemberg
+Copyright © 2004,2007,2009,2010  Red Hat, Inc.
+Copyright © 2011,2012  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+--------------------------------------------------------------------------------
+harfbuzz
+
+Copyright © 1998-2004  David Turner and Werner Lemberg
+Copyright © 2006  Behdad Esfahbod
+Copyright © 2007,2008,2009  Red Hat, Inc.
+Copyright © 2012,2013  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+--------------------------------------------------------------------------------
+harfbuzz
+
+Copyright © 2007  Chris Wilson
+Copyright © 2009,2010  Red Hat, Inc.
+Copyright © 2011,2012  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+--------------------------------------------------------------------------------
+harfbuzz
+
+Copyright © 2007,2008,2009  Red Hat, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+--------------------------------------------------------------------------------
+harfbuzz
+
+Copyright © 2007,2008,2009  Red Hat, Inc.
+Copyright © 2010,2011,2012  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
 
-Copyright 2022 Google, LLC
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+--------------------------------------------------------------------------------
+harfbuzz
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+Copyright © 2007,2008,2009  Red Hat, Inc.
+Copyright © 2010,2012  Google, Inc.
 
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
+This is part of HarfBuzz, a text shaping library.
 
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
 
-  * Neither the name of the copyright holder nor the names of its
-    contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
-angle
-
-Copyright 2022 The ANGLE Project Authors. All rights reserved.
+harfbuzz
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+Copyright © 2007,2008,2009  Red Hat, Inc.
+Copyright © 2011,2012  Google, Inc.
 
-    Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
+This is part of HarfBuzz, a text shaping library.
 
-    Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
 
-    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
-    Ltd., nor the names of their contributors may be used to endorse
-    or promote products derived from this software without specific
-    prior written permission.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
-skia
-zlib
+harfbuzz
 
-Copyright 2022 The Chromium Authors. All rights reserved.
+Copyright © 2007,2008,2009  Red Hat, Inc.
+Copyright © 2012  Google, Inc.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+This is part of HarfBuzz, a text shaping library.
 
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
-fuchsia_sdk
+harfbuzz
 
-Copyright 2022 The Fuchsia Authors. All rights reserved.
+Copyright © 2007,2008,2009  Red Hat, Inc.
+Copyright © 2012,2013  Google, Inc.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+This is part of HarfBuzz, a text shaping library.
 
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------------------
-angle
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
 
-Copyright The ANGLE Project Authors. All rights reserved.
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+--------------------------------------------------------------------------------
+harfbuzz
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+Copyright © 2007,2008,2009  Red Hat, Inc.
+Copyright © 2012,2013  Google, Inc.
+Copyright © 2019, Facebook Inc.
 
-    Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
+This is part of HarfBuzz, a text shaping library.
 
-    Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
 
-    Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
-    Ltd., nor the names of their contributors may be used to endorse
-    or promote products derived from this software without specific
-    prior written permission.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 1998-2004  David Turner and Werner Lemberg
-Copyright © 2004,2007,2009  Red Hat, Inc.
-Copyright © 2011,2012  Google, Inc.
+Copyright © 2007,2008,2009  Red Hat, Inc.
+Copyright © 2018,2019,2020  Ebrahim Byagowi
+Copyright © 2018  Khaled Hosny
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+--------------------------------------------------------------------------------
+harfbuzz
+
+Copyright © 2007,2008,2009,2010  Red Hat, Inc.
+Copyright © 2010,2012  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -11978,11 +29143,10 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 1998-2004  David Turner and Werner Lemberg
-Copyright © 2004,2007,2009,2010  Red Hat, Inc.
-Copyright © 2011,2012  Google, Inc.
+Copyright © 2007,2008,2009,2010  Red Hat, Inc.
+Copyright © 2010,2012,2013  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12004,12 +29168,10 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 1998-2004  David Turner and Werner Lemberg
-Copyright © 2006  Behdad Esfahbod
-Copyright © 2007,2008,2009  Red Hat, Inc.
-Copyright © 2012,2013  Google, Inc.
+Copyright © 2007,2008,2009,2010  Red Hat, Inc.
+Copyright © 2012  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12031,11 +29193,10 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2007  Chris Wilson
-Copyright © 2009,2010  Red Hat, Inc.
-Copyright © 2011,2012  Google, Inc.
+Copyright © 2007,2008,2009,2010  Red Hat, Inc.
+Copyright © 2012,2018  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12057,9 +29218,11 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2007,2008,2009  Red Hat, Inc.
+Copyright © 2007,2008,2009,2010  Red Hat, Inc.
+Copyright © 2012,2018  Google, Inc.
+Copyright © 2019  Facebook, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12081,10 +29244,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2007,2008,2009  Red Hat, Inc.
-Copyright © 2010,2011,2012  Google, Inc.
+Copyright © 2009  Red Hat, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12106,10 +29268,11 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2007,2008,2009  Red Hat, Inc.
-Copyright © 2010,2012  Google, Inc.
+Copyright © 2009  Red Hat, Inc.
+Copyright © 2009  Keith Stribley
+Copyright © 2011  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12131,10 +29294,11 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2007,2008,2009  Red Hat, Inc.
-Copyright © 2011,2012  Google, Inc.
+Copyright © 2009  Red Hat, Inc.
+Copyright © 2009  Keith Stribley
+Copyright © 2015  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12156,10 +29320,11 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2007,2008,2009  Red Hat, Inc.
-Copyright © 2012  Google, Inc.
+Copyright © 2009  Red Hat, Inc.
+Copyright © 2011  Codethink Limited
+Copyright © 2010,2011,2012  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12181,10 +29346,11 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2007,2008,2009  Red Hat, Inc.
-Copyright © 2012,2013  Google, Inc.
+Copyright © 2009  Red Hat, Inc.
+Copyright © 2011  Codethink Limited
+Copyright © 2011,2012  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12206,11 +29372,10 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2007,2008,2009  Red Hat, Inc.
-Copyright © 2012,2013  Google, Inc.
-Copyright © 2019, Facebook Inc.
+Copyright © 2009  Red Hat, Inc.
+Copyright © 2011  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12232,11 +29397,10 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2007,2008,2009  Red Hat, Inc.
-Copyright © 2018,2019,2020  Ebrahim Byagowi
-Copyright © 2018  Khaled Hosny
+Copyright © 2009  Red Hat, Inc.
+Copyright © 2012  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12258,10 +29422,10 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2007,2008,2009,2010  Red Hat, Inc.
-Copyright © 2010,2012  Google, Inc.
+Copyright © 2009  Red Hat, Inc.
+Copyright © 2015  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12283,10 +29447,10 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2007,2008,2009,2010  Red Hat, Inc.
-Copyright © 2010,2012,2013  Google, Inc.
+Copyright © 2009  Red Hat, Inc.
+Copyright © 2018  Ebrahim Byagowi
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12308,10 +29472,10 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2007,2008,2009,2010  Red Hat, Inc.
-Copyright © 2012  Google, Inc.
+Copyright © 2009  Red Hat, Inc.
+Copyright © 2018  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12333,10 +29497,10 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2007,2008,2009,2010  Red Hat, Inc.
-Copyright © 2012,2018  Google, Inc.
+Copyright © 2009,2010  Red Hat, Inc.
+Copyright © 2010,2011,2012  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12358,11 +29522,10 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2007,2008,2009,2010  Red Hat, Inc.
-Copyright © 2012,2018  Google, Inc.
-Copyright © 2019  Facebook, Inc.
+Copyright © 2009,2010  Red Hat, Inc.
+Copyright © 2010,2011,2012,2013  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12384,9 +29547,10 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2009  Red Hat, Inc.
+Copyright © 2009,2010  Red Hat, Inc.
+Copyright © 2010,2011,2013  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12408,11 +29572,10 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2009  Red Hat, Inc.
-Copyright © 2009  Keith Stribley
-Copyright © 2011  Google, Inc.
+Copyright © 2009,2010  Red Hat, Inc.
+Copyright © 2011,2012  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12434,11 +29597,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2009  Red Hat, Inc.
-Copyright © 2009  Keith Stribley
-Copyright © 2015  Google, Inc.
+Copyright © 2010  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12460,11 +29621,10 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2009  Red Hat, Inc.
-Copyright © 2011  Codethink Limited
-Copyright © 2010,2011,2012  Google, Inc.
+Copyright © 2010  Red Hat, Inc.
+Copyright © 2012  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12486,11 +29646,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2009  Red Hat, Inc.
-Copyright © 2011  Codethink Limited
-Copyright © 2011,2012  Google, Inc.
+Copyright © 2010,2011  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12512,10 +29670,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2009  Red Hat, Inc.
-Copyright © 2011  Google, Inc.
+Copyright © 2010,2011,2012  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12537,10 +29694,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2009  Red Hat, Inc.
-Copyright © 2012  Google, Inc.
+Copyright © 2010,2011,2013  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12562,10 +29718,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2009  Red Hat, Inc.
-Copyright © 2015  Google, Inc.
+Copyright © 2010,2012  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12587,10 +29742,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2009  Red Hat, Inc.
-Copyright © 2018  Ebrahim Byagowi
+Copyright © 2011  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12612,10 +29766,10 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2009  Red Hat, Inc.
-Copyright © 2018  Google, Inc.
+Copyright © 2011  Martin Hosken
+Copyright © 2011  SIL International
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12637,10 +29791,11 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2009,2010  Red Hat, Inc.
-Copyright © 2010,2011,2012  Google, Inc.
+Copyright © 2011  Martin Hosken
+Copyright © 2011  SIL International
+Copyright © 2011,2012  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12662,10 +29817,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2009,2010  Red Hat, Inc.
-Copyright © 2010,2011,2012,2013  Google, Inc.
+Copyright © 2011,2012  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12687,10 +29841,10 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2009,2010  Red Hat, Inc.
-Copyright © 2010,2011,2013  Google, Inc.
+Copyright © 2011,2012  Google, Inc.
+Copyright © 2018  Ebrahim Byagowi
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12712,10 +29866,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2009,2010  Red Hat, Inc.
-Copyright © 2011,2012  Google, Inc.
+Copyright © 2011,2012,2013  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12737,9 +29890,10 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2010  Google, Inc.
+Copyright © 2011,2012,2013  Google, Inc.
+Copyright © 2021  Khaled Hosny
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12761,10 +29915,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2010  Red Hat, Inc.
-Copyright © 2012  Google, Inc.
+Copyright © 2011,2012,2014  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12786,9 +29939,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2010,2011  Google, Inc.
+Copyright © 2011,2014  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12810,9 +29963,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2010,2011,2012  Google, Inc.
+Copyright © 2012  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12834,9 +29987,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2010,2011,2013  Google, Inc.
+Copyright © 2012  Mozilla Foundation.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12858,9 +30011,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2010,2012  Google, Inc.
+Copyright © 2012,2013  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12882,9 +30035,10 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2011  Google, Inc.
+Copyright © 2012,2013  Mozilla Foundation.
+Copyright © 2012,2013  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12906,10 +30060,10 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2011  Martin Hosken
-Copyright © 2011  SIL International
+Copyright © 2012,2017  Google, Inc.
+Copyright © 2021 Behdad Esfahbod
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12931,11 +30085,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2011  Martin Hosken
-Copyright © 2011  SIL International
-Copyright © 2011,2012  Google, Inc.
+Copyright © 2012,2018  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12957,9 +30109,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2011,2012  Google, Inc.
+Copyright © 2013  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -12981,10 +30133,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2011,2012  Google, Inc.
-Copyright © 2018  Ebrahim Byagowi
+Copyright © 2013  Red Hat, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13006,9 +30157,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2011,2012,2013  Google, Inc.
+Copyright © 2014  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13030,10 +30181,11 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2011,2012,2013  Google, Inc.
-Copyright © 2021  Khaled Hosny
+Copyright © 2015  Google, Inc.
+Copyright © 2019  Adobe Inc.
+Copyright © 2019  Ebrahim Byagowi
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13055,9 +30207,10 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2011,2012,2014  Google, Inc.
+Copyright © 2015  Mozilla Foundation.
+Copyright © 2015  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13079,9 +30232,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2011,2014  Google, Inc.
+Copyright © 2015-2019  Ebrahim Byagowi
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13103,9 +30256,11 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2012  Google, Inc.
+Copyright © 2016  Elie Roux <elie.roux@telecom-bretagne.eu>
+Copyright © 2018  Google, Inc.
+Copyright © 2018-2019  Ebrahim Byagowi
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13127,9 +30282,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2012  Mozilla Foundation.
+Copyright © 2016  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13151,9 +30306,10 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2012,2013  Google, Inc.
+Copyright © 2016  Google, Inc.
+Copyright © 2018  Ebrahim Byagowi
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13175,10 +30331,11 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2012,2013  Mozilla Foundation.
-Copyright © 2012,2013  Google, Inc.
+Copyright © 2016  Google, Inc.
+Copyright © 2018  Khaled Hosny
+Copyright © 2018  Ebrahim Byagowi
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13200,10 +30357,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2012,2017  Google, Inc.
-Copyright © 2021 Behdad Esfahbod
+Copyright © 2016  Igalia S.L.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13225,9 +30381,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2012,2018  Google, Inc.
+Copyright © 2017  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13249,9 +30405,10 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2013  Google, Inc.
+Copyright © 2017  Google, Inc.
+Copyright © 2018  Ebrahim Byagowi
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13273,9 +30430,10 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2013  Red Hat, Inc.
+Copyright © 2017  Google, Inc.
+Copyright © 2019  Facebook, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13297,9 +30455,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2014  Google, Inc.
+Copyright © 2017,2018  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13321,11 +30479,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2015  Google, Inc.
-Copyright © 2019  Adobe Inc.
-Copyright © 2019  Ebrahim Byagowi
+Copyright © 2018  Ebrahim Byagowi
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13347,10 +30503,10 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2015  Mozilla Foundation.
-Copyright © 2015  Google, Inc.
+Copyright © 2018  Ebrahim Byagowi
+Copyright © 2018  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13372,9 +30528,10 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2015-2019  Ebrahim Byagowi
+Copyright © 2018  Ebrahim Byagowi
+Copyright © 2020  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13396,11 +30553,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2016  Elie Roux <elie.roux@telecom-bretagne.eu>
-Copyright © 2018  Google, Inc.
-Copyright © 2018-2019  Ebrahim Byagowi
+Copyright © 2018  Ebrahim Byagowi.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13422,9 +30577,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2016  Google, Inc.
+Copyright © 2018  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13446,10 +30601,10 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2016  Google, Inc.
-Copyright © 2018  Ebrahim Byagowi
+Copyright © 2018  Google, Inc.
+Copyright © 2019  Facebook, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13471,11 +30626,10 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2016  Google, Inc.
-Copyright © 2018  Khaled Hosny
-Copyright © 2018  Ebrahim Byagowi
+Copyright © 2018  Google, Inc.
+Copyright © 2023  Behdad Esfahbod
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13497,9 +30651,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2016  Igalia S.L.
+Copyright © 2018 Adobe Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13521,9 +30675,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2017  Google, Inc.
+Copyright © 2018-2019  Ebrahim Byagowi
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13545,10 +30699,10 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2017  Google, Inc.
-Copyright © 2018  Ebrahim Byagowi
+Copyright © 2019  Adobe Inc.
+Copyright © 2019  Ebrahim Byagowi
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13570,10 +30724,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2017  Google, Inc.
-Copyright © 2019  Facebook, Inc.
+Copyright © 2019  Adobe, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13595,9 +30748,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2017,2018  Google, Inc.
+Copyright © 2019  Ebrahim Byagowi
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13619,9 +30772,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2018  Ebrahim Byagowi
+Copyright © 2019  Facebook, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13643,10 +30796,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2018  Ebrahim Byagowi
-Copyright © 2018  Google, Inc.
+Copyright © 2019 Adobe Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13668,10 +30820,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2018  Ebrahim Byagowi
-Copyright © 2020  Google, Inc.
+Copyright © 2019-2020  Ebrahim Byagowi
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13693,9 +30844,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2018  Ebrahim Byagowi.
+Copyright © 2020  Ebrahim Byagowi
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13717,9 +30868,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2018  Google, Inc.
+Copyright © 2020  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13741,10 +30892,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2018  Google, Inc.
-Copyright © 2019  Facebook, Inc.
+Copyright © 2021  Behdad Esfahbod
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13766,9 +30916,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2018 Adobe Inc.
+Copyright © 2021  Behdad Esfahbod.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13790,9 +30940,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2018-2019  Ebrahim Byagowi
+Copyright © 2021  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13814,10 +30964,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2019  Adobe Inc.
-Copyright © 2019  Ebrahim Byagowi
+Copyright © 2022  Behdad Esfahbod
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13839,9 +30988,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2019  Adobe, Inc.
+Copyright © 2022  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13863,9 +31012,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2019  Ebrahim Byagowi
+Copyright © 2022  Red Hat, Inc
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13887,9 +31036,10 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2019  Facebook, Inc.
+Copyright © 2022  Red Hat, Inc
+Copyright © 2021, 2022  Black Foundry
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13911,9 +31061,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2019 Adobe Inc.
+Copyright © 2022  Red Hat, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13935,9 +31085,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2019-2020  Ebrahim Byagowi
+Copyright © 2022 Behdad Esfahbod
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13959,9 +31109,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2020  Ebrahim Byagowi
+Copyright © 2022 Matthias Clasen
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -13983,9 +31133,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2020  Google, Inc.
+Copyright © 2022 Red Hat, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -14007,9 +31157,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2021  Behdad Esfahbod
+Copyright © 2023  Behdad Esfahbod
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -14031,9 +31181,12 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2021  Behdad Esfahbod.
+Copyright © 2023  Behdad Esfahbod
+Copyright © 1999  David Turner
+Copyright © 2005  Werner Lemberg
+Copyright © 2013-2015  Alexei Podtelezhnikov
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -14055,9 +31208,9 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
 harfbuzz
 
-Copyright © 2021  Google, Inc.
+Copyright © 2023  Google, Inc.
 
- This is part of HarfBuzz, a text shaping library.
+This is part of HarfBuzz, a text shaping library.
 
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
@@ -14077,28 +31230,75 @@ FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
 ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
 PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
+glslang
+
+Copyright(C) 2021 Advanced Micro Devices, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+   Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+   Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+boringssl
+
+DTLS code by Eric Rescorla <ekr@rtfm.com>
+
+Copyright (C) 2006, Network Resonance, Inc.
+Copyright (C) 2011, RTFM, Inc.
+--------------------------------------------------------------------------------
 harfbuzz
 
 HarfBuzz is licensed under the so-called "Old MIT" license.  Details follow.
 For parts of HarfBuzz that are licensed under different licenses see individual
 files names COPYING in subdirectories where applicable.
 
-Copyright © 2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020  Google, Inc.
-Copyright © 2018,2019,2020  Ebrahim Byagowi
+Copyright © 2010-2022  Google, Inc.
+Copyright © 2015-2020  Ebrahim Byagowi
 Copyright © 2019,2020  Facebook, Inc.
-Copyright © 2012  Mozilla Foundation
+Copyright © 2012,2015  Mozilla Foundation
 Copyright © 2011  Codethink Limited
 Copyright © 2008,2010  Nokia Corporation and/or its subsidiary(-ies)
 Copyright © 2009  Keith Stribley
-Copyright © 2009  Martin Hosken and SIL International
+Copyright © 2011  Martin Hosken and SIL International
 Copyright © 2007  Chris Wilson
-Copyright © 2005,2006,2020,2021  Behdad Esfahbod
-Copyright © 2005  David Turner
-Copyright © 2004,2007,2008,2009,2010  Red Hat, Inc.
-Copyright © 1998-2004  David Turner and Werner Lemberg
+Copyright © 2005,2006,2020,2021,2022,2023  Behdad Esfahbod
+Copyright © 2004,2007,2008,2009,2010,2013,2021,2022,2023  Red Hat, Inc.
+Copyright © 1998-2005  David Turner and Werner Lemberg
+Copyright © 2016  Igalia S.L.
+Copyright © 2022  Matthias Clasen
+Copyright © 2018,2021  Khaled Hosny
+Copyright © 2018,2019,2020  Adobe, Inc
+Copyright © 2013-2015  Alexei Podtelezhnikov
 
 For full copyright notices consult the individual files in the package.
 
+
 Permission is hereby granted, without written agreement and without
 license or royalty fees, to use, copy, modify, and distribute this
 software and its documentation for any purpose, provided that the
@@ -14117,257 +31317,55 @@ FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
 ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
 PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 --------------------------------------------------------------------------------
-json
-
-MIT License
-
-Copyright (c) 2013-2022 Niels Lohmann
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
---------------------------------------------------------------------------------
-angle
-
-MIT License
-
-Copyright (c) 2021 e_t
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
---------------------------------------------------------------------------------
-root_certificates
-
-Mozilla Public License
-Version 2.0
-
-1. Definitions
-
-1.1. “Contributor”
-
-means each individual or legal entity that creates, contributes to the creation of, or owns Covered Software.
-
-1.2. “Contributor Version”
-
-means the combination of the Contributions of others (if any) used by a Contributor and that particular Contributor’s Contribution.
-
-1.3. “Contribution”
-
-means Covered Software of a particular Contributor.
-
-1.4. “Covered Software”
-
-means Source Code Form to which the initial Contributor has attached the notice in Exhibit A, the Executable Form of such Source Code Form, and Modifications of such Source Code Form, in each case including portions thereof.
-
-1.5. “Incompatible With Secondary Licenses”
-
-means
-
-    a. that the initial Contributor has attached the notice described in Exhibit B to the Covered Software; or
-
-    b. that the Covered Software was made available under the terms of version 1.1 or earlier of the License, but not also under the terms of a Secondary License.
-
-1.6. “Executable Form”
-
-means any form of the work other than Source Code Form.
-
-1.7. “Larger Work”
-
-means a work that combines Covered Software with other material, in a separate file or files, that is not Covered Software.
-
-1.8. “License”
-
-means this document.
-
-1.9. “Licensable”
-
-means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently, any and all of the rights conveyed by this License.
-
-1.10. “Modifications”
-
-means any of the following:
-
-    a. any file in Source Code Form that results from an addition to, deletion from, or modification of the contents of Covered Software; or
-
-    b. any new file in Source Code Form that contains any Covered Software.
-
-1.11. “Patent Claims” of a Contributor
-
-means any patent claim(s), including without limitation, method, process, and apparatus claims, in any patent Licensable by such Contributor that would be infringed, but for the grant of the License, by the making, using, selling, offering for sale, having made, import, or transfer of either its Contributions or its Contributor Version.
-
-1.12. “Secondary License”
-
-means either the GNU General Public License, Version 2.0, the GNU Lesser General Public License, Version 2.1, the GNU Affero General Public License, Version 3.0, or any later versions of those licenses.
-
-1.13. “Source Code Form”
-
-means the form of the work preferred for making modifications.
-
-1.14. “You” (or “Your”)
-
-means an individual or a legal entity exercising rights under this License. For legal entities, “You” includes any entity that controls, is controlled by, or is under common control with You. For purposes of this definition, “control” means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
-
-2. License Grants and Conditions
-
-2.1. Grants
-
-Each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license:
-
-    a. under intellectual property rights (other than patent or trademark) Licensable by such Contributor to use, reproduce, make available, modify, display, perform, distribute, and otherwise exploit its Contributions, either on an unmodified basis, with Modifications, or as part of a Larger Work; and
-
-    b. under Patent Claims of such Contributor to make, use, sell, offer for sale, have made, import, and otherwise transfer either its Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-The licenses granted in Section 2.1 with respect to any Contribution become effective for each Contribution on the date the Contributor first distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-The licenses granted in this Section 2 are the only rights granted under this License. No additional rights or licenses will be implied from the distribution or licensing of Covered Software under this License. Notwithstanding Section 2.1(b) above, no patent license is granted by a Contributor:
-
-    a. for any code that a Contributor has removed from Covered Software; or
-
-    b. for infringements caused by: (i) Your and any other third party’s modifications of Covered Software, or (ii) the combination of its Contributions with other software (except as part of its Contributor Version); or
-
-    c. under Patent Claims infringed by Covered Software in the absence of its Contributions.
-
-This License does not grant any rights in the trademarks, service marks, or logos of any Contributor (except as may be necessary to comply with the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-No Contributor makes additional grants as a result of Your choice to distribute the Covered Software under a subsequent version of this License (see Section 10.2) or under the terms of a Secondary License (if permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-Each Contributor represents that the Contributor believes its Contributions are its original creation(s) or it has sufficient rights to grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-This License is not intended to limit any rights You have under applicable copyright doctrines of fair use, fair dealing, or other equivalents.
-
-2.7. Conditions
-
-Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in Section 2.1.
-
-3. Responsibilities
-
-3.1. Distribution of Source Form
-
-All distribution of Covered Software in Source Code Form, including any Modifications that You create or to which You contribute, must be under the terms of this License. You must inform recipients that the Source Code Form of the Covered Software is governed by the terms of this License, and how they can obtain a copy of this License. You may not attempt to alter or restrict the recipients’ rights in the Source Code Form.
-
-3.2. Distribution of Executable Form
-
-If You distribute Covered Software in Executable Form then:
-
-    a. such Covered Software must also be made available in Source Code Form, as described in Section 3.1, and You must inform recipients of the Executable Form how they can obtain a copy of such Source Code Form by reasonable means in a timely manner, at a charge no more than the cost of distribution to the recipient; and
-
-    b. You may distribute such Executable Form under the terms of this License, or sublicense it under different terms, provided that the license for the Executable Form does not attempt to limit or alter the recipients’ rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-You may create and distribute a Larger Work under terms of Your choice, provided that You also comply with the requirements of this License for the Covered Software. If the Larger Work is a combination of Covered Software with a work governed by one or more Secondary Licenses, and the Covered Software is not Incompatible With Secondary Licenses, this License permits You to additionally distribute such Covered Software under the terms of such Secondary License(s), so that the recipient of the Larger Work may, at their option, further distribute the Covered Software under the terms of either this License or such Secondary License(s).
-
-3.4. Notices
-
-You may not remove or alter the substance of any license notices (including copyright notices, patent notices, disclaimers of warranty, or limitations of liability) contained within the Source Code Form of the Covered Software, except that You may alter any license notices to the extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Software. However, You may do so only on Your own behalf, and not on behalf of any Contributor. You must make it absolutely clear that any such warranty, support, indemnity, or liability obligation is offered by You alone, and You hereby agree to indemnify every Contributor for any liability incurred by such Contributor as a result of warranty, support, indemnity or liability terms You offer. You may include additional disclaimers of warranty and limitations of liability specific to any jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
-
-If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Software due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be placed in a text file included with all distributions of the Covered Software under this License. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it.
-
-5. Termination
-
-5.1. The rights granted under this License will terminate automatically if You fail to comply with any of its terms. However, if You become compliant, then the rights granted under this License from a particular Contributor are reinstated (a) provisionally, unless and until such Contributor explicitly and finally terminates Your grants, and (b) on an ongoing basis, if such Contributor fails to notify You of the non-compliance by some reasonable means prior to 60 days after You have come back into compliance. Moreover, Your grants from a particular Contributor are reinstated on an ongoing basis if such Contributor notifies You of the non-compliance by some reasonable means, this is the first time You have received notice of non-compliance with this License from such Contributor, and You become compliant prior to 30 days after Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent infringement claim (excluding declaratory judgment actions, counter-claims, and cross-claims) alleging that a Contributor Version directly or indirectly infringes any patent, then the rights granted to You by any and all Contributors for the Covered Software under Section 2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user license agreements (excluding distributors and resellers) which have been validly granted by You or Your distributors under this License prior to termination shall survive termination.
-
-6. Disclaimer of Warranty
-
-    Covered Software is provided under this License on an “as is” basis, without warranty of any kind, either expressed, implied, or statutory, including, without limitation, warranties that the Covered Software is free of defects, merchantable, fit for a particular purpose or non-infringing. The entire risk as to the quality and performance of the Covered Software is with You. Should any Covered Software prove defective in any respect, You (not any Contributor) assume the cost of any necessary servicing, repair, or correction. This disclaimer of warranty constitutes an essential part of this License. No use of any Covered Software is authorized under this License except under this disclaimer.
-
-7. Limitation of Liability
-
-    Under no circumstances and under no legal theory, whether tort (including negligence), contract, or otherwise, shall any Contributor, or anyone who distributes Covered Software as permitted above, be liable to You for any direct, indirect, special, incidental, or consequential damages of any character including, without limitation, damages for lost profits, loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses, even if such party shall have been informed of the possibility of such damages. This limitation of liability shall not apply to liability for death or personal injury resulting from such party’s negligence to the extent applicable law prohibits such limitation. Some jurisdictions do not allow the exclusion or limitation of incidental or consequential damages, so this exclusion and limitation may not apply to You.
-
-8. Litigation
-
-Any litigation relating to this License may be brought only in the courts of a jurisdiction where the defendant maintains its principal place of business and such litigation shall be governed by laws of that jurisdiction, without reference to its conflict-of-law provisions. Nothing in this Section shall prevent a party’s ability to bring cross-claims or counter-claims.
-
-9. Miscellaneous
-
-This License represents the complete agreement concerning the subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not be used to construe this License against a Contributor.
-
-10. Versions of the License
-
-10.1. New Versions
-
-Mozilla Foundation is the license steward. Except as provided in Section 10.3, no one other than the license steward has the right to modify or publish new versions of this License. Each version will be given a distinguishing version number.
-
-10.2. Effect of New Versions
-
-You may distribute the Covered Software under the terms of the version of the License under which You originally received the Covered Software, or under the terms of any subsequent version published by the license steward.
-
-10.3. Modified Versions
-
-If you create software not governed by this License, and you want to create a new license for such software, you may create and use a modified version of this License if you rename the license and remove any references to the name of the license steward (except to note that such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses
-
-If You choose to distribute Source Code Form that is Incompatible With Secondary Licenses under the terms of this version of the License, the notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
-
-    This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular file, then You may include the notice in a location (such as a LICENSE file in a relevant directory) where a recipient would be likely to look for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - “Incompatible With Secondary Licenses” Notice
+engine
 
-    This Source Code Form is “Incompatible With Secondary Licenses”, as defined by the Mozilla Public License, v. 2.0.
---------------------------------------------------------------------------------
-root_certificates
+License for the Ahem font embedded below is from:
+https://www.w3.org/Style/CSS/Test/Fonts/Ahem/COPYING
+
+The Ahem font in this directory belongs to the public domain. In
+jurisdictions that do not recognize public domain ownership of these
+files, the following Creative Commons Zero declaration applies:
+
+<http://labs.creativecommons.org/licenses/zero-waive/1.0/us/legalcode>
+
+which is quoted below:
+
+  The person who has associated a work with this document (the "Work")
+  affirms that he or she (the "Affirmer") is the/an author or owner of
+  the Work. The Work may be any work of authorship, including a
+  database.
+
+  The Affirmer hereby fully, permanently and irrevocably waives and
+  relinquishes all of her or his copyright and related or neighboring
+  legal rights in the Work available under any federal or state law,
+  treaty or contract, including but not limited to moral rights,
+  publicity and privacy rights, rights protecting against unfair
+  competition and any rights protecting the extraction, dissemination
+  and reuse of data, whether such rights are present or future, vested
+  or contingent (the "Waiver"). The Affirmer makes the Waiver for the
+  benefit of the public at large and to the detriment of the Affirmer's
+  heirs or successors.
+
+  The Affirmer understands and intends that the Waiver has the effect
+  of eliminating and entirely removing from the Affirmer's control all
+  the copyright and related or neighboring legal rights previously held
+  by the Affirmer in the Work, to that extent making the Work freely
+  available to the public for any and all uses and purposes without
+  restriction of any kind, including commercial use and uses in media
+  and formats or by methods that have not yet been invented or
+  conceived. Should the Waiver for any reason be judged legally
+  ineffective in any jurisdiction, the Affirmer hereby grants a free,
+  full, permanent, irrevocable, nonexclusive and worldwide license for
+  all her or his copyright and related or neighboring legal rights in
+  the Work.
+--------------------------------------------------------------------------------
+fallback_root_certificates
 
 Mozilla Public License Version 2.0
 ==================================
 
 1. Definitions
+--------------
 
 1.1. "Contributor"
     means each individual or legal entity that creates, contributes to
@@ -14449,6 +31447,7 @@ Mozilla Public License Version 2.0
     ownership of such entity.
 
 2. License Grants and Conditions
+--------------------------------
 
 2.1. Grants
 
@@ -14519,6 +31518,7 @@ Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
 in Section 2.1.
 
 3. Responsibilities
+-------------------
 
 3.1. Distribution of Source Form
 
@@ -14580,6 +31580,7 @@ disclaimers of warranty and limitations of liability specific to any
 jurisdiction.
 
 4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
 
 If it is impossible for You to comply with any of the terms of this
 License with respect to some or all of the Covered Software due to
@@ -14592,6 +31593,7 @@ or regulation, such description must be sufficiently detailed for a
 recipient of ordinary skill to be able to understand it.
 
 5. Termination
+--------------
 
 5.1. The rights granted under this License will terminate automatically
 if You fail to comply with any of its terms. However, if You become
@@ -14619,39 +31621,50 @@ end user license agreements (excluding distributors and resellers) which
 have been validly granted by You or Your distributors under this License
 prior to termination shall survive termination.
 
-*  6. Disclaimer of Warranty
-
-*  Covered Software is provided under this License on an "as is"
-*  basis, without warranty of any kind, either expressed, implied, or
-*  statutory, including, without limitation, warranties that the
-*  Covered Software is free of defects, merchantable, fit for a
-*  particular purpose or non-infringing. The entire risk as to the
-*  quality and performance of the Covered Software is with You.
-*  Should any Covered Software prove defective in any respect, You
-*  (not any Contributor) assume the cost of any necessary servicing,
-*  repair, or correction. This disclaimer of warranty constitutes an
-*  essential part of this License. No use of any Covered Software is
-*  authorized under this License except under this disclaimer.
-
-*  7. Limitation of Liability
-
-*  Under no circumstances and under no legal theory, whether tort
-*  (including negligence), contract, or otherwise, shall any
-*  Contributor, or anyone who distributes Covered Software as
-*  permitted above, be liable to You for any direct, indirect,
-*  special, incidental, or consequential damages of any character
-*  including, without limitation, damages for lost profits, loss of
-*  goodwill, work stoppage, computer failure or malfunction, or any
-*  and all other commercial damages or losses, even if such party
-*  shall have been informed of the possibility of such damages. This
-*  limitation of liability shall not apply to liability for death or
-*  personal injury resulting from such party's negligence to the
-*  extent applicable law prohibits such limitation. Some
-*  jurisdictions do not allow the exclusion or limitation of
-*  incidental or consequential damages, so this exclusion and
-*  limitation may not apply to You.
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
 
 8. Litigation
+-------------
 
 Any litigation relating to this License may be brought only in the
 courts of a jurisdiction where the defendant maintains its principal
@@ -14661,6 +31674,7 @@ Nothing in this Section shall prevent a party's ability to bring
 cross-claims or counter-claims.
 
 9. Miscellaneous
+----------------
 
 This License represents the complete agreement concerning the subject
 matter hereof. If any provision of this License is held to be
@@ -14670,6 +31684,7 @@ that the language of a contract shall be construed against the drafter
 shall not be used to construe this License against a Contributor.
 
 10. Versions of the License
+---------------------------
 
 10.1. New Versions
 
@@ -14701,152 +31716,159 @@ Secondary Licenses under the terms of this version of the License, the
 notice described in Exhibit B of this License must be attached.
 
 Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.
+
+You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/bb65648e20e29abc47acf3dd984518d29fd625c3
+/third_party/fallback_root_certificates/
+
+--------------------------------------------------------------------------------
+boringssl
+
+OpenSSL License
+---------------
+
+Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. All advertising materials mentioning features or use of this
+   software must display the following acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+   endorse or promote products derived from this software without
+   prior written permission. For written permission, please contact
+   openssl-core@openssl.org.
 
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+5. Products derived from this software may not be called "OpenSSL"
+   nor may "OpenSSL" appear in their names without prior written
+   permission of the OpenSSL Project.
 
-If it is not possible or desirable to put the notice in a particular
-file, then You may include the notice in a location (such as a LICENSE
-file in a relevant directory) where a recipient would be likely to look
-for such a notice.
+6. Redistributions of any form whatsoever must retain the following
+   acknowledgment:
+   "This product includes software developed by the OpenSSL Project
+   for use in the OpenSSL Toolkit (http://www.openssl.org/)"
 
-You may add additional accurate notices of copyright ownership.
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
 
-Exhibit B - "Incompatible With Secondary Licenses" Notice
 
-  This Source Code Form is "Incompatible With Secondary Licenses", as
-  defined by the Mozilla Public License, v. 2.0.
---------------------------------------------------------------------------------
-boringssl
+This product includes cryptographic software written by Eric Young
+(eay@cryptsoft.com).  This product includes software written by Tim
+Hudson (tjh@cryptsoft.com).
 
-OpenSSL License
+Original SSLeay License
+-----------------------
 
- ====================================================================
- Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.
+Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+All rights reserved.
 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
+This package is an SSL implementation written
+by Eric Young (eay@cryptsoft.com).
+The implementation was written so as to conform with Netscapes SSL.
 
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
+This library is free for commercial and non-commercial use as long as
+the following conditions are aheared to.  The following conditions
+apply to all code found in this distribution, be it the RC4, RSA,
+lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+included with this distribution is covered by the same copyright terms
+except that the holder is Tim Hudson (tjh@cryptsoft.com).
 
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
+Copyright remains Eric Young's, and as such any Copyright notices in
+the code are not to be removed.
+If this package is used in a product, Eric Young should be given attribution
+as the author of the parts of the library used.
+This can be in the form of a textual message at program startup or
+in documentation (online or textual) provided with the package.
 
- 3. All advertising materials mentioning features or use of this
-    software must display the following acknowledgment:
-    "This product includes software developed by the OpenSSL Project
-    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
-
- 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-    endorse or promote products derived from this software without
-    prior written permission. For written permission, please contact
-    openssl-core@openssl.org.
-
- 5. Products derived from this software may not be called "OpenSSL"
-    nor may "OpenSSL" appear in their names without prior written
-    permission of the OpenSSL Project.
-
- 6. Redistributions of any form whatsoever must retain the following
-    acknowledgment:
-    "This product includes software developed by the OpenSSL Project
-    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
-
- THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
- ====================================================================
-
- This product includes cryptographic software written by Eric Young
- (eay@cryptsoft.com).  This product includes software written by Tim
- Hudson (tjh@cryptsoft.com).
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. All advertising materials mentioning features or use of this software
+   must display the following acknowledgement:
+   "This product includes cryptographic software written by
+    Eric Young (eay@cryptsoft.com)"
+   The word 'cryptographic' can be left out if the rouines from the library
+   being used are not cryptographic related :-).
+4. If you include any Windows specific code (or a derivative thereof) from
+   the apps directory (application code) you must include an acknowledgement:
+   "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
 
-Original SSLeay License
+THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
 
-* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
-* All rights reserved.
-
-* This package is an SSL implementation written
-* by Eric Young (eay@cryptsoft.com).
-* The implementation was written so as to conform with Netscapes SSL.
-
-* This library is free for commercial and non-commercial use as long as
-* the following conditions are aheared to.  The following conditions
-* apply to all code found in this distribution, be it the RC4, RSA,
-* lhash, DES, etc., code; not just the SSL code.  The SSL documentation
-* included with this distribution is covered by the same copyright terms
-* except that the holder is Tim Hudson (tjh@cryptsoft.com).
-
-* Copyright remains Eric Young's, and as such any Copyright notices in
-* the code are not to be removed.
-* If this package is used in a product, Eric Young should be given attribution
-* as the author of the parts of the library used.
-* This can be in the form of a textual message at program startup or
-* in documentation (online or textual) provided with the package.
-
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions
-* are met:
-* 1. Redistributions of source code must retain the copyright
-*    notice, this list of conditions and the following disclaimer.
-* 2. Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the
-*    documentation and/or other materials provided with the distribution.
-* 3. All advertising materials mentioning features or use of this software
-*    must display the following acknowledgement:
-*    "This product includes cryptographic software written by
-*     Eric Young (eay@cryptsoft.com)"
-*    The word 'cryptographic' can be left out if the rouines from the library
-*    being used are not cryptographic related :-).
-* 4. If you include any Windows specific code (or a derivative thereof) from
-*    the apps directory (application code) you must include an acknowledgement:
-*    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
-
-* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-* ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-* SUCH DAMAGE.
-
-* The licence and distribution terms for any publically available version or
-* derivative of this code cannot be changed.  i.e. this code cannot simply be
-* copied and put under another distribution licence
-* [including the GNU Public Licence.]
+The licence and distribution terms for any publically available version or
+derivative of this code cannot be changed.  i.e. this code cannot simply be
+copied and put under another distribution licence
+[including the GNU Public Licence.]
 
 ISC license used for completely new code in BoringSSL:
 
-/* Copyright (c) 2015, Google Inc.
+Copyright (c) 2015, Google Inc.
 
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
 
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 The code in third_party/fiat carries the MIT license:
 
@@ -14872,6 +31894,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 Licenses for support code
+-------------------------
 
 Parts of the TLS test suite are under the Go license. This code is not included
 in BoringSSL (i.e. libcrypto and libssl) when compiled, however, so
@@ -14887,240 +31910,68 @@ met:
 notice, this list of conditions and the following disclaimer.
    * Redistributions in binary form must reproduce the above
 copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------------------
-angle
-json
-rapidjson
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
---------------------------------------------------------------------------------
-libtess2
-
-SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
-Copyright (C) [dates of first publication] Silicon Graphics, Inc.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice including the dates of first publication and either this
-permission notice or a reference to http://oss.sgi.com/projects/FreeB/ shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL SILICON GRAPHICS, INC.
-BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
-OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of Silicon Graphics, Inc. shall not
-be used in advertising or otherwise to promote the sale, use or other dealings in
-this Software without prior written authorization from Silicon Graphics, Inc.
---------------------------------------------------------------------------------
-icu
-
-See Terms of Use <https://www.unicode.org/copyright.html>
-for definitions of Unicode Inc.’s Data Files and Software.
-
-NOTICE TO USER: Carefully read the following legal agreement.
-BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S
-DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"),
-YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
-TERMS AND CONDITIONS OF THIS AGREEMENT.
-IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE
-THE DATA FILES OR SOFTWARE.
-
-COPYRIGHT AND PERMISSION NOTICE
-
-Copyright © 1991-2022 Unicode, Inc. All rights reserved.
-Distributed under the Terms of Use in https://www.unicode.org/copyright.html.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Unicode data files and any associated documentation
-(the "Data Files") or Unicode software and any associated documentation
-(the "Software") to deal in the Data Files or Software
-without restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, and/or sell copies of
-the Data Files or Software, and to permit persons to whom the Data Files
-or Software are furnished to do so, provided that either
-(a) this copyright and permission notice appear with all copies
-of the Data Files or Software, or
-(b) this copyright and permission notice appear in associated
-Documentation.
-
-THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT OF THIRD PARTY RIGHTS.
-IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
-NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
-DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THE DATA FILES OR SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale,
-use or other dealings in these Data Files or Software without prior
-written authorization of the copyright holder.
---------------------------------------------------------------------------------
-rapidjson
-
-Tencent is pleased to support the open source community by making RapidJSON available.
-
-Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.  All rights reserved.
-
-If you have downloaded a copy of the RapidJSON binary from Tencent, please note that the RapidJSON binary is licensed under the MIT License.
-If you have downloaded a copy of the RapidJSON source code from Tencent, please note that RapidJSON source code is licensed under the MIT License, except for the third-party components listed below which are subject to different license terms.  Your integration of RapidJSON into your own projects may require compliance with the MIT License, as well as the other licenses applicable to the third-party components included within RapidJSON.
-
-A copy of the MIT License is included in this file.
-
-Other dependencies and licenses:
-
-Open Source Software Licensed Under the BSD License:
-
-The msinttypes r29
-Copyright (c) 2006-2013 Alexander Chemeris
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-* Neither the name of  copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Terms of the MIT License:
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
---------------------------------------------------------------------------------
-rapidjson
-
-Tencent is pleased to support the open source community by making RapidJSON available.
-
-Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.  All rights reserved.
-
-If you have downloaded a copy of the RapidJSON binary from Tencent, please note that the RapidJSON binary is licensed under the MIT License.
-If you have downloaded a copy of the RapidJSON source code from Tencent, please note that RapidJSON source code is licensed under the MIT License, except for the third-party components listed below which are subject to different license terms.  Your integration of RapidJSON into your own projects may require compliance with the MIT License, as well as the other licenses applicable to the third-party components included within RapidJSON. To avoid the problematic JSON license in your own projects, it's sufficient to exclude the bin/jsonchecker/ directory, as it's the only code under the JSON license.
-A copy of the MIT License is included in this file.
-
-Other dependencies and licenses:
-
-Open Source Software Licensed Under the BSD License:
-
-The msinttypes r29
-Copyright (c) 2006-2013 Alexander Chemeris
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-* Neither the name of  copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Open Source Software Licensed Under the JSON License:
-
-json.org
-Copyright (c) 2002 JSON.org
-All Rights Reserved.
-
-JSON_checker
-Copyright (c) 2002 JSON.org
-All Rights Reserved.
-
-Terms of the JSON License:
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Terms of the MIT License:
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
---------------------------------------------------------------------------------
-icu
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-The BSD License
-http://opensource.org/licenses/bsd-license.php
-Copyright (C) 2006-2008, Google Inc.
+BoringSSL uses the Chromium test infrastructure to run a continuous build,
+trybots etc. The scripts which manage this, and the script for generating build
+metadata, are under the Chromium license. Distributing code linked against
+BoringSSL does not trigger this license.
 
-All rights reserved.
+Copyright 2015 The Chromium Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+modification, are permitted provided that the following conditions are
+met:
 
- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following
-disclaimer in the documentation and/or other materials provided with
-the distribution.
- Neither the name of  Google Inc. nor the names of its
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
 contributors may be used to endorse or promote products derived from
 this software without specific prior written permission.
 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 freetype2
 
 The FreeType Project LICENSE
+----------------------------
+
+                            2006-Jan-27
+
+                    Copyright 1996-2002, 2006 by
+          David Turner, Robert Wilhelm, and Werner Lemberg
 
-        2006-Jan-27
 
-Copyright 1996-2002, 2006 by
-David Turner, Robert Wilhelm, and Werner Lemberg
 
 Introduction
 ============
@@ -15156,20 +32007,25 @@ Introduction
   We  disclaim  all warranties  covering  The  FreeType Project  and
   assume no liability related to The FreeType Project.
 
+
   Finally,  many  people  asked  us  for  a  preferred  form  for  a
   credit/disclaimer to use in compliance with this license.  We thus
   encourage you to use the following text:
 
+   """
     Portions of this software are copyright © <year> The FreeType
     Project (www.freetype.org).  All rights reserved.
+   """
 
   Please replace <year> with the value from the FreeType version you
   actually use.
 
+
 Legal Terms
 ===========
 
 0. Definitions
+--------------
 
   Throughout this license,  the terms `package', `FreeType Project',
   and  `FreeType  archive' refer  to  the  set  of files  originally
@@ -15195,6 +32051,7 @@ Legal Terms
   specified below.
 
 1. No Warranty
+--------------
 
   THE FREETYPE PROJECT  IS PROVIDED `AS IS' WITHOUT  WARRANTY OF ANY
   KIND, EITHER  EXPRESS OR IMPLIED,  INCLUDING, BUT NOT  LIMITED TO,
@@ -15204,6 +32061,7 @@ Legal Terms
   USE, OF THE FREETYPE PROJECT.
 
 2. Redistribution
+-----------------
 
   This  license  grants  a  worldwide, royalty-free,  perpetual  and
   irrevocable right  and license to use,  execute, perform, compile,
@@ -15232,6 +32090,7 @@ Legal Terms
   to us.
 
 3. Advertising
+--------------
 
   Neither the  FreeType authors and  contributors nor you  shall use
   the name of the  other for commercial, advertising, or promotional
@@ -15251,6 +32110,7 @@ Legal Terms
   of this license.
 
 4. Contacts
+-----------
 
   There are two mailing lists related to FreeType:
 
@@ -15270,367 +32130,493 @@ Legal Terms
 
     https://www.freetype.org
 
+
 --- end of FTL.TXT ---
 --------------------------------------------------------------------------------
-boringssl
+rapidjson
 
-The MIT License (MIT)
+The above software in this distribution may have been modified by
+THL A29 Limited ("Tencent Modifications").
+All Tencent Modifications are Copyright (C) 2015 THL A29 Limited.
+--------------------------------------------------------------------------------
+sqlite
 
-Copyright (c) 2015-2016 the fiat-crypto authors (see
-https://github.com/mit-plv/fiat-crypto/blob/master/AUTHORS).
+The source code for SQLite is in the public domain. No claim of
+copyright is made on any part of the core source code. (The
+documentation and test code is a different matter - some sections of
+documentation and test logic are governed by open-source licenses.)
+All contributors to the SQLite core software have signed affidavits
+specifically disavowing any copyright interest in the code. This means
+that anybody is able to legally do anything they want with the SQLite
+source code.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+There are other SQL database engines with liberal licenses that allow
+the code to be broadly and freely used. But those other engines are
+still governed by copyright law. SQLite is different in that copyright
+law simply does not apply.
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The source code files for other SQL database engines typically begin
+with a comment describing your legal rights to view and copy that
+file. The SQLite source code contains no license since it is not
+governed by copyright. Instead of a license, the SQLite source code
+offers a blessing:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+May you do good and not evil
+May you find forgiveness for yourself and forgive others
+May you share freely, never taking more than you give.
 --------------------------------------------------------------------------------
-rapidjson
-
-The MIT License (MIT)
+zlib
 
-Copyright (c) 2017 Bart Muzzin
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+--------------------------------------------------------------------------------
+freetype2
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+This software was written by Alexander Peslyak in 2001.  No copyright is
+claimed, and the software is hereby placed in the public domain.
+In case this attempt to disclaim copyright and place the software in the
+public domain is deemed null and void, then the software is
+Copyright (c) 2001 Alexander Peslyak and it is hereby released to the
+general public under the following terms:
 
-Derived from:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted.
 
-The MIT License (MIT)
+There's ABSOLUTELY NO WARRANTY, express or implied.
+--------------------------------------------------------------------------------
+freetype2
 
-Copyright (c) 2015 mojmir svoboda
+This software was written by Alexander Peslyak in 2001.  No copyright is
+claimed, and the software is hereby placed in the public domain.
+In case this attempt to disclaim copyright and place the software in the
+public domain is deemed null and void, then the software is
+Copyright (c) 2001 Alexander Peslyak and it is hereby released to the
+general public under the following terms:
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted.
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+There's ABSOLUTELY NO WARRANTY, express or implied.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+(This is a heavily cut-down "BSD license".)
 --------------------------------------------------------------------------------
-fuchsia_sdk
+icu
+
+UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
+
+See Terms of Use <https://www.unicode.org/copyright.html>
+for definitions of Unicode Inc.’s Data Files and Software.
+
+NOTICE TO USER: Carefully read the following legal agreement.
+BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S
+DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"),
+YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
+TERMS AND CONDITIONS OF THIS AGREEMENT.
+IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE
+THE DATA FILES OR SOFTWARE.
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright © 1991-2023 Unicode, Inc. All rights reserved.
+Distributed under the Terms of Use in https://www.unicode.org/copyright.html.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+
+Third-Party Software Licenses
+
+This section contains third-party software notices and/or additional
+terms for licensed third-party software components included within ICU
+libraries.
+
+ICU License - ICU 1.8.1 to ICU 57.1
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright (c) 1995-2016 International Business Machines Corporation and others
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, and/or sell copies of the Software, and to permit persons
+to whom the Software is furnished to do so, provided that the above
+copyright notice(s) and this permission notice appear in all copies of
+the Software and that both the above copyright notice(s) and this
+permission notice appear in supporting documentation.
 
-The majority of files in this project use the Apache 2.0 License.
-There are a few exceptions and their license can be found in the source.
-Any license deviations from Apache 2.0 are "more permissive" licenses.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY
+SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER
+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+of the copyright holder.
+
+All trademarks and registered trademarks mentioned herein are the
+property of their respective owners.
+
+Chinese/Japanese Word Break Dictionary Data (cjdict.txt)
+
+The Google Chrome software developed by Google is licensed under
+the BSD license. Other software included in this distribution is
+provided under other licenses, as set forth below.
+
+The BSD License
+http://opensource.org/licenses/bsd-license.php
+Copyright (C) 2006-2008, Google Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
-===========================================================================================
+Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following
+disclaimer in the documentation and/or other materials provided with
+the distribution.
+Neither the name of  Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
 
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses
 
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-   1. Definitions.
+The word list in cjdict.txt are generated by combining three word lists
+listed below with further processing for compound word breaking. The
+frequency is generated with an iterative training against Google web
+corpora.
 
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
+* Libtabe (Chinese)
+   - https://sourceforge.net/project/?group_id=1519
+   - Its license terms and conditions are shown below.
 
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
+* IPADIC (Japanese)
+   - http://chasen.aist-nara.ac.jp/chasen/distribution.html
+   - Its license terms and conditions are shown below.
 
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
+Copyright (c) 1999 TaBE Project.
+Copyright (c) 1999 Pai-Hsiang Hsiao.
+All rights reserved.
 
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
 
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
+. Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+. Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in
+  the documentation and/or other materials provided with the
+  distribution.
+. Neither the name of the TaBE Project nor the names of its
+  contributors may be used to endorse or promote products derived
+  from this software without specific prior written permission.
 
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
 
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
+Copyright (c) 1999 Computer Systems and Communication Lab,
+                   Institute of Information Science, Academia
+                   Sinica. All rights reserved.
 
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
 
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
+. Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+. Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in
+  the documentation and/or other materials provided with the
+  distribution.
+. Neither the name of the Computer Systems and Communication Lab
+  nor the names of its contributors may be used to endorse or
+  promote products derived from this software without specific
+  prior written permission.
 
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
 
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
+Copyright 1996 Chih-Hao Tsai @ Beckman Institute,
+    University of Illinois
+c-tsai4@uiuc.edu  http://casper.beckman.uiuc.edu/~c-tsai4
 
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
+Copyright 2000, 2001, 2002, 2003 Nara Institute of Science
+and Technology.  All Rights Reserved.
 
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
+Use, reproduction, and distribution of this software is permitted.
+Any copy of this software, whether in its original form or modified,
+must include both the above copyright notice and the following
+paragraphs.
 
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
+Nara Institute of Science and Technology (NAIST),
+the copyright holders, disclaims all warranties with regard to this
+software, including all implied warranties of merchantability and
+fitness, in no event shall NAIST be liable for
+any special, indirect or consequential damages or any damages
+whatsoever resulting from loss of use, data or profits, whether in an
+action of contract, negligence or other tortuous action, arising out
+of or in connection with the use or performance of this software.
 
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
+A large portion of the dictionary entries
+originate from ICOT Free Software.  The following conditions for ICOT
+Free Software applies to the current dictionary as well.
 
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
+Each User may also freely distribute the Program, whether in its
+original form or modified, to any third party or parties, PROVIDED
+that the provisions of Section 3 ("NO WARRANTY") will ALWAYS appear
+on, or be attached to, the Program, which is distributed substantially
+in the same form as set out herein and that such intended
+distribution, if actually made, will neither violate or otherwise
+contravene any of the laws and regulations of the countries having
+jurisdiction over the User or the intended distribution itself.
 
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
+NO WARRANTY
 
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
+The program was produced on an experimental basis in the course of the
+research and development conducted during the project and is provided
+to users as so produced on an experimental basis.  Accordingly, the
+program is provided without any warranty whatsoever, whether express,
+implied, statutory or otherwise.  The term "warranty" used herein
+includes, but is not limited to, any warranty of the quality,
+performance, merchantability and fitness for a particular purpose of
+the program and the nonexistence of any infringement or violation of
+any right of any third party.
 
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
+Each user of the program will agree and understand, and be deemed to
+have agreed and understood, that there is no warranty whatsoever for
+the program and, accordingly, the entire risk arising from or
+otherwise connected with the program is assumed by the user.
 
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
+Therefore, neither ICOT, the copyright holder, or any other
+organization that participated in or was otherwise related to the
+development of the program and their respective officials, directors,
+officers and other employees shall be held liable for any and all
+damages, including, without limitation, general, special, incidental
+and consequential damages, arising out of or otherwise in connection
+with the use or inability to use the program or any product, material
+or result produced or otherwise obtained by using the program,
+regardless of whether they have been advised of, or otherwise had
+knowledge of, the possibility of such damages at any time during the
+project or thereafter.  Each user will be deemed to have agreed to the
+foregoing by his or her commencement of use of the program.  The term
+"use" as used herein includes, but is not limited to, the use,
+modification, copying and distribution of the program and the
+production of secondary products from the program.
 
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
+In the case where the program, whether in its original form or
+modified, was distributed or delivered to or received by a user from
+any person, organization or entity other than ICOT, unless it makes or
+grants independently of ICOT any specific warranty to the user in
+writing, such person, organization or entity, will also be exempted
+from and not be held liable to the user for any such damages as noted
+above as far as the program is concerned.
 
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
+Lao Word Break Dictionary Data (laodict.txt)
 
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
+Copyright (C) 2016 and later: Unicode, Inc. and others.
+License & terms of use: http://www.unicode.org/copyright.html
+Copyright (c) 2015 International Business Machines Corporation
+and others. All Rights Reserved.
 
-   END OF TERMS AND CONDITIONS
+Project: https://github.com/rober42539/lao-dictionary
+Dictionary: https://github.com/rober42539/lao-dictionary/laodict.txt
+License: https://github.com/rober42539/lao-dictionary/LICENSE.txt
+         (copied below)
 
-   APPENDIX: How to apply the Apache License to your work.
+This file is derived from the above dictionary version of Nov 22, 2020
 
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
+Copyright (C) 2013 Brian Eugene Wilson, Robert Martin Campbell.
+All rights reserved.
 
-   Copyright [yyyy] [name of copyright owner]
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
+Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer. Redistributions in binary
+form must reproduce the above copyright notice, this list of conditions and
+the following disclaimer in the documentation and/or other materials
+provided with the distribution.
 
-       http://www.apache.org/licenses/LICENSE-2.0
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
 
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
---------------------------------------------------------------------------------
-sqlite
+Burmese Word Break Dictionary Data (burmesedict.txt)
 
-The source code for SQLite is in the public domain. No claim of
-copyright is made on any part of the core source code. (The
-documentation and test code is a different matter - some sections of
-documentation and test logic are governed by open-source licenses.)
-All contributors to the SQLite core software have signed affidavits
-specifically disavowing any copyright interest in the code. This means
-that anybody is able to legally do anything they want with the SQLite
-source code.
+Copyright (c) 2014 International Business Machines Corporation
+and others. All Rights Reserved.
 
-There are other SQL database engines with liberal licenses that allow
-the code to be broadly and freely used. But those other engines are
-still governed by copyright law. SQLite is different in that copyright
-law simply does not apply.
+This list is part of a project hosted at:
+  github.com/kanyawtech/myanmar-karen-word-lists
 
-The source code files for other SQL database engines typically begin
-with a comment describing your legal rights to view and copy that
-file. The SQLite source code contains no license since it is not
-governed by copyright. Instead of a license, the SQLite source code
-offers a blessing:
+Copyright (c) 2013, LeRoy Benjamin Sharon
+All rights reserved.
 
-May you do good and not evil
-May you find forgiveness for yourself and forgive others
-May you share freely, never taking more than you give.
---------------------------------------------------------------------------------
-web_unicode
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met: Redistributions of source code must retain the above
+copyright notice, this list of conditions and the following
+disclaimer.  Redistributions in binary form must reproduce the
+above copyright notice, this list of conditions and the following
+disclaimer in the documentation and/or other materials provided
+with the distribution.
 
-UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
+  Neither the name Myanmar Karen Word Lists, nor the names of its
+  contributors may be used to endorse or promote products derived
+  from this software without specific prior written permission.
 
-See Terms of Use <https://www.unicode.org/copyright.html>
-for definitions of Unicode Inc.’s Data Files and Software.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
 
-NOTICE TO USER: Carefully read the following legal agreement.
-BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S
-DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"),
-YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
-TERMS AND CONDITIONS OF THIS AGREEMENT.
-IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE
-THE DATA FILES OR SOFTWARE.
+Google double-conversion
 
-COPYRIGHT AND PERMISSION NOTICE
+Copyright 2006-2011, the V8 project authors. All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
 
-Copyright © 1991-2022 Unicode, Inc. All rights reserved.
-Distributed under the Terms of Use in https://www.unicode.org/copyright.html.
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google Inc. nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Unicode data files and any associated documentation
-(the "Data Files") or Unicode software and any associated documentation
-(the "Software") to deal in the Data Files or Software
-without restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, and/or sell copies of
-the Data Files or Software, and to permit persons to whom the Data Files
-or Software are furnished to do so, provided that either
-(a) this copyright and permission notice appear with all copies
-of the Data Files or Software, or
-(b) this copyright and permission notice appear in associated
-Documentation.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT OF THIRD PARTY RIGHTS.
-IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
-NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
-DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+File: install-sh (only for ICU4C)
 
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale,
-use or other dealings in these Data Files or Software without prior
-written authorization of the copyright holder.
+
+Copyright 1991 by the Massachusetts Institute of Technology
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of M.I.T. not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission.  M.I.T. makes no representations about the
+suitability of this software for any purpose.  It is provided "as is"
+without express or implied warranty.
 --------------------------------------------------------------------------------
+harfbuzz
 icu
+web_unicode
 
 Unicode® Copyright and Terms of Use
 For the general privacy policy governing access to this site, see the  Unicode Privacy Policy.
@@ -15639,18 +32625,18 @@ A. Unicode Copyright
 1. Copyright © 1991-2022 Unicode, Inc. All rights reserved.
 B. Definitions
 Unicode Data Files ("DATA FILES") include all data files under the directories:
-https://www.unicode.org/Public
-https://www.unicode.org/reports
-https://www.unicode.org/ivd/data
+https://www.unicode.org/Public/
+https://www.unicode.org/reports/
+https://www.unicode.org/ivd/data/
 
 Unicode Data Files do not include PDF online code charts under the directory:
-https://www.unicode.org/Public
+https://www.unicode.org/Public/
 
 Unicode Software ("SOFTWARE") includes any source code published in the Unicode Standard
 or any source code or compiled code under the directories:
-https://www.unicode.org/Public/PROGRAMS
-https://www.unicode.org/Public/cldr
-http://site.icu-project.org/download
+https://www.unicode.org/Public/PROGRAMS/
+https://www.unicode.org/Public/cldr/
+http://site.icu-project.org/download/
 C. Terms of Use
 1. Certain documents and files on this website contain a legend indicating that "Modification is permitted." Any person is hereby authorized, without fee, to modify such documents and files to create derivative works conforming to the Unicode® Standard, subject to Terms and Conditions herein.
 2. Any person is hereby authorized, without fee, to view, use, reproduce, and distribute all documents and files, subject to the Terms and Conditions herein.
@@ -15727,50 +32713,103 @@ shall not be used in advertising or otherwise to promote the sale,
 use or other dealings in these Data Files or Software without prior
 written authorization of the copyright holder.
 --------------------------------------------------------------------------------
-libcxx
-libcxxabi
+libjpeg-turbo
 
-University of Illinois/NCSA
-Open Source License
+We are also required to state that
+   "The Graphics Interchange Format(c) is the Copyright property of
+   CompuServe Incorporated. GIF(sm) is a Service Mark property of
+   CompuServe Incorporated."
+--------------------------------------------------------------------------------
+libjpeg-turbo
 
-Copyright (c) 2009-2019 by the contributors listed in CREDITS.TXT
+libjpeg-turbo Licenses
+======================
 
-All rights reserved.
+libjpeg-turbo is covered by three compatible BSD-style open source licenses:
 
-Developed by:
+- The IJG (Independent JPEG Group) License, which is listed in
+  [README.ijg](README.ijg)
 
-    LLVM Team
+  This license applies to the libjpeg API library and associated programs
+  (any code inherited from libjpeg, and any modifications to that code.)
 
-    University of Illinois at Urbana-Champaign
+- The Modified (3-clause) BSD License, which is listed in
+  [turbojpeg.c](turbojpeg.c)
 
-    http://llvm.org
+  This license covers the TurboJPEG API library and associated programs.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal with
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
+- The zlib License, which is listed in [simd/jsimdext.inc](simd/jsimdext.inc)
 
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimers.
+  This license is a subset of the other two, and it covers the libjpeg-turbo
+  SIMD extensions.
 
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimers in the
-      documentation and/or other materials provided with the distribution.
 
-    * Neither the names of the LLVM Team, University of Illinois at
-      Urbana-Champaign, nor the names of its contributors may be used to
-      endorse or promote products derived from this Software without specific
-      prior written permission.
+Complying with the libjpeg-turbo Licenses
+=========================================
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
-SOFTWARE.
+This section provides a roll-up of the libjpeg-turbo licensing terms, to the
+best of our understanding.
+
+1.  If you are distributing a modified version of the libjpeg-turbo source,
+    then:
+
+    1.  You cannot alter or remove any existing copyright or license notices
+        from the source.
+
+        **Origin**
+        - Clause 1 of the IJG License
+        - Clause 1 of the Modified BSD License
+        - Clauses 1 and 3 of the zlib License
+
+    2.  You must add your own copyright notice to the header of each source
+        file you modified, so others can tell that you modified that file (if
+        there is not an existing copyright header in that file, then you can
+        simply add a notice stating that you modified the file.)
+
+        **Origin**
+        - Clause 1 of the IJG License
+        - Clause 2 of the zlib License
+
+    3.  You must include the IJG README file, and you must not alter any of the
+        copyright or license text in that file.
+
+        **Origin**
+        - Clause 1 of the IJG License
+
+2.  If you are distributing only libjpeg-turbo binaries without the source, or
+    if you are distributing an application that statically links with
+    libjpeg-turbo, then:
+
+    1.  Your product documentation must include a message stating:
+
+        This software is based in part on the work of the Independent JPEG
+        Group.
+
+        **Origin**
+        - Clause 2 of the IJG license
+
+    2.  If your binary distribution includes or uses the TurboJPEG API, then
+        your product documentation must include the text of the Modified BSD
+        License.
+
+        **Origin**
+        - Clause 2 of the Modified BSD License
+
+3.  You cannot use the name of the IJG or The libjpeg-turbo Project or the
+    contributors thereof in advertising, publicity, etc.
+
+    **Origin**
+    - IJG License
+    - Clause 3 of the Modified BSD License
+
+4.  The IJG and The libjpeg-turbo Project do not warrant libjpeg-turbo to be
+    free of defects, nor do we accept any liability for undesirable
+    consequences resulting from your use of the software.
+
+    **Origin**
+    - IJG License
+    - Modified BSD License
+    - zlib License
 --------------------------------------------------------------------------------
 libjpeg-turbo
 
@@ -15780,6 +32819,7 @@ sections, and to remove impolitic language that existed in the libjpeg v8
 README.  It is included only for reference.  Please see README.md for
 information specific to libjpeg-turbo.
 
+
 The Independent JPEG Group's JPEG software
 ==========================================
 
@@ -15795,6 +32835,7 @@ and other members of the Independent JPEG Group.
 IJG is not affiliated with the ISO/IEC JTC1/SC29/WG1 standards committee
 (also known as JPEG, together with ITU-T SG16).
 
+
 DOCUMENTATION ROADMAP
 =====================
 
@@ -15829,6 +32870,7 @@ If you want to understand how the JPEG code works, we suggest reading one or
 more of the REFERENCES, then looking at the documentation files (in roughly
 the order listed) before diving into the code.
 
+
 OVERVIEW
 ========
 
@@ -15881,6 +32923,7 @@ We welcome the use of this software as a component of commercial products.
 No royalty is required, but we do ask for an acknowledgement in product
 documentation, as described under LEGAL ISSUES.
 
+
 LEGAL ISSUES
 ============
 
@@ -15930,6 +32973,7 @@ We specifically permit and encourage the use of this software as the basis of
 commercial products, provided that all warranty or liability claims are
 assumed by the product vendor.
 
+
 The Unix configuration script "configure" was produced with GNU Autoconf.
 It is copyright by the Free Software Foundation but is freely distributable.
 The same holds for its supporting scripts (config.guess, config.sub,
@@ -15948,6 +32992,7 @@ We are required to state that
     CompuServe Incorporated.  GIF(sm) is a Service Mark property of
     CompuServe Incorporated."
 
+
 REFERENCES
 ==========
 
@@ -15955,8 +33000,8 @@ We recommend reading one or more of these references before trying to
 understand the innards of the JPEG software.
 
 The best short technical introduction to the JPEG compression algorithm is
-	Wallace, Gregory K.  "The JPEG Still Picture Compression Standard",
-	Communications of the ACM, April 1991 (vol. 34 no. 4), pp. 30-44.
+    Wallace, Gregory K.  "The JPEG Still Picture Compression Standard",
+    Communications of the ACM, April 1991 (vol. 34 no. 4), pp. 30-44.
 (Adjacent articles in that issue discuss MPEG motion picture compression,
 applications of JPEG, and related topics.)  If you don't have the CACM issue
 handy, a PDF file containing a revised version of Wallace's article is
@@ -16010,6 +33055,7 @@ of the TIFF spec will replace the 6.0 JPEG design with the Note's design.
 Although IJG's own code does not support TIFF/JPEG, the free libtiff library
 uses our library to implement TIFF/JPEG per the Note.
 
+
 ARCHIVE LOCATIONS
 =================
 
@@ -16019,13 +33065,14 @@ directory "files".
 
 The JPEG FAQ (Frequently Asked Questions) article is a source of some
 general information about JPEG.
-It is available on the World Wide Web at http://www.faqs.org/faqs/jpeg-faq
+It is available on the World Wide Web at http://www.faqs.org/faqs/jpeg-faq/
 and other news.answers archive sites, including the official news.answers
 archive at rtfm.mit.edu: ftp://rtfm.mit.edu/pub/usenet/news.answers/jpeg-faq/.
 If you don't have Web or FTP access, send e-mail to mail-server@rtfm.mit.edu
 with body
-	send usenet/news.answers/jpeg-faq/part1
-	send usenet/news.answers/jpeg-faq/part2
+    send usenet/news.answers/jpeg-faq/part1
+    send usenet/news.answers/jpeg-faq/part2
+
 
 FILE FORMAT WARS
 ================
@@ -16040,6 +33087,7 @@ Don't use an incompatible file format!
 (In any case, our decoder will remain capable of reading existing JPEG
 image files indefinitely.)
 
+
 TO DO
 =====
 
@@ -16049,6 +33097,7 @@ fuchsia_sdk
 
 musl as a whole is licensed under the following standard MIT license:
 
+
 Copyright © 2005-2014 Rich Felker, et al.
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -16070,6 +33119,7 @@ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+
 Authors/contributors include:
 
 Alex Dowad
@@ -16175,6 +33225,25 @@ negated the permissions granted in the license. In the spirit of
 permissive licensing, and of not having licensing issues being an
 obstacle to adoption, that text has been removed.
 --------------------------------------------------------------------------------
+icu
+
+punycode.c 0.4.0 (2001-Nov-17-Sat)
+http://www.cs.berkeley.edu/~amc/idn/
+Adam M. Costello
+http://www.nicemice.net/amc/
+
+Disclaimer and license
+
+    Regarding this entire document or any portion of it (including
+    the pseudocode and C code), the author makes no guarantees and
+    is not responsible for any damage resulting from its use.  The
+    author grants irrevocable permission to anyone to use, modify,
+    and distribute it in any way that does not diminish the rights
+    of anyone else to use, modify, and distribute it, provided that
+    redistributed derivative works do not contain misleading author or
+    version information.  Derivative works need not be licensed under
+    similar terms.
+--------------------------------------------------------------------------------
 zlib
 
 version 1.2.12, March 27th, 2022
diff --git a/sky/packages/sky_engine/lib/_embedder.yaml b/sky/packages/sky_engine/lib/_embedder.yaml
index d14230709a8a75ad8ab9e50d1157c646f63a116a..ab4dd851b6b6b2bd4d8f4ce0a03ff61ccfe5ae8c 100644
--- a/sky/packages/sky_engine/lib/_embedder.yaml
+++ b/sky/packages/sky_engine/lib/_embedder.yaml
@@ -12,11 +12,13 @@ embedded_libs:
   "dart:io": "../../../../../third_party/dart/sdk/lib/io/io.dart"
   "dart:isolate": "../../../../../third_party/dart/sdk/lib/isolate/isolate.dart"
   "dart:js": "../../../../../third_party/dart/sdk/lib/js/js.dart"
+  "dart:js_interop": "../../../../../third_party/dart/sdk/lib/js_interop/js_interop.dart"
+  "dart:js_interop_unsafe": "../../../../../third_party/dart/sdk/lib/js_interop_unsafe/js_interop_unsafe.dart"
   "dart:js_util": "../../../../../third_party/dart/sdk/lib/js_util/js_util.dart"
   "dart:math": "../../../../../third_party/dart/sdk/lib/math/math.dart"
   "dart:typed_data": "../../../../../third_party/dart/sdk/lib/typed_data/typed_data.dart"
   "dart:ui": "../../../../lib/ui/ui.dart"
-  "dart:wasm": "../../../../../third_party/dart/sdk/lib/wasm/wasm_types.dart"
+  "dart:ui_web": "../../../../lib/web_ui/lib/ui_web/src/ui_web.dart"
 
   "dart:_http": "../../../../../third_party/dart/sdk/lib/_http/http.dart"
   "dart:_interceptors": "../../../../../third_party/dart/sdk/lib/_interceptors/interceptors.dart"
@@ -24,4 +26,8 @@ embedded_libs:
   # public API, e.g. List being Iterable by virtue of implementing
   # EfficientLengthIterable. Not including this library yields analysis errors.
   "dart:_internal": "../../../../../third_party/dart/sdk/lib/internal/internal.dart"
+  # The _js_annotations library is also needed for the same reasons as _internal.
+  "dart:_js_annotations": "../../../../../third_party/dart/sdk/lib/js/_js_annotations.dart"
+  # The _js_types library is also needed for the same reasons as _internal.
+  "dart:_js_types": "../../../../../third_party/dart/sdk/lib/_internal/js_shared/lib/js_types.dart"
   "dart:nativewrappers": "_empty.dart"
diff --git a/sky/packages/sky_engine/pubspec.yaml b/sky/packages/sky_engine/pubspec.yaml
index 9d357357db3368ed572e175a0ccba573f749a12c..08863df240e901bc379782cb36f388d6d78112ca 100644
--- a/sky/packages/sky_engine/pubspec.yaml
+++ b/sky/packages/sky_engine/pubspec.yaml
@@ -5,4 +5,4 @@ description: Dart SDK extensions for dart:ui
 homepage: http://flutter.io
 # sky_engine requires sdk_ext support in the analyzer which was added in 1.11.x
 environment:
-  sdk: ">=2.12.0-0 <3.0.0"
+  sdk: '>=3.2.0-0 <4.0.0'
diff --git a/sky/tools/create_embedder_framework.py b/sky/tools/create_embedder_framework.py
new file mode 100755
index 0000000000000000000000000000000000000000..9178c5410205cfaf3a0959988c5b09d9070cd170
--- /dev/null
+++ b/sky/tools/create_embedder_framework.py
@@ -0,0 +1,149 @@
+#!/usr/bin/env python3
+#
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import argparse
+import platform
+import subprocess
+import shutil
+import sys
+import os
+
+buildroot_dir = os.path.abspath(os.path.join(os.path.realpath(__file__), '..', '..', '..', '..'))
+
+ARCH_SUBPATH = 'mac-arm64' if platform.processor() == 'arm' else 'mac-x64'
+DSYMUTIL = os.path.join(
+    os.path.dirname(__file__), '..', '..', 'buildtools', ARCH_SUBPATH, 'clang', 'bin', 'dsymutil'
+)
+
+out_dir = os.path.join(buildroot_dir, 'out')
+
+
+def main():
+  parser = argparse.ArgumentParser(description='Creates FlutterEmbedder.framework for macOS')
+
+  parser.add_argument('--dst', type=str, required=True)
+  parser.add_argument('--arm64-out-dir', type=str, required=True)
+  parser.add_argument('--x64-out-dir', type=str, required=True)
+  parser.add_argument('--strip', action='store_true', default=False)
+  parser.add_argument('--dsym', action='store_true', default=False)
+  # TODO(godofredoc): Remove after recipes v2 have landed.
+  parser.add_argument('--zip', action='store_true', default=False)
+
+  args = parser.parse_args()
+
+  dst = (args.dst if os.path.isabs(args.dst) else os.path.join(buildroot_dir, args.dst))
+  arm64_out_dir = (
+      args.arm64_out_dir
+      if os.path.isabs(args.arm64_out_dir) else os.path.join(buildroot_dir, args.arm64_out_dir)
+  )
+  x64_out_dir = (
+      args.x64_out_dir
+      if os.path.isabs(args.x64_out_dir) else os.path.join(buildroot_dir, args.x64_out_dir)
+  )
+
+  fat_framework = os.path.join(dst, 'FlutterEmbedder.framework')
+  arm64_framework = os.path.join(arm64_out_dir, 'FlutterEmbedder.framework')
+  x64_framework = os.path.join(x64_out_dir, 'FlutterEmbedder.framework')
+
+  arm64_dylib = os.path.join(arm64_framework, 'FlutterEmbedder')
+  x64_dylib = os.path.join(x64_framework, 'FlutterEmbedder')
+
+  if not os.path.isdir(arm64_framework):
+    print('Cannot find macOS arm64 Framework at %s' % arm64_framework)
+    return 1
+
+  if not os.path.isdir(x64_framework):
+    print('Cannot find macOS x64 Framework at %s' % x64_framework)
+    return 1
+
+  if not os.path.isfile(arm64_dylib):
+    print('Cannot find macOS arm64 dylib at %s' % arm64_dylib)
+    return 1
+
+  if not os.path.isfile(x64_dylib):
+    print('Cannot find macOS x64 dylib at %s' % x64_dylib)
+    return 1
+
+  if not os.path.isfile(DSYMUTIL):
+    print('Cannot find dsymutil at %s' % DSYMUTIL)
+    return 1
+
+  shutil.rmtree(fat_framework, True)
+  shutil.copytree(arm64_framework, fat_framework, symlinks=True)
+  regenerate_symlinks(fat_framework)
+
+  fat_framework_binary = os.path.join(fat_framework, 'Versions', 'A', 'FlutterEmbedder')
+
+  # Create the arm64/x64 fat framework.
+  subprocess.check_call([
+      'lipo', arm64_dylib, x64_dylib, '-create', '-output', fat_framework_binary
+  ])
+  process_framework(dst, args, fat_framework, fat_framework_binary)
+
+  return 0
+
+
+def regenerate_symlinks(fat_framework):
+  """Regenerates the symlinks structure.
+
+  Recipes V2 upload artifacts in CAS before integration and CAS follows symlinks.
+  This logic regenerates the symlinks in the expected structure.
+  """
+  if os.path.islink(os.path.join(fat_framework, 'FlutterEmbedder')):
+    return
+  os.remove(os.path.join(fat_framework, 'FlutterEmbedder'))
+  shutil.rmtree(os.path.join(fat_framework, 'Headers'), True)
+  shutil.rmtree(os.path.join(fat_framework, 'Modules'), True)
+  shutil.rmtree(os.path.join(fat_framework, 'Resources'), True)
+  current_version_path = os.path.join(fat_framework, 'Versions', 'Current')
+  shutil.rmtree(current_version_path, True)
+  os.symlink('A', current_version_path)
+  os.symlink(
+      os.path.join('Versions', 'Current', 'FlutterEmbedder'),
+      os.path.join(fat_framework, 'FlutterEmbedder')
+  )
+  os.symlink(os.path.join('Versions', 'Current', 'Headers'), os.path.join(fat_framework, 'Headers'))
+  os.symlink(os.path.join('Versions', 'Current', 'Modules'), os.path.join(fat_framework, 'Modules'))
+  os.symlink(
+      os.path.join('Versions', 'Current', 'Resources'), os.path.join(fat_framework, 'Resources')
+  )
+
+
+def process_framework(dst, args, fat_framework, fat_framework_binary):
+  if args.dsym:
+    dsym_out = os.path.splitext(fat_framework)[0] + '.dSYM'
+    subprocess.check_call([DSYMUTIL, '-o', dsym_out, fat_framework_binary])
+    if args.zip:
+      dsym_dst = os.path.join(dst, 'FlutterEmbedder.dSYM')
+      subprocess.check_call(['zip', '-r', '-y', 'FlutterEmbedder.dSYM.zip', '.'], cwd=dsym_dst)
+      dsym_final_src_path = os.path.join(dsym_dst, 'FlutterEmbedder.dSYM.zip')
+      dsym_final_dst_path = os.path.join(dst, 'FlutterEmbedder.dSYM.zip')
+      shutil.move(dsym_final_src_path, dsym_final_dst_path)
+
+  if args.strip:
+    # copy unstripped
+    unstripped_out = os.path.join(dst, 'FlutterEmbedder.unstripped')
+    shutil.copyfile(fat_framework_binary, unstripped_out)
+    subprocess.check_call(['strip', '-x', '-S', fat_framework_binary])
+
+  # Zip FlutterEmbedder.framework.
+  if args.zip:
+    framework_dst = os.path.join(dst, 'FlutterEmbedder.framework')
+    subprocess.check_call([
+        'zip',
+        '-r',
+        '-y',
+        'FlutterEmbedder.framework.zip',
+        '.',
+    ],
+                          cwd=framework_dst)
+    final_src_path = os.path.join(framework_dst, 'FlutterEmbedder.framework.zip')
+    final_dst_path = os.path.join(dst, 'FlutterEmbedder.framework.zip')
+    shutil.move(final_src_path, final_dst_path)
+
+
+if __name__ == '__main__':
+  sys.exit(main())
diff --git a/sky/tools/create_full_ios_framework.py b/sky/tools/create_full_ios_framework.py
index 3d46fc45850e991c0d620884c84d63d74001686a..1c3cc0d3bca061df6e348eb4a9e20b5d23229e61 100644
--- a/sky/tools/create_full_ios_framework.py
+++ b/sky/tools/create_full_ios_framework.py
@@ -9,20 +9,19 @@
 
 import argparse
 import os
+import platform
 import shutil
 import subprocess
 import sys
 
-from create_xcframework import create_xcframework
+from create_xcframework import create_xcframework  # pylint: disable=import-error
 
+ARCH_SUBPATH = 'mac-arm64' if platform.processor() == 'arm' else 'mac-x64'
 DSYMUTIL = os.path.join(
-    os.path.dirname(__file__), '..', '..', '..', 'buildtools', 'mac-x64',
-    'clang', 'bin', 'dsymutil'
+    os.path.dirname(__file__), '..', '..', 'buildtools', ARCH_SUBPATH, 'clang', 'bin', 'dsymutil'
 )
 
-buildroot_dir = os.path.abspath(
-    os.path.join(os.path.realpath(__file__), '..', '..', '..', '..')
-)
+buildroot_dir = os.path.abspath(os.path.join(os.path.realpath(__file__), '..', '..', '..', '..'))
 
 
 def main():
@@ -39,54 +38,46 @@ def main():
   parser.add_argument('--arm64-out-dir', type=str, required=True)
   parser.add_argument('--simulator-x64-out-dir', type=str, required=True)
   parser.add_argument('--simulator-arm64-out-dir', type=str, required=False)
-  parser.add_argument('--strip', action="store_true", default=False)
-  parser.add_argument('--dsym', action="store_true", default=False)
+  parser.add_argument('--strip', action='store_true', default=False)
+  parser.add_argument('--dsym', action='store_true', default=False)
 
   args = parser.parse_args()
 
-  dst = (
-      args.dst
-      if os.path.isabs(args.dst) else os.path.join(buildroot_dir, args.dst)
-  )
+  dst = (args.dst if os.path.isabs(args.dst) else os.path.join(buildroot_dir, args.dst))
 
   arm64_out_dir = (
-      args.arm64_out_dir if os.path.isabs(args.arm64_out_dir) else
-      os.path.join(buildroot_dir, args.arm64_out_dir)
+      args.arm64_out_dir
+      if os.path.isabs(args.arm64_out_dir) else os.path.join(buildroot_dir, args.arm64_out_dir)
   )
 
   x64_out_dir = None
   if args.x64_out_dir:
     x64_out_dir = (
-        args.x64_out_dir if os.path.isabs(args.x64_out_dir) else
-        os.path.join(buildroot_dir, args.x64_out_dir)
+        args.x64_out_dir
+        if os.path.isabs(args.x64_out_dir) else os.path.join(buildroot_dir, args.x64_out_dir)
     )
 
   simulator_x64_out_dir = None
   if args.simulator_x64_out_dir:
     simulator_x64_out_dir = (
-        args.simulator_x64_out_dir if os.path.isabs(args.simulator_x64_out_dir)
-        else os.path.join(buildroot_dir, args.simulator_x64_out_dir)
+        args.simulator_x64_out_dir if os.path.isabs(args.simulator_x64_out_dir) else
+        os.path.join(buildroot_dir, args.simulator_x64_out_dir)
     )
 
   framework = os.path.join(dst, 'Flutter.framework')
   simulator_framework = os.path.join(dst, 'sim', 'Flutter.framework')
   arm64_framework = os.path.join(arm64_out_dir, 'Flutter.framework')
-  simulator_x64_framework = os.path.join(
-      simulator_x64_out_dir, 'Flutter.framework'
-  )
+  simulator_x64_framework = os.path.join(simulator_x64_out_dir, 'Flutter.framework')
 
   simulator_arm64_out_dir = None
   if args.simulator_arm64_out_dir:
     simulator_arm64_out_dir = (
-        args.simulator_arm64_out_dir if os.path.isabs(
-            args.simulator_arm64_out_dir
-        ) else os.path.join(buildroot_dir, args.simulator_arm64_out_dir)
+        args.simulator_arm64_out_dir if os.path.isabs(args.simulator_arm64_out_dir) else
+        os.path.join(buildroot_dir, args.simulator_arm64_out_dir)
     )
 
   if args.simulator_arm64_out_dir is not None:
-    simulator_arm64_framework = os.path.join(
-        simulator_arm64_out_dir, 'Flutter.framework'
-    )
+    simulator_arm64_framework = os.path.join(simulator_arm64_out_dir, 'Flutter.framework')
 
   if not os.path.isdir(arm64_framework):
     print('Cannot find iOS arm64 Framework at %s' % arm64_framework)
@@ -101,16 +92,44 @@ def main():
     return 1
 
   create_framework(
-      args, dst, framework, arm64_framework, simulator_framework,
-      simulator_x64_framework, simulator_arm64_framework
+      args, dst, framework, arm64_framework, simulator_framework, simulator_x64_framework,
+      simulator_arm64_framework
   )
-  framework_binary = os.path.join(framework, 'Flutter')
-  process_framework(args, dst, framework, framework_binary)
+
+  extension_safe_dst = os.path.join(dst, 'extension_safe')
+  create_extension_safe_framework(
+      args, extension_safe_dst, '%s_extension_safe' % arm64_out_dir,
+      '%s_extension_safe' % simulator_x64_out_dir, '%s_extension_safe' % simulator_arm64_out_dir
+  )
+
   generate_gen_snapshot(args, dst, x64_out_dir, arm64_out_dir)
   zip_archive(dst)
+  return 0
+
+def create_extension_safe_framework( # pylint: disable=too-many-arguments
+    args, dst, arm64_out_dir, simulator_x64_out_dir, simulator_arm64_out_dir
+):
+  framework = os.path.join(dst, 'Flutter.framework')
+  simulator_framework = os.path.join(dst, 'sim', 'Flutter.framework')
+  arm64_framework = os.path.join(arm64_out_dir, 'Flutter.framework')
+  simulator_x64_framework = os.path.join(simulator_x64_out_dir, 'Flutter.framework')
+  simulator_arm64_framework = os.path.join(simulator_arm64_out_dir, 'Flutter.framework')
 
+  if not os.path.isdir(arm64_framework):
+    print('Cannot find extension safe iOS arm64 Framework at %s' % arm64_framework)
+    return 1
 
-def create_framework(
+  if not os.path.isdir(simulator_x64_framework):
+    print('Cannot find extension safe iOS x64 simulator Framework at %s' % simulator_x64_framework)
+    return 1
+
+  create_framework(
+      args, dst, framework, arm64_framework, simulator_framework, simulator_x64_framework,
+      simulator_arm64_framework
+  )
+  return 0
+
+def create_framework(  # pylint: disable=too-many-arguments
     args, dst, framework, arm64_framework, simulator_framework,
     simulator_x64_framework, simulator_arm64_framework
 ):
@@ -122,12 +141,13 @@ def create_framework(
     return 1
 
   if not os.path.isfile(simulator_x64_dylib):
-    print('Cannot find iOS simulator dylib at %s' % simulator_dylib)
+    print('Cannot find iOS simulator dylib at %s' % simulator_x64_dylib)
     return 1
 
   shutil.rmtree(framework, True)
   shutil.copytree(arm64_framework, framework)
   framework_binary = os.path.join(framework, 'Flutter')
+  process_framework(args, dst, framework, framework_binary)
 
   if args.simulator_arm64_out_dir is not None:
     shutil.rmtree(simulator_framework, True)
@@ -137,46 +157,45 @@ def create_framework(
 
     # Create the arm64/x64 simulator fat framework.
     subprocess.check_call([
-        'lipo', simulator_x64_dylib, simulator_arm64_dylib, '-create',
-        '-output', simulator_framework_binary
+        'lipo', simulator_x64_dylib, simulator_arm64_dylib, '-create', '-output',
+        simulator_framework_binary
     ])
-    process_framework(
-        args, dst, simulator_framework, simulator_framework_binary
-    )
-    simulator_framework = simulator_framework
+    process_framework(args, dst, simulator_framework, simulator_framework_binary)
   else:
     simulator_framework = simulator_x64_framework
 
-  # Create XCFramework from the arm-only fat framework and the arm64/x64 simulator frameworks, or just the
-  # x64 simulator framework if only that one exists.
+  # Create XCFramework from the arm-only fat framework and the arm64/x64
+  # simulator frameworks, or just the x64 simulator framework if only that one
+  # exists.
   xcframeworks = [simulator_framework, framework]
   create_xcframework(location=dst, name='Flutter', frameworks=xcframeworks)
 
   # Add the x64 simulator into the fat framework
   subprocess.check_call([
-      'lipo', arm64_dylib, simulator_x64_dylib, '-create', '-output',
-      framework_binary
+      'lipo', arm64_dylib, simulator_x64_dylib, '-create', '-output', framework_binary
   ])
 
+  process_framework(args, dst, framework, framework_binary)
+  return 0
+
 
 def embed_codesign_configuration(config_path, contents):
-  with open(config_path, 'w') as f:
-    f.write('\n'.join(contents) + '\n')
+  with open(config_path, 'w') as file:
+    file.write('\n'.join(contents) + '\n')
 
 
 def zip_archive(dst):
   ios_file_with_entitlements = ['gen_snapshot_arm64']
   ios_file_without_entitlements = [
       'Flutter.xcframework/ios-arm64/Flutter.framework/Flutter',
-      'Flutter.xcframework/ios-arm64_x86_64-simulator/Flutter.framework/Flutter'
+      'Flutter.xcframework/ios-arm64_x86_64-simulator/Flutter.framework/Flutter',
+      'extension_safe/Flutter.xcframework/ios-arm64/Flutter.framework/Flutter',
+      'extension_safe/Flutter.xcframework/ios-arm64_x86_64-simulator/Flutter.framework/Flutter'
   ]
-  embed_codesign_configuration(
-      os.path.join(dst, 'entitlements.txt'), ios_file_with_entitlements
-  )
+  embed_codesign_configuration(os.path.join(dst, 'entitlements.txt'), ios_file_with_entitlements)
 
   embed_codesign_configuration(
-      os.path.join(dst, 'without_entitlements.txt'),
-      ios_file_without_entitlements
+      os.path.join(dst, 'without_entitlements.txt'), ios_file_without_entitlements
   )
 
   subprocess.check_call([
@@ -187,11 +206,14 @@ def zip_archive(dst):
       'Flutter.xcframework',
       'entitlements.txt',
       'without_entitlements.txt',
+      'extension_safe/Flutter.xcframework',
   ],
                         cwd=dst)
-  if (os.path.exists(os.path.join(dst, 'Flutter.dSYM'))):
-    subprocess.check_call(['zip', '-r', 'Flutter.dSYM.zip', 'Flutter.dSYM'],
-                          cwd=dst)
+  if os.path.exists(os.path.join(dst, 'Flutter.dSYM')):
+    subprocess.check_call(['zip', '-r', 'Flutter.dSYM.zip', 'Flutter.dSYM'], cwd=dst)
+
+  if os.path.exists(os.path.join(dst, 'extension_safe', 'Flutter.dSYM')):
+    subprocess.check_call(['zip', '-r', 'extension_safe_Flutter.dSYM.zip', 'Flutter.dSYM'], cwd=dst)
 
 
 def process_framework(args, dst, framework, framework_binary):
@@ -204,7 +226,7 @@ def process_framework(args, dst, framework, framework_binary):
     unstripped_out = os.path.join(dst, 'Flutter.unstripped')
     shutil.copyfile(framework_binary, unstripped_out)
 
-    subprocess.check_call(["strip", "-x", "-S", framework_binary])
+    subprocess.check_call(['strip', '-x', '-S', framework_binary])
 
 
 def generate_gen_snapshot(args, dst, x64_out_dir, arm64_out_dir):
@@ -213,8 +235,7 @@ def generate_gen_snapshot(args, dst, x64_out_dir, arm64_out_dir):
 
   if arm64_out_dir:
     _generate_gen_snapshot(
-        os.path.join(arm64_out_dir, args.clang_dir),
-        os.path.join(dst, 'gen_snapshot_arm64')
+        os.path.join(arm64_out_dir, args.clang_dir), os.path.join(dst, 'gen_snapshot_arm64')
     )
 
 
@@ -224,9 +245,7 @@ def _generate_gen_snapshot(directory, destination):
     print('Cannot find gen_snapshot at %s' % gen_snapshot_dir)
     sys.exit(1)
 
-  subprocess.check_call([
-      'xcrun', 'bitcode_strip', '-r', gen_snapshot_dir, '-o', destination
-  ])
+  subprocess.check_call(['xcrun', 'bitcode_strip', '-r', gen_snapshot_dir, '-o', destination])
 
 
 if __name__ == '__main__':
diff --git a/sky/tools/create_ios_framework.py b/sky/tools/create_ios_framework.py
index e20c01065603724ea3d8e04619e34bf7e317f658..e8d77606fb43522dc79b75cf73bded1221531233 100755
--- a/sky/tools/create_ios_framework.py
+++ b/sky/tools/create_ios_framework.py
@@ -5,47 +5,40 @@
 # found in the LICENSE file.
 
 import argparse
+import platform
 import subprocess
 import shutil
 import sys
 import os
 
-from create_xcframework import create_xcframework
+from create_xcframework import create_xcframework  # pylint: disable=import-error
 
+ARCH_SUBPATH = 'mac-arm64' if platform.processor() == 'arm' else 'mac-x64'
 DSYMUTIL = os.path.join(
-    os.path.dirname(__file__), '..', '..', '..', 'buildtools', 'mac-x64',
-    'clang', 'bin', 'dsymutil'
+    os.path.dirname(__file__), '..', '..', 'buildtools', ARCH_SUBPATH, 'clang', 'bin', 'dsymutil'
 )
 
 
 def main():
-  parser = argparse.ArgumentParser(
-      description='Creates Flutter.framework and Flutter.xcframework'
-  )
+  parser = argparse.ArgumentParser(description='Creates Flutter.framework and Flutter.xcframework')
 
   parser.add_argument('--dst', type=str, required=True)
   parser.add_argument('--arm64-out-dir', type=str, required=True)
   parser.add_argument('--armv7-out-dir', type=str, required=False)
   # TODO(gw280): Remove --simulator-out-dir alias when all recipes are updated
-  parser.add_argument(
-      '--simulator-x64-out-dir', '--simulator-out-dir', type=str, required=True
-  )
+  parser.add_argument('--simulator-x64-out-dir', '--simulator-out-dir', type=str, required=True)
   parser.add_argument('--simulator-arm64-out-dir', type=str, required=False)
-  parser.add_argument('--strip', action="store_true", default=False)
-  parser.add_argument('--dsym', action="store_true", default=False)
+  parser.add_argument('--strip', action='store_true', default=False)
+  parser.add_argument('--dsym', action='store_true', default=False)
 
   args = parser.parse_args()
 
   framework = os.path.join(args.dst, 'Flutter.framework')
   simulator_framework = os.path.join(args.dst, 'sim', 'Flutter.framework')
   arm64_framework = os.path.join(args.arm64_out_dir, 'Flutter.framework')
-  simulator_x64_framework = os.path.join(
-      args.simulator_x64_out_dir, 'Flutter.framework'
-  )
+  simulator_x64_framework = os.path.join(args.simulator_x64_out_dir, 'Flutter.framework')
   if args.simulator_arm64_out_dir is not None:
-    simulator_arm64_framework = os.path.join(
-        args.simulator_arm64_out_dir, 'Flutter.framework'
-    )
+    simulator_arm64_framework = os.path.join(args.simulator_arm64_out_dir, 'Flutter.framework')
     simulator_arm64_dylib = os.path.join(simulator_arm64_framework, 'Flutter')
 
   arm64_dylib = os.path.join(arm64_framework, 'Flutter')
@@ -64,7 +57,7 @@ def main():
     return 1
 
   if not os.path.isfile(simulator_x64_dylib):
-    print('Cannot find iOS simulator dylib at %s' % simulator_dylib)
+    print('Cannot find iOS simulator dylib at %s' % simulator_x64_dylib)
     return 1
 
   if not os.path.isfile(DSYMUTIL):
@@ -84,26 +77,26 @@ def main():
 
     # Create the arm64/x64 simulator fat framework.
     subprocess.check_call([
-        'lipo', simulator_x64_dylib, simulator_arm64_dylib, '-create',
-        '-output', simulator_framework_binary
+        'lipo', simulator_x64_dylib, simulator_arm64_dylib, '-create', '-output',
+        simulator_framework_binary
     ])
     process_framework(args, simulator_framework, simulator_framework_binary)
-    simulator_framework = simulator_framework
   else:
     simulator_framework = simulator_x64_framework
 
-  # Create XCFramework from the arm-only fat framework and the arm64/x64 simulator frameworks, or just the
-  # x64 simulator framework if only that one exists.
+  # Create XCFramework from the arm-only fat framework and the arm64/x64
+  # simulator frameworks, or just the x64 simulator framework if only that one
+  # exists.
   xcframeworks = [simulator_framework, framework]
   create_xcframework(location=args.dst, name='Flutter', frameworks=xcframeworks)
 
   # Add the x64 simulator into the fat framework
   subprocess.check_call([
-      'lipo', arm64_dylib, simulator_x64_dylib, '-create', '-output',
-      framework_binary
+      'lipo', arm64_dylib, simulator_x64_dylib, '-create', '-output', framework_binary
   ])
 
   process_framework(args, framework, framework_binary)
+  return 0
 
 
 def process_framework(args, framework, framework_binary):
@@ -116,7 +109,7 @@ def process_framework(args, framework, framework_binary):
     unstripped_out = os.path.join(args.dst, 'Flutter.unstripped')
     shutil.copyfile(framework_binary, unstripped_out)
 
-    subprocess.check_call(["strip", "-x", "-S", framework_binary])
+    subprocess.check_call(['strip', '-x', '-S', framework_binary])
 
 
 if __name__ == '__main__':
diff --git a/sky/tools/create_macos_framework.py b/sky/tools/create_macos_framework.py
index a47a15a4e1f667dcde27636bf0314a349fa536e1..51020cd08f312fcf64547af91af3664d80f4ff56 100755
--- a/sky/tools/create_macos_framework.py
+++ b/sky/tools/create_macos_framework.py
@@ -5,20 +5,19 @@
 # found in the LICENSE file.
 
 import argparse
+import platform
 import subprocess
 import shutil
 import sys
 import os
 
-from create_xcframework import create_xcframework
+from create_xcframework import create_xcframework  # pylint: disable=import-error
 
-buildroot_dir = os.path.abspath(
-    os.path.join(os.path.realpath(__file__), '..', '..', '..', '..')
-)
+buildroot_dir = os.path.abspath(os.path.join(os.path.realpath(__file__), '..', '..', '..', '..'))
 
+ARCH_SUBPATH = 'mac-arm64' if platform.processor() == 'arm' else 'mac-x64'
 DSYMUTIL = os.path.join(
-    os.path.dirname(__file__), '..', '..', '..', 'buildtools', 'mac-x64',
-    'clang', 'bin', 'dsymutil'
+    os.path.dirname(__file__), '..', '..', 'buildtools', ARCH_SUBPATH, 'clang', 'bin', 'dsymutil'
 )
 
 out_dir = os.path.join(buildroot_dir, 'out')
@@ -26,30 +25,27 @@ out_dir = os.path.join(buildroot_dir, 'out')
 
 def main():
   parser = argparse.ArgumentParser(
-      description='Creates FlutterMacOS.framework for macOS'
+      description='Creates FlutterMacOS.framework and FlutterMacOS.xcframework for macOS'
   )
 
   parser.add_argument('--dst', type=str, required=True)
   parser.add_argument('--arm64-out-dir', type=str, required=True)
   parser.add_argument('--x64-out-dir', type=str, required=True)
-  parser.add_argument('--strip', action="store_true", default=False)
-  parser.add_argument('--dsym', action="store_true", default=False)
+  parser.add_argument('--strip', action='store_true', default=False)
+  parser.add_argument('--dsym', action='store_true', default=False)
   # TODO(godofredoc): Remove after recipes v2 have landed.
-  parser.add_argument('--zip', action="store_true", default=False)
+  parser.add_argument('--zip', action='store_true', default=False)
 
   args = parser.parse_args()
 
-  dst = (
-      args.dst
-      if os.path.isabs(args.dst) else os.path.join(buildroot_dir, args.dst)
-  )
+  dst = (args.dst if os.path.isabs(args.dst) else os.path.join(buildroot_dir, args.dst))
   arm64_out_dir = (
-      args.arm64_out_dir if os.path.isabs(args.arm64_out_dir) else
-      os.path.join(buildroot_dir, args.arm64_out_dir)
+      args.arm64_out_dir
+      if os.path.isabs(args.arm64_out_dir) else os.path.join(buildroot_dir, args.arm64_out_dir)
   )
   x64_out_dir = (
-      args.x64_out_dir if os.path.isabs(args.x64_out_dir) else
-      os.path.join(buildroot_dir, args.x64_out_dir)
+      args.x64_out_dir
+      if os.path.isabs(args.x64_out_dir) else os.path.join(buildroot_dir, args.x64_out_dir)
   )
 
   fat_framework = os.path.join(dst, 'FlutterMacOS.framework')
@@ -81,18 +77,38 @@ def main():
 
   shutil.rmtree(fat_framework, True)
   shutil.copytree(arm64_framework, fat_framework, symlinks=True)
+
   regenerate_symlinks(fat_framework)
 
-  fat_framework_binary = os.path.join(
-      fat_framework, 'Versions', 'A', 'FlutterMacOS'
-  )
+  fat_framework_binary = os.path.join(fat_framework, 'Versions', 'A', 'FlutterMacOS')
 
   # Create the arm64/x64 fat framework.
   subprocess.check_call([
       'lipo', arm64_dylib, x64_dylib, '-create', '-output', fat_framework_binary
   ])
+
+  # Add group and other readability to all files.
+  versions_path = os.path.join(fat_framework, 'Versions')
+  subprocess.check_call(['chmod', '-R', 'og+r', versions_path])
+  # Find all the files below the target dir with owner execute permission
+  find_subprocess = subprocess.Popen(['find', versions_path, '-perm', '-100', '-print0'],
+                                     stdout=subprocess.PIPE)
+  # Add execute permission for other and group for all files that had it for owner.
+  xargs_subprocess = subprocess.Popen(['xargs', '-0', 'chmod', 'og+x'],
+                                      stdin=find_subprocess.stdout)
+  find_subprocess.wait()
+  xargs_subprocess.wait()
+
   process_framework(dst, args, fat_framework, fat_framework_binary)
 
+  # Create XCFramework from the arm64 and x64 fat framework.
+  xcframeworks = [fat_framework]
+  create_xcframework(location=dst, name='FlutterMacOS', frameworks=xcframeworks)
+
+  zip_framework(dst, args)
+
+  return 0
+
 
 def regenerate_symlinks(fat_framework):
   """Regenerates the symlinks structure.
@@ -113,17 +129,10 @@ def regenerate_symlinks(fat_framework):
       os.path.join('Versions', 'Current', 'FlutterMacOS'),
       os.path.join(fat_framework, 'FlutterMacOS')
   )
+  os.symlink(os.path.join('Versions', 'Current', 'Headers'), os.path.join(fat_framework, 'Headers'))
+  os.symlink(os.path.join('Versions', 'Current', 'Modules'), os.path.join(fat_framework, 'Modules'))
   os.symlink(
-      os.path.join('Versions', 'Current', 'Headers'),
-      os.path.join(fat_framework, 'Headers')
-  )
-  os.symlink(
-      os.path.join('Versions', 'Current', 'Modules'),
-      os.path.join(fat_framework, 'Modules')
-  )
-  os.symlink(
-      os.path.join('Versions', 'Current', 'Resources'),
-      os.path.join(fat_framework, 'Resources')
+      os.path.join('Versions', 'Current', 'Resources'), os.path.join(fat_framework, 'Resources')
   )
 
 
@@ -137,41 +146,98 @@ def process_framework(dst, args, fat_framework, fat_framework_binary):
     dsym_out = os.path.splitext(fat_framework)[0] + '.dSYM'
     subprocess.check_call([DSYMUTIL, '-o', dsym_out, fat_framework_binary])
     if args.zip:
+      dsym_dst = os.path.join(dst, 'FlutterMacOS.dSYM')
+      subprocess.check_call(['zip', '-r', '-y', 'FlutterMacOS.dSYM.zip', '.'], cwd=dsym_dst)
+      # Double zip to make it consistent with legacy artifacts.
+      # TODO(fujino): remove this once https://github.com/flutter/flutter/issues/125067 is resolved
       subprocess.check_call([
-          'zip', '-r', '-y', 'FlutterMacOS.dSYM.zip', 'FlutterMacOS.dSYM'
+          'zip',
+          '-y',
+          'FlutterMacOS.dSYM_.zip',
+          'FlutterMacOS.dSYM.zip',
       ],
-                            cwd=dst)
+                            cwd=dsym_dst)
+      # Use doubled zipped file.
+      dsym_final_src_path = os.path.join(dsym_dst, 'FlutterMacOS.dSYM_.zip')
+      dsym_final_dst_path = os.path.join(dst, 'FlutterMacOS.dSYM.zip')
+      shutil.move(dsym_final_src_path, dsym_final_dst_path)
 
   if args.strip:
     # copy unstripped
     unstripped_out = os.path.join(dst, 'FlutterMacOS.unstripped')
     shutil.copyfile(fat_framework_binary, unstripped_out)
 
-    subprocess.check_call(["strip", "-x", "-S", fat_framework_binary])
+    subprocess.check_call(['strip', '-x', '-S', fat_framework_binary])
+
 
+def zip_framework(dst, args):
   # Zip FlutterMacOS.framework.
   if args.zip:
     filepath_with_entitlements = ''
-    filepath_without_entitlements = 'FlutterMacOS.framework/Versions/A/FlutterMacOS'
+
+    framework_dst = os.path.join(dst, 'FlutterMacOS.framework')
+    # TODO(xilaizhang): Remove the zip file from the path when outer zip is removed.
+    filepath_without_entitlements = 'FlutterMacOS.framework.zip/Versions/A/FlutterMacOS'
 
     embed_codesign_configuration(
-        os.path.join(dst, 'entitlements.txt'), filepath_with_entitlements
+        os.path.join(framework_dst, 'entitlements.txt'), filepath_with_entitlements
     )
 
     embed_codesign_configuration(
-        os.path.join(dst, 'without_entitlements.txt'),
-        filepath_without_entitlements
+        os.path.join(framework_dst, 'without_entitlements.txt'), filepath_without_entitlements
     )
     subprocess.check_call([
         'zip',
         '-r',
         '-y',
         'FlutterMacOS.framework.zip',
-        'FlutterMacOS.framework',
-        'entitlements.txt',
-        'without_entitlements.txt',
+        '.',
     ],
-                          cwd=dst)
+                          cwd=framework_dst)
+    # Double zip to make it consistent with legacy artifacts.
+    # TODO(fujino): remove this once https://github.com/flutter/flutter/issues/125067 is resolved
+    subprocess.check_call(
+        [
+            'zip',
+            '-y',
+            'FlutterMacOS.framework_.zip',
+            'FlutterMacOS.framework.zip',
+            # TODO(xilaizhang): Move these files to inner zip before removing the outer zip.
+            'entitlements.txt',
+            'without_entitlements.txt',
+        ],
+        cwd=framework_dst
+    )
+    # Use doubled zipped file.
+    final_src_path = os.path.join(framework_dst, 'FlutterMacOS.framework_.zip')
+    final_dst_path = os.path.join(dst, 'FlutterMacOS.framework.zip')
+    shutil.move(final_src_path, final_dst_path)
+
+    zip_xcframework_archive(dst)
+
+
+def zip_xcframework_archive(dst):
+  filepath_with_entitlements = ''
+  filepath_without_entitlements = (
+      'FlutterMacOS.xcframework/macos-arm64_x86_64/'
+      'FlutterMacOS.framework/Versions/A/FlutterMacOS'
+  )
+  embed_codesign_configuration(os.path.join(dst, 'entitlements.txt'), filepath_with_entitlements)
+
+  embed_codesign_configuration(
+      os.path.join(dst, 'without_entitlements.txt'), filepath_without_entitlements
+  )
+
+  subprocess.check_call([
+      'zip',
+      '-r',
+      '-y',
+      'framework.zip',
+      'FlutterMacOS.xcframework',
+      'entitlements.txt',
+      'without_entitlements.txt',
+  ],
+                        cwd=dst)
 
 
 if __name__ == '__main__':
diff --git a/sky/tools/create_macos_gen_snapshots.py b/sky/tools/create_macos_gen_snapshots.py
index 4603bcd1c2abe6e6482d09b53aab8ff02779bfb1..e9f66c99e6593fa6fa92912b8fddde473dc58329 100755
--- a/sky/tools/create_macos_gen_snapshots.py
+++ b/sky/tools/create_macos_gen_snapshots.py
@@ -9,9 +9,7 @@ import subprocess
 import sys
 import os
 
-buildroot_dir = os.path.abspath(
-    os.path.join(os.path.realpath(__file__), '..', '..', '..', '..')
-)
+buildroot_dir = os.path.abspath(os.path.join(os.path.realpath(__file__), '..', '..', '..', '..'))
 
 
 def main():
@@ -24,14 +22,11 @@ def main():
   parser.add_argument('--x64-out-dir', type=str)
   parser.add_argument('--arm64-out-dir', type=str)
   parser.add_argument('--armv7-out-dir', type=str)
-  parser.add_argument('--zip', action="store_true", default=False)
+  parser.add_argument('--zip', action='store_true', default=False)
 
   args = parser.parse_args()
 
-  dst = (
-      args.dst
-      if os.path.isabs(args.dst) else os.path.join(buildroot_dir, args.dst)
-  )
+  dst = (args.dst if os.path.isabs(args.dst) else os.path.join(buildroot_dir, args.dst))
 
   # if dst folder does not exist create it.
   if not os.path.exists(dst):
@@ -39,35 +34,42 @@ def main():
 
   if args.x64_out_dir:
     x64_out_dir = (
-        args.x64_out_dir if os.path.isabs(args.x64_out_dir) else
-        os.path.join(buildroot_dir, args.x64_out_dir)
+        args.x64_out_dir
+        if os.path.isabs(args.x64_out_dir) else os.path.join(buildroot_dir, args.x64_out_dir)
     )
     generate_gen_snapshot(x64_out_dir, os.path.join(dst, 'gen_snapshot_x64'))
 
   if args.arm64_out_dir:
     arm64_out_dir = (
-        args.arm64_out_dir if os.path.isabs(args.arm64_out_dir) else
-        os.path.join(buildroot_dir, args.arm64_out_dir)
+        args.arm64_out_dir
+        if os.path.isabs(args.arm64_out_dir) else os.path.join(buildroot_dir, args.arm64_out_dir)
     )
     generate_gen_snapshot(
-        os.path.join(arm64_out_dir, args.clang_dir),
-        os.path.join(dst, 'gen_snapshot_arm64')
+        os.path.join(arm64_out_dir, args.clang_dir), os.path.join(dst, 'gen_snapshot_arm64')
     )
 
   if args.armv7_out_dir:
     armv7_out_dir = (
-        args.armv7_out_dir if os.path.isabs(args.armv7_out_dir) else
-        os.path.join(buildroot_dir, args.armv7_out_dir)
+        args.armv7_out_dir
+        if os.path.isabs(args.armv7_out_dir) else os.path.join(buildroot_dir, args.armv7_out_dir)
     )
     generate_gen_snapshot(
-        os.path.join(armv7_out_dir, args.clang_dir),
-        os.path.join(dst, 'gen_snapshot_armv7')
+        os.path.join(armv7_out_dir, args.clang_dir), os.path.join(dst, 'gen_snapshot_armv7')
     )
   if args.zip:
     zip_archive(dst)
 
 
+def embed_codesign_configuration(config_path, contents):
+  with open(config_path, 'w') as file:
+    file.write('\n'.join(contents) + '\n')
+
+
 def zip_archive(dst):
+  snapshot_filepath = ['gen_snapshot_arm64', 'gen_snapshot_x64']
+
+  embed_codesign_configuration(os.path.join(dst, 'entitlements.txt'), snapshot_filepath)
+
   subprocess.check_call([
       'zip',
       '-r',
@@ -82,9 +84,7 @@ def generate_gen_snapshot(directory, destination):
     print('Cannot find gen_snapshot at %s' % gen_snapshot_dir)
     sys.exit(1)
 
-  subprocess.check_call([
-      'xcrun', 'bitcode_strip', '-r', gen_snapshot_dir, '-o', destination
-  ])
+  subprocess.check_call(['xcrun', 'bitcode_strip', '-r', gen_snapshot_dir, '-o', destination])
 
 
 if __name__ == '__main__':
diff --git a/sky/tools/create_xcframework.py b/sky/tools/create_xcframework.py
index 889dea35d84a8f344282f00decbfe3c8ebad494d..337bca458a52b9a87e3c2ea073d23b582bbf04e7 100755
--- a/sky/tools/create_xcframework.py
+++ b/sky/tools/create_xcframework.py
@@ -5,7 +5,6 @@
 # found in the LICENSE file.
 
 import argparse
-import errno
 import os
 import shutil
 import subprocess
@@ -23,12 +22,8 @@ def main():
       help='The framework paths used to create the XCFramework.',
       required=True
   )
-  parser.add_argument(
-      '--name', help='Name of the XCFramework', type=str, required=True
-  )
-  parser.add_argument(
-      '--location', help='Output directory', type=str, required=True
-  )
+  parser.add_argument('--name', help='Name of the XCFramework', type=str, required=True)
+  parser.add_argument('--location', help='Output directory', type=str, required=True)
 
   args = parser.parse_args()
 
@@ -46,7 +41,8 @@ def create_xcframework(location, name, frameworks):
     # Remove old xcframework.
     shutil.rmtree(output_xcframework)
 
-  # xcrun xcodebuild -create-xcframework -framework foo/baz.framework -framework bar/baz.framework -output output/
+  # xcrun xcodebuild -create-xcframework -framework foo/baz.framework \
+  #                  -framework bar/baz.framework -output output/
   command = ['xcrun', 'xcodebuild', '-quiet', '-create-xcframework']
 
   for framework in frameworks:
diff --git a/sky/tools/dist_dart_pkg.py b/sky/tools/dist_dart_pkg.py
index f91cf24adaf6d4d3d6ffb6d75ddb68b0e9b8f2c5..5174318ef197f1f2cd99c8ba2ea253322ab5166a 100755
--- a/sky/tools/dist_dart_pkg.py
+++ b/sky/tools/dist_dart_pkg.py
@@ -15,12 +15,8 @@ import sys
 def main():
   parser = argparse.ArgumentParser(description='Copy a Dart package')
 
-  parser.add_argument(
-      '--source', type=str, help='Source directory assembled by dart_pkg.py'
-  )
-  parser.add_argument(
-      '--dest', type=str, help='Destination directory for the package'
-  )
+  parser.add_argument('--source', type=str, help='Source directory assembled by dart_pkg.py')
+  parser.add_argument('--dest', type=str, help='Destination directory for the package')
 
   args = parser.parse_args()
 
@@ -29,9 +25,7 @@ def main():
 
   # dart_pkg.py will create a packages directory within the package.
   # Do not copy this into the release output.
-  shutil.copytree(
-      args.source, args.dest, ignore=shutil.ignore_patterns('packages')
-  )
+  shutil.copytree(args.source, args.dest, ignore=shutil.ignore_patterns('packages'))
 
 
 if __name__ == '__main__':
diff --git a/sky/tools/install_framework_headers.py b/sky/tools/install_framework_headers.py
index 4cc631d0e47f30743f96a86da3f1ddf685813b0c..3719b5ed5afb80d92b1276bb39dcb204c53a1e38 100755
--- a/sky/tools/install_framework_headers.py
+++ b/sky/tools/install_framework_headers.py
@@ -8,7 +8,6 @@ import argparse
 import errno
 import os
 import shutil
-import subprocess
 import sys
 
 
@@ -19,10 +18,7 @@ def main():
   )
 
   parser.add_argument(
-      '--headers',
-      nargs='+',
-      help='The headers to install at the location.',
-      required=True
+      '--headers', nargs='+', help='The headers to install at the location.', required=True
   )
   parser.add_argument('--location', type=str, required=True)
 
@@ -31,10 +27,10 @@ def main():
   # Remove old headers.
   try:
     shutil.rmtree(os.path.normpath(args.location))
-  except OSError as e:
+  except OSError as err:
     # Ignore only "not found" errors.
-    if e.errno != errno.ENOENT:
-      raise e
+    if err.errno != errno.ENOENT:
+      raise err
 
   # Create the directory to copy the files to.
   if not os.path.isdir(args.location):
@@ -42,9 +38,7 @@ def main():
 
   # Copy all files specified in the args.
   for header_file in args.headers:
-    shutil.copyfile(
-        header_file, os.path.join(args.location, os.path.basename(header_file))
-    )
+    shutil.copyfile(header_file, os.path.join(args.location, os.path.basename(header_file)))
 
 
 if __name__ == '__main__':
diff --git a/sky/tools/objcopy.py b/sky/tools/objcopy.py
deleted file mode 100755
index a1fdedd143468cf5d1f094be74de570d029bb485..0000000000000000000000000000000000000000
--- a/sky/tools/objcopy.py
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright 2013 The Flutter Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import argparse
-import os
-import subprocess
-import sys
-
-# BFD architecture names recognized by objcopy.
-BFD_ARCH = {
-    'arm': 'arm',
-    'arm64': 'aarch64',
-    'x86': 'i386',
-    'x64': 'i386:x86-64',
-}
-
-# BFD target names recognized by objcopy.
-BFD_TARGET = {
-    'arm': 'elf32-littlearm',
-    'arm64': 'elf64-littleaarch64',
-    'x86': 'elf32-i386',
-    'x64': 'elf64-x86-64',
-}
-
-
-def main():
-  parser = argparse.ArgumentParser(
-      description='Convert a data file to an object file'
-  )
-  parser.add_argument('--objcopy', type=str, required=True)
-  parser.add_argument('--input', type=str, required=True)
-  parser.add_argument('--output', type=str, required=True)
-  parser.add_argument('--arch', type=str, required=True)
-
-  args = parser.parse_args()
-
-  input_dir, input_file = os.path.split(args.input)
-  output_path = os.path.abspath(args.output)
-
-  subprocess.check_call([
-      args.objcopy,
-      '-I',
-      'binary',
-      '-O',
-      BFD_TARGET[args.arch],
-      '-B',
-      BFD_ARCH[args.arch],
-      input_file,
-      output_path,
-  ],
-                        cwd=input_dir)
-
-
-if __name__ == '__main__':
-  sys.exit(main())
diff --git a/sky/tools/roll/patch.py b/sky/tools/roll/patch.py
deleted file mode 100755
index 651f187f25b2870595da48caac24358c56664dac..0000000000000000000000000000000000000000
--- a/sky/tools/roll/patch.py
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright 2013 The Flutter Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import os
-import subprocess
-import utils
-
-
-def patch_and_filter(dest_dir, relative_patches_dir):
-  os.chdir(dest_dir)
-
-  utils.filter_file(
-      "build/landmines.py", lambda line: not "gyp_environment" in line
-  )
-  utils.commit("filter gyp_environment out of build/landmines.py")
-
-  patch(dest_dir, relative_patches_dir)
-
-
-def patch(dest_dir, relative_patches_dir=os.curdir):
-  """Applies the *.patch files in |relative_patches_dir|.
-
-  Args:
-    relative_patches_dir: A directory path relative to the current directory.
-        Defaults to the directory of this file.
-
-  Raises:
-    subprocess.CalledProcessError if the patch couldn't be applied.
-  """
-  patches_dir = os.path.join(
-      os.path.dirname(os.path.realpath(__file__)), relative_patches_dir
-  )
-  assert os.path.isdir(patches_dir)
-
-  os.chdir(dest_dir)
-  for p in utils.find(["*.patch"], patches_dir):
-    print("applying patch %s" % os.path.basename(p))
-    try:
-      utils.system(["git", "apply", p])
-      utils.commit("applied patch %s" % os.path.basename(p))
-    except subprocess.CalledProcessError:
-      print("ERROR: patch %s failed to apply" % os.path.basename(p))
-      raise
diff --git a/sky/tools/roll/patches/chromium/android_build.patch b/sky/tools/roll/patches/chromium/android_build.patch
deleted file mode 100644
index bd73b9e009c59813be4298072e7ad089e949235f..0000000000000000000000000000000000000000
--- a/sky/tools/roll/patches/chromium/android_build.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/build/android/pylib/constants/__init__.py
-+++ b/build/android/pylib/constants/__init__.py
-@@ -184,7 +184,7 @@ class ANDROID_SDK_VERSION_CODES(object):
-   LOLLIPOP_MR1 = 22
- 
- ANDROID_SDK_VERSION = ANDROID_SDK_VERSION_CODES.LOLLIPOP_MR1
--ANDROID_SDK_BUILD_TOOLS_VERSION = '22.0.0'
-+ANDROID_SDK_BUILD_TOOLS_VERSION = '22.0.1'
- ANDROID_SDK_ROOT = os.path.join(DIR_SOURCE_ROOT,
-                                 'third_party/android_tools/sdk')
- ANDROID_SDK_TOOLS = os.path.join(ANDROID_SDK_ROOT,
---- a/build/common.gypi
-+++ b/build/common.gypi
-@@ -1682,7 +1682,7 @@
-             'android_host_arch%': '<!(uname -m)',
-             # Android API-level of the SDK used for compilation.
-             'android_sdk_version%': '22',
--            'android_sdk_build_tools_version%': '22.0.0',
-+            'android_sdk_build_tools_version%': '22.0.1',
-             'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')",
-           },
-           # Copy conditionally-set variables out one scope.
---- a/build/config/android/config.gni
-+++ b/build/config/android/config.gni
-@@ -17,7 +17,7 @@ if (is_android) {
-   if (!defined(default_android_sdk_root)) {
-     default_android_sdk_root = "//third_party/android_tools/sdk"
-     default_android_sdk_version = "22"
--    default_android_sdk_build_tools_version = "22.0.0"
-+    default_android_sdk_build_tools_version = "22.0.1"
-   }
- 
-   if (!defined(google_play_services_library)) {
diff --git a/sky/tools/roll/roll.py b/sky/tools/roll/roll.py
deleted file mode 100755
index 0c0f754fef79914936194729438057a139f66de1..0000000000000000000000000000000000000000
--- a/sky/tools/roll/roll.py
+++ /dev/null
@@ -1,173 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright 2013 The Flutter Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import argparse
-import json
-import os
-import subprocess
-import sys
-import urllib.request, urllib.error, urllib.parse
-from utils import commit
-from utils import system
-import patch
-
-# //base and its dependencies
-_base_deps = [
-    'base',
-    'testing',
-    'third_party/ashmem',
-    'third_party/libevent',
-    'third_party/tcmalloc',
-]
-
-# //build and its dependencies
-_build_deps = [
-    'build',
-    'third_party/android_testrunner',
-    'third_party/binutils',
-    'third_party/instrumented_libraries',
-    'third_party/pymock',
-    'tools/android',
-    'tools/clang',
-    'tools/generate_library_loader',
-    'tools/gritsettings',
-    'tools/valgrind',
-]
-
-_third_party_deps = [
-    'third_party/android_platform',
-    'third_party/apple_apsl',
-    'third_party/expat',
-    'third_party/freetype-android',
-    'third_party/harfbuzz-ng',
-    'third_party/iccjpeg',
-    'third_party/jinja2',
-    'third_party/jsr-305',
-    'third_party/junit',
-    'third_party/libjpeg',
-    'third_party/libpng',
-    'third_party/markupsafe',
-    'third_party/mesa',
-    'third_party/mockito',
-    'third_party/ply',
-    'third_party/qcms',
-    'third_party/robolectric',
-    'third_party/zlib',
-]
-
-dirs_from_chromium = _base_deps + _build_deps + _third_party_deps
-
-dirs_from_mojo = [
-    'mojo/android',
-    'mojo/application',
-    'mojo/common',
-    ('mojo/dart/embedder', ['embedder.gni']),
-    'mojo/dart/packages/mojo',
-    'mojo/data_pipe_utils',
-    'mojo/edk',
-    'mojo/environment',
-    'mojo/java',
-    'mojo/message_pump',
-    'mojo/services',
-    'mojo/skia',
-    'services/sensors',
-]
-
-# The contents of these files before the roll will be preserved after the roll,
-# even though they live in directories rolled in from Chromium.
-files_not_to_roll = [
-    'build/config/ui.gni',
-    'build/ls.py',
-    'build/module_args/mojo.gni',
-    'tools/android/download_android_tools.py',
-    'tools/android/VERSION_LINUX_NDK',
-    'tools/android/VERSION_LINUX_SDK',
-    'tools/android/VERSION_MACOSX_NDK',
-    'tools/android/VERSION_MACOSX_SDK',
-]
-
-
-def rev(source_dir, dest_dir, dirs_to_rev, name, revision_file=None):
-  for dir_to_rev in dirs_to_rev:
-    if type(dir_to_rev) is tuple:
-      d, file_subset = dir_to_rev
-    else:
-      d = dir_to_rev
-      file_subset = None
-    print("removing directory %s" % d)
-    try:
-      system(["git", "rm", "-r", d], cwd=dest_dir)
-    except subprocess.CalledProcessError:
-      print("Could not remove %s" % d)
-    print("cloning directory %s" % d)
-
-    if file_subset is None:
-      files = system(["git", "ls-files", d], cwd=source_dir).splitlines()
-    else:
-      files = [os.path.join(d, f) for f in file_subset]
-
-    for f in files:
-      source_path = os.path.join(source_dir, f)
-      if not os.path.isfile(source_path):
-        continue
-      dest_path = os.path.join(dest_dir, f)
-      system(["mkdir", "-p", os.path.dirname(dest_path)], cwd=source_dir)
-      system(["cp", source_path, dest_path], cwd=source_dir)
-    system(["git", "add", d], cwd=dest_dir)
-
-  for f in files_not_to_roll:
-    system(["git", "checkout", "HEAD", f], cwd=dest_dir)
-
-  src_commit = system(["git", "rev-parse", "HEAD"], cwd=source_dir).strip()
-
-  if revision_file:
-    with open(revision_file, 'w') as f:
-      f.write(src_commit)
-
-  system(["git", "add", "."], cwd=dest_dir)
-  commit("Update to %s %s" % (name, src_commit), cwd=dest_dir)
-
-
-def main():
-  parser = argparse.ArgumentParser(
-      description="Update the mojo repo's " +
-      "snapshot of things imported from chromium."
-  )
-  parser.add_argument("--mojo-dir", type=str)
-  parser.add_argument("--chromium-dir", type=str)
-  parser.add_argument("--dest-dir", type=str)
-
-  args = parser.parse_args()
-
-  dest_dir = os.path.abspath(args.dest_dir)
-
-  if args.mojo_dir:
-    rev(
-        os.path.abspath(args.mojo_dir),
-        dest_dir,
-        dirs_from_mojo,
-        'mojo',
-        revision_file='mojo/VERSION'
-    )
-
-  if args.chromium_dir:
-    rev(
-        os.path.abspath(args.chromium_dir), dest_dir, dirs_from_chromium,
-        'chromium'
-    )
-
-    try:
-      patch.patch_and_filter(dest_dir, os.path.join('patches', 'chromium'))
-    except subprocess.CalledProcessError:
-      print("ERROR: Roll failed due to a patch not applying")
-      print("Fix the patch to apply, commit the result, and re-run this script")
-      return 1
-
-  return 0
-
-
-if __name__ == "__main__":
-  sys.exit(main())
diff --git a/sky/tools/roll/utils.py b/sky/tools/roll/utils.py
deleted file mode 100755
index a5234d341607403971cb5b2bbb61728865ba681b..0000000000000000000000000000000000000000
--- a/sky/tools/roll/utils.py
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright 2013 The Flutter Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import fnmatch
-import os
-import subprocess
-
-
-def commit(message, cwd=None):
-  subprocess.call(['git', 'commit', '-a', '-m', message], cwd=cwd)
-
-
-def system(command, cwd=None):
-  return subprocess.check_output(command, cwd=cwd)
-
-
-def find(patterns, start='.'):
-  for path, dirs, files in os.walk(start):
-    for basename in files + dirs:
-      if any([fnmatch.fnmatch(basename, pattern) for pattern in patterns]):
-        filename = os.path.join(path, basename)
-        yield filename
-
-
-def filter_file(path, predicate):
-  with open(path, 'r+') as f:
-    lines = f.readlines()
-    new_lines = [line for line in lines if predicate(line)]
-    f.seek(0)
-    f.truncate()
-    f.write(''.join(new_lines))
diff --git a/testing/BUILD.gn b/testing/BUILD.gn
index 8ca7c4f0a74a7cace87b797122fb19bc37982718..28dab99a0b301a3482e2eac0a721c8124b09664a 100644
--- a/testing/BUILD.gn
+++ b/testing/BUILD.gn
@@ -17,10 +17,22 @@ source_set("testing_lib") {
 
   sources = [
     "assertions.h",
+    "debugger_detection.cc",
+    "debugger_detection.h",
     "display_list_testing.cc",
     "display_list_testing.h",
+    "logger_listener.cc",
+    "logger_listener.h",
+    "mock_canvas.cc",
+    "mock_canvas.h",
     "post_task_sync.cc",
     "post_task_sync.h",
+    "stream_capture.cc",
+    "stream_capture.h",
+    "test_args.cc",
+    "test_args.h",
+    "test_timeout_listener.cc",
+    "test_timeout_listener.h",
     "testing.cc",
     "testing.h",
     "thread_test.cc",
@@ -30,8 +42,8 @@ source_set("testing_lib") {
   public_deps = [
     "//flutter/display_list",
     "//flutter/fml",
-    "//third_party/googletest:gmock",
-    "//third_party/googletest:gtest",
+    "//flutter/third_party/googletest:gmock",
+    "//flutter/third_party/googletest:gtest",
   ]
   public_configs = [ "//flutter:config" ]
 }
@@ -39,13 +51,12 @@ source_set("testing_lib") {
 source_set("testing") {
   testonly = true
 
-  sources = [
-    "debugger_detection.cc",
-    "debugger_detection.h",
-    "run_all_unittests.cc",
-    "test_timeout_listener.cc",
-    "test_timeout_listener.h",
-  ]
+  sources = [ "run_all_unittests.cc" ]
+
+  if (enable_unittests && is_linux) {
+    # So that we can call gtk_init in main().
+    configs += [ "//flutter/shell/platform/linux/config:gtk" ]
+  }
 
   public_deps = [ ":testing_lib" ]
   public_configs = [ ":dynamic_symbols" ]
@@ -65,12 +76,12 @@ source_set("dart") {
 
   public_deps = [
     ":testing_lib",
+    "$dart_src/runtime/bin:elf_loader",
     "//flutter/common",
     "//flutter/runtime",
     "//flutter/runtime:libdart",
+    "//flutter/skia",
     "//flutter/third_party/tonic",
-    "//third_party/dart/runtime/bin:elf_loader",
-    "//third_party/skia",
   ]
 }
 
@@ -81,13 +92,11 @@ source_set("skia") {
     "assertions_skia.cc",
     "assertions_skia.h",
     "canvas_test.h",
-    "mock_canvas.cc",
-    "mock_canvas.h",
   ]
 
   public_deps = [
     ":testing_lib",
-    "//third_party/skia",
+    "//flutter/skia",
   ]
 }
 
@@ -124,7 +133,20 @@ source_set("fixture_test") {
   }
 }
 
-if (enable_unittests) {
+if (is_mac || is_ios) {
+  source_set("autoreleasepool_test") {
+    testonly = true
+
+    sources = [ "autoreleasepool_test.h" ]
+
+    deps = [
+      "//flutter/fml",
+      "//flutter/third_party/googletest:gtest",
+    ]
+  }
+}
+
+if (enable_unittests && shell_enable_vulkan) {
   source_set("vulkan") {
     testonly = true
 
@@ -149,11 +171,13 @@ if (enable_unittests) {
     ]
 
     if (!is_fuchsia) {
-      deps += [ "//third_party/swiftshader" ]
-      configs += [ "//third_party/swiftshader:swiftshader_config" ]
+      deps += [ "//flutter/third_party/swiftshader" ]
+      configs += [ "//flutter/third_party/swiftshader:swiftshader_config" ]
     }
   }
+}
 
+if (enable_unittests) {
   test_fixtures("testing_fixtures") {
     fixtures = []
   }
@@ -170,7 +194,6 @@ if (enable_unittests) {
       ":testing",
       ":testing_fixtures",
       "//flutter/runtime:libdart",
-      "//flutter/vulkan",
     ]
 
     if (shell_enable_metal) {
@@ -178,6 +201,10 @@ if (enable_unittests) {
 
       deps += [ ":metal" ]
     }
+
+    if (shell_enable_vulkan) {
+      deps += [ "//flutter/vulkan" ]
+    }
   }
 }
 
@@ -207,7 +234,7 @@ if (is_mac || is_ios) {
 
       # Skia's Vulkan support is enabled for all platforms (except iOS), and so parts of
       # Skia's graphics context reference Vulkan symbols.
-      if (!is_ios) {
+      if (shell_enable_vulkan) {
         deps += [ "//flutter/vulkan" ]
       }
     }
@@ -217,32 +244,30 @@ if (is_mac || is_ios) {
 }
 
 # We only use SwiftShader on unittests
-use_swiftshader = enable_unittests && !is_fuchsia
-
-source_set("opengl") {
-  testonly = true
+use_swiftshader = enable_unittests && shell_enable_gl
+if (use_swiftshader) {
+  source_set("opengl") {
+    testonly = true
 
-  sources = [
-    "test_gl_surface.cc",
-    "test_gl_surface.h",
-  ]
+    sources = [
+      "test_gl_surface.cc",
+      "test_gl_surface.h",
+    ]
 
-  deps = [
-    ":skia",
-    "//flutter/fml",
-  ]
+    deps = [
+      ":skia",
+      "//flutter/fml",
+    ]
 
-  if (use_swiftshader) {
     configs -= [ "//build/config/clang:extra_warnings" ]
     configs += [
-      "//flutter/vulkan:vulkan_config",  # for swiftshader
-      "//third_party/angle:gl_prototypes",
-      "//third_party/swiftshader:swiftshader_config",
+      "//flutter/third_party/angle:gl_prototypes",
+      "//flutter/third_party/swiftshader:swiftshader_config",
     ]
     deps += [
-      "//third_party/angle:libEGL_static",
-      "//third_party/angle:libGLESv2_static",
-      "//third_party/swiftshader",
+      "//flutter/third_party/angle:libEGL_static",
+      "//flutter/third_party/angle:libGLESv2_static",
+      "//flutter/third_party/swiftshader",
     ]
   }
 }
diff --git a/testing/README.md b/testing/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..f3c65cdd87393a197a220436510c6d4aa9b18d96
--- /dev/null
+++ b/testing/README.md
@@ -0,0 +1,18 @@
+# Engine Testing
+
+This directory contains the infrastructure for running tests on the engine,
+which are most often run by Flutter's continuous integration (CI) systems.
+
+The tests themselves are located in other directories, closer to the source for
+each platform, language, and variant. For instance, macOS engine unit tests
+written in objective C are located in the same directory as the source files,
+but with a `Test` suffix added (e.g. "FlutterEngineTest.mm" holds the tests for
+"FlutterEngine.mm", and they are located in the same directory).
+
+## Testing the Engine locally
+
+If you are working on the engine, you will want to be able to run tests locally.
+
+In order to learn the details of how do that, please consult the [Flutter Wiki
+page](https://github.com/flutter/flutter/wiki/Testing-the-engine) on the
+subject.
diff --git a/testing/android/native_activity/AndroidManifest.xml.template b/testing/android/native_activity/AndroidManifest.xml.template
new file mode 100644
index 0000000000000000000000000000000000000000..9f908332793a7d82b5acda4a2fbf5055d4c4597e
--- /dev/null
+++ b/testing/android/native_activity/AndroidManifest.xml.template
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="dev.flutter.testing.{{apk-library-name}}"
+    android:versionCode="1"
+    android:versionName="1.0"
+    >
+  <uses-sdk android:minSdkVersion="23"/>
+  <application android:hasCode="false">
+    <activity android:name="android.app.NativeActivity"
+              android:configChanges="orientation|keyboardHidden"
+              android:exported="true">
+      <meta-data android:name="android.app.lib_name"
+                 android:value="{{apk-library-name}}" />
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity>
+  </application>
+</manifest>
diff --git a/testing/android/native_activity/BUILD.gn b/testing/android/native_activity/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..354864c1c97a30a729f6a48b6172e697ad92656f
--- /dev/null
+++ b/testing/android/native_activity/BUILD.gn
@@ -0,0 +1,41 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# To create an native activity, deps in this source set in a
+# `native_activity_apk` target and make sure to add the implementation of
+# `NativeActivityMain` which returns a `flutter::NativeActivity` subclass.
+source_set("native_activity") {
+  assert(is_android)
+
+  sources = [
+    "native_activity.cc",
+    "native_activity.h",
+  ]
+
+  public_deps = [
+    "//flutter/fml",
+    "//flutter/impeller/toolkit/android",
+  ]
+
+  libs = [
+    "android",
+    "log",
+  ]
+}
+
+source_set("gtest_activity") {
+  assert(is_android)
+
+  testonly = true
+
+  sources = [
+    "gtest_activity.cc",
+    "gtest_activity.h",
+  ]
+
+  public_deps = [
+    ":native_activity",
+    "//flutter/testing:testing_lib",
+  ]
+}
diff --git a/testing/android/native_activity/README.md b/testing/android/native_activity/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..5ce198a06691df25810bac6e63f8fe08ac156946
--- /dev/null
+++ b/testing/android/native_activity/README.md
@@ -0,0 +1,31 @@
+Native Activity
+===============
+
+Executables packaged as native activities in an Android APK. These activities
+contain no Java code.
+
+To create an APK of your existing `exectuable` target, replace `exectuable` with
+`native_activity_apk` from the `native_activity.gni` template and give it an
+`apk_name`.
+
+## Example
+
+```
+native_activity_apk("apk_unittests") {
+  apk_name = "toolkit_unittests"
+
+  testonly = true
+
+  sources = [ "toolkit_android_unittests.cc" ]
+
+  deps = [
+    ":unittests_lib",
+    "//flutter/testing/android/native_activity:gtest_activity",
+  ]
+}
+```
+
+One of the translation units in must contain an implementation of
+`flutter::NativeActivityMain`. The `gtest_activity` target contains an
+implementation of an activity that run GoogleTests. That can be used off the
+shelf.
diff --git a/testing/android/native_activity/debug.keystore b/testing/android/native_activity/debug.keystore
new file mode 100644
index 0000000000000000000000000000000000000000..df0714f9b96d27c4abac51776c167e1919d81e71
Binary files /dev/null and b/testing/android/native_activity/debug.keystore differ
diff --git a/testing/android/native_activity/gtest_activity.cc b/testing/android/native_activity/gtest_activity.cc
new file mode 100644
index 0000000000000000000000000000000000000000..4a678f36e6b980f36ee5acb9e507234e5aeb6be2
--- /dev/null
+++ b/testing/android/native_activity/gtest_activity.cc
@@ -0,0 +1,49 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/testing/android/native_activity/gtest_activity.h"
+
+#include "flutter/impeller/toolkit/android/native_window.h"
+#include "flutter/testing/logger_listener.h"
+#include "flutter/testing/test_timeout_listener.h"
+
+namespace flutter {
+
+GTestActivity::GTestActivity(ANativeActivity* activity)
+    : NativeActivity(activity) {}
+
+GTestActivity::~GTestActivity() = default;
+
+static void StartTestSuite(const impeller::android::NativeWindow& window) {
+  auto timeout_listener = new flutter::testing::TestTimeoutListener(
+      fml::TimeDelta::FromSeconds(120u));
+  auto logger_listener = new flutter::testing::LoggerListener();
+
+  auto& listeners = ::testing::UnitTest::GetInstance()->listeners();
+
+  listeners.Append(timeout_listener);
+  listeners.Append(logger_listener);
+
+  int result = RUN_ALL_TESTS();
+
+  delete listeners.Release(timeout_listener);
+  delete listeners.Release(logger_listener);
+
+  FML_CHECK(result == 0);
+}
+
+// |NativeActivity|
+void GTestActivity::OnNativeWindowCreated(ANativeWindow* window) {
+  auto handle = std::make_shared<impeller::android::NativeWindow>(window);
+  background_thread_.GetTaskRunner()->PostTask(
+      [handle]() { StartTestSuite(*handle); });
+}
+
+std::unique_ptr<NativeActivity> NativeActivityMain(
+    ANativeActivity* activity,
+    std::unique_ptr<fml::Mapping> saved_state) {
+  return std::make_unique<GTestActivity>(activity);
+}
+
+}  // namespace flutter
diff --git a/testing/android/native_activity/gtest_activity.h b/testing/android/native_activity/gtest_activity.h
new file mode 100644
index 0000000000000000000000000000000000000000..44a0a5eb74557bbf4dd384977901436d67ffffdf
--- /dev/null
+++ b/testing/android/native_activity/gtest_activity.h
@@ -0,0 +1,40 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_TESTING_ANDROID_NATIVE_ACTIVITY_GTEST_ACTIVITY_H_
+#define FLUTTER_TESTING_ANDROID_NATIVE_ACTIVITY_GTEST_ACTIVITY_H_
+
+#include "flutter/fml/macros.h"
+#include "flutter/fml/thread.h"
+#include "flutter/testing/android/native_activity/native_activity.h"
+
+namespace flutter {
+
+//------------------------------------------------------------------------------
+/// @brief      A native activity subclass an in implementation of
+///             `flutter::NativeActivityMain` that return it.
+///
+///             This class runs a Google Test harness on a background thread and
+///             redirects progress updates to `logcat` instead of STDOUT.
+///
+class GTestActivity final : public NativeActivity {
+ public:
+  explicit GTestActivity(ANativeActivity* activity);
+
+  ~GTestActivity() override;
+
+  GTestActivity(const GTestActivity&) = delete;
+
+  GTestActivity& operator=(const GTestActivity&) = delete;
+
+  // |NativeActivity|
+  void OnNativeWindowCreated(ANativeWindow* window) override;
+
+ private:
+  fml::Thread background_thread_;
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_TESTING_ANDROID_NATIVE_ACTIVITY_GTEST_ACTIVITY_H_
diff --git a/testing/android/native_activity/native_activity.cc b/testing/android/native_activity/native_activity.cc
new file mode 100644
index 0000000000000000000000000000000000000000..37f7a1d7652e8ec3de08a01929632f5b31843431
--- /dev/null
+++ b/testing/android/native_activity/native_activity.cc
@@ -0,0 +1,143 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/testing/android/native_activity/native_activity.h"
+
+#include "flutter/fml/message_loop.h"
+
+namespace flutter {
+
+NativeActivity::NativeActivity(ANativeActivity* activity)
+    : activity_(activity) {
+  fml::MessageLoop::EnsureInitializedForCurrentThread();
+
+  activity->instance = this;
+
+  activity->callbacks->onStart = [](ANativeActivity* activity) {
+    reinterpret_cast<NativeActivity*>(activity->instance)->OnStart();
+  };
+  activity->callbacks->onStop = [](ANativeActivity* activity) {
+    reinterpret_cast<NativeActivity*>(activity->instance)->OnStop();
+  };
+  activity->callbacks->onPause = [](ANativeActivity* activity) {
+    reinterpret_cast<NativeActivity*>(activity->instance)->OnPause();
+  };
+  activity->callbacks->onResume = [](ANativeActivity* activity) {
+    reinterpret_cast<NativeActivity*>(activity->instance)->OnResume();
+  };
+  activity->callbacks->onDestroy = [](ANativeActivity* activity) {
+    delete reinterpret_cast<NativeActivity*>(activity->instance);
+  };
+  activity->callbacks->onSaveInstanceState = [](ANativeActivity* activity,
+                                                size_t* out_size) -> void* {
+    auto mapping = reinterpret_cast<NativeActivity*>(activity->instance)
+                       ->OnSaveInstanceState();
+    if (mapping == nullptr || mapping->GetMapping() == nullptr) {
+      *out_size = 0;
+      return nullptr;
+    }
+
+    // This will be `free`d by the framework.
+    auto copied = malloc(mapping->GetSize());
+    FML_CHECK(copied != nullptr)
+        << "Allocation failure while saving instance state.";
+    memcpy(copied, mapping->GetMapping(), mapping->GetSize());
+    *out_size = mapping->GetSize();
+    return copied;
+  };
+  activity->callbacks->onWindowFocusChanged = [](ANativeActivity* activity,
+                                                 int has_focus) {
+    reinterpret_cast<NativeActivity*>(activity->instance)
+        ->OnWindowFocusChanged(has_focus);
+  };
+  activity->callbacks->onNativeWindowCreated = [](ANativeActivity* activity,
+                                                  ANativeWindow* window) {
+    reinterpret_cast<NativeActivity*>(activity->instance)
+        ->OnNativeWindowCreated(window);
+  };
+  activity->callbacks->onNativeWindowResized = [](ANativeActivity* activity,
+                                                  ANativeWindow* window) {
+    reinterpret_cast<NativeActivity*>(activity->instance)
+        ->OnNativeWindowResized(window);
+  };
+  activity->callbacks->onNativeWindowRedrawNeeded =
+      [](ANativeActivity* activity, ANativeWindow* window) {
+        reinterpret_cast<NativeActivity*>(activity->instance)
+            ->OnNativeWindowRedrawNeeded(window);
+      };
+  activity->callbacks->onNativeWindowDestroyed = [](ANativeActivity* activity,
+                                                    ANativeWindow* window) {
+    reinterpret_cast<NativeActivity*>(activity->instance)
+        ->OnNativeWindowDestroyed(window);
+  };
+  activity->callbacks->onInputQueueCreated = [](ANativeActivity* activity,
+                                                AInputQueue* queue) {
+    reinterpret_cast<NativeActivity*>(activity->instance)
+        ->OnInputQueueCreated(queue);
+  };
+  activity->callbacks->onInputQueueDestroyed = [](ANativeActivity* activity,
+                                                  AInputQueue* queue) {
+    reinterpret_cast<NativeActivity*>(activity->instance)
+        ->OnInputQueueDestroyed(queue);
+  };
+  activity->callbacks->onConfigurationChanged = [](ANativeActivity* activity) {
+    reinterpret_cast<NativeActivity*>(activity->instance)
+        ->OnConfigurationChanged();
+  };
+  activity->callbacks->onLowMemory = [](ANativeActivity* activity) {
+    reinterpret_cast<NativeActivity*>(activity->instance)->OnLowMemory();
+  };
+}
+
+NativeActivity::~NativeActivity() = default;
+
+void NativeActivity::OnStart() {}
+
+void NativeActivity::OnStop() {}
+
+void NativeActivity::OnPause() {}
+
+void NativeActivity::OnResume() {}
+
+std::shared_ptr<fml::Mapping> NativeActivity::OnSaveInstanceState() {
+  return nullptr;
+}
+
+void NativeActivity::OnWindowFocusChanged(bool has_focus) {}
+
+void NativeActivity::OnNativeWindowCreated(ANativeWindow* window) {}
+
+void NativeActivity::OnNativeWindowResized(ANativeWindow* window) {}
+
+void NativeActivity::OnNativeWindowRedrawNeeded(ANativeWindow* window) {}
+
+void NativeActivity::OnNativeWindowDestroyed(ANativeWindow* window) {}
+
+void NativeActivity::OnInputQueueCreated(AInputQueue* queue) {}
+
+void NativeActivity::OnInputQueueDestroyed(AInputQueue* queue) {}
+
+void NativeActivity::OnConfigurationChanged() {}
+
+void NativeActivity::OnLowMemory() {}
+
+void NativeActivity::Terminate() {
+  ANativeActivity_finish(activity_);
+}
+
+}  // namespace flutter
+
+extern "C" __attribute__((visibility("default"))) void ANativeActivity_onCreate(
+    ANativeActivity* activity,
+    void* saved_state,
+    size_t saved_state_size) {
+  std::unique_ptr<fml::Mapping> saved_state_mapping;
+  if (saved_state_size > 0u) {
+    saved_state_mapping = std::make_unique<fml::MallocMapping>(
+        fml::MallocMapping::Copy(saved_state, saved_state_size));
+  }
+  flutter::NativeActivityMain(activity, std::move(saved_state_mapping))
+      .release();  // Will be freed when the frame calls the onDestroy. See the
+                   // delete in that callback.
+}
diff --git a/testing/android/native_activity/native_activity.gni b/testing/android/native_activity/native_activity.gni
new file mode 100644
index 0000000000000000000000000000000000000000..cbf4d3e75141dc7c52d13a6623b727339baafdd3
--- /dev/null
+++ b/testing/android/native_activity/native_activity.gni
@@ -0,0 +1,92 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/android/config.gni")
+import("//flutter/tools/templater/templater.gni")
+
+android_buildtools = "//third_party/android_tools/sdk/build-tools/34.0.0"
+aapt2 = "$android_buildtools/aapt2"
+zipalign = "$android_buildtools/zipalign"
+apksigner = "$android_buildtools/apksigner"
+android_jar = "//third_party/android_tools/sdk/platforms/android-34/android.jar"
+src_root = "//flutter/testing/android/native_activity"
+
+# A drop in replacement for an executable or shared library target. Providing a
+# (required) apk_name packages that native code into an APK suitable for
+# debugging.
+template("native_activity_apk") {
+  assert(defined(invoker.apk_name), "The name of the APK must be specified.")
+
+  invoker_apk_name = invoker.apk_name
+  apk_dylib_name = "lib$invoker_apk_name.so"
+
+  android_manifest_template = "$src_root/AndroidManifest.xml.template"
+  android_manifest = "$target_gen_dir/AndroidManifest.xml"
+
+  android_manifest_target_name = "android_manifest_$target_name"
+  templater(android_manifest_target_name) {
+    input = android_manifest_template
+    output = android_manifest
+    values = [ "--apk-library-name=$invoker_apk_name" ]
+  }
+
+  shared_library_target_name = "shared_library_$target_name"
+  shared_library(shared_library_target_name) {
+    forward_variables_from(invoker, "*", [ "output_name" ])
+    output_name = invoker_apk_name
+  }
+
+  apk_target_name = "apk_$target_name"
+  action(apk_target_name) {
+    forward_variables_from(invoker, [ "testonly" ])
+
+    script = "$src_root/native_activity_apk.py"
+
+    apk_path = "$root_build_dir/$invoker_apk_name.apk"
+
+    sources = [
+      "$root_build_dir/$apk_dylib_name",
+      aapt2,
+      android_jar,
+      android_manifest_template,
+      apksigner,
+      zipalign,
+    ]
+
+    outputs = [ apk_path ]
+
+    args = [
+      "--aapt2-bin",
+      rebase_path(aapt2, root_build_dir),
+      "--zipalign-bin",
+      rebase_path(zipalign, root_build_dir),
+      "--android-manifest",
+      rebase_path(android_manifest, root_build_dir),
+      "--android-jar",
+      rebase_path(android_jar, root_build_dir),
+      "--output-path",
+      rebase_path(apk_path, root_build_dir),
+      "--library",
+      rebase_path("$root_build_dir/$apk_dylib_name", root_build_dir),
+      "--apksigner-bin",
+      rebase_path(apksigner, root_build_dir),
+      "--keystore",
+      rebase_path("$src_root/debug.keystore", root_build_dir),
+      "--gen-dir",
+      rebase_path(target_gen_dir, root_build_dir),
+      "--android-abi",
+      android_app_abi,
+    ]
+    deps = [
+      ":$android_manifest_target_name",
+      ":$shared_library_target_name",
+    ]
+  }
+
+  group(target_name) {
+    forward_variables_from(invoker, [ "testonly" ])
+
+    deps = [ ":$apk_target_name" ]
+  }
+}
diff --git a/testing/android/native_activity/native_activity.h b/testing/android/native_activity/native_activity.h
new file mode 100644
index 0000000000000000000000000000000000000000..d740d8748694288b8c227a9d04525481ef700483
--- /dev/null
+++ b/testing/android/native_activity/native_activity.h
@@ -0,0 +1,81 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_TESTING_ANDROID_NATIVE_ACTIVITY_NATIVE_ACTIVITY_H_
+#define FLUTTER_TESTING_ANDROID_NATIVE_ACTIVITY_NATIVE_ACTIVITY_H_
+
+#include <android/native_activity.h>
+
+#include "flutter/fml/macros.h"
+#include "flutter/fml/mapping.h"
+
+namespace flutter {
+
+//------------------------------------------------------------------------------
+/// @brief      An instance of a native activity. Users of the
+///             `native_activity_apk` are meant to subclass this and return an
+///             instance of this subclass from `flutter::NativeActivityMain`.
+///
+///             All methods are called on the Android Platform main-thread.
+///             Subclasses will usually re-thread calls to a background thread
+///             for long running tasks as these will lead to ANRs on when
+///             invoked on the platform thread.
+///
+class NativeActivity {
+ public:
+  virtual ~NativeActivity();
+
+  //----------------------------------------------------------------------------
+  /// @brief      Perform graceful termination of the activity. Will eventually
+  ///             lead to the other activity lifecycle callback on the way to
+  ///             termination.
+  ///
+  ///             Can be called from any thread.
+  ///
+  void Terminate();
+
+  virtual void OnStart();
+
+  virtual void OnStop();
+
+  virtual void OnPause();
+
+  virtual void OnResume();
+
+  virtual std::shared_ptr<fml::Mapping> OnSaveInstanceState();
+
+  virtual void OnWindowFocusChanged(bool has_focus);
+
+  virtual void OnNativeWindowCreated(ANativeWindow* window);
+
+  virtual void OnNativeWindowResized(ANativeWindow* window);
+
+  virtual void OnNativeWindowRedrawNeeded(ANativeWindow* window);
+
+  virtual void OnNativeWindowDestroyed(ANativeWindow* window);
+
+  virtual void OnInputQueueCreated(AInputQueue* queue);
+
+  virtual void OnInputQueueDestroyed(AInputQueue* queue);
+
+  virtual void OnConfigurationChanged();
+
+  virtual void OnLowMemory();
+
+ protected:
+  explicit NativeActivity(ANativeActivity* activity);
+
+ private:
+  ANativeActivity* activity_ = nullptr;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(NativeActivity);
+};
+
+std::unique_ptr<NativeActivity> NativeActivityMain(
+    ANativeActivity* activity,
+    std::unique_ptr<fml::Mapping> saved_state);
+
+}  // namespace flutter
+
+#endif  // FLUTTER_TESTING_ANDROID_NATIVE_ACTIVITY_NATIVE_ACTIVITY_H_
diff --git a/testing/android/native_activity/native_activity_apk.py b/testing/android/native_activity/native_activity_apk.py
new file mode 100644
index 0000000000000000000000000000000000000000..23813ab969048715095f4671cafad3c3da06443a
--- /dev/null
+++ b/testing/android/native_activity/native_activity_apk.py
@@ -0,0 +1,97 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import sys
+
+import argparse
+import os
+import zipfile
+import subprocess
+
+
+def run_command_checked(command):
+  try:
+    subprocess.check_output(command, stderr=subprocess.STDOUT, text=True)
+  except subprocess.CalledProcessError as cpe:
+    print(cpe.output)
+    raise cpe
+
+
+def main():
+  parser = argparse.ArgumentParser()
+
+  parser.add_argument('--aapt2-bin', type=str, required=True, help='The path to the aapt2 binary.')
+  parser.add_argument(
+      '--zipalign-bin', type=str, required=True, help='The path to the zipalign binary.'
+  )
+  parser.add_argument(
+      '--apksigner-bin', type=str, required=True, help='The path to the apksigner binary.'
+  )
+  parser.add_argument(
+      '--android-manifest', type=str, required=True, help='The path to the AndroidManifest.xml.'
+  )
+  parser.add_argument('--android-jar', type=str, required=True, help='The path to android.jar.')
+  parser.add_argument('--output-path', type=str, required=True, help='The path to the output apk.')
+  parser.add_argument(
+      '--library', type=str, required=True, help='The path to the library to put in the apk.'
+  )
+  parser.add_argument(
+      '--keystore', type=str, required=True, help='The path to the debug keystore to sign the apk.'
+  )
+  parser.add_argument(
+      '--gen-dir', type=str, required=True, help='The directory for generated files.'
+  )
+  parser.add_argument(
+      '--android-abi', type=str, required=True, help='The android ABI of the library.'
+  )
+
+  args = parser.parse_args()
+
+  library_file = os.path.basename(args.library)
+  apk_name = os.path.basename(args.output_path)
+
+  unaligned_apk_path = os.path.join(args.gen_dir, '%s.unaligned' % apk_name)
+  unsigned_apk_path = os.path.join(args.gen_dir, '%s.unsigned' % apk_name)
+  apk_path = args.output_path
+
+  # Create the skeleton of the APK using aapt2.
+  aapt2_command = [
+      args.aapt2_bin,
+      'link',
+      '-I',
+      args.android_jar,
+      '--manifest',
+      args.android_manifest,
+      '-o',
+      unaligned_apk_path,
+  ]
+  run_command_checked(aapt2_command)
+
+  # Stuff the library in the APK which is just a regular ZIP file. Libraries are not compressed.
+  with zipfile.ZipFile(unaligned_apk_path, 'a', compression=zipfile.ZIP_STORED) as zipf:
+    zipf.write(args.library, 'lib/%s/%s' % (args.android_abi, library_file))
+
+  # Align the dylib to a page boundary.
+  zipalign_command = [
+      args.zipalign_bin,
+      '-p',  # Page align the dylib
+      '-f',  # overwrite output if exists
+      '4',  # 32-bit alignment
+      unaligned_apk_path,
+      unsigned_apk_path,
+  ]
+  run_command_checked(zipalign_command)
+
+  # Sign the APK.
+  apksigner_command = [
+      args.apksigner_bin, 'sign', '--ks', args.keystore, '--ks-pass', 'pass:android', '--out',
+      apk_path, unsigned_apk_path
+  ]
+  run_command_checked(apksigner_command)
+
+  return 0
+
+
+if __name__ == '__main__':
+  sys.exit(main())
diff --git a/testing/android_background_image/android/app/build.gradle b/testing/android_background_image/android/app/build.gradle
index c7346c23e8422b55fa8b063fc43e0a8fd9b841d2..3b064625a8a23cf7584b756bef29fa3cdf4ab287 100644
--- a/testing/android_background_image/android/app/build.gradle
+++ b/testing/android_background_image/android/app/build.gradle
@@ -1,6 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
+    namespace 'dev.flutter.android_background_image'
     lintOptions {
         abortOnError true
         checkAllWarnings true
@@ -16,16 +17,16 @@ android {
         // The others are irrelevant for a test application.
         disable 'UnpackedNativeCode','MissingApplicationIcon','GoogleAppIndexingApiWarning','GoogleAppIndexingWarning','GradleDependency','NewerVersionAvailable'
     }
-    buildToolsVersion = '33.0.0'
-    compileSdkVersion 33
+    buildToolsVersion = '34.0.0'
+    compileSdkVersion 34
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
     defaultConfig {
         applicationId 'dev.flutter.android_background_image'
-        minSdkVersion 16
-        targetSdkVersion 33
+        minSdkVersion 21
+        targetSdkVersion 34
         versionCode 1
         versionName '1.0'
     }
diff --git a/testing/android_background_image/android/app/src/main/AndroidManifest.xml b/testing/android_background_image/android/app/src/main/AndroidManifest.xml
index d55247e606a67f16dc061289dbff27e9c3af207f..a3a4f995b8227fad5a9e688d86a7b29e3d870330 100644
--- a/testing/android_background_image/android/app/src/main/AndroidManifest.xml
+++ b/testing/android_background_image/android/app/src/main/AndroidManifest.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dev.flutter.android_background_image">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET" />
     <application
         android:name="io.flutter.app.FlutterApplication"
-        android:allowBackup="false"
         android:label="Background Image Tester"
         android:supportsRtl="true">
         <activity
diff --git a/testing/android_background_image/android/build.gradle b/testing/android_background_image/android/build.gradle
index 51b93f95dc27961e02fa74a2712c14ff82daa9ba..5c91cb90e6a0a65be262f691fa173e91cbdfaa0d 100644
--- a/testing/android_background_image/android/build.gradle
+++ b/testing/android_background_image/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0'
+        classpath 'com.android.tools.build:gradle:8.0.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/testing/android_background_image/pubspec.yaml b/testing/android_background_image/pubspec.yaml
index 361922d8fd21ff732b54325ab6a470932c6c369f..ff08f39de048953178ac068b44a34511ad19bd7d 100644
--- a/testing/android_background_image/pubspec.yaml
+++ b/testing/android_background_image/pubspec.yaml
@@ -5,7 +5,7 @@
 name: android_background_image
 publish_to: none
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=3.2.0-0 <4.0.0'
 
 # Do not add any dependencies that require more than what is provided in
 # //third_party/dart/pkg, //third_party/dart/third_party/pkg, or
diff --git a/testing/android_systrace_test.py b/testing/android_systrace_test.py
index e6c039db5ac5984b7cf1d0fb81eef18a0382ea39..2875409703e92a5ccc32a53422ef8fbf11275a67 100755
--- a/testing/android_systrace_test.py
+++ b/testing/android_systrace_test.py
@@ -9,13 +9,11 @@ import os
 import subprocess
 import sys
 
-BUILDROOT_DIR = os.path.abspath(
-    os.path.join(os.path.realpath(__file__), '..', '..', '..')
-)
+BUILDROOT_DIR = os.path.abspath(os.path.join(os.path.realpath(__file__), '..', '..', '..'))
 
 PERFETTO_SESSION_KEY = 'session1'
 PERFETTO_TRACE_FILE = '/data/misc/perfetto-traces/trace'
-PERFETTO_CONFIG = '''
+PERFETTO_CONFIG = """
 write_into_file: true
 file_write_period_ms: 1000000000
 flush_period_ms: 1000
@@ -32,30 +30,28 @@ data_sources: {
         }
     }
 }
-'''
+"""
 
 
-def InstallApk(apk_path, package_name, adb_path='adb'):
+def install_apk(apk_path, package_name, adb_path='adb'):
   print('Installing APK')
   subprocess.check_output([adb_path, 'shell', 'am', 'force-stop', package_name])
   # Allowed to fail if APK was never installed.
-  subprocess.call([adb_path, 'uninstall', package_name],
-                  stdout=subprocess.DEVNULL)
+  subprocess.call([adb_path, 'uninstall', package_name], stdout=subprocess.DEVNULL)
   subprocess.check_output([adb_path, 'install', apk_path])
 
 
-def StartPerfetto(package_name, adb_path='adb'):
+def start_perfetto(package_name, adb_path='adb'):
   print('Starting trace')
   cmd = [
-      adb_path, 'shell', 'echo', "'" + PERFETTO_CONFIG % package_name + "'",
-      '|', 'perfetto', '-c', '-', '--txt', '-o', PERFETTO_TRACE_FILE,
-      '--detach', PERFETTO_SESSION_KEY
+      adb_path, 'shell', 'echo', "'" + PERFETTO_CONFIG % package_name + "'", '|', 'perfetto', '-c',
+      '-', '--txt', '-o', PERFETTO_TRACE_FILE, '--detach', PERFETTO_SESSION_KEY
   ]
 
   subprocess.check_output(cmd, stderr=subprocess.STDOUT)
 
 
-def LaunchPackage(package_name, activity_name, adb_path='adb'):
+def launch_package(package_name, activity_name, adb_path='adb'):
   print('Scanning logcat')
   subprocess.check_output([adb_path, 'logcat', '-c'], stderr=subprocess.STDOUT)
   logcat = subprocess.Popen([adb_path, 'logcat'],
@@ -71,13 +67,12 @@ def LaunchPackage(package_name, activity_name, adb_path='adb'):
                           stderr=subprocess.STDOUT)
   for line in logcat.stdout:
     print('>>>>>>>> ' + line.strip())
-    if ('Observatory listening' in line) or ('Dart VM service is listening'
-                                             in line):
+    if ('Observatory listening' in line) or ('Dart VM service is listening' in line):
       logcat.kill()
       break
 
 
-def CollectAndValidateTrace(adb_path='adb'):
+def collect_and_validate_trace(adb_path='adb'):
   print('Fetching trace')
   subprocess.check_output([
       adb_path, 'shell', 'perfetto', '--attach', PERFETTO_SESSION_KEY, '--stop'
@@ -88,12 +83,9 @@ def CollectAndValidateTrace(adb_path='adb'):
 
   print('Validating trace')
   traceconv = os.path.join(
-      BUILDROOT_DIR, 'third_party', 'android_tools', 'trace_to_text',
-      'trace_to_text'
+      BUILDROOT_DIR, 'third_party', 'android_tools', 'trace_to_text', 'trace_to_text'
   )
-  traceconv_output = subprocess.check_output([
-      traceconv, 'systrace', 'trace.pb'
-  ],
+  traceconv_output = subprocess.check_output([traceconv, 'systrace', 'trace.pb'],
                                              stderr=subprocess.STDOUT,
                                              universal_newlines=True)
 
@@ -111,10 +103,7 @@ def main():
   parser = argparse.ArgumentParser()
 
   parser.add_argument(
-      '--apk-path',
-      dest='apk_path',
-      action='store',
-      help='Provide the path to the APK to install'
+      '--apk-path', dest='apk_path', action='store', help='Provide the path to the APK to install'
   )
   parser.add_argument(
       '--package-name',
@@ -140,10 +129,18 @@ def main():
 
   args = parser.parse_args()
 
-  InstallApk(args.apk_path, args.package_name, args.adb_path)
-  StartPerfetto(args.package_name, args.adb_path)
-  LaunchPackage(args.package_name, args.activity_name, args.adb_path)
-  return CollectAndValidateTrace(args.adb_path)
+  android_api_level = subprocess.check_output([
+      args.adb_path, 'shell', 'getprop', 'ro.build.version.sdk'
+  ],
+                                              text=True).strip()
+  if int(android_api_level) < 29:
+    print('Android API %s detected. This script requires API 29 or above.' % android_api_level)
+    return 0
+
+  install_apk(args.apk_path, args.package_name, args.adb_path)
+  start_perfetto(args.package_name, args.adb_path)
+  launch_package(args.package_name, args.activity_name, args.adb_path)
+  return collect_and_validate_trace(args.adb_path)
 
 
 if __name__ == '__main__':
diff --git a/testing/assertions_skia.cc b/testing/assertions_skia.cc
index 856ddf1972eeed98778927bc7c0864c87bd908ea..a8e036d973b6448199b6f572509c8f8fe212190c 100644
--- a/testing/assertions_skia.cc
+++ b/testing/assertions_skia.cc
@@ -4,8 +4,7 @@
 
 #include "flutter/testing/assertions_skia.h"
 
-namespace flutter {
-namespace testing {
+namespace std {
 
 std::ostream& operator<<(std::ostream& os, const SkClipOp& o) {
   switch (o) {
@@ -100,5 +99,4 @@ std::ostream& operator<<(std::ostream& os, const SkSamplingOptions& s) {
   }
 }
 
-}  // namespace testing
-}  // namespace flutter
+}  // namespace std
diff --git a/testing/assertions_skia.h b/testing/assertions_skia.h
index 663ab57f3b027844eb9c39ed8a812eab3c2c5db1..c1e3764ca30455ca659b865bfbb26611367f5ead 100644
--- a/testing/assertions_skia.h
+++ b/testing/assertions_skia.h
@@ -16,8 +16,7 @@
 #include "third_party/skia/include/core/SkRRect.h"
 #include "third_party/skia/include/core/SkSamplingOptions.h"
 
-namespace flutter {
-namespace testing {
+namespace std {
 
 extern std::ostream& operator<<(std::ostream& os, const SkClipOp& o);
 extern std::ostream& operator<<(std::ostream& os, const SkMatrix& m);
@@ -33,7 +32,6 @@ extern std::ostream& operator<<(std::ostream& os, const SkColor4f& r);
 extern std::ostream& operator<<(std::ostream& os, const SkPaint& r);
 extern std::ostream& operator<<(std::ostream& os, const SkSamplingOptions& s);
 
-}  // namespace testing
-}  // namespace flutter
+}  // namespace std
 
 #endif  // FLUTTER_TESTING_ASSERTIONS_SKIA_H_
diff --git a/testing/autoreleasepool_test.h b/testing/autoreleasepool_test.h
new file mode 100644
index 0000000000000000000000000000000000000000..2e11da555310908feec902c5e52ea9bf146f4c15
--- /dev/null
+++ b/testing/autoreleasepool_test.h
@@ -0,0 +1,45 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_TESTING_AUTORELEASEPOOL_TEST_H_
+#define FLUTTER_TESTING_AUTORELEASEPOOL_TEST_H_
+
+#include "flutter/fml/platform/darwin/scoped_nsautorelease_pool.h"
+
+#include "gtest/gtest.h"
+
+namespace flutter::testing {
+
+// GoogleTest mixin that runs the test within the scope of an NSAutoReleasePool.
+//
+// This can be mixed into test fixture classes that also inherit from gtest's
+// ::testing::Test base class.
+class AutoreleasePoolTestMixin {
+ public:
+  AutoreleasePoolTestMixin() = default;
+  ~AutoreleasePoolTestMixin() = default;
+
+ private:
+  fml::ScopedNSAutoreleasePool autorelease_pool_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(AutoreleasePoolTestMixin);
+};
+
+// GoogleTest fixture that runs the test within the scope of an
+// NSAutoReleasePool.
+class AutoreleasePoolTest : public ::testing::Test,
+                            public AutoreleasePoolTestMixin {
+ public:
+  AutoreleasePoolTest() = default;
+  ~AutoreleasePoolTest() = default;
+
+ private:
+  fml::ScopedNSAutoreleasePool autorelease_pool_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(AutoreleasePoolTest);
+};
+
+}  // namespace flutter::testing
+
+#endif  // FLUTTER_TESTING_AUTORELEASEPOOL_TEST_H_
diff --git a/testing/benchmark/displaylist_benchmark_parser.py b/testing/benchmark/displaylist_benchmark_parser.py
index a8b49c6b95579e86421c86d2d3b2c901a7ba38f1..9c7d476f5b1dc1d94a6ce6e39c0845aa76e9cd65 100755
--- a/testing/benchmark/displaylist_benchmark_parser.py
+++ b/testing/benchmark/displaylist_benchmark_parser.py
@@ -8,77 +8,73 @@ import argparse
 import csv
 import json
 import sys
-import matplotlib.pyplot as plt
-from matplotlib.backends.backend_pdf import PdfPages as pdfp
+import matplotlib.pyplot as plt  # pylint: disable=import-error
+from matplotlib.backends.backend_pdf import PdfPages as pdfp  # pylint: disable=import-error
 
 
-class BenchmarkResult:
+class BenchmarkResult:  # pylint: disable=too-many-instance-attributes
 
-  def __init__(self, name, backend, timeUnit, drawCallCount):
+  def __init__(self, name, backend, time_unit, draw_call_count):
     self.name = name
     self.series = {}
-    self.seriesLabels = {}
+    self.series_labels = {}
     self.backend = backend
-    self.largeYValues = False
-    self.yLimit = 200
-    self.timeUnit = timeUnit
-    self.drawCallCount = drawCallCount
-    self.optionalValues = {}
+    self.large_y_values = False
+    self.y_limit = 200
+    self.time_unit = time_unit
+    self.draw_call_count = draw_call_count
+    self.optional_values = {}
 
   def __repr__(self):
     return 'Name: % s\nBackend: % s\nSeries: % s\nSeriesLabels: % s\n' % (
-        self.name, self.backend, self.series, self.seriesLabels
+        self.name, self.backend, self.series, self.series_labels
     )
 
-  def addDataPoint(self, family, x, y):
+  def add_data_point(self, family, xval, yval):
     if family not in self.series:
       self.series[family] = {'x': [], 'y': []}
 
-    self.series[family]['x'].append(x)
-    self.series[family]['y'].append(y)
+    self.series[family]['x'].append(xval)
+    self.series[family]['y'].append(yval)
 
-    if y > self.yLimit:
-      self.largeYValues = True
+    if yval > self.y_limit:
+      self.large_y_values = True
 
-  def addOptionalValue(self, name, x, y):
-    if name not in self.optionalValues:
-      self.optionalValues[name] = {}
+  def add_optional_value(self, name, xval, yval):
+    if name not in self.optional_values:
+      self.optional_values[name] = {}
 
-    self.optionalValues[name][x] = y
+    self.optional_values[name][xval] = yval
 
-  def setFamilyLabel(self, family, label):
+  def set_family_label(self, family, label):
     # I'm not keying the main series dict off the family label
     # just in case we get data where the two aren't a 1:1 mapping
-    if family in self.seriesLabels:
-      assert self.seriesLabels[family] == label
+    if family in self.series_labels:
+      assert self.series_labels[family] == label
       return
 
-    self.seriesLabels[family] = label
+    self.series_labels[family] = label
 
   def plot(self):
     figures = []
     figures.append(plt.figure(dpi=1200, frameon=False, figsize=(11, 8.5)))
 
     for family in self.series:
-      plt.plot(
-          self.series[family]['x'],
-          self.series[family]['y'],
-          label=self.seriesLabels[family]
-      )
+      plt.plot(self.series[family]['x'], self.series[family]['y'], label=self.series_labels[family])
 
     plt.xlabel('Benchmark Seed')
-    plt.ylabel('Time (' + self.timeUnit + ')')
+    plt.ylabel('Time (' + self.time_unit + ')')
 
     title = ''
     # Crop the Y axis so that we can see what's going on at the lower end
-    if self.largeYValues:
-      plt.ylim((0, self.yLimit))
+    if self.large_y_values:
+      plt.ylim((0, self.y_limit))
       title = self.name + ' ' + self.backend + ' (Cropped)'
     else:
       title = self.name + ' ' + self.backend
 
-    if self.drawCallCount != -1:
-      title += '\nDraw Call Count: ' + str(int(self.drawCallCount))
+    if self.draw_call_count != -1:
+      title += '\nDraw Call Count: ' + str(int(self.draw_call_count))
 
     plt.title(title)
 
@@ -87,22 +83,20 @@ class BenchmarkResult:
     plt.legend(fontsize='xx-small')
     plt.plot()
 
-    if self.largeYValues:
+    if self.large_y_values:
       # Plot again but with the full Y axis visible
       figures.append(plt.figure(dpi=1200, frameon=False, figsize=(11, 8.5)))
       for family in self.series:
         plt.plot(
-            self.series[family]['x'],
-            self.series[family]['y'],
-            label=self.seriesLabels[family]
+            self.series[family]['x'], self.series[family]['y'], label=self.series_labels[family]
         )
 
       plt.xlabel('Benchmark Seed')
-      plt.ylabel('Time (' + self.timeUnit + ')')
+      plt.ylabel('Time (' + self.time_unit + ')')
       title = self.name + ' ' + self.backend + ' (Complete)'
 
-      if self.drawCallCount != -1:
-        title += '\nDraw Call Count: ' + str(int(self.drawCallCount))
+      if self.draw_call_count != -1:
+        title += '\nDraw Call Count: ' + str(int(self.draw_call_count))
 
       plt.title(title)
 
@@ -113,25 +107,25 @@ class BenchmarkResult:
 
     return figures
 
-  def writeCSV(self, writer):
+  def write_csv(self, writer):
     # For now assume that all our series have the same x values
     # this is true for now, but may differ in the future with benchmark changes
     x_values = []
     y_values = []
     for family in self.series:
       x_values = ['x'] + self.series[family]['x']
-      y_values.append([self.seriesLabels[family]] + self.series[family]['y'])
+      y_values.append([self.series_labels[family]] + self.series[family]['y'])
 
-    for name in self.optionalValues:
+    for name in self.optional_values:
       column = [name]
-      for key in self.optionalValues[name]:
-        column.append(self.optionalValues[name][key])
+      for key in self.optional_values[name]:
+        column.append(self.optional_values[name][key])
       y_values.append(column)
 
-    writer.writerow([self.name, self.drawCallCount])
-    for line in range(len(x_values)):
+    writer.writerow([self.name, self.draw_call_count])
+    for line, _ in enumerate(x_values):
       row = [x_values[line]]
-      for series in range(len(y_values)):
+      for series, _ in enumerate(y_values):
         row.append(y_values[series][line])
       writer.writerow(row)
 
@@ -140,14 +134,12 @@ def main():
   parser = argparse.ArgumentParser()
 
   parser.add_argument(
-      'filename',
-      action='store',
-      help='Path to the JSON output from Google Benchmark'
+      'filename', action='store', help='Path to the JSON output from Google Benchmark'
   )
   parser.add_argument(
       '-o',
       '--output-pdf',
-      dest='outputPDF',
+      dest='output_pdf',
       action='store',
       default='output.pdf',
       help='Filename to output the PDF of graphs to.'
@@ -155,23 +147,23 @@ def main():
   parser.add_argument(
       '-c',
       '--output-csv',
-      dest='outputCSV',
+      dest='output_csv',
       action='store',
       default='output.csv',
       help='Filename to output the CSV data to.'
   )
 
   args = parser.parse_args()
-  jsonData = parseJSON(args.filename)
-  return processBenchmarkData(jsonData, args.outputPDF, args.outputCSV)
+  json_data = parse_json(args.filename)
+  return process_benchmark_data(json_data, args.output_pdf, args.output_csv)
 
 
 def error(message):
   print(message)
-  exit(1)
+  sys.exit(1)
 
 
-def extractAttributesLabel(benchmarkResult):
+def extrac_attributes_label(benchmark_result):
   # Possible attribute keys are:
   #  AntiAliasing
   #  HairlineStroke
@@ -182,7 +174,7 @@ def extractAttributesLabel(benchmarkResult):
 
   for attr in attributes:
     try:
-      if benchmarkResult[attr] != 0:
+      if benchmark_result[attr] != 0:
         label += attr + ', '
     except KeyError:
       pass
@@ -190,96 +182,93 @@ def extractAttributesLabel(benchmarkResult):
   return label[:-2]
 
 
-def processBenchmarkData(benchmarkJSON, outputPDF, outputCSV):
-  benchmarkResultsData = {}
+def process_benchmark_data(benchmark_json, output_pdf, output_csv):
+  benchmark_results_data = {}
 
-  for benchmarkResult in benchmarkJSON:
+  for benchmark_result in benchmark_json:
     # Skip aggregate results
-    if 'aggregate_name' in benchmarkResult:
+    if 'aggregate_name' in benchmark_result:
       continue
 
-    benchmarkVariant = benchmarkResult['name'].split('/')
+    benchmark_variant = benchmark_result['name'].split('/')
     # The final split is always `real_time` and can be discarded
-    benchmarkVariant.remove('real_time')
+    benchmark_variant.remove('real_time')
 
-    splits = len(benchmarkVariant)
+    splits = len(benchmark_variant)
     # First split is always the benchmark function name
-    benchmarkName = benchmarkVariant[0]
+    benchmark_name = benchmark_variant[0]
     # The last split is always the seeded value into the benchmark
-    benchmarkSeededValue = benchmarkVariant[splits - 1]
+    benchmark_seeded_value = benchmark_variant[splits - 1]
     # The second last split is always the backend
-    benchmarkBackend = benchmarkVariant[splits - 2]
+    benchmark_backend = benchmark_variant[splits - 2]
     # Time taken (wall clock time) for benchmark to run
-    benchmarkRealTime = benchmarkResult['real_time']
-    benchmarkUnit = benchmarkResult['time_unit']
+    benchmark_real_time = benchmark_result['real_time']
+    benchmark_unit = benchmark_result['time_unit']
 
-    benchmarkFamilyIndex = benchmarkResult['family_index']
+    benchmark_family_index = benchmark_result['family_index']
 
-    benchmarkFamilyLabel = ''
+    benchmark_family_label = ''
     if splits > 3:
       for i in range(1, splits - 2):
-        benchmarkFamilyLabel += benchmarkVariant[i] + ', '
+        benchmark_family_label += benchmark_variant[i] + ', '
 
-    benchmarkFamilyAttributes = extractAttributesLabel(benchmarkResult)
+    benchmark_family_attributes = extrac_attributes_label(benchmark_result)
 
-    if benchmarkFamilyAttributes == '':
-      benchmarkFamilyLabel = benchmarkFamilyLabel[:-2]
+    if benchmark_family_attributes == '':
+      benchmark_family_label = benchmark_family_label[:-2]
     else:
-      benchmarkFamilyLabel = benchmarkFamilyLabel + benchmarkFamilyAttributes
+      benchmark_family_label = benchmark_family_label + benchmark_family_attributes
 
-    if 'DrawCallCount' in benchmarkResult:
-      benchmarkDrawCallCount = benchmarkResult['DrawCallCount']
+    if 'DrawCallCount' in benchmark_result:
+      benchmark_draw_call_count = benchmark_result['DrawCallCount']
     else:
-      benchmarkDrawCallCount = -1
+      benchmark_draw_call_count = -1
 
-    optional_keys = [
-        'DrawCallCount_Varies', 'VerbCount', 'PointCount', 'VertexCount',
-        'GlyphCount'
-    ]
+    optional_keys = ['DrawCallCount_Varies', 'VerbCount', 'PointCount', 'VertexCount', 'GlyphCount']
 
-    if benchmarkName not in benchmarkResultsData:
-      benchmarkResultsData[benchmarkName] = BenchmarkResult(
-          benchmarkName, benchmarkBackend, benchmarkUnit, benchmarkDrawCallCount
+    if benchmark_name not in benchmark_results_data:
+      benchmark_results_data[benchmark_name] = BenchmarkResult(
+          benchmark_name, benchmark_backend, benchmark_unit, benchmark_draw_call_count
       )
 
     for key in optional_keys:
-      if key in benchmarkResult:
-        benchmarkResultsData[benchmarkName].addOptionalValue(
-            key, benchmarkSeededValue, benchmarkResult[key]
+      if key in benchmark_result:
+        benchmark_results_data[benchmark_name].add_optional_value(
+            key, benchmark_seeded_value, benchmark_result[key]
         )
 
-    benchmarkResultsData[benchmarkName].addDataPoint(
-        benchmarkFamilyIndex, benchmarkSeededValue, benchmarkRealTime
+    benchmark_results_data[benchmark_name].add_data_point(
+        benchmark_family_index, benchmark_seeded_value, benchmark_real_time
     )
-    benchmarkResultsData[benchmarkName].setFamilyLabel(
-        benchmarkFamilyIndex, benchmarkFamilyLabel
+    benchmark_results_data[benchmark_name].set_family_label(
+        benchmark_family_index, benchmark_family_label
     )
 
-  pp = pdfp(outputPDF)
+  pdf = pdfp(output_pdf)
 
-  csv_file = open(outputCSV, 'w')
+  csv_file = open(output_csv, 'w')
   csv_writer = csv.writer(csv_file)
 
-  for benchmark in benchmarkResultsData:
-    figures = benchmarkResultsData[benchmark].plot()
+  for benchmark in benchmark_results_data:
+    figures = benchmark_results_data[benchmark].plot()
     for fig in figures:
-      pp.savefig(fig)
-    benchmarkResultsData[benchmark].writeCSV(csv_writer)
-  pp.close()
+      pdf.savefig(fig)
+    benchmark_results_data[benchmark].write_csv(csv_writer)
+  pdf.close()
 
 
-def parseJSON(filename):
+def parse_json(filename):
   try:
-    jsonFile = open(filename, 'r')
-  except:
+    json_file = open(filename, 'r')
+  except:  # pylint: disable=bare-except
     error('Unable to load file.')
 
   try:
-    jsonData = json.load(jsonFile)
-  except JSONDecodeError:
+    json_data = json.load(json_file)
+  except JSONDecodeError:  # pylint: disable=undefined-variable
     error('Invalid JSON. Unable to parse.')
 
-  return jsonData['benchmarks']
+  return json_data['benchmarks']
 
 
 if __name__ == '__main__':
diff --git a/testing/benchmark/generate_metrics.sh b/testing/benchmark/generate_metrics.sh
index 3886c595870dcfb80a1dd95ff11ab46fc22d33c6..173f28dda9cb82d9e026376f5833dd7f4535d6c9 100644
--- a/testing/benchmark/generate_metrics.sh
+++ b/testing/benchmark/generate_metrics.sh
@@ -4,14 +4,17 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
-# This script is expected to run from $ENGINE_PATH/src/out/host_release/
-# it is currently used only by automation to collect and upload metrics.
+# This script expects $ENGINE_PATH to be set. It is currently used only
+# by automation to collect and upload metrics.
 
 set -ex
 
-./txt_benchmarks --benchmark_format=json > txt_benchmarks.json
-./fml_benchmarks --benchmark_format=json > fml_benchmarks.json
-./shell_benchmarks --benchmark_format=json > shell_benchmarks.json
-./ui_benchmarks --benchmark_format=json > ui_benchmarks.json
-./display_list_builder_benchmarks --benchmark_format=json > display_list_builder_benchmarks.json
-./geometry_benchmarks --benchmark_format=json > geometry_benchmarks.json
+$ENGINE_PATH/src/out/host_release/txt_benchmarks --benchmark_format=json > $ENGINE_PATH/src/out/host_release/txt_benchmarks.json
+$ENGINE_PATH/src/out/host_release/fml_benchmarks --benchmark_format=json > $ENGINE_PATH/src/out/host_release/fml_benchmarks.json
+$ENGINE_PATH/src/out/host_release/shell_benchmarks --benchmark_format=json > $ENGINE_PATH/src/out/host_release/shell_benchmarks.json
+$ENGINE_PATH/src/out/host_release/ui_benchmarks --benchmark_format=json > $ENGINE_PATH/src/out/host_release/ui_benchmarks.json
+$ENGINE_PATH/src/out/host_release/display_list_builder_benchmarks --benchmark_format=json > $ENGINE_PATH/src/out/host_release/display_list_builder_benchmarks.json
+$ENGINE_PATH/src/out/host_release/display_list_region_benchmarks --benchmark_format=json > $ENGINE_PATH/src/out/host_release/display_list_region_benchmarks.json
+$ENGINE_PATH/src/out/host_release/display_list_transform_benchmarks --benchmark_format=json > $ENGINE_PATH/src/out/host_release/display_list_transform_benchmarks.json
+$ENGINE_PATH/src/out/host_release/geometry_benchmarks --benchmark_format=json > $ENGINE_PATH/src/out/host_release/geometry_benchmarks.json
+$ENGINE_PATH/src/out/host_release/canvas_benchmarks --benchmark_format=json > $ENGINE_PATH/src/out/host_release/canvas_benchmarks.json
diff --git a/testing/benchmark/pubspec.yaml b/testing/benchmark/pubspec.yaml
index b4c2fae3164636caff5f358bfb6f319feb36f350..ed249a4eb8c786e112c73bc2ec5a0e294599b465 100644
--- a/testing/benchmark/pubspec.yaml
+++ b/testing/benchmark/pubspec.yaml
@@ -5,7 +5,7 @@
 name: flutter_engine_benchmark
 publish_to: none
 environment:
-  sdk: '>=2.12.0-0 <3.0.0'
+  sdk: '>=3.2.0-0 <4.0.0'
 
 # Do not add any dependencies that require more than what is provided in
 # //third_party/pkg, //third_party/dart/pkg, or
@@ -26,7 +26,7 @@ dev_dependencies:
 
 dependency_overrides:
   _discoveryapis_commons:
-    path: ../../../third_party/pkg/googleapis/discoveryapis_commons
+    path: ../../third_party/pkg/googleapis/discoveryapis_commons
   args:
     path: ../../../third_party/dart/third_party/pkg/args
   async_helper:
@@ -40,25 +40,27 @@ dependency_overrides:
   crypto :
     path: ../../../third_party/dart/third_party/pkg/crypto
   equatable:
-    path: ../../../third_party/pkg/equatable
+    path: ../../third_party/pkg/equatable
   expect:
     path: ../../../third_party/dart/pkg/expect
   gcloud:
-    path: ../../../third_party/pkg/gcloud
+    path: ../../third_party/pkg/gcloud
   googleapis:
-    path: ../../../third_party/pkg/googleapis/generated/googleapis
+    path: ../../third_party/pkg/googleapis/generated/googleapis
   googleapis_auth:
-    path: ../../../third_party/pkg/googleapis/googleapis_auth
+    path: ../../third_party/pkg/googleapis/googleapis_auth
   http:
     path: ../../../third_party/dart/third_party/pkg/http/pkgs/http
   http_parser:
     path: ../../../third_party/dart/third_party/pkg/http_parser
+  js:
+    path: ../../../third_party/dart/pkg/js
   litetest:
     path: ../litetest
   meta:
     path: ../../../third_party/dart/pkg/meta
   metrics_center:
-    path: ../../../third_party/pkg/flutter_packages/packages/metrics_center
+    path: ../../third_party/pkg/flutter_packages/packages/metrics_center
   path:
     path: ../../../third_party/dart/third_party/pkg/path
   smith:
@@ -71,3 +73,5 @@ dependency_overrides:
     path: ../../../third_party/dart/third_party/pkg/term_glyph
   typed_data:
     path: ../../../third_party/dart/third_party/pkg/typed_data
+  web:
+    path: ../../../third_party/dart/third_party/pkg/web
diff --git a/testing/benchmark/upload_metrics.sh b/testing/benchmark/upload_metrics.sh
index a087c947df4bef594ffc7cf142a1ef200c1b64b9..a2a8f28a4f876876b7913e4efcd087bf1260650a 100644
--- a/testing/benchmark/upload_metrics.sh
+++ b/testing/benchmark/upload_metrics.sh
@@ -5,7 +5,7 @@
 # found in the LICENSE file.
 
 # This script is currently used only by automation to collect and upload
-# metrics.
+# metrics and expects $ENGINE_PATH to be set.
 
 set -ex
 
@@ -30,21 +30,35 @@ function follow_links() (
   echo "$file"
 )
 
+function dart_bin() {
+  dart_path="$1/flutter/third_party/dart/tools/sdks/dart-sdk/bin"
+  if [[ ! -e "$dart_path" ]]; then
+    dart_path="$1/third_party/dart/tools/sdks/dart-sdk/bin"
+  fi
+  echo "$dart_path"
+}
+
 SCRIPT_DIR=$(follow_links "$(dirname -- "${BASH_SOURCE[0]}")")
 SRC_DIR="$(cd "$SCRIPT_DIR/../../.."; pwd -P)"
-DART_SDK_DIR="${SRC_DIR}/third_party/dart/tools/sdks/dart-sdk"
-DART="${DART_SDK_DIR}/bin/dart"
+DART_BIN=$(dart_bin "$SRC_DIR")
+DART="${DART_BIN}/dart"
 
 cd "$SCRIPT_DIR"
 "$DART" --disable-dart-dev bin/parse_and_send.dart \
-  --json ../../../out/host_release/txt_benchmarks.json "$@"
+  --json $ENGINE_PATH/src/out/host_release/txt_benchmarks.json "$@"
+"$DART" --disable-dart-dev bin/parse_and_send.dart \
+  --json $ENGINE_PATH/src/out/host_release/fml_benchmarks.json "$@"
+"$DART" --disable-dart-dev bin/parse_and_send.dart \
+  --json $ENGINE_PATH/src/out/host_release/shell_benchmarks.json "$@"
+"$DART" --disable-dart-dev bin/parse_and_send.dart \
+  --json $ENGINE_PATH/src/out/host_release/ui_benchmarks.json "$@"
 "$DART" --disable-dart-dev bin/parse_and_send.dart \
-  --json ../../../out/host_release/fml_benchmarks.json "$@"
+  --json $ENGINE_PATH/src/out/host_release/display_list_builder_benchmarks.json "$@"
 "$DART" --disable-dart-dev bin/parse_and_send.dart \
-  --json ../../../out/host_release/shell_benchmarks.json "$@"
+  --json $ENGINE_PATH/src/out/host_release/display_list_region_benchmarks.json "$@"
 "$DART" --disable-dart-dev bin/parse_and_send.dart \
-  --json ../../../out/host_release/ui_benchmarks.json "$@"
+  --json $ENGINE_PATH/src/out/host_release/display_list_transform_benchmarks.json "$@"
 "$DART" --disable-dart-dev bin/parse_and_send.dart \
-  --json ../../../out/host_release/display_list_builder_benchmarks.json "$@"
+  --json $ENGINE_PATH/src/out/host_release/geometry_benchmarks.json "$@"
 "$DART" --disable-dart-dev bin/parse_and_send.dart \
-  --json ../../../out/host_release/geometry_benchmarks.json "$@"
+  --json $ENGINE_PATH/src/out/host_release/canvas_benchmarks.json "$@"
diff --git a/testing/canvas_test.h b/testing/canvas_test.h
index 0d9eda9080c135284b67bea2255fa463a861987b..3219dfeba1596cec9d232d2fff2484881fa987b6 100644
--- a/testing/canvas_test.h
+++ b/testing/canvas_test.h
@@ -2,12 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef TESTING_CANVAS_TEST_H_
-#define TESTING_CANVAS_TEST_H_
+#ifndef FLUTTER_TESTING_CANVAS_TEST_H_
+#define FLUTTER_TESTING_CANVAS_TEST_H_
 
 #include "flutter/fml/macros.h"
 #include "flutter/testing/mock_canvas.h"
 #include "gtest/gtest.h"
+#include "third_party/skia/include/core/SkColorSpace.h"
 
 namespace flutter {
 namespace testing {
@@ -19,10 +20,11 @@ class CanvasTestBase : public BaseT {
   CanvasTestBase() = default;
 
   MockCanvas& mock_canvas() { return canvas_; }
-  SkColorSpace* mock_color_space() { return canvas_.imageInfo().colorSpace(); }
+  sk_sp<SkColorSpace> mock_color_space() { return color_space_; }
 
  private:
   MockCanvas canvas_;
+  sk_sp<SkColorSpace> color_space_ = SkColorSpace::MakeSRGB();
 
   FML_DISALLOW_COPY_AND_ASSIGN(CanvasTestBase);
 };
@@ -31,4 +33,4 @@ using CanvasTest = CanvasTestBase<::testing::Test>;
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // TESTING_CANVAS_TEST_H_
+#endif  // FLUTTER_TESTING_CANVAS_TEST_H_
diff --git a/testing/dart/BUILD.gn b/testing/dart/BUILD.gn
index 04035d13d8f2e186fa36121de50b73ab47441f6e..90b4ee96f42958d1ba3d3ee53ec1990edc407aaf 100644
--- a/testing/dart/BUILD.gn
+++ b/testing/dart/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//flutter/testing/dart/compile_test.gni")
+import("//flutter/build/dart/rules.gni")
 
 tests = [
   "assets_test.dart",
@@ -17,6 +17,7 @@ tests = [
   "fragment_shader_test.dart",
   "geometry_test.dart",
   "gesture_settings_test.dart",
+  "gpu_test.dart",
   "gradient_test.dart",
   "http_allow_http_connections_test.dart",
   "http_disallow_http_connections_test.dart",
@@ -32,24 +33,41 @@ tests = [
   "lerp_test.dart",
   "locale_test.dart",
   "mask_filter_test.dart",
+  "painting_test.dart",
   "paragraph_builder_test.dart",
   "paragraph_test.dart",
   "path_test.dart",
   "picture_test.dart",
+  "platform_dispatcher_test.dart",
   "platform_view_test.dart",
+  "platform_isolate_test.dart",
+  "platform_isolate_shutdown_test.dart",
   "plugin_utilities_test.dart",
   "semantics_test.dart",
   "serial_gc_test.dart",
+  "spawn_helper.dart",
+  "spawn_test.dart",
+  "stringification_test.dart",
   "task_order_test.dart",
   "text_test.dart",
   "window_test.dart",
 ]
 
 foreach(test, tests) {
-  compile_flutter_dart_test("compile_$test") {
-    dart_file = test
-    dart_kernel = "$root_gen_dir/$test.dill"
-    packages = ".dart_tool/package_config.json"
+  flutter_build_dir = rebase_path("$root_gen_dir")
+  flutter_src_dir = rebase_path("$root_out_dir/../../flutter")
+  skia_gold_work_dir = rebase_path("$root_gen_dir/skia_gold_$test")
+  flutter_frontend_server("compile_$test") {
+    main_dart = test
+    kernel_output = "$root_gen_dir/$test.dill"
+    extra_args = [
+      "-DkFlutterSrcDirectory=$flutter_src_dir",
+      "-DkFlutterBuildDirectory=$flutter_build_dir",
+      "-DkSkiaGoldWorkDirectory=$skia_gold_work_dir",
+    ]
+    package_config = ".dart_tool/package_config.json"
+    deps = [ "//flutter/third_party/txt:txt_fixtures" ]
+    testonly = true
   }
 }
 
diff --git a/testing/dart/assets_test.dart b/testing/dart/assets_test.dart
index 198f952f98e7f182a77a89f3064c40dda74c656d..84a5d307fa86e6e214d8deeff9b4938ea5b639cf 100644
--- a/testing/dart/assets_test.dart
+++ b/testing/dart/assets_test.dart
@@ -68,9 +68,9 @@ void main() {
 
   test('Tester can still load through dart:ui', () async {
     /// Manually load font asset through dart.
-    final Uint8List encoded = utf8.encoder.convert(Uri(path: Uri.encodeFull('Roboto-Medium.ttf')).path);
+    final Uint8List encoded = utf8.encode(Uri(path: Uri.encodeFull('Roboto-Medium.ttf')).path);
     final Completer<Uint8List> result = Completer<Uint8List>();
-    window.sendPlatformMessage('flutter/assets', encoded.buffer.asByteData(), (ByteData? data) {
+    PlatformDispatcher.instance.sendPlatformMessage('flutter/assets', encoded.buffer.asByteData(), (ByteData? data) {
       result.complete(data!.buffer.asUint8List());
     });
 
diff --git a/testing/dart/canvas_test.dart b/testing/dart/canvas_test.dart
index 58706921667677f83c853b9d8e2ff5ec3d9b3d66..fe957e3340f12dcfd39aa361ecd1bfe6eaba8a74 100644
--- a/testing/dart/canvas_test.dart
+++ b/testing/dart/canvas_test.dart
@@ -12,6 +12,9 @@ import 'package:litetest/litetest.dart';
 import 'package:path/path.dart' as path;
 import 'package:vector_math/vector_math_64.dart';
 
+import 'goldens.dart';
+import 'impeller_enabled.dart';
+
 typedef CanvasCallback = void Function(Canvas canvas);
 
 Future<Image> createImage(int width, int height) {
@@ -113,62 +116,27 @@ void testNoCrashes() {
 
     // Regression test for https://github.com/flutter/flutter/issues/115143
     testCanvas((Canvas canvas) => canvas.drawPaint(Paint()..imageFilter = const ColorFilter.mode(Color(0x00000000), BlendMode.xor)));
-  });
-}
 
-/// @returns true When the images are reasonably similar.
-/// @todo Make the search actually fuzzy to a certain degree.
-Future<bool> fuzzyCompareImages(Image golden, Image img) async {
-  if (golden.width != img.width || golden.height != img.height) {
-    return false;
-  }
-  int getPixel(ByteData data, int x, int y) => data.getUint32((x + y * golden.width) * 4);
-  final ByteData goldenData = (await golden.toByteData())!;
-  final ByteData imgData = (await img.toByteData())!;
-  for (int y = 0; y < golden.height; y++) {
-    for (int x = 0; x < golden.width; x++) {
-      if (getPixel(goldenData, x, y) != getPixel(imgData, x, y)) {
-        return false;
-      }
-    }
-  }
-  return true;
-}
-
-Future<void> saveTestImage(Image image, String filename) async {
-  final String imagesPath = path.join('flutter', 'testing', 'resources');
-  final ByteData pngData = (await image.toByteData(format: ImageByteFormat.png))!;
-  final String outPath = path.join(imagesPath, filename);
-  File(outPath).writeAsBytesSync(pngData.buffer.asUint8List());
-  print('wrote: $outPath');
+    // Regression test for https://github.com/flutter/flutter/issues/120278
+    testCanvas((Canvas canvas) => canvas.drawPaint(Paint()..imageFilter = ImageFilter.compose(
+      outer: ImageFilter.matrix(Matrix4.identity().storage),
+      inner: ImageFilter.blur())));
+  });
 }
 
-/// @returns true When the images are reasonably similar.
-Future<bool> fuzzyGoldenImageCompare(
-    Image image, String goldenImageName) async {
-  final String imagesPath = path.join('flutter', 'testing', 'resources');
-  final File file = File(path.join(imagesPath, goldenImageName));
-
-  bool areEqual = false;
+const String kFlutterBuildDirectory = 'kFlutterBuildDirectory';
 
-  if (file.existsSync()) {
-    final Uint8List goldenData = await file.readAsBytes();
-
-    final Codec codec = await instantiateImageCodec(goldenData);
-    final FrameInfo frame = await codec.getNextFrame();
-    expect(frame.image.height, equals(image.height));
-    expect(frame.image.width, equals(image.width));
-
-    areEqual = await fuzzyCompareImages(frame.image, image);
-  }
-
-  if (!areEqual) {
-    saveTestImage(image, 'found_$goldenImageName');
+String get _flutterBuildPath {
+  const String buildPath = String.fromEnvironment(kFlutterBuildDirectory);
+  if (buildPath.isEmpty) {
+    throw StateError('kFlutterBuildDirectory -D variable is not set.');
   }
-  return areEqual;
+  return buildPath;
 }
 
-void main() {
+void main() async {
+  final ImageComparer comparer = await ImageComparer.create();
+
   testNoCrashes();
 
   test('Simple .toImage', () async {
@@ -183,10 +151,7 @@ void main() {
     }, 100, 100);
     expect(image.width, equals(100));
     expect(image.height, equals(100));
-
-    final bool areEqual =
-        await fuzzyGoldenImageCompare(image, 'canvas_test_toImage.png');
-    expect(areEqual, true);
+    await comparer.addGoldenImage(image, 'canvas_test_toImage.png');
   });
 
   Gradient makeGradient() {
@@ -197,8 +162,7 @@ void main() {
     );
   }
 
-  test('Simple gradient', () async {
-    Paint.enableDithering = false;
+  test('Simple gradient, which is implicitly dithered', () async {
     final Image image = await toImage((Canvas canvas) {
       final Paint paint = Paint()..shader = makeGradient();
       canvas.drawPaint(paint);
@@ -206,24 +170,8 @@ void main() {
     expect(image.width, equals(100));
     expect(image.height, equals(100));
 
-    final bool areEqual =
-        await fuzzyGoldenImageCompare(image, 'canvas_test_gradient.png');
-    expect(areEqual, true);
-  }, skip: !Platform.isLinux); // https://github.com/flutter/flutter/issues/53784
-
-  test('Simple dithered gradient', () async {
-    Paint.enableDithering = true;
-    final Image image = await toImage((Canvas canvas) {
-      final Paint paint = Paint()..shader = makeGradient();
-      canvas.drawPaint(paint);
-    }, 100, 100);
-    expect(image.width, equals(100));
-    expect(image.height, equals(100));
-
-    final bool areEqual =
-        await fuzzyGoldenImageCompare(image, 'canvas_test_dithered_gradient.png');
-    expect(areEqual, true);
-  }, skip: !Platform.isLinux); // https://github.com/flutter/flutter/issues/53784
+    await comparer.addGoldenImage(image, 'canvas_test_dithered_gradient.png');
+  });
 
   test('Null values allowed for drawAtlas methods', () async {
     final Image image = await createImage(100, 100);
@@ -310,12 +258,8 @@ void main() {
       });
     }, width, height);
 
-    final bool areEqual = await fuzzyCompareImages(incrementalMatrixImage, combinedMatrixImage);
+    final bool areEqual = await comparer.fuzzyCompareImages(incrementalMatrixImage, combinedMatrixImage);
 
-    if (!areEqual) {
-      saveTestImage(incrementalMatrixImage, 'incremental_3D_transform_test_image.png');
-      saveTestImage(combinedMatrixImage, 'combined_3D_transform_test_image.png');
-    }
     expect(areEqual, true);
   });
 
@@ -326,6 +270,7 @@ void main() {
       builder.pushStyle(TextStyle(
         decoration: TextDecoration.underline,
         decorationColor: const Color(0xFF0000FF),
+        fontFamily: 'Ahem',
         fontSize: 10,
         color: const Color(0xFF000000),
         decorationStyle: style,
@@ -355,10 +300,8 @@ void main() {
     expect(image.width, equals(200));
     expect(image.height, equals(250));
 
-    final bool areEqual =
-        await fuzzyGoldenImageCompare(image, 'dotted_path_effect_mixed_with_stroked_geometry.png');
-    expect(areEqual, true);
-  }, skip: !Platform.isLinux); // https://github.com/flutter/flutter/issues/53784
+    await comparer.addGoldenImage(image, 'dotted_path_effect_mixed_with_stroked_geometry.png');
+  });
 
   test('Gradients with matrices in Paragraphs render correctly', () async {
     final Image image = await toImage((Canvas canvas) {
@@ -407,10 +350,8 @@ void main() {
     expect(image.width, equals(600));
     expect(image.height, equals(400));
 
-    final bool areEqual =
-    await fuzzyGoldenImageCompare(image, 'text_with_gradient_with_matrix.png');
-    expect(areEqual, true);
-  }, skip: !Platform.isLinux); // https://github.com/flutter/flutter/issues/53784
+    await comparer.addGoldenImage(image, 'text_with_gradient_with_matrix.png');
+  });
 
   test('toImageSync - too big', () async {
     PictureRecorder recorder = PictureRecorder();
@@ -426,6 +367,12 @@ void main() {
     recorder = PictureRecorder();
     canvas = Canvas(recorder);
 
+    if (impellerEnabled) {
+      // Impeller tries to automagically scale this. See
+      // https://github.com/flutter/flutter/issues/128885
+      canvas.drawImage(image, Offset.zero, Paint());
+      return;
+    }
     // On a slower CI machine, the raster thread may get behind the UI thread
     // here. However, once the image is in an error state it will immediately
     // throw on subsequent attempts.
@@ -435,7 +382,10 @@ void main() {
         canvas.drawImage(image, Offset.zero, Paint());
       } on PictureRasterizationException catch (e) {
         caughtException = true;
-        expect(e.message, contains('unable to create render target at specified size'));
+        expect(
+          e.message,
+          contains('unable to create bitmap render target at specified size ${image.width}x${image.height}'),
+        );
         break;
       }
       // Let the event loop turn.
@@ -590,7 +540,7 @@ void main() {
     // Skia renders a tofu if the font does not have a glyph for a character.
     // However, Flutter opts-in to a Skia feature to render tabs as a single space.
     // See: https://github.com/flutter/flutter/issues/79153
-    final File file = File(path.join('flutter', 'testing', 'resources', 'RobotoSlab-VariableFont_wght.ttf'));
+    final File file = File(path.join(_flutterBuildPath, 'flutter', 'third_party', 'txt', 'assets', 'Roboto-Regular.ttf'));
     final Uint8List fontData = await file.readAsBytes();
     await loadFontFromList(fontData, fontFamily: 'RobotoSerif');
 
@@ -600,13 +550,102 @@ void main() {
     final Image tofuImage = await drawText('>\b<');
 
     // The tab's image should be identical to the space's image but not the tofu's image.
-    final bool tabToSpaceComparison = await fuzzyCompareImages(tabImage, spaceImage);
-    final bool tabToTofuComparison = await fuzzyCompareImages(tabImage, tofuImage);
+    final bool tabToSpaceComparison = await comparer.fuzzyCompareImages(tabImage, spaceImage);
+    final bool tabToTofuComparison = await comparer.fuzzyCompareImages(tabImage, tofuImage);
 
     expect(tabToSpaceComparison, isTrue);
     expect(tabToTofuComparison, isFalse);
   });
 
+  test('drawRect, drawOval, and clipRect render with unsorted rectangles', () async {
+    final PictureRecorder recorder = PictureRecorder();
+    final Canvas canvas = Canvas(recorder);
+
+    canvas.drawColor(const Color(0xFFE0E0E0), BlendMode.src);
+
+    void draw(Rect rect, double x, double y, Color color) {
+      final Paint paint = Paint()
+        ..color = color
+        ..strokeWidth = 5.0;
+
+      final Rect tallThin = Rect.fromLTRB(
+        min(rect.left, rect.right) - 10,
+        rect.top,
+        min(rect.left, rect.right) - 10,
+        rect.bottom,
+      );
+      final Rect wideThin = Rect.fromLTRB(
+        rect.left,
+        min(rect.top, rect.bottom) - 10,
+        rect.right,
+        min(rect.top, rect.bottom) - 10,
+      );
+
+      canvas.save();
+      canvas.translate(x, y);
+
+      paint.style = PaintingStyle.fill;
+      canvas.drawRect(rect, paint);
+      canvas.drawRect(tallThin, paint);
+      canvas.drawRect(wideThin, paint);
+
+      canvas.save();
+      canvas.translate(0, 100);
+      paint.style = PaintingStyle.stroke;
+      canvas.drawRect(rect, paint);
+      canvas.drawRect(tallThin, paint);
+      canvas.drawRect(wideThin, paint);
+      canvas.restore();
+
+      canvas.save();
+      canvas.translate(100, 0);
+      paint.style = PaintingStyle.fill;
+      canvas.drawOval(rect, paint);
+      canvas.drawOval(tallThin, paint);
+      canvas.drawOval(wideThin, paint);
+      canvas.restore();
+
+      canvas.save();
+      canvas.translate(100, 100);
+      paint.style = PaintingStyle.stroke;
+      canvas.drawOval(rect, paint);
+      canvas.drawOval(tallThin, paint);
+      canvas.drawOval(wideThin, paint);
+      canvas.restore();
+
+      canvas.save();
+      canvas.translate(50, 50);
+
+      canvas.save();
+      canvas.clipRect(rect);
+      canvas.drawPaint(paint);
+      canvas.restore();
+
+      canvas.save();
+      canvas.clipRect(tallThin);
+      canvas.drawPaint(paint);
+      canvas.restore();
+
+      canvas.save();
+      canvas.clipRect(wideThin);
+      canvas.drawPaint(paint);
+      canvas.restore();
+
+      canvas.restore();
+
+      canvas.restore();
+    }
+
+    draw(const Rect.fromLTRB(10, 10, 40, 40), 50, 50, const Color(0xFF2196F3));
+    draw(const Rect.fromLTRB(40, 10, 10, 40), 250, 50, const Color(0xFF4CAF50));
+    draw(const Rect.fromLTRB(10, 40, 40, 10), 50, 250, const Color(0xFF9C27B0));
+    draw(const Rect.fromLTRB(40, 40, 10, 10), 250, 250, const Color(0xFFFF9800));
+
+    final Picture picture = recorder.endRecording();
+    final Image image = await picture.toImage(450, 450);
+    await comparer.addGoldenImage(image, 'render_unordered_rects.png');
+  });
+
   Matcher closeToTransform(Float64List expected) => (dynamic v) {
     Expect.type<Float64List>(v);
     final Float64List value = v as Float64List;
@@ -727,26 +766,126 @@ void main() {
   };
 
   test('Canvas.clipRect affects canvas.getClipBounds', () async {
+    void testRect(Rect clipRect, bool doAA) {
+      final PictureRecorder recorder = PictureRecorder();
+      final Canvas canvas = Canvas(recorder);
+      canvas.clipRect(clipRect, doAntiAlias: doAA);
+
+      final Rect clipSortedBounds = Rect.fromLTRB(
+        min(clipRect.left, clipRect.right),
+        min(clipRect.top, clipRect.bottom),
+        max(clipRect.left, clipRect.right),
+        max(clipRect.top, clipRect.bottom),
+      );
+      Rect clipExpandedBounds;
+      if (doAA) {
+        clipExpandedBounds = Rect.fromLTRB(
+          clipSortedBounds.left.floorToDouble(),
+          clipSortedBounds.top.floorToDouble(),
+          clipSortedBounds.right.ceilToDouble(),
+          clipSortedBounds.bottom.ceilToDouble(),
+        );
+      } else {
+        clipExpandedBounds = clipSortedBounds;
+      }
+
+      // Save initial return values for testing restored values
+      final Rect initialLocalBounds = canvas.getLocalClipBounds();
+      final Rect initialDestinationBounds = canvas.getDestinationClipBounds();
+      expect(initialLocalBounds, closeToRect(clipExpandedBounds));
+      expect(initialDestinationBounds, closeToRect(clipExpandedBounds));
+
+      canvas.save();
+      canvas.clipRect(const Rect.fromLTRB(0, 0, 15, 15));
+      // Both clip bounds have changed
+      expect(canvas.getLocalClipBounds(), notCloseToRect(clipExpandedBounds));
+      expect(canvas.getDestinationClipBounds(), notCloseToRect(clipExpandedBounds));
+      // Previous return values have not changed
+      expect(initialLocalBounds, closeToRect(clipExpandedBounds));
+      expect(initialDestinationBounds, closeToRect(clipExpandedBounds));
+      canvas.restore();
+
+      // save/restore returned the values to their original values
+      expect(canvas.getLocalClipBounds(), initialLocalBounds);
+      expect(canvas.getDestinationClipBounds(), initialDestinationBounds);
+
+      canvas.save();
+      canvas.scale(2, 2);
+      final Rect scaledExpandedBounds = Rect.fromLTRB(
+        clipExpandedBounds.left / 2.0,
+        clipExpandedBounds.top / 2.0,
+        clipExpandedBounds.right / 2.0,
+        clipExpandedBounds.bottom / 2.0,
+      );
+      expect(canvas.getLocalClipBounds(), closeToRect(scaledExpandedBounds));
+      // Destination bounds are unaffected by transform
+      expect(canvas.getDestinationClipBounds(), closeToRect(clipExpandedBounds));
+      canvas.restore();
+
+      // save/restore returned the values to their original values
+      expect(canvas.getLocalClipBounds(), initialLocalBounds);
+      expect(canvas.getDestinationClipBounds(), initialDestinationBounds);
+    }
+
+    testRect(const Rect.fromLTRB(10.2, 11.3, 20.4, 25.7), false);
+    testRect(const Rect.fromLTRB(10.2, 11.3, 20.4, 25.7), true);
+
+    // LR swapped
+    testRect(const Rect.fromLTRB(20.4, 11.3, 10.2, 25.7), false);
+    testRect(const Rect.fromLTRB(20.4, 11.3, 10.2, 25.7), true);
+
+    // TB swapped
+    testRect(const Rect.fromLTRB(10.2, 25.7, 20.4, 11.3), false);
+    testRect(const Rect.fromLTRB(10.2, 25.7, 20.4, 11.3), true);
+
+    // LR and TB swapped
+    testRect(const Rect.fromLTRB(20.4, 25.7, 10.2, 11.3), false);
+    testRect(const Rect.fromLTRB(20.4, 25.7, 10.2, 11.3), true);
+  });
+
+  test('Canvas.clipRect with matrix affects canvas.getClipBounds', () async {
+    final PictureRecorder recorder = PictureRecorder();
+    final Canvas canvas = Canvas(recorder);
+    const Rect clipBounds1 = Rect.fromLTRB(0.0, 0.0, 10.0, 10.0);
+    const Rect clipBounds2 = Rect.fromLTRB(10.0, 10.0, 20.0, 20.0);
+
+    canvas.save();
+    canvas.clipRect(clipBounds1, doAntiAlias: false);
+    canvas.translate(0, 10.0);
+    canvas.clipRect(clipBounds1, doAntiAlias: false);
+    expect(canvas.getDestinationClipBounds().isEmpty, isTrue);
+    canvas.restore();
+
+    canvas.save();
+    canvas.clipRect(clipBounds1, doAntiAlias: false);
+    canvas.translate(-10.0, -10.0);
+    canvas.clipRect(clipBounds2, doAntiAlias: false);
+    expect(canvas.getDestinationClipBounds(), clipBounds1);
+    canvas.restore();
+  });
+
+  test('Canvas.clipRRect(doAA=true) affects canvas.getClipBounds', () async {
     final PictureRecorder recorder = PictureRecorder();
     final Canvas canvas = Canvas(recorder);
     const Rect clipBounds = Rect.fromLTRB(10.2, 11.3, 20.4, 25.7);
     const Rect clipExpandedBounds = Rect.fromLTRB(10, 11, 21, 26);
-    canvas.clipRect(clipBounds);
+    final RRect clip = RRect.fromRectAndRadius(clipBounds, const Radius.circular(3));
+    canvas.clipRRect(clip);
 
     // Save initial return values for testing restored values
     final Rect initialLocalBounds = canvas.getLocalClipBounds();
     final Rect initialDestinationBounds = canvas.getDestinationClipBounds();
     expect(initialLocalBounds, closeToRect(clipExpandedBounds));
-    expect(initialDestinationBounds, closeToRect(clipBounds));
+    expect(initialDestinationBounds, closeToRect(clipExpandedBounds));
 
     canvas.save();
     canvas.clipRect(const Rect.fromLTRB(0, 0, 15, 15));
     // Both clip bounds have changed
     expect(canvas.getLocalClipBounds(), notCloseToRect(clipExpandedBounds));
-    expect(canvas.getDestinationClipBounds(), notCloseToRect(clipBounds));
+    expect(canvas.getDestinationClipBounds(), notCloseToRect(clipExpandedBounds));
     // Previous return values have not changed
     expect(initialLocalBounds, closeToRect(clipExpandedBounds));
-    expect(initialDestinationBounds, closeToRect(clipBounds));
+    expect(initialDestinationBounds, closeToRect(clipExpandedBounds));
     canvas.restore();
 
     // save/restore returned the values to their original values
@@ -758,7 +897,7 @@ void main() {
     const Rect scaledExpandedBounds = Rect.fromLTRB(5, 5.5, 10.5, 13);
     expect(canvas.getLocalClipBounds(), closeToRect(scaledExpandedBounds));
     // Destination bounds are unaffected by transform
-    expect(canvas.getDestinationClipBounds(), closeToRect(clipBounds));
+    expect(canvas.getDestinationClipBounds(), closeToRect(clipExpandedBounds));
     canvas.restore();
 
     // save/restore returned the values to their original values
@@ -766,48 +905,26 @@ void main() {
     expect(canvas.getDestinationClipBounds(), initialDestinationBounds);
   });
 
-  test('Canvas.clipRect with matrix affects canvas.getClipBounds', () async {
-    final PictureRecorder recorder = PictureRecorder();
-    final Canvas canvas = Canvas(recorder);
-    const Rect clipBounds1 = Rect.fromLTRB(0.0, 0.0, 10.0, 10.0);
-    const Rect clipBounds2 = Rect.fromLTRB(10.0, 10.0, 20.0, 20.0);
-
-    canvas.save();
-    canvas.clipRect(clipBounds1);
-    canvas.translate(0, 10.0);
-    canvas.clipRect(clipBounds1);
-    expect(canvas.getDestinationClipBounds().isEmpty, isTrue);
-    canvas.restore();
-
-    canvas.save();
-    canvas.clipRect(clipBounds1);
-    canvas.translate(-10.0, -10.0);
-    canvas.clipRect(clipBounds2);
-    expect(canvas.getDestinationClipBounds(), clipBounds1);
-    canvas.restore();
-  });
-
-  test('Canvas.clipRRect affects canvas.getClipBounds', () async {
+  test('Canvas.clipRRect(doAA=false) affects canvas.getClipBounds', () async {
     final PictureRecorder recorder = PictureRecorder();
     final Canvas canvas = Canvas(recorder);
     const Rect clipBounds = Rect.fromLTRB(10.2, 11.3, 20.4, 25.7);
-    const Rect clipExpandedBounds = Rect.fromLTRB(10, 11, 21, 26);
     final RRect clip = RRect.fromRectAndRadius(clipBounds, const Radius.circular(3));
-    canvas.clipRRect(clip);
+    canvas.clipRRect(clip, doAntiAlias: false);
 
     // Save initial return values for testing restored values
     final Rect initialLocalBounds = canvas.getLocalClipBounds();
     final Rect initialDestinationBounds = canvas.getDestinationClipBounds();
-    expect(initialLocalBounds, closeToRect(clipExpandedBounds));
+    expect(initialLocalBounds, closeToRect(clipBounds));
     expect(initialDestinationBounds, closeToRect(clipBounds));
 
     canvas.save();
-    canvas.clipRect(const Rect.fromLTRB(0, 0, 15, 15));
+    canvas.clipRect(const Rect.fromLTRB(0, 0, 15, 15), doAntiAlias: false);
     // Both clip bounds have changed
-    expect(canvas.getLocalClipBounds(), notCloseToRect(clipExpandedBounds));
+    expect(canvas.getLocalClipBounds(), notCloseToRect(clipBounds));
     expect(canvas.getDestinationClipBounds(), notCloseToRect(clipBounds));
     // Previous return values have not changed
-    expect(initialLocalBounds, closeToRect(clipExpandedBounds));
+    expect(initialLocalBounds, closeToRect(clipBounds));
     expect(initialDestinationBounds, closeToRect(clipBounds));
     canvas.restore();
 
@@ -817,8 +934,8 @@ void main() {
 
     canvas.save();
     canvas.scale(2, 2);
-    const Rect scaledExpandedBounds = Rect.fromLTRB(5, 5.5, 10.5, 13);
-    expect(canvas.getLocalClipBounds(), closeToRect(scaledExpandedBounds));
+    const Rect scaledClipBounds = Rect.fromLTRB(5.1, 5.65, 10.2, 12.85);
+    expect(canvas.getLocalClipBounds(), closeToRect(scaledClipBounds));
     // Destination bounds are unaffected by transform
     expect(canvas.getDestinationClipBounds(), closeToRect(clipBounds));
     canvas.restore();
@@ -837,21 +954,21 @@ void main() {
     final RRect clip2 = RRect.fromRectAndRadius(clipBounds2, const Radius.circular(3));
 
     canvas.save();
-    canvas.clipRRect(clip1);
+    canvas.clipRRect(clip1, doAntiAlias: false);
     canvas.translate(0, 10.0);
-    canvas.clipRRect(clip1);
+    canvas.clipRRect(clip1, doAntiAlias: false);
     expect(canvas.getDestinationClipBounds().isEmpty, isTrue);
     canvas.restore();
 
     canvas.save();
-    canvas.clipRRect(clip1);
+    canvas.clipRRect(clip1, doAntiAlias: false);
     canvas.translate(-10.0, -10.0);
-    canvas.clipRRect(clip2);
+    canvas.clipRRect(clip2, doAntiAlias: false);
     expect(canvas.getDestinationClipBounds(), clipBounds1);
     canvas.restore();
   });
 
-  test('Canvas.clipPath affects canvas.getClipBounds', () async {
+  test('Canvas.clipPath(doAA=true) affects canvas.getClipBounds', () async {
     final PictureRecorder recorder = PictureRecorder();
     final Canvas canvas = Canvas(recorder);
     const Rect clipBounds = Rect.fromLTRB(10.2, 11.3, 20.4, 25.7);
@@ -863,16 +980,16 @@ void main() {
     final Rect initialLocalBounds = canvas.getLocalClipBounds();
     final Rect initialDestinationBounds = canvas.getDestinationClipBounds();
     expect(initialLocalBounds, closeToRect(clipExpandedBounds));
-    expect(initialDestinationBounds, closeToRect(clipBounds));
+    expect(initialDestinationBounds, closeToRect(clipExpandedBounds));
 
     canvas.save();
     canvas.clipRect(const Rect.fromLTRB(0, 0, 15, 15));
     // Both clip bounds have changed
     expect(canvas.getLocalClipBounds(), notCloseToRect(clipExpandedBounds));
-    expect(canvas.getDestinationClipBounds(), notCloseToRect(clipBounds));
+    expect(canvas.getDestinationClipBounds(), notCloseToRect(clipExpandedBounds));
     // Previous return values have not changed
     expect(initialLocalBounds, closeToRect(clipExpandedBounds));
-    expect(initialDestinationBounds, closeToRect(clipBounds));
+    expect(initialDestinationBounds, closeToRect(clipExpandedBounds));
     canvas.restore();
 
     // save/restore returned the values to their original values
@@ -884,6 +1001,46 @@ void main() {
     const Rect scaledExpandedBounds = Rect.fromLTRB(5, 5.5, 10.5, 13);
     expect(canvas.getLocalClipBounds(), closeToRect(scaledExpandedBounds));
     // Destination bounds are unaffected by transform
+    expect(canvas.getDestinationClipBounds(), closeToRect(clipExpandedBounds));
+    canvas.restore();
+
+    // save/restore returned the values to their original values
+    expect(canvas.getLocalClipBounds(), initialLocalBounds);
+    expect(canvas.getDestinationClipBounds(), initialDestinationBounds);
+  });
+
+  test('Canvas.clipPath(doAA=false) affects canvas.getClipBounds', () async {
+    final PictureRecorder recorder = PictureRecorder();
+    final Canvas canvas = Canvas(recorder);
+    const Rect clipBounds = Rect.fromLTRB(10.2, 11.3, 20.4, 25.7);
+    final Path clip = Path()..addRect(clipBounds)..addOval(clipBounds);
+    canvas.clipPath(clip, doAntiAlias: false);
+
+    // Save initial return values for testing restored values
+    final Rect initialLocalBounds = canvas.getLocalClipBounds();
+    final Rect initialDestinationBounds = canvas.getDestinationClipBounds();
+    expect(initialLocalBounds, closeToRect(clipBounds));
+    expect(initialDestinationBounds, closeToRect(clipBounds));
+
+    canvas.save();
+    canvas.clipRect(const Rect.fromLTRB(0, 0, 15, 15), doAntiAlias: false);
+    // Both clip bounds have changed
+    expect(canvas.getLocalClipBounds(), notCloseToRect(clipBounds));
+    expect(canvas.getDestinationClipBounds(), notCloseToRect(clipBounds));
+    // Previous return values have not changed
+    expect(initialLocalBounds, closeToRect(clipBounds));
+    expect(initialDestinationBounds, closeToRect(clipBounds));
+    canvas.restore();
+
+    // save/restore returned the values to their original values
+    expect(canvas.getLocalClipBounds(), initialLocalBounds);
+    expect(canvas.getDestinationClipBounds(), initialDestinationBounds);
+
+    canvas.save();
+    canvas.scale(2, 2);
+    const Rect scaledClipBounds = Rect.fromLTRB(5.1, 5.65, 10.2, 12.85);
+    expect(canvas.getLocalClipBounds(), closeToRect(scaledClipBounds));
+    // Destination bounds are unaffected by transform
     expect(canvas.getDestinationClipBounds(), closeToRect(clipBounds));
     canvas.restore();
 
@@ -901,16 +1058,16 @@ void main() {
     final Path clip2 = Path()..addRect(clipBounds2)..addOval(clipBounds2);
 
     canvas.save();
-    canvas.clipPath(clip1);
+    canvas.clipPath(clip1, doAntiAlias: false);
     canvas.translate(0, 10.0);
-    canvas.clipPath(clip1);
+    canvas.clipPath(clip1, doAntiAlias: false);
     expect(canvas.getDestinationClipBounds().isEmpty, isTrue);
     canvas.restore();
 
     canvas.save();
-    canvas.clipPath(clip1);
+    canvas.clipPath(clip1, doAntiAlias: false);
     canvas.translate(-10.0, -10.0);
-    canvas.clipPath(clip2);
+    canvas.clipPath(clip2, doAntiAlias: false);
     expect(canvas.getDestinationClipBounds(), clipBounds1);
     canvas.restore();
   });
@@ -919,16 +1076,15 @@ void main() {
     final PictureRecorder recorder = PictureRecorder();
     final Canvas canvas = Canvas(recorder);
     const Rect clipBounds = Rect.fromLTRB(10.2, 11.3, 20.4, 25.7);
-    const Rect clipExpandedBounds = Rect.fromLTRB(10, 11, 21, 26);
-    canvas.clipRect(clipBounds);
+    canvas.clipRect(clipBounds, doAntiAlias: false);
 
     // Save initial return values for testing restored values
     final Rect initialLocalBounds = canvas.getLocalClipBounds();
     final Rect initialDestinationBounds = canvas.getDestinationClipBounds();
-    expect(initialLocalBounds, closeToRect(clipExpandedBounds));
+    expect(initialLocalBounds, closeToRect(clipBounds));
     expect(initialDestinationBounds, closeToRect(clipBounds));
 
-    canvas.clipRect(const Rect.fromLTRB(0, 0, 15, 15), clipOp: ClipOp.difference);
+    canvas.clipRect(const Rect.fromLTRB(0, 0, 15, 15), clipOp: ClipOp.difference, doAntiAlias: false);
     expect(canvas.getLocalClipBounds(), initialLocalBounds);
     expect(canvas.getDestinationClipBounds(), initialDestinationBounds);
   });
@@ -973,6 +1129,39 @@ void main() {
     canvas.restoreToCount(canvas.getSaveCount() + 1);
     expect(canvas.getSaveCount(), equals(6));
   });
+
+  test('TextDecoration renders non-solid lines', () async {
+    final File file = File(path.join(_flutterBuildPath, 'flutter', 'third_party', 'txt', 'assets', 'Roboto-Regular.ttf'));
+    final Uint8List fontData = await file.readAsBytes();
+    await loadFontFromList(fontData, fontFamily: 'RobotoSlab');
+
+    final PictureRecorder recorder = PictureRecorder();
+    final Canvas canvas = Canvas(recorder);
+
+    for (final (int index, TextDecorationStyle style) in TextDecorationStyle.values.indexed) {
+      final ParagraphBuilder builder = ParagraphBuilder(ParagraphStyle());
+      builder.pushStyle(TextStyle(
+        decoration: TextDecoration.underline,
+        decorationStyle: style,
+        decorationThickness: 1.0,
+        decorationColor: const Color(0xFFFF0000),
+        fontFamily: 'RobotoSlab',
+        fontSize: 24.0,
+        foreground: Paint()..color = const Color(0xFF0000FF),
+      ));
+
+      builder.addText(style.name);
+      final Paragraph paragraph = builder.build();
+      paragraph.layout(const ParagraphConstraints(width: 1000));
+
+      // Draw and layout based on the index vertically.
+      canvas.drawParagraph(paragraph, Offset(0, index * 40.0));
+    }
+
+    final Picture picture = recorder.endRecording();
+    final Image image = await picture.toImage(200, 200);
+    await comparer.addGoldenImage(image, 'text_decoration.png');
+  });
 }
 
 Matcher listEquals(ByteData expected) => (dynamic v) {
diff --git a/testing/dart/channel_buffers_test.dart b/testing/dart/channel_buffers_test.dart
index 4683a62254d7766e421eb46c3356b118421116e6..500d805f753d1e1cd08cf25de36bb438fafc69e6 100644
--- a/testing/dart/channel_buffers_test.dart
+++ b/testing/dart/channel_buffers_test.dart
@@ -12,7 +12,7 @@ import 'dart:ui' as ui;
 import 'package:litetest/litetest.dart';
 
 ByteData _makeByteData(String str) {
-  final Uint8List list = utf8.encode(str) as Uint8List;
+  final Uint8List list = utf8.encode(str);
   final ByteBuffer buffer = list.buffer;
   return ByteData.view(buffer);
 }
@@ -22,6 +22,12 @@ void _resize(ui.ChannelBuffers buffers, String name, int newSize) {
 }
 
 void main() {
+  bool assertsEnabled = false;
+  assert(() {
+    assertsEnabled = true;
+    return true;
+  }());
+
   test('push drain', () async {
     const String channel = 'foo';
     final ByteData data = _makeByteData('bar');
@@ -31,11 +37,14 @@ void main() {
       called = true;
     }
     buffers.push(channel, data, callback);
+    // Ignoring the deprecated member use because we're specifically testing
+    // deprecated API.
+    // ignore: deprecated_member_use
     await buffers.drain(channel, (ByteData? drainedData, ui.PlatformMessageResponseCallback drainedCallback) async {
       expect(drainedData, equals(data));
-      assert(!called);
+      expect(called, isFalse);
       drainedCallback(drainedData);
-      assert(called);
+      expect(called, isTrue);
     });
   });
 
@@ -52,6 +61,9 @@ void main() {
 
     // Ignoring the returned future because the completion of the drain is
     // communicated using the `completer`.
+    // Ignoring the deprecated member use because we're specifically testing
+    // deprecated API.
+    // ignore: deprecated_member_use
     buffers.drain(channel, (ByteData? drainedData, ui.PlatformMessageResponseCallback drainedCallback) async {
       log.add('callback');
       completer.complete();
@@ -77,6 +89,9 @@ void main() {
     _resize(buffers, channel, 0);
     buffers.push(channel, data, callback);
     bool didCall = false;
+    // Ignoring the deprecated member use because we're specifically testing
+    // deprecated API.
+    // ignore: deprecated_member_use
     await buffers.drain(channel, (ByteData? drainedData, ui.PlatformMessageResponseCallback drainedCallback) async {
       didCall = true;
     });
@@ -87,6 +102,9 @@ void main() {
     const String channel = 'foo';
     final ui.ChannelBuffers buffers = ui.ChannelBuffers();
     bool didCall = false;
+    // Ignoring the deprecated member use because we're specifically testing
+    // deprecated API.
+    // ignore: deprecated_member_use
     await buffers.drain(channel, (ByteData? drainedData, ui.PlatformMessageResponseCallback drainedCallback) async {
       didCall = true;
     });
@@ -107,17 +125,17 @@ void main() {
     buffers.push(channel, three, callback);
     buffers.push(channel, four, callback);
     int counter = 0;
+    // Ignoring the deprecated member use because we're specifically testing
+    // deprecated API.
+    // ignore: deprecated_member_use
     await buffers.drain(channel, (ByteData? drainedData, ui.PlatformMessageResponseCallback drainedCallback) async {
       switch (counter) {
         case 0:
           expect(drainedData, equals(two));
-          break;
         case 1:
           expect(drainedData, equals(three));
-          break;
         case 2:
           expect(drainedData, equals(four));
-          break;
       }
       counter += 1;
     });
@@ -135,6 +153,9 @@ void main() {
     buffers.push(channel, two, callback);
     _resize(buffers, channel, 1);
     int counter = 0;
+    // Ignoring the deprecated member use because we're specifically testing
+    // deprecated API.
+    // ignore: deprecated_member_use
     await buffers.drain(channel, (ByteData? drainedData, ui.PlatformMessageResponseCallback drainedCallback) async {
       switch (counter) {
         case 0:
@@ -212,21 +233,21 @@ void main() {
     buffers.push('a', three, (ByteData? data) { });
     log.add('top');
     buffers.setListener('a', (ByteData? data, ui.PlatformMessageResponseCallback callback) {
-      assert(data != null);
+      expect(data, isNotNull);
       log.add('a1: ${utf8.decode(data!.buffer.asUint8List())}');
     });
     log.add('-1');
     await null;
     log.add('-2');
     buffers.setListener('a', (ByteData? data, ui.PlatformMessageResponseCallback callback) {
-      assert(data != null);
+      expect(data, isNotNull);
       log.add('a2: ${utf8.decode(data!.buffer.asUint8List())}');
     });
     log.add('-3');
     await null;
     log.add('-4');
     buffers.setListener('b', (ByteData? data, ui.PlatformMessageResponseCallback callback) {
-      assert(data != null);
+      expect(data, isNotNull);
       log.add('b: ${utf8.decode(data!.buffer.asUint8List())}');
     });
     log.add('-5');
@@ -275,7 +296,7 @@ void main() {
     buffers.push('a', three, (ByteData? data) { });
     log.add('-1');
     buffers.setListener('a', (ByteData? data, ui.PlatformMessageResponseCallback callback) {
-      assert(data != null);
+      expect(data, isNotNull);
       log.add('a1: ${utf8.decode(data!.buffer.asUint8List())}');
     });
     await null; // handles one
@@ -284,7 +305,7 @@ void main() {
     await null;
     log.add('-3');
     buffers.setListener('a', (ByteData? data, ui.PlatformMessageResponseCallback callback) {
-      assert(data != null);
+      expect(data, isNotNull);
       log.add('a2: ${utf8.decode(data!.buffer.asUint8List())}');
     });
     log.add('-4');
@@ -357,6 +378,24 @@ void main() {
       'callback2: true',
     ]);
   });
+
+  test('ChannelBufferspush rejects names with nulls', () async {
+    const String channel = 'foo\u0000bar';
+    final ByteData blabla = _makeByteData('blabla');
+    final ui.ChannelBuffers buffers = ui.ChannelBuffers();
+    try {
+      buffers.push(channel, blabla, (ByteData? data) { });
+      fail('did not throw as expected');
+    } on AssertionError catch (e) {
+      expect(e.toString(), contains('U+0000 NULL'));
+    }
+    try {
+      buffers.setListener(channel, (ByteData? data, ui.PlatformMessageResponseCallback callback) { });
+      fail('did not throw as expected');
+    } on AssertionError catch (e) {
+      expect(e.toString(), contains('U+0000 NULL'));
+    }
+  }, skip: !assertsEnabled);
 }
 
 class _TestChannelBuffers extends ui.ChannelBuffers {
diff --git a/testing/dart/codec_test.dart b/testing/dart/codec_test.dart
index 3ac053abbacab5ace42ba106aa420754f4c08e3e..6910f56b82fcacc615cc160d526de76200ff3e36 100644
--- a/testing/dart/codec_test.dart
+++ b/testing/dart/codec_test.dart
@@ -9,6 +9,8 @@ import 'dart:ui' as ui;
 import 'package:litetest/litetest.dart';
 import 'package:path/path.dart' as path;
 
+import 'impeller_enabled.dart';
+
 void main() {
 
   test('Animation metadata', () async {
@@ -43,7 +45,11 @@ void main() {
       await codec.getNextFrame();
       fail('exception not thrown');
     } on Exception catch (e) {
-      expect(e.toString(), contains('Codec failed'));
+      if (impellerEnabled) {
+        expect(e.toString(), contains('Could not decompress image.'));
+      } else {
+        expect(e.toString(), contains('Codec failed'));
+      }
     }
   });
 
@@ -86,6 +92,33 @@ void main() {
     ]));
   });
 
+  test('with size', () async {
+    final Uint8List data = await _getSkiaResource('baby_tux.png').readAsBytes();
+    final ui.ImmutableBuffer buffer = await ui.ImmutableBuffer.fromUint8List(data);
+    final ui.Codec codec = await ui.instantiateImageCodecWithSize(
+      buffer,
+      getTargetSize: (int intrinsicWidth, int intrinsicHeight) {
+        return ui.TargetImageSize(
+          width: intrinsicWidth ~/ 2,
+          height: intrinsicHeight ~/ 2,
+        );
+      },
+    );
+    final List<List<int>> decodedFrameInfos = <List<int>>[];
+    for (int i = 0; i < 2; i++) {
+      final ui.FrameInfo frameInfo = await codec.getNextFrame();
+      decodedFrameInfos.add(<int>[
+        frameInfo.duration.inMilliseconds,
+        frameInfo.image.width,
+        frameInfo.image.height,
+      ]);
+    }
+    expect(decodedFrameInfos, equals(<List<int>>[
+      <int>[0, 120, 123],
+      <int>[0, 120, 123],
+    ]));
+  });
+
   test('disposed decoded image', () async {
     final Uint8List data = await _getSkiaResource('flutter_logo.jpg').readAsBytes();
     final ui.Codec codec = await ui.instantiateImageCodec(data);
@@ -99,6 +132,126 @@ void main() {
       expect(e.toString(), contains('Decoded image has been disposed'));
     }
   });
+
+  test('Animated gif can reuse across multiple frames', () async {
+    // Regression test for b/271947267 and https://github.com/flutter/flutter/issues/122134
+
+    final Uint8List data = File(
+      path.join('flutter', 'lib', 'ui', 'fixtures', 'four_frame_with_reuse.gif'),
+    ).readAsBytesSync();
+    final ui.Codec codec = await ui.instantiateImageCodec(data);
+
+    // Capture the final frame of animation. If we have not composited
+    // correctly, it will be clipped strangely.
+    late ui.FrameInfo frameInfo;
+    for (int i = 0; i < 4; i++) {
+      frameInfo = await codec.getNextFrame();
+    }
+
+    final ui.Image image = frameInfo.image;
+    final ByteData imageData = (await image.toByteData(format: ui.ImageByteFormat.png))!;
+
+    final String fileName = impellerEnabled ? 'impeller_four_frame_with_reuse_end.png' : 'four_frame_with_reuse_end.png';
+    final Uint8List goldenData = File(
+      path.join('flutter', 'lib', 'ui', 'fixtures', fileName),
+    ).readAsBytesSync();
+
+    expect(imageData.buffer.asUint8List(), goldenData);
+  });
+
+  test('Animated webp can reuse across multiple frames', () async {
+    // Regression test for https://github.com/flutter/flutter/issues/61150#issuecomment-679055858
+
+    final Uint8List data = File(
+      path.join('flutter', 'lib', 'ui', 'fixtures', 'heart.webp'),
+    ).readAsBytesSync();
+    final ui.Codec codec = await ui.instantiateImageCodec(data);
+
+    // Capture the final frame of animation. If we have not composited
+    // correctly, the hearts will be incorrectly repeated in the image.
+    late ui.FrameInfo frameInfo;
+    for (int i = 0; i < 69; i++) {
+      frameInfo  = await codec.getNextFrame();
+    }
+
+    final ui.Image image = frameInfo.image;
+    final ByteData imageData = (await image.toByteData(format: ui.ImageByteFormat.png))!;
+
+    final String fileName = impellerEnabled ? 'impeller_heart_end.png' : 'heart_end.png';
+
+    final Uint8List goldenData = File(
+      path.join('flutter', 'lib', 'ui', 'fixtures', fileName),
+    ).readAsBytesSync();
+
+    expect(imageData.buffer.asUint8List(), goldenData);
+
+  });
+
+  test('Animated apng can reuse pre-pre-frame', () async {
+    // https://github.com/flutter/engine/pull/42153
+
+    final Uint8List data = File(
+      path.join('flutter', 'lib', 'ui', 'fixtures', '2_dispose_op_restore_previous.apng'),
+    ).readAsBytesSync();
+    final ui.Codec codec = await ui.instantiateImageCodec(data);
+
+    // Capture the 67,68,69 frames of animation and then compare the pixels.
+    late ui.FrameInfo frameInfo;
+    for (int i = 0; i < 70; i++) {
+      frameInfo = await codec.getNextFrame();
+      if (i >= 67) {
+        final ui.Image image = frameInfo.image;
+        final ByteData imageData = (await image.toByteData(format: ui.ImageByteFormat.png))!;
+
+        final String fileName = impellerEnabled ? 'impeller_2_dispose_op_restore_previous.apng.$i.png' : '2_dispose_op_restore_previous.apng.$i.png';
+
+        final Uint8List goldenData = File(
+          path.join('flutter', 'lib', 'ui', 'fixtures', fileName),
+        ).readAsBytesSync();
+
+        expect(imageData.buffer.asUint8List(), goldenData);
+      }
+    }
+  });
+
+  test('Animated apng alpha type handling', () async {
+    final Uint8List data = File(
+      path.join('flutter', 'lib', 'ui', 'fixtures', 'alpha_animated.apng'),
+    ).readAsBytesSync();
+    final ui.Codec codec = await ui.instantiateImageCodec(data);
+
+    // The test image contains two frames of solid red.  The first has
+    // alpha=0.2, and the second has alpha=0.6.
+    ui.Image image = (await codec.getNextFrame()).image;
+    ByteData imageData = (await image.toByteData())!;
+    expect(imageData.getUint32(0), 0x33000033);
+    image = (await codec.getNextFrame()).image;
+    imageData = (await image.toByteData())!;
+    expect(imageData.getUint32(0), 0x99000099);
+  });
+
+  test('Animated apng background color restore', () async {
+    final Uint8List data = File(
+      path.join('flutter', 'lib', 'ui', 'fixtures', 'dispose_op_background.apng'),
+    ).readAsBytesSync();
+    final ui.Codec codec = await ui.instantiateImageCodec(data);
+
+    // First frame is solid red
+    ui.Image image = (await codec.getNextFrame()).image;
+    ByteData imageData = (await image.toByteData())!;
+    expect(imageData.getUint32(0), 0xFF0000FF);
+
+    // Third frame is blue in the lower right corner.
+    await codec.getNextFrame();
+    image = (await codec.getNextFrame()).image;
+    imageData = (await image.toByteData())!;
+    expect(imageData.getUint32(imageData.lengthInBytes - 4), 0x0000FFFF);
+
+    // Fourth frame is transparent in the lower right corner
+    image = (await codec.getNextFrame()).image;
+    imageData = (await image.toByteData())!;
+    expect(imageData.getUint32(imageData.lengthInBytes - 4), 0x00000000);
+  });
 }
 
 /// Returns a File handle to a file in the skia/resources directory.
@@ -108,7 +261,8 @@ File _getSkiaResource(String fileName) {
   // assuming the curent working directory is engine/src.
   // This is fragile and should be changed once the Platform.script issue is
   // resolved.
-  final String assetPath =
-    path.join('third_party', 'skia', 'resources', 'images', fileName);
+  final String assetPath = path.join(
+    'flutter', 'third_party', 'skia', 'resources', 'images', fileName,
+  );
   return File(assetPath);
 }
diff --git a/testing/dart/color_filter_test.dart b/testing/dart/color_filter_test.dart
index ad4a324c14c6884e81e2a90891d43f63ee1ad6ae..66ec9548ca58f1c9d3b62fc58cd2b843026b7dc9 100644
--- a/testing/dart/color_filter_test.dart
+++ b/testing/dart/color_filter_test.dart
@@ -7,6 +7,8 @@ import 'dart:ui';
 
 import 'package:litetest/litetest.dart';
 
+import 'impeller_enabled.dart';
+
 const Color transparent = Color(0x00000000);
 const Color red = Color(0xFFAA0000);
 const Color green = Color(0xFF00AA00);
@@ -56,6 +58,11 @@ void main() {
     Uint32List bytes = await getBytesForPaint(paint);
     expect(bytes[0], greenRedColorBlend);
 
+    // TODO(135699): enable this
+    if (impellerEnabled) {
+      return;
+    }
+
     paint.invertColors = true;
     bytes = await getBytesForPaint(paint);
     expect(bytes[0], greenRedColorBlendInverted);
@@ -76,7 +83,6 @@ void main() {
     builder.addPicture(Offset.zero, picture);
 
     final Scene scene = builder.build();
-    expect(scene != null, true);
     await scene.toImage(100, 100);
   });
 
@@ -88,6 +94,11 @@ void main() {
     Uint32List bytes = await getBytesForPaint(paint);
     expect(bytes[0], greenGreyscaled);
 
+    // TODO(135699): enable this
+    if (impellerEnabled) {
+      return;
+    }
+
     paint.invertColors = true;
     bytes = await getBytesForPaint(paint);
     expect(bytes[0], greenInvertedGreyscaled);
@@ -108,7 +119,6 @@ void main() {
     builder.addPicture(Offset.zero, picture);
 
     final Scene scene = builder.build();
-    expect(scene != null, true);
     await scene.toImage(100, 100);
   });
 
@@ -120,6 +130,10 @@ void main() {
     Uint32List bytes = await getBytesForPaint(paint);
     expect(bytes[0], greenLinearToSrgbGamma);
 
+    // TODO(135699): enable this
+    if (impellerEnabled) {
+      return;
+    }
     paint.invertColors = true;
     bytes = await getBytesForPaint(paint);
     expect(bytes[0], greenLinearToSrgbGammaInverted);
@@ -133,6 +147,11 @@ void main() {
     Uint32List bytes = await getBytesForPaint(paint);
     expect(bytes[0], greenSrgbToLinearGamma);
 
+    // TODO(135699): enable this
+    if (impellerEnabled) {
+      return;
+    }
+
     paint.invertColors = true;
     bytes = await getBytesForPaint(paint);
     expect(bytes[0], greenSrgbToLinearGammaInverted);
diff --git a/testing/dart/color_test.dart b/testing/dart/color_test.dart
index 55105ed80f7db71549f774666b7201f5a3ec3f41..5d8f680cb8062f8d0e2d55aeaa98c1acf084d58b 100644
--- a/testing/dart/color_test.dart
+++ b/testing/dart/color_test.dart
@@ -7,7 +7,7 @@ import 'dart:ui';
 import 'package:litetest/litetest.dart';
 
 class NotAColor extends Color {
-  const NotAColor(int value) : super(value);
+  const NotAColor(super.value);
 }
 
 void main() {
@@ -27,23 +27,15 @@ void main() {
   });
 
   test('color created with out of bounds value', () {
-    try {
-      const Color c = Color(0x100 << 24);
-      final Paint p = Paint();
-      p.color = c;
-    } catch (e) {
-      expect(e != null, equals(true));
-    }
+    const Color c = Color(0x100 << 24);
+    final Paint p = Paint();
+    p.color = c;
   });
 
   test('color created with wildly out of bounds value', () {
-    try {
-      const Color c = Color(1 << 1000000);
-      final Paint p = Paint();
-      p.color = c;
-    } catch (e) {
-      expect(e != null, equals(true));
-    }
+    const Color c = Color(1 << 1000000);
+    final Paint p = Paint();
+    p.color = c;
   });
 
   test('two colors are only == if they have the same runtime type', () {
diff --git a/testing/dart/compile_test.gni b/testing/dart/compile_test.gni
deleted file mode 100644
index fbdf76ea849da0364166a02eb54c33c07741f48a..0000000000000000000000000000000000000000
--- a/testing/dart/compile_test.gni
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 2013 The Flutter Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/compiled_action.gni")
-import("//flutter/common/config.gni")
-import("//third_party/dart/build/dart/dart_action.gni")
-import("//third_party/dart/sdk_args.gni")
-
-import("//third_party/dart/build/dart/dart_action.gni")
-
-# Generates a Dart kernel snapshot using flutter_frontend_server.
-#
-# Arguments
-#     dart_main (required): The Main Dart file.
-#
-#     dart_kernel (required): The path to the output kernel snapshot in the out
-#                             directory.
-#
-#     packages (required): The path to the .packages file.
-template("compile_flutter_dart_test") {
-  assert(defined(invoker.dart_file), "The Dart test file must be specified.")
-  assert(defined(invoker.dart_kernel),
-         "The Dart Kernel file location must be specified.")
-  assert(defined(invoker.packages),
-         "The path to the .packages file must be specified.")
-
-  common_deps = [
-    "//flutter/flutter_frontend_server:frontend_server",
-    "//flutter/lib/snapshot:strong_platform",
-  ]
-  if (defined(invoker.deps)) {
-    common_deps += invoker.deps
-  }
-
-  snapshot_depfile =
-      "$root_gen_dir/flutter/testing/snapshot_$target_name.depfile.d"
-
-  common_vm_args = [ "--disable-dart-dev" ]
-
-  flutter_patched_sdk = rebase_path("$root_out_dir/flutter_patched_sdk")
-
-  common_args = [
-    "--sound-null-safety",
-    "--sdk-root",
-    flutter_patched_sdk,
-    "--target=flutter",
-    "--packages",
-    rebase_path(invoker.packages),
-    "--depfile",
-    rebase_path(snapshot_depfile),
-    "--output-dill",
-    rebase_path(invoker.dart_kernel, root_out_dir),
-    rebase_path(invoker.dart_file),
-  ]
-
-  if (flutter_prebuilt_dart_sdk) {
-    action(target_name) {
-      testonly = true
-      deps = common_deps
-      pool = "//flutter/build/dart:dart_pool"
-      script = "//build/gn_run_binary.py"
-      inputs = [ invoker.dart_file ]
-      outputs = [ invoker.dart_kernel ]
-      depfile = snapshot_depfile
-
-      ext = ""
-      if (is_win) {
-        ext = ".exe"
-      }
-      dart = rebase_path("$host_prebuilt_dart_sdk/bin/dart$ext", root_out_dir)
-      frontend_server =
-          rebase_path("$root_gen_dir/frontend_server.dart.snapshot")
-
-      args = [ dart ] + common_vm_args + [ frontend_server ] + common_args
-    }
-  } else {
-    dart_action(target_name) {
-      testonly = true
-      deps = common_deps
-      pool = "//flutter/build/dart:dart_pool"
-      script = "$root_gen_dir/frontend_server.dart.snapshot"
-      packages = rebase_path(invoker.packages)
-      inputs = [ invoker.dart_file ]
-      outputs = [ invoker.dart_kernel ]
-      depfile = snapshot_depfile
-      vm_args = common_vm_args
-      args = common_args
-    }
-  }
-}
diff --git a/testing/dart/compositing_test.dart b/testing/dart/compositing_test.dart
index a679a40e27e3fb34a9b1a057a8c367010940579e..a2f95cdba099733333079aeb37b10d4cfb734404 100644
--- a/testing/dart/compositing_test.dart
+++ b/testing/dart/compositing_test.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:typed_data' show ByteData, Float64List;
+import 'dart:typed_data';
 import 'dart:ui';
 
 import 'package:litetest/litetest.dart';
@@ -83,7 +83,6 @@ void main() {
     }
 
     final Scene scene = builder.build();
-    expect(scene != null, true);
     scene.dispose();
   });
 
@@ -403,10 +402,6 @@ void main() {
         oldLayer: oldLayer as ShaderMaskEngineLayer?,
       );
     });
-    testNoSharing((SceneBuilder builder, EngineLayer? oldLayer) {
-      // ignore: deprecated_member_use
-      return builder.pushPhysicalShape(path: Path(), color: const Color.fromARGB(0, 0, 0, 0), oldLayer: oldLayer as PhysicalShapeEngineLayer?, elevation: 0.0);
-    });
     testNoSharing((SceneBuilder builder, EngineLayer? oldLayer) {
       return builder.pushColorFilter(
         const ColorFilter.mode(
diff --git a/testing/dart/encoding_test.dart b/testing/dart/encoding_test.dart
index 79176c52f6b4393ae1a308b4cd7ea28df67e1d71..2aa426a1081002bd90cd9a8bf48f376064e778d2 100644
--- a/testing/dart/encoding_test.dart
+++ b/testing/dart/encoding_test.dart
@@ -10,6 +10,8 @@ import 'dart:ui';
 import 'package:litetest/litetest.dart';
 import 'package:path/path.dart' as path;
 
+import 'impeller_enabled.dart';
+
 const int _kWidth = 10;
 const int _kRadius = 2;
 
@@ -17,6 +19,47 @@ const Color _kBlack = Color.fromRGBO(0, 0, 0, 1.0);
 const Color _kGreen = Color.fromRGBO(0, 255, 0, 1.0);
 
 void main() {
+  test('decodeImageFromPixels float32', () async {
+    if (impellerEnabled) {
+      print('Disabled on Impeller - https://github.com/flutter/flutter/issues/135702');
+      return;
+    }
+    const int width = 2;
+    const int height = 2;
+    final Float32List pixels = Float32List(width * height * 4);
+    final List<List<double>> pixels2d = <List<double>>[
+      <double>[1, 0, 0, 1],
+      <double>[0, 1, 0, 1],
+      <double>[0, 0, 1, 1],
+      <double>[1, 1, 1, 0],
+    ];
+    int offset = 0;
+    for (final List<double> color in pixels2d) {
+      pixels[offset + 0] = color[0];
+      pixels[offset + 1] = color[1];
+      pixels[offset + 2] = color[2];
+      pixels[offset + 3] = color[3];
+      offset += 4;
+    }
+
+    final Completer<Image> completer = Completer<Image>();
+    decodeImageFromPixels(
+        Uint8List.view(pixels.buffer), width, height, PixelFormat.rgbaFloat32,
+        (Image result) {
+      completer.complete(result);
+    });
+
+    final Image image = await completer.future;
+    final ByteData data =
+        (await image.toByteData(format: ImageByteFormat.rawStraightRgba))!;
+    final Uint32List readPixels = Uint32List.view(data.buffer);
+    expect(width * height, readPixels.length);
+    expect(readPixels[0], 0xff0000ff);
+    expect(readPixels[1], 0xff00ff00);
+    expect(readPixels[2], 0xffff0000);
+    expect(readPixels[3], 0x00ffffff);
+  });
+
   test('Image.toByteData RGBA format works with simple image', () async {
     final Image image = await Square4x4Image.image;
     final ByteData data = (await image.toByteData())!;
@@ -54,6 +97,10 @@ void main() {
   });
 
   test('Image.toByteData Unmodified format works with grayscale images', () async {
+    if (impellerEnabled) {
+      print('Disabled on Impeller - https://github.com/flutter/flutter/issues/135706');
+      return;
+    }
     final Image image = await GrayscaleImage.load();
     final ByteData data = (await image.toByteData(format: ImageByteFormat.rawUnmodified))!;
     final Uint8List bytes = data.buffer.asUint8List();
@@ -62,11 +109,30 @@ void main() {
   });
 
   test('Image.toByteData PNG format works with simple image', () async {
+    if (impellerEnabled) {
+      print('Disabled on Impeller - https://github.com/flutter/flutter/issues/135706');
+      return;
+    }
     final Image image = await Square4x4Image.image;
     final ByteData data = (await image.toByteData(format: ImageByteFormat.png))!;
     final List<int> expected = await readFile('square.png');
     expect(Uint8List.view(data.buffer), expected);
   });
+
+  test('Image.toByteData ExtendedRGBA128', () async {
+    final Image image = await Square4x4Image.image;
+    final ByteData data = (await image.toByteData(format: ImageByteFormat.rawExtendedRgba128))!;
+    expect(image.width, _kWidth);
+    expect(image.height, _kWidth);
+    expect(data.lengthInBytes, _kWidth * _kWidth * 4 * 4);
+    // Top-left pixel should be black.
+    final Float32List floats = Float32List.view(data.buffer);
+    expect(floats[0], 0.0);
+    expect(floats[1], 0.0);
+    expect(floats[2], 0.0);
+    expect(floats[3], 1.0);
+    expect(image.colorSpace, ColorSpace.sRGB);
+  });
 }
 
 class Square4x4Image {
diff --git a/testing/dart/fragment_shader_test.dart b/testing/dart/fragment_shader_test.dart
index 7ce3edbe389b645e7103e86f77f823e05f6269d6..4d339029ce3017c4782f3b403fcc00d248059dd4 100644
--- a/testing/dart/fragment_shader_test.dart
+++ b/testing/dart/fragment_shader_test.dart
@@ -12,6 +12,7 @@ import 'dart:ui';
 import 'package:litetest/litetest.dart';
 import 'package:path/path.dart' as path;
 
+import 'impeller_enabled.dart';
 import 'shader_test_file_utils.dart';
 
 void main() async {
@@ -29,10 +30,13 @@ void main() async {
     expect(rawData is Map<String, Object?>, true);
 
     final Map<String, Object?> data = rawData! as Map<String, Object?>;
-    expect(data['sksl'] is String, true);
-    expect(data['uniforms'] is List<Object?>, true);
+    expect(data.keys.toList(), <String>['sksl']);
+    expect(data['sksl'] is Map<String, Object?>, true);
 
-    final Object? rawUniformData = (data['uniforms']! as List<Object?>)[0];
+    final Map<String, Object?> skslData = data['sksl']! as Map<String, Object?>;
+    expect(skslData['uniforms'] is List<Object?>, true);
+
+    final Object? rawUniformData = (skslData['uniforms']! as List<Object?>)[0];
 
     expect(rawUniformData is Map<String, Object?>, true);
 
@@ -41,6 +45,22 @@ void main() async {
     expect(uniformData['location'] is int, true);
   });
 
+  if (impellerEnabled) {
+    // https://github.com/flutter/flutter/issues/122823
+    return;
+  }
+
+  test('FragmentProgram objects are cached.', () async {
+    final FragmentProgram programA = await FragmentProgram.fromAsset(
+      'blue_green_sampler.frag.iplr',
+    );
+    final FragmentProgram programB = await FragmentProgram.fromAsset(
+      'blue_green_sampler.frag.iplr',
+    );
+
+    expect(identical(programA, programB), true);
+  });
+
   test('FragmentShader setSampler throws with out-of-bounds index', () async {
     final FragmentProgram program = await FragmentProgram.fromAsset(
       'blue_green_sampler.frag.iplr',
@@ -172,6 +192,10 @@ void main() async {
   });
 
   test('FragmentShader simple shader renders correctly', () async {
+    if (impellerEnabled) {
+      print('Skipped for Impeller - https://github.com/flutter/flutter/issues/122823');
+      return;
+    }
     final FragmentProgram program = await FragmentProgram.fromAsset(
       'functions.frag.iplr',
     );
@@ -182,6 +206,10 @@ void main() async {
   });
 
   test('Reused FragmentShader simple shader renders correctly', () async {
+    if (impellerEnabled) {
+      print('Skipped for Impeller - https://github.com/flutter/flutter/issues/122823');
+      return;
+    }
     final FragmentProgram program = await FragmentProgram.fromAsset(
       'functions.frag.iplr',
     );
@@ -196,6 +224,10 @@ void main() async {
   });
 
   test('FragmentShader blue-green image renders green', () async {
+    if (impellerEnabled) {
+      print('Skipped for Impeller - https://github.com/flutter/flutter/issues/122823');
+      return;
+    }
     final FragmentProgram program = await FragmentProgram.fromAsset(
       'blue_green_sampler.frag.iplr',
     );
@@ -208,6 +240,10 @@ void main() async {
   });
 
   test('FragmentShader blue-green image renders green - GPU image', () async {
+    if (impellerEnabled) {
+      print('Skipped for Impeller - https://github.com/flutter/flutter/issues/122823');
+      return;
+    }
     final FragmentProgram program = await FragmentProgram.fromAsset(
       'blue_green_sampler.frag.iplr',
     );
@@ -220,6 +256,10 @@ void main() async {
   });
 
   test('FragmentShader with uniforms renders correctly', () async {
+    if (impellerEnabled) {
+      print('Skipped for Impeller - https://github.com/flutter/flutter/issues/122823');
+      return;
+    }
     final FragmentProgram program = await FragmentProgram.fromAsset(
       'uniforms.frag.iplr',
     );
@@ -246,6 +286,10 @@ void main() async {
   });
 
   test('FragmentShader shader with array uniforms renders correctly', () async {
+    if (impellerEnabled) {
+      print('Skipped for Impeller - https://github.com/flutter/flutter/issues/122823');
+      return;
+    }
     final FragmentProgram program = await FragmentProgram.fromAsset(
       'uniform_arrays.frag.iplr',
     );
@@ -260,6 +304,10 @@ void main() async {
   });
 
   test('FragmentShader The ink_sparkle shader is accepted', () async {
+    if (impellerEnabled) {
+      print('Skipped for Impeller - https://github.com/flutter/flutter/issues/122823');
+      return;
+    }
     final FragmentProgram program = await FragmentProgram.fromAsset(
       'ink_sparkle.frag.iplr',
     );
@@ -273,6 +321,10 @@ void main() async {
   });
 
   test('FragmentShader Uniforms are sorted correctly', () async {
+    if (impellerEnabled) {
+      print('Skipped for Impeller - https://github.com/flutter/flutter/issues/122823');
+      return;
+    }
     final FragmentProgram program = await FragmentProgram.fromAsset(
       'uniforms_sorted.frag.iplr',
     );
@@ -314,6 +366,10 @@ void main() async {
   });
 
   test('FragmentShader user defined functions do not redefine builtins', () async {
+    if (impellerEnabled) {
+      print('Skipped for Impeller - https://github.com/flutter/flutter/issues/122823');
+      return;
+    }
     final FragmentProgram program = await FragmentProgram.fromAsset(
       'no_builtin_redefinition.frag.iplr',
     );
@@ -324,6 +380,10 @@ void main() async {
   });
 
   test('FragmentShader fromAsset accepts a shader with no uniforms', () async {
+    if (impellerEnabled) {
+      print('Skipped for Impeller - https://github.com/flutter/flutter/issues/122823');
+      return;
+    }
     final FragmentProgram program = await FragmentProgram.fromAsset(
       'no_uniforms.frag.iplr',
     );
@@ -332,33 +392,10 @@ void main() async {
     shader.dispose();
   });
 
-  // This test can't rely on actual pixels rendered since it needs to run on a
-  // metal shader on iOS. instead parse the source code.
-  test('impellerc orders samplers in metal shader according to declaration and not usage', () async {
-    if (!Platform.isMacOS) {
-      return;
-    }
-    final Directory directory = shaderDirectory('iplr-remap');
-    final String data = readAsStringLossy(File(path.join(directory.path, 'shader_with_samplers.frag.iplr')));
-
-    const String expected = 'texture2d<float> textureA [[texture(0)]],'
-      ' texture2d<float> textureB [[texture(1)]]';
-
-    expect(data, contains(expected));
-  });
-
-  test('impellerc orders samplers in metal shader according to declaration and not usage in glow', () async {
-    if (!Platform.isMacOS) {
-      return;
-    }
-    final Directory directory = shaderDirectory('iplr-remap');
-    final String data = readAsStringLossy(File(path.join(directory.path, 'glow_shader.frag.iplr')));
-
-    const String expected = 'texture2d<float> tInput [[texture(0)]], texture2d<float> tNoise [[texture(1)]], '
-      'sampler tInputSmplr [[sampler(0)]], sampler tNoiseSmplr [[sampler(1)]]';
-
-    expect(data, contains(expected));
-  });
+  if (impellerEnabled) {
+    print('Skipped for Impeller - https://github.com/flutter/flutter/issues/122823');
+    return;
+  }
 
   // Test all supported GLSL ops. See lib/spirv/lib/src/constants.dart
   final Map<String, FragmentProgram> iplrSupportedGLSLOpShaders = await _loadShaderAssets(
@@ -512,8 +549,3 @@ Image _createBlueGreenImageSync() {
     picture.dispose();
   }
 }
-
-// Ignore invalid utf8 since file is not actually text.
-String readAsStringLossy(File file) {
-  return convert.utf8.decode(file.readAsBytesSync(), allowMalformed: true);
-}
diff --git a/testing/dart/goldens.dart b/testing/dart/goldens.dart
new file mode 100644
index 0000000000000000000000000000000000000000..84addf8e20d69b21c2113753758fb7bfcc89b1f6
--- /dev/null
+++ b/testing/dart/goldens.dart
@@ -0,0 +1,129 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io';
+import 'dart:typed_data';
+import 'dart:ui';
+
+import 'package:path/path.dart' as path;
+import 'package:skia_gold_client/skia_gold_client.dart';
+
+import 'impeller_enabled.dart';
+
+const String _kSkiaGoldWorkDirectoryKey = 'kSkiaGoldWorkDirectory';
+
+/// A helper for doing image comparison (golden) tests.
+///
+/// Contains utilities for comparing two images in memory that are expected to
+/// be identical, or for adding images to Skia gold for comparison.
+class ImageComparer {
+  ImageComparer._({
+    required SkiaGoldClient client,
+  }) : _client = client;
+
+  // Avoid talking to Skia gold for the force-multithreading variants.
+  static bool get _useSkiaGold =>
+      !Platform.executableArguments.contains('--force-multithreading');
+
+  /// Creates an image comparer and authorizes.
+  static Future<ImageComparer> create({
+    bool verbose = false,
+  }) async {
+    const String workDirectoryPath =
+        String.fromEnvironment(_kSkiaGoldWorkDirectoryKey);
+    if (workDirectoryPath.isEmpty) {
+      throw UnsupportedError(
+          'Using ImageComparer requries defining kSkiaGoldWorkDirectoryKey.');
+    }
+
+    final Directory workDirectory = Directory(
+      impellerEnabled ? '${workDirectoryPath}_iplr' : workDirectoryPath,
+    )..createSync();
+    final Map<String, String> dimensions = <String, String>{
+      'impeller_enabled': impellerEnabled.toString(),
+    };
+    final SkiaGoldClient client = SkiaGoldClient.isAvailable() && _useSkiaGold
+        ? SkiaGoldClient(workDirectory,
+            dimensions: dimensions, verbose: verbose)
+        : _FakeSkiaGoldClient(workDirectory, dimensions, verbose: verbose);
+
+    await client.auth();
+    return ImageComparer._(client: client);
+  }
+
+  final SkiaGoldClient _client;
+
+  /// Adds an [Image] to Skia Gold for comparison.
+  ///
+  /// The [fileName] must be unique.
+  Future<void> addGoldenImage(Image image, String fileName) async {
+    final ByteData data =
+        (await image.toByteData(format: ImageByteFormat.png))!;
+
+    final File file = File(path.join(_client.workDirectory.path, fileName))
+      ..writeAsBytesSync(data.buffer.asUint8List());
+    await _client.addImg(
+      fileName,
+      file,
+      screenshotSize: image.width * image.height,
+    ).catchError((dynamic error) {
+      print('Skia gold comparison failed: $error');
+      throw Exception('Failed comparison: $fileName');
+    });
+  }
+
+  Future<bool> fuzzyCompareImages(Image golden, Image testImage) async {
+    if (golden.width != testImage.width || golden.height != testImage.height) {
+      return false;
+    }
+    int getPixel(ByteData data, int x, int y) =>
+        data.getUint32((x + y * golden.width) * 4);
+    final ByteData goldenData = (await golden.toByteData())!;
+    final ByteData testImageData = (await testImage.toByteData())!;
+    for (int y = 0; y < golden.height; y++) {
+      for (int x = 0; x < golden.width; x++) {
+        if (getPixel(goldenData, x, y) != getPixel(testImageData, x, y)) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+}
+
+// TODO(dnfield): add local comparison against baseline,
+// https://github.com/flutter/flutter/issues/136831
+class _FakeSkiaGoldClient implements SkiaGoldClient {
+  _FakeSkiaGoldClient(
+    this.workDirectory,
+    this.dimensions, {
+    this.verbose = false,
+  });
+
+  @override
+  final Directory workDirectory;
+
+  @override
+  final Map<String, String> dimensions;
+
+  @override
+  final bool verbose;
+
+  @override
+  Future<void> auth() async {}
+
+  @override
+  Future<void> addImg(
+    String testName,
+    File goldenFile, {
+    double differentPixelsRate = 0.01,
+    int pixelColorDelta = 0,
+    required int screenshotSize,
+  }) async {}
+
+  @override
+  dynamic noSuchMethod(Invocation invocation) {
+    throw UnimplementedError(invocation.memberName.toString().split('"')[1]);
+  }
+}
diff --git a/testing/dart/gpu_test.dart b/testing/dart/gpu_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..cfafec5250a45fe8fee6e497ccbf25180bda4226
--- /dev/null
+++ b/testing/dart/gpu_test.dart
@@ -0,0 +1,189 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// ignore_for_file: avoid_relative_lib_imports
+
+import 'dart:typed_data';
+import 'dart:ui' as ui;
+
+import 'package:litetest/litetest.dart';
+
+import '../../lib/gpu/lib/gpu.dart' as gpu;
+import 'impeller_enabled.dart';
+
+void main() {
+  // TODO(131346): Remove this once we migrate the Dart GPU API into this space.
+  test('smoketest', () async {
+    final int result = gpu.testProc();
+    expect(result, 1);
+
+    final String? message = gpu.testProcWithCallback((int result) {
+      expect(result, 1234);
+    });
+    expect(message, null);
+
+    final gpu.FlutterGpuTestClass a = gpu.FlutterGpuTestClass();
+    a.coolMethod(9847);
+  });
+
+  test('gpu.context throws exception for incompatible embedders', () async {
+    try {
+      // ignore: unnecessary_statements
+      gpu.gpuContext; // Force the context to instantiate.
+      if (!impellerEnabled) {
+        fail('Exception not thrown, but no Impeller context available.');
+      }
+    } catch (e) {
+      if (impellerEnabled) {
+        fail('Exception thrown even though Impeller is enabled.');
+      }
+      expect(
+          e.toString(),
+          contains(
+              'Flutter GPU requires the Impeller rendering backend to be enabled.'));
+    }
+  });
+
+  test('HostBuffer.emplace', () async {
+    final gpu.HostBuffer hostBuffer = gpu.gpuContext.createHostBuffer();
+
+    final gpu.BufferView view0 = hostBuffer
+        .emplace(Int8List.fromList(<int>[0, 1, 2, 3]).buffer.asByteData());
+    expect(view0.offsetInBytes, 0);
+    expect(view0.lengthInBytes, 4);
+
+    final gpu.BufferView view1 = hostBuffer
+        .emplace(Int8List.fromList(<int>[0, 1, 2, 3]).buffer.asByteData());
+    expect(view1.offsetInBytes >= 4, true);
+    expect(view1.lengthInBytes, 4);
+  }, skip: !impellerEnabled);
+
+  test('GpuContext.createDeviceBuffer', () async {
+    final gpu.DeviceBuffer? deviceBuffer =
+        gpu.gpuContext.createDeviceBuffer(gpu.StorageMode.hostVisible, 4);
+    assert(deviceBuffer != null);
+
+    expect(deviceBuffer!.sizeInBytes, 4);
+  }, skip: !impellerEnabled);
+
+  test('DeviceBuffer.overwrite', () async {
+    final gpu.DeviceBuffer? deviceBuffer =
+        gpu.gpuContext.createDeviceBuffer(gpu.StorageMode.hostVisible, 4);
+    assert(deviceBuffer != null);
+
+    final bool success = deviceBuffer!
+        .overwrite(Int8List.fromList(<int>[0, 1, 2, 3]).buffer.asByteData());
+    expect(success, true);
+  }, skip: !impellerEnabled);
+
+  test('DeviceBuffer.overwrite fails when out of bounds', () async {
+    final gpu.DeviceBuffer? deviceBuffer =
+        gpu.gpuContext.createDeviceBuffer(gpu.StorageMode.hostVisible, 4);
+    assert(deviceBuffer != null);
+
+    final bool success = deviceBuffer!.overwrite(
+        Int8List.fromList(<int>[0, 1, 2, 3]).buffer.asByteData(),
+        destinationOffsetInBytes: 1);
+    expect(success, false);
+  }, skip: !impellerEnabled);
+
+  test('DeviceBuffer.overwrite throws for negative destination offset',
+      () async {
+    final gpu.DeviceBuffer? deviceBuffer =
+        gpu.gpuContext.createDeviceBuffer(gpu.StorageMode.hostVisible, 4);
+    assert(deviceBuffer != null);
+
+    try {
+      deviceBuffer!.overwrite(
+          Int8List.fromList(<int>[0, 1, 2, 3]).buffer.asByteData(),
+          destinationOffsetInBytes: -1);
+      fail('Exception not thrown for negative destination offset.');
+    } catch (e) {
+      expect(
+          e.toString(), contains('destinationOffsetInBytes must be positive'));
+    }
+  }, skip: !impellerEnabled);
+
+  test('GpuContext.createTexture', () async {
+    final gpu.Texture? texture =
+        gpu.gpuContext.createTexture(gpu.StorageMode.hostVisible, 100, 100);
+    assert(texture != null);
+
+    // Check the defaults.
+    expect(
+        texture!.coordinateSystem, gpu.TextureCoordinateSystem.renderToTexture);
+    expect(texture.width, 100);
+    expect(texture.height, 100);
+    expect(texture.storageMode, gpu.StorageMode.hostVisible);
+    expect(texture.sampleCount, 1);
+    expect(texture.format, gpu.PixelFormat.r8g8b8a8UNormInt);
+    expect(texture.enableRenderTargetUsage, true);
+    expect(texture.enableShaderReadUsage, true);
+    expect(!texture.enableShaderWriteUsage, true);
+    expect(texture.bytesPerTexel, 4);
+    expect(texture.GetBaseMipLevelSizeInBytes(), 40000);
+  }, skip: !impellerEnabled);
+
+  test('Texture.overwrite', () async {
+    final gpu.Texture? texture =
+        gpu.gpuContext.createTexture(gpu.StorageMode.hostVisible, 2, 2);
+    assert(texture != null);
+
+    const ui.Color red = ui.Color.fromARGB(0xFF, 0xFF, 0, 0);
+    const ui.Color green = ui.Color.fromARGB(0xFF, 0, 0xFF, 0);
+    final bool success = texture!.overwrite(Int32List.fromList(
+            <int>[red.value, green.value, green.value, red.value])
+        .buffer
+        .asByteData());
+
+    expect(success, true);
+  }, skip: !impellerEnabled);
+
+  test('Texture.overwrite throws for wrong buffer size', () async {
+    final gpu.Texture? texture =
+        gpu.gpuContext.createTexture(gpu.StorageMode.hostVisible, 100, 100);
+    assert(texture != null);
+
+    const ui.Color red = ui.Color.fromARGB(0xFF, 0xFF, 0, 0);
+    try {
+      texture!.overwrite(
+          Int32List.fromList(<int>[red.value, red.value, red.value, red.value])
+              .buffer
+              .asByteData());
+      fail('Exception not thrown for wrong buffer size.');
+    } catch (e) {
+      expect(
+          e.toString(),
+          contains(
+              'The length of sourceBytes (bytes: 16) must exactly match the size of the base mip level (bytes: 40000)'));
+    }
+  }, skip: !impellerEnabled);
+
+  test('Texture.asImage returns a valid ui.Image handle', () async {
+    final gpu.Texture? texture =
+        gpu.gpuContext.createTexture(gpu.StorageMode.hostVisible, 100, 100);
+    assert(texture != null);
+
+    final ui.Image image = texture!.asImage();
+    expect(image.width, 100);
+    expect(image.height, 100);
+  }, skip: !impellerEnabled);
+
+  test('Texture.asImage throws when not shader readable', () async {
+    final gpu.Texture? texture = gpu.gpuContext.createTexture(
+        gpu.StorageMode.hostVisible, 100, 100,
+        enableShaderReadUsage: false);
+    assert(texture != null);
+
+    try {
+      texture!.asImage();
+      fail('Exception not thrown when not shader readable.');
+    } catch (e) {
+      expect(
+          e.toString(),
+          contains(
+              'Only shader readable Flutter GPU textures can be used as UI Images'));
+    }
+  }, skip: !impellerEnabled);
+}
diff --git a/testing/dart/http_disallow_http_connections_test.dart b/testing/dart/http_disallow_http_connections_test.dart
index 7c3e4774a61f59b1f5ae4466854bec90d463f4f1..fbe9874c23249080ef3c12e6df07f556b306fcf3 100644
--- a/testing/dart/http_disallow_http_connections_test.dart
+++ b/testing/dart/http_disallow_http_connections_test.dart
@@ -91,7 +91,7 @@ void main() {
         zoneValues: <dynamic, dynamic>{#flutter.io.allow_http: mockTrue});
       expect(mockFalse.checked, isTrue);
     });
-  });
+  }, skip: Platform.isMacOS); // https://github.com/flutter/flutter/issues/141149
 
   test('testWithLoopback', () async {
     await bindServerAndTest('127.0.0.1', (HttpClient httpClient, Uri uri) async {
diff --git a/testing/dart/image_descriptor_test.dart b/testing/dart/image_descriptor_test.dart
index 21c88c0b46860782e27b77104316fb062ee9239e..8155112d4012b1f3d41c65ef23f6f0ef6084fdfb 100644
--- a/testing/dart/image_descriptor_test.dart
+++ b/testing/dart/image_descriptor_test.dart
@@ -97,7 +97,8 @@ File _getSkiaResource(String fileName) {
   // assuming the curent working directory is engine/src.
   // This is fragile and should be changed once the Platform.script issue is
   // resolved.
-  final String assetPath =
-    path.join('third_party', 'skia', 'resources', 'images', fileName);
+  final String assetPath = path.join(
+    'flutter', 'third_party', 'skia', 'resources', 'images', fileName,
+  );
   return File(assetPath);
 }
diff --git a/testing/dart/image_dispose_test.dart b/testing/dart/image_dispose_test.dart
index e96ca0dcb44a85a8f8b48030a943dd11d8b07831..d7692f287bba00f844a8b49672983604206d7625 100644
--- a/testing/dart/image_dispose_test.dart
+++ b/testing/dart/image_dispose_test.dart
@@ -73,17 +73,17 @@ void main() {
     final Image handle1 = frame.image.clone();
     final Image handle2 = handle1.clone();
 
-    List<StackTrace> stackTraces = (frame.image.debugGetOpenHandleStackTraces())!;
+    List<StackTrace> stackTraces = frame.image.debugGetOpenHandleStackTraces()!;
     expect(stackTraces.length, 3);
     expect(stackTraces, equals(handle1.debugGetOpenHandleStackTraces()));
 
     handle1.dispose();
-    stackTraces = (frame.image.debugGetOpenHandleStackTraces())!;
+    stackTraces = frame.image.debugGetOpenHandleStackTraces()!;
     expect(stackTraces.length, 2);
     expect(stackTraces, equals(handle2.debugGetOpenHandleStackTraces()));
 
     handle2.dispose();
-    stackTraces = (frame.image.debugGetOpenHandleStackTraces())!;
+    stackTraces = frame.image.debugGetOpenHandleStackTraces()!;
     expect(stackTraces.length, 1);
     expect(stackTraces, equals(frame.image.debugGetOpenHandleStackTraces()));
 
diff --git a/testing/dart/image_filter_test.dart b/testing/dart/image_filter_test.dart
index 98435912f8f372ecf424d2b19f8ac2fe03d68de0..44ffece1b7924d0bc5e857a124be940ffd1b8089 100644
--- a/testing/dart/image_filter_test.dart
+++ b/testing/dart/image_filter_test.dart
@@ -7,6 +7,8 @@ import 'dart:ui';
 
 import 'package:litetest/litetest.dart';
 
+import 'impeller_enabled.dart';
+
 const Color red = Color(0xFFAA0000);
 const Color green = Color(0xFF00AA00);
 
@@ -25,13 +27,6 @@ const List<double> grayscaleColorMatrix = <double>[
   0,      0,      0,      1, 0,
 ];
 
-const List<double> identityColorMatrix = <double>[
-  1, 0, 0, 0, 0,
-  0, 1, 0, 0, 0,
-  0, 0, 1, 0, 0,
-  0, 0, 0, 1, 0,
-];
-
 const List<double> constValueColorMatrix = <double>[
   0, 0, 0, 0, 2,
   0, 0, 0, 0, 2,
@@ -174,9 +169,13 @@ void main() {
   }
 
   test('ImageFilter - blur', () async {
+    if (impellerEnabled) {
+      print('Disabled - see https://github.com/flutter/flutter/issues/135712');
+      return;
+    }
     final Paint paint = Paint()
       ..color = green
-      ..imageFilter = makeBlur(1.0, 1.0);
+      ..imageFilter = makeBlur(1.0, 1.0, TileMode.decal);
 
     final Uint32List bytes = await getBytesForPaint(paint);
     checkBytes(bytes, greenCenterBlurred, greenSideBlurred, greenCornerBlurred);
@@ -201,6 +200,11 @@ void main() {
   });
 
   test('ImageFilter - matrix', () async {
+    if (impellerEnabled) {
+      print('Disabled - see https://github.com/flutter/flutter/issues/135712');
+      return;
+    }
+
     final Paint paint = Paint()
       ..color = green
       ..imageFilter = makeScale(2.0, 2.0, 1.5, 1.5);
@@ -227,6 +231,11 @@ void main() {
   });
 
   test('ImageFilter - from color filters', () async {
+    if (impellerEnabled) {
+      print('Disabled - see https://github.com/flutter/flutter/issues/135712');
+      return;
+    }
+
     final Paint paint = Paint()
       ..color = green
       ..imageFilter = const ColorFilter.matrix(constValueColorMatrix);
@@ -236,6 +245,11 @@ void main() {
   });
 
   test('ImageFilter - color filter composition', () async {
+    if (impellerEnabled) {
+      print('Disabled - see https://github.com/flutter/flutter/issues/135712');
+      return;
+    }
+
     final ImageFilter compOrder1 = ImageFilter.compose(
       outer: const ColorFilter.matrix(halvesBrightnessColorMatrix),
       inner: const ColorFilter.matrix(constValueColorMatrix),
diff --git a/testing/dart/impeller_enabled.dart b/testing/dart/impeller_enabled.dart
new file mode 100644
index 0000000000000000000000000000000000000000..18c457e3c059f00dbdee45892ece926cc384bcfb
--- /dev/null
+++ b/testing/dart/impeller_enabled.dart
@@ -0,0 +1,7 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io';
+
+bool get impellerEnabled => Platform.executableArguments.contains('--enable-impeller');
diff --git a/testing/dart/isolate_name_server_test.dart b/testing/dart/isolate_name_server_test.dart
index b805e814a573a97f485cdd2f566046a91d98bbb2..58005227699ad330853a8f52ff576374a253bb2f 100644
--- a/testing/dart/isolate_name_server_test.dart
+++ b/testing/dart/isolate_name_server_test.dart
@@ -110,12 +110,10 @@ void main() {
             break;
           case kCloseCode:
             receivePort.close();
-            break;
           case kDeletedCode:
             expect(IsolateNameServer.lookupPortByName(portName), isNull);
             // Test is done, close the last ReceivePort.
             testReceivePort.close();
-            break;
           case kErrorCode:
             throw message;
           default:
diff --git a/testing/dart/mask_filter_test.dart b/testing/dart/mask_filter_test.dart
index 7ac3a7c8bce574a6678529327786d7595ec55284..f1cd3a1ba57872829cb53aed664eaa783de8b1bb 100644
--- a/testing/dart/mask_filter_test.dart
+++ b/testing/dart/mask_filter_test.dart
@@ -22,7 +22,6 @@ void main() {
     builder.addPicture(Offset.zero, picture);
 
     final Scene scene = builder.build();
-    expect(scene != null, true);
     await scene.toImage(100, 100);
   });
 }
diff --git a/testing/dart/observatory/BUILD.gn b/testing/dart/observatory/BUILD.gn
index a0e6afbe6be174b95d7a38f9eac4a5a0fcd58133..35c573a85a4db253bea9fa0b950112c4d3b01b37 100644
--- a/testing/dart/observatory/BUILD.gn
+++ b/testing/dart/observatory/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//flutter/testing/dart/compile_test.gni")
+import("//flutter/build/dart/rules.gni")
 
 tests = [
   "skp_test.dart",
@@ -12,10 +12,10 @@ tests = [
 ]
 
 foreach(test, tests) {
-  compile_flutter_dart_test("compile_$test") {
-    dart_file = test
-    dart_kernel = "$root_gen_dir/$test.dill"
-    packages = "../.dart_tool/package_config.json"
+  flutter_frontend_server("compile_$test") {
+    main_dart = test
+    kernel_output = "$root_gen_dir/$test.dill"
+    package_config = "../.dart_tool/package_config.json"
   }
 }
 
diff --git a/testing/dart/observatory/shader_reload_test.dart b/testing/dart/observatory/shader_reload_test.dart
index ca4981e4b64fbaa3768e734fe65ecd3e63d34fb6..734b36f559ea161e2982add9dae00ed1cb642dfe 100644
--- a/testing/dart/observatory/shader_reload_test.dart
+++ b/testing/dart/observatory/shader_reload_test.dart
@@ -9,8 +9,14 @@ import 'package:litetest/litetest.dart';
 import 'package:vm_service/vm_service.dart' as vms;
 import 'package:vm_service/vm_service_io.dart';
 
+import '../impeller_enabled.dart';
+
 void main() {
   test('simple iplr shader can be re-initialized', () async {
+    if (impellerEnabled) {
+      // Needs https://github.com/flutter/flutter/issues/129659
+      return;
+    }
     vms.VmService? vmService;
     FragmentShader? shader;
     try {
@@ -23,7 +29,7 @@ void main() {
       final developer.ServiceProtocolInfo info = await developer.Service.getInfo();
 
       if (info.serverUri == null) {
-        fail('This test must not be run with --disable-observatory.');
+        fail('This test must not be run with --disable-vm-service.');
       }
 
       vmService = await vmServiceConnectUri(
diff --git a/testing/dart/observatory/skp_test.dart b/testing/dart/observatory/skp_test.dart
index 0303702c7a3f52de054d8154152d87b1158220cc..6c2a1460f9f21ff4a57f518d3fb5f9bf1e9451e4 100644
--- a/testing/dart/observatory/skp_test.dart
+++ b/testing/dart/observatory/skp_test.dart
@@ -12,12 +12,14 @@ import 'package:litetest/litetest.dart';
 import 'package:vm_service/vm_service.dart' as vms;
 import 'package:vm_service/vm_service_io.dart';
 
+import '../impeller_enabled.dart';
+
 void main() {
   test('Capture an SKP ', () async {
     final developer.ServiceProtocolInfo info = await developer.Service.getInfo();
 
     if (info.serverUri == null) {
-      fail('This test must not be run with --disable-observatory.');
+      fail('This test must not be run with --disable-vm-service.');
     }
 
     final vms.VmService vmService = await vmServiceConnectUri(
@@ -25,7 +27,7 @@ void main() {
     );
 
     final Completer<void> completer = Completer<void>();
-    window.onBeginFrame = (Duration timeStamp) {
+    PlatformDispatcher.instance.onBeginFrame = (Duration timeStamp) {
       final PictureRecorder recorder = PictureRecorder();
       final Canvas canvas = Canvas(recorder);
       canvas.drawRect(const Rect.fromLTRB(10, 10, 20, 20), Paint());
@@ -35,23 +37,26 @@ void main() {
       builder.addPicture(Offset.zero, picture);
       final Scene scene = builder.build();
 
-      window.render(scene);
+      PlatformDispatcher.instance.implicitView!.render(scene);
       scene.dispose();
-      // window.onBeginFrame = (Duration timeStamp) {
-        completer.complete();
-      // };
-      // window.scheduleFrame();
+      completer.complete();
     };
-    window.scheduleFrame();
+    PlatformDispatcher.instance.scheduleFrame();
     await completer.future;
 
-    final vms.Response response = await vmService.callServiceExtension('_flutter.screenshotSkp');
+    try {
+      final vms.Response response = await vmService.callServiceExtension('_flutter.screenshotSkp');
+      expect(impellerEnabled, false);
+      final String base64data = response.json!['skp'] as String;
+      expect(base64data, isNotNull);
+      expect(base64data, isNotEmpty);
+      final Uint8List decoded = base64Decode(base64data);
+      expect(decoded.sublist(0, 8), 'skiapict'.codeUnits);
+    } on vms.RPCError catch (e) {
+      expect(impellerEnabled, true);
+      expect(e.toString(), contains('Cannot capture SKP screenshot with Impeller enabled.'));
+    }
 
-    final String base64data = response.json!['skp'] as String;
-    expect(base64data, isNotNull);
-    expect(base64data, isNotEmpty);
-    final Uint8List decoded = base64Decode(base64data);
-    expect(decoded.sublist(0, 8), 'skiapict'.codeUnits);
 
     await vmService.dispose();
   });
diff --git a/testing/dart/observatory/tracing_test.dart b/testing/dart/observatory/tracing_test.dart
index 3257a8ef06e3cc71b4fddd39b3760dc178155ffc..b2bfaeb6ca26191dde76a9f84f9ac8f140b25680 100644
--- a/testing/dart/observatory/tracing_test.dart
+++ b/testing/dart/observatory/tracing_test.dart
@@ -3,19 +3,77 @@
 // found in the LICENSE file.
 
 import 'dart:async';
+import 'dart:convert' show base64Decode;
 import 'dart:developer' as developer;
 import 'dart:ui';
 
 import 'package:litetest/litetest.dart';
 import 'package:vm_service/vm_service.dart' as vms;
 import 'package:vm_service/vm_service_io.dart';
+import 'package:vm_service_protos/vm_service_protos.dart';
+
+import '../impeller_enabled.dart';
+
+Future<void> _testChromeFormatTrace(vms.VmService vmService) async {
+  final vms.Timeline timeline = await vmService.getVMTimeline();
+
+  int saveLayerRecordCount = 0;
+  int saveLayerCount = 0;
+  // int flowEventCount = 0;
+  for (final vms.TimelineEvent event in timeline.traceEvents!) {
+    final Map<String, dynamic> json = event.json!;
+    if (json['ph'] == 'B') {
+      if (json['name'] == 'ui.Canvas::saveLayer (Recorded)') {
+        saveLayerRecordCount += 1;
+      }
+      if (json['name'] == 'Canvas::saveLayer') {
+        saveLayerCount += 1;
+      }
+    }
+    // else if (json['ph'] == 's' || json['ph'] == 't' || json['ph'] == 'f') {
+    //   flowEventCount += 1;
+    // }
+  }
+  expect(saveLayerRecordCount, 3);
+  expect(saveLayerCount, impellerEnabled ? 2 : 3);
+  // TODO(derekxu16): Deflake https://github.com/flutter/flutter/issues/144394
+  // expect(flowEventCount, 5);
+}
+
+Future<void> _testPerfettoFormatTrace(vms.VmService vmService) async {
+  final vms.PerfettoTimeline response = await vmService.getPerfettoVMTimeline();
+  final List<TracePacket> packets =
+      Trace.fromBuffer(base64Decode(response.trace!)).packet;
+  final Iterable<TrackEvent> events = packets
+      .where((TracePacket packet) => packet.hasTrackEvent())
+      .map((TracePacket packet) => packet.trackEvent);
+
+  int saveLayerRecordCount = 0;
+  int saveLayerCount = 0;
+  // int flowIdCount = 0;
+  for (final TrackEvent event in events) {
+    if (event.type == TrackEvent_Type.TYPE_SLICE_BEGIN) {
+      if (event.name == 'ui.Canvas::saveLayer (Recorded)') {
+        saveLayerRecordCount += 1;
+      }
+      if (event.name == 'Canvas::saveLayer') {
+        saveLayerCount += 1;
+      }
+      // flowIdCount += event.flowIds.length;
+    }
+  }
+  expect(saveLayerRecordCount, 3);
+  expect(saveLayerCount, impellerEnabled ? 2 : 3);
+  // TODO(derekxu16): Deflake https://github.com/flutter/flutter/issues/144394
+  // expect(flowIdCount, 5);
+}
 
 void main() {
   test('Canvas.saveLayer emits tracing', () async {
     final developer.ServiceProtocolInfo info = await developer.Service.getInfo();
 
     if (info.serverUri == null) {
-      fail('This test must not be run with --disable-observatory.');
+      fail('This test must not be run with --disable-vm-service.');
     }
 
     final vms.VmService vmService = await vmServiceConnectUri(
@@ -23,10 +81,11 @@ void main() {
     );
 
     final Completer<void> completer = Completer<void>();
-    window.onBeginFrame = (Duration timeStamp) async {
+    PlatformDispatcher.instance.onBeginFrame = (Duration timeStamp) async {
       final PictureRecorder recorder = PictureRecorder();
       final Canvas canvas = Canvas(recorder);
       canvas.drawColor(const Color(0xff0000ff), BlendMode.srcOut);
+      // Will saveLayer implicitly for Skia, but not Impeller.
       canvas.drawPaint(Paint()..imageFilter = ImageFilter.blur(sigmaX: 2, sigmaY: 3));
       canvas.saveLayer(null, Paint());
       canvas.drawRect(const Rect.fromLTRB(10, 10, 20, 20), Paint());
@@ -45,26 +104,11 @@ void main() {
       scene.dispose();
       completer.complete();
     };
-    window.scheduleFrame();
+    PlatformDispatcher.instance.scheduleFrame();
     await completer.future;
 
-    final vms.Timeline timeline = await vmService.getVMTimeline();
+    await _testChromeFormatTrace(vmService);
+    await _testPerfettoFormatTrace(vmService);
     await vmService.dispose();
-
-    int saveLayerRecordCount = 0;
-    int saveLayerCount = 0;
-    for (final vms.TimelineEvent event in timeline.traceEvents!) {
-      final Map<String, dynamic> json = event.json!;
-      if (json['ph'] == 'B') {
-        if (json['name'] == 'ui.Canvas::saveLayer (Recorded)') {
-          saveLayerRecordCount += 1;
-        }
-        if (json['name'] == 'Canvas::saveLayer') {
-          saveLayerCount += 1;
-        }
-      }
-    }
-    expect(saveLayerRecordCount, 3);
-    expect(saveLayerCount, 3);
   });
 }
diff --git a/testing/dart/observatory/vmservice_methods_test.dart b/testing/dart/observatory/vmservice_methods_test.dart
index 6fe14f0d5e697b3e0053d5e0b335498de628c423..14fd20d2afcb19fe4cbae49817722a1523379fe8 100644
--- a/testing/dart/observatory/vmservice_methods_test.dart
+++ b/testing/dart/observatory/vmservice_methods_test.dart
@@ -12,13 +12,15 @@ import 'package:litetest/litetest.dart';
 import 'package:vm_service/vm_service.dart' as vms;
 import 'package:vm_service/vm_service_io.dart';
 
+import '../impeller_enabled.dart';
+
 void main() {
   test('Setting invalid directory returns an error', () async {
     vms.VmService? vmService;
     try {
       final developer.ServiceProtocolInfo info = await developer.Service.getInfo();
       if (info.serverUri == null) {
-        fail('This test must not be run with --disable-observatory.');
+        fail('This test must not be run with --disable-vm-service.');
       }
 
       vmService = await vmServiceConnectUri(
@@ -47,7 +49,7 @@ void main() {
     try {
       final developer.ServiceProtocolInfo info = await developer.Service.getInfo();
       if (info.serverUri == null) {
-        fail('This test must not be run with --disable-observatory.');
+        fail('This test must not be run with --disable-vm-service.');
       }
 
       vmService = await vmServiceConnectUri(
@@ -59,7 +61,7 @@ void main() {
         'ext.ui.window.impellerEnabled',
         isolateId: isolateId,
       );
-      expect(response.json!['enabled'], false);
+      expect(response.json!['enabled'], impellerEnabled);
     } finally {
       await vmService?.dispose();
     }
@@ -71,15 +73,18 @@ void main() {
       final developer.ServiceProtocolInfo info =
           await developer.Service.getInfo();
       if (info.serverUri == null) {
-        fail('This test must not be run with --disable-observatory.');
+        fail('This test must not be run with --disable-vm-service.');
       }
 
-      final Completer<PlatformResponse> completer = Completer<PlatformResponse>();
-      ui.window.onPlatformMessage = (String name, ByteData? data, ui.PlatformMessageResponseCallback? callback) {
-        final ByteBuffer buffer = data!.buffer;
-        final Uint8List list = buffer.asUint8List(data.offsetInBytes, data.lengthInBytes);
-        completer.complete(PlatformResponse(name: name, contents: utf8.decode(list)));
-      };
+      final Completer<String> completer = Completer<String>();
+      ui.channelBuffers.setListener(
+        'flutter/system',
+        (ByteData? data, ui.PlatformMessageResponseCallback callback) {
+          final ByteBuffer buffer = data!.buffer;
+          final Uint8List list = buffer.asUint8List(data.offsetInBytes, data.lengthInBytes);
+          completer.complete(utf8.decode(list));
+        },
+      );
 
       vmService = await vmServiceConnectUri(
         'ws://localhost:${info.serverUri!.port}${info.serverUri!.path}ws',
@@ -94,13 +99,11 @@ void main() {
       expect(fontChangeResponse.type, 'Success');
       expect(
         await completer.future,
-        const PlatformResponse(
-          name: 'flutter/system',
-          contents: '{"type":"fontsChange"}',
-        ),
+        '{"type":"fontsChange"}',
       );
     } finally {
       await vmService?.dispose();
+      ui.channelBuffers.clearListener('flutter/system');
     }
   });
 }
@@ -121,22 +124,3 @@ Future<String?> getIsolateId(vms.VmService vmService) async {
   }
   return null;
 }
-
-class PlatformResponse {
-  const PlatformResponse({
-    required this.name,
-    required this.contents,
-  });
-
-  final String name;
-  final String contents;
-
-  @override
-  bool operator ==(Object other) =>
-      other is PlatformResponse &&
-      other.name == name &&
-      other.contents == contents;
-
-  @override
-  int get hashCode => Object.hash(name, contents);
-}
diff --git a/testing/dart/painting_test.dart b/testing/dart/painting_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..8c5061772f541da905daa6e1b4f7aa86d4afd0fa
--- /dev/null
+++ b/testing/dart/painting_test.dart
@@ -0,0 +1,106 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:typed_data';
+import 'dart:ui';
+
+import 'package:litetest/litetest.dart';
+
+typedef CanvasCallback = void Function(Canvas canvas);
+
+void main() {
+  test('Vertices checks', () {
+    try {
+      Vertices(
+        VertexMode.triangles,
+        const <Offset>[Offset.zero, Offset.zero, Offset.zero],
+        indices: Uint16List.fromList(const <int>[0, 2, 5]),
+      );
+      throw 'Vertices did not throw the expected error.';
+    } on ArgumentError catch (e) {
+      expect('$e', 'Invalid argument(s): "indices" values must be valid indices in the positions list (i.e. numbers in the range 0..2), but indices[2] is 5, which is too big.');
+    }
+    Vertices( // This one does not throw.
+      VertexMode.triangles,
+      const <Offset>[Offset.zero],
+    ).dispose();
+    Vertices( // This one should not throw.
+      VertexMode.triangles,
+      const <Offset>[Offset.zero, Offset.zero, Offset.zero],
+      indices: Uint16List.fromList(const <int>[0, 2, 1, 2, 0, 1, 2, 0]), // Uint16List implements List<int> so this is ok.
+    ).dispose();
+  });
+
+  test('Vertices.raw checks', () {
+    try {
+      Vertices.raw(
+        VertexMode.triangles,
+        Float32List.fromList(const <double>[0.0]),
+      );
+      throw 'Vertices.raw did not throw the expected error.';
+    } on ArgumentError catch (e) {
+      expect('$e', 'Invalid argument(s): "positions" must have an even number of entries (each coordinate is an x,y pair).');
+    }
+    try {
+      Vertices.raw(
+        VertexMode.triangles,
+        Float32List.fromList(const <double>[0.0, 0.0, 0.0, 0.0, 0.0, 0.0]),
+        indices: Uint16List.fromList(const <int>[0, 2, 5]),
+      );
+      throw 'Vertices.raw did not throw the expected error.';
+    } on ArgumentError catch (e) {
+      expect('$e', 'Invalid argument(s): "indices" values must be valid indices in the positions list (i.e. numbers in the range 0..2), but indices[2] is 5, which is too big.');
+    }
+    Vertices.raw( // This one does not throw.
+      VertexMode.triangles,
+      Float32List.fromList(const <double>[0.0, 0.0]),
+    ).dispose();
+    Vertices.raw( // This one should not throw.
+      VertexMode.triangles,
+      Float32List.fromList(const <double>[0.0, 0.0, 0.0, 0.0, 0.0, 0.0]),
+      indices: Uint16List.fromList(const <int>[0, 2, 1, 2, 0, 1, 2, 0]),
+    ).dispose();
+  });
+
+  test('BackdropFilter with multiple clips', () async {
+    // Regression test for https://github.com/flutter/flutter/issues/144211
+    Picture makePicture(CanvasCallback callback) {
+      final PictureRecorder recorder = PictureRecorder();
+      final Canvas canvas = Canvas(recorder);
+      callback(canvas);
+      return recorder.endRecording();
+    }
+    final SceneBuilder sceneBuilder = SceneBuilder();
+
+    final Picture redClippedPicture = makePicture((Canvas canvas) {
+      canvas.clipRect(const Rect.fromLTRB(10, 10, 200, 200));
+      canvas.clipRect(const Rect.fromLTRB(11, 10, 300, 200));
+      canvas.drawPaint(Paint()..color = const Color(0xFFFF0000));
+    });
+    sceneBuilder.addPicture(Offset.zero, redClippedPicture);
+
+    final Float64List matrix = Float64List(16);
+    sceneBuilder.pushBackdropFilter(ImageFilter.matrix(matrix));
+
+    final Picture whitePicture = makePicture((Canvas canvas) {
+      canvas.drawPaint(Paint()..color = const Color(0xFFFFFFFF));
+    });
+    sceneBuilder.addPicture(Offset.zero, whitePicture);
+
+    final Scene scene = sceneBuilder.build();
+    final Image image = scene.toImageSync(20, 20);
+
+    final ByteData data = (await image.toByteData())!;
+    expect(data.buffer.asUint32List().length, 20 * 20);
+    // If clipping went wrong as in the linked issue, there will be red pixels.
+    for (final int color in  data.buffer.asUint32List()) {
+      expect(color, 0xFFFFFFFF);
+    }
+
+    scene.dispose();
+    image.dispose();
+    whitePicture.dispose();
+    redClippedPicture.dispose();
+  });
+}
diff --git a/testing/dart/paragraph_builder_test.dart b/testing/dart/paragraph_builder_test.dart
index 37e27a758147ad5543998658d2801ffac569b7f8..14761f17f9c83f3d98077e5147d5fc649c296f5d 100644
--- a/testing/dart/paragraph_builder_test.dart
+++ b/testing/dart/paragraph_builder_test.dart
@@ -7,9 +7,6 @@ import 'dart:ui';
 import 'package:litetest/litetest.dart';
 
 void main() {
-  // The actual values for font measurements will vary by platform slightly.
-  const double epsillon = 0.0001;
-
   test('Should be able to build and layout a paragraph', () {
     final ParagraphBuilder builder = ParagraphBuilder(ParagraphStyle());
     builder.addText('Hello');
@@ -40,10 +37,10 @@ void main() {
 
     final List<TextBox> boxes = paragraph.getBoxesForRange(0, 3);
     expect(boxes.length, 1);
-    expect(boxes.first.left, 0);
-    expect(boxes.first.top, closeTo(0, epsillon));
-    expect(boxes.first.right, closeTo(42, epsillon));
-    expect(boxes.first.bottom, closeTo(14, epsillon));
+    expect(boxes.first.left, 0.0);
+    expect(boxes.first.top, 0.0);
+    expect(boxes.first.right, 42.0);
+    expect(boxes.first.bottom, 14.0);
     expect(boxes.first.direction, TextDirection.ltr);
   });
 
@@ -60,13 +57,13 @@ void main() {
     final List<LineMetrics> metrics = paragraph.computeLineMetrics();
     expect(metrics.length, 1);
     expect(metrics.first.hardBreak, true);
-    expect(metrics.first.ascent, closeTo(11.200042724609375, epsillon));
-    expect(metrics.first.descent, closeTo(2.799957275390625, epsillon));
-    expect(metrics.first.unscaledAscent, closeTo(11.200042724609375, epsillon));
+    expect(metrics.first.ascent, 10.5);
+    expect(metrics.first.descent, 3.5);
+    expect(metrics.first.unscaledAscent, 10.5);
     expect(metrics.first.height, 14.0);
     expect(metrics.first.width, 70.0);
     expect(metrics.first.left, 0.0);
-    expect(metrics.first.baseline, closeTo(11.200042724609375, epsillon));
+    expect(metrics.first.baseline, 10.5);
     expect(metrics.first.lineNumber, 0);
   });
 }
diff --git a/testing/dart/paragraph_test.dart b/testing/dart/paragraph_test.dart
index b6f4898669c11dfe3c82a4a4ca4a0dd9f5251c78..d8acb74c50c34c8c2760e7c0ede9d4fbdb3bfb44 100644
--- a/testing/dart/paragraph_test.dart
+++ b/testing/dart/paragraph_test.dart
@@ -10,7 +10,7 @@ void main() {
   // Ahem font uses a constant ideographic/alphabetic baseline ratio.
   const double kAhemBaselineRatio = 1.25;
 
-  test('predictably lays out a single-line paragraph', () {
+  test('predictably lays out a single-line paragraph - Ahem', () {
     for (final double fontSize in <double>[10.0, 20.0, 30.0, 40.0]) {
       final ParagraphBuilder builder = ParagraphBuilder(ParagraphStyle(
         fontFamily: 'Ahem',
@@ -34,6 +34,27 @@ void main() {
     }
   });
 
+  test('predictably lays out a single-line paragraph - FlutterTest', () {
+    for (final double fontSize in <double>[10.0, 20.0, 30.0, 40.0]) {
+      final ParagraphBuilder builder = ParagraphBuilder(ParagraphStyle(
+        fontFamily: 'FlutterTest',
+        fontStyle: FontStyle.normal,
+        fontWeight: FontWeight.normal,
+        fontSize: fontSize,
+      ));
+      builder.addText('Test');
+      final Paragraph paragraph = builder.build();
+      paragraph.layout(const ParagraphConstraints(width: 400.0));
+
+      expect(paragraph.height, fontSize);
+      expect(paragraph.width, 400.0);
+      expect(paragraph.minIntrinsicWidth, fontSize * 4.0);
+      expect(paragraph.maxIntrinsicWidth, fontSize * 4.0);
+      expect(paragraph.alphabeticBaseline, fontSize * 0.75);
+      expect(paragraph.ideographicBaseline, fontSize);
+    }
+  });
+
   test('predictably lays out a multi-line paragraph', () {
     for (final double fontSize in <double>[10.0, 20.0, 30.0, 40.0]) {
       final ParagraphBuilder builder = ParagraphBuilder(ParagraphStyle(
@@ -198,6 +219,105 @@ void main() {
     expect(line.end, 10);
   });
 
+  test('getLineMetricsAt', () {
+    const double fontSize = 10.0;
+    final ParagraphBuilder builder = ParagraphBuilder(ParagraphStyle(
+      fontSize: fontSize,
+      textDirection: TextDirection.rtl,
+      height: 2.0,
+    ));
+    builder.addText('Test\npppp');
+    final Paragraph paragraph = builder.build();
+    paragraph.layout(const ParagraphConstraints(width: 100.0));
+    final LineMetrics? line = paragraph.getLineMetricsAt(1);
+    expect(line?.hardBreak, isTrue);
+    expect(line?.ascent, 15.0);
+    expect(line?.descent, 5.0);
+    expect(line?.height, 20.0);
+    expect(line?.width, 4 * 10.0);
+    expect(line?.left, 100.0 - 40.0);
+    expect(line?.baseline, 20.0 + 15.0);
+    expect(line?.lineNumber, 1);
+  });
+
+  test('line number', () {
+    const double fontSize = 10.0;
+    final ParagraphBuilder builder = ParagraphBuilder(ParagraphStyle(fontSize: fontSize));
+    builder.addText('Test\n\nTest');
+    final Paragraph paragraph = builder.build();
+    paragraph.layout(const ParagraphConstraints(width: 100.0));
+    expect(paragraph.numberOfLines, 3);
+    expect(paragraph.getLineNumberAt(4), 0); // first LF
+    expect(paragraph.getLineNumberAt(5), 1); // second LF
+    expect(paragraph.getLineNumberAt(6), 2); // "T" in the second "Test"
+  });
+
+  test('empty paragraph', () {
+    const double fontSize = 10.0;
+    final Paragraph paragraph = ParagraphBuilder(ParagraphStyle(
+      fontSize: fontSize,
+    )).build();
+    paragraph.layout(const ParagraphConstraints(width: double.infinity));
+
+    expect(paragraph.getClosestGlyphInfoForOffset(Offset.zero), isNull);
+    expect(paragraph.getGlyphInfoAt(0), isNull);
+
+    expect(paragraph.getLineMetricsAt(0), isNull);
+    expect(paragraph.numberOfLines, 0);
+    expect(paragraph.getLineNumberAt(0), isNull);
+
+    expect(paragraph.getGlyphInfoAt(0), isNull);
+    expect(paragraph.getClosestGlyphInfoForOffset(Offset.zero), isNull);
+  });
+
+  test('OOB indices as input', () {
+    const double fontSize = 10.0;
+    final ParagraphBuilder builder = ParagraphBuilder(ParagraphStyle(
+      fontSize: fontSize,
+      maxLines: 1,
+      ellipsis: 'BBB',
+    ))..addText('A' * 100);
+    final Paragraph paragraph = builder.build();
+    paragraph.layout(const ParagraphConstraints(width: 100));
+
+    expect(paragraph.numberOfLines, 1);
+
+    expect(paragraph.getLineMetricsAt(-1), isNull);
+    expect(paragraph.getLineMetricsAt(0)?.lineNumber, 0);
+    expect(paragraph.getLineMetricsAt(1), isNull);
+
+    expect(paragraph.getLineNumberAt(-1), isNull);
+    expect(paragraph.getLineNumberAt(0), 0);
+    expect(paragraph.getLineNumberAt(6), 0);
+    // The last 3 characters on the first line are ellipsized with BBB.
+    expect(paragraph.getLineMetricsAt(7), isNull);
+
+    expect(paragraph.getGlyphInfoAt(-1), isNull);
+    expect(paragraph.getGlyphInfoAt(0)?.graphemeClusterCodeUnitRange, const TextRange(start: 0, end: 1));
+    expect(paragraph.getGlyphInfoAt(6)?.graphemeClusterCodeUnitRange, const TextRange(start: 6, end: 7));
+    expect(paragraph.getGlyphInfoAt(7), isNull);
+    expect(paragraph.getGlyphInfoAt(200), isNull);
+  });
+
+  test('querying glyph info', () {
+    const double fontSize = 10.0;
+    final ParagraphBuilder builder = ParagraphBuilder(ParagraphStyle(
+      fontSize: fontSize,
+    ));
+    builder.addText('Test\nTest');
+    final Paragraph paragraph = builder.build();
+    paragraph.layout(const ParagraphConstraints(width: double.infinity));
+
+    final GlyphInfo? bottomRight = paragraph.getClosestGlyphInfoForOffset(const Offset(99.0, 99.0));
+    final GlyphInfo? last = paragraph.getGlyphInfoAt(8);
+    expect(bottomRight, equals(last));
+    expect(bottomRight, notEquals(paragraph.getGlyphInfoAt(0)));
+
+    expect(bottomRight?.graphemeClusterLayoutBounds, const Rect.fromLTWH(30, 10, 10, 10));
+    expect(bottomRight?.graphemeClusterCodeUnitRange, const TextRange(start: 8, end: 9));
+    expect(bottomRight?.writingDirection, TextDirection.ltr);
+  });
+
   test('painting a disposed paragraph does not crash', () {
     final Paragraph paragraph = ParagraphBuilder(ParagraphStyle()).build();
     paragraph.dispose();
@@ -212,4 +332,21 @@ void main() {
       expect(callback, throwsStateError);
     }
   });
+
+  test('rounding hack disabled', () {
+    const double fontSize = 1.25;
+    const String text = '12345';
+    assert((fontSize * text.length).truncate() != fontSize * text.length);
+    final ParagraphBuilder builder = ParagraphBuilder(ParagraphStyle(fontSize: fontSize));
+    builder.addText(text);
+    final Paragraph paragraph = builder.build()
+      ..layout(const ParagraphConstraints(width: text.length * fontSize));
+    expect(paragraph.maxIntrinsicWidth, text.length * fontSize);
+    switch (paragraph.computeLineMetrics()) {
+      case [LineMetrics(width: final double width)]:
+        expect(width, text.length * fontSize);
+      case final List<LineMetrics> metrics:
+        expect(metrics, hasLength(1));
+    }
+  });
 }
diff --git a/testing/dart/path_test.dart b/testing/dart/path_test.dart
index 8b2647fd1750eafd7158279982ee8bbb1194b55e..306797a32395c6ff382a685f32042cdc89f36224 100644
--- a/testing/dart/path_test.dart
+++ b/testing/dart/path_test.dart
@@ -225,4 +225,19 @@ void main() {
     expect(newFirstMetric.getTangentForOffset(4.0)!.vector, const Offset(0.0, 1.0));
     expect(newFirstMetric.extractPath(4.0, 10.0).computeMetrics().first.length, 6.0);
   });
+
+  test('PathMetrics on a mutated path', () {
+    final Path path = Path()
+      ..lineTo(0, 30)
+      ..lineTo(40, 30)
+      ..moveTo(100, 0)
+      ..lineTo(100, 30)
+      ..lineTo(140, 30)
+      ..close();
+    final PathMetrics metrics = path.computeMetrics();
+    expect(metrics.toString(),
+      '(PathMetric(length: 70.0, isClosed: false, contourIndex: 0), '
+       'PathMetric(length: 120.0, isClosed: true, contourIndex: 1))',
+    );
+  });
 }
diff --git a/testing/dart/platform_dispatcher_test.dart b/testing/dart/platform_dispatcher_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..e7ff1f1aa5646597b00547c2534086cd71cedc4f
--- /dev/null
+++ b/testing/dart/platform_dispatcher_test.dart
@@ -0,0 +1,77 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'dart:ui';
+
+import 'package:litetest/litetest.dart';
+
+void main() {
+  test('ViewConstraints.tight', () {
+    final ViewConstraints tightConstraints = ViewConstraints.tight(const Size(200, 300));
+    expect(tightConstraints.minWidth, 200);
+    expect(tightConstraints.maxWidth, 200);
+    expect(tightConstraints.minHeight, 300);
+    expect(tightConstraints.maxHeight, 300);
+
+    expect(tightConstraints.isTight, true);
+    expect(tightConstraints.isSatisfiedBy(const Size(200, 300)), true);
+    expect(tightConstraints.isSatisfiedBy(const Size(400, 500)), false);
+    expect(tightConstraints / 2, ViewConstraints.tight(const Size(100, 150)));
+  });
+
+  test('ViewConstraints unconstrained', () {
+    const ViewConstraints defaultValues = ViewConstraints();
+    expect(defaultValues.minWidth, 0);
+    expect(defaultValues.maxWidth, double.infinity);
+    expect(defaultValues.minHeight, 0);
+    expect(defaultValues.maxHeight, double.infinity);
+
+    expect(defaultValues.isTight, false);
+    expect(defaultValues.isSatisfiedBy(const Size(200, 300)), true);
+    expect(defaultValues.isSatisfiedBy(const Size(400, 500)), true);
+    expect(defaultValues / 2, const ViewConstraints());
+  });
+
+
+  test('ViewConstraints', () {
+    const ViewConstraints constraints = ViewConstraints(minWidth: 100, maxWidth: 200, minHeight: 300, maxHeight: 400);
+    expect(constraints.minWidth, 100);
+    expect(constraints.maxWidth, 200);
+    expect(constraints.minHeight, 300);
+    expect(constraints.maxHeight, 400);
+
+    expect(constraints.isTight, false);
+    expect(constraints.isSatisfiedBy(const Size(200, 300)), true);
+    expect(constraints.isSatisfiedBy(const Size(400, 500)), false);
+    expect(constraints / 2, const ViewConstraints(minWidth: 50, maxWidth: 100, minHeight: 150, maxHeight: 200));
+  });
+
+  test('scheduleWarmupFrame should call both callbacks and flush microtasks', () async {
+    bool microtaskFlushed = false;
+    bool beginFrameCalled = false;
+    final Completer<void> drawFrameCalled = Completer<void>();
+    PlatformDispatcher.instance.scheduleWarmUpFrame(beginFrame: () {
+      expect(microtaskFlushed, false);
+      expect(drawFrameCalled.isCompleted, false);
+      expect(beginFrameCalled, false);
+      beginFrameCalled = true;
+      scheduleMicrotask(() {
+        expect(microtaskFlushed, false);
+        expect(drawFrameCalled.isCompleted, false);
+        microtaskFlushed = true;
+      });
+      expect(microtaskFlushed, false);
+    }, drawFrame: () {
+      expect(beginFrameCalled, true);
+      expect(microtaskFlushed, true);
+      expect(drawFrameCalled.isCompleted, false);
+      drawFrameCalled.complete();
+    });
+    await drawFrameCalled.future;
+    expect(beginFrameCalled, true);
+    expect(drawFrameCalled.isCompleted, true);
+    expect(microtaskFlushed, true);
+  });
+}
diff --git a/testing/dart/platform_isolate_shutdown_test.dart b/testing/dart/platform_isolate_shutdown_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..af5c37048125fe8f92f1dfc6584e87ee7c349dcf
--- /dev/null
+++ b/testing/dart/platform_isolate_shutdown_test.dart
@@ -0,0 +1,40 @@
+// Copyright 2024 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'dart:ffi';
+import 'dart:isolate';
+import 'dart:ui';
+
+import 'package:litetest/litetest.dart';
+
+void main() {
+  test('PlatformIsolate runOnPlatformThread, cancels pending jobs if shutdown', () async {
+    final Future<int> slowTask = runOnPlatformThread(() async {
+      await Future<void>.delayed(const Duration(seconds: 10));
+      return 123;
+    });
+
+    await runOnPlatformThread(() {
+      _forceShutdownIsolate();
+      Future<void>(() => Isolate.exit());
+    });
+
+    bool throws = false;
+    try {
+      await slowTask;
+    } catch (error) {
+      expect(error.toString(), contains('PlatformIsolate shutdown unexpectedly'));
+      throws = true;
+    }
+    expect(throws, true);
+
+    // Platform isolate automatically restarts.
+    final int result = await runOnPlatformThread(() => 123);
+    expect(result, 123);
+  });
+}
+
+@Native<Void Function()>(symbol: 'ForceShutdownIsolate')
+external void _forceShutdownIsolate();
diff --git a/testing/dart/platform_isolate_test.dart b/testing/dart/platform_isolate_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..e6046beb557efbb276152201600f277dfe089c7d
--- /dev/null
+++ b/testing/dart/platform_isolate_test.dart
@@ -0,0 +1,187 @@
+// Copyright 2024 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'dart:isolate';
+import 'dart:ui';
+
+import 'package:litetest/litetest.dart';
+
+int counter = 0;
+
+void main() {
+  test('PlatformIsolate isRunningOnPlatformThread, false cases', () async {
+    final bool isPlatThread =
+        await Isolate.run(() => isRunningOnPlatformThread);
+    expect(isPlatThread, isFalse);
+  });
+
+  test('PlatformIsolate runOnPlatformThread', () async {
+    final bool isPlatThread =
+        await runOnPlatformThread(() => isRunningOnPlatformThread);
+    expect(isPlatThread, isTrue);
+  });
+
+  test('PlatformIsolate runOnPlatformThread, async operations', () async {
+    final bool isPlatThread = await runOnPlatformThread(() async {
+      await Future<void>.delayed(const Duration(milliseconds: 100));
+      await Future<void>.delayed(const Duration(milliseconds: 100));
+      await Future<void>.delayed(const Duration(milliseconds: 100));
+      return isRunningOnPlatformThread;
+    });
+    expect(isPlatThread, isTrue);
+  });
+
+  test('PlatformIsolate runOnPlatformThread, retains state', () async {
+    await runOnPlatformThread(() => ++counter);
+    await Future<void>.delayed(const Duration(milliseconds: 100));
+    await runOnPlatformThread(() => ++counter);
+    await Future<void>.delayed(const Duration(milliseconds: 100));
+    await runOnPlatformThread(() => ++counter);
+    await Future<void>.delayed(const Duration(milliseconds: 100));
+    final int counterValue = await runOnPlatformThread(() => counter);
+    expect(counterValue, 3);
+  });
+
+  test('PlatformIsolate runOnPlatformThread, concurrent jobs', () async {
+    final Future<int> future1 = runOnPlatformThread(() async {
+      await Future<void>.delayed(const Duration(milliseconds: 100));
+      return 1;
+    });
+    final Future<int> future2 = runOnPlatformThread(() async {
+      await Future<void>.delayed(const Duration(milliseconds: 100));
+      return 2;
+    });
+    final Future<int> future3 = runOnPlatformThread(() async {
+      await Future<void>.delayed(const Duration(milliseconds: 100));
+      return 3;
+    });
+    expect(await future1, 1);
+    expect(await future2, 2);
+    expect(await future3, 3);
+  });
+
+  test('PlatformIsolate runOnPlatformThread, send and receive messages',
+      () async {
+    // Send numbers 1 to 10 to the platform isolate. The platform isolate
+    // multiplies them by 100 and sends them back.
+    int sum = 0;
+    final RawReceivePort recvPort = RawReceivePort((Object message) {
+      if (message is SendPort) {
+        for (int i = 1; i <= 10; ++i) {
+          message.send(i);
+        }
+      } else {
+        sum += message as int;
+      }
+    });
+    final SendPort sendPort = recvPort.sendPort;
+    await runOnPlatformThread(() async {
+      final Completer<void> completer = Completer<void>();
+      final RawReceivePort recvPort = RawReceivePort((Object message) {
+        sendPort.send((message as int) * 100);
+        if (message == 10) {
+          completer.complete();
+        }
+      });
+      sendPort.send(recvPort.sendPort);
+      await completer.future;
+      recvPort.close();
+    });
+    expect(sum, 5500); // sum(1 to 10) * 100
+    recvPort.close();
+  });
+
+  test('PlatformIsolate runOnPlatformThread, throws', () async {
+    bool throws = false;
+    try {
+      await runOnPlatformThread(() => throw 'Oh no!');
+    } catch (error) {
+      expect(error, 'Oh no!');
+      throws = true;
+    }
+    expect(throws, true);
+  });
+
+  test('PlatformIsolate runOnPlatformThread, async throws', () async {
+    bool throws = false;
+    try {
+      await runOnPlatformThread(() async {
+        await Future<void>.delayed(const Duration(milliseconds: 100));
+        await Future<void>.delayed(const Duration(milliseconds: 100));
+        await Future<void>.delayed(const Duration(milliseconds: 100));
+        throw 'Oh no!';
+      });
+    } catch (error) {
+      expect(error, 'Oh no!');
+      throws = true;
+    }
+    expect(throws, true);
+  });
+
+  test('PlatformIsolate runOnPlatformThread, disabled on helper isolates',
+      () async {
+    await Isolate.run(() {
+      expect(() => runOnPlatformThread(() => print('Unreachable')), throws);
+    });
+  });
+
+  test('PlatformIsolate runOnPlatformThread, on platform isolate', () async {
+    final int result = await runOnPlatformThread(() => runOnPlatformThread(
+        () => runOnPlatformThread(() => runOnPlatformThread(() => 123))));
+    expect(result, 123);
+  });
+
+  test('PlatformIsolate runOnPlatformThread, exit disabled', () async {
+    await runOnPlatformThread(() => expect(() => Isolate.exit(), throws));
+  });
+
+  test('PlatformIsolate runOnPlatformThread, unsendable object', () async {
+    bool throws = false;
+    try {
+      await runOnPlatformThread(() => ReceivePort());
+    } catch (error) {
+      throws = true;
+    }
+    expect(throws, true);
+  });
+
+  test('PlatformIsolate runOnPlatformThread, unsendable object async',
+      () async {
+    bool throws = false;
+    try {
+      await runOnPlatformThread(() async {
+        await Future<void>.delayed(const Duration(milliseconds: 100));
+        return ReceivePort();
+      });
+    } catch (error) {
+      throws = true;
+    }
+    expect(throws, true);
+  });
+
+  test('PlatformIsolate runOnPlatformThread, throws unsendable', () async {
+    bool throws = false;
+    try {
+      await runOnPlatformThread(() => throw ReceivePort());
+    } catch (error) {
+      throws = true;
+    }
+    expect(throws, true);
+  });
+
+  test('PlatformIsolate runOnPlatformThread, throws unsendable async',
+      () async {
+    bool throws = false;
+    try {
+      await runOnPlatformThread(() async {
+        await Future<void>.delayed(const Duration(milliseconds: 100));
+        throw ReceivePort();
+      });
+    } catch (error) {
+      throws = true;
+    }
+    expect(throws, true);
+  });
+}
diff --git a/testing/dart/platform_view_test.dart b/testing/dart/platform_view_test.dart
index c234e63bb0e4f1dbe7db62696e598a3bc3b3b5a4..cd581a22d581db6c3d09dbcd8bbfdc59c5be9049 100644
--- a/testing/dart/platform_view_test.dart
+++ b/testing/dart/platform_view_test.dart
@@ -10,10 +10,12 @@ void main() {
   test('PlatformView layers do not emit errors from tester', () async {
     final SceneBuilder builder = SceneBuilder();
     builder.addPlatformView(1);
-    final Scene scene = builder.build();
-
-    window.render(scene);
-    scene.dispose();
+    PlatformDispatcher.instance.onBeginFrame = (Duration duration) {
+      final Scene scene = builder.build();
+      PlatformDispatcher.instance.implicitView!.render(scene);
+      scene.dispose();
+    };
+    PlatformDispatcher.instance.scheduleFrame();
     // Test harness asserts that this does not emit an error from the shell logs.
   });
 }
diff --git a/testing/dart/plugin_utilities_test.dart b/testing/dart/plugin_utilities_test.dart
index 6de841e987b6a7bef448d3168fa38105d6aa93ee..b0a701f0cda2db8cf07b8cf6c1c29d9d14bfa3f9 100644
--- a/testing/dart/plugin_utilities_test.dart
+++ b/testing/dart/plugin_utilities_test.dart
@@ -17,8 +17,6 @@ class Foo {
   double getDouble() => 1.0;
 }
 
-const Foo foo = Foo();
-
 void main() {
   test('PluginUtilities Callback Handles', () {
     // Top level callback.
diff --git a/testing/dart/pubspec.yaml b/testing/dart/pubspec.yaml
index 971314f0324b53c0d22b8ea4dddfa73873bff941..c83fa2f0b0f551fd56eee989a2f854f8a2c0839f 100644
--- a/testing/dart/pubspec.yaml
+++ b/testing/dart/pubspec.yaml
@@ -14,31 +14,58 @@ publish_to: none
 # relative to this directory into //third_party/dart
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=3.2.0-0 <4.0.0'
 
 dependencies:
+  ffi: any
   litetest: any
   path: any
+  skia_gold_client: any
   sky_engine: any
   vector_math: any
   vm_service: any
+  vm_service_protos: any
 
 dependency_overrides:
   async_helper:
     path: ../../../third_party/dart/pkg/async_helper
+  collection:
+    path: ../../../third_party/dart/third_party/pkg/collection
+  crypto:
+    path: ../../../third_party/dart/third_party/pkg/crypto
+  engine_repo_tools:
+    path: ../../tools/pkg/engine_repo_tools
   expect:
     path: ../../../third_party/dart/pkg/expect
+  file:
+    path: ../../../third_party/dart/third_party/pkg/file/packages/file
+  ffi:
+    path: ../../../third_party/dart/third_party/pkg/native/pkgs/ffi
+  fixnum:
+    path: ../../../third_party/dart/third_party/pkg/fixnum
   litetest:
     path: ../litetest
   meta:
     path: ../../../third_party/dart/pkg/meta
   path:
     path: ../../../third_party/dart/third_party/pkg/path
+  platform:
+    path: ../../third_party/pkg/platform
+  process:
+    path: ../../third_party/pkg/process
+  protobuf:
+    path: ../../../third_party/dart/third_party/pkg/protobuf/protobuf
   smith:
     path: ../../../third_party/dart/pkg/smith
+  skia_gold_client:
+    path: ../skia_gold_client
   sky_engine:
     path: ../../sky/packages/sky_engine
+  typed_data:
+    path: ../../../third_party/dart/third_party/pkg/typed_data
   vector_math:
-    path: ../../../third_party/pkg/vector_math
+    path: ../../third_party/pkg/vector_math
   vm_service:
     path: ../../../third_party/dart/pkg/vm_service
+  vm_service_protos:
+    path: ../../../third_party/dart/pkg/vm_service_protos
diff --git a/testing/dart/semantics_test.dart b/testing/dart/semantics_test.dart
index 15f1245dbebd23f03c7252e00478b61422e0205e..a995b4037fb871f68e15d1b89d842a93dc58c2b2 100644
--- a/testing/dart/semantics_test.dart
+++ b/testing/dart/semantics_test.dart
@@ -11,13 +11,13 @@ import 'package:litetest/litetest.dart';
 
 void main() {
   // This must match the number of flags in lib/ui/semantics.dart
-  const int numSemanticsFlags = 26;
+  const int numSemanticsFlags = 28;
   test('SemanticsFlag.values refers to all flags.', () async {
     expect(SemanticsFlag.values.length, equals(numSemanticsFlags));
     for (int index = 0; index < numSemanticsFlags; ++index) {
       final int flag = 1 << index;
-      expect(SemanticsFlag.values[flag], isNotNull);
-      expect(SemanticsFlag.values[flag].toString(), startsWith('SemanticsFlag.'));
+      expect(SemanticsFlag.fromIndex(flag), isNotNull);
+      expect(SemanticsFlag.fromIndex(flag).toString(), startsWith('SemanticsFlag.'));
     }
   });
 
@@ -27,8 +27,8 @@ void main() {
     expect(SemanticsAction.values.length, equals(numSemanticsActions));
     for (int index = 0; index < numSemanticsActions; ++index) {
       final int flag = 1 << index;
-      expect(SemanticsAction.values[flag], isNotNull);
-      expect(SemanticsAction.values[flag].toString(), startsWith('SemanticsAction.'));
+      expect(SemanticsAction.fromIndex(flag), isNotNull);
+      expect(SemanticsAction.fromIndex(flag).toString(), startsWith('SemanticsAction.'));
     }
   });
 
diff --git a/testing/dart/spawn_helper.dart b/testing/dart/spawn_helper.dart
new file mode 100644
index 0000000000000000000000000000000000000000..31d1acefd6e71daccb0f508a12a0b880a51b3678
--- /dev/null
+++ b/testing/dart/spawn_helper.dart
@@ -0,0 +1,10 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+void main() {}
+
+@pragma('vm:entry-point')
+int echoInt(int echo) {
+  return echo;
+}
diff --git a/testing/dart/spawn_test.dart b/testing/dart/spawn_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..a3f87b2a979b51544ef52907c87268b828c89b27
--- /dev/null
+++ b/testing/dart/spawn_test.dart
@@ -0,0 +1,87 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:ffi';
+import 'dart:isolate';
+import 'dart:ui';
+
+import 'package:ffi/ffi.dart';
+import 'package:litetest/litetest.dart';
+
+// This import is used in a test, but not in a way that the analyzer can understand.
+// ignore: unused_import
+import 'spawn_helper.dart';
+
+@Native<Handle Function(Pointer<Utf8>)>(symbol: 'LoadLibraryFromKernel')
+external Object _loadLibraryFromKernel(Pointer<Utf8> path);
+
+@Native<Handle Function(Pointer<Utf8>, Pointer<Utf8>)>(symbol: 'LookupEntryPoint')
+external Object _lookupEntryPoint(Pointer<Utf8> library, Pointer<Utf8> name);
+
+@Native<Void Function(Pointer<Utf8>, Pointer<Utf8>)>(symbol: 'Spawn')
+external void _spawn(Pointer<Utf8> entrypoint, Pointer<Utf8> route);
+
+void spawn({
+  required SendPort port,
+  String entrypoint = 'main',
+  String route = '/',
+}) {
+  assert(
+    entrypoint != 'main' || route != '/',
+    'Spawn should not be used to spawn main with the default route name',
+  );
+  IsolateNameServer.registerPortWithName(port, route);
+  final Pointer<Utf8> nativeEntrypoint = entrypoint.toNativeUtf8();
+  final Pointer<Utf8> nativeRoute = route.toNativeUtf8();
+  _spawn(nativeEntrypoint, nativeRoute);
+  malloc.free(nativeEntrypoint);
+  malloc.free(nativeRoute);
+}
+
+const String kTestEntrypointRouteName = 'testEntrypoint';
+
+@pragma('vm:entry-point')
+void testEntrypoint() {
+  expect(PlatformDispatcher.instance.defaultRouteName, kTestEntrypointRouteName);
+  IsolateNameServer.lookupPortByName(kTestEntrypointRouteName)!.send(null);
+}
+
+void main() {
+  const bool kReleaseMode = bool.fromEnvironment('dart.vm.product');
+  const bool kProfileMode = bool.fromEnvironment('dart.vm.profile');
+
+  test('Spawn a different entrypoint with a special route name', () async {
+    final ReceivePort port = ReceivePort();
+    spawn(port: port.sendPort, entrypoint: 'testEntrypoint', route: kTestEntrypointRouteName);
+    expect(await port.first, isNull);
+    port.close();
+  });
+
+  test('Lookup entrypoint and execute', () {
+    final Pointer<Utf8> libraryPath = 'file://${const String.fromEnvironment('kFlutterSrcDirectory')}/testing/dart/spawn_helper.dart'.toNativeUtf8();
+    final Pointer<Utf8> entryPoint = 'echoInt'.toNativeUtf8();
+    expect(
+      (_lookupEntryPoint(
+        libraryPath,
+        entryPoint,
+      ) as int Function(int))(42),
+      42,
+    );
+    malloc.free(libraryPath);
+    malloc.free(entryPoint);
+  });
+
+  test('Load from kernel', () {
+    final Pointer<Utf8> kernelPath = '${const String.fromEnvironment('kFlutterBuildDirectory')}/spawn_helper.dart.dill'.toNativeUtf8();
+    expect(
+      _loadLibraryFromKernel(kernelPath) is void Function(),
+      true,
+    );
+    malloc.free(kernelPath);
+
+    final Pointer<Utf8> fakePath = 'fake-path'.toNativeUtf8();
+    expect(_loadLibraryFromKernel(fakePath), null);
+    malloc.free(fakePath);
+  }, skip: kProfileMode || kReleaseMode); // ignore: avoid_redundant_argument_values
+}
diff --git a/testing/dart/stringification_test.dart b/testing/dart/stringification_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..4e6f25c5f0ab94bc3e4443f36b2fb642e7c08621
--- /dev/null
+++ b/testing/dart/stringification_test.dart
@@ -0,0 +1,43 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:typed_data';
+import 'dart:ui';
+
+import 'package:litetest/litetest.dart';
+
+final Uint8List imageData = Uint8List.fromList(<int>[ // Small WebP file
+  0x52, 0x49, 0x46, 0x46, 0x12, 0x00, 0x00, 0x00,  0x57, 0x45, 0x42, 0x50, 0x56, 0x50, 0x38, 0x4c, // |RIFF....WEBPVP8L|
+  0x06, 0x00, 0x00, 0x00, 0x2f, 0x41, 0x6c, 0x6f,  0x00, 0x6b,                                     // |..../Alo.k|
+]);
+
+void main() {
+  test('Stringification of native objects exposed in Dart', () async {
+    expect(SemanticsUpdateBuilder().toString(), 'SemanticsUpdateBuilder');
+    expect(SemanticsUpdateBuilder().build().toString(), 'SemanticsUpdate');
+    expect(ParagraphBuilder(ParagraphStyle()).toString(), 'ParagraphBuilder');
+    expect(ParagraphBuilder(ParagraphStyle()).build().toString(), 'Paragraph(dirty)');
+    expect((await instantiateImageCodec(imageData)).toString(), 'Codec()');
+    expect(Path().toString(), 'Path');
+    final PictureRecorder recorder = PictureRecorder();
+    expect(recorder.toString(), 'PictureRecorder(recording: false)');
+    final Canvas canvas = Canvas(recorder);
+    expect(recorder.toString(), 'PictureRecorder(recording: true)');
+    expect(canvas.toString(), 'Canvas(recording: true)');
+    final Picture picture = recorder.endRecording();
+    expect(recorder.toString(), 'PictureRecorder(recording: false)');
+    expect(canvas.toString(), 'Canvas(recording: false)');
+    expect(picture.toString(), 'Picture');
+    expect(
+      ImageDescriptor.raw(
+        await ImmutableBuffer.fromUint8List(Uint8List.fromList(<int>[0, 0, 0, 0])),
+        width: 1,
+        height: 1,
+        pixelFormat: PixelFormat.rgba8888,
+      ).toString(), 'ImageDescriptor(width: 1, height: 1, bytes per pixel: 4)',
+    );
+    expect(SceneBuilder().toString(), 'SceneBuilder');
+    expect(SceneBuilder().build().toString(), 'Scene');
+  });
+}
diff --git a/testing/dart/text_test.dart b/testing/dart/text_test.dart
index e0f9c825ecd15704e4fead62986e6f2db1b014ad..dd54059c8e0be8fc8ccad7cebb27de0bc02e84a9 100644
--- a/testing/dart/text_test.dart
+++ b/testing/dart/text_test.dart
@@ -56,10 +56,10 @@ void testParagraphStyle() {
   final ParagraphStyle ps3 = ParagraphStyle(fontWeight: FontWeight.w700, fontSize: 12.0, height: 123.0);
 
   test('ParagraphStyle toString works', () {
-    expect(ps0.toString(), equals('ParagraphStyle(textAlign: unspecified, textDirection: TextDirection.ltr, fontWeight: unspecified, fontStyle: unspecified, maxLines: unspecified, textHeightBehavior: unspecified, fontFamily: unspecified, fontSize: 14.0, height: unspecified, ellipsis: unspecified, locale: unspecified)'));
-    expect(ps1.toString(), equals('ParagraphStyle(textAlign: unspecified, textDirection: TextDirection.rtl, fontWeight: unspecified, fontStyle: unspecified, maxLines: unspecified, textHeightBehavior: unspecified, fontFamily: unspecified, fontSize: 14.0, height: unspecified, ellipsis: unspecified, locale: unspecified)'));
-    expect(ps2.toString(), equals('ParagraphStyle(textAlign: TextAlign.center, textDirection: unspecified, fontWeight: FontWeight.w800, fontStyle: unspecified, maxLines: unspecified, textHeightBehavior: unspecified, fontFamily: unspecified, fontSize: 10.0, height: 100.0x, ellipsis: unspecified, locale: unspecified)'));
-    expect(ps3.toString(), equals('ParagraphStyle(textAlign: unspecified, textDirection: unspecified, fontWeight: FontWeight.w700, fontStyle: unspecified, maxLines: unspecified, textHeightBehavior: unspecified, fontFamily: unspecified, fontSize: 12.0, height: 123.0x, ellipsis: unspecified, locale: unspecified)'));
+    expect(ps0.toString(), equals('ParagraphStyle(textAlign: unspecified, textDirection: TextDirection.ltr, fontWeight: unspecified, fontStyle: unspecified, maxLines: unspecified, textHeightBehavior: unspecified, fontFamily: unspecified, fontSize: 14.0, height: unspecified, strutStyle: unspecified, ellipsis: unspecified, locale: unspecified)'));
+    expect(ps1.toString(), equals('ParagraphStyle(textAlign: unspecified, textDirection: TextDirection.rtl, fontWeight: unspecified, fontStyle: unspecified, maxLines: unspecified, textHeightBehavior: unspecified, fontFamily: unspecified, fontSize: 14.0, height: unspecified, strutStyle: unspecified, ellipsis: unspecified, locale: unspecified)'));
+    expect(ps2.toString(), equals('ParagraphStyle(textAlign: TextAlign.center, textDirection: unspecified, fontWeight: FontWeight.w800, fontStyle: unspecified, maxLines: unspecified, textHeightBehavior: unspecified, fontFamily: unspecified, fontSize: 10.0, height: 100.0x, strutStyle: unspecified, ellipsis: unspecified, locale: unspecified)'));
+    expect(ps3.toString(), equals('ParagraphStyle(textAlign: unspecified, textDirection: unspecified, fontWeight: FontWeight.w700, fontStyle: unspecified, maxLines: unspecified, textHeightBehavior: unspecified, fontFamily: unspecified, fontSize: 12.0, height: 123.0x, strutStyle: unspecified, ellipsis: unspecified, locale: unspecified)'));
   });
 }
 
@@ -193,22 +193,33 @@ void testTextRange() {
   });
 }
 
+void testGlyphInfo() {
+  test('constructor', () {
+    const Rect testRect = Rect.fromLTWH(1, 2, 3, 4);
+    const TextRange testRange = TextRange(start: 5, end: 6);
+    const TextDirection testDirection = TextDirection.ltr;
+    final GlyphInfo info = GlyphInfo(testRect, testRange, testDirection);
+    expect(info.graphemeClusterLayoutBounds, testRect);
+    expect(info.graphemeClusterCodeUnitRange, testRange);
+    expect(info.writingDirection, testDirection);
+  });
+}
+
 void testLoadFontFromList() {
   test('loadFontFromList will send platform message after font is loaded', () async {
-    final PlatformMessageCallback? oldHandler = window.onPlatformMessage;
-    late String actualName;
     late String message;
-    window.onPlatformMessage = (String name, ByteData? data, PlatformMessageResponseCallback? callback) {
-      assert(data != null);
-      actualName = name;
-      final Uint8List list = data!.buffer.asUint8List(data.offsetInBytes, data.lengthInBytes);
-      message = utf8.decode(list);
-    };
+    channelBuffers.setListener(
+      'flutter/system',
+      (ByteData? data, PlatformMessageResponseCallback? callback) {
+        assert(data != null);
+        final Uint8List list = data!.buffer.asUint8List(data.offsetInBytes, data.lengthInBytes);
+        message = utf8.decode(list);
+      },
+    );
     final Uint8List fontData = Uint8List(0);
     await loadFontFromList(fontData, fontFamily: 'fake');
-    window.onPlatformMessage = oldHandler;
-    expect(actualName, 'flutter/system');
     expect(message, '{"type":"fontsChange"}');
+    channelBuffers.clearListener('flutter/system');
   });
 }
 
@@ -286,6 +297,26 @@ void testFontVariation() {
 
     expect(wideWidth, greaterThan(baseWidth));
   });
+
+  test('FontVariation constructors', () async {
+    expect(const FontVariation.weight(123.0).axis, 'wght');
+    expect(const FontVariation.weight(123.0).value, 123.0);
+    expect(const FontVariation.width(123.0).axis, 'wdth');
+    expect(const FontVariation.width(123.0).value, 123.0);
+    expect(const FontVariation.slant(45.0).axis, 'slnt');
+    expect(const FontVariation.slant(45.0).value, 45.0);
+    expect(const FontVariation.opticalSize(67.0).axis, 'opsz');
+    expect(const FontVariation.opticalSize(67.0).value, 67.0);
+    expect(const FontVariation.italic(0.8).axis, 'ital');
+    expect(const FontVariation.italic(0.8).value, 0.8);
+  });
+
+  test('FontVariation.lerp', () async {
+    expect(FontVariation.lerp(const FontVariation.weight(100.0), const FontVariation.weight(300.0), 0.5), const FontVariation.weight(200.0));
+    expect(FontVariation.lerp(const FontVariation.slant(0.0), const FontVariation.slant(-80.0), 0.25), const FontVariation.slant(-20.0));
+    expect(FontVariation.lerp(const FontVariation.width(90.0), const FontVariation.italic(0.2), 0.1), const FontVariation.width(90.0));
+    expect(FontVariation.lerp(const FontVariation.width(90.0), const FontVariation.italic(0.2), 0.9), const FontVariation.italic(0.2));
+  });
 }
 
 void testGetWordBoundary() {
@@ -317,6 +348,7 @@ void main() {
   testTextStyle();
   testTextHeightBehavior();
   testTextRange();
+  testGlyphInfo();
   testLoadFontFromList();
   testFontFeatureClass();
   testFontVariation();
diff --git a/testing/dart/window_test.dart b/testing/dart/window_test.dart
index 66bcefa130a2da26b72e7ac4e4d7da48eaf394a6..fc13eeb10b7cecea84ab77649def5d7b3179bd36 100644
--- a/testing/dart/window_test.dart
+++ b/testing/dart/window_test.dart
@@ -12,7 +12,7 @@ void main() {
   test('window.sendPlatformMessage preserves callback zone', () {
     runZoned(() {
       final Zone innerZone = Zone.current;
-      window.sendPlatformMessage('test', ByteData.view(Uint8List(0).buffer), expectAsync1((ByteData? data) {
+      PlatformDispatcher.instance.sendPlatformMessage('test', ByteData.view(Uint8List(0).buffer), expectAsync1((ByteData? data) {
         final Zone runZone = Zone.current;
         expect(runZone, isNotNull);
         expect(runZone, same(innerZone));
@@ -76,7 +76,31 @@ void main() {
       const Locale.fromSubtags(languageCode: 'en'),
     ];
     // The default implementation returns null due to lack of a real platform.
-    final Locale? result = window.computePlatformResolvedLocale(supportedLocales);
+    final Locale? result = PlatformDispatcher.instance.computePlatformResolvedLocale(supportedLocales);
     expect(result, null);
   });
+
+  test('Display is configured for the implicitView', () {
+    final FlutterView implicitView = PlatformDispatcher.instance.implicitView!;
+    final Display display = implicitView.display;
+
+    expect(display.id, 0);
+    expect(display.devicePixelRatio, implicitView.devicePixelRatio);
+    expect(display.refreshRate, 60);
+    expect(display.size, implicitView.physicalSize);
+  });
+
+  test('FlutterView.toString contains the viewId', () {
+    final FlutterView flutterView = PlatformDispatcher.instance.implicitView!;
+    expect(flutterView.viewId, 0);
+    expect(flutterView.toString(), 'FlutterView(id: 0)');
+  });
+
+  test('scaleFontSize is the identity function by default when textScaleFactor = 1', () {
+    expect(PlatformDispatcher.instance.scaleFontSize(0), 0.0);
+    expect(PlatformDispatcher.instance.scaleFontSize(1), 1.0);
+    expect(PlatformDispatcher.instance.scaleFontSize(2), 2.0);
+    expect(PlatformDispatcher.instance.scaleFontSize(3), 3.0);
+    expect(PlatformDispatcher.instance.scaleFontSize(3.4), 3.4);
+  });
 }
diff --git a/testing/dart_fixture.cc b/testing/dart_fixture.cc
index 9fe8a5c5b0fc9e46a74307768c7d2d68a473ba0e..7c765dcb105a5dd14690012b146d4e33a907c913 100644
--- a/testing/dart_fixture.cc
+++ b/testing/dart_fixture.cc
@@ -35,7 +35,7 @@ Settings DartFixture::CreateSettingsForFixture() {
   settings.isolate_create_callback = [this]() {
     native_resolver_->SetNativeResolverForIsolate();
   };
-  settings.enable_observatory = false;
+  settings.enable_vm_service = false;
   SetSnapshotsAndAssets(settings);
   return settings;
 }
diff --git a/testing/dart_isolate_runner.cc b/testing/dart_isolate_runner.cc
index ff034a9e72f5ba2dfa690e545326150dab2f54ef..1afbb7879695e612fc665ec86c005a76e7a3179a 100644
--- a/testing/dart_isolate_runner.cc
+++ b/testing/dart_isolate_runner.cc
@@ -72,7 +72,8 @@ std::unique_ptr<AutoIsolateShutdown> RunDartCodeInIsolateOnUITaskRunner(
     const std::vector<std::string>& args,
     const std::string& kernel_file_path,
     fml::WeakPtr<IOManager> io_manager,
-    const std::shared_ptr<VolatilePathTracker>& volatile_path_tracker) {
+    const std::shared_ptr<VolatilePathTracker>& volatile_path_tracker,
+    std::unique_ptr<PlatformConfiguration> platform_configuration) {
   FML_CHECK(task_runners.GetUITaskRunner()->RunsTasksOnCurrentThread());
 
   if (!vm_ref) {
@@ -123,12 +124,13 @@ std::unique_ptr<AutoIsolateShutdown> RunDartCodeInIsolateOnUITaskRunner(
   context.io_manager = std::move(io_manager);
   context.advisory_script_uri = "main.dart";
   context.advisory_script_entrypoint = entrypoint.c_str();
+  context.enable_impeller = p_settings.enable_impeller;
 
   auto isolate =
       DartIsolate::CreateRunningRootIsolate(
           settings,                            // settings
           vm_data->GetIsolateSnapshot(),       // isolate snapshot
-          nullptr,                             // platform configuration
+          std::move(platform_configuration),   // platform configuration
           DartIsolate::Flags{},                // flags
           nullptr,                             // root isolate create callback
           settings.isolate_create_callback,    // isolate create callback
@@ -158,14 +160,16 @@ std::unique_ptr<AutoIsolateShutdown> RunDartCodeInIsolate(
     const std::vector<std::string>& args,
     const std::string& kernel_file_path,
     fml::WeakPtr<IOManager> io_manager,
-    std::shared_ptr<VolatilePathTracker> volatile_path_tracker) {
+    std::shared_ptr<VolatilePathTracker> volatile_path_tracker,
+    std::unique_ptr<PlatformConfiguration> platform_configuration) {
   std::unique_ptr<AutoIsolateShutdown> result;
   fml::AutoResetWaitableEvent latch;
   fml::TaskRunner::RunNowOrPostTask(
       task_runners.GetUITaskRunner(), fml::MakeCopyable([&]() mutable {
         result = RunDartCodeInIsolateOnUITaskRunner(
             vm_ref, settings, task_runners, entrypoint, args, kernel_file_path,
-            io_manager, volatile_path_tracker);
+            io_manager, volatile_path_tracker,
+            std::move(platform_configuration));
         latch.Signal();
       }));
   latch.Wait();
diff --git a/testing/dart_isolate_runner.h b/testing/dart_isolate_runner.h
index ec1d477e83bbc9e58a1138919d9aa8ebe604ef65..25a0702ef0e3a737f313bb7a706e3fbd091e3f21 100644
--- a/testing/dart_isolate_runner.h
+++ b/testing/dart_isolate_runner.h
@@ -54,7 +54,8 @@ void RunDartCodeInIsolate(
     const std::vector<std::string>& args,
     const std::string& fixtures_path,
     fml::WeakPtr<IOManager> io_manager = {},
-    std::shared_ptr<VolatilePathTracker> volatile_path_tracker = nullptr);
+    std::shared_ptr<VolatilePathTracker> volatile_path_tracker = nullptr,
+    std::unique_ptr<PlatformConfiguration> platform_configuration = nullptr);
 
 std::unique_ptr<AutoIsolateShutdown> RunDartCodeInIsolate(
     DartVMRef& vm_ref,
@@ -64,7 +65,8 @@ std::unique_ptr<AutoIsolateShutdown> RunDartCodeInIsolate(
     const std::vector<std::string>& args,
     const std::string& fixtures_path,
     fml::WeakPtr<IOManager> io_manager = {},
-    std::shared_ptr<VolatilePathTracker> volatile_path_tracker = nullptr);
+    std::shared_ptr<VolatilePathTracker> volatile_path_tracker = nullptr,
+    std::unique_ptr<PlatformConfiguration> platform_configuration = nullptr);
 
 }  // namespace testing
 }  // namespace flutter
diff --git a/testing/display_list_testing.cc b/testing/display_list_testing.cc
index 007cd71971481f288b73dd9612c061982d6e616a..03a37553ac84f12598bb7d95c9448a0d9fb3cf53 100644
--- a/testing/display_list_testing.cc
+++ b/testing/display_list_testing.cc
@@ -46,6 +46,36 @@ std::ostream& operator<<(std::ostream& os,
   return os;
 }
 
+std::ostream& operator<<(std::ostream& os, const DlPaint& paint) {
+  os << "DlPaint("
+     << "isaa: " << paint.isAntiAlias() << ", "
+     << paint.getColor() << ", "
+     << paint.getBlendMode() << ", "
+     << paint.getDrawStyle();
+  if (paint.getDrawStyle() != DlDrawStyle::kFill) {
+    os << ", width: " << paint.getStrokeWidth()
+       << ", miter: " << paint.getStrokeMiter()
+       << ", " << paint.getStrokeCap()
+       << ", " << paint.getStrokeJoin();
+  }
+  if (paint.getColorSource()) {
+    os << ", " << paint.getColorSource();
+  }
+  if (paint.getColorFilter()) {
+    os << ", " << paint.getColorFilter();
+  }
+  if (paint.getImageFilter()) {
+    os << ", " << paint.getImageFilter();
+  }
+  if (paint.getMaskFilter()) {
+    os << ", " << paint.getMaskFilter();
+  }
+  if (paint.isInvertColors()) {
+    os << ", invertColors: " << paint.isInvertColors();
+  }
+  return os << ")";
+}
+
 std::ostream& operator<<(std::ostream& os, const DlBlendMode& mode) {
   switch (mode) {
     case DlBlendMode::kClear:      return os << "BlendMode::kClear";
@@ -160,68 +190,64 @@ static std::ostream& operator<<(std::ostream& os, const SkRSXform& xform) {
             << "ty: " << xform.fTy << ")";
 }
 
-static std::ostream& operator<<(std::ostream& os, const SkClipOp& op) {
+std::ostream& operator<<(std::ostream& os, const DlCanvas::ClipOp& op) {
   switch (op) {
-    case SkClipOp::kDifference: return os << "ClipOp::kDifference";
-    case SkClipOp::kIntersect:  return os << "ClipOp::kIntersect";
+    case DlCanvas::ClipOp::kDifference: return os << "ClipOp::kDifference";
+    case DlCanvas::ClipOp::kIntersect:  return os << "ClipOp::kIntersect";
+  }
+}
 
-    default: return os << "ClipOp::????";
+std::ostream& operator<<(std::ostream& os, const DlCanvas::SrcRectConstraint& constraint) {
+  switch (constraint) {
+    case DlCanvas::SrcRectConstraint::kFast:
+      return os << "SrcRectConstraint::kFast";
+    case DlCanvas::SrcRectConstraint::kStrict:
+      return os << "SrcRectConstraint::kStrict";
   }
 }
 
-static std::ostream& operator<<(std::ostream& os, const DlStrokeCap& cap) {
+std::ostream& operator<<(std::ostream& os, const DlStrokeCap& cap) {
   switch (cap) {
     case DlStrokeCap::kButt:   return os << "Cap::kButt";
     case DlStrokeCap::kRound:  return os << "Cap::kRound";
     case DlStrokeCap::kSquare: return os << "Cap::kSquare";
-
-    default: return os << "Cap::????";
   }
 }
 
-static std::ostream& operator<<(std::ostream& os, const DlStrokeJoin& join) {
+std::ostream& operator<<(std::ostream& os, const DlStrokeJoin& join) {
   switch (join) {
     case DlStrokeJoin::kMiter: return os << "Join::kMiter";
     case DlStrokeJoin::kRound: return os << "Join::kRound";
     case DlStrokeJoin::kBevel: return os << "Join::kBevel";
-
-    default: return os << "Join::????";
   }
 }
 
-static std::ostream& operator<<(std::ostream& os, const DlDrawStyle& style) {
+std::ostream& operator<<(std::ostream& os, const DlDrawStyle& style) {
   switch (style) {
     case DlDrawStyle::kFill:          return os << "Style::kFill";
     case DlDrawStyle::kStroke:        return os << "Style::kStroke";
     case DlDrawStyle::kStrokeAndFill: return os << "Style::kStrokeAnFill";
-
-    default: return os << "Style::????";
   }
 }
 
-static std::ostream& operator<<(std::ostream& os, const SkBlurStyle& style) {
+std::ostream& operator<<(std::ostream& os, const DlBlurStyle& style) {
   switch (style) {
-    case kNormal_SkBlurStyle: return os << "BlurStyle::kNormal";
-    case kSolid_SkBlurStyle:  return os << "BlurStyle::kSolid";
-    case kOuter_SkBlurStyle:  return os << "BlurStyle::kOuter";
-    case kInner_SkBlurStyle:  return os << "BlurStyle::kInner";
-
-    default: return os << "Style::????";
+    case DlBlurStyle::kNormal: return os << "BlurStyle::kNormal";
+    case DlBlurStyle::kSolid:  return os << "BlurStyle::kSolid";
+    case DlBlurStyle::kOuter:  return os << "BlurStyle::kOuter";
+    case DlBlurStyle::kInner:  return os << "BlurStyle::kInner";
   }
 }
 
-static std::ostream& operator<<(std::ostream& os,
-                                const SkCanvas::PointMode& mode) {
+std::ostream& operator<<(std::ostream& os, const DlCanvas::PointMode& mode) {
   switch (mode) {
-    case SkCanvas::kPoints_PointMode:  return os << "PointMode::kPoints";
-    case SkCanvas::kLines_PointMode:   return os << "PointMode::kLines";
-    case SkCanvas::kPolygon_PointMode: return os << "PointMode::kPolygon";
-
-    default: return os << "PointMode::????";
+    case DlCanvas::PointMode::kPoints:  return os << "PointMode::kPoints";
+    case DlCanvas::PointMode::kLines:   return os << "PointMode::kLines";
+    case DlCanvas::PointMode::kPolygon: return os << "PointMode::kPolygon";
   }
 }
 
-static std::ostream& operator<<(std::ostream& os, const DlFilterMode& mode) {
+std::ostream& operator<<(std::ostream& os, const DlFilterMode& mode) {
   switch (mode) {
     case DlFilterMode::kNearest: return os << "FilterMode::kNearest";
     case DlFilterMode::kLinear:  return os << "FilterMode::kLinear";
@@ -230,12 +256,11 @@ static std::ostream& operator<<(std::ostream& os, const DlFilterMode& mode) {
   }
 }
 
-static std::ostream& operator<<(std::ostream& os, const DlColor& color) {
-  return os << "DlColor(" << std::hex << color.argb << std::dec << ")";
+std::ostream& operator<<(std::ostream& os, const DlColor& color) {
+  return os << "DlColor(" << std::hex << color.argb() << std::dec << ")";
 }
 
-static std::ostream& operator<<(std::ostream& os,
-                                DlImageSampling sampling) {
+std::ostream& operator<<(std::ostream& os, DlImageSampling sampling) {
   switch (sampling) {
     case DlImageSampling::kNearestNeighbor: {
       return os << "NearestSampling";
@@ -259,7 +284,18 @@ static std::ostream& operator<<(std::ostream& os, const SkTextBlob* blob) {
   return os << "&SkTextBlob(ID: " << blob->uniqueID() << ", " << blob->bounds() << ")";
 }
 
-static std::ostream& operator<<(std::ostream& os, const DlVertexMode& mode) {
+static std::ostream& operator<<(std::ostream& os,
+                                const impeller::TextFrame* frame) {
+  if (frame == nullptr) {
+    return os << "no text";
+  }
+  auto bounds = frame->GetBounds();
+  return os << "&TextFrame("
+            << bounds.GetLeft() << ", " << bounds.GetTop() << " => "
+            << bounds.GetRight() << ", " << bounds.GetBottom() << ")";
+}
+
+std::ostream& operator<<(std::ostream& os, const DlVertexMode& mode) {
   switch (mode) {
     case DlVertexMode::kTriangles:     return os << "VertexMode::kTriangles";
     case DlVertexMode::kTriangleStrip: return os << "VertexMode::kTriangleStrip";
@@ -269,7 +305,7 @@ static std::ostream& operator<<(std::ostream& os, const DlVertexMode& mode) {
   }
 }
 
-static std::ostream& operator<<(std::ostream& os, const DlTileMode& mode) {
+std::ostream& operator<<(std::ostream& os, const DlTileMode& mode) {
   switch (mode) {
     case DlTileMode::kClamp: return os << "TileMode::kClamp";
     case DlTileMode::kRepeat: return os << "TileMode::kRepeat";
@@ -280,7 +316,7 @@ static std::ostream& operator<<(std::ostream& os, const DlTileMode& mode) {
   }
 }
 
-static std::ostream& operator<<(std::ostream& os, const DlImage* image) {
+std::ostream& operator<<(std::ostream& os, const DlImage* image) {
   if (image == nullptr) {
     return os << "null image";
   }
@@ -323,10 +359,7 @@ std::ostream& DisplayListStreamDispatcher::out_array(std::string name,  // NOLIN
 void DisplayListStreamDispatcher::setAntiAlias(bool aa) {
   startl() << "setAntiAlias(" << aa << ");" << std::endl;
 }
-void DisplayListStreamDispatcher::setDither(bool dither) {
-  startl() << "setDither(" << dither << ");" << std::endl;
-}
-void DisplayListStreamDispatcher::setStyle(DlDrawStyle style) {
+void DisplayListStreamDispatcher::setDrawStyle(DlDrawStyle style) {
   startl() << "setStyle(" << style << ");" << std::endl;
 }
 void DisplayListStreamDispatcher::setColor(DlColor color) {
@@ -416,7 +449,7 @@ void DisplayListStreamDispatcher::setColorSource(const DlColorSource* source) {
       break;
     }
     default:
-      os_ << "DlUnknownColorSource(" << source->skia_object().get() << ")";
+      os_ << "?DlUnknownColorSource?()";
       break;
   }
   os_ << ");" << std::endl;
@@ -458,7 +491,7 @@ void DisplayListStreamDispatcher::out(const DlColorFilter& filter) {
       break;
     }
     default:
-      os_ << "DlUnknownColorFilter(" << filter.skia_object().get() << ")";
+      os_ << "?DlUnknownColorFilter?()";
       break;
   }
 }
@@ -481,9 +514,6 @@ void DisplayListStreamDispatcher::setInvertColors(bool invert) {
 void DisplayListStreamDispatcher::setBlendMode(DlBlendMode mode) {
   startl() << "setBlendMode(" << mode << ");" << std::endl;
 }
-void DisplayListStreamDispatcher::setBlender(sk_sp<SkBlender> blender) {
-  startl() << "setBlender(" << blender << ");" << std::endl;
-}
 void DisplayListStreamDispatcher::setPathEffect(const DlPathEffect* effect) {
   startl() << "setPathEffect(" << effect << ");" << std::endl;
 }
@@ -501,7 +531,7 @@ void DisplayListStreamDispatcher::setMaskFilter(const DlMaskFilter* filter) {
       break;
     }
     default:
-      os_ << "DlUnknownMaskFilter(" << filter->skia_object().get() << ")";
+      os_ << "?DlUnknownMaskFilter?()";
       break;
   }
   os_ << ");" << std::endl;
@@ -534,17 +564,21 @@ void DisplayListStreamDispatcher::out(const DlImageFilter& filter) {
       os_ << "DlMatrixImageFilter(" << matrix->matrix() << ", " << matrix->sampling() << ")";
       break;
     }
-    case DlImageFilterType::kComposeFilter: {
+    case DlImageFilterType::kCompose: {
       const DlComposeImageFilter* compose = filter.asCompose();
       FML_DCHECK(compose);
       os_ << "DlComposeImageFilter(" << std::endl;
       indent();
       startl() << "outer: ";
+      indent(7);
       out(compose->outer().get());
       os_ << "," << std::endl;
+      outdent(7);
       startl() << "inner: ";
+      indent(7);
       out(compose->inner().get());
-      os_ << "," << std::endl;
+      os_ << std::endl;
+      outdent(7);
       outdent();
       startl() << ")";
       break;
@@ -557,9 +591,19 @@ void DisplayListStreamDispatcher::out(const DlImageFilter& filter) {
       os_ << ")";
       break;
     }
-    default:
-      os_ << "DlUnknownImageFilter(" << filter.skia_object().get() << ")";
+    case DlImageFilterType::kLocalMatrix: {
+      const DlLocalMatrixImageFilter* local_matrix = filter.asLocalMatrix();
+      FML_DCHECK(local_matrix);
+      os_ << "DlLocalMatrixImageFilter(" << local_matrix->matrix();
+      os_ << "," << std::endl;
+      indent(25);
+      startl() << "filter: ";
+      out(local_matrix->image_filter().get());
+      os_ << std::endl;
+      outdent(25);
+      startl() << ")";
       break;
+    }
   }
 }
 void DisplayListStreamDispatcher::out(const DlImageFilter* filter) {
@@ -567,12 +611,16 @@ void DisplayListStreamDispatcher::out(const DlImageFilter* filter) {
     os_ << "no ImageFilter";
   } else {
     os_ << "&";
+    indent(1);
     out(*filter);
+    outdent(1);
   }
 }
 void DisplayListStreamDispatcher::setImageFilter(const DlImageFilter* filter) {
   startl() << "setImageFilter(";
+  indent(15);
   out(filter);
+  outdent(15);
   os_ << ");" << std::endl;
 }
 void DisplayListStreamDispatcher::save() {
@@ -580,7 +628,7 @@ void DisplayListStreamDispatcher::save() {
   startl() << "{" << std::endl;
   indent();
 }
-void DisplayListStreamDispatcher::saveLayer(const SkRect* bounds,
+void DisplayListStreamDispatcher::saveLayer(const SkRect& bounds,
                                             const SaveLayerOptions options,
                                             const DlImageFilter* backdrop) {
   startl() << "saveLayer(" << bounds << ", " << options;
@@ -659,7 +707,7 @@ void DisplayListStreamDispatcher::transformReset() {
   startl() << "transformReset();" << std::endl;
 }
 
-void DisplayListStreamDispatcher::clipRect(const SkRect& rect, SkClipOp clip_op,
+void DisplayListStreamDispatcher::clipRect(const SkRect& rect, ClipOp clip_op,
                                            bool is_aa) {
   startl() << "clipRect("
            << rect << ", "
@@ -668,7 +716,7 @@ void DisplayListStreamDispatcher::clipRect(const SkRect& rect, SkClipOp clip_op,
            << ");" << std::endl;
 }
 void DisplayListStreamDispatcher::clipRRect(const SkRRect& rrect,
-                         SkClipOp clip_op,
+                         ClipOp clip_op,
                          bool is_aa) {
   startl() << "clipRRect("
            << rrect << ", "
@@ -676,7 +724,7 @@ void DisplayListStreamDispatcher::clipRRect(const SkRRect& rrect,
            << "isaa: " << is_aa
            << ");" << std::endl;
 }
-void DisplayListStreamDispatcher::clipPath(const SkPath& path, SkClipOp clip_op,
+void DisplayListStreamDispatcher::clipPath(const SkPath& path, ClipOp clip_op,
                                            bool is_aa) {
   startl() << "clipPath("
            << path << ", "
@@ -730,17 +778,13 @@ void DisplayListStreamDispatcher::drawArc(const SkRect& oval_bounds,
            << "use_center: " << use_center
            << ");" << std::endl;
 }
-void DisplayListStreamDispatcher::drawPoints(SkCanvas::PointMode mode,
+void DisplayListStreamDispatcher::drawPoints(PointMode mode,
                                              uint32_t count,
                                              const SkPoint points[]) {
   startl() << "drawPoints(" << mode << ", ";
                           out_array("points", count, points)
            << ");" << std::endl;
 }
-void DisplayListStreamDispatcher::drawSkVertices(const sk_sp<SkVertices> vertices,
-                                                 SkBlendMode mode) {
-  startl() << "drawSkVertices(" << vertices << ", " << static_cast<int>(mode) << ");" << std::endl;
-}
 void DisplayListStreamDispatcher::drawVertices(const DlVertices* vertices,
                                                DlBlendMode mode) {
   startl() << "drawVertices("
@@ -767,7 +811,7 @@ void DisplayListStreamDispatcher::drawImageRect(const sk_sp<DlImage> image,
                                                 const SkRect& dst,
                                                 DlImageSampling sampling,
                                                 bool render_with_attributes,
-                                                SkCanvas::SrcRectConstraint constraint) {
+                                                SrcRectConstraint constraint) {
   startl() << "drawImageRect(" << image.get() << "," << std::endl;
   startl() << "              src: " << src << "," << std::endl;
   startl() << "              dst: " << dst << "," << std::endl;
@@ -788,13 +832,6 @@ void DisplayListStreamDispatcher::drawImageNine(const sk_sp<DlImage> image,
                                << "with attributes: " << render_with_attributes
            << ");" << std::endl;
 }
-void DisplayListStreamDispatcher::drawImageLattice(const sk_sp<DlImage> image,
-                                                   const SkCanvas::Lattice& lattice,
-                                                   const SkRect& dst,
-                                                   DlFilterMode filter,
-                                                   bool render_with_attributes) {
-  startl() << "drawImageLattice(blah blah);" << std::endl;
-}
 void DisplayListStreamDispatcher::drawAtlas(const sk_sp<DlImage> atlas,
                                             const SkRSXform xform[],
                                             const SkRect tex[],
@@ -812,18 +849,13 @@ void DisplayListStreamDispatcher::drawAtlas(const sk_sp<DlImage> atlas,
                    << "with attributes: " << render_with_attributes
            << ");" << std::endl;
 }
-void DisplayListStreamDispatcher::drawPicture(const sk_sp<SkPicture> picture,
-                                              const SkMatrix* matrix,
-                                              bool render_with_attributes) {
-  startl() << "drawPicture("
-           << "SkPicture(ID: " << picture->uniqueID() << ", bounds: " << picture->cullRect() << ", @" << picture << "), "
-           << matrix << ", "
-           << render_with_attributes
-           << ");" << std::endl;
-}
 void DisplayListStreamDispatcher::drawDisplayList(
-    const sk_sp<DisplayList> display_list) {
-  startl() << "drawDisplayList(ID: " << display_list->unique_id() << ", bounds: " << display_list->bounds() << ");" << std::endl;
+    const sk_sp<DisplayList> display_list, SkScalar opacity) {
+  startl() << "drawDisplayList("
+           << "ID: " << display_list->unique_id() << ", "
+           << "bounds: " << display_list->bounds() << ", "
+           << "opacity: " << opacity
+           << ");" << std::endl;
 }
 void DisplayListStreamDispatcher::drawTextBlob(const sk_sp<SkTextBlob> blob,
                                                SkScalar x,
@@ -832,6 +864,16 @@ void DisplayListStreamDispatcher::drawTextBlob(const sk_sp<SkTextBlob> blob,
            << blob.get() << ", "
            << x << ", " << y << ");" << std::endl;
 }
+
+void DisplayListStreamDispatcher::drawTextFrame(
+    const std::shared_ptr<impeller::TextFrame>& text_frame,
+    SkScalar x,
+    SkScalar y) {
+  startl() << "drawTextFrame("
+    << text_frame.get() << ", "
+    << x << ", " << y << ");" << std::endl;
+}
+
 void DisplayListStreamDispatcher::drawShadow(const SkPath& path,
                                              const DlColor color,
                                              const SkScalar elevation,
diff --git a/testing/display_list_testing.h b/testing/display_list_testing.h
index d9e46c15351c0b5d0ebfae8360acf64a9fe0e80b..74bc2826228a8357cc799f73b09bec4ca07637fd 100644
--- a/testing/display_list_testing.h
+++ b/testing/display_list_testing.h
@@ -2,14 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef TESTING_DISPLAY_LIST_TESTING_H_
-#define TESTING_DISPLAY_LIST_TESTING_H_
+#ifndef FLUTTER_TESTING_DISPLAY_LIST_TESTING_H_
+#define FLUTTER_TESTING_DISPLAY_LIST_TESTING_H_
 
 #include <ostream>
 
 #include "flutter/display_list/display_list.h"
-#include "flutter/display_list/display_list_dispatcher.h"
-#include "flutter/display_list/display_list_path_effect.h"
+#include "flutter/display_list/dl_op_receiver.h"
 
 namespace flutter {
 namespace testing {
@@ -18,32 +17,48 @@ bool DisplayListsEQ_Verbose(const DisplayList* a, const DisplayList* b);
 bool inline DisplayListsEQ_Verbose(const DisplayList& a, const DisplayList& b) {
   return DisplayListsEQ_Verbose(&a, &b);
 }
-bool inline DisplayListsEQ_Verbose(sk_sp<const DisplayList> a,
-                                   sk_sp<const DisplayList> b) {
+bool inline DisplayListsEQ_Verbose(const sk_sp<const DisplayList>& a,
+                                   const sk_sp<const DisplayList>& b) {
   return DisplayListsEQ_Verbose(a.get(), b.get());
 }
 bool DisplayListsNE_Verbose(const DisplayList* a, const DisplayList* b);
 bool inline DisplayListsNE_Verbose(const DisplayList& a, const DisplayList& b) {
   return DisplayListsNE_Verbose(&a, &b);
 }
-bool inline DisplayListsNE_Verbose(sk_sp<const DisplayList> a,
-                                   sk_sp<const DisplayList> b) {
+bool inline DisplayListsNE_Verbose(const sk_sp<const DisplayList>& a,
+                                   const sk_sp<const DisplayList>& b) {
   return DisplayListsNE_Verbose(a.get(), b.get());
 }
 
 extern std::ostream& operator<<(std::ostream& os,
                                 const DisplayList& display_list);
-
-class DisplayListStreamDispatcher final : public Dispatcher {
+extern std::ostream& operator<<(std::ostream& os, const DlPaint& paint);
+extern std::ostream& operator<<(std::ostream& os, const DlBlendMode& mode);
+extern std::ostream& operator<<(std::ostream& os, const DlCanvas::ClipOp& op);
+extern std::ostream& operator<<(std::ostream& os,
+                                const DlCanvas::PointMode& op);
+extern std::ostream& operator<<(std::ostream& os,
+                                const DlCanvas::SrcRectConstraint& op);
+extern std::ostream& operator<<(std::ostream& os, const DlStrokeCap& cap);
+extern std::ostream& operator<<(std::ostream& os, const DlStrokeJoin& join);
+extern std::ostream& operator<<(std::ostream& os, const DlDrawStyle& style);
+extern std::ostream& operator<<(std::ostream& os, const DlBlurStyle& style);
+extern std::ostream& operator<<(std::ostream& os, const DlFilterMode& mode);
+extern std::ostream& operator<<(std::ostream& os, const DlColor& color);
+extern std::ostream& operator<<(std::ostream& os, DlImageSampling sampling);
+extern std::ostream& operator<<(std::ostream& os, const DlVertexMode& mode);
+extern std::ostream& operator<<(std::ostream& os, const DlTileMode& mode);
+extern std::ostream& operator<<(std::ostream& os, const DlImage* image);
+
+class DisplayListStreamDispatcher final : public DlOpReceiver {
  public:
-  DisplayListStreamDispatcher(std::ostream& os,
-                              int cur_indent = 2,
-                              int indent = 2)
+  explicit DisplayListStreamDispatcher(std::ostream& os,
+                                       int cur_indent = 2,
+                                       int indent = 2)
       : os_(os), cur_indent_(cur_indent), indent_(indent) {}
 
   void setAntiAlias(bool aa) override;
-  void setDither(bool dither) override;
-  void setStyle(DlDrawStyle style) override;
+  void setDrawStyle(DlDrawStyle style) override;
   void setColor(DlColor color) override;
   void setStrokeWidth(SkScalar width) override;
   void setStrokeMiter(SkScalar limit) override;
@@ -53,13 +68,12 @@ class DisplayListStreamDispatcher final : public Dispatcher {
   void setColorFilter(const DlColorFilter* filter) override;
   void setInvertColors(bool invert) override;
   void setBlendMode(DlBlendMode mode) override;
-  void setBlender(sk_sp<SkBlender> blender) override;
   void setPathEffect(const DlPathEffect* effect) override;
   void setMaskFilter(const DlMaskFilter* filter) override;
   void setImageFilter(const DlImageFilter* filter) override;
 
   void save() override;
-  void saveLayer(const SkRect* bounds,
+  void saveLayer(const SkRect& bounds,
                  const SaveLayerOptions options,
                  const DlImageFilter* backdrop) override;
   void restore() override;
@@ -79,9 +93,9 @@ class DisplayListStreamDispatcher final : public Dispatcher {
   // clang-format on
   void transformReset() override;
 
-  void clipRect(const SkRect& rect, SkClipOp clip_op, bool is_aa) override;
-  void clipRRect(const SkRRect& rrect, SkClipOp clip_op, bool is_aa) override;
-  void clipPath(const SkPath& path, SkClipOp clip_op, bool is_aa) override;
+  void clipRect(const SkRect& rect, ClipOp clip_op, bool is_aa) override;
+  void clipRRect(const SkRRect& rrect, ClipOp clip_op, bool is_aa) override;
+  void clipPath(const SkPath& path, ClipOp clip_op, bool is_aa) override;
 
   void drawColor(DlColor color, DlBlendMode mode) override;
   void drawPaint() override;
@@ -96,11 +110,9 @@ class DisplayListStreamDispatcher final : public Dispatcher {
                SkScalar start_degrees,
                SkScalar sweep_degrees,
                bool use_center) override;
-  void drawPoints(SkCanvas::PointMode mode,
+  void drawPoints(PointMode mode,
                   uint32_t count,
                   const SkPoint points[]) override;
-  void drawSkVertices(const sk_sp<SkVertices> vertices,
-                      SkBlendMode mode) override;
   void drawVertices(const DlVertices* vertices, DlBlendMode mode) override;
   void drawImage(const sk_sp<DlImage> image,
                  const SkPoint point,
@@ -111,17 +123,12 @@ class DisplayListStreamDispatcher final : public Dispatcher {
                      const SkRect& dst,
                      DlImageSampling sampling,
                      bool render_with_attributes,
-                     SkCanvas::SrcRectConstraint constraint) override;
+                     SrcRectConstraint constraint) override;
   void drawImageNine(const sk_sp<DlImage> image,
                      const SkIRect& center,
                      const SkRect& dst,
                      DlFilterMode filter,
                      bool render_with_attributes) override;
-  void drawImageLattice(const sk_sp<DlImage> image,
-                        const SkCanvas::Lattice& lattice,
-                        const SkRect& dst,
-                        DlFilterMode filter,
-                        bool render_with_attributes) override;
   void drawAtlas(const sk_sp<DlImage> atlas,
                  const SkRSXform xform[],
                  const SkRect tex[],
@@ -131,13 +138,14 @@ class DisplayListStreamDispatcher final : public Dispatcher {
                  DlImageSampling sampling,
                  const SkRect* cull_rect,
                  bool render_with_attributes) override;
-  void drawPicture(const sk_sp<SkPicture> picture,
-                   const SkMatrix* matrix,
-                   bool render_with_attributes) override;
-  void drawDisplayList(const sk_sp<DisplayList> display_list) override;
+  void drawDisplayList(const sk_sp<DisplayList> display_list,
+                       SkScalar opacity) override;
   void drawTextBlob(const sk_sp<SkTextBlob> blob,
                     SkScalar x,
                     SkScalar y) override;
+  void drawTextFrame(const std::shared_ptr<impeller::TextFrame>& text_frame,
+                     SkScalar x,
+                     SkScalar y) override;
   void drawShadow(const SkPath& path,
                   const DlColor color,
                   const SkScalar elevation,
@@ -168,4 +176,4 @@ class DisplayListStreamDispatcher final : public Dispatcher {
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // TESTING_DISPLAY_LIST_TESTING_H_
+#endif  // FLUTTER_TESTING_DISPLAY_LIST_TESTING_H_
diff --git a/testing/elf_loader.cc b/testing/elf_loader.cc
index 2c7a989dbb34f36dfba8bb0a47115fbb064e3e94..d420d841d94b8369ea7389142839238481621d32 100644
--- a/testing/elf_loader.cc
+++ b/testing/elf_loader.cc
@@ -30,14 +30,15 @@ ELFAOTSymbols LoadELFSymbolFromFixturesIfNeccessary(std::string elf_filename) {
 
   ELFAOTSymbols symbols;
 
-  // Must not be freed.
-  const char* error = nullptr;
-
 #if OS_FUCHSIA
   // TODO(gw280): https://github.com/flutter/flutter/issues/50285
   // Dart doesn't implement Dart_LoadELF on Fuchsia
-  auto loaded_elf = nullptr;
+  FML_LOG(ERROR) << "Dart doesn't implement Dart_LoadELF on Fuchsia";
+  return {};
 #else
+  // Must not be freed.
+  const char* error = nullptr;
+
   auto loaded_elf =
       Dart_LoadELF(elf_path.c_str(),             // file path
                    0,                            // file offset
@@ -47,7 +48,6 @@ ELFAOTSymbols LoadELFSymbolFromFixturesIfNeccessary(std::string elf_filename) {
                    &symbols.vm_isolate_data,     // vm isolate data (out)
                    &symbols.vm_isolate_instrs    // vm isolate instr (out)
       );
-#endif
 
   if (loaded_elf == nullptr) {
     FML_LOG(ERROR)
@@ -60,6 +60,7 @@ ELFAOTSymbols LoadELFSymbolFromFixturesIfNeccessary(std::string elf_filename) {
   symbols.loaded_elf.reset(loaded_elf);
 
   return symbols;
+#endif  // OS_FUCHSIA
 }
 
 ELFAOTSymbols LoadELFSplitSymbolFromFixturesIfNeccessary(
@@ -79,14 +80,15 @@ ELFAOTSymbols LoadELFSplitSymbolFromFixturesIfNeccessary(
 
   ELFAOTSymbols symbols;
 
-  // Must not be freed.
-  const char* error = nullptr;
-
 #if OS_FUCHSIA
   // TODO(gw280): https://github.com/flutter/flutter/issues/50285
   // Dart doesn't implement Dart_LoadELF on Fuchsia
-  auto loaded_elf = nullptr;
+  FML_LOG(ERROR) << "Dart doesn't implement Dart_LoadELF on Fuchsia";
+  return {};
 #else
+  // Must not be freed.
+  const char* error = nullptr;
+
   auto loaded_elf =
       Dart_LoadELF(elf_path.c_str(),             // file path
                    0,                            // file offset
@@ -96,7 +98,6 @@ ELFAOTSymbols LoadELFSplitSymbolFromFixturesIfNeccessary(
                    &symbols.vm_isolate_data,     // vm isolate data (out)
                    &symbols.vm_isolate_instrs    // vm isolate instr (out)
       );
-#endif
 
   if (loaded_elf == nullptr) {
     FML_LOG(ERROR)
@@ -109,6 +110,7 @@ ELFAOTSymbols LoadELFSplitSymbolFromFixturesIfNeccessary(
   symbols.loaded_elf.reset(loaded_elf);
 
   return symbols;
+#endif
 }
 
 bool PrepareSettingsForAOTWithSymbols(Settings& settings,
diff --git a/testing/fuchsia/meta/test_suite.cml b/testing/fuchsia/meta/test_suite.cml
index b1e5f3cf761b32048b2b6697782db3ef1f30707d..39bcd4ad6f22a89ac5f69b7e7a1e7622cbf9f2ed 100644
--- a/testing/fuchsia/meta/test_suite.cml
+++ b/testing/fuchsia/meta/test_suite.cml
@@ -1,4 +1,7 @@
 {
+    include: [
+         "sys/component/realm_builder_absolute.shard.cml",
+    ],
     facets: {
         // shell_unittests and embedder_unittests require vulkan to function.
         "fuchsia.test": { type: "vulkan" },
diff --git a/testing/fuchsia/run_tests.py b/testing/fuchsia/run_tests.py
new file mode 100755
index 0000000000000000000000000000000000000000..f7155e5563cc07ef2cc0717b507b785e9167cde5
--- /dev/null
+++ b/testing/fuchsia/run_tests.py
@@ -0,0 +1,151 @@
+#!/usr/bin/env vpython3
+
+# [VPYTHON:BEGIN]
+# python_version: "3.8"
+# wheel <
+#   name: "infra/python/wheels/pyyaml/${platform}_${py_python}_${py_abi}"
+#   version: "version:5.4.1.chromium.1"
+# >
+# [VPYTHON:END]
+
+# Copyright (c) 2013, the Flutter project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be found
+# in the LICENSE file.
+
+import argparse
+import logging
+import os
+import sys
+
+from subprocess import CompletedProcess
+from typing import Any, Iterable, List, Mapping, NamedTuple, Set
+
+# The import is coming from vpython wheel and pylint cannot find it.
+import yaml  # pylint: disable=import-error
+
+# The imports are coming from fuchsia/test_scripts and pylint cannot find them
+# without setting a global init-hook which is less favorable.
+# But this file will be executed as part of the CI, its correctness of importing
+# is guaranteed.
+
+sys.path.insert(
+    0, os.path.join(os.path.dirname(__file__), '../../tools/fuchsia/test_scripts/test/')
+)
+
+# pylint: disable=import-error, wrong-import-position
+import run_test
+from common import DIR_SRC_ROOT
+from run_executable_test import ExecutableTestRunner
+from test_runner import TestRunner
+
+if len(sys.argv) == 2:
+  VARIANT = sys.argv[1]
+  sys.argv.pop()
+elif len(sys.argv) == 1:
+  VARIANT = 'fuchsia_debug_x64'
+else:
+  assert False, 'Expect only one parameter as the compile output directory.'
+OUT_DIR = os.path.join(DIR_SRC_ROOT, 'out', VARIANT)
+
+
+# Visible for testing
+class TestCase(NamedTuple):
+  package: str
+  args: str = ''
+
+
+class _BundledTestRunner(TestRunner):
+
+  # private, use bundled_test_runner_of function instead.
+  def __init__(self, target_id: str, package_deps: Set[str], tests: List[TestCase], logs_dir: str):
+    super().__init__(OUT_DIR, [], None, target_id, list(package_deps))
+    self.tests = tests
+    self.logs_dir = logs_dir
+
+  def run_test(self) -> CompletedProcess:
+    returncode = 0
+    for test in self.tests:
+      assert test.package.endswith('.cm')
+      test_runner = ExecutableTestRunner(
+          OUT_DIR, test.args.split(), test.package, self._target_id, None, self.logs_dir, [], None
+      )
+      # pylint: disable=protected-access
+      test_runner._package_deps = self._package_deps
+      result = test_runner.run_test().returncode
+      logging.info('Result of test %s is %s', test, result)
+      if result != 0:
+        returncode = result
+    return CompletedProcess(args='', returncode=returncode)
+
+
+# Visible for testing
+def resolve_packages(tests: Iterable[Mapping[str, Any]]) -> Set[str]:
+  packages = set()
+  for test in tests:
+    if 'package' in test:
+      packages.add(test['package'])
+    else:
+      assert 'packages' in test, \
+             'Expect either one package or a list of packages'
+      packages.update(test['packages'])
+  resolved_packages = set()
+  for package in packages:
+    if package.endswith('-0.far'):
+      # Make a symbolic link to match the name of the package itself without the
+      # '-0.far' suffix.
+      new_package = os.path.join(OUT_DIR, package.replace('-0.far', '.far'))
+      try:
+        # Remove the old one if it exists, usually happen on the devbox, so
+        # ignore the FileNotFoundError.
+        os.remove(new_package)
+      except FileNotFoundError:
+        pass
+      os.symlink(package, new_package)
+      resolved_packages.add(new_package)
+    else:
+      resolved_packages.add(os.path.join(OUT_DIR, package))
+  return resolved_packages
+
+
+# Visible for testing
+def build_test_cases(tests: Iterable[Mapping[str, Any]]) -> List[TestCase]:
+  test_cases = []
+  for test in [t['test_command'] for t in tests]:
+    assert test.startswith('test run ')
+    test = test[len('test run '):]
+    if ' -- ' in test:
+      package, args = test.split(' -- ', 1)
+      test_cases.append(TestCase(package=package, args=args))
+    else:
+      test_cases.append(TestCase(package=test))
+  return test_cases
+
+
+def _bundled_test_runner_of(target_id: str) -> _BundledTestRunner:
+  log_dir = os.environ.get('FLUTTER_LOGS_DIR', '/tmp/log')
+  with open(os.path.join(os.path.dirname(__file__), 'test_suites.yaml'), 'r') as file:
+    tests = yaml.safe_load(file)
+  # TODO(zijiehe-google-com): Run all tests in release build,
+  # https://github.com/flutter/flutter/issues/140179.
+  def variant(test) -> bool:
+    return 'variant' not in test or test['variant'] in VARIANT
+
+  tests = [t for t in tests if variant(t)]
+  return _BundledTestRunner(target_id, resolve_packages(tests), build_test_cases(tests), log_dir)
+
+
+def _get_test_runner(runner_args: argparse.Namespace, *_) -> TestRunner:
+  return _bundled_test_runner_of(runner_args.target_id)
+
+
+if __name__ == '__main__':
+  logging.basicConfig(level=logging.INFO)
+  logging.info('Running tests in %s', OUT_DIR)
+  sys.argv.append('--out-dir=' + OUT_DIR)
+  if VARIANT.endswith('_arm64'):
+    sys.argv.append('--product=terminal.qemu-arm64')
+  # The 'flutter-test-type' is a place holder and has no specific meaning; the
+  # _get_test_runner is overrided.
+  sys.argv.append('flutter-test-type')
+  run_test._get_test_runner = _get_test_runner  # pylint: disable=protected-access
+  sys.exit(run_test.main())
diff --git a/testing/fuchsia/run_tests_test.py b/testing/fuchsia/run_tests_test.py
new file mode 100755
index 0000000000000000000000000000000000000000..82b5d5aae433e3ba9f0bb138c6f453b0541ff09a
--- /dev/null
+++ b/testing/fuchsia/run_tests_test.py
@@ -0,0 +1,63 @@
+#!/usr/bin/env vpython3
+
+# [VPYTHON:BEGIN]
+# python_version: "3.8"
+# wheel <
+#   name: "infra/python/wheels/pyyaml/${platform}_${py_python}_${py_abi}"
+#   version: "version:5.4.1.chromium.1"
+# >
+# [VPYTHON:END]
+
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import os
+import shutil
+import unittest
+
+from pathlib import Path
+
+# pylint is looking for a wrong //testing/run_tests.py.
+# pylint: disable=no-member
+import run_tests
+
+run_tests.OUT_DIR = '/tmp/out/fuchsia_debug_x64'
+os.makedirs(run_tests.OUT_DIR, exist_ok=True)
+
+
+class RunTestsTest(unittest.TestCase):
+
+  def test_resolve_both_package_and_packages(self):
+    packages = run_tests.resolve_packages([{'package': 'abc'}, {'packages': ['abc', 'def']}])
+    self.assertEqual(
+        packages, {os.path.join(run_tests.OUT_DIR, 'abc'),
+                   os.path.join(run_tests.OUT_DIR, 'def')}
+    )
+
+  def test_resolve_package_make_symbolic_link(self):
+    Path(os.path.join(run_tests.OUT_DIR, 'abc-0.far')).touch()
+    packages = run_tests.resolve_packages([
+        {'package': 'abc-0.far'},
+    ])
+    self.assertEqual(packages, {os.path.join(run_tests.OUT_DIR, 'abc.far')})
+    self.assertTrue(os.path.islink(os.path.join(run_tests.OUT_DIR, 'abc.far')))
+
+  def test_build_test_cases_with_arguments(self):
+    test_cases = run_tests.build_test_cases([
+        {'test_command': 'test run abc'},
+        {'test_command': 'test run def -- --args'},
+    ])
+    self.assertEqual(
+        test_cases,
+        [run_tests.TestCase(package='abc'),
+         run_tests.TestCase(package='def', args='--args')]
+    )
+
+
+if __name__ == '__main__':
+  try:
+    unittest.main()
+  finally:
+    # Clean up the temporary files. Since it's in /tmp/, ignore the errors.
+    shutil.rmtree(run_tests.OUT_DIR, ignore_errors=True)
diff --git a/testing/fuchsia/test_suites.yaml b/testing/fuchsia/test_suites.yaml
index d417444918902282e9a4ff1e9f023e5f1e46ebeb..f017c6e0d74af175e678e486e2d5e2ace7325dfa 100644
--- a/testing/fuchsia/test_suites.yaml
+++ b/testing/fuchsia/test_suites.yaml
@@ -1,12 +1,6 @@
 # This configuration file specifies several test suites with their package and
 # test command for femu_test.py.
 
-- test_command: test run fuchsia-pkg://fuchsia.com/flutter-embedder-test#meta/flutter-embedder-test.cm
-  packages:
-    - flutter-embedder-test-0.far
-    - oot_flutter_jit_runner-0.far
-    - gen/flutter/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/child-view/child-view.far
-    - gen/flutter/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/parent-view/parent-view.far
 - test_command: test run fuchsia-pkg://fuchsia.com/dart_runner_tests#meta/dart_runner_tests.cm
   package: dart_runner_tests-0.far
 - test_command: test run fuchsia-pkg://fuchsia.com/flutter_runner_tests#meta/flutter_runner_tests.cm
@@ -21,20 +15,29 @@
   package: display_list_tests-0.far
 - test_command: test run fuchsia-pkg://fuchsia.com/display_list_render_tests#meta/display_list_render_tests.cm
   package: display_list_render_tests-0.far
+  disabled: on arm64 because of the slowness
+  variant: x64
 - test_command: test run fuchsia-pkg://fuchsia.com/flow_tests#meta/flow_tests.cm
   package: flow_tests-0.far
 - test_command: test run fuchsia-pkg://fuchsia.com/runtime_tests#meta/runtime_tests.cm
   package: runtime_tests-0.far
+  disabled: on debug_arm64 because of the slowness
+  variant: debug_x64
 - test_command: test run fuchsia-pkg://fuchsia.com/shell_tests#meta/shell_tests.cm
   package: shell_tests-0.far
+  variant: debug_x64
 - test_command: test run fuchsia-pkg://fuchsia.com/testing_tests#meta/testing_tests.cm
   package: testing_tests-0.far
 - test_command: test run fuchsia-pkg://fuchsia.com/txt_tests#meta/txt_tests.cm -- --gtest_filter=-ParagraphTest.*
   package: txt_tests-0.far
+  variant: debug
 - test_command: test run fuchsia-pkg://fuchsia.com/ui_tests#meta/ui_tests.cm
   package: ui_tests-0.far
+  disabled: on debug_arm64 because of the slowness
+  variant: debug_x64
 - test_command: test run fuchsia-pkg://fuchsia.com/embedder_tests#meta/embedder_tests.cm
   package: embedder_tests-0.far
+  variant: debug_x64
 - test_command: test run fuchsia-pkg://fuchsia.com/dart_utils_tests#meta/dart_utils_tests.cm
   package: dart_utils_tests-0.far
 - test_command: test run fuchsia-pkg://fuchsia.com/dart-jit-runner-integration-test#meta/dart-jit-runner-integration-test.cm
@@ -45,6 +48,7 @@
   emulator_arch:
     - 'x64'
     - 'arm64'
+  variant: debug
 - test_command: test run fuchsia-pkg://fuchsia.com/dart-aot-runner-integration-test#meta/dart-aot-runner-integration-test.cm
   run_with_dart_aot: 'true'
   packages:
@@ -54,14 +58,29 @@
   emulator_arch:
     - 'x64'
     - 'arm64'
+  variant: profile
+- test_command: test run fuchsia-pkg://fuchsia.com/flutter-embedder-test#meta/flutter-embedder-test.cm
+  packages:
+    - flutter-embedder-test-0.far
+    - oot_flutter_jit_runner-0.far
+    - gen/flutter/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/child-view/child-view.far
+    - gen/flutter/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/parent-view/parent-view.far
+  variant: debug_x64
 - test_command: test run fuchsia-pkg://fuchsia.com/touch-input-test#meta/touch-input-test.cm
   packages:
     - touch-input-test-0.far
     - oot_flutter_jit_runner-0.far
     - gen/flutter/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/touch-input-view/touch-input-view.far
     - gen/flutter/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/embedding-flutter-view/embedding-flutter-view.far
+  variant: debug_x64
 - test_command: test run fuchsia-pkg://fuchsia.com/mouse-input-test#meta/mouse-input-test.cm
   packages:
     - mouse-input-test-0.far
     - oot_flutter_jit_runner-0.far
     - gen/flutter/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/mouse-input-view/mouse-input-view.far
+- test_command: test run fuchsia-pkg://fuchsia.com/text-input-test#meta/text-input-test.cm
+  packages:
+    - text-input-test-0.far
+    - oot_flutter_jit_runner-0.far
+    - gen/flutter/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/text-input-view/text-input-view.far
+  variant: debug_x64
diff --git a/testing/impeller_golden_tests_output.txt b/testing/impeller_golden_tests_output.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6f301c29df50323ec79f16094c7efabdcc122242
--- /dev/null
+++ b/testing/impeller_golden_tests_output.txt
@@ -0,0 +1,665 @@
+digest.json
+impeller_GoldenTests_ConicalGradient.png
+impeller_Play_AiksTest_BlendModeClear_Metal.png
+impeller_Play_AiksTest_BlendModeClear_OpenGLES.png
+impeller_Play_AiksTest_BlendModeClear_Vulkan.png
+impeller_Play_AiksTest_BlendModeColorBurn_Metal.png
+impeller_Play_AiksTest_BlendModeColorBurn_OpenGLES.png
+impeller_Play_AiksTest_BlendModeColorBurn_Vulkan.png
+impeller_Play_AiksTest_BlendModeColorDodge_Metal.png
+impeller_Play_AiksTest_BlendModeColorDodge_OpenGLES.png
+impeller_Play_AiksTest_BlendModeColorDodge_Vulkan.png
+impeller_Play_AiksTest_BlendModeColor_Metal.png
+impeller_Play_AiksTest_BlendModeColor_OpenGLES.png
+impeller_Play_AiksTest_BlendModeColor_Vulkan.png
+impeller_Play_AiksTest_BlendModeDarken_Metal.png
+impeller_Play_AiksTest_BlendModeDarken_OpenGLES.png
+impeller_Play_AiksTest_BlendModeDarken_Vulkan.png
+impeller_Play_AiksTest_BlendModeDestinationATop_Metal.png
+impeller_Play_AiksTest_BlendModeDestinationATop_OpenGLES.png
+impeller_Play_AiksTest_BlendModeDestinationATop_Vulkan.png
+impeller_Play_AiksTest_BlendModeDestinationIn_Metal.png
+impeller_Play_AiksTest_BlendModeDestinationIn_OpenGLES.png
+impeller_Play_AiksTest_BlendModeDestinationIn_Vulkan.png
+impeller_Play_AiksTest_BlendModeDestinationOut_Metal.png
+impeller_Play_AiksTest_BlendModeDestinationOut_OpenGLES.png
+impeller_Play_AiksTest_BlendModeDestinationOut_Vulkan.png
+impeller_Play_AiksTest_BlendModeDestinationOver_Metal.png
+impeller_Play_AiksTest_BlendModeDestinationOver_OpenGLES.png
+impeller_Play_AiksTest_BlendModeDestinationOver_Vulkan.png
+impeller_Play_AiksTest_BlendModeDestination_Metal.png
+impeller_Play_AiksTest_BlendModeDestination_OpenGLES.png
+impeller_Play_AiksTest_BlendModeDestination_Vulkan.png
+impeller_Play_AiksTest_BlendModeDifference_Metal.png
+impeller_Play_AiksTest_BlendModeDifference_OpenGLES.png
+impeller_Play_AiksTest_BlendModeDifference_Vulkan.png
+impeller_Play_AiksTest_BlendModeExclusion_Metal.png
+impeller_Play_AiksTest_BlendModeExclusion_OpenGLES.png
+impeller_Play_AiksTest_BlendModeExclusion_Vulkan.png
+impeller_Play_AiksTest_BlendModeHardLight_Metal.png
+impeller_Play_AiksTest_BlendModeHardLight_OpenGLES.png
+impeller_Play_AiksTest_BlendModeHardLight_Vulkan.png
+impeller_Play_AiksTest_BlendModeHue_Metal.png
+impeller_Play_AiksTest_BlendModeHue_OpenGLES.png
+impeller_Play_AiksTest_BlendModeHue_Vulkan.png
+impeller_Play_AiksTest_BlendModeLighten_Metal.png
+impeller_Play_AiksTest_BlendModeLighten_OpenGLES.png
+impeller_Play_AiksTest_BlendModeLighten_Vulkan.png
+impeller_Play_AiksTest_BlendModeLuminosity_Metal.png
+impeller_Play_AiksTest_BlendModeLuminosity_OpenGLES.png
+impeller_Play_AiksTest_BlendModeLuminosity_Vulkan.png
+impeller_Play_AiksTest_BlendModeModulate_Metal.png
+impeller_Play_AiksTest_BlendModeModulate_OpenGLES.png
+impeller_Play_AiksTest_BlendModeModulate_Vulkan.png
+impeller_Play_AiksTest_BlendModeMultiply_Metal.png
+impeller_Play_AiksTest_BlendModeMultiply_OpenGLES.png
+impeller_Play_AiksTest_BlendModeMultiply_Vulkan.png
+impeller_Play_AiksTest_BlendModeOverlay_Metal.png
+impeller_Play_AiksTest_BlendModeOverlay_OpenGLES.png
+impeller_Play_AiksTest_BlendModeOverlay_Vulkan.png
+impeller_Play_AiksTest_BlendModePlus_Metal.png
+impeller_Play_AiksTest_BlendModePlus_OpenGLES.png
+impeller_Play_AiksTest_BlendModePlus_Vulkan.png
+impeller_Play_AiksTest_BlendModeSaturation_Metal.png
+impeller_Play_AiksTest_BlendModeSaturation_OpenGLES.png
+impeller_Play_AiksTest_BlendModeSaturation_Vulkan.png
+impeller_Play_AiksTest_BlendModeScreen_Metal.png
+impeller_Play_AiksTest_BlendModeScreen_OpenGLES.png
+impeller_Play_AiksTest_BlendModeScreen_Vulkan.png
+impeller_Play_AiksTest_BlendModeShouldCoverWholeScreen_Metal.png
+impeller_Play_AiksTest_BlendModeShouldCoverWholeScreen_OpenGLES.png
+impeller_Play_AiksTest_BlendModeShouldCoverWholeScreen_Vulkan.png
+impeller_Play_AiksTest_BlendModeSoftLight_Metal.png
+impeller_Play_AiksTest_BlendModeSoftLight_OpenGLES.png
+impeller_Play_AiksTest_BlendModeSoftLight_Vulkan.png
+impeller_Play_AiksTest_BlendModeSourceATop_Metal.png
+impeller_Play_AiksTest_BlendModeSourceATop_OpenGLES.png
+impeller_Play_AiksTest_BlendModeSourceATop_Vulkan.png
+impeller_Play_AiksTest_BlendModeSourceIn_Metal.png
+impeller_Play_AiksTest_BlendModeSourceIn_OpenGLES.png
+impeller_Play_AiksTest_BlendModeSourceIn_Vulkan.png
+impeller_Play_AiksTest_BlendModeSourceOut_Metal.png
+impeller_Play_AiksTest_BlendModeSourceOut_OpenGLES.png
+impeller_Play_AiksTest_BlendModeSourceOut_Vulkan.png
+impeller_Play_AiksTest_BlendModeSourceOver_Metal.png
+impeller_Play_AiksTest_BlendModeSourceOver_OpenGLES.png
+impeller_Play_AiksTest_BlendModeSourceOver_Vulkan.png
+impeller_Play_AiksTest_BlendModeSource_Metal.png
+impeller_Play_AiksTest_BlendModeSource_OpenGLES.png
+impeller_Play_AiksTest_BlendModeSource_Vulkan.png
+impeller_Play_AiksTest_BlendModeXor_Metal.png
+impeller_Play_AiksTest_BlendModeXor_OpenGLES.png
+impeller_Play_AiksTest_BlendModeXor_Vulkan.png
+impeller_Play_AiksTest_BlurHasNoEdge_Metal.png
+impeller_Play_AiksTest_BlurHasNoEdge_OpenGLES.png
+impeller_Play_AiksTest_BlurHasNoEdge_Vulkan.png
+impeller_Play_AiksTest_BlurredRectangleWithShader_Metal.png
+impeller_Play_AiksTest_BlurredRectangleWithShader_OpenGLES.png
+impeller_Play_AiksTest_BlurredRectangleWithShader_Vulkan.png
+impeller_Play_AiksTest_CanDrawAnOpenPathThatIsntARect_Metal.png
+impeller_Play_AiksTest_CanDrawAnOpenPathThatIsntARect_OpenGLES.png
+impeller_Play_AiksTest_CanDrawAnOpenPathThatIsntARect_Vulkan.png
+impeller_Play_AiksTest_CanDrawAnOpenPath_Metal.png
+impeller_Play_AiksTest_CanDrawAnOpenPath_OpenGLES.png
+impeller_Play_AiksTest_CanDrawAnOpenPath_Vulkan.png
+impeller_Play_AiksTest_CanDrawMultiContourConvexPath_Metal.png
+impeller_Play_AiksTest_CanDrawMultiContourConvexPath_OpenGLES.png
+impeller_Play_AiksTest_CanDrawMultiContourConvexPath_Vulkan.png
+impeller_Play_AiksTest_CanDrawPaintMultipleTimesInteractive_Metal.png
+impeller_Play_AiksTest_CanDrawPaintMultipleTimesInteractive_OpenGLES.png
+impeller_Play_AiksTest_CanDrawPaintMultipleTimesInteractive_Vulkan.png
+impeller_Play_AiksTest_CanDrawPaintMultipleTimes_Metal.png
+impeller_Play_AiksTest_CanDrawPaintMultipleTimes_OpenGLES.png
+impeller_Play_AiksTest_CanDrawPaintMultipleTimes_Vulkan.png
+impeller_Play_AiksTest_CanDrawPaintWithAdvancedBlend_Metal.png
+impeller_Play_AiksTest_CanDrawPaintWithAdvancedBlend_OpenGLES.png
+impeller_Play_AiksTest_CanDrawPaintWithAdvancedBlend_Vulkan.png
+impeller_Play_AiksTest_CanDrawPaint_Metal.png
+impeller_Play_AiksTest_CanDrawPaint_OpenGLES.png
+impeller_Play_AiksTest_CanDrawPaint_Vulkan.png
+impeller_Play_AiksTest_CanDrawPerspectiveTransformWithClips_Metal.png
+impeller_Play_AiksTest_CanDrawPerspectiveTransformWithClips_OpenGLES.png
+impeller_Play_AiksTest_CanDrawPerspectiveTransformWithClips_Vulkan.png
+impeller_Play_AiksTest_CanDrawPointsWithTextureMap_Metal.png
+impeller_Play_AiksTest_CanDrawPointsWithTextureMap_OpenGLES.png
+impeller_Play_AiksTest_CanDrawPointsWithTextureMap_Vulkan.png
+impeller_Play_AiksTest_CanDrawPoints_Metal.png
+impeller_Play_AiksTest_CanDrawPoints_OpenGLES.png
+impeller_Play_AiksTest_CanDrawPoints_Vulkan.png
+impeller_Play_AiksTest_CanEmptyPictureConvertToImage_Metal.png
+impeller_Play_AiksTest_CanEmptyPictureConvertToImage_OpenGLES.png
+impeller_Play_AiksTest_CanEmptyPictureConvertToImage_Vulkan.png
+impeller_Play_AiksTest_CanPerformFullScreenMSAA_Metal.png
+impeller_Play_AiksTest_CanPerformFullScreenMSAA_OpenGLES.png
+impeller_Play_AiksTest_CanPerformFullScreenMSAA_Vulkan.png
+impeller_Play_AiksTest_CanPerformSaveLayerWithBoundsAndLargerIntermediateIsNotAllocated_Metal.png
+impeller_Play_AiksTest_CanPerformSaveLayerWithBoundsAndLargerIntermediateIsNotAllocated_OpenGLES.png
+impeller_Play_AiksTest_CanPerformSaveLayerWithBoundsAndLargerIntermediateIsNotAllocated_Vulkan.png
+impeller_Play_AiksTest_CanPerformSaveLayerWithBounds_Metal.png
+impeller_Play_AiksTest_CanPerformSaveLayerWithBounds_OpenGLES.png
+impeller_Play_AiksTest_CanPerformSaveLayerWithBounds_Vulkan.png
+impeller_Play_AiksTest_CanPerformSkew_Metal.png
+impeller_Play_AiksTest_CanPerformSkew_OpenGLES.png
+impeller_Play_AiksTest_CanPerformSkew_Vulkan.png
+impeller_Play_AiksTest_CanPictureConvertToImage_Metal.png
+impeller_Play_AiksTest_CanPictureConvertToImage_OpenGLES.png
+impeller_Play_AiksTest_CanPictureConvertToImage_Vulkan.png
+impeller_Play_AiksTest_CanRenderAdvancedBlendColorFilterWithSaveLayer_Metal.png
+impeller_Play_AiksTest_CanRenderAdvancedBlendColorFilterWithSaveLayer_OpenGLES.png
+impeller_Play_AiksTest_CanRenderAdvancedBlendColorFilterWithSaveLayer_Vulkan.png
+impeller_Play_AiksTest_CanRenderBackdropBlurHugeSigma_Metal.png
+impeller_Play_AiksTest_CanRenderBackdropBlurHugeSigma_OpenGLES.png
+impeller_Play_AiksTest_CanRenderBackdropBlurHugeSigma_Vulkan.png
+impeller_Play_AiksTest_CanRenderBackdropBlurInteractive_Metal.png
+impeller_Play_AiksTest_CanRenderBackdropBlurInteractive_OpenGLES.png
+impeller_Play_AiksTest_CanRenderBackdropBlurInteractive_Vulkan.png
+impeller_Play_AiksTest_CanRenderBackdropBlur_Metal.png
+impeller_Play_AiksTest_CanRenderBackdropBlur_OpenGLES.png
+impeller_Play_AiksTest_CanRenderBackdropBlur_Vulkan.png
+impeller_Play_AiksTest_CanRenderClippedBackdropFilter_Metal.png
+impeller_Play_AiksTest_CanRenderClippedBackdropFilter_OpenGLES.png
+impeller_Play_AiksTest_CanRenderClippedBackdropFilter_Vulkan.png
+impeller_Play_AiksTest_CanRenderClippedBlur_Metal.png
+impeller_Play_AiksTest_CanRenderClippedBlur_OpenGLES.png
+impeller_Play_AiksTest_CanRenderClippedBlur_Vulkan.png
+impeller_Play_AiksTest_CanRenderClippedLayers_Metal.png
+impeller_Play_AiksTest_CanRenderClippedLayers_OpenGLES.png
+impeller_Play_AiksTest_CanRenderClippedLayers_Vulkan.png
+impeller_Play_AiksTest_CanRenderClippedRuntimeEffects_Metal.png
+impeller_Play_AiksTest_CanRenderClippedRuntimeEffects_OpenGLES.png
+impeller_Play_AiksTest_CanRenderClips_Metal.png
+impeller_Play_AiksTest_CanRenderClips_OpenGLES.png
+impeller_Play_AiksTest_CanRenderClips_Vulkan.png
+impeller_Play_AiksTest_CanRenderColorFilterWithInvertColorsDrawPaint_Metal.png
+impeller_Play_AiksTest_CanRenderColorFilterWithInvertColorsDrawPaint_OpenGLES.png
+impeller_Play_AiksTest_CanRenderColorFilterWithInvertColorsDrawPaint_Vulkan.png
+impeller_Play_AiksTest_CanRenderColorFilterWithInvertColors_Metal.png
+impeller_Play_AiksTest_CanRenderColorFilterWithInvertColors_OpenGLES.png
+impeller_Play_AiksTest_CanRenderColorFilterWithInvertColors_Vulkan.png
+impeller_Play_AiksTest_CanRenderColoredRect_Metal.png
+impeller_Play_AiksTest_CanRenderColoredRect_OpenGLES.png
+impeller_Play_AiksTest_CanRenderColoredRect_Vulkan.png
+impeller_Play_AiksTest_CanRenderConicalGradientWithDitheringDisabled_Metal.png
+impeller_Play_AiksTest_CanRenderConicalGradientWithDitheringDisabled_OpenGLES.png
+impeller_Play_AiksTest_CanRenderConicalGradientWithDitheringDisabled_Vulkan.png
+impeller_Play_AiksTest_CanRenderConicalGradientWithDitheringEnabled_Metal.png
+impeller_Play_AiksTest_CanRenderConicalGradientWithDitheringEnabled_OpenGLES.png
+impeller_Play_AiksTest_CanRenderConicalGradientWithDitheringEnabled_Vulkan.png
+impeller_Play_AiksTest_CanRenderConicalGradient_Metal.png
+impeller_Play_AiksTest_CanRenderConicalGradient_OpenGLES.png
+impeller_Play_AiksTest_CanRenderConicalGradient_Vulkan.png
+impeller_Play_AiksTest_CanRenderCurvedStrokes_Metal.png
+impeller_Play_AiksTest_CanRenderCurvedStrokes_OpenGLES.png
+impeller_Play_AiksTest_CanRenderCurvedStrokes_Vulkan.png
+impeller_Play_AiksTest_CanRenderDestructiveSaveLayer_Metal.png
+impeller_Play_AiksTest_CanRenderDestructiveSaveLayer_OpenGLES.png
+impeller_Play_AiksTest_CanRenderDestructiveSaveLayer_Vulkan.png
+impeller_Play_AiksTest_CanRenderDifferenceClips_Metal.png
+impeller_Play_AiksTest_CanRenderDifferenceClips_OpenGLES.png
+impeller_Play_AiksTest_CanRenderDifferenceClips_Vulkan.png
+impeller_Play_AiksTest_CanRenderDifferencePaths_Metal.png
+impeller_Play_AiksTest_CanRenderDifferencePaths_OpenGLES.png
+impeller_Play_AiksTest_CanRenderDifferencePaths_Vulkan.png
+impeller_Play_AiksTest_CanRenderDifferentShapesWithSameColorSource_Metal.png
+impeller_Play_AiksTest_CanRenderDifferentShapesWithSameColorSource_OpenGLES.png
+impeller_Play_AiksTest_CanRenderDifferentShapesWithSameColorSource_Vulkan.png
+impeller_Play_AiksTest_CanRenderEmojiTextFrameWithAlpha_Metal.png
+impeller_Play_AiksTest_CanRenderEmojiTextFrameWithAlpha_OpenGLES.png
+impeller_Play_AiksTest_CanRenderEmojiTextFrameWithAlpha_Vulkan.png
+impeller_Play_AiksTest_CanRenderEmojiTextFrameWithBlur_Metal.png
+impeller_Play_AiksTest_CanRenderEmojiTextFrameWithBlur_OpenGLES.png
+impeller_Play_AiksTest_CanRenderEmojiTextFrameWithBlur_Vulkan.png
+impeller_Play_AiksTest_CanRenderEmojiTextFrame_Metal.png
+impeller_Play_AiksTest_CanRenderEmojiTextFrame_OpenGLES.png
+impeller_Play_AiksTest_CanRenderEmojiTextFrame_Vulkan.png
+impeller_Play_AiksTest_CanRenderForegroundAdvancedBlendWithMaskBlur_Metal.png
+impeller_Play_AiksTest_CanRenderForegroundAdvancedBlendWithMaskBlur_OpenGLES.png
+impeller_Play_AiksTest_CanRenderForegroundAdvancedBlendWithMaskBlur_Vulkan.png
+impeller_Play_AiksTest_CanRenderForegroundBlendWithMaskBlur_Metal.png
+impeller_Play_AiksTest_CanRenderForegroundBlendWithMaskBlur_OpenGLES.png
+impeller_Play_AiksTest_CanRenderForegroundBlendWithMaskBlur_Vulkan.png
+impeller_Play_AiksTest_CanRenderGradientDecalWithBackground_Metal.png
+impeller_Play_AiksTest_CanRenderGradientDecalWithBackground_OpenGLES.png
+impeller_Play_AiksTest_CanRenderGradientDecalWithBackground_Vulkan.png
+impeller_Play_AiksTest_CanRenderGroupOpacity_Metal.png
+impeller_Play_AiksTest_CanRenderGroupOpacity_OpenGLES.png
+impeller_Play_AiksTest_CanRenderGroupOpacity_Vulkan.png
+impeller_Play_AiksTest_CanRenderImageRect_Metal.png
+impeller_Play_AiksTest_CanRenderImageRect_OpenGLES.png
+impeller_Play_AiksTest_CanRenderImageRect_Vulkan.png
+impeller_Play_AiksTest_CanRenderImage_Metal.png
+impeller_Play_AiksTest_CanRenderImage_OpenGLES.png
+impeller_Play_AiksTest_CanRenderImage_Vulkan.png
+impeller_Play_AiksTest_CanRenderInvertedImageWithColorFilter_Metal.png
+impeller_Play_AiksTest_CanRenderInvertedImageWithColorFilter_OpenGLES.png
+impeller_Play_AiksTest_CanRenderInvertedImageWithColorFilter_Vulkan.png
+impeller_Play_AiksTest_CanRenderItalicizedText_Metal.png
+impeller_Play_AiksTest_CanRenderItalicizedText_OpenGLES.png
+impeller_Play_AiksTest_CanRenderItalicizedText_Vulkan.png
+impeller_Play_AiksTest_CanRenderLinearGradientClamp_Metal.png
+impeller_Play_AiksTest_CanRenderLinearGradientClamp_OpenGLES.png
+impeller_Play_AiksTest_CanRenderLinearGradientClamp_Vulkan.png
+impeller_Play_AiksTest_CanRenderLinearGradientDecalWithColorFilter_Metal.png
+impeller_Play_AiksTest_CanRenderLinearGradientDecalWithColorFilter_OpenGLES.png
+impeller_Play_AiksTest_CanRenderLinearGradientDecalWithColorFilter_Vulkan.png
+impeller_Play_AiksTest_CanRenderLinearGradientDecal_Metal.png
+impeller_Play_AiksTest_CanRenderLinearGradientDecal_OpenGLES.png
+impeller_Play_AiksTest_CanRenderLinearGradientDecal_Vulkan.png
+impeller_Play_AiksTest_CanRenderLinearGradientManyColorsClamp_Metal.png
+impeller_Play_AiksTest_CanRenderLinearGradientManyColorsClamp_OpenGLES.png
+impeller_Play_AiksTest_CanRenderLinearGradientManyColorsClamp_Vulkan.png
+impeller_Play_AiksTest_CanRenderLinearGradientManyColorsDecal_Metal.png
+impeller_Play_AiksTest_CanRenderLinearGradientManyColorsDecal_OpenGLES.png
+impeller_Play_AiksTest_CanRenderLinearGradientManyColorsDecal_Vulkan.png
+impeller_Play_AiksTest_CanRenderLinearGradientManyColorsMirror_Metal.png
+impeller_Play_AiksTest_CanRenderLinearGradientManyColorsMirror_OpenGLES.png
+impeller_Play_AiksTest_CanRenderLinearGradientManyColorsMirror_Vulkan.png
+impeller_Play_AiksTest_CanRenderLinearGradientManyColorsRepeat_Metal.png
+impeller_Play_AiksTest_CanRenderLinearGradientManyColorsRepeat_OpenGLES.png
+impeller_Play_AiksTest_CanRenderLinearGradientManyColorsRepeat_Vulkan.png
+impeller_Play_AiksTest_CanRenderLinearGradientManyColorsUnevenStops_Metal.png
+impeller_Play_AiksTest_CanRenderLinearGradientManyColorsUnevenStops_OpenGLES.png
+impeller_Play_AiksTest_CanRenderLinearGradientManyColorsUnevenStops_Vulkan.png
+impeller_Play_AiksTest_CanRenderLinearGradientMaskBlur_Metal.png
+impeller_Play_AiksTest_CanRenderLinearGradientMaskBlur_OpenGLES.png
+impeller_Play_AiksTest_CanRenderLinearGradientMaskBlur_Vulkan.png
+impeller_Play_AiksTest_CanRenderLinearGradientMirror_Metal.png
+impeller_Play_AiksTest_CanRenderLinearGradientMirror_OpenGLES.png
+impeller_Play_AiksTest_CanRenderLinearGradientMirror_Vulkan.png
+impeller_Play_AiksTest_CanRenderLinearGradientRepeat_Metal.png
+impeller_Play_AiksTest_CanRenderLinearGradientRepeat_OpenGLES.png
+impeller_Play_AiksTest_CanRenderLinearGradientRepeat_Vulkan.png
+impeller_Play_AiksTest_CanRenderLinearGradientWayManyColorsClamp_Metal.png
+impeller_Play_AiksTest_CanRenderLinearGradientWayManyColorsClamp_OpenGLES.png
+impeller_Play_AiksTest_CanRenderLinearGradientWayManyColorsClamp_Vulkan.png
+impeller_Play_AiksTest_CanRenderLinearGradientWithDitheringDisabled_Metal.png
+impeller_Play_AiksTest_CanRenderLinearGradientWithDitheringDisabled_OpenGLES.png
+impeller_Play_AiksTest_CanRenderLinearGradientWithDitheringDisabled_Vulkan.png
+impeller_Play_AiksTest_CanRenderLinearGradientWithDitheringEnabled_Metal.png
+impeller_Play_AiksTest_CanRenderLinearGradientWithDitheringEnabled_OpenGLES.png
+impeller_Play_AiksTest_CanRenderLinearGradientWithDitheringEnabled_Vulkan.png
+impeller_Play_AiksTest_CanRenderLinearGradientWithOverlappingStopsClamp_Metal.png
+impeller_Play_AiksTest_CanRenderLinearGradientWithOverlappingStopsClamp_OpenGLES.png
+impeller_Play_AiksTest_CanRenderLinearGradientWithOverlappingStopsClamp_Vulkan.png
+impeller_Play_AiksTest_CanRenderMaskBlurHugeSigma_Metal.png
+impeller_Play_AiksTest_CanRenderMaskBlurHugeSigma_OpenGLES.png
+impeller_Play_AiksTest_CanRenderMaskBlurHugeSigma_Vulkan.png
+impeller_Play_AiksTest_CanRenderNestedClips_Metal.png
+impeller_Play_AiksTest_CanRenderNestedClips_OpenGLES.png
+impeller_Play_AiksTest_CanRenderNestedClips_Vulkan.png
+impeller_Play_AiksTest_CanRenderOffscreenCheckerboard_Metal.png
+impeller_Play_AiksTest_CanRenderOffscreenCheckerboard_OpenGLES.png
+impeller_Play_AiksTest_CanRenderOffscreenCheckerboard_Vulkan.png
+impeller_Play_AiksTest_CanRenderOverlappingMultiContourPath_Metal.png
+impeller_Play_AiksTest_CanRenderOverlappingMultiContourPath_OpenGLES.png
+impeller_Play_AiksTest_CanRenderOverlappingMultiContourPath_Vulkan.png
+impeller_Play_AiksTest_CanRenderRadialGradientManyColors_Metal.png
+impeller_Play_AiksTest_CanRenderRadialGradientManyColors_OpenGLES.png
+impeller_Play_AiksTest_CanRenderRadialGradientManyColors_Vulkan.png
+impeller_Play_AiksTest_CanRenderRadialGradientWithDitheringDisabled_Metal.png
+impeller_Play_AiksTest_CanRenderRadialGradientWithDitheringDisabled_OpenGLES.png
+impeller_Play_AiksTest_CanRenderRadialGradientWithDitheringDisabled_Vulkan.png
+impeller_Play_AiksTest_CanRenderRadialGradientWithDitheringEnabled_Metal.png
+impeller_Play_AiksTest_CanRenderRadialGradientWithDitheringEnabled_OpenGLES.png
+impeller_Play_AiksTest_CanRenderRadialGradientWithDitheringEnabled_Vulkan.png
+impeller_Play_AiksTest_CanRenderRadialGradient_Metal.png
+impeller_Play_AiksTest_CanRenderRadialGradient_OpenGLES.png
+impeller_Play_AiksTest_CanRenderRadialGradient_Vulkan.png
+impeller_Play_AiksTest_CanRenderRoundedRectWithNonUniformRadii_Metal.png
+impeller_Play_AiksTest_CanRenderRoundedRectWithNonUniformRadii_OpenGLES.png
+impeller_Play_AiksTest_CanRenderRoundedRectWithNonUniformRadii_Vulkan.png
+impeller_Play_AiksTest_CanRenderSimpleClips_Metal.png
+impeller_Play_AiksTest_CanRenderSimpleClips_OpenGLES.png
+impeller_Play_AiksTest_CanRenderSimpleClips_Vulkan.png
+impeller_Play_AiksTest_CanRenderStrokePathThatEndsAtSharpTurn_Metal.png
+impeller_Play_AiksTest_CanRenderStrokePathThatEndsAtSharpTurn_OpenGLES.png
+impeller_Play_AiksTest_CanRenderStrokePathThatEndsAtSharpTurn_Vulkan.png
+impeller_Play_AiksTest_CanRenderStrokePathWithCubicLine_Metal.png
+impeller_Play_AiksTest_CanRenderStrokePathWithCubicLine_OpenGLES.png
+impeller_Play_AiksTest_CanRenderStrokePathWithCubicLine_Vulkan.png
+impeller_Play_AiksTest_CanRenderStrokes_Metal.png
+impeller_Play_AiksTest_CanRenderStrokes_OpenGLES.png
+impeller_Play_AiksTest_CanRenderStrokes_Vulkan.png
+impeller_Play_AiksTest_CanRenderSweepGradientClamp_Metal.png
+impeller_Play_AiksTest_CanRenderSweepGradientClamp_OpenGLES.png
+impeller_Play_AiksTest_CanRenderSweepGradientClamp_Vulkan.png
+impeller_Play_AiksTest_CanRenderSweepGradientDecal_Metal.png
+impeller_Play_AiksTest_CanRenderSweepGradientDecal_OpenGLES.png
+impeller_Play_AiksTest_CanRenderSweepGradientDecal_Vulkan.png
+impeller_Play_AiksTest_CanRenderSweepGradientManyColorsClamp_Metal.png
+impeller_Play_AiksTest_CanRenderSweepGradientManyColorsClamp_OpenGLES.png
+impeller_Play_AiksTest_CanRenderSweepGradientManyColorsClamp_Vulkan.png
+impeller_Play_AiksTest_CanRenderSweepGradientManyColorsDecal_Metal.png
+impeller_Play_AiksTest_CanRenderSweepGradientManyColorsDecal_OpenGLES.png
+impeller_Play_AiksTest_CanRenderSweepGradientManyColorsDecal_Vulkan.png
+impeller_Play_AiksTest_CanRenderSweepGradientManyColorsMirror_Metal.png
+impeller_Play_AiksTest_CanRenderSweepGradientManyColorsMirror_OpenGLES.png
+impeller_Play_AiksTest_CanRenderSweepGradientManyColorsMirror_Vulkan.png
+impeller_Play_AiksTest_CanRenderSweepGradientManyColorsRepeat_Metal.png
+impeller_Play_AiksTest_CanRenderSweepGradientManyColorsRepeat_OpenGLES.png
+impeller_Play_AiksTest_CanRenderSweepGradientManyColorsRepeat_Vulkan.png
+impeller_Play_AiksTest_CanRenderSweepGradientMirror_Metal.png
+impeller_Play_AiksTest_CanRenderSweepGradientMirror_OpenGLES.png
+impeller_Play_AiksTest_CanRenderSweepGradientMirror_Vulkan.png
+impeller_Play_AiksTest_CanRenderSweepGradientRepeat_Metal.png
+impeller_Play_AiksTest_CanRenderSweepGradientRepeat_OpenGLES.png
+impeller_Play_AiksTest_CanRenderSweepGradientRepeat_Vulkan.png
+impeller_Play_AiksTest_CanRenderSweepGradientWithDitheringDisabled_Metal.png
+impeller_Play_AiksTest_CanRenderSweepGradientWithDitheringDisabled_OpenGLES.png
+impeller_Play_AiksTest_CanRenderSweepGradientWithDitheringDisabled_Vulkan.png
+impeller_Play_AiksTest_CanRenderSweepGradientWithDitheringEnabled_Metal.png
+impeller_Play_AiksTest_CanRenderSweepGradientWithDitheringEnabled_OpenGLES.png
+impeller_Play_AiksTest_CanRenderSweepGradientWithDitheringEnabled_Vulkan.png
+impeller_Play_AiksTest_CanRenderTextFrameSTB_Metal.png
+impeller_Play_AiksTest_CanRenderTextFrameSTB_OpenGLES.png
+impeller_Play_AiksTest_CanRenderTextFrameSTB_Vulkan.png
+impeller_Play_AiksTest_CanRenderTextFrame_Metal.png
+impeller_Play_AiksTest_CanRenderTextFrame_OpenGLES.png
+impeller_Play_AiksTest_CanRenderTextFrame_Vulkan.png
+impeller_Play_AiksTest_CanRenderTextInSaveLayer_Metal.png
+impeller_Play_AiksTest_CanRenderTextInSaveLayer_OpenGLES.png
+impeller_Play_AiksTest_CanRenderTextInSaveLayer_Vulkan.png
+impeller_Play_AiksTest_CanRenderTextOutsideBoundaries_Metal.png
+impeller_Play_AiksTest_CanRenderTextOutsideBoundaries_OpenGLES.png
+impeller_Play_AiksTest_CanRenderTextOutsideBoundaries_Vulkan.png
+impeller_Play_AiksTest_CanRenderThickCurvedStrokes_Metal.png
+impeller_Play_AiksTest_CanRenderThickCurvedStrokes_OpenGLES.png
+impeller_Play_AiksTest_CanRenderThickCurvedStrokes_Vulkan.png
+impeller_Play_AiksTest_CanRenderTiledTextureClampWithTranslate_Metal.png
+impeller_Play_AiksTest_CanRenderTiledTextureClampWithTranslate_OpenGLES.png
+impeller_Play_AiksTest_CanRenderTiledTextureClampWithTranslate_Vulkan.png
+impeller_Play_AiksTest_CanRenderTiledTextureClamp_Metal.png
+impeller_Play_AiksTest_CanRenderTiledTextureClamp_OpenGLES.png
+impeller_Play_AiksTest_CanRenderTiledTextureClamp_Vulkan.png
+impeller_Play_AiksTest_CanRenderTiledTextureDecal_Metal.png
+impeller_Play_AiksTest_CanRenderTiledTextureDecal_OpenGLES.png
+impeller_Play_AiksTest_CanRenderTiledTextureDecal_Vulkan.png
+impeller_Play_AiksTest_CanRenderTiledTextureMirror_Metal.png
+impeller_Play_AiksTest_CanRenderTiledTextureMirror_OpenGLES.png
+impeller_Play_AiksTest_CanRenderTiledTextureMirror_Vulkan.png
+impeller_Play_AiksTest_CanRenderTiledTextureRepeat_Metal.png
+impeller_Play_AiksTest_CanRenderTiledTextureRepeat_OpenGLES.png
+impeller_Play_AiksTest_CanRenderTiledTextureRepeat_Vulkan.png
+impeller_Play_AiksTest_CanRenderTinyOverlappingSubpasses_Metal.png
+impeller_Play_AiksTest_CanRenderTinyOverlappingSubpasses_OpenGLES.png
+impeller_Play_AiksTest_CanRenderTinyOverlappingSubpasses_Vulkan.png
+impeller_Play_AiksTest_CanRenderWithContiguousClipRestores_Metal.png
+impeller_Play_AiksTest_CanRenderWithContiguousClipRestores_OpenGLES.png
+impeller_Play_AiksTest_CanRenderWithContiguousClipRestores_Vulkan.png
+impeller_Play_AiksTest_CanSaveLayerStandalone_Metal.png
+impeller_Play_AiksTest_CanSaveLayerStandalone_OpenGLES.png
+impeller_Play_AiksTest_CanSaveLayerStandalone_Vulkan.png
+impeller_Play_AiksTest_CaptureContext_Metal.png
+impeller_Play_AiksTest_CaptureContext_OpenGLES.png
+impeller_Play_AiksTest_CaptureContext_Vulkan.png
+impeller_Play_AiksTest_ClearBlendWithBlur_Metal.png
+impeller_Play_AiksTest_ClearBlendWithBlur_OpenGLES.png
+impeller_Play_AiksTest_ClearBlendWithBlur_Vulkan.png
+impeller_Play_AiksTest_ClearColorOptimizationWhenSubpassIsBiggerThanParentPass_Metal.png
+impeller_Play_AiksTest_ClearColorOptimizationWhenSubpassIsBiggerThanParentPass_OpenGLES.png
+impeller_Play_AiksTest_ClearColorOptimizationWhenSubpassIsBiggerThanParentPass_Vulkan.png
+impeller_Play_AiksTest_ClippedBlurFilterRendersCorrectlyInteractive_Metal.png
+impeller_Play_AiksTest_ClippedBlurFilterRendersCorrectlyInteractive_OpenGLES.png
+impeller_Play_AiksTest_ClippedBlurFilterRendersCorrectlyInteractive_Vulkan.png
+impeller_Play_AiksTest_ClippedBlurFilterRendersCorrectly_Metal.png
+impeller_Play_AiksTest_ClippedBlurFilterRendersCorrectly_OpenGLES.png
+impeller_Play_AiksTest_ClippedBlurFilterRendersCorrectly_Vulkan.png
+impeller_Play_AiksTest_ClipsUseCurrentTransform_Metal.png
+impeller_Play_AiksTest_ClipsUseCurrentTransform_OpenGLES.png
+impeller_Play_AiksTest_ClipsUseCurrentTransform_Vulkan.png
+impeller_Play_AiksTest_CollapsedDrawPaintInSubpassBackdropFilter_Metal.png
+impeller_Play_AiksTest_CollapsedDrawPaintInSubpassBackdropFilter_OpenGLES.png
+impeller_Play_AiksTest_CollapsedDrawPaintInSubpassBackdropFilter_Vulkan.png
+impeller_Play_AiksTest_CollapsedDrawPaintInSubpass_Metal.png
+impeller_Play_AiksTest_CollapsedDrawPaintInSubpass_OpenGLES.png
+impeller_Play_AiksTest_CollapsedDrawPaintInSubpass_Vulkan.png
+impeller_Play_AiksTest_ColorMatrixFilterSubpassCollapseOptimization_Metal.png
+impeller_Play_AiksTest_ColorMatrixFilterSubpassCollapseOptimization_OpenGLES.png
+impeller_Play_AiksTest_ColorMatrixFilterSubpassCollapseOptimization_Vulkan.png
+impeller_Play_AiksTest_ColorWheel_Metal.png
+impeller_Play_AiksTest_ColorWheel_OpenGLES.png
+impeller_Play_AiksTest_ColorWheel_Vulkan.png
+impeller_Play_AiksTest_CoordinateConversionsAreCorrect_Metal.png
+impeller_Play_AiksTest_CoordinateConversionsAreCorrect_OpenGLES.png
+impeller_Play_AiksTest_CoordinateConversionsAreCorrect_Vulkan.png
+impeller_Play_AiksTest_CoverageOriginShouldBeAccountedForInSubpasses_Metal.png
+impeller_Play_AiksTest_CoverageOriginShouldBeAccountedForInSubpasses_OpenGLES.png
+impeller_Play_AiksTest_CoverageOriginShouldBeAccountedForInSubpasses_Vulkan.png
+impeller_Play_AiksTest_DrawAdvancedBlendPartlyOffscreen_Metal.png
+impeller_Play_AiksTest_DrawAdvancedBlendPartlyOffscreen_OpenGLES.png
+impeller_Play_AiksTest_DrawAdvancedBlendPartlyOffscreen_Vulkan.png
+impeller_Play_AiksTest_DrawAtlasAdvancedAndTransform_Metal.png
+impeller_Play_AiksTest_DrawAtlasAdvancedAndTransform_OpenGLES.png
+impeller_Play_AiksTest_DrawAtlasAdvancedAndTransform_Vulkan.png
+impeller_Play_AiksTest_DrawAtlasWithColorAdvancedAndTransform_Metal.png
+impeller_Play_AiksTest_DrawAtlasWithColorAdvancedAndTransform_OpenGLES.png
+impeller_Play_AiksTest_DrawAtlasWithColorAdvancedAndTransform_Vulkan.png
+impeller_Play_AiksTest_DrawLinesRenderCorrectly_Metal.png
+impeller_Play_AiksTest_DrawLinesRenderCorrectly_OpenGLES.png
+impeller_Play_AiksTest_DrawLinesRenderCorrectly_Vulkan.png
+impeller_Play_AiksTest_DrawPaintTransformsBounds_Metal.png
+impeller_Play_AiksTest_DrawPaintTransformsBounds_OpenGLES.png
+impeller_Play_AiksTest_DrawPaintTransformsBounds_Vulkan.png
+impeller_Play_AiksTest_DrawPaintWithAdvancedBlendOverFilter_Metal.png
+impeller_Play_AiksTest_DrawPaintWithAdvancedBlendOverFilter_OpenGLES.png
+impeller_Play_AiksTest_DrawPaintWithAdvancedBlendOverFilter_Vulkan.png
+impeller_Play_AiksTest_DrawRectStrokesRenderCorrectly_Metal.png
+impeller_Play_AiksTest_DrawRectStrokesRenderCorrectly_OpenGLES.png
+impeller_Play_AiksTest_DrawRectStrokesRenderCorrectly_Vulkan.png
+impeller_Play_AiksTest_DrawRectStrokesWithBevelJoinRenderCorrectly_Metal.png
+impeller_Play_AiksTest_DrawRectStrokesWithBevelJoinRenderCorrectly_OpenGLES.png
+impeller_Play_AiksTest_DrawRectStrokesWithBevelJoinRenderCorrectly_Vulkan.png
+impeller_Play_AiksTest_DrawScaledTextWithPerspectiveNoSaveLayer_Metal.png
+impeller_Play_AiksTest_DrawScaledTextWithPerspectiveNoSaveLayer_OpenGLES.png
+impeller_Play_AiksTest_DrawScaledTextWithPerspectiveNoSaveLayer_Vulkan.png
+impeller_Play_AiksTest_DrawScaledTextWithPerspectiveSaveLayer_Metal.png
+impeller_Play_AiksTest_DrawScaledTextWithPerspectiveSaveLayer_OpenGLES.png
+impeller_Play_AiksTest_DrawScaledTextWithPerspectiveSaveLayer_Vulkan.png
+impeller_Play_AiksTest_EmptySaveLayerIgnoresPaint_Metal.png
+impeller_Play_AiksTest_EmptySaveLayerIgnoresPaint_OpenGLES.png
+impeller_Play_AiksTest_EmptySaveLayerIgnoresPaint_Vulkan.png
+impeller_Play_AiksTest_EmptySaveLayerRendersWithClear_Metal.png
+impeller_Play_AiksTest_EmptySaveLayerRendersWithClear_OpenGLES.png
+impeller_Play_AiksTest_EmptySaveLayerRendersWithClear_Vulkan.png
+impeller_Play_AiksTest_FilledCirclesRenderCorrectly_Metal.png
+impeller_Play_AiksTest_FilledCirclesRenderCorrectly_OpenGLES.png
+impeller_Play_AiksTest_FilledCirclesRenderCorrectly_Vulkan.png
+impeller_Play_AiksTest_FilledEllipsesRenderCorrectly_Metal.png
+impeller_Play_AiksTest_FilledEllipsesRenderCorrectly_OpenGLES.png
+impeller_Play_AiksTest_FilledEllipsesRenderCorrectly_Vulkan.png
+impeller_Play_AiksTest_FilledRoundRectPathsRenderCorrectly_Metal.png
+impeller_Play_AiksTest_FilledRoundRectPathsRenderCorrectly_OpenGLES.png
+impeller_Play_AiksTest_FilledRoundRectPathsRenderCorrectly_Vulkan.png
+impeller_Play_AiksTest_FilledRoundRectsRenderCorrectly_Metal.png
+impeller_Play_AiksTest_FilledRoundRectsRenderCorrectly_OpenGLES.png
+impeller_Play_AiksTest_FilledRoundRectsRenderCorrectly_Vulkan.png
+impeller_Play_AiksTest_ForegroundBlendSubpassCollapseOptimization_Metal.png
+impeller_Play_AiksTest_ForegroundBlendSubpassCollapseOptimization_OpenGLES.png
+impeller_Play_AiksTest_ForegroundBlendSubpassCollapseOptimization_Vulkan.png
+impeller_Play_AiksTest_GaussianBlurAnimatedBackdrop_Metal.png
+impeller_Play_AiksTest_GaussianBlurAnimatedBackdrop_OpenGLES.png
+impeller_Play_AiksTest_GaussianBlurAnimatedBackdrop_Vulkan.png
+impeller_Play_AiksTest_GaussianBlurAtPeripheryHorizontal_Metal.png
+impeller_Play_AiksTest_GaussianBlurAtPeripheryHorizontal_OpenGLES.png
+impeller_Play_AiksTest_GaussianBlurAtPeripheryHorizontal_Vulkan.png
+impeller_Play_AiksTest_GaussianBlurAtPeripheryVertical_Metal.png
+impeller_Play_AiksTest_GaussianBlurAtPeripheryVertical_OpenGLES.png
+impeller_Play_AiksTest_GaussianBlurAtPeripheryVertical_Vulkan.png
+impeller_Play_AiksTest_GaussianBlurOneDimension_Metal.png
+impeller_Play_AiksTest_GaussianBlurOneDimension_OpenGLES.png
+impeller_Play_AiksTest_GaussianBlurOneDimension_Vulkan.png
+impeller_Play_AiksTest_GaussianBlurRotatedAndClippedInteractive_Metal.png
+impeller_Play_AiksTest_GaussianBlurRotatedAndClippedInteractive_OpenGLES.png
+impeller_Play_AiksTest_GaussianBlurRotatedAndClippedInteractive_Vulkan.png
+impeller_Play_AiksTest_GaussianBlurRotatedAndClipped_Metal.png
+impeller_Play_AiksTest_GaussianBlurRotatedAndClipped_OpenGLES.png
+impeller_Play_AiksTest_GaussianBlurRotatedAndClipped_Vulkan.png
+impeller_Play_AiksTest_GaussianBlurScaledAndClipped_Metal.png
+impeller_Play_AiksTest_GaussianBlurScaledAndClipped_OpenGLES.png
+impeller_Play_AiksTest_GaussianBlurScaledAndClipped_Vulkan.png
+impeller_Play_AiksTest_GaussianBlurStyleInnerGradient_Metal.png
+impeller_Play_AiksTest_GaussianBlurStyleInnerGradient_OpenGLES.png
+impeller_Play_AiksTest_GaussianBlurStyleInnerGradient_Vulkan.png
+impeller_Play_AiksTest_GaussianBlurStyleInner_Metal.png
+impeller_Play_AiksTest_GaussianBlurStyleInner_OpenGLES.png
+impeller_Play_AiksTest_GaussianBlurStyleInner_Vulkan.png
+impeller_Play_AiksTest_GaussianBlurStyleOuterGradient_Metal.png
+impeller_Play_AiksTest_GaussianBlurStyleOuterGradient_OpenGLES.png
+impeller_Play_AiksTest_GaussianBlurStyleOuterGradient_Vulkan.png
+impeller_Play_AiksTest_GaussianBlurStyleOuter_Metal.png
+impeller_Play_AiksTest_GaussianBlurStyleOuter_OpenGLES.png
+impeller_Play_AiksTest_GaussianBlurStyleOuter_Vulkan.png
+impeller_Play_AiksTest_GaussianBlurStyleSolidGradient_Metal.png
+impeller_Play_AiksTest_GaussianBlurStyleSolidGradient_OpenGLES.png
+impeller_Play_AiksTest_GaussianBlurStyleSolidGradient_Vulkan.png
+impeller_Play_AiksTest_GaussianBlurStyleSolid_Metal.png
+impeller_Play_AiksTest_GaussianBlurStyleSolid_OpenGLES.png
+impeller_Play_AiksTest_GaussianBlurStyleSolid_Vulkan.png
+impeller_Play_AiksTest_GaussianBlurWithoutDecalSupport_Metal.png
+impeller_Play_AiksTest_GradientStrokesRenderCorrectly_Metal.png
+impeller_Play_AiksTest_GradientStrokesRenderCorrectly_OpenGLES.png
+impeller_Play_AiksTest_GradientStrokesRenderCorrectly_Vulkan.png
+impeller_Play_AiksTest_GuassianBlurUpdatesMipmapContents_Metal.png
+impeller_Play_AiksTest_GuassianBlurUpdatesMipmapContents_OpenGLES.png
+impeller_Play_AiksTest_GuassianBlurUpdatesMipmapContents_Vulkan.png
+impeller_Play_AiksTest_ImageColorSourceEffectTransform_Metal.png
+impeller_Play_AiksTest_ImageColorSourceEffectTransform_OpenGLES.png
+impeller_Play_AiksTest_ImageColorSourceEffectTransform_Vulkan.png
+impeller_Play_AiksTest_ImageFilteredSaveLayerWithUnboundedContents_Metal.png
+impeller_Play_AiksTest_ImageFilteredSaveLayerWithUnboundedContents_OpenGLES.png
+impeller_Play_AiksTest_ImageFilteredSaveLayerWithUnboundedContents_Vulkan.png
+impeller_Play_AiksTest_ImageFilteredUnboundedSaveLayerWithUnboundedContents_Metal.png
+impeller_Play_AiksTest_ImageFilteredUnboundedSaveLayerWithUnboundedContents_OpenGLES.png
+impeller_Play_AiksTest_ImageFilteredUnboundedSaveLayerWithUnboundedContents_Vulkan.png
+impeller_Play_AiksTest_LinearToSrgbFilterSubpassCollapseOptimization_Metal.png
+impeller_Play_AiksTest_LinearToSrgbFilterSubpassCollapseOptimization_OpenGLES.png
+impeller_Play_AiksTest_LinearToSrgbFilterSubpassCollapseOptimization_Vulkan.png
+impeller_Play_AiksTest_MaskBlurDoesntStretchContents_Metal.png
+impeller_Play_AiksTest_MaskBlurDoesntStretchContents_OpenGLES.png
+impeller_Play_AiksTest_MaskBlurDoesntStretchContents_Vulkan.png
+impeller_Play_AiksTest_MaskBlurTexture_Metal.png
+impeller_Play_AiksTest_MaskBlurTexture_OpenGLES.png
+impeller_Play_AiksTest_MaskBlurTexture_Vulkan.png
+impeller_Play_AiksTest_MaskBlurVariantTestInnerTranslucentWithBlurImageFilter_Metal.png
+impeller_Play_AiksTest_MaskBlurVariantTestInnerTranslucentWithBlurImageFilter_OpenGLES.png
+impeller_Play_AiksTest_MaskBlurVariantTestInnerTranslucentWithBlurImageFilter_Vulkan.png
+impeller_Play_AiksTest_MaskBlurVariantTestInnerTranslucent_Metal.png
+impeller_Play_AiksTest_MaskBlurVariantTestInnerTranslucent_OpenGLES.png
+impeller_Play_AiksTest_MaskBlurVariantTestInnerTranslucent_Vulkan.png
+impeller_Play_AiksTest_MaskBlurVariantTestNormalTranslucentZeroSigma_Metal.png
+impeller_Play_AiksTest_MaskBlurVariantTestNormalTranslucentZeroSigma_OpenGLES.png
+impeller_Play_AiksTest_MaskBlurVariantTestNormalTranslucentZeroSigma_Vulkan.png
+impeller_Play_AiksTest_MaskBlurVariantTestNormalTranslucent_Metal.png
+impeller_Play_AiksTest_MaskBlurVariantTestNormalTranslucent_OpenGLES.png
+impeller_Play_AiksTest_MaskBlurVariantTestNormalTranslucent_Vulkan.png
+impeller_Play_AiksTest_MaskBlurVariantTestOuterOpaqueWithBlurImageFilter_Metal.png
+impeller_Play_AiksTest_MaskBlurVariantTestOuterOpaqueWithBlurImageFilter_OpenGLES.png
+impeller_Play_AiksTest_MaskBlurVariantTestOuterOpaqueWithBlurImageFilter_Vulkan.png
+impeller_Play_AiksTest_MaskBlurVariantTestOuterTranslucent_Metal.png
+impeller_Play_AiksTest_MaskBlurVariantTestOuterTranslucent_OpenGLES.png
+impeller_Play_AiksTest_MaskBlurVariantTestOuterTranslucent_Vulkan.png
+impeller_Play_AiksTest_MaskBlurVariantTestSolidOpaque_Metal.png
+impeller_Play_AiksTest_MaskBlurVariantTestSolidOpaque_OpenGLES.png
+impeller_Play_AiksTest_MaskBlurVariantTestSolidOpaque_Vulkan.png
+impeller_Play_AiksTest_MaskBlurVariantTestSolidTranslucentExclusionBlend_Metal.png
+impeller_Play_AiksTest_MaskBlurVariantTestSolidTranslucentExclusionBlend_OpenGLES.png
+impeller_Play_AiksTest_MaskBlurVariantTestSolidTranslucentExclusionBlend_Vulkan.png
+impeller_Play_AiksTest_MaskBlurVariantTestSolidTranslucentWithFilters_Metal.png
+impeller_Play_AiksTest_MaskBlurVariantTestSolidTranslucentWithFilters_OpenGLES.png
+impeller_Play_AiksTest_MaskBlurVariantTestSolidTranslucentWithFilters_Vulkan.png
+impeller_Play_AiksTest_MaskBlurVariantTestSolidTranslucent_Metal.png
+impeller_Play_AiksTest_MaskBlurVariantTestSolidTranslucent_OpenGLES.png
+impeller_Play_AiksTest_MaskBlurVariantTestSolidTranslucent_Vulkan.png
+impeller_Play_AiksTest_MaskBlurWithZeroSigmaIsSkipped_Metal.png
+impeller_Play_AiksTest_MaskBlurWithZeroSigmaIsSkipped_OpenGLES.png
+impeller_Play_AiksTest_MaskBlurWithZeroSigmaIsSkipped_Vulkan.png
+impeller_Play_AiksTest_MatrixBackdropFilter_Metal.png
+impeller_Play_AiksTest_MatrixBackdropFilter_OpenGLES.png
+impeller_Play_AiksTest_MatrixBackdropFilter_Vulkan.png
+impeller_Play_AiksTest_MatrixImageFilterDoesntCullWhenScaledAndTranslatedFromOffscreen_Metal.png
+impeller_Play_AiksTest_MatrixImageFilterDoesntCullWhenScaledAndTranslatedFromOffscreen_OpenGLES.png
+impeller_Play_AiksTest_MatrixImageFilterDoesntCullWhenScaledAndTranslatedFromOffscreen_Vulkan.png
+impeller_Play_AiksTest_MatrixImageFilterDoesntCullWhenTranslatedFromOffscreen_Metal.png
+impeller_Play_AiksTest_MatrixImageFilterDoesntCullWhenTranslatedFromOffscreen_OpenGLES.png
+impeller_Play_AiksTest_MatrixImageFilterDoesntCullWhenTranslatedFromOffscreen_Vulkan.png
+impeller_Play_AiksTest_MatrixImageFilterMagnify_Metal.png
+impeller_Play_AiksTest_MatrixImageFilterMagnify_OpenGLES.png
+impeller_Play_AiksTest_MatrixImageFilterMagnify_Vulkan.png
+impeller_Play_AiksTest_MatrixSaveLayerFilter_Metal.png
+impeller_Play_AiksTest_MatrixSaveLayerFilter_OpenGLES.png
+impeller_Play_AiksTest_MatrixSaveLayerFilter_Vulkan.png
+impeller_Play_AiksTest_PaintBlendModeIsRespected_Metal.png
+impeller_Play_AiksTest_PaintBlendModeIsRespected_OpenGLES.png
+impeller_Play_AiksTest_PaintBlendModeIsRespected_Vulkan.png
+impeller_Play_AiksTest_PipelineBlendSingleParameter_Metal.png
+impeller_Play_AiksTest_PipelineBlendSingleParameter_OpenGLES.png
+impeller_Play_AiksTest_PipelineBlendSingleParameter_Vulkan.png
+impeller_Play_AiksTest_ReleasesTextureOnTeardown_Metal.png
+impeller_Play_AiksTest_ReleasesTextureOnTeardown_OpenGLES.png
+impeller_Play_AiksTest_ReleasesTextureOnTeardown_Vulkan.png
+impeller_Play_AiksTest_RotateColorFilteredPath_Metal.png
+impeller_Play_AiksTest_RotateColorFilteredPath_OpenGLES.png
+impeller_Play_AiksTest_RotateColorFilteredPath_Vulkan.png
+impeller_Play_AiksTest_SaveLayerDrawsBehindSubsequentEntities_Metal.png
+impeller_Play_AiksTest_SaveLayerDrawsBehindSubsequentEntities_OpenGLES.png
+impeller_Play_AiksTest_SaveLayerDrawsBehindSubsequentEntities_Vulkan.png
+impeller_Play_AiksTest_SaveLayerFiltersScaleWithTransform_Metal.png
+impeller_Play_AiksTest_SaveLayerFiltersScaleWithTransform_OpenGLES.png
+impeller_Play_AiksTest_SaveLayerFiltersScaleWithTransform_Vulkan.png
+impeller_Play_AiksTest_SiblingSaveLayerBoundsAreRespected_Metal.png
+impeller_Play_AiksTest_SiblingSaveLayerBoundsAreRespected_OpenGLES.png
+impeller_Play_AiksTest_SiblingSaveLayerBoundsAreRespected_Vulkan.png
+impeller_Play_AiksTest_SolidColorCirclesOvalsRRectsMaskBlurCorrectly_Metal.png
+impeller_Play_AiksTest_SolidColorCirclesOvalsRRectsMaskBlurCorrectly_OpenGLES.png
+impeller_Play_AiksTest_SolidColorCirclesOvalsRRectsMaskBlurCorrectly_Vulkan.png
+impeller_Play_AiksTest_SolidStrokesRenderCorrectly_Metal.png
+impeller_Play_AiksTest_SolidStrokesRenderCorrectly_OpenGLES.png
+impeller_Play_AiksTest_SolidStrokesRenderCorrectly_Vulkan.png
+impeller_Play_AiksTest_SrgbToLinearFilterSubpassCollapseOptimization_Metal.png
+impeller_Play_AiksTest_SrgbToLinearFilterSubpassCollapseOptimization_OpenGLES.png
+impeller_Play_AiksTest_SrgbToLinearFilterSubpassCollapseOptimization_Vulkan.png
+impeller_Play_AiksTest_StrokedCirclesRenderCorrectly_Metal.png
+impeller_Play_AiksTest_StrokedCirclesRenderCorrectly_OpenGLES.png
+impeller_Play_AiksTest_StrokedCirclesRenderCorrectly_Vulkan.png
+impeller_Play_AiksTest_SubpassWithClearColorOptimization_Metal.png
+impeller_Play_AiksTest_SubpassWithClearColorOptimization_OpenGLES.png
+impeller_Play_AiksTest_SubpassWithClearColorOptimization_Vulkan.png
+impeller_Play_AiksTest_TextForegroundShaderWithTransform_Metal.png
+impeller_Play_AiksTest_TextForegroundShaderWithTransform_OpenGLES.png
+impeller_Play_AiksTest_TextForegroundShaderWithTransform_Vulkan.png
+impeller_Play_AiksTest_TextFrameSubpixelAlignment_Metal.png
+impeller_Play_AiksTest_TextFrameSubpixelAlignment_OpenGLES.png
+impeller_Play_AiksTest_TextFrameSubpixelAlignment_Vulkan.png
+impeller_Play_AiksTest_TranslucentSaveLayerDrawsCorrectly_Metal.png
+impeller_Play_AiksTest_TranslucentSaveLayerDrawsCorrectly_OpenGLES.png
+impeller_Play_AiksTest_TranslucentSaveLayerDrawsCorrectly_Vulkan.png
+impeller_Play_AiksTest_TranslucentSaveLayerImageDrawsCorrectly_Metal.png
+impeller_Play_AiksTest_TranslucentSaveLayerImageDrawsCorrectly_OpenGLES.png
+impeller_Play_AiksTest_TranslucentSaveLayerImageDrawsCorrectly_Vulkan.png
+impeller_Play_AiksTest_TranslucentSaveLayerWithAdvancedBlendModeDrawsCorrectly_Metal.png
+impeller_Play_AiksTest_TranslucentSaveLayerWithAdvancedBlendModeDrawsCorrectly_OpenGLES.png
+impeller_Play_AiksTest_TranslucentSaveLayerWithAdvancedBlendModeDrawsCorrectly_Vulkan.png
+impeller_Play_AiksTest_TranslucentSaveLayerWithBlendColorFilterDrawsCorrectly_Metal.png
+impeller_Play_AiksTest_TranslucentSaveLayerWithBlendColorFilterDrawsCorrectly_OpenGLES.png
+impeller_Play_AiksTest_TranslucentSaveLayerWithBlendColorFilterDrawsCorrectly_Vulkan.png
+impeller_Play_AiksTest_TranslucentSaveLayerWithBlendImageFilterDrawsCorrectly_Metal.png
+impeller_Play_AiksTest_TranslucentSaveLayerWithBlendImageFilterDrawsCorrectly_OpenGLES.png
+impeller_Play_AiksTest_TranslucentSaveLayerWithBlendImageFilterDrawsCorrectly_Vulkan.png
+impeller_Play_AiksTest_TranslucentSaveLayerWithColorAndImageFilterDrawsCorrectly_Metal.png
+impeller_Play_AiksTest_TranslucentSaveLayerWithColorAndImageFilterDrawsCorrectly_OpenGLES.png
+impeller_Play_AiksTest_TranslucentSaveLayerWithColorAndImageFilterDrawsCorrectly_Vulkan.png
+impeller_Play_AiksTest_TranslucentSaveLayerWithColorFilterAndImageFilterDrawsCorrectly_Metal.png
+impeller_Play_AiksTest_TranslucentSaveLayerWithColorFilterAndImageFilterDrawsCorrectly_OpenGLES.png
+impeller_Play_AiksTest_TranslucentSaveLayerWithColorFilterAndImageFilterDrawsCorrectly_Vulkan.png
+impeller_Play_AiksTest_TranslucentSaveLayerWithColorMatrixColorFilterDrawsCorrectly_Metal.png
+impeller_Play_AiksTest_TranslucentSaveLayerWithColorMatrixColorFilterDrawsCorrectly_OpenGLES.png
+impeller_Play_AiksTest_TranslucentSaveLayerWithColorMatrixColorFilterDrawsCorrectly_Vulkan.png
+impeller_Play_AiksTest_TranslucentSaveLayerWithColorMatrixImageFilterDrawsCorrectly_Metal.png
+impeller_Play_AiksTest_TranslucentSaveLayerWithColorMatrixImageFilterDrawsCorrectly_OpenGLES.png
+impeller_Play_AiksTest_TranslucentSaveLayerWithColorMatrixImageFilterDrawsCorrectly_Vulkan.png
+impeller_Play_AiksTest_VerticesGeometryUVPositionDataWithTranslate_Metal.png
+impeller_Play_AiksTest_VerticesGeometryUVPositionDataWithTranslate_OpenGLES.png
+impeller_Play_AiksTest_VerticesGeometryUVPositionDataWithTranslate_Vulkan.png
+impeller_Play_AiksTest_VerticesGeometryUVPositionData_Metal.png
+impeller_Play_AiksTest_VerticesGeometryUVPositionData_OpenGLES.png
+impeller_Play_AiksTest_VerticesGeometryUVPositionData_Vulkan.png
\ No newline at end of file
diff --git a/testing/impeller_vulkan_test_status.csv b/testing/impeller_vulkan_test_status.csv
deleted file mode 100644
index 517d67ef9f33e4e632f408d5021accfd1441be01..0000000000000000000000000000000000000000
--- a/testing/impeller_vulkan_test_status.csv
+++ /dev/null
@@ -1,141 +0,0 @@
-test,status
-CanRenderImage/Vulkan,fail
-CanRenderTiledTexture/Vulkan,fail
-CanRenderImageRect/Vulkan,fail
-CoordinateConversionsAreCorrect/Vulkan,fail
-CanRenderDifferencePaths/Vulkan,fail
-SaveLayerFiltersScaleWithTransform/Vulkan,fail
-CanDrawImage/Vulkan,fail
-CanDrawWithMaskBlur/Vulkan,fail
-CanDrawWithBlendColorFilter/Vulkan,fail
-CanDrawWithColorFilterImageFilter/Vulkan,fail
-CanDrawWithImageBlurFilter/Vulkan,fail
-CanDrawWithComposeImageFilter/Vulkan,fail
-CanClampTheResultingColorOfColorMatrixFilter/Vulkan,fail
-SaveLayerWithColorMatrixFiltersAndAlphaDrawCorrectly/Vulkan,fail
-SaveLayerWithBlendFiltersAndAlphaDrawCorrectly/Vulkan,fail
-CanDrawBackdropFilter/Vulkan,fail
-CanDrawNinePatchImage/Vulkan,fail
-CanDrawNinePatchImageCenterWidthBiggerThanDest/Vulkan,fail
-CanDrawNinePatchImageCenterHeightBiggerThanDest/Vulkan,fail
-CanDrawNinePatchImageCenterBiggerThanDest/Vulkan,fail
-CanDrawNinePatchImageCornersScaledDown/Vulkan,fail
-CanDrawWithMatrixFilter/Vulkan,fail
-CanDrawPaintWithColorSource/Vulkan,fail
-FilterCoverageRespectsCropRect/Vulkan,fail
-Filters/Vulkan,fail
-GaussianBlurFilter/Vulkan,fail
-MorphologyFilter/Vulkan,fail
-DrawAtlasNoColor/Vulkan,fail
-DrawAtlasWithColor/Vulkan,fail
-DrawAtlasUsesProvidedCullRectForCoverage/Vulkan,fail
-DrawAtlasWithOpacity/Vulkan,fail
-DrawAtlasNoColorFullSize/Vulkan,fail
-ColorMatrixFilterEditable/Vulkan,fail
-LinearToSrgbFilter/Vulkan,fail
-SrgbToLinearFilter/Vulkan,fail
-CanCreateBoxPrimitive/Vulkan,fail
-CanRenderPerspectiveCube/Vulkan,fail
-CanRenderMultiplePrimitives/Vulkan,fail
-CanRenderToTexture/Vulkan,fail
-CanBlitTextureToTexture/Vulkan,fail
-CanGenerateMipmaps/Vulkan,fail
-TheImpeller/Vulkan,fail
-InactiveUniforms/Vulkan,fail
-CanCreateGlyphAtlas/Vulkan,fail
-GlyphAtlasWithOddUniqueGlyphSize/Vulkan,fail
-CanRegisterStage/Vulkan,pass
-CanCreatePipelineFromRuntimeStage/Vulkan,pass
-CanvasCTMCanBeUpdated/Vulkan,pass
-CanvasCanPushPopCTM/Vulkan,pass
-CanRenderColoredRect/Vulkan,pass
-CanRenderStrokes/Vulkan,pass
-CanRenderCurvedStrokes/Vulkan,pass
-CanRenderClips/Vulkan,pass
-CanRenderNestedClips/Vulkan,pass
-CanRenderDifferenceClips/Vulkan,pass
-ClipsUseCurrentTransform/Vulkan,pass
-CanSaveLayerStandalone/Vulkan,pass
-CanRenderLinearGradient/Vulkan,pass
-CanRenderLinearGradientManyColors/Vulkan,pass
-CanRenderLinearGradientWayManyColors/Vulkan,pass
-CanRenderLinearGradientManyColorsUnevenStops/Vulkan,pass
-CanRenderRadialGradient/Vulkan,pass
-CanRenderRadialGradientManyColors/Vulkan,pass
-CanRenderSweepGradient/Vulkan,pass
-CanRenderSweepGradientManyColors/Vulkan,pass
-CanRenderDifferentShapesWithSameColorSource/Vulkan,pass
-CanPictureConvertToImage/Vulkan,pass
-BlendModeShouldCoverWholeScreen/Vulkan,pass
-CanRenderGroupOpacity/Vulkan,pass
-CanPerformFullScreenMSAA/Vulkan,pass
-CanPerformSkew/Vulkan,pass
-CanPerformSaveLayerWithBounds/Vulkan,pass
-CanPerformSaveLayerWithBoundsAndLargerIntermediateIsNotAllocated/Vulkan,pass
-CanRenderRoundedRectWithNonUniformRadii/Vulkan,pass
-CanRenderTextFrame/Vulkan,pass
-CanRenderItalicizedText/Vulkan,pass
-CanRenderEmojiTextFrame/Vulkan,pass
-CanRenderTextInSaveLayer/Vulkan,pass
-CanDrawPaint/Vulkan,pass
-PaintBlendModeIsRespected/Vulkan,pass
-ColorWheel/Vulkan,pass
-TransformMultipliesCorrectly/Vulkan,pass
-SolidStrokesRenderCorrectly/Vulkan,pass
-GradientStrokesRenderCorrectly/Vulkan,pass
-CoverageOriginShouldBeAccountedForInSubpasses/Vulkan,fail
-DrawRectStrokesRenderCorrectly/Vulkan,pass
-SaveLayerDrawsBehindSubsequentEntities/Vulkan,pass
-SiblingSaveLayerBoundsAreRespected/Vulkan,pass
-CanRenderClippedLayers/Vulkan,pass
-CanDrawRect/Vulkan,pass
-CanDrawTextBlob/Vulkan,pass
-CanDrawCapsAndJoins/Vulkan,pass
-CanDrawArc/Vulkan,pass
-StrokedPathsDrawCorrectly/Vulkan,pass
-CanDrawWithOddPathWinding/Vulkan,pass
-CanDrawPoints/Vulkan,pass
-CanDrawZeroLengthLine/Vulkan,pass
-CanDrawShadow/Vulkan,pass
-CanConvertTriangleFanToTriangles/Vulkan,pass
-CanDrawZeroWidthLine/Vulkan,pass
-CanDrawRectWithLinearToSrgbColorFilter/Vulkan,pass
-CanBlendDstOverAndDstCorrectly/Vulkan,pass
-CanCreateEntity/Vulkan,pass
-EntityPassCoverageRespectsDelegateBoundsHint/Vulkan,pass
-EntityPassCoverageRespectsCoverageLimit/Vulkan,pass
-CanDrawRect/Vulkan,pass
-ThreeStrokesInOnePath/Vulkan,pass
-TriangleInsideASquare/Vulkan,pass
-StrokeCapAndJoinTest/Vulkan,pass
-CubicCurveTest/Vulkan,pass
-CubicCurveAndOverlapTest/Vulkan,pass
-SolidColorContentsStrokeSetStrokeCapsAndJoins/Vulkan,pass
-SolidColorContentsStrokeSetMiterLimit/Vulkan,pass
-BlendingModeOptions/Vulkan,pass
-BezierCircleScaled/Vulkan,pass
-SetBlendMode/Vulkan,pass
-ContentsGetBoundsForEmptyPathReturnsNullopt/Vulkan,pass
-SolidStrokeCoverageIsCorrect/Vulkan,pass
-BorderMaskBlurCoverageIsCorrect/Vulkan,pass
-DrawVerticesSolidColorTrianglesWithoutIndices/Vulkan,pass
-DrawVerticesLinearGradientWithoutIndices/Vulkan,pass
-DrawVerticesSolidColorTrianglesWithIndices/Vulkan,pass
-SolidFillCoverageIsCorrect/Vulkan,pass
-SolidFillShouldRenderIsCorrect/Vulkan,pass
-ClipContentsShouldRenderIsCorrect/Vulkan,pass
-RRectShadowTest/Vulkan,pass
-ColorMatrixFilterCoverageIsCorrect/Vulkan,pass
-LinearToSrgbFilterCoverageIsCorrect/Vulkan,pass
-SrgbToLinearFilterCoverageIsCorrect/Vulkan,pass
-TTTBlendColor/Vulkan,pass
-SdfText/Vulkan,pass
-RuntimeEffect/Vulkan,pass
-ArrayUniforms/Vulkan,pass
-CanCreateCPUBackedTexture/Vulkan,pass
-DefaultIndexSize/Vulkan,pass
-VertexBufferBuilder/Vulkan,pass
-CanCreateComputePass/Vulkan,pass
-CanConvertTextBlob/Vulkan,pass
-CanCreateRenderContext/Vulkan,pass
-LazyAtlasTracksColor/Vulkan,pass
diff --git a/testing/ios/IosUnitTests/App/AppDelegate.h b/testing/ios/IosUnitTests/App/AppDelegate.h
index b9c2cbb009868076b7dcbea6d94771f8cc6428a7..c987bb4da9e7a49e22d5f0460c648c50ffa7c5df 100644
--- a/testing/ios/IosUnitTests/App/AppDelegate.h
+++ b/testing/ios/IosUnitTests/App/AppDelegate.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_TESTING_IOS_IOSUNITTESTS_APP_APPDELEGATE_H_
+#define FLUTTER_TESTING_IOS_IOSUNITTESTS_APP_APPDELEGATE_H_
+
 #import <UIKit/UIKit.h>
 
 @interface AppDelegate : UIResponder <UIApplicationDelegate>
@@ -9,3 +12,5 @@
 @property(strong, nonatomic) UIWindow* window;
 
 @end
+
+#endif  // FLUTTER_TESTING_IOS_IOSUNITTESTS_APP_APPDELEGATE_H_
diff --git a/testing/ios/IosUnitTests/App/ViewController.h b/testing/ios/IosUnitTests/App/ViewController.h
index 4f235259bfecc8dc92c3fb0a4bba2be436c19000..86d739de890f3c054e0a334a74369255024416ad 100644
--- a/testing/ios/IosUnitTests/App/ViewController.h
+++ b/testing/ios/IosUnitTests/App/ViewController.h
@@ -2,8 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_TESTING_IOS_IOSUNITTESTS_APP_VIEWCONTROLLER_H_
+#define FLUTTER_TESTING_IOS_IOSUNITTESTS_APP_VIEWCONTROLLER_H_
+
 #import <UIKit/UIKit.h>
 
 @interface ViewController : UIViewController
 
 @end
+
+#endif  // FLUTTER_TESTING_IOS_IOSUNITTESTS_APP_VIEWCONTROLLER_H_
diff --git a/testing/ios/IosUnitTests/IosUnitTests.xcodeproj/project.pbxproj b/testing/ios/IosUnitTests/IosUnitTests.xcodeproj/project.pbxproj
index b14ff6444597dfa3552ddad6f9425d6286c89600..0ff04e310ac7245215d6e9213f310444ffeed982 100644
--- a/testing/ios/IosUnitTests/IosUnitTests.xcodeproj/project.pbxproj
+++ b/testing/ios/IosUnitTests/IosUnitTests.xcodeproj/project.pbxproj
@@ -50,7 +50,6 @@
 		0AC232F724BA71D300A85907 /* FlutterEngineTest.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = FlutterEngineTest.mm; sourceTree = "<group>"; };
 		0AC2330324BA71D300A85907 /* accessibility_bridge_test.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = accessibility_bridge_test.mm; sourceTree = "<group>"; };
 		0AC2330B24BA71D300A85907 /* FlutterTextInputPluginTest.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = FlutterTextInputPluginTest.mm; sourceTree = "<group>"; };
-		0AC2330F24BA71D300A85907 /* FlutterBinaryMessengerRelayTest.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = FlutterBinaryMessengerRelayTest.mm; sourceTree = "<group>"; };
 		0AC2331024BA71D300A85907 /* connection_collection_test.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = connection_collection_test.mm; sourceTree = "<group>"; };
 		0AC2331224BA71D300A85907 /* FlutterEnginePlatformViewTest.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = FlutterEnginePlatformViewTest.mm; sourceTree = "<group>"; };
 		0AC2331924BA71D300A85907 /* FlutterPluginAppLifeCycleDelegateTest.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = FlutterPluginAppLifeCycleDelegateTest.mm; sourceTree = "<group>"; };
@@ -69,10 +68,10 @@
 		0D6AB6C922BB05E200EEE540 /* IosUnitTestsTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = IosUnitTestsTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		0D6AB6CF22BB05E200EEE540 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		0D6AB73E22BD8F0200EEE540 /* FlutterEngineConfig.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = FlutterEngineConfig.xcconfig; sourceTree = "<group>"; };
+		3DD7D38C27D2B81000DA365C /* FlutterUndoManagerPluginTest.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = FlutterUndoManagerPluginTest.mm; sourceTree = "<group>"; };
 		689EC1E2281B30D3008FEB58 /* FlutterSpellCheckPluginTest.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = FlutterSpellCheckPluginTest.mm; sourceTree = "<group>"; };
 		68B6091227F62F990036AC78 /* VsyncWaiterIosTest.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = VsyncWaiterIosTest.mm; sourceTree = "<group>"; };
-		3DD7D38C27D2B81000DA365C /* FlutterUndoManagerPluginTest.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = FlutterUndoManagerPluginTest.mm; sourceTree = "<group>"; };
-        73F12C22288F92FF00AFC3A6 /* FlutterViewControllerTest_mrc.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = FlutterViewControllerTest_mrc.mm; sourceTree = "<group>"; };
+		D2D361A52B234EAC0018964E /* FlutterMetalLayerTest.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = FlutterMetalLayerTest.mm; sourceTree = "<group>"; };
 		F7521D7226BB671E005F15C5 /* libios_test_flutter.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libios_test_flutter.dylib; path = "../../../../out/$(FLUTTER_ENGINE)/libios_test_flutter.dylib"; sourceTree = "<group>"; };
 		F7521D7526BB673E005F15C5 /* libocmock_shared.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libocmock_shared.dylib; path = "../../../../out/$(FLUTTER_ENGINE)/libocmock_shared.dylib"; sourceTree = "<group>"; };
 		F77E081726FA9CE6003E6E4C /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = "../../../../out/$(FLUTTER_ENGINE)/Flutter.framework"; sourceTree = "<group>"; };
@@ -108,12 +107,11 @@
 				0AC232F724BA71D300A85907 /* FlutterEngineTest.mm */,
 				0AC2330324BA71D300A85907 /* accessibility_bridge_test.mm */,
 				0AC2330B24BA71D300A85907 /* FlutterTextInputPluginTest.mm */,
-				0AC2330F24BA71D300A85907 /* FlutterBinaryMessengerRelayTest.mm */,
 				0AC2331024BA71D300A85907 /* connection_collection_test.mm */,
 				0AC2331224BA71D300A85907 /* FlutterEnginePlatformViewTest.mm */,
 				0AC2331924BA71D300A85907 /* FlutterPluginAppLifeCycleDelegateTest.mm */,
 				0AC2332124BA71D300A85907 /* FlutterViewControllerTest.mm */,
-				73F12C22288F92FF00AFC3A6 /* FlutterViewControllerTest_mrc.mm */,
+				D2D361A52B234EAC0018964E /* FlutterMetalLayerTest.mm */,
 			);
 			name = Source;
 			path = ../../../shell/platform/darwin/ios/framework/Source;
@@ -511,7 +509,7 @@
 					"$(PROJECT_DIR)/Tests",
 					../../../../out/$FLUTTER_ENGINE,
 					../../../../out/$FLUTTER_ENGINE/obj/flutter/shell/platform/darwin/ios/,
-					../../../../out/$FLUTTER_ENGINE/obj/third_party/ocmock/,
+					../../../../out/$FLUTTER_ENGINE/obj/flutter/third_party/ocmock/,
 					"$(PROJECT_DIR)",
 				);
 				OTHER_LDFLAGS = (
@@ -522,7 +520,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.google.flutter.IosUnitTestsTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SYSTEM_HEADER_SEARCH_PATHS = ../../../../third_party/ocmock/Source/;
+				SYSTEM_HEADER_SEARCH_PATHS = ../../../third_party/ocmock/Source/;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/IosUnitTests.app/IosUnitTests";
 			};
@@ -556,7 +554,7 @@
 					"$(PROJECT_DIR)/Tests",
 					../../../../out/$FLUTTER_ENGINE,
 					../../../../out/$FLUTTER_ENGINE/obj/flutter/shell/platform/darwin/ios/,
-					../../../../out/$FLUTTER_ENGINE/obj/third_party/ocmock/,
+					../../../../out/$FLUTTER_ENGINE/obj/flutter/third_party/ocmock/,
 					"$(PROJECT_DIR)",
 				);
 				OTHER_LDFLAGS = (
@@ -567,7 +565,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.google.flutter.IosUnitTestsTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SYSTEM_HEADER_SEARCH_PATHS = ../../../../third_party/ocmock/Source/;
+				SYSTEM_HEADER_SEARCH_PATHS = ../../../third_party/ocmock/Source/;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/IosUnitTests.app/IosUnitTests";
 			};
diff --git a/testing/ios/IosUnitTests/IosUnitTests.xcodeproj/xcshareddata/xcschemes/IosUnitTests.xcscheme b/testing/ios/IosUnitTests/IosUnitTests.xcodeproj/xcshareddata/xcschemes/IosUnitTests.xcscheme
index b1341fc8d5c2a6721a3b768e10b260ab7b047725..cb0776ee41f7bda0c6827196c500065bea3d5734 100644
--- a/testing/ios/IosUnitTests/IosUnitTests.xcodeproj/xcshareddata/xcschemes/IosUnitTests.xcscheme
+++ b/testing/ios/IosUnitTests/IosUnitTests.xcodeproj/xcshareddata/xcschemes/IosUnitTests.xcscheme
@@ -26,8 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      systemAttachmentLifetime = "keepNever">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <AdditionalOptions>
          <AdditionalOption
             key = "MallocStackLogging"
diff --git a/testing/ios/IosUnitTests/README.md b/testing/ios/IosUnitTests/README.md
index 557fb6e29b1548e41dd11193fc601168e6e10aee..0f40aea9b82f3f22ede8013c99e6df1c296dcfd4 100644
--- a/testing/ios/IosUnitTests/README.md
+++ b/testing/ios/IosUnitTests/README.md
@@ -1,16 +1,38 @@
 # iOS Unit Tests
 
-These are the unit tests for iOS engine.  They can be executed locally and are
+These are the unit tests for iOS engine. They can be executed locally and are
 also run in LUCI builds.
 
-## Running Tests
+## Running Tests from command line
 
-To build and run the iOS tests, run the following script from the src directory:
+To build and run the iOS tests, use the `run_tests` script from the `src` directory.
 
 ```sh
 flutter/testing/run_tests.py --type=objc
 ```
 
+And if you're on Apple Silicon:
+
+```sh
+./flutter/testing/run_tests.py \
+  --type=objc \
+  --ios-variant ios_debug_sim_unopt_arm64
+```
+
+The `.xcresult` is automatically removed after testing ends. To change this:
+
+```sh
+export FLUTTER_TEST_OUTPUTS_DIR=~/Desktop
+```
+
+To learn more:
+
+```
+flutter/testing/run_tests.py --help
+```
+
+## Running Tests from Xcode
+
 After the `ios_test_flutter` target is built you can also run the tests inside
 of Xcode with `testing/ios/IosUnitTests/IosUnitTests.xcodeproj`.
 
diff --git a/testing/ios/IosUnitTests/Tests/FlutterEngineConfig.xcconfig b/testing/ios/IosUnitTests/Tests/FlutterEngineConfig.xcconfig
index 8d3437a336fb1f4167c39dd30958ad82819c3b6f..8f5ca977be7a1d0c2d71851de2b25a72a2666161 100644
--- a/testing/ios/IosUnitTests/Tests/FlutterEngineConfig.xcconfig
+++ b/testing/ios/IosUnitTests/Tests/FlutterEngineConfig.xcconfig
@@ -1 +1,3 @@
-FLUTTER_ENGINE=ios_debug_sim_unopt
+FLUTTER_ENGINE[arch=x86_64]=ios_debug_sim_unopt
+FLUTTER_ENGINE[arch=arm64]=ios_debug_sim_unopt_arm64
+FLUTTER_ENGINE=ios_debug_sim_unopt_arm64
diff --git a/testing/litetest/lib/src/matchers.dart b/testing/litetest/lib/src/matchers.dart
index e41f09ad57c9fbf0e3adc865a40828c7d6407e50..5c40eacc093dbf43e6c54862cb605d640e6de707 100644
--- a/testing/litetest/lib/src/matchers.dart
+++ b/testing/litetest/lib/src/matchers.dart
@@ -62,8 +62,8 @@ void isNotEmpty(dynamic d) {
 /// Gives a [Matcher] that asserts that the value being matched is within
 /// `tolerance` of `value`.
 Matcher closeTo(num value, num tolerance) => (dynamic actual) {
-  Expect.approxEquals(value, actual as num, tolerance);
-};
+      Expect.approxEquals(value, actual as num, tolerance);
+    };
 
 /// A [Matcher] that matches NaN.
 void isNaN(dynamic v) {
@@ -74,8 +74,8 @@ void isNaN(dynamic v) {
 /// Gives a [Matcher] that asserts that the value being matched is not equal to
 /// `unexpected`.
 Matcher notEquals(dynamic unexpected) => (dynamic actual) {
-  Expect.notEquals(unexpected, actual);
-};
+      Expect.notEquals(unexpected, actual);
+    };
 
 /// A [Matcher] that matches non-zero values.
 void isNonZero(dynamic d) {
@@ -90,44 +90,76 @@ void throwsRangeError(dynamic d) {
 /// Gives a [Matcher] that asserts that the value being matched is a [String]
 /// that contains `s` as a substring.
 Matcher contains(String s) => (dynamic d) {
-  expect(d, isInstanceOf<String>());
-  Expect.contains(s, d as String);
-};
+      expect(d, isInstanceOf<String>());
+      Expect.contains(s, d as String);
+    };
 
 /// Gives a [Matcher] that asserts that the value being matched is an [Iterable]
 /// of length `d`.
 Matcher hasLength(int l) => (dynamic d) {
-  expect(d, isInstanceOf<Iterable<dynamic>>());
-  expect((d as Iterable<dynamic>).length, equals(l));
-};
+      expect(d, isInstanceOf<Iterable<dynamic>>());
+      expect((d as Iterable<dynamic>).length, equals(l));
+    };
 
 /// Gives a matcher that asserts that the value being matched is a [String] that
 /// starts with `s`.
 Matcher startsWith(String s) => (dynamic d) {
-  expect(d, isInstanceOf<String>());
-  final String h = d as String;
-  if (!h.startsWith(s)) {
-    Expect.fail('Expected "$h" to start with "$s"');
-  }
-};
+      expect(d, isInstanceOf<String>());
+      final String h = d as String;
+      if (!h.startsWith(s)) {
+        Expect.fail('Expected "$h" to start with "$s"');
+      }
+    };
 
 /// Gives a matcher that asserts that the value being matched is a [String] that
 /// ends with `s`.
 Matcher endsWith(String s) => (dynamic d) {
-  expect(d, isInstanceOf<String>());
-  final String h = d as String;
-  if (!h.endsWith(s)) {
-    Expect.fail('Expected "$h" to end with "$s"');
-  }
-};
+      expect(d, isInstanceOf<String>());
+      final String h = d as String;
+      if (!h.endsWith(s)) {
+        Expect.fail('Expected "$h" to end with "$s"');
+      }
+    };
 
 /// Gives a matcher that asserts that the value being matched is a [String] that
 /// regexp matches with `pattern`.
 Matcher hasMatch(String pattern) => (dynamic d) {
-  expect(d, isInstanceOf<String>());
-  final String h = d as String;
-  final RegExp regExp = RegExp(pattern);
-  if (!regExp.hasMatch(h)) {
-    Expect.fail('Expected "$h" to match with "$pattern"');
-  }
-};
+      expect(d, isInstanceOf<String>());
+      final String h = d as String;
+      final RegExp regExp = RegExp(pattern);
+      if (!regExp.hasMatch(h)) {
+        Expect.fail('Expected "$h" to match with "$pattern"');
+      }
+    };
+
+/// Gives a matcher that asserts that the value being matched is a
+/// `List<String>` that contains the entries in `pattern` in order.
+/// There may be values that are not in the pattern interleaved.
+Matcher containsStringsInOrder(List<String> pattern) => (dynamic d) {
+      expect(d, isInstanceOf<List<String>>());
+      final List<String> input = d as List<String>;
+      int cursor = 0;
+      for (final String el in input) {
+        if (cursor == pattern.length) {
+          break;
+        }
+        if (el == pattern[cursor]) {
+          cursor++;
+        }
+      }
+      if (cursor < pattern.length) {
+        Expect.fail('Did not find ${pattern[cursor]} in $d');
+      }
+    };
+
+/// Gives a matcher that asserts that the value being matched is a
+/// `List<String>` that does not contain any of the values in `unexpected`.
+Matcher doesNotContainAny(List<String> unexpected) => (dynamic d) {
+      expect(d, isInstanceOf<List<String>>());
+      final List<String> input = d as List<String>;
+      for (final String string in input) {
+        if (unexpected.contains(string)) {
+          Expect.fail("String '$d' is unexpected");
+        }
+      }
+    };
diff --git a/testing/litetest/lib/src/test_suite.dart b/testing/litetest/lib/src/test_suite.dart
index f701a9f3607cf2fea1ee34d2a40bc7dd837fa8d3..7ea0f4505e8e2b220fa767a08c4c85051a594471 100644
--- a/testing/litetest/lib/src/test_suite.dart
+++ b/testing/litetest/lib/src/test_suite.dart
@@ -40,12 +40,22 @@ class TestSuite {
       );
     }
     if (skip) {
-      _logger.writeln('Test $name: Skipped');
+      _logger.writeln('Test "$name": Skipped');
+      _primeQueue();
       return;
     }
     _pushTest(name, body);
   }
 
+  void _primeQueue() {
+    if (!_testQueuePrimed) {
+      // All tests() must be added synchronously with main, so we can enqueue an
+      // event to start all tests to run after main() is done.
+      Timer.run(_startAllTests);
+      _testQueuePrimed = true;
+    }
+  }
+
   void _pushTest(
     String name,
     dynamic Function() body,
@@ -53,12 +63,7 @@ class TestSuite {
     final Test newTest = Test(name, body, logger: _logger);
     _testQueue.add(newTest);
     newTest.state = TestState.queued;
-    if (!_testQueuePrimed) {
-      // All tests() must be added synchronously with main, so we can enqueue an
-      // event to start all tests to run after main() is done.
-      Timer.run(_startAllTests);
-      _testQueuePrimed = true;
-    }
+    _primeQueue();
   }
 
   void _startAllTests() {
@@ -72,6 +77,10 @@ class TestSuite {
       });
     }
     _lifecycle.onStart();
+    if (_testQueue.isEmpty) {
+      _logger.writeln('All tests skipped.');
+      _lifecycle.onDone(_testQueue);
+    }
   }
 }
 
diff --git a/testing/litetest/pubspec.yaml b/testing/litetest/pubspec.yaml
index 905a4999a9d30c87b227f0b7355c22fa0cde72b7..ee8f8fd4dda6301af901b36c6744014f496b5b60 100644
--- a/testing/litetest/pubspec.yaml
+++ b/testing/litetest/pubspec.yaml
@@ -14,7 +14,7 @@ publish_to: none
 # relative to this directory into //third_party/dart
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=3.2.0-0 <4.0.0'
 
 dependencies:
   async_helper: any
diff --git a/testing/litetest/test/litetest_test.dart b/testing/litetest/test/litetest_test.dart
index c8e61a2b156239314e4f4155855b69f24cf04380..3a42d8328ffcc429f9d74843cdcd287d8a911905 100644
--- a/testing/litetest/test/litetest_test.dart
+++ b/testing/litetest/test/litetest_test.dart
@@ -4,6 +4,7 @@
 
 import 'dart:async';
 import 'dart:collection';
+import 'dart:isolate';
 
 import 'package:async_helper/async_helper.dart';
 import 'package:async_helper/async_minitest.dart';
@@ -13,6 +14,25 @@ import 'package:litetest/src/test_suite.dart';
 Future<void> main() async {
   asyncStart();
 
+  test('skip', () async {
+    final StringBuffer buffer = StringBuffer();
+    final TestLifecycle lifecycle = TestLifecycle();
+    final TestSuite ts = TestSuite(
+      logger: buffer,
+      lifecycle: lifecycle,
+    );
+
+    ts.test('Test', () {
+      expect(1, equals(1));
+    }, skip: true);
+    final bool result = await lifecycle.result;
+
+    expect(result, true);
+    expect(buffer.toString(), equals(
+      'Test "Test": Skipped\nAll tests skipped.\n',
+    ));
+  });
+
   test('test', () async {
     final StringBuffer buffer = StringBuffer();
     final TestLifecycle lifecycle = TestLifecycle();
@@ -211,6 +231,8 @@ Test "Test3": Passed
 }
 
 class TestLifecycle implements Lifecycle {
+  final ReceivePort port = ReceivePort();
+
   final Completer<bool> _testCompleter = Completer<bool>();
 
   Future<bool> get result => _testCompleter.future;
@@ -225,5 +247,6 @@ class TestLifecycle implements Lifecycle {
       testsSucceeded = testsSucceeded && (t.state == TestState.succeeded);
     }
     _testCompleter.complete(testsSucceeded);
+    port.close();
   }
 }
diff --git a/testing/logger_listener.cc b/testing/logger_listener.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a4ce8408636d4839346c9eadd18bb38d439c30f5
--- /dev/null
+++ b/testing/logger_listener.cc
@@ -0,0 +1,58 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/testing/logger_listener.h"
+
+namespace flutter::testing {
+
+LoggerListener::LoggerListener() = default;
+
+LoggerListener::~LoggerListener() = default;
+
+void testing::LoggerListener::OnTestStart(
+    const ::testing::TestInfo& test_info) {
+  FML_LOG(IMPORTANT) << ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>";
+  FML_LOG(IMPORTANT) << "Starting Test: " << test_info.test_suite_name() << ":"
+                     << test_info.name();
+}
+
+std::string TestStatusAsString(const ::testing::TestResult* result) {
+  if (result == nullptr) {
+    return "UNKNOWN";
+  }
+  if (result->Passed()) {
+    return "PASSED";
+  }
+  if (result->Skipped()) {
+    return "SKIPPED";
+  }
+  if (result->Failed()) {
+    return "FAILED";
+  }
+  return "UNKNOWN";
+}
+
+std::string TestLabel(const ::testing::TestInfo& info) {
+  return std::string{info.test_suite_name()} + "." + info.name();
+}
+
+std::string TestTimeAsString(const ::testing::TestResult* result) {
+  if (result == nullptr) {
+    return "UNKNOWN";
+  }
+  return std::to_string(result->elapsed_time()) + " ms";
+}
+
+void testing::LoggerListener::OnTestEnd(const ::testing::TestInfo& info) {
+  FML_LOG(IMPORTANT) << "Test " << TestStatusAsString(info.result()) << " ("
+                     << TestTimeAsString(info.result())
+                     << "): " << TestLabel(info);
+  FML_LOG(IMPORTANT) << "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<";
+}
+
+void testing::LoggerListener::OnTestDisabled(const ::testing::TestInfo& info) {
+  FML_LOG(IMPORTANT) << "Test Disabled: " << TestLabel(info);
+}
+
+}  // namespace flutter::testing
diff --git a/testing/logger_listener.h b/testing/logger_listener.h
new file mode 100644
index 0000000000000000000000000000000000000000..92a4fafd1f504da7d534febf3e9aae93595ddead
--- /dev/null
+++ b/testing/logger_listener.h
@@ -0,0 +1,35 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_TESTING_LOGGER_LISTENER_H_
+#define FLUTTER_TESTING_LOGGER_LISTENER_H_
+
+#include "flutter/fml/logging.h"
+#include "flutter/testing/testing.h"
+
+namespace flutter::testing {
+
+class LoggerListener : public ::testing::EmptyTestEventListener {
+ public:
+  LoggerListener();
+
+  ~LoggerListener();
+
+  LoggerListener(const LoggerListener&) = delete;
+
+  LoggerListener& operator=(const LoggerListener&) = delete;
+
+  // |testing::EmptyTestEventListener|
+  void OnTestStart(const ::testing::TestInfo& test_info) override;
+
+  // |testing::EmptyTestEventListener|
+  void OnTestEnd(const ::testing::TestInfo& test_info) override;
+
+  // |testing::EmptyTestEventListener|
+  void OnTestDisabled(const ::testing::TestInfo& test_info) override;
+};
+
+}  // namespace flutter::testing
+
+#endif  // FLUTTER_TESTING_LOGGER_LISTENER_H_
diff --git a/testing/lsan_suppressions.txt b/testing/lsan_suppressions.txt
index d6891ae3cf12f2a374b26a24c2b2a16ca92cfedc..9a36fe57ecd6873ed1e8c92f109470d2b4f87045 100644
--- a/testing/lsan_suppressions.txt
+++ b/testing/lsan_suppressions.txt
@@ -68,3 +68,6 @@ leak:g_realloc
 # ANGLE's egl impelementation uses annotations that our LSAN setup does
 # not respect. Ignore leaks from egl::*
 leak:egl::*
+
+# False positives in libfontconfig. http://crbug.com/39050
+leak:libfontconfig
diff --git a/testing/mock_canvas.cc b/testing/mock_canvas.cc
index b53a01ca51caf3a60f9377cf7155e52ee5d3a90c..14628e9e9948904250284143d871f528fa186391 100644
--- a/testing/mock_canvas.cc
+++ b/testing/mock_canvas.cc
@@ -5,8 +5,8 @@
 #include "flutter/testing/mock_canvas.h"
 
 #include "flutter/fml/logging.h"
+#include "flutter/testing/display_list_testing.h"
 #include "third_party/skia/include/core/SkImageInfo.h"
-#include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/core/SkSerialProcs.h"
 #include "third_party/skia/include/core/SkSize.h"
 #include "third_party/skia/include/core/SkTextBlob.h"
@@ -17,75 +17,142 @@ namespace testing {
 constexpr SkISize kSize = SkISize::Make(64, 64);
 
 MockCanvas::MockCanvas()
-    : SkCanvasVirtualEnforcer<SkCanvas>(kSize.fWidth, kSize.fHeight),
-      internal_canvas_(imageInfo().width(), imageInfo().height()),
-      current_layer_(0) {
-  internal_canvas_.addCanvas(this);
-}
+    : tracker_(SkRect::Make(kSize), SkMatrix::I()), current_layer_(0) {}
+
+MockCanvas::MockCanvas(int width, int height)
+    : tracker_(SkRect::MakeIWH(width, height), SkMatrix::I()),
+      current_layer_(0) {}
 
 MockCanvas::~MockCanvas() {
   EXPECT_EQ(current_layer_, 0);
 }
 
-void MockCanvas::willSave() {
+SkISize MockCanvas::GetBaseLayerSize() const {
+  return tracker_.base_device_cull_rect().roundOut().size();
+}
+
+SkImageInfo MockCanvas::GetImageInfo() const {
+  SkISize size = GetBaseLayerSize();
+  return SkImageInfo::MakeUnknown(size.width(), size.height());
+}
+
+void MockCanvas::Save() {
   draw_calls_.emplace_back(
       DrawCall{current_layer_, SaveData{current_layer_ + 1}});
+  tracker_.save();
   current_layer_++;  // Must go here; func params order of eval is undefined
 }
 
-SkCanvas::SaveLayerStrategy MockCanvas::getSaveLayerStrategy(
-    const SaveLayerRec& rec) {
+void MockCanvas::SaveLayer(const SkRect* bounds,
+                           const DlPaint* paint,
+                           const DlImageFilter* backdrop) {
   // saveLayer calls this prior to running, so we use it to track saveLayer
   // calls
   draw_calls_.emplace_back(DrawCall{
       current_layer_,
-      SaveLayerData{rec.fBounds ? *rec.fBounds : SkRect(),
-                    rec.fPaint ? *rec.fPaint : SkPaint(),
-                    rec.fBackdrop ? sk_ref_sp<SkImageFilter>(rec.fBackdrop)
-                                  : sk_sp<SkImageFilter>(),
+      SaveLayerData{bounds ? *bounds : SkRect(), paint ? *paint : DlPaint(),
+                    backdrop ? backdrop->shared() : nullptr,
                     current_layer_ + 1}});
+  tracker_.save();
   current_layer_++;  // Must go here; func params order of eval is undefined
-  return kNoLayer_SaveLayerStrategy;
 }
 
-void MockCanvas::willRestore() {
+void MockCanvas::Restore() {
   FML_DCHECK(current_layer_ > 0);
 
   draw_calls_.emplace_back(
       DrawCall{current_layer_, RestoreData{current_layer_ - 1}});
+  tracker_.restore();
   current_layer_--;  // Must go here; func params order of eval is undefined
 }
 
-void MockCanvas::didConcat44(const SkM44& matrix) {
-  draw_calls_.emplace_back(DrawCall{current_layer_, ConcatMatrixData{matrix}});
+// clang-format off
+
+// 2x3 2D affine subset of a 4x4 transform in row major order
+void MockCanvas::Transform2DAffine(SkScalar mxx, SkScalar mxy, SkScalar mxt,
+                                   SkScalar myx, SkScalar myy, SkScalar myt) {
+  Transform(SkMatrix::MakeAll(mxx, mxy, mxt, myx, myy, myt, 0, 0, 1));
+}
+
+// full 4x4 transform in row major order
+void MockCanvas::TransformFullPerspective(
+    SkScalar mxx, SkScalar mxy, SkScalar mxz, SkScalar mxt,
+    SkScalar myx, SkScalar myy, SkScalar myz, SkScalar myt,
+    SkScalar mzx, SkScalar mzy, SkScalar mzz, SkScalar mzt,
+    SkScalar mwx, SkScalar mwy, SkScalar mwz, SkScalar mwt) {
+  Transform(SkM44(mxx, mxy, mxz, mxt,
+                  myx, myy, myz, myt,
+                  mzx, mzy, mzz, mzt,
+                  mwx, mwy, mwz, mwt));
+}
+
+// clang-format on
+
+void MockCanvas::Transform(const SkMatrix* matrix) {
+  draw_calls_.emplace_back(
+      DrawCall{current_layer_, ConcatMatrixData{SkM44(*matrix)}});
+  tracker_.transform(*matrix);
+}
+
+void MockCanvas::Transform(const SkM44* matrix) {
+  draw_calls_.emplace_back(DrawCall{current_layer_, ConcatMatrixData{*matrix}});
+  tracker_.transform(*matrix);
+}
+
+void MockCanvas::SetTransform(const SkMatrix* matrix) {
+  draw_calls_.emplace_back(
+      DrawCall{current_layer_, SetMatrixData{SkM44(*matrix)}});
+  tracker_.setTransform(*matrix);
+}
+
+void MockCanvas::SetTransform(const SkM44* matrix) {
+  draw_calls_.emplace_back(DrawCall{current_layer_, SetMatrixData{*matrix}});
+  tracker_.setTransform(*matrix);
+}
+
+void MockCanvas::TransformReset() {
+  draw_calls_.emplace_back(DrawCall{current_layer_, SetMatrixData{SkM44()}});
+  tracker_.setIdentity();
+}
+
+void MockCanvas::Translate(SkScalar x, SkScalar y) {
+  this->Transform(SkM44::Translate(x, y));
 }
 
-void MockCanvas::didSetM44(const SkM44& matrix) {
-  draw_calls_.emplace_back(DrawCall{current_layer_, SetMatrixData{matrix}});
+void MockCanvas::Scale(SkScalar x, SkScalar y) {
+  this->Transform(SkM44::Scale(x, y));
 }
 
-void MockCanvas::didScale(SkScalar x, SkScalar y) {
-  this->didConcat44(SkM44::Scale(x, y));
+void MockCanvas::Rotate(SkScalar degrees) {
+  this->Transform(SkMatrix::RotateDeg(degrees));
 }
 
-void MockCanvas::didTranslate(SkScalar x, SkScalar y) {
-  this->didConcat44(SkM44::Translate(x, y));
+void MockCanvas::Skew(SkScalar sx, SkScalar sy) {
+  this->Transform(SkMatrix::Skew(sx, sy));
 }
 
-void MockCanvas::onDrawTextBlob(const SkTextBlob* text,
-                                SkScalar x,
-                                SkScalar y,
-                                const SkPaint& paint) {
+SkM44 MockCanvas::GetTransformFullPerspective() const {
+  return tracker_.matrix_4x4();
+}
+
+SkMatrix MockCanvas::GetTransform() const {
+  return tracker_.matrix_3x3();
+}
+
+void MockCanvas::DrawTextBlob(const sk_sp<SkTextBlob>& text,
+                              SkScalar x,
+                              SkScalar y,
+                              const DlPaint& paint) {
   // This duplicates existing logic in SkCanvas::onDrawPicture
   // that should probably be split out so it doesn't need to be here as well.
-  SkRect storage;
-  if (paint.canComputeFastBounds()) {
-    storage = text->bounds().makeOffset(x, y);
-    SkRect tmp;
-    if (this->quickReject(paint.computeFastBounds(storage, &tmp))) {
-      return;
-    }
-  }
+  // SkRect storage;
+  // if (paint.canComputeFastBounds()) {
+  //   storage = text->bounds().makeOffset(x, y);
+  //   SkRect tmp;
+  //   if (this->quickReject(paint.computeFastBounds(storage, &tmp))) {
+  //     return;
+  //   }
+  // }
 
   draw_calls_.emplace_back(DrawCall{
       current_layer_, DrawTextData{text ? text->serialize(SkSerialProcs{})
@@ -93,193 +160,208 @@ void MockCanvas::onDrawTextBlob(const SkTextBlob* text,
                                    paint, SkPoint::Make(x, y)}});
 }
 
-void MockCanvas::onDrawRect(const SkRect& rect, const SkPaint& paint) {
+void MockCanvas::DrawTextFrame(
+    const std::shared_ptr<impeller::TextFrame>& text_frame,
+    SkScalar x,
+    SkScalar y,
+    const DlPaint& paint) {
+  FML_DCHECK(false);
+}
+
+void MockCanvas::DrawRect(const SkRect& rect, const DlPaint& paint) {
   draw_calls_.emplace_back(DrawCall{current_layer_, DrawRectData{rect, paint}});
 }
 
-void MockCanvas::onDrawPath(const SkPath& path, const SkPaint& paint) {
+void MockCanvas::DrawPath(const SkPath& path, const DlPaint& paint) {
   draw_calls_.emplace_back(DrawCall{current_layer_, DrawPathData{path, paint}});
 }
 
-void MockCanvas::onDrawShadowRec(const SkPath& path,
-                                 const SkDrawShadowRec& rec) {
-  // See: https://bugs.chromium.org/p/skia/issues/detail?id=12125
-  (void)rec;  // Can't use b/c Skia keeps this type anonymous.
-  draw_calls_.emplace_back(DrawCall{current_layer_, DrawShadowData{path}});
+void MockCanvas::DrawShadow(const SkPath& path,
+                            const DlColor color,
+                            const SkScalar elevation,
+                            bool transparent_occluder,
+                            SkScalar dpr) {
+  draw_calls_.emplace_back(DrawCall{
+      current_layer_,
+      DrawShadowData{path, color, elevation, transparent_occluder, dpr}});
 }
 
-void MockCanvas::onDrawImage2(const SkImage* image,
-                              SkScalar x,
-                              SkScalar y,
-                              const SkSamplingOptions& options,
-                              const SkPaint* paint) {
+void MockCanvas::DrawImage(const sk_sp<DlImage>& image,
+                           SkPoint point,
+                           const DlImageSampling options,
+                           const DlPaint* paint) {
   if (paint) {
     draw_calls_.emplace_back(
         DrawCall{current_layer_,
-                 DrawImageData{sk_ref_sp(image), x, y, options, *paint}});
+                 DrawImageData{image, point.fX, point.fY, options, *paint}});
   } else {
-    draw_calls_.emplace_back(DrawCall{
-        current_layer_, DrawImageDataNoPaint{sk_ref_sp(image), x, y, options}});
+    draw_calls_.emplace_back(
+        DrawCall{current_layer_,
+                 DrawImageDataNoPaint{image, point.fX, point.fY, options}});
   }
 }
 
-void MockCanvas::onDrawPicture(const SkPicture* picture,
-                               const SkMatrix* matrix,
-                               const SkPaint* paint) {
-  // This duplicates existing logic in SkCanvas::onDrawPicture
-  // that should probably be split out so it doesn't need to be here as well.
-  if (!paint || paint->canComputeFastBounds()) {
-    SkRect bounds = picture->cullRect();
-    if (paint) {
-      paint->computeFastBounds(bounds, &bounds);
-    }
-    if (matrix) {
-      matrix->mapRect(&bounds);
-    }
-    if (this->quickReject(bounds)) {
-      return;
-    }
-  }
-
-  draw_calls_.emplace_back(DrawCall{
-      current_layer_,
-      DrawPictureData{
-          picture ? picture->serialize() : SkData::MakeUninitialized(0),
-          paint ? *paint : SkPaint(), matrix ? *matrix : SkMatrix()}});
+void MockCanvas::DrawDisplayList(const sk_sp<DisplayList> display_list,
+                                 SkScalar opacity) {
+  draw_calls_.emplace_back(
+      DrawCall{current_layer_, DrawDisplayListData{display_list, opacity}});
 }
 
-void MockCanvas::onClipRect(const SkRect& rect,
-                            SkClipOp op,
-                            ClipEdgeStyle style) {
+void MockCanvas::ClipRect(const SkRect& rect, ClipOp op, bool is_aa) {
+  ClipEdgeStyle style = is_aa ? kSoftClipEdgeStyle : kHardClipEdgeStyle;
   draw_calls_.emplace_back(
       DrawCall{current_layer_, ClipRectData{rect, op, style}});
-  // quickReject() is handled by base class and needs accurate clip information
-  SkCanvas::onClipRect(rect, op, style);
+  tracker_.clipRect(rect, op, is_aa);
 }
 
-void MockCanvas::onClipRRect(const SkRRect& rrect,
-                             SkClipOp op,
-                             ClipEdgeStyle style) {
+void MockCanvas::ClipRRect(const SkRRect& rrect, ClipOp op, bool is_aa) {
+  ClipEdgeStyle style = is_aa ? kSoftClipEdgeStyle : kHardClipEdgeStyle;
   draw_calls_.emplace_back(
       DrawCall{current_layer_, ClipRRectData{rrect, op, style}});
-  // quickReject() is handled by base class and needs accurate clip information
-  SkCanvas::onClipRRect(rrect, op, style);
+  tracker_.clipRRect(rrect, op, is_aa);
 }
 
-void MockCanvas::onClipPath(const SkPath& path,
-                            SkClipOp op,
-                            ClipEdgeStyle style) {
+void MockCanvas::ClipPath(const SkPath& path, ClipOp op, bool is_aa) {
+  ClipEdgeStyle style = is_aa ? kSoftClipEdgeStyle : kHardClipEdgeStyle;
   draw_calls_.emplace_back(
       DrawCall{current_layer_, ClipPathData{path, op, style}});
-  // quickReject() is handled by base class and needs accurate clip information
-  SkCanvas::onClipPath(path, op, style);
+  tracker_.clipPath(path, op, is_aa);
 }
 
-bool MockCanvas::onDoSaveBehind(const SkRect*) {
-  FML_DCHECK(false);
-  return false;
+SkRect MockCanvas::GetDestinationClipBounds() const {
+  return tracker_.device_cull_rect();
 }
 
-void MockCanvas::onDrawAnnotation(const SkRect&, const char[], SkData*) {
-  FML_DCHECK(false);
+SkRect MockCanvas::GetLocalClipBounds() const {
+  return tracker_.local_cull_rect();
 }
 
-void MockCanvas::onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) {
-  FML_DCHECK(false);
+bool MockCanvas::QuickReject(const SkRect& bounds) const {
+  return tracker_.content_culled(bounds);
 }
 
-void MockCanvas::onDrawDrawable(SkDrawable*, const SkMatrix*) {
+void MockCanvas::DrawDRRect(const SkRRect&, const SkRRect&, const DlPaint&) {
   FML_DCHECK(false);
 }
 
-void MockCanvas::onDrawPatch(const SkPoint[12],
-                             const SkColor[4],
-                             const SkPoint[4],
-                             SkBlendMode,
-                             const SkPaint&) {
-  FML_DCHECK(false);
+void MockCanvas::DrawPaint(const DlPaint& paint) {
+  draw_calls_.emplace_back(DrawCall{current_layer_, DrawPaintData{paint}});
 }
 
-void MockCanvas::onDrawPaint(const SkPaint& skPaint) {
-  draw_calls_.emplace_back(DrawCall{current_layer_, DrawPaint{skPaint}});
+void MockCanvas::DrawColor(DlColor color, DlBlendMode mode) {
+  DrawPaint(DlPaint(color).setBlendMode(mode));
 }
 
-void MockCanvas::onDrawBehind(const SkPaint&) {
+void MockCanvas::DrawLine(const SkPoint& p0,
+                          const SkPoint& p1,
+                          const DlPaint& paint) {
   FML_DCHECK(false);
 }
 
-void MockCanvas::onDrawPoints(PointMode,
-                              size_t,
-                              const SkPoint[],
-                              const SkPaint&) {
+void MockCanvas::DrawPoints(PointMode,
+                            uint32_t,
+                            const SkPoint[],
+                            const DlPaint&) {
   FML_DCHECK(false);
 }
 
-void MockCanvas::onDrawRegion(const SkRegion&, const SkPaint&) {
+void MockCanvas::DrawOval(const SkRect&, const DlPaint&) {
   FML_DCHECK(false);
 }
 
-void MockCanvas::onDrawOval(const SkRect&, const SkPaint&) {
+void MockCanvas::DrawCircle(const SkPoint& center,
+                            SkScalar radius,
+                            const DlPaint& paint) {
   FML_DCHECK(false);
 }
 
-void MockCanvas::onDrawArc(const SkRect&,
-                           SkScalar,
-                           SkScalar,
-                           bool,
-                           const SkPaint&) {
+void MockCanvas::DrawArc(const SkRect&,
+                         SkScalar,
+                         SkScalar,
+                         bool,
+                         const DlPaint&) {
   FML_DCHECK(false);
 }
 
-void MockCanvas::onDrawRRect(const SkRRect&, const SkPaint&) {
+void MockCanvas::DrawRRect(const SkRRect&, const DlPaint&) {
   FML_DCHECK(false);
 }
 
-void MockCanvas::onDrawImageRect2(const SkImage*,
-                                  const SkRect&,
-                                  const SkRect&,
-                                  const SkSamplingOptions&,
-                                  const SkPaint*,
-                                  SrcRectConstraint) {
+void MockCanvas::DrawImageRect(const sk_sp<DlImage>&,
+                               const SkRect&,
+                               const SkRect&,
+                               const DlImageSampling,
+                               const DlPaint*,
+                               SrcRectConstraint constraint) {
   FML_DCHECK(false);
 }
 
-void MockCanvas::onDrawImageLattice2(const SkImage*,
-                                     const Lattice&,
-                                     const SkRect&,
-                                     SkFilterMode,
-                                     const SkPaint*) {
+void MockCanvas::DrawImageNine(const sk_sp<DlImage>& image,
+                               const SkIRect& center,
+                               const SkRect& dst,
+                               DlFilterMode filter,
+                               const DlPaint* paint) {
   FML_DCHECK(false);
 }
 
-void MockCanvas::onDrawVerticesObject(const SkVertices*,
-                                      SkBlendMode,
-                                      const SkPaint&) {
+void MockCanvas::DrawVertices(const DlVertices*, DlBlendMode, const DlPaint&) {
   FML_DCHECK(false);
 }
 
-void MockCanvas::onDrawAtlas2(const SkImage*,
-                              const SkRSXform[],
-                              const SkRect[],
-                              const SkColor[],
-                              int,
-                              SkBlendMode,
-                              const SkSamplingOptions&,
-                              const SkRect*,
-                              const SkPaint*) {
+void MockCanvas::DrawAtlas(const sk_sp<DlImage>&,
+                           const SkRSXform[],
+                           const SkRect[],
+                           const DlColor[],
+                           int,
+                           DlBlendMode,
+                           const DlImageSampling,
+                           const SkRect*,
+                           const DlPaint*) {
   FML_DCHECK(false);
 }
 
-void MockCanvas::onDrawEdgeAAQuad(const SkRect&,
-                                  const SkPoint[4],
-                                  QuadAAFlags,
-                                  const SkColor4f&,
-                                  SkBlendMode) {
+void MockCanvas::Flush() {
   FML_DCHECK(false);
 }
 
-void MockCanvas::onClipRegion(const SkRegion&, SkClipOp) {
-  FML_DCHECK(false);
+// --------------------------------------------------------
+// A few ostream operators duplicated from assertions_skia.cc
+// In the short term, there are issues trying to include that file
+// here because it appears in a skia-targeted testing source set
+// and in the long term, DlCanvas, and therefore this file will
+// eventually be cleaned of these SkObject dependencies and these
+// ostream operators will be converted to their DL equivalents.
+static std::ostream& operator<<(std::ostream& os, const SkPoint& r) {
+  return os << "XY: " << r.fX << ", " << r.fY;
+}
+
+static std::ostream& operator<<(std::ostream& os, const SkRect& r) {
+  return os << "LTRB: " << r.fLeft << ", " << r.fTop << ", " << r.fRight << ", "
+            << r.fBottom;
+}
+
+static std::ostream& operator<<(std::ostream& os, const SkRRect& r) {
+  return os << "LTRB: " << r.rect().fLeft << ", " << r.rect().fTop << ", "
+            << r.rect().fRight << ", " << r.rect().fBottom;
+}
+
+static std::ostream& operator<<(std::ostream& os, const SkPath& r) {
+  return os << "Valid: " << r.isValid()
+            << ", FillType: " << static_cast<int>(r.getFillType())
+            << ", Bounds: " << r.getBounds();
+}
+// --------------------------------------------------------
+
+static std::ostream& operator<<(std::ostream& os, const SkM44& m) {
+  os << m.rc(0, 0) << ", " << m.rc(0, 1) << ", " << m.rc(0, 2) << ", "
+     << m.rc(0, 3) << std::endl;
+  os << m.rc(1, 0) << ", " << m.rc(1, 1) << ", " << m.rc(1, 2) << ", "
+     << m.rc(1, 3) << std::endl;
+  os << m.rc(2, 0) << ", " << m.rc(2, 1) << ", " << m.rc(2, 2) << ", "
+     << m.rc(2, 3) << std::endl;
+  os << m.rc(3, 0) << ", " << m.rc(3, 1) << ", " << m.rc(3, 2) << ", "
+     << m.rc(3, 3);
+  return os;
 }
 
 bool operator==(const MockCanvas::SaveData& a, const MockCanvas::SaveData& b) {
@@ -293,7 +375,7 @@ std::ostream& operator<<(std::ostream& os, const MockCanvas::SaveData& data) {
 bool operator==(const MockCanvas::SaveLayerData& a,
                 const MockCanvas::SaveLayerData& b) {
   return a.save_bounds == b.save_bounds && a.restore_paint == b.restore_paint &&
-         a.backdrop_filter == b.backdrop_filter &&
+         Equals(a.backdrop_filter, b.backdrop_filter) &&
          a.save_to_layer == b.save_to_layer;
 }
 
@@ -388,26 +470,28 @@ std::ostream& operator<<(std::ostream& os,
             << data.options;
 }
 
-bool operator==(const MockCanvas::DrawPictureData& a,
-                const MockCanvas::DrawPictureData& b) {
-  return a.serialized_picture->equals(b.serialized_picture.get()) &&
-         a.paint == b.paint && a.matrix == b.matrix;
+bool operator==(const MockCanvas::DrawDisplayListData& a,
+                const MockCanvas::DrawDisplayListData& b) {
+  return a.display_list->Equals(b.display_list) && a.opacity == b.opacity;
 }
 
 std::ostream& operator<<(std::ostream& os,
-                         const MockCanvas::DrawPictureData& data) {
-  return os << data.serialized_picture << " " << data.paint << " "
-            << data.matrix;
+                         const MockCanvas::DrawDisplayListData& data) {
+  auto dl = data.display_list;
+  return os << "[" << dl->unique_id() << " " << dl->op_count() << " "
+            << dl->bytes() << "] " << data.opacity;
 }
 
 bool operator==(const MockCanvas::DrawShadowData& a,
                 const MockCanvas::DrawShadowData& b) {
-  return a.path == b.path;
+  return a.path == b.path && a.color == b.color && a.elevation == b.elevation &&
+         a.transparent_occluder == b.transparent_occluder && a.dpr == b.dpr;
 }
 
 std::ostream& operator<<(std::ostream& os,
                          const MockCanvas::DrawShadowData& data) {
-  return os << data.path;
+  return os << data.path << " " << data.color << " " << data.elevation << " "
+            << data.transparent_occluder << " " << data.dpr;
 }
 
 bool operator==(const MockCanvas::ClipRectData& a,
@@ -415,6 +499,12 @@ bool operator==(const MockCanvas::ClipRectData& a,
   return a.rect == b.rect && a.clip_op == b.clip_op && a.style == b.style;
 }
 
+static std::ostream& operator<<(std::ostream& os,
+                                const MockCanvas::ClipEdgeStyle& style) {
+  return os << (style == MockCanvas::kSoftClipEdgeStyle ? "kSoftEdges"
+                                                        : "kHardEdges");
+}
+
 std::ostream& operator<<(std::ostream& os,
                          const MockCanvas::ClipRectData& data) {
   return os << data.rect << " " << data.clip_op << " " << data.style;
@@ -454,12 +544,13 @@ std::ostream& operator<<(std::ostream& os, const MockCanvas::DrawCall& draw) {
   return os << "[Layer: " << draw.layer << ", Data: " << draw.data << "]";
 }
 
-bool operator==(const MockCanvas::DrawPaint& a,
-                const MockCanvas::DrawPaint& b) {
+bool operator==(const MockCanvas::DrawPaintData& a,
+                const MockCanvas::DrawPaintData& b) {
   return a.paint == b.paint;
 }
 
-std::ostream& operator<<(std::ostream& os, const MockCanvas::DrawPaint& data) {
+std::ostream& operator<<(std::ostream& os,
+                         const MockCanvas::DrawPaintData& data) {
   return os << data.paint;
 }
 
diff --git a/testing/mock_canvas.h b/testing/mock_canvas.h
index 345adbc0cde1823fa6e6a8e34b2a96edba8c789f..9ef5d8c4b14c1ee08a7959fd9bb56f55077e0616 100644
--- a/testing/mock_canvas.h
+++ b/testing/mock_canvas.h
@@ -2,14 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef TESTING_MOCK_CANVAS_H_
-#define TESTING_MOCK_CANVAS_H_
+#ifndef FLUTTER_TESTING_MOCK_CANVAS_H_
+#define FLUTTER_TESTING_MOCK_CANVAS_H_
 
 #include <ostream>
 #include <variant>
 #include <vector>
 
-#include "flutter/testing/assertions_skia.h"
+#include "flutter/display_list/dl_canvas.h"
+#include "flutter/display_list/utils/dl_matrix_clip_tracker.h"
 #include "gtest/gtest.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkCanvasVirtualEnforcer.h"
@@ -33,10 +34,12 @@ static constexpr SkRect kEmptyRect = SkRect::MakeEmpty();
 //
 // The |MockCanvas| stores a list of |DrawCall| that the test can later verify
 // against the expected list of primitives to be drawn.
-class MockCanvas : public SkCanvasVirtualEnforcer<SkCanvas> {
+class MockCanvas final : public DlCanvas {
  public:
-  using SkCanvas::kHard_ClipEdgeStyle;
-  using SkCanvas::kSoft_ClipEdgeStyle;
+  enum ClipEdgeStyle {
+    kHardClipEdgeStyle,
+    kSoftClipEdgeStyle,
+  };
 
   struct SaveData {
     int save_to_layer;
@@ -44,8 +47,8 @@ class MockCanvas : public SkCanvasVirtualEnforcer<SkCanvas> {
 
   struct SaveLayerData {
     SkRect save_bounds;
-    SkPaint restore_paint;
-    sk_sp<SkImageFilter> backdrop_filter;
+    DlPaint restore_paint;
+    std::shared_ptr<DlImageFilter> backdrop_filter;
     int save_to_layer;
   };
 
@@ -63,65 +66,68 @@ class MockCanvas : public SkCanvasVirtualEnforcer<SkCanvas> {
 
   struct DrawRectData {
     SkRect rect;
-    SkPaint paint;
+    DlPaint paint;
   };
 
   struct DrawPathData {
     SkPath path;
-    SkPaint paint;
+    DlPaint paint;
   };
 
   struct DrawTextData {
     sk_sp<SkData> serialized_text;
-    SkPaint paint;
+    DlPaint paint;
     SkPoint offset;
   };
 
   struct DrawImageDataNoPaint {
-    sk_sp<SkImage> image;
+    sk_sp<DlImage> image;
     SkScalar x;
     SkScalar y;
-    SkSamplingOptions options;
+    DlImageSampling options;
   };
 
   struct DrawImageData {
-    sk_sp<SkImage> image;
+    sk_sp<DlImage> image;
     SkScalar x;
     SkScalar y;
-    SkSamplingOptions options;
-    SkPaint paint;
+    DlImageSampling options;
+    DlPaint paint;
   };
 
-  struct DrawPictureData {
-    sk_sp<SkData> serialized_picture;
-    SkPaint paint;
-    SkMatrix matrix;
+  struct DrawDisplayListData {
+    sk_sp<DisplayList> display_list;
+    SkScalar opacity;
   };
 
   struct DrawShadowData {
     SkPath path;
+    DlColor color;
+    SkScalar elevation;
+    bool transparent_occluder;
+    SkScalar dpr;
   };
 
   struct ClipRectData {
     SkRect rect;
-    SkClipOp clip_op;
+    ClipOp clip_op;
     ClipEdgeStyle style;
   };
 
   struct ClipRRectData {
     SkRRect rrect;
-    SkClipOp clip_op;
+    ClipOp clip_op;
     ClipEdgeStyle style;
   };
 
   struct ClipPathData {
     SkPath path;
-    SkClipOp clip_op;
+    ClipOp clip_op;
     ClipEdgeStyle style;
   };
 
-  struct DrawPaint {
-    SkPaint paint;
+  struct DrawPaintData {
+    DlPaint paint;
   };
 
   // Discriminated union of all the different |DrawCall| types.  It is roughly
@@ -136,12 +142,12 @@ class MockCanvas : public SkCanvasVirtualEnforcer<SkCanvas> {
                                     DrawTextData,
                                     DrawImageDataNoPaint,
                                     DrawImageData,
-                                    DrawPictureData,
+                                    DrawDisplayListData,
                                     DrawShadowData,
                                     ClipRectData,
                                     ClipRRectData,
                                     ClipPathData,
-                                    DrawPaint>;
+                                    DrawPaintData>;
 
   // A single call made against this canvas.
   struct DrawCall {
@@ -150,107 +156,137 @@ class MockCanvas : public SkCanvasVirtualEnforcer<SkCanvas> {
   };
 
   MockCanvas();
-  ~MockCanvas() override;
-
-  SkNWayCanvas* internal_canvas() { return &internal_canvas_; }
+  MockCanvas(int width, int height);
+  ~MockCanvas();
 
   const std::vector<DrawCall>& draw_calls() const { return draw_calls_; }
   void reset_draw_calls() { draw_calls_.clear(); }
 
- protected:
-  // Save/restore/set operations that we track.
-  void willSave() override;
-  SaveLayerStrategy getSaveLayerStrategy(const SaveLayerRec& rec) override;
-  void willRestore() override;
-  void didRestore() override {}
-  void didConcat44(const SkM44&) override;
-  void didSetM44(const SkM44&) override;
-  void didScale(SkScalar x, SkScalar y) override;
-  void didTranslate(SkScalar x, SkScalar y) override;
-
-  // Draw and clip operations that we track.
-  void onDrawRect(const SkRect& rect, const SkPaint& paint) override;
-  void onDrawPath(const SkPath& path, const SkPaint& paint) override;
-  void onDrawTextBlob(const SkTextBlob* text,
-                      SkScalar x,
-                      SkScalar y,
-                      const SkPaint& paint) override;
-  void onDrawShadowRec(const SkPath& path, const SkDrawShadowRec& rec) override;
-  void onDrawPicture(const SkPicture* picture,
-                     const SkMatrix* matrix,
-                     const SkPaint* paint) override;
-  void onClipRect(const SkRect& rect,
-                  SkClipOp op,
-                  ClipEdgeStyle style) override;
-  void onClipRRect(const SkRRect& rrect,
-                   SkClipOp op,
-                   ClipEdgeStyle style) override;
-  void onClipPath(const SkPath& path,
-                  SkClipOp op,
-                  ClipEdgeStyle style) override;
-
-  // Operations that we don't track.
-  bool onDoSaveBehind(const SkRect*) override;
-  void onDrawAnnotation(const SkRect&, const char[], SkData*) override;
-  void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) override;
-  void onDrawDrawable(SkDrawable*, const SkMatrix*) override;
-  void onDrawPatch(const SkPoint[12],
-                   const SkColor[4],
-                   const SkPoint[4],
-                   SkBlendMode,
-                   const SkPaint&) override;
-  void onDrawPaint(const SkPaint&) override;
-  void onDrawBehind(const SkPaint&) override;
-  void onDrawPoints(PointMode,
-                    size_t,
-                    const SkPoint[],
-                    const SkPaint&) override;
-  void onDrawRegion(const SkRegion&, const SkPaint&) override;
-  void onDrawOval(const SkRect&, const SkPaint&) override;
-  void onDrawArc(const SkRect&,
-                 SkScalar,
-                 SkScalar,
-                 bool,
-                 const SkPaint&) override;
-  void onDrawRRect(const SkRRect&, const SkPaint&) override;
-  void onDrawImage2(const SkImage* image,
+  SkISize GetBaseLayerSize() const override;
+  SkImageInfo GetImageInfo() const override;
+
+  void Save() override;
+  void SaveLayer(const SkRect* bounds,
+                 const DlPaint* paint = nullptr,
+                 const DlImageFilter* backdrop = nullptr) override;
+  void Restore() override;
+  int GetSaveCount() const { return current_layer_; }
+  void RestoreToCount(int restore_count) {
+    while (current_layer_ > restore_count) {
+      Restore();
+    }
+  }
+
+  // clang-format off
+
+  // 2x3 2D affine subset of a 4x4 transform in row major order
+  void Transform2DAffine(SkScalar mxx, SkScalar mxy, SkScalar mxt,
+                         SkScalar myx, SkScalar myy, SkScalar myt) override;
+  // full 4x4 transform in row major order
+  void TransformFullPerspective(
+      SkScalar mxx, SkScalar mxy, SkScalar mxz, SkScalar mxt,
+      SkScalar myx, SkScalar myy, SkScalar myz, SkScalar myt,
+      SkScalar mzx, SkScalar mzy, SkScalar mzz, SkScalar mzt,
+      SkScalar mwx, SkScalar mwy, SkScalar mwz, SkScalar mwt) override;
+  // clang-format on
+
+  void Translate(SkScalar tx, SkScalar ty) override;
+  void Scale(SkScalar sx, SkScalar sy) override;
+  void Rotate(SkScalar degrees) override;
+  void Skew(SkScalar sx, SkScalar sy) override;
+  void TransformReset() override;
+  void Transform(const SkMatrix* matrix) override;
+  void Transform(const SkM44* matrix44) override;
+  void SetTransform(const SkMatrix* matrix) override;
+  void SetTransform(const SkM44* matrix44) override;
+  using DlCanvas::SetTransform;
+  using DlCanvas::Transform;
+
+  SkM44 GetTransformFullPerspective() const override;
+  SkMatrix GetTransform() const override;
+
+  void ClipRect(const SkRect& rect, ClipOp clip_op, bool is_aa) override;
+  void ClipRRect(const SkRRect& rrect, ClipOp clip_op, bool is_aa) override;
+  void ClipPath(const SkPath& path, ClipOp clip_op, bool is_aa) override;
+
+  SkRect GetDestinationClipBounds() const override;
+  SkRect GetLocalClipBounds() const override;
+  bool QuickReject(const SkRect& bounds) const override;
+
+  void DrawPaint(const DlPaint& paint) override;
+  void DrawColor(DlColor color, DlBlendMode mode) override;
+  void DrawLine(const SkPoint& p0,
+                const SkPoint& p1,
+                const DlPaint& paint) override;
+  void DrawRect(const SkRect& rect, const DlPaint& paint) override;
+  void DrawOval(const SkRect& bounds, const DlPaint& paint) override;
+  void DrawCircle(const SkPoint& center,
+                  SkScalar radius,
+                  const DlPaint& paint) override;
+  void DrawRRect(const SkRRect& rrect, const DlPaint& paint) override;
+  void DrawDRRect(const SkRRect& outer,
+                  const SkRRect& inner,
+                  const DlPaint& paint) override;
+  void DrawPath(const SkPath& path, const DlPaint& paint) override;
+  void DrawArc(const SkRect& bounds,
+               SkScalar start,
+               SkScalar sweep,
+               bool useCenter,
+               const DlPaint& paint) override;
+  void DrawPoints(PointMode mode,
+                  uint32_t count,
+                  const SkPoint pts[],
+                  const DlPaint& paint) override;
+  void DrawVertices(const DlVertices* vertices,
+                    DlBlendMode mode,
+                    const DlPaint& paint) override;
+
+  void DrawImage(const sk_sp<DlImage>& image,
+                 const SkPoint point,
+                 DlImageSampling sampling,
+                 const DlPaint* paint = nullptr) override;
+  void DrawImageRect(
+      const sk_sp<DlImage>& image,
+      const SkRect& src,
+      const SkRect& dst,
+      DlImageSampling sampling,
+      const DlPaint* paint = nullptr,
+      SrcRectConstraint constraint = SrcRectConstraint::kFast) override;
+  void DrawImageNine(const sk_sp<DlImage>& image,
+                     const SkIRect& center,
+                     const SkRect& dst,
+                     DlFilterMode filter,
+                     const DlPaint* paint = nullptr) override;
+  void DrawAtlas(const sk_sp<DlImage>& atlas,
+                 const SkRSXform xform[],
+                 const SkRect tex[],
+                 const DlColor colors[],
+                 int count,
+                 DlBlendMode mode,
+                 DlImageSampling sampling,
+                 const SkRect* cullRect,
+                 const DlPaint* paint = nullptr) override;
+
+  void DrawDisplayList(const sk_sp<DisplayList> display_list,
+                       SkScalar opacity) override;
+  void DrawTextBlob(const sk_sp<SkTextBlob>& blob,
                     SkScalar x,
                     SkScalar y,
-                    const SkSamplingOptions&,
-                    const SkPaint* paint) override;
-  void onDrawImageRect2(const SkImage*,
-                        const SkRect&,
-                        const SkRect&,
-                        const SkSamplingOptions&,
-                        const SkPaint*,
-                        SrcRectConstraint) override;
-  void onDrawImageLattice2(const SkImage*,
-                           const Lattice&,
-                           const SkRect&,
-                           SkFilterMode,
-                           const SkPaint*) override;
-  void onDrawVerticesObject(const SkVertices*,
-                            SkBlendMode,
-                            const SkPaint&) override;
-  void onDrawAtlas2(const SkImage*,
-                    const SkRSXform[],
-                    const SkRect[],
-                    const SkColor[],
-                    int,
-                    SkBlendMode,
-                    const SkSamplingOptions&,
-                    const SkRect*,
-                    const SkPaint*) override;
-  void onDrawEdgeAAQuad(const SkRect&,
-                        const SkPoint[4],
-                        QuadAAFlags,
-                        const SkColor4f&,
-                        SkBlendMode) override;
-  void onClipRegion(const SkRegion&, SkClipOp) override;
+                    const DlPaint& paint) override;
+  void DrawTextFrame(const std::shared_ptr<impeller::TextFrame>& text_frame,
+                     SkScalar x,
+                     SkScalar y,
+                     const DlPaint& paint) override;
+  void DrawShadow(const SkPath& path,
+                  const DlColor color,
+                  const SkScalar elevation,
+                  bool transparent_occluder,
+                  SkScalar dpr) override;
+
+  void Flush() override;
 
  private:
-  SkNWayCanvas internal_canvas_;
-
+  DisplayListMatrixClipTracker tracker_;
   std::vector<DrawCall> draw_calls_;
   int current_layer_;
 };
@@ -295,10 +331,10 @@ extern bool operator==(const MockCanvas::DrawImageDataNoPaint& a,
                        const MockCanvas::DrawImageDataNoPaint& b);
 extern std::ostream& operator<<(std::ostream& os,
                                 const MockCanvas::DrawImageDataNoPaint& data);
-extern bool operator==(const MockCanvas::DrawPictureData& a,
-                       const MockCanvas::DrawPictureData& b);
+extern bool operator==(const MockCanvas::DrawDisplayListData& a,
+                       const MockCanvas::DrawDisplayListData& b);
 extern std::ostream& operator<<(std::ostream& os,
-                                const MockCanvas::DrawPictureData& data);
+                                const MockCanvas::DrawDisplayListData& data);
 extern bool operator==(const MockCanvas::DrawShadowData& a,
                        const MockCanvas::DrawShadowData& b);
 extern std::ostream& operator<<(std::ostream& os,
@@ -321,11 +357,11 @@ extern bool operator==(const MockCanvas::DrawCall& a,
                        const MockCanvas::DrawCall& b);
 extern std::ostream& operator<<(std::ostream& os,
                                 const MockCanvas::DrawCall& draw);
-extern bool operator==(const MockCanvas::DrawPaint& a,
-                       const MockCanvas::DrawPaint& b);
+extern bool operator==(const MockCanvas::DrawPaintData& a,
+                       const MockCanvas::DrawPaintData& b);
 extern std::ostream& operator<<(std::ostream& os,
-                                const MockCanvas::DrawPaint& data);
+                                const MockCanvas::DrawPaintData& data);
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // TESTING_MOCK_CANVAS_H_
+#endif  // FLUTTER_TESTING_MOCK_CANVAS_H_
diff --git a/testing/mock_canvas_unittests.cc b/testing/mock_canvas_unittests.cc
index 7e8d6246420647df170ce6641cb951e82477e8fb..c615918defc5dd5b43f946d323147fc06205985c 100644
--- a/testing/mock_canvas_unittests.cc
+++ b/testing/mock_canvas_unittests.cc
@@ -14,17 +14,17 @@ using MockCanvasTest = CanvasTest;
 
 #ifndef NDEBUG
 TEST_F(MockCanvasTest, DrawRRectDies) {
-  EXPECT_DEATH_IF_SUPPORTED(mock_canvas().drawRRect(SkRRect(), SkPaint()), "");
+  EXPECT_DEATH_IF_SUPPORTED(mock_canvas().DrawRRect(SkRRect(), DlPaint()), "");
 }
 #endif
 
 TEST_F(MockCanvasTest, DrawCalls) {
   const SkRect rect = SkRect::MakeWH(5.0f, 5.0f);
-  const SkPaint paint = SkPaint(SkColors::kGreen);
+  const DlPaint paint = DlPaint(DlColor::kGreen());
   const auto expected_draw_calls = std::vector{
       MockCanvas::DrawCall{0, MockCanvas::DrawRectData{rect, paint}}};
 
-  mock_canvas().drawRect(rect, paint);
+  mock_canvas().DrawRect(rect, paint);
   EXPECT_EQ(mock_canvas().draw_calls(), expected_draw_calls);
 }
 
diff --git a/testing/rules/run_gradle.py b/testing/rules/run_gradle.py
index 10a7c723ff225b9aae898ed536c17eec4a6eda3a..d07cbd3c7e89114aab3e662ce4d4eeed7ccc5653 100644
--- a/testing/rules/run_gradle.py
+++ b/testing/rules/run_gradle.py
@@ -17,30 +17,22 @@ SCRIPT_PATH = os.path.dirname(os.path.realpath(__file__))
 
 BAT = '.bat' if sys.platform.startswith(('cygwin', 'win')) else ''
 GRADLE_BIN = os.path.normpath(
-    os.path.join(
-        SCRIPT_PATH, '..', '..', '..', 'third_party', 'gradle', 'bin',
-        'gradle%s' % BAT
-    )
+    os.path.join(SCRIPT_PATH, '..', '..', '..', 'third_party', 'gradle', 'bin', 'gradle%s' % BAT)
 )
 
 ANDROID_HOME = os.path.normpath(
-    os.path.join(
-        SCRIPT_PATH, '..', '..', '..', 'third_party', 'android_tools', 'sdk'
-    )
+    os.path.join(SCRIPT_PATH, '..', '..', '..', 'third_party', 'android_tools', 'sdk')
 )
 
 if platform.system() == 'Darwin':
   JAVA_HOME = os.path.normpath(
       os.path.join(
-          SCRIPT_PATH, '..', '..', '..', 'third_party', 'java', 'openjdk',
-          'Contents', 'Home'
+          SCRIPT_PATH, '..', '..', '..', 'third_party', 'java', 'openjdk', 'Contents', 'Home'
       )
   )
 else:
   JAVA_HOME = os.path.normpath(
-      os.path.join(
-          SCRIPT_PATH, '..', '..', '..', 'third_party', 'java', 'openjdk'
-      )
+      os.path.join(SCRIPT_PATH, '..', '..', '..', 'third_party', 'java', 'openjdk')
   )
 
 
diff --git a/testing/run_all_unittests.cc b/testing/run_all_unittests.cc
index ae5105fc21e72cea69172e8044f18e74538edeaa..48f4c0d5eb8164c0228add36705496a8d6ae6ad1 100644
--- a/testing/run_all_unittests.cc
+++ b/testing/run_all_unittests.cc
@@ -10,6 +10,7 @@
 #include "flutter/fml/build_config.h"
 #include "flutter/fml/command_line.h"
 #include "flutter/testing/debugger_detection.h"
+#include "flutter/testing/test_args.h"
 #include "flutter/testing/test_timeout_listener.h"
 #include "gtest/gtest.h"
 
@@ -17,13 +18,13 @@
 #include <asl.h>
 #endif  // FML_OS_IOS
 
-std::optional<fml::TimeDelta> GetTestTimeoutFromArgs(int argc, char** argv) {
-  const auto command_line = fml::CommandLineFromPlatformOrArgcArgv(argc, argv);
+std::optional<fml::TimeDelta> GetTestTimeout() {
+  const auto& command_line = flutter::testing::GetArgsForProcess();
 
   std::string timeout_seconds;
   if (!command_line.GetOptionValue("timeout", &timeout_seconds)) {
-    // No timeout specified. Default to 120s.
-    return fml::TimeDelta::FromSeconds(120u);
+    // No timeout specified. Default to 300s.
+    return fml::TimeDelta::FromSeconds(300u);
   }
 
   const auto seconds = std::stoi(timeout_seconds);
@@ -37,6 +38,9 @@ std::optional<fml::TimeDelta> GetTestTimeoutFromArgs(int argc, char** argv) {
 
 int main(int argc, char** argv) {
   fml::InstallCrashHandler();
+
+  flutter::testing::SetArgsForProcess(argc, argv);
+
 #ifdef FML_OS_IOS
   asl_log_descriptor(NULL, NULL, ASL_LEVEL_NOTICE, STDOUT_FILENO,
                      ASL_LOG_DESCRIPTOR_WRITE);
@@ -45,9 +49,10 @@ int main(int argc, char** argv) {
 #endif  // FML_OS_IOS
 
   ::testing::InitGoogleTest(&argc, argv);
+  GTEST_FLAG_SET(death_test_style, "threadsafe");
 
   // Check if the user has specified a timeout.
-  const auto timeout = GetTestTimeoutFromArgs(argc, argv);
+  const auto timeout = GetTestTimeout();
   if (!timeout.has_value()) {
     FML_LOG(INFO) << "Timeouts disabled via a command line flag.";
     return RUN_ALL_TESTS();
diff --git a/testing/run_tests.py b/testing/run_tests.py
index f080cb2d48ad6b51c12f1e6f3611dc0a006cbcae..25af03c2eb3b12a89492689eb50d567352a74760 100755
--- a/testing/run_tests.py
+++ b/testing/run_tests.py
@@ -8,42 +8,56 @@
 A top level harness to run all unit-tests in a specific engine build.
 """
 
+from pathlib import Path
+
 import argparse
-import glob
 import errno
+import glob
+import logging
+import logging.handlers
 import multiprocessing
 import os
 import re
+import shutil
 import subprocess
-import sys
+# Explicitly import the parts of sys that are needed. This is to avoid using
+# sys.stdout and sys.stderr directly. Instead, only the logger defined below
+# should be used for output.
+from sys import exit as sys_exit, platform as sys_platform
+import tempfile
 import time
-import csv
+import typing
 import xvfb
 
-script_dir = os.path.dirname(os.path.realpath(__file__))
-buildroot_dir = os.path.abspath(
-    os.path.join(os.path.realpath(__file__), '..', '..', '..')
-)
-out_dir = os.path.join(buildroot_dir, 'out')
-golden_dir = os.path.join(buildroot_dir, 'flutter', 'testing', 'resources')
-fonts_dir = os.path.join(
-    buildroot_dir, 'flutter', 'third_party', 'txt', 'third_party', 'fonts'
-)
-roboto_font_path = os.path.join(fonts_dir, 'Roboto-Regular.ttf')
-font_subset_dir = os.path.join(buildroot_dir, 'flutter', 'tools', 'font-subset')
-
-FML_UNITTESTS_FILTER = '--gtest_filter=-*TimeSensitiveTest*'
+SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
+BUILDROOT_DIR = os.path.abspath(os.path.join(os.path.realpath(__file__), '..', '..', '..'))
+OUT_DIR = os.path.join(BUILDROOT_DIR, 'out')
+GOLDEN_DIR = os.path.join(BUILDROOT_DIR, 'flutter', 'testing', 'resources')
+FONTS_DIR = os.path.join(BUILDROOT_DIR, 'flutter', 'third_party', 'txt', 'third_party', 'fonts')
+ROBOTO_FONT_PATH = os.path.join(FONTS_DIR, 'Roboto-Regular.ttf')
+FONT_SUBSET_DIR = os.path.join(BUILDROOT_DIR, 'flutter', 'tools', 'font_subset')
+
 ENCODING = 'UTF-8'
 
+LOG_FILE = os.path.join(OUT_DIR, 'run_tests.log')
+logger = logging.getLogger(__name__)
+console_logger_handler = logging.StreamHandler()
+file_logger_handler = logging.FileHandler(LOG_FILE)
+
+
+# Override print so that it uses the logger instead of stdout directly.
+def print(*args, **kwargs):  # pylint: disable=redefined-builtin
+  logger.info(*args, **kwargs)
+
 
-def PrintDivider(char='='):
-  print('\n')
+def print_divider(char='='):
+  logger.info('\n')
   for _ in range(4):
-    print(''.join([char for _ in range(80)]))
-  print('\n')
+    logger.info(''.join([char for _ in range(80)]))
+  logger.info('\n')
 
 
-def IsAsan(build_dir):
+def is_asan(build_dir):
   with open(os.path.join(build_dir, 'args.gn')) as args:
     if 'is_asan = true' in args.read():
       return True
@@ -51,87 +65,102 @@ def IsAsan(build_dir):
   return False
 
 
-def RunCmd(cmd, forbidden_output=[], expect_failure=False, env=None, **kwargs):
+def run_cmd(
+    cmd: typing.List[str],
+    forbidden_output: typing.List[str] = None,
+    expect_failure: bool = False,
+    env: typing.Dict[str, str] = None,
+    allowed_failure_output: typing.List[str] = None,
+    **kwargs
+) -> None:
+  if forbidden_output is None:
+    forbidden_output = []
+  if allowed_failure_output is None:
+    allowed_failure_output = []
+
   command_string = ' '.join(cmd)
 
-  PrintDivider('>')
-  print('Running command "%s"' % command_string)
+  print_divider('>')
+  logger.info('Running command "%s"', command_string)
 
   start_time = time.time()
-  stdout_pipe = sys.stdout if not forbidden_output else subprocess.PIPE
-  stderr_pipe = sys.stderr if not forbidden_output else subprocess.PIPE
+
   process = subprocess.Popen(
       cmd,
-      stdout=stdout_pipe,
-      stderr=stderr_pipe,
+      stdout=subprocess.PIPE,
+      stderr=subprocess.STDOUT,
       env=env,
       universal_newlines=True,
       **kwargs
   )
-  stdout, stderr = process.communicate()
+  output = ''
+
+  for line in iter(process.stdout.readline, ''):
+    output += line
+    logger.info(line.rstrip())
+
+  process.wait()
   end_time = time.time()
 
   if process.returncode != 0 and not expect_failure:
-    PrintDivider('!')
+    print_divider('!')
 
-    print(
-        'Failed Command:\n\n%s\n\nExit Code: %d\n' %
-        (command_string, process.returncode)
+    logger.error(
+        'Failed Command:\n\n%s\n\nExit Code: %s\n\nOutput:\n%s', command_string, process.returncode,
+        output
     )
 
-    if stdout:
-      print('STDOUT: \n%s' % stdout)
+    print_divider('!')
 
-    if stderr:
-      print('STDERR: \n%s' % stderr)
-
-    PrintDivider('!')
-
-    raise Exception(
-        'Command "%s" exited with code %d.' %
-        (command_string, process.returncode)
-    )
+    allowed_failure = False
+    for allowed_string in allowed_failure_output:
+      if allowed_string in output:
+        allowed_failure = True
 
-  if stdout or stderr:
-    print(stdout)
-    print(stderr)
+    if not allowed_failure:
+      raise RuntimeError('Command "%s" exited with code %s.' % (command_string, process.returncode))
 
   for forbidden_string in forbidden_output:
-    if (stdout and forbidden_string in stdout) or (stderr and
-                                                   forbidden_string in stderr):
-      raise Exception(
-          'command "%s" contained forbidden string %s' %
-          (command_string, forbidden_string)
+    if forbidden_string in output:
+      raise RuntimeError(
+          'command "%s" contained forbidden string "%s"' % (command_string, forbidden_string)
       )
 
-  PrintDivider('<')
-  print(
-      'Command run successfully in %.2f seconds: %s' %
-      (end_time - start_time, command_string)
-  )
+  print_divider('<')
+  logger.info('Command run successfully in %.2f seconds: %s', end_time - start_time, command_string)
+
+
+def is_mac():
+  return sys_platform == 'darwin'
 
 
-def IsMac():
-  return sys.platform == 'darwin'
+def is_aarm64():
+  assert is_mac()
+  output = subprocess.check_output(['sysctl', 'machdep.cpu'])
+  text = output.decode('utf-8')
+  aarm64 = text.find('Apple') >= 0
+  if not aarm64:
+    assert text.find('GenuineIntel') >= 0
+  return aarm64
 
 
-def IsLinux():
-  return sys.platform.startswith('linux')
+def is_linux():
+  return sys_platform.startswith('linux')
 
 
-def IsWindows():
-  return sys.platform.startswith(('cygwin', 'win'))
+def is_windows():
+  return sys_platform.startswith(('cygwin', 'win'))
 
 
-def ExecutableSuffix():
-  return '.exe' if IsWindows() else ''
+def executable_suffix():
+  return '.exe' if is_windows() else ''
 
 
-def FindExecutablePath(path):
+def find_executable_path(path):
   if os.path.exists(path):
     return path
 
-  if IsWindows():
+  if is_windows():
     exe_path = path + '.exe'
     if os.path.exists(exe_path):
       return exe_path
@@ -143,21 +172,53 @@ def FindExecutablePath(path):
   raise Exception('Executable %s does not exist!' % path)
 
 
-def BuildEngineExecutableCommand(
-    build_dir, executable_name, flags=[], coverage=False, gtest=False
+def vulkan_validation_env(build_dir):
+  extra_env = {
+      # pylint: disable=line-too-long
+      # Note: built from //third_party/swiftshader
+      'VK_ICD_FILENAMES': os.path.join(build_dir, 'vk_swiftshader_icd.json'),
+      # Note: built from //third_party/vulkan_validation_layers:vulkan_gen_json_files
+      # and //third_party/vulkan_validation_layers.
+      'VK_LAYER_PATH': os.path.join(build_dir, 'vulkan-data'),
+      'VK_INSTANCE_LAYERS': 'VK_LAYER_KHRONOS_validation',
+  }
+  return extra_env
+
+
+def metal_validation_env():
+  extra_env = {
+      # pylint: disable=line-too-long
+      # See https://developer.apple.com/documentation/metal/diagnosing_metal_programming_issues_early?language=objc
+      'MTL_SHADER_VALIDATION': '1',  # Enables all shader validation tests.
+      'MTL_SHADER_VALIDATION_GLOBAL_MEMORY':
+          '1',  # Validates accesses to device and constant memory.
+      'MTL_SHADER_VALIDATION_THREADGROUP_MEMORY': '1',  # Validates accesses to threadgroup memory.
+      'MTL_SHADER_VALIDATION_TEXTURE_USAGE': '1',  # Validates that texture references are not nil.
+  }
+  if is_aarm64():
+    extra_env.update({
+        'METAL_DEBUG_ERROR_MODE': '0',  # Enables metal validation.
+        'METAL_DEVICE_WRAPPER_TYPE': '1',  # Enables metal validation.
+    })
+  return extra_env
+
+
+def build_engine_executable_command(
+    build_dir, executable_name, flags=None, coverage=False, gtest=False
 ):
+  if flags is None:
+    flags = []
+
   unstripped_exe = os.path.join(build_dir, 'exe.unstripped', executable_name)
   # We cannot run the unstripped binaries directly when coverage is enabled.
-  if IsLinux() and os.path.exists(unstripped_exe) and not coverage:
+  if is_linux() and os.path.exists(unstripped_exe) and not coverage:
     # Use unstripped executables in order to get better symbolized crash
     # stack traces on Linux.
     executable = unstripped_exe
   else:
-    executable = FindExecutablePath(os.path.join(build_dir, executable_name))
+    executable = find_executable_path(os.path.join(build_dir, executable_name))
 
-  coverage_script = os.path.join(
-      buildroot_dir, 'flutter', 'build', 'generate_coverage.py'
-  )
+  coverage_script = os.path.join(BUILDROOT_DIR, 'flutter', 'build', 'generate_coverage.py')
 
   if coverage:
     coverage_flags = [
@@ -170,53 +231,65 @@ def BuildEngineExecutableCommand(
     test_command = [executable] + flags
     if gtest:
       gtest_parallel = os.path.join(
-          buildroot_dir, 'third_party', 'gtest-parallel', 'gtest-parallel'
+          BUILDROOT_DIR, 'flutter', 'third_party', 'gtest-parallel', 'gtest-parallel'
       )
       test_command = ['python3', gtest_parallel] + test_command
 
   return test_command
 
 
-def RunEngineExecutable(
+def run_engine_executable( # pylint: disable=too-many-arguments
     build_dir,
     executable_name,
-    filter,
-    flags=[],
-    cwd=buildroot_dir,
-    forbidden_output=[],
+    executable_filter,
+    flags=None,
+    cwd=BUILDROOT_DIR,
+    forbidden_output=None,
+    allowed_failure_output=None,
     expect_failure=False,
     coverage=False,
-    extra_env={},
-    gtest=False
+    extra_env=None,
+    gtest=False,
 ):
-  if filter is not None and executable_name not in filter:
-    print('Skipping %s due to filter.' % executable_name)
+  if executable_filter is not None and executable_name not in executable_filter:
+    logger.info('Skipping %s due to filter.', executable_name)
     return
 
+  if flags is None:
+    flags = []
+  if forbidden_output is None:
+    forbidden_output = []
+  if allowed_failure_output is None:
+    allowed_failure_output = []
+  if extra_env is None:
+    extra_env = {}
+
   unstripped_exe = os.path.join(build_dir, 'exe.unstripped', executable_name)
   env = os.environ.copy()
-  if IsLinux():
+  if is_linux():
     env['LD_LIBRARY_PATH'] = build_dir
     env['VK_DRIVER_FILES'] = os.path.join(build_dir, 'vk_swiftshader_icd.json')
     if os.path.exists(unstripped_exe):
+      unstripped_vulkan = os.path.join(build_dir, 'lib.unstripped', 'libvulkan.so.1')
+      if os.path.exists(unstripped_vulkan):
+        vulkan_path = unstripped_vulkan
+      else:
+        vulkan_path = os.path.join(build_dir, 'libvulkan.so.1')
       try:
-        os.symlink(
-            os.path.join(build_dir, 'lib.unstripped', 'libvulkan.so.1'),
-            os.path.join(build_dir, 'exe.unstripped', 'libvulkan.so.1')
-        )
-      except OSError as e:
-        if e.errno == errno.EEXIST:
+        os.symlink(vulkan_path, os.path.join(build_dir, 'exe.unstripped', 'libvulkan.so.1'))
+      except OSError as err:
+        if err.errno == errno.EEXIST:
           pass
         else:
           raise
-  elif IsMac():
+  elif is_mac():
     env['DYLD_LIBRARY_PATH'] = build_dir
   else:
-    env['PATH'] = build_dir + ":" + env['PATH']
+    env['PATH'] = build_dir + ':' + env['PATH']
 
-  print('Running %s in %s' % (executable_name, cwd))
+  logger.info('Running %s in %s', executable_name, cwd)
 
-  test_command = BuildEngineExecutableCommand(
+  test_command = build_engine_executable_command(
       build_dir,
       executable_name,
       flags=flags,
@@ -229,12 +302,13 @@ def RunEngineExecutable(
     env[key] = value
 
   try:
-    RunCmd(
+    run_cmd(
         test_command,
         cwd=cwd,
         forbidden_output=forbidden_output,
         expect_failure=expect_failure,
-        env=env
+        env=env,
+        allowed_failure_output=allowed_failure_output,
     )
   except:
     # The LUCI environment may provide a variable containing a directory path
@@ -243,17 +317,14 @@ def RunEngineExecutable(
     # the dump and output a report that will be uploaded.
     luci_test_outputs_path = os.environ.get('FLUTTER_TEST_OUTPUTS_DIR')
     core_path = os.path.join(cwd, 'core')
-    if luci_test_outputs_path and os.path.exists(core_path) and os.path.exists(
-        unstripped_exe):
+    if luci_test_outputs_path and os.path.exists(core_path) and os.path.exists(unstripped_exe):
       dump_path = os.path.join(
-          luci_test_outputs_path, '%s_%s.txt' % (executable_name, sys.platform)
+          luci_test_outputs_path, '%s_%s.txt' % (executable_name, sys_platform)
       )
-      print('Writing core dump analysis to %s' % dump_path)
+      logger.error('Writing core dump analysis to %s', dump_path)
       subprocess.call([
-          os.path.join(
-              buildroot_dir, 'flutter', 'testing', 'analyze_core_dump.sh'
-          ),
-          buildroot_dir,
+          os.path.join(BUILDROOT_DIR, 'flutter', 'testing', 'analyze_core_dump.sh'),
+          BUILDROOT_DIR,
           unstripped_exe,
           core_path,
           dump_path,
@@ -262,73 +333,75 @@ def RunEngineExecutable(
     raise
 
 
-class EngineExecutableTask(object):
+class EngineExecutableTask():  # pylint: disable=too-many-instance-attributes
 
-  def __init__(
+  def __init__( # pylint: disable=too-many-arguments
       self,
       build_dir,
       executable_name,
-      filter,
-      flags=[],
-      cwd=buildroot_dir,
-      forbidden_output=[],
+      executable_filter,
+      flags=None,
+      cwd=BUILDROOT_DIR,
+      forbidden_output=None,
+      allowed_failure_output=None,
       expect_failure=False,
       coverage=False,
-      extra_env={}
+      extra_env=None,
   ):
     self.build_dir = build_dir
     self.executable_name = executable_name
-    self.filter = filter
+    self.executable_filter = executable_filter
     self.flags = flags
     self.cwd = cwd
     self.forbidden_output = forbidden_output
+    self.allowed_failure_output = allowed_failure_output
     self.expect_failure = expect_failure
     self.coverage = coverage
     self.extra_env = extra_env
 
   def __call__(self, *args):
-    RunEngineExecutable(
+    run_engine_executable(
         self.build_dir,
         self.executable_name,
-        self.filter,
+        self.executable_filter,
         flags=self.flags,
         cwd=self.cwd,
         forbidden_output=self.forbidden_output,
+        allowed_failure_output=self.allowed_failure_output,
         expect_failure=self.expect_failure,
         coverage=self.coverage,
         extra_env=self.extra_env,
     )
 
   def __str__(self):
-    command = BuildEngineExecutableCommand(
-        self.build_dir,
-        self.executable_name,
-        flags=self.flags,
-        coverage=self.coverage
+    command = build_engine_executable_command(
+        self.build_dir, self.executable_name, flags=self.flags, coverage=self.coverage
     )
-    return " ".join(command)
+    return ' '.join(command)
 
 
 shuffle_flags = [
-    "--gtest_repeat=2",
-    "--gtest_shuffle",
+    '--gtest_repeat=2',
+    '--gtest_shuffle',
 ]
 
 
-def RunCCTests(build_dir, filter, coverage, capture_core_dump):
-  print("Running Engine Unit-tests.")
+def run_cc_tests(build_dir, executable_filter, coverage, capture_core_dump):
+  logger.info('Running Engine Unit-tests.')
 
-  if capture_core_dump and IsLinux():
-    import resource
-    resource.setrlimit(
-        resource.RLIMIT_CORE, (resource.RLIM_INFINITY, resource.RLIM_INFINITY)
-    )
+  if capture_core_dump and is_linux():
+    import resource  # pylint: disable=import-outside-toplevel
+    resource.setrlimit(resource.RLIMIT_CORE, (resource.RLIM_INFINITY, resource.RLIM_INFINITY))
 
   repeat_flags = [
-      "--repeat=2",
+      '--repeat=2',
   ]
 
-  def make_test(name, flags=repeat_flags, extra_env={}):
+  def make_test(name, flags=None, extra_env=None):
+    if flags is None:
+      flags = repeat_flags
+    if extra_env is None:
+      extra_env = {}
     return (name, flags, extra_env)
 
   unittests = [
@@ -342,7 +415,8 @@ def RunCCTests(build_dir, filter, coverage, capture_core_dump):
       make_test('embedder_a11y_unittests'),
       make_test('embedder_proctable_unittests'),
       make_test('embedder_unittests'),
-      make_test('fml_unittests', flags=[FML_UNITTESTS_FILTER] + repeat_flags),
+      make_test('fml_unittests'),
+      make_test('fml_arc_unittests'),
       make_test('no_dart_plugin_registrant_unittests'),
       make_test('runtime_unittests'),
       make_test('testing_unittests'),
@@ -351,7 +425,7 @@ def RunCCTests(build_dir, filter, coverage, capture_core_dump):
       make_test('ui_unittests', flags=repeat_flags + ['--timeout=90']),
   ]
 
-  if not IsWindows():
+  if not is_windows():
     unittests += [
         # https://github.com/google/googletest/issues/2490
         make_test('android_external_view_embedder_unittests'),
@@ -361,7 +435,7 @@ def RunCCTests(build_dir, filter, coverage, capture_core_dump):
         make_test('shell_unittests'),
     ]
 
-  if IsWindows():
+  if is_windows():
     unittests += [
         # The accessibility library only supports Mac and Windows.
         make_test('accessibility_unittests'),
@@ -370,27 +444,26 @@ def RunCCTests(build_dir, filter, coverage, capture_core_dump):
     ]
 
   # These unit-tests are Objective-C and can only run on Darwin.
-  if IsMac():
+  if is_mac():
     unittests += [
         # The accessibility library only supports Mac and Windows.
         make_test('accessibility_unittests'),
-        make_test('flutter_channels_unittests'),
+        make_test('availability_version_check_unittests'),
+        make_test('framework_common_unittests'),
+        make_test('spring_animation_unittests'),
+        make_test('gpu_surface_metal_unittests'),
     ]
 
-  if IsLinux():
+  if is_linux():
     flow_flags = [
-        '--golden-dir=%s' % golden_dir,
-        '--font-file=%s' % roboto_font_path,
-    ]
-    icu_flags = [
-        '--icu-data-file-path=%s' % os.path.join(build_dir, 'icudtl.dat')
+        '--golden-dir=%s' % GOLDEN_DIR,
+        '--font-file=%s' % ROBOTO_FONT_PATH,
     ]
+    icu_flags = ['--icu-data-file-path=%s' % os.path.join(build_dir, 'icudtl.dat')]
     unittests += [
         make_test('flow_unittests', flags=repeat_flags + ['--'] + flow_flags),
         make_test('flutter_glfw_unittests'),
-        make_test(
-            'flutter_linux_unittests', extra_env={'G_DEBUG': 'fatal-criticals'}
-        ),
+        make_test('flutter_linux_unittests', extra_env={'G_DEBUG': 'fatal-criticals'}),
         # https://github.com/flutter/flutter/issues/36296
         make_test('txt_unittests', flags=repeat_flags + ['--'] + icu_flags),
     ]
@@ -400,97 +473,154 @@ def RunCCTests(build_dir, filter, coverage, capture_core_dump):
         make_test('flow_unittests', flags=repeat_flags + flow_flags),
     ]
 
-  for test, flags, extra_env in unittests:
-    RunEngineExecutable(
+  build_name = os.path.basename(build_dir)
+  try:
+    if is_linux():
+      xvfb.start_virtual_x(build_name, build_dir)
+    for test, flags, extra_env in unittests:
+      run_engine_executable(
+          build_dir,
+          test,
+          executable_filter,
+          flags,
+          coverage=coverage,
+          extra_env=extra_env,
+          gtest=True
+      )
+  finally:
+    if is_linux():
+      xvfb.stop_virtual_x(build_name)
+
+  if is_mac():
+    # flutter_desktop_darwin_unittests uses global state that isn't handled
+    # correctly by gtest-parallel.
+    # https://github.com/flutter/flutter/issues/104789
+    if not os.path.basename(build_dir).startswith('host_debug'):
+      # Test is disabled for flaking in debug runs:
+      # https://github.com/flutter/flutter/issues/127441
+      run_engine_executable(
+          build_dir,
+          'flutter_desktop_darwin_unittests',
+          executable_filter,
+          shuffle_flags,
+          coverage=coverage
+      )
+    extra_env = metal_validation_env()
+    extra_env.update(vulkan_validation_env(build_dir))
+    mac_impeller_unittests_flags = shuffle_flags + [
+        '--enable_vulkan_validation',
+        '--gtest_filter=-*OpenGLES'  # These are covered in the golden tests.
+    ]
+    # Impeller tests are only supported on macOS for now.
+    run_engine_executable(
         build_dir,
-        test,
-        filter,
-        flags,
+        'impeller_unittests',
+        executable_filter,
+        mac_impeller_unittests_flags,
         coverage=coverage,
         extra_env=extra_env,
-        gtest=True
+        # TODO(https://github.com/flutter/flutter/issues/123733): Remove this allowlist.
+        # See also https://github.com/flutter/flutter/issues/114872.
+        allowed_failure_output=[
+            '[MTLCompiler createVertexStageAndLinkPipelineWithFragment:',
+            '[MTLCompiler pipelineStateWithVariant:',
+        ]
     )
 
-  if IsMac():
-    # flutter_desktop_darwin_unittests uses global state that isn't handled
-    # correctly by gtest-parallel.
-    # https://github.com/flutter/flutter/issues/104789
-    RunEngineExecutable(
+    # Run one interactive Vulkan test with validation enabled.
+    #
+    # TODO(matanlurey): https://github.com/flutter/flutter/issues/134852; enable
+    # more of the suite, and ideally we'd like to use Skia gold and take screen
+    # shots as well.
+    run_engine_executable(
         build_dir,
-        'flutter_desktop_darwin_unittests',
-        filter,
-        shuffle_flags,
-        coverage=coverage
+        'impeller_unittests',
+        executable_filter,
+        shuffle_flags + [
+            '--enable_vulkan_validation',
+            '--enable_playground',
+            '--playground_timeout_ms=4000',
+            '--gtest_filter="*ColorWheel/Vulkan"',
+        ],
+        coverage=coverage,
+        extra_env=extra_env,
     )
-    # TODO(117122): Re-enable impeller_unittests after shader compiler errors
-    #               are addressed.
-    # Impeller tests are only supported on macOS for now.
-    # RunEngineExecutable(
-    #     build_dir,
-    #     'impeller_unittests',
-    #     filter,
-    #     shuffle_flags,
-    #     coverage=coverage,
-    #     extra_env={
-    #         # See https://developer.apple.com/documentation/metal/diagnosing_metal_programming_issues_early?language=objc
-    #         'MTL_SHADER_VALIDATION':
-    #             '1',  # Enables all shader validation tests.
-    #         'MTL_SHADER_VALIDATION_GLOBAL_MEMORY':
-    #             '1',  # Validates accesses to device and constant memory.
-    #         'MTL_SHADER_VALIDATION_THREADGROUP_MEMORY':
-    #             '1',  # Validates accesses to threadgroup memory.
-    #         'MTL_SHADER_VALIDATION_TEXTURE_USAGE':
-    #             '1',  # Validates that texture references are not nil.
-    #     }
-    # )
-
-
-def ParseImpellerVulkanFilter():
-  test_status_path = os.path.join(script_dir, 'impeller_vulkan_test_status.csv')
-  gtest_filter = '--gtest_filter="'
-  with open(test_status_path, 'r') as csvfile:
-    csvreader = csv.reader(csvfile)
-    next(csvreader)  # Skip header.
-    for row in csvreader:
-      if row[1] == 'pass':
-        gtest_filter += '*%s:' % row[0]
-  gtest_filter += '"'
-  return gtest_filter
-
-
-def RunEngineBenchmarks(build_dir, filter):
-  print("Running Engine Benchmarks.")
-
-  icu_flags = [
-      '--icu-data-file-path=%s' % os.path.join(build_dir, 'icudtl.dat')
-  ]
 
-  RunEngineExecutable(build_dir, 'shell_benchmarks', filter, icu_flags)
+    # Run the Flutter GPU test suite.
+    run_engine_executable(
+        build_dir,
+        'impeller_dart_unittests',
+        executable_filter,
+        shuffle_flags + [
+            '--enable_vulkan_validation',
+            # TODO(https://github.com/flutter/flutter/issues/145036)
+            # TODO(https://github.com/flutter/flutter/issues/142642)
+            '--gtest_filter=*Metal',
+        ],
+        coverage=coverage,
+        extra_env=extra_env,
+    )
 
-  RunEngineExecutable(build_dir, 'fml_benchmarks', filter, icu_flags)
 
-  RunEngineExecutable(build_dir, 'ui_benchmarks', filter, icu_flags)
+def run_engine_benchmarks(build_dir, executable_filter):
+  logger.info('Running Engine Benchmarks.')
 
-  RunEngineExecutable(
-      build_dir, 'display_list_builder_benchmarks', filter, icu_flags
-  )
+  icu_flags = ['--icu-data-file-path=%s' % os.path.join(build_dir, 'icudtl.dat')]
 
-  RunEngineExecutable(build_dir, 'geometry_benchmarks', filter, icu_flags)
+  run_engine_executable(build_dir, 'shell_benchmarks', executable_filter, icu_flags)
 
-  if IsLinux():
-    RunEngineExecutable(build_dir, 'txt_benchmarks', filter, icu_flags)
+  run_engine_executable(build_dir, 'fml_benchmarks', executable_filter, icu_flags)
 
+  run_engine_executable(build_dir, 'ui_benchmarks', executable_filter, icu_flags)
 
-def GatherDartTest(
-    build_dir,
-    test_packages,
-    dart_file,
-    verbose_dart_snapshot,
-    multithreaded,
-    enable_observatory=False,
-    expect_failure=False,
-    alternative_tester=False
-):
+  run_engine_executable(build_dir, 'display_list_builder_benchmarks', executable_filter, icu_flags)
+
+  run_engine_executable(build_dir, 'geometry_benchmarks', executable_filter, icu_flags)
+
+  run_engine_executable(build_dir, 'canvas_benchmarks', executable_filter, icu_flags)
+
+  if is_linux():
+    run_engine_executable(build_dir, 'txt_benchmarks', executable_filter, icu_flags)
+
+
+class FlutterTesterOptions():
+
+  def __init__(
+      self,
+      multithreaded=False,
+      enable_impeller=False,
+      enable_observatory=False,
+      expect_failure=False
+  ):
+    self.multithreaded = multithreaded
+    self.enable_impeller = enable_impeller
+    self.enable_observatory = enable_observatory
+    self.expect_failure = expect_failure
+
+  def apply_args(self, command_args):
+    if not self.enable_observatory:
+      command_args.append('--disable-observatory')
+
+    if self.enable_impeller:
+      command_args += ['--enable-impeller']
+    else:
+      command_args += ['--no-enable-impeller']
+
+    if self.multithreaded:
+      command_args.insert(0, '--force-multithreading')
+
+  def threading_description(self):
+    if self.multithreaded:
+      return 'multithreaded'
+    return 'single-threaded'
+
+  def impeller_enabled(self):
+    if self.enable_impeller:
+      return 'impeller swiftshader'
+    return 'skia software'
+
+
+def gather_dart_test(build_dir, dart_file, options):
   kernel_file_name = os.path.basename(dart_file) + '.dill'
   kernel_file_output = os.path.join(build_dir, 'gen', kernel_file_name)
   error_message = "%s doesn't exist. Please run the build that populates %s" % (
@@ -499,127 +629,90 @@ def GatherDartTest(
   assert os.path.isfile(kernel_file_output), error_message
 
   command_args = []
-  if not enable_observatory:
-    command_args.append('--disable-observatory')
+
+  options.apply_args(command_args)
 
   dart_file_contents = open(dart_file, 'r')
-  custom_options = re.findall(
-      "// FlutterTesterOptions=(.*)", dart_file_contents.read()
-  )
+  custom_options = re.findall('// FlutterTesterOptions=(.*)', dart_file_contents.read())
   dart_file_contents.close()
   command_args.extend(custom_options)
 
   command_args += [
       '--use-test-fonts',
       '--icu-data-file-path=%s' % os.path.join(build_dir, 'icudtl.dat'),
-      '--flutter-assets-dir=%s' %
-      os.path.join(build_dir, 'gen', 'flutter', 'lib', 'ui', 'assets'),
+      '--flutter-assets-dir=%s' % os.path.join(build_dir, 'gen', 'flutter', 'lib', 'ui', 'assets'),
       '--disable-asset-fonts',
       kernel_file_output,
   ]
 
-  if multithreaded:
-    threading = 'multithreaded'
-    command_args.insert(0, '--force-multithreading')
-  else:
-    threading = 'single-threaded'
-
   tester_name = 'flutter_tester'
-  print(
-      "Running test '%s' using '%s' (%s)" %
-      (kernel_file_name, tester_name, threading)
+  logger.info(
+      "Running test '%s' using '%s' (%s, %s)", kernel_file_name, tester_name,
+      options.threading_description(), options.impeller_enabled()
   )
-  forbidden_output = [] if 'unopt' in build_dir or expect_failure else [
-      '[ERROR'
-  ]
+  forbidden_output = [] if 'unopt' in build_dir or options.expect_failure else ['[ERROR']
   return EngineExecutableTask(
       build_dir,
       tester_name,
       None,
       command_args,
       forbidden_output=forbidden_output,
-      expect_failure=expect_failure,
-  )
-
-
-def EnsureDebugUnoptSkyPackagesAreBuilt():
-  variant_out_dir = os.path.join(out_dir, 'host_debug_unopt')
-  message = []
-  message.append('gn --runtime-mode debug --unopt --no-lto')
-  message.append('ninja -C %s flutter/sky/packages' % variant_out_dir)
-  final_message = '%s doesn\'t exist. Please run the following commands: \n%s' % (
-      variant_out_dir, '\n'.join(message)
+      expect_failure=options.expect_failure,
   )
-  assert os.path.exists(variant_out_dir), final_message
 
 
-def EnsureIosTestsAreBuilt(ios_out_dir):
+def ensure_ios_tests_are_built(ios_out_dir):
   """Builds the engine variant and the test dylib containing the XCTests"""
-  tmp_out_dir = os.path.join(out_dir, ios_out_dir)
+  tmp_out_dir = os.path.join(OUT_DIR, ios_out_dir)
   ios_test_lib = os.path.join(tmp_out_dir, 'libios_test_flutter.dylib')
   message = []
-  message.append(
-      'gn --ios --unoptimized --runtime-mode=debug --no-lto --simulator'
-  )
-  message.append('autoninja -C %s ios_test_flutter' % ios_out_dir)
-  final_message = '%s or %s doesn\'t exist. Please run the following commands: \n%s' % (
+  message.append('gn --ios --unoptimized --runtime-mode=debug --no-lto --simulator')
+  message.append('ninja -C %s ios_test_flutter' % ios_out_dir)
+  final_message = "%s or %s doesn't exist. Please run the following commands: \n%s" % (
       ios_out_dir, ios_test_lib, '\n'.join(message)
   )
-  assert os.path.exists(tmp_out_dir
-                       ) and os.path.exists(ios_test_lib), final_message
+  assert os.path.exists(tmp_out_dir) and os.path.exists(ios_test_lib), final_message
 
 
-def AssertExpectedXcodeVersion():
+def assert_expected_xcode_version():
   """Checks that the user has a version of Xcode installed"""
   version_output = subprocess.check_output(['xcodebuild', '-version'])
   # TODO ricardoamador: remove this check when python 2 is deprecated.
-  version_output = version_output if isinstance(
-      version_output, str
-  ) else version_output.decode(ENCODING)
+  version_output = version_output if isinstance(version_output,
+                                                str) else version_output.decode(ENCODING)
   version_output = version_output.strip()
   match = re.match(r'Xcode (\d+)', version_output)
   message = 'Xcode must be installed to run the iOS embedding unit tests'
   assert match, message
 
 
-def JavaHome():
+def java_home():
   script_path = os.path.dirname(os.path.realpath(__file__))
-  if IsMac():
+  if is_mac():
     return os.path.join(
-        script_path, '..', '..', 'third_party', 'java', 'openjdk', 'Contents',
-        'Home'
-    )
-  else:
-    return os.path.join(
-        script_path, '..', '..', 'third_party', 'java', 'openjdk'
+        script_path, '..', '..', 'third_party', 'java', 'openjdk', 'Contents', 'Home'
     )
+  return os.path.join(script_path, '..', '..', 'third_party', 'java', 'openjdk')
 
 
-def JavaBin():
-  return os.path.join(JavaHome(), 'bin', 'java.exe' if IsWindows() else 'java')
+def java_bin():
+  return os.path.join(java_home(), 'bin', 'java.exe' if is_windows() else 'java')
 
 
-def RunJavaTests(filter, android_variant='android_debug_unopt'):
+def run_java_tests(executable_filter, android_variant='android_debug_unopt'):
   """Runs the Java JUnit unit tests for the Android embedding"""
   test_runner_dir = os.path.join(
-      buildroot_dir, 'flutter', 'shell', 'platform', 'android', 'test_runner'
+      BUILDROOT_DIR, 'flutter', 'shell', 'platform', 'android', 'test_runner'
   )
   gradle_bin = os.path.join(
-      buildroot_dir, 'third_party', 'gradle', 'bin',
-      'gradle.bat' if IsWindows() else 'gradle'
-  )
-  flutter_jar = os.path.join(out_dir, android_variant, 'flutter.jar')
-  android_home = os.path.join(
-      buildroot_dir, 'third_party', 'android_tools', 'sdk'
-  )
-  build_dir = os.path.join(
-      out_dir, android_variant, 'robolectric_tests', 'build'
-  )
-  gradle_cache_dir = os.path.join(
-      out_dir, android_variant, 'robolectric_tests', '.gradle'
+      BUILDROOT_DIR, 'third_party', 'gradle', 'bin', 'gradle.bat' if is_windows() else 'gradle'
   )
+  flutter_jar = os.path.join(OUT_DIR, android_variant, 'flutter.jar')
+  android_home = os.path.join(BUILDROOT_DIR, 'third_party', 'android_tools', 'sdk')
+  build_dir = os.path.join(OUT_DIR, android_variant, 'robolectric_tests', 'build')
+  gradle_cache_dir = os.path.join(OUT_DIR, android_variant, 'robolectric_tests', '.gradle')
 
-  test_class = filter if filter else '*'
+  test_class = executable_filter if executable_filter else '*'
   command = [
       gradle_bin,
       '-Pflutter_jar=%s' % flutter_jar,
@@ -632,44 +725,54 @@ def RunJavaTests(filter, android_variant='android_debug_unopt'):
       '--gradle-user-home=%s' % gradle_cache_dir,
   ]
 
-  env = dict(os.environ, ANDROID_HOME=android_home, JAVA_HOME=JavaHome())
-  RunCmd(command, cwd=test_runner_dir, env=env)
+  env = dict(os.environ, ANDROID_HOME=android_home, JAVA_HOME=java_home())
+  run_cmd(command, cwd=test_runner_dir, env=env)
 
 
-def RunAndroidTests(android_variant='android_debug_unopt', adb_path=None):
-  test_runner_name = 'flutter_shell_native_unittests'
-  tests_path = os.path.join(out_dir, android_variant, test_runner_name)
+def run_android_unittest(test_runner_name, android_variant, adb_path):
+  tests_path = os.path.join(OUT_DIR, android_variant, test_runner_name)
   remote_path = '/data/local/tmp'
   remote_tests_path = os.path.join(remote_path, test_runner_name)
-  if adb_path == None:
+  run_cmd([adb_path, 'push', tests_path, remote_path], cwd=BUILDROOT_DIR)
+
+  try:
+    run_cmd([adb_path, 'shell', remote_tests_path])
+  except:
+    luci_test_outputs_path = os.environ.get('FLUTTER_TEST_OUTPUTS_DIR')
+    if luci_test_outputs_path:
+      print('>>>>> Test %s failed. Capturing logcat.' % test_runner_name)
+      logcat_path = os.path.join(luci_test_outputs_path, '%s_logcat' % test_runner_name)
+      logcat_file = open(logcat_path, 'w')
+      subprocess.run([adb_path, 'logcat', '-d'], stdout=logcat_file, check=False)
+    raise
+
+
+def run_android_tests(android_variant='android_debug_unopt', adb_path=None):
+  if adb_path is None:
     adb_path = 'adb'
-  RunCmd([adb_path, 'push', tests_path, remote_path], cwd=buildroot_dir)
-  RunCmd([adb_path, 'shell', remote_tests_path])
 
-  systrace_test = os.path.join(
-      buildroot_dir, 'flutter', 'testing', 'android_systrace_test.py'
-  )
-  scenario_apk = os.path.join(
-      out_dir, android_variant, 'firebase_apks', 'scenario_app.apk'
-  )
-  RunCmd([
-      systrace_test, '--adb-path', adb_path, '--apk-path', scenario_apk,
-      '--package-name', 'dev.flutter.scenarios', '--activity-name',
-      '.PlatformViewsActivity'
+  run_android_unittest('flutter_shell_native_unittests', android_variant, adb_path)
+  run_android_unittest('impeller_toolkit_android_unittests', android_variant, adb_path)
+
+  systrace_test = os.path.join(BUILDROOT_DIR, 'flutter', 'testing', 'android_systrace_test.py')
+  scenario_apk = os.path.join(OUT_DIR, android_variant, 'firebase_apks', 'scenario_app.apk')
+  run_cmd([
+      systrace_test, '--adb-path', adb_path, '--apk-path', scenario_apk, '--package-name',
+      'dev.flutter.scenarios', '--activity-name', '.PlatformViewsActivity'
   ])
 
 
-def RunObjcTests(ios_variant='ios_debug_sim_unopt', test_filter=None):
+def run_objc_tests(ios_variant='ios_debug_sim_unopt', test_filter=None):
   """Runs Objective-C XCTest unit tests for the iOS embedding"""
-  AssertExpectedXcodeVersion()
-  ios_out_dir = os.path.join(out_dir, ios_variant)
-  EnsureIosTestsAreBuilt(ios_out_dir)
+  assert_expected_xcode_version()
+  ios_out_dir = os.path.join(OUT_DIR, ios_variant)
+  ensure_ios_tests_are_built(ios_out_dir)
 
   new_simulator_name = 'IosUnitTestsSimulator'
 
   # Delete simulators with this name in case any were leaked
   # from another test run.
-  DeleteSimulator(new_simulator_name)
+  delete_simulator(new_simulator_name)
 
   create_simulator = [
       'xcrun '
@@ -677,264 +780,214 @@ def RunObjcTests(ios_variant='ios_debug_sim_unopt', test_filter=None):
       'create '
       '%s com.apple.CoreSimulator.SimDeviceType.iPhone-11' % new_simulator_name
   ]
-  RunCmd(create_simulator, shell=True)
+  run_cmd(create_simulator, shell=True)
 
   try:
-    ios_unit_test_dir = os.path.join(
-        buildroot_dir, 'flutter', 'testing', 'ios', 'IosUnitTests'
-    )
-    # Avoid using xcpretty unless the following can be addressed:
-    # - Make sure all relevant failure output is printed on a failure.
-    # - Make sure that a failing exit code is set for CI.
-    # See https://github.com/flutter/flutter/issues/63742
-    test_command = [
-        'xcodebuild '
-        '-sdk iphonesimulator '
-        '-scheme IosUnitTests '
-        "-destination name='" + new_simulator_name + "' "
-        'test '
-        'FLUTTER_ENGINE=' + ios_variant
-    ]
-    if test_filter != None:
-      test_command[0] = test_command[0] + " -only-testing:%s" % test_filter
-    RunCmd(test_command, cwd=ios_unit_test_dir, shell=True)
+    ios_unit_test_dir = os.path.join(BUILDROOT_DIR, 'flutter', 'testing', 'ios', 'IosUnitTests')
+
+    with tempfile.TemporaryDirectory(suffix='ios_embedding_xcresult') as result_bundle_temp:
+      result_bundle_path = os.path.join(result_bundle_temp, 'ios_embedding')
+
+      # Avoid using xcpretty unless the following can be addressed:
+      # - Make sure all relevant failure output is printed on a failure.
+      # - Make sure that a failing exit code is set for CI.
+      # See https://github.com/flutter/flutter/issues/63742
+      test_command = [
+          'xcodebuild '
+          '-sdk iphonesimulator '
+          '-scheme IosUnitTests '
+          '-resultBundlePath ' + result_bundle_path + ' '
+          '-destination name=' + new_simulator_name + ' '
+          'test '
+          'FLUTTER_ENGINE=' + ios_variant
+      ]
+      if test_filter is not None:
+        test_command[0] = test_command[0] + ' -only-testing:%s' % test_filter
+      try:
+        run_cmd(test_command, cwd=ios_unit_test_dir, shell=True)
+
+      except:
+        # The LUCI environment may provide a variable containing a directory path
+        # for additional output files that will be uploaded to cloud storage.
+        # Upload the xcresult when the tests fail.
+        luci_test_outputs_path = os.environ.get('FLUTTER_TEST_OUTPUTS_DIR')
+        xcresult_bundle = os.path.join(result_bundle_temp, 'ios_embedding.xcresult')
+        if luci_test_outputs_path and os.path.exists(xcresult_bundle):
+          dump_path = os.path.join(luci_test_outputs_path, 'ios_embedding.xcresult')
+          # xcresults contain many little files. Archive the bundle before upload.
+          shutil.make_archive(dump_path, 'zip', root_dir=xcresult_bundle)
+        raise
+
   finally:
-    DeleteSimulator(new_simulator_name)
+    delete_simulator(new_simulator_name)
 
 
-def DeleteSimulator(simulator_name):
+def delete_simulator(simulator_name):
   # Will delete all simulators with this name.
-  delete_simulator = [
+  command = [
       'xcrun',
       'simctl',
       'delete',
       simulator_name,
   ]
   # Let this fail if the simulator was never created.
-  RunCmd(delete_simulator, expect_failure=True)
+  run_cmd(command, expect_failure=True)
 
 
-def GatherDartTests(build_dir, filter, verbose_dart_snapshot):
+def gather_dart_tests(build_dir, test_filter):
   dart_tests_dir = os.path.join(
-      buildroot_dir,
+      BUILDROOT_DIR,
       'flutter',
       'testing',
       'dart',
   )
 
-  # This one is a bit messy. The pubspec.yaml at flutter/testing/dart/pubspec.yaml
-  # has dependencies that are hardcoded to point to the sky packages at host_debug_unopt/
-  # Before running Dart tests, make sure to run just that target (NOT the whole engine)
-  EnsureDebugUnoptSkyPackagesAreBuilt()
-
   # Now that we have the Sky packages at the hardcoded location, run `dart pub get`.
-  RunEngineExecutable(
+  run_engine_executable(
       build_dir,
       os.path.join('dart-sdk', 'bin', 'dart'),
       None,
-      flags=['pub', 'get', '--offline'],
+      flags=['pub', '--suppress-analytics', 'get', '--offline'],
       cwd=dart_tests_dir,
   )
 
-  dart_observatory_tests = glob.glob(
-      '%s/observatory/*_test.dart' % dart_tests_dir
-  )
+  dart_observatory_tests = glob.glob('%s/observatory/*_test.dart' % dart_tests_dir)
   dart_tests = glob.glob('%s/*_test.dart' % dart_tests_dir)
-  test_packages = os.path.join(
-      dart_tests_dir, '.dart_tool', 'package_config.json'
-  )
 
   if 'release' not in build_dir:
     for dart_test_file in dart_observatory_tests:
-      if filter is not None and os.path.basename(dart_test_file) not in filter:
-        print("Skipping '%s' due to filter." % dart_test_file)
+      if test_filter is not None and os.path.basename(dart_test_file) not in test_filter:
+        logger.info("Skipping '%s' due to filter.", dart_test_file)
       else:
-        print(
-            "Gathering dart test '%s' with observatory enabled" % dart_test_file
-        )
-        yield GatherDartTest(
-            build_dir, test_packages, dart_test_file, verbose_dart_snapshot,
-            True, True
-        )
-        yield GatherDartTest(
-            build_dir, test_packages, dart_test_file, verbose_dart_snapshot,
-            False, True
-        )
+        logger.info("Gathering dart test '%s' with observatory enabled", dart_test_file)
+        for multithreaded in [False, True]:
+          for enable_impeller in [False, True]:
+            yield gather_dart_test(
+                build_dir, dart_test_file,
+                FlutterTesterOptions(
+                    multithreaded=multithreaded,
+                    enable_impeller=enable_impeller,
+                    enable_observatory=True
+                )
+            )
 
   for dart_test_file in dart_tests:
-    if filter is not None and os.path.basename(dart_test_file) not in filter:
-      print("Skipping '%s' due to filter." % dart_test_file)
+    if test_filter is not None and os.path.basename(dart_test_file) not in test_filter:
+      logger.info("Skipping '%s' due to filter.", dart_test_file)
     else:
-      print("Gathering dart test '%s'" % dart_test_file)
-      yield GatherDartTest(
-          build_dir, test_packages, dart_test_file, verbose_dart_snapshot, True
-      )
-      yield GatherDartTest(
-          build_dir, test_packages, dart_test_file, verbose_dart_snapshot, False
-      )
+      logger.info("Gathering dart test '%s'", dart_test_file)
+      for multithreaded in [False, True]:
+        for enable_impeller in [False, True]:
+          yield gather_dart_test(
+              build_dir, dart_test_file,
+              FlutterTesterOptions(multithreaded=multithreaded, enable_impeller=enable_impeller)
+          )
 
 
-def GatherDartSmokeTest(build_dir, verbose_dart_snapshot):
+def gather_dart_smoke_test(build_dir, test_filter):
   smoke_test = os.path.join(
-      buildroot_dir, "flutter", "testing", "smoke_test_failure",
-      "fail_test.dart"
-  )
-  test_packages = os.path.join(
-      buildroot_dir, "flutter", "testing", "smoke_test_failure", ".dart_tool",
-      "package_config.json"
-  )
-  yield GatherDartTest(
-      build_dir,
-      test_packages,
-      smoke_test,
-      verbose_dart_snapshot,
-      True,
-      expect_failure=True
-  )
-  yield GatherDartTest(
-      build_dir,
-      test_packages,
-      smoke_test,
-      verbose_dart_snapshot,
-      False,
-      expect_failure=True
+      BUILDROOT_DIR,
+      'flutter',
+      'testing',
+      'smoke_test_failure',
+      'fail_test.dart',
   )
+  if test_filter is not None and os.path.basename(smoke_test) not in test_filter:
+    logger.info("Skipping '%s' due to filter.", smoke_test)
+  else:
+    yield gather_dart_test(
+        build_dir, smoke_test, FlutterTesterOptions(multithreaded=True, expect_failure=True)
+    )
+    yield gather_dart_test(
+        build_dir, smoke_test, FlutterTesterOptions(multithreaded=False, expect_failure=True)
+    )
 
 
-def GatherFrontEndServerTests(build_dir):
-  test_dir = os.path.join(buildroot_dir, 'flutter', 'flutter_frontend_server')
-  dart_tests = glob.glob('%s/test/*_test.dart' % test_dir)
+def gather_dart_package_tests(build_dir, package_path, extra_opts):
+  dart_tests = glob.glob('%s/test/*_test.dart' % package_path)
+  if not dart_tests:
+    raise Exception('No tests found for Dart package at %s' % package_path)
   for dart_test_file in dart_tests:
-    opts = [
-        '--disable-dart-dev', dart_test_file, build_dir,
-        os.path.join(build_dir, 'gen', 'frontend_server.dart.snapshot'),
-        os.path.join(build_dir, 'flutter_patched_sdk')
-    ]
+    opts = ['--disable-dart-dev', dart_test_file] + extra_opts
     yield EngineExecutableTask(
-        build_dir,
-        os.path.join('dart-sdk', 'bin', 'dart'),
-        None,
-        flags=opts,
-        cwd=test_dir
+        build_dir, os.path.join('dart-sdk', 'bin', 'dart'), None, flags=opts, cwd=package_path
     )
 
 
-def GatherPathOpsTests(build_dir):
-  # TODO(dnfield): https://github.com/flutter/flutter/issues/107321
-  if IsAsan(build_dir):
-    return
-
-  test_dir = os.path.join(
-      buildroot_dir, 'flutter', 'tools', 'path_ops', 'dart', 'test'
-  )
-  opts = ['--disable-dart-dev', os.path.join(test_dir, 'path_ops_test.dart')]
-  yield EngineExecutableTask(
-      build_dir,
-      os.path.join('dart-sdk', 'bin', 'dart'),
-      None,
-      flags=opts,
-      cwd=test_dir
-  )
-
-
-def GatherConstFinderTests(build_dir):
-  test_dir = os.path.join(
-      buildroot_dir, 'flutter', 'tools', 'const_finder', 'test'
-  )
-  opts = [
-      '--disable-dart-dev',
-      os.path.join(test_dir, 'const_finder_test.dart'),
-      os.path.join(build_dir, 'gen', 'frontend_server.dart.snapshot'),
-      os.path.join(build_dir, 'flutter_patched_sdk'),
-      os.path.join(build_dir, 'dart-sdk', 'lib', 'libraries.json')
+# Returns a list of Dart packages to test.
+#
+# The first element of each tuple in the returned list is the path to the Dart
+# package to test. It is assumed that the packages follow the convention that
+# tests are named as '*_test.dart', and reside under a directory called 'test'.
+#
+# The second element of each tuple is a list of additional command line
+# arguments to pass to each of the packages tests.
+def build_dart_host_test_list(build_dir):
+  dart_host_tests = [
+      (
+          os.path.join('flutter', 'ci'),
+          [os.path.join(BUILDROOT_DIR, 'flutter')],
+      ),
+      (
+          os.path.join('flutter', 'flutter_frontend_server'),
+          [
+              build_dir,
+              os.path.join(build_dir, 'gen', 'frontend_server.dart.snapshot'),
+              os.path.join(build_dir, 'flutter_patched_sdk')
+          ],
+      ),
+      (os.path.join('flutter', 'testing', 'litetest'), []),
+      (os.path.join('flutter', 'testing', 'skia_gold_client'), []),
+      (os.path.join('flutter', 'testing', 'scenario_app'), []),
+      (
+          os.path.join('flutter', 'tools', 'api_check'),
+          [os.path.join(BUILDROOT_DIR, 'flutter')],
+      ),
+      (os.path.join('flutter', 'tools', 'build_bucket_golden_scraper'), []),
+      (os.path.join('flutter', 'tools', 'clang_tidy'), []),
+      (
+          os.path.join('flutter', 'tools', 'const_finder'),
+          [
+              os.path.join(build_dir, 'gen', 'frontend_server.dart.snapshot'),
+              os.path.join(build_dir, 'flutter_patched_sdk'),
+              os.path.join(build_dir, 'dart-sdk', 'lib', 'libraries.json'),
+          ],
+      ),
+      (os.path.join('flutter', 'tools', 'dir_contents_diff'), []),
+      (os.path.join('flutter', 'tools', 'engine_tool'), []),
+      (os.path.join('flutter', 'tools', 'githooks'), []),
+      (os.path.join('flutter', 'tools', 'header_guard_check'), []),
+      (os.path.join('flutter', 'tools', 'pkg', 'engine_build_configs'), []),
+      (os.path.join('flutter', 'tools', 'pkg', 'engine_repo_tools'), []),
+      (os.path.join('flutter', 'tools', 'pkg', 'git_repo_tools'), []),
   ]
-  yield EngineExecutableTask(
-      build_dir,
-      os.path.join('dart-sdk', 'bin', 'dart'),
-      None,
-      flags=opts,
-      cwd=test_dir
-  )
-
+  if not is_asan(build_dir):
+    dart_host_tests += [
+        (os.path.join('flutter', 'tools', 'path_ops', 'dart'), []),
+    ]
 
-def GatherLitetestTests(build_dir):
-  test_dir = os.path.join(buildroot_dir, 'flutter', 'testing', 'litetest')
-  dart_tests = glob.glob('%s/test/*_test.dart' % test_dir)
-  for dart_test_file in dart_tests:
-    opts = ['--disable-dart-dev', dart_test_file]
-    yield EngineExecutableTask(
-        build_dir,
-        os.path.join('dart-sdk', 'bin', 'dart'),
-        None,
-        flags=opts,
-        cwd=test_dir
-    )
+  return dart_host_tests
 
 
-def RunBenchmarkTests(build_dir):
-  test_dir = os.path.join(buildroot_dir, 'flutter', 'testing', 'benchmark')
+def run_benchmark_tests(build_dir):
+  test_dir = os.path.join(BUILDROOT_DIR, 'flutter', 'testing', 'benchmark')
   dart_tests = glob.glob('%s/test/*_test.dart' % test_dir)
   for dart_test_file in dart_tests:
     opts = ['--disable-dart-dev', dart_test_file]
-    RunEngineExecutable(
-        build_dir,
-        os.path.join('dart-sdk', 'bin', 'dart'),
-        None,
-        flags=opts,
-        cwd=test_dir
+    run_engine_executable(
+        build_dir, os.path.join('dart-sdk', 'bin', 'dart'), None, flags=opts, cwd=test_dir
     )
 
 
-def GatherGithooksTests(build_dir):
-  test_dir = os.path.join(buildroot_dir, 'flutter', 'tools', 'githooks')
-  dart_tests = glob.glob('%s/test/*_test.dart' % test_dir)
-  for dart_test_file in dart_tests:
-    opts = ['--disable-dart-dev', dart_test_file]
-    yield EngineExecutableTask(
-        build_dir,
-        os.path.join('dart-sdk', 'bin', 'dart'),
-        None,
-        flags=opts,
-        cwd=test_dir
-    )
-
+def worker_init(queue, level):
+  queue_handler = logging.handlers.QueueHandler(queue)
+  log = logging.getLogger(__name__)
+  log.setLevel(logging.INFO)
+  queue_handler.setLevel(level)
+  log.addHandler(queue_handler)
 
-def GatherClangTidyTests(build_dir):
-  test_dir = os.path.join(buildroot_dir, 'flutter', 'tools', 'clang_tidy')
-  dart_tests = glob.glob('%s/test/*_test.dart' % test_dir)
-  for dart_test_file in dart_tests:
-    opts = [
-        '--disable-dart-dev', dart_test_file,
-        os.path.join(build_dir, 'compile_commands.json'),
-        os.path.join(buildroot_dir, 'flutter')
-    ]
-    yield EngineExecutableTask(
-        build_dir,
-        os.path.join('dart-sdk', 'bin', 'dart'),
-        None,
-        flags=opts,
-        cwd=test_dir
-    )
 
-
-def GatherApiConsistencyTests(build_dir):
-  test_dir = os.path.join(buildroot_dir, 'flutter', 'tools', 'api_check')
-  dart_tests = glob.glob('%s/test/*_test.dart' % test_dir)
-  for dart_test_file in dart_tests:
-    opts = [
-        '--disable-dart-dev', dart_test_file,
-        os.path.join(buildroot_dir, 'flutter')
-    ]
-    yield EngineExecutableTask(
-        build_dir,
-        os.path.join('dart-sdk', 'bin', 'dart'),
-        None,
-        flags=opts,
-        cwd=test_dir
-    )
-
-
-def RunEngineTasksInParallel(tasks):
+def run_engine_tasks_in_parallel(tasks):
   # Work around a bug in Python.
   #
   # The multiprocessing package relies on the win32 WaitForMultipleObjects()
@@ -945,29 +998,122 @@ def RunEngineTasksInParallel(tasks):
   #
   # See: https://bugs.python.org/issue26903
   max_processes = multiprocessing.cpu_count()
-  if sys.platform.startswith(('cygwin', 'win')) and max_processes > 60:
+  if sys_platform.startswith(('cygwin', 'win')) and max_processes > 60:
     max_processes = 60
 
-  pool = multiprocessing.Pool(processes=max_processes)
-  async_results = [(t, pool.apply_async(t, ())) for t in tasks]
+  queue = multiprocessing.Queue()
+  queue_listener = logging.handlers.QueueListener(
+      queue,
+      console_logger_handler,
+      file_logger_handler,
+      respect_handler_level=True,
+  )
+  queue_listener.start()
+
   failures = []
-  for task, async_result in async_results:
-    try:
-      async_result.get()
-    except Exception as exn:
-      failures += [(task, exn)]
+  try:
+    with multiprocessing.Pool(max_processes, worker_init,
+                              [queue, logger.getEffectiveLevel()]) as pool:
+      async_results = [(t, pool.apply_async(t, ())) for t in tasks]
+      for task, async_result in async_results:
+        try:
+          async_result.get()
+        except Exception as exn:  # pylint: disable=broad-except
+          failures += [(task, exn)]
+  finally:
+    queue_listener.stop()
 
   if len(failures) > 0:
-    print("The following commands failed:")
+    logger.error('The following commands failed:')
     for task, exn in failures:
-      print("%s\n%s\n" % (str(task), str(exn)))
-    raise Exception()
+      logger.error('%s\n  %s\n\n', str(task), str(exn))
+    return False
+
+  return True
+
+
+class DirectoryChange():
+  """
+  A scoped change in the CWD.
+  """
+  old_cwd: str = ''
+  new_cwd: str = ''
+
+  def __init__(self, new_cwd: str):
+    self.new_cwd = new_cwd
+
+  def __enter__(self):
+    self.old_cwd = os.getcwd()
+    os.chdir(self.new_cwd)
+
+  def __exit__(self, exception_type, exception_value, exception_traceback):
+    os.chdir(self.old_cwd)
+
+
+def run_impeller_golden_tests(build_dir: str):
+  """
+  Executes the impeller golden image tests from in the `variant` build.
+  """
+  tests_path: str = os.path.join(build_dir, 'impeller_golden_tests')
+  if not os.path.exists(tests_path):
+    raise Exception(
+        'Cannot find the "impeller_golden_tests" executable in "%s". You may need to build it.' %
+        (build_dir)
+    )
+  harvester_path: Path = Path(SCRIPT_DIR).parent.joinpath('tools'
+                                                         ).joinpath('golden_tests_harvester')
+
+  with tempfile.TemporaryDirectory(prefix='impeller_golden') as temp_dir:
+    extra_env = metal_validation_env()
+    extra_env.update(vulkan_validation_env(build_dir))
+    run_cmd([tests_path, f'--working_dir={temp_dir}'], cwd=build_dir, env=extra_env)
+    dart_bin = os.path.join(build_dir, 'dart-sdk', 'bin', 'dart')
+    golden_path = os.path.join('testing', 'impeller_golden_tests_output.txt')
+    script_path = os.path.join('tools', 'dir_contents_diff', 'bin', 'dir_contents_diff.dart')
+    diff_result = subprocess.run(
+        f'{dart_bin} --disable-dart-dev {script_path} {golden_path} {temp_dir}',
+        check=False,
+        shell=True,
+        stdout=subprocess.PIPE,
+        cwd=os.path.join(BUILDROOT_DIR, 'flutter')
+    )
+    if diff_result.returncode != 0:
+      print_divider('<')
+      print(diff_result.stdout.decode())
+      raise RuntimeError('impeller_golden_tests diff failure')
+
+    # On release builds and local builds, we typically do not have GOLDCTL set,
+    # which on other words means that this invoking the SkiaGoldClient would
+    # throw. Skip this step in those cases and log a notice.
+    if 'GOLDCTL' not in os.environ:
+      print_divider('<')
+      print(
+          'Skipping the SkiaGoldClient invocation as the GOLDCTL environment variable is not set.'
+      )
+      return
+
+    with DirectoryChange(harvester_path):
+      bin_path = Path('.').joinpath('bin').joinpath('golden_tests_harvester.dart')
+      run_cmd([dart_bin, '--disable-dart-dev', str(bin_path), temp_dir])
 
 
 def main():
-  parser = argparse.ArgumentParser()
+  parser = argparse.ArgumentParser(
+      description="""
+In order to learn the details of running tests in the engine, please consult the
+Flutter Wiki page on the subject: https://github.com/flutter/flutter/wiki/Testing-the-engine
+"""
+  )
   all_types = [
-      'engine', 'dart', 'benchmarks', 'java', 'android', 'objc', 'font-subset'
+      'engine',
+      'dart',
+      'dart-host',
+      'benchmarks',
+      'java',
+      'android',
+      'objc',
+      'font-subset',
+      'impeller-golden',
   ]
 
   parser.add_argument(
@@ -981,20 +1127,22 @@ def main():
       '--type',
       type=str,
       default='all',
-      help='A list of test types, default is "all" (equivalent to "%s")' %
-      (','.join(all_types))
+      help='A list of test types, default is "all" (equivalent to "%s")' % (','.join(all_types))
   )
   parser.add_argument(
-      '--engine-filter',
+      '--engine-filter', type=str, default='', help='A list of engine test executables to run.'
+  )
+  parser.add_argument(
+      '--dart-filter',
       type=str,
       default='',
-      help='A list of engine test executables to run.'
+      help='A list of Dart test scripts to run in flutter_tester.'
   )
   parser.add_argument(
-      '--dart-filter',
+      '--dart-host-filter',
       type=str,
       default='',
-      help='A list of Dart test scripts to run.'
+      help='A list of Dart test scripts to run with the Dart CLI.'
   )
   parser.add_argument(
       '--java-filter',
@@ -1027,7 +1175,10 @@ def main():
       '--objc-filter',
       type=str,
       default=None,
-      help='Filter parameter for which objc tests to run (example: "IosUnitTestsTests/SemanticsObjectTest/testShouldTriggerAnnouncement")'
+      help=(
+          'Filter parameter for which objc tests to run '
+          '(example: "IosUnitTestsTests/SemanticsObjectTest/testShouldTriggerAnnouncement")'
+      )
   )
   parser.add_argument(
       '--coverage',
@@ -1056,105 +1207,138 @@ def main():
       default=None,
       help='Provide the path of adb used for android tests. By default it looks on $PATH.'
   )
+  parser.add_argument(
+      '--quiet',
+      dest='quiet',
+      action='store_true',
+      default=False,
+      help='Only emit output when there is an error.'
+  )
+  parser.add_argument(
+      '--logs-dir',
+      dest='logs_dir',
+      type=str,
+      help='The directory that verbose logs will be copied to in --quiet mode.',
+  )
 
   args = parser.parse_args()
 
+  logger.addHandler(console_logger_handler)
+  logger.addHandler(file_logger_handler)
+  logger.setLevel(logging.INFO)
+  if args.quiet:
+    file_logger_handler.setLevel(logging.INFO)
+    console_logger_handler.setLevel(logging.WARNING)
+  else:
+    console_logger_handler.setLevel(logging.INFO)
+
   if args.type == 'all':
     types = all_types
   else:
     types = args.type.split(',')
 
-  build_dir = os.path.join(out_dir, args.variant)
+  build_dir = os.path.join(OUT_DIR, args.variant)
   if args.type != 'java' and args.type != 'android':
-    assert os.path.exists(
-        build_dir
-    ), 'Build variant directory %s does not exist!' % build_dir
+    assert os.path.exists(build_dir), 'Build variant directory %s does not exist!' % build_dir
 
   if args.sanitizer_suppressions:
-    assert IsLinux() or IsMac(
-    ), "The sanitizer suppressions flag is only supported on Linux and Mac."
+    assert is_linux() or is_mac(
+    ), 'The sanitizer suppressions flag is only supported on Linux and Mac.'
     file_dir = os.path.dirname(os.path.abspath(__file__))
     command = [
-        "env", "-i", "bash", "-c",
-        "source {}/sanitizer_suppressions.sh >/dev/null && env"
-        .format(file_dir)
+        'env', '-i', 'bash', '-c',
+        'source {}/sanitizer_suppressions.sh >/dev/null && env'.format(file_dir)
     ]
     process = subprocess.Popen(command, stdout=subprocess.PIPE)
     for line in process.stdout:
-      key, _, value = line.decode('utf8').strip().partition("=")
+      key, _, value = line.decode('utf8').strip().partition('=')
       os.environ[key] = value
     process.communicate()  # Avoid pipe deadlock while waiting for termination.
 
+  success = True
+
   engine_filter = args.engine_filter.split(',') if args.engine_filter else None
   if 'engine' in types:
-    RunCCTests(
-        build_dir, engine_filter, args.coverage, args.engine_capture_core_dump
-    )
+    run_cc_tests(build_dir, engine_filter, args.coverage, args.engine_capture_core_dump)
 
-  # Use this type to exclusively run impeller vulkan tests.
-  # TODO (https://github.com/flutter/flutter/issues/113961): Remove this once
-  # impeller vulkan tests are stable.
-  if 'impeller-vulkan' in types:
+  # Use this type to exclusively run impeller tests.
+  if 'impeller' in types:
     build_name = args.variant
     try:
-      xvfb.StartVirtualX(build_name, build_dir)
-      vulkan_gtest_filter = ParseImpellerVulkanFilter()
-      gtest_flags = shuffle_flags
-      gtest_flags.append(vulkan_gtest_filter)
-      RunEngineExecutable(
+      xvfb.start_virtual_x(build_name, build_dir)
+      extra_env = vulkan_validation_env(build_dir)
+      run_engine_executable(
           build_dir,
           'impeller_unittests',
           engine_filter,
-          gtest_flags,
-          coverage=args.coverage
+          shuffle_flags,
+          coverage=args.coverage,
+          extra_env=extra_env
       )
     finally:
-      xvfb.StopVirtualX(build_name)
+      xvfb.stop_virtual_x(build_name)
 
   if 'dart' in types:
     dart_filter = args.dart_filter.split(',') if args.dart_filter else None
-    tasks = list(GatherDartSmokeTest(build_dir, args.verbose_dart_snapshot))
-    tasks += list(GatherLitetestTests(build_dir))
-    tasks += list(GatherGithooksTests(build_dir))
-    tasks += list(GatherClangTidyTests(build_dir))
-    tasks += list(GatherApiConsistencyTests(build_dir))
-    tasks += list(GatherPathOpsTests(build_dir))
-    tasks += list(GatherConstFinderTests(build_dir))
-    tasks += list(GatherFrontEndServerTests(build_dir))
-    tasks += list(
-        GatherDartTests(build_dir, dart_filter, args.verbose_dart_snapshot)
-    )
-    RunEngineTasksInParallel(tasks)
+    tasks = list(gather_dart_smoke_test(build_dir, dart_filter))
+    tasks += list(gather_dart_tests(build_dir, dart_filter))
+    success = success and run_engine_tasks_in_parallel(tasks)
+
+  if 'dart-host' in types:
+    dart_filter = args.dart_host_filter.split(',') if args.dart_host_filter else None
+    dart_host_packages = build_dart_host_test_list(build_dir)
+    tasks = []
+    for dart_host_package, extra_opts in dart_host_packages:
+      if dart_filter is None or dart_host_package in dart_filter:
+        tasks += list(
+            gather_dart_package_tests(
+                build_dir,
+                os.path.join(BUILDROOT_DIR, dart_host_package),
+                extra_opts,
+            )
+        )
+
+    success = success and run_engine_tasks_in_parallel(tasks)
 
   if 'java' in types:
-    assert not IsWindows(), "Android engine files can't be compiled on Windows."
+    assert not is_windows(), "Android engine files can't be compiled on Windows."
     java_filter = args.java_filter
     if ',' in java_filter or '*' in java_filter:
-      print(
-          'Can only filter JUnit4 tests by single entire class name, eg "io.flutter.SmokeTest". Ignoring filter='
-          + java_filter
+      logger.wraning(
+          'Can only filter JUnit4 tests by single entire class name, '
+          'eg "io.flutter.SmokeTest". Ignoring filter=' + java_filter
       )
       java_filter = None
-    RunJavaTests(java_filter, args.android_variant)
+    run_java_tests(java_filter, args.android_variant)
 
   if 'android' in types:
-    assert not IsWindows(), "Android engine files can't be compiled on Windows."
-    RunAndroidTests(args.android_variant, args.adb_path)
+    assert not is_windows(), "Android engine files can't be compiled on Windows."
+    run_android_tests(args.android_variant, args.adb_path)
 
   if 'objc' in types:
-    assert IsMac(), "iOS embedding tests can only be run on macOS."
-    RunObjcTests(args.ios_variant, args.objc_filter)
+    assert is_mac(), 'iOS embedding tests can only be run on macOS.'
+    run_objc_tests(args.ios_variant, args.objc_filter)
 
   # https://github.com/flutter/flutter/issues/36300
-  if 'benchmarks' in types and not IsWindows():
-    RunBenchmarkTests(build_dir)
-    RunEngineBenchmarks(build_dir, engine_filter)
+  if 'benchmarks' in types and not is_windows():
+    run_benchmark_tests(build_dir)
+    run_engine_benchmarks(build_dir, engine_filter)
 
   variants_to_skip = ['host_release', 'host_profile']
-  if ('engine' in types or
-      'font-subset' in types) and args.variant not in variants_to_skip:
-    RunCmd(['python3', 'test.py'], cwd=font_subset_dir)
+  if ('engine' in types or 'font-subset' in types) and args.variant not in variants_to_skip:
+    cmd = ['python3', 'test.py', '--variant', args.variant]
+    if 'arm64' in args.variant:
+      cmd += ['--target-cpu', 'arm64']
+    run_cmd(cmd, cwd=FONT_SUBSET_DIR)
+
+  if 'impeller-golden' in types:
+    run_impeller_golden_tests(build_dir)
+
+  if args.quiet and args.logs_dir:
+    shutil.copy(LOG_FILE, os.path.join(args.logs_dir, 'run_tests.log'))
+
+  return 0 if success else 1
 
 
 if __name__ == '__main__':
-  sys.exit(main())
+  sys_exit(main())
diff --git a/testing/run_tests.sh b/testing/run_tests.sh
index 8cefc971a4c04a9c3ae1f3280bd1305ba54e726b..4aed1c7092558721a3437f8f3c6a50fec32c710c 100755
--- a/testing/run_tests.sh
+++ b/testing/run_tests.sh
@@ -5,4 +5,7 @@ set -o pipefail -e;
 BUILD_VARIANT="${1:-host_debug_unopt}"
 CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-python "${CURRENT_DIR}/run_tests.py" --variant="${BUILD_VARIANT}" --type=engine,dart,benchmarks
+python3 "${CURRENT_DIR}/run_tests.py" --variant="${BUILD_VARIANT}" --type=engine,dart,benchmarks
+
+# This does not run the web_ui tests. To run those, use:
+#   lib/web_ui/dev/felt test
diff --git a/testing/sanitizer_suppressions.sh b/testing/sanitizer_suppressions.sh
index ec5c4bce6baa63ecf355b246d559051462e02cbb..9b249ef629e10af1d767f117163b4b090ee69120 100755
--- a/testing/sanitizer_suppressions.sh
+++ b/testing/sanitizer_suppressions.sh
@@ -3,10 +3,10 @@ ENGINE_BUILDROOT=$(cd $TESTING_DIRECTORY/../..; pwd -P)
 
 case "$(uname -s)" in
   Linux)
-    BUILDTOOLS_DIRECTORY="${ENGINE_BUILDROOT}/buildtools/linux-x64"
+    BUILDTOOLS_DIRECTORY="${ENGINE_BUILDROOT}/flutter/buildtools/linux-x64"
     ;;
   Darwin)
-    BUILDTOOLS_DIRECTORY="${ENGINE_BUILDROOT}/buildtools/mac-x64"
+    BUILDTOOLS_DIRECTORY="${ENGINE_BUILDROOT}/flutter/buildtools/mac-x64"
     ;;
 esac
 
diff --git a/testing/scenario_app/README.md b/testing/scenario_app/README.md
index 289719cf77b564b1198ece3782c04d620bd0c429..8e2fb2ad6677b243cf3cb2350378b2d9550b5e4a 100644
--- a/testing/scenario_app/README.md
+++ b/testing/scenario_app/README.md
@@ -1,85 +1,46 @@
 # Scenario App
 
-This folder contains e2e integration tests for the engine in conjunction with a
-fake dart:ui framework running in JIT or AOT.
+[![GitHub Issues or Pull Requests by label](https://img.shields.io/github/issues/flutter/flutter/e%3A%20scenario-app)](https://github.com/flutter/flutter/issues?q=is%3Aopen+is%3Aissue+label%3A%22e%3A+scenario-app%22)
 
-It intentionally has no dependencies on the Flutter framework or tooling, such
-that it should be buildable as a presubmit or postsubmit to the engine even in
-the face of changes to Dart or dart:ui that require upstream changes in the
-Flutter tooling.
+This package simulates a Flutter app that uses the engine (`dart:ui`) only,
+in conjunction with Android and iOS-specific embedding code that simulates the
+use of the engine in a real app (such as plugins and platform views).
 
-## Adding a New Scenario
-
-Create a new subclass of [Scenario](https://github.com/flutter/engine/blob/5d9509ae056b04c30295df27f201f31af9777842/testing/scenario_app/lib/src/scenario.dart#L9)
-and add it to the map in [scenarios.dart](https://github.com/flutter/engine/blob/db4d423ad9c6dad373618712690acd06b0a385fd/testing/scenario_app/lib/src/scenarios.dart#L22).
-For an example, see [animated_color_square.dart](https://github.com/flutter/engine/blob/5d9509ae056b04c30295df27f201f31af9777842/testing/scenario_app/lib/src/animated_color_square.dart#L15),
-which draws a continuously animating colored square that bounces off the sides
-of the viewport.
-
-Then set the scenario from the Android or iOS app by calling "set_scenario" on
-platform channel.
+The [`bin/run_android_tests.dart`](bin/run_android_tests.dart) and
+[`run_ios_tests.sh`](run_ios_tests.sh) are then used to run the tests on a
+connected device or emulator.
 
-## Running for iOS
+See also:
 
-Build the `ios_debug_sim_unopt` engine variant, and run
-
-```sh
-./run_ios_tests.sh
-```
+- [File an issue][file_issue] with the `e: scenario-app` label.
+- [`bin/`](bin/), the entry point for running Android integration tests.
+- [`lib/`](lib/), the Dart code and instrumentation for the scenario app.
+- [`ios/`](ios/), the iOS-side native code and tests.
+- [`android/`](android/), the Android-side native code and tests.
 
-in your shell.
+[file_issue]: https://github.com/flutter/flutter/issues/new?labels=e:%20scenario-app,engine,team-engine
 
-To run or debug in Xcode, open the xcodeproj file located in
-`<engine_out_dir>/ios_debug_sim_unopt/scenario_app/Scenarios/Scenarios.xcodeproj`.
+## Running a smoke test on Firebase TestLab
 
-### iOS Platform View Tests
+To run the smoke test on Firebase TestLab test, build `android_profile_arm64`,
+and run [`./ci/firebase_testlab.py`](../../ci/firebase_testlab.py), or pass
+`--variant` to run a different configuration.
 
-For PlatformView tests on iOS, you'll also have to edit the dictionaries in
-[AppDelegate.m](https://github.com/flutter/engine/blob/5d9509ae056b04c30295df27f201f31af9777842/testing/scenario_app/ios/Scenarios/Scenarios/AppDelegate.m#L29) and [GoldenTestManager.m](https://github.com/flutter/engine/blob/db4d423ad9c6dad373618712690acd06b0a385fd/testing/scenario_app/ios/Scenarios/ScenariosUITests/GoldenTestManager.m#L25) so that the correct golden image can be found.  Also, you'll have to add a [GoldenPlatformViewTests](https://github.com/flutter/engine/blob/5d9509ae056b04c30295df27f201f31af9777842/testing/scenario_app/ios/Scenarios/ScenariosUITests/GoldenPlatformViewTests.h#L18) in [PlatformViewUITests.m](https://github.com/flutter/engine/blob/af2ffc02b72af2a89242ca3c89e18269b1584ce5/testing/scenario_app/ios/Scenarios/ScenariosUITests/PlatformViewUITests.m).
-
-If `PlatformViewRotation` is failing, make sure Simulator app Device > Rotate Device Automatically
-is selected, or run:
-
-```bash
-defaults write com.apple.iphonesimulator RotateWindowWhenSignaledByGuest -int 1
+```sh
+# From the root of the engine repository
+$ ./ci/firebase_testlab.py --variant android_debug_arm64
 ```
 
-### Generating Golden Images on iOS
-
-Screenshots are saved as
-[XCTAttachment](https://developer.apple.com/documentation/xctest/activities_and_attachments/adding_attachments_to_tests_and_activities?language=objc)'s.
-If you look at the output from running the tests you'll find a path in the form:
-`/Users/$USER/Library/Developer/Xcode/DerivedData/Scenarios-$HASH`.
-Inside that directory you'll find
-`./Build/Products/Debug-iphonesimulator/ScenariosUITests-Runner.app/PlugIns/ScenariosUITests.xctest/` which is where all the images that were
-compared against golden reside.
-
-## Running for Android
+> [!NOTE]
+> These instructions were not verified at the time of writing/refactoring.
 
-### Integration tests
-
-For emulators running on a x64 host, build `android_debug_unopt_x64` using
-`./tools/gn --android --unoptimized --goma --android-cpu=x64`.
-
-Then, launch the emulator, and run `./testing/scenario_app/run_android_tests.sh android_debug_unopt_x64`.
-
-If you wish to build a different engine variant, make sure to pass that variant to the script `run_android_tests.sh`.
-
-If you make a change to the source code, you would need to rebuild the same engine variant.
-
-### Smoke test on FTL
-
-To run the smoke test on Firebase TestLab test, build `android_profile_arm64`, and run
-`./flutter/ci/firebase_testlab.py`. If you wish to test a different variant, e.g.
-debug arm64, pass `--variant android_debug_arm64`.
-
-### Updating Gradle dependencies
-
-If a Gradle dependency is updated, lockfiles must be regenerated.
+## Adding a New Scenario
 
-To generate new lockfiles, run:
+Create a new subclass of [Scenario](lib/src/scenario.dart) and add it to the map
+in [scenarios.dart](lib/src/scenarios.dart). For an example, see
+[animated_color_square.dart](lib/src/animated_color_square.dart), which draws a
+continuously animating colored square that bounces off the sides of the
+viewport.
 
-```bash
-cd android
-../../../../third_party/gradle/bin/gradle generateLockfiles
-```
+Then set the scenario from the Android or iOS app by calling `set_scenario` on
+platform channel `driver`.
diff --git a/testing/scenario_app/android/BUILD.gn b/testing/scenario_app/android/BUILD.gn
index 200c90784f7da0223cc09e683cec1892ee636f99..8d00892fa5726f4bdf942fc70143292d1981c4e5 100644
--- a/testing/scenario_app/android/BUILD.gn
+++ b/testing/scenario_app/android/BUILD.gn
@@ -7,8 +7,8 @@ import("//flutter/testing/rules/android.gni")
 _android_sources = [
   "app/build.gradle",
   "app/src/androidTest/java/dev/flutter/TestRunner.java",
-  "app/src/androidTest/java/dev/flutter/scenarios/EngineLaunchE2ETest.java",
   "app/src/androidTest/java/dev/flutter/scenarios/ExampleInstrumentedTest.java",
+  "app/src/androidTest/java/dev/flutter/scenariosui/DrawSolidBlueScreenTest.java",
   "app/src/androidTest/java/dev/flutter/scenariosui/ExternalTextureTests.java",
   "app/src/androidTest/java/dev/flutter/scenariosui/GetBitmapTests.java",
   "app/src/androidTest/java/dev/flutter/scenariosui/MemoryLeakTests.java",
@@ -21,9 +21,13 @@ _android_sources = [
   "app/src/androidTest/java/dev/flutter/scenariosui/PlatformViewWithTextureViewUiTest.java",
   "app/src/androidTest/java/dev/flutter/scenariosui/ScreenshotUtil.java",
   "app/src/androidTest/java/dev/flutter/scenariosui/SpawnEngineTests.java",
+  "app/src/androidTest/java/dev/flutter/scenariosui/SpawnMultiEngineTest.java",
   "app/src/main/AndroidManifest.xml",
+  "app/src/main/assets/sample.mp4",
+  "app/src/main/java/dev/flutter/scenarios/ExternalTextureFlutterActivity.java",
   "app/src/main/java/dev/flutter/scenarios/GetBitmapActivity.java",
   "app/src/main/java/dev/flutter/scenarios/PlatformViewsActivity.java",
+  "app/src/main/java/dev/flutter/scenarios/SpawnMultiEngineActivity.java",
   "app/src/main/java/dev/flutter/scenarios/SpawnedEngineActivity.java",
   "app/src/main/java/dev/flutter/scenarios/StrictModeFlutterActivity.java",
   "app/src/main/java/dev/flutter/scenarios/SurfacePlatformViewFactory.java",
@@ -31,6 +35,10 @@ _android_sources = [
   "app/src/main/java/dev/flutter/scenarios/TestableFlutterActivity.java",
   "app/src/main/java/dev/flutter/scenarios/TextPlatformViewFactory.java",
   "app/src/main/java/dev/flutter/scenarios/TexturePlatformViewFactory.java",
+  "app/src/main/res/values/colors.xml",
+  "app/src/main/res/values/styles.xml",
+  "app/src/main/res/xml/data_extraction_rules.xml",
+  "app/src/main/res/xml/extraction_config_11_and_below.xml",
   "build.gradle",
 ]
 
diff --git a/testing/scenario_app/android/README.md b/testing/scenario_app/android/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..c3d5e0cb7fc46509446a0df5459e37b627e02e1f
--- /dev/null
+++ b/testing/scenario_app/android/README.md
@@ -0,0 +1,365 @@
+# Scenario App: Android Tests and Test Runner
+
+End-to-end tests and test infrastructure for the Flutter engine on Android.
+
+> [!IMPORTANT]
+> There are several **known issues** with this test suite:
+>
+> - [#144407](https://github.com/flutter/flutter/issues/144407): "Newer Android"
+>   tests are missing expected cropping and rotation.
+> - [#144365](https://github.com/flutter/flutter/issues/144365): Tests that use
+>   `ExternalTextureFlutterActivity` sometimes do not render.
+> - [#144232](https://github.com/flutter/flutter/issues/144232): Impeller Vulkan
+>   sometimes hangs on emulators.
+> - [#144352](https://github.com/flutter/flutter/issues/144352): Skia Gold
+>   sometimes is missing expected diffs.
+
+---
+
+Top topics covered in this document include (but are not limited to):
+
+- [Running the Tests](#running-the-tests)
+- [Contributing](#contributing)
+- [Project History](#project-history)
+- [Troubleshooting](#troubleshooting)
+- [Getting Help](#getting-help)
+
+## Introduction
+
+This package simulates a Flutter app that uses the engine (`dart:ui`) only, in
+conjunction with Android-specific embedding code that simulates the use of the
+engine in a real app (such as plugins and platform views).
+
+A custom test runner, [`run_android_tests.dart`](bin/run_android_tests.dart), is
+used to run the tests on a connected device or emulator, and report the results,
+including screenshots (golden files) and logs from `adb logcat`.
+
+In the following architecture diagram:
+
+> <a
+>   href="https://github.com/flutter/flutter/wiki/The-Engine-architecture"
+>   title="The Engine architecture"> <img
+>   width="300"
+>   alt="Anatomy of a Flutter app"
+>   src="https://raw.githubusercontent.com/flutter/engine/main/docs/app_anatomy.svg"
+> /> </a>
+
+- The Dart app is represented by [`lib/main.dart`](../lib/main.dart).
+- There is no framework code.
+- `dart:ui` and the engine are the same as in a real app.
+- Android-specific application code is in this directory
+  ([`android/`](./)).
+- The runner is a _custom_ test runner,
+  [`run_android_tests.dart`](bin/run_android_tests.dart).
+
+### Scope of Testing
+
+The tests in this package are end-to-end tests that _specifically_ exercise the
+engine and Android-specific embedding code. They are not [unit tests][1] for the
+engine or the framework, and are not designed to test the behavior of the
+framework or specific plugins, but rather to simulate the use of a framework
+or plugins downstream of the engine.
+
+In other words, we test "does the engine work on Android?" without a dependency
+on either the Flutter framework, Flutter tooling, or any specific plugins.
+
+[1]: ../../../shell/platform/android
+
+### Golden Comparisons
+
+Many of the Android-specific interactions with the engine are visual, such as
+[external textures](https://api.flutter.dev/flutter/widgets/Texture-class.html)
+or [platform views](https://docs.flutter.dev/platform-integration/android/platform-views),
+and as such, the tests in this package use golden screenshot file comparisons to
+verify the correctness of the engine's output.
+
+For example, in [`ExternalTextureTests_testMediaSurface`](https://flutter-engine-gold.skia.org/search?corpus=flutter-engine&include_ignored=false&left_filter=name%3DExternalTextureTests_testMediaSurface&max_rgba=0&min_rgba=0&negative=true&not_at_head=false&positive=true&reference_image_required=false&right_filter=&sort=descending&untriaged=true), a [video](app/src/main/assets/sample.mp4) is converted to an external texture and displayed in a Flutter app. The test takes a screenshot of the app and compares it to a golden file:
+
+<img 
+  alt="Two pictures, the top one Flutter and the bottom Android"
+  src="https://github.com/flutter/flutter/assets/168174/e2c34b88-d03d-4732-87e4-a86c97d006c5"
+  width="300"
+/>
+
+_The top picture is the Flutter app, and the bottom picture is just Android._
+
+See also:
+
+- [`tools/compare_goldens`](../../../tools/compare_goldens).
+
+## Prerequisites
+
+If you've never worked in the `flutter/engine` repository before, you will
+need to setup a development environment that is quite different from a typical
+Flutter app or even working on the Flutter framework. It will take roughly
+30 minutes to an hour to setup an environment, depending on your familiarity
+with the tools and the speed of your internet connection.
+
+See also:
+
+- [Setting up the Engine](https://github.com/flutter/flutter/wiki/Setting-up-the-Engine-development-environment)
+- [Rebuilding the Tests](#rebuilding-the-tests)
+
+### Android SDK
+
+It's highly recommended to use the engine's vendored Android SDK, which once
+you have the engine set up, you can find at
+`$ENGINE/src/third_party/android_tools/sdk`. Testing or running with other
+versions of the SDK may work, but it's _not guaranteed_, and might have
+different results.
+
+Consider also placing this directory in the `ANDROID_HOME` environment variable:
+
+```sh
+export ANDROID_HOME=$ENGINE/src/third_party/android_tools/sdk
+```
+
+### Device or Emulator
+
+The tests in this package require a connected device or emulator to run. The
+device or emulator should be running the same version of Android as the CI
+configuration (there are issues with crashes and other problems on older
+emulators in particular).
+
+> [!CAUTION]
+>
+> [#144561](https://github.com/flutter/flutter/issues/144561): The emulator
+> vendored in the engine checkout is old and [has a known issue with Vulkan](https://github.com/flutter/flutter/issues/144232).
+>
+> If you're working locally, you can update your copy by running:
+>
+> ```sh
+> $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --install emulator
+> ```
+
+### Additional Dependencies
+
+While not required, it is **strongly recommended** to use an IDE such as
+[Android Studio](https://developer.android.com/studio) when contributing to the
+Android side of the test suite, as it will provide a better development
+experience such as code completion, debugging, and more:
+
+<img
+  width="500"
+  alt="Screenshot of Android Studio with Autocompletion"
+  src="https://github.com/flutter/flutter/assets/168174/79b685f5-8da7-4396-abe6-9baeb29d7ce3"
+/>
+
+> [!TIP]
+>
+> Android Studio is expected to work _out of the box_ in this directory.
+>
+> If you encounter any issues, please [file a bug](#getting-help).
+
+## Running the Tests
+
+The [test runner](../bin/run_android_tests.dart) is a Dart script that installs
+the test app and test suite on a connected device or emulator, runs the tests,
+and reports the results including screenshots (golden files) and logs from
+`adb logcat`.
+
+From the `$ENGINE/src/flutter` directory, run:
+
+```sh
+dart ./testing/scenario_app/bin/run_android_tests.dart
+```
+
+By default when run locally, the test runner:
+
+- Uses the engine-wide default graphics backend for Android.
+- Uses the last built Android-specific engine artifacts (i.e. `$ENGINE/src/out/android_*/`).
+- Will not diff screenshots, but does save them to a logs directory.
+
+### Rebuilding the Tests
+
+If you've made changes to any file in `scenario_app`, incluing the Dart code
+in `lib/` or the Android code in `android/`, you will need to rebuild the
+tests before running them.
+
+To rebuild the `scenario_app` for the `android_debug_unopt_arm64` variant:
+
+```sh
+ninja -C out/android_debug_unopt_arm64 scenario_app
+```
+
+See also:
+
+- [Compiling the Engine](https://github.com/flutter/flutter/wiki/Compiling-the-engine)
+
+### Common Options
+
+A list of options can be found by running:
+
+```sh
+dart ./testing/scenario_app/bin/run_android_tests.dart --help
+```
+
+Frequently used options include:
+
+- `--out-dir`: Which engine artifacts to use (e.g.
+  `--out-dir=../out/android_debug_unopt_arm64`).
+
+- `--logs-dir`: Where to save full `adb logcat` logs and screenshots.
+
+- `--[no]-enable-impeller`: Enables/disables use of the Impeller graphics
+  backend.
+
+- `--impeller-backend`: Use a specific Impeller backend (e.g.
+  `--impeller-backend=opengles`).
+
+- `--force-surface-producer-surface-texture`: Force the use of `SurfaceTexture`s
+  for plugin code that uses `SurfaceProducer`s. This instruments the same code
+  path that is used for Android API versions that are <= 28 without requiring
+  an older emulator or device.
+
+- `--smoke-test=<full.class.Name>`: Runs a specific test, instead of all tests.
+
+### Advanced Options
+
+When debugging the runner itself, you can use the `--verbose` flag to see more
+detailed output, including additional options such as configuring which binary
+of `adb` to use:
+
+```sh
+dart ./testing/scenario_app/bin/run_android_tests.dart --help --verbose
+```
+
+See also:
+
+- [`bin/utils/options.dart`](../bin/utils/options.dart).
+
+### CI Configuration
+
+See [`ci/builders`](../../../ci/builders) and grep for `run_android_tests.dart`:
+
+```sh
+grep -r run_android_tests.dart ci/builders
+```
+
+> [!NOTE]
+> The Impeller OpenGLES backend tests are only run on staging (`bringup: true`)
+> and as such are **non-blocking**. We expect to stabilize and run these tests
+> as part of a wider release of the Impeller OpenGLES backend.
+
+#### Older Android
+
+"Older Android" refers to "code paths to support older Android API levels".
+Specifically, these configurations use
+`--force-surface-producer-surface-texture` (see [above](#common-options) for
+details).
+
+| Backend           | CI Configuration            | CI History                                     | Skia Gold                 |
+| ----------------- | --------------------------- | ---------------------------------------------- | ------------------------- |
+| Skia              | [`ci/builders`][skia-st-ci] | [Presubmit][skia-try], [Postsubmit][skia-prod] | [Skia Gold][skia-st-gold] |
+| Impeller OpenGLES | [`ci/builders`][imp-st-ci]  | [Staging][imp-staging]                         | N/A                       |
+
+[skia-try]: https://ci.chromium.org/ui/p/flutter/builders/try/Linux%20linux_android_emulator_skia_tests
+[skia-prod]: https://ci.chromium.org/ui/p/flutter/builders/prod/Linux%20linux_android_emulator_skia_tests
+[imp-staging]: https://ci.chromium.org/ui/p/flutter/builders/staging/Linux%20linux_android_emulator_opengles_tests
+[impeller-try]: https://ci.chromium.org/ui/p/flutter/builders/try/Linux%20linux_android_emulator_tests
+[impeller-prod]: https://ci.chromium.org/ui/p/flutter/builders/prod/Linux%20linux_android_emulator_tests
+[skia-st-ci]: https://github.com/search?q=repo%3Aflutter%2Fengine+path%3Aci%2Fbuilders+%22--no-enable-impeller%22+%22run_android_tests.dart%22+%22--force-surface-producer-surface-texture%22&type=code
+[skia-st-gold]: https://flutter-engine-gold.skia.org/search?left_filter=ForceSurfaceProducerSurfaceTexture%3Dtrue%26GraphicsBackend%3Dskia&negative=true&positive=true&right_filter=AndroidAPILevel%3D34%26GraphicsBackend%3Dskia
+[imp-st-ci]: https://github.com/search?q=repo%3Aflutter%2Fengine+path%3Aci%2Fbuilders+%22--impeller-backend%3Dopengles%22+%22run_android_tests.dart%22+%22--force-surface-producer-surface-texture%22&type=code
+[imp-st-gold]: https://flutter-engine-gold.skia.org/search?left_filter=ForceSurfaceProducerSurfaceTexture%3Dtrue%26GraphicsBackend%3Dimpeller-opengles&negative=true&positive=true&right_filter=AndroidAPILevel%3D34%26GraphicsBackend%3Dskia
+
+#### Newer Android
+
+| Backend           | CI Configuration             | CI History                                             | Skia Gold                |
+| ----------------- | ---------------------------- | ------------------------------------------------------ | ------------------------ |
+| Skia              | [`ci/builders`][skia-ci]     | [Presubmit][skia-try], [Postsubmit][skia-prod]         | [Skia Gold][skia-gold]   |
+| Impeller OpenGLES | [`ci/builders`][imp-gles-ci] | [Staging][imp-staging]                                 | N/A                      |
+| Impeller Vulkan   | [`ci/builders`][imp-vk-ci]   | [Presubmit][impeller-try], [Postsubmit][impeller-prod] | [Skia Gold][imp-vk-gold] |
+
+[skia-ci]: https://github.com/search?q=repo%3Aflutter%2Fengine+path%3Aci%2Fbuilders+%22--no-enable-impeller%22+%22run_android_tests.dart%22&type=code
+[skia-gold]: https://flutter-engine-gold.skia.org/search?left_filter=ForceSurfaceProducerSurfaceTexture%3Dfalse%26GraphicsBackend%3Dskia&negative=true&positive=true&right_filter=AndroidAPILevel%3D34%26GraphicsBackend%3Dskia
+[imp-gles-ci]: https://github.com/search?q=repo%3Aflutter%2Fengine+path%3Aci%2Fbuilders+%22--impeller-backend%3Dopengles%22+%22run_android_tests.dart%22&type=code
+[imp-vk-ci]: https://github.com/search?q=repo%3Aflutter%2Fengine+path%3Aci%2Fbuilders+%22--impeller-backend%3Dvulkan%22+%22run_android_tests.dart%22&type=code
+[imp-vk-gold]: https://flutter-engine-gold.skia.org/search?left_filter=ForceSurfaceProducerSurfaceTexture%3Dfalse%26GraphicsBackend%3Dimpeller-vulkan&negative=true&positive=true&right_filter=AndroidAPILevel%3D34%26GraphicsBackend%3Dskia
+
+## Contributing
+
+[![GitHub Issues or Pull Requests by label](https://img.shields.io/github/issues/flutter/flutter/e%3A%20scenario-app)](https://github.com/flutter/flutter/issues?q=is%3Aopen+is%3Aissue+label%3A%22e%3A+scenario-app%22)
+
+Contributions to this package are welcome, as it is a critical part of the
+engine's test suite.
+
+### Anatomy of a Test
+
+A "test" in practice is a combination of roughly 3 components:
+
+1. An Android _[JUnit test][]_ that configures and launches an Android activity.
+2. An Android _[activity][]_, which simulates the Android side of a plugin or
+   platform view.
+3. A Dart _[scenario][]_, which simulates the Flutter side of an application.
+
+[junit test]: ./app/src/androidTest/java/dev/flutter/scenariosui/DrawSolidBlueScreenTest.java
+[activity]: ./app/src/main/java/dev/flutter/scenarios/ExternalTextureFlutterActivity.java
+[scenario]: ../lib/src/solid_blue.dart
+
+While every test suite has exactly one JUnit-instrumented class, each test can
+have many activities and scenarios, each with their own configuration, setup,
+and assertions. Not all of this is desirable, but it is the current state of
+the test suite.
+
+A test might also take a screenshot. See the _Skia Gold_ links in
+[CI Configuration](#ci-configuration) for examples.
+
+### Project History
+
+This test suite was [originally written in 2019](https://github.com/flutter/engine/pull/10007)
+with a goal of:
+
+> \[being\] suitable for embedders to do integration testing with - it has no
+> dependencies on the flutter_tools or framework, and so will not fail/flake
+> based on variances in those downstream.
+
+Unfortunately, the Android side of the test suite was never fully operational,
+and the tests, even if failing, were accidentally be reported as passing on CI.
+In 2024, as the team got closer to shipping our new graphics backend,
+[Impeller](https://docs.flutter.dev/perf/impeller) on Android, it was clear that
+we needed a reliable test suite for the engine on Android, particularly for
+visual tests around external textures and platform views.
+
+So, this package was revived and updated to be a (more) reliable test suite for
+the engine on Android. It's by no means complete
+([contributions welcome](#contributing)), but it did successfully catch at least
+one bug that would not have been detected automatically otherwise.
+
+_Go forth and test the engine on Android!_
+
+## Troubleshooting
+
+If you encounter any issues, please [file a bug](#getting-help).
+
+### My test is failing on CI
+
+If a test is failing on CI, it's likely that the test is failing locally as
+well. Try the steps in [running the Tests](#running-the-tests) to reproduce the
+failure locally, and then debug the failure as you would any other test. If this
+is your first time working on the engine, you may need to setup a development
+environment first (see [prerequisites](#prerequisites)).
+
+The test runner makes extensive use of logging and screenshots to help debug
+failures. If you're not sure where to start, try looking at the logs and
+screenshots to see if they provide any clues (you'll need them to file a bug
+anyway).
+
+`test: Android Scenario App Integration Tests (Impeller/Vulkan)`
+on [LUCI](https://ci.chromium.org/ui/p/flutter/builders/try/Linux%20Engine%20Drone/2079486/overview) produces these logs:
+
+![Screenshot of Logs](https://github.com/flutter/flutter/assets/168174/fed8fae6-bcd2-4e6e-a074-c2c37f34a770)
+
+The files include a screenshot of each test, and a _full_ logcat log from the
+device (you might find it easier trying the `stdout` of the test first, which
+uses rudimentary log filtering). In the case of multiple runs, the logs are
+prefixed with the test configuration and run attempt.
+
+## Getting Help
+
+To suggest changes, or highlight problems, please [file an issue](https://github.com/flutter/flutter/issues/new?labels=e:%20scenario-app,engine,platform-android,fyi-android,team-engine).
+
+If you're not sure where to start, or need help debugging or contributing, you
+can also reach out to [`hackers-android`](https://discord.com/channels/608014603317936148/846507907876257822) on Discord, or the Flutter engine team internally. There is
+no full-time maintainer of this package, so be prepared to do some of the
+legwork yourself.
diff --git a/testing/scenario_app/android/app/build.gradle b/testing/scenario_app/android/app/build.gradle
index 5f2a94523b9963055bfff1965017a62c9a28177e..c65cc89148e8ff414d3433bfdeef45044558d660 100644
--- a/testing/scenario_app/android/app/build.gradle
+++ b/testing/scenario_app/android/app/build.gradle
@@ -18,16 +18,16 @@ android {
         // The others are irrelevant for a test application.
         disable 'UnpackedNativeCode','MissingApplicationIcon','GoogleAppIndexingApiWarning','GoogleAppIndexingWarning','GradleDependency','NewerVersionAvailable','Registered'
     }
-    buildToolsVersion = '33.0.0'
-    compileSdkVersion 33
+    buildToolsVersion = '34.0.0'
+    compileSdkVersion 34
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
     defaultConfig {
         applicationId 'dev.flutter.scenarios'
-        minSdkVersion 18
-        targetSdkVersion 33
+        minSdkVersion 21
+        targetSdkVersion 34
         versionCode 1
         versionName '1.0'
         testInstrumentationRunner 'dev.flutter.TestRunner'
diff --git a/testing/scenario_app/android/app/gradle.lockfile b/testing/scenario_app/android/app/gradle.lockfile
index 630350a3efe1bf51ab5edc402dc932e0e8e8097f..e083af965d3fb80020afb6354e0cefa4751301eb 100644
--- a/testing/scenario_app/android/app/gradle.lockfile
+++ b/testing/scenario_app/android/app/gradle.lockfile
@@ -125,7 +125,7 @@ jline:jline:2.14.6=lintClassPath
 junit:junit:4.12=androidTestImplementationDependenciesMetadata,debugAndroidTestCompileClasspath,debugAndroidTestImplementationDependenciesMetadata,debugAndroidTestRuntimeClasspath
 junit:junit:4.13.1=lintClassPath
 net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
+net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=androidTestImplementationDependenciesMetadata,debugAndroidTestCompileClasspath,debugAndroidTestImplementationDependenciesMetadata,debugAndroidTestRuntimeClasspath,lintClassPath
 org.apache.ant:ant-antlr:1.10.9=lintClassPath
@@ -168,29 +168,27 @@ org.glassfish.jaxb:txw2:2.3.2=lintClassPath
 org.hamcrest:hamcrest-core:1.3=androidTestImplementationDependenciesMetadata,debugAndroidTestCompileClasspath,debugAndroidTestImplementationDependenciesMetadata,debugAndroidTestRuntimeClasspath,lintClassPath
 org.hamcrest:hamcrest-integration:1.3=androidTestImplementationDependenciesMetadata,debugAndroidTestCompileClasspath,debugAndroidTestImplementationDependenciesMetadata,debugAndroidTestRuntimeClasspath
 org.hamcrest:hamcrest-library:1.3=androidTestImplementationDependenciesMetadata,debugAndroidTestCompileClasspath,debugAndroidTestImplementationDependenciesMetadata,debugAndroidTestRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
+org.jacoco:org.jacoco.agent:0.8.8=androidJacocoAnt
+org.jacoco:org.jacoco.ant:0.8.8=androidJacocoAnt
+org.jacoco:org.jacoco.core:0.8.8=androidJacocoAnt
+org.jacoco:org.jacoco.report:0.8.8=androidJacocoAnt
 org.jetbrains.intellij.deps:trove4j:1.0.20181211=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.30=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.30=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.5.30=kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.6.10=kotlinKlibCommonizerClasspath
 org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.5.30=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-script-runtime:1.5.30=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-script-runtime:1.6.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.21=androidTestImplementationDependenciesMetadata,debugAndroidTestImplementationDependenciesMetadata
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.5.30=apiDependenciesMetadata,debugApiDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,releaseApiDependenciesMetadata
-org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.6.10=apiDependenciesMetadata,debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.30=apiDependenciesMetadata,debugAndroidTestCompileClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10=apiDependenciesMetadata,debugAndroidTestCompileClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.30=apiDependenciesMetadata,debugAndroidTestCompileClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10=apiDependenciesMetadata,debugAndroidTestCompileClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.jetbrains.kotlin:kotlin-stdlib:1.4.21=androidTestImplementationDependenciesMetadata,debugAndroidTestImplementationDependenciesMetadata
 org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.5.30=apiDependenciesMetadata,debugApiDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,releaseApiDependenciesMetadata
-org.jetbrains.kotlin:kotlin-stdlib:1.5.31=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:1.6.10=apiDependenciesMetadata,debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.2=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
@@ -203,12 +201,16 @@ org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
 org.junit:junit-bom:5.7.0=lintClassPath
 org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
 org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
+org.ow2.asm:asm-analysis:9.2=androidJacocoAnt
+org.ow2.asm:asm-commons:7.0=lintClassPath
+org.ow2.asm:asm-commons:9.2=androidJacocoAnt
+org.ow2.asm:asm-tree:7.0=lintClassPath
+org.ow2.asm:asm-tree:9.2=androidJacocoAnt
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
+org.ow2.asm:asm:9.2=androidJacocoAnt
 org.testng:testng:7.3.0=lintClassPath
 xerces:xercesImpl:2.12.0=lintClassPath
 xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestApiDependenciesMetadata,androidTestCompileOnlyDependenciesMetadata,androidTestDebugApiDependenciesMetadata,androidTestDebugCompileOnlyDependenciesMetadata,androidTestDebugImplementationDependenciesMetadata,androidTestDebugIntransitiveDependenciesMetadata,androidTestDebugRuntimeOnlyDependenciesMetadata,androidTestIntransitiveDependenciesMetadata,androidTestReleaseApiDependenciesMetadata,androidTestReleaseCompileOnlyDependenciesMetadata,androidTestReleaseImplementationDependenciesMetadata,androidTestReleaseIntransitiveDependenciesMetadata,androidTestReleaseRuntimeOnlyDependenciesMetadata,androidTestRuntimeOnlyDependenciesMetadata,androidTestUtil,compileOnlyDependenciesMetadata,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestApiDependenciesMetadata,debugAndroidTestCompileOnlyDependenciesMetadata,debugAndroidTestIntransitiveDependenciesMetadata,debugAndroidTestRuntimeOnlyDependenciesMetadata,debugAnnotationProcessorClasspath,debugCompileOnly,debugCompileOnlyDependenciesMetadata,debugIntransitiveDependenciesMetadata,debugReverseMetadataValues,debugRuntimeOnlyDependenciesMetadata,debugUnitTestAnnotationProcessorClasspath,debugUnitTestApiDependenciesMetadata,debugUnitTestCompileOnlyDependenciesMetadata,debugUnitTestImplementationDependenciesMetadata,debugUnitTestIntransitiveDependenciesMetadata,debugUnitTestRuntimeOnlyDependenciesMetadata,debugWearBundling,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinCompilerPluginClasspathDebug,kotlinCompilerPluginClasspathDebugAndroidTest,kotlinCompilerPluginClasspathDebugUnitTest,kotlinCompilerPluginClasspathRelease,kotlinCompilerPluginClasspathReleaseUnitTest,kotlinNativeCompilerPluginClasspath,lintChecks,lintPublish,releaseAnnotationProcessorClasspath,releaseCompileOnly,releaseCompileOnlyDependenciesMetadata,releaseIntransitiveDependenciesMetadata,releaseReverseMetadataValues,releaseRuntimeOnlyDependenciesMetadata,releaseUnitTestAnnotationProcessorClasspath,releaseUnitTestApiDependenciesMetadata,releaseUnitTestCompileOnlyDependenciesMetadata,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestIntransitiveDependenciesMetadata,releaseUnitTestRuntimeOnlyDependenciesMetadata,releaseWearBundling,runtimeOnlyDependenciesMetadata,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testDebugApiDependenciesMetadata,testDebugCompileOnlyDependenciesMetadata,testDebugImplementationDependenciesMetadata,testDebugIntransitiveDependenciesMetadata,testDebugRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testIntransitiveDependenciesMetadata,testReleaseApiDependenciesMetadata,testReleaseCompileOnlyDependenciesMetadata,testReleaseImplementationDependenciesMetadata,testReleaseIntransitiveDependenciesMetadata,testReleaseRuntimeOnlyDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
+empty=androidApis,androidJdkImage,androidTestApiDependenciesMetadata,androidTestCompileOnlyDependenciesMetadata,androidTestDebugApiDependenciesMetadata,androidTestDebugCompileOnlyDependenciesMetadata,androidTestDebugImplementationDependenciesMetadata,androidTestDebugIntransitiveDependenciesMetadata,androidTestDebugRuntimeOnlyDependenciesMetadata,androidTestIntransitiveDependenciesMetadata,androidTestReleaseApiDependenciesMetadata,androidTestReleaseCompileOnlyDependenciesMetadata,androidTestReleaseImplementationDependenciesMetadata,androidTestReleaseIntransitiveDependenciesMetadata,androidTestReleaseRuntimeOnlyDependenciesMetadata,androidTestRuntimeOnlyDependenciesMetadata,androidTestUtil,compileOnlyDependenciesMetadata,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestApiDependenciesMetadata,debugAndroidTestCompileOnlyDependenciesMetadata,debugAndroidTestIntransitiveDependenciesMetadata,debugAndroidTestRuntimeOnlyDependenciesMetadata,debugAnnotationProcessorClasspath,debugCompileOnly,debugCompileOnlyDependenciesMetadata,debugIntransitiveDependenciesMetadata,debugReverseMetadataValues,debugRuntimeOnlyDependenciesMetadata,debugUnitTestAnnotationProcessorClasspath,debugUnitTestApiDependenciesMetadata,debugUnitTestCompileOnlyDependenciesMetadata,debugUnitTestImplementationDependenciesMetadata,debugUnitTestIntransitiveDependenciesMetadata,debugUnitTestRuntimeOnlyDependenciesMetadata,debugWearBundling,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinCompilerPluginClasspathDebug,kotlinCompilerPluginClasspathDebugAndroidTest,kotlinCompilerPluginClasspathDebugUnitTest,kotlinCompilerPluginClasspathRelease,kotlinCompilerPluginClasspathReleaseUnitTest,kotlinNativeCompilerPluginClasspath,lintChecks,lintPublish,releaseAnnotationProcessorClasspath,releaseCompileOnly,releaseCompileOnlyDependenciesMetadata,releaseIntransitiveDependenciesMetadata,releaseReverseMetadataValues,releaseRuntimeOnlyDependenciesMetadata,releaseUnitTestAnnotationProcessorClasspath,releaseUnitTestApiDependenciesMetadata,releaseUnitTestCompileOnlyDependenciesMetadata,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestIntransitiveDependenciesMetadata,releaseUnitTestRuntimeOnlyDependenciesMetadata,releaseWearBundling,runtimeOnlyDependenciesMetadata,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testDebugApiDependenciesMetadata,testDebugCompileOnlyDependenciesMetadata,testDebugImplementationDependenciesMetadata,testDebugIntransitiveDependenciesMetadata,testDebugRuntimeOnlyDependenciesMetadata,testFixturesApiDependenciesMetadata,testFixturesCompileOnlyDependenciesMetadata,testFixturesDebugApiDependenciesMetadata,testFixturesDebugCompileOnlyDependenciesMetadata,testFixturesDebugImplementationDependenciesMetadata,testFixturesDebugIntransitiveDependenciesMetadata,testFixturesDebugRuntimeOnlyDependenciesMetadata,testFixturesImplementationDependenciesMetadata,testFixturesIntransitiveDependenciesMetadata,testFixturesReleaseApiDependenciesMetadata,testFixturesReleaseCompileOnlyDependenciesMetadata,testFixturesReleaseImplementationDependenciesMetadata,testFixturesReleaseIntransitiveDependenciesMetadata,testFixturesReleaseRuntimeOnlyDependenciesMetadata,testFixturesRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testIntransitiveDependenciesMetadata,testReleaseApiDependenciesMetadata,testReleaseCompileOnlyDependenciesMetadata,testReleaseImplementationDependenciesMetadata,testReleaseIntransitiveDependenciesMetadata,testReleaseRuntimeOnlyDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
diff --git a/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/TestRunner.java b/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/TestRunner.java
index 18962141cca0222170bdf0ad3283ab4c31149a3b..6c2989c1517b49346c131ca8c6e64da2969f83bf 100644
--- a/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/TestRunner.java
+++ b/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/TestRunner.java
@@ -8,10 +8,31 @@ import android.os.Bundle;
 import androidx.annotation.Nullable;
 import androidx.test.runner.AndroidJUnitRunner;
 import dev.flutter.scenariosui.ScreenshotUtil;
+import io.flutter.FlutterInjector;
+import io.flutter.embedding.engine.renderer.FlutterRenderer;
 
 public class TestRunner extends AndroidJUnitRunner {
   @Override
   public void onCreate(@Nullable Bundle arguments) {
+    String[] engineArguments = null;
+    assert arguments != null;
+    if ("true".equals(arguments.getString("enable-impeller"))) {
+      // Set up the global settings object so that Impeller is enabled for all tests.
+      engineArguments =
+          new String[] {
+            "--enable-impeller=true",
+            "--impeller-backend=" + arguments.getString("impeller-backend", "vulkan")
+          };
+    }
+    if ("true".equals(arguments.getString("force-surface-producer-surface-texture"))) {
+      // Set a test flag to force the SurfaceProducer to use SurfaceTexture.
+      FlutterRenderer.debugForceSurfaceProducerGlTextures = true;
+    }
+    // For consistency, just always initilaize FlutterJNI etc.
+    FlutterInjector.instance().flutterLoader().startInitialization(getTargetContext());
+    FlutterInjector.instance()
+        .flutterLoader()
+        .ensureInitializationComplete(getTargetContext(), engineArguments);
     ScreenshotUtil.onCreate();
     super.onCreate(arguments);
   }
diff --git a/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenarios/EngineLaunchE2ETest.java b/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenarios/EngineLaunchE2ETest.java
deleted file mode 100644
index a5415b5425199778e54edbc49f447376b004d029..0000000000000000000000000000000000000000
--- a/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenarios/EngineLaunchE2ETest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package dev.flutter.scenarios;
-
-import static org.junit.Assert.fail;
-
-import android.content.Context;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.internal.runner.junit4.statement.UiThreadStatement;
-import androidx.test.runner.AndroidJUnit4;
-import com.google.common.util.concurrent.SettableFuture;
-import io.flutter.embedding.engine.FlutterEngine;
-import io.flutter.embedding.engine.dart.DartExecutor;
-import java.util.Arrays;
-import java.util.Locale;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicReference;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-public class EngineLaunchE2ETest {
-  @Test
-  public void smokeTestEngineLaunch() throws Throwable {
-    Context applicationContext = InstrumentationRegistry.getTargetContext();
-    // Specifically, create the engine without running FlutterMain first.
-    final AtomicReference<FlutterEngine> engine = new AtomicReference<>();
-
-    // Run the production under test on the UI thread instead of annotating the whole test
-    // as @UiThreadTest because having the message handler and the CompletableFuture both being
-    // on the same thread will create deadlocks.
-    UiThreadStatement.runOnUiThread(() -> engine.set(new FlutterEngine(applicationContext)));
-    SettableFuture<Boolean> statusReceived = SettableFuture.create();
-
-    // Resolve locale to `en_US`.
-    // This is required, so `window.locale` in populated in dart.
-    // TODO: Fix race condition between sending this over the channel and starting the entrypoint.
-    // https://github.com/flutter/flutter/issues/55999
-    UiThreadStatement.runOnUiThread(
-        () -> engine.get().getLocalizationChannel().sendLocales(Arrays.asList(Locale.US)));
-
-    // The default Dart main entrypoint sends back a platform message on the "waiting_for_status"
-    // channel. That will be our launch success assertion condition.
-    engine
-        .get()
-        .getDartExecutor()
-        .setMessageHandler(
-            "waiting_for_status", (byteBuffer, binaryReply) -> statusReceived.set(Boolean.TRUE));
-
-    // Launching the entrypoint will run the Dart code that sends the "waiting_for_status" platform
-    // message.
-    UiThreadStatement.runOnUiThread(
-        () ->
-            engine
-                .get()
-                .getDartExecutor()
-                .executeDartEntrypoint(DartExecutor.DartEntrypoint.createDefault()));
-
-    try {
-      Boolean result = statusReceived.get(10, TimeUnit.SECONDS);
-      if (!result) {
-        fail("expected message on waiting_for_status not received");
-      }
-    } catch (ExecutionException e) {
-      fail(e.getMessage());
-    } catch (InterruptedException e) {
-      fail(e.getMessage());
-    } catch (TimeoutException e) {
-      fail("timed out waiting for engine started signal");
-    }
-    // If it gets to here, statusReceived is true.
-  }
-}
diff --git a/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/DrawSolidBlueScreenTest.java b/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/DrawSolidBlueScreenTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..b61a69f7848bd8ad82d3aeba245b8f05334e6675
--- /dev/null
+++ b/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/DrawSolidBlueScreenTest.java
@@ -0,0 +1,27 @@
+package dev.flutter.scenariosui;
+
+import android.content.Intent;
+import androidx.annotation.NonNull;
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
+import dev.flutter.scenarios.PlatformViewsActivity;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+@LargeTest
+public final class DrawSolidBlueScreenTest {
+  @Rule @NonNull
+  public ActivityTestRule<PlatformViewsActivity> activityRule =
+      new ActivityTestRule<>(
+          PlatformViewsActivity.class, /*initialTouchMode=*/ false, /*launchActivity=*/ false);
+
+  @Test
+  public void test() throws Exception {
+    Intent intent = new Intent(Intent.ACTION_MAIN);
+    intent.putExtra("scenario_name", "solid_blue");
+    ScreenshotUtil.capture(activityRule.launchActivity(intent), "DrawSolidBlueScreenTest");
+  }
+}
diff --git a/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/ExternalTextureTests.java b/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/ExternalTextureTests.java
index 37d96fa3e261f7bca983a99595ab62e12d975494..dd02b4956edcb1e5cccd76f351aeba975d5d323a 100644
--- a/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/ExternalTextureTests.java
+++ b/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/ExternalTextureTests.java
@@ -4,9 +4,10 @@
 
 package dev.flutter.scenariosui;
 
+import static io.flutter.Build.API_LEVELS;
+
 import android.content.Intent;
 import android.graphics.Rect;
-import android.os.Build.VERSION_CODES;
 import androidx.annotation.NonNull;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.SdkSuppress;
@@ -47,7 +48,6 @@ public class ExternalTextureTests {
   }
 
   @Test
-  @SdkSuppress(minSdkVersion = VERSION_CODES.LOLLIPOP)
   public void testMediaSurface() throws Exception {
     intent.putExtra("scenario_name", "display_texture");
     intent.putExtra("surface_renderer", "media");
@@ -56,7 +56,6 @@ public class ExternalTextureTests {
   }
 
   @Test
-  @SdkSuppress(minSdkVersion = VERSION_CODES.LOLLIPOP)
   public void testRotatedMediaSurface_90() throws Exception {
     intent.putExtra("scenario_name", "display_texture");
     intent.putExtra("surface_renderer", "media");
@@ -66,7 +65,6 @@ public class ExternalTextureTests {
   }
 
   @Test
-  @SdkSuppress(minSdkVersion = VERSION_CODES.LOLLIPOP)
   public void testRotatedMediaSurface_180() throws Exception {
     intent.putExtra("scenario_name", "display_texture");
     intent.putExtra("surface_renderer", "media");
@@ -76,7 +74,6 @@ public class ExternalTextureTests {
   }
 
   @Test
-  @SdkSuppress(minSdkVersion = VERSION_CODES.LOLLIPOP)
   public void testRotatedMediaSurface_270() throws Exception {
     intent.putExtra("scenario_name", "display_texture");
     intent.putExtra("surface_renderer", "media");
@@ -86,7 +83,7 @@ public class ExternalTextureTests {
   }
 
   @Test
-  @SdkSuppress(minSdkVersion = VERSION_CODES.M)
+  @SdkSuppress(minSdkVersion = API_LEVELS.API_23)
   public void testCroppedMediaSurface_bottomLeft() throws Exception {
     intent.putExtra("scenario_name", "display_texture");
     intent.putExtra("surface_renderer", "image");
@@ -97,7 +94,7 @@ public class ExternalTextureTests {
   }
 
   @Test
-  @SdkSuppress(minSdkVersion = VERSION_CODES.M)
+  @SdkSuppress(minSdkVersion = API_LEVELS.API_23)
   public void testCroppedMediaSurface_topRight() throws Exception {
     intent.putExtra("scenario_name", "display_texture");
     intent.putExtra("surface_renderer", "image");
@@ -109,7 +106,7 @@ public class ExternalTextureTests {
   }
 
   @Test
-  @SdkSuppress(minSdkVersion = VERSION_CODES.M)
+  @SdkSuppress(minSdkVersion = API_LEVELS.API_23)
   public void testCroppedRotatedMediaSurface_bottomLeft_90() throws Exception {
     intent.putExtra("scenario_name", "display_texture");
     intent.putExtra("surface_renderer", "image");
diff --git a/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/PlatformTextureUiTests.java b/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/PlatformTextureUiTests.java
index a4aa061f2a82cb7f09f6ba07e43a66b0c03fb2bb..bb09a981247f7095ea36d3dd91341772bf0cc0e8 100644
--- a/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/PlatformTextureUiTests.java
+++ b/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/PlatformTextureUiTests.java
@@ -4,10 +4,12 @@
 
 package dev.flutter.scenariosui;
 
+import android.app.Instrumentation;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import androidx.annotation.NonNull;
 import androidx.test.filters.LargeTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
 import androidx.test.runner.AndroidJUnit4;
 import dev.flutter.scenarios.PlatformViewsActivity;
@@ -19,7 +21,8 @@ import org.junit.runner.RunWith;
 @RunWith(AndroidJUnit4.class)
 @LargeTest
 public class PlatformTextureUiTests {
-  Intent intent;
+  private Instrumentation instrumentation;
+  private Intent intent;
 
   @Rule @NonNull
   public ActivityTestRule<PlatformViewsActivity> activityRule =
@@ -32,6 +35,7 @@ public class PlatformTextureUiTests {
 
   @Before
   public void setUp() {
+    instrumentation = InstrumentationRegistry.getInstrumentation();
     intent = new Intent(Intent.ACTION_MAIN);
     // Render a texture.
     intent.putExtra("use_android_view", false);
@@ -99,6 +103,7 @@ public class PlatformTextureUiTests {
     intent.putExtra("scenario_name", "platform_view_rotate");
     PlatformViewsActivity activity = activityRule.launchActivity(intent);
     activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+    instrumentation.waitForIdleSync();
     ScreenshotUtil.capture(activity, goldName("testPlatformViewRotate"));
   }
 
diff --git a/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/PlatformViewUiTests.java b/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/PlatformViewUiTests.java
index 50dc5dfef600b41a507b35ab73c33f7de72c725a..12cb44044361ff7fc9c8001d2a579f347819e5b1 100644
--- a/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/PlatformViewUiTests.java
+++ b/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/PlatformViewUiTests.java
@@ -4,10 +4,12 @@
 
 package dev.flutter.scenariosui;
 
+import android.app.Instrumentation;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import androidx.annotation.NonNull;
 import androidx.test.filters.LargeTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
 import androidx.test.runner.AndroidJUnit4;
 import dev.flutter.scenarios.PlatformViewsActivity;
@@ -19,7 +21,8 @@ import org.junit.runner.RunWith;
 @RunWith(AndroidJUnit4.class)
 @LargeTest
 public class PlatformViewUiTests {
-  Intent intent;
+  private Instrumentation instrumentation;
+  private Intent intent;
 
   @Rule @NonNull
   public ActivityTestRule<PlatformViewsActivity> activityRule =
@@ -32,6 +35,7 @@ public class PlatformViewUiTests {
 
   @Before
   public void setUp() {
+    instrumentation = InstrumentationRegistry.getInstrumentation();
     intent = new Intent(Intent.ACTION_MAIN);
     // Render a native android view.
     intent.putExtra("use_android_view", true);
@@ -99,6 +103,7 @@ public class PlatformViewUiTests {
     intent.putExtra("scenario_name", "platform_view_rotate");
     PlatformViewsActivity activity = activityRule.launchActivity(intent);
     activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+    instrumentation.waitForIdleSync();
     ScreenshotUtil.capture(activity, goldName("testPlatformViewRotate"));
   }
 
diff --git a/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/PlatformViewWithSurfaceViewUiTest.java b/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/PlatformViewWithSurfaceViewUiTest.java
index b445a3d8407a552a0fc9393de97a293d96c217d4..b5d62993bd45634105704de994ce113943ec573e 100644
--- a/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/PlatformViewWithSurfaceViewUiTest.java
+++ b/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/PlatformViewWithSurfaceViewUiTest.java
@@ -4,10 +4,12 @@
 
 package dev.flutter.scenariosui;
 
+import android.app.Instrumentation;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import androidx.annotation.NonNull;
 import androidx.test.filters.LargeTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
 import androidx.test.runner.AndroidJUnit4;
 import dev.flutter.scenarios.PlatformViewsActivity;
@@ -20,7 +22,8 @@ import org.junit.runner.RunWith;
 @RunWith(AndroidJUnit4.class)
 @LargeTest
 public class PlatformViewWithSurfaceViewUiTest {
-  Intent intent;
+  private Instrumentation instrumentation;
+  private Intent intent;
 
   @Rule @NonNull
   public ActivityTestRule<PlatformViewsActivity> activityRule =
@@ -33,6 +36,7 @@ public class PlatformViewWithSurfaceViewUiTest {
 
   @Before
   public void setUp() {
+    instrumentation = InstrumentationRegistry.getInstrumentation();
     intent = new Intent(Intent.ACTION_MAIN);
     // Render a texture.
     intent.putExtra("use_android_view", false);
@@ -100,6 +104,7 @@ public class PlatformViewWithSurfaceViewUiTest {
     intent.putExtra("scenario_name", "platform_view_rotate");
     PlatformViewsActivity activity = activityRule.launchActivity(intent);
     activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+    instrumentation.waitForIdleSync();
     ScreenshotUtil.capture(activity, goldName("testPlatformViewRotate"));
   }
 
diff --git a/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/PlatformViewWithTextureViewUiTest.java b/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/PlatformViewWithTextureViewUiTest.java
index 9a8dfd99878ee15de785b0120444a253d7445196..c2039b59f4508ed2d68e94a934f83b51fc4b7e22 100644
--- a/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/PlatformViewWithTextureViewUiTest.java
+++ b/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/PlatformViewWithTextureViewUiTest.java
@@ -4,10 +4,12 @@
 
 package dev.flutter.scenariosui;
 
+import android.app.Instrumentation;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import androidx.annotation.NonNull;
 import androidx.test.filters.LargeTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
 import androidx.test.runner.AndroidJUnit4;
 import dev.flutter.scenarios.PlatformViewsActivity;
@@ -19,7 +21,8 @@ import org.junit.runner.RunWith;
 @RunWith(AndroidJUnit4.class)
 @LargeTest
 public class PlatformViewWithTextureViewUiTest {
-  Intent intent;
+  private Instrumentation instrumentation;
+  private Intent intent;
 
   @Rule @NonNull
   public ActivityTestRule<PlatformViewsActivity> activityRule =
@@ -32,6 +35,7 @@ public class PlatformViewWithTextureViewUiTest {
 
   @Before
   public void setUp() {
+    instrumentation = InstrumentationRegistry.getInstrumentation();
     intent = new Intent(Intent.ACTION_MAIN);
     intent.putExtra("view_type", PlatformViewsActivity.TEXTURE_VIEW_PV);
   }
@@ -97,6 +101,7 @@ public class PlatformViewWithTextureViewUiTest {
     intent.putExtra("scenario_name", "platform_view_rotate");
     PlatformViewsActivity activity = activityRule.launchActivity(intent);
     activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+    instrumentation.waitForIdleSync();
     ScreenshotUtil.capture(activity, goldName("testPlatformViewRotate"));
   }
 
diff --git a/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/SpawnMultiEngineTest.java b/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/SpawnMultiEngineTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..bc1017b76039d0d6f7eebf0d98bca36a9fd1c0df
--- /dev/null
+++ b/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/SpawnMultiEngineTest.java
@@ -0,0 +1,37 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package dev.flutter.scenariosui;
+
+import android.content.Intent;
+import androidx.annotation.NonNull;
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
+import dev.flutter.scenarios.SpawnMultiEngineActivity;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+@LargeTest
+public class SpawnMultiEngineTest {
+  Intent intent;
+
+  @Rule @NonNull
+  public ActivityTestRule<SpawnMultiEngineActivity> activityRule =
+      new ActivityTestRule<>(
+          SpawnMultiEngineActivity.class, /*initialTouchMode=*/ false, /*launchActivity=*/ false);
+
+  @Before
+  public void setUp() {
+    intent = new Intent(Intent.ACTION_MAIN);
+  }
+
+  @Test
+  public void testSpawnedEngine() throws Exception {
+    activityRule.launchActivity(intent);
+  }
+}
diff --git a/testing/scenario_app/android/app/src/main/AndroidManifest.xml b/testing/scenario_app/android/app/src/main/AndroidManifest.xml
index 7952e14f9e799cdab1e0a41f58f8121454aa6319..e125978054d8dd207861fbda6c7804371e79264d 100644
--- a/testing/scenario_app/android/app/src/main/AndroidManifest.xml
+++ b/testing/scenario_app/android/app/src/main/AndroidManifest.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="dev.flutter.scenarios">
     <uses-permission android:name="android.permission.INTERNET" />
     <application
         android:name="io.flutter.app.FlutterApplication"
-        android:allowBackup="false"
         android:label="Scenarios App"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:fullBackupContent="@xml/extraction_config_11_and_below"
+        tools:ignore="UnusedAttribute"> <!-- Unused attribute to ignore dataExtractionRules and fullBackupContent -->
         <activity
             android:name=".PlatformViewsActivity"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
@@ -37,6 +40,18 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".SpawnMultiEngineActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            android:hardwareAccelerated="true"
+            android:launchMode="singleTop"
+            android:windowSoftInputMode="adjustResize"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
         <activity
             android:name=".ExternalTextureFlutterActivity"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
diff --git a/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/ExternalTextureFlutterActivity.java b/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/ExternalTextureFlutterActivity.java
index 4946070eb0ff852908926a766eb42ba22b1a2a9c..9b42bff82a3d630f588986fe75e83888026359e3 100644
--- a/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/ExternalTextureFlutterActivity.java
+++ b/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/ExternalTextureFlutterActivity.java
@@ -4,6 +4,8 @@
 
 package dev.flutter.scenarios;
 
+import static io.flutter.Build.API_LEVELS;
+
 import android.content.res.AssetFileDescriptor;
 import android.graphics.Canvas;
 import android.graphics.ImageFormat;
@@ -11,7 +13,6 @@ import android.graphics.LinearGradient;
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.Shader.TileMode;
-import android.graphics.SurfaceTexture;
 import android.hardware.HardwareBuffer;
 import android.media.Image;
 import android.media.ImageReader;
@@ -20,7 +21,6 @@ import android.media.MediaCodec;
 import android.media.MediaExtractor;
 import android.media.MediaFormat;
 import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.HandlerThread;
@@ -36,10 +36,11 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.core.util.Supplier;
-import io.flutter.view.TextureRegistry.SurfaceTextureEntry;
+import io.flutter.view.TextureRegistry;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.CountDownLatch;
 
 public class ExternalTextureFlutterActivity extends TestActivity {
@@ -47,20 +48,20 @@ public class ExternalTextureFlutterActivity extends TestActivity {
   private static final int SURFACE_WIDTH = 192;
   private static final int SURFACE_HEIGHT = 256;
 
-  private SurfaceRenderer surfaceViewRenderer, flutterRenderer;
+  private SurfaceRenderer flutterRenderer;
 
   // Latch used to ensure both SurfaceRenderers produce a frame before taking a screenshot.
-  private final CountDownLatch firstFrameLatch = new CountDownLatch(2);
+  private final CountDownLatch firstFrameLatch = new CountDownLatch(1);
 
   private long textureId = 0;
-  private SurfaceTextureEntry surfaceTextureEntry;
+  private TextureRegistry.SurfaceProducer surfaceProducer;
 
   @Override
   protected void onCreate(@Nullable Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
 
     String surfaceRenderer = getIntent().getStringExtra("surface_renderer");
-    surfaceViewRenderer = selectSurfaceRenderer(surfaceRenderer, getIntent().getExtras());
+    assert surfaceRenderer != null;
     flutterRenderer = selectSurfaceRenderer(surfaceRenderer, getIntent().getExtras());
 
     // Create and place a SurfaceView above the Flutter content.
@@ -84,7 +85,6 @@ public class ExternalTextureFlutterActivity extends TestActivity {
 
     SurfaceHolder surfaceHolder = surfaceView.getHolder();
     surfaceHolder.setFixedSize(SURFACE_WIDTH, SURFACE_HEIGHT);
-    surfaceHolder.addCallback(new SurfaceRendererCallback(surfaceViewRenderer, firstFrameLatch));
   }
 
   @Override
@@ -92,7 +92,7 @@ public class ExternalTextureFlutterActivity extends TestActivity {
     super.waitUntilFlutterRendered();
 
     try {
-      firstFrameLatch.await(10, java.util.concurrent.TimeUnit.SECONDS);
+      firstFrameLatch.await();
     } catch (InterruptedException e) {
       throw new RuntimeException(e);
     }
@@ -101,7 +101,7 @@ public class ExternalTextureFlutterActivity extends TestActivity {
   private SurfaceRenderer selectSurfaceRenderer(String surfaceRenderer, Bundle extras) {
     switch (surfaceRenderer) {
       case "image":
-        if (VERSION.SDK_INT >= VERSION_CODES.M) {
+        if (VERSION.SDK_INT >= API_LEVELS.API_23) {
           // CanvasSurfaceRenderer doesn't work correctly when used with ImageSurfaceRenderer.
           // Use MediaSurfaceRenderer for now.
           return new ImageSurfaceRenderer(
@@ -110,11 +110,7 @@ public class ExternalTextureFlutterActivity extends TestActivity {
           throw new RuntimeException("ImageSurfaceRenderer not supported");
         }
       case "media":
-        if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
-          return new MediaSurfaceRenderer(this::createMediaExtractor, extras.getInt("rotation", 0));
-        } else {
-          throw new RuntimeException("MediaSurfaceRenderer not supported");
-        }
+        return new MediaSurfaceRenderer(this::createMediaExtractor, extras.getInt("rotation", 0));
       case "canvas":
       default:
         return new CanvasSurfaceRenderer();
@@ -127,8 +123,9 @@ public class ExternalTextureFlutterActivity extends TestActivity {
     // -profile:v main -level:v 5.2 -t 1 -r 1 -vf scale=192:256 -b:v 1M sample.mp4
     try {
       MediaExtractor extractor = new MediaExtractor();
-      AssetFileDescriptor afd = getAssets().openFd("sample.mp4");
-      extractor.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
+      try (AssetFileDescriptor afd = getAssets().openFd("sample.mp4")) {
+        extractor.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
+      }
       return extractor;
     } catch (IOException e) {
       e.printStackTrace();
@@ -138,20 +135,19 @@ public class ExternalTextureFlutterActivity extends TestActivity {
 
   @Override
   public void onPause() {
-    surfaceViewRenderer.destroy();
     flutterRenderer.destroy();
-    surfaceTextureEntry.release();
+    surfaceProducer.release();
     super.onPause();
   }
 
   @Override
   public void onFlutterUiDisplayed() {
-    surfaceTextureEntry = getFlutterEngine().getRenderer().createSurfaceTexture();
-    SurfaceTexture surfaceTexture = surfaceTextureEntry.surfaceTexture();
-    surfaceTexture.setDefaultBufferSize(SURFACE_WIDTH, SURFACE_HEIGHT);
-    flutterRenderer.attach(new Surface(surfaceTexture), firstFrameLatch);
+    surfaceProducer =
+        Objects.requireNonNull(getFlutterEngine()).getRenderer().createSurfaceProducer();
+    surfaceProducer.setSize(SURFACE_WIDTH, SURFACE_HEIGHT);
+    flutterRenderer.attach(surfaceProducer.getSurface(), firstFrameLatch);
     flutterRenderer.repaint();
-    textureId = surfaceTextureEntry.id();
+    textureId = surfaceProducer.id();
 
     super.onFlutterUiDisplayed();
   }
@@ -188,7 +184,7 @@ public class ExternalTextureFlutterActivity extends TestActivity {
     @Override
     public void repaint() {
       Canvas canvas =
-          VERSION.SDK_INT >= VERSION_CODES.M
+          VERSION.SDK_INT >= API_LEVELS.API_23
               ? surface.lockHardwareCanvas()
               : surface.lockCanvas(null);
       Paint paint = new Paint();
@@ -222,7 +218,6 @@ public class ExternalTextureFlutterActivity extends TestActivity {
   }
 
   /** Decodes a sample video into the attached Surface. */
-  @RequiresApi(VERSION_CODES.LOLLIPOP)
   private static class MediaSurfaceRenderer implements SurfaceRenderer {
     private final Supplier<MediaExtractor> extractorSupplier;
     private final int rotation;
@@ -256,7 +251,9 @@ public class ExternalTextureFlutterActivity extends TestActivity {
 
     private void decodeThreadMain() {
       try {
-        MediaCodec codec = MediaCodec.createDecoderByType(format.getString(MediaFormat.KEY_MIME));
+        MediaCodec codec =
+            MediaCodec.createDecoderByType(
+                Objects.requireNonNull(format.getString(MediaFormat.KEY_MIME)));
         codec.configure(format, surface, null, 0);
         codec.start();
 
@@ -274,6 +271,7 @@ public class ExternalTextureFlutterActivity extends TestActivity {
           if (!seenEOS) {
             int inputBufferIndex = codec.dequeueInputBuffer(-1);
             ByteBuffer inputBuffer = codec.getInputBuffer(inputBufferIndex);
+            assert inputBuffer != null;
             int sampleSize = extractor.readSampleData(inputBuffer, 0);
             if (sampleSize >= 0) {
               long presentationTimeUs = extractor.getSampleTime();
@@ -337,7 +335,7 @@ public class ExternalTextureFlutterActivity extends TestActivity {
    * Takes frames from the inner SurfaceRenderer and feeds it through an ImageReader and ImageWriter
    * pair.
    */
-  @RequiresApi(VERSION_CODES.M)
+  @RequiresApi(API_LEVELS.API_23)
   private static class ImageSurfaceRenderer implements SurfaceRenderer {
     private final SurfaceRenderer inner;
     private final Rect crop;
@@ -360,7 +358,7 @@ public class ExternalTextureFlutterActivity extends TestActivity {
     @Override
     public void attach(Surface surface, CountDownLatch onFirstFrame) {
       this.onFirstFrame = onFirstFrame;
-      if (VERSION.SDK_INT >= VERSION_CODES.Q) {
+      if (VERSION.SDK_INT >= API_LEVELS.API_29) {
         // On Android Q+, use PRIVATE image format.
         // Also let the frame producer know the images will
         // be sampled from by the GPU.
@@ -411,7 +409,6 @@ public class ExternalTextureFlutterActivity extends TestActivity {
         // Simply log and return.
         Log.i(TAG, "Surface disconnected from ImageWriter", e);
         image.close();
-        return;
       }
 
       Log.v(TAG, "Output image");
@@ -461,27 +458,4 @@ public class ExternalTextureFlutterActivity extends TestActivity {
       handlerThread.quitSafely();
     }
   }
-
-  private static class SurfaceRendererCallback implements SurfaceHolder.Callback {
-    final SurfaceRenderer surfaceRenderer;
-    final CountDownLatch onFirstFrame;
-
-    public SurfaceRendererCallback(SurfaceRenderer surfaceRenderer, CountDownLatch onFirstFrame) {
-      this.surfaceRenderer = surfaceRenderer;
-      this.onFirstFrame = onFirstFrame;
-    }
-
-    @Override
-    public void surfaceCreated(@NonNull SurfaceHolder holder) {
-      surfaceRenderer.attach(holder.getSurface(), onFirstFrame);
-    }
-
-    @Override
-    public void surfaceChanged(@NonNull SurfaceHolder holder, int format, int width, int height) {
-      surfaceRenderer.repaint();
-    }
-
-    @Override
-    public void surfaceDestroyed(@NonNull SurfaceHolder holder) {}
-  }
 }
diff --git a/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/SpawnMultiEngineActivity.java b/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/SpawnMultiEngineActivity.java
new file mode 100644
index 0000000000000000000000000000000000000000..d95adbd29c8dfa840dcd7e7d138bb9da54218fc6
--- /dev/null
+++ b/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/SpawnMultiEngineActivity.java
@@ -0,0 +1,32 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package dev.flutter.scenarios;
+
+import android.content.Context;
+import androidx.annotation.NonNull;
+import io.flutter.embedding.engine.FlutterEngine;
+import io.flutter.embedding.engine.FlutterEngineGroup;
+
+public class SpawnMultiEngineActivity extends TestActivity {
+  static final String TAG = "Scenarios";
+
+  @Override
+  @NonNull
+  public FlutterEngine provideFlutterEngine(@NonNull Context context) {
+    FlutterEngineGroup engineGroup = new FlutterEngineGroup(context);
+    FlutterEngineGroup.Options options =
+        new FlutterEngineGroup.Options(context).setAutomaticallyRegisterPlugins(false);
+    FlutterEngine firstEngine = engineGroup.createAndRunEngine(options);
+
+    FlutterEngine secondEngine = engineGroup.createAndRunEngine(options);
+
+    // Check that a new engine can be spawned from the group even if the group's
+    // original engine has been destroyed.
+    firstEngine.destroy();
+    FlutterEngine thirdEngine = engineGroup.createAndRunEngine(options);
+
+    return thirdEngine;
+  }
+}
diff --git a/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/SpawnedEngineActivity.java b/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/SpawnedEngineActivity.java
index fbce67dede353cce06324a5208a087a5b18377e9..6026893f99011a97b6943eca8ffa6d382ff8d1a6 100644
--- a/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/SpawnedEngineActivity.java
+++ b/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/SpawnedEngineActivity.java
@@ -16,9 +16,11 @@ public class SpawnedEngineActivity extends TestActivity {
   @NonNull
   public FlutterEngine provideFlutterEngine(@NonNull Context context) {
     FlutterEngineGroup engineGroup = new FlutterEngineGroup(context);
-    engineGroup.createAndRunDefaultEngine(context);
+    FlutterEngineGroup.Options options =
+        new FlutterEngineGroup.Options(context).setAutomaticallyRegisterPlugins(false);
+    engineGroup.createAndRunEngine(options);
 
-    FlutterEngine secondEngine = engineGroup.createAndRunDefaultEngine(context);
+    FlutterEngine secondEngine = engineGroup.createAndRunEngine(options);
 
     secondEngine
         .getDartExecutor()
diff --git a/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/SurfacePlatformViewFactory.java b/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/SurfacePlatformViewFactory.java
index 399afdf1be6b9b3c949fe3c8ae33bc812195a887..0524d3428be881ec26c8ff4e587ef875f8ab6964 100644
--- a/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/SurfacePlatformViewFactory.java
+++ b/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/SurfacePlatformViewFactory.java
@@ -4,6 +4,8 @@
 
 package dev.flutter.scenarios;
 
+import static io.flutter.Build.API_LEVELS;
+
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.ContextWrapper;
@@ -23,7 +25,7 @@ import io.flutter.plugin.platform.PlatformView;
 import io.flutter.plugin.platform.PlatformViewFactory;
 import java.nio.ByteBuffer;
 
-@TargetApi(23)
+@TargetApi(API_LEVELS.API_23)
 public final class SurfacePlatformViewFactory extends PlatformViewFactory {
   private boolean preserveContext;
 
diff --git a/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TestActivity.java b/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TestActivity.java
index bc4dd41e582b5a69e1b83b9fd402ec6904de86b9..03fdbeee31ddd899c1d95bf2f8c7db3b57af0377 100644
--- a/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TestActivity.java
+++ b/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TestActivity.java
@@ -4,9 +4,12 @@
 
 package dev.flutter.scenarios;
 
+import static io.flutter.Build.API_LEVELS;
+
 import android.Manifest;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.AssetFileDescriptor;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -18,6 +21,7 @@ import androidx.annotation.Nullable;
 import androidx.core.view.WindowCompat;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.core.view.WindowInsetsControllerCompat;
+import io.flutter.FlutterInjector;
 import io.flutter.Log;
 import io.flutter.embedding.engine.FlutterShellArgs;
 import io.flutter.embedding.engine.loader.FlutterLoader;
@@ -31,11 +35,24 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public abstract class TestActivity extends TestableFlutterActivity {
   static final String TAG = "Scenarios";
 
+  private final Runnable resultsTask =
+      new Runnable() {
+        @Override
+        public void run() {
+          final Uri logFileUri = getIntent().getData();
+          writeTimelineData(logFileUri);
+          testFlutterLoaderCallbackWhenInitializedTwice();
+        }
+      };
+
+  private final Handler handler = new Handler();
+
   @Override
   protected void onCreate(@Nullable Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
@@ -43,25 +60,21 @@ public abstract class TestActivity extends TestableFlutterActivity {
 
     final Intent launchIntent = getIntent();
     if ("com.google.intent.action.TEST_LOOP".equals(launchIntent.getAction())) {
-      if (Build.VERSION.SDK_INT > 22) {
+      if (Build.VERSION.SDK_INT > API_LEVELS.API_22) {
         requestPermissions(new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1);
       }
-      final Uri logFileUri = launchIntent.getData();
-      new Handler()
-          .postDelayed(
-              new Runnable() {
-                @Override
-                public void run() {
-                  writeTimelineData(logFileUri);
-                  testFlutterLoaderCallbackWhenInitializedTwice();
-                }
-              },
-              20000);
+      handler.postDelayed(resultsTask, 20000);
     } else {
       testFlutterLoaderCallbackWhenInitializedTwice();
     }
   }
 
+  @Override
+  protected void onDestroy() {
+    handler.removeCallbacks(resultsTask);
+    super.onDestroy();
+  }
+
   @Override
   @NonNull
   public FlutterShellArgs getFlutterShellArgs() {
@@ -76,7 +89,10 @@ public abstract class TestActivity extends TestableFlutterActivity {
   public void onFlutterUiDisplayed() {
     final Intent launchIntent = getIntent();
     MethodChannel channel =
-        new MethodChannel(getFlutterEngine().getDartExecutor(), "driver", JSONMethodCodec.INSTANCE);
+        new MethodChannel(
+            Objects.requireNonNull(getFlutterEngine()).getDartExecutor(),
+            "driver",
+            JSONMethodCodec.INSTANCE);
     Map<String, Object> test = new HashMap<>(2);
     if (launchIntent.hasExtra("scenario_name")) {
       test.put("name", launchIntent.getStringExtra("scenario_name"));
@@ -113,14 +129,25 @@ public abstract class TestActivity extends TestableFlutterActivity {
     channel.send(
         null,
         (ByteBuffer reply) -> {
+          AssetFileDescriptor afd = null;
           try {
-            final FileDescriptor fd =
-                getContentResolver().openAssetFileDescriptor(logFile, "w").getFileDescriptor();
+            afd = getContentResolver().openAssetFileDescriptor(logFile, "w");
+            assert afd != null;
+            final FileDescriptor fd = afd.getFileDescriptor();
             final FileOutputStream outputStream = new FileOutputStream(fd);
+            assert reply != null;
             outputStream.write(reply.array());
             outputStream.close();
           } catch (IOException ex) {
             Log.e(TAG, "Could not write timeline file", ex);
+          } finally {
+            try {
+              if (afd != null) {
+                afd.close();
+              }
+            } catch (IOException e) {
+              Log.w(TAG, "Could not close", e);
+            }
           }
           finish();
         });
@@ -132,7 +159,7 @@ public abstract class TestActivity extends TestableFlutterActivity {
    * String[], Handler, Runnable)} invokes its callback when called after initialization.
    */
   protected void testFlutterLoaderCallbackWhenInitializedTwice() {
-    FlutterLoader flutterLoader = new FlutterLoader();
+    FlutterLoader flutterLoader = FlutterInjector.instance().flutterLoader();
 
     // Flutter is probably already loaded in this app based on
     // code that ran before this method. Nonetheless, invoke the
@@ -172,6 +199,7 @@ public abstract class TestActivity extends TestableFlutterActivity {
   private static void hideSystemBars(Window window) {
     final WindowInsetsControllerCompat insetController =
         WindowCompat.getInsetsController(window, window.getDecorView());
+    assert insetController != null;
     insetController.setSystemBarsBehavior(
         WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE);
     insetController.hide(WindowInsetsCompat.Type.systemBars());
diff --git a/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TestableFlutterActivity.java b/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TestableFlutterActivity.java
index 82ba2d95c5abde406c04e2ade990560b848b7777..69c9dd02603533284ef04eafc6d47f7c9174f13a 100644
--- a/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TestableFlutterActivity.java
+++ b/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TestableFlutterActivity.java
@@ -4,14 +4,16 @@
 
 package dev.flutter.scenarios;
 
+import android.os.Bundle;
+import android.view.WindowManager;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import io.flutter.embedding.android.FlutterActivity;
 import io.flutter.embedding.engine.FlutterEngine;
-import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.CountDownLatch;
 
 public abstract class TestableFlutterActivity extends FlutterActivity {
-  private Object flutterUiRenderedLock = new Object();
-  private AtomicBoolean isScenarioReady = new AtomicBoolean(false);
+  private final CountDownLatch flutterUiRenderedLatch = new CountDownLatch(1);
 
   @Override
   public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) {
@@ -22,23 +24,27 @@ public abstract class TestableFlutterActivity extends FlutterActivity {
         .setMessageHandler("take_screenshot", (byteBuffer, binaryReply) -> notifyFlutterRendered());
   }
 
+  @Override
+  protected void onCreate(@Nullable Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+
+    // On newer versions of Android, this is the default. Because these tests are being used to take
+    // screenshots on Skia Gold, we don't want any of the System UI to show up, even for older API
+    // versions (i.e. 28).
+    //
+    // See also:
+    // https://github.com/flutter/engine/blob/a9081cce1f0dd730577a36ee1ca6d7af5cdc5a9b/shell/platform/android/io/flutter/embedding/android/FlutterView.java#L696
+    // https://github.com/flutter/flutter/issues/143471
+    getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+  }
+
   protected void notifyFlutterRendered() {
-    synchronized (flutterUiRenderedLock) {
-      isScenarioReady.set(true);
-      flutterUiRenderedLock.notifyAll();
-    }
+    flutterUiRenderedLatch.countDown();
   }
 
   public void waitUntilFlutterRendered() {
     try {
-      if (isScenarioReady.get()) {
-        return;
-      }
-      synchronized (flutterUiRenderedLock) {
-        flutterUiRenderedLock.wait();
-      }
-      // Reset the lock.
-      flutterUiRenderedLock = new Object();
+      flutterUiRenderedLatch.await();
     } catch (InterruptedException e) {
       throw new RuntimeException(e);
     }
diff --git a/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TexturePlatformViewFactory.java b/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TexturePlatformViewFactory.java
index e79dd16ccb4c54377f539faaeb95ed3c58b5d80f..8664780374f9620effad0e2eecc0cda0fcb81ac9 100644
--- a/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TexturePlatformViewFactory.java
+++ b/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TexturePlatformViewFactory.java
@@ -4,6 +4,8 @@
 
 package dev.flutter.scenarios;
 
+import static io.flutter.Build.API_LEVELS;
+
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.Canvas;
@@ -22,7 +24,7 @@ import io.flutter.plugin.platform.PlatformView;
 import io.flutter.plugin.platform.PlatformViewFactory;
 import java.nio.ByteBuffer;
 
-@TargetApi(23)
+@TargetApi(API_LEVELS.API_23)
 public final class TexturePlatformViewFactory extends PlatformViewFactory {
   TexturePlatformViewFactory() {
     super(
diff --git a/testing/scenario_app/android/app/src/main/res/values/styles.xml b/testing/scenario_app/android/app/src/main/res/values/styles.xml
index 5885930df6d10edf3d6df40d6556297d11f953da..af4477a1bc166f0aaa306a1412a197273ab46b11 100644
--- a/testing/scenario_app/android/app/src/main/res/values/styles.xml
+++ b/testing/scenario_app/android/app/src/main/res/values/styles.xml
@@ -6,6 +6,7 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:windowIsTranslucent">true</item>
     </style>
 
 </resources>
diff --git a/testing/scenario_app/android/app/src/main/res/xml/data_extraction_rules.xml b/testing/scenario_app/android/app/src/main/res/xml/data_extraction_rules.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9ec01e6da1e70e514bba340ddb88faffc6917d9c
--- /dev/null
+++ b/testing/scenario_app/android/app/src/main/res/xml/data_extraction_rules.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Exclude all files from backup -->
+<data-extraction-rules>
+    <cloud-backup>
+        <exclude domain="root" path="."/>
+        <exclude domain="file" path="."/>
+        <exclude domain="database" path="."/>
+        <exclude domain="sharedpref" path="."/>
+        <exclude domain="external" path="."/>
+    </cloud-backup>
+    <device-transfer>
+        <exclude domain="root" path="."/>
+        <exclude domain="file" path="."/>
+        <exclude domain="database" path="."/>
+        <exclude domain="sharedpref" path="."/>
+        <exclude domain="external" path="."/>
+    </device-transfer>
+</data-extraction-rules>
\ No newline at end of file
diff --git a/testing/scenario_app/android/app/src/main/res/xml/extraction_config_11_and_below.xml b/testing/scenario_app/android/app/src/main/res/xml/extraction_config_11_and_below.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ff293d0205569631f9df05d2957e8abb67483ba8
--- /dev/null
+++ b/testing/scenario_app/android/app/src/main/res/xml/extraction_config_11_and_below.xml
@@ -0,0 +1,8 @@
+<!-- Exclude all files from backup -->
+<full-backup-content>
+    <exclude domain="root" path="."/>
+    <exclude domain="file" path="."/>
+    <exclude domain="database" path="."/>
+    <exclude domain="sharedpref" path="."/>
+    <exclude domain="external" path="."/>
+</full-backup-content>
\ No newline at end of file
diff --git a/testing/scenario_app/android/build.gradle b/testing/scenario_app/android/build.gradle
index 007f63430020beea9a83747c66ef52e353ad9488..165461c763928e8f4433629e966bf20f8ee59a4a 100644
--- a/testing/scenario_app/android/build.gradle
+++ b/testing/scenario_app/android/build.gradle
@@ -6,11 +6,16 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0'
         classpath 'com.facebook.testing.screenshot:plugin:0.12.0'
-	// leakcanary uses Kotlin. This app does not, but the plugin is
-	// needed to specify language version options.
-	classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.30'
+        // leakcanary uses Kotlin. This app does not, but the plugin is
+        // needed to specify language version options.
+        // Gradle 8.0 requires minimum kotlin 1.6.10
+        // https://docs.gradle.org/current/userguide/upgrading_version_7.html#legacy_incrementaltaskinputs_api
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10'
+        // Requries Minimum AGP 7.3.
+        // https://docs.gradle.org/current/userguide/upgrading_version_7.html#legacy_incrementaltaskinputs_api
+        classpath 'com.android.tools.build:gradle:7.4.2'
+
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/testing/scenario_app/android/buildscript-gradle.lockfile b/testing/scenario_app/android/buildscript-gradle.lockfile
index 8a0282f655ecdd62bc7808c54f8640616ab81b2b..dc10f2efd340e23592959dd01f6234d730f365d2 100644
--- a/testing/scenario_app/android/buildscript-gradle.lockfile
+++ b/testing/scenario_app/android/buildscript-gradle.lockfile
@@ -1,146 +1,149 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-androidx.databinding:databinding-common:7.0.0=classpath
-androidx.databinding:databinding-compiler-common:7.0.0=classpath
-com.android.databinding:baseLibrary:7.0.0=classpath
-com.android.tools.analytics-library:crash:30.0.0=classpath
-com.android.tools.analytics-library:protos:30.0.0=classpath
-com.android.tools.analytics-library:shared:30.0.0=classpath
-com.android.tools.analytics-library:tracker:30.0.0=classpath
-com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath
-com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath
-com.android.tools.build:aapt2-proto:7.0.0-7396180=classpath
-com.android.tools.build:aaptcompiler:7.0.0=classpath
-com.android.tools.build:apksig:7.0.0=classpath
-com.android.tools.build:apkzlib:7.0.0=classpath
-com.android.tools.build:builder-model:7.0.0=classpath
-com.android.tools.build:builder-test-api:7.0.0=classpath
-com.android.tools.build:builder:7.0.0=classpath
-com.android.tools.build:bundletool:1.6.0=classpath
-com.android.tools.build:gradle-api:7.0.0=classpath
-com.android.tools.build:gradle:7.0.0=classpath
-com.android.tools.build:manifest-merger:30.0.0=classpath
+androidx.databinding:databinding-common:7.4.2=classpath
+androidx.databinding:databinding-compiler-common:7.4.2=classpath
+com.android.databinding:baseLibrary:7.4.2=classpath
+com.android.tools.analytics-library:crash:30.4.2=classpath
+com.android.tools.analytics-library:protos:30.4.2=classpath
+com.android.tools.analytics-library:shared:30.4.2=classpath
+com.android.tools.analytics-library:tracker:30.4.2=classpath
+com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10=classpath
+com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10=classpath
+com.android.tools.build:aapt2-proto:7.4.2-8841542=classpath
+com.android.tools.build:aaptcompiler:7.4.2=classpath
+com.android.tools.build:apksig:7.4.2=classpath
+com.android.tools.build:apkzlib:7.4.2=classpath
+com.android.tools.build:builder-model:7.4.2=classpath
+com.android.tools.build:builder-test-api:7.4.2=classpath
+com.android.tools.build:builder:7.4.2=classpath
+com.android.tools.build:bundletool:1.11.4=classpath
+com.android.tools.build:gradle-api:7.4.2=classpath
+com.android.tools.build:gradle-settings-api:7.4.2=classpath
+com.android.tools.build:gradle:7.4.2=classpath
+com.android.tools.build:manifest-merger:30.4.2=classpath
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
-com.android.tools.ddms:ddmlib:30.0.0=classpath
-com.android.tools.layoutlib:layoutlib-api:30.0.0=classpath
-com.android.tools.lint:lint-model:30.0.0=classpath
-com.android.tools.utp:android-device-provider-gradle-proto:30.0.0=classpath
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.0=classpath
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.0=classpath
-com.android.tools:annotations:30.0.0=classpath
-com.android.tools:common:30.0.0=classpath
-com.android.tools:dvlib:30.0.0=classpath
-com.android.tools:repository:30.0.0=classpath
-com.android.tools:sdk-common:30.0.0=classpath
-com.android.tools:sdklib:30.0.0=classpath
-com.android:signflinger:7.0.0=classpath
-com.android:zipflinger:7.0.0=classpath
+com.android.tools.ddms:ddmlib:30.4.2=classpath
+com.android.tools.layoutlib:layoutlib-api:30.4.2=classpath
+com.android.tools.lint:lint-model:30.4.2=classpath
+com.android.tools.lint:lint-typedef-remover:30.4.2=classpath
+com.android.tools.utp:android-device-provider-ddmlib-proto:30.4.2=classpath
+com.android.tools.utp:android-device-provider-gradle-proto:30.4.2=classpath
+com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.4.2=classpath
+com.android.tools.utp:android-test-plugin-host-coverage-proto:30.4.2=classpath
+com.android.tools.utp:android-test-plugin-host-retention-proto:30.4.2=classpath
+com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.4.2=classpath
+com.android.tools:annotations:30.4.2=classpath
+com.android.tools:common:30.4.2=classpath
+com.android.tools:dvlib:30.4.2=classpath
+com.android.tools:repository:30.4.2=classpath
+com.android.tools:sdk-common:30.4.2=classpath
+com.android.tools:sdklib:30.4.2=classpath
+com.android:signflinger:7.4.2=classpath
+com.android:zipflinger:7.4.2=classpath
 com.facebook.testing.screenshot:plugin:0.12.0=classpath
 com.github.gundy:semver4j:0.16.4=classpath
 com.google.android:annotations:4.1.1.4=classpath
-com.google.api.grpc:proto-google-common-protos:1.12.0=classpath
+com.google.api.grpc:proto-google-common-protos:2.0.1=classpath
 com.google.auto.value:auto-value-annotations:1.6.2=classpath
 com.google.code.findbugs:jsr305:3.0.2=classpath
-com.google.code.gson:gson:2.8.6=classpath
+com.google.code.gson:gson:2.8.9=classpath
 com.google.crypto.tink:tink:1.3.0-rc2=classpath
 com.google.dagger:dagger:2.28.3=classpath
-com.google.errorprone:error_prone_annotations:2.3.4=classpath
+com.google.errorprone:error_prone_annotations:2.4.0=classpath
 com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
 com.google.guava:failureaccess:1.0.1=classpath
 com.google.guava:guava:30.1-jre=classpath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
 com.google.j2objc:j2objc-annotations:1.3=classpath
 com.google.jimfs:jimfs:1.1=classpath
-com.google.protobuf:protobuf-java-util:3.10.0=classpath
-com.google.protobuf:protobuf-java:3.10.0=classpath
-com.google.testing.platform:core-proto:0.0.8-alpha04=classpath
-com.googlecode.json-simple:json-simple:1.1=classpath
+com.google.protobuf:protobuf-java-util:3.17.2=classpath
+com.google.protobuf:protobuf-java:3.17.2=classpath
+com.google.testing.platform:core-proto:0.0.8-alpha08=classpath
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
 com.squareup:javapoet:1.10.0=classpath
 com.squareup:javawriter:2.5.0=classpath
 com.sun.activation:javax.activation:1.2.0=classpath
 com.sun.istack:istack-commons-runtime:3.0.8=classpath
 com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath
-commons-codec:commons-codec:1.10=classpath
+commons-codec:commons-codec:1.11=classpath
 commons-io:commons-io:2.4=classpath
 commons-logging:commons-logging:1.2=classpath
 de.undercouch:gradle-download-task:4.1.1=classpath
-io.grpc:grpc-api:1.21.1=classpath
-io.grpc:grpc-context:1.21.1=classpath
-io.grpc:grpc-core:1.21.1=classpath
-io.grpc:grpc-netty:1.21.1=classpath
-io.grpc:grpc-protobuf-lite:1.21.1=classpath
-io.grpc:grpc-protobuf:1.21.1=classpath
-io.grpc:grpc-stub:1.21.1=classpath
-io.netty:netty-buffer:4.1.34.Final=classpath
-io.netty:netty-codec-http2:4.1.34.Final=classpath
-io.netty:netty-codec-http:4.1.34.Final=classpath
-io.netty:netty-codec-socks:4.1.34.Final=classpath
-io.netty:netty-codec:4.1.34.Final=classpath
-io.netty:netty-common:4.1.34.Final=classpath
-io.netty:netty-handler-proxy:4.1.34.Final=classpath
-io.netty:netty-handler:4.1.34.Final=classpath
-io.netty:netty-resolver:4.1.34.Final=classpath
-io.netty:netty-transport:4.1.34.Final=classpath
-io.opencensus:opencensus-api:0.21.0=classpath
-io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=classpath
-it.unimi.dsi:fastutil:8.4.0=classpath
+io.grpc:grpc-api:1.39.0=classpath
+io.grpc:grpc-context:1.39.0=classpath
+io.grpc:grpc-core:1.39.0=classpath
+io.grpc:grpc-netty:1.39.0=classpath
+io.grpc:grpc-protobuf-lite:1.39.0=classpath
+io.grpc:grpc-protobuf:1.39.0=classpath
+io.grpc:grpc-stub:1.39.0=classpath
+io.netty:netty-buffer:4.1.52.Final=classpath
+io.netty:netty-codec-http2:4.1.52.Final=classpath
+io.netty:netty-codec-http:4.1.52.Final=classpath
+io.netty:netty-codec-socks:4.1.52.Final=classpath
+io.netty:netty-codec:4.1.52.Final=classpath
+io.netty:netty-common:4.1.52.Final=classpath
+io.netty:netty-handler-proxy:4.1.52.Final=classpath
+io.netty:netty-handler:4.1.52.Final=classpath
+io.netty:netty-resolver:4.1.52.Final=classpath
+io.netty:netty-transport:4.1.52.Final=classpath
+io.perfmark:perfmark-api:0.23.0=classpath
 jakarta.activation:jakarta.activation-api:1.2.1=classpath
 jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
+javax.annotation:javax.annotation-api:1.3.2=classpath
 javax.inject:javax.inject:1=classpath
 net.java.dev.jna:jna-platform:5.6.0=classpath
 net.java.dev.jna:jna:5.6.0=classpath
 net.sf.jopt-simple:jopt-simple:4.9=classpath
 net.sf.kxml:kxml2:2.3.0=classpath
-org.antlr:antlr4:4.5.3=classpath
 org.apache.commons:commons-compress:1.20=classpath
-org.apache.httpcomponents:httpclient:4.5.6=classpath
-org.apache.httpcomponents:httpcore:4.4.10=classpath
+org.apache.httpcomponents:httpclient:4.5.13=classpath
+org.apache.httpcomponents:httpcore:4.4.13=classpath
 org.apache.httpcomponents:httpmime:4.5.6=classpath
-org.bouncycastle:bcpkix-jdk15on:1.56=classpath
-org.bouncycastle:bcprov-jdk15on:1.56=classpath
+org.bitbucket.b_c:jose4j:0.7.0=classpath
+org.bouncycastle:bcpkix-jdk15on:1.67=classpath
+org.bouncycastle:bcprov-jdk15on:1.67=classpath
 org.checkerframework:checker-qual:3.5.0=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=classpath
+org.codehaus.mojo:animal-sniffer-annotations:1.19=classpath
 org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
 org.glassfish.jaxb:txw2:2.3.2=classpath
 org.jdom:jdom2:2.0.6=classpath
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.5.30=classpath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.5.30=classpath
-org.jetbrains.kotlin:kotlin-build-common:1.5.30=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.30=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.5.30=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.5.30=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.30=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.30=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.30=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.30=classpath
-org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.5.30=classpath
-org.jetbrains.kotlin:kotlin-native-utils:1.5.30=classpath
-org.jetbrains.kotlin:kotlin-project-model:1.5.30=classpath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.5.30=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.30=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.30=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.30=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-tooling-metadata:1.5.30=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.5.30=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.5.30=classpath
+org.jetbrains.intellij.deps:trove4j:1.0.20200330=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.6.10=classpath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.6.10=classpath
+org.jetbrains.kotlin:kotlin-build-common:1.6.10=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.10=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.6.10=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.6.10=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.10=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.6.10=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.6.10=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.6.10=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.6.10=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.6.10=classpath
+org.jetbrains.kotlin:kotlin-reflect:1.7.10=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.6.10=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.6.10=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.6.10=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.6.10=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.7.10=classpath
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.6.10=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.6.10=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.6.10=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=classpath
 org.jetbrains:annotations:13.0=classpath
 org.json:json:20180813=classpath
 org.jvnet.staxex:stax-ex:1.8.1=classpath
-org.ow2.asm:asm-analysis:7.0=classpath
-org.ow2.asm:asm-commons:7.0=classpath
-org.ow2.asm:asm-tree:7.0=classpath
-org.ow2.asm:asm-util:7.0=classpath
-org.ow2.asm:asm:7.0=classpath
+org.ow2.asm:asm-analysis:9.2=classpath
+org.ow2.asm:asm-commons:9.2=classpath
+org.ow2.asm:asm-tree:9.2=classpath
+org.ow2.asm:asm-util:9.2=classpath
+org.ow2.asm:asm:9.2=classpath
+org.slf4j:slf4j-api:1.7.30=classpath
 org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath
 xerces:xercesImpl:2.12.0=classpath
 xml-apis:xml-apis:1.4.01=classpath
diff --git a/testing/scenario_app/android/expected_golden_output.txt b/testing/scenario_app/android/expected_golden_output.txt
new file mode 100644
index 0000000000000000000000000000000000000000..da412e233e0ceb9a186c8bf1f43798eabc9dd09e
--- /dev/null
+++ b/testing/scenario_app/android/expected_golden_output.txt
@@ -0,0 +1,63 @@
+DrawSolidBlueScreenTest.png
+ExternalTextureTests_testCanvasSurface.png
+ExternalTextureTests_testCroppedMediaSurface_bottomLeft.png
+ExternalTextureTests_testCroppedMediaSurface_topRight.png
+ExternalTextureTests_testCroppedRotatedMediaSurface_bottomLeft_90.png
+ExternalTextureTests_testMediaSurface.png
+ExternalTextureTests_testRotatedMediaSurface_180.png
+ExternalTextureTests_testRotatedMediaSurface_270.png
+ExternalTextureTests_testRotatedMediaSurface_90.png
+PlatformTextureUiTests_testPlatformView.png
+PlatformTextureUiTests_testPlatformViewClippath.png
+PlatformTextureUiTests_testPlatformViewCliprect.png
+PlatformTextureUiTests_testPlatformViewCliprrect.png
+PlatformTextureUiTests_testPlatformViewMultiple.png
+PlatformTextureUiTests_testPlatformViewMultipleBackgroundForeground.png
+PlatformTextureUiTests_testPlatformViewMultipleWithoutOverlays.png
+PlatformTextureUiTests_testPlatformViewOpacity.png
+PlatformTextureUiTests_testPlatformViewRotate.png
+PlatformTextureUiTests_testPlatformViewTransform.png
+PlatformTextureUiTests_testPlatformViewTwoIntersectingOverlays.png
+PlatformTextureUiTests_testPlatformViewWithoutOverlayIntersection.png
+PlatformViewUiTests_testPlatformView.png
+PlatformViewUiTests_testPlatformViewClippath.png
+PlatformViewUiTests_testPlatformViewCliprect.png
+PlatformViewUiTests_testPlatformViewCliprrect.png
+PlatformViewUiTests_testPlatformViewMultiple.png
+PlatformViewUiTests_testPlatformViewMultipleBackgroundForeground.png
+PlatformViewUiTests_testPlatformViewMultipleWithoutOverlays.png
+PlatformViewUiTests_testPlatformViewOpacity.png
+PlatformViewUiTests_testPlatformViewRotate.png
+PlatformViewUiTests_testPlatformViewTransform.png
+PlatformViewUiTests_testPlatformViewTwoIntersectingOverlays.png
+PlatformViewUiTests_testPlatformViewWithoutOverlayIntersection.png
+PlatformViewWithSurfaceViewBadContextUiTest_testPlatformView.png
+PlatformViewWithSurfaceViewHybridFallbackUiTest_testPlatformView.png
+PlatformViewWithSurfaceViewHybridUiTest_testPlatformView.png
+PlatformViewWithSurfaceViewUiTest_testPlatformView.png
+PlatformViewWithSurfaceViewUiTest_testPlatformViewClippath.png
+PlatformViewWithSurfaceViewUiTest_testPlatformViewCliprect.png
+PlatformViewWithSurfaceViewUiTest_testPlatformViewCliprrect.png
+PlatformViewWithSurfaceViewUiTest_testPlatformViewMultiple.png
+PlatformViewWithSurfaceViewUiTest_testPlatformViewMultipleBackgroundForeground.png
+PlatformViewWithSurfaceViewUiTest_testPlatformViewMultipleWithoutOverlays.png
+PlatformViewWithSurfaceViewUiTest_testPlatformViewOpacity.png
+PlatformViewWithSurfaceViewUiTest_testPlatformViewRotate.png
+PlatformViewWithSurfaceViewUiTest_testPlatformViewTransform.png
+PlatformViewWithSurfaceViewUiTest_testPlatformViewTwoIntersectingOverlays.png
+PlatformViewWithSurfaceViewUiTest_testPlatformViewWithoutOverlayIntersection.png
+PlatformViewWithTextureViewUiTest_testPlatformView.png
+PlatformViewWithTextureViewUiTest_testPlatformViewClippath.png
+PlatformViewWithTextureViewUiTest_testPlatformViewCliprect.png
+PlatformViewWithTextureViewUiTest_testPlatformViewCliprrect.png
+PlatformViewWithTextureViewUiTest_testPlatformViewMultiple.png
+PlatformViewWithTextureViewUiTest_testPlatformViewMultipleBackgroundForeground.png
+PlatformViewWithTextureViewUiTest_testPlatformViewMultipleWithoutOverlays.png
+PlatformViewWithTextureViewUiTest_testPlatformViewOpacity.png
+PlatformViewWithTextureViewUiTest_testPlatformViewRotate.png
+PlatformViewWithTextureViewUiTest_testPlatformViewTransform.png
+PlatformViewWithTextureViewUiTest_testPlatformViewTwoIntersectingOverlays.png
+PlatformViewWithTextureViewUiTest_testPlatformViewWithoutOverlayIntersection.png
+SpawnEngineTests_testSpawnedEngine.png
+logcat.txt
+noop.txt
\ No newline at end of file
diff --git a/testing/scenario_app/android/gradle.properties b/testing/scenario_app/android/gradle.properties
index 06d12a7d35f42c303a4e17bf365dae827b40aab4..0b5c48ae64de034e8cbb01cbd426df55c06d02e3 100644
--- a/testing/scenario_app/android/gradle.properties
+++ b/testing/scenario_app/android/gradle.properties
@@ -1,4 +1,4 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx2048M
 android.useAndroidX=true
 android.enableJetifier=true
 android.builder.sdkDownload=false
diff --git a/testing/scenario_app/bin/README.md b/testing/scenario_app/bin/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..9dd9b9d5b51de8c571cfd67259e427d90db2d97c
--- /dev/null
+++ b/testing/scenario_app/bin/README.md
@@ -0,0 +1,8 @@
+# Scenario App Android Test Runner
+
+This directory contains code specific to running Android integration tests.
+
+The tests are uploaded and run on the device using `adb`, and screenshots are
+captured and compared using Skia Gold (if available, for example on CI).
+
+See [running the tests](../android/README.md#running-the-tests) for more information.
diff --git a/testing/scenario_app/bin/android_integration_tests.dart b/testing/scenario_app/bin/android_integration_tests.dart
deleted file mode 100644
index 02fbdfa2652908723e82b562f13d899ab27f3ff2..0000000000000000000000000000000000000000
--- a/testing/scenario_app/bin/android_integration_tests.dart
+++ /dev/null
@@ -1,228 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'dart:async';
-import 'dart:io';
-import 'dart:typed_data';
-
-import 'package:args/args.dart';
-import 'package:path/path.dart';
-import 'package:process/process.dart';
-import 'package:skia_gold_client/skia_gold_client.dart';
-
-import 'utils/logs.dart';
-import 'utils/process_manager_extension.dart';
-import 'utils/screenshot_transformer.dart';
-
-const int tcpPort = 3001;
-
-void main(List<String> args) async {
-  const ProcessManager pm = LocalProcessManager();
-  final ArgParser parser = ArgParser()
-    ..addOption('adb', help: 'absolute path to the adb tool', mandatory: true)
-    ..addOption('out-dir', help: 'out directory', mandatory: true);
-
-  final ArgResults results = parser.parse(args);
-  final Directory outDir = Directory(results['out-dir'] as String);
-  final File adb = File(results['adb'] as String);
-
-  if (!outDir.existsSync()) {
-    panic(<String>['out-dir does not exist: $outDir', 'make sure to build the selected engine variant']);
-  }
-
-  if (!adb.existsSync()) {
-    panic(<String>['cannot find adb: $adb', 'make sure to run gclient sync']);
-  }
-
-  final String scenarioAppPath = join(outDir.path, 'scenario_app');
-  final String logcatPath = join(scenarioAppPath, 'logcat.txt');
-  final String screenshotPath = join(scenarioAppPath, 'screenshots');
-  final String apkOutPath = join(scenarioAppPath, 'app', 'outputs', 'apk');
-  final File testApk = File(join(apkOutPath, 'androidTest', 'debug', 'app-debug-androidTest.apk'));
-  final File appApk = File(join(apkOutPath, 'debug', 'app-debug.apk'));
-
-  if (!testApk.existsSync()) {
-    panic(<String>['test apk does not exist: ${testApk.path}', 'make sure to build the selected engine variant']);
-  }
-
-  if (!appApk.existsSync()) {
-    panic(<String>['app apk does not exist: ${appApk.path}', 'make sure to build the selected engine variant']);
-  }
-
-  // Start a TCP socket in the host, and forward it to the device that runs the tests.
-  // This allows the test process to start a connection with the host, and write the bytes
-  // for the screenshots.
-  // On LUCI, the host uploads the screenshots to Skia Gold.
-  SkiaGoldClient? skiaGoldClient;
-  late  ServerSocket server;
-  final List<Future<void>> pendingComparisons = <Future<void>>[];
-  await step('Starting server...', () async {
-    server = await ServerSocket.bind(InternetAddress.anyIPv4, tcpPort);
-    stdout.writeln('listening on host ${server.address.address}:${server.port}');
-    server.listen((Socket client) {
-      stdout.writeln('client connected ${client.remoteAddress.address}:${client.remotePort}');
-      client.transform(const ScreenshotBlobTransformer()).listen((Screenshot screenshot) {
-        final String fileName = screenshot.filename;
-        final Uint8List fileContent = screenshot.fileContent;
-        log('host received ${fileContent.lengthInBytes} bytes for screenshot `$fileName`');
-        assert(skiaGoldClient != null, 'expected Skia Gold client');
-        late File goldenFile;
-        try {
-          goldenFile = File(join(screenshotPath, fileName))..writeAsBytesSync(fileContent, flush: true);
-        } on FileSystemException catch (err) {
-          panic(<String>['failed to create screenshot $fileName: $err']);
-        }
-        log('wrote ${goldenFile.absolute.path}');
-        if (isSkiaGoldClientAvailable) {
-          final Future<void> comparison = skiaGoldClient!
-            .addImg(fileName, goldenFile,
-                    screenshotSize: screenshot.pixelCount)
-            .catchError((dynamic err) {
-              panic(<String>['skia gold comparison failed: $err']);
-            });
-          pendingComparisons.add(comparison);
-        }
-      },
-      onError: (dynamic err) {
-        panic(<String>['error while receiving bytes: $err']);
-      },
-      cancelOnError: true);
-    });
-  });
-
-  late Process logcatProcess;
-  late Future<int> logcatProcessExitCode;
-
-  final IOSink logcat = File(logcatPath).openWrite();
-  try {
-    await step('Creating screenshot directory...', () async {
-      Directory(screenshotPath).createSync(recursive: true);
-    });
-
-    await step('Starting logcat...', () async {
-      final int exitCode = await pm.runAndForward(<String>[adb.path, 'logcat', '-c']);
-      if (exitCode != 0) {
-        panic(<String>['could not clear logs']);
-      }
-      logcatProcess = await pm.start(<String>[adb.path, 'logcat', '-T', '1']);
-      logcatProcessExitCode = pipeProcessStreams(logcatProcess, out: logcat);
-    });
-
-    await step('Configuring emulator...', () async {
-      final int exitCode = await pm.runAndForward(<String>[
-        adb.path,
-        'shell',
-        'settings',
-        'put',
-        'secure',
-        'immersive_mode_confirmations',
-        'confirmed',
-      ]);
-      if (exitCode != 0) {
-        panic(<String>['could not configure emulator']);
-      }
-    });
-
-    await step('Get API level of connected device...', () async {
-      final ProcessResult apiLevelProcessResult = await pm.run(<String>[adb.path, 'shell', 'getprop', 'ro.build.version.sdk']);
-      if (apiLevelProcessResult.exitCode != 0) {
-        panic(<String>['could not get API level of the connected device']);
-      }
-      final String connectedDeviceAPILevel = (apiLevelProcessResult.stdout as String).trim();
-      log('using API level $connectedDeviceAPILevel');
-      skiaGoldClient = SkiaGoldClient(
-        outDir,
-        dimensions: <String, String>{
-          'AndroidAPILevel': connectedDeviceAPILevel,
-        },
-      );
-    });
-
-    await step('Skia Gold auth...', () async {
-      if (isSkiaGoldClientAvailable) {
-        await skiaGoldClient!.auth();
-        log('skia gold client is available');
-      } else {
-        log('skia gold client is unavailable');
-      }
-    });
-
-    await step('Reverse port...', () async {
-      final int exitCode = await pm.runAndForward(<String>[adb.path, 'reverse', 'tcp:3000', 'tcp:$tcpPort']);
-      if (exitCode != 0) {
-        panic(<String>['could not forward port']);
-      }
-    });
-
-    await step('Installing app APK...', () async {
-      final int exitCode = await pm.runAndForward(<String>[adb.path, 'install', appApk.path]);
-      if (exitCode != 0) {
-        panic(<String>['could not install app apk']);
-      }
-    });
-
-    await step('Installing test APK...', () async {
-      final int exitCode = await pm.runAndForward(<String>[adb.path, 'install', testApk.path]);
-      if (exitCode != 0) {
-        panic(<String>['could not install test apk']);
-      }
-    });
-
-    await step('Running instrumented tests...', () async {
-      final int exitCode = await pm.runAndForward(<String>[
-        adb.path,
-        'shell',
-        'am',
-        'instrument',
-        '-w', 'dev.flutter.scenarios.test/dev.flutter.TestRunner',
-      ]);
-      if (exitCode != 0) {
-        panic(<String>['could not install test apk']);
-      }
-    });
-  } finally {
-    await server.close();
-
-    await step('Remove reverse port...', () async {
-      final int exitCode = await pm.runAndForward(<String>[
-        adb.path,
-        'reverse',
-        '--remove', 'tcp:3000',
-      ]);
-      if (exitCode != 0) {
-        panic(<String>['could not unforward port']);
-      }
-    });
-
-    await step('Uinstalling app APK...', () async {
-      final int exitCode = await pm.runAndForward(<String>[adb.path, 'uninstall', 'dev.flutter.scenarios']);
-      if (exitCode != 0) {
-        panic(<String>['could not uninstall app apk']);
-      }
-    });
-
-    await step('Uinstalling test APK...', () async {
-      final int exitCode = await pm.runAndForward(<String>[adb.path, 'uninstall', 'dev.flutter.scenarios.test']);
-      if (exitCode != 0) {
-        panic(<String>['could not uninstall app apk']);
-      }
-    });
-
-    await step('Killing logcat process...', () async {
-      final bool delivered = logcatProcess.kill(ProcessSignal.sigkill);
-      assert(delivered);
-      await logcatProcessExitCode;
-    });
-
-    await step('Wait for Skia gold comparisons...', () async {
-      await Future.wait(pendingComparisons);
-    });
-
-    await step('Flush logcat...', () async {
-      await logcat.flush();
-    });
-
-    exit(0);
-  }
-}
diff --git a/testing/scenario_app/bin/run_android_tests.dart b/testing/scenario_app/bin/run_android_tests.dart
new file mode 100644
index 0000000000000000000000000000000000000000..669a255440f0646b9b25eda8c96eca9df8133945
--- /dev/null
+++ b/testing/scenario_app/bin/run_android_tests.dart
@@ -0,0 +1,551 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+import 'dart:typed_data';
+
+import 'package:dir_contents_diff/dir_contents_diff.dart' show dirContentsDiff;
+import 'package:engine_repo_tools/engine_repo_tools.dart';
+import 'package:path/path.dart';
+import 'package:process/process.dart';
+import 'package:skia_gold_client/skia_gold_client.dart';
+
+import 'utils/adb_logcat_filtering.dart';
+import 'utils/environment.dart';
+import 'utils/logs.dart';
+import 'utils/options.dart';
+import 'utils/process_manager_extension.dart';
+import 'utils/screenshot_transformer.dart';
+
+// If you update the arguments, update the documentation in the README.md file.
+void main(List<String> args) async {
+  // Get some basic environment information to guide the rest of the program.
+  final Environment environment = Environment(
+    isCi: Platform.environment['LUCI_CONTEXT'] != null,
+    showVerbose: Options.showVerbose(args),
+    logsDir: Platform.environment['FLUTTER_LOGS_DIR'],
+  );
+
+  // Determine if the CWD is within an engine checkout.
+  final Engine? localEngineDir = Engine.tryFindWithin();
+
+  // Show usage if requested.
+  if (Options.showUsage(args)) {
+    stdout.writeln(Options.usage(
+      environment: environment,
+      localEngineDir: localEngineDir,
+    ));
+    return;
+  }
+
+  // Parse the command line arguments.
+  final Options options;
+  try {
+    options = Options.parse(
+      args,
+      environment: environment,
+      localEngine: localEngineDir,
+    );
+  } on FormatException catch (error) {
+    stderr.writeln(error);
+    stderr.writeln(Options.usage(
+      environment: environment,
+      localEngineDir: localEngineDir,
+    ));
+    exitCode = 1;
+    return;
+  }
+
+  // Capture CTRL-C.
+  late final StreamSubscription<void> onSigint;
+  runZonedGuarded(
+    () async {
+      onSigint = ProcessSignal.sigint.watch().listen((_) {
+        onSigint.cancel();
+        panic(<String>['Received SIGINT']);
+      });
+      await _run(
+        verbose: options.verbose,
+        outDir: Directory(options.outDir),
+        adb: File(options.adb),
+        smokeTestFullPath: options.smokeTest,
+        useSkiaGold: options.useSkiaGold,
+        enableImpeller: options.enableImpeller,
+        impellerBackend: _ImpellerBackend.tryParse(options.impellerBackend),
+        logsDir: Directory(options.logsDir),
+        contentsGolden: options.outputContentsGolden,
+        ndkStack: options.ndkStack,
+        forceSurfaceProducerSurfaceTexture: options.forceSurfaceProducerSurfaceTexture,
+        prefixLogsPerRun: options.prefixLogsPerRun,
+      );
+      onSigint.cancel();
+      exit(0);
+    },
+    (Object error, StackTrace stackTrace) {
+      onSigint.cancel();
+      if (error is! Panic) {
+        stderr.writeln('Unhandled error: $error');
+        stderr.writeln(stackTrace);
+      }
+      exitCode = 1;
+    },
+  );
+}
+
+const int _tcpPort = 3001;
+
+enum _ImpellerBackend {
+  vulkan,
+  opengles;
+
+  static _ImpellerBackend? tryParse(String? value) {
+    for (final _ImpellerBackend backend in _ImpellerBackend.values) {
+      if (backend.name == value) {
+        return backend;
+      }
+    }
+    return null;
+  }
+}
+
+Future<void> _run({
+  required bool verbose,
+  required Directory outDir,
+  required File adb,
+  required String? smokeTestFullPath,
+  required bool useSkiaGold,
+  required bool enableImpeller,
+  required _ImpellerBackend? impellerBackend,
+  required Directory logsDir,
+  required String? contentsGolden,
+  required String ndkStack,
+  required bool forceSurfaceProducerSurfaceTexture,
+  required bool prefixLogsPerRun,
+}) async {
+  const ProcessManager pm = LocalProcessManager();
+  final String scenarioAppPath = join(outDir.path, 'scenario_app');
+
+  // Due to the CI environment, the logs directory persists between runs and
+  // even different builds. Because we're checking the output directory after
+  // each run, we need a clean logs directory to avoid false positives.
+  //
+  // Only after the runner is done, we can move the logs to the final location.
+  //
+  // See [_copyFiles] below and https://github.com/flutter/flutter/issues/144402.
+  final Directory finalLogsDir = logsDir..createSync(recursive: true);
+  logsDir = Directory.systemTemp.createTempSync('scenario_app_test_logs.');
+  final String logcatPath = join(logsDir.path, 'logcat.txt');
+
+  final String screenshotPath = logsDir.path;
+  final String apkOutPath = join(scenarioAppPath, 'app', 'outputs', 'apk');
+  final File testApk = File(join(apkOutPath, 'androidTest', 'debug', 'app-debug-androidTest.apk'));
+  final File appApk = File(join(apkOutPath, 'debug', 'app-debug.apk'));
+  log('writing logs and screenshots to ${logsDir.path}');
+
+  if (!testApk.existsSync()) {
+    panic(<String>[
+      'test apk does not exist: ${testApk.path}',
+      'make sure to build the selected engine variant'
+    ]);
+  }
+
+  if (!appApk.existsSync()) {
+    panic(<String>[
+      'app apk does not exist: ${appApk.path}',
+      'make sure to build the selected engine variant'
+    ]);
+  }
+
+  // Start a TCP socket in the host, and forward it to the device that runs the tests.
+  // This allows the test process to start a connection with the host, and write the bytes
+  // for the screenshots.
+  // On LUCI, the host uploads the screenshots to Skia Gold.
+  SkiaGoldClient? skiaGoldClient;
+  late final ServerSocket server;
+  final List<Future<void>> pendingComparisons = <Future<void>>[];
+  final List<Socket> pendingConnections = <Socket>[];
+  int comparisonsFailed = 0;
+  await step('Starting server...', () async {
+    server = await ServerSocket.bind(InternetAddress.anyIPv4, _tcpPort);
+    if (verbose) {
+      stdout.writeln('listening on host ${server.address.address}:${server.port}');
+    }
+    server.listen((Socket client) {
+      if (verbose) {
+        stdout.writeln('client connected ${client.remoteAddress.address}:${client.remotePort}');
+      }
+      pendingConnections.add(client);
+      client.transform(const ScreenshotBlobTransformer()).listen((Screenshot screenshot) {
+        final String fileName = screenshot.filename;
+        final Uint8List fileContent = screenshot.fileContent;
+        if (verbose) {
+          log('host received ${fileContent.lengthInBytes} bytes for screenshot `$fileName`');
+        }
+        assert(skiaGoldClient != null, 'expected Skia Gold client');
+        late File goldenFile;
+        try {
+          goldenFile = File(join(screenshotPath, fileName))..writeAsBytesSync(fileContent, flush: true);
+        } on FileSystemException catch (err) {
+          panic(<String>['failed to create screenshot $fileName: $err']);
+        }
+        if (verbose) {
+          log('wrote ${goldenFile.absolute.path}');
+        }
+        if (SkiaGoldClient.isAvailable()) {
+          final Future<void> comparison = skiaGoldClient!
+              .addImg(
+                fileName,
+                goldenFile,
+                screenshotSize: screenshot.pixelCount,
+                // Each color channel can be off by 2.
+                pixelColorDelta: 8,
+              )
+              .then((_) => logImportant('skia gold comparison succeeded: $fileName'))
+              .catchError((Object error) {
+            logWarning('skia gold comparison failed: $error');
+            comparisonsFailed++;
+          });
+          pendingComparisons.add(comparison);
+        }
+      }, onDone: () {
+        pendingConnections.remove(client);
+      });
+    });
+  });
+
+  late Process logcatProcess;
+  late Future<int> logcatProcessExitCode;
+  _ImpellerBackend? actualImpellerBackend;
+
+  final IOSink logcat = File(logcatPath).openWrite();
+  try {
+    await step('Creating screenshot directory `$screenshotPath`...', () async {
+      Directory(screenshotPath).createSync(recursive: true);
+    });
+
+    await step('Starting logcat...', () async {
+      final int exitCode = await pm.runAndForward(<String>[adb.path, 'logcat', '-c']);
+      if (exitCode != 0) {
+        panic(<String>['could not clear logs']);
+      }
+
+      logcatProcess = await pm.start(<String>[adb.path, 'logcat', '-T', '1']);
+      final (Future<int> logcatExitCode, Stream<String> logcatOutput) = getProcessStreams(logcatProcess);
+
+      logcatProcessExitCode = logcatExitCode;
+      String? filterProcessId;
+
+      logcatOutput.listen((String line) {
+        // Always write to the full log.
+        logcat.writeln(line);
+        if (enableImpeller && actualImpellerBackend == null && line.contains('Using the Impeller rendering backend')) {
+          if (line.contains('OpenGLES')) {
+            actualImpellerBackend = _ImpellerBackend.opengles;
+          } else if (line.contains('Vulkan')) {
+            actualImpellerBackend = _ImpellerBackend.vulkan;
+          } else {
+            panic(<String>[
+              'Impeller was enabled, but $line did not contain "OpenGLES" or "Vulkan".',
+            ]);
+          }
+        }
+
+        // Conditionally parse and write to stderr.
+        final AdbLogLine? adbLogLine = AdbLogLine.tryParse(line);
+        if (verbose || adbLogLine == null) {
+          log(line);
+          return;
+        }
+
+        // If we haven't already found a process ID, try to find one.
+        // The process ID will help us filter out logs from other processes.
+        filterProcessId ??= adbLogLine.tryParseProcess();
+
+        // If this is a "verbose" log, possibly skip it.
+        final bool isVerbose = adbLogLine.isVerbose(filterProcessId: filterProcessId);
+        if (isVerbose || filterProcessId == null) {
+          // We've requested verbose output, so print everything.
+          if (verbose) {
+            adbLogLine.printFormatted();
+          }
+          return;
+        }
+
+        // It's a non-verbose log, so print it.
+        adbLogLine.printFormatted();
+      }, onError: (Object? err) {
+        if (verbose) {
+          logWarning('logcat stream error: $err');
+        }
+      });
+    });
+
+    await step('Configuring emulator...', () async {
+      final int exitCode = await pm.runAndForward(<String>[
+        adb.path,
+        'shell',
+        'settings',
+        'put',
+        'secure',
+        'immersive_mode_confirmations',
+        'confirmed',
+      ]);
+      if (exitCode != 0) {
+        panic(<String>['could not configure emulator']);
+      }
+    });
+
+    await step('Get API level of connected device...', () async {
+      final ProcessResult apiLevelProcessResult = await pm.run(<String>[adb.path, 'shell', 'getprop', 'ro.build.version.sdk']);
+      if (apiLevelProcessResult.exitCode != 0) {
+        panic(<String>['could not get API level of the connected device']);
+      }
+      final String connectedDeviceAPILevel = (apiLevelProcessResult.stdout as String).trim();
+      final Map<String, String> dimensions = <String, String>{
+        'AndroidAPILevel': connectedDeviceAPILevel,
+        'GraphicsBackend': enableImpeller ? 'impeller-${impellerBackend!.name}' : 'skia',
+        'ForceSurfaceProducerSurfaceTexture': '$forceSurfaceProducerSurfaceTexture'
+      };
+      log('using dimensions: ${json.encode(dimensions)}');
+      skiaGoldClient = SkiaGoldClient(
+        outDir,
+        dimensions: dimensions,
+      );
+    });
+
+    await step('Skia Gold auth...', () async {
+      if (SkiaGoldClient.isAvailable()) {
+        await skiaGoldClient!.auth();
+        log('skia gold client is available');
+      } else {
+        if (useSkiaGold) {
+          panic(<String>['skia gold client is unavailable']);
+        } else {
+          log('skia gold client is unavaialble');
+        }
+      }
+    });
+
+    await step('Reverse port...', () async {
+      final int exitCode = await pm.runAndForward(<String>[adb.path, 'reverse', 'tcp:3000', 'tcp:$_tcpPort']);
+      if (exitCode != 0) {
+        panic(<String>['could not forward port']);
+      }
+    });
+
+    await step('Installing app APK...', () async {
+      final int exitCode = await pm.runAndForward(<String>[adb.path, 'install', appApk.path]);
+      if (exitCode != 0) {
+        panic(<String>['could not install app apk']);
+      }
+    });
+
+    await step('Installing test APK...', () async {
+      final int exitCode = await pm.runAndForward(<String>[adb.path, 'install', testApk.path]);
+      if (exitCode != 0) {
+        panic(<String>['could not install test apk']);
+      }
+    });
+
+    await step('Running instrumented tests...', () async {
+      final (int exitCode, StringBuffer out) = await pm.runAndCapture(<String>[
+        adb.path,
+        'shell',
+        'am',
+        'instrument',
+        '-w',
+	'--no-window-animation',
+        if (smokeTestFullPath != null)
+          '-e class $smokeTestFullPath',
+        if (enableImpeller)
+          '-e enable-impeller true',
+        if (impellerBackend != null)
+          '-e impeller-backend ${impellerBackend.name}',
+        if (forceSurfaceProducerSurfaceTexture)
+          '-e force-surface-producer-surface-texture true',
+        'dev.flutter.scenarios.test/dev.flutter.TestRunner',
+      ]);
+      if (exitCode != 0) {
+        panic(<String>['instrumented tests failed to run']);
+      }
+      // Unfortunately adb shell am instrument does not return a non-zero exit
+      // code when tests fail, but it does seem to print "FAILURES!!!" to
+      // stdout, so we can use that as a signal that something went wrong.
+      if (out.toString().contains('FAILURES!!!')) {
+        stdout.write(out);
+        panic(<String>['1 or more tests failed']);
+      } else if (comparisonsFailed > 0) {
+        panic(<String>['$comparisonsFailed Skia Gold comparisons failed']);
+      }
+    });
+  } finally {
+    await server.close();
+    for (final Socket client in pendingConnections.toList()) {
+      client.close();
+    }
+
+    await step('Killing test app and test runner...', () async {
+      final int exitCode = await pm.runAndForward(<String>[adb.path, 'shell', 'am', 'force-stop', 'dev.flutter.scenarios']);
+      if (exitCode != 0) {
+        panic(<String>['could not kill test app']);
+      }
+    });
+
+    await step('Killing logcat process...', () async {
+      final bool delivered = logcatProcess.kill(ProcessSignal.sigkill);
+      assert(delivered);
+      await logcatProcessExitCode;
+    });
+
+    await step('Flush logcat...', () async {
+      await logcat.flush();
+      await logcat.close();
+      log('wrote logcat to $logcatPath');
+
+      // Copy the logs to the final location.
+      // Optionally prefix the logs with a run number and backend name.
+      // See https://github.com/flutter/flutter/issues/144402.
+      final StringBuffer prefix = StringBuffer();
+      if (prefixLogsPerRun) {
+        final int rerunNumber = _getAndIncrementRerunNumber(finalLogsDir.path);
+        prefix.write('run_$rerunNumber.');
+        if (enableImpeller) {
+          prefix.write('impeller');
+        } else {
+          prefix.write('skia');
+        }
+        if (enableImpeller) {
+          prefix.write('_${impellerBackend!.name}');
+        }
+        if (forceSurfaceProducerSurfaceTexture) {
+          prefix.write('_force-st');
+        }
+        prefix.write('.');
+      }
+      _copyFiles(
+        source: logsDir,
+        destination: finalLogsDir,
+        prefix: prefix.toString(),
+      );
+    });
+
+    if (enableImpeller) {
+      await step('Validating Impeller...', () async {
+        final _ImpellerBackend expectedImpellerBackend = impellerBackend ?? _ImpellerBackend.vulkan;
+        if (actualImpellerBackend != expectedImpellerBackend) {
+          panic(<String>[
+            '--enable-impeller was specified and expected to find "${expectedImpellerBackend.name}", which did not match "${actualImpellerBackend?.name ?? '<impeller disabled>'}".',
+          ]);
+        }
+      });
+    }
+
+    await step('Symbolize stack traces', () async {
+      final ProcessResult result = await pm.run(
+        <String>[
+          ndkStack,
+          '-sym',
+          outDir.path,
+          '-dump',
+          logcatPath,
+        ],
+      );
+      if (result.exitCode != 0) {
+        panic(<String>['Failed to symbolize stack traces']);
+      }
+    });
+
+    await step('Remove reverse port...', () async {
+      final int exitCode = await pm.runAndForward(<String>[
+        adb.path,
+        'reverse',
+        '--remove',
+        'tcp:3000',
+      ]);
+      if (exitCode != 0) {
+        panic(<String>['could not unforward port']);
+      }
+    });
+
+    await step('Uninstalling app APK...', () async {
+      final int exitCode = await pm.runAndForward(
+          <String>[adb.path, 'uninstall', 'dev.flutter.scenarios']);
+      if (exitCode != 0) {
+        panic(<String>['could not uninstall app apk']);
+      }
+    });
+
+    await step('Uninstalling test APK...', () async {
+      final int exitCode = await pm.runAndForward(
+          <String>[adb.path, 'uninstall', 'dev.flutter.scenarios.test']);
+      if (exitCode != 0) {
+        panic(<String>['could not uninstall app apk']);
+      }
+    });
+
+    await step('Wait for Skia gold comparisons...', () async {
+      await Future.wait(pendingComparisons);
+    });
+
+    final bool allTestsRun = smokeTestFullPath == null;
+    final bool checkGoldens = contentsGolden != null;
+    if (allTestsRun && checkGoldens) {
+      // Check the output here.
+      await step('Check output files...', () async {
+        // TODO(matanlurey): Resolve this in a better way. On CI this file always exists.
+        File(join(screenshotPath, 'noop.txt')).writeAsStringSync('');
+        // TODO(gaaclarke): We should move this into dir_contents_diff.
+        final String diffScreenhotPath = absolute(screenshotPath);
+        _withTemporaryCwd(absolute(dirname(contentsGolden)), () {
+          final int exitCode = dirContentsDiff(basename(contentsGolden), diffScreenhotPath);
+          if (exitCode != 0) {
+            panic(<String>['Output contents incorrect.']);
+          }
+        });
+      });
+    }
+  }
+}
+
+void _withTemporaryCwd(String path, void Function() callback) {
+  final String originalCwd = Directory.current.path;
+  Directory.current = Directory(path).path;
+
+  try {
+    callback();
+  } finally {
+    Directory.current = originalCwd;
+  }
+}
+
+/// Reads the file named `reruns.txt` in the logs directory and returns the number of reruns.
+///
+/// If the file does not exist, it is created with the number 1 and that number is returned.
+int _getAndIncrementRerunNumber(String logsDir) {
+  final File rerunFile = File(join(logsDir, 'reruns.txt'));
+  if (!rerunFile.existsSync()) {
+    rerunFile.writeAsStringSync('1');
+    return 1;
+  }
+  final int rerunNumber = int.parse(rerunFile.readAsStringSync()) + 1;
+  rerunFile.writeAsStringSync(rerunNumber.toString());
+  return rerunNumber;
+}
+
+/// Copies the contents of [source] to [destination], optionally adding a [prefix] to the destination path.
+///
+/// This function is used to copy the screenshots from the device to the logs directory.
+void _copyFiles({
+  required Directory source,
+  required Directory destination,
+  String prefix = '',
+}) {
+  for (final FileSystemEntity entity in source.listSync()) {
+    if (entity is File) {
+      entity.copySync(join(destination.path, prefix + basename(entity.path)));
+    }
+  }
+}
diff --git a/testing/scenario_app/bin/utils/adb_logcat_filtering.dart b/testing/scenario_app/bin/utils/adb_logcat_filtering.dart
new file mode 100644
index 0000000000000000000000000000000000000000..f029f136dc85e0da5b5657326fe53af9a811b391
--- /dev/null
+++ b/testing/scenario_app/bin/utils/adb_logcat_filtering.dart
@@ -0,0 +1,184 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+/// Some notes about filtering `adb logcat` output, especially as a result of
+/// running `adb shell` to instrument the app and test scripts, as it's
+/// non-trivial and error-prone.
+///
+/// 1. It's probably worth keeping `ActivityManager` lines unconditionally.
+///    They are the most important ones, and they are not too verbose (for
+///    example, they don't typically contain stack traces).
+///
+/// 2. `ActivityManager` starts with the application name and process ID:
+///
+/// ```txt
+/// [stdout] 02-15 10:20:36.914  1735  1752 I ActivityManager: Start proc 6840:dev.flutter.scenarios/u0a98 for added application dev.flutter.scenarios
+/// ```
+///
+/// The "application" comes from the file `android/app/build.gradle` under
+/// `android > defaultConfig > applicationId`.
+///
+/// 3. Once we have the process ID, we can filter the logcat output further:
+///
+/// ```txt
+/// [stdout] 02-15 10:20:37.430  6840  6840 E GeneratedPluginsRegister: Tried to automatically register plugins with FlutterEngine (io.flutter.embedding.engine.FlutterEngine@144d737) but could not find or invoke the GeneratedPluginRegistrant.
+/// ```
+///
+/// A sample output of `adb logcat` command lives in `./sample_adb_logcat.txt`.
+///
+/// See also: <https://developer.android.com/tools/logcat>.
+library;
+
+import 'package:meta/meta.dart';
+
+import 'logs.dart';
+
+/// Represents a line of `adb logcat` output parsed into a structured form.
+///
+/// For example the line:
+/// ```txt
+/// 02-22 13:54:39.839   549  3683 I ActivityManager: Force stopping dev.flutter.scenarios appid=10226 user=0: start instr
+/// ```
+///
+/// ## Implementation notes
+///
+/// The reason this is an extension type and not a class is partially to use the
+/// language feature, and partially because extension types work really well
+/// with lazy parsing.
+extension type const AdbLogLine._(Match _match) {
+  // RegEx that parses into the following groups:
+  // 1. The time of the log message, such as `02-22 13:54:39.839`.
+  // 2. The process ID.
+  // 3. The thread ID.
+  // 4. The character representing the severity of the log message, such as `I`.
+  // 5. The tag, such as `ActivityManager`.
+  // 6. The actual log message.
+  //
+  // This regex is simple versus being more precise. Feel free to improve it.
+  static final RegExp _pattern = RegExp(r'(\d+-\d+\s[\d|:]+\.\d+)\s+(\d+)\s+(\d+)\s(\w)\s(\S+)\s*:\s*(.*)');
+
+  /// Parses the given [adbLogCatLine] into a structured form.
+  ///
+  /// Returns `null` if the line does not match the expected format.
+  static AdbLogLine? tryParse(String adbLogCatLine) {
+    final Match? match = _pattern.firstMatch(adbLogCatLine);
+    return match == null ? null : AdbLogLine._(match);
+  }
+
+  /// Tries to parse the process that was started, if the log line is about it.
+  String? tryParseProcess() {
+    if (name == activityManagerTag && message.startsWith('Start proc')) {
+      // ActivityManager: Start proc 4475:dev.flutter.scenarios/u0a190 for added application ...
+      final RegExpMatch? match = RegExp('Start proc (\\d+):$flutterProcessName').firstMatch(message);
+      return match?.group(1);
+    }
+    return null;
+  }
+
+  @visibleForTesting
+  static const String activityManagerTag = 'ActivityManager';
+
+  @visibleForTesting
+  static const String flutterProcessName = 'dev.flutter.scenarios';
+
+  @visibleForTesting
+  static const Set<String> knownNoiseTags = <String>{
+    'CCodec',
+    'CCodecBufferChannel',
+    'CCodecConfig',
+    'Codec2Client',
+    'ColorUtils',
+    'DMABUFHEAPS',
+    'Gralloc4',
+    'MediaCodec',
+    'MonitoringInstr',
+    'ResourceExtractor',
+    'UsageTrackerFacilitator',
+    'hw-BpHwBinder',
+    'ziparchive',
+  };
+
+  @visibleForTesting
+  static const Set<String> knownUsefulTags = <String>{
+    activityManagerTag
+  };
+
+  @visibleForTesting
+  static const Set<String> knownUsefulErrorTags = <String>{
+    'androidemu',
+    'THREAD_STATE',
+  };
+
+  /// Returns `true` if the log line is verbose.
+  bool isVerbose({String? filterProcessId}) => !_isRelevant(filterProcessId: filterProcessId);
+  bool _isRelevant({String? filterProcessId}) {
+    // Fatal errors are always useful.
+    if (severity == 'F') {
+      return true;
+    }
+
+    // Verbose and debug logs are rarely useful.
+    if (severity == 'V' || severity == 'D') {
+      return false;
+    }
+
+    if (knownNoiseTags.contains(name)) {
+      return false;
+    }
+
+    if (knownUsefulTags.contains(name)) {
+      return true;
+    }
+
+    if (severity == 'E' && knownUsefulErrorTags.contains(name)) {
+      return true;
+    }
+
+    // If a process ID is specified, exclude logs _not_ from that process.
+    if (filterProcessId == null) {
+      // YOLO, let's keep it anyway.
+      return name.toLowerCase().contains('flutter') ||
+          message.toLowerCase().contains('flutter');
+    }
+
+    return process == filterProcessId;
+  }
+
+  /// Logs the line to the console.
+  void printFormatted() {
+    final String formatted = '$time [$severity] $name: $message';
+    if (severity == 'W' || severity == 'E' || severity == 'F') {
+      logWarning(formatted);
+    } else if (name == 'TestRunner') {
+      logImportant(formatted);
+    } else {
+      log(formatted);
+    }
+  }
+
+  /// The full line of `adb logcat` output.
+  String get line => _match.group(0)!;
+
+  /// The time of the log message, such as `02-22 13:54:39.839`.
+  String get time => _match.group(1)!;
+
+  /// The process ID.
+  String get process => _match.group(2)!;
+
+  /// The thread ID.
+  String get thread => _match.group(3)!;
+
+  /// The character representing the severity of the log message, such as `I`.
+  String get severity => _match.group(4)!;
+
+  /// The tag, such as `ActivityManager`.
+  String get name => _match.group(5)!;
+
+  /// The actual log message.
+  String get message => _match.group(6)!;
+
+  String toDebugString() {
+    return 'AdbLogLine(time: $time, process: $process, thread: $thread, severity: $severity, name: $name, message: $message)';
+  }
+}
diff --git a/testing/scenario_app/bin/utils/environment.dart b/testing/scenario_app/bin/utils/environment.dart
new file mode 100644
index 0000000000000000000000000000000000000000..9ad5561f83e24d5b0c80397c437418553b0b0684
--- /dev/null
+++ b/testing/scenario_app/bin/utils/environment.dart
@@ -0,0 +1,45 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:meta/meta.dart';
+
+/// An overridable collection of values provided by the environment.
+@immutable
+final class Environment {
+  /// Creates a new environment from the given values.
+  const Environment({
+    required this.isCi,
+    required this.showVerbose,
+    required this.logsDir,
+  });
+
+  /// Whether the current program is running on a CI environment.
+  ///
+  /// Useful for determining if certain features should be enabled or disabled
+  /// based on the environment, or to add safety checks (for example, using
+  /// confusing or ambiguous flags).
+  final bool isCi;
+
+  /// Whether the user has requested verbose logging and program output.
+  final bool showVerbose;
+
+  /// What directory to store logs and screenshots in.
+  final String? logsDir;
+
+  @override
+  bool operator ==(Object o) {
+    return o is Environment &&
+        o.isCi == isCi &&
+        o.showVerbose == showVerbose &&
+        o.logsDir == logsDir;
+  }
+
+  @override
+  int get hashCode => Object.hash(isCi, showVerbose, logsDir);
+
+  @override
+  String toString() {
+    return 'Environment(isCi: $isCi, showVerbose: $showVerbose, logsDir: $logsDir)';
+  }
+}
diff --git a/testing/scenario_app/bin/utils/logs.dart b/testing/scenario_app/bin/utils/logs.dart
index 41800342d193f39bb3cfd70b3f2f5f3025a63f6c..4d883d340e261f68b12de2f013cabbe6c9cbb881 100644
--- a/testing/scenario_app/bin/utils/logs.dart
+++ b/testing/scenario_app/bin/utils/logs.dart
@@ -7,25 +7,43 @@ import 'dart:io';
 bool _supportsAnsi = stdout.supportsAnsiEscapes;
 String _green = _supportsAnsi ? '\u001b[1;32m' : '';
 String _red = _supportsAnsi ? '\u001b[31m' : '';
+String _yellow = _supportsAnsi ? '\u001b[33m' : '';
 String _gray = _supportsAnsi ? '\u001b[90m' : '';
 String _reset = _supportsAnsi? '\u001B[0m' : '';
 
-Future<void> step(String msg, Function() fn) async {
+Future<void> step(String msg, Future<void> Function() fn) async {
   stdout.writeln('-> $_green$msg$_reset');
   try {
     await fn();
+  } catch (_) {
+    stderr.writeln('~~ ${_red}Failed$_reset');
+    rethrow;
   } finally {
     stdout.writeln('<- ${_gray}Done$_reset');
   }
 }
 
+void _logWithColor(String color, String msg) {
+  stdout.writeln('$color$msg$_reset');
+}
+
 void log(String msg) {
-  stdout.writeln('$_gray$msg$_reset');
+  _logWithColor(_gray, msg);
+}
+
+void logImportant(String msg) {
+  stdout.writeln(msg);
 }
 
-void panic(List<String> messages) {
+void logWarning(String msg) {
+  _logWithColor(_yellow, msg);
+}
+
+final class Panic extends Error {}
+
+Never panic(List<String> messages) {
   for (final String message in messages) {
-    stderr.writeln('$_red$message$_reset');
+    _logWithColor(_red, message);
   }
-  throw 'panic';
+  throw Panic();
 }
diff --git a/testing/scenario_app/bin/utils/options.dart b/testing/scenario_app/bin/utils/options.dart
new file mode 100644
index 0000000000000000000000000000000000000000..36364cf83ba39b2bfacae3832c0090383c0522f0
--- /dev/null
+++ b/testing/scenario_app/bin/utils/options.dart
@@ -0,0 +1,326 @@
+import 'dart:io' as io;
+
+import 'package:args/args.dart';
+import 'package:engine_repo_tools/engine_repo_tools.dart';
+import 'package:path/path.dart' as p;
+
+import 'environment.dart';
+
+/// Command line options and parser for the Android `scenario_app` test runner.
+extension type const Options._(ArgResults _args) {
+  /// Parses the command line [args] into a set of options.
+  ///
+  /// Throws a [FormatException] if command line arguments are invalid.
+  factory Options.parse(
+    List<String> args, {
+    required Environment environment,
+    required Engine? localEngine,
+  }) {
+    final ArgResults results = _parser(environment, localEngine).parse(args);
+    final Options options = Options._(results);
+
+    // The 'adb' tool must exist.
+    if (results['adb'] == null) {
+      throw const FormatException('The --adb option must be set.');
+    } else if (!io.File(options.adb).existsSync()) {
+      throw FormatException(
+        'The adb tool does not exist at ${options.adb}.',
+      );
+    }
+
+    // The 'ndk-stack' tool must exist.
+    if (results['ndk-stack'] == null) {
+      throw const FormatException('The --ndk-stack option must be set.');
+    } else if (!io.File(options.ndkStack).existsSync()) {
+      throw FormatException(
+        'The ndk-stack tool does not exist at ${options.ndkStack}.',
+      );
+    }
+
+    // The 'out-dir' must exist.
+    if (results['out-dir'] == null) {
+      throw const FormatException('The --out-dir option must be set.');
+    } else if (!io.Directory(options.outDir).existsSync()) {
+      throw FormatException(
+        'The out directory does not exist at ${options.outDir}.',
+      );
+    }
+
+    // Cannot use forceSurfaceProducerSurfaceTexture with Impeller+Vulkan.
+    if (options.forceSurfaceProducerSurfaceTexture &&
+        options.enableImpeller &&
+        options.impellerBackend != 'opengles') {
+      throw const FormatException(
+        'Cannot use --force-surface-producer-surface-texture with '
+        '--enable-impeller unless --impeller-backend="opengles" is used. See '
+        'https://github.com/flutter/flutter/issues/143539 for details.',
+      );
+    }
+
+    return options;
+  }
+
+  /// Whether usage information should be shown based on command line [args].
+  ///
+  /// This is a shortcut that can be used to determine if the usage information
+  /// before parsing the remaining command line arguments. For example:
+  ///
+  /// ```
+  /// void main(List<String> args) {
+  ///   if (Options.showUsage(args)) {
+  ///     stdout.writeln(Options.usage);
+  ///     return;
+  ///   }
+  ///   final options = Options.parse(args);
+  ///   // ...
+  /// }
+  /// ```
+  static bool showUsage(List<String> args) {
+    // If any of the arguments are '--help' or -'h'.
+    return args.isNotEmpty && args.any((String arg) {
+      return arg == '--help' || arg == '-h';
+    });
+  }
+
+  /// Whether verbose logging should be enabled based on command line [args].
+  ///
+  /// This is a shortcut that can be used to determine if verbose logging should
+  /// be enabled before parsing the remaining command line arguments. For
+  /// example:
+  ///
+  /// ```
+  /// void main(List<String> args) {
+  ///   final bool verbose = Options.showVerbose(args);
+  ///   // ...
+  /// }
+  /// ```
+  static bool showVerbose(List<String> args) {
+    // If any of the arguments are '--verbose' or -'v'.
+    return args.isNotEmpty && args.any((String arg) {
+      return arg == '--verbose' || arg == '-v';
+    });
+  }
+
+  /// Returns usage information for the `scenario_app` test runner.
+  ///
+  /// If [verbose] is `true`, then additional options are shown.
+  static String usage({
+    required Environment environment,
+    required Engine? localEngineDir,
+  }) {
+    return _parser(environment, localEngineDir).usage;
+  }
+
+  /// Parses the command line [args] into a set of options.
+  ///
+  /// Unlike [_miniParser], this parser includes all options.
+  static ArgParser _parser(Environment environment, Engine? localEngine) {
+    final bool hideUnusualOptions = !environment.showVerbose;
+    return ArgParser(usageLineLength: 120)
+      ..addFlag(
+        'verbose',
+        abbr: 'v',
+        help: 'Enable verbose logging',
+        negatable: false,
+      )
+      ..addFlag(
+        'help',
+        abbr: 'h',
+        help: 'Print usage information',
+        negatable: false,
+      )
+      ..addFlag(
+        'use-skia-gold',
+        help:
+            'Whether to use Skia Gold to compare screenshots. Defaults to true '
+            'on CI and false otherwise.',
+        defaultsTo: environment.isCi,
+        hide: hideUnusualOptions,
+      )
+      ..addFlag(
+        'enable-impeller',
+        help:
+            'Whether to enable Impeller as the graphics backend. If true, the '
+            'test runner will use --impeller-backend if set, otherwise the '
+            'default backend will be used. To explicitly run with the Skia '
+            'backend, set this to false (--no-enable-impeller).',
+      )
+      ..addFlag(
+        'force-surface-producer-surface-texture',
+        help:
+            'Whether to force the use of SurfaceTexture as the SurfaceProducer '
+            'rendering strategy. This is used to emulate the behavior of older '
+            'devices that do not support ImageReader, or to explicitly test '
+            'SurfaceTexture path for rendering plugins still using the older '
+            'createSurfaceTexture() API.'
+            '\n'
+            'Cannot be used with --enable-impeller unless --impeller-backend='
+            '"opengles" is used. See '
+            'https://github.com/flutter/flutter/issues/143539 for details.',
+        negatable: false
+      )
+      ..addFlag(
+        'prefix-logs-per-run',
+        help: 'Whether to prefix logs with a per-run unique identifier.',
+        defaultsTo: environment.isCi,
+        hide: hideUnusualOptions,
+      )
+      ..addOption(
+        'impeller-backend',
+        help: 'The graphics backend to use when --enable-impeller is true. '
+            'Unlike the similar option when launching an app, there is no '
+            'fallback; that is, either Vulkan or OpenGLES must be specified. ',
+        allowed: <String>['vulkan', 'opengles'],
+        defaultsTo: 'vulkan',
+      )
+      ..addOption(
+        'logs-dir',
+        help: 'Path to a directory where logs and screenshots are stored.',
+        defaultsTo: environment.logsDir,
+      )
+      ..addOption(
+        'adb',
+        help: 'Path to the Android Debug Bridge (adb) executable. '
+            'If the current working directory is within the engine repository, '
+            'defaults to ./third_party/android_tools/sdk/platform-tools/adb.',
+        defaultsTo: localEngine != null
+            ? p.join(
+                localEngine.srcDir.path,
+                'third_party',
+                'android_tools',
+                'sdk',
+                'platform-tools',
+                'adb',
+              )
+            : null,
+        valueHelp: 'path/to/adb',
+        hide: hideUnusualOptions,
+      )
+      ..addOption(
+        'ndk-stack',
+        help:
+            'Path to the NDK stack tool. Defaults to the checked-in version in '
+            'third_party/android_tools if the current working directory is '
+            'within the engine repository on a supported platform.',
+        defaultsTo: localEngine != null &&
+                (io.Platform.isLinux ||
+                    io.Platform.isMacOS ||
+                    io.Platform.isWindows)
+            ? p.join(
+                localEngine.srcDir.path,
+                'third_party',
+                'android_tools',
+                'ndk',
+                'prebuilt',
+                () {
+                  if (io.Platform.isLinux) {
+                    return 'linux-x86_64';
+                  } else if (io.Platform.isMacOS) {
+                    return 'darwin-x86_64';
+                  } else if (io.Platform.isWindows) {
+                    return 'windows-x86_64';
+                  } else {
+                    // Unreachable.
+                    throw UnsupportedError(
+                      'Unsupported platform: ${io.Platform.operatingSystem}',
+                    );
+                  }
+                }(),
+                'bin',
+                'ndk-stack',
+              )
+            : null,
+        valueHelp: 'path/to/ndk-stack',
+        hide: hideUnusualOptions,
+      )
+      ..addOption(
+        'out-dir',
+        help: 'Path to a out/{variant} directory where the APKs are built. '
+            'Defaults to the latest updated out/ directory that starts with '
+            '"android_" if the current working directory is within the engine '
+            'repository.',
+        defaultsTo: environment.isCi ? null : localEngine
+            ?.outputs()
+            .where((Output o) => p.basename(o.path.path).startsWith('android_'))
+            .firstOrNull
+            ?.path
+            .path,
+        mandatory: environment.isCi,
+        valueHelp: 'path/to/out/android_variant',
+      )
+      ..addOption(
+        'smoke-test',
+        help: 'Fully qualified class name of a single test to run. For example '
+            'try "dev.flutter.scenarios.EngineLaunchE2ETest" or '
+            '"dev.flutter.scenariosui.ExternalTextureTests".',
+        valueHelp: 'package.ClassName',
+      )
+      ..addOption(
+        'output-contents-golden',
+        help: 'Path to a file that contains the expected filenames of golden '
+            'files. If the current working directory is within the engine '
+            'repository, defaults to ./testing/scenario_app/android/'
+            'expected_golden_output.txt.',
+        defaultsTo: localEngine != null
+            ? p.join(
+                localEngine.flutterDir.path,
+                'testing',
+                'scenario_app',
+                'android',
+                'expected_golden_output.txt',
+              )
+            : null,
+        valueHelp: 'path/to/golden.txt',
+      );
+  }
+
+  /// Whether verbose logging should be enabled.
+  bool get verbose => _args['verbose'] as bool;
+
+  /// Whether usage information should be shown.
+  bool get help => _args['help'] as bool;
+
+  /// Whether to use Skia Gold to compare screenshots.
+  bool get useSkiaGold => _args['use-skia-gold'] as bool;
+
+  /// Whether to enable Impeller as the graphics backend.
+  bool get enableImpeller => _args['enable-impeller'] as bool;
+
+  /// The graphics backend to use when --enable-impeller is true.
+  String get impellerBackend => _args['impeller-backend'] as String;
+
+  /// Path to a directory where logs and screenshots are stored.
+  String get logsDir {
+    final String? logsDir = _args['logs-dir'] as String?;
+    return logsDir ?? p.join(outDir, 'logs');
+  }
+
+  /// Path to the Android Debug Bridge (adb) executable.
+  String get adb => _args['adb'] as String;
+
+  /// Path to the NDK stack tool.
+  String get ndkStack => _args['ndk-stack'] as String;
+
+  /// Path to a out/{variant} directory where the APKs are built.
+  String get outDir => _args['out-dir'] as String;
+
+  /// Fully qualified class name of a single test to run.
+  String? get smokeTest => _args['smoke-test'] as String?;
+
+  /// Path to a file that contains the expected filenames of golden files.
+  String? get outputContentsGolden => _args['output-contents-golden'] as String;
+
+  /// Whether to force the use of `SurfaceTexture` for `SurfaceProducer`.
+  ///
+  /// Always returns `false` if `--enable-impeller` is `true` and
+  /// `--impeller-backend` is not `opengles`.
+  bool get forceSurfaceProducerSurfaceTexture {
+    if (enableImpeller && impellerBackend != 'opengles') {
+      return false;
+    }
+    return _args['force-surface-producer-surface-texture'] as bool;
+  }
+
+  /// Whether to prefix logs with a per-run unique identifier.
+  bool get prefixLogsPerRun => _args['prefix-logs-per-run'] as bool;
+}
diff --git a/testing/scenario_app/bin/utils/process_manager_extension.dart b/testing/scenario_app/bin/utils/process_manager_extension.dart
index fb705f8f1144eb28430a485104ed795b212f9c2f..666b09043aad31d24a842b4777944423cea90007 100644
--- a/testing/scenario_app/bin/utils/process_manager_extension.dart
+++ b/testing/scenario_app/bin/utils/process_manager_extension.dart
@@ -8,35 +8,50 @@ import 'dart:io';
 
 import 'package:process/process.dart';
 
-/// Pipes the [process] streams and writes them to [out] sink.
-/// If [out] is null, then the current [Process.stdout] is used as the sink.
-Future<int> pipeProcessStreams(
-  Process process, {
-  StringSink? out,
-}) async {
-  out ??= stdout;
+(Future<int> exitCode, Stream<String> output) getProcessStreams(
+  Process process,
+) {
   final Completer<void> stdoutCompleter = Completer<void>();
-  final StreamSubscription<String> stdoutSub = process.stdout
+  final Completer<void> stderrCompleter = Completer<void>();
+  final StreamController<String> outputController = StreamController<String>();
+
+  final StreamSubscription<void> stdoutSub = process.stdout
     .transform(utf8.decoder)
     .transform<String>(const LineSplitter())
-    .listen((String line) {
-      out!.writeln('[stdout] $line');
-    }, onDone: stdoutCompleter.complete);
+    .listen(outputController.add, onDone: stdoutCompleter.complete);
 
-  final Completer<void> stderrCompleter = Completer<void>();
-  final StreamSubscription<String> stderrSub = process.stderr
+  // From looking at historic logs, it seems that the stderr output is rare.
+  // Instead of prefacing every line with [stdout] unnecessarily, we'll just
+  // use [stderr] to indicate that it's from the stderr stream.
+  //
+  // For example, a historic log which has 0 occurrences of stderr:
+  // https://gist.github.com/matanlurey/84cf9c903ef6d507dcb63d4c303ca45f
+  final StreamSubscription<void> stderrSub = process.stderr
     .transform(utf8.decoder)
     .transform<String>(const LineSplitter())
-    .listen((String line) {
-      out!.writeln('[stderr] $line');
-    }, onDone: stderrCompleter.complete);
+    .map((String line) => '[stderr] $line')
+    .listen(outputController.add, onDone: stderrCompleter.complete);
+
+  final Future<int> exitCode = process.exitCode.then<int>((int code) async {
+    await (stdoutSub.cancel(), stderrSub.cancel()).wait;
+    outputController.close();
+    return code;
+  });
 
-  final int exitCode = await process.exitCode;
-  await stderrSub.cancel();
-  await stdoutSub.cancel();
+  return (exitCode, outputController.stream);
+}
 
-  await stdoutCompleter.future;
-  await stderrCompleter.future;
+/// Pipes the [process] streams and writes them to [out] sink.
+///
+/// If [out] is null, then the current [Process.stdout] is used as the sink.
+Future<int> pipeProcessStreams(
+  Process process, {
+  StringSink? out,
+}) async {
+  out ??= stdout;
+
+  final (Future<int> exitCode, Stream<String> output) = getProcessStreams(process);
+  output.listen(out.writeln);
   return exitCode;
 }
 
@@ -45,4 +60,11 @@ extension RunAndForward on ProcessManager {
   Future<int> runAndForward(List<String> cmd) async {
     return pipeProcessStreams(await start(cmd), out: stdout);
   }
+
+  /// Runs [cmd], and captures the stdout and stderr pipes.
+  Future<(int, StringBuffer)> runAndCapture(List<String> cmd) async {
+    final StringBuffer buffer = StringBuffer();
+    final int exitCode = await pipeProcessStreams(await start(cmd), out: buffer);
+    return (exitCode, buffer);
+  }
 }
diff --git a/testing/scenario_app/bin/utils/sample_adb_logcat.txt b/testing/scenario_app/bin/utils/sample_adb_logcat.txt
new file mode 100644
index 0000000000000000000000000000000000000000..900d4dbd1081d5b607fa04490cc32379b511b587
--- /dev/null
+++ b/testing/scenario_app/bin/utils/sample_adb_logcat.txt
@@ -0,0 +1,1077 @@
+[stdout] --------- beginning of main
+[stdout] 02-15 10:20:33.023  1735  1941 I GnssLocationProvider: WakeLock acquired by sendMessage(REPORT_SV_STATUS, 0, com.android.server.location.GnssLocationProvider$SvStatusInfo@ac23b3f)
+[stdout] 02-15 10:20:33.023  1735  1749 I GnssLocationProvider: WakeLock released by handleMessage(REPORT_SV_STATUS, 0, com.android.server.location.GnssLocationProvider$SvStatusInfo@ac23b3f)
+[stdout] 02-15 10:20:34.028  1735  1941 I GnssLocationProvider: WakeLock acquired by sendMessage(REPORT_SV_STATUS, 0, com.android.server.location.GnssLocationProvider$SvStatusInfo@47a9c0c)
+[stdout] 02-15 10:20:34.028  1735  1749 I GnssLocationProvider: WakeLock released by handleMessage(REPORT_SV_STATUS, 0, com.android.server.location.GnssLocationProvider$SvStatusInfo@47a9c0c)
+[stdout] 02-15 10:20:35.033  1735  1941 I GnssLocationProvider: WakeLock acquired by sendMessage(REPORT_SV_STATUS, 0, com.android.server.location.GnssLocationProvider$SvStatusInfo@1084955)
+[stdout] 02-15 10:20:35.033  1735  1749 I GnssLocationProvider: WakeLock released by handleMessage(REPORT_SV_STATUS, 0, com.android.server.location.GnssLocationProvider$SvStatusInfo@1084955)
+[stdout] 02-15 10:20:36.036  1735  1941 I GnssLocationProvider: WakeLock acquired by sendMessage(REPORT_SV_STATUS, 0, com.android.server.location.GnssLocationProvider$SvStatusInfo@39d4f6a)
+[stdout] 02-15 10:20:36.036  1735  1749 I GnssLocationProvider: WakeLock released by handleMessage(REPORT_SV_STATUS, 0, com.android.server.location.GnssLocationProvider$SvStatusInfo@39d4f6a)
+[stdout] 02-15 10:20:36.232  1735  1747 W system_server: Long monitor contention with owner PackageInstaller (1783) at java.lang.Object android.util.ArrayMap.get(java.lang.Object)(ArrayMap.java:420) waiters=0 in void com.android.server.pm.PackageInstallerSession.write(org.xmlpull.v1.XmlSerializer, java.io.File) for 1.347s
+[stdout] 02-15 10:20:36.238  1735  3071 W system_server: Long monitor contention with owner Binder:1735_2 (1747) at void com.android.server.pm.PackageInstallerService$InternalCallback.onSessionSealedBlocking(com.android.server.pm.PackageInstallerSession)(PackageInstallerService.java:1136) waiters=0 in android.content.pm.PackageInstaller$SessionInfo com.android.server.pm.PackageInstallerService.getSessionInfo(int) for 1.354s
+[stdout] --------- beginning of system
+[stdout] 02-15 10:20:36.657  1735  1763 D PackageManager: Instant App installer not found with android.intent.action.INSTALL_INSTANT_APP_PACKAGE
+[stdout] 02-15 10:20:36.657  1735  1763 D PackageManager: Clear ephemeral installer activity
+[stdout] 02-15 10:20:36.658  1735  1763 V BackupManagerService: restoreAtInstall pkg=dev.flutter.scenarios token=d restoreSet=0
+[stdout] 02-15 10:20:36.658  1735  1763 V BackupManagerService: Finishing install immediately
+[stdout] 02-15 10:20:36.666  1578  1784 E         : Couldn't opendir /data/app/vmdl831937340.tmp: No such file or directory
+[stdout] 02-15 10:20:36.666  1578  1784 E installd: Failed to delete /data/app/vmdl831937340.tmp: No such file or directory
+[stdout] 02-15 10:20:36.668  3621  3621 I CarrierServices: [2] RcsAutoStartReceiver.b: carrierServicesJibeServiceEnabled changed from true to true
+[stdout] 02-15 10:20:36.668  3621  3621 I CarrierServices: [2] RcsAutoStartReceiver.b: enableRcs changed from true to true
+[stdout] 02-15 10:20:36.668  3621  3621 I CarrierServices: [2] RcsAutoStartReceiver.b: RcsAutoStartReceiver triggered. Fetching RCS State. Action: android.intent.action.PACKAGE_ADDED
+[stdout] 02-15 10:20:36.669  3621  3621 I CarrierServices: [2] aws.a: Migration binding to RcsMigrationService
+[stdout] 02-15 10:20:36.670  1735  1811 I InputReader: Reconfiguring input devices.  changes=0x00000010
+[stdout] 02-15 10:20:36.673  1735  3071 W BroadcastQueue: Background execution not allowed: receiving Intent { act=android.intent.action.PACKAGE_ADDED dat=package:dev.flutter.scenarios flg=0x4000010 (has extras) } to com.android.musicfx/.Compatibility$Receiver
+[stdout] 02-15 10:20:36.673  1735  1750 W BroadcastQueue: Background execution not allowed: receiving Intent { act=android.intent.action.PACKAGE_ADDED dat=package:dev.flutter.scenarios flg=0x4000010 (has extras) } to com.google.android.gms/.games.chimera.GamesSystemBroadcastReceiverProxy
+[stdout] 02-15 10:20:36.674  1735  1750 W BroadcastQueue: Background execution not allowed: receiving Intent { act=android.intent.action.PACKAGE_ADDED dat=package:dev.flutter.scenarios flg=0x4000010 (has extras) } to com.google.android.gms/.gass.chimera.PackageChangeBroadcastReceiver
+[stdout] 02-15 10:20:36.674  1735  1750 W BroadcastQueue: Background execution not allowed: receiving Intent { act=android.intent.action.PACKAGE_ADDED dat=package:dev.flutter.scenarios flg=0x4000010 (has extras) } to com.google.android.gms/.chimera.GmsIntentOperationService$PersistentTrustedReceiver
+[stdout] 02-15 10:20:36.674  1735  1750 W BroadcastQueue: Background execution not allowed: receiving Intent { act=android.intent.action.PACKAGE_ADDED dat=package:dev.flutter.scenarios flg=0x4000010 (has extras) } to com.google.android.googlequicksearchbox/com.google.android.apps.gsa.googlequicksearchbox.GelStubAppWatcher
+[stdout] 02-15 10:20:36.674  1735  1750 W BroadcastQueue: Background execution not allowed: receiving Intent { act=android.intent.action.PACKAGE_ADDED dat=package:dev.flutter.scenarios flg=0x4000010 (has extras) } to com.google.android.ims/.receivers.RcsAutoStartReceiver
+[stdout] 02-15 10:20:36.678  1735  1751 D AutofillUI: destroySaveUiUiThread(): already destroyed
+[stdout] 02-15 10:20:36.679  2863  2863 I Bugle   : returning RCS state provider.
+[stdout] 02-15 10:20:36.681  2863  2972 I CarrierServices: [168] inq.shouldUseCarrierServicesApkForV1Apis: Checking if using CarrierServices.apk is possible. Enabled: true, isAtLeastM: true, runningInsideBugle: true
+[stdout] 02-15 10:20:36.681  2863  2972 I CarrierServices: [168] inq.e: Network Operator: 310260
+[stdout] 02-15 10:20:36.681  1964  1964 D CarrierSvcBindHelper: No carrier app for: 0
+[stdout] 02-15 10:20:36.681  1735  1735 I Telecom : DefaultDialerCache: Refreshing default dialer for user 0: now com.google.android.dialer: DDC.oR@AQE
+[stdout] 02-15 10:20:36.682  1735  1735 V BackupManagerConstants: getFullBackupIntervalMilliseconds(...) returns 86400000
+[stdout] 02-15 10:20:36.683  1964  1964 D ImsResolver: maybeAddedImsService, packageName: dev.flutter.scenarios
+[stdout] 02-15 10:20:36.683  1964  1964 D CarrierConfigLoader: mHandler: 9 phoneId: 0
+[stdout] 02-15 10:20:36.683  2863  2972 I CarrierServices: [168] inq.e: carrierWithOldEcApis: false
+[stdout] 02-15 10:20:36.683  2863  2972 I CarrierServices: [168] inq.e: hasDialerThatSupportsNewEc: false
+[stdout] 02-15 10:20:36.684  1735  1749 D AutofillManagerServiceImpl: Set component for user 0 as AutofillServiceInfo[ServiceInfo{96b5821 com.google.android.gms.autofill.service.AutofillService}, settings:com.google.android.gms.autofill.ui.AutofillSettingsActivity, hasCompatPckgs:false]
+[stdout] 02-15 10:20:36.686  2863  2972 W RcsProvisioning: Failed to read configuration: /data/user/0/com.google.android.apps.messaging/files/rcsconfig (No such file or directory)
+[stdout] 02-15 10:20:36.686  2863  2972 W RcsProvisioning: java.io.FileNotFoundException: /data/user/0/com.google.android.apps.messaging/files/rcsconfig (No such file or directory)
+[stdout] 02-15 10:20:36.686  2863  2972 W RcsProvisioning: 	at java.io.FileInputStream.open0(Native Method)
+[stdout] 02-15 10:20:36.686  2863  2972 W RcsProvisioning: 	at java.io.FileInputStream.open(FileInputStream.java:231)
+[stdout] 02-15 10:20:36.686  2863  2972 W RcsProvisioning: 	at java.io.FileInputStream.<init>(FileInputStream.java:165)
+[stdout] 02-15 10:20:36.686  2863  2972 W RcsProvisioning: 	at android.app.ContextImpl.openFileInput(ContextImpl.java:560)
+[stdout] 02-15 10:20:36.686  2863  2972 W RcsProvisioning: 	at android.content.ContextWrapper.openFileInput(ContextWrapper.java:202)
+[stdout] 02-15 10:20:36.686  2863  2972 W RcsProvisioning: 	at ion.a(SourceFile:2)
+[stdout] 02-15 10:20:36.686  2863  2972 W RcsProvisioning: 	at idl.a(SourceFile:4)
+[stdout] 02-15 10:20:36.686  2863  2972 W RcsProvisioning: 	at idm.a(SourceFile:7)
+[stdout] 02-15 10:20:36.686  2863  2972 W RcsProvisioning: 	at com.google.android.apps.messaging.rcsmigration.RcsStateProvider.buildRcsState(SourceFile:81)
+[stdout] 02-15 10:20:36.686  2863  2972 W RcsProvisioning: 	at com.google.android.apps.messaging.rcsmigration.RcsStateProvider.getRcsState(SourceFile:6)
+[stdout] 02-15 10:20:36.686  2863  2972 W RcsProvisioning: 	at com.google.android.ims.rcsmigration.IRcsStateProvider$Stub.dispatchTransaction(SourceFile:10)
+[stdout] 02-15 10:20:36.686  2863  2972 W RcsProvisioning: 	at com.google.android.aidl.BaseStub.onTransact(SourceFile:18)
+[stdout] 02-15 10:20:36.686  2863  2972 W RcsProvisioning: 	at android.os.Binder.execTransact(Binder.java:731)
+[stdout] 02-15 10:20:36.686  2863  2972 D RcsProvisioning: Retrieving backup token
+[stdout] 02-15 10:20:36.686  2863  2972 D RcsProvisioning: Exception while getting subscriber Id. Using default
+[stdout] 02-15 10:20:36.696  4721  6807 I FontLog : Package dev.flutter.scenarios has no metadata [CONTEXT service_id=132 ]
+[stdout] 02-15 10:20:36.696  4721  6807 W GCM     : Unexpected forwarded intent: Intent { act=android.intent.action.PACKAGE_ADDED dat=package:dev.flutter.scenarios flg=0x4000010 pkg=com.google.android.gms cmp=com.google.android.gms/.chimera.PersistentIntentOperationService (has extras) }
+[stdout] 02-15 10:20:36.697  4721  6809 W GCM     : Unexpected forwarded intent: Intent { act=android.intent.action.PACKAGE_ADDED dat=package:dev.flutter.scenarios flg=0x4000010 pkg=com.google.android.gms cmp=com.google.android.gms/.chimera.PersistentIntentOperationService (has extras) }
+[stdout] 02-15 10:20:36.698  4770  6815 I Auth    : [SupervisedAccountIntentOperation] onHandleIntent(): android.intent.action.PACKAGE_ADDED
+[stdout] 02-15 10:20:36.699  4770  4770 D BoundBrokerSvc: onBind: Intent { act=com.google.android.gms.common.BIND_SHARED_PREFS pkg=com.google.android.gms }
+[stdout] 02-15 10:20:36.699  4770  4770 D BoundBrokerSvc: Loading bound service for intent: Intent { act=com.google.android.gms.common.BIND_SHARED_PREFS pkg=com.google.android.gms }
+[stdout] 02-15 10:20:36.699  4770  6804 I BlockstoreStorage: Clearing Blockstore Data for package dev.flutter.scenarios [CONTEXT service_id=258 ]
+[stdout] 02-15 10:20:36.700  4770  6804 I BlockstoreStorage: No metadata found. Skipping deletion. [CONTEXT service_id=258 ]
+[stdout] 02-15 10:20:36.701  4770  4770 D BoundBrokerSvc: onUnbind: Intent { act=com.google.android.gms.common.BIND_SHARED_PREFS pkg=com.google.android.gms }
+[stdout] 02-15 10:20:36.706  4721  4769 E BluetoothAdapter: Bluetooth binder is null
+[stdout] 02-15 10:20:36.711  4721  4769 W ChimeraUtils: Module com.google.android.gms.nearby_en has empty metadata display_name_string_id
+[stdout] 02-15 10:20:36.711  4721  4769 W ChimeraUtils: Module com.google.android.gms.nearby_en has empty metadata display_name_string_id
+[stdout] 02-15 10:20:36.719  4770  4876 E Icing   : Couldn't handle android.intent.action.PACKAGE_ADDED intent due to initialization failure.
+[stdout] 02-15 10:20:36.726  4770  4876 I Icing   : IndexChimeraService.getServiceInterface callingPackage=com.google.android.gms componentName=ContactsIndexer serviceId=33
+[stdout] 02-15 10:20:36.726  4770  4876 W Icing   : IndexManager failed to initialize. SearchIndex.API is unavailable.
+[stdout] 02-15 10:20:36.727  4770  6817 W IcingInternalCorpora: Failed to get global search sources
+[stdout] 02-15 10:20:36.729  4770  6818 I ChimeraConfigurator: Starting update, reason: 4 urgentFeatures: pay:-1
+[stdout] 02-15 10:20:36.732  4770  6818 W FeatureMgr: Attempted to request and unrequest the same feature: antifingerprinting. Ignoring unrequest.
+[stdout] 02-15 10:20:36.733  4770  4876 W Icing   : IndexManager failed to initialize. AppIndex.API is unavailable.
+[stdout] 02-15 10:20:36.734  4770  4770 W GmscoreIpa: Apps indexing failed. [CONTEXT service_id=255 ]
+[stdout] 02-15 10:20:36.734  4770  4770 W GmscoreIpa: ciev: API: AppIndexing.API is not available on this device. Connection failed with: ConnectionResult{statusCode=API_UNAVAILABLE, resolution=null, message=null}
+[stdout] 02-15 10:20:36.734  4770  4770 W GmscoreIpa: 	at ciez.a(:com.google.android.gms@214515028@21.45.15 (100400-411636772):2)
+[stdout] 02-15 10:20:36.734  4770  4770 W GmscoreIpa: 	at wlo.c(:com.google.android.gms@214515028@21.45.15 (100400-411636772):0)
+[stdout] 02-15 10:20:36.734  4770  4770 W GmscoreIpa: 	at wof.p(:com.google.android.gms@214515028@21.45.15 (100400-411636772):4)
+[stdout] 02-15 10:20:36.734  4770  4770 W GmscoreIpa: 	at wof.d(:com.google.android.gms@214515028@21.45.15 (100400-411636772):0)
+[stdout] 02-15 10:20:36.734  4770  4770 W GmscoreIpa: 	at wof.g(:com.google.android.gms@214515028@21.45.15 (100400-411636772):19)
+[stdout] 02-15 10:20:36.734  4770  4770 W GmscoreIpa: 	at wof.onConnectionFailed(:com.google.android.gms@214515028@21.45.15 (100400-411636772):0)
+[stdout] 02-15 10:20:36.734  4770  4770 W GmscoreIpa: 	at xgi.gE(:com.google.android.gms@214515028@21.45.15 (100400-411636772):0)
+[stdout] 02-15 10:20:36.734  4770  4770 W GmscoreIpa: 	at xfi.b(:com.google.android.gms@214515028@21.45.15 (100400-411636772):1)
+[stdout] 02-15 10:20:36.734  4770  4770 W GmscoreIpa: 	at xez.a(:com.google.android.gms@214515028@21.45.15 (100400-411636772):7)
+[stdout] 02-15 10:20:36.734  4770  4770 W GmscoreIpa: 	at xfc.handleMessage(:com.google.android.gms@214515028@21.45.15 (100400-411636772):23)
+[stdout] 02-15 10:20:36.734  4770  4770 W GmscoreIpa: 	at android.os.Handler.dispatchMessage(Handler.java:106)
+[stdout] 02-15 10:20:36.734  4770  4770 W GmscoreIpa: 	at alyk.jj(:com.google.android.gms@214515028@21.45.15 (100400-411636772):0)
+[stdout] 02-15 10:20:36.734  4770  4770 W GmscoreIpa: 	at alyk.dispatchMessage(:com.google.android.gms@214515028@21.45.15 (100400-411636772):11)
+[stdout] 02-15 10:20:36.734  4770  4770 W GmscoreIpa: 	at android.os.Looper.loop(Looper.java:193)
+[stdout] 02-15 10:20:36.734  4770  4770 W GmscoreIpa: 	at android.os.HandlerThread.run(HandlerThread.java:65)
+[stdout] 02-15 10:20:36.741  4770  4876 I Icing   : IndexChimeraService.getServiceInterface callingPackage=com.google.android.gms componentName=AppsCorpus serviceId=36
+[stdout] 02-15 10:20:36.741  4770  4876 W Icing   : IndexManager failed to initialize. SearchIndex.API is unavailable.
+[stdout] 02-15 10:20:36.742  4770  6632 W IcingInternalCorpora: Couldn't fetch status for corpus apps
+[stdout] 02-15 10:20:36.745  4770  6818 I GmsDebugLogger: [73] 1801
+[stdout] 02-15 10:20:36.746  4770  6818 I GmsDebugLogger: [30] [Pay.optional:214515100000]
+[stdout] 02-15 10:20:36.747  4770  6818 W ChimeraConfigService: Retry attempt was throttled. [CONTEXT service_id=264 ]
+[stdout] 02-15 10:20:36.747  4770  6818 I GmsDebugLogger: [83] 1 [pay]
+[stdout] 02-15 10:20:36.782  1735  1763 D PackageManager: Instant App installer not found with android.intent.action.INSTALL_INSTANT_APP_PACKAGE
+[stdout] 02-15 10:20:36.782  1735  1763 D PackageManager: Clear ephemeral installer activity
+[stdout] 02-15 10:20:36.782  1735  1763 V BackupManagerService: restoreAtInstall pkg=dev.flutter.scenarios.test token=e restoreSet=0
+[stdout] 02-15 10:20:36.783  1735  1763 V BackupManagerService: Finishing install immediately
+[stdout] 02-15 10:20:36.786  1578  1784 E         : Couldn't opendir /data/app/vmdl1936275788.tmp: No such file or directory
+[stdout] 02-15 10:20:36.786  1578  1784 E installd: Failed to delete /data/app/vmdl1936275788.tmp: No such file or directory
+[stdout] 02-15 10:20:36.798  1735  1749 W system_server: Unknown chunk type '200'.
+[stdout] 02-15 10:20:36.802  1735  1811 I InputReader: Reconfiguring input devices.  changes=0x00000010
+[stdout] 02-15 10:20:36.803  1735  1836 W BroadcastQueue: Background execution not allowed: receiving Intent { act=android.intent.action.PACKAGE_ADDED dat=package:dev.flutter.scenarios.test flg=0x4000010 (has extras) } to com.android.musicfx/.Compatibility$Receiver
+[stdout] 02-15 10:20:36.803  1735  1750 W BroadcastQueue: Background execution not allowed: receiving Intent { act=android.intent.action.PACKAGE_ADDED dat=package:dev.flutter.scenarios.test flg=0x4000010 (has extras) } to com.google.android.gms/.games.chimera.GamesSystemBroadcastReceiverProxy
+[stdout] 02-15 10:20:36.803  1735  1750 W BroadcastQueue: Background execution not allowed: receiving Intent { act=android.intent.action.PACKAGE_ADDED dat=package:dev.flutter.scenarios.test flg=0x4000010 (has extras) } to com.google.android.gms/.gass.chimera.PackageChangeBroadcastReceiver
+[stdout] 02-15 10:20:36.803  1735  1735 I Telecom : DefaultDialerCache: Refreshing default dialer for user 0: now com.google.android.dialer: DDC.oR@AQU
+[stdout] 02-15 10:20:36.803  1735  1750 W BroadcastQueue: Background execution not allowed: receiving Intent { act=android.intent.action.PACKAGE_ADDED dat=package:dev.flutter.scenarios.test flg=0x4000010 (has extras) } to com.google.android.gms/.chimera.GmsIntentOperationService$PersistentTrustedReceiver
+[stdout] 02-15 10:20:36.803  1735  1750 W BroadcastQueue: Background execution not allowed: receiving Intent { act=android.intent.action.PACKAGE_ADDED dat=package:dev.flutter.scenarios.test flg=0x4000010 (has extras) } to com.google.android.googlequicksearchbox/com.google.android.apps.gsa.googlequicksearchbox.GelStubAppWatcher
+[stdout] 02-15 10:20:36.803  1735  1750 W BroadcastQueue: Background execution not allowed: receiving Intent { act=android.intent.action.PACKAGE_ADDED dat=package:dev.flutter.scenarios.test flg=0x4000010 (has extras) } to com.google.android.ims/.receivers.RcsAutoStartReceiver
+[stdout] 02-15 10:20:36.804  1735  1735 V BackupManagerConstants: getFullBackupIntervalMilliseconds(...) returns 86400000
+[stdout] 02-15 10:20:36.807  1735  1751 D AutofillUI: destroySaveUiUiThread(): already destroyed
+[stdout] 02-15 10:20:36.807  1735  1749 D AutofillManagerServiceImpl: Set component for user 0 as AutofillServiceInfo[ServiceInfo{51b1cd5 com.google.android.gms.autofill.service.AutofillService}, settings:com.google.android.gms.autofill.ui.AutofillSettingsActivity, hasCompatPckgs:false]
+[stdout] 02-15 10:20:36.813  1964  1964 D CarrierSvcBindHelper: No carrier app for: 0
+[stdout] 02-15 10:20:36.815  1964  1964 D ImsResolver: maybeAddedImsService, packageName: dev.flutter.scenarios.test
+[stdout] 02-15 10:20:36.815  1964  1964 D CarrierConfigLoader: mHandler: 9 phoneId: 0
+[stdout] 02-15 10:20:36.817  4721  6812 W GCM     : Unexpected forwarded intent: Intent { act=android.intent.action.PACKAGE_ADDED dat=package:dev.flutter.scenarios.test flg=0x4000010 pkg=com.google.android.gms cmp=com.google.android.gms/.chimera.PersistentIntentOperationService (has extras) }
+[stdout] 02-15 10:20:36.817  4721  6800 W GCM     : Unexpected forwarded intent: Intent { act=android.intent.action.PACKAGE_ADDED dat=package:dev.flutter.scenarios.test flg=0x4000010 pkg=com.google.android.gms cmp=com.google.android.gms/.chimera.PersistentIntentOperationService (has extras) }
+[stdout] 02-15 10:20:36.817  4721  6810 I FontLog : Package dev.flutter.scenarios.test has no metadata [CONTEXT service_id=132 ]
+[stdout] 02-15 10:20:36.818  4770  6817 I Auth    : [SupervisedAccountIntentOperation] onHandleIntent(): android.intent.action.PACKAGE_ADDED
+[stdout] 02-15 10:20:36.819  4770  4770 D BoundBrokerSvc: onBind: Intent { act=com.google.android.gms.common.BIND_SHARED_PREFS pkg=com.google.android.gms }
+[stdout] 02-15 10:20:36.819  4770  4770 D BoundBrokerSvc: Loading bound service for intent: Intent { act=com.google.android.gms.common.BIND_SHARED_PREFS pkg=com.google.android.gms }
+[stdout] 02-15 10:20:36.819  4770  6816 I BlockstoreStorage: Clearing Blockstore Data for package dev.flutter.scenarios.test [CONTEXT service_id=258 ]
+[stdout] 02-15 10:20:36.819  4770  6816 I BlockstoreStorage: No metadata found. Skipping deletion. [CONTEXT service_id=258 ]
+[stdout] 02-15 10:20:36.819  4770  4770 D BoundBrokerSvc: onUnbind: Intent { act=com.google.android.gms.common.BIND_SHARED_PREFS pkg=com.google.android.gms }
+[stdout] 02-15 10:20:36.823  4770  4876 E Icing   : Couldn't handle android.intent.action.PACKAGE_ADDED intent due to initialization failure.
+[stdout] 02-15 10:20:36.825  4721  4809 E BluetoothAdapter: Bluetooth binder is null
+[stdout] 02-15 10:20:36.826  2863  2972 D RcsProvisioning: No backup token found
+[stdout] 02-15 10:20:36.826  2863  2972 D RcsProvisioning: Retrieving backup token
+[stdout] 02-15 10:20:36.826  2863  2972 D RcsProvisioning: Exception while getting subscriber Id. Using default
+[stdout] 02-15 10:20:36.826  4721  4809 W ChimeraUtils: Module com.google.android.gms.nearby_en has empty metadata display_name_string_id
+[stdout] 02-15 10:20:36.826  4721  4809 W ChimeraUtils: Module com.google.android.gms.nearby_en has empty metadata display_name_string_id
+[stdout] 02-15 10:20:36.833  4770  4876 I Icing   : IndexChimeraService.getServiceInterface callingPackage=com.google.android.gms componentName=ContactsIndexer serviceId=33
+[stdout] 02-15 10:20:36.833  4770  4876 W Icing   : IndexManager failed to initialize. SearchIndex.API is unavailable.
+[stdout] 02-15 10:20:36.836  4770  6817 W IcingInternalCorpora: Failed to get global search sources
+[stdout] 02-15 10:20:36.863  6827  6827 D AndroidRuntime: >>>>>> START com.android.internal.os.RuntimeInit uid 2000 <<<<<<
+[stdout] 02-15 10:20:36.871  4770  6817 I ChimeraConfigurator: Starting update, reason: 4 urgentFeatures: pay:-1
+[stdout] 02-15 10:20:36.875  4770  6817 W FeatureMgr: Attempted to request and unrequest the same feature: antifingerprinting. Ignoring unrequest.
+[stdout] 02-15 10:20:36.876  4770  4876 W Icing   : IndexManager failed to initialize. AppIndex.API is unavailable.
+[stdout] 02-15 10:20:36.877  4770  4770 W GmscoreIpa: Apps indexing failed. [CONTEXT service_id=255 ]
+[stdout] 02-15 10:20:36.877  4770  4770 W GmscoreIpa: ciev: API: AppIndexing.API is not available on this device. Connection failed with: ConnectionResult{statusCode=API_UNAVAILABLE, resolution=null, message=null}
+[stdout] 02-15 10:20:36.877  4770  4770 W GmscoreIpa: 	at ciez.a(:com.google.android.gms@214515028@21.45.15 (100400-411636772):2)
+[stdout] 02-15 10:20:36.877  4770  4770 W GmscoreIpa: 	at wlo.c(:com.google.android.gms@214515028@21.45.15 (100400-411636772):0)
+[stdout] 02-15 10:20:36.877  4770  4770 W GmscoreIpa: 	at wof.p(:com.google.android.gms@214515028@21.45.15 (100400-411636772):4)
+[stdout] 02-15 10:20:36.877  4770  4770 W GmscoreIpa: 	at wof.d(:com.google.android.gms@214515028@21.45.15 (100400-411636772):0)
+[stdout] 02-15 10:20:36.877  4770  4770 W GmscoreIpa: 	at wof.g(:com.google.android.gms@214515028@21.45.15 (100400-411636772):19)
+[stdout] 02-15 10:20:36.877  4770  4770 W GmscoreIpa: 	at wof.onConnectionFailed(:com.google.android.gms@214515028@21.45.15 (100400-411636772):0)
+[stdout] 02-15 10:20:36.877  4770  4770 W GmscoreIpa: 	at xgi.gE(:com.google.android.gms@214515028@21.45.15 (100400-411636772):0)
+[stdout] 02-15 10:20:36.877  4770  4770 W GmscoreIpa: 	at xfi.b(:com.google.android.gms@214515028@21.45.15 (100400-411636772):1)
+[stdout] 02-15 10:20:36.877  4770  4770 W GmscoreIpa: 	at xez.a(:com.google.android.gms@214515028@21.45.15 (100400-411636772):7)
+[stdout] 02-15 10:20:36.877  4770  4770 W GmscoreIpa: 	at xfc.handleMessage(:com.google.android.gms@214515028@21.45.15 (100400-411636772):23)
+[stdout] 02-15 10:20:36.877  4770  4770 W GmscoreIpa: 	at android.os.Handler.dispatchMessage(Handler.java:106)
+[stdout] 02-15 10:20:36.877  4770  4770 W GmscoreIpa: 	at alyk.jj(:com.google.android.gms@214515028@21.45.15 (100400-411636772):0)
+[stdout] 02-15 10:20:36.877  4770  4770 W GmscoreIpa: 	at alyk.dispatchMessage(:com.google.android.gms@214515028@21.45.15 (100400-411636772):11)
+[stdout] 02-15 10:20:36.877  4770  4770 W GmscoreIpa: 	at android.os.Looper.loop(Looper.java:193)
+[stdout] 02-15 10:20:36.877  4770  4770 W GmscoreIpa: 	at android.os.HandlerThread.run(HandlerThread.java:65)
+[stdout] 02-15 10:20:36.886  4770  4876 I Icing   : IndexChimeraService.getServiceInterface callingPackage=com.google.android.gms componentName=AppsCorpus serviceId=36
+[stdout] 02-15 10:20:36.886  4770  4876 W Icing   : IndexManager failed to initialize. SearchIndex.API is unavailable.
+[stdout] 02-15 10:20:36.886  6827  6827 I app_process: The ClassLoaderContext is a special shared library.
+[stdout] 02-15 10:20:36.886  4770  6820 W IcingInternalCorpora: Couldn't fetch status for corpus apps
+[stdout] 02-15 10:20:36.893  4770  6817 I GmsDebugLogger: [73] 1801
+[stdout] 02-15 10:20:36.895  4770  6817 I GmsDebugLogger: [30] [Pay.optional:214515100000]
+[stdout] 02-15 10:20:36.896  4770  6817 W ChimeraConfigService: Retry attempt was throttled. [CONTEXT service_id=264 ]
+[stdout] 02-15 10:20:36.896  4770  6817 I GmsDebugLogger: [83] 1 [pay]
+[stdout] 02-15 10:20:36.899  6827  6827 D AndroidRuntime: Calling main entry com.android.commands.am.Am
+[stdout] 02-15 10:20:36.903  1735  1836 I ActivityManager: Force stopping dev.flutter.scenarios appid=10098 user=0: start instr
+[stdout] 02-15 10:20:36.908  6840  6840 I utter.scenario: Late-enabling -Xcheck:jni
+[stdout] 02-15 10:20:36.914  1735  1752 I ActivityManager: Start proc 6840:dev.flutter.scenarios/u0a98 for added application dev.flutter.scenarios
+[stdout] 02-15 10:20:36.931  6840  6840 W ActivityThread: Package uses different ABI(s) than its instrumentation: package[dev.flutter.scenarios]: arm64-v8a, null instrumentation[dev.flutter.scenarios.test]: null, null
+[stdout] 02-15 10:20:36.932  6840  6840 I utter.scenario: The ClassLoaderContext is a special shared library.
+[stdout] 02-15 10:20:36.932  6840  6840 I utter.scenario: The ClassLoaderContext is a special shared library.
+[stdout] 02-15 10:20:36.966  2863  2972 D RcsProvisioning: No backup token found
+[stdout] 02-15 10:20:36.968  2863  2972 W RcsProvisioning: Failed to read configuration: /data/user/0/com.google.android.apps.messaging/files/rcsconfig (No such file or directory)
+[stdout] 02-15 10:20:36.968  2863  2972 W RcsProvisioning: java.io.FileNotFoundException: /data/user/0/com.google.android.apps.messaging/files/rcsconfig (No such file or directory)
+[stdout] 02-15 10:20:36.968  2863  2972 W RcsProvisioning: 	at java.io.FileInputStream.open0(Native Method)
+[stdout] 02-15 10:20:36.968  2863  2972 W RcsProvisioning: 	at java.io.FileInputStream.open(FileInputStream.java:231)
+[stdout] 02-15 10:20:36.968  2863  2972 W RcsProvisioning: 	at java.io.FileInputStream.<init>(FileInputStream.java:165)
+[stdout] 02-15 10:20:36.968  2863  2972 W RcsProvisioning: 	at android.app.ContextImpl.openFileInput(ContextImpl.java:560)
+[stdout] 02-15 10:20:36.968  2863  2972 W RcsProvisioning: 	at android.content.ContextWrapper.openFileInput(ContextWrapper.java:202)
+[stdout] 02-15 10:20:36.968  2863  2972 W RcsProvisioning: 	at ion.a(SourceFile:2)
+[stdout] 02-15 10:20:36.968  2863  2972 W RcsProvisioning: 	at idl.a(SourceFile:4)
+[stdout] 02-15 10:20:36.968  2863  2972 W RcsProvisioning: 	at idm.a(SourceFile:7)
+[stdout] 02-15 10:20:36.968  2863  2972 W RcsProvisioning: 	at iez.buildConferencesFileName(SourceFile:30)
+[stdout] 02-15 10:20:36.968  2863  2972 W RcsProvisioning: 	at com.google.android.apps.messaging.rcsmigration.RcsStateProvider.buildRcsState(SourceFile:129)
+[stdout] 02-15 10:20:36.968  2863  2972 W RcsProvisioning: 	at com.google.android.apps.messaging.rcsmigration.RcsStateProvider.getRcsState(SourceFile:6)
+[stdout] 02-15 10:20:36.968  2863  2972 W RcsProvisioning: 	at com.google.android.ims.rcsmigration.IRcsStateProvider$Stub.dispatchTransaction(SourceFile:10)
+[stdout] 02-15 10:20:36.968  2863  2972 W RcsProvisioning: 	at com.google.android.aidl.BaseStub.onTransact(SourceFile:18)
+[stdout] 02-15 10:20:36.968  2863  2972 W RcsProvisioning: 	at android.os.Binder.execTransact(Binder.java:731)
+[stdout] 02-15 10:20:36.968  2863  2972 D RcsProvisioning: Retrieving backup token
+[stdout] 02-15 10:20:36.968  2863  2972 D RcsProvisioning: Exception while getting subscriber Id. Using default
+[stdout] 02-15 10:20:37.038  1735  1941 I GnssLocationProvider: WakeLock acquired by sendMessage(REPORT_SV_STATUS, 0, com.android.server.location.GnssLocationProvider$SvStatusInfo@3bc90c1)
+[stdout] 02-15 10:20:37.039  1735  1749 I GnssLocationProvider: WakeLock released by handleMessage(REPORT_SV_STATUS, 0, com.android.server.location.GnssLocationProvider$SvStatusInfo@3bc90c1)
+[stdout] 02-15 10:20:37.054  6840  6840 I utter.scenario: The ClassLoaderContext is a special shared library.
+[stdout] 02-15 10:20:37.055  6840  6840 I utter.scenario: The ClassLoaderContext is a special shared library.
+[stdout] 02-15 10:20:37.108  2863  2972 D RcsProvisioning: No backup token found
+[stdout] 02-15 10:20:37.108  2863  2972 E CarrierServices: [168] iez.getFile: File not found.: /data/user/0/com.google.android.apps.messaging/files/httpft_pending (No such file or directory)
+[stdout] 02-15 10:20:37.108  2863  2972 E CarrierServices: 	java.io.FileInputStream.open0(Native Method)
+[stdout] 02-15 10:20:37.108  2863  2972 E CarrierServices: 	java.io.FileInputStream.open(FileInputStream.java:231)
+[stdout] 02-15 10:20:37.108  2863  2972 E CarrierServices: 	java.io.FileInputStream.<init>(FileInputStream.java:165)
+[stdout] 02-15 10:20:37.108  2863  2972 E CarrierServices: 	android.app.ContextImpl.openFileInput(ContextImpl.java:560)
+[stdout] 02-15 10:20:37.108  2863  2972 E CarrierServices: 	android.content.ContextWrapper.openFileInput(ContextWrapper.java:202)
+[stdout] 02-15 10:20:37.108  2863  2972 E CarrierServices: 	iez.getFile(SourceFile:20)
+[stdout] 02-15 10:20:37.108  2863  2972 E CarrierServices: 	com.google.android.apps.messaging.rcsmigration.RcsStateProvider.buildRcsState(SourceFile:136)
+[stdout] 02-15 10:20:37.108  2863  2972 E CarrierServices: 	com.google.android.apps.messaging.rcsmigration.RcsStateProvider.getRcsState(SourceFile:6)
+[stdout] 02-15 10:20:37.108  2863  2972 E CarrierServices: 	com.google.android.ims.rcsmigration.IRcsStateProvider$Stub.dispatchTransaction(SourceFile:10)
+[stdout] 02-15 10:20:37.108  2863  2972 E CarrierServices: 	com.google.android.aidl.BaseStub.onTransact(SourceFile:18)
+[stdout] 02-15 10:20:37.108  2863  2972 E CarrierServices: 	android.os.Binder.execTransact(Binder.java:731)
+[stdout] 02-15 10:20:37.109  3621  6687 I CarrierServices: [236] awt.doInBackground: Saving RCS State
+[stdout] 02-15 10:20:37.109  3621  6687 I CarrierServices: [236] awt.doInBackground: Old operation mode: 2
+[stdout] 02-15 10:20:37.109  3621  3621 I CarrierServices: [2] RcsAutoStartReceiver.b: carrierServicesJibeServiceEnabled changed from true to true
+[stdout] 02-15 10:20:37.109  3621  3621 I CarrierServices: [2] RcsAutoStartReceiver.b: enableRcs changed from true to true
+[stdout] 02-15 10:20:37.109  3621  3621 I CarrierServices: [2] RcsAutoStartReceiver.b: RcsAutoStartReceiver triggered. Fetching RCS State. Action: android.intent.action.PACKAGE_ADDED
+[stdout] 02-15 10:20:37.110  3621  3621 I CarrierServices: [2] aws.a: Migration binding to RcsMigrationService
+[stdout] 02-15 10:20:37.111  2863  4286 I CarrierServices: [209] inq.shouldUseCarrierServicesApkForV1Apis: Checking if using CarrierServices.apk is possible. Enabled: true, isAtLeastM: true, runningInsideBugle: true
+[stdout] 02-15 10:20:37.111  2863  4286 I CarrierServices: [209] inq.e: Network Operator: 310260
+[stdout] 02-15 10:20:37.111  2863  4286 I CarrierServices: [209] inq.e: carrierWithOldEcApis: false
+[stdout] 02-15 10:20:37.111  2863  4286 I CarrierServices: [209] inq.e: hasDialerThatSupportsNewEc: false
+[stdout] 02-15 10:20:37.112  2863  4286 W RcsProvisioning: Failed to read configuration: /data/user/0/com.google.android.apps.messaging/files/rcsconfig (No such file or directory)
+[stdout] 02-15 10:20:37.112  2863  4286 W RcsProvisioning: java.io.FileNotFoundException: /data/user/0/com.google.android.apps.messaging/files/rcsconfig (No such file or directory)
+[stdout] 02-15 10:20:37.112  2863  4286 W RcsProvisioning: 	at java.io.FileInputStream.open0(Native Method)
+[stdout] 02-15 10:20:37.112  2863  4286 W RcsProvisioning: 	at java.io.FileInputStream.open(FileInputStream.java:231)
+[stdout] 02-15 10:20:37.112  2863  4286 W RcsProvisioning: 	at java.io.FileInputStream.<init>(FileInputStream.java:165)
+[stdout] 02-15 10:20:37.112  2863  4286 W RcsProvisioning: 	at android.app.ContextImpl.openFileInput(ContextImpl.java:560)
+[stdout] 02-15 10:20:37.112  2863  4286 W RcsProvisioning: 	at android.content.ContextWrapper.openFileInput(ContextWrapper.java:202)
+[stdout] 02-15 10:20:37.112  2863  4286 W RcsProvisioning: 	at ion.a(SourceFile:2)
+[stdout] 02-15 10:20:37.112  2863  4286 W RcsProvisioning: 	at idl.a(SourceFile:4)
+[stdout] 02-15 10:20:37.112  2863  4286 W RcsProvisioning: 	at idm.a(SourceFile:7)
+[stdout] 02-15 10:20:37.112  2863  4286 W RcsProvisioning: 	at com.google.android.apps.messaging.rcsmigration.RcsStateProvider.buildRcsState(SourceFile:81)
+[stdout] 02-15 10:20:37.112  2863  4286 W RcsProvisioning: 	at com.google.android.apps.messaging.rcsmigration.RcsStateProvider.getRcsState(SourceFile:6)
+[stdout] 02-15 10:20:37.112  2863  4286 W RcsProvisioning: 	at com.google.android.ims.rcsmigration.IRcsStateProvider$Stub.dispatchTransaction(SourceFile:10)
+[stdout] 02-15 10:20:37.112  2863  4286 W RcsProvisioning: 	at com.google.android.aidl.BaseStub.onTransact(SourceFile:18)
+[stdout] 02-15 10:20:37.112  2863  4286 W RcsProvisioning: 	at android.os.Binder.execTransact(Binder.java:731)
+[stdout] 02-15 10:20:37.112  2863  4286 D RcsProvisioning: Retrieving backup token
+[stdout] 02-15 10:20:37.112  2863  4286 D RcsProvisioning: Exception while getting subscriber Id. Using default
+[stdout] 02-15 10:20:37.112  3621  6687 I CarrierServices: [236] awt.doInBackground: New operation mode: 2
+[stdout] 02-15 10:20:37.172  6840  6840 W utter.scenario: Accessing hidden method Landroid/app/Instrumentation;->execStartActivity(Landroid/content/Context;Landroid/os/IBinder;Landroid/os/IBinder;Landroid/app/Activity;Landroid/content/Intent;ILandroid/os/Bundle;)Landroid/app/Instrumentation$ActivityResult; (light greylist, linking)
+[stdout] 02-15 10:20:37.172  6840  6840 W utter.scenario: Accessing hidden method Landroid/app/Instrumentation;->execStartActivity(Landroid/content/Context;Landroid/os/IBinder;Landroid/os/IBinder;Ljava/lang/String;Landroid/content/Intent;ILandroid/os/Bundle;)Landroid/app/Instrumentation$ActivityResult; (light greylist, linking)
+[stdout] 02-15 10:20:37.177  6840  6840 I MonitoringInstr: Instrumentation started!
+[stdout] 02-15 10:20:37.178  6840  6840 I MonitoringInstr: Setting context classloader to 'dalvik.system.PathClassLoader[DexPathList[[zip file "/system/framework/android.test.runner.jar", zip file "/system/framework/android.test.mock.jar", zip file "/data/app/dev.flutter.scenarios.test-KKXe9YDNYEL7yOuj25XZ6g==/base.apk", zip file "/data/app/dev.flutter.scenarios-rlxf5VuTV43PTiaP6mOD-g==/base.apk"],nativeLibraryDirectories=[/data/app/dev.flutter.scenarios.test-KKXe9YDNYEL7yOuj25XZ6g==/lib/arm64, /data/app/dev.flutter.scenarios-rlxf5VuTV43PTiaP6mOD-g==/lib/arm64, /data/app/dev.flutter.scenarios.test-KKXe9YDNYEL7yOuj25XZ6g==/base.apk!/lib/arm64-v8a, /data/app/dev.flutter.scenarios-rlxf5VuTV43PTiaP6mOD-g==/base.apk!/lib/arm64-v8a, /system/lib64]]]', Original: 'dalvik.system.PathClassLoader[DexPathList[[zip file "/system/framework/android.test.runner.jar", zip file "/system/framework/android.test.mock.jar", zip file "/data/app/dev.flutter.scenarios.test-KKXe9YDNYEL7yOuj25XZ6g==/base.apk", zip file "/data/app/dev.flutter.scenarios-rlxf5VuTV43PTiaP6mOD-g==/base.apk"],nativeLibraryDirectories=[/data/app/dev.flutter.scenarios.test-KKXe9YDNYEL7yOuj25XZ6g==/lib/arm64, /data/app/dev.flutter.scenarios-rlxf5VuTV43PTiaP6mOD-g==/lib/arm64, /data/app/dev.flutter.scenarios.test-KKXe9YDNYEL7yOuj25XZ6g==/base.apk!/lib/arm64-v8a, /data/app/dev.flutter.scenarios-rlxf5VuTV43PTiaP6mOD-g==/base.apk!/lib/arm64-v8a, /system/lib64]]]'
+[stdout] 02-15 10:20:37.181  6840  6840 I MonitoringInstr: No JSBridge.
+[stdout] 02-15 10:20:37.182  6840  6861 I MonitoringInstr: Setting context classloader to 'dalvik.system.PathClassLoader[DexPathList[[zip file "/system/framework/android.test.runner.jar", zip file "/system/framework/android.test.mock.jar", zip file "/data/app/dev.flutter.scenarios.test-KKXe9YDNYEL7yOuj25XZ6g==/base.apk", zip file "/data/app/dev.flutter.scenarios-rlxf5VuTV43PTiaP6mOD-g==/base.apk"],nativeLibraryDirectories=[/data/app/dev.flutter.scenarios.test-KKXe9YDNYEL7yOuj25XZ6g==/lib/arm64, /data/app/dev.flutter.scenarios-rlxf5VuTV43PTiaP6mOD-g==/lib/arm64, /data/app/dev.flutter.scenarios.test-KKXe9YDNYEL7yOuj25XZ6g==/base.apk!/lib/arm64-v8a, /data/app/dev.flutter.scenarios-rlxf5VuTV43PTiaP6mOD-g==/base.apk!/lib/arm64-v8a, /system/lib64]]]', Original: 'dalvik.system.PathClassLoader[DexPathList[[zip file "/system/framework/android.test.runner.jar", zip file "/system/framework/android.test.mock.jar", zip file "/data/app/dev.flutter.scenarios.test-KKXe9YDNYEL7yOuj25XZ6g==/base.apk", zip file "/data/app/dev.flutter.scenarios-rlxf5VuTV43PTiaP6mOD-g==/base.apk"],nativeLibraryDirectories=[/data/app/dev.flutter.scenarios.test-KKXe9YDNYEL7yOuj25XZ6g==/lib/arm64, /data/app/dev.flutter.scenarios-rlxf5VuTV43PTiaP6mOD-g==/lib/arm64, /data/app/dev.flutter.scenarios.test-KKXe9YDNYEL7yOuj25XZ6g==/base.apk!/lib/arm64-v8a, /data/app/dev.flutter.scenarios-rlxf5VuTV43PTiaP6mOD-g==/base.apk!/lib/arm64-v8a, /system/lib64]]]'
+[stdout] 02-15 10:20:37.183  6840  6863 I ResourceExtractor: Resource version mismatch res_timestamp-1-1708021236564
+[stdout] 02-15 10:20:37.187  6840  6861 I UsageTrackerFacilitator: Usage tracking enabled
+[stdout] 02-15 10:20:37.188  6840  6861 I TestRequestBuilder: Scanning classpath to find tests in paths [/data/app/dev.flutter.scenarios.test-KKXe9YDNYEL7yOuj25XZ6g==/base.apk]
+[stdout] 02-15 10:20:37.188  6840  6861 W utter.scenario: Opening an oat file without a class loader. Are you using the deprecated DexFile APIs?
+[stdout] 02-15 10:20:37.229  6840  6863 I ResourceExtractor: Extracted baseline resource assets/flutter_assets/kernel_blob.bin
+[stdout] 02-15 10:20:37.246  2863  4286 D RcsProvisioning: No backup token found
+[stdout] 02-15 10:20:37.246  2863  4286 D RcsProvisioning: Retrieving backup token
+[stdout] 02-15 10:20:37.246  2863  4286 D RcsProvisioning: Exception while getting subscriber Id. Using default
+[stdout] 02-15 10:20:37.307  6840  6863 I ResourceExtractor: Extracted baseline resource assets/flutter_assets/isolate_snapshot_data
+[stdout] 02-15 10:20:37.364  6840  6861 D TestExecutor: Adding listener androidx.test.internal.runner.listener.LogRunListener
+[stdout] 02-15 10:20:37.364  6840  6861 D TestExecutor: Adding listener androidx.test.internal.runner.listener.InstrumentationResultPrinter
+[stdout] 02-15 10:20:37.364  6840  6861 D TestExecutor: Adding listener androidx.test.internal.runner.listener.ActivityFinisherRunListener
+[stdout] 02-15 10:20:37.369  6840  6861 I TestRunner: run started: 66 tests
+[stdout] 02-15 10:20:37.371  6840  6861 I TestRunner: started: smokeTestEngineLaunch(dev.flutter.scenarios.EngineLaunchE2ETest)
+[stdout] 02-15 10:20:37.371  6840  6840 I MonitoringInstr: Activities that are still in CREATED to STOPPED: 0
+[stdout] 02-15 10:20:37.372  6840  6840 W utter.scenarios: type=1400 audit(0.0:71): avc: denied { read } for name="max_map_count" dev="proc" ino=60316 scontext=u:r:untrusted_app:s0:c98,c256,c512,c768 tcontext=u:object_r:proc_max_map_count:s0 tclass=file permissive=0
+[stdout] 02-15 10:20:37.386  2863  4286 D RcsProvisioning: No backup token found
+[stdout] 02-15 10:20:37.387  6840  6840 D HostConnection: HostConnection::get() New Host Connection established 0x758aed7120, tid 6840
+[stdout] 02-15 10:20:37.388  6840  6840 D HostConnection: HostComposition ext ANDROID_EMU_CHECKSUM_HELPER_v1 ANDROID_EMU_sync_buffer_data GL_OES_EGL_image_external_essl3 GL_OES_vertex_array_object GL_KHR_texture_compression_astc_ldr ANDROID_EMU_host_side_tracing ANDROID_EMU_gles_max_version_3_0 
+[stdout] 02-15 10:20:37.388  2863  4286 W RcsProvisioning: Failed to read configuration: /data/user/0/com.google.android.apps.messaging/files/rcsconfig (No such file or directory)
+[stdout] 02-15 10:20:37.389  2863  4286 W RcsProvisioning: java.io.FileNotFoundException: /data/user/0/com.google.android.apps.messaging/files/rcsconfig (No such file or directory)
+[stdout] 02-15 10:20:37.389  2863  4286 W RcsProvisioning: 	at java.io.FileInputStream.open0(Native Method)
+[stdout] 02-15 10:20:37.389  2863  4286 W RcsProvisioning: 	at java.io.FileInputStream.open(FileInputStream.java:231)
+[stdout] 02-15 10:20:37.389  2863  4286 W RcsProvisioning: 	at java.io.FileInputStream.<init>(FileInputStream.java:165)
+[stdout] 02-15 10:20:37.389  2863  4286 W RcsProvisioning: 	at android.app.ContextImpl.openFileInput(ContextImpl.java:560)
+[stdout] 02-15 10:20:37.389  2863  4286 W RcsProvisioning: 	at android.content.ContextWrapper.openFileInput(ContextWrapper.java:202)
+[stdout] 02-15 10:20:37.389  2863  4286 W RcsProvisioning: 	at ion.a(SourceFile:2)
+[stdout] 02-15 10:20:37.389  2863  4286 W RcsProvisioning: 	at idl.a(SourceFile:4)
+[stdout] 02-15 10:20:37.389  2863  4286 W RcsProvisioning: 	at idm.a(SourceFile:7)
+[stdout] 02-15 10:20:37.389  2863  4286 W RcsProvisioning: 	at iez.buildConferencesFileName(SourceFile:30)
+[stdout] 02-15 10:20:37.389  2863  4286 W RcsProvisioning: 	at com.google.android.apps.messaging.rcsmigration.RcsStateProvider.buildRcsState(SourceFile:129)
+[stdout] 02-15 10:20:37.389  2863  4286 W RcsProvisioning: 	at com.google.android.apps.messaging.rcsmigration.RcsStateProvider.getRcsState(SourceFile:6)
+[stdout] 02-15 10:20:37.389  2863  4286 W RcsProvisioning: 	at com.google.android.ims.rcsmigration.IRcsStateProvider$Stub.dispatchTransaction(SourceFile:10)
+[stdout] 02-15 10:20:37.389  2863  4286 W RcsProvisioning: 	at com.google.android.aidl.BaseStub.onTransact(SourceFile:18)
+[stdout] 02-15 10:20:37.389  2863  4286 W RcsProvisioning: 	at android.os.Binder.execTransact(Binder.java:731)
+[stdout] 02-15 10:20:37.389  2863  4286 D RcsProvisioning: Retrieving backup token
+[stdout] 02-15 10:20:37.389  2863  4286 D RcsProvisioning: Exception while getting subscriber Id. Using default
+[stdout] 02-15 10:20:37.389  6840  6840 I ConfigStore: android::hardware::configstore::V1_0::ISurfaceFlingerConfigs::hasWideColorDisplay retrieved: 0
+[stdout] 02-15 10:20:37.389  6840  6840 I ConfigStore: android::hardware::configstore::V1_0::ISurfaceFlingerConfigs::hasHDRDisplay retrieved: 0
+[stdout] 02-15 10:20:37.390  6840  6840 D eglCodecCommon: setVertexArrayObject: set vao to 0 (0) 0 0
+[stdout] 02-15 10:20:37.390  6840  6840 D EGL_emulation: eglCreateContext: 0x758aed8020: maj 3 min 0 rcv 3
+[stdout] 02-15 10:20:37.390  6840  6840 D eglCodecCommon: setVertexArrayObject: set vao to 0 (0) 0 0
+[stdout] 02-15 10:20:37.390  6840  6840 D EGL_emulation: eglCreateContext: 0x758aed80c0: maj 3 min 0 rcv 3
+[stdout] 02-15 10:20:37.391  6840  6869 D HostConnection: HostConnection::get() New Host Connection established 0x758aed8340, tid 6869
+[stdout] 02-15 10:20:37.391  6840  6869 D HostConnection: HostComposition ext ANDROID_EMU_CHECKSUM_HELPER_v1 ANDROID_EMU_sync_buffer_data GL_OES_EGL_image_external_essl3 GL_OES_vertex_array_object GL_KHR_texture_compression_astc_ldr ANDROID_EMU_host_side_tracing ANDROID_EMU_gles_max_version_3_0 
+[stdout] 02-15 10:20:37.392  6840  6869 D EGL_emulation: eglMakeCurrent: 0x758aed80c0: ver 3 0 (tinfo 0x75894bcf60)
+[stdout] 02-15 10:20:37.430  6840  6840 E GeneratedPluginsRegister: Tried to automatically register plugins with FlutterEngine (io.flutter.embedding.engine.FlutterEngine@144d737) but could not find or invoke the GeneratedPluginRegistrant.
+[stdout] 02-15 10:20:37.431  6840  6840 E GeneratedPluginsRegister: Received exception while registering
+[stdout] 02-15 10:20:37.431  6840  6840 E GeneratedPluginsRegister: java.lang.ClassNotFoundException: io.flutter.plugins.GeneratedPluginRegistrant
+[stdout] 02-15 10:20:37.431  6840  6840 E GeneratedPluginsRegister: 	at java.lang.Class.classForName(Native Method)
+[stdout] 02-15 10:20:37.431  6840  6840 E GeneratedPluginsRegister: 	at java.lang.Class.forName(Class.java:453)
+[stdout] 02-15 10:20:37.431  6840  6840 E GeneratedPluginsRegister: 	at java.lang.Class.forName(Class.java:378)
+[stdout] 02-15 10:20:37.431  6840  6840 E GeneratedPluginsRegister: 	at io.flutter.embedding.engine.plugins.util.GeneratedPluginRegister.registerGeneratedPlugins(GeneratedPluginRegister.java:77)
+[stdout] 02-15 10:20:37.431  6840  6840 E GeneratedPluginsRegister: 	at io.flutter.embedding.engine.FlutterEngine.<init>(FlutterEngine.java:385)
+[stdout] 02-15 10:20:37.431  6840  6840 E GeneratedPluginsRegister: 	at io.flutter.embedding.engine.FlutterEngine.<init>(FlutterEngine.java:287)
+[stdout] 02-15 10:20:37.431  6840  6840 E GeneratedPluginsRegister: 	at io.flutter.embedding.engine.FlutterEngine.<init>(FlutterEngine.java:268)
+[stdout] 02-15 10:20:37.431  6840  6840 E GeneratedPluginsRegister: 	at io.flutter.embedding.engine.FlutterEngine.<init>(FlutterEngine.java:248)
+[stdout] 02-15 10:20:37.431  6840  6840 E GeneratedPluginsRegister: 	at io.flutter.embedding.engine.FlutterEngine.<init>(FlutterEngine.java:168)
+[stdout] 02-15 10:20:37.431  6840  6840 E GeneratedPluginsRegister: 	at io.flutter.embedding.engine.FlutterEngine.<init>(FlutterEngine.java:159)
+[stdout] 02-15 10:20:37.431  6840  6840 E GeneratedPluginsRegister: 	at dev.flutter.scenarios.EngineLaunchE2ETest.lambda$smokeTestEngineLaunch$0(EngineLaunchE2ETest.java:36)
+[stdout] 02-15 10:20:37.431  6840  6840 E GeneratedPluginsRegister: 	at dev.flutter.scenarios.EngineLaunchE2ETest$$ExternalSyntheticLambda0.run(Unknown Source:4)
+[stdout] 02-15 10:20:37.431  6840  6840 E GeneratedPluginsRegister: 	at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:458)
+[stdout] 02-15 10:20:37.431  6840  6840 E GeneratedPluginsRegister: 	at java.util.concurrent.FutureTask.run(FutureTask.java:266)
+[stdout] 02-15 10:20:37.431  6840  6840 E GeneratedPluginsRegister: 	at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:458)
+[stdout] 02-15 10:20:37.431  6840  6840 E GeneratedPluginsRegister: 	at java.util.concurrent.FutureTask.run(FutureTask.java:266)
+[stdout] 02-15 10:20:37.431  6840  6840 E GeneratedPluginsRegister: 	at android.app.Instrumentation$SyncRunnable.run(Instrumentation.java:2163)
+[stdout] 02-15 10:20:37.431  6840  6840 E GeneratedPluginsRegister: 	at android.os.Handler.handleCallback(Handler.java:873)
+[stdout] 02-15 10:20:37.431  6840  6840 E GeneratedPluginsRegister: 	at android.os.Handler.dispatchMessage(Handler.java:99)
+[stdout] 02-15 10:20:37.431  6840  6840 E GeneratedPluginsRegister: 	at android.os.Looper.loop(Looper.java:193)
+[stdout] 02-15 10:20:37.431  6840  6840 E GeneratedPluginsRegister: 	at android.app.ActivityThread.main(ActivityThread.java:6669)
+[stdout] 02-15 10:20:37.431  6840  6840 E GeneratedPluginsRegister: 	at java.lang.reflect.Method.invoke(Native Method)
+[stdout] 02-15 10:20:37.431  6840  6840 E GeneratedPluginsRegister: 	at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:493)
+[stdout] 02-15 10:20:37.431  6840  6840 E GeneratedPluginsRegister: 	at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:858)
+[stdout] 02-15 10:20:37.431  6840  6840 E GeneratedPluginsRegister: Caused by: java.lang.ClassNotFoundException: Didn't find class "io.flutter.plugins.GeneratedPluginRegistrant" on path: DexPathList[[zip file "/system/framework/android.test.runner.jar", zip file "/system/framework/android.test.mock.jar", zip file "/data/app/dev.flutter.scenarios.test-KKXe9YDNYEL7yOuj25XZ6g==/base.apk", zip file "/data/app/dev.flutter.scenarios-rlxf5VuTV43PTiaP6mOD-g==/base.apk"],nativeLibraryDirectories=[/data/app/dev.flutter.scenarios.test-KKXe9YDNYEL7yOuj25XZ6g==/lib/arm64, /data/app/dev.flutter.scenarios-rlxf5VuTV43PTiaP6mOD-g==/lib/arm64, /data/app/dev.flutter.scenarios.test-KKXe9YDNYEL7yOuj25XZ6g==/base.apk!/lib/arm64-v8a, /data/app/dev.flutter.scenarios-rlxf5VuTV43PTiaP6mOD-g==/base.apk!/lib/arm64-v8a, /system/lib64]]
+[stdout] 02-15 10:20:37.431  6840  6840 E GeneratedPluginsRegister: 	at dalvik.system.BaseDexClassLoader.findClass(BaseDexClassLoader.java:134)
+[stdout] 02-15 10:20:37.431  6840  6840 E GeneratedPluginsRegister: 	at java.lang.ClassLoader.loadClass(ClassLoader.java:379)
+[stdout] 02-15 10:20:37.431  6840  6840 E GeneratedPluginsRegister: 	at java.lang.ClassLoader.loadClass(ClassLoader.java:312)
+[stdout] 02-15 10:20:37.431  6840  6840 E GeneratedPluginsRegister: 	... 24 more
+[stdout] 02-15 10:20:37.463  6840  6876 I flutter : The Dart VM service is listening on http://127.0.0.1:46424/ubaMX7XzZVU=/
+[stdout] 02-15 10:20:37.465  6840  6867 W utter.scenario: Accessing hidden method Landroid/os/Trace;->asyncTraceBegin(JLjava/lang/String;I)V (light greylist, reflection)
+[stdout] 02-15 10:20:37.465  6840  6840 W utter.scenario: Accessing hidden method Landroid/os/Trace;->asyncTraceEnd(JLjava/lang/String;I)V (light greylist, reflection)
+[stdout] 02-15 10:20:37.470  6840  6861 I TestRunner: finished: smokeTestEngineLaunch(dev.flutter.scenarios.EngineLaunchE2ETest)
+[stdout] 02-15 10:20:37.470  6840  6840 I MonitoringInstr: Activities that are still in CREATED to STOPPED: 0
+[stdout] 02-15 10:20:37.470  6840  6861 I TestRunner: started: useAppContext(dev.flutter.scenarios.ExampleInstrumentedTest)
+[stdout] 02-15 10:20:37.471  6840  6840 I MonitoringInstr: Activities that are still in CREATED to STOPPED: 0
+[stdout] 02-15 10:20:37.471  6840  6861 I TestRunner: finished: useAppContext(dev.flutter.scenarios.ExampleInstrumentedTest)
+[stdout] 02-15 10:20:37.471  6840  6840 I MonitoringInstr: Activities that are still in CREATED to STOPPED: 0
+[stdout] 02-15 10:20:37.472  6840  6861 I TestRunner: started: testCroppedRotatedMediaSurface_bottomLeft_90(dev.flutter.scenariosui.ExternalTextureTests)
+[stdout] 02-15 10:20:37.472  6840  6840 I MonitoringInstr: Activities that are still in CREATED to STOPPED: 0
+[stdout] 02-15 10:20:37.474  1735  1836 I ActivityManager: START u0 {act=android.intent.action.MAIN flg=0x14000000 cmp=dev.flutter.scenarios/.ExternalTextureFlutterActivity (has extras)} from uid 10098
+[stdout] 02-15 10:20:37.479  6840  6840 W ActivityThread: handleWindowVisibility: no activity for token android.os.BinderProxy@22f6c0e
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario: Rejecting re-init on previously-failed class java.lang.Class<io.flutter.embedding.android.FlutterActivity$1>: java.lang.NoClassDefFoundError: Failed resolution of: Landroid/window/OnBackInvokedCallback;
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at java.lang.Object java.lang.Class.newInstance() (Class.java:-2)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at android.app.Activity android.app.AppComponentFactory.instantiateActivity(java.lang.ClassLoader, java.lang.String, android.content.Intent) (AppComponentFactory.java:69)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at android.app.Activity androidx.core.app.CoreComponentFactory.instantiateActivity(java.lang.ClassLoader, java.lang.String, android.content.Intent) (CoreComponentFactory.java:45)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at android.app.Activity android.app.Instrumentation.newActivity(java.lang.ClassLoader, java.lang.String, android.content.Intent) (Instrumentation.java:1215)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at android.app.Activity androidx.test.runner.MonitoringInstrumentation.newActivity(java.lang.ClassLoader, java.lang.String, android.content.Intent) (MonitoringInstrumentation.java:789)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at android.app.Activity android.app.ActivityThread.performLaunchActivity(android.app.ActivityThread$ActivityClientRecord, android.content.Intent) (ActivityThread.java:2831)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at android.app.Activity android.app.ActivityThread.handleLaunchActivity(android.app.ActivityThread$ActivityClientRecord, android.app.servertransaction.PendingTransactionActions, android.content.Intent) (ActivityThread.java:3048)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void android.app.servertransaction.LaunchActivityItem.execute(android.app.ClientTransactionHandler, android.os.IBinder, android.app.servertransaction.PendingTransactionActions) (LaunchActivityItem.java:78)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void android.app.servertransaction.TransactionExecutor.executeCallbacks(android.app.servertransaction.ClientTransaction) (TransactionExecutor.java:108)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void android.app.servertransaction.TransactionExecutor.execute(android.app.servertransaction.ClientTransaction) (TransactionExecutor.java:68)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void android.app.ActivityThread$H.handleMessage(android.os.Message) (ActivityThread.java:1808)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void android.os.Handler.dispatchMessage(android.os.Message) (Handler.java:106)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void android.os.Looper.loop() (Looper.java:193)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void android.app.ActivityThread.main(java.lang.String[]) (ActivityThread.java:6669)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at java.lang.Object java.lang.reflect.Method.invoke(java.lang.Object, java.lang.Object[]) (Method.java:-2)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run() (RuntimeInit.java:493)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void com.android.internal.os.ZygoteInit.main(java.lang.String[]) (ZygoteInit.java:858)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario: Caused by: java.lang.ClassNotFoundException: Didn't find class "android.window.OnBackInvokedCallback" on path: DexPathList[[zip file "/system/framework/android.test.runner.jar", zip file "/system/framework/android.test.mock.jar", zip file "/data/app/dev.flutter.scenarios.test-KKXe9YDNYEL7yOuj25XZ6g==/base.apk", zip file "/data/app/dev.flutter.scenarios-rlxf5VuTV43PTiaP6mOD-g==/base.apk"],nativeLibraryDirectories=[/data/app/dev.flutter.scenarios.test-KKXe9YDNYEL7yOuj25XZ6g==/lib/arm64, /data/app/dev.flutter.scenarios-rlxf5VuTV43PTiaP6mOD-g==/lib/arm64, /data/app/dev.flutter.scenarios.test-KKXe9YDNYEL7yOuj25XZ6g==/base.apk!/lib/arm64-v8a, /data/app/dev.flutter.scenarios-rlxf5VuTV43PTiaP6mOD-g==/base.apk!/lib/arm64-v8a, /system/lib64]]
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at java.lang.Class dalvik.system.BaseDexClassLoader.findClass(java.lang.String) (BaseDexClassLoader.java:134)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at java.lang.Class java.lang.ClassLoader.loadClass(java.lang.String, boolean) (ClassLoader.java:379)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at java.lang.Class java.lang.ClassLoader.loadClass(java.lang.String) (ClassLoader.java:312)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at java.lang.Object java.lang.Class.newInstance() (Class.java:-2)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at android.app.Activity android.app.AppComponentFactory.instantiateActivity(java.lang.ClassLoader, java.lang.String, android.content.Intent) (AppComponentFactory.java:69)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at android.app.Activity androidx.core.app.CoreComponentFactory.instantiateActivity(java.lang.ClassLoader, java.lang.String, android.content.Intent) (CoreComponentFactory.java:45)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at android.app.Activity android.app.Instrumentation.newActivity(java.lang.ClassLoader, java.lang.String, android.content.Intent) (Instrumentation.java:1215)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at android.app.Activity androidx.test.runner.MonitoringInstrumentation.newActivity(java.lang.ClassLoader, java.lang.String, android.content.Intent) (MonitoringInstrumentation.java:789)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at android.app.Activity android.app.ActivityThread.performLaunchActivity(android.app.ActivityThread$ActivityClientRecord, android.content.Intent) (ActivityThread.java:2831)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at android.app.Activity android.app.ActivityThread.handleLaunchActivity(android.app.ActivityThread$ActivityClientRecord, android.app.servertransaction.PendingTransactionActions, android.content.Intent) (ActivityThread.java:3048)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void android.app.servertransaction.LaunchActivityItem.execute(android.app.ClientTransactionHandler, android.os.IBinder, android.app.servertransaction.PendingTransactionActions) (LaunchActivityItem.java:78)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void android.app.servertransaction.TransactionExecutor.executeCallbacks(android.app.servertransaction.ClientTransaction) (TransactionExecutor.java:108)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void android.app.servertransaction.TransactionExecutor.execute(android.app.servertransaction.ClientTransaction) (TransactionExecutor.java:68)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void android.app.ActivityThread$H.handleMessage(android.os.Message) (ActivityThread.java:1808)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void android.os.Handler.dispatchMessage(android.os.Message) (Handler.java:106)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void android.os.Looper.loop() (Looper.java:193)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void android.app.ActivityThread.main(java.lang.String[]) (ActivityThread.java:6669)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at java.lang.Object java.lang.reflect.Method.invoke(java.lang.Object, java.lang.Object[]) (Method.java:-2)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run() (RuntimeInit.java:493)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void com.android.internal.os.ZygoteInit.main(java.lang.String[]) (ZygoteInit.java:858)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario: 
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario: Rejecting re-init on previously-failed class java.lang.Class<io.flutter.embedding.android.FlutterActivity$1>: java.lang.NoClassDefFoundError: Failed resolution of: Landroid/window/OnBackInvokedCallback;
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at java.lang.Object java.lang.Class.newInstance() (Class.java:-2)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at android.app.Activity android.app.AppComponentFactory.instantiateActivity(java.lang.ClassLoader, java.lang.String, android.content.Intent) (AppComponentFactory.java:69)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at android.app.Activity androidx.core.app.CoreComponentFactory.instantiateActivity(java.lang.ClassLoader, java.lang.String, android.content.Intent) (CoreComponentFactory.java:45)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at android.app.Activity android.app.Instrumentation.newActivity(java.lang.ClassLoader, java.lang.String, android.content.Intent) (Instrumentation.java:1215)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at android.app.Activity androidx.test.runner.MonitoringInstrumentation.newActivity(java.lang.ClassLoader, java.lang.String, android.content.Intent) (MonitoringInstrumentation.java:789)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at android.app.Activity android.app.ActivityThread.performLaunchActivity(android.app.ActivityThread$ActivityClientRecord, android.content.Intent) (ActivityThread.java:2831)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at android.app.Activity android.app.ActivityThread.handleLaunchActivity(android.app.ActivityThread$ActivityClientRecord, android.app.servertransaction.PendingTransactionActions, android.content.Intent) (ActivityThread.java:3048)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void android.app.servertransaction.LaunchActivityItem.execute(android.app.ClientTransactionHandler, android.os.IBinder, android.app.servertransaction.PendingTransactionActions) (LaunchActivityItem.java:78)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void android.app.servertransaction.TransactionExecutor.executeCallbacks(android.app.servertransaction.ClientTransaction) (TransactionExecutor.java:108)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void android.app.servertransaction.TransactionExecutor.execute(android.app.servertransaction.ClientTransaction) (TransactionExecutor.java:68)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void android.app.ActivityThread$H.handleMessage(android.os.Message) (ActivityThread.java:1808)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void android.os.Handler.dispatchMessage(android.os.Message) (Handler.java:106)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void android.os.Looper.loop() (Looper.java:193)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void android.app.ActivityThread.main(java.lang.String[]) (ActivityThread.java:6669)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at java.lang.Object java.lang.reflect.Method.invoke(java.lang.Object, java.lang.Object[]) (Method.java:-2)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run() (RuntimeInit.java:493)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void com.android.internal.os.ZygoteInit.main(java.lang.String[]) (ZygoteInit.java:858)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario: Caused by: java.lang.ClassNotFoundException: Didn't find class "android.window.OnBackInvokedCallback" on path: DexPathList[[zip file "/system/framework/android.test.runner.jar", zip file "/system/framework/android.test.mock.jar", zip file "/data/app/dev.flutter.scenarios.test-KKXe9YDNYEL7yOuj25XZ6g==/base.apk", zip file "/data/app/dev.flutter.scenarios-rlxf5VuTV43PTiaP6mOD-g==/base.apk"],nativeLibraryDirectories=[/data/app/dev.flutter.scenarios.test-KKXe9YDNYEL7yOuj25XZ6g==/lib/arm64, /data/app/dev.flutter.scenarios-rlxf5VuTV43PTiaP6mOD-g==/lib/arm64, /data/app/dev.flutter.scenarios.test-KKXe9YDNYEL7yOuj25XZ6g==/base.apk!/lib/arm64-v8a, /data/app/dev.flutter.scenarios-rlxf5VuTV43PTiaP6mOD-g==/base.apk!/lib/arm64-v8a, /system/lib64]]
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at java.lang.Class dalvik.system.BaseDexClassLoader.findClass(java.lang.String) (BaseDexClassLoader.java:134)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at java.lang.Class java.lang.ClassLoader.loadClass(java.lang.String, boolean) (ClassLoader.java:379)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at java.lang.Class java.lang.ClassLoader.loadClass(java.lang.String) (ClassLoader.java:312)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at java.lang.Object java.lang.Class.newInstance() (Class.java:-2)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at android.app.Activity android.app.AppComponentFactory.instantiateActivity(java.lang.ClassLoader, java.lang.String, android.content.Intent) (AppComponentFactory.java:69)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at android.app.Activity androidx.core.app.CoreComponentFactory.instantiateActivity(java.lang.ClassLoader, java.lang.String, android.content.Intent) (CoreComponentFactory.java:45)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at android.app.Activity android.app.Instrumentation.newActivity(java.lang.ClassLoader, java.lang.String, android.content.Intent) (Instrumentation.java:1215)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at android.app.Activity androidx.test.runner.MonitoringInstrumentation.newActivity(java.lang.ClassLoader, java.lang.String, android.content.Intent) (MonitoringInstrumentation.java:789)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at android.app.Activity android.app.ActivityThread.performLaunchActivity(android.app.ActivityThread$ActivityClientRecord, android.content.Intent) (ActivityThread.java:2831)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at android.app.Activity android.app.ActivityThread.handleLaunchActivity(android.app.ActivityThread$ActivityClientRecord, android.app.servertransaction.PendingTransactionActions, android.content.Intent) (ActivityThread.java:3048)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void android.app.servertransaction.LaunchActivityItem.execute(android.app.ClientTransactionHandler, android.os.IBinder, android.app.servertransaction.PendingTransactionActions) (LaunchActivityItem.java:78)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void android.app.servertransaction.TransactionExecutor.executeCallbacks(android.app.servertransaction.ClientTransaction) (TransactionExecutor.java:108)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void android.app.servertransaction.TransactionExecutor.execute(android.app.servertransaction.ClientTransaction) (TransactionExecutor.java:68)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void android.app.ActivityThread$H.handleMessage(android.os.Message) (ActivityThread.java:1808)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void android.os.Handler.dispatchMessage(android.os.Message) (Handler.java:106)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void android.os.Looper.loop() (Looper.java:193)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void android.app.ActivityThread.main(java.lang.String[]) (ActivityThread.java:6669)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at java.lang.Object java.lang.reflect.Method.invoke(java.lang.Object, java.lang.Object[]) (Method.java:-2)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run() (RuntimeInit.java:493)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario:   at void com.android.internal.os.ZygoteInit.main(java.lang.String[]) (ZygoteInit.java:858)
+[stdout] 02-15 10:20:37.482  6840  6840 I utter.scenario: 
+[stdout] 02-15 10:20:37.484  6840  6840 D LifecycleMonitor: Lifecycle status change: dev.flutter.scenarios.ExternalTextureFlutterActivity@8bbd5c5 in: PRE_ON_CREATE
+[stdout] 02-15 10:20:37.486  6840  6840 D eglCodecCommon: setVertexArrayObject: set vao to 0 (0) 0 0
+[stdout] 02-15 10:20:37.486  6840  6840 D EGL_emulation: eglCreateContext: 0x758aed82a0: maj 3 min 0 rcv 3
+[stdout] 02-15 10:20:37.486  6840  6840 D eglCodecCommon: setVertexArrayObject: set vao to 0 (0) 0 0
+[stdout] 02-15 10:20:37.486  6840  6840 D EGL_emulation: eglCreateContext: 0x758aed8f20: maj 3 min 0 rcv 3
+[stdout] 02-15 10:20:37.487  6840  6882 D HostConnection: HostConnection::get() New Host Connection established 0x758c844ee0, tid 6882
+[stdout] 02-15 10:20:37.495  6840  6882 D HostConnection: HostComposition ext ANDROID_EMU_CHECKSUM_HELPER_v1 ANDROID_EMU_sync_buffer_data GL_OES_EGL_image_external_essl3 GL_OES_vertex_array_object GL_KHR_texture_compression_astc_ldr ANDROID_EMU_host_side_tracing ANDROID_EMU_gles_max_version_3_0 
+[stdout] 02-15 10:20:37.495  6840  6882 D EGL_emulation: eglMakeCurrent: 0x758aed8f20: ver 3 0 (tinfo 0x7575cee720)
+[stdout] 02-15 10:20:37.502  6840  6840 D OpenGLRenderer: Skia GL Pipeline
+[stdout] 02-15 10:20:37.508  1384  2162 D gralloc_ranchu: gralloc_alloc: Creating ashmem region of size 10371072
+[stdout] 02-15 10:20:37.522  6840  6840 W utter.scenario: Accessing hidden method Landroid/view/accessibility/AccessibilityNodeInfo;->getSourceNodeId()J (light greylist, reflection)
+[stdout] 02-15 10:20:37.522  6840  6840 W utter.scenario: Accessing hidden method Landroid/view/accessibility/AccessibilityRecord;->getSourceNodeId()J (light greylist, reflection)
+[stdout] 02-15 10:20:37.522  6840  6840 W utter.scenario: Accessing hidden field Landroid/view/accessibility/AccessibilityNodeInfo;->mChildNodeIds:Landroid/util/LongArray; (light greylist, reflection)
+[stdout] 02-15 10:20:37.522  6840  6840 W utter.scenario: Accessing hidden method Landroid/util/LongArray;->get(I)J (light greylist, reflection)
+[stdout] 02-15 10:20:37.524  2863  4286 D RcsProvisioning: No backup token found
+[stdout] 02-15 10:20:37.524  2863  4286 E CarrierServices: [209] iez.getFile: File not found.: /data/user/0/com.google.android.apps.messaging/files/httpft_pending (No such file or directory)
+[stdout] 02-15 10:20:37.524  2863  4286 E CarrierServices: 	java.io.FileInputStream.open0(Native Method)
+[stdout] 02-15 10:20:37.524  2863  4286 E CarrierServices: 	java.io.FileInputStream.open(FileInputStream.java:231)
+[stdout] 02-15 10:20:37.524  2863  4286 E CarrierServices: 	java.io.FileInputStream.<init>(FileInputStream.java:165)
+[stdout] 02-15 10:20:37.524  2863  4286 E CarrierServices: 	android.app.ContextImpl.openFileInput(ContextImpl.java:560)
+[stdout] 02-15 10:20:37.524  2863  4286 E CarrierServices: 	android.content.ContextWrapper.openFileInput(ContextWrapper.java:202)
+[stdout] 02-15 10:20:37.524  2863  4286 E CarrierServices: 	iez.getFile(SourceFile:20)
+[stdout] 02-15 10:20:37.524  2863  4286 E CarrierServices: 	com.google.android.apps.messaging.rcsmigration.RcsStateProvider.buildRcsState(SourceFile:136)
+[stdout] 02-15 10:20:37.524  2863  4286 E CarrierServices: 	com.google.android.apps.messaging.rcsmigration.RcsStateProvider.getRcsState(SourceFile:6)
+[stdout] 02-15 10:20:37.524  2863  4286 E CarrierServices: 	com.google.android.ims.rcsmigration.IRcsStateProvider$Stub.dispatchTransaction(SourceFile:10)
+[stdout] 02-15 10:20:37.524  2863  4286 E CarrierServices: 	com.google.android.aidl.BaseStub.onTransact(SourceFile:18)
+[stdout] 02-15 10:20:37.524  2863  4286 E CarrierServices: 	android.os.Binder.execTransact(Binder.java:731)
+[stdout] 02-15 10:20:37.525  3621  6584 I CarrierServices: [234] awt.doInBackground: Saving RCS State
+[stdout] 02-15 10:20:37.525  3621  6584 I CarrierServices: [234] awt.doInBackground: Old operation mode: 2
+[stdout] 02-15 10:20:37.525  3621  6584 I CarrierServices: [234] awt.doInBackground: New operation mode: 2
+[stdout] 02-15 10:20:37.526  2863  4286 I CarrierServices: [209] RcsStateProvider.onMigrationComplete: Migration complete.
+[stdout] 02-15 10:20:37.526  2863  4286 I CarrierServices: [209] inq.shouldUseCarrierServicesApkForV1Apis: Checking if using CarrierServices.apk is possible. Enabled: true, isAtLeastM: true, runningInsideBugle: true
+[stdout] 02-15 10:20:37.527  2863  4286 I CarrierServices: [209] inq.e: Network Operator: 310260
+[stdout] 02-15 10:20:37.527  2863  4286 I CarrierServices: [209] inq.e: carrierWithOldEcApis: false
+[stdout] 02-15 10:20:37.527  2863  4286 I CarrierServices: [209] inq.e: hasDialerThatSupportsNewEc: false
+[stdout] 02-15 10:20:37.527  2863  4286 I CarrierServices: [209] RcsStateProvider.onMigrationComplete: Rcs Engine should be running in cs.apk. Stopping JibeService.
+[stdout] 02-15 10:20:37.528  2863  4286 I CarrierServices: [209] RcsStateProvider.onMigrationComplete: JibeService stopped: true
+[stdout] 02-15 10:20:37.529  2863  4286 I CarrierServices: [209] inq.e: Network Operator: 310260
+[stdout] 02-15 10:20:37.529  2863  4286 I CarrierServices: [209] inq.e: carrierWithOldEcApis: false
+[stdout] 02-15 10:20:37.529  2863  4286 I CarrierServices: [209] inq.e: hasDialerThatSupportsNewEc: false
+[stdout] 02-15 10:20:37.529  2863  4286 I CarrierServices: [209] jsn.connect: shouldUseCarrierServicesJibeService: true, CarrierServices rcs service found: true
+[stdout] 02-15 10:20:37.529  2863  4286 I CarrierServices: [209] jsn.connect: Binding to JibeService in CarrierServices.
+[stdout] 02-15 10:20:37.530  2863  2863 D RcsClientLib: Service com.google.android.rcs.client.chatsession.ChatSessionService connected. Will notify listeners: true
+[stdout] 02-15 10:20:37.530  2863  2863 V BugleRcs: com.google.android.rcs.client.chatsession.ChatSessionService RCS service connected
+[stdout] 02-15 10:20:37.530  2863  4286 I CarrierServices: [209] inq.e: Network Operator: 310260
+[stdout] 02-15 10:20:37.531  2863  4286 I CarrierServices: [209] inq.e: carrierWithOldEcApis: false
+[stdout] 02-15 10:20:37.531  2863  4286 I CarrierServices: [209] inq.e: hasDialerThatSupportsNewEc: false
+[stdout] 02-15 10:20:37.531  2863  4286 I CarrierServices: [209] jsn.connect: shouldUseCarrierServicesJibeService: true, CarrierServices rcs service found: true
+[stdout] 02-15 10:20:37.531  2863  4286 I CarrierServices: [209] jsn.connect: Binding to JibeService in CarrierServices.
+[stdout] 02-15 10:20:37.531  2863  2863 D RcsClientLib: Service com.google.android.rcs.client.events.EventService connected. Will notify listeners: true
+[stdout] 02-15 10:20:37.531  2863  2863 V BugleRcs: com.google.android.rcs.client.events.EventService RCS service connected
+[stdout] 02-15 10:20:37.532  2863  4286 I CarrierServices: [209] inq.e: Network Operator: 310260
+[stdout] 02-15 10:20:37.532  2863  4286 I CarrierServices: [209] inq.e: carrierWithOldEcApis: false
+[stdout] 02-15 10:20:37.532  2863  4286 I CarrierServices: [209] inq.e: hasDialerThatSupportsNewEc: false
+[stdout] 02-15 10:20:37.533  2863  4286 I CarrierServices: [209] jsn.connect: shouldUseCarrierServicesJibeService: true, CarrierServices rcs service found: true
+[stdout] 02-15 10:20:37.533  2863  4286 I CarrierServices: [209] jsn.connect: Binding to JibeService in CarrierServices.
+[stdout] 02-15 10:20:37.533  2863  2863 D RcsClientLib: Service com.google.android.rcs.client.contacts.ContactsService connected. Will notify listeners: true
+[stdout] 02-15 10:20:37.533  2863  2863 V BugleRcs: com.google.android.rcs.client.contacts.ContactsService RCS service connected
+[stdout] 02-15 10:20:37.534  2863  4286 I CarrierServices: [209] inq.e: Network Operator: 310260
+[stdout] 02-15 10:20:37.534  2863  4286 I CarrierServices: [209] inq.e: carrierWithOldEcApis: false
+[stdout] 02-15 10:20:37.534  2863  4286 I CarrierServices: [209] inq.e: hasDialerThatSupportsNewEc: false
+[stdout] 02-15 10:20:37.534  2863  4286 I CarrierServices: [209] jsn.connect: shouldUseCarrierServicesJibeService: true, CarrierServices rcs service found: true
+[stdout] 02-15 10:20:37.534  2863  4286 I CarrierServices: [209] jsn.connect: Binding to JibeService in CarrierServices.
+[stdout] 02-15 10:20:37.535  2863  2863 D RcsClientLib: Service com.google.android.rcs.client.filetransfer.FileTransferService connected. Will notify listeners: true
+[stdout] 02-15 10:20:37.535  2863  2863 V BugleRcs: com.google.android.rcs.client.filetransfer.FileTransferService RCS service connected
+[stdout] 02-15 10:20:37.535  2863  4286 I CarrierServices: [209] inq.e: Network Operator: 310260
+[stdout] 02-15 10:20:37.536  2863  4286 I CarrierServices: [209] inq.e: carrierWithOldEcApis: false
+[stdout] 02-15 10:20:37.536  2863  4286 I CarrierServices: [209] inq.e: hasDialerThatSupportsNewEc: false
+[stdout] 02-15 10:20:37.536  2863  4286 I CarrierServices: [209] jsn.connect: shouldUseCarrierServicesJibeService: true, CarrierServices rcs service found: true
+[stdout] 02-15 10:20:37.536  2863  4286 I CarrierServices: [209] jsn.connect: Binding to JibeService in CarrierServices.
+[stdout] 02-15 10:20:37.536  2863  2863 D RcsClientLib: Service com.google.android.rcs.client.locationsharing.LocationSharingService connected. Will notify listeners: true
+[stdout] 02-15 10:20:37.536  2863  2863 V BugleRcs: com.google.android.rcs.client.locationsharing.LocationSharingService RCS service connected
+[stdout] 02-15 10:20:37.536  2863  4286 I CarrierServices: [209] inq.e: Network Operator: 310260
+[stdout] 02-15 10:20:37.536  2863  4286 I CarrierServices: [209] inq.e: carrierWithOldEcApis: false
+[stdout] 02-15 10:20:37.536  2863  4286 I CarrierServices: [209] inq.e: hasDialerThatSupportsNewEc: false
+[stdout] 02-15 10:20:37.537  2863  4286 I CarrierServices: [209] jsn.connect: shouldUseCarrierServicesJibeService: true, CarrierServices rcs service found: true
+[stdout] 02-15 10:20:37.537  2863  4286 I CarrierServices: [209] jsn.connect: Binding to JibeService in CarrierServices.
+[stdout] 02-15 10:20:37.537  2863  2863 D RcsClientLib: Service com.google.android.rcs.client.ims.ImsConnectionTrackerService connected. Will notify listeners: true
+[stdout] 02-15 10:20:37.537  2863  2863 V BugleRcs: com.google.android.rcs.client.ims.ImsConnectionTrackerService RCS service connected
+[stdout] 02-15 10:20:37.537  2863  2863 V BugleRcs: kicking off RCS sending/receiving
+[stdout] 02-15 10:20:37.537  2863  2863 V BugleAction: no RCS because we're not registered
+[stdout] 02-15 10:20:37.538  2863  4286 I CarrierServices: [209] inq.e: Network Operator: 310260
+[stdout] 02-15 10:20:37.538  2863  4286 I CarrierServices: [209] inq.e: carrierWithOldEcApis: false
+[stdout] 02-15 10:20:37.538  2863  4286 I CarrierServices: [209] inq.e: hasDialerThatSupportsNewEc: false
+[stdout] 02-15 10:20:37.538  2863  4286 I CarrierServices: [209] jsn.connect: shouldUseCarrierServicesJibeService: true, CarrierServices rcs service found: true
+[stdout] 02-15 10:20:37.538  2863  4286 I CarrierServices: [209] jsn.connect: Binding to JibeService in CarrierServices.
+[stdout] 02-15 10:20:37.538  2863  2863 D RcsClientLib: Service com.google.android.rcs.client.profile.RcsProfileService connected. Will notify listeners: true
+[stdout] 02-15 10:20:37.538  2863  2863 V BugleRcs: com.google.android.rcs.client.profile.RcsProfileService RCS service connected
+[stdout] 02-15 10:20:37.538  2863  2863 V BugleRcs: kicking off RCS sending/receiving
+[stdout] 02-15 10:20:37.538  2863  2863 V BugleAction: no RCS because we're not registered
+[stdout] 02-15 10:20:37.538  3621  3657 W CarrierServices: [190] bmc.a: No config URL. RCS will be disabled!
+[stdout] 02-15 10:20:37.538  2863  2863 I BugleRcs: RcsAvailability ACS url: null
+[stdout] 02-15 10:20:37.539  2863  4286 I CarrierServices: [209] inq.e: Network Operator: 310260
+[stdout] 02-15 10:20:37.539  2863  4286 I CarrierServices: [209] inq.e: carrierWithOldEcApis: false
+[stdout] 02-15 10:20:37.539  2863  4286 I CarrierServices: [209] inq.e: hasDialerThatSupportsNewEc: false
+[stdout] 02-15 10:20:37.539  2863  4286 I CarrierServices: [209] jsn.connect: shouldUseCarrierServicesJibeService: true, CarrierServices rcs service found: true
+[stdout] 02-15 10:20:37.539  2863  4286 I CarrierServices: [209] jsn.connect: Binding to JibeService in CarrierServices.
+[stdout] 02-15 10:20:37.539  2863  2863 D RcsClientLib: Service com.google.android.rcs.client.businessinfo.BusinessInfoService connected. Will notify listeners: true
+[stdout] 02-15 10:20:37.539  2863  2863 V BugleRcs: com.google.android.rcs.client.businessinfo.BusinessInfoService RCS service connected
+[stdout] 02-15 10:20:37.539  2863  2863 V BugleRcs: kicking off RCS sending/receiving
+[stdout] 02-15 10:20:37.540  2863  2863 V BugleAction: no RCS because we're not registered
+[stdout] 02-15 10:20:37.540  3621  3657 W CarrierServices: [190] bmc.a: No config URL. RCS will be disabled!
+[stdout] 02-15 10:20:37.540  2863  2863 I BugleRcs: RcsAvailability ACS url: null
+[stdout] 02-15 10:20:37.540  6840  6862 W FlutterJNI: FlutterJNI.loadLibrary called more than once
+[stdout] 02-15 10:20:37.540  6840  6865 W FlutterJNI: FlutterJNI.prefetchDefaultFontManager called more than once
+[stdout] 02-15 10:20:37.540  6840  6883 I ResourceExtractor: Found extracted resources res_timestamp-1-1708021236564
+[stdout] 02-15 10:20:37.541  6840  6840 W FlutterJNI: FlutterJNI.init called more than once
+[stdout] 02-15 10:20:37.541  2863  4286 W RcsProvisioning: Failed to read configuration: /data/user/0/com.google.android.apps.messaging/files/rcsconfig (No such file or directory)
+[stdout] 02-15 10:20:37.541  2863  4286 W RcsProvisioning: java.io.FileNotFoundException: /data/user/0/com.google.android.apps.messaging/files/rcsconfig (No such file or directory)
+[stdout] 02-15 10:20:37.541  2863  4286 W RcsProvisioning: 	at java.io.FileInputStream.open0(Native Method)
+[stdout] 02-15 10:20:37.541  2863  4286 W RcsProvisioning: 	at java.io.FileInputStream.open(FileInputStream.java:231)
+[stdout] 02-15 10:20:37.541  2863  4286 W RcsProvisioning: 	at java.io.FileInputStream.<init>(FileInputStream.java:165)
+[stdout] 02-15 10:20:37.541  2863  4286 W RcsProvisioning: 	at android.app.ContextImpl.openFileInput(ContextImpl.java:560)
+[stdout] 02-15 10:20:37.541  2863  4286 W RcsProvisioning: 	at android.content.ContextWrapper.openFileInput(ContextWrapper.java:202)
+[stdout] 02-15 10:20:37.541  2863  4286 W RcsProvisioning: 	at ion.a(SourceFile:2)
+[stdout] 02-15 10:20:37.541  2863  4286 W RcsProvisioning: 	at idl.a(SourceFile:4)
+[stdout] 02-15 10:20:37.541  2863  4286 W RcsProvisioning: 	at idm.a(SourceFile:7)
+[stdout] 02-15 10:20:37.541  2863  4286 W RcsProvisioning: 	at com.google.android.apps.messaging.rcsmigration.RcsStateProvider.onMigrationComplete(SourceFile:27)
+[stdout] 02-15 10:20:37.541  2863  4286 W RcsProvisioning: 	at com.google.android.ims.rcsmigration.IRcsStateProvider$Stub.dispatchTransaction(SourceFile:14)
+[stdout] 02-15 10:20:37.541  2863  4286 W RcsProvisioning: 	at com.google.android.aidl.BaseStub.onTransact(SourceFile:18)
+[stdout] 02-15 10:20:37.541  2863  4286 W RcsProvisioning: 	at android.os.Binder.execTransact(Binder.java:731)
+[stdout] 02-15 10:20:37.541  2863  4286 D RcsProvisioning: Retrieving backup token
+[stdout] 02-15 10:20:37.541  2863  4286 D RcsProvisioning: Exception while getting subscriber Id. Using default
+[stdout] 02-15 10:20:37.541  6840  6840 W utter.scenario: Accessing hidden method Landroid/media/ImageWriter;->newInstance(Landroid/view/Surface;II)Landroid/media/ImageWriter; (dark greylist, linking)
+[stdout] 02-15 10:20:37.543  6840  6840 D LifecycleMonitor: Lifecycle status change: dev.flutter.scenarios.ExternalTextureFlutterActivity@8bbd5c5 in: CREATED
+[stdout] 02-15 10:20:37.543  6840  6840 D LifecycleMonitor: Lifecycle status change: dev.flutter.scenarios.ExternalTextureFlutterActivity@8bbd5c5 in: STARTED
+[stdout] 02-15 10:20:37.544  6840  6840 D LifecycleMonitor: Lifecycle status change: dev.flutter.scenarios.ExternalTextureFlutterActivity@8bbd5c5 in: RESUMED
+[stdout] 02-15 10:20:37.546  1572  1709 E SurfaceFlinger: ro.sf.lcd_density must be defined as a build property
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario: Rejecting re-init on previously-failed class java.lang.Class<androidx.window.layout.SidecarCompat$DistinctSidecarElementCallback>: java.lang.NoClassDefFoundError: Failed resolution of: Landroidx/window/sidecar/SidecarInterface$SidecarCallback;
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at androidx.window.layout.ExtensionInterfaceCompat androidx.window.layout.SidecarWindowBackend$Companion.initAndVerifyExtension(android.content.Context) (SidecarWindowBackend.kt:200)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at androidx.window.layout.SidecarWindowBackend androidx.window.layout.SidecarWindowBackend$Companion.getInstance(android.content.Context) (SidecarWindowBackend.kt:184)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at androidx.window.layout.WindowBackend androidx.window.layout.WindowInfoTracker$Companion.windowBackend$window_release(android.content.Context) (WindowInfoTracker.kt:86)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at androidx.window.layout.WindowInfoTracker androidx.window.layout.WindowInfoTracker$Companion.getOrCreate(android.content.Context) (WindowInfoTracker.kt:70)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at io.flutter.embedding.android.WindowInfoRepositoryCallbackAdapterWrapper io.flutter.embedding.android.FlutterView.createWindowInfoRepo() (FlutterView.java:491)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void io.flutter.embedding.android.FlutterView.onAttachedToWindow() (FlutterView.java:511)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.View.dispatchAttachedToWindow(android.view.View$AttachInfo, int) (View.java:18347)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.ViewGroup.dispatchAttachedToWindow(android.view.View$AttachInfo, int) (ViewGroup.java:3397)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.ViewGroup.dispatchAttachedToWindow(android.view.View$AttachInfo, int) (ViewGroup.java:3404)
+[stdout] 02-15 10:20:37.568  6840  6840 I chatty  : uid=10098(dev.flutter.scenarios) identical 1 line
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.ViewGroup.dispatchAttachedToWindow(android.view.View$AttachInfo, int) (ViewGroup.java:3404)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.ViewRootImpl.performTraversals() (ViewRootImpl.java:1761)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.ViewRootImpl.doTraversal() (ViewRootImpl.java:1460)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.ViewRootImpl$TraversalRunnable.run() (ViewRootImpl.java:7183)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.Choreographer$CallbackRecord.run(long) (Choreographer.java:949)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.Choreographer.doCallbacks(int, long) (Choreographer.java:761)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.Choreographer.doFrame(long, int) (Choreographer.java:696)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.Choreographer$FrameDisplayEventReceiver.run() (Choreographer.java:935)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.os.Handler.handleCallback(android.os.Message) (Handler.java:873)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.os.Handler.dispatchMessage(android.os.Message) (Handler.java:99)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.os.Looper.loop() (Looper.java:193)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.app.ActivityThread.main(java.lang.String[]) (ActivityThread.java:6669)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at java.lang.Object java.lang.reflect.Method.invoke(java.lang.Object, java.lang.Object[]) (Method.java:-2)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run() (RuntimeInit.java:493)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void com.android.internal.os.ZygoteInit.main(java.lang.String[]) (ZygoteInit.java:858)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario: Caused by: java.lang.ClassNotFoundException: Didn't find class "androidx.window.sidecar.SidecarInterface$SidecarCallback" on path: DexPathList[[zip file "/system/framework/android.test.runner.jar", zip file "/system/framework/android.test.mock.jar", zip file "/data/app/dev.flutter.scenarios.test-KKXe9YDNYEL7yOuj25XZ6g==/base.apk", zip file "/data/app/dev.flutter.scenarios-rlxf5VuTV43PTiaP6mOD-g==/base.apk"],nativeLibraryDirectories=[/data/app/dev.flutter.scenarios.test-KKXe9YDNYEL7yOuj25XZ6g==/lib/arm64, /data/app/dev.flutter.scenarios-rlxf5VuTV43PTiaP6mOD-g==/lib/arm64, /data/app/dev.flutter.scenarios.test-KKXe9YDNYEL7yOuj25XZ6g==/base.apk!/lib/arm64-v8a, /data/app/dev.flutter.scenarios-rlxf5VuTV43PTiaP6mOD-g==/base.apk!/lib/arm64-v8a, /system/lib64]]
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at java.lang.Class dalvik.system.BaseDexClassLoader.findClass(java.lang.String) (BaseDexClassLoader.java:134)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at java.lang.Class java.lang.ClassLoader.loadClass(java.lang.String, boolean) (ClassLoader.java:379)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at java.lang.Class java.lang.ClassLoader.loadClass(java.lang.String) (ClassLoader.java:312)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at androidx.window.layout.ExtensionInterfaceCompat androidx.window.layout.SidecarWindowBackend$Companion.initAndVerifyExtension(android.content.Context) (SidecarWindowBackend.kt:200)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at androidx.window.layout.SidecarWindowBackend androidx.window.layout.SidecarWindowBackend$Companion.getInstance(android.content.Context) (SidecarWindowBackend.kt:184)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at androidx.window.layout.WindowBackend androidx.window.layout.WindowInfoTracker$Companion.windowBackend$window_release(android.content.Context) (WindowInfoTracker.kt:86)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at androidx.window.layout.WindowInfoTracker androidx.window.layout.WindowInfoTracker$Companion.getOrCreate(android.content.Context) (WindowInfoTracker.kt:70)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at io.flutter.embedding.android.WindowInfoRepositoryCallbackAdapterWrapper io.flutter.embedding.android.FlutterView.createWindowInfoRepo() (FlutterView.java:491)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void io.flutter.embedding.android.FlutterView.onAttachedToWindow() (FlutterView.java:511)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.View.dispatchAttachedToWindow(android.view.View$AttachInfo, int) (View.java:18347)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.ViewGroup.dispatchAttachedToWindow(android.view.View$AttachInfo, int) (ViewGroup.java:3397)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.ViewGroup.dispatchAttachedToWindow(android.view.View$AttachInfo, int) (ViewGroup.java:3404)
+[stdout] 02-15 10:20:37.568  6840  6840 I chatty  : uid=10098(dev.flutter.scenarios) identical 1 line
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.ViewGroup.dispatchAttachedToWindow(android.view.View$AttachInfo, int) (ViewGroup.java:3404)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.ViewRootImpl.performTraversals() (ViewRootImpl.java:1761)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.ViewRootImpl.doTraversal() (ViewRootImpl.java:1460)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.ViewRootImpl$TraversalRunnable.run() (ViewRootImpl.java:7183)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.Choreographer$CallbackRecord.run(long) (Choreographer.java:949)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.Choreographer.doCallbacks(int, long) (Choreographer.java:761)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.Choreographer.doFrame(long, int) (Choreographer.java:696)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.Choreographer$FrameDisplayEventReceiver.run() (Choreographer.java:935)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.os.Handler.handleCallback(android.os.Message) (Handler.java:873)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.os.Handler.dispatchMessage(android.os.Message) (Handler.java:99)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.os.Looper.loop() (Looper.java:193)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.app.ActivityThread.main(java.lang.String[]) (ActivityThread.java:6669)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at java.lang.Object java.lang.reflect.Method.invoke(java.lang.Object, java.lang.Object[]) (Method.java:-2)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run() (RuntimeInit.java:493)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void com.android.internal.os.ZygoteInit.main(java.lang.String[]) (ZygoteInit.java:858)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario: 
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario: Rejecting re-init on previously-failed class java.lang.Class<androidx.window.layout.SidecarCompat$DistinctSidecarElementCallback>: java.lang.NoClassDefFoundError: Failed resolution of: Landroidx/window/sidecar/SidecarInterface$SidecarCallback;
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at androidx.window.layout.ExtensionInterfaceCompat androidx.window.layout.SidecarWindowBackend$Companion.initAndVerifyExtension(android.content.Context) (SidecarWindowBackend.kt:200)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at androidx.window.layout.SidecarWindowBackend androidx.window.layout.SidecarWindowBackend$Companion.getInstance(android.content.Context) (SidecarWindowBackend.kt:184)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at androidx.window.layout.WindowBackend androidx.window.layout.WindowInfoTracker$Companion.windowBackend$window_release(android.content.Context) (WindowInfoTracker.kt:86)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at androidx.window.layout.WindowInfoTracker androidx.window.layout.WindowInfoTracker$Companion.getOrCreate(android.content.Context) (WindowInfoTracker.kt:70)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at io.flutter.embedding.android.WindowInfoRepositoryCallbackAdapterWrapper io.flutter.embedding.android.FlutterView.createWindowInfoRepo() (FlutterView.java:491)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void io.flutter.embedding.android.FlutterView.onAttachedToWindow() (FlutterView.java:511)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.View.dispatchAttachedToWindow(android.view.View$AttachInfo, int) (View.java:18347)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.ViewGroup.dispatchAttachedToWindow(android.view.View$AttachInfo, int) (ViewGroup.java:3397)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.ViewGroup.dispatchAttachedToWindow(android.view.View$AttachInfo, int) (ViewGroup.java:3404)
+[stdout] 02-15 10:20:37.568  6840  6840 I chatty  : uid=10098(dev.flutter.scenarios) identical 1 line
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.ViewGroup.dispatchAttachedToWindow(android.view.View$AttachInfo, int) (ViewGroup.java:3404)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.ViewRootImpl.performTraversals() (ViewRootImpl.java:1761)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.ViewRootImpl.doTraversal() (ViewRootImpl.java:1460)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.ViewRootImpl$TraversalRunnable.run() (ViewRootImpl.java:7183)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.Choreographer$CallbackRecord.run(long) (Choreographer.java:949)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.Choreographer.doCallbacks(int, long) (Choreographer.java:761)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.Choreographer.doFrame(long, int) (Choreographer.java:696)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.Choreographer$FrameDisplayEventReceiver.run() (Choreographer.java:935)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.os.Handler.handleCallback(android.os.Message) (Handler.java:873)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.os.Handler.dispatchMessage(android.os.Message) (Handler.java:99)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.os.Looper.loop() (Looper.java:193)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.app.ActivityThread.main(java.lang.String[]) (ActivityThread.java:6669)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at java.lang.Object java.lang.reflect.Method.invoke(java.lang.Object, java.lang.Object[]) (Method.java:-2)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run() (RuntimeInit.java:493)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void com.android.internal.os.ZygoteInit.main(java.lang.String[]) (ZygoteInit.java:858)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario: Caused by: java.lang.ClassNotFoundException: Didn't find class "androidx.window.sidecar.SidecarInterface$SidecarCallback" on path: DexPathList[[zip file "/system/framework/android.test.runner.jar", zip file "/system/framework/android.test.mock.jar", zip file "/data/app/dev.flutter.scenarios.test-KKXe9YDNYEL7yOuj25XZ6g==/base.apk", zip file "/data/app/dev.flutter.scenarios-rlxf5VuTV43PTiaP6mOD-g==/base.apk"],nativeLibraryDirectories=[/data/app/dev.flutter.scenarios.test-KKXe9YDNYEL7yOuj25XZ6g==/lib/arm64, /data/app/dev.flutter.scenarios-rlxf5VuTV43PTiaP6mOD-g==/lib/arm64, /data/app/dev.flutter.scenarios.test-KKXe9YDNYEL7yOuj25XZ6g==/base.apk!/lib/arm64-v8a, /data/app/dev.flutter.scenarios-rlxf5VuTV43PTiaP6mOD-g==/base.apk!/lib/arm64-v8a, /system/lib64]]
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at java.lang.Class dalvik.system.BaseDexClassLoader.findClass(java.lang.String) (BaseDexClassLoader.java:134)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at java.lang.Class java.lang.ClassLoader.loadClass(java.lang.String, boolean) (ClassLoader.java:379)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at java.lang.Class java.lang.ClassLoader.loadClass(java.lang.String) (ClassLoader.java:312)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at androidx.window.layout.ExtensionInterfaceCompat androidx.window.layout.SidecarWindowBackend$Companion.initAndVerifyExtension(android.content.Context) (SidecarWindowBackend.kt:200)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at androidx.window.layout.SidecarWindowBackend androidx.window.layout.SidecarWindowBackend$Companion.getInstance(android.content.Context) (SidecarWindowBackend.kt:184)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at androidx.window.layout.WindowBackend androidx.window.layout.WindowInfoTracker$Companion.windowBackend$window_release(android.content.Context) (WindowInfoTracker.kt:86)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at androidx.window.layout.WindowInfoTracker androidx.window.layout.WindowInfoTracker$Companion.getOrCreate(android.content.Context) (WindowInfoTracker.kt:70)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at io.flutter.embedding.android.WindowInfoRepositoryCallbackAdapterWrapper io.flutter.embedding.android.FlutterView.createWindowInfoRepo() (FlutterView.java:491)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void io.flutter.embedding.android.FlutterView.onAttachedToWindow() (FlutterView.java:511)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.View.dispatchAttachedToWindow(android.view.View$AttachInfo, int) (View.java:18347)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.ViewGroup.dispatchAttachedToWindow(android.view.View$AttachInfo, int) (ViewGroup.java:3397)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.ViewGroup.dispatchAttachedToWindow(android.view.View$AttachInfo, int) (ViewGroup.java:3404)
+[stdout] 02-15 10:20:37.568  6840  6840 I chatty  : uid=10098(dev.flutter.scenarios) identical 1 line
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.ViewGroup.dispatchAttachedToWindow(android.view.View$AttachInfo, int) (ViewGroup.java:3404)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.ViewRootImpl.performTraversals() (ViewRootImpl.java:1761)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.ViewRootImpl.doTraversal() (ViewRootImpl.java:1460)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.ViewRootImpl$TraversalRunnable.run() (ViewRootImpl.java:7183)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.Choreographer$CallbackRecord.run(long) (Choreographer.java:949)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.Choreographer.doCallbacks(int, long) (Choreographer.java:761)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.Choreographer.doFrame(long, int) (Choreographer.java:696)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.view.Choreographer$FrameDisplayEventReceiver.run() (Choreographer.java:935)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.os.Handler.handleCallback(android.os.Message) (Handler.java:873)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.os.Handler.dispatchMessage(android.os.Message) (Handler.java:99)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.os.Looper.loop() (Looper.java:193)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void android.app.ActivityThread.main(java.lang.String[]) (ActivityThread.java:6669)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at java.lang.Object java.lang.reflect.Method.invoke(java.lang.Object, java.lang.Object[]) (Method.java:-2)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run() (RuntimeInit.java:493)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario:   at void com.android.internal.os.ZygoteInit.main(java.lang.String[]) (ZygoteInit.java:858)
+[stdout] 02-15 10:20:37.568  6840  6840 I utter.scenario: 
+[stdout] 02-15 10:20:37.583  6840  6886 I OpenGLRenderer: Initialized EGL, version 1.4
+[stdout] 02-15 10:20:37.583  6840  6886 D OpenGLRenderer: Swap behavior 1
+[stdout] 02-15 10:20:37.583  6840  6886 D HostConnection: HostConnection::get() New Host Connection established 0x758c8455c0, tid 6886
+[stdout] 02-15 10:20:37.584  6840  6886 D HostConnection: HostComposition ext ANDROID_EMU_CHECKSUM_HELPER_v1 ANDROID_EMU_sync_buffer_data GL_OES_EGL_image_external_essl3 GL_OES_vertex_array_object GL_KHR_texture_compression_astc_ldr ANDROID_EMU_host_side_tracing ANDROID_EMU_gles_max_version_3_0 
+[stdout] 02-15 10:20:37.584  6840  6886 W OpenGLRenderer: Failed to choose config with EGL_SWAP_BEHAVIOR_PRESERVED, retrying without...
+[stdout] 02-15 10:20:37.584  6840  6886 D OpenGLRenderer: Swap behavior 0
+[stdout] 02-15 10:20:37.584  6840  6886 D eglCodecCommon: setVertexArrayObject: set vao to 0 (0) 0 0
+[stdout] 02-15 10:20:37.584  6840  6886 D EGL_emulation: eglCreateContext: 0x758c8458e0: maj 3 min 0 rcv 3
+[stdout] 02-15 10:20:37.585  6840  6886 D EGL_emulation: eglMakeCurrent: 0x758c8458e0: ver 3 0 (tinfo 0x7576d7d2e0)
+[stdout] 02-15 10:20:37.585  1572  1709 W ServiceManager: Permission failure: android.permission.ACCESS_SURFACE_FLINGER from uid=10098 pid=6840
+[stdout] 02-15 10:20:37.585  1572  1709 D PermissionCache: checking android.permission.ACCESS_SURFACE_FLINGER for uid=10098 => denied (83 us)
+[stdout] 02-15 10:20:37.586  1572  1805 E SurfaceFlinger: ro.sf.lcd_density must be defined as a build property
+[stdout] 02-15 10:20:37.590  1384  2162 D gralloc_ranchu: gralloc_alloc: Creating ashmem region of size 10371072
+[stdout] 02-15 10:20:37.591  6840  6886 D HostConnection: createUnique: call
+[stdout] 02-15 10:20:37.591  6840  6886 D HostConnection: HostConnection::get() New Host Connection established 0x758c845b60, tid 6886
+[stdout] 02-15 10:20:37.592  6840  6886 D HostConnection: HostComposition ext ANDROID_EMU_CHECKSUM_HELPER_v1 ANDROID_EMU_sync_buffer_data GL_OES_EGL_image_external_essl3 GL_OES_vertex_array_object GL_KHR_texture_compression_astc_ldr ANDROID_EMU_host_side_tracing ANDROID_EMU_gles_max_version_3_0 
+[stdout] 02-15 10:20:37.596  1384  2162 D gralloc_ranchu: gralloc_alloc: Creating ashmem region of size 9826304
+[stdout] 02-15 10:20:37.596  6840  6881 D HostConnection: HostConnection::get() New Host Connection established 0x758ae650a0, tid 6881
+[stdout] 02-15 10:20:37.597  6840  6881 D HostConnection: HostComposition ext ANDROID_EMU_CHECKSUM_HELPER_v1 ANDROID_EMU_sync_buffer_data GL_OES_EGL_image_external_essl3 GL_OES_vertex_array_object GL_KHR_texture_compression_astc_ldr ANDROID_EMU_host_side_tracing ANDROID_EMU_gles_max_version_3_0 
+[stdout] 02-15 10:20:37.597  6840  6881 D EGL_emulation: eglMakeCurrent: 0x758aed82a0: ver 3 0 (tinfo 0x75932f3220)
+[stdout] 02-15 10:20:37.599  6840  6881 D eglCodecCommon: setVertexArrayObject: set vao to 0 (0) 0 0
+[stdout] 02-15 10:20:37.599  6840  6881 D EGL_emulation: eglCreateContext: 0x758ae66220: maj 3 min 0 rcv 3
+[stdout] 02-15 10:20:37.599  6840  6881 D EGL_emulation: eglMakeCurrent: 0x758ae66220: ver 3 0 (tinfo 0x75932f3220)
+[stdout] 02-15 10:20:37.599  6840  6881 D EGL_emulation: eglMakeCurrent: 0x758aed82a0: ver 3 0 (tinfo 0x75932f3220)
+[stdout] 02-15 10:20:37.603  6840  6881 D EGL_emulation: eglMakeCurrent: 0x758aed82a0: ver 3 0 (tinfo 0x75932f3220)
+[stdout] 02-15 10:20:37.603  1572  1572 D SurfaceFlinger: duplicate layer name: changing SurfaceView - dev.flutter.scenarios/dev.flutter.scenarios.ExternalTextureFlutterActivity to SurfaceView - dev.flutter.scenarios/dev.flutter.scenarios.ExternalTextureFlutterActivity#1
+[stdout] 02-15 10:20:37.604  1572  1572 D SurfaceFlinger: duplicate layer name: changing Background for -SurfaceView - dev.flutter.scenarios/dev.flutter.scenarios.ExternalTextureFlutterActivity to Background for -SurfaceView - dev.flutter.scenarios/dev.flutter.scenarios.ExternalTextureFlutterActivity#1
+[stdout] 02-15 10:20:37.616  1384  2162 D gralloc_ranchu: gralloc_alloc: Creating ashmem region of size 9826304
+[stdout] 02-15 10:20:37.622  6840  6893 D CCodec  : allocate(c2.android.avc.decoder)
+[stdout] 02-15 10:20:37.623  6840  6893 I CCodec  : setting up 'default' as default (vendor) store
+[stdout] 02-15 10:20:37.623  1588  2090 V C2Store : in init
+[stdout] 02-15 10:20:37.623  1588  2090 V C2Store : loading dll
+[stdout] 02-15 10:20:37.624  6840  6893 I CCodec  : Created component [c2.android.avc.decoder]
+[stdout] 02-15 10:20:37.624  6840  6893 D CCodecConfig: read media type: video/avc
+[stdout] 02-15 10:20:37.624  6840  6893 D ReflectedParamUpdater: extent() != 1 for single value type: algo.buffers.max-count.values
+[stdout] 02-15 10:20:37.624  6840  6893 D ReflectedParamUpdater: extent() != 1 for single value type: output.subscribed-indices.values
+[stdout] 02-15 10:20:37.624  6840  6893 D ReflectedParamUpdater: extent() != 1 for single value type: input.buffers.allocator-ids.values
+[stdout] 02-15 10:20:37.624  6840  6893 D ReflectedParamUpdater: extent() != 1 for single value type: output.buffers.allocator-ids.values
+[stdout] 02-15 10:20:37.624  6840  6893 D ReflectedParamUpdater: extent() != 1 for single value type: algo.buffers.allocator-ids.values
+[stdout] 02-15 10:20:37.624  6840  6893 D ReflectedParamUpdater: extent() != 1 for single value type: output.buffers.pool-ids.values
+[stdout] 02-15 10:20:37.624  6840  6893 D ReflectedParamUpdater: extent() != 1 for single value type: algo.buffers.pool-ids.values
+[stdout] 02-15 10:20:37.624  6840  6893 D ReflectedParamUpdater: ignored struct field coded.color-format.locations
+[stdout] 02-15 10:20:37.624  6840  6893 D CCodecConfig: ignoring local param raw.size (0xd2001800) as it is already supported
+[stdout] 02-15 10:20:37.624  6840  6893 D CCodecConfig: ignoring local param raw.color (0xd2001809) as it is already supported
+[stdout] 02-15 10:20:37.624  6840  6893 D ReflectedParamUpdater: ignored struct field raw.hdr-static-info.mastering
+[stdout] 02-15 10:20:37.625  6840  6893 I CCodecConfig: query failed after returning 11 values (BAD_INDEX)
+[stdout] 02-15 10:20:37.625  6840  6893 D CCodecConfig: c2 config is Dict {
+[stdout] 02-15 10:20:37.625  6840  6893 D CCodecConfig:   c2::u32 coded.pl.level = 20496
+[stdout] 02-15 10:20:37.625  6840  6893 D CCodecConfig:   c2::u32 coded.pl.profile = 20481
+[stdout] 02-15 10:20:37.625  6840  6893 D CCodecConfig:   c2::u32 coded.vui.color.matrix = 0
+[stdout] 02-15 10:20:37.625  6840  6893 D CCodecConfig:   c2::u32 coded.vui.color.primaries = 0
+[stdout] 02-15 10:20:37.625  6840  6893 D CCodecConfig:   c2::u32 coded.vui.color.range = 2
+[stdout] 02-15 10:20:37.625  6840  6893 D CCodecConfig:   c2::u32 coded.vui.color.transfer = 0
+[stdout] 02-15 10:20:37.625  6840  6893 D CCodecConfig:   c2::u32 default.color.matrix = 0
+[stdout] 02-15 10:20:37.625  6840  6893 D CCodecConfig:   c2::u32 default.color.primaries = 0
+[stdout] 02-15 10:20:37.625  6840  6893 D CCodecConfig:   c2::u32 default.color.range = 0
+[stdout] 02-15 10:20:37.625  6840  6893 D CCodecConfig:   c2::u32 default.color.transfer = 0
+[stdout] 02-15 10:20:37.625  6840  6893 D CCodecConfig:   c2::u32 input.buffers.max-size.value = 57600
+[stdout] 02-15 10:20:37.625  6840  6893 D CCodecConfig:   c2::u32 input.delay.actual.value = 0
+[stdout] 02-15 10:20:37.625  6840  6893 D CCodecConfig:   string input.media-type.value = "video/avc"
+[stdout] 02-15 10:20:37.625  6840  6893 D CCodecConfig:   string output.media-type.value = "video/raw"
+[stdout] 02-15 10:20:37.625  6840  6893 D CCodecConfig:   c2::u32 raw.color.matrix = 0
+[stdout] 02-15 10:20:37.625  6840  6893 D CCodecConfig:   c2::u32 raw.color.primaries = 0
+[stdout] 02-15 10:20:37.625  6840  6893 D CCodecConfig:   c2::u32 raw.color.range = 2
+[stdout] 02-15 10:20:37.625  6840  6893 D CCodecConfig:   c2::u32 raw.color.transfer = 0
+[stdout] 02-15 10:20:37.625  6840  6893 D CCodecConfig:   c2::u32 raw.max-size.height = 240
+[stdout] 02-15 10:20:37.625  6840  6893 D CCodecConfig:   c2::u32 raw.max-size.width = 320
+[stdout] 02-15 10:20:37.625  6840  6893 D CCodecConfig:   c2::u32 raw.pixel-format.value = 35
+[stdout] 02-15 10:20:37.625  6840  6893 D CCodecConfig:   c2::i32 raw.rotation.flip = 0
+[stdout] 02-15 10:20:37.625  6840  6893 D CCodecConfig:   c2::i32 raw.rotation.value = 0
+[stdout] 02-15 10:20:37.625  6840  6893 D CCodecConfig:   c2::u32 raw.sar.height = 1
+[stdout] 02-15 10:20:37.625  6840  6893 D CCodecConfig:   c2::u32 raw.sar.width = 1
+[stdout] 02-15 10:20:37.625  6840  6893 D CCodecConfig:   c2::u32 raw.size.height = 240
+[stdout] 02-15 10:20:37.625  6840  6893 D CCodecConfig:   c2::u32 raw.size.width = 320
+[stdout] 02-15 10:20:37.625  6840  6893 D CCodecConfig:   c2::u32 raw.surface-scaling.value = 
+[stdout] 02-15 10:20:37.625  6840  6893 W ColorUtils: expected specified color aspects (2:0:0:0)
+[stdout] 02-15 10:20:37.626  6840  6886 D EGL_emulation: eglMakeCurrent: 0x758c8458e0: ver 3 0 (tinfo 0x7576d7d2e0)
+[stdout] 02-15 10:20:37.626  6840  6889 D SurfaceUtils: connecting to surface 0x757d4c0010, reason connectToSurface
+[stdout] 02-15 10:20:37.626  6840  6889 I MediaCodec: [c2.android.avc.decoder] setting surface generation to 7004161
+[stdout] 02-15 10:20:37.626  6840  6889 D SurfaceUtils: disconnecting from surface 0x757d4c0010, reason connectToSurface(reconnect)
+[stdout] 02-15 10:20:37.626  6840  6889 D SurfaceUtils: connecting to surface 0x757d4c0010, reason connectToSurface(reconnect)
+[stdout] 02-15 10:20:37.626  6840  6880 I flutter : Loading scenario display_texture
+[stdout] 02-15 10:20:37.627  6840  6896 D CCodec  : allocate(c2.android.avc.decoder)
+[stdout] 02-15 10:20:37.627  1384  2162 E gralloc_ranchu: gralloc_alloc: Requested auto format selection, but no known format for this usage: 192 x 256, usage 0
+[stdout] 02-15 10:20:37.627  6840  6893 E GraphicBufferAllocator: Failed to allocate (192 x 256) layerCount 1 format 34 usage 0: 3
+[stdout] 02-15 10:20:37.627  6840  6893 E BufferQueueProducer: [ImageReader-192x256f22m2-6840-0] dequeueBuffer: createGraphicBuffer failed
+[stdout] --------- beginning of crash
+[stdout] 02-15 10:20:37.627  6840  6893 F libc    : Fatal signal 11 (SIGSEGV), code 2 (SEGV_ACCERR), fault addr 0x756f15a214 in tid 6893 (CodecLooper), pid 6840 (utter.scenarios)
+[stdout] 02-15 10:20:37.633  6840  6896 I CCodec  : setting up 'default' as default (vendor) store
+[stdout] 02-15 10:20:37.636  6840  6896 I CCodec  : Created component [c2.android.avc.decoder]
+[stdout] 02-15 10:20:37.637  6840  6896 D CCodecConfig: read media type: video/avc
+[stdout] 02-15 10:20:37.637  6840  6886 D eglCodecCommon: setVertexArrayObject: set vao to 0 (0) 1 2
+[stdout] 02-15 10:20:37.638  6840  6896 D ReflectedParamUpdater: extent() != 1 for single value type: algo.buffers.max-count.values
+[stdout] 02-15 10:20:37.638  6840  6896 D ReflectedParamUpdater: extent() != 1 for single value type: output.subscribed-indices.values
+[stdout] 02-15 10:20:37.638  6840  6896 D ReflectedParamUpdater: extent() != 1 for single value type: input.buffers.allocator-ids.values
+[stdout] 02-15 10:20:37.638  6840  6896 D ReflectedParamUpdater: extent() != 1 for single value type: output.buffers.allocator-ids.values
+[stdout] 02-15 10:20:37.638  6840  6896 D ReflectedParamUpdater: extent() != 1 for single value type: algo.buffers.allocator-ids.values
+[stdout] 02-15 10:20:37.638  6840  6896 D ReflectedParamUpdater: extent() != 1 for single value type: output.buffers.pool-ids.values
+[stdout] 02-15 10:20:37.638  6840  6896 D ReflectedParamUpdater: extent() != 1 for single value type: algo.buffers.pool-ids.values
+[stdout] 02-15 10:20:37.638  6840  6896 D ReflectedParamUpdater: ignored struct field coded.color-format.locations
+[stdout] 02-15 10:20:37.638  6840  6896 D CCodecConfig: ignoring local param raw.size (0xd2001800) as it is already supported
+[stdout] 02-15 10:20:37.638  6840  6896 D CCodecConfig: ignoring local param raw.color (0xd2001809) as it is already supported
+[stdout] 02-15 10:20:37.638  6840  6896 D ReflectedParamUpdater: ignored struct field raw.hdr-static-info.mastering
+[stdout] 02-15 10:20:37.638  6840  6896 I CCodecConfig: query failed after returning 11 values (BAD_INDEX)
+[stdout] 02-15 10:20:37.638  6840  6896 D CCodecConfig: c2 config is Dict {
+[stdout] 02-15 10:20:37.638  6840  6896 D CCodecConfig:   c2::u32 coded.pl.level = 20496
+[stdout] 02-15 10:20:37.638  6840  6896 D CCodecConfig:   c2::u32 coded.pl.profile = 20481
+[stdout] 02-15 10:20:37.638  6840  6896 D CCodecConfig:   c2::u32 coded.vui.color.matrix = 0
+[stdout] 02-15 10:20:37.638  6840  6896 D CCodecConfig:   c2::u32 coded.vui.color.primaries = 0
+[stdout] 02-15 10:20:37.638  6840  6896 D CCodecConfig:   c2::u32 coded.vui.color.range = 2
+[stdout] 02-15 10:20:37.638  6840  6896 D CCodecConfig:   c2::u32 coded.vui.color.transfer = 0
+[stdout] 02-15 10:20:37.638  6840  6896 D CCodecConfig:   c2::u32 default.color.matrix = 0
+[stdout] 02-15 10:20:37.638  6840  6896 D CCodecConfig:   c2::u32 default.color.primaries = 0
+[stdout] 02-15 10:20:37.638  6840  6896 D CCodecConfig:   c2::u32 default.color.range = 0
+[stdout] 02-15 10:20:37.638  6840  6896 D CCodecConfig:   c2::u32 default.color.transfer = 0
+[stdout] 02-15 10:20:37.638  6840  6896 D CCodecConfig:   c2::u32 input.buffers.max-size.value = 57600
+[stdout] 02-15 10:20:37.638  6840  6896 D CCodecConfig:   c2::u32 input.delay.actual.value = 0
+[stdout] 02-15 10:20:37.638  6840  6896 D CCodecConfig:   string input.media-type.value = "video/avc"
+[stdout] 02-15 10:20:37.638  6840  6896 D CCodecConfig:   string output.media-type.value = "video/raw"
+[stdout] 02-15 10:20:37.638  6840  6896 D CCodecConfig:   c2::u32 raw.color.matrix = 0
+[stdout] 02-15 10:20:37.638  6840  6896 D CCodecConfig:   c2::u32 raw.color.primaries = 0
+[stdout] 02-15 10:20:37.638  6840  6896 D CCodecConfig:   c2::u32 raw.color.range = 2
+[stdout] 02-15 10:20:37.638  6840  6896 D CCodecConfig:   c2::u32 raw.color.transfer = 0
+[stdout] 02-15 10:20:37.638  6840  6896 D CCodecConfig:   c2::u32 raw.max-size.height = 240
+[stdout] 02-15 10:20:37.638  6840  6896 D CCodecConfig:   c2::u32 raw.max-size.width = 320
+[stdout] 02-15 10:20:37.638  6840  6896 D CCodecConfig:   c2::u32 raw.pixel-format.value = 35
+[stdout] 02-15 10:20:37.638  6840  6896 D CCodecConfig:   c2::i32 raw.rotation.flip = 0
+[stdout] 02-15 10:20:37.638  6840  6896 D CCodecConfig:   c2::i32 raw.rotation.value = 0
+[stdout] 02-15 10:20:37.638  6840  6896 D CCodecConfig:   c2::u32 raw.sar.height = 1
+[stdout] 02-15 10:20:37.638  6840  6896 D CCodecConfig:   c2::u32 raw.sar.width = 1
+[stdout] 02-15 10:20:37.638  6840  6896 D CCodecConfig:   c2::u32 raw.size.height = 240
+[stdout] 02-15 10:20:37.638  6840  6896 D CCodecConfig:   c2::u32 raw.size.width = 320
+[stdout] 02-15 10:20:37.638  6840  6896 D CCodecConfig:   c2::u32 raw.surface-scaling.value = 
+[stdout] 02-15 10:20:37.638  6840  6896 W ColorUtils: expected specified color aspects (2:0:0:0)
+[stdout] 02-15 10:20:37.642  6840  6892 D SurfaceUtils: connecting to surface 0x7576eb4010, reason connectToSurface
+[stdout] 02-15 10:20:37.642  6840  6892 I MediaCodec: [c2.android.avc.decoder] setting surface generation to 7004162
+[stdout] 02-15 10:20:37.642  6840  6892 D SurfaceUtils: disconnecting from surface 0x7576eb4010, reason connectToSurface(reconnect)
+[stdout] 02-15 10:20:37.642  6840  6892 D SurfaceUtils: connecting to surface 0x7576eb4010, reason connectToSurface(reconnect)
+[stdout] 02-15 10:20:37.642  1384  2162 E gralloc_ranchu: gralloc_alloc: Requested auto format selection, but no known format for this usage: 192 x 256, usage 0
+[stdout] 02-15 10:20:37.642  6840  6896 E GraphicBufferAllocator: Failed to allocate (192 x 256) layerCount 1 format 34 usage 0: 3
+[stdout] 02-15 10:20:37.642  6840  6896 E BufferQueueProducer: [ImageReader-192x256f22m2-6840-1] dequeueBuffer: createGraphicBuffer failed
+[stdout] 02-15 10:20:37.650  1384  2162 D gralloc_ranchu: gralloc_alloc: Creating ashmem region of size 10371072
+[stdout] 02-15 10:20:37.651  6901  6901 I crash_dump64: obtaining output fd from tombstoned, type: kDebuggerdTombstone
+[stdout] 02-15 10:20:37.651  1593  1593 I /system/bin/tombstoned: received crash request for pid 6893
+[stdout] 02-15 10:20:37.651  6901  6901 I crash_dump64: performing dump of process 6840 (target tid = 6893)
+[stdout] 02-15 10:20:37.653  6901  6901 F DEBUG   : *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
+[stdout] 02-15 10:20:37.653  6901  6901 F DEBUG   : Build fingerprint: 'Android/sdk_gphone_arm64/generic_arm64:9/PSR1.210301.009.B6/9767327:userdebug/dev-keys'
+[stdout] 02-15 10:20:37.653  6901  6901 F DEBUG   : Revision: '0'
+[stdout] 02-15 10:20:37.653  6901  6901 F DEBUG   : ABI: 'arm64'
+[stdout] 02-15 10:20:37.653  6901  6901 F DEBUG   : pid: 6840, tid: 6893, name: CodecLooper  >>> dev.flutter.scenarios <<<
+[stdout] 02-15 10:20:37.653  6901  6901 F DEBUG   : signal 11 (SIGSEGV), code 2 (SEGV_ACCERR), fault addr 0x756f15a214
+[stdout] 02-15 10:20:37.653  6901  6901 F DEBUG   :     x0  000000757d9fee58  x1  000000756eb53f50  x2  000000757d400000  x3  ffffffff9a31b499
+[stdout] 02-15 10:20:37.653  6901  6901 F DEBUG   :     x4  001350fd7a000000  x5  0000000000000018  x6  0000007618ab4000  x7  00000000000518be
+[stdout] 02-15 10:20:37.653  6901  6901 F DEBUG   :     x8  000000756f15a210  x9  000000756f15a214  x10 0000000000000076  x11 0000000038bac926
+[stdout] 02-15 10:20:37.653  6901  6901 F DEBUG   :     x12 0000000000000018  x13 0000000065ce55f5  x14 002512f7f8ee4080  x15 000056d3b3ab5c7d
+[stdout] 02-15 10:20:37.653  6901  6901 F DEBUG   :     x16 00000076181a7c50  x17 000000761589ac10  x18 000000756eb53190  x19 00000075894c4180
+[stdout] 02-15 10:20:37.653  6901  6901 F DEBUG   :     x20 000000756eb54060  x21 000000757d4c0010  x22 000000761532fba8  x23 0000000000000000
+[stdout] 02-15 10:20:37.653  6901  6901 F DEBUG   :     x24 0000000000000000  x25 00000075933ddc19  x26 000000756eb54588  x27 0000000000000000
+[stdout] 02-15 10:20:37.653  6901  6901 F DEBUG   :     x28 000000756eb54588  x29 000000756eb53fb0
+[stdout] 02-15 10:20:37.653  6901  6901 F DEBUG   :     sp  000000756eb53f40  lr  000000756f108090  pc  000000761589ac20
+[stdout] 02-15 10:20:37.653  1735  1758 I ActivityManager: Displayed dev.flutter.scenarios/.ExternalTextureFlutterActivity: +174ms
+[stdout] 02-15 10:20:37.654  2846  2846 I GoogleInputMethod: onFinishInput() : Dummy InputConnection bound
+[stdout] 02-15 10:20:37.654  2846  2846 I GoogleInputMethod: onStartInput() : Dummy InputConnection bound
+[stdout] 02-15 10:20:37.655  6901  6901 F DEBUG   : 
+[stdout] 02-15 10:20:37.655  6901  6901 F DEBUG   : backtrace:
+[stdout] 02-15 10:20:37.655  6901  6901 F DEBUG   :     #00 pc 000000000000bc20  /system/lib64/libutils.so (android::RefBase::incStrong(void const*) const+16)
+[stdout] 02-15 10:20:37.655  6901  6901 F DEBUG   :     #01 pc 000000000004a08c  /system/lib64/libstagefright_ccodec.so (android::CCodecBufferChannel::setSurface(android::sp<android::Surface> const&)+240)
+[stdout] 02-15 10:20:37.655  6901  6901 F DEBUG   :     #02 pc 0000000000036c98  /system/lib64/libstagefright_ccodec.so (_ZNSt3__110__function6__funcIZN7android6CCodec9configureERKNS2_2spINS2_8AMessageEEEE3$_4NS_9allocatorIS9_EEFivEEclEv+660)
+[stdout] 02-15 10:20:37.655  6901  6901 F DEBUG   :     #03 pc 000000000002e174  /system/lib64/libstagefright_ccodec.so (android::CCodec::configure(android::sp<android::AMessage> const&)+724)
+[stdout] 02-15 10:20:37.655  6901  6901 F DEBUG   :     #04 pc 0000000000029e7c  /system/lib64/libstagefright_ccodec.so (android::CCodec::onMessageReceived(android::sp<android::AMessage> const&)+776)
+[stdout] 02-15 10:20:37.655  6901  6901 F DEBUG   :     #05 pc 0000000000019904  /system/lib64/libstagefright_foundation.so (android::AHandler::deliverMessage(android::sp<android::AMessage> const&)+92)
+[stdout] 02-15 10:20:37.655  6901  6901 F DEBUG   :     #06 pc 0000000000020f6c  /system/lib64/libstagefright_foundation.so (android::AMessage::deliver()+180)
+[stdout] 02-15 10:20:37.655  6901  6901 F DEBUG   :     #07 pc 000000000001c48c  /system/lib64/libstagefright_foundation.so (android::ALooper::loop()+556)
+[stdout] 02-15 10:20:37.655  6901  6901 F DEBUG   :     #08 pc 000000000000f974  /system/lib64/libutils.so (android::Thread::_threadLoop(void*)+276)
+[stdout] 02-15 10:20:37.655  6901  6901 F DEBUG   :     #09 pc 0000000000081080  /system/lib64/libc.so (__pthread_start(void*)+36)
+[stdout] 02-15 10:20:37.655  6901  6901 F DEBUG   :     #10 pc 0000000000023510  /system/lib64/libc.so (__start_thread+68)
+[stdout] 02-15 10:20:37.661  6840  6881 D eglCodecCommon: setVertexArrayObject: set vao to 0 (0) 1 0
+[stdout] 02-15 10:20:37.667  1384  2744 D gralloc_ranchu: gralloc_alloc: Creating ashmem region of size 10371072
+[stdout] 02-15 10:20:37.667  1384  2162 D gralloc_ranchu: gralloc_alloc: Creating ashmem region of size 9826304
+[stdout] 02-15 10:20:37.678  2863  4286 D RcsProvisioning: No backup token found
+[stdout] 02-15 10:20:37.678  2863  4286 D RcsProvisioning: Clearing backup token
+[stdout] 02-15 10:20:37.678  2863  4286 D RcsProvisioning: Exception while getting subscriber Id. Using default
+[stdout] 02-15 10:20:37.686  2863  4286 I CarrierServices: [209] RcsStateProvider.onMigrationComplete: Deleted transfers file: false
+[stdout] 02-15 10:20:37.687  2863  4286 W RcsProvisioning: Failed to read configuration: /data/user/0/com.google.android.apps.messaging/files/rcsconfig (No such file or directory)
+[stdout] 02-15 10:20:37.687  2863  4286 W RcsProvisioning: java.io.FileNotFoundException: /data/user/0/com.google.android.apps.messaging/files/rcsconfig (No such file or directory)
+[stdout] 02-15 10:20:37.687  2863  4286 W RcsProvisioning: 	at java.io.FileInputStream.open0(Native Method)
+[stdout] 02-15 10:20:37.687  2863  4286 W RcsProvisioning: 	at java.io.FileInputStream.open(FileInputStream.java:231)
+[stdout] 02-15 10:20:37.687  2863  4286 W RcsProvisioning: 	at java.io.FileInputStream.<init>(FileInputStream.java:165)
+[stdout] 02-15 10:20:37.687  2863  4286 W RcsProvisioning: 	at android.app.ContextImpl.openFileInput(ContextImpl.java:560)
+[stdout] 02-15 10:20:37.687  2863  4286 W RcsProvisioning: 	at android.content.ContextWrapper.openFileInput(ContextWrapper.java:202)
+[stdout] 02-15 10:20:37.687  2863  4286 W RcsProvisioning: 	at ion.a(SourceFile:2)
+[stdout] 02-15 10:20:37.687  2863  4286 W RcsProvisioning: 	at idl.a(SourceFile:4)
+[stdout] 02-15 10:20:37.687  2863  4286 W RcsProvisioning: 	at idm.a(SourceFile:7)
+[stdout] 02-15 10:20:37.687  2863  4286 W RcsProvisioning: 	at iez.buildConferencesFileName(SourceFile:30)
+[stdout] 02-15 10:20:37.687  2863  4286 W RcsProvisioning: 	at com.google.android.apps.messaging.rcsmigration.RcsStateProvider.onMigrationComplete(SourceFile:48)
+[stdout] 02-15 10:20:37.687  2863  4286 W RcsProvisioning: 	at com.google.android.ims.rcsmigration.IRcsStateProvider$Stub.dispatchTransaction(SourceFile:14)
+[stdout] 02-15 10:20:37.687  2863  4286 W RcsProvisioning: 	at com.google.android.aidl.BaseStub.onTransact(SourceFile:18)
+[stdout] 02-15 10:20:37.687  2863  4286 W RcsProvisioning: 	at android.os.Binder.execTransact(Binder.java:731)
+[stdout] 02-15 10:20:37.687  2863  4286 D RcsProvisioning: Retrieving backup token
+[stdout] 02-15 10:20:37.687  2863  4286 D RcsProvisioning: Exception while getting subscriber Id. Using default
+[stdout] 02-15 10:20:37.785  1572  1709 W SurfaceFlinger: Attempting to set client state on removed layer: Surface(name=AppWindowToken{7e3563e token=Token{2196f9 ActivityRecord{73fc9c0 u0 dev.flutter.scenarios/.ExternalTextureFlutterActivity t10}}})/@0x5c21b8f - animation-leash#0
+[stdout] 02-15 10:20:37.785  1572  1709 W SurfaceFlinger: Attempting to set client state on removed layer: Surface(name=AppWindowToken{310ffb3 token=Token{f40d922 ActivityRecord{df186ed u0 com.android.launcher3/.Launcher t5}}})/@0x278ca58 - animation-leash#0
+[stdout] 02-15 10:20:37.785  1572  1709 W SurfaceFlinger: Attempting to destroy on removed layer: Surface(name=AppWindowToken{7e3563e token=Token{2196f9 ActivityRecord{73fc9c0 u0 dev.flutter.scenarios/.ExternalTextureFlutterActivity t10}}})/@0x5c21b8f - animation-leash#0
+[stdout] 02-15 10:20:37.785  1572  1709 W SurfaceFlinger: Attempting to destroy on removed layer: Surface(name=AppWindowToken{310ffb3 token=Token{f40d922 ActivityRecord{df186ed u0 com.android.launcher3/.Launcher t5}}})/@0x278ca58 - animation-leash#0
+[stdout] 02-15 10:20:37.802  2647  2730 D EGL_emulation: eglMakeCurrent: 0x758c83b5e0: ver 3 0 (tinfo 0x758c80df40)
+[stdout] 02-15 10:20:37.809  1593  1593 E /system/bin/tombstoned: Tombstone written to: /data/tombstones/tombstone_05
+[stdout] 02-15 10:20:37.813  1735  1750 W BroadcastQueue: Background execution not allowed: receiving Intent { act=android.intent.action.DROPBOX_ENTRY_ADDED flg=0x10 (has extras) } to com.google.android.gms/.stats.service.DropBoxEntryAddedReceiver
+[stdout] 02-15 10:20:37.813  1735  1750 W BroadcastQueue: Background execution not allowed: receiving Intent { act=android.intent.action.DROPBOX_ENTRY_ADDED flg=0x10 (has extras) } to com.google.android.gms/.chimera.GmsIntentOperationService$PersistentTrustedReceiver
+[stdout] 02-15 10:20:37.816  1933  2157 D EGL_emulation: eglMakeCurrent: 0x75795b6c40: ver 3 0 (tinfo 0x758aeecba0)
+[stdout] 02-15 10:20:37.818  1933  2157 D EGL_emulation: eglMakeCurrent: 0x75795b6c40: ver 3 0 (tinfo 0x758aeecba0)
+[stdout] 02-15 10:20:37.819  1572  1643 W SurfaceFlinger: Attempting to set client state on removed layer: Splash Screen dev.flutter.scenarios#0
+[stdout] 02-15 10:20:37.819  1572  1643 W SurfaceFlinger: Attempting to destroy on removed layer: Splash Screen dev.flutter.scenarios#0
+[stdout] 02-15 10:20:37.826  2863  4286 D RcsProvisioning: No backup token found
+[stdout] 02-15 10:20:37.828  3621  3621 I CarrierServices: [2] aww.a: Unbinding RcsMigrationService
+[stdout] 02-15 10:20:37.828  2863  5308 I CarrierServices: [379] RcsStateProvider.onMigrationComplete: Migration complete.
+[stdout] 02-15 10:20:37.829  2863  5308 I CarrierServices: [379] inq.shouldUseCarrierServicesApkForV1Apis: Checking if using CarrierServices.apk is possible. Enabled: true, isAtLeastM: true, runningInsideBugle: true
+[stdout] 02-15 10:20:37.829  2863  5308 I CarrierServices: [379] inq.e: Network Operator: 310260
+[stdout] 02-15 10:20:37.829  2863  5308 I CarrierServices: [379] inq.e: carrierWithOldEcApis: false
+[stdout] 02-15 10:20:37.829  2863  5308 I CarrierServices: [379] inq.e: hasDialerThatSupportsNewEc: false
+[stdout] 02-15 10:20:37.829  2863  5308 I CarrierServices: [379] RcsStateProvider.onMigrationComplete: Rcs Engine should be running in cs.apk. Stopping JibeService.
+[stdout] 02-15 10:20:37.830  2863  5308 I CarrierServices: [379] RcsStateProvider.onMigrationComplete: JibeService stopped: true
+[stdout] 02-15 10:20:37.830  2863  5308 I CarrierServices: [379] inq.e: Network Operator: 310260
+[stdout] 02-15 10:20:37.830  2863  5308 I CarrierServices: [379] inq.e: carrierWithOldEcApis: false
+[stdout] 02-15 10:20:37.830  2863  5308 I CarrierServices: [379] inq.e: hasDialerThatSupportsNewEc: false
+[stdout] 02-15 10:20:37.830  2863  5308 I CarrierServices: [379] jsn.connect: shouldUseCarrierServicesJibeService: true, CarrierServices rcs service found: true
+[stdout] 02-15 10:20:37.830  2863  5308 I CarrierServices: [379] jsn.connect: Binding to JibeService in CarrierServices.
+[stdout] 02-15 10:20:37.830  2863  2863 D RcsClientLib: Service com.google.android.rcs.client.chatsession.ChatSessionService connected. Will notify listeners: true
+[stdout] 02-15 10:20:37.830  2863  2863 V BugleRcs: com.google.android.rcs.client.chatsession.ChatSessionService RCS service connected
+[stdout] 02-15 10:20:37.830  2863  5308 I CarrierServices: [379] inq.e: Network Operator: 310260
+[stdout] 02-15 10:20:37.831  2863  5308 I CarrierServices: [379] inq.e: carrierWithOldEcApis: false
+[stdout] 02-15 10:20:37.831  2863  5308 I CarrierServices: [379] inq.e: hasDialerThatSupportsNewEc: false
+[stdout] 02-15 10:20:37.831  2863  5308 I CarrierServices: [379] jsn.connect: shouldUseCarrierServicesJibeService: true, CarrierServices rcs service found: true
+[stdout] 02-15 10:20:37.831  2863  5308 I CarrierServices: [379] jsn.connect: Binding to JibeService in CarrierServices.
+[stdout] 02-15 10:20:37.831  2863  2863 D RcsClientLib: Service com.google.android.rcs.client.events.EventService connected. Will notify listeners: true
+[stdout] 02-15 10:20:37.831  2863  2863 V BugleRcs: com.google.android.rcs.client.events.EventService RCS service connected
+[stdout] 02-15 10:20:37.831  2863  5308 I CarrierServices: [379] inq.e: Network Operator: 310260
+[stdout] 02-15 10:20:37.831  2863  5308 I CarrierServices: [379] inq.e: carrierWithOldEcApis: false
+[stdout] 02-15 10:20:37.831  2863  5308 I CarrierServices: [379] inq.e: hasDialerThatSupportsNewEc: false
+[stdout] 02-15 10:20:37.832  2863  5308 I CarrierServices: [379] jsn.connect: shouldUseCarrierServicesJibeService: true, CarrierServices rcs service found: true
+[stdout] 02-15 10:20:37.832  2863  5308 I CarrierServices: [379] jsn.connect: Binding to JibeService in CarrierServices.
+[stdout] 02-15 10:20:37.832  2863  2863 D RcsClientLib: Service com.google.android.rcs.client.contacts.ContactsService connected. Will notify listeners: true
+[stdout] 02-15 10:20:37.832  2863  2863 V BugleRcs: com.google.android.rcs.client.contacts.ContactsService RCS service connected
+[stdout] 02-15 10:20:37.832  2863  5308 I CarrierServices: [379] inq.e: Network Operator: 310260
+[stdout] 02-15 10:20:37.832  2863  5308 I CarrierServices: [379] inq.e: carrierWithOldEcApis: false
+[stdout] 02-15 10:20:37.832  2863  5308 I CarrierServices: [379] inq.e: hasDialerThatSupportsNewEc: false
+[stdout] 02-15 10:20:37.832  2863  5308 I CarrierServices: [379] jsn.connect: shouldUseCarrierServicesJibeService: true, CarrierServices rcs service found: true
+[stdout] 02-15 10:20:37.832  2863  5308 I CarrierServices: [379] jsn.connect: Binding to JibeService in CarrierServices.
+[stdout] 02-15 10:20:37.832  2863  2863 D RcsClientLib: Service com.google.android.rcs.client.filetransfer.FileTransferService connected. Will notify listeners: true
+[stdout] 02-15 10:20:37.832  2863  2863 V BugleRcs: com.google.android.rcs.client.filetransfer.FileTransferService RCS service connected
+[stdout] 02-15 10:20:37.832  2863  5308 I CarrierServices: [379] inq.e: Network Operator: 310260
+[stdout] 02-15 10:20:37.833  2863  5308 I CarrierServices: [379] inq.e: carrierWithOldEcApis: false
+[stdout] 02-15 10:20:37.833  2863  5308 I CarrierServices: [379] inq.e: hasDialerThatSupportsNewEc: false
+[stdout] 02-15 10:20:37.833  2863  5308 I CarrierServices: [379] jsn.connect: shouldUseCarrierServicesJibeService: true, CarrierServices rcs service found: true
+[stdout] 02-15 10:20:37.833  2863  5308 I CarrierServices: [379] jsn.connect: Binding to JibeService in CarrierServices.
+[stdout] 02-15 10:20:37.833  2863  2863 D RcsClientLib: Service com.google.android.rcs.client.locationsharing.LocationSharingService connected. Will notify listeners: true
+[stdout] 02-15 10:20:37.833  2863  2863 V BugleRcs: com.google.android.rcs.client.locationsharing.LocationSharingService RCS service connected
+[stdout] 02-15 10:20:37.834  2863  5308 I CarrierServices: [379] inq.e: Network Operator: 310260
+[stdout] 02-15 10:20:37.835  2863  5308 I CarrierServices: [379] inq.e: carrierWithOldEcApis: false
+[stdout] 02-15 10:20:37.835  2863  5308 I CarrierServices: [379] inq.e: hasDialerThatSupportsNewEc: false
+[stdout] 02-15 10:20:37.839  2863  5308 I CarrierServices: [379] jsn.connect: shouldUseCarrierServicesJibeService: true, CarrierServices rcs service found: true
+[stdout] 02-15 10:20:37.839  2863  5308 I CarrierServices: [379] jsn.connect: Binding to JibeService in CarrierServices.
+[stdout] 02-15 10:20:37.839  2863  2863 D RcsClientLib: Service com.google.android.rcs.client.ims.ImsConnectionTrackerService connected. Will notify listeners: true
+[stdout] 02-15 10:20:37.839  2863  2863 V BugleRcs: com.google.android.rcs.client.ims.ImsConnectionTrackerService RCS service connected
+[stdout] 02-15 10:20:37.840  2863  2863 V BugleRcs: kicking off RCS sending/receiving
+[stdout] 02-15 10:20:37.840  2863  2863 V BugleAction: no RCS because we're not registered
+[stdout] 02-15 10:20:37.840  2863  5308 I CarrierServices: [379] inq.e: Network Operator: 310260
+[stdout] 02-15 10:20:37.840  2863  5308 I CarrierServices: [379] inq.e: carrierWithOldEcApis: false
+[stdout] 02-15 10:20:37.840  2863  5308 I CarrierServices: [379] inq.e: hasDialerThatSupportsNewEc: false
+[stdout] 02-15 10:20:37.840  2863  5308 I CarrierServices: [379] jsn.connect: shouldUseCarrierServicesJibeService: true, CarrierServices rcs service found: true
+[stdout] 02-15 10:20:37.840  2863  5308 I CarrierServices: [379] jsn.connect: Binding to JibeService in CarrierServices.
+[stdout] 02-15 10:20:37.841  2863  2863 D RcsClientLib: Service com.google.android.rcs.client.profile.RcsProfileService connected. Will notify listeners: true
+[stdout] 02-15 10:20:37.841  2863  2863 V BugleRcs: com.google.android.rcs.client.profile.RcsProfileService RCS service connected
+[stdout] 02-15 10:20:37.841  2863  2863 V BugleRcs: kicking off RCS sending/receiving
+[stdout] 02-15 10:20:37.841  2863  5308 I CarrierServices: [379] inq.e: Network Operator: 310260
+[stdout] 02-15 10:20:37.841  2863  2863 V BugleAction: no RCS because we're not registered
+[stdout] 02-15 10:20:37.841  3621  3657 W CarrierServices: [190] bmc.a: No config URL. RCS will be disabled!
+[stdout] 02-15 10:20:37.841  2863  2863 I BugleRcs: RcsAvailability ACS url: null
+[stdout] 02-15 10:20:37.841  2863  5308 I CarrierServices: [379] inq.e: carrierWithOldEcApis: false
+[stdout] 02-15 10:20:37.841  2863  5308 I CarrierServices: [379] inq.e: hasDialerThatSupportsNewEc: false
+[stdout] 02-15 10:20:37.841  2863  5308 I CarrierServices: [379] jsn.connect: shouldUseCarrierServicesJibeService: true, CarrierServices rcs service found: true
+[stdout] 02-15 10:20:37.841  2863  5308 I CarrierServices: [379] jsn.connect: Binding to JibeService in CarrierServices.
+[stdout] 02-15 10:20:37.841  2863  2863 D RcsClientLib: Service com.google.android.rcs.client.businessinfo.BusinessInfoService connected. Will notify listeners: true
+[stdout] 02-15 10:20:37.841  2863  2863 V BugleRcs: com.google.android.rcs.client.businessinfo.BusinessInfoService RCS service connected
+[stdout] 02-15 10:20:37.841  2863  2863 V BugleRcs: kicking off RCS sending/receiving
+[stdout] 02-15 10:20:37.842  2863  2863 V BugleAction: no RCS because we're not registered
+[stdout] 02-15 10:20:37.842  3621  3657 W CarrierServices: [190] bmc.a: No config URL. RCS will be disabled!
+[stdout] 02-15 10:20:37.842  2863  2863 I BugleRcs: RcsAvailability ACS url: null
+[stdout] 02-15 10:20:37.842  2863  5308 W RcsProvisioning: Failed to read configuration: /data/user/0/com.google.android.apps.messaging/files/rcsconfig (No such file or directory)
+[stdout] 02-15 10:20:37.842  2863  5308 W RcsProvisioning: java.io.FileNotFoundException: /data/user/0/com.google.android.apps.messaging/files/rcsconfig (No such file or directory)
+[stdout] 02-15 10:20:37.842  2863  5308 W RcsProvisioning: 	at java.io.FileInputStream.open0(Native Method)
+[stdout] 02-15 10:20:37.842  2863  5308 W RcsProvisioning: 	at java.io.FileInputStream.open(FileInputStream.java:231)
+[stdout] 02-15 10:20:37.842  2863  5308 W RcsProvisioning: 	at java.io.FileInputStream.<init>(FileInputStream.java:165)
+[stdout] 02-15 10:20:37.842  2863  5308 W RcsProvisioning: 	at android.app.ContextImpl.openFileInput(ContextImpl.java:560)
+[stdout] 02-15 10:20:37.842  2863  5308 W RcsProvisioning: 	at android.content.ContextWrapper.openFileInput(ContextWrapper.java:202)
+[stdout] 02-15 10:20:37.842  2863  5308 W RcsProvisioning: 	at ion.a(SourceFile:2)
+[stdout] 02-15 10:20:37.842  2863  5308 W RcsProvisioning: 	at idl.a(SourceFile:4)
+[stdout] 02-15 10:20:37.842  2863  5308 W RcsProvisioning: 	at idm.a(SourceFile:7)
+[stdout] 02-15 10:20:37.842  2863  5308 W RcsProvisioning: 	at com.google.android.apps.messaging.rcsmigration.RcsStateProvider.onMigrationComplete(SourceFile:27)
+[stdout] 02-15 10:20:37.842  2863  5308 W RcsProvisioning: 	at com.google.android.ims.rcsmigration.IRcsStateProvider$Stub.dispatchTransaction(SourceFile:14)
+[stdout] 02-15 10:20:37.842  2863  5308 W RcsProvisioning: 	at com.google.android.aidl.BaseStub.onTransact(SourceFile:18)
+[stdout] 02-15 10:20:37.842  2863  5308 W RcsProvisioning: 	at android.os.Binder.execTransact(Binder.java:731)
+[stdout] 02-15 10:20:37.842  2863  5308 D RcsProvisioning: Retrieving backup token
+[stdout] 02-15 10:20:37.843  2863  5308 D RcsProvisioning: Exception while getting subscriber Id. Using default
+[stdout] 02-15 10:20:37.857  1735  1810 W InputDispatcher: channel 'ad6b076 dev.flutter.scenarios/dev.flutter.scenarios.ExternalTextureFlutterActivity (server)' ~ Consumer closed input channel or an error occurred.  events=0x9
+[stdout] 02-15 10:20:37.857  1735  1810 E InputDispatcher: channel 'ad6b076 dev.flutter.scenarios/dev.flutter.scenarios.ExternalTextureFlutterActivity (server)' ~ Channel is unrecoverably broken and will be disposed!
+[stdout] 02-15 10:20:37.857  1588  2005 V C2Store : in ~ComponentModule
+[stdout] 02-15 10:20:37.857  1588  2005 V C2Store : unloading dll
+[stdout] 02-15 10:20:37.858  1735  3126 I ActivityManager: Process dev.flutter.scenarios (pid 6840) has died: fore TOP 
+[stdout] 02-15 10:20:37.858  1735  3126 W ActivityManager: Force removing ActivityRecord{73fc9c0 u0 dev.flutter.scenarios/.ExternalTextureFlutterActivity t10}: app died, no saved state
+[stdout] 02-15 10:20:37.858  1735  1753 W libprocessgroup: kill(-6840, 9) failed: No such process
+[stdout] 02-15 10:20:37.859  1735  2050 I WindowManager: WIN DEATH: Window{ad6b076 u0 dev.flutter.scenarios/dev.flutter.scenarios.ExternalTextureFlutterActivity}
+[stdout] 02-15 10:20:37.859  1735  2050 W InputDispatcher: Attempted to unregister already unregistered input channel 'ad6b076 dev.flutter.scenarios/dev.flutter.scenarios.ExternalTextureFlutterActivity (server)'
+[stdout] 02-15 10:20:37.859  1573  1573 I Zygote  : Process 6840 exited due to signal (11)
+[stdout] 02-15 10:20:37.859  1572  1709 W SurfaceFlinger: Attempting to destroy on removed layer: AppWindowToken{7e3563e token=Token{2196f9 ActivityRecord{73fc9c0 u0 dev.flutter.scenarios/.ExternalTextureFlutterActivity t10}}}#0
+[stdout] 02-15 10:20:37.860  1735  3126 W ActivityManager: Crash of app dev.flutter.scenarios running instrumentation ComponentInfo{dev.flutter.scenarios.test/dev.flutter.TestRunner}
+[stdout] 02-15 10:20:37.860  1735  3126 I ActivityManager: Force stopping dev.flutter.scenarios appid=10098 user=0: finished inst
+[stdout] 02-15 10:20:37.860  1735  6915 W Binder  : Outgoing transactions from this process must be FLAG_ONEWAY
+[stdout] 02-15 10:20:37.860  1735  6915 W Binder  : java.lang.Throwable
+[stdout] 02-15 10:20:37.860  1735  6915 W Binder  : 	at android.os.BinderProxy.transact(Binder.java:1114)
+[stdout] 02-15 10:20:37.860  1735  6915 W Binder  : 	at android.app.IInstrumentationWatcher$Stub$Proxy.instrumentationFinished(IInstrumentationWatcher.java:164)
+[stdout] 02-15 10:20:37.860  1735  6915 W Binder  : 	at com.android.server.am.InstrumentationReporter$MyThread.run(InstrumentationReporter.java:86)
+[stdout] 02-15 10:20:37.860  6827  6827 D AndroidRuntime: Shutting down VM
+[stdout] 02-15 10:20:37.862  1735  1758 W ActivityManager: setHasOverlayUi called on unknown pid: 6840
+[stdout] 02-15 10:20:37.868  1572  1572 W SurfaceFlinger: couldn't log to binary event log: overflow.
+[stdout] 02-15 10:20:37.888  1384  2162 D gralloc_ranchu: gralloc_alloc: Creating ashmem region of size 10371072
+[stdout] 02-15 10:20:37.889  1384  2162 I chatty  : uid=1000(system) HwBinder:1384_2 identical 1 line
+[stdout] 02-15 10:20:37.889  1384  2162 D gralloc_ranchu: gralloc_alloc: Creating ashmem region of size 10371072
+[stdout] 02-15 10:20:37.890  2846  2846 I GoogleInputMethod: onFinishInput() : Dummy InputConnection bound
+[stdout] 02-15 10:20:37.890  2846  2846 I GoogleInputMethod: onStartInput() : Dummy InputConnection bound
+[stdout] 02-15 10:20:37.896  1735  1753 W libprocessgroup: kill(-6840, 9) failed: No such process
+[stdout] 02-15 10:20:37.896  1735  1753 I libprocessgroup: Successfully killed process cgroup uid 10098 pid 6840 in 37ms
+[stdout] 02-15 10:20:37.903  2647  2730 D EGL_emulation: eglMakeCurrent: 0x758c83b5e0: ver 3 0 (tinfo 0x758c80df40)
+[stdout] 02-15 10:20:37.908  1572  1572 D SurfaceFlinger: duplicate layer name: changing Surface(name=773ae4d StatusBar)/@0x80ae899 - animation-leash to Surface(name=773ae4d StatusBar)/@0x80ae899 - animation-leash#1
+[stdout] 02-15 10:20:37.921  1933  2157 D EGL_emulation: eglMakeCurrent: 0x75795b6c40: ver 3 0 (tinfo 0x758aeecba0)
+[stdout] 02-15 10:20:37.929  1735  1750 I ActivityManager: Force stopping dev.flutter.scenarios appid=10098 user=-1: deletePackageX
+[stdout] 02-15 10:20:37.936  1933  2157 D EGL_emulation: eglMakeCurrent: 0x75795b6c40: ver 3 0 (tinfo 0x758aeecba0)
+[stdout] 02-15 10:20:37.943  2863  5308 D RcsProvisioning: No backup token found
+[stdout] 02-15 10:20:37.943  2863  5308 D RcsProvisioning: Clearing backup token
+[stdout] 02-15 10:20:37.943  2863  5308 D RcsProvisioning: Exception while getting subscriber Id. Using default
+[stdout] 02-15 10:20:37.948  2863  5308 I CarrierServices: [379] RcsStateProvider.onMigrationComplete: Deleted transfers file: false
+[stdout] 02-15 10:20:37.972  2863  5308 W RcsProvisioning: Failed to read configuration: /data/user/0/com.google.android.apps.messaging/files/rcsconfig (No such file or directory)
+[stdout] 02-15 10:20:37.972  2863  5308 W RcsProvisioning: java.io.FileNotFoundException: /data/user/0/com.google.android.apps.messaging/files/rcsconfig (No such file or directory)
+[stdout] 02-15 10:20:37.972  2863  5308 W RcsProvisioning: 	at java.io.FileInputStream.open0(Native Method)
+[stdout] 02-15 10:20:37.972  2863  5308 W RcsProvisioning: 	at java.io.FileInputStream.open(FileInputStream.java:231)
+[stdout] 02-15 10:20:37.972  2863  5308 W RcsProvisioning: 	at java.io.FileInputStream.<init>(FileInputStream.java:165)
+[stdout] 02-15 10:20:37.972  2863  5308 W RcsProvisioning: 	at android.app.ContextImpl.openFileInput(ContextImpl.java:560)
+[stdout] 02-15 10:20:37.972  2863  5308 W RcsProvisioning: 	at android.content.ContextWrapper.openFileInput(ContextWrapper.java:202)
+[stdout] 02-15 10:20:37.972  2863  5308 W RcsProvisioning: 	at ion.a(SourceFile:2)
+[stdout] 02-15 10:20:37.972  2863  5308 W RcsProvisioning: 	at idl.a(SourceFile:4)
+[stdout] 02-15 10:20:37.972  2863  5308 W RcsProvisioning: 	at idm.a(SourceFile:7)
+[stdout] 02-15 10:20:37.972  2863  5308 W RcsProvisioning: 	at iez.buildConferencesFileName(SourceFile:30)
+[stdout] 02-15 10:20:37.972  2863  5308 W RcsProvisioning: 	at com.google.android.apps.messaging.rcsmigration.RcsStateProvider.onMigrationComplete(SourceFile:48)
+[stdout] 02-15 10:20:37.972  2863  5308 W RcsProvisioning: 	at com.google.android.ims.rcsmigration.IRcsStateProvider$Stub.dispatchTransaction(SourceFile:14)
+[stdout] 02-15 10:20:37.972  2863  5308 W RcsProvisioning: 	at com.google.android.aidl.BaseStub.onTransact(SourceFile:18)
+[stdout] 02-15 10:20:37.972  2863  5308 W RcsProvisioning: 	at android.os.Binder.execTransact(Binder.java:731)
+[stdout] 02-15 10:20:37.972  2863  5308 D RcsProvisioning: Retrieving backup token
+[stdout] 02-15 10:20:37.972  2863  5308 D RcsProvisioning: Exception while getting subscriber Id. Using default
+[stdout] 02-15 10:20:37.973  1579  1579 I keystore: clear_uid 10098
+[stdout] 02-15 10:20:37.973  1735  1763 D PackageManager: Instant App installer not found with android.intent.action.INSTALL_INSTANT_APP_PACKAGE
+[stdout] 02-15 10:20:37.973  1735  1763 D PackageManager: Clear ephemeral installer activity
+[stdout] 02-15 10:20:37.987  1735  1763 I system_server: Explicit concurrent copying GC freed 45480(2MB) AllocSpace objects, 16(640KB) LOS objects, 40% free, 8MB/14MB, paused 17us total 14.150ms
+[stdout] 02-15 10:20:38.012  1735  1763 I ActivityManager: Force stopping dev.flutter.scenarios appid=10098 user=0: pkg removed
+[stdout] 02-15 10:20:38.015  1735  1750 W BroadcastQueue: Background execution not allowed: receiving Intent { act=android.intent.action.PACKAGE_REMOVED dat=package:dev.flutter.scenarios flg=0x4000010 (has extras) } to com.android.musicfx/.Compatibility$Receiver
+[stdout] 02-15 10:20:38.015  1735  1750 W BroadcastQueue: Background execution not allowed: receiving Intent { act=android.intent.action.PACKAGE_REMOVED dat=package:dev.flutter.scenarios flg=0x4000010 (has extras) } to com.google.android.gms/.games.chimera.GamesSystemBroadcastReceiverProxy
+[stdout] 02-15 10:20:38.015  1735  1750 W BroadcastQueue: Background execution not allowed: receiving Intent { act=android.intent.action.PACKAGE_REMOVED dat=package:dev.flutter.scenarios flg=0x4000010 (has extras) } to com.google.android.gms/.chimera.GmsIntentOperationService$PersistentTrustedReceiver
+[stdout] 02-15 10:20:38.015  1735  1750 W BroadcastQueue: Background execution not allowed: receiving Intent { act=android.intent.action.PACKAGE_REMOVED dat=package:dev.flutter.scenarios flg=0x4000010 (has extras) } to com.google.android.googlequicksearchbox/com.google.android.apps.gsa.googlequicksearchbox.GelStubAppWatcher
+[stdout] 02-15 10:20:38.016  1735  1874 E TaskPersister: File error accessing recents directory (directory doesn't exist?).
+[stdout] 02-15 10:20:38.022  1964  1964 D CarrierSvcBindHelper: No carrier app for: 0
+[stdout] 02-15 10:20:38.024  1735  1735 W system_server: Unknown chunk type '200'.
+[stdout] 02-15 10:20:38.025  1735  1735 D ZenLog  : config: removeAutomaticZenRules,ZenModeConfig[user=0,allowAlarms=true,allowMedia=true,allowSystem=false,allowReminders=false,allowEvents=false,allowCalls=true,allowRepeatCallers=true,allowMessages=false,allowCallsFrom=stars,allowMessagesFrom=contacts,suppressedVisualEffects=511,areChannelsBypassingDnd=false,automaticRules={EVENTS_DEFAULT_RULE=ZenRule[enabled=false,snoozing=false,name=Event,zenMode=ZEN_MODE_IMPORTANT_INTERRUPTIONS,conditionId=condition://android/event?userId=-10000&calendar=&reply=1,condition=Condition[id=condition://android/event?userId=-10000&calendar=&reply=1,summary=...,line1=...,line2=...,icon=0,state=STATE_FALSE,flags=2],component=ComponentInfo{android/com.android.server.notification.EventConditionProvider},id=EVENTS_DEFAULT_RULE,creationTime=1679084832814,enabler=null], EVERY_NIGHT_DEFAULT_RULE=ZenRule[enabled=false,snoozing=false,name=Sleeping,zenMode=ZEN_MODE_IMPORTANT_INTERRUPTIONS,conditionId=condition://android/schedule?days=1.2.3.4.5.6.7&start=22.0&end=7.0&exitAtAlarm=true,condition=Condition[id=condition://android/schedule?days=1.2.3.4.5.6.7&start=22.0&end=7.0&exitAtAlarm=true,summary=...,line1=...,line2=...,icon=0,state=STATE_FALSE,flags=2],component=ComponentInfo{android/com.android.server.notification.ScheduleConditionProvider},id=EVERY_NIGHT_DEFAULT_RULE,creationTime=1679084832814,enabler=null]},manualRule=null],Diff[]
+[stdout] 02-15 10:20:38.025  1735  1735 I ConditionProviders: Disallowing condition provider dev.flutter.scenarios
+[stdout] 02-15 10:20:38.026  1735  1811 I InputReader: Reconfiguring input devices.  changes=0x00000010
+[stdout] 02-15 10:20:38.026  4770  6816 I BlockstoreStorage: Clearing all the Blockstore Data for package dev.flutter.scenarios [CONTEXT service_id=258 ]
+[stdout] 02-15 10:20:38.026  4770  6816 I BlockstoreStorage: Clearing all the Blockstore Data for 1 packages [CONTEXT service_id=258 ]
+[stdout] 02-15 10:20:38.030  1735  1846 D WifiConfigManager: Remove all networks for app ApplicationInfo{b46fa72 dev.flutter.scenarios}
+[stdout] 02-15 10:20:38.031  1735  1735 D ZenLog  : set_zen_mode: off,removeAutomaticZenRules
+[stdout] 02-15 10:20:38.033  4770  4876 E Icing   : Couldn't handle android.intent.action.PACKAGE_REMOVED intent due to initialization failure.
+[stdout] 02-15 10:20:38.035  4770  4876 W Icing   : IndexManager failed to initialize. AppIndex.API is unavailable.
+[stdout] 02-15 10:20:38.041  1735  2283 W ActivityManager: Unable to start service Intent { act=com.android.vending.developergroupidinfo.IDeveloperGroupIdInfoService.BIND cmp=com.android.vending/com.google.android.finsky.developergroupidinfo.DeveloperGroupIdInfoService } U=0: not found
+[stdout] 02-15 10:20:38.044  1735  1941 I GnssLocationProvider: WakeLock acquired by sendMessage(REPORT_SV_STATUS, 0, com.android.server.location.GnssLocationProvider$SvStatusInfo@5ee1496)
+[stdout] 02-15 10:20:38.045  4770  4770 D BoundBrokerSvc: onBind: Intent { act=com.google.android.gms.common.BIND_SHARED_PREFS pkg=com.google.android.gms }
+[stdout] 02-15 10:20:38.045  4770  4770 D BoundBrokerSvc: Loading bound service for intent: Intent { act=com.google.android.gms.common.BIND_SHARED_PREFS pkg=com.google.android.gms }
+[stdout] 02-15 10:20:38.046  4770  4876 I Icing   : IndexChimeraService.getServiceInterface callingPackage=com.google.android.gms componentName=ContactsIndexer serviceId=33
+[stdout] 02-15 10:20:38.047  4770  4889 I Icing   : IndexChimeraService.getServiceInterface callingPackage=com.google.android.gms componentName=AppsCorpus serviceId=36
+[stdout] 02-15 10:20:38.047  4770  4770 W GmscoreIpa: Apps indexing failed. [CONTEXT service_id=255 ]
+[stdout] 02-15 10:20:38.047  4770  4770 W GmscoreIpa: ciev: API: AppIndexing.API is not available on this device. Connection failed with: ConnectionResult{statusCode=API_UNAVAILABLE, resolution=null, message=null}
+[stdout] 02-15 10:20:38.047  4770  4770 W GmscoreIpa: 	at ciez.a(:com.google.android.gms@214515028@21.45.15 (100400-411636772):2)
+[stdout] 02-15 10:20:38.047  4770  4770 W GmscoreIpa: 	at wlo.c(:com.google.android.gms@214515028@21.45.15 (100400-411636772):0)
+[stdout] 02-15 10:20:38.047  4770  4770 W GmscoreIpa: 	at wof.p(:com.google.android.gms@214515028@21.45.15 (100400-411636772):4)
+[stdout] 02-15 10:20:38.047  4770  4770 W GmscoreIpa: 	at wof.d(:com.google.android.gms@214515028@21.45.15 (100400-411636772):0)
+[stdout] 02-15 10:20:38.047  4770  4770 W GmscoreIpa: 	at wof.g(:com.google.android.gms@214515028@21.45.15 (100400-411636772):19)
+[stdout] 02-15 10:20:38.047  4770  4770 W GmscoreIpa: 	at wof.onConnectionFailed(:com.google.android.gms@214515028@21.45.15 (100400-411636772):0)
+[stdout] 02-15 10:20:38.047  4770  4770 W GmscoreIpa: 	at xgi.gE(:com.google.android.gms@214515028@21.45.15 (100400-411636772):0)
+[stdout] 02-15 10:20:38.047  4770  4770 W GmscoreIpa: 	at xfi.b(:com.google.android.gms@214515028@21.45.15 (100400-411636772):1)
+[stdout] 02-15 10:20:38.047  4770  4770 W GmscoreIpa: 	at xez.a(:com.google.android.gms@214515028@21.45.15 (100400-411636772):7)
+[stdout] 02-15 10:20:38.047  4770  4770 W GmscoreIpa: 	at xfc.handleMessage(:com.google.android.gms@214515028@21.45.15 (100400-411636772):23)
+[stdout] 02-15 10:20:38.047  4770  4770 W GmscoreIpa: 	at android.os.Handler.dispatchMessage(Handler.java:106)
+[stdout] 02-15 10:20:38.047  4770  4770 W GmscoreIpa: 	at alyk.jj(:com.google.android.gms@214515028@21.45.15 (100400-411636772):0)
+[stdout] 02-15 10:20:38.047  4770  4770 W GmscoreIpa: 	at alyk.dispatchMessage(:com.google.android.gms@214515028@21.45.15 (100400-411636772):11)
+[stdout] 02-15 10:20:38.047  4770  4770 W GmscoreIpa: 	at android.os.Looper.loop(Looper.java:193)
+[stdout] 02-15 10:20:38.047  4770  4770 W GmscoreIpa: 	at android.os.HandlerThread.run(HandlerThread.java:65)
+[stdout] 02-15 10:20:38.047  4770  4889 W Icing   : IndexManager failed to initialize. SearchIndex.API is unavailable.
+[stdout] 02-15 10:20:38.047  1735  1751 D AutofillUI: destroySaveUiUiThread(): already destroyed
+[stdout] 02-15 10:20:38.047  1735  1749 D AutofillManagerServiceImpl: Set component for user 0 as AutofillServiceInfo[ServiceInfo{cb4dded com.google.android.gms.autofill.service.AutofillService}, settings:com.google.android.gms.autofill.ui.AutofillSettingsActivity, hasCompatPckgs:false]
+[stdout] 02-15 10:20:38.047  1735  1750 I ActivityManager: Force stopping dev.flutter.scenarios.test appid=10099 user=-1: deletePackageX
+[stdout] 02-15 10:20:38.047  4770  4770 D BoundBrokerSvc: onUnbind: Intent { act=com.google.android.gms.common.BIND_SHARED_PREFS pkg=com.google.android.gms }
+[stdout] 02-15 10:20:38.048  4770  4876 W Icing   : IndexManager failed to initialize. SearchIndex.API is unavailable.
+[stdout] 02-15 10:20:38.048  4770  6820 W IcingInternalCorpora: Couldn't fetch status for corpus apps
+[stdout] 02-15 10:20:38.048  4770  6804 W IcingInternalCorpora: Failed to get global search sources
+[stdout] 02-15 10:20:38.048  1735  1749 I GnssLocationProvider: WakeLock released by handleMessage(REPORT_SV_STATUS, 0, com.android.server.location.GnssLocationProvider$SvStatusInfo@5ee1496)
+[stdout] 02-15 10:20:38.051  4721  6812 I Fitness : FitCleanupIntentOperation received Intent android.intent.action.PACKAGE_REMOVED [CONTEXT service_id=17 ]
+[stdout] 02-15 10:20:38.074  2863  5308 D RcsProvisioning: No backup token found
+[stdout] 02-15 10:20:38.101  3621  3621 I CarrierServices: [2] aww.a: Unbinding RcsMigrationService
+[stdout] 02-15 10:20:38.101  1579  1579 I keystore: clear_uid 10099
+[stdout] 02-15 10:20:38.103  1735  1763 D PackageManager: Instant App installer not found with android.intent.action.INSTALL_INSTANT_APP_PACKAGE
+[stdout] 02-15 10:20:38.103  1735  1763 D PackageManager: Clear ephemeral installer activity
+[stdout] 02-15 10:20:38.104  3621  3621 E CarrierServices: [2] btx.a: Invalid signature found for com.android.contacts: E39B7BFBE0A67D78292F6CC62E06CA27A2EBF255
+[stdout] 02-15 10:20:38.106  3621  3621 E CarrierServices: [2] btx.a: Invalid signature found for com.android.contacts: E39B7BFBE0A67D78292F6CC62E06CA27A2EBF255
+[stdout] 02-15 10:20:38.119  1735  1763 I system_server: Explicit concurrent copying GC freed 30159(1729KB) AllocSpace objects, 12(496KB) LOS objects, 40% free, 8MB/14MB, paused 18us total 15.908ms
diff --git a/testing/scenario_app/ios/BUILD.gn b/testing/scenario_app/ios/BUILD.gn
index 605de6f33dce1e8708210bab9e260a603b1b3a0f..089de90141168c308fa02209e58e94eb2406b787 100644
--- a/testing/scenario_app/ios/BUILD.gn
+++ b/testing/scenario_app/ios/BUILD.gn
@@ -2,8 +2,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//flutter/build/dart/dart.gni")
 import("//flutter/testing/rules/runtime_mode.gni")
-import("//third_party/dart/build/dart/copy_tree.gni")
+
+import("$dart_src/build/dart/copy_tree.gni")
 
 _app_framework_dir = "$root_out_dir/scenario_app/Scenarios/App.framework"
 
diff --git a/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost.xcodeproj/project.pbxproj b/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost.xcodeproj/project.pbxproj
new file mode 100644
index 0000000000000000000000000000000000000000..b67c72aabae64c9fb9521236ac60157eda601fd4
--- /dev/null
+++ b/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost.xcodeproj/project.pbxproj
@@ -0,0 +1,372 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 56;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		686382C62ABE173000E27AAD /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 686382C52ABE173000E27AAD /* AppDelegate.m */; };
+		686382C92ABE173000E27AAD /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 686382C82ABE173000E27AAD /* SceneDelegate.m */; };
+		686382CC2ABE173000E27AAD /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 686382CB2ABE173000E27AAD /* ViewController.m */; };
+		686382CF2ABE173000E27AAD /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 686382CD2ABE173000E27AAD /* Main.storyboard */; };
+		686382D12ABE173000E27AAD /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 686382D02ABE173000E27AAD /* Assets.xcassets */; };
+		686382D42ABE173000E27AAD /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 686382D22ABE173000E27AAD /* LaunchScreen.storyboard */; };
+		686382D72ABE173000E27AAD /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 686382D62ABE173000E27AAD /* main.m */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		686382C12ABE172F00E27AAD /* FlutterAppExtensionTestHost.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FlutterAppExtensionTestHost.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		686382C42ABE173000E27AAD /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
+		686382C52ABE173000E27AAD /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
+		686382C72ABE173000E27AAD /* SceneDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SceneDelegate.h; sourceTree = "<group>"; };
+		686382C82ABE173000E27AAD /* SceneDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SceneDelegate.m; sourceTree = "<group>"; };
+		686382CA2ABE173000E27AAD /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
+		686382CB2ABE173000E27AAD /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
+		686382CE2ABE173000E27AAD /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
+		686382D02ABE173000E27AAD /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		686382D32ABE173000E27AAD /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
+		686382D52ABE173000E27AAD /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		686382D62ABE173000E27AAD /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		686382BE2ABE172F00E27AAD /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		686382B82ABE172F00E27AAD = {
+			isa = PBXGroup;
+			children = (
+				686382C32ABE173000E27AAD /* FlutterAppExtensionTestHost */,
+				686382C22ABE172F00E27AAD /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		686382C22ABE172F00E27AAD /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				686382C12ABE172F00E27AAD /* FlutterAppExtensionTestHost.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		686382C32ABE173000E27AAD /* FlutterAppExtensionTestHost */ = {
+			isa = PBXGroup;
+			children = (
+				686382C42ABE173000E27AAD /* AppDelegate.h */,
+				686382C52ABE173000E27AAD /* AppDelegate.m */,
+				686382C72ABE173000E27AAD /* SceneDelegate.h */,
+				686382C82ABE173000E27AAD /* SceneDelegate.m */,
+				686382CA2ABE173000E27AAD /* ViewController.h */,
+				686382CB2ABE173000E27AAD /* ViewController.m */,
+				686382CD2ABE173000E27AAD /* Main.storyboard */,
+				686382D02ABE173000E27AAD /* Assets.xcassets */,
+				686382D22ABE173000E27AAD /* LaunchScreen.storyboard */,
+				686382D52ABE173000E27AAD /* Info.plist */,
+				686382D62ABE173000E27AAD /* main.m */,
+			);
+			path = FlutterAppExtensionTestHost;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		686382C02ABE172F00E27AAD /* FlutterAppExtensionTestHost */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 686382DA2ABE173000E27AAD /* Build configuration list for PBXNativeTarget "FlutterAppExtensionTestHost" */;
+			buildPhases = (
+				686382BD2ABE172F00E27AAD /* Sources */,
+				686382BE2ABE172F00E27AAD /* Frameworks */,
+				686382BF2ABE172F00E27AAD /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = FlutterAppExtensionTestHost;
+			productName = FlutterAppExtensionTestHost;
+			productReference = 686382C12ABE172F00E27AAD /* FlutterAppExtensionTestHost.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		686382B92ABE172F00E27AAD /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				BuildIndependentTargetsInParallel = 1;
+				LastUpgradeCheck = 1500;
+				TargetAttributes = {
+					686382C02ABE172F00E27AAD = {
+						CreatedOnToolsVersion = 15.0;
+					};
+				};
+			};
+			buildConfigurationList = 686382BC2ABE172F00E27AAD /* Build configuration list for PBXProject "FlutterAppExtensionTestHost" */;
+			compatibilityVersion = "Xcode 14.0";
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = 686382B82ABE172F00E27AAD;
+			productRefGroup = 686382C22ABE172F00E27AAD /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				686382C02ABE172F00E27AAD /* FlutterAppExtensionTestHost */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		686382BF2ABE172F00E27AAD /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				686382D42ABE173000E27AAD /* LaunchScreen.storyboard in Resources */,
+				686382D12ABE173000E27AAD /* Assets.xcassets in Resources */,
+				686382CF2ABE173000E27AAD /* Main.storyboard in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		686382BD2ABE172F00E27AAD /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				686382CC2ABE173000E27AAD /* ViewController.m in Sources */,
+				686382C62ABE173000E27AAD /* AppDelegate.m in Sources */,
+				686382D72ABE173000E27AAD /* main.m in Sources */,
+				686382C92ABE173000E27AAD /* SceneDelegate.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXVariantGroup section */
+		686382CD2ABE173000E27AAD /* Main.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				686382CE2ABE173000E27AAD /* Base */,
+			);
+			name = Main.storyboard;
+			sourceTree = "<group>";
+		};
+		686382D22ABE173000E27AAD /* LaunchScreen.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				686382D32ABE173000E27AAD /* Base */,
+			);
+			name = LaunchScreen.storyboard;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		686382D82ABE173000E27AAD /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu17;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
+				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+			};
+			name = Debug;
+		};
+		686382D92ABE173000E27AAD /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu17;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
+				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				MTL_FAST_MATH = YES;
+				SDKROOT = iphoneos;
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		686382DB2ABE173000E27AAD /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_FILE = FlutterAppExtensionTestHost/Info.plist;
+				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
+				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
+				INFOPLIST_KEY_UIMainStoryboardFile = Main;
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				IPHONEOS_DEPLOYMENT_TARGET = 16.2;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.FlutterAppExtensionTestHost;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_EMIT_LOC_STRINGS = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		686382DC2ABE173000E27AAD /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_FILE = FlutterAppExtensionTestHost/Info.plist;
+				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
+				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
+				INFOPLIST_KEY_UIMainStoryboardFile = Main;
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				IPHONEOS_DEPLOYMENT_TARGET = 16.2;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.FlutterAppExtensionTestHost;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_EMIT_LOC_STRINGS = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		686382BC2ABE172F00E27AAD /* Build configuration list for PBXProject "FlutterAppExtensionTestHost" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				686382D82ABE173000E27AAD /* Debug */,
+				686382D92ABE173000E27AAD /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		686382DA2ABE173000E27AAD /* Build configuration list for PBXNativeTarget "FlutterAppExtensionTestHost" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				686382DB2ABE173000E27AAD /* Debug */,
+				686382DC2ABE173000E27AAD /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 686382B92ABE172F00E27AAD /* Project object */;
+}
diff --git a/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000000000000000000000000000000000000..919434a6254f0e9651f402737811be6634a03e9c
--- /dev/null
+++ b/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>
diff --git a/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 0000000000000000000000000000000000000000..18d981003d68d0546c4804ac2ff47dd97c6e7921
--- /dev/null
+++ b/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/AppDelegate.h b/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/AppDelegate.h
new file mode 100644
index 0000000000000000000000000000000000000000..6c4e04002c709bcd9519231f9d8ad8e829f64b20
--- /dev/null
+++ b/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/AppDelegate.h
@@ -0,0 +1,14 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_TESTING_SCENARIO_APP_IOS_FLUTTERAPPEXTENSIONTESTHOST_FLUTTERAPPEXTENSIONTESTHOST_APPDELEGATE_H_
+#define FLUTTER_TESTING_SCENARIO_APP_IOS_FLUTTERAPPEXTENSIONTESTHOST_FLUTTERAPPEXTENSIONTESTHOST_APPDELEGATE_H_
+
+#import <UIKit/UIKit.h>
+
+@interface AppDelegate : UIResponder <UIApplicationDelegate>
+
+@end
+
+#endif  // FLUTTER_TESTING_SCENARIO_APP_IOS_FLUTTERAPPEXTENSIONTESTHOST_FLUTTERAPPEXTENSIONTESTHOST_APPDELEGATE_H_
diff --git a/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/AppDelegate.m b/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/AppDelegate.m
new file mode 100644
index 0000000000000000000000000000000000000000..1beee74b03e03034a4dd1738439da40f0d611411
--- /dev/null
+++ b/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/AppDelegate.m
@@ -0,0 +1,38 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "AppDelegate.h"
+
+@interface AppDelegate ()
+
+@end
+
+@implementation AppDelegate
+
+- (BOOL)application:(UIApplication*)application
+    didFinishLaunchingWithOptions:(NSDictionary*)launchOptions {
+  // Override point for customization after application launch.
+  return YES;
+}
+
+#pragma mark - UISceneSession lifecycle
+
+- (UISceneConfiguration*)application:(UIApplication*)application
+    configurationForConnectingSceneSession:(UISceneSession*)connectingSceneSession
+                                   options:(UISceneConnectionOptions*)options {
+  // Called when a new scene session is being created.
+  // Use this method to select a configuration to create the new scene with.
+  return [[UISceneConfiguration alloc] initWithName:@"Default Configuration"
+                                        sessionRole:connectingSceneSession.role];
+}
+
+- (void)application:(UIApplication*)application
+    didDiscardSceneSessions:(NSSet<UISceneSession*>*)sceneSessions {
+  // Called when the user discards a scene session.
+  // If any sessions were discarded while the application was not running, this will be called
+  // shortly after application:didFinishLaunchingWithOptions. Use this method to release any
+  // resources that were specific to the discarded scenes, as they will not return.
+}
+
+@end
diff --git a/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/Assets.xcassets/AccentColor.colorset/Contents.json b/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/Assets.xcassets/AccentColor.colorset/Contents.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb8789700816459c1e1480e0b34781d9fb78a1ca
--- /dev/null
+++ b/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/Assets.xcassets/AccentColor.colorset/Contents.json
@@ -0,0 +1,11 @@
+{
+  "colors" : [
+    {
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/Assets.xcassets/AppIcon.appiconset/Contents.json b/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/Assets.xcassets/AppIcon.appiconset/Contents.json
new file mode 100644
index 0000000000000000000000000000000000000000..13613e3ee1a9348462a11a77a619faa808a346eb
--- /dev/null
+++ b/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,13 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/Assets.xcassets/Contents.json b/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/Assets.xcassets/Contents.json
new file mode 100644
index 0000000000000000000000000000000000000000..73c00596a7fca3f3d4bdd64053b69d86745f9e10
--- /dev/null
+++ b/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/Base.lproj/LaunchScreen.storyboard b/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/Base.lproj/LaunchScreen.storyboard
new file mode 100644
index 0000000000000000000000000000000000000000..865e9329f3767a7c1dd66294b8025bf81dee7d2c
--- /dev/null
+++ b/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/Base.lproj/LaunchScreen.storyboard
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="EHf-IW-A2E">
+            <objects>
+                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="53" y="375"/>
+        </scene>
+    </scenes>
+</document>
diff --git a/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/Base.lproj/Main.storyboard b/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/Base.lproj/Main.storyboard
new file mode 100644
index 0000000000000000000000000000000000000000..808a21ce779bae61839ac1803bc4e2c854578f5e
--- /dev/null
+++ b/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/Base.lproj/Main.storyboard
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="tne-QT-ifu">
+            <objects>
+                <viewController id="BYZ-38-t0r" customClass="ViewController" customModuleProvider="" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
+            </objects>
+        </scene>
+    </scenes>
+</document>
diff --git a/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/Info.plist b/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/Info.plist
new file mode 100644
index 0000000000000000000000000000000000000000..81ed29b76cfbe2a2a82ddd0448491c41d7839480
--- /dev/null
+++ b/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/Info.plist
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>UIApplicationSceneManifest</key>
+	<dict>
+		<key>UIApplicationSupportsMultipleScenes</key>
+		<false/>
+		<key>UISceneConfigurations</key>
+		<dict>
+			<key>UIWindowSceneSessionRoleApplication</key>
+			<array>
+				<dict>
+					<key>UISceneConfigurationName</key>
+					<string>Default Configuration</string>
+					<key>UISceneDelegateClassName</key>
+					<string>SceneDelegate</string>
+					<key>UISceneStoryboardFile</key>
+					<string>Main</string>
+				</dict>
+			</array>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/SceneDelegate.h b/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/SceneDelegate.h
new file mode 100644
index 0000000000000000000000000000000000000000..95dfc1cefe7e2948e39b6652522cfe6b40d91439
--- /dev/null
+++ b/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/SceneDelegate.h
@@ -0,0 +1,16 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_TESTING_SCENARIO_APP_IOS_FLUTTERAPPEXTENSIONTESTHOST_FLUTTERAPPEXTENSIONTESTHOST_SCENEDELEGATE_H_
+#define FLUTTER_TESTING_SCENARIO_APP_IOS_FLUTTERAPPEXTENSIONTESTHOST_FLUTTERAPPEXTENSIONTESTHOST_SCENEDELEGATE_H_
+
+#import <UIKit/UIKit.h>
+
+@interface SceneDelegate : UIResponder <UIWindowSceneDelegate>
+
+@property(strong, nonatomic) UIWindow* window;
+
+@end
+
+#endif  // FLUTTER_TESTING_SCENARIO_APP_IOS_FLUTTERAPPEXTENSIONTESTHOST_FLUTTERAPPEXTENSIONTESTHOST_SCENEDELEGATE_H_
diff --git a/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/SceneDelegate.m b/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/SceneDelegate.m
new file mode 100644
index 0000000000000000000000000000000000000000..1271efb7faa5f6f2607d434bef2654f9cd543723
--- /dev/null
+++ b/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/SceneDelegate.m
@@ -0,0 +1,52 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "SceneDelegate.h"
+
+@interface SceneDelegate ()
+
+@end
+
+@implementation SceneDelegate
+
+- (void)scene:(UIScene*)scene
+    willConnectToSession:(UISceneSession*)session
+                 options:(UISceneConnectionOptions*)connectionOptions {
+  // Use this method to optionally configure and attach the UIWindow `window` to the provided
+  // UIWindowScene `scene`. If using a storyboard, the `window` property will automatically be
+  // initialized and attached to the scene. This delegate does not imply the connecting scene or
+  // session are new (see `application:configurationForConnectingSceneSession` instead).
+}
+
+- (void)sceneDidDisconnect:(UIScene*)scene {
+  // Called as the scene is being released by the system.
+  // This occurs shortly after the scene enters the background, or when its session is discarded.
+  // Release any resources associated with this scene that can be re-created the next time the scene
+  // connects. The scene may re-connect later, as its session was not necessarily discarded (see
+  // `application:didDiscardSceneSessions` instead).
+}
+
+- (void)sceneDidBecomeActive:(UIScene*)scene {
+  // Called when the scene has moved from an inactive state to an active state.
+  // Use this method to restart any tasks that were paused (or not yet started) when the scene was
+  // inactive.
+}
+
+- (void)sceneWillResignActive:(UIScene*)scene {
+  // Called when the scene will move from an active state to an inactive state.
+  // This may occur due to temporary interruptions (ex. an incoming phone call).
+}
+
+- (void)sceneWillEnterForeground:(UIScene*)scene {
+  // Called as the scene transitions from the background to the foreground.
+  // Use this method to undo the changes made on entering the background.
+}
+
+- (void)sceneDidEnterBackground:(UIScene*)scene {
+  // Called as the scene transitions from the foreground to the background.
+  // Use this method to save data, release shared resources, and store enough scene-specific state
+  // information to restore the scene back to its current state.
+}
+
+@end
diff --git a/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/ViewController.h b/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/ViewController.h
new file mode 100644
index 0000000000000000000000000000000000000000..397bc20aa85d5ab626afd32edb74914d7d84df0e
--- /dev/null
+++ b/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/ViewController.h
@@ -0,0 +1,14 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_TESTING_SCENARIO_APP_IOS_FLUTTERAPPEXTENSIONTESTHOST_FLUTTERAPPEXTENSIONTESTHOST_VIEWCONTROLLER_H_
+#define FLUTTER_TESTING_SCENARIO_APP_IOS_FLUTTERAPPEXTENSIONTESTHOST_FLUTTERAPPEXTENSIONTESTHOST_VIEWCONTROLLER_H_
+
+#import <UIKit/UIKit.h>
+
+@interface ViewController : UIViewController
+
+@end
+
+#endif  // FLUTTER_TESTING_SCENARIO_APP_IOS_FLUTTERAPPEXTENSIONTESTHOST_FLUTTERAPPEXTENSIONTESTHOST_VIEWCONTROLLER_H_
diff --git a/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/ViewController.m b/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/ViewController.m
new file mode 100644
index 0000000000000000000000000000000000000000..b725cc412618f90b805b0598ae0f3f86a9954ecb
--- /dev/null
+++ b/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/ViewController.m
@@ -0,0 +1,33 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "ViewController.h"
+
+@interface ViewController ()
+
+@end
+
+@implementation ViewController
+
+- (void)viewDidLoad {
+  [super viewDidLoad];
+  UIButton* openShare =
+      [UIButton systemButtonWithPrimaryAction:[UIAction actionWithHandler:^(
+                                                            __kindof UIAction* _Nonnull action) {
+                  UIActivityViewController* activityVC =
+                      [[UIActivityViewController alloc] initWithActivityItems:@[ @"text to share" ]
+                                                        applicationActivities:nil];
+                  activityVC.excludedActivityTypes = @[
+                    UIActivityTypePrint, UIActivityTypeCopyToPasteboard,
+                    UIActivityTypeAssignToContact, UIActivityTypeSaveToCameraRoll
+                  ];  // Exclude whichever aren't relevant
+                  [self presentViewController:activityVC animated:YES completion:nil];
+                }]];
+  openShare.backgroundColor = [UIColor systemPinkColor];
+  [openShare setTitle:@"Open Share" forState:UIControlStateNormal];
+  [self.view addSubview:openShare];
+  openShare.frame = CGRectMake(0, 0, 200, 200);
+}
+
+@end
diff --git a/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/main.m b/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/main.m
new file mode 100644
index 0000000000000000000000000000000000000000..f98f92491e8a09b169c05f9ebe36600c6309d33b
--- /dev/null
+++ b/testing/scenario_app/ios/FlutterAppExtensionTestHost/FlutterAppExtensionTestHost/main.m
@@ -0,0 +1,15 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import <UIKit/UIKit.h>
+#import "AppDelegate.h"
+
+int main(int argc, char* argv[]) {
+  NSString* appDelegateClassName;
+  @autoreleasepool {
+    // Setup code that might create autoreleased objects goes here.
+    appDelegateClassName = NSStringFromClass([AppDelegate class]);
+  }
+  return UIApplicationMain(argc, argv, nil, appDelegateClassName);
+}
diff --git a/testing/scenario_app/ios/FlutterAppExtensionTestHost/Scenarios/Info_Impeller.plist b/testing/scenario_app/ios/FlutterAppExtensionTestHost/Scenarios/Info_Impeller.plist
new file mode 100644
index 0000000000000000000000000000000000000000..2ad0401d1c878b8287b6a818ac32d8fb86c20e48
--- /dev/null
+++ b/testing/scenario_app/ios/FlutterAppExtensionTestHost/Scenarios/Info_Impeller.plist
@@ -0,0 +1,29 @@
+<!--Dummy plist file to make the impeller version of scenario test happy-->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<!--This flag does not do anything, it only makes the xcodebuild command happy-->
+	<key>FLTEnableImpeller</key>
+	<true/>
+	<key>UIApplicationSceneManifest</key>
+	<dict>
+		<key>UIApplicationSupportsMultipleScenes</key>
+		<false/>
+		<key>UISceneConfigurations</key>
+		<dict>
+			<key>UIWindowSceneSessionRoleApplication</key>
+			<array>
+				<dict>
+					<key>UISceneConfigurationName</key>
+					<string>Default Configuration</string>
+					<key>UISceneDelegateClassName</key>
+					<string>SceneDelegate</string>
+					<key>UISceneStoryboardFile</key>
+					<string>Main</string>
+				</dict>
+			</array>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/testing/scenario_app/ios/README.md b/testing/scenario_app/ios/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..972625056d403943887bad001423567568134e41
--- /dev/null
+++ b/testing/scenario_app/ios/README.md
@@ -0,0 +1,55 @@
+# Scenario App: iOS Tests
+
+As mentioned in the [top-level README](../README.md), this directory contains
+the iOS-specific native code and tests for the [scenario app](../lib). To run
+the tests, you will need to build the engine with the appropriate configuration.
+
+For example, after building `ios_debug_sim_unopt` (to run on Intel Macs) or `ios_debug_sim_unopt_arm64` (to run on ARM Macs),
+run:
+
+```sh
+# From the root of the engine repository
+$ ./testing/run_ios_tests.sh ios_debug_sim_unopt
+```
+or 
+```sh
+# From the root of the engine repository
+$ ./testing/run_ios_tests.sh ios_debug_sim_unopt_arm64
+```
+
+To run or debug in Xcode, open the xcodeproj file located in
+`<engine_out_dir>/ios_debug_sim_unopt/scenario_app/Scenarios/Scenarios.xcodeproj`.
+
+## CI Configuration
+
+See [`ci/builders/mac_unopt.json`](../../../../ci/builders/mac_unopt.json), and
+grep for `run_ios_tests.sh`.
+
+## iOS Platform View Tests
+
+For PlatformView tests on iOS, edit the dictionaries in
+[AppDelegate.m](Scenarios/Scenarios/AppDelegate.m) and
+[GoldenTestManager.m](Scenarios/ScenariosUITests/GoldenTestManager.m) so that
+the correct golden image can be found. Also, add a
+[GoldenPlatformViewTests](Scenarios/ScenariosUITests/GoldenPlatformViewTests.h)
+in [PlatformViewUITests.m](Scenarios/ScenariosUITests/PlatformViewUITests.m).
+
+If `PlatformViewRotation` is failing, make sure
+`Simulator app Device > Rotate Device Automatically` is selected, or run:
+
+```bash
+defaults write com.apple.iphonesimulator RotateWindowWhenSignaledByGuest -int 1
+```
+
+## Generating Golden Images on iOS
+
+Screenshots are saved as
+[XCTAttachment](https://developer.apple.com/documentation/xctest/activities_and_attachments/adding_attachments_to_tests_and_activities?language=objc)'s.
+
+A path in the form of
+`/Users/$USER/Library/Developer/Xcode/DerivedData/Scenarios-$HASH` will be
+printed to the console.
+
+Inside that directory there is a directory
+`./Build/Products/Debug-iphonesimulator/ScenariosUITests-Runner.app/PlugIns/ScenariosUITests.xctest/`
+which is where all the images that were compared against golden reside.
diff --git a/testing/scenario_app/ios/Runner/GeneratedPluginRegistrant.h b/testing/scenario_app/ios/Runner/GeneratedPluginRegistrant.h
index ed9a5c61691e5335ceefc5106fb1e6cd73079609..8db549ca77debc3b7de4fba8d1375cfe092f079b 100644
--- a/testing/scenario_app/ios/Runner/GeneratedPluginRegistrant.h
+++ b/testing/scenario_app/ios/Runner/GeneratedPluginRegistrant.h
@@ -2,8 +2,10 @@
 //  Generated file. Do not edit.
 //
 
-#ifndef GeneratedPluginRegistrant_h
-#define GeneratedPluginRegistrant_h
+// clang-format off
+
+#ifndef FLUTTER_TESTING_SCENARIO_APP_IOS_RUNNER_GENERATEDPLUGINREGISTRANT_H_
+#define FLUTTER_TESTING_SCENARIO_APP_IOS_RUNNER_GENERATEDPLUGINREGISTRANT_H_
 
 #import <Flutter/Flutter.h>
 
@@ -14,4 +16,4 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
-#endif /* GeneratedPluginRegistrant_h */
+#endif  // FLUTTER_TESTING_SCENARIO_APP_IOS_RUNNER_GENERATEDPLUGINREGISTRANT_H_
diff --git a/testing/scenario_app/ios/Runner/GeneratedPluginRegistrant.m b/testing/scenario_app/ios/Runner/GeneratedPluginRegistrant.m
index 60dfa42b328db978cbb0d84f5db8535fe3a08542..efe65ecccf693ff20ed7d92b7a75e0a67396dbfa 100644
--- a/testing/scenario_app/ios/Runner/GeneratedPluginRegistrant.m
+++ b/testing/scenario_app/ios/Runner/GeneratedPluginRegistrant.m
@@ -2,6 +2,8 @@
 //  Generated file. Do not edit.
 //
 
+// clang-format off
+
 #import "GeneratedPluginRegistrant.h"
 
 @implementation GeneratedPluginRegistrant
diff --git a/testing/scenario_app/ios/Scenarios.xcworkspace/contents.xcworkspacedata b/testing/scenario_app/ios/Scenarios.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000000000000000000000000000000000000..00ca3de9d76c0e105f7bb851d2e6e7b57d050abb
--- /dev/null
+++ b/testing/scenario_app/ios/Scenarios.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "container:Scenarios/Scenarios.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/testing/scenario_app/ios/Scenarios.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/testing/scenario_app/ios/Scenarios.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 0000000000000000000000000000000000000000..18d981003d68d0546c4804ac2ff47dd97c6e7921
--- /dev/null
+++ b/testing/scenario_app/ios/Scenarios.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/testing/scenario_app/ios/Scenarios.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/testing/scenario_app/ios/Scenarios.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
new file mode 100644
index 0000000000000000000000000000000000000000..0c67376ebacb410fd873cac1d8d8dd431b262c02
--- /dev/null
+++ b/testing/scenario_app/ios/Scenarios.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>
diff --git a/testing/scenario_app/ios/Scenarios/Scenarios.xcodeproj/project.pbxproj b/testing/scenario_app/ios/Scenarios/Scenarios.xcodeproj/project.pbxproj
index 5294a9b254c987630012c0c754179da081121d42..29355ef4a5872e10497e8367bb21537123bb16f9 100644
--- a/testing/scenario_app/ios/Scenarios/Scenarios.xcodeproj/project.pbxproj
+++ b/testing/scenario_app/ios/Scenarios/Scenarios.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -32,33 +32,48 @@
 		248D76EF22E388380012F0C1 /* PlatformViewUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 248D76EE22E388380012F0C1 /* PlatformViewUITests.m */; };
 		248FDFC422FE7CD0009CC7CD /* FlutterEngineTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 248FDFC322FE7CD0009CC7CD /* FlutterEngineTest.m */; };
 		24F1FB89230B4579005ACE7C /* TextPlatformView.m in Sources */ = {isa = PBXBuildFile; fileRef = 24F1FB87230B4579005ACE7C /* TextPlatformView.m */; };
+		3BFD97202A990CF50094F51B /* golden_bogus_font_text_impeller_iPhone SE (3rd generation)_17.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 3BFD971E2A990CF40094F51B /* golden_bogus_font_text_impeller_iPhone SE (3rd generation)_17.0_simulator.png */; };
+		3BFD97212A990CF50094F51B /* golden_spawn_engine_works_impeller_iPhone SE (3rd generation)_17.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 3BFD971F2A990CF40094F51B /* golden_spawn_engine_works_impeller_iPhone SE (3rd generation)_17.0_simulator.png */; };
 		4F06F1B32473296E000AF246 /* LocalizationInitializationTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F06F1B124731F66000AF246 /* LocalizationInitializationTest.m */; };
 		6402EBD124147BDA00987DCB /* UnobstructedPlatformViewTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6402EBD024147BDA00987DCB /* UnobstructedPlatformViewTests.m */; };
 		6816DB9E231750ED00A51400 /* GoldenPlatformViewTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6816DB9D231750ED00A51400 /* GoldenPlatformViewTests.m */; };
 		6816DBA12317573300A51400 /* GoldenImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 6816DBA02317573300A51400 /* GoldenImage.m */; };
 		6816DBA42318358200A51400 /* GoldenTestManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 6816DBA32318358200A51400 /* GoldenTestManager.m */; };
-		685B9F392977B73100B45442 /* golden_platform_view_large_cliprrect_with_transform_iPhone 8_16.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 685B9F372977B73100B45442 /* golden_platform_view_large_cliprrect_with_transform_iPhone 8_16.0_simulator.png */; };
-		685B9F3A2977B73100B45442 /* golden_platform_view_large_cliprrect_iPhone 8_16.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 685B9F382977B73100B45442 /* golden_platform_view_large_cliprrect_iPhone 8_16.0_simulator.png */; };
-		687AF8E9291EBDE0003912C7 /* golden_platform_view_clippath_with_transform_iPhone 8_16.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 687AF8E8291EBDE0003912C7 /* golden_platform_view_clippath_with_transform_iPhone 8_16.0_simulator.png */; };
+		684FFF7C29F9C10700281002 /* golden_platform_view_cliprrect_with_transform_iPhone SE (3rd generation)_17.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 684FFF6829F9C10300281002 /* golden_platform_view_cliprrect_with_transform_iPhone SE (3rd generation)_17.0_simulator.png */; };
+		684FFF7D29F9C10700281002 /* golden_platform_view_cliprect_with_transform_iPhone SE (3rd generation)_17.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 684FFF6929F9C10300281002 /* golden_platform_view_cliprect_with_transform_iPhone SE (3rd generation)_17.0_simulator.png */; };
+		684FFF7E29F9C10700281002 /* golden_platform_view_opacity_iPhone SE (3rd generation)_17.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 684FFF6A29F9C10300281002 /* golden_platform_view_opacity_iPhone SE (3rd generation)_17.0_simulator.png */; };
+		684FFF7F29F9C10700281002 /* golden_platform_view_rotate_iPhone SE (3rd generation)_17.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 684FFF6B29F9C10400281002 /* golden_platform_view_rotate_iPhone SE (3rd generation)_17.0_simulator.png */; };
+		684FFF8029F9C10700281002 /* golden_platform_view_cliprect_after_moved_iPhone SE (3rd generation)_17.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 684FFF6C29F9C10400281002 /* golden_platform_view_cliprect_after_moved_iPhone SE (3rd generation)_17.0_simulator.png */; };
+		684FFF8129F9C10700281002 /* golden_platform_view_large_cliprrect_with_transform_iPhone SE (3rd generation)_17.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 684FFF6D29F9C10400281002 /* golden_platform_view_large_cliprrect_with_transform_iPhone SE (3rd generation)_17.0_simulator.png */; };
+		684FFF8229F9C10700281002 /* golden_two_platform_views_with_other_backdrop_filter_iPhone SE (3rd generation)_17.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 684FFF6E29F9C10400281002 /* golden_two_platform_views_with_other_backdrop_filter_iPhone SE (3rd generation)_17.0_simulator.png */; };
+		684FFF8329F9C10700281002 /* golden_platform_view_transform_iPhone SE (3rd generation)_17.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 684FFF6F29F9C10400281002 /* golden_platform_view_transform_iPhone SE (3rd generation)_17.0_simulator.png */; };
+		684FFF8429F9C10700281002 /* golden_non_full_screen_flutter_view_platform_view_iPhone SE (3rd generation)_17.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 684FFF7029F9C10500281002 /* golden_non_full_screen_flutter_view_platform_view_iPhone SE (3rd generation)_17.0_simulator.png */; };
+		684FFF8529F9C10700281002 /* golden_platform_view_cliprrect_iPhone SE (3rd generation)_17.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 684FFF7129F9C10500281002 /* golden_platform_view_cliprrect_iPhone SE (3rd generation)_17.0_simulator.png */; };
+		684FFF8629F9C10700281002 /* golden_bogus_font_text_iPhone SE (3rd generation)_17.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 684FFF7229F9C10500281002 /* golden_bogus_font_text_iPhone SE (3rd generation)_17.0_simulator.png */; };
+		684FFF8729F9C10700281002 /* golden_platform_view_multiple_iPhone SE (3rd generation)_17.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 684FFF7329F9C10500281002 /* golden_platform_view_multiple_iPhone SE (3rd generation)_17.0_simulator.png */; };
+		684FFF8829F9C10700281002 /* golden_platform_view_cliprect_iPhone SE (3rd generation)_17.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 684FFF7429F9C10500281002 /* golden_platform_view_cliprect_iPhone SE (3rd generation)_17.0_simulator.png */; };
+		684FFF8929F9C10700281002 /* golden_platform_view_multiple_background_foreground_iPhone SE (3rd generation)_17.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 684FFF7529F9C10600281002 /* golden_platform_view_multiple_background_foreground_iPhone SE (3rd generation)_17.0_simulator.png */; };
+		684FFF8A29F9C10700281002 /* golden_platform_view_clippath_with_transform_iPhone SE (3rd generation)_17.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 684FFF7629F9C10600281002 /* golden_platform_view_clippath_with_transform_iPhone SE (3rd generation)_17.0_simulator.png */; };
+		684FFF8B29F9C10700281002 /* golden_platform_view_clippath_iPhone SE (3rd generation)_17.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 684FFF7729F9C10600281002 /* golden_platform_view_clippath_iPhone SE (3rd generation)_17.0_simulator.png */; };
+		684FFF8C29F9C10700281002 /* golden_platform_view_iPhone SE (3rd generation)_17.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 684FFF7829F9C10600281002 /* golden_platform_view_iPhone SE (3rd generation)_17.0_simulator.png */; };
+		684FFF8D29F9C10700281002 /* golden_platform_view_large_cliprrect_iPhone SE (3rd generation)_17.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 684FFF7929F9C10600281002 /* golden_platform_view_large_cliprrect_iPhone SE (3rd generation)_17.0_simulator.png */; };
+		684FFF8E29F9C10700281002 /* golden_spawn_engine_works_iPhone SE (3rd generation)_17.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 684FFF7A29F9C10700281002 /* golden_spawn_engine_works_iPhone SE (3rd generation)_17.0_simulator.png */; };
+		684FFF8F29F9C10700281002 /* golden_platform_view_with_other_backdrop_filter_iPhone SE (3rd generation)_17.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 684FFF7B29F9C10700281002 /* golden_platform_view_with_other_backdrop_filter_iPhone SE (3rd generation)_17.0_simulator.png */; };
+		6860CE252A01B2FF00B68EC5 /* golden_two_platform_view_clip_rrect_iPhone SE (3rd generation)_17.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 6860CE222A01B2FF00B68EC5 /* golden_two_platform_view_clip_rrect_iPhone SE (3rd generation)_17.0_simulator.png */; };
+		6860CE262A01B2FF00B68EC5 /* golden_two_platform_view_clip_rect_iPhone SE (3rd generation)_17.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 6860CE232A01B2FF00B68EC5 /* golden_two_platform_view_clip_rect_iPhone SE (3rd generation)_17.0_simulator.png */; };
+		6860CE272A01B2FF00B68EC5 /* golden_two_platform_view_clip_path_iPhone SE (3rd generation)_17.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 6860CE242A01B2FF00B68EC5 /* golden_two_platform_view_clip_path_iPhone SE (3rd generation)_17.0_simulator.png */; };
+		686382EC2AC1F9F300E27AAD /* ShareViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 686382EB2AC1F9F300E27AAD /* ShareViewController.m */; };
+		686382EF2AC1F9F300E27AAD /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 686382ED2AC1F9F300E27AAD /* MainInterface.storyboard */; };
+		686382F32AC1F9F300E27AAD /* ScenariosShare.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 686382E82AC1F9F300E27AAD /* ScenariosShare.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		686383132AC202B700E27AAD /* AppExtensionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 686383122AC202B700E27AAD /* AppExtensionTests.m */; };
+		686383152AC2175100E27AAD /* ../../Flutter.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 246B4E4522E3B61000073EBF /* ../../Flutter.xcframework */; };
+		686383162AC2175100E27AAD /* ../../Flutter.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 246B4E4522E3B61000073EBF /* ../../Flutter.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		68A5B63423EB71D300BDBCDB /* PlatformViewGestureRecognizerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 68A5B63323EB71D300BDBCDB /* PlatformViewGestureRecognizerTests.m */; };
+		68C9D8012AD9B0EF00DF9D79 /* DarwinSystemFontTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 68C9D8002AD9B0EF00DF9D79 /* DarwinSystemFontTests.m */; };
+		68C9D8092AD9B6C800DF9D79 /* golden_darwin_system_font_iPhone SE (3rd generation)_17.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 68C9D8082AD9B6C800DF9D79 /* golden_darwin_system_font_iPhone SE (3rd generation)_17.0_simulator.png */; };
 		68D4017D2564859300ECD91A /* ContinuousTexture.m in Sources */ = {isa = PBXBuildFile; fileRef = 68D4017C2564859300ECD91A /* ContinuousTexture.m */; };
-		68D5003F291ED645001ACFE1 /* golden_platform_view_cliprrect_with_transform_iPhone 8_16.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 68D5003D291ED645001ACFE1 /* golden_platform_view_cliprrect_with_transform_iPhone 8_16.0_simulator.png */; };
-		68D50042291ED8CD001ACFE1 /* golden_platform_view_cliprect_with_transform_iPhone 8_16.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 68D50041291ED8CD001ACFE1 /* golden_platform_view_cliprect_with_transform_iPhone 8_16.0_simulator.png */; };
+		68D93AEE2A46097E0054AB6D /* golden_platform_view_with_negative_backdrop_filter_iPhone SE (3rd generation)_17.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = 68D93AED2A46097E0054AB6D /* golden_platform_view_with_negative_backdrop_filter_iPhone SE (3rd generation)_17.0_simulator.png */; };
 		F26F15B8268B6B5600EC54D3 /* iPadGestureTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F26F15B7268B6B5500EC54D3 /* iPadGestureTests.m */; };
-		F769EB53276312BB007AC10F /* golden_platform_view_cliprect_iPhone 8_16.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = F769EB52276312BB007AC10F /* golden_platform_view_cliprect_iPhone 8_16.0_simulator.png */; };
-		F7B464EB2759D0A900079189 /* golden_two_platform_views_with_other_backdrop_filter_iPhone 8_16.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = F7B464DE2759D0A900079189 /* golden_two_platform_views_with_other_backdrop_filter_iPhone 8_16.0_simulator.png */; };
-		F7B464EC2759D0A900079189 /* golden_platform_view_iPhone 8_16.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = F7B464DF2759D0A900079189 /* golden_platform_view_iPhone 8_16.0_simulator.png */; };
-		F7B464ED2759D0A900079189 /* golden_platform_view_cliprrect_iPhone 8_16.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = F7B464E02759D0A900079189 /* golden_platform_view_cliprrect_iPhone 8_16.0_simulator.png */; };
-		F7B464EE2759D0A900079189 /* golden_platform_view_transform_iPhone 8_16.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = F7B464E12759D0A900079189 /* golden_platform_view_transform_iPhone 8_16.0_simulator.png */; };
-		F7B464EF2759D0A900079189 /* golden_platform_view_multiple_iPhone 8_16.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = F7B464E22759D0A900079189 /* golden_platform_view_multiple_iPhone 8_16.0_simulator.png */; };
-		F7B464F02759D0A900079189 /* golden_bogus_font_text_iPhone 8_16.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = F7B464E32759D0A900079189 /* golden_bogus_font_text_iPhone 8_16.0_simulator.png */; };
-		F7B464F12759D0A900079189 /* golden_platform_view_opacity_iPhone 8_16.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = F7B464E42759D0A900079189 /* golden_platform_view_opacity_iPhone 8_16.0_simulator.png */; };
-		F7B464F22759D0A900079189 /* golden_platform_view_clippath_iPhone 8_16.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = F7B464E52759D0A900079189 /* golden_platform_view_clippath_iPhone 8_16.0_simulator.png */; };
-		F7B464F32759D0A900079189 /* golden_platform_view_multiple_background_foreground_iPhone 8_16.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = F7B464E62759D0A900079189 /* golden_platform_view_multiple_background_foreground_iPhone 8_16.0_simulator.png */; };
-		F7B464F42759D0A900079189 /* golden_platform_view_with_other_backdrop_filter_iPhone 8_16.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = F7B464E72759D0A900079189 /* golden_platform_view_with_other_backdrop_filter_iPhone 8_16.0_simulator.png */; };
-		F7B464F62759D0A900079189 /* golden_non_full_screen_flutter_view_platform_view_iPhone 8_16.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = F7B464E92759D0A900079189 /* golden_non_full_screen_flutter_view_platform_view_iPhone 8_16.0_simulator.png */; };
-		F7B464F72759D0A900079189 /* golden_platform_view_rotate_iPhone 8_16.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = F7B464EA2759D0A900079189 /* golden_platform_view_rotate_iPhone 8_16.0_simulator.png */; };
-		F7B464F92759DEA100079189 /* golden_spawn_engine_works_iPhone 8_16.0_simulator.png in Resources */ = {isa = PBXBuildFile; fileRef = F7B464F82759DEA100079189 /* golden_spawn_engine_works_iPhone 8_16.0_simulator.png */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -76,6 +91,27 @@
 			remoteGlobalIDString = 248D76C622E388370012F0C1;
 			remoteInfo = Scenarios;
 		};
+		686382F12AC1F9F300E27AAD /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 248D76BF22E388370012F0C1 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 686382E72AC1F9F300E27AAD;
+			remoteInfo = ScenariosShare;
+		};
+		6863830A2AC2024200E27AAD /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 686383052AC2024200E27AAD /* FlutterAppExtensionTestHost.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 686382C12ABE172F00E27AAD;
+			remoteInfo = FlutterAppExtensionTestHost;
+		};
+		686383102AC2027100E27AAD /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 686383052AC2024200E27AAD /* FlutterAppExtensionTestHost.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 686382C02ABE172F00E27AAD;
+			remoteInfo = FlutterAppExtensionTestHost;
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -113,6 +149,28 @@
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		686382F42AC1F9F300E27AAD /* Embed Foundation Extensions */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 13;
+			files = (
+				686382F32AC1F9F300E27AAD /* ScenariosShare.appex in Embed Foundation Extensions */,
+			);
+			name = "Embed Foundation Extensions";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		686383172AC2175100E27AAD /* Embed Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				686383162AC2175100E27AAD /* ../../Flutter.xcframework in Embed Frameworks */,
+			);
+			name = "Embed Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
@@ -145,6 +203,8 @@
 		24D47D1E230CA4480069DD5E /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		24F1FB87230B4579005ACE7C /* TextPlatformView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TextPlatformView.m; sourceTree = "<group>"; };
 		24F1FB88230B4579005ACE7C /* TextPlatformView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextPlatformView.h; sourceTree = "<group>"; };
+		3BFD971E2A990CF40094F51B /* golden_bogus_font_text_impeller_iPhone SE (3rd generation)_17.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_bogus_font_text_impeller_iPhone SE (3rd generation)_17.0_simulator.png"; sourceTree = "<group>"; };
+		3BFD971F2A990CF40094F51B /* golden_spawn_engine_works_impeller_iPhone SE (3rd generation)_17.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_spawn_engine_works_impeller_iPhone SE (3rd generation)_17.0_simulator.png"; sourceTree = "<group>"; };
 		4F06F1B124731F66000AF246 /* LocalizationInitializationTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LocalizationInitializationTest.m; sourceTree = "<group>"; };
 		6402EBD024147BDA00987DCB /* UnobstructedPlatformViewTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UnobstructedPlatformViewTests.m; sourceTree = "<group>"; };
 		6816DB9C231750ED00A51400 /* GoldenPlatformViewTests.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GoldenPlatformViewTests.h; sourceTree = "<group>"; };
@@ -153,30 +213,44 @@
 		6816DBA02317573300A51400 /* GoldenImage.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GoldenImage.m; sourceTree = "<group>"; };
 		6816DBA22318358200A51400 /* GoldenTestManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GoldenTestManager.h; sourceTree = "<group>"; };
 		6816DBA32318358200A51400 /* GoldenTestManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GoldenTestManager.m; sourceTree = "<group>"; };
-		685B9F372977B73100B45442 /* golden_platform_view_large_cliprrect_with_transform_iPhone 8_16.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_large_cliprrect_with_transform_iPhone 8_16.0_simulator.png"; sourceTree = "<group>"; };
-		685B9F382977B73100B45442 /* golden_platform_view_large_cliprrect_iPhone 8_16.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_large_cliprrect_iPhone 8_16.0_simulator.png"; sourceTree = "<group>"; };
-		687AF8E8291EBDE0003912C7 /* golden_platform_view_clippath_with_transform_iPhone 8_16.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_clippath_with_transform_iPhone 8_16.0_simulator.png"; sourceTree = "<group>"; };
+		684FFF6829F9C10300281002 /* golden_platform_view_cliprrect_with_transform_iPhone SE (3rd generation)_17.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_cliprrect_with_transform_iPhone SE (3rd generation)_17.0_simulator.png"; sourceTree = "<group>"; };
+		684FFF6929F9C10300281002 /* golden_platform_view_cliprect_with_transform_iPhone SE (3rd generation)_17.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_cliprect_with_transform_iPhone SE (3rd generation)_17.0_simulator.png"; sourceTree = "<group>"; };
+		684FFF6A29F9C10300281002 /* golden_platform_view_opacity_iPhone SE (3rd generation)_17.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_opacity_iPhone SE (3rd generation)_17.0_simulator.png"; sourceTree = "<group>"; };
+		684FFF6B29F9C10400281002 /* golden_platform_view_rotate_iPhone SE (3rd generation)_17.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_rotate_iPhone SE (3rd generation)_17.0_simulator.png"; sourceTree = "<group>"; };
+		684FFF6C29F9C10400281002 /* golden_platform_view_cliprect_after_moved_iPhone SE (3rd generation)_17.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_cliprect_after_moved_iPhone SE (3rd generation)_17.0_simulator.png"; sourceTree = "<group>"; };
+		684FFF6D29F9C10400281002 /* golden_platform_view_large_cliprrect_with_transform_iPhone SE (3rd generation)_17.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_large_cliprrect_with_transform_iPhone SE (3rd generation)_17.0_simulator.png"; sourceTree = "<group>"; };
+		684FFF6E29F9C10400281002 /* golden_two_platform_views_with_other_backdrop_filter_iPhone SE (3rd generation)_17.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_two_platform_views_with_other_backdrop_filter_iPhone SE (3rd generation)_17.0_simulator.png"; sourceTree = "<group>"; };
+		684FFF6F29F9C10400281002 /* golden_platform_view_transform_iPhone SE (3rd generation)_17.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_transform_iPhone SE (3rd generation)_17.0_simulator.png"; sourceTree = "<group>"; };
+		684FFF7029F9C10500281002 /* golden_non_full_screen_flutter_view_platform_view_iPhone SE (3rd generation)_17.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_non_full_screen_flutter_view_platform_view_iPhone SE (3rd generation)_17.0_simulator.png"; sourceTree = "<group>"; };
+		684FFF7129F9C10500281002 /* golden_platform_view_cliprrect_iPhone SE (3rd generation)_17.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_cliprrect_iPhone SE (3rd generation)_17.0_simulator.png"; sourceTree = "<group>"; };
+		684FFF7229F9C10500281002 /* golden_bogus_font_text_iPhone SE (3rd generation)_17.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_bogus_font_text_iPhone SE (3rd generation)_17.0_simulator.png"; sourceTree = "<group>"; };
+		684FFF7329F9C10500281002 /* golden_platform_view_multiple_iPhone SE (3rd generation)_17.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_multiple_iPhone SE (3rd generation)_17.0_simulator.png"; sourceTree = "<group>"; };
+		684FFF7429F9C10500281002 /* golden_platform_view_cliprect_iPhone SE (3rd generation)_17.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_cliprect_iPhone SE (3rd generation)_17.0_simulator.png"; sourceTree = "<group>"; };
+		684FFF7529F9C10600281002 /* golden_platform_view_multiple_background_foreground_iPhone SE (3rd generation)_17.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_multiple_background_foreground_iPhone SE (3rd generation)_17.0_simulator.png"; sourceTree = "<group>"; };
+		684FFF7629F9C10600281002 /* golden_platform_view_clippath_with_transform_iPhone SE (3rd generation)_17.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_clippath_with_transform_iPhone SE (3rd generation)_17.0_simulator.png"; sourceTree = "<group>"; };
+		684FFF7729F9C10600281002 /* golden_platform_view_clippath_iPhone SE (3rd generation)_17.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_clippath_iPhone SE (3rd generation)_17.0_simulator.png"; sourceTree = "<group>"; };
+		684FFF7829F9C10600281002 /* golden_platform_view_iPhone SE (3rd generation)_17.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_iPhone SE (3rd generation)_17.0_simulator.png"; sourceTree = "<group>"; };
+		684FFF7929F9C10600281002 /* golden_platform_view_large_cliprrect_iPhone SE (3rd generation)_17.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_large_cliprrect_iPhone SE (3rd generation)_17.0_simulator.png"; sourceTree = "<group>"; };
+		684FFF7A29F9C10700281002 /* golden_spawn_engine_works_iPhone SE (3rd generation)_17.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_spawn_engine_works_iPhone SE (3rd generation)_17.0_simulator.png"; sourceTree = "<group>"; };
+		684FFF7B29F9C10700281002 /* golden_platform_view_with_other_backdrop_filter_iPhone SE (3rd generation)_17.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_with_other_backdrop_filter_iPhone SE (3rd generation)_17.0_simulator.png"; sourceTree = "<group>"; };
+		6860CE222A01B2FF00B68EC5 /* golden_two_platform_view_clip_rrect_iPhone SE (3rd generation)_17.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_two_platform_view_clip_rrect_iPhone SE (3rd generation)_17.0_simulator.png"; sourceTree = "<group>"; };
+		6860CE232A01B2FF00B68EC5 /* golden_two_platform_view_clip_rect_iPhone SE (3rd generation)_17.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_two_platform_view_clip_rect_iPhone SE (3rd generation)_17.0_simulator.png"; sourceTree = "<group>"; };
+		6860CE242A01B2FF00B68EC5 /* golden_two_platform_view_clip_path_iPhone SE (3rd generation)_17.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_two_platform_view_clip_path_iPhone SE (3rd generation)_17.0_simulator.png"; sourceTree = "<group>"; };
+		686382E82AC1F9F300E27AAD /* ScenariosShare.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = ScenariosShare.appex; sourceTree = BUILT_PRODUCTS_DIR; };
+		686382EA2AC1F9F300E27AAD /* ShareViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShareViewController.h; sourceTree = "<group>"; };
+		686382EB2AC1F9F300E27AAD /* ShareViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShareViewController.m; sourceTree = "<group>"; };
+		686382EE2AC1F9F300E27AAD /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/MainInterface.storyboard; sourceTree = "<group>"; };
+		686382F02AC1F9F300E27AAD /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		686383052AC2024200E27AAD /* FlutterAppExtensionTestHost.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = FlutterAppExtensionTestHost.xcodeproj; path = ../FlutterAppExtensionTestHost/FlutterAppExtensionTestHost.xcodeproj; sourceTree = "<group>"; };
+		686383122AC202B700E27AAD /* AppExtensionTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppExtensionTests.m; sourceTree = "<group>"; };
 		68A5B63323EB71D300BDBCDB /* PlatformViewGestureRecognizerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PlatformViewGestureRecognizerTests.m; sourceTree = "<group>"; };
+		68C9D8002AD9B0EF00DF9D79 /* DarwinSystemFontTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DarwinSystemFontTests.m; sourceTree = "<group>"; };
+		68C9D8082AD9B6C800DF9D79 /* golden_darwin_system_font_iPhone SE (3rd generation)_17.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_darwin_system_font_iPhone SE (3rd generation)_17.0_simulator.png"; sourceTree = "<group>"; };
 		68D4017B2564859300ECD91A /* ContinuousTexture.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ContinuousTexture.h; sourceTree = "<group>"; };
 		68D4017C2564859300ECD91A /* ContinuousTexture.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ContinuousTexture.m; sourceTree = "<group>"; };
-		68D5003D291ED645001ACFE1 /* golden_platform_view_cliprrect_with_transform_iPhone 8_16.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_cliprrect_with_transform_iPhone 8_16.0_simulator.png"; sourceTree = "<group>"; };
-		68D50041291ED8CD001ACFE1 /* golden_platform_view_cliprect_with_transform_iPhone 8_16.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_cliprect_with_transform_iPhone 8_16.0_simulator.png"; sourceTree = "<group>"; };
+		68D93AED2A46097E0054AB6D /* golden_platform_view_with_negative_backdrop_filter_iPhone SE (3rd generation)_17.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_with_negative_backdrop_filter_iPhone SE (3rd generation)_17.0_simulator.png"; sourceTree = "<group>"; };
 		F26F15B7268B6B5500EC54D3 /* iPadGestureTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = iPadGestureTests.m; sourceTree = "<group>"; };
 		F72114B628EF99F500184A2D /* Info_Impeller.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info_Impeller.plist; sourceTree = "<group>"; };
-		F769EB52276312BB007AC10F /* golden_platform_view_cliprect_iPhone 8_16.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_cliprect_iPhone 8_16.0_simulator.png"; sourceTree = "<group>"; };
-		F7B464DE2759D0A900079189 /* golden_two_platform_views_with_other_backdrop_filter_iPhone 8_16.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_two_platform_views_with_other_backdrop_filter_iPhone 8_16.0_simulator.png"; sourceTree = "<group>"; };
-		F7B464DF2759D0A900079189 /* golden_platform_view_iPhone 8_16.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_iPhone 8_16.0_simulator.png"; sourceTree = "<group>"; };
-		F7B464E02759D0A900079189 /* golden_platform_view_cliprrect_iPhone 8_16.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_cliprrect_iPhone 8_16.0_simulator.png"; sourceTree = "<group>"; };
-		F7B464E12759D0A900079189 /* golden_platform_view_transform_iPhone 8_16.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_transform_iPhone 8_16.0_simulator.png"; sourceTree = "<group>"; };
-		F7B464E22759D0A900079189 /* golden_platform_view_multiple_iPhone 8_16.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_multiple_iPhone 8_16.0_simulator.png"; sourceTree = "<group>"; };
-		F7B464E32759D0A900079189 /* golden_bogus_font_text_iPhone 8_16.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_bogus_font_text_iPhone 8_16.0_simulator.png"; sourceTree = "<group>"; };
-		F7B464E42759D0A900079189 /* golden_platform_view_opacity_iPhone 8_16.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_opacity_iPhone 8_16.0_simulator.png"; sourceTree = "<group>"; };
-		F7B464E52759D0A900079189 /* golden_platform_view_clippath_iPhone 8_16.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_clippath_iPhone 8_16.0_simulator.png"; sourceTree = "<group>"; };
-		F7B464E62759D0A900079189 /* golden_platform_view_multiple_background_foreground_iPhone 8_16.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_multiple_background_foreground_iPhone 8_16.0_simulator.png"; sourceTree = "<group>"; };
-		F7B464E72759D0A900079189 /* golden_platform_view_with_other_backdrop_filter_iPhone 8_16.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_with_other_backdrop_filter_iPhone 8_16.0_simulator.png"; sourceTree = "<group>"; };
-		F7B464E92759D0A900079189 /* golden_non_full_screen_flutter_view_platform_view_iPhone 8_16.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_non_full_screen_flutter_view_platform_view_iPhone 8_16.0_simulator.png"; sourceTree = "<group>"; };
-		F7B464EA2759D0A900079189 /* golden_platform_view_rotate_iPhone 8_16.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_platform_view_rotate_iPhone 8_16.0_simulator.png"; sourceTree = "<group>"; };
-		F7B464F82759DEA100079189 /* golden_spawn_engine_works_iPhone 8_16.0_simulator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "golden_spawn_engine_works_iPhone 8_16.0_simulator.png"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -205,15 +279,25 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		686382E52AC1F9F300E27AAD /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				686383152AC2175100E27AAD /* ../../Flutter.xcframework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
 		248D76BE22E388370012F0C1 = {
 			isa = PBXGroup;
 			children = (
+				686383052AC2024200E27AAD /* FlutterAppExtensionTestHost.xcodeproj */,
 				248D76C922E388370012F0C1 /* Scenarios */,
 				248D76E222E388380012F0C1 /* ScenariosTests */,
 				248D76ED22E388380012F0C1 /* ScenariosUITests */,
+				686382E92AC1F9F300E27AAD /* ScenariosShare */,
 				248D76C822E388370012F0C1 /* Products */,
 				248D76FC22E388900012F0C1 /* Frameworks */,
 			);
@@ -225,6 +309,7 @@
 				248D76C722E388370012F0C1 /* Scenarios.app */,
 				248D76DF22E388380012F0C1 /* ScenariosTests.xctest */,
 				248D76EA22E388380012F0C1 /* ScenariosUITests.xctest */,
+				686382E82AC1F9F300E27AAD /* ScenariosShare.appex */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -284,6 +369,8 @@
 				246A6610252E693A00EAB0F3 /* RenderingSelectionTest.m */,
 				0DDEBC88258830B40065D0E8 /* SpawnEngineTest.m */,
 				F26F15B7268B6B5500EC54D3 /* iPadGestureTests.m */,
+				686383122AC202B700E27AAD /* AppExtensionTests.m */,
+				68C9D8002AD9B0EF00DF9D79 /* DarwinSystemFontTests.m */,
 			);
 			path = ScenariosUITests;
 			sourceTree = "<group>";
@@ -297,28 +384,55 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		686382E92AC1F9F300E27AAD /* ScenariosShare */ = {
+			isa = PBXGroup;
+			children = (
+				686382EA2AC1F9F300E27AAD /* ShareViewController.h */,
+				686382EB2AC1F9F300E27AAD /* ShareViewController.m */,
+				686382ED2AC1F9F300E27AAD /* MainInterface.storyboard */,
+				686382F02AC1F9F300E27AAD /* Info.plist */,
+			);
+			path = ScenariosShare;
+			sourceTree = "<group>";
+		};
+		686383062AC2024200E27AAD /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				6863830B2AC2024200E27AAD /* FlutterAppExtensionTestHost.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		F7B464DC2759D02B00079189 /* Goldens */ = {
 			isa = PBXGroup;
 			children = (
-				685B9F382977B73100B45442 /* golden_platform_view_large_cliprrect_iPhone 8_16.0_simulator.png */,
-				685B9F372977B73100B45442 /* golden_platform_view_large_cliprrect_with_transform_iPhone 8_16.0_simulator.png */,
-				68D50041291ED8CD001ACFE1 /* golden_platform_view_cliprect_with_transform_iPhone 8_16.0_simulator.png */,
-				68D5003D291ED645001ACFE1 /* golden_platform_view_cliprrect_with_transform_iPhone 8_16.0_simulator.png */,
-				687AF8E8291EBDE0003912C7 /* golden_platform_view_clippath_with_transform_iPhone 8_16.0_simulator.png */,
-				F7B464E32759D0A900079189 /* golden_bogus_font_text_iPhone 8_16.0_simulator.png */,
-				F7B464E92759D0A900079189 /* golden_non_full_screen_flutter_view_platform_view_iPhone 8_16.0_simulator.png */,
-				F7B464E52759D0A900079189 /* golden_platform_view_clippath_iPhone 8_16.0_simulator.png */,
-				F769EB52276312BB007AC10F /* golden_platform_view_cliprect_iPhone 8_16.0_simulator.png */,
-				F7B464E02759D0A900079189 /* golden_platform_view_cliprrect_iPhone 8_16.0_simulator.png */,
-				F7B464DF2759D0A900079189 /* golden_platform_view_iPhone 8_16.0_simulator.png */,
-				F7B464E62759D0A900079189 /* golden_platform_view_multiple_background_foreground_iPhone 8_16.0_simulator.png */,
-				F7B464E22759D0A900079189 /* golden_platform_view_multiple_iPhone 8_16.0_simulator.png */,
-				F7B464E42759D0A900079189 /* golden_platform_view_opacity_iPhone 8_16.0_simulator.png */,
-				F7B464EA2759D0A900079189 /* golden_platform_view_rotate_iPhone 8_16.0_simulator.png */,
-				F7B464E12759D0A900079189 /* golden_platform_view_transform_iPhone 8_16.0_simulator.png */,
-				F7B464E72759D0A900079189 /* golden_platform_view_with_other_backdrop_filter_iPhone 8_16.0_simulator.png */,
-				F7B464F82759DEA100079189 /* golden_spawn_engine_works_iPhone 8_16.0_simulator.png */,
-				F7B464DE2759D0A900079189 /* golden_two_platform_views_with_other_backdrop_filter_iPhone 8_16.0_simulator.png */,
+				68C9D8082AD9B6C800DF9D79 /* golden_darwin_system_font_iPhone SE (3rd generation)_17.0_simulator.png */,
+				3BFD971E2A990CF40094F51B /* golden_bogus_font_text_impeller_iPhone SE (3rd generation)_17.0_simulator.png */,
+				3BFD971F2A990CF40094F51B /* golden_spawn_engine_works_impeller_iPhone SE (3rd generation)_17.0_simulator.png */,
+				68D93AED2A46097E0054AB6D /* golden_platform_view_with_negative_backdrop_filter_iPhone SE (3rd generation)_17.0_simulator.png */,
+				6860CE242A01B2FF00B68EC5 /* golden_two_platform_view_clip_path_iPhone SE (3rd generation)_17.0_simulator.png */,
+				6860CE232A01B2FF00B68EC5 /* golden_two_platform_view_clip_rect_iPhone SE (3rd generation)_17.0_simulator.png */,
+				6860CE222A01B2FF00B68EC5 /* golden_two_platform_view_clip_rrect_iPhone SE (3rd generation)_17.0_simulator.png */,
+				684FFF7229F9C10500281002 /* golden_bogus_font_text_iPhone SE (3rd generation)_17.0_simulator.png */,
+				684FFF7029F9C10500281002 /* golden_non_full_screen_flutter_view_platform_view_iPhone SE (3rd generation)_17.0_simulator.png */,
+				684FFF7729F9C10600281002 /* golden_platform_view_clippath_iPhone SE (3rd generation)_17.0_simulator.png */,
+				684FFF7629F9C10600281002 /* golden_platform_view_clippath_with_transform_iPhone SE (3rd generation)_17.0_simulator.png */,
+				684FFF6C29F9C10400281002 /* golden_platform_view_cliprect_after_moved_iPhone SE (3rd generation)_17.0_simulator.png */,
+				684FFF7429F9C10500281002 /* golden_platform_view_cliprect_iPhone SE (3rd generation)_17.0_simulator.png */,
+				684FFF6929F9C10300281002 /* golden_platform_view_cliprect_with_transform_iPhone SE (3rd generation)_17.0_simulator.png */,
+				684FFF7129F9C10500281002 /* golden_platform_view_cliprrect_iPhone SE (3rd generation)_17.0_simulator.png */,
+				684FFF6829F9C10300281002 /* golden_platform_view_cliprrect_with_transform_iPhone SE (3rd generation)_17.0_simulator.png */,
+				684FFF7829F9C10600281002 /* golden_platform_view_iPhone SE (3rd generation)_17.0_simulator.png */,
+				684FFF7929F9C10600281002 /* golden_platform_view_large_cliprrect_iPhone SE (3rd generation)_17.0_simulator.png */,
+				684FFF6D29F9C10400281002 /* golden_platform_view_large_cliprrect_with_transform_iPhone SE (3rd generation)_17.0_simulator.png */,
+				684FFF7529F9C10600281002 /* golden_platform_view_multiple_background_foreground_iPhone SE (3rd generation)_17.0_simulator.png */,
+				684FFF7329F9C10500281002 /* golden_platform_view_multiple_iPhone SE (3rd generation)_17.0_simulator.png */,
+				684FFF6A29F9C10300281002 /* golden_platform_view_opacity_iPhone SE (3rd generation)_17.0_simulator.png */,
+				684FFF6B29F9C10400281002 /* golden_platform_view_rotate_iPhone SE (3rd generation)_17.0_simulator.png */,
+				684FFF6F29F9C10400281002 /* golden_platform_view_transform_iPhone SE (3rd generation)_17.0_simulator.png */,
+				684FFF7B29F9C10700281002 /* golden_platform_view_with_other_backdrop_filter_iPhone SE (3rd generation)_17.0_simulator.png */,
+				684FFF7A29F9C10700281002 /* golden_spawn_engine_works_iPhone SE (3rd generation)_17.0_simulator.png */,
+				684FFF6E29F9C10400281002 /* golden_two_platform_views_with_other_backdrop_filter_iPhone SE (3rd generation)_17.0_simulator.png */,
 			);
 			name = Goldens;
 			sourceTree = "<group>";
@@ -334,10 +448,12 @@
 				248D76C422E388370012F0C1 /* Frameworks */,
 				248D76C522E388370012F0C1 /* Resources */,
 				246B4E4422E3B5F700073EBF /* Embed Frameworks */,
+				686382F42AC1F9F300E27AAD /* Embed Foundation Extensions */,
 			);
 			buildRules = (
 			);
 			dependencies = (
+				686382F22AC1F9F300E27AAD /* PBXTargetDependency */,
 			);
 			name = Scenarios;
 			productName = Scenarios;
@@ -375,6 +491,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				686383112AC2027100E27AAD /* PBXTargetDependency */,
 				248D76EC22E388380012F0C1 /* PBXTargetDependency */,
 			);
 			name = ScenariosUITests;
@@ -382,6 +499,24 @@
 			productReference = 248D76EA22E388380012F0C1 /* ScenariosUITests.xctest */;
 			productType = "com.apple.product-type.bundle.ui-testing";
 		};
+		686382E72AC1F9F300E27AAD /* ScenariosShare */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 686382F72AC1F9F300E27AAD /* Build configuration list for PBXNativeTarget "ScenariosShare" */;
+			buildPhases = (
+				686382E42AC1F9F300E27AAD /* Sources */,
+				686382E52AC1F9F300E27AAD /* Frameworks */,
+				686382E62AC1F9F300E27AAD /* Resources */,
+				686383172AC2175100E27AAD /* Embed Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = ScenariosShare;
+			productName = ScenariosShare;
+			productReference = 686382E82AC1F9F300E27AAD /* ScenariosShare.appex */;
+			productType = "com.apple.product-type.app-extension";
+		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
@@ -405,6 +540,9 @@
 						LastSwiftMigration = 1030;
 						TestTargetID = 248D76C622E388370012F0C1;
 					};
+					686382E72AC1F9F300E27AAD = {
+						CreatedOnToolsVersion = 15.0;
+					};
 				};
 			};
 			buildConfigurationList = 248D76C222E388370012F0C1 /* Build configuration list for PBXProject "Scenarios" */;
@@ -418,15 +556,32 @@
 			mainGroup = 248D76BE22E388370012F0C1;
 			productRefGroup = 248D76C822E388370012F0C1 /* Products */;
 			projectDirPath = "";
+			projectReferences = (
+				{
+					ProductGroup = 686383062AC2024200E27AAD /* Products */;
+					ProjectRef = 686383052AC2024200E27AAD /* FlutterAppExtensionTestHost.xcodeproj */;
+				},
+			);
 			projectRoot = "";
 			targets = (
 				248D76C622E388370012F0C1 /* Scenarios */,
 				248D76DE22E388380012F0C1 /* ScenariosTests */,
 				248D76E922E388380012F0C1 /* ScenariosUITests */,
+				686382E72AC1F9F300E27AAD /* ScenariosShare */,
 			);
 		};
 /* End PBXProject section */
 
+/* Begin PBXReferenceProxy section */
+		6863830B2AC2024200E27AAD /* FlutterAppExtensionTestHost.app */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.application;
+			path = FlutterAppExtensionTestHost.app;
+			remoteRef = 6863830A2AC2024200E27AAD /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+/* End PBXReferenceProxy section */
+
 /* Begin PBXResourcesBuildPhase section */
 		248D76C522E388370012F0C1 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
@@ -447,25 +602,41 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				68D50042291ED8CD001ACFE1 /* golden_platform_view_cliprect_with_transform_iPhone 8_16.0_simulator.png in Resources */,
-				F7B464F62759D0A900079189 /* golden_non_full_screen_flutter_view_platform_view_iPhone 8_16.0_simulator.png in Resources */,
-				F7B464F02759D0A900079189 /* golden_bogus_font_text_iPhone 8_16.0_simulator.png in Resources */,
-				F7B464F22759D0A900079189 /* golden_platform_view_clippath_iPhone 8_16.0_simulator.png in Resources */,
-				F7B464F12759D0A900079189 /* golden_platform_view_opacity_iPhone 8_16.0_simulator.png in Resources */,
-				F7B464F92759DEA100079189 /* golden_spawn_engine_works_iPhone 8_16.0_simulator.png in Resources */,
-				F7B464EC2759D0A900079189 /* golden_platform_view_iPhone 8_16.0_simulator.png in Resources */,
-				F7B464EE2759D0A900079189 /* golden_platform_view_transform_iPhone 8_16.0_simulator.png in Resources */,
-				F7B464F32759D0A900079189 /* golden_platform_view_multiple_background_foreground_iPhone 8_16.0_simulator.png in Resources */,
-				F7B464F72759D0A900079189 /* golden_platform_view_rotate_iPhone 8_16.0_simulator.png in Resources */,
-				F7B464ED2759D0A900079189 /* golden_platform_view_cliprrect_iPhone 8_16.0_simulator.png in Resources */,
-				685B9F3A2977B73100B45442 /* golden_platform_view_large_cliprrect_iPhone 8_16.0_simulator.png in Resources */,
-				68D5003F291ED645001ACFE1 /* golden_platform_view_cliprrect_with_transform_iPhone 8_16.0_simulator.png in Resources */,
-				F7B464EB2759D0A900079189 /* golden_two_platform_views_with_other_backdrop_filter_iPhone 8_16.0_simulator.png in Resources */,
-				F7B464F42759D0A900079189 /* golden_platform_view_with_other_backdrop_filter_iPhone 8_16.0_simulator.png in Resources */,
-				687AF8E9291EBDE0003912C7 /* golden_platform_view_clippath_with_transform_iPhone 8_16.0_simulator.png in Resources */,
-				685B9F392977B73100B45442 /* golden_platform_view_large_cliprrect_with_transform_iPhone 8_16.0_simulator.png in Resources */,
-				F769EB53276312BB007AC10F /* golden_platform_view_cliprect_iPhone 8_16.0_simulator.png in Resources */,
-				F7B464EF2759D0A900079189 /* golden_platform_view_multiple_iPhone 8_16.0_simulator.png in Resources */,
+				684FFF8C29F9C10700281002 /* golden_platform_view_iPhone SE (3rd generation)_17.0_simulator.png in Resources */,
+				684FFF8E29F9C10700281002 /* golden_spawn_engine_works_iPhone SE (3rd generation)_17.0_simulator.png in Resources */,
+				684FFF8229F9C10700281002 /* golden_two_platform_views_with_other_backdrop_filter_iPhone SE (3rd generation)_17.0_simulator.png in Resources */,
+				684FFF7D29F9C10700281002 /* golden_platform_view_cliprect_with_transform_iPhone SE (3rd generation)_17.0_simulator.png in Resources */,
+				684FFF8829F9C10700281002 /* golden_platform_view_cliprect_iPhone SE (3rd generation)_17.0_simulator.png in Resources */,
+				684FFF8529F9C10700281002 /* golden_platform_view_cliprrect_iPhone SE (3rd generation)_17.0_simulator.png in Resources */,
+				6860CE252A01B2FF00B68EC5 /* golden_two_platform_view_clip_rrect_iPhone SE (3rd generation)_17.0_simulator.png in Resources */,
+				684FFF8F29F9C10700281002 /* golden_platform_view_with_other_backdrop_filter_iPhone SE (3rd generation)_17.0_simulator.png in Resources */,
+				6860CE262A01B2FF00B68EC5 /* golden_two_platform_view_clip_rect_iPhone SE (3rd generation)_17.0_simulator.png in Resources */,
+				684FFF8A29F9C10700281002 /* golden_platform_view_clippath_with_transform_iPhone SE (3rd generation)_17.0_simulator.png in Resources */,
+				3BFD97212A990CF50094F51B /* golden_spawn_engine_works_impeller_iPhone SE (3rd generation)_17.0_simulator.png in Resources */,
+				684FFF8429F9C10700281002 /* golden_non_full_screen_flutter_view_platform_view_iPhone SE (3rd generation)_17.0_simulator.png in Resources */,
+				684FFF7C29F9C10700281002 /* golden_platform_view_cliprrect_with_transform_iPhone SE (3rd generation)_17.0_simulator.png in Resources */,
+				684FFF7F29F9C10700281002 /* golden_platform_view_rotate_iPhone SE (3rd generation)_17.0_simulator.png in Resources */,
+				684FFF8029F9C10700281002 /* golden_platform_view_cliprect_after_moved_iPhone SE (3rd generation)_17.0_simulator.png in Resources */,
+				684FFF8929F9C10700281002 /* golden_platform_view_multiple_background_foreground_iPhone SE (3rd generation)_17.0_simulator.png in Resources */,
+				684FFF8629F9C10700281002 /* golden_bogus_font_text_iPhone SE (3rd generation)_17.0_simulator.png in Resources */,
+				684FFF7E29F9C10700281002 /* golden_platform_view_opacity_iPhone SE (3rd generation)_17.0_simulator.png in Resources */,
+				684FFF8729F9C10700281002 /* golden_platform_view_multiple_iPhone SE (3rd generation)_17.0_simulator.png in Resources */,
+				68D93AEE2A46097E0054AB6D /* golden_platform_view_with_negative_backdrop_filter_iPhone SE (3rd generation)_17.0_simulator.png in Resources */,
+				3BFD97202A990CF50094F51B /* golden_bogus_font_text_impeller_iPhone SE (3rd generation)_17.0_simulator.png in Resources */,
+				68C9D8092AD9B6C800DF9D79 /* golden_darwin_system_font_iPhone SE (3rd generation)_17.0_simulator.png in Resources */,
+				684FFF8D29F9C10700281002 /* golden_platform_view_large_cliprrect_iPhone SE (3rd generation)_17.0_simulator.png in Resources */,
+				684FFF8329F9C10700281002 /* golden_platform_view_transform_iPhone SE (3rd generation)_17.0_simulator.png in Resources */,
+				684FFF8B29F9C10700281002 /* golden_platform_view_clippath_iPhone SE (3rd generation)_17.0_simulator.png in Resources */,
+				6860CE272A01B2FF00B68EC5 /* golden_two_platform_view_clip_path_iPhone SE (3rd generation)_17.0_simulator.png in Resources */,
+				684FFF8129F9C10700281002 /* golden_platform_view_large_cliprrect_with_transform_iPhone SE (3rd generation)_17.0_simulator.png in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		686382E62AC1F9F300E27AAD /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				686382EF2AC1F9F300E27AAD /* MainInterface.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -502,6 +673,7 @@
 			files = (
 				6402EBD124147BDA00987DCB /* UnobstructedPlatformViewTests.m in Sources */,
 				68A5B63423EB71D300BDBCDB /* PlatformViewGestureRecognizerTests.m in Sources */,
+				68C9D8012AD9B0EF00DF9D79 /* DarwinSystemFontTests.m in Sources */,
 				6816DBA12317573300A51400 /* GoldenImage.m in Sources */,
 				0A02E8F724EFAD27002D54E5 /* BogusFontTextTest.m in Sources */,
 				6816DB9E231750ED00A51400 /* GoldenPlatformViewTests.m in Sources */,
@@ -511,10 +683,19 @@
 				F26F15B8268B6B5600EC54D3 /* iPadGestureTests.m in Sources */,
 				246A6611252E693A00EAB0F3 /* RenderingSelectionTest.m in Sources */,
 				4F06F1B32473296E000AF246 /* LocalizationInitializationTest.m in Sources */,
+				686383132AC202B700E27AAD /* AppExtensionTests.m in Sources */,
 				0DDEBC89258830B40065D0E8 /* SpawnEngineTest.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		686382E42AC1F9F300E27AAD /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				686382EC2AC1F9F300E27AAD /* ShareViewController.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
@@ -528,8 +709,29 @@
 			target = 248D76C622E388370012F0C1 /* Scenarios */;
 			targetProxy = 248D76EB22E388380012F0C1 /* PBXContainerItemProxy */;
 		};
+		686382F22AC1F9F300E27AAD /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 686382E72AC1F9F300E27AAD /* ScenariosShare */;
+			targetProxy = 686382F12AC1F9F300E27AAD /* PBXContainerItemProxy */;
+		};
+		686383112AC2027100E27AAD /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = FlutterAppExtensionTestHost;
+			targetProxy = 686383102AC2027100E27AAD /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
+/* Begin PBXVariantGroup section */
+		686382ED2AC1F9F300E27AAD /* MainInterface.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				686382EE2AC1F9F300E27AAD /* Base */,
+			);
+			name = MainInterface.storyboard;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
 /* Begin XCBuildConfiguration section */
 		248D76F122E388380012F0C1 /* Debug */ = {
 			isa = XCBuildConfiguration;
@@ -650,7 +852,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = S8QB4VV633;
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
@@ -673,7 +875,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = S8QB4VV633;
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
@@ -695,7 +897,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = S8QB4VV633;
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
@@ -722,7 +924,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = S8QB4VV633;
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
@@ -748,7 +950,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = S8QB4VV633;
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
@@ -774,7 +976,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = S8QB4VV633;
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
@@ -796,6 +998,68 @@
 			};
 			name = Release;
 		};
+		686382F52AC1F9F300E27AAD /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = "";
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu17;
+				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_FILE = ScenariosShare/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = ScenariosShare;
+				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2023 flutter. All rights reserved.";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@executable_path/../../Frameworks",
+				);
+				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.Scenarios.ScenariosShare;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+				SWIFT_EMIT_LOC_STRINGS = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		686382F62AC1F9F300E27AAD /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = "";
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu17;
+				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_FILE = ScenariosShare/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = ScenariosShare;
+				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2023 flutter. All rights reserved.";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@executable_path/../../Frameworks",
+				);
+				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.Scenarios.ScenariosShare;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+				SWIFT_EMIT_LOC_STRINGS = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Release;
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
@@ -835,6 +1099,15 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		686382F72AC1F9F300E27AAD /* Build configuration list for PBXNativeTarget "ScenariosShare" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				686382F52AC1F9F300E27AAD /* Debug */,
+				686382F62AC1F9F300E27AAD /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 /* End XCConfigurationList section */
 	};
 	rootObject = 248D76BF22E388370012F0C1 /* Project object */;
diff --git a/testing/scenario_app/ios/Scenarios/Scenarios.xcodeproj/xcshareddata/xcschemes/Scenarios.xcscheme b/testing/scenario_app/ios/Scenarios/Scenarios.xcodeproj/xcshareddata/xcschemes/Scenarios.xcscheme
index 8a13784bbe19f36d5c0b9abd4a132b3a65e96518..dcd0cd0a356f056e64b0e0139c27d4b25e312bff 100644
--- a/testing/scenario_app/ios/Scenarios/Scenarios.xcodeproj/xcshareddata/xcschemes/Scenarios.xcscheme
+++ b/testing/scenario_app/ios/Scenarios/Scenarios.xcodeproj/xcshareddata/xcschemes/Scenarios.xcscheme
@@ -26,8 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      systemAttachmentLifetime = "keepNever">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO"
diff --git a/testing/scenario_app/ios/Scenarios/Scenarios/AppDelegate.h b/testing/scenario_app/ios/Scenarios/Scenarios/AppDelegate.h
index b7984f089a9c54de3a366ef8a3773678105174cd..46ac1558cc0ba427e73c48adb9a2ec4c7bb23faf 100644
--- a/testing/scenario_app/ios/Scenarios/Scenarios/AppDelegate.h
+++ b/testing/scenario_app/ios/Scenarios/Scenarios/AppDelegate.h
@@ -2,9 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_TESTING_SCENARIO_APP_IOS_SCENARIOS_SCENARIOS_APPDELEGATE_H_
+#define FLUTTER_TESTING_SCENARIO_APP_IOS_SCENARIOS_SCENARIOS_APPDELEGATE_H_
+
 #import <Flutter/Flutter.h>
 #import <UIKit/UIKit.h>
 
 @interface AppDelegate : FlutterAppDelegate
 
 @end
+
+#endif  // FLUTTER_TESTING_SCENARIO_APP_IOS_SCENARIOS_SCENARIOS_APPDELEGATE_H_
diff --git a/testing/scenario_app/ios/Scenarios/Scenarios/AppDelegate.m b/testing/scenario_app/ios/Scenarios/Scenarios/AppDelegate.m
index 5118a4e6b4ad801d0fadf716226e6d480b99c2f3..47188144fcca7d24455564ca0ef98e1f7fe75257 100644
--- a/testing/scenario_app/ios/Scenarios/Scenarios/AppDelegate.m
+++ b/testing/scenario_app/ios/Scenarios/Scenarios/AppDelegate.m
@@ -9,6 +9,20 @@
 #import "ScreenBeforeFlutter.h"
 #import "TextPlatformView.h"
 
+// A UIViewController that sets YES for its preferedStatusBarHidden property.
+// StatusBar includes current time, which is non-deterministic. This ViewController
+// removes the StatusBar to make the screenshot deterministic.
+@interface NoStatusBarViewController : UIViewController
+
+@end
+
+@implementation NoStatusBarViewController
+- (BOOL)prefersStatusBarHidden {
+  return YES;
+}
+@end
+
+// The FlutterViewController version of NoStatusBarViewController
 @interface NoStatusBarFlutterViewController : FlutterViewController
 
 @end
@@ -38,6 +52,10 @@
         @"platform_view_one_overlay_two_intersecting_overlays",
     @"--platform-view-multiple-without-overlays" : @"platform_view_multiple_without_overlays",
     @"--platform-view-max-overlays" : @"platform_view_max_overlays",
+    @"--platform-view-surrounding-layers-fractional-coordinate" :
+        @"platform_view_surrounding_layers_fractional_coordinate",
+    @"--platform-view-partial-intersection-fractional-coordinate" :
+        @"platform_view_partial_intersection_fractional_coordinate",
     @"--platform-view-multiple" : @"platform_view_multiple",
     @"--platform-view-multiple-background-foreground" :
         @"platform_view_multiple_background_foreground",
@@ -55,18 +73,29 @@
     @"--platform-view-with-other-backdrop-filter" : @"platform_view_with_other_backdrop_filter",
     @"--two-platform-views-with-other-backdrop-filter" :
         @"two_platform_views_with_other_backdrop_filter",
+    @"--platform-view-with-negative-backdrop-filter" :
+        @"platform_view_with_negative_backdrop_filter",
     @"--platform-view-rotate" : @"platform_view_rotate",
     @"--non-full-screen-flutter-view-platform-view" : @"non_full_screen_flutter_view_platform_view",
     @"--gesture-reject-after-touches-ended" : @"platform_view_gesture_reject_after_touches_ended",
     @"--gesture-reject-eager" : @"platform_view_gesture_reject_eager",
     @"--gesture-accept" : @"platform_view_gesture_accept",
+    @"--gesture-accept-with-overlapping-platform-views" :
+        @"platform_view_gesture_accept_with_overlapping_platform_views",
     @"--tap-status-bar" : @"tap_status_bar",
     @"--animated-color-square" : @"animated_color_square",
+    @"--solid-blue" : @"solid_blue",
     @"--platform-view-with-continuous-texture" : @"platform_view_with_continuous_texture",
     @"--bogus-font-text" : @"bogus_font_text",
     @"--spawn-engine-works" : @"spawn_engine_works",
     @"--pointer-events" : @"pointer_events",
-    @"--platform-view-scrolling-under-widget" : @"platform_view_scrolling_under_widget"
+    @"--platform-view-scrolling-under-widget" : @"platform_view_scrolling_under_widget",
+    @"--platform-views-with-clips-scrolling" : @"platform_views_with_clips_scrolling",
+    @"--platform-view-cliprect-after-moved" : @"platform_view_cliprect_after_moved",
+    @"--two-platform-view-clip-rect" : @"two_platform_view_clip_rect",
+    @"--two-platform-view-clip-rrect" : @"two_platform_view_clip_rrect",
+    @"--two-platform-view-clip-path" : @"two_platform_view_clip_path",
+    @"--darwin-system-font" : @"darwin_system_font",
   };
   __block NSString* flutterViewControllerTestName = nil;
   [launchArgsMap
@@ -157,7 +186,7 @@
   UIViewController* rootViewController = flutterViewController;
   // Make Flutter View's origin x/y not 0.
   if ([scenarioIdentifier isEqualToString:@"non_full_screen_flutter_view_platform_view"]) {
-    rootViewController = [UIViewController new];
+    rootViewController = [[NoStatusBarViewController alloc] init];
     [rootViewController.view addSubview:flutterViewController.view];
     flutterViewController.view.frame = CGRectMake(150, 150, 500, 500);
   }
diff --git a/testing/scenario_app/ios/Scenarios/Scenarios/ContinuousTexture.h b/testing/scenario_app/ios/Scenarios/Scenarios/ContinuousTexture.h
index 996de850caa099ef14a98f1ab5bb2a4cc4b46934..4e4422dad3502a5754d4aceb675f2f7a6dca599a 100644
--- a/testing/scenario_app/ios/Scenarios/Scenarios/ContinuousTexture.h
+++ b/testing/scenario_app/ios/Scenarios/Scenarios/ContinuousTexture.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_TESTING_SCENARIO_APP_IOS_SCENARIOS_SCENARIOS_CONTINUOUSTEXTURE_H_
+#define FLUTTER_TESTING_SCENARIO_APP_IOS_SCENARIOS_SCENARIOS_CONTINUOUSTEXTURE_H_
+
 #import <Flutter/Flutter.h>
 #import <Foundation/Foundation.h>
 
@@ -18,3 +21,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif  // FLUTTER_TESTING_SCENARIO_APP_IOS_SCENARIOS_SCENARIOS_CONTINUOUSTEXTURE_H_
diff --git a/testing/scenario_app/ios/Scenarios/Scenarios/FlutterEngine+ScenariosTest.h b/testing/scenario_app/ios/Scenarios/Scenarios/FlutterEngine+ScenariosTest.h
index 9438dd3774ea47cc80255e7f5be852482ee3dae3..1e746199b603b96279edb04ec8973a416ce65b5b 100644
--- a/testing/scenario_app/ios/Scenarios/Scenarios/FlutterEngine+ScenariosTest.h
+++ b/testing/scenario_app/ios/Scenarios/Scenarios/FlutterEngine+ScenariosTest.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_TESTING_SCENARIO_APP_IOS_SCENARIOS_SCENARIOS_FLUTTERENGINE_SCENARIOSTEST_H_
+#define FLUTTER_TESTING_SCENARIO_APP_IOS_SCENARIOS_SCENARIOS_FLUTTERENGINE_SCENARIOSTEST_H_
+
 #import <Flutter/Flutter.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -14,3 +17,5 @@ NS_ASSUME_NONNULL_BEGIN
                        entrypointArgs:(nullable NSArray<NSString*>*)entrypointArgs;
 @end
 NS_ASSUME_NONNULL_END
+
+#endif  // FLUTTER_TESTING_SCENARIO_APP_IOS_SCENARIOS_SCENARIOS_FLUTTERENGINE_SCENARIOSTEST_H_
diff --git a/testing/scenario_app/ios/Scenarios/Scenarios/Info.plist b/testing/scenario_app/ios/Scenarios/Scenarios/Info.plist
index bc23fd5445d4d61dfc8b947256457caf734c8526..0605d9602d839ef6d9aeab77f21f564f2991a6b5 100644
--- a/testing/scenario_app/ios/Scenarios/Scenarios/Info.plist
+++ b/testing/scenario_app/ios/Scenarios/Scenarios/Info.plist
@@ -41,5 +41,7 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>FLTEnableImpeller</key>
+	<false/>
 </dict>
 </plist>
diff --git a/testing/scenario_app/ios/Scenarios/Scenarios/ScreenBeforeFlutter.h b/testing/scenario_app/ios/Scenarios/Scenarios/ScreenBeforeFlutter.h
index bcbacd8871dc9f4e062ad9ee735cd8a8759c9a40..bf184129aae7b7d24110f81472794eb6dfa2489e 100644
--- a/testing/scenario_app/ios/Scenarios/Scenarios/ScreenBeforeFlutter.h
+++ b/testing/scenario_app/ios/Scenarios/Scenarios/ScreenBeforeFlutter.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_TESTING_SCENARIO_APP_IOS_SCENARIOS_SCENARIOS_SCREENBEFOREFLUTTER_H_
+#define FLUTTER_TESTING_SCENARIO_APP_IOS_SCENARIOS_SCENARIOS_SCREENBEFOREFLUTTER_H_
+
 #import <Flutter/Flutter.h>
 
 @interface ScreenBeforeFlutter : UIViewController
@@ -12,3 +15,5 @@
 @property(nonatomic, readonly) FlutterEngine* engine;
 
 @end
+
+#endif  // FLUTTER_TESTING_SCENARIO_APP_IOS_SCENARIOS_SCENARIOS_SCREENBEFOREFLUTTER_H_
diff --git a/testing/scenario_app/ios/Scenarios/Scenarios/TextPlatformView.h b/testing/scenario_app/ios/Scenarios/Scenarios/TextPlatformView.h
index e88fbe9ee2fd9c51a217d8c5b0bf9b400db9e8a6..c145f932365631f3a7f9bc8ed62fabf7e5cbf14b 100644
--- a/testing/scenario_app/ios/Scenarios/Scenarios/TextPlatformView.h
+++ b/testing/scenario_app/ios/Scenarios/Scenarios/TextPlatformView.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_TESTING_SCENARIO_APP_IOS_SCENARIOS_SCENARIOS_TEXTPLATFORMVIEW_H_
+#define FLUTTER_TESTING_SCENARIO_APP_IOS_SCENARIOS_SCENARIOS_TEXTPLATFORMVIEW_H_
+
 #import <Flutter/Flutter.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -21,3 +24,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif  // FLUTTER_TESTING_SCENARIO_APP_IOS_SCENARIOS_SCENARIOS_TEXTPLATFORMVIEW_H_
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosShare/Base.lproj/MainInterface.storyboard b/testing/scenario_app/ios/Scenarios/ScenariosShare/Base.lproj/MainInterface.storyboard
new file mode 100644
index 0000000000000000000000000000000000000000..589bdd9e70de9ad43986536bb70b3e73be5d3ef0
--- /dev/null
+++ b/testing/scenario_app/ios/Scenarios/ScenariosShare/Base.lproj/MainInterface.storyboard
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="j1y-V4-xli">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--Share View Controller-->
+        <scene sceneID="ceB-am-kn3">
+            <objects>
+                <viewController id="j1y-V4-xli" customClass="ShareViewController" customModuleProvider="" sceneMemberID="viewController">
+                    <view key="view" opaque="NO" contentMode="scaleToFill" id="wbc-yd-nQP">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                        <viewLayoutGuide key="safeArea" id="1Xd-am-t49"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="CEy-Cv-SGf" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+        </scene>
+    </scenes>
+</document>
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosShare/Info.plist b/testing/scenario_app/ios/Scenarios/ScenariosShare/Info.plist
new file mode 100644
index 0000000000000000000000000000000000000000..ad33037771e88d4a057bd318e7e7ae13fa1a0be9
--- /dev/null
+++ b/testing/scenario_app/ios/Scenarios/ScenariosShare/Info.plist
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSExtension</key>
+	<dict>
+		<key>NSExtensionAttributes</key>
+		<dict>
+			<key>NSExtensionActivationRule</key>
+			<string>TRUEPREDICATE</string>
+		</dict>
+		<key>NSExtensionPrincipalClass</key>
+		<string>ShareViewController</string>
+		<key>NSExtensionPointIdentifier</key>
+		<string>com.apple.share-services</string>
+	</dict>
+</dict>
+</plist>
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosShare/ShareViewController.h b/testing/scenario_app/ios/Scenarios/ScenariosShare/ShareViewController.h
new file mode 100644
index 0000000000000000000000000000000000000000..133213bd1c3ddab2fa5fea232f944d1106a23794
--- /dev/null
+++ b/testing/scenario_app/ios/Scenarios/ScenariosShare/ShareViewController.h
@@ -0,0 +1,15 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_TESTING_SCENARIO_APP_IOS_SCENARIOS_SCENARIOSSHARE_SHAREVIEWCONTROLLER_H_
+#define FLUTTER_TESTING_SCENARIO_APP_IOS_SCENARIOS_SCENARIOSSHARE_SHAREVIEWCONTROLLER_H_
+
+#import <Flutter/Flutter.h>
+#import <UIKit/UIKit.h>
+
+@interface ShareViewController : FlutterViewController
+
+@end
+
+#endif  // FLUTTER_TESTING_SCENARIO_APP_IOS_SCENARIOS_SCENARIOSSHARE_SHAREVIEWCONTROLLER_H_
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosShare/ShareViewController.m b/testing/scenario_app/ios/Scenarios/ScenariosShare/ShareViewController.m
new file mode 100644
index 0000000000000000000000000000000000000000..cea875a76271ad06608d3c142952faeb065c3d26
--- /dev/null
+++ b/testing/scenario_app/ios/Scenarios/ScenariosShare/ShareViewController.m
@@ -0,0 +1,31 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "ShareViewController.h"
+
+@interface ShareViewController ()
+
+@end
+
+@implementation ShareViewController
+
+- (instancetype)init {
+  FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"FlutterControllerTest" project:nil];
+  [engine run];
+  self = [self initWithEngine:engine nibName:nil bundle:nil];
+  self.view.accessibilityIdentifier = @"flutter_view";
+
+  [engine.binaryMessenger
+      setMessageHandlerOnChannel:@"waiting_for_status"
+            binaryMessageHandler:^(NSData* _Nullable message, FlutterBinaryReply _Nonnull reply) {
+              FlutterMethodChannel* channel = [FlutterMethodChannel
+                  methodChannelWithName:@"driver"
+                        binaryMessenger:engine.binaryMessenger
+                                  codec:[FlutterJSONMethodCodec sharedInstance]];
+              [channel invokeMethod:@"set_scenario" arguments:@{@"name" : @"app_extension"}];
+            }];
+  return self;
+}
+
+@end
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosTests/FlutterEngineTest.m b/testing/scenario_app/ios/Scenarios/ScenariosTests/FlutterEngineTest.m
index 3c9119af61704ad6776dccae19b86aa1a8c7183e..218bc780a9b5296150823093035f5db1301756bd 100644
--- a/testing/scenario_app/ios/Scenarios/ScenariosTests/FlutterEngineTest.m
+++ b/testing/scenario_app/ios/Scenarios/ScenariosTests/FlutterEngineTest.m
@@ -12,6 +12,8 @@
 
 @implementation FlutterEngineTest
 
+extern NSNotificationName const FlutterViewControllerWillDealloc;
+
 - (void)testIsolateId {
   FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"test" project:nil];
   XCTAssertNil(engine.isolateId);
@@ -48,4 +50,40 @@
   XCTAssertNil(engine.lifecycleChannel);
 }
 
+// https://github.com/flutter/flutter/issues/123776
+- (void)testReleaseViewControllerAfterDestroyContextInHeadlessMode {
+  FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"test"
+                                                      project:nil
+                                       allowHeadlessExecution:YES];
+  XCTAssertNil(engine.navigationChannel);
+  XCTAssertNil(engine.platformChannel);
+  XCTAssertNil(engine.lifecycleChannel);
+
+  XCTAssertTrue([engine run]);
+
+  XCTAssertNotNil(engine.navigationChannel);
+  XCTAssertNotNil(engine.platformChannel);
+  XCTAssertNotNil(engine.lifecycleChannel);
+  XCTestExpectation* expectation =
+      [[XCTestExpectation alloc] initWithDescription:@"notification called"];
+  @autoreleasepool {
+    FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engine
+                                                                                  nibName:nil
+                                                                                   bundle:nil];
+    [engine setViewController:viewController];
+    [engine destroyContext];
+    [[NSNotificationCenter defaultCenter] addObserverForName:FlutterViewControllerWillDealloc
+                                                      object:nil
+                                                       queue:[NSOperationQueue mainQueue]
+                                                  usingBlock:^(NSNotification* _Nonnull note) {
+                                                    [expectation fulfill];
+                                                  }];
+    viewController = nil;
+  }
+  [self waitForExpectations:@[ expectation ] timeout:30.0];
+  XCTAssertNil(engine.navigationChannel);
+  XCTAssertNil(engine.platformChannel);
+  XCTAssertNil(engine.lifecycleChannel);
+}
+
 @end
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosTests/FlutterViewControllerTest.m b/testing/scenario_app/ios/Scenarios/ScenariosTests/FlutterViewControllerTest.m
index bc31baa05ab0a96e65472442a27851add0fbeb3a..533b4153af061ba77bf1551d52dbede9e8ad7cc6 100644
--- a/testing/scenario_app/ios/Scenarios/ScenariosTests/FlutterViewControllerTest.m
+++ b/testing/scenario_app/ios/Scenarios/ScenariosTests/FlutterViewControllerTest.m
@@ -60,4 +60,62 @@ FLUTTER_ASSERT_ARC
   [self waitForExpectationsWithTimeout:30.0 handler:nil];
 }
 
+- (void)testDrawLayer {
+  XCTestExpectation* firstFrameRendered = [self expectationWithDescription:@"firstFrameRendered"];
+  XCTestExpectation* imageRendered = [self expectationWithDescription:@"imageRendered"];
+
+  FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"test" project:nil];
+  [engine runWithEntrypoint:nil];
+  [engine.binaryMessenger
+      setMessageHandlerOnChannel:@"waiting_for_status"
+            binaryMessageHandler:^(NSData* _Nullable message, FlutterBinaryReply _Nonnull reply) {
+              FlutterMethodChannel* channel = [FlutterMethodChannel
+                  methodChannelWithName:@"driver"
+                        binaryMessenger:engine.binaryMessenger
+                                  codec:[FlutterJSONMethodCodec sharedInstance]];
+              [channel invokeMethod:@"set_scenario" arguments:@{@"name" : @"solid_blue"}];
+            }];
+
+  self.flutterViewController = [[FlutterViewController alloc] initWithEngine:engine
+                                                                     nibName:nil
+                                                                      bundle:nil];
+
+  XCTAssertFalse(self.flutterViewController.isDisplayingFlutterUI);
+
+  [self.flutterViewController setFlutterViewDidRenderCallback:^{
+    [firstFrameRendered fulfill];
+  }];
+
+  AppDelegate* appDelegate = (AppDelegate*)UIApplication.sharedApplication.delegate;
+  UIViewController* rootVC = appDelegate.window.rootViewController;
+  [rootVC presentViewController:self.flutterViewController animated:NO completion:nil];
+
+  CGColorSpaceRef color_space = CGColorSpaceCreateDeviceRGB();
+
+  __block dispatch_block_t callback;
+  callback = ^{
+    size_t width = 300u;
+    CGContextRef context =
+        CGBitmapContextCreate(nil, width, width, 8, 4 * width, color_space,
+                              kCGBitmapByteOrder32Little | kCGImageAlphaPremultipliedFirst);
+    [appDelegate.window.layer renderInContext:context];
+    uint32_t* image_data = (uint32_t*)CGBitmapContextGetData(context);
+    if (image_data[20] == 0xFF0000FF) {
+      [imageRendered fulfill];
+      return;
+    }
+
+    CGContextRelease(context);
+
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, NSEC_PER_SEC), dispatch_get_main_queue(),
+                   callback);
+  };
+  dispatch_after(dispatch_time(DISPATCH_TIME_NOW, NSEC_PER_SEC), dispatch_get_main_queue(),
+                 callback);
+
+  [self waitForExpectationsWithTimeout:30.0 handler:nil];
+
+  CGColorSpaceRelease(color_space);
+}
+
 @end
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/AppExtensionTests.m b/testing/scenario_app/ios/Scenarios/ScenariosUITests/AppExtensionTests.m
new file mode 100644
index 0000000000000000000000000000000000000000..32555de44ef81009f88962c26a363a5519b245e4
--- /dev/null
+++ b/testing/scenario_app/ios/Scenarios/ScenariosUITests/AppExtensionTests.m
@@ -0,0 +1,75 @@
+// Copyright 2020 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import <XCTest/XCTest.h>
+#import "GoldenTestManager.h"
+
+@interface AppExtensionTests : XCTestCase
+@property(nonatomic, strong) XCUIApplication* hostApplication;
+@end
+
+@implementation AppExtensionTests
+
+- (void)setUp {
+  [super setUp];
+  self.continueAfterFailure = NO;
+  self.hostApplication =
+      [[XCUIApplication alloc] initWithBundleIdentifier:@"dev.flutter.FlutterAppExtensionTestHost"];
+}
+
+- (void)testAppExtensionLaunching {
+  // Launch the Scenarios app first to ensure it's installed then close it.
+  XCUIApplication* app = [[XCUIApplication alloc] init];
+  [app launch];
+  [app terminate];
+
+  [self.hostApplication launch];
+  XCUIElement* button = self.hostApplication.buttons[@"Open Share"];
+  if (![button waitForExistenceWithTimeout:10]) {
+    NSLog(@"%@", self.hostApplication.debugDescription);
+    XCTFail(@"Failed due to not able to find any button with %@ seconds", @(10));
+  }
+  [button tap];
+  BOOL launchedExtensionInFlutter = NO;
+
+  // Wait for first cell of share sheet to appear.
+  XCUIElement* firstCell = self.hostApplication.collectionViews.cells.firstMatch;
+  if (![firstCell waitForExistenceWithTimeout:10]) {
+    NSLog(@"%@", self.hostApplication.debugDescription);
+    XCTFail(@"Failed due to not able to find any cells with %@ seconds", @(10));
+  }
+
+  // Custom share extension button (like the one in this test) does not have a
+  // unique identity on older versions of iOS. They are all identified as
+  // `XCElementSnapshotPrivilegedValuePlaceholder`. On iOS 17, they are
+  // identified by name. Loop through all the buttons labeled
+  // `XCElementSnapshotPrivilegedValuePlaceholder` or `Scenarios` to find the
+  // Flutter one.
+  NSPredicate* cellPredicate = [NSPredicate
+      predicateWithFormat:
+          @"label == 'XCElementSnapshotPrivilegedValuePlaceholder' OR label = 'Scenarios'"];
+  NSArray<XCUIElement*>* shareSheetCells =
+      [self.hostApplication.collectionViews.cells matchingPredicate:cellPredicate]
+          .allElementsBoundByIndex;
+  for (XCUIElement* shareSheetCell in shareSheetCells) {
+    [shareSheetCell tap];
+
+    XCUIElement* flutterView = self.hostApplication.otherElements[@"flutter_view"];
+    if ([flutterView waitForExistenceWithTimeout:10]) {
+      launchedExtensionInFlutter = YES;
+      break;
+    }
+
+    // All the built-in share extensions have a Cancel button.
+    // Tap the Cancel button to close the built-in extension.
+    XCUIElement* cancel = self.hostApplication.buttons[@"Cancel"];
+    if ([cancel waitForExistenceWithTimeout:10]) {
+      [cancel tap];
+    }
+  }
+  // App extension successfully launched flutter view.
+  XCTAssertTrue(launchedExtensionInFlutter);
+}
+
+@end
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/BogusFontTextTest.m b/testing/scenario_app/ios/Scenarios/ScenariosUITests/BogusFontTextTest.m
index 14c9e0bb933650088835c3fc390d02568f40a953..dc554ae2e5986cfb2f16e3756e26455b427d513e 100644
--- a/testing/scenario_app/ios/Scenarios/ScenariosUITests/BogusFontTextTest.m
+++ b/testing/scenario_app/ios/Scenarios/ScenariosUITests/BogusFontTextTest.m
@@ -25,7 +25,7 @@ FLUTTER_ASSERT_ARC
   XCTAssertTrue([addTextField waitForExistenceWithTimeout:30]);
 
   GoldenTestManager* manager = [[GoldenTestManager alloc] initWithLaunchArg:@"--bogus-font-text"];
-  [manager checkGoldenForTest:self];
+  [manager checkGoldenForTest:self rmesThreshold:kDefaultRmseThreshold];
 }
 
 @end
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/DarwinSystemFontTests.m b/testing/scenario_app/ios/Scenarios/ScenariosUITests/DarwinSystemFontTests.m
new file mode 100644
index 0000000000000000000000000000000000000000..29fec251557edcb7a07f306de33b8a2e1349ced1
--- /dev/null
+++ b/testing/scenario_app/ios/Scenarios/ScenariosUITests/DarwinSystemFontTests.m
@@ -0,0 +1,30 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import <Flutter/Flutter.h>
+#import <XCTest/XCTest.h>
+#import "GoldenTestManager.h"
+
+@interface DarwinSystemFontTests : XCTestCase
+
+@end
+
+@implementation DarwinSystemFontTests
+
+- (void)testFontRendering {
+  self.continueAfterFailure = NO;
+
+  XCUIApplication* application = [[XCUIApplication alloc] init];
+  application.launchArguments = @[ @"--darwin-system-font" ];
+  [application launch];
+
+  XCUIElement* addTextField = application.textFields[@"ready"];
+  XCTAssertTrue([addTextField waitForExistenceWithTimeout:30]);
+
+  GoldenTestManager* manager =
+      [[GoldenTestManager alloc] initWithLaunchArg:@"--darwin-system-font"];
+  [manager checkGoldenForTest:self rmesThreshold:kDefaultRmseThreshold];
+}
+
+@end
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/GoldenImage.h b/testing/scenario_app/ios/Scenarios/ScenariosUITests/GoldenImage.h
index dead0c530e12657e7ee1830bd3889f4bdb2a5712..2be1e5c2e3c639b317a52856452c41427486ece4 100644
--- a/testing/scenario_app/ios/Scenarios/ScenariosUITests/GoldenImage.h
+++ b/testing/scenario_app/ios/Scenarios/ScenariosUITests/GoldenImage.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_TESTING_SCENARIO_APP_IOS_SCENARIOS_SCENARIOSUITESTS_GOLDENIMAGE_H_
+#define FLUTTER_TESTING_SCENARIO_APP_IOS_SCENARIOS_SCENARIOSUITESTS_GOLDENIMAGE_H_
+
 #import <UIKit/UIKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -19,8 +22,10 @@ NS_ASSUME_NONNULL_BEGIN
 // Compare this GoldenImage to `image`.
 //
 // Return YES if the `image` of this GoldenImage have the same pixels of provided `image`.
-- (BOOL)compareGoldenToImage:(UIImage*)image;
+- (BOOL)compareGoldenToImage:(UIImage*)image rmesThreshold:(double)rmesThreshold;
 
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif  // FLUTTER_TESTING_SCENARIO_APP_IOS_SCENARIOS_SCENARIOSUITESTS_GOLDENIMAGE_H_
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/GoldenImage.m b/testing/scenario_app/ios/Scenarios/ScenariosUITests/GoldenImage.m
index 3a0d429b86609657ed66f670804d40c4d7f123d2..37ae7b70fbb1dda0caf6319dacbc63b4c965223a 100644
--- a/testing/scenario_app/ios/Scenarios/ScenariosUITests/GoldenImage.m
+++ b/testing/scenario_app/ios/Scenarios/ScenariosUITests/GoldenImage.m
@@ -8,8 +8,6 @@
 #import <os/log.h>
 #include <sys/sysctl.h>
 
-static const double kRmseThreshold = 0.5;
-
 @interface GoldenImage ()
 
 @end
@@ -28,7 +26,7 @@ static const double kRmseThreshold = 0.5;
   return self;
 }
 
-- (BOOL)compareGoldenToImage:(UIImage*)image {
+- (BOOL)compareGoldenToImage:(UIImage*)image rmesThreshold:(double)rmesThreshold {
   if (!self.image || !image) {
     os_log_error(OS_LOG_DEFAULT, "GOLDEN DIFF FAILED: image does not exists.");
     return NO;
@@ -91,11 +89,11 @@ static const double kRmseThreshold = 0.5;
     }
   }
   double rmse = sqrt(sum / size);
-  if (rmse > kRmseThreshold) {
+  if (rmse > rmesThreshold) {
     os_log_error(
         OS_LOG_DEFAULT,
         "GOLDEN DIFF FAILED: image diff greater than threshold. Current diff: %@, threshold: %@",
-        @(rmse), @(kRmseThreshold));
+        @(rmse), @(rmesThreshold));
     return NO;
   }
   return YES;
@@ -114,7 +112,7 @@ NS_INLINE NSString* _platformName() {
   char* answer = malloc(size);
   sysctlbyname("hw.model", answer, &size, NULL, 0);
 
-  NSString* results = [NSString stringWithCString:answer encoding:NSUTF8StringEncoding];
+  NSString* results = [NSString stringWithUTF8String:answer];
   free(answer);
   return results;
 }
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/GoldenPlatformViewTests.h b/testing/scenario_app/ios/Scenarios/ScenariosUITests/GoldenPlatformViewTests.h
index fd1b05ef0b009505589e4ccd1dc205a033a79886..901d45448dedd5420534465331350fab17affb2f 100644
--- a/testing/scenario_app/ios/Scenarios/ScenariosUITests/GoldenPlatformViewTests.h
+++ b/testing/scenario_app/ios/Scenarios/ScenariosUITests/GoldenPlatformViewTests.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_TESTING_SCENARIO_APP_IOS_SCENARIOS_SCENARIOSUITESTS_GOLDENPLATFORMVIEWTESTS_H_
+#define FLUTTER_TESTING_SCENARIO_APP_IOS_SCENARIOS_SCENARIOSUITESTS_GOLDENPLATFORMVIEWTESTS_H_
+
 #import <XCTest/XCTest.h>
 #import "GoldenTestManager.h"
 
@@ -18,6 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface GoldenPlatformViewTests : XCTestCase
 
 @property(nonatomic, strong) XCUIApplication* application;
+@property(nonatomic, assign) double rmseThreadhold;
 
 // Initialize with a `GoldenTestManager`.
 - (instancetype)initWithManager:(GoldenTestManager*)manager invocation:(NSInvocation*)invocation;
@@ -29,3 +33,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif  // FLUTTER_TESTING_SCENARIO_APP_IOS_SCENARIOS_SCENARIOSUITESTS_GOLDENPLATFORMVIEWTESTS_H_
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/GoldenPlatformViewTests.m b/testing/scenario_app/ios/Scenarios/ScenariosUITests/GoldenPlatformViewTests.m
index 7e4bb368fc6ebeb29b39109dd1256c98f9fab8cd..7199fa2600e863110110e3baf943563235311b81 100644
--- a/testing/scenario_app/ios/Scenarios/ScenariosUITests/GoldenPlatformViewTests.m
+++ b/testing/scenario_app/ios/Scenarios/ScenariosUITests/GoldenPlatformViewTests.m
@@ -22,6 +22,7 @@ static const NSInteger kSecondsToWaitForPlatformView = 30;
 - (instancetype)initWithManager:(GoldenTestManager*)manager invocation:(NSInvocation*)invocation {
   self = [super initWithInvocation:invocation];
   _manager = manager;
+  _rmseThreadhold = kDefaultRmseThreshold;
   return self;
 }
 
@@ -45,6 +46,6 @@ static const NSInteger kSecondsToWaitForPlatformView = 30;
             @(kSecondsToWaitForPlatformView));
   }
 
-  [self.manager checkGoldenForTest:self];
+  [self.manager checkGoldenForTest:self rmesThreshold:self.rmseThreadhold];
 }
 @end
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/GoldenTestManager.h b/testing/scenario_app/ios/Scenarios/ScenariosUITests/GoldenTestManager.h
index 4bb0b275a77e97fd8007ce2c3b3344b03f044694..04a74705c52e176ef6a6f27ec63877340a692187 100644
--- a/testing/scenario_app/ios/Scenarios/ScenariosUITests/GoldenTestManager.h
+++ b/testing/scenario_app/ios/Scenarios/ScenariosUITests/GoldenTestManager.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_TESTING_SCENARIO_APP_IOS_SCENARIOS_SCENARIOSUITESTS_GOLDENTESTMANAGER_H_
+#define FLUTTER_TESTING_SCENARIO_APP_IOS_SCENARIOS_SCENARIOSUITESTS_GOLDENTESTMANAGER_H_
+
 #import <Foundation/Foundation.h>
 #import <XCTest/XCTest.h>
 #import "GoldenImage.h"
@@ -9,6 +12,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 extern NSDictionary* launchArgsMap;
+const extern double kDefaultRmseThreshold;
 
 // Manages a `GoldenPlatformViewTests`.
 //
@@ -27,8 +31,10 @@ extern NSDictionary* launchArgsMap;
 
 // Take a sceenshot of the test app and check it has the same pixels with
 // goldenImage inside the `GoldenTestManager`.
-- (void)checkGoldenForTest:(XCTestCase*)test;
+- (void)checkGoldenForTest:(XCTestCase*)test rmesThreshold:(double)rmesThreshold;
 
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif  // FLUTTER_TESTING_SCENARIO_APP_IOS_SCENARIOS_SCENARIOSUITESTS_GOLDENTESTMANAGER_H_
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/GoldenTestManager.m b/testing/scenario_app/ios/Scenarios/ScenariosUITests/GoldenTestManager.m
index 26838a3a474979669bc974054c41570267107c2a..ac55da74642bbf87ae9158eaa6cc651c32773ec9 100644
--- a/testing/scenario_app/ios/Scenarios/ScenariosUITests/GoldenTestManager.m
+++ b/testing/scenario_app/ios/Scenarios/ScenariosUITests/GoldenTestManager.m
@@ -14,6 +14,7 @@
 @implementation GoldenTestManager
 
 NSDictionary* launchArgsMap;
+const double kDefaultRmseThreshold = 0.5;
 
 - (instancetype)initWithLaunchArg:(NSString*)launchArg {
   self = [super init];
@@ -41,26 +42,45 @@ NSDictionary* launchArgsMap;
         @"--platform-view-with-other-backdrop-filter" : @"platform_view_with_other_backdrop_filter",
         @"--two-platform-views-with-other-backdrop-filter" :
             @"two_platform_views_with_other_backdrop_filter",
+        @"--platform-view-with-negative-backdrop-filter" :
+            @"platform_view_with_negative_backdrop_filter",
         @"--platform-view-rotate" : @"platform_view_rotate",
         @"--non-full-screen-flutter-view-platform-view" :
             @"non_full_screen_flutter_view_platform_view",
         @"--bogus-font-text" : @"bogus_font_text",
         @"--spawn-engine-works" : @"spawn_engine_works",
+        @"--platform-view-cliprect-after-moved" : @"platform_view_cliprect_after_moved",
+        @"--two-platform-view-clip-rect" : @"two_platform_view_clip_rect",
+        @"--two-platform-view-clip-rrect" : @"two_platform_view_clip_rrect",
+        @"--two-platform-view-clip-path" : @"two_platform_view_clip_path",
+        @"--app-extension" : @"app_extension",
+        @"--darwin-system-font" : @"darwin_system_font",
       };
     });
     _identifier = launchArgsMap[launchArg];
-    NSString* prefix = [NSString stringWithFormat:@"golden_%@_", _identifier];
+
+    NSString* impeller = @"";
+    NSNumber* enableImpeller = [[NSBundle bundleWithIdentifier:@"dev.flutter.ScenariosUITests"]
+        objectForInfoDictionaryKey:@"FLTEnableImpeller"];
+    if (enableImpeller != nil) {
+      impeller = enableImpeller.boolValue ? @"impeller_" : @"";
+    } else {
+      NSLog(@"FLTEnableImpeller was nil");
+    }
+    NSLog(@"impeller = '%@'", impeller);
+
+    NSString* prefix = [NSString stringWithFormat:@"golden_%@_%@", _identifier, impeller];
     _goldenImage = [[GoldenImage alloc] initWithGoldenNamePrefix:prefix];
     _launchArg = launchArg;
   }
   return self;
 }
 
-- (void)checkGoldenForTest:(XCTestCase*)test {
+- (void)checkGoldenForTest:(XCTestCase*)test rmesThreshold:(double)rmesThreshold {
   XCUIScreenshot* screenshot = [[XCUIScreen mainScreen] screenshot];
   if (!_goldenImage.image) {
     XCTAttachment* attachment = [XCTAttachment attachmentWithScreenshot:screenshot];
-    attachment.name = [_goldenImage.goldenName stringByAppendingString:@"_new"];
+    attachment.name = [_goldenImage.goldenName stringByAppendingString:@"_new.png"];
     attachment.lifetime = XCTAttachmentLifetimeKeepAlways;
     [test addAttachment:attachment];
     // Instead of XCTFail because that definition changed between Xcode 11 and 12 whereas this impl
@@ -71,9 +91,9 @@ NSDictionary* launchArgsMap;
                       _goldenImage.goldenName);
   }
 
-  if (![_goldenImage compareGoldenToImage:screenshot.image]) {
+  if (![_goldenImage compareGoldenToImage:screenshot.image rmesThreshold:rmesThreshold]) {
     XCTAttachment* screenshotAttachment = [XCTAttachment attachmentWithImage:screenshot.image];
-    screenshotAttachment.name = [_goldenImage.goldenName stringByAppendingString:@"_actual"];
+    screenshotAttachment.name = [_goldenImage.goldenName stringByAppendingString:@"_actual.png"];
     screenshotAttachment.lifetime = XCTAttachmentLifetimeKeepAlways;
     [test addAttachment:screenshotAttachment];
 
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/LocalizationInitializationTest.m b/testing/scenario_app/ios/Scenarios/ScenariosUITests/LocalizationInitializationTest.m
index 9b0f699eebe72a624756e6633a90785eb1532065..a0196b9b3b038abd3f6d4b6e3f3a75d4543c8d99 100644
--- a/testing/scenario_app/ios/Scenarios/ScenariosUITests/LocalizationInitializationTest.m
+++ b/testing/scenario_app/ios/Scenarios/ScenariosUITests/LocalizationInitializationTest.m
@@ -26,10 +26,17 @@ FLUTTER_ASSERT_ARC
   NSTimeInterval timeout = 10.0;
 
   // The locales received by dart:ui are exposed onBeginFrame via semantics label.
-  // There should only be one locale, since the default iOS app only has en_US as
-  // the locale. The list should consist of just the en locale.
+  // There should only be one locale. The list should consist of the default
+  // locale provided by the iOS app.
+  NSArray<NSString*>* preferredLocales = [NSLocale preferredLanguages];
+  XCTAssertEqual(preferredLocales.count, 1);
+  // Dart connects the locale parts with `_` while iOS connects them with `-`.
+  // Converts to dart format before comparing.
+  NSString* localeDart = [preferredLocales.firstObject stringByReplacingOccurrencesOfString:@"-"
+                                                                                 withString:@"_"];
+  NSString* expectedIdentifier = [NSString stringWithFormat:@"[%@]", localeDart];
   XCUIElement* textInputSemanticsObject =
-      [self.application.textFields matchingIdentifier:@"[en]"].element;
+      [self.application.textFields matchingIdentifier:expectedIdentifier].element;
   XCTAssertTrue([textInputSemanticsObject waitForExistenceWithTimeout:timeout]);
 
   [textInputSemanticsObject tap];
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/PlatformViewGestureRecognizerTests.m b/testing/scenario_app/ios/Scenarios/ScenariosUITests/PlatformViewGestureRecognizerTests.m
index 0479b071de933e625abb4aae1a7e650a92f36822..5bd831f0948b5e94f2241c39ca5d2d9b3578938d 100644
--- a/testing/scenario_app/ios/Scenarios/ScenariosUITests/PlatformViewGestureRecognizerTests.m
+++ b/testing/scenario_app/ios/Scenarios/ScenariosUITests/PlatformViewGestureRecognizerTests.m
@@ -18,8 +18,7 @@ static const NSInteger kSecondsToWaitForPlatformView = 30;
 
 - (void)testRejectPolicyUtilTouchesEnded {
   XCUIApplication* app = [[XCUIApplication alloc] init];
-  app.launchArguments =
-      @[ @"--gesture-reject-after-touches-ended", @"--enable-software-rendering" ];
+  app.launchArguments = @[ @"--gesture-reject-after-touches-ended" ];
   [app launch];
 
   NSPredicate* predicateToFindPlatformView =
@@ -165,4 +164,32 @@ static const NSInteger kSecondsToWaitForPlatformView = 30;
   return coordinate;
 }
 
+- (void)testGestureWithOverlappingPlatformViews {
+  XCUIApplication* app = [[XCUIApplication alloc] init];
+  app.launchArguments = @[ @"--gesture-accept-with-overlapping-platform-views" ];
+  [app launch];
+
+  XCUIElement* foreground = app.otherElements[@"platform_view[0]"];
+  XCTAssertEqual(foreground.frame.origin.x, 50);
+  XCTAssertEqual(foreground.frame.origin.y, 50);
+  XCTAssertEqual(foreground.frame.size.width, 50);
+  XCTAssertEqual(foreground.frame.size.height, 50);
+  XCTAssertTrue([foreground waitForExistenceWithTimeout:kSecondsToWaitForPlatformView]);
+
+  XCUIElement* background = app.otherElements[@"platform_view[1]"];
+  XCTAssertEqual(background.frame.origin.x, 0);
+  XCTAssertEqual(background.frame.origin.y, 0);
+  XCTAssertEqual(background.frame.size.width, 150);
+  XCTAssertEqual(background.frame.size.height, 150);
+  XCTAssertTrue([background waitForExistenceWithTimeout:kSecondsToWaitForPlatformView]);
+
+  XCUIElement* textView = foreground.textViews.firstMatch;
+  XCTAssertTrue(textView.exists);
+
+  XCTAssertTrue(foreground.isHittable);
+  [foreground tap];
+
+  XCTAssertEqualObjects(textView.label,
+                        @"-gestureTouchesBegan-gestureTouchesEnded-platformViewTapped");
+}
 @end
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/PlatformViewUITests.m b/testing/scenario_app/ios/Scenarios/ScenariosUITests/PlatformViewUITests.m
index a37122b1a44a6c082b908e2b585461c73bc46efe..7415a51717ddb310f56e43b0a4747e4d0cd970e8 100644
--- a/testing/scenario_app/ios/Scenarios/ScenariosUITests/PlatformViewUITests.m
+++ b/testing/scenario_app/ios/Scenarios/ScenariosUITests/PlatformViewUITests.m
@@ -98,6 +98,36 @@ static const NSInteger kSecondsToWaitForPlatformView = 30;
 
 @end
 
+@interface PlatformViewMutationClipRectAfterMovedTests : GoldenPlatformViewTests
+
+@end
+
+@implementation PlatformViewMutationClipRectAfterMovedTests
+
+- (instancetype)initWithInvocation:(NSInvocation*)invocation {
+  GoldenTestManager* manager =
+      [[GoldenTestManager alloc] initWithLaunchArg:@"--platform-view-cliprect-after-moved"];
+  return [super initWithManager:manager invocation:invocation];
+}
+
+- (void)testPlatformView {
+  // This test needs to wait for several frames for the PlatformView to settle to
+  // the correct position. The PlatformView accessiblity is set to platform_view[10000] when it is
+  // ready.
+  XCUIElement* element = self.application.otherElements[@"platform_view[10000]"];
+  BOOL exists = [element waitForExistenceWithTimeout:kSecondsToWaitForPlatformView];
+  if (!exists) {
+    XCTFail(@"It took longer than %@ second to find the platform view."
+            @"There might be issues with the platform view's construction,"
+            @"or with how the scenario is built.",
+            @(kSecondsToWaitForPlatformView));
+  }
+
+  [self checkPlatformViewGolden];
+}
+
+@end
+
 @interface PlatformViewMutationClipRRectTests : GoldenPlatformViewTests
 
 @end
@@ -224,6 +254,60 @@ static const NSInteger kSecondsToWaitForPlatformView = 30;
 
 @end
 
+@interface TwoPlatformViewClipRectTests : GoldenPlatformViewTests
+
+@end
+
+@implementation TwoPlatformViewClipRectTests
+
+- (instancetype)initWithInvocation:(NSInvocation*)invocation {
+  GoldenTestManager* manager =
+      [[GoldenTestManager alloc] initWithLaunchArg:@"--two-platform-view-clip-rect"];
+  return [super initWithManager:manager invocation:invocation];
+}
+
+- (void)testPlatformView {
+  [self checkPlatformViewGolden];
+}
+
+@end
+
+@interface TwoPlatformViewClipRRectTests : GoldenPlatformViewTests
+
+@end
+
+@implementation TwoPlatformViewClipRRectTests
+
+- (instancetype)initWithInvocation:(NSInvocation*)invocation {
+  GoldenTestManager* manager =
+      [[GoldenTestManager alloc] initWithLaunchArg:@"--two-platform-view-clip-rrect"];
+  return [super initWithManager:manager invocation:invocation];
+}
+
+- (void)testPlatformView {
+  [self checkPlatformViewGolden];
+}
+
+@end
+
+@interface TwoPlatformViewClipPathTests : GoldenPlatformViewTests
+
+@end
+
+@implementation TwoPlatformViewClipPathTests
+
+- (instancetype)initWithInvocation:(NSInvocation*)invocation {
+  GoldenTestManager* manager =
+      [[GoldenTestManager alloc] initWithLaunchArg:@"--two-platform-view-clip-path"];
+  return [super initWithManager:manager invocation:invocation];
+}
+
+- (void)testPlatformView {
+  [self checkPlatformViewGolden];
+}
+
+@end
+
 @interface PlatformViewMutationTransformTests : GoldenPlatformViewTests
 
 @end
@@ -290,6 +374,29 @@ static const NSInteger kSecondsToWaitForPlatformView = 30;
   return [super initWithManager:manager invocation:invocation];
 }
 
+- (void)testPlatformView {
+  // (TODO)cyanglaz: remove the threshold adjustment after all the ci migrates to macOS13.
+  // https://github.com/flutter/flutter/issues/133207
+  if ([NSProcessInfo processInfo].operatingSystemVersion.majorVersion >= 13) {
+    self.rmseThreadhold = 0.7;
+  }
+  [self checkPlatformViewGolden];
+}
+
+@end
+
+@interface PlatformViewWithNegativeOtherBackDropFilterTests : GoldenPlatformViewTests
+
+@end
+
+@implementation PlatformViewWithNegativeOtherBackDropFilterTests
+
+- (instancetype)initWithInvocation:(NSInvocation*)invocation {
+  GoldenTestManager* manager = [[GoldenTestManager alloc]
+      initWithLaunchArg:@"--platform-view-with-negative-backdrop-filter"];
+  return [super initWithManager:manager invocation:invocation];
+}
+
 - (void)testPlatformView {
   [self checkPlatformViewGolden];
 }
@@ -384,3 +491,40 @@ static const NSInteger kSecondsToWaitForPlatformView = 30;
 }
 
 @end
+
+@interface PlatformViewWithClipsScrolling : XCTestCase
+
+@end
+
+@implementation PlatformViewWithClipsScrolling
+
+- (void)setUp {
+  [super setUp];
+  self.continueAfterFailure = NO;
+}
+
+- (void)testPlatformViewsWithClipsScrolling {
+  XCUIApplication* app = [[XCUIApplication alloc] init];
+  app.launchArguments =
+      @[ @"--platform-views-with-clips-scrolling", @"platform_views_with_clips_scrolling" ];
+  [app launch];
+
+  XCUIElement* platformView = app.textViews.firstMatch;
+  BOOL exists = [platformView waitForExistenceWithTimeout:kSecondsToWaitForPlatformView];
+  if (!exists) {
+    XCTFail(@"It took longer than %@ second to find the platform view."
+            @"There might be issues with the platform view's construction,"
+            @"or with how the scenario is built.",
+            @(kSecondsToWaitForPlatformView));
+  }
+
+  // Wait and let the scenario app scroll a bit.
+  XCTWaiterResult waitResult = [XCTWaiter
+      waitForExpectations:@[ [[XCTestExpectation alloc] initWithDescription:@"Wait for 5 seconds"] ]
+                  timeout:5];
+  // If the waiter is not interrupted, we know the app is in a valid state after timeout, thus the
+  // test passes.
+  XCTAssert(waitResult != XCTWaiterResultInterrupted);
+}
+
+@end
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/SpawnEngineTest.m b/testing/scenario_app/ios/Scenarios/ScenariosUITests/SpawnEngineTest.m
index 2e529965e9bd9ed46f136f8b8d9252c95545a9c9..cc5810eeac60889c165c8ff80ba123ef85d33e51 100644
--- a/testing/scenario_app/ios/Scenarios/ScenariosUITests/SpawnEngineTest.m
+++ b/testing/scenario_app/ios/Scenarios/ScenariosUITests/SpawnEngineTest.m
@@ -13,7 +13,7 @@
   self.continueAfterFailure = NO;
 
   XCUIApplication* application = [[XCUIApplication alloc] init];
-  application.launchArguments = @[ @"--spawn-engine-works", @"--enable-software-rendering" ];
+  application.launchArguments = @[ @"--spawn-engine-works" ];
   [application launch];
 
   XCUIElement* addTextField = application.textFields[@"ready"];
@@ -21,7 +21,7 @@
 
   GoldenTestManager* manager =
       [[GoldenTestManager alloc] initWithLaunchArg:@"--spawn-engine-works"];
-  [manager checkGoldenForTest:self];
+  [manager checkGoldenForTest:self rmesThreshold:kDefaultRmseThreshold];
 }
 
 @end
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/StatusBarTest.h b/testing/scenario_app/ios/Scenarios/ScenariosUITests/StatusBarTest.h
index 03ff9a1c662cd958b44e1a6b4198ff1a968e0f0f..1312246dab07fa2a5ce8639bb7f36ba9e0b84dd7 100644
--- a/testing/scenario_app/ios/Scenarios/ScenariosUITests/StatusBarTest.h
+++ b/testing/scenario_app/ios/Scenarios/ScenariosUITests/StatusBarTest.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef FLUTTER_TESTING_SCENARIO_APP_IOS_SCENARIOS_SCENARIOSUITESTS_STATUSBARTEST_H_
+#define FLUTTER_TESTING_SCENARIO_APP_IOS_SCENARIOS_SCENARIOSUITESTS_STATUSBARTEST_H_
+
 #import <XCTest/XCTest.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -11,3 +14,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif  // FLUTTER_TESTING_SCENARIO_APP_IOS_SCENARIOS_SCENARIOSUITESTS_STATUSBARTEST_H_
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/UnobstructedPlatformViewTests.m b/testing/scenario_app/ios/Scenarios/ScenariosUITests/UnobstructedPlatformViewTests.m
index 57d627e2b2145fc8dace5f08c922665f38f393bb..5fc45893706f87750b63dd8bc98f83363d172ffd 100644
--- a/testing/scenario_app/ios/Scenarios/ScenariosUITests/UnobstructedPlatformViewTests.m
+++ b/testing/scenario_app/ios/Scenarios/ScenariosUITests/UnobstructedPlatformViewTests.m
@@ -23,8 +23,7 @@ static const CGFloat kCompareAccuracy = 0.001;
 //             +---+
 - (void)testNoOverlay {
   XCUIApplication* app = [[XCUIApplication alloc] init];
-  app.launchArguments =
-      @[ @"--platform-view-no-overlay-intersection", @"--enable-software-rendering" ];
+  app.launchArguments = @[ @"--platform-view-no-overlay-intersection" ];
   [app launch];
 
   XCUIElement* platform_view = app.otherElements[@"platform_view[0]"];
@@ -158,17 +157,14 @@ static const CGFloat kCompareAccuracy = 0.001;
 
   XCUIElement* overlay1 = app.otherElements[@"platform_view[0].overlay[0]"];
   XCTAssertTrue(overlay1.exists);
-  XCTAssertEqual(overlay1.frame.origin.x, 150);
+  XCTAssertEqual(overlay1.frame.origin.x, 75);
   XCTAssertEqual(overlay1.frame.origin.y, 150);
-  XCTAssertEqual(overlay1.frame.size.width, 75);
-  XCTAssertEqual(overlay1.frame.size.height, 75);
+  XCTAssertEqual(overlay1.frame.size.width, 150);
+  XCTAssertEqual(overlay1.frame.size.height, 100);
 
-  XCUIElement* overlay2 = app.otherElements[@"platform_view[0].overlay[1]"];
-  XCTAssertTrue(overlay2.exists);
-  XCTAssertEqual(overlay2.frame.origin.x, 75);
-  XCTAssertEqual(overlay2.frame.origin.y, 225);
-  XCTAssertEqual(overlay2.frame.size.width, 50);
-  XCTAssertEqual(overlay2.frame.size.height, 25);
+  // There are three non overlapping rects above platform view, which
+  // FlutterPlatformViewsController merges into one.
+  XCTAssertFalse(app.otherElements[@"platform_view[0].overlay[1]"].exists);
 
   XCUIElement* overlayView0 = app.otherElements[@"platform_view[0].overlay_view[0]"];
   XCTAssertTrue(overlayView0.exists);
@@ -178,15 +174,6 @@ static const CGFloat kCompareAccuracy = 0.001;
   XCTAssertEqualWithAccuracy(overlayView0.frame.size.width, app.frame.size.width, kCompareAccuracy);
   XCTAssertEqualWithAccuracy(overlayView0.frame.size.height, app.frame.size.height,
                              kCompareAccuracy);
-
-  XCUIElement* overlayView1 = app.otherElements[@"platform_view[0].overlay_view[1]"];
-  XCTAssertTrue(overlayView1.exists);
-  // Overlay should always be the same frame as the app.
-  XCTAssertEqualWithAccuracy(overlayView1.frame.origin.x, app.frame.origin.x, kCompareAccuracy);
-  XCTAssertEqualWithAccuracy(overlayView1.frame.origin.y, app.frame.origin.x, kCompareAccuracy);
-  XCTAssertEqualWithAccuracy(overlayView1.frame.size.width, app.frame.size.width, kCompareAccuracy);
-  XCTAssertEqualWithAccuracy(overlayView1.frame.size.height, app.frame.size.height,
-                             kCompareAccuracy);
 }
 
 // A is the layer, which z index is higher than the platform view.
@@ -318,4 +305,59 @@ static const CGFloat kCompareAccuracy = 0.001;
   XCTAssertFalse(overlayView1.exists);
 }
 
+// Platform view surrounded by adjacent layers on each side should not create any overlays.
+//      +----+
+//      | B  |
+//  +---+----+---+
+//  | A | PV | C |
+//  +---+----+---+
+//      | D  |
+//      +----+
+- (void)testPlatformViewsWithAdjacentSurroundingLayersAndFractionalCoordinate {
+  XCUIApplication* app = [[XCUIApplication alloc] init];
+  app.launchArguments = @[ @"--platform-view-surrounding-layers-fractional-coordinate" ];
+  [app launch];
+
+  XCUIElement* platform_view = app.otherElements[@"platform_view[0]"];
+  XCTAssertTrue([platform_view waitForExistenceWithTimeout:1.0]);
+
+  CGFloat scale = [UIScreen mainScreen].scale;
+  XCTAssertEqual(platform_view.frame.origin.x * scale, 100.5);
+  XCTAssertEqual(platform_view.frame.origin.y * scale, 100.5);
+  XCTAssertEqual(platform_view.frame.size.width * scale, 100);
+  XCTAssertEqual(platform_view.frame.size.height * scale, 100);
+
+  XCUIElement* overlay = app.otherElements[@"platform_view[0].overlay[0]"];
+  XCTAssertFalse(overlay.exists);
+}
+
+// Platform view partially intersect with a layer in fractional coordinate.
+// +-------+
+// |       |
+// | PV +--+--+
+// |    |     |
+// +----+  A  |
+//      |     |
+//      +-----+
+- (void)testPlatformViewsWithPartialIntersectionAndFractionalCoordinate {
+  XCUIApplication* app = [[XCUIApplication alloc] init];
+  app.launchArguments = @[ @"--platform-view-partial-intersection-fractional-coordinate" ];
+  [app launch];
+
+  XCUIElement* platform_view = app.otherElements[@"platform_view[0]"];
+  XCTAssertTrue([platform_view waitForExistenceWithTimeout:1.0]);
+
+  CGFloat scale = [UIScreen mainScreen].scale;
+  XCTAssertEqual(platform_view.frame.origin.x * scale, 0.5);
+  XCTAssertEqual(platform_view.frame.origin.y * scale, 0.5);
+  XCTAssertEqual(platform_view.frame.size.width * scale, 100);
+  XCTAssertEqual(platform_view.frame.size.height * scale, 100);
+
+  XCUIElement* overlay = app.otherElements[@"platform_view[0].overlay[0]"];
+  XCTAssert(overlay.exists);
+
+  // We want to make sure the overlay covers the edge (which is at 100.5).
+  XCTAssertEqual(CGRectGetMaxX(overlay.frame) * scale, 101);
+  XCTAssertEqual(CGRectGetMaxY(overlay.frame) * scale, 101);
+}
 @end
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_bogus_font_text_iPhone SE (3rd generation)_17.0_simulator.png b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_bogus_font_text_iPhone SE (3rd generation)_17.0_simulator.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5948725a2c09d3337dd1fe6b6dd1ada06abf8c4
Binary files /dev/null and b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_bogus_font_text_iPhone SE (3rd generation)_17.0_simulator.png differ
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_bogus_font_text_impeller_iPhone SE (3rd generation)_17.0_simulator.png b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_bogus_font_text_impeller_iPhone SE (3rd generation)_17.0_simulator.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5948725a2c09d3337dd1fe6b6dd1ada06abf8c4
Binary files /dev/null and b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_bogus_font_text_impeller_iPhone SE (3rd generation)_17.0_simulator.png differ
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_darwin_system_font_iPhone SE (3rd generation)_17.0_simulator.png b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_darwin_system_font_iPhone SE (3rd generation)_17.0_simulator.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ebd2b21b70abb10504e1180e5e68d57f0f86f02
Binary files /dev/null and b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_darwin_system_font_iPhone SE (3rd generation)_17.0_simulator.png differ
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_non_full_screen_flutter_view_platform_view_iPhone SE (3rd generation)_17.0_simulator.png b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_non_full_screen_flutter_view_platform_view_iPhone SE (3rd generation)_17.0_simulator.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a132c9d08a82eda3b45f2121c45a35681a99a1f
Binary files /dev/null and b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_non_full_screen_flutter_view_platform_view_iPhone SE (3rd generation)_17.0_simulator.png differ
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_clippath_iPhone SE (3rd generation)_17.0_simulator.png b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_clippath_iPhone SE (3rd generation)_17.0_simulator.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bebde1df95ce7b0f653576cf2a2718ff6499700
Binary files /dev/null and b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_clippath_iPhone SE (3rd generation)_17.0_simulator.png differ
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_clippath_with_transform_iPhone SE (3rd generation)_17.0_simulator.png b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_clippath_with_transform_iPhone SE (3rd generation)_17.0_simulator.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b6157a9ee92b6021bee282932193533a88018ec
Binary files /dev/null and b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_clippath_with_transform_iPhone SE (3rd generation)_17.0_simulator.png differ
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_cliprect_after_moved_iPhone SE (3rd generation)_17.0_simulator.png b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_cliprect_after_moved_iPhone SE (3rd generation)_17.0_simulator.png
new file mode 100644
index 0000000000000000000000000000000000000000..f550dafa6a86d931308c287c8c80fa3a5983a74f
Binary files /dev/null and b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_cliprect_after_moved_iPhone SE (3rd generation)_17.0_simulator.png differ
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_cliprect_iPhone SE (3rd generation)_17.0_simulator.png b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_cliprect_iPhone SE (3rd generation)_17.0_simulator.png
new file mode 100644
index 0000000000000000000000000000000000000000..b013899772b7321dd2fc10f6081ecf707f6b5a13
Binary files /dev/null and b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_cliprect_iPhone SE (3rd generation)_17.0_simulator.png differ
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_cliprect_with_transform_iPhone SE (3rd generation)_17.0_simulator.png b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_cliprect_with_transform_iPhone SE (3rd generation)_17.0_simulator.png
new file mode 100644
index 0000000000000000000000000000000000000000..9204afaccbd1abfa5166a0d47e4656ba5586441f
Binary files /dev/null and b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_cliprect_with_transform_iPhone SE (3rd generation)_17.0_simulator.png differ
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_cliprrect_iPhone SE (3rd generation)_17.0_simulator.png b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_cliprrect_iPhone SE (3rd generation)_17.0_simulator.png
new file mode 100644
index 0000000000000000000000000000000000000000..864e2e4cc6312224b249f6912872f9fb0c08e063
Binary files /dev/null and b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_cliprrect_iPhone SE (3rd generation)_17.0_simulator.png differ
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_cliprrect_with_transform_iPhone SE (3rd generation)_17.0_simulator.png b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_cliprrect_with_transform_iPhone SE (3rd generation)_17.0_simulator.png
new file mode 100644
index 0000000000000000000000000000000000000000..f099ea658da1087a7ec6263010d3a8d0d905394d
Binary files /dev/null and b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_cliprrect_with_transform_iPhone SE (3rd generation)_17.0_simulator.png differ
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_iPhone SE (3rd generation)_17.0_simulator.png b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_iPhone SE (3rd generation)_17.0_simulator.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7f81259f4e92e6a828a1f1843dc5094fe13239b
Binary files /dev/null and b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_iPhone SE (3rd generation)_17.0_simulator.png differ
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_large_cliprrect_iPhone SE (3rd generation)_17.0_simulator.png b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_large_cliprrect_iPhone SE (3rd generation)_17.0_simulator.png
new file mode 100644
index 0000000000000000000000000000000000000000..e7b071aa7b4e0fe86d7861a8176ff0d2bf9b4657
Binary files /dev/null and b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_large_cliprrect_iPhone SE (3rd generation)_17.0_simulator.png differ
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_large_cliprrect_with_transform_iPhone SE (3rd generation)_17.0_simulator.png b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_large_cliprrect_with_transform_iPhone SE (3rd generation)_17.0_simulator.png
new file mode 100644
index 0000000000000000000000000000000000000000..46af77aaf34a771855d18e253bc57c7f4a664002
Binary files /dev/null and b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_large_cliprrect_with_transform_iPhone SE (3rd generation)_17.0_simulator.png differ
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_multiple_background_foreground_iPhone SE (3rd generation)_17.0_simulator.png b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_multiple_background_foreground_iPhone SE (3rd generation)_17.0_simulator.png
new file mode 100644
index 0000000000000000000000000000000000000000..52e043fdf375cf860563e204cf85ff778a2551b6
Binary files /dev/null and b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_multiple_background_foreground_iPhone SE (3rd generation)_17.0_simulator.png differ
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_multiple_iPhone SE (3rd generation)_17.0_simulator.png b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_multiple_iPhone SE (3rd generation)_17.0_simulator.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0f705d7f7634e22e7906d060c30e91628a6f8e1
Binary files /dev/null and b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_multiple_iPhone SE (3rd generation)_17.0_simulator.png differ
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_opacity_iPhone SE (3rd generation)_17.0_simulator.png b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_opacity_iPhone SE (3rd generation)_17.0_simulator.png
new file mode 100644
index 0000000000000000000000000000000000000000..48289b61e86eff76b58a9cee78ff4d4a5e315505
Binary files /dev/null and b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_opacity_iPhone SE (3rd generation)_17.0_simulator.png differ
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_rotate_iPhone SE (3rd generation)_17.0_simulator.png b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_rotate_iPhone SE (3rd generation)_17.0_simulator.png
new file mode 100644
index 0000000000000000000000000000000000000000..804d43ec8d26d6a46c71719d503ccf21ee211f94
Binary files /dev/null and b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_rotate_iPhone SE (3rd generation)_17.0_simulator.png differ
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_transform_iPhone SE (3rd generation)_17.0_simulator.png b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_transform_iPhone SE (3rd generation)_17.0_simulator.png
new file mode 100644
index 0000000000000000000000000000000000000000..349d57b1151469a42c18af181985283ee2fb8a6b
Binary files /dev/null and b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_transform_iPhone SE (3rd generation)_17.0_simulator.png differ
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_with_negative_backdrop_filter_iPhone SE (3rd generation)_17.0_simulator.png b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_with_negative_backdrop_filter_iPhone SE (3rd generation)_17.0_simulator.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a74b97d05ac2d7330619c2ce777002b3aba11ca
Binary files /dev/null and b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_with_negative_backdrop_filter_iPhone SE (3rd generation)_17.0_simulator.png differ
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_with_other_backdrop_filter_iPhone SE (3rd generation)_17.0_simulator.png b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_with_other_backdrop_filter_iPhone SE (3rd generation)_17.0_simulator.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2453349f333f5d7da1d9901e17bbb959edc24f5
Binary files /dev/null and b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_platform_view_with_other_backdrop_filter_iPhone SE (3rd generation)_17.0_simulator.png differ
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_spawn_engine_works_iPhone SE (3rd generation)_17.0_simulator.png b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_spawn_engine_works_iPhone SE (3rd generation)_17.0_simulator.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5948725a2c09d3337dd1fe6b6dd1ada06abf8c4
Binary files /dev/null and b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_spawn_engine_works_iPhone SE (3rd generation)_17.0_simulator.png differ
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_spawn_engine_works_impeller_iPhone SE (3rd generation)_17.0_simulator.png b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_spawn_engine_works_impeller_iPhone SE (3rd generation)_17.0_simulator.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5948725a2c09d3337dd1fe6b6dd1ada06abf8c4
Binary files /dev/null and b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_spawn_engine_works_impeller_iPhone SE (3rd generation)_17.0_simulator.png differ
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_two_platform_view_clip_path_iPhone SE (3rd generation)_17.0_simulator.png b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_two_platform_view_clip_path_iPhone SE (3rd generation)_17.0_simulator.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb1d6c12423cb201f28cffbd4ae8a8710d7c0dd1
Binary files /dev/null and b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_two_platform_view_clip_path_iPhone SE (3rd generation)_17.0_simulator.png differ
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_two_platform_view_clip_rect_iPhone SE (3rd generation)_17.0_simulator.png b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_two_platform_view_clip_rect_iPhone SE (3rd generation)_17.0_simulator.png
new file mode 100644
index 0000000000000000000000000000000000000000..fca605741bb173d09311ca8a8836d34b69618322
Binary files /dev/null and b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_two_platform_view_clip_rect_iPhone SE (3rd generation)_17.0_simulator.png differ
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_two_platform_view_clip_rrect_iPhone SE (3rd generation)_17.0_simulator.png b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_two_platform_view_clip_rrect_iPhone SE (3rd generation)_17.0_simulator.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d8f3cc70cb97e91a9a43843ca903910bb59505e
Binary files /dev/null and b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_two_platform_view_clip_rrect_iPhone SE (3rd generation)_17.0_simulator.png differ
diff --git a/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_two_platform_views_with_other_backdrop_filter_iPhone SE (3rd generation)_17.0_simulator.png b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_two_platform_views_with_other_backdrop_filter_iPhone SE (3rd generation)_17.0_simulator.png
new file mode 100644
index 0000000000000000000000000000000000000000..4666602e183791bc16d48bb38b0d6502544e0684
Binary files /dev/null and b/testing/scenario_app/ios/Scenarios/ScenariosUITests/golden_two_platform_views_with_other_backdrop_filter_iPhone SE (3rd generation)_17.0_simulator.png differ
diff --git a/testing/scenario_app/lib/main.dart b/testing/scenario_app/lib/main.dart
index a7a457be6524cc00f6792b4f1a5d6411d51f83aa..5e76f1d7306bfb88fd9e2ea5c65bdc2504fdb51e 100644
--- a/testing/scenario_app/lib/main.dart
+++ b/testing/scenario_app/lib/main.dart
@@ -12,51 +12,51 @@ import 'dart:ui';
 import 'src/scenarios.dart';
 
 void main() {
-  assert(window.locale != null);
-  window
-    ..onPlatformMessage = _handlePlatformMessage
+  // TODO(goderbauer): Create a window if embedder doesn't provide an implicit
+  //   view to draw into once we have a windowing API and set the window's
+  //   FlutterView to the _view property.
+  assert(PlatformDispatcher.instance.implicitView != null);
+  PlatformDispatcher.instance
     ..onBeginFrame = _onBeginFrame
     ..onDrawFrame = _onDrawFrame
     ..onMetricsChanged = _onMetricsChanged
     ..onPointerDataPacket = _onPointerDataPacket
     ..scheduleFrame();
+  channelBuffers.setListener('driver', _handleDriverMessage);
+  channelBuffers.setListener('write_timeline', _handleWriteTimelineMessage);
+
+  final FlutterView view = PlatformDispatcher.instance.implicitView!;
+  // Asserting that this is greater than zero since this app runs on different
+  // platforms with different sizes. If it is greater than zero, it has been
+  // initialized to some meaningful value at least.
+  assert(
+    view.display.size > Offset.zero,
+    'Expected ${view.display} to be initialized.',
+  );
 
   final ByteData data = ByteData(1);
   data.setUint8(0, 1);
-  window.sendPlatformMessage('waiting_for_status', data, null);
+  PlatformDispatcher.instance.sendPlatformMessage('waiting_for_status', data, null);
 }
 
-void _handleDriverMessage(Map<String, dynamic> call) {
+/// The FlutterView into which the [Scenario]s will be rendered.
+FlutterView get _view => PlatformDispatcher.instance.implicitView!;
+
+void _handleDriverMessage(ByteData? data, PlatformMessageResponseCallback? callback) {
+  final Map<String, dynamic> call = json.decode(utf8.decode(data!.buffer.asUint8List())) as Map<String, dynamic>;
   final String? methodName = call['method'] as String?;
   switch (methodName) {
     case 'set_scenario':
       assert(call['args'] != null);
-      loadScenario(call['args'] as Map<String, dynamic>);
-    break;
+      loadScenario(call['args'] as Map<String, dynamic>, _view);
     default:
       throw 'Unimplemented method: $methodName.';
   }
 }
 
-Future<void> _handlePlatformMessage(
-    String name, ByteData? data, PlatformMessageResponseCallback? callback) async {
-  if (data != null) {
-    print('$name = ${utf8.decode(data.buffer.asUint8List())}');
-  } else {
-    print(name);
-  }
-
-  switch (name) {
-    case 'driver':
-      _handleDriverMessage(json.decode(utf8.decode(data!.buffer.asUint8List())) as Map<String, dynamic>);
-    break;
-    case 'write_timeline':
-      final String timelineData = await _getTimelineData();
-      callback!(Uint8List.fromList(utf8.encode(timelineData)).buffer.asByteData());
-    break;
-    default:
-      currentScenario?.onPlatformMessage(name, data, callback);
-  }
+Future<void> _handleWriteTimelineMessage(ByteData? data, PlatformMessageResponseCallback? callback) async {
+  final String timelineData = await _getTimelineData();
+  callback!(ByteData.sublistView(utf8.encode(timelineData)));
 }
 
 Future<String> _getTimelineData() async {
@@ -87,7 +87,7 @@ void _onBeginFrame(Duration duration) {
   if (currentScenario == null) {
     final SceneBuilder builder = SceneBuilder();
     final Scene scene = builder.build();
-    window.render(scene);
+    _view.render(scene);
     scene.dispose();
     return;
   }
diff --git a/testing/scenario_app/lib/src/animated_color_square.dart b/testing/scenario_app/lib/src/animated_color_square.dart
index d1459038fd6356c4960f069d14f691cd0f3b18a7..90096168c1f424e03e17e9da1cff10e2bd608614 100644
--- a/testing/scenario_app/lib/src/animated_color_square.dart
+++ b/testing/scenario_app/lib/src/animated_color_square.dart
@@ -14,22 +14,18 @@ import 'scenario.dart';
 /// that are constantly changing.
 class AnimatedColorSquareScenario extends Scenario {
   /// Creates the AnimatedColorSquare scenario.
-  ///
-  /// The [dispatcher] parameter must not be null.
-  AnimatedColorSquareScenario(PlatformDispatcher dispatcher)
-      : assert(dispatcher != null),
-        super(dispatcher);
+  AnimatedColorSquareScenario(super.view);
 
   static const double _squareSize = 200;
   /// Used to animate the red value in the color of the square.
   final _NumberSwinger<int> _r = _NumberSwinger<int>(0, 255);
-  _NumberSwinger<double> _top = _NumberSwinger<double>(
+  late _NumberSwinger<double> _top = _NumberSwinger<double>(
     0,
-    window.physicalSize.height - _squareSize,
+    view.physicalSize.height - _squareSize,
   );
-  _NumberSwinger<double> _left = _NumberSwinger<double>(
+  late _NumberSwinger<double> _left = _NumberSwinger<double>(
     0,
-    window.physicalSize.width - _squareSize,
+    view.physicalSize.width - _squareSize,
   );
 
   @override
@@ -51,35 +47,33 @@ class AnimatedColorSquareScenario extends Scenario {
       willChangeHint: true,
     );
     final Scene scene = builder.build();
-    window.render(scene);
+    view.render(scene);
     scene.dispose();
   }
 
   @override
   void onDrawFrame() {
-    window.scheduleFrame();
+    view.platformDispatcher.scheduleFrame();
   }
 
   @override
   void onMetricsChanged() {
     _top = _NumberSwinger<double>(
       0,
-      window.physicalSize.height - _squareSize,
-      math.min(_top.current, window.physicalSize.height - _squareSize),
+      view.physicalSize.height - _squareSize,
+      math.min(_top.current, view.physicalSize.height - _squareSize),
     );
     _left = _NumberSwinger<double>(
       0,
-      window.physicalSize.width - _squareSize,
-      math.min(_left.current, window.physicalSize.width - _squareSize),
+      view.physicalSize.width - _squareSize,
+      math.min(_left.current, view.physicalSize.width - _squareSize),
     );
   }
 }
 
 class _NumberSwinger<T extends num> {
   _NumberSwinger(this._begin, this._end, [T? current])
-      : assert(_begin != null),
-        assert(_end != null),
-        _up = _begin < _end {
+      : _up = _begin < _end {
     _current = current ?? _begin;
   }
 
diff --git a/testing/scenario_app/lib/src/bogus_font_text.dart b/testing/scenario_app/lib/src/bogus_font_text.dart
index 1f5745c4fb49cd97ecacef79de90801a71d53850..57061c0f8cdd2fd02297a113cb91780d860dc58f 100644
--- a/testing/scenario_app/lib/src/bogus_font_text.dart
+++ b/testing/scenario_app/lib/src/bogus_font_text.dart
@@ -11,11 +11,7 @@ import 'scenario.dart';
 /// system default font.
 class BogusFontText extends Scenario {
   /// Creates the BogusFontText scenario.
-  ///
-  /// The [dispatcher] parameter must not be null.
-  BogusFontText(PlatformDispatcher dispatcher)
-      : assert(dispatcher != null),
-        super(dispatcher);
+  BogusFontText(super.view);
 
   // Semi-arbitrary.
   final double _screenWidth = 700;
@@ -44,11 +40,11 @@ class BogusFontText extends Scenario {
       willChangeHint: true,
     );
     final Scene scene = builder.build();
-    window.render(scene);
+    view.render(scene);
     scene.dispose();
 
     sendJsonMessage(
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       channel: 'display_data',
       json: <String, dynamic>{
         'data': 'ready',
diff --git a/testing/scenario_app/lib/src/channel_util.dart b/testing/scenario_app/lib/src/channel_util.dart
index bc906f3129b7318a8e6499818f41fa8e34cef0cc..ee2cfda304e137601e17c8f9961db2984a62f0b2 100644
--- a/testing/scenario_app/lib/src/channel_util.dart
+++ b/testing/scenario_app/lib/src/channel_util.dart
@@ -35,7 +35,7 @@ void sendJsonMessage({
     channel,
     // This recreates a combination of OptionalMethodChannel, JSONMethodCodec,
     // and _DefaultBinaryMessenger in the framework.
-    utf8.encoder.convert(
+    utf8.encode(
       const JsonCodec().encode(json)
     ).buffer.asByteData(),
     callback,
diff --git a/testing/scenario_app/lib/src/darwin_app_extension_scenario.dart b/testing/scenario_app/lib/src/darwin_app_extension_scenario.dart
new file mode 100644
index 0000000000000000000000000000000000000000..354810a5d8d237404143ef9014cdb1785a037d37
--- /dev/null
+++ b/testing/scenario_app/lib/src/darwin_app_extension_scenario.dart
@@ -0,0 +1,44 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:ui';
+
+import 'scenario.dart';
+
+/// Shows a text that is shown in app extension.
+class DarwinAppExtensionScenario extends Scenario {
+  /// Creates the DarwinAppExtensionScenario scenario.
+  DarwinAppExtensionScenario(super.view);
+
+  // Semi-arbitrary.
+  final double _screenWidth = 700;
+
+  @override
+  void onBeginFrame(Duration duration) {
+    final SceneBuilder builder = SceneBuilder();
+    final PictureRecorder recorder = PictureRecorder();
+    final Canvas canvas = Canvas(recorder);
+
+    final ParagraphBuilder paragraphBuilder =
+        ParagraphBuilder(ParagraphStyle())
+          ..pushStyle(TextStyle(fontSize: 80))
+          ..addText('flutter Scenarios app extension.')
+          ..pop();
+    final Paragraph paragraph = paragraphBuilder.build();
+
+    paragraph.layout(ParagraphConstraints(width: _screenWidth));
+
+    canvas.drawParagraph(paragraph, const Offset(50, 80));
+    final Picture picture = recorder.endRecording();
+
+    builder.addPicture(
+      Offset.zero,
+      picture,
+      willChangeHint: true,
+    );
+    final Scene scene = builder.build();
+    view.render(scene);
+    scene.dispose();
+  }
+}
diff --git a/testing/scenario_app/lib/src/darwin_system_font.dart b/testing/scenario_app/lib/src/darwin_system_font.dart
new file mode 100644
index 0000000000000000000000000000000000000000..92bc1357625b71792d78f8355dedd3c89c768171
--- /dev/null
+++ b/testing/scenario_app/lib/src/darwin_system_font.dart
@@ -0,0 +1,62 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:ui';
+
+import 'channel_util.dart';
+import 'scenario.dart';
+
+/// Tries to draw darwin system font: CupertinoSystemDisplay, CupertinoSystemText
+class DarwinSystemFont extends Scenario {
+  /// Creates the DarwinSystemFont scenario.
+  DarwinSystemFont(super.view);
+
+  // Semi-arbitrary.
+  final double _screenWidth = 700;
+
+  @override
+  void onBeginFrame(Duration duration) {
+    final SceneBuilder builder = SceneBuilder();
+    final PictureRecorder recorder = PictureRecorder();
+    final Canvas canvas = Canvas(recorder);
+
+    final ParagraphBuilder paragraphBuilderDisplay =
+        ParagraphBuilder(ParagraphStyle(fontFamily: 'CupertinoSystemDisplay'))
+          ..pushStyle(TextStyle(fontSize: 50))
+          ..addText('Cupertino System Display\n')
+          ..pop();
+    final ParagraphBuilder paragraphBuilderText =
+        ParagraphBuilder(ParagraphStyle(fontFamily: 'CupertinoSystemText'))
+          ..pushStyle(TextStyle(fontSize: 50))
+          ..addText('Cupertino System Text\n')
+          ..pop();
+
+    final Paragraph paragraphPro = paragraphBuilderDisplay.build();
+    paragraphPro.layout(ParagraphConstraints(width: _screenWidth));
+    canvas.drawParagraph(paragraphPro, const Offset(50, 80));
+
+    final Paragraph paragraphText = paragraphBuilderText.build();
+    paragraphText.layout(ParagraphConstraints(width: _screenWidth));
+    canvas.drawParagraph(paragraphText, const Offset(50, 200));
+
+    final Picture picture = recorder.endRecording();
+
+    builder.addPicture(
+      Offset.zero,
+      picture,
+      willChangeHint: true,
+    );
+    final Scene scene = builder.build();
+    view.render(scene);
+    scene.dispose();
+
+    sendJsonMessage(
+      dispatcher: view.platformDispatcher,
+      channel: 'display_data',
+      json: <String, dynamic>{
+        'data': 'ready',
+      },
+    );
+  }
+}
diff --git a/testing/scenario_app/lib/src/get_bitmap_scenario.dart b/testing/scenario_app/lib/src/get_bitmap_scenario.dart
index 01fb99c5e9b9e61eca6f77af1d87bde9631ac90f..73c7ed03c62ec5ffd4fd86193980f202f7fe6d97 100644
--- a/testing/scenario_app/lib/src/get_bitmap_scenario.dart
+++ b/testing/scenario_app/lib/src/get_bitmap_scenario.dart
@@ -9,26 +9,23 @@ import 'scenario.dart';
 /// A scenario with red on top and blue on the bottom.
 class GetBitmapScenario extends Scenario {
   /// Creates the GetBitmap scenario.
-  ///
-  /// The [dispatcher] parameter must not be null.
-  GetBitmapScenario(PlatformDispatcher dispatcher)
-      : super(dispatcher);
+  GetBitmapScenario(super.view);
 
   @override
   void onBeginFrame(Duration duration) {
     final PictureRecorder recorder = PictureRecorder();
     final Canvas canvas = Canvas(recorder);
-    canvas.drawRect(Rect.fromLTWH(0, 0, window.physicalSize.width, 300),
+    canvas.drawRect(Rect.fromLTWH(0, 0, view.physicalSize.width, 300),
         Paint()..color = const Color(0xFFFF0000));
     canvas.drawRect(
-        Rect.fromLTWH(0, window.physicalSize.height - 300,
-            window.physicalSize.width, 300),
+        Rect.fromLTWH(0, view.physicalSize.height - 300,
+            view.physicalSize.width, 300),
         Paint()..color = const Color(0xFF0000FF));
     final Picture picture = recorder.endRecording();
     final SceneBuilder builder = SceneBuilder();
     builder.addPicture(Offset.zero, picture);
     final Scene scene = builder.build();
-    window.render(scene);
+    view.render(scene);
     picture.dispose();
     scene.dispose();
   }
diff --git a/testing/scenario_app/lib/src/initial_route_reply.dart b/testing/scenario_app/lib/src/initial_route_reply.dart
index 7395a7f93c8a40f84e3dc4653d9fb95c5a886909..cd4da1cd8e6eaab985ca26f94d02c9e3ba17490b 100644
--- a/testing/scenario_app/lib/src/initial_route_reply.dart
+++ b/testing/scenario_app/lib/src/initial_route_reply.dart
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:ui';
-
 import 'channel_util.dart';
 import 'scenario.dart';
 
@@ -11,18 +9,14 @@ import 'scenario.dart';
 /// route is.
 class InitialRouteReply extends Scenario {
   /// Creates the InitialRouteReply.
-  ///
-  /// The [window] parameter must not be null.
-  InitialRouteReply(PlatformDispatcher dispatcher)
-      : assert(dispatcher != null),
-        super(dispatcher);
+  InitialRouteReply(super.view);
 
   @override
   void onBeginFrame(Duration duration) {
     sendJsonMethodCall(
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       channel: 'initial_route_test_channel',
-      method: window.defaultRouteName,
+      method: view.platformDispatcher.defaultRouteName,
     );
   }
 }
diff --git a/testing/scenario_app/lib/src/locale_initialization.dart b/testing/scenario_app/lib/src/locale_initialization.dart
index 2cdfc43f2473790672d1f9f72b9203dcd8848add..74eceaa53a526cefdfe7243f94ec481af6c727fc 100644
--- a/testing/scenario_app/lib/src/locale_initialization.dart
+++ b/testing/scenario_app/lib/src/locale_initialization.dart
@@ -12,9 +12,7 @@ import 'scenario.dart';
 /// Sends the received locale data back as semantics information.
 class LocaleInitialization extends Scenario {
   /// Constructor
-  LocaleInitialization(PlatformDispatcher dispatcher)
-      : assert(dispatcher != null),
-        super(dispatcher);
+  LocaleInitialization(super.view);
 
   int _tapCount = 0;
 
@@ -27,7 +25,7 @@ class LocaleInitialization extends Scenario {
     final Canvas canvas = Canvas(recorder);
 
     canvas.drawRect(
-      Rect.fromLTWH(0, 0, window.physicalSize.width, window.physicalSize.height),
+      Rect.fromLTWH(0, 0, view.physicalSize.width, view.physicalSize.height),
       Paint()..color = const Color.fromARGB(255, 255, 255, 255),
     );
     final Picture picture = recorder.endRecording();
@@ -37,7 +35,7 @@ class LocaleInitialization extends Scenario {
       picture,
     );
     final Scene scene = builder.build();
-    window.render(scene);
+    view.render(scene);
     scene.dispose();
 
     // On the first frame, pretend that it drew a text field. Send the
@@ -51,7 +49,8 @@ class LocaleInitialization extends Scenario {
         // SemanticsAction.tap.
         actions: 1,
         rect: const Rect.fromLTRB(0.0, 0.0, 414.0, 48.0),
-        label: window.locales.toString(),
+        identifier: '',
+        label: view.platformDispatcher.locales.toString(),
         labelAttributes: <StringAttribute>[],
         textDirection: TextDirection.ltr,
         textSelectionBase: -1,
@@ -83,7 +82,7 @@ class LocaleInitialization extends Scenario {
 
     final SemanticsUpdate semanticsUpdate = semanticsUpdateBuilder.build();
 
-    dispatcher.views.first.updateSemantics(semanticsUpdate);
+    view.updateSemantics(semanticsUpdate);
   }
 
   /// Handle taps.
@@ -109,6 +108,7 @@ class LocaleInitialization extends Scenario {
         // SemanticsAction.tap.
         actions: 1,
         rect: const Rect.fromLTRB(0.0, 0.0, 414.0, 48.0),
+        identifier: '',
         label: label,
         labelAttributes: <StringAttribute>[],
         textDirection: TextDirection.ltr,
@@ -141,7 +141,7 @@ class LocaleInitialization extends Scenario {
 
     final SemanticsUpdate semanticsUpdate = semanticsUpdateBuilder.build();
 
-    dispatcher.views.first.updateSemantics(semanticsUpdate);
+    view.updateSemantics(semanticsUpdate);
 
     _tapCount++;
   }
diff --git a/testing/scenario_app/lib/src/platform_view.dart b/testing/scenario_app/lib/src/platform_view.dart
index 918d59f9fec1191883375ccca4235ef68cdc9285..dabf0893e2cede435d9a2d7367f9fe8c78112c4a 100644
--- a/testing/scenario_app/lib/src/platform_view.dart
+++ b/testing/scenario_app/lib/src/platform_view.dart
@@ -39,13 +39,10 @@ List<int> _encodeString(String value) {
 class PlatformViewScenario extends Scenario
     with _BasePlatformViewScenarioMixin {
   /// Creates the PlatformView scenario.
-  ///
-  /// The [dispatcher] parameter must not be null.
   PlatformViewScenario(
-    PlatformDispatcher dispatcher, {
+    super.view, {
     required this.id,
-  })  : assert(dispatcher != null),
-        super(dispatcher);
+  });
 
   /// The platform view identifier.
   final int id;
@@ -55,7 +52,7 @@ class PlatformViewScenario extends Scenario
     final SceneBuilder builder = SceneBuilder();
     addPlatformView(
       id,
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       sceneBuilder: builder,
     );
     finishBuilder(builder);
@@ -66,13 +63,10 @@ class PlatformViewScenario extends Scenario
 class NonFullScreenFlutterViewPlatformViewScenario extends Scenario
     with _BasePlatformViewScenarioMixin {
   /// Creates the PlatformView scenario.
-  ///
-  /// The [dispatcher] parameter must not be null.
   NonFullScreenFlutterViewPlatformViewScenario(
-    PlatformDispatcher dispatcher, {
+    super.view, {
     required this.id,
-  })  : assert(dispatcher != null),
-        super(dispatcher);
+  });
 
   /// The platform view identifier.
   final int id;
@@ -82,7 +76,7 @@ class NonFullScreenFlutterViewPlatformViewScenario extends Scenario
     final SceneBuilder builder = SceneBuilder();
     addPlatformView(
       id,
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       sceneBuilder: builder,
     );
     finishBuilder(builder);
@@ -93,13 +87,10 @@ class NonFullScreenFlutterViewPlatformViewScenario extends Scenario
 class PlatformViewNoOverlayIntersectionScenario extends Scenario
     with _BasePlatformViewScenarioMixin {
   /// Creates the PlatformView scenario.
-  ///
-  /// The [dispatcher] parameter must not be null.
   PlatformViewNoOverlayIntersectionScenario(
-    PlatformDispatcher dispatcher, {
+    super.view, {
     required this.id,
-  })  : assert(dispatcher != null),
-        super(dispatcher);
+  });
 
   /// The platform view identifier.
   final int id;
@@ -110,7 +101,7 @@ class PlatformViewNoOverlayIntersectionScenario extends Scenario
 
     addPlatformView(
       id,
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       sceneBuilder: builder,
     );
 
@@ -121,20 +112,16 @@ class PlatformViewNoOverlayIntersectionScenario extends Scenario
   }
 }
 
-
 /// A platform view that is larger than the display size.
 /// This is only applicable on Android while using virtual displays.
 /// Related issue: https://github.com/flutter/flutter/issues/28978.
 class PlatformViewLargerThanDisplaySize extends Scenario
     with _BasePlatformViewScenarioMixin {
   /// Creates the PlatformView scenario.
-  ///
-  /// The [dispatcher] parameter must not be null.
   PlatformViewLargerThanDisplaySize(
-    PlatformDispatcher dispatcher, {
+    super.view, {
     required this.id,
-  })  : assert(dispatcher != null),
-        super(dispatcher);
+  });
 
   /// The platform view identifier.
   final int id;
@@ -145,7 +132,7 @@ class PlatformViewLargerThanDisplaySize extends Scenario
 
     addPlatformView(
       id,
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       sceneBuilder: builder,
       width: 15000,
       height: 60000,
@@ -161,13 +148,10 @@ class PlatformViewLargerThanDisplaySize extends Scenario
 class PlatformViewPartialIntersectionScenario extends Scenario
     with _BasePlatformViewScenarioMixin {
   /// Creates the PlatformView scenario.
-  ///
-  /// The [dispatcher] parameter must not be null.
   PlatformViewPartialIntersectionScenario(
-    PlatformDispatcher dispatcher, {
+    super.view, {
     required this.id,
-  })  : assert(dispatcher != null),
-        super(dispatcher);
+  });
 
   /// The platform view identifier .
   final int id;
@@ -178,7 +162,7 @@ class PlatformViewPartialIntersectionScenario extends Scenario
 
     addPlatformView(
       id,
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       sceneBuilder: builder,
     );
 
@@ -193,13 +177,10 @@ class PlatformViewPartialIntersectionScenario extends Scenario
 class PlatformViewTwoIntersectingOverlaysScenario extends Scenario
     with _BasePlatformViewScenarioMixin {
   /// Creates the PlatformView scenario.
-  ///
-  /// The [dispatcher] parameter must not be null.
   PlatformViewTwoIntersectingOverlaysScenario(
-    PlatformDispatcher dispatcher, {
+    super.view, {
     required this.id,
-  })  : assert(dispatcher != null),
-        super(dispatcher);
+  });
 
   /// The platform view identifier.
   final int id;
@@ -210,7 +191,7 @@ class PlatformViewTwoIntersectingOverlaysScenario extends Scenario
 
     addPlatformView(
       id,
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       sceneBuilder: builder,
     );
     final PictureRecorder recorder = PictureRecorder();
@@ -228,7 +209,7 @@ class PlatformViewTwoIntersectingOverlaysScenario extends Scenario
     final Picture picture = recorder.endRecording();
     builder.addPicture(const Offset(300, 300), picture);
     final Scene scene = builder.build();
-    window.render(scene);
+    view.render(scene);
     scene.dispose();
   }
 }
@@ -237,13 +218,10 @@ class PlatformViewTwoIntersectingOverlaysScenario extends Scenario
 class PlatformViewOneOverlayTwoIntersectingOverlaysScenario extends Scenario
     with _BasePlatformViewScenarioMixin {
   /// Creates the PlatformView scenario.
-  ///
-  /// The [dispatcher] parameter must not be null.
   PlatformViewOneOverlayTwoIntersectingOverlaysScenario(
-    PlatformDispatcher dispatcher, {
+    super.view, {
     required this.id,
-  })  : assert(dispatcher != null),
-        super(dispatcher);
+  });
 
   /// The platform view identifier.
   final int id;
@@ -254,7 +232,7 @@ class PlatformViewOneOverlayTwoIntersectingOverlaysScenario extends Scenario
 
     addPlatformView(
       id,
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       sceneBuilder: builder,
     );
 
@@ -278,7 +256,7 @@ class PlatformViewOneOverlayTwoIntersectingOverlaysScenario extends Scenario
     final Picture picture = recorder.endRecording();
     builder.addPicture(const Offset(300, 300), picture);
     final Scene scene = builder.build();
-    window.render(scene);
+    view.render(scene);
     scene.dispose();
   }
 }
@@ -287,14 +265,11 @@ class PlatformViewOneOverlayTwoIntersectingOverlaysScenario extends Scenario
 class MultiPlatformViewWithoutOverlaysScenario extends Scenario
     with _BasePlatformViewScenarioMixin {
   /// Creates the PlatformView scenario.
-  ///
-  /// The [dispatcher] parameter must not be null.
   MultiPlatformViewWithoutOverlaysScenario(
-    PlatformDispatcher dispatcher, {
+    super.view, {
     required this.firstId,
     required this.secondId,
-  })  : assert(dispatcher != null),
-        super(dispatcher);
+  });
 
   /// The platform view identifier to use for the first platform view.
   final int firstId;
@@ -310,7 +285,7 @@ class MultiPlatformViewWithoutOverlaysScenario extends Scenario
 
     addPlatformView(
       firstId,
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       sceneBuilder: builder,
       text: 'platform view 1',
     );
@@ -319,7 +294,7 @@ class MultiPlatformViewWithoutOverlaysScenario extends Scenario
 
     addPlatformView(
       secondId,
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       sceneBuilder: builder,
       text: 'platform view 2',
     );
@@ -335,7 +310,7 @@ class MultiPlatformViewWithoutOverlaysScenario extends Scenario
 
     builder.pop();
     final Scene scene = builder.build();
-    window.render(scene);
+    view.render(scene);
     scene.dispose();
   }
 }
@@ -344,13 +319,10 @@ class MultiPlatformViewWithoutOverlaysScenario extends Scenario
 class PlatformViewMaxOverlaysScenario extends Scenario
     with _BasePlatformViewScenarioMixin {
   /// Creates the PlatformView scenario.
-  ///
-  /// The [dispatcher] parameter must not be null.
   PlatformViewMaxOverlaysScenario(
-    PlatformDispatcher dispatcher, {
+    super.view, {
     required this.id,
-  })  : assert(dispatcher != null),
-        super(dispatcher);
+  });
 
   /// The platform view identifier.
   final int id;
@@ -361,7 +333,7 @@ class PlatformViewMaxOverlaysScenario extends Scenario
 
     addPlatformView(
       id,
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       sceneBuilder: builder,
     );
     final PictureRecorder recorder = PictureRecorder();
@@ -389,7 +361,128 @@ class PlatformViewMaxOverlaysScenario extends Scenario
     final Picture picture = recorder.endRecording();
     builder.addPicture(const Offset(300, 300), picture);
     final Scene scene = builder.build();
-    window.render(scene);
+    view.render(scene);
+    scene.dispose();
+  }
+}
+
+/// A platform view with adjacent surrounding layers should not create overlays.
+class PlatformViewSurroundingLayersFractionalCoordinateScenario extends Scenario
+    with _BasePlatformViewScenarioMixin {
+  /// Creates the PlatformView scenario.
+  PlatformViewSurroundingLayersFractionalCoordinateScenario(
+    super.view, {
+    required this.id,
+  });
+
+  /// The platform view identifier.
+  final int id;
+
+  @override
+  void onBeginFrame(Duration duration) {
+    final SceneBuilder builder = SceneBuilder();
+
+    // Simulate partial pixel offsets as we would see while scrolling.
+    // All objects in the scene below are then on sub-pixel boundaries.
+    builder.pushOffset(0.5, 0.5);
+
+    // a platform view from (100, 100) to (200, 200)
+    builder.pushOffset(100, 100);
+    addPlatformView(
+      id,
+      width: 100,
+      height: 100,
+      dispatcher: view.platformDispatcher,
+      sceneBuilder: builder,
+    );
+    builder.pop();
+
+    final PictureRecorder recorder = PictureRecorder();
+    final Canvas canvas = Canvas(recorder);
+
+    const Rect rect = Rect.fromLTWH(100, 100, 100, 100);
+
+    // Rect at the left of platform view
+    canvas.drawRect(
+      rect.shift(const Offset(-100, 0)),
+      Paint()..color = const Color(0x22FF0000),
+    );
+
+    // Rect at the right of platform view
+    canvas.drawRect(
+      rect.shift(const Offset(100, 0)),
+      Paint()..color = const Color(0x22FF0000),
+    );
+
+    // Rect at the top of platform view
+    canvas.drawRect(
+      rect.shift(const Offset(0, -100)),
+      Paint()..color = const Color(0x22FF0000),
+    );
+
+    // Rect at the bottom of platform view
+    canvas.drawRect(
+      rect.shift(const Offset(0, 100)),
+      Paint()..color = const Color(0x22FF0000),
+    );
+
+    final Picture picture = recorder.endRecording();
+    builder.addPicture(Offset.zero, picture);
+
+    // Pop the (0.5, 0.5) offset.
+    builder.pop();
+
+    final Scene scene = builder.build();
+    view.render(scene);
+    scene.dispose();
+  }
+}
+
+/// A platform view partially intersect with a layer, both with fractional coordinates.
+class PlatformViewPartialIntersectionFractionalCoordinateScenario extends Scenario
+    with _BasePlatformViewScenarioMixin {
+  /// Creates the PlatformView scenario.
+  PlatformViewPartialIntersectionFractionalCoordinateScenario(
+    super.view, {
+    required this.id,
+  });
+
+  /// The platform view identifier.
+  final int id;
+
+  @override
+  void onBeginFrame(Duration duration) {
+    final SceneBuilder builder = SceneBuilder();
+
+    // Simulate partial pixel offsets as we would see while scrolling.
+    // All objects in the scene below are then on sub-pixel boundaries.
+    builder.pushOffset(0.5, 0.5);
+
+    // a platform view from (0, 0) to (100, 100)
+    addPlatformView(
+      id,
+      width: 100,
+      height: 100,
+      dispatcher: view.platformDispatcher,
+      sceneBuilder: builder,
+    );
+
+    final PictureRecorder recorder = PictureRecorder();
+    final Canvas canvas = Canvas(recorder);
+
+    canvas.drawRect(
+      const Rect.fromLTWH(50, 50, 100, 100),
+      Paint()..color = const Color(0x22FF0000),
+    );
+
+    final Picture picture = recorder.endRecording();
+    builder.addPicture(Offset.zero, picture);
+
+    // Pop the (0.5, 0.5) offset.
+    builder.pop();
+
+    final Scene scene = builder.build();
+    view.render(scene);
     scene.dispose();
   }
 }
@@ -398,14 +491,11 @@ class PlatformViewMaxOverlaysScenario extends Scenario
 class MultiPlatformViewScenario extends Scenario
     with _BasePlatformViewScenarioMixin {
   /// Creates the PlatformView scenario.
-  ///
-  /// The [dispatcher] parameter must not be null.
   MultiPlatformViewScenario(
-    PlatformDispatcher dispatcher, {
+    super.view, {
     required this.firstId,
     required this.secondId,
-  })  : assert(dispatcher != null),
-        super(dispatcher);
+  });
 
   /// The platform view identifier to use for the first platform view.
   final int firstId;
@@ -421,7 +511,7 @@ class MultiPlatformViewScenario extends Scenario
 
     addPlatformView(
       firstId,
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       sceneBuilder: builder,
       text: 'platform view 1',
     );
@@ -430,7 +520,7 @@ class MultiPlatformViewScenario extends Scenario
 
     addPlatformView(
       secondId,
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       sceneBuilder: builder,
       text: 'platform view 2',
     );
@@ -447,15 +537,13 @@ class MultiPlatformViewScenario extends Scenario
 class MultiPlatformViewBackgroundForegroundScenario extends Scenario
     with _BasePlatformViewScenarioMixin {
   /// Creates the PlatformView scenario.
-  ///
-  /// The [dispatcher] parameter must not be null.
   MultiPlatformViewBackgroundForegroundScenario(
-    PlatformDispatcher dispatcher, {
+    super.view, {
     required this.firstId,
     required this.secondId,
-  })  : assert(dispatcher != null),
-        super(dispatcher) {
+  }) {
     _nextFrame = _firstFrame;
+    channelBuffers.setListener('flutter/lifecycle', _onPlatformMessage);
   }
 
   /// The platform view identifier to use for the first platform view.
@@ -478,7 +566,7 @@ class MultiPlatformViewBackgroundForegroundScenario extends Scenario
 
     addPlatformView(
       firstId,
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       sceneBuilder: builder,
       text: 'platform view 1',
     );
@@ -489,7 +577,7 @@ class MultiPlatformViewBackgroundForegroundScenario extends Scenario
 
     addPlatformView(
       secondId,
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       sceneBuilder: builder,
       text: 'platform view 2',
     );
@@ -506,7 +594,7 @@ class MultiPlatformViewBackgroundForegroundScenario extends Scenario
     builder.addPicture(Offset.zero, picture);
 
     final Scene scene = builder.build();
-    window.render(scene);
+    view.render(scene);
     scene.dispose();
   }
 
@@ -517,7 +605,7 @@ class MultiPlatformViewBackgroundForegroundScenario extends Scenario
 
     addPlatformView(
       firstId,
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       sceneBuilder: builder,
       text: 'platform view 1',
     );
@@ -526,46 +614,53 @@ class MultiPlatformViewBackgroundForegroundScenario extends Scenario
 
     addPlatformView(
       secondId,
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       sceneBuilder: builder,
       text: 'platform view 2',
     );
 
     final Scene scene = builder.build();
-    window.render(scene);
+    view.render(scene);
     scene.dispose();
   }
 
   String _lastLifecycleState = '';
 
-  @override
-  void onPlatformMessage(
-    String name,
+  void _onPlatformMessage(
     ByteData? data,
     PlatformMessageResponseCallback? callback,
   ) {
-    if (name != 'flutter/lifecycle') {
+    final String message = utf8.decode(data!.buffer.asUint8List());
+
+    // The expected first event should be 'AppLifecycleState.resumed', but
+    // occasionally it will receive 'AppLifecycleState.inactive' first. Skip
+    // any messages until 'AppLifecycleState.resumed' is received.
+    if (_lastLifecycleState.isEmpty && message != 'AppLifecycleState.resumed') {
       return;
     }
-    final String message = utf8.decode(data!.buffer.asUint8List());
     if (_lastLifecycleState == 'AppLifecycleState.inactive' &&
         message == 'AppLifecycleState.resumed') {
       _nextFrame = _secondFrame;
-      window.scheduleFrame();
+      view.platformDispatcher.scheduleFrame();
     }
 
     _lastLifecycleState = message;
   }
+
+  @override
+  void unmount() {
+    channelBuffers.clearListener('flutter/lifecycle');
+    super.unmount();
+  }
 }
 
 /// Platform view with clip rect.
 class PlatformViewClipRectScenario extends Scenario with _BasePlatformViewScenarioMixin {
   /// Constructs a platform view with clip rect scenario.
   PlatformViewClipRectScenario(
-    PlatformDispatcher dispatcher, {
+    super.view, {
     required this.id,
-  }) : assert(dispatcher != null),
-       super(dispatcher);
+  });
 
   /// The platform view identifier.
   final int id;
@@ -577,7 +672,7 @@ class PlatformViewClipRectScenario extends Scenario with _BasePlatformViewScenar
 
     addPlatformView(
       id,
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       sceneBuilder: builder,
     );
 
@@ -585,13 +680,68 @@ class PlatformViewClipRectScenario extends Scenario with _BasePlatformViewScenar
   }
 }
 
+/// Platform view with clip rect then the PlatformView is moved for 10 frames.
+///
+/// The clip rect moves with the same transform matrix with the PlatformView.
+class PlatformViewClipRectAfterMovedScenario extends Scenario with _BasePlatformViewScenarioMixin {
+  /// Constructs a platform view with clip rect scenario.
+  PlatformViewClipRectAfterMovedScenario(
+    super.view, {
+    required this.id,
+  });
+
+  /// The platform view identifier.
+  final int id;
+
+  int _numberOfFrames = 0;
+
+  double _y = 100.0;
+
+  @override
+  void onBeginFrame(Duration duration) {
+    final Matrix4 translateMatrix = Matrix4.identity()..translate(0.0, _y);
+    final SceneBuilder builder = SceneBuilder()
+      ..pushTransform(translateMatrix.storage)
+      ..pushClipRect(const Rect.fromLTRB(100, 100, 400, 400));
+
+    addPlatformView(
+      _numberOfFrames == 10? 10000: id,
+      dispatcher: view.platformDispatcher,
+      sceneBuilder: builder,
+    );
+
+    // Add a translucent rect that has the same size of PlatformView.
+    final PictureRecorder recorder = PictureRecorder();
+    final Canvas canvas = Canvas(recorder);
+    canvas.drawRect(
+      const Rect.fromLTWH(0, 0, 500, 500),
+      Paint()..color = const Color(0x22FF0000),
+    );
+    final Picture picture = recorder.endRecording();
+    builder.addPicture(Offset.zero, picture);
+
+    finishBuilder(builder);
+    super.onBeginFrame(duration);
+  }
+
+  @override
+  void onDrawFrame() {
+    if (_numberOfFrames < 10) {
+      _numberOfFrames ++;
+      _y -= 10;
+      view.platformDispatcher.scheduleFrame();
+    }
+    super.onDrawFrame();
+  }
+}
+
 /// Platform view with clip rrect.
 class PlatformViewClipRRectScenario extends PlatformViewScenario {
   /// Constructs a platform view with clip rrect scenario.
   PlatformViewClipRRectScenario(
-    PlatformDispatcher dispatcher, {
-    int id = 0,
-  }) : super(dispatcher, id: id);
+    super.view, {
+    super.id = 0,
+  });
 
   @override
   void onBeginFrame(Duration duration) {
@@ -610,7 +760,7 @@ class PlatformViewClipRRectScenario extends PlatformViewScenario {
 
     addPlatformView(
       id,
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       sceneBuilder: builder,
     );
 
@@ -618,15 +768,14 @@ class PlatformViewClipRRectScenario extends PlatformViewScenario {
   }
 }
 
-
 /// Platform view with clip rrect.
 /// The bounding rect of the rrect is the same as PlatformView and only the corner radii clips the PlatformView.
 class PlatformViewLargeClipRRectScenario extends PlatformViewScenario {
   /// Constructs a platform view with large clip rrect scenario.
   PlatformViewLargeClipRRectScenario(
-    PlatformDispatcher dispatcher, {
-    int id = 0,
-  }) : super(dispatcher, id: id);
+    super.view, {
+    super.id = 0,
+  });
 
   @override
   void onBeginFrame(Duration duration) {
@@ -645,7 +794,7 @@ class PlatformViewLargeClipRRectScenario extends PlatformViewScenario {
 
     addPlatformView(
       id,
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       sceneBuilder: builder,
     );
 
@@ -653,13 +802,14 @@ class PlatformViewLargeClipRRectScenario extends PlatformViewScenario {
   }
 }
 
+
 /// Platform view with clip path.
 class PlatformViewClipPathScenario extends PlatformViewScenario {
   /// Constructs a platform view with clip path scenario.
   PlatformViewClipPathScenario(
-    PlatformDispatcher dispatcher, {
-    int id = 0,
-  }) : super(dispatcher, id: id);
+    super.view, {
+    super.id = 0,
+  });
 
   @override
   void onBeginFrame(Duration duration) {
@@ -673,7 +823,7 @@ class PlatformViewClipPathScenario extends PlatformViewScenario {
     final SceneBuilder builder = SceneBuilder()..pushClipPath(path);
     addPlatformView(
       id,
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       sceneBuilder: builder,
     );
     finishBuilder(builder);
@@ -684,9 +834,9 @@ class PlatformViewClipPathScenario extends PlatformViewScenario {
 class PlatformViewClipRectWithTransformScenario extends PlatformViewScenario {
   /// Constructs a platform view with clip rect with transform scenario.
   PlatformViewClipRectWithTransformScenario(
-    PlatformDispatcher dispatcher, {
-    int id = 0,
-  }) : super(dispatcher, id: id);
+    super.view, {
+    super.id = 0,
+  });
 
   @override
   void onBeginFrame(Duration duration) {
@@ -700,7 +850,7 @@ class PlatformViewClipRectWithTransformScenario extends PlatformViewScenario {
 
     addPlatformView(
       id,
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       sceneBuilder: builder,
     );
 
@@ -722,9 +872,9 @@ class PlatformViewClipRectWithTransformScenario extends PlatformViewScenario {
 class PlatformViewClipRRectWithTransformScenario extends PlatformViewScenario {
   /// Constructs a platform view with clip rrect with transform scenario.
   PlatformViewClipRRectWithTransformScenario(
-    PlatformDispatcher dispatcher, {
-    int id = 0,
-  }) : super(dispatcher, id: id);
+    super.view, {
+    super.id = 0,
+  });
 
   @override
   void onBeginFrame(Duration duration) {
@@ -747,7 +897,7 @@ class PlatformViewClipRRectWithTransformScenario extends PlatformViewScenario {
     );
     addPlatformView(
       id,
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       sceneBuilder: builder,
     );
 
@@ -770,9 +920,9 @@ class PlatformViewClipRRectWithTransformScenario extends PlatformViewScenario {
 class PlatformViewLargeClipRRectWithTransformScenario extends PlatformViewScenario {
   /// Constructs a platform view with large clip rrect with transform scenario.
   PlatformViewLargeClipRRectWithTransformScenario(
-    PlatformDispatcher dispatcher, {
-    int id = 0,
-  }) : super(dispatcher, id: id);
+    super.view, {
+    super.id = 0,
+  });
 
   @override
   void onBeginFrame(Duration duration) {
@@ -795,7 +945,7 @@ class PlatformViewLargeClipRRectWithTransformScenario extends PlatformViewScenar
     );
     addPlatformView(
       id,
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       sceneBuilder: builder,
     );
 
@@ -813,13 +963,14 @@ class PlatformViewLargeClipRRectWithTransformScenario extends PlatformViewScenar
   }
 }
 
+
 /// Platform view with clip path after transformed.
 class PlatformViewClipPathWithTransformScenario extends PlatformViewScenario {
   /// Constructs a platform view with clip path with transform scenario.
   PlatformViewClipPathWithTransformScenario(
-    PlatformDispatcher dispatcher, {
-    int id = 0,
-  }) : super(dispatcher, id: id);
+    super.view, {
+    super.id = 0,
+  });
 
   @override
   void onBeginFrame(Duration duration) {
@@ -839,7 +990,7 @@ class PlatformViewClipPathWithTransformScenario extends PlatformViewScenario {
     builder.pushClipPath(path);
     addPlatformView(
       id,
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       sceneBuilder: builder,
     );
 
@@ -857,13 +1008,194 @@ class PlatformViewClipPathWithTransformScenario extends PlatformViewScenario {
   }
 }
 
+/// Two platform views, both have clip rects
+class TwoPlatformViewClipRect extends Scenario
+    with _BasePlatformViewScenarioMixin {
+  /// Creates the PlatformView scenario.
+  TwoPlatformViewClipRect(
+    super.view, {
+    required this.firstId,
+    required this.secondId,
+  });
+
+  /// The platform view identifier to use for the first platform view.
+  final int firstId;
+
+  /// The platform view identifier to use for the second platform view.
+  final int secondId;
+
+  @override
+  void onBeginFrame(Duration duration) {
+    final SceneBuilder builder = SceneBuilder();
+    builder.pushOffset(0, 600);
+    builder.pushClipRect(const Rect.fromLTRB(100, 100, 400, 400));
+
+    addPlatformView(
+      firstId,
+      dispatcher: view.platformDispatcher,
+      sceneBuilder: builder,
+      text: 'platform view 1',
+    );
+
+    builder.pop();
+    builder.pop();
+
+    // Use a different rect to differentiate from the 1st clip rect.
+    builder.pushClipRect(const Rect.fromLTRB(100, 100, 300, 300));
+
+    addPlatformView(
+      secondId,
+      dispatcher: view.platformDispatcher,
+      sceneBuilder: builder,
+      text: 'platform view 2',
+    );
+
+    builder.pop();
+    final Scene scene = builder.build();
+    view.render(scene);
+    scene.dispose();
+  }
+}
+
+/// Two platform views, both have clip rrects
+class TwoPlatformViewClipRRect extends Scenario
+    with _BasePlatformViewScenarioMixin {
+  /// Creates the PlatformView scenario.
+  TwoPlatformViewClipRRect(
+    super.view, {
+    required this.firstId,
+    required this.secondId,
+  });
+
+  /// The platform view identifier to use for the first platform view.
+  final int firstId;
+
+  /// The platform view identifier to use for the second platform view.
+  final int secondId;
+
+  @override
+  void onBeginFrame(Duration duration) {
+    final SceneBuilder builder = SceneBuilder();
+    builder.pushOffset(0, 600);
+    builder.pushClipRRect(
+      RRect.fromLTRBAndCorners(
+        0,
+        0,
+        500,
+        500,
+        topLeft: const Radius.circular(15),
+        topRight: const Radius.circular(50),
+        bottomLeft: const Radius.circular(50),
+      ),
+    );
+
+    addPlatformView(
+      firstId,
+      dispatcher: view.platformDispatcher,
+      sceneBuilder: builder,
+      text: 'platform view 1',
+    );
+
+    builder.pop();
+    builder.pop();
+
+    // Use a different rrect to differentiate from the 1st clip rrect.
+    builder.pushClipRRect(
+      RRect.fromLTRBAndCorners(
+        0,
+        0,
+        500,
+        500,
+        topLeft: const Radius.circular(100),
+        topRight: const Radius.circular(50),
+        bottomLeft: const Radius.circular(50),
+      ),
+    );
+
+    addPlatformView(
+      secondId,
+      dispatcher: view.platformDispatcher,
+      sceneBuilder: builder,
+      text: 'platform view 2',
+    );
+
+    builder.pop();
+    final Scene scene = builder.build();
+    view.render(scene);
+    scene.dispose();
+  }
+}
+
+/// Two platform views, both have clip path
+class TwoPlatformViewClipPath extends Scenario
+    with _BasePlatformViewScenarioMixin {
+  /// Creates the PlatformView scenario.
+  TwoPlatformViewClipPath(
+    super.view, {
+    required this.firstId,
+    required this.secondId,
+  });
+
+  /// The platform view identifier to use for the first platform view.
+  final int firstId;
+
+  /// The platform view identifier to use for the second platform view.
+  final int secondId;
+
+  @override
+  void onBeginFrame(Duration duration) {
+    final SceneBuilder builder = SceneBuilder();
+    builder.pushOffset(0, 600);
+    final Path path = Path()
+      ..moveTo(100, 100)
+      ..quadraticBezierTo(50, 250, 100, 400)
+      ..lineTo(350, 400)
+      ..cubicTo(400, 300, 300, 200, 350, 100)
+      ..close();
+
+    builder.pushClipPath(path);
+
+    addPlatformView(
+      firstId,
+      dispatcher: view.platformDispatcher,
+      sceneBuilder: builder,
+      text: 'platform view 1',
+    );
+
+    builder.pop();
+    builder.pop();
+
+    // Use a different path to differentiate from the 1st clip path.
+    final Path path2 = Path()
+      ..moveTo(100, 100)
+      ..quadraticBezierTo(100, 150, 100, 400)
+      ..lineTo(350, 350)
+      ..cubicTo(400, 300, 300, 200, 350, 200)
+      ..close();
+
+    builder.pushClipPath(path2);
+
+    addPlatformView(
+      secondId,
+      dispatcher: view.platformDispatcher,
+      sceneBuilder: builder,
+      text: 'platform view 2',
+    );
+
+    builder.pop();
+    final Scene scene = builder.build();
+    view.render(scene);
+    scene.dispose();
+  }
+}
+
 /// Platform view with transform.
 class PlatformViewTransformScenario extends PlatformViewScenario {
   /// Constructs a platform view with transform scenario.
   PlatformViewTransformScenario(
-    PlatformDispatcher dispatcher, {
-    int id = 0,
-  }) : super(dispatcher, id: id);
+    super.view, {
+    super.id = 0,
+  });
 
   @override
   void onBeginFrame(Duration duration) {
@@ -875,7 +1207,7 @@ class PlatformViewTransformScenario extends PlatformViewScenario {
     final SceneBuilder builder = SceneBuilder()..pushTransform(matrix4.storage);
     addPlatformView(
       id,
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       sceneBuilder: builder,
     );
     finishBuilder(builder);
@@ -886,16 +1218,16 @@ class PlatformViewTransformScenario extends PlatformViewScenario {
 class PlatformViewOpacityScenario extends PlatformViewScenario {
   /// Constructs a platform view with transform scenario.
   PlatformViewOpacityScenario(
-    PlatformDispatcher dispatcher, {
-    int id = 0,
-  }) : super(dispatcher, id: id);
+    super.view, {
+    super.id = 0,
+  });
 
   @override
   void onBeginFrame(Duration duration) {
     final SceneBuilder builder = SceneBuilder()..pushOpacity(150);
     addPlatformView(
       id,
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       sceneBuilder: builder,
     );
     finishBuilder(builder);
@@ -906,15 +1238,12 @@ class PlatformViewOpacityScenario extends PlatformViewScenario {
 class PlatformViewForTouchIOSScenario extends Scenario
     with _BasePlatformViewScenarioMixin {
   /// Creates the PlatformView scenario.
-  ///
-  /// The [dispatcher] parameter must not be null.
   PlatformViewForTouchIOSScenario(
-    PlatformDispatcher dispatcher, {
+    super.view, {
     this.id = 0,
     this.rejectUntilTouchesEnded = false,
     required this.accept,
-  }) : assert(dispatcher != null),
-       super(dispatcher) {
+  }) {
     _nextFrame = _firstFrame;
   }
 
@@ -941,7 +1270,7 @@ class PlatformViewForTouchIOSScenario extends Scenario
     // See https://github.com/flutter/flutter/issues/66044
     if (_nextFrame == _firstFrame) {
       _nextFrame = _secondFrame;
-      window.scheduleFrame();
+      view.platformDispatcher.scheduleFrame();
     }
     super.onDrawFrame();
   }
@@ -966,7 +1295,7 @@ class PlatformViewForTouchIOSScenario extends Scenario
         valueInt32,
         ..._to32(id),
       ]);
-      window.sendPlatformMessage(
+      view.platformDispatcher.sendPlatformMessage(
         'flutter/platform_views',
         message.buffer.asByteData(),
         (ByteData? response) {},
@@ -980,14 +1309,14 @@ class PlatformViewForTouchIOSScenario extends Scenario
     if (rejectUntilTouchesEnded) {
       addPlatformView(
         id,
-        dispatcher: dispatcher,
+        dispatcher: view.platformDispatcher,
         sceneBuilder: builder,
         viewType: 'scenarios/textPlatformView_blockPolicyUntilTouchesEnded',
       );
     } else {
       addPlatformView(
         id,
-        dispatcher: dispatcher,
+        dispatcher: view.platformDispatcher,
         sceneBuilder: builder,
       );
     }
@@ -999,14 +1328,14 @@ class PlatformViewForTouchIOSScenario extends Scenario
     if (rejectUntilTouchesEnded) {
       addPlatformView(
         id,
-        dispatcher: dispatcher,
+        dispatcher: view.platformDispatcher,
         sceneBuilder: builder,
         viewType: 'scenarios/textPlatformView_blockPolicyUntilTouchesEnded',
       );
     } else {
       addPlatformView(
         id,
-        dispatcher: dispatcher,
+        dispatcher: view.platformDispatcher,
         sceneBuilder: builder,
       );
     }
@@ -1014,14 +1343,139 @@ class PlatformViewForTouchIOSScenario extends Scenario
   }
 }
 
+/// Scenario for verifying overlapping platform views can accept touch gesture.
+/// See: https://github.com/flutter/flutter/issues/118366.
+///
+/// Renders the first frame with a foreground platform view.
+/// Then renders the second frame with the foreground platform view covering
+/// a new background platform view.
+///
+class PlatformViewForOverlappingPlatformViewsScenario extends Scenario
+    with _BasePlatformViewScenarioMixin {
+
+  /// Creates the PlatformViewForOverlappingPlatformViewsScenario.
+  PlatformViewForOverlappingPlatformViewsScenario(
+    super.view, {
+    required this.foregroundId,
+    required this.backgroundId,
+  }) {
+    _nextFrame = _firstFrame;
+  }
+
+  /// The id for a foreground platform view that covers another background platform view.
+  /// A good example is a dialog prompt in a real app.
+  final int foregroundId;
+
+  /// The id for a background platform view that is covered by a foreground platform view.
+  final int backgroundId;
+
+  late void Function() _nextFrame;
+
+  @override
+  void onBeginFrame(Duration duration) {
+    _nextFrame();
+  }
+
+  void _firstFrame() {
+    final SceneBuilder builder = SceneBuilder();
+
+    builder.pushOffset(100, 100);
+    addPlatformView(
+      foregroundId,
+      width: 100,
+      height: 100,
+      dispatcher: view.platformDispatcher,
+      sceneBuilder: builder,
+      text: 'Foreground',
+    );
+    builder.pop();
+
+    final Scene scene = builder.build();
+    view.render(scene);
+    scene.dispose();
+  }
+
+  void _secondFrame() {
+    final SceneBuilder builder = SceneBuilder();
+
+    builder.pushOffset(0, 0);
+    addPlatformView(
+      backgroundId,
+      width: 300,
+      height: 300,
+      dispatcher: view.platformDispatcher,
+      sceneBuilder: builder,
+      text: 'Background',
+    );
+    builder.pop();
+
+    builder.pushOffset(100, 100);
+    addPlatformView(
+      foregroundId,
+      width: 100,
+      height: 100,
+      dispatcher: view.platformDispatcher,
+      sceneBuilder: builder,
+      text: 'Foreground',
+    );
+    builder.pop();
+
+    final Scene scene = builder.build();
+    view.render(scene);
+    scene.dispose();
+  }
+
+  int _frameCount = 0;
+
+  @override
+  void onDrawFrame() {
+    _frameCount += 1;
+    // TODO(hellohuanlin): Need further investigation - the first 2 frames are dropped for some reason.
+    // Wait for 60 frames to ensure the first frame has actually been rendered
+    // (Minimum required is 3 frames, but just to be safe)
+    if (_nextFrame == _firstFrame && _frameCount == 60) {
+      _nextFrame = _secondFrame;
+    }
+    view.platformDispatcher.scheduleFrame();
+    super.onDrawFrame();
+  }
+
+  @override
+  void onPointerDataPacket(PointerDataPacket packet) {
+    final PointerData data = packet.data.first;
+    final double x = data.physicalX;
+    final double y = data.physicalY;
+    if (data.change == PointerChange.up && 100 <= x && x < 200 && 100 <= y && y < 200) {
+      const int valueString = 7;
+      const int valueInt32 = 3;
+      const int valueMap = 13;
+      final Uint8List message = Uint8List.fromList(<int>[
+        valueString,
+        ..._encodeString('acceptGesture'),
+        valueMap,
+        1,
+        valueString,
+        ..._encodeString('id'),
+        valueInt32,
+        ..._to32(foregroundId),
+      ]);
+      view.platformDispatcher.sendPlatformMessage(
+        'flutter/platform_views',
+        message.buffer.asByteData(),
+        (ByteData? response) {},
+      );
+    }
+  }
+}
+
 /// A simple platform view for testing platform view with a continuous texture layer.
 /// For example, it simulates a video being played.
 class PlatformViewWithContinuousTexture extends PlatformViewScenario {
   /// Constructs a platform view with continuous texture layer.
   PlatformViewWithContinuousTexture(
-    PlatformDispatcher dispatcher, {
-    int id = 0,
-  }) : super(dispatcher, id: id);
+    super.view, {
+    super.id = 0,
+  });
 
   @override
   void onBeginFrame(Duration duration) {
@@ -1032,7 +1486,7 @@ class PlatformViewWithContinuousTexture extends PlatformViewScenario {
 
     addPlatformView(
       id,
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       sceneBuilder: builder,
     );
 
@@ -1049,9 +1503,9 @@ class PlatformViewWithContinuousTexture extends PlatformViewScenario {
 class PlatformViewWithOtherBackDropFilter extends PlatformViewScenario {
   /// Constructs the scenario.
   PlatformViewWithOtherBackDropFilter(
-    PlatformDispatcher dispatcher, {
-    int id = 0,
-  }) : super(dispatcher, id: id);
+    super.view, {
+    super.id = 0,
+  });
 
   @override
   void onBeginFrame(Duration duration) {
@@ -1092,7 +1546,7 @@ class PlatformViewWithOtherBackDropFilter extends PlatformViewScenario {
 
     addPlatformView(
       id,
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       sceneBuilder: builder,
     );
 
@@ -1111,7 +1565,7 @@ class PlatformViewWithOtherBackDropFilter extends PlatformViewScenario {
     builder.addPicture(const Offset(100, 100), picture3);
 
     final Scene scene = builder.build();
-    window.render(scene);
+    view.render(scene);
     scene.dispose();
   }
 }
@@ -1119,18 +1573,15 @@ class PlatformViewWithOtherBackDropFilter extends PlatformViewScenario {
 /// A simple platform view for testing backDropFilter with a platform view in the scene.
 ///
 /// The stack would look like: picture 1 -> pv1 -> picture 2 -> filter -> pv2 - > picture 3.
-/// Because backdrop filter on platform views has not been implemented(see: https://github.com/flutter/flutter/issues/43902),
-/// the result will not including a filtered pv1.
 class TwoPlatformViewsWithOtherBackDropFilter extends Scenario
     with _BasePlatformViewScenarioMixin {
   /// Constructs the scenario.
   TwoPlatformViewsWithOtherBackDropFilter(
-    PlatformDispatcher dispatcher, {
+    super.view, {
     required int firstId,
     required int secondId,
   }) : _firstId = firstId,
-       _secondId = secondId,
-       super(dispatcher);
+       _secondId = secondId;
 
   final int _firstId;
   final int _secondId;
@@ -1158,7 +1609,7 @@ class TwoPlatformViewsWithOtherBackDropFilter extends Scenario
 
     addPlatformView(
       _firstId,
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       sceneBuilder: builder,
       width: 100,
       height: 100,
@@ -1183,7 +1634,7 @@ class TwoPlatformViewsWithOtherBackDropFilter extends Scenario
 
     addPlatformView(
       _secondId,
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       sceneBuilder: builder,
       text: 'platform view 2',
     );
@@ -1205,7 +1656,69 @@ class TwoPlatformViewsWithOtherBackDropFilter extends Scenario
     builder.addPicture(const Offset(100, 100), picture3);
 
     final Scene scene = builder.build();
-    window.render(scene);
+    view.render(scene);
+    scene.dispose();
+  }
+}
+
+/// A simple platform view for testing backDropFilter with a platform view in the scene.
+///
+/// The backdrop filter sigma value is negative, which tries to reproduce a crash, see:
+/// https://github.com/flutter/flutter/issues/127095
+class PlatformViewWithNegativeBackDropFilter extends Scenario
+    with _BasePlatformViewScenarioMixin {
+  /// Constructs the scenario.
+  PlatformViewWithNegativeBackDropFilter(
+    super.view, {
+    required int id,
+  }) : _id = id;
+
+  final int _id;
+
+  @override
+  void onBeginFrame(Duration duration) {
+    final SceneBuilder builder = SceneBuilder();
+
+    final PictureRecorder recorder = PictureRecorder();
+    final Canvas canvas = Canvas(recorder);
+    // This is just a background picture to make the result more viewable.
+    canvas.drawRect(
+      const Rect.fromLTRB(0, 0, 600, 1000),
+      Paint()..color = const Color(0xFFFF0000),
+    );
+    canvas.drawRect(
+      const Rect.fromLTRB(0, 0, 300, 300),
+      Paint()..color = const Color(0xFF00FF00),
+    );
+    final Picture picture1 = recorder.endRecording();
+    builder.addPicture(Offset.zero, picture1);
+
+    builder.pushOffset(0, 200);
+
+    addPlatformView(
+      _id,
+      dispatcher: view.platformDispatcher,
+      sceneBuilder: builder,
+      width: 100,
+      height: 100,
+      text: 'platform view 1'
+    );
+
+    final PictureRecorder recorder2 = PictureRecorder();
+    final Canvas canvas2 = Canvas(recorder2);
+    canvas2.drawCircle(
+      const Offset(200, 100),
+      50,
+      Paint()..color = const Color(0xFF0000EF),
+    );
+    final Picture picture2 = recorder2.endRecording();
+    builder.addPicture(const Offset(100, 100), picture2);
+
+    final ImageFilter filter = ImageFilter.blur(sigmaX: -8, sigmaY: 8);
+    builder.pushBackdropFilter(filter);
+
+    final Scene scene = builder.build();
+    view.render(scene);
     scene.dispose();
   }
 }
@@ -1214,16 +1727,12 @@ class TwoPlatformViewsWithOtherBackDropFilter extends Scenario
 class PlatformViewScrollingUnderWidget extends Scenario
     with _BasePlatformViewScenarioMixin {
   /// Creates the PlatformView scenario.
-  ///
-  /// The [dispatcher] parameter must not be null.
   PlatformViewScrollingUnderWidget(
-    PlatformDispatcher dispatcher, {
+    super.view, {
     required int firstPlatformViewId,
     required int lastPlatformViewId,
-  }) : _firstPlatformViewId = firstPlatformViewId,
-       _lastPlatformViewId = lastPlatformViewId,
-       assert(dispatcher != null),
-       super(dispatcher);
+  }) :  _firstPlatformViewId = firstPlatformViewId,
+       _lastPlatformViewId = lastPlatformViewId;
 
   final int _firstPlatformViewId;
 
@@ -1252,7 +1761,7 @@ class PlatformViewScrollingUnderWidget extends Scenario
     } else {
       _offset += 100;
     }
-    window.scheduleFrame();
+    view.platformDispatcher.scheduleFrame();
     super.onDrawFrame();
   }
 
@@ -1266,7 +1775,7 @@ class PlatformViewScrollingUnderWidget extends Scenario
       builder.pushOffset(0, localOffset);
       addPlatformView(
         i,
-        dispatcher: dispatcher,
+        dispatcher: view.platformDispatcher,
         sceneBuilder: builder,
         text: 'platform view $i',
         width: cellWidth,
@@ -1287,12 +1796,99 @@ class PlatformViewScrollingUnderWidget extends Scenario
     builder.addPicture(const Offset(0, 20), picture);
 
     final Scene scene = builder.build();
-    window.render(scene);
+    view.render(scene);
+    scene.dispose();
+  }
+}
+
+/// Builds a scenario where many platform views with clips scrolling.
+class PlatformViewsWithClipsScrolling extends Scenario
+    with _BasePlatformViewScenarioMixin {
+  /// Creates the PlatformView scenario.
+  PlatformViewsWithClipsScrolling(
+    super.view, {
+    required int firstPlatformViewId,
+    required int lastPlatformViewId,
+  }) :  _firstPlatformViewId = firstPlatformViewId,
+       _lastPlatformViewId = lastPlatformViewId;
+
+  final int _firstPlatformViewId;
+
+  final int _lastPlatformViewId;
+
+  double _offset = 0;
+
+  bool _movingUp = true;
+
+  @override
+  void onBeginFrame(Duration duration) {
+    _buildOneFrame(_offset);
+  }
+
+  @override
+  void onDrawFrame() {
+    // Scroll up until -1000, then scroll down until -1.
+    if (_offset < -500) {
+      _movingUp = false;
+    } else if (_offset > -1) {
+      _movingUp = true;
+    }
+
+    if (_movingUp) {
+      _offset -= 100;
+    } else {
+      _offset += 100;
+    }
+    view.platformDispatcher.scheduleFrame();
+    super.onDrawFrame();
+  }
+
+  Future<void> _buildOneFrame(double offset) async {
+    const double cellWidth = 1000;
+    double localOffset = offset;
+    final SceneBuilder builder = SceneBuilder();
+    const double cellHeight = 300;
+    for (int i = _firstPlatformViewId; i <= _lastPlatformViewId; i++) {
+      // Build a list view with platform views.
+      builder.pushOffset(0, localOffset);
+      bool addedClipRRect = false;
+      if (localOffset > -1) {
+        addedClipRRect = true;
+        builder.pushClipRRect(
+          RRect.fromLTRBAndCorners(
+            100,
+            100,
+            400,
+            400,
+            topLeft: const Radius.circular(15),
+            topRight: const Radius.circular(50),
+            bottomLeft: const Radius.circular(50),
+          ),
+        );
+      }
+      addPlatformView(
+        i,
+        dispatcher: view.platformDispatcher,
+        sceneBuilder: builder,
+        text: 'platform view $i',
+        width: cellWidth,
+        height: cellHeight,
+      );
+      if (addedClipRRect) {
+        builder.pop();
+      }
+      builder.pop();
+      localOffset += cellHeight;
+    }
+
+    final Scene scene = builder.build();
+    view.render(scene);
     scene.dispose();
   }
 }
 
 final Map<String, int> _createdPlatformViews = <String, int> {};
+final Map<String, bool> _calledToBeCreatedPlatformViews = <String, bool> {};
 
 /// Adds the platform view to the scene.
 ///
@@ -1312,7 +1908,6 @@ void addPlatformView(
   }
 
   final String platformViewKey = '$viewType-$id';
-
   if (_createdPlatformViews.containsKey(platformViewKey)) {
     addPlatformViewToSceneBuilder(
       id,
@@ -1323,6 +1918,10 @@ void addPlatformView(
     );
     return;
   }
+  if (_calledToBeCreatedPlatformViews.containsKey(platformViewKey)) {
+    return;
+  }
+  _calledToBeCreatedPlatformViews[platformViewKey] = true;
 
   final bool usesAndroidHybridComposition = scenarioParams['use_android_view'] as bool? ?? false;
   final bool expectAndroidHybridCompositionFallback =
@@ -1335,7 +1934,6 @@ void addPlatformView(
   const int valueString = 7;
   const int valueUint8List = 8;
   const int valueMap = 13;
-
   final Uint8List message = Uint8List.fromList(<int>[
     valueString,
     ..._encodeString('create'),
@@ -1466,7 +2064,7 @@ mixin _BasePlatformViewScenarioMixin on Scenario {
     final Picture picture = recorder.endRecording();
     sceneBuilder.addPicture(const Offset(300, 300), picture);
     final Scene scene = sceneBuilder.build();
-    window.render(scene);
+    view.render(scene);
     scene.dispose();
   }
 }
diff --git a/testing/scenario_app/lib/src/poppable_screen.dart b/testing/scenario_app/lib/src/poppable_screen.dart
index 65c94394df4869612e54e5d286e32168c4081ea6..8f633bffbd9b797d186932e94f7dbc065b330992 100644
--- a/testing/scenario_app/lib/src/poppable_screen.dart
+++ b/testing/scenario_app/lib/src/poppable_screen.dart
@@ -2,21 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:typed_data';
 import 'dart:ui';
 
 import 'channel_util.dart';
 
-import 'platform_echo_mixin.dart';
 import 'scenario.dart';
 
 /// A blank page with a button that pops the page when tapped.
-class PoppableScreenScenario extends Scenario with PlatformEchoMixin {
+class PoppableScreenScenario extends Scenario {
   /// Creates the PoppableScreenScenario.
-  ///
-  /// The [dispatcher] parameter must not be null.
-  PoppableScreenScenario(PlatformDispatcher dispatcher)
-      : assert(dispatcher != null),
-        super(dispatcher);
+  PoppableScreenScenario(super.view) {
+    channelBuffers.setListener('flutter/platform', _onHandlePlatformMessage);
+  }
 
   // Rect for the pop button. Only defined once onMetricsChanged is called.
   Rect? _buttonRect;
@@ -40,7 +38,7 @@ class PoppableScreenScenario extends Scenario with PlatformEchoMixin {
     builder.pushOffset(0, 0);
     builder.addPicture(Offset.zero, picture);
     final Scene scene = builder.build();
-    window.render(scene);
+    view.render(scene);
     scene.dispose();
   }
 
@@ -52,12 +50,12 @@ class PoppableScreenScenario extends Scenario with PlatformEchoMixin {
   @override
   void onMetricsChanged() {
     _buttonRect = Rect.fromLTRB(
-      window.physicalSize.width / 4,
-      window.physicalSize.height * 2 / 5,
-      window.physicalSize.width * 3 / 4,
-      window.physicalSize.height * 3 / 5,
+      view.physicalSize.width / 4,
+      view.physicalSize.height * 2 / 5,
+      view.physicalSize.width * 3 / 4,
+      view.physicalSize.height * 3 / 5,
     );
-    window.scheduleFrame();
+    view.platformDispatcher.scheduleFrame();
   }
 
   @override
@@ -73,7 +71,7 @@ class PoppableScreenScenario extends Scenario with PlatformEchoMixin {
 
   void _pop() {
     sendJsonMethodCall(
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       // 'flutter/platform' is the hardcoded name of the 'platform'
       // `SystemChannel` from the `SystemNavigator` API.
       // https://github.com/flutter/flutter/blob/master/packages/flutter/lib/src/services/system_navigator.dart.
@@ -83,4 +81,14 @@ class PoppableScreenScenario extends Scenario with PlatformEchoMixin {
       // will fail.
     );
   }
+
+  void _onHandlePlatformMessage(ByteData? data, PlatformMessageResponseCallback callback) {
+    view.platformDispatcher.sendPlatformMessage('flutter/platform', data, null);
+  }
+
+  @override
+  void unmount() {
+    channelBuffers.clearListener('flutter/platform');
+    super.unmount();
+  }
 }
diff --git a/testing/scenario_app/lib/src/scenario.dart b/testing/scenario_app/lib/src/scenario.dart
index 6e66c862280e979b0a28dd5cc2f8f41a429ab4ab..f44eeccac6f3f6e153477472256d782b1b9e46ac 100644
--- a/testing/scenario_app/lib/src/scenario.dart
+++ b/testing/scenario_app/lib/src/scenario.dart
@@ -2,16 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:typed_data';
 import 'dart:ui';
 
 /// A scenario to run for testing.
 abstract class Scenario {
-  /// Creates a new scenario using a specific FlutterWindow instance.
-  Scenario(this.dispatcher);
+  /// Creates a new scenario using a specific FlutterView instance.
+  Scenario(this.view);
 
-  /// The window used by this scenario. May be mocked.
-  final PlatformDispatcher dispatcher;
+  /// The FlutterView used by this scenario. May be mocked.
+  final FlutterView view;
 
   /// [true] if a screenshot is taken in the next frame.
   bool _didScheduleScreenshot = false;
@@ -27,12 +26,12 @@ abstract class Scenario {
   /// See [PlatformDispatcher.onDrawFrame] for more details.
   void onDrawFrame() {
     if (_didScheduleScreenshot) {
-      dispatcher.sendPlatformMessage('take_screenshot', null, null);
+      view.platformDispatcher.sendPlatformMessage('take_screenshot', null, null);
       return;
     }
     Future<void>.delayed(const Duration(seconds: 2), () {
       _didScheduleScreenshot = true;
-      dispatcher.scheduleFrame();
+      view.platformDispatcher.scheduleFrame();
     });
   }
 
@@ -51,14 +50,4 @@ abstract class Scenario {
   ///
   /// See [PlatformDispatcher.onPointerDataPacket].
   void onPointerDataPacket(PointerDataPacket packet) {}
-
-  /// Called by the program when an engine side platform channel message is
-  /// received.
-  ///
-  /// See [PlatformDispatcher.onPlatformMessage].
-  void onPlatformMessage(
-    String name,
-    ByteData? data,
-    PlatformMessageResponseCallback? callback,
-  ) {}
 }
diff --git a/testing/scenario_app/lib/src/scenarios.dart b/testing/scenario_app/lib/src/scenarios.dart
index 61c9437cb0ae5ff46f258cce25d0e4f6c903adf9..bcd2c0cd908b600c309c032cf9ad45e2ff1489f7 100644
--- a/testing/scenario_app/lib/src/scenarios.dart
+++ b/testing/scenario_app/lib/src/scenarios.dart
@@ -6,59 +6,74 @@ import 'dart:ui';
 
 import 'animated_color_square.dart';
 import 'bogus_font_text.dart';
+import 'darwin_app_extension_scenario.dart';
+import 'darwin_system_font.dart';
 import 'get_bitmap_scenario.dart';
 import 'initial_route_reply.dart';
 import 'locale_initialization.dart';
 import 'platform_view.dart';
 import 'poppable_screen.dart';
 import 'scenario.dart';
+import 'solid_blue.dart';
 import 'texture.dart';
 import 'touches_scenario.dart';
 
-typedef ScenarioFactory = Scenario Function(); // ignore: public_member_api_docs
+typedef _ScenarioFactory = Scenario Function(FlutterView view);
 
 int _viewId = 0;
 
-Map<String, ScenarioFactory> _scenarios = <String, ScenarioFactory>{
-  'animated_color_square': () => AnimatedColorSquareScenario(PlatformDispatcher.instance),
-  'locale_initialization': () => LocaleInitialization(PlatformDispatcher.instance),
-  'platform_view': () => PlatformViewScenario(PlatformDispatcher.instance, id: _viewId++),
-  'platform_view_no_overlay_intersection': () => PlatformViewNoOverlayIntersectionScenario(PlatformDispatcher.instance, id: _viewId++),
-  'platform_view_larger_than_display_size': () => PlatformViewLargerThanDisplaySize(PlatformDispatcher.instance, id: _viewId++),
-  'platform_view_partial_intersection': () => PlatformViewPartialIntersectionScenario(PlatformDispatcher.instance, id: _viewId++),
-  'platform_view_two_intersecting_overlays': () => PlatformViewTwoIntersectingOverlaysScenario(PlatformDispatcher.instance, id: _viewId++),
-  'platform_view_one_overlay_two_intersecting_overlays': () => PlatformViewOneOverlayTwoIntersectingOverlaysScenario(PlatformDispatcher.instance, id: _viewId++),
-  'platform_view_multiple_without_overlays': () => MultiPlatformViewWithoutOverlaysScenario(PlatformDispatcher.instance, firstId: _viewId++, secondId: _viewId++),
-  'platform_view_max_overlays': () => PlatformViewMaxOverlaysScenario(PlatformDispatcher.instance, id: _viewId++),
-  'platform_view_cliprect': () => PlatformViewClipRectScenario(PlatformDispatcher.instance, id: _viewId++),
-  'platform_view_cliprect_with_transform': () => PlatformViewClipRectWithTransformScenario(PlatformDispatcher.instance, id: _viewId++),
-  'platform_view_cliprrect': () => PlatformViewClipRRectScenario(PlatformDispatcher.instance, id: _viewId++),
-  'platform_view_large_cliprrect': () => PlatformViewLargeClipRRectScenario(PlatformDispatcher.instance, id: _viewId++),
-  'platform_view_cliprrect_with_transform': () => PlatformViewClipRRectWithTransformScenario(PlatformDispatcher.instance, id: _viewId++),
-  'platform_view_large_cliprrect_with_transform': () => PlatformViewLargeClipRRectWithTransformScenario(PlatformDispatcher.instance, id: _viewId++),
-  'platform_view_clippath': () => PlatformViewClipPathScenario(PlatformDispatcher.instance, id: _viewId++),
-  'platform_view_clippath_with_transform': () => PlatformViewClipPathWithTransformScenario(PlatformDispatcher.instance, id: _viewId++),
-  'platform_view_transform': () => PlatformViewTransformScenario(PlatformDispatcher.instance, id: _viewId++),
-  'platform_view_opacity': () => PlatformViewOpacityScenario(PlatformDispatcher.instance, id: _viewId++),
-  'platform_view_with_other_backdrop_filter': () => PlatformViewWithOtherBackDropFilter(PlatformDispatcher.instance, id: _viewId++),
-  'two_platform_views_with_other_backdrop_filter': () => TwoPlatformViewsWithOtherBackDropFilter(PlatformDispatcher.instance, firstId: _viewId++, secondId: _viewId++),
-  'platform_view_multiple': () => MultiPlatformViewScenario(PlatformDispatcher.instance, firstId: _viewId++, secondId: _viewId++),
-  'platform_view_multiple_background_foreground': () => MultiPlatformViewBackgroundForegroundScenario(PlatformDispatcher.instance, firstId: _viewId++, secondId: _viewId++),
-  'non_full_screen_flutter_view_platform_view': () => NonFullScreenFlutterViewPlatformViewScenario(PlatformDispatcher.instance, id: _viewId++),
-  'poppable_screen': () => PoppableScreenScenario(PlatformDispatcher.instance),
-  'platform_view_rotate': () => PlatformViewScenario(PlatformDispatcher.instance, id: _viewId++),
-  'platform_view_gesture_reject_eager': () => PlatformViewForTouchIOSScenario(PlatformDispatcher.instance,  id: _viewId++, accept: false),
-  'platform_view_gesture_accept': () => PlatformViewForTouchIOSScenario(PlatformDispatcher.instance, id: _viewId++, accept: true),
-  'platform_view_gesture_reject_after_touches_ended': () => PlatformViewForTouchIOSScenario(PlatformDispatcher.instance, id: _viewId++, accept: false, rejectUntilTouchesEnded: true),
-  'platform_view_scrolling_under_widget':()=>PlatformViewScrollingUnderWidget(PlatformDispatcher.instance, firstPlatformViewId: _viewId++, lastPlatformViewId: _viewId+=16),
-  'tap_status_bar': () => TouchesScenario(PlatformDispatcher.instance),
-  'initial_route_reply': () => InitialRouteReply(PlatformDispatcher.instance),
-  'platform_view_with_continuous_texture': () => PlatformViewWithContinuousTexture(PlatformDispatcher.instance, id: _viewId++),
-  'bogus_font_text': () => BogusFontText(PlatformDispatcher.instance),
-  'spawn_engine_works' : () => BogusFontText(PlatformDispatcher.instance),
-  'pointer_events': () => TouchesScenario(PlatformDispatcher.instance),
-  'display_texture': () => DisplayTexture(PlatformDispatcher.instance),
-  'get_bitmap': () => GetBitmapScenario(PlatformDispatcher.instance),
+Map<String, _ScenarioFactory> _scenarios = <String, _ScenarioFactory>{
+  'animated_color_square': (FlutterView view) => AnimatedColorSquareScenario(view),
+  'solid_blue': (FlutterView view) => SolidBlueScenario(view),
+  'locale_initialization': (FlutterView view) => LocaleInitialization(view),
+  'platform_view': (FlutterView view) => PlatformViewScenario(view, id: _viewId++),
+  'platform_view_no_overlay_intersection': (FlutterView view) => PlatformViewNoOverlayIntersectionScenario(view, id: _viewId++),
+  'platform_view_larger_than_display_size': (FlutterView view) => PlatformViewLargerThanDisplaySize(view, id: _viewId++),
+  'platform_view_partial_intersection': (FlutterView view) => PlatformViewPartialIntersectionScenario(view, id: _viewId++),
+  'platform_view_two_intersecting_overlays': (FlutterView view) => PlatformViewTwoIntersectingOverlaysScenario(view, id: _viewId++),
+  'platform_view_one_overlay_two_intersecting_overlays': (FlutterView view) => PlatformViewOneOverlayTwoIntersectingOverlaysScenario(view, id: _viewId++),
+  'platform_view_multiple_without_overlays': (FlutterView view) => MultiPlatformViewWithoutOverlaysScenario(view, firstId: _viewId++, secondId: _viewId++),
+  'platform_view_max_overlays': (FlutterView view) => PlatformViewMaxOverlaysScenario(view, id: _viewId++),
+  'platform_view_surrounding_layers_fractional_coordinate': (FlutterView view) => PlatformViewSurroundingLayersFractionalCoordinateScenario(view, id: _viewId++),
+  'platform_view_partial_intersection_fractional_coordinate': (FlutterView view) => PlatformViewPartialIntersectionFractionalCoordinateScenario(view, id: _viewId++),
+  'platform_view_cliprect': (FlutterView view) => PlatformViewClipRectScenario(view, id: _viewId++),
+  'platform_view_cliprect_with_transform': (FlutterView view) => PlatformViewClipRectWithTransformScenario(view, id: _viewId++),
+  'platform_view_cliprect_after_moved': (FlutterView view) => PlatformViewClipRectAfterMovedScenario(view, id: _viewId++),
+  'platform_view_cliprrect': (FlutterView view) => PlatformViewClipRRectScenario(view, id: _viewId++),
+  'platform_view_large_cliprrect': (FlutterView view) => PlatformViewLargeClipRRectScenario(view, id: _viewId++),
+  'platform_view_cliprrect_with_transform': (FlutterView view) => PlatformViewClipRRectWithTransformScenario(view, id: _viewId++),
+  'platform_view_large_cliprrect_with_transform': (FlutterView view) => PlatformViewLargeClipRRectWithTransformScenario(view, id: _viewId++),
+  'platform_view_clippath': (FlutterView view) => PlatformViewClipPathScenario(view, id: _viewId++),
+  'platform_view_clippath_with_transform': (FlutterView view) => PlatformViewClipPathWithTransformScenario(view, id: _viewId++),
+  'platform_view_transform': (FlutterView view) => PlatformViewTransformScenario(view, id: _viewId++),
+  'platform_view_opacity': (FlutterView view) => PlatformViewOpacityScenario(view, id: _viewId++),
+  'platform_view_with_other_backdrop_filter': (FlutterView view) => PlatformViewWithOtherBackDropFilter(view, id: _viewId++),
+  'two_platform_views_with_other_backdrop_filter': (FlutterView view) => TwoPlatformViewsWithOtherBackDropFilter(view, firstId: _viewId++, secondId: _viewId++),
+  'platform_view_with_negative_backdrop_filter': (FlutterView view) => PlatformViewWithNegativeBackDropFilter(view, id: _viewId++),
+  'platform_view_multiple': (FlutterView view) => MultiPlatformViewScenario(view, firstId: _viewId++, secondId: _viewId++),
+  'platform_view_multiple_background_foreground': (FlutterView view) => MultiPlatformViewBackgroundForegroundScenario(view, firstId: _viewId++, secondId: _viewId++),
+  'non_full_screen_flutter_view_platform_view': (FlutterView view) => NonFullScreenFlutterViewPlatformViewScenario(view, id: _viewId++),
+  'poppable_screen': (FlutterView view) => PoppableScreenScenario(view),
+  'platform_view_rotate': (FlutterView view) => PlatformViewScenario(view, id: _viewId++),
+  'platform_view_gesture_reject_eager': (FlutterView view) => PlatformViewForTouchIOSScenario(view,  id: _viewId++, accept: false),
+  'platform_view_gesture_accept': (FlutterView view) => PlatformViewForTouchIOSScenario(view, id: _viewId++, accept: true),
+  'platform_view_gesture_reject_after_touches_ended': (FlutterView view) => PlatformViewForTouchIOSScenario(view, id: _viewId++, accept: false, rejectUntilTouchesEnded: true),
+  'platform_view_gesture_accept_with_overlapping_platform_views': (FlutterView view) => PlatformViewForOverlappingPlatformViewsScenario(view, foregroundId: _viewId++, backgroundId: _viewId++),
+  'platform_view_scrolling_under_widget':(FlutterView view) => PlatformViewScrollingUnderWidget(view, firstPlatformViewId: _viewId++, lastPlatformViewId: _viewId+=16),
+  'platform_views_with_clips_scrolling':(FlutterView view) => PlatformViewsWithClipsScrolling(view, firstPlatformViewId: _viewId++, lastPlatformViewId: _viewId+=16),
+  'two_platform_view_clip_rect': (FlutterView view) => TwoPlatformViewClipRect(view, firstId: _viewId++, secondId: _viewId++),
+  'two_platform_view_clip_rrect': (FlutterView view) => TwoPlatformViewClipRRect(view, firstId: _viewId++, secondId: _viewId++),
+  'two_platform_view_clip_path': (FlutterView view) => TwoPlatformViewClipPath(view, firstId: _viewId++, secondId: _viewId++),
+  'tap_status_bar': (FlutterView view) => TouchesScenario(view),
+  'initial_route_reply': (FlutterView view) => InitialRouteReply(view),
+  'platform_view_with_continuous_texture': (FlutterView view) => PlatformViewWithContinuousTexture(view, id: _viewId++),
+  'bogus_font_text': (FlutterView view) => BogusFontText(view),
+  'spawn_engine_works' : (FlutterView view) => BogusFontText(view),
+  'pointer_events': (FlutterView view) => TouchesScenario(view),
+  'display_texture': (FlutterView view) => DisplayTexture(view),
+  'get_bitmap': (FlutterView view) => GetBitmapScenario(view),
+  'app_extension': (FlutterView view) => DarwinAppExtensionScenario(view),
+  'darwin_system_font': (FlutterView view) => DarwinSystemFont(view),
 };
 
 Map<String, dynamic> _currentScenarioParams = <String, dynamic>{};
@@ -67,7 +82,7 @@ Scenario? _currentScenarioInstance;
 
 /// Loads an scenario.
 /// The map must contain a `name` entry, which equals to the name of the scenario.
-void loadScenario(Map<String, dynamic> scenario) {
+void loadScenario(Map<String, dynamic> scenario, FlutterView view) {
   final String scenarioName = scenario['name'] as String;
   assert(_scenarios[scenarioName] != null);
   _currentScenarioParams = scenario;
@@ -76,8 +91,8 @@ void loadScenario(Map<String, dynamic> scenario) {
     _currentScenarioInstance!.unmount();
   }
 
-  _currentScenarioInstance = _scenarios[scenario['name']]!();
-  window.scheduleFrame();
+  _currentScenarioInstance = _scenarios[scenario['name']]!(view);
+  view.platformDispatcher.scheduleFrame();
   print('Loading scenario $scenarioName');
 }
 
diff --git a/testing/scenario_app/lib/src/solid_blue.dart b/testing/scenario_app/lib/src/solid_blue.dart
new file mode 100644
index 0000000000000000000000000000000000000000..ac94311ebcd3c998368ba5d8f74097a43056464e
--- /dev/null
+++ b/testing/scenario_app/lib/src/solid_blue.dart
@@ -0,0 +1,32 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:ui';
+
+import 'scenario.dart';
+
+/// Fills the screen with a solid blue color.
+class SolidBlueScenario extends Scenario {
+  /// Creates the SolidBlue scenario.
+  SolidBlueScenario(super.view);
+
+  @override
+  void onBeginFrame(Duration duration) {
+    final SceneBuilder builder = SceneBuilder();
+    final PictureRecorder recorder = PictureRecorder();
+    final Canvas canvas = Canvas(recorder);
+
+    canvas.drawPaint(Paint()..color = const Color(0xFF0000FF));
+    final Picture picture = recorder.endRecording();
+
+    builder.addPicture(
+      Offset.zero,
+      picture,
+      willChangeHint: true,
+    );
+    final Scene scene = builder.build();
+    view.render(scene);
+    scene.dispose();
+  }
+}
diff --git a/testing/scenario_app/lib/src/texture.dart b/testing/scenario_app/lib/src/texture.dart
index 162fb968d9b7d876b3c1a73896acf5b5721be020..c03628cb7df220f3d87c17b39a22d9c121e49f79 100644
--- a/testing/scenario_app/lib/src/texture.dart
+++ b/testing/scenario_app/lib/src/texture.dart
@@ -11,10 +11,7 @@ import 'scenarios.dart';
 /// Displays a platform texture with the given width and height.
 class DisplayTexture extends Scenario {
   /// Creates the DisplayTexture scenario.
-  ///
-  /// The [dispatcher] parameter must not be null.
-  DisplayTexture(PlatformDispatcher dispatcher)
-      : super(dispatcher);
+  DisplayTexture(super.view);
 
   int get _textureId => scenarioParams['texture_id'] as int;
   double get _textureWidth =>
@@ -28,18 +25,18 @@ class DisplayTexture extends Scenario {
     builder.addTexture(
       _textureId,
       offset: Offset(
-        (window.physicalSize.width / 2.0) - (_textureWidth / 2.0),
+        (view.physicalSize.width / 2.0) - (_textureWidth / 2.0),
         0.0,
       ),
       width: _textureWidth,
       height: _textureHeight,
     );
     final Scene scene = builder.build();
-    window.render(scene);
+    view.render(scene);
     scene.dispose();
 
     sendJsonMessage(
-      dispatcher: dispatcher,
+      dispatcher: view.platformDispatcher,
       channel: 'display_data',
       json: <String, dynamic>{
         'data': 'ready',
diff --git a/testing/scenario_app/lib/src/touches_scenario.dart b/testing/scenario_app/lib/src/touches_scenario.dart
index 00d11da79fb9a87c078284a20f88e6608f843bfe..139f2cf6df8a7a08c34069a82a1a77a1018eb9f7 100644
--- a/testing/scenario_app/lib/src/touches_scenario.dart
+++ b/testing/scenario_app/lib/src/touches_scenario.dart
@@ -10,7 +10,7 @@ import 'scenario.dart';
 /// A scenario that sends back messages when touches are received.
 class TouchesScenario extends Scenario {
   /// Constructor for `TouchesScenario`.
-  TouchesScenario(PlatformDispatcher dispatcher) : super(dispatcher);
+  TouchesScenario(super.view);
 
   final Map<int, int> _knownDevices = <int, int>{};
   int _sequenceNo = 0;
@@ -19,7 +19,7 @@ class TouchesScenario extends Scenario {
   void onBeginFrame(Duration duration) {
     // It is necessary to render frames for touch events to work properly on iOS
     final Scene scene = SceneBuilder().build();
-    window.render(scene);
+    view.render(scene);
     scene.dispose();
   }
 
@@ -29,7 +29,7 @@ class TouchesScenario extends Scenario {
       final int deviceId =
           _knownDevices.putIfAbsent(datum.device, () => _knownDevices.length);
       sendJsonMessage(
-        dispatcher: dispatcher,
+        dispatcher: view.platformDispatcher,
         channel: 'display_data',
         json: <String, dynamic>{
           'data': '$_sequenceNo,${datum.change},device=$deviceId,buttons=${datum.buttons},signalKind=${datum.signalKind}',
diff --git a/testing/scenario_app/pubspec.yaml b/testing/scenario_app/pubspec.yaml
index 00b4a2b1cb1b709a11539ee408f53c7ef4122575..d192027834d0ba2e41da351dc295c8925387cd20 100644
--- a/testing/scenario_app/pubspec.yaml
+++ b/testing/scenario_app/pubspec.yaml
@@ -5,7 +5,7 @@
 name: scenario_app
 publish_to: none
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: ^3.3.0
 
 # Do not add any dependencies that require more than what is provided in
 # //third_party/dart/pkg, //third_party/dart/third_party/pkg, or
@@ -16,34 +16,52 @@ environment:
 # relative to this directory into //third_party/dart, or //third_party/pkg
 dependencies:
   args: any
+  dir_contents_diff: any
+  engine_repo_tools: any
+  meta: any
   path: any
   process: any
   sky_engine: any
   vector_math: any
   skia_gold_client: any
 
+dev_dependencies:
+  litetest: any
+
 dependency_overrides:
   args:
     path: ../../../third_party/dart/third_party/pkg/args
+  async_helper:
+    path: ../../../third_party/dart/pkg/async_helper
   collection:
     path: ../../../third_party/dart/third_party/pkg/collection
   crypto:
     path: ../../../third_party/dart/third_party/pkg/crypto
+  dir_contents_diff:
+    path: ../../tools/dir_contents_diff
+  engine_repo_tools:
+    path: ../../tools/pkg/engine_repo_tools
+  expect:
+    path: ../../../third_party/dart/pkg/expect
   file:
-    path: ../../../third_party/pkg/file/packages/file
+    path: ../../../third_party/dart/third_party/pkg/file/packages/file
+  litetest:
+    path: ../litetest
   meta:
     path: ../../../third_party/dart/pkg/meta
   path:
     path: ../../../third_party/dart/third_party/pkg/path
   platform:
-    path: ../../../third_party/pkg/platform
+    path: ../../third_party/pkg/platform
   process:
-    path: ../../../third_party/pkg/process
+    path: ../../third_party/pkg/process
   skia_gold_client:
     path: ../../testing/skia_gold_client
+  smith:
+    path: ../../../third_party/dart/pkg/smith
   sky_engine:
     path: ../../sky/packages/sky_engine
   typed_data:
     path: ../../../third_party/dart/third_party/pkg/typed_data
   vector_math:
-    path: ../../../third_party/pkg/vector_math
+    path: ../../third_party/pkg/vector_math
diff --git a/testing/scenario_app/run_ios_tests.sh b/testing/scenario_app/run_ios_tests.sh
index 74b32a0d233ca0fbcf6f828c2b8092845a0c6452..ed040b16d1b47e47d8a90f729ec506c8c9c27418 100755
--- a/testing/scenario_app/run_ios_tests.sh
+++ b/testing/scenario_app/run_ios_tests.sh
@@ -27,7 +27,11 @@ function follow_links() (
 SCRIPT_DIR=$(follow_links "$(dirname -- "${BASH_SOURCE[0]}")")
 SRC_DIR="$(cd "$SCRIPT_DIR/../../.."; pwd -P)"
 
-FLUTTER_ENGINE="ios_debug_sim_unopt"
+if uname -m | grep "arm64"; then
+  FLUTTER_ENGINE="ios_debug_sim_unopt_arm64"
+else
+  FLUTTER_ENGINE="ios_debug_sim_unopt"
+fi
 
 if [[ $# -eq 1 ]]; then
   FLUTTER_ENGINE="$1"
@@ -37,25 +41,103 @@ fi
 # Can also be set via Simulator app Device > Rotate Device Automatically
 defaults write com.apple.iphonesimulator RotateWindowWhenSignaledByGuest -int 1
 
-cd $SRC_DIR/out/$FLUTTER_ENGINE/scenario_app/Scenarios
+SCENARIO_PATH=$SRC_DIR/out/$FLUTTER_ENGINE/scenario_app/Scenarios
+pushd .
+cd $SCENARIO_PATH
+
+RESULT_BUNDLE_FOLDER=$(mktemp -d ios_scenario_xcresult_XXX)
+RESULT_BUNDLE_PATH="${SCENARIO_PATH}/${RESULT_BUNDLE_FOLDER}"
+
+# Zip and upload xcresult to luci.
+# First parameter ($1) is the zip output name.
+zip_and_upload_xcresult_to_luci () {
+  # We don't want the zip to contain the abusolute path,
+  # so use relative path (./$RESULT_BUNDLE_FOLDER) instead.
+  zip -q -r $1 "./$RESULT_BUNDLE_FOLDER"
+  mv -f $1 $FLUTTER_TEST_OUTPUTS_DIR
+  exit 1
+}
+
+readonly DEVICE_NAME="iPhone SE (3rd generation)"
+readonly DEVICE=com.apple.CoreSimulator.SimDeviceType.iPhone-SE-3rd-generation
+readonly OS_RUNTIME=com.apple.CoreSimulator.SimRuntime.iOS-17-0
+readonly OS="17.0"
+
+# Delete any existing devices named "iPhone SE (3rd generation)". Having more
+# than one may cause issues when builds target the device.
+echo "Deleting any existing devices names $DEVICE_NAME..."
+RESULT=0
+while [[ $RESULT == 0 ]]; do
+    xcrun simctl delete "$DEVICE_NAME" || RESULT=1
+    if [ $RESULT == 0 ]; then
+        echo "Deleted $DEVICE_NAME"
+    fi
+done
+echo ""
+
+echo "Creating $DEVICE_NAME $DEVICE $OS_RUNTIME ..."
+xcrun simctl create "$DEVICE_NAME" "$DEVICE" "$OS_RUNTIME"
+echo ""
 
 echo "Running simulator tests with Skia"
 echo ""
 
-set -o pipefail && xcodebuild -sdk iphonesimulator \
+if set -o pipefail && xcodebuild -sdk iphonesimulator \
   -scheme Scenarios \
-  -destination 'platform=iOS Simulator,OS=16.0,name=iPhone 8' \
+  -resultBundlePath "$RESULT_BUNDLE_PATH/ios_scenario.xcresult" \
+  -destination "platform=iOS Simulator,OS=$OS,name=$DEVICE_NAME" \
   clean test \
-  FLUTTER_ENGINE="$FLUTTER_ENGINE"
+  FLUTTER_ENGINE="$FLUTTER_ENGINE"; then
+  echo "test success."
+else
+  echo "test failed."
+  zip_and_upload_xcresult_to_luci "ios_scenario_xcresult.zip"
+fi
+rm -rf $RESULT_BUNDLE_PATH
 
 echo "Running simulator tests with Impeller"
 echo ""
 
 # Skip testFontRenderingWhenSuppliedWithBogusFont: https://github.com/flutter/flutter/issues/113250
-set -o pipefail && xcodebuild -sdk iphonesimulator \
+# Skip golden tests that use software rendering: https://github.com/flutter/flutter/issues/131888
+if set -o pipefail && xcodebuild -sdk iphonesimulator \
   -scheme Scenarios \
-  -destination 'platform=iOS Simulator,OS=16.0,name=iPhone 8' \
+  -resultBundlePath "$RESULT_BUNDLE_PATH/ios_scenario.xcresult" \
+  -destination "platform=iOS Simulator,OS=$OS,name=$DEVICE_NAME" \
   clean test \
   FLUTTER_ENGINE="$FLUTTER_ENGINE" \
-  -skip-testing "ScenariosUITests/BogusFontTextTest/testFontRenderingWhenSuppliedWithBogusFont" \
-  INFOPLIST_FILE="Scenarios/Info_Impeller.plist" # Plist with FLTEnableImpeller=YES
+  -skip-testing ScenariosUITests/MultiplePlatformViewsBackgroundForegroundTest/testPlatformView \
+  -skip-testing ScenariosUITests/MultiplePlatformViewsTest/testPlatformView \
+  -skip-testing ScenariosUITests/NonFullScreenFlutterViewPlatformViewUITests/testPlatformView \
+  -skip-testing ScenariosUITests/PlatformViewMutationClipPathTests/testPlatformView \
+  -skip-testing ScenariosUITests/PlatformViewMutationClipPathWithTransformTests/testPlatformView \
+  -skip-testing ScenariosUITests/PlatformViewMutationClipRectAfterMovedTests/testPlatformView \
+  -skip-testing ScenariosUITests/PlatformViewMutationClipRectTests/testPlatformView \
+  -skip-testing ScenariosUITests/PlatformViewMutationClipRectWithTransformTests/testPlatformView \
+  -skip-testing ScenariosUITests/PlatformViewMutationClipRRectTests/testPlatformView \
+  -skip-testing ScenariosUITests/PlatformViewMutationClipRRectWithTransformTests/testPlatformView \
+  -skip-testing ScenariosUITests/PlatformViewMutationLargeClipRRectTests/testPlatformView \
+  -skip-testing ScenariosUITests/PlatformViewMutationLargeClipRRectWithTransformTests/testPlatformView \
+  -skip-testing ScenariosUITests/PlatformViewMutationOpacityTests/testPlatformView \
+  -skip-testing ScenariosUITests/PlatformViewMutationTransformTests/testPlatformView \
+  -skip-testing ScenariosUITests/PlatformViewRotation/testPlatformView \
+  -skip-testing ScenariosUITests/PlatformViewUITests/testPlatformView \
+  -skip-testing ScenariosUITests/PlatformViewWithNegativeOtherBackDropFilterTests/testPlatformView \
+  -skip-testing ScenariosUITests/PlatformViewWithOtherBackdropFilterTests/testPlatformView \
+  -skip-testing ScenariosUITests/RenderingSelectionTest/testSoftwareRendering \
+  -skip-testing ScenariosUITests/TwoPlatformViewClipPathTests/testPlatformView \
+  -skip-testing ScenariosUITests/TwoPlatformViewClipRectTests/testPlatformView \
+  -skip-testing ScenariosUITests/TwoPlatformViewClipRRectTests/testPlatformView \
+  -skip-testing ScenariosUITests/TwoPlatformViewsWithOtherBackDropFilterTests/testPlatformView \
+  -skip-testing ScenariosUITests/UnobstructedPlatformViewTests/testMultiplePlatformViewsWithOverlays \
+  # Plist with FLTEnableImpeller=YES, all projects in the workspace requires this file.
+  # For example, FlutterAppExtensionTestHost has a dummy file under the below directory.
+  INFOPLIST_FILE="Scenarios/Info_Impeller.plist"; then
+  echo "test success."
+else
+  echo "test failed."
+  zip_and_upload_xcresult_to_luci "ios_scenario_impeller_xcresult.zip"
+fi
+rm -rf $RESULT_BUNDLE_PATH
+
+popd
diff --git a/testing/scenario_app/test/adb_log_filter_test.dart b/testing/scenario_app/test/adb_log_filter_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..c1e573157f15d6d9bce80ba81098a29ea2bf1482
--- /dev/null
+++ b/testing/scenario_app/test/adb_log_filter_test.dart
@@ -0,0 +1,128 @@
+import 'package:litetest/litetest.dart';
+
+import '../bin/utils/adb_logcat_filtering.dart';
+import 'src/fake_adb_logcat.dart';
+
+void main() {
+  /// Simulates the filtering of logcat output [lines].
+  Iterable<String> filter(Iterable<String> lines, {int? filterProcessId}) {
+    if (lines.isEmpty) {
+      throw StateError('No log lines to filter. This is unexpected.');
+    }
+    return lines.where((String line) {
+      final AdbLogLine? logLine = AdbLogLine.tryParse(line);
+      if (logLine == null) {
+        throw StateError('Invalid log line: $line');
+      }
+      final bool isVerbose = logLine.isVerbose(filterProcessId: filterProcessId?.toString());
+      return !isVerbose;
+    });
+  }
+
+  test('should always retain fatal logs', () {
+    final FakeAdbLogcat logcat = FakeAdbLogcat();
+    final FakeAdbProcess process = logcat.process();
+    process.fatal('Something', 'A bad thing happened');
+
+    final Iterable<String> filtered = filter(logcat.drain());
+    expect(filtered, hasLength(1));
+    expect(filtered.first, contains('Something: A bad thing happened'));
+  });
+
+  test('should never retain debug logs', () {
+    final FakeAdbLogcat logcat = FakeAdbLogcat();
+    final FakeAdbProcess process = logcat.process();
+    final String tag = AdbLogLine.knownNoiseTags.first;
+    process.debug(tag, 'A debug message');
+
+    final Iterable<String> filtered = filter(logcat.drain());
+    expect(filtered, isEmpty);
+  });
+
+  test('should never retain logs from known "noise" tags', () {
+    final FakeAdbLogcat logcat = FakeAdbLogcat();
+    final FakeAdbProcess process = logcat.process();
+    final String tag = AdbLogLine.knownNoiseTags.first;
+    process.info(tag, 'Flutter flutter flutter');
+
+    final Iterable<String> filtered = filter(logcat.drain());
+    expect(filtered, isEmpty);
+  });
+
+  test('should always retain logs from known "useful" tags', () {
+    final FakeAdbLogcat logcat = FakeAdbLogcat();
+    final FakeAdbProcess process = logcat.process();
+    final String tag = AdbLogLine.knownUsefulTags.first;
+    process.info(tag, 'A useful message');
+
+    final Iterable<String> filtered = filter(logcat.drain());
+    expect(filtered, hasLength(1));
+    expect(filtered.first, contains('$tag: A useful message'));
+  });
+
+  test('if a process ID is passed, retain the log', () {
+    final FakeAdbLogcat logcat = FakeAdbLogcat();
+    final FakeAdbProcess process = logcat.process();
+    process.info('SomeTag', 'A message');
+
+    final Iterable<String> filtered = filter(logcat.drain(), filterProcessId: process.processId);
+    expect(filtered, hasLength(1));
+    expect(filtered.first, contains('SomeTag: A message'));
+  });
+
+  test('even if a process ID passed, retain logs containing "flutter"', () {
+    final FakeAdbLogcat logcat = FakeAdbLogcat();
+    final FakeAdbProcess process = logcat.process();
+    process.info('SomeTag', 'A message with flutter');
+
+    final Iterable<String> filtered = filter(logcat.drain(), filterProcessId: process.processId);
+    expect(filtered, hasLength(1));
+    expect(filtered.first, contains('SomeTag: A message with flutter'));
+  });
+
+  test('should retain E-level flags from known "useful" error tags', () {
+    final FakeAdbLogcat logcat = FakeAdbLogcat();
+    final FakeAdbProcess process = logcat.process();
+    final String tag = AdbLogLine.knownUsefulErrorTags.first;
+    process.error(tag, 'An error message');
+    process.info(tag, 'An info message');
+
+    final Iterable<String> filtered = filter(logcat.drain());
+    expect(filtered, hasLength(1));
+    expect(filtered.first, contains('$tag: An error message'));
+  });
+
+  test('should filter out error logs from unimportant processes', () {
+    final FakeAdbLogcat logcat = FakeAdbLogcat();
+    final FakeAdbProcess process = logcat.process();
+
+    // I hate this one.
+    const String tag = 'gs.intelligence';
+    process.error(tag, 'No package ID ff found for resource ID 0xffffffff.');
+
+    final Iterable<String> filtered = filter(logcat.drain());
+    expect(filtered, isEmpty);
+  });
+
+  test('should filter the flutter-launched process, not just any process', () {
+    final FakeAdbLogcat logcat = FakeAdbLogcat();
+
+    final FakeAdbProcess device = logcat.process();
+    final FakeAdbProcess unrelated = logcat.process();
+    final FakeAdbProcess flutter = logcat.process();
+
+    device.info(AdbLogLine.activityManagerTag, 'Start proc ${unrelated.processId}:com.example.unrelated');
+
+    List<String> rawLines = logcat.drain();
+    expect(rawLines, hasLength(1));
+    AdbLogLine parsedLogLine = AdbLogLine.tryParse(rawLines.single)!;
+    expect(parsedLogLine.tryParseProcess(), isNull);
+
+    device.info(AdbLogLine.activityManagerTag, 'Start proc ${flutter.processId}:${AdbLogLine.flutterProcessName}');
+
+    rawLines = logcat.drain();
+    expect(rawLines, hasLength(1));
+    parsedLogLine = AdbLogLine.tryParse(rawLines.single)!;
+    expect(parsedLogLine.tryParseProcess(), '${flutter.processId}');
+  });
+}
diff --git a/testing/scenario_app/test/src/fake_adb_logcat.dart b/testing/scenario_app/test/src/fake_adb_logcat.dart
new file mode 100644
index 0000000000000000000000000000000000000000..a96d7db8eb689a97d69b687cf955e749bca15c62
--- /dev/null
+++ b/testing/scenario_app/test/src/fake_adb_logcat.dart
@@ -0,0 +1,145 @@
+import '../../bin/utils/adb_logcat_filtering.dart';
+
+/// Simulates the output of `adb logcat`, i.e. for testing.
+///
+/// ## Example
+///
+/// ```dart
+/// final FakeAdbLogcat logcat = FakeAdbLogcat();
+/// final FakeAdbProcess process = logcat.withProcess();
+/// process.info('ActivityManager', 'Force stopping dev.flutter.scenarios appid=10226 user=0: start instr');
+/// // ...
+/// final List<String> logLines = logcat.drain();
+/// // ...
+/// ```
+final class FakeAdbLogcat {
+  final List<String> _lines = <String>[];
+  final Map<int, FakeAdbProcess> _processById = <int, FakeAdbProcess>{};
+
+  /// The current date and time.
+  DateTime _now = DateTime.now();
+
+  /// Returns the date and time for the next log line.
+  ///
+  /// Time is progressed by 1 second each time this method is called.
+  DateTime _progressTime({Duration by = const Duration(seconds: 1)}) {
+    _now = _now.add(by);
+    return _now;
+  }
+
+  /// `02-22 13:54:39.839`
+  static String _formatTime(DateTime time) {
+    return '${time.month.toString().padLeft(2, '0')}-'
+        '${time.day.toString().padLeft(2, '0')} '
+        '${time.hour.toString().padLeft(2, '0')}:'
+        '${time.minute.toString().padLeft(2, '0')}:'
+        '${time.second.toString().padLeft(2, '0')}.'
+        '${time.millisecond.toString().padLeft(3, '0')}';
+  }
+
+  void _write({
+    required int processId,
+    required int threadId,
+    required String severity,
+    required String tag,
+    required String message,
+  }) {
+    final DateTime time = _progressTime();
+    final String line = '${_formatTime(time)}   $processId  $threadId $severity $tag: $message';
+    assert(AdbLogLine.tryParse(line) != null, 'Invalid log line: $line');
+    _lines.add(line);
+  }
+
+  /// Drains the stored log lines and returns them.
+  List<String> drain() {
+    final List<String> result = List<String>.from(_lines);
+    _lines.clear();
+    return result;
+  }
+
+  /// Creates a new process writing to this logcat.
+  ///
+  /// Optionally specify a [processId] to use for the process, otherwise a
+  /// simple default is used (sequential numbers starting from 1000).
+  FakeAdbProcess process({int? processId}) {
+    processId ??= 1000 + _processById.length;
+    return _processById.putIfAbsent(
+      processId,
+      () => _createProcess(processId: processId!),
+    );
+  }
+
+  FakeAdbProcess _createProcess({required int processId}) {
+    return FakeAdbProcess._(this, processId: processId);
+  }
+}
+
+/// A stateful fixture that represents a fake process writing to `adb logcat`.
+///
+/// See [FakeAdbLogcat.process] for how to create this fixture.
+final class FakeAdbProcess {
+  const FakeAdbProcess._(
+    this._logcat, {
+    required this.processId,
+  });
+
+  final FakeAdbLogcat _logcat;
+
+  /// The process ID of this process.
+  final int processId;
+
+  /// Writes a debug log message.
+  void debug(String tag, String message, {int threadId = 1}) {
+    _logcat._write(
+      processId: processId,
+      threadId: threadId,
+      severity: 'D',
+      tag: tag,
+      message: message,
+    );
+  }
+
+  /// Writes an info log message.
+  void info(String tag, String message, {int threadId = 1}) {
+    _logcat._write(
+      processId: processId,
+      threadId: threadId,
+      severity: 'I',
+      tag: tag,
+      message: message,
+    );
+  }
+
+  /// Writes a warning log message.
+  void warning(String tag, String message, {int threadId = 1}) {
+    _logcat._write(
+      processId: processId,
+      threadId: threadId,
+      severity: 'W',
+      tag: tag,
+      message: message,
+    );
+  }
+
+  /// Writes an error log message.
+  void error(String tag, String message, {int threadId = 1}) {
+    _logcat._write(
+      processId: processId,
+      threadId: threadId,
+      severity: 'E',
+      tag: tag,
+      message: message,
+    );
+  }
+
+  /// Writes a fatal log message.
+  void fatal(String tag, String message, {int threadId = 1}) {
+    _logcat._write(
+      processId: processId,
+      threadId: threadId,
+      severity: 'F',
+      tag: tag,
+      message: message,
+    );
+  }
+}
diff --git a/testing/scenario_app/tool/logcat_reader.dart b/testing/scenario_app/tool/logcat_reader.dart
new file mode 100644
index 0000000000000000000000000000000000000000..909204a1af3421c60a84388e2af1e33cd2803eb8
--- /dev/null
+++ b/testing/scenario_app/tool/logcat_reader.dart
@@ -0,0 +1,43 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io' as io;
+
+// It's bad to import a file from `bin` into `tool`.
+// However this tool is not very important, so delete it if necessary.
+import '../bin/utils/adb_logcat_filtering.dart';
+
+/// A tiny tool to read saved `adb logcat` output and perform some analysis.
+///
+/// This tool is not meant to be a full-fledged logcat reader. It's just a
+/// simple tool that uses the [AdbLogLine] extension type to parse results of
+/// `adb logcat` and explain what log tag names are most common.
+void main(List<String> args) {
+  if (args case [final String path]) {
+    final List<AdbLogLine> parsed = io.File(path)
+        .readAsLinesSync()
+        .map(AdbLogLine.tryParse)
+        .whereType<AdbLogLine>()
+          // Filter out all debug logs.
+        .where((AdbLogLine line) => line.severity != 'D')
+        .toList();
+
+    final Map<String, int> tagCounts = <String, int>{};
+    for (final AdbLogLine line in parsed) {
+      tagCounts[line.name] = (tagCounts[line.name] ?? 0) + 1;
+    }
+
+    // Print in order of most common to least common.
+    final List<MapEntry<String, int>> sorted = tagCounts.entries.toList()
+      ..sort((MapEntry<String, int> a, MapEntry<String, int> b) => b.value.compareTo(a.value));
+    for (final MapEntry<String, int> entry in sorted) {
+      print("'${entry.key}', // ${entry.value}");
+    }
+
+    return;
+  }
+
+  print('Usage: logcat_reader.dart <path-to-logcat-output>');
+  io.exitCode = 1;
+}
diff --git a/testing/skia_gold_client/README.md b/testing/skia_gold_client/README.md
index c9d6a8ce564983d2be1f4a433b4335bb4bf17db6..8c4c68e19985c5e936312f5cf48979abbd572789 100644
--- a/testing/skia_gold_client/README.md
+++ b/testing/skia_gold_client/README.md
@@ -12,18 +12,32 @@ The web UI is available on https://flutter-engine-gold.skia.org/.
 1. In `.ci.yaml`, ensure that the task has a dependency on `goldctl`:
 
 ```yaml
-  dependencies: [{"dependency": "goldctl"}]
+dependencies: [{ "dependency": "goldctl" }]
 ```
 
-2. Add dependency in `pubspec.yaml`:
+2. In the builder `.json` file, ensure the drone has a dependency on `goldctl`:
+
+```yaml
+            "dependencies": [
+                {
+                    "dependency": "goldctl",
+                    "version": "git_revision:<sha>"
+                }
+            ],
+```
+
+3. Add dependency in `pubspec.yaml`:
 
 ```yaml
 dependencies:
+  # needed for skia_gold_client to avoid a cache miss.
+  engine_repo_tools:
+    path: <relative-path>/tools/pkg/engine_repo_tools
   skia_gold_client:
     path: <relative-path>/testing/skia_gold_client
 ```
 
-3. Use the client:
+4. Use the client:
 
 ```dart
 import 'package:skia_gold_client/skia_gold_client.dart';
@@ -36,7 +50,7 @@ Future<void> main() {
     );
 
     try {
-        if (isSkiaGoldClientAvailable) {
+        if (SkiaGoldClient.isAvailable()) {
             await client.auth();
 
             await client.addImg(
diff --git a/testing/skia_gold_client/lib/skia_gold_client.dart b/testing/skia_gold_client/lib/skia_gold_client.dart
index 793560e9021e36ee7ad68c6dd2a067021b0714ea..e9d28ff5042863f31ae66db5e298a4f0548b3b39 100644
--- a/testing/skia_gold_client/lib/skia_gold_client.dart
+++ b/testing/skia_gold_client/lib/skia_gold_client.dart
@@ -3,12 +3,18 @@
 // found in the LICENSE file.
 
 import 'dart:convert';
-import 'dart:io';
+import 'dart:io' as io;
 
 import 'package:crypto/crypto.dart';
+import 'package:engine_repo_tools/engine_repo_tools.dart';
+import 'package:meta/meta.dart';
 import 'package:path/path.dart' as path;
 import 'package:process/process.dart';
 
+import 'src/errors.dart';
+
+export 'src/errors.dart' show SkiaGoldProcessError;
+
 const String _kGoldctlKey = 'GOLDCTL';
 const String _kPresubmitEnvName = 'GOLD_TRYJOB';
 const String _kLuciEnvName = 'LUCI_CONTEXT';
@@ -16,55 +22,99 @@ const String _kLuciEnvName = 'LUCI_CONTEXT';
 const String _skiaGoldHost = 'https://flutter-engine-gold.skia.org';
 const String _instance = 'flutter-engine';
 
-/// Whether the Skia Gold client is available and can be used in this
-/// environment.
-bool get isSkiaGoldClientAvailable => Platform.environment.containsKey(_kGoldctlKey);
-
-/// Returns true if the current environment is a LUCI builder.
-bool get isLuciEnv => Platform.environment.containsKey(_kLuciEnvName);
-
-/// Whether the current task is run during a presubmit check.
-bool get _isPresubmit => isLuciEnv && isSkiaGoldClientAvailable && Platform.environment.containsKey(_kPresubmitEnvName);
-
-/// Whether the current task is run during a postsubmit check.
-bool get _isPostsubmit => isLuciEnv && isSkiaGoldClientAvailable && !Platform.environment.containsKey(_kPresubmitEnvName);
-
 /// A client for uploading image tests and making baseline requests to the
 /// Flutter Gold Dashboard.
-class SkiaGoldClient {
+interface class SkiaGoldClient {
   /// Creates a [SkiaGoldClient] with the given [workDirectory].
   ///
   /// [dimensions] allows to add attributes about the environment
   /// used to generate the screenshots.
-  SkiaGoldClient(this.workDirectory, { this.dimensions });
+  SkiaGoldClient(
+    this.workDirectory, {
+    this.dimensions,
+    this.verbose = false,
+    io.HttpClient? httpClient,
+    ProcessManager? processManager,
+    StringSink? stderr,
+    Map<String, String>? environment,
+  }) : httpClient = httpClient ?? io.HttpClient(),
+       process = processManager ?? const LocalProcessManager(),
+       _stderr = stderr ?? io.stderr,
+        _environment = environment ?? io.Platform.environment;
+
+  /// Whether the client is available and can be used in this environment.
+  static bool isAvailable({
+    Map<String, String>? environment,
+  }) {
+    final String? result = (environment ?? io.Platform.environment)[_kGoldctlKey];
+    return result != null && result.isNotEmpty;
+  }
+
+  /// Returns true if the current environment is a LUCI builder.
+  static bool isLuciEnv({
+    Map<String, String>? environment,
+  }) {
+    return (environment ?? io.Platform.environment).containsKey(_kLuciEnvName);
+  }
+
+  /// Whether the current environment is a presubmit job.
+  bool get _isPresubmit {
+    return
+        isLuciEnv(environment: _environment) &&
+        isAvailable(environment: _environment) &&
+        _environment.containsKey(_kPresubmitEnvName);
+  }
+
+  /// Whether the current environment is a postsubmit job.
+  bool get _isPostsubmit {
+    return
+        isLuciEnv(environment: _environment) &&
+        isAvailable(environment: _environment) &&
+        !_environment.containsKey(_kPresubmitEnvName);
+  }
+
+  /// Whether to print verbose output from goldctl.
+  ///
+  /// This flag is intended for use in debugging CI issues, and should not
+  /// ordinarily be set to true.
+  final bool verbose;
+
+  /// Environment variables for the currently running process.
+  final Map<String, String> _environment;
+
+  /// Where output is written for diagnostics.
+  final StringSink _stderr;
 
   /// Allows to add attributes about the environment used to generate the screenshots.
   final Map<String, String>? dimensions;
 
   /// A controller for launching sub-processes.
-  final ProcessManager process = const LocalProcessManager();
+  final ProcessManager process;
 
   /// A client for making Http requests to the Flutter Gold dashboard.
-  final HttpClient httpClient = HttpClient();
+  final io.HttpClient httpClient;
 
   /// The local [Directory] for the current test context. In this directory, the
   /// client will create image and JSON files for the `goldctl` tool to use.
-  final Directory workDirectory;
+  final io.Directory workDirectory;
 
   String get _tempPath => path.join(workDirectory.path, 'temp');
   String get _keysPath => path.join(workDirectory.path, 'keys.json');
   String get _failuresPath => path.join(workDirectory.path, 'failures.json');
 
-  /// Indicates whether the `goldctl` tool has been initialized for the current
-  /// test context.
-  bool _isInitialized = false;
+  Future<void>? _initResult;
+  Future<void> _initOnce(Future<void> Function() callback) {
+    // If a call has already been made, return the result of that call.
+    _initResult ??= callback();
+    return _initResult!;
+  }
 
   /// Indicates whether the client has already been authorized to communicate
   /// with the Skia Gold backend.
   bool get _isAuthorized {
-    final File authFile = File(path.join(_tempPath, 'auth_opt.json'));
+    final io.File authFile = io.File(path.join(_tempPath, 'auth_opt.json'));
 
-    if(authFile.existsSync()) {
+    if (authFile.existsSync()) {
       final String contents = authFile.readAsStringSync();
       final Map<String, dynamic> decoded = json.decode(contents) as Map<String, dynamic>;
       return !(decoded['GSUtil'] as bool);
@@ -75,10 +125,14 @@ class SkiaGoldClient {
   /// The path to the local [Directory] where the `goldctl` tool is hosted.
   String get _goldctl {
     assert(
-      isSkiaGoldClientAvailable,
+      isAvailable(environment: _environment),
       'Trying to use `goldctl` in an environment where it is not available',
     );
-    return Platform.environment[_kGoldctlKey]!;
+    final String? result = _environment[_kGoldctlKey];
+    if (result == null || result.isEmpty) {
+      throw StateError('The environment variable $_kGoldctlKey is not set.');
+    }
+    return result;
   }
 
   /// Prepares the local work space for golden file testing and calls the
@@ -92,27 +146,32 @@ class SkiaGoldClient {
     final List<String> authCommand = <String>[
       _goldctl,
       'auth',
+      if (verbose) '--verbose',
       '--work-dir', _tempPath,
       '--luci',
     ];
 
-    final ProcessResult result = await _runCommand(authCommand);
+    final io.ProcessResult result = await _runCommand(authCommand);
 
     if (result.exitCode != 0) {
       final StringBuffer buf = StringBuffer()
         ..writeln('Skia Gold authorization failed.')
         ..writeln('Luci environments authenticate using the file provided '
           'by LUCI_CONTEXT. There may be an error with this file or Gold '
-          'authentication.')
-        ..writeln('Debug information for Gold:')
-        ..writeln('stdout: ${result.stdout}')
-        ..writeln('stderr: ${result.stderr}');
-      throw Exception(buf.toString());
+          'authentication.');
+      throw SkiaGoldProcessError(
+        command: authCommand,
+        stdout: result.stdout.toString(),
+        stderr: result.stderr.toString(),
+        message: buf.toString(),
+      );
+    } else if (verbose) {
+      _stderr.writeln('stdout:\n${result.stdout}');
+      _stderr.writeln('stderr:\n${result.stderr}');
     }
   }
 
-  Future<ProcessResult> _runCommand(List<String> command) {
-    print(command.join(' '));
+  Future<io.ProcessResult> _runCommand(List<String> command) {
     return process.run(command);
   }
 
@@ -121,12 +180,8 @@ class SkiaGoldClient {
   /// The `imgtest` command collects and uploads test results to the Skia Gold
   /// backend, the `init` argument initializes the current test.
   Future<void> _imgtestInit() async {
-    if (_isInitialized) {
-      return;
-    }
-
-    final File keys = File(_keysPath);
-    final File failures = File(_failuresPath);
+    final io.File keys = io.File(_keysPath);
+    final io.File failures = io.File(_failuresPath);
 
     await keys.writeAsString(_getKeysJSON());
     await failures.create();
@@ -135,6 +190,7 @@ class SkiaGoldClient {
     final List<String> imgtestInitCommand = <String>[
       _goldctl,
       'imgtest', 'init',
+      if (verbose) '--verbose',
       '--instance', _instance,
       '--work-dir', _tempPath,
       '--commit', commitHash,
@@ -143,29 +199,24 @@ class SkiaGoldClient {
       '--passfail',
     ];
 
-    if (imgtestInitCommand.contains(null)) {
-      final StringBuffer buf = StringBuffer()
-        ..writeln('A null argument was provided for Skia Gold imgtest init.')
-        ..writeln('Please confirm the settings of your golden file test.')
-        ..writeln('Arguments provided:');
-      imgtestInitCommand.forEach(buf.writeln);
-      throw Exception(buf.toString());
-    }
-
-    final ProcessResult result = await _runCommand(imgtestInitCommand);
+    final io.ProcessResult result = await _runCommand(imgtestInitCommand);
 
     if (result.exitCode != 0) {
       final StringBuffer buf = StringBuffer()
         ..writeln('Skia Gold imgtest init failed.')
         ..writeln('An error occurred when initializing golden file test with ')
-        ..writeln('goldctl.')
-        ..writeln()
-        ..writeln('Debug information for Gold:')
-        ..writeln('stdout: ${result.stdout}')
-        ..writeln('stderr: ${result.stderr}');
-      throw Exception(buf.toString());
+        ..writeln('goldctl.');
+      throw SkiaGoldProcessError(
+        command: imgtestInitCommand,
+        stdout: result.stdout.toString(),
+        stderr: result.stderr.toString(),
+        message: buf.toString(),
+      );
+    } else if (verbose) {
+      _stderr.writeln('stdout:\n${result.stdout}');
+      _stderr.writeln('stderr:\n${result.stderr}');
     }
-    _isInitialized = true;
+
   }
 
   /// Executes the `imgtest add` command in the `goldctl` tool.
@@ -178,24 +229,29 @@ class SkiaGoldClient {
   /// The [testName] and [goldenFile] parameters reference the current
   /// comparison being evaluated.
   ///
-  /// [pixelColorDelta] defines maximum acceptable difference in RGB channels of each pixel,
-  /// such that:
+  /// [pixelColorDelta] defines maximum acceptable difference in RGB channels of
+  /// each pixel, such that:
   ///
   /// ```
-  /// abs(r(image) - r(golden)) + abs(g(image) - g(golden)) + abs(b(image) - b(golden)) <= pixelDeltaThreshold
+  /// bool isSame(Color image, Color golden, int pixelDeltaThreshold) {
+  ///   return abs(image.r - golden.r)
+  ///     + abs(image.g - golden.g)
+  ///     + abs(image.b - golden.b) <= pixelDeltaThreshold;
+  /// }
   /// ```
   ///
-  /// [differentPixelsRate] is the fraction of accepted pixels to be wrong in the range [0.0, 1.0].
-  /// Defaults to 0.01. A value of 0.01 means that 1% of the pixels are allowed to change.
+  /// [differentPixelsRate] is the fraction of pixels that can differ, as
+  /// determined by the [pixelColorDelta] parameter. It's in the range [0.0,
+  /// 1.0] and defaults to 0.01. A value of 0.01 means that 1% of the pixels are
+  /// allowed to be different.
   Future<void> addImg(
     String testName,
-    File goldenFile, {
+    io.File goldenFile, {
     double differentPixelsRate = 0.01,
     int pixelColorDelta = 0,
     required int screenshotSize,
   }) async {
     assert(_isPresubmit || _isPostsubmit);
-
     if (_isPresubmit) {
       await _tryjobAdd(testName, goldenFile, screenshotSize, pixelColorDelta, differentPixelsRate);
     }
@@ -215,30 +271,51 @@ class SkiaGoldClient {
   /// comparison being evaluated.
   Future<void> _imgtestAdd(
     String testName,
-    File goldenFile,
+    io.File goldenFile,
     int screenshotSize,
     int pixelDeltaThreshold,
     double maxDifferentPixelsRate,
   ) async {
-    await _imgtestInit();
+    await _initOnce(_imgtestInit);
 
     final List<String> imgtestCommand = <String>[
       _goldctl,
-      'imgtest', 'add',
-      '--work-dir', _tempPath,
-      '--test-name', cleanTestName(testName),
-      '--png-file', goldenFile.path,
+      'imgtest',
+      'add',
+      if (verbose)
+      '--verbose',
+      '--work-dir',
+      _tempPath,
+      '--test-name',
+      _cleanTestName(testName),
+      '--png-file',
+      goldenFile.path,
+      // Otherwise post submit will not fail.
+      '--passfail',
       ..._getMatchingArguments(testName, screenshotSize, pixelDeltaThreshold, maxDifferentPixelsRate),
     ];
 
-    final ProcessResult result = await _runCommand(imgtestCommand);
+    final io.ProcessResult result = await _runCommand(imgtestCommand);
 
     if (result.exitCode != 0) {
-      // We do not want to throw for non-zero exit codes here, as an intentional
-      // change or new golden file test expect non-zero exit codes. Logging here
-      // is meant to inform when an unexpected result occurs.
-      print('goldctl imgtest add stdout: ${result.stdout}');
-      print('goldctl imgtest add stderr: ${result.stderr}');
+      final StringBuffer buf = StringBuffer()
+        ..writeln('Skia Gold received an unapproved image in post-submit ')
+        ..writeln('testing. Golden file images in flutter/engine are triaged ')
+        ..writeln('in pre-submit during code review for the given PR.')
+        ..writeln()
+        ..writeln('Visit https://flutter-engine-gold.skia.org/ to view and approve ')
+        ..writeln('the image(s), or revert the associated change. For more ')
+        ..writeln('information, visit the wiki: ')
+        ..writeln('https://github.com/flutter/flutter/wiki/Writing-a-golden-file-test-for-package:flutter');
+      throw SkiaGoldProcessError(
+        command: imgtestCommand,
+        stdout: result.stdout.toString(),
+        stderr: result.stderr.toString(),
+        message: buf.toString(),
+      );
+    } else if (verbose) {
+      _stderr.writeln('stdout:\n${result.stdout}');
+      _stderr.writeln('stderr:\n${result.stderr}');
     }
   }
 
@@ -247,12 +324,8 @@ class SkiaGoldClient {
   /// The `imgtest` command collects and uploads test results to the Skia Gold
   /// backend, the `init` argument initializes the current tryjob.
   Future<void> _tryjobInit() async {
-    if (_isInitialized) {
-      return;
-    }
-
-    final File keys = File(_keysPath);
-    final File failures = File(_failuresPath);
+    final io.File keys = io.File(_keysPath);
+    final io.File failures = io.File(_failuresPath);
 
     await keys.writeAsString(_getKeysJSON());
     await failures.create();
@@ -261,6 +334,7 @@ class SkiaGoldClient {
     final List<String> tryjobInitCommand = <String>[
       _goldctl,
       'imgtest', 'init',
+      if (verbose) '--verbose',
       '--instance', _instance,
       '--work-dir', _tempPath,
       '--commit', commitHash,
@@ -269,32 +343,26 @@ class SkiaGoldClient {
       '--passfail',
       '--crs', 'github',
       '--patchset_id', commitHash,
-      ...getCIArguments(),
+      ..._getCIArguments(),
     ];
 
-    if (tryjobInitCommand.contains(null)) {
-      final StringBuffer buf = StringBuffer()
-        ..writeln('A null argument was provided for Skia Gold tryjob init.')
-        ..writeln('Please confirm the settings of your golden file test.')
-        ..writeln('Arguments provided:');
-      tryjobInitCommand.forEach(buf.writeln);
-      throw Exception(buf.toString());
-    }
-
-    final ProcessResult result = await _runCommand(tryjobInitCommand);
+    final io.ProcessResult result = await _runCommand(tryjobInitCommand);
 
     if (result.exitCode != 0) {
       final StringBuffer buf = StringBuffer()
         ..writeln('Skia Gold tryjobInit failure.')
         ..writeln('An error occurred when initializing golden file tryjob with ')
-        ..writeln('goldctl.')
-        ..writeln()
-        ..writeln('Debug information for Gold:')
-        ..writeln('stdout: ${result.stdout}')
-        ..writeln('stderr: ${result.stderr}');
-      throw Exception(buf.toString());
+        ..writeln('goldctl.');
+      throw SkiaGoldProcessError(
+        command: tryjobInitCommand,
+        stdout: result.stdout.toString(),
+        stderr: result.stderr.toString(),
+        message: buf.toString(),
+      );
+    } else if (verbose) {
+      _stderr.writeln('stdout:\n${result.stdout}');
+      _stderr.writeln('stderr:\n${result.stderr}');
     }
-    _isInitialized = true;
   }
 
   /// Executes the `imgtest add` command in the `goldctl` tool for tryjobs.
@@ -308,37 +376,60 @@ class SkiaGoldClient {
   /// comparison being evaluated.
   Future<void> _tryjobAdd(
     String testName,
-    File goldenFile,
+    io.File goldenFile,
     int screenshotSize,
     int pixelDeltaThreshold,
     double differentPixelsRate,
   ) async {
-    await _tryjobInit();
+    await _initOnce(_tryjobInit);
 
     final List<String> tryjobCommand = <String>[
       _goldctl,
-      'imgtest', 'add',
-      '--work-dir', _tempPath,
-      '--test-name', cleanTestName(testName),
-      '--png-file', goldenFile.path,
+      'imgtest',
+      'add',
+      if (verbose) '--verbose',
+      '--work-dir',
+      _tempPath,
+      '--test-name',
+      _cleanTestName(testName),
+      '--png-file',
+      goldenFile.path,
       ..._getMatchingArguments(testName, screenshotSize, pixelDeltaThreshold, differentPixelsRate),
     ];
 
-    final ProcessResult result = await _runCommand(tryjobCommand);
-
+    final io.ProcessResult result = await _runCommand(tryjobCommand);
     final String resultStdout = result.stdout.toString();
-    if (result.exitCode != 0 &&
-      !(resultStdout.contains('Untriaged') || resultStdout.contains('negative image'))) {
-      final StringBuffer buf = StringBuffer()
-        ..writeln('Unexpected Gold tryjobAdd failure.')
-        ..writeln('Tryjob execution for golden file test $testName failed for')
-        ..writeln('a reason unrelated to pixel comparison.')
-        ..writeln()
-        ..writeln('Debug information for Gold:')
-        ..writeln('stdout: ${result.stdout}')
-        ..writeln('stderr: ${result.stderr}')
-        ..writeln();
-      throw Exception(buf.toString());
+    if (result.exitCode == 0) {
+      // In "verbose" (debugging) mode, print the output of the tryjob anyway.
+      if (verbose) {
+        _stderr.writeln('stdout:\n${result.stdout}');
+        _stderr.writeln('stderr:\n${result.stderr}');
+      }
+    } else {
+      // Neither of these conditions are considered failures during tryjobs.
+      final bool isUntriaged = resultStdout.contains('Untriaged');
+      final bool isNegative = resultStdout.contains('negative image');
+      if (!isUntriaged && !isNegative) {
+        final StringBuffer buf = StringBuffer()
+          ..writeln('Unexpected Gold tryjobAdd failure.')
+          ..writeln('Tryjob execution for golden file test $testName failed for')
+          ..writeln('a reason unrelated to pixel comparison.');
+        throw SkiaGoldProcessError(
+          command: tryjobCommand,
+          stdout: resultStdout,
+          stderr: result.stderr.toString(),
+          message: buf.toString(),
+        );
+      }
+      // ... but we want to know about them anyway.
+      // See https://github.com/flutter/flutter/issues/145219.
+      // TODO(matanlurey): Update the documentation to reflect the new behavior.
+      if (isUntriaged) {
+        _stderr
+          ..writeln('NOTE: Untriaged image detected in tryjob.')
+          ..writeln('Triage should be required by the "Flutter Gold" check')
+          ..writeln('stdout:\n$resultStdout');
+      }
     }
   }
 
@@ -371,64 +462,40 @@ class SkiaGoldClient {
   Future<String?> getExpectationForTest(String testName) async {
     late String? expectation;
     final String traceID = getTraceID(testName);
-    await HttpOverrides.runWithHttpOverrides<Future<void>>(() async {
-      final Uri requestForExpectations = Uri.parse(
-        '$_skiaGoldHost/json/v2/latestpositivedigest/$traceID'
-      );
-      late String rawResponse;
-      try {
-        final HttpClientRequest request = await httpClient.getUrl(requestForExpectations);
-        final HttpClientResponse response = await request.close();
-        rawResponse = await utf8.decodeStream(response);
-        final dynamic jsonResponse = json.decode(rawResponse);
-        if (jsonResponse is! Map<String, dynamic>) {
-          throw const FormatException('Skia gold expectations do not match expected format.');
-        }
-        expectation = jsonResponse['digest'] as String?;
-      } on FormatException catch (error) {
-        print(
-          'Formatting error detected requesting expectations from Flutter Gold.\n'
-          'error: $error\n'
-          'url: $requestForExpectations\n'
-          'response: $rawResponse'
-        );
-        rethrow;
-      }
-    },
-      SkiaGoldHttpOverrides(),
+    final Uri requestForExpectations = Uri.parse(
+      '$_skiaGoldHost/json/v2/latestpositivedigest/$traceID'
     );
-    return expectation;
-  }
-
-  /// Returns a list of bytes representing the golden image retrieved from the
-  /// Skia Gold dashboard.
-  ///
-  /// The provided image hash represents an expectation from Skia Gold.
-  Future<List<int>>getImageBytes(String imageHash) async {
-    final List<int> imageBytes = <int>[];
-    await HttpOverrides.runWithHttpOverrides<Future<void>>(() async {
-      final Uri requestForImage = Uri.parse(
-        '$_skiaGoldHost/img/images/$imageHash.png',
+    late String rawResponse;
+    try {
+      final io.HttpClientRequest request = await httpClient.getUrl(requestForExpectations);
+      final io.HttpClientResponse response = await request.close();
+      rawResponse = await utf8.decodeStream(response);
+      final dynamic jsonResponse = json.decode(rawResponse);
+      if (jsonResponse is! Map<String, dynamic>) {
+        throw const FormatException('Skia gold expectations do not match expected format.');
+      }
+      expectation = jsonResponse['digest'] as String?;
+    } on FormatException catch (error) {
+      _stderr.writeln(
+        'Formatting error detected requesting expectations from Flutter Gold.\n'
+        'error: $error\n'
+        'url: $requestForExpectations\n'
+        'response: $rawResponse'
       );
-
-      final HttpClientRequest request = await httpClient.getUrl(requestForImage);
-      final HttpClientResponse response = await request.close();
-      await response.forEach((List<int> bytes) => imageBytes.addAll(bytes));
-    },
-      SkiaGoldHttpOverrides(),
-    );
-    return imageBytes;
+      rethrow;
+    }
+    return expectation;
   }
 
   /// Returns the current commit hash of the engine repository.
   Future<String> _getCurrentCommit() async {
-    final File currentScript = File.fromUri(Platform.script);
-    final ProcessResult revParse = await process.run(
+    final String engineCheckout = Engine.findWithin().flutterDir.path;
+    final io.ProcessResult revParse = await process.run(
       <String>['git', 'rev-parse', 'HEAD'],
-      workingDirectory: currentScript.parent.absolute.path,
+      workingDirectory: engineCheckout,
     );
     if (revParse.exitCode != 0) {
-      throw Exception('Current commit of the engine can not be found from path ${currentScript.path}.');
+      throw StateError('Current commit of the engine can not be found from path $engineCheckout.');
     }
     return (revParse.stdout as String).trim();
   }
@@ -441,7 +508,7 @@ class SkiaGoldClient {
   Map<String, dynamic> _getKeys() {
     final Map<String, dynamic> initialKeys = <String, dynamic>{
       'CI': 'luci',
-      'Platform': Platform.operatingSystem,
+      'Platform': io.Platform.operatingSystem,
     };
     if (dimensions != null) {
       initialKeys.addAll(dimensions!);
@@ -456,15 +523,15 @@ class SkiaGoldClient {
 
   /// Removes the file extension from the [fileName] to represent the test name
   /// properly.
-  String cleanTestName(String fileName) {
-    return fileName.split(path.extension(fileName))[0];
+  static String _cleanTestName(String fileName) {
+    return path.basenameWithoutExtension(fileName);
   }
 
   /// Returns a list of arguments for initializing a tryjob based on the testing
   /// environment.
-  List<String> getCIArguments() {
-    final String jobId = Platform.environment['LOGDOG_STREAM_PREFIX']!.split('/').last;
-    final List<String> refs = Platform.environment['GOLD_TRYJOB']!.split('/');
+  List<String> _getCIArguments() {
+    final String jobId = _environment['LOGDOG_STREAM_PREFIX']!.split('/').last;
+    final List<String> refs = _environment['GOLD_TRYJOB']!.split('/');
     final String pullRequest = refs[refs.length - 2];
 
     return <String>[
@@ -477,6 +544,7 @@ class SkiaGoldClient {
   /// Returns a trace id based on the current testing environment to lookup
   /// the latest positive digest on Skia Gold with a hex-encoded md5 hash of
   /// the image keys.
+  @visibleForTesting
   String getTraceID(String testName) {
     final Map<String, dynamic> keys = <String, dynamic>{
       ..._getKeys(),
@@ -488,6 +556,3 @@ class SkiaGoldClient {
     return md5Sum;
   }
 }
-
-/// Used to make HttpRequests during testing.
-class SkiaGoldHttpOverrides extends HttpOverrides { }
diff --git a/testing/skia_gold_client/lib/src/errors.dart b/testing/skia_gold_client/lib/src/errors.dart
new file mode 100644
index 0000000000000000000000000000000000000000..d5590091bf46d776e82ab3c96ef597e873ef987d
--- /dev/null
+++ b/testing/skia_gold_client/lib/src/errors.dart
@@ -0,0 +1,53 @@
+/// Skia Gold errors thrown by intepreting process exits and [stdout]/[stderr].
+final class SkiaGoldProcessError extends Error {
+  /// Creates a new [SkiaGoldProcessError] from the provided origin.
+  ///
+  /// - [command] is the command that was executed.
+  /// - [stdout] is the result of the process's standard output.
+  /// - [stderr] is the result of the process's standard error.
+  ///
+  /// Optionally, [message] as context for the error.
+  ///
+  /// ## Example
+  ///
+  /// ```dart
+  /// final io.ProcessResult result = await _runCommand(someCommand);
+  /// if (result.exitCode != 0) {
+  ///   throw SkiaGoldProcessError(
+  ///     command: someCommand,
+  ///     stdout: result.stdout.toString(),
+  ///     stderr: result.stderr.toString(),
+  ///     message: 'Authentication failed <or whatever we were doing>',
+  ///   );
+  /// }
+  /// ```
+  SkiaGoldProcessError({
+    required Iterable<String> command,
+    required this.stdout,
+    required this.stderr,
+    this.message,
+  }) : command = List<String>.unmodifiable(command);
+
+  /// Optional message to include as context for the error.
+  final String? message;
+
+  /// Command that was executed.
+  final List<String> command;
+
+  /// The result of the process's standard output.
+  final String stdout;
+
+  /// The result of the process's standard error.
+  final String stderr;
+
+  @override
+  String toString() {
+    return <String>[
+      'Error when running Skia Gold: ${command.join(' ')}',
+      if (message != null) message!,
+      '',
+      'stdout: $stdout',
+      'stderr: $stderr',
+    ].join('\n');
+  }
+}
diff --git a/testing/skia_gold_client/pubspec.yaml b/testing/skia_gold_client/pubspec.yaml
index bd6d3082d7c2ddac83760cf4e3e817ae210836dd..d119b11ac3fe9ffa0b9d1efdf4752cc6bc33486a 100644
--- a/testing/skia_gold_client/pubspec.yaml
+++ b/testing/skia_gold_client/pubspec.yaml
@@ -5,7 +5,7 @@
 name: skia_gold_client
 publish_to: none
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=3.2.0-0 <4.0.0'
 
 # Do not add any dependencies that require more than what is provided in
 # //third_party/dart/pkg, //third_party/dart/third_party/pkg, or
@@ -16,23 +16,51 @@ environment:
 # relative to this directory into //third_party/dart, or //third_party/pkg
 dependencies:
   crypto: any
+  meta: any
   path: any
+  engine_repo_tools: any
   process: any
 
+dev_dependencies:
+  args: any
+  git_repo_tools: any
+  litetest: any
+  process_fakes: any
+
 dependency_overrides:
+  args:
+    path: ../../../third_party/dart/third_party/pkg/args
+  async:
+    path: ../../../third_party/dart/third_party/pkg/async
+  async_helper:
+    path: ../../../third_party/dart/pkg/async_helper
   collection:
     path: ../../../third_party/dart/third_party/pkg/collection
   crypto:
     path: ../../../third_party/dart/third_party/pkg/crypto
+  engine_repo_tools:
+    path: ../../tools/pkg/engine_repo_tools
+  expect:
+    path: ../../../third_party/dart/pkg/expect
   file:
-    path: ../../../third_party/pkg/file/packages/file
+    path: ../../../third_party/dart/third_party/pkg/file/packages/file
+  git_repo_tools:
+    path: ../../tools/pkg/git_repo_tools
+  litetest:
+    path: ../../testing/litetest
   meta:
     path: ../../../third_party/dart/pkg/meta
   path:
     path: ../../../third_party/dart/third_party/pkg/path
   platform:
-    path: ../../../third_party/pkg/platform
+    path: ../../third_party/pkg/platform
   process:
-    path: ../../../third_party/pkg/process
+    path: ../../third_party/pkg/process
+  process_fakes:
+    path: ../../tools/pkg/process_fakes
+  process_runner:
+    path: ../../third_party/pkg/process_runner
+  smith:
+    path: ../../../third_party/dart/pkg/smith
   typed_data:
     path: ../../../third_party/dart/third_party/pkg/typed_data
diff --git a/testing/skia_gold_client/test/skia_gold_client_test.dart b/testing/skia_gold_client/test/skia_gold_client_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..1f91d8a35231a23d199d3d1ceb4b2ceb8002164e
--- /dev/null
+++ b/testing/skia_gold_client/test/skia_gold_client_test.dart
@@ -0,0 +1,633 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io' as io;
+import 'dart:typed_data';
+
+import 'package:litetest/litetest.dart';
+import 'package:path/path.dart' as p;
+import 'package:process_fakes/process_fakes.dart';
+import 'package:skia_gold_client/skia_gold_client.dart';
+
+void main() {
+  /// A mock commit hash that is used to simulate a successful git call.
+  const String mockCommitHash = '1234567890abcdef';
+
+  /// Simulating what a presubmit environment would look like.
+  const Map<String, String> presubmitEnv = <String, String>{
+    'GOLDCTL': 'python tools/goldctl.py',
+    'GOLD_TRYJOB': 'flutter/engine/1234567890',
+    'LOGDOG_STREAM_PREFIX': 'buildbucket/cr-buildbucket.appspot.com/1234567890/+/logdog',
+    'LUCI_CONTEXT': '{}',
+  };
+
+  /// Simulating what a postsubmit environment would look like.
+  const Map<String, String> postsubmitEnv = <String, String>{
+    'GOLDCTL': 'python tools/goldctl.py',
+    'LOGDOG_STREAM_PREFIX': 'buildbucket/cr-buildbucket.appspot.com/1234567890/+/logdog',
+    'LUCI_CONTEXT': '{}'
+  };
+
+  /// Simulating what a local environment would look like.
+  const Map<String, String> localEnv = <String, String>{};
+
+  /// Creates a [SkiaGoldClient] with the given [dimensions] and [verbose] flag.
+  ///
+  /// Optionally, the [onRun] function can be provided to handle the execution
+  /// of the command-line tool. If not provided, it throws an
+  /// [UnsupportedError] by default.
+  ///
+  /// Side-effects of the client can be observed through the test fixture.
+  SkiaGoldClient createClient(
+    _TestFixture fixture, {
+    required Map<String, String> environment,
+    Map<String, String>? dimensions,
+    bool verbose = false,
+    io.ProcessResult Function(List<String> command) onRun = _runUnhandled,
+  }) {
+    return SkiaGoldClient(
+      fixture.workDirectory,
+      dimensions: dimensions,
+      httpClient: fixture.httpClient,
+      processManager: FakeProcessManager(
+        onRun: onRun,
+      ),
+      verbose: verbose,
+      stderr: fixture.outputSink,
+      environment: environment,
+    );
+  }
+
+  /// Creates a `temp/auth_opt.json` file in the working directory.
+  ///
+  /// This simulates what the goldctl tool does when it runs.
+  void createAuthOptDotJson(String workDirectory) {
+    final io.File authOptDotJson = io.File(p.join(workDirectory, 'temp', 'auth_opt.json'));
+    authOptDotJson.createSync(recursive: true);
+    authOptDotJson.writeAsStringSync('{"GSUtil": false}');
+  }
+
+  test('fails if GOLDCTL is not set', () async {
+    final _TestFixture fixture = _TestFixture();
+    try {
+      final SkiaGoldClient client = createClient(
+        fixture,
+        environment: localEnv,
+      );
+      try {
+        await client.auth();
+        fail('auth should fail if GOLDCTL is not set');
+      } on StateError catch (error) {
+        expect('$error', contains('GOLDCTL is not set'));
+      }
+    } finally {
+      fixture.dispose();
+    }
+  });
+
+  test('auth executes successfully', () async {
+    final _TestFixture fixture = _TestFixture();
+    try {
+      final SkiaGoldClient client = createClient(
+        fixture,
+        environment: presubmitEnv,
+        onRun: (List<String> command) {
+          expect(command, <String>[
+            'python tools/goldctl.py',
+            'auth',
+            '--work-dir',
+            p.join(fixture.workDirectory.path, 'temp'),
+            '--luci',
+          ]);
+          createAuthOptDotJson(fixture.workDirectory.path);
+          return io.ProcessResult(0, 0, '', '');
+        },
+      );
+      await client.auth();
+    } finally {
+      fixture.dispose();
+    }
+  });
+
+  test('auth is only invoked once per instance', () async {
+    final _TestFixture fixture = _TestFixture();
+    try {
+      int callsToGoldctl = 0;
+      final SkiaGoldClient client = createClient(
+        fixture,
+        environment: presubmitEnv,
+        onRun: (List<String> command) {
+          callsToGoldctl++;
+          expect(command, <String>[
+            'python tools/goldctl.py',
+            'auth',
+            '--work-dir',
+            p.join(fixture.workDirectory.path, 'temp'),
+            '--luci',
+          ]);
+          createAuthOptDotJson(fixture.workDirectory.path);
+          return io.ProcessResult(0, 0, '', '');
+        },
+      );
+
+      await client.auth();
+      await client.auth();
+      expect(callsToGoldctl, 1);
+    } finally {
+      fixture.dispose();
+    }
+  });
+
+  test('auth executes successfully with verbose logging', () async {
+    final _TestFixture fixture = _TestFixture();
+    try {
+      final SkiaGoldClient client = createClient(
+        fixture,
+        environment: presubmitEnv,
+        verbose: true,
+        onRun: (List<String> command) {
+          expect(command, <String>[
+            'python tools/goldctl.py',
+            'auth',
+            '--verbose',
+            '--work-dir',
+            p.join(fixture.workDirectory.path, 'temp'),
+            '--luci',
+          ]);
+          return io.ProcessResult(0, 0, 'stdout', 'stderr');
+        },
+      );
+
+      await client.auth();
+      expect(fixture.outputSink.toString(), contains('stdout:\nstdout'));
+      expect(fixture.outputSink.toString(), contains('stderr:\nstderr'));
+    } finally {
+      fixture.dispose();
+    }
+  });
+
+  test('auth fails', () async {
+    final _TestFixture fixture = _TestFixture();
+    try {
+      final SkiaGoldClient client = createClient(
+        fixture,
+        environment: presubmitEnv,
+        onRun: (List<String> command) {
+          return io.ProcessResult(1, 0, 'stdout-text', 'stderr-text');
+        },
+      );
+
+      try {
+        await client.auth();
+      } on SkiaGoldProcessError catch (error) {
+        expect(error.command, contains('auth'));
+        expect(error.stdout, 'stdout-text');
+        expect(error.stderr, 'stderr-text');
+        expect(error.message, contains('Skia Gold authorization failed'));
+      }
+    } finally {
+      fixture.dispose();
+    }
+  });
+
+  test('addImg [pre-submit] executes successfully', () async {
+    final _TestFixture fixture = _TestFixture();
+    try {
+      final SkiaGoldClient client = createClient(
+        fixture,
+        environment: presubmitEnv,
+        onRun: (List<String> command) {
+          if (command case ['git', ...]) {
+            return io.ProcessResult(0, 0, mockCommitHash, '');
+          }
+          if (command case ['python tools/goldctl.py', 'imgtest', 'init', ...]) {
+            return io.ProcessResult(0, 0, '', '');
+          }
+          expect(command, <String>[
+            'python tools/goldctl.py',
+            'imgtest',
+            'add',
+            '--work-dir',
+            p.join(fixture.workDirectory.path, 'temp'),
+            '--test-name',
+            'test-name',
+            '--png-file',
+            p.join(fixture.workDirectory.path, 'temp', 'golden.png'),
+            '--add-test-optional-key',
+            'image_matching_algorithm:fuzzy',
+            '--add-test-optional-key',
+            'fuzzy_max_different_pixels:10',
+            '--add-test-optional-key',
+            'fuzzy_pixel_delta_threshold:0',
+          ]);
+          return io.ProcessResult(0, 0, '', '');
+        },
+      );
+
+      await client.addImg(
+        'test-name.foo',
+        io.File(p.join(fixture.workDirectory.path, 'temp', 'golden.png')),
+        screenshotSize: 1000,
+      );
+    } finally {
+      fixture.dispose();
+    }
+  });
+
+  test('addImg [pre-submit] executes successfully with verbose logging', () async {
+    final _TestFixture fixture = _TestFixture();
+    try {
+      final SkiaGoldClient client = createClient(
+        fixture,
+        environment: presubmitEnv,
+        verbose: true,
+        onRun: (List<String> command) {
+          if (command case ['git', ...]) {
+            return io.ProcessResult(0, 0, mockCommitHash, '');
+          }
+          if (command case ['python tools/goldctl.py', 'imgtest', 'init', ...]) {
+            return io.ProcessResult(0, 0, '', '');
+          }
+          expect(command, <String>[
+            'python tools/goldctl.py',
+            'imgtest',
+            'add',
+            '--verbose',
+            '--work-dir',
+            p.join(fixture.workDirectory.path, 'temp'),
+            '--test-name',
+            'test-name',
+            '--png-file',
+            p.join(fixture.workDirectory.path, 'temp', 'golden.png'),
+            '--add-test-optional-key',
+            'image_matching_algorithm:fuzzy',
+            '--add-test-optional-key',
+            'fuzzy_max_different_pixels:10',
+            '--add-test-optional-key',
+            'fuzzy_pixel_delta_threshold:0',
+          ]);
+          return io.ProcessResult(0, 0, 'stdout', 'stderr');
+        },
+      );
+
+      await client.addImg(
+        'test-name.foo',
+        io.File(p.join(fixture.workDirectory.path, 'temp', 'golden.png')),
+        screenshotSize: 1000,
+      );
+
+      expect(fixture.outputSink.toString(), contains('stdout:\nstdout'));
+      expect(fixture.outputSink.toString(), contains('stderr:\nstderr'));
+    } finally {
+      fixture.dispose();
+    }
+  });
+
+  // A success case (exit code 0) with a message of "Untriaged" is OK.
+  test('addImg [pre-submit] succeeds but has an untriaged image', () async {
+    final _TestFixture fixture = _TestFixture();
+    try {
+      final SkiaGoldClient client = createClient(
+        fixture,
+        environment: presubmitEnv,
+        onRun: (List<String> command) {
+          if (command case ['git', ...]) {
+            return io.ProcessResult(0, 0, mockCommitHash, '');
+          }
+          if (command case ['python tools/goldctl.py', 'imgtest', 'init', ...]) {
+            return io.ProcessResult(0, 0, '', '');
+          }
+          expect(command, <String>[
+            'python tools/goldctl.py',
+            'imgtest',
+            'add',
+            '--work-dir',
+            p.join(fixture.workDirectory.path, 'temp'),
+            '--test-name',
+            'test-name',
+            '--png-file',
+            p.join(fixture.workDirectory.path, 'temp', 'golden.png'),
+            '--add-test-optional-key',
+            'image_matching_algorithm:fuzzy',
+            '--add-test-optional-key',
+            'fuzzy_max_different_pixels:10',
+            '--add-test-optional-key',
+            'fuzzy_pixel_delta_threshold:0',
+          ]);
+          // Intentionally returning a non-zero exit code.
+          return io.ProcessResult(0, 1, 'Untriaged', '');
+        },
+      );
+
+      await client.addImg(
+        'test-name.foo',
+        io.File(p.join(fixture.workDirectory.path, 'temp', 'golden.png')),
+        screenshotSize: 1000,
+      );
+
+      // Expect a stderr log message.
+      final String log = fixture.outputSink.toString();
+      expect(log, contains('Untriaged image detected'));
+    } finally {
+      fixture.dispose();
+    }
+  });
+
+  test('addImg [pre-submit] fails due to an unexpected error', () async {
+    final _TestFixture fixture = _TestFixture();
+    try {
+      final SkiaGoldClient client = createClient(
+        fixture,
+        environment: presubmitEnv,
+        onRun: (List<String> command) {
+          if (command case ['git', ...]) {
+            return io.ProcessResult(0, 0, mockCommitHash, '');
+          }
+          if (command case ['python tools/goldctl.py', 'imgtest', 'init', ...]) {
+            return io.ProcessResult(0, 0, '', '');
+          }
+          return io.ProcessResult(1, 0, 'stdout-text', 'stderr-text');
+        },
+      );
+
+      try {
+        await client.addImg(
+          'test-name.foo',
+          io.File(p.join(fixture.workDirectory.path, 'temp', 'golden.png')),
+          screenshotSize: 1000,
+        );
+      } on SkiaGoldProcessError catch (error) {
+        expect(error.message, contains('Skia Gold image test failed.'));
+        expect(error.stdout, 'stdout-text');
+        expect(error.stderr, 'stderr-text');
+        expect(error.command, contains('imgtest add'));
+      }
+    } finally {
+      fixture.dispose();
+    }
+  });
+
+  test('addImg [post-submit] executes successfully', () async {
+    final _TestFixture fixture = _TestFixture();
+    try {
+      final SkiaGoldClient client = createClient(
+        fixture,
+        environment: postsubmitEnv,
+        onRun: (List<String> command) {
+          if (command case ['git', ...]) {
+            return io.ProcessResult(0, 0, mockCommitHash, '');
+          }
+          if (command case ['python tools/goldctl.py', 'imgtest', 'init', ...]) {
+            return io.ProcessResult(0, 0, '', '');
+          }
+          expect(command, <String>[
+            'python tools/goldctl.py',
+            'imgtest',
+            'add',
+            '--work-dir',
+            p.join(fixture.workDirectory.path, 'temp'),
+            '--test-name',
+            'test-name',
+            '--png-file',
+            p.join(fixture.workDirectory.path, 'temp', 'golden.png'),
+            '--passfail',
+            '--add-test-optional-key',
+            'image_matching_algorithm:fuzzy',
+            '--add-test-optional-key',
+            'fuzzy_max_different_pixels:10',
+            '--add-test-optional-key',
+            'fuzzy_pixel_delta_threshold:0',
+          ]);
+          return io.ProcessResult(0, 0, '', '');
+        },
+      );
+
+      await client.addImg(
+        'test-name.foo',
+        io.File(p.join(fixture.workDirectory.path, 'temp', 'golden.png')),
+        screenshotSize: 1000,
+      );
+    } finally {
+      fixture.dispose();
+    }
+  });
+
+  test('addImg [post-submit] executes successfully with verbose logging', () async {
+    final _TestFixture fixture = _TestFixture();
+    try {
+      final SkiaGoldClient client = createClient(
+        fixture,
+        environment: postsubmitEnv,
+        verbose: true,
+        onRun: (List<String> command) {
+          if (command case ['git', ...]) {
+            return io.ProcessResult(0, 0, mockCommitHash, '');
+          }
+          if (command case ['python tools/goldctl.py', 'imgtest', 'init', ...]) {
+            return io.ProcessResult(0, 0, '', '');
+          }
+          expect(command, <String>[
+            'python tools/goldctl.py',
+            'imgtest',
+            'add',
+            '--verbose',
+            '--work-dir',
+            p.join(fixture.workDirectory.path, 'temp'),
+            '--test-name',
+            'test-name',
+            '--png-file',
+            p.join(fixture.workDirectory.path, 'temp', 'golden.png'),
+            '--passfail',
+            '--add-test-optional-key',
+            'image_matching_algorithm:fuzzy',
+            '--add-test-optional-key',
+            'fuzzy_max_different_pixels:10',
+            '--add-test-optional-key',
+            'fuzzy_pixel_delta_threshold:0',
+          ]);
+          return io.ProcessResult(0, 0, 'stdout', 'stderr');
+        },
+      );
+
+      await client.addImg(
+        'test-name.foo',
+        io.File(p.join(fixture.workDirectory.path, 'temp', 'golden.png')),
+        screenshotSize: 1000,
+      );
+
+      expect(fixture.outputSink.toString(), contains('stdout:\nstdout'));
+      expect(fixture.outputSink.toString(), contains('stderr:\nstderr'));
+    } finally {
+      fixture.dispose();
+    }
+  });
+
+  test('addImg [post-submit] fails due to an unapproved image', () async {
+    final _TestFixture fixture = _TestFixture();
+    try {
+      final SkiaGoldClient client = createClient(
+        fixture,
+        environment: postsubmitEnv,
+        onRun: (List<String> command) {
+          if (command case ['git', ...]) {
+            return io.ProcessResult(0, 0, mockCommitHash, '');
+          }
+          if (command case ['python tools/goldctl.py', 'imgtest', 'init', ...]) {
+            return io.ProcessResult(0, 0, '', '');
+          }
+          return io.ProcessResult(1, 0, 'stdout-text', 'stderr-text');
+        },
+      );
+
+      try {
+        await client.addImg(
+          'test-name.foo',
+          io.File(p.join(fixture.workDirectory.path, 'temp', 'golden.png')),
+          screenshotSize: 1000,
+        );
+      } on SkiaGoldProcessError catch (error) {
+        expect(error.message, contains('Skia Gold image test failed.'));
+        expect(error.stdout, 'stdout-text');
+        expect(error.stderr, 'stderr-text');
+        expect(error.command, contains('imgtest add'));
+      }
+    } finally {
+      fixture.dispose();
+    }
+  });
+
+  test('getExpectationsForTest returns the latest positive digest', () async {
+    final _TestFixture fixture = _TestFixture();
+    try {
+      final SkiaGoldClient client = createClient(
+        fixture,
+        environment: presubmitEnv,
+        onRun: (List<String> command) {
+          expect(command, <String>[
+            'python tools/goldctl.py',
+            'imgtest',
+            'get',
+            '--work-dir',
+            p.join(fixture.workDirectory.path, 'temp'),
+            '--test-name',
+            'test-name',
+          ]);
+          return io.ProcessResult(0, 0, '{"digest":"digest"}', '');
+        },
+      );
+
+      final String hash = client.getTraceID('test-name');
+      fixture.httpClient.setJsonResponse(
+        Uri.parse('https://flutter-engine-gold.skia.org/json/v2/latestpositivedigest/$hash'),
+        <String, Object?>{
+          'digest': 'digest',
+        },
+      );
+
+      final String? digest = await client.getExpectationForTest('test-name');
+      expect(digest, 'digest');
+    } finally {
+      fixture.dispose();
+    }
+  });
+}
+
+final class _TestFixture {
+  _TestFixture();
+
+  final io.Directory workDirectory = io.Directory.systemTemp.createTempSync('skia_gold_client_test');
+  final _FakeHttpClient httpClient = _FakeHttpClient();
+  final StringSink outputSink = StringBuffer();
+
+  void dispose() {
+    workDirectory.deleteSync(recursive: true);
+  }
+}
+
+io.ProcessResult _runUnhandled(List<String> command) {
+  throw UnimplementedError('Unhandled run: ${command.join(' ')}');
+}
+
+/// An  in-memory fake of [io.HttpClient] that allows [getUrl] to be mocked.
+///
+/// This class is used to simulate a response from the server.
+///
+/// Any other methods called on this class will throw a [NoSuchMethodError].
+final class _FakeHttpClient implements io.HttpClient {
+  final Map<Uri, Object?> _expectedResponses = <Uri, Object?>{};
+
+  /// Sets an expected response for the given [request] to [jsonEncodableValue].
+  ///
+  /// This method is used to simulate a response from the server.
+  void setJsonResponse(Uri request, Object? jsonEncodableValue) {
+    _expectedResponses[request] = jsonEncodableValue;
+  }
+
+  @override
+  Future<io.HttpClientRequest> getUrl(Uri url) async {
+    final Object? response = _expectedResponses[url];
+    if (response == null) {
+      throw StateError('No request expected for $url');
+    }
+    return _FakeHttpClientRequest.withJsonResponse(response);
+  }
+
+  @override
+  Object? noSuchMethod(Invocation invocation) {
+    return super.noSuchMethod(invocation);
+  }
+}
+
+final class _FakeHttpClientRequest implements io.HttpClientRequest {
+  factory _FakeHttpClientRequest.withJsonResponse(Object? jsonResponse) {
+    final Uint8List bytes = utf8.encoder.convert(jsonEncode(jsonResponse));
+    return _FakeHttpClientRequest._(_FakeHttpClientResponse(bytes));
+  }
+
+  _FakeHttpClientRequest._(this._response);
+
+  final io.HttpClientResponse _response;
+
+  @override
+  Future<io.HttpClientResponse> close() async {
+    return _response;
+  }
+
+  @override
+  Object? noSuchMethod(Invocation invocation) {
+    return super.noSuchMethod(invocation);
+  }
+}
+
+final class _FakeHttpClientResponse extends Stream<List<int>>
+    implements io.HttpClientResponse {
+  _FakeHttpClientResponse(this._bytes);
+
+  final Uint8List _bytes;
+
+  @override
+  StreamSubscription<List<int>> listen(
+    void Function(List<int> event)? onData, {
+    Function? onError,
+    void Function()? onDone,
+    bool? cancelOnError,
+  }) {
+    return Stream<List<int>>.fromIterable(<List<int>>[_bytes]).listen(
+      onData,
+      onError: onError,
+      onDone: onDone,
+      cancelOnError: cancelOnError,
+    );
+  }
+
+  @override
+  int get statusCode => 200;
+
+  @override
+  Object? noSuchMethod(Invocation invocation) {
+    return super.noSuchMethod(invocation);
+  }
+}
diff --git a/testing/skia_gold_client/tool/e2e_fixtures/solid_blue_square.png b/testing/skia_gold_client/tool/e2e_fixtures/solid_blue_square.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e9bb1e833939bbc0a5ccaaa85f8487ed562bb24
Binary files /dev/null and b/testing/skia_gold_client/tool/e2e_fixtures/solid_blue_square.png differ
diff --git a/testing/skia_gold_client/tool/e2e_fixtures/solid_green_square.png b/testing/skia_gold_client/tool/e2e_fixtures/solid_green_square.png
new file mode 100644
index 0000000000000000000000000000000000000000..c46074d37feffa7154ebcffadf2fb3f645351516
Binary files /dev/null and b/testing/skia_gold_client/tool/e2e_fixtures/solid_green_square.png differ
diff --git a/testing/skia_gold_client/tool/e2e_fixtures/solid_red_square.png b/testing/skia_gold_client/tool/e2e_fixtures/solid_red_square.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0443cd33c7bc69a26466226a3637326d20ab544
Binary files /dev/null and b/testing/skia_gold_client/tool/e2e_fixtures/solid_red_square.png differ
diff --git a/testing/skia_gold_client/tool/e2e_test.dart b/testing/skia_gold_client/tool/e2e_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..79e23e65ba806951a9e37ae67800f5b1179a70b3
--- /dev/null
+++ b/testing/skia_gold_client/tool/e2e_test.dart
@@ -0,0 +1,143 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io';
+
+import 'package:engine_repo_tools/engine_repo_tools.dart';
+import 'package:path/path.dart' as path;
+import 'package:skia_gold_client/skia_gold_client.dart';
+
+/// An E2E test for the Skia Gold client.
+///
+/// Attempts to answer the question: "Does the Skia Gold client, and our custom
+/// integration with it (GitHub, LUCI, etc), work as expected?" in an automated
+/// way.
+///
+/// In a sibling directory, `e2e_fixtures`, there are static (checked-in) files
+/// that represent (fake) generated output to be uploaded and verified by the
+/// Skia Gold client. This test, when run on CI, will use these fixtures to
+/// simulate the process of uploading and verifying real output.
+///
+/// For example, try changing the contents of a fixture file, and then uploading
+/// a PR with this change. The CI will run this test, and it should fail (on
+/// pre-submit), since the fixture file no longer matches the expected output.
+///
+/// Next, after the PR is merged, the CI will run this test again, and it should
+/// pass (on post-submit), since the fixture file now matches the expected
+/// output.
+///
+/// There are also tests for the "dimensions" feature of the Skia Gold client,
+/// which live in `e2e_fixtures/dimensions`. These tests are similar to the
+/// regular tests, but experiment with different fake dimensions to ensure that
+/// our CI environment is correctly handling this feature.
+void main() async {
+  // If the client is not available, we can't run the test.
+  if (!SkiaGoldClient.isAvailable()) {
+    stderr.writeln('Skia gold is unavailable in this environment.');
+    exitCode = 1;
+    return;
+  }
+
+  // If we're not in an engine repo, we can't run the test.
+  final Engine? engine = Engine.tryFindWithin();
+  if (engine == null) {
+    stderr.writeln('Must run within the engine repo.');
+    exitCode = 1;
+    return;
+  }
+
+  // Create a client.
+  final SkiaGoldClient skiaGoldClient = SkiaGoldClient(
+    engine.flutterDir,
+  );
+
+  // Authenticate the client.
+  await skiaGoldClient.auth();
+
+  const String prefix = 'SkiaGoldClientE2ETest';
+  const List<_Digest> digests = <_Digest>[
+    _Digest(
+      name: '${prefix}_SolidBlueSquare',
+      source: 'e2e_fixtures/solid_blue_square.png',
+      pixelCount: 512 * 512,
+    ),
+    _Digest(
+      name: '${prefix}_SolidRedSquare',
+      source: 'e2e_fixtures/solid_red_square.png',
+      pixelCount: 768 * 768,
+    ),
+    _Digest(
+      name: '${prefix}_SolidGreenSquare',
+      source: 'e2e_fixtures/solid_green_square.png',
+      pixelCount: 1200 * 1200,
+    ),
+  ];
+
+  // Upload the digests to Skia Gold.
+  final Set<_Digest> comparisonsFailed = <_Digest>{};
+  for (final _Digest digest in digests) {
+    final String digestPath = digest.source;
+    final String digestName = digest.name;
+    final File digestFile = File(path.join(
+      engine.flutterDir.path,
+      'testing',
+      'skia_gold_client',
+      'tool',
+      digestPath,
+    ));
+    if (!digestFile.existsSync()) {
+      stderr.writeln('The digest file "$digestPath" does not exist.');
+      exitCode = 1;
+      return;
+    }
+
+    print('Uploading digest: $digestName ($digestPath): ${digest.pixelCount} pixels...');
+
+    try {
+      await skiaGoldClient.addImg(
+        digestName,
+        digestFile,
+        screenshotSize: 0,
+      );
+      stderr.writeln('Comparison success: $digestName');
+    } on Exception catch (e) {
+      stderr.writeln('Comparison failure: $digestName: $e');
+      comparisonsFailed.add(digest);
+    }
+  }
+
+  if (comparisonsFailed.isNotEmpty) {
+    stdout.writeln('${comparisonsFailed.length} digest(s) failed.');
+    for (final _Digest digest in comparisonsFailed) {
+      stderr.writeln('  ${digest.name} (${digest.source})');
+    }
+    exitCode = 1;
+    return;
+  }
+}
+
+final class _Digest {
+  const _Digest({
+    required this.name,
+    required this.source,
+    required this.pixelCount,
+  });
+
+  /// The name of the digest/test.
+  final String name;
+
+  /// The source of the digest (e.g. the path to the image file).
+  final String source;
+
+  /// The number of pixels in the image.
+  final int pixelCount;
+
+  @override
+  int get hashCode => source.hashCode;
+
+  @override
+  bool operator ==(Object other) {
+    return other is _Digest && other.source == source;
+  }
+}
diff --git a/testing/skia_gold_client/tool/generate.dart b/testing/skia_gold_client/tool/generate.dart
new file mode 100644
index 0000000000000000000000000000000000000000..a9753ae178b770239ede105bfcc996d0b3cf37ce
--- /dev/null
+++ b/testing/skia_gold_client/tool/generate.dart
@@ -0,0 +1,120 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io';
+
+import 'package:args/args.dart';
+import 'package:engine_repo_tools/engine_repo_tools.dart';
+import 'package:git_repo_tools/git_repo_tools.dart';
+import 'package:path/path.dart' as path;
+
+/// Takes the images in `source_images`, writes text on them (i.e. git hash)
+/// and saves them in `e2e_fixtures`. By default, no arguments are needed but
+/// ImageMagick must be installed.
+void main(List<String> args) async {
+  final Engine? engine = Engine.tryFindWithin();
+
+  final ArgParser parser = ArgParser()
+    ..addFlag(
+      'help',
+      abbr: 'h',
+      help: 'Prints usage information.',
+      negatable: false,
+    )
+    ..addOption(
+      'image-magick-convert-bin',
+      help: 'The path to the ImageMagick `convert` executable.',
+      defaultsTo: 'convert',
+      hide: true,
+    )
+    ..addOption(
+      'annotation',
+      abbr: 'a',
+      help: 'The text to write on the images.',
+      defaultsTo: engine == null
+          ? null
+          : await GitRepo.fromRoot(engine.flutterDir).headSha(short: true),
+    )
+    ..addOption(
+      'source',
+      abbr: 's',
+      help: 'The directory containing the images to be modified.',
+      defaultsTo: engine == null
+          ? null
+          : path.join(
+              engine.flutterDir.path,
+              'testing',
+              'skia_gold_client',
+              'tool',
+              'source_images',
+            ),
+    )
+    ..addOption(
+      'output',
+      abbr: 'o',
+      help: 'The directory to save the modified images in.',
+      defaultsTo: engine == null
+          ? null
+          : path.join(
+              engine.flutterDir.path,
+              'testing',
+              'skia_gold_client',
+              'tool',
+              'e2e_fixtures',
+            ),
+    );
+
+  final ArgResults results = parser.parse(args);
+  if (results['help'] as bool) {
+    print(parser.usage);
+    return;
+  }
+
+  final String relativeDir = engine?.flutterDir.path ?? '';
+  final String imageMagickConvertBin = results['image-magick-convert-bin'] as String;
+  final String annotation = results['annotation'] as String;
+  final String source = results['source'] as String;
+  final String output = results['output'] as String;
+
+  print(
+    'Writing annotation "$annotation" on images in '
+    '${path.relative(source, from: relativeDir)} and saving them in '
+    '${path.relative(output, from: relativeDir)}.',
+  );
+
+  final List<String> sourceImages = Directory(source)
+    .listSync()
+    .whereType<File>()
+    .map((File file) => file.path)
+    .toList();
+
+  // For each source image, write the annotation and save it in the output directory.
+  for (final String sourceImage in sourceImages) {
+    final String outputImage = path.join(
+      output,
+      '${path.basenameWithoutExtension(sourceImage)}.png',
+    );
+    print('Writing to ${path.relative(outputImage, from: relativeDir)}');
+    await Process.run(
+      imageMagickConvertBin,
+      <String>[
+        sourceImage,
+        '-fill',
+        'white',
+        '-undercolor',
+        'black',
+        '-gravity',
+        'SouthEast',
+        '-pointsize',
+        '24',
+        '-annotate',
+        '+10+10',
+        annotation,
+        outputImage,
+      ],
+    );
+  }
+
+  print('Done: wrote ${sourceImages.length} image.');
+}
diff --git a/testing/skia_gold_client/tool/source_images/solid_blue_square.png b/testing/skia_gold_client/tool/source_images/solid_blue_square.png
new file mode 100644
index 0000000000000000000000000000000000000000..424d6638a9c796b3a530fdacaab1630215afb125
Binary files /dev/null and b/testing/skia_gold_client/tool/source_images/solid_blue_square.png differ
diff --git a/testing/skia_gold_client/tool/source_images/solid_green_square.png b/testing/skia_gold_client/tool/source_images/solid_green_square.png
new file mode 100644
index 0000000000000000000000000000000000000000..162932f6d0b1de1f98112763e183fc35189d42e6
Binary files /dev/null and b/testing/skia_gold_client/tool/source_images/solid_green_square.png differ
diff --git a/testing/skia_gold_client/tool/source_images/solid_red_square.png b/testing/skia_gold_client/tool/source_images/solid_red_square.png
new file mode 100644
index 0000000000000000000000000000000000000000..5cf7bbfb56fe8b6cbfb120a9fa4edecc605c7496
Binary files /dev/null and b/testing/skia_gold_client/tool/source_images/solid_red_square.png differ
diff --git a/testing/smoke_test_failure/BUILD.gn b/testing/smoke_test_failure/BUILD.gn
index 8110ea199fa16cbfef8ab094dc6024817a8e2710..1ce144ecc523a3b2612d14f99078a88cf85bb249 100644
--- a/testing/smoke_test_failure/BUILD.gn
+++ b/testing/smoke_test_failure/BUILD.gn
@@ -2,15 +2,15 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//flutter/testing/dart/compile_test.gni")
+import("//flutter/build/dart/rules.gni")
 
 tests = [ "fail_test.dart" ]
 
 foreach(test, tests) {
-  compile_flutter_dart_test("compile_$test") {
-    dart_file = test
-    dart_kernel = "$root_gen_dir/$test.dill"
-    packages = ".dart_tool/package_config.json"
+  flutter_frontend_server("compile_$test") {
+    main_dart = test
+    kernel_output = "$root_gen_dir/$test.dill"
+    package_config = ".dart_tool/package_config.json"
   }
 }
 
diff --git a/testing/smoke_test_failure/pubspec.yaml b/testing/smoke_test_failure/pubspec.yaml
index c51c8cecbe7e856aaacc8c8f2b2e5113e2fdc366..41670c013686586e886de509395c996494ea9109 100644
--- a/testing/smoke_test_failure/pubspec.yaml
+++ b/testing/smoke_test_failure/pubspec.yaml
@@ -5,7 +5,7 @@
 name: smoke_test_failure
 publish_to: none
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=3.2.0-0 <4.0.0'
 
 # Do not add any dependencies that require more than what is provided in
 # //third_party/dart/pkg or //third_party/dart/third_party/pkg.
diff --git a/testing/stream_capture.cc b/testing/stream_capture.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ed02282f4dc19747f3f5aa0583935061d48412db
--- /dev/null
+++ b/testing/stream_capture.cc
@@ -0,0 +1,31 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/testing/stream_capture.h"
+
+namespace flutter {
+namespace testing {
+
+StreamCapture::StreamCapture(std::ostream* ostream)
+    : ostream_(ostream), old_buffer_(ostream_->rdbuf()) {
+  ostream_->rdbuf(buffer_.rdbuf());
+}
+
+StreamCapture::~StreamCapture() {
+  Stop();
+}
+
+void StreamCapture::Stop() {
+  if (old_buffer_) {
+    ostream_->rdbuf(old_buffer_);
+    old_buffer_ = nullptr;
+  }
+}
+
+std::string StreamCapture::GetOutput() const {
+  return buffer_.str();
+}
+
+}  // namespace testing
+}  // namespace flutter
diff --git a/testing/stream_capture.h b/testing/stream_capture.h
new file mode 100644
index 0000000000000000000000000000000000000000..0b0db4863814abae7e7685102a200ab37c50417f
--- /dev/null
+++ b/testing/stream_capture.h
@@ -0,0 +1,47 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_TESTING_STREAM_CAPTURE_H_
+#define FLUTTER_TESTING_STREAM_CAPTURE_H_
+
+#include <ostream>
+#include <sstream>
+#include <string>
+
+namespace flutter {
+namespace testing {
+
+// Temporarily replaces the specified stream's output buffer to capture output.
+//
+// Example:
+// StreamCapture captured_stdout(&std::cout);
+// ... code that writest to std::cout ...
+// std::string output = captured_stdout.GetCapturedOutput();
+class StreamCapture {
+ public:
+  // Begins capturing output to the specified stream.
+  explicit StreamCapture(std::ostream* ostream);
+
+  // Stops capturing output to the specified stream, and restores the original
+  // output buffer, if |Stop| has not already been called.
+  ~StreamCapture();
+
+  // Stops capturing output to the specified stream, and restores the original
+  // output buffer.
+  void Stop();
+
+  // Returns any output written to the captured stream between construction and
+  // the first call to |Stop|, if any, or now.
+  std::string GetOutput() const;
+
+ private:
+  std::ostream* ostream_;
+  std::stringstream buffer_;
+  std::streambuf* old_buffer_;
+};
+
+}  // namespace testing
+}  // namespace flutter
+
+#endif  // FLUTTER_TESTING_STREAM_CAPTURE_H_
diff --git a/testing/symbols/pubspec.yaml b/testing/symbols/pubspec.yaml
index 6f78767c109129612a33964783cd339e074af9a3..fb7d37a81290773837cff65960101436ac9e3f64 100644
--- a/testing/symbols/pubspec.yaml
+++ b/testing/symbols/pubspec.yaml
@@ -5,7 +5,7 @@
 name: verify_exported
 publish_to: none
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=3.2.0-0 <4.0.0'
 
 # Do not add any dependencies that require more than what is provided in
 # //third_party/pkg, //third_party/dart/pkg, or
diff --git a/testing/symbols/verify_exported.dart b/testing/symbols/verify_exported.dart
index 2e97f3e755219f30ec189919535f8cd1e2ae2378..942f5cd9d1be066175f1fb9a3c1be101527b0e38 100644
--- a/testing/symbols/verify_exported.dart
+++ b/testing/symbols/verify_exported.dart
@@ -40,7 +40,7 @@ void main(List<String> arguments) {
     outPath = p.join(engineCheckoutPath, outPath);
   }
   final String buildToolsPath = arguments.length == 1
-      ? p.join(p.dirname(outPath), 'buildtools')
+      ? p.join(p.dirname(outPath), 'flutter', 'buildtools')
       : arguments[1];
 
   String platform;
@@ -94,9 +94,12 @@ int _checkIos(String outPath, String nmPath, Iterable<String> builds) {
       continue;
     }
     final Iterable<NmEntry> unexpectedEntries = NmEntry.parse(nmResult.stdout as String).where((NmEntry entry) {
-      return !(((entry.type == '(__DATA,__common)' || entry.type == '(__DATA,__const)') && entry.name.startsWith('_Flutter'))
-          || (entry.type == '(__DATA,__objc_data)'
-              && (entry.name.startsWith(r'_OBJC_METACLASS_$_Flutter') || entry.name.startsWith(r'_OBJC_CLASS_$_Flutter'))));
+      final bool cSymbol = (entry.type == '(__DATA,__common)' || entry.type == '(__DATA,__const)')
+          && entry.name.startsWith('_Flutter');
+      final bool cInternalSymbol = entry.type == '(__TEXT,__text)' && entry.name.startsWith('_InternalFlutter');
+      final bool objcSymbol = entry.type == '(__DATA,__objc_data)'
+          && (entry.name.startsWith(r'_OBJC_METACLASS_$_Flutter') || entry.name.startsWith(r'_OBJC_CLASS_$_Flutter'));
+      return !(cSymbol || cInternalSymbol || objcSymbol);
     });
     if (unexpectedEntries.isNotEmpty) {
       print('ERROR: $libFlutter exports unexpected symbols:');
@@ -132,106 +135,8 @@ int _checkAndroid(String outPath, String nmPath, Iterable<String> builds) {
     };
     final Map<String, String> expectedSymbols = <String, String>{
       'JNI_OnLoad': 'T',
-      '_binary_icudtl_dat_size': 'A',
-      '_binary_icudtl_dat_start': 'D',
-      // TODO(dnfield): Remove these once Clang lld does not expose them.
-      // arm https://bugs.fuchsia.dev/p/fuchsia/issues/detail?id=47943
-      '__adddf3': 'T',
-      '__addsf3': 'T',
-      '__aeabi_cdcmpeq': 'T',
-      '__aeabi_cdcmple': 'T',
-      '__aeabi_cdrcmple': 'T',
-      '__aeabi_cfcmpeq': 'T',
-      '__aeabi_cfcmple': 'T',
-      '__aeabi_cfrcmple': 'T',
-      '__aeabi_d2lz': 'T',
-      '__aeabi_d2uiz': 'T',
-      '__aeabi_d2ulz': 'T',
-      '__aeabi_dadd': 'T',
-      '__aeabi_dcmpeq': 'T',
-      '__aeabi_dcmpge': 'T',
-      '__aeabi_dcmpgt': 'T',
-      '__aeabi_dcmple': 'T',
-      '__aeabi_dcmplt': 'T',
-      '__aeabi_ddiv': 'T',
-      '__aeabi_dmul': 'T',
-      '__aeabi_drsub': 'T',
-      '__aeabi_dsub': 'T',
-      '__aeabi_f2d': 'T',
-      '__aeabi_f2lz': 'T',
-      '__aeabi_f2ulz': 'T',
-      '__aeabi_fadd': 'T',
-      '__aeabi_fcmpeq': 'T',
-      '__aeabi_fcmpge': 'T',
-      '__aeabi_fcmpgt': 'T',
-      '__aeabi_fcmple': 'T',
-      '__aeabi_fcmplt': 'T',
-      '__aeabi_frsub': 'T',
-      '__aeabi_fsub': 'T',
-      '__aeabi_i2d': 'T',
-      '__aeabi_i2f': 'T',
-      '__aeabi_l2d': 'T',
-      '__aeabi_l2f': 'T',
-      '__aeabi_lasr': 'T',
-      '__aeabi_ldivmod': 'T',
-      '__aeabi_llsl': 'T',
-      '__aeabi_llsr': 'T',
-      '__aeabi_ui2d': 'T',
-      '__aeabi_ui2f': 'T',
-      '__aeabi_uidiv': 'T',
-      '__aeabi_uidivmod': 'T',
-      '__aeabi_ul2d': 'T',
-      '__aeabi_ul2f': 'T',
-      '__aeabi_uldivmod': 'T',
-      '__ashldi3': 'T',
-      '__ashrdi3': 'T',
-      '__cmpdf2': 'T',
-      '__cmpsf2': 'T',
-      '__divdf3': 'T',
-      '__divdi3': 'T',
-      '__eqdf2': 'T',
-      '__eqsf2': 'T',
-      '__extendsfdf2': 'T',
-      '__fixdfdi': 'T',
-      '__fixsfdi': 'T',
-      '__fixunsdfdi': 'T',
-      '__fixunsdfsi': 'T',
-      '__fixunssfdi': 'T',
-      '__floatdidf': 'T',
-      '__floatdisf': 'T',
-      '__floatsidf': 'T',
-      '__floatsisf': 'T',
-      '__floatundidf': 'T',
-      '__floatundisf': 'T',
-      '__floatunsidf': 'T',
-      '__floatunsisf': 'T',
-      '__gedf2': 'T',
-      '__gesf2': 'T',
-      '__gnu_ldivmod_helper': 'T',
-      '__gnu_uldivmod_helper': 'T',
-      '__gtdf2': 'T',
-      '__gtsf2': 'T',
-      '__ledf2': 'T',
-      '__lesf2': 'T',
-      '__lshrdi3': 'T',
-      '__ltdf2': 'T',
-      '__ltsf2': 'T',
-      '__muldf3': 'T',
-      '__nedf2': 'T',
-      '__nesf2': 'T',
-      '__subdf3': 'T',
-      '__subsf3': 'T',
-      '__udivdi3': 'T',
-      '__udivsi3': 'T',
-      // arm64
-      '__clz_tab': 'R',
-      '__udivti3': 'T',
-      // arm64 && x64
-      '__emutls_get_address': 'T',
-      '__emutls_register_common': 'T',
-      // jit x86
-      '__moddi3': 'T',
-      '__umoddi3': 'T',
+      '_binary_icudtl_dat_size': 'R',
+      '_binary_icudtl_dat_start': 'R',
     };
     final Map<String, String> badSymbols = <String, String>{};
     for (final String key in entryMap.keys) {
@@ -275,7 +180,9 @@ int _checkLinux(String outPath, String nmPath, Iterable<String> builds) {
       }
       if (!(entry.name.startsWith('Flutter')
             || entry.name.startsWith('__Flutter')
-            || entry.name.startsWith('kFlutter'))) {
+            || entry.name.startsWith('kFlutter')
+            || entry.name.startsWith('InternalFlutter')
+            || entry.name.startsWith('kInternalFlutter'))) {
         print('ERROR: $libFlutter exports an unexpected symbol name: ($entry)');
         print(' Library has $entries.');
         failures++;
@@ -287,16 +194,15 @@ int _checkLinux(String outPath, String nmPath, Iterable<String> builds) {
 }
 
 class NmEntry {
-  NmEntry._(this.address, this.type, this.name);
+  NmEntry._(this.type, this.name);
 
-  final String address;
   final String type;
   final String name;
 
   static Iterable<NmEntry> parse(String stdout) {
     return LineSplitter.split(stdout).map((String line) {
       final List<String> parts = line.split(' ');
-      return NmEntry._(parts[0], parts[1], parts.last);
+      return NmEntry._(parts[1], parts.last);
     });
   }
 
diff --git a/flow/testing/skia_gpu_object_layer_test.cc b/testing/test_args.cc
similarity index 47%
rename from flow/testing/skia_gpu_object_layer_test.cc
rename to testing/test_args.cc
index 1fca8ec8f3b81c6a5b65fee991ad17058681b148..ace858cd64e7fe5886b804c42d7ecc4d50e1d2b7 100644
--- a/flow/testing/skia_gpu_object_layer_test.cc
+++ b/testing/test_args.cc
@@ -2,17 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/flow/testing/skia_gpu_object_layer_test.h"
-
-#include "flutter/fml/time/time_delta.h"
+#include "flutter/testing/test_args.h"
 
 namespace flutter {
 namespace testing {
 
-SkiaGPUObjectLayerTest::SkiaGPUObjectLayerTest()
-    : unref_queue_(fml::MakeRefCounted<SkiaUnrefQueue>(
-          GetCurrentTaskRunner(),
-          fml::TimeDelta::FromSeconds(0))) {}
+static fml::CommandLine gProcessArgs;
+
+const fml::CommandLine& GetArgsForProcess() {
+  return gProcessArgs;
+}
+
+void SetArgsForProcess(int argc, char** argv) {
+  gProcessArgs = fml::CommandLineFromArgcArgv(argc, argv);
+}
 
 }  // namespace testing
 }  // namespace flutter
diff --git a/shell/platform/windows/testing/flutter_window_test.cc b/testing/test_args.h
similarity index 51%
rename from shell/platform/windows/testing/flutter_window_test.cc
rename to testing/test_args.h
index 690eb28eb494542f294175be88795f23d820f599..494359b060adaaf26cf0e4e822557af084b8e4da 100644
--- a/shell/platform/windows/testing/flutter_window_test.cc
+++ b/testing/test_args.h
@@ -2,15 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/windows/testing/flutter_window_test.h"
+#ifndef FLUTTER_TESTING_TEST_ARGS_H_
+#define FLUTTER_TESTING_TEST_ARGS_H_
+
+#include "flutter/fml/command_line.h"
 
 namespace flutter {
 namespace testing {
 
-FlutterWindowTest::FlutterWindowTest(int width, int height)
-    : FlutterWindow(width, height){};
+const fml::CommandLine& GetArgsForProcess();
 
-FlutterWindowTest::~FlutterWindowTest() = default;
+void SetArgsForProcess(int argc, char** argv);
 
 }  // namespace testing
 }  // namespace flutter
+
+#endif  // FLUTTER_TESTING_TEST_ARGS_H_
diff --git a/testing/test_dart_native_resolver.h b/testing/test_dart_native_resolver.h
index a54ba6ab1e62e012a053863b126b107e3b43d012..bd0a3fe0882dd53cdcac9d94e327f643c9107a3a 100644
--- a/testing/test_dart_native_resolver.h
+++ b/testing/test_dart_native_resolver.h
@@ -8,6 +8,7 @@
 #include <functional>
 #include <map>
 #include <memory>
+#include <string>
 
 #include "flutter/fml/macros.h"
 #include "third_party/dart/runtime/include/dart_api.h"
diff --git a/testing/test_gl_surface.cc b/testing/test_gl_surface.cc
index 6a3cc4d4bb455d4126d5114085b0478eaea55a5d..c70364696277ad1c3d9a19a037269cd15da5563d 100644
--- a/testing/test_gl_surface.cc
+++ b/testing/test_gl_surface.cc
@@ -17,7 +17,12 @@
 #include "third_party/skia/include/core/SkColorSpace.h"
 #include "third_party/skia/include/core/SkColorType.h"
 #include "third_party/skia/include/core/SkSurface.h"
+#include "third_party/skia/include/gpu/GrBackendSurface.h"
+#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
+#include "third_party/skia/include/gpu/ganesh/gl/GrGLBackendSurface.h"
+#include "third_party/skia/include/gpu/ganesh/gl/GrGLDirectContext.h"
 #include "third_party/skia/include/gpu/gl/GrGLAssembleInterface.h"
+#include "third_party/skia/include/gpu/gl/GrGLTypes.h"
 
 namespace flutter {
 namespace testing {
@@ -332,7 +337,7 @@ sk_sp<GrDirectContext> TestGLSurface::CreateGrContext() {
     return nullptr;
   }
 
-  context_ = GrDirectContext::MakeGL(interface);
+  context_ = GrDirectContexts::MakeGL(interface);
   return context_;
 }
 
@@ -349,17 +354,17 @@ sk_sp<SkSurface> TestGLSurface::GetOnscreenSurface() {
   framebuffer_info.fFormat = 0x93A1;  // GL_BGRA8;
 #endif
 
-  GrBackendRenderTarget backend_render_target(
-      width,            // width
-      height,           // height
-      1,                // sample count
-      8,                // stencil bits
-      framebuffer_info  // framebuffer info
-  );
+  auto backend_render_target =
+      GrBackendRenderTargets::MakeGL(width,            // width
+                                     height,           // height
+                                     1,                // sample count
+                                     8,                // stencil bits
+                                     framebuffer_info  // framebuffer info
+      );
 
   SkSurfaceProps surface_properties(0, kUnknown_SkPixelGeometry);
 
-  auto surface = SkSurface::MakeFromBackendRenderTarget(
+  auto surface = SkSurfaces::WrapBackendRenderTarget(
       GetGrContext().get(),         // context
       backend_render_target,        // backend render target
       kBottomLeft_GrSurfaceOrigin,  // surface origin
diff --git a/testing/test_gl_surface.h b/testing/test_gl_surface.h
index b5c7632b58e438aa0ac2244d8859a5bb1449ab7a..32bd732f2c8b9d4b15910fe333116e2fd651ff81 100644
--- a/testing/test_gl_surface.h
+++ b/testing/test_gl_surface.h
@@ -8,6 +8,8 @@
 #include <cstdint>
 
 #include "flutter/fml/macros.h"
+
+#include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
 
 namespace flutter {
diff --git a/testing/test_metal_context.h b/testing/test_metal_context.h
index 167bdf35ec5191ee25e524043b0f0980afb4d34f..734aed61f991adb982112a9f4e745c4048538a8c 100644
--- a/testing/test_metal_context.h
+++ b/testing/test_metal_context.h
@@ -9,7 +9,7 @@
 #include <mutex>
 
 #include "third_party/skia/include/gpu/GrDirectContext.h"
-#include "third_party/skia/include/gpu/mtl/GrMtlTypes.h"
+#include "third_party/skia/include/ports/SkCFObject.h"
 
 namespace flutter {
 
@@ -41,7 +41,7 @@ class TestMetalContext {
   void* device_;
   void* command_queue_;
   sk_sp<GrDirectContext> skia_context_;
-  std::mutex textures_mutex;
+  std::mutex textures_mutex_;
   int64_t texture_id_ctr_ = 1;                 // guarded by textures_mutex
   std::map<int64_t, sk_cfp<void*>> textures_;  // guarded by textures_mutex
 };
diff --git a/testing/test_metal_context.mm b/testing/test_metal_context.mm
index 6ac70a2ae25f3ca408d6c7c7f0b6673fa4937ce9..7f869cb44bd79fd6651e7accef1b23302d76091e 100644
--- a/testing/test_metal_context.mm
+++ b/testing/test_metal_context.mm
@@ -10,6 +10,9 @@
 #include "flutter/fml/logging.h"
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
 #include "third_party/skia/include/core/SkSurface.h"
+#include "third_party/skia/include/gpu/GrDirectContext.h"
+#include "third_party/skia/include/gpu/ganesh/mtl/GrMtlBackendContext.h"
+#include "third_party/skia/include/gpu/ganesh/mtl/GrMtlDirectContext.h"
 
 namespace flutter {
 
@@ -28,9 +31,12 @@ TestMetalContext::TestMetalContext() {
 
   [command_queue.get() setLabel:@"Flutter Test Queue"];
 
+  GrMtlBackendContext backendContext = {};
   // Skia expect arguments to `MakeMetal` transfer ownership of the reference in for release later
   // when the GrDirectContext is collected.
-  skia_context_ = GrDirectContext::MakeMetal([device.get() retain], [command_queue.get() retain]);
+  backendContext.fDevice.reset([device.get() retain]);
+  backendContext.fQueue.reset([command_queue.get() retain]);
+  skia_context_ = GrDirectContexts::MakeMetal(backendContext);
   if (!skia_context_) {
     FML_LOG(ERROR) << "Could not create the GrDirectContext from the Metal Device "
                       "and command queue.";
@@ -41,7 +47,7 @@ TestMetalContext::TestMetalContext() {
 }
 
 TestMetalContext::~TestMetalContext() {
-  std::scoped_lock lock(textures_mutex);
+  std::scoped_lock lock(textures_mutex_);
   textures_.clear();
   if (device_) {
     [(__bridge id)device_ release];
@@ -64,7 +70,7 @@ sk_sp<GrDirectContext> TestMetalContext::GetSkiaContext() const {
 }
 
 TestMetalContext::TextureInfo TestMetalContext::CreateMetalTexture(const SkISize& size) {
-  std::scoped_lock lock(textures_mutex);
+  std::scoped_lock lock(textures_mutex_);
   auto texture_descriptor = fml::scoped_nsobject{
       [[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatBGRA8Unorm
                                                           width:size.width()
@@ -100,7 +106,7 @@ TestMetalContext::TextureInfo TestMetalContext::CreateMetalTexture(const SkISize
 
 // Don't remove the texture from the map here.
 bool TestMetalContext::Present(int64_t texture_id) {
-  std::scoped_lock lock(textures_mutex);
+  std::scoped_lock lock(textures_mutex_);
   if (textures_.find(texture_id) == textures_.end()) {
     return false;
   } else {
@@ -109,7 +115,7 @@ bool TestMetalContext::Present(int64_t texture_id) {
 }
 
 TestMetalContext::TextureInfo TestMetalContext::GetTextureInfo(int64_t texture_id) {
-  std::scoped_lock lock(textures_mutex);
+  std::scoped_lock lock(textures_mutex_);
   if (textures_.find(texture_id) == textures_.end()) {
     FML_CHECK(false) << "Invalid texture id: " << texture_id;
     return {.texture_id = -1, .texture = nullptr};
diff --git a/testing/test_metal_surface.cc b/testing/test_metal_surface.cc
index 162c0a9ef78371225ee04a79e0a87552d66dcc62..15578b819133f2e494a624a3e1be7a7b19db4ab0 100644
--- a/testing/test_metal_surface.cc
+++ b/testing/test_metal_surface.cc
@@ -7,6 +7,8 @@
 #include "flutter/fml/logging.h"
 #include "flutter/testing/test_metal_surface_impl.h"
 
+#include "third_party/skia/include/core/SkSurface.h"
+
 namespace flutter {
 
 bool TestMetalSurface::PlatformSupportsMetal() {
diff --git a/testing/test_metal_surface_impl.h b/testing/test_metal_surface_impl.h
index 12185a46c5f1163595866afe718f104c6c7495f1..fb96891e930ae4112424a3663d03247cb98400e5 100644
--- a/testing/test_metal_surface_impl.h
+++ b/testing/test_metal_surface_impl.h
@@ -9,6 +9,8 @@
 #include "flutter/testing/test_metal_context.h"
 #include "flutter/testing/test_metal_surface.h"
 
+#include "third_party/skia/include/core/SkSurface.h"
+
 namespace flutter {
 
 class TestMetalSurfaceImpl : public TestMetalSurface {
diff --git a/testing/test_metal_surface_impl.mm b/testing/test_metal_surface_impl.mm
index 5dd490910f2232568e36d0d9e284be923c90a12b..cf2c6931f862135b2918260e35bd9aa09e64fc8c 100644
--- a/testing/test_metal_surface_impl.mm
+++ b/testing/test_metal_surface_impl.mm
@@ -15,6 +15,9 @@
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "third_party/skia/include/core/SkSize.h"
 #include "third_party/skia/include/core/SkSurface.h"
+#include "third_party/skia/include/gpu/GpuTypes.h"
+#include "third_party/skia/include/gpu/GrBackendSurface.h"
+#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
 
 namespace flutter {
 
@@ -24,10 +27,10 @@ void TestMetalSurfaceImpl::Init(const TestMetalContext::TextureInfo& texture_inf
 
   GrMtlTextureInfo skia_texture_info;
   skia_texture_info.fTexture.reset([texture retain]);
-  GrBackendTexture backend_texture(surface_size.width(), surface_size.height(), GrMipmapped::kNo,
-                                   skia_texture_info);
+  GrBackendTexture backend_texture(surface_size.width(), surface_size.height(),
+                                   skgpu::Mipmapped::kNo, skia_texture_info);
 
-  sk_sp<SkSurface> surface = SkSurface::MakeFromBackendTexture(
+  sk_sp<SkSurface> surface = SkSurfaces::WrapBackendTexture(
       test_metal_context_.GetSkiaContext().get(), backend_texture, kTopLeft_GrSurfaceOrigin, 1,
       kBGRA_8888_SkColorType, nullptr, nullptr);
 
diff --git a/testing/test_vulkan_context.cc b/testing/test_vulkan_context.cc
index ea36581add8e27a70dd4ac01da042cdec8858a75..d7472303f111a8ea7e646734f4aaa7d04e8d484a 100644
--- a/testing/test_vulkan_context.cc
+++ b/testing/test_vulkan_context.cc
@@ -14,19 +14,13 @@
 
 #include "flutter/fml/memory/ref_ptr.h"
 #include "flutter/fml/native_library.h"
+#include "flutter/vulkan/swiftshader_path.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
+#include "third_party/skia/include/gpu/ganesh/vk/GrVkDirectContext.h"
 #include "third_party/skia/include/gpu/vk/GrVkExtensions.h"
 #include "vulkan/vulkan_core.h"
 
-#ifdef FML_OS_MACOSX
-#define VULKAN_SO_PATH "libvk_swiftshader.dylib"
-#elif FML_OS_WIN
-#define VULKAN_SO_PATH "vk_swiftshader.dll"
-#else
-#define VULKAN_SO_PATH "libvk_swiftshader.so"
-#endif
-
 namespace flutter {
 namespace testing {
 
@@ -113,7 +107,7 @@ TestVulkanContext::TestVulkanContext() {
   GrContextOptions options =
       MakeDefaultContextOptions(ContextType::kRender, GrBackendApi::kVulkan);
   options.fReduceOpsTaskSplitting = GrContextOptions::Enable::kNo;
-  context_ = GrDirectContext::MakeVulkan(backend_context, options);
+  context_ = GrDirectContexts::MakeVulkan(backend_context, options);
 }
 
 TestVulkanContext::~TestVulkanContext() {
diff --git a/testing/test_vulkan_surface.cc b/testing/test_vulkan_surface.cc
index e5a283f3d5fc70d646d7a8c91a7d5075090e16e0..f748ce794cc80668a121b4b0f9b318204db02d37 100644
--- a/testing/test_vulkan_surface.cc
+++ b/testing/test_vulkan_surface.cc
@@ -11,6 +11,10 @@
 #include "third_party/skia/include/core/SkColorType.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/core/SkSurfaceProps.h"
+#include "third_party/skia/include/gpu/GrBackendSurface.h"
+#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
+#include "third_party/skia/include/gpu/ganesh/vk/GrVkBackendSurface.h"
+#include "third_party/skia/include/gpu/vk/GrVkTypes.h"
 
 namespace flutter {
 namespace testing {
@@ -40,16 +44,14 @@ std::unique_ptr<TestVulkanSurface> TestVulkanSurface::Create(
       .fSampleCount = 1,
       .fLevelCount = 1,
   };
-  GrBackendTexture backend_texture(surface_size.width(),   //
-                                   surface_size.height(),  //
-                                   image_info              //
-  );
+  auto backend_texture = GrBackendTextures::MakeVk(
+      surface_size.width(), surface_size.height(), image_info);
 
   SkSurfaceProps surface_properties(0, kUnknown_SkPixelGeometry);
 
   auto result = std::unique_ptr<TestVulkanSurface>(
       new TestVulkanSurface(std::move(image_result.value())));
-  result->surface_ = SkSurface::MakeFromBackendTexture(
+  result->surface_ = SkSurfaces::WrapBackendTexture(
       context.GetGrDirectContext().get(),  // context
       backend_texture,                     // back-end texture
       kTopLeft_GrSurfaceOrigin,            // surface origin
diff --git a/testing/test_vulkan_surface.h b/testing/test_vulkan_surface.h
index 4dce92fe725f8369f69f4d8cad420de8ee402e52..b5c93e9f13f6316d1d1262272f5f475b9821abfb 100644
--- a/testing/test_vulkan_surface.h
+++ b/testing/test_vulkan_surface.h
@@ -2,14 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FLUTTER_TESTING_TEST_VULKAN_SURFACE_IMPL_H_
-#define FLUTTER_TESTING_TEST_VULKAN_SURFACE_IMPL_H_
+#ifndef FLUTTER_TESTING_TEST_VULKAN_SURFACE_H_
+#define FLUTTER_TESTING_TEST_VULKAN_SURFACE_H_
 
 #include <memory>
 #include "flutter/testing/test_vulkan_context.h"
 
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "third_party/skia/include/core/SkSize.h"
+#include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
 
 namespace flutter {
@@ -38,4 +39,4 @@ class TestVulkanSurface {
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // FLUTTER_TESTING_TEST_VULKAN_SURFACE_IMPL_H_
+#endif  // FLUTTER_TESTING_TEST_VULKAN_SURFACE_H_
diff --git a/testing/testing.cc b/testing/testing.cc
index 06de22adb85abafe448c5ba5af77cd7d7c010db8..a12f6159cb29d34dd2e92e855344320492dccde8 100644
--- a/testing/testing.cc
+++ b/testing/testing.cc
@@ -61,6 +61,21 @@ std::unique_ptr<fml::Mapping> OpenFixtureAsMapping(
   return fml::FileMapping::CreateReadOnly(OpenFixture(fixture_name));
 }
 
+sk_sp<SkData> OpenFixtureAsSkData(const std::string& fixture_name) {
+  auto mapping = flutter::testing::OpenFixtureAsMapping(fixture_name);
+  if (!mapping) {
+    return nullptr;
+  }
+  auto data = SkData::MakeWithProc(
+      mapping->GetMapping(), mapping->GetSize(),
+      [](const void* ptr, void* context) {
+        delete reinterpret_cast<fml::Mapping*>(context);
+      },
+      mapping.get());
+  mapping.release();
+  return data;
+}
+
 bool MemsetPatternSetOrCheck(uint8_t* buffer, size_t size, MemsetPatternOp op) {
   if (buffer == nullptr) {
     return false;
diff --git a/testing/testing.gni b/testing/testing.gni
index 3fadcbbc71e16935c24d2c6de108479ad09902e2..66ac11cffd859f91b467b51730429a5218b691fc 100644
--- a/testing/testing.gni
+++ b/testing/testing.gni
@@ -3,16 +3,18 @@
 # found in the LICENSE file.
 
 import("//build/compiled_action.gni")
+import("//flutter/build/dart/rules.gni")
 import("//flutter/common/config.gni")
-import("//third_party/dart/build/dart/dart_action.gni")
-import("//third_party/dart/sdk_args.gni")
 
 is_aot_test =
     flutter_runtime_mode == "profile" || flutter_runtime_mode == "release"
 
-# Unit tests targets are only enabled for host machines and Fuchsia right now
+# Build unit tests when any of the following are true:
+# * host_toolchain: non-cross-compile, so we can run tests on the host.
+# * is_mac: arm64 builds can run x64 binaries.
+# * is_fuchsia: build unittests for testing on device.
 declare_args() {
-  enable_unittests = current_toolchain == host_toolchain || is_fuchsia
+  enable_unittests = current_toolchain == host_toolchain || is_fuchsia || is_mac
 }
 
 # Creates a translation unit that defines the flutter::testing::GetFixturesPath
@@ -48,48 +50,6 @@ template("fixtures_location") {
   }
 }
 
-# Invokes the frontend server using the built Dart SDK or the prebuilt Dart SDK
-# as appropriate.
-#
-# Parameters:
-#   The parameters testonly, deps, inputs, outputs, depfile, and args are
-#   forwarded from the invoker either to an 'action' target or a 'dart_action'
-#   target depending on whether a prebuilt Dart SDK is used or not,
-#   respectively.
-template("_frontend_server") {
-  if (flutter_prebuilt_dart_sdk) {
-    action(target_name) {
-      testonly = invoker.testonly
-      deps = invoker.deps
-      script = "//build/gn_run_binary.py"
-      inputs = invoker.inputs
-      outputs = invoker.outputs
-      depfile = invoker.depfile
-      pool = "//flutter/build/dart:dart_pool"
-
-      ext = ""
-      if (is_win) {
-        ext = ".exe"
-      }
-      dart = rebase_path("$host_prebuilt_dart_sdk/bin/dart$ext", root_out_dir)
-      frontend_server = rebase_path(
-              "$host_prebuilt_dart_sdk/bin/snapshots/frontend_server.dart.snapshot")
-
-      args = [
-               dart,
-               frontend_server,
-             ] + invoker.args
-    }
-  } else {
-    dart_action(target_name) {
-      forward_variables_from(invoker, "*")
-      deps += [ "//third_party/dart/utils/kernel-service:frontend_server" ]
-      script = "$root_out_dir/frontend_server.dart.snapshot"
-      pool = "//flutter/build/dart:dart_pool"
-    }
-  }
-}
-
 # Generates the Dart kernel snapshot.
 #
 # Arguments
@@ -104,45 +64,26 @@ template("dart_snapshot_kernel") {
   assert(defined(invoker.dart_kernel),
          "The Dart Kernel file location must be specified")
 
-  _frontend_server(target_name) {
-    testonly = true
-
-    deps = [ "//flutter/lib/snapshot:strong_platform" ]
-
-    inputs = [ invoker.dart_main ]
-
-    outputs = [ invoker.dart_kernel ]
+  args = []
+  if (flutter_runtime_mode == "release" ||
+      flutter_runtime_mode == "jit_release") {
+    args += [ "-Ddart.vm.product=true" ]
+  }
 
-    snapshot_depfile = "$target_gen_dir/snapshot_$target_name.depfile.d"
-    depfile = snapshot_depfile
+  if (is_aot_test) {
+    args += [
+      "--aot",
 
-    args = [
-      "--sdk-root",
-      rebase_path("$root_out_dir/flutter_patched_sdk"),
-      "--target",
-      "flutter",
-      "--sound-null-safety",
-      "--output-dill",
-      rebase_path(invoker.dart_kernel, root_out_dir),
-      "--depfile",
-      rebase_path(snapshot_depfile),
+      # type flow analysis
+      "--tfa",
     ]
+  }
 
-    if (flutter_runtime_mode == "release" ||
-        flutter_runtime_mode == "jit_release") {
-      args += [ "-Ddart.vm.product=true" ]
-    }
-
-    if (is_aot_test) {
-      args += [
-        "--aot",
-
-        # type flow analysis
-        "--tfa",
-      ]
-    }
-
-    args += [ rebase_path(invoker.dart_main) ]
+  flutter_frontend_server(target_name) {
+    testonly = true
+    main_dart = invoker.dart_main
+    kernel_output = invoker.dart_kernel
+    extra_args = args
   }
 }
 
@@ -165,7 +106,7 @@ template("dart_snapshot_aot") {
   compiled_action(target_name) {
     testonly = true
 
-    tool = "//third_party/dart/runtime/bin:gen_snapshot"
+    tool = "$dart_src/runtime/bin:gen_snapshot"
 
     pool = "//flutter/build/dart:dart_pool"
 
diff --git a/testing/testing.h b/testing/testing.h
index 43cf512162aedf5a4b969036dab408add8a67b39..369f66fbe521482719011c68989264755d8f52d6 100644
--- a/testing/testing.h
+++ b/testing/testing.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef TESTING_TESTING_H_
-#define TESTING_TESTING_H_
+#ifndef FLUTTER_TESTING_TESTING_H_
+#define FLUTTER_TESTING_TESTING_H_
 
 #include <string>
 #include <vector>
@@ -12,6 +12,7 @@
 #include "flutter/fml/mapping.h"
 #include "flutter/testing/assertions.h"
 #include "gtest/gtest.h"
+#include "third_party/skia/include/core/SkData.h"
 
 namespace flutter {
 namespace testing {
@@ -73,6 +74,17 @@ fml::UniqueFD OpenFixture(const std::string& fixture_name);
 std::unique_ptr<fml::Mapping> OpenFixtureAsMapping(
     const std::string& fixture_name);
 
+//------------------------------------------------------------------------------
+/// @brief      Opens a fixture of the given file name and returns a Skia SkData
+///             holding its contents.
+///
+/// @param[in]  fixture_name  The fixture name
+///
+/// @return     An SkData, or null if the fixture does not exist or its contents
+///             cannot be mapped in.
+///
+sk_sp<SkData> OpenFixtureAsSkData(const std::string& fixture_name);
+
 //------------------------------------------------------------------------------
 /// @brief      Gets the name of the currently running test. This is useful in
 ///             generating logs or assets based on test name.
@@ -106,4 +118,4 @@ bool MemsetPatternSetOrCheck(std::vector<uint8_t>& buffer, MemsetPatternOp op);
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // TESTING_TESTING_H_
+#endif  // FLUTTER_TESTING_TESTING_H_
diff --git a/testing/ubsan_suppressions.txt b/testing/ubsan_suppressions.txt
index ec24e31856af81f66092dcfd49465923fa88185c..6bbcd41c9cf20772c2df68c57dc1c7ddb8ae8884 100644
--- a/testing/ubsan_suppressions.txt
+++ b/testing/ubsan_suppressions.txt
@@ -6,5 +6,5 @@ alignment:third_party/dart
 null:third_party/dart
 
 # Ignore errors in SwiftShader
-undefined:third_party/swiftshader
+undefined:flutter/third_party/swiftshader
 
diff --git a/testing/xvfb.py b/testing/xvfb.py
index b7f6f40411d8b26683887721d2ed289fe0c50292..5f06e454c4cbfe2ffcf73b472d21ab3197453354 100644
--- a/testing/xvfb.py
+++ b/testing/xvfb.py
@@ -6,27 +6,25 @@
 """
 
 import os
-import platform
 import signal
 import subprocess
 import tempfile
 import time
 
 
-def _XvfbDisplayIndex(_child_build_name):
+def xvfb_display_index(_child_build_name):
   return '9'
 
 
-def _XvfbPidFilename(child_build_name):
+def xvfb_pid_filename(child_build_name):
   """Returns the filename to the Xvfb pid file.  This name is unique for each
   builder. This is used by the linux builders."""
   return os.path.join(
-      tempfile.gettempdir(),
-      'xvfb-' + _XvfbDisplayIndex(child_build_name) + '.pid'
+      tempfile.gettempdir(), 'xvfb-' + xvfb_display_index(child_build_name) + '.pid'
   )
 
 
-def StartVirtualX(child_build_name, build_dir):
+def start_virtual_x(child_build_name, build_dir):
   """Start a virtual X server and set the DISPLAY environment variable so sub
   processes will use the virtual X server.  Also start openbox. This only works
   on Linux and assumes that xvfb and openbox are installed.
@@ -40,13 +38,13 @@ def StartVirtualX(child_build_name, build_dir):
   """
   # We use a pid file to make sure we don't have any xvfb processes running
   # from a previous test run.
-  StopVirtualX(child_build_name)
+  stop_virtual_x(child_build_name)
 
   xdisplaycheck_path = None
   if build_dir:
     xdisplaycheck_path = os.path.join(build_dir, 'xdisplaycheck')
 
-  display = ':%s' % _XvfbDisplayIndex(child_build_name)
+  display = ':%s' % xvfb_display_index(child_build_name)
   # Note we don't add the optional screen here (+ '.0')
   os.environ['DISPLAY'] = display
 
@@ -73,13 +71,13 @@ def StartVirtualX(child_build_name, build_dir):
       print('xdisplaycheck says there is a display still running, exiting...')
       raise Exception('Display already present.')
 
-    xvfb_lock_filename = '/tmp/.X%s-lock' % _XvfbDisplayIndex(child_build_name)
+    xvfb_lock_filename = '/tmp/.X%s-lock' % xvfb_display_index(child_build_name)
     if os.path.exists(xvfb_lock_filename):
       print('Removing stale xvfb lock file %r' % xvfb_lock_filename)
       try:
         os.unlink(xvfb_lock_filename)
-      except OSError as e:
-        print('Removing xvfb lock file failed: %s' % e)
+      except OSError as err:
+        print('Removing xvfb lock file failed: %s' % err)
 
   # Figure out which X server to try.
   cmd = 'Xvfb'
@@ -87,14 +85,14 @@ def StartVirtualX(child_build_name, build_dir):
   # Start a virtual X server that we run the tests in.  This makes it so we can
   # run the tests even if we didn't start the tests from an X session.
   proc = subprocess.Popen([
-      cmd, display, '-screen', '0', '1280x800x24', '-ac', '-dpi', '96',
-      '-maxclients', '512'
+      cmd, display, '-screen', '0', '1280x800x24', '-ac', '-dpi', '96', '-maxclients', '512',
+      '-extension', 'MIT-SHM'
   ],
                           stdout=subprocess.PIPE,
                           stderr=subprocess.STDOUT,
                           env=env)
-  xvfb_pid_filename = _XvfbPidFilename(child_build_name)
-  open(xvfb_pid_filename, 'w').write(str(proc.pid))
+  pid_filename = xvfb_pid_filename(child_build_name)
+  open(pid_filename, 'w').write(str(proc.pid))
 
   # Wait for Xvfb to start up.
   time.sleep(10)
@@ -112,24 +110,24 @@ def StartVirtualX(child_build_name, build_dir):
     if xdisplayproc.returncode != 0:
       print('xdisplaycheck failed after %d seconds.' % checktime)
       print('xdisplaycheck output:')
-      for l in logs.splitlines():
-        print('> %s' % l)
-      rc = proc.poll()
-      if rc is None:
+      for line in logs.splitlines():
+        print('> %s' % line)
+      return_code = proc.poll()
+      if return_code is None:
         print('Xvfb still running, stopping.')
         proc.terminate()
       else:
-        print('Xvfb exited, code %d' % rc)
+        print('Xvfb exited, code %d' % return_code)
 
       print('Xvfb output:')
-      for l in proc.communicate()[0].splitlines():
-        print('> %s' % l)
+      for line in proc.communicate()[0].splitlines():
+        print('> %s' % line)
       raise Exception(logs)
-    else:
-      print('xdisplaycheck succeeded after %d seconds.' % checktime)
-      print('xdisplaycheck output:')
-      for l in logs.splitlines():
-        print('> %s' % l)
+
+    print('xdisplaycheck succeeded after %d seconds.' % checktime)
+    print('xdisplaycheck output:')
+    for line in logs.splitlines():
+      print('> %s' % line)
     print('...OK')
 
   # Some ChromeOS tests need a window manager.
@@ -137,18 +135,18 @@ def StartVirtualX(child_build_name, build_dir):
   print('Window manager (openbox) started.')
 
 
-def StopVirtualX(child_build_name):
+def stop_virtual_x(child_build_name):
   """Try and stop the virtual X server if one was started with StartVirtualX.
   When the X server dies, it takes down the window manager with it.
   If a virtual x server is not running, this method does nothing."""
-  xvfb_pid_filename = _XvfbPidFilename(child_build_name)
-  if os.path.exists(xvfb_pid_filename):
-    xvfb_pid = int(open(xvfb_pid_filename).read())
+  pid_filename = xvfb_pid_filename(child_build_name)
+  if os.path.exists(pid_filename):
+    xvfb_pid = int(open(pid_filename).read())
     print('Stopping Xvfb with pid %d ...' % xvfb_pid)
     # If the process doesn't exist, we raise an exception that we can ignore.
     try:
       os.kill(xvfb_pid, signal.SIGKILL)
     except OSError:
       print('... killing failed, presuming unnecessary.')
-    os.remove(xvfb_pid_filename)
+    os.remove(pid_filename)
     print('Xvfb pid file removed')
diff --git a/third_party/.clang-tidy b/third_party/.clang-tidy
new file mode 100644
index 0000000000000000000000000000000000000000..ef7500e1a8539df37cb0bf7ba95e0d85b1876fdb
--- /dev/null
+++ b/third_party/.clang-tidy
@@ -0,0 +1,4 @@
+# Disable all checks in this folder.
+#
+# We cannot ask third_party code to conform to our lints.
+Checks: "-*"
diff --git a/third_party/.gitignore b/third_party/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..5bd42c1696fcaf2734597078191294a49c06e194
--- /dev/null
+++ b/third_party/.gitignore
@@ -0,0 +1,22 @@
+# Ignore everything by default, as these come from gclient/DEPS.
+# We'll explicitly include the folders we want to track.
+/*
+
+# Include the .gitignore file itself and .clang-tidy.
+!.gitignore
+!.clang-tidy
+!README.md
+
+# Allow custom README.flutter files in each folder.
+**/README.flutter
+
+# Include folders that have hand-written code (not DEPS).
+!accessibility/
+!canvaskit/
+!spring_animation/
+!test_shaders/
+!tonic/
+!txt/
+!web_locale_keymap/
+!web_test_fonts/
+!web_unicode/
diff --git a/third_party/README.md b/third_party/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..ae435e36c8efb9475cce7f1af3de809d0351a0d2
--- /dev/null
+++ b/third_party/README.md
@@ -0,0 +1,24 @@
+# `flutter/third_party`
+
+This directory contains third-party code that is a combination of:
+
+- Code that is vendored into the Flutter repository, from an external source.
+  For example, we might have `third_party/glfw`, which contains the GLFW
+  library, vendored from an external repository.
+
+  > 💡 **TIP**: See [`DEPS`](../DEPS) for where these sources are declared.
+
+- Code that originates from another repository, but is copied (sometimes with
+  alterations) into the Flutter repository. For an example, see
+  [`third_party/spring_animation`](spring_animation/README.md).
+
+- Code that is licensed separately from the rest of the Flutter repository.
+  For example, see [`third_party/txt`](txt/).
+
+When adding a new _externally_ sourced third-party library, update `.gitignore`:
+
+```diff
+# Ignores all third_party/ directories except for the ones we want to track.
+
++ !{folder_name}/
+```
diff --git a/third_party/accessibility/BUILD.gn b/third_party/accessibility/BUILD.gn
index eb217af52fe73c7c37f6f077e70212c8d7bf11ee..19ba407c382204ab5d834f800c440db525eb3934 100644
--- a/third_party/accessibility/BUILD.gn
+++ b/third_party/accessibility/BUILD.gn
@@ -91,6 +91,8 @@ if (enable_unittests) {
       if (is_win) {
         sources += [
           "ax/platform/ax_fragment_root_win_unittest.cc",
+          "ax/platform/ax_platform_node_textprovider_win_unittest.cc",
+          "ax/platform/ax_platform_node_textrangeprovider_win_unittest.cc",
           "ax/platform/ax_platform_node_win_unittest.cc",
           "base/win/dispatch_stub.cc",
           "base/win/dispatch_stub.h",
diff --git a/third_party/accessibility/LICENSE b/third_party/accessibility/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..76755ac7a175c0806a55ad3e9baa3873b544f0f3
--- /dev/null
+++ b/third_party/accessibility/LICENSE
@@ -0,0 +1,27 @@
+Copyright 2015 The Chromium Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/third_party/accessibility/ax/BUILD.gn b/third_party/accessibility/ax/BUILD.gn
index 3c234b72344a7f76bd2f596d07658892ad4fc399..7de6ae2223ef6d7faa2902d64100eea6daa1d215 100644
--- a/third_party/accessibility/ax/BUILD.gn
+++ b/third_party/accessibility/ax/BUILD.gn
@@ -17,6 +17,7 @@ source_set("ax") {
     "platform/ax_platform_node_delegate.h",
     "platform/ax_platform_node_delegate_base.cc",
     "platform/ax_platform_node_delegate_base.h",
+    "platform/ax_platform_tree_manager.h",
     "platform/ax_unique_id.cc",
     "platform/ax_unique_id.h",
     "platform/compute_attributes.cc",
@@ -92,6 +93,10 @@ source_set("ax") {
       "platform/ax_fragment_root_win.h",
       "platform/ax_platform_node_delegate_utils_win.cc",
       "platform/ax_platform_node_delegate_utils_win.h",
+      "platform/ax_platform_node_textprovider_win.cc",
+      "platform/ax_platform_node_textprovider_win.h",
+      "platform/ax_platform_node_textrangeprovider_win.cc",
+      "platform/ax_platform_node_textrangeprovider_win.h",
       "platform/ax_platform_node_win.cc",
       "platform/ax_platform_node_win.h",
       "platform/uia_registrar_win.cc",
@@ -101,6 +106,10 @@ source_set("ax") {
       "oleacc.lib",
       "uiautomationcore.lib",
     ]
+    deps = [
+      "//flutter/fml:fml",
+      "//flutter/third_party/icu:icui18n",
+    ]
   }
 
   public_deps = [
diff --git a/third_party/accessibility/ax/ax_active_popup.cc b/third_party/accessibility/ax/ax_active_popup.cc
index 904de75c4bbb08fb2753b8afd070022d826dba8b..d41510bceb157cf74acf5437f5525608f97b1313 100644
--- a/third_party/accessibility/ax/ax_active_popup.cc
+++ b/third_party/accessibility/ax/ax_active_popup.cc
@@ -15,7 +15,7 @@ namespace ui {
 static std::optional<int32_t> g_active_popup_ax_unique_id;
 
 std::optional<int32_t> GetActivePopupAxUniqueId() {
-  return *g_active_popup_ax_unique_id;
+  return g_active_popup_ax_unique_id;
 }
 
 void SetActivePopupAxUniqueId(std::optional<int32_t> ax_unique_id) {
diff --git a/third_party/accessibility/ax/ax_constants.h b/third_party/accessibility/ax/ax_constants.h
index e9e7388b5de7cb1f8cc47a3b93d37327361f6d22..db93292e485b872b343557672e0759e1134e6e50 100644
--- a/third_party/accessibility/ax/ax_constants.h
+++ b/third_party/accessibility/ax/ax_constants.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef UI_ACCESSIBILITY_AX_CONSTANTS_H_
+#define UI_ACCESSIBILITY_AX_CONSTANTS_H_
+
 #include <cstdint>
 
 namespace ax {
@@ -19,3 +22,5 @@ const int32_t kUnknownAriaColumnOrRowCount = -1;
 }  // namespace mojom
 
 }  // namespace ax
+
+#endif  // UI_ACCESSIBILITY_AX_CONSTANTS_H_
diff --git a/third_party/accessibility/ax/ax_node.cc b/third_party/accessibility/ax/ax_node.cc
index 96491771482aea7bf7673b08ab3b540bc6e7a267..a58d1913efe93663e0d36f499bf36e96db2f7eb6 100644
--- a/third_party/accessibility/ax/ax_node.cc
+++ b/third_party/accessibility/ax/ax_node.cc
@@ -11,6 +11,8 @@
 #include "ax_role_properties.h"
 #include "ax_table_info.h"
 #include "ax_tree.h"
+#include "ax_tree_manager.h"
+#include "ax_tree_manager_map.h"
 #include "base/color_utils.h"
 #include "base/string_utils.h"
 
@@ -1197,6 +1199,30 @@ bool AXNode::IsEmbeddedGroup() const {
   return ui::IsSetLike(parent()->data().role);
 }
 
+AXNode* AXNode::GetLowestPlatformAncestor() const {
+  AXNode* current_node = const_cast<AXNode*>(this);
+  AXNode* lowest_unignored_node = current_node;
+  for (; lowest_unignored_node && lowest_unignored_node->IsIgnored();
+       lowest_unignored_node = lowest_unignored_node->parent()) {
+  }
+
+  // `highest_leaf_node` could be nullptr.
+  AXNode* highest_leaf_node = lowest_unignored_node;
+  // For the purposes of this method, a leaf node does not include leaves in the
+  // internal accessibility tree, only in the platform exposed tree.
+  for (AXNode* ancestor_node = lowest_unignored_node; ancestor_node;
+       ancestor_node = ancestor_node->GetUnignoredParent()) {
+    if (ancestor_node->IsLeaf())
+      highest_leaf_node = ancestor_node;
+  }
+  if (highest_leaf_node)
+    return highest_leaf_node;
+
+  if (lowest_unignored_node)
+    return lowest_unignored_node;
+  return current_node;
+}
+
 AXNode* AXNode::GetTextFieldAncestor() const {
   AXNode* parent = GetUnignoredParent();
 
@@ -1210,4 +1236,69 @@ AXNode* AXNode::GetTextFieldAncestor() const {
   return nullptr;
 }
 
+bool AXNode::IsDescendantOfCrossingTreeBoundary(const AXNode* ancestor) const {
+  if (!ancestor)
+    return false;
+  if (this == ancestor)
+    return true;
+  if (const AXNode* parent = GetParentCrossingTreeBoundary())
+    return parent->IsDescendantOfCrossingTreeBoundary(ancestor);
+  return false;
+}
+
+AXNode* AXNode::GetParentCrossingTreeBoundary() const {
+  BASE_DCHECK(!tree_->GetTreeUpdateInProgressState());
+  if (parent_)
+    return parent_;
+  const AXTreeManager* manager =
+      AXTreeManagerMap::GetInstance().GetManager(tree_->GetAXTreeID());
+  if (manager)
+    return manager->GetParentNodeFromParentTreeAsAXNode();
+  return nullptr;
+}
+
+AXTree::Selection AXNode::GetUnignoredSelection() const {
+  BASE_DCHECK(tree())
+      << "Cannot retrieve the current selection if the node is not "
+         "attached to an accessibility tree.\n"
+      << *this;
+  AXTree::Selection selection = tree()->GetUnignoredSelection();
+
+  // "selection.anchor_offset" and "selection.focus_ofset" might need to be
+  // adjusted if the anchor or the focus nodes include ignored children.
+  //
+  // TODO(nektar): Move this logic into its own "AXSelection" class and cache
+  // the result for faster reuse.
+  const AXNode* anchor = tree()->GetFromId(selection.anchor_object_id);
+  if (anchor && !anchor->IsLeaf()) {
+    BASE_DCHECK(selection.anchor_offset >= 0);
+    if (static_cast<size_t>(selection.anchor_offset) <
+        anchor->children().size()) {
+      const AXNode* anchor_child = anchor->children()[selection.anchor_offset];
+      BASE_DCHECK(anchor_child);
+      selection.anchor_offset =
+          static_cast<int>(anchor_child->GetUnignoredIndexInParent());
+    } else {
+      selection.anchor_offset =
+          static_cast<int>(anchor->GetUnignoredChildCount());
+    }
+  }
+
+  const AXNode* focus = tree()->GetFromId(selection.focus_object_id);
+  if (focus && !focus->IsLeaf()) {
+    BASE_DCHECK(selection.focus_offset >= 0);
+    if (static_cast<size_t>(selection.focus_offset) <
+        focus->children().size()) {
+      const AXNode* focus_child = focus->children()[selection.focus_offset];
+      BASE_DCHECK(focus_child);
+      selection.focus_offset =
+          static_cast<int>(focus_child->GetUnignoredIndexInParent());
+    } else {
+      selection.focus_offset =
+          static_cast<int>(focus->GetUnignoredChildCount());
+    }
+  }
+  return selection;
+}
+
 }  // namespace ui
diff --git a/third_party/accessibility/ax/ax_node.h b/third_party/accessibility/ax/ax_node.h
index 0cae10f933da54c112e71f25efd8bafcb04ee4eb..45fdb42e1e40556563a5e38a99a51601126bdf73 100644
--- a/third_party/accessibility/ax/ax_node.h
+++ b/third_party/accessibility/ax/ax_node.h
@@ -120,6 +120,10 @@ class AX_EXPORT AXNode final {
   size_t GetUnignoredChildCount() const;
   AXNode* GetUnignoredChildAtIndex(size_t index) const;
   AXNode* GetUnignoredParent() const;
+  // Gets the unignored selection from the accessibility tree, meaning the
+  // selection whose endpoints are on unignored nodes. (An "ignored" node is a
+  // node that is not exposed to platform APIs: See `IsIgnored`.)
+  OwnerTree::Selection GetUnignoredSelection() const;
   size_t GetUnignoredIndexInParent() const;
   size_t GetIndexInParent() const;
   AXNode* GetFirstUnignoredChild() const;
@@ -191,6 +195,9 @@ class AX_EXPORT AXNode final {
   // Return true if this object is equal to or a descendant of |ancestor|.
   bool IsDescendantOf(const AXNode* ancestor) const;
 
+  bool IsDescendantOfCrossingTreeBoundary(const AXNode* ancestor) const;
+  AXNode* GetParentCrossingTreeBoundary() const;
+
   // Gets the text offsets where new lines start either from the node's data or
   // by computing them and caching the result.
   std::vector<int> GetOrComputeLineStartOffsets();
@@ -436,6 +443,12 @@ class AX_EXPORT AXNode final {
   // Finds and returns a pointer to ordered set containing node.
   AXNode* GetOrderedSet() const;
 
+  // If this node is exposed to the platform's accessibility layer, returns this
+  // node. Otherwise, returns the lowest ancestor that is exposed to the
+  // platform. (See `IsLeaf` and `IsIgnored` for information on what is
+  // exposed to platform APIs.)
+  AXNode* GetLowestPlatformAncestor() const;
+
  private:
   // Computes the text offset where each line starts by traversing all child
   // leaf nodes.
diff --git a/third_party/accessibility/ax/ax_node_position.cc b/third_party/accessibility/ax/ax_node_position.cc
index 41308933f309071375d632a3353c567f7114291e..733e5b093c3d7ef28669e667171163f37d82fd32 100644
--- a/third_party/accessibility/ax/ax_node_position.cc
+++ b/third_party/accessibility/ax/ax_node_position.cc
@@ -20,6 +20,16 @@ AXEmbeddedObjectBehavior g_ax_embedded_object_behavior =
     AXEmbeddedObjectBehavior::kSuppressCharacter;
 #endif  // defined(OS_WIN)
 
+ScopedAXEmbeddedObjectBehaviorSetter::ScopedAXEmbeddedObjectBehaviorSetter(
+    AXEmbeddedObjectBehavior behavior) {
+  prev_behavior_ = g_ax_embedded_object_behavior;
+  g_ax_embedded_object_behavior = behavior;
+}
+
+ScopedAXEmbeddedObjectBehaviorSetter::~ScopedAXEmbeddedObjectBehaviorSetter() {
+  g_ax_embedded_object_behavior = prev_behavior_;
+}
+
 // static
 AXNodePosition::AXPositionInstance AXNodePosition::CreatePosition(
     const AXNode& node,
@@ -205,8 +215,9 @@ std::u16string AXNodePosition::GetText() const {
         ax::mojom::StringAttribute::kName);
   }
 
-  for (int i = 0; i < AnchorChildCount(); ++i)
+  for (int i = 0; i < AnchorChildCount(); ++i) {
     text += CreateChildPositionAt(i)->GetText();
+  }
 
   return text;
 }
@@ -263,8 +274,9 @@ int AXNodePosition::MaxTextOffset() const {
   }
 
   int text_length = 0;
-  for (int i = 0; i < AnchorChildCount(); ++i)
+  for (int i = 0; i < AnchorChildCount(); ++i) {
     text_length += CreateChildPositionAt(i)->MaxTextOffset();
+  }
 
   return text_length;
 }
@@ -286,9 +298,10 @@ bool AXNodePosition::IsInLineBreakingObject() const {
   if (IsNullPosition())
     return false;
   BASE_DCHECK(GetAnchor());
-  return GetAnchor()->data().GetBoolAttribute(
-             ax::mojom::BoolAttribute::kIsLineBreakingObject) &&
-         !GetAnchor()->IsInListMarker();
+  return (GetAnchor()->data().GetBoolAttribute(
+              ax::mojom::BoolAttribute::kIsLineBreakingObject) &&
+          !GetAnchor()->IsInListMarker()) ||
+         GetAnchor()->data().role == ax::mojom::Role::kLineBreak;
 }
 
 ax::mojom::Role AXNodePosition::GetAnchorRole() const {
diff --git a/third_party/accessibility/ax/ax_node_position_unittest.cc b/third_party/accessibility/ax/ax_node_position_unittest.cc
index 8eb318b3ef0377404de2ff3786167c2a41fc4908..0d028c2270aa4cc023798967b7a334042eaec13e 100644
--- a/third_party/accessibility/ax/ax_node_position_unittest.cc
+++ b/third_party/accessibility/ax/ax_node_position_unittest.cc
@@ -19,6 +19,7 @@
 #include "ax/ax_tree_id.h"
 #include "ax/ax_tree_update.h"
 #include "ax/test_ax_tree_manager.h"
+#include "flutter/fml/platform/win/wstring_conversion.h"
 #include "gtest/gtest.h"
 
 namespace ui {
@@ -28,10 +29,6 @@ using TestPositionRange = AXRange<AXPosition<AXNodePosition, AXNode>>;
 
 namespace {
 
-std::u16string WideToUTF16(const std::wstring wide) {
-  return std::u16string(wide.begin(), wide.end());
-}
-
 constexpr AXNode::AXID ROOT_ID = 1;
 constexpr AXNode::AXID BUTTON_ID = 2;
 constexpr AXNode::AXID CHECK_BOX_ID = 3;
@@ -43,20 +40,20 @@ constexpr AXNode::AXID STATIC_TEXT2_ID = 8;
 constexpr AXNode::AXID INLINE_BOX2_ID = 9;
 
 // A group of basic and extended characters.
-constexpr const wchar_t* kGraphemeClusters[] = {
+constexpr const char16_t* kGraphemeClusters[] = {
     // The English word "hey" consisting of four ASCII characters.
-    L"h",
-    L"e",
-    L"y",
+    u"h",
+    u"e",
+    u"y",
     // A Hindi word (which means "Hindi") consisting of two Devanagari
     // grapheme clusters.
-    L"\x0939\x093F",
-    L"\x0928\x094D\x0926\x0940",
+    u"\x0939\x093F",
+    u"\x0928\x094D\x0926\x0940",
     // A Thai word (which means "feel") consisting of three Thai grapheme
     // clusters.
-    L"\x0E23\x0E39\x0E49",
-    L"\x0E2A\x0E36",
-    L"\x0E01",
+    u"\x0E23\x0E39\x0E49",
+    u"\x0E2A\x0E36",
+    u"\x0E01",
 };
 
 class AXPositionTest : public testing::Test, public TestAXTreeManager {
@@ -297,6 +294,7 @@ void AXPositionTest::SetUp() {
                                true);
   text_field_.AddState(ax::mojom::State::kEditable);
   text_field_.SetValue(TEXT_VALUE);
+  text_field_.SetName(TEXT_VALUE);
   text_field_.AddIntListAttribute(
       ax::mojom::IntListAttribute::kCachedLineStarts,
       std::vector<int32_t>{0, 7});
@@ -418,7 +416,7 @@ std::unique_ptr<AXTree> AXPositionTest::CreateMultilingualDocument(
 
   std::u16string english_text;
   for (int i = 0; i < 3; ++i) {
-    std::u16string grapheme = WideToUTF16(kGraphemeClusters[i]);
+    std::u16string grapheme = kGraphemeClusters[i];
     EXPECT_EQ(1u, grapheme.length())
         << "All English characters should be one UTF16 code unit in length.";
     text_offsets->push_back(text_offsets->back() +
@@ -428,7 +426,7 @@ std::unique_ptr<AXTree> AXPositionTest::CreateMultilingualDocument(
 
   std::u16string hindi_text;
   for (int i = 3; i < 5; ++i) {
-    std::u16string grapheme = WideToUTF16(kGraphemeClusters[i]);
+    std::u16string grapheme = kGraphemeClusters[i];
     EXPECT_LE(2u, grapheme.length()) << "All Hindi characters should be two "
                                         "or more UTF16 code units in length.";
     text_offsets->push_back(text_offsets->back() +
@@ -438,7 +436,7 @@ std::unique_ptr<AXTree> AXPositionTest::CreateMultilingualDocument(
 
   std::u16string thai_text;
   for (int i = 5; i < 8; ++i) {
-    std::u16string grapheme = WideToUTF16(kGraphemeClusters[i]);
+    std::u16string grapheme = kGraphemeClusters[i];
     EXPECT_LT(0u, grapheme.length())
         << "One of the Thai characters should be one UTF16 code unit, "
            "whilst others should be two or more.";
@@ -617,7 +615,7 @@ TEST_F(AXPositionTest, ToString) {
   AXNodeData static_text_data_2;
   static_text_data_2.id = 3;
   static_text_data_2.role = ax::mojom::Role::kStaticText;
-  static_text_data_2.SetName(WideToUTF16(L"\xfffc"));
+  static_text_data_2.SetName(u"\xfffc");
 
   AXNodeData static_text_data_3;
   static_text_data_3.id = 4;
@@ -875,7 +873,7 @@ TEST_F(AXPositionTest, GetTextFromNullPosition) {
   TestPositionType text_position = AXNodePosition::CreateNullPosition();
   ASSERT_NE(nullptr, text_position);
   ASSERT_TRUE(text_position->IsNullPosition());
-  ASSERT_EQ(WideToUTF16(L""), text_position->GetText());
+  ASSERT_EQ(u"", text_position->GetText());
 }
 
 TEST_F(AXPositionTest, GetTextFromRoot) {
@@ -884,7 +882,7 @@ TEST_F(AXPositionTest, GetTextFromRoot) {
       ax::mojom::TextAffinity::kUpstream);
   ASSERT_NE(nullptr, text_position);
   ASSERT_TRUE(text_position->IsTextPosition());
-  ASSERT_EQ(WideToUTF16(L"Line 1\nLine 2"), text_position->GetText());
+  ASSERT_EQ(u"Line 1\nLine 2", text_position->GetText());
 }
 
 TEST_F(AXPositionTest, GetTextFromButton) {
@@ -893,7 +891,7 @@ TEST_F(AXPositionTest, GetTextFromButton) {
       ax::mojom::TextAffinity::kUpstream);
   ASSERT_NE(nullptr, text_position);
   ASSERT_TRUE(text_position->IsTextPosition());
-  ASSERT_EQ(WideToUTF16(L""), text_position->GetText());
+  ASSERT_EQ(u"", text_position->GetText());
 }
 
 TEST_F(AXPositionTest, GetTextFromCheckbox) {
@@ -902,7 +900,7 @@ TEST_F(AXPositionTest, GetTextFromCheckbox) {
       ax::mojom::TextAffinity::kUpstream);
   ASSERT_NE(nullptr, text_position);
   ASSERT_TRUE(text_position->IsTextPosition());
-  ASSERT_EQ(WideToUTF16(L""), text_position->GetText());
+  ASSERT_EQ(u"", text_position->GetText());
 }
 
 TEST_F(AXPositionTest, GetTextFromTextField) {
@@ -911,7 +909,7 @@ TEST_F(AXPositionTest, GetTextFromTextField) {
       ax::mojom::TextAffinity::kUpstream);
   ASSERT_NE(nullptr, text_position);
   ASSERT_TRUE(text_position->IsTextPosition());
-  ASSERT_EQ(WideToUTF16(L"Line 1\nLine 2"), text_position->GetText());
+  ASSERT_EQ(u"Line 1\nLine 2", text_position->GetText());
 }
 
 TEST_F(AXPositionTest, GetTextFromStaticText) {
@@ -920,7 +918,7 @@ TEST_F(AXPositionTest, GetTextFromStaticText) {
       ax::mojom::TextAffinity::kUpstream);
   ASSERT_NE(nullptr, text_position);
   ASSERT_TRUE(text_position->IsTextPosition());
-  ASSERT_EQ(WideToUTF16(L"Line 1"), text_position->GetText());
+  ASSERT_EQ(u"Line 1", text_position->GetText());
 }
 
 TEST_F(AXPositionTest, GetTextFromInlineTextBox) {
@@ -929,7 +927,7 @@ TEST_F(AXPositionTest, GetTextFromInlineTextBox) {
       ax::mojom::TextAffinity::kUpstream);
   ASSERT_NE(nullptr, text_position);
   ASSERT_TRUE(text_position->IsTextPosition());
-  ASSERT_EQ(WideToUTF16(L"Line 1"), text_position->GetText());
+  ASSERT_EQ(u"Line 1", text_position->GetText());
 }
 
 TEST_F(AXPositionTest, GetTextFromLineBreak) {
@@ -938,7 +936,7 @@ TEST_F(AXPositionTest, GetTextFromLineBreak) {
       ax::mojom::TextAffinity::kUpstream);
   ASSERT_NE(nullptr, text_position);
   ASSERT_TRUE(text_position->IsTextPosition());
-  ASSERT_EQ(WideToUTF16(L"\n"), text_position->GetText());
+  ASSERT_EQ(u"\n", text_position->GetText());
 }
 
 TEST_F(AXPositionTest, GetMaxTextOffsetFromNullPosition) {
@@ -1078,7 +1076,7 @@ TEST_F(AXPositionTest, GetMaxTextOffsetAndGetTextWithGeneratedContent) {
   root_1.role = ax::mojom::Role::kRootWebArea;
   root_1.child_ids = {text_field_2.id};
 
-  text_field_2.role = ax::mojom::Role::kTextField;
+  text_field_2.role = ax::mojom::Role::kGroup;
   text_field_2.SetValue("3.14");
   text_field_2.child_ids = {static_text_3.id, static_text_5.id};
 
@@ -1105,7 +1103,7 @@ TEST_F(AXPositionTest, GetMaxTextOffsetAndGetTextWithGeneratedContent) {
   ASSERT_NE(nullptr, text_position);
   EXPECT_TRUE(text_position->IsTextPosition());
   EXPECT_EQ(38, text_position->MaxTextOffset());
-  EXPECT_EQ(WideToUTF16(L"Placeholder from generated content3.14"),
+  EXPECT_EQ(u"Placeholder from generated content3.14",
             text_position->GetText());
 }
 
@@ -1573,7 +1571,7 @@ TEST_F(AXPositionTest, AtStartAndEndOfLineInsideTextField) {
 
   AXNodeData text_field_data_1;
   text_field_data_1.id = 2;
-  text_field_data_1.role = ax::mojom::Role::kTextField;
+  text_field_data_1.role = ax::mojom::Role::kGroup;
   // "kIsLineBreakingObject" and the "kEditable" state are not strictly
   // necessary but are added for completeness.
   text_field_data_1.AddBoolAttribute(
@@ -1613,7 +1611,7 @@ TEST_F(AXPositionTest, AtStartAndEndOfLineInsideTextField) {
 
   AXNodeData text_field_data_2;
   text_field_data_2.id = 7;
-  text_field_data_2.role = ax::mojom::Role::kTextField;
+  text_field_data_2.role = ax::mojom::Role::kGroup;
   // "kIsLineBreakingObject" and the "kEditable" state are not strictly
   // necessary but are added for completeness.
   text_field_data_2.AddBoolAttribute(
@@ -5569,8 +5567,10 @@ TEST_F(AXPositionTest,
 
 TEST_F(AXPositionTest,
        AsLeafTextPositionBeforeAndAfterCharacterAtInvalidGraphemeBoundary) {
+#if true
   GTEST_SKIP()
       << "Skipping, current accessibility library cannot handle grapheme";
+#else
   std::vector<int> text_offsets;
   SetTree(CreateMultilingualDocument(&text_offsets));
 
@@ -5610,6 +5610,7 @@ TEST_F(AXPositionTest,
   // should have been reset in order to provide consistent output from the
   // method regardless of input affinity.
   EXPECT_EQ(ax::mojom::TextAffinity::kDownstream, test_position->affinity());
+#endif  // true
 }
 
 TEST_F(AXPositionTest, AsLeafTextPositionBeforeCharacterNoAdjustment) {
@@ -6398,8 +6399,10 @@ TEST_F(AXPositionTest, CreatePreviousCharacterPosition) {
 }
 
 TEST_F(AXPositionTest, CreateNextCharacterPositionAtGraphemeBoundary) {
+#if true
   GTEST_SKIP()
       << "Skipping, current accessibility library cannot handle grapheme";
+#else
   std::vector<int> text_offsets;
   SetTree(CreateMultilingualDocument(&text_offsets));
 
@@ -6471,11 +6474,14 @@ TEST_F(AXPositionTest, CreateNextCharacterPositionAtGraphemeBoundary) {
   EXPECT_EQ(12, test_position->text_offset());
   // Affinity should have been reset to downstream because there was a move.
   EXPECT_EQ(ax::mojom::TextAffinity::kDownstream, test_position->affinity());
+#endif  // true
 }
 
 TEST_F(AXPositionTest, CreatePreviousCharacterPositionAtGraphemeBoundary) {
+#if true
   GTEST_SKIP()
       << "Skipping, current accessibility library cannot handle grapheme";
+#else
   std::vector<int> text_offsets;
   SetTree(CreateMultilingualDocument(&text_offsets));
 
@@ -6548,6 +6554,7 @@ TEST_F(AXPositionTest, CreatePreviousCharacterPositionAtGraphemeBoundary) {
   EXPECT_EQ(9, test_position->text_offset());
   // Affinity should have been reset to downstream because there was a move.
   EXPECT_EQ(ax::mojom::TextAffinity::kDownstream, test_position->affinity());
+#endif  // true
 }
 
 TEST_F(AXPositionTest, ReciprocalCreateNextAndPreviousCharacterPosition) {
@@ -7567,7 +7574,7 @@ TEST_F(AXPositionTest, EmptyObjectReplacedByCharacterTextNavigation) {
   inline_box_3.AddIntListAttribute(ax::mojom::IntListAttribute::kWordEnds,
                                    std::vector<int32_t>{6});
 
-  text_field_4.role = ax::mojom::Role::kTextField;
+  text_field_4.role = ax::mojom::Role::kGroup;
   text_field_4.child_ids = {generic_container_5.id};
 
   generic_container_5.role = ax::mojom::Role::kGenericContainer;
@@ -7711,10 +7718,10 @@ TEST_F(AXPositionTest, EmptyObjectReplacedByCharacterTextNavigation) {
       GetTreeID(), root_1.id, 0 /* text_offset */,
       ax::mojom::TextAffinity::kDownstream);
 
-  expected_text = WideToUTF16(L"Hello ") + AXNodePosition::kEmbeddedCharacter +
-                  WideToUTF16(L" world3.14") +
-                  AXNodePosition::kEmbeddedCharacter + WideToUTF16(L"hey") +
-                  AXNodePosition::kEmbeddedCharacter;
+  expected_text =
+      std::u16string(u"Hello ") + AXNodePosition::kEmbeddedCharacter +
+      std::u16string(u" world3.14") + AXNodePosition::kEmbeddedCharacter +
+      std::u16string(u"hey") + AXNodePosition::kEmbeddedCharacter;
   ASSERT_EQ(expected_text, position->GetText());
 
   // MaxTextOffset() with an embedded object replacement character.
diff --git a/third_party/accessibility/ax/ax_position.h b/third_party/accessibility/ax/ax_position.h
index bf05933828ec6aebc92e219d24a0734af4df45a1..c426b46047af4f6ab85fb7b1cc43717ab4723f2e 100644
--- a/third_party/accessibility/ax/ax_position.h
+++ b/third_party/accessibility/ax/ax_position.h
@@ -105,6 +105,16 @@ enum class AXEmbeddedObjectBehavior {
 // overridden for testing.
 AX_EXPORT extern AXEmbeddedObjectBehavior g_ax_embedded_object_behavior;
 
+class AX_EXPORT ScopedAXEmbeddedObjectBehaviorSetter {
+ public:
+  explicit ScopedAXEmbeddedObjectBehaviorSetter(
+      AXEmbeddedObjectBehavior behavior);
+  ~ScopedAXEmbeddedObjectBehaviorSetter();
+
+ private:
+  AXEmbeddedObjectBehavior prev_behavior_;
+};
+
 // Forward declarations.
 template <class AXPositionType, class AXNodeType>
 class AXPosition;
@@ -324,8 +334,9 @@ class AXPosition {
     BASE_DCHECK(GetAnchor());
     // If this position is anchored to an ignored node, then consider this
     // position to be ignored.
-    if (GetAnchor()->IsIgnored())
+    if (GetAnchor()->IsIgnored()) {
       return true;
+    }
 
     switch (kind_) {
       case AXPositionKind::NULL_POSITION:
@@ -372,8 +383,9 @@ class AXPosition {
         // If the corresponding leaf position is ignored, the current text
         // offset will point to ignored text. Therefore, consider this position
         // to be ignored.
-        if (!IsLeaf())
+        if (!IsLeaf()) {
           return AsLeafTreePosition()->IsIgnored();
+        }
         return false;
     }
   }
@@ -417,8 +429,9 @@ class AXPosition {
                 (child_index_ >= 0 && child_index_ <= AnchorChildCount())) &&
                !IsInDescendantOfEmptyObject();
       case AXPositionKind::TEXT_POSITION:
-        if (!GetAnchor() || IsInDescendantOfEmptyObject())
+        if (!GetAnchor() || IsInDescendantOfEmptyObject()) {
           return false;
+        }
 
         // For performance reasons we skip any validation of the text offset
         // that involves retrieving the anchor's text, if the offset is set to
@@ -1029,8 +1042,9 @@ class AXPosition {
       const AXNodeType* ancestor_anchor,
       ax::mojom::MoveDirection move_direction =
           ax::mojom::MoveDirection::kForward) const {
-    if (!ancestor_anchor)
+    if (!ancestor_anchor) {
       return CreateNullPosition();
+    }
 
     AXPositionInstance ancestor_position = Clone();
     while (!ancestor_position->IsNullPosition() &&
@@ -1285,8 +1299,9 @@ class AXPosition {
   }
 
   AXPositionInstance AsLeafTextPosition() const {
-    if (IsNullPosition() || IsLeaf())
+    if (IsNullPosition() || IsLeaf()) {
       return AsTextPosition();
+    }
 
     // Adjust the text offset.
     // No need to check for "before text" positions here because they are only
@@ -1316,7 +1331,7 @@ class AXPosition {
           child_position->affinity_ = ax::mojom::TextAffinity::kUpstream;
           break;
         }
-        child_position = text_position->CreateChildPositionAt(i);
+        child_position = std::move(text_position->CreateChildPositionAt(i));
         adjusted_offset -= max_text_offset_in_parent;
       }
 
@@ -1902,7 +1917,7 @@ class AXPosition {
         // the same as the one that would have been computed if the original
         // position were at the start of the inline text box for "Line two".
         const int max_text_offset = MaxTextOffset();
-        const int max_text_offset_in_parent =
+        int max_text_offset_in_parent =
             IsEmbeddedObjectInParent() ? 1 : max_text_offset;
         int parent_offset = AnchorTextOffsetInParent();
         ax::mojom::TextAffinity parent_affinity = affinity_;
@@ -1935,6 +1950,14 @@ class AXPosition {
           parent_affinity = ax::mojom::TextAffinity::kDownstream;
         }
 
+        // This dummy position serves to retrieve the max text offset of the
+        // anchor-node in which we want to create the parent position.
+        AXPositionInstance dummy_position =
+            CreateTextPosition(tree_id, parent_id, 0, parent_affinity);
+        max_text_offset_in_parent = dummy_position->MaxTextOffset();
+        if (parent_offset > max_text_offset_in_parent) {
+          parent_offset = max_text_offset_in_parent;
+        }
         AXPositionInstance parent_position = CreateTextPosition(
             tree_id, parent_id, parent_offset, parent_affinity);
 
@@ -2061,6 +2084,7 @@ class AXPosition {
       BASE_DCHECK(text_position->text_offset_ >= 0);
       return text_position;
     }
+
     text_position = text_position->CreateNextLeafTextPosition();
     while (!text_position->IsNullPosition() &&
            (text_position->IsIgnored() || !text_position->MaxTextOffset())) {
diff --git a/third_party/accessibility/ax/ax_range.h b/third_party/accessibility/ax/ax_range.h
index d7c97687f9f8032e533de6c0b435c99c5fe23f2a..79bcc9f1fbd78d850c386fff3097ce7f4700d723 100644
--- a/third_party/accessibility/ax/ax_range.h
+++ b/third_party/accessibility/ax/ax_range.h
@@ -11,6 +11,7 @@
 #include <utility>
 #include <vector>
 
+#include "ax_clipping_behavior.h"
 #include "ax_enums.h"
 #include "ax_offscreen_result.h"
 #include "ax_role_properties.h"
@@ -35,6 +36,7 @@ class AXRangeRectDelegate {
       AXNode::AXID node_id,
       int start_offset,
       int end_offset,
+      ui::AXClippingBehavior clipping_behavior,
       AXOffscreenResult* offscreen_result) = 0;
   virtual gfx::Rect GetBoundsRect(AXTreeID tree_id,
                                   AXNode::AXID node_id,
@@ -392,7 +394,8 @@ class AXRange {
                     current_line_start->tree_id(),
                     current_line_start->anchor_id(),
                     current_line_start->text_offset(),
-                    current_line_end->text_offset(), &offscreen_result)
+                    current_line_end->text_offset(),
+                    ui::AXClippingBehavior::kUnclipped, &offscreen_result)
               : delegate->GetBoundsRect(current_line_start->tree_id(),
                                         current_line_start->anchor_id(),
                                         &offscreen_result);
diff --git a/third_party/accessibility/ax/ax_range_unittest.cc b/third_party/accessibility/ax/ax_range_unittest.cc
index 06cc8f8087e02b906497946f797feb37fb441606..f8efa277cc38868b6f755f276d6f3a7fab190c5f 100644
--- a/third_party/accessibility/ax/ax_range_unittest.cc
+++ b/third_party/accessibility/ax/ax_range_unittest.cc
@@ -68,6 +68,7 @@ class TestAXRangeScreenRectDelegate : public AXRangeRectDelegate {
       AXNode::AXID node_id,
       int start_offset,
       int end_offset,
+      ui::AXClippingBehavior clipping_behavior,
       AXOffscreenResult* offscreen_result) override {
     if (tree_manager_->GetTreeID() != tree_id)
       return gfx::Rect();
@@ -80,7 +81,7 @@ class TestAXRangeScreenRectDelegate : public AXRangeRectDelegate {
         TestAXNodeHelper::GetOrCreate(tree_manager_->GetTree(), node);
     return wrapper->GetInnerTextRangeBoundsRect(
         start_offset, end_offset, AXCoordinateSystem::kScreenDIPs,
-        AXClippingBehavior::kClipped, offscreen_result);
+        clipping_behavior, offscreen_result);
   }
 
   gfx::Rect GetBoundsRect(AXTreeID tree_id,
@@ -204,7 +205,7 @@ void AXRangeTest::SetUp() {
   check_box2_.AddIntAttribute(ax::mojom::IntAttribute::kPreviousOnLineId,
                               check_box1_.id);
 
-  text_field_.role = ax::mojom::Role::kTextField;
+  text_field_.role = ax::mojom::Role::kGroup;
   text_field_.AddState(ax::mojom::State::kEditable);
   text_field_.SetValue(TEXT_FIELD);
   text_field_.AddIntListAttribute(
diff --git a/third_party/accessibility/ax/ax_role_properties.cc b/third_party/accessibility/ax/ax_role_properties.cc
index 0e85813cb70dec236cbe66c14a1b78cfff58670e..8e699979b1a27563fd206b4d63e6b73d1681f262 100644
--- a/third_party/accessibility/ax/ax_role_properties.cc
+++ b/third_party/accessibility/ax/ax_role_properties.cc
@@ -687,6 +687,9 @@ bool IsText(ax::mojom::Role role) {
     case ax::mojom::Role::kInlineTextBox:
     case ax::mojom::Role::kLineBreak:
     case ax::mojom::Role::kStaticText:
+    case ax::mojom::Role::kTextField:
+    case ax::mojom::Role::kTextFieldWithComboBox:
+    case ax::mojom::Role::kLabelText:
       return true;
     default:
       return false;
diff --git a/third_party/accessibility/ax/ax_table_info.h b/third_party/accessibility/ax/ax_table_info.h
index 53086c42693c18501c3786bff29804464e01f2f3..ef9266f2e5c4145824c451d14c3075f8daf22310 100644
--- a/third_party/accessibility/ax/ax_table_info.h
+++ b/third_party/accessibility/ax/ax_table_info.h
@@ -7,6 +7,7 @@
 
 #include <map>
 #include <set>
+#include <string>
 #include <unordered_map>
 #include <vector>
 
diff --git a/third_party/accessibility/ax/ax_tree_manager.h b/third_party/accessibility/ax/ax_tree_manager.h
index 7a3c3bb72ed410689c89e0aa4f398ccdb20e8d52..3b4476ae7323cd7ffb0eb6de4c4fe87172e52936 100644
--- a/third_party/accessibility/ax/ax_tree_manager.h
+++ b/third_party/accessibility/ax/ax_tree_manager.h
@@ -7,6 +7,7 @@
 
 #include "ax_export.h"
 #include "ax_node.h"
+#include "ax_tree.h"
 #include "ax_tree_id.h"
 
 namespace ui {
@@ -16,6 +17,8 @@ namespace ui {
 // trees).
 class AX_EXPORT AXTreeManager {
  public:
+  virtual ~AXTreeManager() = default;
+
   // Returns the AXNode with the given |node_id| from the tree that has the
   // given |tree_id|. This allows for callers to access nodes outside of their
   // own tree. Returns nullptr if |tree_id| or |node_id| is not found.
@@ -40,6 +43,8 @@ class AX_EXPORT AXTreeManager {
   // hosts the current tree. Returns nullptr if this tree doesn't have a parent
   // tree.
   virtual AXNode* GetParentNodeFromParentTreeAsAXNode() const = 0;
+
+  virtual AXTree* GetTree() const = 0;
 };
 
 }  // namespace ui
diff --git a/third_party/accessibility/ax/ax_tree_update.h b/third_party/accessibility/ax/ax_tree_update.h
index e0b895f8550ec82a20723e04711f949c7ada0a75..e091c4e67aad64bbffadcfdd89ad6dbf2439bdf9 100644
--- a/third_party/accessibility/ax/ax_tree_update.h
+++ b/third_party/accessibility/ax/ax_tree_update.h
@@ -50,9 +50,6 @@ namespace ui {
 //        before or after an AXTreeUpdate.
 template <typename AXNodeData, typename AXTreeData>
 struct AXTreeUpdateBase {
-  AXTreeUpdateBase() = default;
-  ~AXTreeUpdateBase() = default;
-
   // If |has_tree_data| is true, the value of |tree_data| should be used
   // to update the tree data, otherwise it should be ignored.
   bool has_tree_data = false;
diff --git a/third_party/accessibility/ax/platform/ax_fragment_root_win.cc b/third_party/accessibility/ax/platform/ax_fragment_root_win.cc
index d6abe02c3e2c766fcd10abec416cd4803fa2c9c9..e6ef519656473ff1bcb73557c4723b6d928092f3 100644
--- a/third_party/accessibility/ax/platform/ax_fragment_root_win.cc
+++ b/third_party/accessibility/ax/platform/ax_fragment_root_win.cc
@@ -289,7 +289,7 @@ class AXFragmentRootMapWin {
 
 AXFragmentRootWin::AXFragmentRootWin(gfx::AcceleratedWidget widget,
                                      AXFragmentRootDelegateWin* delegate)
-    : widget_(widget), delegate_(delegate) {
+    : widget_(widget), delegate_(delegate), alert_node_(nullptr) {
   platform_node_ = ui::AXFragmentRootPlatformNodeWin::Create(this);
   AXFragmentRootMapWin::GetInstance().AddFragmentRoot(widget, this);
 }
@@ -331,6 +331,8 @@ int AXFragmentRootWin::GetChildCount() const {
 gfx::NativeViewAccessible AXFragmentRootWin::ChildAtIndex(int index) {
   if (index == 0) {
     return delegate_->GetChildOfAXFragmentRoot();
+  } else if (index == 1 && alert_node_) {
+    return alert_node_;
   }
 
   return nullptr;
@@ -425,4 +427,18 @@ int AXFragmentRootWin::GetIndexInParentOfChild() const {
   return 0;
 }
 
+void AXFragmentRootWin::SetAlertNode(AXPlatformNodeWin* alert_node) {
+  alert_node_ = alert_node;
+}
+
+gfx::Rect AXFragmentRootWin::GetBoundsRect(AXCoordinateSystem sys,
+                                           AXClippingBehavior clip,
+                                           AXOffscreenResult* result) const {
+  AXPlatformNodeDelegate* child = GetChildNodeDelegate();
+  if (!child) {
+    return gfx::Rect();
+  }
+  return child->GetBoundsRect(sys, clip, result);
+}
+
 }  // namespace ui
diff --git a/third_party/accessibility/ax/platform/ax_fragment_root_win.h b/third_party/accessibility/ax/platform/ax_fragment_root_win.h
index ec357d4dffbff0971c22b4ff299f050d2cb036da..fe3699cf211ae6916cfcaa8e4cb9fc0e046537e5 100644
--- a/third_party/accessibility/ax/platform/ax_fragment_root_win.h
+++ b/third_party/accessibility/ax/platform/ax_fragment_root_win.h
@@ -13,6 +13,7 @@ namespace ui {
 
 class AXFragmentRootDelegateWin;
 class AXFragmentRootPlatformNodeWin;
+class AXPlatformNodeWin;
 
 // UI Automation on Windows requires the root of a multi-element provider to
 // implement IRawElementProviderFragmentRoot. Our internal accessibility trees
@@ -55,6 +56,16 @@ class AX_EXPORT AXFragmentRootWin : public ui::AXPlatformNodeDelegateBase {
   // If a child node is available, return its delegate.
   AXPlatformNodeDelegate* GetChildNodeDelegate() const;
 
+  // |AXPlatformNodeDelegate|
+  gfx::AcceleratedWidget GetTargetForNativeAccessibilityEvent() override;
+
+  // alert_node is an AXPlatformNodeWin whose text value can be set by the
+  // application for the purposes of announcing messages to a screen reader.
+  // AXFragmentRootWin does not own its alert_node_; it is owned by the object
+  // with the responsibility of setting its text. In the case of flutter
+  // windows, this is the Window.
+  void SetAlertNode(AXPlatformNodeWin* alert_node);
+
  private:
   // AXPlatformNodeDelegate overrides.
   gfx::NativeViewAccessible GetParent() override;
@@ -65,9 +76,11 @@ class AX_EXPORT AXFragmentRootWin : public ui::AXPlatformNodeDelegateBase {
   gfx::NativeViewAccessible HitTestSync(int x, int y) const override;
   gfx::NativeViewAccessible GetFocus() override;
   const ui::AXUniqueId& GetUniqueId() const override;
-  gfx::AcceleratedWidget GetTargetForNativeAccessibilityEvent() override;
   AXPlatformNode* GetFromTreeIDAndNodeID(const ui::AXTreeID& ax_tree_id,
                                          int32_t id) override;
+  gfx::Rect GetBoundsRect(const AXCoordinateSystem acs,
+                          const AXClippingBehavior acb,
+                          AXOffscreenResult* result) const override;
 
   // A fragment root does not correspond to any node in the platform neutral
   // accessibility tree. Rather, the fragment root's child is a child of the
@@ -82,6 +95,9 @@ class AX_EXPORT AXFragmentRootWin : public ui::AXPlatformNodeDelegateBase {
   AXFragmentRootDelegateWin* const delegate_;
   Microsoft::WRL::ComPtr<ui::AXFragmentRootPlatformNodeWin> platform_node_;
   ui::AXUniqueId unique_id_;
+
+  // Node that presents the alert, if any.
+  AXPlatformNodeWin* alert_node_;
 };
 
 }  // namespace ui
diff --git a/third_party/accessibility/ax/platform/ax_platform_node_delegate.h b/third_party/accessibility/ax/platform/ax_platform_node_delegate.h
index 2bf9c2ff48c8ff8e0969919059ae17e86c3033ab..448f4de5da0357d370f5de9b0a3f55d06e5ebd18 100644
--- a/third_party/accessibility/ax/platform/ax_platform_node_delegate.h
+++ b/third_party/accessibility/ax/platform/ax_platform_node_delegate.h
@@ -311,7 +311,7 @@ class AX_EXPORT AXPlatformNodeDelegate {
   // produce appropriate results. It may optionally return no value, indicating
   // that the delegate does not have all the information required to calculate
   // this value and it is the responsibility of the AXPlatformNode itself to
-  // to calculate it.
+  // calculate it.
   virtual std::optional<int> FindTextBoundary(
       ax::mojom::TextBoundary boundary,
       int offset,
@@ -416,6 +416,14 @@ class AX_EXPORT AXPlatformNodeDelegate {
   // element. The default value should be false if not in testing mode.
   virtual bool ShouldIgnoreHoveredStateForTesting() = 0;
 
+  // If this object is exposed to the platform's accessibility layer, returns
+  // this object. Otherwise, returns the platform leaf or lowest unignored
+  // ancestor under which this object is found.
+  //
+  // (An ignored node means that the node should not be exposed to platform
+  // APIs: See `IsIgnored`.)
+  virtual gfx::NativeViewAccessible GetLowestPlatformAncestor() const = 0;
+
   // Creates a string representation of this delegate's data.
   std::string ToString() { return GetData().ToString(); }
 
diff --git a/third_party/accessibility/ax/platform/ax_platform_node_delegate_base.cc b/third_party/accessibility/ax/platform/ax_platform_node_delegate_base.cc
index f91d4935bc038098f4ad502bfd5dc1b75a91a0e9..501c75096fa104997e3a9070c440033783a94370 100644
--- a/third_party/accessibility/ax/platform/ax_platform_node_delegate_base.cc
+++ b/third_party/accessibility/ax/platform/ax_platform_node_delegate_base.cc
@@ -87,6 +87,32 @@ gfx::NativeViewAccessible AXPlatformNodeDelegateBase::GetParent() {
   return nullptr;
 }
 
+gfx::NativeViewAccessible
+AXPlatformNodeDelegateBase::GetLowestPlatformAncestor() const {
+  AXPlatformNodeDelegateBase* current_delegate =
+      const_cast<AXPlatformNodeDelegateBase*>(this);
+  AXPlatformNodeDelegateBase* lowest_unignored_delegate = current_delegate;
+
+  // `highest_leaf_delegate` could be nullptr.
+  AXPlatformNodeDelegateBase* highest_leaf_delegate = lowest_unignored_delegate;
+  // For the purposes of this method, a leaf node does not include leaves in the
+  // internal accessibility tree, only in the platform exposed tree.
+  for (AXPlatformNodeDelegateBase* ancestor_delegate =
+           lowest_unignored_delegate;
+       ancestor_delegate;
+       ancestor_delegate = static_cast<AXPlatformNodeDelegateBase*>(
+           ancestor_delegate->GetParentDelegate())) {
+    if (ancestor_delegate->IsLeaf())
+      highest_leaf_delegate = ancestor_delegate;
+  }
+  if (highest_leaf_delegate)
+    return highest_leaf_delegate->GetNativeViewAccessible();
+
+  if (lowest_unignored_delegate)
+    return lowest_unignored_delegate->GetNativeViewAccessible();
+  return current_delegate->GetNativeViewAccessible();
+}
+
 int AXPlatformNodeDelegateBase::GetChildCount() const {
   return 0;
 }
diff --git a/third_party/accessibility/ax/platform/ax_platform_node_delegate_base.h b/third_party/accessibility/ax/platform/ax_platform_node_delegate_base.h
index 58e8d086d95b3d61463dd3751f8f7d7fbab51694..c51decc3640f27b6ec730695c1d3ffaf90029a17 100644
--- a/third_party/accessibility/ax/platform/ax_platform_node_delegate_base.h
+++ b/third_party/accessibility/ax/platform/ax_platform_node_delegate_base.h
@@ -51,6 +51,14 @@ class AX_EXPORT AXPlatformNodeDelegateBase : public AXPlatformNodeDelegate {
   // be a native accessible object implemented by another class.
   gfx::NativeViewAccessible GetParent() override;
 
+  // If this object is exposed to the platform's accessibility layer, returns
+  // this object. Otherwise, returns the platform leaf or lowest unignored
+  // ancestor under which this object is found.
+  //
+  // (An ignored node means that the node should not be exposed to platform
+  // APIs: See `IsIgnored`.)
+  gfx::NativeViewAccessible GetLowestPlatformAncestor() const override;
+
   // Get the index in parent. Typically this is the AXNode's index_in_parent_.
   int GetIndexInParent() override;
 
diff --git a/third_party/accessibility/ax/platform/ax_platform_node_textprovider_win.cc b/third_party/accessibility/ax/platform/ax_platform_node_textprovider_win.cc
new file mode 100644
index 0000000000000000000000000000000000000000..7c373df99ee1a5c69302223a1eb676069f6c9225
--- /dev/null
+++ b/third_party/accessibility/ax/platform/ax_platform_node_textprovider_win.cc
@@ -0,0 +1,354 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ax/platform/ax_platform_node_textprovider_win.h"
+
+#include <wrl/client.h>
+
+#include "base/win/scoped_safearray.h"
+
+#include "ax/platform/ax_platform_node_textrangeprovider_win.h"
+
+#define UIA_VALIDATE_TEXTPROVIDER_CALL() \
+  if (!owner()->GetDelegate())           \
+    return UIA_E_ELEMENTNOTAVAILABLE;
+#define UIA_VALIDATE_TEXTPROVIDER_CALL_1_ARG(arg) \
+  if (!owner()->GetDelegate())                    \
+    return UIA_E_ELEMENTNOTAVAILABLE;             \
+  if (!arg)                                       \
+    return E_INVALIDARG;
+
+namespace ui {
+
+AXPlatformNodeTextProviderWin::AXPlatformNodeTextProviderWin() {}
+
+AXPlatformNodeTextProviderWin::~AXPlatformNodeTextProviderWin() {}
+
+// static
+AXPlatformNodeTextProviderWin* AXPlatformNodeTextProviderWin::Create(
+    AXPlatformNodeWin* owner) {
+  CComObject<AXPlatformNodeTextProviderWin>* text_provider = nullptr;
+  if (SUCCEEDED(CComObject<AXPlatformNodeTextProviderWin>::CreateInstance(
+          &text_provider))) {
+    BASE_DCHECK(text_provider);
+    text_provider->owner_ = owner;
+    text_provider->AddRef();
+    return text_provider;
+  }
+
+  return nullptr;
+}
+
+// static
+void AXPlatformNodeTextProviderWin::CreateIUnknown(AXPlatformNodeWin* owner,
+                                                   IUnknown** unknown) {
+  Microsoft::WRL::ComPtr<AXPlatformNodeTextProviderWin> text_provider(
+      Create(owner));
+  if (text_provider)
+    *unknown = text_provider.Detach();
+}
+
+//
+// ITextProvider methods.
+//
+
+HRESULT AXPlatformNodeTextProviderWin::GetSelection(SAFEARRAY** selection) {
+  UIA_VALIDATE_TEXTPROVIDER_CALL();
+
+  *selection = nullptr;
+
+  AXPlatformNodeDelegate* delegate = owner()->GetDelegate();
+  AXTree::Selection unignored_selection = delegate->GetUnignoredSelection();
+
+  AXPlatformNode* anchor_object =
+      delegate->GetFromNodeID(unignored_selection.anchor_object_id);
+  AXPlatformNode* focus_object =
+      delegate->GetFromNodeID(unignored_selection.focus_object_id);
+
+  // anchor_offset corresponds to the selection start index
+  // and focus_offset is where the selection ends.
+  auto start_offset = unignored_selection.anchor_offset;
+  auto end_offset = unignored_selection.focus_offset;
+
+  // If there's no selected object, return success and don't fill the SAFEARRAY.
+  if (!anchor_object || !focus_object)
+    return S_OK;
+
+  AXNodePosition::AXPositionInstance start =
+      anchor_object->GetDelegate()->CreateTextPositionAt(start_offset);
+  AXNodePosition::AXPositionInstance end =
+      focus_object->GetDelegate()->CreateTextPositionAt(end_offset);
+
+  BASE_DCHECK(!start->IsNullPosition());
+  BASE_DCHECK(!end->IsNullPosition());
+
+  // Reverse start and end if the selection goes backwards
+  if (*start > *end)
+    std::swap(start, end);
+
+  Microsoft::WRL::ComPtr<ITextRangeProvider> text_range_provider =
+      AXPlatformNodeTextRangeProviderWin::CreateTextRangeProvider(
+          std::move(start), std::move(end));
+  if (&text_range_provider == nullptr)
+    return E_OUTOFMEMORY;
+
+  // Since we don't support disjoint text ranges, the SAFEARRAY returned
+  // will always have one element
+  base::win::ScopedSafearray selections_to_return(
+      SafeArrayCreateVector(VT_UNKNOWN /* element type */, 0 /* lower bound */,
+                            1 /* number of elements */));
+
+  if (!selections_to_return.Get())
+    return E_OUTOFMEMORY;
+
+  LONG index = 0;
+  HRESULT hr = SafeArrayPutElement(selections_to_return.Get(), &index,
+                                   text_range_provider.Get());
+  BASE_DCHECK(SUCCEEDED(hr));
+
+  // Since BASE_DCHECK only happens in debug builds, return immediately to
+  // ensure that we're not leaking the SAFEARRAY on release builds
+  if (FAILED(hr))
+    return E_FAIL;
+
+  *selection = selections_to_return.Release();
+
+  return S_OK;
+}
+
+HRESULT AXPlatformNodeTextProviderWin::GetVisibleRanges(
+    SAFEARRAY** visible_ranges) {
+  UIA_VALIDATE_TEXTPROVIDER_CALL();
+
+  const AXPlatformNodeDelegate* delegate = owner()->GetDelegate();
+
+  // Get the Clipped Frame Bounds of the current node, not from the root,
+  // so if this node is wrapped with overflow styles it will have the
+  // correct bounds
+  const gfx::Rect frame_rect = delegate->GetBoundsRect(
+      AXCoordinateSystem::kFrame, AXClippingBehavior::kClipped);
+
+  const auto start = delegate->CreateTextPositionAt(0);
+  const auto end = start->CreatePositionAtEndOfAnchor();
+  BASE_DCHECK(start->GetAnchor() == end->GetAnchor());
+
+  // SAFEARRAYs are not dynamic, so fill the visible ranges in a vector
+  // and then transfer to an appropriately-sized SAFEARRAY
+  std::vector<Microsoft::WRL::ComPtr<ITextRangeProvider>> ranges;
+
+  auto current_line_start = start->Clone();
+  while (!current_line_start->IsNullPosition() && *current_line_start < *end) {
+    auto current_line_end = current_line_start->CreateNextLineEndPosition(
+        AXBoundaryBehavior::CrossBoundary);
+    if (current_line_end->IsNullPosition() || *current_line_end > *end)
+      current_line_end = end->Clone();
+
+    gfx::Rect current_rect = delegate->GetInnerTextRangeBoundsRect(
+        current_line_start->text_offset(), current_line_end->text_offset(),
+        AXCoordinateSystem::kFrame, AXClippingBehavior::kUnclipped);
+
+    if (frame_rect.Contains(current_rect)) {
+      Microsoft::WRL::ComPtr<ITextRangeProvider> text_range_provider =
+          AXPlatformNodeTextRangeProviderWin::CreateTextRangeProvider(
+              current_line_start->Clone(), current_line_end->Clone());
+
+      ranges.emplace_back(text_range_provider);
+    }
+
+    current_line_start = current_line_start->CreateNextLineStartPosition(
+        AXBoundaryBehavior::CrossBoundary);
+  }
+
+  base::win::ScopedSafearray scoped_visible_ranges(
+      SafeArrayCreateVector(VT_UNKNOWN /* element type */, 0 /* lower bound */,
+                            ranges.size() /* number of elements */));
+
+  if (!scoped_visible_ranges.Get())
+    return E_OUTOFMEMORY;
+
+  LONG index = 0;
+  for (Microsoft::WRL::ComPtr<ITextRangeProvider>& current_provider : ranges) {
+    HRESULT hr = SafeArrayPutElement(scoped_visible_ranges.Get(), &index,
+                                     current_provider.Get());
+    BASE_DCHECK(SUCCEEDED(hr));
+
+    // Since BASE_DCHECK only happens in debug builds, return immediately to
+    // ensure that we're not leaking the SAFEARRAY on release builds
+    if (FAILED(hr))
+      return E_FAIL;
+
+    ++index;
+  }
+
+  *visible_ranges = scoped_visible_ranges.Release();
+
+  return S_OK;
+}
+
+HRESULT AXPlatformNodeTextProviderWin::RangeFromChild(
+    IRawElementProviderSimple* child,
+    ITextRangeProvider** range) {
+  UIA_VALIDATE_TEXTPROVIDER_CALL_1_ARG(child);
+
+  *range = nullptr;
+
+  Microsoft::WRL::ComPtr<ui::AXPlatformNodeWin> child_platform_node;
+  if (!SUCCEEDED(child->QueryInterface(IID_PPV_ARGS(&child_platform_node))))
+    return UIA_E_INVALIDOPERATION;
+
+  if (!owner()->IsDescendant(child_platform_node.Get()))
+    return E_INVALIDARG;
+
+  *range = GetRangeFromChild(owner(), child_platform_node.Get());
+
+  return S_OK;
+}
+
+HRESULT AXPlatformNodeTextProviderWin::RangeFromPoint(
+    UiaPoint uia_point,
+    ITextRangeProvider** range) {
+  UIA_VALIDATE_TEXTPROVIDER_CALL();
+  *range = nullptr;
+
+  gfx::Point point(uia_point.x, uia_point.y);
+  // Retrieve the closest accessibility node. No coordinate unit conversion is
+  // needed, hit testing input is also in screen coordinates.
+
+  AXPlatformNodeWin* nearest_node =
+      static_cast<AXPlatformNodeWin*>(owner()->NearestLeafToPoint(point));
+  BASE_DCHECK(nearest_node);
+  BASE_DCHECK(nearest_node->IsLeaf());
+
+  AXNodePosition::AXPositionInstance start, end;
+  start = nearest_node->GetDelegate()->CreateTextPositionAt(
+      nearest_node->NearestTextIndexToPoint(point));
+  BASE_DCHECK(!start->IsNullPosition());
+  end = start->Clone();
+
+  *range = AXPlatformNodeTextRangeProviderWin::CreateTextRangeProvider(
+      std::move(start), std::move(end));
+  return S_OK;
+}
+
+HRESULT AXPlatformNodeTextProviderWin::get_DocumentRange(
+    ITextRangeProvider** range) {
+  UIA_VALIDATE_TEXTPROVIDER_CALL();
+
+  // Get range from child, where child is the current node. In other words,
+  // getting the text range of the current owner AxPlatformNodeWin node.
+  *range = GetRangeFromChild(owner(), owner());
+
+  return S_OK;
+}
+
+HRESULT AXPlatformNodeTextProviderWin::get_SupportedTextSelection(
+    enum SupportedTextSelection* text_selection) {
+  UIA_VALIDATE_TEXTPROVIDER_CALL();
+
+  *text_selection = SupportedTextSelection_Single;
+  return S_OK;
+}
+
+//
+// ITextEditProvider methods.
+//
+
+HRESULT AXPlatformNodeTextProviderWin::GetActiveComposition(
+    ITextRangeProvider** range) {
+  UIA_VALIDATE_TEXTPROVIDER_CALL();
+
+  *range = nullptr;
+  return GetTextRangeProviderFromActiveComposition(range);
+}
+
+HRESULT AXPlatformNodeTextProviderWin::GetConversionTarget(
+    ITextRangeProvider** range) {
+  UIA_VALIDATE_TEXTPROVIDER_CALL();
+
+  *range = nullptr;
+  return GetTextRangeProviderFromActiveComposition(range);
+}
+
+ITextRangeProvider* AXPlatformNodeTextProviderWin::GetRangeFromChild(
+    ui::AXPlatformNodeWin* ancestor,
+    ui::AXPlatformNodeWin* descendant) {
+  BASE_DCHECK(ancestor);
+  BASE_DCHECK(descendant);
+  BASE_DCHECK(descendant->GetDelegate());
+  BASE_DCHECK(ancestor->IsDescendant(descendant));
+
+  // Start and end should be leaf text positions that span the beginning and end
+  // of text content within a node. The start position should be the directly
+  // first child and the end position should be the deepest last child node.
+  AXNodePosition::AXPositionInstance start =
+      descendant->GetDelegate()->CreateTextPositionAt(0)->AsLeafTextPosition();
+
+  AXNodePosition::AXPositionInstance end;
+  if (descendant->GetChildCount() == 0) {
+    end = descendant->GetDelegate()
+              ->CreateTextPositionAt(0)
+              ->CreatePositionAtEndOfAnchor()
+              ->AsLeafTextPosition();
+  } else {
+    AXPlatformNodeBase* deepest_last_child = descendant->GetLastChild();
+    while (deepest_last_child && deepest_last_child->GetChildCount() > 0)
+      deepest_last_child = deepest_last_child->GetLastChild();
+
+    end = deepest_last_child->GetDelegate()
+              ->CreateTextPositionAt(0)
+              ->CreatePositionAtEndOfAnchor()
+              ->AsLeafTextPosition();
+  }
+
+  return AXPlatformNodeTextRangeProviderWin::CreateTextRangeProvider(
+      std::move(start), std::move(end));
+}
+
+ITextRangeProvider* AXPlatformNodeTextProviderWin::CreateDegenerateRangeAtStart(
+    ui::AXPlatformNodeWin* node) {
+  BASE_DCHECK(node);
+  BASE_DCHECK(node->GetDelegate());
+
+  // Create a degenerate range positioned at the node's start.
+  AXNodePosition::AXPositionInstance start, end;
+  start = node->GetDelegate()->CreateTextPositionAt(0)->AsLeafTextPosition();
+  end = start->Clone();
+  return AXPlatformNodeTextRangeProviderWin::CreateTextRangeProvider(
+      std::move(start), std::move(end));
+}
+
+ui::AXPlatformNodeWin* AXPlatformNodeTextProviderWin::owner() const {
+  return owner_.Get();
+}
+
+HRESULT
+AXPlatformNodeTextProviderWin::GetTextRangeProviderFromActiveComposition(
+    ITextRangeProvider** range) {
+  *range = nullptr;
+  // We fetch the start and end offset of an active composition only if
+  // this object has focus and TSF is in composition mode.
+  // The offsets here refer to the character positions in a plain text
+  // view of the DOM tree. Ex: if the active composition in an element
+  // has "abc" then the range will be (0,3) in both TSF and accessibility
+  if ((AXPlatformNode::FromNativeViewAccessible(
+           owner()->GetDelegate()->GetFocus()) ==
+       static_cast<AXPlatformNode*>(owner())) &&
+      owner()->HasActiveComposition()) {
+    gfx::Range active_composition_offset =
+        owner()->GetActiveCompositionOffsets();
+    AXNodePosition::AXPositionInstance start =
+        owner()->GetDelegate()->CreateTextPositionAt(
+            /*offset*/ active_composition_offset.start());
+    AXNodePosition::AXPositionInstance end =
+        owner()->GetDelegate()->CreateTextPositionAt(
+            /*offset*/ active_composition_offset.end());
+
+    *range = AXPlatformNodeTextRangeProviderWin::CreateTextRangeProvider(
+        std::move(start), std::move(end));
+  }
+
+  return S_OK;
+}
+
+}  // namespace ui
diff --git a/third_party/accessibility/ax/platform/ax_platform_node_textprovider_win.h b/third_party/accessibility/ax/platform/ax_platform_node_textprovider_win.h
new file mode 100644
index 0000000000000000000000000000000000000000..9dbb4f72ab53dcf5d71db1544aadff1a6ed1bb59
--- /dev/null
+++ b/third_party/accessibility/ax/platform/ax_platform_node_textprovider_win.h
@@ -0,0 +1,82 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef UI_ACCESSIBILITY_PLATFORM_AX_PLATFORM_NODE_TEXTPROVIDER_WIN_H_
+#define UI_ACCESSIBILITY_PLATFORM_AX_PLATFORM_NODE_TEXTPROVIDER_WIN_H_
+
+#include <atlbase.h>
+#include <atlcom.h>
+
+#include <UIAutomationCore.h>
+
+#include "ax/ax_node_position.h"
+#include "ax/platform/ax_platform_node_win.h"
+
+namespace ui {
+
+class AX_EXPORT __declspec(uuid("3e1c192b-4348-45ac-8eb6-4b58eeb3dcca"))
+    AXPlatformNodeTextProviderWin
+    : public CComObjectRootEx<CComMultiThreadModel>,
+      public ITextEditProvider {
+ public:
+  BEGIN_COM_MAP(AXPlatformNodeTextProviderWin)
+  COM_INTERFACE_ENTRY(ITextProvider)
+  COM_INTERFACE_ENTRY(ITextEditProvider)
+  COM_INTERFACE_ENTRY(AXPlatformNodeTextProviderWin)
+  END_COM_MAP()
+
+  AXPlatformNodeTextProviderWin();
+  ~AXPlatformNodeTextProviderWin();
+
+  static AXPlatformNodeTextProviderWin* Create(AXPlatformNodeWin* owner);
+  static void CreateIUnknown(AXPlatformNodeWin* owner, IUnknown** unknown);
+
+  //
+  // ITextProvider methods.
+  //
+
+  IFACEMETHODIMP GetSelection(SAFEARRAY** selection) override;
+
+  IFACEMETHODIMP GetVisibleRanges(SAFEARRAY** visible_ranges) override;
+
+  IFACEMETHODIMP RangeFromChild(IRawElementProviderSimple* child,
+                                ITextRangeProvider** range) override;
+
+  IFACEMETHODIMP RangeFromPoint(UiaPoint point,
+                                ITextRangeProvider** range) override;
+
+  IFACEMETHODIMP get_DocumentRange(ITextRangeProvider** range) override;
+
+  IFACEMETHODIMP get_SupportedTextSelection(
+      enum SupportedTextSelection* text_selection) override;
+
+  //
+  // ITextEditProvider methods.
+  //
+
+  IFACEMETHODIMP GetActiveComposition(ITextRangeProvider** range) override;
+
+  IFACEMETHODIMP GetConversionTarget(ITextRangeProvider** range) override;
+
+  // ITextProvider supporting methods.
+
+  static ITextRangeProvider* GetRangeFromChild(
+      ui::AXPlatformNodeWin* ancestor,
+      ui::AXPlatformNodeWin* descendant);
+
+  // Create a dengerate text range at the start of the specified node.
+  static ITextRangeProvider* CreateDegenerateRangeAtStart(
+      ui::AXPlatformNodeWin* node);
+
+ private:
+  friend class AXPlatformNodeTextProviderTest;
+  ui::AXPlatformNodeWin* owner() const;
+  HRESULT GetTextRangeProviderFromActiveComposition(ITextRangeProvider** range);
+
+  Microsoft::WRL::ComPtr<ui::AXPlatformNodeWin> owner_;
+};
+
+}  // namespace ui
+
+#endif  // UI_ACCESSIBILITY_PLATFORM_AX_PLATFORM_NODE_TEXTPROVIDER_WIN_H_
diff --git a/third_party/accessibility/ax/platform/ax_platform_node_textprovider_win_unittest.cc b/third_party/accessibility/ax/platform/ax_platform_node_textprovider_win_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..b3d1c98a15e041c12a2c036e47e60135ef0f79f6
--- /dev/null
+++ b/third_party/accessibility/ax/platform/ax_platform_node_textprovider_win_unittest.cc
@@ -0,0 +1,946 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ax/platform/ax_platform_node_win_unittest.h"
+
+#include <UIAutomationClient.h>
+#include <UIAutomationCoreApi.h>
+
+#include <vector>
+
+#include "ax/ax_action_data.h"
+#include "ax/platform/ax_fragment_root_win.h"
+#include "ax/platform/ax_platform_node_textprovider_win.h"
+#include "ax/platform/ax_platform_node_textrangeprovider_win.h"
+#include "ax/platform/test_ax_node_wrapper.h"
+#include "base/win/scoped_bstr.h"
+#include "base/win/scoped_safearray.h"
+
+#include "flutter/fml/logging.h"
+#include "flutter/fml/platform/win/wstring_conversion.h"
+
+using Microsoft::WRL::ComPtr;
+
+namespace ui {
+
+// Helper macros for UIAutomation HRESULT expectations
+#define EXPECT_UIA_INVALIDOPERATION(expr) \
+  EXPECT_EQ(static_cast<HRESULT>(UIA_E_INVALIDOPERATION), (expr))
+#define EXPECT_INVALIDARG(expr) \
+  EXPECT_EQ(static_cast<HRESULT>(E_INVALIDARG), (expr))
+
+class AXPlatformNodeTextProviderTest : public AXPlatformNodeWinTest {
+ public:
+  AXPlatformNodeTextProviderTest() = default;
+  ~AXPlatformNodeTextProviderTest() override = default;
+  AXPlatformNodeTextProviderTest(const AXPlatformNodeTextProviderTest&) =
+      delete;
+  AXPlatformNodeTextProviderTest& operator=(
+      const AXPlatformNodeTextProviderTest&) = delete;
+
+ protected:
+  void SetOwner(AXPlatformNodeWin* owner,
+                ITextRangeProvider* destination_range) {
+    ComPtr<ITextRangeProvider> destination_provider = destination_range;
+    ComPtr<AXPlatformNodeTextRangeProviderWin> destination_provider_interal;
+
+    destination_provider->QueryInterface(
+        IID_PPV_ARGS(&destination_provider_interal));
+    destination_provider_interal->SetOwnerForTesting(owner);
+  }
+  AXPlatformNodeWin* GetOwner(
+      const AXPlatformNodeTextProviderWin* text_provider) {
+    return text_provider->owner_.Get();
+  }
+  const AXNodePosition::AXPositionInstance& GetStart(
+      const AXPlatformNodeTextRangeProviderWin* text_range) {
+    return text_range->start();
+  }
+  const AXNodePosition::AXPositionInstance& GetEnd(
+      const AXPlatformNodeTextRangeProviderWin* text_range) {
+    return text_range->end();
+  }
+};
+
+TEST_F(AXPlatformNodeTextProviderTest, CreateDegenerateRangeFromStart) {
+  AXNodeData text1_data;
+  text1_data.id = 3;
+  text1_data.role = ax::mojom::Role::kStaticText;
+  text1_data.SetName("some text");
+
+  AXNodeData text2_data;
+  text2_data.id = 4;
+  text2_data.role = ax::mojom::Role::kStaticText;
+  text2_data.SetName("more text");
+
+  AXNodeData link_data;
+  link_data.id = 2;
+  link_data.role = ax::mojom::Role::kLink;
+  link_data.child_ids = {3, 4};
+
+  AXNodeData root_data;
+  root_data.id = 1;
+  root_data.role = ax::mojom::Role::kStaticText;
+  root_data.SetName("Document");
+  root_data.child_ids = {2};
+
+  AXTreeUpdate update;
+  AXTreeData tree_data;
+  tree_data.tree_id = AXTreeID::CreateNewAXTreeID();
+  update.tree_data = tree_data;
+  update.has_tree_data = true;
+  update.root_id = root_data.id;
+  update.nodes = {root_data, link_data, text1_data, text2_data};
+
+  Init(update);
+  AXNode* root_node = GetRootAsAXNode();
+  AXNode* link_node = root_node->children()[0];
+  AXNode* text2_node = link_node->children()[1];
+  AXPlatformNodeWin* owner =
+      static_cast<AXPlatformNodeWin*>(AXPlatformNodeFromNode(root_node));
+  BASE_DCHECK(owner);
+
+  ComPtr<IRawElementProviderSimple> root_node_raw =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(root_node);
+  ComPtr<IRawElementProviderSimple> link_node_raw =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(link_node);
+  ComPtr<IRawElementProviderSimple> text2_node_raw =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(text2_node);
+
+  ComPtr<AXPlatformNodeWin> root_platform_node;
+  EXPECT_HRESULT_SUCCEEDED(
+      root_node_raw->QueryInterface(IID_PPV_ARGS(&root_platform_node)));
+  ComPtr<AXPlatformNodeWin> link_platform_node;
+  EXPECT_HRESULT_SUCCEEDED(
+      link_node_raw->QueryInterface(IID_PPV_ARGS(&link_platform_node)));
+  ComPtr<AXPlatformNodeWin> text2_platform_node;
+  EXPECT_HRESULT_SUCCEEDED(
+      text2_node_raw->QueryInterface(IID_PPV_ARGS(&text2_platform_node)));
+
+  // Degenerate range created on root node should be:
+  // <>some textmore text
+  ComPtr<ITextRangeProvider> text_range_provider =
+      AXPlatformNodeTextProviderWin::CreateDegenerateRangeAtStart(
+          root_platform_node.Get());
+  SetOwner(owner, text_range_provider.Get());
+  base::win::ScopedBstr text_content;
+  EXPECT_HRESULT_SUCCEEDED(
+      text_range_provider->GetText(-1, text_content.Receive()));
+  EXPECT_EQ(0, wcscmp(text_content.Get(), L""));
+
+  ComPtr<AXPlatformNodeTextRangeProviderWin> actual_range;
+  text_range_provider->QueryInterface(IID_PPV_ARGS(&actual_range));
+  AXNodePosition::AXPositionInstance expected_start, expected_end;
+  expected_start = root_platform_node->GetDelegate()->CreateTextPositionAt(0);
+  expected_end = expected_start->Clone();
+  EXPECT_EQ(*GetStart(actual_range.Get()), *expected_start);
+  EXPECT_EQ(*GetEnd(actual_range.Get()), *expected_end);
+  text_content.Release();
+
+  // Degenerate range created on link node should be:
+  // <>some textmore text
+  text_range_provider =
+      AXPlatformNodeTextProviderWin::CreateDegenerateRangeAtStart(
+          link_platform_node.Get());
+  SetOwner(owner, text_range_provider.Get());
+  EXPECT_HRESULT_SUCCEEDED(
+      text_range_provider->GetText(-1, text_content.Receive()));
+  EXPECT_EQ(0, wcscmp(text_content.Get(), L""));
+  text_range_provider->QueryInterface(IID_PPV_ARGS(&actual_range));
+  EXPECT_EQ(*GetStart(actual_range.Get()), *expected_start);
+  EXPECT_EQ(*GetEnd(actual_range.Get()), *expected_end);
+  text_content.Release();
+
+  // Degenerate range created on more text node should be:
+  // some text<>more text
+  text_range_provider =
+      AXPlatformNodeTextProviderWin::CreateDegenerateRangeAtStart(
+          text2_platform_node.Get());
+  SetOwner(owner, text_range_provider.Get());
+  EXPECT_HRESULT_SUCCEEDED(
+      text_range_provider->GetText(-1, text_content.Receive()));
+  EXPECT_EQ(0, wcscmp(text_content.Get(), L""));
+  text_range_provider->QueryInterface(IID_PPV_ARGS(&actual_range));
+  expected_start = text2_platform_node->GetDelegate()->CreateTextPositionAt(0);
+  expected_end = expected_start->Clone();
+  EXPECT_EQ(*GetStart(actual_range.Get()), *expected_start);
+  EXPECT_EQ(*GetEnd(actual_range.Get()), *expected_end);
+  text_content.Release();
+}
+
+TEST_F(AXPlatformNodeTextProviderTest, ITextProviderRangeFromChild) {
+  AXNodeData text_data;
+  text_data.id = 2;
+  text_data.role = ax::mojom::Role::kStaticText;
+  text_data.SetName("some text");
+
+  AXNodeData empty_text_data;
+  empty_text_data.id = 3;
+  empty_text_data.role = ax::mojom::Role::kStaticText;
+
+  AXNodeData root_data;
+  root_data.id = 1;
+  root_data.role = ax::mojom::Role::kStaticText;
+  root_data.SetName("Document");
+  root_data.child_ids.push_back(2);
+  root_data.child_ids.push_back(3);
+
+  AXTreeUpdate update;
+  AXTreeData tree_data;
+  tree_data.tree_id = AXTreeID::CreateNewAXTreeID();
+  update.tree_data = tree_data;
+  update.has_tree_data = true;
+  update.root_id = root_data.id;
+  update.nodes.push_back(root_data);
+  update.nodes.push_back(text_data);
+  update.nodes.push_back(empty_text_data);
+
+  Init(update);
+
+  AXNode* root_node = GetRootAsAXNode();
+  AXNode* text_node = root_node->children()[0];
+  AXNode* empty_text_node = root_node->children()[1];
+  AXPlatformNodeWin* owner =
+      static_cast<AXPlatformNodeWin*>(AXPlatformNodeFromNode(root_node));
+  BASE_DCHECK(owner);
+
+  ComPtr<IRawElementProviderSimple> root_node_raw =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(root_node);
+  ComPtr<IRawElementProviderSimple> text_node_raw =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(text_node);
+  ComPtr<IRawElementProviderSimple> empty_text_node_raw =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(empty_text_node);
+
+  // Call RangeFromChild on the root with the text child passed in.
+  ComPtr<ITextProvider> text_provider;
+  EXPECT_HRESULT_SUCCEEDED(
+      root_node_raw->GetPatternProvider(UIA_TextPatternId, &text_provider));
+
+  ComPtr<ITextRangeProvider> text_range_provider;
+  EXPECT_HRESULT_SUCCEEDED(
+      text_provider->RangeFromChild(text_node_raw.Get(), &text_range_provider));
+  SetOwner(owner, text_range_provider.Get());
+
+  base::win::ScopedBstr text_content;
+  EXPECT_HRESULT_SUCCEEDED(
+      text_range_provider->GetText(-1, text_content.Receive()));
+  EXPECT_EQ(0, wcscmp(text_content.Get(), L"some text"));
+
+  // Now test that the reverse relation doesn't return a valid
+  // ITextRangeProvider, and instead returns E_INVALIDARG.
+  EXPECT_HRESULT_SUCCEEDED(
+      text_node_raw->GetPatternProvider(UIA_TextPatternId, &text_provider));
+
+  EXPECT_INVALIDARG(
+      text_provider->RangeFromChild(root_node_raw.Get(), &text_range_provider));
+
+  // Now test that a child with no text returns a degenerate range.
+  EXPECT_HRESULT_SUCCEEDED(
+      root_node_raw->GetPatternProvider(UIA_TextPatternId, &text_provider));
+
+  EXPECT_HRESULT_SUCCEEDED(text_provider->RangeFromChild(
+      empty_text_node_raw.Get(), &text_range_provider));
+  SetOwner(owner, text_range_provider.Get());
+
+  base::win::ScopedBstr empty_text_content;
+  EXPECT_HRESULT_SUCCEEDED(
+      text_range_provider->GetText(-1, empty_text_content.Receive()));
+  EXPECT_EQ(0, wcscmp(empty_text_content.Get(), L""));
+
+  // Test that passing in an object from a different instance of
+  // IRawElementProviderSimple than that of the valid text provider
+  // returns UIA_E_INVALIDOPERATION.
+  ComPtr<IRawElementProviderSimple> other_root_node_raw;
+  MockIRawElementProviderSimple::CreateMockIRawElementProviderSimple(
+      &other_root_node_raw);
+
+  EXPECT_HRESULT_SUCCEEDED(
+      root_node_raw->GetPatternProvider(UIA_TextPatternId, &text_provider));
+
+  EXPECT_UIA_INVALIDOPERATION(text_provider->RangeFromChild(
+      other_root_node_raw.Get(), &text_range_provider));
+}
+
+TEST_F(AXPlatformNodeTextProviderTest,
+       ITextProviderRangeFromChildMultipleChildren) {
+  const int ROOT_ID = 1;
+  const int DIALOG_ID = 2;
+  const int DIALOG_LABEL_ID = 3;
+  const int DIALOG_DESCRIPTION_ID = 4;
+  const int BUTTON_ID = 5;
+  const int BUTTON_IMG_ID = 6;
+  const int BUTTON_TEXT_ID = 7;
+  const int DIALOG_DETAIL_ID = 8;
+
+  AXNodeData root;
+  root.id = ROOT_ID;
+  root.role = ax::mojom::Role::kStaticText;
+  root.SetName("Document");
+  root.child_ids = {DIALOG_ID};
+
+  AXNodeData dialog;
+  dialog.id = DIALOG_ID;
+  dialog.role = ax::mojom::Role::kDialog;
+  dialog.child_ids = {DIALOG_LABEL_ID, DIALOG_DESCRIPTION_ID, BUTTON_ID,
+                      DIALOG_DETAIL_ID};
+
+  AXNodeData dialog_label;
+  dialog_label.id = DIALOG_LABEL_ID;
+  dialog_label.role = ax::mojom::Role::kStaticText;
+  dialog_label.SetName("Dialog label.");
+
+  AXNodeData dialog_description;
+  dialog_description.id = DIALOG_DESCRIPTION_ID;
+  dialog_description.role = ax::mojom::Role::kStaticText;
+  dialog_description.SetName("Dialog description.");
+
+  AXNodeData button;
+  button.id = BUTTON_ID;
+  button.role = ax::mojom::Role::kButton;
+  button.child_ids = {BUTTON_IMG_ID, BUTTON_TEXT_ID};
+
+  AXNodeData button_img;
+  button_img.id = BUTTON_IMG_ID;
+  button_img.role = ax::mojom::Role::kImage;
+
+  AXNodeData button_text;
+  button_text.id = BUTTON_TEXT_ID;
+  button_text.role = ax::mojom::Role::kStaticText;
+  button_text.SetName("ok.");
+
+  AXNodeData dialog_detail;
+  dialog_detail.id = DIALOG_DETAIL_ID;
+  dialog_detail.role = ax::mojom::Role::kStaticText;
+  dialog_detail.SetName("Some more detail about dialog.");
+
+  AXTreeUpdate update;
+  AXTreeData tree_data;
+  tree_data.tree_id = AXTreeID::CreateNewAXTreeID();
+  update.tree_data = tree_data;
+  update.has_tree_data = true;
+  update.root_id = ROOT_ID;
+  update.nodes = {root,   dialog,     dialog_label, dialog_description,
+                  button, button_img, button_text,  dialog_detail};
+
+  Init(update);
+
+  AXNode* root_node = GetRootAsAXNode();
+  AXNode* dialog_node = root_node->children()[0];
+  AXPlatformNodeWin* owner =
+      static_cast<AXPlatformNodeWin*>(AXPlatformNodeFromNode(root_node));
+  BASE_DCHECK(owner);
+
+  ComPtr<IRawElementProviderSimple> root_node_raw =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(root_node);
+  ComPtr<IRawElementProviderSimple> dialog_node_raw =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(dialog_node);
+
+  // Call RangeFromChild on the root with the dialog child passed in.
+  ComPtr<ITextProvider> text_provider;
+  EXPECT_HRESULT_SUCCEEDED(
+      root_node_raw->GetPatternProvider(UIA_TextPatternId, &text_provider));
+
+  ComPtr<ITextRangeProvider> text_range_provider;
+  EXPECT_HRESULT_SUCCEEDED(text_provider->RangeFromChild(dialog_node_raw.Get(),
+                                                         &text_range_provider));
+  SetOwner(owner, text_range_provider.Get());
+
+  base::win::ScopedBstr text_content;
+  EXPECT_HRESULT_SUCCEEDED(
+      text_range_provider->GetText(-1, text_content.Receive()));
+  EXPECT_EQ(fml::WideStringToUtf16(text_content.Get()),
+            u"Dialog label.Dialog description." + kEmbeddedCharacterAsString +
+                u"ok.Some more detail " + u"about dialog.");
+
+  // Check the reverse relationship that GetEnclosingElement on the text range
+  // gives back the dialog.
+  ComPtr<IRawElementProviderSimple> enclosing_element;
+  EXPECT_HRESULT_SUCCEEDED(
+      text_range_provider->GetEnclosingElement(&enclosing_element));
+  EXPECT_EQ(enclosing_element.Get(), dialog_node_raw.Get());
+}
+
+TEST_F(AXPlatformNodeTextProviderTest, NearestTextIndexToPoint) {
+  AXNodeData text_data;
+  text_data.id = 2;
+  text_data.role = ax::mojom::Role::kInlineTextBox;
+  text_data.SetName("text");
+  // spacing: "t-e-x---t-"
+  text_data.AddIntListAttribute(ax::mojom::IntListAttribute::kCharacterOffsets,
+                                {2, 4, 8, 10});
+
+  AXNodeData root_data;
+  root_data.id = 1;
+  root_data.role = ax::mojom::Role::kRootWebArea;
+  root_data.relative_bounds.bounds = gfx::RectF(1, 1, 2, 2);
+  root_data.child_ids.push_back(2);
+
+  Init(root_data, text_data);
+
+  AXNode* root_node = GetRootAsAXNode();
+  AXNode* text_node = root_node->children()[0];
+
+  struct NearestTextIndexTestData {
+    AXNode* node;
+    struct point_offset_expected_index_pair {
+      int point_offset_x;
+      int expected_index;
+    };
+    std::vector<point_offset_expected_index_pair> test_data;
+  };
+  NearestTextIndexTestData nodes[] = {
+      {text_node,
+       {{0, 0}, {2, 0}, {3, 1}, {4, 1}, {5, 2}, {8, 2}, {9, 3}, {10, 3}}},
+      {root_node,
+       {{0, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0}, {8, 0}, {9, 0}, {10, 0}}}};
+  for (auto data : nodes) {
+    if (!data.node->IsText() && !data.node->data().IsTextField()) {
+      continue;
+    }
+    ComPtr<IRawElementProviderSimple> element_provider =
+        QueryInterfaceFromNode<IRawElementProviderSimple>(data.node);
+    ComPtr<ITextProvider> text_provider;
+    EXPECT_HRESULT_SUCCEEDED(element_provider->GetPatternProvider(
+        UIA_TextPatternId, &text_provider));
+    // get internal implementation to access helper for testing
+    ComPtr<AXPlatformNodeTextProviderWin> platform_text_provider;
+    EXPECT_HRESULT_SUCCEEDED(
+        text_provider->QueryInterface(IID_PPV_ARGS(&platform_text_provider)));
+
+    ComPtr<AXPlatformNodeWin> platform_node;
+    EXPECT_HRESULT_SUCCEEDED(
+        element_provider->QueryInterface(IID_PPV_ARGS(&platform_node)));
+
+    for (auto pair : data.test_data) {
+      EXPECT_EQ(pair.expected_index, platform_node->NearestTextIndexToPoint(
+                                         gfx::Point(pair.point_offset_x, 0)));
+    }
+  }
+}
+
+TEST_F(AXPlatformNodeTextProviderTest, ITextProviderDocumentRange) {
+  AXNodeData text_data;
+  text_data.id = 2;
+  text_data.role = ax::mojom::Role::kStaticText;
+  text_data.SetName("some text");
+
+  AXNodeData root_data;
+  root_data.id = 1;
+  root_data.role = ax::mojom::Role::kStaticText;
+  root_data.SetName("Document");
+  root_data.child_ids.push_back(2);
+
+  Init(root_data, text_data);
+
+  ComPtr<IRawElementProviderSimple> root_node =
+      GetRootIRawElementProviderSimple();
+
+  ComPtr<ITextProvider> text_provider;
+  EXPECT_HRESULT_SUCCEEDED(
+      root_node->GetPatternProvider(UIA_TextPatternId, &text_provider));
+
+  ComPtr<ITextRangeProvider> text_range_provider;
+  EXPECT_HRESULT_SUCCEEDED(
+      text_provider->get_DocumentRange(&text_range_provider));
+}
+
+TEST_F(AXPlatformNodeTextProviderTest,
+       DISABLED_ITextProviderDocumentRangeTrailingIgnored) {
+  // ++1 root
+  // ++++2 kGenericContainer
+  // ++++++3 kStaticText "Hello"
+  // ++++4 kGenericContainer
+  // ++++++5 kGenericContainer
+  // ++++++++6 kStaticText "3.14"
+  // ++++7 kGenericContainer (ignored)
+  // ++++++8 kGenericContainer (ignored)
+  // ++++++++9 kStaticText "ignored"
+  AXNodeData root_1;
+  AXNodeData gc_2;
+  AXNodeData static_text_3;
+  AXNodeData gc_4;
+  AXNodeData gc_5;
+  AXNodeData static_text_6;
+  AXNodeData gc_7_ignored;
+  AXNodeData gc_8_ignored;
+  AXNodeData static_text_9_ignored;
+
+  root_1.id = 1;
+  gc_2.id = 2;
+  static_text_3.id = 3;
+  gc_4.id = 4;
+  gc_5.id = 5;
+  static_text_6.id = 6;
+  gc_7_ignored.id = 7;
+  gc_8_ignored.id = 8;
+  static_text_9_ignored.id = 9;
+
+  root_1.role = ax::mojom::Role::kRootWebArea;
+  root_1.child_ids = {gc_2.id, gc_4.id, gc_7_ignored.id};
+  root_1.SetName("Document");
+
+  gc_2.role = ax::mojom::Role::kGenericContainer;
+  gc_2.AddIntListAttribute(ax::mojom::IntListAttribute::kLabelledbyIds,
+                           {static_text_3.id});
+  gc_2.child_ids = {static_text_3.id};
+
+  static_text_3.role = ax::mojom::Role::kStaticText;
+  static_text_3.SetName("Hello");
+
+  gc_4.role = ax::mojom::Role::kGenericContainer;
+  gc_4.AddIntListAttribute(ax::mojom::IntListAttribute::kLabelledbyIds,
+                           {gc_5.id});
+  gc_4.child_ids = {gc_5.id};
+
+  gc_5.role = ax::mojom::Role::kGenericContainer;
+  gc_5.child_ids = {static_text_6.id};
+
+  static_text_6.role = ax::mojom::Role::kStaticText;
+  static_text_6.SetName("3.14");
+
+  gc_7_ignored.role = ax::mojom::Role::kGenericContainer;
+  gc_7_ignored.child_ids = {gc_8_ignored.id};
+  gc_7_ignored.AddState(ax::mojom::State::kIgnored);
+
+  gc_8_ignored.role = ax::mojom::Role::kGenericContainer;
+  gc_8_ignored.child_ids = {static_text_9_ignored.id};
+  gc_8_ignored.AddState(ax::mojom::State::kIgnored);
+
+  static_text_9_ignored.role = ax::mojom::Role::kStaticText;
+  static_text_9_ignored.SetName("ignored");
+  static_text_9_ignored.AddState(ax::mojom::State::kIgnored);
+
+  AXTreeUpdate update;
+  AXTreeData tree_data;
+  tree_data.tree_id = AXTreeID::CreateNewAXTreeID();
+  update.tree_data = tree_data;
+  update.has_tree_data = true;
+  update.root_id = root_1.id;
+  update.nodes = {root_1,       gc_2,         static_text_3,
+                  gc_4,         gc_5,         static_text_6,
+                  gc_7_ignored, gc_8_ignored, static_text_9_ignored};
+
+  Init(update);
+
+  ComPtr<IRawElementProviderSimple> root_node =
+      GetRootIRawElementProviderSimple();
+
+  ComPtr<ITextProvider> text_provider;
+  EXPECT_HRESULT_SUCCEEDED(
+      root_node->GetPatternProvider(UIA_TextPatternId, &text_provider));
+
+  ComPtr<ITextRangeProvider> text_range_provider;
+  EXPECT_HRESULT_SUCCEEDED(
+      text_provider->get_DocumentRange(&text_range_provider));
+
+  ComPtr<AXPlatformNodeTextRangeProviderWin> text_range;
+  text_range_provider->QueryInterface(IID_PPV_ARGS(&text_range));
+
+  ComPtr<ITextProvider> root_text_provider;
+  EXPECT_HRESULT_SUCCEEDED(
+      root_node->GetPatternProvider(UIA_TextPatternId, &root_text_provider));
+  ComPtr<AXPlatformNodeTextProviderWin> root_platform_node;
+  root_text_provider->QueryInterface(IID_PPV_ARGS(&root_platform_node));
+  AXPlatformNodeWin* owner = GetOwner(root_platform_node.Get());
+
+  AXNodePosition::AXPositionInstance expected_start =
+      owner->GetDelegate()->CreateTextPositionAt(0)->AsLeafTextPosition();
+  AXNodePosition::AXPositionInstance expected_end =
+      owner->GetDelegate()
+          ->CreateTextPositionAt(0)
+          ->CreatePositionAtEndOfAnchor();
+  expected_end = expected_end->AsLeafTextPosition();
+  EXPECT_EQ(*GetStart(text_range.Get()), *expected_start);
+  EXPECT_EQ(*GetEnd(text_range.Get()), *expected_end);
+}
+
+TEST_F(AXPlatformNodeTextProviderTest, ITextProviderDocumentRangeNested) {
+  AXNodeData text_data;
+  text_data.id = 3;
+  text_data.role = ax::mojom::Role::kStaticText;
+  text_data.SetName("some text");
+
+  AXNodeData paragraph_data;
+  paragraph_data.id = 2;
+  paragraph_data.role = ax::mojom::Role::kParagraph;
+  paragraph_data.child_ids.push_back(3);
+
+  AXNodeData root_data;
+  root_data.id = 1;
+  root_data.role = ax::mojom::Role::kStaticText;
+  root_data.SetName("Document");
+  root_data.child_ids.push_back(2);
+
+  Init(root_data, paragraph_data, text_data);
+
+  ComPtr<IRawElementProviderSimple> root_node =
+      GetRootIRawElementProviderSimple();
+
+  ComPtr<ITextProvider> text_provider;
+  EXPECT_HRESULT_SUCCEEDED(
+      root_node->GetPatternProvider(UIA_TextPatternId, &text_provider));
+
+  ComPtr<ITextRangeProvider> text_range_provider;
+  EXPECT_HRESULT_SUCCEEDED(
+      text_provider->get_DocumentRange(&text_range_provider));
+}
+
+TEST_F(AXPlatformNodeTextProviderTest, ITextProviderSupportedSelection) {
+  AXNodeData text_data;
+  text_data.id = 2;
+  text_data.role = ax::mojom::Role::kStaticText;
+  text_data.SetName("some text");
+
+  AXNodeData root_data;
+  root_data.id = 1;
+  root_data.role = ax::mojom::Role::kStaticText;
+  root_data.SetName("Document");
+  root_data.child_ids.push_back(2);
+
+  Init(root_data, text_data);
+
+  ComPtr<IRawElementProviderSimple> root_node =
+      GetRootIRawElementProviderSimple();
+
+  ComPtr<ITextProvider> text_provider;
+  EXPECT_HRESULT_SUCCEEDED(
+      root_node->GetPatternProvider(UIA_TextPatternId, &text_provider));
+
+  SupportedTextSelection text_selection_mode;
+  EXPECT_HRESULT_SUCCEEDED(
+      text_provider->get_SupportedTextSelection(&text_selection_mode));
+  EXPECT_EQ(text_selection_mode, SupportedTextSelection_Single);
+}
+
+TEST_F(AXPlatformNodeTextProviderTest, ITextProviderGetSelection) {
+  AXNodeData text_data;
+  text_data.id = 2;
+  text_data.role = ax::mojom::Role::kStaticText;
+  text_data.SetName("some text");
+
+  AXNodeData textbox_data;
+  textbox_data.id = 3;
+  textbox_data.role = ax::mojom::Role::kInlineTextBox;
+  textbox_data.SetName("textbox text");
+  textbox_data.AddState(ax::mojom::State::kEditable);
+
+  AXNodeData nonatomic_textfield_data;
+  nonatomic_textfield_data.id = 4;
+  nonatomic_textfield_data.role = ax::mojom::Role::kGroup;
+  nonatomic_textfield_data.child_ids = {5};
+
+  AXNodeData text_child_data;
+  text_child_data.id = 5;
+  text_child_data.role = ax::mojom::Role::kStaticText;
+  text_child_data.SetName("text");
+
+  AXNodeData root_data;
+  root_data.id = 1;
+  root_data.role = ax::mojom::Role::kStaticText;
+  root_data.SetName("Document");
+  root_data.child_ids = {2, 3, 4};
+
+  AXTreeUpdate update;
+  AXTreeData tree_data;
+  tree_data.tree_id = AXTreeID::CreateNewAXTreeID();
+  update.tree_data = tree_data;
+  update.has_tree_data = true;
+  update.root_id = root_data.id;
+  update.nodes = {root_data, text_data, textbox_data, nonatomic_textfield_data,
+                  text_child_data};
+  Init(update);
+
+  ComPtr<IRawElementProviderSimple> root_node =
+      GetRootIRawElementProviderSimple();
+
+  ComPtr<ITextProvider> root_text_provider;
+  EXPECT_HRESULT_SUCCEEDED(
+      root_node->GetPatternProvider(UIA_TextPatternId, &root_text_provider));
+
+  base::win::ScopedSafearray selections;
+  root_text_provider->GetSelection(selections.Receive());
+  ASSERT_EQ(nullptr, selections.Get());
+
+  ComPtr<AXPlatformNodeTextProviderWin> root_platform_node;
+  root_text_provider->QueryInterface(IID_PPV_ARGS(&root_platform_node));
+
+  AXPlatformNodeWin* owner = GetOwner(root_platform_node.Get());
+  AXTreeData& selected_tree_data =
+      const_cast<AXTreeData&>(owner->GetDelegate()->GetTreeData());
+  selected_tree_data.sel_focus_object_id = 2;
+  selected_tree_data.sel_anchor_object_id = 2;
+  selected_tree_data.sel_anchor_offset = 0;
+  selected_tree_data.sel_focus_offset = 4;
+
+  root_text_provider->GetSelection(selections.Receive());
+  ASSERT_NE(nullptr, selections.Get());
+
+  LONG ubound;
+  EXPECT_HRESULT_SUCCEEDED(SafeArrayGetUBound(selections.Get(), 1, &ubound));
+  EXPECT_EQ(0, ubound);
+  LONG lbound;
+  EXPECT_HRESULT_SUCCEEDED(SafeArrayGetLBound(selections.Get(), 1, &lbound));
+  EXPECT_EQ(0, lbound);
+
+  LONG index = 0;
+  ComPtr<ITextRangeProvider> text_range_provider;
+  EXPECT_HRESULT_SUCCEEDED(SafeArrayGetElement(
+      selections.Get(), &index, static_cast<void**>(&text_range_provider)));
+  SetOwner(owner, text_range_provider.Get());
+
+  base::win::ScopedBstr text_content;
+  EXPECT_HRESULT_SUCCEEDED(
+      text_range_provider->GetText(-1, text_content.Receive()));
+  EXPECT_EQ(0, wcscmp(text_content.Get(), L"some"));
+  text_content.Reset();
+  selections.Reset();
+  text_range_provider.Reset();
+
+  // Verify that start and end are appropriately swapped when sel_anchor_offset
+  // is greater than sel_focus_offset
+  selected_tree_data.sel_focus_object_id = 2;
+  selected_tree_data.sel_anchor_object_id = 2;
+  selected_tree_data.sel_anchor_offset = 4;
+  selected_tree_data.sel_focus_offset = 0;
+
+  root_text_provider->GetSelection(selections.Receive());
+  ASSERT_NE(nullptr, selections.Get());
+
+  EXPECT_HRESULT_SUCCEEDED(SafeArrayGetUBound(selections.Get(), 1, &ubound));
+  EXPECT_EQ(0, ubound);
+  EXPECT_HRESULT_SUCCEEDED(SafeArrayGetLBound(selections.Get(), 1, &lbound));
+  EXPECT_EQ(0, lbound);
+
+  EXPECT_HRESULT_SUCCEEDED(SafeArrayGetElement(
+      selections.Get(), &index, static_cast<void**>(&text_range_provider)));
+  SetOwner(owner, text_range_provider.Get());
+
+  EXPECT_HRESULT_SUCCEEDED(
+      text_range_provider->GetText(-1, text_content.Receive()));
+  EXPECT_EQ(0, wcscmp(text_content.Get(), L"some"));
+  text_content.Reset();
+  selections.Reset();
+  text_range_provider.Reset();
+
+  // Verify that text ranges at an insertion point returns a degenerate (empty)
+  // text range via textbox with sel_anchor_offset equal to sel_focus_offset
+  selected_tree_data.sel_focus_object_id = 3;
+  selected_tree_data.sel_anchor_object_id = 3;
+  selected_tree_data.sel_anchor_offset = 1;
+  selected_tree_data.sel_focus_offset = 1;
+
+  AXNode* text_edit_node = GetRootAsAXNode()->children()[1];
+
+  ComPtr<IRawElementProviderSimple> text_edit_com =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(text_edit_node);
+
+  ComPtr<ITextProvider> text_edit_provider;
+  EXPECT_HRESULT_SUCCEEDED(text_edit_com->GetPatternProvider(
+      UIA_TextPatternId, &text_edit_provider));
+
+  selections.Reset();
+  EXPECT_HRESULT_SUCCEEDED(
+      text_edit_provider->GetSelection(selections.Receive()));
+  EXPECT_NE(nullptr, selections.Get());
+
+  EXPECT_HRESULT_SUCCEEDED(SafeArrayGetUBound(selections.Get(), 1, &ubound));
+  EXPECT_EQ(0, ubound);
+  EXPECT_HRESULT_SUCCEEDED(SafeArrayGetLBound(selections.Get(), 1, &lbound));
+  EXPECT_EQ(0, lbound);
+
+  ComPtr<ITextRangeProvider> text_edit_range_provider;
+  EXPECT_HRESULT_SUCCEEDED(
+      SafeArrayGetElement(selections.Get(), &index,
+                          static_cast<void**>(&text_edit_range_provider)));
+  SetOwner(owner, text_edit_range_provider.Get());
+  EXPECT_HRESULT_SUCCEEDED(
+      text_edit_range_provider->GetText(-1, text_content.Receive()));
+  EXPECT_EQ(0U, text_content.Length());
+  text_content.Reset();
+  selections.Reset();
+  text_edit_range_provider.Reset();
+
+  // Verify selections that span multiple nodes
+  selected_tree_data.sel_focus_object_id = 2;
+  selected_tree_data.sel_focus_offset = 0;
+  selected_tree_data.sel_anchor_object_id = 3;
+  selected_tree_data.sel_anchor_offset = 12;
+
+  root_text_provider->GetSelection(selections.Receive());
+  ASSERT_NE(nullptr, selections.Get());
+
+  EXPECT_HRESULT_SUCCEEDED(SafeArrayGetUBound(selections.Get(), 1, &ubound));
+  EXPECT_EQ(0, ubound);
+  EXPECT_HRESULT_SUCCEEDED(SafeArrayGetLBound(selections.Get(), 1, &lbound));
+  EXPECT_EQ(0, lbound);
+
+  EXPECT_HRESULT_SUCCEEDED(SafeArrayGetElement(
+      selections.Get(), &index, static_cast<void**>(&text_range_provider)));
+
+  SetOwner(owner, text_range_provider.Get());
+  EXPECT_HRESULT_SUCCEEDED(
+      text_range_provider->GetText(-1, text_content.Receive()));
+  EXPECT_EQ(0, wcscmp(text_content.Get(), L"some texttextbox text"));
+  text_content.Reset();
+  selections.Reset();
+  text_range_provider.Reset();
+
+  // Verify SAFEARRAY value for degenerate selection.
+  selected_tree_data.sel_focus_object_id = 2;
+  selected_tree_data.sel_anchor_object_id = 2;
+  selected_tree_data.sel_anchor_offset = 1;
+  selected_tree_data.sel_focus_offset = 1;
+
+  root_text_provider->GetSelection(selections.Receive());
+  ASSERT_NE(nullptr, selections.Get());
+
+  EXPECT_HRESULT_SUCCEEDED(SafeArrayGetUBound(selections.Get(), 1, &ubound));
+  EXPECT_EQ(0, ubound);
+  EXPECT_HRESULT_SUCCEEDED(SafeArrayGetLBound(selections.Get(), 1, &lbound));
+  EXPECT_EQ(0, lbound);
+
+  EXPECT_HRESULT_SUCCEEDED(SafeArrayGetElement(
+      selections.Get(), &index, static_cast<void**>(&text_range_provider)));
+
+  SetOwner(owner, text_range_provider.Get());
+  EXPECT_HRESULT_SUCCEEDED(
+      text_range_provider->GetText(-1, text_content.Receive()));
+  EXPECT_EQ(0, wcscmp(text_content.Get(), L""));
+  text_content.Reset();
+  selections.Reset();
+  text_range_provider.Reset();
+
+  // Removed testing logic for non-atomic text fields as we do not have this
+  // role.
+
+  // Now delete the tree (which will delete the associated elements) and verify
+  // that UIA_E_ELEMENTNOTAVAILABLE is returned when calling GetSelection on
+  // a dead element
+  DestroyTree();
+
+  EXPECT_EQ(static_cast<HRESULT>(UIA_E_ELEMENTNOTAVAILABLE),
+            text_edit_provider->GetSelection(selections.Receive()));
+}
+
+TEST_F(AXPlatformNodeTextProviderTest, ITextProviderGetActiveComposition) {
+  AXNodeData text_data;
+  text_data.id = 2;
+  text_data.role = ax::mojom::Role::kStaticText;
+  text_data.SetName("some text");
+
+  AXNodeData root_data;
+  root_data.id = 1;
+  root_data.role = ax::mojom::Role::kStaticText;
+  root_data.SetName("Document");
+  root_data.child_ids.push_back(2);
+
+  AXTreeUpdate update;
+  AXTreeData tree_data;
+  tree_data.tree_id = AXTreeID::CreateNewAXTreeID();
+  update.tree_data = tree_data;
+  update.has_tree_data = true;
+  update.root_id = root_data.id;
+  update.nodes.push_back(root_data);
+  update.nodes.push_back(text_data);
+  Init(update);
+
+  ComPtr<IRawElementProviderSimple> root_node =
+      GetRootIRawElementProviderSimple();
+
+  ComPtr<ITextProvider> root_text_provider;
+  EXPECT_HRESULT_SUCCEEDED(
+      root_node->GetPatternProvider(UIA_TextPatternId, &root_text_provider));
+
+  ComPtr<ITextEditProvider> root_text_edit_provider;
+  EXPECT_HRESULT_SUCCEEDED(root_node->GetPatternProvider(
+      UIA_TextEditPatternId, &root_text_edit_provider));
+
+  ComPtr<ITextRangeProvider> text_range_provider;
+  root_text_edit_provider->GetActiveComposition(&text_range_provider);
+  ASSERT_EQ(nullptr, text_range_provider);
+
+  ComPtr<AXPlatformNodeTextProviderWin> root_platform_node;
+  root_text_provider->QueryInterface(IID_PPV_ARGS(&root_platform_node));
+
+  AXActionData action_data;
+  action_data.action = ax::mojom::Action::kFocus;
+  action_data.target_node_id = 1;
+  AXPlatformNodeWin* owner = GetOwner(root_platform_node.Get());
+  owner->GetDelegate()->AccessibilityPerformAction(action_data);
+  const std::u16string active_composition_text = u"a";
+  owner->OnActiveComposition(gfx::Range(0, 1), active_composition_text, false);
+
+  root_text_edit_provider->GetActiveComposition(&text_range_provider);
+  ASSERT_NE(nullptr, text_range_provider);
+  ComPtr<AXPlatformNodeTextRangeProviderWin> actual_range;
+  AXNodePosition::AXPositionInstance expected_start =
+      owner->GetDelegate()->CreateTextPositionAt(0);
+  AXNodePosition::AXPositionInstance expected_end =
+      owner->GetDelegate()->CreateTextPositionAt(1);
+  text_range_provider->QueryInterface(IID_PPV_ARGS(&actual_range));
+  EXPECT_EQ(*GetStart(actual_range.Get()), *expected_start);
+  EXPECT_EQ(*GetEnd(actual_range.Get()), *expected_end);
+}
+
+TEST_F(AXPlatformNodeTextProviderTest, ITextProviderGetConversionTarget) {
+  AXNodeData text_data;
+  text_data.id = 2;
+  text_data.role = ax::mojom::Role::kStaticText;
+  text_data.SetName("some text");
+
+  AXNodeData root_data;
+  root_data.id = 1;
+  root_data.role = ax::mojom::Role::kStaticText;
+  root_data.SetName("Document");
+  root_data.child_ids.push_back(2);
+
+  AXTreeUpdate update;
+  AXTreeData tree_data;
+  tree_data.tree_id = AXTreeID::CreateNewAXTreeID();
+  update.tree_data = tree_data;
+  update.has_tree_data = true;
+  update.root_id = root_data.id;
+  update.nodes.push_back(root_data);
+  update.nodes.push_back(text_data);
+  Init(update);
+
+  ComPtr<IRawElementProviderSimple> root_node =
+      GetRootIRawElementProviderSimple();
+
+  ComPtr<ITextProvider> root_text_provider;
+  EXPECT_HRESULT_SUCCEEDED(
+      root_node->GetPatternProvider(UIA_TextPatternId, &root_text_provider));
+
+  ComPtr<ITextEditProvider> root_text_edit_provider;
+  EXPECT_HRESULT_SUCCEEDED(root_node->GetPatternProvider(
+      UIA_TextEditPatternId, &root_text_edit_provider));
+
+  ComPtr<ITextRangeProvider> text_range_provider;
+  root_text_edit_provider->GetConversionTarget(&text_range_provider);
+  ASSERT_EQ(nullptr, text_range_provider);
+
+  ComPtr<AXPlatformNodeTextProviderWin> root_platform_node;
+  root_text_provider->QueryInterface(IID_PPV_ARGS(&root_platform_node));
+
+  AXActionData action_data;
+  action_data.action = ax::mojom::Action::kFocus;
+  action_data.target_node_id = 1;
+  AXPlatformNodeWin* owner = GetOwner(root_platform_node.Get());
+  owner->GetDelegate()->AccessibilityPerformAction(action_data);
+  const std::u16string active_composition_text = u"a";
+  owner->OnActiveComposition(gfx::Range(0, 1), active_composition_text, false);
+
+  root_text_edit_provider->GetConversionTarget(&text_range_provider);
+  ASSERT_NE(nullptr, text_range_provider);
+  ComPtr<AXPlatformNodeTextRangeProviderWin> actual_range;
+  AXNodePosition::AXPositionInstance expected_start =
+      owner->GetDelegate()->CreateTextPositionAt(0);
+  AXNodePosition::AXPositionInstance expected_end =
+      owner->GetDelegate()->CreateTextPositionAt(1);
+  text_range_provider->QueryInterface(IID_PPV_ARGS(&actual_range));
+  EXPECT_EQ(*GetStart(actual_range.Get()), *expected_start);
+  EXPECT_EQ(*GetEnd(actual_range.Get()), *expected_end);
+}
+
+}  // namespace ui
diff --git a/third_party/accessibility/ax/platform/ax_platform_node_textrangeprovider_win.cc b/third_party/accessibility/ax/platform/ax_platform_node_textrangeprovider_win.cc
new file mode 100644
index 0000000000000000000000000000000000000000..7f08b2aaeca3fbcf0cd46b319ebaa659428b7cc5
--- /dev/null
+++ b/third_party/accessibility/ax/platform/ax_platform_node_textrangeprovider_win.cc
@@ -0,0 +1,1740 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ax/platform/ax_platform_node_textrangeprovider_win.h"
+
+#include <UIAutomation.h>
+#include <wrl/client.h>
+#include <string_view>
+
+#include "ax/ax_action_data.h"
+#include "ax/ax_range.h"
+#include "ax/platform/ax_platform_node_delegate.h"
+#include "ax/platform/ax_platform_node_win.h"
+#include "ax/platform/ax_platform_tree_manager.h"
+#include "base/win/variant_vector.h"
+#include "flutter/fml/platform/win/wstring_conversion.h"
+#include "third_party/icu/source/i18n/unicode/usearch.h"
+
+#define UIA_VALIDATE_TEXTRANGEPROVIDER_CALL()                  \
+  if (!GetOwner() || !GetOwner()->GetDelegate() || !start() || \
+      !start()->GetAnchor() || !end() || !end()->GetAnchor())  \
+    return UIA_E_ELEMENTNOTAVAILABLE;                          \
+  SetStart(start()->AsValidPosition());                        \
+  SetEnd(end()->AsValidPosition());
+#define UIA_VALIDATE_TEXTRANGEPROVIDER_CALL_1_IN(in)           \
+  if (!GetOwner() || !GetOwner()->GetDelegate() || !start() || \
+      !start()->GetAnchor() || !end() || !end()->GetAnchor())  \
+    return UIA_E_ELEMENTNOTAVAILABLE;                          \
+  if (!in)                                                     \
+    return E_POINTER;                                          \
+  SetStart(start()->AsValidPosition());                        \
+  SetEnd(end()->AsValidPosition());
+#define UIA_VALIDATE_TEXTRANGEPROVIDER_CALL_1_OUT(out)         \
+  if (!GetOwner() || !GetOwner()->GetDelegate() || !start() || \
+      !start()->GetAnchor() || !end() || !end()->GetAnchor())  \
+    return UIA_E_ELEMENTNOTAVAILABLE;                          \
+  if (!out)                                                    \
+    return E_POINTER;                                          \
+  *out = {};                                                   \
+  SetStart(start()->AsValidPosition());                        \
+  SetEnd(end()->AsValidPosition());
+#define UIA_VALIDATE_TEXTRANGEPROVIDER_CALL_1_IN_1_OUT(in, out) \
+  if (!GetOwner() || !GetOwner()->GetDelegate() || !start() ||  \
+      !start()->GetAnchor() || !end() || !end()->GetAnchor())   \
+    return UIA_E_ELEMENTNOTAVAILABLE;                           \
+  if (!in || !out)                                              \
+    return E_POINTER;                                           \
+  *out = {};                                                    \
+  SetStart(start()->AsValidPosition());                         \
+  SetEnd(end()->AsValidPosition());
+// Validate bounds calculated by AXPlatformNodeDelegate. Degenerate bounds
+// indicate the interface is not yet supported on the platform.
+#define UIA_VALIDATE_BOUNDS(bounds)                           \
+  if (bounds.OffsetFromOrigin().IsZero() && bounds.IsEmpty()) \
+    return UIA_E_NOTSUPPORTED;
+
+namespace ui {
+
+class AXRangePhysicalPixelRectDelegate : public AXRangeRectDelegate {
+ public:
+  explicit AXRangePhysicalPixelRectDelegate(
+      AXPlatformNodeTextRangeProviderWin* host)
+      : host_(host) {}
+
+  gfx::Rect GetInnerTextRangeBoundsRect(
+      AXTreeID tree_id,
+      AXNode::AXID node_id,
+      int start_offset,
+      int end_offset,
+      ui::AXClippingBehavior clipping_behavior,
+      AXOffscreenResult* offscreen_result) override {
+    AXPlatformNodeDelegate* delegate = host_->GetDelegate(tree_id, node_id);
+    BASE_DCHECK(delegate);
+    return delegate->GetInnerTextRangeBoundsRect(
+        start_offset, end_offset, ui::AXCoordinateSystem::kScreenPhysicalPixels,
+        clipping_behavior, offscreen_result);
+  }
+
+  gfx::Rect GetBoundsRect(AXTreeID tree_id,
+                          AXNode::AXID node_id,
+                          AXOffscreenResult* offscreen_result) override {
+    AXPlatformNodeDelegate* delegate = host_->GetDelegate(tree_id, node_id);
+    BASE_DCHECK(delegate);
+    return delegate->GetBoundsRect(
+        ui::AXCoordinateSystem::kScreenPhysicalPixels,
+        ui::AXClippingBehavior::kClipped, offscreen_result);
+  }
+
+ private:
+  AXPlatformNodeTextRangeProviderWin* host_;
+};
+
+AXPlatformNodeTextRangeProviderWin::AXPlatformNodeTextRangeProviderWin() {}
+
+AXPlatformNodeTextRangeProviderWin::~AXPlatformNodeTextRangeProviderWin() {}
+
+ITextRangeProvider* AXPlatformNodeTextRangeProviderWin::CreateTextRangeProvider(
+    AXPositionInstance start,
+    AXPositionInstance end) {
+  CComObject<AXPlatformNodeTextRangeProviderWin>* text_range_provider = nullptr;
+  if (SUCCEEDED(CComObject<AXPlatformNodeTextRangeProviderWin>::CreateInstance(
+          &text_range_provider))) {
+    BASE_DCHECK(text_range_provider);
+    text_range_provider->SetStart(std::move(start));
+    text_range_provider->SetEnd(std::move(end));
+    text_range_provider->AddRef();
+    return text_range_provider;
+  }
+
+  return nullptr;
+}
+
+ITextRangeProvider*
+AXPlatformNodeTextRangeProviderWin::CreateTextRangeProviderForTesting(
+    AXPlatformNodeWin* owner,
+    AXPositionInstance start,
+    AXPositionInstance end) {
+  Microsoft::WRL::ComPtr<ITextRangeProvider> text_range_provider =
+      CreateTextRangeProvider(start->Clone(), end->Clone());
+  Microsoft::WRL::ComPtr<AXPlatformNodeTextRangeProviderWin>
+      text_range_provider_win;
+  if (SUCCEEDED(text_range_provider->QueryInterface(
+          IID_PPV_ARGS(&text_range_provider_win)))) {
+    text_range_provider_win->SetOwnerForTesting(owner);  // IN-TEST
+    return text_range_provider_win.Get();
+  }
+
+  return nullptr;
+}
+
+//
+// ITextRangeProvider methods.
+//
+HRESULT AXPlatformNodeTextRangeProviderWin::Clone(ITextRangeProvider** clone) {
+  UIA_VALIDATE_TEXTRANGEPROVIDER_CALL_1_OUT(clone);
+
+  *clone = CreateTextRangeProvider(start()->Clone(), end()->Clone());
+  return S_OK;
+}
+
+HRESULT AXPlatformNodeTextRangeProviderWin::Compare(ITextRangeProvider* other,
+                                                    BOOL* result) {
+  UIA_VALIDATE_TEXTRANGEPROVIDER_CALL_1_IN_1_OUT(other, result);
+
+  Microsoft::WRL::ComPtr<AXPlatformNodeTextRangeProviderWin> other_provider;
+  if (other->QueryInterface(IID_PPV_ARGS(&other_provider)) != S_OK)
+    return UIA_E_INVALIDOPERATION;
+
+  if (*start() == *(other_provider->start()) &&
+      *end() == *(other_provider->end())) {
+    *result = TRUE;
+  }
+  return S_OK;
+}
+
+HRESULT AXPlatformNodeTextRangeProviderWin::CompareEndpoints(
+    TextPatternRangeEndpoint this_endpoint,
+    ITextRangeProvider* other,
+    TextPatternRangeEndpoint other_endpoint,
+    int* result) {
+  UIA_VALIDATE_TEXTRANGEPROVIDER_CALL_1_IN_1_OUT(other, result);
+
+  Microsoft::WRL::ComPtr<AXPlatformNodeTextRangeProviderWin> other_provider;
+  if (other->QueryInterface(IID_PPV_ARGS(&other_provider)) != S_OK)
+    return UIA_E_INVALIDOPERATION;
+
+  const AXPositionInstance& this_provider_endpoint =
+      (this_endpoint == TextPatternRangeEndpoint_Start) ? start() : end();
+  const AXPositionInstance& other_provider_endpoint =
+      (other_endpoint == TextPatternRangeEndpoint_Start)
+          ? other_provider->start()
+          : other_provider->end();
+
+  std::optional<int> comparison =
+      this_provider_endpoint->CompareTo(*other_provider_endpoint);
+  if (!comparison)
+    return UIA_E_INVALIDOPERATION;
+
+  if (comparison.value() < 0)
+    *result = -1;
+  else if (comparison.value() > 0)
+    *result = 1;
+  else
+    *result = 0;
+  return S_OK;
+}
+
+HRESULT AXPlatformNodeTextRangeProviderWin::ExpandToEnclosingUnit(
+    TextUnit unit) {
+  return ExpandToEnclosingUnitImpl(unit);
+}
+
+HRESULT AXPlatformNodeTextRangeProviderWin::ExpandToEnclosingUnitImpl(
+    TextUnit unit) {
+  UIA_VALIDATE_TEXTRANGEPROVIDER_CALL();
+  {
+    AXPositionInstance normalized_start = start()->Clone();
+    AXPositionInstance normalized_end = end()->Clone();
+    NormalizeTextRange(normalized_start, normalized_end);
+    SetStart(std::move(normalized_start));
+    SetEnd(std::move(normalized_end));
+  }
+
+  // Determine if start is on a boundary of the specified TextUnit, if it is
+  // not, move backwards until it is. Move the end forwards from start until it
+  // is on the next TextUnit boundary, if one exists.
+  switch (unit) {
+    case TextUnit_Character: {
+      // For characters, the start endpoint will always be on a TextUnit
+      // boundary, thus we only need to move the end position.
+      AXPositionInstance end_backup = end()->Clone();
+      SetEnd(start()->CreateNextCharacterPosition(
+          AXBoundaryBehavior::CrossBoundary));
+
+      if (end()->IsNullPosition()) {
+        // The previous could fail if the start is at the end of the last anchor
+        // of the tree, try expanding to the previous character instead.
+        AXPositionInstance start_backup = start()->Clone();
+        SetStart(start()->CreatePreviousCharacterPosition(
+            AXBoundaryBehavior::CrossBoundary));
+
+        if (start()->IsNullPosition()) {
+          // Text representation is empty, undo everything and exit.
+          SetStart(std::move(start_backup));
+          SetEnd(std::move(end_backup));
+          return S_OK;
+        }
+        SetEnd(start()->CreateNextCharacterPosition(
+            AXBoundaryBehavior::CrossBoundary));
+        BASE_DCHECK(!end()->IsNullPosition());
+      }
+
+      AXPositionInstance normalized_start = start()->Clone();
+      AXPositionInstance normalized_end = end()->Clone();
+      NormalizeTextRange(normalized_start, normalized_end);
+      SetStart(std::move(normalized_start));
+      SetEnd(std::move(normalized_end));
+      break;
+    }
+    case TextUnit_Format:
+      SetStart(start()->CreatePreviousFormatStartPosition(
+          AXBoundaryBehavior::StopAtAnchorBoundary));
+      SetEnd(start()->CreateNextFormatEndPosition(
+          AXBoundaryBehavior::StopAtAnchorBoundary));
+      break;
+    case TextUnit_Word: {
+      AXPositionInstance start_backup = start()->Clone();
+      SetStart(start()->CreatePreviousWordStartPosition(
+          AXBoundaryBehavior::StopAtAnchorBoundary));
+
+      // Since start_ is already located at a word boundary, we need to cross it
+      // in order to move to the next one. Because Windows ATs behave
+      // undesirably when the start and end endpoints are not in the same anchor
+      // (for character and word navigation), stop at anchor boundary.
+      SetEnd(start()->CreateNextWordStartPosition(
+          AXBoundaryBehavior::StopAtAnchorBoundary));
+      break;
+    }
+    case TextUnit_Line:
+      // Walk backwards to the previous line start (but don't walk backwards
+      // if we're already at the start of a line). The previous line start can
+      // occur in a different node than where `start` is currently pointing, so
+      // use kStopAtLastAnchorBoundary, which will stop at the tree boundary if
+      // no previous line start is found.
+      SetStart(start()->CreateBoundaryStartPosition(
+          AXBoundaryBehavior::StopIfAlreadyAtBoundary,
+          ax::mojom::MoveDirection::kBackward, &AtStartOfLinePredicate,
+          &AtEndOfLinePredicate));
+      // From the start we just walked backwards to, walk forwards to the line
+      // end position.
+      SetEnd(start()->CreateBoundaryEndPosition(
+          AXBoundaryBehavior::StopAtLastAnchorBoundary,
+          ax::mojom::MoveDirection::kForward, &AtStartOfLinePredicate,
+          &AtEndOfLinePredicate));
+      break;
+    case TextUnit_Paragraph:
+      SetStart(start()->CreatePreviousParagraphStartPosition(
+          AXBoundaryBehavior::StopIfAlreadyAtBoundary));
+      SetEnd(start()->CreateNextParagraphStartPosition(
+          AXBoundaryBehavior::StopAtLastAnchorBoundary));
+      break;
+    case TextUnit_Page: {
+      // Per UIA spec, if the document containing the current range doesn't
+      // support pagination, default to document navigation.
+      const AXNode* common_anchor = start()->LowestCommonAnchor(*end());
+      if (common_anchor->tree()->HasPaginationSupport()) {
+        SetStart(start()->CreatePreviousPageStartPosition(
+            AXBoundaryBehavior::StopAtAnchorBoundary));
+        SetEnd(start()->CreateNextPageEndPosition(
+            AXBoundaryBehavior::StopAtAnchorBoundary));
+        break;
+      }
+    }
+      [[fallthrough]];
+    case TextUnit_Document:
+      SetStart(
+          start()->CreatePositionAtStartOfDocument()->AsLeafTextPosition());
+      SetEnd(start()->CreatePositionAtEndOfDocument());
+      break;
+    default:
+      return UIA_E_NOTSUPPORTED;
+  }
+  BASE_DCHECK(!start()->IsNullPosition());
+  BASE_DCHECK(!end()->IsNullPosition());
+  return S_OK;
+}
+
+HRESULT AXPlatformNodeTextRangeProviderWin::FindAttribute(
+    TEXTATTRIBUTEID text_attribute_id,
+    VARIANT attribute_val,
+    BOOL is_backward,
+    ITextRangeProvider** result) {
+  // Algorithm description:
+  // Performs linear search. Expand forward or backward to fetch the first
+  // instance of a sub text range that matches the attribute and its value.
+  // |is_backward| determines the direction of our search.
+  // |is_backward=true|, we search from the end of this text range to its
+  // beginning.
+  // |is_backward=false|, we search from the beginning of this text range to its
+  // end.
+  //
+  // 1. Iterate through the vector of AXRanges in this text range in the
+  //    direction denoted by |is_backward|.
+  // 2. The |matched_range| is initially denoted as null since no range
+  //    currently matches. We initialize |matched_range| to non-null value when
+  //    we encounter the first AXRange instance that matches in attribute and
+  //    value. We then set the |matched_range_start| to be the start (anchor) of
+  //    the current AXRange, and |matched_range_end| to be the end (focus) of
+  //    the current AXRange.
+  // 3. If the current AXRange we are iterating on continues to match attribute
+  //    and value, we extend |matched_range| in one of the two following ways:
+  //    - If |is_backward=true|, we extend the |matched_range| by moving
+  //      |matched_range_start| backward. We do so by setting
+  //      |matched_range_start| to the start (anchor) of the current AXRange.
+  //    - If |is_backward=false|, we extend the |matched_range| by moving
+  //      |matched_range_end| forward. We do so by setting |matched_range_end|
+  //      to the end (focus) of the current AXRange.
+  // 4. We found a match when the current AXRange we are iterating on does not
+  //    match the attribute and value and there is a previously matched range.
+  //    The previously matched range is the final match we found.
+  UIA_VALIDATE_TEXTRANGEPROVIDER_CALL_1_OUT(result);
+  // Use a cloned range so that FindAttribute does not introduce side-effects
+  // while normalizing the original range.
+  AXPositionInstance normalized_start = start()->Clone();
+  AXPositionInstance normalized_end = end()->Clone();
+  NormalizeTextRange(normalized_start, normalized_end);
+
+  *result = nullptr;
+  AXPositionInstance matched_range_start = nullptr;
+  AXPositionInstance matched_range_end = nullptr;
+
+  std::vector<AXNodeRange> anchors;
+  AXNodeRange range(normalized_start->Clone(), normalized_end->Clone());
+  for (AXNodeRange leaf_text_range : range)
+    anchors.emplace_back(std::move(leaf_text_range));
+
+  auto expand_match = [&matched_range_start, &matched_range_end, is_backward](
+                          auto& current_start, auto& current_end) {
+    // The current AXRange has the attribute and its value that we are looking
+    // for, we expand the matched text range if a previously matched exists,
+    // otherwise initialize a newly matched text range.
+    if (matched_range_start != nullptr && matched_range_end != nullptr) {
+      // Continue expanding the matched text range forward/backward based on
+      // the search direction.
+      if (is_backward)
+        matched_range_start = current_start->Clone();
+      else
+        matched_range_end = current_end->Clone();
+    } else {
+      // Initialize the matched text range. The first AXRange instance that
+      // matches the attribute and its value encountered.
+      matched_range_start = current_start->Clone();
+      matched_range_end = current_end->Clone();
+    }
+  };
+
+  HRESULT hr_result =
+      is_backward
+          ? FindAttributeRange(text_attribute_id, attribute_val,
+                               anchors.crbegin(), anchors.crend(), expand_match)
+          : FindAttributeRange(text_attribute_id, attribute_val,
+                               anchors.cbegin(), anchors.cend(), expand_match);
+  if (FAILED(hr_result))
+    return E_FAIL;
+
+  if (matched_range_start != nullptr && matched_range_end != nullptr)
+    *result = CreateTextRangeProvider(std::move(matched_range_start),
+                                      std::move(matched_range_end));
+  return S_OK;
+}
+
+template <typename AnchorIterator, typename ExpandMatchLambda>
+HRESULT AXPlatformNodeTextRangeProviderWin::FindAttributeRange(
+    const TEXTATTRIBUTEID text_attribute_id,
+    VARIANT attribute_val,
+    const AnchorIterator first,
+    const AnchorIterator last,
+    ExpandMatchLambda expand_match) {
+  AXPlatformNodeWin* current_platform_node;
+  bool is_match_found = false;
+
+  for (auto it = first; it != last; ++it) {
+    const auto& current_start = it->anchor();
+    const auto& current_end = it->focus();
+
+    BASE_DCHECK(current_start->GetAnchor() == current_end->GetAnchor());
+
+    AXPlatformNodeDelegate* delegate = GetDelegate(current_start);
+    BASE_DCHECK(delegate);
+
+    current_platform_node = static_cast<AXPlatformNodeWin*>(
+        delegate->GetFromNodeID(current_start->GetAnchor()->id()));
+
+    base::win::VariantVector current_attribute_value;
+    if (FAILED(current_platform_node->GetTextAttributeValue(
+            text_attribute_id, current_start->text_offset(),
+            current_end->text_offset(), &current_attribute_value))) {
+      return E_FAIL;
+    }
+
+    if (!current_attribute_value.Compare(attribute_val)) {
+      // When we encounter an AXRange instance that matches the attribute
+      // and its value which we are looking for and no previously matched text
+      // range exists, we expand or initialize the matched range.
+      is_match_found = true;
+      expand_match(current_start, current_end);
+    } else if (is_match_found) {
+      // When we encounter an AXRange instance that does not match the attribute
+      // and its value which we are looking for and a previously matched text
+      // range exists, the previously matched text range is the result we found.
+      break;
+    }
+  }
+  return S_OK;
+}
+
+static bool StringSearchBasic(const std::u16string_view search_string,
+                              const std::u16string_view find_in,
+                              size_t* find_start,
+                              size_t* find_length,
+                              bool backwards) {
+  size_t index =
+      backwards ? find_in.rfind(search_string) : find_in.find(search_string);
+  if (index == std::u16string::npos) {
+    return false;
+  }
+  *find_start = index;
+  *find_length = search_string.size();
+  return true;
+}
+
+bool StringSearch(std::u16string_view search_string,
+                  std::u16string_view find_in,
+                  size_t* find_start,
+                  size_t* find_length,
+                  bool ignore_case,
+                  bool backwards) {
+  UErrorCode status = U_ZERO_ERROR;
+  UCollator* col = ucol_open(uloc_getDefault(), &status);
+  UStringSearch* search = usearch_openFromCollator(
+      search_string.data(), search_string.size(), find_in.data(),
+      find_in.size(), col, nullptr, &status);
+  if (!U_SUCCESS(status)) {
+    if (search) {
+      usearch_close(search);
+    }
+    return StringSearchBasic(search_string, find_in, find_start, find_length,
+                             backwards);
+  }
+  UCollator* collator = usearch_getCollator(search);
+  ucol_setStrength(collator, ignore_case ? UCOL_PRIMARY : UCOL_TERTIARY);
+  usearch_reset(search);
+  status = U_ZERO_ERROR;
+  usearch_setText(search, find_in.data(), find_in.size(), &status);
+  if (!U_SUCCESS(status)) {
+    if (search) {
+      usearch_close(search);
+    }
+    return StringSearchBasic(search_string, find_in, find_start, find_length,
+                             backwards);
+  }
+  int32_t index = backwards ? usearch_last(search, &status)
+                            : usearch_first(search, &status);
+  bool match = false;
+  if (U_SUCCESS(status) && index != USEARCH_DONE) {
+    match = true;
+    *find_start = static_cast<size_t>(index);
+    *find_length = static_cast<size_t>(usearch_getMatchedLength(search));
+  }
+  usearch_close(search);
+  return match;
+}
+
+HRESULT AXPlatformNodeTextRangeProviderWin::FindText(
+    BSTR string,
+    BOOL backwards,
+    BOOL ignore_case,
+    ITextRangeProvider** result) {
+  UIA_VALIDATE_TEXTRANGEPROVIDER_CALL_1_IN_1_OUT(string, result);
+  // On Windows, there's a dichotomy in the definition of a text offset in a
+  // text position between different APIs:
+  //   - on UIA, a text offset translates to the offset in the text itself
+  //   - on IA2, it translates to the offset in the hypertext
+  //
+  // All unignored non-text nodes are represented with an "embedded object
+  // character" in their parent's text representation on IA2, but aren't on UIA.
+  // This leads to different expected MaxTextOffset values for a same text
+  // position. If `string` is found in the text represented by the start/end
+  // endpoints, we'll create text positions in the least common ancestor, use
+  // the flat text representation's offsets of found string, then convert the
+  // positions to leaf. If 'embedded object characters' are considered, instead
+  // of the flat text representation, this falls apart.
+  //
+  // Whether we expose embedded object characters for nodes is managed by the
+  // |g_ax_embedded_object_behavior| global variable set in ax_node_position.cc.
+  // When on Windows, this variable is always set to kExposeCharacter... which
+  // is incorrect if we run UIA-specific code. To avoid problems caused by that,
+  // we use the following ScopedAXEmbeddedObjectBehaviorSetter to modify the
+  // value of the global variable to what is really expected on UIA.
+  ScopedAXEmbeddedObjectBehaviorSetter ax_embedded_object_behavior(
+      AXEmbeddedObjectBehavior::kSuppressCharacter);
+
+  std::u16string search_string = fml::WideStringToUtf16(string);
+  if (search_string.length() <= 0)
+    return E_INVALIDARG;
+
+  size_t appended_newlines_count = 0;
+  std::u16string text_range = GetString(-1, &appended_newlines_count);
+  size_t find_start;
+  size_t find_length;
+  if (StringSearch(search_string, text_range, &find_start, &find_length,
+                   ignore_case, backwards) &&
+      find_length > appended_newlines_count) {
+    // TODO(https://crbug.com/1023599): There is a known issue here related to
+    // text searches of a |string| starting and ending with a "\n", e.g.
+    // "\nsometext" or "sometext\n" if the newline is computed from a line
+    // breaking object. FindText() is rarely called, and when it is, it's not to
+    // look for a string starting or ending with a newline. This may change
+    // someday, and if so, we'll have to address this issue.
+    const AXNode* common_anchor = start()->LowestCommonAnchor(*end());
+    AXPositionInstance start_ancestor_position =
+        start()->CreateAncestorPosition(common_anchor,
+                                        ax::mojom::MoveDirection::kForward);
+    BASE_DCHECK(!start_ancestor_position->IsNullPosition());
+    AXPositionInstance end_ancestor_position = end()->CreateAncestorPosition(
+        common_anchor, ax::mojom::MoveDirection::kForward);
+    BASE_DCHECK(!end_ancestor_position->IsNullPosition());
+    const AXNode* anchor = start_ancestor_position->GetAnchor();
+    BASE_DCHECK(anchor);
+    const int start_offset =
+        start_ancestor_position->text_offset() + find_start;
+    const int end_offset = start_offset + find_length - appended_newlines_count;
+    const int max_end_offset = end_ancestor_position->text_offset();
+    BASE_DCHECK(start_offset <= end_offset && end_offset <= max_end_offset);
+
+    AXPositionInstance start =
+        ui::AXNodePosition::CreateTextPosition(
+            anchor->tree()->GetAXTreeID(), anchor->id(), start_offset,
+            ax::mojom::TextAffinity::kDownstream)
+            ->AsLeafTextPosition();
+    AXPositionInstance end =
+        ui::AXNodePosition::CreateTextPosition(
+            anchor->tree()->GetAXTreeID(), anchor->id(), end_offset,
+            ax::mojom::TextAffinity::kDownstream)
+            ->AsLeafTextPosition();
+
+    *result = CreateTextRangeProvider(start->Clone(), end->Clone());
+  }
+  return S_OK;
+}
+
+HRESULT AXPlatformNodeTextRangeProviderWin::GetAttributeValue(
+    TEXTATTRIBUTEID attribute_id,
+    VARIANT* value) {
+  UIA_VALIDATE_TEXTRANGEPROVIDER_CALL_1_OUT(value);
+
+  base::win::VariantVector attribute_value;
+
+  // When the range spans only a generated newline (a generated newline is not
+  // part of a node, but rather introduced by AXRange::GetText when at a
+  // paragraph boundary), it doesn't make sense to return the readonly value of
+  // the start or end anchor since the newline character is not part of any of
+  // those nodes. Thus, this attribute value is independent from these nodes.
+  //
+  // Instead, we should return the readonly attribute value of the common anchor
+  // for these two endpoints since the newline character has more in common with
+  // its ancestor than its siblings. Important: This might not be true for all
+  // attributes, but it appears to be reasonable enough for the readonly one.
+  //
+  // To determine if the range encompasses *only* a generated newline, we need
+  // to validate that both the start and end endpoints are around the same
+  // paragraph boundary.
+  if (attribute_id == UIA_IsReadOnlyAttributeId &&
+      start()->anchor_id() != end()->anchor_id() &&
+      start()->AtEndOfParagraph() && end()->AtStartOfParagraph() &&
+      *start()->CreateNextCharacterPosition(
+          AXBoundaryBehavior::CrossBoundary) == *end()) {
+    AXPlatformNodeWin* common_anchor = GetLowestAccessibleCommonPlatformNode();
+    BASE_DCHECK(common_anchor);
+
+    HRESULT hr = common_anchor->GetTextAttributeValue(
+        attribute_id, std::nullopt, std::nullopt, &attribute_value);
+
+    if (FAILED(hr))
+      return E_FAIL;
+
+    *value = attribute_value.ReleaseAsScalarVariant();
+    return S_OK;
+  }
+
+  // Use a cloned range so that GetAttributeValue does not introduce
+  // side-effects while normalizing the original range.
+  AXPositionInstance normalized_start = start()->Clone();
+  AXPositionInstance normalized_end = end()->Clone();
+  NormalizeTextRange(normalized_start, normalized_end);
+
+  // The range is inclusive, so advance our endpoint to the next position
+  const auto end_leaf_text_position = normalized_end->AsLeafTextPosition();
+  auto end = end_leaf_text_position->CreateNextAnchorPosition();
+
+  // Iterate over anchor positions
+  for (auto it = normalized_start->AsLeafTextPosition();
+       it->anchor_id() != end->anchor_id() || it->tree_id() != end->tree_id();
+       it = it->CreateNextAnchorPosition()) {
+    // If the iterator creates a null position, then it has likely overrun the
+    // range, return failure. This is unexpected but may happen if the range
+    // became inverted.
+    BASE_DCHECK(!it->IsNullPosition());
+    if (it->IsNullPosition())
+      return E_FAIL;
+
+    AXPlatformNodeDelegate* delegate = GetDelegate(it.get());
+    BASE_DCHECK(it && delegate);
+
+    AXPlatformNodeWin* platform_node = static_cast<AXPlatformNodeWin*>(
+        delegate->GetFromNodeID(it->anchor_id()));
+    BASE_DCHECK(platform_node);
+
+    // Only get attributes for nodes in the tree. Exclude descendants of leaves
+    // and ignored objects.
+    platform_node = static_cast<AXPlatformNodeWin*>(
+        AXPlatformNode::FromNativeViewAccessible(
+            platform_node->GetDelegate()->GetLowestPlatformAncestor()));
+    BASE_DCHECK(platform_node);
+
+    base::win::VariantVector current_value;
+    const bool at_end_leaf_text_anchor =
+        it->anchor_id() == end_leaf_text_position->anchor_id() &&
+        it->tree_id() == end_leaf_text_position->tree_id();
+    const std::optional<int> start_offset =
+        it->IsTextPosition() ? std::make_optional(it->text_offset())
+                             : std::nullopt;
+    const std::optional<int> end_offset =
+        at_end_leaf_text_anchor
+            ? std::make_optional(end_leaf_text_position->text_offset())
+            : std::nullopt;
+    HRESULT hr = platform_node->GetTextAttributeValue(
+        attribute_id, start_offset, end_offset, &current_value);
+    if (FAILED(hr))
+      return E_FAIL;
+
+    if (attribute_value.Type() == VT_EMPTY) {
+      attribute_value = std::move(current_value);
+    } else if (attribute_value != current_value) {
+      V_VT(value) = VT_UNKNOWN;
+      return ::UiaGetReservedMixedAttributeValue(&V_UNKNOWN(value));
+    }
+  }
+
+  if (ShouldReleaseTextAttributeAsSafearray(attribute_id, attribute_value))
+    *value = attribute_value.ReleaseAsSafearrayVariant();
+  else
+    *value = attribute_value.ReleaseAsScalarVariant();
+  return S_OK;
+}
+
+HRESULT AXPlatformNodeTextRangeProviderWin::GetBoundingRectangles(
+    SAFEARRAY** screen_physical_pixel_rectangles) {
+  UIA_VALIDATE_TEXTRANGEPROVIDER_CALL_1_OUT(screen_physical_pixel_rectangles);
+
+  *screen_physical_pixel_rectangles = nullptr;
+  AXNodeRange range(start()->Clone(), end()->Clone());
+  AXRangePhysicalPixelRectDelegate rect_delegate(this);
+  std::vector<gfx::Rect> rects = range.GetRects(&rect_delegate);
+
+  // 4 array items per rect: left, top, width, height
+  SAFEARRAY* safe_array = SafeArrayCreateVector(
+      VT_R8 /* element type */, 0 /* lower bound */, rects.size() * 4);
+
+  if (!safe_array)
+    return E_OUTOFMEMORY;
+
+  if (rects.size() > 0) {
+    double* double_array = nullptr;
+    HRESULT hr = SafeArrayAccessData(safe_array,
+                                     reinterpret_cast<void**>(&double_array));
+
+    if (SUCCEEDED(hr)) {
+      for (size_t rect_index = 0; rect_index < rects.size(); rect_index++) {
+        const gfx::Rect& rect = rects[rect_index];
+        double_array[rect_index * 4] = rect.x();
+        double_array[rect_index * 4 + 1] = rect.y();
+        double_array[rect_index * 4 + 2] = rect.width();
+        double_array[rect_index * 4 + 3] = rect.height();
+      }
+      hr = SafeArrayUnaccessData(safe_array);
+    }
+
+    if (FAILED(hr)) {
+      BASE_DCHECK(safe_array);
+      SafeArrayDestroy(safe_array);
+      return E_FAIL;
+    }
+  }
+
+  *screen_physical_pixel_rectangles = safe_array;
+  return S_OK;
+}
+
+HRESULT AXPlatformNodeTextRangeProviderWin::GetEnclosingElement(
+    IRawElementProviderSimple** element) {
+  UIA_VALIDATE_TEXTRANGEPROVIDER_CALL_1_OUT(element);
+
+  AXPlatformNodeWin* enclosing_node = GetLowestAccessibleCommonPlatformNode();
+  if (!enclosing_node)
+    return UIA_E_ELEMENTNOTAVAILABLE;
+
+  enclosing_node->GetNativeViewAccessible()->QueryInterface(
+      IID_PPV_ARGS(element));
+
+  BASE_DCHECK(*element);
+  return S_OK;
+}
+
+HRESULT AXPlatformNodeTextRangeProviderWin::GetText(int max_count, BSTR* text) {
+  UIA_VALIDATE_TEXTRANGEPROVIDER_CALL_1_OUT(text);
+
+  // -1 is a valid value that signifies that the caller wants complete text.
+  // Any other negative value is an invalid argument.
+  if (max_count < -1)
+    return E_INVALIDARG;
+
+  std::wstring full_text = fml::Utf16ToWideString(GetString(max_count));
+  if (!full_text.empty()) {
+    size_t length = full_text.length();
+
+    if (max_count != -1 && max_count < static_cast<int>(length))
+      *text = SysAllocStringLen(full_text.c_str(), max_count);
+    else
+      *text = SysAllocStringLen(full_text.c_str(), length);
+  } else {
+    *text = SysAllocString(L"");
+  }
+  return S_OK;
+}
+
+HRESULT AXPlatformNodeTextRangeProviderWin::Move(TextUnit unit,
+                                                 int count,
+                                                 int* units_moved) {
+  UIA_VALIDATE_TEXTRANGEPROVIDER_CALL_1_OUT(units_moved);
+
+  // Per MSDN, move with zero count has no effect.
+  if (count == 0)
+    return S_OK;
+
+  // Save a clone of start and end, in case one of the moves fails.
+  auto start_backup = start()->Clone();
+  auto end_backup = end()->Clone();
+  bool is_degenerate_range = (*start() == *end());
+
+  // Move the start of the text range forward or backward in the document by the
+  // requested number of text unit boundaries.
+  int start_units_moved = 0;
+  HRESULT hr = MoveEndpointByUnitImpl(TextPatternRangeEndpoint_Start, unit,
+                                      count, &start_units_moved);
+
+  bool succeeded_move = SUCCEEDED(hr) && start_units_moved != 0;
+  if (succeeded_move) {
+    SetEnd(start()->Clone());
+    if (!is_degenerate_range) {
+      bool forwards = count > 0;
+      if (forwards && start()->AtEndOfDocument()) {
+        // The start is at the end of the document, so move the start backward
+        // by one text unit to expand the text range from the degenerate range
+        // state.
+        int current_start_units_moved = 0;
+        hr = MoveEndpointByUnitImpl(TextPatternRangeEndpoint_Start, unit, -1,
+                                    &current_start_units_moved);
+        start_units_moved -= 1;
+        succeeded_move = SUCCEEDED(hr) && current_start_units_moved == -1 &&
+                         start_units_moved > 0;
+      } else {
+        // The start is not at the end of the document, so move the endpoint
+        // forward by one text unit to expand the text range from the degenerate
+        // state.
+        int end_units_moved = 0;
+        hr = MoveEndpointByUnitImpl(TextPatternRangeEndpoint_End, unit, 1,
+                                    &end_units_moved);
+        succeeded_move = SUCCEEDED(hr) && end_units_moved == 1;
+      }
+
+      // Because Windows ATs behave undesirably when the start and end endpoints
+      // are not in the same anchor (for character and word navigation), make
+      // sure to bring back the end endpoint to the end of the start's anchor.
+      if (start()->anchor_id() != end()->anchor_id() &&
+          (unit == TextUnit_Character || unit == TextUnit_Word)) {
+        ExpandToEnclosingUnitImpl(unit);
+      }
+    }
+  }
+
+  if (!succeeded_move) {
+    SetStart(std::move(start_backup));
+    SetEnd(std::move(end_backup));
+    start_units_moved = 0;
+    if (!SUCCEEDED(hr))
+      return hr;
+  }
+
+  *units_moved = start_units_moved;
+  return S_OK;
+}
+
+HRESULT AXPlatformNodeTextRangeProviderWin::MoveEndpointByUnit(
+    TextPatternRangeEndpoint endpoint,
+    TextUnit unit,
+    int count,
+    int* units_moved) {
+  return MoveEndpointByUnitImpl(endpoint, unit, count, units_moved);
+}
+
+HRESULT AXPlatformNodeTextRangeProviderWin::MoveEndpointByUnitImpl(
+    TextPatternRangeEndpoint endpoint,
+    TextUnit unit,
+    int count,
+    int* units_moved) {
+  UIA_VALIDATE_TEXTRANGEPROVIDER_CALL_1_OUT(units_moved);
+
+  // Per MSDN, MoveEndpointByUnit with zero count has no effect.
+  if (count == 0) {
+    *units_moved = 0;
+    return S_OK;
+  }
+
+  bool is_start_endpoint = endpoint == TextPatternRangeEndpoint_Start;
+  AXPositionInstance position_to_move =
+      is_start_endpoint ? start()->Clone() : end()->Clone();
+
+  AXPositionInstance new_position;
+  // TODO(schectman): TextUnit_Format implementation.
+  // https://github.com/flutter/flutter/issues/117792
+  switch (unit) {
+    case TextUnit_Character:
+      new_position =
+          MoveEndpointByCharacter(position_to_move, count, units_moved);
+      break;
+    case TextUnit_Word:
+      new_position = MoveEndpointByWord(position_to_move, count, units_moved);
+      break;
+    case TextUnit_Line:
+      new_position = MoveEndpointByLine(position_to_move, is_start_endpoint,
+                                        count, units_moved);
+      break;
+    case TextUnit_Paragraph:
+      new_position = MoveEndpointByParagraph(
+          position_to_move, is_start_endpoint, count, units_moved);
+      break;
+    case TextUnit_Page:
+      new_position = MoveEndpointByPage(position_to_move, is_start_endpoint,
+                                        count, units_moved);
+      break;
+    case TextUnit_Document:
+      new_position =
+          MoveEndpointByDocument(position_to_move, count, units_moved);
+      break;
+    default:
+      return UIA_E_NOTSUPPORTED;
+  }
+  if (is_start_endpoint)
+    SetStart(std::move(new_position));
+  else
+    SetEnd(std::move(new_position));
+
+  // If the start was moved past the end, create a degenerate range with the end
+  // equal to the start; do the equivalent if the end moved past the start.
+  std::optional<int> endpoint_comparison =
+      AXNodeRange::CompareEndpoints(start().get(), end().get());
+  BASE_DCHECK(endpoint_comparison.has_value());
+
+  if (endpoint_comparison.value_or(0) > 0) {
+    if (is_start_endpoint)
+      SetEnd(start()->Clone());
+    else
+      SetStart(end()->Clone());
+  }
+  return S_OK;
+}
+
+HRESULT AXPlatformNodeTextRangeProviderWin::MoveEndpointByRange(
+    TextPatternRangeEndpoint this_endpoint,
+    ITextRangeProvider* other,
+    TextPatternRangeEndpoint other_endpoint) {
+  UIA_VALIDATE_TEXTRANGEPROVIDER_CALL_1_IN(other);
+
+  Microsoft::WRL::ComPtr<AXPlatformNodeTextRangeProviderWin> other_provider;
+  if (other->QueryInterface(IID_PPV_ARGS(&other_provider)) != S_OK)
+    return UIA_E_INVALIDOPERATION;
+
+  const AXPositionInstance& other_provider_endpoint =
+      (other_endpoint == TextPatternRangeEndpoint_Start)
+          ? other_provider->start()
+          : other_provider->end();
+
+  if (this_endpoint == TextPatternRangeEndpoint_Start) {
+    SetStart(other_provider_endpoint->Clone());
+    if (*start() > *end())
+      SetEnd(start()->Clone());
+  } else {
+    SetEnd(other_provider_endpoint->Clone());
+    if (*start() > *end())
+      SetStart(end()->Clone());
+  }
+  return S_OK;
+}
+
+HRESULT AXPlatformNodeTextRangeProviderWin::Select() {
+  UIA_VALIDATE_TEXTRANGEPROVIDER_CALL();
+
+  AXPositionInstance selection_start = start()->Clone();
+  AXPositionInstance selection_end = end()->Clone();
+
+  // Blink only supports selections within a single tree. So if start_ and  end_
+  // are in different trees, we can't directly pass them to the render process
+  // for selection.
+  if (selection_start->tree_id() != selection_end->tree_id()) {
+    // Prioritize the end position's tree, as a selection's focus object is the
+    // end of a selection.
+    selection_start = selection_end->CreatePositionAtStartOfAXTree();
+  }
+
+  BASE_DCHECK(!selection_start->IsNullPosition());
+  BASE_DCHECK(!selection_end->IsNullPosition());
+  BASE_DCHECK(selection_start->tree_id() == selection_end->tree_id());
+
+  // TODO(crbug.com/1124051): Blink does not support selection on the list
+  // markers. So if |selection_start| or |selection_end| are in list markers, we
+  // don't perform selection and return success. Remove this check once this bug
+  // is fixed.
+  if (selection_start->GetAnchor()->IsInListMarker() ||
+      selection_end->GetAnchor()->IsInListMarker()) {
+    return S_OK;
+  }
+
+  AXPlatformNodeDelegate* delegate =
+      GetDelegate(selection_start->tree_id(), selection_start->anchor_id());
+  BASE_DCHECK(delegate);
+
+  AXNodeRange new_selection_range(std::move(selection_start),
+                                  std::move(selection_end));
+  RemoveFocusFromPreviousSelectionIfNeeded(new_selection_range);
+
+  AXActionData action_data;
+  action_data.anchor_node_id = new_selection_range.anchor()->anchor_id();
+  action_data.anchor_offset = new_selection_range.anchor()->text_offset();
+  action_data.focus_node_id = new_selection_range.focus()->anchor_id();
+  action_data.focus_offset = new_selection_range.focus()->text_offset();
+  action_data.action = ax::mojom::Action::kSetSelection;
+
+  delegate->AccessibilityPerformAction(action_data);
+  return S_OK;
+}
+
+HRESULT AXPlatformNodeTextRangeProviderWin::AddToSelection() {
+  // Blink does not support disjoint text selections.
+  return UIA_E_INVALIDOPERATION;
+}
+
+HRESULT
+AXPlatformNodeTextRangeProviderWin::RemoveFromSelection() {
+  // Blink does not support disjoint text selections.
+  return UIA_E_INVALIDOPERATION;
+}
+
+HRESULT AXPlatformNodeTextRangeProviderWin::ScrollIntoView(BOOL align_to_top) {
+  UIA_VALIDATE_TEXTRANGEPROVIDER_CALL();
+
+  const AXPositionInstance start_common_ancestor =
+      start()->LowestCommonAncestor(*end());
+  const AXPositionInstance end_common_ancestor =
+      end()->LowestCommonAncestor(*start());
+  if (start_common_ancestor->IsNullPosition() ||
+      end_common_ancestor->IsNullPosition()) {
+    return E_INVALIDARG;
+  }
+
+  const AXNode* common_ancestor_anchor = start_common_ancestor->GetAnchor();
+  BASE_DCHECK(common_ancestor_anchor == end_common_ancestor->GetAnchor());
+
+  const AXTreeID common_ancestor_tree_id = start_common_ancestor->tree_id();
+  const AXPlatformNodeDelegate* root_delegate =
+      GetRootDelegate(common_ancestor_tree_id);
+  BASE_DCHECK(root_delegate);
+  const gfx::Rect root_frame_bounds = root_delegate->GetBoundsRect(
+      AXCoordinateSystem::kFrame, AXClippingBehavior::kUnclipped);
+  UIA_VALIDATE_BOUNDS(root_frame_bounds);
+
+  const AXPlatformNode* common_ancestor_platform_node =
+      GetOwner()->GetDelegate()->GetFromTreeIDAndNodeID(
+          common_ancestor_tree_id, common_ancestor_anchor->id());
+  BASE_DCHECK(common_ancestor_platform_node);
+  AXPlatformNodeDelegate* common_ancestor_delegate =
+      common_ancestor_platform_node->GetDelegate();
+  BASE_DCHECK(common_ancestor_delegate);
+  const gfx::Rect text_range_container_frame_bounds =
+      common_ancestor_delegate->GetBoundsRect(AXCoordinateSystem::kFrame,
+                                              AXClippingBehavior::kUnclipped);
+  UIA_VALIDATE_BOUNDS(text_range_container_frame_bounds);
+
+  gfx::Point target_point;
+  if (align_to_top) {
+    target_point = gfx::Point(root_frame_bounds.x(), root_frame_bounds.y());
+  } else {
+    target_point =
+        gfx::Point(root_frame_bounds.x(),
+                   root_frame_bounds.y() + root_frame_bounds.height());
+  }
+
+  if ((align_to_top && start()->GetAnchor()->IsText()) ||
+      (!align_to_top && end()->GetAnchor()->IsText())) {
+    const gfx::Rect text_range_frame_bounds =
+        common_ancestor_delegate->GetInnerTextRangeBoundsRect(
+            start_common_ancestor->text_offset(),
+            end_common_ancestor->text_offset(), AXCoordinateSystem::kFrame,
+            AXClippingBehavior::kUnclipped);
+    UIA_VALIDATE_BOUNDS(text_range_frame_bounds);
+
+    if (align_to_top) {
+      target_point.Offset(0, -(text_range_container_frame_bounds.height() -
+                               text_range_frame_bounds.height()));
+    } else {
+      target_point.Offset(0, -text_range_frame_bounds.height());
+    }
+  } else {
+    if (!align_to_top)
+      target_point.Offset(0, -text_range_container_frame_bounds.height());
+  }
+
+  const gfx::Rect root_screen_bounds = root_delegate->GetBoundsRect(
+      AXCoordinateSystem::kScreenDIPs, AXClippingBehavior::kUnclipped);
+  UIA_VALIDATE_BOUNDS(root_screen_bounds);
+  target_point += root_screen_bounds.OffsetFromOrigin();
+
+  AXActionData action_data;
+  action_data.action = ax::mojom::Action::kScrollToPoint;
+  action_data.target_node_id = common_ancestor_anchor->id();
+  action_data.target_point = target_point;
+  if (!common_ancestor_delegate->AccessibilityPerformAction(action_data))
+    return E_FAIL;
+  return S_OK;
+}
+
+// This function is expected to return a subset of the *direct* children of the
+// common ancestor node. The subset should only include the direct children
+// included - fully or partially - in the range.
+HRESULT AXPlatformNodeTextRangeProviderWin::GetChildren(SAFEARRAY** children) {
+  UIA_VALIDATE_TEXTRANGEPROVIDER_CALL_1_OUT(children);
+  std::vector<gfx::NativeViewAccessible> descendants;
+
+  AXPlatformNodeWin* start_anchor =
+      GetPlatformNodeFromAXNode(start()->GetAnchor());
+  AXPlatformNodeWin* end_anchor = GetPlatformNodeFromAXNode(end()->GetAnchor());
+  AXPlatformNodeWin* common_anchor = GetLowestAccessibleCommonPlatformNode();
+  if (!common_anchor || !start_anchor || !end_anchor)
+    return UIA_E_ELEMENTNOTAVAILABLE;
+
+  SAFEARRAY* safe_array = SafeArrayCreateVector(VT_UNKNOWN, 0, 0);
+
+  // TODO(schectman): Implement GetUIADirectChildrenInRange for
+  // FlutterPlatformNodeDelegate
+
+  *children = safe_array;
+  return S_OK;
+}
+
+// static
+bool AXPlatformNodeTextRangeProviderWin::AtStartOfLinePredicate(
+    const AXPositionInstance& position) {
+  return !position->IsIgnored() && position->AtStartOfAnchor() &&
+         (position->AtStartOfLine() || position->AtStartOfInlineBlock());
+}
+
+// static
+bool AXPlatformNodeTextRangeProviderWin::AtEndOfLinePredicate(
+    const AXPositionInstance& position) {
+  return !position->IsIgnored() && position->AtEndOfAnchor() &&
+         (position->AtEndOfLine() || position->AtStartOfInlineBlock());
+}
+
+// static
+AXPlatformNodeTextRangeProviderWin::AXPositionInstance
+AXPlatformNodeTextRangeProviderWin::GetNextTextBoundaryPosition(
+    const AXPositionInstance& position,
+    ax::mojom::TextBoundary boundary_type,
+    AXBoundaryBehavior options,
+    ax::mojom::MoveDirection boundary_direction) {
+  // Override At[Start|End]OfLinePredicate for behavior specific to UIA.
+  BASE_DCHECK(boundary_type != ax::mojom::TextBoundary::kNone);
+  switch (boundary_type) {
+    case ax::mojom::TextBoundary::kLineStart:
+      return position->CreateBoundaryStartPosition(options, boundary_direction,
+                                                   &AtStartOfLinePredicate,
+                                                   &AtEndOfLinePredicate);
+    case ax::mojom::TextBoundary::kLineEnd:
+      return position->CreateBoundaryEndPosition(options, boundary_direction,
+                                                 &AtStartOfLinePredicate,
+                                                 &AtEndOfLinePredicate);
+    default:
+      return position->CreatePositionAtTextBoundary(
+          boundary_type, boundary_direction, options);
+  }
+}
+
+std::u16string AXPlatformNodeTextRangeProviderWin::GetString(
+    int max_count,
+    size_t* appended_newlines_count) {
+  AXNodeRange range(start()->Clone(), end()->Clone());
+  return range.GetText(AXTextConcatenationBehavior::kAsTextContent, max_count,
+                       false, appended_newlines_count);
+}
+
+AXPlatformNodeWin* AXPlatformNodeTextRangeProviderWin::GetOwner() const {
+  // Unit tests can't call |GetPlatformNodeFromTree|, so they must provide an
+  // owner node.
+  if (owner_for_test_.Get())
+    return owner_for_test_.Get();
+
+  const AXPositionInstance& position =
+      !start()->IsNullPosition() ? start() : end();
+  // If start and end are both null, there's no owner.
+  if (position->IsNullPosition())
+    return nullptr;
+
+  const AXNode* anchor = position->GetAnchor();
+  BASE_DCHECK(anchor);
+  const AXTreeManager* tree_manager =
+      AXTreeManagerMap::GetInstance().GetManager(anchor->tree()->GetAXTreeID());
+  BASE_DCHECK(tree_manager);
+  const AXPlatformTreeManager* platform_tree_manager =
+      static_cast<const AXPlatformTreeManager*>(tree_manager);
+  return static_cast<AXPlatformNodeWin*>(
+      platform_tree_manager->GetPlatformNodeFromTree(*anchor));
+}
+
+AXPlatformNodeDelegate* AXPlatformNodeTextRangeProviderWin::GetDelegate(
+    const AXPositionInstanceType* position) const {
+  return GetDelegate(position->tree_id(), position->anchor_id());
+}
+
+AXPlatformNodeDelegate* AXPlatformNodeTextRangeProviderWin::GetDelegate(
+    const AXTreeID tree_id,
+    const AXNode::AXID node_id) const {
+  AXPlatformNode* platform_node =
+      GetOwner()->GetDelegate()->GetFromTreeIDAndNodeID(tree_id, node_id);
+  if (!platform_node)
+    return nullptr;
+
+  return platform_node->GetDelegate();
+}
+
+AXPlatformNodeTextRangeProviderWin::AXPositionInstance
+AXPlatformNodeTextRangeProviderWin::MoveEndpointByCharacter(
+    const AXPositionInstance& endpoint,
+    const int count,
+    int* units_moved) {
+  return MoveEndpointByUnitHelper(std::move(endpoint),
+                                  ax::mojom::TextBoundary::kCharacter, count,
+                                  units_moved);
+}
+
+AXPlatformNodeTextRangeProviderWin::AXPositionInstance
+AXPlatformNodeTextRangeProviderWin::MoveEndpointByWord(
+    const AXPositionInstance& endpoint,
+    const int count,
+    int* units_moved) {
+  return MoveEndpointByUnitHelper(std::move(endpoint),
+                                  ax::mojom::TextBoundary::kWordStart, count,
+                                  units_moved);
+}
+
+AXPlatformNodeTextRangeProviderWin::AXPositionInstance
+AXPlatformNodeTextRangeProviderWin::MoveEndpointByLine(
+    const AXPositionInstance& endpoint,
+    bool is_start_endpoint,
+    const int count,
+    int* units_moved) {
+  return MoveEndpointByUnitHelper(std::move(endpoint),
+                                  is_start_endpoint
+                                      ? ax::mojom::TextBoundary::kLineStart
+                                      : ax::mojom::TextBoundary::kLineEnd,
+                                  count, units_moved);
+}
+
+AXPlatformNodeTextRangeProviderWin::AXPositionInstance
+AXPlatformNodeTextRangeProviderWin::MoveEndpointByParagraph(
+    const AXPositionInstance& endpoint,
+    const bool is_start_endpoint,
+    const int count,
+    int* units_moved) {
+  return MoveEndpointByUnitHelper(std::move(endpoint),
+                                  is_start_endpoint
+                                      ? ax::mojom::TextBoundary::kParagraphStart
+                                      : ax::mojom::TextBoundary::kParagraphEnd,
+                                  count, units_moved);
+}
+
+AXPlatformNodeTextRangeProviderWin::AXPositionInstance
+AXPlatformNodeTextRangeProviderWin::MoveEndpointByPage(
+    const AXPositionInstance& endpoint,
+    const bool is_start_endpoint,
+    const int count,
+    int* units_moved) {
+  // Per UIA spec, if the document containing the current endpoint doesn't
+  // support pagination, default to document navigation.
+  //
+  // Note that the "ax::mojom::MoveDirection" should not matter when calculating
+  // the ancestor position for use when navigating by page or document, so we
+  // use a backward direction as the default.
+  AXPositionInstance common_ancestor = start()->LowestCommonAncestor(*end());
+  if (!common_ancestor->GetAnchor()->tree()->HasPaginationSupport())
+    return MoveEndpointByDocument(std::move(endpoint), count, units_moved);
+
+  return MoveEndpointByUnitHelper(std::move(endpoint),
+                                  is_start_endpoint
+                                      ? ax::mojom::TextBoundary::kPageStart
+                                      : ax::mojom::TextBoundary::kPageEnd,
+                                  count, units_moved);
+}
+
+AXPlatformNodeTextRangeProviderWin::AXPositionInstance
+AXPlatformNodeTextRangeProviderWin::MoveEndpointByDocument(
+    const AXPositionInstance& endpoint,
+    const int count,
+    int* units_moved) {
+  BASE_DCHECK(count != 0);
+
+  if (count < 0) {
+    *units_moved = !endpoint->AtStartOfDocument() ? -1 : 0;
+
+    return endpoint->CreatePositionAtStartOfDocument();
+  }
+  *units_moved = !endpoint->AtEndOfDocument() ? 1 : 0;
+  return endpoint->CreatePositionAtEndOfDocument();
+}
+
+AXPlatformNodeTextRangeProviderWin::AXPositionInstance
+AXPlatformNodeTextRangeProviderWin::MoveEndpointByUnitHelper(
+    const AXPositionInstance& endpoint,
+    const ax::mojom::TextBoundary boundary_type,
+    const int count,
+    int* units_moved) {
+  BASE_DCHECK(count != 0);
+  const ax::mojom::MoveDirection boundary_direction =
+      (count > 0) ? ax::mojom::MoveDirection::kForward
+                  : ax::mojom::MoveDirection::kBackward;
+
+  const AXNode* initial_endpoint = endpoint->GetAnchor();
+
+  // Most of the methods used to create the next/previous position go back and
+  // forth creating a leaf text position and rooting the result to the original
+  // position's anchor; avoid this by normalizing to a leaf text position.
+  AXPositionInstance current_endpoint = endpoint->AsLeafTextPosition();
+  AXPositionInstance next_endpoint = GetNextTextBoundaryPosition(
+      current_endpoint, boundary_type,
+      AXBoundaryBehavior::StopAtLastAnchorBoundary, boundary_direction);
+  BASE_DCHECK(next_endpoint->IsLeafTextPosition());
+
+  bool is_ignored_for_text_navigation = false;
+  int iteration = 0;
+  // Since AXBoundaryBehavior::kStopAtLastAnchorBoundary forces the next
+  // text boundary position to be different than the input position, the
+  // only case where these are equal is when they're already located at the
+  // last anchor boundary. In such case, there is no next position to move
+  // to.
+  while (iteration < std::abs(count) &&
+         !(next_endpoint->GetAnchor() == current_endpoint->GetAnchor() &&
+           *next_endpoint == *current_endpoint)) {
+    is_ignored_for_text_navigation = false;
+    current_endpoint = std::move(next_endpoint);
+
+    next_endpoint = GetNextTextBoundaryPosition(
+        current_endpoint, boundary_type,
+        AXBoundaryBehavior::StopAtLastAnchorBoundary, boundary_direction);
+    BASE_DCHECK(next_endpoint->IsLeafTextPosition());
+
+    // Loop until we're not on a position that is ignored for text navigation.
+    // There is one exception for character navigation - since the ignored
+    // anchor is represented by an embedded object character, we allow
+    // navigation by character for consistency (i.e. you should be able to
+    // move by character the same number of characters that are represented by
+    // the ranges flat string buffer).
+    is_ignored_for_text_navigation =
+        boundary_type != ax::mojom::TextBoundary::kCharacter &&
+        current_endpoint->GetAnchor()->data().role !=
+            ax::mojom::Role::kSplitter;
+    if (!is_ignored_for_text_navigation)
+      iteration++;
+  }
+
+  *units_moved = (count > 0) ? iteration : -iteration;
+
+  if (is_ignored_for_text_navigation &&
+      initial_endpoint != current_endpoint->GetAnchor()) {
+    // If the last node in the tree is ignored for text navigation, we
+    // should still be able to return an endpoint located on that node. We
+    // also need to ensure that the value of |units_moved| is accurate.
+    *units_moved += (count > 0) ? 1 : -1;
+  }
+
+  return current_endpoint;
+}
+
+void AXPlatformNodeTextRangeProviderWin::NormalizeTextRange(
+    AXPositionInstance& start,
+    AXPositionInstance& end) {
+  if (!start->IsValid() || !end->IsValid())
+    return;
+
+  // If either endpoint is anchored to an ignored node,
+  // first snap them both to be unignored positions.
+  NormalizeAsUnignoredTextRange(start, end);
+
+  bool is_degenerate = *start == *end;
+  AXPositionInstance normalized_start =
+      is_degenerate ? start->Clone()
+                    : start->AsLeafTextPositionBeforeCharacter();
+
+  // For a degenerate range, the |end_| will always be the same as the
+  // normalized start, so there's no need to compute the normalized end.
+  // However, a degenerate range might go undetected if there's an ignored node
+  // (or many) between the two endpoints. For this reason, we need to
+  // compare the |end_| with both the |start_| and the |normalized_start|.
+  is_degenerate = is_degenerate || *normalized_start == *end;
+  AXPositionInstance normalized_end =
+      is_degenerate ? normalized_start->Clone()
+                    : end->AsLeafTextPositionAfterCharacter();
+
+  if (!normalized_start->IsNullPosition() &&
+      !normalized_end->IsNullPosition()) {
+    start = std::move(normalized_start);
+    end = std::move(normalized_end);
+  }
+
+  BASE_DCHECK(*start <= *end);
+}
+
+// static
+void AXPlatformNodeTextRangeProviderWin::NormalizeAsUnignoredPosition(
+    AXPositionInstance& position) {
+  if (position->IsNullPosition() || !position->IsValid())
+    return;
+
+  if (position->IsIgnored()) {
+    AXPositionInstance normalized_position = position->AsUnignoredPosition(
+        AXPositionAdjustmentBehavior::kMoveForward);
+    if (normalized_position->IsNullPosition()) {
+      normalized_position = position->AsUnignoredPosition(
+          AXPositionAdjustmentBehavior::kMoveBackward);
+    }
+
+    if (!normalized_position->IsNullPosition())
+      position = std::move(normalized_position);
+  }
+  BASE_DCHECK(!position->IsNullPosition());
+}
+
+// static
+void AXPlatformNodeTextRangeProviderWin::NormalizeAsUnignoredTextRange(
+    AXPositionInstance& start,
+    AXPositionInstance& end) {
+  if (!start->IsValid() || !end->IsValid())
+    return;
+
+  if (!start->IsIgnored() && !end->IsIgnored())
+    return;
+  NormalizeAsUnignoredPosition(start);
+  NormalizeAsUnignoredPosition(end);
+  BASE_DCHECK(*start <= *end);
+}
+
+AXPlatformNodeDelegate* AXPlatformNodeTextRangeProviderWin::GetRootDelegate(
+    const ui::AXTreeID tree_id) {
+  const AXTreeManager* ax_tree_manager =
+      AXTreeManagerMap::GetInstance().GetManager(tree_id);
+  BASE_DCHECK(ax_tree_manager);
+  AXNode* root_node = ax_tree_manager->GetRootAsAXNode();
+  const AXPlatformNode* root_platform_node =
+      GetOwner()->GetDelegate()->GetFromTreeIDAndNodeID(tree_id,
+                                                        root_node->id());
+  BASE_DCHECK(root_platform_node);
+  return root_platform_node->GetDelegate();
+}
+
+void AXPlatformNodeTextRangeProviderWin::SetStart(
+    AXPositionInstance new_start) {
+  endpoints_.SetStart(std::move(new_start));
+}
+
+void AXPlatformNodeTextRangeProviderWin::SetEnd(AXPositionInstance new_end) {
+  endpoints_.SetEnd(std::move(new_end));
+}
+
+void AXPlatformNodeTextRangeProviderWin::SetOwnerForTesting(
+    AXPlatformNodeWin* owner) {
+  owner_for_test_ = owner;
+}
+
+AXNode* AXPlatformNodeTextRangeProviderWin::GetSelectionCommonAnchor() {
+  AXPlatformNodeDelegate* delegate = GetOwner()->GetDelegate();
+  AXTree::Selection unignored_selection = delegate->GetUnignoredSelection();
+  AXPlatformNode* anchor_object =
+      delegate->GetFromNodeID(unignored_selection.anchor_object_id);
+  AXPlatformNode* focus_object =
+      delegate->GetFromNodeID(unignored_selection.focus_object_id);
+
+  if (!anchor_object || !focus_object)
+    return nullptr;
+
+  AXNodePosition::AXPositionInstance start =
+      anchor_object->GetDelegate()->CreateTextPositionAt(
+          unignored_selection.anchor_offset);
+  AXNodePosition::AXPositionInstance end =
+      focus_object->GetDelegate()->CreateTextPositionAt(
+          unignored_selection.focus_offset);
+
+  return start->LowestCommonAnchor(*end);
+}
+
+// When the current selection is inside a focusable element, the DOM focused
+// element will correspond to this element. When we update the selection to be
+// on a different element that is not focusable, the new selection won't be
+// applied unless we remove the DOM focused element. For example, with Narrator,
+// if we move by word from a text field (focusable) to a static text (not
+// focusable), the selection will stay on the text field because the DOM focused
+// element will still be the text field. To avoid that, we need to remove the
+// focus from this element. Since |ax::mojom::Action::kBlur| is not implemented,
+// we perform a |ax::mojom::Action::focus| action on the root node. The result
+// is the same.
+void AXPlatformNodeTextRangeProviderWin::
+    RemoveFocusFromPreviousSelectionIfNeeded(const AXNodeRange& new_selection) {
+  const AXNode* old_selection_node = GetSelectionCommonAnchor();
+  const AXNode* new_selection_node =
+      new_selection.anchor()->LowestCommonAnchor(*new_selection.focus());
+
+  if (!old_selection_node)
+    return;
+
+  if (!new_selection_node ||
+      (old_selection_node->data().HasState(ax::mojom::State::kFocusable) &&
+       !new_selection_node->data().HasState(ax::mojom::State::kFocusable))) {
+    AXPlatformNodeDelegate* root_delegate =
+        GetRootDelegate(old_selection_node->tree()->GetAXTreeID());
+    BASE_DCHECK(root_delegate);
+
+    AXActionData focus_action;
+    focus_action.action = ax::mojom::Action::kFocus;
+    root_delegate->AccessibilityPerformAction(focus_action);
+  }
+}
+
+AXPlatformNodeWin*
+AXPlatformNodeTextRangeProviderWin::GetPlatformNodeFromAXNode(
+    const AXNode* node) const {
+  if (!node)
+    return nullptr;
+
+  // TODO(kschmi): Update to use AXTreeManager.
+  AXPlatformNodeWin* platform_node =
+      static_cast<AXPlatformNodeWin*>(AXPlatformNode::FromNativeViewAccessible(
+          GetDelegate(node->tree()->GetAXTreeID(), node->id())
+              ->GetNativeViewAccessible()));
+  BASE_DCHECK(platform_node);
+
+  return platform_node;
+}
+
+AXPlatformNodeWin*
+AXPlatformNodeTextRangeProviderWin::GetLowestAccessibleCommonPlatformNode()
+    const {
+  AXNode* common_anchor = start()->LowestCommonAnchor(*end());
+  if (!common_anchor)
+    return nullptr;
+
+  return GetPlatformNodeFromAXNode(common_anchor)->GetLowestAccessibleElement();
+}
+
+// static
+bool AXPlatformNodeTextRangeProviderWin::TextAttributeIsArrayType(
+    TEXTATTRIBUTEID attribute_id) {
+  // https://docs.microsoft.com/en-us/windows/win32/winauto/uiauto-textattribute-ids
+  return attribute_id == UIA_AnnotationObjectsAttributeId ||
+         attribute_id == UIA_AnnotationTypesAttributeId ||
+         attribute_id == UIA_TabsAttributeId;
+}
+
+// static
+bool AXPlatformNodeTextRangeProviderWin::TextAttributeIsUiaReservedValue(
+    const base::win::VariantVector& vector) {
+  // Reserved values are always IUnknown.
+  if (vector.Type() != VT_UNKNOWN)
+    return false;
+
+  base::win::ScopedVariant mixed_attribute_value_variant;
+  {
+    Microsoft::WRL::ComPtr<IUnknown> mixed_attribute_value;
+    HRESULT hr = ::UiaGetReservedMixedAttributeValue(&mixed_attribute_value);
+    BASE_DCHECK(SUCCEEDED(hr));
+    mixed_attribute_value_variant.Set(mixed_attribute_value.Get());
+  }
+
+  base::win::ScopedVariant not_supported_value_variant;
+  {
+    Microsoft::WRL::ComPtr<IUnknown> not_supported_value;
+    HRESULT hr = ::UiaGetReservedNotSupportedValue(&not_supported_value);
+    BASE_DCHECK(SUCCEEDED(hr));
+    not_supported_value_variant.Set(not_supported_value.Get());
+  }
+
+  return !vector.Compare(mixed_attribute_value_variant) ||
+         !vector.Compare(not_supported_value_variant);
+}
+
+// static
+bool AXPlatformNodeTextRangeProviderWin::ShouldReleaseTextAttributeAsSafearray(
+    TEXTATTRIBUTEID attribute_id,
+    const base::win::VariantVector& attribute_value) {
+  // |vector| may be pre-populated with a UIA reserved value. In such a case, we
+  // must release as a scalar variant.
+  return TextAttributeIsArrayType(attribute_id) &&
+         !TextAttributeIsUiaReservedValue(attribute_value);
+}
+
+AXPlatformNodeTextRangeProviderWin::TextRangeEndpoints::TextRangeEndpoints() {
+  start_ = AXNodePosition::CreateNullPosition();
+  end_ = AXNodePosition::CreateNullPosition();
+}
+
+AXPlatformNodeTextRangeProviderWin::TextRangeEndpoints::~TextRangeEndpoints() {
+  SetStart(AXNodePosition::CreateNullPosition());
+  SetEnd(AXNodePosition::CreateNullPosition());
+}
+
+void AXPlatformNodeTextRangeProviderWin::TextRangeEndpoints::SetStart(
+    AXPositionInstance new_start) {
+  bool did_tree_change = start_->tree_id() != new_start->tree_id();
+  // TODO(bebeaudr): We can't use IsNullPosition() here because of
+  // https://crbug.com/1152939. Once this is fixed, we can go back to
+  // IsNullPosition().
+  if (did_tree_change && start_->kind() != AXPositionKind::NULL_POSITION &&
+      start_->tree_id() != end_->tree_id()) {
+    RemoveObserver(start_->tree_id());
+  }
+
+  start_ = std::move(new_start);
+
+  if (did_tree_change && !start_->IsNullPosition() &&
+      start_->tree_id() != end_->tree_id()) {
+    AddObserver(start_->tree_id());
+  }
+}
+
+void AXPlatformNodeTextRangeProviderWin::TextRangeEndpoints::SetEnd(
+    AXPositionInstance new_end) {
+  bool did_tree_change = end_->tree_id() != new_end->tree_id();
+  // TODO(bebeaudr): We can't use IsNullPosition() here because of
+  // https://crbug.com/1152939. Once this is fixed, we can go back to
+  // IsNullPosition().
+  if (did_tree_change && end_->kind() != AXPositionKind::NULL_POSITION &&
+      end_->tree_id() != start_->tree_id()) {
+    RemoveObserver(end_->tree_id());
+  }
+
+  end_ = std::move(new_end);
+
+  if (did_tree_change && !end_->IsNullPosition() &&
+      start_->tree_id() != end_->tree_id()) {
+    AddObserver(end_->tree_id());
+  }
+}
+
+void AXPlatformNodeTextRangeProviderWin::TextRangeEndpoints::AddObserver(
+    const AXTreeID tree_id) {
+  AXTreeManager* ax_tree_manager =
+      AXTreeManagerMap::GetInstance().GetManager(tree_id);
+  BASE_DCHECK(ax_tree_manager);
+  ax_tree_manager->GetTree()->AddObserver(this);
+}
+
+void AXPlatformNodeTextRangeProviderWin::TextRangeEndpoints::RemoveObserver(
+    const AXTreeID tree_id) {
+  AXTreeManager* ax_tree_manager =
+      AXTreeManagerMap::GetInstance().GetManager(tree_id);
+  if (ax_tree_manager)
+    ax_tree_manager->GetTree()->RemoveObserver(this);
+}
+
+// Ensures that our endpoints are located on non-deleted nodes (step 1, case A
+// and B). See comment in header file for more details.
+void AXPlatformNodeTextRangeProviderWin::TextRangeEndpoints::
+    OnSubtreeWillBeDeleted(AXTree* tree, AXNode* node) {
+  // If an endpoint is on a node that is included in a subtree that is about to
+  // be deleted, move endpoint up to the parent of the deleted subtree's root
+  // since we want to ensure that the endpoints of a text range provider are
+  // always valid positions. Otherwise, the range will be stuck on nodes that
+  // don't exist anymore.
+  BASE_DCHECK(tree);
+  BASE_DCHECK(node);
+  BASE_DCHECK(tree->GetAXTreeID() == node->tree()->GetAXTreeID());
+
+  AdjustEndpointForSubtreeDeletion(tree, node, true /* is_start_endpoint */);
+  AdjustEndpointForSubtreeDeletion(tree, node, false /* is_start_endpoint */);
+}
+
+void AXPlatformNodeTextRangeProviderWin::TextRangeEndpoints::
+    AdjustEndpointForSubtreeDeletion(AXTree* tree,
+                                     const AXNode* const node,
+                                     bool is_start_endpoint) {
+  AXPositionInstance endpoint =
+      is_start_endpoint ? start_->Clone() : end_->Clone();
+  if (tree->GetAXTreeID() != endpoint->tree_id())
+    return;
+
+  // When the subtree of the root node will be deleted, we can be certain that
+  // our endpoint should be invalidated. We know it's the root node when the
+  // node doesn't have a parent.
+  AXNode* endpoint_anchor = endpoint->GetAnchor();
+  if (!node->parent() || !endpoint_anchor) {
+    is_start_endpoint ? SetStart(AXNodePosition::CreateNullPosition())
+                      : SetEnd(AXNodePosition::CreateNullPosition());
+    return;
+  }
+
+  DeletionOfInterest deletion_of_interest = {tree->GetAXTreeID(), node->id()};
+
+  // If the root of subtree being deleted is a child of the anchor of the
+  // endpoint, ensure `AXPosition::AsValidPosition` is called after the node is
+  // deleted so that the index doesn't go out of bounds of the child array.
+  if (endpoint->kind() == AXPositionKind::TREE_POSITION &&
+      endpoint_anchor == node->parent()) {
+    if (is_start_endpoint)
+      validation_necessary_for_start_ = deletion_of_interest;
+    else
+      validation_necessary_for_end_ = deletion_of_interest;
+    return;
+  }
+
+  // Fast check for the common case - there are many tree updates and the
+  // endpoints probably are not in the deleted subtree. Note that
+  // CreateAncestorPosition/GetParentPosition can be expensive for text
+  // positions.
+  if (!endpoint_anchor->IsDescendantOfCrossingTreeBoundary(node))
+    return;
+
+  AXPositionInstance new_endpoint = endpoint->CreateAncestorPosition(
+      node, ax::mojom::MoveDirection::kForward);
+
+  // Obviously, we want the position to be on the parent of |node| and not on
+  // |node| itself since it's about to be deleted.
+  new_endpoint = new_endpoint->CreateParentPosition();
+  AXPositionInstance other_endpoint =
+      is_start_endpoint ? end_->Clone() : start_->Clone();
+
+  // Convert |new_endpoint| and |other_endpoint| to unignored positions to avoid
+  // AXPosition::SlowCompareTo in the < operator below.
+  NormalizeAsUnignoredPosition(new_endpoint);
+  NormalizeAsUnignoredPosition(other_endpoint);
+  BASE_DCHECK(!new_endpoint->IsIgnored());
+  BASE_DCHECK(!other_endpoint->IsIgnored());
+
+  // If after all the above operations we're still left with a new endpoint that
+  // is a descendant of the subtree root being deleted, just point at a null
+  // position and don't crash later on. This can happen when the entire parent
+  // chain of the subtree is ignored.
+  endpoint_anchor = new_endpoint->GetAnchor();
+  if (!endpoint_anchor ||
+      endpoint_anchor->IsDescendantOfCrossingTreeBoundary(node))
+    new_endpoint = AXNodePosition::CreateNullPosition();
+
+  // Create a degenerate range at the new position if we have an inverted range
+  // - which occurs when the |end_| comes before the |start_|. This could have
+  // happened due to the new endpoint walking forwards or backwards when
+  // normalizing above. If we don't set the opposite endpoint to something that
+  // we know will be safe (i.e. not in a deleted subtree) we'll crash later on
+  // when trying to create a valid position.
+  if (is_start_endpoint) {
+    if (*other_endpoint < *new_endpoint)
+      SetEnd(new_endpoint->Clone());
+
+    SetStart(std::move(new_endpoint));
+    validation_necessary_for_start_ = deletion_of_interest;
+  } else {
+    if (*new_endpoint < *other_endpoint)
+      SetStart(new_endpoint->Clone());
+
+    SetEnd(std::move(new_endpoint));
+    validation_necessary_for_end_ = deletion_of_interest;
+  }
+}
+
+// Ensures that our endpoints are always valid (step 2, all scenarios). See
+// comment in header file for more details.
+void AXPlatformNodeTextRangeProviderWin::TextRangeEndpoints::OnNodeDeleted(
+    AXTree* tree,
+    AXNode::AXID node_id) {
+  BASE_DCHECK(tree);
+
+  if (validation_necessary_for_start_.has_value() &&
+      validation_necessary_for_start_->tree_id == tree->GetAXTreeID() &&
+      validation_necessary_for_start_->node_id == node_id) {
+    if (!start_->IsNullPosition() && start_->GetAnchor()->data().id != 0)
+      SetStart(start_->AsValidPosition());
+    else
+      SetStart(AXNodePosition::CreateNullPosition());
+
+    validation_necessary_for_start_ = std::nullopt;
+  }
+
+  if (validation_necessary_for_end_.has_value() &&
+      validation_necessary_for_end_->tree_id == tree->GetAXTreeID() &&
+      validation_necessary_for_end_->node_id == node_id) {
+    if (!end_->IsNullPosition() && end_->GetAnchor()->data().id != 0)
+      SetEnd(end_->AsValidPosition());
+    else
+      SetEnd(AXNodePosition::CreateNullPosition());
+
+    validation_necessary_for_end_ = std::nullopt;
+  }
+}
+
+}  // namespace ui
diff --git a/third_party/accessibility/ax/platform/ax_platform_node_textrangeprovider_win.h b/third_party/accessibility/ax/platform/ax_platform_node_textrangeprovider_win.h
new file mode 100644
index 0000000000000000000000000000000000000000..d586ac1657603fdf80743b4614907f6add94c56c
--- /dev/null
+++ b/third_party/accessibility/ax/platform/ax_platform_node_textrangeprovider_win.h
@@ -0,0 +1,295 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef UI_ACCESSIBILITY_PLATFORM_AX_PLATFORM_NODE_TEXTRANGEPROVIDER_WIN_H_
+#define UI_ACCESSIBILITY_PLATFORM_AX_PLATFORM_NODE_TEXTRANGEPROVIDER_WIN_H_
+
+#include <atlbase.h>
+#include <atlcom.h>
+
+#include <UIAutomationCore.h>
+
+#include "ax/ax_node_position.h"
+#include "ax/ax_tree_observer.h"
+#include "ax/platform/ax_platform_node_delegate.h"
+#include "ax/platform/ax_platform_node_win.h"
+
+namespace ui {
+
+class AX_EXPORT __declspec(uuid("3071e40d-a10d-45ff-a59f-6e8e1138e2c1"))
+    AXPlatformNodeTextRangeProviderWin
+    : public CComObjectRootEx<CComMultiThreadModel>,
+      public ITextRangeProvider {
+ public:
+  BEGIN_COM_MAP(AXPlatformNodeTextRangeProviderWin)
+  COM_INTERFACE_ENTRY(ITextRangeProvider)
+  COM_INTERFACE_ENTRY(AXPlatformNodeTextRangeProviderWin)
+  END_COM_MAP()
+
+  AXPlatformNodeTextRangeProviderWin();
+  ~AXPlatformNodeTextRangeProviderWin();
+
+  static ITextRangeProvider* CreateTextRangeProvider(
+      AXNodePosition::AXPositionInstance start,
+      AXNodePosition::AXPositionInstance end);
+
+  // Creates an instance of the class for unit tests, where AXPlatformNodes
+  // cannot be queried automatically from endpoints.
+  static ITextRangeProvider* CreateTextRangeProviderForTesting(
+      AXPlatformNodeWin* owner,
+      AXNodePosition::AXPositionInstance start,
+      AXNodePosition::AXPositionInstance end);
+
+  //
+  // ITextRangeProvider methods.
+  //
+
+  IFACEMETHODIMP Clone(ITextRangeProvider** clone) override;
+  IFACEMETHODIMP Compare(ITextRangeProvider* other, BOOL* result) override;
+  IFACEMETHODIMP
+  CompareEndpoints(TextPatternRangeEndpoint this_endpoint,
+                   ITextRangeProvider* other,
+                   TextPatternRangeEndpoint other_endpoint,
+                   int* result) override;
+  IFACEMETHODIMP ExpandToEnclosingUnit(TextUnit unit) override;
+  IFACEMETHODIMP
+  FindAttribute(TEXTATTRIBUTEID attribute_id,
+                VARIANT attribute_val,
+                BOOL is_backward,
+                ITextRangeProvider** result) override;
+  IFACEMETHODIMP
+  FindText(BSTR string,
+           BOOL backwards,
+           BOOL ignore_case,
+           ITextRangeProvider** result) override;
+  IFACEMETHODIMP GetAttributeValue(TEXTATTRIBUTEID attribute_id,
+                                   VARIANT* value) override;
+  IFACEMETHODIMP
+  GetBoundingRectangles(SAFEARRAY** screen_physical_pixel_rectangles) override;
+  IFACEMETHODIMP
+  GetEnclosingElement(IRawElementProviderSimple** element) override;
+  IFACEMETHODIMP GetText(int max_count, BSTR* text) override;
+  IFACEMETHODIMP Move(TextUnit unit, int count, int* units_moved) override;
+  IFACEMETHODIMP
+  MoveEndpointByUnit(TextPatternRangeEndpoint endpoint,
+                     TextUnit unit,
+                     int count,
+                     int* units_moved) override;
+  IFACEMETHODIMP
+  MoveEndpointByRange(TextPatternRangeEndpoint this_endpoint,
+                      ITextRangeProvider* other,
+                      TextPatternRangeEndpoint other_endpoint) override;
+  IFACEMETHODIMP Select() override;
+  IFACEMETHODIMP AddToSelection() override;
+  IFACEMETHODIMP RemoveFromSelection() override;
+  IFACEMETHODIMP ScrollIntoView(BOOL align_to_top) override;
+  IFACEMETHODIMP GetChildren(SAFEARRAY** children) override;
+
+  AXPlatformNodeWin* GetOwner() const;
+  void SetOwnerForTesting(AXPlatformNodeWin* owner);
+
+ private:
+  using AXPositionInstance = AXNodePosition::AXPositionInstance;
+  using AXPositionInstanceType = typename AXPositionInstance::element_type;
+  using AXNodeRange = AXRange<AXPositionInstanceType>;
+
+  friend class AXPlatformNodeTextRangeProviderTest;
+  friend class AXPlatformNodeTextProviderTest;
+  friend class AXRangePhysicalPixelRectDelegate;
+
+  static bool AtStartOfLinePredicate(const AXPositionInstance& position);
+  static bool AtEndOfLinePredicate(const AXPositionInstance& position);
+
+  static AXPositionInstance GetNextTextBoundaryPosition(
+      const AXPositionInstance& position,
+      ax::mojom::TextBoundary boundary_type,
+      AXBoundaryBehavior options,
+      ax::mojom::MoveDirection boundary_direction);
+
+  // Prefer these *Impl methods when functionality is needed internally. We
+  // should avoid calling external APIs internally as it will cause the
+  // histograms to become innaccurate.
+  HRESULT MoveEndpointByUnitImpl(TextPatternRangeEndpoint endpoint,
+                                 TextUnit unit,
+                                 int count,
+                                 int* units_moved);
+
+  IFACEMETHODIMP ExpandToEnclosingUnitImpl(TextUnit unit);
+
+  std::u16string GetString(int max_count,
+                           size_t* appended_newlines_count = nullptr);
+  const AXPositionInstance& start() const { return endpoints_.GetStart(); }
+  const AXPositionInstance& end() const { return endpoints_.GetEnd(); }
+  AXPlatformNodeDelegate* GetDelegate(
+      const AXPositionInstanceType* position) const;
+  AXPlatformNodeDelegate* GetDelegate(const AXTreeID tree_id,
+                                      const AXNode::AXID node_id) const;
+
+  template <typename AnchorIterator, typename ExpandMatchLambda>
+  HRESULT FindAttributeRange(const TEXTATTRIBUTEID text_attribute_id,
+                             VARIANT attribute_val,
+                             const AnchorIterator first,
+                             const AnchorIterator last,
+                             ExpandMatchLambda expand_match);
+
+  AXPositionInstance MoveEndpointByCharacter(const AXPositionInstance& endpoint,
+                                             const int count,
+                                             int* units_moved);
+  AXPositionInstance MoveEndpointByWord(const AXPositionInstance& endpoint,
+                                        const int count,
+                                        int* units_moved);
+  AXPositionInstance MoveEndpointByLine(const AXPositionInstance& endpoint,
+                                        bool is_start_endpoint,
+                                        const int count,
+                                        int* units_moved);
+  AXPositionInstance MoveEndpointByParagraph(const AXPositionInstance& endpoint,
+                                             const bool is_start_endpoint,
+                                             const int count,
+                                             int* units_moved);
+  AXPositionInstance MoveEndpointByPage(const AXPositionInstance& endpoint,
+                                        const bool is_start_endpoint,
+                                        const int count,
+                                        int* units_moved);
+  AXPositionInstance MoveEndpointByDocument(const AXPositionInstance& endpoint,
+                                            const int count,
+                                            int* units_moved);
+
+  AXPositionInstance MoveEndpointByUnitHelper(
+      const AXPositionInstance& endpoint,
+      const ax::mojom::TextBoundary boundary_type,
+      const int count,
+      int* units_moved);
+
+  // A text range normalization is necessary to prevent a |start_| endpoint to
+  // be positioned at the end of an anchor when it can be at the start of the
+  // next anchor. After normalization, it is guaranteed that:
+  // * both endpoints passed by parameter are always positioned on unignored
+  //   anchors;
+  // * both endpoints passed by parameter are never between a grapheme cluster;
+  // * if the endpoints passed by parameter create a degenerate range, both
+  //   endpoints are on the same anchor.
+  // Normalization never updates the internal endpoints directly. Instead, it
+  // normalizes the endpoints passed by parameter.
+  void NormalizeTextRange(AXPositionInstance& start, AXPositionInstance& end);
+  static void NormalizeAsUnignoredPosition(AXPositionInstance& position);
+  static void NormalizeAsUnignoredTextRange(AXPositionInstance& start,
+                                            AXPositionInstance& end);
+
+  AXPlatformNodeDelegate* GetRootDelegate(const ui::AXTreeID tree_id);
+  AXNode* GetSelectionCommonAnchor();
+  void RemoveFocusFromPreviousSelectionIfNeeded(
+      const AXNodeRange& new_selection);
+  AXPlatformNodeWin* GetPlatformNodeFromAXNode(const AXNode* node) const;
+  AXPlatformNodeWin* GetLowestAccessibleCommonPlatformNode() const;
+  bool HasTextRangeOrSelectionInAtomicTextField(
+      const AXPositionInstance& start_position,
+      const AXPositionInstance& end_position) const;
+
+  void SetStart(AXPositionInstance start);
+  void SetEnd(AXPositionInstance end);
+
+  static bool TextAttributeIsArrayType(TEXTATTRIBUTEID attribute_id);
+  static bool TextAttributeIsUiaReservedValue(
+      const base::win::VariantVector& vector);
+  static bool ShouldReleaseTextAttributeAsSafearray(
+      TEXTATTRIBUTEID attribute_id,
+      const base::win::VariantVector& vector);
+
+  Microsoft::WRL::ComPtr<AXPlatformNodeWin> owner_for_test_;
+
+  // The TextRangeEndpoints class has the responsibility of keeping the
+  // endpoints of the range valid or nullify them when it can't find a valid
+  // alternative.
+  //
+  // An endpoint can become invalid when
+  //   A. the node it's on gets deleted,
+  //   B. when an ancestor node gets deleted, deleting the subtree our endpoint
+  //      is on, or
+  //   C. when a descendant node gets deleted, potentially rendering the
+  //      position invalid due to a smaller MaxTextOffset value (for a text
+  //      position) or fewer child nodes (for a tree position).
+  //
+  // In all cases, our approach to resolve the endpoints to valid positions
+  // takes two steps:
+  //   1. Move the endpoint to an equivalent ancestor position before the node
+  //      gets deleted - we can't move the position once the node it's on is
+  //      deleted since this position would already be considered invalid.
+  //   2. Call AsValidPosition on that new position once the node is deleted -
+  //      calling this function before the node gets deleted wouldn't do much
+  //      since our position would still be considered valid at this point.
+  //
+  // Because AsValidPosition can potentially be expensive, we only want to run
+  // it when necessary. For this reason, we store the node ID and tree ID that
+  // causes the first step to happen and only run the second step in
+  // OnNodeDeleted for the corresponding node deletion. When OnNodeDeleted is
+  // called, the |start_| and |end_| endpoints have already been moved up to an
+  // ancestor that is still part of the tree. This is to ensure that we don't
+  // have to read the node/tree structure of the deleted node in that function -
+  // which would likely result in a crash.
+  //
+  // Both scenarios A and B are fixed by this approach (by the implementation of
+  // OnSubtreeWillBeDeleted), but we still have work to do to fix scenario C.
+  // This case, in theory, would only require the second step to ensure that the
+  // position is always valid but computing whether node is part of the subtree
+  // of the endpoint we're on would be very expensive. Furthermore, because the
+  // endpoints are generally on leaf nodes, the scenario is unlikely - we
+  // haven't heard of issues caused by this scenario yet. Eventually, we might
+  // be able to scope the fix to specific use cases, like when the range is on
+  // UIA embedded object (e.g. button, select, etc.)
+  //
+  // ***
+  //
+  // Why we can't use a ScopedObserver here:
+  // We tried using a ScopedObserver instead of a simple observer in this case,
+  // but there appears to be a problem with the lifetime of the referenced
+  // AXTreeManager in the ScopedObserver. The AXTreeManager can get deleted
+  // before the TextRangeEndpoints does, so when the destructor of the
+  // ScopedObserver calls ScopedObserver::RemoveAll on an already deleted
+  // AXTreeManager, it crashes.
+  class TextRangeEndpoints : public AXTreeObserver {
+   public:
+    TextRangeEndpoints();
+    ~TextRangeEndpoints() override;
+    const AXPositionInstance& GetStart() const { return start_; }
+    const AXPositionInstance& GetEnd() const { return end_; }
+    void SetStart(AXPositionInstance new_start);
+    void SetEnd(AXPositionInstance new_end);
+
+    void AddObserver(const AXTreeID tree_id);
+    void RemoveObserver(const AXTreeID tree_id);
+    void OnSubtreeWillBeDeleted(AXTree* tree, AXNode* node) override;
+    void OnNodeDeleted(AXTree* tree, AXNode::AXID node_id) override;
+
+   private:
+    struct DeletionOfInterest {
+      AXTreeID tree_id;
+      AXNode::AXID node_id;
+    };
+
+    void AdjustEndpointForSubtreeDeletion(AXTree* tree,
+                                          const AXNode* const node,
+                                          bool is_start_endpoint);
+
+    AXPositionInstance start_;
+    AXPositionInstance end_;
+
+    std::optional<DeletionOfInterest> validation_necessary_for_start_;
+    std::optional<DeletionOfInterest> validation_necessary_for_end_;
+  };
+  TextRangeEndpoints endpoints_;
+};
+
+// Optionally case-insensitive or reverse string search.
+//
+// Exposed as non-static for use in testing.
+bool StringSearch(std::u16string_view search_string,
+                  std::u16string_view find_in,
+                  size_t* find_start,
+                  size_t* find_length,
+                  bool ignore_case,
+                  bool backwards);
+
+}  // namespace ui
+
+#endif  // UI_ACCESSIBILITY_PLATFORM_AX_PLATFORM_NODE_TEXTRANGEPROVIDER_WIN_H_
diff --git a/third_party/accessibility/ax/platform/ax_platform_node_textrangeprovider_win_unittest.cc b/third_party/accessibility/ax/platform/ax_platform_node_textrangeprovider_win_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c81728d66a26ea86b70de9567a486fa7fb521e58
--- /dev/null
+++ b/third_party/accessibility/ax/platform/ax_platform_node_textrangeprovider_win_unittest.cc
@@ -0,0 +1,7585 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ax/platform/ax_platform_node_win_unittest.h"
+
+#include <UIAutomationClient.h>
+#include <UIAutomationCoreApi.h>
+
+#include <filesystem>
+#include <memory>
+#include <utility>
+
+#include "ax/ax_tree.h"
+#include "ax/platform/ax_fragment_root_win.h"
+#include "ax/platform/ax_platform_node_textrangeprovider_win.h"
+#include "base/win/atl.h"
+#include "base/win/scoped_bstr.h"
+#include "base/win/scoped_safearray.h"
+#include "base/win/scoped_variant.h"
+#include "flutter/fml/icu_util.h"
+#include "third_party/icu/source/common/unicode/putil.h"
+
+using Microsoft::WRL::ComPtr;
+
+namespace ui {
+
+// Helper macros for UIAutomation HRESULT expectations
+#define EXPECT_UIA_ELEMENTNOTAVAILABLE(expr) \
+  EXPECT_EQ(static_cast<HRESULT>(UIA_E_ELEMENTNOTAVAILABLE), (expr))
+#define EXPECT_UIA_INVALIDOPERATION(expr) \
+  EXPECT_EQ(static_cast<HRESULT>(UIA_E_INVALIDOPERATION), (expr))
+#define EXPECT_UIA_ELEMENTNOTENABLED(expr) \
+  EXPECT_EQ(static_cast<HRESULT>(UIA_E_ELEMENTNOTENABLED), (expr))
+#define EXPECT_UIA_NOTSUPPORTED(expr) \
+  EXPECT_EQ(static_cast<HRESULT>(UIA_E_NOTSUPPORTED), (expr))
+
+#define ASSERT_UIA_ELEMENTNOTAVAILABLE(expr) \
+  ASSERT_EQ(static_cast<HRESULT>(UIA_E_ELEMENTNOTAVAILABLE), (expr))
+#define ASSERT_UIA_INVALIDOPERATION(expr) \
+  ASSERT_EQ(static_cast<HRESULT>(UIA_E_INVALIDOPERATION), (expr))
+#define ASSERT_UIA_ELEMENTNOTENABLED(expr) \
+  ASSERT_EQ(static_cast<HRESULT>(UIA_E_ELEMENTNOTENABLED), (expr))
+#define ASSERT_UIA_NOTSUPPORTED(expr) \
+  ASSERT_EQ(static_cast<HRESULT>(UIA_E_NOTSUPPORTED), (expr))
+
+#define EXPECT_UIA_GETPROPERTYVALUE_EQ(node, property_id, expected)      \
+  {                                                                      \
+    base::win::ScopedVariant expectedVariant(expected);                  \
+    ASSERT_EQ(VT_BSTR, expectedVariant.type());                          \
+    ASSERT_NE(nullptr, expectedVariant.ptr()->bstrVal);                  \
+    base::win::ScopedVariant actual;                                     \
+    ASSERT_HRESULT_SUCCEEDED(                                            \
+        node->GetPropertyValue(property_id, actual.Receive()));          \
+    ASSERT_EQ(VT_BSTR, actual.type());                                   \
+    ASSERT_NE(nullptr, actual.ptr()->bstrVal);                           \
+    EXPECT_STREQ(expectedVariant.ptr()->bstrVal, actual.ptr()->bstrVal); \
+  }
+
+#define EXPECT_UIA_ELEMENT_ARRAY_BSTR_EQ(array, element_test_property_id,     \
+                                         expected_property_values)            \
+  {                                                                           \
+    ASSERT_EQ(1u, SafeArrayGetDim(array));                                    \
+    LONG array_lower_bound;                                                   \
+    ASSERT_HRESULT_SUCCEEDED(                                                 \
+        SafeArrayGetLBound(array, 1, &array_lower_bound));                    \
+    LONG array_upper_bound;                                                   \
+    ASSERT_HRESULT_SUCCEEDED(                                                 \
+        SafeArrayGetUBound(array, 1, &array_upper_bound));                    \
+    IUnknown** array_data;                                                    \
+    ASSERT_HRESULT_SUCCEEDED(                                                 \
+        ::SafeArrayAccessData(array, reinterpret_cast<void**>(&array_data))); \
+    size_t count = array_upper_bound - array_lower_bound + 1;                 \
+    ASSERT_EQ(expected_property_values.size(), count);                        \
+    for (size_t i = 0; i < count; ++i) {                                      \
+      ComPtr<IRawElementProviderSimple> element;                              \
+      ASSERT_HRESULT_SUCCEEDED(                                               \
+          array_data[i]->QueryInterface(IID_PPV_ARGS(&element)));             \
+      EXPECT_UIA_GETPROPERTYVALUE_EQ(element, element_test_property_id,       \
+                                     expected_property_values[i].c_str());    \
+    }                                                                         \
+    ASSERT_HRESULT_SUCCEEDED(::SafeArrayUnaccessData(array));                 \
+  }
+
+#define EXPECT_UIA_SAFEARRAY_EQ(safearray, expected_property_values)   \
+  {                                                                    \
+    using T = typename decltype(expected_property_values)::value_type; \
+    EXPECT_EQ(sizeof(T), ::SafeArrayGetElemsize(safearray));           \
+    EXPECT_EQ(1u, SafeArrayGetDim(safearray));                         \
+    LONG array_lower_bound;                                            \
+    EXPECT_HRESULT_SUCCEEDED(                                          \
+        SafeArrayGetLBound(safearray, 1, &array_lower_bound));         \
+    LONG array_upper_bound;                                            \
+    EXPECT_HRESULT_SUCCEEDED(                                          \
+        SafeArrayGetUBound(safearray, 1, &array_upper_bound));         \
+    const size_t count = array_upper_bound - array_lower_bound + 1;    \
+    EXPECT_EQ(expected_property_values.size(), count);                 \
+    if (sizeof(T) == ::SafeArrayGetElemsize(safearray) &&              \
+        count == expected_property_values.size()) {                    \
+      T* array_data;                                                   \
+      EXPECT_HRESULT_SUCCEEDED(::SafeArrayAccessData(                  \
+          safearray, reinterpret_cast<void**>(&array_data)));          \
+      for (size_t i = 0; i < count; ++i) {                             \
+        EXPECT_EQ(array_data[i], expected_property_values[i]);         \
+      }                                                                \
+      EXPECT_HRESULT_SUCCEEDED(::SafeArrayUnaccessData(safearray));    \
+    }                                                                  \
+  }
+
+#define EXPECT_UIA_TEXTATTRIBUTE_EQ(provider, attribute, variant)          \
+  {                                                                        \
+    base::win::ScopedVariant scoped_variant;                               \
+    EXPECT_HRESULT_SUCCEEDED(                                              \
+        provider->GetAttributeValue(attribute, scoped_variant.Receive())); \
+    EXPECT_EQ(0, scoped_variant.Compare(variant));                         \
+  }
+
+#define EXPECT_UIA_TEXTATTRIBUTE_MIXED(provider, attribute)                \
+  {                                                                        \
+    ComPtr<IUnknown> expected_mixed;                                       \
+    EXPECT_HRESULT_SUCCEEDED(                                              \
+        ::UiaGetReservedMixedAttributeValue(&expected_mixed));             \
+    base::win::ScopedVariant scoped_variant;                               \
+    EXPECT_HRESULT_SUCCEEDED(                                              \
+        provider->GetAttributeValue(attribute, scoped_variant.Receive())); \
+    EXPECT_EQ(VT_UNKNOWN, scoped_variant.type());                          \
+    EXPECT_EQ(expected_mixed.Get(), V_UNKNOWN(scoped_variant.ptr()));      \
+  }
+
+#define EXPECT_UIA_TEXTATTRIBUTE_NOTSUPPORTED(provider, attribute)           \
+  {                                                                          \
+    ComPtr<IUnknown> expected_notsupported;                                  \
+    EXPECT_HRESULT_SUCCEEDED(                                                \
+        ::UiaGetReservedNotSupportedValue(&expected_notsupported));          \
+    base::win::ScopedVariant scoped_variant;                                 \
+    EXPECT_HRESULT_SUCCEEDED(                                                \
+        provider->GetAttributeValue(attribute, scoped_variant.Receive()));   \
+    EXPECT_EQ(VT_UNKNOWN, scoped_variant.type());                            \
+    EXPECT_EQ(expected_notsupported.Get(), V_UNKNOWN(scoped_variant.ptr())); \
+  }
+
+#define EXPECT_UIA_TEXTRANGE_EQ(provider, expected_content) \
+  {                                                         \
+    base::win::ScopedBstr provider_content;                 \
+    EXPECT_HRESULT_SUCCEEDED(                               \
+        provider->GetText(-1, provider_content.Receive())); \
+    EXPECT_STREQ(expected_content, provider_content.Get()); \
+  }
+
+#define EXPECT_UIA_FIND_TEXT(text_range_provider, search_term, ignore_case,    \
+                             owner)                                            \
+  {                                                                            \
+    base::win::ScopedBstr find_string(search_term);                            \
+    ComPtr<ITextRangeProvider> text_range_provider_found;                      \
+    EXPECT_HRESULT_SUCCEEDED(text_range_provider->FindText(                    \
+        find_string.Get(), false, ignore_case, &text_range_provider_found));   \
+    if (text_range_provider_found == nullptr) {                                \
+      EXPECT_TRUE(false);                                                      \
+    } else {                                                                   \
+      SetOwner(owner, text_range_provider_found.Get());                        \
+      base::win::ScopedBstr found_content;                                     \
+      EXPECT_HRESULT_SUCCEEDED(                                                \
+          text_range_provider_found->GetText(-1, found_content.Receive()));    \
+      if (ignore_case)                                                         \
+        EXPECT_TRUE(StringCompareICU(found_content.Get(), find_string.Get())); \
+      else                                                                     \
+        EXPECT_EQ(0, wcscmp(found_content.Get(), find_string.Get()));          \
+    }                                                                          \
+  }
+
+#define EXPECT_UIA_FIND_TEXT_NO_MATCH(text_range_provider, search_term,      \
+                                      ignore_case, owner)                    \
+  {                                                                          \
+    base::win::ScopedBstr find_string(search_term);                          \
+    ComPtr<ITextRangeProvider> text_range_provider_found;                    \
+    EXPECT_HRESULT_SUCCEEDED(text_range_provider->FindText(                  \
+        find_string.Get(), false, ignore_case, &text_range_provider_found)); \
+    EXPECT_EQ(nullptr, text_range_provider_found);                           \
+  }
+
+#define EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(text_range_provider, endpoint, unit,  \
+                                         count, expected_text, expected_count) \
+  {                                                                            \
+    int result_count;                                                          \
+    EXPECT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(          \
+        endpoint, unit, count, &result_count));                                \
+    EXPECT_EQ(expected_count, result_count);                                   \
+    EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, expected_text);               \
+  }
+
+#define EXPECT_UIA_MOVE(text_range_provider, unit, count, expected_text, \
+                        expected_count)                                  \
+  {                                                                      \
+    int result_count;                                                    \
+    EXPECT_HRESULT_SUCCEEDED(                                            \
+        text_range_provider->Move(unit, count, &result_count));          \
+    EXPECT_EQ(expected_count, result_count);                             \
+    EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, expected_text);         \
+  }
+
+#define EXPECT_ENCLOSING_ELEMENT(ax_node_given, ax_node_expected)            \
+  {                                                                          \
+    ComPtr<ITextRangeProvider> text_range_provider;                          \
+    GetTextRangeProviderFromTextNode(text_range_provider, ax_node_given);    \
+    ComPtr<IRawElementProviderSimple> enclosing_element;                     \
+    ASSERT_HRESULT_SUCCEEDED(                                                \
+        text_range_provider->GetEnclosingElement(&enclosing_element));       \
+    ComPtr<IRawElementProviderSimple> expected_text_provider =               \
+        QueryInterfaceFromNode<IRawElementProviderSimple>(ax_node_expected); \
+    EXPECT_EQ(expected_text_provider.Get(), enclosing_element.Get());        \
+  }
+
+#define DCHECK_EQ(a, b) BASE_DCHECK((a) == (b))
+
+static bool StringCompareICU(BSTR left, BSTR right) {
+  size_t start, length;
+  if (!StringSearch(reinterpret_cast<char16_t*>(left),
+                    reinterpret_cast<char16_t*>(right), &start, &length, true,
+                    false)) {
+    return false;
+  }
+  return start == 0 && length == wcslen(left);
+}
+
+static AXNodePosition::AXPositionInstance CreateTextPosition(
+    const AXNode& anchor,
+    int text_offset,
+    ax::mojom::TextAffinity affinity) {
+  return AXNodePosition::CreateTextPosition(anchor.tree()->GetAXTreeID(),
+                                            anchor.id(), text_offset, affinity);
+}
+
+class AXPlatformNodeTextRangeProviderTest : public ui::AXPlatformNodeWinTest {
+ public:
+  const AXNodePosition::AXPositionInstance& GetStart(
+      const AXPlatformNodeTextRangeProviderWin* text_range) {
+    return text_range->start();
+  }
+
+  const AXNodePosition::AXPositionInstance& GetEnd(
+      const AXPlatformNodeTextRangeProviderWin* text_range) {
+    return text_range->end();
+  }
+
+  ui::AXPlatformNodeWin* GetOwner(
+      const AXPlatformNodeTextRangeProviderWin* text_range) {
+    return text_range->GetOwner();
+  }
+
+  void CopyOwnerToClone(ITextRangeProvider* source_range,
+                        ITextRangeProvider* destination_range) {
+    ComPtr<ITextRangeProvider> source_provider = source_range;
+    ComPtr<ITextRangeProvider> destination_provider = destination_range;
+
+    ComPtr<AXPlatformNodeTextRangeProviderWin> source_provider_internal;
+    ComPtr<AXPlatformNodeTextRangeProviderWin> destination_provider_internal;
+
+    source_provider->QueryInterface(IID_PPV_ARGS(&source_provider_internal));
+    destination_provider->QueryInterface(
+        IID_PPV_ARGS(&destination_provider_internal));
+    destination_provider_internal->SetOwnerForTesting(
+        source_provider_internal->GetOwner());
+  }
+
+  void SetOwner(AXPlatformNodeWin* owner,
+                ITextRangeProvider* destination_range) {
+    ComPtr<AXPlatformNodeTextRangeProviderWin> destination_provider_internal;
+    auto as =
+        static_cast<AXPlatformNodeTextRangeProviderWin*>(destination_range);
+    destination_range->QueryInterface(
+        IID_PPV_ARGS(&destination_provider_internal));
+    destination_provider_internal->SetOwnerForTesting(owner);
+  }
+
+  void NormalizeTextRange(AXPlatformNodeTextRangeProviderWin* text_range,
+                          AXNodePosition::AXPositionInstance& start,
+                          AXNodePosition::AXPositionInstance& end) {
+    DCHECK_EQ(*GetStart(text_range), *start);
+    DCHECK_EQ(*GetEnd(text_range), *end);
+    text_range->NormalizeTextRange(start, end);
+  }
+
+  void GetTextRangeProviderFromTextNode(
+      ComPtr<ITextRangeProvider>& text_range_provider,
+      ui::AXNode* text_node) {
+    ComPtr<IRawElementProviderSimple> provider_simple =
+        QueryInterfaceFromNode<IRawElementProviderSimple>(text_node);
+    ASSERT_NE(nullptr, provider_simple.Get());
+
+    ComPtr<ITextProvider> text_provider;
+    EXPECT_HRESULT_SUCCEEDED(
+        provider_simple->GetPatternProvider(UIA_TextPatternId, &text_provider));
+    ASSERT_NE(nullptr, text_provider.Get());
+
+    EXPECT_HRESULT_SUCCEEDED(
+        text_provider->get_DocumentRange(&text_range_provider));
+    ASSERT_NE(nullptr, text_range_provider.Get());
+
+    ComPtr<AXPlatformNodeTextRangeProviderWin> text_range_provider_interal;
+    EXPECT_HRESULT_SUCCEEDED(text_range_provider->QueryInterface(
+        IID_PPV_ARGS(&text_range_provider_interal)));
+    AXPlatformNode* ax_platform_node = AXPlatformNodeFromNode(text_node);
+    ASSERT_NE(ax_platform_node, nullptr);
+    text_range_provider_interal->SetOwnerForTesting(
+        static_cast<AXPlatformNodeWin*>(ax_platform_node));
+  }
+
+  void CreateTextRangeProviderWin(
+      ComPtr<AXPlatformNodeTextRangeProviderWin>& text_range_provider_win,
+      AXPlatformNodeWin* owner,
+      const AXNode* start_anchor,
+      int start_offset,
+      ax::mojom::TextAffinity start_affinity,
+      const AXNode* end_anchor,
+      int end_offset,
+      ax::mojom::TextAffinity end_affinity) {
+    AXNodePosition::AXPositionInstance range_start =
+        CreateTextPosition(*start_anchor, start_offset, start_affinity);
+    AXNodePosition::AXPositionInstance range_end =
+        CreateTextPosition(*end_anchor, end_offset, end_affinity);
+
+    ComPtr<ITextRangeProvider> text_range_provider =
+        AXPlatformNodeTextRangeProviderWin::CreateTextRangeProviderForTesting(
+            owner, std::move(range_start), std::move(range_end));
+
+    text_range_provider->QueryInterface(IID_PPV_ARGS(&text_range_provider_win));
+  }
+
+  void ComputeWordBoundariesOffsets(const std::string& text,
+                                    std::vector<int>& word_start_offsets,
+                                    std::vector<int>& word_end_offsets) {
+    char previous_char = ' ';
+    word_start_offsets = std::vector<int>();
+    for (size_t i = 0; i < text.size(); ++i) {
+      if (previous_char == ' ' && text[i] != ' ')
+        word_start_offsets.push_back(i);
+      previous_char = text[i];
+    }
+
+    previous_char = ' ';
+    word_end_offsets = std::vector<int>();
+    for (size_t i = text.size(); i > 0; --i) {
+      if (previous_char == ' ' && text[i - 1] != ' ')
+        word_end_offsets.push_back(i);
+      previous_char = text[i - 1];
+    }
+    std::reverse(word_end_offsets.begin(), word_end_offsets.end());
+  }
+
+  AXTreeUpdate BuildTextDocument(
+      const std::vector<std::string>& text_nodes_content,
+      bool build_word_boundaries_offsets = false,
+      bool place_text_on_one_line = false) {
+    int current_id = 0;
+    AXNodeData root_data;
+    root_data.id = ++current_id;
+    root_data.role = ax::mojom::Role::kRootWebArea;
+
+    AXTreeUpdate update;
+    update.tree_data.tree_id = ui::AXTreeID::CreateNewAXTreeID();
+    update.has_tree_data = true;
+
+    for (const std::string& text_content : text_nodes_content) {
+      AXNodeData static_text_data;
+      static_text_data.id = ++current_id;
+      static_text_data.role = ax::mojom::Role::kStaticText;
+      static_text_data.SetName(text_content);
+      root_data.child_ids.push_back(static_text_data.id);
+
+      AXNodeData inline_box_data;
+      inline_box_data.id = ++current_id;
+      inline_box_data.role = ax::mojom::Role::kInlineTextBox;
+      inline_box_data.SetName(text_content);
+      static_text_data.child_ids = {inline_box_data.id};
+
+      if (build_word_boundaries_offsets) {
+        std::vector<int> word_end_offsets;
+        std::vector<int> word_start_offsets;
+        ComputeWordBoundariesOffsets(text_content, word_start_offsets,
+                                     word_end_offsets);
+        inline_box_data.AddIntListAttribute(
+            ax::mojom::IntListAttribute::kWordStarts, word_start_offsets);
+        inline_box_data.AddIntListAttribute(
+            ax::mojom::IntListAttribute::kWordEnds, word_end_offsets);
+      }
+
+      if (place_text_on_one_line && !update.nodes.empty()) {
+        AXNodeData* previous_inline_box_data = &update.nodes.back();
+        static_text_data.AddIntAttribute(
+            ax::mojom::IntAttribute::kPreviousOnLineId,
+            previous_inline_box_data->id);
+        inline_box_data.AddIntAttribute(
+            ax::mojom::IntAttribute::kPreviousOnLineId,
+            previous_inline_box_data->id);
+        previous_inline_box_data->AddIntAttribute(
+            ax::mojom::IntAttribute::kNextOnLineId, inline_box_data.id);
+      }
+
+      update.nodes.push_back(static_text_data);
+      update.nodes.push_back(inline_box_data);
+    }
+
+    update.nodes.insert(update.nodes.begin(), root_data);
+    update.root_id = root_data.id;
+    return update;
+  }
+
+  ui::AXTreeUpdate BuildAXTreeForBoundingRectangles() {
+    // AXTree content:
+    // <button>Button</button><input type="checkbox">Line 1<br>Line 2
+    ui::AXNodeData root;
+    ui::AXNodeData button;
+    ui::AXNodeData check_box;
+    ui::AXNodeData text_field;
+    ui::AXNodeData static_text1;
+    ui::AXNodeData line_break;
+    ui::AXNodeData static_text2;
+    ui::AXNodeData inline_box1;
+    ui::AXNodeData inline_box2;
+    ui::AXNodeData inline_box_line_break;
+
+    const int ROOT_ID = 1;
+    const int BUTTON_ID = 2;
+    const int CHECK_BOX_ID = 3;
+    const int TEXT_FIELD_ID = 4;
+    const int STATIC_TEXT1_ID = 5;
+    const int INLINE_BOX1_ID = 6;
+    const int LINE_BREAK_ID = 7;
+    const int INLINE_BOX_LINE_BREAK_ID = 8;
+    const int STATIC_TEXT2_ID = 9;
+    const int INLINE_BOX2_ID = 10;
+
+    root.id = ROOT_ID;
+    button.id = BUTTON_ID;
+    check_box.id = CHECK_BOX_ID;
+    text_field.id = TEXT_FIELD_ID;
+    static_text1.id = STATIC_TEXT1_ID;
+    inline_box1.id = INLINE_BOX1_ID;
+    line_break.id = LINE_BREAK_ID;
+    inline_box_line_break.id = INLINE_BOX_LINE_BREAK_ID;
+    static_text2.id = STATIC_TEXT2_ID;
+    inline_box2.id = INLINE_BOX2_ID;
+
+    std::string LINE_1_TEXT = "Line 1";
+    std::string LINE_2_TEXT = "Line 2";
+    std::string LINE_BREAK_TEXT = "\n";
+    std::string ALL_TEXT = LINE_1_TEXT + LINE_BREAK_TEXT + LINE_2_TEXT;
+    std::string BUTTON_TEXT = "Button";
+    std::string CHECKBOX_TEXT = "Check box";
+
+    root.role = ax::mojom::Role::kRootWebArea;
+
+    button.role = ax::mojom::Role::kButton;
+    button.SetHasPopup(ax::mojom::HasPopup::kMenu);
+    button.SetName(BUTTON_TEXT);
+    button.SetValue(BUTTON_TEXT);
+    button.relative_bounds.bounds = gfx::RectF(20, 20, 200, 30);
+    button.AddIntAttribute(ax::mojom::IntAttribute::kNextOnLineId,
+                           check_box.id);
+    root.child_ids.push_back(button.id);
+
+    check_box.role = ax::mojom::Role::kCheckBox;
+    check_box.SetCheckedState(ax::mojom::CheckedState::kTrue);
+    check_box.SetName(CHECKBOX_TEXT);
+    check_box.relative_bounds.bounds = gfx::RectF(20, 50, 200, 30);
+    check_box.AddIntAttribute(ax::mojom::IntAttribute::kPreviousOnLineId,
+                              button.id);
+    root.child_ids.push_back(check_box.id);
+
+    text_field.role = ax::mojom::Role::kTextField;
+    text_field.AddState(ax::mojom::State::kEditable);
+    text_field.AddStringAttribute(ax::mojom::StringAttribute::kHtmlTag,
+                                  "input");
+    text_field.AddStringAttribute(ax::mojom::StringAttribute::kInputType,
+                                  "text");
+    text_field.SetValue(ALL_TEXT);
+    text_field.AddIntListAttribute(
+        ax::mojom::IntListAttribute::kCachedLineStarts,
+        std::vector<int32_t>{0, 7});
+    text_field.child_ids.push_back(static_text1.id);
+    text_field.child_ids.push_back(line_break.id);
+    text_field.child_ids.push_back(static_text2.id);
+    root.child_ids.push_back(text_field.id);
+
+    static_text1.role = ax::mojom::Role::kStaticText;
+    static_text1.AddState(ax::mojom::State::kEditable);
+    static_text1.SetName(LINE_1_TEXT);
+    static_text1.child_ids.push_back(inline_box1.id);
+
+    inline_box1.role = ax::mojom::Role::kInlineTextBox;
+    inline_box1.AddState(ax::mojom::State::kEditable);
+    inline_box1.SetName(LINE_1_TEXT);
+    inline_box1.relative_bounds.bounds = gfx::RectF(220, 20, 100, 30);
+    std::vector<int32_t> character_offsets1;
+    // The width of each character is 5px.
+    character_offsets1.push_back(225);  // "L" {220, 20, 5x30}
+    character_offsets1.push_back(230);  // "i" {225, 20, 5x30}
+    character_offsets1.push_back(235);  // "n" {230, 20, 5x30}
+    character_offsets1.push_back(240);  // "e" {235, 20, 5x30}
+    character_offsets1.push_back(245);  // " " {240, 20, 5x30}
+    character_offsets1.push_back(250);  // "1" {245, 20, 5x30}
+    inline_box1.AddIntListAttribute(
+        ax::mojom::IntListAttribute::kCharacterOffsets, character_offsets1);
+    inline_box1.AddIntListAttribute(ax::mojom::IntListAttribute::kWordStarts,
+                                    std::vector<int32_t>{0, 5});
+    inline_box1.AddIntListAttribute(ax::mojom::IntListAttribute::kWordEnds,
+                                    std::vector<int32_t>{4, 6});
+    inline_box1.AddIntAttribute(ax::mojom::IntAttribute::kNextOnLineId,
+                                line_break.id);
+
+    line_break.role = ax::mojom::Role::kLineBreak;
+    line_break.AddState(ax::mojom::State::kEditable);
+    line_break.SetName(LINE_BREAK_TEXT);
+    line_break.relative_bounds.bounds = gfx::RectF(250, 20, 0, 30);
+    line_break.AddIntAttribute(ax::mojom::IntAttribute::kPreviousOnLineId,
+                               inline_box1.id);
+    line_break.child_ids.push_back(inline_box_line_break.id);
+
+    inline_box_line_break.role = ax::mojom::Role::kInlineTextBox;
+    inline_box_line_break.AddBoolAttribute(
+        ax::mojom::BoolAttribute::kIsLineBreakingObject, true);
+    inline_box_line_break.SetName(LINE_BREAK_TEXT);
+    inline_box_line_break.relative_bounds.bounds = gfx::RectF(250, 20, 0, 30);
+    inline_box_line_break.AddIntListAttribute(
+        ax::mojom::IntListAttribute::kCharacterOffsets, {0});
+    inline_box_line_break.AddIntListAttribute(
+        ax::mojom::IntListAttribute::kWordStarts, std::vector<int32_t>{0});
+    inline_box_line_break.AddIntListAttribute(
+        ax::mojom::IntListAttribute::kWordEnds, std::vector<int32_t>{0});
+
+    static_text2.role = ax::mojom::Role::kStaticText;
+    static_text2.AddState(ax::mojom::State::kEditable);
+    static_text2.SetName(LINE_2_TEXT);
+    static_text2.child_ids.push_back(inline_box2.id);
+
+    inline_box2.role = ax::mojom::Role::kInlineTextBox;
+    inline_box2.AddState(ax::mojom::State::kEditable);
+    inline_box2.SetName(LINE_2_TEXT);
+    inline_box2.relative_bounds.bounds = gfx::RectF(220, 50, 100, 30);
+    std::vector<int32_t> character_offsets2;
+    // The width of each character is 7 px.
+    character_offsets2.push_back(227);  // "L" {220, 50, 7x30}
+    character_offsets2.push_back(234);  // "i" {227, 50, 7x30}
+    character_offsets2.push_back(241);  // "n" {234, 50, 7x30}
+    character_offsets2.push_back(248);  // "e" {241, 50, 7x30}
+    character_offsets2.push_back(255);  // " " {248, 50, 7x30}
+    character_offsets2.push_back(262);  // "2" {255, 50, 7x30}
+    inline_box2.AddIntListAttribute(
+        ax::mojom::IntListAttribute::kCharacterOffsets, character_offsets2);
+    inline_box2.AddIntListAttribute(ax::mojom::IntListAttribute::kWordStarts,
+                                    std::vector<int32_t>{0, 5});
+    inline_box2.AddIntListAttribute(ax::mojom::IntListAttribute::kWordEnds,
+                                    std::vector<int32_t>{4, 6});
+
+    AXTreeUpdate update;
+    update.has_tree_data = true;
+    update.root_id = ROOT_ID;
+    update.nodes = {
+        root,         button,      check_box,  text_field,
+        static_text1, inline_box1, line_break, inline_box_line_break,
+        static_text2, inline_box2};
+    update.tree_data.tree_id = ui::AXTreeID::CreateNewAXTreeID();
+    return update;
+  }
+
+  const std::wstring tree_for_move_full_text =
+      L"First line of text\nStandalone line\n"
+      L"bold text\nParagraph 1\nParagraph 2";
+
+  ui::AXTreeUpdate BuildAXTreeForMove() {
+    ui::AXNodeData group1_data;
+    group1_data.id = 2;
+    group1_data.role = ax::mojom::Role::kGenericContainer;
+    group1_data.AddBoolAttribute(
+        ax::mojom::BoolAttribute::kIsLineBreakingObject, true);
+
+    ui::AXNodeData text_data;
+    text_data.id = 3;
+    text_data.role = ax::mojom::Role::kStaticText;
+    std::string text_content = "First line of text";
+    text_data.SetName(text_content);
+    std::vector<int> word_end_offsets;
+    std::vector<int> word_start_offsets;
+    ComputeWordBoundariesOffsets(text_content, word_start_offsets,
+                                 word_end_offsets);
+    text_data.AddIntListAttribute(ax::mojom::IntListAttribute::kWordStarts,
+                                  word_start_offsets);
+    text_data.AddIntListAttribute(ax::mojom::IntListAttribute::kWordEnds,
+                                  word_end_offsets);
+    group1_data.child_ids = {text_data.id};
+
+    ui::AXNodeData group2_data;
+    group2_data.id = 4;
+    group2_data.role = ax::mojom::Role::kGenericContainer;
+
+    ui::AXNodeData line_break1_data;
+    line_break1_data.id = 5;
+    line_break1_data.role = ax::mojom::Role::kLineBreak;
+    line_break1_data.AddBoolAttribute(
+        ax::mojom::BoolAttribute::kIsLineBreakingObject, true);
+    line_break1_data.SetName("\n");
+
+    ui::AXNodeData standalone_text_data;
+    standalone_text_data.id = 6;
+    standalone_text_data.role = ax::mojom::Role::kStaticText;
+    text_content = "Standalone line";
+    standalone_text_data.SetName(text_content);
+    ComputeWordBoundariesOffsets(text_content, word_start_offsets,
+                                 word_end_offsets);
+    standalone_text_data.AddIntListAttribute(
+        ax::mojom::IntListAttribute::kWordStarts, word_start_offsets);
+    standalone_text_data.AddIntListAttribute(
+        ax::mojom::IntListAttribute::kWordEnds, word_end_offsets);
+
+    ui::AXNodeData line_break2_data;
+    line_break2_data.id = 7;
+    line_break2_data.role = ax::mojom::Role::kLineBreak;
+    line_break2_data.AddBoolAttribute(
+        ax::mojom::BoolAttribute::kIsLineBreakingObject, true);
+    line_break2_data.SetName("\n");
+
+    group2_data.child_ids = {line_break1_data.id, standalone_text_data.id,
+                             line_break2_data.id};
+    standalone_text_data.AddIntAttribute(ax::mojom::IntAttribute::kNextOnLineId,
+                                         line_break2_data.id);
+    line_break2_data.AddIntAttribute(ax::mojom::IntAttribute::kPreviousOnLineId,
+                                     standalone_text_data.id);
+
+    ui::AXNodeData bold_text_data;
+    bold_text_data.id = 8;
+    bold_text_data.role = ax::mojom::Role::kStaticText;
+    bold_text_data.AddIntAttribute(
+        ax::mojom::IntAttribute::kTextStyle,
+        static_cast<int32_t>(ax::mojom::TextStyle::kBold));
+    text_content = "bold text";
+    bold_text_data.SetName(text_content);
+    ComputeWordBoundariesOffsets(text_content, word_start_offsets,
+                                 word_end_offsets);
+    bold_text_data.AddIntListAttribute(ax::mojom::IntListAttribute::kWordStarts,
+                                       word_start_offsets);
+    bold_text_data.AddIntListAttribute(ax::mojom::IntListAttribute::kWordEnds,
+                                       word_end_offsets);
+
+    ui::AXNodeData paragraph1_data;
+    paragraph1_data.id = 9;
+    paragraph1_data.role = ax::mojom::Role::kParagraph;
+    paragraph1_data.AddBoolAttribute(
+        ax::mojom::BoolAttribute::kIsLineBreakingObject, true);
+
+    ui::AXNodeData paragraph1_text_data;
+    paragraph1_text_data.id = 10;
+    paragraph1_text_data.role = ax::mojom::Role::kStaticText;
+    text_content = "Paragraph 1";
+    paragraph1_text_data.SetName(text_content);
+    ComputeWordBoundariesOffsets(text_content, word_start_offsets,
+                                 word_end_offsets);
+    paragraph1_text_data.AddIntListAttribute(
+        ax::mojom::IntListAttribute::kWordStarts, word_start_offsets);
+    paragraph1_text_data.AddIntListAttribute(
+        ax::mojom::IntListAttribute::kWordEnds, word_end_offsets);
+    paragraph1_data.AddBoolAttribute(
+        ax::mojom::BoolAttribute::kIsLineBreakingObject, true);
+
+    ui::AXNodeData ignored_text_data;
+    ignored_text_data.id = 11;
+    ignored_text_data.role = ax::mojom::Role::kStaticText;
+    ignored_text_data.AddState(ax::mojom::State::kIgnored);
+    text_content = "ignored text";
+    ignored_text_data.SetName(text_content);
+
+    paragraph1_data.child_ids = {paragraph1_text_data.id, ignored_text_data.id};
+
+    ui::AXNodeData paragraph2_data;
+    paragraph2_data.id = 12;
+    paragraph2_data.role = ax::mojom::Role::kParagraph;
+    paragraph2_data.AddBoolAttribute(
+        ax::mojom::BoolAttribute::kIsLineBreakingObject, true);
+
+    ui::AXNodeData paragraph2_text_data;
+    paragraph2_text_data.id = 13;
+    paragraph2_text_data.role = ax::mojom::Role::kStaticText;
+    text_content = "Paragraph 2";
+    paragraph2_text_data.SetName(text_content);
+    ComputeWordBoundariesOffsets(text_content, word_start_offsets,
+                                 word_end_offsets);
+    paragraph2_text_data.AddIntListAttribute(
+        ax::mojom::IntListAttribute::kWordStarts, word_start_offsets);
+    paragraph2_text_data.AddIntListAttribute(
+        ax::mojom::IntListAttribute::kWordEnds, word_end_offsets);
+    paragraph1_data.AddBoolAttribute(
+        ax::mojom::BoolAttribute::kIsLineBreakingObject, true);
+    paragraph2_data.child_ids = {paragraph2_text_data.id};
+
+    ui::AXNodeData root_data;
+    root_data.id = 1;
+    root_data.role = ax::mojom::Role::kRootWebArea;
+    root_data.child_ids = {group1_data.id, group2_data.id, bold_text_data.id,
+                           paragraph1_data.id, paragraph2_data.id};
+
+    ui::AXTreeUpdate update;
+    update.has_tree_data = true;
+    update.root_id = root_data.id;
+    update.nodes = {root_data,           group1_data,
+                    text_data,           group2_data,
+                    line_break1_data,    standalone_text_data,
+                    line_break2_data,    bold_text_data,
+                    paragraph1_data,     paragraph1_text_data,
+                    ignored_text_data,   paragraph2_data,
+                    paragraph2_text_data};
+    update.tree_data.tree_id = ui::AXTreeID::CreateNewAXTreeID();
+    return update;
+  }
+
+  AXTreeUpdate BuildAXTreeForMoveByFormat() {
+    //                    1
+    //                    |
+    //    -------------------------------------
+    //    |       |       |    |    |    |    |
+    //    2       4       8   10   12   14   16
+    //    |       |       |    |    |    |    |
+    //    |   ---------   |    |    |    |    |
+    //    |   |   |   |   |    |    |    |    |
+    //    3   5   6   7   9   11   13   15   17
+
+    AXNodeData group1_data;
+    group1_data.id = 2;
+    group1_data.role = ax::mojom::Role::kGenericContainer;
+    group1_data.AddStringAttribute(ax::mojom::StringAttribute::kFontFamily,
+                                   "test font");
+    group1_data.AddBoolAttribute(
+        ax::mojom::BoolAttribute::kIsLineBreakingObject, true);
+
+    AXNodeData text_data;
+    text_data.id = 3;
+    text_data.role = ax::mojom::Role::kStaticText;
+    text_data.SetName("Text with formatting");
+    group1_data.child_ids = {text_data.id};
+
+    AXNodeData group2_data;
+    group2_data.id = 4;
+    group2_data.role = ax::mojom::Role::kGenericContainer;
+    group2_data.AddBoolAttribute(
+        ax::mojom::BoolAttribute::kIsLineBreakingObject, true);
+
+    AXNodeData line_break1_data;
+    line_break1_data.id = 5;
+    line_break1_data.role = ax::mojom::Role::kLineBreak;
+    line_break1_data.SetName("\n");
+
+    AXNodeData standalone_text_data;
+    standalone_text_data.id = 6;
+    standalone_text_data.role = ax::mojom::Role::kStaticText;
+    standalone_text_data.SetName("Standalone line with no formatting");
+
+    AXNodeData line_break2_data;
+    line_break2_data.id = 7;
+    line_break2_data.role = ax::mojom::Role::kLineBreak;
+    line_break2_data.SetName("\n");
+
+    group2_data.child_ids = {line_break1_data.id, standalone_text_data.id,
+                             line_break2_data.id};
+
+    AXNodeData group3_data;
+    group3_data.id = 8;
+    group3_data.role = ax::mojom::Role::kGenericContainer;
+    group3_data.AddIntAttribute(
+        ax::mojom::IntAttribute::kTextStyle,
+        static_cast<int32_t>(ax::mojom::TextStyle::kBold));
+    group3_data.AddBoolAttribute(
+        ax::mojom::BoolAttribute::kIsLineBreakingObject, true);
+
+    AXNodeData bold_text_data;
+    bold_text_data.id = 9;
+    bold_text_data.role = ax::mojom::Role::kStaticText;
+    bold_text_data.SetName("bold text");
+    group3_data.child_ids = {bold_text_data.id};
+
+    AXNodeData paragraph1_data;
+    paragraph1_data.id = 10;
+    paragraph1_data.role = ax::mojom::Role::kParagraph;
+    paragraph1_data.AddIntAttribute(ax::mojom::IntAttribute::kColor, 100);
+    paragraph1_data.AddBoolAttribute(
+        ax::mojom::BoolAttribute::kIsLineBreakingObject, true);
+
+    AXNodeData paragraph1_text_data;
+    paragraph1_text_data.id = 11;
+    paragraph1_text_data.role = ax::mojom::Role::kStaticText;
+    paragraph1_text_data.SetName("Paragraph 1");
+    paragraph1_data.child_ids = {paragraph1_text_data.id};
+
+    AXNodeData paragraph2_data;
+    paragraph2_data.id = 12;
+    paragraph2_data.role = ax::mojom::Role::kParagraph;
+    paragraph2_data.AddFloatAttribute(ax::mojom::FloatAttribute::kFontSize,
+                                      1.0f);
+    paragraph2_data.AddBoolAttribute(
+        ax::mojom::BoolAttribute::kIsLineBreakingObject, true);
+
+    AXNodeData paragraph2_text_data;
+    paragraph2_text_data.id = 13;
+    paragraph2_text_data.role = ax::mojom::Role::kStaticText;
+    paragraph2_text_data.SetName("Paragraph 2");
+    paragraph2_data.child_ids = {paragraph2_text_data.id};
+
+    AXNodeData paragraph3_data;
+    paragraph3_data.id = 14;
+    paragraph3_data.role = ax::mojom::Role::kParagraph;
+    paragraph3_data.AddFloatAttribute(ax::mojom::FloatAttribute::kFontSize,
+                                      1.0f);
+    paragraph3_data.AddBoolAttribute(
+        ax::mojom::BoolAttribute::kIsLineBreakingObject, true);
+
+    AXNodeData paragraph3_text_data;
+    paragraph3_text_data.id = 15;
+    paragraph3_text_data.role = ax::mojom::Role::kStaticText;
+    paragraph3_text_data.SetName("Paragraph 3");
+    paragraph3_data.child_ids = {paragraph3_text_data.id};
+
+    AXNodeData paragraph4_data;
+    paragraph4_data.id = 16;
+    paragraph4_data.role = ax::mojom::Role::kParagraph;
+    paragraph4_data.AddFloatAttribute(ax::mojom::FloatAttribute::kFontSize,
+                                      2.0f);
+    paragraph4_data.AddBoolAttribute(
+        ax::mojom::BoolAttribute::kIsLineBreakingObject, true);
+
+    AXNodeData paragraph4_text_data;
+    paragraph4_text_data.id = 17;
+    paragraph4_text_data.role = ax::mojom::Role::kStaticText;
+    paragraph4_text_data.SetName("Paragraph 4");
+    paragraph4_data.child_ids = {paragraph4_text_data.id};
+
+    AXNodeData root_data;
+    root_data.id = 1;
+    root_data.role = ax::mojom::Role::kRootWebArea;
+    root_data.child_ids = {group1_data.id,     group2_data.id,
+                           group3_data.id,     paragraph1_data.id,
+                           paragraph2_data.id, paragraph3_data.id,
+                           paragraph4_data.id};
+
+    AXTreeUpdate update;
+    update.has_tree_data = true;
+    update.root_id = root_data.id;
+    update.nodes = {root_data,
+                    group1_data,
+                    text_data,
+                    group2_data,
+                    line_break1_data,
+                    standalone_text_data,
+                    line_break2_data,
+                    group3_data,
+                    bold_text_data,
+                    paragraph1_data,
+                    paragraph1_text_data,
+                    paragraph2_data,
+                    paragraph2_text_data,
+                    paragraph3_data,
+                    paragraph3_text_data,
+                    paragraph4_data,
+                    paragraph4_text_data};
+    update.tree_data.tree_id = ui::AXTreeID::CreateNewAXTreeID();
+    return update;
+  }
+
+  void ExpectPositionsEqual(const AXNodePosition::AXPositionInstance& a,
+                            const AXNodePosition::AXPositionInstance& b) {
+    EXPECT_EQ(*a, *b);
+    EXPECT_EQ(a->anchor_id(), b->anchor_id());
+    EXPECT_EQ(a->text_offset(), b->text_offset());
+  }
+};
+
+class MockAXPlatformNodeTextRangeProviderWin
+    : public CComObjectRootEx<CComMultiThreadModel>,
+      public ITextRangeProvider {
+ public:
+  BEGIN_COM_MAP(MockAXPlatformNodeTextRangeProviderWin)
+  COM_INTERFACE_ENTRY(ITextRangeProvider)
+  END_COM_MAP()
+
+  MockAXPlatformNodeTextRangeProviderWin() {}
+  ~MockAXPlatformNodeTextRangeProviderWin() {}
+
+  static HRESULT CreateMockTextRangeProvider(ITextRangeProvider** provider) {
+    CComObject<MockAXPlatformNodeTextRangeProviderWin>* text_range_provider =
+        nullptr;
+    HRESULT hr =
+        CComObject<MockAXPlatformNodeTextRangeProviderWin>::CreateInstance(
+            &text_range_provider);
+    if (SUCCEEDED(hr)) {
+      *provider = text_range_provider;
+    }
+
+    return hr;
+  }
+
+  //
+  // ITextRangeProvider methods.
+  //
+  IFACEMETHODIMP Clone(ITextRangeProvider** clone) override {
+    return E_NOTIMPL;
+  }
+
+  IFACEMETHODIMP Compare(ITextRangeProvider* other, BOOL* result) override {
+    return E_NOTIMPL;
+  }
+
+  IFACEMETHODIMP CompareEndpoints(TextPatternRangeEndpoint this_endpoint,
+                                  ITextRangeProvider* other,
+                                  TextPatternRangeEndpoint other_endpoint,
+                                  int* result) override {
+    return E_NOTIMPL;
+  }
+
+  IFACEMETHODIMP ExpandToEnclosingUnit(TextUnit unit) override {
+    return E_NOTIMPL;
+  }
+
+  IFACEMETHODIMP FindAttribute(TEXTATTRIBUTEID attribute_id,
+                               VARIANT val,
+                               BOOL backward,
+                               ITextRangeProvider** result) override {
+    return E_NOTIMPL;
+  }
+
+  IFACEMETHODIMP FindText(BSTR string,
+                          BOOL backwards,
+                          BOOL ignore_case,
+                          ITextRangeProvider** result) override {
+    return E_NOTIMPL;
+  }
+
+  IFACEMETHODIMP GetAttributeValue(TEXTATTRIBUTEID attribute_id,
+                                   VARIANT* value) override {
+    return E_NOTIMPL;
+  }
+
+  IFACEMETHODIMP GetBoundingRectangles(SAFEARRAY** rectangles) override {
+    return E_NOTIMPL;
+  }
+
+  IFACEMETHODIMP GetEnclosingElement(
+      IRawElementProviderSimple** element) override {
+    return E_NOTIMPL;
+  }
+
+  IFACEMETHODIMP GetText(int max_count, BSTR* text) override {
+    return E_NOTIMPL;
+  }
+
+  IFACEMETHODIMP Move(TextUnit unit, int count, int* units_moved) override {
+    return E_NOTIMPL;
+  }
+
+  IFACEMETHODIMP MoveEndpointByUnit(TextPatternRangeEndpoint endpoint,
+                                    TextUnit unit,
+                                    int count,
+                                    int* units_moved) override {
+    return E_NOTIMPL;
+  }
+
+  IFACEMETHODIMP MoveEndpointByRange(
+      TextPatternRangeEndpoint this_endpoint,
+      ITextRangeProvider* other,
+      TextPatternRangeEndpoint other_endpoint) override {
+    return E_NOTIMPL;
+  }
+
+  IFACEMETHODIMP Select() override { return E_NOTIMPL; }
+
+  IFACEMETHODIMP AddToSelection() override { return E_NOTIMPL; }
+
+  IFACEMETHODIMP RemoveFromSelection() override { return E_NOTIMPL; }
+
+  IFACEMETHODIMP ScrollIntoView(BOOL align_to_top) override {
+    return E_NOTIMPL;
+  }
+
+  IFACEMETHODIMP GetChildren(SAFEARRAY** children) override {
+    return E_NOTIMPL;
+  }
+};
+
+TEST_F(AXPlatformNodeTextRangeProviderTest, TestITextRangeProviderClone) {
+  Init(BuildTextDocument({"some text"}));
+
+  ComPtr<ITextRangeProvider> text_range_provider;
+  GetTextRangeProviderFromTextNode(text_range_provider,
+                                   GetRootAsAXNode()->children()[0]);
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"some text");
+
+  ComPtr<ITextRangeProvider> text_range_provider_clone;
+  text_range_provider->Clone(&text_range_provider_clone);
+  CopyOwnerToClone(text_range_provider.Get(), text_range_provider_clone.Get());
+  ComPtr<AXPlatformNodeTextRangeProviderWin> original_range;
+  ComPtr<AXPlatformNodeTextRangeProviderWin> clone_range;
+
+  text_range_provider->QueryInterface(IID_PPV_ARGS(&original_range));
+  text_range_provider_clone->QueryInterface(IID_PPV_ARGS(&clone_range));
+
+  EXPECT_EQ(*GetStart(original_range.Get()), *GetStart(clone_range.Get()));
+  EXPECT_EQ(*GetEnd(original_range.Get()), *GetEnd(clone_range.Get()));
+  EXPECT_EQ(GetOwner(original_range.Get()), GetOwner(clone_range.Get()));
+
+  // Clear original text range provider.
+  text_range_provider.Reset();
+  EXPECT_EQ(nullptr, text_range_provider.Get());
+
+  // Ensure the clone still works correctly.
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider_clone, L"some text");
+}
+
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       TestITextRangeProviderCompareEndpoints) {
+  Init(BuildTextDocument({"some text", "more text"},
+                         false /* build_word_boundaries_offsets */,
+                         true /* place_text_on_one_line */));
+
+  AXNode* root_node = GetRootAsAXNode();
+
+  // Get the textRangeProvider for the document,
+  // which contains text "some textmore text".
+  ComPtr<ITextRangeProvider> document_text_range_provider;
+  GetTextRangeProviderFromTextNode(document_text_range_provider, root_node);
+
+  // Get the textRangeProvider for "some text".
+  ComPtr<ITextRangeProvider> text_range_provider;
+  GetTextRangeProviderFromTextNode(text_range_provider,
+                                   root_node->children()[0]);
+
+  // Get the textRangeProvider for "more text".
+  ComPtr<ITextRangeProvider> more_text_range_provider;
+  GetTextRangeProviderFromTextNode(more_text_range_provider,
+                                   root_node->children()[1]);
+
+  // Compare the endpoints of the document which contains "some textmore text".
+  int result;
+  EXPECT_HRESULT_SUCCEEDED(document_text_range_provider->CompareEndpoints(
+      TextPatternRangeEndpoint_Start, document_text_range_provider.Get(),
+      TextPatternRangeEndpoint_Start, &result));
+  EXPECT_EQ(0, result);
+
+  EXPECT_HRESULT_SUCCEEDED(document_text_range_provider->CompareEndpoints(
+      TextPatternRangeEndpoint_End, document_text_range_provider.Get(),
+      TextPatternRangeEndpoint_End, &result));
+  EXPECT_EQ(0, result);
+
+  EXPECT_HRESULT_SUCCEEDED(document_text_range_provider->CompareEndpoints(
+      TextPatternRangeEndpoint_Start, document_text_range_provider.Get(),
+      TextPatternRangeEndpoint_End, &result));
+  EXPECT_EQ(-1, result);
+
+  EXPECT_HRESULT_SUCCEEDED(document_text_range_provider->CompareEndpoints(
+      TextPatternRangeEndpoint_End, document_text_range_provider.Get(),
+      TextPatternRangeEndpoint_Start, &result));
+  EXPECT_EQ(1, result);
+
+  // Compare the endpoints of "some text" and "more text". The position at the
+  // end of "some text" is logically equivalent to the position at the start of
+  // "more text".
+  EXPECT_HRESULT_SUCCEEDED(text_range_provider->CompareEndpoints(
+      TextPatternRangeEndpoint_Start, more_text_range_provider.Get(),
+      TextPatternRangeEndpoint_Start, &result));
+  EXPECT_EQ(-1, result);
+
+  EXPECT_HRESULT_SUCCEEDED(text_range_provider->CompareEndpoints(
+      TextPatternRangeEndpoint_End, more_text_range_provider.Get(),
+      TextPatternRangeEndpoint_Start, &result));
+  EXPECT_EQ(0, result);
+
+  // Compare the endpoints of "some text" with those of the entire document. The
+  // position at the start of "some text" is logically equivalent to the
+  // position at the start of the document.
+  EXPECT_HRESULT_SUCCEEDED(text_range_provider->CompareEndpoints(
+      TextPatternRangeEndpoint_Start, document_text_range_provider.Get(),
+      TextPatternRangeEndpoint_Start, &result));
+  EXPECT_EQ(0, result);
+
+  EXPECT_HRESULT_SUCCEEDED(text_range_provider->CompareEndpoints(
+      TextPatternRangeEndpoint_End, document_text_range_provider.Get(),
+      TextPatternRangeEndpoint_End, &result));
+  EXPECT_EQ(-1, result);
+
+  // Compare the endpoints of "more text" with those of the entire document.
+  EXPECT_HRESULT_SUCCEEDED(more_text_range_provider->CompareEndpoints(
+      TextPatternRangeEndpoint_Start, document_text_range_provider.Get(),
+      TextPatternRangeEndpoint_Start, &result));
+  EXPECT_EQ(1, result);
+
+  EXPECT_HRESULT_SUCCEEDED(more_text_range_provider->CompareEndpoints(
+      TextPatternRangeEndpoint_End, document_text_range_provider.Get(),
+      TextPatternRangeEndpoint_End, &result));
+  EXPECT_EQ(0, result);
+}
+
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       TestITextRangeProviderExpandToEnclosingCharacter) {
+  ui::AXTreeUpdate update = BuildTextDocument({"some text", "more text"});
+  Init(update);
+  AXNode* root_node = GetRootAsAXNode();
+
+  ComPtr<ITextRangeProvider> text_range_provider;
+  GetTextRangeProviderFromTextNode(text_range_provider, root_node);
+  ASSERT_HRESULT_SUCCEEDED(
+      text_range_provider->ExpandToEnclosingUnit(TextUnit_Character));
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"s");
+
+  int count;
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_End, TextUnit_Character, /*count*/ 2, &count));
+  ASSERT_EQ(2, count);
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_Start, TextUnit_Character, /*count*/ 1, &count));
+  ASSERT_EQ(1, count);
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"om");
+
+  ASSERT_HRESULT_SUCCEEDED(
+      text_range_provider->ExpandToEnclosingUnit(TextUnit_Character));
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"o");
+
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_End, TextUnit_Character, /*count*/ 9, &count));
+  ASSERT_EQ(9, count);
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_Start, TextUnit_Character, /*count*/ 8, &count));
+  ASSERT_EQ(8, count);
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"mo");
+
+  ASSERT_HRESULT_SUCCEEDED(
+      text_range_provider->ExpandToEnclosingUnit(TextUnit_Character));
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"m");
+
+  // Move the start and end to the end of the document.
+  // Expand to enclosing unit should never return a null position.
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_End, TextUnit_Character, /*count*/ 9, &count));
+  ASSERT_EQ(8, count);
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_Start, TextUnit_Character, /*count*/ 9, &count));
+  ASSERT_EQ(9, count);
+
+  ASSERT_HRESULT_SUCCEEDED(
+      text_range_provider->ExpandToEnclosingUnit(TextUnit_Character));
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"t");
+
+  // Move both endpoints to the position before the start of the "more text"
+  // anchor. Then, force the start to be on the position after the end of
+  // "some text" by moving one character backward and one forward.
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_End, TextUnit_Character, /*count*/ -9, &count));
+  ASSERT_EQ(-9, count);
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_Start, TextUnit_Character, /*count*/ -1,
+      &count));
+  ASSERT_EQ(-1, count);
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_Start, TextUnit_Character, /*count*/ 1, &count));
+  ASSERT_EQ(1, count);
+  ASSERT_HRESULT_SUCCEEDED(
+      text_range_provider->ExpandToEnclosingUnit(TextUnit_Character));
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"m");
+
+  // Check that the enclosing element of the range matches ATs expectations.
+  ComPtr<IRawElementProviderSimple> more_text_provider =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(
+          root_node->children()[1]->children()[0]);
+  ComPtr<IRawElementProviderSimple> enclosing_element;
+  ASSERT_HRESULT_SUCCEEDED(
+      text_range_provider->GetEnclosingElement(&enclosing_element));
+  EXPECT_EQ(more_text_provider.Get(), enclosing_element.Get());
+}
+
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       TestITextRangeProviderExpandToEnclosingWord) {
+  Init(BuildTextDocument({"some text", "definitely not text"},
+                         /*build_word_boundaries_offsets*/ true));
+
+  ComPtr<ITextRangeProvider> text_range_provider;
+  GetTextRangeProviderFromTextNode(text_range_provider,
+                                   GetRootAsAXNode()->children()[1]);
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"definitely not text");
+
+  // Start endpoint is already on a word's start boundary.
+  ASSERT_HRESULT_SUCCEEDED(
+      text_range_provider->ExpandToEnclosingUnit(TextUnit_Word));
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"definitely ");
+
+  // Start endpoint is between a word's start and end boundaries.
+  int count;
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_Start, TextUnit_Character, /*count*/ -2,
+      &count));
+  ASSERT_EQ(-2, count);
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"xtdefinitely ");
+
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_End, TextUnit_Character, /*count*/ 4, &count));
+  ASSERT_EQ(4, count);
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"xtdefinitely not ");
+
+  ASSERT_HRESULT_SUCCEEDED(
+      text_range_provider->ExpandToEnclosingUnit(TextUnit_Word));
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"text");
+
+  // Start endpoint is on a word's end boundary.
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_Start, TextUnit_Character, /*count*/ 18,
+      &count));
+  ASSERT_EQ(18, count);
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"");
+
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_End, TextUnit_Character, /*count*/ 1, &count));
+  ASSERT_EQ(1, count);
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L" ");
+
+  ASSERT_HRESULT_SUCCEEDED(
+      text_range_provider->ExpandToEnclosingUnit(TextUnit_Word));
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"not ");
+}
+
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       TestITextRangeProviderExpandToEnclosingLine) {
+  Init(BuildTextDocument({"line #1", "maybe line #1?", "not line #1"}));
+
+  ComPtr<ITextRangeProvider> text_range_provider;
+  GetTextRangeProviderFromTextNode(text_range_provider,
+                                   GetRootAsAXNode()->children()[0]);
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"line #1");
+
+  // Start endpoint is already on a line's start boundary.
+  int count;
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_End, TextUnit_Character, /*count*/ -11, &count));
+  ASSERT_EQ(-7, count);
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"");
+
+  ASSERT_HRESULT_SUCCEEDED(
+      text_range_provider->ExpandToEnclosingUnit(TextUnit_Line));
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"line #1");
+
+  // Start endpoint is between a line's start and end boundaries.
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_Start, TextUnit_Character, /*count*/ 13,
+      &count));
+  ASSERT_EQ(13, count);
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"");
+
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_End, TextUnit_Character, /*count*/ 4, &count));
+  ASSERT_EQ(4, count);
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"line");
+
+  ASSERT_HRESULT_SUCCEEDED(
+      text_range_provider->ExpandToEnclosingUnit(TextUnit_Line));
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"maybe line #1?");
+
+  // Start endpoint is on a line's end boundary.
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_Start, TextUnit_Character, /*count*/ 29,
+      &count));
+  ASSERT_EQ(25, count);
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"");
+
+  ASSERT_HRESULT_SUCCEEDED(
+      text_range_provider->ExpandToEnclosingUnit(TextUnit_Line));
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"not line #1");
+}
+
+// TOOD(schectman) https://github.com/flutter/flutter/issues/117012
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       DISABLED_TestITextRangeProviderExpandToEnclosingParagraph) {
+  Init(BuildAXTreeForMove());
+  AXNode* root_node = GetRootAsAXNode();
+
+  ComPtr<ITextRangeProvider> text_range_provider;
+  GetTextRangeProviderFromTextNode(text_range_provider, root_node);
+
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider,
+                          /*expected_text*/ tree_for_move_full_text.data());
+
+  // Start endpoint is already on a paragraph's start boundary.
+  //
+  // Note that there are 5 paragraphs, not 6, because the line break element
+  // between the first and second paragraph is merged in the text of the first
+  // paragraph. This is standard UIA behavior which merges any trailing
+  // whitespace with the previous paragraph.
+  int count;
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_End, TextUnit_Paragraph, /*count*/ -5, &count));
+  EXPECT_EQ(-5, count);
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"");
+
+  ASSERT_HRESULT_SUCCEEDED(
+      text_range_provider->ExpandToEnclosingUnit(TextUnit_Paragraph));
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"First line of text\n");
+
+  // Moving the start by two lines will create a degenerate range positioned
+  // at the next paragraph (skipping the newline).
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_Start, TextUnit_Line, /*count*/ 2, &count));
+  EXPECT_EQ(2, count);
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"");
+
+  ASSERT_HRESULT_SUCCEEDED(
+      text_range_provider->ExpandToEnclosingUnit(TextUnit_Paragraph));
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"Standalone line\n");
+
+  // Move to the next paragraph via MoveEndpointByUnit (line), then move to
+  // the middle of the paragraph via Move (word), then expand by paragraph.
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_Start, TextUnit_Line, /*count*/ 1, &count));
+  EXPECT_EQ(1, count);
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"");
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Word,
+                  /*count*/ 1,
+                  /*expected_text*/
+                  L"",
+                  /*expected_count*/ 1);
+  ASSERT_HRESULT_SUCCEEDED(
+      text_range_provider->ExpandToEnclosingUnit(TextUnit_Paragraph));
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"bold text\n");
+
+  // Create a degenerate range at the end of the document, then expand by
+  // paragraph.
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_Start, TextUnit_Document, /*count*/ 1, &count));
+  EXPECT_EQ(1, count);
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"");
+  ASSERT_HRESULT_SUCCEEDED(
+      text_range_provider->ExpandToEnclosingUnit(TextUnit_Paragraph));
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"Paragraph 2");
+}
+
+// TOOD(schectman) https://github.com/flutter/flutter/issues/117012
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       DISABLED_TestITextRangeProviderExpandToEnclosingFormat) {
+  Init(BuildAXTreeForMoveByFormat());
+  AXNode* root_node = GetRootAsAXNode();
+  ComPtr<ITextRangeProvider> text_range_provider;
+  GetTextRangeProviderFromTextNode(text_range_provider, root_node);
+  ComPtr<AXPlatformNodeTextRangeProviderWin> text_range_provider_internal;
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->QueryInterface(
+      IID_PPV_ARGS(&text_range_provider_internal)));
+
+  EXPECT_UIA_TEXTRANGE_EQ(
+      text_range_provider,
+      L"Text with formatting\nStandalone line with no formatting\nbold "
+      L"text\nParagraph 1\nParagraph 2\nParagraph 3\nParagraph 4");
+
+  // https://docs.microsoft.com/en-us/windows/win32/api/uiautomationclient/nf-uiautomationclient-iuiautomationtextrange-expandtoenclosingunit
+  // Consider two consecutive text units A and B.
+  // The documentation illustrates 9 cases, but cases 1 and 9 are equivalent.
+  // In each case, the expected output is a range from start of A to end of A.
+
+  // Create a range encompassing nodes 11-15 which will serve as text units A
+  // and B for this test.
+  ComPtr<ITextRangeProvider> units_a_b_provider;
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->Clone(&units_a_b_provider));
+  CopyOwnerToClone(text_range_provider.Get(), units_a_b_provider.Get());
+
+  int count;
+  ASSERT_HRESULT_SUCCEEDED(units_a_b_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_Start, TextUnit_Line, /*count*/ 5, &count));
+  ASSERT_EQ(5, count);
+  ASSERT_HRESULT_SUCCEEDED(units_a_b_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_End, TextUnit_Line, /*count*/ -1, &count));
+  ASSERT_EQ(-1, count);
+  EXPECT_UIA_TEXTRANGE_EQ(units_a_b_provider,
+                          L"Paragraph 1\nParagraph 2\nParagraph 3");
+
+  // Create a range encompassing node 11 which will serve as our expected
+  // value of a range from start of A to end of A.
+  ComPtr<ITextRangeProvider> unit_a_provider;
+  ASSERT_HRESULT_SUCCEEDED(units_a_b_provider->Clone(&unit_a_provider));
+  CopyOwnerToClone(units_a_b_provider.Get(), unit_a_provider.Get());
+  ASSERT_HRESULT_SUCCEEDED(unit_a_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_End, TextUnit_Line, /*count*/ -2, &count));
+  ASSERT_EQ(-2, count);
+  EXPECT_UIA_TEXTRANGE_EQ(unit_a_provider, L"Paragraph 1");
+
+  // Case 1: Degenerate range at start of A.
+  {
+    SCOPED_TRACE("Case 1: Degenerate range at start of A.");
+    ComPtr<ITextRangeProvider> test_case_provider;
+    ASSERT_HRESULT_SUCCEEDED(unit_a_provider->Clone(&test_case_provider));
+    CopyOwnerToClone(unit_a_provider.Get(), test_case_provider.Get());
+    ASSERT_HRESULT_SUCCEEDED(test_case_provider->MoveEndpointByRange(
+        TextPatternRangeEndpoint_End, test_case_provider.Get(),
+        TextPatternRangeEndpoint_Start));
+    EXPECT_UIA_TEXTRANGE_EQ(test_case_provider, L"");
+
+    ASSERT_HRESULT_SUCCEEDED(
+        test_case_provider->ExpandToEnclosingUnit(TextUnit_Format));
+    BOOL are_same;
+    ASSERT_HRESULT_SUCCEEDED(
+        test_case_provider->Compare(unit_a_provider.Get(), &are_same));
+    EXPECT_TRUE(are_same);
+  }
+
+  // Case 2: Range from start of A to middle of A.
+  {
+    SCOPED_TRACE("Case 2: Range from start of A to middle of A.");
+    ComPtr<ITextRangeProvider> test_case_provider;
+    ASSERT_HRESULT_SUCCEEDED(unit_a_provider->Clone(&test_case_provider));
+    CopyOwnerToClone(unit_a_provider.Get(), test_case_provider.Get());
+    ASSERT_HRESULT_SUCCEEDED(test_case_provider->MoveEndpointByUnit(
+        TextPatternRangeEndpoint_End, TextUnit_Character, /*count*/ -7,
+        &count));
+    ASSERT_EQ(-7, count);
+    EXPECT_UIA_TEXTRANGE_EQ(test_case_provider, L"Para");
+
+    ASSERT_HRESULT_SUCCEEDED(
+        test_case_provider->ExpandToEnclosingUnit(TextUnit_Format));
+    BOOL are_same;
+    ASSERT_HRESULT_SUCCEEDED(
+        test_case_provider->Compare(unit_a_provider.Get(), &are_same));
+    EXPECT_TRUE(are_same);
+  }
+
+  // Case 3: Range from start of A to end of A.
+  {
+    SCOPED_TRACE("Case 3: Range from start of A to end of A.");
+    ComPtr<ITextRangeProvider> test_case_provider;
+    ASSERT_HRESULT_SUCCEEDED(unit_a_provider->Clone(&test_case_provider));
+    CopyOwnerToClone(unit_a_provider.Get(), test_case_provider.Get());
+    EXPECT_UIA_TEXTRANGE_EQ(test_case_provider, L"Paragraph 1");
+
+    ASSERT_HRESULT_SUCCEEDED(
+        test_case_provider->ExpandToEnclosingUnit(TextUnit_Format));
+    BOOL are_same;
+    ASSERT_HRESULT_SUCCEEDED(
+        test_case_provider->Compare(unit_a_provider.Get(), &are_same));
+    EXPECT_TRUE(are_same);
+  }
+
+  // Case 4: Range from start of A to middle of B.
+  {
+    SCOPED_TRACE("Case 4: Range from start of A to middle of B.");
+    ComPtr<ITextRangeProvider> test_case_provider;
+    ASSERT_HRESULT_SUCCEEDED(unit_a_provider->Clone(&test_case_provider));
+    CopyOwnerToClone(unit_a_provider.Get(), test_case_provider.Get());
+    ASSERT_HRESULT_SUCCEEDED(test_case_provider->MoveEndpointByUnit(
+        TextPatternRangeEndpoint_End, TextUnit_Character, /*count*/ 5, &count));
+    ASSERT_EQ(5, count);
+    EXPECT_UIA_TEXTRANGE_EQ(test_case_provider, L"Paragraph 1\nPara");
+
+    ASSERT_HRESULT_SUCCEEDED(
+        test_case_provider->ExpandToEnclosingUnit(TextUnit_Format));
+    BOOL are_same;
+    ASSERT_HRESULT_SUCCEEDED(
+        test_case_provider->Compare(unit_a_provider.Get(), &are_same));
+    EXPECT_TRUE(are_same);
+  }
+
+  // Case 5: Degenerate range in middle of A.
+  {
+    SCOPED_TRACE("Case 5: Degenerate range in middle of A.");
+    ComPtr<ITextRangeProvider> test_case_provider;
+    ASSERT_HRESULT_SUCCEEDED(unit_a_provider->Clone(&test_case_provider));
+    CopyOwnerToClone(unit_a_provider.Get(), test_case_provider.Get());
+    ASSERT_HRESULT_SUCCEEDED(test_case_provider->MoveEndpointByUnit(
+        TextPatternRangeEndpoint_Start, TextUnit_Character, /*count*/ 4,
+        &count));
+    ASSERT_EQ(4, count);
+    ASSERT_HRESULT_SUCCEEDED(test_case_provider->MoveEndpointByRange(
+        TextPatternRangeEndpoint_End, test_case_provider.Get(),
+        TextPatternRangeEndpoint_Start));
+    EXPECT_UIA_TEXTRANGE_EQ(test_case_provider, L"");
+
+    ASSERT_HRESULT_SUCCEEDED(
+        test_case_provider->ExpandToEnclosingUnit(TextUnit_Format));
+    BOOL are_same;
+    ASSERT_HRESULT_SUCCEEDED(
+        test_case_provider->Compare(unit_a_provider.Get(), &are_same));
+    EXPECT_TRUE(are_same);
+  }
+
+  // Case 6: Range from middle of A to middle of A.
+  {
+    SCOPED_TRACE("Case 6: Range from middle of A to middle of A.");
+    ComPtr<ITextRangeProvider> test_case_provider;
+    ASSERT_HRESULT_SUCCEEDED(unit_a_provider->Clone(&test_case_provider));
+    CopyOwnerToClone(unit_a_provider.Get(), test_case_provider.Get());
+    ASSERT_HRESULT_SUCCEEDED(test_case_provider->MoveEndpointByUnit(
+        TextPatternRangeEndpoint_Start, TextUnit_Character, /*count*/ 4,
+        &count));
+    ASSERT_EQ(4, count);
+    ASSERT_HRESULT_SUCCEEDED(test_case_provider->MoveEndpointByUnit(
+        TextPatternRangeEndpoint_End, TextUnit_Character, /*count*/ -2,
+        &count));
+    ASSERT_EQ(-2, count);
+    EXPECT_UIA_TEXTRANGE_EQ(test_case_provider, L"graph");
+
+    ASSERT_HRESULT_SUCCEEDED(
+        test_case_provider->ExpandToEnclosingUnit(TextUnit_Format));
+    BOOL are_same;
+    ASSERT_HRESULT_SUCCEEDED(
+        test_case_provider->Compare(unit_a_provider.Get(), &are_same));
+    EXPECT_TRUE(are_same);
+  }
+
+  // Case 7: Range from middle of A to end of A.
+  {
+    SCOPED_TRACE("Case 7: Range from middle of A to end of A.");
+    ComPtr<ITextRangeProvider> test_case_provider;
+    ASSERT_HRESULT_SUCCEEDED(unit_a_provider->Clone(&test_case_provider));
+    CopyOwnerToClone(unit_a_provider.Get(), test_case_provider.Get());
+    ASSERT_HRESULT_SUCCEEDED(test_case_provider->MoveEndpointByUnit(
+        TextPatternRangeEndpoint_Start, TextUnit_Character, /*count*/ 4,
+        &count));
+    ASSERT_EQ(4, count);
+    EXPECT_UIA_TEXTRANGE_EQ(test_case_provider, L"graph 1");
+
+    ASSERT_HRESULT_SUCCEEDED(
+        test_case_provider->ExpandToEnclosingUnit(TextUnit_Format));
+    BOOL are_same;
+    ASSERT_HRESULT_SUCCEEDED(
+        test_case_provider->Compare(unit_a_provider.Get(), &are_same));
+    EXPECT_TRUE(are_same);
+  }
+
+  // Case 8: Range from middle of A to middle of B.
+  {
+    SCOPED_TRACE("Case 8: Range from middle of A to middle of B.");
+    ComPtr<ITextRangeProvider> test_case_provider;
+    ASSERT_HRESULT_SUCCEEDED(unit_a_provider->Clone(&test_case_provider));
+    CopyOwnerToClone(unit_a_provider.Get(), test_case_provider.Get());
+    ASSERT_HRESULT_SUCCEEDED(test_case_provider->MoveEndpointByUnit(
+        TextPatternRangeEndpoint_Start, TextUnit_Character, /*count*/ 5,
+        &count));
+    ASSERT_EQ(5, count);
+    ASSERT_HRESULT_SUCCEEDED(test_case_provider->MoveEndpointByUnit(
+        TextPatternRangeEndpoint_End, TextUnit_Character, /*count*/ 5, &count));
+    ASSERT_EQ(5, count);
+    EXPECT_UIA_TEXTRANGE_EQ(test_case_provider, L"raph 1\nPara");
+
+    ASSERT_HRESULT_SUCCEEDED(
+        test_case_provider->ExpandToEnclosingUnit(TextUnit_Format));
+    BOOL are_same;
+    ASSERT_HRESULT_SUCCEEDED(
+        test_case_provider->Compare(unit_a_provider.Get(), &are_same));
+    EXPECT_TRUE(are_same);
+  }
+}
+
+// TOOD(schectman) https://github.com/flutter/flutter/issues/117012
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       DISABLED_TestITextRangeProviderExpandToEnclosingFormatWithEmptyObjects) {
+  // This test updates the tree structure to test a specific edge case.
+  //
+  // When using heading navigation, the empty objects (see
+  // AXPosition::IsEmptyObjectReplacedByCharacter for information about empty
+  // objects) sometimes cause a problem with
+  // AXPlatformNodeTextRangeProviderWin::ExpandToEnclosingUnit.
+  // With some specific AXTree (like the one used below), the empty object
+  // causes ExpandToEnclosingUnit to move the range back on the heading that it
+  // previously was instead of moving it forward/backward to the next heading.
+  // To avoid this, empty objects are always marked as format boundaries.
+  //
+  // The issue normally occurs when a heading is directly followed by an ignored
+  // empty object, itself followed by an unignored empty object.
+  //
+  // ++1 kRootWebArea
+  // ++++2 kHeading
+  // ++++++3 kStaticText
+  // ++++++++4 kInlineTextBox
+  // ++++5 kGenericContainer ignored
+  // ++++6 kButton
+  ui::AXNodeData root_1;
+  ui::AXNodeData heading_2;
+  ui::AXNodeData static_text_3;
+  ui::AXNodeData inline_box_4;
+  ui::AXNodeData generic_container_5;
+  ui::AXNodeData button_6;
+
+  root_1.id = 1;
+  heading_2.id = 2;
+  static_text_3.id = 3;
+  inline_box_4.id = 4;
+  generic_container_5.id = 5;
+  button_6.id = 6;
+
+  root_1.role = ax::mojom::Role::kRootWebArea;
+  root_1.child_ids = {heading_2.id, generic_container_5.id, button_6.id};
+
+  heading_2.role = ax::mojom::Role::kHeading;
+  heading_2.child_ids = {static_text_3.id};
+
+  static_text_3.role = ax::mojom::Role::kStaticText;
+  static_text_3.child_ids = {inline_box_4.id};
+  static_text_3.SetName("3.14");
+
+  inline_box_4.role = ax::mojom::Role::kInlineTextBox;
+  inline_box_4.SetName("3.14");
+
+  generic_container_5.role = ax::mojom::Role::kGenericContainer;
+  generic_container_5.AddBoolAttribute(
+      ax::mojom::BoolAttribute::kIsLineBreakingObject, true);
+  generic_container_5.AddState(ax::mojom::State::kIgnored);
+
+  button_6.role = ax::mojom::Role::kButton;
+
+  ui::AXTreeUpdate update;
+  ui::AXTreeData tree_data;
+  tree_data.tree_id = ui::AXTreeID::CreateNewAXTreeID();
+  update.tree_data = tree_data;
+  update.has_tree_data = true;
+  update.root_id = root_1.id;
+  update.nodes.push_back(root_1);
+  update.nodes.push_back(heading_2);
+  update.nodes.push_back(static_text_3);
+  update.nodes.push_back(inline_box_4);
+  update.nodes.push_back(generic_container_5);
+  update.nodes.push_back(button_6);
+
+  Init(update);
+
+  AXNode* root_node = GetRootAsAXNode();
+  ComPtr<ITextRangeProvider> text_range_provider;
+  GetTextRangeProviderFromTextNode(text_range_provider, root_node);
+
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"3.14\xFFFC");
+
+  // Create a degenerate range positioned at the boundary between nodes 4 and 6,
+  // e.g., "3.14<>" and "<\xFFFC>" (because node 5 is ignored).
+  int count;
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_Start, TextUnit_Character, /*count*/ 5, &count));
+  ASSERT_EQ(5, count);
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_End, TextUnit_Character, /*count*/ -1, &count));
+  ASSERT_EQ(-1, count);
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"");
+
+  // ExpandToEnclosingUnit should move the range to the next non-ignored empty
+  // object (i.e, node 6), and not at the beginning of node 4.
+  ASSERT_HRESULT_SUCCEEDED(
+      text_range_provider->ExpandToEnclosingUnit(TextUnit_Format));
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"\xFFFC");
+}
+
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       TestITextRangeProviderExpandToEnclosingDocument) {
+  Init(BuildTextDocument({"some text", "more text", "even more text"}));
+
+  AXNode* root_node = GetRootAsAXNode();
+  AXNode* text_node = root_node->children()[0];
+  AXNode* more_text_node = root_node->children()[1];
+  AXNode* even_more_text_node = root_node->children()[2];
+
+  // Run the test twice, one for TextUnit_Document and once for TextUnit_Page,
+  // since they should have identical behavior.
+  const TextUnit textunit_types[] = {TextUnit_Document, TextUnit_Page};
+  ComPtr<ITextRangeProvider> text_range_provider;
+
+  for (auto& textunit : textunit_types) {
+    GetTextRangeProviderFromTextNode(text_range_provider, text_node);
+    ASSERT_HRESULT_SUCCEEDED(
+        text_range_provider->ExpandToEnclosingUnit(textunit));
+    EXPECT_UIA_TEXTRANGE_EQ(text_range_provider,
+                            L"some textmore texteven more text");
+
+    GetTextRangeProviderFromTextNode(text_range_provider, more_text_node);
+    ASSERT_HRESULT_SUCCEEDED(
+        text_range_provider->ExpandToEnclosingUnit(textunit));
+    EXPECT_UIA_TEXTRANGE_EQ(text_range_provider,
+                            L"some textmore texteven more text");
+
+    GetTextRangeProviderFromTextNode(text_range_provider, even_more_text_node);
+    ASSERT_HRESULT_SUCCEEDED(
+        text_range_provider->ExpandToEnclosingUnit(textunit));
+    EXPECT_UIA_TEXTRANGE_EQ(text_range_provider,
+                            L"some textmore texteven more text");
+  }
+}
+
+// TOOD(schectman) Why should this be ignored?
+// https://github.com/flutter/flutter/issues/117012
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       DISABLED_TestITextRangeProviderIgnoredForTextNavigation) {
+  // ++1 kRootWebArea
+  // ++++2 kStaticText
+  // ++++++3 kInlineTextBox foo
+  // ++++4 kSplitter
+  // ++++5 kStaticText
+  // ++++++6 kInlineTextBox bar
+  // ++++7 genericContainer
+  // ++++8 kStaticText
+  // ++++++9 kInlineTextBox baz
+  ui::AXNodeData root_1;
+  ui::AXNodeData static_text_2;
+  ui::AXNodeData inline_box_3;
+  ui::AXNodeData splitter_4;
+  ui::AXNodeData static_text_5;
+  ui::AXNodeData inline_box_6;
+  ui::AXNodeData generic_container_7;
+  ui::AXNodeData static_text_8;
+  ui::AXNodeData inline_box_9;
+
+  root_1.id = 1;
+  static_text_2.id = 2;
+  inline_box_3.id = 3;
+  splitter_4.id = 4;
+  static_text_5.id = 5;
+  inline_box_6.id = 6;
+  generic_container_7.id = 7;
+  static_text_8.id = 8;
+  inline_box_9.id = 9;
+
+  root_1.role = ax::mojom::Role::kRootWebArea;
+  root_1.child_ids = {static_text_2.id, splitter_4.id, static_text_5.id,
+                      generic_container_7.id, static_text_8.id};
+
+  static_text_2.role = ax::mojom::Role::kStaticText;
+  static_text_2.child_ids = {inline_box_3.id};
+  static_text_2.SetName("foo");
+
+  inline_box_3.role = ax::mojom::Role::kInlineTextBox;
+  inline_box_3.SetName("foo");
+
+  splitter_4.role = ax::mojom::Role::kSplitter;
+  splitter_4.AddBoolAttribute(ax::mojom::BoolAttribute::kIsLineBreakingObject,
+                              true);
+
+  static_text_5.role = ax::mojom::Role::kStaticText;
+  static_text_5.child_ids = {inline_box_6.id};
+  static_text_5.SetName("bar");
+
+  inline_box_6.role = ax::mojom::Role::kInlineTextBox;
+  inline_box_6.SetName("bar");
+
+  generic_container_7.role = ax::mojom::Role::kGenericContainer;
+  generic_container_7.AddBoolAttribute(
+      ax::mojom::BoolAttribute::kIsLineBreakingObject, true);
+
+  static_text_8.role = ax::mojom::Role::kStaticText;
+  static_text_8.child_ids = {inline_box_9.id};
+  static_text_8.SetName("bar");
+
+  inline_box_9.role = ax::mojom::Role::kInlineTextBox;
+  inline_box_9.SetName("baz");
+
+  ui::AXTreeUpdate update;
+  ui::AXTreeData tree_data;
+  tree_data.tree_id = ui::AXTreeID::CreateNewAXTreeID();
+  update.tree_data = tree_data;
+  update.has_tree_data = true;
+  update.root_id = root_1.id;
+  update.nodes = {
+      root_1,        static_text_2, inline_box_3,        splitter_4,
+      static_text_5, inline_box_6,  generic_container_7, static_text_8,
+      inline_box_9};
+
+  Init(update);
+
+  AXNode* root_node = GetRootAsAXNode();
+  ComPtr<ITextRangeProvider> text_range_provider;
+  GetTextRangeProviderFromTextNode(text_range_provider, root_node);
+
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider,
+                          L"foo\n\xFFFC\nbar\n\xFFFC\nbaz");
+
+  int count;
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_Start, TextUnit_Paragraph, /*count*/ 1, &count));
+  ASSERT_EQ(1, count);
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"bar\n\xFFFC\nbaz");
+
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_Start, TextUnit_Paragraph, /*count*/ 1, &count));
+  ASSERT_EQ(1, count);
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"baz");
+}
+
+// TODO(schectman) Segfault after test completes.
+// Why? https://github.com/flutter/flutter/issues/117012
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       DISABLED_TestITextRangeProviderInvalidCalls) {
+  // Test for when a text range provider is invalid. Because no ax tree is
+  // available, the anchor is invalid, so the text range provider fails the
+  // validate call.
+  {
+    Init(BuildTextDocument({}));
+
+    ComPtr<ITextRangeProvider> text_range_provider;
+    GetTextRangeProviderFromTextNode(text_range_provider, GetRootAsAXNode());
+
+    DestroyTree();
+    ComPtr<ITextRangeProvider> text_range_provider_clone;
+    EXPECT_UIA_ELEMENTNOTAVAILABLE(
+        text_range_provider->Clone(&text_range_provider_clone));
+
+    BOOL compare_result;
+    EXPECT_UIA_ELEMENTNOTAVAILABLE(text_range_provider->Compare(
+        text_range_provider.Get(), &compare_result));
+
+    int compare_endpoints_result;
+    EXPECT_UIA_ELEMENTNOTAVAILABLE(text_range_provider->CompareEndpoints(
+        TextPatternRangeEndpoint_Start, text_range_provider.Get(),
+        TextPatternRangeEndpoint_Start, &compare_endpoints_result));
+
+    VARIANT attr_val;
+    V_VT(&attr_val) = VT_BOOL;
+    V_BOOL(&attr_val) = VARIANT_TRUE;
+    ComPtr<ITextRangeProvider> matched_range_provider;
+    EXPECT_UIA_ELEMENTNOTAVAILABLE(text_range_provider->FindAttribute(
+        UIA_IsHiddenAttributeId, attr_val, true, &matched_range_provider));
+
+    EXPECT_UIA_ELEMENTNOTAVAILABLE(text_range_provider->MoveEndpointByRange(
+        TextPatternRangeEndpoint_Start, text_range_provider.Get(),
+        TextPatternRangeEndpoint_Start));
+
+    EXPECT_UIA_ELEMENTNOTAVAILABLE(text_range_provider->Select());
+  }
+
+  // Test for when this provider is valid, but the other provider is not an
+  // instance of AXPlatformNodeTextRangeProviderWin, so no operation can be
+  // performed on the other provider.
+  {
+    Init(BuildTextDocument({}));
+
+    ComPtr<ITextRangeProvider> this_provider;
+    GetTextRangeProviderFromTextNode(this_provider, GetRootAsAXNode());
+
+    ComPtr<ITextRangeProvider> other_provider_different_type;
+    MockAXPlatformNodeTextRangeProviderWin::CreateMockTextRangeProvider(
+        &other_provider_different_type);
+
+    BOOL compare_result;
+    EXPECT_UIA_INVALIDOPERATION(this_provider->Compare(
+        other_provider_different_type.Get(), &compare_result));
+
+    int compare_endpoints_result;
+    EXPECT_UIA_INVALIDOPERATION(this_provider->CompareEndpoints(
+        TextPatternRangeEndpoint_Start, other_provider_different_type.Get(),
+        TextPatternRangeEndpoint_Start, &compare_endpoints_result));
+
+    EXPECT_UIA_INVALIDOPERATION(this_provider->MoveEndpointByRange(
+        TextPatternRangeEndpoint_Start, other_provider_different_type.Get(),
+        TextPatternRangeEndpoint_Start));
+  }
+}
+
+TEST_F(AXPlatformNodeTextRangeProviderTest, TestITextRangeProviderGetText) {
+  Init(BuildTextDocument({"some text", "more text"}));
+
+  AXNode* root_node = GetRootAsAXNode();
+  AXNode* text_node = root_node->children()[0];
+
+  ComPtr<ITextRangeProvider> text_range_provider;
+  GetTextRangeProviderFromTextNode(text_range_provider, text_node);
+
+  base::win::ScopedBstr text_content;
+  EXPECT_HRESULT_SUCCEEDED(
+      text_range_provider->GetText(-1, text_content.Receive()));
+  EXPECT_STREQ(text_content.Get(), L"some text");
+  text_content.Reset();
+
+  EXPECT_HRESULT_SUCCEEDED(
+      text_range_provider->GetText(4, text_content.Receive()));
+  EXPECT_STREQ(text_content.Get(), L"some");
+  text_content.Reset();
+
+  EXPECT_HRESULT_SUCCEEDED(
+      text_range_provider->GetText(0, text_content.Receive()));
+  EXPECT_STREQ(text_content.Get(), L"");
+  text_content.Reset();
+
+  EXPECT_HRESULT_SUCCEEDED(
+      text_range_provider->GetText(9, text_content.Receive()));
+  EXPECT_STREQ(text_content.Get(), L"some text");
+  text_content.Reset();
+
+  EXPECT_HRESULT_SUCCEEDED(
+      text_range_provider->GetText(10, text_content.Receive()));
+  EXPECT_STREQ(text_content.Get(), L"some text");
+  text_content.Reset();
+
+  EXPECT_HRESULT_FAILED(text_range_provider->GetText(-1, nullptr));
+
+  EXPECT_HRESULT_FAILED(
+      text_range_provider->GetText(-2, text_content.Receive()));
+  text_content.Reset();
+
+  ComPtr<ITextRangeProvider> document_textrange;
+  GetTextRangeProviderFromTextNode(document_textrange, root_node);
+
+  EXPECT_HRESULT_SUCCEEDED(
+      document_textrange->GetText(-1, text_content.Receive()));
+  EXPECT_STREQ(text_content.Get(), L"some textmore text");
+  text_content.Reset();
+}
+
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       TestITextRangeProviderMoveCharacter) {
+  Init(BuildAXTreeForMove());
+  AXNode* root_node = GetRootAsAXNode();
+
+  ComPtr<ITextRangeProvider> text_range_provider;
+  GetTextRangeProviderFromTextNode(text_range_provider, root_node);
+
+  // Moving by 0 should have no effect.
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Character, /*count*/ 0,
+                  /*expected_text*/
+                  L"First line of text\nStandalone line\n"
+                  L"bold textParagraph 1Paragraph 2",
+                  /*expected_count*/ 0);
+
+  // Move forward.
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Character,
+                  /*count*/ 1,
+                  /*expected_text*/ L"i",
+                  /*expected_count*/ 1);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Character,
+                  /*count*/ 18,
+                  /*expected_text*/ L"S",
+                  /*expected_count*/ 18);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Character,
+                  /*count*/ 16,
+                  /*expected_text*/ L"b",
+                  /*expected_count*/ 16);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Character,
+                  /*count*/ 60,
+                  /*expected_text*/ L"2",
+                  /*expected_count*/ 30);
+
+  // Trying to move past the last character should have no effect.
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Character,
+                  /*count*/ 1,
+                  /*expected_text*/ L"2",
+                  /*expected_count*/ 0);
+
+  // Move backward.
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Character,
+                  /*count*/ -2,
+                  /*expected_text*/ L"h",
+                  /*expected_count*/ -2);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Character,
+                  /*count*/ -9,
+                  /*expected_text*/ L"1",
+                  /*expected_count*/ -9);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Character,
+                  /*count*/ -60,
+                  /*expected_text*/ L"F",
+                  /*expected_count*/ -54);
+
+  // Moving backward by any number of characters at the start of document
+  // should have no effect.
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Character,
+                  /*count*/ -1,
+                  /*expected_text*/
+                  L"F",
+                  /*expected_count*/ 0);
+
+  // Degenerate range moves.
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_End, TextUnit_Character,
+      /*count*/ -1,
+      /*expected_text*/ L"",
+      /*expected_count*/ -1);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Character,
+                  /*count*/ 4,
+                  /*expected_text*/ L"",
+                  /*expected_count*/ 4);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Character,
+                  /*count*/ 70,
+                  /*expected_text*/ L"",
+                  /*expected_count*/ 62);
+
+  // Trying to move past the last character should have no effect.
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Character,
+                  /*count*/ 70,
+                  /*expected_text*/ L"",
+                  /*expected_count*/ 0);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Character,
+                  /*count*/ -2,
+                  /*expected_text*/ L"",
+                  /*expected_count*/ -2);
+}
+
+// TODO(schectman) https://github.com/flutter/flutter/issues/117012
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       DISABLED_TestITextRangeProviderMoveFormat) {
+  Init(BuildAXTreeForMoveByFormat());
+  AXNode* root_node = GetRootAsAXNode();
+
+  ComPtr<ITextRangeProvider> text_range_provider;
+  GetTextRangeProviderFromTextNode(text_range_provider, root_node);
+
+  // Moving by 0 should have no effect.
+  EXPECT_UIA_MOVE(
+      text_range_provider, TextUnit_Format,
+      /*count*/ 0,
+      /*expected_text*/
+      L"Text with formatting\nStandalone line with no formatting\nbold "
+      L"text\nParagraph 1\nParagraph 2\nParagraph 3\nParagraph 4",
+      /*expected_count*/ 0);
+
+  // Move forward.
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Format,
+                  /*count*/ 1,
+                  /*expected_text*/ L"\nStandalone line with no formatting\n",
+                  /*expected_count*/ 1);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Format,
+                  /*count*/ 2,
+                  /*expected_text*/ L"Paragraph 1",
+                  /*expected_count*/ 2);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Format,
+                  /*count*/ 1,
+                  /*expected_text*/ L"Paragraph 2\nParagraph 3",
+                  /*expected_count*/ 1);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Format,
+                  /*count*/ 1,
+                  /*expected_text*/ L"Paragraph 4",
+                  /*expected_count*/ 1);
+
+  // Trying to move past the last format should have no effect.
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Format,
+                  /*count*/ 1,
+                  /*expected_text*/ L"Paragraph 4",
+                  /*expected_count*/ 0);
+
+  // Move backward.
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Format,
+                  /*count*/ -3,
+                  /*expected_text*/ L"bold text",
+                  /*expected_count*/ -3);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Format,
+                  /*count*/ -1,
+                  /*expected_text*/ L"\nStandalone line with no formatting\n",
+                  /*expected_count*/ -1);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Format,
+                  /*count*/ -1,
+                  /*expected_text*/ L"Text with formatting",
+                  /*expected_count*/ -1);
+
+  // Moving backward by any number of formats at the start of document
+  // should have no effect.
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Format,
+                  /*count*/ -1,
+                  /*expected_text*/
+                  L"Text with formatting",
+                  /*expected_count*/ 0);
+
+  // Test degenerate range creation at the beginning of the document.
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_End, TextUnit_Format,
+      /*count*/ -1,
+      /*expected_text*/ L"",
+      /*expected_count*/ -1);
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_End, TextUnit_Format,
+      /*count*/ 1,
+      /*expected_text*/ L"Text with formatting",
+      /*expected_count*/ 1);
+
+  // Test degenerate range creation at the end of the document.
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Format,
+                  /*count*/ 5,
+                  /*expected_text*/ L"Paragraph 4",
+                  /*expected_count*/ 5);
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_Start, TextUnit_Format,
+      /*count*/ 1,
+      /*expected_text*/ L"",
+      /*expected_count*/ 1);
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_Start, TextUnit_Format,
+      /*count*/ -1,
+      /*expected_text*/ L"Paragraph 4",
+      /*expected_count*/ -1);
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_Start, TextUnit_Format,
+      /*count*/ 1,
+      /*expected_text*/ L"",
+      /*expected_count*/ 1);
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_Start, TextUnit_Format,
+      /*count*/ -1,
+      /*expected_text*/ L"Paragraph 4",
+      /*expected_count*/ -1);
+
+  // Degenerate range moves.
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Format,
+                  /*count*/ -5,
+                  /*expected_text*/ L"Text with formatting",
+                  /*expected_count*/ -5);
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_End, TextUnit_Format,
+      /*count*/ -1,
+      /*expected_text*/ L"",
+      /*expected_count*/ -1);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Format,
+                  /*count*/ 3,
+                  /*expected_text*/ L"",
+                  /*expected_count*/ 3);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Format,
+                  /*count*/ 70,
+                  /*expected_text*/ L"",
+                  /*expected_count*/ 3);
+
+  // Trying to move past the last format should have no effect.
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Format,
+                  /*count*/ 70,
+                  /*expected_text*/ L"",
+                  /*expected_count*/ 0);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Format,
+                  /*count*/ -2,
+                  /*expected_text*/ L"",
+                  /*expected_count*/ -2);
+}
+
+// TODO(schectman) https://github.com/flutter/flutter/issues/117012
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       DISABLED_TestITextRangeProviderMoveWord) {
+  Init(BuildAXTreeForMove());
+  AXNode* root_node = GetRootAsAXNode();
+
+  ComPtr<ITextRangeProvider> text_range_provider;
+  GetTextRangeProviderFromTextNode(text_range_provider, root_node);
+
+  // Moving by 0 should have no effect.
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Word, /*count*/ 0,
+                  /*expected_text*/ tree_for_move_full_text.data(),
+                  /*expected_count*/ 0);
+
+  // Move forward.
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Word,
+                  /*count*/ 1,
+                  /*expected_text*/ L"line ",
+                  /*expected_count*/ 1);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Word,
+                  /*count*/ 2,
+                  /*expected_text*/ L"text",
+                  /*expected_count*/ 2);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Word,
+                  /*count*/ 2,
+                  /*expected_text*/ L"line",
+                  /*expected_count*/ 2);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Word,
+                  /*count*/ 3,
+                  /*expected_text*/ L"Paragraph ",
+                  /*expected_count*/ 3);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Word,
+                  /*count*/ 6,
+                  /*expected_text*/ L"2",
+                  /*expected_count*/ 3);
+
+  // Trying to move past the last word should have no effect.
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Word,
+                  /*count*/ 1,
+                  /*expected_text*/ L"2",
+                  /*expected_count*/ 0);
+
+  // Move backward.
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Word,
+                  /*count*/ -3,
+                  /*expected_text*/ L"Paragraph ",
+                  /*expected_count*/ -3);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Word,
+                  /*count*/ -3,
+                  /*expected_text*/ L"line",
+                  /*expected_count*/ -3);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Word,
+                  /*count*/ -2,
+                  /*expected_text*/ L"text",
+                  /*expected_count*/ -2);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Word,
+                  /*count*/ -6,
+                  /*expected_text*/ L"First ",
+                  /*expected_count*/ -3);
+
+  // Moving backward by any number of words at the start of document
+  // should have no effect.
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Word,
+                  /*count*/ -20,
+                  /*expected_text*/ L"First ",
+                  /*expected_count*/ 0);
+
+  // Degenerate range moves.
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(text_range_provider,
+                                   TextPatternRangeEndpoint_End, TextUnit_Word,
+                                   /*count*/ -1,
+                                   /*expected_text*/ L"",
+                                   /*expected_count*/ -1);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Word,
+                  /*count*/ 4,
+                  /*expected_text*/ L"",
+                  /*expected_count*/ 4);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Word,
+                  /*count*/ 70,
+                  /*expected_text*/ L"",
+                  /*expected_count*/ 8);
+
+  // Trying to move past the last word should have no effect.
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Word,
+                  /*count*/ 70,
+                  /*expected_text*/ L"",
+                  /*expected_count*/ 0);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Word,
+                  /*count*/ -2,
+                  /*expected_text*/ L"",
+                  /*expected_count*/ -2);
+}
+
+// TODO(schectman) https://github.com/flutter/flutter/issues/117012
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       DISABLED_TestITextRangeProviderMoveLine) {
+  Init(BuildAXTreeForMove());
+  AXNode* root_node = GetRootAsAXNode();
+
+  ComPtr<ITextRangeProvider> text_range_provider;
+  GetTextRangeProviderFromTextNode(text_range_provider, root_node);
+
+  // Moving by 0 should have no effect.
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Line, /*count*/ 0,
+                  /*expected_text*/ tree_for_move_full_text.data(),
+                  /*expected_count*/ 0);
+
+  // Move forward.
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Line,
+                  /*count*/ 2,
+                  /*expected_text*/ L"Standalone line",
+                  /*expected_count*/ 2);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Line,
+                  /*count*/ 1,
+                  /*expected_text*/ L"bold text",
+                  /*expected_count*/ 1);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Line,
+                  /*count*/ 10,
+                  /*expected_text*/ L"Paragraph 2",
+                  /*expected_count*/ 2);
+
+  // Trying to move past the last line should have no effect.
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Line,
+                  /*count*/ 1,
+                  /*expected_text*/ L"Paragraph 2",
+                  /*expected_count*/ 0);
+
+  // Move backward.
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Line,
+                  /*count*/ -1,
+                  /*expected_text*/ L"Paragraph 1",
+                  /*expected_count*/ -1);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Line,
+                  /*count*/ -5,
+                  /*expected_text*/ L"First line of text",
+                  /*expected_count*/ -4);
+
+  // Moving backward by any number of lines at the start of document
+  // should have no effect.
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Line,
+                  /*count*/ -20,
+                  /*expected_text*/ L"First line of text",
+                  /*expected_count*/ 0);
+
+  // Degenerate range moves.
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(text_range_provider,
+                                   TextPatternRangeEndpoint_End, TextUnit_Line,
+                                   /*count*/ -1,
+                                   /*expected_text*/ L"",
+                                   /*expected_count*/ -1);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Line,
+                  /*count*/ 4,
+                  /*expected_text*/ L"",
+                  /*expected_count*/ 4);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Line,
+                  /*count*/ 70,
+                  /*expected_text*/ L"",
+                  /*expected_count*/ 2);
+
+  // Trying to move past the last line should have no effect.
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Line,
+                  /*count*/ 70,
+                  /*expected_text*/ L"",
+                  /*expected_count*/ 0);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Line,
+                  /*count*/ -2,
+                  /*expected_text*/ L"",
+                  /*expected_count*/ -2);
+}
+
+// TODO(schectman) https://github.com/flutter/flutter/issues/117012
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       DISABLED_TestITextRangeProviderMoveParagraph) {
+  Init(BuildAXTreeForMove());
+  AXNode* root_node = GetRootAsAXNode();
+
+  ComPtr<ITextRangeProvider> text_range_provider;
+  GetTextRangeProviderFromTextNode(text_range_provider, root_node);
+
+  // Moving by 0 should have no effect.
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Paragraph, /*count*/ 0,
+                  /*expected_text*/ tree_for_move_full_text.data(),
+                  /*expected_count*/ 0);
+
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_End, TextUnit_Paragraph,
+      /*count*/ -4,
+      /*expected_text*/ L"First line of text\n",
+      /*expected_count*/ -4);
+
+  // The first line break does not create an empty paragraph because even though
+  // it is in a block element (i.e. a kGenericContainer) of its own which is a
+  // line breaking object, it merges with the previous paragraph. This is
+  // standard UIA behavior which merges any trailing whitespace with the
+  // previous paragraph.
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_End, TextUnit_Paragraph,
+      /*count*/ -1,
+      /*expected_text*/ L"",
+      /*expected_count*/ -1);
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_End, TextUnit_Paragraph,
+      /*count*/ 1,
+      /*expected_text*/ L"First line of text\n",
+      /*expected_count*/ 1);
+
+  //
+  // Move forward.
+  //
+
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Paragraph,
+                  /*count*/ 1,
+                  /*expected_text*/ L"Standalone line\n",
+                  /*expected_count*/ 1);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Paragraph,
+                  /*count*/ 1,
+                  /*expected_text*/ L"bold text\n",
+                  /*expected_count*/ 1);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Paragraph,
+                  /*count*/ 1,
+                  /*expected_text*/ L"Paragraph 1\n",
+                  /*expected_count*/ 1);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Paragraph,
+                  /*count*/ 1,
+                  /*expected_text*/ L"Paragraph 2",
+                  /*expected_count*/ 1);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Paragraph,
+                  /*count*/ 2,
+                  /*expected_text*/ L"Paragraph 2",
+                  /*expected_count*/ 0);
+
+  // Trying to move past the last paragraph should have no effect.
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Paragraph,
+                  /*count*/ 1,
+                  /*expected_text*/ L"Paragraph 2",
+                  /*expected_count*/ 0);
+
+  //
+  // Move backward.
+  //
+
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Paragraph,
+                  /*count*/ -1,
+                  /*expected_text*/ L"Paragraph 1\n",
+                  /*expected_count*/ -1);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Paragraph,
+                  /*count*/ -1,
+                  /*expected_text*/ L"bold text\n",
+                  /*expected_count*/ -1);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Paragraph,
+                  /*count*/ -1,
+                  /*expected_text*/ L"Standalone line\n",
+                  /*expected_count*/ -1);
+  // The first line break creates an empty paragraph because it is in a block
+  // element (i.e. a kGenericContainer) of its own which is a line breaking
+  // object. It's like having a <br> element wrapped inside a <div>.
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Paragraph,
+                  /*count*/ -1,
+                  /*expected_text*/ L"First line of text\n",
+                  /*expected_count*/ -1);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Paragraph,
+                  /*count*/ -1,
+                  /*expected_text*/ L"First line of text\n",
+                  /*expected_count*/ 0);
+
+  // Moving backward by any number of paragraphs at the start of document
+  // should have no effect.
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Paragraph,
+                  /*count*/ -1,
+                  /*expected_text*/ L"First line of text\n",
+                  /*expected_count*/ 0);
+
+  // Test degenerate range creation at the beginning of the document.
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_End, TextUnit_Paragraph,
+      /*count*/ -1,
+      /*expected_text*/ L"",
+      /*expected_count*/ -1);
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_End, TextUnit_Paragraph,
+      /*count*/ 1,
+      /*expected_text*/ L"First line of text\n",
+      /*expected_count*/ 1);
+
+  // Test degenerate range creation at the end of the document.
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Paragraph,
+                  /*count*/ 5,
+                  /*expected_text*/ L"Paragraph 2",
+                  /*expected_count*/ 4);
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_Start, TextUnit_Paragraph,
+      /*count*/ 1,
+      /*expected_text*/ L"",
+      /*expected_count*/ 1);
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_Start, TextUnit_Paragraph,
+      /*count*/ -1,
+      /*expected_text*/ L"Paragraph 2",
+      /*expected_count*/ -1);
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_Start, TextUnit_Paragraph,
+      /*count*/ 1,
+      /*expected_text*/ L"",
+      /*expected_count*/ 1);
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_Start, TextUnit_Paragraph,
+      /*count*/ -1,
+      /*expected_text*/ L"Paragraph 2",
+      /*expected_count*/ -1);
+
+  //
+  // Degenerate range moves.
+  //
+
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Paragraph,
+                  /*count*/ -6,
+                  /*expected_text*/ L"First line of text\n",
+                  /*expected_count*/ -4);
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_End, TextUnit_Paragraph,
+      /*count*/ -1,
+      /*expected_text*/ L"",
+      /*expected_count*/ -1);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Paragraph,
+                  /*count*/ 3,
+                  /*expected_text*/ L"",
+                  /*expected_count*/ 3);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Paragraph,
+                  /*count*/ 70,
+                  /*expected_text*/ L"",
+                  /*expected_count*/ 2);
+
+  // Trying to move past the last paragraph should have no effect.
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Paragraph,
+                  /*count*/ 70,
+                  /*expected_text*/ L"",
+                  /*expected_count*/ 0);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Paragraph,
+                  /*count*/ -2,
+                  /*expected_text*/ L"",
+                  /*expected_count*/ -2);
+}
+
+// TODO(schectman) https://github.com/flutter/flutter/issues/117012
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       DISABLED_TestITextRangeProviderMoveDocument) {
+  Init(BuildAXTreeForMove());
+  AXNode* root_node = GetRootAsAXNode();
+
+  ComPtr<ITextRangeProvider> text_range_provider;
+  GetTextRangeProviderFromTextNode(text_range_provider, root_node);
+
+  // Moving by 0 should have no effect.
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Document, /*count*/ 0,
+                  /*expected_text*/ tree_for_move_full_text.data(),
+                  /*expected_count*/ 0);
+
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Document, /*count*/ -1,
+                  /*expected_text*/ tree_for_move_full_text.data(),
+                  /*expected_count*/ 0);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Document, /*count*/ 2,
+                  /*expected_text*/ tree_for_move_full_text.data(),
+                  /*expected_count*/ 0);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Page, /*count*/ 1,
+                  /*expected_text*/ tree_for_move_full_text.data(),
+                  /*expected_count*/ 0);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Page, /*count*/ -1,
+                  /*expected_text*/ tree_for_move_full_text.data(),
+                  /*expected_count*/ 0);
+
+  // Degenerate range moves.
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_End, TextUnit_Document,
+      /*count*/ -2,
+      /*expected_text*/ L"",
+      /*expected_count*/ -1);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Page,
+                  /*count*/ 4,
+                  /*expected_text*/ L"",
+                  /*expected_count*/ 1);
+
+  // Trying to move past the last character should have no effect.
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Document,
+                  /*count*/ 1,
+                  /*expected_text*/ L"",
+                  /*expected_count*/ 0);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Page,
+                  /*count*/ -2,
+                  /*expected_text*/ L"",
+                  /*expected_count*/ -1);
+  EXPECT_UIA_MOVE(text_range_provider, TextUnit_Document,
+                  /*count*/ -1,
+                  /*expected_text*/ L"",
+                  /*expected_count*/ 0);
+}
+
+TEST_F(AXPlatformNodeTextRangeProviderTest, TestITextRangeProviderMove) {
+  Init(BuildAXTreeForMove());
+  AXNode* root_node = GetRootAsAXNode();
+
+  ComPtr<ITextRangeProvider> text_range_provider;
+  GetTextRangeProviderFromTextNode(text_range_provider, root_node);
+
+  // TODO(https://crbug.com/928948): test intermixed unit types
+}
+
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       TestITextRangeProviderMoveEndpointByDocument) {
+  Init(BuildTextDocument({"some text", "more text", "even more text"}));
+  AXNode* text_node = GetRootAsAXNode()->children()[1];
+
+  // Run the test twice, one for TextUnit_Document and once for TextUnit_Page,
+  // since they should have identical behavior.
+  const TextUnit textunit_types[] = {TextUnit_Document, TextUnit_Page};
+  ComPtr<ITextRangeProvider> text_range_provider;
+
+  for (auto& textunit : textunit_types) {
+    GetTextRangeProviderFromTextNode(text_range_provider, text_node);
+
+    // Verify MoveEndpointByUnit with zero count has no effect
+    EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(text_range_provider,
+                                     TextPatternRangeEndpoint_End, textunit,
+                                     /*count*/ 0,
+                                     /*expected_text*/ L"more text",
+                                     /*expected_count*/ 0);
+
+    // Move the endpoint to the end of the document. Verify all text content.
+    EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+        text_range_provider, TextPatternRangeEndpoint_End, textunit,
+        /*count*/ 1,
+        /*expected_text*/ L"more texteven more text",
+        /*expected_count*/ 1);
+
+    // Verify no moves occur since the end is already at the end of the document
+    EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+        text_range_provider, TextPatternRangeEndpoint_End, textunit,
+        /*count*/ 5,
+        /*expected_text*/ L"more texteven more text",
+        /*expected_count*/ 0);
+
+    // Move the end before the start
+    EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(text_range_provider,
+                                     TextPatternRangeEndpoint_End, textunit,
+                                     /*count*/ -4,
+                                     /*expected_text*/ L"",
+                                     /*expected_count*/ -1);
+
+    // Move the end back to the end of the document. The text content
+    // should now include the entire document since end was previously
+    // moved before start.
+    EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+        text_range_provider, TextPatternRangeEndpoint_End, textunit,
+        /*count*/ 1,
+        /*expected_text*/ L"some textmore texteven more text",
+        /*expected_count*/ 1);
+
+    // Move the start point to the end
+    EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(text_range_provider,
+                                     TextPatternRangeEndpoint_Start, textunit,
+                                     /*count*/ 3,
+                                     /*expected_text*/ L"",
+                                     /*expected_count*/ 1);
+
+    // Move the start point back to the beginning
+    EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+        text_range_provider, TextPatternRangeEndpoint_Start, textunit,
+        /*count*/ -3,
+        /*expected_text*/ L"some textmore texteven more text",
+        /*expected_count*/ -1);
+  }
+}
+
+// TODO(schectman) We are probably not accounting for multibyte characters
+// properly yet. https://github.com/flutter/flutter/issues/117012
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       DISABLED_TestITextRangeProviderMoveEndpointByCharacterMultilingual) {
+  // The English string has three characters, each 8 bits in length.
+  const std::string english = "hey";
+
+  // The Hindi string has two characters, the first one 32 bits and the second
+  // 64 bits in length. It is formatted in UTF16.
+  const std::string hindi =
+      base::UTF16ToUTF8(u"\x0939\x093F\x0928\x094D\x0926\x0940");
+
+  // The Thai string has three characters, the first one 48, the second 32 and
+  // the last one 16 bits in length. It is formatted in UTF16.
+  const std::string thai =
+      base::UTF16ToUTF8(u"\x0E23\x0E39\x0E49\x0E2A\x0E36\x0E01");
+
+  Init(BuildTextDocument({english, hindi, thai}));
+
+  ComPtr<ITextRangeProvider> text_range_provider;
+  GetTextRangeProviderFromTextNode(text_range_provider,
+                                   GetRootAsAXNode()->children()[0]);
+
+  // Verify MoveEndpointByUnit with zero count has no effect
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"hey");
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_Start, TextUnit_Character,
+      /*count*/ 0,
+      /*expected_text*/ L"hey",
+      /*expected_count*/ 0);
+
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_Start, TextUnit_Character,
+      /*count*/ 1,
+      /*expected_text*/ L"ey",
+      /*expected_count*/ 1);
+
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_End, TextUnit_Character,
+      /*count*/ -1,
+      /*expected_text*/ L"e",
+      /*expected_count*/ -1);
+
+  // Move end into the adjacent node.
+  //
+  // The first character of the second node is 32 bits in length.
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_End, TextUnit_Character,
+      /*count*/ 2,
+      /*expected_text*/ L"ey\x0939\x093F",
+      /*expected_count*/ 2);
+
+  // The second character of the second node is 64 bits in length.
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_End, TextUnit_Character,
+      /*count*/ 1,
+      /*expected_text*/ L"ey\x939\x93F\x928\x94D\x926\x940",
+      /*expected_count*/ 1);
+
+  // Move start into the adjacent node as well.
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_Start, TextUnit_Character,
+      /*count*/ 2,
+      /*expected_text*/ L"\x939\x93F\x928\x94D\x926\x940",
+      /*expected_count*/ 2);
+
+  // Move end into the last node.
+  //
+  // The first character of the last node is 48 bits in length.
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_End, TextUnit_Character,
+      /*count*/ 1,
+      /*expected_text*/ L"\x939\x93F\x928\x94D\x926\x940\xE23\xE39\xE49",
+      /*expected_count*/ 1);
+
+  // Move end back into the second node and then into the last node again.
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_End, TextUnit_Character,
+      /*count*/ -2,
+      /*expected_text*/ L"\x939\x93F",
+      /*expected_count*/ -2);
+
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_End, TextUnit_Character,
+      /*count*/ 3,
+      /*expected_text*/
+      L"\x939\x93F\x928\x94D\x926\x940\xE23\xE39\xE49\xE2A\xE36",
+      /*expected_count*/ 3);
+
+  // The last character of the last node is only 16 bits in length.
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_End, TextUnit_Character,
+      /*count*/ 1,
+      /*expected_text*/
+      L"\x939\x93F\x928\x94D\x926\x940\xE23\xE39\xE49\xE2A\xE36\xE01",
+      /*expected_count*/ 1);
+
+  // Move start into the last node.
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_Start, TextUnit_Character,
+      /*count*/ 3,
+      /*expected_text*/ L"\x0E2A\x0E36\x0E01",
+      /*expected_count*/ 3);
+
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_Start, TextUnit_Character,
+      /*count*/ -1,
+      /*expected_text*/ L"\x0E23\x0E39\x0E49\x0E2A\x0E36\x0E01",
+      /*expected_count*/ -1);
+}
+
+// TODO(schectman) https://github.com/flutter/flutter/issues/117012
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       DISABLED_TestITextRangeProviderMoveEndpointByWord) {
+  Init(BuildTextDocument({"some text", "more text", "even more text"},
+                         /*build_word_boundaries_offsets*/ true));
+
+  ComPtr<ITextRangeProvider> text_range_provider;
+  GetTextRangeProviderFromTextNode(text_range_provider,
+                                   GetRootAsAXNode()->children()[1]);
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"more text");
+
+  // Moving with zero count does not alter the range.
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(text_range_provider,
+                                   TextPatternRangeEndpoint_End, TextUnit_Word,
+                                   /*count*/ 0,
+                                   /*expected_text*/ L"more text",
+                                   /*expected_count*/ 0);
+
+  // Moving the start forward and backward.
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_Start, TextUnit_Word,
+      /*count*/ 1,
+      /*expected_text*/ L"text",
+      /*expected_count*/ 1);
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_Start, TextUnit_Word,
+      /*count*/ -1,
+      /*expected_text*/ L"more text",
+      /*expected_count*/ -1);
+
+  // Moving the end backward and forward.
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(text_range_provider,
+                                   TextPatternRangeEndpoint_End, TextUnit_Word,
+                                   /*count*/ -1,
+                                   /*expected_text*/ L"more ",
+                                   /*expected_count*/ -1);
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(text_range_provider,
+                                   TextPatternRangeEndpoint_End, TextUnit_Word,
+                                   /*count*/ 1,
+                                   /*expected_text*/ L"more text",
+                                   /*expected_count*/ 1);
+
+  // Moving the start past the end, then reverting.
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_Start, TextUnit_Word,
+      /*count*/ 3,
+      /*expected_text*/ L"",
+      /*expected_count*/ 3);
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_Start, TextUnit_Word,
+      /*count*/ -3,
+      /*expected_text*/ L"more texteven ",
+      /*expected_count*/ -3);
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(text_range_provider,
+                                   TextPatternRangeEndpoint_End, TextUnit_Word,
+                                   /*count*/ -1,
+                                   /*expected_text*/ L"more text",
+                                   /*expected_count*/ -1);
+
+  // Moving the end past the start, then reverting.
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(text_range_provider,
+                                   TextPatternRangeEndpoint_End, TextUnit_Word,
+                                   /*count*/ -3,
+                                   /*expected_text*/ L"",
+                                   /*expected_count*/ -3);
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(text_range_provider,
+                                   TextPatternRangeEndpoint_End, TextUnit_Word,
+                                   /*count*/ 3,
+                                   /*expected_text*/ L"textmore text",
+                                   /*expected_count*/ 3);
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_Start, TextUnit_Word,
+      /*count*/ 1,
+      /*expected_text*/ L"more text",
+      /*expected_count*/ 1);
+
+  // Moving the endpoints further than both ends of the document.
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(text_range_provider,
+                                   TextPatternRangeEndpoint_End, TextUnit_Word,
+                                   /*count*/ 5,
+                                   /*expected_text*/ L"more texteven more text",
+                                   /*expected_count*/ 3);
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_Start, TextUnit_Word,
+      /*count*/ 6,
+      /*expected_text*/ L"",
+      /*expected_count*/ 5);
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_Start, TextUnit_Word,
+      /*count*/ -8,
+      /*expected_text*/ L"some textmore texteven more text",
+      /*expected_count*/ -7);
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(text_range_provider,
+                                   TextPatternRangeEndpoint_End, TextUnit_Word,
+                                   /*count*/ -8,
+                                   /*expected_text*/ L"",
+                                   /*expected_count*/ -7);
+}
+
+// TODO(schectman) https://github.com/flutter/flutter/issues/117012
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       DISABLED_TestITextRangeProviderMoveEndpointByLine) {
+  Init(BuildTextDocument({"0", "1", "2", "3", "4", "5", "6"}));
+
+  ComPtr<ITextRangeProvider> text_range_provider;
+  GetTextRangeProviderFromTextNode(text_range_provider,
+                                   GetRootAsAXNode()->children()[3]);
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"3");
+
+  // Moving with zero count does not alter the range.
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(text_range_provider,
+                                   TextPatternRangeEndpoint_End, TextUnit_Line,
+                                   /*count*/ 0,
+                                   /*expected_text*/ L"3",
+                                   /*expected_count*/ 0);
+
+  // Moving the start backward and forward.
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_Start, TextUnit_Line,
+      /*count*/ -2,
+      /*expected_text*/ L"123",
+      /*expected_count*/ -2);
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_Start, TextUnit_Line,
+      /*count*/ 1,
+      /*expected_text*/ L"23",
+      /*expected_count*/ 1);
+
+  // Moving the end forward and backward.
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(text_range_provider,
+                                   TextPatternRangeEndpoint_End, TextUnit_Line,
+                                   /*count*/ 3,
+                                   /*expected_text*/ L"23456",
+                                   /*expected_count*/ 3);
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(text_range_provider,
+                                   TextPatternRangeEndpoint_End, TextUnit_Line,
+                                   /*count*/ -2,
+                                   /*expected_text*/ L"234",
+                                   /*expected_count*/ -2);
+
+  // Moving the end past the start and vice versa.
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(text_range_provider,
+                                   TextPatternRangeEndpoint_End, TextUnit_Line,
+                                   /*count*/ -4,
+                                   /*expected_text*/ L"",
+                                   /*expected_count*/ -4);
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_Start, TextUnit_Line,
+      /*count*/ -1,
+      /*expected_text*/ L"0",
+      /*expected_count*/ -1);
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_Start, TextUnit_Line,
+      /*count*/ 6,
+      /*expected_text*/ L"",
+      /*expected_count*/ 6);
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_Start, TextUnit_Line,
+      /*count*/ -6,
+      /*expected_text*/ L"012345",
+      /*expected_count*/ -6);
+
+  // Moving the endpoints further than both ends of the document.
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(text_range_provider,
+                                   TextPatternRangeEndpoint_End, TextUnit_Line,
+                                   /*count*/ -13,
+                                   /*expected_text*/ L"",
+                                   /*expected_count*/ -6);
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(text_range_provider,
+                                   TextPatternRangeEndpoint_End, TextUnit_Line,
+                                   /*count*/ 11,
+                                   /*expected_text*/ L"0123456",
+                                   /*expected_count*/ 7);
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_Start, TextUnit_Line,
+      /*count*/ 9,
+      /*expected_text*/ L"",
+      /*expected_count*/ 7);
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_Start, TextUnit_Line,
+      /*count*/ -7,
+      /*expected_text*/ L"0123456",
+      /*expected_count*/ -7);
+}
+
+// TODO(schectman) https://github.com/flutter/flutter/issues/117012
+// Verify that the endpoint can move past an empty text field.
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       DISABLED_TestITextRangeProviderMoveEndpointByUnitTextField) {
+  // An empty text field should also be a character, word, and line boundary.
+  ui::AXNodeData root_data;
+  root_data.id = 1;
+  root_data.role = ax::mojom::Role::kRootWebArea;
+
+  ui::AXNodeData group1_data;
+  group1_data.id = 2;
+  group1_data.role = ax::mojom::Role::kGenericContainer;
+
+  ui::AXNodeData text_data;
+  text_data.id = 3;
+  text_data.role = ax::mojom::Role::kStaticText;
+  std::string text_content = "some text";
+  text_data.SetName(text_content);
+  std::vector<int> word_start_offsets, word_end_offsets;
+  ComputeWordBoundariesOffsets(text_content, word_start_offsets,
+                               word_end_offsets);
+  text_data.AddIntListAttribute(ax::mojom::IntListAttribute::kWordStarts,
+                                word_start_offsets);
+  text_data.AddIntListAttribute(ax::mojom::IntListAttribute::kWordEnds,
+                                word_end_offsets);
+
+  ui::AXNodeData text_input_data;
+  text_input_data.id = 4;
+  text_input_data.role = ax::mojom::Role::kTextField;
+  text_input_data.AddState(ax::mojom::State::kEditable);
+  text_input_data.AddStringAttribute(ax::mojom::StringAttribute::kHtmlTag,
+                                     "input");
+  text_input_data.AddStringAttribute(ax::mojom::StringAttribute::kInputType,
+                                     "text");
+
+  ui::AXNodeData group2_data;
+  group2_data.id = 5;
+  group2_data.role = ax::mojom::Role::kGenericContainer;
+
+  ui::AXNodeData more_text_data;
+  more_text_data.id = 6;
+  more_text_data.role = ax::mojom::Role::kStaticText;
+  text_content = "more text";
+  more_text_data.SetName(text_content);
+  ComputeWordBoundariesOffsets(text_content, word_start_offsets,
+                               word_end_offsets);
+  more_text_data.AddIntListAttribute(ax::mojom::IntListAttribute::kWordStarts,
+                                     word_start_offsets);
+  more_text_data.AddIntListAttribute(ax::mojom::IntListAttribute::kWordEnds,
+                                     word_end_offsets);
+
+  ui::AXNodeData empty_text_data;
+  empty_text_data.id = 7;
+  empty_text_data.role = ax::mojom::Role::kStaticText;
+  empty_text_data.AddState(ax::mojom::State::kEditable);
+  text_content = "";
+  empty_text_data.SetNameExplicitlyEmpty();
+  ComputeWordBoundariesOffsets(text_content, word_start_offsets,
+                               word_end_offsets);
+  empty_text_data.AddIntListAttribute(ax::mojom::IntListAttribute::kWordStarts,
+                                      word_start_offsets);
+  empty_text_data.AddIntListAttribute(ax::mojom::IntListAttribute::kWordEnds,
+                                      word_end_offsets);
+
+  root_data.child_ids = {group1_data.id, text_input_data.id, group2_data.id};
+  group1_data.child_ids = {text_data.id};
+  text_input_data.child_ids = {empty_text_data.id};
+  group2_data.child_ids = {more_text_data.id};
+
+  ui::AXTreeUpdate update;
+  ui::AXTreeData tree_data;
+  tree_data.tree_id = ui::AXTreeID::CreateNewAXTreeID();
+  update.tree_data = tree_data;
+  update.has_tree_data = true;
+  update.root_id = root_data.id;
+  update.nodes = {root_data,   group1_data,    text_data,      text_input_data,
+                  group2_data, more_text_data, empty_text_data};
+
+  Init(update);
+
+  // Set up variables from the tree for testing.
+  AXNode* root_node = GetRootAsAXNode();
+  AXNode* text_node = root_node->children()[0]->children()[0];
+
+  ComPtr<ITextRangeProvider> text_range_provider;
+  GetTextRangeProviderFromTextNode(text_range_provider, text_node);
+
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"some text");
+
+  int count;
+  // Tests for TextUnit_Character.
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_End, TextUnit_Character, /*count*/ 2, &count));
+  ASSERT_EQ(2, count);
+  // Note that by design, empty objects such as empty text fields, are placed in
+  // their own paragraph for easier screen reader navigation.
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"some text\n\xFFFc");
+
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_End, TextUnit_Character, /*count*/ 2, &count));
+  ASSERT_EQ(2, count);
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"some text\n\xFFFc\nm");
+
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_End, TextUnit_Character, /*count*/ -1, &count));
+  ASSERT_EQ(-1, count);
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"some text\n\xFFFC\n");
+
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_End, TextUnit_Character, /*count*/ -2, &count));
+  ASSERT_EQ(-2, count);
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"some text\n");
+
+  // Tests for TextUnit_Word.
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_End, TextUnit_Word, /*count*/ 1, &count));
+  ASSERT_EQ(1, count);
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"some text\n\xFFFC\n");
+
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_End, TextUnit_Word, /*count*/ 1, &count));
+  ASSERT_EQ(1, count);
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"some text\n\xFFFC\nmore ");
+
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_End, TextUnit_Word, /*count*/ -1, &count));
+  ASSERT_EQ(-1, count);
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"some text\n\xFFFC\n");
+
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_End, TextUnit_Word, /*count*/ -1, &count));
+  ASSERT_EQ(-1, count);
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"some text\n");
+
+  // Tests for TextUnit_Line.
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_End, TextUnit_Line, /*count*/ 1, &count));
+  ASSERT_EQ(1, count);
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"some text\n\xFFFC");
+
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_End, TextUnit_Line, /*count*/ 1, &count));
+  ASSERT_EQ(1, count);
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"some text\n\xFFFC\nmore text");
+
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_End, TextUnit_Line, /*count*/ -1, &count));
+  ASSERT_EQ(-1, count);
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"some text\n\xFFFC");
+
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_End, TextUnit_Line, /*count*/ -1, &count));
+  ASSERT_EQ(-1, count);
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"some text");
+}
+
+// TODO(schectman) https://github.com/flutter/flutter/issues/117012
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       DISABLED_TestITextRangeProviderMoveEndpointByFormat) {
+  Init(BuildAXTreeForMoveByFormat());
+  AXNode* root_node = GetRootAsAXNode();
+
+  ComPtr<ITextRangeProvider> text_range_provider;
+  GetTextRangeProviderFromTextNode(text_range_provider, root_node);
+
+  EXPECT_UIA_TEXTRANGE_EQ(
+      text_range_provider,
+      L"Text with formatting\nStandalone line with no formatting\nbold "
+      L"text\nParagraph 1\nParagraph 2\nParagraph 3\nParagraph 4");
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_End, TextUnit_Format,
+      /*count*/ -2,
+      /*expected_text*/
+      L"Text with formatting\nStandalone line with no formatting\nbold "
+      L"text\nParagraph 1",
+      /*expected_count*/ -2);
+
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_End, TextUnit_Format,
+      /*count*/ -1,
+      /*expected_text*/
+      L"Text with formatting\nStandalone line with no formatting\nbold text",
+      /*expected_count*/ -1);
+
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_End, TextUnit_Format,
+      /*count*/ -1,
+      /*expected_text*/
+      L"Text with formatting\nStandalone line with no formatting\n",
+      /*expected_count*/ -1);
+
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_End, TextUnit_Format,
+      /*count*/ -1,
+      /*expected_text*/ L"Text with formatting",
+      /*expected_count*/ -1);
+
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_End, TextUnit_Format,
+      /*count*/ -1,
+      /*expected_text*/ L"",
+      /*expected_count*/ -1);
+
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_End, TextUnit_Format,
+      /*count*/ 7,
+      /*expected_text*/
+      L"Text with formatting\nStandalone line with no formatting\nbold "
+      L"text\nParagraph 1\nParagraph 2\nParagraph 3\nParagraph 4",
+      /*expected_count*/ 6);
+
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_End, TextUnit_Format,
+      /*count*/ -8,
+      /*expected_text*/ L"",
+      /*expected_count*/ -6);
+}
+
+TEST_F(AXPlatformNodeTextRangeProviderTest, TestITextRangeProviderCompare) {
+  Init(BuildTextDocument({"some text", "some text"}));
+  AXNode* root_node = GetRootAsAXNode();
+
+  // Get the textRangeProvider for the document,
+  // which contains text "some textsome text".
+  ComPtr<ITextRangeProvider> document_text_range_provider;
+  GetTextRangeProviderFromTextNode(document_text_range_provider, root_node);
+
+  // Get the textRangeProvider for the first text node.
+  ComPtr<ITextRangeProvider> text_range_provider;
+  GetTextRangeProviderFromTextNode(text_range_provider,
+                                   root_node->children()[0]);
+
+  // Get the textRangeProvider for the second text node.
+  ComPtr<ITextRangeProvider> more_text_range_provider;
+  GetTextRangeProviderFromTextNode(more_text_range_provider,
+                                   root_node->children()[1]);
+
+  // Compare text range of the entire document with itself, which should return
+  // that they are equal.
+  BOOL result;
+  EXPECT_HRESULT_SUCCEEDED(document_text_range_provider->Compare(
+      document_text_range_provider.Get(), &result));
+  EXPECT_TRUE(result);
+
+  // Compare the text range of the entire document with one of its child, which
+  // should return that they are not equal.
+  EXPECT_HRESULT_SUCCEEDED(document_text_range_provider->Compare(
+      text_range_provider.Get(), &result));
+  EXPECT_FALSE(result);
+
+  // Compare the text range of text_node which contains "some text" with
+  // text range of more_text_node which also contains "some text". Those two
+  // text ranges should not equal, because their endpoints are different, even
+  // though their contents are the same.
+  EXPECT_HRESULT_SUCCEEDED(
+      text_range_provider->Compare(more_text_range_provider.Get(), &result));
+  EXPECT_FALSE(result);
+}
+
+TEST_F(AXPlatformNodeTextRangeProviderTest, TestITextRangeProviderSelection) {
+  Init(BuildTextDocument({"some text"}));
+
+  ComPtr<ITextRangeProvider> text_range_provider;
+  GetTextRangeProviderFromTextNode(text_range_provider, GetRootAsAXNode());
+
+  ASSERT_UIA_INVALIDOPERATION(text_range_provider->AddToSelection());
+  ASSERT_UIA_INVALIDOPERATION(text_range_provider->RemoveFromSelection());
+}
+
+// TODO(schectman) Rectangles not implemented as in Chromium.
+// https://github.com/flutter/flutter/issues/117012
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       DISABLED_TestITextRangeProviderGetBoundingRectangles) {
+  ui::AXTreeUpdate update = BuildAXTreeForBoundingRectangles();
+  Init(update);
+  ComPtr<ITextRangeProvider> text_range_provider;
+  base::win::ScopedSafearray rectangles;
+  int units_moved;
+
+  // Expected bounding rects:
+  // <button>Button</button><input type="checkbox">Line 1<br>Line 2
+  // |---------------------||---------------------||----|   |------|
+  GetTextRangeProviderFromTextNode(text_range_provider, GetRootAsAXNode());
+  EXPECT_HRESULT_SUCCEEDED(
+      text_range_provider->GetBoundingRectangles(rectangles.Receive()));
+  std::vector<double> expected_values = {20,  20, 200, 30, /* button */
+                                         20,  50, 200, 30, /* check box */
+                                         220, 20, 30,  30, /* line 1 */
+                                         220, 50, 42,  30 /* line 2 */};
+  EXPECT_UIA_SAFEARRAY_EQ(rectangles.Get(), expected_values);
+  rectangles.Reset();
+
+  // Move the text range end back by one character.
+  // Expected bounding rects:
+  // <button>Button</button><input type="checkbox">Line 1<br>Line 2
+  // |---------------------||---------------------||----|   |----|
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_End, TextUnit_Character, /*count*/ -1,
+      &units_moved));
+  ASSERT_EQ(-1, units_moved);
+  EXPECT_HRESULT_SUCCEEDED(
+      text_range_provider->GetBoundingRectangles(rectangles.Receive()));
+  expected_values = {20,  20, 200, 30, /* button */
+                     20,  50, 200, 30, /* check box */
+                     220, 20, 30,  30, /* line 1 */
+                     220, 50, 35,  30 /* line 2 */};
+  EXPECT_UIA_SAFEARRAY_EQ(rectangles.Get(), expected_values);
+  rectangles.Reset();
+
+  // Move the text range end back by one line.
+  // Expected bounding rects:
+  // <button>Button</button><input type="checkbox">Line 1<br>Line 2
+  // |---------------------||---------------------||--------|
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_End, TextUnit_Line, /*count*/ -1, &units_moved));
+  ASSERT_EQ(-1, units_moved);
+  EXPECT_HRESULT_SUCCEEDED(
+      text_range_provider->GetBoundingRectangles(rectangles.Receive()));
+  expected_values = {20,  20, 200, 30, /* button */
+                     20,  50, 200, 30, /* check box */
+                     220, 20, 30,  30 /* line 1 */};
+  EXPECT_UIA_SAFEARRAY_EQ(rectangles.Get(), expected_values);
+  rectangles.Reset();
+
+  // Move the text range end back by one line.
+  // Expected bounding rects:
+  // <button>Button</button><input type="checkbox">Line 1<br>Line 2
+  // |---------------------||---------------------|
+  ASSERT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByUnit(
+      TextPatternRangeEndpoint_End, TextUnit_Word, /*count*/ -3, &units_moved));
+  ASSERT_EQ(-3, units_moved);
+  EXPECT_HRESULT_SUCCEEDED(
+      text_range_provider->GetBoundingRectangles(rectangles.Receive()));
+  expected_values = {20, 20, 200, 30, /* button */
+                     20, 50, 200, 30 /* check box */};
+  EXPECT_UIA_SAFEARRAY_EQ(rectangles.Get(), expected_values);
+}
+
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       TestITextRangeProviderGetEnclosingElement) {
+  // Set up ax tree with the following structure:
+  //
+  // root
+  // |
+  // paragraph______________________________________________
+  // |               |            |       |                |
+  // static_text     link         link    search input     pdf_highlight
+  // |               |            |       |                |
+  // text_node       static_text  ul      text_node        static_text
+  //                 |            |                        |
+  //                 text_node    li                       text_node
+  //                              |
+  //                              static_text
+  //                              |
+  //                              text_node
+
+  ui::AXNodeData root_data;
+  root_data.id = 1;
+  root_data.role = ax::mojom::Role::kRootWebArea;
+
+  ui::AXNodeData paragraph_data;
+  paragraph_data.id = 2;
+  paragraph_data.role = ax::mojom::Role::kParagraph;
+  root_data.child_ids.push_back(paragraph_data.id);
+
+  ui::AXNodeData static_text_data1;
+  static_text_data1.id = 3;
+  static_text_data1.role = ax::mojom::Role::kStaticText;
+  paragraph_data.child_ids.push_back(static_text_data1.id);
+
+  ui::AXNodeData inline_text_data1;
+  inline_text_data1.id = 4;
+  inline_text_data1.role = ax::mojom::Role::kInlineTextBox;
+  static_text_data1.child_ids.push_back(inline_text_data1.id);
+
+  ui::AXNodeData link_data;
+  link_data.id = 5;
+  link_data.role = ax::mojom::Role::kLink;
+  paragraph_data.child_ids.push_back(link_data.id);
+
+  ui::AXNodeData static_text_data2;
+  static_text_data2.id = 6;
+  static_text_data2.role = ax::mojom::Role::kStaticText;
+  link_data.child_ids.push_back(static_text_data2.id);
+
+  ui::AXNodeData inline_text_data2;
+  inline_text_data2.id = 7;
+  inline_text_data2.role = ax::mojom::Role::kInlineTextBox;
+  static_text_data2.child_ids.push_back(inline_text_data2.id);
+
+  ui::AXNodeData link_data2;
+  link_data2.id = 8;
+  link_data2.role = ax::mojom::Role::kLink;
+  paragraph_data.child_ids.push_back(link_data2.id);
+
+  ui::AXNodeData list_data;
+  list_data.id = 9;
+  list_data.role = ax::mojom::Role::kList;
+  link_data2.child_ids.push_back(list_data.id);
+
+  ui::AXNodeData list_item_data;
+  list_item_data.id = 10;
+  list_item_data.role = ax::mojom::Role::kListItem;
+  list_data.child_ids.push_back(list_item_data.id);
+
+  ui::AXNodeData static_text_data3;
+  static_text_data3.id = 11;
+  static_text_data3.role = ax::mojom::Role::kStaticText;
+  list_item_data.child_ids.push_back(static_text_data3.id);
+
+  ui::AXNodeData inline_text_data3;
+  inline_text_data3.id = 12;
+  inline_text_data3.role = ax::mojom::Role::kInlineTextBox;
+  static_text_data3.child_ids.push_back(inline_text_data3.id);
+
+  ui::AXNodeData search_box;
+  search_box.id = 13;
+  search_box.role = ax::mojom::Role::kSearchBox;
+  search_box.AddState(ax::mojom::State::kEditable);
+  search_box.AddStringAttribute(ax::mojom::StringAttribute::kHtmlTag, "input");
+  search_box.AddStringAttribute(ax::mojom::StringAttribute::kInputType,
+                                "search");
+  paragraph_data.child_ids.push_back(search_box.id);
+
+  ui::AXNodeData search_text;
+  search_text.id = 14;
+  search_text.role = ax::mojom::Role::kStaticText;
+  search_text.AddState(ax::mojom::State::kEditable);
+  search_text.SetName("placeholder");
+  search_box.child_ids.push_back(search_text.id);
+
+  ui::AXNodeData pdf_highlight_data;
+  pdf_highlight_data.id = 15;
+  pdf_highlight_data.role = ax::mojom::Role::kPdfActionableHighlight;
+  paragraph_data.child_ids.push_back(pdf_highlight_data.id);
+
+  ui::AXNodeData static_text_data4;
+  static_text_data4.id = 16;
+  static_text_data4.role = ax::mojom::Role::kStaticText;
+  pdf_highlight_data.child_ids.push_back(static_text_data4.id);
+
+  ui::AXNodeData inline_text_data4;
+  inline_text_data4.id = 17;
+  inline_text_data4.role = ax::mojom::Role::kInlineTextBox;
+  static_text_data4.child_ids.push_back(inline_text_data4.id);
+
+  ui::AXTreeUpdate update;
+  ui::AXTreeData tree_data;
+  tree_data.tree_id = ui::AXTreeID::CreateNewAXTreeID();
+  update.tree_data = tree_data;
+  update.has_tree_data = true;
+  update.root_id = root_data.id;
+  update.nodes = {root_data,         paragraph_data,    static_text_data1,
+                  inline_text_data1, link_data,         static_text_data2,
+                  inline_text_data2, link_data2,        list_data,
+                  list_item_data,    static_text_data3, inline_text_data3,
+                  search_box,        search_text,       pdf_highlight_data,
+                  static_text_data4, inline_text_data4};
+  Init(update);
+
+  // Set up variables from the tree for testing.
+  AXNode* paragraph_node = GetRootAsAXNode()->children()[0];
+  AXNode* static_text_node1 = paragraph_node->children()[0];
+  AXNode* link_node = paragraph_node->children()[1];
+  AXNode* inline_text_node1 = static_text_node1->children()[0];
+  AXNode* static_text_node2 = link_node->children()[0];
+  AXNode* inline_text_node2 = static_text_node2->children()[0];
+  AXNode* link_node2 = paragraph_node->children()[2];
+  AXNode* list_node = link_node2->children()[0];
+  AXNode* list_item_node = list_node->children()[0];
+  AXNode* static_text_node3 = list_item_node->children()[0];
+  AXNode* inline_text_node3 = static_text_node3->children()[0];
+  AXNode* search_box_node = paragraph_node->children()[3];
+  AXNode* search_text_node = search_box_node->children()[0];
+  AXNode* pdf_highlight_node = paragraph_node->children()[4];
+  AXNode* static_text_node4 = pdf_highlight_node->children()[0];
+  AXNode* inline_text_node4 = static_text_node4->children()[0];
+  AXPlatformNodeWin* owner =
+      static_cast<AXPlatformNodeWin*>(AXPlatformNodeFromNode(paragraph_node));
+  ASSERT_NE(owner, nullptr);
+
+  ComPtr<IRawElementProviderSimple> link_node_raw =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(link_node);
+  ComPtr<IRawElementProviderSimple> static_text_node_raw1 =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(static_text_node1);
+  ComPtr<IRawElementProviderSimple> static_text_node_raw2 =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(static_text_node2);
+  ComPtr<IRawElementProviderSimple> static_text_node_raw3 =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(static_text_node3);
+  ComPtr<IRawElementProviderSimple> inline_text_node_raw1 =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(inline_text_node1);
+  ComPtr<IRawElementProviderSimple> inline_text_node_raw2 =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(inline_text_node2);
+  ComPtr<IRawElementProviderSimple> inline_text_node_raw3 =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(inline_text_node3);
+  ComPtr<IRawElementProviderSimple> search_box_node_raw =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(search_box_node);
+  ComPtr<IRawElementProviderSimple> search_text_node_raw =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(search_text_node);
+  ComPtr<IRawElementProviderSimple> pdf_highlight_node_raw =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(pdf_highlight_node);
+  ComPtr<IRawElementProviderSimple> inline_text_node_raw4 =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(inline_text_node4);
+
+  // Test GetEnclosingElement for the two leaves text nodes. The enclosing
+  // element of the first one should be its static text parent (because inline
+  // text boxes shouldn't be exposed) and the enclosing element for the text
+  // node that is grandchild of the link node should return the link node.
+  // The text node in the link node with a complex subtree should behave
+  // normally and return the static text parent.
+  ComPtr<ITextProvider> text_provider;
+  EXPECT_HRESULT_SUCCEEDED(inline_text_node_raw1->GetPatternProvider(
+      UIA_TextPatternId, &text_provider));
+
+  ComPtr<ITextRangeProvider> text_range_provider;
+  EXPECT_HRESULT_SUCCEEDED(
+      text_provider->get_DocumentRange(&text_range_provider));
+  SetOwner(owner, text_range_provider.Get());
+
+  ComPtr<IRawElementProviderSimple> enclosing_element;
+  EXPECT_HRESULT_SUCCEEDED(
+      text_range_provider->GetEnclosingElement(&enclosing_element));
+  EXPECT_EQ(inline_text_node_raw1.Get(), enclosing_element.Get());
+
+  EXPECT_HRESULT_SUCCEEDED(inline_text_node_raw2->GetPatternProvider(
+      UIA_TextPatternId, &text_provider));
+
+  EXPECT_HRESULT_SUCCEEDED(
+      text_provider->get_DocumentRange(&text_range_provider));
+  SetOwner(owner, text_range_provider.Get());
+
+  EXPECT_HRESULT_SUCCEEDED(
+      text_range_provider->GetEnclosingElement(&enclosing_element));
+  EXPECT_EQ(link_node_raw.Get(), enclosing_element.Get());
+
+  EXPECT_HRESULT_SUCCEEDED(inline_text_node_raw3->GetPatternProvider(
+      UIA_TextPatternId, &text_provider));
+
+  EXPECT_HRESULT_SUCCEEDED(
+      text_provider->get_DocumentRange(&text_range_provider));
+  SetOwner(owner, text_range_provider.Get());
+
+  EXPECT_HRESULT_SUCCEEDED(
+      text_range_provider->GetEnclosingElement(&enclosing_element));
+  EXPECT_EQ(inline_text_node_raw3.Get(), enclosing_element.Get());
+
+  // The enclosing element of a text range in the search text should give the
+  // search box
+  EXPECT_HRESULT_SUCCEEDED(search_text_node_raw->GetPatternProvider(
+      UIA_TextPatternId, &text_provider));
+
+  EXPECT_HRESULT_SUCCEEDED(
+      text_provider->get_DocumentRange(&text_range_provider));
+  SetOwner(owner, text_range_provider.Get());
+
+  EXPECT_HRESULT_SUCCEEDED(
+      text_range_provider->ExpandToEnclosingUnit(TextUnit_Character));
+
+  EXPECT_HRESULT_SUCCEEDED(
+      text_range_provider->GetEnclosingElement(&enclosing_element));
+  EXPECT_EQ(search_box_node_raw.Get(), enclosing_element.Get());
+
+  // The enclosing element for the text node that is grandchild of the
+  // pdf_highlight node should return the pdf_highlight node.
+  EXPECT_HRESULT_SUCCEEDED(inline_text_node_raw4->GetPatternProvider(
+      UIA_TextPatternId, &text_provider));
+
+  EXPECT_HRESULT_SUCCEEDED(
+      text_provider->get_DocumentRange(&text_range_provider));
+  SetOwner(owner, text_range_provider.Get());
+
+  EXPECT_HRESULT_SUCCEEDED(
+      text_range_provider->GetEnclosingElement(&enclosing_element));
+  EXPECT_EQ(pdf_highlight_node_raw.Get(), enclosing_element.Get());
+}
+
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       TestITextRangeProviderGetEnclosingElementRichButton) {
+  // Set up ax tree with the following structure:
+  //
+  // root
+  // ++button_1
+  // ++++static_text_1
+  // ++++++inline_text_1
+  // ++button_2
+  // ++++heading
+  // ++++++statix_text_2
+  // ++++++++inline_text_2
+
+  ui::AXNodeData root;
+  ui::AXNodeData button_1;
+  ui::AXNodeData static_text_1;
+  ui::AXNodeData inline_text_1;
+  ui::AXNodeData button_2;
+  ui::AXNodeData heading;
+  ui::AXNodeData static_text_2;
+  ui::AXNodeData inline_text_2;
+
+  root.id = 1;
+  button_1.id = 2;
+  static_text_1.id = 3;
+  inline_text_1.id = 4;
+  button_2.id = 5;
+  heading.id = 6;
+  static_text_2.id = 7;
+  inline_text_2.id = 8;
+
+  root.role = ax::mojom::Role::kRootWebArea;
+  root.child_ids = {button_1.id, button_2.id};
+
+  button_1.role = ax::mojom::Role::kButton;
+  button_1.child_ids.push_back(static_text_1.id);
+
+  static_text_1.role = ax::mojom::Role::kStaticText;
+  static_text_1.child_ids.push_back(inline_text_1.id);
+
+  inline_text_1.role = ax::mojom::Role::kInlineTextBox;
+
+  button_2.role = ax::mojom::Role::kButton;
+  button_2.child_ids.push_back(heading.id);
+
+  heading.role = ax::mojom::Role::kHeading;
+  heading.child_ids.push_back(static_text_2.id);
+
+  static_text_2.role = ax::mojom::Role::kStaticText;
+  static_text_2.child_ids.push_back(inline_text_2.id);
+
+  inline_text_2.role = ax::mojom::Role::kInlineTextBox;
+
+  ui::AXTreeUpdate update;
+  ui::AXTreeData tree_data;
+  tree_data.tree_id = ui::AXTreeID::CreateNewAXTreeID();
+  update.tree_data = tree_data;
+  update.has_tree_data = true;
+  update.root_id = root.id;
+  update.nodes = {root,     button_1, static_text_1, inline_text_1,
+                  button_2, heading,  static_text_2, inline_text_2};
+  Init(update);
+
+  // Set up variables from the tree for testing.
+  AXNode* button_1_node = GetRootAsAXNode()->children()[0];
+  AXNode* static_text_1_node = button_1_node->children()[0];
+  AXNode* inline_text_1_node = static_text_1_node->children()[0];
+  AXNode* button_2_node = GetRootAsAXNode()->children()[1];
+  AXNode* heading_node = button_2_node->children()[0];
+  AXNode* static_text_2_node = heading_node->children()[0];
+  AXNode* inline_text_2_node = static_text_2_node->children()[0];
+  AXPlatformNodeWin* owner =
+      static_cast<AXPlatformNodeWin*>(AXPlatformNodeFromNode(button_1_node));
+  ASSERT_NE(owner, nullptr);
+
+  ComPtr<IRawElementProviderSimple> button_1_node_raw =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(button_1_node);
+  ComPtr<IRawElementProviderSimple> inline_text_1_node_raw =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(inline_text_1_node);
+
+  ComPtr<IRawElementProviderSimple> button_2_node_raw =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(button_2_node);
+  ComPtr<IRawElementProviderSimple> static_text_2_node_raw =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(static_text_2_node);
+  ComPtr<IRawElementProviderSimple> inline_text_2_node_raw =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(inline_text_2_node);
+
+  // 1. The first button should hide its children since it contains a single
+  // text node. Thus, calling GetEnclosingElement on a descendant inline text
+  // box should return the button itself.
+  ComPtr<ITextProvider> text_provider;
+  EXPECT_HRESULT_SUCCEEDED(inline_text_1_node_raw->GetPatternProvider(
+      UIA_TextPatternId, &text_provider));
+
+  ComPtr<ITextRangeProvider> text_range_provider;
+  EXPECT_HRESULT_SUCCEEDED(
+      text_provider->get_DocumentRange(&text_range_provider));
+  SetOwner(owner, text_range_provider.Get());
+
+  ComPtr<IRawElementProviderSimple> enclosing_element;
+  EXPECT_HRESULT_SUCCEEDED(
+      text_range_provider->GetEnclosingElement(&enclosing_element));
+  EXPECT_EQ(button_1_node_raw.Get(), enclosing_element.Get());
+
+  // 2. The second button shouldn't hide its children since it doesn't contain a
+  // single text node (it contains a heading node). Thus, calling
+  // GetEnclosingElement on a descendant inline text box should return the
+  // parent node.
+  EXPECT_HRESULT_SUCCEEDED(inline_text_2_node_raw->GetPatternProvider(
+      UIA_TextPatternId, &text_provider));
+
+  EXPECT_HRESULT_SUCCEEDED(
+      text_provider->get_DocumentRange(&text_range_provider));
+  SetOwner(owner, text_range_provider.Get());
+
+  EXPECT_HRESULT_SUCCEEDED(
+      text_range_provider->GetEnclosingElement(&enclosing_element));
+  EXPECT_EQ(button_2_node_raw.Get(), enclosing_element.Get());
+}
+
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       TestITextRangeProviderMoveEndpointByRange) {
+  Init(BuildTextDocument({"some text", "more text"}));
+
+  AXNode* root_node = GetRootAsAXNode();
+  AXNode* text_node = root_node->children()[0];
+  AXNode* more_text_node = root_node->children()[1];
+  AXPlatformNodeWin* owner =
+      static_cast<AXPlatformNodeWin*>(AXPlatformNodeFromNode(root_node));
+  ASSERT_NE(owner, nullptr);
+
+  // Text range for the document, which contains text "some textmore text".
+  ComPtr<IRawElementProviderSimple> root_node_raw =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(root_node);
+  ComPtr<ITextProvider> document_provider;
+  EXPECT_HRESULT_SUCCEEDED(
+      root_node_raw->GetPatternProvider(UIA_TextPatternId, &document_provider));
+  ComPtr<ITextRangeProvider> document_text_range_provider;
+  ComPtr<AXPlatformNodeTextRangeProviderWin> document_text_range;
+
+  // Text range related to "some text".
+  ComPtr<IRawElementProviderSimple> text_node_raw =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(text_node);
+  ComPtr<ITextProvider> text_provider;
+  EXPECT_HRESULT_SUCCEEDED(
+      text_node_raw->GetPatternProvider(UIA_TextPatternId, &text_provider));
+  ComPtr<ITextRangeProvider> text_range_provider;
+  ComPtr<AXPlatformNodeTextRangeProviderWin> text_range;
+
+  // Text range related to "more text".
+  ComPtr<IRawElementProviderSimple> more_text_node_raw =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(more_text_node);
+  ComPtr<ITextProvider> more_text_provider;
+  EXPECT_HRESULT_SUCCEEDED(more_text_node_raw->GetPatternProvider(
+      UIA_TextPatternId, &more_text_provider));
+  ComPtr<ITextRangeProvider> more_text_range_provider;
+  ComPtr<AXPlatformNodeTextRangeProviderWin> more_text_range;
+
+  // Move the start of document text range "some textmore text" to the end of
+  // itself.
+  // The start of document text range "some textmore text" is at the end of
+  // itself.
+  //
+  // Before:
+  // |s                e|
+  // "some textmore text"
+  // After:
+  //                  |s
+  //                   e|
+  // "some textmore text"
+
+  // Get the textRangeProvider for the document, which contains text
+  // "some textmore text".
+  EXPECT_HRESULT_SUCCEEDED(
+      document_provider->get_DocumentRange(&document_text_range_provider));
+  SetOwner(owner, document_text_range_provider.Get());
+
+  EXPECT_HRESULT_SUCCEEDED(document_text_range_provider->MoveEndpointByRange(
+      TextPatternRangeEndpoint_Start, document_text_range_provider.Get(),
+      TextPatternRangeEndpoint_End));
+
+  document_text_range_provider->QueryInterface(
+      IID_PPV_ARGS(&document_text_range));
+  EXPECT_EQ(*GetStart(document_text_range.Get()),
+            *GetEnd(document_text_range.Get()));
+
+  // Move the end of document text range "some textmore text" to the start of
+  // itself.
+  // The end of document text range "some textmore text" is at the start of
+  // itself.
+  //
+  // Before:
+  // |s                e|
+  // "some textmore text"
+  // After:
+  // |s
+  //  e|
+  // "some textmore text"
+
+  // Get the textRangeProvider for the document, which contains text
+  // "some textmore text".
+  EXPECT_HRESULT_SUCCEEDED(
+      document_provider->get_DocumentRange(&document_text_range_provider));
+  SetOwner(owner, document_text_range_provider.Get());
+
+  EXPECT_HRESULT_SUCCEEDED(document_text_range_provider->MoveEndpointByRange(
+      TextPatternRangeEndpoint_Start, document_text_range_provider.Get(),
+      TextPatternRangeEndpoint_End));
+
+  document_text_range_provider->QueryInterface(
+      IID_PPV_ARGS(&document_text_range));
+  EXPECT_EQ(*GetStart(document_text_range.Get()),
+            *GetEnd(document_text_range.Get()));
+
+  // Move the start of document text range "some textmore text" to the start
+  // of text range "more text". The start of document text range "some
+  // textmore text" is at the start of text range "more text". The end of
+  // document range does not change.
+  //
+  // Before:
+  // |s                e|
+  // "some textmore text"
+  // After:
+  //          |s       e|
+  // "some textmore text"
+
+  // Get the textRangeProvider for the document, which contains text
+  // "some textmore text".
+  EXPECT_HRESULT_SUCCEEDED(
+      document_provider->get_DocumentRange(&document_text_range_provider));
+  SetOwner(owner, document_text_range_provider.Get());
+  // Get the textRangeProvider for more_text_node which contains "more text".
+  EXPECT_HRESULT_SUCCEEDED(
+      more_text_provider->get_DocumentRange(&more_text_range_provider));
+  SetOwner(owner, more_text_range_provider.Get());
+
+  EXPECT_HRESULT_SUCCEEDED(document_text_range_provider->MoveEndpointByRange(
+      TextPatternRangeEndpoint_Start, more_text_range_provider.Get(),
+      TextPatternRangeEndpoint_Start));
+
+  document_text_range_provider->QueryInterface(
+      IID_PPV_ARGS(&document_text_range));
+  more_text_range_provider->QueryInterface(IID_PPV_ARGS(&more_text_range));
+  EXPECT_EQ(*GetStart(document_text_range.Get()),
+            *GetStart(more_text_range.Get()));
+
+  // Move the end of document text range "some textmore text" to the end of
+  // text range "some text".
+  // The end of document text range "some textmore text" is at the end of text
+  // range "some text". The start of document range does not change.
+  //
+  // Before:
+  // |s                e|
+  // "some textmore text"
+  // After:
+  // |s       e|
+  // "some textmore text"
+
+  // Get the textRangeProvider for the document, which contains text
+  // "some textmore text".
+  EXPECT_HRESULT_SUCCEEDED(
+      document_provider->get_DocumentRange(&document_text_range_provider));
+  SetOwner(owner, document_text_range_provider.Get());
+  // Get the textRangeProvider for text_node which contains "some text".
+  EXPECT_HRESULT_SUCCEEDED(
+      text_provider->get_DocumentRange(&text_range_provider));
+  SetOwner(owner, text_range_provider.Get());
+
+  EXPECT_HRESULT_SUCCEEDED(document_text_range_provider->MoveEndpointByRange(
+      TextPatternRangeEndpoint_End, text_range_provider.Get(),
+      TextPatternRangeEndpoint_End));
+
+  document_text_range_provider->QueryInterface(
+      IID_PPV_ARGS(&document_text_range));
+  text_range_provider->QueryInterface(IID_PPV_ARGS(&text_range));
+  EXPECT_EQ(*GetEnd(document_text_range.Get()), *GetEnd(text_range.Get()));
+
+  // Move the end of text range "more text" to the start of
+  // text range "some text". Since the order of the endpoints being moved
+  // (those of "more text") have to be ensured, both endpoints of "more text"
+  // is at the start of "some text".
+  //
+  // Before:
+  //          |s       e|
+  // "some textmore text"
+  // After:
+  //  e|
+  // |s
+  // "some textmore text"
+
+  // Get the textRangeProvider for text_node which contains "some text".
+  EXPECT_HRESULT_SUCCEEDED(
+      text_provider->get_DocumentRange(&text_range_provider));
+  SetOwner(owner, document_text_range_provider.Get());
+  // Get the textRangeProvider for more_text_node which contains "more text".
+  EXPECT_HRESULT_SUCCEEDED(
+      more_text_provider->get_DocumentRange(&more_text_range_provider));
+  SetOwner(owner, more_text_range_provider.Get());
+
+  EXPECT_HRESULT_SUCCEEDED(more_text_range_provider->MoveEndpointByRange(
+      TextPatternRangeEndpoint_End, text_range_provider.Get(),
+      TextPatternRangeEndpoint_Start));
+
+  text_range_provider->QueryInterface(IID_PPV_ARGS(&text_range));
+  more_text_range_provider->QueryInterface(IID_PPV_ARGS(&more_text_range));
+  EXPECT_EQ(*GetEnd(more_text_range.Get()), *GetStart(text_range.Get()));
+  EXPECT_EQ(*GetStart(more_text_range.Get()), *GetStart(text_range.Get()));
+
+  // Move the start of text range "some text" to the end of text range
+  // "more text". Since the order of the endpoints being moved (those
+  // of "some text") have to be ensured, both endpoints of "some text" is at
+  // the end of "more text".
+  //
+  // Before:
+  // |s       e|
+  // "some textmore text"
+  // After:
+  //                  |s
+  //                   e|
+  // "some textmore text"
+
+  // Get the textRangeProvider for text_node which contains "some text".
+  EXPECT_HRESULT_SUCCEEDED(
+      text_provider->get_DocumentRange(&text_range_provider));
+  SetOwner(owner, text_range_provider.Get());
+  // Get the textRangeProvider for more_text_node which contains "more text".
+  EXPECT_HRESULT_SUCCEEDED(
+      more_text_provider->get_DocumentRange(&more_text_range_provider));
+  SetOwner(owner, more_text_range_provider.Get());
+
+  EXPECT_HRESULT_SUCCEEDED(text_range_provider->MoveEndpointByRange(
+      TextPatternRangeEndpoint_Start, more_text_range_provider.Get(),
+      TextPatternRangeEndpoint_End));
+
+  text_range_provider->QueryInterface(IID_PPV_ARGS(&text_range));
+  more_text_range_provider->QueryInterface(IID_PPV_ARGS(&more_text_range));
+  EXPECT_EQ(*GetStart(text_range.Get()), *GetEnd(more_text_range.Get()));
+  EXPECT_EQ(*GetEnd(text_range.Get()), *GetEnd(more_text_range.Get()));
+}
+
+// TODO(schectman) https://github.com/flutter/flutter/issues/117012
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       DISABLED_TestITextRangeProviderGetAttributeValue) {
+  ui::AXNodeData text_data;
+  text_data.id = 2;
+  text_data.role = ax::mojom::Role::kStaticText;
+  text_data.AddStringAttribute(ax::mojom::StringAttribute::kFontFamily, "sans");
+  text_data.AddFloatAttribute(ax::mojom::FloatAttribute::kFontSize, 16);
+  text_data.AddFloatAttribute(ax::mojom::FloatAttribute::kFontWeight, 300);
+  text_data.AddIntAttribute(ax::mojom::IntAttribute::kTextOverlineStyle, 1);
+  text_data.AddIntAttribute(ax::mojom::IntAttribute::kTextStrikethroughStyle,
+                            2);
+  text_data.AddIntAttribute(ax::mojom::IntAttribute::kTextUnderlineStyle, 3);
+  text_data.AddIntAttribute(ax::mojom::IntAttribute::kBackgroundColor,
+                            0xFFADBEEFU);
+  text_data.AddIntAttribute(ax::mojom::IntAttribute::kColor, 0xFFADC0DEU);
+  text_data.AddStringAttribute(ax::mojom::StringAttribute::kLanguage, "fr-CA");
+  text_data.SetTextDirection(ax::mojom::WritingDirection::kRtl);
+  text_data.AddTextStyle(ax::mojom::TextStyle::kItalic);
+  text_data.SetTextPosition(ax::mojom::TextPosition::kSubscript);
+  text_data.SetRestriction(ax::mojom::Restriction::kReadOnly);
+  text_data.SetTextAlign(ax::mojom::TextAlign::kCenter);
+  text_data.AddIntListAttribute(ax::mojom::IntListAttribute::kMarkerTypes,
+                                {(int)ax::mojom::MarkerType::kGrammar,
+                                 (int)ax::mojom::MarkerType::kSpelling});
+  text_data.AddIntListAttribute(ax::mojom::IntListAttribute::kMarkerStarts,
+                                {0, 5, 0, 14, 19});
+  text_data.AddIntListAttribute(ax::mojom::IntListAttribute::kMarkerEnds,
+                                {9, 9, 4, 18, 24});
+  text_data.SetName("some text and some other text");
+
+  ui::AXNodeData heading_data;
+  heading_data.id = 3;
+  heading_data.role = ax::mojom::Role::kHeading;
+  heading_data.AddIntAttribute(ax::mojom::IntAttribute::kHierarchicalLevel, 6);
+  heading_data.AddIntAttribute(ax::mojom::IntAttribute::kBackgroundColor,
+                               0xFFADBEEFU);
+  heading_data.AddIntAttribute(ax::mojom::IntAttribute::kColor, 0xFFADC0DEU);
+  heading_data.SetTextDirection(ax::mojom::WritingDirection::kRtl);
+  heading_data.SetTextPosition(ax::mojom::TextPosition::kSuperscript);
+  heading_data.AddState(ax::mojom::State::kEditable);
+  heading_data.child_ids = {4};
+
+  ui::AXNodeData heading_text_data;
+  heading_text_data.id = 4;
+  heading_text_data.role = ax::mojom::Role::kStaticText;
+  heading_text_data.AddState(ax::mojom::State::kInvisible);
+  heading_text_data.AddIntAttribute(ax::mojom::IntAttribute::kBackgroundColor,
+                                    0xFFADBEEFU);
+  heading_text_data.AddIntAttribute(ax::mojom::IntAttribute::kColor,
+                                    0xFFADC0DEU);
+  heading_text_data.SetTextDirection(ax::mojom::WritingDirection::kRtl);
+  heading_text_data.SetTextPosition(ax::mojom::TextPosition::kSuperscript);
+  heading_text_data.AddState(ax::mojom::State::kEditable);
+  heading_text_data.SetTextAlign(ax::mojom::TextAlign::kJustify);
+  heading_text_data.AddIntListAttribute(
+      ax::mojom::IntListAttribute::kMarkerTypes,
+      {(int)ax::mojom::MarkerType::kSpelling});
+  heading_text_data.AddIntListAttribute(
+      ax::mojom::IntListAttribute::kMarkerStarts, {5});
+  heading_text_data.AddIntListAttribute(
+      ax::mojom::IntListAttribute::kMarkerEnds, {9});
+  heading_text_data.SetName("more text");
+
+  ui::AXNodeData mark_data;
+  mark_data.id = 5;
+  mark_data.role = ax::mojom::Role::kMark;
+  mark_data.AddIntAttribute(ax::mojom::IntAttribute::kBackgroundColor,
+                            0xFFADBEEFU);
+  mark_data.AddIntAttribute(ax::mojom::IntAttribute::kColor, 0xFFADC0DEU);
+  mark_data.SetTextDirection(ax::mojom::WritingDirection::kRtl);
+  mark_data.child_ids = {6};
+
+  ui::AXNodeData mark_text_data;
+  mark_text_data.id = 6;
+  mark_text_data.role = ax::mojom::Role::kStaticText;
+  mark_text_data.AddIntAttribute(ax::mojom::IntAttribute::kBackgroundColor,
+                                 0xFFADBEEFU);
+  mark_text_data.AddIntAttribute(ax::mojom::IntAttribute::kColor, 0xFFADC0DEU);
+  mark_text_data.SetTextDirection(ax::mojom::WritingDirection::kRtl);
+  mark_text_data.SetTextAlign(ax::mojom::TextAlign::kNone);
+  mark_text_data.SetName("marked text");
+
+  ui::AXNodeData list_data;
+  list_data.id = 7;
+  list_data.role = ax::mojom::Role::kList;
+  list_data.child_ids = {8, 10};
+  list_data.AddIntAttribute(ax::mojom::IntAttribute::kBackgroundColor,
+                            0xFFADBEEFU);
+  list_data.AddIntAttribute(ax::mojom::IntAttribute::kColor, 0xFFADC0DEU);
+
+  ui::AXNodeData list_item_data;
+  list_item_data.id = 8;
+  list_item_data.role = ax::mojom::Role::kListItem;
+  list_item_data.child_ids = {9};
+  list_item_data.AddIntAttribute(
+      ax::mojom::IntAttribute::kListStyle,
+      static_cast<int>(ax::mojom::ListStyle::kOther));
+  list_item_data.AddIntAttribute(ax::mojom::IntAttribute::kBackgroundColor,
+                                 0xFFADBEEFU);
+  list_item_data.AddIntAttribute(ax::mojom::IntAttribute::kColor, 0xFFADC0DEU);
+
+  ui::AXNodeData list_item_text_data;
+  list_item_text_data.id = 9;
+  list_item_text_data.role = ax::mojom::Role::kStaticText;
+  list_item_text_data.AddIntAttribute(ax::mojom::IntAttribute::kBackgroundColor,
+                                      0xFFADBEEFU);
+  list_item_text_data.AddIntAttribute(ax::mojom::IntAttribute::kColor,
+                                      0xFFADC0DEU);
+  list_item_text_data.SetName("list item");
+
+  ui::AXNodeData list_item2_data;
+  list_item2_data.id = 10;
+  list_item2_data.role = ax::mojom::Role::kListItem;
+  list_item2_data.child_ids = {11};
+  list_item2_data.AddIntAttribute(
+      ax::mojom::IntAttribute::kListStyle,
+      static_cast<int>(ax::mojom::ListStyle::kDisc));
+  list_item2_data.AddIntAttribute(ax::mojom::IntAttribute::kBackgroundColor,
+                                  0xFFADBEEFU);
+  list_item2_data.AddIntAttribute(ax::mojom::IntAttribute::kColor, 0xFFADC0DEU);
+
+  ui::AXNodeData list_item2_text_data;
+  list_item2_text_data.id = 11;
+  list_item2_text_data.role = ax::mojom::Role::kStaticText;
+  list_item2_text_data.AddIntAttribute(
+      ax::mojom::IntAttribute::kBackgroundColor, 0xFFADBEEFU);
+  list_item2_text_data.AddIntAttribute(ax::mojom::IntAttribute::kColor,
+                                       0xFFADC0DEU);
+  list_item2_text_data.SetName("list item 2");
+
+  ui::AXNodeData input_text_data;
+  input_text_data.id = 12;
+  input_text_data.role = ax::mojom::Role::kTextField;
+  input_text_data.AddState(ax::mojom::State::kEditable);
+  input_text_data.AddIntAttribute(
+      ax::mojom::IntAttribute::kNameFrom,
+      static_cast<int>(ax::mojom::NameFrom::kPlaceholder));
+  input_text_data.AddStringAttribute(ax::mojom::StringAttribute::kPlaceholder,
+                                     "placeholder2");
+  input_text_data.AddIntAttribute(ax::mojom::IntAttribute::kBackgroundColor,
+                                  0xFFADBEEFU);
+  input_text_data.AddIntAttribute(ax::mojom::IntAttribute::kColor, 0xFFADC0DEU);
+  input_text_data.AddStringAttribute(ax::mojom::StringAttribute::kHtmlTag,
+                                     "input");
+  input_text_data.AddStringAttribute(ax::mojom::StringAttribute::kInputType,
+                                     "text");
+  input_text_data.SetName("placeholder");
+  input_text_data.child_ids = {13};
+
+  ui::AXNodeData placeholder_text_data;
+  placeholder_text_data.id = 13;
+  placeholder_text_data.role = ax::mojom::Role::kStaticText;
+  placeholder_text_data.AddIntAttribute(
+      ax::mojom::IntAttribute::kBackgroundColor, 0xFFADBEEFU);
+  placeholder_text_data.AddIntAttribute(ax::mojom::IntAttribute::kColor,
+                                        0xFFADC0DEU);
+  placeholder_text_data.SetName("placeholder");
+
+  ui::AXNodeData input_text_data2;
+  input_text_data2.id = 14;
+  input_text_data2.role = ax::mojom::Role::kTextField;
+  input_text_data2.AddState(ax::mojom::State::kEditable);
+  input_text_data2.SetRestriction(ax::mojom::Restriction::kDisabled);
+  input_text_data2.AddStringAttribute(ax::mojom::StringAttribute::kPlaceholder,
+                                      "placeholder2");
+  input_text_data2.AddIntAttribute(ax::mojom::IntAttribute::kBackgroundColor,
+                                   0xFFADBEEFU);
+  input_text_data2.AddIntAttribute(ax::mojom::IntAttribute::kColor,
+                                   0xFFADC0DEU);
+  input_text_data2.AddStringAttribute(ax::mojom::StringAttribute::kHtmlTag,
+                                      "input");
+  input_text_data2.AddStringAttribute(ax::mojom::StringAttribute::kInputType,
+                                      "text");
+  input_text_data2.SetName("foo");
+  input_text_data2.child_ids = {15};
+
+  ui::AXNodeData placeholder_text_data2;
+  placeholder_text_data2.id = 15;
+  placeholder_text_data2.role = ax::mojom::Role::kStaticText;
+  placeholder_text_data2.AddIntAttribute(
+      ax::mojom::IntAttribute::kBackgroundColor, 0xFFADBEEFU);
+  placeholder_text_data2.AddIntAttribute(ax::mojom::IntAttribute::kColor,
+                                         0xFFADC0DEU);
+  placeholder_text_data2.SetName("placeholder2");
+
+  ui::AXNodeData link_data;
+  link_data.id = 16;
+  link_data.role = ax::mojom::Role::kLink;
+  link_data.AddIntAttribute(ax::mojom::IntAttribute::kBackgroundColor,
+                            0xFFADBEEFU);
+  link_data.AddIntAttribute(ax::mojom::IntAttribute::kColor, 0xFFADC0DEU);
+
+  ui::AXNodeData link_text_data;
+  link_text_data.id = 17;
+  link_text_data.role = ax::mojom::Role::kStaticText;
+  link_text_data.AddIntAttribute(ax::mojom::IntAttribute::kBackgroundColor,
+                                 0xFFADBEEFU);
+  link_text_data.AddIntAttribute(ax::mojom::IntAttribute::kColor, 0xFFADC0DEU);
+  link_data.child_ids = {17};
+
+  ui::AXNodeData root_data;
+  root_data.id = 1;
+  root_data.role = ax::mojom::Role::kRootWebArea;
+  root_data.child_ids = {2, 3, 5, 7, 12, 14, 16};
+
+  ui::AXTreeUpdate update;
+  ui::AXTreeData tree_data;
+  tree_data.tree_id = ui::AXTreeID::CreateNewAXTreeID();
+  update.tree_data = tree_data;
+  update.has_tree_data = true;
+  update.root_id = root_data.id;
+  update.nodes.push_back(root_data);
+  update.nodes.push_back(text_data);
+  update.nodes.push_back(heading_data);
+  update.nodes.push_back(heading_text_data);
+  update.nodes.push_back(mark_data);
+  update.nodes.push_back(mark_text_data);
+  update.nodes.push_back(list_data);
+  update.nodes.push_back(list_item_data);
+  update.nodes.push_back(list_item_text_data);
+  update.nodes.push_back(list_item2_data);
+  update.nodes.push_back(list_item2_text_data);
+  update.nodes.push_back(input_text_data);
+  update.nodes.push_back(placeholder_text_data);
+  update.nodes.push_back(input_text_data2);
+  update.nodes.push_back(placeholder_text_data2);
+  update.nodes.push_back(link_data);
+  update.nodes.push_back(link_text_data);
+
+  Init(update);
+
+  AXNode* root_node = GetRootAsAXNode();
+  AXNode* text_node = root_node->children()[0];
+  AXNode* heading_node = root_node->children()[1];
+  AXNode* heading_text_node = heading_node->children()[0];
+  AXNode* mark_node = root_node->children()[2];
+  AXNode* mark_text_node = mark_node->children()[0];
+  AXNode* list_node = root_node->children()[3];
+  AXNode* list_item_node = list_node->children()[0];
+  AXNode* list_item_text_node = list_item_node->children()[0];
+  AXNode* list_item2_node = list_node->children()[1];
+  AXNode* list_item2_text_node = list_item2_node->children()[0];
+  AXNode* input_text_node = root_node->children()[4];
+  AXNode* placeholder_text_node = input_text_node->children()[0];
+  AXNode* input_text_node2 = root_node->children()[5];
+  AXNode* placeholder_text_node2 = input_text_node2->children()[0];
+  AXNode* link_node = root_node->children()[6];
+  AXNode* link_text_node = link_node->children()[0];
+
+  ComPtr<ITextRangeProvider> document_range_provider;
+  GetTextRangeProviderFromTextNode(document_range_provider, root_node);
+  ComPtr<ITextRangeProvider> text_range_provider;
+  GetTextRangeProviderFromTextNode(text_range_provider, text_node);
+  ComPtr<ITextRangeProvider> heading_text_range_provider;
+  GetTextRangeProviderFromTextNode(heading_text_range_provider,
+                                   heading_text_node);
+  ComPtr<ITextRangeProvider> mark_text_range_provider;
+  GetTextRangeProviderFromTextNode(mark_text_range_provider, mark_text_node);
+  ComPtr<ITextRangeProvider> list_item_text_range_provider;
+  GetTextRangeProviderFromTextNode(list_item_text_range_provider,
+                                   list_item_text_node);
+  ComPtr<ITextRangeProvider> list_item2_text_range_provider;
+  GetTextRangeProviderFromTextNode(list_item2_text_range_provider,
+                                   list_item2_text_node);
+
+  ComPtr<ITextRangeProvider> placeholder_text_range_provider;
+  GetTextRangeProviderFromTextNode(placeholder_text_range_provider,
+                                   placeholder_text_node);
+
+  ComPtr<ITextRangeProvider> placeholder_text_range_provider2;
+  GetTextRangeProviderFromTextNode(placeholder_text_range_provider2,
+                                   placeholder_text_node2);
+
+  ComPtr<ITextRangeProvider> link_text_range_provider;
+  GetTextRangeProviderFromTextNode(link_text_range_provider, link_text_node);
+
+  base::win::ScopedVariant expected_variant;
+
+  // SkColor is ARGB, COLORREF is 0BGR
+  expected_variant.Set(static_cast<int32_t>(0x00EFBEADU));
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(text_range_provider,
+                              UIA_BackgroundColorAttributeId, expected_variant);
+  // Important: all nodes need to have the kColor and kBackgroundColor attribute
+  // set for this test, otherwise the following assert will fail.
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(document_range_provider,
+                              UIA_BackgroundColorAttributeId, expected_variant);
+  expected_variant.Reset();
+
+  expected_variant.Set(static_cast<int32_t>(BulletStyle::BulletStyle_None));
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(list_item_text_range_provider,
+                              UIA_BulletStyleAttributeId, expected_variant);
+  expected_variant.Reset();
+
+  expected_variant.Set(
+      static_cast<int32_t>(BulletStyle::BulletStyle_FilledRoundBullet));
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(list_item2_text_range_provider,
+                              UIA_BulletStyleAttributeId, expected_variant);
+  expected_variant.Reset();
+
+  {
+    base::win::ScopedVariant lang_variant;
+    EXPECT_HRESULT_SUCCEEDED(text_range_provider->GetAttributeValue(
+        UIA_CultureAttributeId, lang_variant.Receive()));
+
+    EXPECT_EQ(lang_variant.type(), VT_I4);
+    const LCID lcid = V_I4(lang_variant.ptr());
+    EXPECT_EQ(LANG_FRENCH, PRIMARYLANGID(lcid));
+    EXPECT_EQ(SUBLANG_FRENCH_CANADIAN, SUBLANGID(lcid));
+    EXPECT_EQ(SORT_DEFAULT, SORTIDFROMLCID(lcid));
+  }
+
+  std::wstring font_name = L"sans";
+  expected_variant.Set(SysAllocString(font_name.c_str()));
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(text_range_provider, UIA_FontNameAttributeId,
+                              expected_variant);
+  expected_variant.Reset();
+
+  expected_variant.Set(12.0);
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(text_range_provider, UIA_FontSizeAttributeId,
+                              expected_variant);
+  expected_variant.Reset();
+
+  expected_variant.Set(300);
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(text_range_provider, UIA_FontWeightAttributeId,
+                              expected_variant);
+  expected_variant.Reset();
+
+  // SkColor is ARGB, COLORREF is 0BGR
+  expected_variant.Set(static_cast<int32_t>(0x00DEC0ADU));
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(text_range_provider,
+                              UIA_ForegroundColorAttributeId, expected_variant);
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(document_range_provider,
+                              UIA_ForegroundColorAttributeId, expected_variant);
+  expected_variant.Reset();
+
+  expected_variant.Set(false);
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(text_range_provider, UIA_IsHiddenAttributeId,
+                              expected_variant);
+  expected_variant.Reset();
+
+  EXPECT_UIA_TEXTATTRIBUTE_MIXED(document_range_provider,
+                                 UIA_IsHiddenAttributeId);
+
+  expected_variant.Set(true);
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(text_range_provider, UIA_IsItalicAttributeId,
+                              expected_variant);
+  expected_variant.Reset();
+
+  expected_variant.Set(false);
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(heading_text_range_provider,
+                              UIA_IsItalicAttributeId, expected_variant);
+  expected_variant.Reset();
+
+  expected_variant.Set(true);
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(text_range_provider, UIA_IsReadOnlyAttributeId,
+                              expected_variant);
+  expected_variant.Reset();
+
+  expected_variant.Set(false);
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(heading_text_range_provider,
+                              UIA_IsReadOnlyAttributeId, expected_variant);
+  expected_variant.Reset();
+
+  expected_variant.Set(false);
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(placeholder_text_range_provider,
+                              UIA_IsReadOnlyAttributeId, expected_variant);
+  expected_variant.Reset();
+
+  expected_variant.Set(true);
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(placeholder_text_range_provider2,
+                              UIA_IsReadOnlyAttributeId, expected_variant);
+  expected_variant.Reset();
+
+  expected_variant.Set(true);
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(link_text_range_provider,
+                              UIA_IsReadOnlyAttributeId, expected_variant);
+  expected_variant.Reset();
+
+  expected_variant.Set(HorizontalTextAlignment_Centered);
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(text_range_provider,
+                              UIA_HorizontalTextAlignmentAttributeId,
+                              expected_variant);
+  expected_variant.Reset();
+
+  expected_variant.Set(HorizontalTextAlignment_Justified);
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(heading_text_range_provider,
+                              UIA_HorizontalTextAlignmentAttributeId,
+                              expected_variant);
+  expected_variant.Reset();
+
+  expected_variant.Set(true);
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(text_range_provider, UIA_IsSubscriptAttributeId,
+                              expected_variant);
+  expected_variant.Reset();
+
+  expected_variant.Set(false);
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(heading_text_range_provider,
+                              UIA_IsSubscriptAttributeId, expected_variant);
+  expected_variant.Reset();
+
+  expected_variant.Set(false);
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(text_range_provider, UIA_IsSuperscriptAttributeId,
+                              expected_variant);
+  expected_variant.Reset();
+
+  expected_variant.Set(true);
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(heading_text_range_provider,
+                              UIA_IsSuperscriptAttributeId, expected_variant);
+  expected_variant.Reset();
+
+  expected_variant.Set(TextDecorationLineStyle::TextDecorationLineStyle_Dot);
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(text_range_provider, UIA_OverlineStyleAttributeId,
+                              expected_variant);
+  expected_variant.Reset();
+
+  expected_variant.Set(TextDecorationLineStyle::TextDecorationLineStyle_Dash);
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(
+      text_range_provider, UIA_StrikethroughStyleAttributeId, expected_variant);
+  expected_variant.Reset();
+
+  expected_variant.Set(TextDecorationLineStyle::TextDecorationLineStyle_Single);
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(text_range_provider,
+                              UIA_UnderlineStyleAttributeId, expected_variant);
+  expected_variant.Reset();
+
+  std::wstring style_name;
+  expected_variant.Set(SysAllocString(style_name.c_str()));
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(text_range_provider, UIA_StyleNameAttributeId,
+                              expected_variant);
+  expected_variant.Reset();
+
+  expected_variant.Set(static_cast<int32_t>(StyleId_Heading6));
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(heading_text_range_provider,
+                              UIA_StyleIdAttributeId, expected_variant);
+  expected_variant.Reset();
+
+  style_name = L"mark";
+  expected_variant.Set(SysAllocString(style_name.c_str()));
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(mark_text_range_provider,
+                              UIA_StyleNameAttributeId, expected_variant);
+  expected_variant.Reset();
+
+  expected_variant.Set(static_cast<int32_t>(StyleId_NumberedList));
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(list_item_text_range_provider,
+                              UIA_StyleIdAttributeId, expected_variant);
+  expected_variant.Reset();
+
+  expected_variant.Set(static_cast<int32_t>(StyleId_BulletedList));
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(list_item2_text_range_provider,
+                              UIA_StyleIdAttributeId, expected_variant);
+  expected_variant.Reset();
+
+  expected_variant.Set(
+      static_cast<int32_t>(FlowDirections::FlowDirections_RightToLeft));
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(
+      text_range_provider, UIA_TextFlowDirectionsAttributeId, expected_variant);
+  EXPECT_UIA_TEXTATTRIBUTE_MIXED(document_range_provider,
+                                 UIA_TextFlowDirectionsAttributeId);
+  expected_variant.Reset();
+
+  // Move the start endpoint back and forth one character to force such endpoint
+  // to be located at the end of the previous anchor, this shouldn't cause
+  // GetAttributeValue to include the previous anchor's attributes.
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(mark_text_range_provider,
+                                   TextPatternRangeEndpoint_Start,
+                                   TextUnit_Character,
+                                   /*count*/ -1,
+                                   /*expected_text*/ L"tmarked text",
+                                   /*expected_count*/ -1);
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(mark_text_range_provider,
+                                   TextPatternRangeEndpoint_Start,
+                                   TextUnit_Character,
+                                   /*count*/ 1,
+                                   /*expected_text*/ L"marked text",
+                                   /*expected_count*/ 1);
+  expected_variant.Set(false);
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(mark_text_range_provider,
+                              UIA_IsSuperscriptAttributeId, expected_variant);
+  expected_variant.Reset();
+
+  // Same idea as above, but moving forth and back the end endpoint to force it
+  // to be located at the start of the next anchor.
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(mark_text_range_provider,
+                                   TextPatternRangeEndpoint_End,
+                                   TextUnit_Character,
+                                   /*count*/ 1,
+                                   /*expected_text*/ L"marked textl",
+                                   /*expected_count*/ 1);
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(mark_text_range_provider,
+                                   TextPatternRangeEndpoint_End,
+                                   TextUnit_Character,
+                                   /*count*/ -1,
+                                   /*expected_text*/ L"marked text",
+                                   /*expected_count*/ -1);
+  expected_variant.Set(
+      static_cast<int32_t>(FlowDirections::FlowDirections_RightToLeft));
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(mark_text_range_provider,
+                              UIA_TextFlowDirectionsAttributeId,
+                              expected_variant);
+  expected_variant.Reset();
+
+  {
+    // |text_node| has a grammar error on "some text", a highlight for the
+    // first word, a spelling error for the second word, a "spelling-error"
+    // highlight for the fourth word, and a "grammar-error" highlight for the
+    // fifth word. So the range has mixed annotations.
+    EXPECT_UIA_TEXTATTRIBUTE_MIXED(text_range_provider,
+                                   UIA_AnnotationTypesAttributeId);
+
+    // Testing annotations in range [5,9)
+    // start: TextPosition, anchor_id=2, text_offset=5,
+    //        annotated_text=some <t>ext and some other text
+    // end  : TextPosition, anchor_id=2, text_offset=9,
+    //        annotated_text=some text<> and some other text
+    AXPlatformNodeWin* owner =
+        static_cast<AXPlatformNodeWin*>(AXPlatformNodeFromNode(text_node));
+    ComPtr<AXPlatformNodeTextRangeProviderWin> range_with_annotations;
+    CreateTextRangeProviderWin(
+        range_with_annotations, owner,
+        /*start_anchor=*/text_node, /*start_offset=*/5,
+        /*start_affinity*/ ax::mojom::TextAffinity::kDownstream,
+        /*end_anchor=*/text_node, /*end_offset=*/9,
+        /*end_affinity*/ ax::mojom::TextAffinity::kDownstream);
+
+    base::win::ScopedVariant annotation_types_variant;
+    EXPECT_HRESULT_SUCCEEDED(range_with_annotations->GetAttributeValue(
+        UIA_AnnotationTypesAttributeId, annotation_types_variant.Receive()));
+
+    EXPECT_EQ(annotation_types_variant.type(), VT_ARRAY | VT_I4);
+    std::vector<int> expected_annotations = {AnnotationType_SpellingError,
+                                             AnnotationType_GrammarError};
+    EXPECT_UIA_SAFEARRAY_EQ(V_ARRAY(annotation_types_variant.ptr()),
+                            expected_annotations);
+  }
+
+  {
+    // Testing annotations in range [0,4)
+    // start: TextPosition, anchor_id=2, text_offset=0,
+    //        annotated_text=<s>ome text and some other text
+    // end  : TextPosition, anchor_id=2, text_offset=4,
+    //        annotated_text=some<> text and some other text
+    AXPlatformNodeWin* owner =
+        static_cast<AXPlatformNodeWin*>(AXPlatformNodeFromNode(text_node));
+    ComPtr<AXPlatformNodeTextRangeProviderWin> range_with_annotations;
+    CreateTextRangeProviderWin(
+        range_with_annotations, owner,
+        /*start_anchor=*/text_node, /*start_offset=*/0,
+        /*start_affinity*/ ax::mojom::TextAffinity::kDownstream,
+        /*end_anchor=*/text_node, /*end_offset=*/4,
+        /*end_affinity*/ ax::mojom::TextAffinity::kDownstream);
+
+    base::win::ScopedVariant annotation_types_variant;
+    EXPECT_HRESULT_SUCCEEDED(range_with_annotations->GetAttributeValue(
+        UIA_AnnotationTypesAttributeId, annotation_types_variant.Receive()));
+
+    EXPECT_EQ(annotation_types_variant.type(), VT_ARRAY | VT_I4);
+    std::vector<int> expected_annotations = {AnnotationType_GrammarError,
+                                             AnnotationType_Highlighted};
+    EXPECT_UIA_SAFEARRAY_EQ(V_ARRAY(annotation_types_variant.ptr()),
+                            expected_annotations);
+  }
+
+  {
+    // Testing annotations in range [14,18)
+    // start: TextPosition, anchor_id=2, text_offset=14,
+    //        annotated_text=some text and <s>ome other text
+    // end  : TextPosition, anchor_id=2, text_offset=18,
+    //        annotated_text=some text and some<> other text
+    AXPlatformNodeWin* owner =
+        static_cast<AXPlatformNodeWin*>(AXPlatformNodeFromNode(text_node));
+    ComPtr<AXPlatformNodeTextRangeProviderWin> range_with_annotations;
+    CreateTextRangeProviderWin(
+        range_with_annotations, owner,
+        /*start_anchor=*/text_node, /*start_offset=*/14,
+        /*start_affinity*/ ax::mojom::TextAffinity::kDownstream,
+        /*end_anchor=*/text_node, /*end_offset=*/18,
+        /*end_affinity*/ ax::mojom::TextAffinity::kDownstream);
+
+    base::win::ScopedVariant annotation_types_variant;
+    EXPECT_HRESULT_SUCCEEDED(range_with_annotations->GetAttributeValue(
+        UIA_AnnotationTypesAttributeId, annotation_types_variant.Receive()));
+
+    EXPECT_EQ(annotation_types_variant.type(), VT_ARRAY | VT_I4);
+    std::vector<int> expected_annotations = {AnnotationType_SpellingError};
+    EXPECT_UIA_SAFEARRAY_EQ(V_ARRAY(annotation_types_variant.ptr()),
+                            expected_annotations);
+  }
+
+  {
+    // Testing annotations in range [19,24)
+    // start: TextPosition, anchor_id=2, text_offset=19,
+    //        annotated_text=some text and some <o>ther text
+    // end  : TextPosition, anchor_id=2, text_offset=24,
+    //        annotated_text=some text and some other<> text
+    AXPlatformNodeWin* owner =
+        static_cast<AXPlatformNodeWin*>(AXPlatformNodeFromNode(text_node));
+    ComPtr<AXPlatformNodeTextRangeProviderWin> range_with_annotations;
+    CreateTextRangeProviderWin(
+        range_with_annotations, owner,
+        /*start_anchor=*/text_node, /*start_offset=*/19,
+        /*start_affinity*/ ax::mojom::TextAffinity::kDownstream,
+        /*end_anchor=*/text_node, /*end_offset=*/24,
+        /*end_affinity*/ ax::mojom::TextAffinity::kDownstream);
+
+    base::win::ScopedVariant annotation_types_variant;
+    EXPECT_HRESULT_SUCCEEDED(range_with_annotations->GetAttributeValue(
+        UIA_AnnotationTypesAttributeId, annotation_types_variant.Receive()));
+
+    EXPECT_EQ(annotation_types_variant.type(), VT_ARRAY | VT_I4);
+    std::vector<int> expected_annotations = {AnnotationType_GrammarError};
+    EXPECT_UIA_SAFEARRAY_EQ(V_ARRAY(annotation_types_variant.ptr()),
+                            expected_annotations);
+  }
+
+  {
+    // |heading_text_node| has a spelling error for one word, and no
+    // annotations for the remaining text, so the range has mixed annotations.
+    EXPECT_UIA_TEXTATTRIBUTE_MIXED(heading_text_range_provider,
+                                   UIA_AnnotationTypesAttributeId);
+
+    // start: TextPosition, anchor_id=4, text_offset=5,
+    //        annotated_text=more <t>ext
+    // end  : TextPosition, anchor_id=4, text_offset=9,
+    //        annotated_text=more text<>
+    AXPlatformNodeWin* owner = static_cast<AXPlatformNodeWin*>(
+        AXPlatformNodeFromNode(heading_text_node));
+    ComPtr<AXPlatformNodeTextRangeProviderWin> range_with_annotations;
+    CreateTextRangeProviderWin(
+        range_with_annotations, owner,
+        /*start_anchor=*/heading_text_node, /*start_offset=*/5,
+        /*start_affinity*/ ax::mojom::TextAffinity::kDownstream,
+        /*end_anchor=*/heading_text_node, /*end_offset=*/9,
+        /*end_affinity*/ ax::mojom::TextAffinity::kDownstream);
+
+    base::win::ScopedVariant annotation_types_variant;
+    EXPECT_HRESULT_SUCCEEDED(range_with_annotations->GetAttributeValue(
+        UIA_AnnotationTypesAttributeId, annotation_types_variant.Receive()));
+
+    std::vector<int> expected_annotations = {AnnotationType_SpellingError};
+    EXPECT_UIA_SAFEARRAY_EQ(V_ARRAY(annotation_types_variant.ptr()),
+                            expected_annotations);
+  }
+
+  {
+    base::win::ScopedVariant empty_variant;
+    EXPECT_UIA_TEXTATTRIBUTE_EQ(mark_text_range_provider,
+                                UIA_AnnotationTypesAttributeId, empty_variant);
+  }
+}
+
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       DISABLED_TestITextRangeProviderGetAttributeValueAnnotationObjects) {
+  // rootWebArea id=1
+  // ++mark id=2 detailsIds=comment1 comment2 highlighted
+  // ++++staticText id=3 name="some text"
+  // ++comment id=4 name="comment 1"
+  // ++++staticText id=5 name="comment 1"
+  // ++comment id=6 name="comment 2"
+  // ++++staticText id=7 name="comment 2"
+  // ++mark id=8 name="highlighted"
+  // ++++staticText id=9 name="highlighted"
+
+  AXNodeData root;
+  AXNodeData annotation_target;
+  AXNodeData some_text;
+  AXNodeData comment1;
+  AXNodeData comment1_text;
+  AXNodeData comment2;
+  AXNodeData comment2_text;
+  AXNodeData highlighted;
+  AXNodeData highlighted_text;
+
+  root.id = 1;
+  annotation_target.id = 2;
+  some_text.id = 3;
+  comment1.id = 4;
+  comment1_text.id = 5;
+  comment2.id = 6;
+  comment2_text.id = 7;
+  highlighted.id = 8;
+  highlighted_text.id = 9;
+
+  root.role = ax::mojom::Role::kRootWebArea;
+  root.SetName("root");
+  root.child_ids = {annotation_target.id, comment1.id, comment2.id,
+                    highlighted.id};
+
+  annotation_target.role = ax::mojom::Role::kMark;
+  annotation_target.child_ids = {some_text.id};
+  annotation_target.AddIntListAttribute(
+      ax::mojom::IntListAttribute::kDetailsIds,
+      {comment1.id, comment2.id, highlighted.id});
+
+  some_text.role = ax::mojom::Role::kStaticText;
+  some_text.SetName("some text");
+
+  comment1.role = ax::mojom::Role::kComment;
+  comment1.SetName("comment 1");
+  comment1.child_ids = {comment1_text.id};
+
+  comment1_text.role = ax::mojom::Role::kStaticText;
+  comment1_text.SetName("comment 1");
+
+  comment2.role = ax::mojom::Role::kComment;
+  comment2.SetName("comment 2");
+  comment2.child_ids = {comment2_text.id};
+
+  comment2_text.role = ax::mojom::Role::kStaticText;
+  comment2_text.SetName("comment 2");
+
+  highlighted.role = ax::mojom::Role::kMark;
+  highlighted.SetName("highlighted");
+  highlighted.child_ids = {highlighted_text.id};
+
+  highlighted_text.role = ax::mojom::Role::kStaticText;
+  highlighted_text.SetName("highlighted");
+
+  ui::AXTreeUpdate update;
+  update.has_tree_data = true;
+  update.root_id = root.id;
+  update.nodes = {root,          annotation_target, some_text,
+                  comment1,      comment1_text,     comment2,
+                  comment2_text, highlighted,       highlighted_text};
+  update.tree_data.tree_id = ui::AXTreeID::CreateNewAXTreeID();
+
+  Init(update);
+
+  AXNode* root_node = GetRootAsAXNode();
+  AXNode* annotation_target_node = root_node->children()[0];
+  AXNode* comment1_node = root_node->children()[1];
+  AXNode* comment2_node = root_node->children()[2];
+  AXNode* highlighted_node = root_node->children()[3];
+
+  ComPtr<AXPlatformNodeTextRangeProviderWin> some_text_range_provider;
+
+  // Create a text range encapsulates |annotation_target_node| with content
+  // "some text".
+  // start: TextPosition, anchor_id=2, text_offset=0, annotated_text=<s>ome text
+  // end  : TextPosition, anchor_id=2, text_offset=9, annotated_text=some text<>
+  AXPlatformNodeWin* owner = static_cast<AXPlatformNodeWin*>(
+      AXPlatformNodeFromNode(annotation_target_node));
+  CreateTextRangeProviderWin(
+      some_text_range_provider, owner,
+      /*start_anchor=*/annotation_target_node, /*start_offset=*/0,
+      /*start_affinity*/ ax::mojom::TextAffinity::kDownstream,
+      /*end_anchor=*/annotation_target_node, /*end_offset=*/9,
+      /*end_affinity*/ ax::mojom::TextAffinity::kDownstream);
+  ASSERT_NE(nullptr, some_text_range_provider.Get());
+  EXPECT_UIA_TEXTRANGE_EQ(some_text_range_provider, L"some text");
+
+  ComPtr<IRawElementProviderSimple> comment1_provider =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(comment1_node);
+  ASSERT_NE(nullptr, comment1_provider.Get());
+  ComPtr<IRawElementProviderSimple> comment2_provider =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(comment2_node);
+  ASSERT_NE(nullptr, comment2_provider.Get());
+  ComPtr<IRawElementProviderSimple> highlighted_provider =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(highlighted_node);
+  ASSERT_NE(nullptr, highlighted_provider.Get());
+
+  ComPtr<IAnnotationProvider> annotation_provider;
+  int annotation_type;
+
+  // Validate |comment1_node| with Role::kComment supports IAnnotationProvider.
+  EXPECT_HRESULT_SUCCEEDED(comment1_provider->GetPatternProvider(
+      UIA_AnnotationPatternId, &annotation_provider));
+  ASSERT_NE(nullptr, annotation_provider.Get());
+  EXPECT_HRESULT_SUCCEEDED(
+      annotation_provider->get_AnnotationTypeId(&annotation_type));
+  EXPECT_EQ(AnnotationType_Comment, annotation_type);
+  annotation_provider.Reset();
+
+  // Validate |comment2_node| with Role::kComment supports IAnnotationProvider.
+  EXPECT_HRESULT_SUCCEEDED(comment2_provider->GetPatternProvider(
+      UIA_AnnotationPatternId, &annotation_provider));
+  ASSERT_NE(nullptr, annotation_provider.Get());
+  EXPECT_HRESULT_SUCCEEDED(
+      annotation_provider->get_AnnotationTypeId(&annotation_type));
+  EXPECT_EQ(AnnotationType_Comment, annotation_type);
+  annotation_provider.Reset();
+
+  // Validate |highlighted_node| with Role::kMark supports
+  // IAnnotationProvider.
+  EXPECT_HRESULT_SUCCEEDED(highlighted_provider->GetPatternProvider(
+      UIA_AnnotationPatternId, &annotation_provider));
+  ASSERT_NE(nullptr, annotation_provider.Get());
+  EXPECT_HRESULT_SUCCEEDED(
+      annotation_provider->get_AnnotationTypeId(&annotation_type));
+  EXPECT_EQ(AnnotationType_Highlighted, annotation_type);
+  annotation_provider.Reset();
+
+  base::win::ScopedVariant annotation_objects_variant;
+  EXPECT_HRESULT_SUCCEEDED(some_text_range_provider->GetAttributeValue(
+      UIA_AnnotationObjectsAttributeId, annotation_objects_variant.Receive()));
+  EXPECT_EQ(VT_UNKNOWN | VT_ARRAY, annotation_objects_variant.type());
+
+  std::vector<std::wstring> expected_names = {L"comment 1", L"comment 2",
+                                              L"highlighted"};
+  EXPECT_UIA_ELEMENT_ARRAY_BSTR_EQ(V_ARRAY(annotation_objects_variant.ptr()),
+                                   UIA_NamePropertyId, expected_names);
+}
+
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       DISABLED_TestITextRangeProviderGetAttributeValueAnnotationObjectsMixed) {
+  // rootWebArea id=1
+  // ++mark id=2 detailsIds=comment
+  // ++++staticText id=3 name="some text"
+  // ++staticText id=4 name="read only" restriction=readOnly
+  // ++comment id=5 name="comment 1"
+  // ++++staticText id=6 name="comment 1"
+
+  AXNodeData root;
+  AXNodeData highlighted;
+  AXNodeData some_text;
+  AXNodeData readonly_text;
+  AXNodeData comment1;
+  AXNodeData comment1_text;
+
+  root.id = 1;
+  highlighted.id = 2;
+  some_text.id = 3;
+  readonly_text.id = 4;
+  comment1.id = 5;
+  comment1_text.id = 6;
+
+  root.role = ax::mojom::Role::kRootWebArea;
+  root.SetName("root");
+  root.child_ids = {highlighted.id, readonly_text.id, comment1.id};
+
+  highlighted.role = ax::mojom::Role::kMark;
+  highlighted.child_ids = {some_text.id};
+  highlighted.AddIntListAttribute(ax::mojom::IntListAttribute::kDetailsIds,
+                                  {comment1.id});
+
+  some_text.role = ax::mojom::Role::kStaticText;
+  some_text.SetName("some text");
+
+  readonly_text.role = ax::mojom::Role::kStaticText;
+  readonly_text.SetRestriction(ax::mojom::Restriction::kReadOnly);
+  readonly_text.SetName("read only");
+
+  comment1.role = ax::mojom::Role::kComment;
+  comment1.SetName("comment 1");
+  comment1.child_ids = {comment1_text.id};
+
+  comment1_text.role = ax::mojom::Role::kStaticText;
+  comment1_text.SetName("comment 1");
+
+  ui::AXTreeUpdate update;
+  update.has_tree_data = true;
+  update.root_id = root.id;
+  update.nodes = {root,          highlighted, some_text,
+                  readonly_text, comment1,    comment1_text};
+  update.tree_data.tree_id = ui::AXTreeID::CreateNewAXTreeID();
+
+  Init(update);
+
+  AXNode* root_node = GetRootAsAXNode();
+  AXNode* highlighted_node = root_node->children()[0];
+  AXNode* some_text_node = highlighted_node->children()[0];
+  AXNode* readonly_text_node = root_node->children()[1];
+  AXNode* comment1_node = root_node->children()[2];
+
+  // Create a text range encapsulates |highlighted_node| with content
+  // "some text".
+  // start: TextPosition, anchor_id=2, text_offset=0, annotated_text=<s>ome text
+  // end  : TextPosition, anchor_id=2, text_offset=9, annotated_text=some text<>
+  ComPtr<AXPlatformNodeTextRangeProviderWin> some_text_range_provider;
+  AXPlatformNodeWin* owner =
+      static_cast<AXPlatformNodeWin*>(AXPlatformNodeFromNode(highlighted_node));
+  CreateTextRangeProviderWin(
+      some_text_range_provider, owner,
+      /*start_anchor=*/highlighted_node, /*start_offset=*/0,
+      /*start_affinity*/ ax::mojom::TextAffinity::kDownstream,
+      /*end_anchor=*/highlighted_node, /*end_offset=*/9,
+      /*end_affinity*/ ax::mojom::TextAffinity::kDownstream);
+  ASSERT_NE(nullptr, some_text_range_provider.Get());
+  EXPECT_UIA_TEXTRANGE_EQ(some_text_range_provider, L"some text");
+
+  ComPtr<ITextRangeProvider> readonly_text_range_provider;
+  GetTextRangeProviderFromTextNode(readonly_text_range_provider,
+                                   readonly_text_node);
+  ASSERT_NE(nullptr, readonly_text_range_provider.Get());
+
+  ComPtr<IRawElementProviderSimple> comment1_provider =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(comment1_node);
+  ASSERT_NE(nullptr, comment1_provider.Get());
+
+  ComPtr<IAnnotationProvider> annotation_provider;
+  int annotation_type;
+  base::win::ScopedVariant expected_variant;
+
+  // Validate |comment1_node| with Role::kComment supports IAnnotationProvider.
+  EXPECT_HRESULT_SUCCEEDED(comment1_provider->GetPatternProvider(
+      UIA_AnnotationPatternId, &annotation_provider));
+  ASSERT_NE(nullptr, annotation_provider.Get());
+  EXPECT_HRESULT_SUCCEEDED(
+      annotation_provider->get_AnnotationTypeId(&annotation_type));
+  EXPECT_EQ(AnnotationType_Comment, annotation_type);
+  annotation_provider.Reset();
+
+  // Validate text range "some text" supports AnnotationObjectsAttribute.
+  EXPECT_HRESULT_SUCCEEDED(some_text_range_provider->GetAttributeValue(
+      UIA_AnnotationObjectsAttributeId, expected_variant.Receive()));
+  EXPECT_EQ(VT_UNKNOWN | VT_ARRAY, expected_variant.type());
+
+  std::vector<std::wstring> expected_names = {L"comment 1"};
+  EXPECT_UIA_ELEMENT_ARRAY_BSTR_EQ(V_ARRAY(expected_variant.ptr()),
+                                   UIA_NamePropertyId, expected_names);
+  expected_variant.Reset();
+
+  // Validate text range "read only" supports IsReadOnlyAttribute.
+  // Use IsReadOnly on text range "read only" as a second property in order to
+  // test the "mixed" property in the following section.
+  expected_variant.Set(true);
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(readonly_text_range_provider,
+                              UIA_IsReadOnlyAttributeId, expected_variant);
+
+  // Validate text range "some textread only" returns mixed attribute.
+  // start: TextPosition, anchor_id=2, text_offset=0, annotated_text=<s>ome text
+  // end  : TextPosition, anchor_id=3, text_offset=9, annotated_text=read only<>
+  ComPtr<AXPlatformNodeTextRangeProviderWin> mixed_text_range_provider;
+  CreateTextRangeProviderWin(
+      mixed_text_range_provider, owner,
+      /*start_anchor=*/some_text_node, /*start_offset=*/0,
+      /*start_affinity*/ ax::mojom::TextAffinity::kDownstream,
+      /*end_anchor=*/readonly_text_node, /*end_offset=*/9,
+      /*end_affinity*/ ax::mojom::TextAffinity::kDownstream);
+
+  EXPECT_UIA_TEXTRANGE_EQ(mixed_text_range_provider, L"some textread only");
+  EXPECT_UIA_TEXTATTRIBUTE_MIXED(mixed_text_range_provider,
+                                 UIA_AnnotationObjectsAttributeId);
+}
+
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       TestITextRangeProviderGetAttributeValueNotSupported) {
+  ui::AXNodeData root_data;
+  root_data.id = 1;
+  root_data.role = ax::mojom::Role::kRootWebArea;
+
+  ui::AXNodeData text_data_first;
+  text_data_first.id = 2;
+  text_data_first.role = ax::mojom::Role::kStaticText;
+  text_data_first.SetName("first");
+  root_data.child_ids.push_back(text_data_first.id);
+
+  ui::AXNodeData text_data_second;
+  text_data_second.id = 3;
+  text_data_second.role = ax::mojom::Role::kStaticText;
+  text_data_second.SetName("second");
+  root_data.child_ids.push_back(text_data_second.id);
+
+  ui::AXTreeUpdate update;
+  ui::AXTreeData tree_data;
+  tree_data.tree_id = ui::AXTreeID::CreateNewAXTreeID();
+  update.tree_data = tree_data;
+  update.has_tree_data = true;
+  update.root_id = root_data.id;
+  update.nodes.push_back(root_data);
+  update.nodes.push_back(text_data_first);
+  update.nodes.push_back(text_data_second);
+
+  Init(update);
+
+  ComPtr<ITextRangeProvider> document_range_provider;
+  GetTextRangeProviderFromTextNode(document_range_provider, GetRootAsAXNode());
+
+  EXPECT_UIA_TEXTATTRIBUTE_NOTSUPPORTED(document_range_provider,
+                                        UIA_AfterParagraphSpacingAttributeId);
+  EXPECT_UIA_TEXTATTRIBUTE_NOTSUPPORTED(document_range_provider,
+                                        UIA_AnimationStyleAttributeId);
+  EXPECT_UIA_TEXTATTRIBUTE_NOTSUPPORTED(document_range_provider,
+                                        UIA_BeforeParagraphSpacingAttributeId);
+  EXPECT_UIA_TEXTATTRIBUTE_NOTSUPPORTED(document_range_provider,
+                                        UIA_CapStyleAttributeId);
+  EXPECT_UIA_TEXTATTRIBUTE_NOTSUPPORTED(document_range_provider,
+                                        UIA_CaretBidiModeAttributeId);
+  EXPECT_UIA_TEXTATTRIBUTE_NOTSUPPORTED(document_range_provider,
+                                        UIA_CaretPositionAttributeId);
+  EXPECT_UIA_TEXTATTRIBUTE_NOTSUPPORTED(document_range_provider,
+                                        UIA_IndentationFirstLineAttributeId);
+  EXPECT_UIA_TEXTATTRIBUTE_NOTSUPPORTED(document_range_provider,
+                                        UIA_IndentationLeadingAttributeId);
+  EXPECT_UIA_TEXTATTRIBUTE_NOTSUPPORTED(document_range_provider,
+                                        UIA_IndentationTrailingAttributeId);
+  EXPECT_UIA_TEXTATTRIBUTE_NOTSUPPORTED(document_range_provider,
+                                        UIA_IsActiveAttributeId);
+  EXPECT_UIA_TEXTATTRIBUTE_NOTSUPPORTED(document_range_provider,
+                                        UIA_LineSpacingAttributeId);
+  EXPECT_UIA_TEXTATTRIBUTE_NOTSUPPORTED(document_range_provider,
+                                        UIA_LinkAttributeId);
+  EXPECT_UIA_TEXTATTRIBUTE_NOTSUPPORTED(document_range_provider,
+                                        UIA_MarginBottomAttributeId);
+  EXPECT_UIA_TEXTATTRIBUTE_NOTSUPPORTED(document_range_provider,
+                                        UIA_MarginLeadingAttributeId);
+  EXPECT_UIA_TEXTATTRIBUTE_NOTSUPPORTED(document_range_provider,
+                                        UIA_MarginTopAttributeId);
+  EXPECT_UIA_TEXTATTRIBUTE_NOTSUPPORTED(document_range_provider,
+                                        UIA_MarginTrailingAttributeId);
+  EXPECT_UIA_TEXTATTRIBUTE_NOTSUPPORTED(document_range_provider,
+                                        UIA_OutlineStylesAttributeId);
+  EXPECT_UIA_TEXTATTRIBUTE_NOTSUPPORTED(document_range_provider,
+                                        UIA_OverlineColorAttributeId);
+  EXPECT_UIA_TEXTATTRIBUTE_NOTSUPPORTED(document_range_provider,
+                                        UIA_SelectionActiveEndAttributeId);
+  EXPECT_UIA_TEXTATTRIBUTE_NOTSUPPORTED(document_range_provider,
+                                        UIA_StrikethroughColorAttributeId);
+  EXPECT_UIA_TEXTATTRIBUTE_NOTSUPPORTED(document_range_provider,
+                                        UIA_TabsAttributeId);
+  EXPECT_UIA_TEXTATTRIBUTE_NOTSUPPORTED(document_range_provider,
+                                        UIA_UnderlineColorAttributeId);
+}
+
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       TestITextRangeProviderGetAttributeValueWithAncestorTextPosition) {
+  ui::AXTreeUpdate initial_state;
+  ui::AXTreeID tree_id = ui::AXTreeID::CreateNewAXTreeID();
+  initial_state.tree_data.tree_id = tree_id;
+  initial_state.has_tree_data = true;
+  initial_state.root_id = 1;
+  initial_state.nodes.resize(5);
+  initial_state.nodes[0].id = 1;
+  initial_state.nodes[0].child_ids = {2};
+  initial_state.nodes[0].role = ax::mojom::Role::kRootWebArea;
+  initial_state.nodes[1].id = 2;
+  initial_state.nodes[1].child_ids = {3};
+  initial_state.nodes[1].role = ax::mojom::Role::kGenericContainer;
+  initial_state.nodes[2].id = 3;
+  initial_state.nodes[2].child_ids = {4, 5};
+  initial_state.nodes[2].role = ax::mojom::Role::kGenericContainer;
+  initial_state.nodes[3].id = 4;
+  initial_state.nodes[3].role = ax::mojom::Role::kStaticText;
+  initial_state.nodes[3].SetName("some text");
+  initial_state.nodes[3].AddIntAttribute(
+      ax::mojom::IntAttribute::kBackgroundColor, 0xFFADBEEFU);
+  initial_state.nodes[4].id = 5;
+  initial_state.nodes[4].role = ax::mojom::Role::kStaticText;
+  initial_state.nodes[4].SetName("more text");
+  initial_state.nodes[4].AddIntAttribute(
+      ax::mojom::IntAttribute::kBackgroundColor, 0xFFADBEEFU);
+
+  Init(initial_state);
+  const AXTree* tree = GetTree();
+  const AXNode* some_text_node = tree->GetFromId(4);
+  const AXNode* more_text_node = tree->GetFromId(5);
+
+  // Making |owner| AXID:2 so that |TestAXNodeWrapper::BuildAllWrappers|
+  // will build the entire subtree, and not only AXID:3 for example.
+  AXPlatformNodeWin* owner = static_cast<AXPlatformNodeWin*>(
+      AXPlatformNodeFromNode(GetNodeFromTree(tree_id, 2)));
+
+  // start: TextPosition, anchor_id=4, text_offset=0, annotated_text=<s>ome text
+  // end  : TextPosition, anchor_id=5, text_offset=8,
+  //        annotated_text=more tex<t>
+  ComPtr<AXPlatformNodeTextRangeProviderWin> text_range_provider_win;
+  CreateTextRangeProviderWin(
+      text_range_provider_win, owner,
+      /*start_anchor=*/some_text_node, /*start_offset=*/0,
+      /*start_affinity*/ ax::mojom::TextAffinity::kDownstream,
+      /*end_anchor=*/more_text_node, /*end_offset=*/8,
+      /*end_affinity*/ ax::mojom::TextAffinity::kDownstream);
+
+  ASSERT_TRUE(GetStart(text_range_provider_win.Get())->IsTextPosition());
+  ASSERT_EQ(4, GetStart(text_range_provider_win.Get())->anchor_id());
+  ASSERT_EQ(0, GetStart(text_range_provider_win.Get())->text_offset());
+  ASSERT_TRUE(GetEnd(text_range_provider_win.Get())->IsTextPosition());
+  ASSERT_EQ(5, GetEnd(text_range_provider_win.Get())->anchor_id());
+  ASSERT_EQ(8, GetEnd(text_range_provider_win.Get())->text_offset());
+
+  base::win::ScopedVariant expected_variant;
+  // SkColor is ARGB, COLORREF is 0BGR
+  expected_variant.Set(static_cast<int32_t>(0x00EFBEADU));
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(text_range_provider_win,
+                              UIA_BackgroundColorAttributeId, expected_variant);
+}
+
+TEST_F(AXPlatformNodeTextRangeProviderTest, TestITextRangeProviderSelect) {
+  Init(BuildTextDocument({"some text", "more text2"}));
+  AXNode* root_node = GetRootAsAXNode();
+
+  // Text range for the document, which contains text "some textmore text2".
+  ComPtr<IRawElementProviderSimple> root_node_raw =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(root_node);
+  ComPtr<ITextProvider> document_provider;
+  ComPtr<ITextRangeProvider> document_text_range_provider;
+  ComPtr<AXPlatformNodeTextRangeProviderWin> document_text_range;
+  EXPECT_HRESULT_SUCCEEDED(
+      root_node_raw->GetPatternProvider(UIA_TextPatternId, &document_provider));
+  EXPECT_HRESULT_SUCCEEDED(
+      document_provider->get_DocumentRange(&document_text_range_provider));
+  document_text_range_provider->QueryInterface(
+      IID_PPV_ARGS(&document_text_range));
+  AXPlatformNodeWin* owner_platform =
+      static_cast<AXPlatformNodeWin*>(AXPlatformNodeFromNode(root_node));
+  ASSERT_NE(owner_platform, nullptr);
+  SetOwner(owner_platform, document_text_range_provider.Get());
+
+  // Text range related to "some text".
+  ComPtr<ITextRangeProvider> text_range_provider;
+  GetTextRangeProviderFromTextNode(text_range_provider,
+                                   root_node->children()[0]);
+  ComPtr<AXPlatformNodeTextRangeProviderWin> text_range;
+  EXPECT_HRESULT_SUCCEEDED(
+      text_range_provider->QueryInterface(IID_PPV_ARGS(&text_range)));
+
+  // Text range related to "more text2".
+  ComPtr<ITextRangeProvider> more_text_range_provider;
+  GetTextRangeProviderFromTextNode(more_text_range_provider,
+                                   root_node->children()[1]);
+  SetOwner(owner_platform, more_text_range_provider.Get());
+  ComPtr<AXPlatformNodeTextRangeProviderWin> more_text_range;
+  more_text_range_provider->QueryInterface(IID_PPV_ARGS(&more_text_range));
+
+  AXPlatformNodeDelegate* delegate =
+      GetOwner(document_text_range.Get())->GetDelegate();
+
+  ComPtr<ITextRangeProvider> selected_text_range_provider;
+  base::win::ScopedSafearray selection;
+  LONG index = 0;
+  LONG ubound;
+  LONG lbound;
+
+  // Text range "some text" performs select.
+  {
+    text_range_provider->Select();
+
+    // Verify selection.
+    AXTree::Selection unignored_selection = delegate->GetUnignoredSelection();
+    EXPECT_EQ(3, unignored_selection.anchor_object_id);
+    EXPECT_EQ(3, unignored_selection.focus_object_id);
+    EXPECT_EQ(0, unignored_selection.anchor_offset);
+    EXPECT_EQ(9, unignored_selection.focus_offset);
+
+    // Verify the content of the selection.
+    document_provider->GetSelection(selection.Receive());
+    ASSERT_NE(nullptr, selection.Get());
+
+    EXPECT_HRESULT_SUCCEEDED(SafeArrayGetUBound(selection.Get(), 1, &ubound));
+    EXPECT_EQ(0, ubound);
+    EXPECT_HRESULT_SUCCEEDED(SafeArrayGetLBound(selection.Get(), 1, &lbound));
+    EXPECT_EQ(0, lbound);
+    EXPECT_HRESULT_SUCCEEDED(SafeArrayGetElement(
+        selection.Get(), &index,
+        static_cast<void**>(&selected_text_range_provider)));
+    SetOwner(owner_platform, selected_text_range_provider.Get());
+    EXPECT_UIA_TEXTRANGE_EQ(selected_text_range_provider, L"some text");
+
+    selected_text_range_provider.Reset();
+    selection.Reset();
+  }
+
+  // Text range "more text2" performs select.
+  {
+    more_text_range_provider->Select();
+
+    // Verify selection
+    AXTree::Selection unignored_selection = delegate->GetUnignoredSelection();
+    EXPECT_EQ(5, unignored_selection.anchor_object_id);
+    EXPECT_EQ(5, unignored_selection.focus_object_id);
+    EXPECT_EQ(0, unignored_selection.anchor_offset);
+    EXPECT_EQ(10, unignored_selection.focus_offset);
+
+    // Verify the content of the selection.
+    document_provider->GetSelection(selection.Receive());
+    ASSERT_NE(nullptr, selection.Get());
+
+    EXPECT_HRESULT_SUCCEEDED(SafeArrayGetUBound(selection.Get(), 1, &ubound));
+    EXPECT_EQ(0, ubound);
+    EXPECT_HRESULT_SUCCEEDED(SafeArrayGetLBound(selection.Get(), 1, &lbound));
+    EXPECT_EQ(0, lbound);
+    EXPECT_HRESULT_SUCCEEDED(SafeArrayGetElement(
+        selection.Get(), &index,
+        static_cast<void**>(&selected_text_range_provider)));
+    SetOwner(owner_platform, selected_text_range_provider.Get());
+    EXPECT_UIA_TEXTRANGE_EQ(selected_text_range_provider, L"more text2");
+
+    selected_text_range_provider.Reset();
+    selection.Reset();
+  }
+
+  // Document text range "some textmore text2" performs select.
+  {
+    document_text_range_provider->Select();
+
+    // Verify selection.
+    AXTree::Selection unignored_selection = delegate->GetUnignoredSelection();
+    EXPECT_EQ(3, unignored_selection.anchor_object_id);
+    EXPECT_EQ(5, unignored_selection.focus_object_id);
+    EXPECT_EQ(0, unignored_selection.anchor_offset);
+    EXPECT_EQ(10, unignored_selection.focus_offset);
+
+    // Verify the content of the selection.
+    document_provider->GetSelection(selection.Receive());
+    ASSERT_NE(nullptr, selection.Get());
+
+    document_provider->GetSelection(selection.Receive());
+    EXPECT_HRESULT_SUCCEEDED(SafeArrayGetUBound(selection.Get(), 1, &ubound));
+    EXPECT_EQ(0, ubound);
+    EXPECT_HRESULT_SUCCEEDED(SafeArrayGetLBound(selection.Get(), 1, &lbound));
+    EXPECT_EQ(0, lbound);
+    EXPECT_HRESULT_SUCCEEDED(SafeArrayGetElement(
+        selection.Get(), &index,
+        static_cast<void**>(&selected_text_range_provider)));
+    SetOwner(owner_platform, selected_text_range_provider.Get());
+    EXPECT_UIA_TEXTRANGE_EQ(selected_text_range_provider,
+                            L"some textmore text2");
+  }
+
+  // A degenerate text range performs select.
+  {
+    // Move the endpoint of text range so it becomes degenerate, then select.
+    text_range_provider->MoveEndpointByRange(TextPatternRangeEndpoint_Start,
+                                             text_range_provider.Get(),
+                                             TextPatternRangeEndpoint_End);
+    text_range_provider->Select();
+
+    // Verify selection.
+    AXTree::Selection unignored_selection = delegate->GetUnignoredSelection();
+    EXPECT_EQ(3, unignored_selection.anchor_object_id);
+    EXPECT_EQ(3, unignored_selection.focus_object_id);
+    EXPECT_EQ(9, unignored_selection.anchor_offset);
+    EXPECT_EQ(9, unignored_selection.focus_offset);
+
+    // Verify selection on degenerate range.
+    document_provider->GetSelection(selection.Receive());
+    ASSERT_NE(nullptr, selection.Get());
+
+    EXPECT_HRESULT_SUCCEEDED(SafeArrayGetUBound(selection.Get(), 1, &ubound));
+    EXPECT_EQ(0, ubound);
+    EXPECT_HRESULT_SUCCEEDED(SafeArrayGetLBound(selection.Get(), 1, &lbound));
+    EXPECT_EQ(0, lbound);
+    EXPECT_HRESULT_SUCCEEDED(SafeArrayGetElement(
+        selection.Get(), &index,
+        static_cast<void**>(&selected_text_range_provider)));
+    SetOwner(owner_platform, selected_text_range_provider.Get());
+    EXPECT_UIA_TEXTRANGE_EQ(selected_text_range_provider, L"");
+
+    selected_text_range_provider.Reset();
+    selection.Reset();
+  }
+}
+
+// TODO(crbug.com/1124051): Remove this test once this crbug is fixed.
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       TestITextRangeProviderSelectListMarker) {
+  ui::AXNodeData root_data;
+  root_data.id = 1;
+  root_data.role = ax::mojom::Role::kRootWebArea;
+
+  ui::AXNodeData list_data;
+  list_data.id = 2;
+  list_data.role = ax::mojom::Role::kList;
+  root_data.child_ids.push_back(list_data.id);
+
+  ui::AXNodeData list_item_data;
+  list_item_data.id = 3;
+  list_item_data.role = ax::mojom::Role::kListItem;
+  list_data.child_ids.push_back(list_item_data.id);
+
+  ui::AXNodeData list_marker;
+  list_marker.id = 4;
+  list_marker.role = ax::mojom::Role::kListMarker;
+  list_item_data.child_ids.push_back(list_marker.id);
+
+  ui::AXNodeData static_text_data;
+  static_text_data.id = 5;
+  static_text_data.role = ax::mojom::Role::kStaticText;
+  static_text_data.SetName("1. ");
+  list_marker.child_ids.push_back(static_text_data.id);
+
+  ui::AXNodeData list_item_text_data;
+  list_item_text_data.id = 6;
+  list_item_text_data.role = ax::mojom::Role::kStaticText;
+  list_item_text_data.SetName("First Item");
+  list_item_data.child_ids.push_back(list_item_text_data.id);
+
+  ui::AXTreeUpdate update;
+  ui::AXTreeData tree_data;
+  tree_data.tree_id = ui::AXTreeID::CreateNewAXTreeID();
+  update.tree_data = tree_data;
+  update.has_tree_data = true;
+  update.root_id = root_data.id;
+  update.nodes = {root_data,   list_data,        list_item_data,
+                  list_marker, static_text_data, list_item_text_data};
+  Init(update);
+  AXNode* root_node = GetRootAsAXNode();
+
+  // Text range related to "1. ".
+  AXNode* list_node = root_node->children()[0];
+  AXNode* list_item_node = list_node->children()[0];
+  AXNode* list_marker_node = list_item_node->children()[0];
+  ComPtr<ITextRangeProvider> list_marker_text_range_provider;
+  GetTextRangeProviderFromTextNode(list_marker_text_range_provider,
+                                   list_marker_node->children()[0]);
+
+  // A list marker text range performs select.
+  EXPECT_HRESULT_SUCCEEDED(list_marker_text_range_provider->Select());
+
+  // Verify selection was not performed on list marker range.
+  base::win::ScopedSafearray selection;
+  ComPtr<IRawElementProviderSimple> root_node_raw =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(root_node);
+  ComPtr<ITextProvider> document_provider;
+  EXPECT_HRESULT_SUCCEEDED(
+      root_node_raw->GetPatternProvider(UIA_TextPatternId, &document_provider));
+  EXPECT_HRESULT_SUCCEEDED(
+      document_provider->GetSelection(selection.Receive()));
+  ASSERT_EQ(nullptr, selection.Get());
+  selection.Reset();
+}
+
+TEST_F(AXPlatformNodeTextRangeProviderTest, TestITextRangeProviderFindText) {
+  // Initialize the ICU data from the icudtl.dat file, if it exists.
+  wchar_t buffer[MAX_PATH];
+  GetModuleFileName(nullptr, buffer, MAX_PATH);
+  std::filesystem::path exec_path(buffer);
+  exec_path.remove_filename();
+  exec_path.append("icudtl.dat");
+  const std::string icudtl_path = exec_path.string();
+  if (std::filesystem::exists(icudtl_path)) {
+    fml::icu::InitializeICU(icudtl_path);
+  }
+
+  // \xC3\xA9 are the UTF8 bytes for codepoint 0xE9 - accented lowercase e.
+  Init(BuildTextDocument({"some text", "more text", "resum\xC3\xA9"},
+                         false /* build_word_boundaries_offsets */,
+                         true /* place_text_on_one_line */));
+
+  AXNode* root_node = GetRootAsAXNode();
+  AXPlatformNodeWin* owner =
+      static_cast<AXPlatformNodeWin*>(AXPlatformNodeFromNode(root_node));
+  ASSERT_NE(owner, nullptr);
+  ComPtr<ITextRangeProvider> range;
+
+  // Test Leaf kStaticText search.
+  GetTextRangeProviderFromTextNode(range, root_node->children()[0]);
+  EXPECT_UIA_FIND_TEXT(range, L"some text", false, owner);
+  EXPECT_UIA_FIND_TEXT(range, L"SoMe TeXt", true, owner);
+  GetTextRangeProviderFromTextNode(range, root_node->children()[1]);
+  EXPECT_UIA_FIND_TEXT(range, L"more", false, owner);
+  EXPECT_UIA_FIND_TEXT(range, L"MoRe", true, owner);
+
+  // Test searching for leaf content from ancestor.
+  GetTextRangeProviderFromTextNode(range, root_node);
+  EXPECT_UIA_FIND_TEXT(range, L"some text", false, owner);
+  EXPECT_UIA_FIND_TEXT(range, L"SoMe TeXt", true, owner);
+  EXPECT_UIA_FIND_TEXT(range, L"more text", false, owner);
+  EXPECT_UIA_FIND_TEXT(range, L"MoRe TeXt", true, owner);
+  EXPECT_UIA_FIND_TEXT(range, L"more", false, owner);
+  // Accented lowercase e.
+  EXPECT_UIA_FIND_TEXT(range, L"resum\xE9", false, owner);
+  // Accented uppercase +e.
+  EXPECT_UIA_FIND_TEXT(range, L"resum\xC9", true, owner);
+  EXPECT_UIA_FIND_TEXT(range, L"resume", true, owner);
+  EXPECT_UIA_FIND_TEXT(range, L"resumE", true, owner);
+  // Test finding text that crosses a node boundary.
+  EXPECT_UIA_FIND_TEXT(range, L"textmore", false, owner);
+  // Test no match.
+  EXPECT_UIA_FIND_TEXT_NO_MATCH(range, L"no match", false, owner);
+  EXPECT_UIA_FIND_TEXT_NO_MATCH(range, L"resume", false, owner);
+
+  // Test if range returned is in expected anchor node.
+  GetTextRangeProviderFromTextNode(range, root_node->children()[1]);
+  base::win::ScopedBstr find_string(L"more text");
+  Microsoft::WRL::ComPtr<ITextRangeProvider> text_range_provider_found;
+  EXPECT_HRESULT_SUCCEEDED(range->FindText(find_string.Get(), false, false,
+                                           &text_range_provider_found));
+  Microsoft::WRL::ComPtr<AXPlatformNodeTextRangeProviderWin>
+      text_range_provider_win;
+  text_range_provider_found->QueryInterface(
+      IID_PPV_ARGS(&text_range_provider_win));
+  ASSERT_TRUE(GetStart(text_range_provider_win.Get())->IsTextPosition());
+  EXPECT_EQ(5, GetStart(text_range_provider_win.Get())->anchor_id());
+  EXPECT_EQ(0, GetStart(text_range_provider_win.Get())->text_offset());
+  ASSERT_TRUE(GetEnd(text_range_provider_win.Get())->IsTextPosition());
+  EXPECT_EQ(5, GetEnd(text_range_provider_win.Get())->anchor_id());
+  EXPECT_EQ(9, GetEnd(text_range_provider_win.Get())->text_offset());
+}
+
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       FindTextWithEmbeddedObjectCharacter) {
+  // ++1 kRootWebArea
+  // ++++2 kList
+  // ++++++3 kListItem
+  // ++++++++4 kStaticText
+  // ++++++++++5 kInlineTextBox
+  // ++++++6 kListItem
+  // ++++++++7 kStaticText
+  // ++++++++++8 kInlineTextBox
+  ui::AXNodeData root_1;
+  ui::AXNodeData list_2;
+  ui::AXNodeData list_item_3;
+  ui::AXNodeData static_text_4;
+  ui::AXNodeData inline_box_5;
+  ui::AXNodeData list_item_6;
+  ui::AXNodeData static_text_7;
+  ui::AXNodeData inline_box_8;
+
+  root_1.id = 1;
+  list_2.id = 2;
+  list_item_3.id = 3;
+  static_text_4.id = 4;
+  inline_box_5.id = 5;
+  list_item_6.id = 6;
+  static_text_7.id = 7;
+  inline_box_8.id = 8;
+
+  root_1.role = ax::mojom::Role::kRootWebArea;
+  root_1.child_ids = {list_2.id};
+
+  list_2.role = ax::mojom::Role::kList;
+  list_2.child_ids = {list_item_3.id, list_item_6.id};
+
+  list_item_3.role = ax::mojom::Role::kListItem;
+  list_item_3.child_ids = {static_text_4.id};
+
+  static_text_4.role = ax::mojom::Role::kStaticText;
+  static_text_4.SetName("foo");
+  static_text_4.child_ids = {inline_box_5.id};
+
+  inline_box_5.role = ax::mojom::Role::kInlineTextBox;
+  inline_box_5.SetName("foo");
+
+  list_item_6.role = ax::mojom::Role::kListItem;
+  list_item_6.child_ids = {static_text_7.id};
+
+  static_text_7.role = ax::mojom::Role::kStaticText;
+  static_text_7.child_ids = {inline_box_8.id};
+  static_text_7.SetName("bar");
+
+  inline_box_8.role = ax::mojom::Role::kInlineTextBox;
+  inline_box_8.SetName("bar");
+
+  ui::AXTreeUpdate update;
+  ui::AXTreeData tree_data;
+  tree_data.tree_id = ui::AXTreeID::CreateNewAXTreeID();
+  update.tree_data = tree_data;
+  update.has_tree_data = true;
+  update.root_id = root_1.id;
+  update.nodes = {root_1,       list_2,      list_item_3,   static_text_4,
+                  inline_box_5, list_item_6, static_text_7, inline_box_8};
+
+  Init(update);
+
+  AXNode* root_node = GetRootAsAXNode();
+  ComPtr<ITextRangeProvider> text_range_provider;
+  GetTextRangeProviderFromTextNode(text_range_provider, root_node);
+
+  base::win::ScopedBstr find_string(L"oobar");
+  Microsoft::WRL::ComPtr<ITextRangeProvider> text_range_provider_found;
+  EXPECT_HRESULT_SUCCEEDED(text_range_provider->FindText(
+      find_string.Get(), false, false, &text_range_provider_found));
+  ASSERT_TRUE(text_range_provider_found.Get());
+  Microsoft::WRL::ComPtr<AXPlatformNodeTextRangeProviderWin>
+      text_range_provider_win;
+  text_range_provider_found->QueryInterface(
+      IID_PPV_ARGS(&text_range_provider_win));
+  ASSERT_TRUE(GetStart(text_range_provider_win.Get())->IsTextPosition());
+  EXPECT_EQ(5, GetStart(text_range_provider_win.Get())->anchor_id());
+  EXPECT_EQ(1, GetStart(text_range_provider_win.Get())->text_offset());
+  ASSERT_TRUE(GetEnd(text_range_provider_win.Get())->IsTextPosition());
+  EXPECT_EQ(8, GetEnd(text_range_provider_win.Get())->anchor_id());
+  EXPECT_EQ(3, GetEnd(text_range_provider_win.Get())->text_offset());
+}
+
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       TestITextRangeProviderFindTextBackwards) {
+  Init(BuildTextDocument({"text", "some", "text"},
+                         false /* build_word_boundaries_offsets */,
+                         true /* place_text_on_one_line */));
+  AXNode* root_node = GetRootAsAXNode();
+
+  ComPtr<ITextRangeProvider> root_range_provider;
+  GetTextRangeProviderFromTextNode(root_range_provider, root_node);
+  ComPtr<ITextRangeProvider> text_node1_range;
+  GetTextRangeProviderFromTextNode(text_node1_range, root_node->children()[0]);
+  ComPtr<ITextRangeProvider> text_node3_range;
+  GetTextRangeProviderFromTextNode(text_node3_range, root_node->children()[2]);
+
+  ComPtr<ITextRangeProvider> text_range_provider_found;
+  base::win::ScopedBstr find_string(L"text");
+  BOOL range_equal;
+
+  // Forward search finds the text_node1.
+  EXPECT_HRESULT_SUCCEEDED(root_range_provider->FindText(
+      find_string.Get(), false, false, &text_range_provider_found));
+  CopyOwnerToClone(root_range_provider.Get(), text_range_provider_found.Get());
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider_found, find_string.Get());
+
+  range_equal = false;
+  EXPECT_HRESULT_SUCCEEDED(
+      text_range_provider_found->Compare(text_node1_range.Get(), &range_equal));
+  EXPECT_TRUE(range_equal);
+
+  // Backwards search finds the text_node3.
+  EXPECT_HRESULT_SUCCEEDED(root_range_provider->FindText(
+      find_string.Get(), true, false, &text_range_provider_found));
+  CopyOwnerToClone(root_range_provider.Get(), text_range_provider_found.Get());
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider_found, find_string.Get());
+
+  range_equal = false;
+  EXPECT_HRESULT_SUCCEEDED(
+      text_range_provider_found->Compare(text_node3_range.Get(), &range_equal));
+  EXPECT_TRUE(range_equal);
+}
+
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       TestITextRangeProviderFindAttribute) {
+  // document - visible
+  //  [empty]
+  //
+  // Search forward, look for IsHidden=true.
+  // Expected: nullptr
+  // Search forward, look for IsHidden=false.
+  // Expected: ""
+  // Note: returns "" rather than nullptr here because document root web area by
+  //       default set to visible. So the text range represents document matches
+  //       our searching criteria. And we return a degenerate range.
+  //
+  // Search backward, look for IsHidden=true.
+  // Expected: nullptr
+  // Search backward, look for IsHidden=false.
+  // Expected: ""
+  // Note: returns "" rather than nullptr here because document root web area by
+  //       default set to visible. So the text range represents document matches
+  //       our searching criteria. And we return a degenerate range.
+  {
+    ui::AXNodeData root_data;
+    root_data.id = 1;
+    root_data.role = ax::mojom::Role::kRootWebArea;
+
+    ui::AXTreeUpdate update;
+    update.tree_data.tree_id = ui::AXTreeID::CreateNewAXTreeID();
+    update.has_tree_data = true;
+    update.root_id = root_data.id;
+    update.nodes = {root_data};
+
+    Init(update);
+
+    bool is_search_backward;
+    VARIANT is_hidden_attr_val;
+    V_VT(&is_hidden_attr_val) = VT_BOOL;
+    ComPtr<ITextRangeProvider> matched_range_provider;
+    ComPtr<ITextRangeProvider> document_range_provider;
+    GetTextRangeProviderFromTextNode(document_range_provider,
+                                     GetRootAsAXNode());
+
+    // Search forward, look for IsHidden=true.
+    // Expected: nullptr
+    V_BOOL(&is_hidden_attr_val) = VARIANT_TRUE;
+    is_search_backward = false;
+    document_range_provider->FindAttribute(
+        UIA_IsHiddenAttributeId, is_hidden_attr_val, is_search_backward,
+        &matched_range_provider);
+    ASSERT_EQ(nullptr, matched_range_provider.Get());
+
+    // Search forward, look for IsHidden=false.
+    // Expected: ""
+    // Note: returns "" rather than nullptr here because document root web area
+    //       by default set to visible. So the text range represents document
+    //       matches our searching criteria. And we return a degenerate range.
+    V_BOOL(&is_hidden_attr_val) = VARIANT_FALSE;
+    is_search_backward = false;
+    document_range_provider->FindAttribute(
+        UIA_IsHiddenAttributeId, is_hidden_attr_val, is_search_backward,
+        &matched_range_provider);
+    ASSERT_NE(nullptr, matched_range_provider.Get());
+    CopyOwnerToClone(document_range_provider.Get(),
+                     matched_range_provider.Get());
+    EXPECT_UIA_TEXTRANGE_EQ(matched_range_provider, L"");
+    matched_range_provider.Reset();
+
+    // Search backward, look for IsHidden=true.
+    // Expected: nullptr
+    V_BOOL(&is_hidden_attr_val) = VARIANT_TRUE;
+    is_search_backward = true;
+    document_range_provider->FindAttribute(
+        UIA_IsHiddenAttributeId, is_hidden_attr_val, is_search_backward,
+        &matched_range_provider);
+    ASSERT_EQ(nullptr, matched_range_provider.Get());
+
+    // Search backward, look for IsHidden=false.
+    // Expected: ""
+    // Note: returns "" rather than nullptr here because document root web area
+    //       by default set to visible. So the text range represents document
+    //       matches our searching criteria. And we return a degenerate range.
+    V_BOOL(&is_hidden_attr_val) = VARIANT_FALSE;
+    is_search_backward = true;
+    document_range_provider->FindAttribute(
+        UIA_IsHiddenAttributeId, is_hidden_attr_val, is_search_backward,
+        &matched_range_provider);
+    ASSERT_NE(nullptr, matched_range_provider.Get());
+    CopyOwnerToClone(document_range_provider.Get(),
+                     matched_range_provider.Get());
+    EXPECT_UIA_TEXTRANGE_EQ(matched_range_provider, L"");
+  }
+
+  // document - visible
+  //  text1 - invisible
+  //
+  // Search forward, look for IsHidden=true.
+  // Expected: "text1"
+  // Search forward, look for IsHidden=false.
+  // Expected: nullptr
+  // Search backward, look for IsHidden=true.
+  // Expected: "text1"
+  // Search backward, look for IsHidden=false.
+  // Expected: nullptr
+  {
+    ui::AXNodeData text_data1;
+    text_data1.id = 2;
+    text_data1.role = ax::mojom::Role::kStaticText;
+    text_data1.AddState(ax::mojom::State::kInvisible);
+    text_data1.SetName("text1");
+
+    ui::AXNodeData root_data;
+    root_data.id = 1;
+    root_data.role = ax::mojom::Role::kRootWebArea;
+    root_data.child_ids = {2};
+
+    ui::AXTreeUpdate update;
+    update.tree_data.tree_id = ui::AXTreeID::CreateNewAXTreeID();
+    update.has_tree_data = true;
+    update.root_id = root_data.id;
+    update.nodes = {root_data, text_data1};
+
+    Init(update);
+
+    bool is_search_backward;
+    VARIANT is_hidden_attr_val;
+    V_VT(&is_hidden_attr_val) = VT_BOOL;
+    ComPtr<ITextRangeProvider> matched_range_provider;
+    ComPtr<ITextRangeProvider> document_range_provider;
+    GetTextRangeProviderFromTextNode(document_range_provider,
+                                     GetRootAsAXNode());
+
+    // Search forward, look for IsHidden=true.
+    // Expected: "text1"
+    V_BOOL(&is_hidden_attr_val) = VARIANT_TRUE;
+    is_search_backward = false;
+    document_range_provider->FindAttribute(
+        UIA_IsHiddenAttributeId, is_hidden_attr_val, is_search_backward,
+        &matched_range_provider);
+    ASSERT_NE(nullptr, matched_range_provider.Get());
+    CopyOwnerToClone(document_range_provider.Get(),
+                     matched_range_provider.Get());
+    EXPECT_UIA_TEXTRANGE_EQ(matched_range_provider, L"text1");
+    matched_range_provider.Reset();
+
+    // Search forward, look for IsHidden=false.
+    // Expected: nullptr
+    V_BOOL(&is_hidden_attr_val) = VARIANT_FALSE;
+    is_search_backward = false;
+    document_range_provider->FindAttribute(
+        UIA_IsHiddenAttributeId, is_hidden_attr_val, is_search_backward,
+        &matched_range_provider);
+    ASSERT_EQ(nullptr, matched_range_provider.Get());
+
+    // Search backward, look for IsHidden=true.
+    // Expected: "text1"
+    V_BOOL(&is_hidden_attr_val) = VARIANT_TRUE;
+    is_search_backward = true;
+    document_range_provider->FindAttribute(
+        UIA_IsHiddenAttributeId, is_hidden_attr_val, is_search_backward,
+        &matched_range_provider);
+    ASSERT_NE(nullptr, matched_range_provider.Get());
+    CopyOwnerToClone(document_range_provider.Get(),
+                     matched_range_provider.Get());
+    EXPECT_UIA_TEXTRANGE_EQ(matched_range_provider, L"text1");
+    matched_range_provider.Reset();
+
+    // Search backward, look for IsHidden=false.
+    // Expected: nullptr
+    V_BOOL(&is_hidden_attr_val) = VARIANT_FALSE;
+    is_search_backward = true;
+    document_range_provider->FindAttribute(
+        UIA_IsHiddenAttributeId, is_hidden_attr_val, is_search_backward,
+        &matched_range_provider);
+    ASSERT_EQ(nullptr, matched_range_provider.Get());
+  }
+
+  // document - visible
+  //  text1 - visible
+  //  text2 - visible
+  //
+  // Search forward, look for IsHidden=true.
+  // Expected: nullptr
+  // Search forward, look for IsHidden=false.
+  // Expected: "text1text2"
+  // Search backward, look for IsHidden=true.
+  // Expected: nullptr
+  // Search backward, look for IsHidden=false.
+  // Expected: "text1text2"
+  {
+    ui::AXNodeData text_data1;
+    text_data1.id = 2;
+    text_data1.role = ax::mojom::Role::kStaticText;
+    text_data1.SetName("text1");
+
+    ui::AXNodeData text_data2;
+    text_data2.id = 3;
+    text_data2.role = ax::mojom::Role::kStaticText;
+    text_data2.SetName("text2");
+
+    ui::AXNodeData root_data;
+    root_data.id = 1;
+    root_data.role = ax::mojom::Role::kRootWebArea;
+    root_data.child_ids = {2, 3};
+
+    ui::AXTreeUpdate update;
+    update.tree_data.tree_id = ui::AXTreeID::CreateNewAXTreeID();
+    update.has_tree_data = true;
+    update.root_id = root_data.id;
+    update.nodes = {root_data, text_data1, text_data2};
+
+    Init(update);
+
+    bool is_search_backward;
+    VARIANT is_hidden_attr_val;
+    V_VT(&is_hidden_attr_val) = VT_BOOL;
+    ComPtr<ITextRangeProvider> matched_range_provider;
+    ComPtr<ITextRangeProvider> document_range_provider;
+    GetTextRangeProviderFromTextNode(document_range_provider,
+                                     GetRootAsAXNode());
+
+    // Search forward, look for IsHidden=true.
+    // Expected: nullptr
+    V_BOOL(&is_hidden_attr_val) = VARIANT_TRUE;
+    is_search_backward = false;
+    document_range_provider->FindAttribute(
+        UIA_IsHiddenAttributeId, is_hidden_attr_val, is_search_backward,
+        &matched_range_provider);
+    ASSERT_EQ(nullptr, matched_range_provider.Get());
+
+    // Search forward, look for IsHidden=false.
+    // Expected: "text1text2"
+    V_BOOL(&is_hidden_attr_val) = VARIANT_FALSE;
+    is_search_backward = false;
+    document_range_provider->FindAttribute(
+        UIA_IsHiddenAttributeId, is_hidden_attr_val, is_search_backward,
+        &matched_range_provider);
+    ASSERT_NE(nullptr, matched_range_provider.Get());
+    CopyOwnerToClone(document_range_provider.Get(),
+                     matched_range_provider.Get());
+    EXPECT_UIA_TEXTRANGE_EQ(matched_range_provider, L"text1text2");
+    matched_range_provider.Reset();
+
+    // Search backward, look for IsHidden=true.
+    // Expected: nullptr
+    V_BOOL(&is_hidden_attr_val) = VARIANT_TRUE;
+    is_search_backward = true;
+    document_range_provider->FindAttribute(
+        UIA_IsHiddenAttributeId, is_hidden_attr_val, is_search_backward,
+        &matched_range_provider);
+    ASSERT_EQ(nullptr, matched_range_provider.Get());
+
+    // Search backward, look for IsHidden=false.
+    // Expected: "text1text2"
+    V_BOOL(&is_hidden_attr_val) = VARIANT_FALSE;
+    is_search_backward = true;
+    document_range_provider->FindAttribute(
+        UIA_IsHiddenAttributeId, is_hidden_attr_val, is_search_backward,
+        &matched_range_provider);
+    ASSERT_NE(nullptr, matched_range_provider.Get());
+    CopyOwnerToClone(document_range_provider.Get(),
+                     matched_range_provider.Get());
+    EXPECT_UIA_TEXTRANGE_EQ(matched_range_provider, L"text1text2");
+  }
+
+  // document - visible
+  //  text1 - visible
+  //  text2 - invisible
+  //  text3 - invisible
+  //  text4 - visible
+  //  text5 - invisible
+  //
+  // Search forward, look for IsHidden=true.
+  // Expected: "text2text3"
+  // Search forward, look for IsHidden=false.
+  // Expected: "text1"
+  // Search backward, look for IsHidden=true.
+  // Expected: "text5"
+  // Search backward, look for IsHidden=false.
+  // Expected: "text4"
+  {
+    ui::AXNodeData text_data1;
+    text_data1.id = 2;
+    text_data1.role = ax::mojom::Role::kStaticText;
+    text_data1.SetName("text1");
+
+    ui::AXNodeData text_data2;
+    text_data2.id = 3;
+    text_data2.role = ax::mojom::Role::kStaticText;
+    text_data2.AddState(ax::mojom::State::kInvisible);
+    text_data2.SetName("text2");
+
+    ui::AXNodeData text_data3;
+    text_data3.id = 4;
+    text_data3.role = ax::mojom::Role::kStaticText;
+    text_data3.AddState(ax::mojom::State::kInvisible);
+    text_data3.SetName("text3");
+
+    ui::AXNodeData text_data4;
+    text_data4.id = 5;
+    text_data4.role = ax::mojom::Role::kStaticText;
+    text_data4.SetName("text4");
+
+    ui::AXNodeData text_data5;
+    text_data5.id = 6;
+    text_data5.role = ax::mojom::Role::kStaticText;
+    text_data5.AddState(ax::mojom::State::kInvisible);
+    text_data5.SetName("text5");
+
+    ui::AXNodeData root_data;
+    root_data.id = 1;
+    root_data.role = ax::mojom::Role::kRootWebArea;
+    root_data.child_ids = {2, 3, 4, 5, 6};
+
+    ui::AXTreeUpdate update;
+    update.tree_data.tree_id = ui::AXTreeID::CreateNewAXTreeID();
+    update.has_tree_data = true;
+    update.root_id = root_data.id;
+    update.nodes = {root_data,  text_data1, text_data2,
+                    text_data3, text_data4, text_data5};
+
+    Init(update);
+
+    bool is_search_backward;
+    VARIANT is_hidden_attr_val;
+    V_VT(&is_hidden_attr_val) = VT_BOOL;
+    ComPtr<ITextRangeProvider> matched_range_provider;
+    ComPtr<ITextRangeProvider> document_range_provider;
+    GetTextRangeProviderFromTextNode(document_range_provider,
+                                     GetRootAsAXNode());
+
+    // Search forward, look for IsHidden=true.
+    // Expected: "text2text3"
+    V_BOOL(&is_hidden_attr_val) = VARIANT_TRUE;
+    is_search_backward = false;
+    document_range_provider->FindAttribute(
+        UIA_IsHiddenAttributeId, is_hidden_attr_val, is_search_backward,
+        &matched_range_provider);
+    ASSERT_NE(nullptr, matched_range_provider.Get());
+    CopyOwnerToClone(document_range_provider.Get(),
+                     matched_range_provider.Get());
+    EXPECT_UIA_TEXTRANGE_EQ(matched_range_provider, L"text2text3");
+    matched_range_provider.Reset();
+
+    // Search forward, look for IsHidden=false.
+    // Expected: "text1"
+    V_BOOL(&is_hidden_attr_val) = VARIANT_FALSE;
+    is_search_backward = false;
+    document_range_provider->FindAttribute(
+        UIA_IsHiddenAttributeId, is_hidden_attr_val, is_search_backward,
+        &matched_range_provider);
+    ASSERT_NE(nullptr, matched_range_provider.Get());
+    CopyOwnerToClone(document_range_provider.Get(),
+                     matched_range_provider.Get());
+    EXPECT_UIA_TEXTRANGE_EQ(matched_range_provider, L"text1");
+    matched_range_provider.Reset();
+
+    // Search backward, look for IsHidden=true.
+    // Expected: "text5"
+    V_BOOL(&is_hidden_attr_val) = VARIANT_TRUE;
+    is_search_backward = true;
+    document_range_provider->FindAttribute(
+        UIA_IsHiddenAttributeId, is_hidden_attr_val, is_search_backward,
+        &matched_range_provider);
+    ASSERT_NE(nullptr, matched_range_provider.Get());
+    CopyOwnerToClone(document_range_provider.Get(),
+                     matched_range_provider.Get());
+    EXPECT_UIA_TEXTRANGE_EQ(matched_range_provider, L"text5");
+    matched_range_provider.Reset();
+
+    // Search backward, look for IsHidden=false.
+    // Expected: "text4"
+    V_BOOL(&is_hidden_attr_val) = VARIANT_FALSE;
+    is_search_backward = true;
+    document_range_provider->FindAttribute(
+        UIA_IsHiddenAttributeId, is_hidden_attr_val, is_search_backward,
+        &matched_range_provider);
+    ASSERT_NE(nullptr, matched_range_provider.Get());
+    CopyOwnerToClone(document_range_provider.Get(),
+                     matched_range_provider.Get());
+    EXPECT_UIA_TEXTRANGE_EQ(matched_range_provider, L"text4");
+  }
+
+  // document - visible
+  //  text1 - visible
+  //  text2 - invisible
+  //  text3 - invisible
+  //  text4 - invisible
+  //  text5 - visible
+  //
+  // Search forward, look for IsHidden=true.
+  // Expected: "text2text3text4"
+  // Search forward, look for IsHidden=false.
+  // Expected: "text1"
+  // Search backward, look for IsHidden=true.
+  // Expected: "text2text3text4"
+  // Search backward, look for IsHidden=false.
+  // Expected: "text5"
+  {
+    ui::AXNodeData text_data1;
+    text_data1.id = 2;
+    text_data1.role = ax::mojom::Role::kStaticText;
+    text_data1.SetName("text1");
+
+    ui::AXNodeData text_data2;
+    text_data2.id = 3;
+    text_data2.role = ax::mojom::Role::kStaticText;
+    text_data2.AddState(ax::mojom::State::kInvisible);
+    text_data2.SetName("text2");
+
+    ui::AXNodeData text_data3;
+    text_data3.id = 4;
+    text_data3.role = ax::mojom::Role::kStaticText;
+    text_data3.AddState(ax::mojom::State::kInvisible);
+    text_data3.SetName("text3");
+
+    ui::AXNodeData text_data4;
+    text_data4.id = 5;
+    text_data4.role = ax::mojom::Role::kStaticText;
+    text_data4.AddState(ax::mojom::State::kInvisible);
+    text_data4.SetName("text4");
+
+    ui::AXNodeData text_data5;
+    text_data5.id = 6;
+    text_data5.role = ax::mojom::Role::kStaticText;
+    text_data5.SetName("text5");
+
+    ui::AXNodeData root_data;
+    root_data.id = 1;
+    root_data.role = ax::mojom::Role::kRootWebArea;
+    root_data.child_ids = {2, 3, 4, 5, 6};
+
+    ui::AXTreeUpdate update;
+    update.tree_data.tree_id = ui::AXTreeID::CreateNewAXTreeID();
+    update.has_tree_data = true;
+    update.root_id = root_data.id;
+    update.nodes = {root_data,  text_data1, text_data2,
+                    text_data3, text_data4, text_data5};
+
+    Init(update);
+
+    bool is_search_backward;
+    VARIANT is_hidden_attr_val;
+    V_VT(&is_hidden_attr_val) = VT_BOOL;
+    ComPtr<ITextRangeProvider> matched_range_provider;
+    ComPtr<ITextRangeProvider> document_range_provider;
+    GetTextRangeProviderFromTextNode(document_range_provider,
+                                     GetRootAsAXNode());
+
+    // Search forward, look for IsHidden=true.
+    // Expected: "text2text3text4"
+    V_BOOL(&is_hidden_attr_val) = VARIANT_TRUE;
+    is_search_backward = false;
+    document_range_provider->FindAttribute(
+        UIA_IsHiddenAttributeId, is_hidden_attr_val, is_search_backward,
+        &matched_range_provider);
+    ASSERT_NE(nullptr, matched_range_provider.Get());
+    CopyOwnerToClone(document_range_provider.Get(),
+                     matched_range_provider.Get());
+    EXPECT_UIA_TEXTRANGE_EQ(matched_range_provider, L"text2text3text4");
+    matched_range_provider.Reset();
+
+    // Search forward, look for IsHidden=false.
+    // Expected: "text1"
+    V_BOOL(&is_hidden_attr_val) = VARIANT_FALSE;
+    is_search_backward = false;
+    document_range_provider->FindAttribute(
+        UIA_IsHiddenAttributeId, is_hidden_attr_val, is_search_backward,
+        &matched_range_provider);
+    ASSERT_NE(nullptr, matched_range_provider.Get());
+    CopyOwnerToClone(document_range_provider.Get(),
+                     matched_range_provider.Get());
+    EXPECT_UIA_TEXTRANGE_EQ(matched_range_provider, L"text1");
+    matched_range_provider.Reset();
+
+    // Search backward, look for IsHidden=true.
+    // Expected: "text2text3text4"
+    V_BOOL(&is_hidden_attr_val) = VARIANT_TRUE;
+    is_search_backward = true;
+    document_range_provider->FindAttribute(
+        UIA_IsHiddenAttributeId, is_hidden_attr_val, is_search_backward,
+        &matched_range_provider);
+    ASSERT_NE(nullptr, matched_range_provider.Get());
+    CopyOwnerToClone(document_range_provider.Get(),
+                     matched_range_provider.Get());
+    EXPECT_UIA_TEXTRANGE_EQ(matched_range_provider, L"text2text3text4");
+    matched_range_provider.Reset();
+
+    // Search backward, look for IsHidden=false.
+    // Expected: "text5"
+    V_BOOL(&is_hidden_attr_val) = VARIANT_FALSE;
+    is_search_backward = true;
+    document_range_provider->FindAttribute(
+        UIA_IsHiddenAttributeId, is_hidden_attr_val, is_search_backward,
+        &matched_range_provider);
+    ASSERT_NE(nullptr, matched_range_provider.Get());
+    CopyOwnerToClone(document_range_provider.Get(),
+                     matched_range_provider.Get());
+    EXPECT_UIA_TEXTRANGE_EQ(matched_range_provider, L"text5");
+  }
+}
+
+TEST_F(AXPlatformNodeTextRangeProviderTest, ElementNotAvailable) {
+  AXNodeData root_ax_node_data;
+  root_ax_node_data.id = 1;
+  root_ax_node_data.role = ax::mojom::Role::kRootWebArea;
+
+  Init(root_ax_node_data);
+
+  ComPtr<IRawElementProviderSimple> raw_element_provider_simple =
+      QueryInterfaceFromNode<IRawElementProviderSimple>(GetRootAsAXNode());
+  ASSERT_NE(nullptr, raw_element_provider_simple.Get());
+
+  ComPtr<ITextProvider> text_provider;
+  ASSERT_HRESULT_SUCCEEDED(raw_element_provider_simple->GetPatternProvider(
+      UIA_TextPatternId, &text_provider));
+  ASSERT_NE(nullptr, text_provider.Get());
+
+  ComPtr<ITextRangeProvider> text_range_provider;
+  ASSERT_HRESULT_SUCCEEDED(
+      text_provider->get_DocumentRange(&text_range_provider));
+  ASSERT_NE(nullptr, text_range_provider.Get());
+
+  // An empty tree.
+  SetTree(std::make_unique<AXTree>());
+
+  BOOL bool_arg = FALSE;
+  ASSERT_EQ(static_cast<HRESULT>(UIA_E_ELEMENTNOTAVAILABLE),
+            text_range_provider->ScrollIntoView(bool_arg));
+}
+
+// TODO(schectman) Non-empty ignored nodes are not used by Flutter.
+// https://github.com/flutter/flutter/issues/117012
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       DISABLED_TestITextRangeProviderIgnoredNodes) {
+  // Parent Tree
+  // 1
+  // |
+  // 2(i)
+  // |________________________________
+  // |   |   |    |      |           |
+  // 3   4   5    6      7(i)        8(i)
+  //              |      |________
+  //              |      |       |
+  //              9(i)   10(i)   11
+  //              |      |____
+  //              |      |   |
+  //              12    13   14
+
+  ui::AXTreeUpdate tree_update;
+  ui::AXTreeID tree_id = ui::AXTreeID::CreateNewAXTreeID();
+  tree_update.tree_data.tree_id = tree_id;
+  tree_update.has_tree_data = true;
+  tree_update.root_id = 1;
+  tree_update.nodes.resize(14);
+  tree_update.nodes[0].id = 1;
+  tree_update.nodes[0].child_ids = {2};
+  tree_update.nodes[0].role = ax::mojom::Role::kRootWebArea;
+
+  tree_update.nodes[1].id = 2;
+  tree_update.nodes[1].child_ids = {3, 4, 5, 6, 7, 8};
+  // According to the existing Blink code, editable roots are never ignored.
+  // However, we can still create this tree structure only for test purposes.
+  tree_update.nodes[1].AddState(ax::mojom::State::kIgnored);
+  tree_update.nodes[1].AddState(ax::mojom::State::kEditable);
+  tree_update.nodes[1].AddState(ax::mojom::State::kRichlyEditable);
+  // tree_update.nodes[1].AddBoolAttribute(
+  //     ax::mojom::BoolAttribute::kNonAtomicTextFieldRoot, true);
+  tree_update.nodes[1].role = ax::mojom::Role::kGenericContainer;
+
+  tree_update.nodes[2].id = 3;
+  tree_update.nodes[2].role = ax::mojom::Role::kStaticText;
+  tree_update.nodes[2].SetName(".3.");
+
+  tree_update.nodes[3].id = 4;
+  tree_update.nodes[3].role = ax::mojom::Role::kStaticText;
+  tree_update.nodes[3].SetName(".4.");
+
+  tree_update.nodes[4].id = 5;
+  tree_update.nodes[4].role = ax::mojom::Role::kStaticText;
+  tree_update.nodes[4].SetName(".5.");
+
+  tree_update.nodes[5].id = 6;
+  tree_update.nodes[5].role = ax::mojom::Role::kButton;
+  tree_update.nodes[5].child_ids = {9};
+
+  tree_update.nodes[6].id = 7;
+  tree_update.nodes[6].child_ids = {10, 11};
+  tree_update.nodes[6].AddState(ax::mojom::State::kIgnored);
+  tree_update.nodes[6].role = ax::mojom::Role::kGenericContainer;
+
+  tree_update.nodes[7].id = 8;
+  tree_update.nodes[7].AddState(ax::mojom::State::kIgnored);
+  tree_update.nodes[7].role = ax::mojom::Role::kStaticText;
+  tree_update.nodes[7].SetName(".8.");
+
+  tree_update.nodes[8].id = 9;
+  tree_update.nodes[8].child_ids = {12};
+  tree_update.nodes[8].AddState(ax::mojom::State::kIgnored);
+  tree_update.nodes[8].role = ax::mojom::Role::kGenericContainer;
+
+  tree_update.nodes[9].id = 10;
+  tree_update.nodes[9].child_ids = {13, 14};
+  tree_update.nodes[9].AddState(ax::mojom::State::kIgnored);
+  tree_update.nodes[8].role = ax::mojom::Role::kGenericContainer;
+
+  tree_update.nodes[10].id = 11;
+  tree_update.nodes[10].role = ax::mojom::Role::kStaticText;
+  tree_update.nodes[10].SetName(".11.");
+
+  tree_update.nodes[11].id = 12;
+  tree_update.nodes[11].role = ax::mojom::Role::kStaticText;
+  tree_update.nodes[11].AddState(ax::mojom::State::kIgnored);
+  tree_update.nodes[11].SetName(".12.");
+
+  tree_update.nodes[12].id = 13;
+  tree_update.nodes[12].role = ax::mojom::Role::kStaticText;
+  tree_update.nodes[12].SetName(".13.");
+
+  tree_update.nodes[13].id = 14;
+  tree_update.nodes[13].role = ax::mojom::Role::kStaticText;
+  tree_update.nodes[13].SetName(".14.");
+
+  Init(tree_update);
+  EXPECT_ENCLOSING_ELEMENT(GetNodeFromTree(tree_id, 1),
+                           GetNodeFromTree(tree_id, 1));
+  EXPECT_ENCLOSING_ELEMENT(GetNodeFromTree(tree_id, 2),
+                           GetNodeFromTree(tree_id, 1));
+  EXPECT_ENCLOSING_ELEMENT(GetNodeFromTree(tree_id, 3),
+                           GetNodeFromTree(tree_id, 3));
+  EXPECT_ENCLOSING_ELEMENT(GetNodeFromTree(tree_id, 4),
+                           GetNodeFromTree(tree_id, 4));
+  EXPECT_ENCLOSING_ELEMENT(GetNodeFromTree(tree_id, 5),
+                           GetNodeFromTree(tree_id, 5));
+  EXPECT_ENCLOSING_ELEMENT(GetNodeFromTree(tree_id, 8),
+                           GetNodeFromTree(tree_id, 1));
+  EXPECT_ENCLOSING_ELEMENT(GetNodeFromTree(tree_id, 11),
+                           GetNodeFromTree(tree_id, 11));
+  EXPECT_ENCLOSING_ELEMENT(GetNodeFromTree(tree_id, 13),
+                           GetNodeFromTree(tree_id, 13));
+  EXPECT_ENCLOSING_ELEMENT(GetNodeFromTree(tree_id, 14),
+                           GetNodeFromTree(tree_id, 14));
+
+  // Test movement and GetText()
+  ComPtr<ITextRangeProvider> text_range_provider;
+  GetTextRangeProviderFromTextNode(text_range_provider,
+                                   GetNodeFromTree(tree_id, 1));
+
+  ASSERT_HRESULT_SUCCEEDED(
+      text_range_provider->ExpandToEnclosingUnit(TextUnit_Character));
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L".");
+
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_End, TextUnit_Character,
+      /*count*/ 2,
+      /*expected_text*/ L".3.",
+      /*expected_count*/ 2);
+
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_End, TextUnit_Character,
+      /*count*/ 6,
+      /*expected_text*/ L".3..4..5.",
+      /*expected_count*/ 6);
+
+  // By design, empty objects, such as the unlabelled button in this case, are
+  // placed in their own paragraph for easier screen reader navigation.
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_End, TextUnit_Character,
+      /*count*/ 15,
+      /*expected_text*/ L".3..4..5.\n\xFFFC\n.13..14..11.",
+      /*expected_count*/ 15);
+}
+
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       TestNormalizeTextRangePastEndOfDocument) {
+  ui::AXTreeUpdate initial_state;
+  ui::AXTreeID tree_id = ui::AXTreeID::CreateNewAXTreeID();
+  initial_state.tree_data.tree_id = tree_id;
+  initial_state.has_tree_data = true;
+  initial_state.root_id = 1;
+  initial_state.nodes.resize(3);
+  initial_state.nodes[0].id = 1;
+  initial_state.nodes[0].child_ids = {2};
+  initial_state.nodes[0].role = ax::mojom::Role::kRootWebArea;
+  initial_state.nodes[1].id = 2;
+  initial_state.nodes[1].child_ids = {3};
+  initial_state.nodes[1].role = ax::mojom::Role::kStaticText;
+  initial_state.nodes[1].SetName("aaa");
+  initial_state.nodes[2].id = 3;
+  initial_state.nodes[2].role = ax::mojom::Role::kInlineTextBox;
+  initial_state.nodes[2].SetName("aaa");
+
+  Init(initial_state);
+
+  ComPtr<ITextRangeProvider> text_range_provider;
+  GetTextRangeProviderFromTextNode(text_range_provider,
+                                   GetNodeFromTree(tree_id, 3));
+
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"aaa");
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_Start, TextUnit_Character,
+      /*count*/ 2,
+      /*expected_text*/ L"a",
+      /*expected_count*/ 2);
+
+  ComPtr<AXPlatformNodeTextRangeProviderWin> text_range_provider_win;
+  text_range_provider->QueryInterface(IID_PPV_ARGS(&text_range_provider_win));
+
+  const AXNodePosition::AXPositionInstance start_after_move =
+      GetStart(text_range_provider_win.Get())->Clone();
+  const AXNodePosition::AXPositionInstance end_after_move =
+      GetEnd(text_range_provider_win.Get())->Clone();
+  EXPECT_LT(*start_after_move, *end_after_move);
+
+  AXTreeUpdate update;
+  update.nodes.resize(2);
+  update.nodes[0] = initial_state.nodes[1];
+  update.nodes[0].SetName("aa");
+  update.nodes[1] = initial_state.nodes[2];
+  update.nodes[1].SetName("aa");
+  ASSERT_TRUE(GetTree()->Unserialize(update));
+
+  auto* text_range = text_range_provider_win.Get();
+
+  auto original_start = GetStart(text_range)->Clone();
+  auto original_end = GetEnd(text_range)->Clone();
+
+  auto normalized_start = GetStart(text_range)->Clone();
+  auto normalized_end = GetEnd(text_range)->Clone();
+  NormalizeTextRange(text_range, normalized_start, normalized_end);
+  // Verify that the original range was not changed by normalization.
+  ExpectPositionsEqual(original_start, GetStart(text_range));
+  ExpectPositionsEqual(original_end, GetEnd(text_range));
+
+  EXPECT_EQ(*start_after_move, *normalized_start);
+  EXPECT_EQ(*end_after_move, *normalized_end);
+}
+
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       TestNormalizeTextRangePastEndOfDocumentWithIgnoredNodes) {
+  ui::AXTreeUpdate initial_state;
+  ui::AXTreeID tree_id = ui::AXTreeID::CreateNewAXTreeID();
+  initial_state.tree_data.tree_id = tree_id;
+  initial_state.has_tree_data = true;
+  initial_state.root_id = 1;
+  initial_state.nodes.resize(4);
+  initial_state.nodes[0].id = 1;
+  initial_state.nodes[0].child_ids = {2};
+  initial_state.nodes[0].role = ax::mojom::Role::kRootWebArea;
+  initial_state.nodes[1].id = 2;
+  initial_state.nodes[1].child_ids = {3, 4};
+  initial_state.nodes[1].role = ax::mojom::Role::kStaticText;
+  initial_state.nodes[1].SetName("aaa");
+  initial_state.nodes[2].id = 3;
+  initial_state.nodes[2].role = ax::mojom::Role::kInlineTextBox;
+  initial_state.nodes[2].SetName("aaa");
+  initial_state.nodes[3].id = 4;
+  initial_state.nodes[3].role = ax::mojom::Role::kInlineTextBox;
+  initial_state.nodes[3].AddState(ax::mojom::State::kIgnored);
+  initial_state.nodes[3].SetName("ignored");
+
+  Init(initial_state);
+
+  ComPtr<ITextRangeProvider> text_range_provider;
+  GetTextRangeProviderFromTextNode(text_range_provider,
+                                   GetNodeFromTree(tree_id, 3));
+
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"aaa");
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_Start, TextUnit_Character,
+      /*count*/ 2,
+      /*expected_text*/ L"a",
+      /*expected_count*/ 2);
+
+  ComPtr<AXPlatformNodeTextRangeProviderWin> text_range_provider_win;
+  text_range_provider->QueryInterface(IID_PPV_ARGS(&text_range_provider_win));
+
+  const AXNodePosition::AXPositionInstance start_after_move =
+      GetStart(text_range_provider_win.Get())->Clone();
+  const AXNodePosition::AXPositionInstance end_after_move =
+      GetEnd(text_range_provider_win.Get())->Clone();
+  EXPECT_LT(*start_after_move, *end_after_move);
+
+  AXTreeUpdate update;
+  update.nodes.resize(2);
+  update.nodes[0] = initial_state.nodes[1];
+  update.nodes[0].SetName("aa");
+  update.nodes[1] = initial_state.nodes[2];
+  update.nodes[1].SetName("aa");
+  ASSERT_TRUE(GetTree()->Unserialize(update));
+
+  auto* text_range = text_range_provider_win.Get();
+
+  auto original_start = GetStart(text_range)->Clone();
+  auto original_end = GetEnd(text_range)->Clone();
+
+  auto normalized_start = GetStart(text_range)->Clone();
+  auto normalized_end = GetEnd(text_range)->Clone();
+  NormalizeTextRange(text_range, normalized_start, normalized_end);
+  // Verify that the original range was not changed by normalization.
+  ExpectPositionsEqual(original_start, GetStart(text_range));
+  ExpectPositionsEqual(original_end, GetEnd(text_range));
+
+  EXPECT_EQ(*start_after_move, *normalized_start);
+  EXPECT_EQ(*end_after_move, *normalized_end);
+}
+
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       TestNormalizeTextRangeInsideIgnoredNodes) {
+  ui::AXTreeUpdate initial_state;
+  ui::AXTreeID tree_id = ui::AXTreeID::CreateNewAXTreeID();
+  initial_state.tree_data.tree_id = tree_id;
+  initial_state.has_tree_data = true;
+  initial_state.root_id = 1;
+  initial_state.nodes.resize(4);
+  initial_state.nodes[0].id = 1;
+  initial_state.nodes[0].child_ids = {2, 3, 4};
+  initial_state.nodes[0].role = ax::mojom::Role::kRootWebArea;
+  initial_state.nodes[1].id = 2;
+  initial_state.nodes[1].role = ax::mojom::Role::kStaticText;
+  initial_state.nodes[1].SetName("before");
+  initial_state.nodes[2].id = 3;
+  initial_state.nodes[2].role = ax::mojom::Role::kStaticText;
+  initial_state.nodes[2].AddState(ax::mojom::State::kIgnored);
+  initial_state.nodes[2].SetName("ignored");
+  initial_state.nodes[3].id = 4;
+  initial_state.nodes[3].role = ax::mojom::Role::kStaticText;
+  initial_state.nodes[3].SetName("after");
+
+  Init(initial_state);
+  const AXTree* tree = GetTree();
+  const AXNode* ignored_node = tree->GetFromId(3);
+
+  // Making |owner| AXID:1 so that |TestAXNodeWrapper::BuildAllWrappers|
+  // will build the entire tree.
+  AXPlatformNodeWin* owner = static_cast<AXPlatformNodeWin*>(
+      AXPlatformNodeFromNode(GetNodeFromTree(tree_id, 1)));
+
+  // start: TextPosition, anchor_id=3, text_offset=1, annotated_text=i<g>nored
+  // end  : TextPosition, anchor_id=3, text_offset=6, annotated_text=ignore<d>
+  ComPtr<AXPlatformNodeTextRangeProviderWin> ignored_range_win;
+  CreateTextRangeProviderWin(
+      ignored_range_win, owner,
+      /*start_anchor=*/ignored_node, /*start_offset=*/0,
+      /*start_affinity*/ ax::mojom::TextAffinity::kDownstream,
+      /*end_anchor=*/ignored_node, /*end_offset=*/0,
+      /*end_affinity*/ ax::mojom::TextAffinity::kDownstream);
+
+  EXPECT_TRUE(GetStart(ignored_range_win.Get())->IsIgnored());
+  EXPECT_TRUE(GetEnd(ignored_range_win.Get())->IsIgnored());
+
+  auto original_start = GetStart(ignored_range_win.Get())->Clone();
+  auto original_end = GetEnd(ignored_range_win.Get())->Clone();
+
+  auto normalized_start = GetStart(ignored_range_win.Get())->Clone();
+  auto normalized_end = GetEnd(ignored_range_win.Get())->Clone();
+  NormalizeTextRange(ignored_range_win.Get(), normalized_start, normalized_end);
+  // Verify that the original range was not changed by normalization.
+  ExpectPositionsEqual(original_start, GetStart(ignored_range_win.Get()));
+  ExpectPositionsEqual(original_end, GetEnd(ignored_range_win.Get()));
+
+  EXPECT_FALSE(normalized_start->IsIgnored());
+  EXPECT_FALSE(normalized_end->IsIgnored());
+  EXPECT_LE(*GetStart(ignored_range_win.Get()), *normalized_start);
+  EXPECT_LE(*GetEnd(ignored_range_win.Get()), *normalized_end);
+  EXPECT_LE(*normalized_start, *normalized_end);
+
+  // Remove the last node, forcing |NormalizeTextRange| to normalize
+  // using the opposite AdjustmentBehavior.
+  AXTreeUpdate update;
+  update.nodes.resize(1);
+  update.nodes[0] = initial_state.nodes[0];
+  update.nodes[0].child_ids = {2, 3};
+  ASSERT_TRUE(GetTree()->Unserialize(update));
+
+  original_start = GetStart(ignored_range_win.Get())->Clone();
+  original_end = GetEnd(ignored_range_win.Get())->Clone();
+
+  normalized_start = GetStart(ignored_range_win.Get())->Clone();
+  normalized_end = GetEnd(ignored_range_win.Get())->Clone();
+  NormalizeTextRange(ignored_range_win.Get(), normalized_start, normalized_end);
+  // Verify that the original range was not changed by normalization.
+  ExpectPositionsEqual(original_start, GetStart(ignored_range_win.Get()));
+  ExpectPositionsEqual(original_end, GetEnd(ignored_range_win.Get()));
+
+  EXPECT_FALSE(normalized_start->IsIgnored());
+  EXPECT_FALSE(normalized_end->IsIgnored());
+  EXPECT_GE(*GetStart(ignored_range_win.Get()), *normalized_start);
+  EXPECT_GE(*GetEnd(ignored_range_win.Get()), *normalized_end);
+  EXPECT_LE(*normalized_start, *normalized_end);
+}
+
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       TestNormalizeTextRangeSpanIgnoredNodes) {
+  ui::AXNodeData root_data;
+  root_data.id = 1;
+  root_data.role = ax::mojom::Role::kRootWebArea;
+
+  ui::AXNodeData before_text;
+  before_text.id = 2;
+  before_text.role = ax::mojom::Role::kStaticText;
+  before_text.SetName("before");
+  root_data.child_ids.push_back(before_text.id);
+
+  ui::AXNodeData ignored_text1;
+  ignored_text1.id = 3;
+  ignored_text1.role = ax::mojom::Role::kStaticText;
+  ignored_text1.AddState(ax::mojom::State::kIgnored);
+  ignored_text1.SetName("ignored1");
+  root_data.child_ids.push_back(ignored_text1.id);
+
+  ui::AXNodeData ignored_text2;
+  ignored_text2.id = 4;
+  ignored_text2.role = ax::mojom::Role::kStaticText;
+  ignored_text2.AddState(ax::mojom::State::kIgnored);
+  ignored_text2.SetName("ignored2");
+  root_data.child_ids.push_back(ignored_text2.id);
+
+  ui::AXNodeData after_text;
+  after_text.id = 5;
+  after_text.role = ax::mojom::Role::kStaticText;
+  after_text.SetName("after");
+  root_data.child_ids.push_back(after_text.id);
+
+  ui::AXTreeUpdate update;
+  ui::AXTreeID tree_id = ui::AXTreeID::CreateNewAXTreeID();
+  update.root_id = root_data.id;
+  update.tree_data.tree_id = tree_id;
+  update.has_tree_data = true;
+  update.nodes = {root_data, before_text, ignored_text1, ignored_text2,
+                  after_text};
+
+  Init(update);
+  const AXTree* tree = GetTree();
+
+  const AXNode* before_text_node = tree->GetFromId(before_text.id);
+  const AXNode* after_text_node = tree->GetFromId(after_text.id);
+
+  // Making |owner| AXID:1 so that |TestAXNodeWrapper::BuildAllWrappers|
+  // will build the entire tree.
+  AXPlatformNodeWin* owner = static_cast<AXPlatformNodeWin*>(
+      AXPlatformNodeFromNode(GetNodeFromTree(tree_id, 1)));
+
+  // Original range before NormalizeTextRange()
+  // |before<>||ignored1||ignored2||<a>fter|
+  //         |-----------------------|
+  // start: TextPosition, anchor_id=2, text_offset=6, annotated_text=before<>
+  // end  : TextPosition, anchor_id=5, text_offset=0, annotated_text=<a>fter
+  ComPtr<AXPlatformNodeTextRangeProviderWin> range_span_ignored_nodes;
+  CreateTextRangeProviderWin(
+      range_span_ignored_nodes, owner,
+      /*start_anchor=*/before_text_node, /*start_offset=*/6,
+      /*start_affinity*/ ax::mojom::TextAffinity::kDownstream,
+      /*end_anchor=*/after_text_node, /*end_offset=*/0,
+      /*end_affinity*/ ax::mojom::TextAffinity::kDownstream);
+
+  auto original_start = GetStart(range_span_ignored_nodes.Get())->Clone();
+  auto original_end = GetEnd(range_span_ignored_nodes.Get())->Clone();
+
+  // Normalized range after NormalizeTextRange()
+  // |before||ignored1||ignored2||<a>fter|
+  //                              |-|
+  AXNodePosition::AXPositionInstance normalized_start =
+      GetStart(range_span_ignored_nodes.Get())->Clone();
+  AXNodePosition::AXPositionInstance normalized_end =
+      GetEnd(range_span_ignored_nodes.Get())->Clone();
+  NormalizeTextRange(range_span_ignored_nodes.Get(), normalized_start,
+                     normalized_end);
+  // Verify that the original range was not changed by normalization.
+  ExpectPositionsEqual(original_start,
+                       GetStart(range_span_ignored_nodes.Get()));
+  ExpectPositionsEqual(original_end, GetEnd(range_span_ignored_nodes.Get()));
+
+  EXPECT_EQ(*normalized_start, *normalized_end);
+
+  EXPECT_TRUE(normalized_start->IsTextPosition());
+  EXPECT_TRUE(normalized_start->AtStartOfAnchor());
+  EXPECT_EQ(5, normalized_start->anchor_id());
+  EXPECT_EQ(0, normalized_start->text_offset());
+
+  EXPECT_TRUE(normalized_end->IsTextPosition());
+  EXPECT_TRUE(normalized_end->AtStartOfAnchor());
+  EXPECT_EQ(5, normalized_end->anchor_id());
+  EXPECT_EQ(0, normalized_end->text_offset());
+}
+
+// TODO(schectman) Non-zero text offset in position into an empty node.
+// Why? https://github.com/flutter/flutter/issues/117012
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       DISABLED_TestNormalizeTextRangeForceSameAnchorOnDegenerateRange) {
+  // ++1 kRootWebArea
+  // ++++2 kGenericContainer
+  // ++++++3 kImage
+  // ++++4 kTextField
+  // ++++++5 kGenericContainer
+  // ++++++++6 kStaticText
+  // ++++++++++7 kInlineTextBox
+  ui::AXNodeData root_1;
+  ui::AXNodeData generic_container_2;
+  ui::AXNodeData line_break_3;
+  ui::AXNodeData text_field_4;
+  ui::AXNodeData generic_container_5;
+  ui::AXNodeData static_text_6;
+  ui::AXNodeData inline_box_7;
+
+  root_1.id = 1;
+  generic_container_2.id = 2;
+  line_break_3.id = 3;
+  text_field_4.id = 4;
+  generic_container_5.id = 5;
+  static_text_6.id = 6;
+  inline_box_7.id = 7;
+
+  root_1.role = ax::mojom::Role::kRootWebArea;
+  root_1.child_ids = {generic_container_2.id, text_field_4.id};
+
+  generic_container_2.role = ax::mojom::Role::kGenericContainer;
+  generic_container_2.AddBoolAttribute(
+      ax::mojom::BoolAttribute::kIsLineBreakingObject, true);
+  generic_container_2.child_ids = {line_break_3.id};
+
+  line_break_3.role = ax::mojom::Role::kLineBreak;
+
+  text_field_4.role = ax::mojom::Role::kTextField;
+  text_field_4.AddState(ax::mojom::State::kEditable);
+  text_field_4.child_ids = {generic_container_5.id};
+  text_field_4.SetValue("3.14");
+
+  generic_container_5.role = ax::mojom::Role::kGenericContainer;
+  generic_container_5.child_ids = {static_text_6.id};
+
+  static_text_6.role = ax::mojom::Role::kStaticText;
+  static_text_6.child_ids = {inline_box_7.id};
+  static_text_6.SetName("3.14");
+
+  inline_box_7.role = ax::mojom::Role::kInlineTextBox;
+  inline_box_7.SetName("3.14");
+
+  ui::AXTreeUpdate update;
+  ui::AXTreeData tree_data;
+  tree_data.tree_id = ui::AXTreeID::CreateNewAXTreeID();
+  update.tree_data = tree_data;
+  update.has_tree_data = true;
+  update.root_id = root_1.id;
+  update.nodes.push_back(root_1);
+  update.nodes.push_back(generic_container_2);
+  update.nodes.push_back(line_break_3);
+  update.nodes.push_back(text_field_4);
+  update.nodes.push_back(generic_container_5);
+  update.nodes.push_back(static_text_6);
+  update.nodes.push_back(inline_box_7);
+
+  Init(update);
+  const AXTree* tree = GetTree();
+
+  const AXNode* line_break_3_node = tree->GetFromId(line_break_3.id);
+  const AXNode* inline_box_7_node = tree->GetFromId(inline_box_7.id);
+
+  AXPlatformNodeWin* owner = static_cast<AXPlatformNodeWin*>(
+      AXPlatformNodeFromNode(GetNodeFromTree(tree_data.tree_id, 1)));
+
+  // start: TextPosition, anchor_id=3, text_offset=1, annotated_text=/xFFFC<>
+  // end  : TextPosition, anchor_id=7, text_offset=0, annotated_text=<p>i
+  ComPtr<AXPlatformNodeTextRangeProviderWin> range;
+  CreateTextRangeProviderWin(
+      range, owner,
+      /*start_anchor=*/line_break_3_node, /*start_offset=*/1,
+      /*start_affinity*/ ax::mojom::TextAffinity::kDownstream,
+      /*end_anchor=*/inline_box_7_node, /*end_offset=*/0,
+      /*end_affinity*/ ax::mojom::TextAffinity::kDownstream);
+
+  auto original_start = GetStart(range.Get())->Clone();
+  auto original_end = GetEnd(range.Get())->Clone();
+
+  AXNodePosition::AXPositionInstance normalized_start =
+      GetStart(range.Get())->Clone();
+  AXNodePosition::AXPositionInstance normalized_end =
+      GetEnd(range.Get())->Clone();
+  NormalizeTextRange(range.Get(), normalized_start, normalized_end);
+  // Verify that the original range was not changed by normalization.
+  ExpectPositionsEqual(original_start, GetStart(range.Get()));
+  ExpectPositionsEqual(original_end, GetEnd(range.Get()));
+
+  EXPECT_EQ(*normalized_start, *normalized_start);
+
+  EXPECT_TRUE(normalized_start->AtStartOfAnchor());
+  EXPECT_TRUE(normalized_end->AtStartOfAnchor());
+  EXPECT_EQ(7, normalized_start->anchor_id());
+  EXPECT_EQ(7, normalized_end->anchor_id());
+}
+
+// TODO(schectman) https://github.com/flutter/flutter/issues/117012
+TEST_F(AXPlatformNodeTextRangeProviderTest, DISABLED_TestValidateStartAndEnd) {
+  // This test updates the tree structure to test a specific edge case -
+  // CreatePositionAtFormatBoundary when text lies at the beginning and end
+  // of the AX tree.
+  AXNodeData root_data;
+  root_data.id = 1;
+  root_data.role = ax::mojom::Role::kRootWebArea;
+
+  AXNodeData text_data;
+  text_data.id = 2;
+  text_data.role = ax::mojom::Role::kStaticText;
+  text_data.SetName("some text");
+
+  AXNodeData more_text_data;
+  more_text_data.id = 3;
+  more_text_data.role = ax::mojom::Role::kStaticText;
+  more_text_data.SetName("more text");
+
+  root_data.child_ids = {text_data.id, more_text_data.id};
+
+  ui::AXTreeUpdate update;
+  ui::AXTreeID tree_id = ui::AXTreeID::CreateNewAXTreeID();
+  update.root_id = root_data.id;
+  update.tree_data.tree_id = tree_id;
+  update.has_tree_data = true;
+  update.nodes = {root_data, text_data, more_text_data};
+
+  Init(update);
+  const AXTree* tree = GetTree();
+
+  const AXNode* root_node = tree->GetFromId(root_data.id);
+  const AXNode* more_text_node = tree->GetFromId(more_text_data.id);
+
+  // Create a position at MaxTextOffset
+  // Making |owner| AXID:1 so that |TestAXNodeWrapper::BuildAllWrappers|
+  // will build the entire tree.
+  AXPlatformNodeWin* owner = static_cast<AXPlatformNodeWin*>(
+      AXPlatformNodeFromNode(GetNodeFromTree(tree_id, 1)));
+
+  // start: TextPosition, anchor_id=1, text_offset=0, annotated_text=<s>ome text
+  // end  : TextPosition, anchor_id=3, text_offset=9, annotated_text=more text<>
+  ComPtr<AXPlatformNodeTextRangeProviderWin> text_range_provider;
+  CreateTextRangeProviderWin(
+      text_range_provider, owner,
+      /*start_anchor=*/root_node, /*start_offset=*/0,
+      /*start_affinity*/ ax::mojom::TextAffinity::kDownstream,
+      /*end_anchor=*/more_text_node, /*end_offset=*/9,
+      /*end_affinity*/ ax::mojom::TextAffinity::kDownstream);
+
+  // Since the end of the range is at MaxTextOffset, moving it by 1 character
+  // should have an expected_count of 0.
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_End, TextUnit_Character,
+      /*count*/ 1,
+      /*expected_text*/ L"some textmore text",
+      /*expected_count*/ 0);
+
+  // Now make a change to shorten MaxTextOffset. Ensure that this position is
+  // invalid, then call SnapToMaxTextOffsetIfBeyond and ensure that it is now
+  // valid.
+  more_text_data.SetName("ore tex");
+  AXTreeUpdate test_update;
+  test_update.nodes = {more_text_data};
+  ASSERT_TRUE(GetTree()->Unserialize(test_update));
+
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_End, TextUnit_Character,
+      /*count*/ 1,
+      /*expected_text*/ L"some textore tex",
+      /*expected_count*/ 0);
+
+  // Now modify the tree so that start_ is pointing to a node that has been
+  // removed from the tree.
+  text_data.SetNameExplicitlyEmpty();
+  AXTreeUpdate test_update2;
+  test_update2.nodes = {text_data};
+  ASSERT_TRUE(GetTree()->Unserialize(test_update2));
+
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_Start, TextUnit_Character,
+      /*count*/ 1,
+      /*expected_text*/ L"re tex",
+      /*expected_count*/ 1);
+
+  // Now adjust a node that's not the final node in the tree to point past
+  // MaxTextOffset. First move the range endpoints so that they're pointing to
+  // MaxTextOffset on the first node.
+  text_data.SetName("some text");
+  AXTreeUpdate test_update3;
+  test_update3.nodes = {text_data};
+  ASSERT_TRUE(GetTree()->Unserialize(test_update3));
+
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_Start, TextUnit_Character,
+      /*count*/ -10,
+      /*expected_text*/ L"some textore tex",
+      /*expected_count*/ -10);
+
+  // Ensure that we're at MaxTextOffset on the first node by first
+  // overshooting a negative move...
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_End, TextUnit_Character,
+      /*count*/ -8,
+      /*expected_text*/ L"some tex",
+      /*expected_count*/ -8);
+
+  // ...followed by a positive move
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_End, TextUnit_Character,
+      /*count*/ 1,
+      /*expected_text*/ L"some text",
+      /*expected_count*/ 1);
+
+  // Now our range's start_ is pointing to offset 0 on the first node and end_
+  // is pointing to MaxTextOffset on the first node. Now modify the tree so
+  // that MaxTextOffset is invalid on the first node and ensure that we can
+  // still move
+  text_data.SetName("some tex");
+  AXTreeUpdate test_update4;
+  test_update4.nodes = {text_data};
+  ASSERT_TRUE(GetTree()->Unserialize(test_update4));
+
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(
+      text_range_provider, TextPatternRangeEndpoint_Start, TextUnit_Character,
+      /*count*/ 1,
+      /*expected_text*/ L"ome tex",
+      /*expected_count*/ 1);
+}
+
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       TestReplaceStartAndEndEndpointNode) {
+  // This test updates the tree structure to ensure that the text range is still
+  // valid after a text node gets replaced by another one. This case occurs
+  // every time an AT's focus moves to a node whose style is affected by focus,
+  // thus generating a tree update.
+  //
+  // ++1 kRootWebArea
+  // ++++2 kGroup (ignored)
+  // ++++++3 kStaticText/++++4 kStaticText (replacement node)
+  // ++++5 kStaticText/++++6 kStaticText (replacement node)
+  AXNodeData root_1;
+  AXNodeData group_2;
+  AXNodeData text_3;
+  AXNodeData text_4;
+  AXNodeData text_5;
+  AXNodeData text_6;
+
+  root_1.id = 1;
+  group_2.id = 2;
+  text_3.id = 3;
+  text_4.id = 4;
+  text_5.id = 5;
+  text_6.id = 6;
+
+  root_1.role = ax::mojom::Role::kRootWebArea;
+  root_1.child_ids = {text_3.id, text_5.id};
+
+  group_2.role = ax::mojom::Role::kGroup;
+  group_2.AddState(ax::mojom::State::kIgnored);
+  group_2.child_ids = {text_3.id};
+
+  text_3.role = ax::mojom::Role::kStaticText;
+  text_3.SetName("some text");
+
+  // Replacement node of |text_3|.
+  text_4.role = ax::mojom::Role::kStaticText;
+  text_4.SetName("some text");
+
+  text_5.role = ax::mojom::Role::kStaticText;
+  text_5.SetName("more text");
+
+  // Replacement node of |text_5|.
+  text_6.role = ax::mojom::Role::kStaticText;
+  text_6.SetName("more text");
+
+  ui::AXTreeUpdate update;
+  ui::AXTreeID tree_id = ui::AXTreeID::CreateNewAXTreeID();
+  update.root_id = root_1.id;
+  update.tree_data.tree_id = tree_id;
+  update.has_tree_data = true;
+  update.nodes = {root_1, text_3, text_5};
+
+  Init(update);
+  const AXTree* tree = GetTree();
+
+  const AXNode* text_3_node = tree->GetFromId(text_3.id);
+  const AXNode* text_5_node = tree->GetFromId(text_5.id);
+
+  // Create a position at MaxTextOffset.
+  // Making |owner| AXID:1 so that |TestAXNodeWrapper::BuildAllWrappers|
+  // will build the entire tree.
+  AXPlatformNodeWin* owner = static_cast<AXPlatformNodeWin*>(
+      AXPlatformNodeFromNode(GetNodeFromTree(tree_id, 1)));
+
+  // start: TextPosition, anchor_id=3, text_offset=0, annotated_text=<s>ome text
+  // end  : TextPosition, anchor_id=5, text_offset=9, annotated_text=more text<>
+  ComPtr<AXPlatformNodeTextRangeProviderWin> range;
+  CreateTextRangeProviderWin(
+      range, owner,
+      /*start_anchor*/ text_3_node, /*start_offset*/ 0,
+      /*start_affinity*/ ax::mojom::TextAffinity::kDownstream,
+      /*end_anchor*/ text_5_node, /*end_offset*/ 9,
+      /*end_affinity*/ ax::mojom::TextAffinity::kDownstream);
+
+  EXPECT_UIA_TEXTRANGE_EQ(range, /*expected_text*/ L"some textmore text");
+
+  // 1. Replace the node on which |start_| is.
+  {
+    // Replace node |text_3| with |text_4|.
+    root_1.child_ids = {text_4.id, text_5.id};
+    AXTreeUpdate test_update;
+    test_update.nodes = {root_1, text_4};
+    ASSERT_TRUE(GetTree()->Unserialize(test_update));
+
+    // Replacing that node shouldn't impact the range.
+    base::win::ScopedSafearray children;
+    range->GetChildren(children.Receive());
+    EXPECT_UIA_TEXTRANGE_EQ(range, /*expected_text*/ L"some textmore text");
+
+    // The |start_| endpoint should have moved to the root, skipping its ignored
+    // parent.
+    EXPECT_EQ(root_1.id, GetStart(range.Get())->anchor_id());
+    EXPECT_EQ(0, GetStart(range.Get())->text_offset());
+
+    // The |end_| endpoint should not have moved.
+    EXPECT_EQ(text_5.id, GetEnd(range.Get())->anchor_id());
+    EXPECT_EQ(9, GetEnd(range.Get())->text_offset());
+  }
+
+  // 2. Replace the node on which |end_| is.
+  {
+    // Replace node |text_4| with |text_5|.
+    root_1.child_ids = {text_4.id, text_6.id};
+    AXTreeUpdate test_update;
+    test_update.nodes = {root_1, text_6};
+    ASSERT_TRUE(GetTree()->Unserialize(test_update));
+
+    // Replacing that node shouldn't impact the range.
+    base::win::ScopedSafearray children;
+    range->GetChildren(children.Receive());
+    EXPECT_UIA_TEXTRANGE_EQ(range, /*expected_text*/ L"some textmore text");
+
+    // The |start_| endpoint should still be on its parent.
+    EXPECT_EQ(root_1.id, GetStart(range.Get())->anchor_id());
+    EXPECT_EQ(0, GetStart(range.Get())->text_offset());
+
+    // The |end_| endpoint should have moved to its parent.
+    EXPECT_EQ(root_1.id, GetEnd(range.Get())->anchor_id());
+    EXPECT_EQ(18, GetEnd(range.Get())->text_offset());
+  }
+
+  // 3. Replace the node on which |start_| and |end_| is.
+  {
+    // start: TextPosition, anchor_id=4, text_offset=0, annotated_text=<s>ome
+    // end  : TextPosition, anchor_id=4, text_offset=4, annotated_text=some<>
+    const AXNode* text_4_node = tree->GetFromId(text_4.id);
+    ComPtr<AXPlatformNodeTextRangeProviderWin> range_2;
+    CreateTextRangeProviderWin(
+        range_2, owner,
+        /*start_anchor*/ text_4_node, /*start_offset*/ 0,
+        /*start_affinity*/ ax::mojom::TextAffinity::kDownstream,
+        /*end_anchor*/ text_4_node, /*end_offset*/ 4,
+        /*end_affinity*/ ax::mojom::TextAffinity::kDownstream);
+
+    EXPECT_UIA_TEXTRANGE_EQ(range_2, /*expected_text*/ L"some");
+
+    // Replace node |text_4| with |text_3|.
+    root_1.child_ids = {text_3.id, text_6.id};
+    AXTreeUpdate test_update;
+    test_update.nodes = {root_1, text_3};
+    ASSERT_TRUE(GetTree()->Unserialize(test_update));
+
+    // Replacing that node shouldn't impact the range.
+    base::win::ScopedSafearray children;
+    range_2->GetChildren(children.Receive());
+    EXPECT_UIA_TEXTRANGE_EQ(range_2, /*expected_text*/ L"some");
+
+    // The |start_| endpoint should have moved to its parent.
+    EXPECT_EQ(root_1.id, GetStart(range_2.Get())->anchor_id());
+    EXPECT_EQ(0, GetStart(range_2.Get())->text_offset());
+
+    // The |end_| endpoint should have moved to its parent.
+    EXPECT_EQ(root_1.id, GetEnd(range_2.Get())->anchor_id());
+    EXPECT_EQ(4, GetEnd(range_2.Get())->text_offset());
+  }
+}
+
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       TestDeleteSubtreeThatIncludesEndpoints) {
+  // This test updates the tree structure to ensure that the text range is still
+  // valid after a subtree that includes the text range is deleted, resulting in
+  // a change to the range.
+  //
+  // ++1 kRootWebArea
+  // ++++2 kStaticText "one"
+  // ++++3 kGenericContainer
+  // ++++++4 kGenericContainer
+  // ++++++++5 kStaticText " two"
+  // ++++++6 kGenericContainer
+  // ++++++++7 kStaticText " three"
+  AXNodeData root_1;
+  AXNodeData text_2;
+  AXNodeData gc_3;
+  AXNodeData gc_4;
+  AXNodeData text_5;
+  AXNodeData gc_6;
+  AXNodeData text_7;
+
+  root_1.id = 1;
+  text_2.id = 2;
+  gc_3.id = 3;
+  gc_4.id = 4;
+  text_5.id = 5;
+  gc_6.id = 6;
+  text_7.id = 7;
+
+  root_1.role = ax::mojom::Role::kRootWebArea;
+  root_1.child_ids = {text_2.id, gc_3.id};
+
+  text_2.role = ax::mojom::Role::kStaticText;
+  text_2.SetName("one");
+
+  gc_3.role = ax::mojom::Role::kGenericContainer;
+  gc_3.child_ids = {gc_4.id, gc_6.id};
+
+  gc_4.role = ax::mojom::Role::kGenericContainer;
+  gc_4.child_ids = {text_5.id};
+
+  text_5.role = ax::mojom::Role::kStaticText;
+  text_5.SetName(" two");
+
+  gc_6.role = ax::mojom::Role::kGenericContainer;
+  gc_6.child_ids = {text_7.id};
+
+  text_7.role = ax::mojom::Role::kStaticText;
+  text_7.SetName(" three");
+
+  ui::AXTreeUpdate update;
+  ui::AXTreeID tree_id = ui::AXTreeID::CreateNewAXTreeID();
+  update.root_id = root_1.id;
+  update.tree_data.tree_id = tree_id;
+  update.has_tree_data = true;
+  update.nodes = {root_1, text_2, gc_3, gc_4, text_5, gc_6, text_7};
+
+  Init(update);
+  const AXTree* tree = GetTree();
+
+  const AXNode* text_5_node = tree->GetFromId(text_5.id);
+  const AXNode* text_7_node = tree->GetFromId(text_7.id);
+
+  // Making |owner| AXID:1 so that |TestAXNodeWrapper::BuildAllWrappers|
+  // will build the entire tree.
+  AXPlatformNodeWin* owner = static_cast<AXPlatformNodeWin*>(
+      AXPlatformNodeFromNode(GetNodeFromTree(tree_id, 1)));
+
+  // Create a range that spans " two three" located on the leaf nodes.
+
+  // start: TextPosition, anchor_id=5, text_offset=0
+  // end  : TextPosition, anchor_id=7, text_offset=6
+  ComPtr<AXPlatformNodeTextRangeProviderWin> range;
+  CreateTextRangeProviderWin(
+      range, owner,
+      /*start_anchor*/ text_5_node, /*start_offset*/ 0,
+      /*start_affinity*/ ax::mojom::TextAffinity::kDownstream,
+      /*end_anchor*/ text_7_node, /*end_offset*/ 6,
+      /*end_affinity*/ ax::mojom::TextAffinity::kDownstream);
+
+  EXPECT_UIA_TEXTRANGE_EQ(range, /*expected_text*/ L" two three");
+
+  // Delete |gc_3|, which will delete the entire subtree where both of our
+  // endpoints are.
+  AXTreeUpdate test_update;
+  root_1.child_ids = {text_2.id};
+  test_update.nodes = {root_1};
+  ASSERT_TRUE(GetTree()->Unserialize(test_update));
+
+  // The text range should now be a degenerate range positioned at the end of
+  // root, the parent of |gc_3|, since |gc_3| has been deleted.
+  EXPECT_EQ(root_1.id, GetStart(range.Get())->anchor_id());
+  EXPECT_EQ(3, GetStart(range.Get())->text_offset());
+
+  EXPECT_EQ(root_1.id, GetEnd(range.Get())->anchor_id());
+  EXPECT_EQ(3, GetEnd(range.Get())->text_offset());
+}
+
+// TODO(schectman) https://github.com/flutter/flutter/issues/117012
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       DISABLED_TestDeleteSubtreeWithIgnoredAncestors) {
+  // This test updates the tree structure to ensure that the text range doesn't
+  // crash and points to null positions after a subtree that includes the text
+  // range is deleted and all ancestors are ignored.
+  //
+  // ++1 kRootWebArea ignored
+  // ++++2 kStaticText "one"
+  // ++++3 kGenericContainer ignored
+  // ++++++4 kGenericContainer
+  // ++++++++5 kGenericContainer
+  // ++++++++++6 kStaticText " two"
+  // ++++++++7 kGenericContainer ignored
+  // ++++++++++8 kStaticText " ignored" ignored
+  // ++++++++9 kGenericContainer
+  // ++++++++++10 kStaticText " three"
+  // ++++11 kGenericContainer
+  // ++++++12 kStaticText "four"
+  AXNodeData root_1;
+  AXNodeData text_2;
+  AXNodeData gc_3;
+  AXNodeData gc_4;
+  AXNodeData gc_5;
+  AXNodeData text_6;
+  AXNodeData gc_7;
+  AXNodeData text_8;
+  AXNodeData gc_9;
+  AXNodeData text_10;
+  AXNodeData gc_11;
+  AXNodeData text_12;
+
+  root_1.id = 1;
+  text_2.id = 2;
+  gc_3.id = 3;
+  gc_4.id = 4;
+  gc_5.id = 5;
+  text_6.id = 6;
+  gc_7.id = 7;
+  text_8.id = 8;
+  gc_9.id = 9;
+  text_10.id = 10;
+  gc_11.id = 11;
+  text_12.id = 12;
+
+  root_1.role = ax::mojom::Role::kRootWebArea;
+  root_1.child_ids = {text_2.id, gc_3.id, gc_11.id};
+  root_1.AddState(ax::mojom::State::kIgnored);
+
+  text_2.role = ax::mojom::Role::kStaticText;
+  text_2.SetName("one");
+
+  gc_3.role = ax::mojom::Role::kGenericContainer;
+  gc_3.AddState(ax::mojom::State::kIgnored);
+  gc_3.child_ids = {gc_4.id};
+
+  gc_4.role = ax::mojom::Role::kGenericContainer;
+  gc_4.child_ids = {gc_5.id, gc_7.id, gc_9.id};
+
+  gc_5.role = ax::mojom::Role::kGenericContainer;
+  gc_5.child_ids = {text_6.id};
+
+  text_6.role = ax::mojom::Role::kStaticText;
+  text_6.SetName(" two");
+
+  gc_7.role = ax::mojom::Role::kGenericContainer;
+  gc_7.AddState(ax::mojom::State::kIgnored);
+  gc_7.child_ids = {text_8.id};
+
+  text_8.role = ax::mojom::Role::kStaticText;
+  text_8.AddState(ax::mojom::State::kIgnored);
+  text_8.SetName(" ignored");
+
+  gc_9.role = ax::mojom::Role::kGenericContainer;
+  gc_9.child_ids = {text_10.id};
+
+  text_10.role = ax::mojom::Role::kStaticText;
+  text_10.SetName(" three");
+
+  gc_11.role = ax::mojom::Role::kGenericContainer;
+  gc_11.child_ids = {text_12.id};
+
+  text_12.role = ax::mojom::Role::kStaticText;
+  text_12.SetName("four");
+
+  ui::AXTreeUpdate update;
+  ui::AXTreeID tree_id = ui::AXTreeID::CreateNewAXTreeID();
+  update.root_id = root_1.id;
+  update.tree_data.tree_id = tree_id;
+  update.has_tree_data = true;
+  update.nodes = {root_1, text_2, gc_3, gc_4,    gc_5,  text_6,
+                  gc_7,   text_8, gc_9, text_10, gc_11, text_12};
+
+  Init(update);
+  const AXTree* tree = GetTree();
+
+  const AXNode* text_6_node = tree->GetFromId(text_6.id);
+  const AXNode* text_10_node = tree->GetFromId(text_10.id);
+
+  // Making |owner| AXID:1 so that |TestAXNodeWrapper::BuildAllWrappers|
+  // will build the entire tree.
+  AXPlatformNodeWin* owner = static_cast<AXPlatformNodeWin*>(
+      AXPlatformNodeFromNode(GetNodeFromTree(tree_id, 1)));
+
+  // Create a range that spans " two three" located on the leaf nodes.
+
+  // start: TextPosition, anchor_id=5, text_offset=0
+  // end  : TextPosition, anchor_id=7, text_offset=6
+  ComPtr<AXPlatformNodeTextRangeProviderWin> range;
+  CreateTextRangeProviderWin(
+      range, owner,
+      /*start_anchor*/ text_6_node, /*start_offset*/ 2,
+      /*start_affinity*/ ax::mojom::TextAffinity::kDownstream,
+      /*end_anchor*/ text_10_node, /*end_offset*/ 6,
+      /*end_affinity*/ ax::mojom::TextAffinity::kDownstream);
+
+  EXPECT_UIA_TEXTRANGE_EQ(range, /*expected_text*/ L"wo three");
+
+  // Delete |gc_3|, which will delete the entire subtree where both of our
+  // endpoints are.
+  AXTreeUpdate test_update;
+  gc_3.child_ids = {};
+  test_update.nodes = {gc_3};
+  ASSERT_TRUE(GetTree()->Unserialize(test_update));
+
+  // There was no unignored position in which to place the start and end - they
+  // should now be null positions.
+  EXPECT_TRUE(GetStart(range.Get())->IsNullPosition());
+  EXPECT_TRUE(GetEnd(range.Get())->IsNullPosition());
+}
+
+// TODO(schectman) https://github.com/flutter/flutter/issues/117012
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       DISABLED_TestDeleteSubtreeThatIncludesEndpointsNormalizeMoves) {
+  // This test updates the tree structure to ensure that the text range is still
+  // valid after a subtree that includes the text range is deleted, resulting in
+  // a change to the range that is adjusted forwards due to an ignored node.
+  //
+  // ++1 kRootWebArea
+  // ++++2 kStaticText "one"
+  // ++++3 kGenericContainer ignored
+  // ++++++4 kGenericContainer
+  // ++++++++5 kGenericContainer
+  // ++++++++++6 kStaticText " two"
+  // ++++++++7 kGenericContainer
+  // ++++++++++8 kStaticText " three"
+  // ++++++++9 kGenericContainer ignored
+  // ++++++++++10 kStaticText " ignored" ignored
+  // ++++11 kGenericContainer
+  // ++++++12 kStaticText "four"
+  AXNodeData root_1;
+  AXNodeData text_2;
+  AXNodeData gc_3;
+  AXNodeData gc_4;
+  AXNodeData gc_5;
+  AXNodeData text_6;
+  AXNodeData gc_7;
+  AXNodeData text_8;
+  AXNodeData gc_9;
+  AXNodeData text_10;
+  AXNodeData gc_11;
+  AXNodeData text_12;
+
+  root_1.id = 1;
+  text_2.id = 2;
+  gc_3.id = 3;
+  gc_4.id = 4;
+  gc_5.id = 5;
+  text_6.id = 6;
+  gc_7.id = 7;
+  text_8.id = 8;
+  gc_9.id = 9;
+  text_10.id = 10;
+  gc_11.id = 11;
+  text_12.id = 12;
+
+  root_1.role = ax::mojom::Role::kRootWebArea;
+  root_1.child_ids = {text_2.id, gc_3.id, gc_11.id};
+
+  text_2.role = ax::mojom::Role::kStaticText;
+  text_2.SetName("one");
+
+  gc_3.role = ax::mojom::Role::kGenericContainer;
+  gc_3.AddState(ax::mojom::State::kIgnored);
+  gc_3.child_ids = {gc_4.id};
+
+  gc_4.role = ax::mojom::Role::kGenericContainer;
+  gc_4.child_ids = {gc_5.id, gc_7.id, gc_9.id};
+
+  gc_5.role = ax::mojom::Role::kGenericContainer;
+  gc_5.child_ids = {text_6.id};
+
+  text_6.role = ax::mojom::Role::kStaticText;
+  text_6.SetName(" two");
+
+  gc_7.role = ax::mojom::Role::kGenericContainer;
+  gc_7.child_ids = {text_8.id};
+
+  text_8.role = ax::mojom::Role::kStaticText;
+  text_8.SetName(" three");
+
+  gc_9.role = ax::mojom::Role::kGenericContainer;
+  gc_9.AddState(ax::mojom::State::kIgnored);
+  gc_9.child_ids = {text_10.id};
+
+  text_10.role = ax::mojom::Role::kStaticText;
+  text_10.AddState(ax::mojom::State::kIgnored);
+  text_10.SetName(" ignored");
+
+  gc_11.role = ax::mojom::Role::kGenericContainer;
+  gc_11.child_ids = {text_12.id};
+
+  text_12.role = ax::mojom::Role::kStaticText;
+  text_12.SetName("four");
+
+  ui::AXTreeUpdate update;
+  ui::AXTreeID tree_id = ui::AXTreeID::CreateNewAXTreeID();
+  update.root_id = root_1.id;
+  update.tree_data.tree_id = tree_id;
+  update.has_tree_data = true;
+  update.nodes = {root_1, text_2, gc_3, gc_4,    gc_5,  text_6,
+                  gc_7,   text_8, gc_9, text_10, gc_11, text_12};
+
+  Init(update);
+  const AXTree* tree = GetTree();
+
+  const AXNode* text_6_node = tree->GetFromId(text_6.id);
+  const AXNode* text_8_node = tree->GetFromId(text_8.id);
+
+  // Making |owner| AXID:1 so that |TestAXNodeWrapper::BuildAllWrappers|
+  // will build the entire tree.
+  AXPlatformNodeWin* owner = static_cast<AXPlatformNodeWin*>(
+      AXPlatformNodeFromNode(GetNodeFromTree(tree_id, 1)));
+
+  // Create a range that spans " two three" located on the leaf nodes.
+
+  // start: TextPosition, anchor_id=5, text_offset=0
+  // end  : TextPosition, anchor_id=7, text_offset=6
+  ComPtr<AXPlatformNodeTextRangeProviderWin> range;
+  CreateTextRangeProviderWin(
+      range, owner,
+      /*start_anchor*/ text_6_node, /*start_offset*/ 2,
+      /*start_affinity*/ ax::mojom::TextAffinity::kDownstream,
+      /*end_anchor*/ text_8_node, /*end_offset*/ 6,
+      /*end_affinity*/ ax::mojom::TextAffinity::kDownstream);
+
+  EXPECT_UIA_TEXTRANGE_EQ(range, /*expected_text*/ L"wo three");
+
+  // Delete |gc_3|, which will delete the entire subtree where both of our
+  // endpoints are.
+  AXTreeUpdate test_update;
+  gc_3.child_ids = {};
+  test_update.nodes = {gc_3};
+  ASSERT_TRUE(GetTree()->Unserialize(test_update));
+
+  // The text range should now be a degenerate range positioned at the end of
+  // root, the parent of |gc_3|, since |gc_3| has been deleted.
+  EXPECT_EQ(text_12.id, GetStart(range.Get())->anchor_id());
+  EXPECT_EQ(0, GetStart(range.Get())->text_offset());
+
+  EXPECT_EQ(text_12.id, GetEnd(range.Get())->anchor_id());
+  EXPECT_EQ(0, GetEnd(range.Get())->text_offset());
+}
+
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       TestDeleteTreePositionPreviousSibling) {
+  // This test creates a degenerate range with endpoints pointing after the last
+  // child of the 2 generic container. It then deletes a previous sibling and
+  // ensures that we don't crash with an out of bounds index that causes null
+  // child positions to be created.
+  //
+  // ++1 kRootWebArea
+  // ++++2 kGenericContainer
+  // ++++++3 kHeading
+  // ++++++++4 kStaticText
+  // ++++++++++5 kInlineTextBox
+  // ++++++6 kGenericContainer
+  // ++++++7 kButton
+  ui::AXNodeData root_1;
+  ui::AXNodeData generic_container_2;
+  ui::AXNodeData heading_3;
+  ui::AXNodeData static_text_4;
+  ui::AXNodeData inline_box_5;
+  ui::AXNodeData generic_container_6;
+  ui::AXNodeData button_7;
+
+  root_1.id = 1;
+  generic_container_2.id = 2;
+  heading_3.id = 3;
+  static_text_4.id = 4;
+  inline_box_5.id = 5;
+  generic_container_6.id = 6;
+  button_7.id = 7;
+
+  root_1.role = ax::mojom::Role::kRootWebArea;
+  root_1.child_ids = {generic_container_2.id};
+
+  generic_container_2.role = ax::mojom::Role::kGenericContainer;
+  generic_container_2.child_ids = {heading_3.id, generic_container_6.id,
+                                   button_7.id};
+
+  heading_3.role = ax::mojom::Role::kHeading;
+  heading_3.child_ids = {static_text_4.id};
+
+  static_text_4.role = ax::mojom::Role::kStaticText;
+  static_text_4.child_ids = {inline_box_5.id};
+  static_text_4.SetName("3.14");
+
+  inline_box_5.role = ax::mojom::Role::kInlineTextBox;
+  inline_box_5.SetName("3.14");
+
+  generic_container_6.role = ax::mojom::Role::kGenericContainer;
+  generic_container_6.AddBoolAttribute(
+      ax::mojom::BoolAttribute::kIsLineBreakingObject, true);
+
+  button_7.role = ax::mojom::Role::kButton;
+
+  ui::AXTreeUpdate update;
+  ui::AXTreeData tree_data;
+  tree_data.tree_id = ui::AXTreeID::CreateNewAXTreeID();
+  update.tree_data = tree_data;
+  update.has_tree_data = true;
+  update.root_id = root_1.id;
+  update.nodes = {root_1,       generic_container_2, heading_3, static_text_4,
+                  inline_box_5, generic_container_6, button_7};
+
+  Init(update);
+  AXTree* tree = GetTree();
+
+  AXNode* root_node = GetRootAsAXNode();
+  AXNodePosition::AXPositionInstance range_start =
+      AXNodePosition::CreateTreePosition(tree->GetAXTreeID(),
+                                         generic_container_2.id,
+                                         /*child_index*/ 3);
+  AXNodePosition::AXPositionInstance range_end = range_start->Clone();
+
+  AXPlatformNodeWin* owner =
+      static_cast<AXPlatformNodeWin*>(AXPlatformNodeFromNode(root_node));
+  ComPtr<ITextRangeProvider> text_range_provider =
+      AXPlatformNodeTextRangeProviderWin::CreateTextRangeProviderForTesting(
+          owner, std::move(range_start), std::move(range_end));
+  EXPECT_UIA_TEXTRANGE_EQ(text_range_provider, L"");
+
+  generic_container_2.child_ids = {heading_3.id, button_7.id};
+  AXTreeUpdate test_update;
+  test_update.nodes = {generic_container_2};
+  ASSERT_TRUE(tree->Unserialize(test_update));
+
+  root_1.child_ids = {};
+  test_update.nodes = {root_1};
+  ASSERT_TRUE(tree->Unserialize(test_update));
+}
+
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       TestReplaceStartAndEndEndpointRepeatRemoval) {
+  // This test updates the tree structure to ensure that the text range is still
+  // valid after text nodes get removed repeatedly.
+  //
+  // ++1 kRootWebArea
+  // ++++2 kStaticText
+  // ++++3 kGroup (ignored)
+  // ++++++4 kStaticText
+  // ++++5 kStaticText
+  AXNodeData root_1;
+  AXNodeData text_2;
+  AXNodeData group_3;
+  AXNodeData text_4;
+  AXNodeData text_5;
+
+  root_1.id = 1;
+  text_2.id = 2;
+  group_3.id = 3;
+  text_4.id = 4;
+  text_5.id = 5;
+
+  root_1.role = ax::mojom::Role::kRootWebArea;
+  root_1.child_ids = {text_2.id, group_3.id, text_5.id};
+
+  text_2.role = ax::mojom::Role::kStaticText;
+  text_2.SetName("text 2");
+
+  group_3.role = ax::mojom::Role::kGroup;
+  group_3.AddState(ax::mojom::State::kIgnored);
+  group_3.child_ids = {text_4.id};
+
+  text_4.role = ax::mojom::Role::kStaticText;
+  text_4.SetName("text 4");
+
+  text_5.role = ax::mojom::Role::kStaticText;
+  text_5.SetName("text 5");
+
+  ui::AXTreeUpdate update;
+  ui::AXTreeID tree_id = ui::AXTreeID::CreateNewAXTreeID();
+  update.root_id = root_1.id;
+  update.tree_data.tree_id = tree_id;
+  update.has_tree_data = true;
+  update.nodes = {root_1, text_2, group_3, text_4, text_5};
+
+  Init(update);
+  const AXTree* tree = GetTree();
+
+  const AXNode* text_2_node = tree->GetFromId(text_2.id);
+  const AXNode* text_4_node = tree->GetFromId(text_4.id);
+
+  // Making |owner| AXID:1 so that |TestAXNodeWrapper::BuildAllWrappers|
+  // will build the entire tree.
+  AXPlatformNodeWin* owner = static_cast<AXPlatformNodeWin*>(
+      AXPlatformNodeFromNode(GetNodeFromTree(tree_id, 1)));
+
+  ComPtr<AXPlatformNodeTextRangeProviderWin> range;
+  CreateTextRangeProviderWin(
+      range, owner,
+      /*start_anchor*/ text_2_node, /*start_offset*/ 0,
+      /*start_affinity*/ ax::mojom::TextAffinity::kDownstream,
+      /*end_anchor*/ text_4_node, /*end_offset*/ 0,
+      /*end_affinity*/ ax::mojom::TextAffinity::kDownstream);
+
+  EXPECT_UIA_TEXTRANGE_EQ(range, /*expected_text*/ L"text 2");
+
+  // start: TextPosition, anchor_id=2, text_offset=0, annotated_text=<t>ext2
+  // end  : TextPosition, anchor_id=4, text_offset=0, annotated_text=<>text4
+  // 1. Remove |text_4| which |end_| is anchored on.
+  {
+    // Remove node |text_4|.
+    group_3.child_ids = {};
+    AXTreeUpdate test_update;
+    test_update.nodes = {root_1, group_3};
+    ASSERT_TRUE(GetTree()->Unserialize(test_update));
+
+    // Replacing that node should not impact the range.
+    EXPECT_UIA_TEXTRANGE_EQ(range, /*expected_text*/ L"text 2");
+  }
+
+  // start: TextPosition, anchor_id=2, text_offset=0, annotated_text=<>text2
+  // end  : TextPosition, anchor_id=2, text_offset=5, annotated_text=text2<>
+  // 2. Remove |text_2|, which both |start_| and |end_| are anchored to and
+  //  replace with |text_5|.
+  {
+    root_1.child_ids = {group_3.id, text_5.id};
+    AXTreeUpdate test_update;
+    test_update.nodes = {root_1, group_3};
+    ASSERT_TRUE(GetTree()->Unserialize(test_update));
+
+    // Removing that node should adjust the range to the |text_5|, as it took
+    // |text_2|'s position.
+    EXPECT_UIA_TEXTRANGE_EQ(range, /*expected_text*/ L"text 5");
+  }
+
+  // start: TextPosition, anchor_id=5, text_offset=0, annotated_text=<>text5
+  // end  : TextPosition, anchor_id=5, text_offset=5, annotated_text=text5<>
+  // 3. Remove |text_5|, which both |start_| and |end_| are pointing to.
+  {
+    root_1.child_ids = {group_3.id};
+    AXTreeUpdate test_update;
+    test_update.nodes = {root_1, group_3};
+    ASSERT_TRUE(GetTree()->Unserialize(test_update));
+
+    // Removing the last text node should leave a degenerate range.
+    EXPECT_UIA_TEXTRANGE_EQ(range, /*expected_text*/ L"");
+  }
+}
+
+TEST_F(AXPlatformNodeTextRangeProviderTest, CaretAtEndOfTextFieldReadOnly) {
+  // This test places a degenerate range at end of text field, and it should not
+  // normalize to other positions, so we should expect the
+  // 'UIA_IsReadOnlyAttributeId' attribute queried at this position to return
+  // false.
+  // ++1 kRootWebArea
+  // ++++2 kTextField editable value="hello"
+  // ++++++3 kGenericContainer editable isLineBreakingObject=true
+  // ++++++++4 kStaticText editable name="hello"
+  // ++++++++++5 kInlineTextBox editable name="hello"
+  // ++++6 kStaticText name="abc"
+  // ++++++7 kInlineTextBox name="abc"
+  AXNodeData root_1;
+  AXNodeData text_field_2;
+  AXNodeData generic_container_3;
+  AXNodeData static_text_4;
+  AXNodeData inline_text_5;
+  AXNodeData static_text_6;
+  AXNodeData inline_text_7;
+
+  root_1.id = 1;
+  text_field_2.id = 2;
+  generic_container_3.id = 3;
+  static_text_4.id = 4;
+  inline_text_5.id = 5;
+  static_text_6.id = 6;
+  inline_text_7.id = 7;
+
+  root_1.role = ax::mojom::Role::kRootWebArea;
+  root_1.child_ids = {text_field_2.id, static_text_6.id};
+
+  text_field_2.role = ax::mojom::Role::kTextField;
+  text_field_2.AddState(ax::mojom::State::kEditable);
+  text_field_2.SetValue("hello");
+  text_field_2.child_ids = {generic_container_3.id};
+
+  generic_container_3.role = ax::mojom::Role::kGenericContainer;
+  generic_container_3.AddState(ax::mojom::State::kEditable);
+  generic_container_3.AddBoolAttribute(
+      ax::mojom::BoolAttribute::kIsLineBreakingObject, true);
+  generic_container_3.child_ids = {static_text_4.id};
+
+  static_text_4.role = ax::mojom::Role::kStaticText;
+  static_text_4.SetName("hello");
+  static_text_4.AddState(ax::mojom::State::kEditable);
+  static_text_4.child_ids = {inline_text_5.id};
+
+  inline_text_5.role = ax::mojom::Role::kInlineTextBox;
+  inline_text_5.SetName("hello");
+  inline_text_5.AddState(ax::mojom::State::kEditable);
+
+  static_text_6.role = ax::mojom::Role::kStaticText;
+  static_text_6.SetName("abc");
+  static_text_6.child_ids = {inline_text_7.id};
+
+  inline_text_7.role = ax::mojom::Role::kInlineTextBox;
+  inline_text_7.SetName("abc");
+
+  ui::AXTreeUpdate update;
+  ui::AXTreeID tree_id = ui::AXTreeID::CreateNewAXTreeID();
+  update.root_id = root_1.id;
+  update.tree_data.tree_id = tree_id;
+  update.has_tree_data = true;
+  update.nodes = {root_1,        text_field_2,  generic_container_3,
+                  static_text_4, inline_text_5, static_text_6,
+                  inline_text_7};
+
+  Init(update);
+  const AXTree* tree = GetTree();
+  const AXNode* inline_text_5_node = tree->GetFromId(inline_text_5.id);
+
+  // Making |owner| AXID:1 so that |TestAXNodeWrapper::BuildAllWrappers|
+  // will build the entire tree.
+  AXPlatformNodeWin* owner = static_cast<AXPlatformNodeWin*>(
+      AXPlatformNodeFromNode(GetNodeFromTree(tree_id, 1)));
+
+  ComPtr<AXPlatformNodeTextRangeProviderWin> range;
+  base::win::ScopedVariant expected_variant;
+
+  CreateTextRangeProviderWin(
+      range, owner,
+      /*start_anchor*/ inline_text_5_node, /*start_offset*/ 3,
+      /*start_affinity*/ ax::mojom::TextAffinity::kDownstream,
+      /*end_anchor*/ inline_text_5_node, /*end_offset*/ 4,
+      /*end_affinity*/ ax::mojom::TextAffinity::kDownstream);
+
+  EXPECT_UIA_TEXTRANGE_EQ(range, /*expected_text*/ L"l");
+
+  expected_variant.Set(false);
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(range, UIA_IsReadOnlyAttributeId,
+                              expected_variant);
+
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(range, TextPatternRangeEndpoint_Start,
+                                   TextUnit_Character,
+                                   /*count*/ 1,
+                                   /*expected_text*/ L"",
+                                   /*expected_count*/ 1);
+  expected_variant.Set(false);
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(range, UIA_IsReadOnlyAttributeId,
+                              expected_variant);
+
+  EXPECT_UIA_MOVE(range, TextUnit_Character,
+                  /*count*/ 1,
+                  /*expected_text*/
+                  L"",
+                  /*expected_count*/ 1);
+  expected_variant.Set(false);
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(range, UIA_IsReadOnlyAttributeId,
+                              expected_variant);
+  const AXNodePosition::AXPositionInstance& start = GetStart(range.Get());
+  const AXNodePosition::AXPositionInstance& end = GetEnd(range.Get());
+  EXPECT_TRUE(start->AtEndOfAnchor());
+  EXPECT_EQ(5, start->anchor_id());
+  EXPECT_EQ(5, start->text_offset());
+
+  EXPECT_TRUE(end->AtEndOfAnchor());
+  EXPECT_EQ(5, end->anchor_id());
+  EXPECT_EQ(5, end->text_offset());
+}
+
+// TODO(schectman) Not all attributes treated as in Chromium.
+// https://github.com/flutter/flutter/issues/117012
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       DISABLED_GeneratedNewlineReturnsCommonAnchorReadonly) {
+  // This test places a range that starts at the end of a paragraph and
+  // ends at the beginning of the next paragraph. The range only contains the
+  // generated newline character. The readonly attribute value returned should
+  // be the one of the common anchor of the start and end endpoint.
+
+  // ++1 kRootWebArea
+  // ++++2 kGenericContainer
+  // ++++++3 kImage
+  // ++++++4 kTextField editable
+  // ++++5 kGenericContainer editable
+  // ++++++6 kImage
+  // ++++++7 kTextField editable
+  // ++++8 kGenericContainer
+  // ++++++9 kTextField editable
+  // ++++++10 kTextField editable
+  AXNodeData root_1;
+  AXNodeData generic_container_2;
+  AXNodeData image_3;
+  AXNodeData text_field_4;
+  AXNodeData generic_container_5;
+  AXNodeData image_6;
+  AXNodeData text_field_7;
+  AXNodeData generic_container_8;
+  AXNodeData text_field_9;
+  AXNodeData text_field_10;
+
+  root_1.id = 1;
+  generic_container_2.id = 2;
+  image_3.id = 3;
+  text_field_4.id = 4;
+  generic_container_5.id = 5;
+  image_6.id = 6;
+  text_field_7.id = 7;
+  generic_container_8.id = 8;
+  text_field_9.id = 9;
+  text_field_10.id = 10;
+
+  root_1.role = ax::mojom::Role::kRootWebArea;
+  root_1.child_ids = {generic_container_2.id, generic_container_5.id,
+                      generic_container_8.id};
+
+  generic_container_2.role = ax::mojom::Role::kGenericContainer;
+  generic_container_2.child_ids = {image_3.id, text_field_4.id};
+
+  image_3.role = ax::mojom::Role::kImage;
+  image_3.AddBoolAttribute(ax::mojom::BoolAttribute::kIsLineBreakingObject,
+                           true);
+
+  text_field_4.role = ax::mojom::Role::kTextField;
+  text_field_4.AddState(ax::mojom::State::kEditable);
+
+  generic_container_5.role = ax::mojom::Role::kGenericContainer;
+  generic_container_5.AddState(ax::mojom::State::kEditable);
+  generic_container_5.child_ids = {image_6.id, text_field_7.id};
+
+  image_6.role = ax::mojom::Role::kImage;
+  image_6.AddBoolAttribute(ax::mojom::BoolAttribute::kIsLineBreakingObject,
+                           true);
+
+  text_field_7.role = ax::mojom::Role::kTextField;
+  text_field_7.AddState(ax::mojom::State::kEditable);
+
+  generic_container_8.role = ax::mojom::Role::kGenericContainer;
+  generic_container_8.child_ids = {text_field_9.id, text_field_10.id};
+
+  text_field_9.role = ax::mojom::Role::kTextField;
+  text_field_9.AddState(ax::mojom::State::kEditable);
+  text_field_9.AddBoolAttribute(ax::mojom::BoolAttribute::kIsLineBreakingObject,
+                                true);
+
+  text_field_10.role = ax::mojom::Role::kTextField;
+  text_field_10.AddState(ax::mojom::State::kEditable);
+
+  ui::AXTreeUpdate update;
+  ui::AXTreeID tree_id = ui::AXTreeID::CreateNewAXTreeID();
+  update.root_id = root_1.id;
+  update.tree_data.tree_id = tree_id;
+  update.has_tree_data = true;
+  update.nodes = {root_1,       generic_container_2, image_3,
+                  text_field_4, generic_container_5, image_6,
+                  text_field_7, generic_container_8, text_field_9,
+                  text_field_10};
+
+  Init(update);
+  const AXTree* tree = GetTree();
+
+  const AXNode* image_3_node = tree->GetFromId(image_3.id);
+  const AXNode* image_6_node = tree->GetFromId(image_6.id);
+  const AXNode* text_field_4_node = tree->GetFromId(text_field_4.id);
+  const AXNode* text_field_7_node = tree->GetFromId(text_field_7.id);
+  const AXNode* text_field_9_node = tree->GetFromId(text_field_9.id);
+  const AXNode* text_field_10_node = tree->GetFromId(text_field_10.id);
+
+  // Making |owner| AXID:1 so that |TestAXNodeWrapper::BuildAllWrappers|
+  // will build the entire tree.
+  AXPlatformNodeWin* owner = static_cast<AXPlatformNodeWin*>(
+      AXPlatformNodeFromNode(GetNodeFromTree(tree_id, 1)));
+
+  base::win::ScopedVariant expected_variant;
+
+  ComPtr<AXPlatformNodeTextRangeProviderWin> range_1;
+  CreateTextRangeProviderWin(
+      range_1, owner,
+      /*start_anchor*/ image_3_node, /*start_offset*/ 1,
+      /*start_affinity*/ ax::mojom::TextAffinity::kDownstream,
+      /*end_anchor*/ text_field_4_node, /*end_offset*/ 0,
+      /*end_affinity*/ ax::mojom::TextAffinity::kDownstream);
+
+  EXPECT_UIA_TEXTRANGE_EQ(range_1, /*expected_text*/ L"");
+
+  expected_variant.Set(true);
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(range_1, UIA_IsReadOnlyAttributeId,
+                              expected_variant);
+  expected_variant.Reset();
+
+  ComPtr<AXPlatformNodeTextRangeProviderWin> range_2;
+  CreateTextRangeProviderWin(
+      range_2, owner,
+      /*start_anchor*/ image_6_node, /*start_offset*/ 1,
+      /*start_affinity*/ ax::mojom::TextAffinity::kDownstream,
+      /*end_anchor*/ text_field_7_node, /*end_offset*/ 0,
+      /*end_affinity*/ ax::mojom::TextAffinity::kDownstream);
+
+  EXPECT_UIA_TEXTRANGE_EQ(range_2, /*expected_text*/ L"");
+
+  expected_variant.Set(false);
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(range_2, UIA_IsReadOnlyAttributeId,
+                              expected_variant);
+  expected_variant.Reset();
+
+  // This is testing a corner case when the range spans two text fields
+  // separated by a paragraph boundary. This case used to not work because we
+  // were relying on NormalizeTextRange to handle generated newlines and
+  // normalization doesn't work when the range spans text fields.
+  ComPtr<AXPlatformNodeTextRangeProviderWin> range_3;
+  CreateTextRangeProviderWin(
+      range_3, owner,
+      /*start_anchor*/ text_field_9_node, /*start_offset*/ 1,
+      /*start_affinity*/ ax::mojom::TextAffinity::kDownstream,
+      /*end_anchor*/ text_field_10_node, /*end_offset*/ 0,
+      /*end_affinity*/ ax::mojom::TextAffinity::kDownstream);
+
+  EXPECT_UIA_TEXTRANGE_EQ(range_3, /*expected_text*/ L"");
+
+  expected_variant.Set(true);
+  EXPECT_UIA_TEXTATTRIBUTE_EQ(range_3, UIA_IsReadOnlyAttributeId,
+                              expected_variant);
+  expected_variant.Reset();
+}
+
+// TODO(schectman) https://github.com/flutter/flutter/issues/117012
+TEST_F(AXPlatformNodeTextRangeProviderTest,
+       DISABLED_MoveEndpointToLastIgnoredForTextNavigationNode) {
+  // This test moves the end endpoint of a range by one paragraph unit forward
+  // to the last node of the tree. That last node happens to be a node that is
+  // ignored for text navigation, but since it's the last node in the tree, it
+  // should successfully move the endpoint to that node and keep the units_moved
+  // value in sync.
+  // ++1 kRootWebArea
+  // ++++2 kStaticText name="abc"
+  // ++++++3 kInlineTextBox name="abc"
+  // ++++4 kGenericContainer
+  AXNodeData root_1;
+  AXNodeData static_text_2;
+  AXNodeData inline_text_3;
+  AXNodeData generic_container_4;
+
+  root_1.id = 1;
+  static_text_2.id = 2;
+  inline_text_3.id = 3;
+  generic_container_4.id = 4;
+
+  root_1.role = ax::mojom::Role::kRootWebArea;
+  root_1.child_ids = {static_text_2.id, generic_container_4.id};
+
+  static_text_2.role = ax::mojom::Role::kStaticText;
+  static_text_2.SetName("abc");
+  static_text_2.child_ids = {inline_text_3.id};
+
+  inline_text_3.role = ax::mojom::Role::kInlineTextBox;
+  inline_text_3.SetName("abc");
+
+  generic_container_4.role = ax::mojom::Role::kGenericContainer;
+
+  ui::AXTreeUpdate update;
+  ui::AXTreeID tree_id = ui::AXTreeID::CreateNewAXTreeID();
+  update.root_id = root_1.id;
+  update.tree_data.tree_id = tree_id;
+  update.has_tree_data = true;
+  update.nodes = {root_1, static_text_2, inline_text_3, generic_container_4};
+
+  Init(update);
+  const AXTree* tree = GetTree();
+  const AXNode* inline_text_3_node = tree->GetFromId(inline_text_3.id);
+
+  // Making |owner| AXID:1 so that |TestAXNodeWrapper::BuildAllWrappers|
+  // will build the entire tree.
+  AXPlatformNodeWin* owner = static_cast<AXPlatformNodeWin*>(
+      AXPlatformNodeFromNode(GetNodeFromTree(tree_id, 1)));
+
+  ComPtr<AXPlatformNodeTextRangeProviderWin> range;
+  base::win::ScopedVariant expected_variant;
+
+  CreateTextRangeProviderWin(
+      range, owner,
+      /*start_anchor*/ inline_text_3_node, /*start_offset*/ 0,
+      /*start_affinity*/ ax::mojom::TextAffinity::kDownstream,
+      /*end_anchor*/ inline_text_3_node, /*end_offset*/ 3,
+      /*end_affinity*/ ax::mojom::TextAffinity::kDownstream);
+
+  EXPECT_UIA_TEXTRANGE_EQ(range, /*expected_text*/ L"abc");
+
+  EXPECT_UIA_MOVE_ENDPOINT_BY_UNIT(range, TextPatternRangeEndpoint_End,
+                                   TextUnit_Paragraph,
+                                   /*count*/ 1,
+                                   /*expected_text*/ L"abc\xFFFC",
+                                   /*expected_count*/ 1);
+}
+
+}  // namespace ui
diff --git a/third_party/accessibility/ax/platform/ax_platform_node_win.cc b/third_party/accessibility/ax/platform/ax_platform_node_win.cc
index dad8d2739806a3a016fe3ced93d9da35d1674c5d..68bf57733fce2498a2c71223257cf2441483d731 100644
--- a/third_party/accessibility/ax/platform/ax_platform_node_win.cc
+++ b/third_party/accessibility/ax/platform/ax_platform_node_win.cc
@@ -31,12 +31,14 @@
 #include "ax_fragment_root_win.h"
 #include "ax_platform_node_delegate.h"
 #include "ax_platform_node_delegate_utils_win.h"
+#include "ax_platform_node_textprovider_win.h"
 #include "shellscalingapi.h"
 #include "uia_registrar_win.h"
 
 #include "base/logging.h"
 #include "base/win/atl_module.h"
 #include "base/win/display.h"
+#include "flutter/fml/platform/win/wstring_conversion.h"
 #include "gfx/geometry/rect_conversions.h"
 
 // From ax.constants.mojom
@@ -962,7 +964,7 @@ IFACEMETHODIMP AXPlatformNodeWin::get_accDefaultAction(VARIANT var_id,
     return S_FALSE;
   }
 
-  *def_action = ::SysAllocString(base::UTF16ToWide(action_verb).c_str());
+  *def_action = ::SysAllocString(fml::Utf16ToWideString(action_verb).c_str());
   BASE_DCHECK(def_action);
   return S_OK;
 }
@@ -1053,7 +1055,7 @@ IFACEMETHODIMP AXPlatformNodeWin::get_accName(VARIANT var_id, BSTR* name_bstr) {
   if (name.empty() && !has_name)
     return S_FALSE;
 
-  *name_bstr = ::SysAllocString(base::UTF16ToWide(name).c_str());
+  *name_bstr = ::SysAllocString(fml::Utf16ToWideString(name).c_str());
   return S_OK;
 }
 
@@ -1064,7 +1066,17 @@ IFACEMETHODIMP AXPlatformNodeWin::get_accParent(IDispatch** disp_parent) {
     (*disp_parent)->AddRef();
     return S_OK;
   }
-
+  IRawElementProviderFragmentRoot* root;
+  if (SUCCEEDED(get_FragmentRoot(&root))) {
+    gfx::NativeViewAccessible parent;
+    if (SUCCEEDED(root->QueryInterface(IID_PPV_ARGS(&parent)))) {
+      if (parent && parent != GetNativeViewAccessible()) {
+        *disp_parent = parent;
+        parent->AddRef();
+        return S_OK;
+      }
+    }
+  }
   return S_FALSE;
 }
 
@@ -1738,7 +1750,7 @@ IFACEMETHODIMP AXPlatformNodeWin::SetValue(LPCWSTR value) {
 
   AXActionData data;
   data.action = ax::mojom::Action::kSetValue;
-  data.value = base::UTF16ToUTF8(base::WideToUTF16(value));
+  data.value = base::UTF16ToUTF8(fml::WideStringToUtf16(value));
   if (GetDelegate()->AccessibilityPerformAction(data))
     return S_OK;
   return E_FAIL;
@@ -2121,20 +2133,20 @@ HRESULT AXPlatformNodeWin::GetPropertyValueImpl(PROPERTYID property_id,
   switch (property_id) {
     case UIA_AriaPropertiesPropertyId:
       result->vt = VT_BSTR;
-      result->bstrVal =
-          ::SysAllocString(base::UTF16ToWide(ComputeUIAProperties()).c_str());
+      result->bstrVal = ::SysAllocString(
+          fml::Utf16ToWideString(ComputeUIAProperties()).c_str());
       break;
 
     case UIA_AriaRolePropertyId:
       result->vt = VT_BSTR;
       result->bstrVal =
-          ::SysAllocString(base::UTF16ToWide(UIAAriaRole()).c_str());
+          ::SysAllocString(fml::Utf16ToWideString(UIAAriaRole()).c_str());
       break;
 
     case UIA_AutomationIdPropertyId:
       V_VT(result) = VT_BSTR;
       V_BSTR(result) = ::SysAllocString(
-          base::UTF16ToWide(GetDelegate()->GetAuthorUniqueId()).c_str());
+          fml::Utf16ToWideString(GetDelegate()->GetAuthorUniqueId()).c_str());
       break;
 
     case UIA_ClassNamePropertyId:
@@ -2303,8 +2315,8 @@ HRESULT AXPlatformNodeWin::GetPropertyValueImpl(PROPERTYID property_id,
       std::u16string localized_control_type = GetRoleDescription();
       if (!localized_control_type.empty()) {
         result->vt = VT_BSTR;
-        result->bstrVal =
-            ::SysAllocString(base::UTF16ToWide(localized_control_type).c_str());
+        result->bstrVal = ::SysAllocString(
+            fml::Utf16ToWideString(localized_control_type).c_str());
       }
       // If a role description has not been provided, leave as VT_EMPTY.
       // UIA core handles Localized Control type for some built-in types and
@@ -2455,7 +2467,7 @@ HRESULT AXPlatformNodeWin::GetPropertyValueImpl(PROPERTYID property_id,
       if (!localized_landmark_type.empty()) {
         result->vt = VT_BSTR;
         result->bstrVal = ::SysAllocString(
-            base::UTF16ToWide(localized_landmark_type).c_str());
+            fml::Utf16ToWideString(localized_landmark_type).c_str());
       }
       break;
     }
@@ -2465,6 +2477,19 @@ HRESULT AXPlatformNodeWin::GetPropertyValueImpl(PROPERTYID property_id,
       result->intVal = static_cast<int>(ComputeExpandCollapseState());
       break;
 
+    case UIA_ToggleToggleStatePropertyId: {
+      ToggleState state;
+      get_ToggleState(&state);
+      result->vt = VT_I4;
+      result->lVal = state;
+      break;
+    }
+
+    case UIA_ValueValuePropertyId:
+      result->vt = VT_BSTR;
+      result->bstrVal = GetValueAttributeAsBstr(this);
+      break;
+
     // Not currently implemented.
     case UIA_AnnotationObjectsPropertyId:
     case UIA_AnnotationTypesPropertyId:
@@ -2501,7 +2526,7 @@ HRESULT AXPlatformNodeWin::GetPropertyValueImpl(PROPERTYID property_id,
     // convention here and when we fire events via ::NotifyWinEvent().
     result->vt = VT_BSTR;
     result->bstrVal = ::SysAllocString(
-        base::UTF16ToWide(base::NumberToString16(-GetUniqueId())).c_str());
+        fml::Utf16ToWideString(base::NumberToString16(-GetUniqueId())).c_str());
   }
 
   return S_OK;
@@ -5205,6 +5230,8 @@ std::optional<DWORD> AXPlatformNodeWin::MojoEventToMSAAEvent(
       return EVENT_OBJECT_SHOW;
     case ax::mojom::Event::kValueChanged:
       return EVENT_OBJECT_VALUECHANGE;
+    case ax::mojom::Event::kDocumentSelectionChanged:
+      return EVENT_OBJECT_TEXTSELECTIONCHANGED;
     default:
       return std::nullopt;
   }
@@ -5216,6 +5243,8 @@ std::optional<EVENTID> AXPlatformNodeWin::MojoEventToUIAEvent(
   switch (event) {
     case ax::mojom::Event::kAlert:
       return UIA_SystemAlertEventId;
+    case ax::mojom::Event::kDocumentSelectionChanged:
+      return UIA_Text_TextChangedEventId;
     case ax::mojom::Event::kFocus:
     case ax::mojom::Event::kFocusContext:
     case ax::mojom::Event::kFocusAfterMenuClose:
@@ -5237,7 +5266,6 @@ std::optional<EVENTID> AXPlatformNodeWin::MojoEventToUIAEvent(
   }
 }
 
-// static
 std::optional<PROPERTYID> AXPlatformNodeWin::MojoEventToUIAProperty(
     ax::mojom::Event event) {
   switch (event) {
@@ -5252,6 +5280,11 @@ std::optional<PROPERTYID> AXPlatformNodeWin::MojoEventToUIAProperty(
     case ax::mojom::Event::kSelectionAdd:
     case ax::mojom::Event::kSelectionRemove:
       return UIA_SelectionItemIsSelectedPropertyId;
+    case ax::mojom::Event::kValueChanged:
+      if (SupportsToggle(GetData().role)) {
+        return UIA_ToggleToggleStatePropertyId;
+      }
+      return std::nullopt;
     default:
       return std::nullopt;
   }
@@ -5286,7 +5319,7 @@ BSTR AXPlatformNodeWin::GetValueAttributeAsBstr(AXPlatformNodeWin* target) {
     value_text = base::NumberToString16(red * 100 / 255) + u"% red " +
                  base::NumberToString16(green * 100 / 255) + u"% green " +
                  base::NumberToString16(blue * 100 / 255) + u"% blue";
-    BSTR value = ::SysAllocString(base::UTF16ToWide(value_text).c_str());
+    BSTR value = ::SysAllocString(fml::Utf16ToWideString(value_text).c_str());
     BASE_DCHECK(value);
     return value;
   }
@@ -5297,7 +5330,7 @@ BSTR AXPlatformNodeWin::GetValueAttributeAsBstr(AXPlatformNodeWin* target) {
   if (target->GetData().role == ax::mojom::Role::kRootWebArea ||
       target->GetData().role == ax::mojom::Role::kWebArea) {
     result = base::UTF8ToUTF16(target->GetDelegate()->GetTreeData().url);
-    BSTR value = ::SysAllocString(base::UTF16ToWide(result).c_str());
+    BSTR value = ::SysAllocString(fml::Utf16ToWideString(result).c_str());
     BASE_DCHECK(value);
     return value;
   }
@@ -5307,7 +5340,7 @@ BSTR AXPlatformNodeWin::GetValueAttributeAsBstr(AXPlatformNodeWin* target) {
   //
   if (target->GetData().role == ax::mojom::Role::kLink) {
     result = target->GetString16Attribute(ax::mojom::StringAttribute::kUrl);
-    BSTR value = ::SysAllocString(base::UTF16ToWide(result).c_str());
+    BSTR value = ::SysAllocString(fml::Utf16ToWideString(result).c_str());
     BASE_DCHECK(value);
     return value;
   }
@@ -5322,7 +5355,7 @@ BSTR AXPlatformNodeWin::GetValueAttributeAsBstr(AXPlatformNodeWin* target) {
     if (target->GetFloatAttribute(ax::mojom::FloatAttribute::kValueForRange,
                                   &fval)) {
       result = base::NumberToString16(fval);
-      BSTR value = ::SysAllocString(base::UTF16ToWide(result).c_str());
+      BSTR value = ::SysAllocString(fml::Utf16ToWideString(result).c_str());
       BASE_DCHECK(value);
       return value;
     }
@@ -5331,7 +5364,7 @@ BSTR AXPlatformNodeWin::GetValueAttributeAsBstr(AXPlatformNodeWin* target) {
   if (result.empty() && target->IsRichTextField())
     result = target->GetInnerText();
 
-  BSTR value = ::SysAllocString(base::UTF16ToWide(result).c_str());
+  BSTR value = ::SysAllocString(fml::Utf16ToWideString(result).c_str());
   BASE_DCHECK(value);
   return value;
 }
@@ -5344,7 +5377,7 @@ HRESULT AXPlatformNodeWin::GetStringAttributeAsBstr(
   if (!GetString16Attribute(attribute, &str))
     return S_FALSE;
 
-  *value_bstr = ::SysAllocString(base::UTF16ToWide(str).c_str());
+  *value_bstr = ::SysAllocString(fml::Utf16ToWideString(str).c_str());
   BASE_DCHECK(*value_bstr);
 
   return S_OK;
@@ -5352,7 +5385,7 @@ HRESULT AXPlatformNodeWin::GetStringAttributeAsBstr(
 
 HRESULT AXPlatformNodeWin::GetNameAsBstr(BSTR* value_bstr) const {
   std::u16string str = GetNameAsString16();
-  *value_bstr = ::SysAllocString(base::UTF16ToWide(str).c_str());
+  *value_bstr = ::SysAllocString(fml::Utf16ToWideString(str).c_str());
   BASE_DCHECK(*value_bstr);
   return S_OK;
 }
@@ -5390,7 +5423,7 @@ AXPlatformNodeWin* AXPlatformNodeWin::GetTargetFromChildID(
 
   AXPlatformNodeBase* base =
       FromNativeViewAccessible(node->GetNativeViewAccessible());
-  if (base && !IsDescendant(base))
+  if (base && !base->IsDescendantOf(this))
     base = nullptr;
 
   return static_cast<AXPlatformNodeWin*>(base);
@@ -5462,14 +5495,14 @@ BSTR AXPlatformNodeWin::GetFontNameAttributeAsBSTR() const {
   const std::u16string string =
       GetInheritedString16Attribute(ax::mojom::StringAttribute::kFontFamily);
 
-  return ::SysAllocString(base::UTF16ToWide(string).c_str());
+  return ::SysAllocString(fml::Utf16ToWideString(string).c_str());
 }
 
 BSTR AXPlatformNodeWin::GetStyleNameAttributeAsBSTR() const {
   std::u16string style_name =
       GetDelegate()->GetStyleNameAttributeAsLocalizedString();
 
-  return ::SysAllocString(base::UTF16ToWide(style_name).c_str());
+  return ::SysAllocString(fml::Utf16ToWideString(style_name).c_str());
 }
 
 TextDecorationLineStyle AXPlatformNodeWin::GetUIATextDecorationStyle(
@@ -5582,6 +5615,14 @@ AXPlatformNodeWin::GetPatternProviderFactoryMethod(PATTERNID pattern_id) {
       }
       break;
 
+    case UIA_TextEditPatternId:
+    case UIA_TextPatternId:
+      if (IsText() || IsTextField() ||
+          data.role == ax::mojom::Role::kRootWebArea) {
+        return &AXPlatformNodeTextProviderWin::CreateIUnknown;
+      }
+      break;
+
     case UIA_TogglePatternId:
       if (SupportsToggle(data.role)) {
         return &PatternProvider<IToggleProvider>;
@@ -5675,4 +5716,28 @@ AXPlatformNodeWin* AXPlatformNodeWin::GetFirstTextOnlyDescendant() {
   return nullptr;
 }
 
+bool AXPlatformNodeWin::IsDescendantOf(AXPlatformNode* ancestor) const {
+  if (!ancestor) {
+    return false;
+  }
+
+  if (AXPlatformNodeBase::IsDescendantOf(ancestor)) {
+    return true;
+  }
+
+  // Test if the ancestor is an IRawElementProviderFragmentRoot and if it
+  // matches this node's root fragment.
+  IRawElementProviderFragmentRoot* root;
+  if (SUCCEEDED(
+          const_cast<AXPlatformNodeWin*>(this)->get_FragmentRoot(&root))) {
+    AXPlatformNodeWin* root_win;
+    if (SUCCEEDED(root->QueryInterface(__uuidof(AXPlatformNodeWin),
+                                       reinterpret_cast<void**>(&root_win)))) {
+      return ancestor == static_cast<AXPlatformNode*>(root_win);
+    }
+  }
+
+  return false;
+}
+
 }  // namespace ui
diff --git a/third_party/accessibility/ax/platform/ax_platform_node_win.h b/third_party/accessibility/ax/platform/ax_platform_node_win.h
index c2dba4fcd71ecd39f8f95c4db3863eb01b497fc7..0f5924e228536389d2990924abbef0e1f035f6f5 100644
--- a/third_party/accessibility/ax/platform/ax_platform_node_win.h
+++ b/third_party/accessibility/ax/platform/ax_platform_node_win.h
@@ -470,8 +470,10 @@ class AX_EXPORT __declspec(uuid("26f5641a-246d-457b-a96d-07f3fae6acf2"))
   static std::optional<EVENTID> MojoEventToUIAEvent(ax::mojom::Event event);
 
   // Convert a mojo event to a UIA property id. Exposed for testing.
-  static std::optional<PROPERTYID> MojoEventToUIAProperty(
-      ax::mojom::Event event);
+  std::optional<PROPERTYID> MojoEventToUIAProperty(ax::mojom::Event event);
+
+  // |AXPlatformNodeBase|
+  bool IsDescendantOf(AXPlatformNode* ancestor) const override;
 
  protected:
   // This is hard-coded; all products based on the Chromium engine will have the
@@ -695,7 +697,7 @@ class AX_EXPORT __declspec(uuid("26f5641a-246d-457b-a96d-07f3fae6acf2"))
   };
 
   // Determine if a text range overlaps a |marker_type|, and whether
-  // the overlap is a partial or or complete match.
+  // the overlap is a partial or complete match.
   MarkerTypeRangeResult GetMarkerTypeFromRange(
       const std::optional<int>& start_offset,
       const std::optional<int>& end_offset,
diff --git a/third_party/accessibility/ax/platform/ax_platform_node_win_unittest.cc b/third_party/accessibility/ax/platform/ax_platform_node_win_unittest.cc
index 90d5e40156d0f3a186f3f32d547fcc2d585fb767..8f0b94d62f98e369e281f28a425acef2731c4ad7 100644
--- a/third_party/accessibility/ax/platform/ax_platform_node_win_unittest.cc
+++ b/third_party/accessibility/ax/platform/ax_platform_node_win_unittest.cc
@@ -1760,7 +1760,7 @@ TEST_F(AXPlatformNodeWinTest, ITableItemProviderGetRowHeaderItems) {
   EXPECT_EQ(nullptr, safearray.Get());
 }
 
-TEST_F(AXPlatformNodeWinTest, DISABLED_UIAGetPropertySimple) {
+TEST_F(AXPlatformNodeWinTest, UIAGetPropertySimple) {
   AXNodeData root;
   root.role = ax::mojom::Role::kList;
   root.SetName("fake name");
@@ -1820,7 +1820,7 @@ TEST_F(AXPlatformNodeWinTest, DISABLED_UIAGetPropertySimple) {
   EXPECT_UIA_INT_EQ(child_node1, UIA_PositionInSetPropertyId, 1);
 }
 
-TEST_F(AXPlatformNodeWinTest, DISABLED_UIAGetPropertyValueClickablePoint) {
+TEST_F(AXPlatformNodeWinTest, UIAGetPropertyValueClickablePoint) {
   AXNodeData root;
   root.id = 1;
   root.role = ax::mojom::Role::kButton;
@@ -1837,7 +1837,7 @@ TEST_F(AXPlatformNodeWinTest, DISABLED_UIAGetPropertyValueClickablePoint) {
                              UIA_ClickablePointPropertyId, expected_values);
 }
 
-TEST_F(AXPlatformNodeWinTest, DISABLED_UIAGetPropertyValueIsDialog) {
+TEST_F(AXPlatformNodeWinTest, UIAGetPropertyValueIsDialog) {
   AXNodeData root;
   root.id = 1;
   root.role = ax::mojom::Role::kRootWebArea;
@@ -1948,7 +1948,7 @@ TEST_F(AXPlatformNodeWinTest,
                      UIA_IsControlElementPropertyId, false);
 }
 
-TEST_F(AXPlatformNodeWinTest, DISABLED_UIAGetControllerForPropertyId) {
+TEST_F(AXPlatformNodeWinTest, UIAGetControllerForPropertyId) {
   AXNodeData root;
   root.id = 1;
   root.role = ax::mojom::Role::kRootWebArea;
@@ -1996,7 +1996,7 @@ TEST_F(AXPlatformNodeWinTest, DISABLED_UIAGetControllerForPropertyId) {
       expected_names_2);
 }
 
-TEST_F(AXPlatformNodeWinTest, DISABLED_UIAGetDescribedByPropertyId) {
+TEST_F(AXPlatformNodeWinTest, UIAGetDescribedByPropertyId) {
   AXNodeData root;
   std::vector<AXNode::AXID> describedby_ids = {2, 3, 4};
   root.AddIntListAttribute(ax::mojom::IntListAttribute::kDescribedbyIds,
@@ -2029,7 +2029,7 @@ TEST_F(AXPlatformNodeWinTest, DISABLED_UIAGetDescribedByPropertyId) {
       root_node, UIA_DescribedByPropertyId, UIA_NamePropertyId, expected_names);
 }
 
-TEST_F(AXPlatformNodeWinTest, DISABLED_UIAItemStatusPropertyId) {
+TEST_F(AXPlatformNodeWinTest, UIAItemStatusPropertyId) {
   AXNodeData root;
   root.id = 1;
   root.role = ax::mojom::Role::kTable;
@@ -2097,7 +2097,7 @@ TEST_F(AXPlatformNodeWinTest, DISABLED_UIAItemStatusPropertyId) {
       UIA_ItemStatusPropertyId, ScopedVariant::kEmptyVariant);
 }
 
-TEST_F(AXPlatformNodeWinTest, DISABLED_UIAGetFlowsToPropertyId) {
+TEST_F(AXPlatformNodeWinTest, UIAGetFlowsToPropertyId) {
   AXNodeData root;
   std::vector<AXNode::AXID> flowto_ids = {2, 3, 4};
   root.AddIntListAttribute(ax::mojom::IntListAttribute::kFlowtoIds, flowto_ids);
@@ -2128,7 +2128,7 @@ TEST_F(AXPlatformNodeWinTest, DISABLED_UIAGetFlowsToPropertyId) {
                                             UIA_NamePropertyId, expected_names);
 }
 
-TEST_F(AXPlatformNodeWinTest, DISABLED_UIAGetPropertyValueFlowsFromNone) {
+TEST_F(AXPlatformNodeWinTest, UIAGetPropertyValueFlowsFromNone) {
   AXNodeData root;
   root.id = 1;
   root.role = ax::mojom::Role::kRootWebArea;
@@ -2146,7 +2146,7 @@ TEST_F(AXPlatformNodeWinTest, DISABLED_UIAGetPropertyValueFlowsFromNone) {
   EXPECT_EQ(nullptr, V_ARRAY(property_value.ptr()));
 }
 
-TEST_F(AXPlatformNodeWinTest, DISABLED_UIAGetPropertyValueFlowsFromSingle) {
+TEST_F(AXPlatformNodeWinTest, UIAGetPropertyValueFlowsFromSingle) {
   AXNodeData root;
   root.id = 1;
   root.role = ax::mojom::Role::kRootWebArea;
@@ -2171,7 +2171,7 @@ TEST_F(AXPlatformNodeWinTest, DISABLED_UIAGetPropertyValueFlowsFromSingle) {
       child_node1, UIA_FlowsFromPropertyId, UIA_NamePropertyId, expected_names);
 }
 
-TEST_F(AXPlatformNodeWinTest, DISABLED_UIAGetPropertyValueFlowsFromMultiple) {
+TEST_F(AXPlatformNodeWinTest, UIAGetPropertyValueFlowsFromMultiple) {
   AXNodeData root;
   root.id = 1;
   root.role = ax::mojom::Role::kRootWebArea;
@@ -2215,7 +2215,7 @@ TEST_F(AXPlatformNodeWinTest, DISABLED_UIAGetPropertyValueFlowsFromMultiple) {
       expected_names_2);
 }
 
-TEST_F(AXPlatformNodeWinTest, DISABLED_UIAGetPropertyValueFrameworkId) {
+TEST_F(AXPlatformNodeWinTest, UIAGetPropertyValueFrameworkId) {
   AXNodeData root_ax_node_data;
   root_ax_node_data.id = 1;
   root_ax_node_data.role = ax::mojom::Role::kRootWebArea;
@@ -2554,7 +2554,7 @@ TEST_F(AXPlatformNodeWinTest, GetPropertyValue_IsControlElement) {
                      UIA_IsControlElementPropertyId, true);
 }
 
-TEST_F(AXPlatformNodeWinTest, DISABLED_UIAGetProviderOptions) {
+TEST_F(AXPlatformNodeWinTest, UIAGetProviderOptions) {
   AXNodeData root_data;
   root_data.id = 1;
   Init(root_data);
@@ -2571,7 +2571,7 @@ TEST_F(AXPlatformNodeWinTest, DISABLED_UIAGetProviderOptions) {
             provider_options);
 }
 
-TEST_F(AXPlatformNodeWinTest, DISABLED_UIAGetHostRawElementProvider) {
+TEST_F(AXPlatformNodeWinTest, UIAGetHostRawElementProvider) {
   AXNodeData root_data;
   root_data.id = 1;
   Init(root_data);
@@ -2585,7 +2585,7 @@ TEST_F(AXPlatformNodeWinTest, DISABLED_UIAGetHostRawElementProvider) {
   EXPECT_EQ(nullptr, host_provider.Get());
 }
 
-TEST_F(AXPlatformNodeWinTest, DISABLED_UIAGetBoundingRectangle) {
+TEST_F(AXPlatformNodeWinTest, UIAGetBoundingRectangle) {
   AXNodeData root_data;
   root_data.id = 1;
   root_data.relative_bounds.bounds = gfx::RectF(10, 20, 30, 50);
@@ -2603,7 +2603,7 @@ TEST_F(AXPlatformNodeWinTest, DISABLED_UIAGetBoundingRectangle) {
   EXPECT_EQ(50, bounding_rectangle.height);
 }
 
-TEST_F(AXPlatformNodeWinTest, DISABLED_UIAGetFragmentRoot) {
+TEST_F(AXPlatformNodeWinTest, UIAGetFragmentRoot) {
   // This test needs to be run on a child node since AXPlatformRootNodeWin
   // overrides the method.
   AXNodeData root_data;
@@ -2643,7 +2643,7 @@ TEST_F(AXPlatformNodeWinTest, DISABLED_UIAGetFragmentRoot) {
       element1_provider->get_FragmentRoot(&actual_fragment_root));
 }
 
-TEST_F(AXPlatformNodeWinTest, DISABLED_UIAGetEmbeddedFragmentRoots) {
+TEST_F(AXPlatformNodeWinTest, UIAGetEmbeddedFragmentRoots) {
   AXNodeData root_data;
   root_data.id = 1;
   Init(root_data);
@@ -2657,7 +2657,7 @@ TEST_F(AXPlatformNodeWinTest, DISABLED_UIAGetEmbeddedFragmentRoots) {
   EXPECT_EQ(nullptr, embedded_fragment_roots.Get());
 }
 
-TEST_F(AXPlatformNodeWinTest, DISABLED_UIAGetRuntimeId) {
+TEST_F(AXPlatformNodeWinTest, UIAGetRuntimeId) {
   AXNodeData root_data;
   root_data.id = 1;
   Init(root_data);
@@ -2687,7 +2687,7 @@ TEST_F(AXPlatformNodeWinTest, DISABLED_UIAGetRuntimeId) {
   EXPECT_HRESULT_SUCCEEDED(::SafeArrayUnaccessData(runtime_id.Get()));
 }
 
-TEST_F(AXPlatformNodeWinTest, DISABLED_UIAIWindowProviderGetIsModalUnset) {
+TEST_F(AXPlatformNodeWinTest, UIAIWindowProviderGetIsModalUnset) {
   AXNodeData root;
   root.id = 1;
   root.role = ax::mojom::Role::kRootWebArea;
@@ -2701,7 +2701,7 @@ TEST_F(AXPlatformNodeWinTest, DISABLED_UIAIWindowProviderGetIsModalUnset) {
   ASSERT_EQ(nullptr, window_provider.Get());
 }
 
-TEST_F(AXPlatformNodeWinTest, DISABLED_UIAIWindowProviderGetIsModalFalse) {
+TEST_F(AXPlatformNodeWinTest, UIAIWindowProviderGetIsModalFalse) {
   AXNodeData root;
   root.id = 1;
   root.role = ax::mojom::Role::kRootWebArea;
@@ -2720,7 +2720,7 @@ TEST_F(AXPlatformNodeWinTest, DISABLED_UIAIWindowProviderGetIsModalFalse) {
   ASSERT_FALSE(is_modal);
 }
 
-TEST_F(AXPlatformNodeWinTest, DISABLED_UIAIWindowProviderGetIsModalTrue) {
+TEST_F(AXPlatformNodeWinTest, UIAIWindowProviderGetIsModalTrue) {
   AXNodeData root;
   root.id = 1;
   root.role = ax::mojom::Role::kRootWebArea;
@@ -2739,7 +2739,7 @@ TEST_F(AXPlatformNodeWinTest, DISABLED_UIAIWindowProviderGetIsModalTrue) {
   ASSERT_TRUE(is_modal);
 }
 
-TEST_F(AXPlatformNodeWinTest, DISABLED_UIAIWindowProviderInvalidArgument) {
+TEST_F(AXPlatformNodeWinTest, UIAIWindowProviderInvalidArgument) {
   AXNodeData root;
   root.id = 1;
   root.role = ax::mojom::Role::kRootWebArea;
@@ -2762,7 +2762,7 @@ TEST_F(AXPlatformNodeWinTest, DISABLED_UIAIWindowProviderInvalidArgument) {
   ASSERT_EQ(E_INVALIDARG, window_provider->get_IsTopmost(nullptr));
 }
 
-TEST_F(AXPlatformNodeWinTest, DISABLED_UIAIWindowProviderNotSupported) {
+TEST_F(AXPlatformNodeWinTest, UIAIWindowProviderNotSupported) {
   AXNodeData root;
   root.id = 1;
   root.role = ax::mojom::Role::kRootWebArea;
@@ -2800,7 +2800,7 @@ TEST_F(AXPlatformNodeWinTest, DISABLED_UIAIWindowProviderNotSupported) {
             window_provider->get_IsTopmost(&bool_result));
 }
 
-TEST_F(AXPlatformNodeWinTest, DISABLED_UIANavigate) {
+TEST_F(AXPlatformNodeWinTest, UIANavigate) {
   AXNodeData root_data;
   root_data.id = 1;
 
@@ -3076,7 +3076,7 @@ TEST_F(AXPlatformNodeWinTest, ComputeUIAControlType) {
       UIA_ControlTypePropertyId, int{UIA_EditControlTypeId});
 }
 
-TEST_F(AXPlatformNodeWinTest, DISABLED_UIALandmarkType) {
+TEST_F(AXPlatformNodeWinTest, UIALandmarkType) {
   auto TestLandmarkType = [this](ax::mojom::Role node_role,
                                  std::optional<LONG> expected_landmark_type,
                                  const std::string& node_name = {}) {
@@ -3120,7 +3120,7 @@ TEST_F(AXPlatformNodeWinTest, DISABLED_UIALandmarkType) {
   TestLandmarkType(ax::mojom::Role::kTable, {});
 }
 
-TEST_F(AXPlatformNodeWinTest, DISABLED_UIALocalizedLandmarkType) {
+TEST_F(AXPlatformNodeWinTest, UIALocalizedLandmarkType) {
   auto TestLocalizedLandmarkType =
       [this](ax::mojom::Role node_role,
              const std::wstring& expected_localized_landmark,
@@ -3196,7 +3196,7 @@ TEST_F(AXPlatformNodeWinTest, IRawElementProviderSimple2ShowContextMenu) {
   EXPECT_EQ(root_node, TestAXNodeWrapper::GetNodeFromLastShowContextMenu());
 }
 
-TEST_F(AXPlatformNodeWinTest, DISABLED_UIAErrorHandling) {
+TEST_F(AXPlatformNodeWinTest, UIAErrorHandling) {
   AXNodeData root;
   root.id = 1;
   Init(root);
@@ -3509,11 +3509,13 @@ TEST_F(AXPlatformNodeWinTest, GetPatternProviderSupportedPatterns) {
 
   Init(update);
 
-  EXPECT_EQ(PatternSet({UIA_ScrollItemPatternId}),
+  EXPECT_EQ(PatternSet({UIA_ScrollItemPatternId, UIA_TextPatternId,
+                        UIA_TextEditPatternId}),
             GetSupportedPatternsFromNodeId(root_id));
 
   EXPECT_EQ(PatternSet({UIA_ScrollItemPatternId, UIA_ValuePatternId,
-                        UIA_ExpandCollapsePatternId}),
+                        UIA_ExpandCollapsePatternId, UIA_TextPatternId,
+                        UIA_TextEditPatternId}),
             GetSupportedPatternsFromNodeId(text_field_with_combo_box_id));
 
   EXPECT_EQ(PatternSet({UIA_ScrollItemPatternId, UIA_ValuePatternId,
@@ -4672,4 +4674,20 @@ TEST_F(AXPlatformNodeWinTest, IScrollProviderSetScrollPercent) {
   EXPECT_EQ(y_scroll_percent, 34);
 }
 
+TEST_F(AXPlatformNodeWinTest, MojoEventToUIAPropertyTest) {
+  AXNodeData root;
+  root.id = 1;
+  root.role = ax::mojom::Role::kCheckBox;
+  root.AddIntAttribute(ax::mojom::IntAttribute::kCheckedState,
+                       static_cast<int>(ax::mojom::CheckedState::kMixed));
+
+  Init(root);
+
+  ComPtr<AXPlatformNodeWin> platform_node =
+      QueryInterfaceFromNode<AXPlatformNodeWin>(GetRootAsAXNode());
+  EXPECT_EQ(
+      platform_node->MojoEventToUIAProperty(ax::mojom::Event::kValueChanged),
+      UIA_ToggleToggleStatePropertyId);
+}
+
 }  // namespace ui
diff --git a/third_party/accessibility/ax/platform/ax_platform_tree_manager.h b/third_party/accessibility/ax/platform/ax_platform_tree_manager.h
new file mode 100644
index 0000000000000000000000000000000000000000..e9ee973ce26cf40f3506012c44add92383bcc53e
--- /dev/null
+++ b/third_party/accessibility/ax/platform/ax_platform_tree_manager.h
@@ -0,0 +1,39 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef UI_ACCESSIBILITY_PLATFORM_AX_PLATFORM_TREE_MANAGER_H_
+#define UI_ACCESSIBILITY_PLATFORM_AX_PLATFORM_TREE_MANAGER_H_
+
+#include "ax/ax_export.h"
+#include "ax/ax_node.h"
+#include "ax/ax_tree_id.h"
+#include "ax/ax_tree_manager.h"
+
+namespace ui {
+
+class AXPlatformNode;
+class AXPlatformNodeDelegate;
+
+// Abstract interface for a class that owns an AXTree and manages its
+// connections to other AXTrees in the same page or desktop (parent and child
+// trees).
+class AX_EXPORT AXPlatformTreeManager : public AXTreeManager {
+ public:
+  virtual ~AXPlatformTreeManager() = default;
+
+  // Returns an AXPlatformNode with the specified and |node_id|.
+  virtual AXPlatformNode* GetPlatformNodeFromTree(
+      const AXNode::AXID node_id) const = 0;
+
+  // Returns an AXPlatformNode that corresponds to the given |node|.
+  virtual AXPlatformNode* GetPlatformNodeFromTree(const AXNode& node) const = 0;
+
+  // Returns an AXPlatformNodeDelegate that corresponds to a root node
+  // of the accessibility tree.
+  virtual AXPlatformNodeDelegate* RootDelegate() const = 0;
+};
+
+}  // namespace ui
+
+#endif  // UI_ACCESSIBILITY_PLATFORM_AX_PLATFORM_TREE_MANAGER_H_
diff --git a/third_party/accessibility/ax/platform/ax_unique_id_unittest.cc b/third_party/accessibility/ax/platform/ax_unique_id_unittest.cc
index 5f62ad3d115f74464aecee26468e83c14b4bed8d..d6e791ffc7d5603711a60136dbd99eb894cb5819 100644
--- a/third_party/accessibility/ax/platform/ax_unique_id_unittest.cc
+++ b/third_party/accessibility/ax/platform/ax_unique_id_unittest.cc
@@ -54,7 +54,7 @@ TEST(AXPlatformUniqueIdTest, UnassignedIdsAreReused) {
 }
 
 TEST(AXPlatformUniqueIdTest, DoesCreateCorrectId) {
-  int kLargerThanMaxId = kMaxId * 2;
+  constexpr int kLargerThanMaxId = kMaxId * 2;
   std::unique_ptr<AXUniqueId> ids[kLargerThanMaxId];
   // Creates and releases to fill up the internal static counter.
   for (int i = 0; i < kLargerThanMaxId; i++) {
diff --git a/third_party/accessibility/ax/platform/test_ax_node_wrapper.cc b/third_party/accessibility/ax/platform/test_ax_node_wrapper.cc
index 7270b83911da4045182d36b92435c6126df16109..05a655194948ef9d60ca42a73de93c977b4cc530 100644
--- a/third_party/accessibility/ax/platform/test_ax_node_wrapper.cc
+++ b/third_party/accessibility/ax/platform/test_ax_node_wrapper.cc
@@ -54,9 +54,14 @@ std::map<AXNode::AXID, AXNode::AXID> g_hit_test_result;
 class TestAXTreeObserver : public AXTreeObserver {
  private:
   void OnNodeDeleted(AXTree* tree, int32_t node_id) override {
-    const auto iter = g_node_id_to_wrapper_map.find(node_id);
+    const auto& iter = g_node_id_to_wrapper_map.find(node_id);
     if (iter != g_node_id_to_wrapper_map.end()) {
       TestAXNodeWrapper* wrapper = iter->second;
+      const auto& focus_iter = g_focused_node_in_tree.find(tree);
+      if (focus_iter != g_focused_node_in_tree.end() &&
+          focus_iter->second->id() == node_id) {
+        g_focused_node_in_tree.erase(tree);
+      }
       delete wrapper;
       g_node_id_to_wrapper_map.erase(node_id);
     }
diff --git a/third_party/accessibility/base/BUILD.gn b/third_party/accessibility/base/BUILD.gn
index 54b0a47af32ef7f6cae05e632adfd4726d23d9af..f495debd1ab84acaee3c561e269793a235b4342e 100644
--- a/third_party/accessibility/base/BUILD.gn
+++ b/third_party/accessibility/base/BUILD.gn
@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//flutter/build/dart/dart.gni")
 import("//flutter/common/config.gni")
 
 source_set("base") {
@@ -49,9 +50,9 @@ source_set("base") {
   }
 
   public_deps = [
+    "$dart_src/third_party/double-conversion/src:libdouble_conversion",
     "numerics",
     "//flutter/fml:string_conversion",
     "//flutter/third_party/accessibility/ax_build",
-    "//third_party/dart/runtime/third_party/double-conversion/src:libdouble_conversion",
   ]
 }
diff --git a/third_party/accessibility/base/string_utils.cc b/third_party/accessibility/base/string_utils.cc
index 61e0a4a257f4a36ca798c4c0b66259f909afd9d7..03c67ee0077468af69337a800ba16c429a00076d 100644
--- a/third_party/accessibility/base/string_utils.cc
+++ b/third_party/accessibility/base/string_utils.cc
@@ -12,7 +12,7 @@
 #include <sstream>
 
 #include "flutter/fml/string_conversion.h"
-#include "third_party/dart/runtime/third_party/double-conversion/src/double-conversion.h"
+#include "third_party/dart/third_party/double-conversion/src/double-conversion.h"
 
 #include "no_destructor.h"
 
@@ -72,14 +72,6 @@ std::string UTF16ToUTF8(std::u16string src) {
   return fml::Utf16ToUtf8(src);
 }
 
-std::u16string WideToUTF16(const std::wstring& src) {
-  return std::u16string(src.begin(), src.end());
-}
-
-std::wstring UTF16ToWide(const std::u16string& src) {
-  return std::wstring(src.begin(), src.end());
-}
-
 std::u16string NumberToString16(float number) {
   return ASCIIToUTF16(NumberToString(number));
 }
diff --git a/third_party/accessibility/base/string_utils.h b/third_party/accessibility/base/string_utils.h
index 6e3c6c6153ce97ba47c14c778ff93cc3785e3a75..ceddfbf2b0b15f177461673669474b1308f0f7d2 100644
--- a/third_party/accessibility/base/string_utils.h
+++ b/third_party/accessibility/base/string_utils.h
@@ -26,8 +26,6 @@ std::string StringPrintf(const std::string& format, Args... args) {
 std::u16string ASCIIToUTF16(std::string src);
 std::u16string UTF8ToUTF16(std::string src);
 std::string UTF16ToUTF8(std::u16string src);
-std::u16string WideToUTF16(const std::wstring& src);
-std::wstring UTF16ToWide(const std::u16string& src);
 
 std::u16string NumberToString16(unsigned int number);
 std::u16string NumberToString16(int32_t number);
diff --git a/third_party/accessibility/base/win/variant_vector.cc b/third_party/accessibility/base/win/variant_vector.cc
index 22a28e0e1c771a1e0a59c554c32eab082ca275bd..a60950d394afe630562622fa0bc65d6b8bd254a6 100644
--- a/third_party/accessibility/base/win/variant_vector.cc
+++ b/third_party/accessibility/base/win/variant_vector.cc
@@ -302,8 +302,8 @@ int VariantVector::Compare(SAFEARRAY* safearray, bool ignore_case) const {
     // VARTYPES. For example a value within VT_TYPEMASK that's joined something
     // outside the typemask like VT_ARRAY or VT_BYREF.
     default:
-      BASE_UNREACHABLE();
       compare_result = 1;
+      BASE_UNREACHABLE();
       break;
   }
 
diff --git a/third_party/accessibility/base/win/windows_types.h b/third_party/accessibility/base/win/windows_types.h
index 9b8c421e69bb126f2750ddf9c4084ad28be1cef2..d1084b80ac650647684f0eca00bb21bbcca076a6 100644
--- a/third_party/accessibility/base/win/windows_types.h
+++ b/third_party/accessibility/base/win/windows_types.h
@@ -5,8 +5,8 @@
 // This file contains defines and typedefs that allow popular Windows types to
 // be used without the overhead of including windows.h.
 
-#ifndef BASE_WIN_WINDOWS_TYPES_H
-#define BASE_WIN_WINDOWS_TYPES_H
+#ifndef BASE_WIN_WINDOWS_TYPES_H_
+#define BASE_WIN_WINDOWS_TYPES_H_
 
 // Needed for function prototypes.
 #include <concurrencysal.h>
@@ -273,4 +273,4 @@ WINBASEAPI VOID WINAPI SetLastError(_In_ DWORD dwErrCode);
 #define StartService StartServiceW
 #define UpdateResource UpdateResourceW
 
-#endif  // BASE_WIN_WINDOWS_TYPES_H
+#endif  // BASE_WIN_WINDOWS_TYPES_H_
diff --git a/third_party/canvaskit/BUILD.gn b/third_party/canvaskit/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..782ee659f552871de942884e0e4305d3775d8207
--- /dev/null
+++ b/third_party/canvaskit/BUILD.gn
@@ -0,0 +1,112 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/toolchain/wasm.gni")
+
+# This toolchain is only to be used by the canvaskit target below.
+wasm_toolchain("canvaskit") {
+  extra_toolchain_args = {
+    # Include ICU data.
+    skia_use_icu = true
+    skia_use_client_icu = false
+
+    # Include image codecs.
+    skia_use_libjpeg_turbo_decode = true
+    skia_use_libpng_decode = true
+    skia_use_libwebp_decode = true
+
+    # Disable LTO.
+    enable_lto = false
+  }
+}
+
+copy("canvaskit_group") {
+  visibility = [ "//flutter/web_sdk:*" ]
+  public_deps = [ "//flutter/skia/modules/canvaskit(:canvaskit)" ]
+
+  sources = [
+    "$root_out_dir/canvaskit/canvaskit.js",
+    "$root_out_dir/canvaskit/canvaskit.js.symbols",
+    "$root_out_dir/canvaskit/canvaskit.wasm",
+  ]
+  outputs = [ "$root_out_dir/flutter_web_sdk/canvaskit/{{source_file_part}}" ]
+}
+
+# This toolchain is only to be used by canvaskit_chromium_group below.
+wasm_toolchain("canvaskit_chromium") {
+  extra_toolchain_args = {
+    # In Chromium browsers, we can use the browser's APIs to get the necessary
+    # ICU data.
+    skia_use_icu = false
+    skia_use_client_icu = true
+    skia_icu_bidi_third_party_dir = "//flutter/third_party/canvaskit/icu_bidi"
+
+    # TODO(mdebbar): Set these to false once all image decoding can be done
+    # using the browser's built-in codecs.
+    # https://github.com/flutter/flutter/issues/122331
+
+    # In Chromium browsers, we can use the browser's built-in codecs.
+    skia_use_libjpeg_turbo_decode = true
+    skia_use_libpng_decode = true
+    skia_use_libwebp_decode = true
+
+    # Disable LTO.
+    enable_lto = false
+  }
+}
+
+copy("canvaskit_chromium_group") {
+  visibility = [ "//flutter/web_sdk:*" ]
+  public_deps = [ "//flutter/skia/modules/canvaskit(:canvaskit_chromium)" ]
+
+  sources = [
+    "$root_out_dir/canvaskit_chromium/canvaskit.js",
+    "$root_out_dir/canvaskit_chromium/canvaskit.js.symbols",
+    "$root_out_dir/canvaskit_chromium/canvaskit.wasm",
+  ]
+  outputs = [
+    "$root_out_dir/flutter_web_sdk/canvaskit/chromium/{{source_file_part}}",
+  ]
+}
+
+# This toolchain is only to be used by skwasm_group below.
+wasm_toolchain("skwasm") {
+  extra_toolchain_args = {
+    # In Chromium browsers, we can use the browser's APIs to get the necessary
+    # ICU data.
+    skia_use_icu = false
+    skia_use_client_icu = true
+    skia_icu_bidi_third_party_dir = "//flutter/third_party/canvaskit/icu_bidi"
+
+    skia_use_libjpeg_turbo_decode = false
+    skia_use_libpng_decode = false
+    skia_use_libwebp_decode = false
+
+    # We use OffscreenCanvas to produce PNG data instead of skia
+    skia_use_no_png_encode = true
+    skia_use_libpng_encode = false
+
+    # skwasm is multithreaded
+    wasm_use_pthreads = true
+    wasm_prioritize_size = true
+  }
+}
+
+copy("skwasm_group") {
+  visibility = [ "//flutter/web_sdk:*" ]
+  public_deps = [ "//flutter/lib/web_ui/skwasm(:skwasm)" ]
+
+  sources = [
+    "$root_out_dir/skwasm/skwasm.js",
+    "$root_out_dir/skwasm/skwasm.js.symbols",
+    "$root_out_dir/skwasm/skwasm.wasm",
+    "$root_out_dir/skwasm/skwasm.worker.js",
+  ]
+  if (is_debug) {
+    if (!wasm_use_dwarf) {
+      sources += [ "$root_out_dir/skwasm/skwasm.wasm.map" ]
+    }
+  }
+  outputs = [ "$root_out_dir/flutter_web_sdk/canvaskit/{{source_file_part}}" ]
+}
diff --git a/third_party/canvaskit/icu_bidi/BUILD.gn b/third_party/canvaskit/icu_bidi/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..4a7b22987433c7489876d9fc9b4e97ed0f90f1a1
--- /dev/null
+++ b/third_party/canvaskit/icu_bidi/BUILD.gn
@@ -0,0 +1,54 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+public_include_dirs = [
+  "//flutter/third_party/icu/source/common",
+  "//flutter/third_party/icu/source/i18n",
+]
+
+config("icu_bidi_public") {
+  include_dirs = public_include_dirs
+  defines = [
+    "U_USING_ICU_NAMESPACE=0",
+    "U_DISABLE_RENAMING=0",
+    "U_HAVE_LIB_SUFFIX=1",
+    "U_LIB_SUFFIX_C_NAME=_skia",
+    "U_DISABLE_VERSION_SUFFIX=1",
+    "SK_USING_THIRD_PARTY_ICU",
+  ]
+  cflags = []
+
+  foreach(dir, include_dirs) {
+    cflags += [
+      "-isystem",
+      rebase_path(dir),
+    ]
+  }
+}
+
+static_library("icu_bidi") {
+  defines = [
+    "U_COMMON_IMPLEMENTATION",
+    "U_STATIC_IMPLEMENTATION",
+    "U_I18N_IMPLEMENTATION",
+  ]
+  sources = [
+    "//flutter/third_party/icu/source/common/cmemory.cpp",
+    "//flutter/third_party/icu/source/common/cstring.cpp",
+    "//flutter/third_party/icu/source/common/ubidi.cpp",
+    "//flutter/third_party/icu/source/common/ubidi_props.cpp",
+    "//flutter/third_party/icu/source/common/ubidiln.cpp",
+    "//flutter/third_party/icu/source/common/ubidiwrt.cpp",
+    "//flutter/third_party/icu/source/common/uchar.cpp",
+    "//flutter/third_party/icu/source/common/udataswp.cpp",
+    "//flutter/third_party/icu/source/common/uinvchar.cpp",
+    "//flutter/third_party/icu/source/common/ustring.cpp",
+    "//flutter/third_party/icu/source/common/ustrtrns.cpp",
+    "//flutter/third_party/icu/source/common/utf_impl.cpp",
+    "//flutter/third_party/icu/source/common/utrie2.cpp",
+    "//flutter/third_party/icu/source/common/utypes.cpp",
+  ]
+  public_configs = [ ":icu_bidi_public" ]
+  cflags = [ "-w" ]
+}
diff --git a/third_party/libjpeg-turbo/BUILD.gn b/third_party/libjpeg-turbo/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..d6bef4c58eee1138a2786229c26bad82964853f3
--- /dev/null
+++ b/third_party/libjpeg-turbo/BUILD.gn
@@ -0,0 +1,185 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+_source_location = "//flutter/third_party/libjpeg-turbo/src"
+
+if (current_cpu == "arm") {
+  import("//build/config/arm.gni")
+}
+
+if (is_fuchsia) {
+  import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
+}
+
+if ((current_cpu == "x86" || current_cpu == "x64") && is_fuchsia &&
+    !using_fuchsia_sdk) {
+  import("//third_party/yasm/yasm_assemble.gni")
+
+  yasm_assemble("simd_asm") {
+    defines = []
+
+    if (current_cpu == "x86") {
+      sources = [
+        "$_source_location/simd/jccolor-mmx.asm",
+        "$_source_location/simd/jccolor-sse2.asm",
+        "$_source_location/simd/jcgray-mmx.asm",
+        "$_source_location/simd/jcgray-sse2.asm",
+        "$_source_location/simd/jchuff-sse2.asm",
+        "$_source_location/simd/jcsample-mmx.asm",
+        "$_source_location/simd/jcsample-sse2.asm",
+        "$_source_location/simd/jdcolor-mmx.asm",
+        "$_source_location/simd/jdcolor-sse2.asm",
+        "$_source_location/simd/jdmerge-mmx.asm",
+        "$_source_location/simd/jdmerge-sse2.asm",
+        "$_source_location/simd/jdsample-mmx.asm",
+        "$_source_location/simd/jdsample-sse2.asm",
+        "$_source_location/simd/jfdctflt-3dn.asm",
+        "$_source_location/simd/jfdctflt-sse.asm",
+        "$_source_location/simd/jfdctfst-mmx.asm",
+        "$_source_location/simd/jfdctfst-sse2.asm",
+        "$_source_location/simd/jfdctint-mmx.asm",
+        "$_source_location/simd/jfdctint-sse2.asm",
+        "$_source_location/simd/jidctflt-3dn.asm",
+        "$_source_location/simd/jidctflt-sse.asm",
+        "$_source_location/simd/jidctflt-sse2.asm",
+        "$_source_location/simd/jidctfst-mmx.asm",
+        "$_source_location/simd/jidctfst-sse2.asm",
+        "$_source_location/simd/jidctint-mmx.asm",
+        "$_source_location/simd/jidctint-sse2.asm",
+        "$_source_location/simd/jidctred-mmx.asm",
+        "$_source_location/simd/jidctred-sse2.asm",
+        "$_source_location/simd/jquant-3dn.asm",
+        "$_source_location/simd/jquant-mmx.asm",
+        "$_source_location/simd/jquant-sse.asm",
+        "$_source_location/simd/jquantf-sse2.asm",
+        "$_source_location/simd/jquanti-sse2.asm",
+        "$_source_location/simd/jsimdcpu.asm",
+      ]
+
+      defines += [
+        "__x86__",
+        "PIC",
+      ]
+    } else if (current_cpu == "x64") {
+      sources = [
+        "$_source_location/simd/jccolor-sse2-64.asm",
+        "$_source_location/simd/jcgray-sse2-64.asm",
+        "$_source_location/simd/jchuff-sse2-64.asm",
+        "$_source_location/simd/jcsample-sse2-64.asm",
+        "$_source_location/simd/jdcolor-sse2-64.asm",
+        "$_source_location/simd/jdmerge-sse2-64.asm",
+        "$_source_location/simd/jdsample-sse2-64.asm",
+        "$_source_location/simd/jfdctflt-sse-64.asm",
+        "$_source_location/simd/jfdctfst-sse2-64.asm",
+        "$_source_location/simd/jfdctint-sse2-64.asm",
+        "$_source_location/simd/jidctflt-sse2-64.asm",
+        "$_source_location/simd/jidctfst-sse2-64.asm",
+        "$_source_location/simd/jidctint-sse2-64.asm",
+        "$_source_location/simd/jidctred-sse2-64.asm",
+        "$_source_location/simd/jquantf-sse2-64.asm",
+        "$_source_location/simd/jquanti-sse2-64.asm",
+      ]
+
+      defines += [
+        "__x86_64__",
+        "PIC",
+      ]
+    }
+
+    defines += [ "ELF" ]
+  }
+}
+
+config("libjpeg_config") {
+  include_dirs = [ _source_location ]
+}
+
+static_library("simd") {
+  configs += [ ":libjpeg_config" ]
+
+  if (!is_fuchsia || using_fuchsia_sdk) {
+    sources = [ "$_source_location/jsimd_none.c" ]
+  } else if (current_cpu == "x86") {
+    deps = [ ":simd_asm" ]
+
+    sources = [ "$_source_location/simd/jsimd_i386.c" ]
+  } else if (current_cpu == "x64") {
+    deps = [ ":simd_asm" ]
+
+    sources = [ "$_source_location/simd/jsimd_x86_64.c" ]
+  } else if (current_cpu == "arm" && arm_version >= 7 &&
+             (arm_use_neon || arm_optionally_use_neon)) {
+    sources = [
+      "$_source_location/simd/jsimd_arm.c",
+      "$_source_location/simd/jsimd_arm_neon.S",
+    ]
+  } else if (current_cpu == "arm64") {
+    sources = [
+      "$_source_location/simd/jsimd_arm64.c",
+      "$_source_location/simd/jsimd_arm64_neon.S",
+    ]
+  } else {
+    sources = [ "$_source_location/jsimd_none.c" ]
+  }
+}
+
+static_library("libjpeg") {
+  sources = [
+    "$_source_location/jcapimin.c",
+    "$_source_location/jcapistd.c",
+    "$_source_location/jccoefct.c",
+    "$_source_location/jccolor.c",
+    "$_source_location/jcdctmgr.c",
+    "$_source_location/jchuff.c",
+    "$_source_location/jcinit.c",
+    "$_source_location/jcmainct.c",
+    "$_source_location/jcmarker.c",
+    "$_source_location/jcmaster.c",
+    "$_source_location/jcomapi.c",
+    "$_source_location/jcparam.c",
+    "$_source_location/jcphuff.c",
+    "$_source_location/jcprepct.c",
+    "$_source_location/jcsample.c",
+    "$_source_location/jdapimin.c",
+    "$_source_location/jdapistd.c",
+    "$_source_location/jdatadst.c",
+    "$_source_location/jdatasrc.c",
+    "$_source_location/jdcoefct.c",
+    "$_source_location/jdcolor.c",
+    "$_source_location/jddctmgr.c",
+    "$_source_location/jdhuff.c",
+    "$_source_location/jdinput.c",
+    "$_source_location/jdmainct.c",
+    "$_source_location/jdmarker.c",
+    "$_source_location/jdmaster.c",
+    "$_source_location/jdmerge.c",
+    "$_source_location/jdphuff.c",
+    "$_source_location/jdpostct.c",
+    "$_source_location/jdsample.c",
+    "$_source_location/jerror.c",
+    "$_source_location/jfdctflt.c",
+    "$_source_location/jfdctfst.c",
+    "$_source_location/jfdctint.c",
+    "$_source_location/jidctflt.c",
+    "$_source_location/jidctfst.c",
+    "$_source_location/jidctint.c",
+    "$_source_location/jidctred.c",
+    "$_source_location/jmemmgr.c",
+    "$_source_location/jmemnobs.c",
+    "$_source_location/jquant1.c",
+    "$_source_location/jquant2.c",
+    "$_source_location/jutils.c",
+  ]
+
+  defines = [
+    "WITH_SIMD",
+    "NO_GETENV",
+  ]
+
+  configs += [ ":libjpeg_config" ]
+
+  public_configs = [ ":libjpeg_config" ]
+
+  deps = [ ":simd" ]
+}
diff --git a/third_party/spring_animation/BUILD.gn b/third_party/spring_animation/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..32a6a128b5b16aa8082be8ecc7f3fa3ba3772f19
--- /dev/null
+++ b/third_party/spring_animation/BUILD.gn
@@ -0,0 +1,33 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+if (is_ios || is_mac) {
+  import("//flutter/common/config.gni")
+  import("//flutter/testing/testing.gni")
+
+  source_set("spring_animation") {
+    sources = [
+      "spring_animation.h",
+      "spring_animation.mm",
+    ]
+    public_configs = [ "//flutter:config" ]
+  }
+
+  if (enable_unittests) {
+    test_fixtures("spring_animation_fixtures") {
+      fixtures = []
+    }
+
+    executable("spring_animation_unittests") {
+      testonly = true
+      sources = [ "SpringAnimationTest.mm" ]
+      deps = [
+        ":spring_animation",
+        ":spring_animation_fixtures",
+        "//flutter/testing",
+      ]
+      public_configs = [ "//flutter:config" ]
+    }
+  }
+}
diff --git a/third_party/spring_animation/LICENSE b/third_party/spring_animation/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..b93be90515ccd0b9daedaa589e42bf5929693f1f
--- /dev/null
+++ b/third_party/spring_animation/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) Meta Platforms, Inc. and affiliates.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/third_party/spring_animation/README.md b/third_party/spring_animation/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..3d1731d17fe0092dbd661e91d9f23ab5306b88d5
--- /dev/null
+++ b/third_party/spring_animation/README.md
@@ -0,0 +1,5 @@
+# spring_animation
+
+This is directly derived from
+[Libraries/Animated/animations/SpringAnimation.js](https://github.com/facebook/react-native/blob/494c47360f62761176033a4da359f43b53c2182f/Libraries/Animated/animations/SpringAnimation.js)
+as of 2023-01-10, a part of the React Native library.
diff --git a/third_party/spring_animation/SpringAnimationTest.mm b/third_party/spring_animation/SpringAnimationTest.mm
new file mode 100644
index 0000000000000000000000000000000000000000..110594093d2229eeca7ad2b7a3956d7d1c1e5ce2
--- /dev/null
+++ b/third_party/spring_animation/SpringAnimationTest.mm
@@ -0,0 +1,65 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <cmath>
+#import "flutter/third_party/spring_animation/spring_animation.h"
+#include "gtest/gtest.h"
+
+TEST(SpringAnimationTest, CanInitializeCorrectly) {
+  SpringAnimation* animation = [[SpringAnimation alloc] initWithStiffness:1000
+                                                                  damping:500
+                                                                     mass:3
+                                                          initialVelocity:0
+                                                                fromValue:0
+                                                                  toValue:1000];
+  ASSERT_TRUE(animation.stiffness == 1000);
+  ASSERT_TRUE(animation.damping == 500);
+  ASSERT_TRUE(animation.mass == 3);
+  ASSERT_TRUE(animation.initialVelocity == 0);
+  ASSERT_TRUE(animation.fromValue == 0);
+  ASSERT_TRUE(animation.toValue == 1000);
+}
+
+TEST(SpringAnimationTest, CurveFunctionCanWorkCorrectly) {
+  // Here is the keyboard curve config on iOS platform.
+  SpringAnimation* animation = [[SpringAnimation alloc] initWithStiffness:1000
+                                                                  damping:500
+                                                                     mass:3
+                                                          initialVelocity:0
+                                                                fromValue:0
+                                                                  toValue:1000];
+  const double accuracy = 1.0;
+  const double startTime = 0;
+  const double endTime = 0.6;
+
+  const double startValue = [animation curveFunction:startTime];
+  ASSERT_TRUE(fabs(startValue - animation.fromValue) < accuracy);
+  const double toValue = [animation curveFunction:endTime];
+  ASSERT_TRUE(fabs(toValue - animation.toValue) < accuracy);
+}
+
+TEST(SpringAnimationTest, CanUpdatePositionValuesAndCalculateCorrectly) {
+  SpringAnimation* animation = [[SpringAnimation alloc] initWithStiffness:1000
+                                                                  damping:500
+                                                                     mass:3
+                                                          initialVelocity:0
+                                                                fromValue:0
+                                                                  toValue:1000];
+  const double startTime = 0;
+  const double endTime = 0.6;
+
+  const double startValue1 = [animation curveFunction:startTime];
+  const double toValue1 = [animation curveFunction:endTime];
+
+  animation.fromValue = 10;
+  animation.toValue = 800;
+
+  ASSERT_TRUE(animation.fromValue == 10);
+  ASSERT_TRUE(animation.toValue == 800);
+
+  const double startValue2 = [animation curveFunction:startTime];
+  const double toValue2 = [animation curveFunction:endTime];
+  ASSERT_TRUE(startValue2 > startValue1);
+  ASSERT_TRUE(toValue2 < toValue1);
+}
diff --git a/third_party/spring_animation/spring_animation.h b/third_party/spring_animation/spring_animation.h
new file mode 100644
index 0000000000000000000000000000000000000000..9d200af90e8a192ec179687b90c92aad8cffa733
--- /dev/null
+++ b/third_party/spring_animation/spring_animation.h
@@ -0,0 +1,43 @@
+//
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
+//
+// @flow
+// @format
+//
+
+#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_SPRING_ANIMATION_H_
+#define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_SPRING_ANIMATION_H_
+
+#include <Foundation/NSObject.h>
+
+// This simplified spring model is based off of a damped harmonic oscillator.
+// See:
+// https://en.wikipedia.org/wiki/Harmonic_oscillator#Damped_harmonic_oscillator
+//
+// This models the closed form of the second order differential equation which
+// happens to match the algorithm used by CASpringAnimation, a QuartzCore (iOS)
+// API that creates spring animations.
+@interface SpringAnimation : NSObject
+
+- (instancetype)initWithStiffness:(double)stiffness
+                          damping:(double)damping
+                             mass:(double)mass
+                  initialVelocity:(double)initialVelocity
+                        fromValue:(double)fromValue
+                          toValue:(double)toValue;
+
+- (double)curveFunction:(double)t;
+
+@property(nonatomic, assign, readonly) double stiffness;
+@property(nonatomic, assign, readonly) double damping;
+@property(nonatomic, assign, readonly) double mass;
+@property(nonatomic, assign, readonly) double initialVelocity;
+@property(nonatomic, assign) double fromValue;
+@property(nonatomic, assign) double toValue;
+
+@end
+
+#endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_SPRING_ANIMATION_H_
diff --git a/third_party/spring_animation/spring_animation.mm b/third_party/spring_animation/spring_animation.mm
new file mode 100644
index 0000000000000000000000000000000000000000..60016293a9f5de484adf47cfe18bec795e1d647c
--- /dev/null
+++ b/third_party/spring_animation/spring_animation.mm
@@ -0,0 +1,67 @@
+//
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
+//
+// @flow
+// @format
+//
+
+#import "spring_animation.h"
+
+#include <Foundation/Foundation.h>
+
+@interface SpringAnimation ()
+
+@property(nonatomic, assign) double zeta;
+@property(nonatomic, assign) double omega0;
+@property(nonatomic, assign) double omega1;
+@property(nonatomic, assign) double v0;
+
+@end
+
+// Spring code adapted from React Native's Animation Library, see:
+// https://github.com/facebook/react-native/blob/main/Libraries/Animated/animations/SpringAnimation.js
+@implementation SpringAnimation
+- (instancetype)initWithStiffness:(double)stiffness
+                          damping:(double)damping
+                             mass:(double)mass
+                  initialVelocity:(double)initialVelocity
+                        fromValue:(double)fromValue
+                          toValue:(double)toValue {
+  self = [super init];
+  if (self) {
+    _stiffness = stiffness;
+    _damping = damping;
+    _mass = mass;
+    _initialVelocity = initialVelocity;
+    _fromValue = fromValue;
+    _toValue = toValue;
+
+    _zeta = _damping / (2 * sqrt(_stiffness * _mass));  // Damping ratio.
+    _omega0 = sqrt(_stiffness / _mass);             // Undamped angular frequency of the oscillator.
+    _omega1 = _omega0 * sqrt(1.0 - _zeta * _zeta);  // Exponential decay.
+    _v0 = -_initialVelocity;
+  }
+  return self;
+}
+
+- (double)curveFunction:(double)t {
+  const double x0 = _toValue - _fromValue;
+
+  double y;
+  if (_zeta < 1) {
+    // Under damped.
+    const double envelope = exp(-_zeta * _omega0 * t);
+    y = _toValue - envelope * (((_v0 + _zeta * _omega0 * x0) / _omega1) * sin(_omega1 * t) +
+                               x0 * cos(_omega1 * t));
+  } else {
+    // Critically damped.
+    const double envelope = exp(-_omega0 * t);
+    y = _toValue - envelope * (x0 + (_v0 + _omega0 * x0) * t);
+  }
+
+  return y;
+}
+@end
diff --git a/third_party/tonic/BUILD.gn b/third_party/tonic/BUILD.gn
index 9a6abda8ba6959af3024134b451afc56a03a0baf..ed2930c75560b5241375fa468b1dfdcaf3a7da50 100644
--- a/third_party/tonic/BUILD.gn
+++ b/third_party/tonic/BUILD.gn
@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//flutter/build/dart/dart.gni")
+
 config("config") {
   include_dirs = [
     "//flutter/third_party",
@@ -86,7 +88,7 @@ source_set("tonic") {
     ]
   }
 
-  public_deps = [ "//third_party/dart/runtime:dart_api" ]
+  public_deps = [ "$dart_src/runtime:dart_api" ]
 
   public_configs = [ ":config" ]
 }
diff --git a/ci/licenses_golden/licenses_gpu b/third_party/tonic/LICENSE
similarity index 69%
rename from ci/licenses_golden/licenses_gpu
rename to third_party/tonic/LICENSE
index a1f8f8e87988c6c8eacaecc923ba225d4639d987..c6823b81eb845db89cee59cbbc7ee0b0b63d86ec 100644
--- a/ci/licenses_golden/licenses_gpu
+++ b/third_party/tonic/LICENSE
@@ -1,18 +1,3 @@
-Signature: ffe64a3daaf0ad982854594ad155dd56
-
-UNUSED LICENSES:
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-USED LICENSES:
-
-====================================================================================================
-LIBRARY: gpu
-ORIGIN: ../../../flutter/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../gpu/GLES2/gl2chromium.h
-FILE: ../../../gpu/command_buffer/client/gles2_c_lib_export.h
-----------------------------------------------------------------------------------------------------
 Copyright 2013 The Flutter Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -38,5 +23,3 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
 ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-Total license count: 1
diff --git a/third_party/tonic/converter/dart_converter.h b/third_party/tonic/converter/dart_converter.h
index b96faeb3080082caf8efe3fb22e9eabd2751eea1..cec01acbb46b3838fdbb612132f0f1240ba938c9 100644
--- a/third_party/tonic/converter/dart_converter.h
+++ b/third_party/tonic/converter/dart_converter.h
@@ -202,48 +202,39 @@ struct DartConverter<unsigned long long> {
   }
 };
 
-template <typename T>
-struct DartConverterFloatingPoint {
-  using FfiType = T;
+// There is intentionally no DartConverter<float>, to avoid UB when Dart code
+// gives us a double that is greater than the max float or less than -max float.
+template <>
+struct DartConverter<double> {
+  using FfiType = double;
+  static constexpr const char* kFfiRepresentation = "Double";
+  static constexpr const char* kDartRepresentation = "double";
   static constexpr bool kAllowedInLeafCall = true;
 
-  static Dart_Handle ToDart(T val) { return Dart_NewDouble(val); }
+  static Dart_Handle ToDart(double val) { return Dart_NewDouble(val); }
 
-  static void SetReturnValue(Dart_NativeArguments args, T val) {
+  static void SetReturnValue(Dart_NativeArguments args, double val) {
     Dart_SetDoubleReturnValue(args, val);
   }
 
-  static T FromDart(Dart_Handle handle) {
+  static double FromDart(Dart_Handle handle) {
     double result = 0;
     Dart_DoubleValue(handle, &result);
     return result;
   }
 
-  static T FromArguments(Dart_NativeArguments args,
-                         int index,
-                         Dart_Handle& exception) {
+  static double FromArguments(Dart_NativeArguments args,
+                              int index,
+                              Dart_Handle& exception) {
     double result = 0;
     Dart_GetNativeDoubleArgument(args, index, &result);
     return result;
   }
 
-  static T FromFfi(FfiType val) { return val; }
-  static FfiType ToFfi(T val) { return val; }
+  static double FromFfi(FfiType val) { return val; }
+  static FfiType ToFfi(double val) { return val; }
   static bool AllowedInLeafCall() { return kAllowedInLeafCall; }
-};
 
-template <>
-struct DartConverter<float> : public DartConverterFloatingPoint<float> {
-  static constexpr const char* kFfiRepresentation = "Float";
-  static constexpr const char* kDartRepresentation = "double";
-  static const char* GetFfiRepresentation() { return kFfiRepresentation; }
-  static const char* GetDartRepresentation() { return kDartRepresentation; }
-};
-
-template <>
-struct DartConverter<double> : public DartConverterFloatingPoint<double> {
-  static constexpr const char* kFfiRepresentation = "Double";
-  static constexpr const char* kDartRepresentation = "double";
   static const char* GetFfiRepresentation() { return kFfiRepresentation; }
   static const char* GetDartRepresentation() { return kDartRepresentation; }
 };
diff --git a/third_party/tonic/dart_args.h b/third_party/tonic/dart_args.h
index 2469e24f7b6ef351505741010f441a5675809b7e..ee8e99ceb76160210534bfeab9d5f1d70848c158 100644
--- a/third_party/tonic/dart_args.h
+++ b/third_party/tonic/dart_args.h
@@ -356,11 +356,11 @@ struct FfiDispatcher<C, Return (C::*)(Args...), method> {
 
   // Static C entry-point with Dart FFI signature.
   static FfiReturn Call(
-      C* receiver,
+      DartWrappable* receiver,
       typename DartConverter<typename std::remove_const<
           typename std::remove_reference<Args>::type>::type>::FfiType... args) {
     // Call C++ method on receiver, forwarding converted native arguments.
-    return DartConverter<Return>::ToFfi((receiver->*method)(
+    return DartConverter<Return>::ToFfi((static_cast<C*>(receiver)->*method)(
         DartConverter<typename std::remove_const<typename std::remove_reference<
             Args>::type>::type>::FromFfi(args)...));
   }
@@ -408,11 +408,11 @@ struct FfiDispatcher<C, Return (C::*)(Args...) const, method> {
 
   // Static C entry-point with Dart FFI signature.
   static FfiReturn Call(
-      C* receiver,
+      DartWrappable* receiver,
       typename DartConverter<typename std::remove_const<
           typename std::remove_reference<Args>::type>::type>::FfiType... args) {
     // Call C++ method on receiver, forwarding converted native arguments.
-    return DartConverter<Return>::ToFfi((receiver->*method)(
+    return DartConverter<Return>::ToFfi((static_cast<C*>(receiver)->*method)(
         DartConverter<typename std::remove_const<typename std::remove_reference<
             Args>::type>::type>::FromFfi(args)...));
   }
@@ -501,11 +501,11 @@ struct FfiDispatcher<C, void (C::*)(Args...), method> {
 
   // Static C entry-point with Dart FFI signature.
   static void Call(
-      C* receiver,
+      DartWrappable* receiver,
       typename DartConverter<typename std::remove_const<
           typename std::remove_reference<Args>::type>::type>::FfiType... args) {
     // Call C++ method on receiver, forwarding converted native arguments.
-    (receiver->*method)(
+    (static_cast<C*>(receiver)->*method)(
         DartConverter<typename std::remove_const<typename std::remove_reference<
             Args>::type>::type>::FromFfi(args)...);
   }
diff --git a/third_party/tonic/dart_wrappable.h b/third_party/tonic/dart_wrappable.h
index 42b1dace5e5ee1f99b6a15e29ab9ec5091a55244..7270c3fef9a9ba7fbf153ec1bdb2e216f444ed88 100644
--- a/third_party/tonic/dart_wrappable.h
+++ b/third_party/tonic/dart_wrappable.h
@@ -93,7 +93,7 @@ struct DartConverter<
     T*,
     typename std::enable_if<
         std::is_convertible<T*, const DartWrappable*>::value>::type> {
-  using FfiType = T*;
+  using FfiType = DartWrappable*;
   static constexpr const char* kFfiRepresentation = "Pointer";
   static constexpr const char* kDartRepresentation = "Pointer";
   static constexpr bool kAllowedInLeafCall = true;
@@ -145,7 +145,7 @@ struct DartConverter<
         DartConverterWrappable::FromArguments(args, index, exception));
   }
 
-  static T* FromFfi(FfiType val) { return val; }
+  static T* FromFfi(FfiType val) { return static_cast<T*>(val); }
   static FfiType ToFfi(T* val) { return val; }
   static const char* GetFfiRepresentation() { return kFfiRepresentation; }
   static const char* GetDartRepresentation() { return kDartRepresentation; }
diff --git a/third_party/tonic/file_loader/file_loader.cc b/third_party/tonic/file_loader/file_loader.cc
index 4a9e1791794acc9f3a3578734f7ed52ecddbf7af..be7f93eb1e2e96940d25720ac41de16e4edd4fa5 100644
--- a/third_party/tonic/file_loader/file_loader.cc
+++ b/third_party/tonic/file_loader/file_loader.cc
@@ -136,8 +136,10 @@ Dart_Handle FileLoader::CanonicalizeURL(Dart_Handle library, Dart_Handle url) {
     return url;
   if (string.find(kPackageScheme) == 0u)
     return StdStringToDart(SanitizePath(string));
-  if (string.find(kFileScheme) == 0u)
-    return StdStringToDart(SanitizePath(CanonicalizeFileURL(string)));
+
+  if (string.find(kFileScheme) == 0u) {
+    return StdStringToDart(SanitizeURIEscapedCharacters(string));
+  }
 
   std::string library_url = StdStringFromDart(Dart_LibraryUrl(library));
   std::string prefix = ExtractSchemePrefix(library_url);
diff --git a/third_party/tonic/file_loader/file_loader.h b/third_party/tonic/file_loader/file_loader.h
index 8b887416b9860daa25f50ad69950306f82f9e6db..355ab1b530985eb4055476fe74990c45bb5a08d7 100644
--- a/third_party/tonic/file_loader/file_loader.h
+++ b/third_party/tonic/file_loader/file_loader.h
@@ -46,7 +46,6 @@ class FileLoader {
  private:
   static std::string SanitizeURIEscapedCharacters(const std::string& str);
   static std::string SanitizePath(const std::string& path);
-  static std::string CanonicalizeFileURL(const std::string& url);
 
   std::string GetFilePathForURL(std::string url);
   std::string GetFilePathForPackageURL(std::string url);
diff --git a/third_party/tonic/file_loader/file_loader_fuchsia.cc b/third_party/tonic/file_loader/file_loader_fuchsia.cc
index 359f88df399300924692e2adc4c5a554c03f7255..be2ff8be9892628bad211ca2a0cbb4e763f0c049 100644
--- a/third_party/tonic/file_loader/file_loader_fuchsia.cc
+++ b/third_party/tonic/file_loader/file_loader_fuchsia.cc
@@ -26,20 +26,10 @@ const char FileLoader::kFileURLPrefix[] = "file://";
 const size_t FileLoader::kFileURLPrefixLength =
     sizeof(FileLoader::kFileURLPrefix) - 1;
 
-namespace {
-
-const size_t kFileSchemeLength = FileLoader::kFileURLPrefixLength - 2;
-
-}  // namespace
-
 std::string FileLoader::SanitizePath(const std::string& url) {
   return SanitizeURIEscapedCharacters(url);
 }
 
-std::string FileLoader::CanonicalizeFileURL(const std::string& url) {
-  return url.substr(kFileSchemeLength);
-}
-
 bool FileLoader::ReadFileToString(const std::string& path,
                                   std::string* result) {
   if (dirfd_ == -1)
diff --git a/third_party/tonic/file_loader/file_loader_posix.cc b/third_party/tonic/file_loader/file_loader_posix.cc
index f5167f6e7f5ca90100088cf1a59425a6f6b45a64..b567996ff4f9ca42251a9694cee8a63572d95879 100644
--- a/third_party/tonic/file_loader/file_loader_posix.cc
+++ b/third_party/tonic/file_loader/file_loader_posix.cc
@@ -21,20 +21,10 @@ const char FileLoader::kFileURLPrefix[] = "file://";
 const size_t FileLoader::kFileURLPrefixLength =
     sizeof(FileLoader::kFileURLPrefix) - 1;
 
-namespace {
-
-const size_t kFileSchemeLength = FileLoader::kFileURLPrefixLength - 2;
-
-}  // namespace
-
 std::string FileLoader::SanitizePath(const std::string& url) {
   return SanitizeURIEscapedCharacters(url);
 }
 
-std::string FileLoader::CanonicalizeFileURL(const std::string& url) {
-  return url.substr(kFileSchemeLength);
-}
-
 bool FileLoader::ReadFileToString(const std::string& path,
                                   std::string* result) {
   TONIC_DCHECK(dirfd_ == -1);
diff --git a/third_party/tonic/file_loader/file_loader_unittests.cc b/third_party/tonic/file_loader/file_loader_unittests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..2ca8489bfbf850570d21781ee93e3c856fc8ea45
--- /dev/null
+++ b/third_party/tonic/file_loader/file_loader_unittests.cc
@@ -0,0 +1,46 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/testing/dart_isolate_runner.h"
+#include "flutter/testing/fixture_test.h"
+
+#include "tonic/converter/dart_converter.h"
+#include "tonic/file_loader/file_loader.h"
+
+namespace flutter {
+namespace testing {
+
+using FileLoaderTest = FixtureTest;
+
+TEST_F(FileLoaderTest, CanonicalizesFileUrlCorrectly) {
+  ASSERT_FALSE(DartVMRef::IsInstanceRunning());
+  auto settings = CreateSettingsForFixture();
+  auto vm_snapshot = DartSnapshot::VMSnapshotFromSettings(settings);
+  auto isolate_snapshot = DartSnapshot::IsolateSnapshotFromSettings(settings);
+  auto vm_ref = DartVMRef::Create(settings, vm_snapshot, isolate_snapshot);
+  ASSERT_TRUE(vm_ref);
+
+  TaskRunners task_runners(GetCurrentTestName(),    //
+                           GetCurrentTaskRunner(),  //
+                           GetCurrentTaskRunner(),  //
+                           GetCurrentTaskRunner(),  //
+                           GetCurrentTaskRunner()   //
+  );
+  auto isolate = RunDartCodeInIsolate(vm_ref, settings, task_runners, "main",
+                                      {}, GetDefaultKernelFilePath());
+  ASSERT_TRUE(isolate);
+
+  ASSERT_TRUE(isolate->RunInIsolateScope([]() {
+    tonic::FileLoader file_loader;
+    std::string original_url = "file:///Users/test/foo";
+    Dart_Handle dart_url = tonic::StdStringToDart(original_url);
+    auto canonicalized_url = file_loader.CanonicalizeURL(Dart_Null(), dart_url);
+    EXPECT_TRUE(canonicalized_url);
+    EXPECT_EQ(tonic::StdStringFromDart(canonicalized_url), original_url);
+    return true;
+  }));
+}
+
+}  // namespace testing
+}  // namespace flutter
diff --git a/third_party/tonic/file_loader/file_loader_win.cc b/third_party/tonic/file_loader/file_loader_win.cc
index f312a0ac1dce5dde04a43bc11799411a21857dbb..a6d73224861981e04313d0b13d1a1b8305299c35 100644
--- a/third_party/tonic/file_loader/file_loader_win.cc
+++ b/third_party/tonic/file_loader/file_loader_win.cc
@@ -39,10 +39,6 @@ std::string FileLoader::SanitizePath(const std::string& url) {
   return SanitizeURIEscapedCharacters(sanitized);
 }
 
-std::string FileLoader::CanonicalizeFileURL(const std::string& url) {
-  return SanitizePath(url.substr(FileLoader::kFileURLPrefixLength));
-}
-
 bool FileLoader::ReadFileToString(const std::string& path,
                                   std::string* result) {
   TONIC_DCHECK(dirfd_ == -1);
diff --git a/third_party/tonic/logging/dart_error.cc b/third_party/tonic/logging/dart_error.cc
index c10484ca6de4416383e69d3cccc8a46e54067867..1868746130c22bf7346da60bd0b24f7f165b4a12 100644
--- a/third_party/tonic/logging/dart_error.cc
+++ b/third_party/tonic/logging/dart_error.cc
@@ -39,6 +39,12 @@ bool CheckAndHandleError(Dart_Handle handle) {
 
     ReportUnhandledException(exception_handle, stack_trace_handle);
     return true;
+  } else if (Dart_IsFatalError(handle)) {
+    // An UnwindError designed to shutdown isolates. This is thrown by
+    // Isolate.exit. This is ordinary API usage, not actually an error, so
+    // silently shut down the isolate. The actual isolate shutdown happens in
+    // DartMessageHandler::UnhandledError.
+    return true;
   } else if (Dart_IsError(handle)) {
     tonic::Log("Dart Error: %s", Dart_GetError(handle));
     return true;
diff --git a/third_party/tonic/tests/BUILD.gn b/third_party/tonic/tests/BUILD.gn
index eff79c4245c2795243642493c8cd24939fbf93f4..45619e91395c7d402b5f21683565e74ec7fdd839 100644
--- a/third_party/tonic/tests/BUILD.gn
+++ b/third_party/tonic/tests/BUILD.gn
@@ -15,6 +15,7 @@ executable("tonic_unittests") {
   public_configs = [ "//flutter:export_dynamic_symbols" ]
 
   sources = [
+    "../file_loader/file_loader_unittests.cc",
     "dart_persistent_handle_unittest.cc",
     "dart_state_unittest.cc",
     "dart_weak_persistent_handle_unittest.cc",
@@ -23,13 +24,13 @@ executable("tonic_unittests") {
 
   public_deps = [
     ":tonic_fixtures",
+    "$dart_src/runtime:dart_api",
     "//flutter/lib/snapshot",
     "//flutter/runtime:libdart",
     "//flutter/runtime:runtime",
     "//flutter/testing",
     "//flutter/testing:fixture_test",
-    "//third_party/dart/runtime:dart_api",
-    "//third_party/googletest:gtest",
+    "//flutter/third_party/googletest:gtest",
   ]
 
   deps = [ "../:tonic" ]
diff --git a/third_party/tonic/tests/ffi_native_unittest.cc b/third_party/tonic/tests/ffi_native_unittest.cc
index 2800f35f702f3fb4678049e537b232650a3b39e8..62416f3ff8dabde2d4e4b663efd04cc1b55b979b 100644
--- a/third_party/tonic/tests/ffi_native_unittest.cc
+++ b/third_party/tonic/tests/ffi_native_unittest.cc
@@ -188,23 +188,6 @@ TEST_F(FfiNativeTest, SerialiseEchoIntPtr) {
   }
 }
 
-// Call and serialise function with float.
-
-float EchoFloat(float arg) {
-  EXPECT_EQ(arg, 23.0);
-  return arg;
-}
-
-TEST_F(FfiNativeTest, FfiBindingCallEchoFloat) {
-  DoCallThroughTest<void, decltype(&EchoFloat), &EchoFloat>("EchoFloat",
-                                                            "callEchoFloat");
-}
-
-TEST_F(FfiNativeTest, SerialiseEchoFloat) {
-  DoSerialiseTest<void, decltype(&EchoFloat), &EchoFloat>(
-      /*leaf=*/true, "Float", "double", "Float", "double");
-}
-
 // Call and serialise function with double.
 
 double EchoDouble(double arg) {
diff --git a/third_party/tonic/tests/fixtures/tonic_test.dart b/third_party/tonic/tests/fixtures/tonic_test.dart
index 38c5fb0707c77b2796fa293278e1be362e7a06e6..f3c5f1c3982d11ac5126a5bc8bcea62af1433e4d 100644
--- a/third_party/tonic/tests/fixtures/tonic_test.dart
+++ b/third_party/tonic/tests/fixtures/tonic_test.dart
@@ -32,7 +32,7 @@ void testClearLater() {
 
 // Test helpers for simple void calls through Tonic.
 
-@FfiNative<Void Function()>('Nop', isLeaf: true)
+@Native<Void Function()>(symbol: 'Nop', isLeaf: true)
 external void nop();
 
 @pragma('vm:entry-point')
@@ -43,7 +43,7 @@ void callNop() {
 
 // Test helpers for calls with bool through Tonic.
 
-@FfiNative<Bool Function(Bool)>('EchoBool')
+@Native<Bool Function(Bool)>(symbol: 'EchoBool')
 external bool echoBool(bool arg);
 
 @pragma('vm:entry-point')
@@ -55,7 +55,7 @@ void callEchoBool() {
 
 // Test helpers for calls with int through Tonic.
 
-@FfiNative<IntPtr Function(IntPtr)>('EchoIntPtr')
+@Native<IntPtr Function(IntPtr)>(symbol: 'EchoIntPtr')
 external int echoIntPtr(int arg);
 
 @pragma('vm:entry-point')
@@ -65,21 +65,9 @@ void callEchoIntPtr() {
   }
 }
 
-// Test helpers for calls with float through Tonic.
-
-@FfiNative<Float Function(Float)>('EchoFloat')
-external double echoFloat(double arg);
-
-@pragma('vm:entry-point')
-void callEchoFloat() {
-  if (echoFloat(23.0) == 23.0) {
-    signalDone();
-  }
-}
-
 // Test helpers for calls with double through Tonic.
 
-@FfiNative<Double Function(Double)>('EchoDouble')
+@Native<Double Function(Double)>(symbol: 'EchoDouble')
 external double echoDouble(double arg);
 
 @pragma('vm:entry-point')
@@ -91,7 +79,7 @@ void callEchoDouble() {
 
 // Test helpers for calls with Dart_Handle through Tonic.
 
-@FfiNative<Handle Function(Handle)>('EchoHandle')
+@Native<Handle Function(Handle)>(symbol: 'EchoHandle')
 external Object echoHandle(Object arg);
 
 @pragma('vm:entry-point')
@@ -103,7 +91,7 @@ void callEchoHandle() {
 
 // Test helpers for calls with std::string through Tonic.
 
-@FfiNative<Handle Function(Handle)>('EchoString')
+@Native<Handle Function(Handle)>(symbol: 'EchoString')
 external String echoString(String arg);
 
 @pragma('vm:entry-point')
@@ -115,7 +103,7 @@ void callEchoString() {
 
 // Test helpers for calls with std::u16string through Tonic.
 
-@FfiNative<Handle Function(Handle)>('EchoU16String')
+@Native<Handle Function(Handle)>(symbol: 'EchoU16String')
 external String echoU16String(String arg);
 
 @pragma('vm:entry-point')
@@ -127,7 +115,7 @@ void callEchoU16String() {
 
 // Test helpers for calls with std::vector through Tonic.
 
-@FfiNative<Handle Function(Handle)>('EchoVector')
+@Native<Handle Function(Handle)>(symbol: 'EchoVector')
 external List<String> echoVector(List<String> arg);
 
 @pragma('vm:entry-point')
@@ -139,24 +127,22 @@ void callEchoVector() {
 
 // Test helpers for calls with DartWrappable through Tonic.
 
-class MyNativeClass extends NativeFieldWrapperClass1 {
+base class MyNativeClass extends NativeFieldWrapperClass1 {
   MyNativeClass(int value) {
     _Create(this, value);
   }
 
-  @FfiNative<Void Function(Handle, IntPtr)>('CreateNative')
+  @Native<Void Function(Handle, IntPtr)>(symbol: 'CreateNative')
   external static void _Create(MyNativeClass self, int value);
 
-  @FfiNative<Int32 Function(Pointer<Void>, Int32, Handle)>(
-      'MyNativeClass::MyTestFunction')
+  @Native<Int32 Function(Pointer<Void>, Int32, Handle)>(symbol: 'MyNativeClass::MyTestFunction')
   external static int myTestFunction(MyNativeClass self, int x, Object handle);
 
-  @FfiNative<Handle Function(Pointer<Void>, Int64)>(
-      'MyNativeClass::MyTestMethod')
+  @Native<Handle Function(Pointer<Void>, Int64)>(symbol: 'MyNativeClass::MyTestMethod')
   external Object myTestMethod(int a);
 }
 
-@FfiNative<IntPtr Function(Pointer<Void>)>('EchoWrappable')
+@Native<IntPtr Function(Pointer<Void>)>(symbol: 'EchoWrappable')
 external int echoWrappable(MyNativeClass arg);
 
 @pragma('vm:entry-point')
@@ -169,7 +155,7 @@ void callEchoWrappable() {
 
 // Test helpers for calls with TypedList<..> through Tonic.
 
-@FfiNative<Handle Function(Handle)>('EchoTypedList')
+@Native<Handle Function(Handle)>(symbol: 'EchoTypedList')
 external Float32List echoTypedList(Float32List arg);
 
 @pragma('vm:entry-point')
diff --git a/third_party/txt/BUILD.gn b/third_party/txt/BUILD.gn
index 0aaa87464c73004e8aee84daa40c2569960d6774..33996affb8a5765022a174a310af09da1eb0c5e7 100644
--- a/third_party/txt/BUILD.gn
+++ b/third_party/txt/BUILD.gn
@@ -12,10 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("//build/fuchsia/sdk.gni")
 import("//flutter/common/config.gni")
 import("//flutter/testing/testing.gni")
 
+if (is_fuchsia) {
+  import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
+}
+
 declare_args() {
   flutter_use_fontconfig = false
 }
@@ -37,57 +40,12 @@ config("allow_posix_names") {
   }
 }
 
-config("define_skshaper") {
-  if (flutter_enable_skshaper) {
-    defines = [ "FLUTTER_ENABLE_SKSHAPER" ]
-  }
-}
-
 source_set("txt") {
-  defines = []
-  if (flutter_use_fontconfig) {
-    defines += [ "FLUTTER_USE_FONTCONFIG" ]
-  }
-
   sources = [
-    "src/log/log.cc",
-    "src/log/log.h",
-    "src/minikin/CmapCoverage.cpp",
-    "src/minikin/CmapCoverage.h",
-    "src/minikin/Emoji.cpp",
-    "src/minikin/Emoji.h",
-    "src/minikin/FontCollection.cpp",
-    "src/minikin/FontCollection.h",
-    "src/minikin/FontFamily.cpp",
-    "src/minikin/FontFamily.h",
-    "src/minikin/FontLanguage.cpp",
-    "src/minikin/FontLanguage.h",
-    "src/minikin/FontLanguageListCache.cpp",
-    "src/minikin/FontLanguageListCache.h",
-    "src/minikin/FontUtils.cpp",
-    "src/minikin/FontUtils.h",
-    "src/minikin/GraphemeBreak.cpp",
-    "src/minikin/GraphemeBreak.h",
-    "src/minikin/HbFontCache.cpp",
-    "src/minikin/HbFontCache.h",
-    "src/minikin/Hyphenator.cpp",
-    "src/minikin/Hyphenator.h",
-    "src/minikin/Layout.cpp",
-    "src/minikin/Layout.h",
-    "src/minikin/LayoutUtils.cpp",
-    "src/minikin/LayoutUtils.h",
-    "src/minikin/LineBreaker.cpp",
-    "src/minikin/LineBreaker.h",
-    "src/minikin/Measurement.cpp",
-    "src/minikin/Measurement.h",
-    "src/minikin/MinikinFont.cpp",
-    "src/minikin/MinikinFont.h",
-    "src/minikin/MinikinInternal.cpp",
-    "src/minikin/MinikinInternal.h",
-    "src/minikin/SparseBitSet.cpp",
-    "src/minikin/SparseBitSet.h",
-    "src/minikin/WordBreaker.cpp",
-    "src/minikin/WordBreaker.h",
+    "src/skia/paragraph_builder_skia.cc",
+    "src/skia/paragraph_builder_skia.h",
+    "src/skia/paragraph_skia.cc",
+    "src/skia/paragraph_skia.h",
     "src/txt/asset_font_manager.cc",
     "src/txt/asset_font_manager.h",
     "src/txt/font_asset_provider.cc",
@@ -96,28 +54,18 @@ source_set("txt") {
     "src/txt/font_collection.h",
     "src/txt/font_features.cc",
     "src/txt/font_features.h",
-    "src/txt/font_skia.cc",
-    "src/txt/font_skia.h",
     "src/txt/font_style.h",
     "src/txt/font_weight.h",
     "src/txt/line_metrics.h",
-    "src/txt/paint_record.cc",
-    "src/txt/paint_record.h",
     "src/txt/paragraph.h",
     "src/txt/paragraph_builder.cc",
     "src/txt/paragraph_builder.h",
-    "src/txt/paragraph_builder_txt.cc",
-    "src/txt/paragraph_builder_txt.h",
     "src/txt/paragraph_style.cc",
     "src/txt/paragraph_style.h",
-    "src/txt/paragraph_txt.cc",
-    "src/txt/paragraph_txt.h",
     "src/txt/placeholder_run.cc",
     "src/txt/placeholder_run.h",
     "src/txt/platform.h",
     "src/txt/run_metrics.h",
-    "src/txt/styled_runs.cc",
-    "src/txt/styled_runs.h",
     "src/txt/test_font_manager.cc",
     "src/txt/test_font_manager.h",
     "src/txt/text_baseline.h",
@@ -129,46 +77,34 @@ source_set("txt") {
     "src/txt/text_style.h",
     "src/txt/typeface_font_asset_provider.cc",
     "src/txt/typeface_font_asset_provider.h",
-    "src/utils/JenkinsHash.cpp",
-    "src/utils/JenkinsHash.h",
-    "src/utils/LinuxUtils.h",
-    "src/utils/LruCache.h",
-    "src/utils/MacUtils.h",
-    "src/utils/TypeHelpers.h",
-    "src/utils/WindowsUtils.h",
   ]
 
   public_configs = [ ":txt_config" ]
 
-  configs += [ ":define_skshaper" ]
-
   public_deps = [
     "//flutter/display_list",
     "//flutter/fml",
-    "//third_party/harfbuzz",
-    "//third_party/icu",
-    "//third_party/skia",
+    "//flutter/impeller/typographer/backends/skia:typographer_skia_backend",
+    "//flutter/skia",
+    "//flutter/third_party/harfbuzz",
+    "//flutter/third_party/icu",
   ]
 
-  deps = [ "//third_party/skia" ]
+  deps = [
+    "//flutter/skia",
+    "//flutter/skia/modules/skparagraph",
+  ]
 
+  libs = []
   if (flutter_use_fontconfig) {
-    deps += [ "//third_party/fontconfig" ]
+    libs += [ "fontconfig" ]
   }
 
-  if (flutter_enable_skshaper) {
+  if (is_mac || is_ios) {
     sources += [
-      "src/skia/paragraph_builder_skia.cc",
-      "src/skia/paragraph_builder_skia.h",
-      "src/skia/paragraph_skia.cc",
-      "src/skia/paragraph_skia.h",
+      "src/txt/platform_mac.h",
+      "src/txt/platform_mac.mm",
     ]
-
-    deps += [ "//third_party/skia/modules/skparagraph" ]
-  }
-
-  if (is_mac || is_ios) {
-    sources += [ "src/txt/platform_mac.mm" ]
     deps += [ "//flutter/fml" ]
   } else if (is_android) {
     sources += [ "src/txt/platform_android.cc" ]
@@ -178,7 +114,7 @@ source_set("txt") {
     sources += [ "src/txt/platform_linux.cc" ]
   } else if (is_fuchsia) {
     sources += [ "src/txt/platform_fuchsia.cc" ]
-    deps += [ "$fuchsia_sdk_root/fidl:fuchsia.fonts" ]
+    deps += [ "${fuchsia_sdk}/fidl/fuchsia.fonts" ]
   } else if (is_win) {
     sources += [ "src/txt/platform_windows.cc" ]
   } else {
@@ -187,179 +123,63 @@ source_set("txt") {
 }
 
 if (enable_unittests) {
-  txt_common_executable_deps = [
-    "//flutter/fml",  # For ICU initialization.
-    "//third_party/dart/runtime:libdart_jit",  # For logging.
-  ]
-
   test_fixtures("txt_fixtures") {
-    fixtures = [
-      "third_party/fonts/Bold.ttf",
-      "third_party/fonts/Bold.ttx",
-      "third_party/fonts/BoldItalic.ttf",
-      "third_party/fonts/BoldItalic.ttx",
-      "third_party/fonts/ColorEmojiFont.ttf",
-      "third_party/fonts/ColorEmojiFont.ttx",
-      "third_party/fonts/ColorTextMixedEmojiFont.ttf",
-      "third_party/fonts/ColorTextMixedEmojiFont.ttx",
-      "third_party/fonts/DroidSerif.ttf",
-      "third_party/fonts/Emoji.ttf",
-      "third_party/fonts/Emoji.ttx",
-      "third_party/fonts/HomemadeApple.ttf",
-      "third_party/fonts/Italic.ttf",
-      "third_party/fonts/Italic.ttx",
-      "third_party/fonts/Ja.ttf",
-      "third_party/fonts/Ja.ttx",
-      "third_party/fonts/Katibeh-Regular.ttf",
-      "third_party/fonts/Ko.ttf",
-      "third_party/fonts/Ko.ttx",
-      "third_party/fonts/MultiAxis.ttf",
-      "third_party/fonts/MultiAxis.ttx",
-      "third_party/fonts/NoCmapFormat14.ttf",
-      "third_party/fonts/NoCmapFormat14.ttx",
-      "third_party/fonts/NoGlyphFont.ttf",
-      "third_party/fonts/NoGlyphFont.ttx",
-      "third_party/fonts/NotoColorEmoji.ttf",
-      "third_party/fonts/NotoNaskhArabic-Regular.ttf",
-      "third_party/fonts/NotoSansCJK-Regular.ttc",
-      "third_party/fonts/NotoSansKhmer-Regular.ttf",
-      "third_party/fonts/Regular.ttf",
-      "third_party/fonts/Regular.ttx",
-      "third_party/fonts/Roboto-Black.ttf",
-      "third_party/fonts/Roboto-BlackItalic.ttf",
-      "third_party/fonts/Roboto-Bold.ttf",
-      "third_party/fonts/Roboto-BoldItalic.ttf",
-      "third_party/fonts/Roboto-Italic.ttf",
-      "third_party/fonts/Roboto-Light.ttf",
-      "third_party/fonts/Roboto-LightItalic.ttf",
-      "third_party/fonts/Roboto-Medium.ttf",
-      "third_party/fonts/Roboto-MediumItalic.ttf",
-      "third_party/fonts/Roboto-Regular.ttf",
-      "third_party/fonts/Roboto-Thin.ttf",
-      "third_party/fonts/Roboto-ThinItalic.ttf",
-      "third_party/fonts/SourceHanSerifCN-Bold.otf",
-      "third_party/fonts/SourceHanSerifCN-Regular.otf",
-      "third_party/fonts/TextEmojiFont.ttf",
-      "third_party/fonts/TextEmojiFont.ttx",
-      "third_party/fonts/UnicodeBMPOnly.ttf",
-      "third_party/fonts/UnicodeBMPOnly.ttx",
-      "third_party/fonts/UnicodeBMPOnly2.ttf",
-      "third_party/fonts/UnicodeBMPOnly2.ttx",
-      "third_party/fonts/UnicodeUCS4.ttf",
-      "third_party/fonts/UnicodeUCS4.ttx",
-      "third_party/fonts/VariationSelectorTest-Regular.ttf",
-      "third_party/fonts/VariationSelectorTest-Regular.ttx",
-      "third_party/fonts/ZhHans.ttf",
-      "third_party/fonts/ZhHans.ttx",
-      "third_party/fonts/ZhHant.ttf",
-      "third_party/fonts/ZhHant.ttx",
-      "third_party/fonts/ahem.ttf",
-      "third_party/fonts/emoji.xml",
-      "third_party/fonts/itemize.xml",
-    ]
+    fixtures = [ "third_party/fonts/Roboto-Regular.ttf" ]
   }
 
-  source_set("txt_test_utils") {
+  executable("txt_benchmarks") {
+    testonly = true
+
     sources = [
+      "benchmarks/skparagraph_benchmarks.cc",
+      "benchmarks/txt_run_all_benchmarks.cc",
       "tests/txt_test_utils.cc",
       "tests/txt_test_utils.h",
     ]
 
-    configs += [ ":define_skshaper" ]
-
     deps = [
       ":txt",
+      ":txt_fixtures",
       "//flutter/fml",
-      "//third_party/skia",
+      "//flutter/skia/modules/skparagraph",
+      "//flutter/testing:testing_lib",
+      "//flutter/third_party/benchmark",
     ]
   }
 
-  executable("txt_benchmarks") {
-    testonly = true
-
-    sources = [
-      "benchmarks/paint_record_benchmarks.cc",
-      "benchmarks/paragraph_benchmarks.cc",
-      "benchmarks/paragraph_builder_benchmarks.cc",
-      "benchmarks/txt_run_all_benchmarks.cc",
-    ]
-
-    configs += [ ":define_skshaper" ]
-
-    deps = [
-             ":txt",
-             ":txt_fixtures",
-             ":txt_test_utils",
-             "//flutter/testing:testing_lib",
-             "//third_party/benchmark",
-           ] + txt_common_executable_deps
-
-    if (flutter_enable_skshaper) {
-      sources += [ "benchmarks/skparagraph_benchmarks.cc" ]
-
-      deps += [ "//third_party/skia/modules/skparagraph" ]
-    }
-  }
-
   executable("txt_unittests") {
     testonly = true
 
     sources = [
-      "tests/CmapCoverageTest.cpp",
-      "tests/EmojiTest.cpp",
-      "tests/FileUtils.cpp",
-      "tests/FileUtils.h",
-      "tests/FontTestUtils.h",
-      "tests/GraphemeBreakTests.cpp",
-      "tests/ICUTestBase.h",
-      "tests/LayoutUtilsTest.cpp",
-      "tests/MeasurementTests.cpp",
-      "tests/SparseBitSetTest.cpp",
-      "tests/UnicodeUtils.cpp",
-      "tests/UnicodeUtils.h",
-      "tests/UnicodeUtilsTest.cpp",
-      "tests/font_collection_unittests.cc",
+      "tests/font_collection_tests.cc",
+      "tests/paragraph_builder_skia_tests.cc",
       "tests/paragraph_unittests.cc",
-      "tests/render_test.cc",
-      "tests/render_test.h",
       "tests/txt_run_all_unittests.cc",
-
-      # These tests require static fixtures.
-      # "tests/FontCollectionItemizeTest.cpp",
-      # "tests/FontCollectionTest.cpp",
-      # "tests/FontFamilyTest.cpp",
-      # "tests/FontLanguageListCacheTest.cpp",
-      # "tests/FontTestUtils.cpp",
-      # "tests/HbFontCacheTest.cpp",
-      # "tests/HyphenatorTest.cpp",
-      # "tests/LayoutTest.cpp",
     ]
 
-    if (!is_win) {
-      sources += [
-        "tests/MinikinFontForTest.cpp",
-        "tests/MinikinFontForTest.h",
-      ]
+    if (is_mac || is_ios) {
+      sources += [ "tests/platform_mac_tests.cc" ]
     }
 
-    configs += [
-      ":allow_posix_names",
-      ":define_skshaper",
-    ]
+    public_configs = [ ":txt_config" ]
+
+    configs += [ ":allow_posix_names" ]
 
     deps = [
-             ":txt",
-             ":txt_test_utils",
-             "//flutter/testing:testing_lib",
-             ":txt_fixtures",
-           ] + txt_common_executable_deps
+      ":txt",
+      ":txt_fixtures",
+      "//flutter/fml",
+      "//flutter/runtime:test_font",
+      "//flutter/skia/modules/skparagraph:skparagraph",
+      "//flutter/testing:skia",
+      "//flutter/testing:testing_lib",
+    ]
 
+    # This is needed for //flutter/third_party/googletest for linking zircon
+    # symbols.
     if (is_fuchsia) {
-      sources += [ "tests/platform_fuchsia_unittests.cc" ]
-      deps += [
-        "$fuchsia_sdk_root/fidl:fuchsia.fonts",
-        "$fuchsia_sdk_root/pkg:async-testing",
-      ]
+      libs =
+          [ "${fuchsia_arch_root}/sysroot/lib/libzircon.so" ]
     }
   }
 }
diff --git a/third_party/txt/LICENSE b/third_party/txt/LICENSE
deleted file mode 100644
index d645695673349e3947e8e5ae42332d0ac3164cd7..0000000000000000000000000000000000000000
--- a/third_party/txt/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/third_party/txt/benchmarks/paragraph_benchmarks.cc b/third_party/txt/benchmarks/paragraph_benchmarks.cc
deleted file mode 100644
index babd637093e0402269b18ea65e6027e9b4e2b032..0000000000000000000000000000000000000000
--- a/third_party/txt/benchmarks/paragraph_benchmarks.cc
+++ /dev/null
@@ -1,446 +0,0 @@
-/*
- * Copyright 2017 Google, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <minikin/Layout.h>
-
-#include <cstring>
-
-#include "flutter/fml/command_line.h"
-#include "flutter/fml/logging.h"
-#include "flutter/third_party/txt/tests/txt_test_utils.h"
-#include "minikin/LayoutUtils.h"
-#include "third_party/benchmark/include/benchmark/benchmark.h"
-#include "third_party/icu/source/common/unicode/unistr.h"
-#include "third_party/skia/include/core/SkBitmap.h"
-#include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkColor.h"
-#include "txt/font_collection.h"
-#include "txt/font_skia.h"
-#include "txt/font_style.h"
-#include "txt/font_weight.h"
-#include "txt/paragraph.h"
-#include "txt/paragraph_builder_txt.h"
-
-namespace txt {
-
-class ParagraphFixture : public benchmark::Fixture {
- public:
-  void SetUp(const benchmark::State& state) {
-    font_collection_ = GetTestFontCollection();
-
-    bitmap_ = std::make_unique<SkBitmap>();
-    bitmap_->allocN32Pixels(1000, 1000);
-    canvas_ = std::make_unique<SkCanvas>(*bitmap_);
-    canvas_->clear(SK_ColorWHITE);
-  }
-
-  void TearDown(const benchmark::State& state) { font_collection_.reset(); }
-
- protected:
-  std::shared_ptr<FontCollection> font_collection_;
-  std::unique_ptr<SkCanvas> canvas_;
-  std::unique_ptr<SkBitmap> bitmap_;
-};
-
-BENCHMARK_F(ParagraphFixture, ShortLayout)(benchmark::State& state) {
-  const char* text = "Hello World";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.color = SK_ColorBLACK;
-  txt::ParagraphBuilderTxt builder(paragraph_style, font_collection_);
-
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-  builder.Pop();
-  auto paragraph = BuildParagraph(builder);
-  while (state.KeepRunning()) {
-    paragraph->SetDirty();
-    paragraph->Layout(300);
-  }
-}
-
-BENCHMARK_F(ParagraphFixture, LongLayout)(benchmark::State& state) {
-  const char* text =
-      "This is a very long sentence to test if the text will properly wrap "
-      "around and go to the next line. Sometimes, short sentence. Longer "
-      "sentences are okay too because they are necessary. Very short. "
-      "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
-      "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim "
-      "veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea "
-      "commodo consequat. Duis aute irure dolor in reprehenderit in voluptate "
-      "velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint "
-      "occaecat cupidatat non proident, sunt in culpa qui officia deserunt "
-      "mollit anim id est laborum. "
-      "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
-      "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim "
-      "veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea "
-      "commodo consequat. Duis aute irure dolor in reprehenderit in voluptate "
-      "velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint "
-      "occaecat cupidatat non proident, sunt in culpa qui officia deserunt "
-      "mollit anim id est laborum.";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.color = SK_ColorBLACK;
-
-  txt::ParagraphBuilderTxt builder(paragraph_style, font_collection_);
-
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-  builder.Pop();
-  auto paragraph = BuildParagraph(builder);
-  while (state.KeepRunning()) {
-    paragraph->SetDirty();
-    paragraph->Layout(300);
-  }
-}
-
-BENCHMARK_F(ParagraphFixture, JustifyLayout)(benchmark::State& state) {
-  const char* text =
-      "This is a very long sentence to test if the text will properly wrap "
-      "around and go to the next line. Sometimes, short sentence. Longer "
-      "sentences are okay too because they are necessary. Very short. "
-      "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
-      "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim "
-      "veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea "
-      "commodo consequat. Duis aute irure dolor in reprehenderit in voluptate "
-      "velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint "
-      "occaecat cupidatat non proident, sunt in culpa qui officia deserunt "
-      "mollit anim id est laborum. "
-      "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
-      "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim "
-      "veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea "
-      "commodo consequat. Duis aute irure dolor in reprehenderit in voluptate "
-      "velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint "
-      "occaecat cupidatat non proident, sunt in culpa qui officia deserunt "
-      "mollit anim id est laborum.";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.text_align = TextAlign::justify;
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.color = SK_ColorBLACK;
-
-  txt::ParagraphBuilderTxt builder(paragraph_style, font_collection_);
-
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-  builder.Pop();
-  auto paragraph = BuildParagraph(builder);
-  while (state.KeepRunning()) {
-    paragraph->SetDirty();
-    paragraph->Layout(300);
-  }
-}
-
-BENCHMARK_F(ParagraphFixture, ManyStylesLayout)(benchmark::State& state) {
-  const char* text = "-";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.color = SK_ColorBLACK;
-  txt::ParagraphBuilderTxt builder(paragraph_style, font_collection_);
-  for (int i = 0; i < 1000; ++i) {
-    builder.PushStyle(text_style);
-    builder.AddText(u16_text);
-  }
-  auto paragraph = BuildParagraph(builder);
-  while (state.KeepRunning()) {
-    paragraph->SetDirty();
-    paragraph->Layout(300);
-  }
-}
-
-BENCHMARK_DEFINE_F(ParagraphFixture, TextBigO)(benchmark::State& state) {
-  std::vector<uint16_t> text;
-  for (uint16_t i = 0; i < state.range(0); ++i) {
-    text.push_back(i % 5 == 0 ? ' ' : i);
-  }
-  std::u16string u16_text(text.data(), text.data() + text.size());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.font_family = "Roboto";
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.color = SK_ColorBLACK;
-
-  txt::ParagraphBuilderTxt builder(paragraph_style, font_collection_);
-
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-  builder.Pop();
-  auto paragraph = BuildParagraph(builder);
-  while (state.KeepRunning()) {
-    paragraph->SetDirty();
-    paragraph->Layout(300);
-  }
-  state.SetComplexityN(state.range(0));
-}
-BENCHMARK_REGISTER_F(ParagraphFixture, TextBigO)
-    ->RangeMultiplier(4)
-    ->Range(1 << 6, 1 << 14)
-    ->Complexity(benchmark::oN);
-
-BENCHMARK_DEFINE_F(ParagraphFixture, StylesBigO)(benchmark::State& state) {
-  const char* text = "vry shrt ";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.color = SK_ColorBLACK;
-
-  txt::ParagraphBuilderTxt builder(paragraph_style, font_collection_);
-
-  for (int i = 0; i < state.range(0); ++i) {
-    builder.PushStyle(text_style);
-    builder.AddText(u16_text);
-  }
-  auto paragraph = BuildParagraph(builder);
-  while (state.KeepRunning()) {
-    paragraph->SetDirty();
-    paragraph->Layout(300);
-  }
-  state.SetComplexityN(state.range(0));
-}
-BENCHMARK_REGISTER_F(ParagraphFixture, StylesBigO)
-    ->RangeMultiplier(4)
-    ->Range(1 << 3, 1 << 12)
-    ->Complexity(benchmark::oN);
-
-BENCHMARK_F(ParagraphFixture, PaintSimple)(benchmark::State& state) {
-  const char* text = "Hello world! This is a simple sentence to test drawing.";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.color = SK_ColorBLACK;
-  txt::ParagraphBuilderTxt builder(paragraph_style, font_collection_);
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(300);
-
-  int offset = 0;
-  while (state.KeepRunning()) {
-    paragraph->Paint(canvas_.get(), offset % 700, 10);
-    offset++;
-  }
-}
-
-BENCHMARK_F(ParagraphFixture, PaintLarge)(benchmark::State& state) {
-  const char* text =
-      "Hello world! This is a simple sentence to test drawing. Hello world! "
-      "This is a simple sentence to test drawing. Hello world! This is a "
-      "simple sentence to test drawing.Hello world! This is a simple sentence "
-      "to test drawing. Hello world! "
-      "This is a simple sentence to test drawing. Hello world! This is a "
-      "simple sentence to test drawing.Hello world! This is a simple sentence "
-      "to test drawing. Hello world! "
-      "This is a simple sentence to test drawing. Hello world! This is a "
-      "simple sentence to test drawing.Hello world! This is a simple sentence "
-      "to test drawing. Hello world! "
-      "This is a simple sentence to test drawing. Hello world! This is a "
-      "simple sentence to test drawing.Hello world! This is a simple sentence "
-      "to test drawing. Hello world! "
-      "This is a simple sentence to test drawing. Hello world! This is a "
-      "simple sentence to test drawing.Hello world! This is a simple sentence "
-      "to test drawing. Hello world! "
-      "This is a simple sentence to test drawing. Hello world! This is a "
-      "simple sentence to test drawing.";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.color = SK_ColorBLACK;
-  txt::ParagraphBuilderTxt builder(paragraph_style, font_collection_);
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(300);
-
-  int offset = 0;
-  while (state.KeepRunning()) {
-    paragraph->Paint(canvas_.get(), offset % 700, 10);
-    offset++;
-  }
-}
-
-BENCHMARK_F(ParagraphFixture, PaintDecoration)(benchmark::State& state) {
-  const char* text =
-      "Hello world! This is a simple sentence to test drawing. Hello world! "
-      "This is a simple sentence to test drawing.";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.decoration = TextDecoration::kUnderline |
-                          TextDecoration::kOverline |
-                          TextDecoration::kLineThrough;
-  text_style.decoration_style = TextDecorationStyle(kSolid);
-  text_style.color = SK_ColorBLACK;
-
-  txt::ParagraphBuilderTxt builder(paragraph_style, font_collection_);
-
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-
-  text_style.decoration_style = TextDecorationStyle(kDotted);
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-
-  text_style.decoration_style = TextDecorationStyle(kWavy);
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(300);
-
-  int offset = 0;
-  while (state.KeepRunning()) {
-    paragraph->Paint(canvas_.get(), offset % 700, 10);
-    offset++;
-  }
-}
-
-// -----------------------------------------------------------------------------
-//
-// The following benchmarks break down the layout function and attempts to time
-// each of the components to more finely attribute latency.
-//
-// -----------------------------------------------------------------------------
-
-BENCHMARK_DEFINE_F(ParagraphFixture, MinikinDoLayout)(benchmark::State& state) {
-  std::vector<uint16_t> text;
-  for (uint16_t i = 0; i < 16000 * 2; ++i) {
-    text.push_back(i % 5 == 0 ? ' ' : i);
-  }
-  minikin::FontStyle font;
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  minikin::MinikinPaint paint;
-
-  font = minikin::FontStyle(4, false);
-  paint.size = text_style.font_size;
-  paint.letterSpacing = text_style.letter_spacing;
-  paint.wordSpacing = text_style.word_spacing;
-
-  auto collection = font_collection_->GetMinikinFontCollectionForFamilies(
-      text_style.font_families, "en-US");
-
-  while (state.KeepRunning()) {
-    minikin::Layout layout;
-    layout.doLayout(text.data(), 0, state.range(0), state.range(0), 0, font,
-                    paint, collection);
-  }
-  state.SetComplexityN(state.range(0));
-}
-BENCHMARK_REGISTER_F(ParagraphFixture, MinikinDoLayout)
-    ->RangeMultiplier(4)
-    ->Range(1 << 7, 1 << 14)
-    ->Complexity(benchmark::oN);
-
-BENCHMARK_DEFINE_F(ParagraphFixture, AddStyleRun)(benchmark::State& state) {
-  std::vector<uint16_t> text;
-  for (uint16_t i = 0; i < 16000 * 2; ++i) {
-    text.push_back(i % 5 == 0 ? ' ' : i);
-  }
-  minikin::FontStyle font;
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  minikin::MinikinPaint paint;
-
-  font = minikin::FontStyle(4, false);
-  paint.size = text_style.font_size;
-  paint.letterSpacing = text_style.letter_spacing;
-  paint.wordSpacing = text_style.word_spacing;
-
-  minikin::LineBreaker breaker;
-  breaker.setLocale();
-  breaker.resize(text.size());
-  memcpy(breaker.buffer(), text.data(), text.size() * sizeof(text[0]));
-  breaker.setText();
-
-  while (state.KeepRunning()) {
-    for (int i = 0; i < 20; ++i) {
-      breaker.addStyleRun(&paint,
-                          font_collection_->GetMinikinFontCollectionForFamilies(
-                              std::vector<std::string>(1, "Roboto"), "en-US"),
-                          font, state.range(0) / 20 * i,
-                          state.range(0) / 20 * (i + 1), false);
-    }
-  }
-  state.SetComplexityN(state.range(0));
-}
-BENCHMARK_REGISTER_F(ParagraphFixture, AddStyleRun)
-    ->RangeMultiplier(4)
-    ->Range(1 << 7, 1 << 14)
-    ->Complexity(benchmark::oN);
-
-BENCHMARK_DEFINE_F(ParagraphFixture, SkTextBlobAlloc)(benchmark::State& state) {
-  SkFont font;
-  font.setEdging(SkFont::Edging::kAntiAlias);
-  font.setSize(14);
-  font.setEmbolden(false);
-
-  while (state.KeepRunning()) {
-    SkTextBlobBuilder builder;
-    builder.allocRunPos(font, state.range(0));
-  }
-  state.SetComplexityN(state.range(0));
-}
-BENCHMARK_REGISTER_F(ParagraphFixture, SkTextBlobAlloc)
-    ->RangeMultiplier(4)
-    ->Range(1 << 7, 1 << 14)
-    ->Complexity(benchmark::oN);
-
-}  // namespace txt
diff --git a/third_party/txt/benchmarks/paragraph_builder_benchmarks.cc b/third_party/txt/benchmarks/paragraph_builder_benchmarks.cc
deleted file mode 100644
index b507db32e13b9c7d4d25647f493c3bb28db37f86..0000000000000000000000000000000000000000
--- a/third_party/txt/benchmarks/paragraph_builder_benchmarks.cc
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright 2017 Google, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "flutter/fml/logging.h"
-#include "flutter/third_party/txt/tests/txt_test_utils.h"
-#include "third_party/benchmark/include/benchmark/benchmark.h"
-#include "third_party/icu/source/common/unicode/unistr.h"
-#include "third_party/skia/include/core/SkColor.h"
-#include "txt/font_collection.h"
-#include "txt/font_style.h"
-#include "txt/font_weight.h"
-#include "txt/paragraph.h"
-#include "txt/paragraph_builder_txt.h"
-
-namespace txt {
-
-static void BM_ParagraphBuilderConstruction(benchmark::State& state) {
-  txt::ParagraphStyle paragraph_style;
-  auto font_collection = GetTestFontCollection();
-  while (state.KeepRunning()) {
-    txt::ParagraphBuilderTxt builder(paragraph_style, font_collection);
-  }
-}
-BENCHMARK(BM_ParagraphBuilderConstruction);
-
-static void BM_ParagraphBuilderPushStyle(benchmark::State& state) {
-  txt::ParagraphStyle paragraph_style;
-
-  txt::TextStyle text_style;
-  text_style.color = SK_ColorBLACK;
-  auto font_collection = GetTestFontCollection();
-  while (state.KeepRunning()) {
-    txt::ParagraphBuilderTxt builder(paragraph_style, font_collection);
-    builder.PushStyle(text_style);
-  }
-}
-BENCHMARK(BM_ParagraphBuilderPushStyle);
-
-static void BM_ParagraphBuilderPushPop(benchmark::State& state) {
-  txt::ParagraphStyle paragraph_style;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.color = SK_ColorBLACK;
-  while (state.KeepRunning()) {
-    builder.PushStyle(text_style);
-    builder.Pop();
-  }
-}
-BENCHMARK(BM_ParagraphBuilderPushPop);
-
-static void BM_ParagraphBuilderAddTextString(benchmark::State& state) {
-  std::u16string text = u"Hello World";
-
-  auto font_collection = GetTestFontCollection();
-
-  txt::ParagraphStyle paragraph_style;
-
-  while (state.KeepRunning()) {
-    txt::ParagraphBuilderTxt builder(paragraph_style, font_collection);
-    builder.AddText(text);
-  }
-}
-BENCHMARK(BM_ParagraphBuilderAddTextString);
-
-static void BM_ParagraphBuilderAddTextChar(benchmark::State& state) {
-  std::u16string text = u"Hello World";
-
-  txt::ParagraphStyle paragraph_style;
-  auto font_collection = GetTestFontCollection();
-  while (state.KeepRunning()) {
-    txt::ParagraphBuilderTxt builder(paragraph_style, font_collection);
-    builder.AddText(text);
-  }
-}
-BENCHMARK(BM_ParagraphBuilderAddTextChar);
-
-static void BM_ParagraphBuilderAddTextU16stringShort(benchmark::State& state) {
-  const char* text = "H";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  auto font_collection = GetTestFontCollection();
-  while (state.KeepRunning()) {
-    txt::ParagraphBuilderTxt builder(paragraph_style, font_collection);
-    builder.AddText(u16_text);
-  }
-}
-BENCHMARK(BM_ParagraphBuilderAddTextU16stringShort);
-
-static void BM_ParagraphBuilderAddTextU16stringLong(benchmark::State& state) {
-  const char* text =
-      "This is a very long sentence to test if the text will properly wrap "
-      "around and go to the next line. Sometimes, short sentence. Longer "
-      "sentences are okay too because they are necessary. Very short. "
-      "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
-      "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim "
-      "veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea "
-      "commodo consequat. Duis aute irure dolor in reprehenderit in voluptate "
-      "velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint "
-      "occaecat cupidatat non proident, sunt in culpa qui officia deserunt "
-      "mollit anim id est laborum. "
-      "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
-      "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim "
-      "veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea "
-      "commodo consequat. Duis aute irure dolor in reprehenderit in voluptate "
-      "velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint "
-      "occaecat cupidatat non proident, sunt in culpa qui officia deserunt "
-      "mollit anim id est laborum.";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  auto font_collection = GetTestFontCollection();
-
-  txt::ParagraphStyle paragraph_style;
-
-  while (state.KeepRunning()) {
-    txt::ParagraphBuilderTxt builder(paragraph_style, font_collection);
-    builder.AddText(u16_text);
-  }
-}
-BENCHMARK(BM_ParagraphBuilderAddTextU16stringLong);
-
-static void BM_ParagraphBuilderShortParagraphConstruct(
-    benchmark::State& state) {
-  const char* text = "Hello World";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-
-  txt::TextStyle text_style;
-  text_style.color = SK_ColorBLACK;
-  auto font_collection = GetTestFontCollection();
-  while (state.KeepRunning()) {
-    txt::ParagraphBuilderTxt builder(paragraph_style, font_collection);
-    builder.PushStyle(text_style);
-    builder.AddText(u16_text);
-    builder.Pop();
-    auto paragraph = builder.Build();
-  }
-}
-BENCHMARK(BM_ParagraphBuilderShortParagraphConstruct);
-
-static void BM_ParagraphBuilderLongParagraphConstruct(benchmark::State& state) {
-  const char* text =
-      "This is a very long sentence to test if the text will properly wrap "
-      "around and go to the next line. Sometimes, short sentence. Longer "
-      "sentences are okay too because they are necessary. Very short. "
-      "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
-      "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim "
-      "veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea "
-      "commodo consequat. Duis aute irure dolor in reprehenderit in voluptate "
-      "velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint "
-      "occaecat cupidatat non proident, sunt in culpa qui officia deserunt "
-      "mollit anim id est laborum. "
-      "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
-      "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim "
-      "veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea "
-      "commodo consequat. Duis aute irure dolor in reprehenderit in voluptate "
-      "velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint "
-      "occaecat cupidatat non proident, sunt in culpa qui officia deserunt "
-      "mollit anim id est laborum.";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-
-  txt::TextStyle text_style;
-  text_style.color = SK_ColorBLACK;
-  auto font_collection = GetTestFontCollection();
-  while (state.KeepRunning()) {
-    txt::ParagraphBuilderTxt builder(paragraph_style, font_collection);
-    builder.PushStyle(text_style);
-    builder.AddText(u16_text);
-    builder.Pop();
-    auto paragraph = builder.Build();
-  }
-}
-BENCHMARK(BM_ParagraphBuilderLongParagraphConstruct);
-
-}  // namespace txt
diff --git a/third_party/txt/benchmarks/txt_run_all_benchmarks.cc b/third_party/txt/benchmarks/txt_run_all_benchmarks.cc
index 9f4027e2a5f9a0fd040255baf8a7e76640e463b6..ac9df5ed9e352a2c6a3932aebbeb9ea368ac4d07 100644
--- a/third_party/txt/benchmarks/txt_run_all_benchmarks.cc
+++ b/third_party/txt/benchmarks/txt_run_all_benchmarks.cc
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include "flutter/fml/command_line.h"
 #include "flutter/fml/icu_util.h"
 #include "flutter/fml/logging.h"
 #include "flutter/testing/testing.h"
@@ -24,7 +25,6 @@
 int main(int argc, char** argv) {
   ::benchmark::Initialize(&argc, argv);
   fml::CommandLine cmd = fml::CommandLineFromPlatformOrArgcArgv(argc, argv);
-  txt::SetCommandLine(cmd);
   txt::SetFontDir(flutter::testing::GetFixturesPath());
   if (txt::GetFontDir().length() <= 0) {
     FML_LOG(ERROR) << "Font directory not set via txt::SetFontDir.";
diff --git a/third_party/txt/src/log/log.cc b/third_party/txt/src/log/log.cc
deleted file mode 100644
index ab61fead31b37d3106676ef9ecf259c05a469737..0000000000000000000000000000000000000000
--- a/third_party/txt/src/log/log.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2017 Google, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <log/log.h>
-
-int __android_log_error_write(int tag,
-                              const char* subTag,
-                              int32_t uid,
-                              const char* data,
-                              uint32_t dataLen) {
-  return 0;
-}
diff --git a/third_party/txt/src/log/log.h b/third_party/txt/src/log/log.h
deleted file mode 100644
index edc153a5625fd2eda8ee35e1d84235afa223d0ea..0000000000000000000000000000000000000000
--- a/third_party/txt/src/log/log.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2017 Google, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <stdint.h>
-
-#include "flutter/fml/logging.h"
-
-#if defined(_WIN32)
-// Conflicts with macro on Windows.
-#undef ERROR
-#endif
-
-#ifndef LOG_ALWAYS_FATAL_IF
-#define LOG_ALWAYS_FATAL_IF(cond, ...) \
-  ((cond) ? (FML_LOG(FATAL) << #cond) : (void)0)
-#endif
-
-#ifndef LOG_ALWAYS_FATAL
-#define LOG_ALWAYS_FATAL(...) FML_LOG(FATAL)
-#endif
-
-#ifndef LOG_ASSERT
-#define LOG_ASSERT(cond, ...) FML_CHECK(cond)
-#define ALOG_ASSERT LOG_ASSERT
-#endif
-
-#ifndef ALOGD
-#define ALOGD(message, ...) FML_DLOG(INFO) << (message)
-#endif
-
-#ifndef ALOGW
-#define ALOGW(message, ...) FML_LOG(WARNING) << (message)
-#endif
-
-#ifndef ALOGE
-#define ALOGE(message, ...) FML_LOG(ERROR) << (message)
-#endif
-
-#define android_errorWriteLog(tag, subTag) \
-  __android_log_error_write(tag, subTag, -1, NULL, 0)
-#define android_errorWriteWithInfoLog(tag, subTag, uid, data, dataLen) \
-  __android_log_error_write(tag, subTag, uid, data, dataLen)
-int __android_log_error_write(int tag,
-                              const char* subTag,
-                              int32_t uid,
-                              const char* data,
-                              uint32_t dataLen);
diff --git a/third_party/txt/src/minikin/CmapCoverage.cpp b/third_party/txt/src/minikin/CmapCoverage.cpp
deleted file mode 100644
index c61cd766e2738186d96dd98c011deb4879cdb96c..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/CmapCoverage.cpp
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Determine coverage of font given its raw "cmap" OpenType table
-
-#define LOG_TAG "Minikin"
-
-#include <vector>
-using std::vector;
-
-#include <log/log.h>
-
-#include <minikin/CmapCoverage.h>
-#include <minikin/SparseBitSet.h>
-#include "MinikinInternal.h"
-
-namespace minikin {
-
-// These could perhaps be optimized to use __builtin_bswap16 and friends.
-static uint32_t readU16(const uint8_t* data, size_t offset) {
-  return ((uint32_t)data[offset]) << 8 | ((uint32_t)data[offset + 1]);
-}
-
-static uint32_t readU32(const uint8_t* data, size_t offset) {
-  return ((uint32_t)data[offset]) << 24 | ((uint32_t)data[offset + 1]) << 16 |
-         ((uint32_t)data[offset + 2]) << 8 | ((uint32_t)data[offset + 3]);
-}
-
-static void addRange(vector<uint32_t>& coverage, uint32_t start, uint32_t end) {
-#ifdef VERBOSE_DEBUG
-  ALOGD("adding range %d-%d\n", start, end);
-#endif
-  if (coverage.empty() || coverage.back() < start) {
-    coverage.push_back(start);
-    coverage.push_back(end);
-  } else {
-    coverage.back() = end;
-  }
-}
-
-// Get the coverage information out of a Format 4 subtable, storing it in the
-// coverage vector
-static bool getCoverageFormat4(vector<uint32_t>& coverage,
-                               const uint8_t* data,
-                               size_t size) {
-  const size_t kSegCountOffset = 6;
-  const size_t kEndCountOffset = 14;
-  const size_t kHeaderSize = 16;
-  const size_t kSegmentSize =
-      8;  // total size of array elements for one segment
-  if (kEndCountOffset > size) {
-    return false;
-  }
-  size_t segCount = readU16(data, kSegCountOffset) >> 1;
-  if (kHeaderSize + segCount * kSegmentSize > size) {
-    return false;
-  }
-  for (size_t i = 0; i < segCount; i++) {
-    uint32_t end = readU16(data, kEndCountOffset + 2 * i);
-    uint32_t start = readU16(data, kHeaderSize + 2 * (segCount + i));
-    if (end < start) {
-      // invalid segment range: size must be positive
-      android_errorWriteLog(0x534e4554, "26413177");
-      return false;
-    }
-    uint32_t rangeOffset = readU16(data, kHeaderSize + 2 * (3 * segCount + i));
-    if (rangeOffset == 0) {
-      uint32_t delta = readU16(data, kHeaderSize + 2 * (2 * segCount + i));
-      if (((end + delta) & 0xffff) > end - start) {
-        addRange(coverage, start, end + 1);
-      } else {
-        for (uint32_t j = start; j < end + 1; j++) {
-          if (((j + delta) & 0xffff) != 0) {
-            addRange(coverage, j, j + 1);
-          }
-        }
-      }
-    } else {
-      for (uint32_t j = start; j < end + 1; j++) {
-        uint32_t actualRangeOffset =
-            kHeaderSize + 6 * segCount + rangeOffset + (i + j - start) * 2;
-        if (actualRangeOffset + 2 > size) {
-          // invalid rangeOffset is considered a "warning" by OpenType Sanitizer
-          continue;
-        }
-        uint32_t glyphId = readU16(data, actualRangeOffset);
-        if (glyphId != 0) {
-          addRange(coverage, j, j + 1);
-        }
-      }
-    }
-  }
-  return true;
-}
-
-// Get the coverage information out of a Format 12 subtable, storing it in the
-// coverage vector
-static bool getCoverageFormat12(vector<uint32_t>& coverage,
-                                const uint8_t* data,
-                                size_t size) {
-  const size_t kNGroupsOffset = 12;
-  const size_t kFirstGroupOffset = 16;
-  const size_t kGroupSize = 12;
-  const size_t kStartCharCodeOffset = 0;
-  const size_t kEndCharCodeOffset = 4;
-  const size_t kMaxNGroups =
-      0xfffffff0 / kGroupSize;  // protection against overflow
-  // For all values < kMaxNGroups, kFirstGroupOffset + nGroups * kGroupSize fits
-  // in 32 bits.
-  if (kFirstGroupOffset > size) {
-    return false;
-  }
-  uint32_t nGroups = readU32(data, kNGroupsOffset);
-  if (nGroups >= kMaxNGroups ||
-      kFirstGroupOffset + nGroups * kGroupSize > size) {
-    android_errorWriteLog(0x534e4554, "25645298");
-    return false;
-  }
-  for (uint32_t i = 0; i < nGroups; i++) {
-    uint32_t groupOffset = kFirstGroupOffset + i * kGroupSize;
-    uint32_t start = readU32(data, groupOffset + kStartCharCodeOffset);
-    uint32_t end = readU32(data, groupOffset + kEndCharCodeOffset);
-    if (end < start) {
-      // invalid group range: size must be positive
-      android_errorWriteLog(0x534e4554, "26413177");
-      return false;
-    }
-
-    // No need to read outside of Unicode code point range.
-    if (start > MAX_UNICODE_CODE_POINT) {
-      return true;
-    }
-    if (end > MAX_UNICODE_CODE_POINT) {
-      // file is inclusive, vector is exclusive
-      addRange(coverage, start, MAX_UNICODE_CODE_POINT + 1);
-      return true;
-    }
-    addRange(coverage, start,
-             end + 1);  // file is inclusive, vector is exclusive
-  }
-  return true;
-}
-
-// Lower value has higher priority. 0 for the highest priority table.
-// kLowestPriority for unsupported tables.
-// This order comes from HarfBuzz's hb-ot-font.cc and needs to be kept in sync
-// with it.
-constexpr uint8_t kLowestPriority = 255;
-uint8_t getTablePriority(uint16_t platformId, uint16_t encodingId) {
-  if (platformId == 3 && encodingId == 10) {
-    return 0;
-  }
-  if (platformId == 0 && encodingId == 6) {
-    return 1;
-  }
-  if (platformId == 0 && encodingId == 4) {
-    return 2;
-  }
-  if (platformId == 3 && encodingId == 1) {
-    return 3;
-  }
-  if (platformId == 0 && encodingId == 3) {
-    return 4;
-  }
-  if (platformId == 0 && encodingId == 2) {
-    return 5;
-  }
-  if (platformId == 0 && encodingId == 1) {
-    return 6;
-  }
-  if (platformId == 0 && encodingId == 0) {
-    return 7;
-  }
-  // Tables other than above are not supported.
-  return kLowestPriority;
-}
-
-SparseBitSet CmapCoverage::getCoverage(const uint8_t* cmap_data,
-                                       size_t cmap_size,
-                                       bool* has_cmap_format14_subtable) {
-  constexpr size_t kHeaderSize = 4;
-  constexpr size_t kNumTablesOffset = 2;
-  constexpr size_t kTableSize = 8;
-  constexpr size_t kPlatformIdOffset = 0;
-  constexpr size_t kEncodingIdOffset = 2;
-  constexpr size_t kOffsetOffset = 4;
-  constexpr size_t kFormatOffset = 0;
-  constexpr uint32_t kInvalidOffset = UINT32_MAX;
-
-  if (kHeaderSize > cmap_size) {
-    return SparseBitSet();
-  }
-  uint32_t numTables = readU16(cmap_data, kNumTablesOffset);
-  if (kHeaderSize + numTables * kTableSize > cmap_size) {
-    return SparseBitSet();
-  }
-
-  uint32_t bestTableOffset = kInvalidOffset;
-  uint16_t bestTableFormat = 0;
-  uint8_t bestTablePriority = kLowestPriority;
-  *has_cmap_format14_subtable = false;
-  for (uint32_t i = 0; i < numTables; ++i) {
-    const uint32_t tableHeadOffset = kHeaderSize + i * kTableSize;
-    const uint16_t platformId =
-        readU16(cmap_data, tableHeadOffset + kPlatformIdOffset);
-    const uint16_t encodingId =
-        readU16(cmap_data, tableHeadOffset + kEncodingIdOffset);
-    const uint32_t offset = readU32(cmap_data, tableHeadOffset + kOffsetOffset);
-
-    if (offset > cmap_size - 2) {
-      continue;  // Invalid table: not enough space to read.
-    }
-    const uint16_t format = readU16(cmap_data, offset + kFormatOffset);
-
-    if (platformId == 0 /* Unicode */ &&
-        encodingId == 5 /* Variation Sequences */) {
-      if (!(*has_cmap_format14_subtable) && format == 14) {
-        *has_cmap_format14_subtable = true;
-      } else {
-        // Ignore the (0, 5) table if we have already seen another valid one or
-        // it's in a format we don't understand.
-      }
-    } else {
-      uint32_t length;
-      uint32_t language;
-
-      if (format == 4) {
-        constexpr size_t lengthOffset = 2;
-        constexpr size_t languageOffset = 4;
-        constexpr size_t minTableSize = languageOffset + 2;
-        if (offset > cmap_size - minTableSize) {
-          continue;  // Invalid table: not enough space to read.
-        }
-        length = readU16(cmap_data, offset + lengthOffset);
-        language = readU16(cmap_data, offset + languageOffset);
-      } else if (format == 12) {
-        constexpr size_t lengthOffset = 4;
-        constexpr size_t languageOffset = 8;
-        constexpr size_t minTableSize = languageOffset + 4;
-        if (offset > cmap_size - minTableSize) {
-          continue;  // Invalid table: not enough space to read.
-        }
-        length = readU32(cmap_data, offset + lengthOffset);
-        language = readU32(cmap_data, offset + languageOffset);
-      } else {
-        continue;
-      }
-
-      if (length > cmap_size - offset) {
-        continue;  // Invalid table: table length is larger than whole cmap data
-                   // size.
-      }
-      if (language != 0) {
-        // Unsupported or invalid table: this is either a subtable for the
-        // Macintosh platform (which we don't support), or an invalid subtable
-        // since language field should be zero for non-Macintosh subtables.
-        continue;
-      }
-      const uint8_t priority = getTablePriority(platformId, encodingId);
-      if (priority < bestTablePriority) {
-        bestTableOffset = offset;
-        bestTablePriority = priority;
-        bestTableFormat = format;
-      }
-    }
-    if (*has_cmap_format14_subtable &&
-        bestTablePriority == 0 /* highest priority */) {
-      // Already found the highest priority table and variation sequences table.
-      // No need to look at remaining tables.
-      break;
-    }
-  }
-  if (bestTableOffset == kInvalidOffset) {
-    return SparseBitSet();
-  }
-  const uint8_t* tableData = cmap_data + bestTableOffset;
-  const size_t tableSize = cmap_size - bestTableOffset;
-  vector<uint32_t> coverageVec;
-  bool success;
-  if (bestTableFormat == 4) {
-    success = getCoverageFormat4(coverageVec, tableData, tableSize);
-  } else {
-    success = getCoverageFormat12(coverageVec, tableData, tableSize);
-  }
-  if (success && (coverageVec.size() != 0)) {
-    return SparseBitSet(&coverageVec.front(), coverageVec.size() >> 1);
-  } else {
-    return SparseBitSet();
-  }
-}
-
-}  // namespace minikin
diff --git a/third_party/txt/src/minikin/CmapCoverage.h b/third_party/txt/src/minikin/CmapCoverage.h
deleted file mode 100644
index 9ca72715a6719d3875857a2cb309b1c7266abf4c..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/CmapCoverage.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef MINIKIN_CMAP_COVERAGE_H
-#define MINIKIN_CMAP_COVERAGE_H
-
-#include <minikin/SparseBitSet.h>
-
-namespace minikin {
-
-class CmapCoverage {
- public:
-  static SparseBitSet getCoverage(const uint8_t* cmap_data,
-                                  size_t cmap_size,
-                                  bool* has_cmap_format14_subtable);
-};
-
-}  // namespace minikin
-
-#endif  // MINIKIN_CMAP_COVERAGE_H
diff --git a/third_party/txt/src/minikin/Emoji.cpp b/third_party/txt/src/minikin/Emoji.cpp
deleted file mode 100644
index 3f974052bce489b7646a87ce895e66979efdf300..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/Emoji.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <minikin/Emoji.h>
-
-namespace minikin {
-
-bool isEmoji(uint32_t c) {
-  return u_hasBinaryProperty(c, UCHAR_EMOJI);
-}
-
-bool isEmojiModifier(uint32_t c) {
-  return u_hasBinaryProperty(c, UCHAR_EMOJI_MODIFIER);
-}
-
-bool isEmojiBase(uint32_t c) {
-  // These two characters were removed from Emoji_Modifier_Base in Emoji 4.0,
-  // but we need to keep them as emoji modifier bases since there are fonts and
-  // user-generated text out there that treats these as potential emoji bases.
-  if (c == 0x1F91D || c == 0x1F93C) {
-    return true;
-  }
-  return u_hasBinaryProperty(c, UCHAR_EMOJI_MODIFIER_BASE);
-}
-
-UCharDirection emojiBidiOverride(const void* /* context */, UChar32 c) {
-  return u_charDirection(c);
-}
-
-}  // namespace minikin
diff --git a/third_party/txt/src/minikin/Emoji.h b/third_party/txt/src/minikin/Emoji.h
deleted file mode 100644
index 046a9d60283e63ef3813d2f05e89e51660c9a040..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/Emoji.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <unicode/uchar.h>
-
-namespace minikin {
-
-// Returns true if c is emoji.
-bool isEmoji(uint32_t c);
-
-// Returns true if c is emoji modifier base.
-bool isEmojiBase(uint32_t c);
-
-// Returns true if c is emoji modifier.
-bool isEmojiModifier(uint32_t c);
-
-// Bidi override for ICU that knows about new emoji.
-UCharDirection emojiBidiOverride(const void* context, UChar32 c);
-
-}  // namespace minikin
diff --git a/third_party/txt/src/minikin/FontCollection.cpp b/third_party/txt/src/minikin/FontCollection.cpp
deleted file mode 100644
index 91d1ac295cdc108ffdf98da04a93729188f7f120..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/FontCollection.cpp
+++ /dev/null
@@ -1,582 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// #define VERBOSE_DEBUG
-
-#define LOG_TAG "Minikin"
-
-#include <algorithm>
-
-#include <log/log.h>
-#include "unicode/unistr.h"
-#include "unicode/unorm2.h"
-#include "unicode/utf16.h"
-
-#include <minikin/Emoji.h>
-#include <minikin/FontCollection.h>
-#include "FontLanguage.h"
-#include "FontLanguageListCache.h"
-#include "MinikinInternal.h"
-
-using std::vector;
-
-namespace minikin {
-
-template <typename T>
-static inline T max(T a, T b) {
-  return a > b ? a : b;
-}
-
-const uint32_t EMOJI_STYLE_VS = 0xFE0F;
-const uint32_t TEXT_STYLE_VS = 0xFE0E;
-
-uint32_t FontCollection::sNextId = 0;
-
-// libtxt: return a locale string for a language list ID
-std::string GetFontLocale(uint32_t langListId) {
-  const FontLanguages& langs = FontLanguageListCache::getById(langListId);
-  return langs.size() ? langs[0].getString() : "";
-}
-
-std::shared_ptr<minikin::FontCollection> FontCollection::Create(
-    const std::vector<std::shared_ptr<FontFamily>>& typefaces) {
-  std::shared_ptr<minikin::FontCollection> font_collection(
-      new minikin::FontCollection());
-  if (!font_collection || !font_collection->init(typefaces)) {
-    return nullptr;
-  }
-  return font_collection;
-}
-
-FontCollection::FontCollection() : mMaxChar(0) {}
-
-bool FontCollection::init(
-    const std::vector<std::shared_ptr<FontFamily>>& typefaces) {
-  std::scoped_lock _l(gMinikinLock);
-  mId = sNextId++;
-  vector<uint32_t> lastChar;
-  size_t nTypefaces = typefaces.size();
-#ifdef VERBOSE_DEBUG
-  ALOGD("nTypefaces = %zd\n", nTypefaces);
-#endif
-  const FontStyle defaultStyle;
-  for (size_t i = 0; i < nTypefaces; i++) {
-    const std::shared_ptr<FontFamily>& family = typefaces[i];
-    if (family->getClosestMatch(defaultStyle).font == nullptr) {
-      continue;
-    }
-    const SparseBitSet& coverage = family->getCoverage();
-    mFamilies.push_back(family);  // emplace_back would be better
-    if (family->hasVSTable()) {
-      mVSFamilyVec.push_back(family);
-    }
-    mMaxChar = max(mMaxChar, coverage.length());
-    lastChar.push_back(coverage.nextSetBit(0));
-
-    const std::unordered_set<AxisTag>& supportedAxes = family->supportedAxes();
-    mSupportedAxes.insert(supportedAxes.begin(), supportedAxes.end());
-  }
-  nTypefaces = mFamilies.size();
-  if (nTypefaces == 0) {
-    ALOGE("Font collection must have at least one valid typeface.");
-    return false;
-  }
-  if (nTypefaces > 254) {
-    ALOGE("Font collection may only have up to 254 font families.");
-    return false;
-  }
-  size_t nPages = (mMaxChar + kPageMask) >> kLogCharsPerPage;
-  // TODO: Use variation selector map for mRanges construction.
-  // A font can have a glyph for a base code point and variation selector pair
-  // but no glyph for the base code point without variation selector. The family
-  // won't be listed in the range in this case.
-  for (size_t i = 0; i < nPages; i++) {
-    Range dummy;
-    mRanges.push_back(dummy);
-    Range* range = &mRanges.back();
-#ifdef VERBOSE_DEBUG
-    ALOGD("i=%zd: range start = %zd\n", i, offset);
-#endif
-    range->start = mFamilyVec.size();
-    for (size_t j = 0; j < nTypefaces; j++) {
-      if (lastChar[j] < (i + 1) << kLogCharsPerPage) {
-        const std::shared_ptr<FontFamily>& family = mFamilies[j];
-        mFamilyVec.push_back(static_cast<uint8_t>(j));
-        uint32_t nextChar =
-            family->getCoverage().nextSetBit((i + 1) << kLogCharsPerPage);
-#ifdef VERBOSE_DEBUG
-        ALOGD("nextChar = %d (j = %zd)\n", nextChar, j);
-#endif
-        lastChar[j] = nextChar;
-      }
-    }
-    range->end = mFamilyVec.size();
-  }
-
-  if (mFamilyVec.size() >= 0xFFFF) {
-    ALOGE("Exceeded the maximum indexable cmap coverage.");
-    return false;
-  }
-  return true;
-}
-
-// Special scores for the font fallback.
-const uint32_t kUnsupportedFontScore = 0;
-const uint32_t kFirstFontScore = UINT32_MAX;
-
-// Calculates a font score.
-// The score of the font family is based on three subscores.
-//  - Coverage Score: How well the font family covers the given character or
-//  variation sequence.
-//  - Language Score: How well the font family is appropriate for the language.
-//  - Variant Score: Whether the font family matches the variant. Note that this
-//  variant is not the
-//    one in BCP47. This is our own font variant (e.g., elegant, compact).
-//
-// Then, there is a priority for these three subscores as follow:
-//   Coverage Score > Language Score > Variant Score
-// The returned score reflects this priority order.
-//
-// Note that there are two special scores.
-//  - kUnsupportedFontScore: When the font family doesn't support the variation
-//  sequence or even its
-//    base character.
-//  - kFirstFontScore: When the font is the first font family in the collection
-//  and it supports the
-//    given character or variation sequence.
-uint32_t FontCollection::calcFamilyScore(
-    uint32_t ch,
-    uint32_t vs,
-    int variant,
-    uint32_t langListId,
-    const std::shared_ptr<FontFamily>& fontFamily) const {
-  const uint32_t coverageScore = calcCoverageScore(ch, vs, fontFamily);
-  if (coverageScore == kFirstFontScore ||
-      coverageScore == kUnsupportedFontScore) {
-    // No need to calculate other scores.
-    return coverageScore;
-  }
-
-  const uint32_t languageScore =
-      calcLanguageMatchingScore(langListId, *fontFamily);
-  const uint32_t variantScore = calcVariantMatchingScore(variant, *fontFamily);
-
-  // Subscores are encoded into 31 bits representation to meet the subscore
-  // priority. The highest 2 bits are for coverage score, then following 28 bits
-  // are for language score, then the last 1 bit is for variant score.
-  return coverageScore << 29 | languageScore << 1 | variantScore;
-}
-
-// Calculates a font score based on variation sequence coverage.
-// - Returns kUnsupportedFontScore if the font doesn't support the variation
-// sequence or its base
-//   character.
-// - Returns kFirstFontScore if the font family is the first font family in the
-// collection and it
-//   supports the given character or variation sequence.
-// - Returns 3 if the font family supports the variation sequence.
-// - Returns 2 if the vs is a color variation selector (U+FE0F) and if the font
-// is an emoji font.
-// - Returns 2 if the vs is a text variation selector (U+FE0E) and if the font
-// is not an emoji font.
-// - Returns 1 if the variation selector is not specified or if the font family
-// only supports the
-//   variation sequence's base character.
-uint32_t FontCollection::calcCoverageScore(
-    uint32_t ch,
-    uint32_t vs,
-    const std::shared_ptr<FontFamily>& fontFamily) const {
-  const bool hasVSGlyph = (vs != 0) && fontFamily->hasGlyph(ch, vs);
-  if (!hasVSGlyph && !fontFamily->getCoverage().get(ch)) {
-    // The font doesn't support either variation sequence or even the base
-    // character.
-    return kUnsupportedFontScore;
-  }
-
-  if ((vs == 0 || hasVSGlyph) && mFamilies[0] == fontFamily) {
-    // If the first font family supports the given character or variation
-    // sequence, always use it.
-    return kFirstFontScore;
-  }
-
-  if (vs == 0) {
-    return 1;
-  }
-
-  if (hasVSGlyph) {
-    return 3;
-  }
-
-  if (vs == EMOJI_STYLE_VS || vs == TEXT_STYLE_VS) {
-    const FontLanguages& langs =
-        FontLanguageListCache::getById(fontFamily->langId());
-    bool hasEmojiFlag = false;
-    for (size_t i = 0; i < langs.size(); ++i) {
-      if (langs[i].getEmojiStyle() == FontLanguage::EMSTYLE_EMOJI) {
-        hasEmojiFlag = true;
-        break;
-      }
-    }
-
-    if (vs == EMOJI_STYLE_VS) {
-      return hasEmojiFlag ? 2 : 1;
-    } else {  // vs == TEXT_STYLE_VS
-      return hasEmojiFlag ? 1 : 2;
-    }
-  }
-  return 1;
-}
-
-// Calculate font scores based on the script matching, subtag matching and
-// primary language matching.
-//
-// 1. If only the font's language matches or there is no matches between
-// requested font and
-//    supported font, then the font obtains a score of 0.
-// 2. Without a match in language, considering subtag may change font's
-// EmojiStyle over script,
-//    a match in subtag gets a score of 2 and a match in scripts gains a score
-//    of 1.
-// 3. Regarding to two elements matchings, language-and-subtag matching has a
-// score of 4, while
-//    language-and-script obtains a socre of 3 with the same reason above.
-//
-// If two languages in the requested list have the same language score, the font
-// matching with higher priority language gets a higher score. For example, in
-// the case the user requested language list is "ja-Jpan,en-Latn". The score of
-// for the font of "ja-Jpan" gets a higher score than the font of "en-Latn".
-//
-// To achieve score calculation with priorities, the language score is
-// determined as follows:
-//   LanguageScore = s(0) * 5^(m - 1) + s(1) * 5^(m - 2) + ... + s(m - 2) * 5 +
-//   s(m - 1)
-// Here, m is the maximum number of languages to be compared, and s(i) is the
-// i-th language's matching score. The possible values of s(i) are 0, 1, 2, 3
-// and 4.
-uint32_t FontCollection::calcLanguageMatchingScore(
-    uint32_t userLangListId,
-    const FontFamily& fontFamily) {
-  const FontLanguages& langList =
-      FontLanguageListCache::getById(userLangListId);
-  const FontLanguages& fontLanguages =
-      FontLanguageListCache::getById(fontFamily.langId());
-
-  const size_t maxCompareNum = std::min(langList.size(), FONT_LANGUAGES_LIMIT);
-  uint32_t score = 0;
-  for (size_t i = 0; i < maxCompareNum; ++i) {
-    score = score * 5u + langList[i].calcScoreFor(fontLanguages);
-  }
-  return score;
-}
-
-// Calculates a font score based on variant ("compact" or "elegant") matching.
-//  - Returns 1 if the font doesn't have variant or the variant matches with the
-//  text style.
-//  - No score if the font has a variant but it doesn't match with the text
-//  style.
-uint32_t FontCollection::calcVariantMatchingScore(
-    int variant,
-    const FontFamily& fontFamily) {
-  return (fontFamily.variant() == 0 || fontFamily.variant() == variant) ? 1 : 0;
-}
-
-// Implement heuristic for choosing best-match font. Here are the rules:
-// 1. If first font in the collection has the character, it wins.
-// 2. Calculate a score for the font family. See comments in calcFamilyScore for
-// the detail.
-// 3. Highest score wins, with ties resolved to the first font.
-// This method never returns nullptr.
-const std::shared_ptr<FontFamily>& FontCollection::getFamilyForChar(
-    uint32_t ch,
-    uint32_t vs,
-    uint32_t langListId,
-    int variant) const {
-  if (ch >= mMaxChar) {
-    // libtxt: check if the fallback font provider can match this character
-    if (mFallbackFontProvider) {
-      const std::shared_ptr<FontFamily>& fallback =
-          findFallbackFont(ch, vs, langListId);
-      if (fallback) {
-        return fallback;
-      }
-    }
-    return mFamilies[0];
-  }
-
-  Range range = mRanges[ch >> kLogCharsPerPage];
-
-  if (vs != 0) {
-    range = {0, static_cast<uint16_t>(mFamilies.size())};
-  }
-
-#ifdef VERBOSE_DEBUG
-  ALOGD("querying range %zd:%zd\n", range.start, range.end);
-#endif
-  int bestFamilyIndex = -1;
-  uint32_t bestScore = kUnsupportedFontScore;
-  for (size_t i = range.start; i < range.end; i++) {
-    const std::shared_ptr<FontFamily>& family =
-        vs == 0 ? mFamilies[mFamilyVec[i]] : mFamilies[i];
-    const uint32_t score = calcFamilyScore(ch, vs, variant, langListId, family);
-    if (score == kFirstFontScore) {
-      // If the first font family supports the given character or variation
-      // sequence, always use it.
-      return family;
-    }
-    if (score > bestScore) {
-      bestScore = score;
-      bestFamilyIndex = i;
-    }
-  }
-  if (bestFamilyIndex == -1) {
-    // libtxt: check if the fallback font provider can match this character
-    if (mFallbackFontProvider) {
-      const std::shared_ptr<FontFamily>& fallback =
-          findFallbackFont(ch, vs, langListId);
-      if (fallback) {
-        return fallback;
-      }
-    }
-
-    UErrorCode errorCode = U_ZERO_ERROR;
-    const UNormalizer2* normalizer = unorm2_getNFDInstance(&errorCode);
-    if (U_SUCCESS(errorCode)) {
-      UChar decomposed[4];
-      int len =
-          unorm2_getRawDecomposition(normalizer, ch, decomposed, 4, &errorCode);
-      if (U_SUCCESS(errorCode) && len > 0) {
-        int off = 0;
-        U16_NEXT_UNSAFE(decomposed, off, ch);
-        return getFamilyForChar(ch, vs, langListId, variant);
-      }
-    }
-    return mFamilies[0];
-  }
-  return vs == 0 ? mFamilies[mFamilyVec[bestFamilyIndex]]
-                 : mFamilies[bestFamilyIndex];
-}
-
-const std::shared_ptr<FontFamily>& FontCollection::findFallbackFont(
-    uint32_t ch,
-    uint32_t vs,
-    uint32_t langListId) const {
-  std::string locale = GetFontLocale(langListId);
-
-  const auto it = mCachedFallbackFamilies.find(locale);
-  if (it != mCachedFallbackFamilies.end()) {
-    for (const auto& fallbackFamily : it->second) {
-      if (calcCoverageScore(ch, vs, fallbackFamily)) {
-        return fallbackFamily;
-      }
-    }
-  }
-
-  const std::shared_ptr<FontFamily>& fallback =
-      mFallbackFontProvider->matchFallbackFont(ch, GetFontLocale(langListId));
-
-  if (fallback) {
-    mCachedFallbackFamilies[locale].push_back(fallback);
-  }
-  return fallback;
-}
-
-const uint32_t NBSP = 0x00A0;
-const uint32_t SOFT_HYPHEN = 0x00AD;
-const uint32_t ZWJ = 0x200C;
-const uint32_t ZWNJ = 0x200D;
-const uint32_t HYPHEN = 0x2010;
-const uint32_t NB_HYPHEN = 0x2011;
-const uint32_t NNBSP = 0x202F;
-const uint32_t FEMALE_SIGN = 0x2640;
-const uint32_t MALE_SIGN = 0x2642;
-const uint32_t STAFF_OF_AESCULAPIUS = 0x2695;
-
-// Characters where we want to continue using existing font run instead of
-// recomputing the best match in the fallback list.
-static const uint32_t stickyAllowlist[] = {
-    '!',   ',',         '-',       '.',
-    ':',   ';',         '?',       NBSP,
-    ZWJ,   ZWNJ,        HYPHEN,    NB_HYPHEN,
-    NNBSP, FEMALE_SIGN, MALE_SIGN, STAFF_OF_AESCULAPIUS};
-
-static bool isStickyAllowed(uint32_t c) {
-  for (size_t i = 0; i < sizeof(stickyAllowlist) / sizeof(stickyAllowlist[0]);
-       i++) {
-    if (stickyAllowlist[i] == c)
-      return true;
-  }
-  return false;
-}
-
-static bool isVariationSelector(uint32_t c) {
-  return (0xFE00 <= c && c <= 0xFE0F) || (0xE0100 <= c && c <= 0xE01EF);
-}
-
-bool FontCollection::hasVariationSelector(uint32_t baseCodepoint,
-                                          uint32_t variationSelector) const {
-  if (!isVariationSelector(variationSelector)) {
-    return false;
-  }
-  if (baseCodepoint >= mMaxChar) {
-    return false;
-  }
-
-  std::scoped_lock _l(gMinikinLock);
-
-  // Currently mRanges can not be used here since it isn't aware of the
-  // variation sequence.
-  for (size_t i = 0; i < mVSFamilyVec.size(); i++) {
-    if (mVSFamilyVec[i]->hasGlyph(baseCodepoint, variationSelector)) {
-      return true;
-    }
-  }
-
-  // Even if there is no cmap format 14 subtable entry for the given sequence,
-  // should return true for <char, text presentation selector> case since we
-  // have special fallback rule for the sequence. Note that we don't need to
-  // restrict this to already standardized variation sequences, since Unicode is
-  // adding variation sequences more frequently now and may even move towards
-  // allowing text and emoji variation selectors on any character.
-  if (variationSelector == TEXT_STYLE_VS) {
-    for (size_t i = 0; i < mFamilies.size(); ++i) {
-      if (!mFamilies[i]->isColorEmojiFamily() &&
-          mFamilies[i]->hasGlyph(baseCodepoint, 0)) {
-        return true;
-      }
-    }
-  }
-
-  return false;
-}
-
-void FontCollection::itemize(const uint16_t* string,
-                             size_t string_size,
-                             FontStyle style,
-                             vector<Run>* result) const {
-  const uint32_t langListId = style.getLanguageListId();
-  int variant = style.getVariant();
-  const FontFamily* lastFamily = nullptr;
-  Run* run = NULL;
-
-  if (string_size == 0) {
-    return;
-  }
-
-  const uint32_t kEndOfString = 0xFFFFFFFF;
-
-  uint32_t nextCh = 0;
-  uint32_t prevCh = 0;
-  size_t nextUtf16Pos = 0;
-  size_t readLength = 0;
-  U16_NEXT(string, readLength, string_size, nextCh);
-
-  do {
-    const uint32_t ch = nextCh;
-    const size_t utf16Pos = nextUtf16Pos;
-    nextUtf16Pos = readLength;
-    if (readLength < string_size) {
-      U16_NEXT(string, readLength, string_size, nextCh);
-    } else {
-      nextCh = kEndOfString;
-    }
-
-    bool shouldContinueRun = false;
-    if (lastFamily != nullptr) {
-      if (isStickyAllowed(ch)) {
-        // Continue using existing font as long as it has coverage and is
-        // allowed.
-        shouldContinueRun = lastFamily->getCoverage().get(ch);
-      } else if (ch == SOFT_HYPHEN || isVariationSelector(ch)) {
-        // Always continue if the character is the soft hyphen or a variation
-        // selector.
-        shouldContinueRun = true;
-      }
-    }
-
-    if (!shouldContinueRun) {
-      const std::shared_ptr<FontFamily>& family = getFamilyForChar(
-          ch, isVariationSelector(nextCh) ? nextCh : 0, langListId, variant);
-      if (utf16Pos == 0 || family.get() != lastFamily) {
-        size_t start = utf16Pos;
-        // Workaround for combining marks and emoji modifiers until we implement
-        // per-cluster font selection: if a combining mark or an emoji modifier
-        // is found in a different font that also supports the previous
-        // character, attach previous character to the new run. U+20E3 COMBINING
-        // ENCLOSING KEYCAP, used in emoji, is handled properly by this since
-        // it's a combining mark too.
-        if (utf16Pos != 0 &&
-            ((U_GET_GC_MASK(ch) & U_GC_M_MASK) != 0 ||
-             (isEmojiModifier(ch) && isEmojiBase(prevCh))) &&
-            family != nullptr && family->getCoverage().get(prevCh)) {
-          const size_t prevChLength = U16_LENGTH(prevCh);
-          run->end -= prevChLength;
-          if (run->start == run->end) {
-            result->pop_back();
-          }
-          start -= prevChLength;
-        }
-        result->push_back(
-            {family->getClosestMatch(style), static_cast<int>(start), 0});
-        run = &result->back();
-        lastFamily = family.get();
-      }
-    }
-    prevCh = ch;
-    run->end = nextUtf16Pos;  // exclusive
-  } while (nextCh != kEndOfString);
-}
-
-FakedFont FontCollection::baseFontFaked(FontStyle style) {
-  return mFamilies[0]->getClosestMatch(style);
-}
-
-std::shared_ptr<FontCollection> FontCollection::createCollectionWithVariation(
-    const std::vector<FontVariation>& variations) {
-  if (variations.empty() || mSupportedAxes.empty()) {
-    return nullptr;
-  }
-
-  bool hasSupportedAxis = false;
-  for (const FontVariation& variation : variations) {
-    if (mSupportedAxes.find(variation.axisTag) != mSupportedAxes.end()) {
-      hasSupportedAxis = true;
-      break;
-    }
-  }
-  if (!hasSupportedAxis) {
-    // None of variation axes are supported by this font collection.
-    return nullptr;
-  }
-
-  std::vector<std::shared_ptr<FontFamily>> families;
-  for (const std::shared_ptr<FontFamily>& family : mFamilies) {
-    std::shared_ptr<FontFamily> newFamily =
-        family->createFamilyWithVariation(variations);
-    if (newFamily) {
-      families.push_back(newFamily);
-    } else {
-      families.push_back(family);
-    }
-  }
-
-  return FontCollection::Create(std::move(families));
-}
-
-uint32_t FontCollection::getId() const {
-  return mId;
-}
-
-}  // namespace minikin
diff --git a/third_party/txt/src/minikin/FontCollection.h b/third_party/txt/src/minikin/FontCollection.h
deleted file mode 100644
index 85ca1f4b866191c96d15f6312cc7754ec67c3f09..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/FontCollection.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef MINIKIN_FONT_COLLECTION_H
-#define MINIKIN_FONT_COLLECTION_H
-
-#include <map>
-#include <memory>
-#include <unordered_set>
-#include <vector>
-
-#include <minikin/FontFamily.h>
-#include <minikin/MinikinFont.h>
-
-namespace minikin {
-
-class FontCollection {
- private:
-  explicit FontCollection();
-
- public:
-  static std::shared_ptr<minikin::FontCollection> Create(
-      const std::vector<std::shared_ptr<FontFamily>>& typefaces);
-
-  // libtxt extension: an interface for looking up fallback fonts for characters
-  // that do not match this collection's font families.
-  class FallbackFontProvider {
-   public:
-    virtual ~FallbackFontProvider() = default;
-    virtual const std::shared_ptr<FontFamily>& matchFallbackFont(
-        uint32_t ch,
-        std::string locale) = 0;
-  };
-
-  struct Run {
-    FakedFont fakedFont;
-    int start;
-    int end;
-  };
-
-  void itemize(const uint16_t* string,
-               size_t string_length,
-               FontStyle style,
-               std::vector<Run>* result) const;
-
-  // Returns true if there is a glyph for the code point and variation selector
-  // pair. Returns false if no fonts have a glyph for the code point and
-  // variation selector pair, or invalid variation selector is passed.
-  bool hasVariationSelector(uint32_t baseCodepoint,
-                            uint32_t variationSelector) const;
-
-  // Get base font with fakery information (fake bold could affect metrics)
-  FakedFont baseFontFaked(FontStyle style);
-
-  // Creates new FontCollection based on this collection while applying font
-  // variations. Returns nullptr if none of variations apply to this collection.
-  std::shared_ptr<FontCollection> createCollectionWithVariation(
-      const std::vector<FontVariation>& variations);
-
-  const std::unordered_set<AxisTag>& getSupportedTags() const {
-    return mSupportedAxes;
-  }
-
-  uint32_t getId() const;
-
-  void set_fallback_font_provider(std::unique_ptr<FallbackFontProvider> ffp) {
-    mFallbackFontProvider = std::move(ffp);
-  }
-
- private:
-  static const int kLogCharsPerPage = 8;
-  static const int kPageMask = (1 << kLogCharsPerPage) - 1;
-
-  // mFamilyVec holds the indices of the mFamilies and mRanges holds the range
-  // of indices of mFamilyVec. The maximum number of pages is 0x10FF (U+10FFFF
-  // >> 8). The maximum number of the fonts is 0xFF. Thus, technically the
-  // maximum length of mFamilyVec is 0x10EE01 (0x10FF * 0xFF). However, in
-  // practice, 16-bit integers are enough since most fonts supports only limited
-  // range of code points.
-  struct Range {
-    uint16_t start;
-    uint16_t end;
-  };
-
-  // Initialize the FontCollection.
-  bool init(const std::vector<std::shared_ptr<FontFamily>>& typefaces);
-
-  const std::shared_ptr<FontFamily>& getFamilyForChar(uint32_t ch,
-                                                      uint32_t vs,
-                                                      uint32_t langListId,
-                                                      int variant) const;
-
-  const std::shared_ptr<FontFamily>&
-  findFallbackFont(uint32_t ch, uint32_t vs, uint32_t langListId) const;
-
-  uint32_t calcFamilyScore(uint32_t ch,
-                           uint32_t vs,
-                           int variant,
-                           uint32_t langListId,
-                           const std::shared_ptr<FontFamily>& fontFamily) const;
-
-  uint32_t calcCoverageScore(
-      uint32_t ch,
-      uint32_t vs,
-      const std::shared_ptr<FontFamily>& fontFamily) const;
-
-  static uint32_t calcLanguageMatchingScore(uint32_t userLangListId,
-                                            const FontFamily& fontFamily);
-
-  static uint32_t calcVariantMatchingScore(int variant,
-                                           const FontFamily& fontFamily);
-
-  // static for allocating unique id's
-  static uint32_t sNextId;
-
-  // unique id for this font collection (suitable for cache key)
-  uint32_t mId;
-
-  // Highest UTF-32 code point that can be mapped
-  uint32_t mMaxChar;
-
-  // This vector has pointers to the all font family instances in this
-  // collection. This vector can't be empty.
-  std::vector<std::shared_ptr<FontFamily>> mFamilies;
-
-  // Following two vectors are pre-calculated tables for resolving coverage
-  // faster. For example, to iterate over all fonts which support Unicode code
-  // point U+XXYYZZ, iterate font families index from
-  // mFamilyVec[mRanges[0xXXYY].start] to mFamilyVec[mRange[0xXXYY].end] instead
-  // of whole mFamilies. This vector contains indices into mFamilies. This
-  // vector can't be empty.
-  std::vector<Range> mRanges;
-  std::vector<uint8_t> mFamilyVec;
-
-  // This vector has pointers to the font family instances which have cmap 14
-  // subtables.
-  std::vector<std::shared_ptr<FontFamily>> mVSFamilyVec;
-
-  // Set of supported axes in this collection.
-  std::unordered_set<AxisTag> mSupportedAxes;
-
-  // libtxt extension: Fallback font provider.
-  std::unique_ptr<FallbackFontProvider> mFallbackFontProvider;
-
-  // libtxt extension: Fallback fonts discovered after this font collection
-  // was constructed.
-  mutable std::map<std::string, std::vector<std::shared_ptr<FontFamily>>>
-      mCachedFallbackFamilies;
-};
-
-}  // namespace minikin
-
-#endif  // MINIKIN_FONT_COLLECTION_H
diff --git a/third_party/txt/src/minikin/FontFamily.cpp b/third_party/txt/src/minikin/FontFamily.cpp
deleted file mode 100644
index cf5a623c5613258a8ef2b40cf90c484a42075ed8..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/FontFamily.cpp
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "Minikin"
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <log/log.h>
-#include <utils/JenkinsHash.h>
-
-#include <hb-ot.h>
-#include <hb.h>
-
-#include <minikin/CmapCoverage.h>
-#include <minikin/FontFamily.h>
-#include <minikin/MinikinFont.h>
-#include "FontLanguage.h"
-#include "FontLanguageListCache.h"
-#include "FontUtils.h"
-#include "HbFontCache.h"
-#include "MinikinInternal.h"
-
-using std::vector;
-
-namespace minikin {
-
-FontStyle::FontStyle(int variant, int weight, bool italic)
-    : FontStyle(FontLanguageListCache::kEmptyListId, variant, weight, italic) {}
-
-FontStyle::FontStyle(uint32_t languageListId,
-                     int variant,
-                     int weight,
-                     bool italic)
-    : bits(pack(variant, weight, italic)), mLanguageListId(languageListId) {}
-
-android::hash_t FontStyle::hash() const {
-  uint32_t hash = android::JenkinsHashMix(0, bits);
-  hash = android::JenkinsHashMix(hash, mLanguageListId);
-  return android::JenkinsHashWhiten(hash);
-}
-
-// static
-uint32_t FontStyle::registerLanguageList(const std::string& languages) {
-  std::scoped_lock _l(gMinikinLock);
-  return FontLanguageListCache::getId(languages);
-}
-
-// static
-uint32_t FontStyle::pack(int variant, int weight, bool italic) {
-  return (weight & kWeightMask) | (italic ? kItalicMask : 0) |
-         (variant << kVariantShift);
-}
-
-Font::Font(const std::shared_ptr<MinikinFont>& typeface, FontStyle style)
-    : typeface(typeface), style(style) {}
-
-Font::Font(std::shared_ptr<MinikinFont>&& typeface, FontStyle style)
-    : typeface(typeface), style(style) {}
-
-std::unordered_set<AxisTag> Font::getSupportedAxesLocked() const {
-  const uint32_t fvarTag = MinikinFont::MakeTag('f', 'v', 'a', 'r');
-  HbBlob fvarTable(getFontTable(typeface.get(), fvarTag));
-  if (fvarTable.size() == 0) {
-    return std::unordered_set<AxisTag>();
-  }
-
-  std::unordered_set<AxisTag> supportedAxes;
-  analyzeAxes(fvarTable.get(), fvarTable.size(), &supportedAxes);
-  return supportedAxes;
-}
-
-Font::Font(Font&& o) {
-  typeface = std::move(o.typeface);
-  style = o.style;
-  o.typeface = nullptr;
-}
-
-Font::Font(const Font& o) {
-  typeface = o.typeface;
-  style = o.style;
-}
-
-// static
-FontFamily::FontFamily(std::vector<Font>&& fonts)
-    : FontFamily(0 /* variant */, std::move(fonts)) {}
-
-FontFamily::FontFamily(int variant, std::vector<Font>&& fonts)
-    : FontFamily(FontLanguageListCache::kEmptyListId,
-                 variant,
-                 std::move(fonts)) {}
-
-FontFamily::FontFamily(uint32_t langId, int variant, std::vector<Font>&& fonts)
-    : mLangId(langId),
-      mVariant(variant),
-      mFonts(std::move(fonts)),
-      mHasVSTable(false) {
-  computeCoverage();
-}
-
-bool FontFamily::analyzeStyle(const std::shared_ptr<MinikinFont>& typeface,
-                              int* weight,
-                              bool* italic) {
-  std::scoped_lock _l(gMinikinLock);
-  const uint32_t os2Tag = MinikinFont::MakeTag('O', 'S', '/', '2');
-  HbBlob os2Table(getFontTable(typeface.get(), os2Tag));
-  if (os2Table.get() == nullptr)
-    return false;
-  return ::minikin::analyzeStyle(os2Table.get(), os2Table.size(), weight,
-                                 italic);
-}
-
-// Compute a matching metric between two styles - 0 is an exact match
-static int computeMatch(FontStyle style1, FontStyle style2) {
-  if (style1 == style2)
-    return 0;
-  int score = abs(style1.getWeight() - style2.getWeight());
-  if (style1.getItalic() != style2.getItalic()) {
-    score += 2;
-  }
-  return score;
-}
-
-static FontFakery computeFakery(FontStyle wanted, FontStyle actual) {
-  // If desired weight is semibold or darker, and 2 or more grades
-  // higher than actual (for example, medium 500 -> bold 700), then
-  // select fake bold.
-  int wantedWeight = wanted.getWeight();
-  bool isFakeBold =
-      wantedWeight >= 6 && (wantedWeight - actual.getWeight()) >= 2;
-  bool isFakeItalic = wanted.getItalic() && !actual.getItalic();
-  return FontFakery(isFakeBold, isFakeItalic);
-}
-
-FakedFont FontFamily::getClosestMatch(FontStyle style) const {
-  const Font* bestFont = nullptr;
-  int bestMatch = 0;
-  for (size_t i = 0; i < mFonts.size(); i++) {
-    const Font& font = mFonts[i];
-    int match = computeMatch(font.style, style);
-    if (i == 0 || match < bestMatch) {
-      bestFont = &font;
-      bestMatch = match;
-    }
-  }
-  if (bestFont != nullptr) {
-    return FakedFont{bestFont->typeface.get(),
-                     computeFakery(style, bestFont->style)};
-  }
-  return FakedFont{nullptr, FontFakery()};
-}
-
-bool FontFamily::isColorEmojiFamily() const {
-  const FontLanguages& languageList = FontLanguageListCache::getById(mLangId);
-  for (size_t i = 0; i < languageList.size(); ++i) {
-    if (languageList[i].getEmojiStyle() == FontLanguage::EMSTYLE_EMOJI) {
-      return true;
-    }
-  }
-  return false;
-}
-
-void FontFamily::computeCoverage() {
-  std::scoped_lock _l(gMinikinLock);
-  const FontStyle defaultStyle;
-  const MinikinFont* typeface = getClosestMatch(defaultStyle).font;
-  const uint32_t cmapTag = MinikinFont::MakeTag('c', 'm', 'a', 'p');
-  HbBlob cmapTable(getFontTable(typeface, cmapTag));
-  if (cmapTable.get() == nullptr) {
-    // Missing or corrupt font cmap table; bail out.
-    // The cmap table maps charcodes to glyph indices in a font.
-    return;
-  }
-  mCoverage = CmapCoverage::getCoverage(cmapTable.get(), cmapTable.size(),
-                                        &mHasVSTable);
-
-  for (size_t i = 0; i < mFonts.size(); ++i) {
-    std::unordered_set<AxisTag> supportedAxes =
-        mFonts[i].getSupportedAxesLocked();
-    mSupportedAxes.insert(supportedAxes.begin(), supportedAxes.end());
-  }
-}
-
-bool FontFamily::hasGlyph(uint32_t codepoint,
-                          uint32_t variationSelector) const {
-  assertMinikinLocked();
-  if (variationSelector != 0 && !mHasVSTable) {
-    // Early exit if the variation selector is specified but the font doesn't
-    // have a cmap format 14 subtable.
-    return false;
-  }
-
-  const FontStyle defaultStyle;
-  hb_font_t* font = getHbFontLocked(getClosestMatch(defaultStyle).font);
-  uint32_t unusedGlyph;
-  bool result =
-      hb_font_get_glyph(font, codepoint, variationSelector, &unusedGlyph);
-  hb_font_destroy(font);
-  return result;
-}
-
-std::shared_ptr<FontFamily> FontFamily::createFamilyWithVariation(
-    const std::vector<FontVariation>& variations) const {
-  if (variations.empty() || mSupportedAxes.empty()) {
-    return nullptr;
-  }
-
-  bool hasSupportedAxis = false;
-  for (const FontVariation& variation : variations) {
-    if (mSupportedAxes.find(variation.axisTag) != mSupportedAxes.end()) {
-      hasSupportedAxis = true;
-      break;
-    }
-  }
-  if (!hasSupportedAxis) {
-    // None of variation axes are suppored by this family.
-    return nullptr;
-  }
-
-  std::vector<Font> fonts;
-  for (const Font& font : mFonts) {
-    bool supportedVariations = false;
-    std::scoped_lock _l(gMinikinLock);
-    std::unordered_set<AxisTag> supportedAxes = font.getSupportedAxesLocked();
-    if (!supportedAxes.empty()) {
-      for (const FontVariation& variation : variations) {
-        if (supportedAxes.find(variation.axisTag) != supportedAxes.end()) {
-          supportedVariations = true;
-          break;
-        }
-      }
-    }
-    std::shared_ptr<MinikinFont> minikinFont;
-    if (supportedVariations) {
-      minikinFont = font.typeface->createFontWithVariation(variations);
-    }
-    if (minikinFont == nullptr) {
-      minikinFont = font.typeface;
-    }
-    fonts.push_back(Font(std::move(minikinFont), font.style));
-  }
-
-  return std::shared_ptr<FontFamily>(
-      new FontFamily(mLangId, mVariant, std::move(fonts)));
-}
-
-}  // namespace minikin
diff --git a/third_party/txt/src/minikin/FontFamily.h b/third_party/txt/src/minikin/FontFamily.h
deleted file mode 100644
index b82e80ea222da3d9e66fdae351261ef035d440e4..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/FontFamily.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef MINIKIN_FONT_FAMILY_H
-#define MINIKIN_FONT_FAMILY_H
-
-#include <memory>
-#include <string>
-#include <unordered_set>
-#include <vector>
-
-#include <hb.h>
-
-#include <utils/TypeHelpers.h>
-
-#include <minikin/SparseBitSet.h>
-
-namespace minikin {
-
-class MinikinFont;
-
-// FontStyle represents all style information needed to select an actual font
-// from a collection. The implementation is packed into two 32-bit words
-// so it can be efficiently copied, embedded in other objects, etc.
-class FontStyle {
- public:
-  FontStyle()
-      : FontStyle(0 /* variant */, 4 /* weight */, false /* italic */) {}
-  FontStyle(int weight, bool italic)
-      : FontStyle(0 /* variant */, weight, italic) {}
-  FontStyle(uint32_t langListId)  // NOLINT(google-explicit-constructor)
-      : FontStyle(langListId,
-                  0 /* variant */,
-                  4 /* weight */,
-                  false /* italic */) {}
-
-  FontStyle(int variant, int weight, bool italic);
-  FontStyle(uint32_t langListId, int variant, int weight, bool italic);
-
-  int getWeight() const { return bits & kWeightMask; }
-  bool getItalic() const { return (bits & kItalicMask) != 0; }
-  int getVariant() const { return (bits >> kVariantShift) & kVariantMask; }
-  uint32_t getLanguageListId() const { return mLanguageListId; }
-
-  bool operator==(const FontStyle other) const {
-    return bits == other.bits && mLanguageListId == other.mLanguageListId;
-  }
-
-  android::hash_t hash() const;
-
-  // Looks up a language list from an internal cache and returns its ID.
-  // If the passed language list is not in the cache, registers it and returns
-  // newly assigned ID.
-  static uint32_t registerLanguageList(const std::string& languages);
-
- private:
-  static const uint32_t kWeightMask = (1 << 4) - 1;
-  static const uint32_t kItalicMask = 1 << 4;
-  static const int kVariantShift = 5;
-  static const uint32_t kVariantMask = (1 << 2) - 1;
-
-  static uint32_t pack(int variant, int weight, bool italic);
-
-  uint32_t bits;
-  uint32_t mLanguageListId;
-};
-
-enum FontVariant {
-  VARIANT_DEFAULT = 0,
-  VARIANT_COMPACT = 1,
-  VARIANT_ELEGANT = 2,
-};
-
-inline android::hash_t hash_type(const FontStyle& style) {
-  return style.hash();
-}
-
-// attributes representing transforms (fake bold, fake italic) to match styles
-class FontFakery {
- public:
-  FontFakery() : mFakeBold(false), mFakeItalic(false) {}
-  FontFakery(bool fakeBold, bool fakeItalic)
-      : mFakeBold(fakeBold), mFakeItalic(fakeItalic) {}
-  // TODO: want to support graded fake bolding
-  bool isFakeBold() { return mFakeBold; }
-  bool isFakeItalic() { return mFakeItalic; }
-
- private:
-  bool mFakeBold;
-  bool mFakeItalic;
-};
-
-struct FakedFont {
-  // ownership is the enclosing FontCollection
-  MinikinFont* font;
-  FontFakery fakery;
-};
-
-typedef uint32_t AxisTag;
-
-struct Font {
-  Font(const std::shared_ptr<MinikinFont>& typeface, FontStyle style);
-  Font(std::shared_ptr<MinikinFont>&& typeface, FontStyle style);
-  Font(Font&& o);
-  Font(const Font& o);
-
-  std::shared_ptr<MinikinFont> typeface;
-  FontStyle style;
-
-  std::unordered_set<AxisTag> getSupportedAxesLocked() const;
-};
-
-struct FontVariation {
-  FontVariation(AxisTag axisTag, float value)
-      : axisTag(axisTag), value(value) {}
-  AxisTag axisTag;
-  float value;
-};
-
-class FontFamily {
- public:
-  explicit FontFamily(std::vector<Font>&& fonts);
-  FontFamily(int variant, std::vector<Font>&& fonts);
-  FontFamily(uint32_t langId, int variant, std::vector<Font>&& fonts);
-
-  // TODO: Good to expose FontUtil.h.
-  static bool analyzeStyle(const std::shared_ptr<MinikinFont>& typeface,
-                           int* weight,
-                           bool* italic);
-  FakedFont getClosestMatch(FontStyle style) const;
-
-  uint32_t langId() const { return mLangId; }
-  int variant() const { return mVariant; }
-
-  // API's for enumerating the fonts in a family. These don't guarantee any
-  // particular order
-  size_t getNumFonts() const { return mFonts.size(); }
-  const std::shared_ptr<MinikinFont>& getFont(size_t index) const {
-    return mFonts[index].typeface;
-  }
-  FontStyle getStyle(size_t index) const { return mFonts[index].style; }
-  bool isColorEmojiFamily() const;
-  const std::unordered_set<AxisTag>& supportedAxes() const {
-    return mSupportedAxes;
-  }
-
-  // Get Unicode coverage.
-  const SparseBitSet& getCoverage() const { return mCoverage; }
-
-  // Returns true if the font has a glyph for the code point and variation
-  // selector pair. Caller should acquire a lock before calling the method.
-  bool hasGlyph(uint32_t codepoint, uint32_t variationSelector) const;
-
-  // Returns true if this font family has a variaion sequence table (cmap format
-  // 14 subtable).
-  bool hasVSTable() const { return mHasVSTable; }
-
-  // Creates new FontFamily based on this family while applying font variations.
-  // Returns nullptr if none of variations apply to this family.
-  std::shared_ptr<FontFamily> createFamilyWithVariation(
-      const std::vector<FontVariation>& variations) const;
-
- private:
-  void computeCoverage();
-
-  uint32_t mLangId;
-  int mVariant;
-  std::vector<Font> mFonts;
-  std::unordered_set<AxisTag> mSupportedAxes;
-
-  SparseBitSet mCoverage;
-  bool mHasVSTable;
-
-  // Forbid copying and assignment.
-  FontFamily(const FontFamily&) = delete;
-  void operator=(const FontFamily&) = delete;
-};
-
-}  // namespace minikin
-
-#endif  // MINIKIN_FONT_FAMILY_H
diff --git a/third_party/txt/src/minikin/FontLanguage.cpp b/third_party/txt/src/minikin/FontLanguage.cpp
deleted file mode 100644
index 0576a8340d5ebe32bdc43b3aea397669fe564e30..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/FontLanguage.cpp
+++ /dev/null
@@ -1,368 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "Minikin"
-
-#include "FontLanguage.h"
-
-#include <hb.h>
-#include <string.h>
-#include <unicode/uloc.h>
-#include <algorithm>
-
-namespace minikin {
-
-#define SCRIPT_TAG(c1, c2, c3, c4)                                           \
-  (((uint32_t)(c1)) << 24 | ((uint32_t)(c2)) << 16 | ((uint32_t)(c3)) << 8 | \
-   ((uint32_t)(c4)))
-
-// Check if a language code supports emoji according to its subtag
-static bool isEmojiSubtag(const char* buf,
-                          size_t bufLen,
-                          const char* subtag,
-                          size_t subtagLen) {
-  if (bufLen < subtagLen) {
-    return false;
-  }
-  if (strncmp(buf, subtag, subtagLen) != 0) {
-    return false;  // no match between two strings
-  }
-  return (bufLen == subtagLen || buf[subtagLen] == '\0' ||
-          buf[subtagLen] == '-' || buf[subtagLen] == '_');
-}
-
-// Pack the three letter code into 15 bits and stored to 16 bit integer. The
-// highest bit is 0. For the region code, the letters must be all digits in
-// three letter case, so the number of possible values are 10. For the language
-// code, the letters must be all small alphabets, so the number of possible
-// values are 26. Thus, 5 bits are sufficient for each case and we can pack the
-// three letter language code or region code to 15 bits.
-//
-// In case of two letter code, use fullbit(0x1f) for the first letter instead.
-static uint16_t packLanguageOrRegion(const char* c,
-                                     size_t length,
-                                     uint8_t twoLetterBase,
-                                     uint8_t threeLetterBase) {
-  if (length == 2) {
-    return 0x7c00u |  // 0x1fu << 10
-           (uint16_t)(c[0] - twoLetterBase) << 5 |
-           (uint16_t)(c[1] - twoLetterBase);
-  } else {
-    return ((uint16_t)(c[0] - threeLetterBase) << 10) |
-           (uint16_t)(c[1] - threeLetterBase) << 5 |
-           (uint16_t)(c[2] - threeLetterBase);
-  }
-}
-
-static size_t unpackLanguageOrRegion(uint16_t in,
-                                     char* out,
-                                     uint8_t twoLetterBase,
-                                     uint8_t threeLetterBase) {
-  uint8_t first = (in >> 10) & 0x1f;
-  uint8_t second = (in >> 5) & 0x1f;
-  uint8_t third = in & 0x1f;
-
-  if (first == 0x1f) {
-    out[0] = second + twoLetterBase;
-    out[1] = third + twoLetterBase;
-    return 2;
-  } else {
-    out[0] = first + threeLetterBase;
-    out[1] = second + threeLetterBase;
-    out[2] = third + threeLetterBase;
-    return 3;
-  }
-}
-
-// Find the next '-' or '_' index from startOffset position. If not found,
-// returns bufferLength.
-static size_t nextDelimiterIndex(const char* buffer,
-                                 size_t bufferLength,
-                                 size_t startOffset) {
-  for (size_t i = startOffset; i < bufferLength; ++i) {
-    if (buffer[i] == '-' || buffer[i] == '_') {
-      return i;
-    }
-  }
-  return bufferLength;
-}
-
-static inline bool isLowercase(char c) {
-  return 'a' <= c && c <= 'z';
-}
-
-static inline bool isUppercase(char c) {
-  return 'A' <= c && c <= 'Z';
-}
-
-static inline bool isDigit(char c) {
-  return '0' <= c && c <= '9';
-}
-
-// Returns true if the buffer is valid for language code.
-static inline bool isValidLanguageCode(const char* buffer, size_t length) {
-  if (length != 2 && length != 3)
-    return false;
-  if (!isLowercase(buffer[0]))
-    return false;
-  if (!isLowercase(buffer[1]))
-    return false;
-  if (length == 3 && !isLowercase(buffer[2]))
-    return false;
-  return true;
-}
-
-// Returns true if buffer is valid for script code. The length of buffer must
-// be 4.
-static inline bool isValidScriptCode(const char* buffer) {
-  return isUppercase(buffer[0]) && isLowercase(buffer[1]) &&
-         isLowercase(buffer[2]) && isLowercase(buffer[3]);
-}
-
-// Returns true if the buffer is valid for region code.
-static inline bool isValidRegionCode(const char* buffer, size_t length) {
-  return (length == 2 && isUppercase(buffer[0]) && isUppercase(buffer[1])) ||
-         (length == 3 && isDigit(buffer[0]) && isDigit(buffer[1]) &&
-          isDigit(buffer[2]));
-}
-
-// Parse BCP 47 language identifier into internal structure
-FontLanguage::FontLanguage(const char* buf, size_t length) : FontLanguage() {
-  size_t firstDelimiterPos = nextDelimiterIndex(buf, length, 0);
-  if (isValidLanguageCode(buf, firstDelimiterPos)) {
-    mLanguage = packLanguageOrRegion(buf, firstDelimiterPos, 'a', 'a');
-  } else {
-    // We don't understand anything other than two-letter or three-letter
-    // language codes, so we skip parsing the rest of the string.
-    return;
-  }
-
-  if (firstDelimiterPos == length) {
-    mHbLanguage = hb_language_from_string(getString().c_str(), -1);
-    return;  // Language code only.
-  }
-
-  size_t nextComponentStartPos = firstDelimiterPos + 1;
-  size_t nextDelimiterPos =
-      nextDelimiterIndex(buf, length, nextComponentStartPos);
-  size_t componentLength = nextDelimiterPos - nextComponentStartPos;
-
-  if (componentLength == 4) {
-    // Possibly script code.
-    const char* p = buf + nextComponentStartPos;
-    if (isValidScriptCode(p)) {
-      mScript = SCRIPT_TAG(p[0], p[1], p[2], p[3]);
-      mSubScriptBits = scriptToSubScriptBits(mScript);
-    }
-
-    if (nextDelimiterPos == length) {
-      mHbLanguage = hb_language_from_string(getString().c_str(), -1);
-      mEmojiStyle = resolveEmojiStyle(buf, length, mScript);
-      return;  // No region code.
-    }
-
-    nextComponentStartPos = nextDelimiterPos + 1;
-    nextDelimiterPos = nextDelimiterIndex(buf, length, nextComponentStartPos);
-    componentLength = nextDelimiterPos - nextComponentStartPos;
-  }
-
-  if (componentLength == 2 || componentLength == 3) {
-    // Possibly region code.
-    const char* p = buf + nextComponentStartPos;
-    if (isValidRegionCode(p, componentLength)) {
-      mRegion = packLanguageOrRegion(p, componentLength, 'A', '0');
-    }
-  }
-
-  mHbLanguage = hb_language_from_string(getString().c_str(), -1);
-  mEmojiStyle = resolveEmojiStyle(buf, length, mScript);
-}
-
-// static
-FontLanguage::EmojiStyle FontLanguage::resolveEmojiStyle(const char* buf,
-                                                         size_t length,
-                                                         uint32_t script) {
-  // First, lookup emoji subtag.
-  // 10 is the length of "-u-em-text", which is the shortest emoji subtag,
-  // unnecessary comparison can be avoided if total length is smaller than 10.
-  const size_t kMinSubtagLength = 10;
-  if (length >= kMinSubtagLength) {
-    static const char kPrefix[] = "-u-em-";
-    const char* pos =
-        std::search(buf, buf + length, kPrefix, kPrefix + strlen(kPrefix));
-    if (pos != buf + length) {  // found
-      pos += strlen(kPrefix);
-      const size_t remainingLength = length - (pos - buf);
-      if (isEmojiSubtag(pos, remainingLength, "emoji", 5)) {
-        return EMSTYLE_EMOJI;
-      } else if (isEmojiSubtag(pos, remainingLength, "text", 4)) {
-        return EMSTYLE_TEXT;
-      } else if (isEmojiSubtag(pos, remainingLength, "default", 7)) {
-        return EMSTYLE_DEFAULT;
-      }
-    }
-  }
-
-  // If no emoji subtag was provided, resolve the emoji style from script code.
-  if (script == SCRIPT_TAG('Z', 's', 'y', 'e')) {
-    return EMSTYLE_EMOJI;
-  } else if (script == SCRIPT_TAG('Z', 's', 'y', 'm')) {
-    return EMSTYLE_TEXT;
-  }
-
-  return EMSTYLE_EMPTY;
-}
-
-// static
-uint8_t FontLanguage::scriptToSubScriptBits(uint32_t script) {
-  uint8_t subScriptBits = 0u;
-  switch (script) {
-    case SCRIPT_TAG('B', 'o', 'p', 'o'):
-      subScriptBits = kBopomofoFlag;
-      break;
-    case SCRIPT_TAG('H', 'a', 'n', 'g'):
-      subScriptBits = kHangulFlag;
-      break;
-    case SCRIPT_TAG('H', 'a', 'n', 'b'):
-      // Bopomofo is almost exclusively used in Taiwan.
-      subScriptBits = kHanFlag | kBopomofoFlag;
-      break;
-    case SCRIPT_TAG('H', 'a', 'n', 'i'):
-      subScriptBits = kHanFlag;
-      break;
-    case SCRIPT_TAG('H', 'a', 'n', 's'):
-      subScriptBits = kHanFlag | kSimplifiedChineseFlag;
-      break;
-    case SCRIPT_TAG('H', 'a', 'n', 't'):
-      subScriptBits = kHanFlag | kTraditionalChineseFlag;
-      break;
-    case SCRIPT_TAG('H', 'i', 'r', 'a'):
-      subScriptBits = kHiraganaFlag;
-      break;
-    case SCRIPT_TAG('H', 'r', 'k', 't'):
-      subScriptBits = kKatakanaFlag | kHiraganaFlag;
-      break;
-    case SCRIPT_TAG('J', 'p', 'a', 'n'):
-      subScriptBits = kHanFlag | kKatakanaFlag | kHiraganaFlag;
-      break;
-    case SCRIPT_TAG('K', 'a', 'n', 'a'):
-      subScriptBits = kKatakanaFlag;
-      break;
-    case SCRIPT_TAG('K', 'o', 'r', 'e'):
-      subScriptBits = kHanFlag | kHangulFlag;
-      break;
-  }
-  return subScriptBits;
-}
-
-std::string FontLanguage::getString() const {
-  if (isUnsupported()) {
-    return "und";
-  }
-  char buf[16];
-  size_t i = unpackLanguageOrRegion(mLanguage, buf, 'a', 'a');
-  if (mScript != 0) {
-    buf[i++] = '-';
-    buf[i++] = (mScript >> 24) & 0xFFu;
-    buf[i++] = (mScript >> 16) & 0xFFu;
-    buf[i++] = (mScript >> 8) & 0xFFu;
-    buf[i++] = mScript & 0xFFu;
-  }
-  if (mRegion != INVALID_CODE) {
-    buf[i++] = '-';
-    i += unpackLanguageOrRegion(mRegion, buf + i, 'A', '0');
-  }
-  return std::string(buf, i);
-}
-
-bool FontLanguage::isEqualScript(const FontLanguage& other) const {
-  return other.mScript == mScript;
-}
-
-// static
-bool FontLanguage::supportsScript(uint8_t providedBits, uint8_t requestedBits) {
-  return requestedBits != 0 && (providedBits & requestedBits) == requestedBits;
-}
-
-bool FontLanguage::supportsHbScript(hb_script_t script) const {
-  static_assert(
-      SCRIPT_TAG('J', 'p', 'a', 'n') == HB_TAG('J', 'p', 'a', 'n'),
-      "The Minikin script and HarfBuzz hb_script_t have different encodings.");
-  if (script == mScript)
-    return true;
-  return supportsScript(mSubScriptBits, scriptToSubScriptBits(script));
-}
-
-int FontLanguage::calcScoreFor(const FontLanguages& supported) const {
-  bool languageScriptMatch = false;
-  bool subtagMatch = false;
-  bool scriptMatch = false;
-
-  for (size_t i = 0; i < supported.size(); ++i) {
-    if (mEmojiStyle != EMSTYLE_EMPTY &&
-        mEmojiStyle == supported[i].mEmojiStyle) {
-      subtagMatch = true;
-      if (mLanguage == supported[i].mLanguage) {
-        return 4;
-      }
-    }
-    if (isEqualScript(supported[i]) ||
-        supportsScript(supported[i].mSubScriptBits, mSubScriptBits)) {
-      scriptMatch = true;
-      if (mLanguage == supported[i].mLanguage) {
-        languageScriptMatch = true;
-      }
-    }
-  }
-
-  if (supportsScript(supported.getUnionOfSubScriptBits(), mSubScriptBits)) {
-    scriptMatch = true;
-    if (mLanguage == supported[0].mLanguage &&
-        supported.isAllTheSameLanguage()) {
-      return 3;
-    }
-  }
-
-  if (languageScriptMatch) {
-    return 3;
-  } else if (subtagMatch) {
-    return 2;
-  } else if (scriptMatch) {
-    return 1;
-  }
-  return 0;
-}
-
-FontLanguages::FontLanguages(std::vector<FontLanguage>&& languages)
-    : mLanguages(std::move(languages)) {
-  if (mLanguages.empty()) {
-    return;
-  }
-
-  const FontLanguage& lang = mLanguages[0];
-
-  mIsAllTheSameLanguage = true;
-  mUnionOfSubScriptBits = lang.mSubScriptBits;
-  for (size_t i = 1; i < mLanguages.size(); ++i) {
-    mUnionOfSubScriptBits |= mLanguages[i].mSubScriptBits;
-    if (mIsAllTheSameLanguage && lang.mLanguage != mLanguages[i].mLanguage) {
-      mIsAllTheSameLanguage = false;
-    }
-  }
-}
-
-#undef SCRIPT_TAG
-}  // namespace minikin
diff --git a/third_party/txt/src/minikin/FontLanguage.h b/third_party/txt/src/minikin/FontLanguage.h
deleted file mode 100644
index 1a46abb5873424c52dfd2b1193362765284cc158..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/FontLanguage.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef MINIKIN_FONT_LANGUAGE_H
-#define MINIKIN_FONT_LANGUAGE_H
-
-#include <string>
-#include <vector>
-
-#include <hb.h>
-
-namespace minikin {
-
-// Due to the limits in font fallback score calculation, we can't use anything
-// more than 12 languages.
-const size_t FONT_LANGUAGES_LIMIT = 12;
-
-// The language or region code is encoded to 15 bits.
-const uint16_t INVALID_CODE = 0x7fff;
-
-class FontLanguages;
-
-// FontLanguage is a compact representation of a BCP 47 language tag. It
-// does not capture all possible information, only what directly affects
-// font rendering.
-struct FontLanguage {
- public:
-  enum EmojiStyle : uint8_t {
-    EMSTYLE_EMPTY = 0,
-    EMSTYLE_DEFAULT = 1,
-    EMSTYLE_EMOJI = 2,
-    EMSTYLE_TEXT = 3,
-  };
-  // Default constructor creates the unsupported language.
-  FontLanguage()
-      : mScript(0ul),
-        mLanguage(INVALID_CODE),
-        mRegion(INVALID_CODE),
-        mHbLanguage(HB_LANGUAGE_INVALID),
-        mSubScriptBits(0ul),
-        mEmojiStyle(EMSTYLE_EMPTY) {}
-
-  // Parse from string
-  FontLanguage(const char* buf, size_t length);
-
-  bool operator==(const FontLanguage other) const {
-    return !isUnsupported() && isEqualScript(other) &&
-           mLanguage == other.mLanguage && mRegion == other.mRegion &&
-           mEmojiStyle == other.mEmojiStyle;
-  }
-
-  bool operator!=(const FontLanguage other) const { return !(*this == other); }
-
-  bool isUnsupported() const { return mLanguage == INVALID_CODE; }
-  EmojiStyle getEmojiStyle() const { return mEmojiStyle; }
-  hb_language_t getHbLanguage() const { return mHbLanguage; }
-
-  bool isEqualScript(const FontLanguage& other) const;
-
-  // Returns true if this script supports the given script. For example, ja-Jpan
-  // supports Hira, ja-Hira doesn't support Jpan.
-  bool supportsHbScript(hb_script_t script) const;
-
-  std::string getString() const;
-
-  // Calculates a matching score. This score represents how well the input
-  // languages cover this language. The maximum score in the language list is
-  // returned. 0 = no match, 1 = script match, 2 = script and primary language
-  // match.
-  int calcScoreFor(const FontLanguages& supported) const;
-
-  uint64_t getIdentifier() const {
-    return ((uint64_t)mLanguage << 49) | ((uint64_t)mScript << 17) |
-           ((uint64_t)mRegion << 2) | mEmojiStyle;
-  }
-
- private:
-  friend class FontLanguages;  // for FontLanguages constructor
-
-  // ISO 15924 compliant script code. The 4 chars script code are packed into a
-  // 32 bit integer.
-  uint32_t mScript;
-
-  // ISO 639-1 or ISO 639-2 compliant language code.
-  // The two- or three-letter language code is packed into a 15 bit integer.
-  // mLanguage = 0 means the FontLanguage is unsupported.
-  uint16_t mLanguage;
-
-  // ISO 3166-1 or UN M.49 compliant region code. The two-letter or three-digit
-  // region code is packed into a 15 bit integer.
-  uint16_t mRegion;
-
-  // The language to be passed HarfBuzz shaper.
-  hb_language_t mHbLanguage;
-
-  // For faster comparing, use 7 bits for specific scripts.
-  static const uint8_t kBopomofoFlag = 1u;
-  static const uint8_t kHanFlag = 1u << 1;
-  static const uint8_t kHangulFlag = 1u << 2;
-  static const uint8_t kHiraganaFlag = 1u << 3;
-  static const uint8_t kKatakanaFlag = 1u << 4;
-  static const uint8_t kSimplifiedChineseFlag = 1u << 5;
-  static const uint8_t kTraditionalChineseFlag = 1u << 6;
-  uint8_t mSubScriptBits;
-
-  EmojiStyle mEmojiStyle;
-
-  static uint8_t scriptToSubScriptBits(uint32_t script);
-
-  static EmojiStyle resolveEmojiStyle(const char* buf,
-                                      size_t length,
-                                      uint32_t script);
-
-  // Returns true if the provide subscript bits has the requested subscript
-  // bits. Note that this function returns false if the requested subscript bits
-  // are empty.
-  static bool supportsScript(uint8_t providedBits, uint8_t requestedBits);
-};
-
-// An immutable list of languages.
-class FontLanguages {
- public:
-  explicit FontLanguages(std::vector<FontLanguage>&& languages);
-  FontLanguages() : mUnionOfSubScriptBits(0), mIsAllTheSameLanguage(false) {}
-  FontLanguages(FontLanguages&&) = default;
-
-  size_t size() const { return mLanguages.size(); }
-  bool empty() const { return mLanguages.empty(); }
-  const FontLanguage& operator[](size_t n) const { return mLanguages[n]; }
-
- private:
-  friend struct FontLanguage;  // for calcScoreFor
-
-  std::vector<FontLanguage> mLanguages;
-  uint8_t mUnionOfSubScriptBits;
-  bool mIsAllTheSameLanguage;
-
-  uint8_t getUnionOfSubScriptBits() const { return mUnionOfSubScriptBits; }
-  bool isAllTheSameLanguage() const { return mIsAllTheSameLanguage; }
-
-  // Do not copy and assign.
-  FontLanguages(const FontLanguages&) = delete;
-  void operator=(const FontLanguages&) = delete;
-};
-
-}  // namespace minikin
-
-#endif  // MINIKIN_FONT_LANGUAGE_H
diff --git a/third_party/txt/src/minikin/FontLanguageListCache.cpp b/third_party/txt/src/minikin/FontLanguageListCache.cpp
deleted file mode 100644
index eb4ac69ee13464f2af743f526f1697a64383b173..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/FontLanguageListCache.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "Minikin"
-
-#include "FontLanguageListCache.h"
-
-#include <unicode/uloc.h>
-#include <unicode/umachine.h>
-#include <unordered_set>
-
-#include <log/log.h>
-
-#include "FontLanguage.h"
-#include "MinikinInternal.h"
-
-namespace minikin {
-
-const uint32_t FontLanguageListCache::kEmptyListId;
-
-// Returns the text length of output.
-static size_t toLanguageTag(char* output,
-                            size_t outSize,
-                            const std::string& locale) {
-  output[0] = '\0';
-  if (locale.empty()) {
-    return 0;
-  }
-
-  size_t outLength = 0;
-  UErrorCode uErr = U_ZERO_ERROR;
-  outLength = uloc_canonicalize(locale.c_str(), output, outSize, &uErr);
-  if (U_FAILURE(uErr)) {
-    // unable to build a proper language identifier
-    ALOGD("uloc_canonicalize(\"%s\") failed: %s", locale.c_str(),
-          u_errorName(uErr));
-    output[0] = '\0';
-    return 0;
-  }
-
-  // Preserve "und" and "und-****" since uloc_addLikelySubtags changes "und" to
-  // "en-Latn-US".
-  if (strncmp(output, "und", 3) == 0 &&
-      (outLength == 3 || (outLength == 8 && output[3] == '_'))) {
-    return outLength;
-  }
-
-  char likelyChars[ULOC_FULLNAME_CAPACITY];
-  uErr = U_ZERO_ERROR;
-  uloc_addLikelySubtags(output, likelyChars, ULOC_FULLNAME_CAPACITY, &uErr);
-  if (U_FAILURE(uErr)) {
-    // unable to build a proper language identifier
-    ALOGD("uloc_addLikelySubtags(\"%s\") failed: %s", output,
-          u_errorName(uErr));
-    output[0] = '\0';
-    return 0;
-  }
-
-  uErr = U_ZERO_ERROR;
-  outLength =
-      uloc_toLanguageTag(likelyChars, output, outSize, /*false*/ 0, &uErr);
-  if (U_FAILURE(uErr)) {
-    // unable to build a proper language identifier
-    ALOGD("uloc_toLanguageTag(\"%s\") failed: %s", likelyChars,
-          u_errorName(uErr));
-    output[0] = '\0';
-    return 0;
-  }
-#ifdef VERBOSE_DEBUG
-  ALOGD("ICU normalized '%s' to '%s'", locale.c_str(), output);
-#endif
-  return outLength;
-}
-
-static std::vector<FontLanguage> parseLanguageList(const std::string& input) {
-  std::vector<FontLanguage> result;
-  size_t currentIdx = 0;
-  size_t commaLoc = 0;
-  char langTag[ULOC_FULLNAME_CAPACITY];
-  std::unordered_set<uint64_t> seen;
-  std::string locale(input.size(), 0);
-
-  while ((commaLoc = input.find_first_of(',', currentIdx)) !=
-         std::string::npos) {
-    locale.assign(input, currentIdx, commaLoc - currentIdx);
-    currentIdx = commaLoc + 1;
-    size_t length = toLanguageTag(langTag, ULOC_FULLNAME_CAPACITY, locale);
-    FontLanguage lang(langTag, length);
-    uint64_t identifier = lang.getIdentifier();
-    if (!lang.isUnsupported() && seen.count(identifier) == 0) {
-      result.push_back(lang);
-      if (result.size() == FONT_LANGUAGES_LIMIT) {
-        break;
-      }
-      seen.insert(identifier);
-    }
-  }
-  if (result.size() < FONT_LANGUAGES_LIMIT) {
-    locale.assign(input, currentIdx, input.size() - currentIdx);
-    size_t length = toLanguageTag(langTag, ULOC_FULLNAME_CAPACITY, locale);
-    FontLanguage lang(langTag, length);
-    uint64_t identifier = lang.getIdentifier();
-    if (!lang.isUnsupported() && seen.count(identifier) == 0) {
-      result.push_back(lang);
-    }
-  }
-  return result;
-}
-
-// static
-uint32_t FontLanguageListCache::getId(const std::string& languages) {
-  FontLanguageListCache* inst = FontLanguageListCache::getInstance();
-  std::unordered_map<std::string, uint32_t>::const_iterator it =
-      inst->mLanguageListLookupTable.find(languages);
-  if (it != inst->mLanguageListLookupTable.end()) {
-    return it->second;
-  }
-
-  // Given language list is not in cache. Insert it and return newly assigned
-  // ID.
-  const uint32_t nextId = inst->mLanguageLists.size();
-  FontLanguages fontLanguages(parseLanguageList(languages));
-  if (fontLanguages.empty()) {
-    return kEmptyListId;
-  }
-  inst->mLanguageLists.push_back(std::move(fontLanguages));
-  inst->mLanguageListLookupTable.insert(std::make_pair(languages, nextId));
-  return nextId;
-}
-
-// static
-const FontLanguages& FontLanguageListCache::getById(uint32_t id) {
-  FontLanguageListCache* inst = FontLanguageListCache::getInstance();
-  LOG_ALWAYS_FATAL_IF(id >= inst->mLanguageLists.size(),
-                      "Lookup by unknown language list ID.");
-  return inst->mLanguageLists[id];
-}
-
-// static
-FontLanguageListCache* FontLanguageListCache::getInstance() {
-  assertMinikinLocked();
-  static FontLanguageListCache* instance = nullptr;
-  if (instance == nullptr) {
-    instance = new FontLanguageListCache();
-
-    // Insert an empty language list for mapping default language list to
-    // kEmptyListId. The default language list has only one FontLanguage and it
-    // is the unsupported language.
-    instance->mLanguageLists.push_back(FontLanguages());
-    instance->mLanguageListLookupTable.insert(std::make_pair("", kEmptyListId));
-  }
-  return instance;
-}
-
-}  // namespace minikin
diff --git a/third_party/txt/src/minikin/FontLanguageListCache.h b/third_party/txt/src/minikin/FontLanguageListCache.h
deleted file mode 100644
index c84dd8847798f967b80fe6c98bb0334ef7ec0eaf..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/FontLanguageListCache.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef MINIKIN_FONT_LANGUAGE_LIST_CACHE_H
-#define MINIKIN_FONT_LANGUAGE_LIST_CACHE_H
-
-#include <unordered_map>
-
-#include <minikin/FontFamily.h>
-#include "FontLanguage.h"
-
-namespace minikin {
-
-class FontLanguageListCache {
- public:
-  // A special ID for the empty language list.
-  // This value must be 0 since the empty language list is inserted into
-  // mLanguageLists by default.
-  const static uint32_t kEmptyListId = 0;
-
-  // Returns language list ID for the given string representation of
-  // FontLanguages. Caller should acquire a lock before calling the method.
-  static uint32_t getId(const std::string& languages);
-
-  // Caller should acquire a lock before calling the method.
-  static const FontLanguages& getById(uint32_t id);
-
- private:
-  FontLanguageListCache() {}  // Singleton
-  ~FontLanguageListCache() {}
-
-  // Caller should acquire a lock before calling the method.
-  static FontLanguageListCache* getInstance();
-
-  std::vector<FontLanguages> mLanguageLists;
-
-  // A map from string representation of the font language list to the ID.
-  std::unordered_map<std::string, uint32_t> mLanguageListLookupTable;
-};
-
-}  // namespace minikin
-
-#endif  // MINIKIN_FONT_LANGUAGE_LIST_CACHE_H
diff --git a/third_party/txt/src/minikin/FontUtils.cpp b/third_party/txt/src/minikin/FontUtils.cpp
deleted file mode 100644
index b6a0f120484dca206a77d4f71fae653bb48e291d..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/FontUtils.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdint.h>
-#include <stdlib.h>
-
-#include "FontUtils.h"
-
-namespace minikin {
-
-static uint16_t readU16(const uint8_t* data, size_t offset) {
-  return data[offset] << 8 | data[offset + 1];
-}
-
-static uint32_t readU32(const uint8_t* data, size_t offset) {
-  return ((uint32_t)data[offset]) << 24 | ((uint32_t)data[offset + 1]) << 16 |
-         ((uint32_t)data[offset + 2]) << 8 | ((uint32_t)data[offset + 3]);
-}
-
-bool analyzeStyle(const uint8_t* os2_data,
-                  size_t os2_size,
-                  int* weight,
-                  bool* italic) {
-  const size_t kUsWeightClassOffset = 4;
-  const size_t kFsSelectionOffset = 62;
-  const uint16_t kItalicFlag = (1 << 0);
-  if (os2_size < kFsSelectionOffset + 2) {
-    return false;
-  }
-  uint16_t weightClass = readU16(os2_data, kUsWeightClassOffset);
-  *weight = weightClass / 100;
-  uint16_t fsSelection = readU16(os2_data, kFsSelectionOffset);
-  *italic = (fsSelection & kItalicFlag) != 0;
-  return true;
-}
-
-void analyzeAxes(const uint8_t* fvar_data,
-                 size_t fvar_size,
-                 std::unordered_set<uint32_t>* axes) {
-  const size_t kMajorVersionOffset = 0;
-  const size_t kMinorVersionOffset = 2;
-  const size_t kOffsetToAxesArrayOffset = 4;
-  const size_t kAxisCountOffset = 8;
-  const size_t kAxisSizeOffset = 10;
-
-  axes->clear();
-
-  if (fvar_size < kAxisSizeOffset + 2) {
-    return;
-  }
-  const uint16_t majorVersion = readU16(fvar_data, kMajorVersionOffset);
-  const uint16_t minorVersion = readU16(fvar_data, kMinorVersionOffset);
-  const uint32_t axisOffset = readU16(fvar_data, kOffsetToAxesArrayOffset);
-  const uint32_t axisCount = readU16(fvar_data, kAxisCountOffset);
-  const uint32_t axisSize = readU16(fvar_data, kAxisSizeOffset);
-
-  if (majorVersion != 1 || minorVersion != 0 || axisOffset != 0x10 ||
-      axisSize != 0x14) {
-    return;  // Unsupported version.
-  }
-  if (fvar_size < axisOffset + axisOffset * axisCount) {
-    return;  // Invalid table size.
-  }
-  for (uint32_t i = 0; i < axisCount; ++i) {
-    size_t axisRecordOffset = axisOffset + i * axisSize;
-    uint32_t tag = readU32(fvar_data, axisRecordOffset);
-    axes->insert(tag);
-  }
-}
-}  // namespace minikin
diff --git a/third_party/txt/src/minikin/FontUtils.h b/third_party/txt/src/minikin/FontUtils.h
deleted file mode 100644
index b01e54bd26aa534aee5335b73d0c4119d1180e66..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/FontUtils.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef MINIKIN_FONT_UTILS_H
-#define MINIKIN_FONT_UTILS_H
-
-#include <unordered_set>
-
-namespace minikin {
-
-bool analyzeStyle(const uint8_t* os2_data,
-                  size_t os2_size,
-                  int* weight,
-                  bool* italic);
-void analyzeAxes(const uint8_t* fvar_data,
-                 size_t fvar_size,
-                 std::unordered_set<uint32_t>* axes);
-
-}  // namespace minikin
-
-#endif  // MINIKIN_ANALYZE_STYLE_H
diff --git a/third_party/txt/src/minikin/GraphemeBreak.cpp b/third_party/txt/src/minikin/GraphemeBreak.cpp
deleted file mode 100644
index b711fae9aab7b3a1750acce983c99cf810e8fe21..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/GraphemeBreak.cpp
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdint.h>
-#include <unicode/uchar.h>
-#include <unicode/utf16.h>
-#include <algorithm>
-
-#include <minikin/Emoji.h>
-#include <minikin/GraphemeBreak.h>
-#include "MinikinInternal.h"
-#include "utils/WindowsUtils.h"
-
-namespace minikin {
-
-int32_t tailoredGraphemeClusterBreak(uint32_t c) {
-  // Characters defined as Control that we want to treat them as Extend.
-  // These are curated manually.
-  if (c == 0x00AD                      // SHY
-      || c == 0x061C                   // ALM
-      || c == 0x180E                   // MONGOLIAN VOWEL SEPARATOR
-      || c == 0x200B                   // ZWSP
-      || c == 0x200E                   // LRM
-      || c == 0x200F                   // RLM
-      || (0x202A <= c && c <= 0x202E)  // LRE, RLE, PDF, LRO, RLO
-      || ((c | 0xF) ==
-          0x206F)     // WJ, invisible math operators, LRI, RLI, FSI, PDI,
-                      // and the deprecated invisible format controls
-      || c == 0xFEFF  // BOM
-      || ((c | 0x7F) ==
-          0xE007F))  // recently undeprecated tag characters in Plane 14
-    return U_GCB_EXTEND;
-  // THAI CHARACTER SARA AM is treated as a normal letter by most other
-  // implementations: they allow a grapheme break before it.
-  else if (c == 0x0E33)
-    return U_GCB_OTHER;
-  else
-    return u_getIntPropertyValue(c, UCHAR_GRAPHEME_CLUSTER_BREAK);
-}
-
-// Returns true for all characters whose IndicSyllabicCategory is Pure_Killer.
-// From http://www.unicode.org/Public/9.0.0/ucd/IndicSyllabicCategory.txt
-bool isPureKiller(uint32_t c) {
-  return (c == 0x0E3A || c == 0x0E4E || c == 0x0F84 || c == 0x103A ||
-          c == 0x1714 || c == 0x1734 || c == 0x17D1 || c == 0x1BAA ||
-          c == 0x1BF2 || c == 0x1BF3 || c == 0xA806 || c == 0xA953 ||
-          c == 0xABED || c == 0x11134 || c == 0x112EA || c == 0x1172B);
-}
-
-bool GraphemeBreak::isGraphemeBreak(const float* advances,
-                                    const uint16_t* buf,
-                                    size_t start,
-                                    size_t count,
-                                    const size_t offset) {
-  // This implementation closely follows Unicode Standard Annex #29 on
-  // Unicode Text Segmentation (http://www.unicode.org/reports/tr29/),
-  // implementing a tailored version of extended grapheme clusters.
-  // The GB rules refer to section 3.1.1, Grapheme Cluster Boundary Rules.
-
-  // Rule GB1, sot ÷; Rule GB2, ÷ eot
-  if (offset <= start || offset >= start + count) {
-    return true;
-  }
-  if (U16_IS_TRAIL(buf[offset])) {
-    // Don't break a surrogate pair, but a lonely trailing surrogate pair is a
-    // break
-    return !U16_IS_LEAD(buf[offset - 1]);
-  }
-  uint32_t c1 = 0;
-  uint32_t c2 = 0;
-  size_t offset_back = offset;
-  size_t offset_forward = offset;
-  U16_PREV(buf, start, offset_back, c1);
-  U16_NEXT(buf, offset_forward, start + count, c2);
-  int32_t p1 = tailoredGraphemeClusterBreak(c1);
-  int32_t p2 = tailoredGraphemeClusterBreak(c2);
-  // Rule GB3, CR x LF
-  if (p1 == U_GCB_CR && p2 == U_GCB_LF) {
-    return false;
-  }
-  // Rule GB4, (Control | CR | LF) ÷
-  if (p1 == U_GCB_CONTROL || p1 == U_GCB_CR || p1 == U_GCB_LF) {
-    return true;
-  }
-  // Rule GB5, ÷ (Control | CR | LF)
-  if (p2 == U_GCB_CONTROL || p2 == U_GCB_CR || p2 == U_GCB_LF) {
-    return true;
-  }
-  // Rule GB6, L x ( L | V | LV | LVT )
-  if (p1 == U_GCB_L &&
-      (p2 == U_GCB_L || p2 == U_GCB_V || p2 == U_GCB_LV || p2 == U_GCB_LVT)) {
-    return false;
-  }
-  // Rule GB7, ( LV | V ) x ( V | T )
-  if ((p1 == U_GCB_LV || p1 == U_GCB_V) && (p2 == U_GCB_V || p2 == U_GCB_T)) {
-    return false;
-  }
-  // Rule GB8, ( LVT | T ) x T
-  if ((p1 == U_GCB_LVT || p1 == U_GCB_T) && p2 == U_GCB_T) {
-    return false;
-  }
-  // Rule GB9, x (Extend | ZWJ); Rule GB9a, x SpacingMark; Rule GB9b, Prepend x
-  if (p2 == U_GCB_EXTEND || p2 == U_GCB_ZWJ || p2 == U_GCB_SPACING_MARK ||
-      p1 == U_GCB_PREPEND) {
-    return false;
-  }
-
-  // This is used to decide font-dependent grapheme clusters. If we don't have
-  // the advance information, we become conservative in grapheme breaking and
-  // assume that it has no advance.
-  const bool c2_has_advance =
-      (advances != nullptr && advances[offset - start] != 0.0);
-
-  // All the following rules are font-dependent, in the way that if we know c2
-  // has an advance, we definitely know that it cannot form a grapheme with the
-  // character(s) before it. So we make the decision in favor a grapheme break
-  // early.
-  if (c2_has_advance) {
-    return true;
-  }
-
-  // Note: For Rule GB10 and GB11 below, we do not use the Unicode line breaking
-  // properties for determining emoji-ness and carry our own data, because our
-  // data could be more fresh than what ICU provides.
-  //
-  // Tailored version of Rule GB10, (E_Base | EBG) Extend* × E_Modifier.
-  // The rule itself says do not break between emoji base and emoji modifiers,
-  // skipping all Extend characters. Variation selectors are considered Extend,
-  // so they are handled fine.
-  //
-  // We tailor this by requiring that an actual ligature is formed. If the font
-  // doesn't form a ligature, we allow a break before the modifier.
-  if (isEmojiModifier(c2)) {
-    uint32_t c0 = c1;
-    size_t offset_backback = offset_back;
-    int32_t p0 = p1;
-    if (p0 == U_GCB_EXTEND && offset_backback > start) {
-      // skip over emoji variation selector
-      U16_PREV(buf, start, offset_backback, c0);
-    }
-    if (isEmojiBase(c0)) {
-      return false;
-    }
-  }
-
-  // Tailored version of Rule GB11, ZWJ × (Glue_After_Zwj | EBG)
-  // We try to make emoji sequences with ZWJ a single grapheme cluster, but only
-  // if they actually merge to one cluster. So we are more relaxed than the UAX
-  // #29 rules in accepting any emoji character after the ZWJ, but are tighter
-  // in that we only treat it as one cluster if a ligature is actually formed
-  // and we also require the character before the ZWJ to also be an emoji.
-  if (p1 == U_GCB_ZWJ && isEmoji(c2) && offset_back > start) {
-    // look at character before ZWJ to see that both can participate in an
-    // emoji zwj sequence
-    uint32_t c0 = 0;
-    size_t offset_backback = offset_back;
-    U16_PREV(buf, start, offset_backback, c0);
-    if (c0 == 0xFE0F && offset_backback > start) {
-      // skip over emoji variation selector
-      U16_PREV(buf, start, offset_backback, c0);
-    }
-    if (isEmoji(c0)) {
-      return false;
-    }
-  }
-
-  // Tailored version of Rule GB12 and Rule GB13 that look at even-odd cases.
-  // sot   (RI RI)*  RI x RI
-  // [^RI] (RI RI)*  RI x RI
-  //
-  // If we have font information, we have already broken the cluster if and only
-  // if the second character had no advance, which means a ligature was formed.
-  // If we don't, we look back like UAX #29 recommends, but only up to 1000 code
-  // units.
-  if (p1 == U_GCB_REGIONAL_INDICATOR && p2 == U_GCB_REGIONAL_INDICATOR) {
-    if (advances != nullptr) {
-      // We have advances information. But if we are here, we already know c2
-      // has no advance. So we should definitely disallow a break.
-      return false;
-    } else {
-      // Look at up to 1000 code units.
-      const size_t lookback_barrier =
-          std::max((ssize_t)start, (ssize_t)offset_back - 1000);
-      size_t offset_backback = offset_back;
-      while (offset_backback > lookback_barrier) {
-        uint32_t c0 = 0;
-        U16_PREV(buf, lookback_barrier, offset_backback, c0);
-        if (tailoredGraphemeClusterBreak(c0) != U_GCB_REGIONAL_INDICATOR) {
-          offset_backback += U16_LENGTH(c0);
-          break;
-        }
-      }
-      // The number 4 comes from the number of code units in a whole flag.
-      return (offset - offset_backback) % 4 == 0;
-    }
-  }
-  // Cluster Indic syllables together (tailoring of UAX #29).
-  // Immediately after each virama (that is not just a pure killer) followed by
-  // a letter, we disallow grapheme breaks (if we are here, we don't know about
-  // advances, or we already know that c2 has no advance).
-  if (u_getIntPropertyValue(c1, UCHAR_CANONICAL_COMBINING_CLASS) == 9  // virama
-      && !isPureKiller(c1) &&
-      u_getIntPropertyValue(c2, UCHAR_GENERAL_CATEGORY) == U_OTHER_LETTER) {
-    return false;
-  }
-  // Rule GB999, Any ÷ Any
-  return true;
-}
-
-size_t GraphemeBreak::getTextRunCursor(const float* advances,
-                                       const uint16_t* buf,
-                                       size_t start,
-                                       size_t count,
-                                       size_t offset,
-                                       MoveOpt opt) {
-  switch (opt) {
-    case AFTER:
-      if (offset < start + count) {
-        offset++;
-      }
-      // fall through
-    case AT_OR_AFTER:
-      while (!isGraphemeBreak(advances, buf, start, count, offset)) {
-        offset++;
-      }
-      break;
-    case BEFORE:
-      if (offset > start) {
-        offset--;
-      }
-      // fall through
-    case AT_OR_BEFORE:
-      while (!isGraphemeBreak(advances, buf, start, count, offset)) {
-        offset--;
-      }
-      break;
-    case AT:
-      if (!isGraphemeBreak(advances, buf, start, count, offset)) {
-        offset = (size_t)-1;
-      }
-      break;
-  }
-  return offset;
-}
-
-}  // namespace minikin
diff --git a/third_party/txt/src/minikin/GraphemeBreak.h b/third_party/txt/src/minikin/GraphemeBreak.h
deleted file mode 100644
index 62b9d59aa9344661e1778073de2ad48809f337d7..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/GraphemeBreak.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef MINIKIN_GRAPHEME_BREAK_H
-#define MINIKIN_GRAPHEME_BREAK_H
-
-#include <stddef.h>
-#include <unicode/utf16.h>
-
-namespace minikin {
-
-class GraphemeBreak {
- public:
-  // These values must be kept in sync with CURSOR_AFTER etc in Paint.java
-  enum MoveOpt {
-    AFTER = 0,
-    AT_OR_AFTER = 1,
-    BEFORE = 2,
-    AT_OR_BEFORE = 3,
-    AT = 4
-  };
-
-  // Determine whether the given offset is a grapheme break.
-  // This implementation generally follows Unicode's UTR #29 extended
-  // grapheme break, with various tweaks.
-  static bool isGraphemeBreak(const float* advances,
-                              const uint16_t* buf,
-                              size_t start,
-                              size_t count,
-                              size_t offset);
-
-  // Matches Android's Java API. Note, return (size_t)-1 for AT to
-  // signal non-break because unsigned return type.
-  static size_t getTextRunCursor(const float* advances,
-                                 const uint16_t* buf,
-                                 size_t start,
-                                 size_t count,
-                                 size_t offset,
-                                 MoveOpt opt);
-};
-
-}  // namespace minikin
-
-#endif  // MINIKIN_GRAPHEME_BREAK_H
diff --git a/third_party/txt/src/minikin/HbFontCache.cpp b/third_party/txt/src/minikin/HbFontCache.cpp
deleted file mode 100644
index d60fcc73730e0126aaeed1859330037b5f330cd6..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/HbFontCache.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "Minikin"
-
-#include "HbFontCache.h"
-
-#include <log/log.h>
-#include <utils/LruCache.h>
-
-#include <hb-ot.h>
-#include <hb.h>
-
-#include <minikin/MinikinFont.h>
-#include "MinikinInternal.h"
-
-namespace minikin {
-
-class HbFontCache : private android::OnEntryRemoved<int32_t, hb_font_t*> {
- public:
-  HbFontCache() : mCache(kMaxEntries) {
-    mCache.setOnEntryRemovedListener(this);
-  }
-
-  // callback for OnEntryRemoved
-  void operator()(int32_t& /* key */, hb_font_t*& value) {
-    hb_font_destroy(value);
-  }
-
-  hb_font_t* get(int32_t fontId) { return mCache.get(fontId); }
-
-  void put(int32_t fontId, hb_font_t* font) { mCache.put(fontId, font); }
-
-  void clear() { mCache.clear(); }
-
-  void remove(int32_t fontId) { mCache.remove(fontId); }
-
- private:
-  static const size_t kMaxEntries = 100;
-
-  android::LruCache<int32_t, hb_font_t*> mCache;
-};
-
-HbFontCache* getFontCacheLocked() {
-  assertMinikinLocked();
-  static HbFontCache* cache = nullptr;
-  if (cache == nullptr) {
-    cache = new HbFontCache();
-  }
-  return cache;
-}
-
-void purgeHbFontCacheLocked() {
-  assertMinikinLocked();
-  getFontCacheLocked()->clear();
-}
-
-void purgeHbFontLocked(const MinikinFont* minikinFont) {
-  assertMinikinLocked();
-  const int32_t fontId = minikinFont->GetUniqueId();
-  getFontCacheLocked()->remove(fontId);
-}
-
-// Returns a new reference to a hb_font_t object, caller is
-// responsible for calling hb_font_destroy() on it.
-hb_font_t* getHbFontLocked(const MinikinFont* minikinFont) {
-  assertMinikinLocked();
-  // TODO: get rid of nullFaceFont
-  static hb_font_t* nullFaceFont = nullptr;
-  if (minikinFont == nullptr) {
-    if (nullFaceFont == nullptr) {
-      nullFaceFont = hb_font_create(nullptr);
-    }
-    return hb_font_reference(nullFaceFont);
-  }
-
-  HbFontCache* fontCache = getFontCacheLocked();
-  const int32_t fontId = minikinFont->GetUniqueId();
-  hb_font_t* font = fontCache->get(fontId);
-  if (font != nullptr) {
-    return hb_font_reference(font);
-  }
-
-  hb_face_t* face = minikinFont->CreateHarfBuzzFace();
-
-  hb_font_t* parent_font = hb_font_create(face);
-  hb_ot_font_set_funcs(parent_font);
-
-  unsigned int upem = hb_face_get_upem(face);
-  hb_font_set_scale(parent_font, upem, upem);
-
-  font = hb_font_create_sub_font(parent_font);
-  std::vector<hb_variation_t> variations;
-  for (const FontVariation& variation : minikinFont->GetAxes()) {
-    variations.push_back({variation.axisTag, variation.value});
-  }
-  hb_font_set_variations(font, variations.data(), variations.size());
-  hb_font_destroy(parent_font);
-  hb_face_destroy(face);
-  fontCache->put(fontId, font);
-  return hb_font_reference(font);
-}
-
-}  // namespace minikin
diff --git a/third_party/txt/src/minikin/HbFontCache.h b/third_party/txt/src/minikin/HbFontCache.h
deleted file mode 100644
index 59969e287e01abb5e7dc1df3fb7881770cc10443..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/HbFontCache.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef MINIKIN_HBFONT_CACHE_H
-#define MINIKIN_HBFONT_CACHE_H
-
-struct hb_font_t;
-
-namespace minikin {
-class MinikinFont;
-
-void purgeHbFontCacheLocked();
-void purgeHbFontLocked(const MinikinFont* minikinFont);
-hb_font_t* getHbFontLocked(const MinikinFont* minikinFont);
-
-}  // namespace minikin
-#endif  // MINIKIN_HBFONT_CACHE_H
diff --git a/third_party/txt/src/minikin/Hyphenator.cpp b/third_party/txt/src/minikin/Hyphenator.cpp
deleted file mode 100644
index 321a0ec5c0d91bef0de58edf2334860a8fe6402b..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/Hyphenator.cpp
+++ /dev/null
@@ -1,461 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <unicode/uchar.h>
-#include <unicode/uscript.h>
-#include <algorithm>
-#include <memory>
-#include <string>
-#include <vector>
-
-// HACK: for reading pattern file
-#include <fcntl.h>
-
-#define LOG_TAG "Minikin"
-
-#include "minikin/Hyphenator.h"
-#include "utils/WindowsUtils.h"
-
-using std::vector;
-
-namespace minikin {
-
-static const uint16_t CHAR_HYPHEN_MINUS = 0x002D;
-static const uint16_t CHAR_SOFT_HYPHEN = 0x00AD;
-static const uint16_t CHAR_MIDDLE_DOT = 0x00B7;
-static const uint16_t CHAR_HYPHEN = 0x2010;
-
-// The following are structs that correspond to tables inside the hyb file
-// format
-
-struct AlphabetTable0 {
-  uint32_t version;
-  uint32_t min_codepoint;
-  uint32_t max_codepoint;
-  uint8_t data[1];  // actually flexible array, size is known at runtime
-};
-
-struct AlphabetTable1 {
-  uint32_t version;
-  uint32_t n_entries;
-  uint32_t data[1];  // actually flexible array, size is known at runtime
-
-  static uint32_t codepoint(uint32_t entry) { return entry >> 11; }
-  static uint32_t value(uint32_t entry) { return entry & 0x7ff; }
-};
-
-struct Trie {
-  uint32_t version;
-  uint32_t char_mask;
-  uint32_t link_shift;
-  uint32_t link_mask;
-  uint32_t pattern_shift;
-  uint32_t n_entries;
-  uint32_t data[1];  // actually flexible array, size is known at runtime
-};
-
-struct Pattern {
-  uint32_t version;
-  uint32_t n_entries;
-  uint32_t pattern_offset;
-  uint32_t pattern_size;
-  uint32_t data[1];  // actually flexible array, size is known at runtime
-
-  // accessors
-  static uint32_t len(uint32_t entry) { return entry >> 26; }
-  static uint32_t shift(uint32_t entry) { return (entry >> 20) & 0x3f; }
-  const uint8_t* buf(uint32_t entry) const {
-    return reinterpret_cast<const uint8_t*>(this) + pattern_offset +
-           (entry & 0xfffff);
-  }
-};
-
-struct Header {
-  uint32_t magic;
-  uint32_t version;
-  uint32_t alphabet_offset;
-  uint32_t trie_offset;
-  uint32_t pattern_offset;
-  uint32_t file_size;
-
-  // accessors
-  const uint8_t* bytes() const {
-    return reinterpret_cast<const uint8_t*>(this);
-  }
-  uint32_t alphabetVersion() const {
-    return *reinterpret_cast<const uint32_t*>(bytes() + alphabet_offset);
-  }
-  const AlphabetTable0* alphabetTable0() const {
-    return reinterpret_cast<const AlphabetTable0*>(bytes() + alphabet_offset);
-  }
-  const AlphabetTable1* alphabetTable1() const {
-    return reinterpret_cast<const AlphabetTable1*>(bytes() + alphabet_offset);
-  }
-  const Trie* trieTable() const {
-    return reinterpret_cast<const Trie*>(bytes() + trie_offset);
-  }
-  const Pattern* patternTable() const {
-    return reinterpret_cast<const Pattern*>(bytes() + pattern_offset);
-  }
-};
-
-Hyphenator* Hyphenator::loadBinary(const uint8_t* patternData,
-                                   size_t minPrefix,
-                                   size_t minSuffix) {
-  Hyphenator* result = new Hyphenator;
-  result->patternData = patternData;
-  result->minPrefix = minPrefix;
-  result->minSuffix = minSuffix;
-  return result;
-}
-
-void Hyphenator::hyphenate(vector<HyphenationType>* result,
-                           const uint16_t* word,
-                           size_t len,
-                           const icu::Locale& locale) {
-  result->clear();
-  result->resize(len);
-  const size_t paddedLen = len + 2;  // start and stop code each count for 1
-  if (patternData != nullptr && len >= minPrefix + minSuffix &&
-      paddedLen <= MAX_HYPHENATED_SIZE) {
-    uint16_t alpha_codes[MAX_HYPHENATED_SIZE];
-    const HyphenationType hyphenValue = alphabetLookup(alpha_codes, word, len);
-    if (hyphenValue != HyphenationType::DONT_BREAK) {
-      hyphenateFromCodes(result->data(), alpha_codes, paddedLen, hyphenValue);
-      return;
-    }
-    // TODO: try NFC normalization
-    // TODO: handle non-BMP Unicode (requires remapping of offsets)
-  }
-  // Note that we will always get here if the word contains a hyphen or a soft
-  // hyphen, because the alphabet is not expected to contain a hyphen or a soft
-  // hyphen character, so alphabetLookup would return DONT_BREAK.
-  hyphenateWithNoPatterns(result->data(), word, len, locale);
-}
-
-// This function determines whether a character is like U+2010 HYPHEN in
-// line breaking and usage: a character immediately after which line breaks
-// are allowed, but words containing it should not be automatically
-// hyphenated using patterns. This is a curated set, created by manually
-// inspecting all the characters that have the Unicode line breaking
-// property of BA or HY and seeing which ones are hyphens.
-bool Hyphenator::isLineBreakingHyphen(uint32_t c) {
-  return (c == 0x002D ||  // HYPHEN-MINUS
-          c == 0x058A ||  // ARMENIAN HYPHEN
-          c == 0x05BE ||  // HEBREW PUNCTUATION MAQAF
-          c == 0x1400 ||  // CANADIAN SYLLABICS HYPHEN
-          c == 0x2010 ||  // HYPHEN
-          c == 0x2013 ||  // EN DASH
-          c == 0x2027 ||  // HYPHENATION POINT
-          c == 0x2E17 ||  // DOUBLE OBLIQUE HYPHEN
-          c == 0x2E40);   // DOUBLE HYPHEN
-}
-
-const static uint32_t HYPHEN_STR[] = {0x2010, 0};
-const static uint32_t ARMENIAN_HYPHEN_STR[] = {0x058A, 0};
-const static uint32_t MAQAF_STR[] = {0x05BE, 0};
-const static uint32_t UCAS_HYPHEN_STR[] = {0x1400, 0};
-const static uint32_t ZWJ_STR[] = {0x200D, 0};
-const static uint32_t ZWJ_AND_HYPHEN_STR[] = {0x200D, 0x2010, 0};
-
-const uint32_t* HyphenEdit::getHyphenString(uint32_t hyph) {
-  switch (hyph) {
-    case INSERT_HYPHEN_AT_END:
-    case REPLACE_WITH_HYPHEN_AT_END:
-    case INSERT_HYPHEN_AT_START:
-      return HYPHEN_STR;
-    case INSERT_ARMENIAN_HYPHEN_AT_END:
-      return ARMENIAN_HYPHEN_STR;
-    case INSERT_MAQAF_AT_END:
-      return MAQAF_STR;
-    case INSERT_UCAS_HYPHEN_AT_END:
-      return UCAS_HYPHEN_STR;
-    case INSERT_ZWJ_AND_HYPHEN_AT_END:
-      return ZWJ_AND_HYPHEN_STR;
-    case INSERT_ZWJ_AT_START:
-      return ZWJ_STR;
-    default:
-      return nullptr;
-  }
-}
-
-uint32_t HyphenEdit::editForThisLine(HyphenationType type) {
-  switch (type) {
-    case HyphenationType::DONT_BREAK:
-      return NO_EDIT;
-    case HyphenationType::BREAK_AND_INSERT_HYPHEN:
-      return INSERT_HYPHEN_AT_END;
-    case HyphenationType::BREAK_AND_INSERT_ARMENIAN_HYPHEN:
-      return INSERT_ARMENIAN_HYPHEN_AT_END;
-    case HyphenationType::BREAK_AND_INSERT_MAQAF:
-      return INSERT_MAQAF_AT_END;
-    case HyphenationType::BREAK_AND_INSERT_UCAS_HYPHEN:
-      return INSERT_UCAS_HYPHEN_AT_END;
-    case HyphenationType::BREAK_AND_REPLACE_WITH_HYPHEN:
-      return REPLACE_WITH_HYPHEN_AT_END;
-    case HyphenationType::BREAK_AND_INSERT_HYPHEN_AND_ZWJ:
-      return INSERT_ZWJ_AND_HYPHEN_AT_END;
-    default:
-      return BREAK_AT_END;
-  }
-}
-
-uint32_t HyphenEdit::editForNextLine(HyphenationType type) {
-  switch (type) {
-    case HyphenationType::DONT_BREAK:
-      return NO_EDIT;
-    case HyphenationType::BREAK_AND_INSERT_HYPHEN_AT_NEXT_LINE:
-      return INSERT_HYPHEN_AT_START;
-    case HyphenationType::BREAK_AND_INSERT_HYPHEN_AND_ZWJ:
-      return INSERT_ZWJ_AT_START;
-    default:
-      return BREAK_AT_START;
-  }
-}
-
-static UScriptCode getScript(uint32_t codePoint) {
-  UErrorCode errorCode = U_ZERO_ERROR;
-  const UScriptCode script =
-      uscript_getScript(static_cast<UChar32>(codePoint), &errorCode);
-  if (U_SUCCESS(errorCode)) {
-    return script;
-  } else {
-    return USCRIPT_INVALID_CODE;
-  }
-}
-
-static HyphenationType hyphenationTypeBasedOnScript(uint32_t codePoint) {
-  // Note: It's not clear what the best hyphen for Hebrew is. While maqaf is the
-  // "correct" hyphen for Hebrew, modern practice may have shifted towards
-  // Western hyphens. We use normal hyphens for now to be safe.
-  // BREAK_AND_INSERT_MAQAF is already implemented, so if we want to switch to
-  // maqaf for Hebrew, we can simply add a condition here.
-  const UScriptCode script = getScript(codePoint);
-  if (script == USCRIPT_KANNADA || script == USCRIPT_MALAYALAM ||
-      script == USCRIPT_TAMIL || script == USCRIPT_TELUGU) {
-    // Grantha is not included, since we don't support non-BMP hyphenation yet.
-    return HyphenationType::BREAK_AND_DONT_INSERT_HYPHEN;
-  } else if (script == USCRIPT_ARMENIAN) {
-    return HyphenationType::BREAK_AND_INSERT_ARMENIAN_HYPHEN;
-  } else if (script == USCRIPT_CANADIAN_ABORIGINAL) {
-    return HyphenationType::BREAK_AND_INSERT_UCAS_HYPHEN;
-  } else {
-    return HyphenationType::BREAK_AND_INSERT_HYPHEN;
-  }
-}
-
-static inline int32_t getJoiningType(UChar32 codepoint) {
-  return u_getIntPropertyValue(codepoint, UCHAR_JOINING_TYPE);
-}
-
-// Assumption for caller: location must be >= 2 and word[location] ==
-// CHAR_SOFT_HYPHEN. This function decides if the letters before and after the
-// hyphen should appear as joining.
-static inline HyphenationType getHyphTypeForArabic(const uint16_t* word,
-                                                   size_t len,
-                                                   size_t location) {
-  ssize_t i = location;
-  int32_t type = U_JT_NON_JOINING;
-  while (static_cast<size_t>(i) < len &&
-         (type = getJoiningType(word[i])) == U_JT_TRANSPARENT) {
-    i++;
-  }
-  if (type == U_JT_DUAL_JOINING || type == U_JT_RIGHT_JOINING ||
-      type == U_JT_JOIN_CAUSING) {
-    // The next character is of the type that may join the last character. See
-    // if the last character is also of the right type.
-    i = location - 2;  // Skip the soft hyphen
-    type = U_JT_NON_JOINING;
-    while (i >= 0 && (type = getJoiningType(word[i])) == U_JT_TRANSPARENT) {
-      i--;
-    }
-    if (type == U_JT_DUAL_JOINING || type == U_JT_LEFT_JOINING ||
-        type == U_JT_JOIN_CAUSING) {
-      return HyphenationType::BREAK_AND_INSERT_HYPHEN_AND_ZWJ;
-    }
-  }
-  return HyphenationType::BREAK_AND_INSERT_HYPHEN;
-}
-
-// Use various recommendations of UAX #14 Unicode Line Breaking Algorithm for
-// hyphenating words that didn't match patterns, especially words that contain
-// hyphens or soft hyphens (See sections 5.3, Use of Hyphen, and 5.4, Use of
-// Soft Hyphen).
-void Hyphenator::hyphenateWithNoPatterns(HyphenationType* result,
-                                         const uint16_t* word,
-                                         size_t len,
-                                         const icu::Locale& locale) {
-  result[0] = HyphenationType::DONT_BREAK;
-  for (size_t i = 1; i < len; i++) {
-    const uint16_t prevChar = word[i - 1];
-    if (i > 1 && isLineBreakingHyphen(prevChar)) {
-      // Break after hyphens, but only if they don't start the word.
-
-      if ((prevChar == CHAR_HYPHEN_MINUS || prevChar == CHAR_HYPHEN) &&
-          strcmp(locale.getLanguage(), "pl") == 0 &&
-          getScript(word[i]) == USCRIPT_LATIN) {
-        // In Polish, hyphens get repeated at the next line. To be safe,
-        // we will do this only if the next character is Latin.
-        result[i] = HyphenationType::BREAK_AND_INSERT_HYPHEN_AT_NEXT_LINE;
-      } else {
-        result[i] = HyphenationType::BREAK_AND_DONT_INSERT_HYPHEN;
-      }
-    } else if (i > 1 && prevChar == CHAR_SOFT_HYPHEN) {
-      // Break after soft hyphens, but only if they don't start the word (a soft
-      // hyphen starting the word doesn't give any useful break opportunities).
-      // The type of the break is based on the script of the character we break
-      // on.
-      if (getScript(word[i]) == USCRIPT_ARABIC) {
-        // For Arabic, we need to look and see if the characters around the soft
-        // hyphen actually join. If they don't, we'll just insert a normal
-        // hyphen.
-        result[i] = getHyphTypeForArabic(word, len, i);
-      } else {
-        result[i] = hyphenationTypeBasedOnScript(word[i]);
-      }
-    } else if (prevChar == CHAR_MIDDLE_DOT && minPrefix < i &&
-               i <= len - minSuffix &&
-               ((word[i - 2] == 'l' && word[i] == 'l') ||
-                (word[i - 2] == 'L' && word[i] == 'L')) &&
-               strcmp(locale.getLanguage(), "ca") == 0) {
-      // In Catalan, "l·l" should break as "l-" on the first line
-      // and "l" on the next line.
-      result[i] = HyphenationType::BREAK_AND_REPLACE_WITH_HYPHEN;
-    } else {
-      result[i] = HyphenationType::DONT_BREAK;
-    }
-  }
-}
-
-HyphenationType Hyphenator::alphabetLookup(uint16_t* alpha_codes,
-                                           const uint16_t* word,
-                                           size_t len) {
-  const Header* header = getHeader();
-  HyphenationType result = HyphenationType::BREAK_AND_INSERT_HYPHEN;
-  // TODO: check header magic
-  uint32_t alphabetVersion = header->alphabetVersion();
-  if (alphabetVersion == 0) {
-    const AlphabetTable0* alphabet = header->alphabetTable0();
-    uint32_t min_codepoint = alphabet->min_codepoint;
-    uint32_t max_codepoint = alphabet->max_codepoint;
-    alpha_codes[0] = 0;  // word start
-    for (size_t i = 0; i < len; i++) {
-      uint16_t c = word[i];
-      if (c < min_codepoint || c >= max_codepoint) {
-        return HyphenationType::DONT_BREAK;
-      }
-      uint8_t code = alphabet->data[c - min_codepoint];
-      if (code == 0) {
-        return HyphenationType::DONT_BREAK;
-      }
-      if (result == HyphenationType::BREAK_AND_INSERT_HYPHEN) {
-        result = hyphenationTypeBasedOnScript(c);
-      }
-      alpha_codes[i + 1] = code;
-    }
-    alpha_codes[len + 1] = 0;  // word termination
-    return result;
-  } else if (alphabetVersion == 1) {
-    const AlphabetTable1* alphabet = header->alphabetTable1();
-    size_t n_entries = alphabet->n_entries;
-    const uint32_t* begin = alphabet->data;
-    const uint32_t* end = begin + n_entries;
-    alpha_codes[0] = 0;
-    for (size_t i = 0; i < len; i++) {
-      uint16_t c = word[i];
-      auto p = std::lower_bound<const uint32_t*, uint32_t>(begin, end, c << 11);
-      if (p == end) {
-        return HyphenationType::DONT_BREAK;
-      }
-      uint32_t entry = *p;
-      if (AlphabetTable1::codepoint(entry) != c) {
-        return HyphenationType::DONT_BREAK;
-      }
-      if (result == HyphenationType::BREAK_AND_INSERT_HYPHEN) {
-        result = hyphenationTypeBasedOnScript(c);
-      }
-      alpha_codes[i + 1] = AlphabetTable1::value(entry);
-    }
-    alpha_codes[len + 1] = 0;
-    return result;
-  }
-  return HyphenationType::DONT_BREAK;
-}
-
-/**
- * Internal implementation, after conversion to codes. All case folding and
- *normalization has been done by now, and all characters have been found in the
- *alphabet. Note: len here is the padded length including 0 codes at start and
- *end.
- **/
-void Hyphenator::hyphenateFromCodes(HyphenationType* result,
-                                    const uint16_t* codes,
-                                    size_t len,
-                                    HyphenationType hyphenValue) {
-  static_assert(sizeof(HyphenationType) == sizeof(uint8_t),
-                "HyphnationType must be uint8_t.");
-  // Reuse the result array as a buffer for calculating intermediate hyphenation
-  // numbers.
-  uint8_t* buffer = reinterpret_cast<uint8_t*>(result);
-
-  const Header* header = getHeader();
-  const Trie* trie = header->trieTable();
-  const Pattern* pattern = header->patternTable();
-  uint32_t char_mask = trie->char_mask;
-  uint32_t link_shift = trie->link_shift;
-  uint32_t link_mask = trie->link_mask;
-  uint32_t pattern_shift = trie->pattern_shift;
-  size_t maxOffset = len - minSuffix - 1;
-  for (size_t i = 0; i < len - 1; i++) {
-    uint32_t node = 0;  // index into Trie table
-    for (size_t j = i; j < len; j++) {
-      uint16_t c = codes[j];
-      uint32_t entry = trie->data[node + c];
-      if ((entry & char_mask) == c) {
-        node = (entry & link_mask) >> link_shift;
-      } else {
-        break;
-      }
-      uint32_t pat_ix = trie->data[node] >> pattern_shift;
-      // pat_ix contains a 3-tuple of length, shift (number of trailing zeros),
-      // and an offset into the buf pool. This is the pattern for the substring
-      // (i..j) we just matched, which we combine (via point-wise max) into the
-      // buffer vector.
-      if (pat_ix != 0) {
-        uint32_t pat_entry = pattern->data[pat_ix];
-        int pat_len = Pattern::len(pat_entry);
-        int pat_shift = Pattern::shift(pat_entry);
-        const uint8_t* pat_buf = pattern->buf(pat_entry);
-        int offset = j + 1 - (pat_len + pat_shift);
-        // offset is the index within buffer that lines up with the start of
-        // pat_buf
-        int start = std::max((int)minPrefix - offset, 0);
-        int end = std::min(pat_len, (int)maxOffset - offset);
-        for (int k = start; k < end; k++) {
-          buffer[offset + k] = std::max(buffer[offset + k], pat_buf[k]);
-        }
-      }
-    }
-  }
-  // Since the above calculation does not modify values outside
-  // [minPrefix, len - minSuffix], they are left as 0 = DONT_BREAK.
-  for (size_t i = minPrefix; i < maxOffset; i++) {
-    // Hyphenation opportunities happen when the hyphenation numbers are odd.
-    result[i] = (buffer[i] & 1u) ? hyphenValue : HyphenationType::DONT_BREAK;
-  }
-}
-
-}  // namespace minikin
diff --git a/third_party/txt/src/minikin/Hyphenator.h b/third_party/txt/src/minikin/Hyphenator.h
deleted file mode 100644
index 26b898ed24fa6774d2e48be4263b11e38c95b500..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/Hyphenator.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * An implementation of Liang's hyphenation algorithm.
- */
-
-#ifndef U_USING_ICU_NAMESPACE
-#define U_USING_ICU_NAMESPACE 0
-#endif  //  U_USING_ICU_NAMESPACE
-
-#include <memory>
-#include <unordered_map>
-#include <vector>
-#include "unicode/locid.h"
-
-#ifndef MINIKIN_HYPHENATOR_H
-#define MINIKIN_HYPHENATOR_H
-
-namespace minikin {
-
-enum class HyphenationType : uint8_t {
-  // Note: There are implicit assumptions scattered in the code that DONT_BREAK
-  // is 0.
-
-  // Do not break.
-  DONT_BREAK = 0,
-  // Break the line and insert a normal hyphen.
-  BREAK_AND_INSERT_HYPHEN = 1,
-  // Break the line and insert an Armenian hyphen (U+058A).
-  BREAK_AND_INSERT_ARMENIAN_HYPHEN = 2,
-  // Break the line and insert a maqaf (Hebrew hyphen, U+05BE).
-  BREAK_AND_INSERT_MAQAF = 3,
-  // Break the line and insert a Canadian Syllabics hyphen (U+1400).
-  BREAK_AND_INSERT_UCAS_HYPHEN = 4,
-  // Break the line, but don't insert a hyphen. Used for cases when there is
-  // already a hyphen
-  // present or the script does not use a hyphen (e.g. in Malayalam).
-  BREAK_AND_DONT_INSERT_HYPHEN = 5,
-  // Break and replace the last code unit with hyphen. Used for Catalan "l·l"
-  // which hyphenates
-  // as "l-/l".
-  BREAK_AND_REPLACE_WITH_HYPHEN = 6,
-  // Break the line, and repeat the hyphen (which is the last character) at the
-  // beginning of the
-  // next line. Used in Polish, where "czerwono-niebieska" should hyphenate as
-  // "czerwono-/-niebieska".
-  BREAK_AND_INSERT_HYPHEN_AT_NEXT_LINE = 7,
-  // Break the line, insert a ZWJ and hyphen at the first line, and a ZWJ at the
-  // second line.
-  // This is used in Arabic script, mostly for writing systems of Central Asia.
-  // It's our default
-  // behavior when a soft hyphen is used in Arabic script.
-  BREAK_AND_INSERT_HYPHEN_AND_ZWJ = 8
-};
-
-// The hyphen edit represents an edit to the string when a word is
-// hyphenated. The most common hyphen edit is adding a "-" at the end
-// of a syllable, but nonstandard hyphenation allows for more choices.
-// Note that a HyphenEdit can hold two types of edits at the same time,
-// One at the beginning of the string/line and one at the end.
-class HyphenEdit {
- public:
-  static const uint32_t NO_EDIT = 0x00;
-
-  static const uint32_t INSERT_HYPHEN_AT_END = 0x01;
-  static const uint32_t INSERT_ARMENIAN_HYPHEN_AT_END = 0x02;
-  static const uint32_t INSERT_MAQAF_AT_END = 0x03;
-  static const uint32_t INSERT_UCAS_HYPHEN_AT_END = 0x04;
-  static const uint32_t INSERT_ZWJ_AND_HYPHEN_AT_END = 0x05;
-  static const uint32_t REPLACE_WITH_HYPHEN_AT_END = 0x06;
-  static const uint32_t BREAK_AT_END = 0x07;
-
-  static const uint32_t INSERT_HYPHEN_AT_START = 0x01 << 3;
-  static const uint32_t INSERT_ZWJ_AT_START = 0x02 << 3;
-  static const uint32_t BREAK_AT_START = 0x03 << 3;
-
-  // Keep in sync with the definitions in the Java code at:
-  // frameworks/base/graphics/java/android/graphics/Paint.java
-  static const uint32_t MASK_END_OF_LINE = 0x07;
-  static const uint32_t MASK_START_OF_LINE = 0x03 << 3;
-
-  inline static bool isReplacement(uint32_t hyph) {
-    return hyph == REPLACE_WITH_HYPHEN_AT_END;
-  }
-
-  inline static bool isInsertion(uint32_t hyph) {
-    return (hyph == INSERT_HYPHEN_AT_END ||
-            hyph == INSERT_ARMENIAN_HYPHEN_AT_END ||
-            hyph == INSERT_MAQAF_AT_END || hyph == INSERT_UCAS_HYPHEN_AT_END ||
-            hyph == INSERT_ZWJ_AND_HYPHEN_AT_END ||
-            hyph == INSERT_HYPHEN_AT_START || hyph == INSERT_ZWJ_AT_START);
-  }
-
-  const static uint32_t* getHyphenString(uint32_t hyph);
-  static uint32_t editForThisLine(HyphenationType type);
-  static uint32_t editForNextLine(HyphenationType type);
-
-  HyphenEdit() : hyphen(NO_EDIT) {}
-  HyphenEdit(uint32_t hyphenInt)  // NOLINT(google-explicit-constructor)
-      : hyphen(hyphenInt) {}
-  uint32_t getHyphen() const { return hyphen; }
-  bool operator==(const HyphenEdit& other) const {
-    return hyphen == other.hyphen;
-  }
-
-  uint32_t getEnd() const { return hyphen & MASK_END_OF_LINE; }
-  uint32_t getStart() const { return hyphen & MASK_START_OF_LINE; }
-
- private:
-  uint32_t hyphen;
-};
-
-// hyb file header; implementation details are in the .cpp file
-struct Header;
-
-class Hyphenator {
- public:
-  // Compute the hyphenation of a word, storing the hyphenation in result
-  // vector. Each entry in the vector is a "hyphenation type" for a potential
-  // hyphenation that can be applied at the corresponding code unit offset in
-  // the word.
-  //
-  // Example: word is "hyphen", result is the following, corresponding to
-  // "hy-phen": [DONT_BREAK, DONT_BREAK, BREAK_AND_INSERT_HYPHEN, DONT_BREAK,
-  // DONT_BREAK, DONT_BREAK]
-  void hyphenate(std::vector<HyphenationType>* result,
-                 const uint16_t* word,
-                 size_t len,
-                 const icu::Locale& locale);
-
-  // Returns true if the codepoint is like U+2010 HYPHEN in line breaking and
-  // usage: a character immediately after which line breaks are allowed, but
-  // words containing it should not be automatically hyphenated.
-  static bool isLineBreakingHyphen(uint32_t cp);
-
-  // pattern data is in binary format, as described in doc/hyb_file_format.md.
-  // Note: the caller is responsible for ensuring that the lifetime of the
-  // pattern data is at least as long as the Hyphenator object.
-
-  // Note: nullptr is valid input, in which case the hyphenator only processes
-  // soft hyphens.
-  static Hyphenator* loadBinary(const uint8_t* patternData,
-                                size_t minPrefix,
-                                size_t minSuffix);
-
- private:
-  // apply various hyphenation rules including hard and soft hyphens, ignoring
-  // patterns
-  void hyphenateWithNoPatterns(HyphenationType* result,
-                               const uint16_t* word,
-                               size_t len,
-                               const icu::Locale& locale);
-
-  // Try looking up word in alphabet table, return DONT_BREAK if any code units
-  // fail to map. Otherwise, returns BREAK_AND_INSERT_HYPHEN,
-  // BREAK_AND_INSERT_ARMENIAN_HYPHEN, or BREAK_AND_DONT_INSERT_HYPHEN based on
-  // the script of the characters seen. Note that this method writes len+2
-  // entries into alpha_codes (including start and stop)
-  HyphenationType alphabetLookup(uint16_t* alpha_codes,
-                                 const uint16_t* word,
-                                 size_t len);
-
-  // calculate hyphenation from patterns, assuming alphabet lookup has already
-  // been done
-  void hyphenateFromCodes(HyphenationType* result,
-                          const uint16_t* codes,
-                          size_t len,
-                          HyphenationType hyphenValue);
-
-  // See also LONGEST_HYPHENATED_WORD in LineBreaker.cpp. Here the constant is
-  // used so that temporary buffers can be stack-allocated without waste, which
-  // is a slightly different use case. It measures UTF-16 code units.
-  static const size_t MAX_HYPHENATED_SIZE = 64;
-
-  const uint8_t* patternData;
-  size_t minPrefix, minSuffix;
-
-  // accessors for binary data
-  const Header* getHeader() const {
-    return reinterpret_cast<const Header*>(patternData);
-  }
-};
-
-}  // namespace minikin
-
-#endif  // MINIKIN_HYPHENATOR_H
diff --git a/third_party/txt/src/minikin/Layout.cpp b/third_party/txt/src/minikin/Layout.cpp
deleted file mode 100644
index 59c3d2a2e25435f6ed7defa40f110f3ceeb016e8..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/Layout.cpp
+++ /dev/null
@@ -1,1202 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "Minikin"
-
-#include <math.h>
-#include <unicode/ubidi.h>
-#include <unicode/utf16.h>
-#include <algorithm>
-#include <fstream>
-#include <iostream>  // for debugging
-#include <string>
-#include <vector>
-
-#include <log/log.h>
-#include <utils/JenkinsHash.h>
-#include <utils/LruCache.h>
-#include <utils/WindowsUtils.h>
-
-#include <hb-icu.h>
-#include <hb-ot.h>
-
-#include <minikin/Emoji.h>
-#include <minikin/Layout.h>
-#include "FontLanguage.h"
-#include "FontLanguageListCache.h"
-#include "HbFontCache.h"
-#include "LayoutUtils.h"
-#include "MinikinInternal.h"
-
-namespace minikin {
-
-const int kDirection_Mask = 0x1;
-
-struct LayoutContext {
-  MinikinPaint paint;
-  FontStyle style;
-  std::vector<hb_font_t*> hbFonts;  // parallel to mFaces
-
-  void clearHbFonts() {
-    for (size_t i = 0; i < hbFonts.size(); i++) {
-      hb_font_set_funcs(hbFonts[i], nullptr, nullptr, nullptr);
-      hb_font_destroy(hbFonts[i]);
-    }
-    hbFonts.clear();
-  }
-};
-
-// Layout cache datatypes
-
-class LayoutCacheKey {
- public:
-  LayoutCacheKey(const std::shared_ptr<FontCollection>& collection,
-                 const MinikinPaint& paint,
-                 FontStyle style,
-                 const uint16_t* chars,
-                 size_t start,
-                 size_t count,
-                 size_t nchars,
-                 bool dir)
-      : mChars(chars),
-        mNchars(nchars),
-        mStart(start),
-        mCount(count),
-        mId(collection->getId()),
-        mStyle(style),
-        mSize(paint.size),
-        mScaleX(paint.scaleX),
-        mSkewX(paint.skewX),
-        mLetterSpacing(paint.letterSpacing),
-        mPaintFlags(paint.paintFlags),
-        mHyphenEdit(paint.hyphenEdit),
-        mIsRtl(dir),
-        mHash(computeHash()) {}
-  bool operator==(const LayoutCacheKey& other) const;
-
-  android::hash_t hash() const { return mHash; }
-
-  void copyText() {
-    uint16_t* charsCopy = new uint16_t[mNchars];
-    memcpy(charsCopy, mChars, mNchars * sizeof(uint16_t));
-    mChars = charsCopy;
-  }
-  void freeText() {
-    delete[] mChars;
-    mChars = NULL;
-  }
-
-  void doLayout(Layout* layout,
-                LayoutContext* ctx,
-                const std::shared_ptr<FontCollection>& collection) const {
-    layout->mAdvances.resize(mCount, 0);
-    ctx->clearHbFonts();
-    layout->doLayoutRun(mChars, mStart, mCount, mNchars, mIsRtl, ctx,
-                        collection);
-  }
-
- private:
-  const uint16_t* mChars;
-  size_t mNchars;
-  size_t mStart;
-  size_t mCount;
-  uint32_t mId;  // for the font collection
-  FontStyle mStyle;
-  float mSize;
-  float mScaleX;
-  float mSkewX;
-  float mLetterSpacing;
-  int32_t mPaintFlags;
-  HyphenEdit mHyphenEdit;
-  bool mIsRtl;
-  // Note: any fields added to MinikinPaint must also be reflected here.
-  // TODO: language matching (possibly integrate into style)
-  android::hash_t mHash;
-
-  android::hash_t computeHash() const;
-};
-
-class LayoutCache : private android::OnEntryRemoved<LayoutCacheKey, Layout*> {
- public:
-  LayoutCache() : mCache(kMaxEntries) {
-    mCache.setOnEntryRemovedListener(this);
-  }
-
-  void clear() { mCache.clear(); }
-
-  Layout* get(LayoutCacheKey& key,
-              LayoutContext* ctx,
-              const std::shared_ptr<FontCollection>& collection) {
-    Layout* layout = mCache.get(key);
-    if (layout == NULL) {
-      key.copyText();
-      layout = new Layout();
-      key.doLayout(layout, ctx, collection);
-      mCache.put(key, layout);
-    }
-    return layout;
-  }
-
- private:
-  // callback for OnEntryRemoved
-  void operator()(LayoutCacheKey& key, Layout*& value) {
-    key.freeText();
-    delete value;
-  }
-
-  android::LruCache<LayoutCacheKey, Layout*> mCache;
-
-  // static const size_t kMaxEntries = LruCache<LayoutCacheKey,
-  // Layout*>::kUnlimitedCapacity;
-
-  // TODO: eviction based on memory footprint; for now, we just use a constant
-  // number of strings
-  static const size_t kMaxEntries = 5000;
-};
-
-class LayoutEngine {
- public:
-  LayoutEngine() {
-    unicodeFunctions = hb_unicode_funcs_create(hb_icu_get_unicode_funcs());
-    hbBuffer = hb_buffer_create();
-    hb_buffer_set_unicode_funcs(hbBuffer, unicodeFunctions);
-  }
-
-  hb_buffer_t* hbBuffer;
-  hb_unicode_funcs_t* unicodeFunctions;
-  LayoutCache layoutCache;
-
-  static LayoutEngine& getInstance() {
-    static LayoutEngine* instance = new LayoutEngine();
-    return *instance;
-  }
-};
-
-bool LayoutCacheKey::operator==(const LayoutCacheKey& other) const {
-  return mId == other.mId && mStart == other.mStart && mCount == other.mCount &&
-         mStyle == other.mStyle && mSize == other.mSize &&
-         mScaleX == other.mScaleX && mSkewX == other.mSkewX &&
-         mLetterSpacing == other.mLetterSpacing &&
-         mPaintFlags == other.mPaintFlags && mHyphenEdit == other.mHyphenEdit &&
-         mIsRtl == other.mIsRtl && mNchars == other.mNchars &&
-         !memcmp(mChars, other.mChars, mNchars * sizeof(uint16_t));
-}
-
-android::hash_t LayoutCacheKey::computeHash() const {
-  uint32_t hash = android::JenkinsHashMix(0, mId);
-  hash = android::JenkinsHashMix(hash, mStart);
-  hash = android::JenkinsHashMix(hash, mCount);
-  hash = android::JenkinsHashMix(hash, hash_type(mStyle));
-  hash = android::JenkinsHashMix(hash, hash_type(mSize));
-  hash = android::JenkinsHashMix(hash, hash_type(mScaleX));
-  hash = android::JenkinsHashMix(hash, hash_type(mSkewX));
-  hash = android::JenkinsHashMix(hash, hash_type(mLetterSpacing));
-  hash = android::JenkinsHashMix(hash, hash_type(mPaintFlags));
-  hash = android::JenkinsHashMix(hash, hash_type(mHyphenEdit.getHyphen()));
-  hash = android::JenkinsHashMix(hash, hash_type(mIsRtl));
-  hash = android::JenkinsHashMixShorts(hash, mChars, mNchars);
-  return android::JenkinsHashWhiten(hash);
-}
-
-android::hash_t hash_type(const LayoutCacheKey& key) {
-  return key.hash();
-}
-
-void MinikinRect::join(const MinikinRect& r) {
-  if (isEmpty()) {
-    set(r);
-  } else if (!r.isEmpty()) {
-    mLeft = std::min(mLeft, r.mLeft);
-    mTop = std::min(mTop, r.mTop);
-    mRight = std::max(mRight, r.mRight);
-    mBottom = std::max(mBottom, r.mBottom);
-  }
-}
-
-void Layout::reset() {
-  mGlyphs.clear();
-  mFaces.clear();
-  mBounds.setEmpty();
-  mAdvances.clear();
-  mAdvance = 0;
-}
-
-static hb_position_t harfbuzzGetGlyphHorizontalAdvance(hb_font_t* /* hbFont */,
-                                                       void* fontData,
-                                                       hb_codepoint_t glyph,
-                                                       void* /* userData */) {
-  MinikinPaint* paint = reinterpret_cast<MinikinPaint*>(fontData);
-  float advance = paint->font->GetHorizontalAdvance(glyph, *paint);
-  return 256 * advance + 0.5;
-}
-
-static hb_bool_t harfbuzzGetGlyphHorizontalOrigin(hb_font_t* /* hbFont */,
-                                                  void* /* fontData */,
-                                                  hb_codepoint_t /* glyph */,
-                                                  hb_position_t* /* x */,
-                                                  hb_position_t* /* y */,
-                                                  void* /* userData */) {
-  // Just return true, following the way that Harfbuzz-FreeType
-  // implementation does.
-  return true;
-}
-
-hb_font_funcs_t* getHbFontFuncs(bool forColorBitmapFont) {
-  assertMinikinLocked();
-
-  static hb_font_funcs_t* hbFuncs = nullptr;
-  static hb_font_funcs_t* hbFuncsForColorBitmap = nullptr;
-
-  hb_font_funcs_t** funcs =
-      forColorBitmapFont ? &hbFuncs : &hbFuncsForColorBitmap;
-  if (*funcs == nullptr) {
-    *funcs = hb_font_funcs_create();
-    if (forColorBitmapFont) {
-      // Don't override the h_advance function since we use HarfBuzz's
-      // implementation for emoji for performance reasons. Note that it is
-      // technically possible for a TrueType font to have outline and embedded
-      // bitmap at the same time. We ignore modified advances of hinted outline
-      // glyphs in that case.
-    } else {
-      // Override the h_advance function since we can't use HarfBuzz's
-      // implemenation. It may return the wrong value if the font uses hinting
-      // aggressively.
-      hb_font_funcs_set_glyph_h_advance_func(
-          *funcs, harfbuzzGetGlyphHorizontalAdvance, 0, 0);
-    }
-    hb_font_funcs_set_glyph_h_origin_func(
-        *funcs, harfbuzzGetGlyphHorizontalOrigin, 0, 0);
-    hb_font_funcs_make_immutable(*funcs);
-  }
-  return *funcs;
-}
-
-static bool isColorBitmapFont(hb_font_t* font) {
-  hb_face_t* face = hb_font_get_face(font);
-  return hb_ot_color_has_png(face);
-}
-
-static float HBFixedToFloat(hb_position_t v) {
-  return scalbnf(v, -8);
-}
-
-static hb_position_t HBFloatToFixed(float v) {
-  return scalbnf(v, +8);
-}
-
-void Layout::dump() const {
-  for (size_t i = 0; i < mGlyphs.size(); i++) {
-    const LayoutGlyph& glyph = mGlyphs[i];
-    std::cout << glyph.glyph_id << ": " << glyph.x << ", " << glyph.y
-              << std::endl;
-  }
-}
-
-int Layout::findFace(const FakedFont& face, LayoutContext* ctx) {
-  unsigned int ix;
-  for (ix = 0; ix < mFaces.size(); ix++) {
-    if (mFaces[ix].font == face.font) {
-      return ix;
-    }
-  }
-  mFaces.push_back(face);
-  // Note: ctx == NULL means we're copying from the cache, no need to create
-  // corresponding hb_font object.
-  if (ctx != NULL) {
-    hb_font_t* font = getHbFontLocked(face.font);
-    hb_font_set_funcs(font, getHbFontFuncs(isColorBitmapFont(font)),
-                      &ctx->paint, 0);
-    ctx->hbFonts.push_back(font);
-  }
-  return ix;
-}
-
-static hb_script_t codePointToScript(hb_codepoint_t codepoint) {
-  static hb_unicode_funcs_t* u = 0;
-  if (!u) {
-    u = LayoutEngine::getInstance().unicodeFunctions;
-  }
-  return hb_unicode_script(u, codepoint);
-}
-
-static hb_codepoint_t decodeUtf16(const uint16_t* chars,
-                                  size_t len,
-                                  ssize_t* iter) {
-  const uint16_t v = chars[(*iter)++];
-  // test whether v in (0xd800..0xdfff), lead or trail surrogate
-  if ((v & 0xf800) == 0xd800) {
-    // test whether v in (0xd800..0xdbff), lead surrogate
-    if (size_t(*iter) < len && (v & 0xfc00) == 0xd800) {
-      const uint16_t v2 = chars[(*iter)++];
-      // test whether v2 in (0xdc00..0xdfff), trail surrogate
-      if ((v2 & 0xfc00) == 0xdc00) {
-        // (0xd800 0xdc00) in utf-16 maps to 0x10000 in ucs-32
-        const hb_codepoint_t delta = (0xd800 << 10) + 0xdc00 - 0x10000;
-        return (((hb_codepoint_t)v) << 10) + v2 - delta;
-      }
-      (*iter) -= 1;
-      return 0xFFFDu;
-    } else {
-      return 0xFFFDu;
-    }
-  } else {
-    return v;
-  }
-}
-
-static hb_script_t getScriptRun(const uint16_t* chars,
-                                size_t len,
-                                ssize_t* iter) {
-  if (size_t(*iter) == len) {
-    return HB_SCRIPT_UNKNOWN;
-  }
-  uint32_t cp = decodeUtf16(chars, len, iter);
-  hb_script_t current_script = codePointToScript(cp);
-  for (;;) {
-    if (size_t(*iter) == len)
-      break;
-    const ssize_t prev_iter = *iter;
-    cp = decodeUtf16(chars, len, iter);
-    const hb_script_t script = codePointToScript(cp);
-    if (script != current_script) {
-      if (current_script == HB_SCRIPT_INHERITED ||
-          current_script == HB_SCRIPT_COMMON) {
-        current_script = script;
-      } else if (script == HB_SCRIPT_INHERITED || script == HB_SCRIPT_COMMON) {
-        continue;
-      } else {
-        *iter = prev_iter;
-        break;
-      }
-    }
-  }
-  if (current_script == HB_SCRIPT_INHERITED) {
-    current_script = HB_SCRIPT_COMMON;
-  }
-
-  return current_script;
-}
-
-/**
- * Disable certain scripts (mostly those with cursive connection) from having
- * letterspacing applied. See https://github.com/behdad/harfbuzz/issues/64 for
- * more details.
- */
-static bool isScriptOkForLetterspacing(hb_script_t script) {
-  return !(script == HB_SCRIPT_ARABIC || script == HB_SCRIPT_NKO ||
-           script == HB_SCRIPT_PSALTER_PAHLAVI || script == HB_SCRIPT_MANDAIC ||
-           script == HB_SCRIPT_MONGOLIAN || script == HB_SCRIPT_PHAGS_PA ||
-           script == HB_SCRIPT_DEVANAGARI || script == HB_SCRIPT_BENGALI ||
-           script == HB_SCRIPT_GURMUKHI || script == HB_SCRIPT_MODI ||
-           script == HB_SCRIPT_SHARADA || script == HB_SCRIPT_SYLOTI_NAGRI ||
-           script == HB_SCRIPT_TIRHUTA || script == HB_SCRIPT_OGHAM);
-}
-
-class BidiText {
- public:
-  class Iter {
-   public:
-    struct RunInfo {
-      int32_t mRunStart;
-      int32_t mRunLength;
-      bool mIsRtl;
-    };
-
-    Iter(UBiDi* bidi,
-         size_t start,
-         size_t end,
-         size_t runIndex,
-         size_t runCount,
-         bool isRtl);
-
-    bool operator!=(const Iter& other) const {
-      return mIsEnd != other.mIsEnd || mNextRunIndex != other.mNextRunIndex ||
-             mBidi != other.mBidi;
-    }
-
-    const RunInfo& operator*() const { return mRunInfo; }
-
-    const Iter& operator++() {
-      updateRunInfo();
-      return *this;
-    }
-
-   private:
-    UBiDi* const mBidi;
-    bool mIsEnd;
-    size_t mNextRunIndex;
-    const size_t mRunCount;
-    const int32_t mStart;
-    const int32_t mEnd;
-    RunInfo mRunInfo;
-
-    void updateRunInfo();
-  };
-
-  BidiText(const uint16_t* buf,
-           size_t start,
-           size_t count,
-           size_t bufSize,
-           int bidiFlags);
-
-  ~BidiText() {
-    if (mBidi) {
-      ubidi_close(mBidi);
-    }
-  }
-
-  Iter begin() const { return Iter(mBidi, mStart, mEnd, 0, mRunCount, mIsRtl); }
-
-  Iter end() const {
-    return Iter(mBidi, mStart, mEnd, mRunCount, mRunCount, mIsRtl);
-  }
-
- private:
-  const size_t mStart;
-  const size_t mEnd;
-  const size_t mBufSize;
-  UBiDi* mBidi;
-  size_t mRunCount;
-  bool mIsRtl;
-
-  BidiText(const BidiText&) = delete;
-  void operator=(const BidiText&) = delete;
-};
-
-BidiText::Iter::Iter(UBiDi* bidi,
-                     size_t start,
-                     size_t end,
-                     size_t runIndex,
-                     size_t runCount,
-                     bool isRtl)
-    : mBidi(bidi),
-      mIsEnd(runIndex == runCount),
-      mNextRunIndex(runIndex),
-      mRunCount(runCount),
-      mStart(start),
-      mEnd(end),
-      mRunInfo() {
-  if (mRunCount == 1) {
-    mRunInfo.mRunStart = start;
-    mRunInfo.mRunLength = end - start;
-    mRunInfo.mIsRtl = isRtl;
-    mNextRunIndex = mRunCount;
-    return;
-  }
-  updateRunInfo();
-}
-
-void BidiText::Iter::updateRunInfo() {
-  if (mNextRunIndex == mRunCount) {
-    // All runs have been iterated.
-    mIsEnd = true;
-    return;
-  }
-  int32_t startRun = -1;
-  int32_t lengthRun = -1;
-  const UBiDiDirection runDir =
-      ubidi_getVisualRun(mBidi, mNextRunIndex, &startRun, &lengthRun);
-  mNextRunIndex++;
-  if (startRun == -1 || lengthRun == -1) {
-    ALOGE("invalid visual run");
-    // skip the invalid run.
-    updateRunInfo();
-    return;
-  }
-  const int32_t runEnd = std::min(startRun + lengthRun, mEnd);
-  mRunInfo.mRunStart = std::max(startRun, mStart);
-  mRunInfo.mRunLength = runEnd - mRunInfo.mRunStart;
-  if (mRunInfo.mRunLength <= 0) {
-    // skip the empty run.
-    updateRunInfo();
-    return;
-  }
-  mRunInfo.mIsRtl = (runDir == UBIDI_RTL);
-}
-
-BidiText::BidiText(const uint16_t* buf,
-                   size_t start,
-                   size_t count,
-                   size_t bufSize,
-                   int bidiFlags)
-    : mStart(start),
-      mEnd(start + count),
-      mBufSize(bufSize),
-      mBidi(NULL),
-      mRunCount(1),
-      mIsRtl((bidiFlags & kDirection_Mask) != 0) {
-  if (bidiFlags == kBidi_Force_LTR || bidiFlags == kBidi_Force_RTL) {
-    // force single run.
-    return;
-  }
-  mBidi = ubidi_open();
-  if (!mBidi) {
-    ALOGE("error creating bidi object");
-    return;
-  }
-  UErrorCode status = U_ZERO_ERROR;
-  // Set callbacks to override bidi classes of new emoji
-  ubidi_setClassCallback(mBidi, emojiBidiOverride, nullptr, nullptr, nullptr,
-                         &status);
-  if (!U_SUCCESS(status)) {
-    ALOGE("error setting bidi callback function, status = %d", status);
-    return;
-  }
-
-  UBiDiLevel bidiReq = bidiFlags;
-  if (bidiFlags == kBidi_Default_LTR) {
-    bidiReq = UBIDI_DEFAULT_LTR;
-  } else if (bidiFlags == kBidi_Default_RTL) {
-    bidiReq = UBIDI_DEFAULT_RTL;
-  }
-  ubidi_setPara(mBidi, reinterpret_cast<const UChar*>(buf), mBufSize, bidiReq,
-                NULL, &status);
-  if (!U_SUCCESS(status)) {
-    ALOGE("error calling ubidi_setPara, status = %d", status);
-    return;
-  }
-  const int paraDir = ubidi_getParaLevel(mBidi) & kDirection_Mask;
-  const ssize_t rc = ubidi_countRuns(mBidi, &status);
-  if (!U_SUCCESS(status) || rc < 0) {
-    ALOGW("error counting bidi runs, status = %d", status);
-  }
-  if (!U_SUCCESS(status) || rc <= 1) {
-    mIsRtl = (paraDir == kBidi_RTL);
-    return;
-  }
-  mRunCount = rc;
-}
-
-void Layout::doLayout(const uint16_t* buf,
-                      size_t start,
-                      size_t count,
-                      size_t bufSize,
-                      bool isRtl,
-                      const FontStyle& style,
-                      const MinikinPaint& paint,
-                      const std::shared_ptr<FontCollection>& collection) {
-  std::scoped_lock _l(gMinikinLock);
-
-  LayoutContext ctx;
-  ctx.style = style;
-  ctx.paint = paint;
-
-  reset();
-  mAdvances.resize(count, 0);
-
-  doLayoutRunCached(buf, start, count, bufSize, isRtl, &ctx, start, collection,
-                    this, NULL);
-
-  ctx.clearHbFonts();
-}
-
-float Layout::measureText(const uint16_t* buf,
-                          size_t start,
-                          size_t count,
-                          size_t bufSize,
-                          bool isRtl,
-                          const FontStyle& style,
-                          const MinikinPaint& paint,
-                          const std::shared_ptr<FontCollection>& collection,
-                          float* advances) {
-  std::scoped_lock _l(gMinikinLock);
-
-  LayoutContext ctx;
-  ctx.style = style;
-  ctx.paint = paint;
-
-  float advance = doLayoutRunCached(buf, start, count, bufSize, isRtl, &ctx, 0,
-                                    collection, NULL, advances);
-
-  ctx.clearHbFonts();
-  return advance;
-}
-
-float Layout::doLayoutRunCached(
-    const uint16_t* buf,
-    size_t start,
-    size_t count,
-    size_t bufSize,
-    bool isRtl,
-    LayoutContext* ctx,
-    size_t dstStart,
-    const std::shared_ptr<FontCollection>& collection,
-    Layout* layout,
-    float* advances) {
-  const uint32_t originalHyphen = ctx->paint.hyphenEdit.getHyphen();
-  float advance = 0;
-  if (!isRtl) {
-    // left to right
-    size_t wordstart = start == bufSize
-                           ? start
-                           : getPrevWordBreakForCache(buf, start + 1, bufSize);
-    size_t wordend;
-    for (size_t iter = start; iter < start + count; iter = wordend) {
-      wordend = getNextWordBreakForCache(buf, iter, bufSize);
-      // Only apply hyphen to the first or last word in the string.
-      uint32_t hyphen = originalHyphen;
-      if (iter != start) {  // Not the first word
-        hyphen &= ~HyphenEdit::MASK_START_OF_LINE;
-      }
-      if (wordend < start + count) {  // Not the last word
-        hyphen &= ~HyphenEdit::MASK_END_OF_LINE;
-      }
-      ctx->paint.hyphenEdit = hyphen;
-      size_t wordcount = std::min(start + count, wordend) - iter;
-      advance += doLayoutWord(buf + wordstart, iter - wordstart, wordcount,
-                              wordend - wordstart, isRtl, ctx, iter - dstStart,
-                              collection, layout,
-                              advances ? advances + (iter - start) : advances);
-      wordstart = wordend;
-    }
-  } else {
-    // right to left
-    size_t wordstart;
-    size_t end = start + count;
-    size_t wordend =
-        end == 0 ? 0 : getNextWordBreakForCache(buf, end - 1, bufSize);
-    for (size_t iter = end; iter > start; iter = wordstart) {
-      wordstart = getPrevWordBreakForCache(buf, iter, bufSize);
-      // Only apply hyphen to the first (rightmost) or last (leftmost) word in
-      // the string.
-      uint32_t hyphen = originalHyphen;
-      if (wordstart > start) {  // Not the first word
-        hyphen &= ~HyphenEdit::MASK_START_OF_LINE;
-      }
-      if (iter != end) {  // Not the last word
-        hyphen &= ~HyphenEdit::MASK_END_OF_LINE;
-      }
-      ctx->paint.hyphenEdit = hyphen;
-      size_t bufStart = std::max(start, wordstart);
-      advance += doLayoutWord(
-          buf + wordstart, bufStart - wordstart, iter - bufStart,
-          wordend - wordstart, isRtl, ctx, bufStart - dstStart, collection,
-          layout, advances ? advances + (bufStart - start) : advances);
-      wordend = wordstart;
-    }
-  }
-  return advance;
-}
-
-float Layout::doLayoutWord(const uint16_t* buf,
-                           size_t start,
-                           size_t count,
-                           size_t bufSize,
-                           bool isRtl,
-                           LayoutContext* ctx,
-                           size_t bufStart,
-                           const std::shared_ptr<FontCollection>& collection,
-                           Layout* layout,
-                           float* advances) {
-  LayoutCache& cache = LayoutEngine::getInstance().layoutCache;
-  LayoutCacheKey key(collection, ctx->paint, ctx->style, buf, start, count,
-                     bufSize, isRtl);
-
-  float wordSpacing =
-      count == 1 && isWordSpace(buf[start]) ? ctx->paint.wordSpacing : 0;
-
-  float advance;
-  if (ctx->paint.skipCache()) {
-    Layout layoutForWord;
-    key.doLayout(&layoutForWord, ctx, collection);
-    if (layout) {
-      layout->appendLayout(&layoutForWord, bufStart, wordSpacing);
-    }
-    if (advances) {
-      layoutForWord.getAdvances(advances);
-    }
-    advance = layoutForWord.getAdvance();
-  } else {
-    Layout* layoutForWord = cache.get(key, ctx, collection);
-    if (layout) {
-      layout->appendLayout(layoutForWord, bufStart, wordSpacing);
-    }
-    if (advances) {
-      layoutForWord->getAdvances(advances);
-    }
-    advance = layoutForWord->getAdvance();
-  }
-
-  if (wordSpacing != 0) {
-    advance += wordSpacing;
-    if (advances) {
-      advances[0] += wordSpacing;
-    }
-  }
-  return advance;
-}
-
-static void addFeatures(const std::string& str,
-                        std::vector<hb_feature_t>* features) {
-  if (!str.size())
-    return;
-
-  const char* start = str.c_str();
-  const char* end = start + str.size();
-
-  while (start < end) {
-    static hb_feature_t feature;
-    const char* p = strchr(start, ',');
-    if (!p)
-      p = end;
-    /* We do not allow setting features on ranges.  As such, reject any
-     * setting that has non-universal range. */
-    if (hb_feature_from_string(start, p - start, &feature) &&
-        feature.start == 0 && feature.end == (unsigned int)-1)
-      features->push_back(feature);
-    start = p + 1;
-  }
-}
-
-static const hb_codepoint_t CHAR_HYPHEN = 0x2010; /* HYPHEN */
-
-static inline hb_codepoint_t determineHyphenChar(hb_codepoint_t preferredHyphen,
-                                                 hb_font_t* font) {
-  hb_codepoint_t glyph;
-  if (preferredHyphen == 0x058A    /* ARMENIAN_HYPHEN */
-      || preferredHyphen == 0x05BE /* HEBREW PUNCTUATION MAQAF */
-      || preferredHyphen == 0x1400 /* CANADIAN SYLLABIC HYPHEN */) {
-    if (hb_font_get_nominal_glyph(font, preferredHyphen, &glyph)) {
-      return preferredHyphen;
-    } else {
-      // The original hyphen requested was not supported. Let's try and see if
-      // the Unicode hyphen is supported.
-      preferredHyphen = CHAR_HYPHEN;
-    }
-  }
-  if (preferredHyphen == CHAR_HYPHEN) { /* HYPHEN */
-    // Fallback to ASCII HYPHEN-MINUS if the font didn't have a glyph for the
-    // preferred hyphen. Note that we intentionally don't do anything special if
-    // the font doesn't have a HYPHEN-MINUS either, so a tofu could be shown,
-    // hinting towards something missing.
-    if (!hb_font_get_nominal_glyph(font, preferredHyphen, &glyph)) {
-      return 0x002D;  // HYPHEN-MINUS
-    }
-  }
-  return preferredHyphen;
-}
-
-static inline void addHyphenToHbBuffer(hb_buffer_t* buffer,
-                                       hb_font_t* font,
-                                       uint32_t hyphen,
-                                       uint32_t cluster) {
-  const uint32_t* hyphenStr = HyphenEdit::getHyphenString(hyphen);
-  while (*hyphenStr != 0) {
-    hb_codepoint_t hyphenChar = determineHyphenChar(*hyphenStr, font);
-    hb_buffer_add(buffer, hyphenChar, cluster);
-    hyphenStr++;
-  }
-}
-
-// Returns the cluster value assigned to the first codepoint added to the
-// buffer, which can be used to translate cluster values returned by HarfBuzz to
-// input indices.
-static inline uint32_t addToHbBuffer(hb_buffer_t* buffer,
-                                     const uint16_t* buf,
-                                     size_t start,
-                                     size_t count,
-                                     size_t bufSize,
-                                     ssize_t scriptRunStart,
-                                     ssize_t scriptRunEnd,
-                                     HyphenEdit hyphenEdit,
-                                     hb_font_t* hbFont) {
-  // Only hyphenate the very first script run for starting hyphens.
-  const uint32_t startHyphen =
-      (scriptRunStart == 0) ? hyphenEdit.getStart() : HyphenEdit::NO_EDIT;
-  // Only hyphenate the very last script run for ending hyphens.
-  const uint32_t endHyphen = (static_cast<size_t>(scriptRunEnd) == count)
-                                 ? hyphenEdit.getEnd()
-                                 : HyphenEdit::NO_EDIT;
-
-  // In the following code, we drop the pre-context and/or post-context if there
-  // is a hyphen edit at that end. This is not absolutely necessary, since
-  // HarfBuzz uses contexts only for joining scripts at the moment, e.g. to
-  // determine if the first or last letter of a text range to shape should take
-  // a joining form based on an adjacent letter or joiner (that comes from the
-  // context).
-  //
-  // TODO: Revisit this for:
-  // 1. Desperate breaks for joining scripts like Arabic (where it may be better
-  // to keep
-  //    the context);
-  // 2. Special features like start-of-word font features (not implemented in
-  // HarfBuzz
-  //    yet).
-
-  // We don't have any start-of-line replacement edit yet, so we don't need to
-  // check for those.
-  if (HyphenEdit::isInsertion(startHyphen)) {
-    // A cluster value of zero guarantees that the inserted hyphen will be in
-    // the same cluster with the next codepoint, since there is no pre-context.
-    addHyphenToHbBuffer(buffer, hbFont, startHyphen, 0 /* cluster value */);
-  }
-
-  const uint16_t* hbText;
-  int hbTextLength;
-  unsigned int hbItemOffset;
-  unsigned int hbItemLength = scriptRunEnd - scriptRunStart;  // This is >= 1.
-
-  const bool hasEndInsertion = HyphenEdit::isInsertion(endHyphen);
-  const bool hasEndReplacement = HyphenEdit::isReplacement(endHyphen);
-  if (hasEndReplacement) {
-    // Skip the last code unit while copying the buffer for HarfBuzz if it's a
-    // replacement. We don't need to worry about non-BMP characters yet since
-    // replacements are only done for code units at the moment.
-    hbItemLength -= 1;
-  }
-
-  if (startHyphen == HyphenEdit::NO_EDIT) {
-    // No edit at the beginning. Use the whole pre-context.
-    hbText = buf;
-    hbItemOffset = start + scriptRunStart;
-  } else {
-    // There's an edit at the beginning. Drop the pre-context and start the
-    // buffer at where we want to start shaping.
-    hbText = buf + start + scriptRunStart;
-    hbItemOffset = 0;
-  }
-
-  if (endHyphen == HyphenEdit::NO_EDIT) {
-    // No edit at the end, use the whole post-context.
-    hbTextLength = (buf + bufSize) - hbText;
-  } else {
-    // There is an edit at the end. Drop the post-context.
-    hbTextLength = hbItemOffset + hbItemLength;
-  }
-
-  hb_buffer_add_utf16(buffer, hbText, hbTextLength, hbItemOffset, hbItemLength);
-
-  unsigned int numCodepoints;
-  hb_glyph_info_t* cpInfo = hb_buffer_get_glyph_infos(buffer, &numCodepoints);
-
-  // Add the hyphen at the end, if there's any.
-  if (hasEndInsertion || hasEndReplacement) {
-    // When a hyphen is inserted, by assigning the added hyphen and the last
-    // codepoint added to the HarfBuzz buffer to the same cluster, we can make
-    // sure that they always remain in the same cluster, even if the last
-    // codepoint gets merged into another cluster (for example when it's a
-    // combining mark).
-    //
-    // When a replacement happens instead, we want it to get the cluster value
-    // of the character it's replacing, which is one "codepoint length" larger
-    // than the last cluster. But since the character replaced is always just
-    // one code unit, we can just add 1.
-    uint32_t hyphenCluster;
-    if (numCodepoints == 0) {
-      // Nothing was added to the HarfBuzz buffer. This can only happen if
-      // we have a replacement that is replacing a one-code unit script run.
-      hyphenCluster = 0;
-    } else {
-      hyphenCluster =
-          cpInfo[numCodepoints - 1].cluster + (uint32_t)hasEndReplacement;
-    }
-    addHyphenToHbBuffer(buffer, hbFont, endHyphen, hyphenCluster);
-    // Since we have just added to the buffer, cpInfo no longer necessarily
-    // points to the right place. Refresh it.
-    cpInfo =
-        hb_buffer_get_glyph_infos(buffer, nullptr /* we don't need the size */);
-  }
-  return cpInfo[0].cluster;
-}
-
-void Layout::doLayoutRun(const uint16_t* buf,
-                         size_t start,
-                         size_t count,
-                         size_t bufSize,
-                         bool isRtl,
-                         LayoutContext* ctx,
-                         const std::shared_ptr<FontCollection>& collection) {
-  hb_buffer_t* buffer = LayoutEngine::getInstance().hbBuffer;
-  std::vector<FontCollection::Run> items;
-  collection->itemize(buf + start, count, ctx->style, &items);
-
-  std::vector<hb_feature_t> features;
-  // Disable default-on non-required ligature features if letter-spacing
-  // See http://dev.w3.org/csswg/css-text-3/#letter-spacing-property
-  // "When the effective spacing between two characters is not zero (due to
-  // either justification or a non-zero value of letter-spacing), user agents
-  // should not apply optional ligatures."
-  if (fabs(ctx->paint.letterSpacing) > 0.03) {
-    static const hb_feature_t no_liga = {HB_TAG('l', 'i', 'g', 'a'), 0, 0, ~0u};
-    static const hb_feature_t no_clig = {HB_TAG('c', 'l', 'i', 'g'), 0, 0, ~0u};
-    features.push_back(no_liga);
-    features.push_back(no_clig);
-  }
-  addFeatures(ctx->paint.fontFeatureSettings, &features);
-
-  double size = ctx->paint.size;
-  double scaleX = ctx->paint.scaleX;
-
-  float x = mAdvance;
-  float y = 0;
-  for (int run_ix = isRtl ? items.size() - 1 : 0;
-       isRtl ? run_ix >= 0 : run_ix < static_cast<int>(items.size());
-       isRtl ? --run_ix : ++run_ix) {
-    FontCollection::Run& run = items[run_ix];
-    if (run.fakedFont.font == NULL) {
-      ALOGE("no font for run starting u+%04x length %d", buf[run.start],
-            run.end - run.start);
-      continue;
-    }
-    int font_ix = findFace(run.fakedFont, ctx);
-    ctx->paint.font = mFaces[font_ix].font;
-    ctx->paint.fakery = mFaces[font_ix].fakery;
-    hb_font_t* hbFont = ctx->hbFonts[font_ix];
-#ifdef VERBOSE_DEBUG
-    ALOGD("Run %zu, font %d [%d:%d]", run_ix, font_ix, run.start, run.end);
-#endif
-
-    hb_font_set_ppem(hbFont, size * scaleX, size);
-    hb_font_set_scale(hbFont, HBFloatToFixed(size * scaleX),
-                      HBFloatToFixed(size));
-
-    const bool is_color_bitmap_font = isColorBitmapFont(hbFont);
-
-    // TODO: if there are multiple scripts within a font in an RTL run,
-    // we need to reorder those runs. This is unlikely with our current
-    // font stack, but should be done for correctness.
-
-    // Note: scriptRunStart and scriptRunEnd, as well as run.start and run.end,
-    // run between 0 and count.
-    ssize_t scriptRunEnd;
-    for (ssize_t scriptRunStart = run.start; scriptRunStart < run.end;
-         scriptRunStart = scriptRunEnd) {
-      scriptRunEnd = scriptRunStart;
-      hb_script_t script =
-          getScriptRun(buf + start, run.end, &scriptRunEnd /* iterator */);
-      // After the last line, scriptRunEnd is guaranteed to have increased,
-      // since the only time getScriptRun does not increase its iterator is when
-      // it has already reached the end of the buffer. But that can't happen,
-      // since if we have already reached the end of the buffer, we should have
-      // had (scriptRunEnd == run.end), which means (scriptRunStart == run.end)
-      // which is impossible due to the exit condition of the for loop. So we
-      // can be sure that scriptRunEnd > scriptRunStart.
-
-      double letterSpace = 0.0;
-      double letterSpaceHalfLeft = 0.0;
-      double letterSpaceHalfRight = 0.0;
-
-      if (ctx->paint.letterSpacing != 0.0 &&
-          isScriptOkForLetterspacing(script)) {
-        letterSpace = ctx->paint.letterSpacing * size * scaleX;
-        if ((ctx->paint.paintFlags & LinearTextFlag) == 0) {
-          letterSpace = round(letterSpace);
-          letterSpaceHalfLeft = floor(letterSpace * 0.5);
-        } else {
-          letterSpaceHalfLeft = letterSpace * 0.5;
-        }
-        letterSpaceHalfRight = letterSpace - letterSpaceHalfLeft;
-      }
-
-      hb_buffer_clear_contents(buffer);
-      hb_buffer_set_script(buffer, script);
-      hb_buffer_set_direction(buffer,
-                              isRtl ? HB_DIRECTION_RTL : HB_DIRECTION_LTR);
-      const FontLanguages& langList =
-          FontLanguageListCache::getById(ctx->style.getLanguageListId());
-      if (langList.size() != 0) {
-        const FontLanguage* hbLanguage = &langList[0];
-        for (size_t i = 0; i < langList.size(); ++i) {
-          if (langList[i].supportsHbScript(script)) {
-            hbLanguage = &langList[i];
-            break;
-          }
-        }
-        hb_buffer_set_language(buffer, hbLanguage->getHbLanguage());
-      }
-
-      const uint32_t clusterStart =
-          addToHbBuffer(buffer, buf, start, count, bufSize, scriptRunStart,
-                        scriptRunEnd, ctx->paint.hyphenEdit, hbFont);
-
-      hb_shape(hbFont, buffer, features.empty() ? NULL : &features[0],
-               features.size());
-      unsigned int numGlyphs;
-      hb_glyph_info_t* info = hb_buffer_get_glyph_infos(buffer, &numGlyphs);
-      hb_glyph_position_t* positions =
-          hb_buffer_get_glyph_positions(buffer, NULL);
-
-      // At this point in the code, the cluster values in the info buffer
-      // correspond to the input characters with some shift. The cluster value
-      // clusterStart corresponds to the first character passed to HarfBuzz,
-      // which is at buf[start + scriptRunStart] whose advance needs to be saved
-      // into mAdvances[scriptRunStart]. So cluster values need to be reduced by
-      // (clusterStart - scriptRunStart) to get converted to indices of
-      // mAdvances.
-      const ssize_t clusterOffset = clusterStart - scriptRunStart;
-
-      if (numGlyphs) {
-        mAdvances[info[0].cluster - clusterOffset] += letterSpaceHalfLeft;
-        x += letterSpaceHalfLeft;
-      }
-      for (unsigned int i = 0; i < numGlyphs; i++) {
-#ifdef VERBOSE_DEBUG
-        ALOGD("%d %d %d %d", positions[i].x_advance, positions[i].y_advance,
-              positions[i].x_offset, positions[i].y_offset);
-        ALOGD("DoLayout %u: %f; %d, %d", info[i].codepoint,
-              HBFixedToFloat(positions[i].x_advance), positions[i].x_offset,
-              positions[i].y_offset);
-#endif
-        if (i > 0 && info[i - 1].cluster != info[i].cluster) {
-          mAdvances[info[i - 1].cluster - clusterOffset] +=
-              letterSpaceHalfRight;
-          mAdvances[info[i].cluster - clusterOffset] += letterSpaceHalfLeft;
-          x += letterSpace;
-        }
-
-        hb_codepoint_t glyph_ix = info[i].codepoint;
-        float xoff = HBFixedToFloat(positions[i].x_offset);
-        float yoff = -HBFixedToFloat(positions[i].y_offset);
-        xoff += yoff * ctx->paint.skewX;
-        LayoutGlyph glyph = {
-            font_ix, glyph_ix, x + xoff, y + yoff,
-            static_cast<uint32_t>(info[i].cluster - clusterOffset)};
-        mGlyphs.push_back(glyph);
-        float xAdvance = HBFixedToFloat(positions[i].x_advance);
-        if ((ctx->paint.paintFlags & LinearTextFlag) == 0) {
-          xAdvance = roundf(xAdvance);
-        }
-        MinikinRect glyphBounds;
-        hb_glyph_extents_t extents = {};
-        if (is_color_bitmap_font &&
-            hb_font_get_glyph_extents(hbFont, glyph_ix, &extents)) {
-          // Note that it is technically possible for a TrueType font to have
-          // outline and embedded bitmap at the same time. We ignore modified
-          // bbox of hinted outline glyphs in that case.
-          glyphBounds.mLeft = roundf(HBFixedToFloat(extents.x_bearing));
-          glyphBounds.mTop = roundf(HBFixedToFloat(-extents.y_bearing));
-          glyphBounds.mRight =
-              roundf(HBFixedToFloat(extents.x_bearing + extents.width));
-          glyphBounds.mBottom =
-              roundf(HBFixedToFloat(-extents.y_bearing - extents.height));
-        } else {
-          ctx->paint.font->GetBounds(&glyphBounds, glyph_ix, ctx->paint);
-        }
-        glyphBounds.offset(x + xoff, y + yoff);
-        mBounds.join(glyphBounds);
-        if (static_cast<size_t>(info[i].cluster - clusterOffset) < count) {
-          mAdvances[info[i].cluster - clusterOffset] += xAdvance;
-        } else {
-          ALOGE("cluster %zu (start %zu) out of bounds of count %zu",
-                info[i].cluster - clusterOffset, start, count);
-        }
-        x += xAdvance;
-      }
-      if (numGlyphs) {
-        mAdvances[info[numGlyphs - 1].cluster - clusterOffset] +=
-            letterSpaceHalfRight;
-        x += letterSpaceHalfRight;
-      }
-    }
-  }
-  mAdvance = x;
-}
-
-void Layout::appendLayout(Layout* src, size_t start, float extraAdvance) {
-  int fontMapStack[16];
-  int* fontMap;
-  if (src->mFaces.size() < sizeof(fontMapStack) / sizeof(fontMapStack[0])) {
-    fontMap = fontMapStack;
-  } else {
-    fontMap = new int[src->mFaces.size()];
-  }
-  for (size_t i = 0; i < src->mFaces.size(); i++) {
-    int font_ix = findFace(src->mFaces[i], NULL);
-    fontMap[i] = font_ix;
-  }
-  // LibTxt: Changed x0 from int to float to prevent rounding that causes text
-  // jitter.
-  float x0 = mAdvance;
-  for (size_t i = 0; i < src->mGlyphs.size(); i++) {
-    LayoutGlyph& srcGlyph = src->mGlyphs[i];
-    int font_ix = fontMap[srcGlyph.font_ix];
-    unsigned int glyph_id = srcGlyph.glyph_id;
-    float x = x0 + srcGlyph.x;
-    float y = srcGlyph.y;
-    LayoutGlyph glyph = {font_ix, glyph_id, x, y,
-                         static_cast<uint32_t>(srcGlyph.cluster + start)};
-    mGlyphs.push_back(glyph);
-  }
-  for (size_t i = 0; i < src->mAdvances.size(); i++) {
-    mAdvances[i + start] = src->mAdvances[i];
-    if (i == 0)
-      mAdvances[i + start] += extraAdvance;
-  }
-  MinikinRect srcBounds(src->mBounds);
-  srcBounds.offset(x0, 0);
-  mBounds.join(srcBounds);
-  mAdvance += src->mAdvance + extraAdvance;
-
-  if (fontMap != fontMapStack) {
-    delete[] fontMap;
-  }
-}
-
-size_t Layout::nGlyphs() const {
-  return mGlyphs.size();
-}
-
-const MinikinFont* Layout::getFont(int i) const {
-  const LayoutGlyph& glyph = mGlyphs[i];
-  return mFaces[glyph.font_ix].font;
-}
-
-FontFakery Layout::getFakery(int i) const {
-  const LayoutGlyph& glyph = mGlyphs[i];
-  return mFaces[glyph.font_ix].fakery;
-}
-
-unsigned int Layout::getGlyphId(int i) const {
-  const LayoutGlyph& glyph = mGlyphs[i];
-  return glyph.glyph_id;
-}
-
-// libtxt extension
-unsigned int Layout::getGlyphCluster(int i) const {
-  const LayoutGlyph& glyph = mGlyphs[i];
-  return glyph.cluster;
-}
-
-float Layout::getX(int i) const {
-  const LayoutGlyph& glyph = mGlyphs[i];
-  return glyph.x;
-}
-
-float Layout::getY(int i) const {
-  const LayoutGlyph& glyph = mGlyphs[i];
-  return glyph.y;
-}
-
-float Layout::getAdvance() const {
-  return mAdvance;
-}
-
-void Layout::getAdvances(float* advances) {
-  memcpy(advances, &mAdvances[0], mAdvances.size() * sizeof(float));
-}
-
-void Layout::getBounds(MinikinRect* bounds) const {
-  bounds->set(mBounds);
-}
-
-void Layout::purgeCaches() {
-  std::scoped_lock _l(gMinikinLock);
-  LayoutCache& layoutCache = LayoutEngine::getInstance().layoutCache;
-  layoutCache.clear();
-  purgeHbFontCacheLocked();
-}
-
-}  // namespace minikin
diff --git a/third_party/txt/src/minikin/Layout.h b/third_party/txt/src/minikin/Layout.h
deleted file mode 100644
index 78cf7644ba39b9f4b57081b5c5fc895ad7c17b2b..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/Layout.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef MINIKIN_LAYOUT_H
-#define MINIKIN_LAYOUT_H
-
-#include <hb.h>
-
-#include <memory>
-#include <vector>
-
-#include <minikin/FontCollection.h>
-
-namespace minikin {
-
-struct LayoutGlyph {
-  // index into mFaces and mHbFonts vectors. We could imagine
-  // moving this into a run length representation, because it's
-  // more efficient for long strings, and we'll probably need
-  // something like that for paint attributes (color, underline,
-  // fake b/i, etc), as having those per-glyph is bloated.
-  int font_ix;
-
-  unsigned int glyph_id;
-  float x;
-  float y;
-
-  // libtxt extension: record the cluster (character index) that corresponds
-  // to this glyph
-  uint32_t cluster;
-};
-
-// Internal state used during layout operation
-struct LayoutContext;
-
-enum {
-  kBidi_LTR = 0,
-  kBidi_RTL = 1,
-  kBidi_Default_LTR = 2,
-  kBidi_Default_RTL = 3,
-  kBidi_Force_LTR = 4,
-  kBidi_Force_RTL = 5,
-
-  kBidi_Mask = 0x7
-};
-
-// Lifecycle and threading assumptions for Layout:
-// The object is assumed to be owned by a single thread; multiple threads
-// may not mutate it at the same time.
-class Layout {
- public:
-  Layout() : mGlyphs(), mAdvances(), mFaces(), mAdvance(0), mBounds() {
-    mBounds.setEmpty();
-  }
-
-  Layout(Layout&& layout) = default;
-
-  // Forbid copying and assignment.
-  Layout(const Layout&) = delete;
-  void operator=(const Layout&) = delete;
-
-  void dump() const;
-
-  void doLayout(const uint16_t* buf,
-                size_t start,
-                size_t count,
-                size_t bufSize,
-                bool isRtl,
-                const FontStyle& style,
-                const MinikinPaint& paint,
-                const std::shared_ptr<FontCollection>& collection);
-
-  static float measureText(const uint16_t* buf,
-                           size_t start,
-                           size_t count,
-                           size_t bufSize,
-                           bool isRtl,
-                           const FontStyle& style,
-                           const MinikinPaint& paint,
-                           const std::shared_ptr<FontCollection>& collection,
-                           float* advances);
-
-  // public accessors
-  size_t nGlyphs() const;
-  const MinikinFont* getFont(int i) const;
-  FontFakery getFakery(int i) const;
-  unsigned int getGlyphId(int i) const;
-  uint32_t getGlyphCluster(int i) const;  // libtxt extension
-  float getX(int i) const;
-  float getY(int i) const;
-
-  float getAdvance() const;
-
-  // Get advances, copying into caller-provided buffer. The size of this
-  // buffer must match the length of the string (count arg to doLayout).
-  void getAdvances(float* advances);
-
-  // The i parameter is an offset within the buf relative to start, it is <
-  // count, where start and count are the parameters to doLayout
-  float getCharAdvance(size_t i) const { return mAdvances[i]; }
-
-  void getBounds(MinikinRect* rect) const;
-
-  // Purge all caches, useful in low memory conditions
-  static void purgeCaches();
-
- private:
-  friend class LayoutCacheKey;
-
-  // Find a face in the mFaces vector, or create a new entry
-  int findFace(const FakedFont& face, LayoutContext* ctx);
-
-  // Clears layout, ready to be used again
-  void reset();
-
-  // Lay out a single bidi run
-  // When layout is not null, layout info will be stored in the object.
-  // When advances is not null, measurement results will be stored in the array.
-  static float doLayoutRunCached(
-      const uint16_t* buf,
-      size_t runStart,
-      size_t runLength,
-      size_t bufSize,
-      bool isRtl,
-      LayoutContext* ctx,
-      size_t dstStart,
-      const std::shared_ptr<FontCollection>& collection,
-      Layout* layout,
-      float* advances);
-
-  // Lay out a single word
-  static float doLayoutWord(const uint16_t* buf,
-                            size_t start,
-                            size_t count,
-                            size_t bufSize,
-                            bool isRtl,
-                            LayoutContext* ctx,
-                            size_t bufStart,
-                            const std::shared_ptr<FontCollection>& collection,
-                            Layout* layout,
-                            float* advances);
-
-  // Lay out a single bidi run
-  void doLayoutRun(const uint16_t* buf,
-                   size_t start,
-                   size_t count,
-                   size_t bufSize,
-                   bool isRtl,
-                   LayoutContext* ctx,
-                   const std::shared_ptr<FontCollection>& collection);
-
-  // Append another layout (for example, cached value) into this one
-  void appendLayout(Layout* src, size_t start, float extraAdvance);
-
-  std::vector<LayoutGlyph> mGlyphs;
-  std::vector<float> mAdvances;
-
-  std::vector<FakedFont> mFaces;
-  float mAdvance;
-  MinikinRect mBounds;
-};
-
-}  // namespace minikin
-
-#endif  // MINIKIN_LAYOUT_H
diff --git a/third_party/txt/src/minikin/LayoutUtils.cpp b/third_party/txt/src/minikin/LayoutUtils.cpp
deleted file mode 100644
index e461892d26bbde961093ce10f444363d45f4359e..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/LayoutUtils.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "Minikin"
-
-#include "LayoutUtils.h"
-
-namespace minikin {
-
-const uint16_t CHAR_NBSP = 0x00A0;
-
-/*
- * Determine whether the code unit is a word space for the purposes of
- * justification.
- */
-bool isWordSpace(uint16_t code_unit) {
-  return code_unit == ' ' || code_unit == CHAR_NBSP;
-}
-
-/**
- * For the purpose of layout, a word break is a boundary with no
- * kerning or complex script processing. This is necessarily a
- * heuristic, but should be accurate most of the time.
- */
-static bool isWordBreakAfter(uint16_t c) {
-  if (isWordSpace(c) || (c >= 0x2000 && c <= 0x200a) || c == 0x3000) {
-    // spaces
-    return true;
-  }
-  // Note: kana is not included, as sophisticated fonts may kern kana
-  return false;
-}
-
-static bool isWordBreakBefore(uint16_t c) {
-  // CJK ideographs (and yijing hexagram symbols)
-  return isWordBreakAfter(c) || (c >= 0x3400 && c <= 0x9fff);
-}
-
-/**
- * Return offset of previous word break. It is either < offset or == 0.
- */
-size_t getPrevWordBreakForCache(const uint16_t* chars,
-                                size_t offset,
-                                size_t len) {
-  if (offset == 0)
-    return 0;
-  if (offset > len)
-    offset = len;
-  if (isWordBreakBefore(chars[offset - 1])) {
-    return offset - 1;
-  }
-  for (size_t i = offset - 1; i > 0; i--) {
-    if (isWordBreakBefore(chars[i]) || isWordBreakAfter(chars[i - 1])) {
-      return i;
-    }
-  }
-  return 0;
-}
-
-/**
- * Return offset of next word break. It is either > offset or == len.
- */
-size_t getNextWordBreakForCache(const uint16_t* chars,
-                                size_t offset,
-                                size_t len) {
-  if (offset >= len)
-    return len;
-  if (isWordBreakAfter(chars[offset])) {
-    return offset + 1;
-  }
-  for (size_t i = offset + 1; i < len; i++) {
-    // No need to check isWordBreakAfter(chars[i - 1]) since it is checked
-    // in previous iteration.  Note that isWordBreakBefore returns true
-    // whenever isWordBreakAfter returns true.
-    if (isWordBreakBefore(chars[i])) {
-      return i;
-    }
-  }
-  return len;
-}
-
-}  // namespace minikin
diff --git a/third_party/txt/src/minikin/LayoutUtils.h b/third_party/txt/src/minikin/LayoutUtils.h
deleted file mode 100644
index 2dcc6c510f472d8e2449ef049dac2bae9ddf8e95..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/LayoutUtils.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef MINIKIN_LAYOUT_UTILS_H
-#define MINIKIN_LAYOUT_UTILS_H
-
-#include <stddef.h>
-#include <stdint.h>
-
-namespace minikin {
-
-/*
- * Determine whether the code unit is a word space for the purposes of
- * justification.
- */
-bool isWordSpace(uint16_t code_unit);
-
-/**
- * Return offset of previous word break. It is either < offset or == 0.
- *
- * For the purpose of layout, a word break is a boundary with no
- * kerning or complex script processing. This is necessarily a
- * heuristic, but should be accurate most of the time.
- */
-size_t getPrevWordBreakForCache(const uint16_t* chars,
-                                size_t offset,
-                                size_t len);
-
-/**
- * Return offset of next word break. It is either > offset or == len.
- *
- * For the purpose of layout, a word break is a boundary with no
- * kerning or complex script processing. This is necessarily a
- * heuristic, but should be accurate most of the time.
- */
-size_t getNextWordBreakForCache(const uint16_t* chars,
-                                size_t offset,
-                                size_t len);
-
-}  // namespace minikin
-#endif  // MINIKIN_LAYOUT_UTILS_H
diff --git a/third_party/txt/src/minikin/LineBreaker.cpp b/third_party/txt/src/minikin/LineBreaker.cpp
deleted file mode 100644
index 6a67f87e30a163cc1ca7dc7d141188709d2c9c44..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/LineBreaker.cpp
+++ /dev/null
@@ -1,557 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define VERBOSE_DEBUG 0
-
-#define LOG_TAG "Minikin"
-
-#include <algorithm>
-#include <limits>
-
-#include <log/log.h>
-
-#include <minikin/Layout.h>
-#include <minikin/LineBreaker.h>
-#include <utils/WindowsUtils.h>
-#include "LayoutUtils.h"
-
-using std::vector;
-
-namespace minikin {
-
-// Large scores in a hierarchy; we prefer desperate breaks to an overfull line.
-// All these constants are larger than any reasonable actual width score.
-const float SCORE_INFTY = std::numeric_limits<float>::max();
-const float SCORE_OVERFULL = 1e12f;
-const float SCORE_DESPERATE = 1e10f;
-
-// Multiplier for hyphen penalty on last line.
-const float LAST_LINE_PENALTY_MULTIPLIER = 4.0f;
-// Penalty assigned to each line break (to try to minimize number of lines)
-// TODO: when we implement full justification (so spaces can shrink and
-// stretch), this is probably not the most appropriate method.
-const float LINE_PENALTY_MULTIPLIER = 2.0f;
-
-// Penalty assigned to shrinking the whitepsace.
-const float SHRINK_PENALTY_MULTIPLIER = 4.0f;
-
-// Very long words trigger O(n^2) behavior in hyphenation, so we disable
-// hyphenation for unreasonably long words. This is somewhat of a heuristic
-// because extremely long words are possible in some languages. This does mean
-// that very long real words can get broken by desperate breaks, with no
-// hyphens.
-const size_t LONGEST_HYPHENATED_WORD = 45;
-
-// When the text buffer is within this limit, capacity of vectors is retained at
-// finish(), to avoid allocation.
-const size_t MAX_TEXT_BUF_RETAIN = 32678;
-
-// Maximum amount that spaces can shrink, in justified text.
-const float SHRINKABILITY = 1.0 / 3.0;
-
-// libtxt: Add a fudge factor to comparisons between currentLineWidth and
-// postBreak width.  The currentLineWidth passed by the Flutter framework
-// is based on maxIntrinsicWidth/Layout::measureText calculations that may
-// not precisely match the postBreak width.
-const float LIBTXT_WIDTH_ADJUST = 0.00001;
-
-void LineBreaker::setLocale() {
-  mWordBreaker.setLocale();
-  mLocale = icu::Locale();
-  mHyphenator = nullptr;
-}
-
-void LineBreaker::setText() {
-  mWordBreaker.setText(mTextBuf.data(), mTextBuf.size());
-
-  // handle initial break here because addStyleRun may never be called
-  mWordBreaker.next();
-  mCandidates.clear();
-  Candidate cand = {0,   0, 0.0, 0.0, 0.0,
-                    0.0, 0, 0,   0,   HyphenationType::DONT_BREAK};
-  mCandidates.push_back(cand);
-
-  // reset greedy breaker state
-  mBreaks.clear();
-  mWidths.clear();
-  mFlags.clear();
-  mLastBreak = 0;
-  mBestBreak = 0;
-  mBestScore = SCORE_INFTY;
-  mPreBreak = 0;
-  mLastHyphenation = HyphenEdit::NO_EDIT;
-  mFirstTabIndex = INT_MAX;
-  mSpaceCount = 0;
-}
-
-void LineBreaker::setLineWidths(float firstWidth,
-                                int firstWidthLineCount,
-                                float restWidth) {
-  mLineWidths.setWidths(firstWidth, firstWidthLineCount, restWidth);
-}
-
-void LineBreaker::setIndents(const std::vector<float>& indents) {
-  mLineWidths.setIndents(indents);
-}
-
-// This function determines whether a character is a space that disappears at
-// end of line. It is the Unicode set:
-// [[:General_Category=Space_Separator:]-[:Line_Break=Glue:]], plus '\n'. Note:
-// all such characters are in the BMP, so it's ok to use code units for this.
-bool isLineEndSpace(uint16_t c) {
-  return c == '\n' || c == ' ' || c == 0x1680 ||
-         (0x2000 <= c && c <= 0x200A && c != 0x2007) || c == 0x205F ||
-         c == 0x3000;
-}
-
-// Ordinarily, this method measures the text in the range given. However, when
-// paint is nullptr, it assumes the widths have already been calculated and
-// stored in the width buffer. This method finds the candidate word breaks
-// (using the ICU break iterator) and sends them to addCandidate.
-float LineBreaker::addStyleRun(MinikinPaint* paint,
-                               const std::shared_ptr<FontCollection>& typeface,
-                               FontStyle style,
-                               size_t start,
-                               size_t end,
-                               bool isRtl) {
-  float width = 0.0f;
-
-  float hyphenPenalty = 0.0;
-  if (paint != nullptr) {
-    width = Layout::measureText(mTextBuf.data(), start, end - start,
-                                mTextBuf.size(), isRtl, style, *paint, typeface,
-                                mCharWidths.data() + start);
-
-    // a heuristic that seems to perform well
-    hyphenPenalty =
-        0.5 * paint->size * paint->scaleX * mLineWidths.getLineWidth(0);
-    if (mHyphenationFrequency == kHyphenationFrequency_Normal) {
-      hyphenPenalty *=
-          4.0;  // TODO: Replace with a better value after some testing
-    }
-
-    if (mJustified) {
-      // Make hyphenation more aggressive for fully justified text (so that
-      // "normal" in justified mode is the same as "full" in ragged-right).
-      hyphenPenalty *= 0.25;
-    } else {
-      // Line penalty is zero for justified text.
-      mLinePenalty =
-          std::max(mLinePenalty, hyphenPenalty * LINE_PENALTY_MULTIPLIER);
-    }
-  }
-
-  size_t current = (size_t)mWordBreaker.current();
-  size_t afterWord = start;
-  size_t lastBreak = start;
-  ParaWidth lastBreakWidth = mWidth;
-  ParaWidth postBreak = mWidth;
-  size_t postSpaceCount = mSpaceCount;
-  for (size_t i = start; i < end; i++) {
-    uint16_t c = mTextBuf[i];
-    // libtxt: Tab handling was removed here.
-    if (isWordSpace(c))
-      mSpaceCount += 1;
-    mWidth += mCharWidths[i];
-    if (!isLineEndSpace(c)) {
-      postBreak = mWidth;
-      postSpaceCount = mSpaceCount;
-      afterWord = i + 1;
-    }
-    if (i + 1 == current) {
-      size_t wordStart = mWordBreaker.wordStart();
-      size_t wordEnd = mWordBreaker.wordEnd();
-      if (paint != nullptr && mHyphenator != nullptr &&
-          mHyphenationFrequency != kHyphenationFrequency_None &&
-          wordStart >= start && wordEnd > wordStart &&
-          wordEnd - wordStart <= LONGEST_HYPHENATED_WORD) {
-        mHyphenator->hyphenate(&mHyphBuf, &mTextBuf[wordStart],
-                               wordEnd - wordStart, mLocale);
-#if VERBOSE_DEBUG
-        std::string hyphenatedString;
-        for (size_t j = wordStart; j < wordEnd; j++) {
-          if (mHyphBuf[j - wordStart] ==
-              HyphenationType::BREAK_AND_INSERT_HYPHEN) {
-            hyphenatedString.push_back('-');
-          }
-          // Note: only works with ASCII, should do UTF-8 conversion here
-          hyphenatedString.push_back(buffer()[j]);
-        }
-        ALOGD("hyphenated string: %s", hyphenatedString.c_str());
-#endif
-
-        // measure hyphenated substrings
-        for (size_t j = wordStart; j < wordEnd; j++) {
-          HyphenationType hyph = mHyphBuf[j - wordStart];
-          if (hyph != HyphenationType::DONT_BREAK) {
-            paint->hyphenEdit = HyphenEdit::editForThisLine(hyph);
-            const float firstPartWidth = Layout::measureText(
-                mTextBuf.data(), lastBreak, j - lastBreak, mTextBuf.size(),
-                isRtl, style, *paint, typeface, nullptr);
-            ParaWidth hyphPostBreak = lastBreakWidth + firstPartWidth;
-
-            paint->hyphenEdit = HyphenEdit::editForNextLine(hyph);
-            const float secondPartWidth = Layout::measureText(
-                mTextBuf.data(), j, afterWord - j, mTextBuf.size(), isRtl,
-                style, *paint, typeface, nullptr);
-            ParaWidth hyphPreBreak = postBreak - secondPartWidth;
-
-            addWordBreak(j, hyphPreBreak, hyphPostBreak, postSpaceCount,
-                         postSpaceCount, hyphenPenalty, hyph);
-
-            paint->hyphenEdit = HyphenEdit::NO_EDIT;
-          }
-        }
-      }
-
-      // Skip break for zero-width characters inside replacement span
-      if (paint != nullptr || current == end || mCharWidths[current] > 0) {
-        float penalty = hyphenPenalty * mWordBreaker.breakBadness();
-        addWordBreak(current, mWidth, postBreak, mSpaceCount, postSpaceCount,
-                     penalty, HyphenationType::DONT_BREAK);
-      }
-      lastBreak = current;
-      lastBreakWidth = mWidth;
-      current = (size_t)mWordBreaker.next();
-    }
-  }
-
-  return width;
-}
-
-// add a word break (possibly for a hyphenated fragment), and add desperate
-// breaks if needed (ie when word exceeds current line width)
-void LineBreaker::addWordBreak(size_t offset,
-                               ParaWidth preBreak,
-                               ParaWidth postBreak,
-                               size_t preSpaceCount,
-                               size_t postSpaceCount,
-                               float penalty,
-                               HyphenationType hyph) {
-  Candidate cand;
-  ParaWidth width = mCandidates.back().preBreak;
-  // libtxt: add a fudge factor to this comparison.  The currentLineWidth passed
-  // by the framework is based on maxIntrinsicWidth/Layout::measureText
-  // calculations that may not precisely match the postBreak width.
-  if (postBreak - width > currentLineWidth() + LIBTXT_WIDTH_ADJUST) {
-    // Add desperate breaks.
-    // Note: these breaks are based on the shaping of the (non-broken) original
-    // text; they are imprecise especially in the presence of kerning,
-    // ligatures, and Arabic shaping.
-    size_t i = mCandidates.back().offset;
-    width += mCharWidths[i++];
-    for (; i < offset; i++) {
-      float w = mCharWidths[i];
-      if (w > 0) {
-        cand.offset = i;
-        cand.preBreak = width;
-        cand.postBreak = width;
-        // postSpaceCount doesn't include trailing spaces
-        cand.preSpaceCount = postSpaceCount;
-        cand.postSpaceCount = postSpaceCount;
-        cand.penalty = SCORE_DESPERATE;
-        cand.hyphenType = HyphenationType::BREAK_AND_DONT_INSERT_HYPHEN;
-#if VERBOSE_DEBUG
-        ALOGD("desperate cand: %zd %g:%g", mCandidates.size(), cand.postBreak,
-              cand.preBreak);
-#endif
-        addCandidate(cand);
-        width += w;
-      }
-    }
-  }
-
-  cand.offset = offset;
-  cand.preBreak = preBreak;
-  cand.postBreak = postBreak;
-  cand.penalty = penalty;
-  cand.preSpaceCount = preSpaceCount;
-  cand.postSpaceCount = postSpaceCount;
-  cand.hyphenType = hyph;
-#if VERBOSE_DEBUG
-  ALOGD("cand: %zd %g:%g", mCandidates.size(), cand.postBreak, cand.preBreak);
-#endif
-  addCandidate(cand);
-}
-
-// Helper method for addCandidate()
-void LineBreaker::pushGreedyBreak() {
-  const Candidate& bestCandidate = mCandidates[mBestBreak];
-  pushBreak(
-      bestCandidate.offset, bestCandidate.postBreak - mPreBreak,
-      mLastHyphenation | HyphenEdit::editForThisLine(bestCandidate.hyphenType));
-  mBestScore = SCORE_INFTY;
-#if VERBOSE_DEBUG
-  ALOGD("break: %d %g", mBreaks.back(), mWidths.back());
-#endif
-  mLastBreak = mBestBreak;
-  mPreBreak = bestCandidate.preBreak;
-  mLastHyphenation = HyphenEdit::editForNextLine(bestCandidate.hyphenType);
-}
-
-// TODO performance: could avoid populating mCandidates if greedy only
-void LineBreaker::addCandidate(Candidate cand) {
-  const size_t candIndex = mCandidates.size();
-  mCandidates.push_back(cand);
-
-  // mLastBreak is the index of the last line break we decided to do in
-  // mCandidates, and mPreBreak is its preBreak value. mBestBreak is the index
-  // of the best line breaking candidate we have found since then, and
-  // mBestScore is its penalty.
-  if (cand.postBreak - mPreBreak > currentLineWidth() + LIBTXT_WIDTH_ADJUST) {
-    // This break would create an overfull line, pick the best break and break
-    // there (greedy)
-    if (mBestBreak == mLastBreak) {
-      // No good break has been found since last break. Break here.
-      mBestBreak = candIndex;
-    }
-    pushGreedyBreak();
-  }
-
-  while (mLastBreak != candIndex &&
-         cand.postBreak - mPreBreak >
-             currentLineWidth() + LIBTXT_WIDTH_ADJUST) {
-    // We should rarely come here. But if we are here, we have broken the line,
-    // but the remaining part still doesn't fit. We now need to break at the
-    // second best place after the last break, but we have not kept that
-    // information, so we need to go back and find it.
-    //
-    // In some really rare cases, postBreak - preBreak of a candidate itself may
-    // be over the current line width. We protect ourselves against an infinite
-    // loop in that case by checking that we have not broken the line at this
-    // candidate already.
-    for (size_t i = mLastBreak + 1; i < candIndex; i++) {
-      const float penalty = mCandidates[i].penalty;
-      if (penalty <= mBestScore) {
-        mBestBreak = i;
-        mBestScore = penalty;
-      }
-    }
-    if (mBestBreak == mLastBreak) {
-      // We didn't find anything good. Break here.
-      mBestBreak = candIndex;
-    }
-    pushGreedyBreak();
-  }
-
-  if (cand.penalty <= mBestScore) {
-    mBestBreak = candIndex;
-    mBestScore = cand.penalty;
-  }
-}
-
-void LineBreaker::pushBreak(int offset, float width, uint8_t hyphenEdit) {
-  mBreaks.push_back(offset);
-  mWidths.push_back(width);
-  int flags = (mFirstTabIndex < mBreaks.back()) << kTab_Shift;
-  flags |= hyphenEdit;
-  mFlags.push_back(flags);
-  mFirstTabIndex = INT_MAX;
-}
-
-// libtxt: Add ability to set custom char widths. This allows manual definition
-// of the widths of arbitrary glyphs. To linebreak properly, call addStyleRun
-// with nullptr as the paint property, which will lead it to assume the width
-// has already been calculated. Used for properly breaking inline widgets.
-void LineBreaker::setCustomCharWidth(size_t offset, float width) {
-  mCharWidths[offset] = (width);
-}
-
-void LineBreaker::addReplacement(size_t start, size_t end, float width) {
-  mCharWidths[start] = width;
-  std::fill(&mCharWidths[start + 1], &mCharWidths[end], 0.0f);
-  addStyleRun(nullptr, nullptr, FontStyle(), start, end, false);
-}
-
-// Get the width of a space. May return 0 if there are no spaces.
-// Note: if there are multiple different widths for spaces (for example, because
-// of mixing of fonts), it's only guaranteed to pick one.
-float LineBreaker::getSpaceWidth() const {
-  for (size_t i = 0; i < mTextBuf.size(); i++) {
-    if (isWordSpace(mTextBuf[i])) {
-      return mCharWidths[i];
-    }
-  }
-  return 0.0f;
-}
-
-float LineBreaker::currentLineWidth() const {
-  return mLineWidths.getLineWidth(mBreaks.size());
-}
-
-void LineBreaker::computeBreaksGreedy() {
-  // All breaks but the last have been added in addCandidate already.
-  size_t nCand = mCandidates.size();
-  if (nCand > 0 && (nCand == 1 || mLastBreak != nCand - 1)) {
-    pushBreak(mCandidates[nCand - 1].offset,
-              mCandidates[nCand - 1].postBreak - mPreBreak, mLastHyphenation);
-    // don't need to update mBestScore, because we're done
-#if VERBOSE_DEBUG
-    ALOGD("final break: %d %g", mBreaks.back(), mWidths.back());
-#endif
-  }
-}
-
-// Follow "prev" links in mCandidates array, and copy to result arrays.
-void LineBreaker::finishBreaksOptimal() {
-  // clear existing greedy break result
-  mBreaks.clear();
-  mWidths.clear();
-  mFlags.clear();
-  size_t nCand = mCandidates.size();
-  size_t prev;
-  for (size_t i = nCand - 1; i > 0; i = prev) {
-    prev = mCandidates[i].prev;
-    mBreaks.push_back(mCandidates[i].offset);
-    mWidths.push_back(mCandidates[i].postBreak - mCandidates[prev].preBreak);
-    int flags = HyphenEdit::editForThisLine(mCandidates[i].hyphenType);
-    if (prev > 0) {
-      flags |= HyphenEdit::editForNextLine(mCandidates[prev].hyphenType);
-    }
-    mFlags.push_back(flags);
-  }
-  std::reverse(mBreaks.begin(), mBreaks.end());
-  std::reverse(mWidths.begin(), mWidths.end());
-  std::reverse(mFlags.begin(), mFlags.end());
-}
-
-void LineBreaker::computeBreaksOptimal(bool isRectangle) {
-  size_t active = 0;
-  size_t nCand = mCandidates.size();
-  float width = mLineWidths.getLineWidth(0);
-  float shortLineFactor = mJustified ? 0.75f : 0.5f;
-  float maxShrink = mJustified ? SHRINKABILITY * getSpaceWidth() : 0.0f;
-
-  // "i" iterates through candidates for the end of the line.
-  for (size_t i = 1; i < nCand; i++) {
-    bool atEnd = i == nCand - 1;
-    float best = SCORE_INFTY;
-    size_t bestPrev = 0;
-    size_t lineNumberLast = 0;
-
-    if (!isRectangle) {
-      size_t lineNumberLast = mCandidates[active].lineNumber;
-      width = mLineWidths.getLineWidth(lineNumberLast);
-    }
-    ParaWidth leftEdge = mCandidates[i].postBreak - width;
-    float bestHope = 0;
-
-    // "j" iterates through candidates for the beginning of the line.
-    for (size_t j = active; j < i; j++) {
-      if (!isRectangle) {
-        size_t lineNumber = mCandidates[j].lineNumber;
-        if (lineNumber != lineNumberLast) {
-          float widthNew = mLineWidths.getLineWidth(lineNumber);
-          if (widthNew != width) {
-            leftEdge = mCandidates[i].postBreak - width;
-            bestHope = 0;
-            width = widthNew;
-          }
-          lineNumberLast = lineNumber;
-        }
-      }
-      float jScore = mCandidates[j].score;
-      if (jScore + bestHope >= best)
-        continue;
-      float delta = mCandidates[j].preBreak - leftEdge;
-
-      // compute width score for line
-
-      // Note: the "bestHope" optimization makes the assumption that, when delta
-      // is non-negative, widthScore will increase monotonically as successive
-      // candidate breaks are considered.
-      float widthScore = 0.0f;
-      float additionalPenalty = 0.0f;
-      if ((atEnd || !mJustified) && delta < 0) {
-        widthScore = SCORE_OVERFULL;
-      } else if (atEnd && mStrategy != kBreakStrategy_Balanced) {
-        // increase penalty for hyphen on last line
-        additionalPenalty =
-            LAST_LINE_PENALTY_MULTIPLIER * mCandidates[j].penalty;
-        // Penalize very short (< 1 - shortLineFactor of total width) lines.
-        float underfill = delta - shortLineFactor * width;
-        widthScore = underfill > 0 ? underfill * underfill : 0;
-      } else {
-        widthScore = delta * delta;
-        if (delta < 0) {
-          if (-delta < maxShrink * (mCandidates[i].postSpaceCount -
-                                    mCandidates[j].preSpaceCount)) {
-            widthScore *= SHRINK_PENALTY_MULTIPLIER;
-          } else {
-            widthScore = SCORE_OVERFULL;
-          }
-        }
-      }
-
-      if (delta < 0) {
-        active = j + 1;
-      } else {
-        bestHope = widthScore;
-      }
-
-      float score = jScore + widthScore + additionalPenalty;
-      if (score <= best) {
-        best = score;
-        bestPrev = j;
-      }
-    }
-    mCandidates[i].score = best + mCandidates[i].penalty + mLinePenalty;
-    mCandidates[i].prev = bestPrev;
-    mCandidates[i].lineNumber = mCandidates[bestPrev].lineNumber + 1;
-#if VERBOSE_DEBUG
-    ALOGD("break %zd: score=%g, prev=%zd", i, mCandidates[i].score,
-          mCandidates[i].prev);
-#endif
-  }
-  finishBreaksOptimal();
-}
-
-size_t LineBreaker::computeBreaks() {
-  if (mStrategy == kBreakStrategy_Greedy) {
-    computeBreaksGreedy();
-  } else {
-    computeBreaksOptimal(mLineWidths.isConstant());
-  }
-  return mBreaks.size();
-}
-
-void LineBreaker::finish() {
-  mWordBreaker.finish();
-  mWidth = 0;
-  mLineWidths.clear();
-  mCandidates.clear();
-  mBreaks.clear();
-  mWidths.clear();
-  mFlags.clear();
-  if (mTextBuf.size() > MAX_TEXT_BUF_RETAIN) {
-    mTextBuf.clear();
-    mTextBuf.shrink_to_fit();
-    mCharWidths.clear();
-    mCharWidths.shrink_to_fit();
-    mHyphBuf.clear();
-    mHyphBuf.shrink_to_fit();
-    mCandidates.shrink_to_fit();
-    mBreaks.shrink_to_fit();
-    mWidths.shrink_to_fit();
-    mFlags.shrink_to_fit();
-  }
-  mStrategy = kBreakStrategy_Greedy;
-  mHyphenationFrequency = kHyphenationFrequency_Normal;
-  mLinePenalty = 0.0f;
-  mJustified = false;
-}
-
-}  // namespace minikin
diff --git a/third_party/txt/src/minikin/LineBreaker.h b/third_party/txt/src/minikin/LineBreaker.h
deleted file mode 100644
index a00f3b97ccdefa7cab0319d3bd949a9cac99a2c4..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/LineBreaker.h
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * A module for breaking paragraphs into lines, supporting high quality
- * hyphenation and justification.
- */
-
-#ifndef MINIKIN_LINE_BREAKER_H
-#define MINIKIN_LINE_BREAKER_H
-
-#ifndef U_USING_ICU_NAMESPACE
-#define U_USING_ICU_NAMESPACE 0
-#endif  //  U_USING_ICU_NAMESPACE
-
-#include <cmath>
-#include <vector>
-#include "minikin/FontCollection.h"
-#include "minikin/Hyphenator.h"
-#include "minikin/MinikinFont.h"
-#include "minikin/WordBreaker.h"
-#include "unicode/brkiter.h"
-#include "unicode/locid.h"
-
-namespace minikin {
-
-enum BreakStrategy {
-  kBreakStrategy_Greedy = 0,
-  kBreakStrategy_HighQuality = 1,
-  kBreakStrategy_Balanced = 2
-};
-
-enum HyphenationFrequency {
-  kHyphenationFrequency_None = 0,
-  kHyphenationFrequency_Normal = 1,
-  kHyphenationFrequency_Full = 2
-};
-
-bool isLineEndSpace(uint16_t c);
-
-// TODO: want to generalize to be able to handle array of line widths
-class LineWidths {
- public:
-  void setWidths(float firstWidth, int firstWidthLineCount, float restWidth) {
-    mFirstWidth = firstWidth;
-    mFirstWidthLineCount = firstWidthLineCount;
-    mRestWidth = restWidth;
-  }
-  void setIndents(const std::vector<float>& indents) { mIndents = indents; }
-  bool isConstant() const {
-    // technically mFirstWidthLineCount == 0 would count too, but doesn't
-    // actually happen
-    return mRestWidth == mFirstWidth && mIndents.empty();
-  }
-  float getLineWidth(int line) const {
-    float width = (line < mFirstWidthLineCount) ? mFirstWidth : mRestWidth;
-    if (!mIndents.empty()) {
-      if ((size_t)line < mIndents.size()) {
-        width -= mIndents[line];
-      } else {
-        width -= mIndents.back();
-      }
-    }
-    return width;
-  }
-  void clear() { mIndents.clear(); }
-
- private:
-  float mFirstWidth;
-  int mFirstWidthLineCount;
-  float mRestWidth;
-  std::vector<float> mIndents;
-};
-
-class LineBreaker {
- public:
-  const static int kTab_Shift =
-      29;  // keep synchronized with TAB_MASK in StaticLayout.java
-
-  // Note: Locale persists across multiple invocations (it is not cleaned up by
-  // finish()), explicitly to avoid the cost of creating ICU BreakIterator
-  // objects. It should always be set on the first invocation, but callers are
-  // encouraged not to call again unless locale has actually changed. That logic
-  // could be here but it's better for performance that it's upstream because of
-  // the cost of constructing and comparing the ICU Locale object.
-  // Note: caller is responsible for managing lifetime of hyphenator
-  //
-  // libtxt extension: always use the default locale so that a cached instance
-  // of the ICU break iterator can be reused.
-  void setLocale();
-
-  void resize(size_t size) {
-    mTextBuf.resize(size);
-    mCharWidths.resize(size);
-  }
-
-  size_t size() const { return mTextBuf.size(); }
-
-  uint16_t* buffer() { return mTextBuf.data(); }
-
-  float* charWidths() { return mCharWidths.data(); }
-
-  // set text to current contents of buffer
-  void setText();
-
-  void setLineWidths(float firstWidth,
-                     int firstWidthLineCount,
-                     float restWidth);
-
-  void setIndents(const std::vector<float>& indents);
-
-  BreakStrategy getStrategy() const { return mStrategy; }
-
-  void setStrategy(BreakStrategy strategy) { mStrategy = strategy; }
-
-  void setJustified(bool justified) { mJustified = justified; }
-
-  HyphenationFrequency getHyphenationFrequency() const {
-    return mHyphenationFrequency;
-  }
-
-  void setHyphenationFrequency(HyphenationFrequency frequency) {
-    mHyphenationFrequency = frequency;
-  }
-
-  // TODO: this class is actually fairly close to being general and not tied to
-  // using Minikin to do the shaping of the strings. The main thing that would
-  // need to be changed is having some kind of callback (or virtual class, or
-  // maybe even template), which could easily be instantiated with Minikin's
-  // Layout. Future work for when needed.
-  float addStyleRun(MinikinPaint* paint,
-                    const std::shared_ptr<FontCollection>& typeface,
-                    FontStyle style,
-                    size_t start,
-                    size_t end,
-                    bool isRtl);
-
-  void addReplacement(size_t start, size_t end, float width);
-
-  size_t computeBreaks();
-
-  // libtxt: Add ability to set custom char widths. This allows manual
-  // definition of the widths of arbitrary glyphs. To linebreak properly, call
-  // addStyleRun with nullptr as the paint property, which will lead it to
-  // assume the width has already been calculated. Used for properly breaking
-  // inline placeholders.
-  void setCustomCharWidth(size_t offset, float width);
-
-  const int* getBreaks() const { return mBreaks.data(); }
-
-  const float* getWidths() const { return mWidths.data(); }
-
-  const int* getFlags() const { return mFlags.data(); }
-
-  void finish();
-
- private:
-  // ParaWidth is used to hold cumulative width from beginning of paragraph.
-  // Note that for very large paragraphs, accuracy could degrade using only
-  // 32-bit float. Note however that float is used extensively on the Java side
-  // for this. This is a typedef so that we can easily change it based on
-  // performance/accuracy tradeoff.
-  typedef double ParaWidth;
-
-  // A single candidate break
-  struct Candidate {
-    size_t offset;        // offset to text buffer, in code units
-    size_t prev;          // index to previous break
-    ParaWidth preBreak;   // width of text until this point, if we decide to not
-                          // break here
-    ParaWidth postBreak;  // width of text until this point, if we decide to
-                          // break here
-    float penalty;        // penalty of this break (for example, hyphen penalty)
-    float score;          // best score found for this break
-    size_t lineNumber;    // only updated for non-constant line widths
-    size_t preSpaceCount;   // preceding space count before breaking
-    size_t postSpaceCount;  // preceding space count after breaking
-    HyphenationType hyphenType;
-  };
-
-  float currentLineWidth() const;
-
-  void addWordBreak(size_t offset,
-                    ParaWidth preBreak,
-                    ParaWidth postBreak,
-                    size_t preSpaceCount,
-                    size_t postSpaceCount,
-                    float penalty,
-                    HyphenationType hyph);
-
-  void addCandidate(Candidate cand);
-  void pushGreedyBreak();
-
-  // push an actual break to the output. Takes care of setting flags for tab
-  void pushBreak(int offset, float width, uint8_t hyphenEdit);
-
-  float getSpaceWidth() const;
-
-  void computeBreaksGreedy();
-
-  void computeBreaksOptimal(bool isRectangular);
-
-  void finishBreaksOptimal();
-
-  WordBreaker mWordBreaker;
-  icu::Locale mLocale;
-  std::vector<uint16_t> mTextBuf;
-  std::vector<float> mCharWidths;
-
-  Hyphenator* mHyphenator;
-  std::vector<HyphenationType> mHyphBuf;
-
-  // layout parameters
-  BreakStrategy mStrategy = kBreakStrategy_Greedy;
-  HyphenationFrequency mHyphenationFrequency = kHyphenationFrequency_Normal;
-  bool mJustified;
-  LineWidths mLineWidths;
-
-  // result of line breaking
-  std::vector<int> mBreaks;
-  std::vector<float> mWidths;
-  std::vector<int> mFlags;
-
-  ParaWidth mWidth = 0;
-  std::vector<Candidate> mCandidates;
-  float mLinePenalty = 0.0f;
-
-  // the following are state for greedy breaker (updated while adding style
-  // runs)
-  size_t mLastBreak;
-  size_t mBestBreak;
-  float mBestScore;
-  ParaWidth mPreBreak;        // prebreak of last break
-  uint32_t mLastHyphenation;  // hyphen edit of last break kept for next line
-  int mFirstTabIndex;
-  size_t mSpaceCount;
-};
-
-}  // namespace minikin
-
-#endif  // MINIKIN_LINE_BREAKER_H
diff --git a/third_party/txt/src/minikin/Measurement.cpp b/third_party/txt/src/minikin/Measurement.cpp
deleted file mode 100644
index 87d08465ddddbe1d9caf2d1eb8b2ccf06228ecc0..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/Measurement.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "Minikin"
-
-#include <unicode/uchar.h>
-#include <cmath>
-
-#include <log/log.h>
-
-#include <minikin/GraphemeBreak.h>
-#include <minikin/Measurement.h>
-
-namespace minikin {
-
-// These could be considered helper methods of layout, but need only be loosely
-// coupled, so are separate.
-
-static float getRunAdvance(const float* advances,
-                           const uint16_t* buf,
-                           size_t layoutStart,
-                           size_t start,
-                           size_t count,
-                           size_t offset) {
-  float advance = 0.0f;
-  size_t lastCluster = start;
-  float clusterWidth = 0.0f;
-  for (size_t i = start; i < offset; i++) {
-    float charAdvance = advances[i - layoutStart];
-    if (charAdvance != 0.0f) {
-      advance += charAdvance;
-      lastCluster = i;
-      clusterWidth = charAdvance;
-    }
-  }
-  if (offset < start + count && advances[offset - layoutStart] == 0.0f) {
-    // In the middle of a cluster, distribute width of cluster so that each
-    // grapheme cluster gets an equal share.
-    // TODO: get caret information out of font when that's available
-    size_t nextCluster;
-    for (nextCluster = offset + 1; nextCluster < start + count; nextCluster++) {
-      if (advances[nextCluster - layoutStart] != 0.0f)
-        break;
-    }
-    int numGraphemeClusters = 0;
-    int numGraphemeClustersAfter = 0;
-    for (size_t i = lastCluster; i < nextCluster; i++) {
-      bool isAfter = i >= offset;
-      if (GraphemeBreak::isGraphemeBreak(advances + (start - layoutStart), buf,
-                                         start, count, i)) {
-        numGraphemeClusters++;
-        if (isAfter) {
-          numGraphemeClustersAfter++;
-        }
-      }
-    }
-    if (numGraphemeClusters > 0) {
-      advance -= clusterWidth * numGraphemeClustersAfter / numGraphemeClusters;
-    }
-  }
-  return advance;
-}
-
-float getRunAdvance(const float* advances,
-                    const uint16_t* buf,
-                    size_t start,
-                    size_t count,
-                    size_t offset) {
-  return getRunAdvance(advances, buf, start, start, count, offset);
-}
-
-/**
- * Essentially the inverse of getRunAdvance. Compute the value of offset for
- * which the measured caret comes closest to the provided advance param, and
- * which is on a grapheme cluster boundary.
- *
- * The actual implementation fast-forwards through clusters to get "close", then
- * does a finer-grain search within the cluster and grapheme breaks.
- */
-size_t getOffsetForAdvance(const float* advances,
-                           const uint16_t* buf,
-                           size_t start,
-                           size_t count,
-                           float advance) {
-  float x = 0.0f, xLastClusterStart = 0.0f, xSearchStart = 0.0f;
-  size_t lastClusterStart = start, searchStart = start;
-  for (size_t i = start; i < start + count; i++) {
-    if (GraphemeBreak::isGraphemeBreak(advances, buf, start, count, i)) {
-      searchStart = lastClusterStart;
-      xSearchStart = xLastClusterStart;
-    }
-    float width = advances[i - start];
-    if (width != 0.0f) {
-      lastClusterStart = i;
-      xLastClusterStart = x;
-      x += width;
-      if (x > advance) {
-        break;
-      }
-    }
-  }
-  size_t best = searchStart;
-  float bestDist = FLT_MAX;
-  for (size_t i = searchStart; i <= start + count; i++) {
-    if (GraphemeBreak::isGraphemeBreak(advances, buf, start, count, i)) {
-      // "getRunAdvance(layout, buf, start, count, i) - advance" but more
-      // efficient
-      float delta = getRunAdvance(advances, buf, start, searchStart,
-                                  count - searchStart, i)
-
-                    + xSearchStart - advance;
-      if (std::abs(delta) < bestDist) {
-        bestDist = std::abs(delta);
-        best = i;
-      }
-      if (delta >= 0.0f) {
-        break;
-      }
-    }
-  }
-  return best;
-}
-
-}  // namespace minikin
diff --git a/third_party/txt/src/minikin/Measurement.h b/third_party/txt/src/minikin/Measurement.h
deleted file mode 100644
index fac2848e160610c6df5ebc5e1ab8686cfc7cb9b1..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/Measurement.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef MINIKIN_MEASUREMENT_H
-#define MINIKIN_MEASUREMENT_H
-
-#include <minikin/Layout.h>
-
-namespace minikin {
-
-float getRunAdvance(const float* advances,
-                    const uint16_t* buf,
-                    size_t start,
-                    size_t count,
-                    size_t offset);
-
-size_t getOffsetForAdvance(const float* advances,
-                           const uint16_t* buf,
-                           size_t start,
-                           size_t count,
-                           float advance);
-
-}  // namespace minikin
-
-#endif  // MINIKIN_MEASUREMENT_H
diff --git a/third_party/txt/src/minikin/MinikinFont.cpp b/third_party/txt/src/minikin/MinikinFont.cpp
deleted file mode 100644
index c44b0a1407298fe9578c61823a4a5f205ef9274f..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/MinikinFont.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <minikin/MinikinFont.h>
-#include "HbFontCache.h"
-#include "MinikinInternal.h"
-
-namespace minikin {
-
-MinikinFont::~MinikinFont() {
-  std::scoped_lock _l(gMinikinLock);
-  purgeHbFontLocked(this);
-}
-
-}  // namespace minikin
diff --git a/third_party/txt/src/minikin/MinikinFont.h b/third_party/txt/src/minikin/MinikinFont.h
deleted file mode 100644
index b7d69562af4f6961af7060c18445036991c44c65..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/MinikinFont.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef MINIKIN_FONT_H
-#define MINIKIN_FONT_H
-
-#include <memory>
-#include <string>
-
-#include <minikin/FontFamily.h>
-#include <minikin/Hyphenator.h>
-
-// An abstraction for platform fonts, allowing Minikin to be used with
-// multiple actual implementations of fonts.
-
-namespace minikin {
-
-class MinikinFont;
-
-// Possibly move into own .h file?
-// Note: if you add a field here, either add it to LayoutCacheKey or to
-// skipCache()
-struct MinikinPaint {
-  MinikinPaint()
-      : font(nullptr),
-        size(0),
-        scaleX(0),
-        skewX(0),
-        letterSpacing(0),
-        wordSpacing(0),
-        paintFlags(0),
-        fakery(),
-        hyphenEdit(),
-        fontFeatureSettings() {}
-
-  bool skipCache() const { return !fontFeatureSettings.empty(); }
-
-  MinikinFont* font;
-  float size;
-  float scaleX;
-  float skewX;
-  float letterSpacing;
-  float wordSpacing;
-  uint32_t paintFlags;
-  FontFakery fakery;
-  HyphenEdit hyphenEdit;
-  std::string fontFeatureSettings;
-};
-
-// Only a few flags affect layout, but those that do should have values
-// consistent with Android's paint flags.
-enum MinikinPaintFlags {
-  LinearTextFlag = 0x40,
-};
-
-struct MinikinRect {
-  float mLeft, mTop, mRight, mBottom;
-  bool isEmpty() const { return mLeft == mRight || mTop == mBottom; }
-  void set(const MinikinRect& r) {
-    mLeft = r.mLeft;
-    mTop = r.mTop;
-    mRight = r.mRight;
-    mBottom = r.mBottom;
-  }
-  void offset(float dx, float dy) {
-    mLeft += dx;
-    mTop += dy;
-    mRight += dx;
-    mBottom += dy;
-  }
-  void setEmpty() { mLeft = mTop = mRight = mBottom = 0; }
-  void join(const MinikinRect& r);
-};
-
-// Callback for freeing data
-typedef void (*MinikinDestroyFunc)(void* data);
-
-class MinikinFont {
- public:
-  explicit MinikinFont(int32_t uniqueId) : mUniqueId(uniqueId) {}
-
-  virtual ~MinikinFont();
-
-  virtual float GetHorizontalAdvance(uint32_t glyph_id,
-                                     const MinikinPaint& paint) const = 0;
-
-  virtual void GetBounds(MinikinRect* bounds,
-                         uint32_t glyph_id,
-                         const MinikinPaint& paint) const = 0;
-
-  virtual hb_face_t* CreateHarfBuzzFace() const { return nullptr; }
-
-  virtual const std::vector<minikin::FontVariation>& GetAxes() const = 0;
-
-  virtual std::shared_ptr<MinikinFont> createFontWithVariation(
-      const std::vector<FontVariation>&) const {
-    return nullptr;
-  }
-
-  static uint32_t MakeTag(char c1, char c2, char c3, char c4) {
-    return ((uint32_t)c1 << 24) | ((uint32_t)c2 << 16) | ((uint32_t)c3 << 8) |
-           (uint32_t)c4;
-  }
-
-  int32_t GetUniqueId() const { return mUniqueId; }
-
- private:
-  const int32_t mUniqueId;
-};
-
-}  // namespace minikin
-
-#endif  // MINIKIN_FONT_H
diff --git a/third_party/txt/src/minikin/MinikinInternal.cpp b/third_party/txt/src/minikin/MinikinInternal.cpp
deleted file mode 100644
index 7fd68162d6cc72b3432c1126d5993f22acdb096a..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/MinikinInternal.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Definitions internal to Minikin
-#define LOG_TAG "Minikin"
-
-#include "MinikinInternal.h"
-#include "HbFontCache.h"
-
-#include <log/log.h>
-
-namespace minikin {
-
-#ifdef __clang__
-[[clang::no_destroy]]
-#endif
-std::recursive_mutex gMinikinLock;
-
-void assertMinikinLocked() {
-#ifdef ENABLE_RACE_DETECTION
-  LOG_ALWAYS_FATAL_IF(gMinikinLock.tryLock() == 0);
-#endif
-}
-
-hb_blob_t* getFontTable(const MinikinFont* minikinFont, uint32_t tag) {
-  assertMinikinLocked();
-  hb_font_t* font = getHbFontLocked(minikinFont);
-  hb_face_t* face = hb_font_get_face(font);
-  hb_blob_t* blob = hb_face_reference_table(face, tag);
-  hb_font_destroy(font);
-  return blob;
-}
-
-}  // namespace minikin
diff --git a/third_party/txt/src/minikin/MinikinInternal.h b/third_party/txt/src/minikin/MinikinInternal.h
deleted file mode 100644
index c07ad479a82f084f974813d45f7027d8cdf15359..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/MinikinInternal.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Definitions internal to Minikin
-
-#ifndef MINIKIN_INTERNAL_H
-#define MINIKIN_INTERNAL_H
-
-#include <mutex>
-
-#include <hb.h>
-
-#include <minikin/MinikinFont.h>
-
-namespace minikin {
-
-// All external Minikin interfaces are designed to be thread-safe.
-// Presently, that's implemented by through a global lock, and having
-// all external interfaces take that lock.
-
-extern std::recursive_mutex gMinikinLock;
-
-// Aborts if gMinikinLock is not acquired. Do nothing on the release build.
-void assertMinikinLocked();
-
-hb_blob_t* getFontTable(const MinikinFont* minikinFont, uint32_t tag);
-
-constexpr uint32_t MAX_UNICODE_CODE_POINT = 0x10FFFF;
-
-// An RAII wrapper for hb_blob_t
-class HbBlob {
- public:
-  // Takes ownership of hb_blob_t object, caller is no longer
-  // responsible for calling hb_blob_destroy().
-  explicit HbBlob(hb_blob_t* blob) : mBlob(blob) {}
-
-  ~HbBlob() { hb_blob_destroy(mBlob); }
-
-  const uint8_t* get() const {
-    const char* data = hb_blob_get_data(mBlob, nullptr);
-    return reinterpret_cast<const uint8_t*>(data);
-  }
-
-  size_t size() const { return (size_t)hb_blob_get_length(mBlob); }
-
- private:
-  hb_blob_t* mBlob;
-};
-
-}  // namespace minikin
-
-#endif  // MINIKIN_INTERNAL_H
diff --git a/third_party/txt/src/minikin/SparseBitSet.cpp b/third_party/txt/src/minikin/SparseBitSet.cpp
deleted file mode 100644
index edb5160c3835d474383d47036c847ab03edac302..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/SparseBitSet.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "SparseBitSet"
-
-#include <stddef.h>
-#include <string.h>
-
-#include <log/log.h>
-
-#include <minikin/SparseBitSet.h>
-#include <utils/WindowsUtils.h>
-
-namespace minikin {
-
-const uint32_t SparseBitSet::kNotFound;
-
-uint32_t SparseBitSet::calcNumPages(const uint32_t* ranges, size_t nRanges) {
-  bool haveZeroPage = false;
-  uint32_t nonzeroPageEnd = 0;
-  uint32_t nPages = 0;
-  for (size_t i = 0; i < nRanges; i++) {
-    uint32_t start = ranges[i * 2];
-    uint32_t end = ranges[i * 2 + 1];
-    uint32_t startPage = start >> kLogValuesPerPage;
-    uint32_t endPage = (end - 1) >> kLogValuesPerPage;
-    if (startPage >= nonzeroPageEnd) {
-      if (startPage > nonzeroPageEnd) {
-        if (!haveZeroPage) {
-          haveZeroPage = true;
-          nPages++;
-        }
-      }
-      nPages++;
-    }
-    nPages += endPage - startPage;
-    nonzeroPageEnd = endPage + 1;
-  }
-  return nPages;
-}
-
-void SparseBitSet::initFromRanges(const uint32_t* ranges, size_t nRanges) {
-  if (nRanges == 0) {
-    return;
-  }
-  const uint32_t maxVal = ranges[nRanges * 2 - 1];
-  if (maxVal >= kMaximumCapacity) {
-    return;
-  }
-  mMaxVal = maxVal;
-  mIndices.reset(new uint16_t[(mMaxVal + kPageMask) >> kLogValuesPerPage]);
-  uint32_t nPages = calcNumPages(ranges, nRanges);
-  mBitmaps.reset(new element[nPages << (kLogValuesPerPage - kLogBitsPerEl)]());
-  mZeroPageIndex = noZeroPage;
-  uint32_t nonzeroPageEnd = 0;
-  uint32_t currentPage = 0;
-  for (size_t i = 0; i < nRanges; i++) {
-    uint32_t start = ranges[i * 2];
-    uint32_t end = ranges[i * 2 + 1];
-    LOG_ALWAYS_FATAL_IF(end < start);  // make sure range size is nonnegative
-    uint32_t startPage = start >> kLogValuesPerPage;
-    uint32_t endPage = (end - 1) >> kLogValuesPerPage;
-    if (startPage >= nonzeroPageEnd) {
-      if (startPage > nonzeroPageEnd) {
-        if (mZeroPageIndex == noZeroPage) {
-          mZeroPageIndex = (currentPage++)
-                           << (kLogValuesPerPage - kLogBitsPerEl);
-        }
-        for (uint32_t j = nonzeroPageEnd; j < startPage; j++) {
-          mIndices[j] = mZeroPageIndex;
-        }
-      }
-      mIndices[startPage] = (currentPage++)
-                            << (kLogValuesPerPage - kLogBitsPerEl);
-    }
-
-    size_t index = ((currentPage - 1) << (kLogValuesPerPage - kLogBitsPerEl)) +
-                   ((start & kPageMask) >> kLogBitsPerEl);
-    size_t nElements = (end - (start & ~kElMask) + kElMask) >> kLogBitsPerEl;
-    if (nElements == 1) {
-      mBitmaps[index] |= (kElAllOnes >> (start & kElMask)) &
-                         (kElAllOnes << ((~end + 1) & kElMask));
-    } else {
-      mBitmaps[index] |= kElAllOnes >> (start & kElMask);
-      for (size_t j = 1; j < nElements - 1; j++) {
-        mBitmaps[index + j] = kElAllOnes;
-      }
-      mBitmaps[index + nElements - 1] |= kElAllOnes << ((~end + 1) & kElMask);
-    }
-    for (size_t j = startPage + 1; j < endPage + 1; j++) {
-      mIndices[j] = (currentPage++) << (kLogValuesPerPage - kLogBitsPerEl);
-    }
-    nonzeroPageEnd = endPage + 1;
-  }
-}
-
-#if defined(_WIN32)
-int SparseBitSet::CountLeadingZeros(element x) {
-  return sizeof(element) <= sizeof(int) ? clz_win(x) : clzl_win(x);
-}
-#else
-int SparseBitSet::CountLeadingZeros(element x) {
-  // Note: GCC / clang builtin
-  return sizeof(element) <= sizeof(int) ? __builtin_clz(x) : __builtin_clzl(x);
-}
-#endif
-
-uint32_t SparseBitSet::nextSetBit(uint32_t fromIndex) const {
-  if (fromIndex >= mMaxVal) {
-    return kNotFound;
-  }
-  uint32_t fromPage = fromIndex >> kLogValuesPerPage;
-  const element* bitmap = &mBitmaps[mIndices[fromPage]];
-  uint32_t offset = (fromIndex & kPageMask) >> kLogBitsPerEl;
-  element e = bitmap[offset] & (kElAllOnes >> (fromIndex & kElMask));
-  if (e != 0) {
-    return (fromIndex & ~kElMask) + CountLeadingZeros(e);
-  }
-  for (uint32_t j = offset + 1; j < (1 << (kLogValuesPerPage - kLogBitsPerEl));
-       j++) {
-    e = bitmap[j];
-    if (e != 0) {
-      return (fromIndex & ~kPageMask) + (j << kLogBitsPerEl) +
-             CountLeadingZeros(e);
-    }
-  }
-  uint32_t maxPage = (mMaxVal + kPageMask) >> kLogValuesPerPage;
-  for (uint32_t page = fromPage + 1; page < maxPage; page++) {
-    uint16_t index = mIndices[page];
-    if (index == mZeroPageIndex) {
-      continue;
-    }
-    bitmap = &mBitmaps[index];
-    for (uint32_t j = 0; j < (1 << (kLogValuesPerPage - kLogBitsPerEl)); j++) {
-      e = bitmap[j];
-      if (e != 0) {
-        return (page << kLogValuesPerPage) + (j << kLogBitsPerEl) +
-               CountLeadingZeros(e);
-      }
-    }
-  }
-  return kNotFound;
-}
-
-}  // namespace minikin
diff --git a/third_party/txt/src/minikin/SparseBitSet.h b/third_party/txt/src/minikin/SparseBitSet.h
deleted file mode 100644
index c0bf576920f4ab14416bf5331242b73e1a64551f..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/SparseBitSet.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef MINIKIN_SPARSE_BIT_SET_H
-#define MINIKIN_SPARSE_BIT_SET_H
-
-#include <stdint.h>
-#include <sys/types.h>
-
-#include <memory>
-
-// ---------------------------------------------------------------------------
-
-namespace minikin {
-
-// This is an implementation of a set of integers. It is optimized for
-// values that are somewhat sparse, in the ballpark of a maximum value
-// of thousands to millions. It is particularly efficient when there are
-// large gaps. The motivating example is Unicode coverage of a font, but
-// the abstraction itself is fully general.
-class SparseBitSet {
- public:
-  // Create an empty bit set.
-  SparseBitSet() : mMaxVal(0) {}
-
-  // Initialize the set to a new value, represented by ranges. For
-  // simplicity, these ranges are arranged as pairs of values,
-  // inclusive of start, exclusive of end, laid out in a uint32 array.
-  SparseBitSet(const uint32_t* ranges, size_t nRanges) : SparseBitSet() {
-    initFromRanges(ranges, nRanges);
-  }
-
-  SparseBitSet(SparseBitSet&&) = default;
-  SparseBitSet& operator=(SparseBitSet&&) = default;
-
-  // Determine whether the value is included in the set
-  bool get(uint32_t ch) const {
-    if (ch >= mMaxVal)
-      return false;
-    const uint32_t* bitmap = &mBitmaps[mIndices[ch >> kLogValuesPerPage]];
-    uint32_t index = ch & kPageMask;
-    return (bitmap[index >> kLogBitsPerEl] & (kElFirst >> (index & kElMask))) !=
-           0;
-  }
-
-  // One more than the maximum value in the set, or zero if empty
-  uint32_t length() const { return mMaxVal; }
-
-  // The next set bit starting at fromIndex, inclusive, or kNotFound
-  // if none exists.
-  uint32_t nextSetBit(uint32_t fromIndex) const;
-
-  static const uint32_t kNotFound = ~0u;
-
- private:
-  void initFromRanges(const uint32_t* ranges, size_t nRanges);
-
-  static const uint32_t kMaximumCapacity = 0xFFFFFF;
-  static const int kLogValuesPerPage = 8;
-  static const int kPageMask = (1 << kLogValuesPerPage) - 1;
-  static const int kLogBytesPerEl = 2;
-  static const int kLogBitsPerEl = kLogBytesPerEl + 3;
-  static const int kElMask = (1 << kLogBitsPerEl) - 1;
-  // invariant: sizeof(element) == (1 << kLogBytesPerEl)
-  typedef uint32_t element;
-  static const element kElAllOnes = ~((element)0);
-  static const element kElFirst = ((element)1) << kElMask;
-  static const uint16_t noZeroPage = 0xFFFF;
-
-  static uint32_t calcNumPages(const uint32_t* ranges, size_t nRanges);
-  static int CountLeadingZeros(element x);
-
-  uint32_t mMaxVal;
-
-  std::unique_ptr<uint16_t[]> mIndices;
-  std::unique_ptr<element[]> mBitmaps;
-  uint16_t mZeroPageIndex;
-
-  // Forbid copy and assign.
-  SparseBitSet(const SparseBitSet&) = delete;
-  void operator=(const SparseBitSet&) = delete;
-};
-
-}  // namespace minikin
-
-#endif  // MINIKIN_SPARSE_BIT_SET_H
diff --git a/third_party/txt/src/minikin/WordBreaker.cpp b/third_party/txt/src/minikin/WordBreaker.cpp
deleted file mode 100644
index 107674d9b8643c6bae7abe7cd5bd298412539537..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/WordBreaker.cpp
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "Minikin"
-
-#include <log/log.h>
-
-#include <minikin/Emoji.h>
-#include <minikin/Hyphenator.h>
-#include <minikin/WordBreaker.h>
-#include "MinikinInternal.h"
-
-#include <unicode/uchar.h>
-#include <unicode/utf16.h>
-
-namespace minikin {
-
-const uint32_t CHAR_SOFT_HYPHEN = 0x00AD;
-const uint32_t CHAR_ZWJ = 0x200D;
-
-// libtxt extension: avoid the cost of initializing new ICU break iterators
-// by constructing a global iterator using the default locale and then
-// creating a clone for each WordBreaker instance.
-static std::once_flag gLibtxtBreakIteratorInitFlag;
-static icu::BreakIterator* gLibtxtDefaultBreakIterator = nullptr;
-
-void WordBreaker::setLocale() {
-  UErrorCode status = U_ZERO_ERROR;
-  std::call_once(gLibtxtBreakIteratorInitFlag, [&status] {
-    gLibtxtDefaultBreakIterator =
-        icu::BreakIterator::createLineInstance(icu::Locale(), status);
-  });
-  mBreakIterator.reset(gLibtxtDefaultBreakIterator->clone());
-  // TODO: handle failure status
-  if (mText != nullptr) {
-    mBreakIterator->setText(&mUText, status);
-  }
-  mIteratorWasReset = true;
-}
-
-void WordBreaker::setText(const uint16_t* data, size_t size) {
-  mText = data;
-  mTextSize = size;
-  mIteratorWasReset = false;
-  mLast = 0;
-  mCurrent = 0;
-  mScanOffset = 0;
-  mInEmailOrUrl = false;
-  UErrorCode status = U_ZERO_ERROR;
-  utext_openUChars(&mUText, reinterpret_cast<const UChar*>(data), size,
-                   &status);
-  mBreakIterator->setText(&mUText, status);
-  mBreakIterator->first();
-}
-
-ssize_t WordBreaker::current() const {
-  return mCurrent;
-}
-
-/**
- * Determine whether a line break at position i within the buffer buf is valid.
- *This represents customization beyond the ICU behavior, because plain ICU
- *provides some line break opportunities that we don't want.
- **/
-static bool isBreakValid(const uint16_t* buf, size_t bufEnd, size_t i) {
-  uint32_t codePoint;
-  size_t prev_offset = i;
-  U16_PREV(buf, 0, prev_offset, codePoint);
-  // Do not break on hard or soft hyphens. These are handled by automatic
-  // hyphenation.
-  if (Hyphenator::isLineBreakingHyphen(codePoint) ||
-      codePoint == CHAR_SOFT_HYPHEN) {
-    // txt addition: Temporarily always break on hyphen. Changed from false to
-    // true.
-    return true;
-  }
-  // For Myanmar kinzi sequences, created by <consonant, ASAT, VIRAMA,
-  // consonant>. This is to go around a bug in ICU line breaking:
-  // http://bugs.icu-project.org/trac/ticket/12561. To avoid too much looking
-  // around in the strings, we simply avoid breaking after any Myanmar virama,
-  // where no line break could be imagined, since the Myanmar virama is a pure
-  // stacker.
-  if (codePoint == 0x1039) {  // MYANMAR SIGN VIRAMA
-    return false;
-  }
-
-  uint32_t next_codepoint;
-  size_t next_offset = i;
-  U16_NEXT(buf, next_offset, bufEnd, next_codepoint);
-
-  // Rule LB8 for Emoji ZWJ sequences. We need to do this ourselves since we may
-  // have fresher emoji data than ICU does.
-  if (codePoint == CHAR_ZWJ && isEmoji(next_codepoint)) {
-    return false;
-  }
-
-  // Rule LB30b. We need to this ourselves since we may have fresher emoji data
-  // than ICU does.
-  if (isEmojiModifier(next_codepoint)) {
-    if (codePoint == 0xFE0F && prev_offset > 0) {
-      // skip over emoji variation selector
-      U16_PREV(buf, 0, prev_offset, codePoint);
-    }
-    if (isEmojiBase(codePoint)) {
-      return false;
-    }
-  }
-  return true;
-}
-
-// Customized iteratorNext that takes care of both resets and our modifications
-// to ICU's behavior.
-int32_t WordBreaker::iteratorNext() {
-  int32_t result;
-  do {
-    if (mIteratorWasReset) {
-      result = mBreakIterator->following(mCurrent);
-      mIteratorWasReset = false;
-    } else {
-      result = mBreakIterator->next();
-    }
-  } while (!(result == icu::BreakIterator::DONE ||
-             (size_t)result == mTextSize ||
-             isBreakValid(mText, mTextSize, result)));
-  return result;
-}
-
-// Chicago Manual of Style recommends breaking after these characters in URLs
-// and email addresses
-static bool breakAfter(uint16_t c) {
-  return c == ':' || c == '=' || c == '&';
-}
-
-// Chicago Manual of Style recommends breaking before these characters in URLs
-// and email addresses
-static bool breakBefore(uint16_t c) {
-  return c == '~' || c == '.' || c == ',' || c == '-' || c == '_' || c == '?' ||
-         c == '#' || c == '%' || c == '=' || c == '&';
-}
-
-enum ScanState {
-  START,
-  SAW_AT,
-  SAW_COLON,
-  SAW_COLON_SLASH,
-  SAW_COLON_SLASH_SLASH,
-};
-
-void WordBreaker::detectEmailOrUrl() {
-  // scan forward from current ICU position for email address or URL
-  if (mLast >= mScanOffset) {
-    ScanState state = START;
-    size_t i;
-    for (i = mLast; i < mTextSize; i++) {
-      uint16_t c = mText[i];
-      // scan only ASCII characters, stop at space
-      if (!(' ' < c && c <= 0x007E)) {
-        break;
-      }
-      if (state == START && c == '@') {
-        state = SAW_AT;
-      } else if (state == START && c == ':') {
-        state = SAW_COLON;
-      } else if (state == SAW_COLON || state == SAW_COLON_SLASH) {
-        if (c == '/') {
-          state = static_cast<ScanState>((int)state +
-                                         1);  // next state adds a slash
-        } else {
-          state = START;
-        }
-      }
-    }
-    if (state == SAW_AT || state == SAW_COLON_SLASH_SLASH) {
-      if (!mBreakIterator->isBoundary(i)) {
-        // If there are combining marks or such at the end of the URL or the
-        // email address, consider them a part of the URL or the email, and skip
-        // to the next actual boundary.
-        i = mBreakIterator->following(i);
-      }
-      mInEmailOrUrl = true;
-      mIteratorWasReset = true;
-    } else {
-      mInEmailOrUrl = false;
-    }
-    mScanOffset = i;
-  }
-}
-
-ssize_t WordBreaker::findNextBreakInEmailOrUrl() {
-  // special rules for email addresses and URL's as per Chicago Manual of Style
-  // (16th ed.)
-  uint16_t lastChar = mText[mLast];
-  ssize_t i;
-  for (i = mLast + 1; i < mScanOffset; i++) {
-    if (breakAfter(lastChar)) {
-      break;
-    }
-    // break after double slash
-    if (lastChar == '/' && i >= mLast + 2 && mText[i - 2] == '/') {
-      break;
-    }
-    const uint16_t thisChar = mText[i];
-    // never break after hyphen
-    if (lastChar != '-') {
-      if (breakBefore(thisChar)) {
-        break;
-      }
-      // break before single slash
-      if (thisChar == '/' && lastChar != '/' &&
-          !(i + 1 < mScanOffset && mText[i + 1] == '/')) {
-        break;
-      }
-    }
-    lastChar = thisChar;
-  }
-  return i;
-}
-
-ssize_t WordBreaker::next() {
-  mLast = mCurrent;
-
-  detectEmailOrUrl();
-  if (mInEmailOrUrl) {
-    mCurrent = findNextBreakInEmailOrUrl();
-  } else {  // Business as usual
-    mCurrent = (ssize_t)iteratorNext();
-  }
-  return mCurrent;
-}
-
-ssize_t WordBreaker::wordStart() const {
-  if (mInEmailOrUrl) {
-    return mLast;
-  }
-  ssize_t result = mLast;
-  while (result < mCurrent) {
-    UChar32 c;
-    ssize_t ix = result;
-    U16_NEXT(mText, ix, mCurrent, c);
-    const int32_t lb = u_getIntPropertyValue(c, UCHAR_LINE_BREAK);
-    // strip leading punctuation, defined as OP and QU line breaking classes,
-    // see UAX #14
-    if (!(lb == U_LB_OPEN_PUNCTUATION || lb == U_LB_QUOTATION)) {
-      break;
-    }
-    result = ix;
-  }
-  return result;
-}
-
-ssize_t WordBreaker::wordEnd() const {
-  if (mInEmailOrUrl) {
-    return mLast;
-  }
-  ssize_t result = mCurrent;
-  while (result > mLast) {
-    UChar32 c;
-    ssize_t ix = result;
-    U16_PREV(mText, mLast, ix, c);
-    const int32_t gc_mask = U_GET_GC_MASK(c);
-    // strip trailing space and punctuation
-    if ((gc_mask & (U_GC_ZS_MASK | U_GC_P_MASK)) == 0) {
-      break;
-    }
-    result = ix;
-  }
-  return result;
-}
-
-int WordBreaker::breakBadness() const {
-  return (mInEmailOrUrl && mCurrent < mScanOffset) ? 1 : 0;
-}
-
-void WordBreaker::finish() {
-  mText = nullptr;
-  // Note: calling utext_close multiply is safe
-  utext_close(&mUText);
-}
-
-}  // namespace minikin
diff --git a/third_party/txt/src/minikin/WordBreaker.h b/third_party/txt/src/minikin/WordBreaker.h
deleted file mode 100644
index f318a9566030767ba48ad51aa8ef638ee81f03a2..0000000000000000000000000000000000000000
--- a/third_party/txt/src/minikin/WordBreaker.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * A wrapper around ICU's line break iterator, that gives customized line
- * break opportunities, as well as identifying words for the purpose of
- * hyphenation.
- */
-
-#ifndef MINIKIN_WORD_BREAKER_H
-#define MINIKIN_WORD_BREAKER_H
-
-#include <memory>
-#include "unicode/brkiter.h"
-#include "utils/WindowsUtils.h"
-
-namespace minikin {
-
-class WordBreaker {
- public:
-  ~WordBreaker() { finish(); }
-
-  // libtxt extension: always use the default locale so that a cached instance
-  // of the ICU break iterator can be reused.
-  void setLocale();
-
-  void setText(const uint16_t* data, size_t size);
-
-  // Advance iterator to next word break. Return offset, or -1 if EOT
-  ssize_t next();
-
-  // Current offset of iterator, equal to 0 at BOT or last return from next()
-  ssize_t current() const;
-
-  // After calling next(), wordStart() and wordEnd() are offsets defining the
-  // previous word. If wordEnd <= wordStart, it's not a word for the purpose of
-  // hyphenation.
-  ssize_t wordStart() const;
-
-  ssize_t wordEnd() const;
-
-  int breakBadness() const;
-
-  void finish();
-
- private:
-  int32_t iteratorNext();
-  void detectEmailOrUrl();
-  ssize_t findNextBreakInEmailOrUrl();
-
-  std::unique_ptr<icu::BreakIterator> mBreakIterator;
-  UText mUText = UTEXT_INITIALIZER;
-  const uint16_t* mText = nullptr;
-  size_t mTextSize;
-  ssize_t mLast;
-  ssize_t mCurrent;
-  bool mIteratorWasReset;
-
-  // state for the email address / url detector
-  ssize_t mScanOffset;
-  bool mInEmailOrUrl;
-};
-
-}  // namespace minikin
-
-#endif  // MINIKIN_WORD_BREAKER_H
diff --git a/third_party/txt/src/skia/paragraph_builder_skia.cc b/third_party/txt/src/skia/paragraph_builder_skia.cc
index 272b6e09cb21e12100b3198b737e25e6767bb503..46f6d4aa602794d0d532b2345602f32b09dd4513 100644
--- a/third_party/txt/src/skia/paragraph_builder_skia.cc
+++ b/third_party/txt/src/skia/paragraph_builder_skia.cc
@@ -46,8 +46,9 @@ SkFontStyle MakeSkFontStyle(txt::FontWeight font_weight,
 
 ParagraphBuilderSkia::ParagraphBuilderSkia(
     const ParagraphStyle& style,
-    std::shared_ptr<FontCollection> font_collection)
-    : base_style_(style.GetTextStyle()) {
+    std::shared_ptr<FontCollection> font_collection,
+    const bool impeller_enabled)
+    : base_style_(style.GetTextStyle()), impeller_enabled_(impeller_enabled) {
   builder_ = skt::ParagraphBuilder::make(
       TxtToSkia(style), font_collection->CreateSktFontCollection());
 }
@@ -85,8 +86,8 @@ void ParagraphBuilderSkia::AddPlaceholder(PlaceholderRun& span) {
 }
 
 std::unique_ptr<Paragraph> ParagraphBuilderSkia::Build() {
-  return std::make_unique<ParagraphSkia>(builder_->Build(),
-                                         std::move(dl_paints_));
+  return std::make_unique<ParagraphSkia>(
+      builder_->Build(), std::move(dl_paints_), impeller_enabled_);
 }
 
 skt::ParagraphPainter::PaintID ParagraphBuilderSkia::CreatePaintID(
@@ -101,7 +102,7 @@ skt::ParagraphStyle ParagraphBuilderSkia::TxtToSkia(const ParagraphStyle& txt) {
 
   // Convert the default color of an SkParagraph text style into a DlPaint.
   flutter::DlPaint dl_paint;
-  dl_paint.setColor(text_style.getColor());
+  dl_paint.setColor(flutter::DlColor(text_style.getColor()));
   text_style.setForegroundPaintID(CreatePaintID(dl_paint));
 
   text_style.setFontStyle(MakeSkFontStyle(txt.font_weight, txt.font_style));
@@ -118,6 +119,7 @@ skt::ParagraphStyle ParagraphBuilderSkia::TxtToSkia(const ParagraphStyle& txt) {
   strut_style.setFontSize(SkDoubleToScalar(txt.strut_font_size));
   strut_style.setHeight(SkDoubleToScalar(txt.strut_height));
   strut_style.setHeightOverride(txt.strut_has_height_override);
+  strut_style.setHalfLeading(txt.strut_half_leading);
 
   std::vector<SkString> strut_fonts;
   std::transform(txt.strut_font_families.begin(), txt.strut_font_families.end(),
@@ -138,6 +140,7 @@ skt::ParagraphStyle ParagraphBuilderSkia::TxtToSkia(const ParagraphStyle& txt) {
 
   skia.turnHintingOff();
   skia.setReplaceTabCharacters(true);
+  skia.setApplyRoundingHack(false);
 
   return skia;
 }
@@ -169,14 +172,14 @@ skt::TextStyle ParagraphBuilderSkia::TxtToSkia(const TextStyle& txt) {
   skia.setHalfLeading(txt.half_leading);
 
   skia.setLocale(SkString(txt.locale.c_str()));
-  if (txt.has_background) {
-    skia.setBackgroundPaintID(CreatePaintID(txt.background_dl));
+  if (txt.background.has_value()) {
+    skia.setBackgroundPaintID(CreatePaintID(txt.background.value()));
   }
-  if (txt.has_foreground) {
-    skia.setForegroundPaintID(CreatePaintID(txt.foreground_dl));
+  if (txt.foreground.has_value()) {
+    skia.setForegroundPaintID(CreatePaintID(txt.foreground.value()));
   } else {
     flutter::DlPaint dl_paint;
-    dl_paint.setColor(txt.color);
+    dl_paint.setColor(flutter::DlColor(txt.color));
     skia.setForegroundPaintID(CreatePaintID(dl_paint));
   }
 
diff --git a/third_party/txt/src/skia/paragraph_builder_skia.h b/third_party/txt/src/skia/paragraph_builder_skia.h
index 58869cfa0a58b02e09411f56eacbbf496e50f78e..6269285899f58a1a977de494506972a31ebd3235 100644
--- a/third_party/txt/src/skia/paragraph_builder_skia.h
+++ b/third_party/txt/src/skia/paragraph_builder_skia.h
@@ -19,16 +19,21 @@
 
 #include "txt/paragraph_builder.h"
 
-#include "flutter/display_list/display_list_paint.h"
+#include "flutter/display_list/dl_paint.h"
 #include "third_party/skia/modules/skparagraph/include/ParagraphBuilder.h"
 
 namespace txt {
 
-// Implementation of ParagraphBuilder based on Skia's text layout module.
+//------------------------------------------------------------------------------
+/// @brief      ParagraphBuilder implementation using Skia's text layout module.
+///
+/// @note       Despite the suffix "Skia", this class is not specific to Skia
+///             and is also used with the Impeller backend.
 class ParagraphBuilderSkia : public ParagraphBuilder {
  public:
   ParagraphBuilderSkia(const ParagraphStyle& style,
-                       std::shared_ptr<FontCollection> font_collection);
+                       std::shared_ptr<FontCollection> font_collection,
+                       const bool impeller_enabled);
 
   virtual ~ParagraphBuilderSkia();
 
@@ -40,6 +45,8 @@ class ParagraphBuilderSkia : public ParagraphBuilder {
   virtual std::unique_ptr<Paragraph> Build() override;
 
  private:
+  friend class SkiaParagraphBuilderTests_ParagraphStrutStyle_Test;
+
   skia::textlayout::ParagraphPainter::PaintID CreatePaintID(
       const flutter::DlPaint& dl_paint);
   skia::textlayout::ParagraphStyle TxtToSkia(const ParagraphStyle& txt);
@@ -47,6 +54,14 @@ class ParagraphBuilderSkia : public ParagraphBuilder {
 
   std::shared_ptr<skia::textlayout::ParagraphBuilder> builder_;
   TextStyle base_style_;
+
+  /// @brief      Whether Impeller is enabled in the runtime.
+  ///
+  /// @note       As of the time of this writing, this is used to draw text
+  ///             decorations (i.e. dashed and dotted lines) directly using the
+  ///             `drawLine` API, because Impeller's path rendering does not
+  ///             support dashed and dotted lines (but Skia's does).
+  const bool impeller_enabled_;
   std::stack<TextStyle> txt_style_stack_;
   std::vector<flutter::DlPaint> dl_paints_;
 };
diff --git a/third_party/txt/src/skia/paragraph_skia.cc b/third_party/txt/src/skia/paragraph_skia.cc
index 359a0880de218720f77f656d7b6d1bbaff26e1eb..ca03a4a62b49fa4516b1f53197ac21039ed01062 100644
--- a/third_party/txt/src/skia/paragraph_skia.cc
+++ b/third_party/txt/src/skia/paragraph_skia.cc
@@ -18,6 +18,10 @@
 
 #include <algorithm>
 #include <numeric>
+#include "display_list/dl_paint.h"
+#include "fml/logging.h"
+#include "impeller/typographer/backends/skia/text_frame_skia.h"
+#include "include/core/SkMatrix.h"
 
 namespace txt {
 
@@ -45,27 +49,29 @@ txt::FontStyle GetTxtFontStyle(SkFontStyle::Slant font_slant) {
 
 class DisplayListParagraphPainter : public skt::ParagraphPainter {
  public:
+  //----------------------------------------------------------------------------
+  /// @brief      Creates a |skt::ParagraphPainter| that draws to DisplayList.
+  ///
+  /// @param      builder  The display list builder.
+  /// @param[in]  dl_paints The paints referenced by ID in the `drawX` methods.
+  /// @param[in]  draw_path_effect  If true, draw path effects directly by
+  ///                               drawing multiple lines instead of providing
+  //                                a path effect to the paint.
+  ///
+  /// @note       Impeller does not (and will not) support path effects, but the
+  ///             Skia backend does. That means that if we want to draw dashed
+  ///             and dotted lines, we need to draw them directly using the
+  ///             `drawLine` API instead of using a path effect.
+  ///
+  ///             See https://github.com/flutter/flutter/issues/126673. It
+  ///             probably makes sense to eventually make this a compile-time
+  ///             decision (i.e. with `#ifdef`) instead of a runtime option.
   DisplayListParagraphPainter(DisplayListBuilder* builder,
-                              const std::vector<DlPaint>& dl_paints)
-      : builder_(builder), dl_paints_(dl_paints) {}
-
-  DlPaint toDlPaint(const DecorationStyle& decor_style,
-                    DlDrawStyle draw_style = DlDrawStyle::kStroke) {
-    DlPaint paint;
-    paint.setDrawStyle(draw_style);
-    paint.setAntiAlias(true);
-    paint.setColor(decor_style.getColor());
-    paint.setStrokeWidth(decor_style.getStrokeWidth());
-    std::optional<DashPathEffect> dash_path_effect =
-        decor_style.getDashPathEffect();
-    if (dash_path_effect) {
-      std::array<SkScalar, 2> intervals{dash_path_effect->fOnLength,
-                                        dash_path_effect->fOffLength};
-      paint.setPathEffect(
-          DlDashPathEffect::Make(intervals.data(), intervals.size(), 0));
-    }
-    return paint;
-  }
+                              const std::vector<DlPaint>& dl_paints,
+                              bool impeller_enabled)
+      : builder_(builder),
+        dl_paints_(dl_paints),
+        impeller_enabled_(impeller_enabled) {}
 
   void drawTextBlob(const sk_sp<SkTextBlob>& blob,
                     SkScalar x,
@@ -76,7 +82,23 @@ class DisplayListParagraphPainter : public skt::ParagraphPainter {
     }
     size_t paint_id = std::get<PaintID>(paint);
     FML_DCHECK(paint_id < dl_paints_.size());
-    builder_->drawTextBlob(blob, x, y, dl_paints_[paint_id]);
+
+#ifdef IMPELLER_SUPPORTS_RENDERING
+    if (impeller_enabled_) {
+      if (ShouldRenderAsPath(dl_paints_[paint_id])) {
+        auto path = skia::textlayout::Paragraph::GetPath(blob.get());
+        auto transformed = path.makeTransform(SkMatrix::Translate(
+            x + blob->bounds().left(), y + blob->bounds().top()));
+        builder_->DrawPath(transformed, dl_paints_[paint_id]);
+        return;
+      }
+
+      builder_->DrawTextFrame(impeller::MakeTextFrameFromTextBlobSkia(blob), x,
+                              y, dl_paints_[paint_id]);
+      return;
+    }
+#endif  // IMPELLER_SUPPORTS_RENDERING
+    builder_->DrawTextBlob(blob, x, y, dl_paints_[paint_id]);
   }
 
   void drawTextShadow(const sk_sp<SkTextBlob>& blob,
@@ -88,30 +110,34 @@ class DisplayListParagraphPainter : public skt::ParagraphPainter {
       return;
     }
     DlPaint paint;
-    paint.setColor(color);
+    paint.setColor(DlColor(color));
     if (blur_sigma > 0.0) {
-      DlBlurMaskFilter filter(SkBlurStyle::kNormal_SkBlurStyle, blur_sigma,
-                              false);
+      DlBlurMaskFilter filter(DlBlurStyle::kNormal, blur_sigma, false);
       paint.setMaskFilter(&filter);
     }
-    builder_->drawTextBlob(blob, x, y, paint);
+    if (impeller_enabled_) {
+      builder_->DrawTextFrame(impeller::MakeTextFrameFromTextBlobSkia(blob), x,
+                              y, paint);
+      return;
+    }
+    builder_->DrawTextBlob(blob, x, y, paint);
   }
 
   void drawRect(const SkRect& rect, const SkPaintOrID& paint) override {
     size_t paint_id = std::get<PaintID>(paint);
     FML_DCHECK(paint_id < dl_paints_.size());
-    builder_->drawRect(rect, dl_paints_[paint_id]);
+    builder_->DrawRect(rect, dl_paints_[paint_id]);
   }
 
   void drawFilledRect(const SkRect& rect,
                       const DecorationStyle& decor_style) override {
     DlPaint paint = toDlPaint(decor_style, DlDrawStyle::kFill);
-    builder_->drawRect(rect, paint);
+    builder_->DrawRect(rect, paint);
   }
 
   void drawPath(const SkPath& path,
                 const DecorationStyle& decor_style) override {
-    builder_->drawPath(path, toDlPaint(decor_style));
+    builder_->DrawPath(path, toDlPaint(decor_style));
   }
 
   void drawLine(SkScalar x0,
@@ -119,32 +145,110 @@ class DisplayListParagraphPainter : public skt::ParagraphPainter {
                 SkScalar x1,
                 SkScalar y1,
                 const DecorationStyle& decor_style) override {
-    builder_->drawLine(SkPoint::Make(x0, y0), SkPoint::Make(x1, y1),
-                       toDlPaint(decor_style));
+    // We only support horizontal lines.
+    FML_DCHECK(y0 == y1);
+
+    // This function is called for both solid and dashed lines. If we're drawing
+    // a dashed line, and we're using the Impeller backend, then we need to draw
+    // the line directly using the `drawLine` API instead of using a path effect
+    // (because Impeller does not support path effects).
+    auto dash_path_effect = decor_style.getDashPathEffect();
+#ifdef IMPELLER_SUPPORTS_RENDERING
+    if (impeller_enabled_ && dash_path_effect) {
+      auto path = dashedLine(x0, x1, y0, *dash_path_effect);
+      builder_->DrawPath(path, toDlPaint(decor_style));
+      return;
+    }
+#endif  // IMPELLER_SUPPORTS_RENDERING
+
+    auto paint = toDlPaint(decor_style);
+    if (dash_path_effect) {
+      setPathEffect(paint, *dash_path_effect);
+    }
+    builder_->DrawLine(SkPoint::Make(x0, y0), SkPoint::Make(x1, y1), paint);
   }
 
   void clipRect(const SkRect& rect) override {
-    builder_->clipRect(rect, SkClipOp::kIntersect, false);
+    builder_->ClipRect(rect, DlCanvas::ClipOp::kIntersect, false);
   }
 
   void translate(SkScalar dx, SkScalar dy) override {
-    builder_->translate(dx, dy);
+    builder_->Translate(dx, dy);
   }
 
-  void save() override { builder_->save(); }
+  void save() override { builder_->Save(); }
 
-  void restore() override { builder_->restore(); }
+  void restore() override { builder_->Restore(); }
 
  private:
+  SkPath dashedLine(SkScalar x0,
+                    SkScalar x1,
+                    SkScalar y0,
+                    const DashPathEffect& dash_path_effect) {
+    auto dx = 0.0;
+    auto path = SkPath();
+    auto on = true;
+    auto length = x1 - x0;
+    while (dx < length) {
+      if (on) {
+        // Draw the on part of the dash.
+        path.moveTo(x0 + dx, y0);
+        dx += dash_path_effect.fOnLength;
+        path.lineTo(x0 + dx, y0);
+      } else {
+        // Skip the off part of the dash.
+        dx += dash_path_effect.fOffLength;
+      }
+      on = !on;
+    }
+
+    path.close();
+    return path;
+  }
+
+  bool ShouldRenderAsPath(const DlPaint& paint) const {
+    FML_DCHECK(impeller_enabled_);
+    // Text with non-trivial color sources or stroke paint mode should be
+    // rendered as a path when running on Impeller for correctness. These
+    // filters rely on having the glyph coverage, whereas regular text is
+    // drawn as rectangular texture samples.
+    return ((paint.getColorSource() && !paint.getColorSource()->asColor()) ||
+            paint.getDrawStyle() != DlDrawStyle::kFill);
+  }
+
+  DlPaint toDlPaint(const DecorationStyle& decor_style,
+                    DlDrawStyle draw_style = DlDrawStyle::kStroke) {
+    DlPaint paint;
+    paint.setDrawStyle(draw_style);
+    paint.setAntiAlias(true);
+    paint.setColor(DlColor(decor_style.getColor()));
+    paint.setStrokeWidth(decor_style.getStrokeWidth());
+    return paint;
+  }
+
+  void setPathEffect(DlPaint& paint, const DashPathEffect& dash_path_effect) {
+    // Impeller does not support path effects, so we should never be setting.
+    FML_DCHECK(!impeller_enabled_);
+
+    std::array<SkScalar, 2> intervals{dash_path_effect.fOnLength,
+                                      dash_path_effect.fOffLength};
+    auto effect = DlDashPathEffect::Make(intervals.data(), intervals.size(), 0);
+    paint.setPathEffect(effect);
+  }
+
   DisplayListBuilder* builder_;
   const std::vector<DlPaint>& dl_paints_;
+  const bool impeller_enabled_;
 };
 
 }  // anonymous namespace
 
 ParagraphSkia::ParagraphSkia(std::unique_ptr<skt::Paragraph> paragraph,
-                             std::vector<flutter::DlPaint>&& dl_paints)
-    : paragraph_(std::move(paragraph)), dl_paints_(dl_paints) {}
+                             std::vector<flutter::DlPaint>&& dl_paints,
+                             bool impeller_enabled)
+    : paragraph_(std::move(paragraph)),
+      dl_paints_(dl_paints),
+      impeller_enabled_(impeller_enabled) {}
 
 double ParagraphSkia::GetMaxWidth() {
   return SkScalarToDouble(paragraph_->getMaxWidth());
@@ -197,6 +301,11 @@ std::vector<LineMetrics>& ParagraphSkia::GetLineMetrics() {
   return line_metrics_.value();
 }
 
+bool ParagraphSkia::GetLineMetricsAt(int lineNumber,
+                                     skt::LineMetrics* lineMetrics) const {
+  return paragraph_->getLineMetricsAt(lineNumber, lineMetrics);
+};
+
 double ParagraphSkia::GetMinIntrinsicWidth() {
   return SkScalarToDouble(paragraph_->getMinIntrinsicWidth());
 }
@@ -223,12 +332,8 @@ void ParagraphSkia::Layout(double width) {
   paragraph_->layout(width);
 }
 
-void ParagraphSkia::Paint(SkCanvas* canvas, double x, double y) {
-  paragraph_->paint(canvas, x, y);
-}
-
 bool ParagraphSkia::Paint(DisplayListBuilder* builder, double x, double y) {
-  DisplayListParagraphPainter painter(builder, dl_paints_);
+  DisplayListParagraphPainter painter(builder, dl_paints_, impeller_enabled_);
   paragraph_->paint(&painter, x, y);
   return true;
 }
@@ -273,11 +378,32 @@ Paragraph::PositionWithAffinity ParagraphSkia::GetGlyphPositionAtCoordinate(
       skia_pos.position, static_cast<Affinity>(skia_pos.affinity));
 }
 
+bool ParagraphSkia::GetGlyphInfoAt(
+    unsigned offset,
+    skia::textlayout::Paragraph::GlyphInfo* glyphInfo) const {
+  return paragraph_->getGlyphInfoAtUTF16Offset(offset, glyphInfo);
+}
+
+bool ParagraphSkia::GetClosestGlyphInfoAtCoordinate(
+    double dx,
+    double dy,
+    skia::textlayout::Paragraph::GlyphInfo* glyphInfo) const {
+  return paragraph_->getClosestUTF16GlyphInfoAt(dx, dy, glyphInfo);
+};
+
 Paragraph::Range<size_t> ParagraphSkia::GetWordBoundary(size_t offset) {
   skt::SkRange<size_t> range = paragraph_->getWordBoundary(offset);
   return Paragraph::Range<size_t>(range.start, range.end);
 }
 
+size_t ParagraphSkia::GetNumberOfLines() const {
+  return paragraph_->lineNumber();
+}
+
+int ParagraphSkia::GetLineNumberAt(size_t codeUnitIndex) const {
+  return paragraph_->getLineNumberAtUTF16Offset(codeUnitIndex);
+}
+
 TextStyle ParagraphSkia::SkiaToTxt(const skt::TextStyle& skia) {
   TextStyle txt;
 
@@ -304,22 +430,12 @@ TextStyle ParagraphSkia::SkiaToTxt(const skt::TextStyle& skia) {
 
   txt.locale = skia.getLocale().c_str();
   if (skia.hasBackground()) {
-    skt::ParagraphPainter::SkPaintOrID background =
-        skia.getBackgroundPaintOrID();
-    if (std::holds_alternative<SkPaint>(background)) {
-      txt.background = std::get<SkPaint>(background);
-    } else if (std::holds_alternative<PaintID>(background)) {
-      txt.background_dl = dl_paints_[std::get<PaintID>(background)];
-    }
+    PaintID background_id = std::get<PaintID>(skia.getBackgroundPaintOrID());
+    txt.background = dl_paints_[background_id];
   }
   if (skia.hasForeground()) {
-    skt::ParagraphPainter::SkPaintOrID foreground =
-        skia.getForegroundPaintOrID();
-    if (std::holds_alternative<SkPaint>(foreground)) {
-      txt.foreground = std::get<SkPaint>(foreground);
-    } else if (std::holds_alternative<PaintID>(foreground)) {
-      txt.foreground_dl = dl_paints_[std::get<PaintID>(foreground)];
-    }
+    PaintID foreground_id = std::get<PaintID>(skia.getForegroundPaintOrID());
+    txt.foreground = dl_paints_[foreground_id];
   }
 
   txt.text_shadows.clear();
diff --git a/third_party/txt/src/skia/paragraph_skia.h b/third_party/txt/src/skia/paragraph_skia.h
index 640ab479d41f72ffafa48caae12449041e20a767..a33c2de8530fc97d2f420e3cbe1a6371bb4bd0f3 100644
--- a/third_party/txt/src/skia/paragraph_skia.h
+++ b/third_party/txt/src/skia/paragraph_skia.h
@@ -29,7 +29,8 @@ namespace txt {
 class ParagraphSkia : public Paragraph {
  public:
   ParagraphSkia(std::unique_ptr<skia::textlayout::Paragraph> paragraph,
-                std::vector<flutter::DlPaint>&& dl_paints);
+                std::vector<flutter::DlPaint>&& dl_paints,
+                bool impeller_enabled);
 
   virtual ~ParagraphSkia() = default;
 
@@ -49,11 +50,18 @@ class ParagraphSkia : public Paragraph {
 
   std::vector<LineMetrics>& GetLineMetrics() override;
 
+  bool GetLineMetricsAt(
+      int lineNumber,
+      skia::textlayout::LineMetrics* lineMetrics) const override;
+
+  size_t GetNumberOfLines() const override;
+
+  int GetLineNumberAt(size_t utf16Offset) const override;
+
   bool DidExceedMaxLines() override;
 
   void Layout(double width) override;
 
-  void Paint(SkCanvas* canvas, double x, double y) override;
   bool Paint(flutter::DisplayListBuilder* builder, double x, double y) override;
 
   std::vector<TextBox> GetRectsForRange(
@@ -67,6 +75,15 @@ class ParagraphSkia : public Paragraph {
   PositionWithAffinity GetGlyphPositionAtCoordinate(double dx,
                                                     double dy) override;
 
+  bool GetGlyphInfoAt(
+      unsigned offset,
+      skia::textlayout::Paragraph::GlyphInfo* glyphInfo) const override;
+
+  bool GetClosestGlyphInfoAtCoordinate(
+      double dx,
+      double dy,
+      skia::textlayout::Paragraph::GlyphInfo* glyphInfo) const override;
+
   Range<size_t> GetWordBoundary(size_t offset) override;
 
  private:
@@ -76,6 +93,7 @@ class ParagraphSkia : public Paragraph {
   std::vector<flutter::DlPaint> dl_paints_;
   std::optional<std::vector<LineMetrics>> line_metrics_;
   std::vector<TextStyle> line_metrics_styles_;
+  const bool impeller_enabled_;
 };
 
 }  // namespace txt
diff --git a/third_party/txt/src/txt/asset_font_manager.cc b/third_party/txt/src/txt/asset_font_manager.cc
index c5ba5d7acfa4b99a4a9dccaf9225928ef4fbf49b..c9952e85e8dadc7f8319cee60ad8a87f1afe3f1d 100644
--- a/third_party/txt/src/txt/asset_font_manager.cc
+++ b/third_party/txt/src/txt/asset_font_manager.cc
@@ -40,28 +40,28 @@ void AssetFontManager::onGetFamilyName(int index, SkString* familyName) const {
   familyName->set(font_provider_->GetFamilyName(index).c_str());
 }
 
-SkFontStyleSet* AssetFontManager::onCreateStyleSet(int index) const {
+sk_sp<SkFontStyleSet> AssetFontManager::onCreateStyleSet(int index) const {
   FML_DCHECK(false);
   return nullptr;
 }
 
-SkFontStyleSet* AssetFontManager::onMatchFamily(
+sk_sp<SkFontStyleSet> AssetFontManager::onMatchFamily(
     const char family_name_string[]) const {
   std::string family_name(family_name_string);
   return font_provider_->MatchFamily(family_name);
 }
 
-SkTypeface* AssetFontManager::onMatchFamilyStyle(
+sk_sp<SkTypeface> AssetFontManager::onMatchFamilyStyle(
     const char familyName[],
     const SkFontStyle& style) const {
-  SkFontStyleSet* font_style_set =
+  sk_sp<SkFontStyleSet> font_style_set =
       font_provider_->MatchFamily(std::string(familyName));
   if (font_style_set == nullptr)
     return nullptr;
   return font_style_set->matchStyle(style);
 }
 
-SkTypeface* AssetFontManager::onMatchFamilyStyleCharacter(
+sk_sp<SkTypeface> AssetFontManager::onMatchFamilyStyleCharacter(
     const char familyName[],
     const SkFontStyle&,
     const char* bcp47[],
diff --git a/third_party/txt/src/txt/asset_font_manager.h b/third_party/txt/src/txt/asset_font_manager.h
index 41648a0a497f341ff11ac977268f0eeb4a842dcd..4c1e34c17fdc1285592ecb49266bc717f47e0aed 100644
--- a/third_party/txt/src/txt/asset_font_manager.h
+++ b/third_party/txt/src/txt/asset_font_manager.h
@@ -18,6 +18,7 @@
 #define TXT_ASSET_FONT_MANAGER_H_
 
 #include <memory>
+#include <utility>
 
 #include "flutter/fml/macros.h"
 #include "third_party/skia/include/core/SkFontMgr.h"
@@ -35,7 +36,7 @@ class AssetFontManager : public SkFontMgr {
 
  protected:
   // |SkFontMgr|
-  SkFontStyleSet* onMatchFamily(const char familyName[]) const override;
+  sk_sp<SkFontStyleSet> onMatchFamily(const char familyName[]) const override;
 
   std::unique_ptr<FontAssetProvider> font_provider_;
 
@@ -47,18 +48,19 @@ class AssetFontManager : public SkFontMgr {
   void onGetFamilyName(int index, SkString* familyName) const override;
 
   // |SkFontMgr|
-  SkFontStyleSet* onCreateStyleSet(int index) const override;
+  sk_sp<SkFontStyleSet> onCreateStyleSet(int index) const override;
 
   // |SkFontMgr|
-  SkTypeface* onMatchFamilyStyle(const char familyName[],
-                                 const SkFontStyle&) const override;
+  sk_sp<SkTypeface> onMatchFamilyStyle(const char familyName[],
+                                       const SkFontStyle&) const override;
 
   // |SkFontMgr|
-  SkTypeface* onMatchFamilyStyleCharacter(const char familyName[],
-                                          const SkFontStyle&,
-                                          const char* bcp47[],
-                                          int bcp47Count,
-                                          SkUnichar character) const override;
+  sk_sp<SkTypeface> onMatchFamilyStyleCharacter(
+      const char familyName[],
+      const SkFontStyle&,
+      const char* bcp47[],
+      int bcp47Count,
+      SkUnichar character) const override;
 
   // |SkFontMgr|
   sk_sp<SkTypeface> onMakeFromData(sk_sp<SkData>, int ttcIndex) const override;
@@ -87,7 +89,7 @@ class DynamicFontManager : public AssetFontManager {
   DynamicFontManager()
       : AssetFontManager(std::make_unique<TypefaceFontAssetProvider>()) {}
 
-  TypefaceFontAssetProvider& font_provider() {
+  TypefaceFontAssetProvider& font_provider() const {
     return static_cast<TypefaceFontAssetProvider&>(*font_provider_);
   }
 };
diff --git a/third_party/txt/src/txt/font_asset_provider.h b/third_party/txt/src/txt/font_asset_provider.h
index 45a076293aa2cc3bc73339d55fddbfe5e00deda4..f43aacd68bb02a9025e6bf7c2ca9f43d573440ae 100644
--- a/third_party/txt/src/txt/font_asset_provider.h
+++ b/third_party/txt/src/txt/font_asset_provider.h
@@ -29,7 +29,7 @@ class FontAssetProvider {
 
   virtual size_t GetFamilyCount() const = 0;
   virtual std::string GetFamilyName(int index) const = 0;
-  virtual SkFontStyleSet* MatchFamily(const std::string& family_name) = 0;
+  virtual sk_sp<SkFontStyleSet> MatchFamily(const std::string& family_name) = 0;
 
  protected:
   static std::string CanonicalFamilyName(std::string family_name);
diff --git a/third_party/txt/src/txt/font_collection.cc b/third_party/txt/src/txt/font_collection.cc
index 96c1b1b325331fcb2fd185be600bd151cf7cf517..5cef503cb87bf143b0c1c593879316bc221f35cd 100644
--- a/third_party/txt/src/txt/font_collection.cc
+++ b/third_party/txt/src/txt/font_collection.cc
@@ -26,71 +26,17 @@
 #include <vector>
 #include "flutter/fml/logging.h"
 #include "flutter/fml/trace_event.h"
-#include "font_skia.h"
-#include "minikin/Layout.h"
 #include "txt/platform.h"
 #include "txt/text_style.h"
 
 namespace txt {
 
-namespace {
-
-const std::shared_ptr<minikin::FontFamily> g_null_family;
-
-}  // anonymous namespace
-
-FontCollection::FamilyKey::FamilyKey(const std::vector<std::string>& families,
-                                     const std::string& loc) {
-  locale = loc;
-
-  std::stringstream stream;
-  for_each(families.begin(), families.end(),
-           [&stream](const std::string& str) { stream << str << ','; });
-  font_families = stream.str();
-}
-
-bool FontCollection::FamilyKey::operator==(
-    const FontCollection::FamilyKey& other) const {
-  return font_families == other.font_families && locale == other.locale;
-}
-
-size_t FontCollection::FamilyKey::Hasher::operator()(
-    const FontCollection::FamilyKey& key) const {
-  return std::hash<std::string>()(key.font_families) ^
-         std::hash<std::string>()(key.locale);
-}
-
-class TxtFallbackFontProvider
-    : public minikin::FontCollection::FallbackFontProvider {
- public:
-  TxtFallbackFontProvider(std::shared_ptr<FontCollection> font_collection)
-      : font_collection_(font_collection) {}
-
-  virtual const std::shared_ptr<minikin::FontFamily>& matchFallbackFont(
-      uint32_t ch,
-      std::string locale) {
-    std::shared_ptr<FontCollection> fc = font_collection_.lock();
-    if (fc) {
-      return fc->MatchFallbackFont(ch, locale);
-    } else {
-      return g_null_family;
-    }
-  }
-
- private:
-  std::weak_ptr<FontCollection> font_collection_;
-};
-
 FontCollection::FontCollection() : enable_font_fallback_(true) {}
 
 FontCollection::~FontCollection() {
-  minikin::Layout::purgeCaches();
-
-#if FLUTTER_ENABLE_SKSHAPER
   if (skt_collection_) {
     skt_collection_->clearCaches();
   }
-#endif
 }
 
 size_t FontCollection::GetFontManagersCount() const {
@@ -100,38 +46,27 @@ size_t FontCollection::GetFontManagersCount() const {
 void FontCollection::SetupDefaultFontManager(
     uint32_t font_initialization_data) {
   default_font_manager_ = GetDefaultFontManager(font_initialization_data);
+  skt_collection_.reset();
 }
 
 void FontCollection::SetDefaultFontManager(sk_sp<SkFontMgr> font_manager) {
   default_font_manager_ = font_manager;
-
-#if FLUTTER_ENABLE_SKSHAPER
   skt_collection_.reset();
-#endif
 }
 
 void FontCollection::SetAssetFontManager(sk_sp<SkFontMgr> font_manager) {
   asset_font_manager_ = font_manager;
-
-#if FLUTTER_ENABLE_SKSHAPER
   skt_collection_.reset();
-#endif
 }
 
 void FontCollection::SetDynamicFontManager(sk_sp<SkFontMgr> font_manager) {
   dynamic_font_manager_ = font_manager;
-
-#if FLUTTER_ENABLE_SKSHAPER
   skt_collection_.reset();
-#endif
 }
 
 void FontCollection::SetTestFontManager(sk_sp<SkFontMgr> font_manager) {
   test_font_manager_ = font_manager;
-
-#if FLUTTER_ENABLE_SKSHAPER
   skt_collection_.reset();
-#endif
 }
 
 // Return the available font managers in the order they should be queried.
@@ -150,249 +85,17 @@ std::vector<sk_sp<SkFontMgr>> FontCollection::GetFontManagerOrder() const {
 
 void FontCollection::DisableFontFallback() {
   enable_font_fallback_ = false;
-
-#if FLUTTER_ENABLE_SKSHAPER
   if (skt_collection_) {
     skt_collection_->disableFontFallback();
   }
-#endif
-}
-
-std::shared_ptr<minikin::FontCollection>
-FontCollection::GetMinikinFontCollectionForFamilies(
-    const std::vector<std::string>& font_families,
-    const std::string& locale) {
-  // Look inside the font collections cache first.
-  FamilyKey family_key(font_families, locale);
-  auto cached = font_collections_cache_.find(family_key);
-  if (cached != font_collections_cache_.end()) {
-    return cached->second;
-  }
-
-  std::vector<std::shared_ptr<minikin::FontFamily>> minikin_families;
-
-  // Search for all user provided font families.
-  for (size_t fallback_index = 0; fallback_index < font_families.size();
-       fallback_index++) {
-    std::shared_ptr<minikin::FontFamily> minikin_family =
-        FindFontFamilyInManagers(font_families[fallback_index]);
-    if (minikin_family != nullptr) {
-      minikin_families.push_back(minikin_family);
-    }
-  }
-  // Search for default font family if no user font families were found.
-  if (minikin_families.empty()) {
-    const auto default_font_families = GetDefaultFontFamilies();
-    for (const auto& family : default_font_families) {
-      std::shared_ptr<minikin::FontFamily> minikin_family =
-          FindFontFamilyInManagers(family);
-      if (minikin_family != nullptr) {
-        minikin_families.push_back(minikin_family);
-        break;
-      }
-    }
-  }
-  // Default font family also not found. We fail to get a FontCollection.
-  if (minikin_families.empty()) {
-    font_collections_cache_[family_key] = nullptr;
-    return nullptr;
-  }
-  if (enable_font_fallback_) {
-    for (const std::string& fallback_family :
-         fallback_fonts_for_locale_[locale]) {
-      auto it = fallback_fonts_.find(fallback_family);
-      if (it != fallback_fonts_.end()) {
-        minikin_families.push_back(it->second);
-      }
-    }
-  }
-  // Create the minikin font collection.
-  auto font_collection =
-      minikin::FontCollection::Create(std::move(minikin_families));
-  if (!font_collection) {
-    font_collections_cache_[family_key] = nullptr;
-    return nullptr;
-  }
-  if (enable_font_fallback_) {
-    font_collection->set_fallback_font_provider(
-        std::make_unique<TxtFallbackFontProvider>(shared_from_this()));
-  }
-
-  // Cache the font collection for future queries.
-  font_collections_cache_[family_key] = font_collection;
-
-  return font_collection;
-}
-
-std::shared_ptr<minikin::FontFamily> FontCollection::FindFontFamilyInManagers(
-    const std::string& family_name) {
-  TRACE_EVENT0("flutter", "FontCollection::FindFontFamilyInManagers");
-  // Search for the font family in each font manager.
-  for (sk_sp<SkFontMgr>& manager : GetFontManagerOrder()) {
-    std::shared_ptr<minikin::FontFamily> minikin_family =
-        CreateMinikinFontFamily(manager, family_name);
-    if (!minikin_family)
-      continue;
-    return minikin_family;
-  }
-  return nullptr;
-}
-
-void FontCollection::SortSkTypefaces(
-    std::vector<sk_sp<SkTypeface>>& sk_typefaces) {
-  std::sort(
-      sk_typefaces.begin(), sk_typefaces.end(),
-      [](const sk_sp<SkTypeface>& a, const sk_sp<SkTypeface>& b) {
-        SkFontStyle a_style = a->fontStyle();
-        SkFontStyle b_style = b->fontStyle();
-
-        int a_delta = std::abs(a_style.width() - SkFontStyle::kNormal_Width);
-        int b_delta = std::abs(b_style.width() - SkFontStyle::kNormal_Width);
-
-        if (a_delta != b_delta) {
-          // If a family name query is so generic it ends up bringing in fonts
-          // of multiple widths (e.g. condensed, expanded), opt to be
-          // conservative and select the most standard width.
-          //
-          // If a specific width is desired, it should be be narrowed down via
-          // the family name.
-          //
-          // The font weights are also sorted lightest to heaviest but Flutter
-          // APIs have the weight specified to narrow it down later. The width
-          // ordering here is more consequential since TextStyle doesn't have
-          // letter width APIs.
-          return a_delta < b_delta;
-        } else if (a_style.width() != b_style.width()) {
-          // However, if the 2 fonts are equidistant from the "normal" width,
-          // just arbitrarily but consistently return the more condensed font.
-          return a_style.width() < b_style.width();
-        } else if (a_style.weight() != b_style.weight()) {
-          return a_style.weight() < b_style.weight();
-        } else {
-          return a_style.slant() < b_style.slant();
-        }
-        // Use a cascade of conditions so results are consistent each time.
-      });
-}
-
-std::shared_ptr<minikin::FontFamily> FontCollection::CreateMinikinFontFamily(
-    const sk_sp<SkFontMgr>& manager,
-    const std::string& family_name) {
-  TRACE_EVENT1("flutter", "FontCollection::CreateMinikinFontFamily",
-               "family_name", family_name.c_str());
-  sk_sp<SkFontStyleSet> font_style_set(
-      manager->matchFamily(family_name.c_str()));
-  if (font_style_set == nullptr || font_style_set->count() == 0) {
-    return nullptr;
-  }
-
-  std::vector<sk_sp<SkTypeface>> skia_typefaces;
-  for (int i = 0; i < font_style_set->count(); ++i) {
-    TRACE_EVENT0("flutter", "CreateSkiaTypeface");
-    sk_sp<SkTypeface> skia_typeface(
-        sk_sp<SkTypeface>(font_style_set->createTypeface(i)));
-    if (skia_typeface != nullptr) {
-      skia_typefaces.emplace_back(std::move(skia_typeface));
-    }
-  }
-
-  if (skia_typefaces.empty()) {
-    return nullptr;
-  }
-
-  SortSkTypefaces(skia_typefaces);
-
-  std::vector<minikin::Font> minikin_fonts;
-  for (const sk_sp<SkTypeface>& skia_typeface : skia_typefaces) {
-    // Create the minikin font from the skia typeface.
-    // Divide by 100 because the weights are given as "100", "200", etc.
-    minikin_fonts.emplace_back(
-        std::make_shared<FontSkia>(skia_typeface),
-        minikin::FontStyle{skia_typeface->fontStyle().weight() / 100,
-                           skia_typeface->isItalic()});
-  }
-
-  return std::make_shared<minikin::FontFamily>(std::move(minikin_fonts));
-}
-
-const std::shared_ptr<minikin::FontFamily>& FontCollection::MatchFallbackFont(
-    uint32_t ch,
-    std::string locale) {
-  // Check if the ch's matched font has been cached. We cache the results of
-  // this method as repeated matchFamilyStyleCharacter calls can become
-  // extremely laggy when typing a large number of complex emojis.
-  auto lookup = fallback_match_cache_.find(ch);
-  if (lookup != fallback_match_cache_.end()) {
-    return *lookup->second;
-  }
-  const std::shared_ptr<minikin::FontFamily>* match =
-      &DoMatchFallbackFont(ch, locale);
-  fallback_match_cache_.insert(std::make_pair(ch, match));
-  return *match;
-}
-
-const std::shared_ptr<minikin::FontFamily>& FontCollection::DoMatchFallbackFont(
-    uint32_t ch,
-    std::string locale) {
-  for (const sk_sp<SkFontMgr>& manager : GetFontManagerOrder()) {
-    std::vector<const char*> bcp47;
-    if (!locale.empty())
-      bcp47.push_back(locale.c_str());
-    sk_sp<SkTypeface> typeface(manager->matchFamilyStyleCharacter(
-        0, SkFontStyle(), bcp47.data(), bcp47.size(), ch));
-    if (!typeface)
-      continue;
-
-    SkString sk_family_name;
-    typeface->getFamilyName(&sk_family_name);
-    std::string family_name(sk_family_name.c_str());
-
-    if (std::find(fallback_fonts_for_locale_[locale].begin(),
-                  fallback_fonts_for_locale_[locale].end(),
-                  family_name) == fallback_fonts_for_locale_[locale].end())
-      fallback_fonts_for_locale_[locale].push_back(family_name);
-
-    return GetFallbackFontFamily(manager, family_name);
-  }
-  return g_null_family;
-}
-
-const std::shared_ptr<minikin::FontFamily>&
-FontCollection::GetFallbackFontFamily(const sk_sp<SkFontMgr>& manager,
-                                      const std::string& family_name) {
-  TRACE_EVENT0("flutter", "FontCollection::GetFallbackFontFamily");
-  auto fallback_it = fallback_fonts_.find(family_name);
-  if (fallback_it != fallback_fonts_.end()) {
-    return fallback_it->second;
-  }
-
-  std::shared_ptr<minikin::FontFamily> minikin_family =
-      CreateMinikinFontFamily(manager, family_name);
-  if (!minikin_family)
-    return g_null_family;
-
-  auto insert_it =
-      fallback_fonts_.insert(std::make_pair(family_name, minikin_family));
-
-  // Clear the cache to force creation of new font collections that will
-  // include this fallback font.
-  font_collections_cache_.clear();
-
-  return insert_it.first->second;
 }
 
 void FontCollection::ClearFontFamilyCache() {
-  font_collections_cache_.clear();
-
-#if FLUTTER_ENABLE_SKSHAPER
   if (skt_collection_) {
     skt_collection_->clearCaches();
   }
-#endif
 }
 
-#if FLUTTER_ENABLE_SKSHAPER
-
 sk_sp<skia::textlayout::FontCollection>
 FontCollection::CreateSktFontCollection() {
   if (!skt_collection_) {
@@ -415,6 +118,4 @@ FontCollection::CreateSktFontCollection() {
   return skt_collection_;
 }
 
-#endif  // FLUTTER_ENABLE_SKSHAPER
-
 }  // namespace txt
diff --git a/third_party/txt/src/txt/font_collection.h b/third_party/txt/src/txt/font_collection.h
index 4e9f1a579d4c3392caa237fec72e77cc14497d0c..08631bef8a1427cebe54ed5f15144a1cc7a257e3 100644
--- a/third_party/txt/src/txt/font_collection.h
+++ b/third_party/txt/src/txt/font_collection.h
@@ -23,18 +23,13 @@
 #include <unordered_map>
 
 #include "flutter/fml/macros.h"
-#include "minikin/FontCollection.h"
-#include "minikin/FontFamily.h"
 #include "third_party/googletest/googletest/include/gtest/gtest_prod.h"  // nogncheck
 #include "third_party/skia/include/core/SkFontMgr.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
+#include "third_party/skia/modules/skparagraph/include/FontCollection.h"  // nogncheck
 #include "txt/asset_font_manager.h"
 #include "txt/text_style.h"
 
-#if FLUTTER_ENABLE_SKSHAPER
-#include "third_party/skia/modules/skparagraph/include/FontCollection.h"  // nogncheck
-#endif
-
 namespace txt {
 
 class FontCollection : public std::enable_shared_from_this<FontCollection> {
@@ -51,16 +46,6 @@ class FontCollection : public std::enable_shared_from_this<FontCollection> {
   void SetDynamicFontManager(sk_sp<SkFontMgr> font_manager);
   void SetTestFontManager(sk_sp<SkFontMgr> font_manager);
 
-  std::shared_ptr<minikin::FontCollection> GetMinikinFontCollectionForFamilies(
-      const std::vector<std::string>& font_families,
-      const std::string& locale);
-
-  // Provides a FontFamily that contains glyphs for ch. This caches previously
-  // matched fonts. Also see FontCollection::DoMatchFallbackFont.
-  const std::shared_ptr<minikin::FontFamily>& MatchFallbackFont(
-      uint32_t ch,
-      std::string locale);
-
   // Do not provide alternative fonts that can match characters which are
   // missing from the requested font family.
   void DisableFontFallback();
@@ -68,75 +53,21 @@ class FontCollection : public std::enable_shared_from_this<FontCollection> {
   // Remove all entries in the font family cache.
   void ClearFontFamilyCache();
 
-#if FLUTTER_ENABLE_SKSHAPER
-
   // Construct a Skia text layout FontCollection based on this collection.
   sk_sp<skia::textlayout::FontCollection> CreateSktFontCollection();
 
-#endif  // FLUTTER_ENABLE_SKSHAPER
-
  private:
-  struct FamilyKey {
-    FamilyKey(const std::vector<std::string>& families, const std::string& loc);
-
-    // Concatenated string with all font families.
-    std::string font_families;
-    std::string locale;
-
-    bool operator==(const FamilyKey& other) const;
-
-    struct Hasher {
-      size_t operator()(const FamilyKey& key) const;
-    };
-  };
-
   sk_sp<SkFontMgr> default_font_manager_;
   sk_sp<SkFontMgr> asset_font_manager_;
   sk_sp<SkFontMgr> dynamic_font_manager_;
   sk_sp<SkFontMgr> test_font_manager_;
-  std::unordered_map<FamilyKey,
-                     std::shared_ptr<minikin::FontCollection>,
-                     FamilyKey::Hasher>
-      font_collections_cache_;
-  // Cache that stores the results of MatchFallbackFont to ensure lag-free emoji
-  // font fallback matching.
-  std::unordered_map<uint32_t, const std::shared_ptr<minikin::FontFamily>*>
-      fallback_match_cache_;
-  std::unordered_map<std::string, std::shared_ptr<minikin::FontFamily>>
-      fallback_fonts_;
-  std::unordered_map<std::string, std::vector<std::string>>
-      fallback_fonts_for_locale_;
   bool enable_font_fallback_;
 
-#if FLUTTER_ENABLE_SKSHAPER
   // An equivalent font collection usable by the Skia text shaper library.
   sk_sp<skia::textlayout::FontCollection> skt_collection_;
-#endif
-
-  // Performs the actual work of MatchFallbackFont. The result is cached in
-  // fallback_match_cache_.
-  const std::shared_ptr<minikin::FontFamily>& DoMatchFallbackFont(
-      uint32_t ch,
-      std::string locale);
 
   std::vector<sk_sp<SkFontMgr>> GetFontManagerOrder() const;
 
-  std::shared_ptr<minikin::FontFamily> FindFontFamilyInManagers(
-      const std::string& family_name);
-
-  std::shared_ptr<minikin::FontFamily> CreateMinikinFontFamily(
-      const sk_sp<SkFontMgr>& manager,
-      const std::string& family_name);
-
-  // Sorts in-place a group of SkTypeface from an SkTypefaceSet into a
-  // reasonable order for future queries.
-  FRIEND_TEST(FontCollectionTest, CheckSkTypefacesSorting);
-  static void SortSkTypefaces(std::vector<sk_sp<SkTypeface>>& sk_typefaces);
-
-  const std::shared_ptr<minikin::FontFamily>& GetFallbackFontFamily(
-      const sk_sp<SkFontMgr>& manager,
-      const std::string& family_name);
-
   FML_DISALLOW_COPY_AND_ASSIGN(FontCollection);
 };
 
diff --git a/third_party/txt/src/txt/font_skia.cc b/third_party/txt/src/txt/font_skia.cc
deleted file mode 100644
index 9843ab05aa76b89f41caf8940b80aec369015fee..0000000000000000000000000000000000000000
--- a/third_party/txt/src/txt/font_skia.cc
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2017 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "font_skia.h"
-
-#include <minikin/MinikinFont.h>
-
-#include "third_party/skia/include/core/SkFont.h"
-
-namespace txt {
-namespace {
-
-hb_blob_t* GetTable(hb_face_t* face, hb_tag_t tag, void* context) {
-  SkTypeface* typeface = reinterpret_cast<SkTypeface*>(context);
-
-  const size_t table_size = typeface->getTableSize(tag);
-  if (table_size == 0)
-    return nullptr;
-  void* buffer = malloc(table_size);
-  if (buffer == nullptr)
-    return nullptr;
-
-  size_t actual_size = typeface->getTableData(tag, 0, table_size, buffer);
-  if (table_size != actual_size) {
-    free(buffer);
-    return nullptr;
-  }
-  return hb_blob_create(reinterpret_cast<char*>(buffer), table_size,
-                        HB_MEMORY_MODE_WRITABLE, buffer, free);
-}
-
-}  // namespace
-
-FontSkia::FontSkia(sk_sp<SkTypeface> typeface)
-    : MinikinFont(typeface->uniqueID()), typeface_(std::move(typeface)) {}
-
-FontSkia::~FontSkia() = default;
-
-static void FontSkia_SetSkiaFont(sk_sp<SkTypeface> typeface,
-                                 SkFont* skFont,
-                                 const minikin::MinikinPaint& paint) {
-  skFont->setTypeface(std::move(typeface));
-  skFont->setLinearMetrics((paint.paintFlags & minikin::LinearTextFlag) != 0);
-  // TODO: set more paint parameters from Minikin
-  skFont->setSize(paint.size);
-}
-
-float FontSkia::GetHorizontalAdvance(uint32_t glyph_id,
-                                     const minikin::MinikinPaint& paint) const {
-  SkFont skFont;
-  uint16_t glyph16 = glyph_id;
-  SkScalar skWidth;
-  FontSkia_SetSkiaFont(typeface_, &skFont, paint);
-  skFont.getWidths(&glyph16, 1, &skWidth);
-  return skWidth;
-}
-
-void FontSkia::GetBounds(minikin::MinikinRect* bounds,
-                         uint32_t glyph_id,
-                         const minikin::MinikinPaint& paint) const {
-  SkFont skFont;
-  uint16_t glyph16 = glyph_id;
-  SkRect skBounds;
-  FontSkia_SetSkiaFont(typeface_, &skFont, paint);
-  skFont.getWidths(&glyph16, 1, NULL, &skBounds);
-  bounds->mLeft = skBounds.fLeft;
-  bounds->mTop = skBounds.fTop;
-  bounds->mRight = skBounds.fRight;
-  bounds->mBottom = skBounds.fBottom;
-}
-
-hb_face_t* FontSkia::CreateHarfBuzzFace() const {
-  return hb_face_create_for_tables(GetTable, typeface_.get(), 0);
-}
-
-const std::vector<minikin::FontVariation>& FontSkia::GetAxes() const {
-  return variations_;
-}
-
-const sk_sp<SkTypeface>& FontSkia::GetSkTypeface() const {
-  return typeface_;
-}
-
-}  // namespace txt
diff --git a/third_party/txt/src/txt/font_skia.h b/third_party/txt/src/txt/font_skia.h
deleted file mode 100644
index 72e9bddc234bc933dcf0683b1a6e9e049120a3e7..0000000000000000000000000000000000000000
--- a/third_party/txt/src/txt/font_skia.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2017 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <minikin/MinikinFont.h>
-
-#include "flutter/fml/macros.h"
-#include "third_party/skia/include/core/SkPaint.h"
-#include "third_party/skia/include/core/SkTypeface.h"
-
-namespace txt {
-
-class FontSkia : public minikin::MinikinFont {
- public:
-  explicit FontSkia(sk_sp<SkTypeface> typeface);
-
-  ~FontSkia();
-
-  float GetHorizontalAdvance(uint32_t glyph_id,
-                             const minikin::MinikinPaint& paint) const override;
-
-  void GetBounds(minikin::MinikinRect* bounds,
-                 uint32_t glyph_id,
-                 const minikin::MinikinPaint& paint) const override;
-
-  hb_face_t* CreateHarfBuzzFace() const override;
-
-  const std::vector<minikin::FontVariation>& GetAxes() const override;
-
-  const sk_sp<SkTypeface>& GetSkTypeface() const;
-
- private:
-  sk_sp<SkTypeface> typeface_;
-  std::vector<minikin::FontVariation> variations_;
-
-  FML_DISALLOW_COPY_AND_ASSIGN(FontSkia);
-};
-
-}  // namespace txt
diff --git a/third_party/txt/src/txt/paint_record.cc b/third_party/txt/src/txt/paint_record.cc
deleted file mode 100644
index 21ff440886e15447d01611fbfcdb52f00111faa7..0000000000000000000000000000000000000000
--- a/third_party/txt/src/txt/paint_record.cc
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright 2017 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "paint_record.h"
-
-#include "flutter/fml/logging.h"
-
-namespace txt {
-
-PaintRecord::~PaintRecord() = default;
-
-PaintRecord::PaintRecord(TextStyle style,
-                         SkPoint offset,
-                         sk_sp<SkTextBlob> text,
-                         SkFontMetrics metrics,
-                         size_t line,
-                         double x_start,
-                         double x_end,
-                         bool is_ghost)
-    : style_(style),
-      offset_(offset),
-      text_(std::move(text)),
-      metrics_(metrics),
-      line_(line),
-      x_start_(x_start),
-      x_end_(x_end),
-      is_ghost_(is_ghost) {}
-
-PaintRecord::PaintRecord(TextStyle style,
-                         SkPoint offset,
-                         sk_sp<SkTextBlob> text,
-                         SkFontMetrics metrics,
-                         size_t line,
-                         double x_start,
-                         double x_end,
-                         bool is_ghost,
-                         PlaceholderRun* placeholder_run)
-    : style_(style),
-      offset_(offset),
-      text_(std::move(text)),
-      metrics_(metrics),
-      line_(line),
-      x_start_(x_start),
-      x_end_(x_end),
-      is_ghost_(is_ghost),
-      placeholder_run_(placeholder_run) {}
-
-PaintRecord::PaintRecord(TextStyle style,
-                         sk_sp<SkTextBlob> text,
-                         SkFontMetrics metrics,
-                         size_t line,
-                         double x_start,
-                         double x_end,
-                         bool is_ghost)
-    : style_(style),
-      text_(std::move(text)),
-      metrics_(metrics),
-      line_(line),
-      x_start_(x_start),
-      x_end_(x_end),
-      is_ghost_(is_ghost) {}
-
-PaintRecord::PaintRecord(PaintRecord&& other) {
-  style_ = other.style_;
-  offset_ = other.offset_;
-  text_ = std::move(other.text_);
-  metrics_ = other.metrics_;
-  line_ = other.line_;
-  placeholder_run_ = other.placeholder_run_;
-  x_start_ = other.x_start_;
-  x_end_ = other.x_end_;
-  is_ghost_ = other.is_ghost_;
-}
-
-PaintRecord& PaintRecord::operator=(PaintRecord&& other) {
-  style_ = other.style_;
-  offset_ = other.offset_;
-  text_ = std::move(other.text_);
-  metrics_ = other.metrics_;
-  line_ = other.line_;
-  x_start_ = other.x_start_;
-  x_end_ = other.x_end_;
-  is_ghost_ = other.is_ghost_;
-  placeholder_run_ = other.placeholder_run_;
-  return *this;
-}
-
-void PaintRecord::SetOffset(SkPoint pt) {
-  offset_ = pt;
-}
-
-}  // namespace txt
diff --git a/third_party/txt/src/txt/paint_record.h b/third_party/txt/src/txt/paint_record.h
deleted file mode 100644
index 33917488ccc829dff23837c3eb90fa5ae16df528..0000000000000000000000000000000000000000
--- a/third_party/txt/src/txt/paint_record.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright 2017 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef LIB_TXT_SRC_PAINT_RECORD_H_
-#define LIB_TXT_SRC_PAINT_RECORD_H_
-
-#include "flutter/fml/logging.h"
-#include "flutter/fml/macros.h"
-#include "placeholder_run.h"
-#include "text_style.h"
-#include "third_party/skia/include/core/SkFontMetrics.h"
-#include "third_party/skia/include/core/SkTextBlob.h"
-
-namespace txt {
-
-// PaintRecord holds the layout data after Paragraph::Layout() is called. This
-// stores all necessary offsets, blobs, metrics, and more for Skia to draw the
-// text.
-class PaintRecord {
- public:
-  PaintRecord() = delete;
-
-  ~PaintRecord();
-
-  PaintRecord(TextStyle style,
-              SkPoint offset,
-              sk_sp<SkTextBlob> text,
-              SkFontMetrics metrics,
-              size_t line,
-              double x_start,
-              double x_end,
-              bool is_ghost);
-
-  PaintRecord(TextStyle style,
-              SkPoint offset,
-              sk_sp<SkTextBlob> text,
-              SkFontMetrics metrics,
-              size_t line,
-              double x_start,
-              double x_end,
-              bool is_ghost,
-              PlaceholderRun* placeholder_run);
-
-  PaintRecord(TextStyle style,
-              sk_sp<SkTextBlob> text,
-              SkFontMetrics metrics,
-              size_t line,
-              double x_start,
-              double x_end,
-              bool is_ghost);
-
-  PaintRecord(PaintRecord&& other);
-
-  PaintRecord& operator=(PaintRecord&& other);
-
-  SkPoint offset() const { return offset_; }
-
-  void SetOffset(SkPoint pt);
-
-  SkTextBlob* text() const { return text_.get(); }
-
-  const SkFontMetrics& metrics() const { return metrics_; }
-
-  const TextStyle& style() const { return style_; }
-
-  size_t line() const { return line_; }
-
-  double x_start() const { return x_start_; }
-  double x_end() const { return x_end_; }
-  double GetRunWidth() const { return x_end_ - x_start_; }
-
-  PlaceholderRun* GetPlaceholderRun() const { return placeholder_run_; }
-
-  bool isGhost() const { return is_ghost_; }
-
-  bool isPlaceholder() const { return placeholder_run_ == nullptr; }
-
- private:
-  TextStyle style_;
-  // offset_ is the overall offset of the origin of the SkTextBlob.
-  SkPoint offset_;
-  // SkTextBlob stores the glyphs and coordinates to draw them.
-  sk_sp<SkTextBlob> text_;
-  // FontMetrics stores the measurements of the font used.
-  SkFontMetrics metrics_;
-  size_t line_;
-  double x_start_ = 0.0f;
-  double x_end_ = 0.0f;
-  // 'Ghost' runs represent trailing whitespace. 'Ghost' runs should not have
-  // decorations painted on them and do not impact layout of visible glyphs.
-  bool is_ghost_ = false;
-  // Stores the corresponding PlaceholderRun that the record corresponds to.
-  // When this is nullptr, then the record is of normal text and does not
-  // represent an inline placeholder.
-  PlaceholderRun* placeholder_run_ = nullptr;
-
-  FML_DISALLOW_COPY_AND_ASSIGN(PaintRecord);
-};
-
-}  // namespace txt
-
-#endif  // LIB_TXT_SRC_PAINT_RECORD_H_
diff --git a/third_party/txt/src/txt/paragraph.h b/third_party/txt/src/txt/paragraph.h
index db713241d5936399a37c572a9e9684b56a2f7569..4655ca219ef19fa07c1e5169ee697bcb48046fa0 100644
--- a/third_party/txt/src/txt/paragraph.h
+++ b/third_party/txt/src/txt/paragraph.h
@@ -18,18 +18,20 @@
 #ifndef LIB_TXT_SRC_PARAGRAPH_H_
 #define LIB_TXT_SRC_PARAGRAPH_H_
 
-#include "flutter/display_list/display_list_builder.h"
+#include "flutter/display_list/dl_builder.h"
 #include "line_metrics.h"
 #include "paragraph_style.h"
+#include "third_party/skia/include/core/SkFont.h"
 #include "third_party/skia/include/core/SkRect.h"
+#include "third_party/skia/modules/skparagraph/include/Metrics.h"
+#include "third_party/skia/modules/skparagraph/include/Paragraph.h"
 
 class SkCanvas;
 
 namespace txt {
 
-// Interface for text layout engines.  The original implementation was based on
-// the Minikin text layout library used by Android.  Another implementation is
-// available based on Skia's SkShaper/SkParagraph text layout module.
+// Interface for text layout engines.  The current implementation is based on
+// Skia's SkShaper/SkParagraph text layout module.
 class Paragraph {
  public:
   enum Affinity { UPSTREAM, DOWNSTREAM };
@@ -144,9 +146,8 @@ class Paragraph {
   // before Painting and getting any statistics from this class.
   virtual void Layout(double width) = 0;
 
-  // Paints the laid out text onto the supplied SkCanvas at (x, y) offset from
-  // the origin. Only valid after Layout() is called.
-  virtual void Paint(SkCanvas* canvas, double x, double y) = 0;
+  // Paints the laid out text onto the supplied DisplayListBuilder at
+  // (x, y) offset from the origin. Only valid after Layout() is called.
   virtual bool Paint(flutter::DisplayListBuilder* builder,
                      double x,
                      double y) = 0;
@@ -175,11 +176,36 @@ class Paragraph {
   virtual PositionWithAffinity GetGlyphPositionAtCoordinate(double dx,
                                                             double dy) = 0;
 
+  virtual bool GetGlyphInfoAt(
+      unsigned offset,
+      skia::textlayout::Paragraph::GlyphInfo* glyphInfo) const = 0;
+
+  virtual bool GetClosestGlyphInfoAtCoordinate(
+      double dx,
+      double dy,
+      skia::textlayout::Paragraph::GlyphInfo* glyphInfo) const = 0;
+
   // Finds the first and last glyphs that define a word containing the glyph at
   // index offset.
   virtual Range<size_t> GetWordBoundary(size_t offset) = 0;
 
   virtual std::vector<LineMetrics>& GetLineMetrics() = 0;
+
+  virtual bool GetLineMetricsAt(
+      int lineNumber,
+      skia::textlayout::LineMetrics* lineMetrics) const = 0;
+
+  // Returns the total number of visible lines in the paragraph.
+  virtual size_t GetNumberOfLines() const = 0;
+
+  // Returns the zero-indexed line number that contains the given code unit
+  // offset. Returns -1 if the given offset is out of bounds, or points to a
+  // codepoint that is logically after the last visible codepoint.
+  //
+  // If the offset points to a hard line break, this method returns the line
+  // number of the line this hard line break breaks, intead of the new line it
+  // creates.
+  virtual int GetLineNumberAt(size_t utf16Offset) const = 0;
 };
 
 }  // namespace txt
diff --git a/third_party/txt/src/txt/paragraph_builder.cc b/third_party/txt/src/txt/paragraph_builder.cc
index bb446fdf83621dc62e9c7d71b8edea1a2e1d3f20..41dd9b1a8958ab880a923f5d88409d9729025326 100644
--- a/third_party/txt/src/txt/paragraph_builder.cc
+++ b/third_party/txt/src/txt/paragraph_builder.cc
@@ -16,30 +16,24 @@
 
 #include "paragraph_builder.h"
 
-#include "paragraph_builder_txt.h"
+#include "flutter/third_party/txt/src/skia/paragraph_builder_skia.h"
 #include "paragraph_style.h"
 #include "third_party/icu/source/common/unicode/unistr.h"
 
-#if FLUTTER_ENABLE_SKSHAPER
-#include "flutter/third_party/txt/src/skia/paragraph_builder_skia.h"
-#endif
-
 namespace txt {
 
-std::unique_ptr<ParagraphBuilder> ParagraphBuilder::CreateTxtBuilder(
-    const ParagraphStyle& style,
-    std::shared_ptr<FontCollection> font_collection) {
-  return std::make_unique<ParagraphBuilderTxt>(style, font_collection);
-}
-
-#if FLUTTER_ENABLE_SKSHAPER
-
+//------------------------------------------------------------------------------
+/// @brief      Creates a |ParagraphBuilder| based on Skia's text layout module.
+///
+/// @param[in]  style             The style to use for the paragraph.
+/// @param[in]  font_collection   The font collection to use for the paragraph.
+/// @param[in]  impeller_enabled  Whether Impeller is enabled in the runtime.
 std::unique_ptr<ParagraphBuilder> ParagraphBuilder::CreateSkiaBuilder(
     const ParagraphStyle& style,
-    std::shared_ptr<FontCollection> font_collection) {
-  return std::make_unique<ParagraphBuilderSkia>(style, font_collection);
+    std::shared_ptr<FontCollection> font_collection,
+    const bool impeller_enabled) {
+  return std::make_unique<ParagraphBuilderSkia>(style, font_collection,
+                                                impeller_enabled);
 }
 
-#endif  // FLUTTER_ENABLE_SKSHAPER
-
 }  // namespace txt
diff --git a/third_party/txt/src/txt/paragraph_builder.h b/third_party/txt/src/txt/paragraph_builder.h
index c3953b9b0ef2276603f8c45ee988ae578ad8b46f..acd5e952c2fce783c0dc9bea2e231b7c907e8434 100644
--- a/third_party/txt/src/txt/paragraph_builder.h
+++ b/third_party/txt/src/txt/paragraph_builder.h
@@ -31,15 +31,10 @@ namespace txt {
 
 class ParagraphBuilder {
  public:
-  static std::unique_ptr<ParagraphBuilder> CreateTxtBuilder(
-      const ParagraphStyle& style,
-      std::shared_ptr<FontCollection> font_collection);
-
-#if FLUTTER_ENABLE_SKSHAPER
   static std::unique_ptr<ParagraphBuilder> CreateSkiaBuilder(
       const ParagraphStyle& style,
-      std::shared_ptr<FontCollection> font_collection);
-#endif
+      std::shared_ptr<FontCollection> font_collection,
+      const bool impeller_enabled);
 
   virtual ~ParagraphBuilder() = default;
 
diff --git a/third_party/txt/src/txt/paragraph_builder_txt.cc b/third_party/txt/src/txt/paragraph_builder_txt.cc
deleted file mode 100644
index 54af9c275dc22ba89ee281a6fbf541853d4092a2..0000000000000000000000000000000000000000
--- a/third_party/txt/src/txt/paragraph_builder_txt.cc
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2017 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "paragraph_builder_txt.h"
-
-#include "paragraph_txt.h"
-
-namespace txt {
-
-ParagraphBuilderTxt::ParagraphBuilderTxt(
-    const ParagraphStyle& style,
-    std::shared_ptr<FontCollection> font_collection)
-    : font_collection_(std::move(font_collection)) {
-  SetParagraphStyle(style);
-}
-
-ParagraphBuilderTxt::~ParagraphBuilderTxt() = default;
-
-void ParagraphBuilderTxt::SetParagraphStyle(const ParagraphStyle& style) {
-  paragraph_style_ = style;
-  paragraph_style_index_ = runs_.AddStyle(style.GetTextStyle());
-  runs_.StartRun(paragraph_style_index_, text_.size());
-}
-
-void ParagraphBuilderTxt::PushStyle(const TextStyle& style) {
-  size_t style_index = runs_.AddStyle(style);
-  style_stack_.push_back(style_index);
-  runs_.StartRun(style_index, text_.size());
-}
-
-void ParagraphBuilderTxt::Pop() {
-  if (style_stack_.empty()) {
-    return;
-  }
-  style_stack_.pop_back();
-  runs_.StartRun(PeekStyleIndex(), text_.size());
-}
-
-size_t ParagraphBuilderTxt::PeekStyleIndex() const {
-  return style_stack_.size() ? style_stack_.back() : paragraph_style_index_;
-}
-
-const TextStyle& ParagraphBuilderTxt::PeekStyle() {
-  return runs_.GetStyle(PeekStyleIndex());
-}
-
-void ParagraphBuilderTxt::AddText(const std::u16string& text) {
-  text_.insert(text_.end(), text.begin(), text.end());
-}
-
-void ParagraphBuilderTxt::AddPlaceholder(PlaceholderRun& span) {
-  obj_replacement_char_indexes_.insert(text_.size());
-  runs_.StartRun(PeekStyleIndex(), text_.size());
-  AddText(std::u16string(1ull, objReplacementChar));
-  runs_.StartRun(PeekStyleIndex(), text_.size());
-  inline_placeholders_.push_back(span);
-}
-
-std::unique_ptr<Paragraph> ParagraphBuilderTxt::Build() {
-  runs_.EndRunIfNeeded(text_.size());
-
-  std::unique_ptr<ParagraphTxt> paragraph = std::make_unique<ParagraphTxt>();
-  paragraph->SetText(std::move(text_), std::move(runs_));
-  paragraph->SetInlinePlaceholders(std::move(inline_placeholders_),
-                                   std::move(obj_replacement_char_indexes_));
-  paragraph->SetParagraphStyle(paragraph_style_);
-  paragraph->SetFontCollection(font_collection_);
-  SetParagraphStyle(paragraph_style_);
-  return paragraph;
-}
-
-}  // namespace txt
diff --git a/third_party/txt/src/txt/paragraph_builder_txt.h b/third_party/txt/src/txt/paragraph_builder_txt.h
deleted file mode 100644
index bf44eb4f91858a7678c6abf1669c18aa65ceb772..0000000000000000000000000000000000000000
--- a/third_party/txt/src/txt/paragraph_builder_txt.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2019 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef LIB_TXT_SRC_PARAGRAPH_BUILDER_TXT_H_
-#define LIB_TXT_SRC_PARAGRAPH_BUILDER_TXT_H_
-
-#include "paragraph_builder.h"
-
-#include "styled_runs.h"
-
-namespace txt {
-
-// Implementation of ParagraphBuilder that produces paragraphs backed by the
-// Minikin text layout library.
-class ParagraphBuilderTxt : public ParagraphBuilder {
- public:
-  ParagraphBuilderTxt(const ParagraphStyle& style,
-                      std::shared_ptr<FontCollection> font_collection);
-
-  virtual ~ParagraphBuilderTxt();
-
-  virtual void PushStyle(const TextStyle& style) override;
-  virtual void Pop() override;
-  virtual const TextStyle& PeekStyle() override;
-  virtual void AddText(const std::u16string& text) override;
-  virtual void AddPlaceholder(PlaceholderRun& span) override;
-  virtual std::unique_ptr<Paragraph> Build() override;
-
- private:
-  std::vector<uint16_t> text_;
-  // A vector of PlaceholderRuns, which detail the sizes, positioning and break
-  // behavior of the empty spaces to leave. Each placeholder span corresponds to
-  // a 0xFFFC (object replacement character) in text_, which indicates the
-  // position in the text where the placeholder will occur. There should be an
-  // equal number of 0xFFFC characters and elements in this vector.
-  std::vector<PlaceholderRun> inline_placeholders_;
-  // The indexes of the obj replacement characters added through
-  // ParagraphBuilder::addPlaceholder().
-  std::unordered_set<size_t> obj_replacement_char_indexes_;
-  std::vector<size_t> style_stack_;
-  std::shared_ptr<FontCollection> font_collection_;
-  StyledRuns runs_;
-  ParagraphStyle paragraph_style_;
-  size_t paragraph_style_index_;
-
-  void SetParagraphStyle(const ParagraphStyle& style);
-
-  size_t PeekStyleIndex() const;
-};
-
-}  // namespace txt
-
-#endif  // LIB_TXT_SRC_PARAGRAPH_BUILDER_TXT_H_
diff --git a/third_party/txt/src/txt/paragraph_style.h b/third_party/txt/src/txt/paragraph_style.h
index 8fa135695a41e72c566b4874d42019ca2e9b5e5e..7c3043b8ad8994cd066910a57352673fe105b82d 100644
--- a/third_party/txt/src/txt/paragraph_style.h
+++ b/third_party/txt/src/txt/paragraph_style.h
@@ -22,7 +22,6 @@
 
 #include "font_style.h"
 #include "font_weight.h"
-#include "minikin/LineBreaker.h"
 #include "text_style.h"
 
 namespace txt {
@@ -96,13 +95,6 @@ class ParagraphStyle {
   std::u16string ellipsis;
   std::string locale;
 
-  // Default strategy is kBreakStrategy_Greedy. Sometimes,
-  // kBreakStrategy_HighQuality will produce more desirable layouts (e.g., very
-  // long words are more likely to be reasonably placed).
-  // kBreakStrategy_Balanced will balance between the two.
-  minikin::BreakStrategy break_strategy =
-      minikin::BreakStrategy::kBreakStrategy_Greedy;
-
   TextStyle GetTextStyle() const;
 
   bool unlimited_lines() const;
diff --git a/third_party/txt/src/txt/paragraph_txt.cc b/third_party/txt/src/txt/paragraph_txt.cc
deleted file mode 100644
index a3b458cbfc4c1bf4384a7c36316b037e4beaba00..0000000000000000000000000000000000000000
--- a/third_party/txt/src/txt/paragraph_txt.cc
+++ /dev/null
@@ -1,2026 +0,0 @@
-/*
- * Copyright 2017 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "paragraph_txt.h"
-
-#include <hb.h>
-#include <minikin/Layout.h>
-
-#include <algorithm>
-#include <cstring>
-#include <limits>
-#include <map>
-#include <numeric>
-#include <utility>
-#include <vector>
-
-#include "flutter/fml/logging.h"
-#include "font_collection.h"
-#include "font_skia.h"
-#include "minikin/FontLanguageListCache.h"
-#include "minikin/GraphemeBreak.h"
-#include "minikin/HbFontCache.h"
-#include "minikin/LayoutUtils.h"
-#include "minikin/LineBreaker.h"
-#include "minikin/MinikinFont.h"
-#include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkFont.h"
-#include "third_party/skia/include/core/SkFontMetrics.h"
-#include "third_party/skia/include/core/SkMaskFilter.h"
-#include "third_party/skia/include/core/SkPaint.h"
-#include "third_party/skia/include/core/SkTextBlob.h"
-#include "third_party/skia/include/core/SkTypeface.h"
-#include "third_party/skia/include/effects/SkDashPathEffect.h"
-#include "third_party/skia/include/effects/SkDiscretePathEffect.h"
-#include "unicode/ubidi.h"
-#include "unicode/utf16.h"
-
-namespace txt {
-namespace {
-
-class GlyphTypeface {
- public:
-  GlyphTypeface(sk_sp<SkTypeface> typeface, minikin::FontFakery fakery)
-      : typeface_(std::move(typeface)),
-        fake_bold_(fakery.isFakeBold()),
-        fake_italic_(fakery.isFakeItalic()) {}
-
-  bool operator==(GlyphTypeface& other) {
-    return other.typeface_.get() == typeface_.get() &&
-           other.fake_bold_ == fake_bold_ && other.fake_italic_ == fake_italic_;
-  }
-
-  bool operator!=(GlyphTypeface& other) { return !(*this == other); }
-
-  void apply(SkFont& font) {
-    font.setTypeface(typeface_);
-    font.setEmbolden(fake_bold_);
-    font.setSkewX(fake_italic_ ? -SK_Scalar1 / 4 : 0);
-  }
-
- private:
-  sk_sp<SkTypeface> typeface_;
-  bool fake_bold_;
-  bool fake_italic_;
-};
-
-GlyphTypeface GetGlyphTypeface(const minikin::Layout& layout, size_t index) {
-  const FontSkia* font = static_cast<const FontSkia*>(layout.getFont(index));
-  return GlyphTypeface(font->GetSkTypeface(), layout.getFakery(index));
-}
-
-// Return ranges of text that have the same typeface in the layout.
-std::vector<Paragraph::Range<size_t>> GetLayoutTypefaceRuns(
-    const minikin::Layout& layout) {
-  std::vector<Paragraph::Range<size_t>> result;
-  if (layout.nGlyphs() == 0)
-    return result;
-  size_t run_start = 0;
-  GlyphTypeface run_typeface = GetGlyphTypeface(layout, run_start);
-  for (size_t i = 1; i < layout.nGlyphs(); ++i) {
-    GlyphTypeface typeface = GetGlyphTypeface(layout, i);
-    if (typeface != run_typeface) {
-      result.emplace_back(run_start, i);
-      run_start = i;
-      run_typeface = typeface;
-    }
-  }
-  result.emplace_back(run_start, layout.nGlyphs());
-  return result;
-}
-
-int GetWeight(const FontWeight weight) {
-  switch (weight) {
-    case FontWeight::w100:
-      return 1;
-    case FontWeight::w200:
-      return 2;
-    case FontWeight::w300:
-      return 3;
-    case FontWeight::w400:  // Normal.
-      return 4;
-    case FontWeight::w500:
-      return 5;
-    case FontWeight::w600:
-      return 6;
-    case FontWeight::w700:  // Bold.
-      return 7;
-    case FontWeight::w800:
-      return 8;
-    case FontWeight::w900:
-      return 9;
-    default:
-      return -1;
-  }
-}
-
-int GetWeight(const TextStyle& style) {
-  return GetWeight(style.font_weight);
-}
-
-bool GetItalic(const TextStyle& style) {
-  switch (style.font_style) {
-    case FontStyle::italic:
-      return true;
-    case FontStyle::normal:
-    default:
-      return false;
-  }
-}
-
-minikin::FontStyle GetMinikinFontStyle(const TextStyle& style) {
-  uint32_t language_list_id =
-      style.locale.empty()
-          ? minikin::FontLanguageListCache::kEmptyListId
-          : minikin::FontStyle::registerLanguageList(style.locale);
-  return minikin::FontStyle(language_list_id, 0, GetWeight(style),
-                            GetItalic(style));
-}
-
-void GetFontAndMinikinPaint(const TextStyle& style,
-                            minikin::FontStyle* font,
-                            minikin::MinikinPaint* paint) {
-  *font = GetMinikinFontStyle(style);
-  paint->size = style.font_size;
-  // Divide by font size so letter spacing is pixels, not proportional to font
-  // size.
-  paint->letterSpacing = style.letter_spacing / style.font_size;
-  paint->wordSpacing = style.word_spacing;
-  paint->scaleX = 1.0f;
-  // Prevent spacing rounding in Minikin. This causes jitter when switching
-  // between same text content with different runs composing it, however, it
-  // also produces more accurate layouts.
-  paint->paintFlags |= minikin::LinearTextFlag;
-  paint->fontFeatureSettings = style.font_features.GetFeatureSettings();
-}
-
-void FindWords(const std::vector<uint16_t>& text,
-               size_t start,
-               size_t end,
-               std::vector<Paragraph::Range<size_t>>* words) {
-  bool in_word = false;
-  size_t word_start;
-  for (size_t i = start; i < end; ++i) {
-    bool is_space = minikin::isWordSpace(text[i]);
-    if (!in_word && !is_space) {
-      word_start = i;
-      in_word = true;
-    } else if (in_word && is_space) {
-      words->emplace_back(word_start, i);
-      in_word = false;
-    }
-  }
-  if (in_word)
-    words->emplace_back(word_start, end);
-}
-
-}  // namespace
-
-static const float kDoubleDecorationSpacing = 3.0f;
-
-ParagraphTxt::GlyphPosition::GlyphPosition(double x_start,
-                                           double x_advance,
-                                           size_t code_unit_index,
-                                           size_t code_unit_width)
-    : code_units(code_unit_index, code_unit_index + code_unit_width),
-      x_pos(x_start, x_start + x_advance) {}
-
-void ParagraphTxt::GlyphPosition::Shift(double delta) {
-  x_pos.Shift(delta);
-}
-
-ParagraphTxt::GlyphLine::GlyphLine(std::vector<GlyphPosition>&& p, size_t tcu)
-    : positions(std::move(p)), total_code_units(tcu) {}
-
-ParagraphTxt::CodeUnitRun::CodeUnitRun(std::vector<GlyphPosition>&& p,
-                                       Range<size_t> cu,
-                                       Range<double> x,
-                                       size_t line,
-                                       const SkFontMetrics& metrics,
-                                       const TextStyle& st,
-                                       TextDirection dir,
-                                       const PlaceholderRun* placeholder)
-    : positions(std::move(p)),
-      code_units(cu),
-      x_pos(x),
-      line_number(line),
-      font_metrics(metrics),
-      style(&st),
-      direction(dir),
-      placeholder_run(placeholder) {}
-
-void ParagraphTxt::CodeUnitRun::Shift(double delta) {
-  x_pos.Shift(delta);
-  for (GlyphPosition& position : positions)
-    position.Shift(delta);
-}
-
-ParagraphTxt::ParagraphTxt() {
-  breaker_.setLocale();
-}
-
-ParagraphTxt::~ParagraphTxt() = default;
-
-void ParagraphTxt::SetText(std::vector<uint16_t> text, StyledRuns runs) {
-  SetDirty(true);
-  if (text.size() == 0)
-    return;
-  text_ = std::move(text);
-  runs_ = std::move(runs);
-}
-
-void ParagraphTxt::SetInlinePlaceholders(
-    std::vector<PlaceholderRun> inline_placeholders,
-    std::unordered_set<size_t> obj_replacement_char_indexes) {
-  needs_layout_ = true;
-  inline_placeholders_ = std::move(inline_placeholders);
-  obj_replacement_char_indexes_ = std::move(obj_replacement_char_indexes);
-}
-
-bool ParagraphTxt::ComputeLineBreaks() {
-  line_metrics_.clear();
-  line_widths_.clear();
-  max_intrinsic_width_ = 0;
-
-  std::vector<size_t> newline_positions;
-  // Discover and add all hard breaks.
-  for (size_t i = 0; i < text_.size(); ++i) {
-    ULineBreak ulb = static_cast<ULineBreak>(
-        u_getIntPropertyValue(text_[i], UCHAR_LINE_BREAK));
-    if (ulb == U_LB_LINE_FEED || ulb == U_LB_MANDATORY_BREAK)
-      newline_positions.push_back(i);
-  }
-  // Break at the end of the paragraph.
-  newline_positions.push_back(text_.size());
-
-  // Calculate and add any breaks due to a line being too long.
-  size_t run_index = 0;
-  size_t inline_placeholder_index = 0;
-  for (size_t newline_index = 0; newline_index < newline_positions.size();
-       ++newline_index) {
-    size_t block_start =
-        (newline_index > 0) ? newline_positions[newline_index - 1] + 1 : 0;
-    size_t block_end = newline_positions[newline_index];
-    size_t block_size = block_end - block_start;
-
-    if (block_size == 0) {
-      line_metrics_.emplace_back(block_start, block_end, block_end,
-                                 block_end + 1, true);
-      line_widths_.push_back(0);
-      continue;
-    }
-
-    // Setup breaker. We wait to set the line width in order to account for the
-    // widths of the inline placeholders, which are calculated in the loop over
-    // the runs.
-    breaker_.setLineWidths(0.0f, 0, width_);
-    breaker_.setJustified(paragraph_style_.text_align == TextAlign::justify);
-    breaker_.setStrategy(paragraph_style_.break_strategy);
-    breaker_.resize(block_size);
-    memcpy(breaker_.buffer(), text_.data() + block_start,
-           block_size * sizeof(text_[0]));
-    breaker_.setText();
-
-    // Add the runs that include this line to the LineBreaker.
-    double block_total_width = 0;
-    while (run_index < runs_.size()) {
-      StyledRuns::Run run = runs_.GetRun(run_index);
-      if (run.start >= block_end)
-        break;
-      if (run.end < block_start) {
-        run_index++;
-        continue;
-      }
-
-      minikin::FontStyle font;
-      minikin::MinikinPaint paint;
-      GetFontAndMinikinPaint(run.style, &font, &paint);
-      std::shared_ptr<minikin::FontCollection> collection =
-          GetMinikinFontCollectionForStyle(run.style);
-      if (collection == nullptr) {
-        FML_LOG(INFO) << "Could not find font collection for families \""
-                      << (run.style.font_families.empty()
-                              ? ""
-                              : run.style.font_families[0])
-                      << "\".";
-        return false;
-      }
-      size_t run_start = std::max(run.start, block_start) - block_start;
-      size_t run_end = std::min(run.end, block_end) - block_start;
-      bool isRtl = (paragraph_style_.text_direction == TextDirection::rtl);
-
-      // Check if the run is an object replacement character-only run. We should
-      // leave space for inline placeholder and break around it if appropriate.
-      if (run.end - run.start == 1 &&
-          obj_replacement_char_indexes_.count(run.start) != 0 &&
-          text_[run.start] == objReplacementChar &&
-          inline_placeholder_index < inline_placeholders_.size()) {
-        // Is a inline placeholder run.
-        PlaceholderRun placeholder_run =
-            inline_placeholders_[inline_placeholder_index];
-        block_total_width += placeholder_run.width;
-
-        // Inject custom width into minikin breaker. (Uses LibTxt-minikin
-        // patch).
-        breaker_.setCustomCharWidth(run_start, placeholder_run.width);
-
-        // Called with nullptr as paint in order to use the custom widths passed
-        // above.
-        breaker_.addStyleRun(nullptr, collection, font, run_start, run_end,
-                             isRtl);
-        inline_placeholder_index++;
-      } else {
-        // Is a regular text run.
-        double run_width = breaker_.addStyleRun(&paint, collection, font,
-                                                run_start, run_end, isRtl);
-        block_total_width += run_width;
-      }
-
-      if (run.end > block_end)
-        break;
-      run_index++;
-    }
-    max_intrinsic_width_ = std::max(max_intrinsic_width_, block_total_width);
-
-    size_t breaks_count = breaker_.computeBreaks();
-    const int* breaks = breaker_.getBreaks();
-    for (size_t i = 0; i < breaks_count; ++i) {
-      size_t break_start = (i > 0) ? breaks[i - 1] : 0;
-      size_t line_start = break_start + block_start;
-      size_t line_end = breaks[i] + block_start;
-      bool hard_break = i == breaks_count - 1;
-      size_t line_end_including_newline =
-          (hard_break && line_end < text_.size()) ? line_end + 1 : line_end;
-      size_t line_end_excluding_whitespace = line_end;
-      while (
-          line_end_excluding_whitespace > line_start &&
-          minikin::isLineEndSpace(text_[line_end_excluding_whitespace - 1])) {
-        line_end_excluding_whitespace--;
-      }
-      line_metrics_.emplace_back(line_start, line_end,
-                                 line_end_excluding_whitespace,
-                                 line_end_including_newline, hard_break);
-      line_widths_.push_back(breaker_.getWidths()[i]);
-    }
-
-    breaker_.finish();
-  }
-
-  return true;
-}
-
-bool ParagraphTxt::ComputeBidiRuns(std::vector<BidiRun>* result) {
-  if (text_.empty())
-    return true;
-
-  auto ubidi_closer = [](UBiDi* b) { ubidi_close(b); };
-  std::unique_ptr<UBiDi, decltype(ubidi_closer)> bidi(ubidi_open(),
-                                                      ubidi_closer);
-  if (!bidi)
-    return false;
-
-  UBiDiLevel paraLevel = (paragraph_style_.text_direction == TextDirection::rtl)
-                             ? UBIDI_RTL
-                             : UBIDI_LTR;
-  UErrorCode status = U_ZERO_ERROR;
-  ubidi_setPara(bidi.get(), reinterpret_cast<const UChar*>(text_.data()),
-                text_.size(), paraLevel, nullptr, &status);
-  if (!U_SUCCESS(status))
-    return false;
-
-  int32_t bidi_run_count = ubidi_countRuns(bidi.get(), &status);
-  if (!U_SUCCESS(status))
-    return false;
-
-  // Detect if final trailing run is a single ambiguous whitespace.
-  // We want to bundle the final ambiguous whitespace with the preceding
-  // run in order to maintain logical typing behavior when mixing RTL and LTR
-  // text. We do not want this to be a true ghost run since the contrasting
-  // directionality causes the trailing space to not render at the visual end of
-  // the paragraph.
-  //
-  // This only applies to the final whitespace at the end as other whitespace is
-  // no longer ambiguous when surrounded by additional text.
-
-  // TODO(garyq): Handle this in the text editor caret code instead at layout
-  // level.
-  bool has_trailing_whitespace = false;
-  int32_t bidi_run_start, bidi_run_length;
-  if (bidi_run_count > 1) {
-    ubidi_getVisualRun(bidi.get(), bidi_run_count - 1, &bidi_run_start,
-                       &bidi_run_length);
-    if (!U_SUCCESS(status))
-      return false;
-    if (bidi_run_length == 1) {
-      UChar32 last_char;
-      U16_GET(text_.data(), 0, bidi_run_start + bidi_run_length - 1,
-              static_cast<int>(text_.size()), last_char);
-      if (u_hasBinaryProperty(last_char, UCHAR_WHITE_SPACE)) {
-        // Check if the trailing whitespace occurs before the previous run or
-        // not. If so, this trailing whitespace was a leading whitespace.
-        int32_t second_last_bidi_run_start, second_last_bidi_run_length;
-        ubidi_getVisualRun(bidi.get(), bidi_run_count - 2,
-                           &second_last_bidi_run_start,
-                           &second_last_bidi_run_length);
-        if (bidi_run_start ==
-            second_last_bidi_run_start + second_last_bidi_run_length) {
-          has_trailing_whitespace = true;
-          bidi_run_count--;
-        }
-      }
-    }
-  }
-
-  // Build a map of styled runs indexed by start position.
-  std::map<size_t, StyledRuns::Run> styled_run_map;
-  for (size_t i = 0; i < runs_.size(); ++i) {
-    StyledRuns::Run run = runs_.GetRun(i);
-    styled_run_map.emplace(std::make_pair(run.start, run));
-  }
-
-  for (int32_t bidi_run_index = 0; bidi_run_index < bidi_run_count;
-       ++bidi_run_index) {
-    UBiDiDirection direction = ubidi_getVisualRun(
-        bidi.get(), bidi_run_index, &bidi_run_start, &bidi_run_length);
-    if (!U_SUCCESS(status))
-      return false;
-
-    // Exclude the leading bidi control character if present.
-    UChar32 first_char;
-    U16_GET(text_.data(), 0, bidi_run_start, static_cast<int>(text_.size()),
-            first_char);
-    if (u_hasBinaryProperty(first_char, UCHAR_BIDI_CONTROL)) {
-      bidi_run_start++;
-      bidi_run_length--;
-    }
-    if (bidi_run_length == 0)
-      continue;
-
-    // Exclude the trailing bidi control character if present.
-    UChar32 last_char;
-    U16_GET(text_.data(), 0, bidi_run_start + bidi_run_length - 1,
-            static_cast<int>(text_.size()), last_char);
-    if (u_hasBinaryProperty(last_char, UCHAR_BIDI_CONTROL)) {
-      bidi_run_length--;
-    }
-    if (bidi_run_length == 0)
-      continue;
-
-    // Attach the final trailing whitespace as part of this run.
-    if (has_trailing_whitespace && bidi_run_index == bidi_run_count - 1) {
-      bidi_run_length++;
-    }
-
-    size_t bidi_run_end = bidi_run_start + bidi_run_length;
-    TextDirection text_direction =
-        direction == UBIDI_RTL ? TextDirection::rtl : TextDirection::ltr;
-
-    // Break this bidi run into chunks based on text style.
-    std::vector<BidiRun> chunks;
-    size_t chunk_start = bidi_run_start;
-    while (chunk_start < bidi_run_end) {
-      auto styled_run_iter = styled_run_map.upper_bound(chunk_start);
-      styled_run_iter--;
-      const StyledRuns::Run& styled_run = styled_run_iter->second;
-      size_t chunk_end = std::min(bidi_run_end, styled_run.end);
-      chunks.emplace_back(chunk_start, chunk_end, text_direction,
-                          styled_run.style);
-      chunk_start = chunk_end;
-    }
-
-    if (text_direction == TextDirection::ltr) {
-      result->insert(result->end(), chunks.begin(), chunks.end());
-    } else {
-      result->insert(result->end(), chunks.rbegin(), chunks.rend());
-    }
-  }
-
-  return true;
-}
-
-bool ParagraphTxt::IsStrutValid() const {
-  // Font size must be positive.
-  return (paragraph_style_.strut_enabled &&
-          paragraph_style_.strut_font_size >= 0);
-}
-
-void ParagraphTxt::ComputeStrut(StrutMetrics* strut, SkFont& font) {
-  strut->ascent = 0;
-  strut->descent = 0;
-  strut->leading = 0;
-  strut->half_leading = 0;
-  strut->line_height = 0;
-  strut->force_strut = false;
-
-  if (!IsStrutValid())
-    return;
-
-  // force_strut makes all lines have exactly the strut metrics, and ignores all
-  // actual metrics. We only force the strut if the strut is non-zero and valid.
-  strut->force_strut = paragraph_style_.force_strut_height;
-  minikin::FontStyle minikin_font_style(
-      0, GetWeight(paragraph_style_.strut_font_weight),
-      paragraph_style_.strut_font_style == FontStyle::italic);
-
-  std::shared_ptr<minikin::FontCollection> collection =
-      font_collection_->GetMinikinFontCollectionForFamilies(
-          paragraph_style_.strut_font_families, "");
-  if (!collection) {
-    return;
-  }
-  minikin::FakedFont faked_font = collection->baseFontFaked(minikin_font_style);
-
-  if (faked_font.font != nullptr) {
-    SkString str;
-    static_cast<FontSkia*>(faked_font.font)
-        ->GetSkTypeface()
-        ->getFamilyName(&str);
-    font.setTypeface(static_cast<FontSkia*>(faked_font.font)->GetSkTypeface());
-    font.setSize(paragraph_style_.strut_font_size);
-    SkFontMetrics strut_metrics;
-    font.getMetrics(&strut_metrics);
-
-    const double metrics_height =
-        -strut_metrics.fAscent + strut_metrics.fDescent;
-
-    if (paragraph_style_.strut_has_height_override) {
-      const double strut_height =
-          paragraph_style_.strut_height * paragraph_style_.strut_font_size;
-      const double metrics_leading =
-          // Zero extra leading if there is no user specified strut leading.
-          paragraph_style_.strut_leading < 0
-              ? 0
-              : (paragraph_style_.strut_leading *
-                 paragraph_style_.strut_font_size);
-
-      const double available_height =
-          paragraph_style_.strut_half_leading ? metrics_height : strut_height;
-
-      strut->ascent =
-          (-strut_metrics.fAscent / metrics_height) * available_height;
-      strut->descent =
-          (strut_metrics.fDescent / metrics_height) * available_height;
-
-      strut->leading = metrics_leading + strut_height - available_height;
-    } else {
-      strut->ascent = -strut_metrics.fAscent;
-      strut->descent = strut_metrics.fDescent;
-      strut->leading =
-          // Use font's leading if there is no user specified strut leading.
-          paragraph_style_.strut_leading < 0
-              ? strut_metrics.fLeading
-              : (paragraph_style_.strut_leading *
-                 paragraph_style_.strut_font_size);
-    }
-    strut->half_leading = strut->leading / 2;
-    strut->line_height = strut->ascent + strut->descent + strut->leading;
-  }
-}
-
-void ParagraphTxt::ComputePlaceholder(PlaceholderRun* placeholder_run,
-                                      double& ascent,
-                                      double& descent) {
-  if (placeholder_run != nullptr) {
-    // Calculate how much to shift the ascent and descent to account
-    // for the baseline choice.
-    //
-    // TODO(garyq): implement for various baselines. Currently only
-    // supports for alphabetic and ideographic
-    double baseline_adjustment = 0;
-    switch (placeholder_run->baseline) {
-      case TextBaseline::kAlphabetic: {
-        baseline_adjustment = 0;
-        break;
-      }
-      case TextBaseline::kIdeographic: {
-        baseline_adjustment = -descent / 2;
-        break;
-      }
-    }
-    // Convert the ascent and descent from the font's to the placeholder
-    // rect's.
-    switch (placeholder_run->alignment) {
-      case PlaceholderAlignment::kBaseline: {
-        ascent = baseline_adjustment + placeholder_run->baseline_offset;
-        descent = -baseline_adjustment + placeholder_run->height -
-                  placeholder_run->baseline_offset;
-        break;
-      }
-      case PlaceholderAlignment::kAboveBaseline: {
-        ascent = baseline_adjustment + placeholder_run->height;
-        descent = -baseline_adjustment;
-        break;
-      }
-      case PlaceholderAlignment::kBelowBaseline: {
-        descent = baseline_adjustment + placeholder_run->height;
-        ascent = -baseline_adjustment;
-        break;
-      }
-      case PlaceholderAlignment::kTop: {
-        descent = placeholder_run->height - ascent;
-        break;
-      }
-      case PlaceholderAlignment::kBottom: {
-        ascent = placeholder_run->height - descent;
-        break;
-      }
-      case PlaceholderAlignment::kMiddle: {
-        double mid = (ascent - descent) / 2;
-        ascent = mid + placeholder_run->height / 2;
-        descent = -mid + placeholder_run->height / 2;
-        break;
-      }
-    }
-    placeholder_run->baseline_offset = ascent;
-  }
-}
-
-// Implementation outline:
-//
-// -For each line:
-//   -Compute Bidi runs, convert into line_runs (keeps in-line-range runs, adds
-//   special runs)
-//   -For each line_run (runs in the line):
-//     -Calculate ellipsis
-//     -Obtain font
-//     -layout.doLayout(...), genereates glyph blobs
-//     -For each glyph blob:
-//       -Convert glyph blobs into pixel metrics/advances
-//     -Store as paint records (for painting) and code unit runs (for metrics
-//     and boxes).
-//   -Apply letter spacing, alignment, justification, etc
-//   -Calculate line vertical layout (ascent, descent, etc)
-//   -Store per-line metrics
-void ParagraphTxt::Layout(double width) {
-  double rounded_width = floor(width);
-  // Do not allow calling layout multiple times without changing anything.
-  if (!needs_layout_ && rounded_width == width_) {
-    return;
-  }
-
-  width_ = rounded_width;
-
-  needs_layout_ = false;
-
-  records_.clear();
-  glyph_lines_.clear();
-  code_unit_runs_.clear();
-  inline_placeholder_code_unit_runs_.clear();
-  max_right_ = std::numeric_limits<double>::lowest();
-  min_left_ = std::numeric_limits<double>::max();
-  final_line_count_ = 0;
-
-  if (!ComputeLineBreaks())
-    return;
-
-  std::vector<BidiRun> bidi_runs;
-  if (!ComputeBidiRuns(&bidi_runs))
-    return;
-
-  SkFont font;
-  font.setEdging(SkFont::Edging::kAntiAlias);
-  font.setSubpixel(true);
-  font.setHinting(SkFontHinting::kSlight);
-
-  minikin::Layout layout;
-  SkTextBlobBuilder builder;
-  double y_offset = 0;
-  double prev_max_descent = 0;
-  double max_word_width = 0;
-
-  // Compute strut minimums according to paragraph_style_.
-  ComputeStrut(&strut_, font);
-
-  // Paragraph bounds tracking.
-  size_t line_limit =
-      std::min(paragraph_style_.max_lines, line_metrics_.size());
-  did_exceed_max_lines_ = (line_metrics_.size() > paragraph_style_.max_lines);
-
-  size_t placeholder_run_index = 0;
-  for (size_t line_number = 0; line_number < line_limit; ++line_number) {
-    LineMetrics& line_metrics = line_metrics_[line_number];
-
-    // Break the line into words if justification should be applied.
-    std::vector<Range<size_t>> words;
-    double word_gap_width = 0;
-    size_t word_index = 0;
-    bool justify_line =
-        (paragraph_style_.text_align == TextAlign::justify &&
-         line_number != line_limit - 1 && !line_metrics.hard_break);
-    FindWords(text_, line_metrics.start_index, line_metrics.end_index, &words);
-    if (justify_line) {
-      if (words.size() > 1) {
-        word_gap_width =
-            (width_ - line_widths_[line_number]) / (words.size() - 1);
-      }
-    }
-
-    // Exclude trailing whitespace from justified lines so the last visible
-    // character in the line will be flush with the right margin.
-    size_t line_end_index =
-        (paragraph_style_.effective_align() == TextAlign::right ||
-         paragraph_style_.effective_align() == TextAlign::center ||
-         paragraph_style_.effective_align() == TextAlign::justify)
-            ? line_metrics.end_excluding_whitespace
-            : line_metrics.end_index;
-
-    // Find the runs comprising this line.
-    std::vector<BidiRun> line_runs;
-    for (const BidiRun& bidi_run : bidi_runs) {
-      // A "ghost" run is a run that does not impact the layout, breaking,
-      // alignment, width, etc but is still "visible" through getRectsForRange.
-      // For example, trailing whitespace on centered text can be scrolled
-      // through with the caret but will not wrap the line.
-      //
-      // Here, we add an additional run for the whitespace, but dont
-      // let it impact metrics. After layout of the whitespace run, we do not
-      // add its width into the x-offset adjustment, effectively nullifying its
-      // impact on the layout.
-      std::unique_ptr<BidiRun> ghost_run = nullptr;
-      if (paragraph_style_.ellipsis.empty() &&
-          line_metrics.end_excluding_whitespace < line_metrics.end_index &&
-          bidi_run.start() <= line_metrics.end_index &&
-          bidi_run.end() > line_end_index) {
-        ghost_run = std::make_unique<BidiRun>(
-            std::max(bidi_run.start(), line_end_index),
-            std::min(bidi_run.end(), line_metrics.end_index),
-            bidi_run.direction(), bidi_run.style(), true);
-      }
-      // Include the ghost run before normal run if RTL
-      if (bidi_run.direction() == TextDirection::rtl && ghost_run != nullptr) {
-        line_runs.push_back(*ghost_run);
-      }
-      // Emplace a normal line run.
-      if (bidi_run.start() < line_end_index &&
-          bidi_run.end() > line_metrics.start_index) {
-        // The run is a placeholder run.
-        if (bidi_run.size() == 1 &&
-            text_[bidi_run.start()] == objReplacementChar &&
-            obj_replacement_char_indexes_.count(bidi_run.start()) != 0 &&
-            placeholder_run_index < inline_placeholders_.size()) {
-          line_runs.emplace_back(
-              std::max(bidi_run.start(), line_metrics.start_index),
-              std::min(bidi_run.end(), line_end_index), bidi_run.direction(),
-              bidi_run.style(), inline_placeholders_[placeholder_run_index]);
-          placeholder_run_index++;
-        } else {
-          line_runs.emplace_back(
-              std::max(bidi_run.start(), line_metrics.start_index),
-              std::min(bidi_run.end(), line_end_index), bidi_run.direction(),
-              bidi_run.style());
-        }
-      }
-      // Include the ghost run after normal run if LTR
-      if (bidi_run.direction() == TextDirection::ltr && ghost_run != nullptr) {
-        line_runs.push_back(*ghost_run);
-      }
-    }
-    bool line_runs_all_rtl =
-        line_runs.size() &&
-        std::accumulate(
-            line_runs.begin(), line_runs.end(), true,
-            [](const bool a, const BidiRun& b) { return a && b.is_rtl(); });
-    if (line_runs_all_rtl) {
-      std::reverse(words.begin(), words.end());
-    }
-
-    std::vector<GlyphPosition> line_glyph_positions;
-    std::vector<CodeUnitRun> line_code_unit_runs;
-    std::vector<CodeUnitRun> line_inline_placeholder_code_unit_runs;
-
-    double run_x_offset = 0;
-    double justify_x_offset = 0;
-    std::vector<PaintRecord> paint_records;
-
-    for (auto line_run_it = line_runs.begin(); line_run_it != line_runs.end();
-         ++line_run_it) {
-      const BidiRun& run = *line_run_it;
-      minikin::FontStyle minikin_font;
-      minikin::MinikinPaint minikin_paint;
-      GetFontAndMinikinPaint(run.style(), &minikin_font, &minikin_paint);
-      font.setSize(run.style().font_size);
-
-      std::shared_ptr<minikin::FontCollection> minikin_font_collection =
-          GetMinikinFontCollectionForStyle(run.style());
-      if (!minikin_font_collection) {
-        return;
-      }
-
-      // Lay out this run.
-      uint16_t* text_ptr = text_.data();
-      size_t text_start = run.start();
-      size_t text_count = run.end() - run.start();
-      size_t text_size = text_.size();
-
-      // Apply ellipsizing if the run was not completely laid out and this
-      // is the last line (or lines are unlimited).
-      const std::u16string& ellipsis = paragraph_style_.ellipsis;
-      std::vector<uint16_t> ellipsized_text;
-      if (ellipsis.length() && !isinf(width_) && !line_metrics.hard_break &&
-          line_run_it == line_runs.end() - 1 &&
-          (line_number == line_limit - 1 ||
-           paragraph_style_.unlimited_lines())) {
-        float ellipsis_width = layout.measureText(
-            reinterpret_cast<const uint16_t*>(ellipsis.data()), 0,
-            ellipsis.length(), ellipsis.length(), run.is_rtl(), minikin_font,
-            minikin_paint, minikin_font_collection, nullptr);
-
-        std::vector<float> text_advances(text_count);
-        float text_width =
-            layout.measureText(text_ptr, text_start, text_count, text_.size(),
-                               run.is_rtl(), minikin_font, minikin_paint,
-                               minikin_font_collection, text_advances.data());
-
-        // Truncate characters from the text until the ellipsis fits.
-        size_t truncate_count = 0;
-        while (truncate_count < text_count &&
-               run_x_offset + text_width + ellipsis_width > width_) {
-          text_width -= text_advances[text_count - truncate_count - 1];
-          truncate_count++;
-        }
-
-        ellipsized_text.reserve(text_count - truncate_count +
-                                ellipsis.length());
-        ellipsized_text.insert(ellipsized_text.begin(),
-                               text_.begin() + run.start(),
-                               text_.begin() + run.end() - truncate_count);
-        ellipsized_text.insert(ellipsized_text.end(), ellipsis.begin(),
-                               ellipsis.end());
-        text_ptr = ellipsized_text.data();
-        text_start = 0;
-        text_count = ellipsized_text.size();
-        text_size = text_count;
-
-        // If there is no line limit, then skip all lines after the ellipsized
-        // line.
-        if (paragraph_style_.unlimited_lines()) {
-          line_limit = line_number + 1;
-          did_exceed_max_lines_ = true;
-        }
-      }
-
-      layout.doLayout(text_ptr, text_start, text_count, text_size, run.is_rtl(),
-                      minikin_font, minikin_paint, minikin_font_collection);
-
-      if (layout.nGlyphs() == 0)
-        continue;
-
-      // When laying out RTL ghost runs, shift the run_x_offset here by the
-      // advance so that the ghost run is positioned to the left of the first
-      // real run of text in the line. However, since we do not want it to
-      // impact the layout of real text, this advance is subsequently added
-      // back into the run_x_offset after the ghost run positions have been
-      // calcuated and before the next real run of text is laid out, ensuring
-      // later runs are laid out in the same position as if there were no ghost
-      // run.
-      if (run.is_ghost() && run.is_rtl())
-        run_x_offset -= layout.getAdvance();
-
-      std::vector<float> layout_advances(text_count);
-      layout.getAdvances(layout_advances.data());
-
-      // Break the layout into blobs that share the same SkPaint parameters.
-      std::vector<Range<size_t>> glyph_blobs = GetLayoutTypefaceRuns(layout);
-
-      double word_start_position = std::numeric_limits<double>::quiet_NaN();
-
-      // Build a Skia text blob from each group of glyphs.
-      for (const Range<size_t>& glyph_blob : glyph_blobs) {
-        std::vector<GlyphPosition> glyph_positions;
-
-        GetGlyphTypeface(layout, glyph_blob.start).apply(font);
-        const SkTextBlobBuilder::RunBuffer& blob_buffer =
-            builder.allocRunPos(font, glyph_blob.end - glyph_blob.start);
-
-        double justify_x_offset_delta = 0;
-        for (size_t glyph_index = glyph_blob.start;
-             glyph_index < glyph_blob.end;) {
-          size_t cluster_start_glyph_index = glyph_index;
-          uint32_t cluster = layout.getGlyphCluster(cluster_start_glyph_index);
-          double glyph_x_offset;
-          // Add all the glyphs in this cluster to the text blob.
-          do {
-            size_t blob_index = glyph_index - glyph_blob.start;
-            blob_buffer.glyphs[blob_index] = layout.getGlyphId(glyph_index);
-
-            size_t pos_index = blob_index * 2;
-            blob_buffer.pos[pos_index] = layout.getX(glyph_index) +
-                                         justify_x_offset +
-                                         justify_x_offset_delta;
-            blob_buffer.pos[pos_index + 1] = layout.getY(glyph_index);
-
-            if (glyph_index == cluster_start_glyph_index)
-              glyph_x_offset = blob_buffer.pos[pos_index];
-
-            glyph_index++;
-          } while (glyph_index < glyph_blob.end &&
-                   layout.getGlyphCluster(glyph_index) == cluster);
-
-          Range<int32_t> glyph_code_units(cluster, 0);
-          std::vector<size_t> grapheme_code_unit_counts;
-          if (run.is_rtl()) {
-            if (cluster_start_glyph_index > 0) {
-              glyph_code_units.end =
-                  layout.getGlyphCluster(cluster_start_glyph_index - 1);
-            } else {
-              glyph_code_units.end = text_count;
-            }
-            grapheme_code_unit_counts.push_back(glyph_code_units.width());
-          } else {
-            if (glyph_index < layout.nGlyphs()) {
-              glyph_code_units.end = layout.getGlyphCluster(glyph_index);
-            } else {
-              glyph_code_units.end = text_count;
-            }
-
-            // The glyph may be a ligature.  Determine how many graphemes are
-            // joined into this glyph and how many input code units map to
-            // each grapheme.
-            size_t code_unit_count = 1;
-            for (int32_t offset = glyph_code_units.start + 1;
-                 offset < glyph_code_units.end; ++offset) {
-              if (minikin::GraphemeBreak::isGraphemeBreak(
-                      layout_advances.data(), text_ptr, text_start, text_count,
-                      text_start + offset)) {
-                grapheme_code_unit_counts.push_back(code_unit_count);
-                code_unit_count = 1;
-              } else {
-                code_unit_count++;
-              }
-            }
-            grapheme_code_unit_counts.push_back(code_unit_count);
-          }
-          float glyph_advance;
-          if (run.is_placeholder_run()) {
-            // The placeholder run's layout should yield one glyph representing
-            // the object replacement character.  Replace its width with the
-            // placeholder's width.
-            FML_DCHECK(layout.nGlyphs() == 1);
-            glyph_advance = run.placeholder_run()->width;
-          } else {
-            glyph_advance = layout.getCharAdvance(glyph_code_units.start);
-          }
-          float grapheme_advance =
-              glyph_advance / grapheme_code_unit_counts.size();
-
-          glyph_positions.emplace_back(run_x_offset + glyph_x_offset,
-                                       grapheme_advance,
-                                       run.start() + glyph_code_units.start,
-                                       grapheme_code_unit_counts[0]);
-
-          // Compute positions for the additional graphemes in the ligature.
-          for (size_t i = 1; i < grapheme_code_unit_counts.size(); ++i) {
-            glyph_positions.emplace_back(
-                glyph_positions.back().x_pos.end, grapheme_advance,
-                glyph_positions.back().code_units.start +
-                    grapheme_code_unit_counts[i - 1],
-                grapheme_code_unit_counts[i]);
-          }
-
-          bool at_word_start = false;
-          bool at_word_end = false;
-          if (word_index < words.size()) {
-            at_word_start =
-                words[word_index].start == run.start() + glyph_code_units.start;
-            at_word_end =
-                words[word_index].end == run.start() + glyph_code_units.end;
-            if (line_runs_all_rtl) {
-              std::swap(at_word_start, at_word_end);
-            }
-          }
-
-          if (at_word_start) {
-            word_start_position = run_x_offset + glyph_x_offset;
-          }
-
-          if (at_word_end) {
-            if (justify_line) {
-              justify_x_offset_delta += word_gap_width;
-            }
-            word_index++;
-
-            if (!isnan(word_start_position)) {
-              double word_width =
-                  glyph_positions.back().x_pos.end - word_start_position;
-              max_word_width = std::max(word_width, max_word_width);
-              word_start_position = std::numeric_limits<double>::quiet_NaN();
-            }
-          }
-        }  // for each in glyph_blob
-
-        if (glyph_positions.empty())
-          continue;
-
-        // Store the font metrics and TextStyle in the LineMetrics for this line
-        // to provide metrics upon user request. We index this RunMetrics
-        // instance at `run.end() - 1` to allow map::lower_bound to access the
-        // correct RunMetrics at any text index.
-        size_t run_key = run.end() - 1;
-        line_metrics.run_metrics.emplace(run_key, &run.style());
-        SkFontMetrics* metrics =
-            &line_metrics.run_metrics.at(run_key).font_metrics;
-        font.getMetrics(metrics);
-
-        Range<double> record_x_pos(
-            glyph_positions.front().x_pos.start - run_x_offset,
-            glyph_positions.back().x_pos.end - run_x_offset);
-        paint_records.emplace_back(run.style(), SkPoint::Make(run_x_offset, 0),
-                                   builder.make(), *metrics, line_number,
-                                   record_x_pos.start, record_x_pos.end,
-                                   run.is_ghost(), run.placeholder_run());
-
-        justify_x_offset += justify_x_offset_delta;
-
-        line_glyph_positions.insert(line_glyph_positions.end(),
-                                    glyph_positions.begin(),
-                                    glyph_positions.end());
-
-        // Add a record of glyph positions sorted by code unit index.
-        std::vector<GlyphPosition> code_unit_positions(glyph_positions);
-        std::sort(code_unit_positions.begin(), code_unit_positions.end(),
-                  [](const GlyphPosition& a, const GlyphPosition& b) {
-                    return a.code_units.start < b.code_units.start;
-                  });
-
-        double blob_x_pos_start = glyph_positions.front().x_pos.start;
-        double blob_x_pos_end = glyph_positions.back().x_pos.end;
-        line_code_unit_runs.emplace_back(
-            std::move(code_unit_positions),
-            Range<size_t>(run.start(), run.end()),
-            Range<double>(blob_x_pos_start, blob_x_pos_end), line_number,
-            *metrics, run.style(), run.direction(), run.placeholder_run());
-
-        if (run.is_placeholder_run()) {
-          line_inline_placeholder_code_unit_runs.push_back(
-              line_code_unit_runs.back());
-        }
-
-        if (!run.is_ghost()) {
-          min_left_ = std::min(min_left_, blob_x_pos_start);
-          max_right_ = std::max(max_right_, blob_x_pos_end);
-        }
-      }  // for each in glyph_blobs
-
-      if (run.is_placeholder_run()) {
-        run_x_offset += run.placeholder_run()->width;
-      } else {
-        // Do not increase x offset for LTR trailing ghost runs as it should not
-        // impact the layout of visible glyphs. RTL tailing ghost runs have the
-        // advance subtracted, so we do add the advance here to reset the
-        // run_x_offset. We do keep the record though so GetRectsForRange() can
-        // find metrics for trailing spaces.
-        if (!run.is_ghost() || run.is_rtl()) {
-          run_x_offset += layout.getAdvance();
-        }
-      }
-    }  // for each in line_runs
-
-    // Adjust the glyph positions based on the alignment of the line.
-    double line_x_offset = GetLineXOffset(run_x_offset, justify_line);
-    if (line_x_offset) {
-      for (CodeUnitRun& code_unit_run : line_code_unit_runs) {
-        code_unit_run.Shift(line_x_offset);
-      }
-      for (CodeUnitRun& code_unit_run :
-           line_inline_placeholder_code_unit_runs) {
-        code_unit_run.Shift(line_x_offset);
-      }
-      for (GlyphPosition& position : line_glyph_positions) {
-        position.Shift(line_x_offset);
-      }
-    }
-
-    size_t next_line_start = (line_number < line_metrics_.size() - 1)
-                                 ? line_metrics_[line_number + 1].start_index
-                                 : text_.size();
-    glyph_lines_.emplace_back(std::move(line_glyph_positions),
-                              next_line_start - line_metrics.start_index);
-    code_unit_runs_.insert(code_unit_runs_.end(), line_code_unit_runs.begin(),
-                           line_code_unit_runs.end());
-    inline_placeholder_code_unit_runs_.insert(
-        inline_placeholder_code_unit_runs_.end(),
-        line_inline_placeholder_code_unit_runs.begin(),
-        line_inline_placeholder_code_unit_runs.end());
-
-    // Calculate the amount to advance in the y direction. This is done by
-    // computing the maximum ascent and descent with respect to the strut.
-    double max_ascent = IsStrutValid() ? strut_.ascent + strut_.half_leading
-                                       : std::numeric_limits<double>::lowest();
-    double max_descent = IsStrutValid() ? strut_.descent + strut_.half_leading
-                                        : std::numeric_limits<double>::lowest();
-    double max_unscaled_ascent = 0;
-    for (const PaintRecord& paint_record : paint_records) {
-      UpdateLineMetrics(paint_record.metrics(), paint_record.style(),
-                        max_ascent, max_descent, max_unscaled_ascent,
-                        paint_record.GetPlaceholderRun(), line_number,
-                        line_limit);
-    }
-
-    // If no fonts were actually rendered, then compute a baseline based on the
-    // font of the paragraph style.
-    if (paint_records.empty()) {
-      SkFontMetrics metrics;
-      TextStyle style(paragraph_style_.GetTextStyle());
-      font.setTypeface(GetDefaultSkiaTypeface(style));
-      font.setSize(style.font_size);
-      font.getMetrics(&metrics);
-      UpdateLineMetrics(metrics, style, max_ascent, max_descent,
-                        max_unscaled_ascent, nullptr, line_number, line_limit);
-    }
-
-    // Calculate the baselines. This is only done on the first line.
-    if (line_number == 0) {
-      alphabetic_baseline_ = max_ascent;
-      // TODO(garyq): Ideographic baseline is currently bottom of EM
-      // box, which is not correct. This should be obtained from metrics.
-      // Skia currently does not support various baselines.
-      ideographic_baseline_ = (max_ascent + max_descent);
-    }
-
-    line_metrics.height =
-        (line_number == 0 ? 0 : line_metrics_[line_number - 1].height) +
-        round(max_ascent + max_descent);
-    line_metrics.baseline = line_metrics.height - max_descent;
-
-    y_offset += round(max_ascent + prev_max_descent);
-    prev_max_descent = max_descent;
-
-    line_metrics.line_number = line_number;
-    line_metrics.ascent = max_ascent;
-    line_metrics.descent = max_descent;
-    line_metrics.unscaled_ascent = max_unscaled_ascent;
-    line_metrics.width = line_widths_[line_number];
-    line_metrics.left = line_x_offset;
-
-    final_line_count_++;
-
-    for (PaintRecord& paint_record : paint_records) {
-      paint_record.SetOffset(
-          SkPoint::Make(paint_record.offset().x() + line_x_offset, y_offset));
-      records_.emplace_back(std::move(paint_record));
-    }
-  }  // for each line_number
-
-  if (paragraph_style_.max_lines == 1 ||
-      (paragraph_style_.unlimited_lines() && paragraph_style_.ellipsized())) {
-    min_intrinsic_width_ = max_intrinsic_width_;
-  } else {
-    min_intrinsic_width_ = std::min(max_word_width, max_intrinsic_width_);
-  }
-
-  std::sort(code_unit_runs_.begin(), code_unit_runs_.end(),
-            [](const CodeUnitRun& a, const CodeUnitRun& b) {
-              return a.code_units.start < b.code_units.start;
-            });
-
-  longest_line_ = max_right_ - min_left_;
-}
-
-void ParagraphTxt::UpdateLineMetrics(const SkFontMetrics& metrics,
-                                     const TextStyle& style,
-                                     double& max_ascent,
-                                     double& max_descent,
-                                     double& max_unscaled_ascent,
-                                     PlaceholderRun* placeholder_run,
-                                     size_t line_number,
-                                     size_t line_limit) {
-  if (!strut_.force_strut) {
-    const double metrics_font_height = metrics.fDescent - metrics.fAscent;
-    // The overall height of the glyph blob. If neither the ascent or the
-    // descent is disabled, we have block_height = ascent + descent, where
-    // "ascent" is the extent from the top of the blob to its baseline, and
-    // "descent" is the extent from the text blob's baseline to its bottom. Not
-    // to be mistaken with the font's ascent and descent.
-    const double blob_height = style.has_height_override
-                                   ? style.height * style.font_size
-                                   : metrics_font_height + metrics.fLeading;
-
-    // Scale the ascent and descent such that the sum of ascent and
-    // descent is `style.height * style.font_size`.
-    //
-    // The raw metrics do not add up to fontSize. The state of font
-    // metrics is a mess:
-    //
-    // Each font has 4 sets of vertical metrics:
-    //
-    // * hhea: hheaAscender, hheaDescender, hheaLineGap.
-    //     Used by Apple.
-    // * OS/2 typo: typoAscender, typoDescender, typoLineGap.
-    //     Used sometimes by Windows for layout.
-    // * OS/2 win: winAscent, winDescent.
-    //     Also used by Windows, generally will be cut if extends past
-    //     these metrics.
-    // * EM Square: ascent, descent
-    //     Not actively used, but this defines the 'scale' of the
-    //     units used.
-    //
-    // `Use Typo Metrics` is a boolean that, when enabled, prefers
-    // typo metrics over win metrics. Default is off. Enabled by most
-    // modern fonts.
-    //
-    // In addition to these different sets of metrics, there are also
-    // multiple strategies for using these metrics:
-    //
-    // * Adobe: Set hhea values to typo equivalents.
-    // * Microsoft: Set hhea values to win equivalents.
-    // * Web: Use hhea values for text, regardless of `Use Typo Metrics`
-    //     The hheaLineGap is distributed half across the top and half
-    //     across the bottom of the line.
-    //   Exceptions:
-    //     Windows: All browsers respect `Use Typo Metrics`
-    //     Firefox respects `Use Typo Metrics`.
-    //
-    // This pertains to this code in that it is ambiguous which set of
-    // metrics we are actually using via SkFontMetrics. This in turn
-    // means that if we use the raw metrics, we will see differences
-    // between platforms as well as unpredictable line heights.
-    //
-    // A more thorough explanation is available at
-    // https://glyphsapp.com/tutorials/vertical-metrics
-    //
-    // Doing this ascent/descent normalization to the EM Square allows
-    // a sane, consistent, and reasonable "blob_height" to be specified,
-    // though it breaks with what is done by any of the platforms above.
-    const bool shouldNormalizeFont =
-        style.has_height_override && !style.half_leading;
-    const double font_height =
-        shouldNormalizeFont ? style.font_size : metrics_font_height;
-
-    // Reserve the outermost vertical space we want to distribute evenly over
-    // and under the text ("half-leading").
-    double leading;
-    if (style.half_leading) {
-      leading = blob_height - font_height;
-    } else {
-      leading = style.has_height_override ? 0.0 : metrics.fLeading;
-    }
-    const double half_leading = leading / 2;
-
-    // Proportionally distribute the remaining vertical space above and below
-    // the glyph blob's baseline, per the font's ascent/discent ratio.
-    const double available_vspace = blob_height - leading;
-    const double modifiedAscent =
-        -metrics.fAscent / metrics_font_height * available_vspace +
-        half_leading;
-    const double modifiedDescent =
-        metrics.fDescent / metrics_font_height * available_vspace +
-        half_leading;
-
-    const bool disableAscent =
-        line_number == 0 && paragraph_style_.text_height_behavior &
-                                TextHeightBehavior::kDisableFirstAscent;
-    const bool disableDescent = line_number == line_limit - 1 &&
-                                paragraph_style_.text_height_behavior &
-                                    TextHeightBehavior::kDisableLastDescent;
-
-    double ascent = disableAscent ? -metrics.fAscent : modifiedAscent;
-    double descent = disableDescent ? metrics.fDescent : modifiedDescent;
-
-    ComputePlaceholder(placeholder_run, ascent, descent);
-
-    max_ascent = std::max(ascent, max_ascent);
-    max_descent = std::max(descent, max_descent);
-  }
-
-  max_unscaled_ascent =
-      std::max(placeholder_run == nullptr ? -metrics.fAscent
-                                          : placeholder_run->baseline_offset,
-               max_unscaled_ascent);
-};
-
-double ParagraphTxt::GetLineXOffset(double line_total_advance,
-                                    bool justify_line) {
-  if (isinf(width_))
-    return 0;
-
-  TextAlign align = paragraph_style_.effective_align();
-
-  if (align == TextAlign::right ||
-      (align == TextAlign::justify &&
-       paragraph_style_.text_direction == TextDirection::rtl &&
-       !justify_line)) {
-    return width_ - line_total_advance;
-  } else if (align == TextAlign::center) {
-    return (width_ - line_total_advance) / 2;
-  } else {
-    return 0;
-  }
-}
-
-const ParagraphStyle& ParagraphTxt::GetParagraphStyle() const {
-  return paragraph_style_;
-}
-
-double ParagraphTxt::GetAlphabeticBaseline() {
-  FML_DCHECK(!needs_layout_) << "only valid after layout";
-  // Currently -fAscent
-  return alphabetic_baseline_;
-}
-
-double ParagraphTxt::GetIdeographicBaseline() {
-  FML_DCHECK(!needs_layout_) << "only valid after layout";
-  // TODO(garyq): Currently -fAscent + fUnderlinePosition. Verify this.
-  return ideographic_baseline_;
-}
-
-double ParagraphTxt::GetMaxIntrinsicWidth() {
-  FML_DCHECK(!needs_layout_) << "only valid after layout";
-  return max_intrinsic_width_;
-}
-
-double ParagraphTxt::GetMinIntrinsicWidth() {
-  FML_DCHECK(!needs_layout_) << "only valid after layout";
-  return min_intrinsic_width_;
-}
-
-size_t ParagraphTxt::TextSize() const {
-  FML_DCHECK(!needs_layout_) << "only valid after layout";
-  return text_.size();
-}
-
-double ParagraphTxt::GetHeight() {
-  FML_DCHECK(!needs_layout_) << "only valid after layout";
-  return final_line_count_ == 0 ? 0
-                                : line_metrics_[final_line_count_ - 1].height;
-}
-
-double ParagraphTxt::GetMaxWidth() {
-  FML_DCHECK(!needs_layout_) << "only valid after layout";
-  return width_;
-}
-
-double ParagraphTxt::GetLongestLine() {
-  FML_DCHECK(!needs_layout_) << "only valid after layout";
-  return longest_line_;
-}
-
-void ParagraphTxt::SetParagraphStyle(const ParagraphStyle& style) {
-  needs_layout_ = true;
-  paragraph_style_ = style;
-}
-
-void ParagraphTxt::SetFontCollection(
-    std::shared_ptr<FontCollection> font_collection) {
-  font_collection_ = std::move(font_collection);
-}
-
-std::shared_ptr<minikin::FontCollection>
-ParagraphTxt::GetMinikinFontCollectionForStyle(const TextStyle& style) {
-  std::string locale;
-  if (!style.locale.empty()) {
-    uint32_t language_list_id =
-        minikin::FontStyle::registerLanguageList(style.locale);
-    const minikin::FontLanguages& langs =
-        minikin::FontLanguageListCache::getById(language_list_id);
-    if (langs.size()) {
-      locale = langs[0].getString();
-    }
-  }
-
-  return font_collection_->GetMinikinFontCollectionForFamilies(
-      style.font_families, locale);
-}
-
-sk_sp<SkTypeface> ParagraphTxt::GetDefaultSkiaTypeface(const TextStyle& style) {
-  std::shared_ptr<minikin::FontCollection> collection =
-      GetMinikinFontCollectionForStyle(style);
-  if (!collection) {
-    return nullptr;
-  }
-  minikin::FakedFont faked_font =
-      collection->baseFontFaked(GetMinikinFontStyle(style));
-  return static_cast<FontSkia*>(faked_font.font)->GetSkTypeface();
-}
-
-// The x,y coordinates will be the very top left corner of the rendered
-// paragraph.
-void ParagraphTxt::Paint(SkCanvas* canvas, double x, double y) {
-  SkPoint base_offset = SkPoint::Make(x, y);
-  SkPaint paint;
-  // Paint the background first before painting any text to prevent
-  // potential overlap.
-  for (const PaintRecord& record : records_) {
-    PaintBackground(canvas, record, base_offset);
-  }
-  for (const PaintRecord& record : records_) {
-    if (record.style().has_foreground) {
-      paint = record.style().foreground;
-    } else {
-      paint.reset();
-      paint.setColor(record.style().color);
-    }
-    SkPoint offset = base_offset + record.offset();
-    if (record.GetPlaceholderRun() == nullptr) {
-      PaintShadow(canvas, record, offset);
-      canvas->drawTextBlob(record.text(), offset.x(), offset.y(), paint);
-    }
-    PaintDecorations(canvas, record, base_offset);
-  }
-}
-
-void ParagraphTxt::PaintDecorations(SkCanvas* canvas,
-                                    const PaintRecord& record,
-                                    SkPoint base_offset) {
-  if (record.style().decoration == TextDecoration::kNone)
-    return;
-
-  if (record.isGhost())
-    return;
-
-  const SkFontMetrics& metrics = record.metrics();
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  if (record.style().decoration_color == SK_ColorTRANSPARENT) {
-    paint.setColor(record.style().color);
-  } else {
-    paint.setColor(record.style().decoration_color);
-  }
-  paint.setAntiAlias(true);
-
-  // This is set to 2 for the double line style
-  int decoration_count = 1;
-
-  // Filled when drawing wavy decorations.
-  SkPath path;
-
-  double width = record.GetRunWidth();
-
-  SkScalar underline_thickness;
-  if ((metrics.fFlags &
-       SkFontMetrics::FontMetricsFlags::kUnderlineThicknessIsValid_Flag) &&
-      metrics.fUnderlineThickness > 0) {
-    underline_thickness = metrics.fUnderlineThickness;
-  } else {
-    // Backup value if the fUnderlineThickness metric is not available:
-    // Divide by 14pt as it is the default size.
-    underline_thickness = record.style().font_size / 14.0f;
-  }
-  paint.setStrokeWidth(underline_thickness *
-                       record.style().decoration_thickness_multiplier);
-
-  SkPoint record_offset = base_offset + record.offset();
-  SkScalar x = record_offset.x() + record.x_start();
-  SkScalar y = record_offset.y();
-
-  // Setup the decorations.
-  switch (record.style().decoration_style) {
-    case TextDecorationStyle::kSolid: {
-      break;
-    }
-    case TextDecorationStyle::kDouble: {
-      decoration_count = 2;
-      break;
-    }
-    // Note: the intervals are scaled by the thickness of the line, so it is
-    // possible to change spacing by changing the decoration_thickness
-    // property of TextStyle.
-    case TextDecorationStyle::kDotted: {
-      // Divide by 14pt as it is the default size.
-      const float scale = record.style().font_size / 14.0f;
-      const SkScalar intervals[] = {1.0f * scale, 1.5f * scale, 1.0f * scale,
-                                    1.5f * scale};
-      size_t count = sizeof(intervals) / sizeof(intervals[0]);
-      paint.setPathEffect(SkPathEffect::MakeCompose(
-          SkDashPathEffect::Make(intervals, count, 0.0f),
-          SkDiscretePathEffect::Make(0, 0)));
-      break;
-    }
-    // Note: the intervals are scaled by the thickness of the line, so it is
-    // possible to change spacing by changing the decoration_thickness
-    // property of TextStyle.
-    case TextDecorationStyle::kDashed: {
-      // Divide by 14pt as it is the default size.
-      const float scale = record.style().font_size / 14.0f;
-      const SkScalar intervals[] = {4.0f * scale, 2.0f * scale, 4.0f * scale,
-                                    2.0f * scale};
-      size_t count = sizeof(intervals) / sizeof(intervals[0]);
-      paint.setPathEffect(SkPathEffect::MakeCompose(
-          SkDashPathEffect::Make(intervals, count, 0.0f),
-          SkDiscretePathEffect::Make(0, 0)));
-      break;
-    }
-    case TextDecorationStyle::kWavy: {
-      ComputeWavyDecoration(
-          path, x, y, width,
-          underline_thickness * record.style().decoration_thickness_multiplier);
-      break;
-    }
-  }
-
-  // Draw the decorations.
-  // Use a for loop for "kDouble" decoration style
-  for (int i = 0; i < decoration_count; i++) {
-    double y_offset = i * underline_thickness * kDoubleDecorationSpacing;
-    double y_offset_original = y_offset;
-    // Underline
-    if (record.style().decoration & TextDecoration::kUnderline) {
-      y_offset +=
-          (metrics.fFlags &
-           SkFontMetrics::FontMetricsFlags::kUnderlinePositionIsValid_Flag)
-              ? metrics.fUnderlinePosition
-              : underline_thickness;
-      if (record.style().decoration_style != TextDecorationStyle::kWavy) {
-        canvas->drawLine(x, y + y_offset, x + width, y + y_offset, paint);
-      } else {
-        SkPath offsetPath = path;
-        offsetPath.offset(0, y_offset);
-        canvas->drawPath(offsetPath, paint);
-      }
-      y_offset = y_offset_original;
-    }
-    // Overline
-    if (record.style().decoration & TextDecoration::kOverline) {
-      // We subtract fAscent here because for double overlines, we want the
-      // second line to be above, not below the first.
-      y_offset -= metrics.fAscent;
-      if (record.style().decoration_style != TextDecorationStyle::kWavy) {
-        canvas->drawLine(x, y - y_offset, x + width, y - y_offset, paint);
-      } else {
-        SkPath offsetPath = path;
-        offsetPath.offset(0, -y_offset);
-        canvas->drawPath(offsetPath, paint);
-      }
-      y_offset = y_offset_original;
-    }
-    // Strikethrough
-    if (record.style().decoration & TextDecoration::kLineThrough) {
-      if (metrics.fFlags &
-          SkFontMetrics::FontMetricsFlags::kStrikeoutThicknessIsValid_Flag)
-        paint.setStrokeWidth(metrics.fStrikeoutThickness *
-                             record.style().decoration_thickness_multiplier);
-      // Make sure the double line is "centered" vertically.
-      y_offset += (decoration_count - 1.0) * underline_thickness *
-                  kDoubleDecorationSpacing / -2.0;
-      y_offset +=
-          (metrics.fFlags &
-           SkFontMetrics::FontMetricsFlags::kStrikeoutPositionIsValid_Flag)
-              ? metrics.fStrikeoutPosition
-              // Backup value if the strikeoutposition metric is not
-              // available:
-              : metrics.fXHeight / -2.0;
-      if (record.style().decoration_style != TextDecorationStyle::kWavy) {
-        canvas->drawLine(x, y + y_offset, x + width, y + y_offset, paint);
-      } else {
-        SkPath offsetPath = path;
-        offsetPath.offset(0, y_offset);
-        canvas->drawPath(offsetPath, paint);
-      }
-      y_offset = y_offset_original;
-    }
-  }
-}
-
-void ParagraphTxt::ComputeWavyDecoration(SkPath& path,
-                                         double x,
-                                         double y,
-                                         double width,
-                                         double thickness) {
-  int wave_count = 0;
-  double x_start = 0;
-  // One full wavelength is 4 * thickness.
-  double quarter = thickness;
-  path.moveTo(x, y);
-  double remaining = width;
-  while (x_start + (quarter * 2) < width) {
-    path.rQuadTo(quarter, wave_count % 2 == 0 ? -quarter : quarter, quarter * 2,
-                 0);
-    x_start += quarter * 2;
-    remaining = width - x_start;
-    ++wave_count;
-  }
-  // Manually add a final partial quad for the remaining width that do
-  // not fit nicely into a half-wavelength.
-  // The following math is based off of quadratic bezier equations:
-  //
-  //  * Let P(x) be the equation for the curve.
-  //  * Let P0 = start, P1 = control point, P2 = end
-  //  * P(x) = -2x^2 - 2x
-  //  * P0 = (0, 0)
-  //  * P1 = 2P(0.5) - 0.5 * P0 - 0.5 * P2
-  //  * P2 = P(remaining / (wavelength / 2))
-  //
-  // Simplified implementation coursesy of @jim-flar at
-  // https://github.com/flutter/engine/pull/9468#discussion_r297872739
-  // Unsimplified original version at
-  // https://github.com/flutter/engine/pull/9468#discussion_r297879129
-
-  double x1 = remaining / 2;
-  double y1 = remaining / 2 * (wave_count % 2 == 0 ? -1 : 1);
-  double x2 = remaining;
-  double y2 = (remaining - remaining * remaining / (quarter * 2)) *
-              (wave_count % 2 == 0 ? -1 : 1);
-  path.rQuadTo(x1, y1, x2, y2);
-}
-
-void ParagraphTxt::PaintBackground(SkCanvas* canvas,
-                                   const PaintRecord& record,
-                                   SkPoint base_offset) {
-  if (!record.style().has_background)
-    return;
-
-  const SkFontMetrics& metrics = record.metrics();
-  SkRect rect(SkRect::MakeLTRB(record.x_start(), metrics.fAscent,
-                               record.x_end(), metrics.fDescent));
-  rect.offset(base_offset + record.offset());
-  canvas->drawRect(rect, record.style().background);
-}
-
-void ParagraphTxt::PaintShadow(SkCanvas* canvas,
-                               const PaintRecord& record,
-                               SkPoint offset) {
-  if (record.style().text_shadows.size() == 0)
-    return;
-  for (TextShadow text_shadow : record.style().text_shadows) {
-    if (!text_shadow.hasShadow()) {
-      continue;
-    }
-
-    SkPaint paint;
-    paint.setColor(text_shadow.color);
-    if (text_shadow.blur_sigma > 0.5) {
-      paint.setMaskFilter(SkMaskFilter::MakeBlur(
-          kNormal_SkBlurStyle, text_shadow.blur_sigma, false));
-    }
-    canvas->drawTextBlob(record.text(), offset.x() + text_shadow.offset.x(),
-                         offset.y() + text_shadow.offset.y(), paint);
-  }
-}
-
-std::vector<Paragraph::TextBox> ParagraphTxt::GetRectsForRange(
-    size_t start,
-    size_t end,
-    RectHeightStyle rect_height_style,
-    RectWidthStyle rect_width_style) {
-  FML_DCHECK(!needs_layout_) << "only valid after layout";
-  // Struct that holds calculated metrics for each line.
-  struct LineBoxMetrics {
-    std::vector<Paragraph::TextBox> boxes;
-    // Per-line metrics for max and min coordinates for left and right boxes.
-    // These metrics cannot be calculated in layout generically because of
-    // selections that do not cover the whole line.
-    SkScalar max_right = std::numeric_limits<SkScalar>::lowest();
-    SkScalar min_left = std::numeric_limits<SkScalar>::max();
-  };
-
-  std::map<size_t, LineBoxMetrics> line_box_metrics;
-  // Text direction of the first line so we can extend the correct side for
-  // RectWidthStyle::kMax.
-  TextDirection first_line_dir = TextDirection::ltr;
-  std::map<size_t, size_t> newline_x_positions;
-
-  // Lines that are actually in the requested range.
-  size_t max_line = 0;
-  size_t min_line = INT_MAX;
-  size_t glyph_length = 0;
-
-  // Generate initial boxes and calculate metrics.
-  for (const CodeUnitRun& run : code_unit_runs_) {
-    // Check to see if we are finished.
-    if (run.code_units.start >= end)
-      break;
-
-    // Update new line x position with the ending of last bidi run on the line
-    newline_x_positions[run.line_number] =
-        run.direction == TextDirection::ltr ? run.x_pos.end : run.x_pos.start;
-
-    if (run.code_units.end <= start)
-      continue;
-
-    double baseline = line_metrics_[run.line_number].baseline;
-    SkScalar top = baseline + run.font_metrics.fAscent;
-    SkScalar bottom = baseline + run.font_metrics.fDescent;
-
-    if (run.placeholder_run !=
-        nullptr) {  // Use inline placeholder size as height.
-      top = baseline - run.placeholder_run->baseline_offset;
-      bottom = baseline + run.placeholder_run->height -
-               run.placeholder_run->baseline_offset;
-    }
-
-    max_line = std::max(run.line_number, max_line);
-    min_line = std::min(run.line_number, min_line);
-
-    // Calculate left and right.
-    SkScalar left, right;
-    if (run.code_units.start >= start && run.code_units.end <= end) {
-      left = run.x_pos.start;
-      right = run.x_pos.end;
-    } else {
-      left = SK_ScalarMax;
-      right = SK_ScalarMin;
-      for (const GlyphPosition& gp : run.positions) {
-        if (gp.code_units.start >= start && gp.code_units.end <= end) {
-          left = std::min(left, static_cast<SkScalar>(gp.x_pos.start));
-          right = std::max(right, static_cast<SkScalar>(gp.x_pos.end));
-        } else if (gp.code_units.end == end) {
-          // Calculate left and right when we are at
-          // the last position of a combining character.
-          glyph_length = (gp.code_units.end - gp.code_units.start) - 1;
-          if (gp.code_units.start ==
-              std::max<size_t>(0, (start - glyph_length))) {
-            left = std::min(left, static_cast<SkScalar>(gp.x_pos.start));
-            right = std::max(right, static_cast<SkScalar>(gp.x_pos.end));
-          }
-        }
-      }
-      if (left == SK_ScalarMax || right == SK_ScalarMin)
-        continue;
-    }
-    // Keep track of the min and max horizontal coordinates over all lines. Not
-    // needed for kTight.
-    if (rect_width_style == RectWidthStyle::kMax) {
-      line_box_metrics[run.line_number].max_right =
-          std::max(line_box_metrics[run.line_number].max_right, right);
-      line_box_metrics[run.line_number].min_left =
-          std::min(line_box_metrics[run.line_number].min_left, left);
-      if (min_line == run.line_number) {
-        first_line_dir = run.direction;
-      }
-    }
-    line_box_metrics[run.line_number].boxes.emplace_back(
-        SkRect::MakeLTRB(left, top, right, bottom), run.direction);
-  }
-
-  // Add empty rectangles representing any newline characters within the
-  // range.
-  for (size_t line_number = 0; line_number < line_metrics_.size();
-       ++line_number) {
-    LineMetrics& line = line_metrics_[line_number];
-    if (line.start_index >= end)
-      break;
-    if (line.end_including_newline <= start)
-      continue;
-    if (line_box_metrics.find(line_number) == line_box_metrics.end()) {
-      if (line.end_index != line.end_including_newline &&
-          line.end_index >= start && line.end_including_newline <= end) {
-        SkScalar x;
-        auto it = newline_x_positions.find(line_number);
-        if (it != newline_x_positions.end()) {
-          x = it->second;
-        } else {
-          x = GetLineXOffset(0, false);
-        }
-        SkScalar top =
-            (line_number > 0) ? line_metrics_[line_number - 1].height : 0;
-        SkScalar bottom = line_metrics_[line_number].height;
-        line_box_metrics[line_number].boxes.emplace_back(
-            SkRect::MakeLTRB(x, top, x, bottom), TextDirection::ltr);
-      }
-    }
-  }
-
-  // "Post-process" metrics and aggregate final rects to return.
-  std::vector<Paragraph::TextBox> boxes;
-  for (const auto& kv : line_box_metrics) {
-    // Handle rect_width_styles. We skip the last line because not everything is
-    // selected.
-
-    LineMetrics& line =
-        line_metrics_[fmin(line_metrics_.size() - 1, fmax(0, kv.first))];
-    if (rect_width_style == RectWidthStyle::kMax && kv.first != max_line) {
-      if (line_box_metrics[kv.first].min_left > min_left_ &&
-          (kv.first != min_line || first_line_dir == TextDirection::rtl)) {
-        line_box_metrics[kv.first].boxes.emplace_back(
-            SkRect::MakeLTRB(min_left_, line.baseline - line.unscaled_ascent,
-                             line_box_metrics[kv.first].min_left,
-                             line.baseline + line.descent),
-            TextDirection::rtl);
-      }
-      if (line_box_metrics[kv.first].max_right < max_right_ &&
-          (kv.first != min_line || first_line_dir == TextDirection::ltr)) {
-        line_box_metrics[kv.first].boxes.emplace_back(
-            SkRect::MakeLTRB(line_box_metrics[kv.first].max_right,
-                             line.baseline - line.unscaled_ascent, max_right_,
-                             line.baseline + line.descent),
-            TextDirection::ltr);
-      }
-    }
-
-    // Handle rect_height_styles. The height metrics used are all positive to
-    // make the signage clear here.
-    if (rect_height_style == RectHeightStyle::kTight) {
-      // Ignore line max height and width and generate tight bounds.
-      boxes.insert(boxes.end(), kv.second.boxes.begin(), kv.second.boxes.end());
-    } else if (rect_height_style == RectHeightStyle::kMax) {
-      for (const Paragraph::TextBox& box : kv.second.boxes) {
-        boxes.emplace_back(
-            SkRect::MakeLTRB(box.rect.fLeft, line.baseline - line.ascent,
-                             box.rect.fRight, line.baseline + line.descent),
-            box.direction);
-      }
-    } else if (rect_height_style ==
-               RectHeightStyle::kIncludeLineSpacingMiddle) {
-      SkScalar adjusted_bottom = line.baseline + line.descent;
-      if (kv.first < line_metrics_.size() - 1) {
-        adjusted_bottom += (line_metrics_[kv.first + 1].ascent -
-                            line_metrics_[kv.first + 1].unscaled_ascent) /
-                           2;
-      }
-      SkScalar adjusted_top = line.baseline - line.unscaled_ascent;
-      if (kv.first != 0) {
-        adjusted_top -= (line.ascent - line.unscaled_ascent) / 2;
-      }
-      for (const Paragraph::TextBox& box : kv.second.boxes) {
-        boxes.emplace_back(SkRect::MakeLTRB(box.rect.fLeft, adjusted_top,
-                                            box.rect.fRight, adjusted_bottom),
-                           box.direction);
-      }
-    } else if (rect_height_style == RectHeightStyle::kIncludeLineSpacingTop) {
-      for (const Paragraph::TextBox& box : kv.second.boxes) {
-        SkScalar adjusted_top = kv.first == 0
-                                    ? line.baseline - line.unscaled_ascent
-                                    : line.baseline - line.ascent;
-        boxes.emplace_back(
-            SkRect::MakeLTRB(box.rect.fLeft, adjusted_top, box.rect.fRight,
-                             line.baseline + line.descent),
-            box.direction);
-      }
-    } else if (rect_height_style ==
-               RectHeightStyle::kIncludeLineSpacingBottom) {
-      for (const Paragraph::TextBox& box : kv.second.boxes) {
-        SkScalar adjusted_bottom = line.baseline + line.descent;
-        if (kv.first < line_metrics_.size() - 1) {
-          adjusted_bottom += -line.unscaled_ascent + line.ascent;
-        }
-        boxes.emplace_back(
-            SkRect::MakeLTRB(box.rect.fLeft,
-                             line.baseline - line.unscaled_ascent,
-                             box.rect.fRight, adjusted_bottom),
-            box.direction);
-      }
-    } else if (rect_height_style == RectHeightStyle::kStrut) {
-      if (IsStrutValid()) {
-        for (const Paragraph::TextBox& box : kv.second.boxes) {
-          boxes.emplace_back(
-              SkRect::MakeLTRB(box.rect.fLeft, line.baseline - strut_.ascent,
-                               box.rect.fRight, line.baseline + strut_.descent),
-              box.direction);
-        }
-      } else {
-        // Fall back to tight bounds if the strut is invalid.
-        boxes.insert(boxes.end(), kv.second.boxes.begin(),
-                     kv.second.boxes.end());
-      }
-    }
-  }
-  return boxes;
-}
-
-Paragraph::PositionWithAffinity ParagraphTxt::GetGlyphPositionAtCoordinate(
-    double dx,
-    double dy) {
-  FML_DCHECK(!needs_layout_) << "only valid after layout";
-  if (final_line_count_ <= 0)
-    return PositionWithAffinity(0, DOWNSTREAM);
-
-  size_t y_index;
-  for (y_index = 0; y_index < final_line_count_ - 1; ++y_index) {
-    if (dy < line_metrics_[y_index].height)
-      break;
-  }
-
-  const std::vector<GlyphPosition>& line_glyph_position =
-      glyph_lines_[y_index].positions;
-  if (line_glyph_position.empty()) {
-    int line_start_index =
-        std::accumulate(glyph_lines_.begin(), glyph_lines_.begin() + y_index, 0,
-                        [](const int a, const GlyphLine& b) {
-                          return a + static_cast<int>(b.total_code_units);
-                        });
-    return PositionWithAffinity(line_start_index, DOWNSTREAM);
-  }
-
-  size_t x_index;
-  const GlyphPosition* gp = nullptr;
-  for (x_index = 0; x_index < line_glyph_position.size(); ++x_index) {
-    double glyph_end = (x_index < line_glyph_position.size() - 1)
-                           ? line_glyph_position[x_index + 1].x_pos.start
-                           : line_glyph_position[x_index].x_pos.end;
-    if (dx < glyph_end) {
-      gp = &line_glyph_position[x_index];
-      break;
-    }
-  }
-
-  if (gp == nullptr) {
-    gp = &line_glyph_position.back();
-  }
-
-  // Find the direction of the run that contains this glyph.
-  TextDirection direction = TextDirection::ltr;
-  for (const CodeUnitRun& run : code_unit_runs_) {
-    if (gp->code_units.start >= run.code_units.start &&
-        gp->code_units.end <= run.code_units.end) {
-      direction = run.direction;
-      break;
-    }
-  }
-
-  double glyph_center = (gp->x_pos.start + gp->x_pos.end) / 2;
-  if ((direction == TextDirection::ltr && dx < glyph_center) ||
-      (direction == TextDirection::rtl && dx >= glyph_center)) {
-    return PositionWithAffinity(gp->code_units.start, DOWNSTREAM);
-  } else {
-    return PositionWithAffinity(gp->code_units.end, UPSTREAM);
-  }
-}
-
-// We don't cache this because since this returns all boxes, it is usually
-// unnecessary to call this multiple times in succession.
-std::vector<Paragraph::TextBox> ParagraphTxt::GetRectsForPlaceholders() {
-  FML_DCHECK(!needs_layout_) << "only valid after layout";
-  // Struct that holds calculated metrics for each line.
-  struct LineBoxMetrics {
-    std::vector<Paragraph::TextBox> boxes;
-    // Per-line metrics for max and min coordinates for left and right boxes.
-    // These metrics cannot be calculated in layout generically because of
-    // selections that do not cover the whole line.
-    SkScalar max_right = std::numeric_limits<SkScalar>::lowest();
-    SkScalar min_left = std::numeric_limits<SkScalar>::max();
-  };
-
-  std::vector<Paragraph::TextBox> boxes;
-
-  // Generate initial boxes and calculate metrics.
-  for (const CodeUnitRun& run : inline_placeholder_code_unit_runs_) {
-    // Check to see if we are finished.
-    double baseline = line_metrics_[run.line_number].baseline;
-    SkScalar top = baseline + run.font_metrics.fAscent;
-    SkScalar bottom = baseline + run.font_metrics.fDescent;
-
-    if (run.placeholder_run !=
-        nullptr) {  // Use inline placeholder size as height.
-      top = baseline - run.placeholder_run->baseline_offset;
-      bottom = baseline + run.placeholder_run->height -
-               run.placeholder_run->baseline_offset;
-    }
-
-    // Calculate left and right.
-    SkScalar left, right;
-    left = run.x_pos.start;
-    right = run.x_pos.end;
-
-    boxes.emplace_back(SkRect::MakeLTRB(left, top, right, bottom),
-                       run.direction);
-  }
-  return boxes;
-}
-
-Paragraph::Range<size_t> ParagraphTxt::GetWordBoundary(size_t offset) {
-  FML_DCHECK(!needs_layout_) << "only valid after layout";
-  if (text_.size() == 0)
-    return Range<size_t>(0, 0);
-
-  if (!word_breaker_) {
-    UErrorCode status = U_ZERO_ERROR;
-    word_breaker_.reset(
-        icu::BreakIterator::createWordInstance(icu::Locale(), status));
-    if (!U_SUCCESS(status))
-      return Range<size_t>(0, 0);
-  }
-
-  icu::UnicodeString icu_text(false, text_.data(), text_.size());
-  word_breaker_->setText(icu_text);
-
-  int32_t prev_boundary = word_breaker_->preceding(offset + 1);
-  int32_t next_boundary = word_breaker_->next();
-  if (prev_boundary == icu::BreakIterator::DONE)
-    prev_boundary = offset;
-  if (next_boundary == icu::BreakIterator::DONE)
-    next_boundary = offset;
-  return Range<size_t>(prev_boundary, next_boundary);
-}
-
-size_t ParagraphTxt::GetLineCount() {
-  FML_DCHECK(!needs_layout_) << "only valid after layout";
-  return final_line_count_;
-}
-
-bool ParagraphTxt::DidExceedMaxLines() {
-  FML_DCHECK(!needs_layout_) << "only valid after layout";
-  return did_exceed_max_lines_;
-}
-
-void ParagraphTxt::SetDirty(bool dirty) {
-  needs_layout_ = dirty;
-}
-
-std::vector<LineMetrics>& ParagraphTxt::GetLineMetrics() {
-  FML_DCHECK(!needs_layout_) << "only valid after layout";
-  return line_metrics_;
-}
-
-}  // namespace txt
diff --git a/third_party/txt/src/txt/paragraph_txt.h b/third_party/txt/src/txt/paragraph_txt.h
deleted file mode 100644
index 989fc058bed379dd848c1824e2dc539b5ab3f7c5..0000000000000000000000000000000000000000
--- a/third_party/txt/src/txt/paragraph_txt.h
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
- * Copyright 2017 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef LIB_TXT_SRC_PARAGRAPH_TXT_H_
-#define LIB_TXT_SRC_PARAGRAPH_TXT_H_
-
-#include <set>
-#include <utility>
-#include <vector>
-
-#include "flutter/fml/compiler_specific.h"
-#include "flutter/fml/macros.h"
-#include "font_collection.h"
-#include "line_metrics.h"
-#include "minikin/LineBreaker.h"
-#include "paint_record.h"
-#include "paragraph.h"
-#include "paragraph_style.h"
-#include "placeholder_run.h"
-#include "run_metrics.h"
-#include "styled_runs.h"
-#include "third_party/googletest/googletest/include/gtest/gtest_prod.h"  // nogncheck
-#include "third_party/skia/include/core/SkFontMetrics.h"
-#include "third_party/skia/include/core/SkRect.h"
-#include "utils/LinuxUtils.h"
-#include "utils/MacUtils.h"
-#include "utils/WindowsUtils.h"
-
-namespace txt {
-
-using GlyphID = uint32_t;
-
-// Constant with the unicode codepoint for the "Object replacement character".
-// Used as a stand-in character for Placeholder boxes.
-const int objReplacementChar = 0xFFFC;
-// Constant with the unicode codepoint for the "Replacement character". This is
-// the character that commonly renders as a black diamond with a white question
-// mark. Used to replace non-placeholder instances of 0xFFFC in the text buffer.
-const int replacementChar = 0xFFFD;
-
-// Paragraph provides Layout, metrics, and painting capabilities for text. Once
-// a Paragraph is constructed with ParagraphBuilder::Build(), an example basic
-// workflow can be this:
-//
-//   std::unique_ptr<Paragraph> paragraph = paragraph_builder.Build();
-//   paragraph->Layout(<somewidthgoeshere>);
-//   paragraph->Paint(<someSkCanvas>, <xpos>, <ypos>);
-class ParagraphTxt : public Paragraph {
- public:
-  // Constructor. It is highly recommended to construct a paragraph with a
-  // ParagraphBuilder.
-  ParagraphTxt();
-
-  virtual ~ParagraphTxt();
-
-  // Minikin Layout doLayout() and LineBreaker addStyleRun() has an
-  // O(N^2) (according to benchmarks) time complexity where N is the total
-  // number of characters. However, this is not significant for reasonably sized
-  // paragraphs. It is currently recommended to break up very long paragraphs
-  // (10k+ characters) to ensure speedy layout.
-  virtual void Layout(double width) override;
-
-  virtual void Paint(SkCanvas* canvas, double x, double y) override;
-  virtual bool Paint(flutter::DisplayListBuilder* builder,
-                     double x,
-                     double y) override {
-    return false;
-  }
-
-  // Getter for paragraph_style_.
-  const ParagraphStyle& GetParagraphStyle() const;
-
-  // Returns the number of characters/unicode characters. AKA text_.size()
-  size_t TextSize() const;
-
-  double GetHeight() override;
-
-  double GetMaxWidth() override;
-
-  double GetLongestLine() override;
-
-  double GetAlphabeticBaseline() override;
-
-  double GetIdeographicBaseline() override;
-
-  double GetMaxIntrinsicWidth() override;
-
-  // Currently, calculated similarly to as GetLayoutWidth(), however this is not
-  // necessarily 100% correct in all cases.
-  double GetMinIntrinsicWidth() override;
-
-  std::vector<TextBox> GetRectsForRange(
-      size_t start,
-      size_t end,
-      RectHeightStyle rect_height_style,
-      RectWidthStyle rect_width_style) override;
-
-  PositionWithAffinity GetGlyphPositionAtCoordinate(double dx,
-                                                    double dy) override;
-
-  std::vector<Paragraph::TextBox> GetRectsForPlaceholders() override;
-
-  Range<size_t> GetWordBoundary(size_t offset) override;
-
-  // Returns the number of lines the paragraph takes up. If the text exceeds the
-  // amount width and maxlines provides, Layout() truncates the extra text from
-  // the layout and this will return the max lines allowed.
-  size_t GetLineCount();
-
-  bool DidExceedMaxLines() override;
-
-  // Gets the full vector of LineMetrics which includes detailed data on each
-  // line in the final layout.
-  std::vector<LineMetrics>& GetLineMetrics() override;
-
-  // Sets the needs_layout_ to dirty. When Layout() is called, a new Layout will
-  // be performed when this is set to true. Can also be used to prevent a new
-  // Layout from being calculated by setting to false.
-  void SetDirty(bool dirty = true);
-
- private:
-  friend class ParagraphBuilderTxt;
-  FRIEND_TEST(ParagraphTest, SimpleParagraph);
-  FRIEND_TEST(ParagraphTest, SimpleParagraphSmall);
-  FRIEND_TEST(ParagraphTest, SimpleRedParagraph);
-  FRIEND_TEST(ParagraphTest, RainbowParagraph);
-  FRIEND_TEST(ParagraphTest, DefaultStyleParagraph);
-  FRIEND_TEST(ParagraphTest, BoldParagraph);
-  FRIEND_TEST_WINDOWS_DISABLED(ParagraphTest, LeftAlignParagraph);
-  FRIEND_TEST_WINDOWS_DISABLED(ParagraphTest, RightAlignParagraph);
-  FRIEND_TEST_WINDOWS_DISABLED(ParagraphTest, CenterAlignParagraph);
-  FRIEND_TEST_WINDOWS_DISABLED(ParagraphTest, JustifyAlignParagraph);
-  FRIEND_TEST_WINDOWS_DISABLED(ParagraphTest, JustifyRTL);
-  FRIEND_TEST_WINDOWS_DISABLED(ParagraphTest, InlinePlaceholderLongestLine);
-  FRIEND_TEST_LINUX_ONLY(ParagraphTest, JustifyRTLNewLine);
-  FRIEND_TEST(ParagraphTest, DecorationsParagraph);
-  FRIEND_TEST(ParagraphTest, ItalicsParagraph);
-  FRIEND_TEST(ParagraphTest, ChineseParagraph);
-  FRIEND_TEST(ParagraphTest, DISABLED_ArabicParagraph);
-  FRIEND_TEST(ParagraphTest, SpacingParagraph);
-  FRIEND_TEST(ParagraphTest, LongWordParagraph);
-  FRIEND_TEST_LINUX_ONLY(ParagraphTest, KernScaleParagraph);
-  FRIEND_TEST_WINDOWS_DISABLED(ParagraphTest, NewlineParagraph);
-  FRIEND_TEST_LINUX_ONLY(ParagraphTest, EmojiParagraph);
-  FRIEND_TEST_LINUX_ONLY(ParagraphTest, EmojiMultiLineRectsParagraph);
-  FRIEND_TEST(ParagraphTest, HyphenBreakParagraph);
-  FRIEND_TEST(ParagraphTest, RepeatLayoutParagraph);
-  FRIEND_TEST(ParagraphTest, Ellipsize);
-  FRIEND_TEST(ParagraphTest, UnderlineShiftParagraph);
-  FRIEND_TEST(ParagraphTest, WavyDecorationParagraph);
-  FRIEND_TEST(ParagraphTest, SimpleShadow);
-  FRIEND_TEST(ParagraphTest, ComplexShadow);
-  FRIEND_TEST(ParagraphTest, FontFallbackParagraph);
-  FRIEND_TEST(ParagraphTest, InlinePlaceholder0xFFFCParagraph);
-  FRIEND_TEST(ParagraphTest, FontFeaturesParagraph);
-  FRIEND_TEST(ParagraphTest, GetGlyphPositionAtCoordinateSegfault);
-  FRIEND_TEST(ParagraphTest, KhmerLineBreaker);
-  FRIEND_TEST(ParagraphTest, TextHeightBehaviorRectsParagraph);
-
-  // Starting data to layout.
-  std::vector<uint16_t> text_;
-  // A vector of PlaceholderRuns, which detail the sizes, positioning and break
-  // behavior of the empty spaces to leave. Each placeholder span corresponds to
-  // a 0xFFFC (object replacement character) in text_, which indicates the
-  // position in the text where the placeholder will occur. There should be an
-  // equal number of 0xFFFC characters and elements in this vector.
-  std::vector<PlaceholderRun> inline_placeholders_;
-  // The indexes of the boxes that correspond to an inline placeholder.
-  std::vector<size_t> inline_placeholder_boxes_;
-  // The indexes of instances of 0xFFFC that correspond to placeholders. This is
-  // necessary since the user may pass in manually entered 0xFFFC values using
-  // AddText().
-  std::unordered_set<size_t> obj_replacement_char_indexes_;
-  StyledRuns runs_;
-  ParagraphStyle paragraph_style_;
-  std::shared_ptr<FontCollection> font_collection_;
-
-  minikin::LineBreaker breaker_;
-  mutable std::unique_ptr<icu::BreakIterator> word_breaker_;
-
-  std::vector<LineMetrics> line_metrics_;
-  size_t final_line_count_ = 0;
-  std::vector<double> line_widths_;
-
-  // Stores the result of Layout().
-  std::vector<PaintRecord> records_;
-
-  bool did_exceed_max_lines_;
-
-  // Strut metrics of zero will have no effect on the layout.
-  struct StrutMetrics {
-    double ascent = 0;  // Positive value to keep signs clear.
-    double descent = 0;
-    double leading = 0;
-    double half_leading = 0;
-    double line_height = 0;
-    bool force_strut = false;
-  };
-
-  StrutMetrics strut_;
-
-  // Overall left and right extremes over all lines.
-  double max_right_;
-  double min_left_;
-
-  class BidiRun {
-   public:
-    // Constructs a BidiRun with is_ghost defaulted to false.
-    BidiRun(size_t s, size_t e, TextDirection d, const TextStyle& st)
-        : start_(s), end_(e), direction_(d), style_(&st), is_ghost_(false) {}
-
-    // Constructs a BidiRun with a custom is_ghost flag.
-    BidiRun(size_t s,
-            size_t e,
-            TextDirection d,
-            const TextStyle& st,
-            bool is_ghost)
-        : start_(s), end_(e), direction_(d), style_(&st), is_ghost_(is_ghost) {}
-
-    // Constructs a placeholder bidi run.
-    BidiRun(size_t s,
-            size_t e,
-            TextDirection d,
-            const TextStyle& st,
-            PlaceholderRun& placeholder)
-        : start_(s),
-          end_(e),
-          direction_(d),
-          style_(&st),
-          is_ghost_(false),
-          placeholder_run_(&placeholder) {}
-
-    size_t start() const { return start_; }
-    size_t end() const { return end_; }
-    size_t size() const { return end_ - start_; }
-    TextDirection direction() const { return direction_; }
-    const TextStyle& style() const { return *style_; }
-    PlaceholderRun* placeholder_run() const { return placeholder_run_; }
-    bool is_rtl() const { return direction_ == TextDirection::rtl; }
-    // Tracks if the run represents trailing whitespace.
-    bool is_ghost() const { return is_ghost_; }
-    bool is_placeholder_run() const { return placeholder_run_ != nullptr; }
-
-   private:
-    size_t start_, end_;
-    TextDirection direction_;
-    const TextStyle* style_;
-    bool is_ghost_;
-    PlaceholderRun* placeholder_run_ = nullptr;
-  };
-
-  struct GlyphPosition {
-    Range<size_t> code_units;
-    Range<double> x_pos;
-
-    GlyphPosition(double x_start,
-                  double x_advance,
-                  size_t code_unit_index,
-                  size_t code_unit_width);
-
-    void Shift(double delta);
-  };
-
-  struct GlyphLine {
-    // Glyph positions sorted by x coordinate.
-    const std::vector<GlyphPosition> positions;
-    const size_t total_code_units;
-
-    GlyphLine(std::vector<GlyphPosition>&& p, size_t tcu);
-  };
-
-  struct CodeUnitRun {
-    // Glyph positions sorted by code unit index.
-    std::vector<GlyphPosition> positions;
-    Range<size_t> code_units;
-    Range<double> x_pos;
-    size_t line_number;
-    SkFontMetrics font_metrics;
-    const TextStyle* style;
-    TextDirection direction;
-    const PlaceholderRun* placeholder_run;
-
-    CodeUnitRun(std::vector<GlyphPosition>&& p,
-                Range<size_t> cu,
-                Range<double> x,
-                size_t line,
-                const SkFontMetrics& metrics,
-                const TextStyle& st,
-                TextDirection dir,
-                const PlaceholderRun* placeholder);
-
-    void Shift(double delta);
-  };
-
-  // Holds the laid out x positions of each glyph.
-  std::vector<GlyphLine> glyph_lines_;
-
-  // Holds the positions of each range of code units in the text.
-  // Sorted in code unit index order.
-  std::vector<CodeUnitRun> code_unit_runs_;
-  // Holds the positions of the inline placeholders.
-  std::vector<CodeUnitRun> inline_placeholder_code_unit_runs_;
-
-  // The max width of the paragraph as provided in the most recent Layout()
-  // call.
-  double width_ = -1.0f;
-  double longest_line_ = -1.0f;
-  double max_intrinsic_width_ = 0;
-  double min_intrinsic_width_ = 0;
-  double alphabetic_baseline_ = std::numeric_limits<double>::max();
-  double ideographic_baseline_ = std::numeric_limits<double>::max();
-
-  bool needs_layout_ = true;
-
-  struct WaveCoordinates {
-    double x_start;
-    double y_start;
-    double x_end;
-    double y_end;
-
-    WaveCoordinates(double x_s, double y_s, double x_e, double y_e)
-        : x_start(x_s), y_start(y_s), x_end(x_e), y_end(y_e) {}
-  };
-
-  // Passes in the text and Styled Runs. text_ and runs_ will later be passed
-  // into breaker_ in InitBreaker(), which is called in Layout().
-  void SetText(std::vector<uint16_t> text, StyledRuns runs);
-
-  void SetParagraphStyle(const ParagraphStyle& style);
-
-  void SetFontCollection(std::shared_ptr<FontCollection> font_collection);
-
-  void SetInlinePlaceholders(
-      std::vector<PlaceholderRun> inline_placeholders,
-      std::unordered_set<size_t> obj_replacement_char_indexes);
-
-  // Break the text into lines.
-  bool ComputeLineBreaks();
-
-  // Break the text into runs based on LTR/RTL text direction.
-  bool ComputeBidiRuns(std::vector<BidiRun>* result);
-
-  // Calculates and populates strut based on paragraph_style_ strut info.
-  void ComputeStrut(StrutMetrics* strut, SkFont& font);
-
-  // Adjusts the ascent and descent based on the existence and type of
-  // placeholder. This method sets the proper metrics to achieve the different
-  // PlaceholderAlignment options.
-  void ComputePlaceholder(PlaceholderRun* placeholder_run,
-                          double& ascent,
-                          double& descent);
-
-  bool IsStrutValid() const;
-
-  void UpdateLineMetrics(const SkFontMetrics& metrics,
-                         const TextStyle& style,
-                         double& max_ascent,
-                         double& max_descent,
-                         double& max_unscaled_ascent,
-                         PlaceholderRun* placeholder_run,
-                         size_t line_number,
-                         size_t line_limit);
-
-  // Calculate the starting X offset of a line based on the line's width and
-  // alignment.
-  double GetLineXOffset(double line_total_advance, bool justify_line);
-
-  // Creates and draws the decorations onto the canvas.
-  void PaintDecorations(SkCanvas* canvas,
-                        const PaintRecord& record,
-                        SkPoint base_offset);
-
-  // Computes the beziers for a wavy decoration. The results will be
-  // applied to path.
-  void ComputeWavyDecoration(SkPath& path,
-                             double x,
-                             double y,
-                             double width,
-                             double thickness);
-
-  // Draws the background onto the canvas.
-  void PaintBackground(SkCanvas* canvas,
-                       const PaintRecord& record,
-                       SkPoint base_offset);
-
-  // Draws the shadows onto the canvas.
-  void PaintShadow(SkCanvas* canvas, const PaintRecord& record, SkPoint offset);
-
-  // Obtain a Minikin font collection matching this text style.
-  std::shared_ptr<minikin::FontCollection> GetMinikinFontCollectionForStyle(
-      const TextStyle& style);
-
-  // Get a default SkTypeface for a text style.
-  sk_sp<SkTypeface> GetDefaultSkiaTypeface(const TextStyle& style);
-
-  FML_DISALLOW_COPY_AND_ASSIGN(ParagraphTxt);
-};
-
-}  // namespace txt
-
-#endif  // LIB_TXT_SRC_PARAGRAPH_TXT_H_
diff --git a/third_party/txt/src/txt/platform.cc b/third_party/txt/src/txt/platform.cc
index f1860efd7e9cf077ddbeba5916b45ad6b3a0fbe8..1ab45ddc1da2c8649f55fb1c2fe8a902499ac44e 100644
--- a/third_party/txt/src/txt/platform.cc
+++ b/third_party/txt/src/txt/platform.cc
@@ -4,6 +4,10 @@
 
 #include "txt/platform.h"
 
+#if defined(SK_FONTMGR_FREETYPE_EMPTY_AVAILABLE)
+#include "third_party/skia/include/ports/SkFontMgr_empty.h"
+#endif
+
 namespace txt {
 
 std::vector<std::string> GetDefaultFontFamilies() {
@@ -11,7 +15,12 @@ std::vector<std::string> GetDefaultFontFamilies() {
 }
 
 sk_sp<SkFontMgr> GetDefaultFontManager(uint32_t font_initialization_data) {
-  return SkFontMgr::RefDefault();
+#if defined(SK_FONTMGR_FREETYPE_EMPTY_AVAILABLE)
+  static sk_sp<SkFontMgr> mgr = SkFontMgr_New_Custom_Empty();
+#else
+  static sk_sp<SkFontMgr> mgr = SkFontMgr::RefEmpty();
+#endif
+  return mgr;
 }
 
 }  // namespace txt
diff --git a/third_party/txt/src/txt/platform.h b/third_party/txt/src/txt/platform.h
index 7c29e1900121d7758f1da8783ff67101798454db..7ce2dd2e1c40e9d3ca835d61697c061fd986b17e 100644
--- a/third_party/txt/src/txt/platform.h
+++ b/third_party/txt/src/txt/platform.h
@@ -15,7 +15,7 @@ namespace txt {
 
 std::vector<std::string> GetDefaultFontFamilies();
 
-sk_sp<SkFontMgr> GetDefaultFontManager(uint32_t font_initialization_data);
+sk_sp<SkFontMgr> GetDefaultFontManager(uint32_t font_initialization_data = 0);
 
 }  // namespace txt
 
diff --git a/third_party/txt/src/txt/platform_android.cc b/third_party/txt/src/txt/platform_android.cc
index 3af12dde3bf5f455f9a9569d0c8ac8ddbc8aea5c..19c07f0bf3341de31fa9dec38fd613d0a4004d69 100644
--- a/third_party/txt/src/txt/platform_android.cc
+++ b/third_party/txt/src/txt/platform_android.cc
@@ -4,6 +4,14 @@
 
 #include "txt/platform.h"
 
+#if defined(SK_FONTMGR_ANDROID_AVAILABLE)
+#include "third_party/skia/include/ports/SkFontMgr_android.h"
+#endif
+
+#if defined(SK_FONTMGR_FREETYPE_EMPTY_AVAILABLE)
+#include "third_party/skia/include/ports/SkFontMgr_empty.h"
+#endif
+
 namespace txt {
 
 std::vector<std::string> GetDefaultFontFamilies() {
@@ -11,7 +19,14 @@ std::vector<std::string> GetDefaultFontFamilies() {
 }
 
 sk_sp<SkFontMgr> GetDefaultFontManager(uint32_t font_initialization_data) {
-  return SkFontMgr::RefDefault();
+#if defined(SK_FONTMGR_ANDROID_AVAILABLE)
+  static sk_sp<SkFontMgr> mgr = SkFontMgr_New_Android(nullptr);
+#elif defined(SK_FONTMGR_FREETYPE_EMPTY_AVAILABLE)
+  static sk_sp<SkFontMgr> mgr = SkFontMgr_New_Custom_Empty();
+#else
+  static sk_sp<SkFontMgr> mgr = SkFontMgr::RefEmpty();
+#endif
+  return mgr;
 }
 
 }  // namespace txt
diff --git a/third_party/txt/src/txt/platform_fuchsia.cc b/third_party/txt/src/txt/platform_fuchsia.cc
index 85fd7849dbb2acf5589d0138a797b81d022402ca..547ed6bedd466303c6d6af2422fc7b28622c32ca 100644
--- a/third_party/txt/src/txt/platform_fuchsia.cc
+++ b/third_party/txt/src/txt/platform_fuchsia.cc
@@ -7,6 +7,10 @@
 #include "third_party/skia/include/ports/SkFontMgr_fuchsia.h"
 #include "txt/platform.h"
 
+#if defined(SK_FONTMGR_FREETYPE_EMPTY_AVAILABLE)
+#include "third_party/skia/include/ports/SkFontMgr_empty.h"
+#endif
+
 namespace txt {
 
 std::vector<std::string> GetDefaultFontFamilies() {
@@ -19,7 +23,12 @@ sk_sp<SkFontMgr> GetDefaultFontManager(uint32_t font_initialization_data) {
     sync_font_provider.Bind(zx::channel(font_initialization_data));
     return SkFontMgr_New_Fuchsia(std::move(sync_font_provider));
   } else {
-    return SkFontMgr::RefDefault();
+#if defined(SK_FONTMGR_FREETYPE_EMPTY_AVAILABLE)
+    static sk_sp<SkFontMgr> mgr = SkFontMgr_New_Custom_Empty();
+#else
+    static sk_sp<SkFontMgr> mgr = SkFontMgr::RefEmpty();
+#endif
+    return mgr;
   }
 }
 
diff --git a/third_party/txt/src/txt/platform_linux.cc b/third_party/txt/src/txt/platform_linux.cc
index 86dc2132c2b9ddfdf70bd0adb4b6ab339941f7a4..e542d82e504779252e120e86c0967b4328aa4ffd 100644
--- a/third_party/txt/src/txt/platform_linux.cc
+++ b/third_party/txt/src/txt/platform_linux.cc
@@ -4,10 +4,16 @@
 
 #include "txt/platform.h"
 
-#ifdef FLUTTER_USE_FONTCONFIG
+#if defined(SK_FONTMGR_FONTCONFIG_AVAILABLE)
 #include "third_party/skia/include/ports/SkFontMgr_fontconfig.h"
-#else
-#include "third_party/skia/include/ports/SkFontMgr_directory.h"
+#endif
+
+#if defined(SK_FONTMGR_FREETYPE_DIRECTORY_AVAILABLE)
+#include "include/ports/SkFontMgr_directory.h"
+#endif
+
+#if defined(SK_FONTMGR_FREETYPE_EMPTY_AVAILABLE)
+#include "third_party/skia/include/ports/SkFontMgr_empty.h"
 #endif
 
 namespace txt {
@@ -17,11 +23,17 @@ std::vector<std::string> GetDefaultFontFamilies() {
 }
 
 sk_sp<SkFontMgr> GetDefaultFontManager(uint32_t font_initialization_data) {
-#ifdef FLUTTER_USE_FONTCONFIG
-  return SkFontMgr_New_FontConfig(nullptr);
+#if defined(SK_FONTMGR_FONTCONFIG_AVAILABLE)
+  static sk_sp<SkFontMgr> mgr = SkFontMgr_New_FontConfig(nullptr);
+#elif defined(SK_FONTMGR_FREETYPE_DIRECTORY_AVAILABLE)
+  static sk_sp<SkFontMgr> mgr =
+      SkFontMgr_New_Custom_Directory("/usr/share/fonts/");
+#elif defined(SK_FONTMGR_FREETYPE_EMPTY_AVAILABLE)
+  static sk_sp<SkFontMgr> mgr = SkFontMgr_New_Custom_Empty();
 #else
-  return SkFontMgr_New_Custom_Directory("/usr/share/fonts/");
+  static sk_sp<SkFontMgr> mgr = SkFontMgr::RefEmpty();
 #endif
+  return mgr;
 }
 
 }  // namespace txt
diff --git a/third_party/txt/src/txt/platform_mac.h b/third_party/txt/src/txt/platform_mac.h
new file mode 100644
index 0000000000000000000000000000000000000000..7ff2e0d391ded92b285242b66d943a1d1745cebc
--- /dev/null
+++ b/third_party/txt/src/txt/platform_mac.h
@@ -0,0 +1,17 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef TXT_PLATFORM_MAC_H_
+#define TXT_PLATFORM_MAC_H_
+
+#include "txt/asset_font_manager.h"
+
+namespace txt {
+
+// Register additional system font for MacOS and iOS.
+void RegisterSystemFonts(const DynamicFontManager& dynamic_font_manager);
+
+}  // namespace txt
+
+#endif  // TXT_PLATFORM_MAC_H_
diff --git a/third_party/txt/src/txt/platform_mac.mm b/third_party/txt/src/txt/platform_mac.mm
index 4e116418c597463169d35489614500b87d7ea82e..30fb6eaaa4c2f38d2f781d4f5ba0391546e1041f 100644
--- a/third_party/txt/src/txt/platform_mac.mm
+++ b/third_party/txt/src/txt/platform_mac.mm
@@ -4,8 +4,12 @@
 
 #include <TargetConditionals.h>
 
+#include "flutter/fml/platform/darwin/cf_utils.h"
 #include "flutter/fml/platform/darwin/platform_version.h"
+#include "third_party/skia/include/ports/SkFontMgr_mac_ct.h"
+#include "third_party/skia/include/ports/SkTypeface_mac.h"
 #include "txt/platform.h"
+#include "txt/platform_mac.h"
 
 #if TARGET_OS_EMBEDDED || TARGET_OS_SIMULATOR
 #include <UIKit/UIKit.h>
@@ -15,8 +19,17 @@
 #define FONT_CLASS NSFont
 #endif  // TARGET_OS_EMBEDDED
 
+// Apple system font larger than size 29 returns SFProDisplay typeface.
+static const CGFloat kSFProDisplayBreakPoint = 29;
+// Font name represents the "SF Pro Display" system font on Apple platforms.
+static const std::string kSFProDisplayName = "CupertinoSystemDisplay";
+// Font weight representing Regular
+float kNormalWeightValue = 400;
+
 namespace txt {
 
+const FourCharCode kWeightTag = 'wght';
+
 std::vector<std::string> GetDefaultFontFamilies() {
   if (fml::IsPlatformVersionAtLeast(9)) {
     return {[FONT_CLASS systemFontOfSize:14].familyName.UTF8String};
@@ -26,7 +39,80 @@ std::vector<std::string> GetDefaultFontFamilies() {
 }
 
 sk_sp<SkFontMgr> GetDefaultFontManager(uint32_t font_initialization_data) {
-  return SkFontMgr::RefDefault();
+  static sk_sp<SkFontMgr> mgr = SkFontMgr_New_CoreText(nullptr);
+  return mgr;
+}
+
+fml::CFRef<CTFontRef> MatchSystemUIFont(float desired_weight, float size) {
+  fml::CFRef<CTFontRef> ct_font(
+      CTFontCreateUIFontForLanguage(kCTFontUIFontSystem, size, nullptr));
+
+  if (desired_weight == kNormalWeightValue) {
+    return ct_font;
+  }
+
+  fml::CFRef<CFMutableDictionaryRef> variations(CFDictionaryCreateMutable(
+      kCFAllocatorDefault, 1, &kCFTypeDictionaryKeyCallBacks,
+      &kCFTypeDictionaryValueCallBacks));
+
+  auto add_axis_to_variations = [&variations](const FourCharCode tag,
+                                              float desired_value,
+                                              float normal_value) {
+    if (desired_value != normal_value) {
+      fml::CFRef<CFNumberRef> tag_number(
+          CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &tag));
+      fml::CFRef<CFNumberRef> value_number(CFNumberCreate(
+          kCFAllocatorDefault, kCFNumberFloatType, &desired_value));
+      CFDictionarySetValue(variations, tag_number, value_number);
+    }
+  };
+  add_axis_to_variations(kWeightTag, desired_weight, kNormalWeightValue);
+
+  fml::CFRef<CFMutableDictionaryRef> attributes(CFDictionaryCreateMutable(
+      kCFAllocatorDefault, 1, &kCFTypeDictionaryKeyCallBacks,
+      &kCFTypeDictionaryValueCallBacks));
+  CFDictionarySetValue(attributes, kCTFontVariationAttribute, variations);
+
+  fml::CFRef<CTFontDescriptorRef> var_font_desc(
+      CTFontDescriptorCreateWithAttributes(attributes));
+
+  return fml::CFRef<CTFontRef>(
+      CTFontCreateCopyWithAttributes(ct_font, size, nullptr, var_font_desc));
+}
+
+void RegisterSystemFonts(const DynamicFontManager& dynamic_font_manager) {
+  // iOS loads different system fonts when size is greater than 28 or lower
+  // than 17. The "familyName" property returned from CoreText stays the same
+  // despite the typeface is different.
+  //
+  // Below code manually loads and registers the larger font. The existing
+  // fallback correctly loads the smaller font. The code also iterates through
+  // the possible font weights from 100 - 900 to correctly load all of them, as
+  // a CTFont object for the large system font does not include all of the font
+  // weights by default.
+  //
+  // Darwin system fonts from 17 to 28 also have dynamic spacing based on sizes.
+  // These two fonts do not match the spacings when sizes are from 17 to 28.
+  // The spacing should be handled by the app or the framework.
+  //
+  // See https://www.wwdcnotes.com/notes/wwdc20/10175/ for Apple's document on
+  // this topic.
+  auto register_weighted_font = [&dynamic_font_manager](const int weight) {
+    sk_sp<SkTypeface> large_system_font_weighted = SkMakeTypefaceFromCTFont(
+        MatchSystemUIFont(weight, kSFProDisplayBreakPoint));
+    if (large_system_font_weighted) {
+      dynamic_font_manager.font_provider().RegisterTypeface(
+          large_system_font_weighted, kSFProDisplayName);
+    }
+  };
+  for (int i = 0; i < 8; i++) {
+    const int font_weight = i * 100;
+    register_weighted_font(font_weight);
+  }
+  // The value 780 returns a font weight of 800.
+  register_weighted_font(780);
+  // The value of 810 returns a font weight of 900.
+  register_weighted_font(810);
 }
 
 }  // namespace txt
diff --git a/third_party/txt/src/txt/platform_ohos.cc b/third_party/txt/src/txt/platform_ohos.cc
index 3a0be33881a7846ee40672e9ccdc027f44b4951d..ba548a105dfa3cca4069f7fadf8f9b13c2f23768 100644
--- a/third_party/txt/src/txt/platform_ohos.cc
+++ b/third_party/txt/src/txt/platform_ohos.cc
@@ -14,6 +14,7 @@
 */
 
 #include "txt/platform.h"
+#include "third_party/skia/include/ports/SkFontMgr_ohos_api.h"
 
 namespace txt {
 
@@ -22,7 +23,8 @@ std::vector<std::string> GetDefaultFontFamilies() {
 }
 
 sk_sp<SkFontMgr> GetDefaultFontManager(uint32_t font_initialization_data) {
-  return SkFontMgr::RefDefault();
+  static sk_sp<SkFontMgr> mgr = SkFontMgr_New_OHOS();
+  return mgr;
 }
 
 }  // namespace txt
diff --git a/third_party/txt/src/txt/styled_runs.cc b/third_party/txt/src/txt/styled_runs.cc
deleted file mode 100644
index aa39ef75d93e6532fdddd36b201c3388c9add7f8..0000000000000000000000000000000000000000
--- a/third_party/txt/src/txt/styled_runs.cc
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2017 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "styled_runs.h"
-
-#include "flutter/fml/logging.h"
-#include "utils/WindowsUtils.h"
-
-namespace txt {
-
-StyledRuns::StyledRuns() = default;
-
-StyledRuns::~StyledRuns() = default;
-
-StyledRuns::StyledRuns(StyledRuns&& other) {
-  styles_.swap(other.styles_);
-  runs_.swap(other.runs_);
-}
-
-const StyledRuns& StyledRuns::operator=(StyledRuns&& other) {
-  styles_.swap(other.styles_);
-  runs_.swap(other.runs_);
-  return *this;
-}
-
-void StyledRuns::swap(StyledRuns& other) {
-  styles_.swap(other.styles_);
-  runs_.swap(other.runs_);
-}
-
-size_t StyledRuns::AddStyle(const TextStyle& style) {
-  const size_t style_index = styles_.size();
-  styles_.push_back(style);
-  return style_index;
-}
-
-const TextStyle& StyledRuns::GetStyle(size_t style_index) const {
-  return styles_[style_index];
-}
-
-void StyledRuns::StartRun(size_t style_index, size_t start) {
-  EndRunIfNeeded(start);
-  runs_.push_back(IndexedRun{style_index, start, start});
-}
-
-void StyledRuns::EndRunIfNeeded(size_t end) {
-  if (runs_.empty())
-    return;
-  IndexedRun& run = runs_.back();
-  if (run.start == end) {
-    // The run is empty. We can skip it.
-    runs_.pop_back();
-  } else {
-    run.end = end;
-  }
-}
-
-StyledRuns::Run StyledRuns::GetRun(size_t index) const {
-  const IndexedRun& run = runs_[index];
-  return Run{styles_[run.style_index], run.start, run.end};
-}
-
-}  // namespace txt
diff --git a/third_party/txt/src/txt/styled_runs.h b/third_party/txt/src/txt/styled_runs.h
deleted file mode 100644
index 04000629b63a4b341f2728f677cded318378b65d..0000000000000000000000000000000000000000
--- a/third_party/txt/src/txt/styled_runs.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright 2017 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef LIB_TXT_SRC_STYLED_RUNS_H_
-#define LIB_TXT_SRC_STYLED_RUNS_H_
-
-#include <list>
-#include <vector>
-
-#include "text_style.h"
-#include "third_party/googletest/googletest/include/gtest/gtest_prod.h"  // nogncheck
-#include "utils/WindowsUtils.h"
-
-namespace txt {
-
-// This holds and handles the start/end positions of discrete chunks of text
-// that use different styles (a 'run').
-class StyledRuns {
- public:
-  struct Run {
-    const TextStyle& style;
-    size_t start;
-    size_t end;
-  };
-
-  StyledRuns();
-
-  ~StyledRuns();
-
-  StyledRuns(const StyledRuns& other) = delete;
-
-  StyledRuns(StyledRuns&& other);
-
-  const StyledRuns& operator=(StyledRuns&& other);
-
-  void swap(StyledRuns& other);
-
-  size_t AddStyle(const TextStyle& style);
-
-  const TextStyle& GetStyle(size_t style_index) const;
-
-  void StartRun(size_t style_index, size_t start);
-
-  void EndRunIfNeeded(size_t end);
-
-  size_t size() const { return runs_.size(); }
-
-  Run GetRun(size_t index) const;
-
- private:
-  FRIEND_TEST(ParagraphTest, SimpleParagraph);
-  FRIEND_TEST(ParagraphTest, SimpleParagraphSmall);
-  FRIEND_TEST(ParagraphTest, SimpleRedParagraph);
-  FRIEND_TEST(ParagraphTest, RainbowParagraph);
-  FRIEND_TEST(ParagraphTest, DefaultStyleParagraph);
-  FRIEND_TEST(ParagraphTest, BoldParagraph);
-  FRIEND_TEST_WINDOWS_DISABLED(ParagraphTest, LeftAlignParagraph);
-  FRIEND_TEST_WINDOWS_DISABLED(ParagraphTest, RightAlignParagraph);
-  FRIEND_TEST_WINDOWS_DISABLED(ParagraphTest, CenterAlignParagraph);
-  FRIEND_TEST_WINDOWS_DISABLED(ParagraphTest, JustifyAlignParagraph);
-  FRIEND_TEST(ParagraphTest, DecorationsParagraph);
-  FRIEND_TEST(ParagraphTest, ItalicsParagraph);
-  FRIEND_TEST(ParagraphTest, ChineseParagraph);
-  FRIEND_TEST(ParagraphTest, DISABLED_ArabicParagraph);
-  FRIEND_TEST(ParagraphTest, LongWordParagraph);
-  FRIEND_TEST(ParagraphTest, KernParagraph);
-  FRIEND_TEST(ParagraphTest, HyphenBreakParagraph);
-  FRIEND_TEST(ParagraphTest, RepeatLayoutParagraph);
-  FRIEND_TEST(ParagraphTest, Ellipsize);
-  FRIEND_TEST(ParagraphTest, SimpleShadow);
-  FRIEND_TEST(ParagraphTest, ComplexShadow);
-  FRIEND_TEST(ParagraphTest, FontFallbackParagraph);
-
-  struct IndexedRun {
-    size_t style_index = 0;
-    size_t start = 0;
-    size_t end = 0;
-
-    explicit IndexedRun(size_t style_index, size_t start, size_t end)
-        : style_index(style_index), start(start), end(end) {}
-  };
-
-  std::vector<TextStyle> styles_;
-  std::vector<IndexedRun> runs_;
-};
-
-}  // namespace txt
-
-#endif  // LIB_TXT_SRC_STYLED_RUNS_H_
diff --git a/third_party/txt/src/txt/test_font_manager.cc b/third_party/txt/src/txt/test_font_manager.cc
index a23a8aa58807b3a2f03da1a8466b4c5e05cc875d..4fe5e33e0ef356a64cb03e11f9fd2f4713143982 100644
--- a/third_party/txt/src/txt/test_font_manager.cc
+++ b/third_party/txt/src/txt/test_font_manager.cc
@@ -27,7 +27,8 @@ TestFontManager::TestFontManager(
 
 TestFontManager::~TestFontManager() = default;
 
-SkFontStyleSet* TestFontManager::onMatchFamily(const char family_name[]) const {
+sk_sp<SkFontStyleSet> TestFontManager::onMatchFamily(
+    const char family_name[]) const {
   // Find the requested name in the list, if not found, default to the first
   // font family in the test font family list.
   std::string requested_name(family_name);
diff --git a/third_party/txt/src/txt/test_font_manager.h b/third_party/txt/src/txt/test_font_manager.h
index b1a7d58b999cfa83baa7eaac11e1f27d3eb0bbc7..ffd1d566604d196ab32aa3d8d296d484ed2a5632 100644
--- a/third_party/txt/src/txt/test_font_manager.h
+++ b/third_party/txt/src/txt/test_font_manager.h
@@ -40,7 +40,7 @@ class TestFontManager : public AssetFontManager {
  private:
   std::vector<std::string> test_font_family_names_;
 
-  SkFontStyleSet* onMatchFamily(const char family_name[]) const override;
+  sk_sp<SkFontStyleSet> onMatchFamily(const char family_name[]) const override;
 
   FML_DISALLOW_COPY_AND_ASSIGN(TestFontManager);
 };
diff --git a/third_party/txt/src/txt/text_style.h b/third_party/txt/src/txt/text_style.h
index 7fcb30a26117fbc1a78328db6577072de7ae826a..fc448f9241ae225766ad1a696214402370b5aabe 100644
--- a/third_party/txt/src/txt/text_style.h
+++ b/third_party/txt/src/txt/text_style.h
@@ -17,10 +17,11 @@
 #ifndef LIB_TXT_SRC_TEXT_STYLE_H_
 #define LIB_TXT_SRC_TEXT_STYLE_H_
 
+#include <optional>
 #include <string>
 #include <vector>
 
-#include "flutter/display_list/display_list_paint.h"
+#include "flutter/display_list/dl_paint.h"
 #include "font_features.h"
 #include "font_style.h"
 #include "font_weight.h"
@@ -55,12 +56,8 @@ class TextStyle {
   double height = 1.0;
   bool has_height_override = false;
   std::string locale;
-  bool has_background = false;
-  SkPaint background;
-  flutter::DlPaint background_dl;
-  bool has_foreground = false;
-  SkPaint foreground;
-  flutter::DlPaint foreground_dl;
+  std::optional<flutter::DlPaint> background;
+  std::optional<flutter::DlPaint> foreground;
   // An ordered list of shadows where the first shadow will be drawn first (at
   // the bottom).
   std::vector<TextShadow> text_shadows;
diff --git a/third_party/txt/src/txt/typeface_font_asset_provider.cc b/third_party/txt/src/txt/typeface_font_asset_provider.cc
index c62c43265dff2f9e35c95a1096a1b73dda13ec8d..a43acdd60bcee5663bbc3c405e45a8108b89ad8d 100644
--- a/third_party/txt/src/txt/typeface_font_asset_provider.cc
+++ b/third_party/txt/src/txt/typeface_font_asset_provider.cc
@@ -37,14 +37,13 @@ std::string TypefaceFontAssetProvider::GetFamilyName(int index) const {
 }
 
 // |FontAssetProvider|
-SkFontStyleSet* TypefaceFontAssetProvider::MatchFamily(
+sk_sp<SkFontStyleSet> TypefaceFontAssetProvider::MatchFamily(
     const std::string& family_name) {
   auto found = registered_families_.find(CanonicalFamilyName(family_name));
   if (found == registered_families_.end()) {
     return nullptr;
   }
-  sk_sp<TypefaceFontStyleSet> font_style_set = found->second;
-  return font_style_set.release();
+  return found->second;
 }
 
 void TypefaceFontAssetProvider::RegisterTypeface(sk_sp<SkTypeface> typeface) {
@@ -104,15 +103,15 @@ void TypefaceFontStyleSet::getStyle(int index,
   }
 }
 
-SkTypeface* TypefaceFontStyleSet::createTypeface(int i) {
+sk_sp<SkTypeface> TypefaceFontStyleSet::createTypeface(int i) {
   size_t index = i;
   if (index >= typefaces_.size()) {
     return nullptr;
   }
-  return SkRef(typefaces_[index].get());
+  return typefaces_[index];
 }
 
-SkTypeface* TypefaceFontStyleSet::matchStyle(const SkFontStyle& pattern) {
+sk_sp<SkTypeface> TypefaceFontStyleSet::matchStyle(const SkFontStyle& pattern) {
   return matchStyleCSS3(pattern);
 }
 
diff --git a/third_party/txt/src/txt/typeface_font_asset_provider.h b/third_party/txt/src/txt/typeface_font_asset_provider.h
index a2c49122130e4c7cb68e31a32cc96eb8c898621a..6421ad6abfca25c52087d3f9dbeae91637834215 100644
--- a/third_party/txt/src/txt/typeface_font_asset_provider.h
+++ b/third_party/txt/src/txt/typeface_font_asset_provider.h
@@ -42,10 +42,10 @@ class TypefaceFontStyleSet : public SkFontStyleSet {
   void getStyle(int index, SkFontStyle* style, SkString* name) override;
 
   // |SkFontStyleSet|
-  SkTypeface* createTypeface(int index) override;
+  sk_sp<SkTypeface> createTypeface(int index) override;
 
   // |SkFontStyleSet|
-  SkTypeface* matchStyle(const SkFontStyle& pattern) override;
+  sk_sp<SkTypeface> matchStyle(const SkFontStyle& pattern) override;
 
  private:
   std::vector<sk_sp<SkTypeface>> typefaces_;
@@ -70,7 +70,7 @@ class TypefaceFontAssetProvider : public FontAssetProvider {
   std::string GetFamilyName(int index) const override;
 
   // |FontAssetProvider|
-  SkFontStyleSet* MatchFamily(const std::string& family_name) override;
+  sk_sp<SkFontStyleSet> MatchFamily(const std::string& family_name) override;
 
  private:
   std::unordered_map<std::string, sk_sp<TypefaceFontStyleSet>>
diff --git a/third_party/txt/src/utils/JenkinsHash.cpp b/third_party/txt/src/utils/JenkinsHash.cpp
deleted file mode 100644
index 4df6d2a2bb2fb42a1e58e37c68e81e56001edec5..0000000000000000000000000000000000000000
--- a/third_party/txt/src/utils/JenkinsHash.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* Implementation of Jenkins one-at-a-time hash function. These choices are
- * optimized for code size and portability, rather than raw speed. But speed
- * should still be quite good.
- **/
-
-#include <stdlib.h>
-#include <utils/JenkinsHash.h>
-
-namespace android {
-
-#ifdef __clang__
-__attribute__((no_sanitize("integer")))
-#endif
-hash_t
-JenkinsHashWhiten(uint32_t hash) {
-  hash += (hash << 3);
-  hash ^= (hash >> 11);
-  hash += (hash << 15);
-  return hash;
-}
-
-uint32_t JenkinsHashMixBytes(uint32_t hash, const uint8_t* bytes, size_t size) {
-  if (size > UINT32_MAX) {
-    abort();
-  }
-  hash = JenkinsHashMix(hash, (uint32_t)size);
-  size_t i;
-  for (i = 0; i < (size & -4); i += 4) {
-    uint32_t data = bytes[i] | (bytes[i + 1] << 8) | (bytes[i + 2] << 16) |
-                    (bytes[i + 3] << 24);
-    hash = JenkinsHashMix(hash, data);
-  }
-  if (size & 3) {
-    uint32_t data = bytes[i];
-    data |= ((size & 3) > 1) ? (bytes[i + 1] << 8) : 0;
-    data |= ((size & 3) > 2) ? (bytes[i + 2] << 16) : 0;
-    hash = JenkinsHashMix(hash, data);
-  }
-  return hash;
-}
-
-uint32_t JenkinsHashMixShorts(uint32_t hash,
-                              const uint16_t* shorts,
-                              size_t size) {
-  if (size > UINT32_MAX) {
-    abort();
-  }
-  hash = JenkinsHashMix(hash, (uint32_t)size);
-  size_t i;
-  for (i = 0; i < (size & -2); i += 2) {
-    uint32_t data = shorts[i] | (shorts[i + 1] << 16);
-    hash = JenkinsHashMix(hash, data);
-  }
-  if (size & 1) {
-    uint32_t data = shorts[i];
-    hash = JenkinsHashMix(hash, data);
-  }
-  return hash;
-}
-
-}  // namespace android
diff --git a/third_party/txt/src/utils/JenkinsHash.h b/third_party/txt/src/utils/JenkinsHash.h
deleted file mode 100644
index 25a778b4bc0448f6b3e436b6fd8547141dc3fab3..0000000000000000000000000000000000000000
--- a/third_party/txt/src/utils/JenkinsHash.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* Implementation of Jenkins one-at-a-time hash function. These choices are
- * optimized for code size and portability, rather than raw speed. But speed
- * should still be quite good.
- **/
-
-#ifndef ANDROID_JENKINS_HASH_H
-#define ANDROID_JENKINS_HASH_H
-
-#include <utils/TypeHelpers.h>
-
-namespace android {
-
-/* The Jenkins hash of a sequence of 32 bit words A, B, C is:
- * Whiten(Mix(Mix(Mix(0, A), B), C)) */
-
-#ifdef __clang__
-__attribute__((no_sanitize("integer")))
-#endif
-inline uint32_t
-JenkinsHashMix(uint32_t hash, uint32_t data) {
-  hash += data;
-  hash += (hash << 10);
-  hash ^= (hash >> 6);
-  return hash;
-}
-
-hash_t JenkinsHashWhiten(uint32_t hash);
-
-/* Helpful utility functions for hashing data in 32 bit chunks */
-uint32_t JenkinsHashMixBytes(uint32_t hash, const uint8_t* bytes, size_t size);
-
-uint32_t JenkinsHashMixShorts(uint32_t hash,
-                              const uint16_t* shorts,
-                              size_t size);
-
-}  // namespace android
-
-#endif  // ANDROID_JENKINS_HASH_H
diff --git a/third_party/txt/src/utils/LinuxUtils.h b/third_party/txt/src/utils/LinuxUtils.h
deleted file mode 100644
index 212aa9f8bc5af737186e88c9042127f8e3c4f439..0000000000000000000000000000000000000000
--- a/third_party/txt/src/utils/LinuxUtils.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2017 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef LINUX_UTILS_H
-#define LINUX_UTILS_H
-
-#if defined(__linux__)
-#define DISABLE_TEST_LINUX(TEST_NAME) TEST_NAME
-#define FRIEND_TEST_LINUX_DISABLED_EXPANDED(SUITE, TEST_NAME) \
-  FRIEND_TEST(SUITE, TEST_NAME)
-#define FRIEND_TEST_LINUX_DISABLED(SUITE, TEST_NAME) \
-  FRIEND_TEST_LINUX_DISABLED_EXPANDED(SUITE, DISABLE_TEST_LINUX(TEST_NAME))
-
-#define FRIEND_TEST_LINUX_ONLY(SUITE, TEST_NAME) FRIEND_TEST(SUITE, TEST_NAME)
-#define LINUX_ONLY(TEST_NAME) TEST_NAME
-
-#else
-#define DISABLE_TEST_LINUX(TEST_NAME) DISABLED_##TEST_NAME
-#define FRIEND_TEST_LINUX_DISABLED(SUITE, TEST_NAME) \
-  FRIEND_TEST(SUITE, TEST_NAME)
-
-#define LINUX_ONLY(TEST_NAME) DISABLED_##TEST_NAME
-#define FRIEND_TEST_LINUX_ONLY_EXPANDED(SUITE, TEST_NAME) \
-  FRIEND_TEST(SUITE, TEST_NAME)
-#define FRIEND_TEST_LINUX_ONLY(SUITE, TEST_NAME) \
-  FRIEND_TEST_LINUX_ONLY_EXPANDED(SUITE, DISABLE_TEST_LINUX(TEST_NAME))
-#endif  // defined(__linux__)
-
-#endif  // LINUX_UTILS_H
diff --git a/third_party/txt/src/utils/LruCache.h b/third_party/txt/src/utils/LruCache.h
deleted file mode 100644
index cb2adb7ddc895f2ee5c0a0059ffff14a7f90bff2..0000000000000000000000000000000000000000
--- a/third_party/txt/src/utils/LruCache.h
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_UTILS_LRU_CACHE_H
-#define ANDROID_UTILS_LRU_CACHE_H
-
-#include <memory>
-#include <unordered_set>
-
-#include "utils/TypeHelpers.h"  // hash_t
-
-namespace android {
-
-/**
- * GenerationCache callback used when an item is removed
- */
-template <typename EntryKey, typename EntryValue>
-class OnEntryRemoved {
- public:
-  virtual ~OnEntryRemoved(){};
-  virtual void operator()(EntryKey& key, EntryValue& value) = 0;
-};  // class OnEntryRemoved
-
-template <typename TKey, typename TValue>
-class LruCache {
- public:
-  explicit LruCache(uint32_t maxCapacity);
-  virtual ~LruCache();
-
-  enum Capacity {
-    kUnlimitedCapacity,
-  };
-
-  void setOnEntryRemovedListener(OnEntryRemoved<TKey, TValue>* listener);
-  size_t size() const;
-  const TValue& get(const TKey& key);
-  bool put(const TKey& key, const TValue& value);
-  bool remove(const TKey& key);
-  bool removeOldest();
-  void clear();
-  const TValue& peekOldestValue();
-
- private:
-  LruCache(const LruCache& that);  // disallow copy constructor
-
-  // Super class so that we can have entries having only a key reference, for
-  // searches.
-  class KeyedEntry {
-   public:
-    virtual const TKey& getKey() const = 0;
-    // Make sure the right destructor is executed so that keys and values are
-    // deleted.
-    virtual ~KeyedEntry() {}
-  };
-
-  class Entry final : public KeyedEntry {
-   public:
-    TKey key;
-    TValue value;
-    Entry* parent;
-    Entry* child;
-
-    Entry(TKey _key, TValue _value)
-        : key(_key), value(_value), parent(NULL), child(NULL) {}
-    const TKey& getKey() const final { return key; }
-  };
-
-  class EntryForSearch : public KeyedEntry {
-   public:
-    const TKey& key;
-    EntryForSearch(const TKey& key_) : key(key_) {}
-    const TKey& getKey() const final { return key; }
-  };
-
-  struct HashForEntry {
-    size_t operator()(const KeyedEntry* entry) const {
-      return hash_type(entry->getKey());
-    };
-  };
-
-  struct EqualityForHashedEntries {
-    bool operator()(const KeyedEntry* lhs, const KeyedEntry* rhs) const {
-      return lhs->getKey() == rhs->getKey();
-    };
-  };
-
-  // All entries in the set will be Entry*. Using the weaker KeyedEntry as to
-  // allow entries that have only a key reference, for searching.
-  typedef std::
-      unordered_set<KeyedEntry*, HashForEntry, EqualityForHashedEntries>
-          LruCacheSet;
-
-  void attachToCache(Entry& entry);
-  void detachFromCache(Entry& entry);
-
-  typename LruCacheSet::iterator findByKey(const TKey& key) {
-    EntryForSearch entryForSearch(key);
-    typename LruCacheSet::iterator result = mSet->find(&entryForSearch);
-    return result;
-  }
-
-  std::unique_ptr<LruCacheSet> mSet;
-  OnEntryRemoved<TKey, TValue>* mListener;
-  Entry* mOldest;
-  Entry* mYoungest;
-  uint32_t mMaxCapacity;
-  TValue mNullValue;
-
- public:
-  // To be used like:
-  // while (it.next()) {
-  //   it.value(); it.key();
-  // }
-  class Iterator {
-   public:
-    Iterator(const LruCache<TKey, TValue>& cache)
-        : mCache(cache),
-          mIterator(mCache.mSet->begin()),
-          mBeginReturned(false) {}
-
-    bool next() {
-      if (mIterator == mCache.mSet->end()) {
-        return false;
-      }
-      if (!mBeginReturned) {
-        // mIterator has been initialized to the beginning and
-        // hasn't been returned. Do not advance:
-        mBeginReturned = true;
-      } else {
-        std::advance(mIterator, 1);
-      }
-      bool ret = (mIterator != mCache.mSet->end());
-      return ret;
-    }
-
-    const TValue& value() const {
-      // All the elements in the set are of type Entry. See comment in the
-      // definition of LruCacheSet above.
-      return reinterpret_cast<Entry*>(*mIterator)->value;
-    }
-
-    const TKey& key() const { return (*mIterator)->getKey(); }
-
-   private:
-    const LruCache<TKey, TValue>& mCache;
-    typename LruCacheSet::iterator mIterator;
-    bool mBeginReturned;
-  };
-};
-
-// Implementation is here, because it's fully templated
-template <typename TKey, typename TValue>
-LruCache<TKey, TValue>::LruCache(uint32_t maxCapacity)
-    : mSet(new LruCacheSet()),
-      mListener(NULL),
-      mOldest(NULL),
-      mYoungest(NULL),
-      mMaxCapacity(maxCapacity),
-      mNullValue(0) {
-  mSet->max_load_factor(1.0);
-};
-
-template <typename TKey, typename TValue>
-LruCache<TKey, TValue>::~LruCache() {
-  // Need to delete created entries.
-  clear();
-};
-
-template <typename K, typename V>
-void LruCache<K, V>::setOnEntryRemovedListener(OnEntryRemoved<K, V>* listener) {
-  mListener = listener;
-}
-
-template <typename TKey, typename TValue>
-size_t LruCache<TKey, TValue>::size() const {
-  return mSet->size();
-}
-
-template <typename TKey, typename TValue>
-const TValue& LruCache<TKey, TValue>::get(const TKey& key) {
-  typename LruCacheSet::const_iterator find_result = findByKey(key);
-  if (find_result == mSet->end()) {
-    return mNullValue;
-  }
-  // All the elements in the set are of type Entry. See comment in the
-  // definition of LruCacheSet above.
-  Entry* entry = reinterpret_cast<Entry*>(*find_result);
-  detachFromCache(*entry);
-  attachToCache(*entry);
-  return entry->value;
-}
-
-template <typename TKey, typename TValue>
-bool LruCache<TKey, TValue>::put(const TKey& key, const TValue& value) {
-  if (mMaxCapacity != kUnlimitedCapacity && size() >= mMaxCapacity) {
-    removeOldest();
-  }
-
-  if (findByKey(key) != mSet->end()) {
-    return false;
-  }
-
-  Entry* newEntry = new Entry(key, value);
-  mSet->insert(newEntry);
-  attachToCache(*newEntry);
-  return true;
-}
-
-template <typename TKey, typename TValue>
-bool LruCache<TKey, TValue>::remove(const TKey& key) {
-  typename LruCacheSet::const_iterator find_result = findByKey(key);
-  if (find_result == mSet->end()) {
-    return false;
-  }
-  // All the elements in the set are of type Entry. See comment in the
-  // definition of LruCacheSet above.
-  Entry* entry = reinterpret_cast<Entry*>(*find_result);
-  mSet->erase(entry);
-  if (mListener) {
-    (*mListener)(entry->key, entry->value);
-  }
-  detachFromCache(*entry);
-  delete entry;
-  return true;
-}
-
-template <typename TKey, typename TValue>
-bool LruCache<TKey, TValue>::removeOldest() {
-  if (mOldest != NULL) {
-    return remove(mOldest->key);
-    // TODO: should probably abort if false
-  }
-  return false;
-}
-
-template <typename TKey, typename TValue>
-const TValue& LruCache<TKey, TValue>::peekOldestValue() {
-  if (mOldest) {
-    return mOldest->value;
-  }
-  return mNullValue;
-}
-
-template <typename TKey, typename TValue>
-void LruCache<TKey, TValue>::clear() {
-  if (mListener) {
-    for (Entry* p = mOldest; p != NULL; p = p->child) {
-      (*mListener)(p->key, p->value);
-    }
-  }
-  mYoungest = NULL;
-  mOldest = NULL;
-  for (auto entry : *mSet.get()) {
-    delete entry;
-  }
-  mSet->clear();
-}
-
-template <typename TKey, typename TValue>
-void LruCache<TKey, TValue>::attachToCache(Entry& entry) {
-  if (mYoungest == NULL) {
-    mYoungest = mOldest = &entry;
-  } else {
-    entry.parent = mYoungest;
-    mYoungest->child = &entry;
-    mYoungest = &entry;
-  }
-}
-
-template <typename TKey, typename TValue>
-void LruCache<TKey, TValue>::detachFromCache(Entry& entry) {
-  if (entry.parent != NULL) {
-    entry.parent->child = entry.child;
-  } else {
-    mOldest = entry.child;
-  }
-  if (entry.child != NULL) {
-    entry.child->parent = entry.parent;
-  } else {
-    mYoungest = entry.parent;
-  }
-
-  entry.parent = NULL;
-  entry.child = NULL;
-}
-
-}  // namespace android
-#endif  // ANDROID_UTILS_LRU_CACHE_H
diff --git a/third_party/txt/src/utils/MacUtils.h b/third_party/txt/src/utils/MacUtils.h
deleted file mode 100644
index a4be25142e9d2f80d395991723aef3f43a04114c..0000000000000000000000000000000000000000
--- a/third_party/txt/src/utils/MacUtils.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2017 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef MAC_UTILS_H
-#define MAC_UTILS_H
-
-#if defined(__APPLE__)
-#define DISABLE_TEST_MAC(TEST_NAME) DISABLED_##TEST_NAME
-#define FRIEND_TEST_MAC_DISABLED_EXPANDED(SUITE, TEST_NAME) \
-  FRIEND_TEST(SUITE, TEST_NAME)
-#define FRIEND_TEST_MAC_DISABLED(SUITE, TEST_NAME) \
-  FRIEND_TEST_MAC_DISABLED_EXPANDED(SUITE, DISABLE_TEST_MAC(TEST_NAME))
-
-#define FRIEND_TEST_MAC_ONLY(SUITE, TEST_NAME) FRIEND_TEST(SUITE, TEST_NAME)
-#define MAC_ONLY(TEST_NAME) TEST_NAME
-
-#else
-#define DISABLE_TEST_MAC(TEST_NAME) TEST_NAME
-#define FRIEND_TEST_MAC_DISABLED(SUITE, TEST_NAME) FRIEND_TEST(SUITE, TEST_NAME)
-
-#define MAC_ONLY(TEST_NAME) DISABLED_##TEST_NAME
-#define FRIEND_TEST_MAC_ONLY_EXPANDED(SUITE, TEST_NAME) \
-  FRIEND_TEST(SUITE, TEST_NAME)
-#define FRIEND_TEST_MAC_ONLY(SUITE, TEST_NAME) \
-  FRIEND_TEST_MAC_ONLY_EXPANDED(SUITE, DISABLE_TEST_MAC(TEST_NAME))
-#endif  // defined(__APPLE__)
-#endif  // MAC_UTILS_H
diff --git a/third_party/txt/src/utils/TypeHelpers.h b/third_party/txt/src/utils/TypeHelpers.h
deleted file mode 100644
index 9bd10a4ee1b96bf359c249d1ea8204b9cb80ee32..0000000000000000000000000000000000000000
--- a/third_party/txt/src/utils/TypeHelpers.h
+++ /dev/null
@@ -1,371 +0,0 @@
-/*
- * Copyright (C) 2005 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_TYPE_HELPERS_H
-#define ANDROID_TYPE_HELPERS_H
-
-#include <sys/types.h>
-
-#include <cstdint>
-#include <cstring>
-#include <new>
-#include <type_traits>
-
-// ---------------------------------------------------------------------------
-
-namespace android {
-
-/*
- * Types traits
- */
-
-template <typename T>
-struct trait_trivial_ctor {
-  enum { value = false };
-};
-template <typename T>
-struct trait_trivial_dtor {
-  enum { value = false };
-};
-template <typename T>
-struct trait_trivial_copy {
-  enum { value = false };
-};
-template <typename T>
-struct trait_trivial_move {
-  enum { value = false };
-};
-template <typename T>
-struct trait_pointer {
-  enum { value = false };
-};
-template <typename T>
-struct trait_pointer<T*> {
-  enum { value = true };
-};
-
-template <typename TYPE>
-struct traits {
-  enum {
-    // whether this type is a pointer
-    is_pointer = trait_pointer<TYPE>::value,
-    // whether this type's constructor is a no-op
-    has_trivial_ctor = is_pointer || trait_trivial_ctor<TYPE>::value,
-    // whether this type's destructor is a no-op
-    has_trivial_dtor = is_pointer || trait_trivial_dtor<TYPE>::value,
-    // whether this type type can be copy-constructed with memcpy
-    has_trivial_copy = is_pointer || trait_trivial_copy<TYPE>::value,
-    // whether this type can be moved with memmove
-    has_trivial_move = is_pointer || trait_trivial_move<TYPE>::value
-  };
-};
-
-template <typename T, typename U>
-struct aggregate_traits {
-  enum {
-    is_pointer = false,
-    has_trivial_ctor =
-        traits<T>::has_trivial_ctor && traits<U>::has_trivial_ctor,
-    has_trivial_dtor =
-        traits<T>::has_trivial_dtor && traits<U>::has_trivial_dtor,
-    has_trivial_copy =
-        traits<T>::has_trivial_copy && traits<U>::has_trivial_copy,
-    has_trivial_move =
-        traits<T>::has_trivial_move && traits<U>::has_trivial_move
-  };
-};
-
-#define ANDROID_TRIVIAL_CTOR_TRAIT(T) \
-  template <>                         \
-  struct trait_trivial_ctor<T> {      \
-    enum { value = true };            \
-  };
-
-#define ANDROID_TRIVIAL_DTOR_TRAIT(T) \
-  template <>                         \
-  struct trait_trivial_dtor<T> {      \
-    enum { value = true };            \
-  };
-
-#define ANDROID_TRIVIAL_COPY_TRAIT(T) \
-  template <>                         \
-  struct trait_trivial_copy<T> {      \
-    enum { value = true };            \
-  };
-
-#define ANDROID_TRIVIAL_MOVE_TRAIT(T) \
-  template <>                         \
-  struct trait_trivial_move<T> {      \
-    enum { value = true };            \
-  };
-
-#define ANDROID_BASIC_TYPES_TRAITS(T) \
-  ANDROID_TRIVIAL_CTOR_TRAIT(T)       \
-  ANDROID_TRIVIAL_DTOR_TRAIT(T)       \
-  ANDROID_TRIVIAL_COPY_TRAIT(T)       \
-  ANDROID_TRIVIAL_MOVE_TRAIT(T)
-
-// ---------------------------------------------------------------------------
-
-/*
- * basic types traits
- */
-
-ANDROID_BASIC_TYPES_TRAITS(void)
-ANDROID_BASIC_TYPES_TRAITS(bool)
-ANDROID_BASIC_TYPES_TRAITS(char)
-ANDROID_BASIC_TYPES_TRAITS(unsigned char)
-ANDROID_BASIC_TYPES_TRAITS(short)
-ANDROID_BASIC_TYPES_TRAITS(unsigned short)
-ANDROID_BASIC_TYPES_TRAITS(int)
-ANDROID_BASIC_TYPES_TRAITS(unsigned int)
-ANDROID_BASIC_TYPES_TRAITS(long)
-ANDROID_BASIC_TYPES_TRAITS(unsigned long)
-ANDROID_BASIC_TYPES_TRAITS(long long)
-ANDROID_BASIC_TYPES_TRAITS(unsigned long long)
-ANDROID_BASIC_TYPES_TRAITS(float)
-ANDROID_BASIC_TYPES_TRAITS(double)
-
-// ---------------------------------------------------------------------------
-
-/*
- * compare and order types
- */
-
-template <typename TYPE>
-inline int strictly_order_type(const TYPE& lhs, const TYPE& rhs) {
-  return (lhs < rhs) ? 1 : 0;
-}
-
-template <typename TYPE>
-inline int compare_type(const TYPE& lhs, const TYPE& rhs) {
-  return strictly_order_type(rhs, lhs) - strictly_order_type(lhs, rhs);
-}
-
-/*
- * create, destroy, copy and move types...
- */
-
-template <typename TYPE>
-inline void construct_type(TYPE* p, size_t n) {
-  if (!traits<TYPE>::has_trivial_ctor) {
-    while (n > 0) {
-      n--;
-      new (p++) TYPE;
-    }
-  }
-}
-
-template <typename TYPE>
-inline void destroy_type(TYPE* p, size_t n) {
-  if (!traits<TYPE>::has_trivial_dtor) {
-    while (n > 0) {
-      n--;
-      p->~TYPE();
-      p++;
-    }
-  }
-}
-
-template <typename TYPE>
-typename std::enable_if<traits<TYPE>::has_trivial_copy>::type inline copy_type(
-    TYPE* d,
-    const TYPE* s,
-    size_t n) {
-  memcpy(d, s, n * sizeof(TYPE));
-}
-
-template <typename TYPE>
-typename std::enable_if<!traits<TYPE>::has_trivial_copy>::type inline copy_type(
-    TYPE* d,
-    const TYPE* s,
-    size_t n) {
-  while (n > 0) {
-    n--;
-    new (d) TYPE(*s);
-    d++, s++;
-  }
-}
-
-template <typename TYPE>
-inline void splat_type(TYPE* where, const TYPE* what, size_t n) {
-  if (!traits<TYPE>::has_trivial_copy) {
-    while (n > 0) {
-      n--;
-      new (where) TYPE(*what);
-      where++;
-    }
-  } else {
-    while (n > 0) {
-      n--;
-      *where++ = *what;
-    }
-  }
-}
-
-template <typename TYPE>
-struct use_trivial_move
-    : public std::integral_constant<bool,
-                                    (traits<TYPE>::has_trivial_dtor &&
-                                     traits<TYPE>::has_trivial_copy) ||
-                                        traits<TYPE>::has_trivial_move> {};
-
-template <typename TYPE>
-typename std::enable_if<use_trivial_move<TYPE>::value>::
-    type inline move_forward_type(TYPE* d, const TYPE* s, size_t n = 1) {
-  memmove(d, s, n * sizeof(TYPE));
-}
-
-template <typename TYPE>
-typename std::enable_if<!use_trivial_move<TYPE>::value>::
-    type inline move_forward_type(TYPE* d, const TYPE* s, size_t n = 1) {
-  d += n;
-  s += n;
-  while (n > 0) {
-    n--;
-    --d, --s;
-    if (!traits<TYPE>::has_trivial_copy) {
-      new (d) TYPE(*s);
-    } else {
-      *d = *s;
-    }
-    if (!traits<TYPE>::has_trivial_dtor) {
-      s->~TYPE();
-    }
-  }
-}
-
-template <typename TYPE>
-typename std::enable_if<use_trivial_move<TYPE>::value>::
-    type inline move_backward_type(TYPE* d, const TYPE* s, size_t n = 1) {
-  memmove(d, s, n * sizeof(TYPE));
-}
-
-template <typename TYPE>
-typename std::enable_if<!use_trivial_move<TYPE>::value>::
-    type inline move_backward_type(TYPE* d, const TYPE* s, size_t n = 1) {
-  while (n > 0) {
-    n--;
-    if (!traits<TYPE>::has_trivial_copy) {
-      new (d) TYPE(*s);
-    } else {
-      *d = *s;
-    }
-    if (!traits<TYPE>::has_trivial_dtor) {
-      s->~TYPE();
-    }
-    d++, s++;
-  }
-}
-
-// ---------------------------------------------------------------------------
-
-/*
- * a key/value pair
- */
-
-template <typename KEY, typename VALUE>
-struct key_value_pair_t {
-  typedef KEY key_t;
-  typedef VALUE value_t;
-
-  KEY key;
-  VALUE value;
-  key_value_pair_t() {}
-  key_value_pair_t(const key_value_pair_t& o) : key(o.key), value(o.value) {}
-  key_value_pair_t& operator=(const key_value_pair_t& o) {
-    key = o.key;
-    value = o.value;
-    return *this;
-  }
-  key_value_pair_t(const KEY& k, const VALUE& v) : key(k), value(v) {}
-  explicit key_value_pair_t(const KEY& k) : key(k) {}
-  inline bool operator<(const key_value_pair_t& o) const {
-    return strictly_order_type(key, o.key);
-  }
-  inline const KEY& getKey() const { return key; }
-  inline const VALUE& getValue() const { return value; }
-};
-
-template <typename K, typename V>
-struct trait_trivial_ctor<key_value_pair_t<K, V>> {
-  enum { value = aggregate_traits<K, V>::has_trivial_ctor };
-};
-template <typename K, typename V>
-struct trait_trivial_dtor<key_value_pair_t<K, V>> {
-  enum { value = aggregate_traits<K, V>::has_trivial_dtor };
-};
-template <typename K, typename V>
-struct trait_trivial_copy<key_value_pair_t<K, V>> {
-  enum { value = aggregate_traits<K, V>::has_trivial_copy };
-};
-template <typename K, typename V>
-struct trait_trivial_move<key_value_pair_t<K, V>> {
-  enum { value = aggregate_traits<K, V>::has_trivial_move };
-};
-
-// ---------------------------------------------------------------------------
-
-/*
- * Hash codes.
- */
-typedef uint32_t hash_t;
-
-template <typename TKey>
-hash_t hash_type(const TKey& key);
-
-/* Built-in hash code specializations */
-#define ANDROID_INT32_HASH(T)               \
-  template <>                               \
-  inline hash_t hash_type(const T& value) { \
-    return hash_t(value);                   \
-  }
-#define ANDROID_INT64_HASH(T)               \
-  template <>                               \
-  inline hash_t hash_type(const T& value) { \
-    return hash_t((value >> 32) ^ value);   \
-  }
-#define ANDROID_REINTERPRET_HASH(T, R)                                 \
-  template <>                                                          \
-  inline hash_t hash_type(const T& value) {                            \
-    R newValue;                                                        \
-    static_assert(sizeof(newValue) == sizeof(value), "size mismatch"); \
-    memcpy(&newValue, &value, sizeof(newValue));                       \
-    return hash_type(newValue);                                        \
-  }
-
-ANDROID_INT32_HASH(bool)
-ANDROID_INT32_HASH(int8_t)
-ANDROID_INT32_HASH(uint8_t)
-ANDROID_INT32_HASH(int16_t)
-ANDROID_INT32_HASH(uint16_t)
-ANDROID_INT32_HASH(int32_t)
-ANDROID_INT32_HASH(uint32_t)
-ANDROID_INT64_HASH(int64_t)
-ANDROID_INT64_HASH(uint64_t)
-ANDROID_REINTERPRET_HASH(float, uint32_t)
-ANDROID_REINTERPRET_HASH(double, uint64_t)
-
-template <typename T>
-inline hash_t hash_type(T* const& value) {
-  return hash_type(uintptr_t(value));
-}
-
-};  // namespace android
-
-// ---------------------------------------------------------------------------
-
-#endif  // ANDROID_TYPE_HELPERS_H
diff --git a/third_party/txt/src/utils/WindowsUtils.h b/third_party/txt/src/utils/WindowsUtils.h
deleted file mode 100644
index 9c1af86781f01139cd7d064713cc49b91bda056d..0000000000000000000000000000000000000000
--- a/third_party/txt/src/utils/WindowsUtils.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2017 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef WINDOWS_UTILS_H
-#define WINDOWS_UTILS_H
-
-#if defined(_WIN32)
-#define DISABLE_TEST_WINDOWS(TEST_NAME) DISABLED_##TEST_NAME
-#define FRIEND_TEST_WINDOWS_DISABLED_EXPANDED(SUITE, TEST_NAME) \
-  FRIEND_TEST(SUITE, TEST_NAME)
-#define FRIEND_TEST_WINDOWS_DISABLED(SUITE, TEST_NAME) \
-  FRIEND_TEST_WINDOWS_DISABLED_EXPANDED(SUITE, DISABLE_TEST_WINDOWS(TEST_NAME))
-
-#define FRIEND_TEST_WINDOWS_ONLY(SUITE, TEST_NAME) FRIEND_TEST(SUITE, TEST_NAME)
-#define WINDOWS_ONLY(TEST_NAME) TEST_NAME
-
-#define NOMINMAX
-#include <BaseTsd.h>
-#include <intrin.h>
-#include <windows.h>
-
-#undef ERROR
-
-inline unsigned int clz_win(unsigned int num) {
-  unsigned long r = 0;
-  _BitScanReverse(&r, num);
-  return r;
-}
-
-inline unsigned int clzl_win(unsigned long num) {
-  unsigned long r = 0;
-#if defined(_WIN64)
-  _BitScanReverse64(&r, num);
-#else
-  _BitScanReverse(&r, num);
-#endif
-  return r;
-}
-
-inline unsigned int ctz_win(unsigned int num) {
-  unsigned long r = 0;
-  _BitScanForward(&r, num);
-  return r;
-}
-
-typedef SSIZE_T ssize_t;
-
-#else
-#define DISABLE_TEST_WINDOWS(TEST_NAME) TEST_NAME
-#define FRIEND_TEST_WINDOWS_DISABLED(SUITE, TEST_NAME) \
-  FRIEND_TEST(SUITE, TEST_NAME)
-
-#define WINDOWS_ONLY(TEST_NAME) DISABLED_##TEST_NAME
-#define FRIEND_TEST_WINDOWS_ONLY_EXPANDED(SUITE, TEST_NAME) \
-  FRIEND_TEST(SUITE, TEST_NAME)
-#define FRIEND_TEST_WINDOWS_ONLY(SUITE, TEST_NAME) \
-  FRIEND_TEST_WINDOWS_ONLY_EXPANDED(SUITE, DISABLE_TEST_WINDOWS(TEST_NAME))
-#endif  // defined(_WIN32)
-#endif  // WINDOWS_UTILS_H
diff --git a/third_party/txt/tests/CmapCoverageTest.cpp b/third_party/txt/tests/CmapCoverageTest.cpp
deleted file mode 100644
index b85a9e07775635b913b30e2f5df01596af104916..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/CmapCoverageTest.cpp
+++ /dev/null
@@ -1,659 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <random>
-
-#include <gtest/gtest.h>
-#include <log/log.h>
-#include <minikin/CmapCoverage.h>
-#include <minikin/SparseBitSet.h>
-#include <utils/WindowsUtils.h>
-
-namespace minikin {
-
-size_t writeU16(uint16_t x, uint8_t* out, size_t offset) {
-  out[offset] = x >> 8;
-  out[offset + 1] = x;
-  return offset + 2;
-}
-
-size_t writeI16(int16_t sx, uint8_t* out, size_t offset) {
-  return writeU16(static_cast<uint16_t>(sx), out, offset);
-}
-
-size_t writeU32(uint32_t x, uint8_t* out, size_t offset) {
-  out[offset] = x >> 24;
-  out[offset + 1] = x >> 16;
-  out[offset + 2] = x >> 8;
-  out[offset + 3] = x;
-  return offset + 4;
-}
-
-// Returns valid cmap format 4 table contents. All glyph ID is same value as
-// code point. (e.g. 'a' (U+0061) is mapped to Glyph ID = 0x0061). 'range'
-// should be specified with inclusive-inclusive values.
-static std::vector<uint8_t> buildCmapFormat4Table(
-    const std::vector<uint16_t>& ranges) {
-  uint16_t segmentCount = ranges.size() / 2 + 1 /* +1 for end marker */;
-
-  const size_t numOfUint16 =
-      8 /* format, length, languages, segCountX2, searchRange, entrySelector,
-           rangeShift, pad */
-      + segmentCount * 4 /* endCount, startCount, idRange, idRangeOffset */;
-  const size_t finalLength = sizeof(uint16_t) * numOfUint16;
-
-  std::vector<uint8_t> out(finalLength);
-  size_t head = 0;
-  head = writeU16(4, out.data(), head);            // format
-  head = writeU16(finalLength, out.data(), head);  // length
-  head = writeU16(0, out.data(), head);            // language
-
-  const uint16_t searchRange =
-      2 * (1 << static_cast<int>(floor(log2(segmentCount))));
-
-  head = writeU16(segmentCount * 2, out.data(), head);  // segCountX2
-  head = writeU16(searchRange, out.data(), head);       // searchRange
-#if defined(_WIN32)
-  head = writeU16(ctz_win(searchRange) - 1, out.data(), head);
-#else
-  head = writeU16(__builtin_ctz(searchRange) - 1, out.data(),
-                  head);  // entrySelector
-#endif
-  head =
-      writeU16(segmentCount * 2 - searchRange, out.data(), head);  // rangeShift
-
-  size_t endCountHead = head;
-  size_t startCountHead =
-      head + segmentCount * sizeof(uint16_t) + 2 /* padding */;
-  size_t idDeltaHead = startCountHead + segmentCount * sizeof(uint16_t);
-  size_t idRangeOffsetHead = idDeltaHead + segmentCount * sizeof(uint16_t);
-
-  for (size_t i = 0; i < ranges.size() / 2; ++i) {
-    const uint16_t begin = ranges[i * 2];
-    const uint16_t end = ranges[i * 2 + 1];
-    startCountHead = writeU16(begin, out.data(), startCountHead);
-    endCountHead = writeU16(end, out.data(), endCountHead);
-    // map glyph ID as the same value of the code point.
-    idDeltaHead = writeU16(0, out.data(), idDeltaHead);
-    idRangeOffsetHead =
-        writeU16(0 /* we don't use this */, out.data(), idRangeOffsetHead);
-  }
-
-  // fill end marker
-  endCountHead = writeU16(0xFFFF, out.data(), endCountHead);
-  startCountHead = writeU16(0xFFFF, out.data(), startCountHead);
-  idDeltaHead = writeU16(1, out.data(), idDeltaHead);
-  idRangeOffsetHead = writeU16(0, out.data(), idRangeOffsetHead);
-  LOG_ALWAYS_FATAL_IF(endCountHead > finalLength);
-  LOG_ALWAYS_FATAL_IF(startCountHead > finalLength);
-  LOG_ALWAYS_FATAL_IF(idDeltaHead > finalLength);
-  LOG_ALWAYS_FATAL_IF(idRangeOffsetHead != finalLength);
-  return out;
-}
-
-// Returns valid cmap format 4 table contents. All glyph ID is same value as
-// code point. (e.g. 'a' (U+0061) is mapped to Glyph ID = 0x0061). 'range'
-// should be specified with inclusive-inclusive values.
-static std::vector<uint8_t> buildCmapFormat12Table(
-    const std::vector<uint32_t>& ranges) {
-  uint32_t numGroups = ranges.size() / 2;
-
-  const size_t finalLength =
-      2 /* format */ + 2 /* reserved */ + 4 /* length */ + 4 /* languages */ +
-      4 /* numGroups */ + 12 /* size of a group */ * numGroups;
-
-  std::vector<uint8_t> out(finalLength);
-  size_t head = 0;
-  head = writeU16(12, out.data(), head);           // format
-  head = writeU16(0, out.data(), head);            // reserved
-  head = writeU32(finalLength, out.data(), head);  // length
-  head = writeU32(0, out.data(), head);            // language
-  head = writeU32(numGroups, out.data(), head);    // numGroups
-
-  for (uint32_t i = 0; i < numGroups; ++i) {
-    const uint32_t start = ranges[2 * i];
-    const uint32_t end = ranges[2 * i + 1];
-    head = writeU32(start, out.data(), head);
-    head = writeU32(end, out.data(), head);
-    // map glyph ID as the same value of the code point.
-    // TODO: Use glyph IDs lower than 65535.
-    // Cmap can store 32 bit glyph ID but due to the size of numGlyph, a font
-    // file can contain up to 65535 glyphs in a file.
-    head = writeU32(start, out.data(), head);
-  }
-
-  LOG_ALWAYS_FATAL_IF(head != finalLength);
-  return out;
-}
-
-class CmapBuilder {
- public:
-  static constexpr size_t kEncodingTableHead = 4;
-  static constexpr size_t kEncodingTableSize = 8;
-
-  CmapBuilder(int numTables) : mNumTables(numTables), mCurrentTableIndex(0) {
-    const size_t headerSize =
-        2 /* version */ + 2 /* numTables */ + kEncodingTableSize * numTables;
-    out.resize(headerSize);
-    writeU16(0, out.data(), 0);
-    writeU16(numTables, out.data(), 2);
-  }
-
-  void appendTable(uint16_t platformId,
-                   uint16_t encodingId,
-                   const std::vector<uint8_t>& table) {
-    appendEncodingTable(platformId, encodingId, out.size());
-    out.insert(out.end(), table.begin(), table.end());
-  }
-
-  // TODO: Introduce Format 14 table builder.
-
-  std::vector<uint8_t> build() {
-    LOG_ALWAYS_FATAL_IF(mCurrentTableIndex != mNumTables);
-    return out;
-  }
-
-  // Helper functions.
-  static std::vector<uint8_t> buildSingleFormat4Cmap(
-      uint16_t platformId,
-      uint16_t encodingId,
-      const std::vector<uint16_t>& ranges) {
-    CmapBuilder builder(1);
-    builder.appendTable(platformId, encodingId, buildCmapFormat4Table(ranges));
-    return builder.build();
-  }
-
-  static std::vector<uint8_t> buildSingleFormat12Cmap(
-      uint16_t platformId,
-      uint16_t encodingId,
-      const std::vector<uint32_t>& ranges) {
-    CmapBuilder builder(1);
-    builder.appendTable(platformId, encodingId, buildCmapFormat12Table(ranges));
-    return builder.build();
-  }
-
- private:
-  void appendEncodingTable(uint16_t platformId,
-                           uint16_t encodingId,
-                           uint32_t offset) {
-    LOG_ALWAYS_FATAL_IF(mCurrentTableIndex == mNumTables);
-
-    const size_t currentEncodingTableHead =
-        kEncodingTableHead + mCurrentTableIndex * kEncodingTableSize;
-    size_t head = writeU16(platformId, out.data(), currentEncodingTableHead);
-    head = writeU16(encodingId, out.data(), head);
-    head = writeU32(offset, out.data(), head);
-    LOG_ALWAYS_FATAL_IF((head - currentEncodingTableHead) !=
-                        kEncodingTableSize);
-    mCurrentTableIndex++;
-  }
-
-  int mNumTables;
-  int mCurrentTableIndex;
-  std::vector<uint8_t> out;
-};
-
-TEST(CmapCoverageTest, SingleFormat4_brokenCmap) {
-  bool has_cmap_format_14_subtable = false;
-  {
-    SCOPED_TRACE("Reading beyond buffer size - Too small cmap size");
-    std::vector<uint8_t> cmap = CmapBuilder::buildSingleFormat4Cmap(
-        0, 0, std::vector<uint16_t>({'a', 'a'}));
-
-    SparseBitSet coverage = CmapCoverage::getCoverage(
-        cmap.data(), 3 /* too small */, &has_cmap_format_14_subtable);
-    EXPECT_EQ(0U, coverage.length());
-    EXPECT_FALSE(has_cmap_format_14_subtable);
-  }
-  {
-    SCOPED_TRACE(
-        "Reading beyond buffer size - space needed for tables goes beyond cmap "
-        "size");
-    std::vector<uint8_t> cmap = CmapBuilder::buildSingleFormat4Cmap(
-        0, 0, std::vector<uint16_t>({'a', 'a'}));
-
-    writeU16(1000, cmap.data(), 2 /* offset of num tables in cmap header */);
-    SparseBitSet coverage = CmapCoverage::getCoverage(
-        cmap.data(), cmap.size(), &has_cmap_format_14_subtable);
-    EXPECT_EQ(0U, coverage.length());
-    EXPECT_FALSE(has_cmap_format_14_subtable);
-  }
-  {
-    SCOPED_TRACE(
-        "Reading beyond buffer size - Invalid offset in encoding table");
-    std::vector<uint8_t> cmap = CmapBuilder::buildSingleFormat4Cmap(
-        0, 0, std::vector<uint16_t>({'a', 'a'}));
-
-    writeU16(1000, cmap.data(),
-             8 /* offset of the offset in the first encoding record */);
-    SparseBitSet coverage = CmapCoverage::getCoverage(
-        cmap.data(), cmap.size(), &has_cmap_format_14_subtable);
-    EXPECT_EQ(0U, coverage.length());
-    EXPECT_FALSE(has_cmap_format_14_subtable);
-  }
-}
-
-TEST(CmapCoverageTest, SingleFormat4) {
-  bool has_cmap_format_14_subtable = false;
-  struct TestCast {
-    std::string testTitle;
-    uint16_t platformId;
-    uint16_t encodingId;
-  } TEST_CASES[] = {
-      {"Platform 0, Encoding 0", 0, 0}, {"Platform 0, Encoding 1", 0, 1},
-      {"Platform 0, Encoding 2", 0, 2}, {"Platform 0, Encoding 3", 0, 3},
-      {"Platform 3, Encoding 1", 3, 1},
-  };
-
-  for (const auto& testCase : TEST_CASES) {
-    SCOPED_TRACE(testCase.testTitle.c_str());
-    std::vector<uint8_t> cmap = CmapBuilder::buildSingleFormat4Cmap(
-        testCase.platformId, testCase.encodingId,
-        std::vector<uint16_t>({'a', 'a'}));
-    SparseBitSet coverage = CmapCoverage::getCoverage(
-        cmap.data(), cmap.size(), &has_cmap_format_14_subtable);
-    EXPECT_TRUE(coverage.get('a'));
-    EXPECT_FALSE(coverage.get('b'));
-    EXPECT_FALSE(has_cmap_format_14_subtable);
-  }
-}
-
-TEST(CmapCoverageTest, SingleFormat12) {
-  bool has_cmap_format_14_subtable = false;
-
-  struct TestCast {
-    std::string testTitle;
-    uint16_t platformId;
-    uint16_t encodingId;
-  } TEST_CASES[] = {
-      {"Platform 0, Encoding 4", 0, 4},
-      {"Platform 0, Encoding 6", 0, 6},
-      {"Platform 3, Encoding 10", 3, 10},
-  };
-
-  for (const auto& testCase : TEST_CASES) {
-    SCOPED_TRACE(testCase.testTitle.c_str());
-    std::vector<uint8_t> cmap = CmapBuilder::buildSingleFormat12Cmap(
-        testCase.platformId, testCase.encodingId,
-        std::vector<uint32_t>({'a', 'a'}));
-    SparseBitSet coverage = CmapCoverage::getCoverage(
-        cmap.data(), cmap.size(), &has_cmap_format_14_subtable);
-    EXPECT_TRUE(coverage.get('a'));
-    EXPECT_FALSE(coverage.get('b'));
-    EXPECT_FALSE(has_cmap_format_14_subtable);
-  }
-}
-
-TEST(CmapCoverageTest, Format12_beyondTheUnicodeLimit) {
-  bool has_cmap_format_14_subtable = false;
-  {
-    SCOPED_TRACE(
-        "Starting range is out of Unicode code point. Should be ignored.");
-    std::vector<uint8_t> cmap = CmapBuilder::buildSingleFormat12Cmap(
-        0, 0, std::vector<uint32_t>({'a', 'a', 0x110000, 0x110000}));
-
-    SparseBitSet coverage = CmapCoverage::getCoverage(
-        cmap.data(), cmap.size(), &has_cmap_format_14_subtable);
-    EXPECT_TRUE(coverage.get('a'));
-    EXPECT_FALSE(coverage.get(0x110000));
-    EXPECT_FALSE(has_cmap_format_14_subtable);
-  }
-  {
-    SCOPED_TRACE(
-        "Ending range is out of Unicode code point. Should be ignored.");
-    std::vector<uint8_t> cmap = CmapBuilder::buildSingleFormat12Cmap(
-        0, 0, std::vector<uint32_t>({'a', 'a', 0x10FF00, 0x110000}));
-
-    SparseBitSet coverage = CmapCoverage::getCoverage(
-        cmap.data(), cmap.size(), &has_cmap_format_14_subtable);
-    EXPECT_TRUE(coverage.get('a'));
-    EXPECT_TRUE(coverage.get(0x10FF00));
-    EXPECT_TRUE(coverage.get(0x10FFFF));
-    EXPECT_FALSE(coverage.get(0x110000));
-    EXPECT_FALSE(has_cmap_format_14_subtable);
-  }
-}
-
-TEST(CmapCoverageTest, notSupportedEncodings) {
-  bool has_cmap_format_14_subtable = false;
-
-  struct TestCast {
-    std::string testTitle;
-    uint16_t platformId;
-    uint16_t encodingId;
-  } TEST_CASES[] = {
-      // Any encodings with platform 2 is not supported.
-      {"Platform 2, Encoding 0", 2, 0},
-      {"Platform 2, Encoding 1", 2, 1},
-      {"Platform 2, Encoding 2", 2, 2},
-      {"Platform 2, Encoding 3", 2, 3},
-      // UCS-2 or UCS-4 are supported on Platform == 3. Others are not
-      // supported.
-      {"Platform 3, Encoding 0", 3, 0},  // Symbol
-      {"Platform 3, Encoding 2", 3, 2},  // ShiftJIS
-      {"Platform 3, Encoding 3", 3, 3},  // RPC
-      {"Platform 3, Encoding 4", 3, 4},  // Big5
-      {"Platform 3, Encoding 5", 3, 5},  // Wansung
-      {"Platform 3, Encoding 6", 3, 6},  // Johab
-      {"Platform 3, Encoding 7", 3, 7},  // Reserved
-      {"Platform 3, Encoding 8", 3, 8},  // Reserved
-      {"Platform 3, Encoding 9", 3, 9},  // Reserved
-      // Uknown platforms
-      {"Platform 4, Encoding 0", 4, 0},
-      {"Platform 5, Encoding 1", 5, 1},
-      {"Platform 6, Encoding 0", 6, 0},
-      {"Platform 7, Encoding 1", 7, 1},
-  };
-
-  for (const auto& testCase : TEST_CASES) {
-    SCOPED_TRACE(testCase.testTitle.c_str());
-    CmapBuilder builder(1);
-    std::vector<uint8_t> cmap = CmapBuilder::buildSingleFormat4Cmap(
-        testCase.platformId, testCase.encodingId,
-        std::vector<uint16_t>({'a', 'a'}));
-    SparseBitSet coverage = CmapCoverage::getCoverage(
-        cmap.data(), cmap.size(), &has_cmap_format_14_subtable);
-    EXPECT_EQ(0U, coverage.length());
-    EXPECT_FALSE(has_cmap_format_14_subtable);
-  }
-}
-
-TEST(CmapCoverageTest, brokenFormat4Table) {
-  bool has_cmap_format_14_subtable = false;
-  {
-    SCOPED_TRACE("Too small table cmap size");
-    std::vector<uint8_t> table =
-        buildCmapFormat4Table(std::vector<uint16_t>({'a', 'a'}));
-    table.resize(2);  // Remove trailing data.
-
-    CmapBuilder builder(1);
-    builder.appendTable(0, 0, table);
-    std::vector<uint8_t> cmap = builder.build();
-
-    SparseBitSet coverage = CmapCoverage::getCoverage(
-        cmap.data(), cmap.size(), &has_cmap_format_14_subtable);
-    EXPECT_EQ(0U, coverage.length());
-    EXPECT_FALSE(has_cmap_format_14_subtable);
-  }
-  {
-    SCOPED_TRACE("Too many segments");
-    std::vector<uint8_t> table =
-        buildCmapFormat4Table(std::vector<uint16_t>({'a', 'a'}));
-    writeU16(5000, table.data(),
-             6 /* segment count offset */);  // 5000 segments.
-    CmapBuilder builder(1);
-    builder.appendTable(0, 0, table);
-    std::vector<uint8_t> cmap = builder.build();
-
-    SparseBitSet coverage = CmapCoverage::getCoverage(
-        cmap.data(), cmap.size(), &has_cmap_format_14_subtable);
-    EXPECT_EQ(0U, coverage.length());
-    EXPECT_FALSE(has_cmap_format_14_subtable);
-  }
-  {
-    SCOPED_TRACE("Inversed range");
-    std::vector<uint8_t> table =
-        buildCmapFormat4Table(std::vector<uint16_t>({'b', 'b'}));
-    // Put smaller end code point to inverse the range.
-    writeU16('a', table.data(), 14 /* the first element of endCount offset */);
-    CmapBuilder builder(1);
-    builder.appendTable(0, 0, table);
-    std::vector<uint8_t> cmap = builder.build();
-
-    SparseBitSet coverage = CmapCoverage::getCoverage(
-        cmap.data(), cmap.size(), &has_cmap_format_14_subtable);
-    EXPECT_EQ(0U, coverage.length());
-    EXPECT_FALSE(has_cmap_format_14_subtable);
-  }
-}
-
-TEST(CmapCoverageTest, brokenFormat12Table) {
-  bool has_cmap_format_14_subtable = false;
-  {
-    SCOPED_TRACE("Too small cmap size");
-    std::vector<uint8_t> table =
-        buildCmapFormat12Table(std::vector<uint32_t>({'a', 'a'}));
-    table.resize(2);  // Remove trailing data.
-
-    CmapBuilder builder(1);
-    builder.appendTable(0, 0, table);
-    std::vector<uint8_t> cmap = builder.build();
-
-    SparseBitSet coverage = CmapCoverage::getCoverage(
-        cmap.data(), cmap.size(), &has_cmap_format_14_subtable);
-    EXPECT_EQ(0U, coverage.length());
-    EXPECT_FALSE(has_cmap_format_14_subtable);
-  }
-  {
-    SCOPED_TRACE("Too many groups");
-    std::vector<uint8_t> table =
-        buildCmapFormat12Table(std::vector<uint32_t>({'a', 'a'}));
-    writeU32(5000, table.data(), 12 /* num group offset */);  // 5000 groups.
-
-    CmapBuilder builder(1);
-    builder.appendTable(0, 0, table);
-    std::vector<uint8_t> cmap = builder.build();
-
-    SparseBitSet coverage = CmapCoverage::getCoverage(
-        cmap.data(), cmap.size(), &has_cmap_format_14_subtable);
-    EXPECT_EQ(0U, coverage.length());
-    EXPECT_FALSE(has_cmap_format_14_subtable);
-  }
-  {
-    SCOPED_TRACE("Inversed range.");
-    std::vector<uint8_t> table =
-        buildCmapFormat12Table(std::vector<uint32_t>({'a', 'a'}));
-    // Put larger start code point to inverse the range.
-    writeU32('b', table.data(),
-             16 /* start code point offset in the first  group */);
-
-    CmapBuilder builder(1);
-    builder.appendTable(0, 0, table);
-    std::vector<uint8_t> cmap = builder.build();
-
-    SparseBitSet coverage = CmapCoverage::getCoverage(
-        cmap.data(), cmap.size(), &has_cmap_format_14_subtable);
-    EXPECT_EQ(0U, coverage.length());
-    EXPECT_FALSE(has_cmap_format_14_subtable);
-  }
-  {
-    SCOPED_TRACE("Too large code point");
-    std::vector<uint8_t> cmap = CmapBuilder::buildSingleFormat12Cmap(
-        0, 0, std::vector<uint32_t>({0x110000, 0x110000}));
-
-    SparseBitSet coverage = CmapCoverage::getCoverage(
-        cmap.data(), cmap.size(), &has_cmap_format_14_subtable);
-    EXPECT_EQ(0U, coverage.length());
-    EXPECT_FALSE(has_cmap_format_14_subtable);
-  }
-}
-
-TEST(CmapCoverageTest, TableSelection_Priority) {
-  bool has_cmap_format_14_subtable = false;
-  std::vector<uint8_t> highestFormat12Table =
-      buildCmapFormat12Table(std::vector<uint32_t>({'a', 'a'}));
-  std::vector<uint8_t> highestFormat4Table =
-      buildCmapFormat4Table(std::vector<uint16_t>({'a', 'a'}));
-  std::vector<uint8_t> format4 =
-      buildCmapFormat4Table(std::vector<uint16_t>({'b', 'b'}));
-  std::vector<uint8_t> format12 =
-      buildCmapFormat12Table(std::vector<uint32_t>({'b', 'b'}));
-
-  {
-    SCOPED_TRACE("(platform, encoding) = (3, 10) is the highest priority.");
-
-    struct LowerPriorityTable {
-      uint16_t platformId;
-      uint16_t encodingId;
-      const std::vector<uint8_t>& table;
-    } LOWER_PRIORITY_TABLES[] = {
-        {0, 0, format4},  {0, 1, format4},  {0, 2, format4}, {0, 3, format4},
-        {0, 4, format12}, {0, 6, format12}, {3, 1, format4},
-    };
-
-    for (const auto& table : LOWER_PRIORITY_TABLES) {
-      CmapBuilder builder(2);
-      builder.appendTable(table.platformId, table.encodingId, table.table);
-      builder.appendTable(3, 10, highestFormat12Table);
-      std::vector<uint8_t> cmap = builder.build();
-
-      SparseBitSet coverage = CmapCoverage::getCoverage(
-          cmap.data(), cmap.size(), &has_cmap_format_14_subtable);
-      EXPECT_TRUE(coverage.get('a'));   // comes from highest table
-      EXPECT_FALSE(coverage.get('b'));  // should not use other table.
-      EXPECT_FALSE(has_cmap_format_14_subtable);
-    }
-  }
-  {
-    SCOPED_TRACE("(platform, encoding) = (3, 1) case");
-
-    struct LowerPriorityTable {
-      uint16_t platformId;
-      uint16_t encodingId;
-      const std::vector<uint8_t>& table;
-    } LOWER_PRIORITY_TABLES[] = {
-        {0, 0, format4},
-        {0, 1, format4},
-        {0, 2, format4},
-        {0, 3, format4},
-    };
-
-    for (const auto& table : LOWER_PRIORITY_TABLES) {
-      CmapBuilder builder(2);
-      builder.appendTable(table.platformId, table.encodingId, table.table);
-      builder.appendTable(3, 1, highestFormat4Table);
-      std::vector<uint8_t> cmap = builder.build();
-
-      SparseBitSet coverage = CmapCoverage::getCoverage(
-          cmap.data(), cmap.size(), &has_cmap_format_14_subtable);
-      EXPECT_TRUE(coverage.get('a'));   // comes from highest table
-      EXPECT_FALSE(coverage.get('b'));  // should not use other table.
-      EXPECT_FALSE(has_cmap_format_14_subtable);
-    }
-  }
-}
-
-TEST(CmapCoverageTest, TableSelection_SkipBrokenFormat4Table) {
-  SparseBitSet coverage;
-  bool has_cmap_format_14_subtable = false;
-  std::vector<uint8_t> validTable =
-      buildCmapFormat4Table(std::vector<uint16_t>({'a', 'a'}));
-  {
-    SCOPED_TRACE("Unsupported format");
-    CmapBuilder builder(2);
-    std::vector<uint8_t> table =
-        buildCmapFormat4Table(std::vector<uint16_t>({'b', 'b'}));
-    writeU16(0, table.data(), 0 /* format offset */);
-    builder.appendTable(3, 1, table);
-    builder.appendTable(0, 0, validTable);
-    std::vector<uint8_t> cmap = builder.build();
-
-    SparseBitSet coverage = CmapCoverage::getCoverage(
-        cmap.data(), cmap.size(), &has_cmap_format_14_subtable);
-    EXPECT_TRUE(coverage.get('a'));   // comes from valid table
-    EXPECT_FALSE(coverage.get('b'));  // should not use invalid table.
-    EXPECT_FALSE(has_cmap_format_14_subtable);
-  }
-  {
-    SCOPED_TRACE("Invalid language");
-    CmapBuilder builder(2);
-    std::vector<uint8_t> table =
-        buildCmapFormat4Table(std::vector<uint16_t>({'b', 'b'}));
-    writeU16(1, table.data(), 4 /* language offset */);
-    builder.appendTable(3, 1, table);
-    builder.appendTable(0, 0, validTable);
-    std::vector<uint8_t> cmap = builder.build();
-
-    SparseBitSet coverage = CmapCoverage::getCoverage(
-        cmap.data(), cmap.size(), &has_cmap_format_14_subtable);
-    EXPECT_TRUE(coverage.get('a'));   // comes from valid table
-    EXPECT_FALSE(coverage.get('b'));  // should not use invalid table.
-    EXPECT_FALSE(has_cmap_format_14_subtable);
-  }
-  {
-    SCOPED_TRACE("Invalid length");
-    CmapBuilder builder(2);
-    std::vector<uint8_t> table =
-        buildCmapFormat4Table(std::vector<uint16_t>({'b', 'b'}));
-    writeU16(5000, table.data(), 2 /* length offset */);
-    builder.appendTable(3, 1, table);
-    builder.appendTable(0, 0, validTable);
-    std::vector<uint8_t> cmap = builder.build();
-
-    SparseBitSet coverage = CmapCoverage::getCoverage(
-        cmap.data(), cmap.size(), &has_cmap_format_14_subtable);
-    EXPECT_TRUE(coverage.get('a'));   // comes from valid table
-    EXPECT_FALSE(coverage.get('b'));  // should not use invalid table.
-    EXPECT_FALSE(has_cmap_format_14_subtable);
-  }
-}
-
-TEST(CmapCoverageTest, TableSelection_SkipBrokenFormat12Table) {
-  SparseBitSet coverage;
-  bool has_cmap_format_14_subtable = false;
-  std::vector<uint8_t> validTable =
-      buildCmapFormat12Table(std::vector<uint32_t>({'a', 'a'}));
-  {
-    SCOPED_TRACE("Unsupported format");
-    CmapBuilder builder(2);
-    std::vector<uint8_t> table =
-        buildCmapFormat12Table(std::vector<uint32_t>({'b', 'b'}));
-    writeU16(0, table.data(), 0 /* format offset */);
-    builder.appendTable(3, 1, table);
-    builder.appendTable(0, 0, validTable);
-    std::vector<uint8_t> cmap = builder.build();
-
-    SparseBitSet coverage = CmapCoverage::getCoverage(
-        cmap.data(), cmap.size(), &has_cmap_format_14_subtable);
-    EXPECT_TRUE(coverage.get('a'));   // comes from valid table
-    EXPECT_FALSE(coverage.get('b'));  // should not use invalid table.
-    EXPECT_FALSE(has_cmap_format_14_subtable);
-  }
-  {
-    SCOPED_TRACE("Invalid language");
-    CmapBuilder builder(2);
-    std::vector<uint8_t> table =
-        buildCmapFormat12Table(std::vector<uint32_t>({'b', 'b'}));
-    writeU32(1, table.data(), 8 /* language offset */);
-    builder.appendTable(3, 1, table);
-    builder.appendTable(0, 0, validTable);
-    std::vector<uint8_t> cmap = builder.build();
-
-    SparseBitSet coverage = CmapCoverage::getCoverage(
-        cmap.data(), cmap.size(), &has_cmap_format_14_subtable);
-    EXPECT_TRUE(coverage.get('a'));   // comes from valid table
-    EXPECT_FALSE(coverage.get('b'));  // should not use invalid table.
-    EXPECT_FALSE(has_cmap_format_14_subtable);
-  }
-  {
-    SCOPED_TRACE("Invalid length");
-    CmapBuilder builder(2);
-    std::vector<uint8_t> table =
-        buildCmapFormat12Table(std::vector<uint32_t>({'b', 'b'}));
-    writeU32(5000, table.data(), 4 /* length offset */);
-    builder.appendTable(3, 1, table);
-    builder.appendTable(0, 0, validTable);
-    std::vector<uint8_t> cmap = builder.build();
-
-    SparseBitSet coverage = CmapCoverage::getCoverage(
-        cmap.data(), cmap.size(), &has_cmap_format_14_subtable);
-    EXPECT_TRUE(coverage.get('a'));   // comes from valid table
-    EXPECT_FALSE(coverage.get('b'));  // should not use invalid table.
-    EXPECT_FALSE(has_cmap_format_14_subtable);
-  }
-}
-
-}  // namespace minikin
diff --git a/third_party/txt/tests/EmojiTest.cpp b/third_party/txt/tests/EmojiTest.cpp
deleted file mode 100644
index 91512ddee5e484318c58bc9cb51ae16ee8412762..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/EmojiTest.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <gtest/gtest.h>
-
-#include <unicode/uchar.h>
-
-#include <minikin/Emoji.h>
-
-namespace minikin {
-
-TEST(EmojiTest, isEmojiTest) {
-  EXPECT_TRUE(isEmoji(0x0023));  // NUMBER SIGN
-  EXPECT_TRUE(isEmoji(0x0035));  // DIGIT FIVE
-  // EXPECT_TRUE(isEmoji(0x2640));  // FEMALE SIGN
-  // EXPECT_TRUE(isEmoji(0x2642));  // MALE SIGN
-  // EXPECT_TRUE(isEmoji(0x2695));  // STAFF OF AESCULAPIUS
-  EXPECT_TRUE(isEmoji(0x1F0CF));  // PLAYING CARD BLACK JOKER
-  EXPECT_TRUE(isEmoji(0x1F1E9));  // REGIONAL INDICATOR SYMBOL LETTER D
-  EXPECT_TRUE(isEmoji(0x1F6F7));  // SLED
-  EXPECT_TRUE(isEmoji(0x1F9E6));  // SOCKS
-
-  EXPECT_FALSE(isEmoji(0x0000));   // <control>
-  EXPECT_FALSE(isEmoji(0x0061));   // LATIN SMALL LETTER A
-  EXPECT_FALSE(isEmoji(0x1F93B));  // MODERN PENTATHLON
-  EXPECT_FALSE(isEmoji(0x1F946));  // RIFLE
-  EXPECT_FALSE(isEmoji(0x29E3D));  // A han character.
-}
-
-TEST(EmojiTest, isEmojiModifierTest) {
-  EXPECT_TRUE(isEmojiModifier(0x1F3FB));  // EMOJI MODIFIER FITZPATRICK TYPE-1-2
-  EXPECT_TRUE(isEmojiModifier(0x1F3FC));  // EMOJI MODIFIER FITZPATRICK TYPE-3
-  EXPECT_TRUE(isEmojiModifier(0x1F3FD));  // EMOJI MODIFIER FITZPATRICK TYPE-4
-  EXPECT_TRUE(isEmojiModifier(0x1F3FE));  // EMOJI MODIFIER FITZPATRICK TYPE-5
-  EXPECT_TRUE(isEmojiModifier(0x1F3FF));  // EMOJI MODIFIER FITZPATRICK TYPE-6
-
-  EXPECT_FALSE(isEmojiModifier(0x0000));   // <control>
-  EXPECT_FALSE(isEmojiModifier(0x1F3FA));  // AMPHORA
-  EXPECT_FALSE(isEmojiModifier(0x1F400));  // RAT
-  EXPECT_FALSE(isEmojiModifier(0x29E3D));  // A han character.
-}
-
-TEST(EmojiTest, isEmojiBaseTest) {
-  EXPECT_TRUE(isEmojiBase(0x261D));   // WHITE UP POINTING INDEX
-  EXPECT_TRUE(isEmojiBase(0x270D));   // WRITING HAND
-  EXPECT_TRUE(isEmojiBase(0x1F385));  // FATHER CHRISTMAS
-  // EXPECT_TRUE(isEmojiBase(0x1F3C2));  // SNOWBOARDER
-  // EXPECT_TRUE(isEmojiBase(0x1F3C7));  // HORSE RACING
-  // EXPECT_TRUE(isEmojiBase(0x1F3CC));  // GOLFER
-  // EXPECT_TRUE(isEmojiBase(0x1F574));  // MAN IN BUSINESS SUIT LEVITATING
-  // EXPECT_TRUE(isEmojiBase(0x1F6CC));  // SLEEPING ACCOMMODATION
-  EXPECT_TRUE(isEmojiBase(
-      0x1F91D));  // HANDSHAKE (removed from Emoji 4.0, but we need it)
-  EXPECT_TRUE(isEmojiBase(0x1F91F));  // I LOVE YOU HAND SIGN
-  EXPECT_TRUE(isEmojiBase(0x1F931));  // BREAST-FEEDING
-  EXPECT_TRUE(isEmojiBase(0x1F932));  // PALMS UP TOGETHER
-  EXPECT_TRUE(isEmojiBase(
-      0x1F93C));  // WRESTLERS (removed from Emoji 4.0, but we need it)
-  EXPECT_TRUE(isEmojiBase(0x1F9D1));  // ADULT
-  EXPECT_TRUE(isEmojiBase(0x1F9DD));  // ELF
-
-  EXPECT_FALSE(isEmojiBase(0x0000));   // <control>
-  EXPECT_FALSE(isEmojiBase(0x261C));   // WHITE LEFT POINTING INDEX
-  EXPECT_FALSE(isEmojiBase(0x1F384));  // CHRISTMAS TREE
-  EXPECT_FALSE(isEmojiBase(0x1F9DE));  // GENIE
-  EXPECT_FALSE(isEmojiBase(0x29E3D));  // A han character.
-}
-
-TEST(EmojiTest, emojiBidiOverrideTest) {
-  EXPECT_EQ(U_RIGHT_TO_LEFT,
-            emojiBidiOverride(nullptr, 0x05D0));  // HEBREW LETTER ALEF
-  EXPECT_EQ(U_LEFT_TO_RIGHT,
-            emojiBidiOverride(
-                nullptr, 0x1F170));  // NEGATIVE SQUARED LATIN CAPITAL LETTER A
-  EXPECT_EQ(U_OTHER_NEUTRAL, emojiBidiOverride(nullptr, 0x1F6F7));  // SLED
-  EXPECT_EQ(U_OTHER_NEUTRAL, emojiBidiOverride(nullptr, 0x1F9E6));  // SOCKS
-}
-
-}  // namespace minikin
diff --git a/third_party/txt/tests/FileUtils.cpp b/third_party/txt/tests/FileUtils.cpp
deleted file mode 100644
index 07f65342ab1d424993de741bb1bb7c10027b3a84..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/FileUtils.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <log/log.h>
-
-#include <stdio.h>
-#include <sys/stat.h>
-
-#include <string>
-#include <vector>
-
-std::vector<uint8_t> readWholeFile(const std::string& filePath) {
-  FILE* fp = fopen(filePath.c_str(), "r");
-  LOG_ALWAYS_FATAL_IF(fp == nullptr);
-  struct stat st;
-  LOG_ALWAYS_FATAL_IF(fstat(fileno(fp), &st) != 0);
-
-  std::vector<uint8_t> result(st.st_size);
-  LOG_ALWAYS_FATAL_IF(fread(result.data(), 1, st.st_size, fp) !=
-                      static_cast<size_t>(st.st_size));
-  fclose(fp);
-  return result;
-}
diff --git a/third_party/txt/tests/FileUtils.h b/third_party/txt/tests/FileUtils.h
deleted file mode 100644
index e9c5ef1c34da5794fce4f5b8cd0108411d6c08ec..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/FileUtils.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-std::vector<uint8_t> readWholeFile(const std::string& filePath);
diff --git a/third_party/txt/tests/FontCollectionItemizeTest.cpp b/third_party/txt/tests/FontCollectionItemizeTest.cpp
deleted file mode 100644
index cbef889a057ed469f58c593cbe9baca2a6219bc3..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/FontCollectionItemizeTest.cpp
+++ /dev/null
@@ -1,1550 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <gtest/gtest.h>
-
-#include <memory>
-
-#include "FontTestUtils.h"
-#include "ICUTestBase.h"
-#include "MinikinFontForTest.h"
-#include "UnicodeUtils.h"
-#include "minikin/FontFamily.h"
-#include "minikin/FontLanguage.h"
-#include "minikin/FontLanguageListCache.h"
-#include "minikin/MinikinInternal.h"
-
-namespace minikin {
-
-const char kItemizeFontXml[] = kTestFontDir "itemize.xml";
-const char kEmojiFont[] = kTestFontDir "Emoji.ttf";
-const char kJAFont[] = kTestFontDir "Ja.ttf";
-const char kKOFont[] = kTestFontDir "Ko.ttf";
-const char kLatinBoldFont[] = kTestFontDir "Bold.ttf";
-const char kLatinBoldItalicFont[] = kTestFontDir "BoldItalic.ttf";
-const char kLatinFont[] = kTestFontDir "Regular.ttf";
-const char kLatinItalicFont[] = kTestFontDir "Italic.ttf";
-const char kZH_HansFont[] = kTestFontDir "ZhHans.ttf";
-const char kZH_HantFont[] = kTestFontDir "ZhHant.ttf";
-
-const char kEmojiXmlFile[] = kTestFontDir "emoji.xml";
-const char kNoGlyphFont[] = kTestFontDir "NoGlyphFont.ttf";
-const char kColorEmojiFont[] = kTestFontDir "ColorEmojiFont.ttf";
-const char kTextEmojiFont[] = kTestFontDir "TextEmojiFont.ttf";
-const char kMixedEmojiFont[] = kTestFontDir "ColorTextMixedEmojiFont.ttf";
-
-const char kHasCmapFormat14Font[] = kTestFontDir "NoCmapFormat14.ttf";
-const char kNoCmapFormat14Font[] =
-    kTestFontDir "VariationSelectorTest-Regular.ttf";
-
-typedef ICUTestBase FontCollectionItemizeTest;
-
-// Utility function for calling itemize function.
-void itemize(const std::shared_ptr<FontCollection>& collection,
-             const char* str,
-             FontStyle style,
-             std::vector<FontCollection::Run>* result) {
-  const size_t BUF_SIZE = 256;
-  uint16_t buf[BUF_SIZE];
-  size_t len;
-
-  result->clear();
-  ParseUnicode(buf, BUF_SIZE, str, &len, NULL);
-  std::scoped_lock _l(gMinikinLock);
-  collection->itemize(buf, len, style, result);
-}
-
-// Utility function to obtain font path associated with run.
-const std::string& getFontPath(const FontCollection::Run& run) {
-  EXPECT_NE(nullptr, run.fakedFont.font);
-  return ((MinikinFontForTest*)run.fakedFont.font)->fontPath();
-}
-
-// Utility function to obtain FontLanguages from string.
-const FontLanguages& registerAndGetFontLanguages(
-    const std::string& lang_string) {
-  std::scoped_lock _l(gMinikinLock);
-  return FontLanguageListCache::getById(
-      FontLanguageListCache::getId(lang_string));
-}
-
-TEST_F(FontCollectionItemizeTest, itemize_latin) {
-  std::shared_ptr<FontCollection> collection(
-      getFontCollection(kTestFontDir, kItemizeFontXml));
-  std::vector<FontCollection::Run> runs;
-
-  const FontStyle kRegularStyle = FontStyle();
-  const FontStyle kItalicStyle = FontStyle(4, true);
-  const FontStyle kBoldStyle = FontStyle(7, false);
-  const FontStyle kBoldItalicStyle = FontStyle(7, true);
-
-  itemize(collection, "'a' 'b' 'c' 'd' 'e'", kRegularStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(5, runs[0].end);
-  EXPECT_EQ(kLatinFont, getFontPath(runs[0]));
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeBold());
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeItalic());
-
-  itemize(collection, "'a' 'b' 'c' 'd' 'e'", kItalicStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(5, runs[0].end);
-  EXPECT_EQ(kLatinItalicFont, getFontPath(runs[0]));
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeBold());
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeItalic());
-
-  itemize(collection, "'a' 'b' 'c' 'd' 'e'", kBoldStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(5, runs[0].end);
-  EXPECT_EQ(kLatinBoldFont, getFontPath(runs[0]));
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeBold());
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeItalic());
-
-  itemize(collection, "'a' 'b' 'c' 'd' 'e'", kBoldItalicStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(5, runs[0].end);
-  EXPECT_EQ(kLatinBoldItalicFont, getFontPath(runs[0]));
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeBold());
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeItalic());
-
-  // Continue if the specific characters (e.g. hyphen, comma, etc.) is
-  // followed.
-  itemize(collection, "'a' ',' '-' 'd' '!'", kRegularStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(5, runs[0].end);
-  EXPECT_EQ(kLatinFont, getFontPath(runs[0]));
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeBold());
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeItalic());
-
-  itemize(collection, "'a' ',' '-' 'd' '!'", kRegularStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(5, runs[0].end);
-  EXPECT_EQ(kLatinFont, getFontPath(runs[0]));
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeBold());
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeItalic());
-
-  // U+0301(COMBINING ACUTE ACCENT) must be in the same run with preceding
-  // chars if the font supports it.
-  itemize(collection, "'a' U+0301", kRegularStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  EXPECT_EQ(kLatinFont, getFontPath(runs[0]));
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeBold());
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeItalic());
-}
-
-TEST_F(FontCollectionItemizeTest, itemize_emoji) {
-  std::shared_ptr<FontCollection> collection(
-      getFontCollection(kTestFontDir, kItemizeFontXml));
-  std::vector<FontCollection::Run> runs;
-
-  itemize(collection, "U+1F469 U+1F467", FontStyle(), &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(4, runs[0].end);
-  EXPECT_EQ(kEmojiFont, getFontPath(runs[0]));
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeBold());
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeItalic());
-
-  // U+20E3(COMBINING ENCLOSING KEYCAP) must be in the same run with preceding
-  // character if the font supports.
-  itemize(collection, "'0' U+20E3", FontStyle(), &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  EXPECT_EQ(kEmojiFont, getFontPath(runs[0]));
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeBold());
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeItalic());
-
-  itemize(collection, "U+1F470 U+20E3", FontStyle(), &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(3, runs[0].end);
-  EXPECT_EQ(kEmojiFont, getFontPath(runs[0]));
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeBold());
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeItalic());
-
-  itemize(collection, "U+242EE U+1F470 U+20E3", FontStyle(), &runs);
-  ASSERT_EQ(2U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  EXPECT_EQ(kJAFont, getFontPath(runs[0]));
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeBold());
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeItalic());
-
-  EXPECT_EQ(2, runs[1].start);
-  EXPECT_EQ(5, runs[1].end);
-  EXPECT_EQ(kEmojiFont, getFontPath(runs[1]));
-  EXPECT_FALSE(runs[1].fakedFont.fakery.isFakeBold());
-  EXPECT_FALSE(runs[1].fakedFont.fakery.isFakeItalic());
-
-  // Currently there is no fonts which has a glyph for 'a' + U+20E3, so they
-  // are splitted into two.
-  itemize(collection, "'a' U+20E3", FontStyle(), &runs);
-  ASSERT_EQ(2U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(1, runs[0].end);
-  EXPECT_EQ(kLatinFont, getFontPath(runs[0]));
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeBold());
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeItalic());
-
-  EXPECT_EQ(1, runs[1].start);
-  EXPECT_EQ(2, runs[1].end);
-  EXPECT_EQ(kEmojiFont, getFontPath(runs[1]));
-  EXPECT_FALSE(runs[1].fakedFont.fakery.isFakeBold());
-  EXPECT_FALSE(runs[1].fakedFont.fakery.isFakeItalic());
-}
-
-TEST_F(FontCollectionItemizeTest, itemize_non_latin) {
-  std::shared_ptr<FontCollection> collection(
-      getFontCollection(kTestFontDir, kItemizeFontXml));
-  std::vector<FontCollection::Run> runs;
-
-  FontStyle kJAStyle = FontStyle(FontStyle::registerLanguageList("ja_JP"));
-  FontStyle kUSStyle = FontStyle(FontStyle::registerLanguageList("en_US"));
-  FontStyle kZH_HansStyle =
-      FontStyle(FontStyle::registerLanguageList("zh_Hans"));
-
-  // All Japanese Hiragana characters.
-  itemize(collection, "U+3042 U+3044 U+3046 U+3048 U+304A", kUSStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(5, runs[0].end);
-  EXPECT_EQ(kJAFont, getFontPath(runs[0]));
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeBold());
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeItalic());
-
-  // All Korean Hangul characters.
-  itemize(collection, "U+B300 U+D55C U+BBFC U+AD6D", kUSStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(4, runs[0].end);
-  EXPECT_EQ(kKOFont, getFontPath(runs[0]));
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeBold());
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeItalic());
-
-  // All Han characters ja, zh-Hans font having.
-  // Japanese font should be selected if the specified language is Japanese.
-  itemize(collection, "U+81ED U+82B1 U+5FCD", kJAStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(3, runs[0].end);
-  EXPECT_EQ(kJAFont, getFontPath(runs[0]));
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeBold());
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeItalic());
-
-  // Simplified Chinese font should be selected if the specified language is
-  // Simplified Chinese.
-  itemize(collection, "U+81ED U+82B1 U+5FCD", kZH_HansStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(3, runs[0].end);
-  EXPECT_EQ(kZH_HansFont, getFontPath(runs[0]));
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeBold());
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeItalic());
-
-  // Fallbacks to other fonts if there is no glyph in the specified language's
-  // font. There is no character U+4F60 in Japanese.
-  itemize(collection, "U+81ED U+4F60 U+5FCD", kJAStyle, &runs);
-  ASSERT_EQ(3U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(1, runs[0].end);
-  EXPECT_EQ(kJAFont, getFontPath(runs[0]));
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeBold());
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeItalic());
-
-  EXPECT_EQ(1, runs[1].start);
-  EXPECT_EQ(2, runs[1].end);
-  EXPECT_EQ(kZH_HansFont, getFontPath(runs[1]));
-  EXPECT_FALSE(runs[1].fakedFont.fakery.isFakeBold());
-  EXPECT_FALSE(runs[1].fakedFont.fakery.isFakeItalic());
-
-  EXPECT_EQ(2, runs[2].start);
-  EXPECT_EQ(3, runs[2].end);
-  EXPECT_EQ(kJAFont, getFontPath(runs[2]));
-  EXPECT_FALSE(runs[2].fakedFont.fakery.isFakeBold());
-  EXPECT_FALSE(runs[2].fakedFont.fakery.isFakeItalic());
-
-  // Tone mark.
-  itemize(collection, "U+4444 U+302D", FontStyle(), &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  EXPECT_EQ(kZH_HansFont, getFontPath(runs[0]));
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeBold());
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeItalic());
-
-  // Both zh-Hant and ja fonts support U+242EE, but zh-Hans doesn't.
-  // Here, ja and zh-Hant font should have the same score but ja should be
-  // selected since it is listed before zh-Hant.
-  itemize(collection, "U+242EE", kZH_HansStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  EXPECT_EQ(kJAFont, getFontPath(runs[0]));
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeBold());
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeItalic());
-}
-
-TEST_F(FontCollectionItemizeTest, itemize_mixed) {
-  std::shared_ptr<FontCollection> collection(
-      getFontCollection(kTestFontDir, kItemizeFontXml));
-  std::vector<FontCollection::Run> runs;
-
-  FontStyle kUSStyle = FontStyle(FontStyle::registerLanguageList("en_US"));
-
-  itemize(collection, "'a' U+4F60 'b' U+4F60 'c'", kUSStyle, &runs);
-  ASSERT_EQ(5U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(1, runs[0].end);
-  EXPECT_EQ(kLatinFont, getFontPath(runs[0]));
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeBold());
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeItalic());
-
-  EXPECT_EQ(1, runs[1].start);
-  EXPECT_EQ(2, runs[1].end);
-  EXPECT_EQ(kZH_HansFont, getFontPath(runs[1]));
-  EXPECT_FALSE(runs[1].fakedFont.fakery.isFakeBold());
-  EXPECT_FALSE(runs[1].fakedFont.fakery.isFakeItalic());
-
-  EXPECT_EQ(2, runs[2].start);
-  EXPECT_EQ(3, runs[2].end);
-  EXPECT_EQ(kLatinFont, getFontPath(runs[2]));
-  EXPECT_FALSE(runs[2].fakedFont.fakery.isFakeBold());
-  EXPECT_FALSE(runs[2].fakedFont.fakery.isFakeItalic());
-
-  EXPECT_EQ(3, runs[3].start);
-  EXPECT_EQ(4, runs[3].end);
-  EXPECT_EQ(kZH_HansFont, getFontPath(runs[3]));
-  EXPECT_FALSE(runs[3].fakedFont.fakery.isFakeBold());
-  EXPECT_FALSE(runs[3].fakedFont.fakery.isFakeItalic());
-
-  EXPECT_EQ(4, runs[4].start);
-  EXPECT_EQ(5, runs[4].end);
-  EXPECT_EQ(kLatinFont, getFontPath(runs[4]));
-  EXPECT_FALSE(runs[4].fakedFont.fakery.isFakeBold());
-  EXPECT_FALSE(runs[4].fakedFont.fakery.isFakeItalic());
-}
-
-TEST_F(FontCollectionItemizeTest, itemize_variationSelector) {
-  std::shared_ptr<FontCollection> collection(
-      getFontCollection(kTestFontDir, kItemizeFontXml));
-  std::vector<FontCollection::Run> runs;
-
-  // A glyph for U+4FAE is provided by both Japanese font and Simplified
-  // Chinese font. Also a glyph for U+242EE is provided by both Japanese and
-  // Traditional Chinese font.  To avoid effects of device default locale,
-  // explicitly specify the locale.
-  FontStyle kZH_HansStyle =
-      FontStyle(FontStyle::registerLanguageList("zh_Hans"));
-  FontStyle kZH_HantStyle =
-      FontStyle(FontStyle::registerLanguageList("zh_Hant"));
-
-  // U+4FAE is available in both zh_Hans and ja font, but U+4FAE,U+FE00 is
-  // only available in ja font.
-  itemize(collection, "U+4FAE", kZH_HansStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(1, runs[0].end);
-  EXPECT_EQ(kZH_HansFont, getFontPath(runs[0]));
-
-  itemize(collection, "U+4FAE U+FE00", kZH_HansStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  EXPECT_EQ(kJAFont, getFontPath(runs[0]));
-
-  itemize(collection, "U+4FAE U+4FAE U+FE00", kZH_HansStyle, &runs);
-  ASSERT_EQ(2U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(1, runs[0].end);
-  EXPECT_EQ(kZH_HansFont, getFontPath(runs[0]));
-  EXPECT_EQ(1, runs[1].start);
-  EXPECT_EQ(3, runs[1].end);
-  EXPECT_EQ(kJAFont, getFontPath(runs[1]));
-
-  itemize(collection, "U+4FAE U+4FAE U+FE00 U+4FAE", kZH_HansStyle, &runs);
-  ASSERT_EQ(3U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(1, runs[0].end);
-  EXPECT_EQ(kZH_HansFont, getFontPath(runs[0]));
-  EXPECT_EQ(1, runs[1].start);
-  EXPECT_EQ(3, runs[1].end);
-  EXPECT_EQ(kJAFont, getFontPath(runs[1]));
-  EXPECT_EQ(3, runs[2].start);
-  EXPECT_EQ(4, runs[2].end);
-  EXPECT_EQ(kZH_HansFont, getFontPath(runs[2]));
-
-  // Validation selector after validation selector.
-  itemize(collection, "U+4FAE U+FE00 U+FE00", kZH_HansStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(3, runs[0].end);
-  EXPECT_EQ(kJAFont, getFontPath(runs[1]));
-
-  // No font supports U+242EE U+FE0E.
-  itemize(collection, "U+4FAE U+FE0E", kZH_HansStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  EXPECT_EQ(kZH_HansFont, getFontPath(runs[0]));
-
-  // Surrogate pairs handling.
-  // U+242EE is available in ja font and zh_Hant font.
-  // U+242EE U+FE00 is available only in ja font.
-  itemize(collection, "U+242EE", kZH_HantStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  EXPECT_EQ(kZH_HantFont, getFontPath(runs[0]));
-
-  itemize(collection, "U+242EE U+FE00", kZH_HantStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(3, runs[0].end);
-  EXPECT_EQ(kJAFont, getFontPath(runs[0]));
-
-  itemize(collection, "U+242EE U+242EE U+FE00", kZH_HantStyle, &runs);
-  ASSERT_EQ(2U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  EXPECT_EQ(kZH_HantFont, getFontPath(runs[0]));
-  EXPECT_EQ(2, runs[1].start);
-  EXPECT_EQ(5, runs[1].end);
-  EXPECT_EQ(kJAFont, getFontPath(runs[1]));
-
-  itemize(collection, "U+242EE U+242EE U+FE00 U+242EE", kZH_HantStyle, &runs);
-  ASSERT_EQ(3U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  EXPECT_EQ(kZH_HantFont, getFontPath(runs[0]));
-  EXPECT_EQ(2, runs[1].start);
-  EXPECT_EQ(5, runs[1].end);
-  EXPECT_EQ(kJAFont, getFontPath(runs[1]));
-  EXPECT_EQ(5, runs[2].start);
-  EXPECT_EQ(7, runs[2].end);
-  EXPECT_EQ(kZH_HantFont, getFontPath(runs[2]));
-
-  // Validation selector after validation selector.
-  itemize(collection, "U+242EE U+FE00 U+FE00", kZH_HansStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(4, runs[0].end);
-  EXPECT_EQ(kJAFont, getFontPath(runs[0]));
-
-  // No font supports U+242EE U+FE0E
-  itemize(collection, "U+242EE U+FE0E", kZH_HantStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(3, runs[0].end);
-  EXPECT_EQ(kZH_HantFont, getFontPath(runs[0]));
-
-  // Isolated variation selector supplement.
-  itemize(collection, "U+FE00", FontStyle(), &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(1, runs[0].end);
-  EXPECT_TRUE(runs[0].fakedFont.font == nullptr ||
-              kLatinFont == getFontPath(runs[0]));
-
-  itemize(collection, "U+FE00", kZH_HantStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(1, runs[0].end);
-  EXPECT_TRUE(runs[0].fakedFont.font == nullptr ||
-              kLatinFont == getFontPath(runs[0]));
-
-  // First font family (Regular.ttf) supports U+203C but doesn't support U+203C
-  // U+FE0F. Emoji.ttf font supports U+203C U+FE0F.  Emoji.ttf should be
-  // selected.
-  itemize(collection, "U+203C U+FE0F", kZH_HantStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  EXPECT_EQ(kEmojiFont, getFontPath(runs[0]));
-
-  // First font family (Regular.ttf) supports U+203C U+FE0E.
-  itemize(collection, "U+203C U+FE0E", kZH_HantStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  EXPECT_EQ(kLatinFont, getFontPath(runs[0]));
-}
-
-TEST_F(FontCollectionItemizeTest, itemize_variationSelectorSupplement) {
-  std::shared_ptr<FontCollection> collection(
-      getFontCollection(kTestFontDir, kItemizeFontXml));
-  std::vector<FontCollection::Run> runs;
-
-  // A glyph for U+845B is provided by both Japanese font and Simplified
-  // Chinese font. Also a glyph for U+242EE is provided by both Japanese and
-  // Traditional Chinese font.  To avoid effects of device default locale,
-  // explicitly specify the locale.
-  FontStyle kZH_HansStyle =
-      FontStyle(FontStyle::registerLanguageList("zh_Hans"));
-  FontStyle kZH_HantStyle =
-      FontStyle(FontStyle::registerLanguageList("zh_Hant"));
-
-  // U+845B is available in both zh_Hans and ja font, but U+845B,U+E0100 is
-  // only available in ja font.
-  itemize(collection, "U+845B", kZH_HansStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(1, runs[0].end);
-  EXPECT_EQ(kZH_HansFont, getFontPath(runs[0]));
-
-  itemize(collection, "U+845B U+E0100", kZH_HansStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(3, runs[0].end);
-  EXPECT_EQ(kJAFont, getFontPath(runs[0]));
-
-  itemize(collection, "U+845B U+845B U+E0100", kZH_HansStyle, &runs);
-  ASSERT_EQ(2U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(1, runs[0].end);
-  EXPECT_EQ(kZH_HansFont, getFontPath(runs[0]));
-  EXPECT_EQ(1, runs[1].start);
-  EXPECT_EQ(4, runs[1].end);
-  EXPECT_EQ(kJAFont, getFontPath(runs[1]));
-
-  itemize(collection, "U+845B U+845B U+E0100 U+845B", kZH_HansStyle, &runs);
-  ASSERT_EQ(3U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(1, runs[0].end);
-  EXPECT_EQ(kZH_HansFont, getFontPath(runs[0]));
-  EXPECT_EQ(1, runs[1].start);
-  EXPECT_EQ(4, runs[1].end);
-  EXPECT_EQ(kJAFont, getFontPath(runs[1]));
-  EXPECT_EQ(4, runs[2].start);
-  EXPECT_EQ(5, runs[2].end);
-  EXPECT_EQ(kZH_HansFont, getFontPath(runs[2]));
-
-  // Validation selector after validation selector.
-  itemize(collection, "U+845B U+E0100 U+E0100", kZH_HansStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(5, runs[0].end);
-  EXPECT_EQ(kJAFont, getFontPath(runs[0]));
-
-  // No font supports U+845B U+E01E0.
-  itemize(collection, "U+845B U+E01E0", kZH_HansStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(3, runs[0].end);
-  EXPECT_EQ(kZH_HansFont, getFontPath(runs[0]));
-
-  // Isolated variation selector supplement
-  // Surrogate pairs handling.
-  // U+242EE is available in ja font and zh_Hant font.
-  // U+242EE U+E0100 is available only in ja font.
-  itemize(collection, "U+242EE", kZH_HantStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  EXPECT_EQ(kZH_HantFont, getFontPath(runs[0]));
-
-  itemize(collection, "U+242EE U+E0101", kZH_HantStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(4, runs[0].end);
-  EXPECT_EQ(kJAFont, getFontPath(runs[0]));
-
-  itemize(collection, "U+242EE U+242EE U+E0101", kZH_HantStyle, &runs);
-  ASSERT_EQ(2U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  EXPECT_EQ(kZH_HantFont, getFontPath(runs[0]));
-  EXPECT_EQ(2, runs[1].start);
-  EXPECT_EQ(6, runs[1].end);
-  EXPECT_EQ(kJAFont, getFontPath(runs[1]));
-
-  itemize(collection, "U+242EE U+242EE U+E0101 U+242EE", kZH_HantStyle, &runs);
-  ASSERT_EQ(3U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  EXPECT_EQ(kZH_HantFont, getFontPath(runs[0]));
-  EXPECT_EQ(2, runs[1].start);
-  EXPECT_EQ(6, runs[1].end);
-  EXPECT_EQ(kJAFont, getFontPath(runs[1]));
-  EXPECT_EQ(6, runs[2].start);
-  EXPECT_EQ(8, runs[2].end);
-  EXPECT_EQ(kZH_HantFont, getFontPath(runs[2]));
-
-  // Validation selector after validation selector.
-  itemize(collection, "U+242EE U+E0100 U+E0100", kZH_HantStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(6, runs[0].end);
-  EXPECT_EQ(kJAFont, getFontPath(runs[0]));
-
-  // No font supports U+242EE U+E01E0.
-  itemize(collection, "U+242EE U+E01E0", kZH_HantStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(4, runs[0].end);
-  EXPECT_EQ(kZH_HantFont, getFontPath(runs[0]));
-
-  // Isolated variation selector supplement.
-  itemize(collection, "U+E0100", FontStyle(), &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  EXPECT_TRUE(runs[0].fakedFont.font == nullptr ||
-              kLatinFont == getFontPath(runs[0]));
-
-  itemize(collection, "U+E0100", kZH_HantStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  EXPECT_TRUE(runs[0].fakedFont.font == nullptr ||
-              kLatinFont == getFontPath(runs[0]));
-}
-
-TEST_F(FontCollectionItemizeTest, itemize_no_crash) {
-  std::shared_ptr<FontCollection> collection(
-      getFontCollection(kTestFontDir, kItemizeFontXml));
-  std::vector<FontCollection::Run> runs;
-
-  // Broken Surrogate pairs. Check only not crashing.
-  itemize(collection, "'a' U+D83D 'a'", FontStyle(), &runs);
-  itemize(collection, "'a' U+DC69 'a'", FontStyle(), &runs);
-  itemize(collection, "'a' U+D83D U+D83D 'a'", FontStyle(), &runs);
-  itemize(collection, "'a' U+DC69 U+DC69 'a'", FontStyle(), &runs);
-
-  // Isolated variation selector. Check only not crashing.
-  itemize(collection, "U+FE00 U+FE00", FontStyle(), &runs);
-  itemize(collection, "U+E0100 U+E0100", FontStyle(), &runs);
-  itemize(collection, "U+FE00 U+E0100", FontStyle(), &runs);
-  itemize(collection, "U+E0100 U+FE00", FontStyle(), &runs);
-
-  // Tone mark only. Check only not crashing.
-  itemize(collection, "U+302D", FontStyle(), &runs);
-  itemize(collection, "U+302D U+302D", FontStyle(), &runs);
-
-  // Tone mark and variation selector mixed. Check only not crashing.
-  itemize(collection, "U+FE00 U+302D U+E0100", FontStyle(), &runs);
-}
-
-TEST_F(FontCollectionItemizeTest, itemize_fakery) {
-  std::shared_ptr<FontCollection> collection(
-      getFontCollection(kTestFontDir, kItemizeFontXml));
-  std::vector<FontCollection::Run> runs;
-
-  FontStyle kJABoldStyle =
-      FontStyle(FontStyle::registerLanguageList("ja_JP"), 0, 7, false);
-  FontStyle kJAItalicStyle =
-      FontStyle(FontStyle::registerLanguageList("ja_JP"), 0, 5, true);
-  FontStyle kJABoldItalicStyle =
-      FontStyle(FontStyle::registerLanguageList("ja_JP"), 0, 7, true);
-
-  // Currently there is no italic or bold font for Japanese. FontFakery has
-  // the differences between desired and actual font style.
-
-  // All Japanese Hiragana characters.
-  itemize(collection, "U+3042 U+3044 U+3046 U+3048 U+304A", kJABoldStyle,
-          &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(5, runs[0].end);
-  EXPECT_EQ(kJAFont, getFontPath(runs[0]));
-  EXPECT_TRUE(runs[0].fakedFont.fakery.isFakeBold());
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeItalic());
-
-  // All Japanese Hiragana characters.
-  itemize(collection, "U+3042 U+3044 U+3046 U+3048 U+304A", kJAItalicStyle,
-          &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(5, runs[0].end);
-  EXPECT_EQ(kJAFont, getFontPath(runs[0]));
-  EXPECT_FALSE(runs[0].fakedFont.fakery.isFakeBold());
-  EXPECT_TRUE(runs[0].fakedFont.fakery.isFakeItalic());
-
-  // All Japanese Hiragana characters.
-  itemize(collection, "U+3042 U+3044 U+3046 U+3048 U+304A", kJABoldItalicStyle,
-          &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(5, runs[0].end);
-  EXPECT_EQ(kJAFont, getFontPath(runs[0]));
-  EXPECT_TRUE(runs[0].fakedFont.fakery.isFakeBold());
-  EXPECT_TRUE(runs[0].fakedFont.fakery.isFakeItalic());
-}
-
-TEST_F(FontCollectionItemizeTest, itemize_vs_sequence_but_no_base_char) {
-  // kVSTestFont supports U+717D U+FE02 but doesn't support U+717D.
-  // kVSTestFont should be selected for U+717D U+FE02 even if it does not
-  // support the base code point.
-  const std::string kVSTestFont =
-      kTestFontDir "VariationSelectorTest-Regular.ttf";
-
-  std::vector<std::shared_ptr<FontFamily>> families;
-  std::shared_ptr<MinikinFont> font(new MinikinFontForTest(kLatinFont));
-  std::shared_ptr<FontFamily> family1(new FontFamily(
-      VARIANT_DEFAULT, std::vector<Font>{Font(font, FontStyle())}));
-  families.push_back(family1);
-
-  std::shared_ptr<MinikinFont> font2(new MinikinFontForTest(kVSTestFont));
-  std::shared_ptr<FontFamily> family2(new FontFamily(
-      VARIANT_DEFAULT, std::vector<Font>{Font(font2, FontStyle())}));
-  families.push_back(family2);
-
-  std::shared_ptr<FontCollection> collection(new FontCollection(families));
-
-  std::vector<FontCollection::Run> runs;
-
-  itemize(collection, "U+717D U+FE02", FontStyle(), &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  EXPECT_EQ(kVSTestFont, getFontPath(runs[0]));
-}
-
-TEST_F(FontCollectionItemizeTest, itemize_LanguageScore) {
-  struct TestCase {
-    std::string userPreferredLanguages;
-    std::vector<std::string> fontLanguages;
-    int selectedFontIndex;
-  } testCases[] = {
-      // Font can specify empty language.
-      {"und", {"", ""}, 0},
-      {"und", {"", "en-Latn"}, 0},
-      {"en-Latn", {"", ""}, 0},
-      {"en-Latn", {"", "en-Latn"}, 1},
-
-      // Single user preferred language.
-      // Exact match case
-      {"en-Latn", {"en-Latn", "ja-Jpan"}, 0},
-      {"ja-Jpan", {"en-Latn", "ja-Jpan"}, 1},
-      {"en-Latn", {"en-Latn", "nl-Latn", "es-Latn"}, 0},
-      {"nl-Latn", {"en-Latn", "nl-Latn", "es-Latn"}, 1},
-      {"es-Latn", {"en-Latn", "nl-Latn", "es-Latn"}, 2},
-      {"es-Latn", {"en-Latn", "en-Latn", "nl-Latn"}, 0},
-
-      // Exact script match case
-      {"en-Latn", {"nl-Latn", "e-Latn"}, 0},
-      {"en-Arab", {"nl-Latn", "ar-Arab"}, 1},
-      {"en-Latn", {"be-Latn", "ar-Arab", "d-Beng"}, 0},
-      {"en-Arab", {"be-Latn", "ar-Arab", "d-Beng"}, 1},
-      {"en-Beng", {"be-Latn", "ar-Arab", "d-Beng"}, 2},
-      {"en-Beng", {"be-Latn", "ar-Beng", "d-Beng"}, 1},
-      {"zh-Hant", {"zh-Hant", "zh-Hans"}, 0},
-      {"zh-Hans", {"zh-Hant", "zh-Hans"}, 1},
-
-      // Subscript match case, e.g. Jpan supports Hira.
-      {"en-Hira", {"ja-Jpan"}, 0},
-      {"zh-Hani", {"zh-Hans", "zh-Hant"}, 0},
-      {"zh-Hani", {"zh-Hant", "zh-Hans"}, 0},
-      {"en-Hira", {"zh-Hant", "ja-Jpan", "ja-Jpan"}, 1},
-
-      // Language match case
-      {"ja-Latn", {"zh-Latn", "ja-Latn"}, 1},
-      {"zh-Latn", {"zh-Latn", "ja-Latn"}, 0},
-      {"ja-Latn", {"zh-Latn", "ja-Latn"}, 1},
-      {"ja-Latn", {"zh-Latn", "ja-Latn", "ja-Latn"}, 1},
-
-      // Mixed case
-      // Script/subscript match is strongest.
-      {"ja-Jpan", {"en-Latn", "ja-Latn", "en-Jpan"}, 2},
-      {"ja-Hira", {"en-Latn", "ja-Latn", "en-Jpan"}, 2},
-      {"ja-Hira", {"en-Latn", "ja-Latn", "en-Jpan", "en-Jpan"}, 2},
-
-      // Language match only happens if the script matches.
-      {"ja-Hira", {"en-Latn", "ja-Latn"}, 0},
-      {"ja-Hira", {"en-Jpan", "ja-Jpan"}, 1},
-
-      // Multiple languages.
-      // Even if all fonts have the same score, use the 2nd language for better
-      // selection.
-      {"en-Latn,ja-Jpan", {"zh-Hant", "zh-Hans", "ja-Jpan"}, 2},
-      {"en-Latn,nl-Latn", {"es-Latn", "be-Latn", "nl-Latn"}, 2},
-      {"en-Latn,br-Latn,nl-Latn", {"es-Latn", "be-Latn", "nl-Latn"}, 2},
-      {"en-Latn,br-Latn,nl-Latn",
-       {"es-Latn", "be-Latn", "nl-Latn", "nl-Latn"},
-       2},
-
-      // Script score.
-      {"en-Latn,ja-Jpan", {"en-Arab", "en-Jpan"}, 1},
-      {"en-Latn,ja-Jpan", {"en-Arab", "en-Jpan", "en-Jpan"}, 1},
-
-      // Language match case
-      {"en-Latn,ja-Latn", {"bd-Latn", "ja-Latn"}, 1},
-      {"en-Latn,ja-Latn", {"bd-Latn", "ja-Latn", "ja-Latn"}, 1},
-
-      // Language match only happens if the script matches.
-      {"en-Latn,ar-Arab", {"en-Beng", "ar-Arab"}, 1},
-
-      // Multiple languages in the font settings.
-      {"ko-Jamo", {"ja-Jpan", "ko-Kore", "ko-Kore,ko-Jamo"}, 2},
-      {"en-Latn", {"ja-Jpan", "en-Latn,ja-Jpan"}, 1},
-      {"en-Latn", {"ja-Jpan", "ja-Jpan,en-Latn"}, 1},
-      {"en-Latn", {"ja-Jpan,zh-Hant", "en-Latn,ja-Jpan", "en-Latn"}, 1},
-      {"en-Latn", {"zh-Hant,ja-Jpan", "ja-Jpan,en-Latn", "en-Latn"}, 1},
-
-      // Kore = Hang + Hani, etc.
-      {"ko-Kore", {"ko-Hang", "ko-Jamo,ko-Hani", "ko-Hang,ko-Hani"}, 2},
-      {"ja-Hrkt", {"ja-Hira", "ja-Kana", "ja-Hira,ja-Kana"}, 2},
-      {"ja-Jpan",
-       {"ja-Hira", "ja-Kana", "ja-Hani", "ja-Hira,ja-Kana,ja-Hani"},
-       3},
-      {"zh-Hanb", {"zh-Hant", "zh-Bopo", "zh-Hant,zh-Bopo"}, 2},
-      {"zh-Hanb", {"ja-Hanb", "zh-Hant,zh-Bopo"}, 1},
-
-      // Language match with unified subscript bits.
-      {"zh-Hanb",
-       {"zh-Hant", "zh-Bopo", "ja-Hant,ja-Bopo", "zh-Hant,zh-Bopo"},
-       3},
-      {"zh-Hanb",
-       {"zh-Hant", "zh-Bopo", "ja-Hant,zh-Bopo", "zh-Hant,zh-Bopo"},
-       3},
-
-      // Two elements subtag matching: language and subtag or language or
-      // script.
-      {"ja-Kana-u-em-emoji", {"zh-Hant", "ja-Kana"}, 1},
-      {"ja-Kana-u-em-emoji", {"zh-Hant", "ja-Kana", "ja-Zsye"}, 2},
-      {"ja-Zsym-u-em-emoji", {"ja-Kana", "ja-Zsym", "ja-Zsye"}, 2},
-
-      // One element subtag matching: subtag only or script only.
-      {"en-Latn-u-em-emoji", {"ja-Latn", "ja-Zsye"}, 1},
-      {"en-Zsym-u-em-emoji", {"ja-Zsym", "ja-Zsye"}, 1},
-      {"en-Zsye-u-em-text", {"ja-Zsym", "ja-Zsye"}, 0},
-
-      // Multiple languages list with subtags.
-      {"en-Latn,ja-Jpan-u-em-text", {"en-Latn", "en-Zsye", "en-Zsym"}, 0},
-      {"en-Latn,en-Zsye,ja-Jpan-u-em-text", {"zh", "en-Zsye", "en-Zsym"}, 1},
-  };
-
-  for (auto testCase : testCases) {
-    std::string fontLanguagesStr = "{";
-    for (size_t i = 0; i < testCase.fontLanguages.size(); ++i) {
-      if (i != 0) {
-        fontLanguagesStr += ", ";
-      }
-      fontLanguagesStr += "\"" + testCase.fontLanguages[i] + "\"";
-    }
-    fontLanguagesStr += "}";
-    SCOPED_TRACE("Test of user preferred languages: \"" +
-                 testCase.userPreferredLanguages +
-                 "\" with font languages: " + fontLanguagesStr);
-
-    std::vector<std::shared_ptr<FontFamily>> families;
-
-    // Prepare first font which doesn't supports U+9AA8
-    std::shared_ptr<MinikinFont> firstFamilyMinikinFont(
-        new MinikinFontForTest(kNoGlyphFont));
-    std::shared_ptr<FontFamily> firstFamily(new FontFamily(
-        FontStyle::registerLanguageList("und"), 0 /* variant */,
-        std::vector<Font>({Font(firstFamilyMinikinFont, FontStyle())})));
-    families.push_back(firstFamily);
-
-    // Prepare font families
-    // Each font family is associated with a specified language. All font
-    // families except for the first font support U+9AA8.
-    std::unordered_map<MinikinFont*, int> fontLangIdxMap;
-
-    for (size_t i = 0; i < testCase.fontLanguages.size(); ++i) {
-      std::shared_ptr<MinikinFont> minikin_font(
-          new MinikinFontForTest(kJAFont));
-      std::shared_ptr<FontFamily> family(new FontFamily(
-          FontStyle::registerLanguageList(testCase.fontLanguages[i]),
-          0 /* variant */,
-          std::vector<Font>({Font(minikin_font, FontStyle())})));
-      families.push_back(family);
-      fontLangIdxMap.insert(std::make_pair(minikin_font.get(), i));
-    }
-    std::shared_ptr<FontCollection> collection(new FontCollection(families));
-    // Do itemize
-    const FontStyle style = FontStyle(
-        FontStyle::registerLanguageList(testCase.userPreferredLanguages));
-    std::vector<FontCollection::Run> runs;
-    itemize(collection, "U+9AA8", style, &runs);
-    ASSERT_EQ(1U, runs.size());
-    ASSERT_NE(nullptr, runs[0].fakedFont.font);
-
-    // First family doesn't support U+9AA8 and others support it, so the first
-    // font should not be selected.
-    EXPECT_NE(firstFamilyMinikinFont.get(), runs[0].fakedFont.font);
-
-    // Lookup used font family by MinikinFont*.
-    const int usedLangIndex = fontLangIdxMap[runs[0].fakedFont.font];
-    EXPECT_EQ(testCase.selectedFontIndex, usedLangIndex);
-  }
-}
-
-TEST_F(FontCollectionItemizeTest, itemize_LanguageAndCoverage) {
-  struct TestCase {
-    std::string testString;
-    std::string requestedLanguages;
-    std::string expectedFont;
-  } testCases[] = {
-      // Following test cases verify that following rules in font fallback
-      // chain.
-      // - If the first font in the collection supports the given character or
-      // variation sequence,
-      //   it should be selected.
-      // - If the font doesn't support the given character, variation sequence
-      // or its base
-      //   character, it should not be selected.
-      // - If two or more fonts match the requested languages, the font matches
-      // with the highest
-      //   priority language should be selected.
-      // - If two or more fonts get the same score, the font listed earlier in
-      // the XML file
-      //   (here, kItemizeFontXml) should be selected.
-
-      // Regardless of language, the first font is always selected if it covers
-      // the code point.
-      {"'a'", "", kLatinFont},
-      {"'a'", "en-Latn", kLatinFont},
-      {"'a'", "ja-Jpan", kLatinFont},
-      {"'a'", "ja-Jpan,en-Latn", kLatinFont},
-      {"'a'", "zh-Hans,zh-Hant,en-Latn,ja-Jpan,fr-Latn", kLatinFont},
-
-      // U+81ED is supported by both the ja font and zh-Hans font.
-      {"U+81ED", "", kZH_HansFont},  // zh-Hans font is listed before ja font.
-      {"U+81ED", "en-Latn",
-       kZH_HansFont},  // zh-Hans font is listed before ja font.
-      {"U+81ED", "ja-Jpan", kJAFont},
-      {"U+81ED", "zh-Hans", kZH_HansFont},
-
-      {"U+81ED", "ja-Jpan,en-Latn", kJAFont},
-      {"U+81ED", "en-Latn,ja-Jpan", kJAFont},
-      {"U+81ED", "en-Latn,zh-Hans", kZH_HansFont},
-      {"U+81ED", "zh-Hans,en-Latn", kZH_HansFont},
-      {"U+81ED", "ja-Jpan,zh-Hans", kJAFont},
-      {"U+81ED", "zh-Hans,ja-Jpan", kZH_HansFont},
-
-      {"U+81ED", "en-Latn,zh-Hans,ja-Jpan", kZH_HansFont},
-      {"U+81ED", "en-Latn,ja-Jpan,zh-Hans", kJAFont},
-      {"U+81ED", "en-Latn,zh-Hans,ja-Jpan", kZH_HansFont},
-      {"U+81ED", "ja-Jpan,en-Latn,zh-Hans", kJAFont},
-      {"U+81ED", "ja-Jpan,zh-Hans,en-Latn", kJAFont},
-      {"U+81ED", "zh-Hans,en-Latn,ja-Jpan", kZH_HansFont},
-      {"U+81ED", "zh-Hans,ja-Jpan,en-Latn", kZH_HansFont},
-
-      // U+304A is only supported by ja font.
-      {"U+304A", "", kJAFont},
-      {"U+304A", "ja-Jpan", kJAFont},
-      {"U+304A", "zh-Hant", kJAFont},
-      {"U+304A", "zh-Hans", kJAFont},
-
-      {"U+304A", "ja-Jpan,zh-Hant", kJAFont},
-      {"U+304A", "zh-Hant,ja-Jpan", kJAFont},
-      {"U+304A", "zh-Hans,zh-Hant", kJAFont},
-      {"U+304A", "zh-Hant,zh-Hans", kJAFont},
-      {"U+304A", "zh-Hans,ja-Jpan", kJAFont},
-      {"U+304A", "ja-Jpan,zh-Hans", kJAFont},
-
-      {"U+304A", "zh-Hans,ja-Jpan,zh-Hant", kJAFont},
-      {"U+304A", "zh-Hans,zh-Hant,ja-Jpan", kJAFont},
-      {"U+304A", "ja-Jpan,zh-Hans,zh-Hant", kJAFont},
-      {"U+304A", "ja-Jpan,zh-Hant,zh-Hans", kJAFont},
-      {"U+304A", "zh-Hant,zh-Hans,ja-Jpan", kJAFont},
-      {"U+304A", "zh-Hant,ja-Jpan,zh-Hans", kJAFont},
-
-      // U+242EE is supported by both ja font and zh-Hant fonts but not by
-      // zh-Hans font.
-      {"U+242EE", "", kJAFont},  // ja font is listed before zh-Hant font.
-      {"U+242EE", "ja-Jpan", kJAFont},
-      {"U+242EE", "zh-Hans", kJAFont},
-      {"U+242EE", "zh-Hant", kZH_HantFont},
-
-      {"U+242EE", "ja-Jpan,zh-Hant", kJAFont},
-      {"U+242EE", "zh-Hant,ja-Jpan", kZH_HantFont},
-      {"U+242EE", "zh-Hans,zh-Hant", kZH_HantFont},
-      {"U+242EE", "zh-Hant,zh-Hans", kZH_HantFont},
-      {"U+242EE", "zh-Hans,ja-Jpan", kJAFont},
-      {"U+242EE", "ja-Jpan,zh-Hans", kJAFont},
-
-      {"U+242EE", "zh-Hans,ja-Jpan,zh-Hant", kJAFont},
-      {"U+242EE", "zh-Hans,zh-Hant,ja-Jpan", kZH_HantFont},
-      {"U+242EE", "ja-Jpan,zh-Hans,zh-Hant", kJAFont},
-      {"U+242EE", "ja-Jpan,zh-Hant,zh-Hans", kJAFont},
-      {"U+242EE", "zh-Hant,zh-Hans,ja-Jpan", kZH_HantFont},
-      {"U+242EE", "zh-Hant,ja-Jpan,zh-Hans", kZH_HantFont},
-
-      // U+9AA8 is supported by all ja-Jpan, zh-Hans, zh-Hant fonts.
-      {"U+9AA8", "",
-       kZH_HansFont},  // zh-Hans font is listed before ja and zh-Hant fonts.
-      {"U+9AA8", "ja-Jpan", kJAFont},
-      {"U+9AA8", "zh-Hans", kZH_HansFont},
-      {"U+9AA8", "zh-Hant", kZH_HantFont},
-
-      {"U+9AA8", "ja-Jpan,zh-Hant", kJAFont},
-      {"U+9AA8", "zh-Hant,ja-Jpan", kZH_HantFont},
-      {"U+9AA8", "zh-Hans,zh-Hant", kZH_HansFont},
-      {"U+9AA8", "zh-Hant,zh-Hans", kZH_HantFont},
-      {"U+9AA8", "zh-Hans,ja-Jpan", kZH_HansFont},
-      {"U+9AA8", "ja-Jpan,zh-Hans", kJAFont},
-
-      {"U+9AA8", "zh-Hans,ja-Jpan,zh-Hant", kZH_HansFont},
-      {"U+9AA8", "zh-Hans,zh-Hant,ja-Jpan", kZH_HansFont},
-      {"U+9AA8", "ja-Jpan,zh-Hans,zh-Hant", kJAFont},
-      {"U+9AA8", "ja-Jpan,zh-Hant,zh-Hans", kJAFont},
-      {"U+9AA8", "zh-Hant,zh-Hans,ja-Jpan", kZH_HantFont},
-      {"U+9AA8", "zh-Hant,ja-Jpan,zh-Hans", kZH_HantFont},
-
-      // U+242EE U+FE00 is supported by ja font but not by zh-Hans or zh-Hant
-      // fonts.
-      {"U+242EE U+FE00", "", kJAFont},
-      {"U+242EE U+FE00", "ja-Jpan", kJAFont},
-      {"U+242EE U+FE00", "zh-Hant", kJAFont},
-      {"U+242EE U+FE00", "zh-Hans", kJAFont},
-
-      {"U+242EE U+FE00", "ja-Jpan,zh-Hant", kJAFont},
-      {"U+242EE U+FE00", "zh-Hant,ja-Jpan", kJAFont},
-      {"U+242EE U+FE00", "zh-Hans,zh-Hant", kJAFont},
-      {"U+242EE U+FE00", "zh-Hant,zh-Hans", kJAFont},
-      {"U+242EE U+FE00", "zh-Hans,ja-Jpan", kJAFont},
-      {"U+242EE U+FE00", "ja-Jpan,zh-Hans", kJAFont},
-
-      {"U+242EE U+FE00", "zh-Hans,ja-Jpan,zh-Hant", kJAFont},
-      {"U+242EE U+FE00", "zh-Hans,zh-Hant,ja-Jpan", kJAFont},
-      {"U+242EE U+FE00", "ja-Jpan,zh-Hans,zh-Hant", kJAFont},
-      {"U+242EE U+FE00", "ja-Jpan,zh-Hant,zh-Hans", kJAFont},
-      {"U+242EE U+FE00", "zh-Hant,zh-Hans,ja-Jpan", kJAFont},
-      {"U+242EE U+FE00", "zh-Hant,ja-Jpan,zh-Hans", kJAFont},
-
-      // U+3402 U+E0100 is supported by both zh-Hans and zh-Hant but not by ja
-      // font.
-      {"U+3402 U+E0100", "",
-       kZH_HansFont},  // zh-Hans font is listed before zh-Hant font.
-      {"U+3402 U+E0100", "ja-Jpan",
-       kZH_HansFont},  // zh-Hans font is listed before zh-Hant font.
-      {"U+3402 U+E0100", "zh-Hant", kZH_HantFont},
-      {"U+3402 U+E0100", "zh-Hans", kZH_HansFont},
-
-      {"U+3402 U+E0100", "ja-Jpan,zh-Hant", kZH_HantFont},
-      {"U+3402 U+E0100", "zh-Hant,ja-Jpan", kZH_HantFont},
-      {"U+3402 U+E0100", "zh-Hans,zh-Hant", kZH_HansFont},
-      {"U+3402 U+E0100", "zh-Hant,zh-Hans", kZH_HantFont},
-      {"U+3402 U+E0100", "zh-Hans,ja-Jpan", kZH_HansFont},
-      {"U+3402 U+E0100", "ja-Jpan,zh-Hans", kZH_HansFont},
-
-      {"U+3402 U+E0100", "zh-Hans,ja-Jpan,zh-Hant", kZH_HansFont},
-      {"U+3402 U+E0100", "zh-Hans,zh-Hant,ja-Jpan", kZH_HansFont},
-      {"U+3402 U+E0100", "ja-Jpan,zh-Hans,zh-Hant", kZH_HansFont},
-      {"U+3402 U+E0100", "ja-Jpan,zh-Hant,zh-Hans", kZH_HantFont},
-      {"U+3402 U+E0100", "zh-Hant,zh-Hans,ja-Jpan", kZH_HantFont},
-      {"U+3402 U+E0100", "zh-Hant,ja-Jpan,zh-Hans", kZH_HantFont},
-
-      // No font supports U+4444 U+FE00 but only zh-Hans supports its base
-      // character U+4444.
-      {"U+4444 U+FE00", "", kZH_HansFont},
-      {"U+4444 U+FE00", "ja-Jpan", kZH_HansFont},
-      {"U+4444 U+FE00", "zh-Hant", kZH_HansFont},
-      {"U+4444 U+FE00", "zh-Hans", kZH_HansFont},
-
-      {"U+4444 U+FE00", "ja-Jpan,zh-Hant", kZH_HansFont},
-      {"U+4444 U+FE00", "zh-Hant,ja-Jpan", kZH_HansFont},
-      {"U+4444 U+FE00", "zh-Hans,zh-Hant", kZH_HansFont},
-      {"U+4444 U+FE00", "zh-Hant,zh-Hans", kZH_HansFont},
-      {"U+4444 U+FE00", "zh-Hans,ja-Jpan", kZH_HansFont},
-      {"U+4444 U+FE00", "ja-Jpan,zh-Hans", kZH_HansFont},
-
-      {"U+4444 U+FE00", "zh-Hans,ja-Jpan,zh-Hant", kZH_HansFont},
-      {"U+4444 U+FE00", "zh-Hans,zh-Hant,ja-Jpan", kZH_HansFont},
-      {"U+4444 U+FE00", "ja-Jpan,zh-Hans,zh-Hant", kZH_HansFont},
-      {"U+4444 U+FE00", "ja-Jpan,zh-Hant,zh-Hans", kZH_HansFont},
-      {"U+4444 U+FE00", "zh-Hant,zh-Hans,ja-Jpan", kZH_HansFont},
-      {"U+4444 U+FE00", "zh-Hant,ja-Jpan,zh-Hans", kZH_HansFont},
-
-      // No font supports U+81ED U+E0100 but ja and zh-Hans support its base
-      // character U+81ED.
-      // zh-Hans font is listed before ja font.
-      {"U+81ED U+E0100", "", kZH_HansFont},
-      {"U+81ED U+E0100", "ja-Jpan", kJAFont},
-      {"U+81ED U+E0100", "zh-Hant", kZH_HansFont},
-      {"U+81ED U+E0100", "zh-Hans", kZH_HansFont},
-
-      {"U+81ED U+E0100", "ja-Jpan,zh-Hant", kJAFont},
-      {"U+81ED U+E0100", "zh-Hant,ja-Jpan", kJAFont},
-      {"U+81ED U+E0100", "zh-Hans,zh-Hant", kZH_HansFont},
-      {"U+81ED U+E0100", "zh-Hant,zh-Hans", kZH_HansFont},
-      {"U+81ED U+E0100", "zh-Hans,ja-Jpan", kZH_HansFont},
-      {"U+81ED U+E0100", "ja-Jpan,zh-Hans", kJAFont},
-
-      {"U+81ED U+E0100", "zh-Hans,ja-Jpan,zh-Hant", kZH_HansFont},
-      {"U+81ED U+E0100", "zh-Hans,zh-Hant,ja-Jpan", kZH_HansFont},
-      {"U+81ED U+E0100", "ja-Jpan,zh-Hans,zh-Hant", kJAFont},
-      {"U+81ED U+E0100", "ja-Jpan,zh-Hant,zh-Hans", kJAFont},
-      {"U+81ED U+E0100", "zh-Hant,zh-Hans,ja-Jpan", kZH_HansFont},
-      {"U+81ED U+E0100", "zh-Hant,ja-Jpan,zh-Hans", kJAFont},
-
-      // No font supports U+9AA8 U+E0100 but all zh-Hans zh-hant ja fonts
-      // support its base
-      // character U+9AA8.
-      // zh-Hans font is listed before ja and zh-Hant fonts.
-      {"U+9AA8 U+E0100", "", kZH_HansFont},
-      {"U+9AA8 U+E0100", "ja-Jpan", kJAFont},
-      {"U+9AA8 U+E0100", "zh-Hans", kZH_HansFont},
-      {"U+9AA8 U+E0100", "zh-Hant", kZH_HantFont},
-
-      {"U+9AA8 U+E0100", "ja-Jpan,zh-Hant", kJAFont},
-      {"U+9AA8 U+E0100", "zh-Hant,ja-Jpan", kZH_HantFont},
-      {"U+9AA8 U+E0100", "zh-Hans,zh-Hant", kZH_HansFont},
-      {"U+9AA8 U+E0100", "zh-Hant,zh-Hans", kZH_HantFont},
-      {"U+9AA8 U+E0100", "zh-Hans,ja-Jpan", kZH_HansFont},
-      {"U+9AA8 U+E0100", "ja-Jpan,zh-Hans", kJAFont},
-
-      {"U+9AA8 U+E0100", "zh-Hans,ja-Jpan,zh-Hant", kZH_HansFont},
-      {"U+9AA8 U+E0100", "zh-Hans,zh-Hant,ja-Jpan", kZH_HansFont},
-      {"U+9AA8 U+E0100", "ja-Jpan,zh-Hans,zh-Hant", kJAFont},
-      {"U+9AA8 U+E0100", "ja-Jpan,zh-Hant,zh-Hans", kJAFont},
-      {"U+9AA8 U+E0100", "zh-Hant,zh-Hans,ja-Jpan", kZH_HantFont},
-      {"U+9AA8 U+E0100", "zh-Hant,ja-Jpan,zh-Hans", kZH_HantFont},
-
-      // All zh-Hans,zh-Hant,ja fonts support U+35A8 U+E0100 and its base
-      // character U+35A8.
-      // zh-Hans font is listed before ja and zh-Hant fonts.
-      {"U+35A8", "", kZH_HansFont},
-      {"U+35A8", "ja-Jpan", kJAFont},
-      {"U+35A8", "zh-Hans", kZH_HansFont},
-      {"U+35A8", "zh-Hant", kZH_HantFont},
-
-      {"U+35A8", "ja-Jpan,zh-Hant", kJAFont},
-      {"U+35A8", "zh-Hant,ja-Jpan", kZH_HantFont},
-      {"U+35A8", "zh-Hans,zh-Hant", kZH_HansFont},
-      {"U+35A8", "zh-Hant,zh-Hans", kZH_HantFont},
-      {"U+35A8", "zh-Hans,ja-Jpan", kZH_HansFont},
-      {"U+35A8", "ja-Jpan,zh-Hans", kJAFont},
-
-      {"U+35A8", "zh-Hans,ja-Jpan,zh-Hant", kZH_HansFont},
-      {"U+35A8", "zh-Hans,zh-Hant,ja-Jpan", kZH_HansFont},
-      {"U+35A8", "ja-Jpan,zh-Hans,zh-Hant", kJAFont},
-      {"U+35A8", "ja-Jpan,zh-Hant,zh-Hans", kJAFont},
-      {"U+35A8", "zh-Hant,zh-Hans,ja-Jpan", kZH_HantFont},
-      {"U+35A8", "zh-Hant,ja-Jpan,zh-Hans", kZH_HantFont},
-
-      // All zh-Hans,zh-Hant,ja fonts support U+35B6 U+E0100, but zh-Hant and ja
-      // fonts support its
-      // base character U+35B6.
-      // ja font is listed before zh-Hant font.
-      {"U+35B6", "", kJAFont},
-      {"U+35B6", "ja-Jpan", kJAFont},
-      {"U+35B6", "zh-Hant", kZH_HantFont},
-      {"U+35B6", "zh-Hans", kJAFont},
-
-      {"U+35B6", "ja-Jpan,zh-Hant", kJAFont},
-      {"U+35B6", "zh-Hant,ja-Jpan", kZH_HantFont},
-      {"U+35B6", "zh-Hans,zh-Hant", kZH_HantFont},
-      {"U+35B6", "zh-Hant,zh-Hans", kZH_HantFont},
-      {"U+35B6", "zh-Hans,ja-Jpan", kJAFont},
-      {"U+35B6", "ja-Jpan,zh-Hans", kJAFont},
-
-      {"U+35B6", "zh-Hans,ja-Jpan,zh-Hant", kJAFont},
-      {"U+35B6", "zh-Hans,zh-Hant,ja-Jpan", kZH_HantFont},
-      {"U+35B6", "ja-Jpan,zh-Hans,zh-Hant", kJAFont},
-      {"U+35B6", "ja-Jpan,zh-Hant,zh-Hans", kJAFont},
-      {"U+35B6", "zh-Hant,zh-Hans,ja-Jpan", kZH_HantFont},
-      {"U+35B6", "zh-Hant,ja-Jpan,zh-Hans", kZH_HantFont},
-
-      // All zh-Hans,zh-Hant,ja fonts support U+35C5 U+E0100, but only ja font
-      // supports its base
-      // character U+35C5.
-      {"U+35C5", "", kJAFont},
-      {"U+35C5", "ja-Jpan", kJAFont},
-      {"U+35C5", "zh-Hant", kJAFont},
-      {"U+35C5", "zh-Hans", kJAFont},
-
-      {"U+35C5", "ja-Jpan,zh-Hant", kJAFont},
-      {"U+35C5", "zh-Hant,ja-Jpan", kJAFont},
-      {"U+35C5", "zh-Hans,zh-Hant", kJAFont},
-      {"U+35C5", "zh-Hant,zh-Hans", kJAFont},
-      {"U+35C5", "zh-Hans,ja-Jpan", kJAFont},
-      {"U+35C5", "ja-Jpan,zh-Hans", kJAFont},
-
-      {"U+35C5", "zh-Hans,ja-Jpan,zh-Hant", kJAFont},
-      {"U+35C5", "zh-Hans,zh-Hant,ja-Jpan", kJAFont},
-      {"U+35C5", "ja-Jpan,zh-Hans,zh-Hant", kJAFont},
-      {"U+35C5", "ja-Jpan,zh-Hant,zh-Hans", kJAFont},
-      {"U+35C5", "zh-Hant,zh-Hans,ja-Jpan", kJAFont},
-      {"U+35C5", "zh-Hant,ja-Jpan,zh-Hans", kJAFont},
-
-      // None of ja-Jpan, zh-Hant, zh-Hans font supports U+1F469. Emoji font
-      // supports it.
-      {"U+1F469", "", kEmojiFont},
-      {"U+1F469", "ja-Jpan", kEmojiFont},
-      {"U+1F469", "zh-Hant", kEmojiFont},
-      {"U+1F469", "zh-Hans", kEmojiFont},
-
-      {"U+1F469", "ja-Jpan,zh-Hant", kEmojiFont},
-      {"U+1F469", "zh-Hant,ja-Jpan", kEmojiFont},
-      {"U+1F469", "zh-Hans,zh-Hant", kEmojiFont},
-      {"U+1F469", "zh-Hant,zh-Hans", kEmojiFont},
-      {"U+1F469", "zh-Hans,ja-Jpan", kEmojiFont},
-      {"U+1F469", "ja-Jpan,zh-Hans", kEmojiFont},
-
-      {"U+1F469", "zh-Hans,ja-Jpan,zh-Hant", kEmojiFont},
-      {"U+1F469", "zh-Hans,zh-Hant,ja-Jpan", kEmojiFont},
-      {"U+1F469", "ja-Jpan,zh-Hans,zh-Hant", kEmojiFont},
-      {"U+1F469", "ja-Jpan,zh-Hant,zh-Hans", kEmojiFont},
-      {"U+1F469", "zh-Hant,zh-Hans,ja-Jpan", kEmojiFont},
-      {"U+1F469", "zh-Hant,ja-Jpan,zh-Hans", kEmojiFont},
-  };
-
-  std::shared_ptr<FontCollection> collection(
-      getFontCollection(kTestFontDir, kItemizeFontXml));
-
-  for (auto testCase : testCases) {
-    SCOPED_TRACE("Test for \"" + testCase.testString + "\" with languages " +
-                 testCase.requestedLanguages);
-
-    std::vector<FontCollection::Run> runs;
-    const FontStyle style =
-        FontStyle(FontStyle::registerLanguageList(testCase.requestedLanguages));
-    itemize(collection, testCase.testString.c_str(), style, &runs);
-    ASSERT_EQ(1U, runs.size());
-    EXPECT_EQ(testCase.expectedFont, getFontPath(runs[0]));
-  }
-}
-
-TEST_F(FontCollectionItemizeTest, itemize_emojiSelection_withFE0E) {
-  std::shared_ptr<FontCollection> collection(
-      getFontCollection(kTestFontDir, kEmojiXmlFile));
-  std::vector<FontCollection::Run> runs;
-
-  const FontStyle kDefaultFontStyle;
-
-  // U+00A9 is a text default emoji which is only available in
-  // TextEmojiFont.ttf. TextEmojiFont.ttf should be selected.
-  itemize(collection, "U+00A9 U+FE0E", kDefaultFontStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  EXPECT_EQ(kTextEmojiFont, getFontPath(runs[0]));
-
-  // U+00A9 is a text default emoji which is only available in
-  // ColorEmojiFont.ttf. ColorEmojiFont.ttf should be selected.
-  itemize(collection, "U+00AE U+FE0E", kDefaultFontStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  // Text emoji is specified but it is not available. Use color emoji instead.
-  EXPECT_EQ(kColorEmojiFont, getFontPath(runs[0]));
-
-  // U+203C is a text default emoji which is available in both TextEmojiFont.ttf
-  // and ColorEmojiFont.ttf. TextEmojiFont.ttf should be selected.
-  itemize(collection, "U+203C U+FE0E", kDefaultFontStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  EXPECT_EQ(kTextEmojiFont, getFontPath(runs[0]));
-
-  // U+2049 is a text default emoji which is not available either
-  // TextEmojiFont.ttf or ColorEmojiFont.ttf. No font should be selected.
-  itemize(collection, "U+2049 U+FE0E", kDefaultFontStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  EXPECT_EQ(kNoGlyphFont, getFontPath(runs[0]));
-
-  // U+231A is a emoji default emoji which is available only in TextEmojifFont.
-  // TextEmojiFont.ttf sohuld be selected.
-  itemize(collection, "U+231A U+FE0E", kDefaultFontStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  EXPECT_EQ(kTextEmojiFont, getFontPath(runs[0]));
-
-  // U+231B is a emoji default emoji which is available only in
-  // ColorEmojiFont.ttf. ColorEmojiFont.ttf should be selected.
-  itemize(collection, "U+231B U+FE0E", kDefaultFontStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  // Text emoji is specified but it is not available. Use color emoji instead.
-  EXPECT_EQ(kColorEmojiFont, getFontPath(runs[0]));
-
-  // U+23E9 is a emoji default emoji which is available in both
-  // TextEmojiFont.ttf and ColorEmojiFont.ttf. TextEmojiFont.ttf should be
-  // selected even if U+23E9 is emoji default emoji since U+FE0E is appended.
-  itemize(collection, "U+23E9 U+FE0E", kDefaultFontStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  EXPECT_EQ(kTextEmojiFont, getFontPath(runs[0]));
-
-  // U+23EA is a emoji default emoji but which is not available in either
-  // TextEmojiFont.ttf or ColorEmojiFont.ttf. No font should be selected.
-  itemize(collection, "U+23EA U+FE0E", kDefaultFontStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  EXPECT_EQ(kNoGlyphFont, getFontPath(runs[0]));
-
-  // U+26FA U+FE0E is specified but ColorTextMixedEmojiFont has a variation
-  // sequence U+26F9 U+FE0F in its cmap, so ColorTextMixedEmojiFont should be
-  // selected instaed of ColorEmojiFont.
-  itemize(collection, "U+26FA U+FE0E", kDefaultFontStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  EXPECT_EQ(kMixedEmojiFont, getFontPath(runs[0]));
-}
-
-TEST_F(FontCollectionItemizeTest, itemize_emojiSelection_withFE0F) {
-  std::shared_ptr<FontCollection> collection(
-      getFontCollection(kTestFontDir, kEmojiXmlFile));
-  std::vector<FontCollection::Run> runs;
-
-  const FontStyle kDefaultFontStyle;
-
-  // U+00A9 is a text default emoji which is available only in
-  // TextEmojiFont.ttf. TextEmojiFont.ttf should be selected.
-  itemize(collection, "U+00A9 U+FE0F", kDefaultFontStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  // Color emoji is specified but it is not available. Use text representation
-  // instead.
-  EXPECT_EQ(kTextEmojiFont, getFontPath(runs[0]));
-
-  // U+00AE is a text default emoji which is available only in
-  // ColorEmojiFont.ttf. ColorEmojiFont.ttf should be selected.
-  itemize(collection, "U+00AE U+FE0F", kDefaultFontStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  EXPECT_EQ(kColorEmojiFont, getFontPath(runs[0]));
-
-  // U+203C is a text default emoji which is available in both TextEmojiFont.ttf
-  // and ColorEmojiFont.ttf. ColorEmojiFont.ttf should be selected even if
-  // U+203C is a text default emoji since U+FF0F is appended.
-  itemize(collection, "U+203C U+FE0F", kDefaultFontStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  EXPECT_EQ(kColorEmojiFont, getFontPath(runs[0]));
-
-  // U+2049 is a text default emoji which is not available in either
-  // TextEmojiFont.ttf or ColorEmojiFont.ttf. No font should be selected.
-  itemize(collection, "U+2049 U+FE0F", kDefaultFontStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  EXPECT_EQ(kNoGlyphFont, getFontPath(runs[0]));
-
-  // U+231A is a emoji default emoji which is available only in
-  // TextEmojiFont.ttf. TextEmojiFont.ttf should be selected.
-  itemize(collection, "U+231A U+FE0F", kDefaultFontStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  // Color emoji is specified but it is not available. Use text representation
-  // instead.
-  EXPECT_EQ(kTextEmojiFont, getFontPath(runs[0]));
-
-  // U+231B is a emoji default emoji which is available only in
-  // ColorEmojiFont.ttf. ColorEmojiFont.ttf should be selected.
-  itemize(collection, "U+231B U+FE0F", kDefaultFontStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  EXPECT_EQ(kColorEmojiFont, getFontPath(runs[0]));
-
-  // U+23E9 is a emoji default emoji which is available in both
-  // TextEmojiFont.ttf and ColorEmojiFont.ttf. ColorEmojiFont.ttf should be
-  // selected.
-  itemize(collection, "U+23E9 U+FE0F", kDefaultFontStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  EXPECT_EQ(kColorEmojiFont, getFontPath(runs[0]));
-
-  // U+23EA is a emoji default emoji which is not available in either
-  // TextEmojiFont.ttf or ColorEmojiFont.ttf. No font should be selected.
-  itemize(collection, "U+23EA U+FE0F", kDefaultFontStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  EXPECT_EQ(kNoGlyphFont, getFontPath(runs[0]));
-
-  // U+26F9 U+FE0F is specified but ColorTextMixedEmojiFont has a variation
-  // sequence U+26F9 U+FE0F in its cmap, so ColorTextMixedEmojiFont should be
-  // selected instaed of ColorEmojiFont.
-  itemize(collection, "U+26F9 U+FE0F", kDefaultFontStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  EXPECT_EQ(kMixedEmojiFont, getFontPath(runs[0]));
-}
-
-TEST_F(FontCollectionItemizeTest, itemize_emojiSelection_with_skinTone) {
-  std::shared_ptr<FontCollection> collection(
-      getFontCollection(kTestFontDir, kEmojiXmlFile));
-  std::vector<FontCollection::Run> runs;
-
-  const FontStyle kDefaultFontStyle;
-
-  // TextEmoji font is selected since it is listed before ColorEmoji font.
-  itemize(collection, "U+261D", kDefaultFontStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(1, runs[0].end);
-  EXPECT_EQ(kTextEmojiFont, getFontPath(runs[0]));
-
-  // If skin tone is specified, it should be colored.
-  itemize(collection, "U+261D U+1F3FD", kDefaultFontStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(3, runs[0].end);
-  EXPECT_EQ(kColorEmojiFont, getFontPath(runs[0]));
-
-  // Still color font is selected if an emoji variation selector is specified.
-  itemize(collection, "U+261D U+FE0F U+1F3FD", kDefaultFontStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(4, runs[0].end);
-  EXPECT_EQ(kColorEmojiFont, getFontPath(runs[0]));
-
-  // Text font should be selected if a text variation selector is specified and
-  // skin tone is rendered by itself.
-  itemize(collection, "U+261D U+FE0E U+1F3FD", kDefaultFontStyle, &runs);
-  ASSERT_EQ(2U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  EXPECT_EQ(kTextEmojiFont, getFontPath(runs[0]));
-  EXPECT_EQ(2, runs[1].start);
-  EXPECT_EQ(4, runs[1].end);
-  EXPECT_EQ(kColorEmojiFont, getFontPath(runs[1]));
-}
-
-TEST_F(FontCollectionItemizeTest, itemize_PrivateUseArea) {
-  std::shared_ptr<FontCollection> collection(
-      getFontCollection(kTestFontDir, kEmojiXmlFile));
-  std::vector<FontCollection::Run> runs;
-
-  const FontStyle kDefaultFontStyle;
-
-  // Should not set nullptr to the result run. (Issue 26808815)
-  itemize(collection, "U+FEE10", kDefaultFontStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(2, runs[0].end);
-  EXPECT_EQ(kNoGlyphFont, getFontPath(runs[0]));
-
-  itemize(collection, "U+FEE40 U+FE4C5", kDefaultFontStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(4, runs[0].end);
-  EXPECT_EQ(kNoGlyphFont, getFontPath(runs[0]));
-}
-
-TEST_F(FontCollectionItemizeTest, itemize_genderBalancedEmoji) {
-  std::shared_ptr<FontCollection> collection(
-      getFontCollection(kTestFontDir, kEmojiXmlFile));
-  std::vector<FontCollection::Run> runs;
-
-  const FontStyle kDefaultFontStyle;
-
-  itemize(collection, "U+1F469 U+200D U+1F373", kDefaultFontStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(5, runs[0].end);
-  EXPECT_EQ(kColorEmojiFont, getFontPath(runs[0]));
-
-  itemize(collection, "U+1F469 U+200D U+2695 U+FE0F", kDefaultFontStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(5, runs[0].end);
-  EXPECT_EQ(kColorEmojiFont, getFontPath(runs[0]));
-
-  itemize(collection, "U+1F469 U+200D U+2695", kDefaultFontStyle, &runs);
-  ASSERT_EQ(1U, runs.size());
-  EXPECT_EQ(0, runs[0].start);
-  EXPECT_EQ(4, runs[0].end);
-  EXPECT_EQ(kColorEmojiFont, getFontPath(runs[0]));
-}
-
-// For b/29585939
-TEST_F(FontCollectionItemizeTest, itemizeShouldKeepOrderForVS) {
-  const FontStyle kDefaultFontStyle;
-
-  std::shared_ptr<MinikinFont> dummyFont(new MinikinFontForTest(kNoGlyphFont));
-  std::shared_ptr<MinikinFont> fontA(new MinikinFontForTest(kZH_HansFont));
-  std::shared_ptr<MinikinFont> fontB(new MinikinFontForTest(kZH_HansFont));
-
-  std::shared_ptr<FontFamily> dummyFamily(
-      new FontFamily(std::vector<Font>({Font(dummyFont, FontStyle())})));
-  std::shared_ptr<FontFamily> familyA(
-      new FontFamily(std::vector<Font>({Font(fontA, FontStyle())})));
-  std::shared_ptr<FontFamily> familyB(
-      new FontFamily(std::vector<Font>({Font(fontB, FontStyle())})));
-
-  std::vector<std::shared_ptr<FontFamily>> families = {dummyFamily, familyA,
-                                                       familyB};
-  std::vector<std::shared_ptr<FontFamily>> reversedFamilies = {
-      dummyFamily, familyB, familyA};
-
-  std::shared_ptr<FontCollection> collection(new FontCollection(families));
-  std::shared_ptr<FontCollection> reversedCollection(
-      new FontCollection(reversedFamilies));
-
-  // Both fontA/fontB support U+35A8 but don't support U+35A8 U+E0100. The first
-  // font should be selected.
-  std::vector<FontCollection::Run> runs;
-  itemize(collection, "U+35A8 U+E0100", kDefaultFontStyle, &runs);
-  EXPECT_EQ(fontA.get(), runs[0].fakedFont.font);
-
-  itemize(reversedCollection, "U+35A8 U+E0100", kDefaultFontStyle, &runs);
-  EXPECT_EQ(fontB.get(), runs[0].fakedFont.font);
-}
-
-// For b/29585939
-TEST_F(FontCollectionItemizeTest, itemizeShouldKeepOrderForVS2) {
-  const FontStyle kDefaultFontStyle;
-
-  std::shared_ptr<MinikinFont> dummyFont(new MinikinFontForTest(kNoGlyphFont));
-  std::shared_ptr<MinikinFont> hasCmapFormat14Font(
-      new MinikinFontForTest(kHasCmapFormat14Font));
-  std::shared_ptr<MinikinFont> noCmapFormat14Font(
-      new MinikinFontForTest(kNoCmapFormat14Font));
-
-  std::shared_ptr<FontFamily> dummyFamily(
-      new FontFamily(std::vector<Font>({Font(dummyFont, FontStyle())})));
-  std::shared_ptr<FontFamily> hasCmapFormat14Family(new FontFamily(
-      std::vector<Font>({Font(hasCmapFormat14Font, FontStyle())})));
-  std::shared_ptr<FontFamily> noCmapFormat14Family(new FontFamily(
-      std::vector<Font>({Font(noCmapFormat14Font, FontStyle())})));
-
-  std::vector<std::shared_ptr<FontFamily>> families = {
-      dummyFamily, hasCmapFormat14Family, noCmapFormat14Family};
-  std::vector<std::shared_ptr<FontFamily>> reversedFamilies = {
-      dummyFamily, noCmapFormat14Family, hasCmapFormat14Family};
-
-  std::shared_ptr<FontCollection> collection(new FontCollection(families));
-  std::shared_ptr<FontCollection> reversedCollection(
-      new FontCollection(reversedFamilies));
-
-  // Both hasCmapFormat14Font/noCmapFormat14Font support U+5380 but don't
-  // support U+5380 U+E0100. The first font should be selected.
-  std::vector<FontCollection::Run> runs;
-  itemize(collection, "U+5380 U+E0100", kDefaultFontStyle, &runs);
-  EXPECT_EQ(hasCmapFormat14Font.get(), runs[0].fakedFont.font);
-
-  itemize(reversedCollection, "U+5380 U+E0100", kDefaultFontStyle, &runs);
-  EXPECT_EQ(noCmapFormat14Font.get(), runs[0].fakedFont.font);
-}
-
-}  // namespace minikin
diff --git a/third_party/txt/tests/FontCollectionTest.cpp b/third_party/txt/tests/FontCollectionTest.cpp
deleted file mode 100644
index 64b7921277efb5cd65917bbf4a3329f768b8527e..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/FontCollectionTest.cpp
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <gtest/gtest.h>
-
-#include <minikin/FontCollection.h>
-#include "FontTestUtils.h"
-#include "MinikinFontForTest.h"
-#include "minikin/MinikinInternal.h"
-
-namespace minikin {
-
-// The test font has following glyphs.
-// U+82A6
-// U+82A6 U+FE00 (VS1)
-// U+82A6 U+E0100 (VS17)
-// U+82A6 U+E0101 (VS18)
-// U+82A6 U+E0102 (VS19)
-// U+845B
-// U+845B U+FE01 (VS2)
-// U+845B U+E0101 (VS18)
-// U+845B U+E0102 (VS19)
-// U+845B U+E0103 (VS20)
-// U+537F
-// U+717D U+FE02 (VS3)
-// U+717D U+E0102 (VS19)
-// U+717D U+E0103 (VS20)
-const char kVsTestFont[] = kTestFontDir "/VariationSelectorTest-Regular.ttf";
-
-void expectVSGlyphs(const FontCollection* fc,
-                    uint32_t codepoint,
-                    const std::set<uint32_t>& vsSet) {
-  for (uint32_t vs = 0xFE00; vs <= 0xE01EF; ++vs) {
-    // Move to variation selectors supplements after variation selectors.
-    if (vs == 0xFF00) {
-      vs = 0xE0100;
-    }
-    if (vsSet.find(vs) == vsSet.end()) {
-      EXPECT_FALSE(fc->hasVariationSelector(codepoint, vs))
-          << "Glyph for U+" << std::hex << codepoint << " U+" << vs;
-    } else {
-      EXPECT_TRUE(fc->hasVariationSelector(codepoint, vs))
-          << "Glyph for U+" << std::hex << codepoint << " U+" << vs;
-    }
-  }
-}
-
-TEST(FontCollectionTest, hasVariationSelectorTest) {
-  std::shared_ptr<MinikinFont> font(new MinikinFontForTest(kVsTestFont));
-  std::shared_ptr<FontFamily> family(
-      new FontFamily(std::vector<Font>({Font(font, FontStyle())})));
-  std::vector<std::shared_ptr<FontFamily>> families({family});
-  std::shared_ptr<FontCollection> fc(new FontCollection(families));
-
-  EXPECT_FALSE(fc->hasVariationSelector(0x82A6, 0));
-  expectVSGlyphs(
-      fc.get(), 0x82A6,
-      std::set<uint32_t>({0xFE00, 0xFE0E, 0xE0100, 0xE0101, 0xE0102}));
-
-  EXPECT_FALSE(fc->hasVariationSelector(0x845B, 0));
-  expectVSGlyphs(
-      fc.get(), 0x845B,
-      std::set<uint32_t>({0xFE01, 0xFE0E, 0xE0101, 0xE0102, 0xE0103}));
-
-  EXPECT_FALSE(fc->hasVariationSelector(0x537F, 0));
-  expectVSGlyphs(fc.get(), 0x537F, std::set<uint32_t>({0xFE0E}));
-
-  EXPECT_FALSE(fc->hasVariationSelector(0x717D, 0));
-  expectVSGlyphs(fc.get(), 0x717D,
-                 std::set<uint32_t>({0xFE02, 0xE0102, 0xE0103}));
-}
-
-const char kEmojiXmlFile[] = kTestFontDir "emoji.xml";
-
-TEST(FontCollectionTest, hasVariationSelectorTest_emoji) {
-  std::shared_ptr<FontCollection> collection(
-      getFontCollection(kTestFontDir, kEmojiXmlFile));
-
-  // Both text/color font have cmap format 14 subtable entry for VS15/VS16
-  // respectively.
-  EXPECT_TRUE(collection->hasVariationSelector(0x2623, 0xFE0E));
-  EXPECT_TRUE(collection->hasVariationSelector(0x2623, 0xFE0F));
-
-  // The text font has cmap format 14 subtable entry for VS15 but the color font
-  // doesn't have for VS16
-  EXPECT_TRUE(collection->hasVariationSelector(0x2626, 0xFE0E));
-  EXPECT_FALSE(collection->hasVariationSelector(0x2626, 0xFE0F));
-
-  // The color font has cmap format 14 subtable entry for VS16 but the text font
-  // doesn't have for VS15.
-  EXPECT_TRUE(collection->hasVariationSelector(0x262A, 0xFE0E));
-  EXPECT_TRUE(collection->hasVariationSelector(0x262A, 0xFE0F));
-
-  // Neither text/color font have cmap format 14 subtable entry for VS15/VS16.
-  EXPECT_TRUE(collection->hasVariationSelector(0x262E, 0xFE0E));
-  EXPECT_FALSE(collection->hasVariationSelector(0x262E, 0xFE0F));
-
-  // Text font doesn't support U+1F3FD. Only the color emoji fonts has. So VS15
-  // is not supported.
-  EXPECT_FALSE(collection->hasVariationSelector(0x1F3FD, 0xFE0E));
-
-  // Text font doesn't have U+262F U+FE0E or even its base code point U+262F.
-  EXPECT_FALSE(collection->hasVariationSelector(0x262F, 0xFE0E));
-
-  // None of the fonts support U+2229.
-  EXPECT_FALSE(collection->hasVariationSelector(0x2229, 0xFE0E));
-  EXPECT_FALSE(collection->hasVariationSelector(0x2229, 0xFE0F));
-}
-
-TEST(FontCollectionTest, newEmojiTest) {
-  std::shared_ptr<FontCollection> collection(
-      getFontCollection(kTestFontDir, kEmojiXmlFile));
-
-  // U+2695, U+2640, U+2642 are not in emoji catrgory in Unicode 9 but they are
-  // now in emoji category. Should return true even if U+FE0E was appended.
-  // These three emojis are only avalilable in TextEmoji.ttf but U+2695 is
-  // excluded here since it is used in other tests.
-  EXPECT_TRUE(collection->hasVariationSelector(0x2640, 0xFE0E));
-  EXPECT_FALSE(collection->hasVariationSelector(0x2640, 0xFE0F));
-  EXPECT_TRUE(collection->hasVariationSelector(0x2642, 0xFE0E));
-  EXPECT_FALSE(collection->hasVariationSelector(0x2642, 0xFE0F));
-}
-
-TEST(FontCollectionTest, createWithVariations) {
-  // This font has 'wdth' and 'wght' axes.
-  const char kMultiAxisFont[] = kTestFontDir "/MultiAxis.ttf";
-  const char kNoAxisFont[] = kTestFontDir "/Regular.ttf";
-
-  std::shared_ptr<MinikinFont> multiAxisFont(
-      new MinikinFontForTest(kMultiAxisFont));
-  std::shared_ptr<FontFamily> multiAxisFamily(
-      new FontFamily(std::vector<Font>({Font(multiAxisFont, FontStyle())})));
-  std::vector<std::shared_ptr<FontFamily>> multiAxisFamilies({multiAxisFamily});
-  std::shared_ptr<FontCollection> multiAxisFc(
-      new FontCollection(multiAxisFamilies));
-
-  std::shared_ptr<MinikinFont> noAxisFont(new MinikinFontForTest(kNoAxisFont));
-  std::shared_ptr<FontFamily> noAxisFamily(
-      new FontFamily(std::vector<Font>({Font(noAxisFont, FontStyle())})));
-  std::vector<std::shared_ptr<FontFamily>> noAxisFamilies({noAxisFamily});
-  std::shared_ptr<FontCollection> noAxisFc(new FontCollection(noAxisFamilies));
-
-  {
-    // Do not ceate new instance if none of variations are specified.
-    EXPECT_EQ(nullptr, multiAxisFc->createCollectionWithVariation(
-                           std::vector<FontVariation>()));
-    EXPECT_EQ(nullptr, noAxisFc->createCollectionWithVariation(
-                           std::vector<FontVariation>()));
-  }
-  {
-    // New instance should be used for supported variation.
-    std::vector<FontVariation> variations = {
-        {MinikinFont::MakeTag('w', 'd', 't', 'h'), 1.0f}};
-    std::shared_ptr<FontCollection> newFc(
-        multiAxisFc->createCollectionWithVariation(variations));
-    EXPECT_NE(nullptr, newFc.get());
-    EXPECT_NE(multiAxisFc.get(), newFc.get());
-
-    EXPECT_EQ(nullptr, noAxisFc->createCollectionWithVariation(variations));
-  }
-  {
-    // New instance should be used for supported variation (multiple variations
-    // case).
-    std::vector<FontVariation> variations = {
-        {MinikinFont::MakeTag('w', 'd', 't', 'h'), 1.0f},
-        {MinikinFont::MakeTag('w', 'g', 'h', 't'), 1.0f}};
-    std::shared_ptr<FontCollection> newFc(
-        multiAxisFc->createCollectionWithVariation(variations));
-    EXPECT_NE(nullptr, newFc.get());
-    EXPECT_NE(multiAxisFc.get(), newFc.get());
-
-    EXPECT_EQ(nullptr, noAxisFc->createCollectionWithVariation(variations));
-  }
-  {
-    // Do not ceate new instance if none of variations are supported.
-    std::vector<FontVariation> variations = {
-        {MinikinFont::MakeTag('Z', 'Z', 'Z', 'Z'), 1.0f}};
-    EXPECT_EQ(nullptr, multiAxisFc->createCollectionWithVariation(variations));
-    EXPECT_EQ(nullptr, noAxisFc->createCollectionWithVariation(variations));
-  }
-  {
-    // At least one axis is supported, should create new instance.
-    std::vector<FontVariation> variations = {
-        {MinikinFont::MakeTag('w', 'd', 't', 'h'), 1.0f},
-        {MinikinFont::MakeTag('Z', 'Z', 'Z', 'Z'), 1.0f}};
-    std::shared_ptr<FontCollection> newFc(
-        multiAxisFc->createCollectionWithVariation(variations));
-    EXPECT_NE(nullptr, newFc.get());
-    EXPECT_NE(multiAxisFc.get(), newFc.get());
-
-    EXPECT_EQ(nullptr, noAxisFc->createCollectionWithVariation(variations));
-  }
-}
-
-}  // namespace minikin
diff --git a/third_party/txt/tests/FontFamilyTest.cpp b/third_party/txt/tests/FontFamilyTest.cpp
deleted file mode 100644
index 2cf823eca005874c1533d0b53e1506644e36d350..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/FontFamilyTest.cpp
+++ /dev/null
@@ -1,726 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <minikin/FontFamily.h>
-
-#include <gtest/gtest.h>
-#include <log/log.h>
-
-#include "ICUTestBase.h"
-#include "MinikinFontForTest.h"
-#include "minikin/FontLanguageListCache.h"
-#include "minikin/MinikinInternal.h"
-
-namespace minikin {
-
-typedef ICUTestBase FontLanguagesTest;
-typedef ICUTestBase FontLanguageTest;
-
-static const FontLanguages& createFontLanguages(const std::string& input) {
-  std::scoped_lock _l(gMinikinLock);
-  uint32_t langId = FontLanguageListCache::getId(input);
-  return FontLanguageListCache::getById(langId);
-}
-
-static FontLanguage createFontLanguage(const std::string& input) {
-  std::scoped_lock _l(gMinikinLock);
-  uint32_t langId = FontLanguageListCache::getId(input);
-  return FontLanguageListCache::getById(langId)[0];
-}
-
-static FontLanguage createFontLanguageWithoutICUSanitization(
-    const std::string& input) {
-  return FontLanguage(input.c_str(), input.size());
-}
-
-std::shared_ptr<FontFamily> makeFamily(const std::string& fontPath) {
-  std::shared_ptr<MinikinFont> font(new MinikinFontForTest(fontPath));
-  return std::make_shared<FontFamily>(
-      std::vector<Font>({Font(font, FontStyle())}));
-}
-
-TEST_F(FontLanguageTest, basicTests) {
-  FontLanguage defaultLang;
-  FontLanguage emptyLang("", 0);
-  FontLanguage english = createFontLanguage("en");
-  FontLanguage french = createFontLanguage("fr");
-  FontLanguage und = createFontLanguage("und");
-  FontLanguage undZsye = createFontLanguage("und-Zsye");
-
-  EXPECT_EQ(english, english);
-  EXPECT_EQ(french, french);
-
-  EXPECT_TRUE(defaultLang != defaultLang);
-  EXPECT_TRUE(emptyLang != emptyLang);
-  EXPECT_TRUE(defaultLang != emptyLang);
-  EXPECT_TRUE(defaultLang != und);
-  EXPECT_TRUE(emptyLang != und);
-  EXPECT_TRUE(english != defaultLang);
-  EXPECT_TRUE(english != emptyLang);
-  EXPECT_TRUE(english != french);
-  EXPECT_TRUE(english != undZsye);
-  EXPECT_TRUE(und != undZsye);
-  EXPECT_TRUE(english != und);
-
-  EXPECT_TRUE(defaultLang.isUnsupported());
-  EXPECT_TRUE(emptyLang.isUnsupported());
-
-  EXPECT_FALSE(english.isUnsupported());
-  EXPECT_FALSE(french.isUnsupported());
-  EXPECT_FALSE(und.isUnsupported());
-  EXPECT_FALSE(undZsye.isUnsupported());
-}
-
-TEST_F(FontLanguageTest, getStringTest) {
-  EXPECT_EQ("en-Latn-US", createFontLanguage("en").getString());
-  EXPECT_EQ("en-Latn-US", createFontLanguage("en-Latn").getString());
-
-  // Capitalized language code or lowercased script should be normalized.
-  EXPECT_EQ("en-Latn-US", createFontLanguage("EN-LATN").getString());
-  EXPECT_EQ("en-Latn-US", createFontLanguage("EN-latn").getString());
-  EXPECT_EQ("en-Latn-US", createFontLanguage("en-latn").getString());
-
-  // Invalid script should be kept.
-  EXPECT_EQ("en-Xyzt-US", createFontLanguage("en-xyzt").getString());
-
-  EXPECT_EQ("en-Latn-US", createFontLanguage("en-Latn-US").getString());
-  EXPECT_EQ("ja-Jpan-JP", createFontLanguage("ja").getString());
-  EXPECT_EQ("zh-Hant-TW", createFontLanguage("zh-TW").getString());
-  EXPECT_EQ("zh-Hant-HK", createFontLanguage("zh-HK").getString());
-  EXPECT_EQ("zh-Hant-MO", createFontLanguage("zh-MO").getString());
-  EXPECT_EQ("zh-Hans-CN", createFontLanguage("zh").getString());
-  EXPECT_EQ("zh-Hans-CN", createFontLanguage("zh-CN").getString());
-  EXPECT_EQ("zh-Hans-SG", createFontLanguage("zh-SG").getString());
-  EXPECT_EQ("und", createFontLanguage("und").getString());
-  EXPECT_EQ("und", createFontLanguage("UND").getString());
-  EXPECT_EQ("und", createFontLanguage("Und").getString());
-  EXPECT_EQ("und-Zsye", createFontLanguage("und-Zsye").getString());
-  EXPECT_EQ("und-Zsye", createFontLanguage("Und-ZSYE").getString());
-  EXPECT_EQ("und-Zsye", createFontLanguage("Und-zsye").getString());
-
-  EXPECT_EQ("de-Latn-DE", createFontLanguage("de-1901").getString());
-
-  EXPECT_EQ("es-Latn-419", createFontLanguage("es-Latn-419").getString());
-
-  // Emoji subtag is dropped from getString().
-  EXPECT_EQ("es-Latn-419", createFontLanguage("es-419-u-em-emoji").getString());
-  EXPECT_EQ("es-Latn-419",
-            createFontLanguage("es-Latn-419-u-em-emoji").getString());
-
-  // This is not a necessary desired behavior, just known behavior.
-  EXPECT_EQ("en-Latn-US", createFontLanguage("und-Abcdefgh").getString());
-}
-
-TEST_F(FontLanguageTest, testReconstruction) {
-  EXPECT_EQ("en", createFontLanguageWithoutICUSanitization("en").getString());
-  EXPECT_EQ("fil", createFontLanguageWithoutICUSanitization("fil").getString());
-  EXPECT_EQ("und", createFontLanguageWithoutICUSanitization("und").getString());
-
-  EXPECT_EQ("en-Latn",
-            createFontLanguageWithoutICUSanitization("en-Latn").getString());
-  EXPECT_EQ("fil-Taga",
-            createFontLanguageWithoutICUSanitization("fil-Taga").getString());
-  EXPECT_EQ("und-Zsye",
-            createFontLanguageWithoutICUSanitization("und-Zsye").getString());
-
-  EXPECT_EQ("en-US",
-            createFontLanguageWithoutICUSanitization("en-US").getString());
-  EXPECT_EQ("fil-PH",
-            createFontLanguageWithoutICUSanitization("fil-PH").getString());
-  EXPECT_EQ("es-419",
-            createFontLanguageWithoutICUSanitization("es-419").getString());
-
-  EXPECT_EQ("en-Latn-US",
-            createFontLanguageWithoutICUSanitization("en-Latn-US").getString());
-  EXPECT_EQ(
-      "fil-Taga-PH",
-      createFontLanguageWithoutICUSanitization("fil-Taga-PH").getString());
-  EXPECT_EQ(
-      "es-Latn-419",
-      createFontLanguageWithoutICUSanitization("es-Latn-419").getString());
-
-  // Possible minimum/maximum values.
-  EXPECT_EQ("aa", createFontLanguageWithoutICUSanitization("aa").getString());
-  EXPECT_EQ("zz", createFontLanguageWithoutICUSanitization("zz").getString());
-  EXPECT_EQ("aa-Aaaa",
-            createFontLanguageWithoutICUSanitization("aa-Aaaa").getString());
-  EXPECT_EQ("zz-Zzzz",
-            createFontLanguageWithoutICUSanitization("zz-Zzzz").getString());
-  EXPECT_EQ(
-      "aaa-Aaaa-AA",
-      createFontLanguageWithoutICUSanitization("aaa-Aaaa-AA").getString());
-  EXPECT_EQ(
-      "zzz-Zzzz-ZZ",
-      createFontLanguageWithoutICUSanitization("zzz-Zzzz-ZZ").getString());
-  EXPECT_EQ(
-      "aaa-Aaaa-000",
-      createFontLanguageWithoutICUSanitization("aaa-Aaaa-000").getString());
-  EXPECT_EQ(
-      "zzz-Zzzz-999",
-      createFontLanguageWithoutICUSanitization("zzz-Zzzz-999").getString());
-}
-
-TEST_F(FontLanguageTest, ScriptEqualTest) {
-  EXPECT_TRUE(createFontLanguage("en").isEqualScript(createFontLanguage("en")));
-  EXPECT_TRUE(
-      createFontLanguage("en-Latn").isEqualScript(createFontLanguage("en")));
-  EXPECT_TRUE(createFontLanguage("jp-Latn").isEqualScript(
-      createFontLanguage("en-Latn")));
-  EXPECT_TRUE(createFontLanguage("en-Jpan").isEqualScript(
-      createFontLanguage("en-Jpan")));
-
-  EXPECT_FALSE(createFontLanguage("en-Jpan").isEqualScript(
-      createFontLanguage("en-Hira")));
-  EXPECT_FALSE(createFontLanguage("en-Jpan").isEqualScript(
-      createFontLanguage("en-Hani")));
-}
-
-TEST_F(FontLanguageTest, ScriptMatchTest) {
-  const bool SUPPORTED = true;
-  const bool NOT_SUPPORTED = false;
-
-  struct TestCase {
-    const std::string baseScript;
-    const std::string requestedScript;
-    bool isSupported;
-  } testCases[] = {
-      // Same scripts
-      {"en-Latn", "Latn", SUPPORTED},
-      {"ja-Jpan", "Jpan", SUPPORTED},
-      {"ja-Hira", "Hira", SUPPORTED},
-      {"ja-Kana", "Kana", SUPPORTED},
-      {"ja-Hrkt", "Hrkt", SUPPORTED},
-      {"zh-Hans", "Hans", SUPPORTED},
-      {"zh-Hant", "Hant", SUPPORTED},
-      {"zh-Hani", "Hani", SUPPORTED},
-      {"ko-Kore", "Kore", SUPPORTED},
-      {"ko-Hang", "Hang", SUPPORTED},
-      {"zh-Hanb", "Hanb", SUPPORTED},
-
-      // Japanese supports Hiragana, Katakanara, etc.
-      {"ja-Jpan", "Hira", SUPPORTED},
-      {"ja-Jpan", "Kana", SUPPORTED},
-      {"ja-Jpan", "Hrkt", SUPPORTED},
-      {"ja-Hrkt", "Hira", SUPPORTED},
-      {"ja-Hrkt", "Kana", SUPPORTED},
-
-      // Chinese supports Han.
-      {"zh-Hans", "Hani", SUPPORTED},
-      {"zh-Hant", "Hani", SUPPORTED},
-      {"zh-Hanb", "Hani", SUPPORTED},
-
-      // Hanb supports Bopomofo.
-      {"zh-Hanb", "Bopo", SUPPORTED},
-
-      // Korean supports Hangul.
-      {"ko-Kore", "Hang", SUPPORTED},
-
-      // Different scripts
-      {"ja-Jpan", "Latn", NOT_SUPPORTED},
-      {"en-Latn", "Jpan", NOT_SUPPORTED},
-      {"ja-Jpan", "Hant", NOT_SUPPORTED},
-      {"zh-Hant", "Jpan", NOT_SUPPORTED},
-      {"ja-Jpan", "Hans", NOT_SUPPORTED},
-      {"zh-Hans", "Jpan", NOT_SUPPORTED},
-      {"ja-Jpan", "Kore", NOT_SUPPORTED},
-      {"ko-Kore", "Jpan", NOT_SUPPORTED},
-      {"zh-Hans", "Hant", NOT_SUPPORTED},
-      {"zh-Hant", "Hans", NOT_SUPPORTED},
-      {"zh-Hans", "Kore", NOT_SUPPORTED},
-      {"ko-Kore", "Hans", NOT_SUPPORTED},
-      {"zh-Hant", "Kore", NOT_SUPPORTED},
-      {"ko-Kore", "Hant", NOT_SUPPORTED},
-
-      // Hiragana doesn't support Japanese, etc.
-      {"ja-Hira", "Jpan", NOT_SUPPORTED},
-      {"ja-Kana", "Jpan", NOT_SUPPORTED},
-      {"ja-Hrkt", "Jpan", NOT_SUPPORTED},
-      {"ja-Hani", "Jpan", NOT_SUPPORTED},
-      {"ja-Hira", "Hrkt", NOT_SUPPORTED},
-      {"ja-Kana", "Hrkt", NOT_SUPPORTED},
-      {"ja-Hani", "Hrkt", NOT_SUPPORTED},
-      {"ja-Hani", "Hira", NOT_SUPPORTED},
-      {"ja-Hani", "Kana", NOT_SUPPORTED},
-
-      // Kanji doesn't support Chinese, etc.
-      {"zh-Hani", "Hant", NOT_SUPPORTED},
-      {"zh-Hani", "Hans", NOT_SUPPORTED},
-      {"zh-Hani", "Hanb", NOT_SUPPORTED},
-
-      // Hangul doesn't support Korean, etc.
-      {"ko-Hang", "Kore", NOT_SUPPORTED},
-      {"ko-Hani", "Kore", NOT_SUPPORTED},
-      {"ko-Hani", "Hang", NOT_SUPPORTED},
-      {"ko-Hang", "Hani", NOT_SUPPORTED},
-
-      // Han with botomofo doesn't support simplified Chinese, etc.
-      {"zh-Hanb", "Hant", NOT_SUPPORTED},
-      {"zh-Hanb", "Hans", NOT_SUPPORTED},
-      {"zh-Hanb", "Jpan", NOT_SUPPORTED},
-      {"zh-Hanb", "Kore", NOT_SUPPORTED},
-  };
-
-  for (auto testCase : testCases) {
-    hb_script_t script = hb_script_from_iso15924_tag(
-        HB_TAG(testCase.requestedScript[0], testCase.requestedScript[1],
-               testCase.requestedScript[2], testCase.requestedScript[3]));
-    if (testCase.isSupported) {
-      EXPECT_TRUE(
-          createFontLanguage(testCase.baseScript).supportsHbScript(script))
-          << testCase.baseScript << " should support "
-          << testCase.requestedScript;
-    } else {
-      EXPECT_FALSE(
-          createFontLanguage(testCase.baseScript).supportsHbScript(script))
-          << testCase.baseScript << " shouldn't support "
-          << testCase.requestedScript;
-    }
-  }
-}
-
-TEST_F(FontLanguagesTest, basicTests) {
-  FontLanguages emptyLangs;
-  EXPECT_EQ(0u, emptyLangs.size());
-
-  FontLanguage english = createFontLanguage("en");
-  const FontLanguages& singletonLangs = createFontLanguages("en");
-  EXPECT_EQ(1u, singletonLangs.size());
-  EXPECT_EQ(english, singletonLangs[0]);
-
-  FontLanguage french = createFontLanguage("fr");
-  const FontLanguages& twoLangs = createFontLanguages("en,fr");
-  EXPECT_EQ(2u, twoLangs.size());
-  EXPECT_EQ(english, twoLangs[0]);
-  EXPECT_EQ(french, twoLangs[1]);
-}
-
-TEST_F(FontLanguagesTest, unsupportedLanguageTests) {
-  const FontLanguages& oneUnsupported = createFontLanguages("abcd-example");
-  EXPECT_TRUE(oneUnsupported.empty());
-
-  const FontLanguages& twoUnsupporteds =
-      createFontLanguages("abcd-example,abcd-example");
-  EXPECT_TRUE(twoUnsupporteds.empty());
-
-  FontLanguage english = createFontLanguage("en");
-  const FontLanguages& firstUnsupported =
-      createFontLanguages("abcd-example,en");
-  EXPECT_EQ(1u, firstUnsupported.size());
-  EXPECT_EQ(english, firstUnsupported[0]);
-
-  const FontLanguages& lastUnsupported = createFontLanguages("en,abcd-example");
-  EXPECT_EQ(1u, lastUnsupported.size());
-  EXPECT_EQ(english, lastUnsupported[0]);
-}
-
-TEST_F(FontLanguagesTest, repeatedLanguageTests) {
-  FontLanguage english = createFontLanguage("en");
-  FontLanguage french = createFontLanguage("fr");
-  FontLanguage canadianFrench = createFontLanguage("fr-CA");
-  FontLanguage englishInLatn = createFontLanguage("en-Latn");
-  ASSERT_TRUE(english == englishInLatn);
-
-  const FontLanguages& langs = createFontLanguages("en,en-Latn");
-  EXPECT_EQ(1u, langs.size());
-  EXPECT_EQ(english, langs[0]);
-
-  const FontLanguages& fr = createFontLanguages("fr,fr-FR,fr-Latn-FR");
-  EXPECT_EQ(1u, fr.size());
-  EXPECT_EQ(french, fr[0]);
-
-  // ICU appends FR to fr. The third language is dropped which is same as the
-  // first language.
-  const FontLanguages& fr2 = createFontLanguages("fr,fr-CA,fr-FR");
-  EXPECT_EQ(2u, fr2.size());
-  EXPECT_EQ(french, fr2[0]);
-  EXPECT_EQ(canadianFrench, fr2[1]);
-
-  // The order should be kept.
-  const FontLanguages& langs2 = createFontLanguages("en,fr,en-Latn");
-  EXPECT_EQ(2u, langs2.size());
-  EXPECT_EQ(english, langs2[0]);
-  EXPECT_EQ(french, langs2[1]);
-}
-
-TEST_F(FontLanguagesTest, identifierTest) {
-  EXPECT_EQ(createFontLanguage("en-Latn-US"), createFontLanguage("en-Latn-US"));
-  EXPECT_EQ(createFontLanguage("zh-Hans-CN"), createFontLanguage("zh-Hans-CN"));
-  EXPECT_EQ(createFontLanguage("en-Zsye-US"), createFontLanguage("en-Zsye-US"));
-
-  EXPECT_NE(createFontLanguage("en-Latn-US"), createFontLanguage("en-Latn-GB"));
-  EXPECT_NE(createFontLanguage("en-Latn-US"), createFontLanguage("en-Zsye-US"));
-  EXPECT_NE(createFontLanguage("es-Latn-US"), createFontLanguage("en-Latn-US"));
-  EXPECT_NE(createFontLanguage("zh-Hant-HK"), createFontLanguage("zh-Hant-TW"));
-}
-
-TEST_F(FontLanguagesTest, undEmojiTests) {
-  FontLanguage emoji = createFontLanguage("und-Zsye");
-  EXPECT_EQ(FontLanguage::EMSTYLE_EMOJI, emoji.getEmojiStyle());
-
-  FontLanguage und = createFontLanguage("und");
-  EXPECT_EQ(FontLanguage::EMSTYLE_EMPTY, und.getEmojiStyle());
-  EXPECT_FALSE(emoji == und);
-
-  FontLanguage undExample = createFontLanguage("und-example");
-  EXPECT_EQ(FontLanguage::EMSTYLE_EMPTY, undExample.getEmojiStyle());
-  EXPECT_FALSE(emoji == undExample);
-}
-
-TEST_F(FontLanguagesTest, subtagEmojiTest) {
-  std::string subtagEmojiStrings[] = {
-      // Duplicate subtag case.
-      "und-Latn-u-em-emoji-u-em-text",
-
-      // Strings that contain language.
-      "und-u-em-emoji",
-      "en-u-em-emoji",
-
-      // Strings that contain the script.
-      "und-Jpan-u-em-emoji",
-      "en-Latn-u-em-emoji",
-      "und-Zsym-u-em-emoji",
-      "und-Zsye-u-em-emoji",
-      "en-Zsym-u-em-emoji",
-      "en-Zsye-u-em-emoji",
-
-      // Strings that contain the county.
-      "und-US-u-em-emoji",
-      "en-US-u-em-emoji",
-      "es-419-u-em-emoji",
-      "und-Latn-US-u-em-emoji",
-      "en-Zsym-US-u-em-emoji",
-      "en-Zsye-US-u-em-emoji",
-      "es-Zsye-419-u-em-emoji",
-  };
-
-  for (auto subtagEmojiString : subtagEmojiStrings) {
-    SCOPED_TRACE("Test for \"" + subtagEmojiString + "\"");
-    FontLanguage subtagEmoji = createFontLanguage(subtagEmojiString);
-    EXPECT_EQ(FontLanguage::EMSTYLE_EMOJI, subtagEmoji.getEmojiStyle());
-  }
-}
-
-TEST_F(FontLanguagesTest, subtagTextTest) {
-  std::string subtagTextStrings[] = {
-      // Duplicate subtag case.
-      "und-Latn-u-em-text-u-em-emoji",
-
-      // Strings that contain language.
-      "und-u-em-text",
-      "en-u-em-text",
-
-      // Strings that contain the script.
-      "und-Latn-u-em-text",
-      "en-Jpan-u-em-text",
-      "und-Zsym-u-em-text",
-      "und-Zsye-u-em-text",
-      "en-Zsym-u-em-text",
-      "en-Zsye-u-em-text",
-
-      // Strings that contain the county.
-      "und-US-u-em-text",
-      "en-US-u-em-text",
-      "es-419-u-em-text",
-      "und-Latn-US-u-em-text",
-      "en-Zsym-US-u-em-text",
-      "en-Zsye-US-u-em-text",
-      "es-Zsye-419-u-em-text",
-  };
-
-  for (auto subtagTextString : subtagTextStrings) {
-    SCOPED_TRACE("Test for \"" + subtagTextString + "\"");
-    FontLanguage subtagText = createFontLanguage(subtagTextString);
-    EXPECT_EQ(FontLanguage::EMSTYLE_TEXT, subtagText.getEmojiStyle());
-  }
-}
-
-// TODO: add more "und" language cases whose language and script are
-//       unexpectedly translated to en-Latn by ICU.
-TEST_F(FontLanguagesTest, subtagDefaultTest) {
-  std::string subtagDefaultStrings[] = {
-      // Duplicate subtag case.
-      "en-Latn-u-em-default-u-em-emoji",
-      "en-Latn-u-em-default-u-em-text",
-
-      // Strings that contain language.
-      "und-u-em-default",
-      "en-u-em-default",
-
-      // Strings that contain the script.
-      "en-Latn-u-em-default",
-      "en-Zsym-u-em-default",
-      "en-Zsye-u-em-default",
-
-      // Strings that contain the county.
-      "en-US-u-em-default",
-      "en-Latn-US-u-em-default",
-      "es-Latn-419-u-em-default",
-      "en-Zsym-US-u-em-default",
-      "en-Zsye-US-u-em-default",
-      "es-Zsye-419-u-em-default",
-  };
-
-  for (auto subtagDefaultString : subtagDefaultStrings) {
-    SCOPED_TRACE("Test for \"" + subtagDefaultString + "\"");
-    FontLanguage subtagDefault = createFontLanguage(subtagDefaultString);
-    EXPECT_EQ(FontLanguage::EMSTYLE_DEFAULT, subtagDefault.getEmojiStyle());
-  }
-}
-
-TEST_F(FontLanguagesTest, subtagEmptyTest) {
-  std::string subtagEmptyStrings[] = {
-      "und",
-      "jp",
-      "en-US",
-      "en-Latn",
-      "en-Latn-US",
-      "en-Latn-US-u-em",
-      "en-Latn-US-u-em-defaultemoji",
-  };
-
-  for (auto subtagEmptyString : subtagEmptyStrings) {
-    SCOPED_TRACE("Test for \"" + subtagEmptyString + "\"");
-    FontLanguage subtagEmpty = createFontLanguage(subtagEmptyString);
-    EXPECT_EQ(FontLanguage::EMSTYLE_EMPTY, subtagEmpty.getEmojiStyle());
-  }
-}
-
-TEST_F(FontLanguagesTest, registerLanguageListTest) {
-  EXPECT_EQ(0UL, FontStyle::registerLanguageList(""));
-  EXPECT_NE(0UL, FontStyle::registerLanguageList("en"));
-  EXPECT_NE(0UL, FontStyle::registerLanguageList("jp"));
-  EXPECT_NE(0UL, FontStyle::registerLanguageList("en,zh-Hans"));
-
-  EXPECT_EQ(FontStyle::registerLanguageList("en"),
-            FontStyle::registerLanguageList("en"));
-  EXPECT_NE(FontStyle::registerLanguageList("en"),
-            FontStyle::registerLanguageList("jp"));
-
-  EXPECT_EQ(FontStyle::registerLanguageList("en,zh-Hans"),
-            FontStyle::registerLanguageList("en,zh-Hans"));
-  EXPECT_NE(FontStyle::registerLanguageList("en,zh-Hans"),
-            FontStyle::registerLanguageList("zh-Hans,en"));
-  EXPECT_NE(FontStyle::registerLanguageList("en,zh-Hans"),
-            FontStyle::registerLanguageList("jp"));
-  EXPECT_NE(FontStyle::registerLanguageList("en,zh-Hans"),
-            FontStyle::registerLanguageList("en"));
-  EXPECT_NE(FontStyle::registerLanguageList("en,zh-Hans"),
-            FontStyle::registerLanguageList("en,zh-Hant"));
-}
-
-// The test font has following glyphs.
-// U+82A6
-// U+82A6 U+FE00 (VS1)
-// U+82A6 U+E0100 (VS17)
-// U+82A6 U+E0101 (VS18)
-// U+82A6 U+E0102 (VS19)
-// U+845B
-// U+845B U+FE00 (VS2)
-// U+845B U+E0101 (VS18)
-// U+845B U+E0102 (VS19)
-// U+845B U+E0103 (VS20)
-// U+537F
-// U+717D U+FE02 (VS3)
-// U+717D U+E0102 (VS19)
-// U+717D U+E0103 (VS20)
-const char kVsTestFont[] = kTestFontDir "VariationSelectorTest-Regular.ttf";
-
-class FontFamilyTest : public ICUTestBase {
- public:
-  virtual void SetUp() override {
-    ICUTestBase::SetUp();
-    if (access(kVsTestFont, R_OK) != 0) {
-      FAIL() << "Unable to read " << kVsTestFont << ". "
-             << "Please prepare the test data directory. "
-             << "For more details, please see how_to_run.txt.";
-    }
-  }
-};
-
-// Asserts that the font family has glyphs for and only for specified codepoint
-// and variationSelector pairs.
-void expectVSGlyphs(FontFamily* family,
-                    uint32_t codepoint,
-                    const std::set<uint32_t>& vs) {
-  for (uint32_t i = 0xFE00; i <= 0xE01EF; ++i) {
-    // Move to variation selectors supplements after variation selectors.
-    if (i == 0xFF00) {
-      i = 0xE0100;
-    }
-    if (vs.find(i) == vs.end()) {
-      EXPECT_FALSE(family->hasGlyph(codepoint, i))
-          << "Glyph for U+" << std::hex << codepoint << " U+" << i;
-    } else {
-      EXPECT_TRUE(family->hasGlyph(codepoint, i))
-          << "Glyph for U+" << std::hex << codepoint << " U+" << i;
-    }
-  }
-}
-
-TEST_F(FontFamilyTest, hasVariationSelectorTest) {
-  std::shared_ptr<MinikinFont> minikinFont(new MinikinFontForTest(kVsTestFont));
-  std::shared_ptr<FontFamily> family(
-      new FontFamily(std::vector<Font>{Font(minikinFont, FontStyle())}));
-
-  std::scoped_lock _l(gMinikinLock);
-
-  const uint32_t kVS1 = 0xFE00;
-  const uint32_t kVS2 = 0xFE01;
-  const uint32_t kVS3 = 0xFE02;
-  const uint32_t kVS17 = 0xE0100;
-  const uint32_t kVS18 = 0xE0101;
-  const uint32_t kVS19 = 0xE0102;
-  const uint32_t kVS20 = 0xE0103;
-
-  const uint32_t kSupportedChar1 = 0x82A6;
-  EXPECT_TRUE(family->getCoverage().get(kSupportedChar1));
-  expectVSGlyphs(family.get(), kSupportedChar1,
-                 std::set<uint32_t>({kVS1, kVS17, kVS18, kVS19}));
-
-  const uint32_t kSupportedChar2 = 0x845B;
-  EXPECT_TRUE(family->getCoverage().get(kSupportedChar2));
-  expectVSGlyphs(family.get(), kSupportedChar2,
-                 std::set<uint32_t>({kVS2, kVS18, kVS19, kVS20}));
-
-  const uint32_t kNoVsSupportedChar = 0x537F;
-  EXPECT_TRUE(family->getCoverage().get(kNoVsSupportedChar));
-  expectVSGlyphs(family.get(), kNoVsSupportedChar, std::set<uint32_t>());
-
-  const uint32_t kVsOnlySupportedChar = 0x717D;
-  EXPECT_FALSE(family->getCoverage().get(kVsOnlySupportedChar));
-  expectVSGlyphs(family.get(), kVsOnlySupportedChar,
-                 std::set<uint32_t>({kVS3, kVS19, kVS20}));
-
-  const uint32_t kNotSupportedChar = 0x845C;
-  EXPECT_FALSE(family->getCoverage().get(kNotSupportedChar));
-  expectVSGlyphs(family.get(), kNotSupportedChar, std::set<uint32_t>());
-}
-
-TEST_F(FontFamilyTest, hasVSTableTest) {
-  struct TestCase {
-    const std::string fontPath;
-    bool hasVSTable;
-  } testCases[] = {
-      {kTestFontDir "Ja.ttf", true},     {kTestFontDir "ZhHant.ttf", true},
-      {kTestFontDir "ZhHans.ttf", true}, {kTestFontDir "Italic.ttf", false},
-      {kTestFontDir "Bold.ttf", false},  {kTestFontDir "BoldItalic.ttf", false},
-  };
-
-  for (auto testCase : testCases) {
-    SCOPED_TRACE(testCase.hasVSTable
-                     ? "Font " + testCase.fontPath +
-                           " should have a variation sequence table."
-                     : "Font " + testCase.fontPath +
-                           " shouldn't have a variation sequence table.");
-
-    std::shared_ptr<MinikinFont> minikinFont(
-        new MinikinFontForTest(testCase.fontPath));
-    std::shared_ptr<FontFamily> family(
-        new FontFamily(std::vector<Font>{Font(minikinFont, FontStyle())}));
-    std::scoped_lock _l(gMinikinLock);
-    EXPECT_EQ(testCase.hasVSTable, family->hasVSTable());
-  }
-}
-
-TEST_F(FontFamilyTest, createFamilyWithVariationTest) {
-  // This font has 'wdth' and 'wght' axes.
-  const char kMultiAxisFont[] = kTestFontDir "/MultiAxis.ttf";
-  const char kNoAxisFont[] = kTestFontDir "/Regular.ttf";
-
-  std::shared_ptr<FontFamily> multiAxisFamily = makeFamily(kMultiAxisFont);
-  std::shared_ptr<FontFamily> noAxisFamily = makeFamily(kNoAxisFont);
-
-  {
-    // Do not ceate new instance if none of variations are specified.
-    EXPECT_EQ(nullptr, multiAxisFamily->createFamilyWithVariation(
-                           std::vector<FontVariation>()));
-    EXPECT_EQ(nullptr, noAxisFamily->createFamilyWithVariation(
-                           std::vector<FontVariation>()));
-  }
-  {
-    // New instance should be used for supported variation.
-    std::vector<FontVariation> variations = {
-        {MinikinFont::MakeTag('w', 'd', 't', 'h'), 1.0f}};
-    std::shared_ptr<FontFamily> newFamily(
-        multiAxisFamily->createFamilyWithVariation(variations));
-    EXPECT_NE(nullptr, newFamily.get());
-    EXPECT_NE(multiAxisFamily.get(), newFamily.get());
-    EXPECT_EQ(nullptr, noAxisFamily->createFamilyWithVariation(variations));
-  }
-  {
-    // New instance should be used for supported variation. (multiple variations
-    // case)
-    std::vector<FontVariation> variations = {
-        {MinikinFont::MakeTag('w', 'd', 't', 'h'), 1.0f},
-        {MinikinFont::MakeTag('w', 'g', 'h', 't'), 1.0f}};
-    std::shared_ptr<FontFamily> newFamily(
-        multiAxisFamily->createFamilyWithVariation(variations));
-    EXPECT_NE(nullptr, newFamily.get());
-    EXPECT_NE(multiAxisFamily.get(), newFamily.get());
-    EXPECT_EQ(nullptr, noAxisFamily->createFamilyWithVariation(variations));
-  }
-  {
-    // Do not ceate new instance if none of variations are supported.
-    std::vector<FontVariation> variations = {
-        {MinikinFont::MakeTag('Z', 'Z', 'Z', 'Z'), 1.0f}};
-    EXPECT_EQ(nullptr, multiAxisFamily->createFamilyWithVariation(variations));
-    EXPECT_EQ(nullptr, noAxisFamily->createFamilyWithVariation(variations));
-  }
-  {
-    // At least one axis is supported, should create new instance.
-    std::vector<FontVariation> variations = {
-        {MinikinFont::MakeTag('w', 'd', 't', 'h'), 1.0f},
-        {MinikinFont::MakeTag('Z', 'Z', 'Z', 'Z'), 1.0f}};
-    std::shared_ptr<FontFamily> newFamily(
-        multiAxisFamily->createFamilyWithVariation(variations));
-    EXPECT_NE(nullptr, newFamily.get());
-    EXPECT_NE(multiAxisFamily.get(), newFamily.get());
-    EXPECT_EQ(nullptr, noAxisFamily->createFamilyWithVariation(variations));
-  }
-}
-
-TEST_F(FontFamilyTest, coverageTableSelectionTest) {
-  // This font supports U+0061. The cmap subtable is format 4 and its platform
-  // ID is 0 and encoding ID is 1.
-  const char kUnicodeEncoding1Font[] = kTestFontDir "UnicodeBMPOnly.ttf";
-
-  // This font supports U+0061. The cmap subtable is format 4 and its platform
-  // ID is 0 and encoding ID is 3.
-  const char kUnicodeEncoding3Font[] = kTestFontDir "UnicodeBMPOnly2.ttf";
-
-  // This font has both cmap format 4 subtable which platform ID is 0 and
-  // encoding ID is 1 and cmap format 14 subtable which platform ID is 0 and
-  // encoding ID is 10. U+0061 is listed in both subtable but U+1F926 is only
-  // listed in latter.
-  const char kUnicodeEncoding4Font[] = kTestFontDir "UnicodeUCS4.ttf";
-
-  std::shared_ptr<FontFamily> unicodeEnc1Font =
-      makeFamily(kUnicodeEncoding1Font);
-  std::shared_ptr<FontFamily> unicodeEnc3Font =
-      makeFamily(kUnicodeEncoding3Font);
-  std::shared_ptr<FontFamily> unicodeEnc4Font =
-      makeFamily(kUnicodeEncoding4Font);
-
-  std::scoped_lock _l(gMinikinLock);
-
-  EXPECT_TRUE(unicodeEnc1Font->hasGlyph(0x0061, 0));
-  EXPECT_TRUE(unicodeEnc3Font->hasGlyph(0x0061, 0));
-  EXPECT_TRUE(unicodeEnc4Font->hasGlyph(0x0061, 0));
-
-  EXPECT_TRUE(unicodeEnc4Font->hasGlyph(0x1F926, 0));
-}
-
-}  // namespace minikin
diff --git a/third_party/txt/tests/FontLanguageListCacheTest.cpp b/third_party/txt/tests/FontLanguageListCacheTest.cpp
deleted file mode 100644
index dccb5020619e6de60007e6be12cf34871f80df44..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/FontLanguageListCacheTest.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <gtest/gtest.h>
-
-#include <minikin/FontFamily.h>
-
-#include "ICUTestBase.h"
-#include "minikin/FontLanguageListCache.h"
-#include "minikin/MinikinInternal.h"
-
-namespace minikin {
-
-typedef ICUTestBase FontLanguageListCacheTest;
-
-TEST_F(FontLanguageListCacheTest, getId) {
-  EXPECT_NE(0UL, FontStyle::registerLanguageList("en"));
-  EXPECT_NE(0UL, FontStyle::registerLanguageList("jp"));
-  EXPECT_NE(0UL, FontStyle::registerLanguageList("en,zh-Hans"));
-
-  std::scoped_lock _l(gMinikinLock);
-  EXPECT_EQ(0UL, FontLanguageListCache::getId(""));
-
-  EXPECT_EQ(FontLanguageListCache::getId("en"),
-            FontLanguageListCache::getId("en"));
-  EXPECT_NE(FontLanguageListCache::getId("en"),
-            FontLanguageListCache::getId("jp"));
-
-  EXPECT_EQ(FontLanguageListCache::getId("en,zh-Hans"),
-            FontLanguageListCache::getId("en,zh-Hans"));
-  EXPECT_NE(FontLanguageListCache::getId("en,zh-Hans"),
-            FontLanguageListCache::getId("zh-Hans,en"));
-  EXPECT_NE(FontLanguageListCache::getId("en,zh-Hans"),
-            FontLanguageListCache::getId("jp"));
-  EXPECT_NE(FontLanguageListCache::getId("en,zh-Hans"),
-            FontLanguageListCache::getId("en"));
-  EXPECT_NE(FontLanguageListCache::getId("en,zh-Hans"),
-            FontLanguageListCache::getId("en,zh-Hant"));
-}
-
-TEST_F(FontLanguageListCacheTest, getById) {
-  std::scoped_lock _l(gMinikinLock);
-  uint32_t enLangId = FontLanguageListCache::getId("en");
-  uint32_t jpLangId = FontLanguageListCache::getId("jp");
-  FontLanguage english = FontLanguageListCache::getById(enLangId)[0];
-  FontLanguage japanese = FontLanguageListCache::getById(jpLangId)[0];
-
-  const FontLanguages& defLangs = FontLanguageListCache::getById(0);
-  EXPECT_TRUE(defLangs.empty());
-
-  const FontLanguages& langs =
-      FontLanguageListCache::getById(FontLanguageListCache::getId("en"));
-  ASSERT_EQ(1UL, langs.size());
-  EXPECT_EQ(english, langs[0]);
-
-  const FontLanguages& langs2 =
-      FontLanguageListCache::getById(FontLanguageListCache::getId("en,jp"));
-  ASSERT_EQ(2UL, langs2.size());
-  EXPECT_EQ(english, langs2[0]);
-  EXPECT_EQ(japanese, langs2[1]);
-}
-
-}  // namespace minikin
diff --git a/third_party/txt/tests/FontTestUtils.cpp b/third_party/txt/tests/FontTestUtils.cpp
deleted file mode 100644
index 00b78ebd147fc4637b16697f11889b3d20cdea9a..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/FontTestUtils.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "Minikin"
-
-#include <libxml/tree.h>
-#include <unistd.h>
-
-#include <log/log.h>
-
-#include <minikin/FontCollection.h>
-#include <minikin/FontFamily.h>
-#include "MinikinFontForTest.h"
-#include "minikin/FontLanguage.h"
-
-namespace minikin {
-
-std::vector<std::shared_ptr<FontFamily>> getFontFamilies(const char* fontDir,
-                                                         const char* fontXml) {
-  xmlDoc* doc = xmlReadFile(fontXml, NULL, 0);
-  xmlNode* familySet = xmlDocGetRootElement(doc);
-
-  std::vector<std::shared_ptr<FontFamily>> families;
-  for (xmlNode* familyNode = familySet->children; familyNode;
-       familyNode = familyNode->next) {
-    if (xmlStrcmp(familyNode->name, (const xmlChar*)"family") != 0) {
-      continue;
-    }
-
-    xmlChar* variantXmlch = xmlGetProp(familyNode, (const xmlChar*)"variant");
-    int variant = VARIANT_DEFAULT;
-    if (variantXmlch) {
-      if (xmlStrcmp(variantXmlch, (const xmlChar*)"elegant") == 0) {
-        variant = VARIANT_ELEGANT;
-      } else if (xmlStrcmp(variantXmlch, (const xmlChar*)"compact") == 0) {
-        variant = VARIANT_COMPACT;
-      }
-    }
-
-    std::vector<Font> fonts;
-    for (xmlNode* fontNode = familyNode->children; fontNode;
-         fontNode = fontNode->next) {
-      if (xmlStrcmp(fontNode->name, (const xmlChar*)"font") != 0) {
-        continue;
-      }
-
-      int weight =
-          atoi((const char*)(xmlGetProp(fontNode, (const xmlChar*)"weight"))) /
-          100;
-      bool italic = xmlStrcmp(xmlGetProp(fontNode, (const xmlChar*)"style"),
-                              (const xmlChar*)"italic") == 0;
-      xmlChar* index = xmlGetProp(familyNode, (const xmlChar*)"index");
-
-      xmlChar* fontFileName =
-          xmlNodeListGetString(doc, fontNode->xmlChildrenNode, 1);
-      std::string fontPath = fontDir + std::string((const char*)fontFileName);
-      xmlFree(fontFileName);
-
-      if (access(fontPath.c_str(), R_OK) != 0) {
-        ALOGW("%s is not found.", fontPath.c_str());
-        continue;
-      }
-
-      if (index == nullptr) {
-        std::shared_ptr<MinikinFont> minikinFont =
-            std::make_shared<MinikinFontForTest>(fontPath);
-        fonts.push_back(Font(minikinFont, FontStyle(weight, italic)));
-      } else {
-        std::shared_ptr<MinikinFont> minikinFont =
-            std::make_shared<MinikinFontForTest>(fontPath,
-                                                 atoi((const char*)index));
-        fonts.push_back(Font(minikinFont, FontStyle(weight, italic)));
-      }
-    }
-
-    xmlChar* lang = xmlGetProp(familyNode, (const xmlChar*)"lang");
-    std::shared_ptr<FontFamily> family;
-    if (lang == nullptr) {
-      family = std::make_shared<FontFamily>(variant, std::move(fonts));
-    } else {
-      uint32_t langId = FontStyle::registerLanguageList(
-          std::string((const char*)lang, xmlStrlen(lang)));
-      family = std::make_shared<FontFamily>(langId, variant, std::move(fonts));
-    }
-    families.push_back(family);
-  }
-  xmlFreeDoc(doc);
-  return families;
-}
-std::shared_ptr<FontCollection> getFontCollection(const char* fontDir,
-                                                  const char* fontXml) {
-  return std::make_shared<FontCollection>(getFontFamilies(fontDir, fontXml));
-}
-
-}  // namespace minikin
diff --git a/third_party/txt/tests/FontTestUtils.h b/third_party/txt/tests/FontTestUtils.h
deleted file mode 100644
index e059301f03bdf54ec42d84773b4cbc1bb408054d..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/FontTestUtils.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef MINIKIN_FONT_TEST_UTILS_H
-#define MINIKIN_FONT_TEST_UTILS_H
-
-#include <minikin/FontCollection.h>
-
-#include <memory>
-
-namespace minikin {
-
-/**
- * Returns list of FontFamily from installed fonts.
- *
- * This function reads an XML file and makes font families.
- *
- * Caller must unref the returned pointer.
- */
-std::vector<std::shared_ptr<FontFamily>> getFontFamilies(const char* fontDir,
-                                                         const char* fontXml);
-
-/**
- * Returns FontCollection from installed fonts.
- *
- * This function reads an XML file and makes font families and collections of
- * them. MinikinFontForTest is used for FontFamily creation.
- *
- * Caller must unref the returned pointer.
- */
-std::shared_ptr<FontCollection> getFontCollection(const char* fontDir,
-                                                  const char* fontXml);
-
-}  // namespace minikin
-#endif  // MINIKIN_FONT_TEST_UTILS_H
diff --git a/third_party/txt/tests/GraphemeBreakTests.cpp b/third_party/txt/tests/GraphemeBreakTests.cpp
deleted file mode 100644
index 072630ad3b35affbe38dab22c8b692d59298dac4..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/GraphemeBreakTests.cpp
+++ /dev/null
@@ -1,375 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <gtest/gtest.h>
-#include <minikin/GraphemeBreak.h>
-#include "UnicodeUtils.h"
-
-namespace minikin {
-
-bool IsBreak(const char* src) {
-  const size_t BUF_SIZE = 256;
-  uint16_t buf[BUF_SIZE];
-  size_t offset;
-  size_t size;
-  ParseUnicode(buf, BUF_SIZE, src, &size, &offset);
-  return GraphemeBreak::isGraphemeBreak(nullptr, buf, 0, size, offset);
-}
-
-bool IsBreakWithAdvances(const float* advances, const char* src) {
-  const size_t BUF_SIZE = 256;
-  uint16_t buf[BUF_SIZE];
-  size_t offset;
-  size_t size;
-  ParseUnicode(buf, BUF_SIZE, src, &size, &offset);
-  return GraphemeBreak::isGraphemeBreak(advances, buf, 0, size, offset);
-}
-
-TEST(GraphemeBreak, utf16) {
-  EXPECT_FALSE(IsBreak("U+D83C | U+DC31"));  // emoji, U+1F431
-
-  // tests for invalid UTF-16
-  EXPECT_TRUE(IsBreak("U+D800 | U+D800"));  // two leading surrogates
-  EXPECT_TRUE(IsBreak("U+DC00 | U+DC00"));  // two trailing surrogates
-  EXPECT_TRUE(IsBreak("'a' | U+D800"));     // lonely leading surrogate
-  EXPECT_TRUE(IsBreak("U+DC00 | 'a'"));     // lonely trailing surrogate
-  EXPECT_TRUE(
-      IsBreak("U+D800 | 'a'"));  // leading surrogate followed by non-surrogate
-  EXPECT_TRUE(
-      IsBreak("'a' | U+DC00"));  // non-surrogate followed by trailing surrogate
-}
-
-TEST(GraphemeBreak, rules) {
-  // Rule GB1, sot ÷; Rule GB2, ÷ eot
-  EXPECT_TRUE(IsBreak("| 'a'"));
-  EXPECT_TRUE(IsBreak("'a' |"));
-
-  // Rule GB3, CR x LF
-  EXPECT_FALSE(IsBreak("U+000D | U+000A"));  // CR x LF
-
-  // Rule GB4, (Control | CR | LF) ÷
-  EXPECT_TRUE(IsBreak("'a' | U+2028"));  // Line separator
-  EXPECT_TRUE(IsBreak("'a' | U+000D"));  // LF
-  EXPECT_TRUE(IsBreak("'a' | U+000A"));  // CR
-
-  // Rule GB5, ÷ (Control | CR | LF)
-  EXPECT_TRUE(IsBreak("U+2028 | 'a'"));  // Line separator
-  EXPECT_TRUE(IsBreak("U+000D | 'a'"));  // LF
-  EXPECT_TRUE(IsBreak("U+000A | 'a'"));  // CR
-
-  // Rule GB6, L x ( L | V | LV | LVT )
-  EXPECT_FALSE(IsBreak("U+1100 | U+1100"));  // L x L
-  EXPECT_FALSE(IsBreak("U+1100 | U+1161"));  // L x V
-  EXPECT_FALSE(IsBreak("U+1100 | U+AC00"));  // L x LV
-  EXPECT_FALSE(IsBreak("U+1100 | U+AC01"));  // L x LVT
-
-  // Rule GB7, ( LV | V ) x ( V | T )
-  EXPECT_FALSE(IsBreak("U+AC00 | U+1161"));  // LV x V
-  EXPECT_FALSE(IsBreak("U+1161 | U+1161"));  // V x V
-  EXPECT_FALSE(IsBreak("U+AC00 | U+11A8"));  // LV x T
-  EXPECT_FALSE(IsBreak("U+1161 | U+11A8"));  // V x T
-
-  // Rule GB8, ( LVT | T ) x T
-  EXPECT_FALSE(IsBreak("U+AC01 | U+11A8"));  // LVT x T
-  EXPECT_FALSE(IsBreak("U+11A8 | U+11A8"));  // T x T
-
-  // Other hangul pairs not counted above _are_ breaks (GB10)
-  EXPECT_TRUE(IsBreak("U+AC00 | U+1100"));  // LV x L
-  EXPECT_TRUE(IsBreak("U+AC01 | U+1100"));  // LVT x L
-  EXPECT_TRUE(IsBreak("U+11A8 | U+1100"));  // T x L
-  EXPECT_TRUE(IsBreak("U+11A8 | U+AC00"));  // T x LV
-  EXPECT_TRUE(IsBreak("U+11A8 | U+AC01"));  // T x LVT
-
-  // Rule GB12 and Rule GB13, Regional_Indicator x Regional_Indicator
-  EXPECT_FALSE(IsBreak("U+1F1FA | U+1F1F8"));
-  EXPECT_TRUE(IsBreak(
-      "U+1F1FA U+1F1F8 | U+1F1FA U+1F1F8"));  // Regional indicator pair (flag)
-  EXPECT_FALSE(IsBreak(
-      "U+1F1FA | U+1F1F8 U+1F1FA U+1F1F8"));  // Regional indicator pair (flag)
-  EXPECT_FALSE(IsBreak(
-      "U+1F1FA U+1F1F8 U+1F1FA | U+1F1F8"));  // Regional indicator pair (flag)
-
-  EXPECT_TRUE(
-      IsBreak("U+1F1FA U+1F1F8 | U+1F1FA"));  // Regional indicator pair (flag)
-  EXPECT_FALSE(
-      IsBreak("U+1F1FA | U+1F1F8 U+1F1FA"));  // Regional indicator pair (flag)
-  // Same case as the two above, knowing that the first two characters ligate,
-  // which is what would typically happen.
-  const float firstPairLigated[] = {1.0, 0.0, 0.0, 0.0,
-                                    1.0, 0.0};  // Two entries per codepoint
-  EXPECT_TRUE(
-      IsBreakWithAdvances(firstPairLigated, "U+1F1FA U+1F1F8 | U+1F1FA"));
-  EXPECT_FALSE(
-      IsBreakWithAdvances(firstPairLigated, "U+1F1FA | U+1F1F8 U+1F1FA"));
-  // Repeat the tests, But now the font doesn't have a ligature for the first
-  // two characters, while it does have a ligature for the last two. This could
-  // happen for fonts that do not support some (potentially encoded later than
-  // they were developed) flags.
-  const float secondPairLigated[] = {1.0, 0.0, 1.0, 0.0, 0.0, 0.0};
-  EXPECT_FALSE(
-      IsBreakWithAdvances(secondPairLigated, "U+1F1FA U+1F1F8 | U+1F1FA"));
-  EXPECT_TRUE(
-      IsBreakWithAdvances(secondPairLigated, "U+1F1FA | U+1F1F8 U+1F1FA"));
-
-  EXPECT_TRUE(IsBreak(
-      "'a' U+1F1FA U+1F1F8 | U+1F1FA"));  // Regional indicator pair (flag)
-  EXPECT_FALSE(IsBreak(
-      "'a' U+1F1FA | U+1F1F8 U+1F1FA"));  // Regional indicator pair (flag)
-
-  EXPECT_TRUE(IsBreak("'a' U+1F1FA U+1F1F8 | U+1F1FA U+1F1F8"));  // Regional
-                                                                  // indicator
-                                                                  // pair (flag)
-  EXPECT_FALSE(IsBreak("'a' U+1F1FA | U+1F1F8 U+1F1FA U+1F1F8"));  // Regional
-                                                                   // indicator
-                                                                   // pair
-                                                                   // (flag)
-  EXPECT_FALSE(IsBreak("'a' U+1F1FA U+1F1F8 U+1F1FA | U+1F1F8"));  // Regional
-                                                                   // indicator
-                                                                   // pair
-                                                                   // (flag)
-
-  // Rule GB9, x (Extend | ZWJ)
-  EXPECT_FALSE(IsBreak("'a' | U+0301"));  // combining accent
-  // TODO(jsimmons): re-enable this test when ICU has been updated in all
-  // Flutter platforms.
-  // EXPECT_FALSE(IsBreak("'a' | U+200D"));  // ZWJ
-  // Rule GB9a, x SpacingMark
-  EXPECT_FALSE(IsBreak("U+0915 | U+093E"));  // KA, AA (spacing mark)
-  // Rule GB9b, Prepend x
-  // see tailoring test for prepend, as current ICU doesn't have any characters
-  // in the class
-
-  // Rule GB999, Any ÷ Any
-  EXPECT_TRUE(IsBreak("'a' | 'b'"));
-  EXPECT_TRUE(IsBreak("'f' | 'i'"));        // probable ligature
-  EXPECT_TRUE(IsBreak("U+0644 | U+0627"));  // probable ligature, lam + alef
-  EXPECT_TRUE(IsBreak("U+4E00 | U+4E00"));  // CJK ideographs
-  EXPECT_TRUE(
-      IsBreak("'a' | U+1F1FA U+1F1F8"));  // Regional indicator pair (flag)
-  EXPECT_TRUE(
-      IsBreak("U+1F1FA U+1F1F8 | 'a'"));  // Regional indicator pair (flag)
-
-  // Extended rule for emoji tag sequence.
-  EXPECT_TRUE(IsBreak("'a' | U+1F3F4 'a'"));
-  EXPECT_TRUE(IsBreak("'a' U+1F3F4 | 'a'"));
-
-  // Immediate tag_term after tag_base.
-  EXPECT_TRUE(IsBreak("'a' | U+1F3F4 U+E007F 'a'"));
-  EXPECT_FALSE(IsBreak("U+1F3F4 | U+E007F"));
-  EXPECT_TRUE(IsBreak("'a' U+1F3F4 U+E007F | 'a'"));
-
-  // Flag sequence
-  // U+1F3F4 U+E0067 U+E0062 U+E0073 U+E0063 U+E0074 U+E007F is emoji tag
-  // sequence for the flag of Scotland. U+1F3F4 is WAVING BLACK FLAG. This can
-  // be a tag_base character. U+E0067 is TAG LATIN SMALL LETTER G. This can be a
-  // part of tag_spec. U+E0062 is TAG LATIN SMALL LETTER B. This can be a part
-  // of tag_spec. U+E0073 is TAG LATIN SMALL LETTER S. This can be a part of
-  // tag_spec. U+E0063 is TAG LATIN SMALL LETTER C. This can be a part of
-  // tag_spec. U+E0074 is TAG LATIN SMALL LETTER T. This can be a part of
-  // tag_spec. U+E007F is CANCEL TAG. This is a tag_term character.
-  EXPECT_TRUE(
-      IsBreak("'a' | U+1F3F4 U+E0067 U+E0062 U+E0073 U+E0063 U+E0074 U+E007F"));
-  EXPECT_FALSE(
-      IsBreak("U+1F3F4 | U+E0067 U+E0062 U+E0073 U+E0063 U+E0074 U+E007F"));
-  EXPECT_FALSE(
-      IsBreak("U+1F3F4 U+E0067 | U+E0062 U+E0073 U+E0063 U+E0074 U+E007F"));
-  EXPECT_FALSE(
-      IsBreak("U+1F3F4 U+E0067 U+E0062 | U+E0073 U+E0063 U+E0074 U+E007F"));
-  EXPECT_FALSE(
-      IsBreak("U+1F3F4 U+E0067 U+E0062 U+E0073 | U+E0063 U+E0074 U+E007F"));
-  EXPECT_FALSE(
-      IsBreak("U+1F3F4 U+E0067 U+E0062 U+E0073 U+E0063 | U+E0074 U+E007F"));
-  EXPECT_FALSE(
-      IsBreak("U+1F3F4 U+E0067 U+E0062 U+E0073 U+E0063 U+E0074 | U+E007F"));
-  EXPECT_TRUE(
-      IsBreak("U+1F3F4 U+E0067 U+E0062 U+E0073 U+E0063 U+E0074 U+E007F | 'a'"));
-}
-
-TEST(GraphemeBreak, DISABLED_tailoring) {
-  // control characters that we interpret as "extend"
-  EXPECT_FALSE(IsBreak("'a' | U+00AD"));   // soft hyphen
-  EXPECT_FALSE(IsBreak("'a' | U+200B"));   // zwsp
-  EXPECT_FALSE(IsBreak("'a' | U+200E"));   // lrm
-  EXPECT_FALSE(IsBreak("'a' | U+202A"));   // lre
-  EXPECT_FALSE(IsBreak("'a' | U+E0041"));  // tag character
-
-  // UTC-approved characters for the Prepend class
-  EXPECT_FALSE(
-      IsBreak("U+06DD | U+0661"));  // arabic subtending mark + digit one
-
-  EXPECT_TRUE(IsBreak("U+0E01 | U+0E33"));  // Thai sara am
-
-  // virama is not a grapheme break, but "pure killer" is
-  EXPECT_FALSE(IsBreak("U+0915 | U+094D U+0915"));  // Devanagari ka+virama+ka
-  EXPECT_FALSE(IsBreak("U+0915 U+094D | U+0915"));  // Devanagari ka+virama+ka
-  EXPECT_FALSE(
-      IsBreak("U+0E01 | U+0E3A U+0E01"));          // thai phinthu = pure killer
-  EXPECT_TRUE(IsBreak("U+0E01 U+0E3A | U+0E01"));  // thai phinthu = pure killer
-
-  // Repetition of above tests, but with a given advances array that implies
-  // everything became just one cluster.
-  const float conjoined[] = {1.0, 0.0, 0.0};
-  EXPECT_FALSE(IsBreakWithAdvances(
-      conjoined,
-      "U+0915 | U+094D U+0915"));  // Devanagari ka+virama+ka
-  EXPECT_FALSE(IsBreakWithAdvances(
-      conjoined,
-      "U+0915 U+094D | U+0915"));  // Devanagari ka+virama+ka
-  EXPECT_FALSE(IsBreakWithAdvances(
-      conjoined,
-      "U+0E01 | U+0E3A U+0E01"));  // thai phinthu = pure killer
-  EXPECT_TRUE(IsBreakWithAdvances(
-      conjoined,
-      "U+0E01 U+0E3A | U+0E01"));  // thai phinthu = pure killer
-
-  // Repetition of above tests, but with a given advances array that the virama
-  // did not form a cluster with the following consonant. The difference is that
-  // there is now a grapheme break after the virama in ka+virama+ka.
-  const float separate[] = {1.0, 0.0, 1.0};
-  EXPECT_FALSE(IsBreakWithAdvances(
-      separate,
-      "U+0915 | U+094D U+0915"));  // Devanagari ka+virama+ka
-  EXPECT_TRUE(IsBreakWithAdvances(
-      separate,
-      "U+0915 U+094D | U+0915"));  // Devanagari ka+virama+ka
-  EXPECT_FALSE(IsBreakWithAdvances(
-      separate,
-      "U+0E01 | U+0E3A U+0E01"));  // thai phinthu = pure killer
-  EXPECT_TRUE(IsBreakWithAdvances(
-      separate,
-      "U+0E01 U+0E3A | U+0E01"));  // thai phinthu = pure killer
-
-  // suppress grapheme breaks in zwj emoji sequences
-  EXPECT_FALSE(
-      IsBreak("U+1F469 U+200D | U+2764 U+FE0F U+200D U+1F48B U+200D U+1F468"));
-  EXPECT_FALSE(
-      IsBreak("U+1F469 U+200D U+2764 U+FE0F U+200D | U+1F48B U+200D U+1F468"));
-  EXPECT_FALSE(
-      IsBreak("U+1F469 U+200D U+2764 U+FE0F U+200D U+1F48B U+200D | U+1F468"));
-  EXPECT_FALSE(IsBreak("U+1F468 U+200D | U+1F469 U+200D U+1F466"));
-  EXPECT_FALSE(IsBreak("U+1F468 U+200D U+1F469 U+200D | U+1F466"));
-  EXPECT_FALSE(
-      IsBreak("U+1F469 U+200D | U+1F469 U+200D U+1F467 U+200D U+1F466"));
-  EXPECT_FALSE(
-      IsBreak("U+1F469 U+200D U+1F469 U+200D | U+1F467 U+200D U+1F466"));
-  EXPECT_FALSE(
-      IsBreak("U+1F469 U+200D U+1F469 U+200D U+1F467 U+200D | U+1F466"));
-  EXPECT_FALSE(IsBreak("U+1F441 U+200D | U+1F5E8"));
-
-  // Do not break before and after zwj with all kind of emoji characters.
-  EXPECT_FALSE(IsBreak("U+1F431 | U+200D U+1F464"));
-  EXPECT_FALSE(IsBreak("U+1F431 U+200D | U+1F464"));
-
-  // ARABIC LETTER BEH + ZWJ + heart, not a zwj emoji sequence, so we preserve
-  // the break
-  EXPECT_TRUE(IsBreak("U+0628 U+200D | U+2764"));
-}
-
-TEST(GraphemeBreak, DISABLED_emojiModifiers) {
-  EXPECT_FALSE(
-      IsBreak("U+261D | U+1F3FB"));  // white up pointing index + modifier
-  EXPECT_FALSE(IsBreak("U+270C | U+1F3FB"));   // victory hand + modifier
-  EXPECT_FALSE(IsBreak("U+1F466 | U+1F3FB"));  // boy + modifier
-  EXPECT_FALSE(IsBreak("U+1F466 | U+1F3FC"));  // boy + modifier
-  EXPECT_FALSE(IsBreak("U+1F466 | U+1F3FD"));  // boy + modifier
-  EXPECT_FALSE(IsBreak("U+1F466 | U+1F3FE"));  // boy + modifier
-  EXPECT_FALSE(IsBreak("U+1F466 | U+1F3FF"));  // boy + modifier
-  EXPECT_FALSE(IsBreak("U+1F918 | U+1F3FF"));  // sign of the horns + modifier
-  EXPECT_FALSE(IsBreak("U+1F933 | U+1F3FF"));  // selfie (Unicode 9) + modifier
-  // Repetition of the tests above, with the knowledge that they are ligated.
-  const float ligated1_2[] = {1.0, 0.0, 0.0};
-  const float ligated2_2[] = {1.0, 0.0, 0.0, 0.0};
-  EXPECT_FALSE(IsBreakWithAdvances(ligated1_2, "U+261D | U+1F3FB"));
-  EXPECT_FALSE(IsBreakWithAdvances(ligated1_2, "U+270C | U+1F3FB"));
-  EXPECT_FALSE(IsBreakWithAdvances(ligated2_2, "U+1F466 | U+1F3FB"));
-  EXPECT_FALSE(IsBreakWithAdvances(ligated2_2, "U+1F466 | U+1F3FC"));
-  EXPECT_FALSE(IsBreakWithAdvances(ligated2_2, "U+1F466 | U+1F3FD"));
-  EXPECT_FALSE(IsBreakWithAdvances(ligated2_2, "U+1F466 | U+1F3FE"));
-  EXPECT_FALSE(IsBreakWithAdvances(ligated2_2, "U+1F466 | U+1F3FF"));
-  EXPECT_FALSE(IsBreakWithAdvances(ligated2_2, "U+1F918 | U+1F3FF"));
-  EXPECT_FALSE(IsBreakWithAdvances(ligated2_2, "U+1F933 | U+1F3FF"));
-  // Repetition of the tests above, with the knowledge that they are not
-  // ligated.
-  const float unligated1_2[] = {1.0, 1.0, 0.0};
-  const float unligated2_2[] = {1.0, 0.0, 1.0, 0.0};
-  EXPECT_TRUE(IsBreakWithAdvances(unligated1_2, "U+261D | U+1F3FB"));
-  EXPECT_TRUE(IsBreakWithAdvances(unligated1_2, "U+270C | U+1F3FB"));
-  EXPECT_TRUE(IsBreakWithAdvances(unligated2_2, "U+1F466 | U+1F3FB"));
-  EXPECT_TRUE(IsBreakWithAdvances(unligated2_2, "U+1F466 | U+1F3FC"));
-  EXPECT_TRUE(IsBreakWithAdvances(unligated2_2, "U+1F466 | U+1F3FD"));
-  EXPECT_TRUE(IsBreakWithAdvances(unligated2_2, "U+1F466 | U+1F3FE"));
-  EXPECT_TRUE(IsBreakWithAdvances(unligated2_2, "U+1F466 | U+1F3FF"));
-  EXPECT_TRUE(IsBreakWithAdvances(unligated2_2, "U+1F918 | U+1F3FF"));
-  EXPECT_TRUE(IsBreakWithAdvances(unligated2_2, "U+1F933 | U+1F3FF"));
-
-  // adding extend characters between emoji base and modifier doesn't affect
-  // grapheme cluster
-  EXPECT_FALSE(IsBreak(
-      "U+270C U+FE0E | U+1F3FB"));  // victory hand + text style + modifier
-  EXPECT_FALSE(
-      IsBreak("U+270C U+FE0F | U+1F3FB"));  // heart + emoji style + modifier
-  // Repetition of the two tests above, with the knowledge that they are
-  // ligated.
-  const float ligated1_1_2[] = {1.0, 0.0, 0.0, 0.0};
-  EXPECT_FALSE(IsBreakWithAdvances(ligated1_1_2, "U+270C U+FE0E | U+1F3FB"));
-  EXPECT_FALSE(IsBreakWithAdvances(ligated1_1_2, "U+270C U+FE0F | U+1F3FB"));
-  // Repetition of the first two tests, with the knowledge that they are not
-  // ligated.
-  const float unligated1_1_2[] = {1.0, 0.0, 1.0, 0.0};
-  EXPECT_TRUE(IsBreakWithAdvances(unligated1_1_2, "U+270C U+FE0E | U+1F3FB"));
-  EXPECT_TRUE(IsBreakWithAdvances(unligated1_1_2, "U+270C U+FE0F | U+1F3FB"));
-
-  // heart is not an emoji base
-  EXPECT_TRUE(IsBreak("U+2764 | U+1F3FB"));  // heart + modifier
-  EXPECT_TRUE(
-      IsBreak("U+2764 U+FE0E | U+1F3FB"));  // heart + emoji style + modifier
-  EXPECT_TRUE(
-      IsBreak("U+2764 U+FE0F | U+1F3FB"));    // heart + emoji style + modifier
-  EXPECT_TRUE(IsBreak("U+1F3FB | U+1F3FB"));  // modifier + modifier
-
-  // rat is not an emoji modifer
-  EXPECT_TRUE(IsBreak("U+1F466 | U+1F400"));  // boy + rat
-}
-
-TEST(GraphemeBreak, DISABLED_genderBalancedEmoji) {
-  // U+1F469 is WOMAN, U+200D is ZWJ, U+1F4BC is BRIEFCASE.
-  EXPECT_FALSE(IsBreak("U+1F469 | U+200D U+1F4BC"));
-  EXPECT_FALSE(IsBreak("U+1F469 U+200D | U+1F4BC"));
-  // The above two cases, when the ligature is not supported in the font. We now
-  // expect a break between them.
-  const float unligated2_1_2[] = {1.0, 0.0, 0.0, 1.0, 0.0};
-  EXPECT_FALSE(IsBreakWithAdvances(unligated2_1_2, "U+1F469 | U+200D U+1F4BC"));
-  EXPECT_TRUE(IsBreakWithAdvances(unligated2_1_2, "U+1F469 U+200D | U+1F4BC"));
-
-  // U+2695 has now emoji property, so should be part of ZWJ sequence.
-  EXPECT_FALSE(IsBreak("U+1F469 | U+200D U+2695"));
-  EXPECT_FALSE(IsBreak("U+1F469 U+200D | U+2695"));
-  // The above two cases, when the ligature is not supported in the font. We now
-  // expect a break between them.
-  const float unligated2_1_1[] = {1.0, 0.0, 0.0, 1.0};
-  EXPECT_FALSE(IsBreakWithAdvances(unligated2_1_1, "U+1F469 | U+200D U+2695"));
-  EXPECT_TRUE(IsBreakWithAdvances(unligated2_1_1, "U+1F469 U+200D | U+2695"));
-}
-
-TEST(GraphemeBreak, offsets) {
-  uint16_t string[] = {0x0041, 0x06DD, 0x0045, 0x0301, 0x0049, 0x0301};
-  EXPECT_TRUE(GraphemeBreak::isGraphemeBreak(nullptr, string, 2, 3, 2));
-  EXPECT_FALSE(GraphemeBreak::isGraphemeBreak(nullptr, string, 2, 3, 3));
-  EXPECT_TRUE(GraphemeBreak::isGraphemeBreak(nullptr, string, 2, 3, 4));
-  EXPECT_TRUE(GraphemeBreak::isGraphemeBreak(nullptr, string, 2, 3, 5));
-}
-
-}  // namespace minikin
diff --git a/third_party/txt/tests/HbFontCacheTest.cpp b/third_party/txt/tests/HbFontCacheTest.cpp
deleted file mode 100644
index afbe47432160b85abd8811728266227b07d91e3f..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/HbFontCacheTest.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "minikin/HbFontCache.h"
-
-#include <gtest/gtest.h>
-#include <log/log.h>
-
-#include <memory>
-#include <mutex>
-
-#include <hb.h>
-
-#include <minikin/MinikinFont.h>
-#include "MinikinFontForTest.h"
-#include "minikin/MinikinInternal.h"
-
-namespace minikin {
-
-class HbFontCacheTest : public testing::Test {
- public:
-  virtual void TearDown() {
-    std::scoped_lock _l(gMinikinLock);
-    purgeHbFontCacheLocked();
-  }
-};
-
-TEST_F(HbFontCacheTest, getHbFontLockedTest) {
-  std::shared_ptr<MinikinFontForTest> fontA(
-      new MinikinFontForTest(kTestFontDir "Regular.ttf"));
-
-  std::shared_ptr<MinikinFontForTest> fontB(
-      new MinikinFontForTest(kTestFontDir "Bold.ttf"));
-
-  std::shared_ptr<MinikinFontForTest> fontC(
-      new MinikinFontForTest(kTestFontDir "BoldItalic.ttf"));
-
-  std::scoped_lock _l(gMinikinLock);
-  // Never return NULL.
-  EXPECT_NE(nullptr, getHbFontLocked(fontA.get()));
-  EXPECT_NE(nullptr, getHbFontLocked(fontB.get()));
-  EXPECT_NE(nullptr, getHbFontLocked(fontC.get()));
-
-  EXPECT_NE(nullptr, getHbFontLocked(nullptr));
-
-  // Must return same object if same font object is passed.
-  EXPECT_EQ(getHbFontLocked(fontA.get()), getHbFontLocked(fontA.get()));
-  EXPECT_EQ(getHbFontLocked(fontB.get()), getHbFontLocked(fontB.get()));
-  EXPECT_EQ(getHbFontLocked(fontC.get()), getHbFontLocked(fontC.get()));
-
-  // Different object must be returned if the passed minikinFont has different
-  // ID.
-  EXPECT_NE(getHbFontLocked(fontA.get()), getHbFontLocked(fontB.get()));
-  EXPECT_NE(getHbFontLocked(fontA.get()), getHbFontLocked(fontC.get()));
-}
-
-TEST_F(HbFontCacheTest, purgeCacheTest) {
-  std::shared_ptr<MinikinFontForTest> minikinFont(
-      new MinikinFontForTest(kTestFontDir "Regular.ttf"));
-
-  std::scoped_lock _l(gMinikinLock);
-  hb_font_t* font = getHbFontLocked(minikinFont.get());
-  ASSERT_NE(nullptr, font);
-
-  // Set user data to identify the font object.
-  hb_user_data_key_t key;
-  void* data = (void*)0xdeadbeef;
-  hb_font_set_user_data(font, &key, data, NULL, false);
-  ASSERT_EQ(data, hb_font_get_user_data(font, &key));
-
-  purgeHbFontCacheLocked();
-
-  // By checking user data, confirm that the object after purge is different
-  // from previously created one. Do not compare the returned pointer here since
-  // memory allocator may assign same region for new object.
-  font = getHbFontLocked(minikinFont.get());
-  EXPECT_EQ(nullptr, hb_font_get_user_data(font, &key));
-}
-
-}  // namespace minikin
diff --git a/third_party/txt/tests/HyphenatorTest.cpp b/third_party/txt/tests/HyphenatorTest.cpp
deleted file mode 100644
index 886b38dc12ed53482b4b2ef1df419d594894377c..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/HyphenatorTest.cpp
+++ /dev/null
@@ -1,347 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <gtest/gtest.h>
-
-#include <minikin/Hyphenator.h>
-#include "FileUtils.h"
-#include "ICUTestBase.h"
-
-#ifndef NELEM
-#define NELEM(x) ((sizeof(x) / sizeof((x)[0])))
-#endif
-
-namespace minikin {
-
-const char* usHyph = "/system/usr/hyphen-data/hyph-en-us.hyb";
-const char* malayalamHyph = "/system/usr/hyphen-data/hyph-ml.hyb";
-
-typedef ICUTestBase HyphenatorTest;
-
-const icu::Locale catalanLocale("ca", "ES", nullptr, nullptr);
-const icu::Locale polishLocale("pl", "PL", nullptr, nullptr);
-const icu::Locale& usLocale = icu::Locale::getUS();
-
-const uint16_t HYPHEN_MINUS = 0x002D;
-const uint16_t SOFT_HYPHEN = 0x00AD;
-const uint16_t MIDDLE_DOT = 0x00B7;
-const uint16_t GREEK_LOWER_ALPHA = 0x03B1;
-const uint16_t ARMENIAN_AYB = 0x0531;
-const uint16_t HEBREW_ALEF = 0x05D0;
-const uint16_t ARABIC_ALEF = 0x0627;
-const uint16_t ARABIC_BEH = 0x0628;
-const uint16_t ARABIC_ZWARAKAY = 0x0659;
-const uint16_t MALAYALAM_KA = 0x0D15;
-const uint16_t UCAS_E = 0x1401;
-const uint16_t HYPHEN = 0x2010;
-const uint16_t EN_DASH = 0x2013;
-
-// Simple test for US English. This tests "table", which happens to be the in
-// the exceptions list.
-TEST_F(HyphenatorTest, usEnglishAutomaticHyphenation) {
-  Hyphenator* hyphenator =
-      Hyphenator::loadBinary(readWholeFile(usHyph).data(), 2, 3);
-  const uint16_t word[] = {'t', 'a', 'b', 'l', 'e'};
-  std::vector<HyphenationType> result;
-  hyphenator->hyphenate(&result, word, NELEM(word), usLocale);
-  EXPECT_EQ((size_t)5, result.size());
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[0]);
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[1]);
-  EXPECT_EQ(HyphenationType::BREAK_AND_INSERT_HYPHEN, result[2]);
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[3]);
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[4]);
-}
-
-// Catalan l·l should break as l-/l
-TEST_F(HyphenatorTest, catalanMiddleDot) {
-  Hyphenator* hyphenator = Hyphenator::loadBinary(nullptr, 2, 2);
-  const uint16_t word[] = {'l', 'l', MIDDLE_DOT, 'l', 'l'};
-  std::vector<HyphenationType> result;
-  hyphenator->hyphenate(&result, word, NELEM(word), catalanLocale);
-  EXPECT_EQ((size_t)5, result.size());
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[0]);
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[1]);
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[2]);
-  EXPECT_EQ(HyphenationType::BREAK_AND_REPLACE_WITH_HYPHEN, result[3]);
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[4]);
-}
-
-// Catalan l·l should not break if the word is too short.
-TEST_F(HyphenatorTest, catalanMiddleDotShortWord) {
-  Hyphenator* hyphenator = Hyphenator::loadBinary(nullptr, 2, 2);
-  const uint16_t word[] = {'l', MIDDLE_DOT, 'l'};
-  std::vector<HyphenationType> result;
-  hyphenator->hyphenate(&result, word, NELEM(word), catalanLocale);
-  EXPECT_EQ((size_t)3, result.size());
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[0]);
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[1]);
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[2]);
-}
-
-// If we break on a hyphen in Polish, the hyphen should be repeated on the next
-// line.
-TEST_F(HyphenatorTest, polishHyphen) {
-  Hyphenator* hyphenator = Hyphenator::loadBinary(nullptr, 2, 2);
-  const uint16_t word[] = {'x', HYPHEN, 'y'};
-  std::vector<HyphenationType> result;
-  hyphenator->hyphenate(&result, word, NELEM(word), polishLocale);
-  EXPECT_EQ((size_t)3, result.size());
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[0]);
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[1]);
-  EXPECT_EQ(HyphenationType::BREAK_AND_INSERT_HYPHEN_AT_NEXT_LINE, result[2]);
-}
-
-// If the language is Polish but the script is not Latin, don't use Polish rules
-// for hyphenation.
-TEST_F(HyphenatorTest, polishHyphenButNonLatinWord) {
-  Hyphenator* hyphenator = Hyphenator::loadBinary(nullptr, 2, 2);
-  const uint16_t word[] = {GREEK_LOWER_ALPHA, HYPHEN, GREEK_LOWER_ALPHA};
-  std::vector<HyphenationType> result;
-  hyphenator->hyphenate(&result, word, NELEM(word), polishLocale);
-  EXPECT_EQ((size_t)3, result.size());
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[0]);
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[1]);
-  EXPECT_EQ(HyphenationType::BREAK_AND_DONT_INSERT_HYPHEN, result[2]);
-}
-
-// Polish en dash doesn't repeat on next line (as far as we know), but just
-// provides a break opportunity.
-TEST_F(HyphenatorTest, polishEnDash) {
-  Hyphenator* hyphenator = Hyphenator::loadBinary(nullptr, 2, 2);
-  const uint16_t word[] = {'x', EN_DASH, 'y'};
-  std::vector<HyphenationType> result;
-  hyphenator->hyphenate(&result, word, NELEM(word), polishLocale);
-  EXPECT_EQ((size_t)3, result.size());
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[0]);
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[1]);
-  EXPECT_EQ(HyphenationType::BREAK_AND_DONT_INSERT_HYPHEN, result[2]);
-}
-
-// In Latin script text, soft hyphens should insert a visible hyphen if broken
-// at.
-TEST_F(HyphenatorTest, latinSoftHyphen) {
-  Hyphenator* hyphenator = Hyphenator::loadBinary(nullptr, 2, 2);
-  const uint16_t word[] = {'x', SOFT_HYPHEN, 'y'};
-  std::vector<HyphenationType> result;
-  hyphenator->hyphenate(&result, word, NELEM(word), usLocale);
-  EXPECT_EQ((size_t)3, result.size());
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[0]);
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[1]);
-  EXPECT_EQ(HyphenationType::BREAK_AND_INSERT_HYPHEN, result[2]);
-}
-
-// Soft hyphens at the beginning of a word are not useful in linebreaking.
-TEST_F(HyphenatorTest, latinSoftHyphenStartingTheWord) {
-  Hyphenator* hyphenator = Hyphenator::loadBinary(nullptr, 2, 2);
-  const uint16_t word[] = {SOFT_HYPHEN, 'y'};
-  std::vector<HyphenationType> result;
-  hyphenator->hyphenate(&result, word, NELEM(word), usLocale);
-  EXPECT_EQ((size_t)2, result.size());
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[0]);
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[1]);
-}
-
-// In Malayalam script text, soft hyphens should not insert a visible hyphen if
-// broken at.
-TEST_F(HyphenatorTest, malayalamSoftHyphen) {
-  Hyphenator* hyphenator = Hyphenator::loadBinary(nullptr, 2, 2);
-  const uint16_t word[] = {MALAYALAM_KA, SOFT_HYPHEN, MALAYALAM_KA};
-  std::vector<HyphenationType> result;
-  hyphenator->hyphenate(&result, word, NELEM(word), usLocale);
-  EXPECT_EQ((size_t)3, result.size());
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[0]);
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[1]);
-  EXPECT_EQ(HyphenationType::BREAK_AND_DONT_INSERT_HYPHEN, result[2]);
-}
-
-// In automatically hyphenated Malayalam script text, we should not insert a
-// visible hyphen.
-TEST_F(HyphenatorTest, malayalamAutomaticHyphenation) {
-  Hyphenator* hyphenator =
-      Hyphenator::loadBinary(readWholeFile(malayalamHyph).data(), 2, 2);
-  const uint16_t word[] = {MALAYALAM_KA, MALAYALAM_KA, MALAYALAM_KA,
-                           MALAYALAM_KA, MALAYALAM_KA};
-  std::vector<HyphenationType> result;
-  hyphenator->hyphenate(&result, word, NELEM(word), usLocale);
-  EXPECT_EQ((size_t)5, result.size());
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[0]);
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[1]);
-  EXPECT_EQ(HyphenationType::BREAK_AND_DONT_INSERT_HYPHEN, result[2]);
-  EXPECT_EQ(HyphenationType::BREAK_AND_DONT_INSERT_HYPHEN, result[3]);
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[4]);
-}
-
-// In Armenian script text, soft hyphens should insert an Armenian hyphen if
-// broken at.
-TEST_F(HyphenatorTest, aremenianSoftHyphen) {
-  Hyphenator* hyphenator = Hyphenator::loadBinary(nullptr, 2, 2);
-  const uint16_t word[] = {ARMENIAN_AYB, SOFT_HYPHEN, ARMENIAN_AYB};
-  std::vector<HyphenationType> result;
-  hyphenator->hyphenate(&result, word, NELEM(word), usLocale);
-  EXPECT_EQ((size_t)3, result.size());
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[0]);
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[1]);
-  EXPECT_EQ(HyphenationType::BREAK_AND_INSERT_ARMENIAN_HYPHEN, result[2]);
-}
-
-// In Hebrew script text, soft hyphens should insert a normal hyphen if broken
-// at, for now. We may need to change this to maqaf later.
-TEST_F(HyphenatorTest, hebrewSoftHyphen) {
-  Hyphenator* hyphenator = Hyphenator::loadBinary(nullptr, 2, 2);
-  const uint16_t word[] = {HEBREW_ALEF, SOFT_HYPHEN, HEBREW_ALEF};
-  std::vector<HyphenationType> result;
-  hyphenator->hyphenate(&result, word, NELEM(word), usLocale);
-  EXPECT_EQ((size_t)3, result.size());
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[0]);
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[1]);
-  EXPECT_EQ(HyphenationType::BREAK_AND_INSERT_HYPHEN, result[2]);
-}
-
-// Soft hyphen between two Arabic letters that join should keep the joining
-// behavior when broken across lines.
-TEST_F(HyphenatorTest, arabicSoftHyphenConnecting) {
-  Hyphenator* hyphenator = Hyphenator::loadBinary(nullptr, 2, 2);
-  const uint16_t word[] = {ARABIC_BEH, SOFT_HYPHEN, ARABIC_BEH};
-  std::vector<HyphenationType> result;
-  hyphenator->hyphenate(&result, word, NELEM(word), usLocale);
-  EXPECT_EQ((size_t)3, result.size());
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[0]);
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[1]);
-  EXPECT_EQ(HyphenationType::BREAK_AND_INSERT_HYPHEN_AND_ZWJ, result[2]);
-}
-
-// Arabic letters may be joining on one side, but if it's the wrong side, we
-// should use the normal hyphen.
-TEST_F(HyphenatorTest, arabicSoftHyphenNonConnecting) {
-  Hyphenator* hyphenator = Hyphenator::loadBinary(nullptr, 2, 2);
-  const uint16_t word[] = {ARABIC_ALEF, SOFT_HYPHEN, ARABIC_BEH};
-  std::vector<HyphenationType> result;
-  hyphenator->hyphenate(&result, word, NELEM(word), usLocale);
-  EXPECT_EQ((size_t)3, result.size());
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[0]);
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[1]);
-  EXPECT_EQ(HyphenationType::BREAK_AND_INSERT_HYPHEN, result[2]);
-}
-
-// Skip transparent characters until you find a non-transparent one.
-TEST_F(HyphenatorTest, arabicSoftHyphenSkipTransparents) {
-  Hyphenator* hyphenator = Hyphenator::loadBinary(nullptr, 2, 2);
-  const uint16_t word[] = {ARABIC_BEH, ARABIC_ZWARAKAY, SOFT_HYPHEN,
-                           ARABIC_ZWARAKAY, ARABIC_BEH};
-  std::vector<HyphenationType> result;
-  hyphenator->hyphenate(&result, word, NELEM(word), usLocale);
-  EXPECT_EQ((size_t)5, result.size());
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[0]);
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[1]);
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[2]);
-  EXPECT_EQ(HyphenationType::BREAK_AND_INSERT_HYPHEN_AND_ZWJ, result[3]);
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[4]);
-}
-
-// Skip transparent characters until you find a non-transparent one. If we get
-// to one end without finding anything, we are still non-joining.
-TEST_F(HyphenatorTest, arabicSoftHyphenTransparentsAtEnd) {
-  Hyphenator* hyphenator = Hyphenator::loadBinary(nullptr, 2, 2);
-  const uint16_t word[] = {ARABIC_BEH, ARABIC_ZWARAKAY, SOFT_HYPHEN,
-                           ARABIC_ZWARAKAY};
-  std::vector<HyphenationType> result;
-  hyphenator->hyphenate(&result, word, NELEM(word), usLocale);
-  EXPECT_EQ((size_t)4, result.size());
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[0]);
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[1]);
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[2]);
-  EXPECT_EQ(HyphenationType::BREAK_AND_INSERT_HYPHEN, result[3]);
-}
-
-// Skip transparent characters until you find a non-transparent one. If we get
-// to one end without finding anything, we are still non-joining.
-TEST_F(HyphenatorTest, arabicSoftHyphenTransparentsAtStart) {
-  Hyphenator* hyphenator = Hyphenator::loadBinary(nullptr, 2, 2);
-  const uint16_t word[] = {ARABIC_ZWARAKAY, SOFT_HYPHEN, ARABIC_ZWARAKAY,
-                           ARABIC_BEH};
-  std::vector<HyphenationType> result;
-  hyphenator->hyphenate(&result, word, NELEM(word), usLocale);
-  EXPECT_EQ((size_t)4, result.size());
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[0]);
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[1]);
-  EXPECT_EQ(HyphenationType::BREAK_AND_INSERT_HYPHEN, result[2]);
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[3]);
-}
-
-// In Unified Canadian Aboriginal script (UCAS) text, soft hyphens should insert
-// a UCAS hyphen.
-TEST_F(HyphenatorTest, ucasSoftHyphen) {
-  Hyphenator* hyphenator = Hyphenator::loadBinary(nullptr, 2, 2);
-  const uint16_t word[] = {UCAS_E, SOFT_HYPHEN, UCAS_E};
-  std::vector<HyphenationType> result;
-  hyphenator->hyphenate(&result, word, NELEM(word), usLocale);
-  EXPECT_EQ((size_t)3, result.size());
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[0]);
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[1]);
-  EXPECT_EQ(HyphenationType::BREAK_AND_INSERT_UCAS_HYPHEN, result[2]);
-}
-
-// Presently, soft hyphen looks at the character after it to determine
-// hyphenation type. This is a little arbitrary, but let's test it anyway.
-TEST_F(HyphenatorTest, mixedScriptSoftHyphen) {
-  Hyphenator* hyphenator = Hyphenator::loadBinary(nullptr, 2, 2);
-  const uint16_t word[] = {'a', SOFT_HYPHEN, UCAS_E};
-  std::vector<HyphenationType> result;
-  hyphenator->hyphenate(&result, word, NELEM(word), usLocale);
-  EXPECT_EQ((size_t)3, result.size());
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[0]);
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[1]);
-  EXPECT_EQ(HyphenationType::BREAK_AND_INSERT_UCAS_HYPHEN, result[2]);
-}
-
-// Hard hyphens provide a breaking opportunity with nothing extra inserted.
-TEST_F(HyphenatorTest, hardHyphen) {
-  Hyphenator* hyphenator = Hyphenator::loadBinary(nullptr, 2, 2);
-  const uint16_t word[] = {'x', HYPHEN, 'y'};
-  std::vector<HyphenationType> result;
-  hyphenator->hyphenate(&result, word, NELEM(word), usLocale);
-  EXPECT_EQ((size_t)3, result.size());
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[0]);
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[1]);
-  EXPECT_EQ(HyphenationType::BREAK_AND_DONT_INSERT_HYPHEN, result[2]);
-}
-
-// Hyphen-minuses also provide a breaking opportunity with nothing extra
-// inserted.
-TEST_F(HyphenatorTest, hyphenMinus) {
-  Hyphenator* hyphenator = Hyphenator::loadBinary(nullptr, 2, 2);
-  const uint16_t word[] = {'x', HYPHEN_MINUS, 'y'};
-  std::vector<HyphenationType> result;
-  hyphenator->hyphenate(&result, word, NELEM(word), usLocale);
-  EXPECT_EQ((size_t)3, result.size());
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[0]);
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[1]);
-  EXPECT_EQ(HyphenationType::BREAK_AND_DONT_INSERT_HYPHEN, result[2]);
-}
-
-// If the word starts with a hard hyphen or hyphen-minus, it doesn't make sense
-// to break it at that point.
-TEST_F(HyphenatorTest, startingHyphenMinus) {
-  Hyphenator* hyphenator = Hyphenator::loadBinary(nullptr, 2, 2);
-  const uint16_t word[] = {HYPHEN_MINUS, 'y'};
-  std::vector<HyphenationType> result;
-  hyphenator->hyphenate(&result, word, NELEM(word), usLocale);
-  EXPECT_EQ((size_t)2, result.size());
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[0]);
-  EXPECT_EQ(HyphenationType::DONT_BREAK, result[1]);
-}
-
-}  // namespace minikin
diff --git a/third_party/txt/tests/ICUTestBase.h b/third_party/txt/tests/ICUTestBase.h
deleted file mode 100644
index c25b8f6daffcc0e94d350048c0f7b228d3e8bba0..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/ICUTestBase.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef MINIKIN_TEST_ICU_TEST_BASE_H
-#define MINIKIN_TEST_ICU_TEST_BASE_H
-
-#include <gtest/gtest.h>
-#include <unicode/uclean.h>
-#include <unicode/udata.h>
-
-// low level file access for mapping ICU data
-#include <fcntl.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-
-namespace minikin {
-
-class ICUTestBase : public testing::Test {
- protected:
-  virtual void SetUp() override {
-    const char* fn = "/system/usr/icu/" U_ICUDATA_NAME ".dat";
-    int fd = open(fn, O_RDONLY);
-    ASSERT_NE(-1, fd);
-    struct stat sb;
-    ASSERT_EQ(0, fstat(fd, &sb));
-    void* data = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0);
-
-    UErrorCode errorCode = U_ZERO_ERROR;
-    udata_setCommonData(data, &errorCode);
-    ASSERT_TRUE(U_SUCCESS(errorCode));
-    u_init(&errorCode);
-    ASSERT_TRUE(U_SUCCESS(errorCode));
-  }
-
-  virtual void TearDown() override { u_cleanup(); }
-};
-
-}  // namespace minikin
-#endif  //  MINIKIN_TEST_ICU_TEST_BASE_H
diff --git a/third_party/txt/tests/LayoutTest.cpp b/third_party/txt/tests/LayoutTest.cpp
deleted file mode 100644
index e9ad2eb066a826057ca60215bb94d7d027bda3a6..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/LayoutTest.cpp
+++ /dev/null
@@ -1,431 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <gtest/gtest.h>
-
-#include "../util/FontTestUtils.h"
-#include "../util/UnicodeUtils.h"
-#include "ICUTestBase.h"
-#include "minikin/FontCollection.h"
-#include "minikin/Layout.h"
-
-const char* SYSTEM_FONT_PATH = "/system/fonts/";
-const char* SYSTEM_FONT_XML = "/system/etc/fonts.xml";
-
-namespace minikin {
-
-const float UNTOUCHED_MARKER = 1e+38;
-
-static void expectAdvances(std::vector<float> expected,
-                           float* advances,
-                           size_t length) {
-  EXPECT_LE(expected.size(), length);
-  for (size_t i = 0; i < expected.size(); ++i) {
-    EXPECT_EQ(expected[i], advances[i])
-        << i << "th element is different. Expected: " << expected[i]
-        << ", Actual: " << advances[i];
-  }
-  EXPECT_EQ(UNTOUCHED_MARKER, advances[expected.size()]);
-}
-
-static void resetAdvances(float* advances, size_t length) {
-  for (size_t i = 0; i < length; ++i) {
-    advances[i] = UNTOUCHED_MARKER;
-  }
-}
-
-class LayoutTest : public ICUTestBase {
- protected:
-  LayoutTest() : mCollection(nullptr) {}
-
-  virtual ~LayoutTest() {}
-
-  virtual void SetUp() override {
-    mCollection = std::shared_ptr<FontCollection>(
-        getFontCollection(SYSTEM_FONT_PATH, SYSTEM_FONT_XML));
-  }
-
-  virtual void TearDown() override {}
-
-  std::shared_ptr<FontCollection> mCollection;
-};
-
-TEST_F(LayoutTest, doLayoutTest) {
-  MinikinPaint paint;
-  MinikinRect rect;
-  const size_t kMaxAdvanceLength = 32;
-  float advances[kMaxAdvanceLength];
-  std::vector<float> expectedValues;
-
-  Layout layout;
-  std::vector<uint16_t> text;
-
-  // The mock implementation returns 10.0f advance and 0,0-10x10 bounds for all
-  // glyph.
-  {
-    SCOPED_TRACE("one word");
-    text = utf8ToUtf16("oneword");
-    layout.doLayout(text.data(), 0, text.size(), text.size(), kBidi_LTR,
-                    FontStyle(), paint, mCollection);
-    EXPECT_EQ(70.0f, layout.getAdvance());
-    layout.getBounds(&rect);
-    EXPECT_EQ(0.0f, rect.mLeft);
-    EXPECT_EQ(0.0f, rect.mTop);
-    EXPECT_EQ(70.0f, rect.mRight);
-    EXPECT_EQ(10.0f, rect.mBottom);
-    resetAdvances(advances, kMaxAdvanceLength);
-    layout.getAdvances(advances);
-    expectedValues.resize(text.size());
-    for (size_t i = 0; i < expectedValues.size(); ++i) {
-      expectedValues[i] = 10.0f;
-    }
-    expectAdvances(expectedValues, advances, kMaxAdvanceLength);
-  }
-  {
-    SCOPED_TRACE("two words");
-    text = utf8ToUtf16("two words");
-    layout.doLayout(text.data(), 0, text.size(), text.size(), kBidi_LTR,
-                    FontStyle(), paint, mCollection);
-    EXPECT_EQ(90.0f, layout.getAdvance());
-    layout.getBounds(&rect);
-    EXPECT_EQ(0.0f, rect.mLeft);
-    EXPECT_EQ(0.0f, rect.mTop);
-    EXPECT_EQ(90.0f, rect.mRight);
-    EXPECT_EQ(10.0f, rect.mBottom);
-    resetAdvances(advances, kMaxAdvanceLength);
-    layout.getAdvances(advances);
-    expectedValues.resize(text.size());
-    for (size_t i = 0; i < expectedValues.size(); ++i) {
-      expectedValues[i] = 10.0f;
-    }
-    expectAdvances(expectedValues, advances, kMaxAdvanceLength);
-  }
-  {
-    SCOPED_TRACE("three words");
-    text = utf8ToUtf16("three words test");
-    layout.doLayout(text.data(), 0, text.size(), text.size(), kBidi_LTR,
-                    FontStyle(), paint, mCollection);
-    EXPECT_EQ(160.0f, layout.getAdvance());
-    layout.getBounds(&rect);
-    EXPECT_EQ(0.0f, rect.mLeft);
-    EXPECT_EQ(0.0f, rect.mTop);
-    EXPECT_EQ(160.0f, rect.mRight);
-    EXPECT_EQ(10.0f, rect.mBottom);
-    resetAdvances(advances, kMaxAdvanceLength);
-    layout.getAdvances(advances);
-    expectedValues.resize(text.size());
-    for (size_t i = 0; i < expectedValues.size(); ++i) {
-      expectedValues[i] = 10.0f;
-    }
-    expectAdvances(expectedValues, advances, kMaxAdvanceLength);
-  }
-  {
-    SCOPED_TRACE("two spaces");
-    text = utf8ToUtf16("two  spaces");
-    layout.doLayout(text.data(), 0, text.size(), text.size(), kBidi_LTR,
-                    FontStyle(), paint, mCollection);
-    EXPECT_EQ(110.0f, layout.getAdvance());
-    layout.getBounds(&rect);
-    EXPECT_EQ(0.0f, rect.mLeft);
-    EXPECT_EQ(0.0f, rect.mTop);
-    EXPECT_EQ(110.0f, rect.mRight);
-    EXPECT_EQ(10.0f, rect.mBottom);
-    resetAdvances(advances, kMaxAdvanceLength);
-    layout.getAdvances(advances);
-    expectedValues.resize(text.size());
-    for (size_t i = 0; i < expectedValues.size(); ++i) {
-      expectedValues[i] = 10.0f;
-    }
-    expectAdvances(expectedValues, advances, kMaxAdvanceLength);
-  }
-}
-
-TEST_F(LayoutTest, doLayoutTest_wordSpacing) {
-  MinikinPaint paint;
-  MinikinRect rect;
-  const size_t kMaxAdvanceLength = 32;
-  float advances[kMaxAdvanceLength];
-  std::vector<float> expectedValues;
-  std::vector<uint16_t> text;
-
-  Layout layout;
-
-  paint.wordSpacing = 5.0f;
-
-  // The mock implementation returns 10.0f advance and 0,0-10x10 bounds for all
-  // glyph.
-  {
-    SCOPED_TRACE("one word");
-    text = utf8ToUtf16("oneword");
-    layout.doLayout(text.data(), 0, text.size(), text.size(), kBidi_LTR,
-                    FontStyle(), paint, mCollection);
-    EXPECT_EQ(70.0f, layout.getAdvance());
-    layout.getBounds(&rect);
-    EXPECT_EQ(0.0f, rect.mLeft);
-    EXPECT_EQ(0.0f, rect.mTop);
-    EXPECT_EQ(70.0f, rect.mRight);
-    EXPECT_EQ(10.0f, rect.mBottom);
-    resetAdvances(advances, kMaxAdvanceLength);
-    layout.getAdvances(advances);
-    expectedValues.resize(text.size());
-    for (size_t i = 0; i < expectedValues.size(); ++i) {
-      expectedValues[i] = 10.0f;
-    }
-    expectAdvances(expectedValues, advances, kMaxAdvanceLength);
-  }
-  {
-    SCOPED_TRACE("two words");
-    text = utf8ToUtf16("two words");
-    layout.doLayout(text.data(), 0, text.size(), text.size(), kBidi_LTR,
-                    FontStyle(), paint, mCollection);
-    EXPECT_EQ(95.0f, layout.getAdvance());
-    layout.getBounds(&rect);
-    EXPECT_EQ(0.0f, rect.mLeft);
-    EXPECT_EQ(0.0f, rect.mTop);
-    EXPECT_EQ(95.0f, rect.mRight);
-    EXPECT_EQ(10.0f, rect.mBottom);
-    resetAdvances(advances, kMaxAdvanceLength);
-    layout.getAdvances(advances);
-    EXPECT_EQ(UNTOUCHED_MARKER, advances[text.size()]);
-    resetAdvances(advances, kMaxAdvanceLength);
-    layout.getAdvances(advances);
-    expectedValues.resize(text.size());
-    for (size_t i = 0; i < expectedValues.size(); ++i) {
-      expectedValues[i] = 10.0f;
-    }
-    expectedValues[3] = 15.0f;
-    expectAdvances(expectedValues, advances, kMaxAdvanceLength);
-  }
-  {
-    SCOPED_TRACE("three words test");
-    text = utf8ToUtf16("three words test");
-    layout.doLayout(text.data(), 0, text.size(), text.size(), kBidi_LTR,
-                    FontStyle(), paint, mCollection);
-    EXPECT_EQ(170.0f, layout.getAdvance());
-    layout.getBounds(&rect);
-    EXPECT_EQ(0.0f, rect.mLeft);
-    EXPECT_EQ(0.0f, rect.mTop);
-    EXPECT_EQ(170.0f, rect.mRight);
-    EXPECT_EQ(10.0f, rect.mBottom);
-    resetAdvances(advances, kMaxAdvanceLength);
-    layout.getAdvances(advances);
-    expectedValues.resize(text.size());
-    for (size_t i = 0; i < expectedValues.size(); ++i) {
-      expectedValues[i] = 10.0f;
-    }
-    expectedValues[5] = 15.0f;
-    expectedValues[11] = 15.0f;
-    expectAdvances(expectedValues, advances, kMaxAdvanceLength);
-  }
-  {
-    SCOPED_TRACE("two spaces");
-    text = utf8ToUtf16("two  spaces");
-    layout.doLayout(text.data(), 0, text.size(), text.size(), kBidi_LTR,
-                    FontStyle(), paint, mCollection);
-    EXPECT_EQ(120.0f, layout.getAdvance());
-    layout.getBounds(&rect);
-    EXPECT_EQ(0.0f, rect.mLeft);
-    EXPECT_EQ(0.0f, rect.mTop);
-    EXPECT_EQ(120.0f, rect.mRight);
-    EXPECT_EQ(10.0f, rect.mBottom);
-    resetAdvances(advances, kMaxAdvanceLength);
-    layout.getAdvances(advances);
-    expectedValues.resize(text.size());
-    for (size_t i = 0; i < expectedValues.size(); ++i) {
-      expectedValues[i] = 10.0f;
-    }
-    expectedValues[3] = 15.0f;
-    expectedValues[4] = 15.0f;
-    expectAdvances(expectedValues, advances, kMaxAdvanceLength);
-  }
-}
-
-TEST_F(LayoutTest, doLayoutTest_negativeWordSpacing) {
-  MinikinPaint paint;
-  MinikinRect rect;
-  const size_t kMaxAdvanceLength = 32;
-  float advances[kMaxAdvanceLength];
-  std::vector<float> expectedValues;
-
-  Layout layout;
-  std::vector<uint16_t> text;
-
-  // Negative word spacing also should work.
-  paint.wordSpacing = -5.0f;
-
-  {
-    SCOPED_TRACE("one word");
-    text = utf8ToUtf16("oneword");
-    layout.doLayout(text.data(), 0, text.size(), text.size(), kBidi_LTR,
-                    FontStyle(), paint, mCollection);
-    EXPECT_EQ(70.0f, layout.getAdvance());
-    layout.getBounds(&rect);
-    EXPECT_EQ(0.0f, rect.mLeft);
-    EXPECT_EQ(0.0f, rect.mTop);
-    EXPECT_EQ(70.0f, rect.mRight);
-    EXPECT_EQ(10.0f, rect.mBottom);
-    resetAdvances(advances, kMaxAdvanceLength);
-    layout.getAdvances(advances);
-    expectedValues.resize(text.size());
-    for (size_t i = 0; i < expectedValues.size(); ++i) {
-      expectedValues[i] = 10.0f;
-    }
-    expectAdvances(expectedValues, advances, kMaxAdvanceLength);
-  }
-  {
-    SCOPED_TRACE("two words");
-    text = utf8ToUtf16("two words");
-    layout.doLayout(text.data(), 0, text.size(), text.size(), kBidi_LTR,
-                    FontStyle(), paint, mCollection);
-    EXPECT_EQ(85.0f, layout.getAdvance());
-    layout.getBounds(&rect);
-    EXPECT_EQ(0.0f, rect.mLeft);
-    EXPECT_EQ(0.0f, rect.mTop);
-    EXPECT_EQ(85.0f, rect.mRight);
-    EXPECT_EQ(10.0f, rect.mBottom);
-    resetAdvances(advances, kMaxAdvanceLength);
-    layout.getAdvances(advances);
-    expectedValues.resize(text.size());
-    for (size_t i = 0; i < expectedValues.size(); ++i) {
-      expectedValues[i] = 10.0f;
-    }
-    expectedValues[3] = 5.0f;
-    expectAdvances(expectedValues, advances, kMaxAdvanceLength);
-  }
-  {
-    SCOPED_TRACE("three words");
-    text = utf8ToUtf16("three word test");
-    layout.doLayout(text.data(), 0, text.size(), text.size(), kBidi_LTR,
-                    FontStyle(), paint, mCollection);
-    EXPECT_EQ(140.0f, layout.getAdvance());
-    layout.getBounds(&rect);
-    EXPECT_EQ(0.0f, rect.mLeft);
-    EXPECT_EQ(0.0f, rect.mTop);
-    EXPECT_EQ(140.0f, rect.mRight);
-    EXPECT_EQ(10.0f, rect.mBottom);
-    resetAdvances(advances, kMaxAdvanceLength);
-    layout.getAdvances(advances);
-    expectedValues.resize(text.size());
-    for (size_t i = 0; i < expectedValues.size(); ++i) {
-      expectedValues[i] = 10.0f;
-    }
-    expectedValues[5] = 5.0f;
-    expectedValues[10] = 5.0f;
-    expectAdvances(expectedValues, advances, kMaxAdvanceLength);
-  }
-  {
-    SCOPED_TRACE("two spaces");
-    text = utf8ToUtf16("two  spaces");
-    layout.doLayout(text.data(), 0, text.size(), text.size(), kBidi_LTR,
-                    FontStyle(), paint, mCollection);
-    EXPECT_EQ(100.0f, layout.getAdvance());
-    layout.getBounds(&rect);
-    EXPECT_EQ(0.0f, rect.mLeft);
-    EXPECT_EQ(0.0f, rect.mTop);
-    EXPECT_EQ(100.0f, rect.mRight);
-    EXPECT_EQ(10.0f, rect.mBottom);
-    resetAdvances(advances, kMaxAdvanceLength);
-    layout.getAdvances(advances);
-    expectedValues.resize(text.size());
-    for (size_t i = 0; i < expectedValues.size(); ++i) {
-      expectedValues[i] = 10.0f;
-    }
-    expectedValues[3] = 5.0f;
-    expectedValues[4] = 5.0f;
-    expectAdvances(expectedValues, advances, kMaxAdvanceLength);
-  }
-}
-
-TEST_F(LayoutTest, doLayoutTest_rtlTest) {
-  MinikinPaint paint;
-
-  std::vector<uint16_t> text =
-      parseUnicodeString("'a' 'b' U+3042 U+3043 'c' 'd'");
-
-  Layout ltrLayout;
-  ltrLayout.doLayout(text.data(), 0, text.size(), text.size(), kBidi_LTR,
-                     FontStyle(), paint, mCollection);
-
-  Layout rtlLayout;
-  rtlLayout.doLayout(text.data(), 0, text.size(), text.size(), kBidi_RTL,
-                     FontStyle(), paint, mCollection);
-
-  ASSERT_EQ(ltrLayout.nGlyphs(), rtlLayout.nGlyphs());
-  ASSERT_EQ(6u, ltrLayout.nGlyphs());
-
-  size_t nGlyphs = ltrLayout.nGlyphs();
-  for (size_t i = 0; i < nGlyphs; ++i) {
-    EXPECT_EQ(ltrLayout.getFont(i), rtlLayout.getFont(nGlyphs - i - 1));
-    EXPECT_EQ(ltrLayout.getGlyphId(i), rtlLayout.getGlyphId(nGlyphs - i - 1));
-  }
-}
-
-TEST_F(LayoutTest, hyphenationTest) {
-  Layout layout;
-  std::vector<uint16_t> text;
-
-  // The mock implementation returns 10.0f advance for all glyphs.
-  {
-    SCOPED_TRACE("one word with no hyphen edit");
-    text = utf8ToUtf16("oneword");
-    MinikinPaint paint;
-    paint.hyphenEdit = HyphenEdit::NO_EDIT;
-    layout.doLayout(text.data(), 0, text.size(), text.size(), kBidi_LTR,
-                    FontStyle(), paint, mCollection);
-    EXPECT_EQ(70.0f, layout.getAdvance());
-  }
-  {
-    SCOPED_TRACE("one word with hyphen insertion at the end");
-    text = utf8ToUtf16("oneword");
-    MinikinPaint paint;
-    paint.hyphenEdit = HyphenEdit::INSERT_HYPHEN_AT_END;
-    layout.doLayout(text.data(), 0, text.size(), text.size(), kBidi_LTR,
-                    FontStyle(), paint, mCollection);
-    EXPECT_EQ(80.0f, layout.getAdvance());
-  }
-  {
-    SCOPED_TRACE("one word with hyphen replacement at the end");
-    text = utf8ToUtf16("oneword");
-    MinikinPaint paint;
-    paint.hyphenEdit = HyphenEdit::REPLACE_WITH_HYPHEN_AT_END;
-    layout.doLayout(text.data(), 0, text.size(), text.size(), kBidi_LTR,
-                    FontStyle(), paint, mCollection);
-    EXPECT_EQ(70.0f, layout.getAdvance());
-  }
-  {
-    SCOPED_TRACE("one word with hyphen insertion at the start");
-    text = utf8ToUtf16("oneword");
-    MinikinPaint paint;
-    paint.hyphenEdit = HyphenEdit::INSERT_HYPHEN_AT_START;
-    layout.doLayout(text.data(), 0, text.size(), text.size(), kBidi_LTR,
-                    FontStyle(), paint, mCollection);
-    EXPECT_EQ(80.0f, layout.getAdvance());
-  }
-  {
-    SCOPED_TRACE("one word with hyphen insertion at the both ends");
-    text = utf8ToUtf16("oneword");
-    MinikinPaint paint;
-    paint.hyphenEdit =
-        HyphenEdit::INSERT_HYPHEN_AT_START | HyphenEdit::INSERT_HYPHEN_AT_END;
-    layout.doLayout(text.data(), 0, text.size(), text.size(), kBidi_LTR,
-                    FontStyle(), paint, mCollection);
-    EXPECT_EQ(90.0f, layout.getAdvance());
-  }
-}
-
-// TODO: Add more test cases, e.g. measure text, letter spacing.
-
-}  // namespace minikin
diff --git a/third_party/txt/tests/LayoutUtilsTest.cpp b/third_party/txt/tests/LayoutUtilsTest.cpp
deleted file mode 100644
index 1c57e4b9030e129475800a98ffe368bfef366295..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/LayoutUtilsTest.cpp
+++ /dev/null
@@ -1,510 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <gtest/gtest.h>
-#include "UnicodeUtils.h"
-
-#include "minikin/LayoutUtils.h"
-
-namespace minikin {
-
-void ExpectNextWordBreakForCache(size_t offset_in, const char* query_str) {
-  const size_t BUF_SIZE = 256U;
-  uint16_t buf[BUF_SIZE];
-  size_t expected_breakpoint = 0U;
-  size_t size = 0U;
-
-  ParseUnicode(buf, BUF_SIZE, query_str, &size, &expected_breakpoint);
-  EXPECT_EQ(expected_breakpoint, getNextWordBreakForCache(buf, offset_in, size))
-      << "Expected position is [" << query_str << "] from offset " << offset_in;
-}
-
-void ExpectPrevWordBreakForCache(size_t offset_in, const char* query_str) {
-  const size_t BUF_SIZE = 256U;
-  uint16_t buf[BUF_SIZE];
-  size_t expected_breakpoint = 0U;
-  size_t size = 0U;
-
-  ParseUnicode(buf, BUF_SIZE, query_str, &size, &expected_breakpoint);
-  EXPECT_EQ(expected_breakpoint, getPrevWordBreakForCache(buf, offset_in, size))
-      << "Expected position is [" << query_str << "] from offset " << offset_in;
-}
-
-TEST(WordBreakTest, goNextWordBreakTest) {
-  ExpectNextWordBreakForCache(0, "|");
-
-  // Continue for spaces.
-  ExpectNextWordBreakForCache(0, "'a' 'b' 'c' 'd' |");
-  ExpectNextWordBreakForCache(1, "'a' 'b' 'c' 'd' |");
-  ExpectNextWordBreakForCache(2, "'a' 'b' 'c' 'd' |");
-  ExpectNextWordBreakForCache(3, "'a' 'b' 'c' 'd' |");
-  ExpectNextWordBreakForCache(4, "'a' 'b' 'c' 'd' |");
-  ExpectNextWordBreakForCache(1000, "'a' 'b' 'c' 'd' |");
-
-  // Space makes word break.
-  ExpectNextWordBreakForCache(0, "'a' 'b' | U+0020 'c' 'd'");
-  ExpectNextWordBreakForCache(1, "'a' 'b' | U+0020 'c' 'd'");
-  ExpectNextWordBreakForCache(2, "'a' 'b' U+0020 | 'c' 'd'");
-  ExpectNextWordBreakForCache(3, "'a' 'b' U+0020 'c' 'd' |");
-  ExpectNextWordBreakForCache(4, "'a' 'b' U+0020 'c' 'd' |");
-  ExpectNextWordBreakForCache(5, "'a' 'b' U+0020 'c' 'd' |");
-  ExpectNextWordBreakForCache(1000, "'a' 'b' U+0020 'c' 'd' |");
-
-  ExpectNextWordBreakForCache(0, "'a' 'b' | U+2000 'c' 'd'");
-  ExpectNextWordBreakForCache(1, "'a' 'b' | U+2000 'c' 'd'");
-  ExpectNextWordBreakForCache(2, "'a' 'b' U+2000 | 'c' 'd'");
-  ExpectNextWordBreakForCache(3, "'a' 'b' U+2000 'c' 'd' |");
-  ExpectNextWordBreakForCache(4, "'a' 'b' U+2000 'c' 'd' |");
-  ExpectNextWordBreakForCache(5, "'a' 'b' U+2000 'c' 'd' |");
-  ExpectNextWordBreakForCache(1000, "'a' 'b' U+2000 'c' 'd' |");
-
-  ExpectNextWordBreakForCache(0, "'a' 'b' | U+2000 U+2000 'c' 'd'");
-  ExpectNextWordBreakForCache(1, "'a' 'b' | U+2000 U+2000 'c' 'd'");
-  ExpectNextWordBreakForCache(2, "'a' 'b' U+2000 | U+2000 'c' 'd'");
-  ExpectNextWordBreakForCache(3, "'a' 'b' U+2000 U+2000 | 'c' 'd'");
-  ExpectNextWordBreakForCache(4, "'a' 'b' U+2000 U+2000 'c' 'd' |");
-  ExpectNextWordBreakForCache(5, "'a' 'b' U+2000 U+2000 'c' 'd' |");
-  ExpectNextWordBreakForCache(6, "'a' 'b' U+2000 U+2000 'c' 'd' |");
-  ExpectNextWordBreakForCache(1000, "'a' 'b' U+2000 U+2000 'c' 'd' |");
-
-  // CJK ideographs makes word break.
-  ExpectNextWordBreakForCache(0, "U+4E00 | U+4E00   U+4E00   U+4E00   U+4E00");
-  ExpectNextWordBreakForCache(1, "U+4E00   U+4E00 | U+4E00   U+4E00   U+4E00");
-  ExpectNextWordBreakForCache(2, "U+4E00   U+4E00   U+4E00 | U+4E00   U+4E00");
-  ExpectNextWordBreakForCache(3, "U+4E00   U+4E00   U+4E00   U+4E00 | U+4E00");
-  ExpectNextWordBreakForCache(4,
-                              "U+4E00   U+4E00   U+4E00   U+4E00   U+4E00 |");
-  ExpectNextWordBreakForCache(5,
-                              "U+4E00   U+4E00   U+4E00   U+4E00   U+4E00 |");
-  ExpectNextWordBreakForCache(1000,
-                              "U+4E00   U+4E00   U+4E00   U+4E00   U+4E00 |");
-
-  ExpectNextWordBreakForCache(0, "U+4E00 | U+4E8C   U+4E09   U+56DB   U+4E94");
-  ExpectNextWordBreakForCache(1, "U+4E00   U+4E8C | U+4E09   U+56DB   U+4E94");
-  ExpectNextWordBreakForCache(2, "U+4E00   U+4E8C   U+4E09 | U+56DB   U+4E94");
-  ExpectNextWordBreakForCache(3, "U+4E00   U+4E8C   U+4E09   U+56DB | U+4E94");
-  ExpectNextWordBreakForCache(4,
-                              "U+4E00   U+4E8C   U+4E09   U+56DB   U+4E94 |");
-  ExpectNextWordBreakForCache(5,
-                              "U+4E00   U+4E8C   U+4E09   U+56DB   U+4E94 |");
-  ExpectNextWordBreakForCache(1000,
-                              "U+4E00   U+4E8C   U+4E09   U+56DB   U+4E94 |");
-
-  ExpectNextWordBreakForCache(0, "U+4E00 'a' 'b' | U+2000 'c' U+4E00");
-  ExpectNextWordBreakForCache(1, "U+4E00 'a' 'b' | U+2000 'c' U+4E00");
-  ExpectNextWordBreakForCache(2, "U+4E00 'a' 'b' | U+2000 'c' U+4E00");
-  ExpectNextWordBreakForCache(3, "U+4E00 'a' 'b' U+2000 | 'c' U+4E00");
-  ExpectNextWordBreakForCache(4, "U+4E00 'a' 'b' U+2000 'c' | U+4E00");
-  ExpectNextWordBreakForCache(5, "U+4E00 'a' 'b' U+2000 'c' U+4E00 |");
-  ExpectNextWordBreakForCache(1000, "U+4E00 'a' 'b' U+2000 'c' U+4E00 |");
-
-  // Continue if trailing characters is Unicode combining characters.
-  ExpectNextWordBreakForCache(0, "U+4E00 U+0332 | U+4E00");
-  ExpectNextWordBreakForCache(1, "U+4E00 U+0332 | U+4E00");
-  ExpectNextWordBreakForCache(2, "U+4E00 U+0332 U+4E00 |");
-  ExpectNextWordBreakForCache(3, "U+4E00 U+0332 U+4E00 |");
-  ExpectNextWordBreakForCache(1000, "U+4E00 U+0332 U+4E00 |");
-
-  // Surrogate pairs.
-  ExpectNextWordBreakForCache(0, "U+1F60D U+1F618 |");
-  ExpectNextWordBreakForCache(1, "U+1F60D U+1F618 |");
-  ExpectNextWordBreakForCache(2, "U+1F60D U+1F618 |");
-  ExpectNextWordBreakForCache(3, "U+1F60D U+1F618 |");
-  ExpectNextWordBreakForCache(4, "U+1F60D U+1F618 |");
-  ExpectNextWordBreakForCache(1000, "U+1F60D U+1F618 |");
-
-  // Broken surrogate pairs.
-  // U+D84D is leading surrogate but there is no trailing surrogate for it.
-  ExpectNextWordBreakForCache(0, "U+D84D U+1F618 |");
-  ExpectNextWordBreakForCache(1, "U+D84D U+1F618 |");
-  ExpectNextWordBreakForCache(2, "U+D84D U+1F618 |");
-  ExpectNextWordBreakForCache(3, "U+D84D U+1F618 |");
-  ExpectNextWordBreakForCache(1000, "U+D84D U+1F618 |");
-
-  ExpectNextWordBreakForCache(0, "U+1F618 U+D84D |");
-  ExpectNextWordBreakForCache(1, "U+1F618 U+D84D |");
-  ExpectNextWordBreakForCache(2, "U+1F618 U+D84D |");
-  ExpectNextWordBreakForCache(3, "U+1F618 U+D84D |");
-  ExpectNextWordBreakForCache(1000, "U+1F618 U+D84D |");
-
-  // U+DE0D is trailing surrogate but there is no leading surrogate for it.
-  ExpectNextWordBreakForCache(0, "U+DE0D U+1F618 |");
-  ExpectNextWordBreakForCache(1, "U+DE0D U+1F618 |");
-  ExpectNextWordBreakForCache(2, "U+DE0D U+1F618 |");
-  ExpectNextWordBreakForCache(3, "U+DE0D U+1F618 |");
-  ExpectNextWordBreakForCache(1000, "U+DE0D U+1F618 |");
-
-  ExpectNextWordBreakForCache(0, "U+1F618 U+DE0D |");
-  ExpectNextWordBreakForCache(1, "U+1F618 U+DE0D |");
-  ExpectNextWordBreakForCache(2, "U+1F618 U+DE0D |");
-  ExpectNextWordBreakForCache(3, "U+1F618 U+DE0D |");
-  ExpectNextWordBreakForCache(1000, "U+1F618 U+DE0D |");
-
-  // Regional indicator pair. U+1F1FA U+1F1F8 is US national flag.
-  ExpectNextWordBreakForCache(0, "U+1F1FA U+1F1F8 |");
-  ExpectNextWordBreakForCache(1, "U+1F1FA U+1F1F8 |");
-  ExpectNextWordBreakForCache(2, "U+1F1FA U+1F1F8 |");
-  ExpectNextWordBreakForCache(1000, "U+1F1FA U+1F1F8 |");
-
-  // Tone marks.
-  // CJK ideographic char + Tone mark + CJK ideographic char
-  ExpectNextWordBreakForCache(0, "U+4444 U+302D | U+4444");
-  ExpectNextWordBreakForCache(1, "U+4444 U+302D | U+4444");
-  ExpectNextWordBreakForCache(2, "U+4444 U+302D U+4444 |");
-  ExpectNextWordBreakForCache(3, "U+4444 U+302D U+4444 |");
-  ExpectNextWordBreakForCache(1000, "U+4444 U+302D U+4444 |");
-
-  // Variation Selectors.
-  // CJK Ideographic char + Variation Selector(VS1) + CJK Ideographic char
-  ExpectNextWordBreakForCache(0, "U+845B U+FE00 | U+845B");
-  ExpectNextWordBreakForCache(1, "U+845B U+FE00 | U+845B");
-  ExpectNextWordBreakForCache(2, "U+845B U+FE00 U+845B |");
-  ExpectNextWordBreakForCache(3, "U+845B U+FE00 U+845B |");
-  ExpectNextWordBreakForCache(1000, "U+845B U+FE00 U+845B |");
-
-  // CJK Ideographic char + Variation Selector(VS17) + CJK Ideographic char
-  ExpectNextWordBreakForCache(0, "U+845B U+E0100 | U+845B");
-  ExpectNextWordBreakForCache(1, "U+845B U+E0100 | U+845B");
-  ExpectNextWordBreakForCache(2, "U+845B U+E0100 | U+845B");
-  ExpectNextWordBreakForCache(3, "U+845B U+E0100 U+845B |");
-  ExpectNextWordBreakForCache(4, "U+845B U+E0100 U+845B |");
-  ExpectNextWordBreakForCache(5, "U+845B U+E0100 U+845B |");
-  ExpectNextWordBreakForCache(1000, "U+845B U+E0100 U+845B |");
-
-  // CJK ideographic char + Tone mark + Variation Character(VS1)
-  ExpectNextWordBreakForCache(0, "U+4444 U+302D U+FE00 | U+4444");
-  ExpectNextWordBreakForCache(1, "U+4444 U+302D U+FE00 | U+4444");
-  ExpectNextWordBreakForCache(2, "U+4444 U+302D U+FE00 | U+4444");
-  ExpectNextWordBreakForCache(3, "U+4444 U+302D U+FE00 U+4444 |");
-  ExpectNextWordBreakForCache(4, "U+4444 U+302D U+FE00 U+4444 |");
-  ExpectNextWordBreakForCache(1000, "U+4444 U+302D U+FE00 U+4444 |");
-
-  // CJK ideographic char + Tone mark + Variation Character(VS17)
-  ExpectNextWordBreakForCache(0, "U+4444 U+302D U+E0100 | U+4444");
-  ExpectNextWordBreakForCache(1, "U+4444 U+302D U+E0100 | U+4444");
-  ExpectNextWordBreakForCache(2, "U+4444 U+302D U+E0100 | U+4444");
-  ExpectNextWordBreakForCache(3, "U+4444 U+302D U+E0100 | U+4444");
-  ExpectNextWordBreakForCache(4, "U+4444 U+302D U+E0100 U+4444 |");
-  ExpectNextWordBreakForCache(5, "U+4444 U+302D U+E0100 U+4444 |");
-  ExpectNextWordBreakForCache(1000, "U+4444 U+302D U+E0100 U+4444 |");
-
-  // CJK ideographic char + Variation Character(VS1) + Tone mark
-  ExpectNextWordBreakForCache(0, "U+4444 U+FE00 U+302D | U+4444");
-  ExpectNextWordBreakForCache(1, "U+4444 U+FE00 U+302D | U+4444");
-  ExpectNextWordBreakForCache(2, "U+4444 U+FE00 U+302D | U+4444");
-  ExpectNextWordBreakForCache(3, "U+4444 U+FE00 U+302D U+4444 |");
-  ExpectNextWordBreakForCache(4, "U+4444 U+FE00 U+302D U+4444 |");
-  ExpectNextWordBreakForCache(1000, "U+4444 U+FE00 U+302D U+4444 |");
-
-  // CJK ideographic char + Variation Character(VS17) + Tone mark
-  ExpectNextWordBreakForCache(0, "U+4444 U+E0100 U+302D | U+4444");
-  ExpectNextWordBreakForCache(1, "U+4444 U+E0100 U+302D | U+4444");
-  ExpectNextWordBreakForCache(2, "U+4444 U+E0100 U+302D | U+4444");
-  ExpectNextWordBreakForCache(3, "U+4444 U+E0100 U+302D | U+4444");
-  ExpectNextWordBreakForCache(4, "U+4444 U+E0100 U+302D U+4444 |");
-  ExpectNextWordBreakForCache(5, "U+4444 U+E0100 U+302D U+4444 |");
-  ExpectNextWordBreakForCache(1000, "U+4444 U+E0100 U+302D U+4444 |");
-
-  // Following test cases are unusual usage of variation selectors and tone
-  // marks for caching up the further behavior changes, e.g. index of bounds
-  // or crashes. Please feel free to update the test expectations if the
-  // behavior change makes sense to you.
-
-  // Isolated Tone marks and Variation Selectors
-  ExpectNextWordBreakForCache(0, "U+FE00 |");
-  ExpectNextWordBreakForCache(1, "U+FE00 |");
-  ExpectNextWordBreakForCache(1000, "U+FE00 |");
-  ExpectNextWordBreakForCache(0, "U+E0100 |");
-  ExpectNextWordBreakForCache(1000, "U+E0100 |");
-  ExpectNextWordBreakForCache(0, "U+302D |");
-  ExpectNextWordBreakForCache(1000, "U+302D |");
-
-  // CJK Ideographic char + Variation Selector(VS1) + Variation Selector(VS1)
-  ExpectNextWordBreakForCache(0, "U+845B U+FE00 U+FE00 | U+845B");
-  ExpectNextWordBreakForCache(1, "U+845B U+FE00 U+FE00 | U+845B");
-  ExpectNextWordBreakForCache(2, "U+845B U+FE00 U+FE00 | U+845B");
-  ExpectNextWordBreakForCache(3, "U+845B U+FE00 U+FE00 U+845B |");
-  ExpectNextWordBreakForCache(4, "U+845B U+FE00 U+FE00 U+845B |");
-  ExpectNextWordBreakForCache(1000, "U+845B U+FE00 U+FE00 U+845B |");
-
-  // CJK Ideographic char + Variation Selector(VS17) + Variation Selector(VS17)
-  ExpectNextWordBreakForCache(0, "U+845B U+E0100 U+E0100 | U+845B");
-  ExpectNextWordBreakForCache(1, "U+845B U+E0100 U+E0100 | U+845B");
-  ExpectNextWordBreakForCache(2, "U+845B U+E0100 U+E0100 | U+845B");
-  ExpectNextWordBreakForCache(3, "U+845B U+E0100 U+E0100 | U+845B");
-  ExpectNextWordBreakForCache(4, "U+845B U+E0100 U+E0100 | U+845B");
-  ExpectNextWordBreakForCache(5, "U+845B U+E0100 U+E0100 U+845B |");
-  ExpectNextWordBreakForCache(6, "U+845B U+E0100 U+E0100 U+845B |");
-  ExpectNextWordBreakForCache(1000, "U+845B U+E0100 U+E0100 U+845B |");
-
-  // CJK Ideographic char + Variation Selector(VS1) + Variation Selector(VS17)
-  ExpectNextWordBreakForCache(0, "U+845B U+FE00 U+E0100 | U+845B");
-  ExpectNextWordBreakForCache(1, "U+845B U+FE00 U+E0100 | U+845B");
-  ExpectNextWordBreakForCache(2, "U+845B U+FE00 U+E0100 | U+845B");
-  ExpectNextWordBreakForCache(3, "U+845B U+FE00 U+E0100 | U+845B");
-  ExpectNextWordBreakForCache(4, "U+845B U+FE00 U+E0100 U+845B |");
-  ExpectNextWordBreakForCache(5, "U+845B U+FE00 U+E0100 U+845B |");
-  ExpectNextWordBreakForCache(1000, "U+845B U+FE00 U+E0100 U+845B |");
-
-  // CJK Ideographic char + Variation Selector(VS17) + Variation Selector(VS1)
-  ExpectNextWordBreakForCache(0, "U+845B U+E0100 U+FE00 | U+845B");
-  ExpectNextWordBreakForCache(1, "U+845B U+E0100 U+FE00 | U+845B");
-  ExpectNextWordBreakForCache(2, "U+845B U+E0100 U+FE00 | U+845B");
-  ExpectNextWordBreakForCache(3, "U+845B U+E0100 U+FE00 | U+845B");
-  ExpectNextWordBreakForCache(4, "U+845B U+E0100 U+FE00 U+845B |");
-  ExpectNextWordBreakForCache(5, "U+845B U+E0100 U+FE00 U+845B |");
-  ExpectNextWordBreakForCache(1000, "U+845B U+E0100 U+FE00 U+845B |");
-
-  // Tone mark. + Tone mark
-  ExpectNextWordBreakForCache(0, "U+4444 U+302D U+302D | U+4444");
-  ExpectNextWordBreakForCache(1, "U+4444 U+302D U+302D | U+4444");
-  ExpectNextWordBreakForCache(2, "U+4444 U+302D U+302D | U+4444");
-  ExpectNextWordBreakForCache(3, "U+4444 U+302D U+302D U+4444 |");
-  ExpectNextWordBreakForCache(4, "U+4444 U+302D U+302D U+4444 |");
-  ExpectNextWordBreakForCache(1000, "U+4444 U+302D U+302D U+4444 |");
-}
-
-TEST(WordBreakTest, goPrevWordBreakTest) {
-  ExpectPrevWordBreakForCache(0, "|");
-
-  // Continue for spaces.
-  ExpectPrevWordBreakForCache(0, "| 'a' 'b' 'c' 'd'");
-  ExpectPrevWordBreakForCache(1, "| 'a' 'b' 'c' 'd'");
-  ExpectPrevWordBreakForCache(2, "| 'a' 'b' 'c' 'd'");
-  ExpectPrevWordBreakForCache(3, "| 'a' 'b' 'c' 'd'");
-  ExpectPrevWordBreakForCache(4, "| 'a' 'b' 'c' 'd'");
-  ExpectPrevWordBreakForCache(1000, "| 'a' 'b' 'c' 'd'");
-
-  // Space makes word break.
-  ExpectPrevWordBreakForCache(0, "| 'a' 'b' U+0020 'c' 'd'");
-  ExpectPrevWordBreakForCache(1, "| 'a' 'b' U+0020 'c' 'd'");
-  ExpectPrevWordBreakForCache(2, "| 'a' 'b' U+0020 'c' 'd'");
-  ExpectPrevWordBreakForCache(3, "'a' 'b' | U+0020 'c' 'd'");
-  ExpectPrevWordBreakForCache(4, "'a' 'b' U+0020 | 'c' 'd'");
-  ExpectPrevWordBreakForCache(5, "'a' 'b' U+0020 | 'c' 'd'");
-  ExpectPrevWordBreakForCache(1000, "'a' 'b' U+0020 | 'c' 'd'");
-
-  ExpectPrevWordBreakForCache(0, "| 'a' 'b' U+2000 'c' 'd'");
-  ExpectPrevWordBreakForCache(1, "| 'a' 'b' U+2000 'c' 'd'");
-  ExpectPrevWordBreakForCache(2, "| 'a' 'b' U+2000 'c' 'd'");
-  ExpectPrevWordBreakForCache(3, "'a' 'b' | U+2000 'c' 'd'");
-  ExpectPrevWordBreakForCache(4, "'a' 'b' U+2000 | 'c' 'd'");
-  ExpectPrevWordBreakForCache(5, "'a' 'b' U+2000 | 'c' 'd'");
-  ExpectPrevWordBreakForCache(1000, "'a' 'b' U+2000 | 'c' 'd'");
-
-  ExpectPrevWordBreakForCache(0, "| 'a' 'b' U+2000 U+2000 'c' 'd'");
-  ExpectPrevWordBreakForCache(1, "| 'a' 'b' U+2000 U+2000 'c' 'd'");
-  ExpectPrevWordBreakForCache(2, "| 'a' 'b' U+2000 U+2000 'c' 'd'");
-  ExpectPrevWordBreakForCache(3, "'a' 'b' | U+2000 U+2000 'c' 'd'");
-  ExpectPrevWordBreakForCache(4, "'a' 'b' U+2000 | U+2000 'c' 'd'");
-  ExpectPrevWordBreakForCache(5, "'a' 'b' U+2000 U+2000 | 'c' 'd'");
-  ExpectPrevWordBreakForCache(6, "'a' 'b' U+2000 U+2000 | 'c' 'd'");
-  ExpectPrevWordBreakForCache(1000, "'a' 'b' U+2000 U+2000 | 'c' 'd'");
-
-  // CJK ideographs makes word break.
-  ExpectPrevWordBreakForCache(0, "| U+4E00 U+4E00 U+4E00 U+4E00 U+4E00");
-  ExpectPrevWordBreakForCache(1, "| U+4E00 U+4E00 U+4E00 U+4E00 U+4E00");
-  ExpectPrevWordBreakForCache(2, "U+4E00 | U+4E00 U+4E00 U+4E00 U+4E00");
-  ExpectPrevWordBreakForCache(3, "U+4E00 U+4E00 | U+4E00 U+4E00 U+4E00");
-  ExpectPrevWordBreakForCache(4, "U+4E00 U+4E00 U+4E00 | U+4E00 U+4E00");
-  ExpectPrevWordBreakForCache(5, "U+4E00 U+4E00 U+4E00 U+4E00 | U+4E00");
-  ExpectPrevWordBreakForCache(1000, "U+4E00 U+4E00 U+4E00 U+4E00 | U+4E00");
-
-  ExpectPrevWordBreakForCache(0, "| U+4E00 U+4E8C U+4E09 U+56DB U+4E94");
-  ExpectPrevWordBreakForCache(1, "| U+4E00 U+4E8C U+4E09 U+56DB U+4E94");
-  ExpectPrevWordBreakForCache(2, "U+4E00 | U+4E8C U+4E09 U+56DB U+4E94");
-  ExpectPrevWordBreakForCache(3, "U+4E00 U+4E8C | U+4E09 U+56DB U+4E94");
-  ExpectPrevWordBreakForCache(4, "U+4E00 U+4E8C U+4E09 | U+56DB U+4E94");
-  ExpectPrevWordBreakForCache(5, "U+4E00 U+4E8C U+4E09 U+56DB | U+4E94");
-  ExpectPrevWordBreakForCache(1000, "U+4E00 U+4E8C U+4E09 U+56DB | U+4E94");
-
-  // Mixed case.
-  ExpectPrevWordBreakForCache(0, "| U+4E00 'a' 'b' U+2000 'c' U+4E00");
-  ExpectPrevWordBreakForCache(1, "| U+4E00 'a' 'b' U+2000 'c' U+4E00");
-  ExpectPrevWordBreakForCache(2, "| U+4E00 'a' 'b' U+2000 'c' U+4E00");
-  ExpectPrevWordBreakForCache(3, "| U+4E00 'a' 'b' U+2000 'c' U+4E00");
-  ExpectPrevWordBreakForCache(4, "U+4E00 'a' 'b' | U+2000 'c' U+4E00");
-  ExpectPrevWordBreakForCache(5, "U+4E00 'a' 'b' U+2000 | 'c' U+4E00");
-  ExpectPrevWordBreakForCache(6, "U+4E00 'a' 'b' U+2000 'c' | U+4E00");
-  ExpectPrevWordBreakForCache(1000, "U+4E00 'a' 'b' U+2000 'c' | U+4E00");
-
-  // Continue if trailing characters is Unicode combining characters.
-  ExpectPrevWordBreakForCache(0, "| U+4E00 U+0332 U+4E00");
-  ExpectPrevWordBreakForCache(1, "| U+4E00 U+0332 U+4E00");
-  ExpectPrevWordBreakForCache(2, "| U+4E00 U+0332 U+4E00");
-  ExpectPrevWordBreakForCache(3, "U+4E00 U+0332 | U+4E00");
-  ExpectPrevWordBreakForCache(1000, "U+4E00 U+0332 | U+4E00");
-
-  // Surrogate pairs.
-  ExpectPrevWordBreakForCache(0, "| U+1F60D U+1F618");
-  ExpectPrevWordBreakForCache(1, "| U+1F60D U+1F618");
-  ExpectPrevWordBreakForCache(2, "| U+1F60D U+1F618");
-  ExpectPrevWordBreakForCache(3, "| U+1F60D U+1F618");
-  ExpectPrevWordBreakForCache(4, "| U+1F60D U+1F618");
-  ExpectPrevWordBreakForCache(1000, "| U+1F60D U+1F618");
-
-  // Broken surrogate pairs.
-  // U+D84D is leading surrogate but there is no trailing surrogate for it.
-  ExpectPrevWordBreakForCache(0, "| U+D84D U+1F618");
-  ExpectPrevWordBreakForCache(1, "| U+D84D U+1F618");
-  ExpectPrevWordBreakForCache(2, "| U+D84D U+1F618");
-  ExpectPrevWordBreakForCache(3, "| U+D84D U+1F618");
-  ExpectPrevWordBreakForCache(1000, "| U+D84D U+1F618");
-
-  ExpectPrevWordBreakForCache(0, "| U+1F618 U+D84D");
-  ExpectPrevWordBreakForCache(1, "| U+1F618 U+D84D");
-  ExpectPrevWordBreakForCache(2, "| U+1F618 U+D84D");
-  ExpectPrevWordBreakForCache(3, "| U+1F618 U+D84D");
-  ExpectPrevWordBreakForCache(1000, "| U+1F618 U+D84D");
-
-  // U+DE0D is trailing surrogate but there is no leading surrogate for it.
-  ExpectPrevWordBreakForCache(0, "| U+DE0D U+1F618");
-  ExpectPrevWordBreakForCache(1, "| U+DE0D U+1F618");
-  ExpectPrevWordBreakForCache(2, "| U+DE0D U+1F618");
-  ExpectPrevWordBreakForCache(3, "| U+DE0D U+1F618");
-  ExpectPrevWordBreakForCache(1000, "| U+DE0D U+1F618");
-
-  ExpectPrevWordBreakForCache(0, "| U+1F618 U+DE0D");
-  ExpectPrevWordBreakForCache(1, "| U+1F618 U+DE0D");
-  ExpectPrevWordBreakForCache(2, "| U+1F618 U+DE0D");
-  ExpectPrevWordBreakForCache(3, "| U+1F618 U+DE0D");
-  ExpectPrevWordBreakForCache(1000, "| U+1F618 U+DE0D");
-
-  // Regional indicator pair. U+1F1FA U+1F1F8 is US national flag.
-  ExpectPrevWordBreakForCache(0, "| U+1F1FA U+1F1F8");
-  ExpectPrevWordBreakForCache(1, "| U+1F1FA U+1F1F8");
-  ExpectPrevWordBreakForCache(2, "| U+1F1FA U+1F1F8");
-  ExpectPrevWordBreakForCache(1000, "| U+1F1FA U+1F1F8");
-
-  // Tone marks.
-  // CJK ideographic char + Tone mark + CJK ideographic char
-  ExpectPrevWordBreakForCache(0, "| U+4444 U+302D U+4444");
-  ExpectPrevWordBreakForCache(1, "| U+4444 U+302D U+4444");
-  ExpectPrevWordBreakForCache(2, "| U+4444 U+302D U+4444");
-  ExpectPrevWordBreakForCache(3, "U+4444 U+302D | U+4444");
-  ExpectPrevWordBreakForCache(1000, "U+4444 U+302D | U+4444");
-
-  // Variation Selectors.
-  // CJK Ideographic char + Variation Selector(VS1) + CJK Ideographic char
-  ExpectPrevWordBreakForCache(0, "| U+845B U+FE00 U+845B");
-  ExpectPrevWordBreakForCache(1, "| U+845B U+FE00 U+845B");
-  ExpectPrevWordBreakForCache(2, "| U+845B U+FE00 U+845B");
-  ExpectPrevWordBreakForCache(3, "U+845B U+FE00 | U+845B");
-  ExpectPrevWordBreakForCache(1000, "U+845B U+FE00 | U+845B");
-
-  // CJK Ideographic char + Variation Selector(VS17) + CJK Ideographic char
-  ExpectPrevWordBreakForCache(0, "| U+845B U+E0100 U+845B");
-  ExpectPrevWordBreakForCache(1, "| U+845B U+E0100 U+845B");
-  ExpectPrevWordBreakForCache(2, "| U+845B U+E0100 U+845B");
-  ExpectPrevWordBreakForCache(3, "| U+845B U+E0100 U+845B");
-  ExpectPrevWordBreakForCache(4, "U+845B U+E0100 | U+845B");
-  ExpectPrevWordBreakForCache(5, "U+845B U+E0100 | U+845B");
-  ExpectPrevWordBreakForCache(1000, "U+845B U+E0100 | U+845B");
-
-  // CJK ideographic char + Tone mark + Variation Character(VS1)
-  ExpectPrevWordBreakForCache(0, "| U+4444 U+302D U+FE00 U+4444");
-  ExpectPrevWordBreakForCache(1, "| U+4444 U+302D U+FE00 U+4444");
-  ExpectPrevWordBreakForCache(2, "| U+4444 U+302D U+FE00 U+4444");
-  ExpectPrevWordBreakForCache(3, "| U+4444 U+302D U+FE00 U+4444");
-  ExpectPrevWordBreakForCache(4, "U+4444 U+302D U+FE00 | U+4444");
-  ExpectPrevWordBreakForCache(1000, "U+4444 U+302D U+FE00 | U+4444");
-
-  // CJK ideographic char + Tone mark + Variation Character(VS17)
-  ExpectPrevWordBreakForCache(0, "| U+4444 U+302D U+E0100 U+4444");
-  ExpectPrevWordBreakForCache(1, "| U+4444 U+302D U+E0100 U+4444");
-  ExpectPrevWordBreakForCache(2, "| U+4444 U+302D U+E0100 U+4444");
-  ExpectPrevWordBreakForCache(3, "| U+4444 U+302D U+E0100 U+4444");
-  ExpectPrevWordBreakForCache(4, "| U+4444 U+302D U+E0100 U+4444");
-  ExpectPrevWordBreakForCache(5, "U+4444 U+302D U+E0100 | U+4444");
-  ExpectPrevWordBreakForCache(1000, "U+4444 U+302D U+E0100 | U+4444");
-
-  // CJK ideographic char + Variation Character(VS1) + Tone mark
-  ExpectPrevWordBreakForCache(0, "| U+4444 U+FE00 U+302D U+4444");
-  ExpectPrevWordBreakForCache(1, "| U+4444 U+FE00 U+302D U+4444");
-  ExpectPrevWordBreakForCache(2, "| U+4444 U+FE00 U+302D U+4444");
-  ExpectPrevWordBreakForCache(3, "| U+4444 U+FE00 U+302D U+4444");
-  ExpectPrevWordBreakForCache(4, "U+4444 U+FE00 U+302D | U+4444");
-  ExpectPrevWordBreakForCache(1000, "U+4444 U+FE00 U+302D | U+4444");
-
-  // CJK ideographic char + Variation Character(VS17) + Tone mark
-  ExpectPrevWordBreakForCache(0, "| U+4444 U+E0100 U+302D U+4444");
-  ExpectPrevWordBreakForCache(1, "| U+4444 U+E0100 U+302D U+4444");
-  ExpectPrevWordBreakForCache(2, "| U+4444 U+E0100 U+302D U+4444");
-  ExpectPrevWordBreakForCache(3, "| U+4444 U+E0100 U+302D U+4444");
-  ExpectPrevWordBreakForCache(4, "| U+4444 U+E0100 U+302D U+4444");
-  ExpectPrevWordBreakForCache(5, "U+4444 U+E0100 U+302D | U+4444");
-  ExpectPrevWordBreakForCache(1000, "U+4444 U+E0100 U+302D | U+4444");
-
-  // Following test cases are unusual usage of variation selectors and tone
-  // marks for caching up the further behavior changes, e.g. index of bounds
-  // or crashes. Please feel free to update the test expectations if the
-  // behavior change makes sense to you.
-
-  // Isolated Tone marks and Variation Selectors
-  ExpectPrevWordBreakForCache(0, "| U+FE00");
-  ExpectPrevWordBreakForCache(1, "| U+FE00");
-  ExpectPrevWordBreakForCache(1000, "| U+FE00");
-  ExpectPrevWordBreakForCache(0, "| U+E0100");
-  ExpectPrevWordBreakForCache(1000, "| U+E0100");
-  ExpectPrevWordBreakForCache(0, "| U+302D");
-  ExpectPrevWordBreakForCache(1000, "| U+302D");
-
-  // CJK Ideographic char + Variation Selector(VS1) + Variation Selector(VS1)
-  ExpectPrevWordBreakForCache(0, "| U+845B U+FE00 U+FE00 U+845B");
-  ExpectPrevWordBreakForCache(1, "| U+845B U+FE00 U+FE00 U+845B");
-  ExpectPrevWordBreakForCache(2, "| U+845B U+FE00 U+FE00 U+845B");
-  ExpectPrevWordBreakForCache(3, "| U+845B U+FE00 U+FE00 U+845B");
-  ExpectPrevWordBreakForCache(4, "U+845B U+FE00 U+FE00 | U+845B");
-  ExpectPrevWordBreakForCache(1000, "U+845B U+FE00 U+FE00 | U+845B");
-
-  // CJK Ideographic char + Variation Selector(VS17) + Variation Selector(VS17)
-  ExpectPrevWordBreakForCache(0, "| U+845B U+E0100 U+E0100 U+845B");
-  ExpectPrevWordBreakForCache(1, "| U+845B U+E0100 U+E0100 U+845B");
-  ExpectPrevWordBreakForCache(2, "| U+845B U+E0100 U+E0100 U+845B");
-  ExpectPrevWordBreakForCache(3, "| U+845B U+E0100 U+E0100 U+845B");
-  ExpectPrevWordBreakForCache(4, "| U+845B U+E0100 U+E0100 U+845B");
-  ExpectPrevWordBreakForCache(5, "| U+845B U+E0100 U+E0100 U+845B");
-  ExpectPrevWordBreakForCache(6, "U+845B U+E0100 U+E0100 | U+845B");
-  ExpectPrevWordBreakForCache(1000, "U+845B U+E0100 U+E0100 | U+845B");
-
-  // CJK Ideographic char + Variation Selector(VS1) + Variation Selector(VS17)
-  ExpectPrevWordBreakForCache(0, "| U+845B U+FE00 U+E0100 U+845B");
-  ExpectPrevWordBreakForCache(1, "| U+845B U+FE00 U+E0100 U+845B");
-  ExpectPrevWordBreakForCache(2, "| U+845B U+FE00 U+E0100 U+845B");
-  ExpectPrevWordBreakForCache(3, "| U+845B U+FE00 U+E0100 U+845B");
-  ExpectPrevWordBreakForCache(4, "| U+845B U+FE00 U+E0100 U+845B");
-  ExpectPrevWordBreakForCache(5, "U+845B U+FE00 U+E0100 | U+845B");
-  ExpectPrevWordBreakForCache(1000, "U+845B U+FE00 U+E0100 | U+845B");
-
-  // CJK Ideographic char + Variation Selector(VS17) + Variation Selector(VS1)
-  ExpectPrevWordBreakForCache(0, "| U+845B U+E0100 U+FE00 U+845B");
-  ExpectPrevWordBreakForCache(1, "| U+845B U+E0100 U+FE00 U+845B");
-  ExpectPrevWordBreakForCache(2, "| U+845B U+E0100 U+FE00 U+845B");
-  ExpectPrevWordBreakForCache(3, "| U+845B U+E0100 U+FE00 U+845B");
-  ExpectPrevWordBreakForCache(4, "| U+845B U+E0100 U+FE00 U+845B");
-  ExpectPrevWordBreakForCache(5, "U+845B U+E0100 U+FE00 | U+845B");
-  ExpectPrevWordBreakForCache(1000, "U+845B U+E0100 U+FE00 | U+845B");
-
-  // Tone mark. + Tone mark
-  ExpectPrevWordBreakForCache(0, "| U+4444 U+302D U+302D U+4444");
-  ExpectPrevWordBreakForCache(1, "| U+4444 U+302D U+302D U+4444");
-  ExpectPrevWordBreakForCache(2, "| U+4444 U+302D U+302D U+4444");
-  ExpectPrevWordBreakForCache(3, "| U+4444 U+302D U+302D U+4444");
-  ExpectPrevWordBreakForCache(4, "U+4444 U+302D U+302D | U+4444");
-  ExpectPrevWordBreakForCache(1000, "U+4444 U+302D U+302D | U+4444");
-}
-
-}  // namespace minikin
diff --git a/third_party/txt/tests/MeasurementTests.cpp b/third_party/txt/tests/MeasurementTests.cpp
deleted file mode 100644
index ea3b7007e3d1f08ccb4247456f08770d52ad0452..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/MeasurementTests.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <gtest/gtest.h>
-#include <minikin/Measurement.h>
-#include "UnicodeUtils.h"
-
-namespace minikin {
-
-float getAdvance(const float* advances, const char* src) {
-  const size_t BUF_SIZE = 256;
-  uint16_t buf[BUF_SIZE];
-  size_t offset;
-  size_t size;
-  ParseUnicode(buf, BUF_SIZE, src, &size, &offset);
-  return getRunAdvance(advances, buf, 0, size, offset);
-}
-
-// Latin fi
-TEST(Measurement, getRunAdvance_fi) {
-  const float unligated[] = {30.0, 20.0};
-  EXPECT_EQ(0.0, getAdvance(unligated, "| 'f' 'i'"));
-  EXPECT_EQ(30.0, getAdvance(unligated, "'f' | 'i'"));
-  EXPECT_EQ(50.0, getAdvance(unligated, "'f' 'i' |"));
-
-  const float ligated[] = {40.0, 0.0};
-  EXPECT_EQ(0.0, getAdvance(ligated, "| 'f' 'i'"));
-  EXPECT_EQ(20.0, getAdvance(ligated, "'f' | 'i'"));
-  EXPECT_EQ(40.0, getAdvance(ligated, "'f' 'i' |"));
-}
-
-// Devanagari ka+virama+ka
-TEST(Measurement, getRunAdvance_kka) {
-  const float unligated[] = {30.0, 0.0, 30.0};
-  EXPECT_EQ(0.0, getAdvance(unligated, "| U+0915 U+094D U+0915"));
-  EXPECT_EQ(30.0, getAdvance(unligated, "U+0915 | U+094D U+0915"));
-  EXPECT_EQ(30.0, getAdvance(unligated, "U+0915 U+094D | U+0915"));
-  EXPECT_EQ(60.0, getAdvance(unligated, "U+0915 U+094D U+0915 |"));
-
-  const float ligated[] = {30.0, 0.0, 0.0};
-  EXPECT_EQ(0.0, getAdvance(ligated, "| U+0915 U+094D U+0915"));
-  EXPECT_EQ(30.0, getAdvance(ligated, "U+0915 | U+094D U+0915"));
-  EXPECT_EQ(30.0, getAdvance(ligated, "U+0915 U+094D | U+0915"));
-  EXPECT_EQ(30.0, getAdvance(ligated, "U+0915 U+094D U+0915 |"));
-}
-
-}  // namespace minikin
diff --git a/third_party/txt/tests/MinikinFontForTest.cpp b/third_party/txt/tests/MinikinFontForTest.cpp
deleted file mode 100644
index 88f1a63c313bc9249980bc4834a8ee78bab511de..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/MinikinFontForTest.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "Minikin"
-
-#include "MinikinFontForTest.h"
-
-#include <minikin/MinikinFont.h>
-
-#include <fcntl.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include <string>
-
-#include <log/log.h>
-
-namespace minikin {
-
-static int uniqueId = 0;  // TODO: make thread safe if necessary.
-
-MinikinFontForTest::MinikinFontForTest(
-    const std::string& font_path,
-    int index,
-    const std::vector<FontVariation>& variations)
-    : MinikinFont(uniqueId++),
-      mFontPath(font_path),
-      mVariations(variations),
-      mFontIndex(index) {
-  int fd = open(font_path.c_str(), O_RDONLY);
-  LOG_ALWAYS_FATAL_IF(fd == -1);
-  struct stat st = {};
-  LOG_ALWAYS_FATAL_IF(fstat(fd, &st) != 0);
-  mFontSize = st.st_size;
-  mFontData = mmap(NULL, mFontSize, PROT_READ, MAP_SHARED, fd, 0);
-  LOG_ALWAYS_FATAL_IF(mFontData == nullptr);
-  close(fd);
-}
-
-MinikinFontForTest::~MinikinFontForTest() {
-  munmap(mFontData, mFontSize);
-}
-
-float MinikinFontForTest::GetHorizontalAdvance(
-    uint32_t /* glyph_id */,
-    const MinikinPaint& /* paint */) const {
-  // TODO: Make mock value configurable if necessary.
-  return 10.0f;
-}
-
-void MinikinFontForTest::GetBounds(MinikinRect* bounds,
-                                   uint32_t /* glyph_id */,
-                                   const MinikinPaint& /* paint */) const {
-  // TODO: Make mock values configurable if necessary.
-  bounds->mLeft = 0.0f;
-  bounds->mTop = 0.0f;
-  bounds->mRight = 10.0f;
-  bounds->mBottom = 10.0f;
-}
-
-std::shared_ptr<MinikinFont> MinikinFontForTest::createFontWithVariation(
-    const std::vector<FontVariation>& variations) const {
-  return std::shared_ptr<MinikinFont>(
-      new MinikinFontForTest(mFontPath, mFontIndex, variations));
-}
-
-}  // namespace minikin
diff --git a/third_party/txt/tests/MinikinFontForTest.h b/third_party/txt/tests/MinikinFontForTest.h
deleted file mode 100644
index 1da817b9c50e042d8a24bd16c4d7d3afaab4797d..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/MinikinFontForTest.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef MINIKIN_TEST_MINIKIN_FONT_FOR_TEST_H
-#define MINIKIN_TEST_MINIKIN_FONT_FOR_TEST_H
-
-#include <minikin/MinikinFont.h>
-
-class SkTypeface;
-
-namespace minikin {
-
-class MinikinFontForTest : public MinikinFont {
- public:
-  MinikinFontForTest(const std::string& font_path,
-                     int index,
-                     const std::vector<FontVariation>& variations);
-  MinikinFontForTest(const std::string& font_path, int index)
-      : MinikinFontForTest(font_path, index, std::vector<FontVariation>()) {}
-  MinikinFontForTest(const std::string& font_path)
-      : MinikinFontForTest(font_path, 0) {}
-  virtual ~MinikinFontForTest();
-
-  // MinikinFont overrides.
-  float GetHorizontalAdvance(uint32_t glyph_id,
-                             const MinikinPaint& paint) const;
-  void GetBounds(MinikinRect* bounds,
-                 uint32_t glyph_id,
-                 const MinikinPaint& paint) const;
-
-  const std::string& fontPath() const { return mFontPath; }
-
-  const void* GetFontData() const { return mFontData; }
-  size_t GetFontSize() const { return mFontSize; }
-  int GetFontIndex() const { return mFontIndex; }
-  const std::vector<minikin::FontVariation>& GetAxes() const {
-    return mVariations;
-  }
-  std::shared_ptr<MinikinFont> createFontWithVariation(
-      const std::vector<FontVariation>& variations) const;
-
- private:
-  MinikinFontForTest() = delete;
-  MinikinFontForTest(const MinikinFontForTest&) = delete;
-  MinikinFontForTest& operator=(MinikinFontForTest&) = delete;
-
-  const std::string mFontPath;
-  const std::vector<FontVariation> mVariations;
-  const int mFontIndex;
-  void* mFontData;
-  size_t mFontSize;
-};
-
-}  // namespace minikin
-
-#endif  // MINIKIN_TEST_MINIKIN_FONT_FOR_TEST_H
diff --git a/third_party/txt/tests/SparseBitSetTest.cpp b/third_party/txt/tests/SparseBitSetTest.cpp
deleted file mode 100644
index 80856ee66e00d827c6d0fa15363451c7ab0b2b3d..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/SparseBitSetTest.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <random>
-
-#include <gtest/gtest.h>
-#include <minikin/SparseBitSet.h>
-
-namespace minikin {
-
-TEST(SparseBitSetTest, randomTest) {
-  const uint32_t kTestRangeNum = 4096;
-
-  std::mt19937 mt;  // Fix seeds to be able to reproduce the result.
-  std::uniform_int_distribution<uint16_t> distribution(1, 512);
-
-  std::vector<uint32_t> range{distribution(mt)};
-  for (size_t i = 1; i < kTestRangeNum * 2; ++i) {
-    range.push_back((range.back() - 1) + distribution(mt));
-  }
-
-  SparseBitSet bitset(range.data(), range.size() / 2);
-
-  uint32_t ch = 0;
-  for (size_t i = 0; i < range.size() / 2; ++i) {
-    uint32_t start = range[i * 2];
-    uint32_t end = range[i * 2 + 1];
-
-    for (; ch < start; ch++) {
-      ASSERT_FALSE(bitset.get(ch)) << std::hex << ch;
-    }
-    for (; ch < end; ch++) {
-      ASSERT_TRUE(bitset.get(ch)) << std::hex << ch;
-    }
-  }
-  for (; ch < 0x1FFFFFF; ++ch) {
-    ASSERT_FALSE(bitset.get(ch)) << std::hex << ch;
-  }
-}
-
-}  // namespace minikin
diff --git a/third_party/txt/tests/UnicodeUtils.cpp b/third_party/txt/tests/UnicodeUtils.cpp
deleted file mode 100644
index c52417f83fe4959626c35e80cdc84b6e0a83e116..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/UnicodeUtils.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <log/log.h>
-#include <unicode/utf.h>
-#include <unicode/utf8.h>
-#include <cstdlib>
-#include <memory>
-#include <string>
-#include <vector>
-
-namespace minikin {
-
-// src is of the form "U+1F431 | 'h' 'i'". Position of "|" gets saved to offset
-// if non-null. Size is returned in an out parameter because gtest needs a void
-// return for ASSERT to work.
-void ParseUnicode(uint16_t* buf,
-                  size_t buf_size,
-                  const char* src,
-                  size_t* result_size,
-                  size_t* offset) {
-  size_t input_ix = 0;
-  size_t output_ix = 0;
-  bool seen_offset = false;
-
-  while (src[input_ix] != 0) {
-    switch (src[input_ix]) {
-      case '\'':
-        // single ASCII char
-        LOG_ALWAYS_FATAL_IF(static_cast<uint8_t>(src[input_ix]) >= 0x80);
-        input_ix++;
-        LOG_ALWAYS_FATAL_IF(src[input_ix] == 0);
-        LOG_ALWAYS_FATAL_IF(output_ix >= buf_size);
-        buf[output_ix++] = (uint16_t)src[input_ix++];
-        LOG_ALWAYS_FATAL_IF(src[input_ix] != '\'');
-        input_ix++;
-        break;
-      case 'u':
-      case 'U': {
-        // Unicode codepoint in hex syntax
-        input_ix++;
-        LOG_ALWAYS_FATAL_IF(src[input_ix] != '+');
-        input_ix++;
-        char* endptr = (char*)src + input_ix;
-        unsigned long int codepoint = strtoul(src + input_ix, &endptr, 16);
-        size_t num_hex_digits = endptr - (src + input_ix);
-
-        // also triggers on invalid number syntax, digits = 0
-        LOG_ALWAYS_FATAL_IF(num_hex_digits < 4u);
-        LOG_ALWAYS_FATAL_IF(num_hex_digits > 6u);
-        LOG_ALWAYS_FATAL_IF(codepoint > 0x10FFFFu);
-        input_ix += num_hex_digits;
-        if (U16_LENGTH(codepoint) == 1) {
-          LOG_ALWAYS_FATAL_IF(output_ix + 1 > buf_size);
-          buf[output_ix++] = codepoint;
-        } else {
-          // UTF-16 encoding
-          LOG_ALWAYS_FATAL_IF(output_ix + 2 > buf_size);
-          buf[output_ix++] = U16_LEAD(codepoint);
-          buf[output_ix++] = U16_TRAIL(codepoint);
-        }
-        break;
-      }
-      case ' ':
-        input_ix++;
-        break;
-      case '|':
-        LOG_ALWAYS_FATAL_IF(seen_offset);
-        LOG_ALWAYS_FATAL_IF(offset == nullptr);
-        *offset = output_ix;
-        seen_offset = true;
-        input_ix++;
-        break;
-      default:
-        LOG_ALWAYS_FATAL("Unexpected Character");
-    }
-  }
-  LOG_ALWAYS_FATAL_IF(result_size == nullptr);
-  *result_size = output_ix;
-  LOG_ALWAYS_FATAL_IF(!seen_offset && offset != nullptr);
-}
-
-std::vector<uint16_t> parseUnicodeStringWithOffset(const std::string& in,
-                                                   size_t* offset) {
-  std::unique_ptr<uint16_t[]> buffer = std::make_unique<uint16_t[]>(in.size());
-  size_t result_size = 0;
-  ParseUnicode(buffer.get(), in.size(), in.c_str(), &result_size, offset);
-  return std::vector<uint16_t>(buffer.get(), buffer.get() + result_size);
-}
-
-std::vector<uint16_t> parseUnicodeString(const std::string& in) {
-  return parseUnicodeStringWithOffset(in, nullptr);
-}
-
-std::vector<uint16_t> utf8ToUtf16(const std::string& text) {
-  std::vector<uint16_t> result;
-  int32_t i = 0;
-  const int32_t textLength = static_cast<int32_t>(text.size());
-  uint32_t c = 0;
-  while (i < textLength) {
-    U8_NEXT(text.c_str(), i, textLength, c);
-    if (U16_LENGTH(c) == 1) {
-      result.push_back(c);
-    } else {
-      result.push_back(U16_LEAD(c));
-      result.push_back(U16_TRAIL(c));
-    }
-  }
-  return result;
-}
-
-}  // namespace minikin
diff --git a/third_party/txt/tests/UnicodeUtils.h b/third_party/txt/tests/UnicodeUtils.h
deleted file mode 100644
index 24f7acc34373f1581c0cd9846b03960b2abece98..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/UnicodeUtils.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <cstdint>
-
-namespace minikin {
-
-void ParseUnicode(uint16_t* buf,
-                  size_t buf_size,
-                  const char* src,
-                  size_t* result_size,
-                  size_t* offset);
-
-std::vector<uint16_t> parseUnicodeStringWithOffset(const std::string& in,
-                                                   size_t* offset);
-std::vector<uint16_t> parseUnicodeString(const std::string& in);
-
-// Converts UTF-8 to UTF-16.
-std::vector<uint16_t> utf8ToUtf16(const std::string& text);
-
-}  // namespace minikin
diff --git a/third_party/txt/tests/UnicodeUtilsTest.cpp b/third_party/txt/tests/UnicodeUtilsTest.cpp
deleted file mode 100644
index 1ab59718d64e2d57fadb5d3a4edd505beb48fc2b..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/UnicodeUtilsTest.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <gtest/gtest.h>
-
-#include "UnicodeUtils.h"
-
-namespace minikin {
-
-TEST(UnicodeUtils, parse) {
-  const size_t BUF_SIZE = 256;
-  uint16_t buf[BUF_SIZE];
-  size_t offset;
-  size_t size;
-  ParseUnicode(buf, BUF_SIZE, "U+000D U+1F431 | 'a'", &size, &offset);
-  EXPECT_EQ(size, 4u);
-  EXPECT_EQ(offset, 3u);
-  EXPECT_EQ(buf[0], 0x000D);
-  EXPECT_EQ(buf[1], 0xD83D);
-  EXPECT_EQ(buf[2], 0xDC31);
-  EXPECT_EQ(buf[3], 'a');
-}
-
-}  // namespace minikin
diff --git a/third_party/txt/tests/WordBreakerTests.cpp b/third_party/txt/tests/WordBreakerTests.cpp
deleted file mode 100644
index f4bb239fc09155c067d15a08e3aebce91e2a2513..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/WordBreakerTests.cpp
+++ /dev/null
@@ -1,530 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "Minikin"
-
-#include <gtest/gtest.h>
-#include <log/log.h>
-
-#include <minikin/WordBreaker.h>
-#include <unicode/locid.h>
-#include <unicode/uclean.h>
-#include <unicode/udata.h>
-#include "ICUTestBase.h"
-#include "UnicodeUtils.h"
-
-#ifndef NELEM
-#define NELEM(x) ((sizeof(x) / sizeof((x)[0])))
-#endif
-
-#define UTF16(codepoint) U16_LEAD(codepoint), U16_TRAIL(codepoint)
-
-namespace minikin {
-
-typedef ICUTestBase WordBreakerTest;
-
-TEST_F(WordBreakerTest, basic) {
-  uint16_t buf[] = {'h', 'e', 'l', 'l', 'o', ' ', 'w', 'o', 'r', 'l', 'd'};
-  WordBreaker breaker;
-  breaker.setLocale(icu::Locale::getUS());
-  breaker.setText(buf, NELEM(buf));
-  EXPECT_EQ(0, breaker.current());
-  EXPECT_EQ(6, breaker.next());       // after "hello "
-  EXPECT_EQ(0, breaker.wordStart());  // "hello"
-  EXPECT_EQ(5, breaker.wordEnd());
-  EXPECT_EQ(0, breaker.breakBadness());
-  EXPECT_EQ(6, breaker.current());
-  EXPECT_EQ((ssize_t)NELEM(buf), breaker.next());  // end
-  EXPECT_EQ(6, breaker.wordStart());               // "world"
-  EXPECT_EQ(11, breaker.wordEnd());
-  EXPECT_EQ(0, breaker.breakBadness());
-  EXPECT_EQ(11, breaker.current());
-}
-
-TEST_F(WordBreakerTest, softHyphen) {
-  uint16_t buf[] = {'h', 'e', 'l', 0x00AD, 'l', 'o',
-                    ' ', 'w', 'o', 'r',    'l', 'd'};
-  WordBreaker breaker;
-  breaker.setLocale(icu::Locale::getUS());
-  breaker.setText(buf, NELEM(buf));
-  EXPECT_EQ(0, breaker.current());
-  EXPECT_EQ(7, breaker.next());       // after "hel{SOFT HYPHEN}lo "
-  EXPECT_EQ(0, breaker.wordStart());  // "hel{SOFT HYPHEN}lo"
-  EXPECT_EQ(6, breaker.wordEnd());
-  EXPECT_EQ(0, breaker.breakBadness());
-  EXPECT_EQ((ssize_t)NELEM(buf), breaker.next());  // end
-  EXPECT_EQ(7, breaker.wordStart());               // "world"
-  EXPECT_EQ(12, breaker.wordEnd());
-  EXPECT_EQ(0, breaker.breakBadness());
-}
-
-TEST_F(WordBreakerTest, hardHyphen) {
-  // Hyphens should not allow breaks anymore.
-  uint16_t buf[] = {'s', 'u', 'g', 'a', 'r', '-', 'f', 'r', 'e', 'e'};
-  WordBreaker breaker;
-  breaker.setLocale(icu::Locale::getUS());
-  breaker.setText(buf, NELEM(buf));
-  EXPECT_EQ(0, breaker.current());
-  EXPECT_EQ((ssize_t)NELEM(buf), breaker.next());
-  EXPECT_EQ(0, breaker.wordStart());
-  EXPECT_EQ((ssize_t)NELEM(buf), breaker.wordEnd());
-  EXPECT_EQ(0, breaker.breakBadness());
-}
-
-TEST_F(WordBreakerTest, postfixAndPrefix) {
-  uint16_t buf[] = {'U', 'S', 0x00A2, ' ', 'J', 'P', 0x00A5};  // US¢ JP¥
-  WordBreaker breaker;
-  breaker.setLocale(icu::Locale::getUS());
-  breaker.setText(buf, NELEM(buf));
-  EXPECT_EQ(0, breaker.current());
-
-  EXPECT_EQ(4, breaker.next());       // after CENT SIGN
-  EXPECT_EQ(0, breaker.wordStart());  // "US¢"
-  EXPECT_EQ(3, breaker.wordEnd());
-
-  EXPECT_EQ((ssize_t)NELEM(buf), breaker.next());  // end of string
-  EXPECT_EQ(4, breaker.wordStart());               // "JP¥"
-  EXPECT_EQ((ssize_t)NELEM(buf), breaker.wordEnd());
-}
-
-TEST_F(WordBreakerTest, myanmarKinzi) {
-  uint16_t buf[] = {0x1004, 0x103A, 0x1039, 0x1000,
-                    0x102C};  // NGA, ASAT, VIRAMA, KA, UU
-  WordBreaker breaker;
-  icu::Locale burmese("my");
-  breaker.setLocale(burmese);
-  breaker.setText(buf, NELEM(buf));
-  EXPECT_EQ(0, breaker.current());
-
-  EXPECT_EQ((ssize_t)NELEM(buf), breaker.next());  // end of string
-  EXPECT_EQ(0, breaker.wordStart());
-  EXPECT_EQ((ssize_t)NELEM(buf), breaker.wordEnd());
-}
-
-TEST_F(WordBreakerTest, zwjEmojiSequences) {
-  uint16_t buf[] = {
-      // man + zwj + heart + zwj + man
-      UTF16(0x1F468),
-      0x200D,
-      0x2764,
-      0x200D,
-      UTF16(0x1F468),
-      // woman + zwj + heart + zwj + kiss mark + zwj + woman
-      UTF16(0x1F469),
-      0x200D,
-      0x2764,
-      0x200D,
-      UTF16(0x1F48B),
-      0x200D,
-      UTF16(0x1F469),
-      // eye + zwj + left speech bubble
-      UTF16(0x1F441),
-      0x200D,
-      UTF16(0x1F5E8),
-      // CAT FACE + zwj + BUST IN SILHOUETTE
-      UTF16(0x1F431),
-      0x200D,
-      UTF16(0x1F464),
-  };
-  WordBreaker breaker;
-  breaker.setLocale(icu::Locale::getUS());
-  breaker.setText(buf, NELEM(buf));
-  EXPECT_EQ(0, breaker.current());
-  EXPECT_EQ(7, breaker.next());  // after man + zwj + heart + zwj + man
-  EXPECT_EQ(0, breaker.wordStart());
-  EXPECT_EQ(7, breaker.wordEnd());
-  EXPECT_EQ(17, breaker.next());  // after woman + zwj + heart + zwj + woman
-  EXPECT_EQ(7, breaker.wordStart());
-  EXPECT_EQ(17, breaker.wordEnd());
-  EXPECT_EQ(22, breaker.next());  // after eye + zwj + left speech bubble
-  EXPECT_EQ(17, breaker.wordStart());
-  EXPECT_EQ(22, breaker.wordEnd());
-  EXPECT_EQ((ssize_t)NELEM(buf), breaker.next());  // end
-  EXPECT_EQ(22, breaker.wordStart());
-  EXPECT_EQ(27, breaker.wordEnd());
-}
-
-TEST_F(WordBreakerTest, emojiWithModifier) {
-  uint16_t buf[] = {
-      UTF16(0x1F466), UTF16(0x1F3FB),  // boy + type 1-2 fitzpatrick modifier
-      0x270C, 0xFE0F,
-      UTF16(
-          0x1F3FF)  // victory hand + emoji style + type 6 fitzpatrick modifier
-  };
-  WordBreaker breaker;
-  breaker.setLocale(icu::Locale::getUS());
-  breaker.setText(buf, NELEM(buf));
-  EXPECT_EQ(0, breaker.current());
-  EXPECT_EQ(4, breaker.next());  // after boy + type 1-2 fitzpatrick modifier
-  EXPECT_EQ(0, breaker.wordStart());
-  EXPECT_EQ(4, breaker.wordEnd());
-  EXPECT_EQ((ssize_t)NELEM(buf), breaker.next());  // end
-  EXPECT_EQ(4, breaker.wordStart());
-  EXPECT_EQ(8, breaker.wordEnd());
-}
-
-TEST_F(WordBreakerTest, unicode10Emoji) {
-  // Should break between emojis.
-  uint16_t buf[] = {
-      // SLED + SLED
-      UTF16(0x1F6F7),
-      UTF16(0x1F6F7),
-      // SLED + VS15 + SLED
-      UTF16(0x1F6F7),
-      0xFE0E,
-      UTF16(0x1F6F7),
-      // WHITE SMILING FACE + SLED
-      0x263A,
-      UTF16(0x1F6F7),
-      // WHITE SMILING FACE + VS16 + SLED
-      0x263A,
-      0xFE0F,
-      UTF16(0x1F6F7),
-  };
-  WordBreaker breaker;
-  breaker.setLocale(icu::Locale::getEnglish());
-  breaker.setText(buf, NELEM(buf));
-  EXPECT_EQ(0, breaker.current());
-  EXPECT_EQ(2, breaker.next());
-  EXPECT_EQ(0, breaker.wordStart());
-  EXPECT_EQ(2, breaker.wordEnd());
-
-  EXPECT_EQ(4, breaker.next());
-  EXPECT_EQ(2, breaker.wordStart());
-  EXPECT_EQ(4, breaker.wordEnd());
-
-  EXPECT_EQ(7, breaker.next());
-  EXPECT_EQ(4, breaker.wordStart());
-  EXPECT_EQ(7, breaker.wordEnd());
-
-  EXPECT_EQ(9, breaker.next());
-  EXPECT_EQ(7, breaker.wordStart());
-  EXPECT_EQ(9, breaker.wordEnd());
-
-  EXPECT_EQ(10, breaker.next());
-  EXPECT_EQ(9, breaker.wordStart());
-  EXPECT_EQ(10, breaker.wordEnd());
-
-  EXPECT_EQ(12, breaker.next());
-  EXPECT_EQ(10, breaker.wordStart());
-  EXPECT_EQ(12, breaker.wordEnd());
-
-  EXPECT_EQ(14, breaker.next());
-  EXPECT_EQ(12, breaker.wordStart());
-  EXPECT_EQ(14, breaker.wordEnd());
-
-  EXPECT_EQ(16, breaker.next());
-  EXPECT_EQ(14, breaker.wordStart());
-  EXPECT_EQ(16, breaker.wordEnd());
-}
-
-TEST_F(WordBreakerTest, flagsSequenceSingleFlag) {
-  const std::string kFlag = "U+1F3F4";
-  const std::string flags = kFlag + " " + kFlag;
-
-  const int kFlagLength = 2;
-  const size_t BUF_SIZE = kFlagLength * 2;
-
-  uint16_t buf[BUF_SIZE];
-  size_t size;
-  ParseUnicode(buf, BUF_SIZE, flags.c_str(), &size, nullptr);
-
-  WordBreaker breaker;
-  breaker.setLocale(icu::Locale::getUS());
-  breaker.setText(buf, size);
-  EXPECT_EQ(0, breaker.current());
-  EXPECT_EQ(kFlagLength, breaker.next());  // end of the first flag
-  EXPECT_EQ(0, breaker.wordStart());
-  EXPECT_EQ(kFlagLength, breaker.wordEnd());
-  EXPECT_EQ(static_cast<ssize_t>(size), breaker.next());
-  EXPECT_EQ(kFlagLength, breaker.wordStart());
-  EXPECT_EQ(kFlagLength * 2, breaker.wordEnd());
-}
-
-TEST_F(WordBreakerTest, flagsSequence) {
-  // U+1F3F4 U+E0067 U+E0062 U+E0073 U+E0063 U+E0074 U+E007F is emoji tag
-  // sequence for the flag of Scotland.
-  const std::string kFlagSequence =
-      "U+1F3F4 U+E0067 U+E0062 U+E0073 U+E0063 U+E0074 U+E007F";
-  const std::string flagSequence = kFlagSequence + " " + kFlagSequence;
-
-  const int kFlagLength = 14;
-  const size_t BUF_SIZE = kFlagLength * 2;
-
-  uint16_t buf[BUF_SIZE];
-  size_t size;
-  ParseUnicode(buf, BUF_SIZE, flagSequence.c_str(), &size, nullptr);
-
-  WordBreaker breaker;
-  breaker.setLocale(icu::Locale::getUS());
-  breaker.setText(buf, size);
-  EXPECT_EQ(0, breaker.current());
-  EXPECT_EQ(kFlagLength, breaker.next());  // end of the first flag sequence
-  EXPECT_EQ(0, breaker.wordStart());
-  EXPECT_EQ(kFlagLength, breaker.wordEnd());
-  EXPECT_EQ(static_cast<ssize_t>(size), breaker.next());
-  EXPECT_EQ(kFlagLength, breaker.wordStart());
-  EXPECT_EQ(kFlagLength * 2, breaker.wordEnd());
-}
-
-TEST_F(WordBreakerTest, punct) {
-  uint16_t buf[] = {0x00A1, 0x00A1, 'h', 'e', 'l', 'l', 'o', ',',
-                    ' ',    'w',    'o', 'r', 'l', 'd', '!', '!'};
-  WordBreaker breaker;
-  breaker.setLocale(icu::Locale::getUS());
-  breaker.setText(buf, NELEM(buf));
-  EXPECT_EQ(0, breaker.current());
-  EXPECT_EQ(9, breaker.next());       // after "¡¡hello, "
-  EXPECT_EQ(2, breaker.wordStart());  // "hello"
-  EXPECT_EQ(7, breaker.wordEnd());
-  EXPECT_EQ(0, breaker.breakBadness());
-  EXPECT_EQ((ssize_t)NELEM(buf), breaker.next());  // end
-  EXPECT_EQ(9, breaker.wordStart());               // "world"
-  EXPECT_EQ(14, breaker.wordEnd());
-  EXPECT_EQ(0, breaker.breakBadness());
-}
-
-TEST_F(WordBreakerTest, email) {
-  uint16_t buf[] = {'f', 'o', 'o', '@', 'e', 'x', 'a', 'm', 'p',
-                    'l', 'e', '.', 'c', 'o', 'm', ' ', 'x'};
-  WordBreaker breaker;
-  breaker.setLocale(icu::Locale::getUS());
-  breaker.setText(buf, NELEM(buf));
-  EXPECT_EQ(0, breaker.current());
-  EXPECT_EQ(11, breaker.next());  // after "foo@example"
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(1, breaker.breakBadness());
-  EXPECT_EQ(16, breaker.next());  // after ".com "
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(0, breaker.breakBadness());
-  EXPECT_EQ((ssize_t)NELEM(buf), breaker.next());  // end
-  EXPECT_EQ(16, breaker.wordStart());              // "x"
-  EXPECT_EQ(17, breaker.wordEnd());
-  EXPECT_EQ(0, breaker.breakBadness());
-}
-
-TEST_F(WordBreakerTest, mailto) {
-  uint16_t buf[] = {'m', 'a', 'i', 'l', 't', 'o', ':', 'f', 'o', 'o', '@', 'e',
-                    'x', 'a', 'm', 'p', 'l', 'e', '.', 'c', 'o', 'm', ' ', 'x'};
-  WordBreaker breaker;
-  breaker.setLocale(icu::Locale::getUS());
-  breaker.setText(buf, NELEM(buf));
-  EXPECT_EQ(0, breaker.current());
-  EXPECT_EQ(7, breaker.next());  // after "mailto:"
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(1, breaker.breakBadness());
-  EXPECT_EQ(18, breaker.next());  // after "foo@example"
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(1, breaker.breakBadness());
-  EXPECT_EQ(23, breaker.next());  // after ".com "
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(0, breaker.breakBadness());
-  EXPECT_EQ((ssize_t)NELEM(buf), breaker.next());  // end
-  EXPECT_EQ(23, breaker.wordStart());              // "x"
-  EXPECT_EQ(24, breaker.wordEnd());
-  EXPECT_EQ(0, breaker.breakBadness());
-}
-
-// The current logic always places a line break after a detected email address
-// or URL and an immediately following non-ASCII character.
-TEST_F(WordBreakerTest, emailNonAscii) {
-  uint16_t buf[] = {'f', 'o', 'o', '@', 'e', 'x', 'a', 'm',
-                    'p', 'l', 'e', '.', 'c', 'o', 'm', 0x4E00};
-  WordBreaker breaker;
-  breaker.setLocale(icu::Locale::getUS());
-  breaker.setText(buf, NELEM(buf));
-  EXPECT_EQ(0, breaker.current());
-  EXPECT_EQ(11, breaker.next());  // after "foo@example"
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(1, breaker.breakBadness());
-  EXPECT_EQ(15, breaker.next());  // after ".com"
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(0, breaker.breakBadness());
-  EXPECT_EQ((ssize_t)NELEM(buf), breaker.next());  // end
-  EXPECT_EQ(15, breaker.wordStart());              // "一"
-  EXPECT_EQ(16, breaker.wordEnd());
-  EXPECT_EQ(0, breaker.breakBadness());
-}
-
-TEST_F(WordBreakerTest, emailCombining) {
-  uint16_t buf[] = {'f', 'o', 'o', '@', 'e', 'x', 'a',    'm', 'p',
-                    'l', 'e', '.', 'c', 'o', 'm', 0x0303, ' ', 'x'};
-  WordBreaker breaker;
-  breaker.setLocale(icu::Locale::getUS());
-  breaker.setText(buf, NELEM(buf));
-  EXPECT_EQ(0, breaker.current());
-  EXPECT_EQ(11, breaker.next());  // after "foo@example"
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(1, breaker.breakBadness());
-  EXPECT_EQ(17, breaker.next());  // after ".com̃ "
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(0, breaker.breakBadness());
-  EXPECT_EQ((ssize_t)NELEM(buf), breaker.next());  // end
-  EXPECT_EQ(17, breaker.wordStart());              // "x"
-  EXPECT_EQ(18, breaker.wordEnd());
-  EXPECT_EQ(0, breaker.breakBadness());
-}
-
-TEST_F(WordBreakerTest, lonelyAt) {
-  uint16_t buf[] = {'a', ' ', '@', ' ', 'b'};
-  WordBreaker breaker;
-  breaker.setLocale(icu::Locale::getUS());
-  breaker.setText(buf, NELEM(buf));
-  EXPECT_EQ(0, breaker.current());
-  EXPECT_EQ(2, breaker.next());       // after "a "
-  EXPECT_EQ(0, breaker.wordStart());  // "a"
-  EXPECT_EQ(1, breaker.wordEnd());
-  EXPECT_EQ(0, breaker.breakBadness());
-  EXPECT_EQ(4, breaker.next());  // after "@ "
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(0, breaker.breakBadness());
-  EXPECT_EQ((ssize_t)NELEM(buf), breaker.next());  // end
-  EXPECT_EQ(4, breaker.wordStart());               // "b"
-  EXPECT_EQ(5, breaker.wordEnd());
-  EXPECT_EQ(0, breaker.breakBadness());
-}
-
-TEST_F(WordBreakerTest, url) {
-  uint16_t buf[] = {'h', 't', 't', 'p', ':', '/', '/', 'e', 'x', 'a',
-                    'm', 'p', 'l', 'e', '.', 'c', 'o', 'm', ' ', 'x'};
-  WordBreaker breaker;
-  breaker.setLocale(icu::Locale::getUS());
-  breaker.setText(buf, NELEM(buf));
-  EXPECT_EQ(0, breaker.current());
-  EXPECT_EQ(5, breaker.next());  // after "http:"
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(1, breaker.breakBadness());
-  EXPECT_EQ(7, breaker.next());  // after "//"
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(1, breaker.breakBadness());
-  EXPECT_EQ(14, breaker.next());  // after "example"
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(1, breaker.breakBadness());
-  EXPECT_EQ(19, breaker.next());  // after ".com "
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(0, breaker.breakBadness());
-  EXPECT_EQ((ssize_t)NELEM(buf), breaker.next());  // end
-  EXPECT_EQ(19, breaker.wordStart());              // "x"
-  EXPECT_EQ(20, breaker.wordEnd());
-  EXPECT_EQ(0, breaker.breakBadness());
-}
-
-// Breaks according to section 14.12 of Chicago Manual of Style, *URLs or DOIs
-// and line breaks*
-TEST_F(WordBreakerTest, urlBreakChars) {
-  uint16_t buf[] = {'h', 't', 't', 'p', ':', '/', '/', 'a', '.', 'b', '/',
-                    '~', 'c', ',', 'd', '-', 'e', '?', 'f', '=', 'g', '&',
-                    'h', '#', 'i', '%', 'j', '_', 'k', '/', 'l'};
-  WordBreaker breaker;
-  breaker.setLocale(icu::Locale::getUS());
-  breaker.setText(buf, NELEM(buf));
-  EXPECT_EQ(0, breaker.current());
-  EXPECT_EQ(5, breaker.next());  // after "http:"
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(1, breaker.breakBadness());
-  EXPECT_EQ(7, breaker.next());  // after "//"
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(1, breaker.breakBadness());
-  EXPECT_EQ(8, breaker.next());  // after "a"
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(1, breaker.breakBadness());
-  EXPECT_EQ(10, breaker.next());  // after ".b"
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(1, breaker.breakBadness());
-  EXPECT_EQ(11, breaker.next());  // after "/"
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(1, breaker.breakBadness());
-  EXPECT_EQ(13, breaker.next());  // after "~c"
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(1, breaker.breakBadness());
-  EXPECT_EQ(15, breaker.next());  // after ",d"
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(1, breaker.breakBadness());
-  EXPECT_EQ(17, breaker.next());  // after "-e"
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(1, breaker.breakBadness());
-  EXPECT_EQ(19, breaker.next());  // after "?f"
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(1, breaker.breakBadness());
-  EXPECT_EQ(20, breaker.next());  // after "="
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(1, breaker.breakBadness());
-  EXPECT_EQ(21, breaker.next());  // after "g"
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(1, breaker.breakBadness());
-  EXPECT_EQ(22, breaker.next());  // after "&"
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(1, breaker.breakBadness());
-  EXPECT_EQ(23, breaker.next());  // after "h"
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(1, breaker.breakBadness());
-  EXPECT_EQ(25, breaker.next());  // after "#i"
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(1, breaker.breakBadness());
-  EXPECT_EQ(27, breaker.next());  // after "%j"
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(1, breaker.breakBadness());
-  EXPECT_EQ(29, breaker.next());  // after "_k"
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(1, breaker.breakBadness());
-  EXPECT_EQ((ssize_t)NELEM(buf), breaker.next());  // end
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(0, breaker.breakBadness());
-}
-
-TEST_F(WordBreakerTest, urlNoHyphenBreak) {
-  uint16_t buf[] = {'h', 't', 't', 'p', ':', '/', '/', 'a', '-', '/', 'b'};
-  WordBreaker breaker;
-  breaker.setLocale(icu::Locale::getUS());
-  breaker.setText(buf, NELEM(buf));
-  EXPECT_EQ(0, breaker.current());
-  EXPECT_EQ(5, breaker.next());  // after "http:"
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(7, breaker.next());  // after "//"
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(8, breaker.next());  // after "a"
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ((ssize_t)NELEM(buf), breaker.next());  // end
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-}
-
-TEST_F(WordBreakerTest, urlEndsWithSlash) {
-  uint16_t buf[] = {'h', 't', 't', 'p', ':', '/', '/', 'a', '/'};
-  WordBreaker breaker;
-  breaker.setLocale(icu::Locale::getUS());
-  breaker.setText(buf, NELEM(buf));
-  EXPECT_EQ(0, breaker.current());
-  EXPECT_EQ(5, breaker.next());  // after "http:"
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(7, breaker.next());  // after "//"
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ(8, breaker.next());  // after "a"
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-  EXPECT_EQ((ssize_t)NELEM(buf), breaker.next());  // end
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-}
-
-TEST_F(WordBreakerTest, emailStartsWithSlash) {
-  uint16_t buf[] = {'/', 'a', '@', 'b'};
-  WordBreaker breaker;
-  breaker.setLocale(icu::Locale::getUS());
-  breaker.setText(buf, NELEM(buf));
-  EXPECT_EQ(0, breaker.current());
-  EXPECT_EQ((ssize_t)NELEM(buf), breaker.next());  // end
-  EXPECT_TRUE(breaker.wordStart() >= breaker.wordEnd());
-}
-
-}  // namespace minikin
diff --git a/third_party/txt/tests/fake_provider.h b/third_party/txt/tests/fake_provider.h
deleted file mode 100644
index 2f749655ec679cfd7d18e9e968f169f1a8c4c174..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/fake_provider.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2021 Google, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <fuchsia/fonts/cpp/fidl_test_base.h>
-#include <lib/fidl/cpp/binding.h>
-#include <lib/fidl/cpp/interface_handle.h>
-
-#include "flutter/fml/logging.h"
-
-namespace txt {
-
-class FakeProvider : public fuchsia::fonts::testing::Provider_TestBase {
- public:
-  FakeProvider() : binding_(this) {}
-
-  fidl::InterfaceHandle<fuchsia::fonts::Provider> Bind(
-      async_dispatcher_t* dispatcher) {
-    FML_CHECK(!binding_.is_bound());
-
-    fidl::InterfaceHandle<fuchsia::fonts::Provider> provider;
-    binding_.Bind(provider.NewRequest(), dispatcher);
-
-    return provider;
-  }
-
-  virtual void NotImplemented_(const std::string& name) override {
-    FML_LOG(ERROR) << "A fidl call for " << name
-                   << " on fake_provider is not implemented! This likely means"
-                      "that your test will hang.";
-  }
-
-  void GetFontFamilyInfo(fuchsia::fonts::FamilyName family,
-                         GetFontFamilyInfoCallback callback) override {
-    was_invoked_ = true;
-    callback(fuchsia::fonts::FontFamilyInfo());
-  }
-
-  bool WasInvoked() { return was_invoked_; }
-
- private:
-  fidl::Binding<fuchsia::fonts::Provider> binding_;
-  bool was_invoked_ = false;
-};
-
-}  // namespace txt
diff --git a/third_party/txt/tests/render_test.h b/third_party/txt/tests/font_collection_tests.cc
similarity index 48%
rename from third_party/txt/tests/render_test.h
rename to third_party/txt/tests/font_collection_tests.cc
index 104842ab031b8f6a206ebe26d5fe5a822865d3d4..051d378de17d65c2a2558d9636072837004306cf 100644
--- a/third_party/txt/tests/render_test.h
+++ b/third_party/txt/tests/font_collection_tests.cc
@@ -14,47 +14,30 @@
  * limitations under the License.
  */
 
-#include <memory>
-#include <string>
-
-#include "flutter/fml/macros.h"
 #include "gtest/gtest.h"
-#include "third_party/skia/include/core/SkBitmap.h"
-#include "third_party/skia/include/core/SkCanvas.h"
+
+#include <sstream>
+
 #include "txt/font_collection.h"
 
 namespace txt {
+namespace testing {
 
-class RenderTest : public ::testing::Test {
+class FontCollectionTests : public ::testing::Test {
  public:
-  RenderTest();
-
-  ~RenderTest();
-
-  SkCanvas* GetCanvas();
-
-  bool Snapshot();
-
-  size_t GetTestCanvasWidth() const;
-
-  size_t GetTestCanvasHeight() const;
-
-  std::shared_ptr<txt::FontCollection> GetTestFontCollection() const;
-
- protected:
-  void SetUp() override;
-
-  void TearDown() override;
-
- private:
-  size_t snapshots_;
-  std::unique_ptr<SkBitmap> bitmap_;
-  std::unique_ptr<SkCanvas> canvas_;
-  std::shared_ptr<txt::FontCollection> font_collection_;
-
-  std::string GetNextSnapshotName();
+  FontCollectionTests() {}
 
-  FML_DISALLOW_COPY_AND_ASSIGN(RenderTest);
+  void SetUp() override {}
 };
 
+TEST_F(FontCollectionTests, SettingUpDefaultFontManagerClearsCache) {
+  FontCollection font_collection;
+  sk_sp<skia::textlayout::FontCollection> sk_font_collection =
+      font_collection.CreateSktFontCollection();
+  ASSERT_EQ(sk_font_collection->getFallbackManager().get(), nullptr);
+  font_collection.SetupDefaultFontManager(0);
+  sk_font_collection = font_collection.CreateSktFontCollection();
+  ASSERT_NE(sk_font_collection->getFallbackManager().get(), nullptr);
+}
+}  // namespace testing
 }  // namespace txt
diff --git a/third_party/txt/tests/font_collection_unittests.cc b/third_party/txt/tests/font_collection_unittests.cc
deleted file mode 100644
index 05c055809f607767e3fccdd114516bf313ebe9bd..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/font_collection_unittests.cc
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Copyright 2017 Google, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "flutter/fml/logging.h"
-#include "gtest/gtest.h"
-#include "third_party/skia/include/utils/SkCustomTypeface.h"
-#include "txt/font_collection.h"
-#include "txt_test_utils.h"
-
-namespace txt {
-
-// We don't really need a fixture but a class in a namespace is needed for
-// the FRIEND_TEST macro.
-class FontCollectionTest : public ::testing::Test {};
-
-namespace {
-// This function does some boilerplate to fill a builder with enough real
-// font-like data. Otherwise, detach won't actually build an SkTypeface.
-void PopulateUserTypefaceBoilerplate(SkCustomTypefaceBuilder* builder) {
-  constexpr float upem = 200;
-
-  {
-    SkFontMetrics metrics;
-    metrics.fFlags = 0;
-    metrics.fTop = -200;
-    metrics.fAscent = -150;
-    metrics.fDescent = 50;
-    metrics.fBottom = -75;
-    metrics.fLeading = 10;
-    metrics.fAvgCharWidth = 150;
-    metrics.fMaxCharWidth = 300;
-    metrics.fXMin = -20;
-    metrics.fXMax = 290;
-    metrics.fXHeight = -100;
-    metrics.fCapHeight = 0;
-    metrics.fUnderlineThickness = 5;
-    metrics.fUnderlinePosition = 2;
-    metrics.fStrikeoutThickness = 5;
-    metrics.fStrikeoutPosition = -50;
-    builder->setMetrics(metrics, 1.0f / upem);
-  }
-
-  const SkMatrix scale = SkMatrix::Scale(1.0f / upem, 1.0f / upem);
-  for (SkGlyphID index = 0; index <= 67; ++index) {
-    SkScalar width;
-    width = 100;
-    SkPath path;
-    path.addCircle(50, -50, 75);
-
-    builder->setGlyph(index, width / upem, path.makeTransform(scale));
-  }
-}
-}  // namespace
-
-TEST(FontCollectionTest, CheckSkTypefacesSorting) {
-  // We have to make a real SkTypeface here. Not all the structs from the
-  // SkTypeface headers are fully declared to be able to gmock.
-  // SkCustomTypefaceBuilder is the simplest way to get a simple SkTypeface.
-  SkCustomTypefaceBuilder typefaceBuilder1;
-  typefaceBuilder1.setFontStyle(SkFontStyle(SkFontStyle::kThin_Weight,
-                                            SkFontStyle::kExpanded_Width,
-                                            SkFontStyle::kItalic_Slant));
-  // For the purpose of this test, we need to fill this to make the SkTypeface
-  // build but it doesn't matter. We only care about the SkFontStyle.
-  PopulateUserTypefaceBoilerplate(&typefaceBuilder1);
-  sk_sp<SkTypeface> typeface1{typefaceBuilder1.detach()};
-
-  SkCustomTypefaceBuilder typefaceBuilder2;
-  typefaceBuilder2.setFontStyle(SkFontStyle(SkFontStyle::kLight_Weight,
-                                            SkFontStyle::kNormal_Width,
-                                            SkFontStyle::kUpright_Slant));
-  PopulateUserTypefaceBoilerplate(&typefaceBuilder2);
-  sk_sp<SkTypeface> typeface2{typefaceBuilder2.detach()};
-
-  SkCustomTypefaceBuilder typefaceBuilder3;
-  typefaceBuilder3.setFontStyle(SkFontStyle(SkFontStyle::kNormal_Weight,
-                                            SkFontStyle::kNormal_Width,
-                                            SkFontStyle::kUpright_Slant));
-  PopulateUserTypefaceBoilerplate(&typefaceBuilder3);
-  sk_sp<SkTypeface> typeface3{typefaceBuilder3.detach()};
-
-  SkCustomTypefaceBuilder typefaceBuilder4;
-  typefaceBuilder4.setFontStyle(SkFontStyle(SkFontStyle::kThin_Weight,
-                                            SkFontStyle::kCondensed_Width,
-                                            SkFontStyle::kUpright_Slant));
-  PopulateUserTypefaceBoilerplate(&typefaceBuilder4);
-  sk_sp<SkTypeface> typeface4{typefaceBuilder4.detach()};
-
-  std::vector<sk_sp<SkTypeface>> candidateTypefaces = {typeface1, typeface2,
-                                                       typeface3, typeface4};
-
-  // This sorts the vector in-place.
-  txt::FontCollection::SortSkTypefaces(candidateTypefaces);
-
-  // The second one is first because it's both the most normal width font
-  // with the lightest weight.
-  ASSERT_EQ(candidateTypefaces[0].get(), typeface2.get());
-  // Then the most normal width font with normal weight.
-  ASSERT_EQ(candidateTypefaces[1].get(), typeface3.get());
-  // Then a less normal (condensed) width font.
-  ASSERT_EQ(candidateTypefaces[2].get(), typeface4.get());
-  // All things equal, 4 came before 1 because we arbitrarily chose to make the
-  // narrower font come first.
-  ASSERT_EQ(candidateTypefaces[3].get(), typeface1.get());
-
-  // Double check.
-  ASSERT_EQ(candidateTypefaces[0]->fontStyle().weight(),
-            SkFontStyle::kLight_Weight);
-  ASSERT_EQ(candidateTypefaces[0]->fontStyle().width(),
-            SkFontStyle::kNormal_Width);
-
-  ASSERT_EQ(candidateTypefaces[1]->fontStyle().weight(),
-            SkFontStyle::kNormal_Weight);
-  ASSERT_EQ(candidateTypefaces[1]->fontStyle().width(),
-            SkFontStyle::kNormal_Width);
-
-  ASSERT_EQ(candidateTypefaces[2]->fontStyle().weight(),
-            SkFontStyle::kThin_Weight);
-  ASSERT_EQ(candidateTypefaces[2]->fontStyle().width(),
-            SkFontStyle::kCondensed_Width);
-
-  ASSERT_EQ(candidateTypefaces[3]->fontStyle().weight(),
-            SkFontStyle::kThin_Weight);
-  ASSERT_EQ(candidateTypefaces[3]->fontStyle().width(),
-            SkFontStyle::kExpanded_Width);
-}
-
-#if 0
-
-TEST(FontCollection, HasDefaultRegistrations) {
-  std::string defaultFamilyName = txt::FontCollection::GetDefaultFamilyName();
-
-  auto collection = txt::FontCollection::GetFontCollection(txt::GetFontDir())
-                        .GetMinikinFontCollectionForFamily("");
-  ASSERT_EQ(defaultFamilyName,
-            txt::FontCollection::GetFontCollection(txt::GetFontDir())
-                .ProcessFamilyName(""));
-  ASSERT_NE(defaultFamilyName,
-            txt::FontCollection::GetFontCollection(txt::GetFontDir())
-                .ProcessFamilyName("NotARealFont!"));
-  ASSERT_EQ("NotARealFont!",
-            txt::FontCollection::GetFontCollection(txt::GetFontDir())
-                .ProcessFamilyName("NotARealFont!"));
-  ASSERT_NE(collection.get(), nullptr);
-}
-
-TEST(FontCollection, GetMinikinFontCollections) {
-  std::string defaultFamilyName = txt::FontCollection::GetDefaultFamilyName();
-
-  auto collectionDef = txt::FontCollection::GetFontCollection(txt::GetFontDir())
-                           .GetMinikinFontCollectionForFamily("");
-  auto collectionRoboto =
-      txt::FontCollection::GetFontCollection(txt::GetFontDir())
-          .GetMinikinFontCollectionForFamily("Roboto");
-  auto collectionHomemadeApple =
-      txt::FontCollection::GetFontCollection(txt::GetFontDir())
-          .GetMinikinFontCollectionForFamily("Homemade Apple");
-  for (size_t base = 0; base < 50; base++) {
-    for (size_t variation = 0; variation < 50; variation++) {
-      ASSERT_EQ(collectionDef->hasVariationSelector(base, variation),
-                collectionRoboto->hasVariationSelector(base, variation));
-    }
-  }
-
-  ASSERT_NE(collectionDef, collectionHomemadeApple);
-  ASSERT_NE(collectionHomemadeApple, collectionRoboto);
-  ASSERT_NE(collectionDef.get(), nullptr);
-}
-
-TEST(FontCollection, GetFamilyNames) {
-  std::set<std::string> names =
-      txt::FontCollection::GetFontCollection(txt::GetFontDir())
-          .GetFamilyNames();
-
-  ASSERT_TRUE(names.size() >= 19ull);
-
-  ASSERT_EQ(names.count("Roboto"), 1ull);
-  ASSERT_EQ(names.count("Homemade Apple"), 1ull);
-
-  ASSERT_EQ(names.count("KoreanFont Test"), 1ull);
-  ASSERT_EQ(names.count("JapaneseFont Test"), 1ull);
-  ASSERT_EQ(names.count("EmojiFont Test"), 1ull);
-  ASSERT_EQ(names.count("ItalicFont Test"), 1ull);
-  ASSERT_EQ(names.count("VariationSelector Test"), 1ull);
-  ASSERT_EQ(names.count("ColorEmojiFont Test"), 1ull);
-  ASSERT_EQ(names.count("TraditionalChinese Test"), 1ull);
-  ASSERT_EQ(names.count("Sample Font"), 1ull);
-  ASSERT_EQ(names.count("MultiAxisFont Test"), 1ull);
-  ASSERT_EQ(names.count("TextEmojiFont Test"), 1ull);
-  ASSERT_EQ(names.count("No Cmap Format 14 Subtable Test"), 1ull);
-  ASSERT_EQ(names.count("ColorTextMixedEmojiFont Test"), 1ull);
-  ASSERT_EQ(names.count("BoldFont Test"), 1ull);
-  ASSERT_EQ(names.count("EmptyFont Test"), 1ull);
-  ASSERT_EQ(names.count("SimplifiedChinese Test"), 1ull);
-  ASSERT_EQ(names.count("BoldItalicFont Test"), 1ull);
-  ASSERT_EQ(names.count("RegularFont Test"), 1ull);
-
-  ASSERT_EQ(names.count("Not a real font!"), 0ull);
-  ASSERT_EQ(names.count(""), 0ull);
-  ASSERT_EQ(names.count("Another Fake Font"), 0ull);
-}
-
-#endif  // 0
-
-}  // namespace txt
diff --git a/third_party/txt/tests/old/perftests/FontCollection.cpp b/third_party/txt/tests/old/perftests/FontCollection.cpp
deleted file mode 100644
index eb5592894d8388716990ac16bc4435b925827387..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/old/perftests/FontCollection.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <benchmark/benchmark.h>
-
-#include <memory>
-
-#include <FontTestUtils.h>
-#include <MinikinInternal.h>
-#include <UnicodeUtils.h>
-#include <minikin/FontCollection.h>
-
-namespace minikin {
-
-const char* SYSTEM_FONT_PATH = "/system/fonts/";
-const char* SYSTEM_FONT_XML = "/system/etc/fonts.xml";
-
-static void BM_FontCollection_construct(benchmark::State& state) {
-  std::vector<std::shared_ptr<FontFamily>> families =
-      getFontFamilies(SYSTEM_FONT_PATH, SYSTEM_FONT_XML);
-  while (state.KeepRunning()) {
-    std::make_shared<FontCollection>(families);
-  }
-}
-
-BENCHMARK(BM_FontCollection_construct);
-
-static void BM_FontCollection_hasVariationSelector(benchmark::State& state) {
-  std::shared_ptr<FontCollection> collection(
-      getFontCollection(SYSTEM_FONT_PATH, SYSTEM_FONT_XML));
-
-  uint32_t baseCp = state.range(0);
-  uint32_t vsCp = state.range(1);
-
-  char titleBuffer[64];
-  snprintf(titleBuffer, 64, "hasVariationSelector U+%04X,U+%04X", baseCp, vsCp);
-  state.SetLabel(titleBuffer);
-
-  while (state.KeepRunning()) {
-    collection->hasVariationSelector(baseCp, vsCp);
-  }
-}
-
-// TODO: Rewrite with BENCHMARK_CAPTURE for better test name.
-BENCHMARK(BM_FontCollection_hasVariationSelector)
-    ->ArgPair(0x2708, 0xFE0F)
-    ->ArgPair(0x2708, 0xFE0E)
-    ->ArgPair(0x3402, 0xE0100);
-
-struct ItemizeTestCases {
-  std::string itemizeText;
-  std::string languageTag;
-  std::string labelText;
-} ITEMIZE_TEST_CASES[] = {
-    {"'A' 'n' 'd' 'r' 'o' 'i' 'd'", "en", "English"},
-    {"U+4E16", "zh-Hans", "CJK Ideograph"},
-    {"U+4E16", "zh-Hans,zh-Hant,ja,en,es,pt,fr,de",
-     "CJK Ideograph with many language fallback"},
-    {"U+3402 U+E0100", "ja", "CJK Ideograph with variation selector"},
-    {"'A' 'n' U+0E1A U+0E31 U+0645 U+062D U+0648", "en",
-     "Mixture of English, Thai and Arabic"},
-    {"U+2708 U+FE0E", "en", "Emoji with variation selector"},
-    {"U+0031 U+FE0F U+20E3", "en", "KEYCAP"},
-};
-
-static void BM_FontCollection_itemize(benchmark::State& state) {
-  std::shared_ptr<FontCollection> collection(
-      getFontCollection(SYSTEM_FONT_PATH, SYSTEM_FONT_XML));
-
-  size_t testIndex = state.range(0);
-  state.SetLabel("Itemize: " + ITEMIZE_TEST_CASES[testIndex].labelText);
-
-  uint16_t buffer[64];
-  size_t utf16_length = 0;
-  ParseUnicode(buffer, 64, ITEMIZE_TEST_CASES[testIndex].itemizeText.c_str(),
-               &utf16_length, nullptr);
-  std::vector<FontCollection::Run> result;
-  FontStyle style(FontStyle::registerLanguageList(
-      ITEMIZE_TEST_CASES[testIndex].languageTag));
-
-  std::scoped_lock _l(gMinikinLock);
-  while (state.KeepRunning()) {
-    result.clear();
-    collection->itemize(buffer, utf16_length, style, &result);
-  }
-}
-
-// TODO: Rewrite with BENCHMARK_CAPTURE once it is available in Android.
-BENCHMARK(BM_FontCollection_itemize)
-    ->Arg(0)
-    ->Arg(1)
-    ->Arg(2)
-    ->Arg(3)
-    ->Arg(4)
-    ->Arg(5)
-    ->Arg(6);
-
-}  // namespace minikin
diff --git a/third_party/txt/tests/old/perftests/FontFamily.cpp b/third_party/txt/tests/old/perftests/FontFamily.cpp
deleted file mode 100644
index 9331ce92c65d7015098c580e77b841acc3ef9127..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/old/perftests/FontFamily.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <benchmark/benchmark.h>
-
-#include <minikin/FontFamily.h>
-#include "../util/MinikinFontForTest.h"
-
-namespace minikin {
-
-static void BM_FontFamily_create(benchmark::State& state) {
-  std::shared_ptr<MinikinFontForTest> minikinFont =
-      std::make_shared<MinikinFontForTest>(
-          "/system/fonts/NotoSansCJK-Regular.ttc", 0);
-
-  while (state.KeepRunning()) {
-    std::shared_ptr<FontFamily> family = std::make_shared<FontFamily>(
-        std::vector<Font>({Font(minikinFont, FontStyle())}));
-  }
-}
-
-BENCHMARK(BM_FontFamily_create);
-
-}  // namespace minikin
diff --git a/third_party/txt/tests/old/perftests/FontLanguage.cpp b/third_party/txt/tests/old/perftests/FontLanguage.cpp
deleted file mode 100644
index 8919699b9b255ae169a1bb41b7d723a463f21a74..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/old/perftests/FontLanguage.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <benchmark/benchmark.h>
-
-#include "FontLanguage.h"
-
-namespace minikin {
-
-static void BM_FontLanguage_en_US(benchmark::State& state) {
-  while (state.KeepRunning()) {
-    FontLanguage language("en-US", 5);
-  }
-}
-BENCHMARK(BM_FontLanguage_en_US);
-
-static void BM_FontLanguage_en_Latn_US(benchmark::State& state) {
-  while (state.KeepRunning()) {
-    FontLanguage language("en-Latn-US", 10);
-  }
-}
-BENCHMARK(BM_FontLanguage_en_Latn_US);
-
-static void BM_FontLanguage_en_Latn_US_u_em_emoji(benchmark::State& state) {
-  while (state.KeepRunning()) {
-    FontLanguage language("en-Latn-US-u-em-emoji", 21);
-  }
-}
-BENCHMARK(BM_FontLanguage_en_Latn_US_u_em_emoji);
-
-}  // namespace minikin
diff --git a/third_party/txt/tests/old/perftests/GraphemeBreak.cpp b/third_party/txt/tests/old/perftests/GraphemeBreak.cpp
deleted file mode 100644
index 5fc1e3cbf6a44b49ac9f8c27436e40deebff5145..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/old/perftests/GraphemeBreak.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <benchmark/benchmark.h>
-
-#include <cutils/log.h>
-
-#include "UnicodeUtils.h"
-#include "minikin/GraphemeBreak.h"
-
-namespace minikin {
-
-const char* ASCII_TEST_STR = "'L' 'o' 'r' 'e' 'm' ' ' 'i' 'p' 's' 'u' 'm' '.'";
-// U+261D: WHITE UP POINTING INDEX
-// U+1F3FD: EMOJI MODIFIER FITZPATRICK TYPE-4
-const char* EMOJI_TEST_STR =
-    "U+261D U+1F3FD U+261D U+1F3FD U+261D U+1F3FD U+261D U+1F3FD";
-// U+1F1FA: REGIONAL INDICATOR SYMBOL LETTER U
-// U+1F1F8: REGIONAL INDICATOR SYMBOL LETTER S
-const char* FLAGS_TEST_STR = "U+1F1FA U+1F1F8 U+1F1FA U+1F1F8 U+1F1FA U+1F1F8";
-
-// TODO: Migrate BENCHMARK_CAPTURE for parameterizing.
-static void BM_GraphemeBreak_Ascii(benchmark::State& state) {
-  size_t result_size;
-  uint16_t buffer[12];
-  ParseUnicode(buffer, 12, ASCII_TEST_STR, &result_size, nullptr);
-  LOG_ALWAYS_FATAL_IF(result_size != 12);
-  const size_t testIndex = state.range(0);
-  while (state.KeepRunning()) {
-    GraphemeBreak::isGraphemeBreak(nullptr, buffer, 0, result_size, testIndex);
-  }
-}
-BENCHMARK(BM_GraphemeBreak_Ascii)
-    ->Arg(0)    // Beginning of the text.
-    ->Arg(1)    // Middle of the text.
-    ->Arg(12);  // End of the text.
-
-static void BM_GraphemeBreak_Emoji(benchmark::State& state) {
-  size_t result_size;
-  uint16_t buffer[12];
-  ParseUnicode(buffer, 12, EMOJI_TEST_STR, &result_size, nullptr);
-  LOG_ALWAYS_FATAL_IF(result_size != 12);
-  const size_t testIndex = state.range(0);
-  while (state.KeepRunning()) {
-    GraphemeBreak::isGraphemeBreak(nullptr, buffer, 0, result_size, testIndex);
-  }
-}
-BENCHMARK(BM_GraphemeBreak_Emoji)
-    ->Arg(1)   // Middle of emoji modifier sequence.
-    ->Arg(2)   // Middle of the surrogate pairs.
-    ->Arg(3);  // After emoji modifier sequence. Here is boundary of grapheme
-               // cluster.
-
-static void BM_GraphemeBreak_Emoji_Flags(benchmark::State& state) {
-  size_t result_size;
-  uint16_t buffer[12];
-  ParseUnicode(buffer, 12, FLAGS_TEST_STR, &result_size, nullptr);
-  LOG_ALWAYS_FATAL_IF(result_size != 12);
-  const size_t testIndex = state.range(0);
-  while (state.KeepRunning()) {
-    GraphemeBreak::isGraphemeBreak(nullptr, buffer, 0, result_size, testIndex);
-  }
-}
-BENCHMARK(BM_GraphemeBreak_Emoji_Flags)
-    ->Arg(2)    // Middle of flag sequence.
-    ->Arg(4)    // After flag sequence. Here is boundary of grapheme cluster.
-    ->Arg(10);  // Middle of 3rd flag sequence.
-
-}  // namespace minikin
diff --git a/third_party/txt/tests/old/perftests/Hyphenator.cpp b/third_party/txt/tests/old/perftests/Hyphenator.cpp
deleted file mode 100644
index 2c87c3555a1dba21eefa8d554a40affc8740a259..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/old/perftests/Hyphenator.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <benchmark/benchmark.h>
-
-#include <FileUtils.h>
-#include <UnicodeUtils.h>
-#include <minikin/Hyphenator.h>
-
-namespace minikin {
-
-const char* enUsHyph = "/system/usr/hyphen-data/hyph-en-us.hyb";
-const int enUsMinPrefix = 2;
-const int enUsMinSuffix = 3;
-const icu::Locale& usLocale = icu::Locale::getUS();
-
-static void BM_Hyphenator_short_word(benchmark::State& state) {
-  Hyphenator* hyphenator = Hyphenator::loadBinary(
-      readWholeFile(enUsHyph).data(), enUsMinPrefix, enUsMinSuffix);
-  std::vector<uint16_t> word = utf8ToUtf16("hyphen");
-  std::vector<HyphenationType> result;
-  while (state.KeepRunning()) {
-    hyphenator->hyphenate(&result, word.data(), word.size(), usLocale);
-  }
-  Hyphenator::loadBinary(nullptr, 2, 2);
-}
-
-// TODO: Use BENCHMARK_CAPTURE for parametrise.
-BENCHMARK(BM_Hyphenator_short_word);
-
-static void BM_Hyphenator_long_word(benchmark::State& state) {
-  Hyphenator* hyphenator = Hyphenator::loadBinary(
-      readWholeFile(enUsHyph).data(), enUsMinPrefix, enUsMinSuffix);
-  std::vector<uint16_t> word =
-      utf8ToUtf16("Pneumonoultramicroscopicsilicovolcanoconiosis");
-  std::vector<HyphenationType> result;
-  while (state.KeepRunning()) {
-    hyphenator->hyphenate(&result, word.data(), word.size(), usLocale);
-  }
-  Hyphenator::loadBinary(nullptr, 2, 2);
-}
-
-// TODO: Use BENCHMARK_CAPTURE for parametrise.
-BENCHMARK(BM_Hyphenator_long_word);
-
-// TODO: Add more tests for other languages.
-
-}  // namespace minikin
diff --git a/third_party/txt/tests/old/perftests/WordBreaker.cpp b/third_party/txt/tests/old/perftests/WordBreaker.cpp
deleted file mode 100644
index 70661e107611867a8e69ffffe54329b28b87d10d..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/old/perftests/WordBreaker.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <benchmark/benchmark.h>
-
-#include "UnicodeUtils.h"
-#include "minikin/WordBreaker.h"
-
-namespace minikin {
-
-static void BM_WordBreaker_English(benchmark::State& state) {
-  const char* kLoremIpsum =
-      "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do "
-      "eiusmod tempor incididunt ut labore et dolore magna aliqua.";
-
-  WordBreaker wb;
-  wb.setLocale(icu::Locale::getEnglish());
-  std::vector<uint16_t> text = utf8ToUtf16(kLoremIpsum);
-  while (state.KeepRunning()) {
-    wb.setText(text.data(), text.size());
-    while (wb.next() != -1) {
-    }
-  }
-}
-BENCHMARK(BM_WordBreaker_English);
-
-// TODO: Add more tests for other languages.
-
-}  // namespace minikin
diff --git a/third_party/txt/tests/old/perftests/main.cpp b/third_party/txt/tests/old/perftests/main.cpp
deleted file mode 100644
index 7110ddff4eb8677b1d420a69f23c2aa27b526cbc..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/old/perftests/main.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <benchmark/benchmark.h>
-
-#include <cutils/log.h>
-
-#include <unicode/uclean.h>
-#include <unicode/udata.h>
-
-#include <fcntl.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-
-int main(int argc, char** argv) {
-  const char* fn = "/system/usr/icu/" U_ICUDATA_NAME ".dat";
-  int fd = open(fn, O_RDONLY);
-  LOG_ALWAYS_FATAL_IF(fd == -1);
-  struct stat st;
-  LOG_ALWAYS_FATAL_IF(fstat(fd, &st) != 0);
-  void* data = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
-
-  UErrorCode errorCode = U_ZERO_ERROR;
-  udata_setCommonData(data, &errorCode);
-  LOG_ALWAYS_FATAL_IF(U_FAILURE(errorCode));
-  u_init(&errorCode);
-  LOG_ALWAYS_FATAL_IF(U_FAILURE(errorCode));
-
-  benchmark::Initialize(&argc, argv);
-  benchmark::RunSpecifiedBenchmarks();
-
-  u_cleanup();
-  return 0;
-}
diff --git a/third_party/txt/tests/old/stresstest/MultithreadTest.cpp b/third_party/txt/tests/old/stresstest/MultithreadTest.cpp
deleted file mode 100644
index 3475345e3d24c62f5721cea0a8b90b3a2c968a26..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/old/stresstest/MultithreadTest.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <gtest/gtest.h>
-
-#include <condition_variable>
-#include <mutex>
-#include <random>
-#include <thread>
-
-#include <cutils/log.h>
-
-#include "../util/FontTestUtils.h"
-#include "MinikinInternal.h"
-#include "minikin/FontCollection.h"
-#include "minikin/Layout.h"
-
-namespace minikin {
-
-const char* SYSTEM_FONT_PATH = "/system/fonts/";
-const char* SYSTEM_FONT_XML = "/system/etc/fonts.xml";
-
-constexpr int LAYOUT_COUNT_PER_COLLECTION = 500;
-constexpr int COLLECTION_COUNT_PER_THREAD = 15;
-constexpr int NUM_THREADS = 10;
-
-std::mutex gMutex;
-std::condition_variable gCv;
-bool gReady = false;
-
-static std::vector<uint16_t> generateTestText(std::mt19937* mt,
-                                              int lettersInWord,
-                                              int wordsInText) {
-  std::uniform_int_distribution<uint16_t> dist('A', 'Z');
-
-  std::vector<uint16_t> text;
-  text.reserve((lettersInWord + 1) * wordsInText - 1);
-  for (int i = 0; i < wordsInText; ++i) {
-    if (i != 0) {
-      text.emplace_back(' ');
-    }
-    for (int j = 0; j < lettersInWord; ++j) {
-      text.emplace_back(dist(*mt));
-    }
-  }
-  return text;
-}
-
-static void thread_main(int tid) {
-  {
-    // Wait until all threads are created.
-    std::unique_lock<std::mutex> lock(gMutex);
-    gCv.wait(lock, [] { return gReady; });
-  }
-
-  std::mt19937 mt(tid);
-  MinikinPaint paint;
-
-  for (int i = 0; i < COLLECTION_COUNT_PER_THREAD; ++i) {
-    std::shared_ptr<FontCollection> collection(
-        getFontCollection(SYSTEM_FONT_PATH, SYSTEM_FONT_XML));
-
-    for (int j = 0; j < LAYOUT_COUNT_PER_COLLECTION; ++j) {
-      // Generates 10 of 3-letter words so that the word sometimes hit the
-      // cache.
-      Layout layout;
-      std::vector<uint16_t> text = generateTestText(&mt, 3, 10);
-      layout.doLayout(text.data(), 0, text.size(), text.size(), kBidi_LTR,
-                      FontStyle(), paint, collection);
-      std::vector<float> advances(text.size());
-      layout.getAdvances(advances.data());
-      for (size_t k = 0; k < advances.size(); ++k) {
-        // MinikinFontForTest always returns 10.0f for horizontal advance.
-        LOG_ALWAYS_FATAL_IF(advances[k] != 10.0f,
-                            "Memory corruption detected.");
-      }
-    }
-  }
-}
-
-TEST(MultithreadTest, ThreadSafeStressTest) {
-  std::vector<std::thread> threads;
-
-  {
-    std::unique_lock<std::mutex> lock(gMutex);
-    threads.reserve(NUM_THREADS);
-    for (int i = 0; i < NUM_THREADS; ++i) {
-      threads.emplace_back(&thread_main, i);
-    }
-    gReady = true;
-  }
-  gCv.notify_all();
-
-  for (auto& thread : threads) {
-    thread.join();
-  }
-}
-
-}  // namespace minikin
diff --git a/third_party/txt/benchmarks/paint_record_benchmarks.cc b/third_party/txt/tests/paragraph_builder_skia_tests.cc
similarity index 46%
rename from third_party/txt/benchmarks/paint_record_benchmarks.cc
rename to third_party/txt/tests/paragraph_builder_skia_tests.cc
index 52366031c90602d79e60658a35a93eee8d648a39..3131624be0a663dcfe4fb0206bece1c4aa7a87e7 100644
--- a/third_party/txt/benchmarks/paint_record_benchmarks.cc
+++ b/third_party/txt/tests/paragraph_builder_skia_tests.cc
@@ -14,32 +14,32 @@
  * limitations under the License.
  */
 
-#include "flutter/fml/command_line.h"
-#include "flutter/fml/logging.h"
-#include "flutter/third_party/txt/tests/txt_test_utils.h"
-#include "third_party/benchmark/include/benchmark/benchmark.h"
-#include "txt/paint_record.h"
-#include "txt/text_style.h"
+#include "gtest/gtest.h"
+
+#include <sstream>
+
+#include "skia/paragraph_builder_skia.h"
+#include "txt/paragraph_style.h"
 
 namespace txt {
 
-static void BM_PaintRecordInit(benchmark::State& state) {
-  TextStyle style;
-  style.font_families = std::vector<std::string>(1, "Roboto");
+class SkiaParagraphBuilderTests : public ::testing::Test {
+ public:
+  SkiaParagraphBuilderTests() {}
 
-  SkFont font;
-  font.setEdging(SkFont::Edging::kAntiAlias);
-  font.setSize(14);
-  font.setEmbolden(false);
+  void SetUp() override {}
+};
 
-  SkTextBlobBuilder builder;
-  builder.allocRunPos(font, 100);
-  auto text_blob = builder.make();
+TEST_F(SkiaParagraphBuilderTests, ParagraphStrutStyle) {
+  ParagraphStyle style = ParagraphStyle();
+  auto collection = std::make_shared<FontCollection>();
+  auto builder = ParagraphBuilderSkia(style, collection, false);
 
-  while (state.KeepRunning()) {
-    PaintRecord PaintRecord(style, text_blob, SkFontMetrics(), 0, 0, 0, false);
-  }
-}
-BENCHMARK(BM_PaintRecordInit);
+  auto strut_style = builder.TxtToSkia(style).getStrutStyle();
+  ASSERT_FALSE(strut_style.getHalfLeading());
 
+  style.strut_half_leading = true;
+  strut_style = builder.TxtToSkia(style).getStrutStyle();
+  ASSERT_TRUE(strut_style.getHalfLeading());
+}
 }  // namespace txt
diff --git a/third_party/txt/tests/paragraph_unittests.cc b/third_party/txt/tests/paragraph_unittests.cc
index 979c0079ffb33a2287d31ed1dcea4e306dc56b18..7eaf771c6cde8c5873374cac600c283a790d68f7 100644
--- a/third_party/txt/tests/paragraph_unittests.cc
+++ b/third_party/txt/tests/paragraph_unittests.cc
@@ -1,7114 +1,245 @@
-/*
- * Copyright 2017 Google, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <cstring>
-#include <iostream>
-
-#include "flutter/fml/logging.h"
-#include "render_test.h"
-#include "third_party/icu/source/common/unicode/unistr.h"
-#include "third_party/skia/include/core/SkColor.h"
-#include "third_party/skia/include/core/SkPath.h"
-#include "txt/font_style.h"
-#include "txt/font_weight.h"
-#include "txt/paragraph_builder_txt.h"
-#include "txt/paragraph_txt.h"
-#include "txt/placeholder_run.h"
-#include "txt_test_utils.h"
-
-#define DISABLE_ON_WINDOWS(TEST) DISABLE_TEST_WINDOWS(TEST)
-#define DISABLE_ON_MAC(TEST) DISABLE_TEST_MAC(TEST)
-
-namespace txt {
-
-using ParagraphTest = RenderTest;
-
-TEST_F(ParagraphTest, SimpleParagraph) {
-  const char* text = "Hello World Text Dialog";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  // We must supply a font here, as the default is Arial, and we do not
-  // include Arial in our test fonts as it is proprietary. We want it to
-  // be Arial default though as it is one of the most common fonts on host
-  // platforms. On real devices/apps, Arial should be able to be resolved.
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth());
-
-  paragraph->Paint(GetCanvas(), 10.0, 15.0);
-
-  ASSERT_EQ(paragraph->text_.size(), std::string{text}.length());
-  for (size_t i = 0; i < u16_text.length(); i++) {
-    ASSERT_EQ(paragraph->text_[i], u16_text[i]);
-  }
-  ASSERT_EQ(paragraph->runs_.runs_.size(), 1ull);
-  ASSERT_EQ(paragraph->runs_.styles_.size(), 2ull);
-  ASSERT_TRUE(paragraph->runs_.styles_[1].equals(text_style));
-  ASSERT_EQ(paragraph->records_[0].style().color, text_style.color);
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, SimpleParagraphSmall) {
-  const char* text =
-      "Hello World Text Dialog. This is a very small text in order to check "
-      "for constant advance additions that are only visible when the advance "
-      "of the glyphs are small.";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_size = 6;
-  // We must supply a font here, as the default is Arial, and we do not
-  // include Arial in our test fonts as it is proprietary. We want it to
-  // be Arial default though as it is one of the most common fonts on host
-  // platforms. On real devices/apps, Arial should be able to be resolved.
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth());
-
-  paragraph->Paint(GetCanvas(), 10.0, 15.0);
-
-  ASSERT_EQ(paragraph->text_.size(), std::string{text}.length());
-  for (size_t i = 0; i < u16_text.length(); i++) {
-    ASSERT_EQ(paragraph->text_[i], u16_text[i]);
-  }
-  ASSERT_EQ(paragraph->runs_.runs_.size(), 1ull);
-  ASSERT_EQ(paragraph->runs_.styles_.size(), 2ull);
-  ASSERT_TRUE(paragraph->runs_.styles_[1].equals(text_style));
-  ASSERT_EQ(paragraph->records_[0].style().color, text_style.color);
-  ASSERT_TRUE(Snapshot());
-}
-
-// It is possible for the line_metrics_ vector in paragraph to have an empty
-// line at the end as a result of the line breaking algorithm. This causes
-// the final_line_count_ to be one less than line metrics. This tests that we
-// properly handle this case and do not segfault.
-TEST_F(ParagraphTest, GetGlyphPositionAtCoordinateSegfault) {
-  const char* text = "Hello World\nText Dialog";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  // We must supply a font here, as the default is Arial, and we do not
-  // include Arial in our test fonts as it is proprietary. We want it to
-  // be Arial default though as it is one of the most common fonts on host
-  // platforms. On real devices/apps, Arial should be able to be resolved.
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth());
-
-  paragraph->Paint(GetCanvas(), 10.0, 15.0);
-
-  ASSERT_EQ(paragraph->final_line_count_, paragraph->line_metrics_.size());
-  ASSERT_EQ(paragraph->final_line_count_, 2ull);
-  ASSERT_EQ(paragraph->GetLineCount(), 2ull);
-
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(0.2, 0.2).position, 0ull);
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(20.2, 0.2).position, 3ull);
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(0.2, 20.2).position, 12ull);
-
-  // We artificially reproduce the conditions that cause segfaults in very
-  // specific circumstances in the wild. By adding this empty un-laid-out
-  // LineMetrics at the end, we force the case where final_line_count_
-  // represents the true number of lines whereas line_metrics_ has one
-  // extra empty one.
-  paragraph->line_metrics_.emplace_back(23, 24, 24, 24, true);
-
-  ASSERT_EQ(paragraph->final_line_count_, paragraph->line_metrics_.size() - 1);
-  ASSERT_EQ(paragraph->final_line_count_, 2ull);
-  ASSERT_EQ(paragraph->GetLineCount(), 2ull);
-
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(0.2, 20.2).position, 12ull);
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(0.2, 0.2).position, 0ull);
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(20.2, 0.2).position, 3ull);
-
-  paragraph->line_metrics_.emplace_back(24, 25, 25, 25, true);
-
-  ASSERT_EQ(paragraph->final_line_count_, paragraph->line_metrics_.size() - 2);
-  ASSERT_EQ(paragraph->final_line_count_, 2ull);
-  ASSERT_EQ(paragraph->GetLineCount(), 2ull);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-// Check that GetGlyphPositionAtCoordinate computes correct text positions for
-// a paragraph containing multiple styled runs.
-TEST_F(ParagraphTest, GetGlyphPositionAtCoordinateMultiRun) {
-  txt::ParagraphStyle paragraph_style;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Ahem");
-  text_style.color = SK_ColorBLACK;
-  text_style.font_size = 10;
-  builder.PushStyle(text_style);
-  builder.AddText(u"A");
-  text_style.font_size = 20;
-  builder.PushStyle(text_style);
-  builder.AddText(u"B");
-  text_style.font_size = 30;
-  builder.PushStyle(text_style);
-  builder.AddText(u"C");
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth());
-
-  paragraph->Paint(GetCanvas(), 10.0, 15.0);
-
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(2.0, 5.0).position, 0ull);
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(12.0, 5.0).position, 1ull);
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(32.0, 5.0).position, 2ull);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, LineMetricsParagraph1) {
-  const char* text = "Hello! What is going on?\nSecond line \nthirdline";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  // We must supply a font here, as the default is Arial, and we do not
-  // include Arial in our test fonts as it is proprietary. We want it to
-  // be Arial default though as it is one of the most common fonts on host
-  // platforms. On real devices/apps, Arial should be able to be resolved.
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth());
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  ASSERT_TRUE(Snapshot());
-
-  ASSERT_EQ(paragraph->GetLineMetrics().size(), 3ull);
-  ASSERT_EQ(paragraph->GetLineMetrics()[0].start_index, 0ull);
-  ASSERT_EQ(paragraph->GetLineMetrics()[0].end_index, 24ull);
-  ASSERT_EQ(paragraph->GetLineMetrics()[0].end_including_newline, 25ull);
-  ASSERT_EQ(paragraph->GetLineMetrics()[0].end_excluding_whitespace, 24ull);
-  ASSERT_EQ(paragraph->GetLineMetrics()[0].hard_break, true);
-  ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[0].ascent, 12.988281);
-  ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[0].descent, 3.4179688);
-  ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[0].width, 149.72266);
-  ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[0].left, 0.0);
-  ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[0].baseline, 12.582031);
-  ASSERT_EQ(paragraph->GetLineMetrics()[0].line_number, 0ull);
-  ASSERT_EQ(paragraph->GetLineMetrics()[0].run_metrics.size(), 1ull);
-  ASSERT_EQ(
-      paragraph->GetLineMetrics()[0]
-          .run_metrics.lower_bound(paragraph->GetLineMetrics()[0].start_index)
-          ->second.text_style->color,
-      SK_ColorBLACK);
-  ASSERT_EQ(
-      paragraph->GetLineMetrics()[0]
-          .run_metrics.lower_bound(paragraph->GetLineMetrics()[0].start_index)
-          ->second.text_style->font_families,
-      std::vector<std::string>(1, "Roboto"));
-  ASSERT_FLOAT_EQ(
-      paragraph->GetLineMetrics()[0]
-          .run_metrics.lower_bound(paragraph->GetLineMetrics()[0].start_index)
-          ->second.font_metrics.fAscent,
-      -12.988281);
-  ASSERT_FLOAT_EQ(
-      paragraph->GetLineMetrics()[0]
-          .run_metrics.lower_bound(paragraph->GetLineMetrics()[0].start_index)
-          ->second.font_metrics.fDescent,
-      3.4179688);
-  ASSERT_FLOAT_EQ(
-      paragraph->GetLineMetrics()[0]
-          .run_metrics.lower_bound(paragraph->GetLineMetrics()[0].start_index)
-          ->second.font_metrics.fXHeight,
-      7.3964844);
-  ASSERT_FLOAT_EQ(
-      paragraph->GetLineMetrics()[0]
-          .run_metrics.lower_bound(paragraph->GetLineMetrics()[0].start_index)
-          ->second.font_metrics.fLeading,
-      0);
-  ASSERT_FLOAT_EQ(
-      paragraph->GetLineMetrics()[0]
-          .run_metrics.lower_bound(paragraph->GetLineMetrics()[0].start_index)
-          ->second.font_metrics.fTop,
-      -14.786133);
-  ASSERT_FLOAT_EQ(
-      paragraph->GetLineMetrics()[0]
-          .run_metrics.lower_bound(paragraph->GetLineMetrics()[0].start_index)
-          ->second.font_metrics.fUnderlinePosition,
-      1.0253906);
-
-  ASSERT_EQ(paragraph->GetLineMetrics()[1].start_index, 25ull);
-  ASSERT_EQ(paragraph->GetLineMetrics()[1].end_index, 37ull);
-  ASSERT_EQ(paragraph->GetLineMetrics()[1].end_including_newline, 38ull);
-  ASSERT_EQ(paragraph->GetLineMetrics()[1].end_excluding_whitespace, 36ull);
-  ASSERT_EQ(paragraph->GetLineMetrics()[1].hard_break, true);
-  ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[1].ascent, 12.988281);
-  ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[1].descent, 3.4179688);
-  ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[1].width, 72.0625);
-  ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[1].left, 0.0);
-  ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[1].baseline, 28.582031);
-  ASSERT_EQ(paragraph->GetLineMetrics()[1].line_number, 1ull);
-  ASSERT_EQ(paragraph->GetLineMetrics()[1].run_metrics.size(), 1ull);
-  ASSERT_EQ(
-      paragraph->GetLineMetrics()[1]
-          .run_metrics.lower_bound(paragraph->GetLineMetrics()[1].start_index)
-          ->second.text_style->color,
-      SK_ColorBLACK);
-  ASSERT_EQ(
-      paragraph->GetLineMetrics()[1]
-          .run_metrics.lower_bound(paragraph->GetLineMetrics()[1].start_index)
-          ->second.text_style->font_families,
-      std::vector<std::string>(1, "Roboto"));
-  ASSERT_FLOAT_EQ(
-      paragraph->GetLineMetrics()[1]
-          .run_metrics.lower_bound(paragraph->GetLineMetrics()[1].start_index)
-          ->second.font_metrics.fAscent,
-      -12.988281);
-  ASSERT_FLOAT_EQ(
-      paragraph->GetLineMetrics()[1]
-          .run_metrics.lower_bound(paragraph->GetLineMetrics()[1].start_index)
-          ->second.font_metrics.fDescent,
-      3.4179688);
-  ASSERT_FLOAT_EQ(
-      paragraph->GetLineMetrics()[1]
-          .run_metrics.lower_bound(paragraph->GetLineMetrics()[1].start_index)
-          ->second.font_metrics.fXHeight,
-      7.3964844);
-  ASSERT_FLOAT_EQ(
-      paragraph->GetLineMetrics()[1]
-          .run_metrics.lower_bound(paragraph->GetLineMetrics()[1].start_index)
-          ->second.font_metrics.fLeading,
-      0);
-  ASSERT_FLOAT_EQ(
-      paragraph->GetLineMetrics()[1]
-          .run_metrics.lower_bound(paragraph->GetLineMetrics()[1].start_index)
-          ->second.font_metrics.fTop,
-      -14.786133);
-  ASSERT_FLOAT_EQ(
-      paragraph->GetLineMetrics()[1]
-          .run_metrics.lower_bound(paragraph->GetLineMetrics()[1].start_index)
-          ->second.font_metrics.fUnderlinePosition,
-      1.0253906);
-}
-
-TEST_F(ParagraphTest, DISABLE_ON_MAC(LineMetricsParagraph2)) {
-  const char* text = "test string alphabetic";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string alphabetic(icu_text.getBuffer(),
-                            icu_text.getBuffer() + icu_text.length());
-
-  const char* text2 = "测试中文日本語한국어";
-  auto icu_text2 = icu::UnicodeString::fromUTF8(text2);
-  std::u16string cjk(icu_text2.getBuffer(),
-                     icu_text2.getBuffer() + icu_text2.length());
-
-  txt::ParagraphStyle paragraph_style;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_families.push_back("Noto Sans CJK JP");
-  text_style.font_size = 27;
-  text_style.color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-  builder.AddText(alphabetic);
-
-  text_style.font_size = 24;
-  builder.PushStyle(text_style);
-  builder.AddText(cjk);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(350);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  ASSERT_TRUE(Snapshot());
-
-  ASSERT_EQ(paragraph->GetLineMetrics().size(), 2ull);
-  ASSERT_EQ(paragraph->GetLineMetrics()[0].start_index, 0ull);
-  ASSERT_EQ(paragraph->GetLineMetrics()[0].end_index, 26ull);
-  ASSERT_EQ(paragraph->GetLineMetrics()[0].end_including_newline, 26ull);
-  ASSERT_EQ(paragraph->GetLineMetrics()[0].end_excluding_whitespace, 26ull);
-  ASSERT_EQ(paragraph->GetLineMetrics()[0].hard_break, false);
-  ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[0].ascent, 27.84);
-  ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[0].descent, 7.6799998);
-  ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[0].width, 348.61328);
-  ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[0].left, 0.0);
-  ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[0].baseline, 28.32);
-  ASSERT_EQ(paragraph->GetLineMetrics()[0].line_number, 0ull);
-  ASSERT_EQ(paragraph->GetLineMetrics()[0].run_metrics.size(), 2ull);
-  // First run
-  ASSERT_EQ(paragraph->GetLineMetrics()[0]
-                .run_metrics.lower_bound(2)
-                ->second.text_style->font_size,
-            27);
-  ASSERT_EQ(paragraph->GetLineMetrics()[0]
-                .run_metrics.lower_bound(2)
-                ->second.text_style->font_families,
-            text_style.font_families);
-  ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[0]
-                      .run_metrics.lower_bound(2)
-                      ->second.font_metrics.fAscent,
-                  -25.048828);
-  ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[0]
-                      .run_metrics.lower_bound(2)
-                      ->second.font_metrics.fDescent,
-                  6.5917969);
-
-  ASSERT_EQ(paragraph->GetLineMetrics()[0]
-                .run_metrics.lower_bound(21)
-                ->second.text_style->font_size,
-            27);
-  ASSERT_EQ(paragraph->GetLineMetrics()[0]
-                .run_metrics.lower_bound(21)
-                ->second.text_style->font_families,
-            text_style.font_families);
-  ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[0]
-                      .run_metrics.lower_bound(21)
-                      ->second.font_metrics.fAscent,
-                  -25.048828);
-  ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[0]
-                      .run_metrics.lower_bound(21)
-                      ->second.font_metrics.fDescent,
-                  6.5917969);
-
-  // Second run
-  ASSERT_EQ(paragraph->GetLineMetrics()[0]
-                .run_metrics.lower_bound(22)
-                ->second.text_style->font_size,
-            24);
-  ASSERT_EQ(paragraph->GetLineMetrics()[0]
-                .run_metrics.lower_bound(22)
-                ->second.text_style->font_families,
-            text_style.font_families);
-  ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[0]
-                      .run_metrics.lower_bound(22)
-                      ->second.font_metrics.fAscent,
-                  -27.84);
-  ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[0]
-                      .run_metrics.lower_bound(22)
-                      ->second.font_metrics.fDescent,
-                  7.6799998);
-
-  ASSERT_EQ(paragraph->GetLineMetrics()[0]
-                .run_metrics.lower_bound(24)
-                ->second.text_style->font_size,
-            24);
-  ASSERT_EQ(paragraph->GetLineMetrics()[0]
-                .run_metrics.lower_bound(24)
-                ->second.text_style->font_families,
-            text_style.font_families);
-  ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[0]
-                      .run_metrics.lower_bound(24)
-                      ->second.font_metrics.fAscent,
-                  -27.84);
-  ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[0]
-                      .run_metrics.lower_bound(24)
-                      ->second.font_metrics.fDescent,
-                  7.6799998);
-
-  ASSERT_EQ(paragraph->GetLineMetrics()[1].start_index, 26ull);
-  ASSERT_EQ(paragraph->GetLineMetrics()[1].end_index, 32ull);
-  ASSERT_EQ(paragraph->GetLineMetrics()[1].end_including_newline, 32ull);
-  ASSERT_EQ(paragraph->GetLineMetrics()[1].end_excluding_whitespace, 32ull);
-  ASSERT_EQ(paragraph->GetLineMetrics()[1].hard_break, true);
-  ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[1].ascent, 27.84);
-  ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[1].descent, 7.6799998);
-  ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[1].width, 138.23438);
-  ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[1].left, 0.0);
-  ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[1].baseline, 64.32);
-  ASSERT_EQ(paragraph->GetLineMetrics()[1].line_number, 1ull);
-  ASSERT_EQ(paragraph->GetLineMetrics()[1].run_metrics.size(), 1ull);
-  // Indexing below the line will just resolve to the first run in the line.
-  ASSERT_EQ(paragraph->GetLineMetrics()[1]
-                .run_metrics.lower_bound(3)
-                ->second.text_style->font_size,
-            24);
-  ASSERT_EQ(paragraph->GetLineMetrics()[1]
-                .run_metrics.lower_bound(3)
-                ->second.text_style->font_families,
-            text_style.font_families);
-  ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[1]
-                      .run_metrics.lower_bound(3)
-                      ->second.font_metrics.fAscent,
-                  -27.84);
-  ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[1]
-                      .run_metrics.lower_bound(3)
-                      ->second.font_metrics.fDescent,
-                  7.6799998);
-
-  // Indexing within the line
-  ASSERT_EQ(paragraph->GetLineMetrics()[1]
-                .run_metrics.lower_bound(31)
-                ->second.text_style->font_size,
-            24);
-  ASSERT_EQ(paragraph->GetLineMetrics()[1]
-                .run_metrics.lower_bound(31)
-                ->second.text_style->font_families,
-            text_style.font_families);
-  ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[1]
-                      .run_metrics.lower_bound(31)
-                      ->second.font_metrics.fAscent,
-                  -27.84);
-  ASSERT_FLOAT_EQ(paragraph->GetLineMetrics()[1]
-                      .run_metrics.lower_bound(31)
-                      ->second.font_metrics.fDescent,
-                  7.6799998);
-}
-
-TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(InlinePlaceholderParagraph)) {
-  const char* text = "012 34";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 14;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 26;
-  text_style.letter_spacing = 1;
-  text_style.word_spacing = 5;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  text_style.decoration = TextDecoration::kUnderline;
-  text_style.decoration_color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  txt::PlaceholderRun placeholder_run(50, 50, PlaceholderAlignment::kBaseline,
-                                      TextBaseline::kAlphabetic, 0);
-  builder.AddPlaceholder(placeholder_run);
-
-  builder.AddText(u16_text);
-
-  builder.AddPlaceholder(placeholder_run);
-  txt::PlaceholderRun placeholder_run2(5, 50, PlaceholderAlignment::kBaseline,
-                                       TextBaseline::kAlphabetic, 50);
-  builder.AddPlaceholder(placeholder_run2);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run2);
-  builder.AddText(u16_text);
-  builder.AddPlaceholder(placeholder_run2);
-
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddPlaceholder(placeholder_run2);
-  builder.AddPlaceholder(placeholder_run2);
-  builder.AddPlaceholder(placeholder_run2);
-  builder.AddPlaceholder(placeholder_run2);
-  builder.AddPlaceholder(placeholder_run2);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddPlaceholder(placeholder_run2);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth());
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kTight;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(0, 3, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  // ASSERT_TRUE(Snapshot());
-  EXPECT_EQ(boxes.size(), 1ull);
-
-  paint.setColor(SK_ColorGREEN);
-  boxes =
-      paragraph->GetRectsForRange(0, 1, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-
-  paint.setColor(SK_ColorRED);
-  boxes = paragraph->GetRectsForPlaceholders();
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-
-  paint.setColor(SK_ColorBLUE);
-  boxes =
-      paragraph->GetRectsForRange(4, 17, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 7ull);
-  EXPECT_FLOAT_EQ(boxes[1].rect.left(), 90.945312);
-  EXPECT_FLOAT_EQ(boxes[1].rect.top(), 50);
-  EXPECT_FLOAT_EQ(boxes[1].rect.right(), 140.94531);
-  EXPECT_FLOAT_EQ(boxes[1].rect.bottom(), 100);
-
-  EXPECT_FLOAT_EQ(boxes[3].rect.left(), 231.39062);
-  EXPECT_FLOAT_EQ(boxes[3].rect.top(), 50);
-  EXPECT_FLOAT_EQ(boxes[3].rect.right(), 231.39062 + 50);
-  EXPECT_FLOAT_EQ(boxes[3].rect.bottom(), 100);
-
-  EXPECT_FLOAT_EQ(boxes[4].rect.left(), 281.39062);
-  EXPECT_FLOAT_EQ(boxes[4].rect.top(), 0);
-  EXPECT_FLOAT_EQ(boxes[4].rect.right(), 281.39062 + 5);
-  EXPECT_FLOAT_EQ(boxes[4].rect.bottom(), 50);
-
-  EXPECT_FLOAT_EQ(boxes[6].rect.left(), 336.39062);
-  EXPECT_FLOAT_EQ(boxes[6].rect.top(), 0);
-  EXPECT_FLOAT_EQ(boxes[6].rect.right(), 336.39062 + 5);
-  EXPECT_FLOAT_EQ(boxes[6].rect.bottom(), 50);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(InlinePlaceholderBaselineParagraph)) {
-  const char* text = "012 34";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 14;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 26;
-  text_style.letter_spacing = 1;
-  text_style.word_spacing = 5;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  text_style.decoration = TextDecoration::kUnderline;
-  text_style.decoration_color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  txt::PlaceholderRun placeholder_run(55, 50, PlaceholderAlignment::kBaseline,
-                                      TextBaseline::kAlphabetic, 38.34734);
-  builder.AddPlaceholder(placeholder_run);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth());
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kTight;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForPlaceholders();
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  // Verify the box is in the right place
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 90.945312);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 0);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 145.94531);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 50);
-
-  paint.setColor(SK_ColorBLUE);
-  boxes =
-      paragraph->GetRectsForRange(5, 6, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  // Verify the other text didn't just shift to accommodate it.
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 75.34375);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 14.226246);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 90.945312);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 44.694996);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest,
-       DISABLE_ON_WINDOWS(InlinePlaceholderAboveBaselineParagraph)) {
-  const char* text = "012 34";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 14;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 26;
-  text_style.letter_spacing = 1;
-  text_style.word_spacing = 5;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  text_style.decoration = TextDecoration::kUnderline;
-  text_style.decoration_color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  txt::PlaceholderRun placeholder_run(55, 50,
-                                      PlaceholderAlignment::kAboveBaseline,
-                                      TextBaseline::kAlphabetic, 903129.129308);
-  builder.AddPlaceholder(placeholder_run);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth());
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kTight;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForPlaceholders();
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  // Verify the box is in the right place
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 90.945312);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), -0.34765625);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 145.94531);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 49.652344);
-
-  paint.setColor(SK_ColorBLUE);
-  boxes =
-      paragraph->GetRectsForRange(5, 6, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  // Verify the other text didn't just shift to accommodate it.
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 75.34375);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 25.53125);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 90.945312);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 56);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest,
-       DISABLE_ON_WINDOWS(InlinePlaceholderBelowBaselineParagraph)) {
-  const char* text = "012 34";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 14;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 26;
-  text_style.letter_spacing = 1;
-  text_style.word_spacing = 5;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  text_style.decoration = TextDecoration::kUnderline;
-  text_style.decoration_color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  txt::PlaceholderRun placeholder_run(55, 50,
-                                      PlaceholderAlignment::kBelowBaseline,
-                                      TextBaseline::kAlphabetic, 903129.129308);
-  builder.AddPlaceholder(placeholder_run);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth());
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kTight;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForPlaceholders();
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  // Verify the box is in the right place
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 90.945312);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 24);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 145.94531);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 74);
-
-  paint.setColor(SK_ColorBLUE);
-  boxes =
-      paragraph->GetRectsForRange(5, 6, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  // Verify the other text didn't just shift to accommodate it.
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 75.34375);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), -0.12109375);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 90.945312);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 30.347656);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(InlinePlaceholderBottomParagraph)) {
-  const char* text = "012 34";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 14;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 26;
-  text_style.letter_spacing = 1;
-  text_style.word_spacing = 5;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  text_style.decoration = TextDecoration::kUnderline;
-  text_style.decoration_color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  txt::PlaceholderRun placeholder_run(55, 50, PlaceholderAlignment::kBottom,
-                                      TextBaseline::kAlphabetic, 0);
-  builder.AddPlaceholder(placeholder_run);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth());
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kTight;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForPlaceholders();
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  // Verify the box is in the right place
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 90.945312);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 0);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 145.94531);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 50);
-
-  paint.setColor(SK_ColorBLUE);
-  boxes =
-      paragraph->GetRectsForRange(0, 1, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  // Verify the other text didn't just shift to accommodate it.
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0.5);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 19.53125);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 16.101562);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 50);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(InlinePlaceholderTopParagraph)) {
-  const char* text = "012 34";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 14;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 26;
-  text_style.letter_spacing = 1;
-  text_style.word_spacing = 5;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  text_style.decoration = TextDecoration::kUnderline;
-  text_style.decoration_color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  txt::PlaceholderRun placeholder_run(55, 50, PlaceholderAlignment::kTop,
-                                      TextBaseline::kAlphabetic, 0);
-  builder.AddPlaceholder(placeholder_run);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth());
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kTight;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForPlaceholders();
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  // Verify the box is in the right place
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 90.945312);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 0);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 145.94531);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 50);
-
-  paint.setColor(SK_ColorBLUE);
-  boxes =
-      paragraph->GetRectsForRange(0, 1, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  // Verify the other text didn't just shift to accommodate it.
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0.5);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 0);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 16.101562);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 30.46875);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(InlinePlaceholderMiddleParagraph)) {
-  const char* text = "012 34";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 14;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 26;
-  text_style.letter_spacing = 1;
-  text_style.word_spacing = 5;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  text_style.decoration = TextDecoration::kUnderline;
-  text_style.decoration_color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  txt::PlaceholderRun placeholder_run(55, 50, PlaceholderAlignment::kMiddle,
-                                      TextBaseline::kAlphabetic, 0);
-  builder.AddPlaceholder(placeholder_run);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth());
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kTight;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForPlaceholders();
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  // Verify the box is in the right place
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 90.945312);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 0);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 145.94531);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 50);
-
-  paint.setColor(SK_ColorBLUE);
-  boxes =
-      paragraph->GetRectsForRange(5, 6, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  // Verify the other text didn't just shift to accommodate it.
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 75.34375);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 9.765625);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 90.945312);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 40.234375);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest,
-       DISABLE_ON_MAC(
-           DISABLE_ON_WINDOWS(InlinePlaceholderIdeographicBaselineParagraph))) {
-  const char* text = "給能上目秘使";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 14;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Source Han Serif CN");
-  text_style.font_size = 26;
-  text_style.letter_spacing = 1;
-  text_style.word_spacing = 5;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  text_style.decoration = TextDecoration::kUnderline;
-  text_style.decoration_color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  txt::PlaceholderRun placeholder_run(55, 50, PlaceholderAlignment::kBaseline,
-                                      TextBaseline::kIdeographic, 38.34734);
-  builder.AddPlaceholder(placeholder_run);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth());
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kTight;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForPlaceholders();
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  // Verify the box is in the right place
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 162.5);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 0);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 217.5);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 50);
-
-  paint.setColor(SK_ColorBLUE);
-  boxes =
-      paragraph->GetRectsForRange(5, 6, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  // Verify the other text didn't just shift to accommodate it.
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 135.5);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 4.7033391);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 162.5);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 42.065342);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(InlinePlaceholderBreakParagraph)) {
-  const char* text = "012 34";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 14;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 26;
-  text_style.letter_spacing = 1;
-  text_style.word_spacing = 5;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  text_style.decoration = TextDecoration::kUnderline;
-  text_style.decoration_color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  txt::PlaceholderRun placeholder_run(50, 50, PlaceholderAlignment::kBaseline,
-                                      TextBaseline::kAlphabetic, 50);
-  txt::PlaceholderRun placeholder_run2(25, 25, PlaceholderAlignment::kBaseline,
-                                       TextBaseline::kAlphabetic, 12.5);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run2);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddText(u16_text);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run2);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run2);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run2);
-  builder.AddPlaceholder(placeholder_run);
-
-  builder.AddText(u16_text);
-
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run2);
-
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddPlaceholder(placeholder_run2);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddText(u16_text);
-  builder.AddPlaceholder(placeholder_run2);
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth() - 100);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kTight;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(0, 3, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-
-  paint.setColor(SK_ColorGREEN);
-  boxes = paragraph->GetRectsForRange(175, 176, rect_height_style,
-                                      rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 31.703125);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 218.53125);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 47.304688);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 249);
-
-  paint.setColor(SK_ColorRED);
-  boxes = paragraph->GetRectsForPlaceholders();
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-
-  paint.setColor(SK_ColorBLUE);
-  boxes =
-      paragraph->GetRectsForRange(4, 45, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 30ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 59.742188);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 26.378906);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 90.945312);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 56.847656);
-
-  EXPECT_FLOAT_EQ(boxes[11].rect.left(), 606.39062);
-  EXPECT_FLOAT_EQ(boxes[11].rect.top(), 38);
-  EXPECT_FLOAT_EQ(boxes[11].rect.right(), 631.39062);
-  EXPECT_FLOAT_EQ(boxes[11].rect.bottom(), 63);
-
-  EXPECT_FLOAT_EQ(boxes[17].rect.left(), 0.5);
-  EXPECT_FLOAT_EQ(boxes[17].rect.top(), 63.5);
-  EXPECT_FLOAT_EQ(boxes[17].rect.right(), 50.5);
-  EXPECT_FLOAT_EQ(boxes[17].rect.bottom(), 113.5);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(InlinePlaceholderGetRectsParagraph)) {
-  const char* text = "012 34";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 14;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 26;
-  text_style.letter_spacing = 1;
-  text_style.word_spacing = 5;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  text_style.decoration = TextDecoration::kUnderline;
-  text_style.decoration_color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  txt::PlaceholderRun placeholder_run(50, 50, PlaceholderAlignment::kBaseline,
-                                      TextBaseline::kAlphabetic, 50);
-  txt::PlaceholderRun placeholder_run2(5, 20, PlaceholderAlignment::kBaseline,
-                                       TextBaseline::kAlphabetic, 10);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run2);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run2);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run);
-
-  builder.AddText(u16_text);
-
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run2);
-  builder.AddPlaceholder(placeholder_run2);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run2);
-  builder.AddPlaceholder(placeholder_run2);
-
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddText(u16_text);
-  builder.AddPlaceholder(placeholder_run2);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run2);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddPlaceholder(placeholder_run2);
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth());
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForPlaceholders();
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 34ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 90.945312);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 0);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 140.94531);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 50);
-
-  EXPECT_FLOAT_EQ(boxes[16].rect.left(), 800.94531);
-  EXPECT_FLOAT_EQ(boxes[16].rect.top(), 0);
-  EXPECT_FLOAT_EQ(boxes[16].rect.right(), 850.94531);
-  EXPECT_FLOAT_EQ(boxes[16].rect.bottom(), 50);
-
-  EXPECT_FLOAT_EQ(boxes[33].rect.left(), 503.48438);
-  EXPECT_FLOAT_EQ(boxes[33].rect.top(), 160);
-  EXPECT_FLOAT_EQ(boxes[33].rect.right(), 508.48438);
-  EXPECT_FLOAT_EQ(boxes[33].rect.bottom(), 180);
-
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kMax;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorBLUE);
-  boxes =
-      paragraph->GetRectsForRange(30, 50, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 8ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 216.10156);
-  // Top should be taller than "tight"
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 60);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 290.94531);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 120);
-
-  EXPECT_FLOAT_EQ(boxes[1].rect.left(), 290.94531);
-  EXPECT_FLOAT_EQ(boxes[1].rect.top(), 60);
-  EXPECT_FLOAT_EQ(boxes[1].rect.right(), 340.94531);
-  EXPECT_FLOAT_EQ(boxes[1].rect.bottom(), 120);
-
-  EXPECT_FLOAT_EQ(boxes[2].rect.left(), 340.94531);
-  EXPECT_FLOAT_EQ(boxes[2].rect.top(), 60);
-  EXPECT_FLOAT_EQ(boxes[2].rect.right(), 345.94531);
-  EXPECT_FLOAT_EQ(boxes[2].rect.bottom(), 120);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(InlinePlaceholderLongestLine)) {
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 1;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 26;
-  text_style.letter_spacing = 1;
-  text_style.word_spacing = 5;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  text_style.decoration = TextDecoration::kUnderline;
-  text_style.decoration_color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-
-  txt::PlaceholderRun placeholder_run(50, 50, PlaceholderAlignment::kBaseline,
-                                      TextBaseline::kAlphabetic, 0);
-  builder.AddPlaceholder(placeholder_run);
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth());
-
-  ASSERT_DOUBLE_EQ(paragraph->width_, GetTestCanvasWidth());
-  ASSERT_TRUE(paragraph->longest_line_ < GetTestCanvasWidth());
-  ASSERT_TRUE(paragraph->longest_line_ >= 50);
-}
-
-TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(InlinePlaceholderIntrinsicWidth)) {
-  const char* text = "A ";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::PlaceholderRun placeholder_run(50, 50, PlaceholderAlignment::kBaseline,
-                                      TextBaseline::kAlphabetic, 0);
-
-  txt::ParagraphStyle paragraph_style;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 20;
-  text_style.decoration_color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-  builder.AddPlaceholder(placeholder_run);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth());
-
-  ASSERT_DOUBLE_EQ(paragraph->GetMinIntrinsicWidth(), 50);
-  ASSERT_DOUBLE_EQ(paragraph->GetMaxIntrinsicWidth(), 68);
-}
-
-#if OS_LINUX
-// Tests if manually inserted 0xFFFC characters are replaced to 0xFFFD in order
-// to not interfere with the placeholder box layout.
-TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(InlinePlaceholder0xFFFCParagraph)) {
-  const char* text = "ab\uFFFCcd";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  // Used to generate the replaced version.
-  const char* text2 = "ab\uFFFDcd";
-  auto icu_text2 = icu::UnicodeString::fromUTF8(text2);
-  std::u16string u16_text2(icu_text2.getBuffer(),
-                           icu_text2.getBuffer() + icu_text2.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 14;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 26;
-  text_style.letter_spacing = 1;
-  text_style.word_spacing = 5;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  text_style.decoration = TextDecoration::kUnderline;
-  text_style.decoration_color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-
-  std::vector<uint16_t> truth_text;
-
-  builder.AddText(u16_text);
-  truth_text.insert(truth_text.end(), u16_text2.begin(), u16_text2.end());
-  builder.AddText(u16_text);
-  truth_text.insert(truth_text.end(), u16_text2.begin(), u16_text2.end());
-
-  txt::PlaceholderRun placeholder_run(50, 50, PlaceholderAlignment::kBaseline,
-                                      TextBaseline::kAlphabetic, 25);
-  builder.AddPlaceholder(placeholder_run);
-  truth_text.push_back(0xFFFC);
-
-  builder.AddText(u16_text);
-  truth_text.insert(truth_text.end(), u16_text2.begin(), u16_text2.end());
-  builder.AddText(u16_text);
-  truth_text.insert(truth_text.end(), u16_text2.begin(), u16_text2.end());
-
-  builder.AddPlaceholder(placeholder_run);
-  truth_text.push_back(0xFFFC);
-  builder.AddPlaceholder(placeholder_run);
-  truth_text.push_back(0xFFFC);
-  builder.AddText(u16_text);
-  truth_text.insert(truth_text.end(), u16_text2.begin(), u16_text2.end());
-  builder.AddText(u16_text);
-  truth_text.insert(truth_text.end(), u16_text2.begin(), u16_text2.end());
-  builder.AddPlaceholder(placeholder_run);
-  truth_text.push_back(0xFFFC);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth());
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  for (size_t i = 0; i < truth_text.size(); ++i) {
-    EXPECT_EQ(paragraph->text_[i], truth_text[i]);
-  }
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  paint.setColor(SK_ColorRED);
-
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForPlaceholders();
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 4ull);
-
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 177.83594);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 0);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 227.83594);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 50);
-
-  EXPECT_FLOAT_EQ(boxes[3].rect.left(), 682.50781);
-  EXPECT_FLOAT_EQ(boxes[3].rect.top(), 0);
-  EXPECT_FLOAT_EQ(boxes[3].rect.right(), 732.50781);
-  EXPECT_FLOAT_EQ(boxes[3].rect.bottom(), 50);
-
-  ASSERT_TRUE(Snapshot());
-}
-#endif
-
-TEST_F(ParagraphTest, SimpleRedParagraph) {
-  const char* text = "I am RED";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.color = SK_ColorRED;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth());
-
-  paragraph->Paint(GetCanvas(), 10.0, 15.0);
-
-  ASSERT_EQ(paragraph->text_.size(), std::string{text}.length());
-  for (size_t i = 0; i < u16_text.length(); i++) {
-    ASSERT_EQ(paragraph->text_[i], u16_text[i]);
-  }
-  ASSERT_EQ(paragraph->runs_.runs_.size(), 1ull);
-  ASSERT_EQ(paragraph->runs_.styles_.size(), 2ull);
-  ASSERT_TRUE(paragraph->runs_.styles_[1].equals(text_style));
-  ASSERT_EQ(paragraph->records_[0].style().color, text_style.color);
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, RainbowParagraph) {
-  const char* text1 = "Red Roboto";
-  auto icu_text1 = icu::UnicodeString::fromUTF8(text1);
-  std::u16string u16_text1(icu_text1.getBuffer(),
-                           icu_text1.getBuffer() + icu_text1.length());
-  const char* text2 = "big Greeen Default";
-  auto icu_text2 = icu::UnicodeString::fromUTF8(text2);
-  std::u16string u16_text2(icu_text2.getBuffer(),
-                           icu_text2.getBuffer() + icu_text2.length());
-  const char* text3 = "Defcolor Homemade Apple";
-  auto icu_text3 = icu::UnicodeString::fromUTF8(text3);
-  std::u16string u16_text3(icu_text3.getBuffer(),
-                           icu_text3.getBuffer() + icu_text3.length());
-  const char* text4 = "Small Blue Roboto";
-  auto icu_text4 = icu::UnicodeString::fromUTF8(text4);
-  std::u16string u16_text4(icu_text4.getBuffer(),
-                           icu_text4.getBuffer() + icu_text4.length());
-  const char* text5 =
-      "Continue Last Style With lots of words to check if it overlaps "
-      "properly or not";
-  auto icu_text5 = icu::UnicodeString::fromUTF8(text5);
-  std::u16string u16_text5(icu_text5.getBuffer(),
-                           icu_text5.getBuffer() + icu_text5.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 2;
-  paragraph_style.text_align = TextAlign::left;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style1;
-  text_style1.font_families = std::vector<std::string>(1, "Roboto");
-  text_style1.color = SK_ColorRED;
-
-  builder.PushStyle(text_style1);
-
-  builder.AddText(u16_text1);
-
-  txt::TextStyle text_style2;
-  text_style2.font_size = 50;
-  text_style2.letter_spacing = 10;
-  text_style2.word_spacing = 30;
-  text_style2.font_weight = txt::FontWeight::w600;
-  text_style2.color = SK_ColorGREEN;
-  text_style2.font_families = std::vector<std::string>(1, "Roboto");
-  text_style2.decoration = TextDecoration::kUnderline |
-                           TextDecoration::kOverline |
-                           TextDecoration::kLineThrough;
-  text_style2.decoration_color = SK_ColorBLACK;
-  builder.PushStyle(text_style2);
-
-  builder.AddText(u16_text2);
-
-  txt::TextStyle text_style3;
-  text_style3.font_families = std::vector<std::string>(1, "Homemade Apple");
-  builder.PushStyle(text_style3);
-
-  builder.AddText(u16_text3);
-
-  txt::TextStyle text_style4;
-  text_style4.font_size = 14;
-  text_style4.color = SK_ColorBLUE;
-  text_style4.font_families = std::vector<std::string>(1, "Roboto");
-  text_style4.decoration = TextDecoration::kUnderline |
-                           TextDecoration::kOverline |
-                           TextDecoration::kLineThrough;
-  text_style4.decoration_color = SK_ColorBLACK;
-  builder.PushStyle(text_style4);
-
-  builder.AddText(u16_text4);
-
-  // Extra text to see if it goes to default when there is more text chunks than
-  // styles.
-  builder.AddText(u16_text5);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth());
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  u16_text1 += u16_text2 + u16_text3 + u16_text4;
-  for (size_t i = 0; i < u16_text1.length(); i++) {
-    ASSERT_EQ(paragraph->text_[i], u16_text1[i]);
-  }
-  ASSERT_TRUE(Snapshot());
-  ASSERT_EQ(paragraph->runs_.runs_.size(), 4ull);
-  ASSERT_EQ(paragraph->runs_.styles_.size(), 5ull);
-  ASSERT_TRUE(paragraph->runs_.styles_[1].equals(text_style1));
-  ASSERT_TRUE(paragraph->runs_.styles_[2].equals(text_style2));
-  ASSERT_TRUE(paragraph->runs_.styles_[3].equals(text_style3));
-  ASSERT_TRUE(paragraph->runs_.styles_[4].equals(text_style4));
-  ASSERT_EQ(paragraph->records_[0].style().color, text_style1.color);
-  ASSERT_EQ(paragraph->records_[1].style().color, text_style2.color);
-  ASSERT_EQ(paragraph->records_[2].style().color, text_style3.color);
-  ASSERT_EQ(paragraph->records_[3].style().color, text_style4.color);
-}
-
-// Currently, this should render nothing without a supplied TextStyle.
-TEST_F(ParagraphTest, DefaultStyleParagraph) {
-  const char* text = "No TextStyle! Uh Oh!";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.font_family = "Roboto";
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth());
-
-  paragraph->Paint(GetCanvas(), 10.0, 15.0);
-
-  ASSERT_EQ(paragraph->text_.size(), std::string{text}.length());
-  for (size_t i = 0; i < u16_text.length(); i++) {
-    ASSERT_EQ(paragraph->text_[i], u16_text[i]);
-  }
-  ASSERT_EQ(paragraph->runs_.runs_.size(), 1ull);
-  ASSERT_EQ(paragraph->runs_.styles_.size(), 1ull);
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, BoldParagraph) {
-  const char* text = "This is Red max bold text!";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 60;
-  text_style.letter_spacing = 0;
-  text_style.font_weight = txt::FontWeight::w900;
-  text_style.color = SK_ColorRED;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth());
-
-  paragraph->Paint(GetCanvas(), 10.0, 60.0);
-
-  ASSERT_EQ(paragraph->text_.size(), std::string{text}.length());
-  for (size_t i = 0; i < u16_text.length(); i++) {
-    ASSERT_EQ(paragraph->text_[i], u16_text[i]);
-  }
-  ASSERT_EQ(paragraph->runs_.runs_.size(), 1ull);
-  ASSERT_EQ(paragraph->runs_.styles_.size(), 2ull);
-  ASSERT_TRUE(paragraph->runs_.styles_[1].equals(text_style));
-  ASSERT_EQ(paragraph->records_[0].style().color, text_style.color);
-  ASSERT_TRUE(Snapshot());
-
-  // width_ takes the full available space, but longest_line_ is only the width
-  // of the text, which is less than one line.
-  ASSERT_DOUBLE_EQ(paragraph->width_, GetTestCanvasWidth());
-  ASSERT_TRUE(paragraph->longest_line_ < paragraph->width_);
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kMax;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  std::vector<txt::Paragraph::TextBox> boxes = paragraph->GetRectsForRange(
-      0, strlen(text), rect_height_style, rect_width_style);
-  ASSERT_DOUBLE_EQ(paragraph->longest_line_,
-                   boxes[boxes.size() - 1].rect.right() - boxes[0].rect.left());
-}
-
-TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(HeightOverrideParagraph)) {
-  const char* text = "01234満毎冠行来昼本可\nabcd\n満毎冠行来昼本可";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 10;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 20;
-  text_style.letter_spacing = 0;
-  text_style.word_spacing = 0;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 3.6345;
-  text_style.has_height_override = true;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(550);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  // Tests for GetRectsForRange()
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kIncludeLineSpacingMiddle;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(0, 0, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 0ull);
-
-  boxes =
-      paragraph->GetRectsForRange(0, 40, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 3ull);
-  EXPECT_FLOAT_EQ(boxes[1].rect.left(), 0);
-  EXPECT_NEAR(boxes[1].rect.top(), 92.805778503417969, 0.0001);
-  EXPECT_FLOAT_EQ(boxes[1].rect.right(), 43.851562);
-  EXPECT_NEAR(boxes[1].rect.bottom(), 165.49578857421875, 0.0001);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(HeightOverrideHalfLeadingTextStyle)) {
-  // All 3 lines will have the same typeface.
-  const char* text = "01234満毎冠行来昼本可\nabcd\n満毎冠行来昼本可";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 10;
-  paragraph_style.text_height_behavior = TextHeightBehavior::kAll;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 20;
-  text_style.letter_spacing = 0;
-  text_style.word_spacing = 0;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 3.6345;
-  text_style.has_height_override = true;
-  // Override paragraph_style.text_height_behavior:
-  text_style.half_leading = true;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(550);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  // Tests for GetRectsForRange()
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kTight;
-  Paragraph::RectHeightStyle rect_height_style_max =
-      Paragraph::RectHeightStyle::kMax;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(0, 40, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-
-  std::vector<txt::Paragraph::TextBox> line_boxes = paragraph->GetRectsForRange(
-      0, 40, rect_height_style_max, rect_width_style);
-  EXPECT_EQ(boxes.size(), 3ull);
-  EXPECT_EQ(line_boxes.size(), 3ull);
-
-  const double line_spacing1 = boxes[1].rect.top() - boxes[0].rect.bottom();
-  const double line_spacing2 = boxes[2].rect.top() - boxes[1].rect.bottom();
-
-  EXPECT_EQ(line_spacing1, line_spacing2);
-
-  // half leading.
-  EXPECT_EQ(line_boxes[0].rect.top() - boxes[0].rect.top(),
-            boxes[0].rect.bottom() - line_boxes[0].rect.bottom());
-  EXPECT_EQ(line_boxes[1].rect.top() - boxes[1].rect.top(),
-            boxes[1].rect.bottom() - line_boxes[1].rect.bottom());
-  EXPECT_EQ(line_boxes[2].rect.top() - boxes[2].rect.top(),
-            boxes[2].rect.bottom() - line_boxes[2].rect.bottom());
-  // With half-leadding, the x coordinates should remain the same.
-  EXPECT_FLOAT_EQ(boxes[1].rect.left(), 0);
-  EXPECT_FLOAT_EQ(boxes[1].rect.right(), 43.851562);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(MixedTextHeightBehaviorSameLine)) {
-  // Both runs will still have the same typeface, but with different text height
-  // behaviors.
-  const char* text = "01234満毎冠行来昼本可abcd";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  std::u16string u16_text2(icu_text.getBuffer(),
-                           icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 10;
-  paragraph_style.text_height_behavior = TextHeightBehavior::kAll;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 20;
-  text_style.letter_spacing = 0;
-  text_style.word_spacing = 0;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 3.6345;
-  text_style.has_height_override = true;
-  // First run, with half-leading.
-  text_style.half_leading = true;
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-
-  // Second run with AD-scaling.
-  text_style.half_leading = false;
-
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text2);
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(550);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-  // Tests for GetRectsForRange()
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kTight;
-  Paragraph::RectHeightStyle rect_height_style_max =
-      Paragraph::RectHeightStyle::kMax;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-
-  std::vector<txt::Paragraph::TextBox> boxes = paragraph->GetRectsForRange(
-      0, icu_text.length(), rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-
-  std::vector<txt::Paragraph::TextBox> line_boxes = paragraph->GetRectsForRange(
-      0, icu_text.length(), rect_height_style_max, rect_width_style);
-  // The runs has the same typeface so they should be grouped together.
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_EQ(line_boxes.size(), 1ull);
-
-  const double glyphHeight = boxes[0].rect.height();
-  const double metricsAscent = 18.5546875;
-  const double metricsDescent = 4.8828125;
-  EXPECT_DOUBLE_EQ(glyphHeight, metricsAscent + metricsDescent);
-
-  const double line_height = 3.6345 * 20;
-  const double leading = line_height - glyphHeight;
-
-  // Overall descent is from half-leading and overall ascent is from AD-scaling.
-  EXPECT_NEAR(boxes[0].rect.top() - line_boxes[0].rect.top(),
-              leading * metricsAscent / (metricsAscent + metricsDescent),
-              0.001);
-
-  EXPECT_NEAR(line_boxes[0].rect.bottom() - boxes[0].rect.bottom(),
-              leading * 0.5, 0.001);
-}
-
-TEST_F(ParagraphTest,
-       DISABLE_ON_WINDOWS(MixedTextHeightBehaviorSameLineWithZeroHeight)) {
-  // Both runs will still have the same typeface, but with different text height
-  // behaviors.
-  const char* text = "01234満毎冠行来昼本可abcd";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 10;
-  paragraph_style.text_height_behavior = TextHeightBehavior::kAll;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 20;
-  text_style.letter_spacing = 0;
-  text_style.word_spacing = 0;
-  text_style.color = SK_ColorBLACK;
-  // Set height to 0
-  text_style.height = 0;
-  text_style.has_height_override = true;
-  // First run, with half-leading.
-  text_style.half_leading = true;
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-
-  // Second run with AD-scaling.
-  text_style.half_leading = false;
-
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(550);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-  // Tests for GetRectsForRange()
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kTight;
-  Paragraph::RectHeightStyle rect_height_style_max =
-      Paragraph::RectHeightStyle::kMax;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-
-  std::vector<txt::Paragraph::TextBox> boxes = paragraph->GetRectsForRange(
-      0, icu_text.length(), rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-
-  std::vector<txt::Paragraph::TextBox> line_boxes = paragraph->GetRectsForRange(
-      0, icu_text.length(), rect_height_style_max, rect_width_style);
-  // The runs has the same typeface so they should be grouped together.
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_EQ(line_boxes.size(), 1ull);
-
-  const double glyphHeight = boxes[0].rect.height();
-  const double metricsAscent = 18.5546875;
-  const double metricsDescent = 4.8828125;
-  EXPECT_DOUBLE_EQ(glyphHeight, metricsAscent + metricsDescent);
-
-  // line_height for both styled runs is 0, but the overall line height is not
-  // 0.
-  EXPECT_DOUBLE_EQ(line_boxes[0].rect.height(),
-                   metricsAscent - (metricsAscent + metricsDescent) / 2);
-  EXPECT_LT(boxes[0].rect.top(), 0.0);
-  EXPECT_GT(boxes[0].rect.bottom(), 0.0);
-}
-
-TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(HeightOverrideHalfLeadingStrut)) {
-  // All 3 lines will have the same typeface.
-  const char* text = "01234満毎冠行来昼本可\nabcd\n満毎冠行来昼本可";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 10;
-  paragraph_style.strut_enabled = true;
-  paragraph_style.strut_has_height_override = true;
-  paragraph_style.strut_height = 3.6345;
-  paragraph_style.strut_font_size = 20;
-  paragraph_style.strut_font_families.push_back("Roboto");
-  paragraph_style.strut_half_leading = true;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 20;
-  text_style.letter_spacing = 0;
-  text_style.word_spacing = 0;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 3.6345;
-  text_style.has_height_override = true;
-  text_style.half_leading = true;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(550);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  // Tests for GetRectsForRange()
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kTight;
-  Paragraph::RectHeightStyle rect_height_style_max =
-      Paragraph::RectHeightStyle::kMax;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(0, 40, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-
-  std::vector<txt::Paragraph::TextBox> line_boxes = paragraph->GetRectsForRange(
-      0, 40, rect_height_style_max, rect_width_style);
-  EXPECT_EQ(boxes.size(), 3ull);
-  EXPECT_EQ(line_boxes.size(), 3ull);
-
-  const double line_spacing1 = boxes[1].rect.top() - boxes[0].rect.bottom();
-  const double line_spacing2 = boxes[2].rect.top() - boxes[1].rect.bottom();
-
-  EXPECT_EQ(line_spacing1, line_spacing2);
-
-  // Strut half leading.
-  EXPECT_EQ(line_boxes[0].rect.top() - boxes[0].rect.top(),
-            boxes[0].rect.bottom() - line_boxes[0].rect.bottom());
-  EXPECT_EQ(line_boxes[1].rect.top() - boxes[1].rect.top(),
-            boxes[1].rect.bottom() - line_boxes[1].rect.bottom());
-  EXPECT_EQ(line_boxes[2].rect.top() - boxes[2].rect.top(),
-            boxes[2].rect.bottom() - line_boxes[2].rect.bottom());
-
-  EXPECT_FLOAT_EQ(boxes[1].rect.left(), 0);
-  EXPECT_FLOAT_EQ(boxes[1].rect.right(), 43.851562);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest,
-       DISABLE_ON_WINDOWS(ZeroHeightHalfLeadingStrutForceHeight)) {
-  // All 3 lines will have the same typeface.
-  const char* text = "01234満毎冠行来昼本可abcdn満毎冠行来昼本可";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 10;
-  paragraph_style.strut_enabled = true;
-  paragraph_style.strut_has_height_override = true;
-  paragraph_style.strut_height = 0;
-  // Force strut height.
-  paragraph_style.force_strut_height = true;
-  paragraph_style.strut_font_size = 20;
-  paragraph_style.strut_font_families.push_back("Roboto");
-  paragraph_style.strut_half_leading = true;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 20;
-  text_style.letter_spacing = 0;
-  text_style.word_spacing = 0;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 0;
-  text_style.has_height_override = true;
-
-  // First run, with half-leading.
-  text_style.half_leading = true;
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-
-  // Second run with AD-scaling.
-  text_style.half_leading = false;
-
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(550);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  // Tests for GetRectsForRange()
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kTight;
-  Paragraph::RectHeightStyle rect_height_style_max =
-      Paragraph::RectHeightStyle::kMax;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-
-  std::vector<txt::Paragraph::TextBox> boxes = paragraph->GetRectsForRange(
-      0, icu_text.length(), rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-
-  std::vector<txt::Paragraph::TextBox> line_boxes = paragraph->GetRectsForRange(
-      0, icu_text.length(), rect_height_style_max, rect_width_style);
-  // The runs has the same typeface so they should be grouped together.
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_EQ(line_boxes.size(), 1ull);
-
-  const double glyphHeight = boxes[0].rect.height();
-  const double metricsAscent = 18.5546875;
-  const double metricsDescent = 4.8828125;
-  EXPECT_DOUBLE_EQ(glyphHeight, metricsAscent + metricsDescent);
-
-  EXPECT_DOUBLE_EQ(line_boxes[0].rect.height(), 0.0);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(LeftAlignParagraph)) {
-  const char* text =
-      "This is a very long sentence to test if the text will properly wrap "
-      "around and go to the next line. Sometimes, short sentence. Longer "
-      "sentences are okay too because they are necessary. Very short. "
-      "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
-      "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim "
-      "veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea "
-      "commodo consequat. Duis aute irure dolor in reprehenderit in voluptate "
-      "velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint "
-      "occaecat cupidatat non proident, sunt in culpa qui officia deserunt "
-      "mollit anim id est laborum. "
-      "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
-      "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim "
-      "veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea "
-      "commodo consequat. Duis aute irure dolor in reprehenderit in voluptate "
-      "velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint "
-      "occaecat cupidatat non proident, sunt in culpa qui officia deserunt "
-      "mollit anim id est laborum.";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 14;
-  paragraph_style.text_align = TextAlign::left;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 26;
-  text_style.letter_spacing = 1;
-  text_style.word_spacing = 5;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  text_style.decoration = TextDecoration::kUnderline;
-  text_style.decoration_color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth() - 100);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  ASSERT_TRUE(Snapshot());
-
-  ASSERT_EQ(paragraph->text_.size(), std::string{text}.length());
-  for (size_t i = 0; i < u16_text.length(); i++) {
-    ASSERT_EQ(paragraph->text_[i], u16_text[i]);
-  }
-  ASSERT_EQ(paragraph->runs_.runs_.size(), 1ull);
-  ASSERT_EQ(paragraph->runs_.styles_.size(), 2ull);
-  ASSERT_TRUE(paragraph->runs_.styles_[1].equals(text_style));
-  ASSERT_EQ(paragraph->records_.size(), paragraph_style.max_lines);
-  double expected_y = 24;
-
-  ASSERT_TRUE(paragraph->records_[0].style().equals(text_style));
-  ASSERT_DOUBLE_EQ(paragraph->records_[0].offset().y(), expected_y);
-  expected_y += 30;
-  ASSERT_DOUBLE_EQ(paragraph->records_[0].offset().x(), 0);
-
-  ASSERT_TRUE(paragraph->records_[1].style().equals(text_style));
-  ASSERT_DOUBLE_EQ(paragraph->records_[1].offset().y(), expected_y);
-  expected_y += 30;
-  ASSERT_DOUBLE_EQ(paragraph->records_[1].offset().x(), 0);
-
-  ASSERT_TRUE(paragraph->records_[2].style().equals(text_style));
-  ASSERT_DOUBLE_EQ(paragraph->records_[2].offset().y(), expected_y);
-  expected_y += 30;
-  ASSERT_DOUBLE_EQ(paragraph->records_[2].offset().x(), 0);
-
-  ASSERT_TRUE(paragraph->records_[3].style().equals(text_style));
-  ASSERT_DOUBLE_EQ(paragraph->records_[3].offset().y(), expected_y);
-  expected_y += 30 * 10;
-  ASSERT_DOUBLE_EQ(paragraph->records_[3].offset().x(), 0);
-
-  ASSERT_TRUE(paragraph->records_[13].style().equals(text_style));
-  ASSERT_DOUBLE_EQ(paragraph->records_[13].offset().y(), expected_y);
-  ASSERT_DOUBLE_EQ(paragraph->records_[13].offset().x(), 0);
-
-  ASSERT_EQ(paragraph_style.text_align,
-            paragraph->GetParagraphStyle().text_align);
-
-  // Tests for GetGlyphPositionAtCoordinate()
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(0, 0).position, 0ull);
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(1, 1).position, 0ull);
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(1, 35).position, 68ull);
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(1, 70).position, 134ull);
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(2000, 35).position, 134ull);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(LeftAlignRTLParagraphHitTest)) {
-  // Regression test for https://github.com/flutter/flutter/issues/54969.
-  const char* text = "بمباركة التقليدية قام عن. تصفح";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 1;
-  paragraph_style.text_align = TextAlign::left;
-  paragraph_style.text_direction = TextDirection::rtl;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 26;
-  text_style.letter_spacing = 1;
-  text_style.word_spacing = 5;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  text_style.decoration = TextDecoration::kUnderline;
-  text_style.decoration_color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth());
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  ASSERT_TRUE(Snapshot());
-
-  // Tests for GetGlyphPositionAtCoordinate()
-  ASSERT_EQ(
-      paragraph->GetGlyphPositionAtCoordinate(GetTestCanvasWidth() - 0.5, 0.5)
-          .position,
-      0ull);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(RightAlignParagraph)) {
-  const char* text =
-      "This is a very long sentence to test if the text will properly wrap "
-      "around and go to the next line. Sometimes, short sentence. Longer "
-      "sentences are okay too because they are necessary. Very short. "
-      "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
-      "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim "
-      "veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea "
-      "commodo consequat. Duis aute irure dolor in reprehenderit in voluptate "
-      "velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint "
-      "occaecat cupidatat non proident, sunt in culpa qui officia deserunt "
-      "mollit anim id est laborum. "
-      "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
-      "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim "
-      "veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea "
-      "commodo consequat. Duis aute irure dolor in reprehenderit in voluptate "
-      "velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint "
-      "occaecat cupidatat non proident, sunt in culpa qui officia deserunt "
-      "mollit anim id est laborum.";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 14;
-  paragraph_style.text_align = TextAlign::right;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 26;
-  text_style.letter_spacing = 1;
-  text_style.word_spacing = 5;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  text_style.decoration = TextDecoration::kUnderline;
-  text_style.decoration_color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  int available_width = GetTestCanvasWidth() - 100;
-  paragraph->Layout(available_width);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  ASSERT_TRUE(Snapshot());
-  ASSERT_EQ(paragraph->text_.size(), std::string{text}.length());
-  for (size_t i = 0; i < u16_text.length(); i++) {
-    ASSERT_EQ(paragraph->text_[i], u16_text[i]);
-  }
-  ASSERT_EQ(paragraph->runs_.runs_.size(), 1ull);
-  ASSERT_EQ(paragraph->runs_.styles_.size(), 2ull);
-  ASSERT_TRUE(paragraph->runs_.styles_[1].equals(text_style));
-  // Two records for each due to 'ghost' trailing whitespace run.
-  ASSERT_EQ(paragraph->records_.size(), paragraph_style.max_lines * 2);
-  double expected_y = 24;
-
-  ASSERT_TRUE(paragraph->records_[0].style().equals(text_style));
-  ASSERT_DOUBLE_EQ(paragraph->records_[0].offset().y(), expected_y);
-  expected_y += 30;
-  ASSERT_NEAR(paragraph->records_[0].offset().x(),
-              paragraph->width_ -
-                  paragraph->line_widths_[paragraph->records_[0].line()],
-              2.0);
-
-  // width_ takes the full available space, while longest_line_ wraps the glyphs
-  // as tightly as possible. Even though this text is more than one line long,
-  // no line perfectly spans the width of the full line, so longest_line_ is
-  // less than width_.
-  ASSERT_DOUBLE_EQ(paragraph->width_, available_width);
-  ASSERT_TRUE(paragraph->longest_line_ < available_width);
-  ASSERT_DOUBLE_EQ(paragraph->longest_line_, 880.87109375);
-
-  ASSERT_TRUE(paragraph->records_[2].style().equals(text_style));
-  ASSERT_DOUBLE_EQ(paragraph->records_[2].offset().y(), expected_y);
-  expected_y += 30;
-  ASSERT_NEAR(paragraph->records_[2].offset().x(),
-              paragraph->width_ -
-                  paragraph->line_widths_[paragraph->records_[2].line()],
-              2.0);
-
-  ASSERT_TRUE(paragraph->records_[4].style().equals(text_style));
-  ASSERT_DOUBLE_EQ(paragraph->records_[4].offset().y(), expected_y);
-  expected_y += 30;
-  ASSERT_NEAR(paragraph->records_[4].offset().x(),
-              paragraph->width_ -
-                  paragraph->line_widths_[paragraph->records_[4].line()],
-              2.0);
-
-  ASSERT_TRUE(paragraph->records_[6].style().equals(text_style));
-  ASSERT_DOUBLE_EQ(paragraph->records_[6].offset().y(), expected_y);
-  expected_y += 30 * 10;
-  ASSERT_NEAR(paragraph->records_[6].offset().x(),
-              paragraph->width_ -
-                  paragraph->line_widths_[paragraph->records_[6].line()],
-              2.0);
-
-  ASSERT_TRUE(paragraph->records_[26].style().equals(text_style));
-  ASSERT_DOUBLE_EQ(paragraph->records_[26].offset().y(), expected_y);
-  ASSERT_NEAR(paragraph->records_[26].offset().x(),
-              paragraph->width_ -
-                  paragraph->line_widths_[paragraph->records_[26].line()],
-              2.0);
-
-  ASSERT_EQ(paragraph_style.text_align,
-            paragraph->GetParagraphStyle().text_align);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(CenterAlignParagraph)) {
-  const char* text =
-      "This is a very long sentence to test if the text will properly wrap "
-      "around and go to the next line. Sometimes, short sentence. Longer "
-      "sentences are okay too because they are necessary. Very short. "
-      "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
-      "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim "
-      "veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea "
-      "commodo consequat. Duis aute irure dolor in reprehenderit in voluptate "
-      "velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint "
-      "occaecat cupidatat non proident, sunt in culpa qui officia deserunt "
-      "mollit anim id est laborum. "
-      "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
-      "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim "
-      "veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea "
-      "commodo consequat. Duis aute irure dolor in reprehenderit in voluptate "
-      "velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint "
-      "occaecat cupidatat non proident, sunt in culpa qui officia deserunt "
-      "mollit anim id est laborum.";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 14;
-  paragraph_style.text_align = TextAlign::center;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 26;
-  text_style.letter_spacing = 1;
-  text_style.word_spacing = 5;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  text_style.decoration = TextDecoration::kUnderline;
-  text_style.decoration_color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth() - 100);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  ASSERT_TRUE(Snapshot());
-  ASSERT_EQ(paragraph->text_.size(), std::string{text}.length());
-  for (size_t i = 0; i < u16_text.length(); i++) {
-    ASSERT_EQ(paragraph->text_[i], u16_text[i]);
-  }
-  ASSERT_EQ(paragraph->runs_.runs_.size(), 1ull);
-  ASSERT_EQ(paragraph->runs_.styles_.size(), 2ull);
-  ASSERT_TRUE(paragraph->runs_.styles_[1].equals(text_style));
-  // Two records for each due to 'ghost' trailing whitespace run.
-  ASSERT_EQ(paragraph->records_.size(), paragraph_style.max_lines * 2);
-  double expected_y = 24;
-
-  ASSERT_TRUE(paragraph->records_[0].style().equals(text_style));
-  ASSERT_DOUBLE_EQ(paragraph->records_[0].offset().y(), expected_y);
-  expected_y += 30;
-  ASSERT_NEAR(paragraph->records_[0].offset().x(),
-              (paragraph->width_ -
-               paragraph->line_widths_[paragraph->records_[0].line()]) /
-                  2,
-              2.0);
-
-  ASSERT_TRUE(paragraph->records_[2].style().equals(text_style));
-  ASSERT_DOUBLE_EQ(paragraph->records_[2].offset().y(), expected_y);
-  expected_y += 30;
-  ASSERT_NEAR(paragraph->records_[2].offset().x(),
-              (paragraph->width_ -
-               paragraph->line_widths_[paragraph->records_[2].line()]) /
-                  2,
-              2.0);
-
-  ASSERT_TRUE(paragraph->records_[4].style().equals(text_style));
-  ASSERT_DOUBLE_EQ(paragraph->records_[4].offset().y(), expected_y);
-  expected_y += 30;
-  ASSERT_NEAR(paragraph->records_[4].offset().x(),
-              (paragraph->width_ -
-               paragraph->line_widths_[paragraph->records_[4].line()]) /
-                  2,
-              2.0);
-
-  ASSERT_TRUE(paragraph->records_[6].style().equals(text_style));
-  ASSERT_DOUBLE_EQ(paragraph->records_[6].offset().y(), expected_y);
-  expected_y += 30 * 10;
-  ASSERT_NEAR(paragraph->records_[6].offset().x(),
-              (paragraph->width_ -
-               paragraph->line_widths_[paragraph->records_[6].line()]) /
-                  2,
-              2.0);
-
-  ASSERT_TRUE(paragraph->records_[26].style().equals(text_style));
-  ASSERT_DOUBLE_EQ(paragraph->records_[26].offset().y(), expected_y);
-  ASSERT_NEAR(paragraph->records_[26].offset().x(),
-              (paragraph->width_ -
-               paragraph->line_widths_[paragraph->records_[26].line()]) /
-                  2,
-              2.0);
-
-  ASSERT_EQ(paragraph_style.text_align,
-            paragraph->GetParagraphStyle().text_align);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(JustifyAlignParagraph)) {
-  const char* text =
-      "This is a very long sentence to test if the text will properly wrap "
-      "around and go to the next line. Sometimes, short sentence. Longer "
-      "sentences are okay too because they are necessary. Very short. "
-      "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
-      "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim "
-      "veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea "
-      "commodo consequat. Duis aute irure dolor in reprehenderit in voluptate "
-      "velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint "
-      "occaecat cupidatat non proident, sunt in culpa qui officia deserunt "
-      "mollit anim id est laborum. "
-      "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
-      "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim "
-      "veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea "
-      "commodo consequat. Duis aute irure dolor in reprehenderit in voluptate "
-      "velit esse cillum dolore eu fugiat.";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 14;
-  paragraph_style.text_align = TextAlign::justify;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 26;
-  text_style.letter_spacing = 0;
-  text_style.word_spacing = 5;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  text_style.decoration = TextDecoration::kUnderline;
-  text_style.decoration_color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth() - 100);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  ASSERT_TRUE(Snapshot());
-  ASSERT_EQ(paragraph->text_.size(), std::string{text}.length());
-  for (size_t i = 0; i < u16_text.length(); i++) {
-    ASSERT_EQ(paragraph->text_[i], u16_text[i]);
-  }
-  ASSERT_EQ(paragraph->runs_.runs_.size(), 1ull);
-  ASSERT_EQ(paragraph->runs_.styles_.size(), 2ull);
-  ASSERT_TRUE(paragraph->runs_.styles_[1].equals(text_style));
-  ASSERT_EQ(paragraph->records_.size(), 27ull);
-  double expected_y = 24;
-
-  ASSERT_TRUE(paragraph->records_[0].style().equals(text_style));
-  ASSERT_DOUBLE_EQ(paragraph->records_[0].offset().y(), expected_y);
-  expected_y += 30;
-  ASSERT_DOUBLE_EQ(paragraph->records_[0].offset().x(), 0);
-
-  ASSERT_TRUE(paragraph->records_[2].style().equals(text_style));
-  ASSERT_DOUBLE_EQ(paragraph->records_[2].offset().y(), expected_y);
-  expected_y += 30;
-  ASSERT_DOUBLE_EQ(paragraph->records_[2].offset().x(), 0);
-
-  ASSERT_TRUE(paragraph->records_[4].style().equals(text_style));
-  ASSERT_DOUBLE_EQ(paragraph->records_[4].offset().y(), expected_y);
-  expected_y += 30;
-  ASSERT_DOUBLE_EQ(paragraph->records_[4].offset().x(), 0);
-
-  ASSERT_TRUE(paragraph->records_[6].style().equals(text_style));
-  ASSERT_DOUBLE_EQ(paragraph->records_[6].offset().y(), expected_y);
-  expected_y += 30 * 10;
-  ASSERT_DOUBLE_EQ(paragraph->records_[6].offset().x(), 0);
-
-  ASSERT_TRUE(paragraph->records_[26].style().equals(text_style));
-  ASSERT_DOUBLE_EQ(paragraph->records_[26].offset().y(), expected_y);
-  ASSERT_DOUBLE_EQ(paragraph->records_[26].offset().x(), 0);
-
-  ASSERT_EQ(paragraph_style.text_align,
-            paragraph->GetParagraphStyle().text_align);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(JustifyRTL)) {
-  const char* text =
-      "אאא בּבּבּבּ אאאא בּבּ אאא בּבּבּ אאאאא בּבּבּבּ אאאא בּבּבּבּבּ "
-      "אאאאא בּבּבּבּבּ אאאבּבּבּבּבּבּאאאאא בּבּבּבּבּבּאאאאאבּבּבּבּבּבּ אאאאא בּבּבּבּבּ "
-      "אאאאא בּבּבּבּבּבּ אאאאא בּבּבּבּבּבּ אאאאא בּבּבּבּבּבּ אאאאא בּבּבּבּבּבּ אאאאא בּבּבּבּבּבּ";
-
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 14;
-  paragraph_style.text_align = TextAlign::justify;
-  paragraph_style.text_direction = TextDirection::rtl;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Ahem");
-  text_style.font_size = 26;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  size_t paragraph_width = GetTestCanvasWidth() - 100;
-  paragraph->Layout(paragraph_width);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  auto glyph_line_width = [&paragraph](int index) {
-    size_t second_to_last_position_index =
-        paragraph->glyph_lines_[index].positions.size() - 1;
-    return paragraph->glyph_lines_[index]
-        .positions[second_to_last_position_index]
-        .x_pos.end;
-  };
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  // Tests for GetRectsForRange()
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kMax;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(0, 100, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  ASSERT_EQ(boxes.size(), 5ull);
-
-  paint.setColor(SK_ColorBLUE);
-  boxes = paragraph->GetRectsForRange(240, 250, rect_height_style,
-                                      rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  ASSERT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 588);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 130);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 640);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 156);
-  ASSERT_TRUE(Snapshot());
-
-  // All lines should be justified to the width of the
-  // paragraph.
-  for (size_t i = 0; i < paragraph->glyph_lines_.size(); ++i) {
-    ASSERT_EQ(glyph_line_width(i), paragraph_width);
-  }
-}
-
-TEST_F(ParagraphTest, LINUX_ONLY(JustifyRTLNewLine)) {
-  const char* text =
-      "אאא בּבּבּבּ אאאא\nבּבּ אאא בּבּבּ אאאאא בּבּבּבּ אאאא בּבּבּבּבּ "
-      "אאאאא בּבּבּבּבּ אאאבּבּבּבּבּבּאאאאא בּבּבּבּבּבּאאאאאבּבּבּבּבּבּ אאאאא בּבּבּבּבּ "
-      "אאאאא בּבּבּבּבּבּ אאאאא בּבּבּבּבּבּ אאאאא בּבּבּבּבּבּ אאאאא בּבּבּבּבּבּ אאאאא בּבּבּבּבּבּ";
-
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 14;
-  paragraph_style.text_align = TextAlign::justify;
-  paragraph_style.text_direction = TextDirection::rtl;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Ahem");
-  text_style.font_size = 26;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  size_t paragraph_width = GetTestCanvasWidth() - 100;
-  paragraph->Layout(paragraph_width);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  auto glyph_line_width = [&paragraph](int index) {
-    size_t second_to_last_position_index =
-        paragraph->glyph_lines_[index].positions.size() - 1;
-    return paragraph->glyph_lines_[index]
-        .positions[second_to_last_position_index]
-        .x_pos.end;
-  };
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  ASSERT_TRUE(Snapshot());
-
-  // Tests for GetRectsForRange()
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kMax;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(0, 30, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  ASSERT_EQ(boxes.size(), 2ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 562);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), -1.4305115e-06);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 900);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 26);
-
-  paint.setColor(SK_ColorBLUE);
-  boxes = paragraph->GetRectsForRange(240, 250, rect_height_style,
-                                      rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  ASSERT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 68);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 130);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 120);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 156);
-  ASSERT_TRUE(Snapshot());
-
-  // All lines should be justified to the width of the
-  // paragraph.
-  for (size_t i = 0; i < paragraph->glyph_lines_.size(); ++i) {
-    ASSERT_EQ(glyph_line_width(i), paragraph_width);
-  }
-}
-
-TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(JustifyPlaceholder)) {
-  const char* text1 = "A ";
-  auto icu_text1 = icu::UnicodeString::fromUTF8(text1);
-  std::u16string u16_text1(icu_text1.getBuffer(),
-                           icu_text1.getBuffer() + icu_text1.length());
-
-  txt::PlaceholderRun placeholder_run(60, 60, PlaceholderAlignment::kBaseline,
-                                      TextBaseline::kAlphabetic, 0);
-
-  const char* text2 = " B CCCCC";
-  auto icu_text2 = icu::UnicodeString::fromUTF8(text2);
-  std::u16string u16_text2(icu_text2.getBuffer(),
-                           icu_text2.getBuffer() + icu_text2.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.text_align = TextAlign::justify;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Ahem");
-  text_style.font_size = 20;
-  text_style.decoration_color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text1);
-  builder.AddPlaceholder(placeholder_run);
-  builder.AddText(u16_text2);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(200);
-
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kTight;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-
-  // Check location of placeholder at the center of the line.
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(2, 3, rect_height_style, rect_width_style);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 70);
-
-  // Check location of character B at the end of the line.
-  boxes =
-      paragraph->GetRectsForRange(4, 5, rect_height_style, rect_width_style);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 180);
-}
-
-TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(LeadingSpaceRTL)) {
-  const char* text = " leading space";
-
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 14;
-  paragraph_style.text_align = TextAlign::justify;
-  paragraph_style.text_direction = TextDirection::rtl;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Ahem");
-  text_style.font_size = 26;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  size_t paragraph_width = GetTestCanvasWidth() - 100;
-  paragraph->Layout(paragraph_width);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  // Tests for GetRectsForRange()
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kMax;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(0, 100, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  ASSERT_EQ(boxes.size(), 2ull);
-
-  // This test should crash if behavior regresses.
-}
-
-TEST_F(ParagraphTest, DecorationsParagraph) {
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 14;
-  paragraph_style.text_align = TextAlign::left;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 26;
-  text_style.letter_spacing = 0;
-  text_style.word_spacing = 5;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 2;
-  text_style.decoration = TextDecoration::kUnderline |
-                          TextDecoration::kOverline |
-                          TextDecoration::kLineThrough;
-  text_style.decoration_style = txt::TextDecorationStyle::kSolid;
-  text_style.decoration_color = SK_ColorBLACK;
-  text_style.decoration_thickness_multiplier = 2.0;
-  builder.PushStyle(text_style);
-  builder.AddText(u"This text should be");
-
-  text_style.decoration_style = txt::TextDecorationStyle::kDouble;
-  text_style.decoration_color = SK_ColorBLUE;
-  text_style.decoration_thickness_multiplier = 1.0;
-  builder.PushStyle(text_style);
-  builder.AddText(u" decorated even when");
-
-  text_style.decoration_style = txt::TextDecorationStyle::kDotted;
-  text_style.decoration_color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-  builder.AddText(u" wrapped around to");
-
-  text_style.decoration_style = txt::TextDecorationStyle::kDashed;
-  text_style.decoration_color = SK_ColorBLACK;
-  text_style.decoration_thickness_multiplier = 3.0;
-  builder.PushStyle(text_style);
-  builder.AddText(u" the next line.");
-
-  text_style.decoration_style = txt::TextDecorationStyle::kWavy;
-  text_style.decoration_color = SK_ColorRED;
-  text_style.decoration_thickness_multiplier = 1.0;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u" Otherwise, bad things happen.");
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth() - 100);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  ASSERT_TRUE(Snapshot());
-  ASSERT_EQ(paragraph->runs_.size(), 5ull);
-  ASSERT_EQ(paragraph->records_.size(), 6ull);
-
-  for (size_t i = 0; i < 6; ++i) {
-    ASSERT_EQ(paragraph->records_[i].style().decoration,
-              TextDecoration::kUnderline | TextDecoration::kOverline |
-                  TextDecoration::kLineThrough);
-  }
-
-  ASSERT_EQ(paragraph->records_[0].style().decoration_style,
-            txt::TextDecorationStyle::kSolid);
-  ASSERT_EQ(paragraph->records_[1].style().decoration_style,
-            txt::TextDecorationStyle::kDouble);
-  ASSERT_EQ(paragraph->records_[2].style().decoration_style,
-            txt::TextDecorationStyle::kDotted);
-  ASSERT_EQ(paragraph->records_[3].style().decoration_style,
-            txt::TextDecorationStyle::kDashed);
-  ASSERT_EQ(paragraph->records_[4].style().decoration_style,
-            txt::TextDecorationStyle::kDashed);
-  ASSERT_EQ(paragraph->records_[5].style().decoration_style,
-            txt::TextDecorationStyle::kWavy);
-
-  ASSERT_EQ(paragraph->records_[0].style().decoration_color, SK_ColorBLACK);
-  ASSERT_EQ(paragraph->records_[1].style().decoration_color, SK_ColorBLUE);
-  ASSERT_EQ(paragraph->records_[2].style().decoration_color, SK_ColorBLACK);
-  ASSERT_EQ(paragraph->records_[3].style().decoration_color, SK_ColorBLACK);
-  ASSERT_EQ(paragraph->records_[4].style().decoration_color, SK_ColorBLACK);
-  ASSERT_EQ(paragraph->records_[5].style().decoration_color, SK_ColorRED);
-
-  ASSERT_EQ(paragraph->records_[0].style().decoration_thickness_multiplier,
-            2.0);
-  ASSERT_EQ(paragraph->records_[1].style().decoration_thickness_multiplier,
-            1.0);
-  ASSERT_EQ(paragraph->records_[2].style().decoration_thickness_multiplier,
-            1.0);
-  ASSERT_EQ(paragraph->records_[3].style().decoration_thickness_multiplier,
-            3.0);
-  ASSERT_EQ(paragraph->records_[4].style().decoration_thickness_multiplier,
-            3.0);
-  ASSERT_EQ(paragraph->records_[5].style().decoration_thickness_multiplier,
-            1.0);
-}
-
-TEST_F(ParagraphTest, WavyDecorationParagraph) {
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 14;
-  paragraph_style.text_align = TextAlign::left;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 26;
-  text_style.letter_spacing = 0;
-  text_style.word_spacing = 5;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 2;
-  text_style.decoration = TextDecoration::kUnderline |
-                          TextDecoration::kOverline |
-                          TextDecoration::kLineThrough;
-
-  text_style.decoration_style = txt::TextDecorationStyle::kWavy;
-  text_style.decoration_color = SK_ColorRED;
-  text_style.decoration_thickness_multiplier = 1.0;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u" Otherwise, bad things happen.");
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth() - 100);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  ASSERT_TRUE(Snapshot());
-  ASSERT_EQ(paragraph->runs_.size(), 1ull);
-  ASSERT_EQ(paragraph->records_.size(), 1ull);
-
-  for (size_t i = 0; i < 1; ++i) {
-    ASSERT_EQ(paragraph->records_[i].style().decoration,
-              TextDecoration::kUnderline | TextDecoration::kOverline |
-                  TextDecoration::kLineThrough);
-  }
-
-  ASSERT_EQ(paragraph->records_[0].style().decoration_style,
-            txt::TextDecorationStyle::kWavy);
-
-  ASSERT_EQ(paragraph->records_[0].style().decoration_color, SK_ColorRED);
-
-  ASSERT_EQ(paragraph->records_[0].style().decoration_thickness_multiplier,
-            1.0);
-
-  SkPath path0;
-  SkPath canonical_path0;
-  paragraph->ComputeWavyDecoration(path0, 1, 1, 9.56, 1);
-
-  canonical_path0.moveTo(1, 1);
-  canonical_path0.rQuadTo(1, -1, 2, 0);
-  canonical_path0.rQuadTo(1, 1, 2, 0);
-  canonical_path0.rQuadTo(1, -1, 2, 0);
-  canonical_path0.rQuadTo(1, 1, 2, 0);
-  canonical_path0.rQuadTo(0.78, -0.78, 1.56, -0.3432);
-
-  ASSERT_EQ(path0.countPoints(), canonical_path0.countPoints());
-  for (int i = 0; i < canonical_path0.countPoints(); ++i) {
-    ASSERT_EQ(path0.getPoint(i).x(), canonical_path0.getPoint(i).x());
-    ASSERT_EQ(path0.getPoint(i).y(), canonical_path0.getPoint(i).y());
-  }
-
-  SkPath path1;
-  SkPath canonical_path1;
-  paragraph->ComputeWavyDecoration(path1, 1, 1, 8.35, 1);
-
-  canonical_path1.moveTo(1, 1);
-  canonical_path1.rQuadTo(1, -1, 2, 0);
-  canonical_path1.rQuadTo(1, 1, 2, 0);
-  canonical_path1.rQuadTo(1, -1, 2, 0);
-  canonical_path1.rQuadTo(1, 1, 2, 0);
-  canonical_path1.rQuadTo(0.175, -0.175, 0.35, -0.28875);
-
-  ASSERT_EQ(path1.countPoints(), canonical_path1.countPoints());
-  for (int i = 0; i < canonical_path1.countPoints(); ++i) {
-    ASSERT_EQ(path1.getPoint(i).x(), canonical_path1.getPoint(i).x());
-    ASSERT_EQ(path1.getPoint(i).y(), canonical_path1.getPoint(i).y());
-  }
-
-  SkPath path2;
-  SkPath canonical_path2;
-  paragraph->ComputeWavyDecoration(path2, 1, 1, 10.59, 1);
-
-  canonical_path2.moveTo(1, 1);
-  canonical_path2.rQuadTo(1, -1, 2, 0);
-  canonical_path2.rQuadTo(1, 1, 2, 0);
-  canonical_path2.rQuadTo(1, -1, 2, 0);
-  canonical_path2.rQuadTo(1, 1, 2, 0);
-  canonical_path2.rQuadTo(1, -1, 2, 0);
-  canonical_path2.rQuadTo(0.295, 0.295, 0.59, 0.41595);
-
-  ASSERT_EQ(path2.countPoints(), canonical_path2.countPoints());
-  for (int i = 0; i < canonical_path2.countPoints(); ++i) {
-    ASSERT_EQ(path2.getPoint(i).x(), canonical_path2.getPoint(i).x());
-    ASSERT_EQ(path2.getPoint(i).y(), canonical_path2.getPoint(i).y());
-  }
-
-  SkPath path3;
-  SkPath canonical_path3;
-  paragraph->ComputeWavyDecoration(path3, 1, 1, 11.2, 1);
-
-  canonical_path3.moveTo(1, 1);
-  canonical_path3.rQuadTo(1, -1, 2, 0);
-  canonical_path3.rQuadTo(1, 1, 2, 0);
-  canonical_path3.rQuadTo(1, -1, 2, 0);
-  canonical_path3.rQuadTo(1, 1, 2, 0);
-  canonical_path3.rQuadTo(1, -1, 2, 0);
-  canonical_path3.rQuadTo(0.6, 0.6, 1.2, 0.48);
-
-  ASSERT_EQ(path3.countPoints(), canonical_path3.countPoints());
-  for (int i = 0; i < canonical_path3.countPoints(); ++i) {
-    ASSERT_EQ(path3.getPoint(i).x(), canonical_path3.getPoint(i).x());
-    ASSERT_EQ(path3.getPoint(i).y(), canonical_path3.getPoint(i).y());
-  }
-
-  SkPath path4;
-  SkPath canonical_path4;
-  paragraph->ComputeWavyDecoration(path4, 1, 1, 12, 1);
-
-  canonical_path4.moveTo(1, 1);
-  canonical_path4.rQuadTo(1, -1, 2, 0);
-  canonical_path4.rQuadTo(1, 1, 2, 0);
-  canonical_path4.rQuadTo(1, -1, 2, 0);
-  canonical_path4.rQuadTo(1, 1, 2, 0);
-  canonical_path4.rQuadTo(1, -1, 2, 0);
-  canonical_path4.rQuadTo(1, 1, 2, 0);
-
-  ASSERT_EQ(path4.countPoints(), canonical_path4.countPoints());
-  for (int i = 0; i < canonical_path4.countPoints(); ++i) {
-    ASSERT_EQ(path4.getPoint(i).x(), canonical_path4.getPoint(i).x());
-    ASSERT_EQ(path4.getPoint(i).y(), canonical_path4.getPoint(i).y());
-  }
-}
-
-TEST_F(ParagraphTest, ItalicsParagraph) {
-  txt::ParagraphStyle paragraph_style;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.color = SK_ColorRED;
-  text_style.font_size = 10;
-  builder.PushStyle(text_style);
-  builder.AddText(u"No italic ");
-
-  text_style.font_style = txt::FontStyle::italic;
-  builder.PushStyle(text_style);
-  builder.AddText(u"Yes Italic ");
-
-  builder.Pop();
-  builder.AddText(u"No Italic again.");
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth());
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  ASSERT_EQ(paragraph->runs_.runs_.size(), 3ull);
-  ASSERT_EQ(paragraph->runs_.styles_.size(), 3ull);
-  ASSERT_EQ(paragraph->records_[1].style().color, text_style.color);
-  ASSERT_EQ(paragraph->records_[1].style().font_style, txt::FontStyle::italic);
-  ASSERT_EQ(paragraph->records_[2].style().font_style, txt::FontStyle::normal);
-  ASSERT_EQ(paragraph->records_[0].style().font_style, txt::FontStyle::normal);
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, ChineseParagraph) {
-  const char* text =
-      "左線読設重説切後碁給能上目秘使約。満毎冠行来昼本可必図将発確年。今属場育"
-      "図情闘陰野高備込制詩西校客。審対江置講今固残必託地集済決維駆年策。立得庭"
-      "際輝求佐抗蒼提夜合逃表。注統天言件自謙雅載報紙喪。作画稿愛器灯女書利変探"
-      "訃第金線朝開化建。子戦年帝励害表月幕株漠新期刊人秘。図的海力生禁挙保天戦"
-      "聞条年所在口。";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 14;
-  paragraph_style.text_align = TextAlign::justify;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.color = SK_ColorBLACK;
-  text_style.font_size = 35;
-  text_style.letter_spacing = 2;
-  text_style.font_families = std::vector<std::string>(1, "Source Han Serif CN");
-  text_style.decoration = TextDecoration::kUnderline |
-                          TextDecoration::kOverline |
-                          TextDecoration::kLineThrough;
-  text_style.decoration_style = txt::TextDecorationStyle::kSolid;
-  text_style.decoration_color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth() - 100);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  ASSERT_EQ(paragraph->runs_.runs_.size(), 1ull);
-  ASSERT_EQ(paragraph->runs_.styles_.size(), 2ull);
-  ASSERT_TRUE(paragraph->runs_.styles_[1].equals(text_style));
-  ASSERT_EQ(paragraph->records_[0].style().color, text_style.color);
-  ASSERT_EQ(paragraph->records_.size(), 7ull);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-// TODO(garyq): Support RTL languages.
-TEST_F(ParagraphTest, DISABLED_ArabicParagraph) {
-  const char* text =
-      "من أسر وإعلان الخاصّة وهولندا،, عل قائمة الضغوط بالمطالبة تلك. الصفحة "
-      "بمباركة التقليدية قام عن. تصفح";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 14;
-  paragraph_style.text_align = TextAlign::right;
-  paragraph_style.text_direction = TextDirection::rtl;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.color = SK_ColorBLACK;
-  text_style.font_size = 35;
-  text_style.letter_spacing = 2;
-  text_style.font_families = std::vector<std::string>(1, "Katibeh");
-  text_style.decoration = TextDecoration::kUnderline |
-                          TextDecoration::kOverline |
-                          TextDecoration::kLineThrough;
-  text_style.decoration_style = txt::TextDecorationStyle::kSolid;
-  text_style.decoration_color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth() - 100);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  ASSERT_EQ(paragraph->text_.size(), std::string{text}.length());
-
-  ASSERT_EQ(paragraph->runs_.runs_.size(), 1ull);
-  ASSERT_EQ(paragraph->runs_.styles_.size(), 2ull);
-  ASSERT_TRUE(paragraph->runs_.styles_[1].equals(text_style));
-  ASSERT_EQ(paragraph->records_[0].style().color, text_style.color);
-  ASSERT_EQ(paragraph->records_.size(), 2ull);
-  ASSERT_EQ(paragraph->paragraph_style_.text_direction, TextDirection::rtl);
-
-  for (size_t i = 0; i < u16_text.length(); i++) {
-    ASSERT_EQ(paragraph->text_[i], u16_text[u16_text.length() - i]);
-  }
-
-  ASSERT_TRUE(Snapshot());
-}
-
-// Checks if the rects are in the correct positions after typing spaces in
-// Arabic.
-TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(ArabicRectsParagraph)) {
-  const char* text = "بمباركة التقليدية قام عن. تصفح يد    ";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 14;
-  paragraph_style.text_align = TextAlign::right;
-  paragraph_style.text_direction = TextDirection::rtl;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Noto Naskh Arabic");
-  text_style.font_size = 26;
-  text_style.letter_spacing = 1;
-  text_style.word_spacing = 5;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  text_style.decoration = TextDecoration::kUnderline;
-  text_style.decoration_color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth() - 100);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  // Tests for GetRectsForRange()
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kMax;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(0, 100, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 2ull);
-
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 556.48438);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), -0.26855469);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 900);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 44);
-
-  EXPECT_FLOAT_EQ(boxes[1].rect.left(), 510.03125);
-  EXPECT_FLOAT_EQ(boxes[1].rect.top(), -0.26855469);
-  EXPECT_FLOAT_EQ(boxes[1].rect.right(), 556.98438);
-  EXPECT_FLOAT_EQ(boxes[1].rect.bottom(), 44);
-
-  ASSERT_EQ(paragraph_style.text_align,
-            paragraph->GetParagraphStyle().text_align);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-// Trailing space at the end of the arabic rtl run should be at the left end of
-// the arabic run.
-TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(ArabicRectsLTRLeftAlignParagraph)) {
-  const char* text = "Helloبمباركة التقليدية قام عن. تصفح يد ";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 14;
-  paragraph_style.text_align = TextAlign::left;
-  paragraph_style.text_direction = TextDirection::ltr;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Noto Naskh Arabic");
-  text_style.font_size = 26;
-  text_style.letter_spacing = 1;
-  text_style.word_spacing = 5;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  text_style.decoration = TextDecoration::kUnderline;
-  text_style.decoration_color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth() - 100);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  // Tests for GetRectsForRange()
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kMax;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(36, 40, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 89.425781);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), -0.26855469);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 121.90625);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 44);
-
-  ASSERT_EQ(paragraph_style.text_align,
-            paragraph->GetParagraphStyle().text_align);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-// Trailing space at the end of the arabic rtl run should be at the left end of
-// the arabic run and be a ghost space.
-TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(ArabicRectsLTRRightAlignParagraph)) {
-  const char* text = "Helloبمباركة التقليدية قام عن. تصفح يد ";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 14;
-  paragraph_style.text_align = TextAlign::right;
-  paragraph_style.text_direction = TextDirection::ltr;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Noto Naskh Arabic");
-  text_style.font_size = 26;
-  text_style.letter_spacing = 1;
-  text_style.word_spacing = 5;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  text_style.decoration = TextDecoration::kUnderline;
-  text_style.decoration_color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth() - 100);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  // Tests for GetRectsForRange()
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kMax;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(36, 40, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 2ull);
-
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 556.48438);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), -0.26855469);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 577.72656);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 44);
-
-  EXPECT_FLOAT_EQ(boxes[1].rect.left(), 545.24609);
-  EXPECT_FLOAT_EQ(boxes[1].rect.top(), -0.26855469);
-  EXPECT_FLOAT_EQ(boxes[1].rect.right(), 556.98438);
-  EXPECT_FLOAT_EQ(boxes[1].rect.bottom(), 44);
-
-  ASSERT_EQ(paragraph_style.text_align,
-            paragraph->GetParagraphStyle().text_align);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, GetGlyphPositionAtCoordinateParagraph) {
-  const char* text =
-      "12345 67890 12345 67890 12345 67890 12345 67890 12345 67890 12345 "
-      "67890 12345";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 10;
-  paragraph_style.text_align = TextAlign::left;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 50;
-  text_style.letter_spacing = 1;
-  text_style.word_spacing = 5;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(550);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  ASSERT_TRUE(Snapshot());
-
-  // Tests for GetGlyphPositionAtCoordinate()
-  // NOTE: resulting values can be a few off from their respective positions in
-  // the original text because the final trailing whitespaces are sometimes not
-  // drawn (namely, when using "justify" alignment) and therefore are not active
-  // glyphs.
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(-10000, -10000).position,
-            0ull);
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(-1, -1).position, 0ull);
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(0, 0).position, 0ull);
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(3, 3).position, 0ull);
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(35, 1).position, 1ull);
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(300, 2).position, 11ull);
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(301, 2.2).position, 11ull);
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(302, 2.6).position, 11ull);
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(301, 2.1).position, 11ull);
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(100000, 20).position,
-            18ull);
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(450, 20).position, 16ull);
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(100000, 90).position,
-            36ull);
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(-100000, 90).position,
-            18ull);
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(20, -80).position, 1ull);
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(1, 90).position, 18ull);
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(1, 170).position, 36ull);
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(10000, 180).position,
-            72ull);
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(70, 180).position, 56ull);
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(1, 270).position, 72ull);
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(35, 90).position, 19ull);
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(10000, 10000).position,
-            77ull);
-  ASSERT_EQ(paragraph->GetGlyphPositionAtCoordinate(85, 10000).position, 75ull);
-}
-
-TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(GetRectsForRangeParagraph)) {
-  const char* text =
-      "12345,  \"67890\" 12345 67890 12345 67890 12345 67890 12345 67890 12345 "
-      "67890 12345";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 10;
-  paragraph_style.text_align = TextAlign::left;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 50;
-  text_style.letter_spacing = 0;
-  text_style.font_weight = FontWeight::w500;
-  text_style.word_spacing = 0;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(550);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  // Tests for GetRectsForRange()
-  // NOTE: The base truth values may still need adjustment as the specifics
-  // are adjusted.
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kMax;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(0, 0, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 0ull);
-
-  boxes =
-      paragraph->GetRectsForRange(0, 1, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 0.40625);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 28.417969);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 59);
-
-  paint.setColor(SK_ColorBLUE);
-  boxes =
-      paragraph->GetRectsForRange(2, 8, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 56.835938);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 0.40625);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 177.98438);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 59);
-
-  paint.setColor(SK_ColorGREEN);
-  boxes =
-      paragraph->GetRectsForRange(8, 21, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 177.98438);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 0.40625);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 507.03906);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 59);
-
-  paint.setColor(SK_ColorRED);
-  boxes =
-      paragraph->GetRectsForRange(30, 100, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 4ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 211.37891);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 59.40625);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 463.62891);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 118);
-
-  // TODO(garyq): The following set of vals are definitely wrong and
-  // end of paragraph handling needs to be fixed in a later patch.
-  EXPECT_FLOAT_EQ(boxes[3].rect.left(), 0);
-  EXPECT_FLOAT_EQ(boxes[3].rect.top(), 236.40625);
-  EXPECT_FLOAT_EQ(boxes[3].rect.right(), 142.08984);
-  EXPECT_FLOAT_EQ(boxes[3].rect.bottom(), 295);
-
-  paint.setColor(SK_ColorBLUE);
-  boxes =
-      paragraph->GetRectsForRange(19, 22, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 450.20312);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 0.40625);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 519.49219);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 59);
-
-  paint.setColor(SK_ColorRED);
-  boxes =
-      paragraph->GetRectsForRange(21, 21, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 0ull);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, LINUX_ONLY(GetRectsForRangeTight)) {
-  const char* text =
-      "(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)("
-      "　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)("
-      "　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 10;
-  paragraph_style.text_align = TextAlign::left;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Noto Sans CJK JP");
-  text_style.font_size = 50;
-  text_style.letter_spacing = 0;
-  text_style.font_weight = FontWeight::w500;
-  text_style.word_spacing = 0;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(550);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  // Tests for GetRectsForRange()
-  // NOTE: The base truth values may still need adjustment as the specifics
-  // are adjusted.
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kTight;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(0, 0, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 0ull);
-
-  boxes =
-      paragraph->GetRectsForRange(0, 1, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 0);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 16.898438);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 74);
-
-  paint.setColor(SK_ColorBLUE);
-  boxes =
-      paragraph->GetRectsForRange(2, 8, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 0);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 264.09766);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 74);
-
-  paint.setColor(SK_ColorGREEN);
-  boxes =
-      paragraph->GetRectsForRange(8, 21, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 2ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 264.09766);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 0);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 595.09375);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 74);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest,
-       DISABLE_ON_WINDOWS(GetRectsForRangeIncludeLineSpacingMiddle)) {
-  const char* text =
-      "(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)("
-      "　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)("
-      "　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 10;
-  paragraph_style.text_align = TextAlign::left;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 50;
-  text_style.letter_spacing = 0;
-  text_style.font_weight = FontWeight::w500;
-  text_style.word_spacing = 0;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1.6;
-  text_style.has_height_override = true;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(550);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  // Tests for GetRectsForRange()
-  // NOTE: The base truth values may still need adjustment as the specifics
-  // are adjusted.
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kIncludeLineSpacingMiddle;
-  Paragraph::RectWidthStyle rect_width_style = Paragraph::RectWidthStyle::kMax;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(0, 0, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 0ull);
-
-  boxes =
-      paragraph->GetRectsForRange(0, 1, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 16.946615);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 17.433594);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 88.473305);
-
-  paint.setColor(SK_ColorBLUE);
-  boxes =
-      paragraph->GetRectsForRange(2, 8, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 67.433594);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 16.946615);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 190.01953);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 88.473305);
-
-  paint.setColor(SK_ColorGREEN);
-  boxes =
-      paragraph->GetRectsForRange(8, 21, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 190.01953);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 16.946615);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 508.09375);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 88.473312);
-
-  paint.setColor(SK_ColorRED);
-  boxes =
-      paragraph->GetRectsForRange(30, 150, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 8ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 190.01953);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 88.473312);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 525.72266);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 168.47331);
-
-  EXPECT_FLOAT_EQ(boxes[1].rect.left(), 525.72266);
-  EXPECT_FLOAT_EQ(boxes[1].rect.top(), 88.473312);
-  EXPECT_FLOAT_EQ(boxes[1].rect.right(), 570.05859);
-  EXPECT_FLOAT_EQ(boxes[1].rect.bottom(), 168.4733);
-
-  EXPECT_FLOAT_EQ(boxes[2].rect.left(), 0);
-  EXPECT_FLOAT_EQ(boxes[2].rect.top(), 168.4733);
-  EXPECT_FLOAT_EQ(boxes[2].rect.right(), 531.60547);
-  EXPECT_FLOAT_EQ(boxes[2].rect.bottom(), 248.47331);
-
-  EXPECT_FLOAT_EQ(boxes[3].rect.left(), 531.60547);
-  EXPECT_FLOAT_EQ(boxes[3].rect.top(), 168.4733);
-  EXPECT_FLOAT_EQ(boxes[3].rect.right(), 570.05859);
-  EXPECT_FLOAT_EQ(boxes[3].rect.bottom(), 248.47331);
-
-  EXPECT_FLOAT_EQ(boxes[4].rect.left(), 0);
-  EXPECT_FLOAT_EQ(boxes[4].rect.top(), 248.47331);
-  EXPECT_FLOAT_EQ(boxes[4].rect.right(), 570.05859);
-  EXPECT_FLOAT_EQ(boxes[4].rect.bottom(), 328.4733);
-
-  EXPECT_FLOAT_EQ(boxes[5].rect.left(), 0);
-  EXPECT_FLOAT_EQ(boxes[5].rect.top(), 328.47333);
-  EXPECT_FLOAT_EQ(boxes[5].rect.right(), 570.05859);
-  EXPECT_FLOAT_EQ(boxes[5].rect.bottom(), 408.4733);
-
-  paint.setColor(SK_ColorBLUE);
-  boxes =
-      paragraph->GetRectsForRange(19, 22, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 463.75781);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 16.946615);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 530.26172);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 88.473305);
-
-  paint.setColor(SK_ColorRED);
-  boxes =
-      paragraph->GetRectsForRange(21, 21, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 0ull);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest,
-       DISABLE_ON_WINDOWS(GetRectsForRangeIncludeLineSpacingTop)) {
-  const char* text =
-      "(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)("
-      "　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)("
-      "　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 10;
-  paragraph_style.text_align = TextAlign::left;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 50;
-  text_style.letter_spacing = 0;
-  text_style.font_weight = FontWeight::w500;
-  text_style.word_spacing = 0;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1.6;
-  text_style.has_height_override = true;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(550);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  // Tests for GetRectsForRange()
-  // NOTE: The base truth values may still need adjustment as the specifics
-  // are adjusted.
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kIncludeLineSpacingTop;
-  Paragraph::RectWidthStyle rect_width_style = Paragraph::RectWidthStyle::kMax;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(0, 0, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 0ull);
-
-  boxes =
-      paragraph->GetRectsForRange(0, 1, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 16.946615);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 17.433594);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 80);
-
-  paint.setColor(SK_ColorBLUE);
-  boxes =
-      paragraph->GetRectsForRange(2, 8, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 67.433594);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 16.946615);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 190.01953);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 80);
-
-  paint.setColor(SK_ColorGREEN);
-  boxes =
-      paragraph->GetRectsForRange(8, 21, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 190.01953);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 16.946615);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 508.09375);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 80);
-
-  paint.setColor(SK_ColorRED);
-  boxes =
-      paragraph->GetRectsForRange(30, 150, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 8ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 190.01953);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 80);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 525.72266);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 160);
-
-  EXPECT_FLOAT_EQ(boxes[1].rect.left(), 525.72266);
-  EXPECT_FLOAT_EQ(boxes[1].rect.top(), 80);
-  EXPECT_FLOAT_EQ(boxes[1].rect.right(), 570.05859);
-  EXPECT_FLOAT_EQ(boxes[1].rect.bottom(), 160);
-
-  EXPECT_FLOAT_EQ(boxes[2].rect.left(), 0);
-  EXPECT_FLOAT_EQ(boxes[2].rect.top(), 160);
-  EXPECT_FLOAT_EQ(boxes[2].rect.right(), 531.60547);
-  EXPECT_FLOAT_EQ(boxes[2].rect.bottom(), 240);
-
-  EXPECT_FLOAT_EQ(boxes[3].rect.left(), 531.60547);
-  EXPECT_FLOAT_EQ(boxes[3].rect.top(), 160);
-  EXPECT_FLOAT_EQ(boxes[3].rect.right(), 570.05859);
-  EXPECT_FLOAT_EQ(boxes[3].rect.bottom(), 240);
-
-  EXPECT_FLOAT_EQ(boxes[4].rect.left(), 0);
-  EXPECT_FLOAT_EQ(boxes[4].rect.top(), 240);
-  EXPECT_FLOAT_EQ(boxes[4].rect.right(), 570.05859);
-  EXPECT_FLOAT_EQ(boxes[4].rect.bottom(), 320);
-
-  EXPECT_FLOAT_EQ(boxes[5].rect.left(), 0);
-  EXPECT_FLOAT_EQ(boxes[5].rect.top(), 320);
-  EXPECT_FLOAT_EQ(boxes[5].rect.right(), 570.05859);
-  EXPECT_FLOAT_EQ(boxes[5].rect.bottom(), 400);
-
-  paint.setColor(SK_ColorBLUE);
-  boxes =
-      paragraph->GetRectsForRange(19, 22, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 463.75781);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 16.946615);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 530.26172);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 80);
-
-  paint.setColor(SK_ColorRED);
-  boxes =
-      paragraph->GetRectsForRange(21, 21, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 0ull);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest,
-       DISABLE_ON_WINDOWS(GetRectsForRangeIncludeLineSpacingBottom)) {
-  const char* text =
-      "(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)("
-      "　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)("
-      "　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)(　´･‿･｀)";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 10;
-  paragraph_style.text_align = TextAlign::left;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 50;
-  text_style.letter_spacing = 0;
-  text_style.font_weight = FontWeight::w500;
-  text_style.word_spacing = 0;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1.6;
-  text_style.has_height_override = true;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(550);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  // Tests for GetRectsForRange()
-  // NOTE: The base truth values may still need adjustment as the specifics
-  // are adjusted.
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kIncludeLineSpacingBottom;
-  Paragraph::RectWidthStyle rect_width_style = Paragraph::RectWidthStyle::kMax;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(0, 0, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 0ull);
-
-  boxes =
-      paragraph->GetRectsForRange(0, 1, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 16.946615);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 17.433594);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 96.946609);
-
-  paint.setColor(SK_ColorBLUE);
-  boxes =
-      paragraph->GetRectsForRange(2, 8, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 67.433594);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 16.946615);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 190.01953);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 96.946609);
-
-  paint.setColor(SK_ColorGREEN);
-  boxes =
-      paragraph->GetRectsForRange(8, 21, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 190.01953);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 16.946615);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 508.09375);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 96.946609);
-
-  paint.setColor(SK_ColorRED);
-  boxes =
-      paragraph->GetRectsForRange(30, 150, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 8ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 190.01953);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 96.946617);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 525.72266);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 176.94661);
-
-  EXPECT_FLOAT_EQ(boxes[1].rect.left(), 525.72266);
-  EXPECT_FLOAT_EQ(boxes[1].rect.top(), 96.946617);
-  EXPECT_FLOAT_EQ(boxes[1].rect.right(), 570.05859);
-  EXPECT_FLOAT_EQ(boxes[1].rect.bottom(), 176.94661);
-
-  EXPECT_FLOAT_EQ(boxes[2].rect.left(), 0);
-  EXPECT_FLOAT_EQ(boxes[2].rect.top(), 176.94661);
-  EXPECT_FLOAT_EQ(boxes[2].rect.right(), 531.60547);
-  EXPECT_FLOAT_EQ(boxes[2].rect.bottom(), 256.94662);
-
-  EXPECT_FLOAT_EQ(boxes[3].rect.left(), 531.60547);
-  EXPECT_FLOAT_EQ(boxes[3].rect.top(), 176.94661);
-  EXPECT_FLOAT_EQ(boxes[3].rect.right(), 570.05859);
-  EXPECT_FLOAT_EQ(boxes[3].rect.bottom(), 256.94662);
-
-  EXPECT_FLOAT_EQ(boxes[4].rect.left(), 0);
-  EXPECT_FLOAT_EQ(boxes[4].rect.top(), 256.94662);
-  EXPECT_FLOAT_EQ(boxes[4].rect.right(), 570.05859);
-  EXPECT_FLOAT_EQ(boxes[4].rect.bottom(), 336.94662);
-
-  EXPECT_FLOAT_EQ(boxes[5].rect.left(), 0);
-  EXPECT_FLOAT_EQ(boxes[5].rect.top(), 336.94662);
-  EXPECT_FLOAT_EQ(boxes[5].rect.right(), 570.05859);
-  EXPECT_FLOAT_EQ(boxes[5].rect.bottom(), 416.94662);
-
-  paint.setColor(SK_ColorBLUE);
-  boxes =
-      paragraph->GetRectsForRange(19, 22, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 463.75781);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 16.946615);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 530.26172);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 96.946609);
-
-  paint.setColor(SK_ColorRED);
-  boxes =
-      paragraph->GetRectsForRange(21, 21, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 0ull);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, GetRectsForRangeIncludeCombiningCharacter) {
-  const char* text = "ดีสวัสดีชาวโลกที่น่ารัก";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 10;
-  paragraph_style.text_align = TextAlign::left;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 50;
-  text_style.letter_spacing = 1;
-  text_style.word_spacing = 5;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth() - 100);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kTight;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(0, 0, rect_height_style, rect_width_style);
-  EXPECT_EQ(boxes.size(), 0ull);
-
-  // Case when the sentence starts with a combining character
-  // We should get 0 box for ด because it's already been combined to ดี
-  boxes =
-      paragraph->GetRectsForRange(0, 1, rect_height_style, rect_width_style);
-  EXPECT_EQ(boxes.size(), 0ull);
-
-  boxes =
-      paragraph->GetRectsForRange(1, 2, rect_height_style, rect_width_style);
-  EXPECT_EQ(boxes.size(), 1ull);
-
-  boxes =
-      paragraph->GetRectsForRange(0, 2, rect_height_style, rect_width_style);
-  EXPECT_EQ(boxes.size(), 1ull);
-
-  // Case when the sentence contains a combining character
-  // We should get 0 box for ว because it's already been combined to วั
-  boxes =
-      paragraph->GetRectsForRange(3, 4, rect_height_style, rect_width_style);
-  EXPECT_EQ(boxes.size(), 0ull);
-
-  boxes =
-      paragraph->GetRectsForRange(4, 5, rect_height_style, rect_width_style);
-  EXPECT_EQ(boxes.size(), 1ull);
-
-  boxes =
-      paragraph->GetRectsForRange(3, 5, rect_height_style, rect_width_style);
-  EXPECT_EQ(boxes.size(), 1ull);
-
-  // Case when the sentence contains a combining character that contain 3
-  // characters We should get 0 box for ท and ที because it's already been
-  // combined to ที่
-  boxes =
-      paragraph->GetRectsForRange(14, 15, rect_height_style, rect_width_style);
-  EXPECT_EQ(boxes.size(), 0ull);
-
-  boxes =
-      paragraph->GetRectsForRange(15, 16, rect_height_style, rect_width_style);
-  EXPECT_EQ(boxes.size(), 0ull);
-
-  boxes =
-      paragraph->GetRectsForRange(16, 17, rect_height_style, rect_width_style);
-  EXPECT_EQ(boxes.size(), 1ull);
-
-  boxes =
-      paragraph->GetRectsForRange(14, 17, rect_height_style, rect_width_style);
-  EXPECT_EQ(boxes.size(), 1ull);
-}
-
-TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(GetRectsForRangeCenterParagraph)) {
-  const char* text = "01234  　 ";  // includes ideographic space
-                                    // and english space.
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 10;
-  paragraph_style.text_align = TextAlign::center;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 50;
-  text_style.letter_spacing = 0;
-  text_style.font_weight = FontWeight::w500;
-  text_style.word_spacing = 0;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(550);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  // Tests for GetRectsForRange()
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kMax;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(0, 0, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 0ull);
-
-  boxes =
-      paragraph->GetRectsForRange(0, 1, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 203.95508);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 0.40625);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 232.37305);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 59);
-
-  paint.setColor(SK_ColorBLUE);
-  boxes =
-      paragraph->GetRectsForRange(2, 4, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 260.79102);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 0.40625);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 317.62695);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 59);
-
-  paint.setColor(SK_ColorGREEN);
-  boxes =
-      paragraph->GetRectsForRange(4, 6, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 2ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 317.62695);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 0.40625);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 346.04492);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 59);
-
-  paint.setColor(SK_ColorBLACK);
-  boxes =
-      paragraph->GetRectsForRange(5, 6, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 346.04492);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 0.40625);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 358.49805);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 59);
-
-  paint.setColor(SK_ColorRED);
-  boxes =
-      paragraph->GetRectsForRange(21, 21, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 0ull);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, LINUX_ONLY(GetRectsForRangeParagraphNewlineLeftAlign)) {
-  const char* text = "01234\n\nعab\naعلی\n";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.font_family = "Roboto";
-  paragraph_style.max_lines = 10;
-  paragraph_style.text_direction = TextDirection::ltr;
-  paragraph_style.text_align = TextAlign::left;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = {"Roboto", "Noto Naskh Arabic"};
-  text_style.font_size = 50;
-  text_style.letter_spacing = 0;
-  text_style.font_weight = FontWeight::w500;
-  text_style.word_spacing = 0;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(550);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  // Tests for GetRectsForRange()
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kMax;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(0, 0, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 0ull);
-
-  boxes =
-      paragraph->GetRectsForRange(0, 1, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 0.40625);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 28.417969);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 59);
-
-  paint.setColor(SK_ColorGREEN);
-  boxes =
-      paragraph->GetRectsForRange(6, 7, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 0);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(),
-                  75);  // TODO(garyq): This value can be improved... Should be
-                        // taller, but we need a good way to obtain a height
-                        // without any glyphs on the line.
-
-  boxes =
-      paragraph->GetRectsForRange(10, 11, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 85);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 85);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 160);
-
-  boxes =
-      paragraph->GetRectsForRange(15, 16, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 27);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 27);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 245);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, LINUX_ONLY(GetRectsForRangeParagraphNewlineRightAlign)) {
-  const char* text = "01234\n\nعab\naعلی\n";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.font_family = "Roboto";
-  paragraph_style.max_lines = 10;
-  paragraph_style.text_direction = TextDirection::ltr;
-  paragraph_style.text_align = TextAlign::right;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = {"Roboto", "Noto Naskh Arabic"};
-  text_style.font_size = 50;
-  text_style.letter_spacing = 0;
-  text_style.font_weight = FontWeight::w500;
-  text_style.word_spacing = 0;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(550);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  // Tests for GetRectsForRange()
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kMax;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(0, 0, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 0ull);
-
-  boxes =
-      paragraph->GetRectsForRange(0, 1, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 407.91016);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 0.40625);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 436.32812);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 59);
-
-  paint.setColor(SK_ColorGREEN);
-  boxes =
-      paragraph->GetRectsForRange(6, 7, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 550);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 550);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(),
-                  75);  // TODO(garyq): This value can be improved... Should be
-                        // taller, but we need a good way to obtain a height
-                        // without any glyphs on the line.
-
-  boxes =
-      paragraph->GetRectsForRange(10, 11, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 550);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 550);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 160);
-
-  boxes =
-      paragraph->GetRectsForRange(15, 16, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 478);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 478);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 245);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest,
-       LINUX_ONLY(GetRectsForRangeCenterParagraphNewlineCentered)) {
-  const char* text = "01234\n\nعab\naعلی\n";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.font_family = "Roboto";
-  paragraph_style.max_lines = 10;
-  paragraph_style.text_direction = TextDirection::ltr;
-  paragraph_style.text_align = TextAlign::center;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = {"Roboto", "Noto Naskh Arabic"};
-  text_style.font_size = 50;
-  text_style.letter_spacing = 0;
-  text_style.font_weight = FontWeight::w500;
-  text_style.word_spacing = 0;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(550);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  // Tests for GetRectsForRange()
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kMax;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(0, 0, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 0ull);
-
-  boxes =
-      paragraph->GetRectsForRange(0, 1, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 203.95508);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 0.40625);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 232.37305);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 59);
-
-  paint.setColor(SK_ColorGREEN);
-  boxes =
-      paragraph->GetRectsForRange(6, 7, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 275);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 275);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(),
-                  75);  // TODO(garyq): This value can be improved... Should be
-                        // taller, but we need a good way to obtain a height
-                        // without any glyphs on the line.
-
-  boxes =
-      paragraph->GetRectsForRange(10, 11, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 317);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 317);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 160);
-
-  boxes =
-      paragraph->GetRectsForRange(15, 16, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 252);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 252);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 245);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest,
-       LINUX_ONLY(GetRectsForRangeParagraphNewlineRTLLeftAlign)) {
-  const char* text = "01234\n\nعab\naعلی\n";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.font_family = "Roboto";
-  paragraph_style.max_lines = 10;
-  paragraph_style.text_direction = TextDirection::rtl;
-  paragraph_style.text_align = TextAlign::left;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = {"Roboto", "Noto Naskh Arabic"};
-  text_style.font_size = 50;
-  text_style.letter_spacing = 0;
-  text_style.font_weight = FontWeight::w500;
-  text_style.word_spacing = 0;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(550);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  // Tests for GetRectsForRange()
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kMax;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(0, 0, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 0ull);
-
-  boxes =
-      paragraph->GetRectsForRange(0, 1, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 0.40625);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 28.417969);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 59);
-
-  paint.setColor(SK_ColorGREEN);
-  boxes =
-      paragraph->GetRectsForRange(6, 7, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 0);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(),
-                  75);  // TODO(garyq): This value can be improved... Should be
-                        // taller, but we need a good way to obtain a height
-                        // without any glyphs on the line.
-
-  boxes =
-      paragraph->GetRectsForRange(10, 11, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 55);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 55);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 160);
-
-  boxes =
-      paragraph->GetRectsForRange(15, 16, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 0);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 245);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest,
-       LINUX_ONLY(GetRectsForRangeParagraphNewlineRTLRightAlign)) {
-  const char* text = "01234\n\nعab\naعلی\n";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.font_family = "Roboto";
-  paragraph_style.max_lines = 10;
-  paragraph_style.text_direction = TextDirection::rtl;
-  paragraph_style.text_align = TextAlign::right;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = {"Roboto", "Noto Naskh Arabic"};
-  text_style.font_size = 50;
-  text_style.letter_spacing = 0;
-  text_style.font_weight = FontWeight::w500;
-  text_style.word_spacing = 0;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(550);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  // Tests for GetRectsForRange()
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kMax;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(0, 0, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 0ull);
-
-  boxes =
-      paragraph->GetRectsForRange(0, 1, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 407.91016);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 0.40625);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 436.32812);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 59);
-
-  paint.setColor(SK_ColorGREEN);
-  boxes =
-      paragraph->GetRectsForRange(6, 7, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 550);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 550);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(),
-                  75);  // TODO(garyq): This value can be improved... Should be
-                        // taller, but we need a good way to obtain a height
-                        // without any glyphs on the line.
-
-  boxes =
-      paragraph->GetRectsForRange(10, 11, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 519);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 519);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 160);
-
-  boxes =
-      paragraph->GetRectsForRange(15, 16, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 451);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 451);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 245);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest,
-       LINUX_ONLY(GetRectsForRangeCenterParagraphNewlineRTLCentered)) {
-  const char* text = "01234\n\nعab\naعلی\n";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.font_family = "Roboto";
-  paragraph_style.max_lines = 10;
-  paragraph_style.text_direction = TextDirection::rtl;
-  paragraph_style.text_align = TextAlign::center;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = {"Roboto", "Noto Naskh Arabic"};
-  text_style.font_size = 50;
-  text_style.letter_spacing = 0;
-  text_style.font_weight = FontWeight::w500;
-  text_style.word_spacing = 0;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(550);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  // Tests for GetRectsForRange()
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kMax;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(0, 0, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 0ull);
-
-  boxes =
-      paragraph->GetRectsForRange(0, 1, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 203.95508);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 0.40625);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 232.37305);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 59);
-
-  paint.setColor(SK_ColorGREEN);
-  boxes =
-      paragraph->GetRectsForRange(6, 7, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 275);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 275);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(),
-                  75);  // TODO(garyq): This value can be improved... Should be
-                        // taller, but we need a good way to obtain a height
-                        // without any glyphs on the line.
-
-  boxes =
-      paragraph->GetRectsForRange(10, 11, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 287);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 287);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 160);
-
-  boxes =
-      paragraph->GetRectsForRange(15, 16, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 225);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 225);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 245);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest,
-       DISABLE_ON_WINDOWS(GetRectsForRangeCenterMultiLineParagraph)) {
-  const char* text = "01234  　 \n0123　        ";  // includes ideographic
-                                                    // space and english space.
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 10;
-  paragraph_style.text_align = TextAlign::center;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 50;
-  text_style.letter_spacing = 0;
-  text_style.font_weight = FontWeight::w500;
-  text_style.word_spacing = 0;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(550);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  // Tests for GetRectsForRange()
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kMax;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(0, 0, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 0ull);
-
-  boxes =
-      paragraph->GetRectsForRange(0, 1, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 203.95508);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 0.40625);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 232.37305);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 59);
-
-  paint.setColor(SK_ColorBLUE);
-  boxes =
-      paragraph->GetRectsForRange(2, 4, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 260.79102);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 0.40625);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 317.62695);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 59);
-
-  paint.setColor(SK_ColorGREEN);
-  boxes =
-      paragraph->GetRectsForRange(4, 6, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 2ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 317.62695);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 0.40625);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 346.04492);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 59);
-
-  paint.setColor(SK_ColorBLACK);
-  boxes =
-      paragraph->GetRectsForRange(5, 6, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 346.04492);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 0.40625);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 358.49805);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 59);
-
-  paint.setColor(SK_ColorBLACK);
-  boxes =
-      paragraph->GetRectsForRange(10, 12, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 218.16406);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 59.40625);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 275);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 118);
-
-  paint.setColor(SK_ColorBLACK);
-  boxes =
-      paragraph->GetRectsForRange(14, 18, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 331.83594);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 59.40625);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 419.19531);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 118);
-
-  paint.setColor(SK_ColorRED);
-  boxes =
-      paragraph->GetRectsForRange(21, 21, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 0ull);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, LINUX_ONLY(GetRectsForRangeStrut)) {
-  const char* text = "Chinese 字典";
-
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.strut_enabled = true;
-  paragraph_style.strut_font_families.push_back("Roboto");
-  paragraph_style.strut_font_size = 14;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families.push_back("Noto Sans CJK JP");
-  text_style.font_size = 20;
-  text_style.color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(550);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  std::vector<txt::Paragraph::TextBox> strut_boxes =
-      paragraph->GetRectsForRange(0, 10, Paragraph::RectHeightStyle::kStrut,
-                                  Paragraph::RectWidthStyle::kMax);
-  ASSERT_EQ(strut_boxes.size(), 1ull);
-  const SkRect& strut_rect = strut_boxes.front().rect;
-  paint.setColor(SK_ColorRED);
-  GetCanvas()->drawRect(strut_rect, paint);
-
-  std::vector<txt::Paragraph::TextBox> tight_boxes =
-      paragraph->GetRectsForRange(0, 10, Paragraph::RectHeightStyle::kTight,
-                                  Paragraph::RectWidthStyle::kMax);
-  ASSERT_EQ(tight_boxes.size(), 1ull);
-  const SkRect& tight_rect = tight_boxes.front().rect;
-  paint.setColor(SK_ColorGREEN);
-  GetCanvas()->drawRect(tight_rect, paint);
-
-  EXPECT_FLOAT_EQ(strut_rect.left(), 0);
-  EXPECT_FLOAT_EQ(strut_rect.top(), 10.611719);
-  EXPECT_FLOAT_EQ(strut_rect.right(), 118.61719);
-  EXPECT_FLOAT_EQ(strut_rect.bottom(), 27.017969);
-
-  ASSERT_TRUE(tight_rect.contains(strut_rect));
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(GetRectsForRangeStrutFallback)) {
-  const char* text = "Chinese 字典";
-
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.strut_enabled = false;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families.push_back("Noto Sans CJK JP");
-  text_style.font_size = 20;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(550);
-
-  std::vector<txt::Paragraph::TextBox> strut_boxes =
-      paragraph->GetRectsForRange(0, 10, Paragraph::RectHeightStyle::kStrut,
-                                  Paragraph::RectWidthStyle::kMax);
-  std::vector<txt::Paragraph::TextBox> tight_boxes =
-      paragraph->GetRectsForRange(0, 10, Paragraph::RectHeightStyle::kTight,
-                                  Paragraph::RectWidthStyle::kMax);
-
-  ASSERT_EQ(strut_boxes.size(), 1ull);
-  ASSERT_EQ(tight_boxes.size(), 1ull);
-  ASSERT_EQ(strut_boxes.front().rect, tight_boxes.front().rect);
-}
-
-SkRect GetCoordinatesForGlyphPosition(txt::Paragraph& paragraph, size_t pos) {
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph.GetRectsForRange(pos, pos + 1, Paragraph::RectHeightStyle::kMax,
-                                 Paragraph::RectWidthStyle::kTight);
-  return !boxes.empty() ? boxes.front().rect : SkRect::MakeEmpty();
-}
-
-TEST_F(ParagraphTest, GetWordBoundaryParagraph) {
-  const char* text =
-      "12345  67890 12345 67890 12345 67890 12345 67890 12345 67890 12345 "
-      "67890 12345";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 10;
-  paragraph_style.text_align = TextAlign::left;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 52;
-  text_style.letter_spacing = 1.19039;
-  text_style.word_spacing = 5;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1.5;
-  text_style.has_height_override = true;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(550);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-  paint.setColor(SK_ColorRED);
-
-  SkRect rect = GetCoordinatesForGlyphPosition(*paragraph, 0);
-  GetCanvas()->drawLine(rect.fLeft, rect.fTop, rect.fLeft, rect.fBottom, paint);
-
-  EXPECT_EQ(paragraph->GetWordBoundary(0), txt::Paragraph::Range<size_t>(0, 5));
-  EXPECT_EQ(paragraph->GetWordBoundary(1), txt::Paragraph::Range<size_t>(0, 5));
-  EXPECT_EQ(paragraph->GetWordBoundary(2), txt::Paragraph::Range<size_t>(0, 5));
-  EXPECT_EQ(paragraph->GetWordBoundary(3), txt::Paragraph::Range<size_t>(0, 5));
-  EXPECT_EQ(paragraph->GetWordBoundary(4), txt::Paragraph::Range<size_t>(0, 5));
-  rect = GetCoordinatesForGlyphPosition(*paragraph, 5);
-  GetCanvas()->drawLine(rect.fLeft, rect.fTop, rect.fLeft, rect.fBottom, paint);
-
-  EXPECT_EQ(paragraph->GetWordBoundary(5), txt::Paragraph::Range<size_t>(5, 7));
-  rect = GetCoordinatesForGlyphPosition(*paragraph, 6);
-  GetCanvas()->drawLine(rect.fLeft, rect.fTop, rect.fLeft, rect.fBottom, paint);
-
-  EXPECT_EQ(paragraph->GetWordBoundary(6), txt::Paragraph::Range<size_t>(5, 7));
-  rect = GetCoordinatesForGlyphPosition(*paragraph, 7);
-  GetCanvas()->drawLine(rect.fLeft, rect.fTop, rect.fLeft, rect.fBottom, paint);
-
-  EXPECT_EQ(paragraph->GetWordBoundary(7),
-            txt::Paragraph::Range<size_t>(7, 12));
-  EXPECT_EQ(paragraph->GetWordBoundary(8),
-            txt::Paragraph::Range<size_t>(7, 12));
-  EXPECT_EQ(paragraph->GetWordBoundary(9),
-            txt::Paragraph::Range<size_t>(7, 12));
-  EXPECT_EQ(paragraph->GetWordBoundary(10),
-            txt::Paragraph::Range<size_t>(7, 12));
-  EXPECT_EQ(paragraph->GetWordBoundary(11),
-            txt::Paragraph::Range<size_t>(7, 12));
-  rect = GetCoordinatesForGlyphPosition(*paragraph, 12);
-  GetCanvas()->drawLine(rect.fLeft, rect.fTop, rect.fLeft, rect.fBottom, paint);
-
-  EXPECT_EQ(paragraph->GetWordBoundary(12),
-            txt::Paragraph::Range<size_t>(12, 13));
-  rect = GetCoordinatesForGlyphPosition(*paragraph, 13);
-  GetCanvas()->drawLine(rect.fLeft, rect.fTop, rect.fLeft, rect.fBottom, paint);
-
-  EXPECT_EQ(paragraph->GetWordBoundary(13),
-            txt::Paragraph::Range<size_t>(13, 18));
-  rect = GetCoordinatesForGlyphPosition(*paragraph, 18);
-  GetCanvas()->drawLine(rect.fLeft, rect.fTop, rect.fLeft, rect.fBottom, paint);
-
-  rect = GetCoordinatesForGlyphPosition(*paragraph, 19);
-  GetCanvas()->drawLine(rect.fLeft, rect.fTop, rect.fLeft, rect.fBottom, paint);
-
-  rect = GetCoordinatesForGlyphPosition(*paragraph, 24);
-  GetCanvas()->drawLine(rect.fLeft, rect.fTop, rect.fLeft, rect.fBottom, paint);
-
-  rect = GetCoordinatesForGlyphPosition(*paragraph, 25);
-  GetCanvas()->drawLine(rect.fLeft, rect.fTop, rect.fLeft, rect.fBottom, paint);
-
-  rect = GetCoordinatesForGlyphPosition(*paragraph, 30);
-  GetCanvas()->drawLine(rect.fLeft, rect.fTop, rect.fLeft, rect.fBottom, paint);
-
-  EXPECT_EQ(paragraph->GetWordBoundary(30),
-            txt::Paragraph::Range<size_t>(30, 31));
-  rect = GetCoordinatesForGlyphPosition(*paragraph, 31);
-  GetCanvas()->drawLine(rect.fLeft, rect.fTop, rect.fLeft, rect.fBottom, paint);
-
-  rect = GetCoordinatesForGlyphPosition(*paragraph, icu_text.length() - 5);
-  GetCanvas()->drawLine(rect.fLeft, rect.fTop, rect.fLeft, rect.fBottom, paint);
-
-  EXPECT_EQ(
-      paragraph->GetWordBoundary(icu_text.length() - 1),
-      txt::Paragraph::Range<size_t>(icu_text.length() - 5, icu_text.length()));
-  rect = GetCoordinatesForGlyphPosition(*paragraph, icu_text.length());
-  GetCanvas()->drawLine(rect.fLeft, rect.fTop, rect.fLeft, rect.fBottom, paint);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, SpacingParagraph) {
-  const char* text = "H";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 10;
-  paragraph_style.text_align = TextAlign::left;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 50;
-  text_style.letter_spacing = 20;
-  text_style.word_spacing = 0;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-  builder.Pop();
-
-  text_style.font_size = 50;
-  text_style.letter_spacing = 10;
-  text_style.word_spacing = 0;
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-  builder.Pop();
-
-  text_style.font_size = 50;
-  text_style.letter_spacing = 20;
-  text_style.word_spacing = 0;
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-  builder.Pop();
-
-  text_style.font_size = 50;
-  text_style.letter_spacing = 0;
-  text_style.word_spacing = 0;
-  builder.PushStyle(text_style);
-  builder.AddText(u"|");
-  builder.Pop();
-
-  text_style.font_size = 50;
-  text_style.letter_spacing = 0;
-  text_style.word_spacing = 20;
-  builder.PushStyle(text_style);
-  builder.AddText(u"H ");
-  builder.Pop();
-
-  text_style.font_size = 50;
-  text_style.letter_spacing = 0;
-  text_style.word_spacing = 0;
-  builder.PushStyle(text_style);
-  builder.AddText(u"H ");
-  builder.Pop();
-
-  text_style.font_size = 50;
-  text_style.letter_spacing = 0;
-  text_style.word_spacing = 20;
-  builder.PushStyle(text_style);
-  builder.AddText(u"H ");
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(550);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-  paint.setColor(SK_ColorRED);
-
-  ASSERT_TRUE(Snapshot());
-
-  ASSERT_EQ(paragraph->records_.size(), 7ull);
-  ASSERT_EQ(paragraph->records_[0].style().letter_spacing, 20);
-  ASSERT_EQ(paragraph->records_[1].style().letter_spacing, 10);
-  ASSERT_EQ(paragraph->records_[2].style().letter_spacing, 20);
-
-  ASSERT_EQ(paragraph->records_[4].style().word_spacing, 20);
-  ASSERT_EQ(paragraph->records_[5].style().word_spacing, 0);
-  ASSERT_EQ(paragraph->records_[6].style().word_spacing, 20);
-}
-
-TEST_F(ParagraphTest, LongWordParagraph) {
-  const char* text =
-      "A "
-      "veryverylongwordtoseewherethiswillwraporifitwillatallandifitdoesthenthat"
-      "wouldbeagoodthingbecausethebreakingisworking.";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.break_strategy = minikin::kBreakStrategy_HighQuality;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 31;
-  text_style.letter_spacing = 0;
-  text_style.word_spacing = 0;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth() / 2);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  ASSERT_TRUE(Snapshot());
-  ASSERT_EQ(paragraph->text_.size(), std::string{text}.length());
-  for (size_t i = 0; i < u16_text.length(); i++) {
-    ASSERT_EQ(paragraph->text_[i], u16_text[i]);
-  }
-  ASSERT_EQ(paragraph->runs_.runs_.size(), 1ull);
-  ASSERT_EQ(paragraph->runs_.styles_.size(), 2ull);
-  ASSERT_TRUE(paragraph->runs_.styles_[1].equals(text_style));
-  ASSERT_EQ(paragraph->records_[0].style().color, text_style.color);
-  ASSERT_EQ(paragraph->GetLineCount(), 4ull);
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, LINUX_ONLY(KernScaleParagraph)) {
-  float scale = 3.0f;
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.break_strategy = minikin::kBreakStrategy_HighQuality;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Droid Serif");
-  text_style.font_size = 100 / scale;
-  text_style.letter_spacing = 0;
-  text_style.word_spacing = 0;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  builder.PushStyle(text_style);
-  builder.AddText(u"AVAVAWAH A0 V0 VA To The Lo");
-  builder.PushStyle(text_style);
-  builder.AddText(u"A");
-  builder.PushStyle(text_style);
-  builder.AddText(u"V");
-  text_style.font_size = 14 / scale;
-  builder.PushStyle(text_style);
-  builder.AddText(
-      u" Dialog Text List lots of words to see if kerning works on a bigger "
-      u"set of characters AVAVAW");
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth() / scale);
-  GetCanvas()->scale(scale, scale);
-  paragraph->Paint(GetCanvas(), 0, 0);
-  GetCanvas()->scale(1.0, 1.0);
-  ASSERT_TRUE(Snapshot());
-
-  EXPECT_DOUBLE_EQ(paragraph->records_[0].offset().x(), 0);
-  EXPECT_DOUBLE_EQ(paragraph->records_[1].offset().x(), 0);
-  EXPECT_DOUBLE_EQ(paragraph->records_[2].offset().x(), 207.3671875f);
-  EXPECT_DOUBLE_EQ(paragraph->records_[3].offset().x(), 230.8671875f);
-  EXPECT_DOUBLE_EQ(paragraph->records_[4].offset().x(), 253.35546875f);
-}
-
-TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(NewlineParagraph)) {
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.font_family = "Roboto";
-  paragraph_style.break_strategy = minikin::kBreakStrategy_HighQuality;
-
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 60;
-  text_style.letter_spacing = 0;
-  text_style.word_spacing = 0;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  builder.PushStyle(text_style);
-  builder.AddText(
-      u"line1\nline2 test1 test2 test3 test4 test5 test6 test7\nline3\n\nline4 "
-      "test1 test2 test3 test4");
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth() - 300);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  ASSERT_TRUE(Snapshot());
-
-  ASSERT_EQ(paragraph->records_.size(), 6ull);
-  EXPECT_DOUBLE_EQ(paragraph->records_[0].offset().x(), 0);
-  EXPECT_DOUBLE_EQ(paragraph->records_[1].offset().x(), 0);
-  EXPECT_DOUBLE_EQ(paragraph->records_[1].offset().y(), 126);
-  EXPECT_DOUBLE_EQ(paragraph->records_[2].offset().x(), 0);
-  EXPECT_DOUBLE_EQ(paragraph->records_[3].offset().x(), 0);
-  EXPECT_DOUBLE_EQ(paragraph->records_[4].offset().x(), 0);
-  EXPECT_DOUBLE_EQ(paragraph->records_[3].offset().y(), 266);
-  EXPECT_DOUBLE_EQ(paragraph->records_[5].offset().x(), 0);
-}
-
-TEST_F(ParagraphTest, LINUX_ONLY(EmojiParagraph)) {
-  const char* text =
-      "😀😃😄😁😆😅😂🤣☺😇🙂😍😡😟😢😻👽💩👍👎🙏👌👋👄👁👦👼👨‍🚀👨‍🚒🙋‍♂️👳👨‍👨‍👧‍👧\
-      💼👡👠☂🐶🐰🐻🐼🐷🐒🐵🐔🐧🐦🐋🐟🐡🕸🐌🐴🐊🐄🐪🐘🌸🌏🔥🌟🌚🌝💦💧\
-      ❄🍕🍔🍟🥝🍱🕶🎩🏈⚽🚴‍♀️🎻🎼🎹🚨🚎🚐⚓🛳🚀🚁🏪🏢🖱⏰📱💾💉📉🛏🔑🔓\
-      📁🗓📊❤💯🚫🔻♠♣🕓❗🏳🏁🏳️‍🌈🇮🇹🇱🇷🇺🇸🇬🇧🇨🇳🇧🇴";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.color = SK_ColorBLACK;
-  text_style.font_families = std::vector<std::string>(1, "Noto Color Emoji");
-  text_style.font_size = 50;
-  text_style.decoration = TextDecoration::kUnderline;
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth());
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  ASSERT_TRUE(Snapshot());
-
-  for (size_t i = 0; i < u16_text.length(); i++) {
-    ASSERT_EQ(paragraph->text_[i], u16_text[i]);
-  }
-
-  ASSERT_EQ(paragraph->records_.size(), 8ull);
-
-  EXPECT_EQ(paragraph->records_[0].line(), 0ull);
-  EXPECT_EQ(paragraph->records_[1].line(), 1ull);
-  EXPECT_EQ(paragraph->records_[2].line(), 2ull);
-  EXPECT_EQ(paragraph->records_[3].line(), 3ull);
-  EXPECT_EQ(paragraph->records_[7].line(), 7ull);
-}
-
-TEST_F(ParagraphTest, LINUX_ONLY(EmojiMultiLineRectsParagraph)) {
-  // clang-format off
-  const char* text =
-      "👩‍👩‍👦👩‍👩‍👧‍👧🇺🇸👩‍👩‍👦👩‍👩‍👧‍👧i🇺🇸👩‍👩‍👦👩‍👩‍👧‍👧🇺🇸👩‍👩‍👦👩‍👩‍👧‍👧🇺🇸"
-      "👩‍👩‍👦👩‍👩‍👧‍👧🇺🇸👩‍👩‍👦👩‍👩‍👧‍👧🇺🇸👩‍👩‍👦👩‍👩‍👧‍👧🇺🇸👩‍👩‍👦👩‍👩‍👧‍👧🇺🇸"
-      "👩‍👩‍👦👩‍👩‍👧‍👧🇺🇸👩‍👩‍👦👩‍👩‍👧‍👧🇺🇸👩‍👩‍👦👩‍👩‍👧‍👧🇺🇸👩‍👩‍👦👩‍👩‍👧‍👧🇺🇸"
-      "👩‍👩‍👦👩‍👩‍👧‍👧🇺🇸👩‍👩‍👦👩‍👩‍👧‍👧🇺🇸👩‍👩‍👦👩‍👩‍👧‍👧🇺🇸👩‍👩‍👦👩‍👩‍👧‍👧🇺🇸"
-      "❄🍕🍔🍟🥝🍱🕶🎩🏈⚽🚴‍♀️🎻🎼🎹🚨🚎🚐⚓🛳🚀🚁🏪🏢🖱⏰📱💾💉📉🛏🔑🔓"
-      "📁🗓📊❤💯🚫🔻♠♣🕓❗🏳🏁🏳️‍🌈🇮🇹🇱🇷🇺🇸🇬🇧🇨🇳🇧🇴";
-  // clang-format on
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.color = SK_ColorBLACK;
-  text_style.font_families = std::vector<std::string>(1, "Noto Color Emoji");
-  text_style.font_size = 50;
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth() - 300);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  for (size_t i = 0; i < u16_text.length(); i++) {
-    ASSERT_EQ(paragraph->text_[i], u16_text[i]);
-  }
-
-  ASSERT_EQ(paragraph->records_.size(), 10ull);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  // Tests for GetRectsForRange()
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kTight;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(0, 0, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 0ull);
-
-  // GetPositionForCoordinates should not return inter-emoji positions.
-  boxes = paragraph->GetRectsForRange(
-      0, paragraph->GetGlyphPositionAtCoordinate(610, 100).position,
-      rect_height_style, rect_width_style);
-  paint.setColor(SK_ColorGREEN);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 2ull);
-  EXPECT_FLOAT_EQ(boxes[1].rect.left(), 0);
-  EXPECT_FLOAT_EQ(boxes[1].rect.right(), 622.53906);
-
-  boxes = paragraph->GetRectsForRange(
-      0, paragraph->GetGlyphPositionAtCoordinate(580, 100).position,
-      rect_height_style, rect_width_style);
-  paint.setColor(SK_ColorGREEN);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 2ull);
-  EXPECT_FLOAT_EQ(boxes[1].rect.left(), 0);
-  EXPECT_FLOAT_EQ(boxes[1].rect.right(), 560.28516);
-
-  boxes = paragraph->GetRectsForRange(
-      0, paragraph->GetGlyphPositionAtCoordinate(560, 100).position,
-      rect_height_style, rect_width_style);
-  paint.setColor(SK_ColorGREEN);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 2ull);
-  EXPECT_FLOAT_EQ(boxes[1].rect.left(), 0);
-  EXPECT_FLOAT_EQ(boxes[1].rect.right(), 560.28516);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, LINUX_ONLY(LigatureCharacters)) {
-  const char* text = "Office";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth());
-
-  // The "ffi" characters will be combined into one glyph in the Roboto font.
-  // Verify that the graphemes within the glyph have distinct boxes.
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(1, 2, Paragraph::RectHeightStyle::kTight,
-                                  Paragraph::RectWidthStyle::kTight);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 9.625);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 13.608073);
-
-  boxes = paragraph->GetRectsForRange(2, 4, Paragraph::RectHeightStyle::kTight,
-                                      Paragraph::RectWidthStyle::kTight);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 13.608073);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 21.574219);
-}
-
-TEST_F(ParagraphTest, HyphenBreakParagraph) {
-  const char* text =
-      "A "
-      "very-very-long-Hyphen-word-to-see-where-this-will-wrap-or-if-it-will-at-"
-      "all-and-if-it-does-thent-hat-"
-      "would-be-a-good-thing-because-the-breaking.";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.break_strategy = minikin::kBreakStrategy_HighQuality;
-
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 31;
-  text_style.letter_spacing = 0;
-  text_style.word_spacing = 0;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth() / 2);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  ASSERT_TRUE(Snapshot());
-  ASSERT_EQ(paragraph->text_.size(), std::string{text}.length());
-  for (size_t i = 0; i < u16_text.length(); i++) {
-    ASSERT_EQ(paragraph->text_[i], u16_text[i]);
-  }
-  ASSERT_EQ(paragraph->runs_.runs_.size(), 1ull);
-  ASSERT_EQ(paragraph->runs_.styles_.size(), 2ull);
-  ASSERT_TRUE(paragraph->runs_.styles_[1].equals(text_style));
-  ASSERT_EQ(paragraph->records_[0].style().color, text_style.color);
-  ASSERT_EQ(paragraph->GetLineCount(), 5ull);
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, RepeatLayoutParagraph) {
-  const char* text =
-      "Sentence to layout at diff widths to get diff line counts. short words "
-      "short words short words short words short words short words short words "
-      "short words short words short words short words short words short words "
-      "end";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.break_strategy = minikin::kBreakStrategy_HighQuality;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 31;
-  text_style.letter_spacing = 0;
-  text_style.word_spacing = 0;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  // First Layout.
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(300);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  ASSERT_TRUE(Snapshot());
-  ASSERT_EQ(paragraph->text_.size(), std::string{text}.length());
-  for (size_t i = 0; i < u16_text.length(); i++) {
-    ASSERT_EQ(paragraph->text_[i], u16_text[i]);
-  }
-  ASSERT_EQ(paragraph->runs_.runs_.size(), 1ull);
-  ASSERT_EQ(paragraph->runs_.styles_.size(), 2ull);
-  ASSERT_TRUE(paragraph->runs_.styles_[1].equals(text_style));
-  ASSERT_EQ(paragraph->records_[0].style().color, text_style.color);
-  ASSERT_EQ(paragraph->GetLineCount(), 12ull);
-
-  // Second Layout.
-  SetUp();
-  paragraph->Layout(600);
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  ASSERT_TRUE(Snapshot());
-  ASSERT_EQ(paragraph->text_.size(), std::string{text}.length());
-  for (size_t i = 0; i < u16_text.length(); i++) {
-    ASSERT_EQ(paragraph->text_[i], u16_text[i]);
-  }
-  ASSERT_EQ(paragraph->runs_.runs_.size(), 1ull);
-  ASSERT_EQ(paragraph->runs_.styles_.size(), 2ull);
-  ASSERT_TRUE(paragraph->runs_.styles_[1].equals(text_style));
-  ASSERT_EQ(paragraph->records_[0].style().color, text_style.color);
-  ASSERT_EQ(paragraph->GetLineCount(), 6ull);
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, Ellipsize) {
-  const char* text =
-      "This is a very long sentence to test if the text will properly wrap "
-      "around and go to the next line. Sometimes, short sentence. Longer "
-      "sentences are okay too because they are necessary. Very short. ";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.ellipsis = u"\u2026";
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth());
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  ASSERT_TRUE(Snapshot());
-
-  // Check that the ellipsizer limited the text to one line and did not wrap
-  // to a second line.
-  ASSERT_EQ(paragraph->records_.size(), 1ull);
-}
-
-// Test for shifting when identical runs of text are built as multiple runs.
-TEST_F(ParagraphTest, UnderlineShiftParagraph) {
-  const char* text1 = "fluttser ";
-  auto icu_text1 = icu::UnicodeString::fromUTF8(text1);
-  std::u16string u16_text1(icu_text1.getBuffer(),
-                           icu_text1.getBuffer() + icu_text1.length());
-  const char* text2 = "mdje";
-  auto icu_text2 = icu::UnicodeString::fromUTF8(text2);
-  std::u16string u16_text2(icu_text2.getBuffer(),
-                           icu_text2.getBuffer() + icu_text2.length());
-  const char* text3 = "fluttser mdje";
-  auto icu_text3 = icu::UnicodeString::fromUTF8(text3);
-  std::u16string u16_text3(icu_text3.getBuffer(),
-                           icu_text3.getBuffer() + icu_text3.length());
-
-  // Construct multi-run paragraph.
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 2;
-  paragraph_style.text_align = TextAlign::left;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style1;
-  text_style1.color = SK_ColorBLACK;
-  text_style1.font_families = std::vector<std::string>(1, "Roboto");
-  builder.PushStyle(text_style1);
-
-  builder.AddText(u16_text1);
-
-  txt::TextStyle text_style2;
-  text_style2.color = SK_ColorBLACK;
-  text_style2.font_families = std::vector<std::string>(1, "Roboto");
-  text_style2.decoration = TextDecoration::kUnderline;
-  text_style2.decoration_color = SK_ColorBLACK;
-  builder.PushStyle(text_style2);
-
-  builder.AddText(u16_text2);
-
-  builder.Pop();
-
-  // Construct single run paragraph.
-  txt::ParagraphBuilderTxt builder2(paragraph_style, GetTestFontCollection());
-
-  builder2.PushStyle(text_style1);
-
-  builder2.AddText(u16_text3);
-
-  builder2.Pop();
-
-  // Build multi-run paragraph
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth());
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  // Build single-run paragraph
-  auto paragraph2 = BuildParagraph(builder2);
-  paragraph2->Layout(GetTestCanvasWidth());
-
-  paragraph2->Paint(GetCanvas(), 0, 25);
-
-  ASSERT_TRUE(Snapshot());
-
-  ASSERT_EQ(paragraph->records_[0].GetRunWidth() +
-                paragraph->records_[1].GetRunWidth(),
-            paragraph2->records_[0].GetRunWidth());
-
-  auto rects1 =
-      paragraph->GetRectsForRange(0, 12, Paragraph::RectHeightStyle::kMax,
-                                  Paragraph::RectWidthStyle::kTight);
-  auto rects2 =
-      paragraph2->GetRectsForRange(0, 12, Paragraph::RectHeightStyle::kMax,
-                                   Paragraph::RectWidthStyle::kTight);
-
-  for (size_t i = 0; i < 12; ++i) {
-    auto r1 = GetCoordinatesForGlyphPosition(*paragraph, i);
-    auto r2 = GetCoordinatesForGlyphPosition(*paragraph2, i);
-
-    ASSERT_EQ(r1.fLeft, r2.fLeft);
-    ASSERT_EQ(r1.fRight, r2.fRight);
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <memory>
+#include "display_list/dl_color.h"
+#include "display_list/dl_paint.h"
+#include "display_list/dl_tile_mode.h"
+#include "display_list/effects/dl_color_source.h"
+#include "display_list/utils/dl_receiver_utils.h"
+#include "gtest/gtest.h"
+#include "include/core/SkScalar.h"
+#include "runtime/test_font_data.h"
+#include "skia/paragraph_builder_skia.h"
+#include "testing/canvas_test.h"
+
+namespace flutter {
+namespace testing {
+
+//------------------------------------------------------------------------------
+/// @brief      A custom |DlOpReceiver| that records some |DlOps| it receives.
+class DlOpRecorder final : public virtual DlOpReceiver,
+                           private IgnoreAttributeDispatchHelper,
+                           private IgnoreClipDispatchHelper,
+                           private IgnoreDrawDispatchHelper,
+                           private IgnoreTransformDispatchHelper {
+ public:
+  int lineCount() const { return lines_.size(); }
+  int rectCount() const { return rects_.size(); }
+  int pathCount() const { return paths_.size(); }
+  int textFrameCount() const { return text_frames_.size(); }
+  int blobCount() const { return blobs_.size(); }
+  bool hasPathEffect() const { return path_effect_ != nullptr; }
+
+ private:
+  void drawLine(const SkPoint& p0, const SkPoint& p1) override {
+    lines_.emplace_back(p0, p1);
+  }
+
+  void drawTextFrame(const std::shared_ptr<impeller::TextFrame>& text_frame,
+                     SkScalar x,
+                     SkScalar y) override {
+    text_frames_.push_back(text_frame);
+  }
+
+  void drawTextBlob(const sk_sp<SkTextBlob> blob,
+                    SkScalar x,
+                    SkScalar y) override {
+    blobs_.push_back(blob);
+  }
+
+  void drawRect(const SkRect& rect) override { rects_.push_back(rect); }
+
+  void drawPath(const SkPath& path) override { paths_.push_back(path); }
+
+  void setPathEffect(const DlPathEffect* effect) override {
+    path_effect_ = effect;
   }
-}
-
-TEST_F(ParagraphTest, SimpleShadow) {
-  const char* text = "Hello World Text Dialog";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
 
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.color = SK_ColorBLACK;
-  text_style.text_shadows.emplace_back(SK_ColorBLACK, SkPoint::Make(2.0, 2.0),
-                                       1.0);
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
+  std::vector<std::shared_ptr<impeller::TextFrame>> text_frames_;
+  std::vector<sk_sp<SkTextBlob>> blobs_;
+  std::vector<std::pair<SkPoint, SkPoint>> lines_;
+  std::vector<SkRect> rects_;
+  std::vector<SkPath> paths_;
+  const DlPathEffect* path_effect_;
+};
 
-  builder.Pop();
+template <typename T>
+class PainterTestBase : public CanvasTestBase<T> {
+ public:
+  PainterTestBase() = default;
 
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth());
-  paragraph->Paint(GetCanvas(), 10.0, 15.0);
+  void PretendImpellerIsEnabled(bool impeller) { impeller_ = impeller; }
 
-  ASSERT_EQ(paragraph->text_.size(), std::string{text}.length());
-  for (size_t i = 0; i < u16_text.length(); i++) {
-    ASSERT_EQ(paragraph->text_[i], u16_text[i]);
+ protected:
+  txt::TextStyle makeDecoratedStyle(txt::TextDecorationStyle style) {
+    auto t_style = txt::TextStyle();
+    t_style.color = SK_ColorBLACK;                // default
+    t_style.font_weight = txt::FontWeight::w400;  // normal
+    t_style.font_size = 14;                       // default
+    t_style.decoration = txt::TextDecoration::kUnderline;
+    t_style.decoration_style = style;
+    t_style.decoration_color = SK_ColorBLACK;
+    t_style.font_families.push_back("ahem");
+    return t_style;
   }
-  ASSERT_EQ(paragraph->runs_.runs_.size(), 1ull);
-  ASSERT_EQ(paragraph->runs_.styles_.size(), 2ull);
-  ASSERT_TRUE(paragraph->runs_.styles_[1].equals(text_style));
-  ASSERT_EQ(paragraph->records_[0].style().color, text_style.color);
-
-  ASSERT_EQ(paragraph->records_[0].style().text_shadows.size(), 1ull);
-  ASSERT_EQ(paragraph->records_[0].style().text_shadows[0],
-            text_style.text_shadows[0]);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, ComplexShadow) {
-  const char* text = "Text Chunk ";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
 
-  txt::ParagraphStyle paragraph_style;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.color = SK_ColorBLACK;
-  text_style.text_shadows.emplace_back(SK_ColorBLACK, SkPoint::Make(2.0, 2.0),
-                                       1.0);
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-
-  text_style.text_shadows.emplace_back(SK_ColorRED, SkPoint::Make(2.0, 2.0),
-                                       5.0);
-  text_style.text_shadows.emplace_back(SK_ColorGREEN, SkPoint::Make(10.0, -5.0),
-                                       3.0);
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-
-  builder.Pop();
-  builder.AddText(u16_text);
-
-  text_style.text_shadows.emplace_back(SK_ColorGREEN, SkPoint::Make(0.0, -1.0),
-                                       0.0);
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-
-  builder.Pop();
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth());
-  paragraph->Paint(GetCanvas(), 10.0, 15.0);
-
-  ASSERT_EQ(paragraph->text_.size(), std::string{text}.length() * 5);
-  for (size_t i = 0; i < u16_text.length(); i++) {
-    ASSERT_EQ(paragraph->text_[i], u16_text[i]);
+  txt::TextStyle makeStyle() {
+    auto t_style = txt::TextStyle();
+    t_style.color = SK_ColorBLACK;                // default
+    t_style.font_weight = txt::FontWeight::w400;  // normal
+    t_style.font_size = 14;                       // default
+    t_style.font_families.push_back("ahem");
+    return t_style;
   }
 
-  ASSERT_EQ(paragraph->records_[0].style().text_shadows.size(), 1ull);
-  ASSERT_EQ(paragraph->records_[1].style().text_shadows.size(), 3ull);
-  ASSERT_EQ(paragraph->records_[2].style().text_shadows.size(), 1ull);
-  ASSERT_EQ(paragraph->records_[3].style().text_shadows.size(), 4ull);
-  ASSERT_EQ(paragraph->records_[4].style().text_shadows.size(), 1ull);
-  for (size_t i = 0; i < 1; ++i)
-    ASSERT_EQ(paragraph->records_[0].style().text_shadows[i],
-              text_style.text_shadows[i]);
-  for (size_t i = 0; i < 3; ++i)
-    ASSERT_EQ(paragraph->records_[1].style().text_shadows[i],
-              text_style.text_shadows[i]);
-  for (size_t i = 0; i < 1; ++i)
-    ASSERT_EQ(paragraph->records_[2].style().text_shadows[i],
-              text_style.text_shadows[i]);
-  for (size_t i = 0; i < 4; ++i)
-    ASSERT_EQ(paragraph->records_[3].style().text_shadows[i],
-              text_style.text_shadows[i]);
-  for (size_t i = 0; i < 1; ++i)
-    ASSERT_EQ(paragraph->records_[4].style().text_shadows[i],
-              text_style.text_shadows[i]);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, DISABLE_ON_MAC(BaselineParagraph)) {
-  const char* text =
-      "左線読設Byg後碁給能上目秘使約。満毎冠行来昼本可必図将発確年。今属場育"
-      "図情闘陰野高備込制詩西校客。審対江置講今固残必託地集済決維駆年策。立得";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 14;
-  paragraph_style.text_align = TextAlign::justify;
-  paragraph_style.height = 1.5;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.color = SK_ColorBLACK;
-  text_style.font_size = 55;
-  text_style.letter_spacing = 2;
-  text_style.font_families = std::vector<std::string>(1, "Source Han Serif CN");
-  text_style.decoration_style = txt::TextDecorationStyle::kSolid;
-  text_style.decoration_color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth() - 100);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-  paint.setColor(SK_ColorRED);
-  GetCanvas()->drawLine(0, paragraph->GetIdeographicBaseline(),
-                        paragraph->GetMaxWidth(),
-                        paragraph->GetIdeographicBaseline(), paint);
-
-  paint.setColor(SK_ColorGREEN);
-
-  GetCanvas()->drawLine(0, paragraph->GetAlphabeticBaseline(),
-                        paragraph->GetMaxWidth(),
-                        paragraph->GetAlphabeticBaseline(), paint);
-  ASSERT_DOUBLE_EQ(paragraph->GetIdeographicBaseline(), 79.035000801086426);
-  ASSERT_DOUBLE_EQ(paragraph->GetAlphabeticBaseline(), 63.305000305175781);
-
-  ASSERT_TRUE(Snapshot());
-}
-
-TEST_F(ParagraphTest, FontFallbackParagraph) {
-  const char* text = "Roboto 字典 ";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-  const char* text2 = "Homemade Apple 字典";
-  icu_text = icu::UnicodeString::fromUTF8(text2);
-  std::u16string u16_text2(icu_text.getBuffer(),
-                           icu_text.getBuffer() + icu_text.length());
-  const char* text3 = "Chinese 字典";
-  icu_text = icu::UnicodeString::fromUTF8(text3);
-  std::u16string u16_text3(icu_text.getBuffer(),
-                           icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  // No chinese fallback provided, should not be able to render the chinese.
-  text_style.font_families = std::vector<std::string>(1, "Not a real font");
-  text_style.font_families.push_back("Also a fake font");
-  text_style.font_families.push_back("So fake it is obvious");
-  text_style.font_families.push_back("Next one should be a real font...");
-  text_style.font_families.push_back("Roboto");
-  text_style.font_families.push_back("another fake one in between");
-  text_style.font_families.push_back("Homemade Apple");
-  text_style.color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-
-  // Japanese version of the chinese should be rendered.
-  text_style.font_families = std::vector<std::string>(1, "Not a real font");
-  text_style.font_families.push_back("Also a fake font");
-  text_style.font_families.push_back("So fake it is obvious");
-  text_style.font_families.push_back("Homemade Apple");
-  text_style.font_families.push_back("Next one should be a real font...");
-  text_style.font_families.push_back("Roboto");
-  text_style.font_families.push_back("another fake one in between");
-  text_style.font_families.push_back("Noto Sans CJK JP");
-  text_style.font_families.push_back("Source Han Serif CN");
-  text_style.color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text2);
-
-  // Chinese font defiend first
-  text_style.font_families = std::vector<std::string>(1, "Not a real font");
-  text_style.font_families.push_back("Also a fake font");
-  text_style.font_families.push_back("So fake it is obvious");
-  text_style.font_families.push_back("Homemade Apple");
-  text_style.font_families.push_back("Next one should be a real font...");
-  text_style.font_families.push_back("Roboto");
-  text_style.font_families.push_back("another fake one in between");
-  text_style.font_families.push_back("Source Han Serif CN");
-  text_style.font_families.push_back("Noto Sans CJK JP");
-  text_style.color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text3);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth());
-
-  paragraph->Paint(GetCanvas(), 10.0, 15.0);
-
-  ASSERT_TRUE(Snapshot());
-
-  ASSERT_EQ(paragraph->records_.size(), 5ull);
-  ASSERT_DOUBLE_EQ(paragraph->records_[0].GetRunWidth(), 64.2109375);
-  ASSERT_DOUBLE_EQ(paragraph->records_[1].GetRunWidth(), 139.1328125);
-  ASSERT_DOUBLE_EQ(paragraph->records_[2].GetRunWidth(), 28);
-  ASSERT_DOUBLE_EQ(paragraph->records_[3].GetRunWidth(), 62.25);
-  ASSERT_DOUBLE_EQ(paragraph->records_[4].GetRunWidth(), 28);
-  // When a different font is resolved, then the metrics are different.
-  ASSERT_TRUE(paragraph->records_[2].metrics().fTop -
-                  paragraph->records_[4].metrics().fTop !=
-              0);
-  ASSERT_TRUE(paragraph->records_[2].metrics().fAscent -
-                  paragraph->records_[4].metrics().fAscent !=
-              0);
-  ASSERT_TRUE(paragraph->records_[2].metrics().fDescent -
-                  paragraph->records_[4].metrics().fDescent !=
-              0);
-  ASSERT_TRUE(paragraph->records_[2].metrics().fBottom -
-                  paragraph->records_[4].metrics().fBottom !=
-              0);
-  ASSERT_TRUE(paragraph->records_[2].metrics().fAvgCharWidth -
-                  paragraph->records_[4].metrics().fAvgCharWidth !=
-              0);
-}
-
-TEST_F(ParagraphTest, LINUX_ONLY(StrutParagraph1)) {
-  // The chinese extra height should be absorbed by the strut.
-  const char* text = "01234満毎冠p来É本可\nabcd\n満毎É行p昼本可";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 10;
-  paragraph_style.strut_font_families = std::vector<std::string>(1, "BlahFake");
-  paragraph_style.strut_font_families.push_back("ahem");
-  paragraph_style.strut_font_size = 50;
-  paragraph_style.strut_height = 1.8;
-  paragraph_style.strut_has_height_override = true;
-  paragraph_style.strut_leading = 0.1;
-  paragraph_style.strut_enabled = true;
-
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "ahem");
-  text_style.font_families.push_back("ahem");
-  text_style.font_size = 50;
-  text_style.letter_spacing = 0;
-  text_style.font_weight = FontWeight::w500;
-  text_style.word_spacing = 0;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = .5;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(550);
+  sk_sp<DisplayList> draw(txt::TextStyle style) const {
+    auto pb_skia = makeParagraphBuilder();
+    pb_skia.PushStyle(style);
+    pb_skia.AddText(u"Hello World!");
+    pb_skia.Pop();
 
-  paragraph->Paint(GetCanvas(), 0, 0);
+    auto builder = DisplayListBuilder();
+    auto paragraph = pb_skia.Build();
+    paragraph->Layout(10000);
+    paragraph->Paint(&builder, 0, 0);
 
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  // Tests for GetRectsForRange()
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kTight;
-  Paragraph::RectHeightStyle rect_height_max_style =
-      Paragraph::RectHeightStyle::kMax;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(0, 0, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
+    return builder.Build();
   }
-  EXPECT_EQ(boxes.size(), 0ull);
 
-  boxes =
-      paragraph->GetRectsForRange(0, 1, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
+ private:
+  std::shared_ptr<txt::FontCollection> makeFontCollection() const {
+    auto f_collection = std::make_shared<txt::FontCollection>();
+    auto font_provider = std::make_unique<txt::TypefaceFontAssetProvider>();
+    for (auto& font : GetTestFontData()) {
+      font_provider->RegisterTypeface(font);
+    }
+    auto manager = sk_make_sp<txt::AssetFontManager>(std::move(font_provider));
+    f_collection->SetAssetFontManager(manager);
+    return f_collection;
   }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
-  EXPECT_NEAR(boxes[0].rect.top(), 34.5, 0.0001);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 50);
-  EXPECT_NEAR(boxes[0].rect.bottom(), 84.5, 0.0001);
 
-  boxes = paragraph->GetRectsForRange(0, 1, rect_height_max_style,
-                                      rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
+  txt::ParagraphBuilderSkia makeParagraphBuilder() const {
+    auto p_style = txt::ParagraphStyle();
+    auto f_collection = makeFontCollection();
+    return txt::ParagraphBuilderSkia(p_style, f_collection, impeller_);
   }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
-  EXPECT_NEAR(boxes[0].rect.top(), 0, 0.0001);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 50);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 95);
 
-  boxes =
-      paragraph->GetRectsForRange(6, 10, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 300);
-  EXPECT_NEAR(boxes[0].rect.top(), 34.5, 0.0001);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 500);
-  EXPECT_NEAR(boxes[0].rect.bottom(), 84.5, 0.0001);
-  ;
+  bool impeller_ = false;
+};
 
-  boxes = paragraph->GetRectsForRange(6, 10, rect_height_max_style,
-                                      rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 300);
-  EXPECT_NEAR(boxes[0].rect.top(), 0, 0.0001);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 500);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 95);
+using PainterTest = PainterTestBase<::testing::Test>;
 
-  boxes = paragraph->GetRectsForRange(14, 16, rect_height_max_style,
-                                      rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
-  EXPECT_NEAR(boxes[0].rect.top(), 190, 0.0001);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 100);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 285);
+TEST_F(PainterTest, DrawsSolidLineSkia) {
+  PretendImpellerIsEnabled(false);
 
-  boxes = paragraph->GetRectsForRange(20, 25, rect_height_max_style,
-                                      rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 50);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 285);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 300);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 380);
+  auto recorder = DlOpRecorder();
+  draw(makeDecoratedStyle(txt::TextDecorationStyle::kSolid))
+      ->Dispatch(recorder);
 
-  ASSERT_TRUE(Snapshot());
+  // Skia may draw a solid underline as a filled rectangle:
+  // https://skia.googlesource.com/skia/+/refs/heads/main/modules/skparagraph/src/Decorations.cpp#91
+  EXPECT_EQ(recorder.rectCount(), 1);
+  EXPECT_FALSE(recorder.hasPathEffect());
 }
 
-TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(StrutParagraph2)) {
-  // This string is all one size and smaller than the strut metrics.
-  const char* text = "01234ABCDEFGH\nabcd\nABCDEFGH";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 10;
-  paragraph_style.strut_font_families = std::vector<std::string>(1, "ahem");
-  paragraph_style.strut_font_size = 50;
-  paragraph_style.strut_height = 1.6;
-  paragraph_style.strut_has_height_override = true;
-  paragraph_style.strut_enabled = true;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "ahem");
-  text_style.font_families.push_back("ahem");
-  text_style.font_size = 50;
-  text_style.letter_spacing = 0;
-  text_style.font_weight = FontWeight::w500;
-  text_style.word_spacing = 0;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(550);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  // Tests for GetRectsForRange()
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kTight;
-  Paragraph::RectHeightStyle rect_height_max_style =
-      Paragraph::RectHeightStyle::kMax;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(0, 0, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 0ull);
-
-  boxes =
-      paragraph->GetRectsForRange(0, 1, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
-  EXPECT_NEAR(boxes[0].rect.top(), 24, 0.0001);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 50);
-  EXPECT_NEAR(boxes[0].rect.bottom(), 74, 0.0001);
-
-  boxes = paragraph->GetRectsForRange(0, 1, rect_height_max_style,
-                                      rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
-  EXPECT_NEAR(boxes[0].rect.top(), 0, 0.0001);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 50);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 80);
-
-  boxes =
-      paragraph->GetRectsForRange(6, 10, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 300);
-  EXPECT_NEAR(boxes[0].rect.top(), 24, 0.0001);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 500);
-  EXPECT_NEAR(boxes[0].rect.bottom(), 74, 0.0001);
-
-  boxes = paragraph->GetRectsForRange(6, 10, rect_height_max_style,
-                                      rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 300);
-  EXPECT_NEAR(boxes[0].rect.top(), 0, 0.0001);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 500);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 80);
-
-  boxes = paragraph->GetRectsForRange(14, 16, rect_height_max_style,
-                                      rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
-  EXPECT_NEAR(boxes[0].rect.top(), 160, 0.0001);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 100);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 240);
+TEST_F(PainterTest, DrawDashedLineSkia) {
+  PretendImpellerIsEnabled(false);
 
-  boxes = paragraph->GetRectsForRange(20, 25, rect_height_max_style,
-                                      rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 50);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 240);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 300);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 320);
+  auto recorder = DlOpRecorder();
+  draw(makeDecoratedStyle(txt::TextDecorationStyle::kDashed))
+      ->Dispatch(recorder);
 
-  ASSERT_TRUE(Snapshot());
+  // Skia draws a dashed underline as a filled rectangle with a path effect.
+  EXPECT_EQ(recorder.lineCount(), 1);
+  EXPECT_TRUE(recorder.hasPathEffect());
 }
 
-TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(StrutParagraph3)) {
-  // The strut is too small to absorb the extra chinese height, but the english
-  // second line height is increased due to strut.
-  const char* text = "01234満毎p行来昼本可\nabcd\n満毎冠行来昼本可";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 10;
-  paragraph_style.strut_font_families = std::vector<std::string>(1, "ahem");
-  paragraph_style.strut_font_size = 50;
-  paragraph_style.strut_height = 1.2;
-  paragraph_style.strut_has_height_override = true;
-  paragraph_style.strut_enabled = true;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "ahem");
-  text_style.font_families.push_back("ahem");
-  text_style.font_size = 50;
-  text_style.letter_spacing = 0;
-  text_style.font_weight = FontWeight::w500;
-  text_style.word_spacing = 0;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(550);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  // Tests for GetRectsForRange()
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kTight;
-  Paragraph::RectHeightStyle rect_height_max_style =
-      Paragraph::RectHeightStyle::kMax;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(0, 0, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 0ull);
-
-  boxes =
-      paragraph->GetRectsForRange(0, 1, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
-  EXPECT_NEAR(boxes[0].rect.top(), 8, 0.0001);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 50);
-  EXPECT_NEAR(boxes[0].rect.bottom(), 58, 0.0001);
-
-  boxes = paragraph->GetRectsForRange(0, 1, rect_height_max_style,
-                                      rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
-  EXPECT_NEAR(boxes[0].rect.top(), 0, 0.0001);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 50);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 60);
-
-  boxes =
-      paragraph->GetRectsForRange(6, 10, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 300);
-  EXPECT_NEAR(boxes[0].rect.top(), 8, 0.0001);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 500);
-  EXPECT_NEAR(boxes[0].rect.bottom(), 58, 0.0001);
-
-  boxes = paragraph->GetRectsForRange(6, 10, rect_height_max_style,
-                                      rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 300);
-  EXPECT_NEAR(boxes[0].rect.top(), 0, 0.0001);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 500);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 60);
-
-  boxes = paragraph->GetRectsForRange(14, 16, rect_height_max_style,
-                                      rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 120);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 100);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 180);
+#ifdef IMPELLER_SUPPORTS_RENDERING
+TEST_F(PainterTest, DrawsSolidLineImpeller) {
+  PretendImpellerIsEnabled(true);
 
-  boxes = paragraph->GetRectsForRange(20, 25, rect_height_max_style,
-                                      rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 50);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 180);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 300);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 240);
+  auto recorder = DlOpRecorder();
+  draw(makeDecoratedStyle(txt::TextDecorationStyle::kSolid))
+      ->Dispatch(recorder);
 
-  ASSERT_TRUE(Snapshot());
+  // Skia may draw a solid underline as a filled rectangle:
+  // https://skia.googlesource.com/skia/+/refs/heads/main/modules/skparagraph/src/Decorations.cpp#91
+  EXPECT_EQ(recorder.rectCount(), 1);
+  EXPECT_FALSE(recorder.hasPathEffect());
 }
 
-TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(StrutForceParagraph)) {
-  // The strut is too small to absorb the extra chinese height, but the english
-  // second line height is increased due to strut.
-  const char* text = "01234満毎冠行来昼本可\nabcd\n満毎冠行来昼本可";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 10;
-  paragraph_style.strut_font_families = std::vector<std::string>(1, "ahem");
-  paragraph_style.strut_font_size = 50;
-  paragraph_style.strut_height = 1.5;
-  paragraph_style.strut_has_height_override = true;
-  paragraph_style.strut_leading = 0.1;
-  paragraph_style.force_strut_height = true;
-  paragraph_style.strut_enabled = true;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "ahem");
-  text_style.font_families.push_back("ahem");
-  text_style.font_size = 50;
-  text_style.letter_spacing = 0;
-  text_style.word_spacing = 0;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(550);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  // Tests for GetRectsForRange()
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kTight;
-  Paragraph::RectHeightStyle rect_height_max_style =
-      Paragraph::RectHeightStyle::kMax;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(0, 0, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 0ull);
-
-  boxes =
-      paragraph->GetRectsForRange(0, 1, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
-  EXPECT_NEAR(boxes[0].rect.top(), 22.5, 0.0001);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 50);
-  EXPECT_NEAR(boxes[0].rect.bottom(), 72.5, 0.0001);
-
-  boxes = paragraph->GetRectsForRange(0, 1, rect_height_max_style,
-                                      rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
-  EXPECT_NEAR(boxes[0].rect.top(), 0, 0.0001);
-  ;
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 50);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 80);
-
-  boxes =
-      paragraph->GetRectsForRange(6, 10, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 300);
-  EXPECT_NEAR(boxes[0].rect.top(), 22.5, 0.0001);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 500);
-  EXPECT_NEAR(boxes[0].rect.bottom(), 72.5, 0.0001);
-
-  boxes = paragraph->GetRectsForRange(6, 10, rect_height_max_style,
-                                      rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 300);
-  EXPECT_NEAR(boxes[0].rect.top(), 0, 0.0001);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 500);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 80);
-
-  boxes = paragraph->GetRectsForRange(14, 16, rect_height_max_style,
-                                      rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
-  EXPECT_NEAR(boxes[0].rect.top(), 160, 0.0001);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 100);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 240);
+TEST_F(PainterTest, DrawDashedLineImpeller) {
+  PretendImpellerIsEnabled(true);
 
-  boxes = paragraph->GetRectsForRange(20, 25, rect_height_max_style,
-                                      rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 50);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 240);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 300);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 320);
+  auto recorder = DlOpRecorder();
+  draw(makeDecoratedStyle(txt::TextDecorationStyle::kDashed))
+      ->Dispatch(recorder);
 
-  ASSERT_TRUE(Snapshot());
+  // Impeller draws a dashed underline as a path.
+  EXPECT_EQ(recorder.pathCount(), 1);
+  EXPECT_FALSE(recorder.hasPathEffect());
 }
 
-// The height override is disabled for this test. Direct metrics from the font.
-TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(StrutDefaultParagraph)) {
-  const char* text = "01234満毎冠行来昼本可\nabcd\n満毎冠行来昼本可";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.max_lines = 10;
-  paragraph_style.strut_font_families = std::vector<std::string>(1, "ahem");
-  paragraph_style.strut_font_size = 50;
-  paragraph_style.strut_height = 1.5;
-  paragraph_style.strut_leading = 0.1;
-  paragraph_style.force_strut_height = false;
-  paragraph_style.strut_enabled = true;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "ahem");
-  text_style.font_families.push_back("ahem");
-  text_style.font_size = 20;
-  text_style.letter_spacing = 0;
-  text_style.word_spacing = 0;
-  text_style.color = SK_ColorBLACK;
-  text_style.height = 1;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(550);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
+TEST_F(PainterTest, DrawTextFrameImpeller) {
+  PretendImpellerIsEnabled(true);
 
-  // Tests for GetRectsForRange()
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kTight;
-  Paragraph::RectHeightStyle rect_height_strut_style =
-      Paragraph::RectHeightStyle::kStrut;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(0, 0, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 0ull);
-
-  boxes =
-      paragraph->GetRectsForRange(0, 1, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
-  EXPECT_NEAR(boxes[0].rect.top(), 26.5, 0.0001);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 20);
-  EXPECT_NEAR(boxes[0].rect.bottom(), 46.5, 0.0001);
-
-  boxes = paragraph->GetRectsForRange(0, 2, rect_height_strut_style,
-                                      rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
-  EXPECT_NEAR(boxes[0].rect.top(), 2.5, 0.0001);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 40);
-  EXPECT_NEAR(boxes[0].rect.bottom(), 52.5, 0.0001);
+  auto recorder = DlOpRecorder();
+  draw(makeStyle())->Dispatch(recorder);
 
-  ASSERT_TRUE(Snapshot());
+  EXPECT_EQ(recorder.textFrameCount(), 1);
+  EXPECT_EQ(recorder.blobCount(), 0);
 }
 
-TEST_F(ParagraphTest, FontFeaturesParagraph) {
-  const char* text = "12ab\n";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.color = SK_ColorBLACK;
-  text_style.font_features.SetFeature("tnum", 1);
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-
-  text_style.font_features.SetFeature("tnum", 0);
-  text_style.font_features.SetFeature("pnum", 1);
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
+TEST_F(PainterTest, DrawStrokedTextImpeller) {
+  PretendImpellerIsEnabled(true);
 
-  builder.Pop();
-  builder.Pop();
+  auto style = makeStyle();
+  // What is your shtyle?
+  DlPaint foreground;
+  foreground.setDrawStyle(DlDrawStyle::kStroke);
+  style.foreground = foreground;
 
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth());
+  auto recorder = DlOpRecorder();
+  draw(style)->Dispatch(recorder);
 
-  paragraph->Paint(GetCanvas(), 10.0, 15.0);
-
-  ASSERT_EQ(paragraph->glyph_lines_.size(), 3ull);
-
-  // Tabular numbers should have equal widths.
-  const txt::ParagraphTxt::GlyphLine& tnum_line = paragraph->glyph_lines_[0];
-  ASSERT_EQ(tnum_line.positions.size(), 4ull);
-  EXPECT_FLOAT_EQ(tnum_line.positions[0].x_pos.width(),
-                  tnum_line.positions[1].x_pos.width());
-
-  // Proportional numbers should have variable widths.
-  const txt::ParagraphTxt::GlyphLine& pnum_line = paragraph->glyph_lines_[1];
-  ASSERT_EQ(pnum_line.positions.size(), 4ull);
-  EXPECT_NE(pnum_line.positions[0].x_pos.width(),
-            pnum_line.positions[1].x_pos.width());
-
-  // Alphabetic characters should be unaffected.
-  EXPECT_FLOAT_EQ(tnum_line.positions[2].x_pos.width(),
-                  pnum_line.positions[2].x_pos.width());
-
-  ASSERT_TRUE(Snapshot());
+  EXPECT_EQ(recorder.textFrameCount(), 0);
+  EXPECT_EQ(recorder.blobCount(), 0);
+  EXPECT_EQ(recorder.pathCount(), 1);
 }
 
-TEST_F(ParagraphTest, KhmerLineBreaker) {
-  const char* text = "និងក្មេងចង់ផ្ទៃសមុទ្រសែនខៀវស្រងាត់";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.font_families = std::vector<std::string>(1, "Noto Sans Khmer");
-  text_style.font_size = 24;
-  text_style.color = SK_ColorBLACK;
-  builder.PushStyle(text_style);
-
-  builder.AddText(u16_text);
+TEST_F(PainterTest, DrawTextWithGradientImpeller) {
+  PretendImpellerIsEnabled(true);
 
-  builder.Pop();
+  auto style = makeStyle();
+  // how do you like my shtyle?
+  DlPaint foreground;
+  std::vector<DlColor> colors = {DlColor::kRed(), DlColor::kCyan()};
+  std::vector<float> stops = {0.0, 1.0};
+  foreground.setColorSource(DlColorSource::MakeLinear(
+      SkPoint::Make(0, 0), SkPoint::Make(100, 100), 2, colors.data(),
+      stops.data(), DlTileMode::kClamp));
+  style.foreground = foreground;
 
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(200);
-  paragraph->Paint(GetCanvas(), 0, 0);
+  auto recorder = DlOpRecorder();
+  draw(style)->Dispatch(recorder);
 
-  ASSERT_EQ(paragraph->glyph_lines_.size(), 3ull);
-  EXPECT_EQ(paragraph->glyph_lines_[0].positions.size(), 7ul);
-  EXPECT_EQ(paragraph->glyph_lines_[1].positions.size(), 7ul);
-  EXPECT_EQ(paragraph->glyph_lines_[2].positions.size(), 3ul);
-
-  ASSERT_TRUE(Snapshot());
+  EXPECT_EQ(recorder.textFrameCount(), 0);
+  EXPECT_EQ(recorder.blobCount(), 0);
+  EXPECT_EQ(recorder.pathCount(), 1);
 }
 
-TEST_F(ParagraphTest, TextHeightBehaviorRectsParagraph) {
-  // clang-format off
-  const char* text =
-      "line1\nline2\nline3";
-  // clang-format on
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  paragraph_style.text_height_behavior =
-      txt::TextHeightBehavior::kDisableFirstAscent |
-      txt::TextHeightBehavior::kDisableLastDescent;
-
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.color = SK_ColorBLACK;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 30;
-  text_style.height = 5;
-  text_style.has_height_override = true;
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth() - 300);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  for (size_t i = 0; i < u16_text.length(); i++) {
-    ASSERT_EQ(paragraph->text_[i], u16_text[i]);
-  }
-
-  ASSERT_EQ(paragraph->records_.size(), 3ull);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  // Tests for GetRectsForRange()
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kMax;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(0, 0, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 0ull);
-
-  // First line. Shorter due to disabled height modifications on first ascent.
-  boxes =
-      paragraph->GetRectsForRange(0, 3, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 31.117188);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), -0.08203125);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 59);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom() - boxes[0].rect.top(), 59.082031);
-
-  // Second line. Normal.
-  boxes =
-      paragraph->GetRectsForRange(6, 10, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 47.011719);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 59);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 209);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom() - boxes[0].rect.top(), 150);
+TEST_F(PainterTest, DrawTextBlobNoImpeller) {
+  PretendImpellerIsEnabled(false);
 
-  // Third line. Shorter due to disabled height modifications on last descent
-  boxes =
-      paragraph->GetRectsForRange(12, 17, rect_height_style, rect_width_style);
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  EXPECT_EQ(boxes.size(), 1ull);
-  EXPECT_FLOAT_EQ(boxes[0].rect.left(), 0);
-  EXPECT_FLOAT_EQ(boxes[0].rect.right(), 63.859375);
-  EXPECT_FLOAT_EQ(boxes[0].rect.top(), 208.92578);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom(), 335);
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom() - boxes[0].rect.top(), 126.07422);
+  auto recorder = DlOpRecorder();
+  draw(makeStyle())->Dispatch(recorder);
 
-  ASSERT_TRUE(Snapshot());
+  EXPECT_EQ(recorder.textFrameCount(), 0);
+  EXPECT_EQ(recorder.blobCount(), 1);
 }
+#endif  // IMPELLER_SUPPORTS_RENDERING
 
-TEST_F(ParagraphTest, MixedTextHeightBehaviorRectsParagraph) {
-  const char* text = "0123456789";
-  auto icu_text = icu::UnicodeString::fromUTF8(text);
-  std::u16string u16_text(icu_text.getBuffer(),
-                          icu_text.getBuffer() + icu_text.length());
-
-  txt::ParagraphStyle paragraph_style;
-  // The paragraph's first line and the last line use the font's ascent/descent.
-  paragraph_style.text_height_behavior =
-      txt::TextHeightBehavior::kDisableFirstAscent |
-      txt::TextHeightBehavior::kDisableLastDescent;
-
-  txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
-
-  txt::TextStyle text_style;
-  text_style.color = SK_ColorBLACK;
-  text_style.font_families = std::vector<std::string>(1, "Roboto");
-  text_style.font_size = 30;
-  text_style.height = 5;
-  text_style.has_height_override = true;
-  text_style.half_leading = true;
-
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-
-  text_style.half_leading = false;
-  builder.PushStyle(text_style);
-  builder.AddText(u16_text);
-
-  // 2 identical runs except the first run has half-leading enabled.
-  builder.Pop();
-
-  auto paragraph = BuildParagraph(builder);
-  paragraph->Layout(GetTestCanvasWidth() - 300);
-
-  paragraph->Paint(GetCanvas(), 0, 0);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1);
-
-  // Tests for GetRectsForRange()
-  Paragraph::RectHeightStyle rect_height_style =
-      Paragraph::RectHeightStyle::kMax;
-  Paragraph::RectWidthStyle rect_width_style =
-      Paragraph::RectWidthStyle::kTight;
-  paint.setColor(SK_ColorRED);
-  std::vector<txt::Paragraph::TextBox> boxes =
-      paragraph->GetRectsForRange(0, 20, rect_height_style, rect_width_style);
-
-  for (size_t i = 0; i < boxes.size(); ++i) {
-    GetCanvas()->drawRect(boxes[i].rect, paint);
-  }
-  // The kDisableAll flag is applied.
-  EXPECT_GT(boxes.size(), 1ull);
-  // The height of the line equals to the metrics height of the font
-  // (ascent + descent).
-  EXPECT_FLOAT_EQ(boxes[0].rect.bottom() - boxes[0].rect.top(),
-                  27.8320312 + 7.32421875);
-
-  ASSERT_TRUE(Snapshot());
-}
-}  // namespace txt
+}  // namespace testing
+}  // namespace flutter
diff --git a/third_party/txt/tests/platform_fuchsia_unittests.cc b/third_party/txt/tests/platform_fuchsia_unittests.cc
deleted file mode 100644
index 38746670a0acfa795797e832b924924177d3a5c8..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/platform_fuchsia_unittests.cc
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2021 Google, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <lib/async-loop/cpp/loop.h>
-#include <lib/async-loop/default.h>
-#include <lib/async-testing/test_loop.h>
-
-#include "fake_provider.h"
-#include "gtest/gtest.h"
-#include "txt/platform.h"
-
-namespace txt {
-
-class PlatformFuchsiaTest : public ::testing::Test {
- protected:
-  PlatformFuchsiaTest() : loop_(&kAsyncLoopConfigNoAttachToCurrentThread) {
-    loop_.StartThread();
-  }
-
-  async::Loop& loop() { return loop_; }
-
-  FakeProvider& fake_provider() { return fake_provider_; }
-
-  fidl::InterfaceHandle<fuchsia::fonts::Provider> GetProvider() {
-    return fake_provider_.Bind(loop_.dispatcher());
-  }
-
-  void TearDown() override {
-    loop_.Quit();
-    loop_.JoinThreads();
-  }
-
- private:
-  async::Loop loop_;  // Must come before FIDL bindings.
-  FakeProvider fake_provider_;
-};
-
-TEST_F(PlatformFuchsiaTest, GetDefaultFontManager) {
-  zx_handle_t handle = GetProvider().TakeChannel().release();
-  auto font_manager = GetDefaultFontManager(handle);
-
-  // Nonnull font initialization data should not create SkFontMgr::RefDefault().
-  EXPECT_NE(font_manager, SkFontMgr::RefDefault());
-
-  // Check to see that our font provider was called.
-  EXPECT_FALSE(fake_provider().WasInvoked());
-  font_manager->matchFamily("Invalid font.");
-  EXPECT_TRUE(fake_provider().WasInvoked());
-}
-
-TEST_F(PlatformFuchsiaTest, GetDefaultFontManagerFail) {
-  // Null font initialization data should create SkFontMgr::RefDefault().
-  EXPECT_EQ(GetDefaultFontManager(0), SkFontMgr::RefDefault());
-}
-
-}  // namespace txt
diff --git a/third_party/txt/tests/platform_mac_tests.cc b/third_party/txt/tests/platform_mac_tests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..5ede81394ecdc6803f6621ac60316dc161fb5d92
--- /dev/null
+++ b/third_party/txt/tests/platform_mac_tests.cc
@@ -0,0 +1,35 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "gtest/gtest.h"
+
+#include <sstream>
+
+#include "txt/platform_mac.h"
+
+namespace txt {
+namespace testing {
+
+class PlatformMacTests : public ::testing::Test {
+ public:
+  PlatformMacTests() {}
+
+  void SetUp() override {}
+};
+
+TEST_F(PlatformMacTests, RegisterSystemFonts) {
+  DynamicFontManager dynamic_font_manager;
+  RegisterSystemFonts(dynamic_font_manager);
+  ASSERT_EQ(dynamic_font_manager.font_provider().GetFamilyCount(), 1ul);
+  ASSERT_NE(dynamic_font_manager.font_provider().MatchFamily(
+                "CupertinoSystemDisplay"),
+            nullptr);
+  ASSERT_EQ(dynamic_font_manager.font_provider()
+                .MatchFamily("CupertinoSystemDisplay")
+                ->count(),
+            10);
+}
+
+}  // namespace testing
+}  // namespace txt
diff --git a/third_party/txt/tests/render_test.cc b/third_party/txt/tests/render_test.cc
deleted file mode 100644
index 17730da022e4a00b785f789a2e59ab6852f54e81..0000000000000000000000000000000000000000
--- a/third_party/txt/tests/render_test.cc
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright 2017 Google, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "render_test.h"
-
-#include <string>
-
-#include "flutter/fml/logging.h"
-#include "third_party/skia/include/core/SkBitmap.h"
-#include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkEncodedImageFormat.h"
-#include "third_party/skia/include/core/SkImageEncoder.h"
-#include "third_party/skia/include/core/SkStream.h"
-#include "txt/asset_font_manager.h"
-#include "txt/font_collection.h"
-#include "txt_test_utils.h"
-
-namespace txt {
-
-RenderTest::RenderTest()
-    : snapshots_(0), font_collection_(txt::GetTestFontCollection()) {}
-
-RenderTest::~RenderTest() = default;
-
-SkCanvas* RenderTest::GetCanvas() {
-  return canvas_ == nullptr ? nullptr : canvas_.get();
-}
-
-std::string RenderTest::GetNextSnapshotName() {
-  const auto& test_info =
-      ::testing::UnitTest::GetInstance()->current_test_info();
-
-  std::stringstream stream;
-  stream << "snapshots/" << test_info->test_case_name() << "_"
-         << test_info->name();
-  stream << "_" << ++snapshots_ << ".png";
-
-  return stream.str();
-}
-
-bool RenderTest::Snapshot() {
-  if (!canvas_ || !bitmap_) {
-    return false;
-  }
-  std::string snapshot_dir = "snapshots";
-  int error = 0;
-// _WIN32 defined by Windows Visual compiler.
-#if defined(_WIN32)
-  // Handle windows path creation.
-  error = _mkdir(snapshot_dir.c_str());
-#else
-  // Handle non-windows path creation with Unix permissions.
-  mode_t permissions = 0733;
-  error = mkdir(snapshot_dir.c_str(), permissions);
-#endif
-  if (error > 0) {
-    FML_LOG(ERROR) << "'snapshot/' Directory not available and could not be "
-                      "created. Please create manually to save snapshot.";
-    return false;
-  }
-  auto file_name = GetNextSnapshotName();
-  SkFILEWStream file(file_name.c_str());
-  return SkEncodeImage(&file, *bitmap_, SkEncodedImageFormat::kPNG, 100);
-}
-
-size_t RenderTest::GetTestCanvasWidth() const {
-  return 1000;
-}
-
-size_t RenderTest::GetTestCanvasHeight() const {
-  return 600;
-}
-
-void RenderTest::SetUp() {
-  bitmap_ = std::make_unique<SkBitmap>();
-  bitmap_->allocN32Pixels(GetTestCanvasWidth(), GetTestCanvasHeight());
-  canvas_ = std::make_unique<SkCanvas>(*bitmap_);
-  canvas_->clear(SK_ColorWHITE);
-}
-
-std::shared_ptr<FontCollection> RenderTest::GetTestFontCollection() const {
-  return font_collection_;
-}
-
-void RenderTest::TearDown() {
-  canvas_ = nullptr;
-  bitmap_ = nullptr;
-}
-
-}  // namespace txt
diff --git a/third_party/txt/tests/txt_run_all_unittests.cc b/third_party/txt/tests/txt_run_all_unittests.cc
index f0d2bcf54f6ce9916ede462fc457b2cf5ac396c6..7a20fa6b99f9a5722c8c2e0a8e2018f340f66ff1 100644
--- a/third_party/txt/tests/txt_run_all_unittests.cc
+++ b/third_party/txt/tests/txt_run_all_unittests.cc
@@ -14,34 +14,11 @@
  * limitations under the License.
  */
 
-#include <cassert>
-
 #include "flutter/fml/backtrace.h"
-#include "flutter/fml/command_line.h"
-#include "flutter/fml/icu_util.h"
-#include "flutter/fml/logging.h"
 #include "flutter/testing/testing.h"
-#include "third_party/skia/include/core/SkGraphics.h"
-#include "txt_test_utils.h"
 
 int main(int argc, char** argv) {
   fml::InstallCrashHandler();
-  fml::CommandLine cmd = fml::CommandLineFromPlatformOrArgcArgv(argc, argv);
-  txt::SetCommandLine(cmd);
-  txt::SetFontDir(flutter::testing::GetFixturesPath());
-  if (txt::GetFontDir().length() <= 0) {
-    FML_LOG(ERROR) << "Font directory not set via txt::SetFontDir.";
-    return EXIT_FAILURE;
-  }
-  FML_DCHECK(txt::GetFontDir().length() > 0);
-#if defined(OS_FUCHSIA)
-  fml::icu::InitializeICU("/pkg/data/icudtl.dat");
-#else
-  std::string icudtl_path =
-      cmd.GetOptionValueWithDefault("icu-data-file-path", "icudtl.dat");
-  fml::icu::InitializeICU(icudtl_path);
-#endif
-  SkGraphics::Init();
   testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }
diff --git a/third_party/txt/tests/txt_test_utils.cc b/third_party/txt/tests/txt_test_utils.cc
index 2382fd59e1430f7cdb73d80f5de9fe1b23276a1b..62bae34f39a88b83c29bc94fc477d6ada7f5dc5a 100644
--- a/third_party/txt/tests/txt_test_utils.cc
+++ b/third_party/txt/tests/txt_test_utils.cc
@@ -16,22 +16,9 @@
 
 #include "txt_test_utils.h"
 
-#include <sstream>
-
-#include "third_party/skia/include/core/SkTypeface.h"
-#include "txt/asset_font_manager.h"
-#include "txt/typeface_font_asset_provider.h"
-#include "utils/MacUtils.h"
-#include "utils/WindowsUtils.h"
-
-#if !defined(_WIN32)
-#include <dirent.h>
-#endif
-
 namespace txt {
 
 static std::string gFontDir;
-static fml::CommandLine gCommandLine;
 
 const std::string& GetFontDir() {
   return gFontDir;
@@ -41,90 +28,4 @@ void SetFontDir(const std::string& dir) {
   gFontDir = dir;
 }
 
-const fml::CommandLine& GetCommandLineForProcess() {
-  return gCommandLine;
-}
-
-void SetCommandLine(fml::CommandLine cmd) {
-  gCommandLine = std::move(cmd);
-}
-
-void RegisterFontsFromPath(TypefaceFontAssetProvider& font_provider,
-                           std::string directory_path) {
-#if defined(_WIN32)
-  std::string path = directory_path + "\\*";
-  WIN32_FIND_DATAA ffd;
-  HANDLE directory = FindFirstFileA(path.c_str(), &ffd);
-  if (directory == INVALID_HANDLE_VALUE) {
-    return;
-  }
-
-  do {
-    if ((ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0) {
-      continue;
-    }
-
-    std::string file_name(ffd.cFileName);
-
-    std::stringstream file_path;
-    file_path << directory_path << "/" << file_name;
-
-    font_provider.RegisterTypeface(
-        SkTypeface::MakeFromFile(file_path.str().c_str()));
-  } while (FindNextFileA(directory, &ffd) != 0);
-
-  // TODO(bkonyi): check for error here?
-  FindClose(directory);
-#else
-  auto directory_closer = [](DIR* directory) {
-    if (directory != nullptr) {
-      ::closedir(directory);
-    }
-  };
-
-  std::unique_ptr<DIR, decltype(directory_closer)> directory(
-      ::opendir(directory_path.c_str()), directory_closer);
-
-  if (directory == nullptr) {
-    return;
-  }
-
-  for (struct dirent* entry = ::readdir(directory.get()); entry != nullptr;
-       entry = ::readdir(directory.get())) {
-    if (entry->d_type != DT_REG) {
-      continue;
-    }
-
-    std::string file_name(entry->d_name);
-
-    std::stringstream file_path;
-    file_path << directory_path << "/" << file_name;
-
-    font_provider.RegisterTypeface(
-        SkTypeface::MakeFromFile(file_path.str().c_str()));
-  }
-#endif
-}
-
-std::shared_ptr<FontCollection> GetTestFontCollection() {
-  std::unique_ptr<TypefaceFontAssetProvider> font_provider =
-      std::make_unique<TypefaceFontAssetProvider>();
-  RegisterFontsFromPath(*font_provider, GetFontDir());
-
-  std::shared_ptr<FontCollection> collection =
-      std::make_shared<FontCollection>();
-  collection->SetAssetFontManager(
-      sk_make_sp<AssetFontManager>(std::move(font_provider)));
-
-  return collection;
-}
-
-// Build a paragraph and return it as a ParagraphTxt usable by tests that need
-// access to ParagraphTxt internals.
-std::unique_ptr<ParagraphTxt> BuildParagraph(
-    txt::ParagraphBuilderTxt& builder) {
-  return std::unique_ptr<txt::ParagraphTxt>(
-      static_cast<txt::ParagraphTxt*>(builder.Build().release()));
-}
-
 }  // namespace txt
diff --git a/third_party/txt/tests/txt_test_utils.h b/third_party/txt/tests/txt_test_utils.h
index 096f8f630a5ce8ba911a2d53d5c7129024a2e47e..603c93ab8839adfdabb9a1756095b98a0046d57f 100644
--- a/third_party/txt/tests/txt_test_utils.h
+++ b/third_party/txt/tests/txt_test_utils.h
@@ -14,12 +14,10 @@
  * limitations under the License.
  */
 
-#include <string>
+#ifndef LIB_TXT_TESTS_TXT_TEST_UTILS_H_
+#define LIB_TXT_TESTS_TXT_TEST_UTILS_H_
 
-#include "flutter/fml/command_line.h"
-#include "txt/font_collection.h"
-#include "txt/paragraph_builder_txt.h"
-#include "txt/paragraph_txt.h"
+#include <string>
 
 namespace txt {
 
@@ -27,12 +25,6 @@ const std::string& GetFontDir();
 
 void SetFontDir(const std::string& dir);
 
-const fml::CommandLine& GetCommandLineForProcess();
-
-void SetCommandLine(fml::CommandLine cmd);
-
-std::shared_ptr<FontCollection> GetTestFontCollection();
-
-std::unique_ptr<ParagraphTxt> BuildParagraph(ParagraphBuilderTxt& builder);
-
 }  // namespace txt
+
+#endif  // LIB_TXT_TESTS_TXT_TEST_UTILS_H_
diff --git a/third_party/txt/third_party/fonts/Bold.ttx b/third_party/txt/third_party/fonts/Bold.ttx
deleted file mode 100644
index a595ea58b66c6b2ad33cca28ac2fd9a60a77b566..0000000000000000000000000000000000000000
--- a/third_party/txt/third_party/fonts/Bold.ttx
+++ /dev/null
@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.0">
-
-  <GlyphOrder>
-    <!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
-    <GlyphID id="0" name=".notdef"/>
-    <GlyphID id="1" name="a"/>
-    <GlyphID id="2" name="b"/>
-    <GlyphID id="3" name="c"/>
-    <GlyphID id="4" name="d"/>
-    <GlyphID id="5" name="e"/>
-    <GlyphID id="6" name=","/>
-    <GlyphID id="7" name="-"/>
-    <GlyphID id="8" name="!"/>
-    <GlyphID id="9" name="U+0301"/>
-  </GlyphOrder>
-
-  <head>
-    <!-- Most of this table will be recalculated by the compiler -->
-    <tableVersion value="1.0"/>
-    <fontRevision value="1.0"/>
-    <checkSumAdjustment value="0x640cdb2f"/>
-    <magicNumber value="0x5f0f3cf5"/>
-    <flags value="00000000 00000011"/>
-    <unitsPerEm value="1000"/>
-    <created value="Wed Sep  9 08:01:17 2015"/>
-    <modified value="Wed Sep  9 08:48:07 2015"/>
-    <xMin value="30"/>
-    <yMin value="-200"/>
-    <xMax value="629"/>
-    <yMax value="800"/>
-    <macStyle value="00000000 00000000"/>
-    <lowestRecPPEM value="7"/>
-    <fontDirectionHint value="2"/>
-    <indexToLocFormat value="0"/>
-    <glyphDataFormat value="0"/>
-  </head>
-
-  <hhea>
-    <tableVersion value="1.0"/>
-    <ascent value="1000"/>
-    <descent value="-200"/>
-    <lineGap value="0"/>
-    <advanceWidthMax value="659"/>
-    <minLeftSideBearing value="0"/>
-    <minRightSideBearing value="30"/>
-    <xMaxExtent value="629"/>
-    <caretSlopeRise value="1"/>
-    <caretSlopeRun value="0"/>
-    <caretOffset value="0"/>
-    <reserved0 value="0"/>
-    <reserved1 value="0"/>
-    <reserved2 value="0"/>
-    <reserved3 value="0"/>
-    <metricDataFormat value="0"/>
-    <numberOfHMetrics value="18"/>
-  </hhea>
-
-  <maxp>
-    <!-- Most of this table will be recalculated by the compiler -->
-    <tableVersion value="0x10000"/>
-    <numGlyphs value="54"/>
-    <maxPoints value="73"/>
-    <maxContours value="10"/>
-    <maxCompositePoints value="0"/>
-    <maxCompositeContours value="0"/>
-    <maxZones value="2"/>
-    <maxTwilightPoints value="12"/>
-    <maxStorage value="28"/>
-    <maxFunctionDefs value="119"/>
-    <maxInstructionDefs value="0"/>
-    <maxStackElements value="61"/>
-    <maxSizeOfInstructions value="2967"/>
-    <maxComponentElements value="0"/>
-    <maxComponentDepth value="0"/>
-  </maxp>
-
-  <OS_2>
-    <!-- The fields 'usFirstCharIndex' and 'usLastCharIndex'
-         will be recalculated by the compiler -->
-    <version value="3"/>
-    <xAvgCharWidth value="594"/>
-    <usWeightClass value="700"/>
-    <usWidthClass value="5"/>
-    <fsType value="00000000 00001000"/>
-    <ySubscriptXSize value="650"/>
-    <ySubscriptYSize value="600"/>
-    <ySubscriptXOffset value="0"/>
-    <ySubscriptYOffset value="75"/>
-    <ySuperscriptXSize value="650"/>
-    <ySuperscriptYSize value="600"/>
-    <ySuperscriptXOffset value="0"/>
-    <ySuperscriptYOffset value="350"/>
-    <yStrikeoutSize value="50"/>
-    <yStrikeoutPosition value="300"/>
-    <sFamilyClass value="0"/>
-    <panose>
-      <bFamilyType value="0"/>
-      <bSerifStyle value="0"/>
-      <bWeight value="5"/>
-      <bProportion value="0"/>
-      <bContrast value="0"/>
-      <bStrokeVariation value="0"/>
-      <bArmStyle value="0"/>
-      <bLetterForm value="0"/>
-      <bMidline value="0"/>
-      <bXHeight value="0"/>
-    </panose>
-    <ulUnicodeRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulUnicodeRange2 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange3 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange4 value="00000000 00000000 00000000 00000000"/>
-    <achVendID value="UKWN"/>
-    <fsSelection value="00000000 01000000"/>
-    <usFirstCharIndex value="32"/>
-    <usLastCharIndex value="122"/>
-    <sTypoAscender value="800"/>
-    <sTypoDescender value="-200"/>
-    <sTypoLineGap value="200"/>
-    <usWinAscent value="1000"/>
-    <usWinDescent value="200"/>
-    <ulCodePageRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulCodePageRange2 value="00000000 00000000 00000000 00000000"/>
-    <sxHeight value="500"/>
-    <sCapHeight value="700"/>
-    <usDefaultChar value="0"/>
-    <usBreakChar value="32"/>
-    <usMaxContext value="0"/>
-  </OS_2>
-
-  <hmtx>
-    <mtx name=".notdef" width="500" lsb="93"/>
-    <mtx name="a" width="500" lsb="93"/>
-    <mtx name="b" width="500" lsb="93"/>
-    <mtx name="c" width="500" lsb="93"/>
-    <mtx name="d" width="500" lsb="93"/>
-    <mtx name="e" width="500" lsb="93"/>
-    <mtx name="," width="500" lsb="93"/>
-    <mtx name="-" width="500" lsb="93"/>
-    <mtx name="!" width="500" lsb="93"/>
-    <mtx name="U+0301" width="500" lsb="93"/>
-  </hmtx>
-
-  <cmap>
-    <tableVersion version="0"/>
-    <cmap_format_4 platformID="3" platEncID="10" language="0">
-      <map code="0x0061" name="a" />
-      <map code="0x0062" name="b" />
-      <map code="0x0063" name="c" />
-      <map code="0x0064" name="d" />
-      <map code="0x0065" name="e" />
-      <map code="0x002C" name="," />
-      <map code="0x002D" name="-" />
-      <map code="0x0021" name="!" />
-      <map code="0x0301" name="U+0301" />
-    </cmap_format_4>
-  </cmap>
-
-  <loca>
-    <!-- The 'loca' table will be calculated by the compiler -->
-  </loca>
-
-  <glyf>
-
-    <!-- The xMin, yMin, xMax and yMax values
-         will be recalculated by the compiler. -->
-
-    <TTGlyph name=".notdef" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-
-    <TTGlyph name="a" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="b" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="c" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="d" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="e" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="," xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="-" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="!" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+0301" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-  </glyf>
-
-  <name>
-    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      BoldFont Test
-    </namerecord>
-    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      Bold
-    </namerecord>
-    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      BoldFont Test
-    </namerecord>
-    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      BoldFontTest-Bold
-    </namerecord>
-    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
-      BoldFont Test
-    </namerecord>
-    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
-      Bold
-    </namerecord>
-    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
-      BoldFont Test
-    </namerecord>
-    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
-      BoldFontTest-Bold
-    </namerecord>
-  </name>
-
-  <post>
-    <formatType value="3.0"/>
-    <italicAngle value="0.0"/>
-    <underlinePosition value="-75"/>
-    <underlineThickness value="50"/>
-    <isFixedPitch value="0"/>
-    <minMemType42 value="0"/>
-    <maxMemType42 value="0"/>
-    <minMemType1 value="0"/>
-    <maxMemType1 value="0"/>
-  </post>
-
-</ttFont>
diff --git a/third_party/txt/third_party/fonts/BoldItalic.ttx b/third_party/txt/third_party/fonts/BoldItalic.ttx
deleted file mode 100644
index 5de79fcb7f1625dabd9cce636df974135a21577d..0000000000000000000000000000000000000000
--- a/third_party/txt/third_party/fonts/BoldItalic.ttx
+++ /dev/null
@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.0">
-
-  <GlyphOrder>
-    <!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
-    <GlyphID id="0" name=".notdef"/>
-    <GlyphID id="1" name="a"/>
-    <GlyphID id="2" name="b"/>
-    <GlyphID id="3" name="c"/>
-    <GlyphID id="4" name="d"/>
-    <GlyphID id="5" name="e"/>
-    <GlyphID id="6" name=","/>
-    <GlyphID id="7" name="-"/>
-    <GlyphID id="8" name="!"/>
-    <GlyphID id="9" name="U+0301"/>
-  </GlyphOrder>
-
-  <head>
-    <!-- Most of this table will be recalculated by the compiler -->
-    <tableVersion value="1.0"/>
-    <fontRevision value="1.0"/>
-    <checkSumAdjustment value="0x640cdb2f"/>
-    <magicNumber value="0x5f0f3cf5"/>
-    <flags value="00000000 00000011"/>
-    <unitsPerEm value="1000"/>
-    <created value="Wed Sep  9 08:01:17 2015"/>
-    <modified value="Wed Sep  9 08:48:07 2015"/>
-    <xMin value="30"/>
-    <yMin value="-200"/>
-    <xMax value="629"/>
-    <yMax value="800"/>
-    <macStyle value="00000000 00000000"/>
-    <lowestRecPPEM value="7"/>
-    <fontDirectionHint value="2"/>
-    <indexToLocFormat value="0"/>
-    <glyphDataFormat value="0"/>
-  </head>
-
-  <hhea>
-    <tableVersion value="1.0"/>
-    <ascent value="1000"/>
-    <descent value="-200"/>
-    <lineGap value="0"/>
-    <advanceWidthMax value="659"/>
-    <minLeftSideBearing value="0"/>
-    <minRightSideBearing value="30"/>
-    <xMaxExtent value="629"/>
-    <caretSlopeRise value="1"/>
-    <caretSlopeRun value="0"/>
-    <caretOffset value="0"/>
-    <reserved0 value="0"/>
-    <reserved1 value="0"/>
-    <reserved2 value="0"/>
-    <reserved3 value="0"/>
-    <metricDataFormat value="0"/>
-    <numberOfHMetrics value="18"/>
-  </hhea>
-
-  <maxp>
-    <!-- Most of this table will be recalculated by the compiler -->
-    <tableVersion value="0x10000"/>
-    <numGlyphs value="54"/>
-    <maxPoints value="73"/>
-    <maxContours value="10"/>
-    <maxCompositePoints value="0"/>
-    <maxCompositeContours value="0"/>
-    <maxZones value="2"/>
-    <maxTwilightPoints value="12"/>
-    <maxStorage value="28"/>
-    <maxFunctionDefs value="119"/>
-    <maxInstructionDefs value="0"/>
-    <maxStackElements value="61"/>
-    <maxSizeOfInstructions value="2967"/>
-    <maxComponentElements value="0"/>
-    <maxComponentDepth value="0"/>
-  </maxp>
-
-  <OS_2>
-    <!-- The fields 'usFirstCharIndex' and 'usLastCharIndex'
-         will be recalculated by the compiler -->
-    <version value="3"/>
-    <xAvgCharWidth value="594"/>
-    <usWeightClass value="700"/>
-    <usWidthClass value="5"/>
-    <fsType value="00000000 00001001"/>
-    <ySubscriptXSize value="650"/>
-    <ySubscriptYSize value="600"/>
-    <ySubscriptXOffset value="0"/>
-    <ySubscriptYOffset value="75"/>
-    <ySuperscriptXSize value="650"/>
-    <ySuperscriptYSize value="600"/>
-    <ySuperscriptXOffset value="0"/>
-    <ySuperscriptYOffset value="350"/>
-    <yStrikeoutSize value="50"/>
-    <yStrikeoutPosition value="300"/>
-    <sFamilyClass value="0"/>
-    <panose>
-      <bFamilyType value="0"/>
-      <bSerifStyle value="0"/>
-      <bWeight value="5"/>
-      <bProportion value="0"/>
-      <bContrast value="0"/>
-      <bStrokeVariation value="0"/>
-      <bArmStyle value="0"/>
-      <bLetterForm value="0"/>
-      <bMidline value="0"/>
-      <bXHeight value="0"/>
-    </panose>
-    <ulUnicodeRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulUnicodeRange2 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange3 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange4 value="00000000 00000000 00000000 00000000"/>
-    <achVendID value="UKWN"/>
-    <fsSelection value="00000000 01000000"/>
-    <usFirstCharIndex value="32"/>
-    <usLastCharIndex value="122"/>
-    <sTypoAscender value="800"/>
-    <sTypoDescender value="-200"/>
-    <sTypoLineGap value="200"/>
-    <usWinAscent value="1000"/>
-    <usWinDescent value="200"/>
-    <ulCodePageRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulCodePageRange2 value="00000000 00000000 00000000 00000000"/>
-    <sxHeight value="500"/>
-    <sCapHeight value="700"/>
-    <usDefaultChar value="0"/>
-    <usBreakChar value="32"/>
-    <usMaxContext value="0"/>
-  </OS_2>
-
-  <hmtx>
-    <mtx name=".notdef" width="500" lsb="93"/>
-    <mtx name="a" width="500" lsb="93"/>
-    <mtx name="b" width="500" lsb="93"/>
-    <mtx name="c" width="500" lsb="93"/>
-    <mtx name="d" width="500" lsb="93"/>
-    <mtx name="e" width="500" lsb="93"/>
-    <mtx name="," width="500" lsb="93"/>
-    <mtx name="-" width="500" lsb="93"/>
-    <mtx name="!" width="500" lsb="93"/>
-    <mtx name="U+0301" width="500" lsb="93"/>
-  </hmtx>
-
-  <cmap>
-    <tableVersion version="0"/>
-    <cmap_format_4 platformID="3" platEncID="10" language="0">
-      <map code="0x0061" name="a" />
-      <map code="0x0062" name="b" />
-      <map code="0x0063" name="c" />
-      <map code="0x0064" name="d" />
-      <map code="0x0065" name="e" />
-      <map code="0x002C" name="," />
-      <map code="0x002D" name="-" />
-      <map code="0x0021" name="!" />
-      <map code="0x0301" name="U+0301" />
-    </cmap_format_4>
-  </cmap>
-
-  <loca>
-    <!-- The 'loca' table will be calculated by the compiler -->
-  </loca>
-
-  <glyf>
-
-    <!-- The xMin, yMin, xMax and yMax values
-         will be recalculated by the compiler. -->
-
-    <TTGlyph name=".notdef" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-
-    <TTGlyph name="a" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="b" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="c" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="d" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="e" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="," xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="-" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="!" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+0301" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-  </glyf>
-
-  <name>
-    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      BoldItalicFont Test
-    </namerecord>
-    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      BoldItalic
-    </namerecord>
-    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      BoldItalicFont Test
-    </namerecord>
-    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      BoldItalicFontTest-BoldItalic
-    </namerecord>
-    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
-      BoldItalicFont Test
-    </namerecord>
-    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
-      BoldItalic
-    </namerecord>
-    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
-      BoldItalicFont Test
-    </namerecord>
-    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
-      BoldItalicFontTest-BoldItalic
-    </namerecord>
-  </name>
-
-  <post>
-    <formatType value="3.0"/>
-    <italicAngle value="0.0"/>
-    <underlinePosition value="-75"/>
-    <underlineThickness value="50"/>
-    <isFixedPitch value="0"/>
-    <minMemType42 value="0"/>
-    <maxMemType42 value="0"/>
-    <minMemType1 value="0"/>
-    <maxMemType1 value="0"/>
-  </post>
-
-</ttFont>
diff --git a/third_party/txt/third_party/fonts/ColorEmojiFont.ttx b/third_party/txt/third_party/fonts/ColorEmojiFont.ttx
deleted file mode 100644
index 5e16574d87dc920d4b3e38df578b58b11b8fa329..0000000000000000000000000000000000000000
--- a/third_party/txt/third_party/fonts/ColorEmojiFont.ttx
+++ /dev/null
@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.0">
-
-  <GlyphOrder>
-    <!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
-    <GlyphID id="0" name=".notdef"/>
-    <GlyphID id="1" name="defaultGlyph"/>
-  </GlyphOrder>
-
-  <head>
-    <!-- Most of this table will be recalculated by the compiler -->
-    <tableVersion value="1.0"/>
-    <fontRevision value="1.0"/>
-    <checkSumAdjustment value="0x640cdb2f"/>
-    <magicNumber value="0x5f0f3cf5"/>
-    <flags value="00000000 00000011"/>
-    <unitsPerEm value="1000"/>
-    <created value="Wed Sep  9 08:01:17 2015"/>
-    <modified value="Wed Sep  9 08:48:07 2015"/>
-    <xMin value="30"/>
-    <yMin value="-200"/>
-    <xMax value="629"/>
-    <yMax value="800"/>
-    <macStyle value="00000000 00000000"/>
-    <lowestRecPPEM value="7"/>
-    <fontDirectionHint value="2"/>
-    <indexToLocFormat value="0"/>
-    <glyphDataFormat value="0"/>
-  </head>
-
-  <hhea>
-    <tableVersion value="1.0"/>
-    <ascent value="1000"/>
-    <descent value="-200"/>
-    <lineGap value="0"/>
-    <advanceWidthMax value="659"/>
-    <minLeftSideBearing value="0"/>
-    <minRightSideBearing value="30"/>
-    <xMaxExtent value="629"/>
-    <caretSlopeRise value="1"/>
-    <caretSlopeRun value="0"/>
-    <caretOffset value="0"/>
-    <reserved0 value="0"/>
-    <reserved1 value="0"/>
-    <reserved2 value="0"/>
-    <reserved3 value="0"/>
-    <metricDataFormat value="0"/>
-    <numberOfHMetrics value="18"/>
-  </hhea>
-
-  <maxp>
-    <!-- Most of this table will be recalculated by the compiler -->
-    <tableVersion value="0x10000"/>
-    <numGlyphs value="54"/>
-    <maxPoints value="73"/>
-    <maxContours value="10"/>
-    <maxCompositePoints value="0"/>
-    <maxCompositeContours value="0"/>
-    <maxZones value="2"/>
-    <maxTwilightPoints value="12"/>
-    <maxStorage value="28"/>
-    <maxFunctionDefs value="119"/>
-    <maxInstructionDefs value="0"/>
-    <maxStackElements value="61"/>
-    <maxSizeOfInstructions value="2967"/>
-    <maxComponentElements value="0"/>
-    <maxComponentDepth value="0"/>
-  </maxp>
-
-  <OS_2>
-    <!-- The fields 'usFirstCharIndex' and 'usLastCharIndex'
-         will be recalculated by the compiler -->
-    <version value="3"/>
-    <xAvgCharWidth value="594"/>
-    <usWeightClass value="400"/>
-    <usWidthClass value="5"/>
-    <fsType value="00000000 00001000"/>
-    <ySubscriptXSize value="650"/>
-    <ySubscriptYSize value="600"/>
-    <ySubscriptXOffset value="0"/>
-    <ySubscriptYOffset value="75"/>
-    <ySuperscriptXSize value="650"/>
-    <ySuperscriptYSize value="600"/>
-    <ySuperscriptXOffset value="0"/>
-    <ySuperscriptYOffset value="350"/>
-    <yStrikeoutSize value="50"/>
-    <yStrikeoutPosition value="300"/>
-    <sFamilyClass value="0"/>
-    <panose>
-      <bFamilyType value="0"/>
-      <bSerifStyle value="0"/>
-      <bWeight value="5"/>
-      <bProportion value="0"/>
-      <bContrast value="0"/>
-      <bStrokeVariation value="0"/>
-      <bArmStyle value="0"/>
-      <bLetterForm value="0"/>
-      <bMidline value="0"/>
-      <bXHeight value="0"/>
-    </panose>
-    <ulUnicodeRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulUnicodeRange2 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange3 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange4 value="00000000 00000000 00000000 00000000"/>
-    <achVendID value="UKWN"/>
-    <fsSelection value="00000000 01000000"/>
-    <usFirstCharIndex value="32"/>
-    <usLastCharIndex value="122"/>
-    <sTypoAscender value="800"/>
-    <sTypoDescender value="-200"/>
-    <sTypoLineGap value="200"/>
-    <usWinAscent value="1000"/>
-    <usWinDescent value="200"/>
-    <ulCodePageRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulCodePageRange2 value="00000000 00000000 00000000 00000000"/>
-    <sxHeight value="500"/>
-    <sCapHeight value="700"/>
-    <usDefaultChar value="0"/>
-    <usBreakChar value="32"/>
-    <usMaxContext value="0"/>
-  </OS_2>
-
-  <hmtx>
-    <mtx name=".notdef" width="500" lsb="93"/>
-    <mtx name="defaultGlyph" width="500" lsb="93"/>
-  </hmtx>
-
-  <cmap>
-    <tableVersion version="0"/>
-    <cmap_format_12 format="12" reserved="0" length="7" nGroups="1" platformID="3" platEncID="10" language="0">
-      <!-- TODO: Clean up and write the target test name. -->
-      <map code="0x00AE" name="defaultGlyph" /> <!-- Text Default -->
-      <map code="0x203C" name="defaultGlyph" /> <!-- Text Default -->
-      <map code="0x231B" name="defaultGlyph" /> <!-- Emoji Default -->
-      <map code="0x23E9" name="defaultGlyph" /> <!-- Emoji Default -->
-      <map code="0x26F9" name="defaultGlyph" /> <!-- U+26F9 U+FE0F is in ColorTextMixedEmojiFont.ttf -->
-      <map code="0x261D" name="defaultGlyph" />
-      <map code="0x1F3FD" name="defaultGlyph" />
-
-      <!-- For FontCollectionTest.hasVariationSelectorTest_emoji -->
-      <map code="0x2623" name="defaultGlyph" />
-      <map code="0x2626" name="defaultGlyph" />
-      <map code="0x262A" name="defaultGlyph" />
-      <map code="0x262E" name="defaultGlyph" />
-      <map code="0x262F" name="defaultGlyph" />
-
-      <!--For FontCollectionItemizeTest,.itemize_genderBalancedEmoji -->
-      <map code="0x1F469" name="defaultGlyph" />
-      <map code="0x1F373" name="defaultGlyph" />
-      <map code="0x200D" name="defaultGlyph" />
-      <map code="0x2695" name="defaultGlyph" />
-
-      <!-- U+2640, U+2642 are reserved for FontCollectionTest.newEmojiTest -->
-    </cmap_format_12>
-    <cmap_format_14 format="14" platformID="0" platEncID="5" length="40" numVarSelectorRecords="2">
-      <!-- For FontCollectionTest.hasVariationSelectorTest_emoji -->
-      <map uvs="0xFE0F" uv="0x2623" name="None" />
-      <map uvs="0xFE0F" uv="0x262A" name="None" />
-
-      <!--For FontCollectionItemizeTest,.itemize_genderBalancedEmoji -->
-      <map uvs="0xFE0F" uv="0x2695" name="None" />
-
-      <!-- U+2640, U+2642 are reserved for FontCollectionTest.newEmojiTest -->
-    </cmap_format_14>
-  </cmap>
-
-  <loca>
-    <!-- The 'loca' table will be calculated by the compiler -->
-  </loca>
-
-  <glyf>
-
-    <!-- The xMin, yMin, xMax and yMax values
-         will be recalculated by the compiler. -->
-
-    <TTGlyph name=".notdef" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-
-    <TTGlyph name="defaultGlyph" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-  </glyf>
-
-  <name>
-    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      ColorEmojiFont Test
-    </namerecord>
-    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      Regular
-    </namerecord>
-    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      ColorEmojiFont Test
-    </namerecord>
-    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      ColorEmojiFontTest-Regular
-    </namerecord>
-    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
-      ColorEmojiFont Test
-    </namerecord>
-    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
-      Regular
-    </namerecord>
-    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
-      ColorEmojiFont Test
-    </namerecord>
-    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
-      ColorEmojiFontTest-Regular
-    </namerecord>
-  </name>
-
-  <post>
-    <formatType value="3.0"/>
-    <italicAngle value="0.0"/>
-    <underlinePosition value="-75"/>
-    <underlineThickness value="50"/>
-    <isFixedPitch value="0"/>
-    <minMemType42 value="0"/>
-    <maxMemType42 value="0"/>
-    <minMemType1 value="0"/>
-    <maxMemType1 value="0"/>
-  </post>
-
-</ttFont>
diff --git a/third_party/txt/third_party/fonts/ColorTextMixedEmojiFont.ttx b/third_party/txt/third_party/fonts/ColorTextMixedEmojiFont.ttx
deleted file mode 100644
index 461210bfd882d4750d5b8595de598142c1f2c225..0000000000000000000000000000000000000000
--- a/third_party/txt/third_party/fonts/ColorTextMixedEmojiFont.ttx
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.0">
-
-  <GlyphOrder>
-    <!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
-    <GlyphID id="0" name=".notdef"/>
-    <GlyphID id="1" name="Emoji1"/>
-    <GlyphID id="2" name="Emoji2"/>
-  </GlyphOrder>
-
-  <head>
-    <!-- Most of this table will be recalculated by the compiler -->
-    <tableVersion value="1.0"/>
-    <fontRevision value="1.0"/>
-    <checkSumAdjustment value="0x640cdb2f"/>
-    <magicNumber value="0x5f0f3cf5"/>
-    <flags value="00000000 00000011"/>
-    <unitsPerEm value="1000"/>
-    <created value="Wed Sep  9 08:01:17 2015"/>
-    <modified value="Wed Sep  9 08:48:07 2015"/>
-    <xMin value="30"/>
-    <yMin value="-200"/>
-    <xMax value="629"/>
-    <yMax value="800"/>
-    <macStyle value="00000000 00000000"/>
-    <lowestRecPPEM value="7"/>
-    <fontDirectionHint value="2"/>
-    <indexToLocFormat value="0"/>
-    <glyphDataFormat value="0"/>
-  </head>
-
-  <hhea>
-    <tableVersion value="1.0"/>
-    <ascent value="1000"/>
-    <descent value="-200"/>
-    <lineGap value="0"/>
-    <advanceWidthMax value="659"/>
-    <minLeftSideBearing value="0"/>
-    <minRightSideBearing value="30"/>
-    <xMaxExtent value="629"/>
-    <caretSlopeRise value="1"/>
-    <caretSlopeRun value="0"/>
-    <caretOffset value="0"/>
-    <reserved0 value="0"/>
-    <reserved1 value="0"/>
-    <reserved2 value="0"/>
-    <reserved3 value="0"/>
-    <metricDataFormat value="0"/>
-    <numberOfHMetrics value="18"/>
-  </hhea>
-
-  <maxp>
-    <!-- Most of this table will be recalculated by the compiler -->
-    <tableVersion value="0x10000"/>
-    <numGlyphs value="54"/>
-    <maxPoints value="73"/>
-    <maxContours value="10"/>
-    <maxCompositePoints value="0"/>
-    <maxCompositeContours value="0"/>
-    <maxZones value="2"/>
-    <maxTwilightPoints value="12"/>
-    <maxStorage value="28"/>
-    <maxFunctionDefs value="119"/>
-    <maxInstructionDefs value="0"/>
-    <maxStackElements value="61"/>
-    <maxSizeOfInstructions value="2967"/>
-    <maxComponentElements value="0"/>
-    <maxComponentDepth value="0"/>
-  </maxp>
-
-  <OS_2>
-    <!-- The fields 'usFirstCharIndex' and 'usLastCharIndex'
-         will be recalculated by the compiler -->
-    <version value="3"/>
-    <xAvgCharWidth value="594"/>
-    <usWeightClass value="400"/>
-    <usWidthClass value="5"/>
-    <fsType value="00000000 00001000"/>
-    <ySubscriptXSize value="650"/>
-    <ySubscriptYSize value="600"/>
-    <ySubscriptXOffset value="0"/>
-    <ySubscriptYOffset value="75"/>
-    <ySuperscriptXSize value="650"/>
-    <ySuperscriptYSize value="600"/>
-    <ySuperscriptXOffset value="0"/>
-    <ySuperscriptYOffset value="350"/>
-    <yStrikeoutSize value="50"/>
-    <yStrikeoutPosition value="300"/>
-    <sFamilyClass value="0"/>
-    <panose>
-      <bFamilyType value="0"/>
-      <bSerifStyle value="0"/>
-      <bWeight value="5"/>
-      <bProportion value="0"/>
-      <bContrast value="0"/>
-      <bStrokeVariation value="0"/>
-      <bArmStyle value="0"/>
-      <bLetterForm value="0"/>
-      <bMidline value="0"/>
-      <bXHeight value="0"/>
-    </panose>
-    <ulUnicodeRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulUnicodeRange2 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange3 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange4 value="00000000 00000000 00000000 00000000"/>
-    <achVendID value="UKWN"/>
-    <fsSelection value="00000000 01000000"/>
-    <usFirstCharIndex value="32"/>
-    <usLastCharIndex value="122"/>
-    <sTypoAscender value="800"/>
-    <sTypoDescender value="-200"/>
-    <sTypoLineGap value="200"/>
-    <usWinAscent value="1000"/>
-    <usWinDescent value="200"/>
-    <ulCodePageRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulCodePageRange2 value="00000000 00000000 00000000 00000000"/>
-    <sxHeight value="500"/>
-    <sCapHeight value="700"/>
-    <usDefaultChar value="0"/>
-    <usBreakChar value="32"/>
-    <usMaxContext value="0"/>
-  </OS_2>
-
-  <hmtx>
-    <mtx name=".notdef" width="500" lsb="93"/>
-    <mtx name="Emoji1" width="500" lsb="93"/>
-    <mtx name="Emoji2" width="500" lsb="93"/>
-  </hmtx>
-
-  <cmap>
-    <tableVersion version="0"/>
-    <cmap_format_14 format="14" platformID="0" platEncID="5" length="40" numVarSelectorRecords="2">
-      <map uvs="0xFE0E" uv="0x26FA" name="Emoji1" />
-      <map uvs="0xFE0F" uv="0x26F9" name="Emoji2" />
-    </cmap_format_14>
-  </cmap>
-
-  <loca>
-    <!-- The 'loca' table will be calculated by the compiler -->
-  </loca>
-
-  <glyf>
-
-    <!-- The xMin, yMin, xMax and yMax values
-         will be recalculated by the compiler. -->
-
-    <TTGlyph name=".notdef" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-
-    <TTGlyph name="Emoji1" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="Emoji2" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-  </glyf>
-
-  <name>
-    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      ColorTextMixedEmojiFont Test
-    </namerecord>
-    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      Regular
-    </namerecord>
-    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      ColorTextMixedEmojiFont Test
-    </namerecord>
-    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      ColorTextMixedEmojiFontTest-Regular
-    </namerecord>
-    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
-      ColorTextMixedEmojiFont Test
-    </namerecord>
-    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
-      Regular
-    </namerecord>
-    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
-      ColorTextMixedEmojiFont Test
-    </namerecord>
-    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
-      ColorTextMixedEmojiFontTest-Regular
-    </namerecord>
-  </name>
-
-  <post>
-    <formatType value="3.0"/>
-    <italicAngle value="0.0"/>
-    <underlinePosition value="-75"/>
-    <underlineThickness value="50"/>
-    <isFixedPitch value="0"/>
-    <minMemType42 value="0"/>
-    <maxMemType42 value="0"/>
-    <minMemType1 value="0"/>
-    <maxMemType1 value="0"/>
-  </post>
-
-</ttFont>
diff --git a/third_party/txt/third_party/fonts/Emoji.ttx b/third_party/txt/third_party/fonts/Emoji.ttx
deleted file mode 100644
index 3318c594ae1edd070cd5ab939692e55df68ece30..0000000000000000000000000000000000000000
--- a/third_party/txt/third_party/fonts/Emoji.ttx
+++ /dev/null
@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.0">
-
-  <GlyphOrder>
-    <!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
-    <GlyphID id="0" name=".notdef"/>
-    <GlyphID id="1" name="U+1F469"/>
-    <GlyphID id="2" name="U+1F467"/>
-    <GlyphID id="3" name="U+20E3"/>
-    <GlyphID id="4" name="0"/>
-    <GlyphID id="5" name="U+1F470"/>
-    <GlyphID id="6" name="U+203C_VS16"/>
-  </GlyphOrder>
-
-  <head>
-    <!-- Most of this table will be recalculated by the compiler -->
-    <tableVersion value="1.0"/>
-    <fontRevision value="1.0"/>
-    <checkSumAdjustment value="0x640cdb2f"/>
-    <magicNumber value="0x5f0f3cf5"/>
-    <flags value="00000000 00000011"/>
-    <unitsPerEm value="1000"/>
-    <created value="Wed Sep  9 08:01:17 2015"/>
-    <modified value="Wed Sep  9 08:48:07 2015"/>
-    <xMin value="30"/>
-    <yMin value="-200"/>
-    <xMax value="629"/>
-    <yMax value="800"/>
-    <macStyle value="00000000 00000000"/>
-    <lowestRecPPEM value="7"/>
-    <fontDirectionHint value="2"/>
-    <indexToLocFormat value="0"/>
-    <glyphDataFormat value="0"/>
-  </head>
-
-  <hhea>
-    <tableVersion value="1.0"/>
-    <ascent value="1000"/>
-    <descent value="-200"/>
-    <lineGap value="0"/>
-    <advanceWidthMax value="659"/>
-    <minLeftSideBearing value="0"/>
-    <minRightSideBearing value="30"/>
-    <xMaxExtent value="629"/>
-    <caretSlopeRise value="1"/>
-    <caretSlopeRun value="0"/>
-    <caretOffset value="0"/>
-    <reserved0 value="0"/>
-    <reserved1 value="0"/>
-    <reserved2 value="0"/>
-    <reserved3 value="0"/>
-    <metricDataFormat value="0"/>
-    <numberOfHMetrics value="18"/>
-  </hhea>
-
-  <maxp>
-    <!-- Most of this table will be recalculated by the compiler -->
-    <tableVersion value="0x10000"/>
-    <numGlyphs value="54"/>
-    <maxPoints value="73"/>
-    <maxContours value="10"/>
-    <maxCompositePoints value="0"/>
-    <maxCompositeContours value="0"/>
-    <maxZones value="2"/>
-    <maxTwilightPoints value="12"/>
-    <maxStorage value="28"/>
-    <maxFunctionDefs value="119"/>
-    <maxInstructionDefs value="0"/>
-    <maxStackElements value="61"/>
-    <maxSizeOfInstructions value="2967"/>
-    <maxComponentElements value="0"/>
-    <maxComponentDepth value="0"/>
-  </maxp>
-
-  <OS_2>
-    <!-- The fields 'usFirstCharIndex' and 'usLastCharIndex'
-         will be recalculated by the compiler -->
-    <version value="3"/>
-    <xAvgCharWidth value="594"/>
-    <usWeightClass value="400"/>
-    <usWidthClass value="5"/>
-    <fsType value="00000000 00001000"/>
-    <ySubscriptXSize value="650"/>
-    <ySubscriptYSize value="600"/>
-    <ySubscriptXOffset value="0"/>
-    <ySubscriptYOffset value="75"/>
-    <ySuperscriptXSize value="650"/>
-    <ySuperscriptYSize value="600"/>
-    <ySuperscriptXOffset value="0"/>
-    <ySuperscriptYOffset value="350"/>
-    <yStrikeoutSize value="50"/>
-    <yStrikeoutPosition value="300"/>
-    <sFamilyClass value="0"/>
-    <panose>
-      <bFamilyType value="0"/>
-      <bSerifStyle value="0"/>
-      <bWeight value="5"/>
-      <bProportion value="0"/>
-      <bContrast value="0"/>
-      <bStrokeVariation value="0"/>
-      <bArmStyle value="0"/>
-      <bLetterForm value="0"/>
-      <bMidline value="0"/>
-      <bXHeight value="0"/>
-    </panose>
-    <ulUnicodeRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulUnicodeRange2 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange3 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange4 value="00000000 00000000 00000000 00000000"/>
-    <achVendID value="UKWN"/>
-    <fsSelection value="00000000 01000000"/>
-    <usFirstCharIndex value="32"/>
-    <usLastCharIndex value="122"/>
-    <sTypoAscender value="800"/>
-    <sTypoDescender value="-200"/>
-    <sTypoLineGap value="200"/>
-    <usWinAscent value="1000"/>
-    <usWinDescent value="200"/>
-    <ulCodePageRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulCodePageRange2 value="00000000 00000000 00000000 00000000"/>
-    <sxHeight value="500"/>
-    <sCapHeight value="700"/>
-    <usDefaultChar value="0"/>
-    <usBreakChar value="32"/>
-    <usMaxContext value="0"/>
-  </OS_2>
-
-  <hmtx>
-    <mtx name=".notdef" width="500" lsb="93"/>
-    <mtx name="U+1F469" width="500" lsb="93"/>
-    <mtx name="U+1F467" width="500" lsb="93"/>
-    <mtx name="U+20E3" width="500" lsb="93"/>
-    <mtx name="0" width="500" lsb="93"/>
-    <mtx name="U+1F470" width="500" lsb="93"/>
-    <mtx name="U+203C_VS16" width="500" lsb="93"/>
-  </hmtx>
-
-  <cmap>
-    <tableVersion version="0"/>
-    <cmap_format_12 format="12" reserved="0" length="3" nGroups="1" platformID="3" platEncID="1" language="0">
-      <map code="0x1F469" name="U+1F469" />
-      <map code="0x1F467" name="U+1F467" />
-      <map code="0x20E3" name="U+20E3" />
-      <map code="0x0030" name="0" />
-      <map code="0x1F470" name="U+1F470" />
-    </cmap_format_12>
-    <cmap_format_14 format="14" platformID="0" platEncID="5" length="30" numVarSelectorRecords="1">
-      <map uvs="0xFE0F" uv="0x203C" name="U+203C_VS16" />
-    </cmap_format_14>
-  </cmap>
-
-  <loca>
-    <!-- The 'loca' table will be calculated by the compiler -->
-  </loca>
-
-  <glyf>
-
-    <!-- The xMin, yMin, xMax and yMax values
-         will be recalculated by the compiler. -->
-
-    <TTGlyph name=".notdef" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-
-    <TTGlyph name="U+1F469" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+1F467" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+20E3" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="0" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+1F470" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+203C_VS16" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-  </glyf>
-
-  <name>
-    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      EmojiFont Test
-    </namerecord>
-    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      Regular
-    </namerecord>
-    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      EmojiFont Test
-    </namerecord>
-    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      EmojiFontTest-Regular
-    </namerecord>
-    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
-      EmojiFont Test
-    </namerecord>
-    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
-      Regular
-    </namerecord>
-    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
-      EmojiFont Test
-    </namerecord>
-    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
-      EmojiFontTest-Regular
-    </namerecord>
-  </name>
-
-  <post>
-    <formatType value="3.0"/>
-    <italicAngle value="0.0"/>
-    <underlinePosition value="-75"/>
-    <underlineThickness value="50"/>
-    <isFixedPitch value="0"/>
-    <minMemType42 value="0"/>
-    <maxMemType42 value="0"/>
-    <minMemType1 value="0"/>
-    <maxMemType1 value="0"/>
-  </post>
-
-</ttFont>
diff --git a/third_party/txt/third_party/fonts/HomemadeApple-LICENSE.txt b/third_party/txt/third_party/fonts/HomemadeApple-LICENSE.txt
deleted file mode 100644
index d645695673349e3947e8e5ae42332d0ac3164cd7..0000000000000000000000000000000000000000
--- a/third_party/txt/third_party/fonts/HomemadeApple-LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/third_party/txt/third_party/fonts/Italic.ttx b/third_party/txt/third_party/fonts/Italic.ttx
deleted file mode 100644
index 1853bb6b2681fd789f641d937fbe056148aa2758..0000000000000000000000000000000000000000
--- a/third_party/txt/third_party/fonts/Italic.ttx
+++ /dev/null
@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.0">
-
-  <GlyphOrder>
-    <!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
-    <GlyphID id="0" name=".notdef"/>
-    <GlyphID id="1" name="a"/>
-    <GlyphID id="2" name="b"/>
-    <GlyphID id="3" name="c"/>
-    <GlyphID id="4" name="d"/>
-    <GlyphID id="5" name="e"/>
-    <GlyphID id="6" name=","/>
-    <GlyphID id="7" name="-"/>
-    <GlyphID id="8" name="!"/>
-    <GlyphID id="9" name="U+0301"/>
-  </GlyphOrder>
-
-  <head>
-    <!-- Most of this table will be recalculated by the compiler -->
-    <tableVersion value="1.0"/>
-    <fontRevision value="1.0"/>
-    <checkSumAdjustment value="0x640cdb2f"/>
-    <magicNumber value="0x5f0f3cf5"/>
-    <flags value="00000000 00000011"/>
-    <unitsPerEm value="1000"/>
-    <created value="Wed Sep  9 08:01:17 2015"/>
-    <modified value="Wed Sep  9 08:48:07 2015"/>
-    <xMin value="30"/>
-    <yMin value="-200"/>
-    <xMax value="629"/>
-    <yMax value="800"/>
-    <macStyle value="00000000 00000000"/>
-    <lowestRecPPEM value="7"/>
-    <fontDirectionHint value="2"/>
-    <indexToLocFormat value="0"/>
-    <glyphDataFormat value="0"/>
-  </head>
-
-  <hhea>
-    <tableVersion value="1.0"/>
-    <ascent value="1000"/>
-    <descent value="-200"/>
-    <lineGap value="0"/>
-    <advanceWidthMax value="659"/>
-    <minLeftSideBearing value="0"/>
-    <minRightSideBearing value="30"/>
-    <xMaxExtent value="629"/>
-    <caretSlopeRise value="1"/>
-    <caretSlopeRun value="0"/>
-    <caretOffset value="0"/>
-    <reserved0 value="0"/>
-    <reserved1 value="0"/>
-    <reserved2 value="0"/>
-    <reserved3 value="0"/>
-    <metricDataFormat value="0"/>
-    <numberOfHMetrics value="18"/>
-  </hhea>
-
-  <maxp>
-    <!-- Most of this table will be recalculated by the compiler -->
-    <tableVersion value="0x10000"/>
-    <numGlyphs value="54"/>
-    <maxPoints value="73"/>
-    <maxContours value="10"/>
-    <maxCompositePoints value="0"/>
-    <maxCompositeContours value="0"/>
-    <maxZones value="2"/>
-    <maxTwilightPoints value="12"/>
-    <maxStorage value="28"/>
-    <maxFunctionDefs value="119"/>
-    <maxInstructionDefs value="0"/>
-    <maxStackElements value="61"/>
-    <maxSizeOfInstructions value="2967"/>
-    <maxComponentElements value="0"/>
-    <maxComponentDepth value="0"/>
-  </maxp>
-
-  <OS_2>
-    <!-- The fields 'usFirstCharIndex' and 'usLastCharIndex'
-         will be recalculated by the compiler -->
-    <version value="3"/>
-    <xAvgCharWidth value="594"/>
-    <usWeightClass value="400"/>
-    <usWidthClass value="5"/>
-    <fsType value="00000000 00001000"/>
-    <ySubscriptXSize value="650"/>
-    <ySubscriptYSize value="600"/>
-    <ySubscriptXOffset value="0"/>
-    <ySubscriptYOffset value="75"/>
-    <ySuperscriptXSize value="650"/>
-    <ySuperscriptYSize value="600"/>
-    <ySuperscriptXOffset value="0"/>
-    <ySuperscriptYOffset value="350"/>
-    <yStrikeoutSize value="50"/>
-    <yStrikeoutPosition value="300"/>
-    <sFamilyClass value="0"/>
-    <panose>
-      <bFamilyType value="0"/>
-      <bSerifStyle value="0"/>
-      <bWeight value="5"/>
-      <bProportion value="0"/>
-      <bContrast value="0"/>
-      <bStrokeVariation value="0"/>
-      <bArmStyle value="0"/>
-      <bLetterForm value="0"/>
-      <bMidline value="0"/>
-      <bXHeight value="0"/>
-    </panose>
-    <ulUnicodeRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulUnicodeRange2 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange3 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange4 value="00000000 00000000 00000000 00000000"/>
-    <achVendID value="UKWN"/>
-    <fsSelection value="00000000 01000001"/>
-    <usFirstCharIndex value="32"/>
-    <usLastCharIndex value="122"/>
-    <sTypoAscender value="800"/>
-    <sTypoDescender value="-200"/>
-    <sTypoLineGap value="200"/>
-    <usWinAscent value="1000"/>
-    <usWinDescent value="200"/>
-    <ulCodePageRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulCodePageRange2 value="00000000 00000000 00000000 00000000"/>
-    <sxHeight value="500"/>
-    <sCapHeight value="700"/>
-    <usDefaultChar value="0"/>
-    <usBreakChar value="32"/>
-    <usMaxContext value="0"/>
-  </OS_2>
-
-  <hmtx>
-    <mtx name=".notdef" width="500" lsb="93"/>
-    <mtx name="a" width="500" lsb="93"/>
-    <mtx name="b" width="500" lsb="93"/>
-    <mtx name="c" width="500" lsb="93"/>
-    <mtx name="d" width="500" lsb="93"/>
-    <mtx name="e" width="500" lsb="93"/>
-    <mtx name="," width="500" lsb="93"/>
-    <mtx name="-" width="500" lsb="93"/>
-    <mtx name="!" width="500" lsb="93"/>
-    <mtx name="U+0301" width="500" lsb="93"/>
-  </hmtx>
-
-  <cmap>
-    <tableVersion version="0"/>
-    <cmap_format_4 platformID="3" platEncID="10" language="0">
-      <map code="0x0061" name="a" />
-      <map code="0x0062" name="b" />
-      <map code="0x0063" name="c" />
-      <map code="0x0064" name="d" />
-      <map code="0x0065" name="e" />
-      <map code="0x002C" name="," />
-      <map code="0x002D" name="-" />
-      <map code="0x0021" name="!" />
-      <map code="0x0301" name="U+0301" />
-    </cmap_format_4>
-  </cmap>
-
-  <loca>
-    <!-- The 'loca' table will be calculated by the compiler -->
-  </loca>
-
-  <glyf>
-
-    <!-- The xMin, yMin, xMax and yMax values
-         will be recalculated by the compiler. -->
-
-    <TTGlyph name=".notdef" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-
-    <TTGlyph name="a" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="b" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="c" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="d" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="e" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="," xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="-" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="!" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+0301" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-  </glyf>
-
-  <name>
-    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      ItalicFont Test
-    </namerecord>
-    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      Italic
-    </namerecord>
-    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      ItalicFont Test
-    </namerecord>
-    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      ItalicFontTest-Italic
-    </namerecord>
-    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
-      ItalicFont Test
-    </namerecord>
-    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
-      Italic
-    </namerecord>
-    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
-      ItalicFont Test
-    </namerecord>
-    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
-      ItalicFontTest-Italic
-    </namerecord>
-  </name>
-
-  <post>
-    <formatType value="3.0"/>
-    <italicAngle value="0.0"/>
-    <underlinePosition value="-75"/>
-    <underlineThickness value="50"/>
-    <isFixedPitch value="0"/>
-    <minMemType42 value="0"/>
-    <maxMemType42 value="0"/>
-    <minMemType1 value="0"/>
-    <maxMemType1 value="0"/>
-  </post>
-
-</ttFont>
diff --git a/third_party/txt/third_party/fonts/Ja.ttx b/third_party/txt/third_party/fonts/Ja.ttx
deleted file mode 100644
index 562ff04ca5bee7effafdcfb146b02a4475c952a4..0000000000000000000000000000000000000000
--- a/third_party/txt/third_party/fonts/Ja.ttx
+++ /dev/null
@@ -1,306 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.0">
-
-  <GlyphOrder>
-    <!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
-    <GlyphID id="0" name=".notdef"/>
-    <GlyphID id="1" name="U+3042"/>
-    <GlyphID id="2" name="U+3044"/>
-    <GlyphID id="3" name="U+3046"/>
-    <GlyphID id="4" name="U+3048"/>
-    <GlyphID id="5" name="U+304A"/>
-    <GlyphID id="6" name="U+81ED"/>
-    <GlyphID id="7" name="U+5FCD"/>
-    <GlyphID id="8" name="U+4FAE"/>
-    <GlyphID id="9" name="U+845B"/>
-    <GlyphID id="10" name="U+82B1"/>
-    <GlyphID id="11" name="U+242EE"/>
-    <GlyphID id="12" name="U+1F470"/>
-    <GlyphID id="13" name="U+9AA8"/>
-    <GlyphID id="14" name="U+35A8"/>
-    <GlyphID id="15" name="U+35B6"/>
-    <GlyphID id="16" name="U+35C5"/>
-  </GlyphOrder>
-
-  <head>
-    <!-- Most of this table will be recalculated by the compiler -->
-    <tableVersion value="1.0"/>
-    <fontRevision value="1.0"/>
-    <checkSumAdjustment value="0x640cdb2f"/>
-    <magicNumber value="0x5f0f3cf5"/>
-    <flags value="00000000 00000011"/>
-    <unitsPerEm value="1000"/>
-    <created value="Wed Sep  9 08:01:17 2015"/>
-    <modified value="Wed Sep  9 08:48:07 2015"/>
-    <xMin value="30"/>
-    <yMin value="-200"/>
-    <xMax value="629"/>
-    <yMax value="800"/>
-    <macStyle value="00000000 00000000"/>
-    <lowestRecPPEM value="7"/>
-    <fontDirectionHint value="2"/>
-    <indexToLocFormat value="0"/>
-    <glyphDataFormat value="0"/>
-  </head>
-
-  <hhea>
-    <tableVersion value="1.0"/>
-    <ascent value="1000"/>
-    <descent value="-200"/>
-    <lineGap value="0"/>
-    <advanceWidthMax value="659"/>
-    <minLeftSideBearing value="0"/>
-    <minRightSideBearing value="30"/>
-    <xMaxExtent value="629"/>
-    <caretSlopeRise value="1"/>
-    <caretSlopeRun value="0"/>
-    <caretOffset value="0"/>
-    <reserved0 value="0"/>
-    <reserved1 value="0"/>
-    <reserved2 value="0"/>
-    <reserved3 value="0"/>
-    <metricDataFormat value="0"/>
-    <numberOfHMetrics value="18"/>
-  </hhea>
-
-  <maxp>
-    <!-- Most of this table will be recalculated by the compiler -->
-    <tableVersion value="0x10000"/>
-    <numGlyphs value="54"/>
-    <maxPoints value="73"/>
-    <maxContours value="10"/>
-    <maxCompositePoints value="0"/>
-    <maxCompositeContours value="0"/>
-    <maxZones value="2"/>
-    <maxTwilightPoints value="12"/>
-    <maxStorage value="28"/>
-    <maxFunctionDefs value="119"/>
-    <maxInstructionDefs value="0"/>
-    <maxStackElements value="61"/>
-    <maxSizeOfInstructions value="2967"/>
-    <maxComponentElements value="0"/>
-    <maxComponentDepth value="0"/>
-  </maxp>
-
-  <OS_2>
-    <!-- The fields 'usFirstCharIndex' and 'usLastCharIndex'
-         will be recalculated by the compiler -->
-    <version value="3"/>
-    <xAvgCharWidth value="594"/>
-    <usWeightClass value="400"/>
-    <usWidthClass value="5"/>
-    <fsType value="00000000 00001000"/>
-    <ySubscriptXSize value="650"/>
-    <ySubscriptYSize value="600"/>
-    <ySubscriptXOffset value="0"/>
-    <ySubscriptYOffset value="75"/>
-    <ySuperscriptXSize value="650"/>
-    <ySuperscriptYSize value="600"/>
-    <ySuperscriptXOffset value="0"/>
-    <ySuperscriptYOffset value="350"/>
-    <yStrikeoutSize value="50"/>
-    <yStrikeoutPosition value="300"/>
-    <sFamilyClass value="0"/>
-    <panose>
-      <bFamilyType value="0"/>
-      <bSerifStyle value="0"/>
-      <bWeight value="5"/>
-      <bProportion value="0"/>
-      <bContrast value="0"/>
-      <bStrokeVariation value="0"/>
-      <bArmStyle value="0"/>
-      <bLetterForm value="0"/>
-      <bMidline value="0"/>
-      <bXHeight value="0"/>
-    </panose>
-    <ulUnicodeRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulUnicodeRange2 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange3 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange4 value="00000000 00000000 00000000 00000000"/>
-    <achVendID value="UKWN"/>
-    <fsSelection value="00000000 01000000"/>
-    <usFirstCharIndex value="32"/>
-    <usLastCharIndex value="122"/>
-    <sTypoAscender value="800"/>
-    <sTypoDescender value="-200"/>
-    <sTypoLineGap value="200"/>
-    <usWinAscent value="1000"/>
-    <usWinDescent value="200"/>
-    <ulCodePageRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulCodePageRange2 value="00000000 00000000 00000000 00000000"/>
-    <sxHeight value="500"/>
-    <sCapHeight value="700"/>
-    <usDefaultChar value="0"/>
-    <usBreakChar value="32"/>
-    <usMaxContext value="0"/>
-  </OS_2>
-
-  <hmtx>
-    <mtx name=".notdef" width="500" lsb="93"/>
-    <mtx name="U+3042" width="500" lsb="93"/>
-    <mtx name="U+3044" width="500" lsb="93"/>
-    <mtx name="U+3046" width="500" lsb="93"/>
-    <mtx name="U+3048" width="500" lsb="93"/>
-    <mtx name="U+304A" width="500" lsb="93"/>
-    <mtx name="U+81ED" width="500" lsb="93"/>
-    <mtx name="U+5FCD" width="500" lsb="93"/>
-    <mtx name="U+4FAE" width="500" lsb="93"/>
-    <mtx name="U+845B" width="500" lsb="93"/>
-    <mtx name="U+82B1" width="500" lsb="93"/>
-    <mtx name="U+242EE" width="500" lsb="93"/>
-    <mtx name="U+1F470" width="500" lsb="93"/>
-    <mtx name="U+9AA8" width="500" lsb="93"/>
-    <mtx name="U+35A8" width="500" lsb="93"/>
-    <mtx name="U+35B6" width="500" lsb="93"/>
-    <mtx name="U+35C5" width="500" lsb="93"/>
-  </hmtx>
-
-  <cmap>
-    <tableVersion version="0"/>
-    <cmap_format_12 format="12" reserved="0" length="10" nGroups="1" platformID="3" platEncID="1" language="0">
-      <map code="0x3042" name="U+3042" />
-      <map code="0x3044" name="U+3044" />
-      <map code="0x3046" name="U+3046" />
-      <map code="0x3048" name="U+3048" />
-      <map code="0x304A" name="U+304A" />
-      <map code="0x81ED" name="U+81ED" />
-      <map code="0x5FCD" name="U+5FCD" />
-      <map code="0x4FAE" name="U+4FAE" />
-      <map code="0x845B" name="U+845B" />
-      <map code="0x82B1" name="U+82B1" />
-      <map code="0x242EE" name="U+242EE" />
-      <map code="0x1F470" name="U+242EE" />
-      <map code="0x9AA8" name="U+9AA8" />
-      <map code="0x35A8" name="U+35A8" />
-      <map code="0x35B6" name="U+35B6" />
-      <map code="0x35C5" name="U+35C5" />
-    </cmap_format_12>
-    <cmap_format_14 format="14" platformID="0" platEncID="5" length="40" numVarSelectorRecords="3">
-      <map uvs="0xFE00" uv="0x4FAE" name="None" />
-      <map uvs="0xFE00" uv="0x242EE" name="None" />
-      <map uvs="0xE0100" uv="0x845B" name="None" />
-      <map uvs="0xE0100" uv="0x242EE" name="None" />
-      <map uvs="0xE0101" uv="0x242EE" name="None" />
-      <map uvs="0xE0100" uv="0x35A8" name="None" />
-      <map uvs="0xE0100" uv="0x35B6" name="None" />
-      <map uvs="0xE0100" uv="0x35C5" name="None" />
-    </cmap_format_14>
-  </cmap>
-
-  <loca>
-    <!-- The 'loca' table will be calculated by the compiler -->
-  </loca>
-
-  <glyf>
-
-    <!-- The xMin, yMin, xMax and yMax values
-         will be recalculated by the compiler. -->
-
-    <TTGlyph name=".notdef" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-
-    <TTGlyph name="U+3042" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+3044" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+3046" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+3048" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+304A" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+81ED" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+5FCD" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+4FAE" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+845B" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+82B1" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+242EE" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+1F470" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+9AA8" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+35A8" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+35B6" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+35C5" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-  </glyf>
-
-  <name>
-    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      JapaneseFont Test
-    </namerecord>
-    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      Regular
-    </namerecord>
-    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      JapaneseFont Test
-    </namerecord>
-    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      JapaneseFontTest-Regular
-    </namerecord>
-    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
-      JapaneseFont Test
-    </namerecord>
-    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
-      Regular
-    </namerecord>
-    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
-      JapaneseFont Test
-    </namerecord>
-    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
-      JapaneseFontTest-Regular
-    </namerecord>
-  </name>
-
-  <post>
-    <formatType value="3.0"/>
-    <italicAngle value="0.0"/>
-    <underlinePosition value="-75"/>
-    <underlineThickness value="50"/>
-    <isFixedPitch value="0"/>
-    <minMemType42 value="0"/>
-    <maxMemType42 value="0"/>
-    <minMemType1 value="0"/>
-    <maxMemType1 value="0"/>
-  </post>
-
-</ttFont>
diff --git a/third_party/txt/third_party/fonts/Katibeh-LICENSE.txt b/third_party/txt/third_party/fonts/Katibeh-LICENSE.txt
deleted file mode 100644
index b66a0c31aab4b6510aca5ced6e5d1227f2a12b63..0000000000000000000000000000000000000000
--- a/third_party/txt/third_party/fonts/Katibeh-LICENSE.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-Copyright 2015, 2016 KB-Studio (www.k-b-studio.com|tarobish@gmail.com). Copyright 2015, 2016 Lasse Fister (lasse@graphicore.de). Copyright 2015, 2016 Eduardo Tunni(edu@tipo.net.ar).
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/third_party/txt/third_party/fonts/Ko.ttx b/third_party/txt/third_party/fonts/Ko.ttx
deleted file mode 100644
index 06f12ecf54b53877b75d87f4d031c5f9a28892c2..0000000000000000000000000000000000000000
--- a/third_party/txt/third_party/fonts/Ko.ttx
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.0">
-
-  <GlyphOrder>
-    <!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
-    <GlyphID id="0" name=".notdef"/>
-    <GlyphID id="1" name="U+B300"/>
-    <GlyphID id="2" name="U+D55C"/>
-    <GlyphID id="3" name="U+BBFC"/>
-    <GlyphID id="4" name="U+AD6D"/>
-  </GlyphOrder>
-
-  <head>
-    <!-- Most of this table will be recalculated by the compiler -->
-    <tableVersion value="1.0"/>
-    <fontRevision value="1.0"/>
-    <checkSumAdjustment value="0x640cdb2f"/>
-    <magicNumber value="0x5f0f3cf5"/>
-    <flags value="00000000 00000011"/>
-    <unitsPerEm value="1000"/>
-    <created value="Wed Sep  9 08:01:17 2015"/>
-    <modified value="Wed Sep  9 08:48:07 2015"/>
-    <xMin value="30"/>
-    <yMin value="-200"/>
-    <xMax value="629"/>
-    <yMax value="800"/>
-    <macStyle value="00000000 00000000"/>
-    <lowestRecPPEM value="7"/>
-    <fontDirectionHint value="2"/>
-    <indexToLocFormat value="0"/>
-    <glyphDataFormat value="0"/>
-  </head>
-
-  <hhea>
-    <tableVersion value="1.0"/>
-    <ascent value="1000"/>
-    <descent value="-200"/>
-    <lineGap value="0"/>
-    <advanceWidthMax value="659"/>
-    <minLeftSideBearing value="0"/>
-    <minRightSideBearing value="30"/>
-    <xMaxExtent value="629"/>
-    <caretSlopeRise value="1"/>
-    <caretSlopeRun value="0"/>
-    <caretOffset value="0"/>
-    <reserved0 value="0"/>
-    <reserved1 value="0"/>
-    <reserved2 value="0"/>
-    <reserved3 value="0"/>
-    <metricDataFormat value="0"/>
-    <numberOfHMetrics value="18"/>
-  </hhea>
-
-  <maxp>
-    <!-- Most of this table will be recalculated by the compiler -->
-    <tableVersion value="0x10000"/>
-    <numGlyphs value="54"/>
-    <maxPoints value="73"/>
-    <maxContours value="10"/>
-    <maxCompositePoints value="0"/>
-    <maxCompositeContours value="0"/>
-    <maxZones value="2"/>
-    <maxTwilightPoints value="12"/>
-    <maxStorage value="28"/>
-    <maxFunctionDefs value="119"/>
-    <maxInstructionDefs value="0"/>
-    <maxStackElements value="61"/>
-    <maxSizeOfInstructions value="2967"/>
-    <maxComponentElements value="0"/>
-    <maxComponentDepth value="0"/>
-  </maxp>
-
-  <OS_2>
-    <!-- The fields 'usFirstCharIndex' and 'usLastCharIndex'
-         will be recalculated by the compiler -->
-    <version value="3"/>
-    <xAvgCharWidth value="594"/>
-    <usWeightClass value="400"/>
-    <usWidthClass value="5"/>
-    <fsType value="00000000 00001000"/>
-    <ySubscriptXSize value="650"/>
-    <ySubscriptYSize value="600"/>
-    <ySubscriptXOffset value="0"/>
-    <ySubscriptYOffset value="75"/>
-    <ySuperscriptXSize value="650"/>
-    <ySuperscriptYSize value="600"/>
-    <ySuperscriptXOffset value="0"/>
-    <ySuperscriptYOffset value="350"/>
-    <yStrikeoutSize value="50"/>
-    <yStrikeoutPosition value="300"/>
-    <sFamilyClass value="0"/>
-    <panose>
-      <bFamilyType value="0"/>
-      <bSerifStyle value="0"/>
-      <bWeight value="5"/>
-      <bProportion value="0"/>
-      <bContrast value="0"/>
-      <bStrokeVariation value="0"/>
-      <bArmStyle value="0"/>
-      <bLetterForm value="0"/>
-      <bMidline value="0"/>
-      <bXHeight value="0"/>
-    </panose>
-    <ulUnicodeRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulUnicodeRange2 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange3 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange4 value="00000000 00000000 00000000 00000000"/>
-    <achVendID value="UKWN"/>
-    <fsSelection value="00000000 01000000"/>
-    <usFirstCharIndex value="32"/>
-    <usLastCharIndex value="122"/>
-    <sTypoAscender value="800"/>
-    <sTypoDescender value="-200"/>
-    <sTypoLineGap value="200"/>
-    <usWinAscent value="1000"/>
-    <usWinDescent value="200"/>
-    <ulCodePageRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulCodePageRange2 value="00000000 00000000 00000000 00000000"/>
-    <sxHeight value="500"/>
-    <sCapHeight value="700"/>
-    <usDefaultChar value="0"/>
-    <usBreakChar value="32"/>
-    <usMaxContext value="0"/>
-  </OS_2>
-
-  <hmtx>
-    <mtx name=".notdef" width="500" lsb="93"/>
-    <mtx name="U+B300" width="500" lsb="93"/>
-    <mtx name="U+D55C" width="500" lsb="93"/>
-    <mtx name="U+BBFC" width="500" lsb="93"/>
-    <mtx name="U+AD6D" width="500" lsb="93"/>
-  </hmtx>
-
-  <cmap>
-    <tableVersion version="0"/>
-    <cmap_format_4 platformID="3" platEncID="10" language="0">
-      <map code="0xB300" name="U+B300" />
-      <map code="0xD55C" name="U+D55C" />
-      <map code="0xBBFC" name="U+BBFC" />
-      <map code="0xAD6D" name="U+AD6D" />
-    </cmap_format_4>
-  </cmap>
-
-  <loca>
-    <!-- The 'loca' table will be calculated by the compiler -->
-  </loca>
-
-  <glyf>
-
-    <!-- The xMin, yMin, xMax and yMax values
-         will be recalculated by the compiler. -->
-
-    <TTGlyph name=".notdef" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-
-    <TTGlyph name="U+B300" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+D55C" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+BBFC" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+AD6D" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-  </glyf>
-
-  <name>
-    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      KoreanFont Test
-    </namerecord>
-    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      Regular
-    </namerecord>
-    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      KoreanFont Test
-    </namerecord>
-    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      KoreanFontTest-Regular
-    </namerecord>
-    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
-      KoreanFont Test
-    </namerecord>
-    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
-      Regular
-    </namerecord>
-    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
-      KoreanFont Test
-    </namerecord>
-    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
-      KoreanFontTest-Regular
-    </namerecord>
-  </name>
-
-  <post>
-    <formatType value="3.0"/>
-    <italicAngle value="0.0"/>
-    <underlinePosition value="-75"/>
-    <underlineThickness value="50"/>
-    <isFixedPitch value="0"/>
-    <minMemType42 value="0"/>
-    <maxMemType42 value="0"/>
-    <minMemType1 value="0"/>
-    <maxMemType1 value="0"/>
-  </post>
-
-</ttFont>
diff --git a/third_party/txt/third_party/fonts/MultiAxis.ttx b/third_party/txt/third_party/fonts/MultiAxis.ttx
deleted file mode 100644
index 7c17198c5c80596b36c1e6d76c825b6f43b7bfd0..0000000000000000000000000000000000000000
--- a/third_party/txt/third_party/fonts/MultiAxis.ttx
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.0">
-
-  <GlyphOrder>
-    <!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
-    <GlyphID id="0" name=".notdef"/>
-    <GlyphID id="1" name="default"/>
-  </GlyphOrder>
-
-  <head>
-    <!-- Most of this table will be recalculated by the compiler -->
-    <tableVersion value="1.0"/>
-    <fontRevision value="1.0"/>
-    <checkSumAdjustment value="0x640cdb2f"/>
-    <magicNumber value="0x5f0f3cf5"/>
-    <flags value="00000000 00000011"/>
-    <unitsPerEm value="1000"/>
-    <created value="Wed Sep  9 08:01:17 2015"/>
-    <modified value="Wed Sep  9 08:48:07 2015"/>
-    <xMin value="30"/>
-    <yMin value="-200"/>
-    <xMax value="629"/>
-    <yMax value="800"/>
-    <macStyle value="00000000 00000000"/>
-    <lowestRecPPEM value="7"/>
-    <fontDirectionHint value="2"/>
-    <indexToLocFormat value="0"/>
-    <glyphDataFormat value="0"/>
-  </head>
-
-  <hhea>
-    <tableVersion value="1.0"/>
-    <ascent value="1000"/>
-    <descent value="-200"/>
-    <lineGap value="0"/>
-    <advanceWidthMax value="659"/>
-    <minLeftSideBearing value="0"/>
-    <minRightSideBearing value="30"/>
-    <xMaxExtent value="629"/>
-    <caretSlopeRise value="1"/>
-    <caretSlopeRun value="0"/>
-    <caretOffset value="0"/>
-    <reserved0 value="0"/>
-    <reserved1 value="0"/>
-    <reserved2 value="0"/>
-    <reserved3 value="0"/>
-    <metricDataFormat value="0"/>
-    <numberOfHMetrics value="18"/>
-  </hhea>
-
-  <maxp>
-    <!-- Most of this table will be recalculated by the compiler -->
-    <tableVersion value="0x10000"/>
-    <numGlyphs value="54"/>
-    <maxPoints value="73"/>
-    <maxContours value="10"/>
-    <maxCompositePoints value="0"/>
-    <maxCompositeContours value="0"/>
-    <maxZones value="2"/>
-    <maxTwilightPoints value="12"/>
-    <maxStorage value="28"/>
-    <maxFunctionDefs value="119"/>
-    <maxInstructionDefs value="0"/>
-    <maxStackElements value="61"/>
-    <maxSizeOfInstructions value="2967"/>
-    <maxComponentElements value="0"/>
-    <maxComponentDepth value="0"/>
-  </maxp>
-
-  <OS_2>
-    <!-- The fields 'usFirstCharIndex' and 'usLastCharIndex'
-         will be recalculated by the compiler -->
-    <version value="3"/>
-    <xAvgCharWidth value="594"/>
-    <usWeightClass value="400"/>
-    <usWidthClass value="5"/>
-    <fsType value="00000000 00001000"/>
-    <ySubscriptXSize value="650"/>
-    <ySubscriptYSize value="600"/>
-    <ySubscriptXOffset value="0"/>
-    <ySubscriptYOffset value="75"/>
-    <ySuperscriptXSize value="650"/>
-    <ySuperscriptYSize value="600"/>
-    <ySuperscriptXOffset value="0"/>
-    <ySuperscriptYOffset value="350"/>
-    <yStrikeoutSize value="50"/>
-    <yStrikeoutPosition value="300"/>
-    <sFamilyClass value="0"/>
-    <panose>
-      <bFamilyType value="0"/>
-      <bSerifStyle value="0"/>
-      <bWeight value="5"/>
-      <bProportion value="0"/>
-      <bContrast value="0"/>
-      <bStrokeVariation value="0"/>
-      <bArmStyle value="0"/>
-      <bLetterForm value="0"/>
-      <bMidline value="0"/>
-      <bXHeight value="0"/>
-    </panose>
-    <ulUnicodeRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulUnicodeRange2 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange3 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange4 value="00000000 00000000 00000000 00000000"/>
-    <achVendID value="UKWN"/>
-    <fsSelection value="00000000 01000000"/>
-    <usFirstCharIndex value="32"/>
-    <usLastCharIndex value="122"/>
-    <sTypoAscender value="800"/>
-    <sTypoDescender value="-200"/>
-    <sTypoLineGap value="200"/>
-    <usWinAscent value="1000"/>
-    <usWinDescent value="200"/>
-    <ulCodePageRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulCodePageRange2 value="00000000 00000000 00000000 00000000"/>
-    <sxHeight value="500"/>
-    <sCapHeight value="700"/>
-    <usDefaultChar value="0"/>
-    <usBreakChar value="32"/>
-    <usMaxContext value="0"/>
-  </OS_2>
-
-  <hmtx>
-    <mtx name=".notdef" width="500" lsb="93"/>
-    <mtx name="default" width="500" lsb="93"/>
-  </hmtx>
-
-  <cmap>
-    <tableVersion version="0"/>
-    <cmap_format_4 platformID="3" platEncID="10" language="0">
-      <map code="0x0061" name="default" />
-    </cmap_format_4>
-  </cmap>
-
-  <loca>
-    <!-- The 'loca' table will be calculated by the compiler -->
-  </loca>
-
-  <glyf>
-
-    <!-- The xMin, yMin, xMax and yMax values
-         will be recalculated by the compiler. -->
-
-    <TTGlyph name=".notdef" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-
-    <TTGlyph name="default" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-  </glyf>
-
-  <fvar>
-    <Axis>
-      <AxisTag>wdth</AxisTag>
-      <MinValue>-1.0</MinValue>
-      <DefaultValue>0.0</DefaultValue>
-      <MaxValue>1.0</MaxValue>
-      <NameID>256</NameID>
-    </Axis>
-    <Axis>
-      <AxisTag>wght</AxisTag>
-      <MinValue>-1.0</MinValue>
-      <DefaultValue>0.0</DefaultValue>
-      <MaxValue>1.0</MaxValue>
-      <NameID>256</NameID>
-    </Axis>
-  </fvar>
-
-  <name>
-    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      MultiAxisFont Test
-    </namerecord>
-    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      MultiAxis
-    </namerecord>
-    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      MultiAxisFont Test
-    </namerecord>
-    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      MultiAxisFontTest-Regular
-    </namerecord>
-    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
-      MultiAxisFont Test
-    </namerecord>
-    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
-      MultiAxis
-    </namerecord>
-    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
-      MultiAxisFont Test
-    </namerecord>
-    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
-      MultiAxisFontTest-Regular
-    </namerecord>
-  </name>
-
-  <post>
-    <formatType value="3.0"/>
-    <italicAngle value="0.0"/>
-    <underlinePosition value="-75"/>
-    <underlineThickness value="50"/>
-    <isFixedPitch value="0"/>
-    <minMemType42 value="0"/>
-    <maxMemType42 value="0"/>
-    <minMemType1 value="0"/>
-    <maxMemType1 value="0"/>
-  </post>
-
-</ttFont>
diff --git a/third_party/txt/third_party/fonts/NoCmapFormat14.ttx b/third_party/txt/third_party/fonts/NoCmapFormat14.ttx
deleted file mode 100644
index e034f77d32a8f24d78e87c9e9df82bfcfd94d8c7..0000000000000000000000000000000000000000
--- a/third_party/txt/third_party/fonts/NoCmapFormat14.ttx
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.0">
-
-  <GlyphOrder>
-    <!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
-    <GlyphID id="0" name=".notdef"/>
-    <GlyphID id="1" name="defaultGlyph"/>
-  </GlyphOrder>
-
-  <head>
-    <!-- Most of this table will be recalculated by the compiler -->
-    <tableVersion value="1.0"/>
-    <fontRevision value="1.0"/>
-    <checkSumAdjustment value="0x640cdb2f"/>
-    <magicNumber value="0x5f0f3cf5"/>
-    <flags value="00000000 00000011"/>
-    <unitsPerEm value="1000"/>
-    <created value="Wed Sep  9 08:01:17 2015"/>
-    <modified value="Wed Sep  9 08:48:07 2015"/>
-    <xMin value="30"/>
-    <yMin value="-200"/>
-    <xMax value="629"/>
-    <yMax value="800"/>
-    <macStyle value="00000000 00000000"/>
-    <lowestRecPPEM value="7"/>
-    <fontDirectionHint value="2"/>
-    <indexToLocFormat value="0"/>
-    <glyphDataFormat value="0"/>
-  </head>
-
-  <hhea>
-    <tableVersion value="1.0"/>
-    <ascent value="1000"/>
-    <descent value="-200"/>
-    <lineGap value="0"/>
-    <advanceWidthMax value="659"/>
-    <minLeftSideBearing value="0"/>
-    <minRightSideBearing value="30"/>
-    <xMaxExtent value="629"/>
-    <caretSlopeRise value="1"/>
-    <caretSlopeRun value="0"/>
-    <caretOffset value="0"/>
-    <reserved0 value="0"/>
-    <reserved1 value="0"/>
-    <reserved2 value="0"/>
-    <reserved3 value="0"/>
-    <metricDataFormat value="0"/>
-    <numberOfHMetrics value="18"/>
-  </hhea>
-
-  <maxp>
-    <!-- Most of this table will be recalculated by the compiler -->
-    <tableVersion value="0x10000"/>
-    <numGlyphs value="54"/>
-    <maxPoints value="73"/>
-    <maxContours value="10"/>
-    <maxCompositePoints value="0"/>
-    <maxCompositeContours value="0"/>
-    <maxZones value="2"/>
-    <maxTwilightPoints value="12"/>
-    <maxStorage value="28"/>
-    <maxFunctionDefs value="119"/>
-    <maxInstructionDefs value="0"/>
-    <maxStackElements value="61"/>
-    <maxSizeOfInstructions value="2967"/>
-    <maxComponentElements value="0"/>
-    <maxComponentDepth value="0"/>
-  </maxp>
-
-  <OS_2>
-    <!-- The fields 'usFirstCharIndex' and 'usLastCharIndex'
-         will be recalculated by the compiler -->
-    <version value="3"/>
-    <xAvgCharWidth value="594"/>
-    <usWeightClass value="400"/>
-    <usWidthClass value="5"/>
-    <fsType value="00000000 00001000"/>
-    <ySubscriptXSize value="650"/>
-    <ySubscriptYSize value="600"/>
-    <ySubscriptXOffset value="0"/>
-    <ySubscriptYOffset value="75"/>
-    <ySuperscriptXSize value="650"/>
-    <ySuperscriptYSize value="600"/>
-    <ySuperscriptXOffset value="0"/>
-    <ySuperscriptYOffset value="350"/>
-    <yStrikeoutSize value="50"/>
-    <yStrikeoutPosition value="300"/>
-    <sFamilyClass value="0"/>
-    <panose>
-      <bFamilyType value="0"/>
-      <bSerifStyle value="0"/>
-      <bWeight value="5"/>
-      <bProportion value="0"/>
-      <bContrast value="0"/>
-      <bStrokeVariation value="0"/>
-      <bArmStyle value="0"/>
-      <bLetterForm value="0"/>
-      <bMidline value="0"/>
-      <bXHeight value="0"/>
-    </panose>
-    <ulUnicodeRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulUnicodeRange2 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange3 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange4 value="00000000 00000000 00000000 00000000"/>
-    <achVendID value="UKWN"/>
-    <fsSelection value="00000000 01000000"/>
-    <usFirstCharIndex value="32"/>
-    <usLastCharIndex value="122"/>
-    <sTypoAscender value="800"/>
-    <sTypoDescender value="-200"/>
-    <sTypoLineGap value="200"/>
-    <usWinAscent value="1000"/>
-    <usWinDescent value="200"/>
-    <ulCodePageRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulCodePageRange2 value="00000000 00000000 00000000 00000000"/>
-    <sxHeight value="500"/>
-    <sCapHeight value="700"/>
-    <usDefaultChar value="0"/>
-    <usBreakChar value="32"/>
-    <usMaxContext value="0"/>
-  </OS_2>
-
-  <hmtx>
-    <mtx name=".notdef" width="500" lsb="93"/>
-    <mtx name="defaultGlyph" width="500" lsb="93"/>
-  </hmtx>
-
-  <cmap>
-    <tableVersion version="0"/>
-    <cmap_format_4 platformID="3" platEncID="10" language="0">
-      <map code="0x5380" name="defaultGlyph" />
-    </cmap_format_4>
-    <!-- Do not add cmap_format_14 here since this font is designed for testing purpose. -->
-  </cmap>
-
-  <loca>
-    <!-- The 'loca' table will be calculated by the compiler -->
-  </loca>
-
-  <glyf>
-
-    <!-- The xMin, yMin, xMax and yMax values
-         will be recalculated by the compiler. -->
-
-    <TTGlyph name=".notdef" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-
-    <TTGlyph name="defaultGlyph" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-  </glyf>
-
-  <name>
-    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      No Cmap Format 14 Subtable Test
-    </namerecord>
-    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      Regular
-    </namerecord>
-    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      No Cmap Format 14 Subtable Test
-    </namerecord>
-    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      No Cmap Format 14 SubtableTest-Regular
-    </namerecord>
-    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
-      No Cmap Format 14 Subtable Test
-    </namerecord>
-    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
-      Regular
-    </namerecord>
-    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
-      No Cmap Format 14 Subtable Test
-    </namerecord>
-    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
-      No Cmap Format 14 SubtableTest-Regular
-    </namerecord>
-  </name>
-
-  <post>
-    <formatType value="3.0"/>
-    <italicAngle value="0.0"/>
-    <underlinePosition value="-75"/>
-    <underlineThickness value="50"/>
-    <isFixedPitch value="0"/>
-    <minMemType42 value="0"/>
-    <maxMemType42 value="0"/>
-    <minMemType1 value="0"/>
-    <maxMemType1 value="0"/>
-  </post>
-
-</ttFont>
diff --git a/third_party/txt/third_party/fonts/NoGlyphFont.ttx b/third_party/txt/third_party/fonts/NoGlyphFont.ttx
deleted file mode 100644
index 72c9f292f05eefa14e3195b1a50c12eeccc5b92b..0000000000000000000000000000000000000000
--- a/third_party/txt/third_party/fonts/NoGlyphFont.ttx
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.0">
-
-  <GlyphOrder>
-    <!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
-    <GlyphID id="0" name=".notdef"/>
-  </GlyphOrder>
-
-  <head>
-    <!-- Most of this table will be recalculated by the compiler -->
-    <tableVersion value="1.0"/>
-    <fontRevision value="1.0"/>
-    <checkSumAdjustment value="0x640cdb2f"/>
-    <magicNumber value="0x5f0f3cf5"/>
-    <flags value="00000000 00000011"/>
-    <unitsPerEm value="1000"/>
-    <created value="Wed Sep  9 08:01:17 2015"/>
-    <modified value="Wed Sep  9 08:48:07 2015"/>
-    <xMin value="30"/>
-    <yMin value="-200"/>
-    <xMax value="629"/>
-    <yMax value="800"/>
-    <macStyle value="00000000 00000000"/>
-    <lowestRecPPEM value="7"/>
-    <fontDirectionHint value="2"/>
-    <indexToLocFormat value="0"/>
-    <glyphDataFormat value="0"/>
-  </head>
-
-  <hhea>
-    <tableVersion value="1.0"/>
-    <ascent value="1000"/>
-    <descent value="-200"/>
-    <lineGap value="0"/>
-    <advanceWidthMax value="659"/>
-    <minLeftSideBearing value="0"/>
-    <minRightSideBearing value="30"/>
-    <xMaxExtent value="629"/>
-    <caretSlopeRise value="1"/>
-    <caretSlopeRun value="0"/>
-    <caretOffset value="0"/>
-    <reserved0 value="0"/>
-    <reserved1 value="0"/>
-    <reserved2 value="0"/>
-    <reserved3 value="0"/>
-    <metricDataFormat value="0"/>
-    <numberOfHMetrics value="18"/>
-  </hhea>
-
-  <maxp>
-    <!-- Most of this table will be recalculated by the compiler -->
-    <tableVersion value="0x10000"/>
-    <numGlyphs value="54"/>
-    <maxPoints value="73"/>
-    <maxContours value="10"/>
-    <maxCompositePoints value="0"/>
-    <maxCompositeContours value="0"/>
-    <maxZones value="2"/>
-    <maxTwilightPoints value="12"/>
-    <maxStorage value="28"/>
-    <maxFunctionDefs value="119"/>
-    <maxInstructionDefs value="0"/>
-    <maxStackElements value="61"/>
-    <maxSizeOfInstructions value="2967"/>
-    <maxComponentElements value="0"/>
-    <maxComponentDepth value="0"/>
-  </maxp>
-
-  <OS_2>
-    <!-- The fields 'usFirstCharIndex' and 'usLastCharIndex'
-         will be recalculated by the compiler -->
-    <version value="3"/>
-    <xAvgCharWidth value="594"/>
-    <usWeightClass value="400"/>
-    <usWidthClass value="5"/>
-    <fsType value="00000000 00001000"/>
-    <ySubscriptXSize value="650"/>
-    <ySubscriptYSize value="600"/>
-    <ySubscriptXOffset value="0"/>
-    <ySubscriptYOffset value="75"/>
-    <ySuperscriptXSize value="650"/>
-    <ySuperscriptYSize value="600"/>
-    <ySuperscriptXOffset value="0"/>
-    <ySuperscriptYOffset value="350"/>
-    <yStrikeoutSize value="50"/>
-    <yStrikeoutPosition value="300"/>
-    <sFamilyClass value="0"/>
-    <panose>
-      <bFamilyType value="0"/>
-      <bSerifStyle value="0"/>
-      <bWeight value="5"/>
-      <bProportion value="0"/>
-      <bContrast value="0"/>
-      <bStrokeVariation value="0"/>
-      <bArmStyle value="0"/>
-      <bLetterForm value="0"/>
-      <bMidline value="0"/>
-      <bXHeight value="0"/>
-    </panose>
-    <ulUnicodeRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulUnicodeRange2 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange3 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange4 value="00000000 00000000 00000000 00000000"/>
-    <achVendID value="UKWN"/>
-    <fsSelection value="00000000 01000000"/>
-    <usFirstCharIndex value="32"/>
-    <usLastCharIndex value="122"/>
-    <sTypoAscender value="800"/>
-    <sTypoDescender value="-200"/>
-    <sTypoLineGap value="200"/>
-    <usWinAscent value="1000"/>
-    <usWinDescent value="200"/>
-    <ulCodePageRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulCodePageRange2 value="00000000 00000000 00000000 00000000"/>
-    <sxHeight value="500"/>
-    <sCapHeight value="700"/>
-    <usDefaultChar value="0"/>
-    <usBreakChar value="32"/>
-    <usMaxContext value="0"/>
-  </OS_2>
-
-  <hmtx>
-    <mtx name=".notdef" width="500" lsb="93"/>
-  </hmtx>
-
-  <cmap>
-    <tableVersion version="0"/>
-    <cmap_format_4 platformID="3" platEncID="10" language="0">
-    </cmap_format_4>
-  </cmap>
-
-  <loca>
-    <!-- The 'loca' table will be calculated by the compiler -->
-  </loca>
-
-  <glyf>
-
-    <!-- The xMin, yMin, xMax and yMax values
-         will be recalculated by the compiler. -->
-
-    <TTGlyph name=".notdef" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-  </glyf>
-
-  <name>
-    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      EmptyFont Test
-    </namerecord>
-    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      Regular
-    </namerecord>
-    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      EmptyFont Test
-    </namerecord>
-    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      EmptyFontTest-Regular
-    </namerecord>
-    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
-      EmptyFont Test
-    </namerecord>
-    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
-      Regular
-    </namerecord>
-    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
-      EmptyFont Test
-    </namerecord>
-    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
-      EmptyFontTest-Regular
-    </namerecord>
-  </name>
-
-  <post>
-    <formatType value="3.0"/>
-    <italicAngle value="0.0"/>
-    <underlinePosition value="-75"/>
-    <underlineThickness value="50"/>
-    <isFixedPitch value="0"/>
-    <minMemType42 value="0"/>
-    <maxMemType42 value="0"/>
-    <minMemType1 value="0"/>
-    <maxMemType1 value="0"/>
-  </post>
-
-</ttFont>
diff --git a/third_party/txt/third_party/fonts/NotoColorEmoji-LICENSE.txt b/third_party/txt/third_party/fonts/NotoColorEmoji-LICENSE.txt
deleted file mode 100644
index 88cbb72152efe820ec9551583db1185104966fa0..0000000000000000000000000000000000000000
--- a/third_party/txt/third_party/fonts/NotoColorEmoji-LICENSE.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-
-This Font Software is licensed under the SIL Open Font License,
-Version 1.1.
-
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font
-creation efforts of academic and linguistic communities, and to
-provide a free and open framework in which fonts may be shared and
-improved in partnership with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply to
-any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software
-components as distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to,
-deleting, or substituting -- in part or in whole -- any of the
-components of the Original Version, by changing formats or by porting
-the Font Software to a new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed,
-modify, redistribute, and sell modified and unmodified copies of the
-Font Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components, in
-Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the
-corresponding Copyright Holder. This restriction only applies to the
-primary font name as presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created using
-the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
\ No newline at end of file
diff --git a/third_party/txt/third_party/fonts/NotoNaskhArabic-LICENSE.txt b/third_party/txt/third_party/fonts/NotoNaskhArabic-LICENSE.txt
deleted file mode 100644
index d952d62c065f3f35fb83a173496e90b21525aef3..0000000000000000000000000000000000000000
--- a/third_party/txt/third_party/fonts/NotoNaskhArabic-LICENSE.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-This Font Software is licensed under the SIL Open Font License,
-Version 1.1.
-
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font
-creation efforts of academic and linguistic communities, and to
-provide a free and open framework in which fonts may be shared and
-improved in partnership with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply to
-any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software
-components as distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to,
-deleting, or substituting -- in part or in whole -- any of the
-components of the Original Version, by changing formats or by porting
-the Font Software to a new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed,
-modify, redistribute, and sell modified and unmodified copies of the
-Font Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components, in
-Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the
-corresponding Copyright Holder. This restriction only applies to the
-primary font name as presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created using
-the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/third_party/txt/third_party/fonts/Regular.ttx b/third_party/txt/third_party/fonts/Regular.ttx
deleted file mode 100644
index a5f3ebac2653e2f4467e6683e3119d2222accac4..0000000000000000000000000000000000000000
--- a/third_party/txt/third_party/fonts/Regular.ttx
+++ /dev/null
@@ -1,263 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.0">
-
-  <GlyphOrder>
-    <!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
-    <GlyphID id="0" name=".notdef"/>
-    <GlyphID id="1" name="a"/>
-    <GlyphID id="2" name="b"/>
-    <GlyphID id="3" name="c"/>
-    <GlyphID id="4" name="d"/>
-    <GlyphID id="5" name="e"/>
-    <GlyphID id="6" name=","/>
-    <GlyphID id="7" name="-"/>
-    <GlyphID id="8" name="!"/>
-    <GlyphID id="9" name="U+0301"/>
-    <GlyphID id="10" name="U+203C"/>
-  </GlyphOrder>
-
-  <head>
-    <!-- Most of this table will be recalculated by the compiler -->
-    <tableVersion value="1.0"/>
-    <fontRevision value="1.0"/>
-    <checkSumAdjustment value="0x640cdb2f"/>
-    <magicNumber value="0x5f0f3cf5"/>
-    <flags value="00000000 00000011"/>
-    <unitsPerEm value="1000"/>
-    <created value="Wed Sep  9 08:01:17 2015"/>
-    <modified value="Wed Sep  9 08:48:07 2015"/>
-    <xMin value="30"/>
-    <yMin value="-200"/>
-    <xMax value="629"/>
-    <yMax value="800"/>
-    <macStyle value="00000000 00000000"/>
-    <lowestRecPPEM value="7"/>
-    <fontDirectionHint value="2"/>
-    <indexToLocFormat value="0"/>
-    <glyphDataFormat value="0"/>
-  </head>
-
-  <hhea>
-    <tableVersion value="1.0"/>
-    <ascent value="1000"/>
-    <descent value="-200"/>
-    <lineGap value="0"/>
-    <advanceWidthMax value="659"/>
-    <minLeftSideBearing value="0"/>
-    <minRightSideBearing value="30"/>
-    <xMaxExtent value="629"/>
-    <caretSlopeRise value="1"/>
-    <caretSlopeRun value="0"/>
-    <caretOffset value="0"/>
-    <reserved0 value="0"/>
-    <reserved1 value="0"/>
-    <reserved2 value="0"/>
-    <reserved3 value="0"/>
-    <metricDataFormat value="0"/>
-    <numberOfHMetrics value="18"/>
-  </hhea>
-
-  <maxp>
-    <!-- Most of this table will be recalculated by the compiler -->
-    <tableVersion value="0x10000"/>
-    <numGlyphs value="54"/>
-    <maxPoints value="73"/>
-    <maxContours value="10"/>
-    <maxCompositePoints value="0"/>
-    <maxCompositeContours value="0"/>
-    <maxZones value="2"/>
-    <maxTwilightPoints value="12"/>
-    <maxStorage value="28"/>
-    <maxFunctionDefs value="119"/>
-    <maxInstructionDefs value="0"/>
-    <maxStackElements value="61"/>
-    <maxSizeOfInstructions value="2967"/>
-    <maxComponentElements value="0"/>
-    <maxComponentDepth value="0"/>
-  </maxp>
-
-  <OS_2>
-    <!-- The fields 'usFirstCharIndex' and 'usLastCharIndex'
-         will be recalculated by the compiler -->
-    <version value="3"/>
-    <xAvgCharWidth value="594"/>
-    <usWeightClass value="400"/>
-    <usWidthClass value="5"/>
-    <fsType value="00000000 00001000"/>
-    <ySubscriptXSize value="650"/>
-    <ySubscriptYSize value="600"/>
-    <ySubscriptXOffset value="0"/>
-    <ySubscriptYOffset value="75"/>
-    <ySuperscriptXSize value="650"/>
-    <ySuperscriptYSize value="600"/>
-    <ySuperscriptXOffset value="0"/>
-    <ySuperscriptYOffset value="350"/>
-    <yStrikeoutSize value="50"/>
-    <yStrikeoutPosition value="300"/>
-    <sFamilyClass value="0"/>
-    <panose>
-      <bFamilyType value="0"/>
-      <bSerifStyle value="0"/>
-      <bWeight value="5"/>
-      <bProportion value="0"/>
-      <bContrast value="0"/>
-      <bStrokeVariation value="0"/>
-      <bArmStyle value="0"/>
-      <bLetterForm value="0"/>
-      <bMidline value="0"/>
-      <bXHeight value="0"/>
-    </panose>
-    <ulUnicodeRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulUnicodeRange2 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange3 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange4 value="00000000 00000000 00000000 00000000"/>
-    <achVendID value="UKWN"/>
-    <fsSelection value="00000000 01000000"/>
-    <usFirstCharIndex value="32"/>
-    <usLastCharIndex value="122"/>
-    <sTypoAscender value="800"/>
-    <sTypoDescender value="-200"/>
-    <sTypoLineGap value="200"/>
-    <usWinAscent value="1000"/>
-    <usWinDescent value="200"/>
-    <ulCodePageRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulCodePageRange2 value="00000000 00000000 00000000 00000000"/>
-    <sxHeight value="500"/>
-    <sCapHeight value="700"/>
-    <usDefaultChar value="0"/>
-    <usBreakChar value="32"/>
-    <usMaxContext value="0"/>
-  </OS_2>
-
-  <hmtx>
-    <mtx name=".notdef" width="500" lsb="93"/>
-    <mtx name="a" width="500" lsb="93"/>
-    <mtx name="b" width="500" lsb="93"/>
-    <mtx name="c" width="500" lsb="93"/>
-    <mtx name="d" width="500" lsb="93"/>
-    <mtx name="e" width="500" lsb="93"/>
-    <mtx name="," width="500" lsb="93"/>
-    <mtx name="-" width="500" lsb="93"/>
-    <mtx name="!" width="500" lsb="93"/>
-    <mtx name="U+0301" width="500" lsb="93"/>
-    <mtx name="U+203C" width="500" lsb="93"/>
-  </hmtx>
-
-  <cmap>
-    <tableVersion version="0"/>
-    <cmap_format_4 platformID="3" platEncID="10" language="0">
-      <map code="0x0061" name="a" />
-      <map code="0x0062" name="b" />
-      <map code="0x0063" name="c" />
-      <map code="0x0064" name="d" />
-      <map code="0x0065" name="e" />
-      <map code="0x002C" name="," />
-      <map code="0x002D" name="-" />
-      <map code="0x0021" name="!" />
-      <map code="0x0301" name="U+0301" />
-      <map code="0x203C" name="U+203C" />
-    </cmap_format_4>
-    <cmap_format_14 format="14" platformID="0" platEncID="5" length="29" numVarSelectorRecords="1">
-      <map uvs="0xFE0E" uv="0x203C" name="None" />
-    </cmap_format_14>
-  </cmap>
-
-  <loca>
-    <!-- The 'loca' table will be calculated by the compiler -->
-  </loca>
-
-  <glyf>
-
-    <!-- The xMin, yMin, xMax and yMax values
-         will be recalculated by the compiler. -->
-
-    <TTGlyph name=".notdef" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-
-    <TTGlyph name="a" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="b" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="c" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="d" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="e" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="," xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="-" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="!" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+0301" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+203C" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-  </glyf>
-
-  <name>
-    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      RegularFont Test
-    </namerecord>
-    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      Regular
-    </namerecord>
-    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      RegularFont Test
-    </namerecord>
-    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      RegularFontTest-Regular
-    </namerecord>
-    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
-      RegularFont Test
-    </namerecord>
-    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
-      Regular
-    </namerecord>
-    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
-      RegularFont Test
-    </namerecord>
-    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
-      RegularFontTest-Regular
-    </namerecord>
-  </name>
-
-  <post>
-    <formatType value="3.0"/>
-    <italicAngle value="0.0"/>
-    <underlinePosition value="-75"/>
-    <underlineThickness value="50"/>
-    <isFixedPitch value="0"/>
-    <minMemType42 value="0"/>
-    <maxMemType42 value="0"/>
-    <minMemType1 value="0"/>
-    <maxMemType1 value="0"/>
-  </post>
-
-</ttFont>
diff --git a/third_party/txt/third_party/fonts/SourceHanSerif-LICENSE.txt b/third_party/txt/third_party/fonts/SourceHanSerif-LICENSE.txt
deleted file mode 100644
index d952d62c065f3f35fb83a173496e90b21525aef3..0000000000000000000000000000000000000000
--- a/third_party/txt/third_party/fonts/SourceHanSerif-LICENSE.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-This Font Software is licensed under the SIL Open Font License,
-Version 1.1.
-
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font
-creation efforts of academic and linguistic communities, and to
-provide a free and open framework in which fonts may be shared and
-improved in partnership with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply to
-any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software
-components as distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to,
-deleting, or substituting -- in part or in whole -- any of the
-components of the Original Version, by changing formats or by porting
-the Font Software to a new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed,
-modify, redistribute, and sell modified and unmodified copies of the
-Font Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components, in
-Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the
-corresponding Copyright Holder. This restriction only applies to the
-primary font name as presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created using
-the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/third_party/txt/third_party/fonts/TextEmojiFont.ttx b/third_party/txt/third_party/fonts/TextEmojiFont.ttx
deleted file mode 100644
index eb49422cd0affa2c1c6b7291fb7f17aded4e7cb4..0000000000000000000000000000000000000000
--- a/third_party/txt/third_party/fonts/TextEmojiFont.ttx
+++ /dev/null
@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.0">
-
-  <GlyphOrder>
-    <!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
-    <GlyphID id="0" name=".notdef"/>
-    <GlyphID id="1" name="defaultGlyph"/>
-  </GlyphOrder>
-
-  <head>
-    <!-- Most of this table will be recalculated by the compiler -->
-    <tableVersion value="1.0"/>
-    <fontRevision value="1.0"/>
-    <checkSumAdjustment value="0x640cdb2f"/>
-    <magicNumber value="0x5f0f3cf5"/>
-    <flags value="00000000 00000011"/>
-    <unitsPerEm value="1000"/>
-    <created value="Wed Sep  9 08:01:17 2015"/>
-    <modified value="Wed Sep  9 08:48:07 2015"/>
-    <xMin value="30"/>
-    <yMin value="-200"/>
-    <xMax value="629"/>
-    <yMax value="800"/>
-    <macStyle value="00000000 00000000"/>
-    <lowestRecPPEM value="7"/>
-    <fontDirectionHint value="2"/>
-    <indexToLocFormat value="0"/>
-    <glyphDataFormat value="0"/>
-  </head>
-
-  <hhea>
-    <tableVersion value="1.0"/>
-    <ascent value="1000"/>
-    <descent value="-200"/>
-    <lineGap value="0"/>
-    <advanceWidthMax value="659"/>
-    <minLeftSideBearing value="0"/>
-    <minRightSideBearing value="30"/>
-    <xMaxExtent value="629"/>
-    <caretSlopeRise value="1"/>
-    <caretSlopeRun value="0"/>
-    <caretOffset value="0"/>
-    <reserved0 value="0"/>
-    <reserved1 value="0"/>
-    <reserved2 value="0"/>
-    <reserved3 value="0"/>
-    <metricDataFormat value="0"/>
-    <numberOfHMetrics value="18"/>
-  </hhea>
-
-  <maxp>
-    <!-- Most of this table will be recalculated by the compiler -->
-    <tableVersion value="0x10000"/>
-    <numGlyphs value="54"/>
-    <maxPoints value="73"/>
-    <maxContours value="10"/>
-    <maxCompositePoints value="0"/>
-    <maxCompositeContours value="0"/>
-    <maxZones value="2"/>
-    <maxTwilightPoints value="12"/>
-    <maxStorage value="28"/>
-    <maxFunctionDefs value="119"/>
-    <maxInstructionDefs value="0"/>
-    <maxStackElements value="61"/>
-    <maxSizeOfInstructions value="2967"/>
-    <maxComponentElements value="0"/>
-    <maxComponentDepth value="0"/>
-  </maxp>
-
-  <OS_2>
-    <!-- The fields 'usFirstCharIndex' and 'usLastCharIndex'
-         will be recalculated by the compiler -->
-    <version value="3"/>
-    <xAvgCharWidth value="594"/>
-    <usWeightClass value="400"/>
-    <usWidthClass value="5"/>
-    <fsType value="00000000 00001000"/>
-    <ySubscriptXSize value="650"/>
-    <ySubscriptYSize value="600"/>
-    <ySubscriptXOffset value="0"/>
-    <ySubscriptYOffset value="75"/>
-    <ySuperscriptXSize value="650"/>
-    <ySuperscriptYSize value="600"/>
-    <ySuperscriptXOffset value="0"/>
-    <ySuperscriptYOffset value="350"/>
-    <yStrikeoutSize value="50"/>
-    <yStrikeoutPosition value="300"/>
-    <sFamilyClass value="0"/>
-    <panose>
-      <bFamilyType value="0"/>
-      <bSerifStyle value="0"/>
-      <bWeight value="5"/>
-      <bProportion value="0"/>
-      <bContrast value="0"/>
-      <bStrokeVariation value="0"/>
-      <bArmStyle value="0"/>
-      <bLetterForm value="0"/>
-      <bMidline value="0"/>
-      <bXHeight value="0"/>
-    </panose>
-    <ulUnicodeRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulUnicodeRange2 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange3 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange4 value="00000000 00000000 00000000 00000000"/>
-    <achVendID value="UKWN"/>
-    <fsSelection value="00000000 01000000"/>
-    <usFirstCharIndex value="32"/>
-    <usLastCharIndex value="122"/>
-    <sTypoAscender value="800"/>
-    <sTypoDescender value="-200"/>
-    <sTypoLineGap value="200"/>
-    <usWinAscent value="1000"/>
-    <usWinDescent value="200"/>
-    <ulCodePageRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulCodePageRange2 value="00000000 00000000 00000000 00000000"/>
-    <sxHeight value="500"/>
-    <sCapHeight value="700"/>
-    <usDefaultChar value="0"/>
-    <usBreakChar value="32"/>
-    <usMaxContext value="0"/>
-  </OS_2>
-
-  <hmtx>
-    <mtx name=".notdef" width="500" lsb="93"/>
-    <mtx name="defaultGlyph" width="500" lsb="93"/>
-  </hmtx>
-
-  <cmap>
-    <tableVersion version="0"/>
-    <cmap_format_4 platformID="3" platEncID="10" language="0">
-      <!-- TODO: Clean up and write the target test name. -->
-      <map code="0x00A9" name="defaultGlyph" /> <!-- Text Default -->
-      <map code="0x203C" name="defaultGlyph" /> <!-- Text Default -->
-      <map code="0x231A" name="defaultGlyph" /> <!-- Emoji Default -->
-      <map code="0x23E9" name="defaultGlyph" /> <!-- Emoji Default -->
-      <map code="0x26FA" name="defaultGlyph" /> <!-- U+26FA U+FE0E is in ColorTextMixedEmojiFont.ttf -->
-      <map code="0x261D" name="defaultGlyph" />
-
-      <!-- For FontCollectionTest.hasVariationSelectorTest_emoji -->
-      <map code="0x2623" name="defaultGlyph" />
-      <map code="0x2626" name="defaultGlyph" />
-      <map code="0x262A" name="defaultGlyph" />
-      <map code="0x262E" name="defaultGlyph" />
-      <!-- U+262F is reserved for this test. -->
-
-      <!--For FontCollectionItemizeTest,.itemize_genderBalancedEmoji -->
-      <!-- U+1F469 is reserved. -->
-      <!-- U+1F373 is reserved. -->
-      <map code="0x2695" name="defaultGlyph" />
-
-      <!-- For FontCollectionTest.newEmojiTest -->
-      <map code="0x2640" name="defaultGlyph" />
-      <map code="0x2642" name="defaultGlyph" />
-
-    </cmap_format_4>
-    <cmap_format_14 format="14" platformID="0" platEncID="5" length="40" numVarSelectorRecords="2">
-      <!-- For FontCollectionTest.hasVariationSelectorTest_emoji -->
-      <map uvs="0xFE0E" uv="0x2623" name="None" />
-      <map uvs="0xFE0E" uv="0x2626" name="None" />
-
-      <!--For FontCollectionItemizeTest,.itemize_genderBalancedEmoji -->
-      <map uvs="0xFE0E" uv="0x2695" name="None" />
-
-      <!-- U+2640, U+2642 are reserved for FontCollectionTest.newEmojiTest -->
-    </cmap_format_14>
-  </cmap>
-
-  <loca>
-    <!-- The 'loca' table will be calculated by the compiler -->
-  </loca>
-
-  <glyf>
-
-    <!-- The xMin, yMin, xMax and yMax values
-         will be recalculated by the compiler. -->
-
-    <TTGlyph name=".notdef" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-
-    <TTGlyph name="defaultGlyph" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-  </glyf>
-
-  <name>
-    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      TextEmojiFont Test
-    </namerecord>
-    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      Regular
-    </namerecord>
-    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      TextEmojiFont Test
-    </namerecord>
-    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      TextEmojiFontTest-Regular
-    </namerecord>
-    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
-      TextEmojiFont Test
-    </namerecord>
-    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
-      Regular
-    </namerecord>
-    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
-      TextEmojiFont Test
-    </namerecord>
-    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
-      TextEmojiFontTest-Regular
-    </namerecord>
-  </name>
-
-  <post>
-    <formatType value="3.0"/>
-    <italicAngle value="0.0"/>
-    <underlinePosition value="-75"/>
-    <underlineThickness value="50"/>
-    <isFixedPitch value="0"/>
-    <minMemType42 value="0"/>
-    <maxMemType42 value="0"/>
-    <minMemType1 value="0"/>
-    <maxMemType1 value="0"/>
-  </post>
-
-</ttFont>
diff --git a/third_party/txt/third_party/fonts/UnicodeBMPOnly.ttx b/third_party/txt/third_party/fonts/UnicodeBMPOnly.ttx
deleted file mode 100644
index b50a3f027c4f0c0795b3b35e059d9c0641b0885a..0000000000000000000000000000000000000000
--- a/third_party/txt/third_party/fonts/UnicodeBMPOnly.ttx
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.0">
-
-  <GlyphOrder>
-    <GlyphID id="0" name=".notdef"/>
-    <GlyphID id="1" name="a"/>
-  </GlyphOrder>
-
-  <head>
-    <tableVersion value="1.0"/>
-    <fontRevision value="1.0"/>
-    <checkSumAdjustment value="0x640cdb2f"/>
-    <magicNumber value="0x5f0f3cf5"/>
-    <flags value="00000000 00000011"/>
-    <unitsPerEm value="1000"/>
-    <created value="Fri Mar 17 07:31:00 2017"/>
-    <macStyle value="00000000 00000000"/>
-    <lowestRecPPEM value="7"/>
-    <fontDirectionHint value="2"/>
-    <glyphDataFormat value="0"/>
-  </head>
-
-  <hhea>
-    <tableVersion value="1.0"/>
-    <ascent value="1000"/>
-    <descent value="-200"/>
-    <lineGap value="0"/>
-    <caretSlopeRise value="1"/>
-    <caretSlopeRun value="0"/>
-    <caretOffset value="0"/>
-    <reserved0 value="0"/>
-    <reserved1 value="0"/>
-    <reserved2 value="0"/>
-    <reserved3 value="0"/>
-    <metricDataFormat value="0"/>
-  </hhea>
-
-  <maxp>
-    <tableVersion value="0x10000"/>
-    <maxZones value="0"/>
-    <maxTwilightPoints value="0"/>
-    <maxStorage value="0"/>
-    <maxFunctionDefs value="0"/>
-    <maxInstructionDefs value="0"/>
-    <maxStackElements value="0"/>
-    <maxSizeOfInstructions value="0"/>
-    <maxComponentElements value="0"/>
-  </maxp>
-
-  <OS_2>
-    <!-- The fields 'usFirstCharIndex' and 'usLastCharIndex'
-         will be recalculated by the compiler -->
-    <version value="3"/>
-    <xAvgCharWidth value="594"/>
-    <usWeightClass value="400"/>
-    <usWidthClass value="5"/>
-    <fsType value="00000000 00001000"/>
-    <ySubscriptXSize value="650"/>
-    <ySubscriptYSize value="600"/>
-    <ySubscriptXOffset value="0"/>
-    <ySubscriptYOffset value="75"/>
-    <ySuperscriptXSize value="650"/>
-    <ySuperscriptYSize value="600"/>
-    <ySuperscriptXOffset value="0"/>
-    <ySuperscriptYOffset value="350"/>
-    <yStrikeoutSize value="50"/>
-    <yStrikeoutPosition value="300"/>
-    <sFamilyClass value="0"/>
-    <panose>
-      <bFamilyType value="0"/>
-      <bSerifStyle value="0"/>
-      <bWeight value="5"/>
-      <bProportion value="0"/>
-      <bContrast value="0"/>
-      <bStrokeVariation value="0"/>
-      <bArmStyle value="0"/>
-      <bLetterForm value="0"/>
-      <bMidline value="0"/>
-      <bXHeight value="0"/>
-    </panose>
-    <ulUnicodeRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulUnicodeRange2 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange3 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange4 value="00000000 00000000 00000000 00000000"/>
-    <achVendID value="UKWN"/>
-    <fsSelection value="00000000 01000000"/>
-    <usFirstCharIndex value="32"/>
-    <usLastCharIndex value="122"/>
-    <sTypoAscender value="800"/>
-    <sTypoDescender value="-200"/>
-    <sTypoLineGap value="200"/>
-    <usWinAscent value="1000"/>
-    <usWinDescent value="200"/>
-    <ulCodePageRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulCodePageRange2 value="00000000 00000000 00000000 00000000"/>
-    <sxHeight value="500"/>
-    <sCapHeight value="700"/>
-    <usDefaultChar value="0"/>
-    <usBreakChar value="32"/>
-    <usMaxContext value="0"/>
-  </OS_2>
-
-  <hmtx>
-    <mtx name=".notdef" width="500" lsb="93"/>
-    <mtx name="a" width="500" lsb="93"/>
-  </hmtx>
-
-  <cmap>
-    <tableVersion version="0"/>
-    <cmap_format_4 platformID="0" platEncID="1" language="0">
-      <map code="0x0061" name="a" />
-    </cmap_format_4>
-  </cmap>
-
-  <loca>
-    <!-- The 'loca' table will be calculated by the compiler -->
-  </loca>
-
-  <glyf>
-    <TTGlyph name=".notdef" xMin="0" yMin="0" xMax="0" yMax="0" />
-    <TTGlyph name="a" xMin="0" yMin="0" xMax="0" yMax="0" />
-  </glyf>
-
-  <name>
-    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      Sample Font
-    </namerecord>
-    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      Regular
-    </namerecord>
-    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      Sample Font
-    </namerecord>
-    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      SampleFont-Regular
-    </namerecord>
-    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
-      Sample Font
-    </namerecord>
-    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
-      Regular
-    </namerecord>
-    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
-      Sample Font
-    </namerecord>
-    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
-      SampleFont-Regular
-    </namerecord>
-  </name>
-
-  <post>
-    <formatType value="3.0"/>
-    <italicAngle value="0.0"/>
-    <underlinePosition value="-75"/>
-    <underlineThickness value="50"/>
-    <isFixedPitch value="0"/>
-    <minMemType42 value="0"/>
-    <maxMemType42 value="0"/>
-    <minMemType1 value="0"/>
-    <maxMemType1 value="0"/>
-  </post>
-
-</ttFont>
diff --git a/third_party/txt/third_party/fonts/UnicodeBMPOnly2.ttx b/third_party/txt/third_party/fonts/UnicodeBMPOnly2.ttx
deleted file mode 100644
index e43ebf80144f0d7ef5d82d606ddff8cb1149471d..0000000000000000000000000000000000000000
--- a/third_party/txt/third_party/fonts/UnicodeBMPOnly2.ttx
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.0">
-
-  <GlyphOrder>
-    <GlyphID id="0" name=".notdef"/>
-    <GlyphID id="1" name="a"/>
-  </GlyphOrder>
-
-  <head>
-    <tableVersion value="1.0"/>
-    <fontRevision value="1.0"/>
-    <checkSumAdjustment value="0x640cdb2f"/>
-    <magicNumber value="0x5f0f3cf5"/>
-    <flags value="00000000 00000011"/>
-    <unitsPerEm value="1000"/>
-    <created value="Fri Mar 17 07:31:00 2017"/>
-    <macStyle value="00000000 00000000"/>
-    <lowestRecPPEM value="7"/>
-    <fontDirectionHint value="2"/>
-    <glyphDataFormat value="0"/>
-  </head>
-
-  <hhea>
-    <tableVersion value="1.0"/>
-    <ascent value="1000"/>
-    <descent value="-200"/>
-    <lineGap value="0"/>
-    <caretSlopeRise value="1"/>
-    <caretSlopeRun value="0"/>
-    <caretOffset value="0"/>
-    <reserved0 value="0"/>
-    <reserved1 value="0"/>
-    <reserved2 value="0"/>
-    <reserved3 value="0"/>
-    <metricDataFormat value="0"/>
-  </hhea>
-
-  <maxp>
-    <tableVersion value="0x10000"/>
-    <maxZones value="0"/>
-    <maxTwilightPoints value="0"/>
-    <maxStorage value="0"/>
-    <maxFunctionDefs value="0"/>
-    <maxInstructionDefs value="0"/>
-    <maxStackElements value="0"/>
-    <maxSizeOfInstructions value="0"/>
-    <maxComponentElements value="0"/>
-  </maxp>
-
-  <OS_2>
-    <!-- The fields 'usFirstCharIndex' and 'usLastCharIndex'
-         will be recalculated by the compiler -->
-    <version value="3"/>
-    <xAvgCharWidth value="594"/>
-    <usWeightClass value="400"/>
-    <usWidthClass value="5"/>
-    <fsType value="00000000 00001000"/>
-    <ySubscriptXSize value="650"/>
-    <ySubscriptYSize value="600"/>
-    <ySubscriptXOffset value="0"/>
-    <ySubscriptYOffset value="75"/>
-    <ySuperscriptXSize value="650"/>
-    <ySuperscriptYSize value="600"/>
-    <ySuperscriptXOffset value="0"/>
-    <ySuperscriptYOffset value="350"/>
-    <yStrikeoutSize value="50"/>
-    <yStrikeoutPosition value="300"/>
-    <sFamilyClass value="0"/>
-    <panose>
-      <bFamilyType value="0"/>
-      <bSerifStyle value="0"/>
-      <bWeight value="5"/>
-      <bProportion value="0"/>
-      <bContrast value="0"/>
-      <bStrokeVariation value="0"/>
-      <bArmStyle value="0"/>
-      <bLetterForm value="0"/>
-      <bMidline value="0"/>
-      <bXHeight value="0"/>
-    </panose>
-    <ulUnicodeRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulUnicodeRange2 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange3 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange4 value="00000000 00000000 00000000 00000000"/>
-    <achVendID value="UKWN"/>
-    <fsSelection value="00000000 01000000"/>
-    <usFirstCharIndex value="32"/>
-    <usLastCharIndex value="122"/>
-    <sTypoAscender value="800"/>
-    <sTypoDescender value="-200"/>
-    <sTypoLineGap value="200"/>
-    <usWinAscent value="1000"/>
-    <usWinDescent value="200"/>
-    <ulCodePageRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulCodePageRange2 value="00000000 00000000 00000000 00000000"/>
-    <sxHeight value="500"/>
-    <sCapHeight value="700"/>
-    <usDefaultChar value="0"/>
-    <usBreakChar value="32"/>
-    <usMaxContext value="0"/>
-  </OS_2>
-
-  <hmtx>
-    <mtx name=".notdef" width="500" lsb="93"/>
-    <mtx name="a" width="500" lsb="93"/>
-  </hmtx>
-
-  <cmap>
-    <tableVersion version="0"/>
-    <cmap_format_4 platformID="0" platEncID="2" language="0">
-      <map code="0x0061" name="a" />
-    </cmap_format_4>
-  </cmap>
-
-  <loca>
-    <!-- The 'loca' table will be calculated by the compiler -->
-  </loca>
-
-  <glyf>
-    <TTGlyph name=".notdef" xMin="0" yMin="0" xMax="0" yMax="0" />
-    <TTGlyph name="a" xMin="0" yMin="0" xMax="0" yMax="0" />
-  </glyf>
-
-  <name>
-    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      Sample Font
-    </namerecord>
-    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      Regular
-    </namerecord>
-    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      Sample Font
-    </namerecord>
-    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      SampleFont-Regular
-    </namerecord>
-    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
-      Sample Font
-    </namerecord>
-    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
-      Regular
-    </namerecord>
-    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
-      Sample Font
-    </namerecord>
-    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
-      SampleFont-Regular
-    </namerecord>
-  </name>
-
-  <post>
-    <formatType value="3.0"/>
-    <italicAngle value="0.0"/>
-    <underlinePosition value="-75"/>
-    <underlineThickness value="50"/>
-    <isFixedPitch value="0"/>
-    <minMemType42 value="0"/>
-    <maxMemType42 value="0"/>
-    <minMemType1 value="0"/>
-    <maxMemType1 value="0"/>
-  </post>
-
-</ttFont>
diff --git a/third_party/txt/third_party/fonts/UnicodeUCS4.ttx b/third_party/txt/third_party/fonts/UnicodeUCS4.ttx
deleted file mode 100644
index da5575d5b061f8712a96169f34823f82fcac5067..0000000000000000000000000000000000000000
--- a/third_party/txt/third_party/fonts/UnicodeUCS4.ttx
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.0">
-
-  <GlyphOrder>
-    <GlyphID id="0" name=".notdef"/>
-    <GlyphID id="1" name="a"/>
-  </GlyphOrder>
-
-  <head>
-    <tableVersion value="1.0"/>
-    <fontRevision value="1.0"/>
-    <checkSumAdjustment value="0x640cdb2f"/>
-    <magicNumber value="0x5f0f3cf5"/>
-    <flags value="00000000 00000011"/>
-    <unitsPerEm value="1000"/>
-    <created value="Fri Mar 17 07:31:00 2017"/>
-    <macStyle value="00000000 00000000"/>
-    <lowestRecPPEM value="7"/>
-    <fontDirectionHint value="2"/>
-    <glyphDataFormat value="0"/>
-  </head>
-
-  <hhea>
-    <tableVersion value="1.0"/>
-    <ascent value="1000"/>
-    <descent value="-200"/>
-    <lineGap value="0"/>
-    <caretSlopeRise value="1"/>
-    <caretSlopeRun value="0"/>
-    <caretOffset value="0"/>
-    <reserved0 value="0"/>
-    <reserved1 value="0"/>
-    <reserved2 value="0"/>
-    <reserved3 value="0"/>
-    <metricDataFormat value="0"/>
-  </hhea>
-
-  <maxp>
-    <tableVersion value="0x10000"/>
-    <maxZones value="0"/>
-    <maxTwilightPoints value="0"/>
-    <maxStorage value="0"/>
-    <maxFunctionDefs value="0"/>
-    <maxInstructionDefs value="0"/>
-    <maxStackElements value="0"/>
-    <maxSizeOfInstructions value="0"/>
-    <maxComponentElements value="0"/>
-  </maxp>
-
-  <OS_2>
-    <!-- The fields 'usFirstCharIndex' and 'usLastCharIndex'
-         will be recalculated by the compiler -->
-    <version value="3"/>
-    <xAvgCharWidth value="594"/>
-    <usWeightClass value="400"/>
-    <usWidthClass value="5"/>
-    <fsType value="00000000 00001000"/>
-    <ySubscriptXSize value="650"/>
-    <ySubscriptYSize value="600"/>
-    <ySubscriptXOffset value="0"/>
-    <ySubscriptYOffset value="75"/>
-    <ySuperscriptXSize value="650"/>
-    <ySuperscriptYSize value="600"/>
-    <ySuperscriptXOffset value="0"/>
-    <ySuperscriptYOffset value="350"/>
-    <yStrikeoutSize value="50"/>
-    <yStrikeoutPosition value="300"/>
-    <sFamilyClass value="0"/>
-    <panose>
-      <bFamilyType value="0"/>
-      <bSerifStyle value="0"/>
-      <bWeight value="5"/>
-      <bProportion value="0"/>
-      <bContrast value="0"/>
-      <bStrokeVariation value="0"/>
-      <bArmStyle value="0"/>
-      <bLetterForm value="0"/>
-      <bMidline value="0"/>
-      <bXHeight value="0"/>
-    </panose>
-    <ulUnicodeRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulUnicodeRange2 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange3 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange4 value="00000000 00000000 00000000 00000000"/>
-    <achVendID value="UKWN"/>
-    <fsSelection value="00000000 01000000"/>
-    <usFirstCharIndex value="32"/>
-    <usLastCharIndex value="122"/>
-    <sTypoAscender value="800"/>
-    <sTypoDescender value="-200"/>
-    <sTypoLineGap value="200"/>
-    <usWinAscent value="1000"/>
-    <usWinDescent value="200"/>
-    <ulCodePageRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulCodePageRange2 value="00000000 00000000 00000000 00000000"/>
-    <sxHeight value="500"/>
-    <sCapHeight value="700"/>
-    <usDefaultChar value="0"/>
-    <usBreakChar value="32"/>
-    <usMaxContext value="0"/>
-  </OS_2>
-
-  <hmtx>
-    <mtx name=".notdef" width="500" lsb="93"/>
-    <mtx name="a" width="500" lsb="93"/>
-  </hmtx>
-
-  <cmap>
-    <tableVersion version="0"/>
-    <cmap_format_4 platformID="0" platEncID="1" language="0">
-      <map code="0x0061" name="a" />
-    </cmap_format_4>
-    <cmap_format_12 format="12" reserved="0" length="2" nGroups="1" platformID="0" platEncID="4" language="0">
-      <map code="0x0061" name="a" />
-      <map code="0x1F926" name="a" />
-    </cmap_format_12>
-  </cmap>
-
-  <loca>
-    <!-- The 'loca' table will be calculated by the compiler -->
-  </loca>
-
-  <glyf>
-    <TTGlyph name=".notdef" xMin="0" yMin="0" xMax="0" yMax="0" />
-    <TTGlyph name="a" xMin="0" yMin="0" xMax="0" yMax="0" />
-  </glyf>
-
-  <name>
-    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      Sample Font
-    </namerecord>
-    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      Regular
-    </namerecord>
-    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      Sample Font
-    </namerecord>
-    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      SampleFont-Regular
-    </namerecord>
-    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
-      Sample Font
-    </namerecord>
-    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
-      Regular
-    </namerecord>
-    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
-      Sample Font
-    </namerecord>
-    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
-      SampleFont-Regular
-    </namerecord>
-  </name>
-
-  <post>
-    <formatType value="3.0"/>
-    <italicAngle value="0.0"/>
-    <underlinePosition value="-75"/>
-    <underlineThickness value="50"/>
-    <isFixedPitch value="0"/>
-    <minMemType42 value="0"/>
-    <maxMemType42 value="0"/>
-    <minMemType1 value="0"/>
-    <maxMemType1 value="0"/>
-  </post>
-
-</ttFont>
diff --git a/third_party/txt/third_party/fonts/VariationSelectorTest-Regular.ttx b/third_party/txt/third_party/fonts/VariationSelectorTest-Regular.ttx
deleted file mode 100644
index f86f008b08144b78a83c7d018ce31561e6e319ca..0000000000000000000000000000000000000000
--- a/third_party/txt/third_party/fonts/VariationSelectorTest-Regular.ttx
+++ /dev/null
@@ -1,229 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.0">
-
-  <GlyphOrder>
-    <!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
-    <GlyphID id="0" name=".notdef"/>
-    <GlyphID id="1" name="defaultGlyph"/>
-  </GlyphOrder>
-
-  <head>
-    <!-- Most of this table will be recalculated by the compiler -->
-    <tableVersion value="1.0"/>
-    <fontRevision value="1.0"/>
-    <checkSumAdjustment value="0x640cdb2f"/>
-    <magicNumber value="0x5f0f3cf5"/>
-    <flags value="00000000 00000011"/>
-    <unitsPerEm value="1000"/>
-    <created value="Wed Sep  9 08:01:17 2015"/>
-    <modified value="Wed Sep  9 08:48:07 2015"/>
-    <xMin value="30"/>
-    <yMin value="-200"/>
-    <xMax value="629"/>
-    <yMax value="800"/>
-    <macStyle value="00000000 00000000"/>
-    <lowestRecPPEM value="7"/>
-    <fontDirectionHint value="2"/>
-    <indexToLocFormat value="0"/>
-    <glyphDataFormat value="0"/>
-  </head>
-
-  <hhea>
-    <tableVersion value="1.0"/>
-    <ascent value="1000"/>
-    <descent value="-200"/>
-    <lineGap value="0"/>
-    <advanceWidthMax value="659"/>
-    <minLeftSideBearing value="0"/>
-    <minRightSideBearing value="30"/>
-    <xMaxExtent value="629"/>
-    <caretSlopeRise value="1"/>
-    <caretSlopeRun value="0"/>
-    <caretOffset value="0"/>
-    <reserved0 value="0"/>
-    <reserved1 value="0"/>
-    <reserved2 value="0"/>
-    <reserved3 value="0"/>
-    <metricDataFormat value="0"/>
-    <numberOfHMetrics value="18"/>
-  </hhea>
-
-  <maxp>
-    <!-- Most of this table will be recalculated by the compiler -->
-    <tableVersion value="0x10000"/>
-    <numGlyphs value="54"/>
-    <maxPoints value="73"/>
-    <maxContours value="10"/>
-    <maxCompositePoints value="0"/>
-    <maxCompositeContours value="0"/>
-    <maxZones value="2"/>
-    <maxTwilightPoints value="12"/>
-    <maxStorage value="28"/>
-    <maxFunctionDefs value="119"/>
-    <maxInstructionDefs value="0"/>
-    <maxStackElements value="61"/>
-    <maxSizeOfInstructions value="2967"/>
-    <maxComponentElements value="0"/>
-    <maxComponentDepth value="0"/>
-  </maxp>
-
-  <OS_2>
-    <!-- The fields 'usFirstCharIndex' and 'usLastCharIndex'
-         will be recalculated by the compiler -->
-    <version value="3"/>
-    <xAvgCharWidth value="594"/>
-    <usWeightClass value="400"/>
-    <usWidthClass value="5"/>
-    <fsType value="00000000 00001000"/>
-    <ySubscriptXSize value="650"/>
-    <ySubscriptYSize value="600"/>
-    <ySubscriptXOffset value="0"/>
-    <ySubscriptYOffset value="75"/>
-    <ySuperscriptXSize value="650"/>
-    <ySuperscriptYSize value="600"/>
-    <ySuperscriptXOffset value="0"/>
-    <ySuperscriptYOffset value="350"/>
-    <yStrikeoutSize value="50"/>
-    <yStrikeoutPosition value="300"/>
-    <sFamilyClass value="0"/>
-    <panose>
-      <bFamilyType value="0"/>
-      <bSerifStyle value="0"/>
-      <bWeight value="5"/>
-      <bProportion value="0"/>
-      <bContrast value="0"/>
-      <bStrokeVariation value="0"/>
-      <bArmStyle value="0"/>
-      <bLetterForm value="0"/>
-      <bMidline value="0"/>
-      <bXHeight value="0"/>
-    </panose>
-    <ulUnicodeRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulUnicodeRange2 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange3 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange4 value="00000000 00000000 00000000 00000000"/>
-    <achVendID value="UKWN"/>
-    <fsSelection value="00000000 01000000"/>
-    <usFirstCharIndex value="32"/>
-    <usLastCharIndex value="122"/>
-    <sTypoAscender value="800"/>
-    <sTypoDescender value="-200"/>
-    <sTypoLineGap value="200"/>
-    <usWinAscent value="1000"/>
-    <usWinDescent value="200"/>
-    <ulCodePageRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulCodePageRange2 value="00000000 00000000 00000000 00000000"/>
-    <sxHeight value="500"/>
-    <sCapHeight value="700"/>
-    <usDefaultChar value="0"/>
-    <usBreakChar value="32"/>
-    <usMaxContext value="0"/>
-  </OS_2>
-
-  <hmtx>
-    <mtx name=".notdef" width="500" lsb="93"/>
-    <mtx name="defaultGlyph" width="500" lsb="93"/>
-  </hmtx>
-
-  <cmap>
-    <tableVersion version="0"/>
-    <cmap_format_4 platformID="3" platEncID="10" language="0">
-      <map code="0x82A6" name="defaultGlyph" />
-      <map code="0x845B" name="defaultGlyph" />
-      <map code="0x537F" name="defaultGlyph" />
-      <map code="0x5380" name="defaultGlyph" />
-    </cmap_format_4>
-    <cmap_format_14 format="14" platformID="0" platEncID="5" length="40" numVarSelectorRecords="3">
-      <map uvs="0xFE00" uv="0x82A6" name="None" />
-      <map uvs="0xE0100" uv="0x82A6" name="None" />
-      <map uvs="0xE0101" uv="0x82A6" name="None" />
-      <map uvs="0xE0102" uv="0x82A6" name="None" />
-
-      <map uvs="0xFE01" uv="0x845B" name="None" />
-      <map uvs="0xE0101" uv="0x845B" name="None" />
-      <map uvs="0xE0102" uv="0x845B" name="None" />
-      <map uvs="0xE0103" uv="0x845B" name="None" />
-
-      <map uvs="0xFE02" uv="0x717D" name="defaultGlyph" />
-      <map uvs="0xE0102" uv="0x717D" name="defaultGlyph" />
-      <map uvs="0xE0103" uv="0x717D" name="defaultGlyph" />
-      <!-- There is no default glyph for U+717D U+E0104 but there is a entry for
-           default UVS entry.  hasVariationSelector should return false in this
-           case.  -->
-      <map uvs="0xE0104" uv="0x717D" name="None" />
-      <!-- Do not add entry for U+5380. -->
-    </cmap_format_14>
-  </cmap>
-
-  <loca>
-    <!-- The 'loca' table will be calculated by the compiler -->
-  </loca>
-
-  <glyf>
-
-    <!-- The xMin, yMin, xMax and yMax values
-         will be recalculated by the compiler. -->
-
-    <TTGlyph name=".notdef" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-
-    <TTGlyph name="defaultGlyph" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-  </glyf>
-
-  <name>
-    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      VariationSelector Test
-    </namerecord>
-    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      Regular
-    </namerecord>
-    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      VariationSelector Test
-    </namerecord>
-    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      VariationSelectorTest-Regular
-    </namerecord>
-    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
-      VariationSelector Test
-    </namerecord>
-    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
-      Regular
-    </namerecord>
-    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
-      VariationSelector Test
-    </namerecord>
-    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
-      VariationSelectorTest-Regular
-    </namerecord>
-  </name>
-
-  <post>
-    <formatType value="3.0"/>
-    <italicAngle value="0.0"/>
-    <underlinePosition value="-75"/>
-    <underlineThickness value="50"/>
-    <isFixedPitch value="0"/>
-    <minMemType42 value="0"/>
-    <maxMemType42 value="0"/>
-    <minMemType1 value="0"/>
-    <maxMemType1 value="0"/>
-  </post>
-
-</ttFont>
diff --git a/third_party/txt/third_party/fonts/ZhHans.ttx b/third_party/txt/third_party/fonts/ZhHans.ttx
deleted file mode 100644
index 238bd5e6d006ef23fe3a9991a7d319dfa5046221..0000000000000000000000000000000000000000
--- a/third_party/txt/third_party/fonts/ZhHans.ttx
+++ /dev/null
@@ -1,282 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.0">
-
-  <GlyphOrder>
-    <!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
-    <GlyphID id="0" name=".notdef"/>
-    <GlyphID id="1" name="U+81ED"/>
-    <GlyphID id="2" name="U+82B1"/>
-    <GlyphID id="3" name="U+5FCD"/>
-    <GlyphID id="4" name="U+4444"/>
-    <GlyphID id="5" name="U+302D"/>
-    <GlyphID id="6" name="U+4F60"/>
-    <GlyphID id="7" name="U+4FAE"/>
-    <GlyphID id="8" name="U+845B"/>
-    <GlyphID id="9" name="U+3402"/>
-    <GlyphID id="10" name="U+9AA8"/>
-    <GlyphID id="11" name="U+35A8"/>
-    <GlyphID id="12" name="U+35B6_VS17"/>
-    <GlyphID id="13" name="U+35C5_VS17"/>
-  </GlyphOrder>
-
-  <head>
-    <!-- Most of this table will be recalculated by the compiler -->
-    <tableVersion value="1.0"/>
-    <fontRevision value="1.0"/>
-    <checkSumAdjustment value="0x640cdb2f"/>
-    <magicNumber value="0x5f0f3cf5"/>
-    <flags value="00000000 00000011"/>
-    <unitsPerEm value="1000"/>
-    <created value="Wed Sep  9 08:01:17 2015"/>
-    <modified value="Wed Sep  9 08:48:07 2015"/>
-    <xMin value="30"/>
-    <yMin value="-200"/>
-    <xMax value="629"/>
-    <yMax value="800"/>
-    <macStyle value="00000000 00000000"/>
-    <lowestRecPPEM value="7"/>
-    <fontDirectionHint value="2"/>
-    <indexToLocFormat value="0"/>
-    <glyphDataFormat value="0"/>
-  </head>
-
-  <hhea>
-    <tableVersion value="1.0"/>
-    <ascent value="1000"/>
-    <descent value="-200"/>
-    <lineGap value="0"/>
-    <advanceWidthMax value="659"/>
-    <minLeftSideBearing value="0"/>
-    <minRightSideBearing value="30"/>
-    <xMaxExtent value="629"/>
-    <caretSlopeRise value="1"/>
-    <caretSlopeRun value="0"/>
-    <caretOffset value="0"/>
-    <reserved0 value="0"/>
-    <reserved1 value="0"/>
-    <reserved2 value="0"/>
-    <reserved3 value="0"/>
-    <metricDataFormat value="0"/>
-    <numberOfHMetrics value="18"/>
-  </hhea>
-
-  <maxp>
-    <!-- Most of this table will be recalculated by the compiler -->
-    <tableVersion value="0x10000"/>
-    <numGlyphs value="54"/>
-    <maxPoints value="73"/>
-    <maxContours value="10"/>
-    <maxCompositePoints value="0"/>
-    <maxCompositeContours value="0"/>
-    <maxZones value="2"/>
-    <maxTwilightPoints value="12"/>
-    <maxStorage value="28"/>
-    <maxFunctionDefs value="119"/>
-    <maxInstructionDefs value="0"/>
-    <maxStackElements value="61"/>
-    <maxSizeOfInstructions value="2967"/>
-    <maxComponentElements value="0"/>
-    <maxComponentDepth value="0"/>
-  </maxp>
-
-  <OS_2>
-    <!-- The fields 'usFirstCharIndex' and 'usLastCharIndex'
-         will be recalculated by the compiler -->
-    <version value="3"/>
-    <xAvgCharWidth value="594"/>
-    <usWeightClass value="400"/>
-    <usWidthClass value="5"/>
-    <fsType value="00000000 00001000"/>
-    <ySubscriptXSize value="650"/>
-    <ySubscriptYSize value="600"/>
-    <ySubscriptXOffset value="0"/>
-    <ySubscriptYOffset value="75"/>
-    <ySuperscriptXSize value="650"/>
-    <ySuperscriptYSize value="600"/>
-    <ySuperscriptXOffset value="0"/>
-    <ySuperscriptYOffset value="350"/>
-    <yStrikeoutSize value="50"/>
-    <yStrikeoutPosition value="300"/>
-    <sFamilyClass value="0"/>
-    <panose>
-      <bFamilyType value="0"/>
-      <bSerifStyle value="0"/>
-      <bWeight value="5"/>
-      <bProportion value="0"/>
-      <bContrast value="0"/>
-      <bStrokeVariation value="0"/>
-      <bArmStyle value="0"/>
-      <bLetterForm value="0"/>
-      <bMidline value="0"/>
-      <bXHeight value="0"/>
-    </panose>
-    <ulUnicodeRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulUnicodeRange2 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange3 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange4 value="00000000 00000000 00000000 00000000"/>
-    <achVendID value="UKWN"/>
-    <fsSelection value="00000000 01000000"/>
-    <usFirstCharIndex value="32"/>
-    <usLastCharIndex value="122"/>
-    <sTypoAscender value="800"/>
-    <sTypoDescender value="-200"/>
-    <sTypoLineGap value="200"/>
-    <usWinAscent value="1000"/>
-    <usWinDescent value="200"/>
-    <ulCodePageRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulCodePageRange2 value="00000000 00000000 00000000 00000000"/>
-    <sxHeight value="500"/>
-    <sCapHeight value="700"/>
-    <usDefaultChar value="0"/>
-    <usBreakChar value="32"/>
-    <usMaxContext value="0"/>
-  </OS_2>
-
-  <hmtx>
-    <mtx name=".notdef" width="500" lsb="93"/>
-    <mtx name="U+81ED" width="500" lsb="93"/>
-    <mtx name="U+82B1" width="500" lsb="93"/>
-    <mtx name="U+5FCD" width="500" lsb="93"/>
-    <mtx name="U+4444" width="500" lsb="93"/>
-    <mtx name="U+302D" width="500" lsb="93"/>
-    <mtx name="U+4F60" width="500" lsb="93"/>
-    <mtx name="U+4FAE" width="500" lsb="93"/>
-    <mtx name="U+845B" width="500" lsb="93"/>
-    <mtx name="U+3402" width="500" lsb="93"/>
-    <mtx name="U+9AA8" width="500" lsb="93"/>
-    <mtx name="U+35A8" width="500" lsb="93"/>
-    <mtx name="U+35B6_VS17" width="500" lsb="93"/>
-    <mtx name="U+35C5_VS17" width="500" lsb="93"/>
-  </hmtx>
-
-  <cmap>
-    <tableVersion version="0"/>
-    <cmap_format_12 format="12" reserved="0" length="10" nGroups="1" platformID="3" platEncID="1" language="0">
-      <map code="0x81ED" name="U+81ED" />
-      <map code="0x82B1" name="U+82B1" />
-      <map code="0x5FCD" name="U+5FCD" />
-      <map code="0x4444" name="U+4444" />
-      <map code="0x302D" name="U+302D" />
-      <map code="0x4F60" name="U+4F60" />
-      <map code="0x4FAE" name="U+4FAE" />
-      <map code="0x845B" name="U+845B" />
-      <map code="0x3402" name="U+3402" />
-      <map code="0x9AA8" name="U+9AA8" />
-      <map code="0x35A8" name="U+35A8" />
-    </cmap_format_12>
-    <cmap_format_14 format="14" platformID="0" platEncID="5" length="40" numVarSelectorRecords="3">
-      <map uvs="0xE0100" uv="0x3402" name="None"/>
-      <map uvs="0xE0100" uv="0x35A8" name="None"/>
-      <map uvs="0xE0100" uv="0x35B6" name="U+35B6_VS17"/>
-      <map uvs="0xE0100" uv="0x35C5" name="U+35C5_VS17"/>
-    </cmap_format_14>
-  </cmap>
-
-  <loca>
-    <!-- The 'loca' table will be calculated by the compiler -->
-  </loca>
-
-  <glyf>
-
-    <!-- The xMin, yMin, xMax and yMax values
-         will be recalculated by the compiler. -->
-
-    <TTGlyph name=".notdef" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-
-    <TTGlyph name="U+81ED" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+82B1" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+5FCD" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+4444" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+302D" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+4F60" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+4FAE" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+845B" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+3402" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+9AA8" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+35A8" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+35B6_VS17" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+35C5_VS17" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-  </glyf>
-
-  <name>
-    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      SimplifiedChinese Test
-    </namerecord>
-    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      Regular
-    </namerecord>
-    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      SimplifiedChinese Test
-    </namerecord>
-    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      SimplifiedChineseTest-Regular
-    </namerecord>
-    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
-      SimplifiedChinese Test
-    </namerecord>
-    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
-      Regular
-    </namerecord>
-    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
-      SimplifiedChinese Test
-    </namerecord>
-    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
-      SimplifiedChineseTest-Regular
-    </namerecord>
-  </name>
-
-  <post>
-    <formatType value="3.0"/>
-    <italicAngle value="0.0"/>
-    <underlinePosition value="-75"/>
-    <underlineThickness value="50"/>
-    <isFixedPitch value="0"/>
-    <minMemType42 value="0"/>
-    <maxMemType42 value="0"/>
-    <minMemType1 value="0"/>
-    <maxMemType1 value="0"/>
-  </post>
-
-</ttFont>
diff --git a/third_party/txt/third_party/fonts/ZhHant.ttx b/third_party/txt/third_party/fonts/ZhHant.ttx
deleted file mode 100644
index 31fada959779a2a3d7eeb1ef95bb38cf9ad8889b..0000000000000000000000000000000000000000
--- a/third_party/txt/third_party/fonts/ZhHant.ttx
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.0">
-
-  <GlyphOrder>
-    <!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
-    <GlyphID id="0" name=".notdef"/>
-    <GlyphID id="1" name="U+242EE"/>
-    <GlyphID id="2" name="U+3402"/>
-    <GlyphID id="3" name="U+9AA8"/>
-    <GlyphID id="4" name="U+35A8"/>
-    <GlyphID id="5" name="U+35B6"/>
-    <GlyphID id="6" name="U+35C5_VS17"/>
-  </GlyphOrder>
-
-  <head>
-    <!-- Most of this table will be recalculated by the compiler -->
-    <tableVersion value="1.0"/>
-    <fontRevision value="1.0"/>
-    <checkSumAdjustment value="0x640cdb2f"/>
-    <magicNumber value="0x5f0f3cf5"/>
-    <flags value="00000000 00000011"/>
-    <unitsPerEm value="1000"/>
-    <created value="Wed Sep  9 08:01:17 2015"/>
-    <modified value="Wed Sep  9 08:48:07 2015"/>
-    <xMin value="30"/>
-    <yMin value="-200"/>
-    <xMax value="629"/>
-    <yMax value="800"/>
-    <macStyle value="00000000 00000000"/>
-    <lowestRecPPEM value="7"/>
-    <fontDirectionHint value="2"/>
-    <indexToLocFormat value="0"/>
-    <glyphDataFormat value="0"/>
-  </head>
-
-  <hhea>
-    <tableVersion value="1.0"/>
-    <ascent value="1000"/>
-    <descent value="-200"/>
-    <lineGap value="0"/>
-    <advanceWidthMax value="659"/>
-    <minLeftSideBearing value="0"/>
-    <minRightSideBearing value="30"/>
-    <xMaxExtent value="629"/>
-    <caretSlopeRise value="1"/>
-    <caretSlopeRun value="0"/>
-    <caretOffset value="0"/>
-    <reserved0 value="0"/>
-    <reserved1 value="0"/>
-    <reserved2 value="0"/>
-    <reserved3 value="0"/>
-    <metricDataFormat value="0"/>
-    <numberOfHMetrics value="18"/>
-  </hhea>
-
-  <maxp>
-    <!-- Most of this table will be recalculated by the compiler -->
-    <tableVersion value="0x10000"/>
-    <numGlyphs value="54"/>
-    <maxPoints value="73"/>
-    <maxContours value="10"/>
-    <maxCompositePoints value="0"/>
-    <maxCompositeContours value="0"/>
-    <maxZones value="2"/>
-    <maxTwilightPoints value="12"/>
-    <maxStorage value="28"/>
-    <maxFunctionDefs value="119"/>
-    <maxInstructionDefs value="0"/>
-    <maxStackElements value="61"/>
-    <maxSizeOfInstructions value="2967"/>
-    <maxComponentElements value="0"/>
-    <maxComponentDepth value="0"/>
-  </maxp>
-
-  <OS_2>
-    <!-- The fields 'usFirstCharIndex' and 'usLastCharIndex'
-         will be recalculated by the compiler -->
-    <version value="3"/>
-    <xAvgCharWidth value="594"/>
-    <usWeightClass value="400"/>
-    <usWidthClass value="5"/>
-    <fsType value="00000000 00001000"/>
-    <ySubscriptXSize value="650"/>
-    <ySubscriptYSize value="600"/>
-    <ySubscriptXOffset value="0"/>
-    <ySubscriptYOffset value="75"/>
-    <ySuperscriptXSize value="650"/>
-    <ySuperscriptYSize value="600"/>
-    <ySuperscriptXOffset value="0"/>
-    <ySuperscriptYOffset value="350"/>
-    <yStrikeoutSize value="50"/>
-    <yStrikeoutPosition value="300"/>
-    <sFamilyClass value="0"/>
-    <panose>
-      <bFamilyType value="0"/>
-      <bSerifStyle value="0"/>
-      <bWeight value="5"/>
-      <bProportion value="0"/>
-      <bContrast value="0"/>
-      <bStrokeVariation value="0"/>
-      <bArmStyle value="0"/>
-      <bLetterForm value="0"/>
-      <bMidline value="0"/>
-      <bXHeight value="0"/>
-    </panose>
-    <ulUnicodeRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulUnicodeRange2 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange3 value="00000000 00000000 00000000 00000000"/>
-    <ulUnicodeRange4 value="00000000 00000000 00000000 00000000"/>
-    <achVendID value="UKWN"/>
-    <fsSelection value="00000000 01000000"/>
-    <usFirstCharIndex value="32"/>
-    <usLastCharIndex value="122"/>
-    <sTypoAscender value="800"/>
-    <sTypoDescender value="-200"/>
-    <sTypoLineGap value="200"/>
-    <usWinAscent value="1000"/>
-    <usWinDescent value="200"/>
-    <ulCodePageRange1 value="00000000 00000000 00000000 00000001"/>
-    <ulCodePageRange2 value="00000000 00000000 00000000 00000000"/>
-    <sxHeight value="500"/>
-    <sCapHeight value="700"/>
-    <usDefaultChar value="0"/>
-    <usBreakChar value="32"/>
-    <usMaxContext value="0"/>
-  </OS_2>
-
-  <hmtx>
-    <mtx name=".notdef" width="500" lsb="93"/>
-    <mtx name="U+242EE" width="500" lsb="93"/>
-    <mtx name="U+3402" width="500" lsb="93"/>
-    <mtx name="U+9AA8" width="500" lsb="93"/>
-    <mtx name="U+35A8" width="500" lsb="93"/>
-    <mtx name="U+35B6" width="500" lsb="93"/>
-    <mtx name="U+35C5_VS17" width="500" lsb="93"/>
-  </hmtx>
-
-  <cmap>
-    <tableVersion version="0"/>
-    <cmap_format_12 format="12" reserved="0" length="10" nGroups="1" platformID="3" platEncID="1" language="0">
-      <map code="0x242EE" name="U+242EE" />
-      <map code="0x3402" name="U+3402" />
-      <map code="0x9AA8" name="U+9AA8" />
-      <map code="0x35A8" name="U+35A8" />
-      <map code="0x35B6" name="U+35B6" />
-    </cmap_format_12>
-    <cmap_format_14 format="14" platformID="0" platEncID="5" length="40" numVarSelectorRecords="3">
-      <map uvs="0xE0100" uv="0x3402" name="None" />
-      <map uvs="0xE0100" uv="0x35A8" name="None" />
-      <map uvs="0xE0100" uv="0x35B6" name="None" />
-      <map uvs="0xE0100" uv="0x35C5" name="U+35C5_VS17" />
-    </cmap_format_14>
-  </cmap>
-
-  <loca>
-    <!-- The 'loca' table will be calculated by the compiler -->
-  </loca>
-
-  <glyf>
-
-    <!-- The xMin, yMin, xMax and yMax values
-         will be recalculated by the compiler. -->
-
-    <TTGlyph name=".notdef" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+242EE" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+3402" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+9AA8" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+35A8" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+35B6" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-    <TTGlyph name="U+35C5_VS17" xMin="0" yMin="0" xMax="0" yMax="0">
-      <contour></contour><instructions><assembly></assembly></instructions>
-    </TTGlyph>
-  </glyf>
-
-  <name>
-    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      TraditionalChinese Test
-    </namerecord>
-    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      Regular
-    </namerecord>
-    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      TraditionalChinese Test
-    </namerecord>
-    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
-      TraditionalChineseTest-Regular
-    </namerecord>
-    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
-      TraditionalChinese Test
-    </namerecord>
-    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
-      Regular
-    </namerecord>
-    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
-      TraditionalChinese Test
-    </namerecord>
-    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
-      TraditionalChineseTest-Regular
-    </namerecord>
-  </name>
-
-  <post>
-    <formatType value="3.0"/>
-    <italicAngle value="0.0"/>
-    <underlinePosition value="-75"/>
-    <underlineThickness value="50"/>
-    <isFixedPitch value="0"/>
-    <minMemType42 value="0"/>
-    <maxMemType42 value="0"/>
-    <minMemType1 value="0"/>
-    <maxMemType1 value="0"/>
-  </post>
-
-</ttFont>
diff --git a/third_party/txt/third_party/fonts/emoji.xml b/third_party/txt/third_party/fonts/emoji.xml
deleted file mode 100644
index 796a0f1ea038374e7b3063333d1776de6ada4270..0000000000000000000000000000000000000000
--- a/third_party/txt/third_party/fonts/emoji.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<familyset version="22">
-    <!-- Place NoGlyphFont here since the first font can be chosen if no font is
-         available for the code point. -->
-    <family>
-        <font weight="400" style="normal">NoGlyphFont.ttf</font>
-    </family>
-    <family>
-        <font weight="400" style="normal">TextEmojiFont.ttf</font>
-    </family>
-    <family lang="und-Zsye">
-        <font weight="400" style="normal">ColorEmojiFont.ttf</font>
-    </family>
-    <family>
-        <font weight="400" style="normal">ColorTextMixedEmojiFont.ttf</font>
-    </family>
-</familyset>
diff --git a/third_party/txt/third_party/fonts/itemize.xml b/third_party/txt/third_party/fonts/itemize.xml
deleted file mode 100644
index 32a5ab02b711cd2d6cf4df457adf7fa0615115d7..0000000000000000000000000000000000000000
--- a/third_party/txt/third_party/fonts/itemize.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<familyset version="22">
-    <family name="sans-serif">
-        <font weight="400" style="normal">Regular.ttf</font>
-        <font weight="400" style="italic">Italic.ttf</font>
-        <font weight="700" style="normal">Bold.ttf</font>
-        <font weight="700" style="italic">BoldItalic.ttf</font>
-    </family>
-
-    <family lang="zh-Hans">
-        <font weight="400" style="normal">ZhHans.ttf</font>
-    </family>
-    <family lang="ja">
-        <font weight="400" style="normal">Ja.ttf</font>
-    </family>
-    <family lang="zh-Hant">
-        <font weight="400" style="normal">ZhHant.ttf</font>
-    </family>
-    <family lang="ko">
-        <font weight="400" style="normal">Ko.ttf</font>
-    </family>
-    <family>
-        <font weight="400" style="normal">Emoji.ttf</font>
-    </family>
-</familyset>
diff --git a/third_party/web_locale_keymap/lib/web_locale_keymap/key_mappings.g.dart b/third_party/web_locale_keymap/lib/web_locale_keymap/key_mappings.g.dart
index cae2917ff0a521f654f476ff714a01eeca3d14e8..4661448503462005268b06d5009fa046411e1029 100644
--- a/third_party/web_locale_keymap/lib/web_locale_keymap/key_mappings.g.dart
+++ b/third_party/web_locale_keymap/lib/web_locale_keymap/key_mappings.g.dart
@@ -5,15 +5,15 @@
 
 // DO NOT EDIT -- DO NOT EDIT -- DO NOT EDIT
 //
-// This file is auto generated by flutter/engine:flutter/tools/gen_web_keyboard_layouts based on
-// https://github.com/microsoft/vscode/tree/ab7ccc9e872dfcdfc429f8f2815109ec0ca926e3/src/vs/workbench/services/keybinding/browser/keyboardLayouts
+// This file is auto generated by flutter/engine:flutter/tools/gen_web_keyboard_keymap based on
+// https://github.com/microsoft/vscode/tree/422b581e3802e30cfb780c21d9cc1a2cd0c9f0aa/src/vs/workbench/services/keybinding/browser/keyboardLayouts
 //
 // Edit the following files instead:
 //
 //  - Script: lib/main.dart
 //  - Templates: data/*.tmpl
 //
-// See flutter/engine:flutter/tools/gen_web_keyboard_layouts/README.md for more information.
+// See flutter/engine:flutter/tools/gen_web_locale_keymap/README.md for more information.
 
 /// Used in the final mapping indicating the logical key should be derived from
 /// KeyboardEvent.keyCode.
@@ -100,16 +100,17 @@ bool isLetter(int charCode) {
 ///
 /// This greatly reduces the entries needed in the final mapping.
 int? heuristicMapper(String code, String key) {
-  // Digit code: return the digit.
+  // Digit code: return the digit by event code.
   if (code.startsWith('Digit')) {
     assert(code.length == 6);
     return code.codeUnitAt(5); // The character immediately after 'Digit'
   }
   final int charCode = key.codeUnitAt(0);
+  // Non-ascii: return the goal (i.e. US mapping by event code).
   if (key.length > 1 || !_isAscii(charCode)) {
     return kLayoutGoals[code]?.codeUnitAt(0);
   }
-  // Letter key: return the letter.
+  // Letter key: return the event key letter.
   if (isLetter(charCode)) {
     return key.toLowerCase().codeUnitAt(0);
   }
@@ -167,22 +168,20 @@ class _StringStream {
 
 Map<String, int> _unmarshallCodeMap(_StringStream stream) {
   final int entryNum = stream.readIntAsVerbatim();
-  return Map<String, int>.fromEntries((() sync* {
-    for (int entryIndex = 0; entryIndex < entryNum; entryIndex += 1) {
-      yield MapEntry<String, int>(stream.readEventKey(), stream.readIntAsChar());
-    }
-  })());
+  return <String, int>{
+    for (int i = 0; i < entryNum; i++)
+      stream.readEventKey(): stream.readIntAsChar(),
+  };
 }
 
 /// Decode a key mapping data out of the string.
 Map<String, Map<String, int>> unmarshallMappingData(String compressed) {
   final _StringStream stream = _StringStream(compressed);
   final int eventCodeNum = stream.readIntAsVerbatim();
-  return Map<String, Map<String, int>>.fromEntries((() sync* {
-    for (int eventCodeIndex = 0; eventCodeIndex < eventCodeNum; eventCodeIndex += 1) {
-      yield MapEntry<String, Map<String, int>>(stream.readEventCode(), _unmarshallCodeMap(stream));
-    }
-  })());
+  return <String, Map<String, int>>{
+    for (int i = 0; i < eventCodeNum; i++)
+      stream.readEventCode() : _unmarshallCodeMap(stream),
+  };
 }
 
 /// Data for [LocaleKeymap] on Windows.
diff --git a/third_party/web_locale_keymap/lib/web_locale_keymap/locale_keymap.dart b/third_party/web_locale_keymap/lib/web_locale_keymap/locale_keymap.dart
index dd2faa527fc2a0c6a61cda4a8a3db69dba0c90e9..5c261f665571f042e2dc54806815daa7d2faadde 100644
--- a/third_party/web_locale_keymap/lib/web_locale_keymap/locale_keymap.dart
+++ b/third_party/web_locale_keymap/lib/web_locale_keymap/locale_keymap.dart
@@ -41,6 +41,9 @@ class LocaleKeymap {
       return eventKeyCode;
     }
     if (result == null) {
+      if ((eventCode ?? '').isEmpty && (eventKey ?? '').isEmpty) {
+        return null;
+      }
       final int? heuristicResult = heuristicMapper(eventCode ?? '', eventKey ?? '');
       if (heuristicResult != null) {
         return heuristicResult;
diff --git a/third_party/web_locale_keymap/pubspec.yaml b/third_party/web_locale_keymap/pubspec.yaml
index c9c7518d01ed10b3cba40f500ad1b06a145c9685..646fbb3b96997922f10738831b7918990f085078 100644
--- a/third_party/web_locale_keymap/pubspec.yaml
+++ b/third_party/web_locale_keymap/pubspec.yaml
@@ -3,7 +3,7 @@ name: web_locale_keymap
 publish_to: none
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: '>=3.2.0-0 <4.0.0'
 
 dev_dependencies:
   test: ^1.21.7
diff --git a/third_party/web_locale_keymap/test/test_cases.g.dart b/third_party/web_locale_keymap/test/test_cases.g.dart
index b57842551d4975fb5f6a8945cdb70188773c91ec..ec396a403199fda3e3c6b8e6bd6aacedb1fcdc90 100644
--- a/third_party/web_locale_keymap/test/test_cases.g.dart
+++ b/third_party/web_locale_keymap/test/test_cases.g.dart
@@ -5,7 +5,7 @@
 
 // DO NOT EDIT -- DO NOT EDIT -- DO NOT EDIT
 //
-// This file is auto generated by flutter/engine:flutter/tools/gen_web_keyboard_layouts based on
+// This file is auto generated by flutter/engine:flutter/tools/gen_web_keyboard_keymap based on
 // https://github.com/microsoft/vscode/tree/@@@COMMIT_ID@@@/src/vs/workbench/services/keybinding/browser/keyboardLayouts
 //
 // Edit the following files instead:
@@ -13,7 +13,7 @@
 //  - Script: lib/main.dart
 //  - Templates: data/*.tmpl
 //
-// See flutter/engine:flutter/tools/gen_web_keyboard_layouts/README.md for more information.
+// See flutter/engine:flutter/tools/gen_web_keyboard_keymap/README.md for more information.
 
 import 'package:test/test.dart';
 import 'package:web_locale_keymap/web_locale_keymap.dart';
diff --git a/third_party/web_test_fonts/lib/web_test_fonts.dart b/third_party/web_test_fonts/lib/web_test_fonts.dart
new file mode 100644
index 0000000000000000000000000000000000000000..ae57f3b85bc1db1fcd4bc1d1582aa99213049cf5
--- /dev/null
+++ b/third_party/web_test_fonts/lib/web_test_fonts.dart
@@ -0,0 +1,7 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+library web_test_fonts;
+
+export 'web_test_fonts/web_test_fonts.dart';
diff --git a/third_party/web_test_fonts/lib/web_test_fonts/web_test_fonts.dart b/third_party/web_test_fonts/lib/web_test_fonts/web_test_fonts.dart
new file mode 100644
index 0000000000000000000000000000000000000000..a859b9cc89b225efff5fa52362948d9ca3ee7c1c
--- /dev/null
+++ b/third_party/web_test_fonts/lib/web_test_fonts/web_test_fonts.dart
@@ -0,0 +1,269 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:typed_data';
+
+class EmbeddedTestFont {
+  const EmbeddedTestFont._({
+      required this.fontFamily,
+      required this.data,
+  });
+
+  static final EmbeddedTestFont flutterTest = EmbeddedTestFont._(fontFamily: 'FlutterTest', data: _flutterTestData);
+
+  final String fontFamily;
+  final Uint8List data;
+}
+
+final Uint8List _flutterTestData = Uint8List.fromList(<int>[
+    0x00, 0x01, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x80, 0x00, 0x03, 0x00, 0x60,
+    0x42, 0x41, 0x53, 0x45, 0x8a, 0x4b, 0x87, 0x01, 0x00, 0x00, 0x0b, 0x24,
+    0x00, 0x00, 0x00, 0x82, 0x47, 0x44, 0x45, 0x46, 0x00, 0x29, 0x00, 0x14,
+    0x00, 0x00, 0x0b, 0x04, 0x00, 0x00, 0x00, 0x1e, 0x4f, 0x53, 0x2f, 0x32,
+    0x13, 0xfd, 0x90, 0xf2, 0x00, 0x00, 0x01, 0x68, 0x00, 0x00, 0x00, 0x60,
+    0x63, 0x6d, 0x61, 0x70, 0xec, 0x11, 0x06, 0x0f, 0x00, 0x00, 0x02, 0x00,
+    0x00, 0x00, 0x05, 0x04, 0x63, 0x76, 0x74, 0x20, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x07, 0x18, 0x00, 0x00, 0x00, 0x02, 0x67, 0x6c, 0x79, 0x66,
+    0x09, 0x85, 0x89, 0xf8, 0x00, 0x00, 0x07, 0x3c, 0x00, 0x00, 0x00, 0xd8,
+    0x68, 0x65, 0x61, 0x64, 0x81, 0x1b, 0xef, 0xfd, 0x00, 0x00, 0x00, 0xec,
+    0x00, 0x00, 0x00, 0x36, 0x68, 0x68, 0x65, 0x61, 0x07, 0x02, 0x03, 0x0f,
+    0x00, 0x00, 0x01, 0x24, 0x00, 0x00, 0x00, 0x24, 0x68, 0x6d, 0x74, 0x78,
+    0x1b, 0x86, 0x00, 0x80, 0x00, 0x00, 0x01, 0xc8, 0x00, 0x00, 0x00, 0x38,
+    0x6c, 0x6f, 0x63, 0x61, 0x02, 0x7e, 0x02, 0x50, 0x00, 0x00, 0x07, 0x1c,
+    0x00, 0x00, 0x00, 0x1e, 0x6d, 0x61, 0x78, 0x70, 0x00, 0x52, 0x00, 0x2d,
+    0x00, 0x00, 0x01, 0x48, 0x00, 0x00, 0x00, 0x20, 0x6e, 0x61, 0x6d, 0x65,
+    0x1a, 0xef, 0x7a, 0x5b, 0x00, 0x00, 0x08, 0x14, 0x00, 0x00, 0x02, 0x25,
+    0x70, 0x6f, 0x73, 0x74, 0x89, 0x84, 0x28, 0x37, 0x00, 0x00, 0x0a, 0x3c,
+    0x00, 0x00, 0x00, 0xc7, 0x70, 0x72, 0x65, 0x70, 0x6f, 0x48, 0x68, 0x25,
+    0x00, 0x00, 0x07, 0x04, 0x00, 0x00, 0x00, 0x11, 0x00, 0x01, 0x00, 0x00,
+    0x00, 0x01, 0x00, 0x00, 0xab, 0xb4, 0x91, 0x15, 0x5f, 0x0f, 0x3c, 0xf5,
+    0x00, 0x1f, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8e, 0xf4, 0x56, 0x80,
+    0x00, 0x00, 0x00, 0x00, 0x8e, 0xf4, 0x56, 0x80, 0x00, 0x00, 0xff, 0x00,
+    0x04, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x03, 0x00, 0xff, 0x00,
+    0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x0e, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x08,
+    0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01,
+    0x00, 0x01, 0x00, 0x00, 0x00, 0x40, 0x00, 0x22, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x04, 0x02, 0x05, 0x01, 0x90, 0x00, 0x05, 0x00, 0x00, 0x02, 0x99,
+    0x02, 0xcc, 0x00, 0x00, 0x00, 0x8f, 0x02, 0x99, 0x02, 0xcc, 0x00, 0x00,
+    0x01, 0xeb, 0x00, 0x33, 0x01, 0x09, 0x00, 0x00, 0x02, 0x00, 0x05, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x03, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x80, 0x00, 0x20, 0xfe, 0xff, 0x03, 0x00, 0xff, 0x00,
+    0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+    0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x01,
+    0x04, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x55, 0x00, 0x00,
+    0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+    0x04, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x55, 0x00, 0x00,
+    0x01, 0x00, 0x00, 0x00, 0x00, 0xaa, 0x00, 0x00, 0x00, 0xcc, 0x00, 0x00,
+    0x00, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
+    0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x01, 0x00, 0x00,
+    0x00, 0x00, 0x03, 0xfe, 0x00, 0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1c,
+    0x00, 0x04, 0x03, 0xe2, 0x00, 0x00, 0x00, 0x64, 0x00, 0x40, 0x00, 0x05,
+    0x00, 0x24, 0x00, 0x7e, 0x00, 0xff, 0x01, 0x31, 0x01, 0x53, 0x01, 0x78,
+    0x01, 0x92, 0x02, 0xc9, 0x02, 0xdd, 0x03, 0x94, 0x03, 0xa9, 0x03, 0xc0,
+    0x20, 0x0a, 0x20, 0x26, 0x20, 0x30, 0x20, 0x3a, 0x20, 0x44, 0x21, 0x26,
+    0x22, 0x06, 0x22, 0x12, 0x22, 0x1e, 0x22, 0x2b, 0x22, 0x48, 0x22, 0x65,
+    0x22, 0xf2, 0x25, 0xca, 0x30, 0x07, 0x4e, 0x03, 0x4e, 0x09, 0x4e, 0x2d,
+    0x4e, 0x5d, 0x4e, 0x8c, 0x4e, 0x94, 0x51, 0x6d, 0x53, 0x41, 0x54, 0x26,
+    0x56, 0xdb, 0x57, 0x1f, 0x65, 0x87, 0x66, 0x2f, 0x67, 0x2c, 0x6b, 0x63,
+    0x6c, 0x34, 0x6d, 0x4b, 0x70, 0x6b, 0x78, 0x6e, 0x8b, 0xd5, 0x91, 0xd1,
+    0xf0, 0x02, 0xfe, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x20, 0x00, 0xa1,
+    0x01, 0x31, 0x01, 0x52, 0x01, 0x78, 0x01, 0x92, 0x02, 0xc6, 0x02, 0xd8,
+    0x03, 0x94, 0x03, 0xa5, 0x03, 0xbc, 0x20, 0x02, 0x20, 0x13, 0x20, 0x30,
+    0x20, 0x39, 0x20, 0x44, 0x21, 0x22, 0x22, 0x02, 0x22, 0x0f, 0x22, 0x19,
+    0x22, 0x2b, 0x22, 0x48, 0x22, 0x60, 0x22, 0xf2, 0x25, 0xca, 0x30, 0x07,
+    0x4e, 0x00, 0x4e, 0x09, 0x4e, 0x2d, 0x4e, 0x5d, 0x4e, 0x8c, 0x4e, 0x94,
+    0x51, 0x6b, 0x53, 0x41, 0x54, 0x26, 0x56, 0xd7, 0x57, 0x1f, 0x65, 0x87,
+    0x66, 0x2f, 0x67, 0x28, 0x6b, 0x63, 0x6c, 0x34, 0x6d, 0x4b, 0x70, 0x6b,
+    0x78, 0x6e, 0x8b, 0xd5, 0x91, 0xd1, 0xf0, 0x00, 0xfe, 0xff, 0xff, 0xff,
+    0x00, 0x00, 0x00, 0x00, 0xfe, 0xd2, 0x00, 0x00, 0xfe, 0x8b, 0xfe, 0x71,
+    0x00, 0x00, 0x00, 0x00, 0xfc, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0xdf, 0xd3, 0x00, 0x00, 0xdf, 0xbf, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xdd, 0xd8, 0xdd, 0xbb, 0x00, 0x00, 0xdd, 0x11,
+    0xda, 0x39, 0xcf, 0xfc, 0x00, 0x00, 0xb1, 0xfa, 0xb1, 0xd6, 0xb1, 0xa6,
+    0xb1, 0x77, 0xb1, 0x6f, 0x00, 0x00, 0xac, 0xc2, 0xab, 0xdd, 0x00, 0x00,
+    0xa8, 0xe4, 0x9a, 0x7c, 0x99, 0xd4, 0x00, 0x00, 0x94, 0xa0, 0x93, 0xcf,
+    0x92, 0xb8, 0x8f, 0x98, 0x87, 0x95, 0x74, 0x2e, 0x6e, 0x32, 0x00, 0x00,
+    0x01, 0x0e, 0x00, 0x01, 0x00, 0x64, 0x01, 0x20, 0x00, 0x00, 0x01, 0xda,
+    0x00, 0x00, 0x00, 0x00, 0x01, 0xd8, 0x01, 0xde, 0x00, 0x00, 0x01, 0xe6,
+    0x01, 0xee, 0x01, 0xf6, 0x02, 0x06, 0x00, 0x00, 0x02, 0x2a, 0x00, 0x00,
+    0x02, 0x2a, 0x02, 0x32, 0x02, 0x3a, 0x02, 0x40, 0x00, 0x00, 0x00, 0x00,
+    0x02, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x4a, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x46, 0x00, 0x00,
+    0x00, 0x00, 0x02, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x48,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x02, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x04, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x05, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
+    0x00, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x09, 0x00, 0x0a, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x0b, 0x00, 0x0c, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
+    0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03,
+    0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00,
+    0x01, 0x06, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x01, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+    0x06, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x00, 0x03, 0x03, 0x03, 0x03,
+    0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+    0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+    0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+    0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+    0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+    0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+    0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x00,
+    0x03, 0x03, 0x03, 0x05, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+    0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+    0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+    0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+    0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+    0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+    0x03, 0x03, 0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+    0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x00, 0x03, 0x03, 0x00, 0x00,
+    0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+    0x03, 0x03, 0x03, 0x03, 0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+    0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x18, 0xb8, 0x00, 0x00,
+    0x4c, 0xb8, 0x00, 0xc0, 0x63, 0xb8, 0x00, 0x04, 0x62, 0x20, 0x67, 0x61,
+    0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x26,
+    0x00, 0x26, 0x00, 0x26, 0x00, 0x3c, 0x00, 0x54, 0x00, 0x6c, 0x00, 0x6c,
+    0x00, 0x6c, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x6c,
+    0x00, 0x6c, 0x00, 0x00, 0x00, 0x02, 0x00, 0x80, 0x00, 0x00, 0x03, 0x80,
+    0x03, 0x00, 0x00, 0x03, 0x00, 0x07, 0x00, 0x22, 0x00, 0xb3, 0x00, 0x00,
+    0x00, 0x00, 0x16, 0xe0, 0x12, 0xb2, 0x01, 0x01, 0x01, 0x15, 0x36, 0x16,
+    0xb0, 0x00, 0x2f, 0xb0, 0x01, 0x2f, 0xb0, 0x02, 0x2f, 0xb0, 0x03, 0x2f,
+    0xb0, 0x04, 0x2f, 0xb0, 0x07, 0x2f, 0x25, 0x21, 0x11, 0x21, 0x03, 0x11,
+    0x21, 0x11, 0x01, 0x00, 0x02, 0x00, 0xfe, 0x00, 0x80, 0x03, 0x00, 0x80,
+    0x02, 0x00, 0xfd, 0x80, 0x03, 0x00, 0xfd, 0x00, 0x00, 0x01, 0x00, 0x00,
+    0xff, 0x00, 0x04, 0x00, 0x03, 0x00, 0x00, 0x03, 0x00, 0x11, 0x00, 0xb3,
+    0x00, 0x00, 0x00, 0x00, 0x16, 0xe0, 0x12, 0xb2, 0x01, 0x01, 0x01, 0x15,
+    0x36, 0x16, 0x00, 0x19, 0x01, 0x21, 0x11, 0x04, 0x00, 0xff, 0x00, 0x04,
+    0x00, 0xfc, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xff, 0x00, 0x04, 0x00,
+    0x00, 0x00, 0x00, 0x03, 0x00, 0x16, 0x00, 0xb3, 0x00, 0x00, 0x00, 0x00,
+    0x16, 0xe0, 0x12, 0xb2, 0x01, 0x01, 0x01, 0x15, 0x36, 0x16, 0xb0, 0x01,
+    0x2f, 0xb0, 0x02, 0x2f, 0x19, 0x01, 0x21, 0x11, 0x04, 0x00, 0xff, 0x00,
+    0x01, 0x00, 0xff, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00,
+    0x03, 0x00, 0x00, 0x03, 0x00, 0x16, 0x00, 0xb3, 0x00, 0x00, 0x00, 0x00,
+    0x16, 0xe0, 0x12, 0xb2, 0x01, 0x01, 0x01, 0x15, 0x36, 0x16, 0xb0, 0x00,
+    0x2f, 0xb0, 0x03, 0x2f, 0x31, 0x11, 0x21, 0x11, 0x04, 0x00, 0x03, 0x00,
+    0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0xae, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1d, 0x00, 0x3c, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x07, 0x00, 0x6a, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x07, 0x00, 0x82, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x26, 0x00, 0xd8, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x0b, 0x01, 0x17, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x0f, 0x01, 0x43, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x0b, 0x01, 0x6b, 0x00, 0x03,
+    0x00, 0x01, 0x04, 0x09, 0x00, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x00, 0x03,
+    0x00, 0x01, 0x04, 0x09, 0x00, 0x01, 0x00, 0x0e, 0x00, 0x5a, 0x00, 0x03,
+    0x00, 0x01, 0x04, 0x09, 0x00, 0x02, 0x00, 0x0e, 0x00, 0x72, 0x00, 0x03,
+    0x00, 0x01, 0x04, 0x09, 0x00, 0x03, 0x00, 0x4c, 0x00, 0x8a, 0x00, 0x03,
+    0x00, 0x01, 0x04, 0x09, 0x00, 0x04, 0x00, 0x16, 0x00, 0xff, 0x00, 0x03,
+    0x00, 0x01, 0x04, 0x09, 0x00, 0x05, 0x00, 0x1e, 0x01, 0x23, 0x00, 0x03,
+    0x00, 0x01, 0x04, 0x09, 0x00, 0x06, 0x00, 0x16, 0x01, 0x53, 0x00, 0x43,
+    0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, 0x00, 0x69, 0x00, 0x67,
+    0x00, 0x68, 0x00, 0x74, 0x00, 0x20, 0x00, 0x28, 0x00, 0x63, 0x00, 0x29,
+    0x00, 0x20, 0x00, 0x31, 0x00, 0x39, 0x00, 0x38, 0x00, 0x30, 0x00, 0x2c,
+    0x00, 0x20, 0x00, 0x41, 0x00, 0x6e, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x79,
+    0x00, 0x6d, 0x00, 0x6f, 0x00, 0x75, 0x00, 0x73, 0x00, 0x00, 0x43, 0x6f,
+    0x70, 0x79, 0x72, 0x69, 0x67, 0x68, 0x74, 0x20, 0x28, 0x63, 0x29, 0x20,
+    0x31, 0x39, 0x38, 0x30, 0x2c, 0x20, 0x41, 0x6e, 0x6f, 0x6e, 0x79, 0x6d,
+    0x6f, 0x75, 0x73, 0x00, 0x00, 0x4d, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67,
+    0x00, 0x4c, 0x00, 0x69, 0x00, 0x55, 0x00, 0x00, 0x4d, 0x69, 0x6e, 0x67,
+    0x4c, 0x69, 0x55, 0x00, 0x00, 0x52, 0x00, 0x65, 0x00, 0x67, 0x00, 0x75,
+    0x00, 0x6c, 0x00, 0x61, 0x00, 0x72, 0x00, 0x00, 0x52, 0x65, 0x67, 0x75,
+    0x6c, 0x61, 0x72, 0x00, 0x00, 0x46, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x74,
+    0x00, 0x46, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x67, 0x00, 0x65, 0x00, 0x20,
+    0x00, 0x32, 0x00, 0x2e, 0x00, 0x30, 0x00, 0x20, 0x00, 0x3a, 0x00, 0x20,
+    0x00, 0x46, 0x00, 0x6c, 0x00, 0x75, 0x00, 0x74, 0x00, 0x74, 0x00, 0x65,
+    0x00, 0x72, 0x00, 0x54, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, 0x20,
+    0x00, 0x3a, 0x00, 0x20, 0x00, 0x31, 0x00, 0x2d, 0x00, 0x31, 0x00, 0x2d,
+    0x00, 0x31, 0x00, 0x39, 0x00, 0x38, 0x00, 0x30, 0x00, 0x00, 0x46, 0x6f,
+    0x6e, 0x74, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x20, 0x32, 0x2e, 0x30, 0x20,
+    0x3a, 0x20, 0x46, 0x6c, 0x75, 0x74, 0x74, 0x65, 0x72, 0x54, 0x65, 0x73,
+    0x74, 0x20, 0x3a, 0x20, 0x31, 0x2d, 0x31, 0x2d, 0x31, 0x39, 0x38, 0x30,
+    0x00, 0x00, 0x46, 0x00, 0x6c, 0x00, 0x75, 0x00, 0x74, 0x00, 0x74, 0x00,
+    0x65, 0x00, 0x72, 0x00, 0x54, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00,
+    0x00, 0x46, 0x6c, 0x75, 0x74, 0x74, 0x65, 0x72, 0x54, 0x65, 0x73, 0x74,
+    0x00, 0x00, 0x56, 0x00, 0x65, 0x00, 0x72, 0x00, 0x73, 0x00, 0x69, 0x00,
+    0x6f, 0x00, 0x6e, 0x00, 0x20, 0x00, 0x30, 0x00, 0x30, 0x00, 0x31, 0x00,
+    0x2e, 0x00, 0x30, 0x00, 0x30, 0x00, 0x30, 0x00, 0x00, 0x56, 0x65, 0x72,
+    0x73, 0x69, 0x6f, 0x6e, 0x20, 0x30, 0x30, 0x31, 0x2e, 0x30, 0x30, 0x30,
+    0x00, 0x00, 0x46, 0x00, 0x6c, 0x00, 0x75, 0x00, 0x74, 0x00, 0x74, 0x00,
+    0x65, 0x00, 0x72, 0x00, 0x54, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00,
+    0x00, 0x46, 0x6c, 0x75, 0x74, 0x74, 0x65, 0x72, 0x54, 0x65, 0x73, 0x74,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xff, 0x7e, 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x0e, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x01, 0x02, 0x01, 0x03,
+    0x01, 0x04, 0x01, 0x05, 0x01, 0x06, 0x01, 0x07, 0x01, 0x08, 0x01, 0x09,
+    0x01, 0x0a, 0x01, 0x0b, 0x01, 0x0c, 0x06, 0x53, 0x71, 0x75, 0x61, 0x72,
+    0x65, 0x0e, 0x41, 0x73, 0x63, 0x65, 0x6e, 0x74, 0x20, 0x46, 0x6c, 0x75,
+    0x73, 0x68, 0x65, 0x64, 0x0f, 0x44, 0x65, 0x73, 0x63, 0x65, 0x6e, 0x74,
+    0x20, 0x46, 0x6c, 0x75, 0x73, 0x68, 0x65, 0x64, 0x0c, 0x46, 0x75, 0x6c,
+    0x6c, 0x20, 0x41, 0x64, 0x76, 0x61, 0x6e, 0x63, 0x65, 0x0b, 0x31, 0x2f,
+    0x32, 0x20, 0x41, 0x64, 0x76, 0x61, 0x6e, 0x63, 0x65, 0x0b, 0x31, 0x2f,
+    0x33, 0x20, 0x41, 0x64, 0x76, 0x61, 0x6e, 0x63, 0x65, 0x0b, 0x31, 0x2f,
+    0x34, 0x20, 0x41, 0x64, 0x76, 0x61, 0x6e, 0x63, 0x65, 0x0b, 0x31, 0x2f,
+    0x36, 0x20, 0x41, 0x64, 0x76, 0x61, 0x6e, 0x63, 0x65, 0x0b, 0x31, 0x2f,
+    0x35, 0x20, 0x41, 0x64, 0x76, 0x61, 0x6e, 0x63, 0x65, 0x0c, 0x31, 0x2f,
+    0x31, 0x30, 0x20, 0x41, 0x64, 0x76, 0x61, 0x6e, 0x63, 0x65, 0x0c, 0x5a,
+    0x65, 0x72, 0x6f, 0x20, 0x41, 0x64, 0x76, 0x61, 0x6e, 0x63, 0x65, 0x00,
+    0x00, 0x01, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00,
+    0x00, 0x02, 0x00, 0x01, 0x00, 0x03, 0x00, 0x0d, 0x00, 0x01, 0x00, 0x04,
+    0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+    0x00, 0x08, 0x00, 0x00, 0x00, 0x04, 0x00, 0x12, 0x00, 0x03, 0x68, 0x61,
+    0x6e, 0x67, 0x69, 0x64, 0x65, 0x6f, 0x72, 0x6f, 0x6d, 0x6e, 0x00, 0x03,
+    0x67, 0x72, 0x65, 0x6b, 0x00, 0x14, 0x68, 0x61, 0x6e, 0x69, 0x00, 0x30,
+    0x6c, 0x61, 0x74, 0x6e, 0x00, 0x4c, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x02, 0x00, 0x03, 0x00, 0x0a, 0x00, 0x0e, 0x00, 0x12, 0x00, 0x01,
+    0x03, 0x00, 0x00, 0x01, 0xff, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x06,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00, 0x0a, 0x00, 0x0e,
+    0x00, 0x12, 0x00, 0x01, 0x03, 0x00, 0x00, 0x01, 0xff, 0x00, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x03,
+    0x00, 0x0a, 0x00, 0x0e, 0x00, 0x12, 0x00, 0x01, 0x03, 0x00, 0x00, 0x01,
+    0xff, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+  ]);
diff --git a/third_party/web_test_fonts/pubspec.yaml b/third_party/web_test_fonts/pubspec.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..2042ad239ca21ab5d79dcdccef8365414263a2bf
--- /dev/null
+++ b/third_party/web_test_fonts/pubspec.yaml
@@ -0,0 +1,10 @@
+name: web_test_fonts
+
+publish_to: none
+
+environment:
+  sdk: '>=3.2.0-0 <4.0.0'
+
+dev_dependencies:
+  args: any
+  path: any
diff --git a/third_party/web_unicode/pubspec.yaml b/third_party/web_unicode/pubspec.yaml
index 8d9281ee95302c06301f6fb7c4a516600af1924e..fd57811f90f19a43b06765761ace97384fb42133 100644
--- a/third_party/web_unicode/pubspec.yaml
+++ b/third_party/web_unicode/pubspec.yaml
@@ -3,7 +3,7 @@ name: web_unicode
 publish_to: none
 
 environment:
-  sdk: ">=2.12.0-0 <3.0.0"
+  sdk: '>=3.2.0-0 <4.0.0'
 
 dev_dependencies:
   args: any
diff --git a/tools/activate_emsdk.py b/tools/activate_emsdk.py
index 30fd1b0d6d9040bfb78a0312f3e54d01166f8844..64219942a4a97297980ae7c7629e1910b5638da0 100644
--- a/tools/activate_emsdk.py
+++ b/tools/activate_emsdk.py
@@ -9,27 +9,23 @@ import os
 import subprocess
 import sys
 
-EMSDK_ROOT = os.path.join('src', 'buildtools', 'emsdk')
+EMSDK_ROOT = os.path.abspath(os.path.join(__file__, '..', '..', 'prebuilts', 'emsdk'))
 
 EMSDK_PATH = os.path.join(EMSDK_ROOT, 'emsdk.py')
 
 # See lib/web_ui/README.md for instructions on updating the EMSDK version.
-EMSDK_VERSION = '3.1.3'
+EMSDK_VERSION = '3.1.44'
 
 
 def main():
   try:
-    subprocess.check_call([
-        sys.executable, EMSDK_PATH, 'install', EMSDK_VERSION
-    ],
+    subprocess.check_call([sys.executable, EMSDK_PATH, 'install', EMSDK_VERSION],
                           stdout=subprocess.DEVNULL)
   except subprocess.CalledProcessError:
     print('Failed to install emsdk')
     return 1
   try:
-    subprocess.check_call([
-        sys.executable, EMSDK_PATH, 'activate', EMSDK_VERSION
-    ],
+    subprocess.check_call([sys.executable, EMSDK_PATH, 'activate', EMSDK_VERSION],
                           stdout=subprocess.DEVNULL)
   except subprocess.CalledProcessError:
     print('Failed to activate emsdk')
diff --git a/tools/android_illegal_imports.py b/tools/android_illegal_imports.py
index 47e8a7ad202c67f913d0d33dabf9a91c3f0d1a59..dfa77c35993ef09ab620766e2e6b7ac05a565239 100644
--- a/tools/android_illegal_imports.py
+++ b/tools/android_illegal_imports.py
@@ -16,6 +16,8 @@ ANDROIDX_TRACE_CLASS = 'androidx.tracing.Trace'
 ANDROID_TRACE_CLASS = 'android.tracing.Trace'
 FLUTTER_TRACE_CLASS = 'io.flutter.util.TraceSection'
 
+ANDROID_BUILD_VERSION_CODE_CLASS = 'VERSION_CODES'
+
 
 def CheckBadFiles(bad_files, bad_class, good_class):
   if bad_files:
@@ -42,11 +44,12 @@ def main():
 
   bad_log_files = []
   bad_trace_files = []
+  bad_version_codes_files = []
 
   for file in args.files:
     if (file.endswith(os.path.join('io', 'flutter', 'Log.java')) or
-        file.endswith(os.path.join('io', 'flutter', 'util', 'TraceSection.java')
-                     )):
+        file.endswith(os.path.join('io', 'flutter', 'util', 'TraceSection.java')) or
+        file.endswith(os.path.join('io', 'flutter', 'Build.java'))):
       continue
     with open(file) as f:
       contents = f.read()
@@ -54,13 +57,23 @@ def main():
         bad_log_files.append(file)
       if ANDROIDX_TRACE_CLASS in contents or ANDROID_TRACE_CLASS in contents:
         bad_trace_files.append(file)
-
-  has_bad_files = CheckBadFiles(
-      bad_log_files, ANDROID_LOG_CLASS, FLUTTER_LOG_CLASS
-  )
-  has_bad_files = has_bad_files or CheckBadFiles(
-      bad_trace_files, 'android[x].tracing.Trace', FLUTTER_TRACE_CLASS
-  )
+      if ANDROID_BUILD_VERSION_CODE_CLASS in contents:
+        bad_version_codes_files.append(file)
+
+  # Flutter's Log class allows additional configuration around verbosity.
+
+  # Flutter's tracing class makes sure we do not violate string lengths that
+  # cause crashes at runtime.
+
+  # Flutter's Build.API_LEVELS class is clearer to read about which API version
+  # is used.
+  has_bad_files = CheckBadFiles(bad_log_files, ANDROID_LOG_CLASS,
+                                FLUTTER_LOG_CLASS) or CheckBadFiles(
+                                    bad_trace_files, 'android[x].tracing.Trace', FLUTTER_TRACE_CLASS
+                                ) or CheckBadFiles(
+                                    bad_version_codes_files, 'android.os.Build.VERSION_CODES',
+                                    'io.flutter.Build.API_LEVELS'
+                                )
 
   if has_bad_files:
     return 1
diff --git a/tools/android_lint/.gitignore b/tools/android_lint/.gitignore
index e44752dc2001b59ff1f2b62f94afc6a37dba36c9..c42d61497735f306ef4068979687e3296f76ddfa 100644
--- a/tools/android_lint/.gitignore
+++ b/tools/android_lint/.gitignore
@@ -1 +1,3 @@
 lint_report/
+# autogenerated by the tool, run in CI.
+project.xml
diff --git a/tools/android_lint/baseline.xml b/tools/android_lint/baseline.xml
index 41e7e89b6a6f4a1022a233625ed2cc806ad9deee..a73601b7945032ba61cc52fa2ccfa7bfaa3a9556 100644
--- a/tools/android_lint/baseline.xml
+++ b/tools/android_lint/baseline.xml
@@ -1,71 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 7.2.0" type="baseline" client="" dependencies="true" name="" variant="all" version="7.2.0">
-
-    <issue
-        id="InlinedApi"
-        message="Field requires API level 18 (current min is 16): `android.content.pm.ActivityInfo#SCREEN_ORIENTATION_USER_PORTRAIT`"
-        errorLine1="        return ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT;"
-        errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/PlatformChannel.java"
-            line="267"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="InlinedApi"
-        message="Field requires API level 18 (current min is 16): `android.content.pm.ActivityInfo#SCREEN_ORIENTATION_USER_LANDSCAPE`"
-        errorLine1="        return ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE;"
-        errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/PlatformChannel.java"
-            line="271"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="InlinedApi"
-        message="Field requires API level 18 (current min is 16): `android.content.pm.ActivityInfo#SCREEN_ORIENTATION_FULL_USER`"
-        errorLine1="        return ActivityInfo.SCREEN_ORIENTATION_FULL_USER;"
-        errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/PlatformChannel.java"
-            line="275"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="InlinedApi"
-        message="Field requires API level 17 (current min is 16): `android.view.View#LAYOUT_DIRECTION_LTR`"
-        errorLine1="    return direction == View.LAYOUT_DIRECTION_LTR || direction == View.LAYOUT_DIRECTION_RTL;"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java"
-            line="661"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="InlinedApi"
-        message="Field requires API level 17 (current min is 16): `android.view.View#LAYOUT_DIRECTION_RTL`"
-        errorLine1="    return direction == View.LAYOUT_DIRECTION_LTR || direction == View.LAYOUT_DIRECTION_RTL;"
-        errorLine2="                                                                  ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java"
-            line="661"
-            column="67"/>
-    </issue>
-
-    <issue
-        id="OldTargetApi"
-        message="Not targeting the latest versions of Android; compatibility modes apply. Consider testing and updating this version. Consult the `android.os.Build.VERSION_CODES` javadoc for details."
-        errorLine1="    &lt;uses-sdk android:minSdkVersion=&quot;16&quot; android:targetSdkVersion=&quot;31&quot; />"
-        errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../flutter/shell/platform/android/AndroidManifest.xml"
-            line="8"
-            column="42"/>
-    </issue>
+<issues format="6" by="lint 8.1.0 [10406996] " type="baseline" client="" dependencies="true" name="" variant="all" version="8.1.0 [10406996] ">
 
     <issue
         id="HardcodedDebugMode"
@@ -85,7 +19,7 @@
         errorLine2="                 ~~~~~~~~~~~~">
         <location
             file="../../../flutter/shell/platform/android/io/flutter/view/FlutterView.java"
-            line="436"
+            line="445"
             column="18"/>
     </issue>
 
@@ -96,19 +30,8 @@
         errorLine2="                 ~~~~~~~~~~~~">
         <location
             file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterView.java"
-            line="911"
+            line="928"
             column="18"/>
     </issue>
 
-    <issue
-        id="UseSparseArrays"
-        message="Use `new SparseArray&lt;VirtualDisplayController>(...)` instead for better performance"
-        errorLine1="        vdControllers = new HashMap&lt;>();"
-        errorLine2="                        ~~~~~~~~~~~~~~~">
-        <location
-            file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java"
-            line="61"
-            column="25"/>
-</issue>
-
 </issues>
diff --git a/tools/android_lint/bin/main.dart b/tools/android_lint/bin/main.dart
index 88cfd040e231beb2bb2de1fd027cb2dced0f6dfa..d6b6191b73e987546ae93c02e61379ae5c2060a6 100644
--- a/tools/android_lint/bin/main.dart
+++ b/tools/android_lint/bin/main.dart
@@ -73,7 +73,7 @@ Future<int> runLint(ArgParser argParser, ArgResults argResults) async {
 <!-- WILL AUTOMATICALLY FIND ALL .java FILES AND INCLUDE THEM HERE       -->
 <project>
   <sdk dir="${androidSdkDir.path}" />
-  <module name="FlutterEngine" android="true" library="true" compile-sdk-version="android-T">
+  <module name="FlutterEngine" android="true" library="true" compile-sdk-version="android-U">
   <manifest file="${path.join(androidDir.path, 'AndroidManifest.xml')}" />
 ''');
   for (final FileSystemEntity entity in androidDir.listSync(recursive: true)) {
@@ -95,7 +95,7 @@ Future<int> runLint(ArgParser argParser, ArgResults argResults) async {
   final List<String> lintArgs = <String>[
     path.join(androidSdkDir.path, 'cmdline-tools', 'latest', 'bin', 'lint'),
     '--project', projectXmlPath,
-    '--compile-sdk-version', '33',
+    '--compile-sdk-version', '34',
     '--showall',
     '--exitcode', // Set non-zero exit code on errors
     '-Wall',
diff --git a/tools/android_lint/project.xml b/tools/android_lint/project.xml
deleted file mode 100644
index 7c83d368f2449ec51d6ec2210e7316fc46b42cc5..0000000000000000000000000000000000000000
--- a/tools/android_lint/project.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<!-- THIS FILE IS GENERATED. PLEASE USE THE INCLUDED DART PROGRAM  WHICH -->
-<!-- WILL AUTOMATICALLY FIND ALL .java FILES AND INCLUDE THEM HERE       -->
-<project>
-  <sdk dir="../../../third_party/android_tools/sdk" />
-  <module name="FlutterEngine" android="true" library="true" compile-sdk-version="android-T">
-  <manifest file="../../../flutter/shell/platform/android/AndroidManifest.xml" />
-    <src file="../../../flutter/shell/platform/android/test/io/flutter/util/KeyCodes.java" />
-    <src file="../../../flutter/shell/platform/android/test/io/flutter/util/FakeKeyEvent.java" />
-    <src file="../../../flutter/shell/platform/android/test/io/flutter/plugins/GeneratedPluginRegistrant.java" />
-    <src file="../../../flutter/shell/platform/android/test/io/flutter/embedding/android/SplashShadowResources.java" />
-    <src file="../../../flutter/shell/platform/android/test/io/flutter/embedding/android/RobolectricFlutterActivity.java" />
-    <src file="../../../flutter/shell/platform/android/test/io/flutter/CustomShadowContextImpl.java" />
-    <src file="../../../flutter/shell/platform/android/test/io/flutter/external/FlutterLaunchTests.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/app/FlutterPluginRegistry.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/app/FlutterPlayStoreSplitApplication.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/app/FlutterActivity.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/app/FlutterActivityEvents.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/app/FlutterApplication.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/util/Preconditions.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/util/ViewUtils.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/util/Predicate.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/util/TraceSection.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/util/PathUtils.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/util/HandlerCompat.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/KeyboardMap.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/KeyboardManager.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/AndroidTouchProcessor.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterPlayStoreSplitApplication.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/RenderMode.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterFragmentActivity.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivity.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/DrawableSplashScreen.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/KeyChannelResponder.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivityAndFragmentDelegate.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterView.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterSplashView.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/KeyEmbedderResponder.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterTextureView.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/MotionEventTracker.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/SplashScreenProvider.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/WindowInfoRepositoryCallbackAdapterWrapper.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/TransparencyMode.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterEngineProvider.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterFragment.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterEngineConfigurator.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterSurfaceView.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/ExclusiveAppComponent.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterImageView.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/KeyData.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivityLaunchConfigs.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/android/SplashScreen.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterUiDisplayListener.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/RenderSurface.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/SurfaceTextureWrapper.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/mutatorsstack/FlutterMutatorsStack.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/mutatorsstack/FlutterMutatorView.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/PluginRegistry.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/util/GeneratedPluginRegister.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/activity/ActivityPluginBinding.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/activity/ActivityAware.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/activity/ActivityControlSurface.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/lifecycle/HiddenLifecycleReference.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/contentprovider/ContentProviderPluginBinding.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/contentprovider/ContentProviderAware.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/contentprovider/ContentProviderControlSurface.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimRegistrar.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimPluginRegistry.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/service/ServiceControlSurface.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/service/ServicePluginBinding.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/service/ServiceAware.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/FlutterPlugin.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/broadcastreceiver/BroadcastReceiverAware.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/broadcastreceiver/BroadcastReceiverControlSurface.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/broadcastreceiver/BroadcastReceiverPluginBinding.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/dart/PlatformTaskQueue.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/dart/DartExecutor.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/dart/PlatformMessageHandler.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/dart/DartMessenger.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngineConnectionRegistry.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterOverlaySurface.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/loader/FlutterLoader.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/loader/ApplicationInfoLoader.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/loader/FlutterApplicationInfo.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/loader/ResourceExtractor.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/SettingsChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/PlatformViewsChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/NavigationChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/LocalizationChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/RestorationChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/TextInputChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/AccessibilityChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/KeyEventChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/SpellCheckChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/PlatformChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/SystemChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/DeferredComponentChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/MouseCursorChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/LifecycleChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngineCache.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngine.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/DeferredComponentManager.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/PlayStoreDeferredComponentManager.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngineGroup.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewRegistry.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/VirtualDisplayController.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewRegistryImpl.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/SingleViewPresentation.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewFactory.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/AccessibilityEventsDelegate.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformOverlayView.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformView.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsAccessibilityDelegate.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewWrapper.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/mouse/MouseCursorPlugin.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/BasicMessageChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/JSONMethodCodec.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/JSONUtil.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/PluginRegistry.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/MessageCodec.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/ErrorLogResult.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/JSONMessageCodec.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/ActivityLifecycleListener.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/BinaryCodec.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/FlutterException.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/StringCodec.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/StandardMessageCodec.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/StandardMethodCodec.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/MethodCodec.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/BinaryMessenger.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/MethodCall.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/EventChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/MethodChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/editing/TextInputPlugin.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/editing/TextEditingDelta.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/editing/ListenableEditingState.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/editing/InputConnectionAdaptor.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/editing/FlutterTextUtils.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/editing/ImeSyncDeferringInsetsCallback.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/editing/SpellCheckPlugin.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/localization/LocalizationPlugin.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/FlutterInjector.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/Log.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/view/FlutterNativeView.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/view/FlutterCallbackInformation.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/view/VsyncWaiter.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/view/FlutterView.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/view/FlutterMain.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/view/TextureRegistry.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/view/FlutterRunArguments.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/view/AccessibilityBridge.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/view/AccessibilityViewEmbedder.java" />
-  </module>
-</project>
diff --git a/tools/android_lint/pubspec.yaml b/tools/android_lint/pubspec.yaml
index 81eb92b2088417e8d4d8c1f3b6d5ed3b36fdd3ea..125b864b5d663f5f18a1a0abb90d59a781120a4a 100644
--- a/tools/android_lint/pubspec.yaml
+++ b/tools/android_lint/pubspec.yaml
@@ -4,7 +4,7 @@
 
 name: android_lint
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=3.2.0-0 <4.0.0'
 
 # Do not add any dependencies that require more than what is provided in
 # //third_party.pkg, //third_party/dart/pkg, or
@@ -24,12 +24,12 @@ dependency_overrides:
   args:
     path: ../../../third_party/dart/third_party/pkg/args
   file:
-    path: ../../../third_party/pkg/file/packages/file
+    path: ../../../third_party/dart/third_party/pkg/file/packages/file
   meta:
     path: ../../../third_party/dart/pkg/meta
   path:
     path: ../../../third_party/dart/third_party/pkg/path
   platform:
-    path: ../../../third_party/pkg/platform
+    path: ../../third_party/pkg/platform
   process:
-    path: ../../../third_party/pkg/process
+    path: ../../third_party/pkg/process
diff --git a/tools/android_sdk/create_cipd_packages.sh b/tools/android_sdk/create_cipd_packages.sh
index c618ddeb025b8dc07eff0654b7abe246815e6297..94d71bb5cabb37cbeac95016bd65f061a11784a7 100755
--- a/tools/android_sdk/create_cipd_packages.sh
+++ b/tools/android_sdk/create_cipd_packages.sh
@@ -4,16 +4,18 @@
 
 print_usage () {
   echo "Usage:"
-  echo "  ./create_cipd_united_package.sh <VERSION_TAG> [PATH_TO_SDK_DIR]"
+  echo "  ./create_cipd_packages.sh <VERSION_TAG> [PATH_TO_SDK_DIR]"
   echo "    Downloads, packages, and uploads Android SDK packages where:"
-  echo "      - VERSION_TAG is the tag of the cipd packages, e.g. 28r6 or 31v1"
+  echo "      - VERSION_TAG is the tag of the cipd packages, e.g. 28r6 or 31v1. Must contain"
+  echo "                    only lowercase letters and numbers."
   echo "      - PATH_TO_SDK_DIR is the path to the sdk folder. If omitted, this defaults to"
   echo "                      your ANDROID_SDK_ROOT environment variable."
-  echo "  ./create_cipd_united_package.sh list"
+  echo "  ./create_cipd_packages.sh list"
   echo "    Lists the available packages for use in 'packages.txt'"
   echo ""
   echo "This script downloads the packages specified in packages.txt and uploads"
   echo "them to CIPD for linux, mac, and windows."
+  echo "To confirm you have write permissions run 'cipd acl-check flutter/android/sdk/all/ -writer'."
   echo ""
   echo "Manage the packages to download in 'packages.txt'. You can use"
   echo "'sdkmanager --list --include_obsolete' in cmdline-tools to list all available packages."
@@ -25,20 +27,27 @@ print_usage () {
   echo "and should only be run on linux or macos hosts."
 }
 
-# Validate version is provided
-if [[ $1 == "" ]]; then
+first_argument=$1
+# Validate version or argument is provided.
+if [[ $first_argument == "" ]]; then
   print_usage
   exit 1
 fi
 
-# Validate path contains depot_tools
+# Validate version contains only lower case letters and numbers.
+if ! [[ $first_argument =~ ^[[:lower:][:digit:]]+$ ]]; then
+  echo "Version tag can only consist of lower case letters and digits.";
+  print_usage
+  exit 1
+fi
+
+# Validate environment has cipd installed.
 if [[ `which cipd` == "" ]]; then
   echo "'cipd' command not found. depot_tools should be on the path."
   exit 1
 fi
 
 sdk_path=${2:-$ANDROID_SDK_ROOT}
-version_tag=$1
 
 # Validate directory contains all SDK packages
 if [[ ! -d "$sdk_path" ]]; then
@@ -46,6 +55,8 @@ if [[ ! -d "$sdk_path" ]]; then
   print_usage
   exit 1
 fi
+
+# Validate caller has cipd.
 if [[ ! -d "$sdk_path/cmdline-tools" ]]; then
   echo "SDK directory does not contain $sdk_path/cmdline-tools."
   print_usage
@@ -73,7 +84,7 @@ while [ ! -f "$sdkmanager_path" ]; do
 done
 
 # list available packages
-if [ $version_tag == "list" ]; then
+if [ $first_argument == "list" ]; then
   $sdkmanager_path  --list --include_obsolete
   exit 0
 fi
@@ -108,12 +119,22 @@ for platform in "${platforms[@]}"; do
   done
 
   # Special treatment for NDK to move to expected directory.
+  # Instead of the ndk being in `sdk/ndk/<major>.<minor>.<patch>/`, it will be
+  # in `ndk/`.
+  # This simplifies the build scripts, and enables version difference between
+  # the Dart and Flutter build while reusing the same build rules.
+  # See https://github.com/flutter/flutter/issues/136666#issuecomment-1805467578
   mv $upload_dir/sdk/ndk $upload_dir/ndk-bundle
   ndk_sub_paths=`find $upload_dir/ndk-bundle -maxdepth 1 -type d`
   ndk_sub_paths_arr=($ndk_sub_paths)
   mv ${ndk_sub_paths_arr[1]} $upload_dir/ndk
   rm -rf $upload_dir/ndk-bundle
 
+  if [[ ! -d "$upload_dir/ndk" ]]; then
+    echo "Failure to bundle ndk for platform"
+    exit 1
+  fi
+
   # Accept all licenses to ensure they are generated and uploaded.
   yes "y" | $sdkmanager_path --licenses --sdk_root=$sdk_root
   cp -r "$sdk_root/licenses" "$upload_dir/sdk"
@@ -129,11 +150,16 @@ for platform in "${platforms[@]}"; do
     if [[ $platform == "macosx" ]]; then
       cipd_name="mac-$arch"
     fi
-    echo "Uploading $cipd_name to CIPD"
-    cipd create -in $upload_dir -name "flutter/android/sdk/all/$cipd_name" -install-mode copy -tag version:$version_tag
+
+    echo "Uploading $upload_dir as $cipd_name to CIPD"
+    cipd create -in $upload_dir -name "flutter/android/sdk/all/$cipd_name" -install-mode copy -tag version:$first_argument
   done
 
   rm -rf $sdk_root
   rm -rf $upload_dir
+
+  # This variable changes the behvaior of sdkmanager.
+  # Unset to clean up after script.
+  unset REPO_OS_OVERRIDE
 done
 rm -rf $temp_dir
diff --git a/tools/android_sdk/packages.txt b/tools/android_sdk/packages.txt
index b257101a496affe10a565a550a0cf9a8595219c7..43a2526314c4e94a48845e5ed92a8b15fbe30bd5 100644
--- a/tools/android_sdk/packages.txt
+++ b/tools/android_sdk/packages.txt
@@ -1,6 +1,6 @@
-platforms;android-33:platforms
+platforms;android-34:platforms
 cmdline-tools;latest:cmdline-tools
-build-tools;33.0.0:build-tools
+build-tools;34.0.0:build-tools
 platform-tools:platform-tools
 tools:tools
-ndk;22.1.7171670:ndk
\ No newline at end of file
+ndk;22.1.7171670:ndk
diff --git a/tools/androidx/configure.gradle b/tools/androidx/configure.gradle
index 35e02b888aa352fc67039e1304701c23d59b3b62..cbd106ac80e2f53845c00eff6a2545e283e4857e 100644
--- a/tools/androidx/configure.gradle
+++ b/tools/androidx/configure.gradle
@@ -5,7 +5,7 @@
 import groovy.json.JsonSlurper
 
 // Configures the embedding dependencies.
-ext.configureDependencies = { engineRootDir, add ->
+ext.configureEmbedderDependencies = { engineRootDir, add ->
     def filesJson = new File(engineRootDir, 'tools/androidx/files.json')
     if (!filesJson.exists()) {
         throw new Exception("${filesJson.absolutePath} not found. Did you provide the wrong engine root directory to configureDependencies?")
@@ -17,3 +17,21 @@ ext.configureDependencies = { engineRootDir, add ->
         add(dependency.maven_dependency)
     }
 }
+
+// Configures the embedding dependencies. To match the logic in
+// generate_pom_file.py, this does not include transitive dependencies since
+// they aren't used by the embedding.
+ext.configureDependencies = { engineRootDir, add ->
+    def filesJson = new File(engineRootDir, 'tools/androidx/files.json')
+    if (!filesJson.exists()) {
+        throw new Exception("${filesJson.absolutePath} not found. Did you provide the wrong engine root directory to configureDependencies?")
+    }
+    def dependencies = new JsonSlurper().parseText(filesJson.text)
+    assert dependencies instanceof List
+    dependencies.each { dependency ->
+        assert dependency.maven_dependency instanceof String
+        if (dependency.provides) {
+            add(dependency.maven_dependency)
+        }
+    }
+}
diff --git a/tools/androidx/files.json b/tools/androidx/files.json
index 2c055ebbb42e26faf69ca169e11f1b6917890e51..79ee484d6e737c8cdd2ddbed4b476995723b5b00 100644
--- a/tools/androidx/files.json
+++ b/tools/androidx/files.json
@@ -79,5 +79,11 @@
       "androidx.window.layout.WindowLayoutInfo",
       "androidx.window.layout.WindowInfoRepository"
     ]
+  },
+  {
+    "url": "https://dl.google.com/android/maven2/com/google/android/play/core/1.8.0/core-1.8.0.aar",
+    "out_file_name": "core-1.8.0.aar",
+    "maven_dependency": "com.google.android.play:core:1.8.0",
+    "provides": []
   }
 ]
diff --git a/tools/androidx/generate_pom_file.py b/tools/androidx/generate_pom_file.py
index 4d9231c31a3cce331c468126e93e70e5fb97cf5b..90c589614c4571a84181b154dbfa4c287c96f8d0 100644
--- a/tools/androidx/generate_pom_file.py
+++ b/tools/androidx/generate_pom_file.py
@@ -72,26 +72,16 @@ def main():
   with open(os.path.join(THIS_DIR, 'files.json')) as f:
     dependencies = json.load(f)
 
-  parser = argparse.ArgumentParser(
-      description='Generate the POM file for the engine artifacts'
-  )
+  parser = argparse.ArgumentParser(description='Generate the POM file for the engine artifacts')
   parser.add_argument(
       '--engine-artifact-id',
       type=utf8,
       required=True,
       help='The artifact id. e.g. android_arm_release'
   )
+  parser.add_argument('--engine-version', type=utf8, required=True, help='The engine commit hash')
   parser.add_argument(
-      '--engine-version',
-      type=utf8,
-      required=True,
-      help='The engine commit hash'
-  )
-  parser.add_argument(
-      '--destination',
-      type=utf8,
-      required=True,
-      help='The destination directory absolute path'
+      '--destination', type=utf8, required=True, help='The destination directory absolute path'
   )
   parser.add_argument(
       '--include-embedding-dependencies',
@@ -116,22 +106,12 @@ def main():
 
   # Write the POM file.
   with open(os.path.join(args.destination, out_file_name), 'w') as f:
-    f.write(
-        POM_FILE_CONTENT.format(
-            engine_artifact_id, artifact_version, pom_dependencies
-        )
-    )
+    f.write(POM_FILE_CONTENT.format(engine_artifact_id, artifact_version, pom_dependencies))
 
   # Write the Maven metadata file.
-  with open(os.path.join(args.destination,
-                         '%s.maven-metadata.xml' % engine_artifact_id),
-            'w') as f:
+  with open(os.path.join(args.destination, '%s.maven-metadata.xml' % engine_artifact_id), 'w') as f:
     timestamp = datetime.datetime.utcnow().strftime("%Y%m%d.%H%M%S")
-    f.write(
-        MAVEN_METADATA_CONTENT.format(
-            engine_artifact_id, artifact_version, timestamp
-        )
-    )
+    f.write(MAVEN_METADATA_CONTENT.format(engine_artifact_id, artifact_version, timestamp))
 
 
 if __name__ == '__main__':
diff --git a/tools/api_check/lib/apicheck.dart b/tools/api_check/lib/apicheck.dart
index 7aafdb6d022393cc397af40c4e645976da58e62a..6e6ecb93be692114d43716f66710ea152c04fe43 100644
--- a/tools/api_check/lib/apicheck.dart
+++ b/tools/api_check/lib/apicheck.dart
@@ -12,7 +12,6 @@ import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/analysis/session.dart';
 import 'package:analyzer/dart/analysis/utilities.dart';
 import 'package:analyzer/dart/ast/ast.dart';
-import 'package:pub_semver/pub_semver.dart';
 
 /// Returns all indexed fields in [className].
 ///
@@ -163,10 +162,7 @@ List<String> _getBlockStartingWith({
 /// Apply a visitor to all compilation units in the dart:ui library.
 void visitUIUnits(String flutterRoot, AstVisitor<void> visitor) {
   final String uiRoot = '$flutterRoot/lib/ui';
-  final FeatureSet analyzerFeatures = FeatureSet.fromEnableFlags2(
-    sdkLanguageVersion: Version.parse('2.17.0'),
-    flags: <String>['non-nullable'],
-  );
+  final FeatureSet analyzerFeatures = FeatureSet.latestLanguageVersion();
   final ParseStringResult uiResult = parseFile(path: '$uiRoot/ui.dart', featureSet: analyzerFeatures);
   for (final PartDirective part in uiResult.unit.directives.whereType<PartDirective>()) {
     final String partPath = part.uri.stringValue!;
diff --git a/tools/api_check/pubspec.yaml b/tools/api_check/pubspec.yaml
index 60a1493a0247a7fc04b29ecefe725edb97b44ab9..1904602a19edc78e9ac2a2b0bb30f614eccee598 100644
--- a/tools/api_check/pubspec.yaml
+++ b/tools/api_check/pubspec.yaml
@@ -14,7 +14,7 @@ publish_to: none
 # relative to this directory into //third_party/dart
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=3.2.0-0 <4.0.0'
 
 # Do not add any dependencies that require more than what is provided in
 # //third_party/pkg, //third_party/dart/pkg, or
@@ -40,6 +40,8 @@ dev_dependencies:
 dependency_overrides:
   _fe_analyzer_shared:
     path: ../../../third_party/dart/pkg/_fe_analyzer_shared
+  _macros:
+    path: ../../../third_party/dart/pkg/_macros
   analyzer:
     path: ../../../third_party/dart/pkg/analyzer
   async:
@@ -52,16 +54,20 @@ dependency_overrides:
     path: ../../../third_party/dart/third_party/pkg/convert
   crypto:
     path: ../../../third_party/dart/third_party/pkg/crypto
+  dart_internal:
+    path: ../../../third_party/dart/pkg/dart_internal
   expect:
     path: ../../../third_party/dart/pkg/expect
   file:
-    path: ../../../third_party/pkg/file/packages/file
+    path: ../../../third_party/dart/third_party/pkg/file/packages/file
   glob:
     path: ../../../third_party/dart/third_party/pkg/glob
   litetest:
     path: ../../testing/litetest
   meta:
     path: ../../../third_party/dart/pkg/meta
+  macros:
+    path: ../../../third_party/dart/pkg/macros
   package_config:
     path: ../../../third_party/dart/third_party/pkg/package_config
   path:
diff --git a/tools/api_check/test/apicheck_test.dart b/tools/api_check/test/apicheck_test.dart
index 945b4ee4d205d773534f20ab147f64f80efa5666..f32bb339f8f8a1a5635c2b6f7fcd86c28a1e3584 100644
--- a/tools/api_check/test/apicheck_test.dart
+++ b/tools/api_check/test/apicheck_test.dart
@@ -43,10 +43,6 @@ void checkApiConsistency(String flutterRoot) {
       sourcePath: path.join(flutterRoot, 'lib', 'ui', 'window.dart'),
       className: 'AccessibilityFeatures',
     );
-    final List<String> webuiFields = getDartClassFields(
-      sourcePath: path.join(flutterRoot, 'lib', 'ui', 'window.dart'),
-      className: 'AccessibilityFeatures',
-    );
     // C values: kFlutterAccessibilityFeatureFooBar = 1 << N,
     final List<String> embedderEnumValues = getCppEnumValues(
       sourcePath: path.join(flutterRoot, 'shell', 'platform', 'embedder', 'embedder.h'),
@@ -64,7 +60,6 @@ void checkApiConsistency(String flutterRoot) {
       enumName: 'AccessibilityFeature',
     ).map(allCapsToCamelCase).toList();
 
-    expect(webuiFields, uiFields);
     expect(embedderEnumValues, uiFields);
     expect(internalEnumValues, uiFields);
     expect(javaEnumValues, uiFields);
@@ -77,7 +72,7 @@ void checkApiConsistency(String flutterRoot) {
       className: 'SemanticsAction',
     );
     final List<String> webuiFields = getDartClassFields(
-      sourcePath: path.join(flutterRoot, 'lib', 'ui', 'semantics.dart'),
+      sourcePath: path.join(flutterRoot, 'lib', 'web_ui', 'lib', 'semantics.dart'),
       className: 'SemanticsAction',
     );
     // C values: kFlutterSemanticsActionFooBar = 1 << N.
@@ -103,6 +98,33 @@ void checkApiConsistency(String flutterRoot) {
     expect(javaEnumValues, uiFields);
   });
 
+  test('AppLifecycleState enums match', () {
+    // Dart values: _kFooBarIndex = 1 << N.
+    final List<String> uiFields = getDartClassFields(
+      sourcePath: path.join(flutterRoot, 'lib', 'ui', 'platform_dispatcher.dart'),
+      className: 'AppLifecycleState',
+    );
+    final List<String> webuiFields = getDartClassFields(
+      sourcePath: path.join(flutterRoot, 'lib', 'web_ui', 'lib', 'platform_dispatcher.dart'),
+      className: 'AppLifecycleState',
+    );
+    // C++ values: kFooBar = 1 << N.
+    final List<String> internalEnumValues = getCppEnumClassValues(
+      sourcePath: path.join(flutterRoot, 'shell', 'platform', 'common', 'app_lifecycle_state.h'),
+      enumName: 'AppLifecycleState',
+    );
+    // Java values: FOO_BAR(1 << N).
+    final List<String> javaEnumValues = getJavaEnumValues(
+      sourcePath: path.join(flutterRoot, 'shell', 'platform', 'android', 'io',
+          'flutter', 'embedding', 'engine', 'systemchannels', 'LifecycleChannel.java'),
+      enumName: 'AppLifecycleState',
+    ).map(allCapsToCamelCase).toList();
+
+    expect(webuiFields, uiFields);
+    expect(internalEnumValues, uiFields);
+    expect(javaEnumValues, uiFields);
+  });
+
   test('SemanticsFlag enums match', () {
     // Dart values: _kFooBarIndex = 1 << N.
     final List<String> uiFields = getDartClassFields(
@@ -192,7 +214,7 @@ class NativeFunctionVisitor extends RecursiveAstVisitor<void> {
         type = (parameter.parameter as SimpleFormalParameter).type;
       }
       if (type! is NamedType) {
-        final String name = (type as NamedType).name.name;
+        final String name = (type as NamedType).name2.lexeme;
         if (type.question != null && simpleTypes.contains(name)) {
           errors.add(description);
           return;
diff --git a/tools/build_bucket_golden_scraper/README.md b/tools/build_bucket_golden_scraper/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..687b357f4f7e736d7bdd2a2bdad8a8d2856ac087
--- /dev/null
+++ b/tools/build_bucket_golden_scraper/README.md
@@ -0,0 +1,86 @@
+# `build_bucket_golden_scraper`
+
+Given logging on Flutter's CI, scrapes the log for golden file changes.
+
+```shell
+$ dart bin/main.dart <path to log file, which can be http or a file>
+
+Wrote 3 golden file changes:
+  testing/resources/performance_overlay_gold_60fps.png
+  testing/resources/performance_overlay_gold_90fps.png
+  testing/resources/performance_overlay_gold_120fps.png
+```
+
+It can also be run with `--dry-run` to just print what it _would_ do:
+
+```shell
+$ dart bin/main.dart --dry-run <path to log file, which can be http or a file>
+
+Found 3 golden file changes:
+  testing/resources/performance_overlay_gold_60fps.png
+  testing/resources/performance_overlay_gold_90fps.png
+  testing/resources/performance_overlay_gold_120fps.png
+
+Run again without --dry-run to apply these changes.
+```
+
+You're recommended to still use `git diff` to verify the changes look good.
+
+## Upgrading `git diff`
+
+By default, `git diff` is not very helpful for binary files. You can install
+[`imagemagick`](https://imagemagick.org/) and configure your local git client
+to make `git diff` show a PNG diff:
+
+```shell
+# On MacOS.
+$ brew install imagemagick
+
+# Create a comparison script.
+$ cat > ~/bin/git-imgdiff <<EOF
+#!/bin/sh
+echo "Comparing $2 and $5"
+
+# Find a temporary directory to store the diff.
+if [ -z "$TMPDIR" ]; then
+  TMPDIR=/tmp
+fi
+
+compare \
+  "$2" "$5" \
+  /tmp/git-imgdiff-diff.png
+
+# Display the diff.
+open /tmp/git-imgdiff-diff.png
+EOF
+
+# Setup git.
+git config --global core.attributesfile '~/.gitattributes'
+
+# Add the following to ~/.gitattributes.
+cat >> ~/.gitattributes <<EOF
+*.png diff=imgdiff
+*.jpg diff=imgdiff
+*.gif diff=imgdiff
+EOF
+
+git config --global diff.imgdiff.command '~/bin/git-imgdiff'
+```
+
+## Motivation
+
+Due to <https://github.com/flutter/flutter/issues/53784>, on non-Linux OSes
+there is no way to get golden-file changes locally for a variety of engine
+tests.
+
+This tool, given log output from a Flutter CI run, will scrape the log for:
+
+```txt
+Golden file mismatch. Please check the difference between /b/s/w/ir/cache/builder/src/flutter/testing/resources/performance_overlay_gold_90fps.png and /b/s/w/ir/cache/builder/src/flutter/testing/resources/performance_overlay_gold_90fps_new.png, and  replace the former with the latter if the difference looks good.
+S
+See also the base64 encoded /b/s/w/ir/cache/builder/src/flutter/testing/resources/performance_overlay_gold_90fps_new.png:
+iVBORw0KGgoAAAANSUhEUgAAA+gAAAPoCAYAAABNo9TkAAAABHNCSVQICAgIfAhkiAAAIABJREFUeJzs3elzFWeeJ/rnHB3tSEILktgEBrPvYBbbUF4K24X3t (...omitted)
+```
+
+And convert the base64 encoded image into a PNG file, and overwrite the old
+golden file with the new one.
diff --git a/tools/build_bucket_golden_scraper/bin/main.dart b/tools/build_bucket_golden_scraper/bin/main.dart
new file mode 100644
index 0000000000000000000000000000000000000000..94ffbd65fd9458c1793e7627f040bf010836a4b9
--- /dev/null
+++ b/tools/build_bucket_golden_scraper/bin/main.dart
@@ -0,0 +1,20 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io' as io;
+
+import 'package:build_bucket_golden_scraper/build_bucket_golden_scraper.dart';
+
+void main(List<String> arguments) async {
+  final int result;
+  try {
+    result = await BuildBucketGoldenScraper.fromCommandLine(arguments).run();
+  } on FormatException catch (e) {
+    io.stderr.writeln(e.message);
+    io.exit(1);
+  }
+  if (result != 0) {
+    io.exit(result);
+  }
+}
diff --git a/tools/build_bucket_golden_scraper/lib/build_bucket_golden_scraper.dart b/tools/build_bucket_golden_scraper/lib/build_bucket_golden_scraper.dart
new file mode 100644
index 0000000000000000000000000000000000000000..a0f661f02346593b9c1c71e577ca95582143f822
--- /dev/null
+++ b/tools/build_bucket_golden_scraper/lib/build_bucket_golden_scraper.dart
@@ -0,0 +1,205 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:convert';
+import 'dart:io' as io;
+
+import 'package:args/args.dart';
+import 'package:engine_repo_tools/engine_repo_tools.dart';
+import 'package:meta/meta.dart';
+import 'package:path/path.dart' as p;
+
+/// "Downloads" (i.e. decodes base64 encoded strings) goldens from buildbucket.
+///
+/// See ../README.md for motivation and usage.
+final class BuildBucketGoldenScraper {
+  /// Creates a scraper with the given configuration.
+  BuildBucketGoldenScraper({
+    required this.pathOrUrl,
+    this.dryRun = false,
+    String? engineSrcPath,
+    StringSink? outSink,
+  }) :
+      engine = engineSrcPath != null ?
+          Engine.fromSrcPath(engineSrcPath) :
+          Engine.findWithin(p.dirname(p.fromUri(io.Platform.script))),
+      _outSink = outSink ?? io.stdout;
+
+  /// Creates a scraper from the command line arguments.
+  ///
+  /// Throws [FormatException] if the arguments are invalid.
+  factory BuildBucketGoldenScraper.fromCommandLine(
+    List<String> args, {
+    StringSink? outSink,
+    StringSink? errSink,
+  }) {
+    outSink ??= io.stdout;
+    errSink ??= io.stderr;
+
+    final ArgResults argResults = _argParser.parse(args);
+    if (argResults['help'] as bool) {
+      _usage(args);
+    }
+    final String? pathOrUrl = argResults.rest.isEmpty ? null : argResults.rest.first;
+    if (pathOrUrl == null) {
+      _usage(args);
+    }
+    return BuildBucketGoldenScraper(
+      pathOrUrl: pathOrUrl,
+      dryRun: argResults['dry-run'] as bool,
+      outSink: outSink,
+      engineSrcPath: argResults['engine-src-path'] as String?,
+    );
+  }
+
+  static Never _usage(List<String> args) {
+    final StringBuffer output = StringBuffer();
+    output.writeln('Usage: build_bucket_golden_scraper [options] <path or URL>');
+    output.writeln();
+    output.writeln(_argParser.usage);
+    throw FormatException(output.toString(), args.join(' '));
+  }
+
+  static final ArgParser _argParser = ArgParser()
+    ..addFlag(
+      'help',
+      abbr: 'h',
+      help: 'Print this help message.',
+      negatable: false,
+    )
+    ..addFlag(
+      'dry-run',
+      help: "If true, don't write any files to disk (other than temporary files).",
+      negatable: false,
+    )
+    ..addOption(
+      'engine-src-path',
+      help: 'The path to the engine source code.',
+      valueHelp: 'path/that/contains/src (defaults to the directory containing this script)',
+    );
+
+  /// A local path or a URL to a buildbucket log file.
+  final String pathOrUrl;
+
+  /// If true, don't write any files to disk (other than temporary files).
+  final bool dryRun;
+
+  /// The path to the engine source code.
+  final Engine engine;
+
+  /// How to print output, typically [io.stdout].
+  final StringSink _outSink;
+
+  /// Runs the scraper.
+  Future<int> run() async {
+    // If the path is a URL, download it and store it in a temporary file.
+    final Uri? maybeUri = Uri.tryParse(pathOrUrl);
+    if (maybeUri == null) {
+      throw FormatException('Invalid path or URL: $pathOrUrl');
+    }
+
+    final String contents;
+    if (maybeUri.hasScheme) {
+      contents = await _downloadFile(maybeUri);
+    } else {
+      final io.File readFile = io.File(pathOrUrl);
+      if (!readFile.existsSync()) {
+        throw FormatException('File does not exist: $pathOrUrl');
+      }
+      contents = readFile.readAsStringSync();
+    }
+
+    // Check that it is a buildbucket log file.
+    if (!contents.contains(_buildBucketMagicString)) {
+      throw FormatException('Not a buildbucket log file: $pathOrUrl');
+    }
+
+    // Check for occurences of a base64 encoded string.
+    //
+    // The format looks something like this:
+    // [LINE N+0]: See also the base64 encoded /b/s/w/ir/cache/builder/src/flutter/testing/resources/performance_overlay_gold_120fps_new.png:
+    // [LINE N+1]: {{BASE_64_ENCODED_IMAGE}}
+    //
+    // We want to extract the file name (relative to the engine root) and then
+    // decode the base64 encoded string (and write it to disk if we are not in
+    // dry-run mode).
+    final List<_Golden> goldens = <_Golden>[];
+    final List<String> lines = contents.split('\n');
+    for (int i = 0; i < lines.length; i++) {
+      final String line = lines[i];
+      if (line.startsWith(_base64MagicString)) {
+        final String relativePath = line.split(_buildBucketMagicString).last.split(':').first;
+
+        // Remove the _new suffix from the file name.
+        final String pathWithouNew = relativePath.replaceAll('_new', '');
+
+        final String base64EncodedString = lines[i + 1];
+        final List<int> bytes = base64Decode(base64EncodedString);
+        final io.File outFile = io.File(p.join(engine.srcDir.path, pathWithouNew));
+        goldens.add(_Golden(outFile, bytes));
+      }
+    }
+
+    if (goldens.isEmpty) {
+      _outSink.writeln('No goldens found.');
+      return 0;
+    }
+
+    // Sort and de-duplicate the goldens.
+    goldens.sort();
+    final Set<_Golden> uniqueGoldens = goldens.toSet();
+
+    // Write the goldens to disk (or pretend to in dry-run mode).
+    _outSink.writeln('${dryRun ? 'Found' : 'Wrote'} ${uniqueGoldens.length} golden file changes:');
+    for (final _Golden golden in uniqueGoldens) {
+      final String truncatedPathAfterFlutterDir = golden.outFile.path.split('flutter${p.separator}').last;
+      _outSink.writeln('  $truncatedPathAfterFlutterDir');
+      if (!dryRun) {
+        await golden.outFile.writeAsBytes(golden.bytes);
+      }
+    }
+    if (dryRun) {
+      _outSink.writeln('Run again without --dry-run to apply these changes.');
+    }
+
+    return 0;
+  }
+
+  static const String _buildBucketMagicString = '/b/s/w/ir/cache/builder/src/';
+  static const String _base64MagicString = 'See also the base64 encoded $_buildBucketMagicString';
+
+  static Future<String> _downloadFile(Uri uri) async {
+    final io.HttpClient client = io.HttpClient();
+    final io.HttpClientRequest request = await client.getUrl(uri);
+    final io.HttpClientResponse response = await request.close();
+    final StringBuffer contents = StringBuffer();
+    await response.transform(utf8.decoder).forEach(contents.write);
+    client.close();
+    return contents.toString();
+  }
+}
+
+@immutable
+final class _Golden implements Comparable<_Golden> {
+  const _Golden(this.outFile, this.bytes);
+
+  /// Where to write the golden file.
+  final io.File outFile;
+
+  /// The bytes of the golden file to write.
+  final List<int> bytes;
+
+  @override
+  int get hashCode => outFile.path.hashCode;
+
+  @override
+  bool operator ==(Object other) {
+    return other is _Golden && other.outFile.path == outFile.path;
+  }
+
+  @override
+  int compareTo(_Golden other) {
+    return outFile.path.compareTo(other.outFile.path);
+  }
+}
diff --git a/tools/build_bucket_golden_scraper/pubspec.yaml b/tools/build_bucket_golden_scraper/pubspec.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..f9855c0958e4a1b0e09e47aa90aa0a8370aec25d
--- /dev/null
+++ b/tools/build_bucket_golden_scraper/pubspec.yaml
@@ -0,0 +1,47 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+name: build_bucket_golden_scraper
+publish_to: none
+environment:
+  sdk: '>=3.2.0-0 <4.0.0'
+
+# Do not add any dependencies that require more than what is provided in
+# //third_party/pkg, //third_party/dart/pkg, or
+# //third_party/dart/third_party/pkg. In particular, package:test is not usable
+# here.
+
+# If you do add packages here, make sure you can run `pub get --offline`, and
+# check the .packages and .package_config to make sure all the paths are
+# relative to this directory into //third_party/dart
+
+dependencies:
+  args: any
+  engine_repo_tools: any
+  meta: any
+  path: any
+
+dev_dependencies:
+  async_helper: any
+  expect: any
+  litetest: any
+  smith: any
+
+dependency_overrides:
+  async_helper:
+    path: ../../../third_party/dart/pkg/async_helper
+  args:
+    path: ../../../third_party/dart/third_party/pkg/args
+  engine_repo_tools:
+    path: ../pkg/engine_repo_tools
+  expect:
+    path: ../../../third_party/dart/pkg/expect
+  litetest:
+    path: ../../testing/litetest
+  meta:
+    path: ../../../third_party/dart/pkg/meta
+  path:
+    path: ../../../third_party/dart/third_party/pkg/path
+  smith:
+    path: ../../../third_party/dart/pkg/smith
diff --git a/tools/build_bucket_golden_scraper/test/build_bucket_golden_scraper_test.dart b/tools/build_bucket_golden_scraper/test/build_bucket_golden_scraper_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..ff95e266e1363084af015d126f92f452c7611687
--- /dev/null
+++ b/tools/build_bucket_golden_scraper/test/build_bucket_golden_scraper_test.dart
@@ -0,0 +1,74 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io' as io;
+
+import 'package:build_bucket_golden_scraper/build_bucket_golden_scraper.dart';
+import 'package:litetest/litetest.dart';
+import 'package:path/path.dart' as p;
+
+int main(List<String> args) {
+  test('parses command-line arguments', () {
+    // Create a fake engine directory.
+    final io.Directory buildRoot = io.Directory.systemTemp.createTempSync('build_bucket_golden_scraper_test_engine');
+    final io.Directory srcDir = io.Directory(p.join(buildRoot.path, 'src'))..createSync();
+    io.Directory(p.join(srcDir.path, 'flutter')).createSync();
+
+    // Does not run, but just parses.
+    try {
+      final BuildBucketGoldenScraper scraper = BuildBucketGoldenScraper.fromCommandLine(<String>[
+        '--dry-run',
+        '--engine-src-path',
+        srcDir.path,
+        'https://ci.chromium.org/raw/buildbucket/v1/builders/flutter/flutter-linux/builder:linux_bare',
+      ]);
+
+      expect(scraper.dryRun, isTrue);
+      expect(scraper.engine.srcDir.path, srcDir.path);
+      expect(scraper.pathOrUrl, 'https://ci.chromium.org/raw/buildbucket/v1/builders/flutter/flutter-linux/builder:linux_bare');
+    } finally {
+      buildRoot.deleteSync(recursive: true);
+    }
+  });
+
+  test('finds diffs', () async {
+    // Create a fake engine directory.
+    final io.Directory buildRoot = io.Directory.systemTemp.createTempSync('build_bucket_golden_scraper_test_engine');
+    final io.Directory srcDir = io.Directory(p.join(buildRoot.path, 'src'))..createSync();
+    io.Directory(p.join(srcDir.path, 'flutter', 'docs')).createSync(recursive: true);
+
+    // Create an empty logo in docs/flutter_logo.png.
+    final io.File logo = io.File(p.join(srcDir.path, 'flutter', 'docs', 'flutter_logo.png'))..createSync();
+
+    // Create a fake log file.
+    try {
+      final io.File logFile = io.File(p.join(buildRoot.path, 'log.txt'))..createSync();
+      logFile.writeAsStringSync('''
+See also the base64 encoded /b/s/w/ir/cache/builder/src/flutter/docs/flutter_logo_new.png:
+iVBORw0KGgoAAAANSUhEUgAAADcAAAA3CAYAAACo29JGAAAAAXNSR0IArs4c6QAAAAlwSFlzAAALEwAACxMBAJqcGAAAA6hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuNC4wIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIgogICAgICAgICAgICB4bWxuczp0aWZmPSJodHRwOi8vbnMuYWRvYmUuY29tL3RpZmYvMS4wLyIKICAgICAgICAgICAgeG1sbnM6ZXhpZj0iaHR0cDovL25zLmFkb2JlLmNvbS9leGlmLzEuMC8iPgogICAgICAgICA8eG1wOk1vZGlmeURhdGU+MjAxOS0wOC0yN1QyMDowODo0NzwveG1wOk1vZGlmeURhdGU+CiAgICAgICAgIDx4bXA6Q3JlYXRvclRvb2w+UGl4ZWxtYXRvciAzLjguNTwveG1wOkNyZWF0b3JUb29sPgogICAgICAgICA8dGlmZjpPcmllbnRhdGlvbj4xPC90aWZmOk9yaWVudGF0aW9uPgogICAgICAgICA8dGlmZjpDb21wcmVzc2lvbj4wPC90aWZmOkNvbXByZXNzaW9uPgogICAgICAgICA8dGlmZjpSZXNvbHV0aW9uVW5pdD4yPC90aWZmOlJlc29sdXRpb25Vbml0PgogICAgICAgICA8dGlmZjpZUmVzb2x1dGlvbj43MjwvdGlmZjpZUmVzb2x1dGlvbj4KICAgICAgICAgPHRpZmY6WFJlc29sdXRpb24+NzI8L3RpZmY6WFJlc29sdXRpb24+CiAgICAgICAgIDxleGlmOlBpeGVsWERpbWVuc2lvbj41NTwvZXhpZjpQaXhlbFhEaW1lbnNpb24+CiAgICAgICAgIDxleGlmOkNvbG9yU3BhY2U+MTwvZXhpZjpDb2xvclNwYWNlPgogICAgICAgICA8ZXhpZjpQaXhlbFlEaW1lbnNpb24+NTU8L2V4aWY6UGl4ZWxZRGltZW5zaW9uPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KKG12ggAADJJJREFUaAXtmntwVNUZwM+5793NJpuEoHVgtFaYUaqUkrGAKMEXhTqV1m4sPiBBCTN1cKZW+087denYdupYOxW1SJ0RCKBkAQUsEV9EUNBCrNgBHeVRLCCSQF6793Xuuaffd5MbNpCYQBLiH5whe8/evffc73e+x/nOdyHkQrswAxdm4MIMDNAM0AEap3/DpISUepSQFKV+5S77Yd8jfxSEMPjzYWCQkUKXEPhAeYWgcPQFnvNlXc9njvvbFyfqf8BrctuQw6WEkPaA0GlKecUH9gI1X3uCmb7me74ABAQDeQO2jk8KdNh8YhTplLWyJ5eXar/KhQr7StgZimMKNNYJVu/OUyPK4yzjaZxxTiUqgW7wX8AINIRIAMZBmzLheoGuua18UXUPYMgjDQUUPhPB6qYQCTU2d6c7G8D+ykxu+B73qCzJcAmqjILy2o8SkPlESBLxAzCLPV/953W/DMYC7ePx9DY0mkOvgYmto9SrrHfulHT5aW77MeFxF8A0ARZ5qkGfSgTO+YDraQnQmMmWf7L441+QdDlPbREK+Kp36vpTvW6JT/08CD0Aq6ongUAVu5yZsq4u9hmJew5zwRQ1CBRdHwqKE74vgI/pAMay7urGdw9V1S8pZcmaPVpqavdgOAjO4HltVbuEuqSUsrk7velKRKoGIyxmlm2DxozAw3LYsAt/QhLE1Qp1nWXcVz7bevyuHQ+NtBZsEvqiGdT5OuHPq+ZCsMp6dqNkSMt9Tos9y+kE6xQUiQIsQTrBsl7tl3s/vQfBKrYcNHoDw7HOm8+hCYHG3Pt2sOskRX4RrHMYM20HNRZEwk6ysAPmSIRrJHTdyXpvf/F+U3ndA2OzFVuEsXQqtcOrvu54XuA6NObO/SBbSg1lDcTo4SxjQfCQ9S5ggR3CBwZIMEU9YWiOybZb+5tvr3tgeAY11lcwhB50nwtNsWJ75molEntNUsklbsZmAKAiS24Lcg44AcBMLzBUZrIPm3a3lG24r6QtuUdo6THUzb2+t/6gwoUCzftIjPa5eFPR6Ugn6zAQSkXBusDBl+A7gGn5hupk3b0nj1uT/3lboimcoN5gTv990OBCsLnbmi8net5baky+zG5zPEoFuAL605kN1jJXzTc0Zrr75AZ30gsz4g3jIbrWQ3Q98+rezwxKtAzBKv9ljhRa9DU1T77MyTgMkHoEg+zDUfMMjZvuIdLKyxCsDBbocwVD9AGHm77pcx19o2pX9ltEyJv0fHWUm2EOOJKKgaJbjQliK3m67lnuEde2blx+U/QImmLd1yzQvettgOEQrHbGKKdyqyhhXNmgF2jfdVpdW/hc7wkMaG01phue7R3zbPfWVdcnDqRqBC4b52SKudAD5nOhKd73WkuRn9DX64X6ZLuFmcTnUYzJmNt30ywlqkc8mzVyy5y24obEh2ezjnUzXpdT3T6xyxV9+BKCzX23Ie6r8ZeNQv0mu9nNQk4Yoz2YIgxrKREAc70mnrVuWzElf3tyu4ikJ1ErKYTcUFfXR9nKSEkDEelyyk8XtY8DnH7bqe9hmMYZJ1FnLYDNcFpYxuc8L1iMT12a27NlQze464E32j9eNTm+BcaJgimaGETqygiHe9u3crl35faDBAbMoXs3Dq7sNxyOkkptUQ5On5SOFGkzneYOMNh4QToPv3Z9BCzQrqIbsNP2HM6c26sn5W0OwMYTa8E+oi0aRZ1kzf4CNVosmQyW9UQgZ9ePZkKiaitletx3TO7HL4oVrJwQPdz1ogHKLQ9Mm7AyUqzNtJtY1kdT7AEMHI9Jqq55Lkjt2snq6/M3V20EjY2n1r2vH4sumnZx9q5tmXuN4uj9vkt9WOnbXTUnxAbdIpy3BD7GikpiBDedpwDs+QGHm7PTWRUp1MqtJjcLe7FYoKcgj+rQGEqDficE7LBlNdjWMO9nALYRfWzJRGJV1cNxGs3OervtDi1uLKYyjVJcEXOV3gEYHOC8B5ud2HBCzK/IOkk3ak8Hw+8wRD+bENsgJs6SJFnxuQe+AhUOmHACm+0OeXCzyWVFkSRVISybmVU9Ob5u+udCT19B7OQOYiyZRM17tmZ/pBQYL8BNUafRdgTUUALJOgfBUpiguCkHa7e1hBFv+4JXN31wcF7tg6O63df1exFfdq3xdydrzlMisk4VhQMI7KVRgg6pQBRJlqlsKJJr2nOqr4u/hEGo9grioo9hdJxVl7kFwKoBLO6ZYLMyhXUxyD8xBw3+YK5U2Kkrvk98o8SIc0esZa2tCxAMg1B3Kuo3XLKmRl4xMfa81WwtUKOyRmWVC+5zEvgdRD2o9SgxVXItu2rFpMhyFOSSVwlPpomKwWPOe9YNRsJYBUZYGIBJNEiqA7WH84PmiZYNuWek2NC9rHg1e/Lo/PQtRS24bPSUyfQbbszepECBV0yKPg2Av9byFBU0iGUP1wcjUuOqBFuXBdXXRv4RCPIO8YOqVzl1r9zQMqFRVV+SJGmYB7sFMMUzwDDYAiMaAjOKIam2xestXzTc//LNI07gc7F61p3W8Fyuy/Z0Ta/nU1Baq6uDahbkgve+b/0OgsJCN+MKNaZRqGo9sqxUfiJZI+T0XpDzUXgmCPT9V5vHy/G8l6GkNXK4cNySiKxhHRZJgkCCWgPpYDEREKi4XmgonIl37MaTd6dvGnYkBWCpXnLPfmsOyVNQBi8rIz76UvWEyO/dNvtP0WKN+o73mwAMTGcMgl3VAbY+c40cj6bBh0b6Wdv90qFag82J0iFNuDy2g0EBNgFgntjRdrSlAsHwOb2BoVwDAhcCNh3AicaZZ3/JNmZvzTrmYvw+BmY/BQVYAinSuFdOXCUX6jVUVr7N2ixXUiVNApqjpiCNtg+AqLocjSV0CCJiV8uJttmvTC/8L4L1NakeELNEgLBhJTmFX1LUR3OFfruBgXbHrmsdrRVH1lBVuZq1mA5EUaihBIVKiu81MMCOiFJSrEORkvtQWY5IcH63czI7a/WU+CfhrgOH70sbcDh8aPAO4CqipMsJIynQA4COW9t0qTI8vgYW8lLWnHUh6EBlGWJBR2KNJtT+4oaSEYbwS4qiEhPeZ1aDk1x7c97HuC7WQnTtC1R4zaDAhYMHWnyUiB/UnozzWOIdyJe+52VMLOfpEE4DsECvcANmyTIsH4x5Qo1E6cWK0zDumsjExxJ0/3QowNb2UoANn5l7HDCfyx007Kegk1pIqOOA1JI4gL4Ef+BVYIBhbhVMLyz7kHrA9oeohkHcTIZsW/um/Fj545fjWLU1S89JCYMKF/gdCPfRTwqb3ff3zPY9sUYtiqqECzcARcnR0QCMM0bgRSJhpkkPv/GWb311vCgy8rK1evniGWRppU2ST0bw8rNpgwuHkmBggSDz8SNjs/bxtvm+yTcoRVGdcB/8B9IO0KDPPCIBGHdscnjz2yRz5EtJ0WROuBen0fylenLxLST9kEUqXjDOBu6c1H02DwivDRZxWAquWXdsuDZs2DKqyT90T5pYONIlTQVARo5seoNkDv2PyLEo8UEySCM9qkchb5SOevaJu72XFtSRipRBlqb6VE4/b3AIGQKOW99wCU0UVlNFvtE3XUdwrh/buJm0fn6QyAV5hIM9cXjXiG9SoTGhRGCrRA7JZvNd1poHtsNAGryb67X6PPhmieJ1NKxzIOC/by856hxqrRSCvytFNP34+tfdtn0HCSnKJ0wF/5NBrCDxxmwZ8k1mQfmdXAoRd5l6x+LSAKzqufY8NBy8m+N51Vzn87dsUcjUqd7498R3jtRuXdW879C1QnYhyOBmFgwSF/TOiNN+Fyz2DCrXuNn9hNiNs9jqB3eTMhinbmq3b1XxrvOquU44ACPP7VLrr6P7j+3eOUdElI+ongdvVT0P0/8zwPBG2GAIB7JxQq4U2rBl2p3PXBmAlaW63cvhLUMDh0+eX8rGoO9sfPhTkTkxGxZ1eI8TQ815QAcM+IGomK7CHrw9m9aIk7HBF8f6Wv5yknzmClKX8sAH8T8InNGGxixzxZj+lE5qH3TUmX8bTwtKYNNKRgvXBBMNV3lcCoG1o0EP1g7fJlpeHkzEVi6su8nKeYfD33OPQw+H0pTB+lVXaUd++tQEHh+2Uija5bCqB3LmcKEy8R80EJvbRMSgDJY9sdd33Z+T9Pz/BD/lfHwz4FAgXKAhE1GSz06hmjEfakocVnhkgW0fJtU5UqPBouQ+VFJk4yLBvfVk9f1nlPZy7xj6PvrgubQeloVvjuZCKAzvoz87O7mWzO/2jdDZDRIKMNhH/B9GCxeenWypVFAFGGzRLox/YQb6OQP/B/nlPRSmL0CtAAAAAElFTkSuQmCC
+''');
+
+      // Tell the runner to extract diffs.
+      final StringBuffer outSink = StringBuffer();
+      final BuildBucketGoldenScraper scraper = BuildBucketGoldenScraper(
+        pathOrUrl: logFile.path,
+        engineSrcPath: srcDir.path,
+        outSink: outSink,
+      );
+
+      // Run.
+      final int result = await scraper.run();
+      expect(result, 0);
+
+      // Check the output.
+      expect(outSink.toString(), contains('Wrote 1 golden file changes:'));
+      expect(outSink.toString(), contains('docs/flutter_logo.png'));
+      expect(logo.readAsBytesSync().length, 4257);
+    } finally {
+      buildRoot.deleteSync(recursive: true);
+    }
+  });
+
+  return 0;
+}
diff --git a/tools/cipd/android_embedding_bundle/.gitignore b/tools/cipd/android_embedding_bundle/.gitignore
index 690c5aed9ff0bcbf7c6b62beb4879896acaf13ad..dd74c636a5b938438936cf5468895c9639e349f3 100644
--- a/tools/cipd/android_embedding_bundle/.gitignore
+++ b/tools/cipd/android_embedding_bundle/.gitignore
@@ -1,3 +1,4 @@
 # Don't include the jars in the engine repo.
+build/
 lib/
 .gradle
diff --git a/tools/cipd/android_embedding_bundle/README.md b/tools/cipd/android_embedding_bundle/README.md
index af42e02acd8f0cdf442baa5a976a0542af838c51..603a72b1a39208c071ba71bb36f4b814cbd04323 100644
--- a/tools/cipd/android_embedding_bundle/README.md
+++ b/tools/cipd/android_embedding_bundle/README.md
@@ -1,12 +1,36 @@
 # Updating the Embedding Dependencies
 
+The instructions in this README explain how to create a CIPD package that
+contains the build-time dependencies of the Android embedding of the Engine,
+and the dependencies of the in-tree testing framework. The Android embedder is
+shipped to Flutter end-users, but these build-time dependencies are not.
+Therefore, the license script can skip over the destination of the CIPD package
+in an Engine checkout at `src/third_party/android_embedding_dependencies`.
+Even so, the CIPD package should contain a LICENSE file, and the instructions
+below explain how to fetch the license information for the dependencies.
+
 ## Requirements
 
-1. Gradle. If you don't have Gradle installed, you can get it on [https://gradle.org/install/#manually](https://gradle.org/install/#manually).
-2. [Depot tools](http://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/depot_tools_tutorial.html#_setting_up).
+1. If you have a flutter/engine checkout, then you should already have
+[Depot tools](http://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/depot_tools_tutorial.html#_setting_up) on your path.
+1. You should have a copy of `gradle` in a flutter/engine checkout under
+   `src/third_party/gradle/bin/gradle`.
 
 ## Steps
 
-1. Update tools/androidx/files.json. (This file includes the Maven dependencies used to build Flutter apps).
-2. `cd` into this directory.
-3. Run `./generate.sh`.
+1. Update `src/flutter/tools/androidx/files.json`. (This file includes the Maven
+   dependencies used to build Flutter apps).
+1. `cd` into this directory: `src/flutter/tools/cipd/android_embedding_bundle`.
+1. Run `gradle downloadLicenses`
+1. Run `gradle updateDependencies`
+1. Examine the file `./build/reports/license/license-dependency.xml`. If it
+   contains licenses other than "The Apache License, Version 2.0" or something
+   very similar, STOP. Ask Hixie for adivce on how to proceed.
+1. Copy or move the `lib/` directory to `src/third_party/android_embedding_dependencies/`,
+   overwriting its contents, and ensure the Android build still works.
+1. Run `cipd create --pkg-def cipd.yaml -tag last_updated:"$version_tag"` where
+   `$version_tag` is the output of `date +%Y-%m-%dT%T%z`.
+1. Update the `DEPS` file entry for `android_embedding_dependencies` with the
+   new tag: `last_updated:"$version_tag"`.
+1. Update the GN list `embedding_dependencies_jars` in
+   `src/flutter/shell/platform/android/BUILD.gn`.
diff --git a/tools/cipd/android_embedding_bundle/build.gradle b/tools/cipd/android_embedding_bundle/build.gradle
index 93c76e84fd384fe5ffba884a990f873723d34657..9b93d0a0afbdf566eae59f517d987578fdbb9030 100644
--- a/tools/cipd/android_embedding_bundle/build.gradle
+++ b/tools/cipd/android_embedding_bundle/build.gradle
@@ -7,8 +7,6 @@
 //
 // This script downloads the embedding dependencies into a lib/ directory,
 // extract jar files from AARs, so they can be used in gn.
-def destinationDir = "lib"
-
 buildscript {
     repositories {
         google()
@@ -19,6 +17,12 @@ buildscript {
     }
 }
 
+plugins {
+    id "com.github.hierynomus.license-report" version "0.16.1"
+}
+
+def destinationDir = "lib"
+
 allprojects {
     repositories {
         google()
@@ -29,16 +33,21 @@ allprojects {
 apply plugin: "com.android.application"
 
 android {
-  compileSdkVersion 33
+  compileSdkVersion 34
 }
 
 configurations {
   embedding
 }
 
+println project.buildDir
+
 // Configure the embedding dependencies.
-apply from: new File(rootDir, '../tools/androidx/configure.gradle').absolutePath;
-configureDependencies(new File(rootDir, '../..')) { dependency ->
+// NB: '../../androidx/configure.gradle' is expected to resolve to the path
+// 'src/flutter/tools/androidx', and '../../..' is expected to resolve to the
+// path 'src/flutter'.
+apply from: new File(rootDir, '../../androidx/configure.gradle').absolutePath;
+configureEmbedderDependencies(new File(rootDir, '../../..')) { dependency ->
   dependencies {
      embedding "$dependency"
   }
@@ -76,3 +85,22 @@ task updateDependencies() {
       }
   }
 }
+
+downloadLicenses {
+  ext.apacheTwo = license(
+    'The Apache License, Version 2.0',
+    'http://www.apache.org/licenses/LICENSE-2.0.txt',
+  )
+  aliases = [
+    (apacheTwo) : [
+      'The Apache Software License, Version 2.0',
+      'Apache 2',
+      'Apache License Version 2.0',
+      'Apache License, Version 2.0',
+      'Apache License 2.0',
+      license('Apache License', 'http://www.apache.org/licenses/LICENSE-2.0'),
+      license('Apache License, Version 2.0', 'http://opensource.org/licenses/Apache-2.0'),
+    ],
+  ]
+  dependencyConfiguration = 'embedding'
+}
diff --git a/tools/cipd/malioc/.gitignore b/tools/cipd/malioc/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..5a658f14ebc7c157d1dab2bd823b169d487f7483
--- /dev/null
+++ b/tools/cipd/malioc/.gitignore
@@ -0,0 +1,2 @@
+# Don't accidentally check in the Arm Tools.
+arm-tools/
diff --git a/tools/cipd/malioc/README.md b/tools/cipd/malioc/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..bfa6bfb748a4f346f82535a5f41aae065ff707de
--- /dev/null
+++ b/tools/cipd/malioc/README.md
@@ -0,0 +1,22 @@
+# Updating malioc
+
+Flutter uses `malioc` from the Arm Mobile Studio to statically analyze
+Impeller's shaders. See `impeller/tools/malioc_diff.py` for more information
+about that.
+
+The files in this directory are instructions for updating the `flutter_internal`
+CIPD package that CI uses to obtain `malioc`.
+
+## Steps
+
+1. Download the Arm Mobile Studio from [Arm](https://developer.arm.com/Tools%20and%20Software/Arm%20Mobile%20Studio)
+2. Extract the `.zip` archive into a directory called `arm-tools` sibling to
+   this file.
+3. Check that the `arm-tools` directory contains a child directory
+   `mali_offline_compiler`. If it instead contains a child directory which
+   is something like `Arm_Mobile_Studio_2022.4`, then copy the contents of that
+   directory to `arm-tools` instead.
+4. Run the `generate.sh` script in this directory.
+5. Verify that the file appears [here](https://chrome-infra-packages.appspot.com/p/flutter_internal/tools).
+6. Update `.ci.yaml` to refer to the new version tag echoed by `generate.sh`.
+7. Delete the `arm-tools` directory
diff --git a/tools/cipd/malioc/cipd.yaml b/tools/cipd/malioc/cipd.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..47f70db8ef05ae6b12e0e85ae21dbb4d8426aa06
--- /dev/null
+++ b/tools/cipd/malioc/cipd.yaml
@@ -0,0 +1,5 @@
+package: flutter_internal/tools/arm-tools
+description: Tools for analyzing shaders
+install_mode: copy
+data:
+  - dir: arm-tools
diff --git a/tools/cipd/android_embedding_bundle/generate.sh b/tools/cipd/malioc/generate.sh
similarity index 39%
rename from tools/cipd/android_embedding_bundle/generate.sh
rename to tools/cipd/malioc/generate.sh
index bf2019071966b474f44d9b8b8064b79d78dff690..a9d63f4183264143fef980cb4b52b9fb3a66fa21 100755
--- a/tools/cipd/android_embedding_bundle/generate.sh
+++ b/tools/cipd/malioc/generate.sh
@@ -6,24 +6,6 @@
 
 set -e
 
-gradle updateDependencies
-
 version_tag=`date +%Y-%m-%dT%T%z`
 
 cipd create --pkg-def cipd.yaml -tag last_updated:"$version_tag"
-
-echo ""
-echo "Update the dependency in the DEPS file:"
-echo ""
-echo "'src/third_party/android_embedding_dependencies': {"
-echo "  'packages': ["
-echo "    {"
-echo "      'package': 'flutter/android/embedding_bundle',"
-echo "      'version': 'last_updated:$version_tag'"
-echo "    }"
-echo "  ],"
-echo "  'condition': 'download_android_deps',"
-echo "  'dep_type': 'cipd',"
-echo "}"
-echo ""
-echo "Run gclient sync"
diff --git a/tools/clang_tidy/README.md b/tools/clang_tidy/README.md
index 460ecbbfb79599cc4239f6e1f54504cae701b204..2d82b4b1056587256818e266347e0640baea88ff 100644
--- a/tools/clang_tidy/README.md
+++ b/tools/clang_tidy/README.md
@@ -1,15 +1,103 @@
 # clang_tidy
 
-This is a Dart program/library that runs clang_tidy over modified files in the Flutter engine repo.
+A wrapper library and program that runs `clang_tidy` on the Flutter engine repo.
 
-By default the linter runs on the repo files changed contained in `src/out/host_debug/compile_commands.json` command.
-To check files other than in `host_debug` use `--target-variant android_debug_unopt`,
-`--target-variant ios_debug_sim_unopt`, etc.
+```shell
+# Assuming you are in the `flutter` root of the engine repo.
+dart ./tools/clang_tidy/bin/main.dart
+```
+
+By default, the linter runs over _modified_[^1] files in the _latest_[^2] build
+of the engine.
+
+A subset of checks can also be fixed automatically by passing `--fix`:
+
+```shell
+dart ./tools/clang_tidy/bin/main.dart --fix
+```
+
+To configure what lints are enabled, see [`.clang-tidy`](../../.clang-tidy).
+
+> **💡 TIP**: If you're looking for the git pre-commit hook configuration, see
+> [`githooks`](../githooks).
+
+## Advanced Usage
+
+Some common use cases are described below, or use `--help` to see all options.
+
+### Run with checks added or removed
+
+To run adding a check _not_ specified in `.clang-tidy`:
+
+```shell
+dart ./tools/clang_tidy/bin/main.dart --checks="<check-name-to-run>"
+```
+
+It's possible also to use wildcards to add multiple checks:
+
+```shell
+dart ./tools/clang_tidy/bin/main.dart --checks="readability-*"
+```
+
+To remove a specific check:
+
+```shell
+dart ./tools/clang_tidy/bin/main.dart --checks="-<check-name-to-remove>"
+```
+
+To remove multiple checks:
 
-Alternatively, use `--compile-commands` to specify a path to a `compile_commands.json` file.
+```shell
+dart ./tools/clang_tidy/bin/main.dart --checks="-readability-*"
+```
+
+To remove _all_ checks (usually to add a specific check):
+
+```shell
+dart ./tools/clang_tidy/bin/main.dart --checks="-*,<only-check-to-run>"
+```
+
+### Specify a specific build
+
+There are some rules that are only applicable to certain builds, or to check
+a difference in behavior between two builds.
+
+Use `--target-variant` to specify a build:
+
+```shell
+dart ./tools/clang_tidy/bin/main.dart --target-variant <engine-variant>
+```
+
+For example, to check the `android_debug_unopt` build:
 
+```shell
+dart ./tools/clang_tidy/bin/main.dart --target-variant android_debug_unopt
 ```
-$ bin/main.dart --target-variant <engine-variant>
-$ bin/main.dart --compile-commands <compile_commands.json-path>
-$ bin/main.dart --help
+
+In rarer cases, for example comparing two different checkouts of the engine,
+use `--src-dir=<path/to/engine/src>`.
+
+### Lint entire repository
+
+When adding a new lint rule, or when checking lint rules that impact files that
+have not changed.
+
+Use `--lint-all` to lint all files in the repo:
+
+```shell
+dart ./tools/clang_tidy/bin/main.dart --lint-all
 ```
+
+Or, provide a regular expression to lint files that match:
+
+```shell
+dart ./tools/clang_tidy/bin/main.dart --lint-regex=".*test.*\.cc"
+```
+
+> **⚠️ WARNING**: This may take a long time to run if a pattern is not provided
+> or if the pattern matches a large number of files, i.e. on the order of
+> thousands of files could take 30 minutes or more to run and lock your
+> machine.
+
+[^1]: Modified files are determined by a `git diff` command compared to `HEAD`.
+[^2]: Latest build is the last updated directory in `src/out/`.
diff --git a/tools/clang_tidy/lib/clang_tidy.dart b/tools/clang_tidy/lib/clang_tidy.dart
index 4a49f9b591f960611de003e98dc08e89ab8a1049..e3757b9f40d83d14196dedc04097398a8b4dc8c6 100644
--- a/tools/clang_tidy/lib/clang_tidy.dart
+++ b/tools/clang_tidy/lib/clang_tidy.dart
@@ -5,12 +5,15 @@
 import 'dart:convert' show LineSplitter, jsonDecode;
 import 'dart:io' as io show File, stderr, stdout;
 
+import 'package:engine_repo_tools/engine_repo_tools.dart';
+import 'package:git_repo_tools/git_repo_tools.dart';
 import 'package:meta/meta.dart';
 import 'package:path/path.dart' as path;
+import 'package:process/process.dart';
 import 'package:process_runner/process_runner.dart';
 
 import 'src/command.dart';
-import 'src/git_repo.dart';
+import 'src/lint_target.dart';
 import 'src/options.dart';
 
 const String _linterOutputHeader = '''
@@ -43,61 +46,92 @@ class _SetStatusCommand {
 /// A class that runs clang-tidy on all or only the changed files in a git
 /// repo.
 class ClangTidy {
-  /// Given the path to the build commands for a repo and its root, builds
-  /// an instance of [ClangTidy].
+  /// Builds an instance of [ClangTidy] using a repo's [buildCommandPath].
   ///
-  /// `buildCommandsPath` is the path to the build_commands.json file.
-  /// `repoPath` is the path to the Engine repo.
-  /// `checksArg` are specific checks for clang-tidy to do.
-  /// `lintAll` when true indicates that all files should be linted.
-  /// `outSink` when provided is the destination for normal log messages, which
-  /// will otherwise go to stdout.
-  /// `errSink` when provided is the destination for error messages, which
-  /// will otherwise go to stderr.
+  /// ## Required
+  ///
+  /// - [buildCommandsPath] is the path to the build_commands.json file.
+  ///
+  /// ## Optional
+  ///
+  /// - [checksArg] are specific checks for clang-tidy to do.
+  ///
+  ///   If omitted, checks will be determined by the `.clang-tidy` file in the
+  ///   repo.
+  ///
+  /// - [lintTarget] is what files to lint.
+  ///
+  /// ## Optional (Test Overrides)
+  ///
+  /// _Most usages of this class will not need to override the following, which
+  /// are primarily used for testing (i.e. to avoid real interaction with I/O)._
+  ///
+  /// - [outSink] when provided is the destination for normal log messages.
+  ///
+  ///   If omitted, [io.stdout] will be used.
+  ///
+  /// - [errSink] when provided is the destination for error messages.
+  ///
+  ///   If omitted, [io.stderr] will be used.
+  ///
+  /// - [processManager] when provided is delegated to for running processes.
+  ///
+  ///   If omitted, [LocalProcessManager] will be used.
   ClangTidy({
     required io.File buildCommandsPath,
     String checksArg = '',
-    bool lintAll = false,
-    bool lintHead = false,
+    LintTarget lintTarget = const LintChanged(),
     bool fix = false,
     StringSink? outSink,
     StringSink? errSink,
+    ProcessManager processManager = const LocalProcessManager(),
   }) :
     options = Options(
       buildCommandsPath: buildCommandsPath,
       checksArg: checksArg,
-      lintAll: lintAll,
-      lintHead: lintHead,
+      lintTarget: lintTarget,
       fix: fix,
       errSink: errSink,
     ),
     _outSink = outSink ?? io.stdout,
-    _errSink = errSink ?? io.stderr;
+    _errSink = errSink ?? io.stderr,
+    _processManager = processManager,
+    _engine = null;
 
   /// Builds an instance of [ClangTidy] from a command line.
   ClangTidy.fromCommandLine(
     List<String> args, {
+    Engine? engine,
     StringSink? outSink,
     StringSink? errSink,
+    ProcessManager processManager = const LocalProcessManager(),
   }) :
-    options = Options.fromCommandLine(args, errSink: errSink),
+    options = Options.fromCommandLine(args, errSink: errSink, engine: engine),
     _outSink = outSink ?? io.stdout,
-    _errSink = errSink ?? io.stderr;
+    _errSink = errSink ?? io.stderr,
+    _processManager = processManager,
+    _engine = engine;
 
   /// The [Options] that specify how this [ClangTidy] operates.
   final Options options;
   final StringSink _outSink;
   final StringSink _errSink;
+  final ProcessManager _processManager;
+  final Engine? _engine;
+
+  late final DateTime _startTime;
 
   /// Runs clang-tidy on the repo as specified by the [Options].
   Future<int> run() async {
+    _startTime = DateTime.now();
+
     if (options.help) {
-      options.printUsage();
+      options.printUsage(engine: _engine);
       return 0;
     }
 
     if (options.errorMessage != null) {
-      options.printUsage(message: options.errorMessage);
+      options.printUsage(message: options.errorMessage, engine: _engine);
       return 1;
     }
 
@@ -111,12 +145,23 @@ class ClangTidy {
         _outSink.writeln('Checking for specific checks: ${options.checks}.');
       }
       final int changedFilesCount = filesOfInterest.length;
-      if (options.lintAll) {
-        _outSink.writeln('Checking all $changedFilesCount files the repo dir.');
-      } else {
-        _outSink.writeln(
-          'Dectected $changedFilesCount files that have changed',
-        );
+      switch (options.lintTarget) {
+        case LintAll():
+          _outSink.writeln('Checking all $changedFilesCount files in the repo.');
+        case LintChanged():
+          _outSink.writeln(
+            'Checking $changedFilesCount files that have changed since the '
+            'last commit.',
+          );
+        case LintHead():
+          _outSink.writeln(
+            'Checking $changedFilesCount files that have changed compared to '
+            'HEAD.',
+          );
+        case LintRegex(:final String regex):
+          _outSink.writeln(
+            'Checking $changedFilesCount files that match the regex "$regex".',
+          );
       }
     }
 
@@ -168,25 +213,39 @@ class ClangTidy {
     return computeResult + runResult > 0 ? 1 : 0;
   }
 
-  /// The files with local modifications or all the files if `lintAll` was
-  /// specified.
+  /// The files with local modifications or all/a subset of all files.
+  ///
+  /// See [LintTarget] for more information.
   @visibleForTesting
   Future<List<io.File>> computeFilesOfInterest() async {
-    if (options.lintAll) {
-      return options.repoPath
-        .listSync(recursive: true)
-        .whereType<io.File>()
-        .toList();
-    }
-
-    final GitRepo repo = GitRepo(
-      options.repoPath,
-      verbose: options.verbose,
-    );
-    if (options.lintHead) {
-      return repo.changedFilesAtHead;
+    switch (options.lintTarget) {
+      case LintAll():
+        return options.repoPath
+          .listSync(recursive: true)
+          .whereType<io.File>()
+          .toList();
+      case LintRegex(:final String regex):
+        final RegExp pattern = RegExp(regex);
+        return options.repoPath
+          .listSync(recursive: true)
+          .whereType<io.File>()
+          .where((io.File file) => pattern.hasMatch(file.path))
+          .toList();
+      case LintChanged():
+        final GitRepo repo = GitRepo.fromRoot(
+          options.repoPath,
+          processManager: _processManager,
+          verbose: options.verbose,
+        );
+        return repo.changedFiles;
+      case LintHead():
+        final GitRepo repo = GitRepo.fromRoot(
+          options.repoPath,
+          processManager: _processManager,
+          verbose: options.verbose,
+        );
+        return repo.changedFilesAtHead;
     }
-    return repo.changedFiles;
   }
 
   /// Returns f(n) = value(n * [shardCount] + [id]).
@@ -237,13 +296,13 @@ class ClangTidy {
     final List<Command> totalCommands = <Command>[];
     if (sharedBuildCommandsData.isNotEmpty) {
       final List<Command> buildCommands = <Command>[
-        for (Object? data in buildCommandsData)
+        for (final Object? data in buildCommandsData)
           Command.fromMap((data as Map<String, Object?>?)!)
       ];
       final List<Set<String>> shardFilePaths = <Set<String>>[
-        for (List<Object?> list in sharedBuildCommandsData)
+        for (final List<Object?> list in sharedBuildCommandsData)
           <String>{
-            for (Object? data in list)
+            for (final Object? data in list)
               Command.fromMap((data as Map<String, Object?>?)!).filePath
           }
       ];
@@ -255,7 +314,7 @@ class ClangTidy {
         }
       }
       final List<Command> intersection = <Command>[
-        for (_SetStatusCommand result in intersectionResults)
+        for (final _SetStatusCommand result in intersectionResults)
           if (result.setStatus == _SetStatus.Intersection) result.command
       ];
       // Make sure to sort results so the sharding scheme is guaranteed to work
@@ -266,7 +325,7 @@ class ClangTidy {
           _takeShard(intersection, shardId!, 1 + sharedBuildCommandsData.length));
     } else {
       totalCommands.addAll(<Command>[
-        for (Object? data in buildCommandsData)
+        for (final Object? data in buildCommandsData)
           Command.fromMap((data as Map<String, Object?>?)!)
       ]);
     }
@@ -299,24 +358,19 @@ class ClangTidy {
       switch (action) {
         case LintAction.skipNoLint:
           _outSink.writeln('🔷 ignoring $relativePath (FLUTTER_NOLINT)');
-          break;
         case LintAction.failMalformedNoLint:
           _errSink.writeln('❌ malformed opt-out $relativePath');
           _errSink.writeln(
             '   Required format: // FLUTTER_NOLINT: $issueUrlPrefix/ISSUE_ID',
           );
           sawMalformed = true;
-          break;
         case LintAction.lint:
           _outSink.writeln('🔶 linting $relativePath');
           jobs.add(command.createLintJob(options));
-          break;
         case LintAction.skipThirdParty:
           _outSink.writeln('🔷 ignoring $relativePath (third_party)');
-          break;
         case LintAction.skipMissing:
           _outSink.writeln('🔷 ignoring $relativePath (missing)');
-          break;
       }
     }
     return _ComputeJobsResult(jobs, sawMalformed);
@@ -345,9 +399,30 @@ class ClangTidy {
 
   Future<int> _runJobs(List<WorkerJob> jobs) async {
     int result = 0;
-    final ProcessPool pool = ProcessPool();
+    final Set<String> pendingJobs = <String>{for (final WorkerJob job in jobs) job.name};
+
+    void reporter(int totalJobs, int completed, int inProgress, int pending, int failed) {
+      return _logWithTimestamp(ProcessPool.defaultReportToString(
+        totalJobs, completed, inProgress, pending, failed));
+    }
+
+    final ProcessPool pool = ProcessPool(
+      printReport: reporter,
+      processRunner: ProcessRunner(processManager: _processManager),
+    );
     await for (final WorkerJob job in pool.startWorkers(jobs)) {
+      pendingJobs.remove(job.name);
+      if (pendingJobs.isNotEmpty && pendingJobs.length <= 3) {
+        final List<String> sortedJobs = pendingJobs.toList()..sort();
+        _logWithTimestamp('Still running: $sortedJobs');
+      }
       if (job.result.exitCode == 0) {
+        if (options.enableCheckProfile) {
+          // stderr is lazily evaluated, so force it to be evaluated here.
+          final String stderr = job.result.stderr;
+          _errSink.writeln('Results of --enable-check-profile for ${job.name}:');
+          _errSink.writeln(stderr);
+        }
         continue;
       }
       _errSink.writeln('❌ Failures for ${job.name}:');
@@ -363,4 +438,10 @@ class ClangTidy {
     }
     return result;
   }
+
+  void _logWithTimestamp(String message) {
+    final Duration elapsedTime = DateTime.now().difference(_startTime);
+    final String seconds = (elapsedTime.inSeconds % 60).toString().padLeft(2, '0');
+    _outSink.writeln('[${elapsedTime.inMinutes}:$seconds] $message');
+  }
 }
diff --git a/tools/clang_tidy/lib/src/command.dart b/tools/clang_tidy/lib/src/command.dart
index f2132b266693496fe660ef0aa8445c615007516c..b2e10b54727548eab4cec896b5e8daa57fc7f591 100644
--- a/tools/clang_tidy/lib/src/command.dart
+++ b/tools/clang_tidy/lib/src/command.dart
@@ -55,8 +55,11 @@ class Command {
   /// The file on which the command operates.
   late final String filePath;
 
-  static final RegExp _pathRegex = RegExp(r'\S*clang/bin/clang');
-  static final RegExp _argRegex = RegExp(r'-MF \S*');
+  static final RegExp _pathRegex = RegExp(r'\S*clang/bin/clang(\+\+)?');
+  static final RegExp _argRegex = RegExp(r'-MF\s+\S+\s+');
+
+  // Filter out any extra commands that were appended to the compile command.
+  static final RegExp _extraCommandRegex = RegExp(r'&&.*$');
 
   String? _tidyArgs;
 
@@ -64,8 +67,14 @@ class Command {
   String get tidyArgs {
     return _tidyArgs ??= (() {
       String result = command;
+      result = result.replaceAll(r'\s+', ' ');
+      // Remove everything that comes before the compiler command.
+      result = result.split(' ')
+                     .skipWhile((String s) => !_pathRegex.hasMatch(s))
+                     .join(' ');
       result = result.replaceAll(_pathRegex, '');
       result = result.replaceAll(_argRegex, '');
+      result = result.replaceAll(_extraCommandRegex, '');
       return result;
     })();
   }
@@ -77,7 +86,7 @@ class Command {
     return _tidyPath ??= _pathRegex.stringMatch(command)?.replaceAll(
       'clang/bin/clang',
       'clang/bin/clang-tidy',
-    ) ?? '';
+    ).replaceAll('clang-tidy++', 'clang-tidy') ?? '';
   }
 
   /// Whether this command operates on any of the files in `queries`.
@@ -141,11 +150,14 @@ class Command {
         '--fix',
         '--format-style=file',
       ],
+      if (options.enableCheckProfile)
+        '--enable-check-profile',
       '--',
     ];
     args.addAll(tidyArgs.split(' '));
+    final String clangTidyPath = options.clangTidyPath?.path ?? tidyPath;
     return WorkerJob(
-      <String>[tidyPath, ...args],
+      <String>[clangTidyPath, ...args],
       workingDirectory: directory,
       name: 'clang-tidy on $filePath',
       printOutput: options.verbose,
diff --git a/tools/clang_tidy/lib/src/lint_target.dart b/tools/clang_tidy/lib/src/lint_target.dart
new file mode 100644
index 0000000000000000000000000000000000000000..8f45ae9ccce95dec5a5150ffc8e04f9949782862
--- /dev/null
+++ b/tools/clang_tidy/lib/src/lint_target.dart
@@ -0,0 +1,40 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+/// Describes what should be linted by the Clang Tidy tool.
+sealed class LintTarget {
+  /// Creates a new [LintTarget].
+  const LintTarget();
+}
+
+/// Lints all files in the project.
+final class LintAll extends LintTarget {
+  /// Defines a lint target that lints all files in the project.
+  const LintAll();
+}
+
+/// Lint all files that have changed since the last commit.
+///
+/// This considers only the last commit, not all commits in the current branch.
+final class LintChanged extends LintTarget {
+  /// Defines a lint target of files that have changed since the last commit.
+  const LintChanged();
+}
+
+/// Lint all files that have changed compared to HEAD.
+///
+/// This considers _all_ commits in the current branch, not just the last one.
+final class LintHead extends LintTarget {
+  /// Defines a lint target of files that have changed compared to HEAD.
+  const LintHead();
+}
+
+/// Lint all files whose paths match the given regex.
+final class LintRegex extends LintTarget {
+  /// Creates a new [LintRegex] with the given [regex].
+  const LintRegex(this.regex);
+
+  /// The regular expression to match against file paths.
+  final String regex;
+}
diff --git a/tools/clang_tidy/lib/src/options.dart b/tools/clang_tidy/lib/src/options.dart
index 7e17e1f72e54717b38107a275f402c477bbcd101..160210f1ef5cc28ae6e49ca2ba943f16825d062d 100644
--- a/tools/clang_tidy/lib/src/options.dart
+++ b/tools/clang_tidy/lib/src/options.dart
@@ -5,11 +5,12 @@
 import 'dart:io' as io show Directory, File, Platform, stderr;
 
 import 'package:args/args.dart';
+import 'package:engine_repo_tools/engine_repo_tools.dart';
 import 'package:path/path.dart' as path;
 
-// Path to root of the flutter/engine repository containing this script.
-final String _engineRoot = path.dirname(path.dirname(path.dirname(path.dirname(path.fromUri(io.Platform.script)))));
+import 'lint_target.dart';
 
+final Engine _engineRoot = Engine.findWithin(path.dirname(path.fromUri(io.Platform.script)));
 
 /// Adds warnings as errors for only specific runs.  This is helpful if migrating one platform at a time.
 String? _platformSpecificWarningsAsErrors(ArgResults options) {
@@ -29,14 +30,15 @@ class Options {
     this.help = false,
     this.verbose = false,
     this.checksArg = '',
-    this.lintAll = false,
-    this.lintHead = false,
+    this.lintTarget = const LintChanged(),
     this.fix = false,
     this.errorMessage,
     this.warningsAsErrors,
     this.shardId,
     this.shardCommandsPaths = const <io.File>[],
+    this.enableCheckProfile = false,
     StringSink? errSink,
+    this.clangTidyPath,
   }) : checks = checksArg.isNotEmpty ? '--checks=$checksArg' : null,
        _errSink = errSink ?? io.stderr;
 
@@ -68,20 +70,31 @@ class Options {
     StringSink? errSink,
     required List<io.File> shardCommandsPaths,
     int? shardId,
+    io.File? clangTidyPath,
   }) {
+    final LintTarget lintTarget;
+    if (options.wasParsed('lint-all') || io.Platform.environment['FLUTTER_LINT_ALL'] != null) {
+      lintTarget = const LintAll();
+    } else if (options.wasParsed('lint-regex')) {
+      lintTarget = LintRegex(options['lint-regex'] as String? ?? '');
+    } else if (options.wasParsed('lint-head')) {
+      lintTarget = const LintHead();
+    } else {
+      lintTarget = const LintChanged();
+    }
     return Options(
       help: options['help'] as bool,
       verbose: options['verbose'] as bool,
       buildCommandsPath: buildCommandsPath,
       checksArg: options.wasParsed('checks') ? options['checks'] as String : '',
-      lintAll: io.Platform.environment['FLUTTER_LINT_ALL'] != null ||
-               options['lint-all'] as bool,
-      lintHead: options['lint-head'] as bool,
+      lintTarget: lintTarget,
       fix: options['fix'] as bool,
       errSink: errSink,
       warningsAsErrors: _platformSpecificWarningsAsErrors(options),
       shardCommandsPaths: shardCommandsPaths,
       shardId: shardId,
+      enableCheckProfile: options['enable-check-profile'] as bool,
+      clangTidyPath: clangTidyPath,
     );
   }
 
@@ -89,8 +102,13 @@ class Options {
   factory Options.fromCommandLine(
     List<String> arguments, {
     StringSink? errSink,
+    Engine? engine,
   }) {
-    final ArgResults argResults = _argParser.parse(arguments);
+    // TODO(matanlurey): Refactor this further, ideally moving all of the engine
+    // resolution logic (i.e. --src-dir, --target-variant, --compile-commands)
+    // into a separate method, and perhaps also adding `engine.output(name)`
+    // to engine_repo_tools instead of path manipulation inlined below.
+    final ArgResults argResults = _argParser(defaultEngine: engine).parse(arguments);
 
     String? buildCommandsPath = argResults['compile-commands'] as String?;
 
@@ -123,78 +141,109 @@ class Options {
     if (shardId != null && (shardId > shardCommands.length || shardId < 0)) {
       return Options._error('Invalid shard-id value: $shardId.', errSink: errSink);
     }
+    final io.File? clangTidyPath = ((String? path) => path == null
+        ? null
+        : io.File(path))(argResults['clang-tidy'] as String?);
     return Options._fromArgResults(
       argResults,
       buildCommandsPath: buildCommands,
       errSink: errSink,
       shardCommandsPaths: shardCommands,
       shardId: shardId,
+      clangTidyPath: clangTidyPath,
     );
   }
 
-  static final ArgParser _argParser = ArgParser()
-    ..addFlag(
-      'help',
-      abbr: 'h',
-      help: 'Print help.',
-      negatable: false,
-    )
-    ..addFlag(
-      'lint-all',
-      help: 'Lint all of the sources, regardless of FLUTTER_NOLINT.',
-    )
-    ..addFlag(
-      'lint-head',
-      help: 'Lint files changed in the tip-of-tree commit.',
-    )
-    ..addFlag(
-      'fix',
-      help: 'Apply suggested fixes.',
-    )
-    ..addFlag(
-      'verbose',
-      help: 'Print verbose output.',
-    )
-    ..addOption(
-      'shard-id',
-      help: 'When used with the shard-commands option this identifies which shard will execute.',
-      valueHelp: 'A number less than 1 + the number of shard-commands arguments.',
-    )
-    ..addOption(
-      'shard-variants',
-      help: 'Comma separated list of other targets, this invocation '
-            'will only execute a subset of the intersection and the difference of the '
-            'compile commands. Use with `shard-id`.'
-    )
-    ..addOption(
-      'compile-commands',
-      help: 'Use the given path as the source of compile_commands.json. This '
-            'file is created by running "tools/gn". Cannot be used with --target-variant '
-            'or --src-dir.',
-    )
-    ..addOption(
-      'target-variant',
-      aliases: <String>['variant'],
-      help: 'The engine variant directory containing compile_commands.json '
-            'created by running "tools/gn". Cannot be used with --compile-commands.',
-      valueHelp: 'host_debug|android_debug_unopt|ios_debug|ios_debug_sim_unopt',
-      defaultsTo: 'host_debug',
-    )
-    ..addOption('mac-host-warnings-as-errors',
+  static ArgParser _argParser({required Engine? defaultEngine}) {
+    defaultEngine ??= _engineRoot;
+    final io.Directory? latestBuild = defaultEngine.latestOutput()?.path;
+    return ArgParser()
+      ..addFlag(
+        'help',
+        abbr: 'h',
+        help: 'Print help.',
+        negatable: false,
+      )
+      ..addOption(
+        'lint-regex',
+        help: 'Lint all files, regardless of FLUTTER_NOLINT. Provide a regex '
+              'to filter files. For example, `--lint-regex=".*impeller.*"` will '
+              'lint all files within a path that contains "impeller".',
+        valueHelp: 'regex',
+      )
+      ..addFlag(
+        'lint-all',
+        help: 'Lint all files, regardless of FLUTTER_NOLINT.',
+      )
+      ..addFlag(
+        'lint-head',
+        help: 'Lint files changed in the tip-of-tree commit.',
+      )
+      ..addFlag(
+        'fix',
+        help: 'Apply suggested fixes.',
+      )
+      ..addFlag(
+        'verbose',
+        help: 'Print verbose output.',
+      )
+      ..addOption(
+        'shard-id',
+        help: 'When used with the shard-commands option this identifies which shard will execute.',
+        valueHelp: 'A number less than 1 + the number of shard-commands arguments.',
+      )
+      ..addOption(
+        'shard-variants',
+        help: 'Comma separated list of other targets, this invocation '
+              'will only execute a subset of the intersection and the difference of the '
+              'compile commands. Use with `shard-id`.'
+      )
+      ..addOption(
+        'compile-commands',
+        help: 'Use the given path as the source of compile_commands.json. This '
+              'file is created by running "tools/gn". Cannot be used with --target-variant '
+              'or --src-dir.',
+      )
+      ..addOption(
+        'target-variant',
+        aliases: <String>['variant'],
+        help: 'The engine variant directory name containing compile_commands.json '
+              'created by running "tools/gn".\n\nIf not provided, the default is '
+              'the latest build in the engine defined by --src-dir (or the '
+              'default path, see --src-dir for details).\n\n'
+              'Cannot be used with --compile-commands.',
+        valueHelp: 'host_debug|android_debug_unopt|ios_debug|ios_debug_sim_unopt',
+        defaultsTo: latestBuild == null ? 'host_debug' : path.basename(latestBuild.path),
+      )
+      ..addOption('mac-host-warnings-as-errors',
+          help:
+              'checks that will be treated as errors when running debug_host on mac.')
+      ..addOption(
+        'src-dir',
         help:
-            'checks that will be treated as errors when running debug_host on mac.')
-    ..addOption(
-      'src-dir',
-      help: 'Path to the engine src directory. Cannot be used with --compile-commands.',
-      valueHelp: 'path/to/engine/src',
-      defaultsTo: path.dirname(_engineRoot),
-    )
-    ..addOption(
-      'checks',
-      help: 'Perform the given checks on the code. Defaults to the empty '
-            'string, indicating all checks should be performed.',
-      defaultsTo: '',
-    );
+              'Path to the engine src directory.\n\n'
+              'If not provided, the default is the engine root directory that '
+              'contains the `clang_tidy` tool.\n\n'
+              'Cannot be used with --compile-commands.',
+        valueHelp: 'path/to/engine/src',
+        defaultsTo: _engineRoot.srcDir.path,
+      )
+      ..addOption(
+        'checks',
+        help: 'Perform the given checks on the code. Defaults to the empty '
+              'string, indicating all checks should be performed.',
+        defaultsTo: '',
+      )
+      ..addOption('clang-tidy',
+          help:
+              'Path to the clang-tidy executable. Defaults to deriving the path\n'
+              'from compile_commands.json.')
+      ..addFlag(
+        'enable-check-profile',
+        help: 'Enable per-check timing profiles and print a report to stderr.',
+        negatable: false,
+      );
+  }
 
   /// Whether to print a help message and exit.
   final bool help;
@@ -212,7 +261,7 @@ class Options {
   final int? shardId;
 
   /// The root of the flutter/engine repository.
-  final io.Directory repoPath = io.Directory(_engineRoot);
+  final io.Directory repoPath = _engineRoot.flutterDir;
 
   /// Argument sent as `warnings-as-errors` to clang-tidy.
   final String? warningsAsErrors;
@@ -223,23 +272,27 @@ class Options {
   /// Check argument to be supplied to the clang-tidy subprocess.
   final String? checks;
 
-  /// Whether all files should be linted.
-  final bool lintAll;
-
-  /// Whether to lint only files changed in the tip-of-tree commit.
-  final bool lintHead;
+  /// What files to lint.
+  final LintTarget lintTarget;
 
   /// Whether checks should apply available fix-ups to the working copy.
   final bool fix;
 
+  /// Whether to enable per-check timing profiles and print a report to stderr.
+  final bool enableCheckProfile;
+
   /// If there was a problem with the command line arguments, this string
   /// contains the error message.
   final String? errorMessage;
 
   final StringSink _errSink;
 
+  /// Override for which clang-tidy to use. If it is null it will be derived
+  /// instead.
+  final io.File? clangTidyPath;
+
   /// Print command usage with an additional message.
-  void printUsage({String? message}) {
+  void printUsage({String? message, required Engine? engine}) {
     if (message != null) {
       _errSink.writeln(message);
     }
@@ -247,7 +300,7 @@ class Options {
       'Usage: bin/main.dart [--help] [--lint-all] [--lint-head] [--fix] [--verbose] '
       '[--diff-branch] [--target-variant variant] [--src-dir path/to/engine/src]',
     );
-    _errSink.writeln(_argParser.usage);
+    _errSink.writeln(_argParser(defaultEngine: engine).usage);
   }
 
   /// Command line argument validation.
@@ -265,8 +318,8 @@ class Options {
       return 'ERROR: --compile-commands option cannot be used with --src-dir.';
     }
 
-    if (argResults.wasParsed('lint-all') && argResults.wasParsed('lint-head')) {
-      return 'ERROR: At most one of --lint-all and --lint-head can be passed.';
+    if (const <String>['lint-all', 'lint-head', 'lint-regex'].where(argResults.wasParsed).length > 1) {
+      return 'ERROR: At most one of --lint-all, --lint-head, --lint-regex can be passed.';
     }
 
     if (!buildCommandsPath.existsSync()) {
diff --git a/tools/clang_tidy/pubspec.yaml b/tools/clang_tidy/pubspec.yaml
index 7e89c33285ceb767ab826dae7d68e73a1e121d4c..7e7e987a61404c55e0fd21002a587140da7221a1 100644
--- a/tools/clang_tidy/pubspec.yaml
+++ b/tools/clang_tidy/pubspec.yaml
@@ -5,7 +5,7 @@
 name: clang_tidy
 publish_to: none
 environment:
-  sdk: '>=2.12.0-0 <3.0.0'
+  sdk: '>=3.2.0-0 <4.0.0'
 
 # Do not add any dependencies that require more than what is provided in
 # //third_party/pkg, //third_party/dart/pkg, or
@@ -18,15 +18,20 @@ environment:
 
 dependencies:
   args: any
+  git_repo_tools: any
+  engine_repo_tools: any
   meta: any
   path: any
+  process: any
   process_runner: any
 
 dev_dependencies:
   async_helper: any
   expect: any
   litetest: any
+  process_fakes: any
   smith: any
+  yaml: any
 
 dependency_overrides:
   args:
@@ -37,10 +42,14 @@ dependency_overrides:
     path: ../../../third_party/dart/pkg/async_helper
   collection:
     path: ../../../third_party/dart/third_party/pkg/collection
+  engine_repo_tools:
+    path: ../pkg/engine_repo_tools
   expect:
     path: ../../../third_party/dart/pkg/expect
   file:
-    path: ../../../third_party/pkg/file/packages/file
+    path: ../../../third_party/dart/third_party/pkg/file/packages/file
+  git_repo_tools:
+    path: ../pkg/git_repo_tools
   litetest:
     path: ../../testing/litetest
   meta:
@@ -48,10 +57,20 @@ dependency_overrides:
   path:
     path: ../../../third_party/dart/third_party/pkg/path
   platform:
-    path: ../../../third_party/pkg/platform
+    path: ../../third_party/pkg/platform
   process:
-    path: ../../../third_party/pkg/process
+    path: ../../third_party/pkg/process
+  process_fakes:
+    path: ../pkg/process_fakes
   process_runner:
-    path: ../../../third_party/pkg/process_runner
+    path: ../../third_party/pkg/process_runner
+  source_span:
+    path: ../../../third_party/dart/third_party/pkg/source_span
   smith:
     path: ../../../third_party/dart/pkg/smith
+  string_scanner:
+    path: ../../../third_party/dart/third_party/pkg/string_scanner
+  term_glyph:
+    path: ../../../third_party/dart/third_party/pkg/term_glyph
+  yaml:
+    path: ../../../third_party/dart/third_party/pkg/yaml
diff --git a/tools/clang_tidy/test/clang_tidy_test.dart b/tools/clang_tidy/test/clang_tidy_test.dart
index 13b2e08188ae1fd0293714aad876589bdcbd675f..edcc4c9af647de11a39763e02c6ee5e48dfe0bff 100644
--- a/tools/clang_tidy/test/clang_tidy_test.dart
+++ b/tools/clang_tidy/test/clang_tidy_test.dart
@@ -6,11 +6,64 @@ import 'dart:io' as io show Directory, File, Platform, stderr;
 
 import 'package:clang_tidy/clang_tidy.dart';
 import 'package:clang_tidy/src/command.dart';
+import 'package:clang_tidy/src/lint_target.dart';
 import 'package:clang_tidy/src/options.dart';
+import 'package:engine_repo_tools/engine_repo_tools.dart';
 import 'package:litetest/litetest.dart';
 import 'package:path/path.dart' as path;
+import 'package:process/process.dart';
+import 'package:process_fakes/process_fakes.dart';
 import 'package:process_runner/process_runner.dart';
 
+
+/// A test fixture for the `clang-tidy` tool.
+final class Fixture {
+  /// Simulates running the tool with the given [args].
+  factory Fixture.fromCommandLine(List<String> args, {
+    ProcessManager? processManager,
+    Engine? engine,
+  }) {
+    processManager ??= FakeProcessManager();
+    final StringBuffer outBuffer = StringBuffer();
+    final StringBuffer errBuffer = StringBuffer();
+    return Fixture._(ClangTidy.fromCommandLine(
+      args,
+      outSink: outBuffer,
+      errSink: errBuffer,
+      processManager: processManager,
+      engine: engine,
+    ), errBuffer);
+  }
+
+  /// Simulates running the tool with the given [options].
+  factory Fixture.fromOptions(Options options, {
+    ProcessManager? processManager,
+  }) {
+    processManager ??= FakeProcessManager();
+    final StringBuffer outBuffer = StringBuffer();
+    final StringBuffer errBuffer = StringBuffer();
+    return Fixture._(ClangTidy(
+      buildCommandsPath: options.buildCommandsPath,
+      lintTarget: options.lintTarget,
+      fix: options.fix,
+      outSink: outBuffer,
+      errSink: errBuffer,
+      processManager: processManager,
+    ), errBuffer);
+  }
+
+  Fixture._(
+    this.tool,
+    this.errBuffer,
+  );
+
+  /// The `clang-tidy` tool.
+  final ClangTidy tool;
+
+  /// Captured `stderr` from the tool.
+  final StringBuffer errBuffer;
+}
+
 // Recorded locally from clang-tidy.
 const String _tidyOutput = '''
 /runtime.dart_isolate.o" in /Users/aaclarke/dev/engine/src/out/host_debug exited with code 1
@@ -52,30 +105,58 @@ void _withTempFile(String prefix, void Function(String path) func) {
 }
 
 Future<int> main(List<String> args) async {
-  if (args.isEmpty) {
+  final String? buildCommands =
+      args.firstOrNull ??
+      Engine.findWithin().latestOutput()?.compileCommandsJson.path;
+
+  if (buildCommands == null || args.length > 1) {
     io.stderr.writeln(
       'Usage: clang_tidy_test.dart [path/to/compile_commands.json]',
     );
     return 1;
   }
-  final String buildCommands = args[0];
 
-  test('--help gives help', () async {
-    final StringBuffer outBuffer = StringBuffer();
-    final StringBuffer errBuffer = StringBuffer();
-    final ClangTidy clangTidy = ClangTidy.fromCommandLine(
-      <String>[
-      '--help',
-      ],
-      outSink: outBuffer,
-      errSink: errBuffer,
-    );
+  test('--help gives help, and uses host_debug by default outside of an engine root', () async {
+    final io.Directory rootDir = io.Directory.systemTemp.createTempSync('clang_tidy_test');
+    try {
+      final Fixture fixture = Fixture.fromCommandLine(
+        <String>['--help'],
+        engine: TestEngine.createTemp(rootDir: rootDir)
+      );
+      final int result = await fixture.tool.run();
+
+      expect(fixture.tool.options.help, isTrue);
+      expect(result, equals(0));
+
+      final String errors = fixture.errBuffer.toString();
+      expect(errors, contains('Usage: '));
+      expect(errors, contains('defaults to "host_debug"'));
+    } finally {
+      rootDir.deleteSync(recursive: true);
+    }
+  });
 
-    final int result = await clangTidy.run();
+  test('--help gives help, and uses the latest build by default outside in an engine root', () async {
+    final io.Directory rootDir = io.Directory.systemTemp.createTempSync('clang_tidy_test');
+    final io.Directory buildDir = io.Directory(path.join(rootDir.path, 'out', 'host_debug_unopt_arm64'))..createSync(recursive: true);
+    try {
+      final Fixture fixture = Fixture.fromCommandLine(
+        <String>['--help'],
+        engine: TestEngine.createTemp(rootDir: rootDir, outputs: <TestOutput>[
+          TestOutput(buildDir),
+        ])
+      );
+      final int result = await fixture.tool.run();
+
+      expect(fixture.tool.options.help, isTrue);
+      expect(result, equals(0));
 
-    expect(clangTidy.options.help, isTrue);
-    expect(result, equals(0));
-    expect(errBuffer.toString(), contains('Usage: '));
+      final String errors = fixture.errBuffer.toString();
+      expect(errors, contains('Usage: '));
+      expect(errors, contains('defaults to "host_debug_unopt_arm64"'));
+    } finally {
+      rootDir.deleteSync(recursive: true);
+    }
   });
 
   test('trimmed clang-tidy output', () {
@@ -83,47 +164,36 @@ Future<int> main(List<String> args) async {
   });
 
   test('Error when --compile-commands and --target-variant are used together', () async {
-    final StringBuffer outBuffer = StringBuffer();
-    final StringBuffer errBuffer = StringBuffer();
-    final ClangTidy clangTidy = ClangTidy.fromCommandLine(
+    final Fixture fixture = Fixture.fromCommandLine(
       <String>[
         '--compile-commands',
         '/unused',
         '--target-variant',
         'unused'
       ],
-      outSink: outBuffer,
-      errSink: errBuffer,
     );
 
-    final int result = await clangTidy.run();
+    final int result = await fixture.tool.run();
 
-    expect(clangTidy.options.help, isFalse);
     expect(result, equals(1));
-    expect(errBuffer.toString(), contains(
+    expect(fixture.errBuffer.toString(), contains(
       'ERROR: --compile-commands option cannot be used with --target-variant.',
     ));
   });
 
   test('Error when --compile-commands and --src-dir are used together', () async {
-    final StringBuffer outBuffer = StringBuffer();
-    final StringBuffer errBuffer = StringBuffer();
-    final ClangTidy clangTidy = ClangTidy.fromCommandLine(
+    final Fixture fixture = Fixture.fromCommandLine(
       <String>[
         '--compile-commands',
         '/unused',
         '--src-dir',
         '/unused',
       ],
-      outSink: outBuffer,
-      errSink: errBuffer,
     );
+    final int result = await fixture.tool.run();
 
-    final int result = await clangTidy.run();
-
-    expect(clangTidy.options.help, isFalse);
     expect(result, equals(1));
-    expect(errBuffer.toString(), contains(
+    expect(fixture.errBuffer.toString(), contains(
       'ERROR: --compile-commands option cannot be used with --src-dir.',
     ));
   });
@@ -140,6 +210,23 @@ Future<int> main(List<String> args) async {
     });
   });
 
+  test('clang-tidy specified', () async {
+    _withTempFile('shard-id-valid', (String path) {
+      final Options options = Options.fromCommandLine( <String>[
+          '--clang-tidy=foo/bar',
+        ],);
+      expect(options.clangTidyPath, isNotNull);
+      expect(options.clangTidyPath!.path, equals('foo/bar'));
+    });
+  });
+
+  test('clang-tidy unspecified', () async {
+    _withTempFile('shard-id-valid', (String path) {
+      final Options options = Options.fromCommandLine( <String>[],);
+      expect(options.clangTidyPath, isNull);
+    });
+  });
+
   test('shard-id invalid', () async {
     _withTempFile('shard-id-valid', (String path) {
       final StringBuffer errBuffer = StringBuffer();
@@ -150,55 +237,38 @@ Future<int> main(List<String> args) async {
       ], errSink: errBuffer);
       expect(options.errorMessage, isNotNull);
       expect(options.shardId, isNull);
-      print('foo ${options.errorMessage}');
-      expect(
-          options.errorMessage,
-          contains(
-            'Invalid shard-id value',
-          ));
+      expect(options.errorMessage, contains('Invalid shard-id value'));
     });
   });
 
   test('Error when --compile-commands path does not exist', () async {
-    final StringBuffer outBuffer = StringBuffer();
-    final StringBuffer errBuffer = StringBuffer();
-    final ClangTidy clangTidy = ClangTidy.fromCommandLine(
+    final Fixture fixture = Fixture.fromCommandLine(
       <String>[
         '--compile-commands',
         '/does/not/exist',
       ],
-      outSink: outBuffer,
-      errSink: errBuffer,
     );
+    final int result = await fixture.tool.run();
 
-    final int result = await clangTidy.run();
-
-    expect(clangTidy.options.help, isFalse);
     expect(result, equals(1));
-    expect(errBuffer.toString().split('\n')[0], hasMatch(
+    expect(fixture.errBuffer.toString().split('\n')[0], hasMatch(
       r"ERROR: Build commands path .*/does/not/exist doesn't exist.",
     ));
   });
 
   test('Error when --src-dir path does not exist, uses target variant in path', () async {
-    final StringBuffer outBuffer = StringBuffer();
-    final StringBuffer errBuffer = StringBuffer();
-    final ClangTidy clangTidy = ClangTidy.fromCommandLine(
+    final Fixture fixture = Fixture.fromCommandLine(
       <String>[
         '--src-dir',
         '/does/not/exist',
         '--target-variant',
         'ios_debug_unopt',
       ],
-      outSink: outBuffer,
-      errSink: errBuffer,
     );
+    final int result = await fixture.tool.run();
 
-    final int result = await clangTidy.run();
-
-    expect(clangTidy.options.help, isFalse);
     expect(result, equals(1));
-    expect(errBuffer.toString().split('\n')[0], hasMatch(
+    expect(fixture.errBuffer.toString().split('\n')[0], hasMatch(
       r'ERROR: Build commands path .*/does/not/exist'
       r'[/\\]out[/\\]ios_debug_unopt[/\\]compile_commands.json'
       r" doesn't exist.",
@@ -206,77 +276,127 @@ Future<int> main(List<String> args) async {
   });
 
   test('Error when --lint-all and --lint-head are used together', () async {
-    final StringBuffer outBuffer = StringBuffer();
-    final StringBuffer errBuffer = StringBuffer();
-    final ClangTidy clangTidy = ClangTidy.fromCommandLine(
+    final Fixture fixture = Fixture.fromCommandLine(
       <String>[
         '--compile-commands',
         '/unused',
         '--lint-all',
         '--lint-head',
       ],
-      outSink: outBuffer,
-      errSink: errBuffer,
     );
+    final int result = await fixture.tool.run();
 
-    final int result = await clangTidy.run();
+    expect(result, equals(1));
+    expect(fixture.errBuffer.toString(), contains(
+      'ERROR: At most one of --lint-all, --lint-head, --lint-regex can be passed.',
+    ));
+  });
+
+  test('Error when --lint-all and --lint-regex are used together', () async {
+    final Fixture fixture = Fixture.fromCommandLine(
+      <String>[
+        '--compile-commands',
+        '/unused',
+        '--lint-all',
+        '--lint-regex=".*"',
+      ],
+    );
+    final int result = await fixture.tool.run();
 
-    expect(clangTidy.options.help, isFalse);
     expect(result, equals(1));
-    expect(errBuffer.toString(), contains(
-      'ERROR: At most one of --lint-all and --lint-head can be passed.',
+    expect(fixture.errBuffer.toString(), contains(
+      'ERROR: At most one of --lint-all, --lint-head, --lint-regex can be passed.',
     ));
   });
 
   test('lintAll=true checks all files', () async {
-    final StringBuffer outBuffer = StringBuffer();
-    final StringBuffer errBuffer = StringBuffer();
-    final ClangTidy clangTidy = ClangTidy(
-      buildCommandsPath: io.File(buildCommands),
-      lintAll: true,
-      outSink: outBuffer,
-      errSink: errBuffer,
+    final Fixture fixture = Fixture.fromOptions(
+      Options(
+        buildCommandsPath: io.File(buildCommands),
+        lintTarget: const LintAll(),
+      ),
     );
-    final List<io.File> fileList = await clangTidy.computeFilesOfInterest();
+    final List<io.File> fileList = await fixture.tool.computeFilesOfInterest();
     expect(fileList.length, greaterThan(1000));
   });
 
   test('lintAll=false does not check all files', () async {
-    final StringBuffer outBuffer = StringBuffer();
-    final StringBuffer errBuffer = StringBuffer();
-    final ClangTidy clangTidy = ClangTidy(
-      buildCommandsPath: io.File(buildCommands),
-      outSink: outBuffer,
-      errSink: errBuffer,
+    final Fixture fixture = Fixture.fromOptions(
+      Options(
+        buildCommandsPath: io.File(buildCommands),
+        // Intentional:
+        // ignore: avoid_redundant_argument_values
+        lintTarget: const LintChanged(),
+      ),
+      processManager: FakeProcessManager(
+        onStart: (List<String> command) {
+          if (command.first == 'git') {
+            // This just allows git to not actually be called.
+            return FakeProcess();
+          }
+          return FakeProcessManager.unhandledStart(command);
+        },
+      ),
     );
-    final List<io.File> fileList = await clangTidy.computeFilesOfInterest();
+    final List<io.File> fileList = await fixture.tool.computeFilesOfInterest();
     expect(fileList.length, lessThan(300));
   });
 
+  test('lintAll=pattern checks based on a RegEx', () async {
+    final Fixture fixture = Fixture.fromOptions(
+      Options(
+        buildCommandsPath: io.File(buildCommands),
+        lintTarget: const LintRegex(r'.*test.*\.cc$'),
+      ),
+      processManager: FakeProcessManager(
+        onStart: (List<String> command) {
+          if (command.first == 'git') {
+            // This just allows git to not actually be called.
+            return FakeProcess();
+          }
+          return FakeProcessManager.unhandledStart(command);
+        },
+      ),
+    );
+    final List<io.File> fileList = await fixture.tool.computeFilesOfInterest();
+    expect(fileList.length, lessThan(2000));
+  });
+
   test('Sharding', () async {
-    final StringBuffer outBuffer = StringBuffer();
-    final StringBuffer errBuffer = StringBuffer();
-    final ClangTidy clangTidy = ClangTidy(
-      buildCommandsPath: io.File(buildCommands),
-      lintAll: true,
-      outSink: outBuffer,
-      errSink: errBuffer,
+    final Fixture fixture = Fixture.fromOptions(
+      Options(
+        buildCommandsPath: io.File(buildCommands),
+        lintTarget: const LintAll(),
+      ),
+      processManager: FakeProcessManager(
+        onStart: (List<String> command) {
+          if (command.first == 'git') {
+            // This just allows git to not actually be called.
+            return FakeProcess();
+          }
+          return FakeProcessManager.unhandledStart(command);
+        },
+      ),
     );
-    Map<String, dynamic> makeBuildCommandEntry(String filePath) => <String, dynamic>{
-          'directory': '/unused',
-          'command': '../../buildtools/mac-x64/clang/bin/clang $filePath',
-          'file': filePath,
-        };
+
+    Map<String, String> makeBuildCommandEntry(String filePath) {
+      return <String, String>{
+        'directory': '/unused',
+        'command': '../../buildtools/mac-x64/clang/bin/clang $filePath',
+        'file': filePath,
+      };
+    }
+
     final List<String> filePaths = <String>[
       for (int i = 0; i < 10; ++i) '/path/to/a/source_file_$i.cc'
     ];
-    final List<dynamic> buildCommandsData =
+    final List<Map<String, String>> buildCommandsData =
         filePaths.map((String e) => makeBuildCommandEntry(e)).toList();
-    final List<dynamic> shardBuildCommandsData =
+    final List<Map<String, String>> shardBuildCommandsData =
       filePaths.sublist(6).map((String e) => makeBuildCommandEntry(e)).toList();
 
     {
-      final List<Command> commands = await clangTidy.getLintCommandsForFiles(
+      final List<Command> commands = await fixture.tool.getLintCommandsForFiles(
         buildCommandsData,
         filePaths.map((String e) => io.File(e)).toList(),
         <List<dynamic>>[shardBuildCommandsData],
@@ -296,10 +416,10 @@ Future<int> main(List<String> args) async {
       expect(commandFilePaths.contains('/path/to/a/source_file_9.cc'), false);
     }
     {
-      final List<Command> commands = await clangTidy.getLintCommandsForFiles(
+      final List<Command> commands = await fixture.tool.getLintCommandsForFiles(
         buildCommandsData,
         filePaths.map((String e) => io.File(e)).toList(),
-        <List<dynamic>>[shardBuildCommandsData],
+        <List<Map<String, String>>>[shardBuildCommandsData],
         1,
       );
 
@@ -319,14 +439,13 @@ Future<int> main(List<String> args) async {
   });
 
   test('No Commands are produced when no files changed', () async {
-    final StringBuffer outBuffer = StringBuffer();
-    final StringBuffer errBuffer = StringBuffer();
-    final ClangTidy clangTidy = ClangTidy(
-      buildCommandsPath: io.File(buildCommands),
-      lintAll: true,
-      outSink: outBuffer,
-      errSink: errBuffer,
+    final Fixture fixture = Fixture.fromOptions(
+      Options(
+        buildCommandsPath: io.File(buildCommands),
+        lintTarget: const LintAll(),
+      ),
     );
+
     const String filePath = '/path/to/a/source_file.cc';
     final List<dynamic> buildCommandsData = <Map<String, dynamic>>[
       <String, dynamic>{
@@ -335,7 +454,7 @@ Future<int> main(List<String> args) async {
         'file': filePath,
       },
     ];
-    final List<Command> commands = await clangTidy.getLintCommandsForFiles(
+    final List<Command> commands = await fixture.tool.getLintCommandsForFiles(
       buildCommandsData,
       <io.File>[],
       <List<dynamic>>[],
@@ -346,13 +465,11 @@ Future<int> main(List<String> args) async {
   });
 
   test('A Command is produced when a file is changed', () async {
-    final StringBuffer outBuffer = StringBuffer();
-    final StringBuffer errBuffer = StringBuffer();
-    final ClangTidy clangTidy = ClangTidy(
-      buildCommandsPath: io.File(buildCommands),
-      lintAll: true,
-      outSink: outBuffer,
-      errSink: errBuffer,
+    final Fixture fixture = Fixture.fromOptions(
+      Options(
+        buildCommandsPath: io.File(buildCommands),
+        lintTarget: const LintAll(),
+      ),
     );
 
     // This file needs to exist, and be UTF8 line-parsable.
@@ -364,7 +481,7 @@ Future<int> main(List<String> args) async {
         'file': filePath,
       },
     ];
-    final List<Command> commands = await clangTidy.getLintCommandsForFiles(
+    final List<Command> commands = await fixture.tool.getLintCommandsForFiles(
       buildCommandsData,
       <io.File>[io.File(filePath)],
       <List<dynamic>>[],
@@ -458,5 +575,40 @@ Future<int> main(List<String> args) async {
     expect(lintAction, equals(LintAction.lint));
   });
 
+  test('Command filters out sed command after a compile command', () {
+    final Command command = Command.fromMap(<String, String>{
+        'directory': '/unused',
+        'command':
+          '../../buildtools/mac-x64/clang/bin/clang filename '
+          "&& sed -i 's@/b/f/w@../..@g' filename",
+        'file': 'unused',
+    });
+    expect(command.tidyArgs.trim(), 'filename');
+  });
+
+  test('Command filters out the -MF flag', () {
+    final Command command = Command.fromMap(<String, String>{
+        'directory': '/unused',
+        'command':
+          '../../buildtools/mac-x64/clang/bin/clang -MF stuff filename ',
+        'file': 'unused',
+    });
+    expect(command.tidyArgs.trim(), 'filename');
+  });
+
+  test('Command filters out rewrapper command before a compile command', () {
+    final Command command = Command.fromMap(<String, String>{
+        'directory': '/unused',
+        'command':
+          'flutter/engine/src/buildtools/mac-arm64/reclient/rewrapper '
+          '--cfg=flutter/engine/src/flutter/build/rbe/rewrapper-mac-arm64.cfg '
+          '--exec_root=flutter/engine/src/ '
+          '--labels=type=compile,compiler=clang,lang=cpp '
+          '../../buildtools/mac-x64/clang/bin/clang++ filename ',
+        'file': 'unused',
+    });
+    expect(command.tidyArgs.trim(), 'filename');
+  });
+
   return 0;
 }
diff --git a/tools/clang_tidy/test/header_filter_regex_test.dart b/tools/clang_tidy/test/header_filter_regex_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..21db03162d6ec93f925d9a4dc7761b023626119a
--- /dev/null
+++ b/tools/clang_tidy/test/header_filter_regex_test.dart
@@ -0,0 +1,70 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io';
+
+import 'package:engine_repo_tools/engine_repo_tools.dart';
+import 'package:litetest/litetest.dart';
+import 'package:path/path.dart' as path;
+import 'package:yaml/yaml.dart' as yaml;
+
+/// Tests that `HeaderFilterRegex` works as expected in `.clang_tidy`.
+void main() {
+  // Find the root of the repo.
+  final Engine engine = Engine.findWithin(path.dirname(Platform.script.path));
+
+  // Find the `.clang_tidy` file and "parse" it (it's YAML).
+  final yaml.YamlDocument dotClangTidy = yaml.loadYamlDocument(
+    File(path.join(engine.flutterDir.path, '.clang-tidy')).readAsStringSync(),
+  );
+
+  // Find the `HeaderFilterRegex` entry.
+  if (dotClangTidy.contents is! yaml.YamlMap) {
+    stderr.writeln('Expected .clang-tidy to be a YAML map.');
+    exit(1);
+  }
+  final yaml.YamlMap nodes = dotClangTidy.contents as yaml.YamlMap;
+  final yaml.YamlNode? headerFilterRegex = nodes.nodes['HeaderFilterRegex'];
+  if (headerFilterRegex == null) {
+    stderr.writeln('Expected .clang-tidy to have a HeaderFilterRegex entry.');
+    exit(1);
+  }
+
+  final RegExp regexValue = RegExp(headerFilterRegex.value.toString());
+
+  test('contains every root directory in the regex', () {
+    // These are a list of directories that should _not_ be included.
+    const Set<String> intentionallyOmitted = <String>{
+      '.git',
+      '.github',
+      'build_overrides',
+      'buildtools',
+      'prebuilts',
+      'third_party',
+    };
+
+    // Find all the directories in the repo root aside from the ones above.
+    final Set<String> rootDirs = <String>{};
+    for (final FileSystemEntity entity in engine.flutterDir.listSync()) {
+      if (entity is! Directory) {
+        continue;
+      }
+      final String name = path.basename(entity.path);
+      if (intentionallyOmitted.contains(name)) {
+        continue;
+      }
+      rootDirs.add(name);
+    }
+
+    // Create a fake file in that path, and assert that it matches the regex.
+    for (final String rootDir in rootDirs) {
+      final String file = path.join('..', '..', 'flutter', rootDir, 'foo');
+      if (!regexValue.hasMatch(file)) {
+        // This is because reason: ... doesn't work in pkg/litetest.
+        stderr.writeln('Expected "$file" to be caught by HeaderFilterRegex (${regexValue.pattern}).');
+      }
+      expect(regexValue.hasMatch(file), isTrue);
+    }
+  });
+}
diff --git a/tools/compare_goldens/README.md b/tools/compare_goldens/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..4c9b1fdf04302c203093d80657644878da60f759
--- /dev/null
+++ b/tools/compare_goldens/README.md
@@ -0,0 +1,37 @@
+# Compare Goldens
+
+This is a script that will let you check golden image diffs locally.
+
+The directories are scanned for png files that match in name, then the diff
+is written to `diff_<name of file>` in the CWD. This allows you to get
+results quicker than having to upload to skia gold.  By default it uses fuzzy
+RMSE to compare.
+
+## Usage
+
+```sh
+dart run compare_goldens <dir path> <dir path>
+```
+
+Here's the steps for using this with something like impeller golden tests:
+
+1) Checkout a base revision
+2) Build impeller_golden_tests
+3) Execute `impeller_golden_tests --working_dir=\<path a\>
+4) Checkout test revision
+5) Build impeller_golden_tests
+6) Execute `impeller_golden_tests --working_dir=\<path b\>
+7) Execute `compare_goldens \<path a\> \<path b\>
+
+## Requirements
+
+- ImageMagick is installed on $PATH
+
+## Testing
+
+To run the tests:
+
+```sh
+dart pub get
+find . -name "*_test.dart" | xargs -n 1 dart --enable-asserts
+```
diff --git a/tools/compare_goldens/bin/compare_goldens.dart b/tools/compare_goldens/bin/compare_goldens.dart
new file mode 100644
index 0000000000000000000000000000000000000000..f5f2d5a1709d5a23829a6d5f5caea6eacf43ba27
--- /dev/null
+++ b/tools/compare_goldens/bin/compare_goldens.dart
@@ -0,0 +1,10 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io' show exitCode;
+import 'package:compare_goldens/compare_goldens.dart' as compare_goldens;
+
+void main(List<String> args) {
+  exitCode = compare_goldens.run(args);
+}
diff --git a/tools/compare_goldens/lib/compare_goldens.dart b/tools/compare_goldens/lib/compare_goldens.dart
new file mode 100644
index 0000000000000000000000000000000000000000..8a865e5b7eca28dcf3a4e25f4a6e63427fa00df0
--- /dev/null
+++ b/tools/compare_goldens/lib/compare_goldens.dart
@@ -0,0 +1,85 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io';
+
+bool _hasCommandOnPath(String name) {
+  final ProcessResult result = Process.runSync('which', <String>[name]);
+  return result.exitCode == 0;
+}
+
+List<String> _findPairs(Set<String> as, Set<String> bs) {
+  final List<String> result  = <String>[];
+  for (final String a in as) {
+    if (bs.contains(a)) {
+      result.add(a);
+    } else {
+      print('Mix match file $a.');
+    }
+  }
+  for (final String b in bs) {
+    if (!as.contains(b)) {
+      print('Mix match file $b.');
+    }
+  }
+  return result;
+}
+
+String _basename(String path) {
+  return path.split(Platform.pathSeparator).last;
+}
+
+Set<String> _grabPngFilenames(Directory dir) {
+  return dir.listSync()
+    .map((FileSystemEntity e) => _basename(e.path))
+    .where((String e) => e.endsWith('.png'))
+    .toSet();
+}
+
+/// The main entry point to the tool, execute it like `main`. Returns the
+/// `exitCode`.
+int run(List<String> args) {
+  int returnCode = 0;
+  if (!_hasCommandOnPath('compare')) {
+    throw Exception(r'Could not find `compare` from ImageMagick on $PATH.');
+  }
+  if (args.length != 2) {
+    throw Exception('Usage: compare_goldens.dart <dir path> <dir path>');
+  }
+
+  final Directory dirA = Directory(args[0]);
+  if (!dirA.existsSync()) {
+    throw Exception('Unable to find $dirA');
+  }
+  final Directory dirB = Directory(args[1]);
+  if (!dirB.existsSync()) {
+    throw Exception('Unable to find $dirB');
+  }
+
+  final Set<String> filesA = _grabPngFilenames(dirA);
+  final Set<String> filesB = _grabPngFilenames(dirB);
+  final List<String> pairs = _findPairs(filesA, filesB);
+
+  if (filesA.length != pairs.length || filesB.length != pairs.length) {
+    returnCode = 1;
+  }
+
+  int count = 0;
+  for (final String name in pairs) {
+    count += 1;
+    final String pathA = <String>[dirA.path, name].join(Platform.pathSeparator);
+    final String pathB = <String>[dirB.path, name].join(Platform.pathSeparator);
+    final String output = 'diff_$name';
+    print('compare ($count / ${pairs.length}) $name');
+    final ProcessResult result = Process.runSync('compare',
+        <String>['-metric', 'RMSE', '-fuzz', '5%', pathA, pathB, output]);
+    if (result.exitCode != 0) {
+      print('DIFF FOUND: saved to $output');
+      returnCode = 1;
+    } else {
+      File(output).deleteSync();
+    }
+  }
+  return returnCode;
+}
diff --git a/tools/compare_goldens/pubspec.yaml b/tools/compare_goldens/pubspec.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..c93e9a825fee6bcce5e5698b372526eee27d2767
--- /dev/null
+++ b/tools/compare_goldens/pubspec.yaml
@@ -0,0 +1,3 @@
+name: compare_goldens
+environment:
+  sdk: '>=3.2.0-0 <4.0.0'
diff --git a/tools/compare_goldens/test/compare_goldens_test.dart b/tools/compare_goldens/test/compare_goldens_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..f9b0dd79fed956ff4027c47fcb784c60bf36e50e
--- /dev/null
+++ b/tools/compare_goldens/test/compare_goldens_test.dart
@@ -0,0 +1,5 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+void main() {}
diff --git a/tools/const_finder/BUILD.gn b/tools/const_finder/BUILD.gn
index c20766d7d8643bc966f67fc94ab018f763875378..d628749c26fca67d10e75947ad6a31e5334ae0c5 100644
--- a/tools/const_finder/BUILD.gn
+++ b/tools/const_finder/BUILD.gn
@@ -13,7 +13,6 @@ application_snapshot("const_finder") {
 
   inputs = [
     "bin/main.dart",
-    "lib/const_finder.dart",
     ".dart_tool/package_config.json",
   ]
 
diff --git a/tools/const_finder/bin/main.dart b/tools/const_finder/bin/main.dart
index d20423687ed4dc0ba684ed8b440d5cf10593a3ec..0a64dc452f8b6b3cf43047186a7ebff2ad0ceba1 100644
--- a/tools/const_finder/bin/main.dart
+++ b/tools/const_finder/bin/main.dart
@@ -6,7 +6,7 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:args/args.dart';
-import 'package:const_finder/const_finder.dart';
+import 'package:kernel/const_finder.dart';
 
 void main(List<String> args) {
   final ArgParser parser = ArgParser();
diff --git a/tools/const_finder/lib/const_finder.dart b/tools/const_finder/lib/const_finder.dart
deleted file mode 100644
index 4af94de2aa2854866f4099385f3b86bf79b266cc..0000000000000000000000000000000000000000
--- a/tools/const_finder/lib/const_finder.dart
+++ /dev/null
@@ -1,167 +0,0 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'dart:collection';
-
-import 'package:kernel/kernel.dart';
-
-class _ConstVisitor extends RecursiveVisitor<void> {
-  _ConstVisitor(
-    this.kernelFilePath,
-    this.classLibraryUri,
-    this.className,
-    this.annotationClassLibraryUri,
-    this.annotationClassName,
-  )  : _visitedInstances = <String>{},
-       constantInstances = <Map<String, dynamic>>[],
-       nonConstantLocations = <Map<String, dynamic>>[];
-
-  /// The path to the file to open.
-  final String kernelFilePath;
-
-  /// The library URI for the class to find.
-  final String classLibraryUri;
-
-  /// The name of the class to find.
-  final String className;
-
-  final Set<String> _visitedInstances;
-  final List<Map<String, dynamic>> constantInstances;
-  final List<Map<String, dynamic>> nonConstantLocations;
-
-  bool inIgnoredClass = false;
-
-  /// The name of the name of the class of the annotation marking classes
-  /// whose constant references should be ignored.
-  final String? annotationClassName;
-
-  /// The library URI of the class of the annotation marking classes whose
-  /// constant references should be ignored.
-  final String? annotationClassLibraryUri;
-
-  // A cache of previously evaluated classes.
-  static final Map<Class, bool> _classHeirarchyCache = <Class, bool>{};
-  bool _matches(Class node) {
-    final bool? result = _classHeirarchyCache[node];
-    if (result != null) {
-      return result;
-    }
-    final bool exactMatch = node.name == className
-        && node.enclosingLibrary.importUri.toString() == classLibraryUri;
-    final bool match = exactMatch
-        || node.supers.any((Supertype supertype) => _matches(supertype.classNode));
-    _classHeirarchyCache[node] = match;
-    return match;
-  }
-
-  // Avoid visiting the same constant more than once.
-  final Set<Constant> _cache = LinkedHashSet<Constant>.identity();
-
-  @override
-  void defaultConstant(Constant node) {
-    if (_cache.add(node)) {
-      super.defaultConstant(node);
-    }
-  }
-
-  @override
-  void defaultConstantReference(Constant node) {
-    defaultConstant(node);
-  }
-
-  @override
-  void visitConstructorInvocation(ConstructorInvocation node) {
-    final Class parentClass = node.target.parent! as Class;
-    if (_matches(parentClass)) {
-      final Location location = node.location!;
-      nonConstantLocations.add(<String, dynamic>{
-        'file': location.file.toString(),
-        'line': location.line,
-        'column': location.column,
-      });
-    }
-    super.visitConstructorInvocation(node);
-  }
-
-  @override
-  void visitClass(Class node) {
-    // check if this is a class that we should ignore
-    inIgnoredClass = _classShouldBeIgnored(node);
-    super.visitClass(node);
-    inIgnoredClass = false;
-  }
-
-  // If any annotations on the class match annotationClassName AND
-  // annotationClassLibraryUri.
-  bool _classShouldBeIgnored(Class node) {
-    if (annotationClassName == null || annotationClassLibraryUri == null) {
-      return false;
-    }
-    return node.annotations.any((Expression expression) {
-      if (expression is! ConstantExpression) {
-        return false;
-      }
-
-      final Constant constant = expression.constant;
-      return constant is InstanceConstant
-          && constant.classNode.name == annotationClassName
-          && constant.classNode.enclosingLibrary.importUri.toString() == annotationClassLibraryUri;
-    });
-  }
-
-  @override
-  void visitInstanceConstantReference(InstanceConstant node) {
-    super.visitInstanceConstantReference(node);
-    if (!_matches(node.classNode) || inIgnoredClass) {
-      return;
-    }
-
-    final Map<String, dynamic> instance = <String, dynamic>{};
-    for (final MapEntry<Reference, Constant> kvp in node.fieldValues.entries) {
-      if (kvp.value is! PrimitiveConstant<dynamic>) {
-        continue;
-      }
-      final PrimitiveConstant<dynamic> value = kvp.value as PrimitiveConstant<dynamic>;
-      instance[kvp.key.asField.name.text] = value.value;
-    }
-    if (_visitedInstances.add(instance.toString())) {
-      constantInstances.add(instance);
-    }
-  }
-}
-
-/// A kernel AST visitor that finds const references.
-class ConstFinder {
-  /// Creates a new ConstFinder class.  All arguments are required and must not
-  /// be null.
-  ///
-  /// The `kernelFilePath` is the path to a dill (kernel) file to process.
-  ConstFinder({
-    required String kernelFilePath,
-    required String classLibraryUri,
-    required String className,
-    String? annotationClassLibraryUri,
-    String? annotationClassName,
-  })  : _visitor = _ConstVisitor(
-                    kernelFilePath,
-                    classLibraryUri,
-                    className,
-                    annotationClassLibraryUri,
-                    annotationClassName,
-                  );
-
-  final _ConstVisitor _visitor;
-
-  /// Finds all instances
-  Map<String, dynamic> findInstances() {
-    _visitor._visitedInstances.clear();
-    for (final Library library in loadComponentFromBinary(_visitor.kernelFilePath).libraries) {
-      library.visitChildren(_visitor);
-    }
-    return <String, dynamic>{
-      'constantInstances': _visitor.constantInstances,
-      'nonConstantLocations': _visitor.nonConstantLocations,
-    };
-  }
-}
diff --git a/tools/const_finder/pubspec.yaml b/tools/const_finder/pubspec.yaml
index 4a9ce8e9b4a17dc7dd865cf0a1a7f8079d7a9cd0..c7d2b9f0f82bca7b6618bb1b1bafcf6691212cf7 100644
--- a/tools/const_finder/pubspec.yaml
+++ b/tools/const_finder/pubspec.yaml
@@ -6,7 +6,7 @@ name: const_finder
 publish_to: none
 
 environment:
-  sdk: ">=2.17.0 <3.0.0"
+  sdk: '>=3.2.0-0 <4.0.0'
 
 # Do not add any dependencies that require more than what is provided in
 # //third_party/dart/pkg or //third_party/dart/third_party/pkg.
diff --git a/tools/const_finder/test/const_finder_test.dart b/tools/const_finder/test/const_finder_test.dart
index 6c6da5d2bcd8ce35002527a287e420d2d4137f0e..18e237fd7c96e2b999098e647f7ed2de99557e33 100644
--- a/tools/const_finder/test/const_finder_test.dart
+++ b/tools/const_finder/test/const_finder_test.dart
@@ -8,7 +8,7 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:collection/collection.dart';
-import 'package:const_finder/const_finder.dart';
+import 'package:kernel/const_finder.dart';
 import 'package:path/path.dart' as path;
 
 void expect<T>(T value, T expected) {
@@ -31,10 +31,6 @@ void expectInstances(dynamic value, dynamic expected, Compiler compiler) {
 
   final Equality<Object?> equality;
   if (compiler == Compiler.dart2js) {
-    // Ignore comparing nonConstantLocations in web dills because it will have
-    // extra fields.
-    (value as Map<String, Object?>).remove('nonConstantLocations');
-    (expected as Map<String, Object?>).remove('nonConstantLocations');
     equality = const Dart2JSDeepCollectionEquality();
   } else {
     equality = const DeepCollectionEquality();
@@ -49,7 +45,6 @@ void expectInstances(dynamic value, dynamic expected, Compiler compiler) {
 // This test is assuming the `dart` used to invoke the tests is compatible
 // with the version of package:kernel in //third-party/dart/pkg/kernel
 final String dart = Platform.resolvedExecutable;
-final String bat = Platform.isWindows ? '.bat' : '';
 
 void _checkRecursion(String dillPath, Compiler compiler) {
   stdout.writeln('Checking recursive calls.');
@@ -69,9 +64,7 @@ void _checkConsts(String dillPath, Compiler compiler) {
     classLibraryUri: 'package:const_finder_fixtures/target.dart',
     className: 'Target',
   );
-  expectInstances(
-    finder.findInstances(),
-    <String, dynamic>{
+  final Map<String, Object?> expectation = <String, dynamic>{
       'constantInstances': <Map<String, dynamic>>[
         <String, dynamic>{'stringValue': '100', 'intValue': 100, 'targetValue': null},
         <String, dynamic>{'stringValue': '102', 'intValue': 102, 'targetValue': null},
@@ -95,7 +88,27 @@ void _checkConsts(String dillPath, Compiler compiler) {
         <String, dynamic>{'stringValue': 'package', 'intValue':-1, 'targetValue': null},
       ],
       'nonConstantLocations': <dynamic>[],
-    },
+    };
+  if (compiler == Compiler.aot) {
+    expectation['nonConstantLocations'] = <Object?>[];
+  } else {
+    final String fixturesUrl = Platform.isWindows
+      ? '/$fixtures'.replaceAll(Platform.pathSeparator, '/')
+      : fixtures;
+
+    // Without true tree-shaking, there is a non-const reference in a
+    // never-invoked function that will be present in the dill.
+    expectation['nonConstantLocations'] = <Object?>[
+      <String, dynamic>{
+        'file': 'file://$fixturesUrl/pkg/package.dart',
+        'line': 14,
+        'column': 25,
+      },
+    ];
+  }
+  expectInstances(
+    finder.findInstances(),
+    expectation,
     compiler,
   );
 
@@ -125,8 +138,9 @@ void _checkAnnotation(String dillPath, Compiler compiler) {
     annotationClassName: 'StaticIconProvider',
     annotationClassLibraryUri: 'package:const_finder_fixtures/static_icon_provider.dart',
   );
+  final Map<String, dynamic> instances = finder.findInstances();
   expectInstances(
-    finder.findInstances(),
+    instances,
     <String, dynamic>{
       'constantInstances': <Map<String, Object?>>[
         <String, Object?>{
@@ -140,6 +154,8 @@ void _checkAnnotation(String dillPath, Compiler compiler) {
           'targetValue': null,
         },
       ],
+      // TODO(fujino): This should have non-constant locations from the use of
+      // a tear-off, see https://github.com/flutter/flutter/issues/116797
       'nonConstantLocations': <Object?>[],
     },
     compiler,
@@ -212,6 +228,9 @@ void _checkNonConstsWeb(String dillPath, Compiler compiler) {
     className: 'Target',
   );
 
+  final String fixturesUrl = Platform.isWindows
+    ? '/$fixtures'.replaceAll(Platform.pathSeparator, '/')
+    : fixtures;
   expectInstances(
     finder.findInstances(),
     <String, dynamic>{
@@ -225,7 +244,33 @@ void _checkNonConstsWeb(String dillPath, Compiler compiler) {
         <String, dynamic>{'stringValue': '7', 'intValue': 7, 'targetValue': null},
         <String, dynamic>{'stringValue': 'package', 'intValue': -1, 'targetValue': null},
       ],
-      'nonConstantLocations': <dynamic>[]
+      'nonConstantLocations': <dynamic>[
+        <String, dynamic>{
+          'file': 'file://$fixturesUrl/lib/consts_and_non.dart',
+          'line': 14,
+          'column': 26,
+        },
+        <String, dynamic>{
+          'file': 'file://$fixturesUrl/lib/consts_and_non.dart',
+          'line': 16,
+          'column': 26,
+        },
+        <String, dynamic>{
+          'file': 'file://$fixturesUrl/lib/consts_and_non.dart',
+          'line': 16,
+          'column': 41,
+        },
+        <String, dynamic>{
+          'file': 'file://$fixturesUrl/lib/consts_and_non.dart',
+          'line': 17,
+          'column': 26,
+        },
+        <String, dynamic>{
+          'file': 'file://$fixturesUrl/pkg/package.dart',
+          'line': 14,
+          'column': 25,
+        }
+      ],
     },
     compiler,
   );
diff --git a/tools/const_finder/test/fixtures/.dart_tool/package_config.json b/tools/const_finder/test/fixtures/.dart_tool/package_config.json
index 52cc3dac2fe364a44746ec8373fb40ebc6a7110c..b6392ddc92e8ce2befe6c1c5ba3c55b1efe86625 100644
--- a/tools/const_finder/test/fixtures/.dart_tool/package_config.json
+++ b/tools/const_finder/test/fixtures/.dart_tool/package_config.json
@@ -4,12 +4,12 @@
         {
             "name": "const_finder_fixtures",
             "rootUri": "../lib/",
-            "languageVersion": "2.12"
+            "languageVersion": "2.17"
         },
         {
             "name": "const_finder_fixtures_package",
             "rootUri": "../pkg/",
-            "languageVersion": "2.12"
+            "languageVersion": "2.17"
         }
     ]
 }
diff --git a/tools/const_finder/test/fixtures/lib/box.dart b/tools/const_finder/test/fixtures/lib/box.dart
index b9fd42847e513b6c391c6af57d8257f44e0712e2..bc467d14b0f398c8ed48e95257115cf4a49986c6 100644
--- a/tools/const_finder/test/fixtures/lib/box.dart
+++ b/tools/const_finder/test/fixtures/lib/box.dart
@@ -10,8 +10,8 @@
 
 class Box {
   const Box(this.content1, this.content2);
-  final Object? content1;
-  final Object? content2;
+  final Object? content1; // ignore: unreachable_from_main
+  final Object? content2; // ignore: unreachable_from_main
 }
 
 const Box box1_0 = Box(null, null);
diff --git a/tools/const_finder/test/fixtures/lib/static_icon_provider.dart b/tools/const_finder/test/fixtures/lib/static_icon_provider.dart
index ec9121c1c0fc42c03f8a09a3f24228637ebbd250..11840397d889dd174dd97432ca2967199b7669ff 100644
--- a/tools/const_finder/test/fixtures/lib/static_icon_provider.dart
+++ b/tools/const_finder/test/fixtures/lib/static_icon_provider.dart
@@ -7,13 +7,19 @@ import 'target.dart';
 void main() {
   Targets.used1.hit();
   Targets.used2.hit();
+  final Target nonConstUsed3 = helper(Target.new);
+  nonConstUsed3.hit();
+}
+
+Target helper(Target Function(String, int, Target?) tearOff) {
+  return tearOff('from tear-off', 3, null);
 }
 
 @staticIconProvider
 class Targets {
   static const Target used1 = Target('used1', 1, null);
   static const Target used2 = Target('used2', 2, null);
-  static const Target unused1 = Target('unused1', 1, null);
+  static const Target unused1 = Target('unused1', 1, null); // ignore: unreachable_from_main
 }
 
 // const_finder explicitly does not retain constants appearing within a class
diff --git a/tools/const_finder/test/fixtures/lib/target.dart b/tools/const_finder/test/fixtures/lib/target.dart
index c8d7872c4f9395a8854c9e8e932b833a62fb76d6..821dade2971aca78423892349aba185294aeb99d 100644
--- a/tools/const_finder/test/fixtures/lib/target.dart
+++ b/tools/const_finder/test/fixtures/lib/target.dart
@@ -15,8 +15,7 @@ class Target {
 }
 
 class ExtendsTarget extends Target {
-  const ExtendsTarget(String stringValue, int intValue, Target? targetValue)
-      : super(stringValue, intValue, targetValue);
+  const ExtendsTarget(super.stringValue, super.intValue, super.targetValue);
 }
 
 class ImplementsTarget implements Target {
diff --git a/tools/dia_dll.py b/tools/dia_dll.py
index 5438af756f05fa403e262c3e1657829a92f0402d..ed66b42ab1dc27d0f97cd8b71fa6c81460faac65 100644
--- a/tools/dia_dll.py
+++ b/tools/dia_dll.py
@@ -18,9 +18,7 @@ import sys
 
 # Path constants. (All of these should be absolute paths.)
 THIS_DIR = os.path.abspath(os.path.dirname(__file__))
-LLVM_BUILD_DIR = os.path.abspath(
-    os.path.join(THIS_DIR, '..', '..', 'buildtools', 'windows-x64', 'clang')
-)
+LLVM_BUILD_DIR = os.path.abspath(os.path.join(THIS_DIR, '..', 'buildtools', 'windows-x64', 'clang'))
 
 
 def GetDiaDll():
diff --git a/tools/dir_contents_diff/README.md b/tools/dir_contents_diff/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..2eddf23a43f15e147dbab4b0df0796507c2d94ba
--- /dev/null
+++ b/tools/dir_contents_diff/README.md
@@ -0,0 +1,12 @@
+# dir_contents_diff
+
+This tool will compare the contents of a directory to a file that lists the
+contents of the directory, printing out a patch to apply if they differ.
+
+The exit code is 0 if there is no difference.
+
+## Usage
+
+```sh
+dart run ./bin/dir_contents_diff.dart <golden file path> <dir path>
+```
diff --git a/impeller/entity/shaders/blending/advanced_blend_colorburn.frag b/tools/dir_contents_diff/bin/dir_contents_diff.dart
similarity index 53%
rename from impeller/entity/shaders/blending/advanced_blend_colorburn.frag
rename to tools/dir_contents_diff/bin/dir_contents_diff.dart
index 95aac01645999272b8c0fd620c8e6e5528d5a89c..22273291b3a3b4dd200c2a9926bc00c173222514 100644
--- a/impeller/entity/shaders/blending/advanced_blend_colorburn.frag
+++ b/tools/dir_contents_diff/bin/dir_contents_diff.dart
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <impeller/blending.glsl>
+import 'dart:io' show exitCode;
 
-vec3 Blend(vec3 dst, vec3 src) {
-  return IPBlendColorBurn(dst, src);
-}
+import 'package:dir_contents_diff/dir_contents_diff.dart';
 
-#include "advanced_blend.glsl"
+void main(List<String> args) {
+  exitCode = run(args);
+}
diff --git a/tools/dir_contents_diff/lib/dir_contents_diff.dart b/tools/dir_contents_diff/lib/dir_contents_diff.dart
new file mode 100644
index 0000000000000000000000000000000000000000..c9329beaa0b6cc0d674523254644914880a2cd7c
--- /dev/null
+++ b/tools/dir_contents_diff/lib/dir_contents_diff.dart
@@ -0,0 +1,108 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:convert' show utf8;
+import 'dart:io';
+
+String _basename(String path) {
+  return path.split(Platform.pathSeparator).last;
+}
+
+String _generateDirListing(String dirPath) {
+  final Directory dir = Directory(dirPath);
+  final List<FileSystemEntity> entities = dir.listSync();
+  entities.sort(
+      (FileSystemEntity a, FileSystemEntity b) => a.path.compareTo(b.path));
+  return entities
+      .map((FileSystemEntity entity) => _basename(entity.path))
+      .join('\n');
+}
+
+String _strReplaceRange(
+    String inputStr, int start, int end, String replacement) {
+  return inputStr.substring(0, start) + replacement + inputStr.substring(end);
+}
+
+String _redirectPatch(String patch) {
+  final RegExp inputPathExp = RegExp(r'^--- a(.*)', multiLine: true);
+  final RegExp outputPathExp = RegExp(r'^\+\+\+ b(.*)', multiLine: true);
+
+  final Match? inputPathMatch = inputPathExp.firstMatch(patch);
+  final Match? outputPathMatch = outputPathExp.firstMatch(patch);
+
+  assert(inputPathMatch != null);
+  assert(outputPathMatch != null);
+
+  if (inputPathMatch != null && outputPathMatch != null) {
+    return _strReplaceRange(
+      patch,
+      outputPathMatch.start + 5, // +5 to account for '+++ b'
+      outputPathMatch.end,
+      inputPathMatch.group(1)!,
+    );
+  }
+  throw Exception('Unable to find input and output paths');
+}
+
+File _makeTempFile(String prefix) {
+  final Directory systemTempDir = Directory.systemTemp;
+  final String filename = '$prefix-${DateTime.now().millisecondsSinceEpoch}';
+  final String path = '${systemTempDir.path}${Platform.pathSeparator}$filename';
+  final File result = File(path);
+  result.createSync();
+  return result;
+}
+
+/// Run the diff of the contents of a directory at [dirPath] and the contents of
+/// a file at [goldenPath].  Returns 0 if there is no diff. Be aware that the
+/// CWD should be inside of the git repository for the patch to be correct.
+int dirContentsDiff(String goldenPath, String dirPath) {
+  if (!File(goldenPath).existsSync()) {
+    throw Exception('unable to find `$goldenPath`');
+  }
+  if (!Directory(dirPath).existsSync()) {
+    throw Exception('unable to find `$dirPath`');
+  }
+  int result = 0;
+  final File tempFile = _makeTempFile('dir_contents_diff');
+  try {
+    final String dirListing = _generateDirListing(dirPath);
+    tempFile.writeAsStringSync(dirListing);
+    final ProcessResult diffResult = Process.runSync(
+      'git',
+      <String>[
+        'diff',
+        // If you manually edit the golden file, many text editors will add
+        // trailing whitespace. This flag ignores that because honestly it's
+        // not a significant part of this test.
+        '--ignore-space-at-eol',
+        '-p',
+        goldenPath,
+        tempFile.path,
+      ],
+      runInShell: true,
+      stdoutEncoding: utf8,
+    );
+    if (diffResult.exitCode != 0) {
+      print(
+          'Unexpected diff in $goldenPath, use `git apply` with the following patch.\n');
+      print(_redirectPatch(diffResult.stdout as String));
+      result = 1;
+    }
+  } finally {
+    tempFile.deleteSync();
+  }
+
+  return result;
+}
+
+/// The main entrypoint for the program, returns `exitCode`.
+int run(List<String> args) {
+  if (args.length != 2) {
+    throw Exception('usage: <path to golden> <path to directory>');
+  }
+  final String goldenPath = args[0];
+  final String dirPath = args[1];
+  return dirContentsDiff(goldenPath, dirPath);
+}
diff --git a/tools/dir_contents_diff/pubspec.yaml b/tools/dir_contents_diff/pubspec.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..f1f6dd20de430b43373f49d2aaeb3363d78bb744
--- /dev/null
+++ b/tools/dir_contents_diff/pubspec.yaml
@@ -0,0 +1,19 @@
+name: dir_contents_diff
+environment:
+  sdk: '>=3.2.0-0 <4.0.0'
+dev_dependencies:
+  litetest: any
+  path: any
+dependency_overrides:
+  async_helper:
+    path: ../../../third_party/dart/pkg/async_helper
+  expect:
+    path: ../../../third_party/dart/pkg/expect
+  litetest:
+    path: ../../testing/litetest
+  meta:
+    path: ../../../third_party/dart/pkg/meta
+  path:
+    path: ../../../third_party/dart/third_party/pkg/path
+  smith:
+    path: ../../../third_party/dart/pkg/smith
diff --git a/tools/dir_contents_diff/test/dir_contents_diff_test.dart b/tools/dir_contents_diff/test/dir_contents_diff_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..d2ed1c51aef51820ab1745eb93a9096dc5df146e
--- /dev/null
+++ b/tools/dir_contents_diff/test/dir_contents_diff_test.dart
@@ -0,0 +1,80 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io' as io;
+
+import 'package:litetest/litetest.dart';
+import 'package:path/path.dart' as p;
+
+void main() {
+  // Find a path to `dir_contents_diff.dart` from the working directory.
+  final String pkgPath = io.File.fromUri(io.Platform.script).parent.parent.path;
+  final String binPath = p.join(
+    pkgPath,
+    'bin',
+    'dir_contents_diff.dart',
+  );
+
+  // As a sanity check, ensure that the file exists.
+  if (!io.File(binPath).existsSync()) {
+    io.stderr.writeln('Unable to find $binPath');
+    io.exitCode = 1;
+    return;
+  }
+
+  // Runs `../bin/dir_contents_diff.dart` with the given arguments.
+  (int, String) runSync(String goldenPath, String dirPath) {
+    final io.ProcessResult result = io.Process.runSync(
+      io.Platform.resolvedExecutable,
+      <String>[binPath, goldenPath, dirPath],
+    );
+    return (result.exitCode, result.stdout ?? result.stderr);
+  }
+
+  test('lists files and diffs successfully', () {
+    final String goldenPath = p.join(pkgPath, 'test', 'file_ok.txt');
+    final String dirPath = p.join(pkgPath, 'test', 'fixtures');
+    final (int exitCode, String output) = runSync(goldenPath, dirPath);
+    if (exitCode != 0) {
+      io.stderr.writeln('Expected exit code 0, got $exitCode');
+      io.stderr.writeln(output);
+    }
+    expect(exitCode, 0);
+  });
+
+  test('lists files and diffs successfully, even with an EOF newline', () {
+    final String goldenPath = p.join(pkgPath, 'test', 'file_ok_eof_newline.txt');
+    final String dirPath = p.join(pkgPath, 'test', 'fixtures');
+    final (int exitCode, String output) = runSync(goldenPath, dirPath);
+    if (exitCode != 0) {
+      io.stderr.writeln('Expected exit code 0, got $exitCode');
+      io.stderr.writeln(output);
+    }
+    expect(exitCode, 0);
+  });
+
+  test('diff fails when an expected file is missing', () {
+    final String goldenPath = p.join(pkgPath, 'test', 'file_bad_missing.txt');
+    final String dirPath = p.join(pkgPath, 'test', 'fixtures');
+    final (int exitCode, String output) = runSync(goldenPath, dirPath);
+    if (exitCode == 0) {
+      io.stderr.writeln('Expected non-zero exit code, got $exitCode');
+      io.stderr.writeln(output);
+    }
+    expect(exitCode, 1);
+    expect(output, contains('+a.txt'));
+  });
+
+  test('diff fails when an unexpected file is present', () {
+    final String goldenPath = p.join(pkgPath, 'test', 'file_bad_unexpected.txt');
+    final String dirPath = p.join(pkgPath, 'test', 'fixtures');
+    final (int exitCode, String output) = runSync(goldenPath, dirPath);
+    if (exitCode == 0) {
+      io.stderr.writeln('Expected non-zero exit code, got $exitCode');
+      io.stderr.writeln(output);
+    }
+    expect(exitCode, 1);
+    expect(output, contains('-c.txt'));
+  });
+}
diff --git a/tools/dir_contents_diff/test/file_bad_missing.txt b/tools/dir_contents_diff/test/file_bad_missing.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1f482482efa7cc35d1dbab733e23a10c97a9364f
--- /dev/null
+++ b/tools/dir_contents_diff/test/file_bad_missing.txt
@@ -0,0 +1 @@
+b.txt
diff --git a/tools/dir_contents_diff/test/file_bad_unexpected.txt b/tools/dir_contents_diff/test/file_bad_unexpected.txt
new file mode 100644
index 0000000000000000000000000000000000000000..5be9c6d18f7f544630033dd558b310cd9d724f5e
--- /dev/null
+++ b/tools/dir_contents_diff/test/file_bad_unexpected.txt
@@ -0,0 +1,3 @@
+a.txt
+b.txt
+c.txt
diff --git a/tools/dir_contents_diff/test/file_ok.txt b/tools/dir_contents_diff/test/file_ok.txt
new file mode 100644
index 0000000000000000000000000000000000000000..87122ecd89acfab95e5d7b76cb521e404021221e
--- /dev/null
+++ b/tools/dir_contents_diff/test/file_ok.txt
@@ -0,0 +1,2 @@
+a.txt
+b.txt
diff --git a/tools/dir_contents_diff/test/file_ok_eof_newline.txt b/tools/dir_contents_diff/test/file_ok_eof_newline.txt
new file mode 100644
index 0000000000000000000000000000000000000000..87122ecd89acfab95e5d7b76cb521e404021221e
--- /dev/null
+++ b/tools/dir_contents_diff/test/file_ok_eof_newline.txt
@@ -0,0 +1,2 @@
+a.txt
+b.txt
diff --git a/tools/dir_contents_diff/test/fixtures/a.txt b/tools/dir_contents_diff/test/fixtures/a.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0d4f7dd5141cf0de2ddc4aecf2aa62a5370e5941
--- /dev/null
+++ b/tools/dir_contents_diff/test/fixtures/a.txt
@@ -0,0 +1 @@
+Will be referenced by a test.
diff --git a/tools/dir_contents_diff/test/fixtures/b.txt b/tools/dir_contents_diff/test/fixtures/b.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0d4f7dd5141cf0de2ddc4aecf2aa62a5370e5941
--- /dev/null
+++ b/tools/dir_contents_diff/test/fixtures/b.txt
@@ -0,0 +1 @@
+Will be referenced by a test.
diff --git a/tools/download_fuchsia_sdk.py b/tools/download_fuchsia_sdk.py
index 67fe3c772fcf2bf049049b497205affbb2841add..2b1d91d34fb633374de33cab53681952c5d2e40b 100755
--- a/tools/download_fuchsia_sdk.py
+++ b/tools/download_fuchsia_sdk.py
@@ -14,9 +14,7 @@ import shutil
 import subprocess
 import sys
 
-SRC_ROOT = os.path.dirname(
-    os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-)
+SRC_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 FUCHSIA_SDK_DIR = os.path.join(SRC_ROOT, 'fuchsia', 'sdk')
 FLUTTER_DIR = os.path.join(SRC_ROOT, 'flutter')
 
@@ -64,12 +62,10 @@ def DownloadFuchsiaSDKFromGCS(sdk_path, verbose):
       universal_newlines=True,
   )
   if curl_result.returncode == 0 and verbose:
-    print(
-        'curl output:stdout:\n{}\nstderr:\n{}'.format(
-            curl_result.stdout,
-            curl_result.stderr,
-        )
-    )
+    print('curl output:stdout:\n{}\nstderr:\n{}'.format(
+        curl_result.stdout,
+        curl_result.stderr,
+    ))
   elif curl_result.returncode != 0:
     eprint(
         'Failed to download: stdout:\n{}\nstderr:\n{}'.format(
@@ -138,10 +134,7 @@ def Main():
 
   parser.add_argument('--host-os', help='The host os')
 
-  parser.add_argument(
-      '--fuchsia-sdk-path',
-      help='The path in gcs to the fuchsia sdk to download'
-  )
+  parser.add_argument('--fuchsia-sdk-path', help='The path in gcs to the fuchsia sdk to download')
 
   args = parser.parse_args()
   fail_loudly = 1 if args.fail_loudly else 0
diff --git a/tools/engine_tool/README.md b/tools/engine_tool/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..0ab53e048f2eaf7c1d267097d1bfc82bb1d11fd4
--- /dev/null
+++ b/tools/engine_tool/README.md
@@ -0,0 +1,77 @@
+# The Engine Tool
+
+[![Open `e: engine-tool` issues](https://img.shields.io/github/issues/flutter/flutter/e%3A%20engine-tool)](https://github.com/flutter/flutter/issues?q=is%3Aopen+is%3Aissue+label%3A%22e%3A+engine-tool%22)
+
+This is a command line Dart program that automates workflows in the
+`flutter/engine` repository.
+
+> [!NOTE]
+> This tool is under development and is not yet ready for general use. Consider
+> filing a [feature request](https://github.com/flutter/flutter/issues/new?labels=e:%20engine-tool,team-engine).
+
+## Prerequisites
+
+The tool requires an initial `gclient sync -D` as described in the [repo setup
+steps](https://github.com/flutter/flutter/wiki/Setting-up-the-Engine-development-environment#getting-the-source)
+before it will work.
+
+## Status
+
+The tool has the following commands.
+
+- `help` - Prints helpful information about commands and usage.
+- `build` - Builds the Flutter engine.
+- `fetch` - Downloads Flutter engine dependencies.
+- `format` - Formats files in the engine tree using various off-the-shelf
+  formatters.
+- `run` - Runs a flutter application with a local build of the engine.
+- `query builds` - Lists the CI builds described under `ci/builders` that the
+  host platform is capable of executing.
+
+### Missing features
+
+There are currently many missing features. Some overall goals are listed in the
+GitHub issue [here](https://github.com/flutter/flutter/issues/132807). Some
+desirable new features would do the following:
+
+- Add a `doctor` command.
+- Update the engine checkout so that engine developers no longer have to remember
+  to run `gclient sync -D`.
+- Build and test the engine using CI configurations locally, with the
+  possibility to override or add new build options and targets.
+- Build engines using options coming only from the command line.
+- List tests and run them locally, automatically building their dependencies
+  first. Automatically start emulators or simulators if they're needed to run a
+  test.
+- Spawn individual builders remotely using `led` from `depot_tools`.
+- Encapsulate all code formatters, checkers, linters, etc. for all languages.
+- Find a compatible version of the flutter/flutter repo, check it out, and spawn
+  tests from that repo with a locally built engine to run on an emulator,
+  simulator or device.
+- Use a real logging package for prettier terminal output.
+- Wire the tool up to a package providing autocomplete like
+  [cli_completion](https://pub.dev/packages/cli_completion.).
+
+The way the current tooling in the engine repo works may need to be rewritten,
+especially tests spawned by `run_tests.py`, in order to provide this interface.
+
+## Contributing
+
+- Follow the [Flutter style guide](https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo)
+  for Dart code that are relevant outside of the framework repo. It contains
+  conventions that go beyond code formatting, which
+  we'll follow even if using `dart format` in the future.
+- Do not call directly into `dart:io` except from `main.dart`. Instead access
+  the system only through the `Enviroment` object.
+- All commands must have unit tests. If some functionality needs a fake
+  implementation, then write a fake implementation.
+- When adding or changing functionality, update this README.md file.
+- _Begin with the end in mind_ - Start working from what the interface provided
+  by this tool _should_ be, then modify underlying scripts and tools to provide
+  APIs to support that.
+
+Run tests using `//flutter/testing/run_tests.py`:
+
+```shell
+testing/run_tests.py --type dart-host --dart-host-filter flutter/tools/engine_tool
+```
diff --git a/tools/engine_tool/bin/et.dart b/tools/engine_tool/bin/et.dart
new file mode 100644
index 0000000000000000000000000000000000000000..03994fb37224992b6818a77f1aa08104163f0805
--- /dev/null
+++ b/tools/engine_tool/bin/et.dart
@@ -0,0 +1,7 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:engine_tool/main.dart' as m;
+
+void main(List<String> args) => m.main(args);
diff --git a/tools/engine_tool/lib/main.dart b/tools/engine_tool/lib/main.dart
new file mode 100644
index 0000000000000000000000000000000000000000..716571fe74f6fcc6e08a99b3e5290ad288586846
--- /dev/null
+++ b/tools/engine_tool/lib/main.dart
@@ -0,0 +1,77 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:ffi' as ffi show Abi;
+import 'dart:io' as io show Directory, Platform, exitCode, stderr;
+
+import 'package:engine_build_configs/engine_build_configs.dart';
+import 'package:engine_repo_tools/engine_repo_tools.dart';
+import 'package:path/path.dart' as p;
+import 'package:platform/platform.dart';
+import 'package:process_runner/process_runner.dart';
+
+import 'src/commands/command_runner.dart';
+import 'src/environment.dart';
+import 'src/logger.dart';
+
+void main(List<String> args) async {
+  // Find the engine repo.
+  final Engine engine;
+  try {
+    engine = Engine.findWithin(p.dirname(io.Platform.script.toFilePath()));
+  } catch (e) {
+    io.stderr.writeln(e);
+    io.exitCode = 1;
+    return;
+  }
+
+  // Find and parse the engine build configs.
+  final io.Directory buildConfigsDir = io.Directory(p.join(
+    engine.flutterDir.path,
+    'ci',
+    'builders',
+  ));
+  final BuildConfigLoader loader = BuildConfigLoader(
+    buildConfigsDir: buildConfigsDir,
+  );
+
+  // Treat it as an error if no build configs were found. The caller likely
+  // expected to find some.
+  final Map<String, BuilderConfig> configs = loader.configs;
+  if (configs.isEmpty) {
+    io.stderr.writeln(
+      'Error: No build configs found under ${buildConfigsDir.path}',
+    );
+    io.exitCode = 1;
+    return;
+  }
+  if (loader.errors.isNotEmpty) {
+    loader.errors.forEach(io.stderr.writeln);
+    io.exitCode = 1;
+  }
+
+  final Environment environment = Environment(
+    abi: ffi.Abi.current(),
+    engine: engine,
+    platform: const LocalPlatform(),
+    processRunner: ProcessRunner(),
+    logger: Logger(),
+  );
+
+  // Use the Engine and BuildConfig collection to build the CommandRunner.
+  final ToolCommandRunner runner = ToolCommandRunner(
+    environment: environment,
+    configs: configs,
+  );
+
+  try {
+    io.exitCode = await runner.run(args);
+  } on FatalError catch (e, st) {
+    environment.logger.error('FatalError caught in main. Please file a bug\n'
+        'error: $e\n'
+        'stack: $st');
+    io.exitCode = 1;
+  }
+  return;
+}
diff --git a/tools/engine_tool/lib/src/build_utils.dart b/tools/engine_tool/lib/src/build_utils.dart
new file mode 100644
index 0000000000000000000000000000000000000000..0be0e587258d496d3538b369085e4c526986bce3
--- /dev/null
+++ b/tools/engine_tool/lib/src/build_utils.dart
@@ -0,0 +1,127 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io' as io show Directory;
+
+import 'package:engine_build_configs/engine_build_configs.dart';
+import 'package:path/path.dart' as p;
+
+import 'environment.dart';
+import 'logger.dart';
+
+/// A function that returns true or false when given a [BuilderConfig] and its
+/// name.
+typedef ConfigFilter = bool Function(String name, BuilderConfig config);
+
+/// A function that returns true or false when given a [BuilderConfig] name
+/// and a [Build].
+typedef BuildFilter = bool Function(String configName, Build build);
+
+/// Returns a filtered copy of [input] filtering out configs where test
+/// returns false.
+Map<String, BuilderConfig> filterBuilderConfigs(
+    Map<String, BuilderConfig> input, ConfigFilter test) {
+  return <String, BuilderConfig>{
+    for (final MapEntry<String, BuilderConfig> entry in input.entries)
+      if (test(entry.key, entry.value)) entry.key: entry.value,
+  };
+}
+
+/// Returns a copy of [input] filtering out configs that are not runnable
+/// on the current platform.
+Map<String, BuilderConfig> runnableBuilderConfigs(
+    Environment env, Map<String, BuilderConfig> input) {
+  return filterBuilderConfigs(input, (String name, BuilderConfig config) {
+    return config.canRunOn(env.platform);
+  });
+}
+
+/// Returns a List of [Build] that match test.
+List<Build> filterBuilds(Map<String, BuilderConfig> input, BuildFilter test) {
+  return <Build>[
+    for (final MapEntry<String, BuilderConfig> entry in input.entries)
+      for (final Build build in entry.value.builds)
+        if (test(entry.key, build)) build,
+  ];
+}
+
+/// Returns a list of runnable builds.
+List<Build> runnableBuilds(Environment env, Map<String, BuilderConfig> input) {
+  return filterBuilds(input, (String configName, Build build) {
+    return build.canRunOn(env.platform);
+  });
+}
+
+/// Validates the list of builds.
+/// Calls assert.
+void debugCheckBuilds(List<Build> builds) {
+  final Set<String> names = <String>{};
+
+  for (final Build build in builds) {
+    assert(!names.contains(build.name),
+        'More than one build has the name ${build.name}');
+    names.add(build.name);
+  }
+}
+
+/// Build the build target in the environment.
+Future<int> runBuild(
+  Environment environment,
+  Build build, {
+  List<String> extraGnArgs = const <String>[],
+}) async {
+  // If RBE config files aren't in the tree, then disable RBE.
+  final String rbeConfigPath = p.join(
+    environment.engine.srcDir.path,
+    'flutter',
+    'build',
+    'rbe',
+  );
+  final List<String> gnArgs = <String>[
+    ...extraGnArgs,
+    if (!io.Directory(rbeConfigPath).existsSync()) '--no-rbe',
+  ];
+
+  final BuildRunner buildRunner = BuildRunner(
+    platform: environment.platform,
+    processRunner: environment.processRunner,
+    abi: environment.abi,
+    engineSrcDir: environment.engine.srcDir,
+    build: build,
+    extraGnArgs: gnArgs,
+    runTests: false,
+  );
+
+  Spinner? spinner;
+  void handler(RunnerEvent event) {
+    switch (event) {
+      case RunnerStart():
+        environment.logger.status('$event     ', newline: false);
+        spinner = environment.logger.startSpinner();
+      case RunnerProgress(done: true):
+        spinner?.finish();
+        spinner = null;
+        environment.logger.clearLine();
+        environment.logger.status(event);
+      case RunnerProgress(done: false):
+        {
+          spinner?.finish();
+          spinner = null;
+          final String percent = '${event.percent.toStringAsFixed(1)}%';
+          final String fraction = '(${event.completed}/${event.total})';
+          final String prefix = '[${event.name}] $percent $fraction ';
+          final String what = event.what;
+          environment.logger.clearLine();
+          environment.logger.status('$prefix$what', newline: false, fit: true);
+        }
+      default:
+        spinner?.finish();
+        spinner = null;
+        environment.logger.status(event);
+    }
+  }
+
+  final bool buildResult = await buildRunner.run(handler);
+  return buildResult ? 0 : 1;
+}
diff --git a/tools/engine_tool/lib/src/commands/build_command.dart b/tools/engine_tool/lib/src/commands/build_command.dart
new file mode 100644
index 0000000000000000000000000000000000000000..366a831be20693f106be68301a4d21c94441bf07
--- /dev/null
+++ b/tools/engine_tool/lib/src/commands/build_command.dart
@@ -0,0 +1,69 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:engine_build_configs/engine_build_configs.dart';
+
+import '../build_utils.dart';
+import 'command.dart';
+import 'flags.dart';
+
+/// The root 'build' command.
+final class BuildCommand extends CommandBase {
+  /// Constructs the 'build' command.
+  BuildCommand({
+    required super.environment,
+    required Map<String, BuilderConfig> configs,
+  }) {
+    builds = runnableBuilds(environment, configs);
+    debugCheckBuilds(builds);
+    argParser.addOption(
+      configFlag,
+      abbr: 'c',
+      defaultsTo: 'host_debug',
+      help: 'Specify the build config to use',
+      allowed: <String>[
+        for (final Build config in runnableBuilds(environment, configs))
+          config.name,
+      ],
+      allowedHelp: <String, String>{
+        for (final Build config in runnableBuilds(environment, configs))
+          config.name: config.gn.join(' '),
+      },
+    );
+    argParser.addFlag(
+      rbeFlag,
+      defaultsTo: true,
+      help: 'RBE is enabled by default when available. Use --no-rbe to '
+            'disable it.',
+    );
+  }
+
+  /// List of compatible builds.
+  late final List<Build> builds;
+
+  @override
+  String get name => 'build';
+
+  @override
+  String get description => 'Builds the engine';
+
+  @override
+  Future<int> run() async {
+    final String configName = argResults![configFlag] as String;
+    final bool useRbe = argResults![rbeFlag] as bool;
+    final Build? build =
+        builds.where((Build build) => build.name == configName).firstOrNull;
+    if (build == null) {
+      environment.logger.error('Could not find config $configName');
+      return 1;
+    }
+
+    final List<String> extraGnArgs = <String>[
+      if (!useRbe) '--no-rbe',
+    ];
+
+    // TODO(loic-sharma): Fetch dependencies if needed.
+    return runBuild(environment, build, extraGnArgs: extraGnArgs);
+  }
+}
diff --git a/tools/engine_tool/lib/src/commands/command.dart b/tools/engine_tool/lib/src/commands/command.dart
new file mode 100644
index 0000000000000000000000000000000000000000..3e61ff388e4a195c787ac19fc14ad53b5afaae2b
--- /dev/null
+++ b/tools/engine_tool/lib/src/commands/command.dart
@@ -0,0 +1,18 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:args/command_runner.dart';
+
+import '../environment.dart';
+
+/// The base class that all commands and subcommands should inherit from.
+abstract base class CommandBase extends Command<int> {
+  /// Constructs the base command.
+  CommandBase({
+    required this.environment
+  });
+
+  /// The host system environment.
+  final Environment environment;
+}
diff --git a/tools/engine_tool/lib/src/commands/command_runner.dart b/tools/engine_tool/lib/src/commands/command_runner.dart
new file mode 100644
index 0000000000000000000000000000000000000000..cf4bc92f83d54d799a02ba484540ca7b741f6ea1
--- /dev/null
+++ b/tools/engine_tool/lib/src/commands/command_runner.dart
@@ -0,0 +1,72 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:args/command_runner.dart';
+import 'package:engine_build_configs/engine_build_configs.dart';
+
+import '../environment.dart';
+import 'build_command.dart';
+import 'fetch_command.dart';
+import 'flags.dart';
+import 'format_command.dart';
+import 'lint_command.dart';
+import 'query_command.dart';
+import 'run_command.dart';
+
+const int _usageLineLength = 80;
+
+/// The root command runner.
+final class ToolCommandRunner extends CommandRunner<int> {
+  /// Constructs the runner and populates commands, subcommands, and global
+  /// options and flags.
+  ToolCommandRunner({
+    required this.environment,
+    required this.configs,
+  }) : super(toolName, toolDescription, usageLineLength: _usageLineLength) {
+    final List<Command<int>> commands = <Command<int>>[
+      FetchCommand(environment: environment),
+      FormatCommand(environment: environment),
+      QueryCommand(environment: environment, configs: configs),
+      BuildCommand(environment: environment, configs: configs),
+      RunCommand(environment: environment, configs: configs),
+      LintCommand(environment: environment),
+    ];
+    commands.forEach(addCommand);
+
+    argParser.addFlag(
+      verboseFlag,
+      abbr: 'v',
+      help: 'Prints verbose output',
+      negatable: false,
+    );
+  }
+
+  /// The name of the tool as reported in the tool's usage and help
+  /// messages.
+  static const String toolName = 'et';
+
+  /// The description of the tool reported in the tool's usage and help
+  /// messages.
+  static const String toolDescription = 'A command line tool for working on '
+      'the Flutter Engine.';
+
+  /// The host system environment.
+  final Environment environment;
+
+  /// Build configurations loaded from the engine from under ci/builders.
+  final Map<String, BuilderConfig> configs;
+
+  @override
+  Future<int> run(Iterable<String> args) async {
+    try {
+      return await runCommand(parse(args)) ?? 0;
+    } on FormatException catch (e) {
+      environment.logger.error(e);
+      return 1;
+    } on UsageException catch (e) {
+      environment.logger.error(e);
+      return 1;
+    }
+  }
+}
diff --git a/tools/engine_tool/lib/src/commands/fetch_command.dart b/tools/engine_tool/lib/src/commands/fetch_command.dart
new file mode 100644
index 0000000000000000000000000000000000000000..7cdfd0cd6580aadfbc4f5407adfbb04d8198008c
--- /dev/null
+++ b/tools/engine_tool/lib/src/commands/fetch_command.dart
@@ -0,0 +1,30 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import '../dependencies.dart';
+import 'command.dart';
+import 'flags.dart';
+
+/// The root 'fetch' command.
+final class FetchCommand extends CommandBase {
+  /// Constructs the 'fetch' command.
+  FetchCommand({
+    required super.environment,
+  });
+
+  @override
+  String get name => 'fetch';
+
+  @override
+  String get description => "Download the Flutter engine's dependencies";
+
+  @override
+  List<String> get aliases => const <String>['sync'];
+
+  @override
+  Future<int> run() {
+    final bool verbose = globalResults![verboseFlag] as bool;
+    return fetchDependencies(environment, verbose: verbose);
+  }
+}
diff --git a/tools/engine_tool/lib/src/commands/flags.dart b/tools/engine_tool/lib/src/commands/flags.dart
new file mode 100644
index 0000000000000000000000000000000000000000..6d13847bd2cf4339ba4a08c4d034744ea3ce1e2d
--- /dev/null
+++ b/tools/engine_tool/lib/src/commands/flags.dart
@@ -0,0 +1,21 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// ignore_for_file: public_member_api_docs
+
+// The purpose of this list of flags in a file separate from the command
+// definitions is to ensure that flags are named consistently across
+// subcommands. For example, unless there's a compelling reason to have both,
+// we'd avoid having one subcommand define an --all flag while another defines
+// an --everything flag.
+
+// Keep this list alphabetized.
+const String allFlag = 'all';
+const String builderFlag = 'builder';
+const String configFlag = 'config';
+const String dryRunFlag = 'dry-run';
+const String quietFlag = 'quiet';
+const String rbeFlag = 'rbe';
+const String runTestsFlag = 'run-tests';
+const String verboseFlag = 'verbose';
diff --git a/tools/engine_tool/lib/src/commands/format_command.dart b/tools/engine_tool/lib/src/commands/format_command.dart
new file mode 100644
index 0000000000000000000000000000000000000000..aefb91becb8d1049b9f571a7da2e90b89378e54b
--- /dev/null
+++ b/tools/engine_tool/lib/src/commands/format_command.dart
@@ -0,0 +1,159 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io' as io;
+
+import 'package:path/path.dart' as p;
+
+import '../logger.dart';
+import 'command.dart';
+import 'flags.dart';
+
+/// The 'format' command.
+///
+/// The format command implementation below works by spawning another Dart VM to
+/// run the program under ci/bin/format.dart.
+///
+// TODO(team-engine): Part of https://github.com/flutter/flutter/issues/132807.
+// Instead, format.dart should be moved under the engine_tool package and
+// invoked by a function call. The file ci/bin/format.dart should be split up so
+// that each of its `FormatCheckers` is in a separate file under src/formatters,
+// and they should be unit-tested.
+final class FormatCommand extends CommandBase {
+  // ignore: public_member_api_docs
+  FormatCommand({
+    required super.environment,
+  }) {
+    argParser
+      ..addFlag(
+        allFlag,
+        abbr: 'a',
+        help: 'By default only dirty files are checked. This flag causes all '
+              'files to be checked. (Slow)',
+        negatable: false,
+      )
+      ..addFlag(
+        dryRunFlag,
+        abbr: 'd',
+        help: 'Do not fix formatting in-place. Instead, print file diffs to '
+              'the logs.',
+        negatable: false,
+      )
+      ..addFlag(
+        quietFlag,
+        abbr: 'q',
+        help: 'Silences all log messages except for errors and warnings',
+        negatable: false,
+      );
+  }
+
+  @override
+  String get name => 'format';
+
+  @override
+  String get description => 'Formats files using standard formatters and styles.';
+
+  @override
+  Future<int> run() async {
+    final bool all = argResults![allFlag]! as bool;
+    final bool dryRun = argResults![dryRunFlag]! as bool;
+    final bool quiet = argResults![quietFlag]! as bool;
+    final bool verbose = globalResults![verboseFlag] as bool;
+    final String formatPath = p.join(
+      environment.engine.flutterDir.path, 'ci', 'bin', 'format.dart',
+    );
+
+    final io.Process process = await environment.processRunner.processManager.start(
+      <String>[
+        environment.platform.resolvedExecutable,
+        formatPath,
+        if (all) '--all-files',
+        if (!dryRun) '--fix',
+        if (verbose) '--verbose',
+      ],
+      workingDirectory: environment.engine.flutterDir.path,
+    );
+    final Completer<void> stdoutComplete = Completer<void>();
+    final Completer<void> stderrComplete = Completer<void>();
+
+    final _FormatStreamer streamer = _FormatStreamer(
+      environment.logger,
+      dryRun,
+      quiet,
+    );
+    process.stdout
+      .transform<String>(const Utf8Decoder())
+      .transform(const LineSplitter())
+      .listen(
+        streamer.nextStdout,
+        onDone: () async => stdoutComplete.complete(),
+      );
+    process.stderr
+      .transform<String>(const Utf8Decoder())
+      .transform(const LineSplitter())
+      .listen(
+        streamer.nextStderr,
+        onDone: () async => stderrComplete.complete(),
+      );
+
+    await Future.wait<void>(<Future<void>>[
+      stdoutComplete.future, stderrComplete.future,
+    ]);
+    final int exitCode = await process.exitCode;
+
+    return exitCode;
+  }
+}
+
+class _FormatStreamer {
+  _FormatStreamer(this.logger, this.dryRun, this.quiet);
+
+  final Logger logger;
+  final bool dryRun;
+  final bool quiet;
+
+  bool inADiff = false;
+  bool inProgress = false;
+
+  void nextStdout(String line) {
+    if (quiet) {
+      return;
+    }
+    final String l = line.trim();
+    if (l == 'To fix, run `et format` or:') {
+      inADiff = true;
+    }
+    if (l.isNotEmpty && (!inADiff || dryRun)) {
+      if (_isProgressLine(l)) {
+        inProgress = true;
+        logger.clearLine();
+        logger.status('$l\r', newline: false);
+      } else {
+        if (inProgress) {
+          logger.clearLine();
+          inProgress = false;
+        }
+        logger.status(l);
+      }
+    }
+    if (l == 'DONE') {
+      inADiff = false;
+    }
+  }
+
+  void nextStderr(String line) {
+    final String l = line.trim();
+    if (l.isEmpty) {
+      return;
+    }
+    logger.error(l);
+  }
+
+  bool _isProgressLine(String l) {
+    final List<String> words = l.split(',');
+    return words.isNotEmpty && words[0].endsWith('% done');
+  }
+}
diff --git a/tools/engine_tool/lib/src/commands/lint_command.dart b/tools/engine_tool/lib/src/commands/lint_command.dart
new file mode 100644
index 0000000000000000000000000000000000000000..1fa9907f0fc34e8f773fda25b02175cd668bda07
--- /dev/null
+++ b/tools/engine_tool/lib/src/commands/lint_command.dart
@@ -0,0 +1,226 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io' show Directory;
+import 'dart:math';
+
+import 'package:path/path.dart' as p;
+
+import '../dart_utils.dart';
+import '../environment.dart';
+import '../logger.dart';
+import '../proc_utils.dart';
+import '../worker_pool.dart';
+import 'command.dart';
+import 'flags.dart';
+
+/// The different kind of linters we support.
+enum Linter {
+  /// Dart linter
+  dart,
+
+  /// Java linter
+  java,
+
+  /// C/C++ linter
+  c,
+
+  /// Python linter
+  python
+}
+
+class _LinterDescription {
+  _LinterDescription(this.linter, this.cwd, this.command);
+
+  final Linter linter;
+  final Directory cwd;
+  final List<String> command;
+}
+
+/// The root 'lint' command.
+final class LintCommand extends CommandBase {
+  /// Constructs the 'lint' command.
+  LintCommand({
+    required super.environment,
+  }) {
+    final String engineFlutterPath = environment.engine.flutterDir.path;
+    _linters[Linter.dart] = _LinterDescription(
+        Linter.dart, environment.engine.flutterDir, <String>[
+      p.join(engineFlutterPath, 'ci', 'analyze.sh'),
+      findDartBinDirectory(environment)
+    ]);
+    _linters[Linter.java] =
+        _LinterDescription(Linter.java, environment.engine.flutterDir, <String>[
+      findDartBinary(environment), '--disable-dart-dev',
+      p.join(engineFlutterPath, 'tools', 'android_lint', 'bin', 'main.dart'),
+    ]);
+    _linters[Linter.c] = _LinterDescription(
+        Linter.c,
+        environment.engine.flutterDir,
+        <String>[p.join(engineFlutterPath, 'ci', 'clang_tidy.sh')]);
+    _linters[Linter.python] = _LinterDescription(
+        Linter.python,
+        environment.engine.flutterDir,
+        <String>[p.join(engineFlutterPath, 'ci', 'pylint.sh')]);
+    argParser.addFlag(
+      quietFlag,
+      abbr: 'q',
+      help: 'Prints minimal output',
+    );
+  }
+
+  final Map<Linter, _LinterDescription> _linters =
+      <Linter, _LinterDescription>{};
+
+  @override
+  String get name => 'lint';
+
+  @override
+  String get description => 'Lint the engine repository.';
+
+  @override
+  Future<int> run() async {
+    // TODO(loic-sharma): Relax this restriction.
+    if (environment.platform.isWindows) {
+      environment.logger
+          .fatal('lint command is not supported on Windows (for now).');
+      return 1;
+    }
+    final WorkerPool wp =
+        WorkerPool(environment, ProcessTaskProgressReporter(environment));
+
+    final Set<ProcessTask> tasks = <ProcessTask>{};
+    for (final MapEntry<Linter, _LinterDescription> entry in _linters.entries) {
+      tasks.add(ProcessTask(
+          entry.key.name, environment, entry.value.cwd, entry.value.command));
+    }
+    final bool r = await wp.run(tasks);
+
+    final bool quiet = argResults![quietFlag] as bool;
+    if (!quiet) {
+      environment.logger.status('\nDumping failure logs\n');
+      for (final ProcessTask pt in tasks) {
+        final ProcessArtifacts pa = pt.processArtifacts;
+        if (pa.exitCode == 0) {
+          continue;
+        }
+        environment.logger.status('Linter ${pt.name} found issues:');
+        environment.logger.status('${pa.stdout}\n');
+        environment.logger.status('${pa.stderr}\n');
+      }
+    }
+    return r ? 0 : 1;
+  }
+}
+
+/// A WorkerPoolProgressReporter designed to work with ProcessTasks.
+class ProcessTaskProgressReporter implements WorkerPoolProgressReporter {
+  /// Construct a new reporter.
+  ProcessTaskProgressReporter(this._environment);
+
+  final Environment _environment;
+  Spinner? _spinner;
+  bool _finished = false;
+  int _longestName = 0;
+
+  @override
+  void onRun(Set<WorkerTask> tasks) {
+    for (final WorkerTask task in tasks) {
+      _longestName = max(_longestName, task.name.length);
+    }
+  }
+
+  @override
+  void onFinish() {
+    _finished = true;
+    _updateSpinner(<ProcessTask>[]);
+  }
+
+  List<ProcessTask> _makeProcessTaskList(WorkerPool pool) {
+    final List<ProcessTask> runningTasks = <ProcessTask>[];
+    for (final WorkerTask task in pool.running) {
+      if (task is! ProcessTask) {
+        continue;
+      }
+      runningTasks.add(task);
+    }
+    return runningTasks;
+  }
+
+  @override
+  void onTaskStart(WorkerPool pool, WorkerTask task) {
+    final List<ProcessTask> running = _makeProcessTaskList(pool);
+    _updateSpinner(running);
+  }
+
+  @override
+  void onTaskDone(WorkerPool pool, WorkerTask task, [Object? err]) {
+    final List<ProcessTask> running = _makeProcessTaskList(pool);
+    task as ProcessTask;
+    final ProcessArtifacts pa = task.processArtifacts;
+    final String dt = _formatDurationShort(task.runTime);
+    if (pa.exitCode != 0) {
+      final String paPath = task.processArtifactsPath;
+      _environment.logger.clearLine();
+      _environment.logger.status(
+          'FAIL: ${task.name.padLeft(_longestName)} after $dt [details in $paPath]');
+    } else {
+      _environment.logger.clearLine();
+      _environment.logger
+          .status('OKAY: ${task.name.padLeft(_longestName)} after $dt');
+    }
+    _updateSpinner(running);
+  }
+
+  void _updateSpinner(List<ProcessTask> tasks) {
+    if (_spinner != null) {
+      _spinner!.finish();
+      _spinner = null;
+    }
+    if (_finished) {
+      return;
+    }
+    _environment.logger.clearLine();
+    String runStatus = '[';
+    for (final ProcessTask pt in tasks) {
+      if (runStatus != '[') {
+        runStatus += ' ';
+      }
+      runStatus += pt.name;
+    }
+    if (tasks.isNotEmpty) {
+      runStatus += '...';
+    }
+    runStatus += ']  ';
+    _environment.logger.status('Linting $runStatus', newline: false);
+    _spinner = _environment.logger.startSpinner();
+  }
+}
+
+String _formatDurationShort(Duration dur) {
+  int micros = dur.inMicroseconds;
+  String r = '';
+  if (micros >= Duration.microsecondsPerMinute) {
+    final int minutes = micros ~/ Duration.microsecondsPerMinute;
+    micros -= minutes * Duration.microsecondsPerMinute;
+    r += '${minutes}m';
+  }
+  if (micros >= Duration.microsecondsPerSecond) {
+    final int seconds = micros ~/ Duration.microsecondsPerSecond;
+    micros -= seconds * Duration.microsecondsPerSecond;
+    if (r.isNotEmpty) {
+      r += '.';
+    }
+    r += '${seconds}s';
+  }
+  if (micros >= Duration.microsecondsPerMillisecond) {
+    final int millis = micros ~/ Duration.microsecondsPerMillisecond;
+    micros -= millis * Duration.microsecondsPerMillisecond;
+    if (r.isNotEmpty) {
+      r += '.';
+    }
+    r += '${millis}ms';
+  }
+  return r;
+}
diff --git a/tools/engine_tool/lib/src/commands/query_command.dart b/tools/engine_tool/lib/src/commands/query_command.dart
new file mode 100644
index 0000000000000000000000000000000000000000..b70ee43ae89893ab9289e7b4ba985d90b8049e50
--- /dev/null
+++ b/tools/engine_tool/lib/src/commands/query_command.dart
@@ -0,0 +1,122 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:engine_build_configs/engine_build_configs.dart';
+
+import 'command.dart';
+import 'flags.dart';
+
+// ignore: public_member_api_docs
+final class QueryCommand extends CommandBase {
+  // ignore: public_member_api_docs
+  QueryCommand({
+    required super.environment,
+    required this.configs,
+  }) {
+    // Add options here that are common to all queries.
+    argParser
+      ..addFlag(
+        allFlag,
+        abbr: 'a',
+        help: 'List all results, even when not relevant on this platform',
+        negatable: false,
+      )
+      ..addOption(
+        builderFlag,
+        abbr: 'b',
+        help: 'Restrict the query to a single builder.',
+        allowed: <String>[
+          for (final MapEntry<String, BuilderConfig> entry in configs.entries)
+            if (entry.value.canRunOn(environment.platform)) entry.key,
+        ],
+        allowedHelp: <String, String>{
+          // TODO(zanderso): Add human readable descriptions to the json files.
+          for (final MapEntry<String, BuilderConfig> entry in configs.entries)
+            if (entry.value.canRunOn(environment.platform))
+              entry.key: entry.value.path,
+        },
+      );
+
+    addSubcommand(QueryBuildersCommand(
+      environment: environment,
+      configs: configs,
+    ));
+  }
+
+  /// Build configurations loaded from the engine from under ci/builders.
+  final Map<String, BuilderConfig> configs;
+
+  @override
+  String get name => 'query';
+
+  @override
+  String get description => 'Provides information about build configurations '
+      'and tests.';
+}
+
+/// The 'query builds' command.
+final class QueryBuildersCommand extends CommandBase {
+  /// Constructs the 'query build' command.
+  QueryBuildersCommand({
+    required super.environment,
+    required this.configs,
+  });
+
+  /// Build configurations loaded from the engine from under ci/builders.
+  final Map<String, BuilderConfig> configs;
+
+  @override
+  String get name => 'builders';
+
+  @override
+  String get description => 'Provides information about CI builder '
+      'configurations';
+
+  @override
+  Future<int> run() async {
+    // Loop through all configs, and log those that are compatible with the
+    // current platform.
+    final bool all = parent!.argResults![allFlag]! as bool;
+    final String? builderName = parent!.argResults![builderFlag] as String?;
+    final bool verbose = globalResults![verboseFlag]! as bool;
+    if (!verbose) {
+      environment.logger.status(
+        'Add --verbose to see detailed information about each builder',
+      );
+      environment.logger.status('');
+    }
+    for (final String key in configs.keys) {
+      if (builderName != null && key != builderName) {
+        continue;
+      }
+
+      final BuilderConfig config = configs[key]!;
+      if (!config.canRunOn(environment.platform) && !all) {
+        continue;
+      }
+
+      environment.logger.status('"$key" builder:');
+      for (final Build build in config.builds) {
+        if (!build.canRunOn(environment.platform) && !all) {
+          continue;
+        }
+        environment.logger.status('"${build.name}" config', indent: 3);
+        if (!verbose) {
+          continue;
+        }
+        environment.logger.status('gn flags:', indent: 6);
+        for (final String flag in build.gn) {
+          environment.logger.status(flag, indent: 9);
+        }
+        if (build.ninja.targets.isNotEmpty) {
+          environment.logger.status('ninja targets:', indent: 6);
+          for (final String target in build.ninja.targets) {
+            environment.logger.status(target, indent: 9);
+          }
+        }
+      }
+    }
+    return 0;
+  }
+}
diff --git a/tools/engine_tool/lib/src/commands/run_command.dart b/tools/engine_tool/lib/src/commands/run_command.dart
new file mode 100644
index 0000000000000000000000000000000000000000..3976aef6f769f194d4b66d280c7e6a87cf0d6d98
--- /dev/null
+++ b/tools/engine_tool/lib/src/commands/run_command.dart
@@ -0,0 +1,190 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io' show ProcessStartMode;
+
+import 'package:engine_build_configs/engine_build_configs.dart';
+import 'package:process_runner/process_runner.dart';
+
+import '../build_utils.dart';
+import '../run_utils.dart';
+import 'command.dart';
+import 'flags.dart';
+
+/// The root 'run' command.
+final class RunCommand extends CommandBase {
+  /// Constructs the 'run' command.
+  RunCommand({
+    required super.environment,
+    required Map<String, BuilderConfig> configs,
+  }) {
+    builds = runnableBuilds(environment, configs);
+    debugCheckBuilds(builds);
+
+    argParser.addOption(
+      configFlag,
+      abbr: 'c',
+      defaultsTo: '',
+      help:
+          'Specify the build config to use for the target build (usually auto detected)',
+      allowed: <String>[
+        for (final Build build in runnableBuilds(environment, configs))
+          build.name,
+      ],
+      allowedHelp: <String, String>{
+        for (final Build build in runnableBuilds(environment, configs))
+          build.name: build.gn.join(' '),
+      },
+    );
+    argParser.addFlag(
+      rbeFlag,
+      defaultsTo: true,
+      help: 'RBE is enabled by default when available. Use --no-rbe to '
+            'disable it.',
+    );
+  }
+
+  /// List of compatible builds.
+  late final List<Build> builds;
+
+  @override
+  String get name => 'run';
+
+  @override
+  String get description => 'Run a Flutter app with a local engine build. '
+      'All arguments after -- are forwarded to flutter run, e.g.: '
+      'et run -- --profile '
+      'et run -- -d macos '
+      'See `flutter run --help` for a listing';
+
+  Build? _lookup(String configName) {
+    return builds.where((Build build) => build.name == configName).firstOrNull;
+  }
+
+  Build? _findHostBuild(Build? targetBuild) {
+    if (targetBuild == null) {
+      return null;
+    }
+
+    final String name = targetBuild.name;
+    if (name.startsWith('host_')) {
+      return targetBuild;
+    }
+    // TODO(johnmccutchan): This is brittle, it would be better if we encoded
+    // the host config name in the target config.
+    if (name.contains('_debug')) {
+      return _lookup('host_debug');
+    } else if (name.contains('_profile')) {
+      return _lookup('host_profile');
+    } else if (name.contains('_release')) {
+      return _lookup('host_release');
+    }
+    return null;
+  }
+
+  String _getDeviceId() {
+    if (argResults!.rest.contains('-d')) {
+      final int index = argResults!.rest.indexOf('-d') + 1;
+      if (index < argResults!.rest.length) {
+        return argResults!.rest[index];
+      }
+    }
+    if (argResults!.rest.contains('--device-id')) {
+      final int index = argResults!.rest.indexOf('--device-id') + 1;
+      if (index < argResults!.rest.length) {
+        return argResults!.rest[index];
+      }
+    }
+    return '';
+  }
+
+  String _getMode() {
+    // Sniff the build mode from the args that will be passed to flutter run.
+    String mode = 'debug';
+    if (argResults!.rest.contains('--profile')) {
+      mode = 'profile';
+    } else if (argResults!.rest.contains('--release')) {
+      mode = 'release';
+    }
+    return mode;
+  }
+
+  Future<String?> _selectTargetConfig() async {
+    final String configName = argResults![configFlag] as String;
+    if (configName.isNotEmpty) {
+      return configName;
+    }
+    final String deviceId = _getDeviceId();
+    final RunTarget? target =
+        await detectAndSelectRunTarget(environment, deviceId);
+    if (target == null) {
+      return 'host_debug';
+    }
+    environment.logger.status(
+        'Building to run on "${target.name}" running ${target.targetPlatform}');
+    return target.buildConfigFor(_getMode());
+  }
+
+  @override
+  Future<int> run() async {
+    if (!environment.processRunner.processManager.canRun('flutter')) {
+      environment.logger.error('Cannot find the flutter command in your path');
+      return 1;
+    }
+    final String? configName = await _selectTargetConfig();
+    if (configName == null) {
+      environment.logger.error('Could not find target config');
+      return 1;
+    }
+    final Build? build = _lookup(configName);
+    final Build? hostBuild = _findHostBuild(build);
+    if (build == null) {
+      environment.logger.error('Could not find build $configName');
+      return 1;
+    }
+    if (hostBuild == null) {
+      environment.logger.error('Could not find host build for $configName');
+      return 1;
+    }
+
+    final bool useRbe = argResults![rbeFlag] as bool;
+    final List<String> extraGnArgs = <String>[
+      if (!useRbe) '--no-rbe',
+    ];
+
+    // First build the host.
+    int r = await runBuild(environment, hostBuild, extraGnArgs: extraGnArgs);
+    if (r != 0) {
+      return r;
+    }
+
+    // Now build the target if it isn't the same.
+    if (hostBuild.name != build.name) {
+      r = await runBuild(environment, build, extraGnArgs: extraGnArgs);
+      if (r != 0) {
+        return r;
+      }
+    }
+
+    // TODO(johnmccutchan): Be smart and if the user requested a profile
+    // config, add the '--profile' flag when invoking flutter run.
+    final ProcessRunnerResult result =
+        await environment.processRunner.runProcess(
+      <String>[
+        'flutter',
+        'run',
+        '--local-engine-src-path',
+        environment.engine.srcDir.path,
+        '--local-engine',
+        build.name,
+        '--local-engine-host',
+        hostBuild.name,
+        ...argResults!.rest,
+      ],
+      runInShell: true,
+      startMode: ProcessStartMode.inheritStdio,
+    );
+    return result.exitCode;
+  }
+}
diff --git a/tools/engine_tool/lib/src/dart_utils.dart b/tools/engine_tool/lib/src/dart_utils.dart
new file mode 100644
index 0000000000000000000000000000000000000000..86a09acfd8da101f342664691ac7bbb8324f5bfe
--- /dev/null
+++ b/tools/engine_tool/lib/src/dart_utils.dart
@@ -0,0 +1,16 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:path/path.dart' as p;
+import 'environment.dart';
+
+/// Returns a dart-sdk/bin directory path that is compatible with the host.
+String findDartBinDirectory(Environment env) {
+  return p.dirname(env.platform.resolvedExecutable);
+}
+
+/// Returns a dart-sdk/bin/dart file pthat that is executable on the host.
+String findDartBinary(Environment env) {
+  return p.join(findDartBinDirectory(env), 'dart');
+}
diff --git a/tools/engine_tool/lib/src/dependencies.dart b/tools/engine_tool/lib/src/dependencies.dart
new file mode 100644
index 0000000000000000000000000000000000000000..28bc2c9d7a31eae30d092f54550e4fbc98538a9e
--- /dev/null
+++ b/tools/engine_tool/lib/src/dependencies.dart
@@ -0,0 +1,57 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io' as io;
+
+import 'package:process_runner/process_runner.dart';
+
+import 'environment.dart';
+import 'logger.dart';
+
+/// Update Flutter engine dependencies. Returns an exit code.
+Future<int> fetchDependencies(
+  Environment environment, {
+  bool verbose = false,
+}) async {
+  if (!environment.processRunner.processManager.canRun('gclient')) {
+    environment.logger.error('Cannot find the gclient command in your path');
+    return 1;
+  }
+
+  environment.logger.status('Fetching dependencies... ', newline: verbose);
+
+  Spinner? spinner;
+  ProcessRunnerResult result;
+  try {
+    if (!verbose) {
+      spinner = environment.logger.startSpinner();
+    }
+
+    result = await environment.processRunner.runProcess(
+      <String>[
+        'gclient',
+        'sync',
+        '-D',
+      ],
+      runInShell: true,
+      startMode: verbose
+        ? io.ProcessStartMode.inheritStdio
+        : io.ProcessStartMode.normal,
+    );
+  } finally {
+    spinner?.finish();
+  }
+
+  if (result.exitCode != 0) {
+    environment.logger.error('Fetching dependencies failed.');
+
+    // Verbose mode already logged output by making the child process inherit
+    // this process's stdio handles.
+    if (!verbose) {
+      environment.logger.error('Output:\n${result.output}');
+    }
+  }
+
+  return result.exitCode;
+}
diff --git a/tools/engine_tool/lib/src/environment.dart b/tools/engine_tool/lib/src/environment.dart
new file mode 100644
index 0000000000000000000000000000000000000000..dfe40e501c4ac622a1f6e318c4db777d26867d17
--- /dev/null
+++ b/tools/engine_tool/lib/src/environment.dart
@@ -0,0 +1,43 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:ffi' as ffi show Abi;
+
+import 'package:engine_repo_tools/engine_repo_tools.dart';
+import 'package:platform/platform.dart';
+import 'package:process_runner/process_runner.dart';
+
+import 'logger.dart';
+
+/// This class encapsulates information about the host system.
+///
+/// Rather than being written directly against `dart:io`, implementations in the
+/// tool should only access the system by way of the abstractions in this class.
+/// This is so that unit tests can be hermetic by providing fake
+/// implementations.
+final class Environment {
+  /// Constructs the environment.
+  Environment({
+    required this.abi,
+    required this.engine,
+    required this.logger,
+    required this.platform,
+    required this.processRunner,
+  });
+
+  /// The host OS and architecture that the tool is running on.
+  final ffi.Abi abi;
+
+  /// Information about paths in the engine repo.
+  final Engine engine;
+
+  /// Where log messages are written.
+  final Logger logger;
+
+  /// More detailed information about the host platform.
+  final Platform platform;
+
+  /// Facility for commands to run subprocesses.
+  final ProcessRunner processRunner;
+}
diff --git a/tools/engine_tool/lib/src/json_utils.dart b/tools/engine_tool/lib/src/json_utils.dart
new file mode 100644
index 0000000000000000000000000000000000000000..07cc42ca218e17e5be9e5147e80db24b10d23229
--- /dev/null
+++ b/tools/engine_tool/lib/src/json_utils.dart
@@ -0,0 +1,86 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:convert';
+
+void _appendTypeError(
+  Map<String, Object?> map,
+  String field,
+  String expected,
+  List<String> errors, {
+  Object? element,
+}) {
+  if (element == null) {
+    final Type actual = map[field]!.runtimeType;
+    errors.add(
+      'For field "$field", expected type: $expected, actual type: $actual.',
+    );
+  } else {
+    final Type actual = element.runtimeType;
+    errors.add(
+      'For element "$element" of "$field", '
+      'expected type: $expected, actual type: $actual',
+    );
+  }
+}
+
+/// Type safe getter of a List<String> field from map.
+List<String>? stringListOfJson(
+  Map<String, Object?> map,
+  String field,
+  List<String> errors,
+) {
+  if (map[field] == null) {
+    return <String>[];
+  }
+  if (map[field]! is! List<Object?>) {
+    _appendTypeError(map, field, 'list', errors);
+    return null;
+  }
+  for (final Object? obj in map[field]! as List<Object?>) {
+    if (obj is! String) {
+      _appendTypeError(map, field, element: obj, 'string', errors);
+      return null;
+    }
+  }
+  return (map[field]! as List<Object?>).cast<String>();
+}
+
+/// Type safe getter of a String field from map.
+String? stringOfJson(
+  Map<String, Object?> map,
+  String field,
+  List<String> errors,
+) {
+  if (map[field] == null) {
+    return '<undef>';
+  }
+  if (map[field]! is! String) {
+    _appendTypeError(map, field, 'string', errors);
+    return null;
+  }
+  return map[field]! as String;
+}
+
+/// Type safe getter of an int field from map.
+int? intOfJson(
+  Map<String, Object?> map,
+  String field,
+  List<String> errors, {
+  int fallback = 0,
+}) {
+  if (map[field] == null) {
+    return fallback;
+  }
+  if (map[field]! is! int) {
+    _appendTypeError(map, field, 'int', errors);
+    return null;
+  }
+  return map[field]! as int;
+}
+
+const JsonEncoder _jsonEncoder = JsonEncoder.withIndent('    ');
+
+/// Same as [jsonEncode] but is formatted to be human readable.
+String jsonEncodePretty(Object? object) => _jsonEncoder.convert(object);
diff --git a/tools/engine_tool/lib/src/logger.dart b/tools/engine_tool/lib/src/logger.dart
new file mode 100644
index 0000000000000000000000000000000000000000..96c5fc0d5765e9cf6ef82bfe89d5b6c2c97142f2
--- /dev/null
+++ b/tools/engine_tool/lib/src/logger.dart
@@ -0,0 +1,371 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async' show Timer, runZoned;
+import 'dart:io' as io show IOSink, stderr, stdout;
+
+import 'package:logging/logging.dart' as log;
+import 'package:meta/meta.dart';
+
+// This is where a flutter_tool style progress spinner, color output,
+// ascii art, terminal control for clearing lines or the whole screen, etc.
+// can go. We can just add more methods to Logger using the flutter_tool's
+// Logger as a guide:
+//
+// https://github.com/flutter/flutter/blob/c530276f7806c77da2541c518a0e103c9bb44f10/packages/flutter_tools/lib/src/base/logger.dart#L422
+
+/// A simplified wrapper around the [Logger] from package:logging.
+///
+/// The default log level is [Logger.status]. A --quiet flag might change it to
+/// [Logger.warning] or [Logger.error]. A --verbose flag might change it to
+/// [Logger.info].
+///
+/// Log messages at [Logger.warning] and higher will be written to stderr, and
+/// to stdout otherwise. [Logger.test] records all log messages to a buffer,
+/// which can be inspected by unit tetss.
+class Logger {
+  /// Constructs a logger for use in the tool.
+  Logger()
+      : _logger = log.Logger.detached('et'),
+        _test = false {
+    _logger.level = statusLevel;
+    _logger.onRecord.listen(_handler);
+    _setupIoSink(io.stderr);
+    _setupIoSink(io.stdout);
+  }
+
+  /// A logger for tests.
+  @visibleForTesting
+  Logger.test()
+      : _logger = log.Logger.detached('et'),
+        _test = true {
+    _logger.level = statusLevel;
+    _logger.onRecord.listen((log.LogRecord r) => _testLogs.add(r));
+  }
+
+  /// The logging level for error messages. These go to stderr.
+  static const log.Level errorLevel = log.Level('ERROR', 100);
+
+  /// The logging level for warning messages. These go to stderr.
+  static const log.Level warningLevel = log.Level('WARNING', 75);
+
+  /// The logging level for normal status messages. These go to stdout.
+  static const log.Level statusLevel = log.Level('STATUS', 25);
+
+  /// The logging level for verbose informational messages. These go to stdout.
+  static const log.Level infoLevel = log.Level('INFO', 10);
+
+  static void _handler(log.LogRecord r) {
+    final io.IOSink sink = r.level >= warningLevel ? io.stderr : io.stdout;
+    final String prefix =
+        r.level >= warningLevel ? '[${r.time}] ${r.level}: ' : '';
+    _ioSinkWrite(sink, '$prefix${r.message}');
+  }
+
+  // Status of the global io.stderr and io.stdout is shared across all
+  // Logger instances.
+  static bool _stdioDone = false;
+
+  // stdout and stderr might already be closed, and when not already closed,
+  // writing can still fail by throwing either a sync or async exception.
+  // This function handles all three cases.
+  static void _ioSinkWrite(io.IOSink sink, String message) {
+    if (_stdioDone) {
+      return;
+    }
+    runZoned<void>(() {
+      try {
+        sink.write(message);
+      } catch (_) {
+        _stdioDone = true;
+      }
+    }, onError: (Object e, StackTrace s) {
+      _stdioDone = true;
+    });
+  }
+
+  static void _setupIoSink(io.IOSink sink) {
+    sink.done.then(
+      (void _) {
+        _stdioDone = true;
+      },
+      onError: (Object err, StackTrace st) {
+        _stdioDone = true;
+      },
+    );
+  }
+
+  final log.Logger _logger;
+  final List<log.LogRecord> _testLogs = <log.LogRecord>[];
+  final bool _test;
+
+  Spinner? _status;
+
+  /// Get the current logging level.
+  log.Level get level => _logger.level;
+
+  /// Set the current logging level.
+  set level(log.Level l) {
+    _logger.level = l;
+  }
+
+  /// Record a log message level [Logger.error] and throw a FatalError.
+  /// This should only be called when the program has entered an impossible
+  /// to recover from state or when something isn't implemented yet.
+  void fatal(
+    Object? message, {
+    int indent = 0,
+    bool newline = true,
+    bool fit = false,
+  }) {
+    _emitLog(errorLevel, message, indent, newline, fit);
+    throw FatalError(_formatMessage(message, indent, newline, fit));
+  }
+
+  /// Record a log message at level [Logger.error].
+  void error(
+    Object? message, {
+    int indent = 0,
+    bool newline = true,
+    bool fit = false,
+  }) {
+    _emitLog(errorLevel, message, indent, newline, fit);
+  }
+
+  /// Record a log message at level [Logger.warning].
+  void warning(
+    Object? message, {
+    int indent = 0,
+    bool newline = true,
+    bool fit = false,
+  }) {
+    _emitLog(warningLevel, message, indent, newline, fit);
+  }
+
+  /// Record a log message at level [Logger.warning].
+  void status(
+    Object? message, {
+    int indent = 0,
+    bool newline = true,
+    bool fit = false,
+  }) {
+    _emitLog(statusLevel, message, indent, newline, fit);
+  }
+
+  /// Record a log message at level [Logger.info].
+  void info(
+    Object? message, {
+    int indent = 0,
+    bool newline = true,
+    bool fit = false,
+  }) {
+    _emitLog(infoLevel, message, indent, newline, fit);
+  }
+
+  /// Writes a number of spaces to stdout equal to the width of the terminal
+  /// and emits a carriage return.
+  void clearLine() {
+    if (!io.stdout.hasTerminal || _test) {
+      return;
+    }
+    _status?.pause();
+    _emitClearLine();
+    _status?.resume();
+  }
+
+  /// Starts printing a progress spinner.
+  Spinner startSpinner({
+    void Function()? onFinish,
+  }) {
+    void finishCallback() {
+      onFinish?.call();
+      _status = null;
+    }
+
+    _status = io.stdout.hasTerminal && !_test
+        ? FlutterSpinner(onFinish: finishCallback)
+        : Spinner(onFinish: finishCallback);
+    _status!.start();
+    return _status!;
+  }
+
+  static void _emitClearLine() {
+    if (io.stdout.supportsAnsiEscapes) {
+      // Go to start of the line and clear the line.
+      _ioSinkWrite(io.stdout, '\r\x1B[K');
+      return;
+    }
+    final int width = io.stdout.terminalColumns;
+    final String backspaces = '\b' * width;
+    final String spaces = ' ' * width;
+    _ioSinkWrite(io.stdout, '$backspaces$spaces$backspaces');
+  }
+
+  String _formatMessage(Object? message, int indent, bool newline, bool fit) {
+    String m = '${' ' * indent}$message${newline ? '\n' : ''}';
+    if (fit && io.stdout.hasTerminal) {
+      m = fitToWidth(m, io.stdout.terminalColumns);
+    }
+    return m;
+  }
+
+  void _emitLog(
+    log.Level level,
+    Object? message,
+    int indent,
+    bool newline,
+    bool fit,
+  ) {
+    final String m = _formatMessage(message, indent, newline, fit);
+    _status?.pause();
+    _logger.log(level, m);
+    _status?.resume();
+  }
+
+  /// Shorten a string such that its length will be `w` by replacing
+  /// enough characters in the middle with '...'. Trailing whitespace will not
+  /// be preserved or counted against 'w', but if the input ends with a newline,
+  /// then the output will end with a newline that is not counted against 'w'.
+  /// That is, if the input string ends with a newline, the output string will
+  /// have length up to (w + 1) and end with a newline.
+  ///
+  /// If w <= 0, the result will be the empty string.
+  /// If w <= 3, the result will be a string containing w '.'s.
+  /// If there are a different number of non-'...' characters to the right and
+  /// left of '...' in the result, then the right will have one more than the
+  /// left.
+  @visibleForTesting
+  static String fitToWidth(String s, int w) {
+    // Preserve a trailing newline if needed.
+    final String maybeNewline = s.endsWith('\n') ? '\n' : '';
+    if (w <= 0) {
+      return maybeNewline;
+    }
+    if (w <= 3) {
+      return '${'.' * w}$maybeNewline';
+    }
+
+    // But remove trailing whitespace before removing the middle of the string.
+    s = s.trimRight();
+    if (s.length <= w) {
+      return '$s$maybeNewline';
+    }
+
+    // remove (s.length + 3 - w) characters from the middle of `s` and
+    // replace them with '...'.
+    final int diff = (s.length + 3) - w;
+    final int leftEnd = (s.length - diff) ~/ 2;
+    final int rightStart = (s.length + diff) ~/ 2;
+    s = s.replaceRange(leftEnd, rightStart, '...');
+    return s + maybeNewline;
+  }
+
+  /// In a [Logger] constructed by [Logger.test], this list will contain all of
+  /// the [LogRecord]s emitted by the test.
+  @visibleForTesting
+  List<log.LogRecord> get testLogs => _testLogs;
+}
+
+/// A base class for progress spinners, and a no-op implementation that prints
+/// nothing.
+class Spinner {
+  /// Creates a progress spinner. If supplied the `onDone` callback will be
+  /// called when `finish()` is called.
+  Spinner({
+    this.onFinish,
+  });
+
+  /// The callback called when `finish()` is called.
+  final void Function()? onFinish;
+
+  /// Starts the spinner animation.
+  void start() {}
+
+  /// Pauses the spinner animation. That is, this call causes printing to the
+  /// terminal to stop.
+  void pause() {}
+
+  /// Resumes the animation at the same from where `pause()` was called.
+  void resume() {}
+
+  /// Ends an animation, calling the `onFinish` callback if one was provided.
+  void finish() {
+    onFinish?.call();
+  }
+}
+
+/// A [Spinner] implementation that prints an animated "Flutter" banner.
+class FlutterSpinner extends Spinner {
+  // ignore: public_member_api_docs
+  FlutterSpinner({
+    super.onFinish,
+  });
+
+  /// The frames of the animation.
+  static const String frames = '⢸⡯⠭⠅⢸⣇⣀⡀⢸⣇⣸⡇⠈⢹⡏⠁⠈⢹⡏⠁⢸⣯⣭⡅⢸⡯⢕⡂⠀⠀';
+
+  static final List<String> _flutterAnimation = frames.runes
+      .map<String>((int scalar) => String.fromCharCode(scalar))
+      .toList();
+
+  Timer? _timer;
+  int _ticks = 0;
+  int _lastAnimationFrameLength = 0;
+
+  @override
+  void start() {
+    _startSpinner();
+  }
+
+  void _startSpinner() {
+    _timer = Timer.periodic(const Duration(milliseconds: 100), _callback);
+    _callback(_timer!);
+  }
+
+  void _callback(Timer timer) {
+    Logger._ioSinkWrite(io.stdout, '\b' * _lastAnimationFrameLength);
+    _ticks += 1;
+    final String newFrame = _currentAnimationFrame;
+    _lastAnimationFrameLength = newFrame.runes.length;
+    Logger._ioSinkWrite(io.stdout, newFrame);
+  }
+
+  String get _currentAnimationFrame {
+    return _flutterAnimation[_ticks % _flutterAnimation.length];
+  }
+
+  @override
+  void pause() {
+    Logger._emitClearLine();
+    _lastAnimationFrameLength = 0;
+    _timer?.cancel();
+  }
+
+  @override
+  void resume() {
+    _startSpinner();
+  }
+
+  @override
+  void finish() {
+    _timer?.cancel();
+    _timer = null;
+    Logger._emitClearLine();
+    _lastAnimationFrameLength = 0;
+    if (onFinish != null) {
+      onFinish!();
+    }
+  }
+}
+
+/// FatalErrors are thrown when a fatal error has occurred.
+class FatalError extends Error {
+  /// Constructs a FatalError with a message.
+  FatalError(this._message);
+
+  final String _message;
+
+  @override
+  String toString() => _message;
+}
diff --git a/tools/engine_tool/lib/src/proc_utils.dart b/tools/engine_tool/lib/src/proc_utils.dart
new file mode 100644
index 0000000000000000000000000000000000000000..cbcc226bde6beb96210b6d4088aa477f1d09d559
--- /dev/null
+++ b/tools/engine_tool/lib/src/proc_utils.dart
@@ -0,0 +1,118 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:path/path.dart' as p;
+import 'package:process_runner/process_runner.dart';
+
+import 'environment.dart';
+import 'json_utils.dart';
+import 'worker_pool.dart';
+
+/// Artifacts from an exited sub-process.
+final class ProcessArtifacts {
+  /// Constructs an instance of ProcessArtifacts from raw values.
+  ProcessArtifacts(
+      this.cwd, this.commandLine, this.exitCode, this.stdout, this.stderr,
+      {this.pid});
+
+  /// Constructs an instance of ProcessArtifacts from serialized JSON text.
+  factory ProcessArtifacts.fromJson(String serialized) {
+    final Map<String, dynamic> artifact =
+        jsonDecode(serialized) as Map<String, dynamic>;
+    final List<String> errors = <String>[];
+    final Directory cwd = Directory(stringOfJson(artifact, 'cwd', errors)!);
+    final List<String> commandLine =
+        stringListOfJson(artifact, 'commandLine', errors)!;
+    final int exitCode = intOfJson(artifact, 'exitCode', errors)!;
+    final String stdout = stringOfJson(artifact, 'stdout', errors)!;
+    final String stderr = stringOfJson(artifact, 'stderr', errors)!;
+    return ProcessArtifacts(cwd, commandLine, exitCode, stdout, stderr);
+  }
+
+  /// Constructs an instance of ProcessArtifacts from a file containing JSON.
+  factory ProcessArtifacts.fromFile(File file) {
+    return ProcessArtifacts.fromJson(file.readAsStringSync());
+  }
+
+  /// Saves ProcessArtifacts into file.
+  void save(File file) {
+    final Map<String, Object> data = <String, Object>{};
+    if (pid != null) {
+      data['pid'] = pid!;
+    }
+    data['exitCode'] = exitCode;
+    data['stdout'] = stdout;
+    data['stderr'] = stderr;
+    data['cwd'] = cwd.absolute.path;
+    data['commandLine'] = commandLine;
+    file.writeAsStringSync(jsonEncodePretty(data));
+  }
+
+  /// Creates a temporary file and saves the artifacts into it.
+  /// Returns the File.
+  File saveTemp() {
+    final Directory systemTemp = Directory.systemTemp;
+    final String prefix = pid != null ? 'et$pid' : 'et';
+    final Directory artifacts = systemTemp.createTempSync(prefix);
+    final File resultFile =
+        File(p.join(artifacts.path, 'process_artifacts.json'));
+    save(resultFile);
+    return resultFile;
+  }
+
+  /// Current working directory of process when it was spawned.
+  final Directory cwd;
+
+  /// Full command line of process.
+  final List<String> commandLine;
+
+  /// Exit code.
+  final int exitCode;
+
+  /// Stdout (may be empty).
+  final String stdout;
+
+  /// Stdout (may be empty).
+  final String stderr;
+
+  /// Pid (when available).
+  final int? pid;
+}
+
+/// A WorkerTask that runs a process
+class ProcessTask extends WorkerTask {
+  /// Construct a new process task with name, cwd, and command line.
+  ProcessTask(super.name, this._environment, this._cwd, this._commandLine);
+
+  final Environment _environment;
+  final Directory _cwd;
+  final List<String> _commandLine;
+  late ProcessArtifacts? _processArtifacts;
+  late String? _processArtifactsPath;
+
+  @override
+  Future<bool> run() async {
+    final ProcessRunnerResult result = await _environment.processRunner
+        .runProcess(_commandLine, failOk: true, workingDirectory: _cwd);
+    _processArtifacts = ProcessArtifacts(
+        _cwd, _commandLine, result.exitCode, result.stdout, result.stderr,
+        pid: result.pid);
+    _processArtifactsPath = _processArtifacts!.saveTemp().path;
+    return result.exitCode == 0;
+  }
+
+  /// Returns the ProcessArtifacts after run completes.
+  ProcessArtifacts get processArtifacts {
+    return _processArtifacts!;
+  }
+
+  /// Returns the path that the process artifacts were saved in.
+  String get processArtifactsPath {
+    return _processArtifactsPath!;
+  }
+}
diff --git a/tools/engine_tool/lib/src/run_utils.dart b/tools/engine_tool/lib/src/run_utils.dart
new file mode 100644
index 0000000000000000000000000000000000000000..5c2f720879c00673cae5384485a307d5d2c81906
--- /dev/null
+++ b/tools/engine_tool/lib/src/run_utils.dart
@@ -0,0 +1,131 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:convert';
+
+import 'package:process_runner/process_runner.dart';
+
+import 'environment.dart';
+import 'json_utils.dart';
+
+const String _targetPlatformKey = 'targetPlatform';
+const String _nameKey = 'name';
+const String _idKey = 'id';
+
+/// Target to run a flutter application on.
+class RunTarget {
+  /// Construct a RunTarget from a JSON map.
+  factory RunTarget.fromJson(Map<String, Object> map) {
+    final List<String> errors = <String>[];
+    final String name = stringOfJson(map, _nameKey, errors)!;
+    final String id = stringOfJson(map, _idKey, errors)!;
+    final String targetPlatform =
+        stringOfJson(map, _targetPlatformKey, errors)!;
+
+    if (errors.isNotEmpty) {
+      throw FormatException('Failed to parse RunTarget: ${errors.join('\n')}');
+    }
+    return RunTarget._(name, id, targetPlatform);
+  }
+
+  RunTarget._(this.name, this.id, this.targetPlatform);
+
+  /// Name of target device.
+  final String name;
+
+  /// Id of target device.
+  final String id;
+
+  /// Target platform of device.
+  final String targetPlatform;
+
+  /// BuildConfig name for compilation mode.
+  String buildConfigFor(String mode) {
+    switch (targetPlatform) {
+      case 'android-arm64':
+        return 'android_${mode}_arm64';
+      case 'darwin':
+        return 'host_$mode';
+      case 'web-javascript':
+        return 'chrome_$mode';
+      default:
+        throw UnimplementedError('No mapping for $targetPlatform');
+    }
+  }
+}
+
+/// Parse the raw output of `flutter devices --machine`.
+List<RunTarget> parseDevices(Environment env, String flutterDevicesMachine) {
+  late final List<dynamic> decoded;
+  try {
+    decoded = jsonDecode(flutterDevicesMachine) as List<dynamic>;
+  } on FormatException catch (e) {
+    env.logger.error(
+        'Failed to parse flutter devices output: $e\n\n$flutterDevicesMachine\n\n');
+    return <RunTarget>[];
+  }
+
+  final List<RunTarget> r = <RunTarget>[];
+  for (final dynamic device in decoded) {
+    if (device is! Map<String, Object?>) {
+      return <RunTarget>[];
+    }
+    if (!device.containsKey(_nameKey) || !device.containsKey(_idKey)) {
+      env.logger.error('device is missing required fields:\n$device\n');
+      return <RunTarget>[];
+    }
+    if (!device.containsKey(_targetPlatformKey)) {
+      env.logger.warning('Skipping ${device[_nameKey]}: '
+          'Could not find $_targetPlatformKey in device description.');
+      continue;
+    }
+    late final RunTarget target;
+    try {
+      target = RunTarget.fromJson(device.cast<String, Object>());
+    } on FormatException catch (e) {
+      env.logger.error(e);
+      return <RunTarget>[];
+    }
+    r.add(target);
+  }
+
+  return r;
+}
+
+/// Return the default device to be used.
+RunTarget? defaultDevice(Environment env, List<RunTarget> targets) {
+  if (targets.isEmpty) {
+    return null;
+  }
+  return targets.first;
+}
+
+/// Select a run target.
+RunTarget? selectRunTarget(Environment env, String flutterDevicesMachine,
+    [String? idPrefix]) {
+  final List<RunTarget> targets = parseDevices(env, flutterDevicesMachine);
+  if (idPrefix != null && idPrefix.isNotEmpty) {
+    for (final RunTarget target in targets) {
+      if (target.id.startsWith(idPrefix)) {
+        return target;
+      }
+    }
+  }
+  return defaultDevice(env, targets);
+}
+
+/// Detects available targets and then selects one.
+Future<RunTarget?> detectAndSelectRunTarget(Environment env,
+    [String? idPrefix]) async {
+  final ProcessRunnerResult result = await env.processRunner
+      .runProcess(<String>['flutter', 'devices', '--machine']);
+  if (result.exitCode != 0) {
+    env.logger.error('flutter devices --machine failed:\n'
+        'EXIT_CODE:${result.exitCode}\n'
+        'STDOUT:\n${result.stdout}'
+        'STDERR:\n${result.stderr}');
+    return null;
+  }
+  return selectRunTarget(env, result.stdout, idPrefix);
+}
diff --git a/tools/engine_tool/lib/src/worker_pool.dart b/tools/engine_tool/lib/src/worker_pool.dart
new file mode 100644
index 0000000000000000000000000000000000000000..c9ec02f4a1773cf606c407ffaa719e303c36e4af
--- /dev/null
+++ b/tools/engine_tool/lib/src/worker_pool.dart
@@ -0,0 +1,148 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'dart:collection';
+
+import 'environment.dart';
+
+/// A WorkerTask.
+abstract class WorkerTask {
+  /// WorkerTask with a name.
+  WorkerTask(this.name);
+
+  /// Name of worker task.
+  final String name;
+
+  /// Run the task which is complete when the returned future completes.
+  /// Returns true if successful.
+  Future<bool> run();
+
+  /// Returns the run time of this task.
+  Duration get runTime {
+    if (_startTime == null || _finishTime == null) {
+      return Duration.zero;
+    }
+    return _finishTime!.difference(_startTime!);
+  }
+
+  // When did this task start running?
+  DateTime? _startTime;
+  // When did this task finish running?
+  DateTime? _finishTime;
+}
+
+/// A pool of worker tasks that will run numWorkers tasks at a time
+/// until all of the tasks are finished.
+class WorkerPool {
+  /// Construct a worker pool with a specific reporter and max concurrency
+  /// limit.
+  WorkerPool(this._environment, this._reporter, [this._maxConcurrency = 4]);
+
+  final Environment _environment;
+  final WorkerPoolProgressReporter _reporter;
+  final int _maxConcurrency;
+
+  late Completer<bool> _runCompleter;
+  bool _anyFailed = false;
+  final Set<WorkerTask> _running = <WorkerTask>{};
+  final Set<WorkerTask> _pending = <WorkerTask>{};
+  final Set<WorkerTask> _finished = <WorkerTask>{};
+
+  /// Run all tasks in the pool. Report progress via reporter.
+  /// Returns 0 on success and non-zero on failure.
+  Future<bool> run(Set<WorkerTask> tasks) async {
+    _environment.logger.info('Running ${tasks.length}');
+    _runCompleter = Completer<bool>();
+    _reporter.onRun(tasks);
+    _pending.addAll(tasks);
+    _runQueue();
+    return _runCompleter.future;
+  }
+
+  /// Returns the current set of pending tasks.
+  UnmodifiableSetView<WorkerTask> get pending {
+    return UnmodifiableSetView<WorkerTask>(_pending);
+  }
+
+  /// Returns the current set of running tasks.
+  UnmodifiableSetView<WorkerTask> get running {
+    return UnmodifiableSetView<WorkerTask>(_running);
+  }
+
+  /// Returns the current set of finished tasks.
+  UnmodifiableSetView<WorkerTask> get finished {
+    return UnmodifiableSetView<WorkerTask>(_finished);
+  }
+
+  void _runQueue() {
+    if (_pending.isEmpty && _running.isEmpty) {
+      _reporter.onFinish();
+      // Nothing left to do or running.
+      _runCompleter.complete(!_anyFailed);
+      return;
+    }
+    while (_running.length < _maxConcurrency && _pending.isNotEmpty) {
+      final WorkerTask task = _pending.elementAt(0);
+      _pending.remove(task);
+      _runTask(task);
+    }
+  }
+
+  Future<void> _runTask(WorkerTask task) async {
+    task._startTime = DateTime.now();
+    final Future<bool> result = task.run();
+
+    _running.add(task);
+    _reporter.onTaskStart(this, task);
+
+    Object? err;
+    late final bool r;
+    try {
+      r = await result;
+    } catch (e) {
+      err = e;
+      r = false;
+    }
+    _anyFailed = _anyFailed || !r;
+    task._finishTime = DateTime.now();
+
+    _running.remove(task);
+    _finished.add(task);
+    _reporter.onTaskDone(this, task, err);
+
+    // Kick the queue again.
+    _runQueue();
+  }
+}
+
+/// WorkerPoolProgressReporter can be used to monitor worker pool progress.
+abstract class WorkerPoolProgressReporter {
+  /// Invoked when [WorkerPool.run] is invoked.
+  void onRun(Set<WorkerTask> tasks);
+
+  /// Invoked right before [WorkerPool.run] is returned from.
+  void onFinish();
+
+  /// Invoked right after a task has been started.
+  void onTaskStart(WorkerPool pool, WorkerTask task);
+
+  /// Invoked right after a task has finished.
+  void onTaskDone(WorkerPool pool, WorkerTask task, [Object? err]);
+}
+
+/// Useful for tests.
+class NoopWorkerPoolProgressReporter implements WorkerPoolProgressReporter {
+  @override
+  void onRun(Set<WorkerTask> tasks) {}
+
+  @override
+  void onFinish() {}
+
+  @override
+  void onTaskStart(WorkerPool pool, WorkerTask task) {}
+
+  @override
+  void onTaskDone(WorkerPool pool, WorkerTask task, [Object? err]) {}
+}
diff --git a/tools/engine_tool/pubspec.yaml b/tools/engine_tool/pubspec.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..1fc8f9fb2555276acb7fe7df05987c71dc979787
--- /dev/null
+++ b/tools/engine_tool/pubspec.yaml
@@ -0,0 +1,76 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+name: engine_tool
+publish_to: none
+environment:
+  sdk: '>=3.2.0-0 <4.0.0'
+
+# Do not add any dependencies that require more than what is provided in
+# //third_party/pkg, //third_party/dart/pkg, or
+# //third_party/dart/third_party/pkg. In particular, package:test is not usable
+# here.
+
+# If you do add packages here, make sure you can run `pub get --offline`, and
+# check the .packages and .package_config to make sure all the paths are
+# relative to this directory into //third_party/dart
+
+dependencies:
+  args: any
+  engine_build_configs:
+    path: ../pkg/engine_build_configs
+  engine_repo_tools:
+    path: ../pkg/engine_repo_tools
+  file: any
+  logging: any
+  meta: any
+  path: any
+  platform: any
+  process_runner: any
+
+dev_dependencies:
+  async_helper: any
+  expect: any
+  litetest: any
+  process_fakes:
+    path: ../pkg/process_fakes
+  smith: any
+
+dependency_overrides:
+  args:
+    path: ../../../third_party/dart/third_party/pkg/args
+  async:
+    path: ../../../third_party/dart/third_party/pkg/async
+  async_helper:
+    path: ../../../third_party/dart/pkg/async_helper
+  collection:
+    path: ../../../third_party/dart/third_party/pkg/collection
+  expect:
+    path: ../../../third_party/dart/pkg/expect
+  file:
+    path: ../../../third_party/dart/third_party/pkg/file/packages/file
+  litetest:
+    path: ../../testing/litetest
+  logging:
+    path: ../../../third_party/dart/third_party/pkg/logging
+  meta:
+    path: ../../../third_party/dart/pkg/meta
+  path:
+    path: ../../../third_party/dart/third_party/pkg/path
+  platform:
+    path: ../../third_party/pkg/platform
+  process:
+    path: ../../third_party/pkg/process
+  process_runner:
+    path: ../../third_party/pkg/process_runner
+  smith:
+    path: ../../../third_party/dart/pkg/smith
+  source_span:
+    path: ../../../third_party/dart/third_party/pkg/source_span
+  string_scanner:
+    path: ../../../third_party/dart/third_party/pkg/string_scanner
+  term_glyph:
+    path: ../../../third_party/dart/third_party/pkg/term_glyph
+  yaml:
+    path: ../../../third_party/dart/third_party/pkg/yaml
diff --git a/tools/engine_tool/test/build_command_test.dart b/tools/engine_tool/test/build_command_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..bc1c2344d6a132c3da1b1e4ecddc1bad5ad5639d
--- /dev/null
+++ b/tools/engine_tool/test/build_command_test.dart
@@ -0,0 +1,268 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:convert' as convert;
+import 'dart:ffi' as ffi show Abi;
+import 'dart:io' as io;
+
+import 'package:engine_build_configs/engine_build_configs.dart';
+import 'package:engine_repo_tools/engine_repo_tools.dart';
+import 'package:engine_tool/src/build_utils.dart';
+import 'package:engine_tool/src/commands/command_runner.dart';
+import 'package:engine_tool/src/environment.dart';
+import 'package:engine_tool/src/logger.dart';
+import 'package:litetest/litetest.dart';
+import 'package:path/path.dart' as path;
+import 'package:platform/platform.dart';
+import 'package:process_fakes/process_fakes.dart';
+import 'package:process_runner/process_runner.dart';
+
+import 'fixtures.dart' as fixtures;
+
+void main() {
+  final BuilderConfig linuxTestConfig = BuilderConfig.fromJson(
+    path: 'ci/builders/linux_test_config.json',
+    map: convert.jsonDecode(fixtures.testConfig('Linux'))
+        as Map<String, Object?>,
+  );
+
+  final BuilderConfig macTestConfig = BuilderConfig.fromJson(
+    path: 'ci/builders/mac_test_config.json',
+    map: convert.jsonDecode(fixtures.testConfig('Mac-12'))
+        as Map<String, Object?>,
+  );
+
+  final BuilderConfig winTestConfig = BuilderConfig.fromJson(
+    path: 'ci/builders/win_test_config.json',
+    map: convert.jsonDecode(fixtures.testConfig('Windows-11'))
+        as Map<String, Object?>,
+  );
+
+  final Map<String, BuilderConfig> configs = <String, BuilderConfig>{
+    'linux_test_config': linuxTestConfig,
+    'linux_test_config2': linuxTestConfig,
+    'mac_test_config': macTestConfig,
+    'win_test_config': winTestConfig,
+  };
+
+  (Environment, List<List<String>>) linuxEnv(
+    Logger logger, {
+    bool withRbe = false,
+  }) {
+    final io.Directory rootDir = io.Directory.systemTemp.createTempSync('et');
+    final TestEngine engine = TestEngine.createTemp(rootDir: rootDir);
+    if (withRbe) {
+      io.Directory(path.join(
+        engine.srcDir.path,
+        'flutter',
+        'build',
+        'rbe',
+      )).createSync(recursive: true);
+    }
+    final List<List<String>> runHistory = <List<String>>[];
+    return (
+      Environment(
+        abi: ffi.Abi.linuxX64,
+        engine: engine,
+        platform: FakePlatform(
+            operatingSystem: Platform.linux,
+            resolvedExecutable: io.Platform.resolvedExecutable),
+        processRunner: ProcessRunner(
+          processManager: FakeProcessManager(
+            canRun: (Object? exe, {String? workingDirectory}) => true,
+            onStart: (List<String> command) {
+              runHistory.add(command);
+              return FakeProcess();
+            },
+            onRun: (List<String> command) {
+              runHistory.add(command);
+              return io.ProcessResult(81, 0, '', '');
+            },
+          ),
+        ),
+        logger: logger,
+      ),
+      runHistory
+    );
+  }
+
+  void cleanupEnv(Environment env) {
+    try {
+      env.engine.srcDir.parent.deleteSync(recursive: true);
+    } catch (_) {
+      // Ignore failure to clean up.
+    }
+  }
+
+  test('can find host runnable build', () async {
+    final Logger logger = Logger.test();
+    final (Environment env, _) = linuxEnv(logger);
+    try {
+      final List<Build> result = runnableBuilds(env, configs);
+      expect(result.length, equals(8));
+      expect(result[0].name, equals('build_name'));
+    } finally {
+      cleanupEnv(env);
+    }
+  });
+
+  test('build command invokes gn', () async {
+    final Logger logger = Logger.test();
+    final (Environment env, List<List<String>> runHistory) = linuxEnv(logger);
+    try {
+      final ToolCommandRunner runner = ToolCommandRunner(
+        environment: env,
+        configs: configs,
+      );
+      final int result = await runner.run(<String>[
+        'build',
+        '--config',
+        'build_name',
+      ]);
+      expect(result, equals(0));
+      expect(runHistory.length, greaterThanOrEqualTo(1));
+      expect(runHistory[0].length, greaterThanOrEqualTo(1));
+      expect(runHistory[0][0], contains('gn'));
+    } finally {
+      cleanupEnv(env);
+    }
+  });
+
+  test('build command invokes ninja', () async {
+    final Logger logger = Logger.test();
+    final (Environment env, List<List<String>> runHistory) = linuxEnv(logger);
+    try {
+      final ToolCommandRunner runner = ToolCommandRunner(
+        environment: env,
+        configs: configs,
+      );
+      final int result = await runner.run(<String>[
+        'build',
+        '--config',
+        'build_name',
+      ]);
+      expect(result, equals(0));
+      expect(runHistory.length, greaterThanOrEqualTo(2));
+      expect(runHistory[1].length, greaterThanOrEqualTo(1));
+      expect(runHistory[1][0], contains('ninja'));
+    } finally {
+      cleanupEnv(env);
+    }
+  });
+
+  test('build command invokes generator', () async {
+    final Logger logger = Logger.test();
+    final (Environment env, List<List<String>> runHistory) = linuxEnv(logger);
+    try {
+      final ToolCommandRunner runner = ToolCommandRunner(
+        environment: env,
+        configs: configs,
+      );
+      final int result = await runner.run(<String>[
+        'build',
+        '--config',
+        'build_name',
+      ]);
+      expect(result, equals(0));
+      expect(runHistory.length, greaterThanOrEqualTo(3));
+      expect(
+        runHistory[2],
+        containsStringsInOrder(<String>['python3', 'gen/script.py']),
+      );
+    } finally {
+      cleanupEnv(env);
+    }
+  });
+
+  test('build command does not invoke tests', () async {
+    final Logger logger = Logger.test();
+    final (Environment env, List<List<String>> runHistory) = linuxEnv(logger);
+    try {
+      final ToolCommandRunner runner = ToolCommandRunner(
+        environment: env,
+        configs: configs,
+      );
+      final int result = await runner.run(<String>[
+        'build',
+        '--config',
+        'build_name',
+      ]);
+      expect(result, equals(0));
+      expect(runHistory.length, lessThanOrEqualTo(3));
+    } finally {
+      cleanupEnv(env);
+    }
+  });
+
+  test('build command runs rbe on an rbe build', () async {
+    final Logger logger = Logger.test();
+    final (Environment env, List<List<String>> runHistory) = linuxEnv(
+      logger, withRbe: true,
+    );
+    try {
+      final ToolCommandRunner runner = ToolCommandRunner(
+        environment: env,
+        configs: configs,
+      );
+      final int result = await runner.run(<String>[
+        'build',
+        '--config',
+        'android_debug_rbe_arm64',
+      ]);
+      expect(result, equals(0));
+      expect(runHistory[0][0], contains(path.join('tools', 'gn')));
+      expect(runHistory[0][4], equals('--rbe'));
+      expect(runHistory[1][0], contains(path.join('reclient', 'bootstrap')));
+    } finally {
+      cleanupEnv(env);
+    }
+  });
+
+  test('build command does not run rbe when disabled', () async {
+    final Logger logger = Logger.test();
+    final (Environment env, List<List<String>> runHistory) = linuxEnv(
+      logger, withRbe: true,
+    );
+    try {
+      final ToolCommandRunner runner = ToolCommandRunner(
+        environment: env,
+        configs: configs,
+      );
+      final int result = await runner.run(<String>[
+        'build',
+        '--config',
+        'android_debug_rbe_arm64',
+        '--no-rbe',
+      ]);
+      expect(result, equals(0));
+      expect(runHistory[0][0], contains(path.join('tools', 'gn')));
+      expect(runHistory[0], doesNotContainAny(<String>['--rbe']));
+      expect(runHistory[1][0], contains(path.join('ninja', 'ninja')));
+    } finally {
+      cleanupEnv(env);
+    }
+  });
+
+  test('build command does not run rbe when rbe configs do not exist', () async {
+    final Logger logger = Logger.test();
+    final (Environment env, List<List<String>> runHistory) = linuxEnv(logger);
+    try {
+      final ToolCommandRunner runner = ToolCommandRunner(
+        environment: env,
+        configs: configs,
+      );
+      final int result = await runner.run(<String>[
+        'build',
+        '--config',
+        'android_debug_rbe_arm64',
+      ]);
+      expect(result, equals(0));
+      expect(runHistory[0][0], contains(path.join('tools', 'gn')));
+      expect(runHistory[0], doesNotContainAny(<String>['--rbe']));
+      expect(runHistory[1][0], contains(path.join('ninja', 'ninja')));
+    } finally {
+      cleanupEnv(env);
+    }
+  });
+}
diff --git a/tools/engine_tool/test/entry_point_test.dart b/tools/engine_tool/test/entry_point_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..052b36106dd8266229e71cbf60495394eb00673d
--- /dev/null
+++ b/tools/engine_tool/test/entry_point_test.dart
@@ -0,0 +1,40 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io' as io;
+
+import 'package:engine_repo_tools/engine_repo_tools.dart';
+import 'package:litetest/litetest.dart';
+import 'package:path/path.dart' as path;
+import 'package:platform/platform.dart';
+import 'package:process_runner/process_runner.dart';
+
+void main() {
+  final Engine engine;
+  try {
+    engine = Engine.findWithin();
+  } catch (e) {
+    io.stderr.writeln(e);
+    io.exitCode = 1;
+    return;
+  }
+
+  test('The entry points under bin/ work', () async {
+    const Platform platform = LocalPlatform();
+    final ProcessRunner runner = ProcessRunner();
+    final String exe = platform.isWindows ? '.bat' : '';
+    final String entrypointPath = path.join(
+      engine.flutterDir.path, 'bin', 'et$exe',
+    );
+    final ProcessRunnerResult processResult = await runner.runProcess(
+      <String>[entrypointPath, 'help'],
+      failOk: true,
+    );
+    if (processResult.exitCode != 0) {
+      io.stdout.writeln(processResult.stdout);
+      io.stderr.writeln(processResult.stderr);
+    }
+    expect(processResult.exitCode, equals(0));
+  });
+}
diff --git a/tools/engine_tool/test/fetch_command_test.dart b/tools/engine_tool/test/fetch_command_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..16ccdd6ee41390acedd9fb708659983cd7bf4320
--- /dev/null
+++ b/tools/engine_tool/test/fetch_command_test.dart
@@ -0,0 +1,83 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:ffi' as ffi show Abi;
+import 'dart:io' as io;
+
+import 'package:engine_build_configs/engine_build_configs.dart';
+import 'package:engine_repo_tools/engine_repo_tools.dart';
+import 'package:engine_tool/src/commands/command_runner.dart';
+import 'package:engine_tool/src/environment.dart';
+import 'package:engine_tool/src/logger.dart';
+import 'package:litetest/litetest.dart';
+import 'package:platform/platform.dart';
+import 'package:process_fakes/process_fakes.dart';
+import 'package:process_runner/process_runner.dart';
+
+void main() {
+  final Engine? engine = Engine.tryFindWithin();
+  if (engine == null) {
+    io.stderr.writeln('The current working directory is not a Flutter engine');
+    io.exitCode = 1;
+    return;
+  }
+
+  final Map<String, BuilderConfig> configs = <String, BuilderConfig>{};
+
+  (Environment, List<List<String>>) linuxEnv(Logger logger) {
+    final List<List<String>> runHistory = <List<String>>[];
+    return (
+      Environment(
+        abi: ffi.Abi.linuxX64,
+        engine: engine,
+        platform: FakePlatform(
+            operatingSystem: Platform.linux,
+            resolvedExecutable: io.Platform.resolvedExecutable),
+        processRunner: ProcessRunner(
+          processManager: FakeProcessManager(onStart: (List<String> command) {
+            runHistory.add(command);
+            return FakeProcess();
+          }, onRun: (List<String> command) {
+            runHistory.add(command);
+            return io.ProcessResult(81, 0, '', '');
+          }),
+        ),
+        logger: logger,
+      ),
+      runHistory
+    );
+  }
+
+  test('fetch command invokes gclient sync -D', () async {
+    final Logger logger = Logger.test();
+    final (Environment env, List<List<String>> runHistory) = linuxEnv(logger);
+    final ToolCommandRunner runner = ToolCommandRunner(
+      environment: env,
+      configs: configs,
+    );
+    final int result = await runner.run(<String>['fetch']);
+    expect(result, equals(0));
+    expect(runHistory.length, greaterThanOrEqualTo(1));
+    expect(
+      runHistory[0],
+      containsStringsInOrder(<String>['gclient', 'sync', '-D']),
+    );
+  });
+
+  test('fetch command has sync alias', () async {
+    final Logger logger = Logger.test();
+    final (Environment env, List<List<String>> runHistory) = linuxEnv(logger);
+    final ToolCommandRunner runner = ToolCommandRunner(
+      environment: env,
+      configs: configs,
+    );
+    final int result = await runner.run(<String>['sync']);
+    expect(result, equals(0));
+    expect(runHistory.length, greaterThanOrEqualTo(1));
+    expect(
+      runHistory[0],
+      containsStringsInOrder(<String>['gclient', 'sync', '-D']),
+    );
+  });
+}
diff --git a/tools/engine_tool/test/fixtures.dart b/tools/engine_tool/test/fixtures.dart
new file mode 100644
index 0000000000000000000000000000000000000000..b450136d7ca370b8931ce59f69f264bcad969a40
--- /dev/null
+++ b/tools/engine_tool/test/fixtures.dart
@@ -0,0 +1,196 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+String testConfig(String os) => '''
+{
+  "builds": [
+    {
+      "archives": [
+        {
+          "name": "build_name",
+          "base_path": "base/path",
+          "type": "gcs",
+          "include_paths": ["include/path"],
+          "realm": "archive_realm"
+        }
+      ],
+      "drone_dimensions": [
+        "os=$os"
+      ],
+      "gclient_variables": {
+        "variable": false
+      },
+      "gn": ["--gn-arg", "--lto", "--goma", "--no-rbe"],
+      "name": "build_name",
+      "ninja": {
+        "config": "build_name",
+        "targets": ["ninja_target"]
+      },
+      "tests": [
+        {
+          "language": "python3",
+          "name": "build_name tests",
+          "parameters": ["--test-params"],
+          "script": "test/script.py",
+          "contexts": ["context"]
+        }
+      ],
+      "generators": {
+        "tasks": [
+          {
+            "name": "generator_task",
+            "language": "python",
+            "parameters": ["--gen-param"],
+            "scripts": ["gen/script.py"]
+          }
+        ]
+      }
+    },
+    {},
+    {},
+    {
+      "drone_dimensions": [
+        "os=$os"
+      ],
+      "gn": ["--gn-arg", "--lto", "--goma", "--no-rbe"],
+      "name": "host_debug",
+      "ninja": {
+        "config": "host_debug",
+        "targets": ["ninja_target"]
+      }
+    },
+    {
+      "drone_dimensions": [
+        "os=$os"
+      ],
+      "gn": ["--gn-arg", "--lto", "--goma", "--no-rbe"],
+      "name": "android_debug_arm64",
+      "ninja": {
+        "config": "android_debug_arm64",
+        "targets": ["ninja_target"]
+      }
+    },
+    {
+      "drone_dimensions": [
+        "os=$os"
+      ],
+      "gn": ["--gn-arg", "--lto", "--no-goma", "--rbe"],
+      "name": "android_debug_rbe_arm64",
+      "ninja": {
+        "config": "android_debug_rbe_arm64",
+        "targets": ["ninja_target"]
+      }
+    }
+  ],
+  "generators": {
+    "tasks": [
+      {
+        "name": "global generator task",
+        "parameters": ["--global-gen-param"],
+        "script": "global/gen_script.dart",
+        "language": "dart"
+      }
+    ]
+  },
+  "tests": [
+    {
+      "name": "global test",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "os=$os"
+      ],
+      "gclient_variables": {
+        "variable": false
+      },
+      "dependencies": ["dependency"],
+      "test_dependencies": [
+        {
+          "dependency": "test_dependency",
+          "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "global test task",
+          "parameters": ["--test-parameter"],
+          "script": "global/test/script.py"
+        }
+      ]
+    }
+  ]
+}
+''';
+
+String attachedDevices() => '''
+[
+  {
+    "name": "sdk gphone64 arm64",
+    "id": "emulator-5554",
+    "isSupported": true,
+    "targetPlatform": "android-arm64",
+    "emulator": true,
+    "sdk": "Android 14 (API 34)",
+    "capabilities": {
+      "hotReload": true,
+      "hotRestart": true,
+      "screenshot": true,
+      "fastStart": true,
+      "flutterExit": true,
+      "hardwareRendering": true,
+      "startPaused": true
+    }
+  },
+  {
+    "name": "macOS",
+    "id": "macos",
+    "isSupported": true,
+    "targetPlatform": "darwin",
+    "emulator": false,
+    "sdk": "macOS 14.3.1 23D60 darwin-arm64",
+    "capabilities": {
+      "hotReload": true,
+      "hotRestart": true,
+      "screenshot": false,
+      "fastStart": false,
+      "flutterExit": true,
+      "hardwareRendering": false,
+      "startPaused": true
+    }
+  },
+  {
+    "name": "Mac Designed for iPad",
+    "id": "mac-designed-for-ipad",
+    "isSupported": true,
+    "targetPlatform": "darwin",
+    "emulator": false,
+    "sdk": "macOS 14.3.1 23D60 darwin-arm64",
+    "capabilities": {
+      "hotReload": true,
+      "hotRestart": true,
+      "screenshot": false,
+      "fastStart": false,
+      "flutterExit": true,
+      "hardwareRendering": false,
+      "startPaused": true
+    }
+  },
+  {
+    "name": "Chrome",
+    "id": "chrome",
+    "isSupported": true,
+    "targetPlatform": "web-javascript",
+    "emulator": false,
+    "sdk": "Google Chrome 122.0.6261.94",
+    "capabilities": {
+      "hotReload": true,
+      "hotRestart": true,
+      "screenshot": false,
+      "fastStart": false,
+      "flutterExit": false,
+      "hardwareRendering": false,
+      "startPaused": true
+    }
+  }
+]
+''';
diff --git a/tools/engine_tool/test/format_command_test.dart b/tools/engine_tool/test/format_command_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..029d9b268b7d247386588d439c415506d88758d9
--- /dev/null
+++ b/tools/engine_tool/test/format_command_test.dart
@@ -0,0 +1,265 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:ffi' as ffi show Abi;
+import 'dart:io' as io;
+
+import 'package:engine_build_configs/engine_build_configs.dart';
+import 'package:engine_repo_tools/engine_repo_tools.dart';
+import 'package:engine_tool/src/commands/command_runner.dart';
+import 'package:engine_tool/src/commands/flags.dart';
+import 'package:engine_tool/src/environment.dart';
+import 'package:engine_tool/src/logger.dart';
+import 'package:litetest/litetest.dart';
+import 'package:logging/logging.dart' as log;
+import 'package:platform/platform.dart';
+import 'package:process_fakes/process_fakes.dart';
+import 'package:process_runner/process_runner.dart';
+
+void main() {
+  final Engine engine;
+  try {
+    engine = Engine.findWithin();
+  } catch (e) {
+    io.stderr.writeln(e);
+    io.exitCode = 1;
+    return;
+  }
+
+  Environment linuxEnv(Logger logger, FakeProcessManager processManager) {
+    return Environment(
+      abi: ffi.Abi.linuxX64,
+      engine: engine,
+      platform: FakePlatform(
+        resolvedExecutable: '/dart',
+        operatingSystem: Platform.linux,
+      ),
+      processRunner: ProcessRunner(
+        processManager: processManager,
+      ),
+      logger: logger,
+    );
+  }
+
+  List<String> stringsFromLogs(List<log.LogRecord> logs) {
+    return logs.map((log.LogRecord r) => r.message).toList();
+  }
+
+  test('--fix is passed to ci/bin/format.dart by default', () async {
+    final Logger logger = Logger.test();
+    final FakeProcessManager manager = _formatProcessManager(
+      expectedFlags: <String>['--fix'],
+    );
+    final Environment env = linuxEnv(logger, manager);
+    final ToolCommandRunner runner = ToolCommandRunner(
+      environment: env,
+      configs: <String, BuilderConfig>{},
+    );
+    final int result = await runner.run(<String>[
+      'format',
+    ]);
+    expect(result, equals(0));
+  });
+
+  test('--fix is not passed to ci/bin/format.dart with --dry-run', () async {
+    final Logger logger = Logger.test();
+    final FakeProcessManager manager = _formatProcessManager(
+      expectedFlags: <String>[],
+    );
+    final Environment env = linuxEnv(logger, manager);
+    final ToolCommandRunner runner = ToolCommandRunner(
+      environment: env,
+      configs: <String, BuilderConfig>{},
+    );
+    final int result = await runner.run(<String>[
+      'format',
+      '--$dryRunFlag',
+    ]);
+    expect(result, equals(0));
+  });
+
+  test('exit code is non-zero when ci/bin/format.dart exit code was non zero',
+      () async {
+    final Logger logger = Logger.test();
+    final FakeProcessManager manager = _formatProcessManager(
+      expectedFlags: <String>['--fix'],
+      exitCode: 1,
+    );
+    final Environment env = linuxEnv(logger, manager);
+    final ToolCommandRunner runner = ToolCommandRunner(
+      environment: env,
+      configs: <String, BuilderConfig>{},
+    );
+    final int result = await runner.run(<String>[
+      'format',
+    ]);
+    expect(result, equals(1));
+  });
+
+  test('--all-files is passed to ci/bin/format.dart correctly', () async {
+    final Logger logger = Logger.test();
+    final FakeProcessManager manager = _formatProcessManager(
+      expectedFlags: <String>['--fix', '--all-files'],
+    );
+    final Environment env = linuxEnv(logger, manager);
+    final ToolCommandRunner runner = ToolCommandRunner(
+      environment: env,
+      configs: <String, BuilderConfig>{},
+    );
+    final int result = await runner.run(<String>[
+      'format',
+      '--$allFlag',
+    ]);
+    expect(result, equals(0));
+  });
+
+  test('--verbose is passed to ci/bin/format.dart correctly', () async {
+    final Logger logger = Logger.test();
+    final FakeProcessManager manager = _formatProcessManager(
+      expectedFlags: <String>['--fix', '--verbose'],
+    );
+    final Environment env = linuxEnv(logger, manager);
+    final ToolCommandRunner runner = ToolCommandRunner(
+      environment: env,
+      configs: <String, BuilderConfig>{},
+    );
+    final int result = await runner.run(<String>[
+      'format',
+      '--$verboseFlag',
+    ]);
+    expect(result, equals(0));
+  });
+
+  test('--quiet suppresses non-error output', () async {
+    final Logger logger = Logger.test();
+    final FakeProcessManager manager = _formatProcessManager(
+      expectedFlags: <String>['--fix'],
+      stdout: <String>['many', 'lines', 'of', 'output'].join('\n'),
+      stderr: 'error\n',
+    );
+    final Environment env = linuxEnv(logger, manager);
+    final ToolCommandRunner runner = ToolCommandRunner(
+      environment: env,
+      configs: <String, BuilderConfig>{},
+    );
+    final int result = await runner.run(<String>[
+      'format',
+      '--$quietFlag',
+    ]);
+    expect(result, equals(0));
+    expect(stringsFromLogs(logger.testLogs), equals(<String>['error\n']));
+  });
+
+  test('Diffs are suppressed by default', () async {
+    final Logger logger = Logger.test();
+    final FakeProcessManager manager = _formatProcessManager(
+      expectedFlags: <String>['--fix'],
+      stdout: <String>[
+        'To fix, run `et format` or:',
+        'many',
+        'lines',
+        'of',
+        'output',
+        'DONE',
+      ].join('\n'),
+    );
+    final Environment env = linuxEnv(logger, manager);
+    final ToolCommandRunner runner = ToolCommandRunner(
+      environment: env,
+      configs: <String, BuilderConfig>{},
+    );
+    final int result = await runner.run(<String>[
+      'format',
+    ]);
+    expect(result, equals(0));
+    expect(stringsFromLogs(logger.testLogs), isEmpty);
+  });
+
+  test('--dry-run disables --fix and prints diffs', () async {
+    final Logger logger = Logger.test();
+    final FakeProcessManager manager = _formatProcessManager(
+      expectedFlags: <String>[],
+      stdout: <String>[
+        'To fix, run `et format` or:',
+        'many',
+        'lines',
+        'of',
+        'output',
+        'DONE',
+      ].join('\n'),
+    );
+    final Environment env = linuxEnv(logger, manager);
+    final ToolCommandRunner runner = ToolCommandRunner(
+      environment: env,
+      configs: <String, BuilderConfig>{},
+    );
+    final int result = await runner.run(<String>[
+      'format',
+      '--$dryRunFlag',
+    ]);
+    expect(result, equals(0));
+    expect(
+        stringsFromLogs(logger.testLogs),
+        equals(<String>[
+          'To fix, run `et format` or:\n',
+          'many\n',
+          'lines\n',
+          'of\n',
+          'output\n',
+          'DONE\n',
+        ]));
+  });
+
+  test('progress lines are followed by a carriage return', () async {
+    final Logger logger = Logger.test();
+    const String progressLine = 'diff Jobs:  46% done, 1528/3301 completed,  '
+        '7 in progress, 1753 pending,  13 failed.';
+    final FakeProcessManager manager = _formatProcessManager(
+      expectedFlags: <String>['--fix'],
+      stdout: progressLine,
+    );
+    final Environment env = linuxEnv(logger, manager);
+    final ToolCommandRunner runner = ToolCommandRunner(
+      environment: env,
+      configs: <String, BuilderConfig>{},
+    );
+    final int result = await runner.run(<String>[
+      'format',
+    ]);
+    expect(result, equals(0));
+    expect(
+        stringsFromLogs(logger.testLogs), equals(<String>['$progressLine\r']));
+  });
+}
+
+FakeProcessManager _formatProcessManager({
+  required List<String> expectedFlags,
+  int exitCode = 0,
+  String stdout = '',
+  String stderr = '',
+  bool Function(Object?, {String? workingDirectory})? canRun,
+  bool failUnknown = true,
+}) {
+  final io.ProcessResult success = io.ProcessResult(1, 0, '', '');
+  final FakeProcess formatProcess = FakeProcess(
+    exitCode: exitCode,
+    stdout: stdout,
+    stderr: stderr,
+  );
+  return FakeProcessManager(
+    canRun: canRun ?? (Object? exe, {String? workingDirectory}) => true,
+    onRun: (List<String> cmd) => switch (cmd) {
+      _ => failUnknown ? io.ProcessResult(1, 1, '', '') : success,
+    },
+    onStart: (List<String> cmd) => switch (cmd) {
+      [final String exe, final String fmt, ...final List<String> rest]
+          when exe.endsWith('dart') &&
+              fmt.endsWith('ci/bin/format.dart') &&
+              rest.length == expectedFlags.length &&
+              expectedFlags.every(rest.contains) =>
+        formatProcess,
+      _ => failUnknown ? FakeProcess(exitCode: 1) : FakeProcess(),
+    },
+  );
+}
diff --git a/tools/engine_tool/test/lint_command_test.dart b/tools/engine_tool/test/lint_command_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..659f617d510aae0c2763dae73430f257bf257048
--- /dev/null
+++ b/tools/engine_tool/test/lint_command_test.dart
@@ -0,0 +1,91 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:convert' as convert;
+import 'dart:ffi' as ffi show Abi;
+import 'dart:io' as io;
+
+import 'package:engine_build_configs/engine_build_configs.dart';
+import 'package:engine_repo_tools/engine_repo_tools.dart';
+import 'package:engine_tool/src/commands/command_runner.dart';
+import 'package:engine_tool/src/environment.dart';
+import 'package:engine_tool/src/logger.dart';
+import 'package:litetest/litetest.dart';
+import 'package:platform/platform.dart';
+import 'package:process_fakes/process_fakes.dart';
+import 'package:process_runner/process_runner.dart';
+
+import 'fixtures.dart' as fixtures;
+
+void main() {
+  final Engine engine;
+  try {
+    engine = Engine.findWithin();
+  } catch (e) {
+    io.stderr.writeln(e);
+    io.exitCode = 1;
+    return;
+  }
+  final BuilderConfig linuxTestConfig = BuilderConfig.fromJson(
+    path: 'ci/builders/linux_test_config.json',
+    map: convert.jsonDecode(fixtures.testConfig('Linux'))
+        as Map<String, Object?>,
+  );
+
+  final BuilderConfig macTestConfig = BuilderConfig.fromJson(
+    path: 'ci/builders/mac_test_config.json',
+    map: convert.jsonDecode(fixtures.testConfig('Mac-12'))
+        as Map<String, Object?>,
+  );
+
+  final BuilderConfig winTestConfig = BuilderConfig.fromJson(
+    path: 'ci/builders/win_test_config.json',
+    map: convert.jsonDecode(fixtures.testConfig('Windows-11'))
+        as Map<String, Object?>,
+  );
+
+  final Map<String, BuilderConfig> configs = <String, BuilderConfig>{
+    'linux_test_config': linuxTestConfig,
+    'linux_test_config2': linuxTestConfig,
+    'mac_test_config': macTestConfig,
+    'win_test_config': winTestConfig,
+  };
+
+  (Environment, List<List<String>>) macEnv(Logger logger) {
+    final List<List<String>> runHistory = <List<String>>[];
+    return (
+      Environment(
+        abi: ffi.Abi.macosArm64,
+        engine: engine,
+        platform: FakePlatform(
+            operatingSystem: Platform.macOS,
+            resolvedExecutable: io.Platform.resolvedExecutable),
+        processRunner: ProcessRunner(
+            processManager: FakeProcessManager(onStart: (List<String> command) {
+          runHistory.add(command);
+          return FakeProcess();
+        }, onRun: (List<String> command) {
+          // Should not be executed.
+          assert(false);
+          return io.ProcessResult(81, 1, '', '');
+        })),
+        logger: logger,
+      ),
+      runHistory
+    );
+  }
+
+  test('invoked linters', () async {
+    final Logger logger = Logger.test();
+    final (Environment env, List<List<String>> runHistory) = macEnv(logger);
+    final ToolCommandRunner runner = ToolCommandRunner(
+      environment: env,
+      configs: configs,
+    );
+    final int result = await runner.run(<String>['lint']);
+    expect(result, equals(0));
+    expect(runHistory.length, greaterThanOrEqualTo(4));
+    expect(runHistory[0].firstOrNull, contains('analyze.sh'));
+  });
+}
diff --git a/tools/engine_tool/test/logger_test.dart b/tools/engine_tool/test/logger_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..d28ad14aa20a3d309ef47d30f2527b48b22fb641
--- /dev/null
+++ b/tools/engine_tool/test/logger_test.dart
@@ -0,0 +1,140 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:engine_tool/src/logger.dart';
+import 'package:litetest/litetest.dart';
+import 'package:logging/logging.dart' as log;
+
+void main() {
+  List<String> stringsFromLogs(List<log.LogRecord> logs) {
+    return logs.map((log.LogRecord r) => r.message).toList();
+  }
+
+  test('Setting the level works', () {
+    final Logger logger = Logger.test();
+    logger.level = Logger.infoLevel;
+    expect(logger.level, equals(Logger.infoLevel));
+  });
+
+  test('error messages are recorded at the default log level', () {
+    final Logger logger = Logger.test();
+    logger.error('Error');
+    expect(stringsFromLogs(logger.testLogs), equals(<String>['Error\n']));
+  });
+
+  test('warning messages are recorded at the default log level', () {
+    final Logger logger = Logger.test();
+    logger.warning('Warning');
+    expect(stringsFromLogs(logger.testLogs), equals(<String>['Warning\n']));
+  });
+
+  test('status messages are recorded at the default log level', () {
+    final Logger logger = Logger.test();
+    logger.status('Status');
+    expect(stringsFromLogs(logger.testLogs), equals(<String>['Status\n']));
+  });
+
+  test('info messages are not recorded at the default log level', () {
+    final Logger logger = Logger.test();
+    logger.info('info');
+    expect(stringsFromLogs(logger.testLogs), equals(<String>[]));
+  });
+
+  test('info messages are recorded at the infoLevel log level', () {
+    final Logger logger = Logger.test();
+    logger.level = Logger.infoLevel;
+    logger.info('info');
+    expect(stringsFromLogs(logger.testLogs), equals(<String>['info\n']));
+  });
+
+  test('indent indents the message', () {
+    final Logger logger = Logger.test();
+    logger.status('Status', indent: 1);
+    expect(stringsFromLogs(logger.testLogs), equals(<String>[' Status\n']));
+  });
+
+  test('newlines in error() can be disabled', () {
+    final Logger logger = Logger.test();
+    logger.error('Error', newline: false);
+    expect(stringsFromLogs(logger.testLogs), equals(<String>['Error']));
+  });
+
+  test('newlines in warning() can be disabled', () {
+    final Logger logger = Logger.test();
+    logger.warning('Warning', newline: false);
+    expect(stringsFromLogs(logger.testLogs), equals(<String>['Warning']));
+  });
+
+  test('newlines in status() can be disabled', () {
+    final Logger logger = Logger.test();
+    logger.status('Status', newline: false);
+    expect(stringsFromLogs(logger.testLogs), equals(<String>['Status']));
+  });
+
+  test('newlines in info() can be disabled', () {
+    final Logger logger = Logger.test();
+    logger.level = Logger.infoLevel;
+    logger.info('info', newline: false);
+    expect(stringsFromLogs(logger.testLogs), equals(<String>['info']));
+  });
+
+  test('fatal throws exception', () {
+    final Logger logger = Logger.test();
+    logger.level = Logger.infoLevel;
+    bool caught = false;
+    try {
+      logger.fatal('test', newline: false);
+    } on FatalError catch (_) {
+      caught = true;
+    }
+    expect(caught, equals(true));
+    expect(stringsFromLogs(logger.testLogs), equals(<String>['test']));
+  });
+
+  test('fitToWidth', () {
+    expect(Logger.fitToWidth('hello', 0), equals(''));
+    expect(Logger.fitToWidth('hello', 1), equals('.'));
+    expect(Logger.fitToWidth('hello', 2), equals('..'));
+    expect(Logger.fitToWidth('hello', 3), equals('...'));
+    expect(Logger.fitToWidth('hello', 4), equals('...o'));
+    expect(Logger.fitToWidth('hello', 5), equals('hello'));
+
+    expect(Logger.fitToWidth('foobar', 5), equals('f...r'));
+
+    expect(Logger.fitToWidth('foobarb', 5), equals('f...b'));
+    expect(Logger.fitToWidth('foobarb', 6), equals('f...rb'));
+
+    expect(Logger.fitToWidth('foobarba', 5), equals('f...a'));
+    expect(Logger.fitToWidth('foobarba', 6), equals('f...ba'));
+    expect(Logger.fitToWidth('foobarba', 7), equals('fo...ba'));
+
+    expect(Logger.fitToWidth('hello\n', 0), equals('\n'));
+    expect(Logger.fitToWidth('hello\n', 1), equals('.\n'));
+    expect(Logger.fitToWidth('hello\n', 2), equals('..\n'));
+    expect(Logger.fitToWidth('hello\n', 3), equals('...\n'));
+    expect(Logger.fitToWidth('hello\n', 4), equals('...o\n'));
+    expect(Logger.fitToWidth('hello\n', 5), equals('hello\n'));
+
+    expect(Logger.fitToWidth('foobar\n', 5), equals('f...r\n'));
+
+    expect(Logger.fitToWidth('foobarb\n', 5), equals('f...b\n'));
+    expect(Logger.fitToWidth('foobarb\n', 6), equals('f...rb\n'));
+
+    expect(Logger.fitToWidth('foobarba\n', 5), equals('f...a\n'));
+    expect(Logger.fitToWidth('foobarba\n', 6), equals('f...ba\n'));
+    expect(Logger.fitToWidth('foobarba\n', 7), equals('fo...ba\n'));
+  });
+
+  test('Spinner calls onFinish callback', () {
+    final Logger logger = Logger.test();
+    bool called = false;
+    final Spinner spinner = logger.startSpinner(
+      onFinish: () {
+        called = true;
+      },
+    );
+    spinner.finish();
+    expect(called, isTrue);
+  });
+}
diff --git a/tools/engine_tool/test/proc_utils_test.dart b/tools/engine_tool/test/proc_utils_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..fd29f7a48f40d4cf4b707ff9cbe4c0ab90914d02
--- /dev/null
+++ b/tools/engine_tool/test/proc_utils_test.dart
@@ -0,0 +1,86 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:ffi' as ffi show Abi;
+import 'dart:io' as io;
+
+import 'package:engine_repo_tools/engine_repo_tools.dart';
+import 'package:engine_tool/src/environment.dart';
+import 'package:engine_tool/src/logger.dart';
+import 'package:engine_tool/src/proc_utils.dart';
+import 'package:engine_tool/src/worker_pool.dart';
+import 'package:litetest/litetest.dart';
+import 'package:platform/platform.dart';
+import 'package:process_fakes/process_fakes.dart';
+import 'package:process_runner/process_runner.dart';
+
+void main() {
+  final Engine engine;
+  try {
+    engine = Engine.findWithin();
+  } catch (e) {
+    io.stderr.writeln(e);
+    io.exitCode = 1;
+    return;
+  }
+
+  (Environment, List<List<String>>) macEnv(Logger logger) {
+    final List<List<String>> runHistory = <List<String>>[];
+    return (
+      Environment(
+        abi: ffi.Abi.macosArm64,
+        engine: engine,
+        platform: FakePlatform(
+            operatingSystem: Platform.macOS,
+            resolvedExecutable: io.Platform.resolvedExecutable),
+        processRunner: ProcessRunner(
+            processManager: FakeProcessManager(onStart: (List<String> command) {
+          runHistory.add(command);
+          switch (command) {
+            case ['success']:
+              return FakeProcess(stdout: 'stdout success');
+            case ['failure']:
+              return FakeProcess(exitCode: 1, stdout: 'stdout failure');
+            default:
+              return FakeProcess();
+          }
+        }, onRun: (List<String> command) {
+          // Should not be executed.
+          assert(false);
+          return io.ProcessResult(81, 1, '', '');
+        })),
+        logger: logger,
+      ),
+      runHistory
+    );
+  }
+
+  test('process queue success', () async {
+    final Logger logger = Logger.test();
+    final (Environment env, _) = macEnv(logger);
+    final WorkerPool wp = WorkerPool(env, NoopWorkerPoolProgressReporter());
+    final ProcessTask task =
+        ProcessTask('S', env, io.Directory.current, <String>['success']);
+    final bool r = await wp.run(<WorkerTask>{task});
+    expect(r, equals(true));
+    expect(task.processArtifacts.exitCode, equals(0));
+    final ProcessArtifacts loaded =
+        ProcessArtifacts.fromFile(io.File(task.processArtifactsPath));
+    expect(loaded.stdout, equals('stdout success'));
+  });
+
+  test('process queue failure', () async {
+    final Logger logger = Logger.test();
+    final (Environment env, _) = macEnv(logger);
+    final WorkerPool wp = WorkerPool(env, NoopWorkerPoolProgressReporter());
+    final ProcessTask task =
+        ProcessTask('F', env, io.Directory.current, <String>['failure']);
+    final bool r = await wp.run(<WorkerTask>{task});
+    expect(r, equals(false));
+    expect(task.processArtifacts.exitCode, notEquals(0));
+    final ProcessArtifacts loaded =
+        ProcessArtifacts.fromFile(io.File(task.processArtifactsPath));
+    expect(loaded.stdout, equals('stdout failure'));
+  });
+}
diff --git a/tools/engine_tool/test/query_command_test.dart b/tools/engine_tool/test/query_command_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..4abed0318507c99107be35d3bfa8c0d264174e93
--- /dev/null
+++ b/tools/engine_tool/test/query_command_test.dart
@@ -0,0 +1,152 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:convert' as convert;
+import 'dart:ffi' as ffi show Abi;
+import 'dart:io' as io;
+
+import 'package:engine_build_configs/engine_build_configs.dart';
+import 'package:engine_repo_tools/engine_repo_tools.dart';
+import 'package:engine_tool/src/commands/command_runner.dart';
+import 'package:engine_tool/src/environment.dart';
+import 'package:engine_tool/src/logger.dart';
+import 'package:litetest/litetest.dart';
+import 'package:logging/logging.dart' as log;
+import 'package:platform/platform.dart';
+import 'package:process_fakes/process_fakes.dart';
+import 'package:process_runner/process_runner.dart';
+
+import 'fixtures.dart' as fixtures;
+
+void main() {
+  final Engine engine;
+  try {
+    engine = Engine.findWithin();
+  } catch (e) {
+    io.stderr.writeln(e);
+    io.exitCode = 1;
+    return;
+  }
+
+  final BuilderConfig linuxTestConfig = BuilderConfig.fromJson(
+    path: 'ci/builders/linux_test_config.json',
+    map: convert.jsonDecode(fixtures.testConfig('Linux'))
+        as Map<String, Object?>,
+  );
+
+  final BuilderConfig macTestConfig = BuilderConfig.fromJson(
+    path: 'ci/builders/mac_test_config.json',
+    map: convert.jsonDecode(fixtures.testConfig('Mac-12'))
+        as Map<String, Object?>,
+  );
+
+  final BuilderConfig winTestConfig = BuilderConfig.fromJson(
+    path: 'ci/builders/win_test_config.json',
+    map: convert.jsonDecode(fixtures.testConfig('Windows-11'))
+        as Map<String, Object?>,
+  );
+
+  final Map<String, BuilderConfig> configs = <String, BuilderConfig>{
+    'linux_test_config': linuxTestConfig,
+    'linux_test_config2': linuxTestConfig,
+    'mac_test_config': macTestConfig,
+    'win_test_config': winTestConfig,
+  };
+
+  Environment linuxEnv(Logger logger) {
+    return Environment(
+      abi: ffi.Abi.linuxX64,
+      engine: engine,
+      platform: FakePlatform(
+          operatingSystem: Platform.linux,
+          resolvedExecutable: io.Platform.resolvedExecutable),
+      processRunner: ProcessRunner(
+        processManager: FakeProcessManager(),
+      ),
+      logger: logger,
+    );
+  }
+
+  List<String> stringsFromLogs(List<log.LogRecord> logs) {
+    return logs.map((log.LogRecord r) => r.message).toList();
+  }
+
+  test('query command returns builds for the host platform.', () async {
+    final Logger logger = Logger.test();
+    final Environment env = linuxEnv(logger);
+    final ToolCommandRunner runner = ToolCommandRunner(
+      environment: env,
+      configs: configs,
+    );
+    final int result = await runner.run(<String>[
+      'query',
+      'builders',
+    ]);
+    expect(result, equals(0));
+    expect(
+      stringsFromLogs(logger.testLogs),
+      equals(<String>[
+        'Add --verbose to see detailed information about each builder\n',
+        '\n',
+        '"linux_test_config" builder:\n',
+        '   "build_name" config\n',
+        '   "host_debug" config\n',
+        '   "android_debug_arm64" config\n',
+        '   "android_debug_rbe_arm64" config\n',
+        '"linux_test_config2" builder:\n',
+        '   "build_name" config\n',
+        '   "host_debug" config\n',
+        '   "android_debug_arm64" config\n',
+        '   "android_debug_rbe_arm64" config\n',
+      ]),
+    );
+  });
+
+  test('query command with --builder returns only from the named builder.',
+      () async {
+    final Logger logger = Logger.test();
+    final Environment env = linuxEnv(logger);
+    final ToolCommandRunner runner = ToolCommandRunner(
+      environment: env,
+      configs: configs,
+    );
+    final int result = await runner.run(<String>[
+      'query',
+      'builders',
+      '--builder',
+      'linux_test_config',
+    ]);
+    expect(result, equals(0));
+    expect(
+        stringsFromLogs(logger.testLogs),
+        equals(<String>[
+          'Add --verbose to see detailed information about each builder\n',
+          '\n',
+          '"linux_test_config" builder:\n',
+          '   "build_name" config\n',
+          '   "host_debug" config\n',
+          '   "android_debug_arm64" config\n',
+          '   "android_debug_rbe_arm64" config\n',
+        ]));
+  });
+
+  test('query command with --all returns all builds.', () async {
+    final Logger logger = Logger.test();
+    final Environment env = linuxEnv(logger);
+    final ToolCommandRunner runner = ToolCommandRunner(
+      environment: env,
+      configs: configs,
+    );
+    final int result = await runner.run(<String>[
+      'query',
+      'builders',
+      '--all',
+    ]);
+    expect(result, equals(0));
+    expect(
+      logger.testLogs.length,
+      equals(30),
+    );
+  });
+}
diff --git a/tools/engine_tool/test/run_command_test.dart b/tools/engine_tool/test/run_command_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..9c2352fdb1864b227bb827d6bb2845b8b477e04e
--- /dev/null
+++ b/tools/engine_tool/test/run_command_test.dart
@@ -0,0 +1,162 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:convert' as convert;
+import 'dart:ffi' as ffi show Abi;
+import 'dart:io' as io;
+
+import 'package:engine_build_configs/engine_build_configs.dart';
+import 'package:engine_repo_tools/engine_repo_tools.dart';
+import 'package:engine_tool/src/commands/command_runner.dart';
+import 'package:engine_tool/src/environment.dart';
+import 'package:engine_tool/src/logger.dart';
+import 'package:engine_tool/src/run_utils.dart';
+import 'package:litetest/litetest.dart';
+import 'package:platform/platform.dart';
+import 'package:process_fakes/process_fakes.dart';
+import 'package:process_runner/process_runner.dart';
+
+import 'fixtures.dart' as fixtures;
+
+void main() {
+  final Engine engine;
+  try {
+    engine = Engine.findWithin();
+  } catch (e) {
+    io.stderr.writeln(e);
+    io.exitCode = 1;
+    return;
+  }
+
+  final BuilderConfig linuxTestConfig = BuilderConfig.fromJson(
+    path: 'ci/builders/linux_test_config.json',
+    map: convert.jsonDecode(fixtures.testConfig('Linux'))
+        as Map<String, Object?>,
+  );
+
+  final BuilderConfig macTestConfig = BuilderConfig.fromJson(
+    path: 'ci/builders/mac_test_config.json',
+    map: convert.jsonDecode(fixtures.testConfig('Mac-12'))
+        as Map<String, Object?>,
+  );
+
+  final BuilderConfig winTestConfig = BuilderConfig.fromJson(
+    path: 'ci/builders/win_test_config.json',
+    map: convert.jsonDecode(fixtures.testConfig('Windows-11'))
+        as Map<String, Object?>,
+  );
+
+  final Map<String, BuilderConfig> configs = <String, BuilderConfig>{
+    'linux_test_config': linuxTestConfig,
+    'linux_test_config2': linuxTestConfig,
+    'mac_test_config': macTestConfig,
+    'win_test_config': winTestConfig,
+  };
+
+  (Environment, List<List<String>>) linuxEnv(Logger logger) {
+    final List<List<String>> runHistory = <List<String>>[];
+    return (
+      Environment(
+        abi: ffi.Abi.linuxX64,
+        engine: engine,
+        platform: FakePlatform(
+            operatingSystem: Platform.linux,
+            resolvedExecutable: io.Platform.resolvedExecutable),
+        processRunner: ProcessRunner(
+          processManager: FakeProcessManager(onStart: (List<String> command) {
+            runHistory.add(command);
+            switch (command) {
+              case ['flutter', 'devices', '--machine']:
+                return FakeProcess(stdout: fixtures.attachedDevices());
+              default:
+                return FakeProcess();
+            }
+          }, onRun: (List<String> command) {
+            // Should not be executed.
+            assert(false);
+            return io.ProcessResult(81, 1, '', '');
+          }),
+        ),
+        logger: logger,
+      ),
+      runHistory
+    );
+  }
+
+  test('run command invokes flutter run', () async {
+    final Logger logger = Logger.test();
+    final (Environment env, List<List<String>> runHistory) = linuxEnv(logger);
+    final ToolCommandRunner runner = ToolCommandRunner(
+      environment: env,
+      configs: configs,
+    );
+    final int result =
+        await runner.run(<String>['run', '--', '--weird_argument']);
+    expect(result, equals(0));
+    expect(runHistory.length, greaterThanOrEqualTo(6));
+    expect(runHistory[5],
+        containsStringsInOrder(<String>['flutter', 'run', '--weird_argument']));
+  });
+
+  test('parse devices list', () async {
+    final Logger logger = Logger.test();
+    final (Environment env, _) = linuxEnv(logger);
+    final List<RunTarget> targets =
+        parseDevices(env, fixtures.attachedDevices());
+    expect(targets.length, equals(4));
+    final RunTarget android = targets[0];
+    expect(android.name, contains('gphone64'));
+    expect(android.buildConfigFor('debug'), equals('android_debug_arm64'));
+  });
+
+  test('default device', () async {
+    final Logger logger = Logger.test();
+    final (Environment env, _) = linuxEnv(logger);
+    final List<RunTarget> targets =
+        parseDevices(env, fixtures.attachedDevices());
+    expect(targets.length, equals(4));
+    final RunTarget? defaultTarget = defaultDevice(env, targets);
+    expect(defaultTarget, isNotNull);
+    expect(defaultTarget!.name, contains('gphone64'));
+    expect(
+        defaultTarget.buildConfigFor('debug'), equals('android_debug_arm64'));
+  });
+
+  test('device select', () async {
+    final Logger logger = Logger.test();
+    final (Environment env, _) = linuxEnv(logger);
+    RunTarget target = selectRunTarget(env, fixtures.attachedDevices())!;
+    expect(target.name, contains('gphone64'));
+    target = selectRunTarget(env, fixtures.attachedDevices(), 'mac')!;
+    expect(target.name, contains('macOS'));
+  });
+
+  test('flutter run device select', () async {
+    final Logger logger = Logger.test();
+    final (Environment env, List<List<String>> runHistory) = linuxEnv(logger);
+    final ToolCommandRunner runner = ToolCommandRunner(
+      environment: env,
+      configs: configs,
+    );
+    // Request that the emulator device is used. The emulator is an Android
+    // ARM64 device.
+    final int result =
+        await runner.run(<String>['run', '--', '-d', 'emulator']);
+    expect(result, equals(0));
+    expect(runHistory.length, greaterThanOrEqualTo(6));
+    // Observe that we selected android_debug_arm64 as the target.
+    expect(
+        runHistory[5],
+        containsStringsInOrder(<String>[
+          'flutter',
+          'run',
+          '--local-engine',
+          'android_debug_arm64',
+          '--local-engine-host',
+          'host_debug',
+          '-d',
+          'emulator'
+        ]));
+  });
+}
diff --git a/tools/engine_tool/test/worker_pool_test.dart b/tools/engine_tool/test/worker_pool_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..ad99d3700c78d19a50de050eb52f6f8d53a2f424
--- /dev/null
+++ b/tools/engine_tool/test/worker_pool_test.dart
@@ -0,0 +1,126 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:ffi' as ffi show Abi;
+import 'dart:io' as io;
+
+import 'package:engine_repo_tools/engine_repo_tools.dart';
+import 'package:engine_tool/src/environment.dart';
+import 'package:engine_tool/src/logger.dart';
+import 'package:engine_tool/src/worker_pool.dart';
+import 'package:litetest/litetest.dart';
+import 'package:platform/platform.dart';
+import 'package:process_fakes/process_fakes.dart';
+import 'package:process_runner/process_runner.dart';
+
+class TestWorkerPoolProgressReporter implements WorkerPoolProgressReporter {
+  int _successCount = 0;
+  int _errorCount = 0;
+  final List<Object> _errors = <Object>[];
+
+  @override
+  void onRun(Set<WorkerTask> tasks) {}
+
+  @override
+  void onFinish() {}
+
+  @override
+  void onTaskStart(WorkerPool pool, WorkerTask task) {}
+
+  @override
+  void onTaskDone(WorkerPool pool, WorkerTask task, [Object? err]) {
+    if (err == null) {
+      _successCount++;
+      return;
+    }
+    _errorCount++;
+    _errors.add(err);
+  }
+}
+
+class SuccessfulTask extends WorkerTask {
+  SuccessfulTask() : super('s');
+
+  @override
+  Future<bool> run() async {
+    return true;
+  }
+}
+
+class FailureTask extends WorkerTask {
+  FailureTask() : super('f');
+
+  @override
+  Future<bool> run() async {
+    throw ArgumentError('test');
+  }
+}
+
+void main() {
+  final Engine engine;
+  try {
+    engine = Engine.findWithin();
+  } catch (e) {
+    io.stderr.writeln(e);
+    io.exitCode = 1;
+    return;
+  }
+
+  (Environment, List<List<String>>) macEnv(Logger logger) {
+    final List<List<String>> runHistory = <List<String>>[];
+    return (
+      Environment(
+        abi: ffi.Abi.macosArm64,
+        engine: engine,
+        platform: FakePlatform(operatingSystem: Platform.macOS),
+        processRunner: ProcessRunner(
+            processManager: FakeProcessManager(onStart: (List<String> command) {
+          runHistory.add(command);
+          switch (command) {
+            case ['success']:
+              return FakeProcess(stdout: 'stdout success');
+            case ['failure']:
+              return FakeProcess(exitCode: 1, stdout: 'stdout failure');
+            default:
+              return FakeProcess();
+          }
+        }, onRun: (List<String> command) {
+          // Should not be executed.
+          assert(false);
+          return io.ProcessResult(81, 1, '', '');
+        })),
+        logger: logger,
+      ),
+      runHistory
+    );
+  }
+
+  test('worker pool success', () async {
+    final Logger logger = Logger.test();
+    final (Environment env, _) = macEnv(logger);
+    final TestWorkerPoolProgressReporter reporter =
+        TestWorkerPoolProgressReporter();
+    final WorkerPool wp = WorkerPool(env, reporter);
+    final WorkerTask task = SuccessfulTask();
+    final bool r = await wp.run(<WorkerTask>{task});
+    expect(r, equals(true));
+    expect(reporter._successCount, equals(1));
+    expect(reporter._errorCount, equals(0));
+    expect(reporter._errors.length, equals(0));
+  });
+
+  test('worker pool failure', () async {
+    final Logger logger = Logger.test();
+    final (Environment env, _) = macEnv(logger);
+    final TestWorkerPoolProgressReporter reporter =
+        TestWorkerPoolProgressReporter();
+    final WorkerPool wp = WorkerPool(env, reporter);
+    final WorkerTask task = FailureTask();
+    final bool r = await wp.run(<WorkerTask>{task});
+    expect(r, equals(false));
+    expect(reporter._successCount, equals(0));
+    expect(reporter._errorCount, equals(1));
+    expect(reporter._errors.length, equals(1));
+  });
+}
diff --git a/tools/font-subset/.gitignore b/tools/font_subset/.gitignore
similarity index 100%
rename from tools/font-subset/.gitignore
rename to tools/font_subset/.gitignore
diff --git a/tools/font-subset/BUILD.gn b/tools/font_subset/BUILD.gn
similarity index 65%
rename from tools/font-subset/BUILD.gn
rename to tools/font_subset/BUILD.gn
index 53df3e102e74ef907724d72042e3743c2f9b03cc..14d23cf6fc031628f1e588b2f11bd267f20b1c0a 100644
--- a/tools/font-subset/BUILD.gn
+++ b/tools/font_subset/BUILD.gn
@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 import("//flutter/build/zip_bundle.gni")
-import("//flutter/shell/version/version.gni")
 
 executable("_font-subset") {
   output_name = "font-subset"
@@ -13,7 +12,7 @@ executable("_font-subset") {
     "main.cc",
   ]
 
-  deps = [ "//third_party/harfbuzz" ]
+  deps = [ "//flutter/third_party/harfbuzz:harfbuzz_subset" ]
 
   if (is_mac) {
     frameworks = [
@@ -28,22 +27,6 @@ executable("_font-subset") {
   }
 }
 
-generated_file("_font-subset-license") {
-  source_path = rebase_path(".", "//flutter")
-  license_path =
-      rebase_path("//flutter/sky/packages/sky_engine/LICENSE", "//flutter")
-  git_url = "https://github.com/flutter/engine/tree/$engine_version"
-  outputs = [ "$target_gen_dir/LICENSE.font-subset.md" ]
-  contents = [
-    "# font-subset",
-    "",
-    "This tool is used by the Flutter SDK to tree shake icon fonts.",
-    "",
-    "Source code for this tool: [flutter/engine/$source_path]($git_url/$source_path).",
-    "License for this tool: [flutter/engine/sky/packages/sky_engine/LICENSE]($git_url/$license_path).",
-  ]
-}
-
 generated_file("font_entitlement_config") {
   outputs = [ "$target_gen_dir/font_subset_without_entitlements.txt" ]
 
@@ -52,7 +35,7 @@ generated_file("font_entitlement_config") {
   deps = [ ":_font-subset" ]
 }
 
-zip_bundle("font-subset") {
+zip_bundle("font_subset") {
   if (is_mac) {
     # Mac artifacts sometimes use mac and sometimes darwin. Standardizing the
     # names will require changes in the list of artifacts the tool is downloading.
@@ -75,15 +58,10 @@ zip_bundle("font-subset") {
       source = "$root_gen_dir/const_finder.dart.snapshot"
       destination = "const_finder.dart.snapshot"
     },
-    {
-      source = "$target_gen_dir/LICENSE.font-subset.md"
-      destination = "LICENSE.font-subset.md"
-    },
   ]
 
   deps = [
     ":_font-subset",
-    ":_font-subset-license",
     "//flutter/tools/const_finder",
   ]
   if (is_mac) {
diff --git a/tools/font-subset/fixtures/1.ttf b/tools/font_subset/fixtures/1.ttf
similarity index 100%
rename from tools/font-subset/fixtures/1.ttf
rename to tools/font_subset/fixtures/1.ttf
diff --git a/tools/font_subset/fixtures/1variable.ttf b/tools/font_subset/fixtures/1variable.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..d503a7888c44bdc91957aa94b794f10ae137a1c9
Binary files /dev/null and b/tools/font_subset/fixtures/1variable.ttf differ
diff --git a/tools/font-subset/fixtures/2.ttf b/tools/font_subset/fixtures/2.ttf
similarity index 100%
rename from tools/font-subset/fixtures/2.ttf
rename to tools/font_subset/fixtures/2.ttf
diff --git a/tools/font_subset/fixtures/2variable.ttf b/tools/font_subset/fixtures/2variable.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..e0552ba3e28c611313b627b0017ddfe1ddfd33e2
Binary files /dev/null and b/tools/font_subset/fixtures/2variable.ttf differ
diff --git a/tools/font-subset/fixtures/3.ttf b/tools/font_subset/fixtures/3.ttf
similarity index 100%
rename from tools/font-subset/fixtures/3.ttf
rename to tools/font_subset/fixtures/3.ttf
diff --git a/tools/font_subset/fixtures/3variable.ttf b/tools/font_subset/fixtures/3variable.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..214cf3997a56c057ba1ad08c56c078c90f34a289
Binary files /dev/null and b/tools/font_subset/fixtures/3variable.ttf differ
diff --git a/tools/font-subset/fixtures/MaterialIcons-Regular.ttf b/tools/font_subset/fixtures/MaterialIcons-Regular.ttf
similarity index 100%
rename from tools/font-subset/fixtures/MaterialIcons-Regular.ttf
rename to tools/font_subset/fixtures/MaterialIcons-Regular.ttf
diff --git a/tools/font_subset/fixtures/MaterialSymbols-Variable.ttf b/tools/font_subset/fixtures/MaterialSymbols-Variable.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..a116bf2357d2ce72a7a932db04971e61867396aa
Binary files /dev/null and b/tools/font_subset/fixtures/MaterialSymbols-Variable.ttf differ
diff --git a/tools/font-subset/gen/.gitkeep b/tools/font_subset/gen/.gitkeep
similarity index 100%
rename from tools/font-subset/gen/.gitkeep
rename to tools/font_subset/gen/.gitkeep
diff --git a/tools/font-subset/hb_wrappers.h b/tools/font_subset/hb_wrappers.h
similarity index 86%
rename from tools/font-subset/hb_wrappers.h
rename to tools/font_subset/hb_wrappers.h
index ee27d74b243e5bb4cedd09435aaf9e0ebd5006e6..c393b115fbbe7140727bf750ac1de5658f080def 100644
--- a/tools/font-subset/hb_wrappers.h
+++ b/tools/font_subset/hb_wrappers.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef HB_WRAPPERS_H_
-#define HB_WRAPPERS_H_
+#ifndef FLUTTER_TOOLS_FONT_SUBSET_HB_WRAPPERS_H_
+#define FLUTTER_TOOLS_FONT_SUBSET_HB_WRAPPERS_H_
 
 #include <hb-subset.h>
 
@@ -34,4 +34,4 @@ using HbSetPtr = std::unique_ptr<hb_set_t, hb_set_deleter>;
 
 };  // namespace HarfbuzzWrappers
 
-#endif  // HB_WRAPPERS_H_s
+#endif  // FLUTTER_TOOLS_FONT_SUBSET_HB_WRAPPERS_H_
diff --git a/tools/font-subset/main.cc b/tools/font_subset/main.cc
similarity index 76%
rename from tools/font-subset/main.cc
rename to tools/font_subset/main.cc
index fc53ef4e61ab89be653f176716c85f8c6d54e480..346cb2f008eeef605a9e3eeb4c49e52a9ff02953 100644
--- a/tools/font-subset/main.cc
+++ b/tools/font_subset/main.cc
@@ -13,15 +13,22 @@
 
 #include "hb_wrappers.h"
 
-hb_codepoint_t ParseCodepoint(const std::string& arg) {
+hb_codepoint_t ParseCodepoint(std::string_view arg, bool& optional) {
+  constexpr std::string_view kOptionalPrefix = "optional:";
+  if (arg.substr(0, kOptionalPrefix.length()) == kOptionalPrefix) {
+    optional = true;
+    arg = arg.substr(kOptionalPrefix.length());
+  } else {
+    optional = false;
+  }
   uint64_t value = 0;
   // Check for \u123, u123, otherwise let strtoul work it out.
   if (arg[0] == 'u') {
-    value = strtoul(arg.c_str() + 1, nullptr, 16);
+    value = strtoul(arg.data() + 1, nullptr, 16);
   } else if (arg[0] == '\\' && arg[1] == 'u') {
-    value = strtoul(arg.c_str() + 2, nullptr, 16);
+    value = strtoul(arg.data() + 2, nullptr, 16);
   } else {
-    value = strtoul(arg.c_str(), nullptr, 0);
+    value = strtoul(arg.data(), nullptr, 0);
   }
   if (value == 0 || value > std::numeric_limits<hb_codepoint_t>::max()) {
     std::cerr << "The value '" << arg << "' (" << value
@@ -43,6 +50,10 @@ void Usage() {
                "and must be input as decimal numbers (123), hexadecimal "
                "numbers (0x7B), or unicode hexadecimal characters (\\u7B)."
             << std::endl;
+  std::cout << "Codepoints can be prefixed by the string \"optional:\" to "
+               "specify that the codepoint can be omitted if it isn't found "
+               "in the input font file."
+            << std::endl;
   std::cout << "Input terminates with a newline." << std::endl;
   std::cout
       << "This program will de-duplicate codepoints if the same codepoint is "
@@ -59,14 +70,20 @@ struct HarfBuzzSubset {
     // The prior version of harfbuzz automatically dropped layout tables,
     // but in the new version they are kept by default. So re-add them to the
     // drop list to retain the same behaviour.
-
-    hb_set_add(hb_subset_input_set(input, HB_SUBSET_SETS_DROP_TABLE_TAG),
-               HB_TAG('G', 'S', 'U', 'B'));
-    hb_set_add(hb_subset_input_set(input, HB_SUBSET_SETS_DROP_TABLE_TAG),
-               HB_TAG('G', 'P', 'O', 'S'));
-    hb_set_add(hb_subset_input_set(input, HB_SUBSET_SETS_DROP_TABLE_TAG),
-               HB_TAG('G', 'D', 'E', 'F'));
-
+    if (!hb_ot_var_has_data(face) || hb_ot_var_get_axis_count(face) == 0) {
+      // we can only drop GSUB/GPOS/GDEF for non variable fonts, they may be
+      // needed for variable fonts (guessing we need to keep all of these, but
+      // in Material Symbols Icon variable fonts if we drop the GSUB table (they
+      // do not have GPOS/DEF) then the Fill=1,Weight=100 variation is rendered
+      // incorrect. (and other variations are probably less noticibly
+      // incorrect))
+      hb_set_add(hb_subset_input_set(input, HB_SUBSET_SETS_DROP_TABLE_TAG),
+                 HB_TAG('G', 'S', 'U', 'B'));
+      hb_set_add(hb_subset_input_set(input, HB_SUBSET_SETS_DROP_TABLE_TAG),
+                 HB_TAG('G', 'P', 'O', 'S'));
+      hb_set_add(hb_subset_input_set(input, HB_SUBSET_SETS_DROP_TABLE_TAG),
+                 HB_TAG('G', 'D', 'E', 'F'));
+    }
     return HarfbuzzWrappers::HbFacePtr(hb_subset_or_fail(face, input));
   }
 };
@@ -107,13 +124,21 @@ int main(int argc, char** argv) {
     hb_face_collect_unicodes(font_face.get(), actual_codepoints.get());
     std::string raw_codepoint;
     while (std::cin >> raw_codepoint) {
-      auto codepoint = ParseCodepoint(raw_codepoint);
+      bool optional = false;
+      auto codepoint =
+          ParseCodepoint(std::string_view(raw_codepoint), optional);
       if (!codepoint) {
         std::cerr << "Invalid codepoint for " << raw_codepoint << "; exiting."
                   << std::endl;
         return -1;
       }
+
       if (!hb_set_has(actual_codepoints.get(), codepoint)) {
+        if (optional) {
+          // Code point is optional, so omit it.
+          continue;
+        }
+
         std::cerr << "Codepoint " << raw_codepoint
                   << " not found in font, aborting." << std::endl;
         return -1;
diff --git a/tools/font-subset/test.py b/tools/font_subset/test.py
similarity index 32%
rename from tools/font-subset/test.py
rename to tools/font_subset/test.py
index fff6f89b86507aee26ff192a2efbd1a8512cbd14..ae8554d30e5bb18a179a136b0736d021b24dc117 100755
--- a/tools/font-subset/test.py
+++ b/tools/font_subset/test.py
@@ -8,55 +8,31 @@
 Tests for font-subset
 '''
 
+import argparse
 import filecmp
 import os
 import subprocess
 import sys
 from zipfile import ZipFile
 
-# Dictionary to map the platform name to the output directory
-# of the font artifacts.
-PLATFORM_2_PATH = {
-    'darwin': 'darwin-x64',
-    'linux': 'linux-x64',
-    'linux2': 'linux-x64',
-    'cygwin': 'windows-x64',
-    'win': 'windows-x64',
-    'win32': 'windows-x64',
-}
-
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 SRC_DIR = os.path.normpath(os.path.join(SCRIPT_DIR, '..', '..', '..'))
 MATERIAL_TTF = os.path.join(SCRIPT_DIR, 'fixtures', 'MaterialIcons-Regular.ttf')
-IS_WINDOWS = sys.platform.startswith(('cygwin', 'win'))
-EXE = '.exe' if IS_WINDOWS else ''
-BAT = '.bat' if IS_WINDOWS else ''
-FONT_SUBSET = os.path.join(SRC_DIR, 'out', 'host_debug', 'font-subset' + EXE)
-FONT_SUBSET_ZIP = os.path.join(
-    SRC_DIR, 'out', 'host_debug', 'zip_archives',
-    PLATFORM_2_PATH.get(sys.platform, ''), 'font-subset.zip'
-)
-if not os.path.isfile(FONT_SUBSET):
-  FONT_SUBSET = os.path.join(
-      SRC_DIR, 'out', 'host_debug_unopt', 'font-subset' + EXE
-  )
-  FONT_SUBSET_ZIP = os.path.join(
-      SRC_DIR, 'out', 'host_debug_unopt', 'zip_archives',
-      PLATFORM_2_PATH.get(sys.platform, ''), 'font-subset.zip'
-  )
-if not os.path.isfile(FONT_SUBSET):
-  raise Exception(
-      'Could not locate font-subset%s in host_debug or host_debug_unopt - build before running this script.'
-      % EXE
-  )
+VARIABLE_MATERIAL_TTF = os.path.join(SCRIPT_DIR, 'fixtures', 'MaterialSymbols-Variable.ttf')
 
 COMPARE_TESTS = (
     (True, '1.ttf', MATERIAL_TTF, [r'57347']),
     (True, '1.ttf', MATERIAL_TTF, [r'0xE003']),
     (True, '1.ttf', MATERIAL_TTF, [r'\uE003']),
-    (False, '1.ttf', MATERIAL_TTF, [r'57348'
-                                   ]),  # False because different codepoint
+    (False, '1.ttf', MATERIAL_TTF, [r'57348']),  # False because different codepoint
     (True, '2.ttf', MATERIAL_TTF, [r'0xE003', r'0xE004']),
+    (True, '2.ttf', MATERIAL_TTF, [r'0xE003',
+                                   r'optional:0xE004']),  # Optional codepoint that is found
+    (True, '2.ttf', MATERIAL_TTF, [
+        r'0xE003',
+        r'0xE004',
+        r'optional:0x12',
+    ]),  # Optional codepoint that is not found
     (True, '2.ttf', MATERIAL_TTF, [
         r'0xE003',
         r'0xE004',
@@ -67,47 +43,85 @@ COMPARE_TESTS = (
         r'0xE004',
         r'0xE021',
     ]),
+    # repeat tests with variable input font and verified variable output goldens
+    (True, '1variable.ttf', VARIABLE_MATERIAL_TTF, [r'57347']),
+    (True, '1variable.ttf', VARIABLE_MATERIAL_TTF, [r'0xE003']),
+    (True, '1variable.ttf', VARIABLE_MATERIAL_TTF, [r'\uE003']),
+    (False, '1variable.ttf', VARIABLE_MATERIAL_TTF, [r'57348'
+                                                    ]),  # False because different codepoint
+    (True, '2variable.ttf', VARIABLE_MATERIAL_TTF, [r'0xE003', r'0xE004']),
+    (True, '2variable.ttf', VARIABLE_MATERIAL_TTF, [
+        r'0xE003',
+        r'0xE004',
+        r'57347',
+    ]),  # Duplicated codepoint
+    (True, '3variable.ttf', VARIABLE_MATERIAL_TTF, [
+        r'0xE003',
+        r'0xE004',
+        r'0xE021',
+    ]),
 )
 
-FAIL_TESTS = [
-    ([FONT_SUBSET, 'output.ttf', 'does-not-exist.ttf'], [
-        '1',
-    ]),  # non-existent input font
-    ([FONT_SUBSET, 'output.ttf', MATERIAL_TTF], [
-        '0xFFFFFFFF',
-    ]),  # Value too big.
-    ([FONT_SUBSET, 'output.ttf', MATERIAL_TTF], [
-        '-1',
-    ]),  # invalid value
-    ([FONT_SUBSET, 'output.ttf', MATERIAL_TTF], [
-        'foo',
-    ]),  # no valid values
-    ([FONT_SUBSET, 'output.ttf', MATERIAL_TTF], [
-        '0xE003',
-        '0x12',
-        '0xE004',
-    ]),  # codepoint not in font
-    ([FONT_SUBSET, 'non-existent-dir/output.ttf', MATERIAL_TTF], [
-        '0xE003',
-    ]),  # dir doesn't exist
-    ([FONT_SUBSET, 'output.ttf', MATERIAL_TTF], [
-        ' ',
-    ]),  # empty input
-    ([FONT_SUBSET, 'output.ttf', MATERIAL_TTF], []),  # empty input
-    ([FONT_SUBSET, 'output.ttf', MATERIAL_TTF], ['']),  # empty input
-]
-
-
-def RunCmd(cmd, codepoints, fail=False):
+
+def fail_tests(font_subset):
+  return [
+      ([font_subset, 'output.ttf', 'does-not-exist.ttf'], [
+          '1',
+      ]),  # non-existent input font
+      ([font_subset, 'output.ttf', MATERIAL_TTF], [
+          '0xFFFFFFFF',
+      ]),  # Value too big.
+      ([font_subset, 'output.ttf', MATERIAL_TTF], [
+          '-1',
+      ]),  # invalid value
+      ([font_subset, 'output.ttf', MATERIAL_TTF], [
+          'foo',
+      ]),  # no valid values
+      ([font_subset, 'output.ttf', MATERIAL_TTF], [
+          '0xE003',
+          '0x12',
+          '0xE004',
+      ]),  # codepoint not in font
+      ([font_subset, 'non-existent-dir/output.ttf', MATERIAL_TTF], [
+          '0xE003',
+      ]),  # dir doesn't exist
+      ([font_subset, 'output.ttf', MATERIAL_TTF], [
+          ' ',
+      ]),  # empty input
+      ([font_subset, 'output.ttf', MATERIAL_TTF], []),  # empty input
+      ([font_subset, 'output.ttf', MATERIAL_TTF], ['']),  # empty input
+      # repeat tests with variable input font
+      ([font_subset, 'output.ttf', VARIABLE_MATERIAL_TTF], [
+          '0xFFFFFFFF',
+      ]),  # Value too big.
+      ([font_subset, 'output.ttf', VARIABLE_MATERIAL_TTF], [
+          '-1',
+      ]),  # invalid value
+      ([font_subset, 'output.ttf', VARIABLE_MATERIAL_TTF], [
+          'foo',
+      ]),  # no valid values
+      ([font_subset, 'output.ttf', VARIABLE_MATERIAL_TTF], [
+          '0xE003',
+          '0x12',
+          '0xE004',
+      ]),  # codepoint not in font
+      ([font_subset, 'non-existent-dir/output.ttf', VARIABLE_MATERIAL_TTF], [
+          '0xE003',
+      ]),  # dir doesn't exist
+      ([font_subset, 'output.ttf', VARIABLE_MATERIAL_TTF], [
+          ' ',
+      ]),  # empty input
+      ([font_subset, 'output.ttf', VARIABLE_MATERIAL_TTF], []),  # empty input
+      ([font_subset, 'output.ttf', VARIABLE_MATERIAL_TTF], ['']),  # empty input
+  ]
+
+
+def run_cmd(cmd, codepoints, fail=False):
   print('Running command:')
   print('       %s' % ' '.join(cmd))
   print('STDIN: "%s"' % ' '.join(codepoints))
   p = subprocess.Popen(
-      cmd,
-      stdout=subprocess.PIPE,
-      stdin=subprocess.PIPE,
-      stderr=subprocess.PIPE,
-      cwd=SRC_DIR
+      cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.PIPE, cwd=SRC_DIR
   )
   stdout_data, stderr_data = p.communicate(input=' '.join(codepoints).encode())
   if p.returncode != 0 and fail == False:
@@ -128,34 +142,65 @@ def RunCmd(cmd, codepoints, fail=False):
   return p.returncode
 
 
-def TestZip():
-  with ZipFile(FONT_SUBSET_ZIP, 'r') as zip:
+def test_zip(font_subset_zip, exe):
+  with ZipFile(font_subset_zip, 'r') as zip:
     files = zip.namelist()
-    if 'font-subset%s' % EXE not in files:
-      print('expected %s to contain font-subset%s' % (files, EXE))
+    if 'font-subset%s' % exe not in files:
+      print('expected %s to contain font-subset%s' % (files, exe))
       return 1
     return 0
 
 
+# Maps the platform name to the output directory of the font artifacts.
+def platform_to_path(os, cpu):
+  d = {
+      'darwin': 'darwin-',
+      'linux': 'linux-',
+      'linux2': 'linux-',
+      'cygwin': 'windows-',
+      'win': 'windows-',
+      'win32': 'windows-',
+  }
+  return d[os] + cpu
+
+
 def main():
-  print('Using font subset binary at %s (%s)' % (FONT_SUBSET, FONT_SUBSET_ZIP))
+  parser = argparse.ArgumentParser(description='Runs font-subset tests.')
+  parser.add_argument('--variant', type=str, required=True)
+  parser.add_argument('--target-cpu', type=str, default='x64')
+  args = parser.parse_args()
+  variant = args.variant
+
+  is_windows = sys.platform.startswith(('cygwin', 'win'))
+  exe = '.exe' if is_windows else ''
+  font_subset = os.path.join(SRC_DIR, 'out', variant, 'font-subset' + exe)
+  font_subset_zip = os.path.join(
+      SRC_DIR, 'out', variant, 'zip_archives', platform_to_path(sys.platform, args.target_cpu),
+      'font-subset.zip'
+  )
+  if not os.path.isfile(font_subset):
+    raise Exception(
+        'Could not locate font-subset%s in %s - build before running this script.' % (exe, variant)
+    )
+
+  print('Using font subset binary at %s (%s)' % (font_subset, font_subset_zip))
   failures = 0
 
-  failures += TestZip()
+  failures += test_zip(font_subset_zip, exe)
 
   for should_pass, golden_font, input_font, codepoints in COMPARE_TESTS:
     gen_ttf = os.path.join(SCRIPT_DIR, 'gen', golden_font)
     golden_ttf = os.path.join(SCRIPT_DIR, 'fixtures', golden_font)
-    cmd = [FONT_SUBSET, gen_ttf, input_font]
-    RunCmd(cmd, codepoints)
+    cmd = [font_subset, gen_ttf, input_font]
+    run_cmd(cmd, codepoints)
     cmp = filecmp.cmp(gen_ttf, golden_ttf, shallow=False)
     if (should_pass and not cmp) or (not should_pass and cmp):
       print('Test case %s failed.' % cmd)
       failures += 1
 
   with open(os.devnull, 'w') as devnull:
-    for cmd, codepoints in FAIL_TESTS:
-      if RunCmd(cmd, codepoints, fail=True) == 0:
+    for cmd, codepoints in fail_tests(font_subset):
+      if run_cmd(cmd, codepoints, fail=True) == 0:
         failures += 1
 
   if failures > 0:
diff --git a/tools/fuchsia/build_fuchsia_artifacts.py b/tools/fuchsia/build_fuchsia_artifacts.py
index f3954b28d560bb525ed3d2ce404866cda8454fd4..e170a699555f552bb300cb9c6033931febe2e2b3 100755
--- a/tools/fuchsia/build_fuchsia_artifacts.py
+++ b/tools/fuchsia/build_fuchsia_artifacts.py
@@ -59,9 +59,7 @@ def GetHostArchFromPlatform():
 
 
 def GetPMBinPath():
-  return os.path.join(
-      GetFuchsiaSDKPath(), 'tools', GetHostArchFromPlatform(), 'pm'
-  )
+  return os.path.join(GetFuchsiaSDKPath(), 'tools', GetHostArchFromPlatform(), 'pm')
 
 
 def RunExecutable(command):
@@ -69,10 +67,7 @@ def RunExecutable(command):
 
 
 def RunGN(variant_dir, flags):
-  print(
-      'Running gn for variant "%s" with flags: %s' %
-      (variant_dir, ','.join(flags))
-  )
+  print('Running gn for variant "%s" with flags: %s' % (variant_dir, ','.join(flags)))
   RunExecutable([
       os.path.join('flutter', 'tools', 'gn'),
   ] + flags)
@@ -83,9 +78,8 @@ def RunGN(variant_dir, flags):
 def BuildNinjaTargets(variant_dir, targets):
   assert os.path.exists(os.path.join(_out_dir, variant_dir))
 
-  print('Running autoninja for targets: %s', targets)
-  RunExecutable(['autoninja', '-C',
-                 os.path.join(_out_dir, variant_dir)] + targets)
+  print('Running autoninja for targets: %s' % targets)
+  RunExecutable(['autoninja', '-C', os.path.join(_out_dir, variant_dir)] + targets)
 
 
 def RemoveDirectoryIfExists(path):
@@ -129,16 +123,14 @@ def CopyGenSnapshotIfExists(source, destination):
   FindFileAndCopyTo('gen_snapshot', source_root, destination_base)
   FindFileAndCopyTo('gen_snapshot_product', source_root, destination_base)
   FindFileAndCopyTo(
-      'kernel_compiler.dart.snapshot', source_root, destination_base,
-      'kernel_compiler.snapshot'
+      'kernel_compiler.dart.snapshot', source_root, destination_base, 'kernel_compiler.snapshot'
   )
   FindFileAndCopyTo(
       'frontend_server.dart.snapshot', source_root, destination_base,
       'flutter_frontend_server.snapshot'
   )
   FindFileAndCopyTo(
-      'list_libraries.dart.snapshot', source_root, destination_base,
-      'list_libraries.snapshot'
+      'list_libraries.dart.snapshot', source_root, destination_base, 'list_libraries.snapshot'
   )
 
 
@@ -154,9 +146,7 @@ def CopyZirconFFILibIfExists(source, destination):
   FindFileAndCopyTo('libzircon_ffi.so', source_root, destination_base)
 
 
-def CopyToBucketWithMode(
-    source, destination, aot, product, runner_type, api_level
-):
+def CopyToBucketWithMode(source, destination, aot, product, runner_type, api_level):
   mode = 'aot' if aot else 'jit'
   product_suff = '_product' if product else ''
   runner_name = '%s_%s%s_runner' % (runner_type, mode, product_suff)
@@ -188,23 +178,21 @@ def CopyToBucket(src, dst, product=False):
 
 
 def ReadTargetAPILevel():
-  filename = os.path.join(os.path.dirname(__file__), 'target_api_level')
+  filename = os.path.join(os.path.dirname(__file__), '../../build/config/fuchsia/gn_configs.gni')
   with open(filename) as f:
-    api_level = f.read().rstrip('\n')
-  return api_level
+    for line in f:
+      if line.startswith('fuchsia_target_api_level'):
+        return line.split('=')[-1].strip()
+  assert False, 'No fuchsia_target_api_level found in //flutter/build/config/fuchsia/gn_configs.gni'
 
 
 def CopyVulkanDepsToBucket(src, dst, arch):
   sdk_path = GetFuchsiaSDKPath()
   deps_bucket_path = os.path.join(_bucket_directory, dst)
   if not os.path.exists(deps_bucket_path):
+    FindFileAndCopyTo('VkLayer_khronos_validation.json', '%s/pkg' % (sdk_path), deps_bucket_path)
     FindFileAndCopyTo(
-        'VkLayer_khronos_validation.json', '%s/pkg' % (sdk_path),
-        deps_bucket_path
-    )
-    FindFileAndCopyTo(
-        'VkLayer_khronos_validation.so', '%s/arch/%s' % (sdk_path, arch),
-        deps_bucket_path
+        'VkLayer_khronos_validation.so', '%s/arch/%s' % (sdk_path, arch), deps_bucket_path
     )
 
 
@@ -234,10 +222,7 @@ def CopyBuildToBucket(runtime_mode, arch, optimized, product):
   # are about to package.
   bucket_root = os.path.join(_bucket_directory, 'flutter')
   licenses_root = os.path.join(_src_root_dir, 'flutter/ci/licenses_golden')
-  license_files = [
-      'licenses_flutter', 'licenses_fuchsia', 'licenses_gpu', 'licenses_skia',
-      'licenses_third_party'
-  ]
+  license_files = ['licenses_flutter', 'licenses_fuchsia', 'licenses_skia', 'licenses_third_party']
   for license in license_files:
     src_path = os.path.join(licenses_root, license)
     dst_path = os.path.join(bucket_root, license)
@@ -313,8 +298,8 @@ def ProcessCIPDPackage(upload, engine_version):
 
 
 def BuildTarget(
-    runtime_mode, arch, optimized, enable_lto, enable_legacy, asan,
-    dart_version_git_info, prebuilt_dart_sdk, build_targets
+    runtime_mode, arch, optimized, enable_lto, enable_legacy, asan, dart_version_git_info,
+    prebuilt_dart_sdk, build_targets
 ):
   unopt = "_unopt" if not optimized else ""
   out_dir = 'fuchsia_%s%s_%s' % (runtime_mode, unopt, arch)
@@ -362,11 +347,7 @@ def main():
       help='If set, uploads the CIPD package and tags it as the latest.'
   )
 
-  parser.add_argument(
-      '--engine-version',
-      required=False,
-      help='Specifies the flutter engine SHA.'
-  )
+  parser.add_argument('--engine-version', required=False, help='Specifies the flutter engine SHA.')
 
   parser.add_argument(
       '--unoptimized',
@@ -376,15 +357,10 @@ def main():
   )
 
   parser.add_argument(
-      '--runtime-mode',
-      type=str,
-      choices=['debug', 'profile', 'release', 'all'],
-      default='all'
+      '--runtime-mode', type=str, choices=['debug', 'profile', 'release', 'all'], default='all'
   )
 
-  parser.add_argument(
-      '--archs', type=str, choices=['x64', 'arm64', 'all'], default='all'
-  )
+  parser.add_argument('--archs', type=str, choices=['x64', 'arm64', 'all'], default='all')
 
   parser.add_argument(
       '--asan',
@@ -394,10 +370,7 @@ def main():
   )
 
   parser.add_argument(
-      '--no-lto',
-      action='store_true',
-      default=False,
-      help='If set, disables LTO for the build.'
+      '--no-lto', action='store_true', default=False, help='If set, disables LTO for the build.'
   )
 
   parser.add_argument(
@@ -417,10 +390,8 @@ def main():
   parser.add_argument(
       '--targets',
       default='',
-      help=(
-          'Comma-separated list; adds additional targets to build for '
-          'Fuchsia.'
-      )
+      help=('Comma-separated list; adds additional targets to build for '
+            'Fuchsia.')
   )
 
   parser.add_argument(
@@ -477,9 +448,8 @@ def main():
       if build_mode == 'all' or runtime_mode == build_mode:
         if not args.skip_build:
           BuildTarget(
-              runtime_mode, arch, optimized, enable_lto, enable_legacy,
-              args.asan, not args.no_dart_version_git_info,
-              not args.no_prebuilt_dart_sdk,
+              runtime_mode, arch, optimized, enable_lto, enable_legacy, args.asan,
+              not args.no_dart_version_git_info, not args.no_prebuilt_dart_sdk,
               args.targets.split(",") if args.targets else ['flutter']
           )
         CopyBuildToBucket(runtime_mode, arch, optimized, product)
@@ -495,9 +465,17 @@ def main():
         if args.copy_unoptimized_debug_artifacts and runtime_mode == 'debug' and optimized:
           CopyBuildToBucket(runtime_mode, arch, not optimized, product)
 
+  # Set revision to HEAD if empty and remove upload. This is to support
+  # presubmit workflows.
+  should_upload = args.upload
+  engine_version = args.engine_version
+  if not engine_version:
+    engine_version = 'HEAD'
+    should_upload = False
+
   # Create and optionally upload CIPD package
   if args.cipd_dry_run or args.upload:
-    ProcessCIPDPackage(args.upload, args.engine_version)
+    ProcessCIPDPackage(should_upload, engine_version)
 
   return 0
 
diff --git a/tools/fuchsia/build_fuchsia_artifacts_test.py b/tools/fuchsia/build_fuchsia_artifacts_test.py
new file mode 100755
index 0000000000000000000000000000000000000000..466ca4339db82d38c86c638d8fd2f6729dcbc0a0
--- /dev/null
+++ b/tools/fuchsia/build_fuchsia_artifacts_test.py
@@ -0,0 +1,18 @@
+#!/usr/bin/env vpython3
+
+import unittest
+
+import build_fuchsia_artifacts
+
+
+class BuildFuchsiaArtifactsTest(unittest.TestCase):
+
+  def test_read_fuchsia_target_api_level(self):
+    # It's expected to update this test each time the fuchsia_target_api_level
+    # in //flutter/build/config/fuchsia/gn_configs.gni is changed, so it won't
+    # accidentally publishing the artifacts with a wrong api level suffix.
+    self.assertEqual(build_fuchsia_artifacts.ReadTargetAPILevel(), '16')
+
+
+if __name__ == '__main__':
+  unittest.main()
diff --git a/tools/fuchsia/clang.gni b/tools/fuchsia/clang.gni
index cdb8e7f07294e8571633f00b105d3e255e59c193..a858227f8e85218f12349ef542914eab4bef9d49 100644
--- a/tools/fuchsia/clang.gni
+++ b/tools/fuchsia/clang.gni
@@ -2,10 +2,12 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/toolchain/toolchain.gni")
+
 declare_args() {
   # The default clang toolchain provided by the prebuilt. This variable is
   # additionally consumed by the Go toolchain.
-  clang_base = rebase_path("//buildtools/${host_os}-${host_cpu}/clang/lib")
+  clang_base = rebase_path("$buildtools_path/${host_os}-${host_cpu}/clang/lib")
 }
 
 if (current_cpu == "arm64") {
diff --git a/tools/fuchsia/compile_cml.py b/tools/fuchsia/compile_cml.py
deleted file mode 100755
index 48a59dfe74b6aff9b75ac65d59999eb60dd062a0..0000000000000000000000000000000000000000
--- a/tools/fuchsia/compile_cml.py
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright 2013 The Flutter Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-""" Compiles a cml manifest file.
-"""
-
-import argparse
-import os
-import subprocess
-import sys
-
-
-def main():
-  parser = argparse.ArgumentParser()
-
-  parser.add_argument(
-      '--cmc-bin', dest='cmc_bin', action='store', required=True
-  )
-  parser.add_argument('--output', dest='output', action='store', required=True)
-  parser.add_argument(
-      '--manifest-file', dest='manifest_file', action='store', required=True
-  )
-  parser.add_argument(
-      '--includepath',
-      dest='includepath',
-      action='append',
-      required=True,
-  )
-
-  args = parser.parse_args()
-
-  assert os.path.exists(args.cmc_bin)
-  assert os.path.exists(args.manifest_file)
-
-  subprocess.check_output([
-      args.cmc_bin,
-      'compile',
-      '--output',
-      args.output,
-      args.manifest_file,
-  ] + (args.includepath and ['--includepath'] + args.includepath))
-
-  return 0
-
-
-if __name__ == '__main__':
-  sys.exit(main())
diff --git a/tools/fuchsia/copy_debug_symbols.py b/tools/fuchsia/copy_debug_symbols.py
index d92a0be603bc9190d0edbba7134317fbd647afca..cc5842f092ccbbe520e176cf8eaaa1f0b4739293 100755
--- a/tools/fuchsia/copy_debug_symbols.py
+++ b/tools/fuchsia/copy_debug_symbols.py
@@ -45,17 +45,14 @@ def GetBuildIdParts(exec_path, read_elf):
   file_out = subprocess.check_output([read_elf, '-n', exec_path])
   build_id_line = file_out.splitlines()[-1].split()
   if (build_id_line[0] != b'Build' or build_id_line[1] != b'ID:' or
-      not sha1_pattern.match(str(build_id_line[-1])) or
-      not len(build_id_line[-1]) > 2):
+      not sha1_pattern.match(str(build_id_line[-1])) or not len(build_id_line[-1]) > 2):
     raise Exception(
-        'Expected the last line of llvm-readelf to match "Build ID <Hex String>" Got: %s'
-        % file_out
+        'Expected the last line of llvm-readelf to match "Build ID <Hex String>" Got: %s' % file_out
     )
 
   build_id = build_id_line[-1]
   return {
-      'build_id': build_id.decode('utf-8'),
-      'prefix_dir': build_id[:2].decode('utf-8'),
+      'build_id': build_id.decode('utf-8'), 'prefix_dir': build_id[:2].decode('utf-8'),
       'exec_name': build_id[2:].decode('utf-8')
   }
 
@@ -106,11 +103,9 @@ def main():
   )
 
   args = parser.parse_args()
-  assert os.path.exists(args.exec_path
-                       ), ('exec_path "%s" does not exist' % args.exec_path)
+  assert os.path.exists(args.exec_path), ('exec_path "%s" does not exist' % args.exec_path)
   assert os.path.exists(args.dest), ('dest "%s" does not exist' % args.dest)
-  assert os.path.exists(args.read_elf
-                       ), ('read_elf "%s" does not exist' % args.read_elf)
+  assert os.path.exists(args.read_elf), ('read_elf "%s" does not exist' % args.read_elf)
 
   parts = GetBuildIdParts(args.exec_path, args.read_elf)
   dbg_prefix_base = os.path.join(args.dest, parts['prefix_dir'])
@@ -135,8 +130,7 @@ def main():
 
   # If the debug file hasn't changed, don't rewrite the debug and completion
   # file, speeding up incremental builds.
-  if os.path.exists(dbg_file_path) and HashFile(args.exec_path
-                                               ) == HashFile(dbg_file_path):
+  if os.path.exists(dbg_file_path) and HashFile(args.exec_path) == HashFile(dbg_file_path):
     return 0
 
   shutil.copyfile(args.exec_path, dbg_file_path)
diff --git a/tools/fuchsia/copy_path.py b/tools/fuchsia/copy_path.py
index 5f3be36637364f023c667502a89c7d36b7c28989..7f46cb09180576b835723101a1a9d74194388c01 100755
--- a/tools/fuchsia/copy_path.py
+++ b/tools/fuchsia/copy_path.py
@@ -50,9 +50,7 @@ def CopyPath(src, dst):
 def main():
   parser = argparse.ArgumentParser()
 
-  parser.add_argument(
-      '--file-list', dest='file_list', action='store', required=True
-  )
+  parser.add_argument('--file-list', dest='file_list', action='store', required=True)
 
   args = parser.parse_args()
 
diff --git a/tools/fuchsia/dart.gni b/tools/fuchsia/dart.gni
index 534acb52eae679575a128661eed23e0b39dec7da..d5289a84b5cfa0324cf5089c447b02c355e6473c 100644
--- a/tools/fuchsia/dart.gni
+++ b/tools/fuchsia/dart.gni
@@ -2,13 +2,14 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-gen_snapshot = "//third_party/dart/runtime/bin:gen_snapshot"
-gen_snapshot_product = "//third_party/dart/runtime/bin:gen_snapshot_product"
+import("//flutter/build/dart/dart.gni")
 
-prebuilt_dart = "//third_party/dart/tools/sdks/dart-sdk/bin/dart"
+gen_snapshot = "$dart_src/runtime/bin:gen_snapshot"
+gen_snapshot_product = "$dart_src/runtime/bin:gen_snapshot_product"
 
-observatory_target =
-    "//third_party/dart/runtime/observatory:observatory_archive"
+prebuilt_dart = "$dart_src/tools/sdks/dart-sdk/bin/dart"
+
+observatory_target = "$dart_src/runtime/observatory:observatory_archive"
 observatory_archive_dir = get_label_info(observatory_target, "target_gen_dir")
 observatory_archive_name = get_label_info(observatory_target, "name")
 observatory_archive_file =
diff --git a/tools/fuchsia/dart/BUILD.gn b/tools/fuchsia/dart/BUILD.gn
index a1efa3520a65d91d3e0d38dcccc0ec2d1319f1db..b68777d2b418c88392c04c2ce7a2c0fcc49a8808 100644
--- a/tools/fuchsia/dart/BUILD.gn
+++ b/tools/fuchsia/dart/BUILD.gn
@@ -17,6 +17,6 @@ if (current_toolchain == default_toolchain) {
 
 if (current_toolchain != default_toolchain) {
   sdk_targets("dart_library") {
-    meta = "$fuchsia_sdk_path/meta/manifest.json"
+    meta = "$fuchsia_sdk/meta/manifest.json"
   }
 }
diff --git a/tools/fuchsia/dart/dart_component.gni b/tools/fuchsia/dart/dart_component.gni
index 7e76ebf80e3495cc4f14cddc8663cbf41277526b..8cf19ba8a3f8782c8ed24ea2b18120cb2436bc41 100644
--- a/tools/fuchsia/dart/dart_component.gni
+++ b/tools/fuchsia/dart/dart_component.gni
@@ -81,9 +81,6 @@ import("//flutter/tools/fuchsia/flutter/internal/flutter_dart_component.gni")
 #     Specifies the parameters for building the component.
 #     See //build/dart/dart_build_config.gni for predefined configs.
 #
-#   null_safe (optional)
-#    If true, this component will be compiled with --sound-null-safety
-#
 #  deps
 #  testonly
 #  visibility
@@ -123,7 +120,6 @@ template("dart_component") {
                              "build_cfg",
                              "deps",
                              "main_dart",
-                             "null_safe",
                            ])
     main_package = _main_package
     deps = _component_deps
diff --git a/tools/fuchsia/dart/dart_library.gni b/tools/fuchsia/dart/dart_library.gni
index 5eea0fe04e991c8d1588615e4deb10f975ae9874..ed3ded2cc930fada780050350818b3bb741787ad 100644
--- a/tools/fuchsia/dart/dart_library.gni
+++ b/tools/fuchsia/dart/dart_library.gni
@@ -76,9 +76,6 @@ import("//flutter/tools/fuchsia/dart/toolchain.gni")
 #   disable_metadata_entry (optional)
 #     Prevents metedata entry from being written to the dart_packag_config json file.
 #
-#   null_safe (optional)
-#     A flag that enables null safety check in dart libraries.
-#
 # Example of usage:
 #
 #   dart_library("baz") {
@@ -183,10 +180,10 @@ if (current_toolchain == dart_toolchain) {
           name = package_name
           if (defined(invoker.language_version)) {
             language_version = invoker.language_version
-          } else if (defined(invoker.null_safe) && invoker.null_safe) {
-            language_version = "2.12"
           } else if (defined(invoker.pubspec)) {
             pubspec_path = rebase_path(invoker.pubspec, root_build_dir)
+          } else {
+            language_version = "2.12"
           }
           root_uri = rebase_path(package_root, root_build_dir)
           if (defined(invoker.source_dir)) {
diff --git a/tools/fuchsia/dart/fidl_dart.gni b/tools/fuchsia/dart/fidl_dart.gni
deleted file mode 100644
index 06f0d0bb551fe30ec55d344d7411f874737f09ed..0000000000000000000000000000000000000000
--- a/tools/fuchsia/dart/fidl_dart.gni
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 2013 The Flutter Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//flutter/tools/executable_action.gni")
-import("//flutter/tools/fuchsia/dart/dart_library.gni")
-import("//flutter/tools/fuchsia/dart/toolchain.gni")
-import("//flutter/tools/fuchsia/fidl/fidl.gni")
-import("//flutter/tools/fuchsia/fidl/toolchain.gni")
-import("//flutter/tools/fuchsia/gn-sdk/config/config.gni")
-
-# Generates some Dart bindings for a FIDL library.
-#
-# The parameters for this template are defined in //flutter/tools/fuchsia/fidl/fidl.gni. The
-# relevant parameters in this template are:
-#   - name;
-
-template("fidl_dart") {
-  assert(current_toolchain == dart_toolchain,
-         "This template can only be used in the $dart_toolchain toolchain.")
-
-  not_needed(invoker,
-             [
-               "meta",
-               "sources",
-             ])
-
-  main_target_name = target_name
-  generation_target_name = "${target_name}_dart_generate"
-
-  library_name = target_name
-  root_dir = "$target_gen_dir/${library_name}_package"
-  if (defined(invoker.name)) {
-    library_name = invoker.name
-    root_dir = "$target_gen_dir/${target_name}_${library_name}_package"
-  }
-  bindings_dir = "$root_dir/lib"
-  async_bindings_file = "$bindings_dir/fidl_async.dart"
-  test_bindings_file = "$bindings_dir/fidl_test.dart"
-
-  fidl_target_gen_dir =
-      get_label_info(":bogus($fidl_toolchain)", "target_gen_dir")
-  json_representation = "$fidl_target_gen_dir/$target_name.fidl.json"
-
-  executable_action(generation_target_name) {
-    visibility = [ ":*" ]
-
-    tool = "${fuchsia_tool_dir}/fidlgen_dart"
-
-    inputs = [ json_representation ]
-
-    outputs = [
-      async_bindings_file,
-      test_bindings_file,
-    ]
-
-    args = [
-      "--json",
-      rebase_path(json_representation, root_build_dir),
-      "--output-async",
-      rebase_path(async_bindings_file, root_build_dir),
-      "--output-test",
-      rebase_path(test_bindings_file, root_build_dir),
-    ]
-
-    deps = [ ":$main_target_name($fidl_toolchain)" ]
-    forward_variables_from(invoker, [ "testonly" ])
-  }
-
-  dart_library(main_target_name) {
-    forward_variables_from(invoker,
-                           [
-                             "testonly",
-                             "visibility",
-                           ])
-
-    package_root = root_dir
-
-    package_name = "fidl_" + string_replace(library_name, ".", "_")
-
-    null_safe = true
-
-    sources = [
-      rebase_path(async_bindings_file, bindings_dir),
-      rebase_path(test_bindings_file, bindings_dir),
-    ]
-
-    deps = [ ":$generation_target_name" ]
-
-    if (defined(invoker.public_deps)) {
-      deps += invoker.public_deps
-    }
-
-    # invoker.deps are the non_fidl_deps passed in to the fidl() rule
-    if (defined(invoker.deps)) {
-      deps += invoker.deps
-    }
-  }
-}
diff --git a/tools/fuchsia/dart/gen_app_invocation.py b/tools/fuchsia/dart/gen_app_invocation.py
index bfd5bd8bff24577e0028430f3dd36255f88b43e4..d056869d6f96df6d0747353876436da1c5fb575f 100755
--- a/tools/fuchsia/dart/gen_app_invocation.py
+++ b/tools/fuchsia/dart/gen_app_invocation.py
@@ -11,16 +11,10 @@ import sys
 
 
 def main():
-  parser = argparse.ArgumentParser(
-      description='Generate a script that invokes a Dart application'
-  )
-  parser.add_argument(
-      '--out', help='Path to the invocation file to generate', required=True
-  )
+  parser = argparse.ArgumentParser(description='Generate a script that invokes a Dart application')
+  parser.add_argument('--out', help='Path to the invocation file to generate', required=True)
   parser.add_argument('--dart', help='Path to the Dart binary', required=True)
-  parser.add_argument(
-      '--snapshot', help='Path to the app snapshot', required=True
-  )
+  parser.add_argument('--snapshot', help='Path to the app snapshot', required=True)
   args = parser.parse_args()
 
   app_file = args.out
@@ -28,14 +22,12 @@ def main():
   if not os.path.exists(app_path):
     os.makedirs(app_path)
 
-  script_template = string.Template(
-      '''#!/bin/sh
+  script_template = string.Template('''#!/bin/sh
 
 $dart \\
   $snapshot \\
   "$$@"
-'''
-  )
+''')
   with open(app_file, 'w') as file:
     file.write(script_template.substitute(args.__dict__))
   permissions = (
diff --git a/tools/fuchsia/dart/gen_dart_package_config.py b/tools/fuchsia/dart/gen_dart_package_config.py
index 02a876f871f1aedca381ea6525dad661bd73807f..8c5d7a7a9d509cd9109d99257ee228183942cc03 100755
--- a/tools/fuchsia/dart/gen_dart_package_config.py
+++ b/tools/fuchsia/dart/gen_dart_package_config.py
@@ -15,18 +15,12 @@ import re
 import sys
 
 THIS_DIR = os.path.abspath(os.path.dirname(__file__))
-sys.path += [
-    os.path.join(
-        THIS_DIR, '..', '..', '..', '..', 'third_party', 'pyyaml', 'lib3'
-    )
-]
+sys.path += [os.path.join(THIS_DIR, '..', '..', '..', 'third_party', 'pyyaml', 'lib3')]
 import yaml
 
 DEFAULT_LANGUAGE_VERSION = '2.8'
 
-Package = collections.namedtuple(
-    'Package', ['name', 'rootUri', 'languageVersion', 'packageUri']
-)
+Package = collections.namedtuple('Package', ['name', 'rootUri', 'languageVersion', 'packageUri'])
 
 
 class PackageConfig:
@@ -109,12 +103,8 @@ def collect_packages(items, relative_to):
 
 def main():
   parser = argparse.ArgumentParser(description=__doc__)
-  parser.add_argument(
-      '--input', help='Path to original package_config', required=True
-  )
-  parser.add_argument(
-      '--output', help='Path to the updated package_config', required=True
-  )
+  parser.add_argument('--input', help='Path to original package_config', required=True)
+  parser.add_argument('--output', help='Path to the updated package_config', required=True)
   parser.add_argument('--root', help='Path to fuchsia root', required=True)
   parser.add_argument('--depfile', help='Path to the depfile', required=True)
   args = parser.parse_args()
@@ -133,11 +123,7 @@ def main():
   with open(args.output, 'w') as output_file:
     package_config = PackageConfig(packages)
     json.dump(
-        package_config.asdict(),
-        output_file,
-        indent=2,
-        sort_keys=True,
-        separators=(',', ': ')
+        package_config.asdict(), output_file, indent=2, sort_keys=True, separators=(',', ': ')
     )
 
   return 0
diff --git a/tools/fuchsia/dart/kernel/BUILD.gn b/tools/fuchsia/dart/kernel/BUILD.gn
index d8a538e3933eea72c16d23103bbc6cc3dac5477a..38af886e1af7cdcfa489f2c0e3daba3851d0f4c0 100644
--- a/tools/fuchsia/dart/kernel/BUILD.gn
+++ b/tools/fuchsia/dart/kernel/BUILD.gn
@@ -5,5 +5,5 @@
 import("//flutter/tools/fuchsia/dart/dart_tool.gni")
 
 dart_prebuilt_tool("gen_kernel") {
-  snapshot = "//third_party/dart/pkg/vm/bin/gen_kernel.dart"
+  snapshot = "$dart_src/pkg/vm/bin/gen_kernel.dart"
 }
diff --git a/tools/fuchsia/dart/kernel/convert_manifest_to_json.py b/tools/fuchsia/dart/kernel/convert_manifest_to_json.py
index a5f329ab169ba7b49bbfb6e2064375d704d70fe2..2169caac1ebd2ee35db999b0b399dcdc457e1893 100755
--- a/tools/fuchsia/dart/kernel/convert_manifest_to_json.py
+++ b/tools/fuchsia/dart/kernel/convert_manifest_to_json.py
@@ -31,16 +31,10 @@ def collect(path_prefix, lines):
 def main():
   parser = argparse.ArgumentParser(description=__doc__)
   parser.add_argument(
-      '--path_prefix',
-      help='Directory path containing the manifest entry sources',
-      required=True
-  )
-  parser.add_argument(
-      '--input', help='Path to original manifest', required=True
-  )
-  parser.add_argument(
-      '--output', help='Path to the updated json file', required=True
+      '--path_prefix', help='Directory path containing the manifest entry sources', required=True
   )
+  parser.add_argument('--input', help='Path to original manifest', required=True)
+  parser.add_argument('--output', help='Path to the updated json file', required=True)
   args = parser.parse_args()
 
   with open(args.input, 'r') as input_file:
diff --git a/tools/fuchsia/dart/kernel/dart_kernel.gni b/tools/fuchsia/dart/kernel/dart_kernel.gni
index 01de51578d2ad03583a9639fd6209b2fdddf40e5..6053eb5f1e50466a4288998f8b2c169b6368937d 100644
--- a/tools/fuchsia/dart/kernel/dart_kernel.gni
+++ b/tools/fuchsia/dart/kernel/dart_kernel.gni
@@ -134,7 +134,7 @@ template("_convert_kernel_manifest") {
 #  link_platform (optional)
 #    Whether the kernel compiler should link the current platform.dill into
 #    the build. If false, the --no-link-platform flag will be passed to the
-#    compiler. Defaults to false
+#    compiler. Defaults to false.
 template("dart_kernel") {
   assert(defined(invoker.platform_name), "dart_kernel() requires platform_name")
   assert(defined(invoker.packages_path),
@@ -258,7 +258,6 @@ template("dart_kernel") {
     }
     args += [
       "--verbosity=warning",
-      "--no-sound-null-safety",
       "--target",
       invoker.platform_name,
       "--platform",
@@ -276,6 +275,7 @@ template("dart_kernel") {
       rebase_path(depfile, root_build_dir),
       "--output",
       rebase_path(_kernel_path, root_build_dir),
+      "--sound-null-safety",
     ]
 
     # TODO(richkadel): It should be possible to remove all of the build rules
diff --git a/tools/fuchsia/dart/merge_deps_sources.py b/tools/fuchsia/dart/merge_deps_sources.py
index 58e49c4f3751e8fe750567aaab22f3b159e45371..f3cea8898033c2e11d66791a3e017207c6d6b324 100755
--- a/tools/fuchsia/dart/merge_deps_sources.py
+++ b/tools/fuchsia/dart/merge_deps_sources.py
@@ -14,14 +14,10 @@ import sys
 
 def main():
   parser = argparse.ArgumentParser(
-      'Merges sources of a Dart target and its dependencies',
-      fromfile_prefix_chars='@'
+      'Merges sources of a Dart target and its dependencies', fromfile_prefix_chars='@'
   )
   parser.add_argument(
-      '--output',
-      help='Path to output the final list',
-      type=argparse.FileType('w'),
-      required=True
+      '--output', help='Path to output the final list', type=argparse.FileType('w'), required=True
   )
   parser.add_argument(
       '--depfile',
@@ -34,16 +30,10 @@ def main():
       help='Sources of this target',
       nargs='*',
   )
-  parser.add_argument(
-      '--source_lists',
-      help='Files containing lists of Dart sources',
-      nargs='*'
-  )
+  parser.add_argument('--source_lists', help='Files containing lists of Dart sources', nargs='*')
   args = parser.parse_args()
 
-  args.depfile.write(
-      '{}: {}\n'.format(args.output.name, ' '.join(args.source_lists))
-  )
+  args.depfile.write('{}: {}\n'.format(args.output.name, ' '.join(args.source_lists)))
 
   # Merges sources of this target, and all of its dependencies.
   all_sources = set(args.sources)
diff --git a/tools/fuchsia/dart/verify_sources.py b/tools/fuchsia/dart/verify_sources.py
index b76b49875f3952fe8700314d7597b501ccfc54eb..30e5cc9e926ce395c694eb7df77428523f2cdece 100755
--- a/tools/fuchsia/dart/verify_sources.py
+++ b/tools/fuchsia/dart/verify_sources.py
@@ -15,15 +15,9 @@ def main():
       "Verifies that all .dart files are included in sources, and sources don't include nonexsitent files"
   )
   parser.add_argument(
-      "--source_dir",
-      help="Path to the directory containing the package sources",
-      required=True
-  )
-  parser.add_argument(
-      "--stamp",
-      help="File to touch when source checking succeeds",
-      required=True
+      "--source_dir", help="Path to the directory containing the package sources", required=True
   )
+  parser.add_argument("--stamp", help="File to touch when source checking succeeds", required=True)
   parser.add_argument("sources", help="source files", nargs=argparse.REMAINDER)
   args = parser.parse_args()
 
@@ -41,8 +35,7 @@ def main():
   expected_sources = set(args.sources)
   # It is possible for sources to include dart files outside of source_dir.
   actual_sources.update([
-      s for s in (expected_sources - actual_sources)
-      if src_dir_path.joinpath(s).resolve().exists()
+      s for s in (expected_sources - actual_sources) if src_dir_path.joinpath(s).resolve().exists()
   ],)
 
   if actual_sources == expected_sources:
@@ -56,14 +49,16 @@ def main():
   missing_sources = actual_sources - expected_sources
   if missing_sources:
     print(
-        '\nSource files found that were missing from the "sources" parameter:\n{}\n'
-        .format("\n".join(sources_to_abs_path(missing_sources))),
+        '\nSource files found that were missing from the "sources" parameter:\n{}\n'.format(
+            "\n".join(sources_to_abs_path(missing_sources))
+        ),
     )
   nonexistent_sources = expected_sources - actual_sources
   if nonexistent_sources:
     print(
-        '\nSource files listed in "sources" parameter but not found:\n{}\n'
-        .format("\n".join(sources_to_abs_path(nonexistent_sources))),
+        '\nSource files listed in "sources" parameter but not found:\n{}\n'.format(
+            "\n".join(sources_to_abs_path(nonexistent_sources))
+        ),
     )
   return 1
 
diff --git a/tools/fuchsia/dart_kernel.gni b/tools/fuchsia/dart_kernel.gni
index 598113eee02e7c8d0e758653a31c0a6564cf9081..49fed728362a6ddc98bfd98dfcf26e1d3182e89c 100644
--- a/tools/fuchsia/dart_kernel.gni
+++ b/tools/fuchsia/dart_kernel.gni
@@ -4,7 +4,7 @@
 
 import("//flutter/common/fuchsia_config.gni")
 import("//flutter/tools/fuchsia/dart.gni")
-import("//third_party/dart/build/dart/dart_action.gni")
+import("$dart_src/build/dart/dart_action.gni")
 
 template("dart_kernel") {
   prebuilt_dart_action(target_name) {
@@ -16,11 +16,10 @@ template("dart_kernel") {
 
     deps = [ invoker.kernel_platform_files ]
 
-    gen_kernel_script = "//third_party/dart/pkg/vm/bin/gen_kernel.dart"
+    gen_kernel_script = "$dart_src/pkg/vm/bin/gen_kernel.dart"
     platform_dill = "$root_out_dir/dart_runner_patched_sdk/platform_strong.dill"
 
-    dot_packages =
-        rebase_path("//third_party/dart/.dart_tool/package_config.json")
+    dot_packages = rebase_path("$dart_src/.dart_tool/package_config.json")
 
     inputs = [
       platform_dill,
diff --git a/tools/fuchsia/depfile_path_to_relative.py b/tools/fuchsia/depfile_path_to_relative.py
index 27a9c2d9491da6a73451ff5195ef419c9757cb4c..b434ef6fb9beb59314a248c621fae5e3a1fe9c38 100755
--- a/tools/fuchsia/depfile_path_to_relative.py
+++ b/tools/fuchsia/depfile_path_to_relative.py
@@ -13,12 +13,8 @@ def main():
   parser = argparse.ArgumentParser(
       description='Executes a command, then rewrites the depfile, converts all absolute paths to relative'
   )
-  parser.add_argument(
-      '--depfile', help='Path to the depfile to rewrite', required=True
-  )
-  parser.add_argument(
-      'command', nargs='+', help='Positional args for the command to run'
-  )
+  parser.add_argument('--depfile', help='Path to the depfile to rewrite', required=True)
+  parser.add_argument('command', nargs='+', help='Positional args for the command to run')
   args = parser.parse_args()
 
   retval = subprocess.call(args.command)
diff --git a/tools/fuchsia/devshell/build_and_copy_to_fuchsia.sh b/tools/fuchsia/devshell/build_and_copy_to_fuchsia.sh
index 4aca3f4d7d2530d396ea55e37f930cc0201fd9b6..0ef08bf703b0343d13e2b4d79606af9e81b85889 100755
--- a/tools/fuchsia/devshell/build_and_copy_to_fuchsia.sh
+++ b/tools/fuchsia/devshell/build_and_copy_to_fuchsia.sh
@@ -154,9 +154,9 @@ if [[ "${fuchsia_cpu}" == x64 ]]
 then
   if [[ "${runtime_mode}" == debug ]]
   then
-    echo "  fx set workstation_eng.x64"
+    echo "  fx set terminal.x64"
   else
-    echo "  fx set workstation_eng.x64 --release"
+    echo "  fx set terminal.x64 --release"
   fi
 fi
 echo '  fx build'
diff --git a/tools/fuchsia/devshell/run_integration_test.sh b/tools/fuchsia/devshell/run_integration_test.sh
index e8fad8eb0c7b200d3b99dc169527651733f3566a..467ffb0247e554178d2ed28f41255b18fb170f71 100755
--- a/tools/fuchsia/devshell/run_integration_test.sh
+++ b/tools/fuchsia/devshell/run_integration_test.sh
@@ -34,7 +34,7 @@ then
 fi
 
 # This script currently requires running `fx serve`.
-if [[ -z "$(pgrep -f 'pm serve')" ]]
+if [[ -z "$(pgrep -f 'package-tool')" ]]
 then
   engine-error "This script currently requires running 'fx serve' first."
   exit 1
@@ -55,8 +55,6 @@ case $test_name in
     test_packages=("flutter-embedder-test-0.far" "parent-view.far" "child-view.far")
     ;;
   text-input)
-    # TODO(https://fxbug.dev/107917): Finish implementing and remove this warning.
-    engine-warning "This test currently hangs because the Dart view hasn't been implemented yet. https://fxbug.dev/107917"
     test_packages=("text-input-test-0.far" "text-input-view.far")
     ;;
   touch-input)
@@ -207,7 +205,7 @@ fi
 for test_package_path in "${test_package_paths[@]}"
 do
   engine-info "... Publishing $test_package_path to package repository ($fx_build_dir/amber-files)..."
-  "$jiri_bin"/fx pm publish -a -repo "$fx_build_dir/amber-files/" -f "$test_package_path"
+  "$jiri_bin"/ffx repository publish "$fx_build_dir/amber-files/" --package-archive "$test_package_path"
 done
 
 test_package_name_for_url="$(echo "${test_packages[0]}" | sed "s/\-0.far//")"
diff --git a/tools/fuchsia/devshell/run_unit_tests.sh b/tools/fuchsia/devshell/run_unit_tests.sh
index 653ce9a3d65538590b5a4fc690ab04617285e2dd..396bccd60f67c230f4ca1f7f24da2f2d7d9a0838 100755
--- a/tools/fuchsia/devshell/run_unit_tests.sh
+++ b/tools/fuchsia/devshell/run_unit_tests.sh
@@ -92,7 +92,7 @@ test_names=()
 for test_package in $test_packages
 do
   engine-info "... publishing ${test_package} ..."
-  $ENGINE_DIR/fuchsia/sdk/linux/tools/x64/pm publish -a -r $FUCHSIA_DIR/$(cat $FUCHSIA_DIR/.fx-build-dir)/amber-files -f "${test_package}"
+  ${FUCHSIA_DIR}/.jiri_root/bin/ffx repository publish $FUCHSIA_DIR/$(cat $FUCHSIA_DIR/.fx-build-dir)/amber-files --package-archive "${test_package}"
   test_names+=("$(basename ${test_package} | sed -e "s/-0.far//")")
 done
 
diff --git a/tools/fuchsia/fidl/BUILD.gn b/tools/fuchsia/fidl/BUILD.gn
deleted file mode 100644
index 0855b3f0bc907f71f589c7ca97ce86b3e7747ab5..0000000000000000000000000000000000000000
--- a/tools/fuchsia/fidl/BUILD.gn
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2013 The Flutter Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/fuchsia/sdk.gni")
-import("//flutter/tools/fuchsia/fidl/fidl.gni")
-import("//flutter/tools/fuchsia/fidl/toolchain.gni")
-import("//flutter/tools/fuchsia/sdk/sdk_targets.gni")
-import("//flutter/tools/fuchsia/toolchain/basic_toolchain.gni")
-
-# A toolchain dedicated to processing FIDL libraries.
-# The only targets in this toolchain are action() targets, so it
-# has no real tools.  But every toolchain needs stamp and copy.
-if (current_toolchain == default_toolchain) {
-  basic_toolchain("fidling") {
-    expected_label = fidl_toolchain
-  }
-}
-
-if (current_toolchain != default_toolchain) {
-  sdk_targets("fidl_library") {
-    meta = "$fuchsia_sdk_path/meta/manifest.json"
-  }
-}
diff --git a/tools/fuchsia/fidl/fidl.gni b/tools/fuchsia/fidl/fidl.gni
deleted file mode 100644
index fb1e396abfa0564a228475c7b1ee47fb093b8b8e..0000000000000000000000000000000000000000
--- a/tools/fuchsia/fidl/fidl.gni
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2013 The Flutter Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/fuchsia/sdk.gni")
-import("//flutter/tools/fuchsia/dart/toolchain.gni")
-import("//flutter/tools/fuchsia/fidl/toolchain.gni")
-
-# Declares a FIDL library.
-#
-# Depending on the toolchain in which this targets is expanded, it will yield
-# different results:
-#   - in the FIDL toolchain, it will compile its source files into an
-#     intermediate representation consumable by language bindings generators;
-#   - in the target or shared toolchain, this will produce a source_set
-#     containing language-specific bindings.
-template("fidl") {
-  # Allow generated targets visibility to their dependant generated targets
-  if (defined(invoker.visibility)) {
-    invoker.visibility += [ ":*" ]
-  }
-
-  assert(!defined(invoker.deps),
-         "All FIDL dependencies are inherently " +
-             "public, use 'public_deps' instead of 'deps'.")
-
-  if (current_toolchain == dart_toolchain) {
-    import("//flutter/tools/fuchsia/dart/fidl_dart.gni")
-
-    not_needed(invoker, [ "meta" ])
-
-    fidl_dart(target_name) {
-      forward_variables_from(invoker, "*")
-    }
-  } else if (current_toolchain == fidl_toolchain) {
-    import("//flutter/tools/fuchsia/fidl/fidl_library.gni")
-
-    not_needed(invoker, [ "meta" ])
-
-    fidl_library(target_name) {
-      forward_variables_from(invoker, "*")
-    }
-  } else if (current_toolchain == default_toolchain) {
-    not_needed(invoker,
-               [
-                 "name",
-                 "sources",
-               ])
-
-    fuchsia_fidl_library(target_name) {
-      forward_variables_from(invoker, "*")
-    }
-  } else {
-    not_needed("*")
-  }
-}
diff --git a/tools/fuchsia/fidl/fidl_library.gni b/tools/fuchsia/fidl/fidl_library.gni
deleted file mode 100644
index 8069bb669cb2d851f8f8100ce7dec5e6611b324b..0000000000000000000000000000000000000000
--- a/tools/fuchsia/fidl/fidl_library.gni
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 2013 The Flutter Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//flutter/tools/executable_action.gni")
-import("//flutter/tools/fuchsia/fidl/fidl.gni")
-import("//flutter/tools/fuchsia/fidl/toolchain.gni")
-import("//flutter/tools/fuchsia/gn-sdk/config/config.gni")
-
-# Generates some representation of a FIDL library that's consumable by Language
-# bindings generators.
-#
-# The parameters for this template are defined in //flutter/tools/fuchsia/fidl/fidl.gni. The
-# relevant parameters in this template are:
-#   - name;
-#   - sources.
-
-template("fidl_library") {
-  assert(
-      current_toolchain == fidl_toolchain,
-      "This template can only be used in the FIDL toolchain $fidl_toolchain.")
-
-  assert(defined(invoker.sources), "A FIDL library requires some sources.")
-
-  library_name = target_name
-  if (defined(invoker.name)) {
-    library_name = invoker.name
-  }
-
-  response_file = "$target_gen_dir/$target_name.args"
-  fidl_stem = "$target_gen_dir/$target_name.fidl"
-  json_representation = "$fidl_stem.json"
-
-  coding_tables = "$fidl_stem.tables.c"
-
-  main_target_name = target_name
-  response_file_target_name = "${target_name}_response_file"
-  compilation_target_name = "${target_name}_compile"
-
-  # Only artifacts that have various associated FIDL generated targets.
-  fidl_deps = []
-
-  # Artifacts other than FIDL, that are also dependencies.
-  non_fidl_deps = []
-
-  if (defined(invoker.non_fidl_deps)) {
-    non_fidl_deps += invoker.non_fidl_deps
-  }
-
-  if (defined(invoker.deps)) {
-    fidl_deps += invoker.deps - non_fidl_deps
-  }
-  if (defined(invoker.public_deps)) {
-    fidl_deps += invoker.public_deps
-  }
-
-  action(response_file_target_name) {
-    visibility = [ ":*" ]
-
-    script = "//flutter/tools/fuchsia/fidl/gen_response_file.py"
-
-    forward_variables_from(invoker,
-                           [
-                             "deps",
-                             "public_deps",
-                             "sources",
-                             "testonly",
-                           ])
-
-    libraries = "$target_gen_dir/$main_target_name.libraries"
-
-    outputs = [
-      response_file,
-      libraries,
-    ]
-
-    args = [
-             "--out-response-file",
-             rebase_path(response_file, root_build_dir),
-             "--out-libraries",
-             rebase_path(libraries, root_build_dir),
-             "--json",
-             rebase_path(json_representation, root_build_dir),
-             "--tables",
-             rebase_path(coding_tables, root_build_dir),
-             "--name",
-             library_name,
-             "--sources",
-           ] + rebase_path(sources, root_build_dir)
-
-    if (fidl_deps != []) {
-      dep_libraries = []
-
-      foreach(dep, fidl_deps) {
-        gen_dir = get_label_info(dep, "target_gen_dir")
-        name = get_label_info(dep, "name")
-        dep_libraries += [ "$gen_dir/$name.libraries" ]
-      }
-
-      inputs = dep_libraries
-
-      args += [ "--dep-libraries" ] + rebase_path(dep_libraries, root_build_dir)
-    }
-  }
-
-  executable_action(compilation_target_name) {
-    forward_variables_from(invoker, [ "testonly" ])
-
-    visibility = [ ":*" ]
-
-    tool = "$fuchsia_tool_dir/fidlc"
-
-    inputs = [ response_file ]
-
-    outputs = [
-      coding_tables,
-      json_representation,
-    ]
-
-    args = [ "@" + rebase_path(response_file, root_build_dir) ]
-
-    deps = [ ":$response_file_target_name" ] + non_fidl_deps
-  }
-
-  group(main_target_name) {
-    forward_variables_from(invoker,
-                           [
-                             "testonly",
-                             "visibility",
-                             "response_file",
-                           ])
-
-    # Metadata to allow us to query all FIDL IR files.
-    metadata = {
-      fidl_json = [ rebase_path(json_representation, root_build_dir) ]
-      generated_sources = fidl_json
-    }
-
-    public_deps = [
-      ":$compilation_target_name",
-      ":$response_file_target_name",
-    ]
-  }
-}
diff --git a/tools/fuchsia/fidl/gen_response_file.py b/tools/fuchsia/fidl/gen_response_file.py
deleted file mode 100755
index c44f4784b3b96c72f3dcd7877cc75908c90f0401..0000000000000000000000000000000000000000
--- a/tools/fuchsia/fidl/gen_response_file.py
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2013 The Flutter Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import argparse
-import os
-import string
-import sys
-
-
-def read_libraries(libraries_path):
-  with open(libraries_path) as f:
-    lines = f.readlines()
-    return [l.rstrip("\n") for l in lines]
-
-
-def write_libraries(libraries_path, libraries):
-  directory = os.path.dirname(libraries_path)
-  if not os.path.exists(directory):
-    os.makedirs(directory)
-  with open(libraries_path, "w+") as f:
-    for library in libraries:
-      f.write(library)
-      f.write("\n")
-
-
-def main():
-  parser = argparse.ArgumentParser(
-      description="Generate response file for FIDL frontend"
-  )
-  parser.add_argument(
-      "--out-response-file",
-      help="The path for the response file to generate",
-      required=True
-  )
-  parser.add_argument(
-      "--out-libraries",
-      help="The path for the libraries file to generate",
-      required=True
-  )
-  parser.add_argument(
-      "--json", help="The path for the JSON file to generate, if any"
-  )
-  parser.add_argument(
-      "--tables", help="The path for the tables file to generate, if any"
-  )
-  parser.add_argument(
-      "--deprecated-fuchsia-only-c-client",
-      help="The path for the C simple client file to generate, if any"
-  )
-  parser.add_argument(
-      "--deprecated-fuchsia-only-c-header",
-      help="The path for the C header file to generate, if any"
-  )
-  parser.add_argument(
-      "--deprecated-fuchsia-only-c-server",
-      help="The path for the C simple server file to generate, if any"
-  )
-  parser.add_argument(
-      "--name", help="The name for the generated FIDL library, if any"
-  )
-  parser.add_argument(
-      "--depfile", help="The name for the generated depfile, if any"
-  )
-  parser.add_argument("--sources", help="List of FIDL source files", nargs="*")
-  parser.add_argument(
-      "--dep-libraries", help="List of dependent libraries", nargs="*"
-  )
-  parser.add_argument(
-      "--experimental-flag", help="List of experimental flags", action="append"
-  )
-  args = parser.parse_args()
-
-  target_libraries = []
-
-  for dep_libraries_path in args.dep_libraries or []:
-    dep_libraries = read_libraries(dep_libraries_path)
-    for library in dep_libraries:
-      if library in target_libraries:
-        continue
-      target_libraries.append(library)
-
-  target_libraries.append(" ".join(sorted(args.sources)))
-  write_libraries(args.out_libraries, target_libraries)
-
-  response_file = []
-
-  if args.json:
-    response_file.append("--json %s" % args.json)
-
-  if args.tables:
-    response_file.append("--tables %s" % args.tables)
-
-  if args.deprecated_fuchsia_only_c_client:
-    response_file.append(
-        "--deprecated-fuchsia-only-c-client %s" %
-        args.deprecated_fuchsia_only_c_client
-    )
-
-  if args.deprecated_fuchsia_only_c_header:
-    response_file.append(
-        "--deprecated-fuchsia-only-c-header %s" %
-        args.deprecated_fuchsia_only_c_header
-    )
-
-  if args.deprecated_fuchsia_only_c_server:
-    response_file.append(
-        "--deprecated-fuchsia-only-c-server %s" %
-        args.deprecated_fuchsia_only_c_server
-    )
-
-  if args.name:
-    response_file.append("--name %s" % args.name)
-
-  if args.depfile:
-    response_file.append("--depfile %s" % args.depfile)
-
-  if args.experimental_flag:
-    for experimental_flag in args.experimental_flag:
-      response_file.append("--experimental %s" % experimental_flag)
-
-  response_file.extend(["--files %s" % library for library in target_libraries])
-
-  with open(args.out_response_file, "w+") as f:
-    f.write(" ".join(response_file))
-    f.write("\n")
-
-
-if __name__ == "__main__":
-  sys.exit(main())
diff --git a/tools/fuchsia/flutter/flutter_build_config.gni b/tools/fuchsia/flutter/flutter_build_config.gni
index b7c033a46fc2a291bcb772b60a2c6cf3622f266a..a322a7e25587e51e17b4b1fe76717bca8676cfa9 100644
--- a/tools/fuchsia/flutter/flutter_build_config.gni
+++ b/tools/fuchsia/flutter/flutter_build_config.gni
@@ -12,7 +12,6 @@ import("//flutter/common/config.gni")
 # Builds the component in a non-product JIT build. This will
 # launch the vm service in the runner.
 flutter_debug_build_cfg = {
-  runtime_meta = "//flutter/shell/platform/fuchsia/flutter/meta/jit_runtime"
   runner_dep = "//flutter/shell/platform/fuchsia/flutter:flutter_jit_runner"
   platform_name = "flutter_runner"
   is_aot = false
@@ -25,7 +24,6 @@ flutter_debug_build_cfg = {
 # This configuration is not compatible with a --release build since the
 # profile aot runner is built without asserts.
 flutter_aot_debug_build_cfg = {
-  runtime_meta = "//flutter/shell/platform/fuchsia/flutter/meta/aot_runtime"
   runner_dep = "//flutter/shell/platform/fuchsia/flutter:flutter_aot_runner"
   platform_name = "flutter_runner"
   is_aot = true
@@ -36,9 +34,6 @@ flutter_aot_debug_build_cfg = {
 # Builds the component in a non-product AOT build. This will
 # launch the vm service in the runner.
 flutter_profile_build_cfg = {
-  runtime_meta =
-      "//flutter/shell/platform/fuchsia/flutter/meta/aot_runtime"  # profile
-                                                                   # runner
   runner_dep = "//flutter/shell/platform/fuchsia/flutter:flutter_aot_runner"
   platform_name = "flutter_runner"
   is_aot = true
@@ -49,8 +44,6 @@ flutter_profile_build_cfg = {
 # Builds the component in a product JIT build. This will
 # not launch the vm service in the runner.
 flutter_jit_release_build_cfg = {
-  runtime_meta =
-      "//flutter/shell/platform/fuchsia/flutter/meta/jit_product_runtime"
   runner_dep =
       "//flutter/shell/platform/fuchsia/flutter:flutter_jit_product_runner"
   platform_name = "flutter_runner"
@@ -62,8 +55,6 @@ flutter_jit_release_build_cfg = {
 # Builds the component in a product AOT build. This will
 # not launch the vm service in the runner.
 flutter_release_build_cfg = {
-  runtime_meta =
-      "//flutter/shell/platform/fuchsia/flutter/meta/aot_product_runtime"
   runner_dep =
       "//flutter/shell/platform/fuchsia/flutter:flutter_aot_product_runner"
   platform_name = "flutter_runner"
diff --git a/tools/fuchsia/flutter/flutter_component.gni b/tools/fuchsia/flutter/flutter_component.gni
index 3e43e1634a82aefd2293f9b1d6fb7074547b716e..8fd99842cbba0ba5a174dbc72db58d81379454f6 100644
--- a/tools/fuchsia/flutter/flutter_component.gni
+++ b/tools/fuchsia/flutter/flutter_component.gni
@@ -16,7 +16,7 @@ import("//flutter/tools/fuchsia/flutter/internal/flutter_dart_component.gni")
 # dart_library("lib") {
 #   package_name = "my_library"
 #   sources = [ "main.dart" ]
-#   deps = [ "//third_party/dart-pkg/git/flutter/packages/flutter" ]
+#   deps = [ "$dart_src-pkg/git/flutter/packages/flutter" ]
 # }
 # ```
 #
diff --git a/tools/fuchsia/flutter/internal/flutter_dart_component.gni b/tools/fuchsia/flutter/internal/flutter_dart_component.gni
index 49529d23c0158e9e0e1396b79e95b9c8cc7372db..72cd952b8418bfa653cd7285112bfb2399540c86 100644
--- a/tools/fuchsia/flutter/internal/flutter_dart_component.gni
+++ b/tools/fuchsia/flutter/internal/flutter_dart_component.gni
@@ -7,8 +7,8 @@ import("//flutter/tools/fuchsia/dart/config.gni")
 import("//flutter/tools/fuchsia/dart/dart.gni")
 import("//flutter/tools/fuchsia/dart/dart_package_config.gni")
 import("//flutter/tools/fuchsia/dart/kernel/dart_kernel.gni")
-import("//flutter/tools/fuchsia/gn-sdk/cmc.gni")
-import("//flutter/tools/fuchsia/gn-sdk/component.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/cmc.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/component.gni")
 
 # Defines a component which will run in a flutter_runner or dart_runner
 #
diff --git a/tools/fuchsia/fuchsia_archive.gni b/tools/fuchsia/fuchsia_archive.gni
index a30d392c526e9c7edc5c88bf1296fa4b3ba682f7..9161dd0ccf2a27521c938ec74dfd89ffc8c820ee 100644
--- a/tools/fuchsia/fuchsia_archive.gni
+++ b/tools/fuchsia/fuchsia_archive.gni
@@ -2,50 +2,33 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/fuchsia/config.gni")
 import("//flutter/tools/fuchsia/fuchsia_debug_symbols.gni")
 import("//flutter/tools/fuchsia/fuchsia_libs.gni")
-import("//flutter/tools/fuchsia/gn-sdk/config/config.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/cmc.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
 
-# Compiles a CML file for a V2 component.
-#
-# manifest (required):
-#   The path to the .cml file for the component. Should include the file extension.
-# output (optional):
-#   The path for the output .cm file. Should include the file extension.
+# Alias of cmc_compile in gn-sdk/src/cmc.gni
 template("_compile_cml") {
   assert(defined(invoker.manifest), "_compile_cml must define manifest")
 
-  action(target_name) {
+  # Create an empty depfile, it's not used in flutter.
+  write_file("${target_gen_dir}/${target_name}/${target_name}.d",
+             [],
+             "list lines")
+
+  cmc_compile(target_name) {
     forward_variables_from(invoker,
                            [
                              "deps",
+                             "manifest",
                              "testonly",
-                             "visibility",
                            ])
-    script = "//flutter/tools/fuchsia/compile_cml.py"
-
-    inputs = [ "$fuchsia_tool_dir/cmc" ]
-    sources = [ invoker.manifest ]
-
-    args = [
-      "--cmc-bin",
-      rebase_path("$fuchsia_tool_dir/cmc"),
-      "--manifest-file",
-      rebase_path(invoker.manifest),
-      "--output",
-      rebase_path(invoker.output, root_build_dir),
-      "--includepath",
-      rebase_path("$fuchsia_sdk/pkg/", root_build_dir),
-      "--includepath",
-      get_path_info(invoker.manifest, "dir"),
-      "--includepath",
-      rebase_path("//"),
-    ]
-    outputs = [ invoker.output ]
+    output_file = invoker.output
   }
 }
 
+# TODO(zijiehe): May use fuchsia_package in gn-sdk if possible. - http://crbug.com/40935282
+
 # Creates a Fuchsia archive (.far) file using PM from the Fuchsia SDK.
 #
 # binary (required):
@@ -105,8 +88,14 @@ template("_fuchsia_archive") {
   }
 
   foreach(lib, pkg.libraries) {
+    output_path = ""
+
+    if (defined(lib.output_path)) {
+      output_path = lib.output_path
+    }
+
     copy_sources += [ "${lib.path}/${lib.name}" ]
-    copy_outputs += [ "$far_base_dir/lib/${lib.name}" ]
+    copy_outputs += [ "$far_base_dir/lib/${output_path}${lib.name}" ]
   }
 
   pkg_dir_deps = pkg.deps
diff --git a/tools/fuchsia/fuchsia_debug_symbols.gni b/tools/fuchsia/fuchsia_debug_symbols.gni
index 88254ced35118817db8422a1950cb2b9889398b5..ad18d3d9d349bd99a4c92fee45c44f8719d87fd0 100644
--- a/tools/fuchsia/fuchsia_debug_symbols.gni
+++ b/tools/fuchsia/fuchsia_debug_symbols.gni
@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/toolchain/toolchain.gni")
 import("//flutter/common/fuchsia_config.gni")
 
 # The inputs to this template are 'binary_path' and a boolean 'unstripped'.
@@ -33,7 +34,8 @@ template("_copy_debug_symbols") {
       "--destination-base",
       rebase_path(_dest_base),
       "--read-elf",
-      rebase_path("//buildtools/${host_os}-${host_cpu}/clang/bin/llvm-readelf"),
+      rebase_path(
+          "$buildtools_path/${host_os}-${host_cpu}/clang/bin/llvm-readelf"),
     ]
 
     if (unstripped) {
diff --git a/tools/fuchsia/fuchsia_libs.gni b/tools/fuchsia/fuchsia_libs.gni
index 08f34a71e622fe4e30fd3e96daf80c0f84299ed7..519b6c8744b773e70877db56747a574572a674d9 100644
--- a/tools/fuchsia/fuchsia_libs.gni
+++ b/tools/fuchsia/fuchsia_libs.gni
@@ -40,14 +40,6 @@ common_libs = [
     name = "libfdio.so"
     path = rebase_path("$fuchsia_sdk_dist")
   },
-  {
-    name = "libmemfs.so"
-    path = rebase_path("$fuchsia_sdk_dist")
-  },
-  {
-    name = "libsyslog.so"
-    path = rebase_path("$fuchsia_sdk_dist")
-  },
   {
     name = "libvulkan.so"
     path = rebase_path("$fuchsia_sdk_dist")
@@ -59,6 +51,11 @@ common_libs = [
   {
     name = "ld.so.1"
     path = rebase_path("$sysroot_dist_lib/$ld_so_path")
+    output_path = ld_so_path
+  },
+  {
+    name = "libvfs_internal.so"
+    path = rebase_path("$fuchsia_sdk_dist")
   },
 ]
 
diff --git a/tools/fuchsia/gather_flutter_runner_artifacts.py b/tools/fuchsia/gather_flutter_runner_artifacts.py
index 9438a0d5120e6334e3225ee30efa8f8fe66c0999..1b92a67214fa147248b8c6199df0960eba8afef1 100755
--- a/tools/fuchsia/gather_flutter_runner_artifacts.py
+++ b/tools/fuchsia/gather_flutter_runner_artifacts.py
@@ -72,12 +72,8 @@ def GatherArtifacts(src_root, dst_root, create_meta_package=True):
 def main():
   parser = argparse.ArgumentParser()
 
-  parser.add_argument(
-      '--artifacts-root', dest='artifacts_root', action='store', required=True
-  )
-  parser.add_argument(
-      '--dest-dir', dest='dst_dir', action='store', required=True
-  )
+  parser.add_argument('--artifacts-root', dest='artifacts_root', action='store', required=True)
+  parser.add_argument('--dest-dir', dest='dst_dir', action='store', required=True)
 
   args = parser.parse_args()
 
diff --git a/tools/fuchsia/gen_package.py b/tools/fuchsia/gen_package.py
index ab4d423186ddc7f721d82e2ffc0b7dbbec33d423..5ca757d845121a544d84f507b9cbac48393b393f 100755
--- a/tools/fuchsia/gen_package.py
+++ b/tools/fuchsia/gen_package.py
@@ -25,9 +25,7 @@ def GenerateManifest(package_dir):
       common_prefix = os.path.commonprefix([root, package_dir])
       rel_path = os.path.relpath(os.path.join(root, f), common_prefix)
       from_package = os.path.abspath(os.path.join(package_dir, rel_path))
-      assert from_package, 'Failed to create from_package for %s' % os.path.join(
-          root, f
-      )
+      assert from_package, 'Failed to create from_package for %s' % os.path.join(root, f)
       full_paths.append('%s=%s' % (rel_path, from_package))
 
   parent_dir = os.path.abspath(os.path.join(package_dir, os.pardir))
@@ -43,8 +41,7 @@ def CreateFarPackage(pm_bin, package_dir, signing_key, dst_dir, api_level):
   manifest_path = GenerateManifest(package_dir)
 
   pm_command_base = [
-      pm_bin, '-m', manifest_path, '-k', signing_key, '-o', dst_dir,
-      '--api-level', api_level
+      pm_bin, '-m', manifest_path, '-k', signing_key, '-o', dst_dir, '--api-level', api_level
   ]
 
   # Build the package
@@ -60,24 +57,13 @@ def main():
   parser = argparse.ArgumentParser()
 
   parser.add_argument('--pm-bin', dest='pm_bin', action='store', required=True)
+  parser.add_argument('--package-dir', dest='package_dir', action='store', required=True)
+  parser.add_argument('--manifest-file', dest='manifest_file', action='store', required=False)
   parser.add_argument(
-      '--package-dir', dest='package_dir', action='store', required=True
-  )
-  parser.add_argument(
-      '--manifest-file', dest='manifest_file', action='store', required=False
-  )
-  parser.add_argument(
-      '--manifest-json-file',
-      dest='manifest_json_file',
-      action='store',
-      required=True
-  )
-  parser.add_argument(
-      '--far-name', dest='far_name', action='store', required=False
-  )
-  parser.add_argument(
-      '--api-level', dest='api_level', action='store', required=False
+      '--manifest-json-file', dest='manifest_json_file', action='store', required=True
   )
+  parser.add_argument('--far-name', dest='far_name', action='store', required=False)
+  parser.add_argument('--api-level', dest='api_level', action='store', required=False)
 
   args = parser.parse_args()
 
@@ -113,16 +99,13 @@ def main():
   # Use check_output so if anything goes wrong we get the output.
   try:
 
-    build_command = [
-        'build', '--output-package-manifest', args.manifest_json_file
-    ]
+    build_command = ['build', '--output-package-manifest', args.manifest_json_file]
 
     if args.api_level is not None:
       build_command = ['--api-level', args.api_level] + build_command
 
     archive_command = [
-        'archive', '--output=' +
-        os.path.join(os.path.dirname(output_dir), args.far_name + "-0")
+        'archive', '--output=' + os.path.join(os.path.dirname(output_dir), args.far_name + "-0")
     ]
 
     pm_commands = [build_command, archive_command]
@@ -130,24 +113,16 @@ def main():
     for pm_command in pm_commands:
       subprocess.check_output(pm_command_base + pm_command)
   except subprocess.CalledProcessError as e:
-    print(
-        '==================== Manifest contents ========================================='
-    )
+    print('==================== Manifest contents =========================================')
     with open(manifest_file, 'r') as manifest:
       sys.stdout.write(manifest.read())
-    print(
-        '==================== End manifest contents ====================================='
-    )
+    print('==================== End manifest contents =====================================')
     meta_contents_path = os.path.join(output_dir, 'meta', 'contents')
     if os.path.exists(meta_contents_path):
-      print(
-          '==================== meta/contents ============================================='
-      )
+      print('==================== meta/contents =============================================')
       with open(meta_contents_path, 'r') as meta_contents:
         sys.stdout.write(meta_contents.read())
-      print(
-          '==================== End meta/contents ========================================='
-      )
+      print('==================== End meta/contents =========================================')
     raise
 
   return 0
diff --git a/tools/fuchsia/gen_repo.py b/tools/fuchsia/gen_repo.py
index b121b505eec68b4a6d5a3ff2602f706c61a4707e..b795254b8df06b596df4660a1596bdfec2cccae8 100755
--- a/tools/fuchsia/gen_repo.py
+++ b/tools/fuchsia/gen_repo.py
@@ -19,12 +19,8 @@ def main():
   parser = argparse.ArgumentParser()
 
   parser.add_argument('--pm-bin', dest='pm_bin', action='store', required=True)
-  parser.add_argument(
-      '--repo-dir', dest='repo_dir', action='store', required=True
-  )
-  parser.add_argument(
-      '--archive', dest='archives', action='append', required=True
-  )
+  parser.add_argument('--repo-dir', dest='repo_dir', action='store', required=True)
+  parser.add_argument('--archive', dest='archives', action='append', required=True)
 
   args = parser.parse_args()
 
diff --git a/tools/fuchsia/gn-sdk/README.md b/tools/fuchsia/gn-sdk/README.md
deleted file mode 100644
index c46e963a0dab6fb16ae843b976e979978586163e..0000000000000000000000000000000000000000
--- a/tools/fuchsia/gn-sdk/README.md
+++ /dev/null
@@ -1,73 +0,0 @@
-# flutter/tools/fuchsia/gn-sdk
-
-This directory contains a few build rules imported from an August 2021 snapshot
-of the Fuchsia GN SDK, with small (required) path adjustments.
-
-The Dart Fuchsia tests require the Fuchsia _Core_ SDK, and the build rules in
-the GN SDK require slight path modification to support building against the
-Fuchsia Core SDK from a different location. Therefore, the Fuchsia Core SDK is
-downloaded via `gclient sync` (versioned according to its fingerprint in DEPS),
-and the modified build rules from Fuchsia GN SDK are, for now, copied to
-and maintained in flutter/engine.
-
-It is not yet clear if Fuchsia will want to provide SDK resources that support
-GN build rules with Dart libraries and tests, but if that does happen, these
-files should be replaced by the Fuchsia-provided build rules.
-
-<!-- TODO(richkadel): Talk with Fuchsia SDK team about:
-  1. Splitting the GN rules into a separate CIPD download (so SDK Dart libaries
-     and reusable GN rules can both be downloaded into flutter)
-  2. Ensuring the config.gni path to the SDK will work if the GN rules are not
-     in the same directory as the other SDK artifacts (e.g., FIDL, C++, and
-     Dart libraries)
-  3. How to resolve third-party Dart dependencies in Fuchsia Dart meta.json
-     files (i.e., including something like the `find_dart_libraries.py` script)
-  4. Address issues found in the Flutter GN SDK build rules, including:
-     * `cmc_merge` is adding `.cmx` extension redundantly (compared to
-       fuchsia.git's version, which doesn't).
-     * `prepare_package_inputs.py` list `unprocessed_binary_paths` can be empty
-       for non-C++ packages (like Dart) but the code assumes the list is never
-       empty, and crashes.
-     * `prepare_package_inputs.py` list seems to require up front knowledge of
-       all of the resources, at GN time, but for Dart, I seem to need to compile
-       the libraries, so the compiler ("dart kernel") will generate a manifest
-       of the compiled libraries that need to be added as resources. I had to
-       add a separate JSON file of compile-time-generated list of additional
-       resources to add to the package and its manifest.
-     * Other `TODO(richkadel)` items in `flutter/tools/fuchsia`, mostly those
-       in the `gn-sdk` subdirectory, but others (derived from fuchsia.git may
-       add context.
--->
-
-
-## Other GN SDK build rules to be considered
-
-<!-- TODO(richkadel): revisit the following build rules and consider replacing
-them with existing GN SDK rules.
--->
-
-It may be wise to consider replacing a few other duplicated (but differently
-built) build rules in `//flutter/tools/fuchsia` and `//build` with up-to-date
-(via `gclient sync`) rules from the GN SDK. Some of the flutter versions of
-these rules were originally imported from the fuchsia.git `//build` directory,
-and tailored for flutter. The GN SDK build rules offer simplified versions of
-these rules, pre-tailored for the Fuchsia SDK layout and out-of-tree use cases.
-
-Known build files in this category, with the same file name and similar GN
-templates, in both Flutter and Fuchsia GN SDK, include:
-
-* fidl_library.gni
-* gn_run_binary.py
-
-Other Flutter GN SDK build rules that could replace flutter implemented logic
-include:
-
-* gn-sdk/build/fuchsia_sdk_pkg.gni could potentially replace some of the build
-  logic in `//flutter/tools/fuchsia/sdk/sdk_targets.gni` and/or
-  `//build/fuchsia/sdk.gni`
-* gn-sdk/build/pm_tool.gni rules could potentially replace some flutter pm
-  invocations
-
-SDK build logic that might improve GN target implementations in flutter include:
-
-* gn-sdk/build/test.gni
diff --git a/tools/fuchsia/gn-sdk/cmc.gni b/tools/fuchsia/gn-sdk/cmc.gni
deleted file mode 100644
index 99cdbc1c5e7c4d6e61cfbef012f1ef572036b9c6..0000000000000000000000000000000000000000
--- a/tools/fuchsia/gn-sdk/cmc.gni
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 2013 The Flutter Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("config/config.gni")
-
-# Internal template for the cmc tool.
-#
-# Invokes cmc
-#
-# Example:
-#
-# ```
-# _cmc_tool("validate_cmx") {
-#   inputs = [ manifest ]
-#   outputs = [ stamp_file ]
-#
-#   args = [
-#      "--stamp",
-#      rebase_path(stamp_file, root_build_dir),
-#      "validate",
-#      rebase_path(invoker.manifest),
-#   ]
-# }
-# ```
-#
-# Parameters:
-#
-#  inputs (required)
-#    List of files that are input for cmc.
-#    Type: list(path)
-#
-#  outputs (required)
-#    List paths that are output for the run of cmc.
-#    Type: list(path)
-#
-#  args (required)
-#    List command line args  for  cmc.
-#    Type: list(path)
-#
-#  deps
-#  public_deps
-#  testonly
-#  visibility
-#
-template("_cmc_tool") {
-  action(target_name) {
-    forward_variables_from(invoker,
-                           [
-                             "deps",
-                             "public_deps",
-                             "testonly",
-                             "visibility",
-                           ])
-    script = "//build/gn_run_binary.py"
-    _cmc_tool_path = "${fuchsia_tool_dir}/cmc"
-
-    assert(defined(invoker.inputs), "inputs is a required parameter.")
-    assert(defined(invoker.outputs), "outputs is a required parameter.")
-    assert(defined(invoker.args), "args is a required parameter.")
-
-    inputs =
-        [
-          _cmc_tool_path,
-
-          # Depend on the SDK hash, to ensure rebuild if the SDK tools change.
-          fuchsia_sdk_manifest_file,
-        ] + invoker.inputs
-
-    outputs = invoker.outputs
-
-    args = [ rebase_path(_cmc_tool_path, root_build_dir) ] + invoker.args
-  }
-}
-
-# Compiles a Components Framework v2 manifest (.cml) file to .cm
-#
-# Example:
-#
-# ```
-# cmc_compile(_compiled_manifest_target) {
-#      forward_variables_from(invoker, [ "deps" ])
-#      manifest = rebase_path(manifest)
-# }
-# ```
-#
-# Parameters:
-#
-#   manifest (required)
-#     The input Component Framework v2 manifest source (.cml) file.
-#     The file must have the extension ".cml".
-#
-#   output_name (optional)
-#     Name of the output file to generate. Defaults to $target_name.
-#     This should not include a file extension (.cm)
-#
-#   deps
-#   public_deps
-#   testonly
-#   visibility
-#
-template("cmc_compile") {
-  output_name = target_name
-  if (defined(invoker.output_name)) {
-    output_name = invoker.output_name
-  }
-
-  _cmc_tool(target_name) {
-    forward_variables_from(invoker,
-                           [
-                             "deps",
-                             "manifest",
-                             "public_deps",
-                             "testonly",
-                             "visibility",
-                           ])
-    assert(defined(manifest), "manifest file required")
-
-    inputs = [ manifest ]
-
-    output_file = "$target_out_dir/$output_name.cm"
-    outputs = [ output_file ]
-
-    depfile = "$target_out_dir/$target_name.d"
-
-    args = [
-      "compile",
-      rebase_path(manifest, root_build_dir),
-      "--output",
-      rebase_path(output_file, root_build_dir),
-      "--includeroot",
-      rebase_path("//", root_build_dir),
-      "--includepath",
-      rebase_path("$fuchsia_sdk/pkg/", root_build_dir),
-      "--depfile",
-      rebase_path(depfile, root_build_dir),
-    ]
-  }
-}
-
-# Validates a component manifest file
-#
-# The cmc_validate template will ensure that a given cmx file is conformant to
-# the cmx schema, as defined by //tools/cmc/schema.json. A stamp file is
-# generated to mark that a given cmx file has passed.
-#
-# Parameters:
-#
-#   manifest (required)
-#     [file] The path to the cmx file that is to be validated
-#
-#   deps
-#   testonly
-#   visibility
-#
-template("cmc_validate") {
-  _cmc_tool(target_name) {
-    forward_variables_from(invoker,
-                           [
-                             "manifest",
-                             "deps",
-                             "testonly",
-                             "visibility",
-                           ])
-    stamp_file = "$target_gen_dir/$target_name.verified"
-
-    assert(defined(manifest), "manifest file required")
-
-    inputs = [ manifest ]
-
-    outputs = [ stamp_file ]
-
-    args = [
-      "--stamp",
-      rebase_path(stamp_file, root_build_dir),
-      "validate",
-      rebase_path(invoker.manifest),
-    ]
-  }
-}
-
-# Merges multiple component manifest files into one.
-#
-# Combines mutliple component manifests into a single manifest.
-# This is useful for merging fragments of sandbox configurations into
-# a single component manifest.
-#
-# Example
-#
-# ```
-#   cmc_merge("combined_cmx") {
-#     sources = ["sandbox.cmx", "services.cmx", "program.cmx"]
-#     output_name = "my-component.cmx"
-#   }
-# ```
-#
-# Parameters
-#
-#   sources
-#     The list of cmx files to merge together.
-#
-#     Type: list of strings (filepath)
-#
-#   output_name [optional]
-#     The name of the merged cmx file. This file is created in $target_out_dir.
-#     If not specified, $target_name.cmx is used.
-#
-#     Type: string
-#
-#   Standard parameters:
-#     deps
-#     testonly
-#     visibility
-#
-template("cmc_merge") {
-  _cmc_tool(target_name) {
-    forward_variables_from(invoker,
-                           [
-                             "deps",
-                             "output_name",
-                             "sources",
-                             "testonly",
-                             "visibility",
-                           ])
-    if (!defined(output_name)) {
-      # TODO(richkadel): THE GN SDK VERSION OF CMC.GNI IS INCONSISTENT WITH fuchsia.git!
-      # The default name should be `target_name`, which should already include the
-      # extension... Or change fuchsia.git to add the extension, and fix calls that
-      # append .cmx to the target name, like flutter_dart_component.gni.
-      # With the target_name representing the base of the CMC filename results
-      # in a "Duplicate definition" error in GN, because "flutter_component()"
-      # typically has the same target name. My current workaround is to
-      # redundantly assign `output_name` to the same value as the `target_name`,
-      # which includes the `.cmx` extension.
-      output_name = "${target_name}.cmx"
-    }
-
-    merged_output = "${target_out_dir}/${output_name}"
-    inputs = invoker.sources
-    outputs = [ merged_output ]
-
-    args = [
-      "merge",
-      "--output",
-      rebase_path(merged_output, root_build_dir),
-    ]
-
-    foreach(source, sources) {
-      args += [ rebase_path(source, root_build_dir) ]
-    }
-  }
-}
diff --git a/tools/fuchsia/gn-sdk/component.gni b/tools/fuchsia/gn-sdk/component.gni
deleted file mode 100644
index 6c06b45286ebca12902da655b44efac6bbc0a79a..0000000000000000000000000000000000000000
--- a/tools/fuchsia/gn-sdk/component.gni
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 2013 The Flutter Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("cmc.gni")
-
-declare_args() {
-  # Enable code coverage for Fuchsia components. Only applies to v1 components.
-  fuchsia_code_coverage = false
-}
-
-# Defines a Fuchsia component.
-# See: https://fuchsia.dev/fuchsia-src/glossary#component
-#
-# A component is defined by a component manifest.
-# A component is a unit of executable software on Fuchsia. When the componet is executed, there are usually many files
-# needed at runtime, such as the executable itself, shared libraries, and possibly other data resources. These files are
-# specified by using the GN concept of "data_deps".
-#
-# Components are distributed using a fuchsia package which can contain multiple components. The component manifest and
-# the runtime dependencies of the component are packaged using the fuchsia_package rule.
-#
-# By default, the runtime depenencies of the component are included in the package using relative paths calcualted from
-# the "closest" root of: $root_gen_dir, $root_dir, $out_dir. If a specific path is desired in the package, the "resources" parameter can
-# be used to explicitly specify the path of a specific file.
-#
-# A component is launched by a URL which identifies the package and the component manifest.
-# See: https://fuchsia.dev/fuchsia-src/glossary#component_url
-#
-# Example
-#
-# ```
-#   fuchsia_component("my_component") {
-#      manifest = "meta/component-manifest.cmx"
-#      resources = [
-#        {
-#          path = "testdata/use_case1.json"
-#          dest = "data/testdata/use_case1.json"
-#        },
-#      ]
-#      data_deps = [ ":hello_world_executable"]
-#   }
-# ```
-#
-# Parameters
-#
-#   manifest
-#     The source manifest file for this component. This can be either v1 (.cmx)
-#     or v2 (.cml) manifest.
-#
-#     Type: string (filepath)
-#
-#   data_deps
-#     The labels of targets that generate the files needed at runtime by the component.
-#     At minimum, this should include the label of the binary to include in the component.
-#
-#     Type: list of labels
-#
-#   manifest_output_name [optional]
-#     The name of the manifest file contained in the distribution that this
-#     component is included in. The output name should have no extension or
-#     prefixes. The resulting filename will have the extension correct for the
-#     manifest version. For example, if `manifest` is "foo.cmx"
-#     and `manifest_output_name` is "bar", the filename will be "bar.cmx". If
-#     `manifest` is "foo.cml" (a v2 manifest), the filename will be "bar.cm".
-#
-#     Type: string
-#     Default: The base file name of `manifest` without an extension.
-#
-#   resources [optional]
-#     Lists additional files to include for runtime access by the component.
-#     Defines the resources in a package containing this component. A resource
-#     is a data file that may be produced by the build system, checked in to a
-#     source repository, or produced by another system that runs before the
-#     build. Resources are placed in the `data/` directory of the assembled
-#     package.
-#
-#     Type: list of scopes.  Entries in a scope in the resources list:
-#       path (required)
-#             Location of resource in source or build directory. If the
-#             resource is checked in, this will typically be specified
-#             as a path relative to the BUILD.gn file containing the
-#             `package()` target. If the resource is generated, this will
-#             typically be specified relative to `$target_gen_dir`.
-#
-#        dest (required) string (path) Location the resource will be placed within `data/`.
-#
-#   Standard parameters:
-#     deps
-#     testonly
-#     visibility
-#
-#   Metadata
-#     contents - list of scopes describing files for this component. This metadata is consumed by
-#       The fuchsia_package rule, which describes the entries used.
-#       Entries in scope:
-#         type: the usage type of the element, manifest or resource.
-#                Each type can have specific properties included in the scope.
-#         source [type == manifest || resource] The source file to include in
-#           the package for this component. In the case of v2 components,
-#           this is the compiled manifest.
-#         output_name [type == manifest] The basename of the manifest as it should appear in the package.
-#         manifest_version [type == manifest]
-#       dest: [type == resource] The package relative path of the resource.
-
-template("fuchsia_component") {
-  forward_variables_from(invoker,
-                         [
-                           "manifest",
-                           "manifest_output_name",
-                         ])
-
-  assert(defined(manifest), "manifest file required for this component")
-
-  if (!defined(manifest_output_name)) {
-    manifest_output_name = get_path_info(manifest, "name")
-  }
-
-  # Determine manifest_version from the `manifest` file extension.
-  _manifest_extension = get_path_info(manifest, "extension")
-  assert(_manifest_extension == "cmx" || _manifest_extension == "cml",
-         "Manifest file extension must be .cmx or .cml")
-  if (_manifest_extension == "cmx") {
-    _manifest_version = "v1"
-  } else if (_manifest_extension == "cml") {
-    _manifest_version = "v2"
-  }
-
-  if (fuchsia_code_coverage) {
-    if (_manifest_version == "v1") {
-      merged_manifest = "${target_name}-coverage.cmx"
-      cmc_merge(merged_manifest) {
-        forward_variables_from(invoker,
-                               [
-                                 "deps",
-                                 "testonly",
-                               ])
-        sources = [
-          "${fuchsia_sdk}/build/enable_coverage_data.cmx",
-          manifest,
-        ]
-        output_name = merged_manifest
-      }
-      manifest = "${target_out_dir}/${merged_manifest}"
-    }
-  }
-
-  # The component manifest validated using cmx_validation for v1,
-  # or cmc_compile for v2.
-  _cm_validation_target =
-      "${target_name}_validate_" + get_path_info(manifest, "file")
-
-  if (_manifest_version == "v1") {
-    cmc_validate(_cm_validation_target) {
-      forward_variables_from(invoker, [ "testonly" ])
-      manifest = manifest
-      deps = []
-      if (defined(invoker.deps)) {
-        deps += invoker.deps
-      }
-      if (fuchsia_code_coverage) {
-        deps += [ ":${merged_manifest}" ]
-      }
-    }
-
-    _manifest_source = manifest
-  } else if (_manifest_version == "v2") {
-    cmc_compile(_cm_validation_target) {
-      forward_variables_from(invoker,
-                             [
-                               "deps",
-                               "testonly",
-                             ])
-      manifest = rebase_path(manifest)
-    }
-
-    _compiled_manifest_outputs = get_target_outputs(":$_cm_validation_target")
-    _manifest_source = _compiled_manifest_outputs[0]
-  }
-
-  group(target_name) {
-    forward_variables_from(invoker,
-                           [
-                             "data",
-                             "deps",
-                             "data_deps",
-                             "resources",
-                             "resources_in_json_files",
-                             "testonly",
-                             "visibility",
-                           ])
-
-    # Data is used for adding files as runtime dependencies. Files used as
-    # sources in the resources parameter are added as data to make sure
-    # non-generated files listed are captured as dependencies.
-    if (!defined(data)) {
-      data = []
-    }
-
-    if (!defined(resources)) {
-      resources = []
-    }
-
-    # TODO(richkadel): Changed from the Fuchsia GN SDK to add
-    # `resources_in_json_files, so additional resources could be computed at
-    # compile time (in this case, compiled Dart libraries).
-    if (!defined(resources_in_json_files)) {
-      resources_in_json_files = []
-    }
-
-    if (!defined(deps)) {
-      deps = []
-    }
-    deps += [ ":$_cm_validation_target" ]
-
-    # Create the component metadata entries. These capture the manifest information and
-    # the resources parameter contents.  The metadata is intended for the fuchsia_package rule.
-    component_contents = [
-      {
-        type = "manifest"
-        source = rebase_path(get_path_info(_manifest_source, "abspath"))
-        output_name = manifest_output_name
-        manifest_version = _manifest_version
-      },
-    ]
-    foreach(resource, resources) {
-      data += [ resource.path ]
-      component_contents += [
-        {
-          type = "resource"
-          source = rebase_path(resource.path)
-          dest = resource.dest
-        },
-      ]
-    }
-    foreach(file, resources_in_json_files) {
-      data += [ file ]
-      component_contents += [
-        {
-          type = "json_of_resources"
-          source = file
-        },
-      ]
-    }
-
-    # The contents of the component are enumerated in the
-    # metadata.
-    metadata = {
-      contents = [ component_contents ]
-    }
-  }
-}
diff --git a/tools/fuchsia/gn-sdk/config/config.gni b/tools/fuchsia/gn-sdk/config/config.gni
deleted file mode 100644
index 3be92db282634bffffd2b96bedb3280d6113b5b4..0000000000000000000000000000000000000000
--- a/tools/fuchsia/gn-sdk/config/config.gni
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2013 The Flutter Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# TODO(richkadel): added this import and modified the fuchsia_sdk assignment.
-# See below.
-import("//build/fuchsia/sdk.gni")
-declare_args() {
-  # Path to the fuchsia SDK. This is intended for use in other templates & rules
-  # to reference the contents of the fuchsia SDK.
-  fuchsia_sdk = "$fuchsia_sdk_path"
-
-  # TODO(richkadel): Since flutter needs build rules from the GN SDK, but also
-  # requires the Fuchsia _Core_ SDK (for dart libraries, in the core SDK, but
-  # excluded from the GN SDK), the Fuchsia SDK assumption that the build files
-  # are in the same SDK directory path as the APIs does not hold true. (And
-  # there are are a couple of other minor tweaks that appear to be needed, at
-  # this time.) This use case will be discussed with the SDK team, to see if we
-  # can come up with a cleaner solution.
-
-  # Build ID uniquely identifying the Fuchsia IDK. This is exposed as a property so
-  # it can be used to locate images and packages on GCS and as a marker to indicate the
-  # "version" of the IDK. If it is empty, then it is most likely that something is fatally wrong.
-  fuchsia_sdk_id = ""
-}
-
-declare_args() {
-  # The SDK manifest file. This is useful to include as a dependency
-  # for some targets in order to cause a rebuild when the version of the
-  # SDK is changed.
-  fuchsia_sdk_manifest_file = "$fuchsia_sdk/meta/manifest.json"
-
-  # fuchsia_tool_dir is use to specify the directory in the SDK to locate tools for the
-  # host cpu architecture. If the host_cpu is not recognized, then tool dir
-  # defaults to x64.
-  fuchsia_tool_dir = "$fuchsia_sdk/tools/x64"
-  if (host_cpu == "x64" || host_cpu == "arm64") {
-    fuchsia_tool_dir = "${fuchsia_sdk}/tools/${host_cpu}"
-  }
-
-  # fuchsia_auto_index_symbols when true adds the ids.txt file generated from a `fuchsia_package`
-  # to the Fuchsia symbol index used to symbolize logs and to find source when using zxdb.
-  # The default value is false, in order to be backwards compatibility with existing builds, and
-  # only makes sense to set to true when building as a developer that will need to symbolize logs
-  # or use the debugger with locally build code.
-  fuchsia_auto_index_symbols = false
-}
-
-if (fuchsia_sdk_id == "") {
-  # Note: If we need to expose more than just the id in the future,
-  # we should consider exposing the entire json object for the metadata vs.
-  # adding a bunch of variables.
-  _meta = read_file(fuchsia_sdk_manifest_file, "json")
-  fuchsia_sdk_id = _meta.id
-}
diff --git a/tools/fuchsia/gn-sdk/package.gni b/tools/fuchsia/gn-sdk/package.gni
deleted file mode 100644
index 2b7ce3acf9e07aeea5417d8fc7df780ce49f8278..0000000000000000000000000000000000000000
--- a/tools/fuchsia/gn-sdk/package.gni
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 2013 The Flutter Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("config/config.gni")
-import("pm_tool.gni")
-import("symbol_index.gni")
-
-# Define a Fuchsia component package target.
-#
-# Parameters
-#
-#   package_name: [Optional]
-#     Name of the package. Defaults to target_name.
-#
-#     Type: string
-#
-#   excluded_files: [Optional]
-#     List of files to exclude from the package.
-#
-#     Type: list of file paths
-#
-#   fidl_ref_out_dir: [Optional]
-#     Directory for writing out $package_name_all_fidl_refs.txt
-#       that contains the paths to the internal representation (IR) of every
-#       FIDL interface referenced in the package. Defaults to $root_build_dir/fidl_refs.
-#
-#   ids_txt_output_path: [Optional]
-#     Path to write out the ids.txt file for the symbols in the binaries.
-#     Defaults to `${target_gen_dir}/${package_name}/ids.txt`
-#
-#     Type: file path
-#
-#   deps
-#     Required: List of fuchsia_component() targets that this
-#              package contains.
-#
-template("fuchsia_package") {
-  if (!defined(invoker.package_name)) {
-    package_name = target_name
-  } else {
-    package_name = invoker.package_name
-  }
-  if (!defined(invoker.excluded_files)) {
-    excluded_files = []
-  } else {
-    excluded_files = invoker.excluded_files
-  }
-  if (!defined(invoker.fidl_ref_out_dir)) {
-    fidl_ref_out_dir = "$root_build_dir/fidl_refs"
-  } else {
-    fidl_ref_out_dir = invoker.fidl_ref_out_dir
-  }
-
-  _depfile = "${target_gen_dir}/${target_name}_stamp.d"
-
-  # target names
-  _manifest_target = "${target_name}__archive-manifest"
-  _metadata_target = "${target_name}__archive-metadata"
-  _packaged_components_metadata_target =
-      "${target_name}__packaged_components_metadata"
-
-  # output values
-  _pkg_out_dir = "${target_gen_dir}/${package_name}"
-  _runtime_deps_file = "$_pkg_out_dir/${package_name}.runtime_deps"
-  _archive_manifest = "$_pkg_out_dir/${package_name}.manifest"
-  _build_ids_file = "$_pkg_out_dir/ids.txt"
-  if (defined(invoker.ids_txt_output_path)) {
-    _build_ids_file = invoker.ids_txt_output_path
-  }
-  _package_file = "$_pkg_out_dir/package"
-  _fidl_json_refs_file = "${fidl_ref_out_dir}/${package_name}_all_fidl_refs.txt"
-
-  _packaged_components_metadata_file =
-      "${target_gen_dir}/${package_name}_packaged_components_metadata.json"
-
-  _package_deps = []
-  if (defined(invoker.deps)) {
-    _package_deps += invoker.deps
-  }
-  if (defined(invoker.data_deps)) {
-    _package_deps += invoker.data_deps
-  }
-
-  # Generates a JSON file containing the contents of each of the
-  # components being included in this package.
-  generated_file(_packaged_components_metadata_target) {
-    forward_variables_from(invoker, [ "testonly" ])
-    outputs = [ _packaged_components_metadata_file ]
-    data_keys = [ "contents" ]
-    output_conversion = "json"
-    deps = _package_deps
-  }
-
-  # A generated file that lists all of the .fidl.json files
-  # used in this package. This is useful for tools that need
-  # to decode fidl.
-  generated_file("${package_name}_all_fidl_refs") {
-    testonly = true
-    deps = _package_deps
-
-    outputs = [ _fidl_json_refs_file ]
-    data_keys = [ "fidl_json" ]
-  }
-
-  action(_manifest_target) {
-    forward_variables_from(invoker, [ "testonly" ])
-    script = "//flutter/tools/fuchsia/gn-sdk/prepare_package_inputs.py"
-
-    inputs = [
-      _runtime_deps_file,
-      _packaged_components_metadata_file,
-    ]
-
-    outputs = [
-      _archive_manifest,
-      _build_ids_file,
-      _package_file,
-    ]
-
-    data_deps = _package_deps
-
-    deps = _package_deps
-    deps += [ ":${_packaged_components_metadata_target}" ]
-    if (defined(invoker.deps)) {
-      deps += invoker.deps
-    }
-
-    # Use a depfile to trigger package rebuilds if any of the files (static
-    # assets, shared libraries, etc.) included by the package have changed.
-    depfile = _depfile
-
-    args = [
-      "--root-dir",
-      rebase_path("//", root_build_dir),
-      "--out-dir",
-      rebase_path(root_out_dir, root_build_dir),
-      "--app-name",
-      package_name,
-      "--runtime-deps-file",
-      rebase_path(_runtime_deps_file, root_build_dir),
-      "--depfile-path",
-      rebase_path(_depfile, root_build_dir),
-      "--manifest-path",
-      rebase_path(_archive_manifest, root_build_dir),
-      "--build-ids-file",
-      rebase_path(_build_ids_file, root_build_dir),
-      "--json-file",
-      rebase_path(_packaged_components_metadata_file),
-    ]
-
-    if (defined(excluded_files)) {
-      foreach(filename, excluded_files) {
-        args += [
-          "--exclude-file",
-          filename,
-        ]
-      }
-    }
-    write_runtime_deps = _runtime_deps_file
-
-    # Allows ids.txt paths to be collected by dependent targets.
-    metadata = {
-      ids_txt_paths = [ _build_ids_file ]
-    }
-  }
-
-  # Creates a Fuchsia metadata package.
-  fuchsia_pm_tool(_metadata_target) {
-    forward_variables_from(invoker, [ "testonly" ])
-    package_name = package_name
-    command = "build"
-    archive_manifest = _archive_manifest
-    public_deps = [ ":$_manifest_target" ]
-  }
-
-  fuchsia_pm_tool(target_name) {
-    forward_variables_from(invoker, [ "testonly" ])
-    package_name = package_name
-    command = "archive"
-    archive_manifest = _archive_manifest
-    public_deps = [ ":$_metadata_target" ]
-    if (!defined(deps)) {
-      deps = []
-    }
-    if (defined(fuchsia_auto_index_symbols) && fuchsia_auto_index_symbols) {
-      deps += [ ":${target_name}_fuchsia_auto_index_symbols" ]
-    }
-  }
-
-  if (defined(fuchsia_auto_index_symbols) && fuchsia_auto_index_symbols) {
-    fuchsia_symbol_index_tool("${target_name}_fuchsia_auto_index_symbols") {
-      forward_variables_from(invoker, [ "testonly" ])
-      symbols = _build_ids_file
-      deps = [ ":$_metadata_target" ]
-    }
-  }
-}
diff --git a/tools/fuchsia/gn-sdk/pm_tool.gni b/tools/fuchsia/gn-sdk/pm_tool.gni
deleted file mode 100644
index 73dabf0d6be02e497609cfa3a50df03886629528..0000000000000000000000000000000000000000
--- a/tools/fuchsia/gn-sdk/pm_tool.gni
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 2013 The Flutter Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("config/config.gni")
-
-# Template for running the pm tool for packaging fuchsia packages.
-#
-# Parameters
-#   package_name - defaults to target_name
-#   archive_manifest - required
-#   command - the packaging step to perform valid steps are build, archive
-#
-# Forwarded parameters
-#       testonly
-#       deps
-#       public_deps
-#       visibility
-template("fuchsia_pm_tool") {
-  forward_variables_from(invoker, [ "*" ])
-  action(target_name) {
-    forward_variables_from(invoker,
-                           [
-                             "testonly",
-                             "deps",
-                             "public_deps",
-                             "visibility",
-                           ])
-    _valid_commands = [
-      "build",
-      "archive",
-    ]
-    assert(defined(invoker.archive_manifest), "archive_manifest is required.")
-    archive_manifest = invoker.archive_manifest
-
-    assert(defined(invoker.command), "command is required")
-    assert(invoker.command == "build" || invoker.command == "archive",
-           "invalid command. valid commands are ${_valid_commands}")
-    command = invoker.command
-
-    package_name = target_name
-    if (defined(invoker.package_name)) {
-      package_name = invoker.package_name
-    }
-
-    # tool path
-    _pm_tool_path = "${fuchsia_tool_dir}/pm"
-    script = "//build/gn_run_binary.py"
-
-    # output files
-    _pkg_out_dir = "${target_gen_dir}/${package_name}"
-    _meta_far_file = "${_pkg_out_dir}/meta.far"
-
-    inputs = [
-      # Depend on the SDK hash, to ensure rebuild if the SDK tools change.
-      fuchsia_sdk_manifest_file,
-      _pm_tool_path,
-      archive_manifest,
-    ]
-
-    if (command == "build") {
-      _pkg_output_manifest = "${_pkg_out_dir}/package_manifest.json"
-      outputs = [
-        _meta_far_file,
-        "${_pkg_out_dir}/meta/contents",
-        "${_meta_far_file}.merkle",
-        _pkg_output_manifest,
-      ]
-      depfile = "${_meta_far_file}.d"
-    } else {
-      inputs += [ _meta_far_file ]
-
-      _final_far_file = "$_pkg_out_dir/${package_name}.far"
-      outputs = [ _final_far_file ]
-    }
-
-    args = [
-      rebase_path(_pm_tool_path, root_build_dir),
-      "-o",
-      rebase_path(_pkg_out_dir, root_build_dir),
-      "-m",
-      rebase_path(archive_manifest, root_build_dir),
-      "-n",
-      package_name,
-    ]
-    if (command == "build") {
-      assert(fuchsia_target_api_level != -1,
-             "Must set a target api level when creating an archive")
-      args += [
-        "--api-level=${fuchsia_target_api_level}",
-        command,
-        "-output-package-manifest",
-        rebase_path(_pkg_output_manifest, root_build_dir),
-        "-depfile",
-      ]
-    } else if (command == "archive") {
-      args += [
-        command,
-        "--output",
-        rebase_path("${_pkg_out_dir}/${package_name}"),
-      ]
-    }
-  }
-}
diff --git a/tools/fuchsia/gn-sdk/prepare_package_inputs.py b/tools/fuchsia/gn-sdk/prepare_package_inputs.py
deleted file mode 100755
index 930e45fc88351019d9952ea2802cd587e3a03ca5..0000000000000000000000000000000000000000
--- a/tools/fuchsia/gn-sdk/prepare_package_inputs.py
+++ /dev/null
@@ -1,397 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2013 The Flutter Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-#
-# Derivative work of https://chromium.googlesource.com/chromium/src/+/HEAD/build/config/fuchsia/prepare_package_inputs.py
-#
-
-"""Creates a archive manifest used for Fuchsia package generation."""
-
-import argparse
-import json
-import os
-import shutil
-import subprocess
-import sys
-
-# File extension of a component manifest for each Component Framework version
-MANIFEST_VERSION_EXTENSIONS = {"v1": ".cmx", "v2": ".cm"}
-
-
-def make_package_path(file_path, roots):
-  """Computes a path for |file_path| relative to one of the |roots|.
-
-  Args:
-    file_path: The file path to relativize.
-    roots: A list of directory paths which may serve as a relative root for
-      |file_path|.
-
-    For example:
-        * make_package_path('/foo/bar.txt', ['/foo/']) 'bar.txt'
-        * make_package_path('/foo/dir/bar.txt', ['/foo/']) 'dir/bar.txt'
-        * make_package_path('/foo/out/Debug/bar.exe', ['/foo/', '/foo/out/Debug/']) 'bar.exe'
-  """
-
-  # Prevents greedily matching against a shallow path when a deeper, better
-  # matching path exists.
-  roots.sort(key=len, reverse=True)
-
-  for next_root in roots:
-    if not next_root.endswith(os.sep):
-      next_root += os.sep
-
-    if file_path.startswith(next_root):
-      relative_path = file_path[len(next_root):]
-      return relative_path
-
-  return file_path
-
-
-def _get_stripped_path(bin_path):
-  """Finds the stripped version of |bin_path| in the build output directory.
-
-        returns |bin_path| if no stripped path is found.
-  """
-  stripped_path = bin_path.replace('lib.unstripped/',
-                                   'lib/').replace('exe.unstripped/', '')
-  if os.path.exists(stripped_path):
-    return stripped_path
-  else:
-    return bin_path
-
-
-def _is_binary(path):
-  """Checks if the file at |path| is an ELF executable.
-
-        This is done by inspecting its FourCC header.
-  """
-
-  with open(path, 'rb') as f:
-    file_tag = f.read(4)
-  return file_tag == b'\x7fELF'
-
-
-def _write_build_ids_txt(binary_paths, ids_txt_path):
-  """Writes an index text file mapping build IDs to unstripped binaries."""
-
-  READELF_FILE_PREFIX = 'File: '
-  READELF_BUILD_ID_PREFIX = 'Build ID: '
-
-  # List of binaries whose build IDs are awaiting processing by readelf.
-  # Entries are removed as readelf's output is parsed.
-  unprocessed_binary_paths = set(binary_paths)
-  build_ids_map = {}
-
-  # Sanity check that unstripped binaries do not also have their stripped
-  # counterpart listed.
-  for binary_path in binary_paths:
-    stripped_binary_path = _get_stripped_path(binary_path)
-    if stripped_binary_path != binary_path:
-      unprocessed_binary_paths.discard(stripped_binary_path)
-
-  with open(ids_txt_path, 'w') as ids_file:
-    # TODO(richkadel): This script (originally from the Fuchsia GN SDK) was
-    # changed, adding this `if unprocessed_binary_paths` check, because for
-    # the Dart packages I tested (child-view and parent-view), this was
-    # empty. Update the Fuchsia GN SDK? (Or figure out if the Dart packages
-    # _should_ have at least one unprocessed_binary_path?)
-    if unprocessed_binary_paths:
-      # Create a set to dedupe stripped binary paths in case both the stripped and
-      # unstripped versions of a binary are specified.
-      readelf_stdout = subprocess.check_output(['readelf', '-n'] +
-                                               sorted(unprocessed_binary_paths)
-                                              ).decode('utf8')
-
-      if len(binary_paths) == 1:
-        # Readelf won't report a binary's path if only one was provided to the
-        # tool.
-        binary_path = binary_paths[0]
-      else:
-        binary_path = None
-
-      for line in readelf_stdout.split('\n'):
-        line = line.strip()
-
-        if line.startswith(READELF_FILE_PREFIX):
-          binary_path = line[len(READELF_FILE_PREFIX):]
-          assert binary_path in unprocessed_binary_paths
-
-        elif line.startswith(READELF_BUILD_ID_PREFIX):
-          # Paths to the unstripped executables listed in "ids.txt" are specified
-          # as relative paths to that file.
-          unstripped_rel_path = os.path.relpath(
-              os.path.abspath(binary_path),
-              os.path.dirname(os.path.abspath(ids_txt_path))
-          )
-
-          build_id = line[len(READELF_BUILD_ID_PREFIX):]
-          build_ids_map[build_id] = unstripped_rel_path
-          unprocessed_binary_paths.remove(binary_path)
-
-      for id_and_path in sorted(build_ids_map.items()):
-        ids_file.write(id_and_path[0] + ' ' + id_and_path[1] + '\n')
-
-  # Did readelf forget anything? Make sure that all binaries are accounted for.
-  assert not unprocessed_binary_paths
-
-
-def _parse_component(component_info_file):
-  component_info = json.load(open(component_info_file, 'r'))
-  return component_info
-
-
-def _get_component_manifests(component_info):
-  return [c for c in component_info if c.get('type') == 'manifest']
-
-
-# TODO(richkadel): Changed, from the Fuchsia GN SDK version to add this function
-# and related code, to include support for a file of resources that aren't known
-# until compile time.
-def _get_resource_items_from_json_items(component_info):
-  nested_resources = []
-  files = [
-      c.get('source')
-      for c in component_info
-      if c.get('type') == 'json_of_resources'
-  ]
-  for json_file in files:
-    for resource in _parse_component(json_file):
-      nested_resources.append(resource)
-  return nested_resources
-
-
-def _get_resource_items(component_info):
-  return ([c for c in component_info if c.get('type') == 'resource'] +
-          _get_resource_items_from_json_items(component_info))
-
-
-def _get_expanded_files(runtime_deps_file):
-  """ Process the runtime deps file for file paths, recursively walking
-    directories as needed.
-
-    Returns a set of expanded files referenced by the runtime deps file.
-    """
-
-  # runtime_deps may contain duplicate paths, so use a set for
-  # de-duplication.
-  expanded_files = set()
-  for next_path in open(runtime_deps_file, 'r'):
-    next_path = next_path.strip()
-    if os.path.isdir(next_path):
-      for root, _, files in os.walk(next_path):
-        for current_file in files:
-          if current_file.startswith('.'):
-            continue
-          expanded_files.add(os.path.normpath(os.path.join(root, current_file)))
-    else:
-      expanded_files.add(os.path.normpath(next_path))
-  return expanded_files
-
-
-def _write_gn_deps_file(
-    depfile_path, package_manifest, component_manifests, out_dir, expanded_files
-):
-  with open(depfile_path, 'w') as depfile:
-    deps_list = [os.path.relpath(f, out_dir) for f in expanded_files]
-    deps_list.extend(component_manifests)
-
-    # The deps file is space-delimited, so filenames containing spaces
-    # must have them escaped.
-    deps_list = [f.replace(' ', '\\ ') for f in deps_list]
-
-    deps_string = ' '.join(sorted(deps_list))
-    depfile.write('%s: %s' % (package_manifest, deps_string))
-
-
-def _write_meta_package_manifest(
-    manifest_entries, manifest_path, app_name, out_dir, package_version
-):
-  # Write meta/package manifest file and add to archive manifest.
-  meta_package = os.path.join(os.path.dirname(manifest_path), 'package')
-  with open(meta_package, 'w') as package_json:
-    json_payload = {'version': package_version, 'name': app_name}
-    json.dump(json_payload, package_json)
-    package_json_filepath = os.path.relpath(package_json.name, out_dir)
-    manifest_entries['meta/package'] = package_json_filepath
-
-
-def _write_component_manifest(
-    manifest_entries, component_info, archive_manifest_path, out_dir
-):
-  """Copy component manifest files and add to archive manifest.
-
-    Raises an exception if a component uses a unknown manifest version.
-    """
-
-  for component_manifest in _get_component_manifests(component_info):
-    manifest_version = component_manifest.get('manifest_version')
-
-    if manifest_version not in MANIFEST_VERSION_EXTENSIONS:
-      raise Exception('Unknown manifest_version: {}'.format(manifest_version))
-
-    # TODO(richkadel): Changed, from the Fuchsia GN SDK version, to assume
-    # the given `output_name` already includes its extension. This change
-    # has not been fully validate, in particular, it has not been tested
-    # with CF v2 `.cm` (from `.cml`) files. Original implementation was:
-    #
-    # extension = MANIFEST_VERSION_EXTENSIONS.get(manifest_version)
-    # manifest_dest_file_path = os.path.join(
-    #     os.path.dirname(archive_manifest_path),
-    #     component_manifest.get('output_name') + extension)
-    manifest_dest_file_path = os.path.join(
-        os.path.dirname(archive_manifest_path),
-        component_manifest.get('output_name')
-    )
-    # Add the 'meta/' subdir, for example, if `output_name` includes it
-    os.makedirs(os.path.dirname(manifest_dest_file_path), exist_ok=True)
-    shutil.copy(component_manifest.get('source'), manifest_dest_file_path)
-
-    manifest_entries['meta/%s' % os.path.basename(manifest_dest_file_path)
-                    ] = os.path.relpath(manifest_dest_file_path, out_dir)
-  return manifest_dest_file_path
-
-
-def _write_package_manifest(
-    manifest_entries, expanded_files, out_dir, exclude_file, root_dir,
-    component_info
-):
-  """Writes the package manifest for a Fuchsia package
-
-    Returns a list of binaries in the package.
-
-    Raises an exception if excluded files are not found."""
-  gen_dir = os.path.normpath(os.path.join(out_dir, 'gen'))
-  excluded_files_set = set(exclude_file)
-  roots = [gen_dir, root_dir, out_dir]
-
-  # Filter out component manifests. These are written out elsewhere.
-  excluded_files_set.update([
-      make_package_path(os.path.relpath(cf.get('source'), out_dir), roots)
-      for cf in _get_component_manifests(component_info)
-      if os.path.relpath(cf.get('source'), out_dir) in expanded_files
-  ])
-
-  # Filter out json_of_resources since only their contents are written, and we
-  # don't know the contained resources until late in the build cycle
-  excluded_files_set.update([
-      make_package_path(os.path.relpath(cf.get('source'), out_dir), roots)
-      for cf in component_info
-      if cf.get('type') == 'json_of_resources' and
-      os.path.relpath(cf.get('source'), out_dir) in expanded_files
-  ])
-
-  # Write out resource files with specific package paths, and exclude them from
-  # the list of expanded files so they are not listed twice in the manifest.
-  for resource in _get_resource_items(component_info):
-    relative_src_file = os.path.relpath(resource.get('source'), out_dir)
-    resource_path = make_package_path(relative_src_file, roots)
-    manifest_entries[resource.get('dest')] = relative_src_file
-    if resource.get('type') == 'resource':
-      excluded_files_set.add(resource_path)
-
-  for current_file in expanded_files:
-    current_file = _get_stripped_path(current_file)
-    # make_package_path() may relativize to either the source root or
-    # output directory.
-    in_package_path = make_package_path(current_file, roots)
-
-    if in_package_path in excluded_files_set:
-      excluded_files_set.remove(in_package_path)
-    else:
-      manifest_entries[in_package_path] = current_file
-
-  if excluded_files_set:
-    raise Exception(
-        'Some files were excluded with --exclude-file but '
-        'not found in the deps list, or a resource (data) file '
-        'was added and not filtered out. Excluded files and resources: '
-        '%s' % ', '.join(excluded_files_set)
-    )
-
-
-def _build_manifest(args):
-  # Use a sorted list to make sure the manifest order is deterministic.
-  expanded_files = sorted(_get_expanded_files(args.runtime_deps_file))
-  component_info = _parse_component(args.json_file)
-  component_manifests = []
-
-  # Collect the manifest entries in a map since duplication happens
-  # because of runtime libraries.
-  manifest_entries = {}
-  _write_meta_package_manifest(
-      manifest_entries, args.manifest_path, args.app_name, args.out_dir,
-      args.package_version
-  )
-  for component_item in component_info:
-    _write_package_manifest(
-        manifest_entries, expanded_files, args.out_dir, args.exclude_file,
-        args.root_dir, component_item
-    )
-    component_manifests.append(
-        _write_component_manifest(
-            manifest_entries, component_item, args.manifest_path, args.out_dir
-        )
-    )
-
-  with open(args.manifest_path, 'w') as manifest:
-    for key in sorted(manifest_entries.keys()):
-      manifest.write('%s=%s\n' % (key, manifest_entries[key]))
-
-  binaries = [f for f in expanded_files if _is_binary(f)]
-  _write_build_ids_txt(sorted(binaries), args.build_ids_file)
-
-  # Omit any excluded_files from the expanded_files written to the depfile.
-  gen_dir = os.path.normpath(os.path.join(args.out_dir, 'gen'))
-  roots = [gen_dir, args.root_dir, args.out_dir]
-  excluded_files_set = set(args.exclude_file)
-  expanded_deps_files = [
-      path for path in expanded_files
-      if make_package_path(path, roots) not in excluded_files_set
-  ]
-
-  _write_gn_deps_file(
-      args.depfile_path, args.manifest_path, component_manifests, args.out_dir,
-      expanded_deps_files
-  )
-  return 0
-
-
-def main():
-  parser = argparse.ArgumentParser()
-  parser.add_argument('--root-dir', required=True, help='Build root directory')
-  parser.add_argument('--out-dir', required=True, help='Build output directory')
-  parser.add_argument('--app-name', required=True, help='Package name')
-  parser.add_argument(
-      '--runtime-deps-file',
-      required=True,
-      help='File with the list of runtime dependencies.'
-  )
-  parser.add_argument(
-      '--depfile-path', required=True, help='Path to write GN deps file.'
-  )
-  parser.add_argument(
-      '--exclude-file',
-      action='append',
-      default=[],
-      help='Package-relative file path to exclude from the package.'
-  )
-  parser.add_argument(
-      '--manifest-path', required=True, help='Manifest output path.'
-  )
-  parser.add_argument(
-      '--build-ids-file', required=True, help='Debug symbol index path.'
-  )
-  parser.add_argument('--json-file', required=True)
-  parser.add_argument(
-      '--package-version', default='0', help='Version of the package'
-  )
-
-  args = parser.parse_args()
-
-  return _build_manifest(args)
-
-
-if __name__ == '__main__':
-  sys.exit(main())
diff --git a/tools/fuchsia/gn-sdk/symbol_index.gni b/tools/fuchsia/gn-sdk/symbol_index.gni
deleted file mode 100644
index dd92770b8911b4ae1e8929918467fdecef72ead1..0000000000000000000000000000000000000000
--- a/tools/fuchsia/gn-sdk/symbol_index.gni
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2013 The Flutter Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("config/config.gni")
-
-# TODO(akbiggs): Delete this, symbol-index no longer exists, it has been
-# replaced with ffx debug symbol-index. I don't think this build rule is being
-# used because it would be failing if it was, so it can probably be removed
-# safely.
-#
-# Template for running the symbol-index tool for registering symbols with the symbolizer.
-#
-# Parameters
-#   symbols - the build_id or ids.txt file to add to the index
-#   build_dir - optional, the root of the build id used to resolve
-#       relative source code paths found in the symbols.
-#
-# Forwarded parameters
-#       testonly
-#       deps
-#       public_deps
-#       visibility
-template("fuchsia_symbol_index_tool") {
-  forward_variables_from(invoker, [ "*" ])
-  action(target_name) {
-    forward_variables_from(invoker,
-                           [
-                             "testonly",
-                             "deps",
-                             "public_deps",
-                             "visibility",
-                           ])
-    assert(defined(invoker.symbols), "symbols is required.")
-    _symbol_file = invoker.symbols
-
-    _build_root_dir = root_build_dir
-    if (defined(invoker.build_root_dir)) {
-      _build_root_dir = invoker.build_root_dir
-    }
-
-    _stamp_file = "$target_gen_dir/$target_name.symbol_index.stamp"
-    outputs = [ _stamp_file ]
-
-    # tool path
-    _tool_path = "${fuchsia_tool_dir}/symbol-index"
-    script = "//build/gn_run_binary.py"
-
-    inputs = [
-      # Depend on the SDK hash, to ensure rebuild if the SDK tools change.
-      _symbol_file,
-      _tool_path,
-    ]
-    args = [
-      "--stamp",
-      rebase_path(_stamp_file, root_build_dir),
-      rebase_path(_tool_path, root_build_dir),
-      "add",
-      rebase_path(_symbol_file, root_build_dir),
-      rebase_path(_build_root_dir, root_build_dir),
-    ]
-  }
-}
diff --git a/tools/fuchsia/make_build_info.py b/tools/fuchsia/make_build_info.py
index cde629296d18a6c73cb1c8fb846b33407c19ea8c..ea680a043d89e383e34ddde5662df50181c49bb3 100755
--- a/tools/fuchsia/make_build_info.py
+++ b/tools/fuchsia/make_build_info.py
@@ -15,48 +15,42 @@ import sys
 import json
 
 
+def GetDartPath(buildroot):
+  dart_path = path.join(buildroot, 'flutter', 'third_party', 'dart')
+  if not path.exists(dart_path):
+    dart_path = path.join(buildroot, 'third_party', 'dart')
+  return dart_path
+
+
 def GetDartSdkGitRevision(buildroot):
-  project_root = path.join(buildroot, 'third_party', 'dart')
-  return subprocess.check_output([
-      'git', '-C', project_root, 'rev-parse', 'HEAD'
-  ]).strip()
+  return subprocess.check_output(['git', '-C', GetDartPath(buildroot), 'rev-parse', 'HEAD']).strip()
 
 
 def GetDartSdkSemanticVersion(buildroot):
   project_root = path.join(buildroot, 'third_party', 'dart')
-  return subprocess.check_output([
-      'git', '-C', project_root, 'describe', '--abbrev=0'
-  ]).strip()
+  return subprocess.check_output(['git', '-C',
+                                  GetDartPath(buildroot), 'describe', '--abbrev=0']).strip()
 
 
 def GetFlutterEngineGitRevision(buildroot):
   project_root = path.join(buildroot, 'flutter')
-  return subprocess.check_output([
-      'git', '-C', project_root, 'rev-parse', 'HEAD'
-  ]).strip()
+  return subprocess.check_output(['git', '-C', project_root, 'rev-parse', 'HEAD']).strip()
 
 
 def GetFuchsiaSdkVersion(buildroot):
   with open(path.join(buildroot, 'fuchsia', 'sdk',
-                      'linux' if sys.platform.startswith('linux') else 'mac',
-                      'meta', 'manifest.json'), 'r') as fuchsia_sdk_manifest:
+                      'linux' if sys.platform.startswith('linux') else 'mac', 'meta',
+                      'manifest.json'), 'r') as fuchsia_sdk_manifest:
     return json.load(fuchsia_sdk_manifest)['id']
 
 
 def main():
   # Parse arguments.
   parser = ArgumentParser()
+  parser.add_argument('--input', action='store', help='input file path', required=True)
+  parser.add_argument('--output', action='store', help='output file path', required=True)
   parser.add_argument(
-      '--input', action='store', help='input file path', required=True
-  )
-  parser.add_argument(
-      '--output', action='store', help='output file path', required=True
-  )
-  parser.add_argument(
-      '--buildroot',
-      action='store',
-      help='path to the flutter engine buildroot',
-      required=True
+      '--buildroot', action='store', help='path to the flutter engine buildroot', required=True
   )
   args = parser.parse_args()
 
@@ -72,9 +66,7 @@ def main():
         ).replace(
             '{{FLUTTER_ENGINE_GIT_REVISION}}',
             GetFlutterEngineGitRevision(args.buildroot).decode('utf-8')
-        ).replace(
-            '{{FUCHSIA_SDK_VERSION}}', GetFuchsiaSdkVersion(args.buildroot)
-        )
+        ).replace('{{FUCHSIA_SDK_VERSION}}', GetFuchsiaSdkVersion(args.buildroot))
     )
 
 
diff --git a/tools/fuchsia/merge_and_upload_debug_symbols.py b/tools/fuchsia/merge_and_upload_debug_symbols.py
index 6005b6dcfc8ae3e7e5815821e8da806507acdb78..752e003097606d32fd019ea4b876b72279936ee9 100755
--- a/tools/fuchsia/merge_and_upload_debug_symbols.py
+++ b/tools/fuchsia/merge_and_upload_debug_symbols.py
@@ -17,6 +17,11 @@ import shutil
 import subprocess
 import sys
 import tarfile
+import tempfile
+
+# Path to the engine root checkout. This is used to calculate absolute
+# paths if relative ones are passed to the script.
+BUILD_ROOT_DIR = os.path.abspath(os.path.join(os.path.realpath(__file__), '..', '..', '..', '..'))
 
 
 def IsLinux():
@@ -96,9 +101,7 @@ def ProcessCIPDPackage(upload, cipd_yaml, engine_version, out_dir, target_arch):
   else:
     command = [
         'cipd', 'pkg-build', '-pkg-def', cipd_yaml, '-out',
-        os.path.join(
-            _packaging_dir, 'fuchsia-debug-symbols-%s.cipd' % target_arch
-        )
+        os.path.join(_packaging_dir, 'fuchsia-debug-symbols-%s.cipd' % target_arch)
     ]
 
   # Retry up to three times.  We've seen CIPD fail on verification in some
@@ -145,6 +148,16 @@ def HardlinkContents(dirA, dirB):
   return internal_symbol_dirs
 
 
+def CalculateAbsoluteDirs(dirs):
+  results = []
+  for directory in dirs:
+    if os.path.isabs(directory):
+      results.append(directory)
+    else:
+      results.append(os.path.join(BUILD_ROOT_DIR, directory))
+  return results
+
+
 def main():
   parser = argparse.ArgumentParser()
 
@@ -156,25 +169,22 @@ def main():
   )
   parser.add_argument(
       '--out-dir',
-      required=True,
       action='store',
       dest='out_dir',
-      help='Output directory where the executables will be placed.'
-  )
-  parser.add_argument(
-      '--target-arch', type=str, choices=['x64', 'arm64'], required=True
-  )
-  parser.add_argument(
-      '--engine-version',
-      required=True,
-      help='Specifies the flutter engine SHA.'
+      default=tempfile.mkdtemp(),
+      help=(
+          'Output directory where the executables will be placed defaults to an '
+          'empty temp directory'
+      )
   )
+  parser.add_argument('--target-arch', type=str, choices=['x64', 'arm64'], required=True)
+  parser.add_argument('--engine-version', required=True, help='Specifies the flutter engine SHA.')
 
   parser.add_argument('--upload', default=False, action='store_true')
 
   args = parser.parse_args()
 
-  symbol_dirs = args.symbol_dirs
+  symbol_dirs = CalculateAbsoluteDirs(args.symbol_dirs)
   for symbol_dir in symbol_dirs:
     assert os.path.exists(symbol_dir) and os.path.isdir(symbol_dir)
 
@@ -194,7 +204,17 @@ def main():
 
   arch = args.target_arch
   cipd_def = WriteCIPDDefinition(arch, out_dir, internal_symbol_dirs)
-  ProcessCIPDPackage(args.upload, cipd_def, args.engine_version, out_dir, arch)
+
+  # Set revision to HEAD if empty and remove upload. This is to support
+  # presubmit workflows. An empty engine_version means this script is running
+  # on presubmit.
+  should_upload = args.upload
+  engine_version = args.engine_version
+  if not engine_version:
+    engine_version = 'HEAD'
+    should_upload = False
+
+  ProcessCIPDPackage(should_upload, cipd_def, engine_version, out_dir, arch)
   return 0
 
 
diff --git a/tools/fuchsia/parse_manifest.py b/tools/fuchsia/parse_manifest.py
index 3cd0584c183277ef95842e12995bd8d91181a883..2872ef3e58bc54ccfa51eedbab1c7249448662fe 100755
--- a/tools/fuchsia/parse_manifest.py
+++ b/tools/fuchsia/parse_manifest.py
@@ -17,12 +17,8 @@ import hashlib
 def main():
   parser = argparse.ArgumentParser()
 
-  parser.add_argument(
-      '--input', dest='file_path', action='store', required=True
-  )
-  parser.add_argument(
-      '--clang-cpu', dest='clang_cpu', action='store', required=True
-  )
+  parser.add_argument('--input', dest='file_path', action='store', required=True)
+  parser.add_argument('--clang-cpu', dest='clang_cpu', action='store', required=True)
 
   args = parser.parse_args()
 
diff --git a/tools/fuchsia/sdk/sdk_targets.gni b/tools/fuchsia/sdk/sdk_targets.gni
index c7b850509605d37c44ee7aeddb769a8b0a17674a..274dd7be0b4b973fe4b25c96539b2926169b9ea8 100644
--- a/tools/fuchsia/sdk/sdk_targets.gni
+++ b/tools/fuchsia/sdk/sdk_targets.gni
@@ -2,11 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/fuchsia/sdk.gni")
 import("//flutter/tools/fuchsia/dart/dart_library.gni")
-import("//flutter/tools/fuchsia/fidl/fidl.gni")
-
-_fuchsia_sdk_path = "//fuchsia/sdk/$host_os"
+import("//flutter/tools/fuchsia/gn-sdk/src/fidl_library.gni")
 
 template("_fuchsia_dart_library") {
   assert(defined(invoker.meta), "The meta file content must be specified.")
@@ -17,11 +14,7 @@ template("_fuchsia_dart_library") {
   _sources = []
   _deps = []
 
-  if (defined(meta.dart_library_null_safe) && meta.dart_library_null_safe) {
-    _dart_language_version = "2.12"
-  } else {
-    _dart_language_version = "2.0"
-  }
+  _dart_language_version = "2.12"
 
   foreach(source, meta.sources) {
     _sources += [ string_replace("$source", "${meta.root}/lib/", "") ]
@@ -67,7 +60,7 @@ template("_fuchsia_dart_library") {
   }
 
   dart_library(target_name) {
-    package_root = "${_fuchsia_sdk_path}/${meta.root}"
+    package_root = "${fuchsia_sdk}/${meta.root}"
     package_name = _output_name
     language_version = _dart_language_version
     sources = _sources
@@ -75,23 +68,6 @@ template("_fuchsia_dart_library") {
   }
 }
 
-template("_fuchsia_fidl_library") {
-  assert(defined(invoker.meta), "The meta file content must be specified.")
-  meta = invoker.meta
-  assert(meta.type == "fidl_library")
-
-  fidl(target_name) {
-    sources = []
-    foreach(source, meta.sources) {
-      sources += [ "$fuchsia_sdk_path/$source" ]
-    }
-    public_deps = []
-    foreach(dep, meta.deps) {
-      public_deps += [ ":$dep" ]
-    }
-  }
-}
-
 template("sdk_targets") {
   assert(defined(invoker.meta), "The meta.json file path must be specified.")
 
@@ -102,13 +78,11 @@ template("sdk_targets") {
   foreach(part, meta_json.parts) {
     part_meta_json = {
     }
-
     part_meta = part.meta
-    part_meta_rebased = "$fuchsia_sdk_path/$part_meta"
-
-    part_meta_json = read_file(part_meta_rebased, "json")
+    part_meta_rebased = "$fuchsia_sdk/$part_meta"
 
     if (part_meta != "version_history.json") {
+      part_meta_json = read_file(part_meta_rebased, "json")
       subtarget_name = part_meta_json.name
 
       # Check if the part is using `part.element_type` or `part.type`.
@@ -125,7 +99,7 @@ template("sdk_targets") {
             meta = part_meta_json
           }
         } else if (target_type == "fidl_library") {
-          _fuchsia_fidl_library(subtarget_name) {
+          fidl_library(subtarget_name) {
             meta = part_meta_json
           }
         }
diff --git a/tools/fuchsia/target_api_level b/tools/fuchsia/target_api_level
deleted file mode 100644
index f599e28b8ab0d8c9c57a486c89c4a5132dcbd3b2..0000000000000000000000000000000000000000
--- a/tools/fuchsia/target_api_level
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/tools/fuchsia/toolchain/copy.py b/tools/fuchsia/toolchain/copy.py
index 1f56a60fe8fc49c56b18d054daf706025bc2d55e..a7713cfbd6215891e965807010c6d59081166d32 100755
--- a/tools/fuchsia/toolchain/copy.py
+++ b/tools/fuchsia/toolchain/copy.py
@@ -19,9 +19,7 @@ def main():
   dest = sys.argv[2]
 
   if os.path.isdir(source):
-    print(
-        f'{source} is a directory, tool "copy" does not support directory copies'
-    )
+    print(f'{source} is a directory, tool "copy" does not support directory copies')
     return 1
 
   if os.path.exists(dest):
diff --git a/tools/fuchsia/upload_to_symbol_server.py b/tools/fuchsia/upload_to_symbol_server.py
new file mode 100755
index 0000000000000000000000000000000000000000..c6b97ac57526caecc670d41085d0c53b73ca8611
--- /dev/null
+++ b/tools/fuchsia/upload_to_symbol_server.py
@@ -0,0 +1,93 @@
+#!/usr/bin/env python3
+#
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+"""Uploads debug symbols to the symbols server."""
+
+import argparse
+import os
+import subprocess
+import sys
+import tempfile
+
+## Path to the engine root checkout. This is used to calculate absolute
+## paths if relative ones are passed to the script.
+BUILD_ROOT_DIR = os.path.abspath(os.path.join(os.path.realpath(__file__), '..', '..', '..', '..'))
+FUCHSIA_ARTIFACTS_DEBUG_NAMESPACE = 'debug'
+FUCHSIA_ARTIFACTS_BUCKET_NAME = 'fuchsia-artifacts-release'
+
+
+def remote_filename(exec_path):
+  # An example of exec_path is:
+  # out/fuchsia_debug_x64/flutter-fuchsia-x64/d4/917f5976.debug
+  # In the above example "d4917f5976" is the elf BuildID for the
+  # executable. First 2 characters are used as the directory name
+  # and the rest of the string is the name of the unstripped executable.
+  parts = exec_path.split('/')
+  # We want d4917f5976.debug as the result.
+  return ''.join(parts[-2:])
+
+
+def exists_remotely(remote_path):
+  gsutil = os.path.join(os.environ['DEPOT_TOOLS'], 'gsutil.py')
+  command = ['python3', gsutil, '--', 'stat', remote_path]
+  process = subprocess.Popen(command, stderr=subprocess.PIPE, stdout=subprocess.PIPE)
+  stdout, stderr = process.communicate()
+  return_code = process.wait()
+  if return_code == 0:
+    print('%s exists - skipping copy' % remote_path)
+  return return_code == 0
+
+
+def process_symbols(should_upload, symbol_dir):
+  full_path = os.path.join(BUILD_ROOT_DIR, symbol_dir)
+
+  files = []
+  for (dirpath, dirnames, filenames) in os.walk(full_path):
+    files.extend([os.path.join(dirpath, f) for f in filenames])
+
+  print('List of files to upload')
+  print('\n'.join(files))
+
+  # Remove dbg_files
+  files = [f for f in files if 'dbg_success' not in f]
+
+  for file in files:
+    remote_path = 'gs://%s/%s/%s' % (
+        FUCHSIA_ARTIFACTS_BUCKET_NAME, FUCHSIA_ARTIFACTS_DEBUG_NAMESPACE, remote_filename(file)
+    )
+    if should_upload and not exists_remotely(remote_path):
+      gsutil = os.path.join(os.environ['DEPOT_TOOLS'], 'gsutil.py')
+      command = ['python3', gsutil, '--', 'cp', file, remote_path]
+      subprocess.check_call(command)
+    else:
+      print(remote_path)
+
+
+def main():
+  parser = argparse.ArgumentParser()
+
+  parser.add_argument(
+      '--symbol-dir', required=True, help='Directory that contain the debug symbols.'
+  )
+  parser.add_argument('--engine-version', required=True, help='Specifies the flutter engine SHA.')
+  parser.add_argument(
+      '--upload', default=False, action='store_true', help='If set, uploads symbols to the server.'
+  )
+
+  args = parser.parse_args()
+
+  should_upload = args.upload
+  engine_version = args.engine_version
+  if not engine_version:
+    engine_version = 'HEAD'
+    should_upload = False
+
+  process_symbols(should_upload, args.symbol_dir)
+  return 0
+
+
+if __name__ == '__main__':
+  sys.exit(main())
diff --git a/tools/fuchsia/with_envs.py b/tools/fuchsia/with_envs.py
new file mode 100644
index 0000000000000000000000000000000000000000..bb23636a419c9f1d0cc1e9bae07fb1a19f0aeed9
--- /dev/null
+++ b/tools/fuchsia/with_envs.py
@@ -0,0 +1,53 @@
+#!/usr/bin/env python3
+# Copyright (c) 2013, the Flutter project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be found
+# in the LICENSE file.
+
+import os
+import platform
+import subprocess
+import sys
+
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), 'test_scripts/test/')))
+
+from common import catch_sigterm, wait_for_sigterm
+
+
+def Main():
+  """
+    Executes the test-scripts with required environment variables. It acts like
+    /usr/bin/env, but provides some extra functionality to dynamically set up
+    the environment variables.
+    """
+  # Ensures the signals can be correctly forwarded to the subprocesses.
+  catch_sigterm()
+
+  os.environ['SRC_ROOT'] = os.path.abspath(os.path.join(os.path.dirname(__file__), '../../../'))
+  # Flutter uses a different repo structure and fuchsia sdk is not in the
+  # third_party/, so images root and sdk root need to be explicitly set.
+  os.environ['FUCHSIA_IMAGES_ROOT'] = os.path.join(os.environ['SRC_ROOT'], 'fuchsia/images/')
+
+  assert platform.system() == 'Linux', 'Unsupported OS ' + platform.system()
+  os.environ['FUCHSIA_SDK_ROOT'] = os.path.join(os.environ['SRC_ROOT'], 'fuchsia/sdk/linux/')
+  os.environ['FUCHSIA_GN_SDK_ROOT'] = os.path.join(
+      os.environ['SRC_ROOT'], 'flutter/tools/fuchsia/gn-sdk/src'
+  )
+
+  if os.getenv('DOWNLOAD_FUCHSIA_SDK') == 'True':
+    sdk_path = os.environ['FUCHSIA_SDK_PATH']
+    assert sdk_path.endswith('/linux-amd64/core.tar.gz')
+    assert not sdk_path.startswith('/')
+    os.environ['FUCHSIA_SDK_OVERRIDE'
+              ] = 'gs://fuchsia-artifacts/' + sdk_path[:-len('/linux-amd64/core.tar.gz')]
+
+  with subprocess.Popen(sys.argv[1:]) as proc:
+    try:
+      proc.wait()
+    except:
+      # Use terminate / SIGTERM to allow the subprocess exiting cleanly.
+      proc.terminate()
+    return proc.returncode
+
+
+if __name__ == '__main__':
+  sys.exit(Main())
diff --git a/tools/gen_android_buildconfig.py b/tools/gen_android_buildconfig.py
index d75d273fc1a53b6a36b252340d78d716243ff64f..6d70b76601c6f2ee3fd18311a1661665d489c479 100644
--- a/tools/gen_android_buildconfig.py
+++ b/tools/gen_android_buildconfig.py
@@ -30,9 +30,7 @@ public final class BuildConfig {{
 
 
 def main():
-  parser = argparse.ArgumentParser(
-      description='Generate BuildConfig.java for Android'
-  )
+  parser = argparse.ArgumentParser(description='Generate BuildConfig.java for Android')
   parser.add_argument('--runtime-mode', type=str, required=True)
   parser.add_argument('--out', type=str, required=True)
 
diff --git a/tools/gen_docs.py b/tools/gen_docs.py
new file mode 100755
index 0000000000000000000000000000000000000000..7985cfa02db16b8ff432370c30ccc941bd8f2504
--- /dev/null
+++ b/tools/gen_docs.py
@@ -0,0 +1,106 @@
+#!/usr/bin/env python3
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Generates API docs for Flutter embedders and libraries.
+import os
+import shutil
+import tempfile
+import zipfile
+import sys
+import subprocess
+from collections import namedtuple
+
+Section = namedtuple('Section', ['title', 'inputs'])
+
+SECTIONS = {
+    'ios':
+        Section(
+            'iOS Embedder', [
+                'shell/platform/darwin/ios',
+                'shell/platform/darwin/common',
+                'shell/platform/common',
+            ]
+        ),
+    'macos':
+        Section(
+            'macOS Embedder', [
+                'shell/platform/darwin/macos',
+                'shell/platform/darwin/common',
+                'shell/platform/common',
+            ]
+        ),
+    'linux':
+        Section('Linux Embedder', [
+            'shell/platform/linux',
+            'shell/platform/common',
+        ]),
+    'windows':
+        Section('Windows Embedder', [
+            'shell/platform/windows',
+            'shell/platform/common',
+        ]),
+    'impeller':
+        Section('Impeller', [
+            'impeller',
+        ]),
+}
+
+
+def generate_doxyfile(section, output_dir, log_file, doxy_file):
+  doxyfile = open('docs/Doxyfile.template', 'r').read()
+  doxyfile = doxyfile.replace('@@OUTPUT_DIRECTORY@@', output_dir)
+  doxyfile = doxyfile.replace('@@LOG_FILE@@', log_file)
+  doxyfile = doxyfile.replace('@@INPUT_DIRECTORIES@@', '"{}"'.format('" "'.join(section.inputs)))
+  doxyfile = doxyfile.replace('@@PROJECT_NAME@@', 'Flutter {}'.format(section.title))
+  doxyfile = doxyfile.replace(
+      '@@DOCSET_FEEDNAME@@', 'Flutter {} Documentation'.format(section.title)
+  )
+  with open(doxy_file, 'w') as f:
+    f.write(doxyfile)
+
+
+def process_section(name, section, destination):
+  output_dir = tempfile.mkdtemp(prefix="doxygen")
+  log_file = os.path.join(destination, '{}-doxygen.log'.format(name))
+  zip_file = os.path.join(destination, '{}-docs.zip'.format(name))
+  doxy_file = os.path.join(output_dir, 'Doxyfile')
+  generate_doxyfile(section, output_dir, log_file, doxy_file)
+  # Update the Doxyfile format to the latest format.
+  subprocess.call(['doxygen', '-u'], cwd=output_dir)
+  subprocess.call(['doxygen', doxy_file])
+  html_dir = os.path.join(output_dir, 'html')
+  with zipfile.ZipFile(zip_file, 'w') as zip:
+    for root, _, files in os.walk(html_dir):
+      for file in files:
+        filename = os.path.join(root, file)
+        zip.write(filename, os.path.relpath(filename, html_dir))
+  print('Wrote ZIP file for {} to {}'.format(section, zip_file))
+  print('Preserving log file in {}'.format(log_file))
+  shutil.rmtree(output_dir, ignore_errors=True)
+
+
+def generate_docs(argv):
+  if len(argv) != 2:
+    print(
+        'Error: Argument specifying output directory required. '
+        'Directory may be an absolute path, or a relative path from the "src" directory.'
+    )
+    exit(1)
+
+  destination = argv[1]
+  script_path = os.path.realpath(__file__)
+  src_path = os.path.dirname(os.path.dirname(os.path.dirname(script_path)))
+  # Run commands from the Flutter root dir.
+  os.chdir(os.path.join(src_path, 'flutter'))
+  # If the argument isn't an absolute path, assume that it is relative to the src dir.
+  if not os.path.isabs(destination):
+    destination = os.path.join(src_path, destination)
+  os.makedirs(destination, exist_ok=True)
+  for name, section in SECTIONS.items():
+    process_section(name, section, destination)
+
+
+if __name__ == '__main__':
+  generate_docs(sys.argv)
diff --git a/tools/gen_objcdoc.sh b/tools/gen_objcdoc.sh
deleted file mode 100755
index 7f7d65d4f4bd6804f752739847bb78aaa49d6b34..0000000000000000000000000000000000000000
--- a/tools/gen_objcdoc.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2013 The Flutter Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# Generates objc docs for Flutter iOS libraries.
-
-set -e
-
-if [[ $# -eq 0 ]]; then
-   echo "Error: Argument specifying output directory required."
-   exit 1
-fi
-
-# Move to the flutter checkout
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-pushd "$SCRIPT_DIR/../../flutter"
-
-FLUTTER_UMBRELLA_HEADER=$(find ../out -maxdepth 4 -type f -name Flutter.h | grep 'ios_' | head -n 1)
-if [[ ! -f "$FLUTTER_UMBRELLA_HEADER" ]]
-  then
-      echo "Error: This script must be run at the root of the Flutter source tree with at least one built Flutter.framework in ../out/ios*/Flutter.framework."
-      echo "Running from: $(pwd)"
-      exit 1
-fi
-
-OUTPUT_DIR="$1/objectc_docs"
-ZIP_DESTINATION="$1"
-if [ "${OUTPUT_DIR:0:1}" != "/" ]
-then
-  ZIP_DESTINATION="$SCRIPT_DIR/../../$1"
-  OUTPUT_DIR="$ZIP_DESTINATION/objectc_docs"
-fi
-
-# If GEM_HOME is set, prefer using its copy of jazzy.
-# LUCI will put jazzy here instead of on the path.
-if [[ -n "${GEM_HOME}" ]]
-  then
-    PATH="${GEM_HOME}/bin:$PATH"
-fi
-
-# Use iPhoneSimulator SDK
-# See: https://github.com/realm/jazzy/issues/791
-jazzy \
-  --objc\
-  --sdk iphonesimulator\
-  --clean\
-  --author Flutter Team\
-  --author_url 'https://flutter.io'\
-  --github_url 'https://github.com/flutter'\
-  --github-file-prefix 'http://github.com/flutter/engine/blob/main'\
-  --module-version 1.0.0\
-  --xcodebuild-arguments --objc,"$FLUTTER_UMBRELLA_HEADER",--,-x,objective-c,-isysroot,"$(xcrun --show-sdk-path --sdk iphonesimulator)",-I,"$(pwd)"\
-  --module Flutter\
-  --root-url https://api.flutter.dev/objc/\
-  --output "$OUTPUT_DIR"
-
-EXPECTED_CLASSES="FlutterAppDelegate.html
-FlutterBasicMessageChannel.html
-FlutterCallbackCache.html
-FlutterCallbackInformation.html
-FlutterDartProject.html
-FlutterEngine.html
-FlutterEngineGroup.html
-FlutterEngineGroupOptions.html
-FlutterError.html
-FlutterEventChannel.html
-FlutterHeadlessDartRunner.html
-FlutterMethodCall.html
-FlutterMethodChannel.html
-FlutterPluginAppLifeCycleDelegate.html
-FlutterStandardMessageCodec.html
-FlutterStandardMethodCodec.html
-FlutterStandardReader.html
-FlutterStandardReaderWriter.html
-FlutterStandardTypedData.html
-FlutterStandardWriter.html
-FlutterViewController.html"
-
-ACTUAL_CLASSES=$(ls "$OUTPUT_DIR/Classes" | sort)
-
-if [[ $EXPECTED_CLASSES != $ACTUAL_CLASSES ]]; then
-  echo "Expected classes did not match actual classes"
-  echo
-  diff <(echo "$EXPECTED_CLASSES") <(echo "$ACTUAL_CLASSES")
-  exit -1
-fi
-
-# Create the final zip file.
-pushd $OUTPUT_DIR
-zip -r "$ZIP_DESTINATION/ios-objcdoc.zip" .
-popd
diff --git a/tools/gen_test_font.py b/tools/gen_test_font.py
new file mode 100755
index 0000000000000000000000000000000000000000..33bfd58c9636556fe3f556a084c68af7836d7555
--- /dev/null
+++ b/tools/gen_test_font.py
@@ -0,0 +1,323 @@
+#!/usr/bin/env python3
+#
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import sys, math
+from operator import itemgetter
+from itertools import groupby
+import unicodedata
+import fontforge
+
+NAME = "FlutterTest"
+# Turn off auto-hinting and enable manual hinting. FreeType skips auto-hinting
+# if the font's family name is in a hard-coded "tricky" font list.
+TRICKY_NAME = "MingLiU"
+EM = 1024
+DESCENT = -EM // 4
+ASCENT = EM + DESCENT
+# -143 and 20 are the underline location and width Ahem uses.
+UPOS = -143 * 1000 // EM
+UWIDTH = 20 * 1000 // EM
+
+### Font Metadata and Metrics
+
+font = fontforge.font()
+font.familyname = TRICKY_NAME
+font.fullname = NAME
+font.fontname = NAME
+
+# This sets the relevant fields in the os2 table and hhea table.
+font.ascent = ASCENT
+font.descent = -DESCENT
+font.upos = UPOS
+font.uwidth = UWIDTH
+font.hhea_linegap = 0
+font.os2_typolinegap = 0
+
+font.horizontalBaseline = (
+    ("hang", "ideo", "romn"),
+    (
+        ("latn", "romn", (ASCENT, DESCENT, 0), ()),
+        ("grek", "romn", (ASCENT, DESCENT, 0), ()),
+        ("hani", "ideo", (ASCENT, DESCENT, 0), ()),
+    ),
+)
+
+### TrueType Hinting
+
+# Hints are ignored on macOS.
+#
+# These hints only **vertically** adjust the outlines, for better vertical
+# alignment in golden tests. They don't affect the font or the glyphs' public
+# metrics available to the framework, so they typically don't affect non-golden
+# tests.
+#
+# The hinting goals are:
+#
+# 1. Aligning the key points on glyph outlines between glyphs, when different
+#    types of glyphs are placed side by side. E.g., for a given point size, "p"
+#    and "É" should never overlap vertically, and "p" and "x" should be
+#    bottom-aligned.
+#
+# 2. Aligning the top and the bottom of the "x" glyph with the background. With
+#    point size = 14, since the em square's y-extent is 3.5 px (256 * 14 / 1024)
+#    below the baseline and 10.5 px above the baseline, the glyph's CBOX will be
+#    "rounded out" (3.5 -> 4, 10.5 -> 11). So "x" is going to be misaligned with
+#    the background by +0.5 px when rasterized without proper grid-fitting.
+
+# Allocate space in cvt.
+font.cvt = [0]
+# gcd is used to avoid overflowing, this works for the current ASCENT and EM value.
+gcd = math.gcd(ASCENT, EM)
+# The control value program is for computing the y-offset (in pixels) to move
+# the embox's top edge to grid. The end result will be stored to CVT entry 0.
+# CVT[0] = (pointSize * ASCENT / EM) - ceil(pointSize * ASCENT / EM)
+prep_program = f"""
+    RTG
+    PUSHW_1
+    0
+    MPS
+    PUSHW_1
+    {(ASCENT << 6) // gcd}
+    MUL
+    PUSHW_1
+    {EM // gcd}
+    DIV
+    DUP
+    CEILING
+    SUB
+    WCVTP
+"""
+font.setTableData("prep", fontforge.parseTTInstrs(prep_program))
+
+
+def glyph_program(glyph):
+  # Shift Zone 1 by CVT[0]. In FreeType SHZ actually shifts the zone zp2
+  # points to, instead of top of the stack. That's probably a bug.
+  instructions = """
+        SVTCA[0]
+        PUSHB_4
+        0
+        0
+        0
+        0
+        SZPS
+        MIRP[0000]
+        SRP2
+        PUSHB_3
+        1
+        1
+        1
+        SZP2
+        SHZ[0]
+        SZPS
+    """
+
+  # Round To Grid every on-curve point, but ignore those who are on the ASCENT
+  # or DESCENT line. This step keeps "p" (ascent flushed) and "É" (descent
+  # flushed)'s y extents from overlapping each other.
+  for index, point in enumerate([p for contour in glyph.foreground for p in contour]):
+    if point.y not in [ASCENT, DESCENT]:
+      instructions += f"""
+                PUSHB_1
+                {index}
+                MDAP[1]
+            """
+  return fontforge.parseTTInstrs(instructions)
+
+
+### Creating Glyphs Outlines
+
+
+def square_glyph(glyph):
+  pen = glyph.glyphPen()
+  # Counter Clockwise
+  pen.moveTo((0, DESCENT))
+  pen.lineTo((0, ASCENT))
+  pen.lineTo((EM, ASCENT))
+  pen.lineTo((EM, DESCENT))
+  pen.closePath()
+  glyph.ttinstrs = glyph_program(glyph)
+
+
+def ascent_flushed_glyph(glyph):
+  pen = glyph.glyphPen()
+  pen.moveTo((0, DESCENT))
+  pen.lineTo((0, 0))
+  pen.lineTo((EM, 0))
+  pen.lineTo((EM, DESCENT))
+  pen.closePath()
+  glyph.ttinstrs = glyph_program(glyph)
+
+
+def descent_flushed_glyph(glyph):
+  pen = glyph.glyphPen()
+  pen.moveTo((0, 0))
+  pen.lineTo((0, ASCENT))
+  pen.lineTo((EM, ASCENT))
+  pen.lineTo((EM, 0))
+  pen.closePath()
+  glyph.ttinstrs = glyph_program(glyph)
+
+
+def not_def_glyph(glyph):
+  pen = glyph.glyphPen()
+  # Counter Clockwise for the outer contour.
+  pen.moveTo((EM // 8, 0))
+  pen.lineTo((EM // 8, ASCENT))
+  pen.lineTo((EM - EM // 8, ASCENT))
+  pen.lineTo((EM - EM // 8, 0))
+  pen.closePath()
+  # Clockwise, inner contour.
+  pen.moveTo((EM // 4, EM // 8))
+  pen.lineTo((EM - EM // 4, EM // 8))
+  pen.lineTo((EM - EM // 4, ASCENT - EM // 8))
+  pen.lineTo((EM // 4, ASCENT - EM // 8))
+  pen.closePath()
+  glyph.ttinstrs = glyph_program(glyph)
+
+
+def unicode_range(fromUnicode, throughUnicode):
+  return range(fromUnicode, throughUnicode + 1)
+
+
+square_codepoints = [
+    codepoint for l in [
+        unicode_range(0x21, 0x26),
+        unicode_range(0x28, 0x6F),
+        unicode_range(0x71, 0x7E),
+        unicode_range(0xA1, 0xC8),
+        unicode_range(0xCA, 0xFF),
+        [0x131],
+        unicode_range(0x152, 0x153),
+        [0x178, 0x192],
+        unicode_range(0x2C6, 0x2C7),
+        [0x2C9],
+        unicode_range(0x2D8, 0x2DD),
+        [0x394, 0x3A5, 0x3A7, 0x3A9, 0x3BC, 0x3C0],
+        unicode_range(0x2013, 0x2014),
+        unicode_range(0x2018, 0x201A),
+        unicode_range(0x201C, 0x201E),
+        unicode_range(0x2020, 0x2022),
+        [0x2026, 0x2030],
+        unicode_range(0x2039, 0x203A),
+        [0x2044, 0x2122, 0x2126, 0x2202, 0x2206, 0x220F],
+        unicode_range(0x2211, 0x2212),
+        unicode_range(0x2219, 0x221A),
+        [0x221E, 0x222B, 0x2248, 0x2260],
+        unicode_range(0x2264, 0x2265),
+        [
+            0x22F2, 0x25CA, 0x3007, 0x4E00, 0x4E03, 0x4E09, 0x4E5D, 0x4E8C, 0x4E94, 0x516B, 0x516D,
+            0x5341, 0x56D7, 0x56DB, 0x571F, 0x6728, 0x6C34, 0x706B, 0x91D1
+        ],
+        unicode_range(0xF000, 0xF002),
+    ] for codepoint in l
+] + [0x70] + [ord(c) for c in "中文测试文本是否正确"]
+
+no_path_codepoints = [
+    #(codepoint, advance %)
+    (0x0020, 1),
+    (0x00A0, 1),
+    (0x2003, 1),
+    (0x3000, 1),
+    (0x2002, 1 / 2),
+    (0x2004, 1 / 3),
+    (0x2005, 1 / 4),
+    (0x2006, 1 / 6),
+    (0x2009, 1 / 5),
+    (0x200A, 1 / 10),
+    (0xFEFF, 0),
+    (0x200B, 0),
+    (0x200C, 0),
+    (0x200D, 0),
+]
+
+
+def create_glyph(name, contour):
+  glyph = font.createChar(-1, name)
+  contour(glyph)
+  glyph.width = EM
+  return glyph
+
+
+if square_codepoints:
+  create_glyph("Square", square_glyph).altuni = square_codepoints
+create_glyph("Ascent Flushed", ascent_flushed_glyph).unicode = 0x70
+create_glyph("Descent Flushed", descent_flushed_glyph).unicode = 0xC9
+create_glyph(".notdef", not_def_glyph).unicode = -1
+
+
+def create_no_path_glyph(codepoint, advance_percentage):
+  name = "Zero Advance" if advance_percentage == 0 else (
+      "Full Advance" if advance_percentage == 1 else f"1/{(int)(1/advance_percentage)} Advance"
+  )
+  no_path_glyph = font.createChar(codepoint, name)
+  no_path_glyph.width = (int)(EM * advance_percentage)
+  return no_path_glyph
+
+
+for (codepoint, advance_percentage) in no_path_codepoints:
+  if (codepoint in square_codepoints):
+    raise ValueError(f"{hex(codepoint)} is occupied.")
+  create_no_path_glyph(codepoint, advance_percentage)
+
+font.generate(sys.argv[1] if len(sys.argv) >= 2 else "test_font.ttf")
+
+### Printing Glyph Map Stats
+
+scripts = set()
+for glyph in font.glyphs():
+  if glyph.unicode >= 0:
+    scripts.add(fontforge.scriptFromUnicode(glyph.unicode))
+  for codepoint, _, _ in glyph.altuni or []:
+    scripts.add(fontforge.scriptFromUnicode(codepoint))
+script_list = list(scripts)
+script_list.sort()
+
+print(f"|     \ Script <br />Glyph | {' | '.join(script_list)} |")
+print(" | :--- " + " | :----: " * len(script_list) + "|")
+
+for glyph in font.glyphs():
+  if glyph.unicode < 0 and not glyph.altuni:
+    continue
+  glyph_mapping = {}
+  if glyph.unicode >= 0:
+    glyph_mapping[fontforge.scriptFromUnicode(glyph.unicode)] = [glyph.unicode]
+  for codepoint, _, _ in glyph.altuni or []:
+    script = fontforge.scriptFromUnicode(codepoint)
+    if script in glyph_mapping:
+      glyph_mapping[script].append(codepoint)
+    else:
+      glyph_mapping[script] = [codepoint]
+
+  codepoints_by_script = [glyph_mapping.get(script, []) for script in script_list]
+
+  def describe_codepoint_range(codepoints):
+    if not codepoints:
+      return ""
+    codepoints.sort()
+    codepoint_ranges = [
+        list(map(itemgetter(1), group))
+        for key, group in groupby(enumerate(codepoints), lambda x: x[0] - x[1])
+    ]
+    characters = [chr(c) for c in codepoints]
+
+    def map_char(c):
+      if c == "`":
+        return "`` ` ``"
+      if c == "|":
+        return "`\\|`"
+      if c.isprintable() and (not c.isspace()):
+        return f"`{c}`"
+      return "`<" + unicodedata.name(c, hex(ord(c))) + ">`"
+
+    full_list = " ".join([map_char(c) for c in characters])
+    return "**codepoint(s):** " + ", ".join([
+        f"{hex(r[0])}-{hex(r[-1])}" if len(r) > 1 else hex(r[0]) for r in codepoint_ranges
+    ]) + "<br />" + "**character(s):** " + full_list
+
+  print(
+      f"| {glyph.glyphname} | {' | '.join([describe_codepoint_range(l) for l in codepoints_by_script])} |"
+  )
diff --git a/tools/gen_web_locale_keymap/bin/gen_web_locale_keymap.dart b/tools/gen_web_locale_keymap/bin/gen_web_locale_keymap.dart
index a2f2bf3f4a8e334313204450e7439b3e57fe063f..6bf2d70052b78a8bc38e7867af9bafe5d0885d3f 100644
--- a/tools/gen_web_locale_keymap/bin/gen_web_locale_keymap.dart
+++ b/tools/gen_web_locale_keymap/bin/gen_web_locale_keymap.dart
@@ -5,10 +5,10 @@
 import 'dart:io';
 
 import 'package:args/args.dart';
-import 'package:gen_web_keyboard_layouts/benchmark_planner.dart';
-import 'package:gen_web_keyboard_layouts/common.dart';
-import 'package:gen_web_keyboard_layouts/github.dart';
-import 'package:gen_web_keyboard_layouts/layout_types.dart';
+import 'package:gen_web_keyboard_keymap/benchmark_planner.dart';
+import 'package:gen_web_keyboard_keymap/common.dart';
+import 'package:gen_web_keyboard_keymap/github.dart';
+import 'package:gen_web_keyboard_keymap/layout_types.dart';
 import 'package:path/path.dart' as path;
 
 const String kEnvGithubToken = 'GITHUB_TOKEN';
diff --git a/tools/gen_web_locale_keymap/data/key_mappings.dart.tmpl b/tools/gen_web_locale_keymap/data/key_mappings.dart.tmpl
index fa54363de1f9fe9793c3794707ea5e816daabf37..b308353ddf3911a6d61e3078582e9c921696ce85 100644
--- a/tools/gen_web_locale_keymap/data/key_mappings.dart.tmpl
+++ b/tools/gen_web_locale_keymap/data/key_mappings.dart.tmpl
@@ -5,7 +5,7 @@
 
 // DO NOT EDIT -- DO NOT EDIT -- DO NOT EDIT
 //
-// This file is auto generated by flutter/engine:flutter/tools/gen_web_keyboard_layouts based on
+// This file is auto generated by flutter/engine:flutter/tools/gen_web_keyboard_keymap based on
 // @@@COMMIT_URL@@@
 //
 // Edit the following files instead:
@@ -13,7 +13,7 @@
 //  - Script: lib/main.dart
 //  - Templates: data/*.tmpl
 //
-// See flutter/engine:flutter/tools/gen_web_keyboard_layouts/README.md for more information.
+// See flutter/engine:flutter/tools/gen_web_locale_keymap/README.md for more information.
 @@@COMMON@@@
 
 /// Data for [LocaleKeymap] on Windows.
diff --git a/tools/gen_web_locale_keymap/data/test_cases.dart.tmpl b/tools/gen_web_locale_keymap/data/test_cases.dart.tmpl
index 41a94b0a6817378b1ad8d6d1df7146c8d848a3fc..d18c73b3e0defdbccdf868f7da4262446816408d 100644
--- a/tools/gen_web_locale_keymap/data/test_cases.dart.tmpl
+++ b/tools/gen_web_locale_keymap/data/test_cases.dart.tmpl
@@ -5,7 +5,7 @@
 
 // DO NOT EDIT -- DO NOT EDIT -- DO NOT EDIT
 //
-// This file is auto generated by flutter/engine:flutter/tools/gen_web_keyboard_layouts based on
+// This file is auto generated by flutter/engine:flutter/tools/gen_web_keyboard_keymap based on
 // https://github.com/microsoft/vscode/tree/@@@COMMIT_ID@@@/src/vs/workbench/services/keybinding/browser/keyboardLayouts
 //
 // Edit the following files instead:
@@ -13,7 +13,7 @@
 //  - Script: lib/main.dart
 //  - Templates: data/*.tmpl
 //
-// See flutter/engine:flutter/tools/gen_web_keyboard_layouts/README.md for more information.
+// See flutter/engine:flutter/tools/gen_web_keyboard_keymap/README.md for more information.
 
 import 'package:test/test.dart';
 import 'package:web_locale_keymap/web_locale_keymap.dart';
diff --git a/tools/gen_web_locale_keymap/lib/common.dart b/tools/gen_web_locale_keymap/lib/common.dart
index 2d8526d8773e31de08af1bc8d4f18ffe82cef39d..9f9a2963a09ac9322b1b31dbaa4b8f39c721b6da 100644
--- a/tools/gen_web_locale_keymap/lib/common.dart
+++ b/tools/gen_web_locale_keymap/lib/common.dart
@@ -159,22 +159,20 @@ class _StringStream {
 
 Map<String, int> _unmarshallCodeMap(_StringStream stream) {
   final int entryNum = stream.readIntAsVerbatim();
-  return Map<String, int>.fromEntries((() sync* {
-    for (int entryIndex = 0; entryIndex < entryNum; entryIndex += 1) {
-      yield MapEntry<String, int>(stream.readEventKey(), stream.readIntAsChar());
-    }
-  })());
+  return <String, int>{
+    for (int i = 0; i < entryNum; i++)
+      stream.readEventKey(): stream.readIntAsChar(),
+  };
 }
 
 /// Decode a key mapping data out of the string.
 Map<String, Map<String, int>> unmarshallMappingData(String compressed) {
   final _StringStream stream = _StringStream(compressed);
   final int eventCodeNum = stream.readIntAsVerbatim();
-  return Map<String, Map<String, int>>.fromEntries((() sync* {
-    for (int eventCodeIndex = 0; eventCodeIndex < eventCodeNum; eventCodeIndex += 1) {
-      yield MapEntry<String, Map<String, int>>(stream.readEventCode(), _unmarshallCodeMap(stream));
-    }
-  })());
+  return <String, Map<String, int>>{
+    for (int i = 0; i < eventCodeNum; i++)
+      stream.readEventCode() : _unmarshallCodeMap(stream),
+  };
 }
 
 /*@@@ SHARED SEGMENT END @@@*/
diff --git a/tools/gen_web_locale_keymap/pubspec.yaml b/tools/gen_web_locale_keymap/pubspec.yaml
index 363b3b533e33cfc1e37f6ee6d9b929168de7b8cd..bbd82dee63f280d55f3cefa46a4320c816219bb8 100644
--- a/tools/gen_web_locale_keymap/pubspec.yaml
+++ b/tools/gen_web_locale_keymap/pubspec.yaml
@@ -1,20 +1,37 @@
-name: gen_web_keyboard_layouts
+name: gen_web_keyboard_keymap
 description: Generates keyboard layouts for Web from external sources.
 
 environment:
-  sdk: ">=2.18.0-0 <3.0.0"
+  sdk: '>=3.2.0-0 <4.0.0'
 
 dependencies:
   args: any
-  http: ^0.13.4
-  path: ^1.8.1
+  http: any
+  path: any
   meta: any
 
-dev_dependencies:
-  test: ^1.21.1
-
 dependency_overrides:
   args:
     path: ../../../third_party/dart/third_party/pkg/args
+  async:
+    path: ../../../third_party/dart/third_party/pkg/async
+  collection:
+    path: ../../../third_party/dart/third_party/pkg/collection
+  http:
+    path: ../../../third_party/dart/third_party/pkg/http/pkgs/http
+  http_parser:
+    path: ../../../third_party/dart/third_party/pkg/http_parser
   meta:
     path: ../../../third_party/dart/pkg/meta
+  path:
+    path: ../../../third_party/dart/third_party/pkg/path
+  source_span:
+    path: ../../../third_party/dart/third_party/pkg/source_span
+  string_scanner:
+    path: ../../../third_party/dart/third_party/pkg/string_scanner
+  term_glyph:
+    path: ../../../third_party/dart/third_party/pkg/term_glyph
+  typed_data:
+    path: ../../../third_party/dart/third_party/pkg/typed_data
+  web:
+    path: ../../../third_party/dart/third_party/pkg/web
diff --git a/tools/githooks/README.md b/tools/githooks/README.md
index 1ac57c8ca3326a634226514679c29aed0f509007..ce0ab06a242160e5bd8c7d4e8dd3b1ce0cc129d7 100644
--- a/tools/githooks/README.md
+++ b/tools/githooks/README.md
@@ -21,8 +21,8 @@ scripts have the names that `git` will look for.
 This hooks runs when pushing commits to a remote branch, for example to
 create or update a pull request: `git push origin my-local-branch`.
 
-The `pre-push` hook runs `ci/lint.sh` and `ci/format.sh`. `ci/analyze.sh` and
-`ci/licenses.sh` are more expensive and are not run.
+The `pre-push` hook runs `ci/clang_tidy.sh`, `ci/pylint.sh` and `ci/format.sh`.
+`ci/analyze.sh` and `ci/licenses.sh` are more expensive and are not run.
 
 ### Adding new pre-push checks
 
diff --git a/tools/githooks/lib/githooks.dart b/tools/githooks/lib/githooks.dart
index 14c3d4349fff7ee2482474fff2523456ab3e4998..0a44e2ab33a0a4c6ffd085e7ade90ed7cbbb5462 100644
--- a/tools/githooks/lib/githooks.dart
+++ b/tools/githooks/lib/githooks.dart
@@ -7,7 +7,10 @@ import 'dart:io' as io;
 import 'package:args/args.dart';
 import 'package:args/command_runner.dart';
 
+import 'src/post_checkout_command.dart';
+import 'src/post_merge_command.dart';
 import 'src/pre_push_command.dart';
+import 'src/pre_rebase_command.dart';
 
 /// Runs the githooks
 Future<int> run(List<String> args) async {
@@ -15,7 +18,10 @@ Future<int> run(List<String> args) async {
     'githooks',
     'Githooks implementation for the flutter/engine repo.',
   )
-  ..addCommand(PrePushCommand());
+  ..addCommand(PostCheckoutCommand())
+  ..addCommand(PostMergeCommand())
+  ..addCommand(PrePushCommand())
+  ..addCommand(PreRebaseCommand());
 
   // Add top-level arguments.
   runner.argParser
diff --git a/tools/githooks/lib/src/messages.dart b/tools/githooks/lib/src/messages.dart
new file mode 100644
index 0000000000000000000000000000000000000000..787a8a134be51c1be0776e14a0c29beaf6c2b426
--- /dev/null
+++ b/tools/githooks/lib/src/messages.dart
@@ -0,0 +1,19 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io' as io;
+
+const String _redBoldUnderline = '\x1B[31;1;4m';
+const String _reset = '\x1B[0m';
+
+/// Prints a reminder to stdout to run `gclient sync -D`. Uses colors when
+/// stdout supports ANSI escape codes.
+void printGclientSyncReminder(String command) {
+  final String prefix = io.stdout.supportsAnsiEscapes ? _redBoldUnderline : '';
+  final String postfix = io.stdout.supportsAnsiEscapes ? _reset : '';
+  io.stderr.writeln('$command: The engine source tree has been updated.');
+  io.stderr.writeln(
+    '\n${prefix}You may need to run "gclient sync -D"$postfix\n',
+  );
+}
diff --git a/tools/githooks/lib/src/post_checkout_command.dart b/tools/githooks/lib/src/post_checkout_command.dart
new file mode 100644
index 0000000000000000000000000000000000000000..2be39d15e2c075802dc7cc77c155faed47d6daa1
--- /dev/null
+++ b/tools/githooks/lib/src/post_checkout_command.dart
@@ -0,0 +1,22 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:args/command_runner.dart';
+
+import 'messages.dart';
+
+/// The command that implements the post-checkout githook
+class PostCheckoutCommand extends Command<bool> {
+  @override
+  final String name = 'post-checkout';
+
+  @override
+  final String description = 'Checks that run after the worktree is updated';
+
+  @override
+  Future<bool> run() async {
+    printGclientSyncReminder(name);
+    return true;
+  }
+}
diff --git a/testing/scenario_app/lib/src/platform_echo_mixin.dart b/tools/githooks/lib/src/post_merge_command.dart
similarity index 32%
rename from testing/scenario_app/lib/src/platform_echo_mixin.dart
rename to tools/githooks/lib/src/post_merge_command.dart
index 2567fa1cd2744771da01bbd3cbe05f956cdf7e34..3ce259fda1b5d6768b4ccc9fbde35a5a40266093 100644
--- a/testing/scenario_app/lib/src/platform_echo_mixin.dart
+++ b/tools/githooks/lib/src/post_merge_command.dart
@@ -2,20 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:typed_data';
-import 'dart:ui';
+import 'package:args/command_runner.dart';
 
-import 'scenario.dart';
+import 'messages.dart';
 
-/// Echo platform messages back to the sender.
-mixin PlatformEchoMixin on Scenario {
-  /// Handle a platform message.
+/// The command that implements the post-merge githook
+class PostMergeCommand extends Command<bool> {
   @override
-  void onPlatformMessage(
-    String name,
-    ByteData? data,
-    PlatformMessageResponseCallback? callback,
-  ) {
-    window.sendPlatformMessage(name, data, null);
+  final String name = 'post-merge';
+
+  @override
+  final String description = 'Checks to run after a "git merge"';
+
+  @override
+  Future<bool> run() async {
+    printGclientSyncReminder(name);
+    return true;
   }
 }
diff --git a/tools/githooks/lib/src/pre_rebase_command.dart b/tools/githooks/lib/src/pre_rebase_command.dart
new file mode 100644
index 0000000000000000000000000000000000000000..3e816708882614b36b85ae46a0b00a3fe669a02b
--- /dev/null
+++ b/tools/githooks/lib/src/pre_rebase_command.dart
@@ -0,0 +1,23 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:args/command_runner.dart';
+
+import 'messages.dart';
+
+/// The command that implements the pre-rebase githook
+class PreRebaseCommand extends Command<bool> {
+  @override
+  final String name = 'pre-rebase';
+
+  @override
+  final String description = 'Checks to run before a "git rebase"';
+
+  @override
+  Future<bool> run() async {
+    printGclientSyncReminder(name);
+    // Returning false here will block the rebase.
+    return true;
+  }
+}
diff --git a/tools/githooks/post-checkout b/tools/githooks/post-checkout
new file mode 100755
index 0000000000000000000000000000000000000000..a3d6654de3fcac261593c9e84c5c1c6fdac00fbe
--- /dev/null
+++ b/tools/githooks/post-checkout
@@ -0,0 +1,42 @@
+#!/usr/bin/env vpython3
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+'''
+Runs the post-checkout githooks.
+'''
+
+import os
+import subprocess
+import sys
+
+SRC_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
+FLUTTER_DIR = os.path.join(SRC_ROOT, 'flutter')
+
+
+def GetDartBin():
+  dart_bin = os.path.join(SRC_ROOT, 'flutter', 'third_party', 'dart', 'tools', 'sdks', 'dart-sdk', 'bin')
+  if not os.path.exists(dart_bin):
+    dart_bin = os.path.join(SRC_ROOT, 'third_party', 'dart', 'tools', 'sdks', 'dart-sdk', 'bin')
+  return dart_bin
+
+
+def Main(argv):
+  githook_args = [
+    '--flutter',
+    FLUTTER_DIR,
+  ]
+
+  result = subprocess.run([
+    os.path.join(GetDartBin(), 'dart'),
+    '--disable-dart-dev',
+    os.path.join(FLUTTER_DIR, 'tools', 'githooks', 'bin', 'main.dart'),
+  ] + githook_args + [
+    'post-checkout',
+  ] + argv[1:], cwd=SRC_ROOT)
+  return result.returncode
+
+
+if __name__ == '__main__':
+    sys.exit(Main(sys.argv))
diff --git a/tools/githooks/post-merge b/tools/githooks/post-merge
new file mode 100755
index 0000000000000000000000000000000000000000..91cbe9ee73fbec92c3656bead132b46b6ac486ef
--- /dev/null
+++ b/tools/githooks/post-merge
@@ -0,0 +1,42 @@
+#!/usr/bin/env vpython3
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+'''
+Runs the post-merge githooks.
+'''
+
+import os
+import subprocess
+import sys
+
+SRC_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
+FLUTTER_DIR = os.path.join(SRC_ROOT, 'flutter')
+
+
+def GetDartBin():
+  dart_bin = os.path.join(SRC_ROOT, 'flutter', 'third_party', 'dart', 'tools', 'sdks', 'dart-sdk', 'bin')
+  if not os.path.exists(dart_bin):
+    dart_bin = os.path.join(SRC_ROOT, 'third_party', 'dart', 'tools', 'sdks', 'dart-sdk', 'bin')
+  return dart_bin
+
+
+def Main(argv):
+  githook_args = [
+    '--flutter',
+    FLUTTER_DIR,
+  ]
+
+  result = subprocess.run([
+    os.path.join(GetDartBin(), 'dart'),
+    '--disable-dart-dev',
+    os.path.join(FLUTTER_DIR, 'tools', 'githooks', 'bin', 'main.dart'),
+  ] + githook_args + [
+    'post-merge',
+  ] + argv[1:], cwd=SRC_ROOT)
+  return result.returncode
+
+
+if __name__ == '__main__':
+    sys.exit(Main(sys.argv))
diff --git a/tools/githooks/pre-push b/tools/githooks/pre-push
index 4e10ce870add57244a2d0acf74cffd04e6852b4f..5b95d51b6d445e29440f4f1bef3e67b78e5de7c5 100755
--- a/tools/githooks/pre-push
+++ b/tools/githooks/pre-push
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env vpython3
 # Copyright 2013 The Flutter Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
@@ -14,9 +14,16 @@ import sys
 
 SRC_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
 FLUTTER_DIR = os.path.join(SRC_ROOT, 'flutter')
-DART_BIN = os.path.join(SRC_ROOT, 'third_party', 'dart', 'tools', 'sdks', 'dart-sdk', 'bin')
 ENABLE_CLANG_TIDY = os.environ.get('PRE_PUSH_CLANG_TIDY')
 
+
+def GetDartBin():
+  dart_bin = os.path.join(SRC_ROOT, 'flutter', 'third_party', 'dart', 'tools', 'sdks', 'dart-sdk', 'bin')
+  if not os.path.exists(dart_bin):
+    dart_bin = os.path.join(SRC_ROOT, 'third_party', 'dart', 'tools', 'sdks', 'dart-sdk', 'bin')
+  return dart_bin
+
+
 def Main(argv):
   githook_args = [
     '--flutter',
@@ -29,12 +36,12 @@ def Main(argv):
     ]
 
   result = subprocess.run([
-    os.path.join(DART_BIN, 'dart'),
+    os.path.join(GetDartBin(), 'dart'),
     '--disable-dart-dev',
     os.path.join(FLUTTER_DIR, 'tools', 'githooks', 'bin', 'main.dart'),
   ] + githook_args + [
     'pre-push',
-  ], cwd=SRC_ROOT)
+  ] + argv[1:], cwd=SRC_ROOT)
   return result.returncode
 
 
diff --git a/tools/githooks/pre-rebase b/tools/githooks/pre-rebase
new file mode 100755
index 0000000000000000000000000000000000000000..56082c4a6aa49d50e40f810f8c7a7553bbb1f86d
--- /dev/null
+++ b/tools/githooks/pre-rebase
@@ -0,0 +1,42 @@
+#!/usr/bin/env vpython3
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+'''
+Runs the pre-rebase githooks.
+'''
+
+import os
+import subprocess
+import sys
+
+SRC_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
+FLUTTER_DIR = os.path.join(SRC_ROOT, 'flutter')
+
+
+def GetDartBin():
+  dart_bin = os.path.join(SRC_ROOT, 'flutter', 'third_party', 'dart', 'tools', 'sdks', 'dart-sdk', 'bin')
+  if not os.path.exists(dart_bin):
+    dart_bin = os.path.join(SRC_ROOT, 'third_party', 'dart', 'tools', 'sdks', 'dart-sdk', 'bin')
+  return dart_bin
+
+
+def Main(argv):
+  githook_args = [
+    '--flutter',
+    FLUTTER_DIR,
+  ]
+
+  result = subprocess.run([
+    os.path.join(GetDartBin(), 'dart'),
+    '--disable-dart-dev',
+    os.path.join(FLUTTER_DIR, 'tools', 'githooks', 'bin', 'main.dart'),
+  ] + githook_args + [
+    'pre-rebase',
+  ] + argv[1:], cwd=SRC_ROOT)
+  return result.returncode
+
+
+if __name__ == '__main__':
+    sys.exit(Main(sys.argv))
diff --git a/tools/githooks/pubspec.yaml b/tools/githooks/pubspec.yaml
index 891f45852b1b8bf2f91af64e4934ade5954a6530..ef2cafcf024684f61512a81a27d7f3b23487f894 100644
--- a/tools/githooks/pubspec.yaml
+++ b/tools/githooks/pubspec.yaml
@@ -5,7 +5,7 @@
 name: githooks
 publish_to: none
 environment:
-  sdk: '>=2.12.0-0.0.dev <3.0.0'
+  sdk: '>=3.2.0-0 <4.0.0'
 
 # Do not add any dependencies that require more than what is provided in
 # //third_party.pkg, //third_party/dart/pkg, or
@@ -18,9 +18,9 @@ environment:
 
 dependencies:
   args: any
+  clang_tidy: any
   meta: any
   path: any
-  clang_tidy: any
 
 dev_dependencies:
   async_helper: any
@@ -39,10 +39,14 @@ dependency_overrides:
     path: ../clang_tidy
   collection:
     path: ../../../third_party/dart/third_party/pkg/collection
+  engine_repo_tools:
+    path: ../pkg/engine_repo_tools
   expect:
     path: ../../../third_party/dart/pkg/expect
   file:
-    path: ../../../third_party/pkg/file/packages/file
+    path: ../../../third_party/dart/third_party/pkg/file/packages/file
+  git_repo_tools:
+    path: ../pkg/git_repo_tools
   litetest:
     path: ../../testing/litetest
   meta:
@@ -50,10 +54,10 @@ dependency_overrides:
   path:
     path: ../../../third_party/dart/third_party/pkg/path
   platform:
-    path: ../../../third_party/pkg/platform
+    path: ../../third_party/pkg/platform
   process:
-    path: ../../../third_party/pkg/process
+    path: ../../third_party/pkg/process
   process_runner:
-    path: ../../../third_party/pkg/process_runner
+    path: ../../third_party/pkg/process_runner
   smith:
     path: ../../../third_party/dart/pkg/smith
diff --git a/tools/githooks/setup.py b/tools/githooks/setup.py
index ea8edf467a8381e292644de25c7cf04c203c4d44..7187588120a451bdf8c9bd3be3a0bce9c8a62005 100755
--- a/tools/githooks/setup.py
+++ b/tools/githooks/setup.py
@@ -12,9 +12,7 @@ import subprocess
 import sys
 
 SRC_ROOT = os.path.dirname(
-    os.path.dirname(
-        os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-    )
+    os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 )
 FLUTTER_DIR = os.path.join(SRC_ROOT, 'flutter')
 
@@ -29,14 +27,12 @@ def Main(argv):
   githooks = os.path.join(FLUTTER_DIR, 'tools', 'githooks')
   if IsWindows():
     git = 'git.bat'
-    githooks = os.path.join(githooks, 'windows')
   result = subprocess.run([
       git,
       'config',
       'core.hooksPath',
       githooks,
-  ],
-                          cwd=FLUTTER_DIR)
+  ], cwd=FLUTTER_DIR)
   return result.returncode
 
 
diff --git a/tools/githooks/test/githooks_test.dart b/tools/githooks/test/githooks_test.dart
index 2b347d31dd20f6083b9f20fb6e8b63e7442d05a4..74639c2d549c808cdbc45752e8dfd1c56b44bdb7 100644
--- a/tools/githooks/test/githooks_test.dart
+++ b/tools/githooks/test/githooks_test.dart
@@ -66,4 +66,52 @@ void main() {
     }
     expect(result, equals(1));
   });
+
+  test('post-merge runs successfully', () async {
+    int? result;
+    try {
+      final io.Directory flutterPath = io.File(io.Platform.script.path)
+        .parent.parent.parent;
+      result = await run(<String>[
+        'post-merge',
+        '--flutter',
+        flutterPath.path,
+      ]);
+    } catch (e, st) {
+      fail('Unexpected exception: $e\n$st');
+    }
+    expect(result, equals(0));
+  });
+
+  test('pre-rebase runs successfully', () async {
+    int? result;
+    try {
+      final io.Directory flutterPath = io.File(io.Platform.script.path)
+        .parent.parent.parent;
+      result = await run(<String>[
+        'pre-rebase',
+        '--flutter',
+        flutterPath.path,
+      ]);
+    } catch (e, st) {
+      fail('Unexpected exception: $e\n$st');
+    }
+    expect(result, equals(0));
+  });
+
+  test('post-checkout runs successfully', () async {
+    int? result;
+    try {
+      final io.Directory flutterPath = io.File(io.Platform.script.path)
+        .parent.parent.parent;
+      result = await run(<String>[
+        'post-checkout',
+        '--flutter',
+        flutterPath.path,
+      ]);
+    } catch (e, st) {
+      fail('Unexpected exception: $e\n$st');
+    }
+    expect(result, equals(0));
+  });
 }
diff --git a/tools/githooks/windows/pre-push b/tools/githooks/windows/pre-push
index aa363e3cdf4e04838a8addb1b8229bed3b3705d0..811a4c9e6c2130f6269a913861304a4684fdd953 100644
--- a/tools/githooks/windows/pre-push
+++ b/tools/githooks/windows/pre-push
@@ -3,8 +3,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+YELLOW=''
 RED=''
 NC=''
 BOLD=''
-echo "${BOLD}${RED}Warning:${NC} ${BOLD}Pre-push checks not supported on Windows${NC}"
-echo "${BOLD}See: https://github.com/flutter/flutter/issues/86506${NC}"
+echo "${BOLD}${RED}Warning:${NC} ${BOLD}Pre-push checks are not enabled!${NC}"
+echo "${YELLOW}${BOLD}Note:${NC} ${BOLD}Please run 'gclient sync -D' to enable pre-push checks on Windows${NC}"
diff --git a/tools/gn b/tools/gn
index 58d35d1d9d08f1157d089c15a3f4f11672475589..f6f4948d7970d6ddad7ad002e6c5cd9ca50137cd 100755
--- a/tools/gn
+++ b/tools/gn
@@ -8,14 +8,15 @@ from __future__ import division
 from __future__ import print_function
 
 import argparse
-import subprocess
-import sys
+import ctypes
+import multiprocessing
 import os
 import platform
+import re
+import subprocess
+import sys
 
-SRC_ROOT = os.path.dirname(
-    os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-)
+SRC_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
 def get_out_dir(args):
@@ -52,6 +53,7 @@ def get_out_dir(args):
   if args.linux_cpu is not None:
     target_dir.append(args.linux_cpu)
 
+
 #  if args.ohos_cpu is not None:
 #   target_dir.append(args.ohos_cpu)
 
@@ -67,6 +69,9 @@ def get_out_dir(args):
   if args.macos_enable_metal:
     target_dir.append('metal')
 
+  if args.darwin_extension_safe:
+    target_dir.append('extension_safe')
+
   if args.target_dir != '':
     target_dir = [args.target_dir]
 
@@ -83,20 +88,13 @@ def to_command_line(gn_args):
   def merge(key, value):
     if isinstance(value, bool):
       return '%s=%s' % (key, 'true' if value else 'false')
+    if isinstance(value, int):
+      return '%s=%d' % (key, value)
     return '%s="%s"' % (key, value)
 
   return [merge(x, y) for x, y in gn_args.items()]
 
 
-def cpu_for_target_arch(arch):
-  if arch in ['ia32', 'x86', 'arm', 'armv6', 'armv5te', 'mips', 'simarm',
-              'simarmv6', 'simarmv5te', 'simmips', 'simdbc', 'armsimdbc']:
-    return 'x86'
-  if arch in ['x64', 'arm64', 'simarm64', 'simdbc64', 'armsimdbc64']:
-    return 'x64'
-  return None
-
-
 def is_host_build(args):
   # If target_os == None, then this is a host build.
   if args.target_os is None:
@@ -107,24 +105,20 @@ def is_host_build(args):
     return True
 #if args.target_os == 'ohos' and args.ohos_cpu == 'arm64':
 #    return True
-  # The Mac and host targets are redundant. Again, necessary to disambiguate
-  # during cross-compilation.
+# The Mac and host targets are redundant. Again, necessary to disambiguate
+# during cross-compilation.
   if args.target_os == 'mac':
     return True
   return False
 
 
 # Determines whether a prebuilt Dart SDK can be used instead of building one.
-# We can use a prebuilt Dart SDK when:
-# 1. It is a host build, a build targeting Fuchsia, or a build targeting desktop.
-# 2. The prebuilt SDK exists under //flutter/prebuilts/$OS-$ARCH.
 def can_use_prebuilt_dart(args):
   prebuilt = None
-  # In a Fuchsia build, we can use a prebuilt Dart SDK for the host to build
-  # platform agnostic artifacts (e.g. kernel snapshots), and a Dart SDK
-  # targeting Fuchsia is not needed. So, it is safe to say that the prebuilt
-  # Dart SDK in a Fuchsia build is the host prebuilt Dart SDK.
-  if args.target_os is None or args.target_os == 'fuchsia':
+  # When doing a 'host' build (args.target_os is None), or a build when the
+  # target OS and host OS are different, the prebuilt Dart SDK is the Dart SDK
+  # for the host system's OS and archetecture.
+  if args.target_os is None or args.target_os in ['android', 'ios', 'fuchsia']:
     if sys.platform.startswith(('cygwin', 'win')):
       prebuilt = 'windows-x64'
     elif sys.platform == 'darwin':
@@ -160,7 +154,8 @@ def get_host_os():
 # Rosetta. I.e., python3 is an x64 executable and we're on an arm64 Mac.
 def is_rosetta():
   if platform.system() == 'Darwin':
-    proc = subprocess.Popen(['sysctl', '-in', 'sysctl.proc_translated'], shell=True,
+    proc = subprocess.Popen(['sysctl', '-in', 'sysctl.proc_translated'],
+                            shell=True,
                             stdout=subprocess.PIPE,
                             stderr=subprocess.STDOUT)
     output, _ = proc.communicate()
@@ -218,53 +213,274 @@ def get_target_cpu(args):
   return 'x64'
 
 
+def buildtools_dir():
+  host_os = get_host_os()
+  host_cpu = get_host_cpu()
+  if host_os == 'win':
+    host_os = 'windows'
+  return '%s-%s' % (host_os, host_cpu)
+
+
+def setup_rbe(args):
+  rbe_gn_args = {}
+  # RBE is default-off. If it is not asked for, then silently keep all default
+  # flag values.
+  if not args.rbe:
+    return rbe_gn_args
+
+  rbe_gn_args['use_rbe'] = True
+
+  # When running in CI, the recipes use their own rbe install, and take
+  # care of starting and stopping the compiler proxy.
+  running_on_luci = os.environ.get('LUCI_CONTEXT') is not None
+
+  if args.rbe_server_address:
+    rbe_gn_args['rbe_server_address'] = args.rbe_server_address
+  if args.rbe_exec_strategy:
+    rbe_gn_args['rbe_exec_strategy'] = args.rbe_exec_strategy
+  if args.rbe_dial_timeout:
+    rbe_gn_args['rbe_dial_timeout'] = args.rbe_dial_timeout
+  if args.rbe_platform:
+    rbe_gn_args['rbe_platform'] = args.rbe_platform
+
+  rbe_gn_args['rbe_dir'] = os.path.join(
+      SRC_ROOT, 'flutter', 'buildtools', buildtools_dir(), 'reclient'
+  )
+
+  rbe_gn_args['rbe_cfg'] = os.path.join(
+      SRC_ROOT, 'flutter', 'build', 'rbe', 'rewrapper-' + buildtools_dir() + '.cfg'
+  )
+
+  if sys.platform == 'darwin':
+    if (not running_on_luci or args.xcode_symlinks or
+        os.getenv('FLUTTER_GOMA_CREATE_XCODE_SYMLINKS', '0') == '1'):
+      rbe_gn_args['create_xcode_symlinks'] = True
+
+  return rbe_gn_args
+
+
+def setup_goma(args):
+  goma_gn_args = {}
+  # If RBE is requested, don't try to use goma.
+  if args.rbe:
+    goma_gn_args['use_goma'] = False
+    goma_gn_args['goma_dir'] = None
+    return goma_gn_args
+
+  # args.goma has three states, True (--goma), False (--no-goma), and
+  # None (default). In True mode, we force GOMA to be used (and fail
+  # if we cannot enable it) unless the selected target definitely does
+  # not support it (in which case we print a warning). In False mode,
+  # we disable GOMA regardless. In None mode, we enable it if we can
+  # autodetect a configuration, and otherwise disable it.
+
+  # When running in CI, the recipes use their own goma install, and take
+  # care of starting and stopping the compiler proxy.
+  running_on_luci = os.environ.get('LUCI_CONTEXT') is not None
+
+  # The GOMA client has no arm64 binary, so run the x64 binary through
+  # Rosetta.
+  buildtools_platform = buildtools_dir()
+  if buildtools_platform == 'mac-arm64':
+    buildtools_platform = 'mac-x64'
+
+  # Prefer the goma fetched by gclient if it exists.
+  cipd_goma_dir = os.path.join(SRC_ROOT, 'flutter', 'buildtools', buildtools_platform, 'goma')
+
+  # Next, if GOMA_DIR is set, use that install.
+  goma_dir = os.environ.get('GOMA_DIR')
+
+  # Finally, look for goma in the install location recommended in our
+  # documentation.
+  goma_home_dir = os.path.join(os.getenv('HOME', ''), 'goma')
+  # GOMA has a different default (home) path on gWindows.
+  if not os.path.exists(goma_home_dir) and sys.platform.startswith(('cygwin', 'win')):
+    goma_home_dir = os.path.join('c:\\', 'src', 'goma', 'goma-win64')
+
+  if args.target_os == 'wasm' or args.web:
+    goma_gn_args['use_goma'] = False
+    goma_gn_args['goma_dir'] = None
+    if args.goma:
+      print('Disabling GOMA for wasm builds, it is not supported yet.')
+  elif args.goma is not False and not running_on_luci and os.path.exists(cipd_goma_dir):
+    goma_gn_args['use_goma'] = True
+    goma_gn_args['goma_dir'] = cipd_goma_dir
+  elif args.goma is not False and goma_dir and os.path.exists(goma_dir):
+    goma_gn_args['use_goma'] = True
+    goma_gn_args['goma_dir'] = goma_dir
+  elif args.goma is not False and os.path.exists(goma_home_dir):
+    goma_gn_args['use_goma'] = True
+    goma_gn_args['goma_dir'] = goma_home_dir
+  elif args.goma:
+    raise Exception(
+        'GOMA was specified but was not found. Set the GOMA_DIR environment '
+        'variable, install goma at $HOME/goma following the instructions at '
+        'https://github.com/flutter/flutter/wiki/Compiling-the-engine, or '
+        'run this script with the --no-goma flag to do a non-goma-enabled '
+        'build.',
+    )
+  else:
+    goma_gn_args['use_goma'] = False
+    goma_gn_args['goma_dir'] = None
+
+  if goma_gn_args['use_goma'] and sys.platform == 'darwin':
+    if (not running_on_luci or args.xcode_symlinks or
+        os.getenv('FLUTTER_GOMA_CREATE_XCODE_SYMLINKS', '0') == '1'):
+      goma_gn_args['create_xcode_symlinks'] = True
+
+  return goma_gn_args
+
+
+# Find the locations of the macOS and iOS SDKs under flutter/prebuilts.
+def setup_apple_sdks():
+  sdks_gn_args = {}
+
+  # These are needed on a macOS host regardless of target.
+  # This value should agree with the 'mac_sdk_min' value in the DEPS file.
+  sdks_gn_args['mac_sdk_min'] = '10.14'
+
+  # The MACOSX_DEPLOYMENT_TARGET variable used when compiling.
+  # Must be of the form x.x.x for Info.plist files.
+  sdks_gn_args['mac_deployment_target'] = '10.14.0'
+
+  running_on_luci = os.environ.get('LUCI_CONTEXT') is not None
+  if running_on_luci:
+    return sdks_gn_args
+
+  prefixes = [
+      ('MacOSX', 'mac_sdk_path'),
+      ('iPhoneOS', 'ios_device_sdk_path'),
+      ('iPhoneSimulator', 'ios_simulator_sdk_path'),
+  ]
+  sdks_path = os.path.join(SRC_ROOT, 'flutter', 'prebuilts', 'SDKs')
+  sdk_entries = os.listdir(sdks_path)
+  for (prefix, arg) in prefixes:
+    for entry in sdk_entries:
+      if entry.startswith(prefix):
+        sdks_gn_args[arg] = os.path.join(sdks_path, entry)
+  return sdks_gn_args
+
+
+def get_repository_version(repository):
+  'Returns the Git HEAD for the supplied repository path as a string.'
+  if not os.path.exists(repository):
+    raise IOError('path does not exist')
+
+  git = 'git'
+  if sys.platform.startswith(('cygwin', 'win')):
+    git = 'git.bat'
+  version = subprocess.check_output([
+      git,
+      '-C',
+      repository,
+      'rev-parse',
+      'HEAD',
+  ])
+
+  return str(version.strip(), 'utf-8')
+
+
+def setup_git_versions():
+  revision_args = {}
+
+  engine_path = os.path.join(SRC_ROOT, 'flutter')
+  revision_args['engine_version'] = get_repository_version(engine_path)
+
+  skia_path = os.path.join(SRC_ROOT, 'flutter', 'third_party', 'skia')
+  revision_args['skia_version'] = get_repository_version(skia_path)
+
+  dart_path = os.path.join(SRC_ROOT, 'third_party', 'dart')
+  revision_args['dart_version'] = get_repository_version(dart_path)
+
+  return revision_args
+
+
+# pylint: disable=line-too-long
+# See https://docs.microsoft.com/en-us/windows/win32/api/sysinfoapi/nf-sysinfoapi-globalmemorystatusex
+# and https://docs.microsoft.com/en-us/windows/win32/api/sysinfoapi/ns-sysinfoapi-memorystatusex
+# pylint: enable=line-too-long
+class MEMORYSTATUSEX(ctypes.Structure):
+  _fields_ = [
+      ('dwLength', ctypes.c_ulong),
+      ('dwMemoryLoad', ctypes.c_ulong),
+      ('ullTotalPhys', ctypes.c_ulonglong),
+      ('ullAvailPhys', ctypes.c_ulonglong),
+      ('ullTotalPageFile', ctypes.c_ulonglong),
+      ('ullAvailPageFile', ctypes.c_ulonglong),
+      ('ullTotalVirtual', ctypes.c_ulonglong),
+      ('ullAvailVirtual', ctypes.c_ulonglong),
+      ('sullAvailExtendedVirtual', ctypes.c_ulonglong),
+  ]
+
+
+def get_total_memory():
+  if sys.platform in ('win32', 'cygwin'):
+    stat = MEMORYSTATUSEX(dwLength=ctypes.sizeof(MEMORYSTATUSEX))
+    success = ctypes.windll.kernel32.GlobalMemoryStatusEx(ctypes.byref(stat))
+    return stat.ullTotalPhys if success else 0
+  if sys.platform.startswith('linux'):
+    if os.path.exists('/proc/meminfo'):
+      with open('/proc/meminfo') as meminfo:
+        memtotal_re = re.compile(r'^MemTotal:\s*(\d*)\s*kB')
+        for line in meminfo:
+          match = memtotal_re.match(line)
+          if match:
+            return float(match.group(1)) * 2**10
+  if sys.platform == 'darwin':
+    try:
+      return int(subprocess.check_output(['sysctl', '-n', 'hw.memsize']))
+    except:  # pylint: disable=bare-except
+      return 0
+  return 0
+
+
+def parse_size(string):
+  units = {'B': 1, 'KB': 2**10, 'MB': 2**20, 'GB': 2**30, 'TB': 2**40}
+  i = next(i for (i, c) in enumerate(string) if not c.isdigit())
+  number = string[:i].strip()
+  unit = string[i:].strip()
+  return int(float(number) * units[unit])
+
+
+def get_concurrent_jobs(reserve_memory, memory_per_job):
+  # reserve_memory = 2**30
+  total_memory = get_total_memory()
+  # Ensure the total memory used in the calculation below is at least 0
+  mem_total_bytes = max(0, total_memory - parse_size(reserve_memory))
+  # Ensure the number of cpus used in the calculation below is at least 1
+  try:
+    cpu_cap = multiprocessing.cpu_count()
+  except:  # pylint: disable=bare-except
+    cpu_cap = 1
+
+  # Calculate the number of jobs that will fit in memory. Ensure the
+  # value is at least 1.
+  num_concurrent_jobs = int(max(1, mem_total_bytes / parse_size(memory_per_job)))
+  # Cap the number of jobs by the number of cpus available.
+  concurrent_jobs = min(num_concurrent_jobs, cpu_cap)
+
+  return concurrent_jobs
+
+
 def to_gn_args(args):
   if args.simulator:
     if args.target_os != 'ios':
       raise Exception('--simulator is only supported for iOS')
 
-  print('args.target_os:%s' %  args.target_os )
+  print('args.target_os:%s' % args.target_os)
   runtime_mode = args.runtime_mode
 
   gn_args = {}
 
-  gn_args['is_debug'] = args.unoptimized
+  gn_args['buildtools_path'] = '//flutter/buildtools'
 
-  goma_dir = os.environ.get('GOMA_DIR')
-  goma_home_dir = os.path.join(os.getenv('HOME', ''), 'goma')
-  depot_tools_bin_dir = os.path.join(args.depot_tools, '.cipd_bin')
+  gn_args['is_debug'] = args.unoptimized
 
-  # GOMA has a different default (home) path on gWindows.
-  if not os.path.exists(goma_home_dir) and sys.platform.startswith(
-      ('cygwin', 'win')):
-    goma_home_dir = os.path.join('c:\\', 'src', 'goma', 'goma-win64')
+  gn_args.update(setup_git_versions())
 
-  if args.target_os == 'wasm' or args.web:
-    gn_args['use_goma'] = False
-    gn_args['goma_dir'] = None
-    print('Disabling GOMA for wasm builds, it is not supported yet.')
-  elif args.goma and goma_dir:
-    gn_args['use_goma'] = True
-    gn_args['goma_dir'] = goma_dir
-  elif args.goma and os.path.exists(goma_home_dir):
-    gn_args['use_goma'] = True
-    gn_args['goma_dir'] = goma_home_dir
-  elif args.goma and os.path.exists(depot_tools_bin_dir):
-    gn_args['use_goma'] = True
-    gn_args['goma_dir'] = depot_tools_bin_dir
-  else:
-    if args.goma:
-      print(
-          "GOMA usage was specified but can't be found, falling back to local "
-          'builds. Set the GOMA_DIR environment variable to fix GOMA.'
-      )
-    gn_args['use_goma'] = False
-    gn_args['goma_dir'] = None
+  gn_args.update(setup_goma(args))
 
-  if gn_args['use_goma']:
-    if args.xcode_symlinks or os.getenv('FLUTTER_GOMA_CREATE_XCODE_SYMLINKS',
-                                        '0') == '1':
-      gn_args['create_xcode_symlinks'] = True
+  gn_args.update(setup_rbe(args))
 
   # If building for WASM, set the GN args using 'to_gn_wasm_args' as most
   # of the Flutter SDK specific arguments are unused.
@@ -272,37 +488,36 @@ def to_gn_args(args):
     to_gn_wasm_args(args, gn_args)
     return gn_args
 
-  gn_args['flutter_build_web_sdk'] = args.build_web_sdk
   gn_args['full_dart_sdk'] = args.full_dart_sdk
-  if args.build_web_sdk or args.full_dart_sdk:
-    gn_args['build_canvaskit'] = args.build_canvaskit
 
   if args.enable_unittests:
-    gn_args['enable_unittests'] = args.enable_unittests
+    # Ensure that Android and iOS are *not* used with --enable-unittests.
+    # https://github.com/flutter/flutter/issues/132611
+    if args.target_os == 'android' or args.target_os == 'ios':
+      raise Exception(
+          'Cannot use --enable-unittests with --target-os=android or ios. If ' +
+          'you are trying to create an output directory to use for clangd ' +
+          '(i.e. for VSCode integration), use a host build instead.\n\n' +
+          'See https://github.com/flutter/flutter/wiki/' +
+          'Setting-up-the-Engine-development-environment' + '#vscode-with-cc-intellisense-cc'
+      )
+    gn_args['enable_unittests'] = True
+  if args.no_enable_unittests:
+    gn_args['enable_unittests'] = False
 
   # Skia GN args.
-  gn_args['skia_enable_flutter_defines'
-         ] = True  # Enable Flutter API guards in Skia.
   gn_args['skia_use_dng_sdk'] = False  # RAW image handling.
-  gn_args['skia_use_sfntly'] = False  # PDF handling dependency.
   gn_args['skia_enable_pdf'] = False  # PDF handling.
-  gn_args['skia_use_x11'
-         ] = False  # Never add the X11 dependency (only takes effect on Linux).
+  gn_args['skia_use_x11'] = False  # Never add the X11 dependency (only takes effect on Linux).
   gn_args['skia_use_wuffs'] = True
-  gn_args['skia_use_expat'] = args.target_os == 'android'
+  gn_args['skia_use_expat'] = True
   gn_args['skia_use_fontconfig'] = args.enable_fontconfig
-  gn_args['skia_use_legacy_layer_bounds'
-         ] = True  # Temporary: See skbug.com/12083, skbug.com/12303.
-
-  if args.enable_skshaper:
-    gn_args['skia_use_icu'] = True
-    gn_args['flutter_always_use_skshaper'] = args.always_use_skshaper
+  gn_args['skia_use_icu'] = True
   gn_args['is_official_build'] = True  # Disable Skia test utilities.
-  gn_args['android_full_debug'
-         ] = args.target_os == 'android' and args.unoptimized
-  
-  if  args.target_os == 'ohos':
-      gn_args['ohos_api_int'] = args.ohos_api_int
+  gn_args['android_full_debug'] = args.target_os == 'android' and args.unoptimized
+
+  if args.target_os == 'ohos' and get_host_os() != 'win':
+    gn_args['ohos_api_int'] = args.ohos_api_int
 
   if args.clang is None:
     gn_args['is_clang'] = True
@@ -347,7 +562,10 @@ def to_gn_args(args):
     if (args.target_os == 'ohos'):
       gn_args['host_cpu'] = get_host_cpu()
 
-  print("ARGS.target_os:%s-%s" % (args.target_os,gn_args['target_os'] ) )
+  print("ARGS.target_os:%s-%s" % (args.target_os, gn_args['target_os']))
+  if not args.build_engine_artifacts:
+    gn_args['flutter_build_engine_artifacts'] = False
+
   # We cannot cross-compile for 32 bit arm on a Windows host. We work around
   # this by leaving 'target_cpu' and 'dart_target_arch' set to 'arm' so that
   # Dart tools such as gen_snapshot that are built for the host will correctly
@@ -356,32 +574,26 @@ def to_gn_args(args):
   # does not exist. Further, we set the 'host_cpu' so that it shares the
   # bitwidth of the 32-bit arm target.
   if sys.platform.startswith(
-      ('cygwin', 'win')
-  ) and args.target_os == 'android' and gn_args['target_cpu'] == 'arm':
+      ('cygwin', 'win')) and args.target_os == 'android' and gn_args['target_cpu'] == 'arm':
     gn_args['host_cpu'] = 'x86'
     gn_args['current_cpu'] = 'x86'
 
-  if is_host_build(args) and gn_args['host_os'] == 'mac':
-    # macOS host builds (whether x64 or arm64) must currently be built under
-    # Rosetta on Apple Silicon Macs.
-    # TODO(cbracken): https://github.com/flutter/flutter/issues/103386
-    gn_args['host_cpu'] = 'x64'
-
-    # macOS unit tests include Vulkan headers which reference Metal types
-    # introduced in macOS 10.14.
-    gn_args['mac_sdk_min'] = '10.14'
-    gn_args['mac_deployment_target'] = '10.14.0'
-
-  # macOS target builds (whether x64 or arm64) must currently be built under
-  # Rosetta on Apple Silicon Macs.
+  # When building binaries to run on a macOS host (like gen_snapshot), always
+  # use the clang_x64 toolchain, which will run under Rosetta. This is done for
+  # two reasons:
+  #  1. goma currently only supports the clang_x64 toolchain.
+  #  2. gen_snapshot cannot crossbuild from arm64 to x64. Its host architecture
+  #     must be x64 to target x64.
   # TODO(cbracken): https://github.com/flutter/flutter/issues/103386
-  if 'target_os' in gn_args and gn_args['target_os'] == 'mac':
+  if get_host_os() == 'mac' and not args.force_mac_arm64:
     gn_args['host_cpu'] = 'x64'
 
   if gn_args['target_os'] == 'ios':
     gn_args['use_ios_simulator'] = args.simulator
+    gn_args.update(setup_apple_sdks())
   elif get_host_os() == 'mac':
     gn_args['use_ios_simulator'] = False
+    gn_args.update(setup_apple_sdks())
 
   if args.dart_debug:
     gn_args['dart_debug'] = True
@@ -390,10 +602,13 @@ def to_gn_args(args):
     gn_args['dart_debug'] = True
     gn_args['dart_debug_optimization_level'] = '0'
 
+  if args.dart_optimization_level:
+    gn_args['dart_default_optimization_level'] = args.dart_optimization_level
+  elif gn_args['target_os'] in ['android', 'ios']:
+    gn_args['dart_default_optimization_level'] = '2'
+
   gn_args['flutter_use_fontconfig'] = args.enable_fontconfig
-  gn_args['flutter_enable_skshaper'] = args.enable_skshaper
-  gn_args['dart_component_kind'
-         ] = 'static_library'  # Always link Dart in statically.
+  gn_args['dart_component_kind'] = 'static_library'  # Always link Dart in statically.
   gn_args['embedder_for_target'] = args.embedder_for_target
   gn_args['dart_lib_export_symbols'] = False
   gn_args['flutter_runtime_mode'] = runtime_mode
@@ -407,13 +622,38 @@ def to_gn_args(args):
   else:
     gn_args['dart_runtime_mode'] = runtime_mode
 
+  gn_args['concurrent_dart_jobs'] = get_concurrent_jobs('1GB', '1GB')
+
+  # Hardcoding this avoids invoking a relatively expensive python script from
+  # GN, but removes the ability to use git-worktrees in the Dart checkout from
+  # within the Engine repo, but it's unlikely anyone is using that.
+  gn_args['default_git_folder'] = os.path.join(SRC_ROOT, 'third_party', 'dart', '.git')
+
+  # By default, the Dart GN build will invoke a relatively expensive python
+  # script to calculate an SDK "hash" that ensures compatibility between the
+  # Dart VM and the Dart front-end. This default hash calculation allows some
+  # wiggle room in which a VM and kernel file will be compatible forwards and
+  # backwards across a small range of git commits. Since Flutter doesn't need
+  # the wiggle room, to avoid running the python script, we instead set the SDK
+  # hash to the exact git commit.
+  sdk_hash = gn_args['dart_version']
+  gn_args['dart_sdk_verification_hash'] = sdk_hash if len(sdk_hash) <= 10 else sdk_hash[:10]
+
   # Desktop embeddings can have more dependencies than the engine library,
   # which can be problematic in some build environments (e.g., building on
   # Linux will bring in pkg-config dependencies at generation time). These
-  # flags allow preventing those those targets from being part of the build
-  # tree.
+  # flags allow preventing those targets from being part of the build tree.
   gn_args['enable_desktop_embeddings'] = not args.disable_desktop_embeddings
 
+  # Determine whether backtace support should be compiled in.
+  if args.backtrace:
+    gn_args['enable_backtrace'] = (
+        args.target_os in ['linux', 'mac', 'win'] or
+        args.target_os == 'ios' and runtime_mode == 'debug'
+    )
+  else:
+    gn_args['enable_backtrace'] = False
+
   # Overrides whether Boring SSL is compiled with system as. Only meaningful
   # on Android.
   gn_args['bssl_use_clang_integrated_as'] = True
@@ -423,9 +663,7 @@ def to_gn_args(args):
 
   # DBC is not supported anymore.
   if args.interpreter:
-    raise Exception(
-        '--interpreter is no longer needed on any supported platform.'
-    )
+    raise Exception('--interpreter is no longer needed on any supported platform.')
 
   if args.target_os is None:
     if sys.platform.startswith(('cygwin', 'win')):
@@ -447,10 +685,6 @@ def to_gn_args(args):
     gn_args['skia_use_gl'] = False
     gn_args['shell_enable_metal'] = True
     gn_args['skia_use_metal'] = True
-    # Bitcode enabled builds using the current version of the toolchain leak
-    # C++ symbols decorated with the availability attribute. Disable these
-    # attributes in release modes till the toolchain is updated.
-    gn_args['skia_enable_api_available_macro'] = args.runtime_mode != 'release'
   else:
     gn_args['skia_use_gl'] = args.target_os != 'fuchsia'
 
@@ -465,7 +699,7 @@ def to_gn_args(args):
   # Enable Vulkan on all platforms except for iOS. This is just
   # to save on mobile binary size, as there's no reason the Vulkan embedder
   # features can't work on these platforms.
-  if args.target_os not in ['ios','mac','ohos']:
+  if gn_args['target_os'] not in ['ios', 'mac', 'ohos']:
     gn_args['skia_use_vulkan'] = True
     gn_args['skia_use_vma'] = False
     gn_args['shell_enable_vulkan'] = True
@@ -479,8 +713,9 @@ def to_gn_args(args):
   # gn_args['enable_profiling'] = args.runtime_mode != 'release' and args.android_cpu != 'x86'
 
   # Make symbols visible in order to enable symbolization of unit test crash backtraces on Linux
-  gn_args['disable_hidden_visibility'
-         ] = (args.target_os == 'linux' or args.target_os == 'ohos') and args.unoptimized
+  gn_args['disable_hidden_visibility'] = (
+      args.target_os == 'linux' or args.target_os == 'ohos'
+  ) and args.unoptimized
 
   if args.arm_float_abi:
     gn_args['arm_float_abi'] = args.arm_float_abi
@@ -506,6 +741,10 @@ def to_gn_args(args):
           'source by setting `--no-prebuilt-dart-sdk` flag to tools/gn'
       )
   elif is_host_build(args):
+    # If we are building the dart sdk in-tree, exclude the wasm-opt target, as
+    # it doesn't build properly with our gn configuration.
+    gn_args['dart_include_wasm_opt'] = False
+
     # dart_platform_sdk is only defined for host builds, linux arm host builds
     # specify target_os=linux.
     # dart_platform_sdk=True means exclude web-related files, e.g. dart2js,
@@ -538,41 +777,52 @@ def to_gn_args(args):
   if args.fstack_protector:
     gn_args['use_fstack_protector'] = True
 
-  if args.enable_vulkan_validation_layers:
-    if args.target_os != 'fuchsia':
-      print(
-          'Vulkan validation layers are currently only supported on Fuchsia targets.'
-      )
-      sys.exit(1)
+  enable_vulkan_validation = args.enable_vulkan_validation_layers
+
+  # Enable Vulkan validation layer automatically on debug builds for arm64.
+  if args.unoptimized and args.target_os == 'android' and args.android_cpu == 'arm64':
+    enable_vulkan_validation = True
+
+  if enable_vulkan_validation:
     gn_args['enable_vulkan_validation_layers'] = True
+    gn_args['impeller_enable_vulkan_validation_layers'] = True
 
   # Enable pointer compression on 64-bit mobile targets. iOS is excluded due to
   # its inability to allocate address space without allocating memory.
-  if args.target_os in ['android'] and gn_args['target_cpu'] in ['x64', 'arm64'
-                                                                ]:
+  if args.target_os in ['android'] and gn_args['target_cpu'] in ['x64', 'arm64']:
     gn_args['dart_use_compressed_pointers'] = True
 
-  if args.fuchsia_target_api_level is not None:
-    gn_args['fuchsia_target_api_level'] = args.fuchsia_target_api_level
-  elif args.target_os == 'fuchsia':
-    # Read the default target api level from a file so we can update it with a roller
-    with open(os.path.join(os.path.dirname(__file__),
-                           'fuchsia/target_api_level')) as file:
-      gn_args['fuchsia_target_api_level'] = int(file.read().strip())
+  if args.target_os == 'fuchsia':
+    gn_args['gn_configs_path'] = '//flutter/build/config/fuchsia/gn_configs.gni'
+    gn_args['fuchsia_gn_sdk'] = '//flutter/tools/fuchsia/gn-sdk'
 
   # Flags for Dart features:
   if args.use_mallinfo2:
     gn_args['dart_use_mallinfo2'] = args.use_mallinfo2
 
   # Impeller flags.
-  if args.enable_impeller_playground:
-    gn_args['impeller_enable_playground'] = args.enable_impeller_playground
-  elif os.getenv('FLUTTER_IMPELLER_ENABLE_PLAYGROUND', '0') == '1':
-    gn_args['impeller_enable_playground'] = True
+  if args.enable_impeller_3d:
+    gn_args['impeller_enable_3d'] = True
+
+  if args.enable_impeller_trace_canvas:
+    gn_args['impeller_trace_canvas'] = True
 
   if args.prebuilt_impellerc is not None:
     gn_args['impeller_use_prebuilt_impellerc'] = args.prebuilt_impellerc
 
+  malioc_path = args.malioc_path
+  if not malioc_path:
+    malioc_path = os.environ.get('MALIOC_PATH')
+  if malioc_path:
+    gn_args['impeller_malioc_path'] = malioc_path
+    gn_args['impeller_concurrent_malioc_jobs'] = get_concurrent_jobs('1GB', '100MB')
+
+  if args.use_glfw_swiftshader:
+    if get_host_os() == 'mac':
+      gn_args['glfw_vulkan_library'] = r'\"libvulkan.dylib\"'
+    elif get_host_os() == 'linux':
+      gn_args['glfw_vulkan_library'] = r'\"libvulkan.so.1\"'
+
   # ANGLE is exclusively used for:
   #  - Windows at runtime
   #  - Non-fuchsia host unit tests (is_host_build evaluates to false).
@@ -581,8 +831,10 @@ def to_gn_args(args):
   # There is a special case for Android on Windows because there we _only_ build
   # gen_snapshot, but the build defines otherwise make it look like the build is
   # for a host Windows build and make GN think we will be building ANGLE.
-  if is_host_build(args) or (args.target_os == 'android' and
-                             get_host_os() == 'win'):
+  # Angle is not used on Mac hosts as there are no tests for the OpenGL backend.
+  if is_host_build(args) or (args.target_os == 'android' and get_host_os() == 'win'):
+    # Don't include git commit information.
+    gn_args['angle_enable_commit_id'] = False
     # Do not build unnecessary parts of the ANGLE tree.
     gn_args['angle_build_all'] = False
     gn_args['angle_has_astc_encoder'] = False
@@ -591,16 +843,25 @@ def to_gn_args(args):
     # https://github.com/flutter/flutter/issues/114107
     if get_host_os() == 'win':
       gn_args['angle_force_context_check_every_call'] = True
+    if get_host_os() == 'mac':
+      gn_args['angle_enable_metal'] = True
+      gn_args['angle_enable_gl'] = False
+      gn_args['angle_enable_vulkan'] = False
+
+    # ANGLE and SwiftShader share build flags to enable X11 and Wayland,
+    # but we only need these enabled for SwiftShader.
+    gn_args['angle_use_x11'] = False
+    gn_args['angle_use_wayland'] = False
 
     # Requires RTTI. We may want to build this in debug modes, punting on that
     # for now.
     gn_args['angle_enable_vulkan_validation_layers'] = False
-    gn_args['angle_vulkan_headers_dir'
-           ] = '//third_party/vulkan-deps/vulkan-headers/src'
-    gn_args['angle_vulkan_loader_dir'
-           ] = '//third_party/vulkan-deps/vulkan-loader/src'
-    gn_args['angle_vulkan_tools_dir'
-           ] = '//third_party/vulkan-deps/vulkan-tools/src'
+    gn_args['angle_vulkan_headers_dir'] = '//flutter/third_party/vulkan-deps/vulkan-headers/src'
+    gn_args['angle_vulkan_loader_dir'] = '//flutter/third_party/vulkan-deps/vulkan-loader/src'
+    gn_args['angle_vulkan_tools_dir'] = '//flutter/third_party/vulkan-deps/vulkan-tools/src'
+
+  if args.darwin_extension_safe:
+    gn_args['darwin_extension_safe'] = True
 
   return gn_args
 
@@ -609,31 +870,32 @@ def to_gn_args(args):
 # build are unused. This method is used instead.
 def to_gn_wasm_args(args, gn_args):
   gn_args['is_official_build'] = True
-  gn_args['skia_enable_flutter_defines'] = True
   gn_args['is_component_build'] = False
   gn_args['use_clang_static_analyzer'] = False
   gn_args['is_clang'] = True
   gn_args['target_os'] = 'wasm'
   gn_args['target_cpu'] = 'wasm'
+  gn_args['wasm_use_dwarf'] = args.wasm_use_dwarf
   gn_args['skia_use_angle'] = False
   gn_args['skia_use_dng_sdk'] = False
   gn_args['skia_use_expat'] = False
   gn_args['skia_use_vulkan'] = False
   gn_args['skia_use_webgpu'] = False
   gn_args['skia_use_libheif'] = False
-  gn_args['skia_use_libjpeg_turbo_decode'] = True
   gn_args['skia_use_libjpeg_turbo_encode'] = False
-  gn_args['skia_use_libpng_decode'] = True
+  gn_args['skia_use_no_jpeg_encode'] = True
+  # TODO(yjbanov): https://github.com/flutter/flutter/issues/122759
+  # Remove this and implement it through Canvas2d.
   gn_args['skia_use_libpng_encode'] = True
-  gn_args['skia_use_libwebp_decode'] = True
   gn_args['skia_use_libwebp_encode'] = False
+  gn_args['skia_use_no_webp_encode'] = True
   gn_args['skia_use_lua'] = False
   gn_args['skia_use_wuffs'] = True
   gn_args['skia_use_zlib'] = True
   gn_args['skia_gl_standard'] = 'webgl'
-  gn_args['skia_enable_gpu'] = True
+  gn_args['skia_enable_ganesh'] = True
+  gn_args['skia_enable_skottie'] = False
   gn_args['skia_enable_sksl_tracing'] = False
-  gn_args['skia_use_icu'] = True
   gn_args['icu_use_data_file'] = False
   gn_args['skia_use_freetype'] = True
   gn_args['skia_use_harfbuzz'] = True
@@ -642,16 +904,12 @@ def to_gn_wasm_args(args, gn_args):
   gn_args['skia_enable_fontmgr_custom_directory'] = False
   gn_args['skia_enable_fontmgr_custom_embedded'] = True
   gn_args['skia_enable_fontmgr_custom_empty'] = True
-  gn_args['skia_fontmgr_factory'
-         ] = '//third_party/skia:fontmgr_custom_empty_factory'
   gn_args['skia_enable_skshaper'] = True
   gn_args['skia_enable_skparagraph'] = True
   gn_args['skia_canvaskit_force_tracing'] = False
   gn_args['skia_canvaskit_enable_skp_serialization'] = True
   gn_args['skia_canvaskit_enable_effects_deserialization'] = False
-  gn_args['skia_canvaskit_enable_skottie'] = False
   gn_args['skia_canvaskit_include_viewer'] = False
-  gn_args['skia_canvaskit_enable_particles'] = False
   gn_args['skia_canvaskit_enable_pathops'] = True
   gn_args['skia_canvaskit_enable_rt_shader'] = True
   gn_args['skia_canvaskit_enable_matrix_helper'] = False
@@ -664,15 +922,34 @@ def to_gn_wasm_args(args, gn_args):
   gn_args['skia_canvaskit_enable_paragraph'] = True
   gn_args['skia_canvaskit_enable_webgl'] = True
   gn_args['skia_canvaskit_enable_webgpu'] = False
-  is_profile_build = args.runtime_mode == 'profile' or args.runtime_mode == 'debug'
-  gn_args['skia_canvaskit_profile_build'] = is_profile_build
+  gn_args['skia_canvaskit_profile_build'] = args.runtime_mode == 'profile'
   gn_args['flutter_prebuilt_dart_sdk'] = True
 
-  # TODO(jacksongardner): Make this based off of the input argument rather
-  # than forced to true, once the recipes are updated.
-  # https://github.com/flutter/flutter/issues/113303
-  gn_args['build_canvaskit'] = True
-  gn_args['flutter_build_web_sdk'] = True
+
+def run_impeller_cmake(args):
+  impeller_cmake_dir = os.path.join('third_party', 'impeller-cmake-example')
+  if not os.path.isdir(os.path.join(SRC_ROOT, impeller_cmake_dir)):
+    print('The Impeller cmake example directory "{}" does not exist'.format(impeller_cmake_dir))
+    return 1
+  goma_gn_args = setup_goma(args)
+  goma_dir = goma_gn_args['goma_dir']
+  cmake_cmd = [
+      'python3',
+      os.path.join(SRC_ROOT, 'flutter', 'ci', 'impeller_cmake_build_test.py'),
+      '--path',
+      impeller_cmake_dir,
+      '--cmake',
+  ]
+  if goma_dir is not None:
+    cmake_cmd = cmake_cmd + ['--goma-dir', goma_dir]
+  if args.xcode_symlinks:
+    cmake_cmd = cmake_cmd + ['--xcode-symlinks']
+  try:
+    cmake_call_result = subprocess.call(cmake_cmd, cwd=SRC_ROOT)
+  except subprocess.CalledProcessError as exc:
+    print('Failed to generate cmake files: ', exc.returncode, exc.output)
+    return 1
+  return cmake_call_result
 
 
 def parse_args(args):
@@ -681,7 +958,18 @@ def parse_args(args):
 
   parser.add_argument('--unoptimized', default=False, action='store_true')
 
-  parser.add_argument('--enable-unittests', action='store_true', default=False)
+  parser.add_argument(
+      '--enable-unittests',
+      action='store_true',
+      default=False,
+      help='Force enable building unit test binaries.'
+  )
+  parser.add_argument(
+      '--no-enable-unittests',
+      default=False,
+      action='store_true',
+      help='Force disable building unit test binaries.'
+  )
 
   parser.add_argument(
       '--runtime-mode',
@@ -713,72 +1001,107 @@ def parse_args(args):
   )
 
   parser.add_argument(
-      '--target-os',
+      '--dart-optimization-level',
       type=str,
-      choices=['android', 'ios', 'mac', 'linux', 'fuchsia', 'wasm', 'win','ohos']
-  )
-  parser.add_argument(
-      '--android', dest='target_os', action='store_const', const='android'
-  )
-  parser.add_argument(
-      '--android-cpu',
-      type=str,
-      choices=['arm', 'x64', 'x86', 'arm64'],
-      default='arm'
-  )
-  parser.add_argument(
-      '--ios', dest='target_os', action='store_const', const='ios'
+      help='The default optimization level for the Dart VM runtime.',
   )
+
   parser.add_argument(
-      '--ios-cpu', type=str, choices=['arm', 'arm64'], default='arm64'
+      '--target-os', type=str, choices=['android', 'ios', 'mac', 'linux', 'fuchsia', 'wasm', 'win']
   )
+  parser.add_argument('--android', dest='target_os', action='store_const', const='android')
   parser.add_argument(
-      '--mac', dest='target_os', action='store_const', const='mac'
+      '--android-cpu', type=str, choices=['arm', 'x64', 'x86', 'arm64'], default='arm'
   )
+  parser.add_argument('--ios', dest='target_os', action='store_const', const='ios')
+  parser.add_argument('--ios-cpu', type=str, choices=['arm', 'arm64'], default='arm64')
+  parser.add_argument('--mac', dest='target_os', action='store_const', const='mac')
+  parser.add_argument('--mac-cpu', type=str, choices=['x64', 'arm64'], default='x64')
   parser.add_argument(
-      '--mac-cpu', type=str, choices=['x64', 'arm64'], default='x64'
+      '--force-mac-arm64',
+      action='store_true',
+      default=False,
+      help='Force use of the clang_arm64 toolchain on an arm64 mac host when '
+      'building host binaries.'
   )
   parser.add_argument('--simulator', action='store_true', default=False)
+  parser.add_argument('--linux', dest='target_os', action='store_const', const='linux')
+  parser.add_argument('--ohos', dest='target_os', action='store_const', const='ohos')
+  parser.add_argument('--fuchsia', dest='target_os', action='store_const', const='fuchsia')
+  parser.add_argument('--wasm', dest='target_os', action='store_const', const='wasm')
   parser.add_argument(
-      '--linux', dest='target_os', action='store_const', const='linux'
-  )
-  parser.add_argument(
-      '--ohos', dest='target_os', action='store_const', const='ohos'
-  )
-  parser.add_argument(
-      '--fuchsia', dest='target_os', action='store_const', const='fuchsia'
-  )
-  parser.add_argument(
-      '--wasm', dest='target_os', action='store_const', const='wasm'
+      '--wasm-use-dwarf',
+      action='store_true',
+      default=False,
+      help='Embed dwarf debugging info in the output module instead of using '
+      'sourcemap files.'
   )
   parser.add_argument('--web', action='store_true', default=False)
+  parser.add_argument('--windows', dest='target_os', action='store_const', const='win')
+
+  parser.add_argument('--linux-cpu', type=str, choices=['x64', 'x86', 'arm64', 'arm'])
+  parser.add_argument('--ohos-cpu', type=str, choices=['x64', 'x86', 'arm64', 'arm'])
+  parser.add_argument('--ohos-api-int', type=int, choices=[10, 11, 12], default=11)
+
+  parser.add_argument('--fuchsia-cpu', type=str, choices=['x64', 'arm64'], default='x64')
+  parser.add_argument('--windows-cpu', type=str, choices=['x64', 'arm64', 'x86'], default='x64')
+  parser.add_argument('--simulator-cpu', type=str, choices=['x64', 'arm64'], default='x64')
+  parser.add_argument('--arm-float-abi', type=str, choices=['hard', 'soft', 'softfp'])
+
+  # Whether to compile in backtrace support.
+  # Available for Windows and POSIX platforms whose libc includes execinfo.h.
+  # MUSL doesn't include execinfo.h should be build with --no-backtrace.
   parser.add_argument(
-      '--windows', dest='target_os', action='store_const', const='win'
+      '--backtrace',
+      default=True,
+      action='store_true',
+      help='Whether OS support exists for collecting backtraces.'
   )
+  parser.add_argument('--no-backtrace', dest='backtrace', action='store_false')
 
   parser.add_argument(
-      '--linux-cpu', type=str, choices=['x64', 'x86', 'arm64', 'arm']
+      '--build-engine-artifacts',
+      default=True,
+      action='store_true',
+      help='Build the host-side development artifacts.'
   )
   parser.add_argument(
-      '--ohos-cpu', type=str, choices=['x64', 'x86', 'arm64', 'arm']
+      '--no-build-engine-artifacts',
+      dest='build_engine_artifacts',
+      action='store_false',
+      help='Do not build the host-side development artifacts.'
   )
+
+  parser.add_argument('--rbe', default=None, action='store_true')
+  parser.add_argument('--no-rbe', dest='rbe', action='store_false')
   parser.add_argument(
-      '--ohos-api-int', type=int, choices=[10, 11], default=11
+      '--rbe-server-address', default=None, type=str, help='The reproxy serveraddress'
   )
   parser.add_argument(
-      '--fuchsia-cpu', type=str, choices=['x64', 'arm64'], default='x64'
+      '--rbe-exec-strategy',
+      default=None,
+      type=str,
+      help='The RBE execution strategy.',
+      choices=['local', 'remote', 'remote_local_fallback', 'racing']
   )
   parser.add_argument(
-      '--windows-cpu', type=str, choices=['x64', 'arm64', 'x86'], default='x64'
+      '--rbe-dial-timeout',
+      default=None,
+      type=str,
+      help='The timeout for connecting to the local reproxy server.',
   )
   parser.add_argument(
-      '--simulator-cpu', type=str, choices=['x64', 'arm64'], default='x64'
+      '--rbe-platform',
+      default=None,
+      type=str,
+      help='The RBE "platform" string. This is used to identify remote platform '
+      'settings like the docker image to use to run the command.'
   )
   parser.add_argument(
-      '--arm-float-abi', type=str, choices=['hard', 'soft', 'softfp']
+      '--rbe-dir', default=None, type=str, help='The location of the reclient binaries.'
   )
 
-  parser.add_argument('--goma', default=True, action='store_true')
+  parser.add_argument('--goma', default=None, action='store_true')
   parser.add_argument('--no-goma', dest='goma', action='store_false')
   parser.add_argument(
       '--xcode-symlinks',
@@ -791,10 +1114,7 @@ def parse_args(args):
       'variable may be set to 1 to achieve the same effect.'
   )
   parser.add_argument(
-      '--no-xcode-symlinks',
-      dest='xcode_symlinks',
-      default=False,
-      action='store_false'
+      '--no-xcode-symlinks', dest='xcode_symlinks', default=False, action='store_false'
   )
   parser.add_argument(
       '--depot-tools',
@@ -808,52 +1128,28 @@ def parse_args(args):
   parser.add_argument('--no-lto', dest='lto', action='store_false')
 
   parser.add_argument('--clang', action='store_const', const=True)
-  parser.add_argument(
-      '--no-clang', dest='clang', action='store_const', const=False
-  )
+  parser.add_argument('--no-clang', dest='clang', action='store_const', const=False)
 
+  parser.add_argument('--clang-static-analyzer', default=False, action='store_true')
   parser.add_argument(
-      '--clang-static-analyzer', default=False, action='store_true'
-  )
-  parser.add_argument(
-      '--no-clang-static-analyzer',
-      dest='clang_static_analyzer',
-      action='store_false'
+      '--no-clang-static-analyzer', dest='clang_static_analyzer', action='store_false'
   )
 
   parser.add_argument('--target-sysroot', type=str)
   parser.add_argument('--target-toolchain', type=str)
   parser.add_argument('--target-triple', type=str)
   parser.add_argument(
-      '--operator-new-alignment',
-      dest='operator_new_alignment',
-      type=str,
-      default=None
+      '--operator-new-alignment', dest='operator_new_alignment', type=str, default=None
   )
 
-  parser.add_argument(
-      '--macos-enable-metal', action='store_true', default=False
-  )
+  parser.add_argument('--macos-enable-metal', action='store_true', default=False)
   parser.add_argument('--enable-vulkan', action='store_true', default=False)
 
   parser.add_argument('--enable-fontconfig', action='store_true', default=False)
-  parser.add_argument(
-      '--enable-vulkan-validation-layers', action='store_true', default=False
-  )
+  parser.add_argument('--enable-vulkan-validation-layers', action='store_true', default=False)
 
-  parser.add_argument('--enable-skshaper', action='store_true', default=True)
-  parser.add_argument(
-      '--no-enable-skshaper', dest='enable_skshaper', action='store_false'
-  )
   parser.add_argument(
-      '--always-use-skshaper', action='store_true', default=False
-  )
-
-  parser.add_argument(
-      '--embedder-for-target',
-      dest='embedder_for_target',
-      action='store_true',
-      default=False
+      '--embedder-for-target', dest='embedder_for_target', action='store_true', default=False
   )
 
   parser.add_argument('--coverage', default=False, action='store_true')
@@ -877,36 +1173,20 @@ def parse_args(args):
       action='store_true',
       help='include trained dart2js and dartdevc snapshots. Enable only on steps that create an SDK'
   )
-  parser.add_argument(
-      '--no-full-dart-sdk', dest='full_dart_sdk', action='store_false'
-  )
-
-  parser.add_argument(
-      '--build-web-sdk',
-      default=False,
-      action='store_true',
-      help='build the flutter web sdk'
-  )
-  parser.add_argument(
-      '--no-build-web-sdk', dest='build_web_sdk', action='store_false'
-  )
+  parser.add_argument('--no-full-dart-sdk', dest='full_dart_sdk', action='store_false')
 
   parser.add_argument(
       '--build-canvaskit',
       default=False,
       action='store_true',
-      help='build canvaskit from source'
-  )
-  parser.add_argument(
-      '--no-build-canvaskit', dest='build_canvaskit', action='store_false'
+      help='build canvaskit from source (DEPRECATED: use ninja targets to select what to build)'
   )
 
   parser.add_argument(
       '--ide',
       default='',
       type=str,
-      help='The IDE files to generate using GN. Use `gn gen help` and look for the --ide flag to'
-      +
+      help='The IDE files to generate using GN. Use `gn gen help` and look for the --ide flag to' +
       ' see supported IDEs. If this flag is not specified, a platform specific default is selected.'
   )
 
@@ -962,16 +1242,10 @@ def parse_args(args):
       '--prebuilt-dart-sdk',
       default=True,
       action='store_true',
-      help='Whether to use a prebuilt Dart SDK instead of building one. This defaults to '
-      + 'true and is enabled on CI.'
-  )
-  parser.add_argument(
-      '--no-prebuilt-dart-sdk', dest='prebuilt_dart_sdk', action='store_false'
-  )
-
-  parser.add_argument(
-      '--fuchsia-target-api-level', dest='fuchsia_target_api_level'
+      help='Whether to use a prebuilt Dart SDK instead of building one. This defaults to ' +
+      'true and is enabled on CI.'
   )
+  parser.add_argument('--no-prebuilt-dart-sdk', dest='prebuilt_dart_sdk', action='store_false')
 
   # Flags for Dart features.
   parser.add_argument(
@@ -983,12 +1257,6 @@ def parse_args(args):
   )
 
   # Impeller flags.
-  parser.add_argument(
-      '--enable-impeller-playground',
-      default=False,
-      action='store_true',
-      help='Whether impeller unit tests run in playground mode.'
-  )
   parser.add_argument(
       '--prebuilt-impellerc',
       default=None,
@@ -997,13 +1265,26 @@ def parse_args(args):
       'Do not use this outside of CI or with impellerc from a different engine version.'
   )
 
-  # This is currently a no-op, will be removed shortly.
   parser.add_argument(
-      '--enable-impeller-vulkan',
+      '--enable-impeller-3d',
+      default=False,
+      action='store_true',
+      help='Enables experimental 3d support.'
+  )
+
+  parser.add_argument(
+      '--enable-impeller-trace-canvas',
       default=False,
       action='store_true',
-      help='Enables WIP impeller support for vulkan. ' +
-      'https://github.com/flutter/flutter/issues/107357'
+      help='Enables tracing calls to Canvas.'
+  )
+  parser.add_argument('--malioc-path', type=str, help='The path to the malioc tool.')
+
+  parser.add_argument(
+      '--impeller-cmake-example',
+      default=False,
+      action='store_true',
+      help='Do not run GN. Instead configure the Impeller cmake example build.',
   )
 
   # Sanitizers.
@@ -1022,20 +1303,66 @@ def parse_args(args):
 
   parser.add_argument(
       '--trace-gn',
-      default=False,
+      default=True,
       action='store_true',
       help='Write a GN trace log (gn_trace.json) in the Chromium tracing '
       'format in the build directory.'
   )
 
+  parser.add_argument(
+      '--darwin-extension-safe',
+      default=False,
+      action='store_true',
+      help='Whether the produced Flutter.framework is app extension safe. Only for iOS.'
+  )
+
   # Verbose output.
   parser.add_argument('--verbose', default=False, action='store_true')
 
+  parser.add_argument(
+      '--gn-args',
+      action='append',
+      help='Additional gn args to be passed to gn. If you '
+      'need to use this, it should probably be another switch '
+      'in //flutter/tools/gn.',
+  )
+
+  parser.add_argument(
+      '--use-glfw-swiftshader',
+      default=False,
+      action='store_true',
+      help='Forces glfw to use swiftshader.',
+  )
+
   return parser.parse_args(args)
 
 
+def validate_args(args):
+  valid = True
+  if args.simulator:
+    if args.mac_cpu != 'x64':
+      print(
+          'Specified a non-default mac-cpu for a simulator build. Did you mean '
+          'to use `--simulator-cpu`?'
+      )
+      valid = False
+    if args.ios_cpu != 'arm64':
+      print(
+          'Specified a non-default ios-cpu for a simulator build. Did you mean '
+          'to use `--simulator-cpu`?'
+      )
+      valid = False
+
+  if not valid:
+    sys.exit(-1)
+
+
 def main(argv):
   args = parse_args(argv)
+  validate_args(args)
+
+  if args.impeller_cmake_example:
+    return run_impeller_cmake(args)
 
   exe = '.exe' if sys.platform.startswith(('cygwin', 'win')) else ''
 
@@ -1046,15 +1373,15 @@ def main(argv):
       '--export-compile-commands',
   ]
 
-  print('XX ohos_cpu:%s' % args.ohos_cpu )
- # print('linux_cpu:'+ args.linux_cpu )
+  print('XX ohos_cpu:%s' % args.ohos_cpu)
+  # print('linux_cpu:'+ args.linux_cpu )
   print('XX target_os:%s' % args.target_os)
 
-  if  args.target_os == 'ohos':
-      if args.ohos_cpu is not None:
-        args.linux_cpu = args.ohos_cpu
-      elif args.linux_cpu is not None :
-        args.ohos_cpu = args.linux_cpu
+  if args.target_os == 'ohos':
+    if args.ohos_cpu is not None:
+      args.linux_cpu = args.ohos_cpu
+    elif args.linux_cpu is not None:
+      args.ohos_cpu = args.linux_cpu
 
   if not args.web:
     if args.ide != '':
@@ -1067,16 +1394,16 @@ def main(argv):
     elif sys.platform.startswith('win'):
       # On Windows, generate a Visual Studio project.
       command.append('--ide=vs')
+      command.append('--ninja-executable=ninja')
 
   command.append('--export-compile-commands=default')
 
   gn_args = to_command_line(to_gn_args(args))
+  gn_args.extend(args.gn_args or [])
   out_dir = get_out_dir(args)
   command.append(out_dir)
   command.append('--args=%s' % ' '.join(gn_args))
 
-
-
   print('gn ARGS : %s' % ' '.join(gn_args))
 
   if args.trace_gn:
diff --git a/tools/gn_test.py b/tools/gn_test.py
index a399d7e779c8dd01eed6843790774bd0d393ff0f..33ab13e68504e333bd46c5ab41aac5bad2443a35 100644
--- a/tools/gn_test.py
+++ b/tools/gn_test.py
@@ -1,10 +1,10 @@
 # Copyright 2013 The Flutter Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-import unittest
 
-import os
 import imp
+import os
+import unittest
 
 SKY_TOOLS = os.path.dirname(os.path.abspath(__file__))
 gn = imp.load_source('gn', os.path.join(SKY_TOOLS, 'gn'))
@@ -14,15 +14,21 @@ class GNTestCase(unittest.TestCase):
 
   def _expect_build_dir(self, arg_list, expected_build_dir):
     args = gn.parse_args(['gn'] + arg_list)
-    self.assertEquals(gn.get_out_dir(args), expected_build_dir)
+    self.assertEqual(gn.get_out_dir(args), expected_build_dir)
 
   def test_get_out_dir(self):
-    self._expect_build_dir(['--debug'], 'out/Debug')
-    self._expect_build_dir(['--release'], 'out/Release')
-    self._expect_build_dir(['--ios'], 'out/ios_Debug')
-    self._expect_build_dir(['--ios', '--release'], 'out/ios_Release')
-    self._expect_build_dir(['--android'], 'out/android_Debug')
-    self._expect_build_dir(['--android', '--release'], 'out/android_Release')
+    self._expect_build_dir(['--runtime-mode', 'debug'], os.path.join('out', 'host_debug'))
+    self._expect_build_dir(['--runtime-mode', 'release'], os.path.join('out', 'host_release'))
+    self._expect_build_dir(['--ios'], os.path.join('out', 'ios_debug'))
+    self._expect_build_dir(['--ios', '--darwin-extension-safe'],
+                           os.path.join('out', 'ios_debug_extension_safe'))
+    self._expect_build_dir(['--ios', '--runtime-mode', 'release'],
+                           os.path.join('out', 'ios_release'))
+    self._expect_build_dir(['--ios', '--darwin-extension-safe', '--runtime-mode', 'release'],
+                           os.path.join('out', 'ios_release_extension_safe'))
+    self._expect_build_dir(['--android'], os.path.join('out', 'android_debug'))
+    self._expect_build_dir(['--android', '--runtime-mode', 'release'],
+                           os.path.join('out', 'android_release'))
 
   def _gn_args(self, arg_list):
     args = gn.parse_args(['gn'] + arg_list)
@@ -30,10 +36,24 @@ class GNTestCase(unittest.TestCase):
 
   def test_to_gn_args(self):
     # This would not necessarily be true on a 32-bit machine?
-    self.assertEquals(
-        self._gn_args(['--ios', '--simulator'])['target_cpu'], 'x64'
+    self.assertEqual(
+        self._gn_args(['--ios', '--simulator', '--simulator-cpu', 'x64'])['target_cpu'], 'x64'
     )
-    self.assertEquals(self._gn_args(['--ios'])['target_cpu'], 'arm')
+    self.assertEqual(self._gn_args(['--ios'])['target_cpu'], 'arm64')
+
+  def test_cannot_use_android_and_enable_unittests(self):
+    with self.assertRaises(Exception):
+      self._gn_args(['--android', '--enable-unittests'])
+
+  def test_cannot_use_ios_and_enable_unittests(self):
+    with self.assertRaises(Exception):
+      self._gn_args(['--ios', '--enable-unittests'])
+
+  def test_parse_size(self):
+    self.assertEqual(gn.parse_size('5B'), 5)
+    self.assertEqual(gn.parse_size('5KB'), 5 * 2**10)
+    self.assertEqual(gn.parse_size('5MB'), 5 * 2**20)
+    self.assertEqual(gn.parse_size('5GB'), 5 * 2**30)
 
 
 if __name__ == '__main__':
diff --git a/tools/golden_tests_harvester/.gitignore b/tools/golden_tests_harvester/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..3a85790408401f7e9d4f00d07006a207a00a3392
--- /dev/null
+++ b/tools/golden_tests_harvester/.gitignore
@@ -0,0 +1,3 @@
+# https://dart.dev/guides/libraries/private-files
+# Created by `dart pub`
+.dart_tool/
diff --git a/tools/golden_tests_harvester/README.md b/tools/golden_tests_harvester/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..379ebace6b29d56a0f65a5628b5cd769ea5b2a15
--- /dev/null
+++ b/tools/golden_tests_harvester/README.md
@@ -0,0 +1,31 @@
+# Golden Tests Harvester
+
+A command-line tool that uploads golden images to Skia gold from a directory.
+
+## Usage
+
+This program assumes you've _already run_ a suite of golden tests that produce
+a directory of images with a JSON digest named `digests.json`, which is
+[documented in `lib/golden_tests_harvester.dart`][lib].
+
+Provide the directory as the only positional argument to the program:
+
+[lib]: lib/golden_tests_harvester.dart
+
+```sh
+dart ./tools/golden_tests_harvester/bin/golden_tests_harvester.dart <path/to/digests>
+```
+
+> [!INFO]
+> Skia Gold must be setup and configured to accept the images being uploaded.
+>
+> In practice, that means it's the process is running on CI.
+
+_Optionally_, you can run in `--dry-run` mode to see what would be uploaded
+without actually uploading anything:
+
+```sh
+dart ./tools/golden_tests_harvester/bin/golden_tests_harvester.dart --dry-run <path/to/digests>
+```
+
+This flag is automatically set when running locally (i.e. outside of CI).
diff --git a/tools/golden_tests_harvester/analysis_options.yaml b/tools/golden_tests_harvester/analysis_options.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..f04c6cf0f30d4f8306eabe5dfd00f2a4c902b838
--- /dev/null
+++ b/tools/golden_tests_harvester/analysis_options.yaml
@@ -0,0 +1 @@
+include: ../../analysis_options.yaml
diff --git a/tools/golden_tests_harvester/bin/golden_tests_harvester.dart b/tools/golden_tests_harvester/bin/golden_tests_harvester.dart
new file mode 100644
index 0000000000000000000000000000000000000000..aa6183365838cfc43c13140e8fbf47c5438d9eda
--- /dev/null
+++ b/tools/golden_tests_harvester/bin/golden_tests_harvester.dart
@@ -0,0 +1,72 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io' as io;
+
+import 'package:args/args.dart';
+import 'package:golden_tests_harvester/golden_tests_harvester.dart';
+import 'package:skia_gold_client/skia_gold_client.dart';
+
+final bool _isLocalEnvWithoutSkiaGold =
+    !SkiaGoldClient.isAvailable(environment: io.Platform.environment) ||
+    !SkiaGoldClient.isLuciEnv(environment: io.Platform.environment);
+
+final ArgParser _argParser = ArgParser()
+  ..addFlag(
+    'help',
+    abbr: 'h',
+    negatable: false,
+    help: 'Prints this usage information.',
+  )
+  ..addFlag(
+    'dry-run',
+    defaultsTo: _isLocalEnvWithoutSkiaGold,
+    help: 'Do not upload images to Skia Gold.',
+  );
+
+Future<void> main(List<String> args) async {
+  final ArgResults results = _argParser.parse(args);
+  if (results['help'] as bool) {
+    io.stdout.writeln(_argParser.usage);
+    return;
+  }
+
+  final List<String> rest = results.rest;
+  if (rest.length != 1) {
+    io.stderr.writeln('Error: Must provide exactly one argument.');
+    io.stderr.writeln(_argParser.usage);
+    io.exitCode = 1;
+    return;
+  }
+
+  final io.Directory workDirectory = io.Directory(rest.single);
+  final bool isDryRun = results['dry-run'] as bool;
+  final Harvester harvester;
+  if (isDryRun) {
+    io.stderr.writeln('=== DRY RUN. Results not submitted to Skia Gold. ===');
+    harvester =
+      await Harvester.create(workDirectory, io.stderr,
+        addImageToSkiaGold: _dryRunAddImg);
+  } else {
+    harvester =
+      await Harvester.create(workDirectory, io.stderr);
+  }
+  await harvest(harvester);
+}
+
+Future<void> _dryRunAddImg(
+  String testName,
+  io.File goldenFile, {
+  required int screenshotSize,
+  double differentPixelsRate = 0.01,
+  int pixelColorDelta = 0,
+}) async {
+  io.stderr.writeln('addImg '
+    'testName:$testName '
+    'goldenFile:${goldenFile.path} '
+    'screenshotSize:$screenshotSize '
+    'differentPixelsRate:$differentPixelsRate '
+    'pixelColorDelta:$pixelColorDelta',
+  );
+}
diff --git a/tools/golden_tests_harvester/lib/golden_tests_harvester.dart b/tools/golden_tests_harvester/lib/golden_tests_harvester.dart
new file mode 100644
index 0000000000000000000000000000000000000000..7eeff6044d9770400a28e83026ab9e50b0586f33
--- /dev/null
+++ b/tools/golden_tests_harvester/lib/golden_tests_harvester.dart
@@ -0,0 +1,205 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io' as io;
+
+import 'package:path/path.dart' as p;
+import 'package:skia_gold_client/skia_gold_client.dart';
+
+import 'src/digests_json_format.dart';
+
+/// Used by [harvest] to process a directory for Skia Gold upload.
+abstract class Harvester {
+  /// Creates a new [Harvester] from the directory at [workDirectory].
+  ///
+  /// The directory is expected to match the following structure:
+  /// ```txt
+  /// workDirectory/
+  ///   - digest.json
+  ///   - test_name_1.png
+  ///   - test_name_2.png
+  ///   - ...
+  /// ```
+  ///
+  /// The format of `digest.json` is expected to match the following:
+  /// ```jsonc
+  /// {
+  ///   "dimensions": {
+  ///     // Key-value pairs of dimensions to provide to Skia Gold.
+  ///     // For example:
+  ///     "platform": "linux",
+  ///   },
+  ///   "entries": [
+  ///     // Each entry is a test-run with the following format:
+  ///     {
+  ///       // Path must be a direct sibling of digest.json.
+  ///       "filename": "test_name_1.png",
+  ///
+  ///       // Called `screenshotSize` in Skia Gold (width * height).
+  ///       "width": 100,
+  ///       "height": 100,
+  ///
+  ///       // Called `differentPixelsRate` in Skia Gold.
+  ///       "maxDiffPixelsPercent": 0.01,
+  ///
+  ///       // Called `pixelColorDelta` in Skia Gold.
+  ///       "maxColorDelta": 0
+  ///     }
+  ///   ]
+  /// }
+  /// ```
+  static Future<Harvester> create(
+      io.Directory workDirectory, StringSink stderr,
+      {AddImageToSkiaGold? addImageToSkiaGold}) async {
+    final io.File file = io.File(p.join(workDirectory.path, 'digest.json'));
+    if (!file.existsSync()) {
+      // Check if the directory exists or if the file is just missing.
+      if (!workDirectory.existsSync()) {
+        throw ArgumentError('Directory not found: ${workDirectory.path}.');
+      }
+      // Lookup sibling files to help the user understand what's missing.
+      final List<io.FileSystemEntity> files = workDirectory.listSync();
+      throw StateError(
+        'File "digest.json" not found in ${workDirectory.path}.\n\n'
+        'Found files: ${files.map((io.FileSystemEntity e) => p.basename(e.path)).join(', ')}',
+      );
+    }
+    final Digests digests = Digests.parse(file.readAsStringSync());
+
+    if (addImageToSkiaGold != null) {
+      return _DryRunHarvester(digests, stderr, workDirectory, addImageToSkiaGold);
+    } else {
+      return SkiaGoldHarvester._create(digests, stderr, workDirectory);
+    }
+  }
+
+  Future<void> _addImg(
+    String testName,
+    io.File goldenFile, {
+    double differentPixelsRate,
+    int pixelColorDelta,
+    required int screenshotSize,
+  });
+
+  Future<void> _auth();
+
+  Digests get _digests;
+  StringSink get _stderr;
+  io.Directory get _workDirectory;
+}
+
+/// A [Harvester] that communicates with a real [SkiaGoldClient].
+class SkiaGoldHarvester implements Harvester {
+  SkiaGoldHarvester._init(
+      this._digests, this._stderr, this._workDirectory, this.client);
+
+  @override
+  final Digests _digests;
+  @override
+  final StringSink _stderr;
+  @override
+  final io.Directory _workDirectory;
+  /// The [SkiaGoldClient] that will be used for harvesting.
+  final SkiaGoldClient client;
+
+  static Future<SkiaGoldHarvester> _create(
+      Digests digests, StringSink stderr, io.Directory workDirectory) async {
+    final SkiaGoldClient client =
+        SkiaGoldClient(workDirectory, dimensions: digests.dimensions);
+    return SkiaGoldHarvester._init(digests, stderr, workDirectory, client);
+  }
+
+  @override
+  Future<void> _addImg(String testName, io.File goldenFile,
+      {double differentPixelsRate = 0.01,
+      int pixelColorDelta = 0,
+      required int screenshotSize}) async {
+    return client.addImg(testName, goldenFile,
+        differentPixelsRate: differentPixelsRate,
+        pixelColorDelta: pixelColorDelta,
+        screenshotSize: screenshotSize);
+  }
+
+  @override
+  Future<void> _auth() {
+    return client.auth();
+  }
+}
+
+/// A [Harvester] that doesn't harvest, just calls a callback.
+class _DryRunHarvester implements Harvester {
+  _DryRunHarvester(
+      this._digests, this._stderr, this._workDirectory,
+      this._addImageToSkiaGold);
+
+  @override
+  final Digests _digests;
+  @override
+  final StringSink _stderr;
+  @override
+  final io.Directory _workDirectory;
+  final AddImageToSkiaGold _addImageToSkiaGold;
+
+  @override
+  Future<void> _addImg(String testName, io.File goldenFile,
+      {double differentPixelsRate = 0.01,
+      int pixelColorDelta = 0,
+      required int screenshotSize}) async {
+    return _addImageToSkiaGold(testName, goldenFile,
+        differentPixelsRate: differentPixelsRate,
+        pixelColorDelta: pixelColorDelta,
+        screenshotSize: screenshotSize);
+  }
+
+  @override
+  Future<void> _auth() async {
+    _stderr.writeln('using dimensions: ${_digests.dimensions}');
+  }
+}
+
+/// Uploads the images of digests in [harvester] to Skia Gold.
+Future<void> harvest(Harvester harvester) async {
+  await harvester._auth();
+  final List<Future<void>> pendingComparisons = <Future<void>>[];
+  for (final DigestEntry entry in harvester._digests.entries) {
+    final io.File goldenFile =
+        io.File(p.join(harvester._workDirectory.path, entry.filename));
+    final Future<void> future = harvester
+        ._addImg(
+      entry.filename,
+      goldenFile,
+      screenshotSize: entry.width * entry.height,
+      differentPixelsRate: entry.maxDiffPixelsPercent,
+      pixelColorDelta: entry.maxColorDelta,
+    )
+        .catchError((Object e) {
+      harvester._stderr.writeln('Failed to add image to Skia Gold: $e');
+      throw FailedComparisonException(entry.filename);
+    });
+    pendingComparisons.add(future);
+  }
+
+  await Future.wait(pendingComparisons);
+}
+
+/// An exception thrown when a comparison fails.
+final class FailedComparisonException implements Exception {
+  /// Creates a new instance of [FailedComparisonException].
+  const FailedComparisonException(this.testName);
+
+  /// The test name that failed.
+  final String testName;
+
+  @override
+  String toString() => 'Failed comparison: $testName';
+}
+
+/// A function that uploads an image to Skia Gold.
+typedef AddImageToSkiaGold = Future<void> Function(
+  String testName,
+  io.File goldenFile, {
+  double differentPixelsRate,
+  int pixelColorDelta,
+  required int screenshotSize,
+});
diff --git a/tools/golden_tests_harvester/lib/src/digests_json_format.dart b/tools/golden_tests_harvester/lib/src/digests_json_format.dart
new file mode 100644
index 0000000000000000000000000000000000000000..8a2674f5e1bcea8847b7d4e7199c31d1851b2071
--- /dev/null
+++ b/tools/golden_tests_harvester/lib/src/digests_json_format.dart
@@ -0,0 +1,120 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:convert' as convert;
+
+/// A Dart representation of a `digest.json` file.
+///
+/// A single file is typically used to represent the results of a test suite,
+/// or a series of tests that have been run with the same [dimensions]. For
+/// example, "Impeller Unittests on Vulkan running on MacOS" might generate
+/// a `digest.json` file.
+///
+/// Other tools (perhaps implemented in other languages, like C++) can use this
+/// format to communicate with the `golden_tests_harvester` tool without
+/// relying on the tool directly (or the Dart SDK).
+final class Digests {
+  /// Creates a new instance of [Digests].
+  ///
+  /// In practice, [Digests.parse] is typically used to create a new instance
+  /// from an existing `digest.json` file read into memory as string contents.
+  const Digests({
+    required this.dimensions,
+    required this.entries,
+  });
+
+  /// Parses a `digest.json` file from a string.
+  factory Digests.parse(String json) {
+    final Object? decoded = convert.json.decode(json);
+    if (decoded is! Map<String, Object?>) {
+      throw FormatException(
+        'Expected a JSON object as the root, but got $decoded',
+        json,
+      );
+    }
+
+    final Object? dimensions = decoded['dimensions'];
+    if (dimensions is! Map<String, Object?>) {
+      throw FormatException(
+        'Expected a JSON object "dimensions", but got ${dimensions.runtimeType}',
+        dimensions,
+      );
+    }
+
+    final Object? entries = decoded['entries'];
+    if (entries is! List<Object?>) {
+      throw FormatException(
+        'Expected a JSON list "entries", but got ${entries.runtimeType}',
+        entries,
+      );
+    }
+
+    // Now parse the entries.
+    return Digests(
+      dimensions: dimensions.map((String key, Object? value) {
+        if (value is! String) {
+          throw FormatException(
+            'Expected a JSON string for dimension "$key", but got ${value.runtimeType}',
+            value,
+          );
+        }
+        return MapEntry<String, String>(key, value);
+      }),
+      entries: List<DigestEntry>.unmodifiable(entries.map((Object? entry) {
+        if (entry is! Map<String, Object?>) {
+          throw FormatException(
+            'Expected a JSON object for an entry, but got ${entry.runtimeType}',
+            entry,
+          );
+        }
+        return DigestEntry(
+          filename: entry['filename']! as String,
+          width: entry['width']! as int,
+          height: entry['height']! as int,
+          maxDiffPixelsPercent: entry['maxDiffPixelsPercent']! as double,
+          maxColorDelta: entry['maxColorDelta']! as int,
+        );
+      })),
+    );
+  }
+
+  /// A key-value map of dimensions to provide to Skia Gold.
+  final Map<String, String> dimensions;
+
+  /// A list of test-run entries.
+  final List<DigestEntry> entries;
+}
+
+/// A single entry in a `digest.json` file.
+///
+/// Each entry is a test-run (or part of a test-run).
+final class DigestEntry {
+  /// Creates a new instance of [DigestEntry].
+  const DigestEntry({
+    required this.filename,
+    required this.width,
+    required this.height,
+    required this.maxDiffPixelsPercent,
+    required this.maxColorDelta,
+  });
+
+  /// File path that is a direct sibling of the parsed `digest.json`.
+  final String filename;
+
+  /// Width of the image.
+  final int width;
+
+  /// Height of the image.
+  final int height;
+
+  /// Maximum percentage of different pixels.
+  ///
+  /// Within Skia Gold, this is called `differentPixelsRate`.
+  final double maxDiffPixelsPercent;
+
+  /// Maximum color delta.
+  ///
+  /// Within Skia Gold, this is called `pixelColorDelta`.
+  final int maxColorDelta;
+}
diff --git a/tools/golden_tests_harvester/pubspec.yaml b/tools/golden_tests_harvester/pubspec.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..933beeac0ec7d40351be77384ca4f0a50faa6da7
--- /dev/null
+++ b/tools/golden_tests_harvester/pubspec.yaml
@@ -0,0 +1,55 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+name: golden_tests_harvester
+publish_to: none
+environment:
+  sdk: '>=3.2.0-0 <4.0.0'
+
+# Do not add any dependencies that require more than what is provided in
+# //third_party/dart/pkg, //third_party/dart/third_party/pkg, or
+# //third_party/pkg. In particular, package:test is not usable here.
+
+# If you do add packages here, make sure you can run `pub get --offline`, and
+# check the .packages and .package_config to make sure all the paths are
+# relative to this directory into //third_party/dart, or //third_party/pkg
+dependencies:
+  args: any
+  meta: any
+  path: any
+  skia_gold_client:
+    path: ../../testing/skia_gold_client
+
+dev_dependencies:
+  litetest: any
+
+dependency_overrides:
+  args:
+    path: ../../../third_party/dart/third_party/pkg/args
+  async_helper:
+    path: ../../../third_party/dart/pkg/async_helper
+  collection:
+    path: ../../../third_party/dart/third_party/pkg/collection
+  crypto:
+    path: ../../../third_party/dart/third_party/pkg/crypto
+  expect:
+    path: ../../../third_party/dart/pkg/expect
+  file:
+    path: ../../../third_party/dart/third_party/pkg/file/packages/file
+  litetest:
+    path: ../../testing/litetest
+  meta:
+    path: ../../../third_party/dart/pkg/meta
+  engine_repo_tools:
+    path: ../../tools/pkg/engine_repo_tools
+  path:
+    path: ../../../third_party/dart/third_party/pkg/path
+  platform:
+    path: ../../third_party/pkg/platform
+  process:
+    path: ../../third_party/pkg/process
+  smith:
+    path: ../../../third_party/dart/pkg/smith
+  typed_data:
+    path: ../../../third_party/dart/third_party/pkg/typed_data
diff --git a/tools/golden_tests_harvester/test/golden_tests_harvester_test.dart b/tools/golden_tests_harvester/test/golden_tests_harvester_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..bdbbabe7fb9e151760b2d4b28c8278e31d2a4cb0
--- /dev/null
+++ b/tools/golden_tests_harvester/test/golden_tests_harvester_test.dart
@@ -0,0 +1,223 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'dart:io' as io;
+
+import 'package:golden_tests_harvester/golden_tests_harvester.dart';
+import 'package:litetest/litetest.dart';
+import 'package:path/path.dart' as p;
+
+void main() async {
+  Future<void> withTempDirectory(
+      FutureOr<void> Function(io.Directory) callback) async {
+    final io.Directory tempDirectory = await io.Directory.systemTemp
+        .createTemp('golden_tests_harvester_test.');
+    try {
+      await callback(tempDirectory);
+    } finally {
+      await tempDirectory.delete(recursive: true);
+    }
+  }
+
+  test('should fail on a missing directory', () async {
+    await withTempDirectory((io.Directory tempDirectory) async {
+      final StringSink stderr = StringBuffer();
+      final ArgumentError error = await _expectThrow<ArgumentError>(() async {
+        await Harvester.create(
+            io.Directory(p.join(tempDirectory.path, 'non_existent')),
+            stderr,
+            addImageToSkiaGold: _alwaysThrowsAddImg);
+      });
+      expect(error.message, contains('non_existent'));
+      expect(stderr.toString(), isEmpty);
+    });
+  });
+
+  test('should require a file named "digest.json" in the working directory',
+      () async {
+    await withTempDirectory((io.Directory tempDirectory) async {
+      final StringSink stderr = StringBuffer();
+
+      final StateError error = await _expectThrow<StateError>(() async {
+        await Harvester.create(
+            tempDirectory,
+            stderr,
+            addImageToSkiaGold: _alwaysThrowsAddImg);
+      });
+      expect(error.toString(), contains('digest.json'));
+      expect(stderr.toString(), isEmpty);
+    });
+  });
+
+  test('should throw if "digest.json" is in an unexpected format', () async {
+    await withTempDirectory((io.Directory tempDirectory) async {
+      final StringSink stderr = StringBuffer();
+      final io.File digestsFile =
+          io.File(p.join(tempDirectory.path, 'digest.json'));
+      await digestsFile
+          .writeAsString('{"dimensions": "not a map", "entries": []}');
+
+      final FormatException error =
+          await _expectThrow<FormatException>(() async {
+        await Harvester.create(
+            tempDirectory,
+            stderr,
+            addImageToSkiaGold: _alwaysThrowsAddImg);
+      });
+      expect(error.message, contains('dimensions'));
+      expect(stderr.toString(), isEmpty);
+    });
+  });
+
+  test('should fail eagerly if addImg fails', () async {
+    await withTempDirectory((io.Directory tempDirectory) async {
+      final io.File digestsFile =
+          io.File(p.join(tempDirectory.path, 'digest.json'));
+      final StringSink stderr = StringBuffer();
+      await digestsFile.writeAsString('''
+        {
+          "dimensions": {},
+          "entries": [
+            {
+              "filename": "test_name_1.png",
+              "width": 100,
+              "height": 100,
+              "maxDiffPixelsPercent": 0.01,
+              "maxColorDelta": 0
+            }
+          ]
+        }
+      ''');
+
+      final FailedComparisonException error =
+          await _expectThrow<FailedComparisonException>(() async {
+        final Harvester harvester = await Harvester.create(
+            tempDirectory,
+            stderr,
+            addImageToSkiaGold: _alwaysThrowsAddImg);
+        await harvest(harvester);
+      });
+      expect(error.testName, 'test_name_1.png');
+      expect(stderr.toString(), contains('IntentionalError'));
+    });
+  });
+
+  test('should invoke addImg per test', () async {
+    await withTempDirectory((io.Directory tempDirectory) async {
+      final io.File digestsFile =
+          io.File(p.join(tempDirectory.path, 'digest.json'));
+      await digestsFile.writeAsString('''
+        {
+          "dimensions": {},
+          "entries": [
+            {
+              "filename": "test_name_1.png",
+              "width": 100,
+              "height": 100,
+              "maxDiffPixelsPercent": 0.01,
+              "maxColorDelta": 0
+            },
+            {
+              "filename": "test_name_2.png",
+              "width": 200,
+              "height": 200,
+              "maxDiffPixelsPercent": 0.02,
+              "maxColorDelta": 1
+            }
+          ]
+        }
+      ''');
+      final List<String> addImgCalls = <String>[];
+      final StringSink stderr = StringBuffer();
+
+      final Harvester harvester =
+          await Harvester.create(tempDirectory, stderr, addImageToSkiaGold: (
+        String testName,
+        io.File goldenFile, {
+        required int screenshotSize,
+        double differentPixelsRate = 0.01,
+        int pixelColorDelta = 0,
+      }) async {
+        addImgCalls.add(
+            '$testName $screenshotSize $differentPixelsRate $pixelColorDelta');
+      });
+      await harvest(harvester);
+      expect(addImgCalls, <String>[
+        'test_name_1.png 10000 0.01 0',
+        'test_name_2.png 40000 0.02 1',
+      ]);
+    });
+  });
+
+  test('client has dimensions', () async {
+    await withTempDirectory((io.Directory tempDirectory) async {
+      final StringSink stderr = StringBuffer();
+      final io.File digestsFile =
+          io.File(p.join(tempDirectory.path, 'digest.json'));
+      await digestsFile
+          .writeAsString('{"dimensions": {"key":"value"}, "entries": []}');
+      final Harvester harvester = await Harvester.create(tempDirectory, stderr);
+      expect(harvester is SkiaGoldHarvester, true);
+      final SkiaGoldHarvester skiaGoldHarvester =
+          harvester as SkiaGoldHarvester;
+      expect(skiaGoldHarvester.client.dimensions,
+          <String, String>{'key': 'value'});
+    });
+  });
+
+  test('throws without GOLDCTL', () async {
+    await withTempDirectory((io.Directory tempDirectory) async {
+      final StringSink stderr = StringBuffer();
+      final io.File digestsFile =
+          io.File(p.join(tempDirectory.path, 'digest.json'));
+      await digestsFile.writeAsString('''
+{
+  "dimensions": {"key":"value"},
+  "entries": [
+    {
+      "filename": "foo.png",
+      "width": 100,
+      "height": 100,
+      "maxDiffPixelsPercent": 0.01,
+      "maxColorDelta": 0
+    }
+  ]}
+''');
+      final Harvester harvester = await Harvester.create(tempDirectory, stderr);
+      final StateError error = await _expectThrow<StateError>(() async {
+        await harvest(harvester);
+      });
+      expect(error.message, contains('GOLDCTL'));
+      expect(stderr.toString(), isEmpty);
+    });
+  });
+}
+
+
+FutureOr<T> _expectThrow<T extends Object>(
+    FutureOr<void> Function() callback) async {
+  try {
+    await callback();
+    fail('Expected an exception of type $T');
+  } on T catch (e) {
+    return e;
+  } catch (e) {
+    fail('Expected an exception of type $T, but got $e');
+  }
+  // fail(...) unfortunately does not return Never, but it does always throw.
+  throw UnsupportedError('Unreachable');
+}
+
+final class _IntentionalError extends Error {}
+
+Future<void> _alwaysThrowsAddImg(
+  String testName,
+  io.File goldenFile, {
+  required int screenshotSize,
+  double differentPixelsRate = 0.01,
+  int pixelColorDelta = 0,
+}) async {
+  throw _IntentionalError();
+}
diff --git a/tools/gradle/README.md b/tools/gradle/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..4c2286bbf59105ead143734e1c40aafead1f67c0
--- /dev/null
+++ b/tools/gradle/README.md
@@ -0,0 +1,26 @@
+# Updating gradle version used in engine repo
+
+The instructions in this README explain how to create a CIPD package that
+contains the gradle build-time dependency of the Android embedding of the Engine.
+The Android embedder is shipped to Flutter end-users, but gradle is not.
+
+## Requirements
+
+1. If you have a flutter/engine checkout, then you should already have
+[Depot tools](http://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/depot_tools_tutorial.html#_setting_up) on your path.
+1. Ensure you have write access for cipd. go/flutter-luci-cipd
+1. Download the new version of gradle then verify the checksum,
+and unzip into a local directory.
+
+## Update CIPD Steps
+These steps use gradle version 7.5.1 as an example.
+
+1. Unzip gradle into a folder `unzip gradle-7.5.1-all.zip`
+1. Authenticate with cipd `cipd auth-login`
+1. Run `cipd create -in gradle-7.5.1 -install-mode copy -tag version:7.5.1 -name flutter/gradle`
+1. Update `engine/src/flutter/DEPS` gradle entry to contain the tag from the command above.
+1. Run `gclient sync` to verify that dependency can be fetched.
+
+## Useful links
+* CIPD gradle https://chrome-infra-packages.appspot.com/p/flutter/gradle/+/
+* Gradle Releases https://gradle.org/releases/
\ No newline at end of file
diff --git a/tools/header_guard_check/README.md b/tools/header_guard_check/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..a2118b563c935444eb8b33a946ab395e779d5b31
--- /dev/null
+++ b/tools/header_guard_check/README.md
@@ -0,0 +1,43 @@
+# header_guard_check
+
+A tool to check that C++ header guards are used consistently in the engine.
+
+```shell
+# Assuming you are in the `flutter` root of the engine repo.
+dart ./tools/header_guard_check/bin/main.dart
+```
+
+The tool checks _all_ header files for the following pattern:
+
+```h
+// path/to/file.h
+
+#ifndef PATH_TO_FILE_H_
+#define PATH_TO_FILE_H_
+...
+#endif  // PATH_TO_FILE_H_
+```
+
+If the header file does not follow this pattern, the tool will print an error
+message and exit with a non-zero exit code. For more information about why we
+use this pattern, see [the Google C++ style guide](https://google.github.io/styleguide/cppguide.html#The__define_Guard).
+
+## Automatic fixes
+
+The tool can automatically fix header files that do not follow the pattern:
+
+```shell
+dart ./tools/header_guard_check/bin/main.dart --fix
+```
+
+## Advanced usage
+
+### Restricting the files to check
+
+By default, the tool checks all header files in the engine. You can restrict the
+files to check by passing a relative (to the `engine/src/flutter` root) paths to
+include:
+
+```shell
+dart ./tools/header_guard_check/bin/main.dart --include impeller
+```
diff --git a/tools/header_guard_check/bin/main.dart b/tools/header_guard_check/bin/main.dart
new file mode 100644
index 0000000000000000000000000000000000000000..014b51c2d839dc16fa1998741621eaf3b63e9b20
--- /dev/null
+++ b/tools/header_guard_check/bin/main.dart
@@ -0,0 +1,15 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io' as io;
+
+import 'package:header_guard_check/header_guard_check.dart';
+
+Future<int> main(List<String> arguments) async {
+  final int result = await HeaderGuardCheck.fromCommandLine(arguments).run();
+  if (result != 0) {
+    io.exit(result);
+  }
+  return result;
+}
diff --git a/tools/header_guard_check/lib/header_guard_check.dart b/tools/header_guard_check/lib/header_guard_check.dart
new file mode 100644
index 0000000000000000000000000000000000000000..8bc16c234891c72974a0d89888cd1a72db92024f
--- /dev/null
+++ b/tools/header_guard_check/lib/header_guard_check.dart
@@ -0,0 +1,191 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:collection';
+import 'dart:io' as io;
+
+import 'package:args/args.dart';
+import 'package:engine_repo_tools/engine_repo_tools.dart';
+import 'package:meta/meta.dart';
+import 'package:path/path.dart' as p;
+
+import 'src/header_file.dart';
+
+/// Checks C++ header files for header guards.
+@immutable
+final class HeaderGuardCheck {
+  /// Creates a new header guard checker.
+  HeaderGuardCheck({
+    required this.source,
+    required this.exclude,
+    this.include = const <String>[],
+    this.fix = false,
+    StringSink? stdOut,
+    StringSink? stdErr,
+  }) : _stdOut = stdOut ?? io.stdout, _stdErr = stdErr ?? io.stderr;
+
+  /// Parses the command line arguments and creates a new header guard checker.
+  factory HeaderGuardCheck.fromCommandLine(List<String> arguments) {
+    final ArgResults argResults = _parser.parse(arguments);
+    return HeaderGuardCheck(
+      source: Engine.fromSrcPath(argResults['root'] as String),
+      include: argResults['include'] as List<String>,
+      exclude: argResults['exclude'] as List<String>,
+      fix: argResults['fix'] as bool,
+    );
+  }
+
+  /// Engine source root.
+  final Engine source;
+
+  /// Whether to automatically fix most header guards.
+  final bool fix;
+
+  /// Path directories to include in the check.
+  final List<String> include;
+
+  /// Path directories to exclude from the check.
+  final List<String> exclude;
+
+  /// Stdout.
+  final StringSink _stdOut;
+
+  /// Stderr.
+  final StringSink _stdErr;
+
+  /// Runs the header guard check.
+  Future<int> run() async {
+    final List<HeaderFile> badFiles = _checkFiles(_findIncludedHeaderFiles()).toList();
+
+    if (badFiles.isNotEmpty) {
+      _stdOut.writeln('The following ${badFiles.length} files have invalid header guards:');
+      for (final HeaderFile headerFile in badFiles) {
+        _stdOut.writeln('  ${headerFile.path}');
+      }
+
+      // If we're fixing, fix the files.
+      if (fix) {
+        for (final HeaderFile headerFile in badFiles) {
+          headerFile.fix(engineRoot: source.flutterDir.path);
+        }
+
+        _stdOut.writeln('Fixed ${badFiles.length} files.');
+        return 0;
+      }
+
+      return 1;
+    }
+
+    return 0;
+  }
+
+  Iterable<io.File> _findIncludedHeaderFiles() sync* {
+    final Queue<String> queue = Queue<String>();
+    final Set<String> yielded = <String>{};
+    if (include.isEmpty) {
+      queue.add(source.flutterDir.path);
+    } else {
+      queue.addAll(include);
+    }
+    while (queue.isNotEmpty) {
+      final String path = queue.removeFirst();
+      if (path.endsWith('.h')) {
+        if (!_isExcluded(path) && yielded.add(path)) {
+          yield io.File(path);
+        }
+      } else if (io.FileSystemEntity.isDirectorySync(path)) {
+        if (_isExcluded(path)) {
+          continue;
+        }
+        final io.Directory directory = io.Directory(path);
+        for (final io.FileSystemEntity entity in directory.listSync(recursive: true)) {
+          if (entity is io.File && entity.path.endsWith('.h')) {
+            queue.add(entity.path);
+          }
+        }
+      } else {
+        // Neither a header file nor a directory that might contain header files.
+      }
+    }
+  }
+
+  bool _isExcluded(String path) {
+    for (final String excludePath in exclude) {
+      final String relativePath = p.relative(excludePath, from: source.flutterDir.path);
+      if (p.isWithin(relativePath, path) || p.equals(relativePath, path)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  Iterable<HeaderFile> _checkFiles(Iterable<io.File> headers) sync* {
+    for (final io.File header in headers) {
+      final HeaderFile headerFile = HeaderFile.parse(header.path);
+      if (headerFile.pragmaOnce != null) {
+        _stdErr.writeln(headerFile.pragmaOnce!.message('Unexpected #pragma once'));
+        yield headerFile;
+        continue;
+      }
+
+      if (headerFile.guard == null) {
+        _stdErr.writeln('Missing header guard in ${headerFile.path}');
+        yield headerFile;
+        continue;
+      }
+
+      final String expectedGuard = headerFile.computeExpectedName(engineRoot: source.flutterDir.path);
+      if (headerFile.guard!.ifndefValue != expectedGuard) {
+        _stdErr.writeln(headerFile.guard!.ifndefSpan!.message('Expected #ifndef $expectedGuard'));
+        yield headerFile;
+        continue;
+      }
+      if (headerFile.guard!.defineValue != expectedGuard) {
+        _stdErr.writeln(headerFile.guard!.defineSpan!.message('Expected #define $expectedGuard'));
+        yield headerFile;
+        continue;
+      }
+      if (headerFile.guard!.endifValue != expectedGuard) {
+        _stdErr.writeln(headerFile.guard!.endifSpan!.message('Expected #endif // $expectedGuard'));
+        yield headerFile;
+        continue;
+      }
+    }
+  }
+}
+
+final Engine? _engine = Engine.tryFindWithin(p.dirname(p.fromUri(io.Platform.script)));
+
+final ArgParser _parser = ArgParser()
+  ..addFlag(
+    'fix',
+    help: 'Automatically fixes most header guards.',
+  )
+  ..addOption(
+    'root',
+    abbr: 'r',
+    help: 'Path to the engine source root.',
+    valueHelp: 'path/to/engine/src',
+    defaultsTo: _engine?.srcDir.path,
+  )
+  ..addMultiOption(
+    'include',
+    abbr: 'i',
+    help: 'Paths to include in the check.',
+    valueHelp: 'path/to/dir/or/file (relative to the engine root)',
+    defaultsTo: <String>[],
+  )
+  ..addMultiOption(
+    'exclude',
+    abbr: 'e',
+    help: 'Paths to exclude from the check.',
+    valueHelp: 'path/to/dir/or/file (relative to the engine root)',
+    defaultsTo: _engine != null ? <String>[
+      'build',
+      'buildtools',
+      'impeller/compiler/code_gen_template.h',
+      'prebuilts',
+      'third_party',
+    ] : null,
+  );
diff --git a/tools/header_guard_check/lib/src/header_file.dart b/tools/header_guard_check/lib/src/header_file.dart
new file mode 100644
index 0000000000000000000000000000000000000000..494d6421f9b14348f86d0e1c5a4cb06e48bad360
--- /dev/null
+++ b/tools/header_guard_check/lib/src/header_file.dart
@@ -0,0 +1,344 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io' as io;
+
+import 'package:meta/meta.dart';
+import 'package:path/path.dart' as p;
+import 'package:source_span/source_span.dart';
+
+/// Represents a C++ header file, i.e. a file on disk that ends in `.h`.
+@immutable
+final class HeaderFile {
+  /// Creates a new header file from the given [path].
+  const HeaderFile.from(
+    this.path, {
+    required this.guard,
+    required this.pragmaOnce,
+  });
+
+  /// Parses the given [path] as a header file.
+  ///
+  /// Throws an [ArgumentError] if the file does not exist.
+  factory HeaderFile.parse(String path) {
+    final io.File file = io.File(path);
+    if (!file.existsSync()) {
+      throw ArgumentError.value(path, 'path', 'File does not exist.');
+    }
+
+    final String contents = file.readAsStringSync();
+    final SourceFile sourceFile = SourceFile.fromString(contents, url: p.toUri(path));
+    return HeaderFile.from(
+      path,
+      guard: _parseGuard(sourceFile),
+      pragmaOnce: _parsePragmaOnce(sourceFile),
+    );
+  }
+
+  static ({
+    int start,
+    int end,
+    String line,
+  }) _getLine(SourceFile sourceFile, int index) {
+    final int start = sourceFile.getOffset(index);
+    int end = index == sourceFile.lines - 1
+        ? sourceFile.length
+        : sourceFile.getOffset(index + 1) - 1;
+    String line = sourceFile.getText(start, end);
+
+    // On Windows, it's common for files to have CRLF line endings, and for
+    // developers to use git's `core.autocrlf` setting to convert them to LF
+    // line endings.
+    //
+    // However, our scripts expect LF line endings, so we need to remove the
+    // CR characters from the line endings when computing the line so that
+    // properly formatted files are not considered malformed.
+    if (line.isNotEmpty && sourceFile.getText(end - 1, end) == '\r') {
+      end--;
+      line = line.substring(0, line.length - 1);
+    }
+
+    return (
+      start: start,
+      end: end,
+      line: line,
+    );
+  }
+
+  /// Parses the header guard of the given [sourceFile].
+  static HeaderGuardSpans? _parseGuard(SourceFile sourceFile) {
+    SourceSpan? ifndefSpan;
+    SourceSpan? defineSpan;
+    SourceSpan? endifSpan;
+
+    // Iterate over the lines in the file.
+    for (int i = 0; i < sourceFile.lines; i++) {
+      final (:int start, :int end, :String line) = _getLine(sourceFile, i);
+
+      // Check if the line is a header guard directive.
+      if (line.startsWith('#ifndef')) {
+        ifndefSpan = sourceFile.span(start, end);
+      } else if (line.startsWith('#define')) {
+        // If we find a define preceding an ifndef, it is not a header guard.
+        if (ifndefSpan == null) {
+          continue;
+        }
+        defineSpan = sourceFile.span(start, end);
+        break;
+      }
+    }
+
+    // If we found no header guard, return null.
+    if (ifndefSpan == null) {
+      return null;
+    }
+
+    // Now iterate backwards to find the (last) #endif directive.
+    for (int i = sourceFile.lines - 1; i > 0; i--) {
+      final (:int start, :int end, :String line) = _getLine(sourceFile, i);
+
+      // Check if the line is a header guard directive.
+      if (line.startsWith('#endif')) {
+        endifSpan = sourceFile.span(start, end);
+        break;
+      }
+    }
+
+    return HeaderGuardSpans(
+      ifndefSpan: ifndefSpan,
+      defineSpan: defineSpan,
+      endifSpan: endifSpan,
+    );
+  }
+
+  /// Parses the `#pragma once` directive of the given [sourceFile].
+  static SourceSpan? _parsePragmaOnce(SourceFile sourceFile) {
+    // Iterate over the lines in the file.
+    for (int i = 0; i < sourceFile.lines; i++) {
+      final (:int start, :int end, :String line) = _getLine(sourceFile, i);
+
+      // Check if the line is a header guard directive.
+      if (line.startsWith('#pragma once')) {
+        return sourceFile.span(start, end);
+      }
+    }
+
+    return null;
+  }
+
+  /// Path to the file on disk.
+  final String path;
+
+  /// The header guard span, if any.
+  ///
+  /// This is `null` if the file does not have a header guard.
+  final HeaderGuardSpans? guard;
+
+  /// The `#pragma once` directive, if any.
+  ///
+  /// This is `null` if the file does not have a `#pragma once` directive.
+  final SourceSpan? pragmaOnce;
+
+  static final RegExp _nonAlphaNumeric = RegExp(r'[^a-zA-Z0-9]');
+
+  /// Returns the expected header guard for this file, relative to [engineRoot].
+  ///
+  /// For example, if the file is `foo/bar/baz.h`, this will return `FLUTTER_FOO_BAR_BAZ_H_`.
+  String computeExpectedName({required String engineRoot}) {
+    final String relativePath = p.relative(path, from: engineRoot);
+    final String underscoredRelativePath = p.withoutExtension(relativePath).replaceAll(_nonAlphaNumeric, '_');
+    return 'FLUTTER_${underscoredRelativePath.toUpperCase()}_H_';
+  }
+
+  /// Updates the file at [path] to have the expected header guard.
+  ///
+  /// Returns `true` if the file was modified, `false` otherwise.
+  bool fix({required String engineRoot}) {
+    final String expectedGuard = computeExpectedName(engineRoot: engineRoot);
+
+    // Check if the file already has a valid header guard.
+    if (guard != null) {
+      if (guard!.ifndefValue == expectedGuard &&
+          guard!.defineValue == expectedGuard &&
+          guard!.endifValue == expectedGuard) {
+        return false;
+      }
+    }
+
+    // Get the contents of the file.
+    final String oldContents = io.File(path).readAsStringSync();
+
+    // If we're using pragma once, replace it with an ifndef/define, and
+    // append an endif and a newline at the end of the file.
+    if (pragmaOnce != null) {
+      // Append the endif and newline.
+      String newContents = '$oldContents\n#endif  // $expectedGuard\n';
+
+      // Replace the span with the ifndef/define.
+      newContents = newContents.replaceRange(
+        pragmaOnce!.start.offset,
+        pragmaOnce!.end.offset,
+        '#ifndef $expectedGuard\n'
+        '#define $expectedGuard'
+      );
+
+      // Write the new contents to the file.
+      io.File(path).writeAsStringSync(newContents);
+      return true;
+    }
+
+    // If we're not using pragma once, replace the header guard with the
+    // expected header guard.
+    if (guard != null) {
+
+      // Replace endif:
+      String newContents = oldContents.replaceRange(
+        guard!.endifSpan!.start.offset,
+        guard!.endifSpan!.end.offset,
+        '#endif  // $expectedGuard'
+      );
+
+      // Replace define:
+      newContents = newContents.replaceRange(
+        guard!.defineSpan!.start.offset,
+        guard!.defineSpan!.end.offset,
+        '#define $expectedGuard'
+      );
+
+      // Replace ifndef:
+      newContents = newContents.replaceRange(
+        guard!.ifndefSpan!.start.offset,
+        guard!.ifndefSpan!.end.offset,
+        '#ifndef $expectedGuard'
+      );
+
+      // Write the new contents to the file.
+      io.File(path).writeAsStringSync('$newContents\n');
+      return true;
+    }
+
+    // If we're missing a guard entirely, add one. The rules are:
+    // 1. Add a newline, #endif at the end of the file.
+    // 2. Add a newline, #ifndef, #define after the first non-comment line.
+    String newContents = oldContents;
+    newContents += '\n#endif  // $expectedGuard\n';
+    newContents = newContents.replaceFirst(
+      RegExp(r'^(?!//)', multiLine: true),
+      '\n#ifndef $expectedGuard\n'
+      '#define $expectedGuard\n'
+    );
+
+    // Write the new contents to the file.
+    io.File(path).writeAsStringSync(newContents);
+    return true;
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is HeaderFile &&
+        path == other.path &&
+        guard == other.guard &&
+        pragmaOnce == other.pragmaOnce;
+  }
+
+  @override
+  int get hashCode => Object.hash(path, guard, pragmaOnce);
+
+  @override
+  String toString() {
+    return 'HeaderFile(\n'
+        '  path:       $path\n'
+        '  guard:      $guard\n'
+        '  pragmaOnce: $pragmaOnce\n'
+        ')';
+  }
+}
+
+/// Source elements that are part of a header guard.
+@immutable
+final class HeaderGuardSpans {
+  /// Collects the source spans of the header guard directives.
+  const HeaderGuardSpans({
+    required this.ifndefSpan,
+    required this.defineSpan,
+    required this.endifSpan,
+  });
+
+  /// Location of the `#ifndef` directive.
+  final SourceSpan? ifndefSpan;
+
+  /// Location of the `#define` directive.
+  final SourceSpan? defineSpan;
+
+  /// Location of the `#endif` directive.
+  final SourceSpan? endifSpan;
+
+  @override
+  bool operator ==(Object other) {
+    return other is HeaderGuardSpans &&
+        ifndefSpan == other.ifndefSpan &&
+        defineSpan == other.defineSpan &&
+        endifSpan == other.endifSpan;
+  }
+
+  @override
+  int get hashCode => Object.hash(ifndefSpan, defineSpan, endifSpan);
+
+  @override
+  String toString() {
+    return 'HeaderGuardSpans(\n'
+        '  #ifndef: $ifndefSpan\n'
+        '  #define: $defineSpan\n'
+        '  #endif:  $endifSpan\n'
+        ')';
+  }
+
+  /// Returns the value of the `#ifndef` directive.
+  ///
+  /// For example, `#ifndef FOO_H_`, this will return `FOO_H_`.
+  ///
+  /// If the span is not a valid `#ifndef` directive, `null` is returned.
+  String? get ifndefValue {
+    final String? value = ifndefSpan?.text;
+    if (value == null) {
+      return null;
+    }
+    if (!value.startsWith('#ifndef ')) {
+      return null;
+    }
+    return value.substring('#ifndef '.length);
+  }
+
+  /// Returns the value of the `#define` directive.
+  ///
+  /// For example, `#define FOO_H_`, this will return `FOO_H_`.
+  ///
+  /// If the span is not a valid `#define` directive, `null` is returned.
+  String? get defineValue {
+    final String? value = defineSpan?.text;
+    if (value == null) {
+      return null;
+    }
+    if (!value.startsWith('#define ')) {
+      return null;
+    }
+    return value.substring('#define '.length);
+  }
+
+  /// Returns the value of the `#endif` directive.
+  ///
+  /// For example, `#endif  // FOO_H_`, this will return `FOO_H_`.
+  ///
+  /// If the span is not a valid `#endif` directive, `null` is returned.
+  String? get endifValue {
+    final String? value = endifSpan?.text;
+    if (value == null) {
+      return null;
+    }
+    if (!value.startsWith('#endif  // ')) {
+      return null;
+    }
+    return value.substring('#endif  // '.length);
+  }
+}
diff --git a/tools/header_guard_check/pubspec.yaml b/tools/header_guard_check/pubspec.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d775e403853e2a77b8f79e2b729e7d80c914e64a
--- /dev/null
+++ b/tools/header_guard_check/pubspec.yaml
@@ -0,0 +1,70 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+name: header_guard_check
+publish_to: none
+
+# Do not add any dependencies that require more than what is provided in
+# //third_party/dart/pkg or //third_party/dart/third_party/pkg.
+# In particular, package:test is not usable here.
+
+# If you do add packages here, make sure you can run `pub get --offline`, and
+# check the .packages and .package_config to make sure all the paths are
+# relative to this directory into //third_party/dart
+
+environment:
+  sdk: '>=3.2.0-0 <4.0.0'
+
+dependencies:
+  args: any
+  git_repo_tools: any
+  engine_repo_tools: any
+  meta: any
+  path: any
+  source_span: any
+
+dev_dependencies:
+  async_helper: any
+  expect: any
+  litetest: any
+  process_fakes: any
+  smith: any
+
+dependency_overrides:
+  args:
+    path: ../../../third_party/dart/third_party/pkg/args
+  async:
+    path: ../../../third_party/dart/third_party/pkg/async
+  async_helper:
+    path: ../../../third_party/dart/pkg/async_helper
+  collection:
+    path: ../../../third_party/dart/third_party/pkg/collection
+  engine_repo_tools:
+    path: ../pkg/engine_repo_tools
+  expect:
+    path: ../../../third_party/dart/pkg/expect
+  file:
+    path: ../../../third_party/dart/third_party/pkg/file/packages/file
+  git_repo_tools:
+    path: ../pkg/git_repo_tools
+  litetest:
+    path: ../../testing/litetest
+  meta:
+    path: ../../../third_party/dart/pkg/meta
+  path:
+    path: ../../../third_party/dart/third_party/pkg/path
+  platform:
+    path: ../../third_party/pkg/platform
+  process:
+    path: ../../third_party/pkg/process
+  process_fakes:
+    path: ../pkg/process_fakes
+  process_runner:
+    path: ../../third_party/pkg/process_runner
+  smith:
+    path: ../../../third_party/dart/pkg/smith
+  source_span:
+    path: ../../../third_party/dart/third_party/pkg/source_span
+  term_glyph:
+    path: ../../../third_party/dart/third_party/pkg/term_glyph
diff --git a/tools/header_guard_check/test/header_file_test.dart b/tools/header_guard_check/test/header_file_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..a61d0edaca0d7104ebae6f11a661ebe273d6a798
--- /dev/null
+++ b/tools/header_guard_check/test/header_file_test.dart
@@ -0,0 +1,350 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io' as io;
+
+import 'package:header_guard_check/src/header_file.dart';
+import 'package:litetest/litetest.dart';
+import 'package:path/path.dart' as p;
+import 'package:source_span/source_span.dart';
+
+Future<int> main(List<String> args) async {
+  void withTestFile(String path, String contents, void Function(io.File) fn) {
+    // Create a temporary file and delete it when we're done.
+    final io.Directory tempDir = io.Directory.systemTemp.createTempSync('header_guard_check_test');
+    final io.File file = io.File(p.join(tempDir.path, path));
+    file.writeAsStringSync(contents);
+    try {
+      fn(file);
+    } finally {
+      tempDir.deleteSync(recursive: true);
+    }
+  }
+
+  group('HeaderGuardSpans', () {
+    test('parses #ifndef', () {
+      const String input = '#ifndef FOO_H_';
+      final HeaderGuardSpans guard = HeaderGuardSpans(
+        ifndefSpan: SourceSpanWithContext(
+          SourceLocation(0),
+          SourceLocation(input.length),
+          input,
+          input,
+        ),
+        defineSpan: null,
+        endifSpan: null,
+      );
+      expect(guard.ifndefValue, 'FOO_H_');
+    });
+
+    test('ignores #ifndef if omitted', () {
+      const HeaderGuardSpans guard = HeaderGuardSpans(
+        ifndefSpan: null,
+        defineSpan: null,
+        endifSpan: null,
+      );
+      expect(guard.ifndefValue, isNull);
+    });
+
+    test('ignores #ifndef if invalid', () {
+      const String input = '#oops FOO_H_';
+      final HeaderGuardSpans guard = HeaderGuardSpans(
+        ifndefSpan: SourceSpanWithContext(
+          SourceLocation(0),
+          SourceLocation(input.length),
+          input,
+          input,
+        ),
+        defineSpan: null,
+        endifSpan: null,
+      );
+      expect(guard.ifndefValue, isNull);
+    });
+
+    test('parses #define', () {
+      const String input = '#define FOO_H_';
+      final HeaderGuardSpans guard = HeaderGuardSpans(
+        ifndefSpan: null,
+        defineSpan: SourceSpanWithContext(
+          SourceLocation(0),
+          SourceLocation(input.length),
+          input,
+          input,
+        ),
+        endifSpan: null,
+      );
+      expect(guard.defineValue, 'FOO_H_');
+    });
+
+    test('ignores #define if omitted', () {
+      const HeaderGuardSpans guard = HeaderGuardSpans(
+        ifndefSpan: null,
+        defineSpan: null,
+        endifSpan: null,
+      );
+      expect(guard.defineValue, isNull);
+    });
+
+    test('ignores #define if invalid', () {
+      const String input = '#oops FOO_H_';
+      final HeaderGuardSpans guard = HeaderGuardSpans(
+        ifndefSpan: null,
+        defineSpan: SourceSpanWithContext(
+          SourceLocation(0),
+          SourceLocation(input.length),
+          input,
+          input,
+        ),
+        endifSpan: null,
+      );
+      expect(guard.defineValue, isNull);
+    });
+
+    test('parses #endif', () {
+      const String input = '#endif  // FOO_H_';
+      final HeaderGuardSpans guard = HeaderGuardSpans(
+        ifndefSpan: null,
+        defineSpan: null,
+        endifSpan: SourceSpanWithContext(
+          SourceLocation(0),
+          SourceLocation(input.length),
+          input,
+          input,
+        ),
+      );
+      expect(guard.endifValue, 'FOO_H_');
+    });
+
+    test('ignores #endif if omitted', () {
+      const HeaderGuardSpans guard = HeaderGuardSpans(
+        ifndefSpan: null,
+        defineSpan: null,
+        endifSpan: null,
+      );
+      expect(guard.endifValue, isNull);
+    });
+
+    test('ignores #endif if invalid', () {
+      const String input = '#oops  // FOO_H_';
+      final HeaderGuardSpans guard = HeaderGuardSpans(
+        ifndefSpan: null,
+        defineSpan: null,
+        endifSpan: SourceSpanWithContext(
+          SourceLocation(0),
+          SourceLocation(input.length),
+          input,
+          input,
+        ),
+      );
+      expect(guard.endifValue, isNull);
+    });
+  });
+
+  group('HeaderFile', () {
+    test('produces a valid header guard name from various file names', () {
+      // All of these should produce the name `FOO_BAR_BAZ_H_`.
+      const List<String> inputs = <String>[
+        'foo_bar_baz.h',
+        'foo-bar-baz.h',
+        'foo_bar-baz.h',
+        'foo-bar_baz.h',
+        'foo+bar+baz.h',
+      ];
+      for (final String input in inputs) {
+        final HeaderFile headerFile = HeaderFile.from(
+          input,
+          guard: null,
+          pragmaOnce: null,
+        );
+        expect(headerFile.computeExpectedName(engineRoot: ''), endsWith('FOO_BAR_BAZ_H_'));
+      }
+    });
+
+    test('parses a header file with a valid guard', () {
+      final String input = <String>[
+        '#ifndef FOO_H_',
+        '#define FOO_H_',
+        '',
+        '#endif  // FOO_H_',
+      ].join('\n');
+      withTestFile('foo.h', input, (io.File file) {
+        final HeaderFile headerFile = HeaderFile.parse(file.path);
+        expect(headerFile.guard!.ifndefValue, 'FOO_H_');
+        expect(headerFile.guard!.defineValue, 'FOO_H_');
+        expect(headerFile.guard!.endifValue, 'FOO_H_');
+      });
+    });
+
+    test('parses a header file with an invalid #endif', () {
+      final String input = <String>[
+        '#ifndef FOO_H_',
+        '#define FOO_H_',
+        '',
+        // No comment after the #endif.
+        '#endif',
+      ].join('\n');
+      withTestFile('foo.h', input, (io.File file) {
+        final HeaderFile headerFile = HeaderFile.parse(file.path);
+        expect(headerFile.guard!.ifndefValue, 'FOO_H_');
+        expect(headerFile.guard!.defineValue, 'FOO_H_');
+        expect(headerFile.guard!.endifValue, isNull);
+      });
+    });
+
+    test('parses a header file with a missing #define', () {
+      final String input = <String>[
+        '#ifndef FOO_H_',
+        // No #define.
+        '',
+        '#endif  // FOO_H_',
+      ].join('\n');
+      withTestFile('foo.h', input, (io.File file) {
+        final HeaderFile headerFile = HeaderFile.parse(file.path);
+        expect(headerFile.guard!.ifndefValue, 'FOO_H_');
+        expect(headerFile.guard!.defineValue, isNull);
+        expect(headerFile.guard!.endifValue, 'FOO_H_');
+      });
+    });
+
+    test('parses a header file with a missing #ifndef', () {
+      final String input = <String>[
+        // No #ifndef.
+        '#define FOO_H_',
+        '',
+        '#endif  // FOO_H_',
+      ].join('\n');
+      withTestFile('foo.h', input, (io.File file) {
+        final HeaderFile headerFile = HeaderFile.parse(file.path);
+        expect(headerFile.guard, isNull);
+      });
+    });
+
+    test('parses a header file with a #pragma once', () {
+      final String input = <String>[
+        '#pragma once',
+        '',
+      ].join('\n');
+      withTestFile('foo.h', input, (io.File file) {
+        final HeaderFile headerFile = HeaderFile.parse(file.path);
+        expect(headerFile.pragmaOnce, isNotNull);
+      });
+    });
+
+    test('fixes a file that uses #pragma once', () {
+      final String input = <String>[
+        '#pragma once',
+        '',
+        '// ...',
+      ].join('\n');
+      withTestFile('foo.h', input, (io.File file) {
+        final HeaderFile headerFile = HeaderFile.parse(file.path);
+        expect(headerFile.fix(engineRoot: p.dirname(file.path)), isTrue);
+        expect(file.readAsStringSync(), <String>[
+          '#ifndef FLUTTER_FOO_H_',
+          '#define FLUTTER_FOO_H_',
+          '',
+          '// ...',
+          '#endif  // FLUTTER_FOO_H_',
+          '',
+        ].join('\n'));
+      });
+    });
+
+    test('fixes a file with an incorrect header guard', () {
+      final String input = <String>[
+        '#ifndef FOO_H_',
+        '#define FOO_H_',
+        '',
+        '#endif  // FOO_H_',
+      ].join('\n');
+      withTestFile('foo.h', input, (io.File file) {
+        final HeaderFile headerFile = HeaderFile.parse(file.path);
+        expect(headerFile.fix(engineRoot: p.dirname(file.path)), isTrue);
+        expect(file.readAsStringSync(), <String>[
+          '#ifndef FLUTTER_FOO_H_',
+          '#define FLUTTER_FOO_H_',
+          '',
+          '#endif  // FLUTTER_FOO_H_',
+          '',
+        ].join('\n'));
+      });
+    });
+
+    test('fixes a file with no header guard', () {
+      final String input = <String>[
+        '// 1.',
+        '// 2.',
+        '// 3.',
+        '',
+        "#import 'flutter/shell/platform/darwin/Flutter.h'",
+        '',
+        '@protocl Flutter',
+        '',
+        '@end',
+        '',
+      ].join('\n');
+      withTestFile('foo.h', input, (io.File file) {
+        final HeaderFile headerFile = HeaderFile.parse(file.path);
+        expect(headerFile.fix(engineRoot: p.dirname(file.path)), isTrue);
+        expect(file.readAsStringSync(), <String>[
+          '// 1.',
+          '// 2.',
+          '// 3.',
+          '',
+          '#ifndef FLUTTER_FOO_H_',
+          '#define FLUTTER_FOO_H_',
+          '',
+          "#import 'flutter/shell/platform/darwin/Flutter.h'",
+          '',
+          '@protocl Flutter',
+          '',
+          '@end',
+          '',
+          '#endif  // FLUTTER_FOO_H_',
+          '',
+        ].join('\n'));
+      });
+    });
+
+    test('does not touch a file with an existing guard and another #define', () {
+      final String input = <String>[
+        '// 1.',
+        '// 2.',
+        '// 3.',
+        '',
+        '#define FML_USED_ON_EMBEDDER',
+        '',
+        '#ifndef FLUTTER_FOO_H_',
+        '#define FLUTTER_FOO_H_',
+        '',
+        '#endif  // FLUTTER_FOO_H_',
+        '',
+      ].join('\n');
+      withTestFile('foo.h', input, (io.File file) {
+        final HeaderFile headerFile = HeaderFile.parse(file.path);
+        expect(headerFile.fix(engineRoot: p.dirname(file.path)), isFalse);
+      });
+    });
+
+    test('is OK with windows-style CRLF file with a valid header guard', () {
+      final String input = <String>[
+        '#ifndef FLUTTER_FOO_H_',
+        '#define FLUTTER_FOO_H_',
+        '',
+        '// ...',
+        '',
+        '#endif  // FLUTTER_FOO_H_',
+      ].join('\r\n');
+      withTestFile('foo.h', input, (io.File file) {
+        final HeaderFile headerFile = HeaderFile.parse(file.path);
+        expect(headerFile.pragmaOnce, isNull);
+        expect(headerFile.guard!.ifndefValue, 'FLUTTER_FOO_H_');
+        expect(headerFile.guard!.defineValue, 'FLUTTER_FOO_H_');
+        expect(headerFile.guard!.endifValue, 'FLUTTER_FOO_H_');
+      });
+    });
+  });
+
+  return 0;
+}
diff --git a/tools/header_guard_check/test/header_guard_check_test.dart b/tools/header_guard_check/test/header_guard_check_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..cf4ed35435b4ffd803f15f5941a6dfbbb9290b52
--- /dev/null
+++ b/tools/header_guard_check/test/header_guard_check_test.dart
@@ -0,0 +1,124 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io' as io;
+
+import 'package:engine_repo_tools/engine_repo_tools.dart';
+import 'package:header_guard_check/header_guard_check.dart';
+import 'package:litetest/litetest.dart';
+import 'package:path/path.dart' as p;
+
+Future<int> main(List<String> args) async {
+  void withTestRepository(String path, void Function(io.Directory) fn) {
+    // Create a temporary directory and delete it when we're done.
+    final io.Directory tempDir = io.Directory.systemTemp.createTempSync('header_guard_check_test');
+    final io.Directory repoDir = io.Directory(p.join(tempDir.path, path));
+    repoDir.createSync(recursive: true);
+    try {
+      fn(repoDir);
+    } finally {
+      tempDir.deleteSync(recursive: true);
+    }
+  }
+
+  group('HeaderGuardCheck', () {
+    test('by default checks all files', () {
+      withTestRepository('engine/src', (io.Directory repoDir) {
+        final io.Directory flutterDir = io.Directory(p.join(repoDir.path, 'flutter'));
+        flutterDir.createSync(recursive: true);
+        final io.File file1 = io.File(p.join(flutterDir.path, 'foo.h'));
+        file1.createSync(recursive: true);
+        final io.File file2 = io.File(p.join(flutterDir.path, 'bar.h'));
+        file2.createSync(recursive: true);
+        final io.File file3 = io.File(p.join(flutterDir.path, 'baz.h'));
+        file3.createSync(recursive: true);
+
+        final StringBuffer stdOut = StringBuffer();
+        final StringBuffer stdErr = StringBuffer();
+        final HeaderGuardCheck check = HeaderGuardCheck(
+          source: Engine.fromSrcPath(repoDir.path),
+          exclude: const <String>[],
+          stdOut: stdOut,
+          stdErr: stdErr,
+        );
+
+        expect(check.run(), completion(1));
+        expect(stdOut.toString(), contains('foo.h'));
+        expect(stdOut.toString(), contains('bar.h'));
+        expect(stdOut.toString(), contains('baz.h'));
+      });
+    });
+
+    test('if --include is provided, checks specific files', () {
+      withTestRepository('engine/src', (io.Directory repoDir) {
+        final io.Directory flutterDir = io.Directory(p.join(repoDir.path, 'flutter'));
+        flutterDir.createSync(recursive: true);
+        final io.File file1 = io.File(p.join(flutterDir.path, 'foo.h'));
+        file1.createSync(recursive: true);
+        final io.File file2 = io.File(p.join(flutterDir.path, 'bar.h'));
+        file2.createSync(recursive: true);
+        final io.File file3 = io.File(p.join(flutterDir.path, 'baz.h'));
+        file3.createSync(recursive: true);
+
+        final StringBuffer stdOut = StringBuffer();
+        final StringBuffer stdErr = StringBuffer();
+        final HeaderGuardCheck check = HeaderGuardCheck(
+          source: Engine.fromSrcPath(repoDir.path),
+          include: <String>[file1.path, file3.path],
+          exclude: const <String>[],
+          stdOut: stdOut,
+          stdErr: stdErr,
+        );
+
+        expect(check.run(), completion(1));
+        expect(stdOut.toString(), contains('foo.h'));
+        expect(stdOut.toString(), contains('baz.h'));
+
+        // TODO(matanlurey): https://github.com/flutter/flutter/issues/133569).
+        if (stdOut.toString().contains('bar.h')) {
+          // There is no not(contains(...)) matcher.
+          fail('bar.h should not be checked. Output: $stdOut');
+        }
+      });
+    });
+
+    test('if --include is provided, checks specific directories', () {
+      withTestRepository('engine/src', (io.Directory repoDir) {
+        final io.Directory flutterDir = io.Directory(p.join(repoDir.path, 'flutter'));
+        flutterDir.createSync(recursive: true);
+
+        // Create a sub-directory called "impeller".
+        final io.Directory impellerDir = io.Directory(p.join(flutterDir.path, 'impeller'));
+        impellerDir.createSync(recursive: true);
+
+        // Create one file in both the root and in impeller.
+        final io.File file1 = io.File(p.join(flutterDir.path, 'foo.h'));
+        file1.createSync(recursive: true);
+        final io.File file2 = io.File(p.join(impellerDir.path, 'bar.h'));
+        file2.createSync(recursive: true);
+
+        final StringBuffer stdOut = StringBuffer();
+        final StringBuffer stdErr = StringBuffer();
+        final HeaderGuardCheck check = HeaderGuardCheck(
+          source: Engine.fromSrcPath(repoDir.path),
+          include: <String>[impellerDir.path],
+          exclude: const <String>[],
+          stdOut: stdOut,
+          stdErr: stdErr,
+        );
+
+        expect(check.run(), completion(1));
+        expect(stdOut.toString(), contains('bar.h'));
+
+        // TODO(matanlurey): https://github.com/flutter/flutter/issues/133569).
+        if (stdOut.toString().contains('foo.h')) {
+          // There is no not(contains(...)) matcher.
+          fail('foo.h should not be checked. Output: $stdOut');
+        }
+      });
+    });
+  });
+
+  return 0;
+}
diff --git a/tools/javadoc/gen_javadoc.py b/tools/javadoc/gen_javadoc.py
index 92b49ad77118dc3d8023a7c5dac57ffb06310e39..357bc285fdca98c9aed56de86f72333a0c03730b 100755
--- a/tools/javadoc/gen_javadoc.py
+++ b/tools/javadoc/gen_javadoc.py
@@ -17,29 +17,23 @@ SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 def JavadocBin():
   if sys.platform == 'darwin':
     return os.path.join(
-        SCRIPT_DIR, '..', '..', '..', 'third_party', 'java', 'openjdk',
-        'Contents', 'Home', 'bin', 'javadoc'
+        SCRIPT_DIR, '..', '..', '..', 'third_party', 'java', 'openjdk', 'Contents', 'Home', 'bin',
+        'javadoc'
     )
   elif sys.platform.startswith(('cygwin', 'win')):
     return os.path.join(
-        SCRIPT_DIR, '..', '..', '..', 'third_party', 'java', 'openjdk', 'bin',
-        'javadoc.exe'
+        SCRIPT_DIR, '..', '..', '..', 'third_party', 'java', 'openjdk', 'bin', 'javadoc.exe'
     )
   else:
     return os.path.join(
-        SCRIPT_DIR, '..', '..', '..', 'third_party', 'java', 'openjdk', 'bin',
-        'javadoc'
+        SCRIPT_DIR, '..', '..', '..', 'third_party', 'java', 'openjdk', 'bin', 'javadoc'
     )
 
 
 def main():
-  parser = argparse.ArgumentParser(
-      description='Runs javadoc on Flutter Android libraries'
-  )
+  parser = argparse.ArgumentParser(description='Runs javadoc on Flutter Android libraries')
   parser.add_argument('--out-dir', type=str, required=True)
-  parser.add_argument(
-      '--android-source-root', type=str, default=ANDROID_SRC_ROOT
-  )
+  parser.add_argument('--android-source-root', type=str, default=ANDROID_SRC_ROOT)
   parser.add_argument('--build-config-path', type=str)
   parser.add_argument('--third-party', type=str, default='third_party')
   parser.add_argument('--quiet', default=False, action='store_true')
@@ -57,12 +51,8 @@ def main():
 
   classpath = [
       args.android_source_root,
-      os.path.join(
-          args.third_party, 'android_tools/sdk/platforms/android-33/android.jar'
-      ),
-      os.path.join(
-          args.third_party, 'android_embedding_dependencies', 'lib', '*'
-      ),
+      os.path.join(args.third_party, 'android_tools/sdk/platforms/android-34/android.jar'),
+      os.path.join(args.third_party, 'android_embedding_dependencies', 'lib', '*'),
   ]
   if args.build_config_path:
     classpath.append(args.build_config_path)
diff --git a/tools/licenses/README.md b/tools/licenses/README.md
index 39a123a1a268a696c1366bf83cefe97444e78743..de9f42f59c4b6c86d53cd27169507f243b838f3d 100644
--- a/tools/licenses/README.md
+++ b/tools/licenses/README.md
@@ -1,20 +1,42 @@
 # Update License Files
 
 ## Apply patch generated by CI
-If you're not working on a Linux box then you can't auto-generate license files. A workaround is provided via CI.
-
-Your build will fail one or more CI checks if your license files are not correct. Open the failing CI check. In the CI output you will find a patch diff that represents the changes that need to be made to your license files.
+If you're not working on a Linux box then you can't auto-generate license
+files. A workaround is provided via CI.
+
+Your build will fail one or more CI checks if your license files are not
+correct. Open the failing CI check. In the CI output you will find a
+patch diff that represents the changes that need to be made to your
+license files.
+
+> [!WARNING]
+> Do this only if the diff does not change _which_ licenses are being
+> included, but affects just the `FILE:` metadata and so forth in the
+> golden files. If the actual content of the licenses has changed, you
+> will need to rerun the script from a Linux box to update the actual
+> LICENSE file, as described below.
+
+```sh
+cd flutter/ci/licenses_golden
+```
 
-IF (and only if!) the diff does not change _which_ licenses are being included, but only affects the `FILE:` metadata and so forth in the golden files, then you can click `Download full logs` (Github removes lines with only whitespaces, which invalidates the diff), copy this patch to a temporary patch file wherever you'd like, and then apply the patch to your repo:
+If the file is to `my/patch/file` locally. The `-p2` strips two path
+components from the file paths in the diff. Adjust as necessary.
 
-```
-cd flutter/ci/licenses_golden
+```sh
 patch -p2 < my/patch/file
 ```
 
-HOWEVER, if the actual content of the licenses changed then you will need to rerun the script from a Linux box to update the actual LICENSE file, as described below.
+If the patch file is copied in your clipboard. On Mac, you may apply the patch from there.
+
+```sh
+pbpaste | patch -p2
+```
+
+## Check for license changes
 
-## Check for license changes (Only works on Linux)
+> [!WARNING]
+> Only works on Linux.
 
 This script has two sets of output files: "goldens", which describe
 the current license state of the repository, and the actual real
@@ -30,7 +52,7 @@ latest upstream main and then run the following in this directory:
 dart pub get
 gclient sync -D
 rm -rf ../../../out/licenses
-dart lib/main.dart --src ../../.. --out ../../../out/licenses --golden ../../ci/licenses_golden
+dart --enable-asserts lib/main.dart --src ../../.. --out ../../../out/licenses --golden ../../ci/licenses_golden
 ```
 
 In order for the license script to work correctly, you need to remove
@@ -46,11 +68,12 @@ cp ../../../out/licenses/* ../../ci/licenses_golden
 git diff
 ```
 
-If the only changes are to what files are included, then you're good
-to go. However, if any of the _licenses_ changed, whether new licenses
-are added, old ones removed, or any have their content changed in
-_any_ way (including, e.g., whitespace changes), or if the affected
-libraries change, **you must update the actual license file**.
+> [!IMPORTANT]
+> If the only changes are to what files are included, then you're good
+> to go. However, if any of the _licenses_ changed, whether new licenses
+> are added, old ones removed, or any have their content changed in
+> _any_ way (including, e.g., whitespace changes), or if the affected
+> libraries change, **you must update the actual license file**.
 
 The `sky/packages/sky_engine/LICENSE` file is the one actually
 included in product releases and the one that should be updated any
@@ -59,11 +82,20 @@ anything other than the `FILE` lines. To update this file, run:
 
 ```
 dart pub get
-gclient sync
-dart lib/main.dart --release --src ../../.. --out ../../../out/licenses > ../../sky/packages/sky_engine/LICENSE
+gclient sync -D
+dart --enable-asserts lib/main.dart --release --src ../../.. > ../../sky/packages/sky_engine/LICENSE
 ```
 
 The bots do not verify that you did this step, it's important that you
 do it! When reviewing patches, if you see a change to the golden
 files, check to see if there's a corresponding change to the LICENSE
 file!
+
+## Testing
+
+To run the tests:
+
+```
+dart pub get
+find -name "*_test.dart" | xargs -n 1 dart --enable-asserts
+```
diff --git a/tools/licenses/data/ietf b/tools/licenses/data/ietf
new file mode 100644
index 0000000000000000000000000000000000000000..5f6366fbbbb672a16ef13d0eb37571a6d5c54525
--- /dev/null
+++ b/tools/licenses/data/ietf
@@ -0,0 +1,25 @@
+Copyright (C) The Internet Society (2002).  All Rights Reserved.
+
+This document and translations of it may be copied and furnished to
+others, and derivative works that comment on or otherwise explain it
+or assist in its implementation may be prepared, copied, published
+and distributed, in whole or in part, without restriction of any
+kind, provided that the above copyright notice and this paragraph are
+included on all such copies and derivative works.  However, this
+document itself may not be modified in any way, such as by removing
+the copyright notice or references to the Internet Society or other
+Internet organizations, except as needed for the purpose of
+developing Internet standards in which case the procedures for
+copyrights defined in the Internet Standards process must be
+followed, or as required to translate it into languages other than
+English.
+
+The limited permissions granted above are perpetual and will not be
+revoked by the Internet Society or its successors or assigns.
+
+This document and the information contained herein is provided on an
+"AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
+TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
+BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
+HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/tools/licenses/lib/README b/tools/licenses/lib/README
index 3699c766ce0cf48ad5b6670b1241708b2a1fd5a7..7874f4fa6f56d0e87d9a479a878f94263fc25199 100644
--- a/tools/licenses/lib/README
+++ b/tools/licenses/lib/README
@@ -35,7 +35,8 @@ licenses than strictly necessary), it tries to avoid including
 material that isn't actually used. To do this, RepositoryDirectory
 objects only crawl directories and files for which shouldRecurse
 returns true. For example, shouldRecurse returns false for ".git"
-files.
+files. To simplify the configuration of such rules, the default is to
+apply the rules in the paths.dart file.
 
 Some directories and files require special handling, and have specific
 subclasses of the above classes. To create the appropriate objects,
@@ -71,10 +72,23 @@ the Free Software Foundation is off by one, for no clear reason,
 leading to the pattern ending with "MA 0211[01]-1307, USA".
 
 
-The license.dart file also contains the License object, the currently
-simplistic normalizer (_reformat) for license text (which mostly just
-removes comment syntax), the code that attempts to determine what
-copyrights apply to which licenses, and the code that attempts to
-identify the licenses themselves (at a high level), to make sure that
-appropriate clauses are followed (e.g. including the copyright with a
-BSD notice).
+The license.dart file also contains the License object, the code that
+attempts to determine what copyrights apply to which licenses, and the
+code that attempts to identify the licenses themselves (at a high
+level), to make sure that appropriate clauses are followed (e.g.
+including the copyright with a BSD notice).
+
+
+In formatter.dart you will find the only part of this codebase that is
+actually tested at this time; this is the code that reformats blobs of
+text to remove comments and decorations and the like.
+
+
+The biggest problem with this script right now is that it is absurdly
+slow, largely because of the many, many applications of regular
+expressions in pattern.dart (especially the ones that use _linebreak).
+In regexp_debug.dart we have a wrapper around RegExp that attempts to
+quantify this cost, you can see the results if you run the script with
+`--verbose`. Long term, the right solution is to change from these
+all-in-one patterns to a world where we first tokenize each file, then
+apply word-by-word pattern matching to the tokenized input.
diff --git a/tools/licenses/lib/filesystem.dart b/tools/licenses/lib/filesystem.dart
index 206f7bb2ddef5a1cb43fc38c0101b5926ff2b7f0..071ad10b578db83294c255e998eff7cfe9683c1e 100644
--- a/tools/licenses/lib/filesystem.dart
+++ b/tools/licenses/lib/filesystem.dart
@@ -11,6 +11,7 @@ import 'package:path/path.dart' as path;
 
 import 'cache.dart';
 import 'limits.dart';
+import 'patterns.dart';
 
 enum FileType {
   binary, // won't have its own license block
@@ -20,14 +21,14 @@ enum FileType {
   tar, // should be parsed as an archive and drilled into
   gz, // should be parsed as a single compressed file and exposed
   bzip2, // should be parsed as a single compressed file and exposed
-  metadata, // can be skipped entirely (e.g. Mac OS X ._foo files)
+  notPartOfBuild, // can be skipped entirely (e.g. Mac OS X ._foo files, bash scripts)
 }
 
 typedef Reader = List<int> Function();
 
-class BytesOf extends Key { BytesOf(dynamic value) : super(value); }
-class UTF8Of extends Key { UTF8Of(dynamic value) : super(value); }
-class Latin1Of extends Key { Latin1Of(dynamic value) : super(value); }
+class BytesOf extends Key { BytesOf(super.value); }
+class UTF8Of extends Key { UTF8Of(super.value); }
+class Latin1Of extends Key { Latin1Of(super.value); }
 
 bool matchesSignature(List<int> bytes, List<int> signature) {
   if (bytes.length < signature.length) {
@@ -76,15 +77,20 @@ FileType identifyFile(String name, Reader reader) {
       (path.split(name).reversed.take(3).toList().reversed.join('/') == 'third_party/cares/cares.rc')) {
     return FileType.latin1Text;
   }
-  if (path.split(name).reversed.take(6).toList().reversed.join('/') == 'dart/runtime/tests/vm/dart/bad_snapshot' || // Not any particular format
-      path.split(name).reversed.take(8).toList().reversed.join('/') == 'third_party/android_tools/ndk/sources/cxx-stl/stlport/src/stlport.rc') {
+  if (path.split(name).reversed.take(6).toList().reversed.join('/') == 'dart/runtime/tests/vm/dart/bad_snapshot') { // Not any particular format
+    return FileType.binary;
+  }
+  if (path.split(name).reversed.take(9).toList().reversed.join('/') == 'fuchsia/sdk/linux/dart/zircon/lib/src/fakes/handle_disposition.dart' || // has bogus but benign "authors" reference, reported to jamesr@
+      path.split(name).reversed.take(6).toList().reversed.join('/') == 'third_party/angle/src/common/fuchsia_egl/fuchsia_egl.c' || // has bogus but benign "authors" reference, reported to author and legal team
+      path.split(name).reversed.take(6).toList().reversed.join('/') == 'third_party/angle/src/common/fuchsia_egl/fuchsia_egl.h' || // has bogus but benign "authors" reference, reported to author and legal team
+      path.split(name).reversed.take(6).toList().reversed.join('/') == 'third_party/angle/src/common/fuchsia_egl/fuchsia_egl_backend.h') { // has bogus but benign "authors" reference, reported to author and legal team
     return FileType.binary;
   }
   final String base = path.basename(name);
   if (base.startsWith('._')) {
     bytes ??= reader();
     if (matchesSignature(bytes, <int>[0x00, 0x05, 0x16, 0x07, 0x00, 0x02, 0x00, 0x00, 0x4d, 0x61, 0x63, 0x20, 0x4f, 0x53, 0x20, 0x58])) {
-      return FileType.metadata;
+      return FileType.notPartOfBuild;
     } // The ._* files in Mac OS X archives that gives icons and stuff
   }
   if (path.split(name).contains('cairo')) {
@@ -150,21 +156,22 @@ FileType identifyFile(String name, Reader reader) {
     case '.cc': return FileType.text;
     case '.cpp': return FileType.text;
     case '.inc': return FileType.text;
+    // Go code
+    case '.go': return FileType.text;
     // ObjectiveC code
     case '.m': return FileType.text;
     // Assembler
     case '.asm': return FileType.text;
     // Shell
-    case '.sh': return FileType.text;
-    case '.bat': return FileType.text;
+    case '.sh': return FileType.notPartOfBuild;
+    case '.bat': return FileType.notPartOfBuild;
     // Build files
-    case '.in': return FileType.text;
-    case '.ac': return FileType.text;
-    case '.am': return FileType.text;
-    case '.gn': return FileType.text;
-    case '.gni': return FileType.text;
-    case '.gyp': return FileType.text;
-    case '.gypi': return FileType.text;
+    case '.ac': return FileType.notPartOfBuild;
+    case '.am': return FileType.notPartOfBuild;
+    case '.gn': return FileType.notPartOfBuild;
+    case '.gni': return FileType.notPartOfBuild;
+    case '.gyp': return FileType.notPartOfBuild;
+    case '.gypi': return FileType.notPartOfBuild;
     // Java code
     case '.java': return FileType.text;
     case '.jar': return FileType.zip; // Java package
@@ -218,6 +225,7 @@ FileType identifyFile(String name, Reader reader) {
     case '.emf': return FileType.binary; // Windows enhanced metafile format
     case '.skp': return FileType.binary; // Skia picture format
     case '.mskp': return FileType.binary; // Skia picture format
+    case '.spv': return FileType.binary; // SPIR-V
     // Videos
     case '.ogg': return FileType.binary; // Ogg media
     case '.mp4': return FileType.binary; // MPEG media
@@ -332,9 +340,19 @@ FileType identifyFile(String name, Reader reader) {
   if (matchesSignature(bytes, <int>[0x58, 0x50, 0x43, 0x4f, 0x4d, 0x0a, 0x54, 0x79, 0x70, 0x65, 0x4c, 0x69, 0x62, 0x0d, 0x0a, 0x1a])) {
     return FileType.binary;
   } // XPCOM Type Library
+  if (matchesSignature(bytes, <int>[0x23, 0x21])) {
+    // #! indicates a shell script, those are not part of the build
+    return FileType.notPartOfBuild;
+  }
   return FileType.text;
 }
 
+String _normalize(String fileContents) {
+  fileContents = fileContents.replaceAll(newlinePattern, '\n');
+  fileContents = fileContents.replaceAll('\t', ' ' * 4);
+  return fileContents;
+}
+
 
 // INTERFACE
 
@@ -363,7 +381,7 @@ mixin UTF8TextFile implements TextFile {
   @override
   String readString() {
     try {
-      return cache(UTF8Of(this), () => utf8.decode(readBytes()!));
+      return cache(UTF8Of(this), () => _normalize(utf8.decode(readBytes()!)));
     } on FormatException {
       print(fullName);
       rethrow;
@@ -390,13 +408,14 @@ mixin Latin1TextFile implements TextFile {
       if (isUTF8) {
         throw '$fullName contains valid UTF-8 and is probably not actually encoded as Win1252';
       }
-      return latin1.decode(bytes);
+      return _normalize(latin1.decode(bytes));
     });
   }
 }
 
 // interface
 abstract class Directory extends IoNode {
+  // lists children (shallow walk, not deep walk)
   Iterable<IoNode> get walk;
 }
 
@@ -488,7 +507,7 @@ class FileSystemDirectory extends IoNode implements Directory {
   String get fullName => _directory.path;
 
   List<int> _readBytes(io.File file) {
-    return cache/*List<int>*/(BytesOf(file), () => file.readAsBytesSync());
+    return cache(BytesOf(file), () => file.readAsBytesSync());
   }
 
   @override
@@ -505,14 +524,14 @@ class FileSystemDirectory extends IoNode implements Directory {
         final io.File fileEntity = entity as io.File;
         if (fileEntity.lengthSync() > 0) {
           switch (identifyFile(fileEntity.path, () => _readBytes(fileEntity))) {
-            case FileType.binary: yield FileSystemFile(fileEntity); break;
-            case FileType.zip: yield FileSystemZipFile(fileEntity); break;
-            case FileType.tar: yield FileSystemTarFile(fileEntity); break;
-            case FileType.gz: yield FileSystemGZipFile(fileEntity); break;
-            case FileType.bzip2: yield FileSystemBZip2File(fileEntity); break;
-            case FileType.text: yield FileSystemUTF8TextFile(fileEntity); break;
-            case FileType.latin1Text: yield FileSystemLatin1TextFile(fileEntity); break;
-            case FileType.metadata: break; // ignore this file
+            case FileType.binary: yield FileSystemFile(fileEntity);
+            case FileType.zip: yield FileSystemZipFile(fileEntity);
+            case FileType.tar: yield FileSystemTarFile(fileEntity);
+            case FileType.gz: yield FileSystemGZipFile(fileEntity);
+            case FileType.bzip2: yield FileSystemBZip2File(fileEntity);
+            case FileType.text: yield FileSystemUTF8TextFile(fileEntity);
+            case FileType.latin1Text: yield FileSystemLatin1TextFile(fileEntity);
+            case FileType.notPartOfBuild: break; // ignore this file
           }
         }
       }
@@ -550,27 +569,27 @@ class FileSystemFile extends IoNode implements File {
 }
 
 class FileSystemUTF8TextFile extends FileSystemFile with UTF8TextFile {
-  FileSystemUTF8TextFile(io.File file) : super(file);
+  FileSystemUTF8TextFile(super.file);
 }
 
 class FileSystemLatin1TextFile extends FileSystemFile with Latin1TextFile {
-  FileSystemLatin1TextFile(io.File file) : super(file);
+  FileSystemLatin1TextFile(super.file);
 }
 
 class FileSystemZipFile extends FileSystemFile with ZipFile {
-  FileSystemZipFile(io.File file) : super(file);
+  FileSystemZipFile(super.file);
 }
 
 class FileSystemTarFile extends FileSystemFile with TarFile {
-  FileSystemTarFile(io.File file) : super(file);
+  FileSystemTarFile(super.file);
 }
 
 class FileSystemGZipFile extends FileSystemFile with GZipFile {
-  FileSystemGZipFile(io.File file) : super(file);
+  FileSystemGZipFile(super.file);
 }
 
 class FileSystemBZip2File extends FileSystemFile with BZip2File {
-  FileSystemBZip2File(io.File file) : super(file);
+  FileSystemBZip2File(super.file);
 }
 
 
@@ -599,14 +618,14 @@ class ArchiveDirectory extends IoNode implements Directory {
       if (entry.size > 0) {
         final String entryFullName = '$fullName/${path.basename(entry.name)}';
         switch (identifyFile(entry.name, () => entry.content as List<int>)) {
-          case FileType.binary: _files.add(ArchiveFile(entryFullName, entry)); break;
-          case FileType.zip: _files.add(ArchiveZipFile(entryFullName, entry)); break;
-          case FileType.tar: _files.add(ArchiveTarFile(entryFullName, entry)); break;
-          case FileType.gz: _files.add(ArchiveGZipFile(entryFullName, entry)); break;
-          case FileType.bzip2: _files.add(ArchiveBZip2File(entryFullName, entry)); break;
-          case FileType.text: _files.add(ArchiveUTF8TextFile(entryFullName, entry)); break;
-          case FileType.latin1Text: _files.add(ArchiveLatin1TextFile(entryFullName, entry)); break;
-          case FileType.metadata: break; // ignore this file
+          case FileType.binary: _files.add(ArchiveFile(entryFullName, entry));
+          case FileType.zip: _files.add(ArchiveZipFile(entryFullName, entry));
+          case FileType.tar: _files.add(ArchiveTarFile(entryFullName, entry));
+          case FileType.gz: _files.add(ArchiveGZipFile(entryFullName, entry));
+          case FileType.bzip2: _files.add(ArchiveBZip2File(entryFullName, entry));
+          case FileType.text: _files.add(ArchiveUTF8TextFile(entryFullName, entry));
+          case FileType.latin1Text: _files.add(ArchiveLatin1TextFile(entryFullName, entry));
+          case FileType.notPartOfBuild: break; // ignore this file
         }
       }
     }
@@ -647,27 +666,27 @@ class ArchiveFile extends IoNode implements File {
 }
 
 class ArchiveUTF8TextFile extends ArchiveFile with UTF8TextFile {
-  ArchiveUTF8TextFile(String fullName, a.ArchiveFile file) : super(fullName, file);
+  ArchiveUTF8TextFile(super.fullName, super.file);
 }
 
 class ArchiveLatin1TextFile extends ArchiveFile with Latin1TextFile {
-  ArchiveLatin1TextFile(String fullName, a.ArchiveFile file) : super(fullName, file);
+  ArchiveLatin1TextFile(super.fullName, super.file);
 }
 
 class ArchiveZipFile extends ArchiveFile with ZipFile {
-  ArchiveZipFile(String fullName, a.ArchiveFile file) : super(fullName, file);
+  ArchiveZipFile(super.fullName, super.file);
 }
 
 class ArchiveTarFile extends ArchiveFile with TarFile {
-  ArchiveTarFile(String fullName, a.ArchiveFile file) : super(fullName, file);
+  ArchiveTarFile(super.fullName, super.file);
 }
 
 class ArchiveGZipFile extends ArchiveFile with GZipFile {
-  ArchiveGZipFile(String fullName, a.ArchiveFile file) : super(fullName, file);
+  ArchiveGZipFile(super.fullName, super.file);
 }
 
 class ArchiveBZip2File extends ArchiveFile with BZip2File {
-  ArchiveBZip2File(String fullName, a.ArchiveFile file) : super(fullName, file);
+  ArchiveBZip2File(super.fullName, super.file);
 }
 
 
@@ -688,7 +707,7 @@ class InMemoryFile extends IoNode implements File {
       case FileType.bzip2: return InMemoryBZip2File(fullName, bytes);
       case FileType.text: return InMemoryUTF8TextFile(fullName, bytes);
       case FileType.latin1Text: return InMemoryLatin1TextFile(fullName, bytes);
-      case FileType.metadata: break; // ignore this file
+      case FileType.notPartOfBuild: break; // ignore this file
     }
     assert(false);
     return null;
@@ -707,25 +726,25 @@ class InMemoryFile extends IoNode implements File {
 }
 
 class InMemoryUTF8TextFile extends InMemoryFile with UTF8TextFile {
-  InMemoryUTF8TextFile(String fullName, List<int> file) : super(fullName, file);
+  InMemoryUTF8TextFile(super.fullName, super.file);
 }
 
 class InMemoryLatin1TextFile extends InMemoryFile with Latin1TextFile {
-  InMemoryLatin1TextFile(String fullName, List<int> file) : super(fullName, file);
+  InMemoryLatin1TextFile(super.fullName, super.file);
 }
 
 class InMemoryZipFile extends InMemoryFile with ZipFile {
-  InMemoryZipFile(String fullName, List<int> file) : super(fullName, file);
+  InMemoryZipFile(super.fullName, super.file);
 }
 
 class InMemoryTarFile extends InMemoryFile with TarFile {
-  InMemoryTarFile(String fullName, List<int> file) : super(fullName, file);
+  InMemoryTarFile(super.fullName, super.file);
 }
 
 class InMemoryGZipFile extends InMemoryFile with GZipFile {
-  InMemoryGZipFile(String fullName, List<int> file) : super(fullName, file);
+  InMemoryGZipFile(super.fullName, super.file);
 }
 
 class InMemoryBZip2File extends InMemoryFile with BZip2File {
-  InMemoryBZip2File(String fullName, List<int> file) : super(fullName, file);
+  InMemoryBZip2File(super.fullName, super.file);
 }
diff --git a/tools/licenses/lib/formatter.dart b/tools/licenses/lib/formatter.dart
new file mode 100644
index 0000000000000000000000000000000000000000..152755b450ca5bd93d3a59afb2c28f348f9afe25
--- /dev/null
+++ b/tools/licenses/lib/formatter.dart
@@ -0,0 +1,198 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:core' hide RegExp;
+
+import 'patterns.dart';
+
+void _stripFullLines(List<String> lines) {
+  // Strip full-line decorations, e.g. horizontal lines, and trailing whitespace.
+  for (int index = 0; index < lines.length; index += 1) {
+    lines[index] = lines[index].trimRight();
+    if (fullDecorations.matchAsPrefix(lines[index]) != null) {
+      if (index == 0 || lines[index].length != lines[index - 1].length) {
+        // (we leave the decorations if it's just underlining the previous line)
+        lines[index] = '';
+      }
+    }
+  }
+  // Remove leading and trailing blank lines
+  while (lines.isNotEmpty && lines.first == '') {
+    lines.removeAt(0);
+  }
+  while (lines.isNotEmpty && lines.last == '') {
+    lines.removeLast();
+  }
+}
+
+bool _stripIndentation(List<String> lines) {
+  // Try stripping leading indentation.
+  String? prefix;
+  bool removeTrailingBlockEnd = false;
+  if (lines.first.startsWith('/*') && lines.last.startsWith(' *')) {
+    // In addition to the leadingDecorations, we also support one specific
+    // kind of multiline decoration, the /*...*/ block comment.
+    prefix = ' *';
+    removeTrailingBlockEnd = true;
+  } else {
+    prefix = leadingDecorations.matchAsPrefix(lines.first)?.group(0);
+  }
+  if (prefix != null && lines.skip(1).every((String line) => line.startsWith(prefix!) || prefix.startsWith(line))) {
+    final int prefixLength = prefix.length;
+    for (int index = 0; index < lines.length; index += 1) {
+      final String line = lines[index];
+      if (line.length > prefixLength) {
+        lines[index] = line.substring(prefixLength);
+      } else {
+        lines[index] = '';
+      }
+    }
+    if (removeTrailingBlockEnd) {
+      if (lines.last == '/') {
+        // This removes the line with the trailing "*/" when we had a "/*" at the top.
+        lines.removeLast();
+      }
+    }
+    return true;
+  }
+  return false;
+}
+
+bool _unindentLeadingParagraphs(List<String> lines) {
+  // Try removing leading spaces
+  // (we know that this loop terminates before the end of the block because
+  // otherwise the previous section would have stripped a common prefix across
+  // the entire block)
+  //
+  // For example, this will change:
+  //
+  //     foo
+  //   bar
+  //
+  // ...into:
+  //
+  //   foo
+  //   bar
+  //
+  assert(' '.startsWith(leadingDecorations));
+  if (lines.first.startsWith(' ')) {
+    int lineCount = 0;
+    String line = lines.first;
+    int leadingBlockIndent = line.length; // arbitrarily big number
+    do {
+      int indentWidth = 1;
+      while (indentWidth < line.length && line[indentWidth] == ' ') {
+        indentWidth += 1;
+      }
+      if (indentWidth < leadingBlockIndent) {
+        leadingBlockIndent = indentWidth;
+      }
+      lineCount += 1;
+      assert(lineCount < lines.length);
+      line = lines[lineCount];
+    } while (line.startsWith(' '));
+    assert(leadingBlockIndent > 0);
+    for (int index = 0; index < lineCount; index += 1) {
+      lines[index] = lines[index].substring(leadingBlockIndent, lines[index].length);
+    }
+    return true;
+  }
+  return false;
+}
+
+bool _minorRemovals(List<String> lines) {
+  bool didEdits = false;
+  // Try removing stray leading spaces (but only one space).
+  for (int index = 0; index < lines.length; index += 1) {
+    if (lines[index].startsWith(' ') && !lines[index].startsWith('  ')) {
+      lines[index] = lines[index].substring(1, lines[index].length);
+      didEdits = true;
+    }
+  }
+  // Try stripping HTML leading and trailing block (<!--/-->) comment markers.
+  if (lines.first.contains('<!--') || lines.last.contains('-->')) {
+    lines.first = lines[0].replaceFirst('<!--', '');
+    lines.last = lines[0].replaceFirst('-->', '');
+    didEdits = true;
+  }
+  // Try stripping C-style leading block comment markers.
+  // We don't do this earlier because if it's a multiline block comment
+  // we want to be careful about stripping the trailing aligned "*/".
+  if (lines.first.startsWith('/*')) {
+    lines.first = lines.first.substring(2, lines.first.length);
+    didEdits = true;
+  }
+  // Try stripping trailing decorations (specifically, stray "*/"s).
+  for (int index = 0; index < lines.length; index += 1) {
+    if (lines[index].endsWith('*/')) {
+      lines[index] = lines[index].substring(0, lines[index].length - 2);
+      didEdits = true;
+    }
+  }
+  return didEdits;
+}
+
+/// This function takes a block of text potentially decorated with leading
+/// prefix indents, horizontal lines, C-style comment blocks, blank lines, etc,
+/// and removes all such incidental material leaving only the significant text.
+String reformat(String body) {
+  final List<String> lines = body.split('\n');
+  while (true) {
+    // The order of the following checks is important. If any test changes
+    // something that could affect an earlier test, then we should "continue" back
+    // to the top of the loop.
+    _stripFullLines(lines);
+    if (lines.isEmpty) {
+      // We've stripped everything, give up.
+      return '';
+    }
+    if (_stripIndentation(lines)) {
+      continue; // Go back to top since we may have more blank lines to strip now.
+    }
+    if (_unindentLeadingParagraphs(lines)) {
+      continue; // Go back to the top since we may have more indentation to strip now.
+    }
+    if (_minorRemovals(lines)) {
+      continue; // Go back to the top since we may have new stuff to strip.
+    }
+    // If we get here, we could not find anything else to do to the text to clean it up.
+    break;
+  }
+  return lines.join('\n');
+}
+
+String stripAsciiArt(String input) {
+  // Look for images so that we can remove them.
+  final List<String> lines = input.split('\n');
+  for (final List<String> image in asciiArtImages) {
+    assert(image.isNotEmpty);
+    // Look for the image starting on each line.
+    search: for (int index = 0; index < lines.length - image.length; index += 1) {
+      final int x = lines[index].indexOf(image[0]);
+      if (x >= 0) {
+        int width = image[0].length;
+        // Found the first line, check to see if we have a complete image.
+        for (int imageLine = 1; imageLine < image.length; imageLine += 1) {
+          if (lines[index + imageLine].indexOf(image[imageLine]) != x) {
+            continue search; // Not a complete image.
+          }
+          if (image[imageLine].length > width) {
+            width = image[imageLine].length;
+          }
+        }
+        // Now remove the image.
+        for (int imageLine = 0; imageLine < image.length; imageLine += 1) {
+          final String text = lines[index + imageLine];
+          assert(text.length > x);
+          if (text.length >= x + width) {
+            lines[index + imageLine] = text.substring(0, x) + text.substring(x + width, text.length);
+          } else {
+            lines[index + imageLine] = text.substring(0, x);
+          }
+        }
+      }
+    }
+  }
+  return lines.join('\n');
+}
diff --git a/tools/licenses/lib/licenses.dart b/tools/licenses/lib/licenses.dart
index 34440e4426ba6962e4e0a7b01b7b9cefc3b29d94..5092b1a7e5af119262c9a51d1ad0a43762034453 100644
--- a/tools/licenses/lib/licenses.dart
+++ b/tools/licenses/lib/licenses.dart
@@ -3,77 +3,111 @@
 // found in the LICENSE file.
 
 import 'dart:convert';
+import 'dart:core' hide RegExp;
 import 'dart:io' as system;
 
 import 'cache.dart';
+import 'formatter.dart';
 import 'limits.dart';
 import 'patterns.dart';
-
-class FetchedContentsOf extends Key { FetchedContentsOf(dynamic value) : super(value); }
-
-enum LicenseType { unknown, bsd, gpl, lgpl, mpl, afl, mit, freetype, apache, apacheNotice, eclipse, ijg, zlib, icu, apsl, libpng, openssl, vulkan, bison }
+import 'regexp_debug.dart';
+
+class FetchedContentsOf extends Key { FetchedContentsOf(super.value); }
+
+enum LicenseType {
+  afl,
+  apache,
+  apacheNotice,
+  apsl,
+  bison,
+  bsd,
+  eclipse,
+  freetype,
+  gpl,
+  icu,
+  defaultTemplate, // metatype: a license that applies to a file without an internal license; only used when searching for a license
+  ietf,
+  ijg,
+  lgpl,
+  libpng,
+  llvm,
+  mit,
+  mpl,
+  openssl,
+  unicode,
+  unknown,
+  vulkan,
+  zlib,
+}
 
 LicenseType convertLicenseNameToType(String? name) {
-  switch (name?.toLowerCase()) {
-    case 'apache':
-    case 'apache-license-2.0':
-    case 'license-apache-2.0.txt':
-    case 'apache-2.0.txt':
-    case 'license.vulkan':
+  switch (name) {
+    case 'Apache':
+    case 'Apache-2.0.txt':
+    case 'LICENSE-APACHE-2.0.txt':
+    case 'LICENSE.vulkan':
+    case 'APACHE-LICENSE-2.0':
       return LicenseType.apache;
-    case 'bsd':
-    case 'bsd.txt':
-    case 'bsd-3-clause.txt':
+    case 'BSD':
+    case 'BSD-3-Clause.txt':
+    case 'BSD.txt':
       return LicenseType.bsd;
-    case 'license-lgpl-2':
-    case 'license-lgpl-2.1':
-    case 'copying-lgpl-2.1':
+    case 'COPYING-LGPL-2.1':
+    case 'LICENSE-LGPL-2':
+    case 'LICENSE-LGPL-2.1':
       return LicenseType.lgpl;
-    case 'copying-gpl-3':
-    case 'gpl-3.0-only.txt':
+    case 'COPYING-GPL-3':
+    case 'GPL-3.0-only.txt':
+    case 'GPLv2.TXT':
       return LicenseType.gpl;
-    case 'ftl.txt':
+    case 'FTL.TXT':
       return LicenseType.freetype;
     case 'zlib.h':
       return LicenseType.zlib;
     case 'png.h':
       return LicenseType.libpng;
-    case 'icu':
+    case 'ICU':
       return LicenseType.icu;
-    case 'apple public source license':
+    case 'Apple Public Source License':
       return LicenseType.apsl;
-    case 'openssl':
+    case 'OpenSSL':
       return LicenseType.openssl;
-    case 'license.mplv2':
-    case 'copying-mpl-1.1':
+    case 'COPYING-MPL-1.1':
+    case 'LICENSE.MPLv2':
+    case 'http://mozilla.org/MPL/2.0/':
       return LicenseType.mpl;
-    case 'copyright.vulkan':
+    case 'COPYRIGHT.vulkan':
       return LicenseType.vulkan;
-    case 'license.mit':
-    case 'mit.txt':
+    case 'LICENSE.MIT':
+    case 'MIT':
+    case 'MIT.txt':
       return LicenseType.mit;
-    // common file names that don't say what the type is
-    case 'copying':
-    case 'copying.txt':
-    case 'copying.lib': // lgpl usually
-    case 'copying.runtime': // gcc exception usually
-    case 'license':
-    case 'license.md':
-    case 'license.html':
-    case 'license.txt':
-    case 'license.cssmin':
-    case 'notice':
-    case 'notice.txt':
+    // file names that don't say what the type is
+    case 'COPYING':
+    case 'COPYING.LIB': // lgpl usually
+    case 'COPYING.RUNTIME': // gcc exception usually
+    case 'COPYING.txt':
+    case 'COPYRIGHT.musl':
+    case 'Copyright':
+    case 'LICENSE':
+    case 'LICENSE-APPLE':
+    case 'LICENSE.TXT':
+    case 'LICENSE.cssmin':
+    case 'LICENSE.md':
+    case 'LICENSE.rst':
+    case 'LICENSE.txt':
+    case 'License.txt':
+    case 'NOTICE':
+    case 'NOTICE.txt':
     case 'copyright':
-      return LicenseType.unknown;
-    // particularly weird file names
-    case 'copyright.musl':
-    case 'license-apple':
+    case 'extreme.indiana.edu.license.TXT':
     case 'extreme.indiana.edu.license.txt':
+    case 'javolution.license.TXT':
     case 'javolution.license.txt':
     case 'libyaml-license.txt':
+    case 'license.html':
     case 'license.patch':
-    case 'license.rst':
+    case 'license.txt':
     case 'mh-bsd-gcc':
     case 'pivotal.labs.license.txt':
       return LicenseType.unknown;
@@ -82,6 +116,9 @@ LicenseType convertLicenseNameToType(String? name) {
 }
 
 LicenseType convertBodyToType(String body) {
+  if (body.startsWith(lrApache) && body.contains(lrLLVM)) {
+    return LicenseType.llvm;
+  }
   if (body.startsWith(lrApache)) {
     return LicenseType.apache;
   }
@@ -115,22 +152,92 @@ LicenseType convertBodyToType(String body) {
   return LicenseType.unknown;
 }
 
+// API exposed by the classes in main.dart
 abstract class LicenseSource {
+  String get name;
+  String get libraryName;
+  String get officialSourceLocation;
   List<License>? nearestLicensesFor(String name);
   License? nearestLicenseOfType(LicenseType type);
   License? nearestLicenseWithName(String name, { String? authors });
 }
 
-abstract class License implements Comparable<License> {
+// Represents a license/file pairing, with metadata saying where the license came from.
+class Assignment {
+  const Assignment(this.license, this.target, this.source);
+  final License license;
+  final String target;
+  final LicenseSource source;
+}
+
+// Represents a group of files assigned to the same license, so that we can avoid
+// duplicating licenses in the output.
+class GroupedLicense {
+  GroupedLicense(this.type, this.body);
+  final LicenseType type;
+  final String body;
+
+  // The names of files to which this license applies.
+  final Set<String> targets = <String>{};
+
+  // The libraries from which those files originate.
+  final Set<String> libraries = <String>{};
+
+  // How we determined the license applied to these files.
+  final Set<String> origins = <String>{};
+
+  String toStringDebug() {
+    final StringBuffer result = StringBuffer();
+    result.writeln('=' * 100);
+    (libraries.map((String s) => 'LIBRARY: $s').toList()..sort()).forEach(result.writeln);
+    (origins.map((String s) => 'ORIGIN: $s').toList()..sort()).forEach(result.writeln);
+    result.writeln('TYPE: $type');
+    (targets.map((String s) => 'FILE: $s').toList()..sort()).forEach(result.writeln);
+    result.writeln('-' * 100);
+    if (body.isEmpty) {
+      result.writeln('<THIS BLOCK INTENTIONALLY LEFT BLANK>');
+    } else {
+      result.writeln(body);
+    }
+    result.writeln('=' * 100);
+    return result.toString();
+  }
+
+  String toStringFormal() {
+    final StringBuffer result = StringBuffer();
+    (libraries.toList()..sort()).forEach(result.writeln);
+    result.writeln();
+    assert(body.isNotEmpty);
+    result.write(body);
+    return result.toString();
+  }
+}
+
+List<GroupedLicense> groupLicenses(Iterable<Assignment> assignments) {
+  final Map<String, GroupedLicense> groups = <String, GroupedLicense>{};
+  for (final Assignment assignment in assignments) {
+    final String body = assignment.license.toStringBody(assignment.source);
+    final GroupedLicense entry = groups.putIfAbsent(body, () => GroupedLicense(assignment.license.type, body));
+    entry.targets.add(assignment.target);
+    entry.libraries.add(assignment.source.libraryName);
+    entry.origins.add(assignment.license.origin);
+  }
+  final List<GroupedLicense> results = groups.values.toList();
+  results.sort((GroupedLicense a, GroupedLicense b) => a.body.compareTo(b.body));
+  return results;
+}
+
+abstract class License {
   factory License.unique(String body, LicenseType type, {
     bool reformatted = false,
-    String? origin,
+    required String origin,
+    String? authors,
     bool yesWeKnowWhatItLooksLikeButItIsNot = false
   }) {
     if (!reformatted) {
-      body = _reformat(body);
+      body = reformat(body);
     }
-    final License result = _registry.putIfAbsent(body, () => UniqueLicense._(body, type, origin: origin, yesWeKnowWhatItLooksLikeButItIsNot: yesWeKnowWhatItLooksLikeButItIsNot));
+    final License result = UniqueLicense._(body, type, origin: origin, yesWeKnowWhatItLooksLikeButItIsNot: yesWeKnowWhatItLooksLikeButItIsNot, authors: authors);
     assert(() {
       if (result is! UniqueLicense || result.type != type) {
         throw 'tried to add a UniqueLicense $type, but it was a duplicate of a ${result.runtimeType} ${result.type}';
@@ -142,12 +249,13 @@ abstract class License implements Comparable<License> {
 
   factory License.template(String body, LicenseType type, {
     bool reformatted = false,
-    String? origin
+    required String origin,
+    String? authors,
   }) {
     if (!reformatted) {
-      body = _reformat(body);
+      body = reformat(body);
     }
-    final License result = _registry.putIfAbsent(body, () => TemplateLicense._(body, type, origin: origin));
+    final License result = TemplateLicense._autosplit(body, type, origin: origin, authors: authors);
     assert(() {
       if (result is! TemplateLicense || result.type != type) {
         throw 'tried to add a TemplateLicense $type, but it was a duplicate of a ${result.runtimeType} ${result.type}';
@@ -157,14 +265,32 @@ abstract class License implements Comparable<License> {
     return result;
   }
 
+  factory License.multiLicense(String body, LicenseType type, {
+    bool reformatted = false,
+    String? authors,
+    required String origin
+  }) {
+    if (!reformatted) {
+      body = reformat(body);
+    }
+    final License result = MultiLicense._(body, type, origin: origin, authors: authors);
+    assert(() {
+      if (result is! MultiLicense || result.type != type) {
+        throw 'tried to add a MultiLicense $type, but it was a duplicate of a ${result.runtimeType} ${result.type}';
+      }
+      return true;
+    }());
+    return result;
+  }
+
   factory License.message(String body, LicenseType type, {
     bool reformatted = false,
-    String? origin
+    required String origin
   }) {
     if (!reformatted) {
-      body = _reformat(body);
+      body = reformat(body);
     }
-    final License result = _registry.putIfAbsent(body, () => MessageLicense._(body, type, origin: origin));
+    final License result = MessageLicense._(body, type, origin: origin);
     assert(() {
       if (result is! MessageLicense || result.type != type) {
         throw 'tried to add a MessageLicense $type, but it was a duplicate of a ${result.runtimeType} ${result.type}';
@@ -174,8 +300,8 @@ abstract class License implements Comparable<License> {
     return result;
   }
 
-  factory License.blank(String body, LicenseType type, { String? origin }) {
-    final License result = _registry.putIfAbsent(body, () => BlankLicense._(_reformat(body), type, origin: origin));
+  factory License.blank(String body, LicenseType type, { required String origin }) {
+    final License result = BlankLicense._(reformat(body), type, origin: origin);
     assert(() {
       if (result is! BlankLicense || result.type != type) {
         throw 'tried to add a BlankLicense $type, but it was a duplicate of a ${result.runtimeType} ${result.type}';
@@ -185,194 +311,213 @@ abstract class License implements Comparable<License> {
     return result;
   }
 
-  factory License.fromMultipleBlocks(List<String> bodies, LicenseType type) {
-    final String body = bodies.map((String s) => _reformat(s)).join('\n\n');
-    return _registry.putIfAbsent(body, () => UniqueLicense._(body, type));
+  factory License.mozilla(String body, { required String origin }) {
+    body = reformat(body);
+    final License result = MozillaLicense._(body, LicenseType.mpl, origin: origin);
+    assert(() {
+      if (result is! MozillaLicense) {
+        throw 'tried to add a MozillaLicense, but it was a duplicate of a ${result.runtimeType} ${result.type}';
+      }
+      return true;
+    }());
+    return result;
+  }
+
+  factory License.fromMultipleBlocks(List<String> bodies, LicenseType type, {
+    String? authors,
+    required String origin,
+    bool yesWeKnowWhatItLooksLikeButItIsNot = false,
+  }) {
+    final String body = bodies.map((String s) => reformat(s)).join('\n\n');
+    return MultiLicense._(body, type, authors: authors, origin: origin, yesWeKnowWhatItLooksLikeButItIsNot: yesWeKnowWhatItLooksLikeButItIsNot);
   }
 
   factory License.fromBodyAndType(String body, LicenseType type, {
     bool reformatted = false,
-    String? origin
+    required String origin
   }) {
     if (!reformatted) {
-      body = _reformat(body);
+      body = reformat(body);
+    }
+    final License result;
+    switch (type) {
+      case LicenseType.bsd:
+      case LicenseType.mit:
+        result = TemplateLicense._autosplit(body, type, origin: origin);
+      case LicenseType.apache:
+      case LicenseType.freetype:
+      case LicenseType.ijg:
+      case LicenseType.ietf:
+      case LicenseType.libpng:
+      case LicenseType.llvm: // The LLVM license is an Apache variant
+      case LicenseType.unicode:
+      case LicenseType.unknown:
+      case LicenseType.vulkan:
+      case LicenseType.zlib:
+        result = MessageLicense._(body, type, origin: origin);
+      case LicenseType.apacheNotice:
+        result = UniqueLicense._(body, type, origin: origin);
+      case LicenseType.mpl:
+        result = MozillaLicense._(body, type, origin: origin);
+      // The exception in the license of Bison allows redistributing larger
+      // works "under terms of your choice"; we choose terms that don't require
+      // any notice in the binary distribution.
+      case LicenseType.bison:
+        result = BlankLicense._(body, type, origin: origin);
+      case LicenseType.icu:
+      case LicenseType.openssl:
+        throw 'Use License.fromMultipleBlocks rather than License.fromBodyAndType for the ICU and OpenSSL licenses.';
+      case LicenseType.afl:
+      case LicenseType.apsl:
+      case LicenseType.eclipse:
+      case LicenseType.gpl:
+      case LicenseType.lgpl:
+        result = DisallowedLicense._(body, type, origin: origin);
+      case LicenseType.defaultTemplate:
+        throw 'should not be creating a LicenseType.defaultTemplate license, it is not a real type';
     }
-    final License result = _registry.putIfAbsent(body, () {
-      assert(type != null);
-      switch (type) {
-        case LicenseType.bsd:
-        case LicenseType.mit:
-        case LicenseType.zlib:
-        case LicenseType.icu:
-          return TemplateLicense._(body, type, origin: origin);
-        case LicenseType.unknown:
-        case LicenseType.apacheNotice:
-          return UniqueLicense._(body, type, origin: origin);
-        case LicenseType.afl:
-        case LicenseType.mpl:
-        case LicenseType.gpl:
-        case LicenseType.lgpl:
-        case LicenseType.freetype:
-        case LicenseType.apache:
-        case LicenseType.eclipse:
-        case LicenseType.ijg:
-        case LicenseType.apsl:
-          return MessageLicense._(body, type, origin: origin);
-        case LicenseType.vulkan:
-        case LicenseType.openssl:
-          return MultiLicense._(body, type, origin: origin);
-        case LicenseType.libpng:
-          return BlankLicense._(body, type, origin: origin);
-        // The exception in the license of Bison allows redistributing larger
-        // works "under terms of your choice"; we choose terms that don't require
-        // any notice in the binary distribution.
-        case LicenseType.bison:
-          return BlankLicense._(body, type, origin: origin);
-      }
-    });
     assert(result.type == type);
     return result;
   }
 
-  factory License.fromBodyAndName(String body, String name, { String? origin }) {
-    body = _reformat(body);
+  factory License.fromBodyAndName(String body, String name, { required String origin }) {
+    body = reformat(body);
     LicenseType type = convertLicenseNameToType(name);
     if (type == LicenseType.unknown) {
       type = convertBodyToType(body);
     }
-    return License.fromBodyAndType(body, type, origin: origin);
+    return License.fromBodyAndType(body, type, reformatted: true, origin: origin);
   }
 
-  factory License.fromBody(String body, { String? origin }) {
-    body = _reformat(body);
+  factory License.fromBody(String body, { required String origin, bool reformatted = false }) {
+    if (!reformatted) {
+      body = reformat(body);
+    }
     final LicenseType type = convertBodyToType(body);
     return License.fromBodyAndType(body, type, reformatted: true, origin: origin);
   }
 
-  factory License.fromCopyrightAndLicense(String copyright, String? template, LicenseType type, { String? origin }) {
-    final String body = '$copyright\n\n$template';
-    return _registry.putIfAbsent(body, () => TemplateLicense._(body, type, origin: origin));
+  factory License.fromCopyrightAndLicense(String copyright, String template, LicenseType type, { required String origin }) {
+    copyright = reformat(copyright);
+    template = reformat(template);
+    return TemplateLicense._(copyright, template, type, origin: origin);
   }
 
-  factory License.fromUrl(String url, { String? origin }) {
+  factory License.fromIdentifyingReference(String identifyingReference, { required String referencer }) {
     String body;
     LicenseType type = LicenseType.unknown;
-    switch (url) {
-      case 'Apache:2.0':
+    switch (identifyingReference) {
+      case 'Apache-2.0 OR MIT':  // SPDX ID
       case 'Apache-2.0':  // SPDX ID
+      case 'Apache:2.0':
       case 'http://www.apache.org/licenses/LICENSE-2.0':
       case 'https://www.apache.org/licenses/LICENSE-2.0':
-      // If we start seeing more OR options, we can parse them out and write
-      // a generic utility to pick according so some ranking; for now just
-      // hard-code a choice for this option set.
-      case 'Apache-2.0 OR MIT':  // SPDX ID
+        // If you're wondering why Abseil has what appears to be a duplicate copy of
+        // the Apache license, it's because of this:
+        // https://github.com/abseil/abseil-cpp/pull/270/files#r793181143
         body = system.File('data/apache-license-2.0').readAsStringSync();
         type = LicenseType.apache;
-        break;
       case 'Apache-2.0 WITH LLVM-exception':  // SPDX ID
+      case 'https://llvm.org/LICENSE.txt':
         body = system.File('data/apache-license-2.0-with-llvm-exception').readAsStringSync();
-        type = LicenseType.apache;
-        break;
+        type = LicenseType.llvm;
       case 'https://developers.google.com/open-source/licenses/bsd':
         body = system.File('data/google-bsd').readAsStringSync();
         type = LicenseType.bsd;
-        break;
       case 'http://polymer.github.io/LICENSE.txt':
         body = system.File('data/polymer-bsd').readAsStringSync();
         type = LicenseType.bsd;
-        break;
       case 'http://www.eclipse.org/legal/epl-v10.html':
         body = system.File('data/eclipse-1.0').readAsStringSync();
         type = LicenseType.eclipse;
-        break;
       case 'COPYING3:3':
         body = system.File('data/gpl-3.0').readAsStringSync();
         type = LicenseType.gpl;
-        break;
       case 'COPYING.LIB:2':
       case 'COPYING.LIother.m_:2': // blame hyatt
         body = system.File('data/library-gpl-2.0').readAsStringSync();
         type = LicenseType.lgpl;
-        break;
       case 'GNU Lesser:2':
         // there has never been such a license, but the authors said they meant the LGPL2.1
       case 'GNU Lesser:2.1':
         body = system.File('data/lesser-gpl-2.1').readAsStringSync();
         type = LicenseType.lgpl;
-        break;
       case 'COPYING.RUNTIME:3.1':
       case 'GCC Runtime Library Exception:3.1':
         body = system.File('data/gpl-gcc-exception-3.1').readAsStringSync();
-        break;
       case 'Academic Free License:3.0':
         body = system.File('data/academic-3.0').readAsStringSync();
         type = LicenseType.afl;
-        break;
       case 'Mozilla Public License:1.1':
         body = system.File('data/mozilla-1.1').readAsStringSync();
         type = LicenseType.mpl;
-        break;
       case 'http://mozilla.org/MPL/2.0/:2.0':
         body = system.File('data/mozilla-2.0').readAsStringSync();
         type = LicenseType.mpl;
-        break;
       case 'MIT':  // SPDX ID
+      case 'http://opensource->org/licenses/MIT': // i don't even
       case 'http://opensource.org/licenses/MIT':
       case 'https://opensource.org/licenses/MIT':
-      case 'http://opensource->org/licenses/MIT': // i don't even
         body = system.File('data/mit').readAsStringSync();
         type = LicenseType.mit;
-        break;
       case 'Unicode-DFS-2016': // SPDX ID
-      case 'https://www.unicode.org/copyright.html':
+      case 'http://unicode.org/copyright.html#Exhibit1':
+      case 'http://www.unicode.org/copyright.html#License':
       case 'http://www.unicode.org/copyright.html':
+      case 'http://www.unicode.org/terms_of_use.html': // redirects to copyright.html
+      case 'https://www.unicode.org/copyright.html':
+      case 'https://www.unicode.org/terms_of_use.html': // redirects to copyright.html
         body = system.File('data/unicode').readAsStringSync();
-        type = LicenseType.icu;
-        break;
-      default: throw 'unknown url $url';
+        type = LicenseType.unicode;
+      case 'http://www.ietf.org/rfc/rfc3454.txt':
+        body = system.File('data/ietf').readAsStringSync();
+        type = LicenseType.ietf;
+      default: throw 'unknown identifyingReference $identifyingReference';
     }
-    return _registry.putIfAbsent(body, () => License.fromBodyAndType(body, type, origin: origin));
+    return License.fromBodyAndType(body, type, origin: '$identifyingReference referenced by $referencer');
   }
 
-  License._(this.body, this.type, {
-    this.origin,
+  License._(String body, this.type, {
+    required this.origin,
+    String? authors,
     bool yesWeKnowWhatItLooksLikeButItIsNot = false
-  }) : authors = _readAuthors(body),
-       assert(_reformat(body) == body) {
+  }) : authors = authors ?? _readAuthors(body) {
     assert(() {
       try {
         switch (type) {
-          case LicenseType.bsd:
-          case LicenseType.mit:
-          case LicenseType.zlib:
-          case LicenseType.icu:
-            assert(this is TemplateLicense);
-            break;
-          case LicenseType.unknown:
-            assert(this is UniqueLicense || this is BlankLicense);
-            break;
-          case LicenseType.apacheNotice:
-            assert(this is UniqueLicense);
-            break;
           case LicenseType.afl:
-          case LicenseType.mpl:
+          case LicenseType.apsl:
+          case LicenseType.eclipse:
           case LicenseType.gpl:
           case LicenseType.lgpl:
-          case LicenseType.freetype:
+            // We do not want this kind of license in our build.
+            assert(this is DisallowedLicense);
           case LicenseType.apache:
-          case LicenseType.eclipse:
+          case LicenseType.freetype:
           case LicenseType.ijg:
-          case LicenseType.apsl:
-            assert(this is MessageLicense);
-            break;
+          case LicenseType.ietf:
           case LicenseType.libpng:
+          case LicenseType.llvm:
+          case LicenseType.unicode:
+          case LicenseType.vulkan:
+          case LicenseType.zlib:
+            assert(this is MessageLicense);
+          case LicenseType.apacheNotice:
+            assert(this is UniqueLicense);
           case LicenseType.bison:
             assert(this is BlankLicense);
-            break;
+          case LicenseType.bsd:
+          case LicenseType.mit:
+            assert(this is TemplateLicense);
+          case LicenseType.icu:
           case LicenseType.openssl:
-          case LicenseType.vulkan:
             assert(this is MultiLicense);
-            break;
+          case LicenseType.mpl:
+            assert(this is MozillaLicense);
+          case LicenseType.unknown:
+            assert(this is MessageLicense || this is UniqueLicense);
+          case LicenseType.defaultTemplate:
+            assert(false, 'should not be creating LicenseType.defaultTemplate license');
         }
       } on AssertionError {
         throw 'incorrectly created a $runtimeType for a $type';
@@ -380,25 +525,18 @@ abstract class License implements Comparable<License> {
       return true;
     }());
     final LicenseType detectedType = convertBodyToType(body);
-
-    // Fuchsia SDK Vulkan license is Apache 2.0 with some additional BSD-matching copyrights.
-    if (type == LicenseType.vulkan) {
-      yesWeKnowWhatItLooksLikeButItIsNot = true;
+    if (detectedType != LicenseType.unknown && detectedType != type && !yesWeKnowWhatItLooksLikeButItIsNot) {
+      throw 'Created a license of type $type but it looks like $detectedType:\n---------\n$body\n-----------';
+    }
+    if (type != LicenseType.apache && type != LicenseType.llvm && type != LicenseType.vulkan && type != LicenseType.apacheNotice && body.contains('Apache')) {
+      throw 'Non-Apache license (type=$type, detectedType=$detectedType) contains the word "Apache"; maybe it\'s a notice?:\n---\n$body\n---';
     }
-
     if (detectedType != LicenseType.unknown && detectedType != type && !yesWeKnowWhatItLooksLikeButItIsNot) {
       throw 'Created a license of type $type but it looks like $detectedType.';
     }
-    if (type != LicenseType.apache && type != LicenseType.apacheNotice) {
-      if (!yesWeKnowWhatItLooksLikeButItIsNot && body.contains('Apache')) {
-        throw 'Non-Apache license (type=$type, detectedType=$detectedType) contains the word "Apache"; maybe it\'s a notice?:\n---\n$body\n---';
-      }
-    }
     if (body.contains(trailingColon)) {
       throw 'incomplete license detected:\n---\n$body\n---';
     }
-    // if (type == LicenseType.unknown)
-    //   print('need detector for:\n----\n$body\n----');
     bool isUTF8 = true;
     late List<int> latin1Encoded;
     try {
@@ -424,51 +562,24 @@ abstract class License implements Comparable<License> {
     }
   }
 
-  final String body;
   final String? authors;
-  final String? origin;
+  final String origin;
   final LicenseType type;
 
-  final Set<String> _licensees = <String>{};
-  final Set<String> _libraries = <String>{};
-
-  bool get isUsed => _licensees.isNotEmpty;
-
-  void markUsed(String filename, String libraryName) {
-    assert(filename != null);
-    assert(filename != '');
-    assert(libraryName != null);
-    assert(libraryName != '');
-    _licensees.add(filename);
-    _libraries.add(libraryName);
+  Assignment assignLicenses(String target, LicenseSource source) {
+    return Assignment(this, target, source);
   }
 
-  Iterable<License> expandTemplate(String copyright, String licenseBody, { String? origin });
-
-  @override
-  int compareTo(License other) => toString().compareTo(other.toString());
-
-  @override
-  String toString() {
-    final List<String> prefixes = _libraries.toList();
-    prefixes.sort();
-    final List<String> licensees = _licensees.toList();
-    licensees.sort();
-    final List<String> header = <String>[];
-    header.addAll(prefixes.map((String s) => 'LIBRARY: $s'));
-    header.add('ORIGIN: $origin');
-    header.add('TYPE: $type');
-    header.addAll(licensees.map((String s) => 'FILE: $s'));
-    return '${'=' * 100}\n${header.join('\n')}\n${'-' * 100}\n${toStringBody()}\n${'=' * 100}';
-  }
+  // This takes a second license, which has been pre-split into copyright and
+  // licenseBody, and uses this license to expand it into a new license. How
+  // this works depends on this license; for example BSD licenses typically take
+  // their body and put on the given copyright, (and the licenseBody argument
+  // here in those cases is usually a reference to that license); some other
+  // licenses turn into two, one for the original license and one for this
+  // copyright/body pair.
+  Iterable<License> _expandTemplate(String copyright, String licenseBody, { required String origin });
 
-  String toStringBody() => body;
-
-  String? toStringFormal() {
-    final List<String> prefixes = _libraries.toList();
-    prefixes.sort();
-    return '${prefixes.join('\n')}\n\n$body';
-  }
+  String toStringBody(LicenseSource source);
 
   static final RegExp _copyrightForAuthors = RegExp(
     r'Copyright [-0-9 ,(cC)©]+\b(The .+ Authors)\.',
@@ -481,75 +592,13 @@ abstract class License implements Comparable<License> {
       return null;
     }
     if (matches.length > 1) {
-      throw 'found too many authors for this copyright:\n$body';
+      throw 'found too many authors for this copyright:\n$body\n\n${StackTrace.current}\n\n';
     }
     return matches[0].group(1);
   }
-}
-
-
-final Map<String, License> _registry = <String, License>{};
-
-void clearLicenseRegistry() {
-  _registry.clear();
-}
-
-final License missingLicense = UniqueLicense._('<missing>', LicenseType.unknown);
 
-String _reformat(String body) {
-  // TODO(ianh): ensure that we're stripping the same amount of leading text on each line
-  final List<String> lines = body.split('\n');
-  while (lines.isNotEmpty && lines.first == '') {
-    lines.removeAt(0);
-  }
-  while (lines.isNotEmpty && lines.last == '') {
-    lines.removeLast();
-  }
-  if (lines.length > 2) {
-    if (lines[0].startsWith(beginLicenseBlock) && lines.last.startsWith(endLicenseBlock)) {
-      lines.removeAt(0);
-      lines.removeLast();
-    }
-  } else if (lines.isEmpty) {
-    return '';
-  }
-  final List<String?> output = <String?>[];
-  int? lastGood;
-  String? previousPrefix;
-  bool lastWasEmpty = true;
-  for (final String line in lines) {
-    final Match match = stripDecorations.firstMatch(line)!;
-    final String? prefix = match.group(1);
-    String? s = match.group(2);
-    if (!lastWasEmpty || s != '') {
-      if (s != '') {
-        if (previousPrefix != null) {
-          if (previousPrefix.length > prefix!.length) {
-            // TODO(ianh): Spot check files that hit this. At least one just
-            // has a corrupt license block, which is why this is commented out.
-            //if (previousPrefix.substring(prefix.length).contains(nonSpace))
-            //  throw 'inconsistent line prefix: was "$previousPrefix", now "$prefix"\nfull body was:\n---8<---\n$body\n---8<---';
-            previousPrefix = prefix;
-          } else if (previousPrefix.length < prefix.length) {
-            s = '${prefix.substring(previousPrefix.length)}$s';
-          }
-        } else {
-          previousPrefix = prefix;
-        }
-        lastWasEmpty = false;
-        lastGood = output.length + 1;
-      } else {
-        lastWasEmpty = true;
-      }
-      output.add(s);
-    }
-  }
-  if (lastGood == null) {
-    print('_reformatted to nothing:\n----\n|${body.split("\n").join("|\n|")}|\n----');
-    assert(lastGood != null);
-    throw 'reformatted to nothing:\n$body';
-  }
-  return output.take(lastGood).join('\n');
+  @override
+  String toString() => '$runtimeType ($type) from $origin';
 }
 
 class _LineRange {
@@ -613,6 +662,7 @@ _SplitLicense _splitLicense(String body, { bool verifyResults = true }) {
     throw 'tried to split empty license';
   }
   int end = 0;
+  String endReason;
   while (true) {
     final String line = lines.current.value;
     if (line == 'Author:' ||
@@ -626,6 +676,7 @@ _SplitLicense _splitLicense(String body, { bool verifyResults = true }) {
       }
       end = lines.current.end;
       if (!lines.moveNext()) {
+        endReason = 'ran out of text after author';
         break;
       }
     } else if (line.startsWith('Authors:') || line == 'Other contributors:') {
@@ -638,8 +689,7 @@ _SplitLicense _splitLicense(String body, { bool verifyResults = true }) {
       }
       final String firstAuthor = lines.current.value;
       int subindex = 0;
-      while (subindex < firstAuthor.length && (firstAuthor[subindex] == ' ' ||
-                                               firstAuthor[subindex] == '\t')) {
+      while (subindex < firstAuthor.length && (firstAuthor[subindex] == ' ')) {
         subindex += 1;
       }
       if (subindex == 0 || subindex > firstAuthor.length) {
@@ -650,12 +700,13 @@ _SplitLicense _splitLicense(String body, { bool verifyResults = true }) {
       bool hadMoreLines;
       while ((hadMoreLines = lines.moveNext()) && lines.current.value.startsWith(prefix)) {
         final String nextAuthor = lines.current.value.substring(prefix.length);
-        if (nextAuthor == '' || nextAuthor[0] == ' ' || nextAuthor[0] == '\t') {
+        if (nextAuthor == '' || nextAuthor[0] == ' ') {
           throw 'unexpectedly ragged author list when looking for copyright';
         }
         end = lines.current.end;
       }
       if (!hadMoreLines) {
+        endReason = 'ran out of text while collecting authors';
         break;
       }
     } else if (line.contains(halfCopyrightPattern)) {
@@ -669,25 +720,28 @@ _SplitLicense _splitLicense(String body, { bool verifyResults = true }) {
         end = lines.current.end;
       } while (lines.current.value.contains(trailingComma));
       if (!lines.moveNext()) {
+        endReason = 'ran out of text after matching halfCopyrightPattern/trailingComma sequence';
         break;
       }
-    } else if (copyrightStatementPatterns.every((RegExp pattern) => !line.contains(pattern))) {
-      break;
-    } else {
+    } else if (copyrightStatementPatterns.any(line.contains)) {
       end = lines.current.end;
       if (!lines.moveNext()) {
+        endReason = 'ran out of text after copyright statement pattern';
         break;
       }
+    } else {
+      endReason = 'line did not match any copyright patterns ("$line")';
+      break;
     }
   }
   if (verifyResults && 'Copyright ('.allMatches(body, end).isNotEmpty && !body.startsWith('If you modify libpng')) {
-    throw 'the license seems to contain a copyright:\n===copyright===\n${body.substring(0, end)}\n===license===\n${body.substring(end)}\n=========';
+    throw 'the license seems to contain a copyright:\n===copyright===\n${body.substring(0, end)}\n===license===\n${body.substring(end)}\n=========\ntermination reason: $endReason';
   }
   return _SplitLicense(body, end);
 }
 
 class _PartialLicenseMatch {
-  _PartialLicenseMatch(this._body, this.start, this.split, this.end, this._match, { this.hasCopyrights }) : assert(split >= start),
+  _PartialLicenseMatch(this._body, this.start, this.split, this.end, this._match, { required this.hasCopyrights }) : assert(split >= start),
           assert(split == start || _body[split] == '\n');
 
   final String _body;
@@ -706,19 +760,20 @@ class _PartialLicenseMatch {
   String getCopyrights() => _body.substring(start, split);
   String getConditions() => _body.substring(split + 1, end);
   String getEntireLicense() => _body.substring(start, end);
-  final bool? hasCopyrights;
+  final bool hasCopyrights;
 }
 
-Iterable<_PartialLicenseMatch> _findLicenseBlocks(String body, RegExp pattern, int? firstPrefixIndex, int? indentPrefixIndex, { bool needsCopyright = true }) sync* {
+// Look for all matches of `pattern` in `body` and return them along with associated copyrights.
+Iterable<_PartialLicenseMatch> _findLicenseBlocks(String body, RegExp pattern, int firstPrefixIndex, int indentPrefixIndex, { bool needsCopyright = true }) sync* {
   // I tried doing this with one big RegExp initially, but that way lay madness.
   for (final Match match in pattern.allMatches(body)) {
-    assert(match.groupCount >= firstPrefixIndex!);
-    assert(match.groupCount >= indentPrefixIndex!);
+    assert(match.groupCount >= firstPrefixIndex);
+    assert(match.groupCount >= indentPrefixIndex);
     int start = match.start;
-    final String fullPrefix = '${match.group(firstPrefixIndex!)}${match.group(indentPrefixIndex!)}';
+    final String fullPrefix = '${match.group(firstPrefixIndex)}${match.group(indentPrefixIndex)}';
     // first we walk back to the start of the block that has the same prefix (e.g.
     // the start of this comment block)
-    bool firstLineSpecialComment = false;
+    int firstLineOffset = 0;
     bool lastWasBlank = false;
     bool foundNonBlank = false;
     for (final _LineRange range in _walkLinesBackwards(body, start)) {
@@ -735,16 +790,18 @@ Iterable<_PartialLicenseMatch> _findLicenseBlocks(String body, RegExp pattern, i
         isBlockCommentLine = false;
       }
       if (line.isEmpty || fullPrefix.startsWith(line)) {
-        // this is blank line
+        // this is a blank line
         if (lastWasBlank && (foundNonBlank || !needsCopyright)) {
           break;
         }
         lastWasBlank = true;
-      } else if ((!isBlockCommentLine && line.startsWith('/*'))
-                 || line.startsWith('<!--')
-                 || (range.start == 0 && line.startsWith('  $fullPrefix'))) {
+      } else if (!isBlockCommentLine && line.startsWith('/*')) {
+        start = range.start;
+        firstLineOffset = 2;
+        break;
+      } else if (line.startsWith('<!--')) {
         start = range.start;
-        firstLineSpecialComment = true;
+        firstLineOffset = 4;
         break;
       } else if (fullPrefix.isNotEmpty && !line.startsWith(fullPrefix)) {
         break;
@@ -760,59 +817,60 @@ Iterable<_PartialLicenseMatch> _findLicenseBlocks(String body, RegExp pattern, i
     // then we walk forward dropping anything until the first line that matches what
     // we think might be part of a copyright statement
     bool foundAny = false;
-    for (final _LineRange range in _walkLinesForwards(body, start: start, end: match.start)) {
-      final String line = range.value;
-      if (firstLineSpecialComment || line.startsWith(fullPrefix)) {
-        String? data;
-        if (firstLineSpecialComment) {
-          data = stripDecorations.firstMatch(line)!.group(2);
-        } else {
-          data = line.substring(fullPrefix.length);
-        }
-        if (copyrightStatementLeadingPatterns.any((RegExp pattern) => data!.contains(pattern))) {
+    RegExp? debugFirstPattern;
+    copyrightSearch: for (final _LineRange range in _walkLinesForwards(body, start: start, end: match.start)) {
+      String line = range.value;
+      if (firstLineOffset > 0) {
+        line = line.substring(firstLineOffset);
+        firstLineOffset = 0;
+      } else if (line.startsWith(fullPrefix)) {
+        line = line.substring(fullPrefix.length);
+      } else {
+        assert(line.isEmpty || fullPrefix.startsWith(line), 'invariant violated: expected this to be a blank line but it was "$line" (prefix is "$fullPrefix").');
+        continue copyrightSearch;
+      }
+      for (final RegExp pattern in copyrightStatementLeadingPatterns) {
+        if (line.contains(pattern)) {
           start = range.start;
           foundAny = true;
-          break;
+          debugFirstPattern = pattern;
+          break copyrightSearch;
         }
       }
-      firstLineSpecialComment = false;
     }
-    // At this point we have figured out what might be copyright text before the license.
+    // At this point we have figured out what might be copyright text before the license (if anything).
     int split;
     if (!foundAny) {
       if (needsCopyright) {
-        throw 'could not find copyright before license\nlicense body was:\n---\n${body.substring(match.start, match.end)}\n---\nfile was:\n---\n$body\n---';
+       throw 'could not find copyright before license\nlicense body was:\n---\n${body.substring(match.start, match.end)}\n---\nfile was:\n---\n$body\n---';
       }
       start = match.start;
       split = match.start;
     } else {
       final String copyrights = body.substring(start, match.start);
-      final String undecoratedCopyrights = _reformat(copyrights);
+      final String undecoratedCopyrights = reformat(copyrights);
       // Let's try splitting the copyright block as if it was a license.
       // This will tell us if we collected something in the copyright block
       // that was more license than copyright and that therefore should be
       // examined closer.
-      final _SplitLicense sanityCheck = _splitLicense(undecoratedCopyrights, verifyResults: false);
-      final String conditions = sanityCheck.getConditions();
+      final _SplitLicense consistencyCheck = _splitLicense(undecoratedCopyrights, verifyResults: false);
+      final String conditions = consistencyCheck.getConditions();
       if (conditions != '') {
         // Copyright lines long enough to spill to a second line can create
         // false positives; try to weed those out.
-        final String resplitCopyright = sanityCheck.getCopyright();
+        final String resplitCopyright = consistencyCheck.getCopyright();
         if (resplitCopyright.trim().contains('\n') ||
             conditions.trim().contains('\n') ||
             resplitCopyright.length < 70 ||
             conditions.length > 15) {
-          throw 'potential license text caught in _findLicenseBlocks copyright dragnet:\n---\n$conditions\n---\nundecorated copyrights was:\n---\n$undecoratedCopyrights\n---\ncopyrights was:\n---\n$copyrights\n---\nblock was:\n---\n${body.substring(start, match.end)}\n---';
+          throw 'potential license text caught in _findLicenseBlocks copyright dragnet:\n---\n$conditions\n---\nundecorated copyrights was:\n---\n$undecoratedCopyrights\n---\ncopyrights was:\n---\n$copyrights\n---\nblock was:\n---\n${body.substring(start, match.end)}\n---\nfirst line matched: $debugFirstPattern\n---\npattern:\n$pattern\n---\n${StackTrace.current}\n=============';
         }
       }
 
-      if (!copyrights.contains(copyrightMentionPattern)) {
+      if (!copyrights.contains(anySlightSignOfCopyrights)) {
         throw 'could not find copyright before license block:\n---\ncopyrights was:\n---\n$copyrights\n---\nblock was:\n---\n${body.substring(start, match.end)}\n---';
       }
-      if (body[match.start - 1] != '\n') {
-        print('about to assert; match.start = ${match.start}, match.end = ${match.end}, split at: "${body[match.start - 1]}"');
-      }
-      assert(body[match.start - 1] == '\n');
+      assert(body[match.start - 1] == '\n', 'match did not start at a newline; match.start = ${match.start}, match.end = ${match.end}, split at: "${body[match.start - 1]}"');
       split = match.start - 1;
     }
     yield _PartialLicenseMatch(body, start, split, match.end, match, hasCopyrights: foundAny);
@@ -822,70 +880,58 @@ Iterable<_PartialLicenseMatch> _findLicenseBlocks(String body, RegExp pattern, i
 class _LicenseMatch {
   _LicenseMatch(this.license, this.start, this.end, {
     this.debug = '',
-    this.isDuplicate = false,
+    this.ignoreWhenCheckingOverlappingRegions = false,
     this.missingCopyrights = false
   });
   final License license;
   final int start;
   final int end;
   final String debug;
-  final bool isDuplicate;
+  final bool ignoreWhenCheckingOverlappingRegions;
   final bool missingCopyrights;
+
+  @override
+  String toString() {
+    return '$start..$end: $license';
+  }
 }
 
-Iterable<_LicenseMatch> _expand(License template, String copyright, String body, int start, int end, { String debug = '', String? origin }) sync* {
-  final List<License> results = template.expandTemplate(_reformat(copyright), body, origin: origin).toList();
+Iterable<_LicenseMatch> _expand(License template, String copyright, String body, int start, int end, { String debug = '', required String origin }) sync* {
+  final List<License> results = template._expandTemplate(reformat(copyright), body, origin: origin).toList();
   if (results.isEmpty) {
     throw 'license could not be expanded';
   }
   yield _LicenseMatch(results.first, start, end, debug: 'expanding template for $debug');
   if (results.length > 1) {
-    yield* results.skip(1).map((License license) => _LicenseMatch(license, start, end, isDuplicate: true, debug: 'expanding subsequent template for $debug'));
+    yield* results.skip(1).map((License license) => _LicenseMatch(license, start, end, ignoreWhenCheckingOverlappingRegions: true, debug: 'expanding subsequent template for $debug'));
   }
 }
 
-Iterable<_LicenseMatch> _tryNone(String body, String filename, RegExp pattern, LicenseSource parentDirectory) sync* {
-  for (final Match match in pattern.allMatches(body)) {
-    final List<License>? results = parentDirectory.nearestLicensesFor(filename);
-    if (results == null || results.isEmpty) {
-      throw 'no default license file found';
-    }
-    // TODO(ianh): use _expand if the license asks for the copyright to be included (e.g. BSD)
-    yield _LicenseMatch(results.first, match.start, match.end, debug: '_tryNone');
-    if (results.length > 1) {
-      yield* results.skip(1).map((License license) => _LicenseMatch(license, match.start, match.end, isDuplicate: true, debug: 'subsequent _tryNone'));
-    }
-  }
-}
-
-Iterable<_LicenseMatch> _tryAttribution(String body, RegExp pattern, { String? origin }) sync* {
-  for (final Match match in pattern.allMatches(body)) {
-    assert(match.groupCount == 2);
-    yield _LicenseMatch(License.unique('Thanks to ${match.group(2)}.', LicenseType.unknown, origin: origin), match.start, match.end, debug: '_tryAttribution');
-  }
-}
-
-Iterable<_LicenseMatch> _tryReferenceByFilename(String body, LicenseFileReferencePattern pattern, LicenseSource parentDirectory, { String? origin }) sync* {
+Iterable<_LicenseMatch> _tryReferenceByFilename(String body, LicenseFileReferencePattern pattern, LicenseSource parentDirectory, { required String origin }) sync* {
   if (pattern.copyrightIndex != null) {
-    for (final Match match in pattern.pattern!.allMatches(body)) {
+    for (final Match match in pattern.pattern.allMatches(body)) {
       final String copyright = match.group(pattern.copyrightIndex!)!;
       final String? authors = pattern.authorIndex != null ? match.group(pattern.authorIndex!) : null;
-      final String filename = match.group(pattern.fileIndex!)!;
+      final String filename = match.group(pattern.fileIndex)!;
       final License? template = parentDirectory.nearestLicenseWithName(filename, authors: authors);
       if (template == null) {
         throw 'failed to find template $filename in $parentDirectory (authors=$authors)';
       }
-      assert(_reformat(copyright) != '');
+      assert(reformat(copyright) != '');
       final String entireLicense = body.substring(match.start, match.end);
       yield* _expand(template, copyright, entireLicense, match.start, match.end, debug: '_tryReferenceByFilename (with explicit copyright) looking for $filename', origin: origin);
     }
   } else {
-    for (final _PartialLicenseMatch match in _findLicenseBlocks(body, pattern.pattern!, pattern.firstPrefixIndex, pattern.indentPrefixIndex, needsCopyright: pattern.needsCopyright)) {
+    for (final _PartialLicenseMatch match in _findLicenseBlocks(body, pattern.pattern, pattern.firstPrefixIndex, pattern.indentPrefixIndex, needsCopyright: pattern.needsCopyright)) {
       final String? authors = match.getAuthors();
       String? filename = match.group(pattern.fileIndex);
       if (filename == 'modp_b64.c') {
-        filename = 'modp_b64.cc';
-      } // it was renamed but other files reference the old name
+        filename = 'modp_b64.cc'; // it was renamed but other files reference the old name
+      }
+      // There's also special cases for fuchsia/sdk/linux/dart/zircon/lib/src/fakes/handle_disposition.dart
+      // (which points to "The Flutter Authors" instead of "The Fuchsia Authors" for mysterious reasons) and
+      // third_party/angle/src/common/fuchsia_egl/fuchsia_egl.* (which does something similar), but those
+      // files never reach here because they're marked as binary files in filesystem.dart.
       final License? template = parentDirectory.nearestLicenseWithName(filename!, authors: authors);
       if (template == null) {
         throw
@@ -901,115 +947,141 @@ Iterable<_LicenseMatch> _tryReferenceByFilename(String body, LicenseFileReferenc
   }
 }
 
-Iterable<_LicenseMatch> _tryReferenceByType(String body, RegExp pattern, LicenseSource parentDirectory, { String? origin, bool needsCopyright = true }) sync* {
-  for (final _PartialLicenseMatch match in _findLicenseBlocks(body, pattern, 1, 2, needsCopyright: needsCopyright)) {
+Iterable<_LicenseMatch> _tryReferenceByType(String body, RegExp pattern, LicenseSource parentDirectory, { required String origin }) sync* {
+  for (final _PartialLicenseMatch match in _findLicenseBlocks(body, pattern, 1, 2, needsCopyright: false)) {
     final LicenseType type = convertLicenseNameToType(match.group(3));
     final License? template = parentDirectory.nearestLicenseOfType(type);
     if (template == null) {
       throw 'failed to find accompanying $type license in $parentDirectory';
     }
-    assert(() {
-      final String copyrights = _reformat(match.getCopyrights());
-      assert(needsCopyright && copyrights.isNotEmpty || !needsCopyright && copyrights.isEmpty);
-      return true;
-    }());
-    if (needsCopyright) {
-      yield* _expand(template, match.getCopyrights(), match.getEntireLicense(), match.start, match.end, debug: '_tryReferenceByType', origin: origin);
-    } else {
+    if (match.getCopyrights() == '') {
       yield _LicenseMatch(template, match.start, match.end, debug: '_tryReferenceByType (without copyrights) for type $type');
+    } else {
+      yield* _expand(template, match.getCopyrights(), match.getEntireLicense(), match.start, match.end, debug: '_tryReferenceByType (with successful copyright search) for type $type', origin: origin);
     }
   }
 }
 
-License _dereferenceLicense(int groupIndex, String? Function(int index) group, MultipleVersionedLicenseReferencePattern pattern, LicenseSource parentDirectory, { String? origin }) {
+License _dereferenceLicense(int groupIndex, String? Function(int index) group, LicenseReferencePattern pattern, LicenseSource parentDirectory, { required String origin }) {
   License? result = pattern.checkLocalFirst ? parentDirectory.nearestLicenseWithName(group(groupIndex)!) : null;
-  if (result == null) {
-    String suffix = '';
-    if (pattern.versionIndices != null && pattern.versionIndices!.containsKey(groupIndex)) {
-      suffix = ':${group(pattern.versionIndices![groupIndex]!)}';
-    }
-    result = License.fromUrl('${group(groupIndex)}$suffix', origin: origin);
-  }
+  result ??= License.fromIdentifyingReference(group(groupIndex)!, referencer: origin);
   return result;
 }
 
-Iterable<_LicenseMatch> _tryReferenceByUrl(String body, MultipleVersionedLicenseReferencePattern pattern, LicenseSource parentDirectory, { String? origin }) sync* {
+Iterable<_LicenseMatch> _tryReferenceByIdentifyingReference(String body, LicenseReferencePattern pattern, LicenseSource parentDirectory, { required String origin }) sync* {
   for (final _PartialLicenseMatch match in _findLicenseBlocks(body, pattern.pattern!, 1, 2, needsCopyright: false)) {
-    bool isDuplicate = false;
-    for (final int index in pattern.licenseIndices!) {
-      final License result = _dereferenceLicense(index, match.group, pattern, parentDirectory, origin: origin);
-      yield _LicenseMatch(result, match.start, match.end, isDuplicate: isDuplicate, debug: '_tryReferenceByUrl');
-      isDuplicate = true;
+    if (pattern.spdx) {
+      // Per legal advice, we allowlist the use of SPDX headers. Currently, we
+      // recognize SPDX headers in code from Khronos. To identify such code, we
+      // examine the copyright that came with the SPDX header or we look at the
+      // library name. We also accept the headers in some libcxx files that have
+      // their own license and that otherwise would trip up our code checking
+      // for missed licenses and copyrights. To identify those, we use the
+      // library name and the parent directory name or copyright.
+      bool allowSpdx = false;
+      final String copyrights = match.getCopyrights();
+      if (copyrights.contains('The Khronos Group') ||
+          parentDirectory.libraryName == 'spirv-cross' ||
+          (parentDirectory.libraryName == 'libcxx' && parentDirectory.name == 'ryu') ||
+          (parentDirectory.libraryName == 'libcxx' && copyrights.contains('Microsoft'))) {
+        allowSpdx = true;
+      }
+      if (!allowSpdx) {
+        // Skip this match.
+        continue;
+      }
+    }
+    assert(match.group(3) != null, 'pattern ${pattern.pattern!} did not have three groups when matched against:\n---\n$body\n---\nmatch: $match');
+    final License template = _dereferenceLicense(3, match.group, pattern, parentDirectory, origin: origin);
+    if (match.getCopyrights() == '') {
+      yield _LicenseMatch(template, match.start, match.end, debug: '_tryReferenceByIdentifyingReference (without copyrights)');
+    } else {
+      yield* _expand(template, match.getCopyrights(), match.getEntireLicense(), match.start, match.end, debug: '_tryReferenceByIdentifyingReference (with copyright)', origin: origin);
     }
   }
 }
 
 Iterable<_LicenseMatch> _tryInline(String body, RegExp pattern, {
   required bool needsCopyright,
-  String? origin,
+  required String origin,
 }) sync* {
-  assert(needsCopyright != null);
-  for (final _PartialLicenseMatch match in _findLicenseBlocks(body, pattern, 1, 2, needsCopyright: false)) {
-    // We search with "needsCopyright: false" but then create a _LicenseMatch with
-    // "missingCopyrights: true" if our own "needsCopyright" argument is true.
-    // We use a template license here (not unique) because it's not uncommon for files
-    // to reference license blocks in other files, but with their own copyrights.
-    yield _LicenseMatch(License.fromBody(match.getEntireLicense(), origin: origin), match.start, match.end, debug: '_tryInline', missingCopyrights: needsCopyright && !match.hasCopyrights!);
+  for (final _PartialLicenseMatch match in _findLicenseBlocks(body, pattern, 1, 2, needsCopyright: needsCopyright)) {
+    yield _LicenseMatch(License.fromBody(match.getEntireLicense(), origin: origin), match.start, match.end, debug: '_tryInline', missingCopyrights: needsCopyright && !match.hasCopyrights);
   }
 }
 
-Iterable<_LicenseMatch> _tryForwardReferencePattern(String fileContents, ForwardReferencePattern pattern, License template, { String? origin }) sync* {
-  for (final _PartialLicenseMatch match in _findLicenseBlocks(fileContents, pattern.pattern!, pattern.firstPrefixIndex, pattern.indentPrefixIndex)) {
-    if (!template.body.contains(pattern.targetPattern!)) {
+Iterable<_LicenseMatch> _tryStray(String body, RegExp pattern, LicenseSource parentDirectory, { required String origin }) sync* {
+  // this one doesn't look for copyrights (that's the point, the patterns _are_ the copyrights)
+  bool gotTemplate = false;
+  License? template;
+  for (final Match match in pattern.allMatches(body)) {
+    if (!gotTemplate) {
+      template = parentDirectory.nearestLicenseOfType(LicenseType.defaultTemplate);
+      gotTemplate = true;
+    }
+    if (template != null) {
+      yield* _expand(template, match.group(0)!, match.group(0)!, match.start, match.end, debug: '_tryStray (with template)', origin: origin);
+    } else {
+      yield _LicenseMatch(License.fromBody(match.group(0)!, origin: origin), match.start, match.end, debug: '_tryStray');
+    }
+  }
+}
+
+Iterable<_LicenseMatch> _tryForwardReferencePattern(String fileContents, ForwardReferencePattern pattern, License template, LicenseSource source, { required String origin }) sync* {
+  String? body;
+  for (final _PartialLicenseMatch match in _findLicenseBlocks(fileContents, pattern.pattern, pattern.firstPrefixIndex, pattern.indentPrefixIndex)) {
+    body ??= template.toStringBody(source);
+    if (!body.contains(pattern.targetPattern)) {
       throw
         'forward license reference to unexpected license\n'
-        'license:\n---\n${template.body}\n---\nexpected pattern:\n---\n${pattern.targetPattern}\n---';
+        'license:\n---\n$body\n---\nexpected pattern:\n---\n${pattern.targetPattern}\n---';
     }
     yield* _expand(template, match.getCopyrights(), match.getEntireLicense(), match.start, match.end, debug: '_tryForwardReferencePattern', origin: origin);
   }
 }
 
-List<License> determineLicensesFor(String fileContents, String filename, LicenseSource? parentDirectory, { String? origin }) {
+List<License> determineLicensesFor(String fileContents, String filename, LicenseSource? parentDirectory, { required String origin }) {
   if (parentDirectory == null) {
     throw 'Fatal error: determineLicensesFor was called with parentDirectory=null!';
   }
-
   if (fileContents.length > kMaxSize) {
     fileContents = fileContents.substring(0, kMaxSize);
   }
   final List<_LicenseMatch> results = <_LicenseMatch>[];
-  fileContents = fileContents.replaceAll('\t', ' ');
-  fileContents = fileContents.replaceAll(newlinePattern, '\n');
-  results.addAll(csNoCopyrights.expand((RegExp pattern) => _tryNone(fileContents, filename, pattern, parentDirectory)));
-  results.addAll(csAttribution.expand((RegExp pattern) => _tryAttribution(fileContents, pattern, origin: origin)));
+  fileContents = stripAsciiArt(fileContents);
   results.addAll(csReferencesByFilename.expand((LicenseFileReferencePattern pattern) => _tryReferenceByFilename(fileContents, pattern, parentDirectory, origin: origin)));
   results.addAll(csReferencesByType.expand((RegExp pattern) => _tryReferenceByType(fileContents, pattern, parentDirectory, origin: origin)));
-  results.addAll(csReferencesByTypeNoCopyright.expand((RegExp pattern) => _tryReferenceByType(fileContents, pattern, parentDirectory, origin: origin, needsCopyright: false)));
-  results.addAll(csReferencesByUrl.expand((MultipleVersionedLicenseReferencePattern pattern) => _tryReferenceByUrl(fileContents, pattern, parentDirectory, origin: origin)));
-  results.addAll(csLicenses.expand((RegExp pattern) => _tryInline(fileContents, pattern, needsCopyright: true, origin: origin)));
-  results.addAll(csNotices.expand((RegExp pattern) => _tryInline(fileContents, pattern, needsCopyright: false, origin: origin)));
+  results.addAll(csReferencesByIdentifyingReference.expand((LicenseReferencePattern pattern) => _tryReferenceByIdentifyingReference(fileContents, pattern, parentDirectory, origin: origin)));
+  results.addAll(csTemplateLicenses.expand((RegExp pattern) => _tryInline(fileContents, pattern, needsCopyright: true, origin: origin)));
+  results.addAll(csNoticeLicenses.expand((RegExp pattern) => _tryInline(fileContents, pattern, needsCopyright: false, origin: origin)));
   _LicenseMatch? usedTemplate;
   if (results.length == 1) {
     final _LicenseMatch target = results.single;
-    results.addAll(csForwardReferenceLicenses.expand((ForwardReferencePattern pattern) => _tryForwardReferencePattern(fileContents, pattern, target.license, origin: origin)));
+    results.addAll(csForwardReferenceLicenses.expand((ForwardReferencePattern pattern) => _tryForwardReferencePattern(fileContents, pattern, target.license, parentDirectory, origin: origin)));
     if (results.length > 1) {
       usedTemplate = target;
     }
   }
-  // It's good to manually sanity check that these are all being correctly used
-  // to expand later licenses every now and then:
-  // for (_LicenseMatch match in results.where((_LicenseMatch match) => match.missingCopyrights)) {
-  //   print('Found a license for $filename but it was missing a copyright, so ignoring it:\n----8<----\n${match.license}\n----8<----');
-  // }
-  results.removeWhere((_LicenseMatch match) => match.missingCopyrights);
+  for (final _LicenseMatch match in results.where((_LicenseMatch match) => match.missingCopyrights)) {
+    throw 'found a license for $filename but could not match its copyright:\n----8<----\n${match.license}\n----8<----';
+  }
   if (results.isEmpty) {
-    // we failed to find a license, so let's look for some corner cases
-    results.addAll(csFallbacks.expand((RegExp pattern) => _tryNone(fileContents, filename, pattern, parentDirectory)));
-    if (results.isEmpty) {
-      if ((fileContents.contains(copyrightMentionPattern) && fileContents.contains(licenseMentionPattern)) && !fileContents.contains(copyrightMentionOkPattern)) {
-        throw 'unmatched potential copyright and license statements; first twenty lines:\n----8<----\n${fileContents.split("\n").take(20).join("\n")}\n----8<----';
+    if ((fileContents.contains(copyrightMentionPattern) && fileContents.contains(licenseMentionPattern)) && !fileContents.contains(copyrightMentionOkPattern)) {
+      throw 'failed to find any license but saw unmatched potential copyright and license statements; first twenty lines:\n----8<----\n${fileContents.split("\n").take(20).join("\n")}\n----8<----';
+    }
+  }
+  // Some files have the odd copyright that isn't explicitly attached to a
+  // license; we treat those as notice licenses. Only such copyrights
+  // allowlisted in csStrayCopyrights are handled this way, though. For each of
+  // these, we have to make sure they don't overlap any of the actual licenses
+  // matched earlier, so we check for overlaps on each one first.
+  strays: for (final _LicenseMatch stray in csStrayCopyrights.expand((RegExp pattern) => _tryStray(fileContents, pattern, parentDirectory, origin: origin))) {
+    for (final _LicenseMatch full in results) {
+      if (stray.start >= full.start && stray.end <= full.end) {
+        continue strays;
       }
     }
+    results.add(stray);
   }
   final List<_LicenseMatch> verificationList = results.toList();
   if (usedTemplate != null && !verificationList.contains(usedTemplate)) {
@@ -1024,27 +1096,42 @@ List<License> determineLicensesFor(String fileContents, String filename, License
   });
   int position = 0;
   for (final _LicenseMatch m in verificationList) {
-    if (m.isDuplicate) {
+    if (m.ignoreWhenCheckingOverlappingRegions) {
       continue;
     } // some text expanded into multiple licenses, so overlapping is expected
     if (position > m.start) {
+      system.stderr.writeln('\n\noverlapping licenses:');
       for (final _LicenseMatch n in results) {
-        print('license match: ${n.start}..${n.end}, ${n.debug}, first line: ${n.license.body.split("\n").first}');
+        system.stderr.writeln(
+          'license match: ${n.start}..${n.end}, ${n.license.runtimeType}, ${n.debug}\n'
+          '  first line: ${n.license.toStringBody(parentDirectory).split("\n").first}\n'
+          '  last line: ${n.license.toStringBody(parentDirectory).split("\n").last}'
+        );
       }
       throw 'overlapping licenses in $filename (one ends at $position, another starts at ${m.start})';
     }
     if (position < m.start) {
       final String substring = fileContents.substring(position, m.start);
       if (substring.contains(copyrightMentionPattern) && !substring.contains(copyrightMentionOkPattern)) {
-        throw 'there is another unmatched potential copyright statement in $filename:\n  $position..${m.start}: "$substring"';
+        throw 'there is another unmatched potential copyright statement in $filename:\n  $position..${m.start}: "$substring"\nmatched licenses: $results';
+      }
+      if (substring.contains(licenseMentionPattern)) {
+        throw 'there is another unmatched potential license in $filename:\n  $position..${m.start}: "$substring"\nmatched licenses: $results';
       }
     }
     position = m.end;
   }
-  return results.map((_LicenseMatch entry) => entry.license).toList();
+  final String substring = fileContents.substring(position);
+  if (substring.contains(copyrightMentionPattern) && !substring.contains(copyrightMentionOkPattern)) {
+    throw 'there is an unmatched potential copyright statement in $filename:\n  $position..end: "$substring"\nmatched licenses: $results';
+  }
+  if (substring.contains(licenseMentionPattern)) {
+    throw 'there is an unmatched potential license in $filename:\n  $position..end: "$substring"\nmatched licenses: $results';
+  }
+  return results.map((_LicenseMatch entry) => entry.license).toSet().toList();
 }
 
-License? interpretAsRedirectLicense(String fileContents, LicenseSource parentDirectory, { String? origin }) {
+License? interpretAsRedirectLicense(String fileContents, LicenseSource parentDirectory, { required String origin }) {
   _SplitLicense split;
   try {
     split = _splitLicense(fileContents);
@@ -1053,16 +1140,19 @@ License? interpretAsRedirectLicense(String fileContents, LicenseSource parentDir
   }
   final String body = split.getConditions().trim();
   License? result;
-  for (final MultipleVersionedLicenseReferencePattern pattern in csReferencesByUrl) {
+  for (final LicenseReferencePattern pattern in csReferencesByIdentifyingReference) {
+    if (pattern.spdx) {
+      // We don't support SPDX headers in files that use _RepositoryLicenseRedirectFile.
+      // Before changing this, obtain legal advice.
+      continue;
+    }
     final Match? match = pattern.pattern!.matchAsPrefix(body);
     if (match != null && match.start == 0 && match.end == body.length) {
-      for (final int index in pattern.licenseIndices!) {
-        final License candidate = _dereferenceLicense(index, match.group as String? Function(int?), pattern, parentDirectory, origin: origin);
-        if (result != null && candidate != null) {
-          throw 'Multiple potential matches in interpretAsRedirectLicense in $parentDirectory; body was:\n------8<------\n$fileContents\n------8<------';
-        }
-        result = candidate;
+      final License candidate = _dereferenceLicense(3, match.group as String? Function(int?), pattern, parentDirectory, origin: origin);
+      if (result != null) {
+        throw 'Multiple potential matches in interpretAsRedirectLicense in $parentDirectory; body was:\n------8<------\n$fileContents\n------8<------';
       }
+      result = candidate;
     }
   }
   return result;
@@ -1070,60 +1160,179 @@ License? interpretAsRedirectLicense(String fileContents, LicenseSource parentDir
 
 // the kind of license that just wants to show a message (e.g. the JPEG one)
 class MessageLicense extends License {
-  MessageLicense._(String body, LicenseType type, { String? origin }) : super._(body, type, origin: origin);
+  MessageLicense._(this.body, LicenseType type, { required String origin }) : super._(body, type, origin: origin);
+
+  final String body;
+
   @override
-  Iterable<License> expandTemplate(String copyright, String licenseBody, { String? origin }) sync* {
-    yield this;
-  }
+  String toStringBody(LicenseSource source) => body;
+
+  @override
+  Iterable<License> _expandTemplate(String copyright, String licenseBody, { required String origin }) => <License>[this];
 }
 
 // the kind of license that says to include the copyright and the license text (e.g. BSD)
 class TemplateLicense extends License {
-  TemplateLicense._(String body, LicenseType type, { String? origin })
-    : assert(!body.startsWith('Apache License')),
-      super._(body, type, origin: origin);
+  TemplateLicense._(this.defaultCopyright, this.terms, LicenseType type, { String? authors, required String origin })
+    : assert(!defaultCopyright.endsWith('\n')),
+      assert(!terms.startsWith('\n')),
+      assert(terms.isNotEmpty),
+      super._('$defaultCopyright\n\n$terms', type, origin: origin, authors: authors);
+
+  factory TemplateLicense._autosplit(String body, LicenseType type, { String? authors, required String origin }) {
+    final _SplitLicense bits = _splitLicense(body);
+    final String copyright = bits.getCopyright();
+    final String terms = bits.getConditions();
+    assert((copyright.isEmpty && terms == body) || ('$copyright\n$terms' == body) || (copyright == body && terms.isEmpty), '_splitLicense contract violation.\nCOPYRIGHT:\n===\n$copyright\n===\nTERMS:\n===\n$terms\n===\nBODY:\n===\n$body\n===\n');
+    int copyrightLength = copyright.length;
+    while (copyrightLength > 0 && copyright[copyrightLength - 1] == '\n') {
+      copyrightLength -= 1;
+    }
+    int termsStart = 0;
+    while (termsStart < terms.length && terms[termsStart] == '\n') {
+      termsStart += 1;
+    }
+    return TemplateLicense._(
+      copyright.substring(0, copyrightLength),
+      terms.substring(termsStart),
+      type,
+      authors: authors,
+      origin: origin,
+    );
+  }
+
+  final String defaultCopyright;
+  final String terms;
 
-  String? _conditions;
+  @override
+  String toStringBody(LicenseSource source) {
+    if (defaultCopyright.isEmpty) {
+      return terms;
+    }
+    return '$defaultCopyright\n\n$terms';
+  }
 
   @override
-  Iterable<License> expandTemplate(String copyright, String licenseBody, { String? origin }) sync* {
-    _conditions ??= _splitLicense(body).getConditions();
-    yield License.fromCopyrightAndLicense(copyright, _conditions, type, origin: '$origin + ${this.origin}');
+  Iterable<License> _expandTemplate(String copyright, String licenseBody, { required String origin }) {
+    return <License>[ License.fromCopyrightAndLicense(copyright, terms, type, origin: '$origin + ${this.origin}') ];
   }
 }
 
-// the kind of license that expands to two license blocks a main license and the referring block (e.g. OpenSSL)
+// The kind of license that expands to two license blocks a main license and the referring block
+// (e.g. OpenSSL).
+//
+// This is a lawyer-suggested workaround for handling BSD-style licenses where instead of there
+// being a single license block where it's obvious what is meant by "above copyright notice" and
+// "this list of conditions", we instead have a bunch of similar licenses, each with their own
+// copyright, plus there's a copyright in the file that (probably) doesn't exactly match any of the
+// copyrights in the file, plus some text saying that that license applies to the file.
 class MultiLicense extends License {
-  MultiLicense._(String body, LicenseType type, { String? origin }) : super._(body, type, origin: origin);
+  MultiLicense._(this.body, LicenseType type, {
+    String? authors,
+    required String origin,
+    bool yesWeKnowWhatItLooksLikeButItIsNot = false,
+  }) : super._(body, type, origin: origin, authors: authors, yesWeKnowWhatItLooksLikeButItIsNot: yesWeKnowWhatItLooksLikeButItIsNot);
+
+  final String body;
+
+  @override
+  String toStringBody(LicenseSource source) => body;
 
   @override
-  Iterable<License> expandTemplate(String copyright, String licenseBody, { String? origin }) sync* {
-    yield License.fromBody(body, origin: '$origin + ${this.origin}');
-    yield License.fromBody(licenseBody, origin: '$origin + ${this.origin}');
+  Iterable<License> _expandTemplate(String copyright, String licenseBody, { required String origin }) {
+    // Sometimes a license (e.g. the OpenSSL license in the BoringSSL package) is referenced
+    // from a file that has its own copyright header. When that happens we just print the referenced
+    // license and the reference to that license separately because it's not at all clear how we're
+    // supposed to merge them otherwise.
+    licenseBody = reformat(licenseBody);
+    assert(licenseBody.startsWith(copyright), 'copyright:\n---\n$copyright\n---\nlicenseBody:\n---\n$licenseBody\n---');
+    return <License>[
+      this,
+      License.fromBody(licenseBody, origin: '$origin (with ${this.origin})', reformatted: true),
+    ];
   }
 }
 
 // the kind of license that should not be combined with separate copyright notices
 class UniqueLicense extends License {
-  UniqueLicense._(String body, LicenseType type, {
-    String? origin,
+  UniqueLicense._(this.body, LicenseType type, {
+    required String origin,
+    String? authors,
     bool yesWeKnowWhatItLooksLikeButItIsNot = false
-  }) : super._(body, type, origin: origin, yesWeKnowWhatItLooksLikeButItIsNot: yesWeKnowWhatItLooksLikeButItIsNot);
+  }) : super._(body, type, origin: origin, yesWeKnowWhatItLooksLikeButItIsNot: yesWeKnowWhatItLooksLikeButItIsNot, authors: authors);
+
+  final String body;
+
+  @override
+  String toStringBody(LicenseSource source) => body;
+
   @override
-  Iterable<License> expandTemplate(String copyright, String licenseBody, { String? origin }) sync* {
+  Iterable<License> _expandTemplate(String copyright, String licenseBody, { required String origin }) {
     throw 'attempted to expand non-template license with "$copyright"\ntemplate was: $this';
   }
 }
 
 // the kind of license that doesn't need to be reported anywhere
 class BlankLicense extends License {
-  BlankLicense._(String body, LicenseType type, { String? origin }) : super._(body, type, origin: origin);
+  BlankLicense._(super.body, super.type, { required super.origin }) : super._();
+
+  @override
+  Iterable<License> _expandTemplate(String copyright, String licenseBody, { required String origin }) {
+    // We don't care what copyrights this kind of license has, we don't need
+    // to report them. Just report |this| (which is always blank, see below).
+    return <License>[this];
+  }
+
+  @override
+  String toStringBody(LicenseSource source) => '';
+}
+
+// MPL
+class MozillaLicense extends License {
+  MozillaLicense._(this.body, LicenseType type, { required String origin }) : assert(type == LicenseType.mpl), super._(body, type, origin: origin);
+
+  final String body;
+
+  @override
+  Assignment assignLicenses(String target, LicenseSource source) {
+    if (source.libraryName != 'fallback_root_certificates') {
+      throw 'Only fallack_root_certificates is allowed to use the MPL.';
+    }
+    return Assignment(this, target, source);
+  }
+
   @override
-  Iterable<License> expandTemplate(String copyright, String licenseBody, { String? origin }) sync* {
-    yield this;
+  Iterable<License> _expandTemplate(String copyright, String licenseBody, { required String origin }) {
+    throw 'attempted to expand non-template license with "$copyright"\ntemplate was: $this';
   }
+
   @override
-  String toStringBody() => '<THIS BLOCK INTENTIONALLY LEFT BLANK>';
+  String toStringBody(LicenseSource source) {
+    final StringBuffer result = StringBuffer();
+    result.writeln(body);
+    result.writeln();
+    result.writeln("You may obtain a copy of this library's Source Code Form from: ${source.officialSourceLocation}");
+    return result.toString();
+  }
+}
+
+class DisallowedLicense extends License {
+  DisallowedLicense._(this.body, LicenseType type, { required String origin }) : super._(body, type, origin: origin);
+
+  final String body;
+
   @override
-  String? toStringFormal() => null;
+  Assignment assignLicenses(String target, LicenseSource source) {
+    throw '$target (in ${source.libraryName}) attempted to use $origin which is a disallowed license type ($type)';
+  }
+
+  @override
+  Iterable<License> _expandTemplate(String copyright, String licenseBody, { required String origin }) {
+    throw 'attempted to use $origin which is a disallowed license type ($type)';
+  }
+
+  @override
+  String toStringBody(LicenseSource source) {
+    throw '${source.libraryName} attempted to use $origin which is a disallowed license type ($type)';
+  }
 }
diff --git a/tools/licenses/lib/limits.dart b/tools/licenses/lib/limits.dart
index b4ef63f8df63bb2551d9d51a32a2355da6664442..b62edebd58cb317e95aebcebbbcf48d93354324c 100644
--- a/tools/licenses/lib/limits.dart
+++ b/tools/licenses/lib/limits.dart
@@ -5,4 +5,8 @@
 // Only look for copyrights and licenses at the top of the file.
 // This can be increased as necessary, but the larger the value, the slower the
 // script will be, so be judicious.
-const int kMaxSize = 6 * 1024;
+//
+// FWIW, png.h's license statements end near the 7KB mark.
+// third_party/boringssl/src/include/openssl/ssl.h has licenses for 7285 bytes
+// third_party/boringssl/src/include/openssl/tls1.h has licenses for 7530 bytes
+const int kMaxSize = 7530;
diff --git a/tools/licenses/lib/main.dart b/tools/licenses/lib/main.dart
index f308860b43b9d1b9db20f12c93a4c2b78eece581..6f22cc21f92e12116a57498b7d4c377a48a2f490 100644
--- a/tools/licenses/lib/main.dart
+++ b/tools/licenses/lib/main.dart
@@ -4,30 +4,26 @@
 
 // See README in this directory for information on how this code is organized.
 
-import 'dart:async';
-import 'dart:collection';
-import 'dart:convert';
+import 'dart:core' hide RegExp;
 import 'dart:io' as system;
 import 'dart:math' as math;
 
 import 'package:args/args.dart';
-import 'package:collection/collection.dart'
-    show IterableExtension, IterableNullableExtension;
+import 'package:collection/collection.dart' show IterableExtension;
 import 'package:crypto/crypto.dart' as crypto;
 import 'package:path/path.dart' as path;
 
 import 'filesystem.dart' as fs;
 import 'licenses.dart';
+import 'paths.dart';
 import 'patterns.dart';
-
-// REPOSITORY OBJECTS
+import 'regexp_debug.dart';
 
 abstract class _RepositoryEntry implements Comparable<_RepositoryEntry> {
   _RepositoryEntry(this.parent, this.io);
   final _RepositoryDirectory? parent;
   final fs.IoNode io;
   String get name => io.name;
-  String get libraryName;
 
   @override
   int compareTo(_RepositoryEntry other) => toString().compareTo(other.toString());
@@ -37,132 +33,127 @@ abstract class _RepositoryEntry implements Comparable<_RepositoryEntry> {
 }
 
 abstract class _RepositoryFile extends _RepositoryEntry {
-  _RepositoryFile(_RepositoryDirectory parent, fs.File io) : super(parent, io);
-
-  Iterable<License>? get licenses;
-
-  @override
-  String get libraryName => parent!.libraryName;
+  _RepositoryFile(_RepositoryDirectory super.parent, fs.File super.io);
 
   fs.File get ioFile => super.io as fs.File;
 }
 
 abstract class _RepositoryLicensedFile extends _RepositoryFile {
-  _RepositoryLicensedFile(_RepositoryDirectory parent, fs.File io) : super(parent, io);
-
-  // file names that we are confident won't be included in the final build product
-  static final RegExp _readmeNamePattern = RegExp(r'\b_*(?:readme|contributing|patents)_*\b', caseSensitive: false);
-  static final RegExp _buildTimePattern = RegExp(r'^(?!.*gen$)(?:CMakeLists\.txt|(?:pkgdata)?Makefile(?:\.inc)?(?:\.am|\.in|)|configure(?:\.ac|\.in)?|config\.(?:sub|guess)|.+\.m4|install-sh|.+\.sh|.+\.bat|.+\.pyc?|.+\.pl|icu-configure|.+\.gypi?|.*\.gni?|.+\.mk|.+\.cmake|.+\.gradle|.+\.yaml|pubspec\.lock|\.packages|vms_make\.com|pom\.xml|\.project|source\.properties|.+\.obj|.+\.autopkg|Brewfile)$', caseSensitive: false);
-  static final RegExp _docsPattern = RegExp(r'^(?:INSTALL|NEWS|OWNERS|AUTHORS|ChangeLog(?:\.rst|\.[0-9]+)?|.+\.txt|.+\.md|.+\.log|.+\.css|.+\.1|doxygen\.config|Doxyfile|.+\.spec(?:\.in)?)$', caseSensitive: false);
-  static final RegExp _devPattern = RegExp(r'^(?:codereview\.settings|.+\.~|.+\.~[0-9]+~|\.clang-format|swift\.swiftformat|\.gitattributes|\.landmines|\.DS_Store|\.travis\.yml|\.cirrus\.yml|\.cache|\.mailmap|CODEOWNERS|TESTOWNERS)$', caseSensitive: false);
-  static final RegExp _testsPattern = RegExp(r'^(?:tj(?:bench|example)test\.(?:java\.)?in|example\.c)$', caseSensitive: false);
-  // The ICU library has sample code that will never get linked.
-  static final RegExp _icuSamplesPattern = RegExp(r'.*(?:icu\/source\/samples).*$', caseSensitive: false);
-
-  bool get isIncludedInBuildProducts {
-    return !io.name.contains(_readmeNamePattern)
-        && !io.name.contains(_buildTimePattern)
-        && !io.name.contains(_docsPattern)
-        && !io.name.contains(_devPattern)
-        && !io.name.contains(_testsPattern)
-        && !io.toString().contains(_icuSamplesPattern)
-        && !isShellScript;
-  }
-
-  bool get isShellScript => false;
+  _RepositoryLicensedFile(super.parent, super.io);
+
+  // Returns the License that is found inside this file.
+  //
+  // Used when one file says it is covered by the license of another file.
+  License extractInternalLicense() {
+    throw 'tried to extract a license from $this but it does not contain text';
+  }
+
+  // Creates the mapping from the file to its licenses.
+  //
+  // Subclasses implement things like applying licenses found within the file
+  // itself, applying licenses that point to other files, etc.
+  //
+  // The assignments are later grouped when generating the output, see
+  // groupLicenses in licenses.dart.
+  Iterable<Assignment> assignLicenses() {
+    final List<License> licenses = parent!.nearestLicensesFor(name);
+    if (licenses.isEmpty) {
+      throw 'file has no detectable license and no in-scope default license file';
+    }
+    return licenses.map((License license) => license.assignLicenses(io.fullName, parent!));
+  }
 }
 
 class _RepositorySourceFile extends _RepositoryLicensedFile {
-  _RepositorySourceFile(_RepositoryDirectory parent, fs.TextFile io) : super(parent, io);
+  _RepositorySourceFile(super.parent, fs.TextFile super.io) : _contents = _readFile(io);
 
   fs.TextFile get ioTextFile => super.io as fs.TextFile;
 
-  static final RegExp _hashBangPattern = RegExp(r'^#! *(?:/bin/sh|/bin/bash|/usr/bin/env +(?:python[23]?|bash))\b');
+  final String _contents;
 
-  @override
-  bool get isShellScript {
-    return ioTextFile.readString().startsWith(_hashBangPattern);
+  static String _readFile(fs.TextFile ioTextFile) {
+    late String contents;
+    try {
+      contents = ioTextFile.readString();
+    } on FormatException {
+      throw 'non-UTF8 data in $ioTextFile';
+    }
+    return contents;
   }
 
-  List<License>? _licenses;
+  List<License>? _internalLicenses;
 
   @override
-  Iterable<License> get licenses {
-    if (_licenses != null) {
-      return _licenses!;
+  License extractInternalLicense() {
+    _internalLicenses ??= determineLicensesFor(_contents, name, parent, origin: io.fullName);
+    if (_internalLicenses == null || _internalLicenses!.isEmpty) {
+      throw 'tried to extract a license from $this but there is nothing here';
     }
-    late String contents;
-    try {
-      contents = ioTextFile.readString();
-    } on FormatException {
-      print('non-UTF8 data in $io');
-      system.exit(2);
-    }
-    _licenses = determineLicensesFor(contents, name, parent, origin: '$this');
-    if (_licenses == null || _licenses!.isEmpty) {
-      _licenses = parent?.nearestLicensesFor(name);
-      if (_licenses == null || _licenses!.isEmpty) {
-        throw 'file has no detectable license and no in-scope default license file';
-      }
+    if (_internalLicenses!.length > 1) {
+      throw 'tried to extract a license from $this but there are multiple licenses in this file';
     }
-    _licenses!.sort();
-    for (final License license in _licenses!) {
-      license.markUsed(io.fullName, libraryName);
+    return _internalLicenses!.single;
+  }
+
+  @override
+  Iterable<Assignment> assignLicenses() {
+    _internalLicenses ??= determineLicensesFor(_contents, name, parent, origin: io.fullName);
+    final List<License>? licenses = _internalLicenses;
+    if (licenses != null && licenses.isNotEmpty) {
+      return licenses.map((License license) => license.assignLicenses(io.fullName, parent!));
     }
-    assert(_licenses != null && _licenses!.isNotEmpty);
-    return _licenses!;
+    return super.assignLicenses();
   }
 }
 
 class _RepositoryBinaryFile extends _RepositoryLicensedFile {
-  _RepositoryBinaryFile(_RepositoryDirectory parent, fs.File io) : super(parent, io);
-
-  List<License>? _licenses;
+  _RepositoryBinaryFile(super.parent, super.io);
 
   @override
-  List<License>? get licenses {
-    if (_licenses == null) {
-      _licenses = parent?.nearestLicensesFor(name);
-      if (_licenses == null || _licenses!.isEmpty) {
-        throw 'no license file found in scope for ${io.fullName}';
-      }
-      for (final License license in _licenses!) {
-        license.markUsed(io.fullName, libraryName);
-      }
+  Iterable<Assignment> assignLicenses() {
+    final List<License> licenses = parent!.nearestLicensesFor(name);
+    if (licenses.isEmpty) {
+      throw 'no license file found in scope for ${io.fullName}';
     }
-    return _licenses;
+    return licenses.map((License license) => license.assignLicenses(io.fullName, parent!));
   }
 }
 
 // LICENSES
 
 abstract class _RepositoryLicenseFile extends _RepositoryFile {
-  _RepositoryLicenseFile(_RepositoryDirectory parent, fs.File io) : super(parent, io);
+  _RepositoryLicenseFile(super.parent, fs.TextFile super.io);
 
-  List<License>? licensesFor(String name);
+  // returns any licenses that apply specifically to the file named "name"
+  List<License> licensesFor(String name) => licenses;
+
+  // returns the license that applies to files looking for a license of the given type
   License? licenseOfType(LicenseType type);
+
+  // returns the license that applies to files looking for a license of the given name
   License? licenseWithName(String name);
 
   License? get defaultLicense;
+  List<License> get licenses;
 }
 
 abstract class _RepositorySingleLicenseFile extends _RepositoryLicenseFile {
-  _RepositorySingleLicenseFile(_RepositoryDirectory parent, fs.TextFile io, this.license)
-    : super(parent, io);
+  _RepositorySingleLicenseFile(super.parent, super.io, this.license);
 
   final License license;
 
   @override
-  List<License>? licensesFor(String name) {
-    if (license != null) {
-      return <License>[license];
+  License? licenseWithName(String name) {
+    if (this.name == name) {
+      return license;
     }
     return null;
   }
 
   @override
-  License? licenseWithName(String name) {
-    if (this.name == name) {
+  License? licenseOfType(LicenseType type) {
+    assert(type != LicenseType.unknown);
+    if (type == license.type) {
       return license;
     }
     return null;
@@ -172,92 +163,46 @@ abstract class _RepositorySingleLicenseFile extends _RepositoryLicenseFile {
   License get defaultLicense => license;
 
   @override
-  Iterable<License> get licenses sync* { yield license; }
+  List<License> get licenses => <License>[license];
 }
 
 class _RepositoryGeneralSingleLicenseFile extends _RepositorySingleLicenseFile {
   _RepositoryGeneralSingleLicenseFile(_RepositoryDirectory parent, fs.TextFile io)
-    : super(parent, io, License.fromBodyAndName(io.readString(), io.name, origin: io.fullName));
-
-  @override
-  License? licenseOfType(LicenseType type) {
-    if (type == license.type) {
-      return license;
-    }
-    return null;
-  }
-}
-
-class _RepositoryApache4DNoticeFile extends _RepositorySingleLicenseFile {
-  _RepositoryApache4DNoticeFile(_RepositoryDirectory parent, fs.TextFile io)
     : super(parent, io, _parseLicense(io));
 
-  @override
-  License? licenseOfType(LicenseType type) => null;
-
-  static final RegExp _pattern = RegExp(
-    r'^(// ------------------------------------------------------------------\n'
-    r'// NOTICE file corresponding to the section 4d of The Apache License,\n'
-    r'// Version 2\.0, in this case for (?:.+)\n'
-    r'// ------------------------------------------------------------------\n)'
-    r'((?:.|\n)+)$',
-    caseSensitive: false
-  );
-
-  static bool consider(fs.TextFile io) {
-    return io.readString().contains(_pattern);
-  }
-
   static License _parseLicense(fs.TextFile io) {
-    final Match match = _pattern.allMatches(io.readString()).single;
-    assert(match.groupCount == 2);
-    return License.unique(match.group(2)!, LicenseType.apacheNotice, origin: io.fullName);
-  }
-}
-
-class _RepositoryLicenseRedirectFile extends _RepositorySingleLicenseFile {
-  _RepositoryLicenseRedirectFile(_RepositoryDirectory parent, fs.TextFile io, License license)
-    : super(parent, io, license);
-
-  @override
-  License? licenseOfType(LicenseType type) {
-    if (type == license.type) {
-      return license;
-    }
-    return null;
-  }
-
-  static _RepositoryLicenseRedirectFile? maybeCreateFrom(_RepositoryDirectory parent, fs.TextFile io) {
-    final String contents = io.readString();
-    final License? license = interpretAsRedirectLicense(contents, parent, origin: io.fullName);
-    if (license != null) {
-      return _RepositoryLicenseRedirectFile(parent, io, license);
+    final String body = io.readString();
+    int start = 0;
+    Match? match;
+    while ((match = licenseHeaders.matchAsPrefix(body, start)) != null) {
+      assert(match!.end > start);
+      start = match!.end; // https://github.com/dart-lang/sdk/issues/50264
     }
-    return null;
+    return License.fromBodyAndName(body.substring(start), io.name, origin: io.fullName);
   }
 }
 
-class _RepositoryLicenseFileWithLeader extends _RepositorySingleLicenseFile {
-  _RepositoryLicenseFileWithLeader(_RepositoryDirectory parent, fs.TextFile io, RegExp leader)
-    : super(parent, io, _parseLicense(io, leader));
-
-  @override
-  License? licenseOfType(LicenseType type) => null;
-
-  static License _parseLicense(fs.TextFile io, RegExp leader) {
-    final String body = io.readString();
-    final Match? match = leader.firstMatch(body);
-    if (match == null) {
-      throw 'failed to strip leader from $io\nleader: /$leader/\nbody:\n---\n$body\n---';
-    }
-    return License.fromBodyAndName(body.substring(match.end), io.name, origin: io.fullName);
-  }
+// Avoid using this unless the license file has multiple licenses in a weird mishmash.
+// For example, the RapidJSON license which mixes BSD and MIT in somewhat confusing ways
+// (e.g. having the copyright for one above the terms for the other and so on).
+class _RepositoryOpaqueLicenseFile extends _RepositorySingleLicenseFile {
+  _RepositoryOpaqueLicenseFile(_RepositoryDirectory parent, fs.TextFile io)
+    : super(parent, io, License.unique(io.readString(), LicenseType.unknown, origin: io.fullName, yesWeKnowWhatItLooksLikeButItIsNot: true));
 }
 
 class _RepositoryReadmeIjgFile extends _RepositorySingleLicenseFile {
   _RepositoryReadmeIjgFile(_RepositoryDirectory parent, fs.TextFile io)
     : super(parent, io, _parseLicense(io));
 
+  // The message we are required to include in our output.
+  //
+  // We include it by just including the whole license.
+  static const String _message = 'this software is based in part on the work of the Independent JPEG Group';
+
+  // The license text that says we should output _message.
+  //
+  // We inject _message into it, munged such that each space character can also
+  // match a newline, so that if the license wraps the text, it still matches.
   static final RegExp _pattern = RegExp(
     r'Permission is hereby granted to use, copy, modify, and distribute this\n'
     r'software \(or portions thereof\) for any purpose, without fee, subject to these\n'
@@ -267,12 +212,10 @@ class _RepositoryReadmeIjgFile extends _RepositorySingleLicenseFile {
     r'unaltered; and any additions, deletions, or changes to the original files\n'
     r'must be clearly indicated in accompanying documentation\.\n'
     r'\(2\) If only executable code is distributed, then the accompanying\n'
-    r'documentation must state that "this software is based in part on the work of\n'
-    r'the Independent JPEG Group"\.\n'
+    r'documentation must state that "' '${_message.replaceAll(" ", "[ \n]+")}' r'"\.\n'
     r'\(3\) Permission for use of this software is granted only if the user accepts\n'
     r'full responsibility for any undesirable consequences; the authors accept\n'
     r'NO LIABILITY for damages of any kind\.\n',
-    caseSensitive: false
   );
 
   static License _parseLicense(fs.TextFile io) {
@@ -290,11 +233,6 @@ class _RepositoryReadmeIjgFile extends _RepositorySingleLicenseFile {
     }
     return null;
   }
-
-  @override
-  License? licenseOfType(LicenseType type) {
-    return null;
-  }
 }
 
 class _RepositoryDartLicenseFile extends _RepositorySingleLicenseFile {
@@ -303,7 +241,6 @@ class _RepositoryDartLicenseFile extends _RepositorySingleLicenseFile {
 
   static final RegExp _pattern = RegExp(
     r'(Copyright (?:.|\n)+)$',
-    caseSensitive: false
   );
 
   static License _parseLicense(fs.TextFile io) {
@@ -313,16 +250,11 @@ class _RepositoryDartLicenseFile extends _RepositorySingleLicenseFile {
     }
     return License.template(match.group(1)!, LicenseType.bsd, origin: io.fullName);
   }
-
-  @override
-  License? licenseOfType(LicenseType type) {
-    return null;
-  }
 }
 
 class _RepositoryLibPngLicenseFile extends _RepositorySingleLicenseFile {
   _RepositoryLibPngLicenseFile(_RepositoryDirectory parent, fs.TextFile io)
-    : super(parent, io, License.blank(io.readString(), LicenseType.libpng, origin: io.fullName)) {
+    : super(parent, io, License.message(io.readString(), LicenseType.libpng, origin: io.fullName)) {
     _verifyLicense(io);
   }
 
@@ -333,103 +265,10 @@ class _RepositoryLibPngLicenseFile extends _RepositorySingleLicenseFile {
       throw 'unexpected libpng license file contents:\n----8<----\n$contents\n----<8----';
     }
   }
-
-  @override
-  License? licenseOfType(LicenseType type) {
-    if (type == LicenseType.libpng) {
-      return license;
-    }
-    return null;
-  }
-}
-
-class _RepositoryBlankLicenseFile extends _RepositorySingleLicenseFile {
-  _RepositoryBlankLicenseFile(_RepositoryDirectory parent, fs.TextFile io, String sanityCheck)
-    : super(parent, io, License.blank(io.readString(), LicenseType.unknown)) {
-    _verifyLicense(io, sanityCheck);
-  }
-
-  static void _verifyLicense(fs.TextFile io, String sanityCheck) {
-    final String contents = io.readString();
-    if (!contents.contains(sanityCheck)) {
-      throw 'unexpected file contents; wanted "$sanityCheck", but got:\n----8<----\n$contents\n----<8----';
-    }
-  }
-
-  @override
-  License? licenseOfType(LicenseType type) => null;
-}
-
-class _RepositoryCatapultApiClientLicenseFile extends _RepositorySingleLicenseFile {
-  _RepositoryCatapultApiClientLicenseFile(_RepositoryDirectory parent, fs.TextFile io)
-    : super(parent, io, _parseLicense(io));
-
-  static final RegExp _pattern = RegExp(
-    r' *Licensed under the Apache License, Version 2\.0 \(the "License"\);\n'
-    r' *you may not use this file except in compliance with the License\.\n'
-    r' *You may obtain a copy of the License at\n'
-    r' *\n'
-    r' *(http://www\.apache\.org/licenses/LICENSE-2\.0)\n'
-    r' *\n'
-    r' *Unless required by applicable law or agreed to in writing, software\n'
-    r' *distributed under the License is distributed on an "AS IS" BASIS,\n'
-    r' *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied\.\n'
-    r' *See the License for the specific language governing permissions and\n'
-    r' *limitations under the License\.\n',
-    multiLine: true,
-    caseSensitive: false,
-  );
-
-  static License _parseLicense(fs.TextFile io) {
-    final Match? match = _pattern.firstMatch(io.readString());
-    if (match == null || match.groupCount != 1) {
-      throw 'unexpected apiclient license file contents';
-    }
-    return License.fromUrl(match.group(1)!, origin: io.fullName);
-  }
-
-  @override
-  License? licenseOfType(LicenseType type) {
-    return null;
-  }
-}
-
-class _RepositoryCatapultCoverageLicenseFile extends _RepositorySingleLicenseFile {
-  _RepositoryCatapultCoverageLicenseFile(_RepositoryDirectory parent, fs.TextFile io)
-    : super(parent, io, _parseLicense(io));
-
-  static final RegExp _pattern = RegExp(
-    r' *Except where noted otherwise, this software is licensed under the Apache\n'
-    r' *License, Version 2.0 \(the "License"\); you may not use this work except in\n'
-    r' *compliance with the License\.  You may obtain a copy of the License at\n'
-    r' *\n'
-    r' *(http://www\.apache\.org/licenses/LICENSE-2\.0)\n'
-    r' *\n'
-    r' *Unless required by applicable law or agreed to in writing, software\n'
-    r' *distributed under the License is distributed on an "AS IS" BASIS,\n'
-    r' *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied\.\n'
-    r' *See the License for the specific language governing permissions and\n'
-    r' *limitations under the License\.\n',
-    multiLine: true,
-    caseSensitive: false,
-  );
-
-  static License _parseLicense(fs.TextFile io) {
-    final Match? match = _pattern.firstMatch(io.readString());
-    if (match == null || match.groupCount != 1) {
-      throw 'unexpected coverage license file contents';
-    }
-    return License.fromUrl(match.group(1)!, origin: io.fullName);
-  }
-
-  @override
-  License? licenseOfType(LicenseType type) {
-    return null;
-  }
 }
 
-class _RepositoryLibJpegTurboLicense extends _RepositoryLicenseFile {
-  _RepositoryLibJpegTurboLicense(_RepositoryDirectory parent, fs.TextFile io)
+class _RepositoryLibJpegTurboLicenseFile extends _RepositoryLicenseFile {
+  _RepositoryLibJpegTurboLicenseFile(_RepositoryDirectory parent, fs.TextFile io)
     : super(parent, io) {
     _parseLicense(io);
   }
@@ -461,33 +300,11 @@ class _RepositoryLibJpegTurboLicense extends _RepositoryLicenseFile {
     }
   }
 
-  List<License>? _licenses;
-
-  @override
-  List<License>? get licenses {
-    if (_licenses == null) {
-      final _RepositoryReadmeIjgFile readme = parent!.getChildByName('README.ijg') as _RepositoryReadmeIjgFile;
-      final _RepositorySourceFile main = parent!.getChildByName('turbojpeg.c') as _RepositorySourceFile;
-      final _RepositoryDirectory simd = parent!.getChildByName('simd') as _RepositoryDirectory;
-      final _RepositorySourceFile zlib = simd.getChildByName('jsimdext.inc') as _RepositorySourceFile;
-      _licenses = <License>[];
-      _licenses!.add(readme.license);
-      _licenses!.add(main.licenses.single);
-      _licenses!.add(zlib.licenses.single);
-    }
-    return _licenses;
-  }
-
   @override
   License? licenseWithName(String name) {
     return null;
   }
 
-  @override
-  List<License>? licensesFor(String name) {
-    return licenses;
-  }
-
   @override
   License? licenseOfType(LicenseType type) {
     return null;
@@ -495,11 +312,28 @@ class _RepositoryLibJpegTurboLicense extends _RepositoryLicenseFile {
 
   @override
   License? get defaultLicense => null;
+
+  List<License>? _licenses;
+
+  @override
+  List<License> get licenses {
+    if (_licenses == null) {
+      final _RepositoryLicenseFile readme = parent!.getChildByName('README.ijg') as _RepositoryReadmeIjgFile;
+      final _RepositorySourceFile main = parent!.getChildByName('turbojpeg.c') as _RepositorySourceFile;
+      final _RepositoryDirectory simd = parent!.getChildByName('simd') as _RepositoryDirectory;
+      final _RepositorySourceFile zlib = simd.getChildByName('jsimdext.inc') as _RepositorySourceFile;
+      _licenses = <License>[];
+      _licenses!.addAll(readme.licenses);
+      _licenses!.add(main.extractInternalLicense());
+      _licenses!.add(zlib.extractInternalLicense());
+    }
+    return _licenses!;
+  }
 }
 
 class _RepositoryFreetypeLicenseFile extends _RepositoryLicenseFile {
-  _RepositoryFreetypeLicenseFile(_RepositoryDirectory parent, fs.TextFile io)
-    : _target = _parseLicense(io), super(parent, io);
+  _RepositoryFreetypeLicenseFile(super.parent, super.io)
+    : _target = _parseLicense(io);
 
   static final RegExp _pattern = RegExp(
     r'FREETYPE LICENSES\n'
@@ -545,30 +379,27 @@ class _RepositoryFreetypeLicenseFile extends _RepositoryLicenseFile {
     r'--- end of LICENSE\.TXT ---\n*$'
   );
 
-  static String? _parseLicense(fs.TextFile io) {
+  static String _parseLicense(fs.TextFile io) {
     final Match? match = _pattern.firstMatch(io.readString());
     if (match == null || match.groupCount != 1) {
       throw 'unexpected Freetype license file contents';
     }
-    return match.group(1);
+    return match.group(1)!;
   }
 
-  final String? _target;
+  final String _target;
   List<License>? _targetLicense;
 
   void _warmCache() {
     if (parent != null && _targetLicense == null) {
       final License? license = parent!.nearestLicenseWithName(_target);
-      _targetLicense = <License>[license!];
+      if (license == null) {
+        throw 'Could not find license in Freetype directory. Make sure $_target is not excluded from consideration.';
+      }
+      _targetLicense = <License>[license];
     }
   }
 
-  @override
-  List<License>? licensesFor(String name) {
-    _warmCache();
-    return _targetLicense;
-  }
-
   @override
   License? licenseOfType(LicenseType type) => null;
 
@@ -582,47 +413,86 @@ class _RepositoryFreetypeLicenseFile extends _RepositoryLicenseFile {
   }
 
   @override
-  Iterable<License> get licenses sync* { }
+  List<License> get licenses {
+    _warmCache();
+    return _targetLicense ?? const <License>[];
+  }
 }
 
-class _RepositoryIcuLicenseFile extends _RepositoryLicenseFile {
-  _RepositoryIcuLicenseFile(_RepositoryDirectory parent, fs.TextFile io)
-    : _licenses = _parseLicense(io),
-      super(parent, io);
+class _RepositoryIcuLicenseFile extends _RepositorySingleLicenseFile {
+  factory _RepositoryIcuLicenseFile(_RepositoryDirectory parent, fs.TextFile io) {
+    final Match? match = _pattern.firstMatch(_fixup(io.readString()));
+    if (match == null) {
+      throw 'could not parse ICU license file';
+    }
+    const int groupCount = 22;
+    assert(match.groupCount == groupCount, 'ICU: expected $groupCount groups, but got ${match.groupCount}');
+    const int timeZoneGroup = 18;
+    if (match.group(timeZoneGroup)!.contains(copyrightMentionPattern)) {
+      throw 'ICU: unexpected copyright in time zone database group\n:${match.group(timeZoneGroup)}';
+    }
+    if (!match.group(timeZoneGroup)!.contains('7.  Database Ownership')) {
+      throw 'ICU: unexpected text in time zone database group\n:${match.group(timeZoneGroup)}';
+    }
+    const int gplGroup1 = 20;
+    const int gplGroup2 = 21;
+    if (!match.group(gplGroup1)!.contains(gplExceptionExplanation1) || !match.group(gplGroup2)!.contains(gplExceptionExplanation2)) {
+      throw 'ICU: did not find GPL exception in GPL-licensed files';
+    }
+    const Set<int> skippedGroups = <int>{ timeZoneGroup, gplGroup1, gplGroup2 };
+    return _RepositoryIcuLicenseFile._(
+      parent,
+      io,
+      License.template(match.group(2)!, LicenseType.bsd, origin: io.fullName),
+      License.fromMultipleBlocks(
+        match.groups(
+          Iterable<int>
+            .generate(groupCount, (int index) => index + 1)
+            .where((int index) => !skippedGroups.contains(index))
+            .toList()
+        ).cast<String>(),
+        LicenseType.icu,
+        origin: io.fullName,
+        yesWeKnowWhatItLooksLikeButItIsNot: true,
+      ),
+    );
+  }
 
-  final List<License> _licenses;
+  _RepositoryIcuLicenseFile._(_RepositoryDirectory parent, fs.TextFile io, this.template, License license)
+    : super(parent, io, license);
 
   static final RegExp _pattern = RegExp(
-    r'^UNICODE, INC\. LICENSE AGREEMENT - DATA FILES AND SOFTWARE\n+'
-    r'( *See Terms of Use (?:.|\n)+?)\n+' // 1
-    r'-+\n'
-    r'\n'
-    r'Third-Party Software Licenses\n+'
-    r' *This section contains third-party software notices and/or additional\n'
-    r' *terms for licensed third-party software components included within ICU\n'
-    r' *libraries\.\n+'
-    r'-+\n'
-    r'\n'
-    r' *ICU License - ICU 1\.8\.1 to ICU 57.1[ \n]+?'
-    r' *COPYRIGHT AND PERMISSION NOTICE\n+'
-    r'(Copyright (?:.|\n)+?)\n+' // 2
-    r'-+\n'
-    r'\n'
-    r'Chinese/Japanese Word Break Dictionary Data \(cjdict\.txt\)\n+'
-    r' #     The Google Chrome software developed by Google is licensed under\n?'
+    r'^(UNICODE, INC\. LICENSE AGREEMENT - DATA FILES AND SOFTWARE\n+' // group
+    r'See Terms of Use (?:.|\n)+?'
+    r'COPYRIGHT AND PERMISSION NOTICE\n+'
+    r'Copyright.+\n'
+    r'Distributed under the Terms of Use in .+\n+'
+    r')(Permission is hereby granted(?:.|\n)+?)' // template group
+    r'\n+-+\n+'
+    r'(Third-Party Software Licenses\n+' // group
+    r'This section contains third-party software notices and/or additional\n'
+    r'terms for licensed third-party software components included within ICU\n'
+    r'libraries\.\n+)'
+    r'-+\n+'
+    r'(ICU License - ICU 1\.8\.1 to ICU 57.1[ \n]+?' // group
+    r'COPYRIGHT AND PERMISSION NOTICE\n+'
+    r'Copyright (?:.|\n)+?)\n+'
+    r'-+\n+'
+    r'(Chinese/Japanese Word Break Dictionary Data \(cjdict\.txt\)\n+)' // group
+    r'( #     The Google Chrome software developed by Google is licensed under\n?' // group
     r' # the BSD license\. Other software included in this distribution is\n?'
     r' # provided under other licenses, as set forth below\.\n'
     r' #\n'
-    r'( #  The BSD License\n'
+    r' #  The BSD License\n'
     r' #  http://opensource\.org/licenses/bsd-license\.php\n'
-    r' # +Copyright(?:.|\n)+?)\n' // 3
+    r' # +Copyright(?:.|\n)+?)\n'
     r' #\n'
     r' #\n'
-    r' #  The word list in cjdict.txt are generated by combining three word lists\n?'
+    r'( #  The word list in cjdict.txt are generated by combining three word lists\n?' // group
     r' # listed below with further processing for compound word breaking\. The\n?'
     r' # frequency is generated with an iterative training against Google web\n?'
     r' # corpora\.\n'
-    r' #\n'
+    r' #\n' // if this section is taken out, make sure to remove the cjdict.txt exclusion in paths.dart
     r' #  \* Libtabe \(Chinese\)\n'
     r' #    - https://sourceforge\.net/project/\?group_id=1519\n'
     r' #    - Its license terms and conditions are shown below\.\n'
@@ -630,73 +500,68 @@ class _RepositoryIcuLicenseFile extends _RepositoryLicenseFile {
     r' #  \* IPADIC \(Japanese\)\n'
     r' #    - http://chasen\.aist-nara\.ac\.jp/chasen/distribution\.html\n'
     r' #    - Its license terms and conditions are shown below\.\n'
-    r' #\n'
+    r' #\n)'
     r' #  ---------COPYING\.libtabe ---- BEGIN--------------------\n'
     r' #\n'
     r' # +/\*\n'
-    r'( # +\* Copyright (?:.|\n)+?)\n' // 4
+    r'( # +\* Copyright (?:.|\n)+?)\n' // group
     r' # +\*/\n'
     r' #\n'
     r' # +/\*\n'
-    r'( # +\* Copyright (?:.|\n)+?)\n' // 5
+    r'( # +\* Copyright (?:.|\n)+?)\n' // group
     r' # +\*/\n'
     r' #\n'
-    r'( # +Copyright (?:.|\n)+?)\n' // 6
+    r'( # +Copyright (?:.|\n)+?)\n' // group
     r' #\n'
     r' # +---------------COPYING\.libtabe-----END--------------------------------\n'
     r' #\n'
     r' #\n'
     r' # +---------------COPYING\.ipadic-----BEGIN-------------------------------\n'
     r' #\n'
-    r'( # +Copyright (?:.|\n)+?)\n' // 7
+    r'( # +Copyright (?:.|\n)+?)\n' // group
     r' #\n'
-    r' # +---------------COPYING\.ipadic-----END----------------------------------\n'
-    r'\n'
-    r'-+\n'
-    r'\n'
-    r' *Lao Word Break Dictionary Data \(laodict\.txt\)\n'
-    r'\n'
-    r'( # +Copyright(?:.|\n)+?)\n' // 8
-    r'\n'
-    r'-+\n'
-    r'\n'
-    r' *Burmese Word Break Dictionary Data \(burmesedict\.txt\)\n'
-    r'\n'
-    r'( # +Copyright(?:.|\n)+?)\n' // 9
+    r' # +---------------COPYING\.ipadic-----END----------------------------------\n+'
+    r'-+\n+'
+    r'(Lao Word Break Dictionary Data \(laodict\.txt\)\n)' // group
+    r'\n' // if this section is taken out, make sure to remove the laodict.txt exclusion in paths.dart
+    r'( # +Copyright(?:.|\n)+?)' // group
+    r'( # +This file is derived(?:.|\n)+?)\n'
     r'\n'
     r'-+\n'
     r'\n'
-    r' *Time Zone Database\n'
-    r'((?:.|\n)+)\n' // 10
+    r'(Burmese Word Break Dictionary Data \(burmesedict\.txt\)\n)' // group
+    r'\n' // if this section is taken out, make sure to remove the burmesedict.txt exclusion in paths.dart
+    r'( # +Copyright(?:.|\n)+?)\n' // group
+    r' # +-+\n'
+    r'( # +Copyright(?:.|\n)+?)\n' // group
+    r' # +-+\n+'
+    r'-+\n+'
+    r'( *Time Zone Database\n'
+    r'(?:.|\n)+)\n' // group (not really a license -- excluded)
     r'\n'
     r'-+\n'
     r'\n'
-    r' *Google double-conversion\n'
+    r'(Google double-conversion\n' // group
     r'\n'
-    r'(Copyright(?:.|\n)+)\n' // 11
+    r'Copyright(?:.|\n)+)\n'
     r'\n'
     r'-+\n'
     r'\n'
-    r' *File: aclocal\.m4 \(only for ICU4C\)\n'
-    r' *Section: pkg\.m4 - Macros to locate and utilise pkg-config\.\n+'
-    r'(Copyright (?:.|\n)+?)\n' // 12
+    r'(File: aclocal\.m4 \(only for ICU4C\)\n' // group (excluded)
+    r'Section: pkg\.m4 - Macros to locate and utilise pkg-config\.\n+'
+    r'Copyright (?:.|\n)+?)\n'
     r'\n'
     r'-+\n'
     r'\n'
-    r' *File: config\.guess \(only for ICU4C\)\n+'
-    r'(This file is free software(?:.|\n)+?)\n' // 13
+    r'(File: config\.guess \(only for ICU4C\)\n+' // group (excluded)
+    r'This file is free software(?:.|\n)+?)\n'
     r'\n'
     r'-+\n'
     r'\n'
-    r' *File: install-sh \(only for ICU4C\)\n+'
-    r'(Copyright(?:.|\n)+?)\n$', // 14
-    multiLine: true,
-    caseSensitive: false
+    r'(File: install-sh \(only for ICU4C\)\n+' // group
+    r'Copyright(?:.|\n)+)',
   );
 
-  static final RegExp _unexpectedHash = RegExp(r'^.+ #', multiLine: true);
-  static final RegExp _newlineHash = RegExp(r' # ?');
-
   static const String gplExceptionExplanation1 =
     'As a special exception to the GNU General Public License, if you\n'
     'distribute this file as part of a program that contains a\n'
@@ -722,252 +587,332 @@ class _RepositoryIcuLicenseFile extends _RepositoryLicenseFile {
     'ICU4C includes a configuration script generated by Autoconf,\n'
     'namely the `configure` script.)';
 
-  static String _dewrap(String s) {
-    if (!s.startsWith(' # ')) {
-      return s;
-    }
-    if (s.contains(_unexpectedHash)) {
-      throw 'ICU license file contained unexpected hash sequence';
-    }
-    if (s.contains('\x2028')) {
-      throw 'ICU license file contained unexpected line separator';
+  // Fixes an error in the license's formatting that our reformatter wouldn't be
+  // able to figure out on its own and which would otherwise completely mess up
+  // the reformatting of this license file.
+  static String _fixup(String license) {
+    return license.replaceAll(
+      ' #       *                    Sinica. All rights reserved.',
+      ' #   *                    Sinica. All rights reserved.',
+    );
+  }
+
+  final License template;
+
+  @override
+  License? licenseOfType(LicenseType type) {
+    if (type == LicenseType.defaultTemplate) {
+      return template;
     }
-    return s.replaceAll(_newlineHash, '\x2028').replaceAll('\n', '').replaceAll('\x2028', '\n');
+    return super.licenseOfType(type);
   }
+}
+
+class _RepositoryCxxStlDualLicenseFile extends _RepositoryLicenseFile {
+  _RepositoryCxxStlDualLicenseFile(super.parent, super.io)
+    : _licenses = _parseLicenses(io);
+
+  static final RegExp _pattern = RegExp(
+    r'^'
+    r'==============================================================================\n'
+    r'The LLVM Project is under the Apache License v2\.0 with LLVM Exceptions:\n'
+    r'==============================================================================\n'
+    r'\n('
+    r' *Apache License\n'
+    r' *Version 2.0, January 2004\n'
+    r' *http://www.apache.org/licenses/\n'
+    r'\n'
+    r'.+?)\n+'
+    r'---- LLVM Exceptions to the Apache 2.0 License ----'
+    r'.+?'
+    r'==============================================================================\n'
+    r'Software from third parties included in the LLVM Project:\n'
+    r'==============================================================================\n'
+    r'The LLVM Project contains third party software which is under different license\n'
+    r'terms\. All such code will be identified clearly using at least one of two\n'
+    r'mechanisms:\n'
+    r'1\) It will be in a separate directory tree with its own `LICENSE\.txt` or\n'
+    r' *`LICENSE` file at the top containing the specific license and restrictions\n'
+    r' *which apply to that software, or\n'
+    r'2\) It will contain specific license and restriction terms at the top of every\n'
+    r' *file\.\n'
+    r'\n'
+    r'==============================================================================\n'
+    r'Legacy LLVM License \(https://llvm\.org/docs/DeveloperPolicy\.html#legacy\):\n'
+    r'==============================================================================\n'
+    r'\n'
+    r'The libc\+\+(?:abi)? library is dual licensed under both the University of Illinois\n'
+    r'"BSD-Like" license and the MIT license\. *As a user of this code you may choose\n'
+    r'to use it under either license\. *As a contributor, you agree to allow your code\n'
+    r'to be used under both\.\n'
+    r'\n'
+    r'Full text of the relevant licenses is included below\.\n'
+    r'\n'
+    r'==============================================================================\n'
+    r'\n'
+    r'University of Illinois/NCSA\n'
+    r'Open Source License\n'
+    r'\n'
+    r'(Copyright \(c\) 2009-2019 by the contributors listed in CREDITS\.TXT\n'
+    r'\n'
+    r'All rights reserved\.\n'
+    r'\n'
+    r'Developed by:\n'
+    r'\n'
+    r' *LLVM Team\n'
+    r'\n'
+    r' *University of Illinois at Urbana-Champaign\n'
+    r'\n'
+    r' *http://llvm\.org\n'
+    r'\n'
+    r'Permission is hereby granted, free of charge, to any person obtaining a copy of\n'
+    r'this software and associated documentation files \(the "Software"\), to deal with\n'
+    r'the Software without restriction, including without limitation the rights to\n'
+    r'use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies\n'
+    r'of the Software, and to permit persons to whom the Software is furnished to do\n'
+    r'so, subject to the following conditions:\n'
+    r'\n'
+    r' *\* Redistributions of source code must retain the above copyright notice,\n'
+    r' *this list of conditions and the following disclaimers\.\n'
+    r'\n'
+    r' *\* Redistributions in binary form must reproduce the above copyright notice,\n'
+    r' *this list of conditions and the following disclaimers in the\n'
+    r' *documentation and/or other materials provided with the distribution\.\n'
+    r'\n'
+    r' *\* Neither the names of the LLVM Team, University of Illinois at\n'
+    r' *Urbana-Champaign, nor the names of its contributors may be used to\n'
+    r' *endorse or promote products derived from this Software without specific\n'
+    r' *prior written permission\.\n'
+    r'\n'
+    r'THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n'
+    r'IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS\n'
+    r'FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT\.  IN NO EVENT SHALL THE\n'
+    r'CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n'
+    r'LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n'
+    r'OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE\n'
+    r'SOFTWARE\.)\n*'
+    r'==============================================================================\n*'
+    r'(Copyright \(c\) 2009-2014 by the contributors listed in CREDITS\.TXT\n'
+    r'\n'
+    r'Permission is hereby granted, free of charge, to any person obtaining a copy\n'
+    r'of this software and associated documentation files \(the "Software"\), to deal\n'
+    r'in the Software without restriction, including without limitation the rights\n'
+    r'to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n'
+    r'copies of the Software, and to permit persons to whom the Software is\n'
+    r'furnished to do so, subject to the following conditions:\n'
+    r'\n'
+    r'The above copyright notice and this permission notice shall be included in\n'
+    r'all copies or substantial portions of the Software\.\n'
+    r'\n'
+    r'THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n'
+    r'IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n'
+    r'FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT\. IN NO EVENT SHALL THE\n'
+    r'AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n'
+    r'LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n'
+    r'OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n'
+    r'THE SOFTWARE\.)\n*'
+    r'$',
+    dotAll: true,
+  );
 
-  static List<License> _parseLicense(fs.TextFile io) {
+  static List<License> _parseLicenses(fs.TextFile io) {
     final Match? match = _pattern.firstMatch(io.readString());
     if (match == null) {
-      throw 'could not parse ICU license file';
+      throw 'unexpected license file contents';
+    }
+    if (match.groupCount != 3) {
+      throw 'internal error; match count inconsistency\nRemainder:[[${match.input.substring(match.end)}]]';
     }
-    assert(match.groupCount == 14);
-    if (match.group(10)!.contains(copyrightMentionPattern) || match.group(11)!.contains('7.')) {
-      throw 'unexpected copyright in ICU license file';
-    }
-    if (!match.group(12)!.contains(gplExceptionExplanation1) || !match.group(13)!.contains(gplExceptionExplanation2)) {
-      throw 'did not find GPL exception in GPL-licensed files';
-    }
-    final List<License> result = <License>[
-      License.fromBodyAndType(_dewrap(match.group(1)!), LicenseType.unknown, origin: io.fullName),
-      License.fromBodyAndType(_dewrap(match.group(2)!), LicenseType.icu, origin: io.fullName),
-      License.fromBodyAndType(_dewrap(match.group(3)!), LicenseType.bsd, origin: io.fullName),
-      License.fromBodyAndType(_dewrap(match.group(4)!), LicenseType.bsd, origin: io.fullName),
-      License.fromBodyAndType(_dewrap(match.group(5)!), LicenseType.bsd, origin: io.fullName),
-      License.fromBodyAndType(_dewrap(match.group(6)!), LicenseType.unknown, origin: io.fullName),
-      License.fromBodyAndType(_dewrap(match.group(7)!), LicenseType.unknown, origin: io.fullName),
-      License.fromBodyAndType(_dewrap(match.group(8)!), LicenseType.bsd, origin: io.fullName),
-      License.fromBodyAndType(_dewrap(match.group(9)!), LicenseType.bsd, origin: io.fullName),
-      License.fromBodyAndType(_dewrap(match.group(11)!), LicenseType.bsd, origin: io.fullName),
-      // Matches 12 and 13 are for the GPL3 license. However, they are covered by an exemption
-      // (they are exempt because ICU4C includes a configuration script generated by Autoconf)
-      License.fromBodyAndType(_dewrap(match.group(14)!), LicenseType.mit, origin: io.fullName),
+    return <License>[
+      // License.fromBodyAndType(match.group(1), LicenseType.apache), // the exception says we can ignore this
+      License.fromBodyAndType(match.group(2)!, LicenseType.bsd, origin: io.fullName),
+      License.fromBodyAndType(match.group(3)!, LicenseType.mit, origin: io.fullName),
     ];
-    return result;
   }
 
-  @override
-  List<License> licensesFor(String name) {
-    return _licenses;
-  }
+  final List<License> _licenses;
 
   @override
   License licenseOfType(LicenseType type) {
-    if (type == LicenseType.icu) {
-      return _licenses[0];
-    }
-    throw "tried to use ICU license file to find a license by type but type wasn't ICU";
+    throw 'tried to look up a dual-license license by type ("$type")';
   }
 
   @override
   License licenseWithName(String name) {
-    throw 'tried to use ICU license file to find a license by name';
+    throw 'tried to look up a dual-license license by name ("$name")';
   }
 
   @override
   License get defaultLicense => _licenses[0];
 
   @override
-  Iterable<License> get licenses => _licenses;
+  List<License> get licenses => _licenses;
 }
 
-Iterable<List<int>> splitIntList(List<int> data, int boundary) sync* {
-  int index = 0;
-  List<int> getOne() {
-    final int start = index;
-    int end = index;
-    while ((end < data.length) && (data[end] != boundary)) {
-      end += 1;
-    }
-    end += 1;
-    index = end;
-    return data.sublist(start, end).toList();
-  }
+class _RepositoryKhronosLicenseFile extends _RepositoryLicenseFile {
+  _RepositoryKhronosLicenseFile(super.parent, super.io)
+    : _licenses = _parseLicenses(io);
 
-  while (index < data.length) {
-    yield getOne();
-  }
-}
+  static final RegExp _pattern = RegExp(
+    r'^(Copyright .+?)\n'
+    r'SGI FREE SOFTWARE LICENSE B[^\n]+\n\n'
+    r'(Copyright .+?)$',
+    dotAll: true,
+  );
 
-class _RepositoryMultiLicenseNoticesForFilesFile extends _RepositoryLicenseFile {
-  _RepositoryMultiLicenseNoticesForFilesFile(_RepositoryDirectory parent, fs.File io)
-    : _licenses = _parseLicense(io),
-      super(parent, io);
-
-  final Map<String, License> _licenses;
-
-  static Map<String, License> _parseLicense(fs.File io) {
-    final Map<String, License> result = <String, License>{};
-    // Files of this type should begin with:
-    // "Notices for files contained in the"
-    // ...then have a second line which is 60 "=" characters
-    final List<List<int>> contents = splitIntList(io.readBytes()!, 0x0A).toList();
-    if (!ascii.decode(contents[0]).startsWith('Notices for files contained in') ||
-        ascii.decode(contents[1]) != '============================================================\n') {
-      throw 'unrecognised syntax: ${io.fullName}';
-    }
-    int index = 2;
-    while (index < contents.length) {
-      if (ascii.decode(contents[index]) != 'Notices for file(s):\n') {
-        throw 'unrecognised syntax on line ${index + 1}: ${io.fullName}';
-      }
-      index += 1;
-      final List<String> names = <String>[];
-      do {
-        names.add(ascii.decode(contents[index]));
-        index += 1;
-      } while (ascii.decode(contents[index]) != '------------------------------------------------------------\n');
-      index += 1;
-      final List<List<int>> body = <List<int>>[];
-      do {
-        body.add(contents[index]);
-        index += 1;
-      } while (index < contents.length &&
-          ascii.decode(contents[index], allowInvalid: true) != '============================================================\n');
-      index += 1;
-      final List<int> bodyBytes = body.expand((List<int> line) => line).toList();
-      String bodyText;
-      try {
-        bodyText = utf8.decode(bodyBytes);
-      } on FormatException {
-        bodyText = latin1.decode(bodyBytes);
-      }
-      final License license = License.unique(bodyText, LicenseType.unknown, origin: io.fullName);
-      for (final String name in names) {
-        if (result[name] != null) {
-          throw 'conflicting license information for $name in ${io.fullName}';
-        }
-        result[name] = license;
-      }
+  static List<License> _parseLicenses(fs.TextFile io) {
+    final Match? match = _pattern.firstMatch(io.readString());
+    if (match == null || match.groupCount != 2) {
+      throw 'unexpected Khronos license file contents';
     }
-    return result;
+    return <License>[
+      License.fromBodyAndType(match.group(1)!, LicenseType.mit, origin: io.fullName),
+      License.fromBodyAndType(match.group(2)!, LicenseType.mit, origin: io.fullName),
+    ];
   }
 
-  @override
-  List<License>? licensesFor(String name) {
-    final License? license = _licenses[name];
-    if (license != null) {
-      return <License>[license];
-    }
-    return null;
-  }
+  final List<License> _licenses;
 
   @override
   License licenseOfType(LicenseType type) {
-    throw 'tried to use multi-license license file to find a license by type';
+    throw 'tried to look up a combination license by type ("$type")';
   }
 
   @override
   License licenseWithName(String name) {
-    throw 'tried to use multi-license license file to find a license by name';
+    throw 'tried to look up a combination license by name ("$name")';
   }
 
   @override
   License get defaultLicense {
-    assert(false);
-    throw '$this ($runtimeType) does not have a concept of a "default" license';
+    throw 'there is no default Khronos license';
   }
 
   @override
-  Iterable<License> get licenses => _licenses.values;
+  List<License> get licenses => _licenses;
 }
 
-class _RepositoryCxxStlDualLicenseFile extends _RepositoryLicenseFile {
-  _RepositoryCxxStlDualLicenseFile(_RepositoryDirectory parent, fs.TextFile io)
-    : _licenses = _parseLicenses(io), super(parent, io);
+/// The BoringSSL license file.
+///
+/// This file contains a bunch of different licenses, but other files
+/// refer to it as if it was a monolithic license so we sort of have
+/// to treat the whole thing as a MultiLicense.
+class _RepositoryOpenSSLLicenseFile extends _RepositorySingleLicenseFile {
+  _RepositoryOpenSSLLicenseFile(_RepositoryDirectory parent, fs.TextFile io)
+    : super(parent, io, _parseLicense(io));
 
   static final RegExp _pattern = RegExp(
-    r'==============================================================================\n'
-    r'.+ License.*\n'
-    r'==============================================================================\n'
-    r'\n'
-    r'The .+ library is dual licensed under both the University of Illinois\n'
-    r'"BSD-Like" license and the MIT license\. +As a user of this code you may choose\n'
-    r'to use it under either license\. +As a contributor, you agree to allow your code\n'
-    r'to be used under both\.\n'
-    r'\n'
-    r'Full text of the relevant licenses is included below\.\n'
-    r'\n'
-    r'==============================================================================\n'
-    r'((?:.|\n)+)\n'
-    r'==============================================================================\n'
-    r'((?:.|\n)+)'
-    r'$'
+    // advice is to skip the first 27 lines of this file in the LICENSE file
+    r'^BoringSSL is a fork of OpenSSL. As such, .+?'
+    r'The following are Google-internal bug numbers where explicit permission from\n'
+    r'some authors is recorded for use of their work\. \(This is purely for our own\n'
+    r'record keeping\.\)\n+'
+    r'[0-9+ \n]+\n+'
+    r'(' // 1
+    r' *OpenSSL License\n'
+    r' *---------------\n+)'
+    r'(.+?)\n+' // 2
+    r'(' // 3
+    r' *Original SSLeay License\n'
+    r' *-----------------------\n+)'
+    r'(.+?)\n+' // 4
+    r'( *ISC license used for completely new code in BoringSSL:\n+)' // 5
+    r'(.+?)\n+' // 6
+    r'( *The code in third_party/fiat carries the MIT license:\n+)' // 7
+    r'(.+?)\n+' // 8
+    r'(' // 9
+    r' *Licenses for support code\n'
+    r' *-------------------------\n+)'
+    r'(.+?)\n+' // 10
+    r'(BoringSSL uses the Chromium test infrastructure to run a continuous build,\n' // 11
+    r'trybots etc\. The scripts which manage this, and the script for generating build\n'
+    r'metadata, are under the Chromium license\. Distributing code linked against\n'
+    r'BoringSSL does not trigger this license\.)\n+'
+    r'(.+?)\n+$', // 12
+    dotAll: true,
   );
 
-  static List<License> _parseLicenses(fs.TextFile io) {
+  static License _parseLicense(fs.TextFile io) {
     final Match? match = _pattern.firstMatch(io.readString());
-    if (match == null || match.groupCount != 2) {
-      throw 'unexpected dual license file contents';
-    }
-    return <License>[
-      License.fromBodyAndType(match.group(1)!, LicenseType.bsd),
-      License.fromBodyAndType(match.group(2)!, LicenseType.mit),
-    ];
+    if (match == null) {
+      throw 'Failed to match OpenSSL license pattern.';
+    }
+    assert(match.groupCount == 12);
+    return License.fromMultipleBlocks(
+      List<String>.generate(match.groupCount, (int index) => match.group(index + 1)!).toList(),
+      LicenseType.openssl,
+      origin: io.fullName,
+      authors: 'The OpenSSL Project Authors',
+      yesWeKnowWhatItLooksLikeButItIsNot: true, // looks like BSD, but...
+    );
   }
+}
 
-  final List<License> _licenses;
+class _RepositoryFuchsiaSdkLinuxLicenseFile extends _RepositorySingleLicenseFile {
+  _RepositoryFuchsiaSdkLinuxLicenseFile(_RepositoryDirectory parent, fs.TextFile io)
+    : super(parent, io, _parseLicense(io));
 
-  @override
-  List<License> licensesFor(String name) {
-    return _licenses;
-  }
+  static const String _pattern = 'The majority of files in this project use the Apache 2.0 License.\n'
+                                 'There are a few exceptions and their license can be found in the source.\n'
+                                 'Any license deviations from Apache 2.0 are "more permissive" licenses.\n';
 
-  @override
-  License licenseOfType(LicenseType type) {
-    throw 'tried to look up a dual-license license by type ("$type")';
+  static License _parseLicense(fs.TextFile io) {
+    final String body = io.readString();
+    if (!body.startsWith(_pattern)) {
+      throw 'unexpected Fuchsia license file contents';
+    }
+    return License.fromBodyAndType(body.substring(_pattern.length), LicenseType.apache, origin: io.fullName);
   }
+}
 
-  @override
-  License licenseWithName(String name) {
-    throw 'tried to look up a dual-license license by name ("$name")';
-  }
+/// The BoringSSL license file.
+///
+/// This file contains a bunch of different licenses, but other files
+/// refer to it as if it was a monolithic license so we sort of have
+/// to treat the whole thing as a MultiLicense.
+class _RepositoryVulkanApacheLicenseFile extends _RepositorySingleLicenseFile {
+  _RepositoryVulkanApacheLicenseFile(_RepositoryDirectory parent, fs.TextFile io)
+    : super(parent, io, _parseLicense(io));
 
-  @override
-  License get defaultLicense => _licenses[0];
+  static const String _prefix =
+    'The majority of files in this project use the Apache 2.0 License.\n'
+    'There are a few exceptions and their license can be found in the source.\n'
+    'Any license deviations from Apache 2.0 are "more permissive" licenses.\n'
+    "Any file without a license in it's source defaults to the repository Apache 2.0 License.\n"
+    '\n'
+    '===========================================================================================\n'
+    '\n';
 
-  @override
-  Iterable<License> get licenses => _licenses;
+  static License _parseLicense(fs.TextFile io) {
+    final String body = io.readString();
+    if (!body.startsWith(_prefix)) {
+      throw 'Failed to match Vulkan Apache license prefix.';
+    }
+    return License.fromBody(body.substring(_prefix.length), origin: io.fullName);
+  }
 }
 
+
 // DIRECTORIES
 
+typedef _Constructor = _RepositoryFile Function(_RepositoryDirectory parent, fs.TextFile);
+
 class _RepositoryDirectory extends _RepositoryEntry implements LicenseSource {
-  _RepositoryDirectory(_RepositoryDirectory? parent, fs.Directory io) : super(parent, io) {
+  _RepositoryDirectory(super.parent, fs.Directory super.io) {
     crawl();
   }
 
   fs.Directory get ioDirectory => super.io as fs.Directory;
+  fs.Directory get rootDirectory => parent != null ? parent!.rootDirectory : ioDirectory;
 
   final List<_RepositoryDirectory> _subdirectories = <_RepositoryDirectory>[];
   final List<_RepositoryLicensedFile> _files = <_RepositoryLicensedFile>[];
   final List<_RepositoryLicenseFile> _licenses = <_RepositoryLicenseFile>[];
+  static final List<fs.IoNode> _excluded = <fs.IoNode>[];
 
   List<_RepositoryDirectory> get subdirectories => _subdirectories;
 
-  final Map<String, _RepositoryEntry> _childrenByName = <String, _RepositoryEntry>{};
-
-  // the bit at the beginning excludes files like "license.py".
-  static final RegExp _licenseNamePattern = RegExp(r'^(?!.*\.py$)(?!.*(?:no|update)-copyright)(?!.*mh-bsd-gcc).*\b_*(?:license(?!\.html)|copying|copyright|notice|l?gpl|bsd|mpl?|ftl\.txt)_*\b', caseSensitive: false);
+  final Map<String,_RepositoryEntry> _childrenByName = <String,_RepositoryEntry>{};
 
   void crawl() {
     for (final fs.IoNode entry in ioDirectory.walk) {
@@ -980,7 +925,6 @@ class _RepositoryDirectory extends _RepositoryEntry implements LicenseSource {
         } else if (entry is fs.File) {
           try {
             final _RepositoryFile child = createFile(entry);
-            assert(child != null);
             if (child is _RepositoryLicensedFile) {
               _files.add(child);
             } else {
@@ -988,16 +932,16 @@ class _RepositoryDirectory extends _RepositoryEntry implements LicenseSource {
               _licenses.add(child as _RepositoryLicenseFile);
             }
             _childrenByName[child.name] = child;
-          } catch (e) {
-            system.stderr.writeln('failed to handle $entry: $e');
-            rethrow;
+          } catch (error, stack) {
+            throw 'failed to handle $entry\n$error\nOriginal stack:\n$stack';
           }
         } else {
           assert(entry is fs.Link);
         }
+      } else {
+        _excluded.add(entry);
       }
     }
-
     for (final _RepositoryDirectory child in virtualSubdirectories) {
       _subdirectories.add(child);
       _childrenByName[child.name] = child;
@@ -1008,44 +952,31 @@ class _RepositoryDirectory extends _RepositoryEntry implements LicenseSource {
   // direct child of this directory's filesystem node.
   List<_RepositoryDirectory> get virtualSubdirectories => <_RepositoryDirectory>[];
 
-  /// Standard directory names containing files that should be ignored by the
-  /// license script.
-  ///
-  /// Do not include repository-level directories here. Instead use one of:
-  ///
-  /// - [_RepositoryFlutterDirectory], to filter specific sub-directories at the
-  ///   flutter/engine repository level.
-  /// - [_EngineSrcDirectory], to filter specific sub-directories under the src/
-  ///   directory (a.k.a. buildroot).
   bool shouldRecurse(fs.IoNode entry) {
-    return !entry.fullName.endsWith('third_party/gn') &&
-           !entry.fullName.endsWith('third_party/gradle') &&
-           !entry.fullName.endsWith('third_party/imgui') &&
-           !entry.fullName.endsWith('third_party/json/LICENSES') &&
-           !entry.fullName.endsWith('third_party/json/docs') &&
-           !entry.fullName.endsWith('third_party/ninja') &&
-           !entry.fullName.endsWith('third_party/tinygltf') &&
-           !entry.fullName.endsWith('third_party/test_shaders') &&
-            entry.name != '.ccls-cache' &&
-            entry.name != '.cipd' &&
-            entry.name != '.git' &&
-            entry.name != '.github' &&
-            entry.name != '.gitignore' &&
-            entry.name != '.reuse' &&
-            entry.name != '.vscode' &&
-            entry.name != 'javatests' &&
-            entry.name != 'fixtures' &&
-            entry.name != 'playground' &&
-            entry.name != 'test' &&
-            entry.name != 'test.disabled' &&
-            entry.name != 'test_runner' &&
-            entry.name != 'test_support' &&
-            entry.name != 'testdata' &&
-            entry.name != 'tests' &&
-            entry.name != 'testing' &&
-            entry.name != '.dart_tool';  // Generated by various Dart tools, such as pub and
-                                         // build_runner. Skip it because it does not contain
-                                         // source code.
+    if (entry is fs.File) {
+      if (skippedCommonFiles.contains(entry.name)) {
+        return false;
+      }
+      if (skippedCommonExtensions.contains(path.extension(entry.name))) {
+        return false;
+      }
+    } else if (entry is fs.Directory) {
+      if (skippedCommonDirectories.contains(entry.name)) {
+        return false;
+      }
+    } else {
+      throw 'unexpected entry type ${entry.runtimeType}: ${entry.fullName}';
+    }
+    final String target = path.relative(entry.fullName, from: rootDirectory.fullName);
+    if (skippedPaths.contains(target)) {
+      return false;
+    }
+    for (final Pattern pattern in skippedFilePatterns) {
+      if (target.contains(pattern)) {
+        return false;
+      }
+    }
+    return true;
   }
 
   _RepositoryDirectory createSubdirectory(fs.Directory entry) {
@@ -1055,119 +986,89 @@ class _RepositoryDirectory extends _RepositoryEntry implements LicenseSource {
     return _RepositoryDirectory(this, entry);
   }
 
+  // the bit at the beginning excludes files like "license.py".
+  static final RegExp _licenseNamePattern = RegExp(r'^(?!.*\.py$)(?!.*(?:no|update)-copyright)(?!.*mh-bsd-gcc).*\b_*(?:license(?!\.html)|copying|copyright|notice|l?gpl|GPLv2|bsd|mit|mpl?|ftl|Apache)_*\b', caseSensitive: false);
+
+  static const Map<String, _Constructor> _specialCaseFiles = <String, _Constructor>{
+    '/flutter/third_party/boringssl/src/LICENSE': _RepositoryOpenSSLLicenseFile.new,
+    '/flutter/third_party/freetype2/LICENSE.TXT': _RepositoryFreetypeLicenseFile.new,
+    '/flutter/third_party/icu/LICENSE': _RepositoryIcuLicenseFile.new,
+    '/flutter/third_party/inja/third_party/include/nlohmann/json.hpp': _RepositoryInjaJsonFile.new,
+    '/flutter/third_party/libjpeg-turbo/src/LICENSE': _RepositoryLibJpegTurboLicenseFile.new,
+    '/flutter/third_party/libjpeg-turbo/src/README.ijg': _RepositoryReadmeIjgFile.new,
+    '/flutter/third_party/libpng/LICENSE': _RepositoryLibPngLicenseFile.new,
+    '/flutter/third_party/rapidjson/LICENSE': _RepositoryOpaqueLicenseFile.new,
+    '/flutter/third_party/rapidjson/license.txt': _RepositoryOpaqueLicenseFile.new,
+    '/flutter/third_party/vulkan-deps/vulkan-validation-layers/src/LICENSE.txt': _RepositoryVulkanApacheLicenseFile.new,
+    '/fuchsia/sdk/linux/LICENSE.vulkan': _RepositoryFuchsiaSdkLinuxLicenseFile.new,
+    '/fuchsia/sdk/mac/LICENSE.vulkan': _RepositoryFuchsiaSdkLinuxLicenseFile.new,
+    '/third_party/dart/LICENSE': _RepositoryDartLicenseFile.new,
+    '/third_party/khronos/LICENSE': _RepositoryKhronosLicenseFile.new,
+    '/third_party/libcxx/LICENSE.TXT': _RepositoryCxxStlDualLicenseFile.new,
+    '/third_party/libcxxabi/LICENSE.TXT': _RepositoryCxxStlDualLicenseFile.new,
+  };
+
   _RepositoryFile createFile(fs.IoNode entry) {
+    final String key = '/${path.relative(entry.fullName, from: rootDirectory.fullName)}';
+    final _Constructor? constructor = _specialCaseFiles[key];
     if (entry is fs.TextFile) {
-      if (_RepositoryApache4DNoticeFile.consider(entry)) {
-        return _RepositoryApache4DNoticeFile(this, entry);
-      } else {
-        _RepositoryFile? result;
-        if (entry.name == 'NOTICE') {
-          result = _RepositoryLicenseRedirectFile.maybeCreateFrom(this, entry);
-        }
-        if (result != null) {
-          return result;
-        } else if (entry.name.contains(_licenseNamePattern)) {
-          return _RepositoryGeneralSingleLicenseFile(this, entry);
-        } else if (entry.name == 'README.ijg') {
-          return _RepositoryReadmeIjgFile(this, entry);
-        } else {
-          return _RepositorySourceFile(this, entry);
-        }
+      if (constructor != null) {
+        return constructor(this, entry);
       }
-    } else if (entry.name == 'NOTICE.txt') {
-      return _RepositoryMultiLicenseNoticesForFilesFile(this, entry as fs.File);
-    } else {
-      return _RepositoryBinaryFile(this, entry as fs.File);
+      if (entry.name.contains(_licenseNamePattern)) {
+        return _RepositoryGeneralSingleLicenseFile(this, entry);
+      }
+      return _RepositorySourceFile(this, entry);
     }
+    return _RepositoryBinaryFile(this, entry as fs.File);
   }
 
   int get count => _files.length + _subdirectories.fold<int>(0, (int count, _RepositoryDirectory child) => count + child.count);
 
+  bool _canGoUp() {
+    assert(parent != null || isLicenseRoot);
+    return isLicenseRootException || (!isLicenseRoot && !parent!.subdirectoriesAreLicenseRoots);
+  }
+
   @override
-  List<License>? nearestLicensesFor(String name) {
+  List<License> nearestLicensesFor(String name) {
     if (_licenses.isEmpty) {
-      if (_canGoUp(null)) {
-        return parent?.nearestLicensesFor('${io.name}/$name');
+      if (_canGoUp()) {
+        return parent!.nearestLicensesFor('${io.name}/$name');
       }
-      return null;
+      return const <License>[];
     }
-    if (_licenses.length == 1) {
-      return _licenses.single.licensesFor(name);
-    }
-    final List<License> licenses = _licenses.expand((_RepositoryLicenseFile license) sync* {
-      final List<License>? licenses = license.licensesFor(name);
-      if (licenses != null) {
-        yield* licenses;
-      }
+    return _licenses.expand((_RepositoryLicenseFile license) {
+      return license.licensesFor(name);
     }).toList();
-    if (licenses.isEmpty) {
-      return null;
-    }
-    if (licenses.length > 1) {
-      //print('unexpectedly found multiple matching licenses for: $name');
-      return licenses; // TODO(ianh): disambiguate them, in case we have e.g. a dual GPL/BSD situation
-    }
-    return licenses;
   }
 
+  final Map<LicenseType, License?> _nearestLicenseOfTypeCache = <LicenseType, License?>{};
+
+  /// Searches the current directory, all parent directories up to the license
+  /// root, and all their descendants, for a license of the specified type.
   @override
   License? nearestLicenseOfType(LicenseType type) {
-    License? result = _nearestAncestorLicenseWithType(type);
-    if (result == null) {
-      for (final _RepositoryDirectory directory in _subdirectories) {
-        result = directory._localLicenseWithType(type);
-        if (result != null) {
-          break;
-        }
+    return _nearestLicenseOfTypeCache.putIfAbsent(type, () {
+      final License? result = _localLicenseWithType(type);
+      if (result != null) {
+        return result;
       }
-    }
-    result ??= _fullWalkUpForLicenseWithType(type);
-    return result;
-  }
-
-  /// Searches the current and all parent directories (up to the license root)
-  /// for a license of the specified type.
-  License? _nearestAncestorLicenseWithType(LicenseType type) {
-    final License? result = _localLicenseWithType(type);
-    if (result != null) {
-      return result;
-    }
-    if (_canGoUp(null)) {
-      return parent?._nearestAncestorLicenseWithType(type);
-    }
-    return null;
-  }
-
-  /// Searches all subdirectories below the current license root for a license
-  /// of the specified type.
-  License? _fullWalkUpForLicenseWithType(LicenseType type) {
-    return _canGoUp(null)
-            ? parent?._fullWalkUpForLicenseWithType(type)
-            : _fullWalkDownForLicenseWithType(type);
-  }
-
-  /// Searches the current directory and all subdirectories for a license of
-  /// the specified type.
-  License? _fullWalkDownForLicenseWithType(LicenseType type) {
-    License? result = _localLicenseWithType(type);
-    if (result == null) {
-      for (final _RepositoryDirectory directory in _subdirectories) {
-        result = directory._fullWalkDownForLicenseWithType(type);
-        if (result != null) {
-          break;
-        }
+      if (_canGoUp()) {
+        return parent!.nearestLicenseOfType(type);
       }
-    }
-    return result;
+      return _fullWalkDownForLicenseWithType(type);
+    });
   }
 
   /// Searches the current directory for licenses of the specified type.
   License? _localLicenseWithType(LicenseType type) {
-    final List<License> licenses = _licenses.expand((_RepositoryLicenseFile license) sync* {
+    final List<License> licenses = _licenses.expand((_RepositoryLicenseFile license) {
       final License? result = license.licenseOfType(type);
       if (result != null) {
-        yield result;
+        return <License>[result];
       }
+      return const <License>[];
     }).toList();
     if (licenses.length > 1) {
       print('unexpectedly found multiple matching licenses in $name of type $type');
@@ -1179,63 +1080,83 @@ class _RepositoryDirectory extends _RepositoryEntry implements LicenseSource {
     return null;
   }
 
-  @override
-  License? nearestLicenseWithName(String? name, {String? authors}) {
-    License? result = _nearestAncestorLicenseWithName(name, authors: authors);
-    if (result == null) {
-      for (final _RepositoryDirectory directory in _subdirectories) {
-        result = directory._localLicenseWithName(name, authors: authors);
+  /// Searches all subdirectories (depth-first) for a license of the specified type.
+  License? _fullWalkDownForLicenseWithType(LicenseType type) {
+    for (final _RepositoryDirectory directory in _subdirectories) {
+      if (directory._canGoUp()) { // avoid crawling into other license scopes
+        final License? result = directory._localLicenseWithType(type) ?? directory._fullWalkDownForLicenseWithType(type);
         if (result != null) {
-          break;
+          return result;
         }
       }
     }
-    result ??= _fullWalkUpForLicenseWithName(name, authors: authors);
-    result ??= _fullWalkUpForLicenseWithName(name, authors: authors, ignoreCase: true);
-    if (authors != null && result == null) {
-      // if (result == null)
-      //   print('could not find $name for authors "$authors", now looking for any $name in $this');
-      result = nearestLicenseWithName(name);
-      // if (result == null)
-      //   print('completely failed to find $name for authors "$authors"');
-      // else
-      //   print('ended up finding a $name for "${result.authors}" instead');
-    }
-    return result;
+    return null;
   }
 
-  bool _canGoUp(String? authors) {
-    return parent != null && (authors != null || isLicenseRootException || (!isLicenseRoot && !parent!.subdirectoriesAreLicenseRoots));
+  final Map<String, License?> _nearestLicenseWithNameCache = <String, License?>{};
+
+  @override
+  License? nearestLicenseWithName(String name, {String? authors}) {
+    assert(!name.contains('\x00'));
+    assert(authors == null || !authors.contains('\x00'));
+    assert(authors == null || authors != '${null}');
+    final License? result = _nearestLicenseWithNameCache.putIfAbsent('$name\x00$authors', () {
+      final License? result = _localLicenseWithName(name, authors: authors);
+      if (result != null) {
+        return result;
+      }
+      if (_canGoUp()) {
+        return parent!.nearestLicenseWithName(name, authors: authors);
+      }
+      return _fullWalkDownForLicenseWithName(name, authors: authors)
+          ?? (authors != null ? parent?._fullWalkUpForLicenseWithName(name, authors: authors) : null);
+    });
+    return result;
   }
 
-  License? _nearestAncestorLicenseWithName(String? name, { String? authors }) {
-    final License? result = _localLicenseWithName(name, authors: authors);
-    if (result != null) {
-      return result;
+  License? _localLicenseWithName(String name, { String? authors }) {
+    final _RepositoryEntry? entry = _childrenByName[name];
+    License? license;
+    if (entry is _RepositoryLicensedFile) {
+      license = entry.extractInternalLicense();
+    } else if (entry is _RepositoryLicenseFile) {
+      license = entry.defaultLicense;
+    } else if (entry != null) {
+      if (authors == null) {
+        throw 'found "$name" in $this but it was a ${entry.runtimeType}';
+      }
     }
-    if (_canGoUp(authors)) {
-      return parent?._nearestAncestorLicenseWithName(name, authors: authors);
+    if (license != null && authors != null && authors != license.authors) {
+      license = null;
     }
-    return null;
+    return license;
   }
 
-  License? _fullWalkUpForLicenseWithName(String? name, { String? authors, bool ignoreCase = false }) {
-    return _canGoUp(authors)
-            ? parent?._fullWalkUpForLicenseWithName(name, authors: authors, ignoreCase: ignoreCase)
-            : _fullWalkDownForLicenseWithName(name, authors: authors, ignoreCase: ignoreCase);
+  License? _fullWalkUpForLicenseWithName(String name, { required String authors }) {
+    // When looking for a license specific to certain authors, we want to walk
+    // to the top of the local license root, then from there check all the
+    // ancestors and all the descendants.
+    //
+    // We check even the ancestors (on the other side of license root
+    // boundaries) for this because when we know which authors we're looking
+    // for, it's reasonable to look all the way up the tree (e.g. the Flutter
+    // Authors license is at the root, and is sometimes mentioned in various
+    // files deep inside third party directories).
+    return _localLicenseWithName(name, authors: authors) ??
+           parent?._fullWalkUpForLicenseWithName(name, authors: authors);
   }
 
-  License? _fullWalkDownForLicenseWithName(String? name, { String? authors, bool ignoreCase = false }) {
-    License? result = _localLicenseWithName(name, authors: authors, ignoreCase: ignoreCase);
-    if (result == null) {
-      for (final _RepositoryDirectory directory in _subdirectories) {
-        result = directory._fullWalkDownForLicenseWithName(name, authors: authors, ignoreCase: ignoreCase);
+  License? _fullWalkDownForLicenseWithName(String name, { String? authors }) {
+    for (final _RepositoryDirectory directory in _subdirectories) {
+      if (directory._canGoUp()) { // avoid crawling into other license scopes
+        final License? result = directory._localLicenseWithName(name, authors: authors)
+                             ?? directory._fullWalkDownForLicenseWithName(name, authors: authors);
         if (result != null) {
-          break;
+          return result;
         }
       }
     }
-    return result;
+    return null;
   }
 
   /// Unless isLicenseRootException is true, we should not walk up the tree from
@@ -1248,12 +1169,11 @@ class _RepositoryDirectory extends _RepositoryEntry implements LicenseSource {
 
   @override
   String get libraryName {
-    if (isLicenseRoot) {
+    if (isLicenseRoot || parent!.subdirectoriesAreLicenseRoots) {
       return name;
     }
-    assert(parent != null);
-    if (parent!.subdirectoriesAreLicenseRoots) {
-      return name;
+    if (parent!.parent == null) {
+      throw '$this is not a license root';
     }
     return parent!.libraryName;
   }
@@ -1265,78 +1185,39 @@ class _RepositoryDirectory extends _RepositoryEntry implements LicenseSource {
   /// to the LICENSE in the root of the repo.
   bool get isLicenseRootException => false;
 
-  License? _localLicenseWithName(String? name, { String? authors, bool ignoreCase = false }) {
-    Map<String, _RepositoryEntry> map;
-    if (ignoreCase) {
-      // we get here if we're trying a last-ditch effort at finding a file.
-      // so this should happen only rarely.
-      map = HashMap<String, _RepositoryEntry>(
-        equals: (String n1, String n2) => n1.toLowerCase() == n2.toLowerCase(),
-        hashCode: (String n) => n.toLowerCase().hashCode
-      )
-        ..addAll(_childrenByName);
-    } else {
-      map = _childrenByName;
-    }
-    final _RepositoryEntry? entry = map[name!];
-    License? license;
-    if (entry is _RepositoryLicensedFile) {
-      license = entry.licenses!.single;
-    } else if (entry is _RepositoryLicenseFile) {
-      license = entry.defaultLicense;
-    } else if (entry != null) {
-      if (authors == null) {
-        throw 'found "$name" in $this but it was a ${entry.runtimeType}';
-      }
-    }
-    if (license != null && authors != null) {
-      if (license.authors?.toLowerCase() != authors.toLowerCase()) {
-        license = null;
-      }
-    }
-    return license;
-  }
-
   _RepositoryEntry getChildByName(String name) {
+    assert(_childrenByName.containsKey(name), 'missing $name in ${io.fullName}');
     return _childrenByName[name]!;
   }
 
-  Set<License> getLicenses(_Progress progress) {
-    final Set<License> result = <License>{};
-    for (final _RepositoryDirectory directory in _subdirectories) {
-      result.addAll(directory.getLicenses(progress));
-    }
+  Iterable<Assignment> assignLicenses(_Progress progress) {
+    final List<Assignment> result = <Assignment>[];
+    // Report licenses for files in this directory
     for (final _RepositoryLicensedFile file in _files) {
-      if (file.isIncludedInBuildProducts) {
-        try {
-          progress.label = '$file';
-          final List<License> licenses = file.licenses!.toList();
-          assert(licenses != null && licenses.isNotEmpty);
-          result.addAll(licenses);
-          progress.advance(success: true);
-        } catch (e, stack) {
-          system.stderr.writeln('\nerror searching for copyright in: ${file.io}\n$e');
-          if (e is! String) {
-            system.stderr.writeln(stack);
-          }
-          system.stderr.writeln('\n');
-          progress.advance(success: false);
+      try {
+        progress.label = '$file';
+        final Iterable<Assignment> licenses = file.assignLicenses();
+        assert(licenses.isNotEmpty);
+        result.addAll(licenses);
+        progress.advance(success: true);
+      } catch (e, stack) {
+        system.stderr.writeln('\nerror searching for copyright in: ${file.io}\n$e');
+        if (e is! String) {
+          system.stderr.writeln(stack);
         }
+        system.stderr.writeln('\n');
+        progress.advance(success: false);
       }
     }
-    for (final _RepositoryLicenseFile file in _licenses) {
-      result.addAll(file.licenses!);
+    // Recurse to subdirectories
+    for (final _RepositoryDirectory directory in _subdirectories) {
+      result.addAll(directory.assignLicenses(progress));
     }
     return result;
   }
 
   int get fileCount {
-    int result = 0;
-    for (final _RepositoryLicensedFile file in _files) {
-      if (file.isIncludedInBuildProducts) {
-        result += 1;
-      }
-    }
+    int result = _files.length;
     for (final _RepositoryDirectory directory in _subdirectories) {
       result += directory.fileCount;
     }
@@ -1345,9 +1226,7 @@ class _RepositoryDirectory extends _RepositoryEntry implements LicenseSource {
 
   Iterable<_RepositoryLicensedFile> get _signatureFiles sync* {
     for (final _RepositoryLicensedFile file in _files) {
-      if (file.isIncludedInBuildProducts) {
-        yield file;
-      }
+      yield file;
     }
     for (final _RepositoryDirectory directory in _subdirectories) {
       if (directory.includeInSignature) {
@@ -1375,22 +1254,20 @@ class _RepositoryDirectory extends _RepositoryEntry implements LicenseSource {
 
   /// True if this directory's contents should be included when computing the signature.
   bool get includeInSignature => true;
-}
-
-class _RepositoryGenericThirdPartyDirectory extends _RepositoryDirectory {
-  _RepositoryGenericThirdPartyDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
 
   @override
-  bool get subdirectoriesAreLicenseRoots => true;
+  String get officialSourceLocation {
+    throw 'license requested source location for directory that should not need it';
+  }
 }
 
 class _RepositoryReachOutFile extends _RepositoryLicensedFile {
-  _RepositoryReachOutFile(_RepositoryDirectory parent, fs.File io, this.offset) : super(parent, io);
+  _RepositoryReachOutFile(super.parent, super.io, this.offset);
 
   final int offset;
 
   @override
-  List<License>? get licenses {
+  Iterable<Assignment> assignLicenses() {
     _RepositoryDirectory? directory = parent;
     int index = offset;
     while (index > 1) {
@@ -1400,12 +1277,12 @@ class _RepositoryReachOutFile extends _RepositoryLicensedFile {
       directory = directory.parent;
       index -= 1;
     }
-    return directory!.nearestLicensesFor(name);
+    return directory!.nearestLicensesFor(name).map((License license) => license.assignLicenses(io.fullName, parent!));
   }
 }
 
 class _RepositoryReachOutDirectory extends _RepositoryDirectory {
-  _RepositoryReachOutDirectory(_RepositoryDirectory parent, fs.Directory io, this.reachOutFilenames, this.offset) : super(parent, io);
+  _RepositoryReachOutDirectory(_RepositoryDirectory super.parent, super.io, this.reachOutFilenames, this.offset);
 
   final Set<String> reachOutFilenames;
   final int offset;
@@ -1419,179 +1296,177 @@ class _RepositoryReachOutDirectory extends _RepositoryDirectory {
   }
 }
 
-class _RepositoryExcludeSubpathDirectory extends _RepositoryDirectory {
-  _RepositoryExcludeSubpathDirectory(_RepositoryDirectory parent, fs.Directory io, this.paths, [ this.index = 0 ]) : super(parent, io);
+class _RepositoryInjaJsonFile extends _RepositorySourceFile {
+  _RepositoryInjaJsonFile(super.parent, super.io);
+  @override
+  License extractInternalLicense() {
+    throw '$this does not have a clearly extractable license';
+  }
 
-  final List<String> paths;
-  final int index;
+  static final RegExp _pattern = RegExp(
+    r'^(.*?)' // 1
+    r'Licensed under the MIT License <http://opensource\.org/licenses/MIT>\.\n'
+    r'SPDX-License-Identifier: MIT\n'
+    r'(Copyright \(c\) 2013-2019 Niels Lohmann <http://nlohmann\.me>\.)\n' // 2
+    r'\n'
+    r'(Permission is hereby  granted, free of charge, to any  person obtaining a copy\n' // 3
+    r'of this software and associated  documentation files \(the "Software"\), to deal\n'
+    r'in the Software  without restriction, including without  limitation the rights\n'
+    r'to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell\n'
+    r'copies  of  the Software,  and  to  permit persons  to  whom  the Software  is\n'
+    r'furnished to do so, subject to the following conditions:\n'
+    r'\n'
+    r'The above copyright notice and this permission notice shall be included in all\n'
+    r'copies or substantial portions of the Software\.\n'
+    r'\n'
+    r'THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR\n'
+    r'IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,\n'
+    r'FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT\. IN NO EVENT  SHALL THE\n'
+    r'AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER\n'
+    r'LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n'
+    r'OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE\n'
+    r'SOFTWARE\.)\n'
+    r'(.*?)' // 4
+    r' \* Created by Evan Nemerson <evan@nemerson\.com>\n'
+    r' \*\n'
+    r' \* To the extent possible under law, the author\(s\) have dedicated all\n'
+    r' \* copyright and related and neighboring rights to this software to\n'
+    r' \* the public domain worldwide\. This software is distributed without\n'
+    r' \* any warranty\.\n'
+    r' \*\n'
+    r' \* For details, see <http://creativecommons\.org/publicdomain/zero/1\.0/>\.\n'
+    r' \* SPDX-License-Identifier: CC0-1\.0\n'
+    r'(.*?)' // 5
+    r'The code is distributed under the MIT license, (Copyright \(c\) 2009 Florian Loitsch\.)\n' // 6
+    r'(.*?)' // 7
+    r'    @copyright (Copyright \(c\) 2008-2009 Bjoern Hoehrmann <bjoern@hoehrmann\.de>)\n' // 8
+    r'(.*?)' // 9
+    r'    `copyright` \| The copyright line for the library as string\.\n'
+    r'(.*?)' // 10
+    r'        result\["copyright"\] = "\(C\) 2013-2020 Niels Lohmann";\n'
+    r'(.*)$', // 11
+    dotAll: true, // isMultiLine is false, so ^ and $ only match start and end.
+  );
 
   @override
-  bool shouldRecurse(fs.IoNode entry) {
-    if (index == paths.length - 1 && entry.name == paths.last) {
-      return false;
+  Iterable<Assignment> assignLicenses() {
+    if (_internalLicenses == null) {
+      final Match? match = _pattern.matchAsPrefix(_contents);
+      if (match == null) {
+        throw '${io.fullName} has changed contents.';
+      }
+      final String license = match.group(3)!;
+      _internalLicenses = match.groups(const <int>[ 2, 6, 8 ]).map<License>((String? copyright) {
+        assert(copyright!.contains('Copyright'));
+        return License.fromCopyrightAndLicense(copyright!, license, LicenseType.mit, origin: io.fullName);
+      }).toList();
+      assert(!match.groups(const <int>[ 1, 4, 5, 7, 9, 10, 11]).any((String? text) => text!.contains(copyrightMentionPattern)));
     }
-    return super.shouldRecurse(entry);
+    return _internalLicenses!.map((License license) => license.assignLicenses(io.fullName, parent!));
   }
+}
+
+/// The `src/` directory created by gclient sync (a.k.a. buildroot).
+///
+/// This directory is the parent of the flutter/engine repository. The license
+/// crawler begins its search starting from this directory and recurses down
+/// from it.
+///
+/// This is not the root of the flutter/engine repository.
+/// [_RepositoryFlutterDirectory] represents that.
+class _EngineSrcDirectory extends _RepositoryDirectory {
+  _EngineSrcDirectory(fs.Directory io) : super(null, io);
 
   @override
-  _RepositoryDirectory createSubdirectory(fs.Directory entry) {
-    if (entry.name == paths[index] && (index < paths.length - 1)) {
-      return _RepositoryExcludeSubpathDirectory(this, entry, paths, index + 1);
-    }
-    return super.createSubdirectory(entry);
+  String get libraryName {
+    throw 'Package failed to determine library name.';
   }
-}
 
-// WHAT TO CRAWL AND WHAT NOT TO CRAWL
+  @override
+  bool get isLicenseRoot => true;
 
-class _RepositoryAngleDirectory extends _RepositoryDirectory {
-  _RepositoryAngleDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
+  @override
+  bool get subdirectoriesAreLicenseRoots => false;
 
   @override
   _RepositoryDirectory createSubdirectory(fs.Directory entry) {
-    if (entry.name == 'src') {
-      return _RepositoryAngleSrcDirectory(this, entry);
+    if (entry.name == 'third_party') {
+      return _RepositoryRootThirdPartyDirectory(this, entry);
+    }
+    if (entry.name == 'flutter') {
+      return _RepositoryFlutterDirectory(this, entry);
+    }
+    if (entry.name == 'gpu') {
+      return _RepositoryGpuShimDirectory(this, entry);
+    }
+    if (entry.name == 'fuchsia') {
+      return _RepositoryFuchsiaDirectory(this, entry);
     }
     return super.createSubdirectory(entry);
   }
 
   @override
-  bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != 'tools'       // These are build-time tools, and aren't shipped.
-        && entry.name != 'third_party' // Unused by Flutter: BUILD files with forwarding targets (but no code).
-        && super.shouldRecurse(entry);
+  List<_RepositoryDirectory> get virtualSubdirectories {
+    // Dart and Skia are updated more frequently than other third party
+    // libraries and is therefore represented as a separate top-level component.
+    final fs.Directory thirdPartyNode = findChildDirectory(ioDirectory, 'third_party')!;
+    final fs.Directory dartNode = findChildDirectory(thirdPartyNode, 'dart')!;
+
+    final fs.Directory flutterNode = findChildDirectory(ioDirectory, 'flutter')!;
+    final fs.Directory flutterThirdPartyNode = findChildDirectory(flutterNode, 'third_party')!;
+    final fs.Directory skiaNode = findChildDirectory(flutterThirdPartyNode, 'skia')!;
+    return <_RepositoryDirectory>[
+      _RepositoryDartDirectory(this, dartNode),
+      _RepositorySkiaDirectory(this, skiaNode),
+    ];
   }
 }
 
-class _RepositoryAngleSrcDirectory extends _RepositoryDirectory {
-  _RepositoryAngleSrcDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
+class _RepositoryGenericThirdPartyDirectory extends _RepositoryDirectory {
+  _RepositoryGenericThirdPartyDirectory(_RepositoryDirectory super.parent, super.io);
 
   @override
-  _RepositoryDirectory createSubdirectory(fs.Directory entry) {
-    if (entry.name == 'third_party') {
-      return _RepositoryAngleSrcThirdPartyDirectory(this, entry);
-    }
-    return super.createSubdirectory(entry);
-  }
+  bool get subdirectoriesAreLicenseRoots => true;
 }
 
-class _RepositoryAngleSrcThirdPartyDirectory extends _RepositoryDirectory {
-  _RepositoryAngleSrcThirdPartyDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
+class _RepositoryRootThirdPartyDirectory extends _RepositoryGenericThirdPartyDirectory {
+  _RepositoryRootThirdPartyDirectory(super.parent, super.io);
 
   @override
   bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != 'volk' // We don't use Vulkan in our ANGLE build.
+    return entry.name != 'dart' // handled as a virtual directory of the root
         && super.shouldRecurse(entry);
   }
-}
-
-class _RepositoryAndroidPlatformDirectory extends _RepositoryDirectory {
-  _RepositoryAndroidPlatformDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
 
   @override
-  bool shouldRecurse(fs.IoNode entry) {
-    // we don't link with or use any of the Android NDK samples
-    return entry.name != 'webview' // not used at all
-        && entry.name != 'development' // not linked in
-        && super.shouldRecurse(entry);
+  _RepositoryDirectory createSubdirectory(fs.Directory entry) {
+    if (entry.name == 'icu') {
+      return _RepositoryIcuDirectory(this, entry);
+    }
+    if (entry.name == 'zlib') {
+      return _RepositoryZLibDirectory(this, entry);
+    }
+    return super.createSubdirectory(entry);
   }
 }
 
 class _RepositoryExpatDirectory extends _RepositoryDirectory {
-  _RepositoryExpatDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
+  _RepositoryExpatDirectory(_RepositoryDirectory super.parent, super.io);
 
   @override
   bool get isLicenseRootException => true;
 
   @override
   bool get subdirectoriesAreLicenseRoots => true;
-
-  @override
-  _RepositoryDirectory createSubdirectory(fs.Directory entry) {
-    if (entry.name == 'expat') {
-      return _RepositoryExpatExpatDirectory(this, entry);
-    }
-    return super.createSubdirectory(entry);
-  }
-}
-
-class _RepositoryExpatExpatDirectory extends _RepositoryDirectory {
-  _RepositoryExpatExpatDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  @override
-  bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != 'doc' // we don't ship the documentation
-        && super.shouldRecurse(entry);
-  }
-}
-
-class _RepositoryFreetypeDocsDirectory extends _RepositoryDirectory {
-  _RepositoryFreetypeDocsDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  @override
-  int get fileCount => 0;
-
-  @override
-  Set<License> getLicenses(_Progress progress) {
-    // We don't ship anything in this directory so don't bother looking for licenses there.
-    // However, there are licenses in this directory referenced from elsewhere, so we do
-    // want to crawl it and expose them.
-    return <License>{};
-  }
-}
-
-class _RepositoryFreetypeSrcGZipDirectory extends _RepositoryDirectory {
-  _RepositoryFreetypeSrcGZipDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  // advice was to make this directory's inffixed.h file (which has no license)
-  // use the license in zlib.h.
-
-  @override
-  List<License>? nearestLicensesFor(String name) {
-    final License? zlib = nearestLicenseWithName('zlib.h');
-    assert(zlib != null);
-    if (zlib != null) {
-      return <License>[zlib];
-    }
-    return super.nearestLicensesFor(name);
-  }
-
-  @override
-  License? nearestLicenseOfType(LicenseType type) {
-    if (type == LicenseType.zlib) {
-      final License? result = nearestLicenseWithName('zlib.h');
-      assert(result != null);
-      return result;
-    }
-    return null;
-  }
-}
-
-class _RepositoryFreetypeSrcDirectory extends _RepositoryDirectory {
-  _RepositoryFreetypeSrcDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  @override
-  _RepositoryDirectory createSubdirectory(fs.Directory entry) {
-    if (entry.name == 'gzip') {
-      return _RepositoryFreetypeSrcGZipDirectory(this, entry);
-    }
-    return super.createSubdirectory(entry);
-  }
-
-  @override
-  bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != 'tools'
-        && super.shouldRecurse(entry);
-  }
 }
 
 class _RepositoryFreetypeDirectory extends _RepositoryDirectory {
-  _RepositoryFreetypeDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
+  _RepositoryFreetypeDirectory(_RepositoryDirectory super.parent, super.io);
 
   @override
-  List<License>? nearestLicensesFor(String name) {
-    final List<License>? result = super.nearestLicensesFor(name);
-    if (result == null) {
+  List<License> nearestLicensesFor(String name) {
+    final List<License> result = super.nearestLicensesFor(name);
+    if (result.isEmpty) {
       final License? license = nearestLicenseWithName('LICENSE.TXT');
       assert(license != null);
       if (license != null) {
@@ -1606,1028 +1481,309 @@ class _RepositoryFreetypeDirectory extends _RepositoryDirectory {
     if (type == LicenseType.freetype) {
       final License? result = nearestLicenseWithName('FTL.TXT');
       assert(result != null);
-      return result;
-    }
-    return null;
-  }
-
-  @override
-  bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != 'builds' // build files
-        && super.shouldRecurse(entry);
-  }
-
-  @override
-  _RepositoryFile createFile(fs.IoNode entry) {
-    if (entry.name == 'LICENSE.TXT') {
-      return _RepositoryFreetypeLicenseFile(this, entry as fs.TextFile);
-    }
-    return super.createFile(entry);
-  }
-
-  @override
-  _RepositoryDirectory createSubdirectory(fs.Directory entry) {
-    if (entry.name == 'src') {
-      return _RepositoryFreetypeSrcDirectory(this, entry);
-    }
-    if (entry.name == 'docs') {
-      return _RepositoryFreetypeDocsDirectory(this, entry);
-    }
-    return super.createSubdirectory(entry);
-  }
-}
-
-class _RepositoryGlfwDirectory extends _RepositoryDirectory {
-  _RepositoryGlfwDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  @override
-  bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != 'examples' // Not linked in build.
-        && entry.name != 'tests' // Not linked in build.
-        && entry.name != 'deps' // Only used by examples and tests; not linked in build.
-        && super.shouldRecurse(entry);
-  }
-}
-
-class _RepositoryIcuDirectory extends _RepositoryDirectory {
-  _RepositoryIcuDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  @override
-  bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != 'license.html' // redundant with LICENSE file
-        && super.shouldRecurse(entry);
-  }
-
-  @override
-  _RepositoryFile createFile(fs.IoNode entry) {
-    if (entry.name == 'LICENSE') {
-      return _RepositoryIcuLicenseFile(this, entry as fs.TextFile);
-    }
-    return super.createFile(entry);
-  }
-}
-
-class _RepositoryHarfbuzzDirectory extends _RepositoryDirectory {
-  _RepositoryHarfbuzzDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  @override
-  bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != 'util' // utils are command line tools that do not end up in the binary
-        && super.shouldRecurse(entry);
-  }
-}
-
-class _RepositoryJSR305Directory extends _RepositoryDirectory {
-  _RepositoryJSR305Directory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  @override
-  _RepositoryDirectory createSubdirectory(fs.Directory entry) {
-    if (entry.name == 'src') {
-      return _RepositoryJSR305SrcDirectory(this, entry);
-    }
-    return super.createSubdirectory(entry);
-  }
-}
-
-class _RepositoryJSR305SrcDirectory extends _RepositoryDirectory {
-  _RepositoryJSR305SrcDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  @override
-  bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != 'javadoc'
-        && entry.name != 'sampleUses'
-        && super.shouldRecurse(entry);
-  }
-}
-
-class _RepositoryLibcxxDirectory extends _RepositoryDirectory {
-  _RepositoryLibcxxDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  @override
-  bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != 'utils'
-        && super.shouldRecurse(entry);
-  }
-
-  @override
-  _RepositoryDirectory createSubdirectory(fs.Directory entry) {
-    if (entry.name == 'src') {
-      return _RepositoryLibcxxSrcDirectory(this, entry);
-    }
-    return super.createSubdirectory(entry);
-  }
-
-  @override
-  _RepositoryFile createFile(fs.IoNode entry) {
-    if (entry.name == 'LICENSE.TXT') {
-      return _RepositoryCxxStlDualLicenseFile(this, entry as fs.TextFile);
-    }
-    return super.createFile(entry);
-  }
-}
-
-class _RepositoryLibcxxSrcDirectory extends _RepositoryDirectory {
-  _RepositoryLibcxxSrcDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  @override
-  _RepositoryDirectory createSubdirectory(fs.Directory entry) {
-    if (entry.name == 'support') {
-      return _RepositoryLibcxxSrcSupportDirectory(this, entry);
-    }
-    return super.createSubdirectory(entry);
-  }
-}
-
-class _RepositoryLibcxxSrcSupportDirectory extends _RepositoryDirectory {
-  _RepositoryLibcxxSrcSupportDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  @override
-  bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != 'solaris'
-        && super.shouldRecurse(entry);
-  }
-}
-
-class _RepositoryLibcxxabiDirectory extends _RepositoryDirectory {
-  _RepositoryLibcxxabiDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  @override
-  bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != 'www'
-        && super.shouldRecurse(entry);
-  }
-
-  @override
-  _RepositoryFile createFile(fs.IoNode entry) {
-    if (entry.name == 'LICENSE.TXT') {
-      return _RepositoryCxxStlDualLicenseFile(this, entry as fs.TextFile);
-    }
-    return super.createFile(entry);
-  }
-}
-
-class _RepositoryLibJpegDirectory extends _RepositoryDirectory {
-  _RepositoryLibJpegDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  @override
-  _RepositoryFile createFile(fs.IoNode entry) {
-    if (entry.name == 'README') {
-      return _RepositoryReadmeIjgFile(this, entry as fs.TextFile);
-    }
-    if (entry.name == 'LICENSE') {
-      return _RepositoryLicenseFileWithLeader(this, entry as fs.TextFile, RegExp(r'^\(Copied from the README\.\)\n+-+\n+'));
-    }
-    return super.createFile(entry);
-  }
-}
-
-class _RepositoryLibJpegTurboDirectory extends _RepositoryDirectory {
-  _RepositoryLibJpegTurboDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  @override
-  _RepositoryFile createFile(fs.IoNode entry) {
-    if (entry.name == 'LICENSE.md') {
-      return _RepositoryLibJpegTurboLicense(this, entry as fs.TextFile);
-    }
-    return super.createFile(entry);
-  }
-
-  @override
-  bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != 'release' // contains nothing that ends up in the binary executable
-        && entry.name != 'doc' // contains nothing that ends up in the binary executable
-        && entry.name != 'testimages' // test assets
-        && super.shouldRecurse(entry);
-  }
-}
-
-class _RepositoryLibPngDirectory extends _RepositoryDirectory {
-  _RepositoryLibPngDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  @override
-  _RepositoryFile createFile(fs.IoNode entry) {
-    if (entry.name == 'LICENSE' || entry.name == 'png.h') {
-      return _RepositoryLibPngLicenseFile(this, entry as fs.TextFile);
-    }
-    return super.createFile(entry);
-  }
-
-  static final RegExp skipFileTypes = RegExp(r'\.(?:jpg|png|dfa|in|3|5)$');
-
-  @override
-  bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != 'contrib' // not linked in
-        && entry.name != 'mips' // not linked in
-        && entry.name != 'powerpc' // not linked in
-        && entry.name != 'projects' // not linked in
-        && entry.name != 'scripts' // not linked in
-        && entry.name != 'tests' // not linked in
-        && entry.name != 'ANNOUNCE'
-        && entry.name != 'CHANGES'
-        && entry.name != 'TODO'
-        && entry.name != 'TRADEMARK'
-        && !entry.name.contains(skipFileTypes)
-        && super.shouldRecurse(entry);
-  }
-}
-
-class _RepositoryLibWebpDirectory extends _RepositoryDirectory {
-  _RepositoryLibWebpDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  @override
-  bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != 'examples' // contains nothing that ends up in the binary executable
-        && entry.name != 'swig' // not included in our build
-        && entry.name != 'gradle' // not included in our build
-        && super.shouldRecurse(entry);
-  }
-}
-
-class _RepositoryPkgDirectory extends _RepositoryDirectory {
-  _RepositoryPkgDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  @override
-  bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != 'archive' // contains nothing that ends up in the binary executable
-        && entry.name != 'equatable'
-        && entry.name != 'file'
-        && entry.name != 'flutter_packages'
-        && entry.name != 'gcloud'
-        && entry.name != 'googleapis'
-        && entry.name != 'isolate'
-        && entry.name != 'platform'
-        && entry.name != 'process'
-        && entry.name != 'process_runner'
-        && entry.name != 'vector_math';
-  }
-
-  @override
-  _RepositoryDirectory createSubdirectory(fs.Directory entry) {
-    if (entry.name == 'when') {
-      return _RepositoryPkgWhenDirectory(this, entry);
-    }
-    return super.createSubdirectory(entry);
-  }
-}
-
-class _RepositoryPkgWhenDirectory extends _RepositoryDirectory {
-  _RepositoryPkgWhenDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  @override
-  bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != 'example' // contains nothing that ends up in the binary executable
-        && super.shouldRecurse(entry);
-  }
-}
-
-class _RepositorySkiaLibWebPDirectory extends _RepositoryDirectory {
-  _RepositorySkiaLibWebPDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  @override
-  _RepositoryDirectory createSubdirectory(fs.Directory entry) {
-    if (entry.name == 'webp') {
-      return _RepositoryReachOutDirectory(
-          this, entry, const <String>{'config.h'}, 3);
-    }
-    return super.createSubdirectory(entry);
-  }
-}
-
-class _RepositorySkiaLibSdlDirectory extends _RepositoryDirectory {
-  _RepositorySkiaLibSdlDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  @override
-  bool get isLicenseRootException => true;
-}
-
-class _RepositorySkiaThirdPartyDirectory extends _RepositoryGenericThirdPartyDirectory {
-  _RepositorySkiaThirdPartyDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  @override
-  bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != 'giflib' // contains nothing that ends up in the binary executable
-        && entry.name != 'freetype' // we use our own version
-        && entry.name != 'freetype2' // we use our own version
-        && entry.name != 'gif' // not linked in
-        && entry.name != 'icu' // we use our own version
-        && entry.name != 'libjpeg-turbo' // we use our own version
-        && entry.name != 'libpng' // we use our own version
-        && entry.name != 'lua' // not linked in
-        && entry.name != 'yasm' // build tool (assembler)
-        && super.shouldRecurse(entry);
-  }
-
-  @override
-  _RepositoryDirectory createSubdirectory(fs.Directory entry) {
-    if (entry.name == 'ktx') {
-      return _RepositoryReachOutDirectory(this, entry, const <String>{'ktx.h', 'ktx.cpp'}, 2);
-    }
-    if (entry.name == 'libmicrohttpd') {
-      return _RepositoryReachOutDirectory(this, entry, const <String>{'MHD_config.h'}, 2);
-    }
-    if (entry.name == 'libwebp') {
-      return _RepositorySkiaLibWebPDirectory(this, entry);
-    }
-    if (entry.name == 'libsdl') {
-      return _RepositorySkiaLibSdlDirectory(this, entry);
-    }
-    return super.createSubdirectory(entry);
-  }
-}
-
-class _RepositorySkiaDirectory extends _RepositoryDirectory {
-  _RepositorySkiaDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  @override
-  bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != 'bazel' // contains nothing that ends up in the binary executable
-        && entry.name != 'platform_tools' // contains nothing that ends up in the binary executable
-        && entry.name != 'tools' // contains nothing that ends up in the binary executable
-        && entry.name != 'resources' // contains nothing that ends up in the binary executable
-        && super.shouldRecurse(entry);
-  }
-
-  @override
-  _RepositoryDirectory createSubdirectory(fs.Directory entry) {
-    if (entry.name == 'third_party') {
-      return _RepositorySkiaThirdPartyDirectory(this, entry);
-    }
-    return super.createSubdirectory(entry);
-  }
-}
-
-class _RepositoryVulkanDirectory extends _RepositoryDirectory {
-  _RepositoryVulkanDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  @override
-  bool shouldRecurse(fs.IoNode entry) {
-    // Flutter only uses the headers in the include directory.
-    return entry.name == 'include'
-        && super.shouldRecurse(entry);
-  }
-
-  @override
-  _RepositoryDirectory createSubdirectory(fs.Directory entry) {
-    if (entry.name == 'src') {
-      return _RepositoryExcludeSubpathDirectory(this, entry, const <String>['spec']);
-    }
-    return super.createSubdirectory(entry);
-  }
-}
-
-class _RepositoryWuffsDirectory extends _RepositoryDirectory {
-  _RepositoryWuffsDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  @override
-  bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != 'CONTRIBUTORS' // not linked in
-        && super.shouldRecurse(entry);
-  }
-
-  @override
-  _RepositoryDirectory createSubdirectory(fs.Directory entry) {
-    if (entry.name == 'src') {
-      return _RepositoryExcludeSubpathDirectory(this, entry, const <String>['spec']);
-    }
-    return super.createSubdirectory(entry);
-  }
-}
-
-class _RepositoryVulkanDepsDirectory extends _RepositoryDirectory {
-  _RepositoryVulkanDepsDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  @override
-  bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != '.git' // source control
-        && entry.name != 'glslang' // only used on hosts for tests
-        && entry.name != 'spirv-cross' // Used by impellerc with separate license and host tests. See //flutter/impeller/compiler:impellerc_license
-        && entry.name != 'spirv-headers' // only used on hosts for tests
-        && entry.name != 'spirv-tools' // only used on hosts for tests
-        && entry.name != 'vulkan-loader' // on hosts for tests
-        && entry.name != 'vulkan-tools' // on hosts for tests
-        && entry.name != 'vulkan-validation-layers'; // on hosts for tests
-  }
-
-  @override
-  _RepositoryDirectory createSubdirectory(fs.Directory entry) {
-    if (entry.name == 'vulkan-headers') {
-      return _RepositoryVulkanDepsSubDirectory(this, entry);
-    }
-    return super.createSubdirectory(entry);
-  }
-}
-
-class _RepositoryVulkanDepsSubDirectory extends _RepositoryDirectory {
-  _RepositoryVulkanDepsSubDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  @override
-  bool shouldRecurse(fs.IoNode entry) {
-    return entry.name == 'src';
-  }
-
-  @override
-  _RepositoryDirectory createSubdirectory(fs.Directory entry) {
-    if (entry.name == 'src') {
-      return _RepositoryVulkanDirectory(this, entry);
-    }
-    return super.createSubdirectory(entry);
-  }
-}
-
-class _RepositoryRootThirdPartyDirectory extends _RepositoryGenericThirdPartyDirectory {
-  _RepositoryRootThirdPartyDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  @override
-  bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != 'appurify-python' // only used by tests
-        && entry.name != 'benchmark' // only used by tests
-        && entry.name != 'dart-sdk' // redundant with //engine/dart; https://github.com/flutter/flutter/issues/2618
-        && entry.name != 'firebase' // only used by bots; https://github.com/flutter/flutter/issues/3722
-        && entry.name != 'gyp' // build-time only
-        && entry.name != 'jinja2' // build-time code generation
-        && entry.name != 'junit' // only mentioned in build files, not used
-        && entry.name != 'libxml' // dependency of the testing system that we don't actually use
-        && entry.name != 'llvm-build' // only used by build
-        && entry.name != 'markupsafe' // build-time only
-        && entry.name != 'mockito' // only used by tests
-        && entry.name != 'pymock' // presumably only used by tests
-        && entry.name != 'pyyaml' // build-time dependency only
-        && entry.name != 'yapf'  // only used for code formatting
-        && entry.name != 'android_embedding_dependencies' // testing framework for android
-        && entry.name != 'yasm' // build-time dependency only
-        && entry.name != 'binutils' // build-time dependency only
-        && entry.name != 'instrumented_libraries' // unused according to chinmay
-        && entry.name != 'android_tools' // excluded on advice
-        && entry.name != 'androidx' // build-time only
-        && entry.name != 'googletest' // only used by tests
-        && entry.name != 'skia' // treated as a separate component
-        && entry.name != 'fontconfig' // not used in standard configurations
-        && entry.name != 'swiftshader' // only used on hosts for tests
-        && entry.name != 'shaderc' // Used by impellerc with separate license and host tests. See //flutter/impeller/compiler:impellerc_license
-        && entry.name != 'ocmock' // only used for tests
-        && entry.name != 'java' // only used for Android builds
-        && entry.name != 'inja' // Only used by impellerc, which ships a separate license. See //flutter/impeller/compiler:impellerc_license
-        && super.shouldRecurse(entry);
-  }
-
-  @override
-  _RepositoryDirectory createSubdirectory(fs.Directory entry) {
-    if (entry.name == 'android_platform') {
-      return _RepositoryAndroidPlatformDirectory(this, entry);
-    }
-    if (entry.name == 'angle') {
-      return _RepositoryAngleDirectory(this, entry);
-    }
-    if (entry.name == 'boringssl') {
-      return _RepositoryBoringSSLDirectory(this, entry);
-    }
-    if (entry.name == 'catapult') {
-      return _RepositoryCatapultDirectory(this, entry);
-    }
-    if (entry.name == 'dart') {
-      return _RepositoryDartDirectory(this, entry);
-    }
-    if (entry.name == 'expat') {
-      return _RepositoryExpatDirectory(this, entry);
-    }
-    if (entry.name == 'vulkan_memory_allocator') {
-      return _RepositoryVulkanMemoryAllocatorDirectory(this, entry);
-    }
-    if (entry.name == 'vulkan-deps') {
-      return _RepositoryVulkanDepsDirectory(this, entry);
-    }
-    if (entry.name == 'freetype-android') {
-      throw '//third_party/freetype-android is no longer part of this client: remove it';
-    }
-    if (entry.name == 'freetype2') {
-      return _RepositoryFreetypeDirectory(this, entry);
-    }
-    if (entry.name == 'glfw') {
-      return _RepositoryGlfwDirectory(this, entry);
-    }
-    if (entry.name == 'harfbuzz') {
-      return _RepositoryHarfbuzzDirectory(this, entry);
-    }
-    if (entry.name == 'icu') {
-      return _RepositoryIcuDirectory(this, entry);
-    }
-    if (entry.name == 'jsr-305') {
-      return _RepositoryJSR305Directory(this, entry);
-    }
-    if (entry.name == 'libcxx') {
-      return _RepositoryLibcxxDirectory(this, entry);
-    }
-    if (entry.name == 'libcxxabi') {
-      return _RepositoryLibcxxabiDirectory(this, entry);
-    }
-    if (entry.name == 'libjpeg') {
-      return _RepositoryLibJpegDirectory(this, entry);
-    }
-    if (entry.name == 'libjpeg_turbo' || entry.name == 'libjpeg-turbo') {
-      return _RepositoryLibJpegTurboDirectory(this, entry);
-    }
-    if (entry.name == 'libpng') {
-      return _RepositoryLibPngDirectory(this, entry);
-    }
-    if (entry.name == 'libwebp') {
-      return _RepositoryLibWebpDirectory(this, entry);
-    }
-    if (entry.name == 'pkg') {
-      return _RepositoryPkgDirectory(this, entry);
-    }
-    if (entry.name == 'vulkan') {
-      return _RepositoryVulkanDirectory(this, entry);
-    }
-    if (entry.name == 'wuffs') {
-      return _RepositoryWuffsDirectory(this, entry);
-    }
-    if (entry.name == 'web_dependencies') {
-      return _RepositoryThirdPartyWebDependenciesDirectory(this, entry);
-    }
-    return super.createSubdirectory(entry);
-  }
-}
-
-/// Corresponds to the `src/third_party/web_dependencies` directory.
-class _RepositoryThirdPartyWebDependenciesDirectory extends _RepositoryDirectory {
-  _RepositoryThirdPartyWebDependenciesDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  @override
-  bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != 'canvaskit' // redundant; covered by Skia dependencies
-        && super.shouldRecurse(entry);
-  }
-}
-
-class _RepositoryVulkanMemoryAllocatorDirectory extends _RepositoryDirectory {
-  _RepositoryVulkanMemoryAllocatorDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  @override
-  bool shouldRecurse(fs.IoNode entry) {
-    // Flutter only uses the headers in the include directory.
-    return entry.name == 'include'
-        && super.shouldRecurse(entry);
-  }
-}
-
-class _RepositoryBoringSSLThirdPartyDirectory extends _RepositoryDirectory {
-  _RepositoryBoringSSLThirdPartyDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  @override
-  bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != 'android-cmake' // build-time only
-        && super.shouldRecurse(entry);
-  }
-}
-
-class _RepositoryBoringSSLSourceDirectory extends _RepositoryDirectory {
-  _RepositoryBoringSSLSourceDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  @override
-  String get libraryName => 'boringssl';
-
-  @override
-  bool get isLicenseRoot => true;
-
-  @override
-  bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != 'fuzz' // testing tools, not shipped
-        && super.shouldRecurse(entry);
-  }
-
-  @override
-  _RepositoryFile createFile(fs.IoNode entry) {
-    if (entry.name == 'LICENSE') {
-      return _RepositoryOpenSSLLicenseFile(this, entry as fs.TextFile);
-    }
-    return super.createFile(entry);
-  }
-
-  @override
-  _RepositoryDirectory createSubdirectory(fs.Directory entry) {
-    if (entry.name == 'third_party') {
-      return _RepositoryBoringSSLThirdPartyDirectory(this, entry);
-    }
-    return super.createSubdirectory(entry);
-  }
-}
-
-/// The BoringSSL license file.
-///
-/// This license includes 23 lines of informational header text that are not
-/// part of the copyright notices and can be skipped.
-/// It also has a trailer that mentions licenses that are used during build
-/// time of BoringSSL - those can be ignored as well since they don't apply
-/// to code that is distributed.
-class _RepositoryOpenSSLLicenseFile extends _RepositorySingleLicenseFile {
-  _RepositoryOpenSSLLicenseFile(_RepositoryDirectory parent, fs.TextFile io)
-    : super(parent, io,
-        License.fromBodyAndType(
-            LineSplitter.split(io.readString())
-                .skip(23)
-                .takeWhile((String s) => !s.startsWith('BoringSSL uses the Chromium test infrastructure to run a continuous build,'))
-                .join('\n'),
-            LicenseType.openssl,
-            origin: io.fullName)) {
-    _verifyLicense(io);
-  }
-
-  static void _verifyLicense(fs.TextFile io) {
-    final String contents = io.readString();
-    if (!contents.contains('BoringSSL is a fork of OpenSSL. As such, large parts of it fall under OpenSSL')) {
-      throw 'unexpected OpenSSL license file contents:\n----8<----\n$contents\n----<8----';
-    }
-  }
-
-  @override
-  License? licenseOfType(LicenseType type) {
-    if (type == LicenseType.openssl) {
-      return license;
-    }
-    return null;
-  }
-}
-
-class _RepositoryBoringSSLDirectory extends _RepositoryDirectory {
-  _RepositoryBoringSSLDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  @override
-  _RepositoryFile createFile(fs.IoNode entry) {
-    if (entry.name == 'README') {
-      return _RepositoryBlankLicenseFile(this, entry as fs.TextFile, 'This repository contains the files generated by boringssl for its build.');
+      return result;
     }
-    return super.createFile(entry);
+    return super.nearestLicenseOfType(type);
   }
 
   @override
   _RepositoryDirectory createSubdirectory(fs.Directory entry) {
     if (entry.name == 'src') {
-      return _RepositoryBoringSSLSourceDirectory(this, entry);
+      return _RepositoryFreetypeSrcDirectory(this, entry);
     }
-    return _RepositoryBoringSSLDirectory(this, entry);
+    return super.createSubdirectory(entry);
   }
 }
 
-class _RepositoryCatapultThirdPartyApiClientDirectory extends _RepositoryDirectory {
-  _RepositoryCatapultThirdPartyApiClientDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
+class _RepositoryFreetypeSrcDirectory extends _RepositoryDirectory {
+  _RepositoryFreetypeSrcDirectory(_RepositoryDirectory super.parent, super.io);
 
   @override
-  _RepositoryFile createFile(fs.IoNode entry) {
-    if (entry.name == 'LICENSE') {
-      return _RepositoryCatapultApiClientLicenseFile(this, entry as fs.TextFile);
+  _RepositoryDirectory createSubdirectory(fs.Directory entry) {
+    if (entry.name == 'gzip') {
+      return _RepositoryFreetypeSrcGZipDirectory(this, entry);
     }
-    return super.createFile(entry);
+    return super.createSubdirectory(entry);
   }
 }
 
-class _RepositoryCatapultThirdPartyCoverageDirectory extends _RepositoryDirectory {
-  _RepositoryCatapultThirdPartyCoverageDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
+class _RepositoryFreetypeSrcGZipDirectory extends _RepositoryDirectory {
+  _RepositoryFreetypeSrcGZipDirectory(_RepositoryDirectory super.parent, super.io);
+
+  // advice was to make this directory's inffixed.h file (which has no license)
+  // use the license in zlib.h.
 
   @override
-  _RepositoryFile createFile(fs.IoNode entry) {
-    if (entry.name == 'NOTICE.txt') {
-      return _RepositoryCatapultCoverageLicenseFile(this, entry as fs.TextFile);
+  List<License> nearestLicensesFor(String name) {
+    final License? zlib = nearestLicenseWithName('zlib.h');
+    assert(zlib != null);
+    if (zlib != null) {
+      return <License>[zlib];
     }
-    return super.createFile(entry);
+    return super.nearestLicensesFor(name);
   }
-}
-
-class _RepositoryCatapultThirdPartyDirectory extends _RepositoryDirectory {
-  _RepositoryCatapultThirdPartyDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
 
   @override
-  _RepositoryDirectory createSubdirectory(fs.Directory entry) {
-    if (entry.name == 'apiclient') {
-      return _RepositoryCatapultThirdPartyApiClientDirectory(this, entry);
-    }
-    if (entry.name == 'coverage') {
-      return _RepositoryCatapultThirdPartyCoverageDirectory(this, entry);
+  License? nearestLicenseOfType(LicenseType type) {
+    if (type == LicenseType.zlib) {
+      final License? result = nearestLicenseWithName('zlib.h');
+      assert(result != null);
+      return result;
     }
-    return super.createSubdirectory(entry);
+    return super.nearestLicenseOfType(type);
   }
 }
 
-class _RepositoryCatapultDirectory extends _RepositoryDirectory {
-  _RepositoryCatapultDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
+class _RepositoryIcuDirectory extends _RepositoryDirectory {
+  _RepositoryIcuDirectory(super.parent, super.io);
 
   @override
-  _RepositoryDirectory createSubdirectory(fs.Directory entry) {
-    if (entry.name == 'third_party') {
-      return _RepositoryCatapultThirdPartyDirectory(this, entry);
+  _RepositoryFile createFile(fs.IoNode entry) {
+    if (entry.name == 'LICENSE') {
+      return _RepositoryIcuLicenseFile(this, entry as fs.TextFile);
     }
-    return super.createSubdirectory(entry);
+    return super.createFile(entry);
   }
 }
 
-class _RepositoryDartRuntimeThirdPartyDirectory extends _RepositoryGenericThirdPartyDirectory {
-  _RepositoryDartRuntimeThirdPartyDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
+class _RepositoryFallbackRootCertificatesDirectory extends _RepositoryDirectory {
+  _RepositoryFallbackRootCertificatesDirectory(_RepositoryDirectory super.parent, super.io);
 
   @override
-  bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != 'd3' // Siva says "that is the charting library used by the binary size tool"
-        && entry.name != 'binary_size' // not linked in either
-        && super.shouldRecurse(entry);
+  String get officialSourceLocation {
+    final system.ProcessResult result = system.Process.runSync('git', <String>['rev-parse', 'HEAD'], workingDirectory: '$this');
+    if (result.exitCode != 0) {
+      throw 'Failed to run "git rev-parse HEAD"; got non-zero exit code ${result.exitCode}\nstdout:\n${result.stdout}\nstderr:\n${result.stderr}';
+    }
+
+    final String rev = result.stdout as String;
+    return 'https://dart.googlesource.com/sdk/+/$rev/third_party/fallback_root_certificates/';
   }
 }
 
-class _RepositoryDartThirdPartyDirectory extends _RepositoryGenericThirdPartyDirectory {
-  _RepositoryDartThirdPartyDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
+class _RepositoryZLibDirectory extends _RepositoryDirectory {
+  _RepositoryZLibDirectory(_RepositoryDirectory super.parent, super.io);
 
-  @override
-  bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != 'binaryen' // not linked in
-        && entry.name != 'devtools' // test materials
-        && entry.name != 'drt_resources' // test materials
-        && entry.name != 'firefox_jsshell' // testing tool for dart2js
-        && entry.name != 'd8' // testing tool for dart2js
-        && entry.name != 'pkg'
-        && entry.name != 'pkg_tested'
-        && entry.name != 'requirejs' // only used by DDC
-        && super.shouldRecurse(entry);
-  }
+  // Some files in this directory refer to "MiniZip_info.txt".
+  // As best we can tell, that refers to a file that itself includes the
+  // exact same license text as in LICENSE.
 
   @override
-  _RepositoryDirectory createSubdirectory(fs.Directory entry) {
-    if (entry.name == 'boringssl') {
-      return _RepositoryBoringSSLDirectory(this, entry);
+  License? nearestLicenseWithName(String name, { String? authors }) {
+    if (name == 'MiniZip_info.txt') {
+      return super.nearestLicenseWithName('LICENSE', authors: authors)!;
     }
-    return super.createSubdirectory(entry);
+    return super.nearestLicenseWithName(name, authors: authors);
   }
-}
-
-class _RepositoryDartRuntimeDirectory extends _RepositoryDirectory {
-  _RepositoryDartRuntimeDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
 
   @override
-  _RepositoryDirectory createSubdirectory(fs.Directory entry) {
-    if (entry.name == 'third_party') {
-      return _RepositoryDartRuntimeThirdPartyDirectory(this, entry);
+  License? nearestLicenseOfType(LicenseType type) {
+    if (type == LicenseType.zlib) {
+      return nearestLicenseWithName('LICENSE')!;
     }
-    return super.createSubdirectory(entry);
+    return super.nearestLicenseOfType(type);
   }
 }
 
 class _RepositoryDartDirectory extends _RepositoryDirectory {
-  _RepositoryDartDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
+  _RepositoryDartDirectory(_RepositoryDirectory super.parent, super.io);
 
   @override
   bool get isLicenseRoot => true;
 
   @override
-  _RepositoryFile createFile(fs.IoNode entry) {
-    if (entry.name == 'LICENSE') {
-      return _RepositoryDartLicenseFile(this, entry as fs.TextFile);
+  _RepositoryDirectory createSubdirectory(fs.Directory entry) {
+    if (entry.name == 'third_party') {
+      return _RepositoryDartThirdPartyDirectory(this, entry);
     }
-    return super.createFile(entry);
+    return super.createSubdirectory(entry);
   }
+}
 
-  @override
-  bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != 'pkg' // packages that don't become part of the binary (e.g. the analyzer)
-        && entry.name != 'tests' // only used by tests, obviously
-        && entry.name != 'docs' // not shipped in binary
-        && entry.name != 'build' // not shipped in binary
-        && entry.name != 'tools' // not shipped in binary
-        && entry.name != 'samples-dev' // not shipped in binary
-        && entry.name != 'benchmarks' // not shipped in binary
-        && entry.name != 'benchmarks-internal' // not shipped in binary
-        && super.shouldRecurse(entry);
-  }
+class _RepositoryDartThirdPartyDirectory extends _RepositoryGenericThirdPartyDirectory {
+  _RepositoryDartThirdPartyDirectory(super.parent, super.io);
 
   @override
   _RepositoryDirectory createSubdirectory(fs.Directory entry) {
-    if (entry.name == 'third_party') {
-      return _RepositoryDartThirdPartyDirectory(this, entry);
-    }
-    if (entry.name == 'runtime') {
-      return _RepositoryDartRuntimeDirectory(this, entry);
+    if (entry.name == 'fallback_root_certificates') {
+      return _RepositoryFallbackRootCertificatesDirectory(this, entry);
     }
     return super.createSubdirectory(entry);
   }
 }
 
-class _RepositoryFlutterDirectory extends _RepositoryDirectory {
-  _RepositoryFlutterDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  @override
-  String get libraryName => 'engine';
+class _RepositorySkiaDirectory extends _RepositoryDirectory {
+  _RepositorySkiaDirectory(_RepositoryDirectory super.parent, super.io);
 
   @override
   bool get isLicenseRoot => true;
 
   @override
-  bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != 'testing'
-        && entry.name != 'tools'
-        && entry.name != 'docs'
-        && entry.name != 'examples'
-        && entry.name != 'build'
-        && entry.name != 'ci'
-        && entry.name != 'flutter_frontend_server'
-        // None of the web_sdk code is linked into Flutter apps. It's only used
-        // by engine tests and tools.
-        && entry.name != 'web_sdk'
-        && entry.name != 'prebuilts'
-        && super.shouldRecurse(entry);
+  _RepositoryDirectory createSubdirectory(fs.Directory entry) {
+    if (entry.name == 'third_party') {
+      return _RepositorySkiaThirdPartyDirectory(this, entry);
+    }
+    return super.createSubdirectory(entry);
   }
+}
+
+class _RepositorySkiaThirdPartyDirectory extends _RepositoryGenericThirdPartyDirectory {
+  _RepositorySkiaThirdPartyDirectory(super.parent, super.io);
 
   @override
   _RepositoryDirectory createSubdirectory(fs.Directory entry) {
-    if (entry.name == 'sky') {
-      return _RepositoryExcludeSubpathDirectory(this, entry, const <String>['packages', 'sky_engine', 'LICENSE']);
-    } // that's the output of this script!
-    if (entry.name == 'third_party') {
-      return _RepositoryFlutterThirdPartyDirectory(this, entry);
+    if (entry.name == 'ktx') {
+      return _RepositoryReachOutDirectory(this, entry, const <String>{'ktx.h', 'ktx.cpp'}, 2);
     }
-    if (entry.name == 'lib') {
-      return _createLibDirectoryRoot(entry, this);
+    if (entry.name == 'libmicrohttpd') {
+      return _RepositoryReachOutDirectory(this, entry, const <String>{'MHD_config.h'}, 2);
     }
-    if (entry.name == 'web_sdk') {
-      return _createWebSdkDirectoryRoot(entry, this);
+    if (entry.name == 'libwebp') {
+      return _RepositorySkiaLibWebPDirectory(this, entry);
     }
-    if (entry.name == 'impeller') {
-      return _createImpellerDirectory(entry, this);
+    if (entry.name == 'libsdl') {
+      return _RepositorySkiaLibSdlDirectory(this, entry);
     }
     return super.createSubdirectory(entry);
   }
 }
 
-_RelativePathDenylistRepositoryDirectory _createImpellerDirectory(fs.Directory entry, _RepositoryDirectory parent) {
-  return _RelativePathDenylistRepositoryDirectory(
-    rootDir: entry,
-    denylist: <Pattern>[
-      // TODO(chinmaygarde): Remove stb.
-      // https://github.com/flutter/flutter/issues/97843
-      'third_party/stb', // Currently only used for unit tests, and will be removed.
-    ],
-    parent: parent,
-    io: entry,
-  );
-}
+class _RepositorySkiaLibWebPDirectory extends _RepositoryDirectory {
+  _RepositorySkiaLibWebPDirectory(_RepositoryDirectory super.parent, super.io);
 
-/// A specialized crawler for "github.com/flutter/engine/lib" directory.
-///
-/// It includes everything except build tools, test build artifacts, and test code.
-_RelativePathDenylistRepositoryDirectory _createLibDirectoryRoot(fs.Directory entry, _RepositoryDirectory parent) {
-  return _RelativePathDenylistRepositoryDirectory(
-    rootDir: entry,
-    denylist: <Pattern>[
-      'web_ui/lib/assets/ahem.ttf', // this gitignored file exists only for testing purposes
-      RegExp(r'web_ui/build/.*'),   // this is compiler-generated output
-      RegExp(r'web_ui/dev/.*'),     // these are build tools; they do not end up in Engine artifacts
-      RegExp(r'web_ui/test/.*'),    // tests do not end up in Engine artifacts
-    ],
-    parent: parent,
-    io: entry,
-  );
+  @override
+  _RepositoryDirectory createSubdirectory(fs.Directory entry) {
+    if (entry.name == 'webp') {
+      return _RepositoryReachOutDirectory(this, entry, const <String>{'config.h'}, 3);
+    }
+    return super.createSubdirectory(entry);
+  }
 }
 
-/// A specialized crawler for "github.com/flutter/engine/web_sdk" directory.
-///
-/// It includes everything except the "web_engine_tester" package, which is only
-/// used to test the engine itself and is not shipped as part of the Flutter SDK.
-_RelativePathDenylistRepositoryDirectory _createWebSdkDirectoryRoot(fs.Directory entry, _RepositoryDirectory parent) {
-  return _RelativePathDenylistRepositoryDirectory(
-    rootDir: entry,
-    denylist: <Pattern>[
-      RegExp( r'web_engine_tester/.*'), // contains test code for the engine itself
-    ],
-    parent: parent,
-    io: entry,
-  );
+class _RepositorySkiaLibSdlDirectory extends _RepositoryDirectory {
+  _RepositorySkiaLibSdlDirectory(_RepositoryDirectory super.parent, super.io);
+
+  @override
+  bool get isLicenseRootException => true;
 }
 
-/// Walks a [rootDir] recursively, omitting paths that match a [denylist].
-///
-/// The path patterns in the [denylist] are specified relative to the [rootDir].
-class _RelativePathDenylistRepositoryDirectory extends _RepositoryDirectory {
-  _RelativePathDenylistRepositoryDirectory({
-    required this.rootDir,
-    required this.denylist,
-    required _RepositoryDirectory parent,
-    required fs.Directory io,
-  }) : super(parent, io);
+class _RepositoryBoringSSLDirectory extends _RepositoryDirectory {
+  _RepositoryBoringSSLDirectory(_RepositoryDirectory super.parent, super.io);
 
-  /// The directory, relative to which the paths are [denylist]ed.
-  final fs.Directory rootDir;
+  // This directory contains boringssl itself in the 'src' subdirectory,
+  // and the rest of files are code generated from tools in that directory.
+  // We redirect any license queries to the src/LICENSE file.
 
-  /// Blocked path patterns.
-  ///
-  /// Paths are assumed relative to [rootDir].
-  final List<Pattern> denylist;
+  _RepositoryDirectory get src => getChildByName('src') as _RepositoryDirectory;
 
   @override
-  bool shouldRecurse(fs.IoNode entry) {
-    final String relativePath = path.relative(entry.fullName, from: rootDir.fullName);
-    final bool denied = denylist.any(
-      (Pattern pattern) => pattern.matchAsPrefix(relativePath) != null,
-    );
-    if (denied) {
-      return false;
+  List<License> nearestLicensesFor(String name) {
+    final List<License> result = super.nearestLicensesFor(name);
+    if (result.isEmpty) {
+      return (src.getChildByName('LICENSE') as _RepositoryLicenseFile).licenses;
     }
-    return super.shouldRecurse(entry);
+    return result;
+  }
+
+  @override
+  License? nearestLicenseOfType(LicenseType type) {
+    assert(!src._canGoUp());
+    return super.nearestLicenseOfType(type) ?? src.nearestLicenseOfType(type);
+  }
+
+  @override
+  License? nearestLicenseWithName(String name, {String? authors}) {
+    assert(!src._canGoUp());
+    final License? result = super.nearestLicenseWithName(name, authors: authors) ?? src.nearestLicenseWithName(name, authors: authors);
+    return result;
   }
 
   @override
   _RepositoryDirectory createSubdirectory(fs.Directory entry) {
-    return _RelativePathDenylistRepositoryDirectory(
-      rootDir: rootDir,
-      denylist: denylist,
-      parent: this,
-      io: entry,
-    );
+    if (entry.name == 'src') {
+      // This is the actual BoringSSL library.
+      return _RepositoryBoringSSLSourceDirectory(this, entry);
+    }
+    return super.createSubdirectory(entry);
   }
 }
 
-class _RepositoryFuchsiaDirectory extends _RepositoryDirectory {
-  _RepositoryFuchsiaDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
+class _RepositoryBoringSSLSourceDirectory extends _RepositoryDirectory {
+  _RepositoryBoringSSLSourceDirectory(_RepositoryDirectory super.parent, super.io);
 
+  // This directory is called "src" because of the way we import boringssl. The
+  // parent is called "boringssl". Since we are a licenseRoot, the default
+  // "libraryName" implementation would use "src", so we force it to go up here.
   @override
-  String get libraryName => 'fuchsia_sdk';
+  String get libraryName => parent!.libraryName;
 
   @override
   bool get isLicenseRoot => true;
+}
 
-  @override
-  bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != 'toolchain'
-        && super.shouldRecurse(entry);
-  }
+class _RepositoryFlutterDirectory extends _RepositoryDirectory {
+  _RepositoryFlutterDirectory(_RepositoryDirectory super.parent, super.io);
 
   @override
-  _RepositoryDirectory createSubdirectory(fs.Directory entry) {
-    if (entry.name == 'sdk') {
-      return _RepositoryFuchsiaSdkDirectory(this, entry);
-    }
-    return super.createSubdirectory(entry);
-  }
-}
+  String get libraryName => 'engine';
 
-class _RepositoryFuchsiaSdkDirectory extends _RepositoryDirectory {
-  _RepositoryFuchsiaSdkDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
+  @override
+  bool get isLicenseRoot => true;
 
   @override
   _RepositoryDirectory createSubdirectory(fs.Directory entry) {
-    if (entry.name == 'linux' || entry.name == 'mac') {
-      return _RepositoryFuchsiaSdkLinuxDirectory(this, entry);
+    if (entry.name == 'third_party') {
+      return _RepositoryFlutterThirdPartyDirectory(this, entry);
     }
-    return super.createSubdirectory(entry);
+    return _RepositoryDirectory(this, entry);
   }
 }
 
-class _RepositoryFuchsiaSdkLinuxDirectory extends _RepositoryDirectory {
-  _RepositoryFuchsiaSdkLinuxDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
+class _RepositoryFlutterThirdPartyDirectory extends _RepositoryGenericThirdPartyDirectory {
+  _RepositoryFlutterThirdPartyDirectory(super.parent, super.io);
 
   @override
   bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != '.build-id'
-        && entry.name != 'docs'
-        && entry.name != 'images'
-        && entry.name != 'meta'
-        && entry.name != 'tools'
-        // Applies to NOTICE.fuchsia file.
-        // This is a file that covers things that contribute to the Fuchsia SDK.
-        // See: fxb/94240
-        && !(entry.name == 'NOTICE.fuchsia');
+    return entry.name != 'skia' // handled as a virtual directory of the root
+        && super.shouldRecurse(entry);
   }
-}
-
-class _RepositoryFlutterThirdPartyDirectory extends _RepositoryDirectory {
-  _RepositoryFlutterThirdPartyDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
-
-  @override
-  bool get subdirectoriesAreLicenseRoots => true;
 
   @override
   _RepositoryDirectory createSubdirectory(fs.Directory entry) {
-    if (entry.name == 'txt') {
-      return _RepositoryFlutterTxtDirectory(this, entry);
+    if (entry.name == 'boringssl') {
+      return _RepositoryBoringSSLDirectory(this, entry);
+    }
+    if (entry.name == 'expat') {
+      return _RepositoryExpatDirectory(this, entry);
+    }
+    if (entry.name == 'freetype2') {
+      return _RepositoryFreetypeDirectory(this, entry);
+    }
+    if (entry.name == 'vulkan-deps') {
+      return _RepositoryGenericThirdPartyDirectory(this, entry);
     }
     return super.createSubdirectory(entry);
   }
 }
 
-class _RepositoryFlutterTxtDirectory extends _RepositoryDirectory {
-  _RepositoryFlutterTxtDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
+class _RepositoryFuchsiaDirectory extends _RepositoryDirectory {
+  _RepositoryFuchsiaDirectory(_RepositoryDirectory super.parent, super.io);
 
   @override
-  _RepositoryDirectory createSubdirectory(fs.Directory entry) {
-    if (entry.name == 'third_party') {
-      return _RepositoryFlutterTxtThirdPartyDirectory(this, entry);
-    }
-    return super.createSubdirectory(entry);
-  }
+  String get libraryName => 'fuchsia_sdk';
+
+  @override
+  bool get isLicenseRoot => true;
 }
 
-class _RepositoryFlutterTxtThirdPartyDirectory extends _RepositoryDirectory {
-  _RepositoryFlutterTxtThirdPartyDirectory( _RepositoryDirectory parent, fs.Directory io): super(parent, io);
+class _RepositoryGpuShimDirectory extends _RepositoryDirectory {
+  _RepositoryGpuShimDirectory(_RepositoryDirectory super.parent, super.io);
 
   @override
-  bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != 'fonts';
-  }
+  String get libraryName => 'engine';
 }
 
+
 /// The license tool directory.
 ///
 /// This is a special-case root node that is not used for license aggregation,
@@ -2639,81 +1795,21 @@ class _RepositoryFlutterLicenseToolDirectory extends _RepositoryDirectory {
 
   @override
   bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != 'data'
-        && super.shouldRecurse(entry);
+    return entry.name != 'data' && super.shouldRecurse(entry);
   }
 }
 
-/// The `src/` directory created by gclient sync (a.k.a. buildroot).
-///
-/// This directory is the parent of the flutter/engine repository. The license
-/// crawler begins its search starting from this directory and recurses down
-/// from it.
-///
-/// This is not the root of the flutter/engine repository.
-/// [_RepositoryFlutterDirectory] represents that.
-class _EngineSrcDirectory extends _RepositoryDirectory {
-  _EngineSrcDirectory(fs.Directory io) : super(null, io);
-
-  @override
-  String get libraryName {
-    assert(false);
-    return 'engine';
-  }
-
-  @override
-  bool get isLicenseRoot => true;
-
-  @override
-  bool get subdirectoriesAreLicenseRoots => true;
-
-  @override
-  bool shouldRecurse(fs.IoNode entry) {
-    return entry.name != 'build' // only used by build
-        && entry.name != 'buildtools' // only used by build
-        && entry.name != 'build_overrides' // only used by build
-        && entry.name != 'gradle' // only used by build
-        && entry.name != 'ios_tools' // only used by build
-        && entry.name != 'tools' // not distributed in binary
-        && entry.name != 'out' // output of build
-        && super.shouldRecurse(entry);
-  }
-
-  @override
-  _RepositoryDirectory createSubdirectory(fs.Directory entry) {
-    if (entry.name == 'base') {
-      throw '//base is no longer part of this client: remove it';
-    }
-    if (entry.name == 'third_party') {
-      return _RepositoryRootThirdPartyDirectory(this, entry);
-    }
-    if (entry.name == 'flutter') {
-      return _RepositoryFlutterDirectory(this, entry);
-    }
-    if (entry.name == 'fuchsia') {
-      return _RepositoryFuchsiaDirectory(this, entry);
-    }
-    return super.createSubdirectory(entry);
-  }
 
-  @override
-  List<_RepositoryDirectory> get virtualSubdirectories {
-    // Skia is updated more frequently than other third party libraries and
-    // is therefore represented as a separate top-level component.
-    final fs.Directory thirdPartyNode = findChildDirectory(ioDirectory, 'third_party')!;
-    final fs.Directory skiaNode = findChildDirectory(thirdPartyNode, 'skia')!;
-    return <_RepositoryDirectory>[_RepositorySkiaDirectory(this, skiaNode)];
-  }
-}
+// BOOTSTRAPPING LOGIC
 
 fs.Directory? findChildDirectory(fs.Directory parent, String name) {
-  return parent.walk.firstWhereOrNull(
+  return parent.walk.firstWhereOrNull( // from IterableExtension in package:collection
     (fs.IoNode child) => child.name == name,
   ) as fs.Directory?;
 }
 
 class _Progress {
-  _Progress(this.max, {bool? quiet = false}) : _quiet = quiet {
+  _Progress(this.max, {this.quiet = false}) : millisecondsBetweenUpdates = quiet ? 10000 : 0 {
     // This may happen when a git client contains left-over empty component
     // directories after DEPS file changes.
     if (max <= 0) {
@@ -2722,7 +1818,8 @@ class _Progress {
   }
 
   final int max;
-  final bool? _quiet;
+  final bool quiet;
+  final int millisecondsBetweenUpdates;
   int get withLicense => _withLicense;
   int _withLicense = 0;
   int get withoutLicense => _withoutLicense;
@@ -2731,7 +1828,7 @@ class _Progress {
   String _label = '';
   int _lastLength = 0;
   set label(String value) {
-    if (value.length > 50) {
+    if (value.length > 60) {
       value = '.../${value.substring(math.max(0, value.lastIndexOf('/', value.length - 45) + 1))}';
     }
     if (_label != value) {
@@ -2741,7 +1838,6 @@ class _Progress {
   }
 
   void advance({required bool success}) {
-    assert(success != null);
     if (success) {
       _withLicense += 1;
     } else {
@@ -2752,11 +1848,9 @@ class _Progress {
 
   Stopwatch? _lastUpdate;
   void update({bool flush = false}) {
-    if (_lastUpdate == null || _lastUpdate!.elapsedMilliseconds > 90 || flush) {
+    if (_lastUpdate == null || _lastUpdate!.elapsedMilliseconds >= millisecondsBetweenUpdates || flush) {
       _lastUpdate ??= Stopwatch();
-      if (_quiet!) {
-        system.stderr.write('.');
-      } else {
+      if (!quiet) {
         final String line = toString();
         system.stderr.write('\r$line');
         if (_lastLength > line.length) {
@@ -2774,23 +1868,31 @@ class _Progress {
   @override
   String toString() {
     final int percent = (100.0 * (_withLicense + _withoutLicense) / max).round();
-    return '${(_withLicense + _withoutLicense).toString().padLeft(10)} of $max ${'█' * (percent ~/ 10)}${'░' * (10 - (percent ~/ 10))} $percent% ($_withoutLicense missing licenses)  $label';
+    return '${(_withLicense + _withoutLicense).toString().padLeft(10)} of ${max.toString().padRight(6)} '
+           '${'█' * (percent ~/ 10)}${'░' * (10 - (percent ~/ 10))} $percent% '
+           '${ _withoutLicense > 0 ? "($_withoutLicense missing licenses) " : ""}'
+           '$label';
   }
 }
 
+final RegExp _signaturePattern = RegExp(r'^Signature: (\w+)$', multiLine: true, expectNoMatch: true);
+
 /// Reads the signature from a golden file.
-Future<String?> _readSignature(String goldenPath) async {
+String? _readSignature(String goldenPath) {
   try {
     final system.File goldenFile = system.File(goldenPath);
-    final String goldenSignature = await utf8.decoder.bind(goldenFile.openRead())
-        .transform(const LineSplitter()).first;
-    final RegExp signaturePattern = RegExp(r'Signature: (\w+)');
-    final Match? goldenMatch = signaturePattern.matchAsPrefix(goldenSignature);
+    if (!goldenFile.existsSync()) {
+      system.stderr.writeln('    Could not find signature file ($goldenPath).');
+      return null;
+    }
+    final String goldenSignature = goldenFile.readAsStringSync();
+    final Match? goldenMatch = _signaturePattern.matchAsPrefix(goldenSignature);
     if (goldenMatch != null) {
       return goldenMatch.group(1);
     }
+    system.stderr.writeln('    Signature file ($goldenPath) did not match expected pattern.');
   } on system.FileSystemException {
-    system.stderr.writeln('    Failed to read signature file.');
+    system.stderr.writeln('    Failed to read signature file ($goldenPath).');
     return null;
   }
   return null;
@@ -2798,28 +1900,22 @@ Future<String?> _readSignature(String goldenPath) async {
 
 /// Writes a signature to an [system.IOSink] in the expected format.
 void _writeSignature(String signature, system.IOSink sink) {
-  if (signature != null) {
-    sink.writeln('Signature: $signature\n');
-  }
+  sink.writeln('Signature: $signature\n');
 }
 
 // Checks for changes to the license tool itself.
 //
 // Returns true if changes are detected.
 Future<bool> _computeLicenseToolChanges(_RepositoryDirectory root, { required String goldenSignaturePath, required String outputSignaturePath }) async {
-  system.stderr.writeln('Computing signature for license tool');
   final fs.Directory flutterNode = findChildDirectory(root.ioDirectory, 'flutter')!;
   final fs.Directory toolsNode = findChildDirectory(flutterNode, 'tools')!;
   final fs.Directory licenseNode = findChildDirectory(toolsNode, 'licenses')!;
-  final _RepositoryFlutterLicenseToolDirectory licenseToolDirectory =
-      _RepositoryFlutterLicenseToolDirectory(licenseNode);
-
+  final _RepositoryDirectory licenseToolDirectory = _RepositoryFlutterLicenseToolDirectory(licenseNode);
   final String toolSignature = await licenseToolDirectory.signature;
   final system.IOSink sink = system.File(outputSignaturePath).openWrite();
   _writeSignature(toolSignature, sink);
   await sink.close();
-
-  final String? goldenSignature = await _readSignature(goldenSignaturePath);
+  final String? goldenSignature = _readSignature(goldenSignaturePath);
   return toolSignature != goldenSignature;
 }
 
@@ -2830,47 +1926,37 @@ Future<bool> _computeLicenseToolChanges(_RepositoryDirectory root, { required St
 Future<void> _collectLicensesForComponent(_RepositoryDirectory componentRoot, {
   required String inputGoldenPath,
   String? outputGoldenPath,
-  bool? writeSignature,
+  required bool writeSignature,
   required bool force,
-  bool? quiet,
+  required bool quiet,
 }) async {
-  // Check whether the golden file matches the signature of the current contents of this directory.
-  final String? goldenSignature = await _readSignature(inputGoldenPath);
   final String signature = await componentRoot.signature;
-  if (!force && goldenSignature == signature) {
-    system.stderr.writeln('    Skipping this component - no change in signature');
-    return;
+  if (writeSignature) {
+    // Check whether the golden file matches the signature of the current contents of this directory.
+    // (We only do this for components where we write the signature, since if there's no signature,
+    // there's no point trying to read it...)
+    final String? goldenSignature = _readSignature(inputGoldenPath);
+    if (!force && goldenSignature == signature) {
+      system.stderr.writeln('    Skipping this component - no change in signature');
+      return;
+    }
   }
 
   final _Progress progress = _Progress(componentRoot.fileCount, quiet: quiet);
 
   final system.File outFile = system.File(outputGoldenPath!);
   final system.IOSink sink = outFile.openWrite();
-  if (writeSignature!) {
+  if (writeSignature) {
     _writeSignature(signature, sink);
   }
 
-  final List<License> licenses = Set<License>.from(componentRoot.getLicenses(progress).toList()).toList();
-
+  final List<GroupedLicense> licenses = groupLicenses(componentRoot.assignLicenses(progress));
   if (progress.hadErrors) {
     throw 'Had failures while collecting licenses.';
   }
-
-  sink.writeln('UNUSED LICENSES:\n');
-  final List<License> rawUnusedLicenses = licenses
-    .where((License license) => !license.isUsed)
-    .toList();
-  rawUnusedLicenses.sort((License a, License b) => a.toStringBody().compareTo(b.toStringBody()));
-  final List<String> unusedLicenses = rawUnusedLicenses
-    .map((License license) => license.toString())
-    .toList();
-  sink.writeln(unusedLicenses.join('\n\n'));
-  sink.writeln('~' * 80);
-
-  sink.writeln('USED LICENSES:\n');
-  final List<License> usedLicenses = licenses.where((License license) => license.isUsed).toList();
-  usedLicenses.sort((License a, License b) => a.toStringBody().compareTo(b.toStringBody()));
-  final List<String> output = usedLicenses.map((License license) => license.toString()).toList();
+  progress.label = 'Dumping results...';
+  progress.flush();
+  final List<String> output = licenses.map((GroupedLicense license) => license.toStringDebug()).toList();
   for (int index = 0; index < output.length; index += 1) {
     // The strings we look for here are strings which we do not expect to see in
     // any of the licenses we use. They either represent examples of misparsing
@@ -2882,38 +1968,34 @@ Future<void> _collectLicensesForComponent(_RepositoryDirectory componentRoot, {
     // asking Hixie). Do not merely remove one of these checks, sometimes the
     // issues involved are relatively subtle.
     if (output[index].contains('Version: MPL 1.1/GPL 2.0/LGPL 2.1')) {
-      throw 'Unexpected trilicense block found in: ${usedLicenses[index].origin}';
+      throw 'Unexpected trilicense block found in:\n${output[index]}';
     }
-    if (output[index].contains(
-        'The contents of this file are subject to the Mozilla Public License Version')) {
-      throw 'Unexpected MPL block found in: ${usedLicenses[index].origin}';
+    if (output[index].contains('The contents of this file are subject to the Mozilla Public License Version')) {
+      throw 'Unexpected MPL block found in:\n${output[index]}';
     }
     if (output[index].contains('You should have received a copy of the GNU')) {
-      throw 'Unexpected GPL block found in: ${usedLicenses[index].origin}';
-    }
-    if (output[index].contains('BoringSSL is a fork of OpenSSL')) {
-      throw 'Unexpected legacy BoringSSL block found in: ${usedLicenses[index].origin}';
+      throw 'Unexpected GPL block found in:\n${output[index]}';
     }
     if (output[index].contains('Contents of this folder are ported from')) {
-      throw 'Unexpected block found in: ${usedLicenses[index].origin}';
+      throw 'Unexpected block found in:\n${output[index]}';
     }
     if (output[index].contains('https://github.com/w3c/web-platform-tests/tree/master/selectors-api')) {
-      throw 'Unexpected W3C content found in: ${usedLicenses[index].origin}';
+      throw 'Unexpected W3C content found in:\n${output[index]}';
     }
     if (output[index].contains('http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html')) {
-      throw 'Unexpected W3C copyright found in: ${usedLicenses[index].origin}';
+      throw 'Unexpected W3C copyright found in:\n${output[index]}';
     }
     if (output[index].contains('It is based on commit')) {
-      throw 'Unexpected content found in: ${usedLicenses[index].origin}';
+      throw 'Unexpected content found in:\n${output[index]}';
     }
     if (output[index].contains('The original code is covered by the dual-licensing approach described in:')) {
-      throw 'Unexpected old license reference found in: ${usedLicenses[index].origin}';
+      throw 'Unexpected old license reference found in:\n${output[index]}';
     }
     if (output[index].contains('must choose')) {
-      throw 'Unexpected indecisiveness found in: ${usedLicenses[index].origin}';
+      throw 'Unexpected indecisiveness found in:\n${output[index]}';
     }
   }
-  sink.writeln(output.join('\n\n'));
+  sink.writeln(output.join('\n'));
   sink.writeln('Total license count: ${licenses.length}');
 
   await sink.close();
@@ -2926,14 +2008,16 @@ Future<void> _collectLicensesForComponent(_RepositoryDirectory componentRoot, {
 
 Future<void> main(List<String> arguments) async {
   final ArgParser parser = ArgParser()
-    ..addOption('src', help: 'The root of the engine source')
-    ..addOption('out', help: 'The directory where output is written')
-    ..addOption('golden', help: 'The directory containing golden results')
-    ..addFlag('quiet', help: 'If set, the diagnostic output is much less verbose')
-    ..addFlag('release', help: 'Print output in the format used for product releases');
+    ..addOption('src', help: 'The root of the engine source.')
+    ..addOption('out', help: 'The directory where output is written. (Ignored if used with --release.)')
+    ..addOption('golden', help: 'The directory containing golden results.')
+    ..addFlag('quiet', help: 'If set, the diagnostic output is much less verbose.')
+    ..addFlag('verbose', help: 'If set, print additional information to help with development.')
+    ..addFlag('release', help: 'Print output in the format used for product releases.');
 
   final ArgResults argResults = parser.parse(arguments);
-  final bool? quiet = argResults['quiet'] as bool?;
+  final bool quiet = argResults['quiet'] as bool;
+  final bool verbose = argResults['verbose'] as bool;
   final bool releaseMode = argResults['release'] as bool;
   if (argResults['src'] == null) {
     print('Flutter license script: Must provide --src directory');
@@ -2964,23 +2048,18 @@ Future<void> main(List<String> arguments) async {
 
     if (releaseMode) {
       system.stderr.writeln('Collecting licenses...');
-      system.stderr.writeln('quiet: $quiet');
       final _Progress progress = _Progress(root.fileCount, quiet: quiet);
-      final List<License> licenses = Set<License>.from(root.getLicenses(progress).toList()).toList();
+      final List<GroupedLicense> licenses = groupLicenses(root.assignLicenses(progress));
       if (progress.hadErrors) {
         throw 'Had failures while collecting licenses.';
       }
       progress.label = 'Dumping results...';
       progress.flush();
-      final List<License> sortedLicenses = licenses
-        .where((License license) => license.isUsed)
-        .toList();
-      sortedLicenses.sort((License a, License b) => a.toStringBody().compareTo(b.toStringBody()));
-      final List<String?> output = sortedLicenses
-        .map((License license) => license.toStringFormal())
-        .whereNotNull()
-        .toList();
-      print(output.join('\n${"-" * 80}\n'));
+      final String output = licenses
+        .where((GroupedLicense license) => license.body.isNotEmpty)
+        .map((GroupedLicense license) => license.toStringFormal())
+        .join('\n${"-" * 80}\n');
+      print(output);
       progress.label = 'Done.';
       progress.flush();
       system.stderr.writeln();
@@ -2991,21 +2070,16 @@ Future<void> main(List<String> arguments) async {
       const String toolSignatureFilename = 'tool_signature';
       final bool forceRunAll = await _computeLicenseToolChanges(
         root,
-        goldenSignaturePath:
-            path.join(argResults['golden'] as String, toolSignatureFilename),
-        outputSignaturePath:
-            path.join(argResults['out'] as String, toolSignatureFilename),
+        goldenSignaturePath: path.join(argResults['golden'] as String, toolSignatureFilename),
+        outputSignaturePath: path.join(argResults['out'] as String, toolSignatureFilename),
       );
       if (forceRunAll) {
-        system.stderr.writeln(
-            '    Detected changes to license tool. Forcing license collection for all components.');
+        system.stderr.writeln('Detected changes to license tool. Forcing license collection for all components.');
       }
-
       final List<String> usedGoldens = <String>[];
       bool isFirstComponent = true;
       for (final _RepositoryDirectory component in root.subdirectories) {
         system.stderr.writeln('Collecting licenses for ${component.io.name}');
-
         _RepositoryDirectory componentRoot;
         if (isFirstComponent) {
           // For the first component, we can use the results of the initial repository crawl.
@@ -3014,42 +2088,51 @@ Future<void> main(List<String> arguments) async {
         } else {
           // For other components, we need a clean repository that does not
           // contain any state left over from previous components.
-          clearLicenseRegistry();
           componentRoot = _EngineSrcDirectory(rootDirectory)
               .subdirectories
-              .firstWhere(
-                  (_RepositoryDirectory dir) => dir.name == component.name);
+              .firstWhere((_RepositoryDirectory dir) => dir.name == component.name);
         }
-
-        // Always run the full license check on the flutter tree. The flutter
-        // tree is relatively small and changes frequently in ways that do not
-        // affect the license output, and we don't want to require updates to
-        // the golden signature for those changes.
         final String goldenFileName = 'licenses_${component.io.name}';
         await _collectLicensesForComponent(
-            componentRoot,
-            inputGoldenPath: path.join(argResults['golden'] as String, goldenFileName),
-            outputGoldenPath: path.join(argResults['out'] as String, goldenFileName),
-            writeSignature: component.io.name != 'flutter',
-            force: forceRunAll || component.io.name == 'flutter',
-            quiet: quiet,
+          componentRoot,
+          inputGoldenPath: path.join(argResults['golden'] as String, goldenFileName),
+          outputGoldenPath: path.join(argResults['out'] as String, goldenFileName),
+          writeSignature: component.io.name != 'flutter',
+          // Always run the full license check on the flutter tree. The flutter
+          // tree is relatively small and changes frequently in ways that do not
+          // affect the license output, and we don't want to require updates to
+          // the golden signature for those changes.
+          force: forceRunAll || component.io.name == 'flutter',
+          quiet: quiet,
         );
         usedGoldens.add(goldenFileName);
       }
-
       final Set<String> unusedGoldens = system.Directory(argResults['golden'] as String).listSync()
-        .map((system.FileSystemEntity file) => path.basename(file.path)).toSet()
-        ..removeAll(usedGoldens)
-        ..remove(toolSignatureFilename);
+        .map<String>((system.FileSystemEntity file) => path.basename(file.path))
+        .where((String name) => name.startsWith('licenses_'))
+        .toSet()
+        ..removeAll(usedGoldens);
       if (unusedGoldens.isNotEmpty) {
         system.stderr.writeln('The following golden files in ${argResults['golden']} are unused and need to be deleted:');
         unusedGoldens.map((String s) => ' * $s').forEach(system.stderr.writeln);
         system.exit(1);
       }
+      // write to disk the list of files we did _not_ cover, so it's easier to catch in diffs
+      final String excluded = (_RepositoryDirectory._excluded.map(
+        (fs.IoNode node) => node.fullName,
+      ).toSet().toList()..sort()).join('\n');
+      system.File(path.join(argResults['out'] as String, 'excluded_files')).writeAsStringSync(
+        '$excluded\n',
+      );
     }
   } catch (e, stack) {
+    system.stderr.writeln();
     system.stderr.writeln('failure: $e\n$stack');
     system.stderr.writeln('aborted.');
     system.exit(1);
+  } finally {
+    if (verbose) {
+      RegExp.printDiagnostics();
+    }
   }
 }
diff --git a/tools/licenses/lib/paths.dart b/tools/licenses/lib/paths.dart
new file mode 100644
index 0000000000000000000000000000000000000000..63734545958c994c4537ccd80950c0d2e19f3f35
--- /dev/null
+++ b/tools/licenses/lib/paths.dart
@@ -0,0 +1,472 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'regexp_debug.dart';
+
+// Directories or files that are not included in the final binaries.
+//
+// These are absolute paths relative to the root of the buildroot repository
+// as checked out after gclient imports all the dependencies.
+//
+// Do not provide trailing slashes for directories.
+//
+// Including a directory in this list excludes the entire subtree rooted at
+// that directory.
+//
+// Keep this list in lexical order.
+final Set<String> skippedPaths = <String>{
+  r'README.md',
+  r'build', // only used by build
+  r'build_overrides', // only used by build
+  r'buildtools', // only used by build
+  r'flutter/build',
+  r'flutter/build_overrides', // only used by build
+  r'flutter/buildtools', // only used by build
+  r'flutter/ci',
+  r'flutter/docs',
+  r'flutter/flutter_frontend_server',
+  r'flutter/impeller/docs',
+  r'flutter/lib/web_ui/build', // this is compiler-generated output
+  r'flutter/lib/web_ui/dev', // these are build tools; they do not end up in Engine artifacts
+  r'flutter/prebuilts',
+  r'flutter/sky/packages/sky_engine/LICENSE',
+  r'flutter/third_party/angle/android',
+  r'flutter/third_party/angle/doc',
+  r'flutter/third_party/angle/extensions',
+  r'flutter/third_party/angle/infra',
+  r'flutter/third_party/angle/scripts',
+  r'flutter/third_party/angle/src/libANGLE/renderer/metal/doc',
+  r'flutter/third_party/angle/src/libANGLE/renderer/vulkan/doc',
+  r'flutter/third_party/angle/src/third_party/volk', // We don't use Vulkan in our ANGLE build.
+  r'flutter/third_party/angle/third_party', // Unused by Flutter: BUILD files with forwarding targets (but no code).
+  r'flutter/third_party/angle/tools', // These are build-time tools, and aren't shipped.
+  r'flutter/third_party/angle/util',
+  r'flutter/third_party/benchmark', // only used by tests
+  r'flutter/third_party/boringssl/src/crypto/err/err_data_generate.go',
+  r'flutter/third_party/boringssl/src/fuzz', // testing tools, not shipped
+  r'flutter/third_party/boringssl/src/rust', // rust-related code is not shipped
+  r'flutter/third_party/boringssl/src/util', // code generators, not shipped
+  r'flutter/third_party/depot_tools', // only used for the Windows build system.
+  r'flutter/third_party/expat/expat/doc',
+  r'flutter/third_party/expat/expat/win32/expat.iss',
+  r'flutter/third_party/flatbuffers/android',
+  r'flutter/third_party/flatbuffers/benchmarks',
+  r'flutter/third_party/flatbuffers/docs',
+  r'flutter/third_party/flatbuffers/go',
+  r'flutter/third_party/flatbuffers/net',
+  r'flutter/third_party/flatbuffers/php',
+  r'flutter/third_party/flatbuffers/python',
+  r'flutter/third_party/flatbuffers/rust',
+  r'flutter/third_party/flatbuffers/ts',
+  r'flutter/third_party/freetype2/builds',
+  r'flutter/third_party/freetype2/src/tools',
+  r'flutter/third_party/glfw/deps', // Only used by examples and tests; not linked in build.
+  r'flutter/third_party/glfw/docs',
+  r'flutter/third_party/gn',
+  r'flutter/third_party/google_fonts_for_unit_tests', // only used in web unit tests
+  r'flutter/third_party/harfbuzz/docs',
+  r'flutter/third_party/harfbuzz/util', // utils are command line tools that do not end up in the binary
+  r'flutter/third_party/icu/filters',
+  r'flutter/third_party/icu/fuzzers',
+  r'flutter/third_party/icu/scripts',
+  r'flutter/third_party/icu/source/common/unicode/uvernum.h', // this file contains strings that confuse the analysis
+  r'flutter/third_party/icu/source/config',
+  r'flutter/third_party/icu/source/data/brkitr/dictionaries/burmesedict.txt', // explicitly handled by ICU license
+  r'flutter/third_party/icu/source/data/brkitr/dictionaries/cjdict.txt', // explicitly handled by ICU license
+  r'flutter/third_party/icu/source/data/brkitr/dictionaries/laodict.txt', // explicitly handled by ICU license
+  r'flutter/third_party/icu/source/data/dtd',
+  r'flutter/third_party/imgui',
+  r'flutter/third_party/inja/doc', // documentation
+  r'flutter/third_party/inja/third_party/amalgamate', // only used at build time
+  r'flutter/third_party/inja/third_party/include/doctest', // seems to be a unit test library
+  r'flutter/third_party/json/docs',
+  r'flutter/third_party/libpng/contrib', // not linked in
+  r'flutter/third_party/libpng/mips', // not linked in
+  r'flutter/third_party/libpng/powerpc', // not linked in
+  r'flutter/third_party/libpng/projects', // not linked in
+  r'flutter/third_party/libpng/scripts', // not linked in
+  r'flutter/third_party/libtess2/Contrib/nanosvg.c', // only used by the ../Example
+  r'flutter/third_party/libtess2/Contrib/nanosvg.h', // only used by the ../Example
+  r'flutter/third_party/libtess2/Example',
+  r'flutter/third_party/libwebp/doc',
+  r'flutter/third_party/libwebp/gradle', // not included in our build
+  r'flutter/third_party/libwebp/swig', // not included in our build
+  r'flutter/third_party/libwebp/webp_js',
+  r'flutter/third_party/ninja', // build system
+  r'flutter/third_party/ocmock', // only used for tests
+  r'flutter/third_party/perfetto/debian', // contains nothing that ends up in the binary executable
+  r'flutter/third_party/perfetto/infra', // contains nothing that ends up in the binary executable
+  r'flutter/third_party/perfetto/protos', // contains nothing that ends up in the binary executable
+  r'flutter/third_party/perfetto/python/perfetto/trace_processor', // contains nothing that ends up in the binary executable
+  r'flutter/third_party/perfetto/src/ipc', // contains nothing that ends up in the binary executable
+  r'flutter/third_party/perfetto/src/profiling/memory', // contains nothing that ends up in the binary executable
+  r'flutter/third_party/perfetto/src/tools', // contains nothing that ends up in the binary executable
+  r'flutter/third_party/perfetto/src/trace_processor', // contains nothing that ends up in the binary executable
+  r'flutter/third_party/perfetto/src/traced', // contains nothing that ends up in the binary executable
+  r'flutter/third_party/perfetto/src/tracing', // contains nothing that ends up in the binary executable
+  r'flutter/third_party/pkg/archive', // contains nothing that ends up in the binary executable
+  r'flutter/third_party/pkg/equatable',
+  r'flutter/third_party/pkg/flutter_packages',
+  r'flutter/third_party/pkg/gcloud',
+  r'flutter/third_party/pkg/googleapis',
+  r'flutter/third_party/pkg/platform',
+  r'flutter/third_party/pkg/process',
+  r'flutter/third_party/pkg/process_runner',
+  r'flutter/third_party/pkg/vector_math',
+  r'flutter/third_party/protobuf', // build-time dependency only
+  r'flutter/third_party/pyyaml', // build-time dependency only
+  r'flutter/third_party/rapidjson/contrib', // contains nothing that ends up in the binary executable
+  r'flutter/third_party/rapidjson/doc', // documentation
+  r'flutter/third_party/shaderc/third_party/LICENSE.glslang', // unclear what the purpose of this file is
+  r'flutter/third_party/shaderc/third_party/LICENSE.spirv-tools', // unclear what the purpose of this file is
+  r'flutter/third_party/skia/bazel', // contains nothing that ends up in the binary executable
+  r'flutter/third_party/skia/bench',
+  r'flutter/third_party/skia/demos.skia.org',
+  r'flutter/third_party/skia/docs',
+  r'flutter/third_party/skia/experimental',
+  r'flutter/third_party/skia/infra', // contains nothing that ends up in the binary executable
+  r'flutter/third_party/skia/modules/canvaskit/go/gold_test_env',
+  r'flutter/third_party/skia/platform_tools', // contains nothing that ends up in the binary executable
+  r'flutter/third_party/skia/resources', // contains nothing that ends up in the binary executable
+  r'flutter/third_party/skia/samplecode',
+  r'flutter/third_party/skia/site',
+  r'flutter/third_party/skia/specs',
+  r'flutter/third_party/skia/third_party/freetype2', // we use our own version
+  r'flutter/third_party/skia/third_party/icu', // we use our own version
+  r'flutter/third_party/skia/third_party/libjpeg-turbo', // we use our own version
+  r'flutter/third_party/skia/third_party/libpng', // we use our own version
+  r'flutter/third_party/skia/third_party/lua', // not linked in
+  r'flutter/third_party/skia/third_party/vello', // not linked in
+  r'flutter/third_party/skia/tools', // contains nothing that ends up in the binary executable
+  r'flutter/third_party/stb',
+  r'flutter/third_party/swiftshader', // only used on hosts for tests
+  r'flutter/third_party/test_shaders', // for tests only
+  r'flutter/third_party/tinygltf',
+  r'flutter/third_party/txt/third_party/fonts',
+  r'flutter/third_party/vulkan-deps/glslang/LICENSE', // excluded to make sure we don't accidentally apply it as a default license
+  r'flutter/third_party/vulkan-deps/glslang/src/LICENSE.txt', // redundant with licenses inside files
+  r'flutter/third_party/vulkan-deps/glslang/src/glslang/OSDependent/Web', // we only use glslang in impellerc, not in web apps
+  r'flutter/third_party/vulkan-deps/glslang/src/kokoro', // only build files
+  r'flutter/third_party/vulkan-deps/spirv-cross/src/LICENSES', // directory with license templates
+  r'flutter/third_party/vulkan-deps/spirv-cross/src/shaders', // used by regression tests
+  r'flutter/third_party/vulkan-deps/spirv-cross/src/shaders-hlsl', // used by regression tests
+  r'flutter/third_party/vulkan-deps/spirv-cross/src/shaders-hlsl-no-opt', // used by regression tests
+  r'flutter/third_party/vulkan-deps/spirv-cross/src/shaders-msl', // used by regression tests
+  r'flutter/third_party/vulkan-deps/spirv-cross/src/shaders-msl-no-opt', // used by regression tests
+  r'flutter/third_party/vulkan-deps/spirv-cross/src/shaders-no-opt', // used by regression tests
+  r'flutter/third_party/vulkan-deps/spirv-cross/src/shaders-other', // used by regression tests
+  r'flutter/third_party/vulkan-deps/spirv-cross/src/shaders-reflection', // used by regression tests
+  r'flutter/third_party/vulkan-deps/spirv-cross/src/shaders-ue4', // used by regression tests
+  r'flutter/third_party/vulkan-deps/spirv-cross/src/shaders-ue4-no-opt', // used by regression tests
+  r'flutter/third_party/vulkan-deps/spirv-headers', // only used on hosts for tests
+  r'flutter/third_party/vulkan-deps/spirv-tools', // only used on hosts for tests
+  r'flutter/third_party/vulkan-deps/vulkan-headers/src/LICENSE.md', // redundant with licenses inside files
+  r'flutter/third_party/vulkan-deps/vulkan-headers/src/registry',
+  r'flutter/third_party/vulkan-deps/vulkan-loader', // on hosts for tests
+  r'flutter/third_party/vulkan-deps/vulkan-tools', // on hosts for tests
+  r'flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/LICENSE.md', // redundant with licenses inside files
+  r'flutter/third_party/vulkan-deps/vulkan-validation-layers/src/docs',
+  r'flutter/third_party/vulkan_memory_allocator/bin',
+  r'flutter/third_party/vulkan_memory_allocator/docs',
+  r'flutter/third_party/vulkan_memory_allocator/media',
+  r'flutter/third_party/vulkan_memory_allocator/src',
+  r'flutter/third_party/vulkan_memory_allocator/tools',
+  r'flutter/third_party/wuffs/docs',
+  r'flutter/third_party/wuffs/script',
+  r'flutter/third_party/yapf', // only used for code formatting
+  r'flutter/tools',
+  r'flutter/web_sdk', // this code is not linked into Flutter apps; it's only used by engine tests and tools
+  r'fuchsia/sdk/linux/docs',
+  r'fuchsia/sdk/linux/meta',
+  r'fuchsia/sdk/linux/NOTICE.fuchsia', // covers things that contribute to the Fuchsia SDK; see fxb/94240
+  r'fuchsia/sdk/linux/packages/blobs', // See https://github.com/flutter/flutter/issues/134042.
+  r'fuchsia/sdk/linux/tools',
+  r'fuchsia/sdk/mac/docs',
+  r'fuchsia/sdk/mac/meta',
+  r'fuchsia/sdk/mac/NOTICE.fuchsia',
+  r'fuchsia/sdk/mac/tools',
+  r'out', // output of build
+  r'third_party/android_embedding_dependencies', // Not shipped. Used only for the build-time classpath, and for the in-tree testing framework for Android
+  r'third_party/android_tools', // excluded on advice
+  r'third_party/dart/benchmarks', // not shipped in binary
+  r'third_party/dart/build', // not shipped in binary
+  r'third_party/dart/docs', // not shipped in binary
+  r'third_party/dart/pkg', // packages that don't become part of the binary (e.g. the analyzer)
+  r'third_party/dart/runtime/bin/ffi_test',
+  r'third_party/dart/runtime/docs',
+  r'third_party/dart/runtime/vm/service',
+  r'third_party/dart/sdk/lib/html/doc',
+  r'third_party/dart/sdk/lib/svg/dart2js', // generated from other sources
+  r'third_party/dart/third_party/binary_size', // not linked in
+  r'third_party/dart/third_party/binaryen', // not linked in
+  r'third_party/dart/third_party/d3', // Siva says "that is the charting library used by the binary size tool"
+  r'third_party/dart/third_party/d8', // testing tool for dart2js
+  r'third_party/dart/third_party/devtools', // not linked in
+  r'third_party/dart/third_party/fallback_root_certificates/certdata.pem',
+  r'third_party/dart/third_party/fallback_root_certificates/certdata.txt',
+  r'third_party/dart/third_party/firefox_jsshell', // testing tool for dart2js
+  r'third_party/dart/third_party/pkg',
+  r'third_party/dart/third_party/pkg_tested',
+  r'third_party/dart/third_party/requirejs', // only used by DDC
+  r'third_party/dart/tools', // not shipped in binary
+  r'third_party/gradle',
+  r'third_party/java', // only used for Android builds
+  r'third_party/libcxx/benchmarks',
+  r'third_party/libcxx/docs',
+  r'third_party/libcxx/src/support/solaris',
+  r'third_party/libcxx/utils',
+  r'third_party/libcxxabi/www',
+  r'third_party/libxml', // dependency of the testing system that we don't actually use
+  r'third_party/web_dependencies/canvaskit', // redundant; covered by Skia dependencies
+  r'third_party/zlib/contrib/minizip/miniunz.c', // sample file
+  r'third_party/zlib/contrib/minizip/minizip.c', // sample file
+  r'tools', // not distributed in binary
+};
+
+// Directories that should be skipped anywhere we find them.
+//
+// Any directory whose name matches one of these strings is skipped, including
+// its entire subtree.
+//
+// Keep this list in lexical order.
+final Set<String> skippedCommonDirectories = <String>{
+  r'.bazelci',
+  r'.build-id',
+  r'.ccls-cache',
+  r'.cipd',
+  r'.dart_tool',
+  r'.git',
+  r'.github',
+  r'.reuse',
+  r'.versions',
+  r'.vscode',
+  r'CMake',
+  r'Test',
+  r'cmake',
+  r'example',
+  r'examples',
+  r'fixtures',
+  r'googletest',
+  r'javatests',
+  r'jvmTest',
+  r'playground',
+  r'samples',
+  r'test',
+  r'test.disabled',
+  r'test_runner',
+  r'test_support',
+  r'testdata',
+  r'testing',
+  r'tests',
+  r'unit_tests',
+};
+
+// Filenames of files we never look at.
+//
+// Any file with a name in this list is skipped.
+//
+// Be careful about adding files like "LICENSE" or "README" (and such
+// variants) to this list as many packages put important license text in those
+// files and we don't want to skip them. Only include files here whose names
+// we would want to skip in ANY package.
+//
+// Keep this list in lexical order.
+final Set<String> skippedCommonFiles = <String>{
+  r'.DS_Store',
+  r'.appveyor.yml',
+  r'.bazelrc',
+  r'.bazelversion',
+  r'.clang-format',
+  r'.clang-tidy',
+  r'.editorconfig',
+  r'.eslintrc.js',
+  r'.gitattributes',
+  r'.gitconfig',
+  r'.gitignore',
+  r'.gitlab-ci.yml',
+  r'.gitmodules',
+  r'.gn',
+  r'.lgtm.yml',
+  r'.mailmap',
+  r'.packages',
+  r'.project',
+  r'.style.yapf',
+  r'.travis.yml',
+  r'.vpython',
+  r'.vpython3',
+  r'.yapfignore',
+  r'ABSEIL_ISSUE_TEMPLATE.md',
+  r'ANNOUNCE',
+  r'API-CONVENTIONS.md',
+  r'AUTHORS',
+  r'BREAKING-CHANGES.md',
+  r'BUILD.bazel',
+  r'BUILD.md',
+  r'BUILDING.md',
+  r'Brewfile',
+  r'CHANGES',
+  r'CHANGES.md',
+  r'CITATION.cff',
+  r'CMake.README',
+  r'CMakeLists.txt',
+  r'CODEOWNERS',
+  r'CODE_CONVENTIONS.md',
+  r'CODE_OF_CONDUCT.adoc',
+  r'CODE_OF_CONDUCT.md',
+  r'CONFIG.md',
+  r'CONTRIBUTORS',
+  r'CONTRIBUTORS.md',
+  r'CPPLINT.cfg',
+  r'CQ_COMMITTERS',
+  r'CREDITS.TXT',
+  r'Changes',
+  r'CodingStandard.md',
+  r'DEPS',
+  r'DIR_METADATA',
+  r'Dockerfile',
+  r'Doxyfile',
+  r'FAQ.md',
+  r'FIPS.md',
+  r'FUZZING.md',
+  r'FeatureSupportGL.md',
+  r'FormatTables.md',
+  r'Formatters.md',
+  r'GIT_REVISION',
+  r'HACKING.md',
+  r'INCORPORATING.md',
+  r'LAYER_CONFIGURATION.md',
+  r'LOCALE_DEPS.json',
+  r'MANIFEST.in',
+  r'MANIFEST.txt',
+  r'METADATA',
+  r'NEWS',
+  r'OWNERS',
+  r'OWNERS.android',
+  r'PATENT_GRANT',
+  r'PORTING.md',
+  r'README.asciidoc',
+  r'RELEASE_NOTES.TXT',
+  r'RELEASING.md',
+  r'RapidJSON.pc.in',
+  r'RapidJSONConfig.cmake.in',
+  r'RapidJSONConfigVersion.cmake.in',
+  r'SANDBOXING.md',
+  r'SECURITY.md',
+  r'STYLE.md',
+  r'TESTING.md',
+  r'THANKS',
+  r'TODO',
+  r'TODO.TXT',
+  r'TRADEMARK',
+  r'UPGRADES.md',
+  r'UniformBlockToStructuredBufferTranslation.md',
+  r'WATCHLISTS',
+  r'WORKSPACE',
+  r'WORKSPACE.bazel',
+  r'_config.yml',
+  r'additional_readme_paths.json',
+  r'alg_outline.md',
+  r'allowed_experiments.json',
+  r'amalgamate_config.json',
+  r'api_readme.md',
+  r'appveyor-reqs-install.cmd',
+  r'appveyor.yml',
+  r'build.xml',
+  r'codereview.settings',
+  r'coderules.txt',
+  r'configure-ac-style.md',
+  r'doxygen.config',
+  r'example.html',
+  r'gerrit.md',
+  r'gradle.properties',
+  r'include_dirs.js',
+  r'known_good.json',
+  r'known_good_khr.json',
+  r'libraries.json',
+  r'library.json',
+  r'license-checker.cfg',
+  r'license.html',
+  r'memory-sanitizer-blacklist.txt',
+  r'meson.build',
+  r'meta.json',
+  r'minizip.md',
+  r'package.json',
+  r'pkgdataMakefile.in',
+  r'pom.xml',
+  r'pubspec.lock',
+  r'requirements-dev.txt',
+  r'requirements.txt',
+  r'sources.txt',
+  r'structure.txt',
+  r'swift.swiftformat',
+  r'sync.txt',
+  r'unit_tests.md',
+  r'version',
+  r'version_history.json',
+  r'vms_make.com',
+  r'vmservice_libraries.json',
+};
+
+// Extensions that we just never look at.
+//
+// We explicitly do not exclude .txt, .md, .TXT, and .MD files because it is common
+// for licenses to be in such files.
+//
+// This list only works for extensions with a single dot.
+//
+// Keep this list in lexical order.
+final Set<String> skippedCommonExtensions = <String>{
+  r'.1',
+  r'.3',
+  r'.5',
+  r'.autopkg',
+  r'.build',
+  r'.bzl',
+  r'.cmake',
+  r'.css',
+  r'.gn',
+  r'.gni',
+  r'.gradle',
+  r'.log',
+  r'.m4',
+  r'.mk',
+  r'.pl',
+  r'.py',
+  r'.pyc',
+  r'.pylintrc',
+  r'.sha1',
+  r'.yaml',
+  r'.~',
+};
+
+// Patterns for files and directories we should skip.
+//
+// Keep this list to a minimum, preferring all the other lists
+// in this file. Testing patterns is more expensive.
+//
+// Keep this list in lexical order.
+final List<Pattern> skippedFilePatterns = <Pattern>[
+  RegExp(r'\.[1-8]\.in$'), // man page source files (e.g. foo.1.in)
+  RegExp(r'/(?:_|\b)CONTRIBUTING(?:_|\b)[^/]*$'),
+  RegExp(r'/(?:_|\b)LAST_UPDATE(?:_|\b)[^/]*$'),
+  RegExp(r'/(?:_|\b)PATENTS(?:_|\b)[^/]*$'),
+  RegExp(r'/(?:_|\b)README(?!\.IJG)(?:_|\b)[^/]*$', caseSensitive: false),
+  RegExp(r'/(?:_|\b)VERSION(?:_|\b)[^/]*$'),
+  RegExp(r'/CHANGELOG(?:\.[.A-Z0-9]+)?$', caseSensitive: false),
+  RegExp(r'/INSTALL(?:\.[a-zA-Z0-9]+)?$'),
+  RegExp(r'/Makefile(?:\.[.A-Z0-9]+)?$', caseSensitive: false),
+  RegExp(r'\.~[0-9]+~$', expectNoMatch: true), // files that end in ".~1~", a backup convention of some IDEs
+  RegExp(r'\bmanual\.txt$'),
+  RegExp(r'^flutter/(?:.+/)*[^/]+_unittests?\.[^/]+$'),
+  RegExp(r'^flutter/lib/web_ui/lib/assets/ahem\.ttf$', expectNoMatch: true), // this gitignored file exists only for testing purposes
+  RegExp(r'^flutter/sky/packages/sky_engine/LICENSE$'), // that is the output of this script
+  RegExp(r'^flutter/third_party/abseil-cpp/(?:.+/)*[^/]+_test\.[^/]+$'),
+  RegExp(r'^flutter/third_party/angle/(?:.+/)*[^/]+_unittest\.[^/]+$'),
+  RegExp(r'^flutter/third_party/boringssl/(?:.+/)*[^/]+_test\.[^/]+$'),
+  RegExp(r'^flutter/third_party/boringssl/src/crypto/fipsmodule/bn/[^/]+.go$'),
+  RegExp(r'^flutter/third_party/boringssl/src/crypto/fipsmodule/ec/[^/]+.go$'),
+  RegExp(r'^flutter/third_party/freetype2/docs/(?!FTL\.TXT$).+'), // ignore all documentation except the license
+  RegExp(r'^third_party/dart/(?:.+/)*[^/]+_test\.[^/]+$'),
+  RegExp(r'^third_party/zlib/(?:.+/)*[^/]+_unittest\.[^/]+$'),
+];
diff --git a/tools/licenses/lib/patterns.dart b/tools/licenses/lib/patterns.dart
index fe23298b197b7f59c7efa6b35b7af3df29d50190..240553260cec4807edac9380cb6b256af603a55c 100644
--- a/tools/licenses/lib/patterns.dart
+++ b/tools/licenses/lib/patterns.dart
@@ -4,259 +4,245 @@
 
 // ignore_for_file: use_raw_strings, prefer_interpolation_to_compose_strings
 
+import 'dart:core' hide RegExp;
+
+import 'regexp_debug.dart';
+
 // COMMON PATTERNS
 
+// _findLicenseBlocks in licenses.dart cares about the two captures here
+// it also handles the first line being slightly different ("/*" vs " *" for example)
 const String kIndent = r'^((?:[-;@#<!.\\"/* ]*(?:REM[-;@#<!.\\"/* ]*)?[-;@#<!.\"/*]+)?)( *)';
 
 final RegExp stripDecorations = RegExp(
-  r'^((?:(?:[-;@#<!.\\"/* ]*(?:REM[-;@#<!.\\"/* ]*)?[-;@#<!.\"/*]+)?)(?:(?: |\t)*))(.*?)[ */]*$',
+  r'^((?:(?:[-;@#<!.\\"/* ]*(?:REM[-;@#<!.\\"/* ]*)?[-;@#<!.\"/*]+)?) *)(.*?)[ */]*$',
   multiLine: true,
   caseSensitive: false
 );
 
+// _reformat patterns (see also irrelevantText below)
+final RegExp leadingDecorations = RegExp(r'^(?://|#|;|@|REM\b|/?\*|--| )');
+final RegExp fullDecorations = RegExp(r'^ *[-=]{2,}$');
+final RegExp trailingColon = RegExp(r':(?: |\*|/|\n|=|-)*$', expectNoMatch: true);
+
 final RegExp newlinePattern = RegExp(r'\r\n?');
+final RegExp nonSpace = RegExp('[^ ]');
 
-final RegExp beginLicenseBlock = RegExp(
-  r'^([#;/* ]*) (?:\*\*\*\*\* BEGIN LICENSE BLOCK \*\*\*\*\*[ */]*'
-                r'|@APPLE_LICENSE_HEADER_START@)$'
-);
+// Used to check if something that we expect to contain a copyright does contain a copyright. Should be very easy to match.
+final RegExp anySlightSignOfCopyrights = RegExp(r'©|copyright|\(c\)', caseSensitive: false);
 
-final RegExp endLicenseBlock = RegExp(
-  r'^([#;/* ]*) (?:\*\*\*\*\* END LICENSE BLOCK \*\*\*\*\*[ */]*'
-                r'|@APPLE_LICENSE_HEADER_END@)$'
-);
+// Used to check if something that we don't expect to contain a copyright does contain a copyright. Should be harder to match.
+// The copyrightMentionOkPattern below is used to further exclude files that do match this.
+final RegExp copyrightMentionPattern = RegExp(r'©|copyright [0-9]|\(c\) [0-9]|copyright \(c\)', caseSensitive: false);
 
-final RegExp nonSpace = RegExp('[^ ]');
-final RegExp trailingComma = RegExp(r',[ */]*$');
-final RegExp trailingColon = RegExp(r':(?: |\*|/|\n|=|-)*$');
-final RegExp copyrightMentionPattern = RegExp(r'©| \(c\) (?!{)|copy\s*right\b|copy\s*left', caseSensitive: false);
-final RegExp licenseMentionPattern = RegExp(r'license|warrant[iy]', caseSensitive: false);
+// Used to check if something that we don't expect to contain a license does contain a license.
+final RegExp licenseMentionPattern = RegExp(r'Permission is hereby granted|warrant[iy]|derivative works|redistribution|copyleft', caseSensitive: false, expectNoMatch: true);
+
+// Used to allow-list files that match copyrightMentionPattern due to false positives.
+// Files that match this will not be caught if they add new otherwise unmatched licenses!
 final RegExp copyrightMentionOkPattern = RegExp(
   // if a (multiline) block matches this, we ignore it even if it matches copyrightMentionPattern/licenseMentionPattern
   r'(?:These are covered by the following copyright:'
-     r'|^((?:[-;#<!.\\"/* ]*(?:REM[-;#<!.\\"/* ]*)?[-;#<!.\"/*]+)?)((?: |\t)*)COPYRIGHT: *\r?\n'
-     r'|copyright.*\\n"' // clearly part of a string
      r'|\$YEAR' // clearly part of a template string
      r'|LICENSE BLOCK' // MPL license block header/footer
      r'|2117.+COPYRIGHT' // probably U+2117 mention...
      r'|// The copyright below was added in 2009, but I see no record'
      r'|This ICU code derived from:'
      r'|the contents of which are also included in zip.h' // seen in minizip's unzip.c, but the upshot of the crazy license situation there is that we don't have to do anything
-     r'|hold font names, copyright info, notices, etc' // seen in a comment in freetype's src/include/ftsnames.h
-     r'|' // the following is from android_tools/ndk/sources/cxx-stl/gnu-libstdc++/4.9/include/ext/pb_ds/detail/splay_tree_/splay_tree_.hpp
-     r'^ \* This implementation uses an idea from the SGI STL \(using a @a header node\n'
-     r'^ \*    which is needed for efficient iteration\)\. Following is the SGI STL\n'
-     r'^ \*    copyright\.\n'
+     r'|" inflate 1\.2\.1\d Copyright 1995-2022 Mark Adler ";'
+     r'|" deflate 1\.2\.1\d Copyright 1995-2022 Jean-loup Gailly and Mark Adler ";'
+     r'|const char zip_copyright\[\] =" zip 1\.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";'
+     r'|#define JCOPYRIGHT_SHORT "Copyright \(C\) 1991-2016 The libjpeg-turbo Project and many others"'
+     r"|r'[^']*©[^']*'" // e.g. flutter/third_party/web_locale_keymap/lib/web_locale_keymap/key_mappings.g.dart
+     // the following are all bits from ICU source files
+     // (you'd think ICU would be more consistent with its copyrights given how much
+     // source code there is in ICU just for generating copyrights)
+     r'|VALUE "LegalCopyright"'
+     r'|const char inflate_copyright\[\] =\n *" inflate 1\.2\.11 Copyright 1995-2017 Mark Adler ";' // found in some freetype files
+     r'|" Copyright \(C\) 2016 and later: Unicode, Inc\. and others\. License & terms of use: http://www\.unicode\.org/copyright\.html "'
+     r'|"\* / \\\\& ⁊ # % † ‡ ‧ ° © ® ™]"'
+     r'|" \*   Copyright \(C\) International Business Machines\n"'
+     r'|fprintf\(out, "// Copyright \(C\) 2016 and later: Unicode, Inc\. and others\.\\n"\);'
+     r'|fprintf\(out, "// License & terms of use: http://www\.unicode\.org/copyright\.html\\n\\n"\);'
+     r'|fprintf\(out, "/\*\* Copyright \(C\) 2007-2016, International Business Machines Corporation and Others\. All Rights Reserved\. \*\*/\\n\\n"\);'
+     r'|\\\(C\\\) ↔ ©;'
+     r'|" \*   Copyright \(C\) International Business Machines\\n"'
+     r'|"%s Copyright \(C\) %d and later: Unicode, Inc\. and others\.\\n"'
+     r'|"%s License & terms of use: http://www\.unicode\.org/copyright\.html\\n",'
+     r'|"%s Copyright \(C\) 1999-2016, International Business Machines\\n"'
+     r'|"%s Corporation and others\.  All Rights Reserved\.\\n",'
+     r'|\\mainpage' // q.v. third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
+     r'|" \* Copyright 2017 Google Inc\.\\n"'
   r')',
   caseSensitive: false, multiLine: true);
-final RegExp halfCopyrightPattern = RegExp(r'^(?:Copyright(?: \(c\))? [-0-9, ]+(?: by)?|Written [0-9]+)[ */]*$', caseSensitive: false);
+
+// Used to extact the "authors" pattern for copyrights that use that (like Flutter's).
 final RegExp authorPattern = RegExp(r'Copyright .+(The .+ Authors)\. +All rights reserved\.', caseSensitive: false);
 
+// Lines that are found at the top of license files but aren't strictly part of the license.
+final RegExp licenseHeaders = RegExp(
+  r'.+ Library\n|' // e.g. "xxHash Library"
+  r'.*(BSD|MIT|SGI).* (?:License|LICENSE)(?: [A-Z])?(?: \(.+\))?:? *\n|' // e.g. "BSD 3-Clause License", "The MIT License (MIT):", "SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)"; NOT "Apache License" (that _is_ part of the license)
+  r'All MurmurHash source files are placed in the public domain\.\n|'
+  r'The license below applies to all other code in SMHasher:\n|'
+  r'amalgamate.py - Amalgamate C source and header files\n|'
+  r'\n',
+);
+
 // copyright blocks start with the first line matching this
+// (used by _findLicenseBlocks)
 final List<RegExp> copyrightStatementLeadingPatterns = <RegExp>[
-  RegExp(r'^ *(?:Portions(?: are)? )?Copyright .+$', caseSensitive: false),
-  RegExp(r'^.*All rights? reserved\.$', caseSensitive: false),
-  RegExp(r'^ *\(C\) .+$', caseSensitive: false),
-  RegExp(r'^Copyright \(C\) .+$', caseSensitive: false),
-  RegExp(r'^:copyright: .+$', caseSensitive: false),
-  RegExp(r'[-_a-zA-Z0-9()]+ function provided freely by .+'),
-  RegExp(r'^.+ optimized code \(C\) COPYRIGHT .+$', caseSensitive: false),
-  RegExp(r'©'),
-
-  // TODO(ianh): I wish there was a way around including the next few lines so many times in the output:
-  RegExp(r"^This file (?:is|was) part of the Independent JPEG Group's software[:.]$"),
-  RegExp(r'^It was modified by The libjpeg-turbo Project to include only code$'),
-  RegExp(r'^relevant to libjpeg-turbo\.$'),
-  RegExp(r'^It was modified by The libjpeg-turbo Project to include only code relevant$'),
-  RegExp(r'^to libjpeg-turbo\.$'),
-  RegExp(r'^It was modified by The libjpeg-turbo Project to include only code and$'),
-  RegExp(r'^information relevant to libjpeg-turbo\.$'),
+  RegExp(r'^ *(?:Portions(?: created by the Initial Developer)?(?: are)? )?Copyright.+$', caseSensitive: false),
+  RegExp(r'^.*(?:All )?rights? reserved\.$', caseSensitive: false),
+  RegExp(r'^.*© [0-9]{4} .+$'),
 ];
 
+// patterns used by _splitLicense to extend the copyright block
+final RegExp halfCopyrightPattern = RegExp(r'^(?: *(?:Copyright(?: \(c\))? [-0-9, ]+(?: by)?|Written [0-9]+)[ */]*)$', caseSensitive: false);
+final RegExp trailingComma = RegExp(r',[ */]*$');
+
 // copyright blocks end with the last line that matches this, rest is considered license
+// (used by _splitLicense)
 final List<RegExp> copyrightStatementPatterns = <RegExp>[
-  RegExp(r'^ *(?:Portions(?: created by the Initial Developer)?(?: are)? )?Copyright .+$', caseSensitive: false),
-  RegExp(r'^\(Version [-0-9.:, ]+ Copyright .+\)$', caseSensitive: false),
-  RegExp(r'^.*(?:All )?rights? reserved\.$', caseSensitive: false),
-  RegExp(r'^ *\(C\) .+$', caseSensitive: false),
-  RegExp(r'^Copyright \(C\) .+$', caseSensitive: false),
-  RegExp(r'^:copyright: .+$', caseSensitive: false),
-  RegExp(r'^ *[0-9][0-9][0-9][0-9].+ [<(].+@.+[)>]$'),
-  RegExp(r'^                   [^ ].* [<(].+@.+[)>]$'), // that's exactly the number of spaces to line up with the X if "Copyright (c) 2011 X" is on the previous line
-  RegExp(r'^ *and .+$', caseSensitive: false),
-  RegExp(r'^ *others\.?$', caseSensitive: false),
-  RegExp(r'^for more details\.$', caseSensitive: false),
-  RegExp(r'^ *For more info read ([^ ]+)$', caseSensitive: false),
-  RegExp(r'^ *For terms of use, see ([^ ]+)$', caseSensitive: false),
+  ...copyrightStatementLeadingPatterns,
   RegExp(r'^(?:Google )?Author\(?s?\)?: .+', caseSensitive: false),
   RegExp(r'^Written by .+', caseSensitive: false),
   RegExp(r'^Originally written by .+', caseSensitive: false),
-  RegExp(r'^Based on$', caseSensitive: false),
   RegExp(r"^based on (?:code in )?['`][^'`]+['`]$", caseSensitive: false),
   RegExp(r'^Based on .+, written by .+, [0-9]+\.$', caseSensitive: false),
   RegExp(r'^(?:Based on the )?x86 SIMD extension for IJG JPEG library(?: - version [0-9.]+|,)?$'),
-  RegExp(r'^This software originally derived from .+\.$'),
   RegExp(r'^Derived from [a-z._/]+$'),
-  RegExp(r'^Derived from .+, which was$'),
   RegExp(r'^ *This is part of .+, a .+ library\.$'),
-  RegExp(r'^This file is part of [^ ]+\.$'),
   RegExp(r'^(?:Modification )?[Dd]eveloped [-0-9]+ by .+\.$', caseSensitive: false),
   RegExp(r'^Modified .+[:.]$', caseSensitive: false),
   RegExp(r'^(?:[^ ]+ )?Modifications:$', caseSensitive: false),
   RegExp(r'^ *Modifications for', caseSensitive: false),
   RegExp(r'^ *Modifications of', caseSensitive: false),
-  RegExp(r'^Last changed in .+$', caseSensitive: false),
-  RegExp(r'[-_a-zA-Z0-9()]+ function provided freely by .+'), // TODO(ianh): file a bug on analyzer about what happens if you omit this comma
-  RegExp(r'^.+ optimized code \(C\) COPYRIGHT .+$', caseSensitive: false),
+  RegExp(r'^Modifications Copyright \(C\) .+', caseSensitive: false),
   RegExp(r'^\(Royal Institute of Technology, Stockholm, Sweden\)\.$'),
-  RegExp(r'^\(?https?://[^ ]+$\)?'),
-
-  RegExp(r'^The Original Code is Mozilla Communicator client code, released$'),
-  RegExp(r'^March 31, 1998.$'), // mozilla first release date
-
-  RegExp(r'^The Elliptic Curve Public-Key Crypto Library \(ECC Code\) included$'),
-  RegExp(r'^herein is developed by SUN MICROSYSTEMS, INC\., and is contributed$'),
-  RegExp(r'^to the OpenSSL project\.$'),
-
-  RegExp(r'^This code is derived from software contributed to The NetBSD Foundation$'),
-  RegExp(r'^by (?:Atsushi Onoe|Dieter Baron|Klaus Klein|Luke Mewburn|Thomas Klausner|,| |and)*\.$'),
-
   RegExp(r'^FT_Raccess_Get_HeaderInfo\(\) and raccess_guess_darwin_hfsplus\(\) are$'),
   RegExp(r'^derived from ftobjs\.c\.$'),
-
-  // TODO(ianh): I wish there was a way around including the next few lines so many times in the output:
-  RegExp(r"^This file (?:is|was) part of the Independent JPEG Group's software[:.]$"),
-  RegExp(r'^It was modified by The libjpeg-turbo Project to include only code$'),
-  RegExp(r'^relevant to libjpeg-turbo\.$'),
-  RegExp(r'^It was modified by The libjpeg-turbo Project to include only code relevant$'),
-  RegExp(r'^to libjpeg-turbo\.$'),
-  RegExp(r'^It was modified by The libjpeg-turbo Project to include only code and$'),
-  RegExp(r'^information relevant to libjpeg-turbo\.$'),
-
-  RegExp(r'^All or some portions of this file are derived from material licensed$'),
-  RegExp(r'^to the University of California by American Telephone and Telegraph$'),
-  RegExp(r'^Co\. or Unix System Laboratories, Inc\. and are reproduced herein with$'),
-  RegExp(r'^the permission of UNIX System Laboratories, Inc.$'),
-
-  RegExp(r'^This software was developed by the Computer Systems Engineering group$'),
-  RegExp(r'^at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and$'),
-  RegExp(r'^contributed to Berkeley\.$'),
-
-  RegExp(r'^This code is derived from software contributed to Berkeley by$'),
-  RegExp(r'^Ralph Campbell\. +This file is derived from the MIPS RISC$'),
-  RegExp(r'^Architecture book by Gerry Kane\.$'),
-
-  RegExp(r'^All advertising materials mentioning features or use of this software$'),
-  RegExp(r'^must display the following acknowledgement:$'),
-  RegExp(r'^This product includes software developed by the University of$'),
-  RegExp(r'^California, Lawrence Berkeley Laboratory\.$'),
-
-  RegExp(r'^ *Condition of use and distribution are the same than zlib :$'),
-  RegExp(r'^(The )?MIT License:?$'),
-
-  RegExp(r'^$'), // TODO(ianh): file an issue on what happens if you omit the close quote
-
+  // RegExp(r'^ *Condition of use and distribution are the same than zlib :$'),
+  RegExp(r'^Unicode and the Unicode Logo are registered trademarks of Unicode, Inc\. in the U.S. and other countries\.$'),
+  RegExp(r'^$'),
 ];
 
 // patterns that indicate we're running into another license
 final List<RegExp> licenseFragments = <RegExp>[
-  RegExp(r'"as is" without express or implied warranty\.'),
-  RegExp(r'version of this file under any of the LGPL, the MPL or the GPL\.'),
   RegExp(r'SUCH DAMAGE\.'),
   RegExp(r'found in the LICENSE file'),
-  RegExp(r'<http://www\.gnu\.org/licenses/>'),
-  RegExp(r'License & terms of use'),
+  RegExp(r'This notice may not be removed'),
+  RegExp(r'SPDX-License-Identifier'),
+  RegExp(r'terms of use'),
+  RegExp(r'implied warranty'),
+  RegExp(r'^ *For more info read ([^ ]+)$'),
 ];
 
-const String _linebreak      = r' *(?:(?:\*/ *|[*#])?(?:\r?\n\1 *(?:\*/ *)?)*\r?\n\1\2 *)?';
+const String _linebreak      = r' *(?:(?:\*/ *|[*#])?(?:\n\1 *(?:\*/ *)?)*\n\1\2 *)?';
 const String _linebreakLoose = r' *(?:(?:\*/ *|[*#])?\r?\n(?:-|;|#|<|!|/|\*| |REM)*)*';
 
 // LICENSE RECOGNIZERS
 
-final RegExp lrApache = RegExp(r'^(?: |\r|\n)*Apache License\b');
-final RegExp lrMPL = RegExp(r'^(?: |\r|\n)*Mozilla Public License Version 2\.0\n');
-final RegExp lrGPL = RegExp(r'^(?: |\r|\n)*GNU GENERAL PUBLIC LICENSE\n');
-final RegExp lrAPSL = RegExp(r'^APPLE PUBLIC SOURCE LICENSE Version 2\.0 +- +August 6, 2003');
+final RegExp lrLLVM = RegExp(r'--- LLVM Exceptions to the Apache 2\.0 License ----$', multiLine: true);
+final RegExp lrApache = RegExp(r'^(?: |\n)*Apache License\b');
+final RegExp lrMPL = RegExp(r'^(?: |\n)*Mozilla Public License Version 2\.0\n');
+final RegExp lrGPL = RegExp(r'^(?: |\n)*GNU GENERAL PUBLIC LICENSE\n');
+final RegExp lrAPSL = RegExp(r'^APPLE PUBLIC SOURCE LICENSE Version 2\.0 +- +August 6, 2003', expectNoMatch: true);
 final RegExp lrMIT = RegExp(r'Permission(?: |\n)+is(?: |\n)+hereby(?: |\n)+granted,(?: |\n)+free(?: |\n)+of(?: |\n)+charge,(?: |\n)+to(?: |\n)+any(?: |\n)+person(?: |\n)+obtaining(?: |\n)+a(?: |\n)+copy(?: |\n)+of(?: |\n)+this(?: |\n)+software(?: |\n)+and(?: |\n)+associated(?: |\n)+documentation(?: |\n)+files(?: |\n)+\(the(?: |\n)+"Software"\),(?: |\n)+to(?: |\n)+deal(?: |\n)+in(?: |\n)+the(?: |\n)+Software(?: |\n)+without(?: |\n)+restriction,(?: |\n)+including(?: |\n)+without(?: |\n)+limitation(?: |\n)+the(?: |\n)+rights(?: |\n)+to(?: |\n)+use,(?: |\n)+copy,(?: |\n)+modify,(?: |\n)+merge,(?: |\n)+publish,(?: |\n)+distribute,(?: |\n)+sublicense,(?: |\n)+and/or(?: |\n)+sell(?: |\n)+copies(?: |\n)+of(?: |\n)+the(?: |\n)+Software,(?: |\n)+and(?: |\n)+to(?: |\n)+permit(?: |\n)+persons(?: |\n)+to(?: |\n)+whom(?: |\n)+the(?: |\n)+Software(?: |\n)+is(?: |\n)+furnished(?: |\n)+to(?: |\n)+do(?: |\n)+so,(?: |\n)+subject(?: |\n)+to(?: |\n)+the(?: |\n)+following(?: |\n)+conditions:');
-final RegExp lrOpenSSL = RegExp(r'Copyright \(c\) 1998-2011 The OpenSSL Project\.  All rights reserved\.(.|\n)*Original SSLeay License');
+final RegExp lrOpenSSL = RegExp(r'OpenSSL.+dual license', expectNoMatch: true);
 final RegExp lrBSD = RegExp(r'Redistribution(?: |\n)+and(?: |\n)+use(?: |\n)+in(?: |\n)+source(?: |\n)+and(?: |\n)+binary(?: |\n)+forms(?:(?: |\n)+of(?: |\n)+the(?: |\n)+software(?: |\n)+as(?: |\n)+well(?: |\n)+as(?: |\n)+documentation)?,(?: |\n)+with(?: |\n)+or(?: |\n)+without(?: |\n)+modification,(?: |\n)+are(?: |\n)+permitted(?: |\n)+provided(?: |\n)+that(?: |\n)+the(?: |\n)+following(?: |\n)+conditions(?: |\n)+are(?: |\n)+met:');
-final RegExp lrZlib = RegExp(r'Permission(?: |\n)+is(?: |\n)+granted(?: |\n)+to(?: |\n)+anyone(?: |\n)+to(?: |\n)+use(?: |\n)+this(?: |\n)+software(?: |\n)+for(?: |\n)+any(?: |\n)+purpose,(?: |\n)+including(?: |\n)+commercial(?: |\n)+applications,(?: |\n)+and(?: |\n)+to(?: |\n)+alter(?: |\n)+it(?: |\n)+and(?: |\n)+redistribute(?: |\n)+it(?: |\n)+freely,(?: |\n)+subject(?: |\n)+to(?: |\n)+the(?: |\n)+following(?: |\n)+restrictions:');
-final RegExp lrPNG = RegExp(r'This code is released under the libpng license\.');
+final RegExp lrPNG = RegExp(r'This code is released under the libpng license\.|PNG Reference Library License');
 final RegExp lrBison = RegExp(r'This special exception was added by the Free Software Foundation in *\n *version 2.2 of Bison.');
 
+// Matching this exactly is important since it's likely there will be similar
+// licenses with more requirements.
+final RegExp lrZlib = RegExp(
+  r"This software is provided 'as-is', without any express or implied\n"
+  r'warranty\. +In no event will the authors be held liable for any damages\n'
+  r'arising from the use of this software\.\n'
+  r'\n'
+  r'Permission is granted to anyone to use this software for any purpose,\n'
+  r'including commercial applications, and to alter it and redistribute it\n'
+  r'freely, subject to the following restrictions:\n'
+  r'\n'
+  r'1\. The origin of this software must not be misrepresented; you must not\n'
+  r'   claim that you wrote the original software\. If you use this software\n'
+  r'   in a product, an acknowledgment in the product documentation would(?: be)?\n'
+  r'   (?:be )?appreciated but is not required\.\n'
+  r'2\. Altered source versions must be plainly marked as such, and must not(?: be)?\n'
+  r'   (?: be)?misrepresented as being the original software\.\n'
+  r'3\. This notice may not be removed or altered from any source(?: |\n   )distribution\.'
+  r'$' // no more terms!
+);
 
-// "NO COPYRIGHT" STATEMENTS
 
-final List<RegExp> csNoCopyrights = <RegExp>[
+// ASCII ART PATTERNS
 
-  // used with _tryNone
-  // groups are ignored
+// If these images are found in a file, they are stripped before we look for license patterns.
+final List<List<String>> asciiArtImages = <String>[
+  r'''
+ ___        _
+|_ _|_ __  (_) __ _
+ | || '_ \ | |/ _` |
+ | || | | || | (_| |
+|___|_| |_|/ |\__,_|
+         |__/''',
+].map((String image) => image.split('\n')).toList();
 
-  // Seen in Android NDK
-  RegExp(
-    r'^[/* ]*This header was automatically generated from a Linux kernel header\n'
-    r'^[/* ]*of the same name, to make information necessary for userspace to\n'
-    r'^[/* ]*call into the kernel available to libc.  It contains only constants,\n'
-    r'^[/* ]*structures, and macros generated from the original header, and thus,\n'
-    r'^[/* ]*contains no copyrightable information.',
-    multiLine: true,
-    caseSensitive: false
-  ),
 
-  RegExp(
-    kIndent +
-    r'These constants were taken from version 3 of the DWARF standard, *\n'
-    r'^\1\2which is Copyright \(c\) 2005 Free Standards Group, and *\n'
-    r'^\1\2Copyright \(c\) 1992, 1993 UNIX International, Inc\. *\n',
-    multiLine: true,
-    caseSensitive: false
-  ),
+// FORWARD REFERENCE
 
-  // Freetype
-  RegExp(
-    kIndent +
-    (r'This is a dummy file, used to please the build system\. It is never included by the auto-fitter sources\.'.replaceAll(' ', _linebreak)),
-    multiLine: true,
-    caseSensitive: false
-  ),
+class ForwardReferencePattern {
+  ForwardReferencePattern({ required this.firstPrefixIndex, required this.indentPrefixIndex, required this.pattern, required this.targetPattern });
+  final int firstPrefixIndex;
+  final int indentPrefixIndex;
+  final RegExp pattern;
+  final RegExp targetPattern;
+}
 
-  // Freetype
-  RegExp(
-    kIndent +
-    (
-      r'This software was written by Alexander Peslyak in 2001\. No copyright is '
-      r'claimed, and the software is hereby placed in the public domain\. In case '
-      r'this attempt to disclaim copyright and place the software in the public '
-      r'domain is deemed null and void, then the software is Copyright \(c\) 2001 '
-      r'Alexander Peslyak and it is hereby released to the general public under the '
-      r'following terms: Redistribution and use in source and binary forms, with or '
-      r"without modification, are permitted\. There\'s ABSOLUTELY NO WARRANTY, "
-      r'express or implied\.(?: \(This is a heavily cut-down "BSD license"\.\))?'
-      .replaceAll(' ', _linebreak)
+final List<ForwardReferencePattern> csForwardReferenceLicenses = <ForwardReferencePattern>[
+  // used with _tryForwardReferencePattern
+
+  // OpenSSL
+  ForwardReferencePattern(
+    firstPrefixIndex: 1,
+    indentPrefixIndex: 2,
+    pattern: RegExp(
+      kIndent + r'(?:'
+      +
+      (
+        r'Portions of the attached software \("Contribution"\) are developed by .+ and are contributed to the OpenSSL project\.'
+        .replaceAll(' ', _linebreak)
+      )
+      +
+      r'|'
+      +
+      (
+        r'The .+ included herein is developed by .+, and is contributed to the OpenSSL project\.'
+        .replaceAll(' ', _linebreak)
+      )
+      +
+      r'|'
+      r'(?:\1? *\n)+'
+      r')*'
+      r'\1\2 *'
+      +
+      (
+        r'The .+ is licensed pursuant to the OpenSSL open source license provided (?:below|above)\.'
+        .replaceAll(' ', _linebreak)
+      ),
+      multiLine: true,
+      caseSensitive: false,
     ),
-    multiLine: true,
-    caseSensitive: false
+    targetPattern: RegExp('Redistribution and use in source and binary forms(?:.|\n)+OpenSSL')
   ),
 
-];
-
-
-// ATTRIBUTION STATEMENTS
-
-final List<RegExp> csAttribution = <RegExp>[
-
-  // used with _tryAttribution
-  // group 1 is the prefix, group 2 is the attribution
-
-  // Seen in musl in Android SDK
-  RegExp(
-    r'^([/* ]*)This code was written by (.+) in [0-9]+; no copyright is claimed\.\n'
-    r'^\1This code is in the public domain\. +Attribution is appreciated but\n'
-    r'^\1unnecessary\.',
-    multiLine: true,
-    caseSensitive: false
+  ForwardReferencePattern(
+    firstPrefixIndex: 1,
+    indentPrefixIndex: 2,
+    pattern: RegExp(kIndent + r'This code is released under the libpng license\. \(See LICENSE, below\.\)', multiLine: true),
+    targetPattern: RegExp('PNG Reference Library License'),
   ),
-
 ];
 
 
@@ -264,21 +250,26 @@ final List<RegExp> csAttribution = <RegExp>[
 
 class LicenseFileReferencePattern {
   LicenseFileReferencePattern({
-    this.firstPrefixIndex,
-    this.indentPrefixIndex,
+    required this.firstPrefixIndex,
+    required this.indentPrefixIndex,
     this.copyrightIndex,
     this.authorIndex,
-    this.fileIndex,
-    this.pattern,
+    required this.fileIndex,
+    required this.pattern,
     this.needsCopyright = true
   });
-  final int? firstPrefixIndex;
-  final int? indentPrefixIndex;
+  final int firstPrefixIndex;
+  final int indentPrefixIndex;
   final int? copyrightIndex;
   final int? authorIndex;
-  final int? fileIndex;
+  final int fileIndex;
   final bool needsCopyright;
-  final RegExp? pattern;
+  final RegExp pattern;
+
+  @override
+  String toString() {
+    return '$pattern ($firstPrefixIndex $indentPrefixIndex c=$copyrightIndex (needs? $needsCopyright) a=$authorIndex, f=$fileIndex';
+  }
 }
 
 final List<LicenseFileReferencePattern> csReferencesByFilename = <LicenseFileReferencePattern>[
@@ -298,6 +289,20 @@ final List<LicenseFileReferencePattern> csReferencesByFilename = <LicenseFileRef
     ),
   ),
 
+  // zlib files
+  LicenseFileReferencePattern(
+    firstPrefixIndex: 1,
+    indentPrefixIndex: 2,
+    fileIndex: 3,
+    pattern: RegExp(
+      kIndent +
+      r'(?:detect_data_type\(\) function provided freely by Cosmin Truta, 2006 )?'
+      r'For conditions of distribution and use, see copyright notice in (zlib.h|jsimdext.inc)\b'.replaceAll(' ', _linebreak),
+      multiLine: true,
+    ),
+  ),
+
+
   // typical of much Google-written code
   LicenseFileReferencePattern(
     firstPrefixIndex: 1,
@@ -325,7 +330,7 @@ final List<LicenseFileReferencePattern> csReferencesByFilename = <LicenseFileRef
       // the comment decoration in the captured match, otherwise it won't be
       // stripped from the second line when generating output.
       r'((?: \* Copyright \(C\) 2017 ARM, Inc.\n)?'
-      r'Copyright .+(The .+ Authors)\. +All rights reserved\.)\n'
+      r'Copyright .+(The .+ Authors)(?:\. +All rights reserved\.)?)\n'
       r'Use of this source code is governed by a BSD-style license that can be\n'
       r'found in the Chromium source repository ([^ ]+) file.'.replaceAll(r'\n', _linebreakLoose),
       multiLine: true,
@@ -392,10 +397,14 @@ final List<LicenseFileReferencePattern> csReferencesByFilename = <LicenseFileRef
     indentPrefixIndex: 2,
     fileIndex: 3,
     pattern: RegExp(
-      kIndent + r'For conditions of distribution and use, see (?:the accompanying|copyright notice in)? ([-_.a-zA-Z0-9]+)',
+      kIndent +
+      r"(?:This file is part of the Independent JPEG Group's software.)? "
+      r'(?:It was modified by The libjpeg-turbo Project to include only code (?:and information)? relevant to libjpeg-turbo\.)? '
+      r'For conditions of distribution and use, see the accompanying '
+      r'(README.ijg)'.replaceAll(' ', _linebreakLoose),
       multiLine: true,
       caseSensitive: false,
-    )
+    ),
   ),
 
   // Seen in FreeType software
@@ -448,58 +457,6 @@ final List<LicenseFileReferencePattern> csReferencesByFilename = <LicenseFileRef
       r'FreeType Project License as well as those provided in this section, '
       r'and you accept them fully\.'.replaceAll(' ', _linebreak),
       multiLine: true,
-      caseSensitive: false,
-    )
-  ),
-
-  // Seen in Jinja files
-  LicenseFileReferencePattern(
-    firstPrefixIndex: 1,
-    indentPrefixIndex: 2,
-    fileIndex: 3,
-    pattern: RegExp(
-      kIndent + r':license: [A-Z0-9]+, see (.+) for more details\.',
-      multiLine: true,
-      caseSensitive: false,
-    )
-  ),
-
-  // Seen in modp_b64
-  LicenseFileReferencePattern(
-    firstPrefixIndex: 1,
-    indentPrefixIndex: 2,
-    fileIndex: 3,
-    pattern: RegExp(
-      kIndent + r'Released under [^ ]+ license\. +See ([^ ]+) for details\.$',
-      multiLine: true,
-      caseSensitive: false,
-    )
-  ),
-
-  // Seen in libxml files
-  LicenseFileReferencePattern(
-    firstPrefixIndex: 1,
-    indentPrefixIndex: 2,
-    fileIndex: 3,
-    pattern: RegExp(
-      kIndent + r'(?:Copy: )?See ([A-Z0-9]+) for the status of this software\.?',
-      multiLine: true,
-      caseSensitive: false,
-    )
-  ),
-
-  // Seen in libxml files
-  LicenseFileReferencePattern(
-    firstPrefixIndex: 1,
-    indentPrefixIndex: 2,
-    fileIndex: 3,
-    needsCopyright: false,
-    pattern: RegExp(
-      kIndent +
-      r'// This file is dual licensed under the MIT and the University of Illinois Open *\n'
-      r'^\1\2// Source Licenses. See (LICENSE\.TXT) for details\.',
-      multiLine: true,
-      caseSensitive: false,
     )
   ),
 
@@ -516,61 +473,37 @@ final List<LicenseFileReferencePattern> csReferencesByFilename = <LicenseFileRef
       r'https://www\.openssl\.org/source/license\.html'
       .replaceAll(' ', _linebreak),
       multiLine: true,
-      caseSensitive: false,
-    )
-  ),
-
-  // Seen in Fuchsia SDK files
-  LicenseFileReferencePattern(
-    firstPrefixIndex: 1,
-    indentPrefixIndex: 2,
-    fileIndex: 3,
-    needsCopyright: false,
-    pattern: RegExp(
-      kIndent +
-      r'Copyright .+\. All rights reserved\. '
-      r'This is a GENERATED file, see //zircon/.+/abigen\. '
-      r'The license governing this file can be found in the (LICENSE) file\.'
-      .replaceAll(' ', _linebreak),
-      multiLine: true,
-      caseSensitive: false,
     )
   ),
 
-  // Seen in Fuchsia SDK files.
-  // TODO(chinmaygarde): This is a broken license file that is being patched
-  // upstream. Remove this once DX-1477 is patched.
+  // Seen in Microsoft files
   LicenseFileReferencePattern(
     firstPrefixIndex: 1,
     indentPrefixIndex: 2,
     fileIndex: 3,
-    needsCopyright: false,
     pattern: RegExp(
       kIndent +
-      r'Use of this source code is governed by a BSD-style license that can be '
-      r'Copyright .+\. All rights reserved\. '
-      r'found in the (LICENSE) file\.'
+      r'Licensed under the MIT License\. '
+      r'See (License\.txt) in the project root for license information\.'
       .replaceAll(' ', _linebreak),
       multiLine: true,
       caseSensitive: false,
     )
   ),
 
-  // Seen in Microsoft files
+  // Seen in React Native files
   LicenseFileReferencePattern(
     firstPrefixIndex: 1,
     indentPrefixIndex: 2,
     fileIndex: 3,
     pattern: RegExp(
       kIndent +
-      r'Licensed under the MIT License\. '
-      r'See (License\.txt) in the project root for license information\.'
+      r'This source code is licensed under the MIT license found in the '
+      r'(LICENSE) file in the root directory of this source tree.'
       .replaceAll(' ', _linebreak),
       multiLine: true,
-      caseSensitive: false,
     )
   ),
-
 ];
 
 
@@ -581,132 +514,138 @@ final List<RegExp> csReferencesByType = <RegExp>[
   // used with _tryReferenceByType
   // groups 1 and 2 are the prefix, group 3 is the license type
 
-  // Seen in Jinja files, markupsafe files
   RegExp(
-    kIndent + r':license: ([A-Z0-9]+)',
+    kIndent +
+    r'Written by Andy Polyakov <appro@openssl\.org> for the OpenSSL '
+    r'project\. The module is, however, dual licensed under (OpenSSL) and '
+    r'CRYPTOGAMS licenses depending on where you obtain it\. For further '
+    r'details see http://www\.openssl\.org/~appro/cryptogams/\. '
+    r'Permission to use under GPL terms is granted\.'.replaceAll(' ', _linebreak),
+    multiLine: true,
+  ),
+
+  // MPL
+  // fallback_root_certificates
+  RegExp(
+    r'/\* This Source Code Form is subject to the terms of the Mozilla Public *\n'
+    r'^( \*)( )License, v\. 2\.0\. +If a copy of the MPL was not distributed with this *\n'
+    r'^\1\2file, You can obtain one at (http://mozilla\.org/MPL/2\.0/)\.',
+    multiLine: true,
+  ),
+
+  // JSON (MIT)
+  RegExp(
+    kIndent + r'The code is distributed under the (MIT) license, Copyright (.+)\.$',
     multiLine: true,
-    caseSensitive: false
   ),
 
+  // BoringSSL
   RegExp(
     kIndent +
-    r'This software is made available under the terms of the (ICU) License -- ICU 1\.\8\.1 and later\.'.replaceAll(' ', _linebreak),
+    r'Rights for redistribution and usage in source and binary forms are '
+    r'granted according to the (OpenSSL) license\. Warranty of any kind is '
+    r'disclaimed\.'
+    .replaceAll(' ', _linebreak),
     multiLine: true,
-    caseSensitive: false
   ),
 
   RegExp(
     kIndent +
     (
-      r'(?:@APPLE_LICENSE_HEADER_START@)? '
-      r'This file contains Original Code and/or Modifications of Original Code '
-      r'as defined in and that are subject to the (Apple Public Source License) '
-      r"Version (2\.0) \(the 'License'\)\. You may not use this file except in "
-      r'compliance with the License\. Please obtain a copy of the License at '
-      r'(http://www\.opensource\.apple\.com/apsl/) and read it before using this '
-      r'file\. '
-      r'The Original Code and all software distributed under the License are '
-      r"distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER "
-      r'EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, '
-      r'INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, '
-      r'FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT\. '
-      r'Please see the License for the specific language governing rights and '
-      r'limitations under the License\.'
-      r'(?:@APPLE_LICENSE_HEADER_END@)? '
+      r'The portions of the attached software \("Contribution"\) is developed by '
+      r'Nokia Corporation and is licensed pursuant to the (OpenSSL) open source '
+      r'license\. '
+      r'\n '
+      r'The Contribution, originally written by Mika Kousa and Pasi Eronen of '
+      r'Nokia Corporation, consists of the "PSK" \(Pre-Shared Key\) ciphersuites '
+      r'support \(see RFC 4279\) to OpenSSL\. '
+      r'\n '
+      r'No patent licenses or other rights except those expressly stated in '
+      r'the OpenSSL open source license shall be deemed granted or received '
+      r'expressly, by implication, estoppel, or otherwise\. '
+      r'\n '
+      r'No assurances are provided by Nokia that the Contribution does not '
+      r'infringe the patent or other intellectual property rights of any third '
+      r'party or that the license provides you with all the necessary rights '
+      r'to make use of the Contribution\. '
+      r'\n '
+      r'THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND\. IN '
+      r'ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA '
+      r'SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY '
+      r'OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR '
+      r'OTHERWISE\.'
       .replaceAll(' ', _linebreak)
     ),
     multiLine: true,
-    caseSensitive: false
   ),
 
-];
-
-final List<RegExp> csReferencesByTypeNoCopyright = <RegExp>[
-
-  // used with _tryReferenceByType
-  // groups 1 and 2 are the prefix, group 3 is the license type
-
+  // TODO(ianh): Confirm this is the right way to handle this.
   RegExp(
     kIndent +
-    r'Written by Andy Polyakov <appro@openssl\.org> for the OpenSSL '
-    r'project\. The module is, however, dual licensed under (OpenSSL) and '
-    r'CRYPTOGAMS licenses depending on where you obtain it\. For further '
-    r'details see http://www\.openssl\.org/~appro/cryptogams/\. '
-    r'Permission to use under GPL terms is granted\.'.replaceAll(' ', _linebreak),
+    r'.+ support in OpenSSL originally developed by '
+    r'SUN MICROSYSTEMS, INC\., and contributed to the (OpenSSL) project\.'
+    .replaceAll(' ', _linebreak),
     multiLine: true,
-    caseSensitive: false
   ),
 
+  RegExp(
+    kIndent +
+    r'This software is made available under the terms of the (ICU) License -- ICU 1\.8\.1 and later\.'
+    .replaceAll(' ', _linebreak),
+    multiLine: true,
+  ),
 ];
 
-class MultipleVersionedLicenseReferencePattern {
-  MultipleVersionedLicenseReferencePattern({
-    this.firstPrefixIndex,
-    this.indentPrefixIndex,
-    this.licenseIndices,
-    this.versionIndices,
+class LicenseReferencePattern {
+  LicenseReferencePattern({
+    this.firstPrefixIndex = 1,
+    this.indentPrefixIndex = 2,
+    this.licenseIndex = 3,
     this.checkLocalFirst = true,
-    this.pattern
+    this.spdx = false, // indicates whether this is a reference via the SPDX syntax rather than a statement in English
+    required this.pattern,
   });
 
   final int? firstPrefixIndex;
   final int? indentPrefixIndex;
-  final List<int>? licenseIndices;
+  final int? licenseIndex;
   final bool checkLocalFirst;
-  final Map<int, int>? versionIndices;
+  final bool spdx;
   final RegExp? pattern;
 }
 
-final List<MultipleVersionedLicenseReferencePattern> csReferencesByUrl = <MultipleVersionedLicenseReferencePattern>[
+final List<LicenseReferencePattern> csReferencesByIdentifyingReference = <LicenseReferencePattern>[
 
-  // used with _tryReferenceByUrl
+  // used with _tryReferenceByIdentifyingReference
 
-  // SPDX
-  MultipleVersionedLicenseReferencePattern(
-    firstPrefixIndex: 1,
-    indentPrefixIndex: 2,
-    licenseIndices: const <int>[3],
-    checkLocalFirst: false,
+  LicenseReferencePattern(
     pattern: RegExp(
-      kIndent + r'SPDX-License-Identifier: (.*)',
+      kIndent + r'For terms of use, see ([^ \n]+)',
       multiLine: true,
-      caseSensitive: false,
     )
   ),
 
-  // AFL
-  MultipleVersionedLicenseReferencePattern(
-    firstPrefixIndex: 1,
-    indentPrefixIndex: 2,
-    licenseIndices: const <int>[3],
-    versionIndices: const <int, int>{ 3:4 },
-    checkLocalFirst: false,
+  LicenseReferencePattern(
     pattern: RegExp(
-      kIndent + r'Licensed under the (Academic Free License) version (3\.0)',
+      kIndent + r'License & terms of use: ([^ \n]+)',
       multiLine: true,
-      caseSensitive: false,
     )
   ),
 
-  // Eclipse
-  // Seen in auto-generated Java code in the Dart repository.
-  MultipleVersionedLicenseReferencePattern(
-    firstPrefixIndex: 1,
-    indentPrefixIndex: 2,
-    licenseIndices: const <int>[3],
+  LicenseReferencePattern(
+    pattern: RegExp(
+      kIndent + r'For more info read (MiniZip_info.txt)',
+      multiLine: true,
+    )
+  ),
+
+  // SPDX
+  LicenseReferencePattern(
     checkLocalFirst: false,
+    spdx: true, // indicates that this is a reference via the SPDX syntax rather than a statement in English
     pattern: RegExp(
-      r'^(?:[-;#<!.\\"/* ]*[-;#<!.\"/*]+)?( *)Licensed under the Eclipse Public License v1\.0 \(the "License"\); you may not use this file except *\n'
-      r'^\1\2in compliance with the License\. +You may obtain a copy of the License at *\n'
-      r'^\1\2 *\n'
-      r'^\1\2 *(http://www\.eclipse\.org/legal/epl-v10\.html) *\n'
-      r'^\1\2 *\n'
-      r'^\1\2Unless required by applicable law or agreed to in writing, software distributed under the License *\n'
-      r'^\1\2is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express *\n'
-      r'^\1\2or implied\. +See the License for the specific language governing permissions and limitations under *\n'
-      r'^\1\2the License\.',
+      kIndent + r'SPDX-License-Identifier: (.+)',
       multiLine: true,
-      caseSensitive: false,
     )
   ),
 
@@ -714,15 +653,13 @@ final List<MultipleVersionedLicenseReferencePattern> csReferencesByUrl = <Multip
   // Seen in Android code.
   // TODO(ianh): For this license we only need to include the text once, not once per copyright
   // TODO(ianh): For this license we must also include all the NOTICE text (see section 4d)
-  MultipleVersionedLicenseReferencePattern(
-    firstPrefixIndex: 1,
-    indentPrefixIndex: 2,
-    licenseIndices: const <int>[3],
+  LicenseReferencePattern(
     checkLocalFirst: false,
     pattern: RegExp(
       kIndent +
       r'Licensed under the Apache License, Version 2\.0 \(the "License"\); *\n'
       r'^\1\2you may not use this file except in compliance with the License\. *\n'
+      r'^(?:\1\2Copyright \(c\) 2015-2017 Valve Corporation\n)?' // https://github.com/KhronosGroup/Vulkan-ValidationLayers/pull/4930
       r'^\1\2You may obtain a copy of the License at *\n'
       r'^(?:(?:\1\2? *)? *\n)*'
       r'^\1\2 *(https?://www\.apache\.org/licenses/LICENSE-2\.0) *\n'
@@ -737,511 +674,83 @@ final List<MultipleVersionedLicenseReferencePattern> csReferencesByUrl = <Multip
     )
   ),
 
-  // BSD
-  MultipleVersionedLicenseReferencePattern(
-    firstPrefixIndex: 1,
-    indentPrefixIndex: 2,
-    licenseIndices: const <int>[3],
+  // MIT
+  // LicenseReferencePattern(
+  //   checkLocalFirst: false,
+  //   pattern: RegExp(
+  //     kIndent +
+  //     (
+  //      r'Use of this source code is governed by a MIT-style '
+  //      r'license that can be found in the LICENSE file or at '
+  //      r'(https://opensource.org/licenses/MIT)'
+  //      .replaceAll(' ', _linebreak)
+  //     ),
+  //     multiLine: true,
+  //     caseSensitive: false,
+  //   )
+  // ),
+
+  // MIT
+  // the crazy s/./->/ thing is someone being over-eager with search-and-replace in rapidjson
+  LicenseReferencePattern(
     checkLocalFirst: false,
     pattern: RegExp(
       kIndent +
-      r'Use of this source code is governed by a BS?D-style *\n'
-      r'^\1\2license that can be found in the LICENSE file or at *\n'
-      r'^\1\2(https://developers.google.com/open-source/licenses/bsd)',
-      multiLine: true,
-      caseSensitive: false,
-    )
-  ),
-
-  // MIT
-  MultipleVersionedLicenseReferencePattern(
-    firstPrefixIndex: 1,
-    indentPrefixIndex: 2,
-    licenseIndices: const <int>[3],
-    checkLocalFirst: false,
-    pattern: RegExp(
-      kIndent +
-      (
-       r'Use of this source code is governed by a MIT-style '
-       r'license that can be found in the LICENSE file or at '
-       r'(https://opensource.org/licenses/MIT)'
-       .replaceAll(' ', _linebreak)
-      ),
-      multiLine: true,
-      caseSensitive: false,
-    )
-  ),
-
-  // MIT
-  // the crazy s/./->/ thing is someone being over-eager with search-and-replace in rapidjson
-  MultipleVersionedLicenseReferencePattern(
-    firstPrefixIndex: 1,
-    indentPrefixIndex: 2,
-    licenseIndices: const <int>[3],
-    checkLocalFirst: false,
-    pattern: RegExp(
-      kIndent +
-      r'Licensed under the MIT License \(the "License"\); you may not use this file except *\n'
-      r'^\1\2in compliance with the License(?:\.|->) You may obtain a copy of the License at *\n'
-      r'^\1\n'
-      r'^\1\2(http://opensource(?:\.|->)org/licenses/MIT) *\n'
-      r'^\1\n'
-      r'^\1\2Unless required by applicable law or agreed to in writing, software distributed *\n'
-      r'^\1\2under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR *\n'
-      r'^\1\2CONDITIONS OF ANY KIND, either express or implied(?:\.|->) See the License for the *\n'
-      r'^\1\2specific language governing permissions and limitations under the License(?:\.|->)',
+      r'Licensed under the MIT License \(the "License"\); you may not use this file except *\n'
+      r'^\1\2in compliance with the License(?:\.|->) You may obtain a copy of the License at *\n'
+      r'^\1\n'
+      r'^\1\2(http://opensource(?:\.|->)org/licenses/MIT) *\n'
+      r'^\1\n'
+      r'^\1\2Unless required by applicable law or agreed to in writing, software distributed *\n'
+      r'^\1\2under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR *\n'
+      r'^\1\2CONDITIONS OF ANY KIND, either express or implied(?:\.|->) See the License for the *\n'
+      r'^\1\2specific language governing permissions and limitations under the License(?:\.|->)',
       multiLine: true,
       caseSensitive: false,
     )
   ),
 
   // Observatory (polymer)
-  MultipleVersionedLicenseReferencePattern(
-    firstPrefixIndex: 1,
-    indentPrefixIndex: 2,
-    licenseIndices: const <int>[3],
+  LicenseReferencePattern(
     checkLocalFirst: false,
     pattern: RegExp(
-      kIndent +
-      r'This code may only be used under the BSD style license found at (http://polymer.github.io/LICENSE.txt)$',
+      kIndent + r'This code may only be used under the BSD style license found at (http://polymer.github.io/LICENSE.txt)$',
       multiLine: true,
       caseSensitive: false,
     )
   ),
 
-  // ashmem
-  MultipleVersionedLicenseReferencePattern(
-    firstPrefixIndex: 1,
-    indentPrefixIndex: 2,
-    licenseIndices: const <int>[3],
-    versionIndices: const <int, int>{3:4},
+  // LLVM (Apache License v2.0 with LLVM Exceptions)
+  LicenseReferencePattern(
     checkLocalFirst: false,
     pattern: RegExp(
       kIndent +
-      r'This file is dual licensed. +It may be redistributed and/or modified *\n'
-      r'^\1\2under the terms of the (Apache) (2\.0) License OR version 2 of the GNU *\n'
-      r'^\1\2General Public License\.',
-      multiLine: true,
-      caseSensitive: false,
-    )
-  ),
-
-  // GNU ISO C++ GPL+Exception
-  // Seen in gnu-libstdc++ in Android NDK
-  MultipleVersionedLicenseReferencePattern(
-    firstPrefixIndex: 1,
-    indentPrefixIndex: 2,
-    licenseIndices: const <int>[5, 6],
-    versionIndices: const <int, int>{5:3, 6:4},
-    pattern: RegExp(
-      kIndent +
-      r'This file is part of the GNU ISO C\+\+ Library\. +This library is free *\n'
-      r'^\1\2software; you can redistribute _?_?it and/or modify _?_?it under the terms *\n'
-      r'^\1\2of the GNU General Public License as published by the Free Software *\n'
-      r'^\1\2Foundation; either version (3), or \(at your option\) any later *\n'
-      r'^\1\2version\. *\n'
-      r'^(?:(?:\1\2? *)? *\n)*'
-      r'^\1\2This library is distributed in the hope that _?_?it will be useful, but *\n'
-      r'^\1\2WITHOUT ANY WARRANTY; without even the implied warranty of *\n'
-      r'^\1\2MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE\. +See the GNU *\n'
-      r'^\1\2General Public License for more details\. *\n'
-      r'^(?:(?:\1\2? *)? *\n)*'
-      r'^\1\2Under Section 7 of GPL version \3, you are granted additional *\n'
-      r'^\1\2permissions described in the GCC Runtime Library Exception, version *\n'
-      r'^\1\2(3\.1), as published by the Free Software Foundation\. *\n'
-      r'^(?:(?:\1\2? *)? *\n)*'
-      r'^\1\2You should have received a copy of the GNU General Public License and *\n'
-      r'^\1\2a copy of the GCC Runtime Library Exception along with this program; *\n'
-      r'^\1\2see the files (COPYING3) and (COPYING\.RUNTIME) respectively\. +If not, see *\n'
-      r'^\1\2<http://www\.gnu\.org/licenses/>\.',
-      multiLine: true,
-      caseSensitive: false,
-    )
-  ),
-
-  // GNU ISO C++ GPL+Exception, alternative wrapping
-  // Seen in gnu-libstdc++ in Android NDK
-  MultipleVersionedLicenseReferencePattern(
-    firstPrefixIndex: 1,
-    indentPrefixIndex: 2,
-    licenseIndices: const <int>[5, 6],
-    versionIndices: const <int, int>{5:3, 6:4},
-    pattern: RegExp(
-      kIndent +
-      r'This file is part of the GNU ISO C\+\+ Library\. +This library is free *\n'
-      r'^\1\2software; you can redistribute it and/or modify it under the *\n'
-      r'^\1\2terms of the GNU General Public License as published by the *\n'
-      r'^\1\2Free Software Foundation; either version (3), or \(at your option\) *\n'
-      r'^\1\2any later version\. *\n'
-      r'^(?:(?:\1\2? *)? *\n)*'
-      r'^\1\2This library is distributed in the hope that it will be useful, *\n'
-      r'^\1\2but WITHOUT ANY WARRANTY; without even the implied warranty of *\n'
-      r'^\1\2MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE\. +See the *\n'
-      r'^\1\2GNU General Public License for more details\. *\n'
-      r'^(?:(?:\1\2? *)? *\n)*'
-      r'^\1\2Under Section 7 of GPL version \3, you are granted additional *\n'
-      r'^\1\2permissions described in the GCC Runtime Library Exception, version *\n'
-      r'^\1\2(3\.1), as published by the(?:, 2009)? Free Software Foundation\. *\n'
-      r'^(?:(?:\1\2? *)? *\n)*'
-      r'^\1\2You should have received a copy of the GNU General Public License and *\n'
-      r'^\1\2a copy of the GCC Runtime Library Exception along with this program; *\n'
-      r'^\1\2see the files (COPYING3) and (COPYING\.RUNTIME) respectively\. +If not, see *\n'
-      r'^\1\2<http://www\.gnu\.org/licenses/>\.',
-      multiLine: true,
-      caseSensitive: false,
-    )
-  ),
-
-  // GNU ISO C++ GPL+Exception, alternative footer without exception filename
-  // Seen in gnu-libstdc++ in Android NDK
-  MultipleVersionedLicenseReferencePattern(
-    firstPrefixIndex: 1,
-    indentPrefixIndex: 2,
-    licenseIndices: const <int>[6, 4],
-    versionIndices: const <int, int>{6:3, 4:5},
-    pattern: RegExp(
-      kIndent +
-      r'This file is part of the GNU ISO C\+\+ Library\. +This library is free *\n'
-      r'^\1\2software; you can redistribute it and/or modify it under the *\n'
-      r'^\1\2terms of the GNU General Public License as published by the *\n'
-      r'^\1\2Free Software Foundation; either version (3), or \(at your option\) *\n' // group 3 is the version of the gpl
-      r'^\1\2any later version\. *\n'
-      r'^(?:(?:\1\2? *)? *\n)*'
-      r'^\1\2This library is distributed in the hope that it will be useful, *\n'
-      r'^\1\2but WITHOUT ANY WARRANTY; without even the implied warranty of *\n'
-      r'^\1\2MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE\. +See the *\n'
-      r'^\1\2GNU General Public License for more details\. *\n'
-      r'^(?:(?:\1\2? *)? *\n)*'
-      r'^\1\2Under Section 7 of GPL version \3, you are granted additional *\n'
-      r'^\1\2permissions described in the (GCC Runtime Library Exception), version *\n' // group 4 is the "file name" of the exception (it's missing in this version, so we use this as a hook to later, see the url mappings)
-      r'^\1\2(3\.1), as published by the Free Software Foundation\. *\n' // group 5 is the version of the exception
-      r'^(?:(?:\1\2? *)? *\n)*'
-      r'^\1\2You should have received a copy of the GNU General Public License along *\n'
-      r'^\1\2with this library; see the file (COPYING3)\. +If not see *\n' // group 6 is the gpl file name
-      r'^\1\2<http://www\.gnu\.org/licenses/>\.',
-      multiLine: true,
-      caseSensitive: false,
-    )
-  ),
-
-  // GCC GPL+Exception
-  // Seen in gnu-libstdc++ in Android NDK
-  MultipleVersionedLicenseReferencePattern(
-    firstPrefixIndex: 1,
-    indentPrefixIndex: 2,
-    licenseIndices: const <int>[5, 6],
-    versionIndices: const <int, int>{5:3, 6:4},
-    pattern: RegExp(
-      kIndent +
-      r'This file is part of GCC. *\n'
-      r'^(?:(?:\1\2? *)? *\n)*'
-      r'^\1\2GCC is free software; you can redistribute it and/or modify it under *\n'
-      r'^\1\2the terms of the GNU General Public License as published by the Free *\n'
-      r'^\1\2Software Foundation; either version (3), or \(at your option\) any later *\n'
-      r'^\1\2version\. *\n'
-      r'^(?:(?:\1\2? *)? *\n)*'
-      r'^\1\2GCC is distributed in the hope that it will be useful, but WITHOUT ANY *\n'
-      r'^\1\2WARRANTY; without even the implied warranty of MERCHANTABILITY or *\n'
-      r'^\1\2FITNESS FOR A PARTICULAR PURPOSE\. +See the GNU General Public License *\n'
-      r'^\1\2for more details\. *\n'
-      r'^(?:(?:\1\2? *)? *\n)*'
-      r'^\1\2Under Section 7 of GPL version \3, you are granted additional *\n'
-      r'^\1\2permissions described in the GCC Runtime Library Exception, version *\n'
-      r'^\1\2(3\.1), as published by the Free Software Foundation\. *\n'
-      r'^(?:(?:\1\2? *)? *\n)*'
-      r'^\1\2You should have received a copy of the GNU General Public License and *\n'
-      r'^\1\2a copy of the GCC Runtime Library Exception along with this program; *\n'
-      r'^\1\2see the files (COPYING3) and (COPYING\.RUNTIME) respectively\. +If not, see *\n'
-      r'^\1\2<http://www\.gnu\.org/licenses/>\.',
-      multiLine: true,
-      caseSensitive: false,
-    )
-  ),
-
-  // GCC GPL+Exception, alternative line wrapping
-  // Seen in gnu-libstdc++ in Android NDK
-  MultipleVersionedLicenseReferencePattern(
-    firstPrefixIndex: 1,
-    indentPrefixIndex: 2,
-    licenseIndices: const <int>[5, 6],
-    versionIndices: const <int, int>{ 5:3, 6:4 },
-    pattern: RegExp(
-      kIndent +
-      r'This file is part of GCC. *\n'
-      r'^(?:(?:\1\2? *)? *\n)*'
-      r'^\1\2GCC is free software; you can redistribute it and/or modify *\n'
-      r'^\1\2it under the terms of the GNU General Public License as published by *\n'
-      r'^\1\2the Free Software Foundation; either version (3), or \(at your option\) *\n'
-      r'^\1\2any later version\. *\n'
-      r'^(?:(?:\1\2? *)? *\n)*'
-      r'^\1\2GCC is distributed in the hope that it will be useful, *\n'
-      r'^\1\2but WITHOUT ANY WARRANTY; without even the implied warranty of *\n'
-      r'^\1\2MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE\. +See the *\n'
-      r'^\1\2GNU General Public License for more details\. *\n'
-      r'^(?:(?:\1\2? *)? *\n)*'
-      r'^\1\2Under Section 7 of GPL version \3, you are granted additional *\n'
-      r'^\1\2permissions described in the GCC Runtime Library Exception, version *\n'
-      r'^\1\2(3\.1), as published by the Free Software Foundation\. *\n'
-      r'^(?:(?:\1\2? *)? *\n)*'
-      r'^\1\2You should have received a copy of the GNU General Public License and *\n'
-      r'^\1\2a copy of the GCC Runtime Library Exception along with this program; *\n'
-      r'^\1\2see the files (COPYING3) and (COPYING\.RUNTIME) respectively\. +If not, see *\n'
-      r'^\1\2<http://www\.gnu\.org/licenses/>\.',
-      multiLine: true,
-      caseSensitive: false,
-    )
-  ),
-
-  // LGPL 2.1
-  // some engine code
-  MultipleVersionedLicenseReferencePattern(
-    firstPrefixIndex: 1,
-    indentPrefixIndex: 2,
-    licenseIndices: const <int>[4],
-    versionIndices: const <int, int>{ 4:3 },
-    pattern: RegExp(
-      kIndent +
-      r'This library is free software; you can redistribute it and/or *\n'
-      r'^\1\2modify it under the terms of the GNU Library General Public *\n'
-      r'^\1\2License as published by the Free Software Foundation; either *\n'
-      r'^\1\2version (2) of the License, or \(at your option\) any later version\. *\n'
-      r'^(?:(?:\1\2? *)? *\n)*'
-      r'^\1\2This library is distributed in the hope that it will be useful, *\n'
-      r'^\1\2but WITHOUT ANY WARRANTY; without even the implied warranty of *\n?'
-       r'\1\2MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE\. +See the GNU *\n?'
-       r'\1\2Library General Public License for more details\. *\n'
-      r'^(?:(?:\1\2? *)? *\n)*'
-      r'^\1\2You should have received a copy of the GNU Library General Public License *\n'
-      r'^\1\2(?:along|aint) with this library; see the file (COPYING\.LI(?:B|other\.m_))\.?  If not, write to *\n'
-      r'^\1\2the Free Software Foundation, Inc\., (?:51 Franklin Street, Fifth Floor|59 Temple Place - Suite 330), *\n'
-      r'^\1\2Boston, MA 0211[01]-130[17], US(?:A\.|m_)',
-      multiLine: true,
-      caseSensitive: false,
-    )
-  ),
-
-  // AFL/LGPL
-  // xdg_mime
-  MultipleVersionedLicenseReferencePattern(
-    firstPrefixIndex: 1,
-    indentPrefixIndex: 2,
-    licenseIndices: const <int>[4],
-    versionIndices: const <int, int>{ 4:3 },
-    pattern: RegExp(
-      kIndent +
-      r'Licensed under the Academic Free License version 2.0 *\n'
-      r'^\1\2Or under the following terms: *\n'
-      r'^(?:(?:\1\2? *)? *\n)*'
-      r'^\1\2This library is free software; you can redistribute it and/or *\n'
-      r'^\1\2modify it under the terms of the GNU Lesser General Public *\n'
-      r'^\1\2License as published by the Free Software Foundation; either *\n'
-      r'^\1\2version (2) of the License, or \(at your option\) any later version\. *\n'
-      r'^(?:(?:\1\2? *)? *\n)*'
-      r'^\1\2This library is distributed in the hope that it will be useful, *\n'
-      r'^\1\2but WITHOUT ANY WARRANTY; without even the implied warranty of *\n'
-      r'^\1\2MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE\.\t? +See the GNU *\n'
-      r'^\1\2Lesser General Public License for more details\. *\n'
-      r'^(?:(?:\1\2? *)? *\n)*'
-      r'^\1\2You should have received a copy of the (GNU Lesser) General Public *\n'
-      r'^\1\2License along with this library; if not, write to the *\n'
-      r'^\1\2Free Software Foundation, Inc\., 59 Temple Place - Suite 330, *\n'
-      r'^\1\2Boston, MA 0211[01]-1307, USA\.',
-      multiLine: true,
-      caseSensitive: false,
-    )
-  ),
-
-  // MPL
-  // root_certificates
-  MultipleVersionedLicenseReferencePattern(
-    firstPrefixIndex: 1,
-    indentPrefixIndex: 2,
-    licenseIndices: const <int>[4],
-    versionIndices: const <int, int>{ 4:3 },
-    pattern: RegExp(
-      kIndent +
-      r'This Source Code Form is subject to the terms of the Mozilla Public *\n'
-      r'^\1\2License, v\. (2.0)\. +If a copy of the MPL was not distributed with this *\n'
-      r'^\1\2file, You can obtain one at (http://mozilla\.org/MPL/2\.0/)\.',
-      multiLine: true,
-      caseSensitive: false,
-    )
-  ),
-
-  // MPL/GPL/LGPL
-  // engine
-  MultipleVersionedLicenseReferencePattern(
-    firstPrefixIndex: 1,
-    indentPrefixIndex: 2,
-    licenseIndices: const <int>[3], // 5 is lgpl, which we're actively not selecting
-    versionIndices: const <int, int>{ 3:4 }, // 5:6 for lgpl
-    pattern: RegExp(
-      kIndent +
-      r'(?:Version: [GMPL/012. ]+ *\n'
-      r'^(?:(?:\1\2? *)? *\n)*'
-      r'^\1\2)?The contents of this file are subject to the (Mozilla Public License) Version *\n'
-      r'^\1\2(1\.1) \(the "License"\); you may not use this file except in compliance with *\n'
-      r'^\1\2the License\. +You may obtain a copy of the License at *\n'
-      r'^\1\2http://www\.mozilla\.org/MPL/ *\n'
-      r'^(?:(?:\1\2? *)? *\n)*'
-      r'^\1\2Software distributed under the License is distributed on an "AS IS" basis, *\n'
-      r'^\1\2WITHOUT WARRANTY OF ANY KIND, either express or implied\. +See the License *\n'
-      r'^\1\2for the specific language governing rights and limitations under the *\n'
-      r'^\1\2License\. *\n'
-      r'^(?:(?:\1\2? *)? *\n)*'
-      r'^\1\2The Original Code is .+?(?:released\n'
-      r'^\1\2March 31, 1998\.)?\n'
-      r'^(?:(?:\1\2? *)? *\n)*'
-      r'^\1\2The Initial Developer of the Original Code is *\n'
-      r'^\1\2.+\n'
-      r'^\1\2Portions created by the Initial Developer are Copyright \(C\) [0-9]+ *\n'
-      r'^\1\2the Initial Developer\. +All Rights Reserved\. *\n'
-      r'^(?:(?:\1\2? *)? *\n)*'
-      r'^\1\2Contributor\(s\): *\n'
-      r'(?:\1\2  .+\n)*'
-      r'^(?:(?:\1\2? *)? *\n)*'
-      r'^\1\2'
-      +
       (
-        r'Alternatively, the contents of this file may be used under the terms of '
-        r'either (?:of )?the GNU General Public License Version 2 or later \(the "GPL"\), '
-        r'or the (GNU Lesser) General Public License Version (2\.1) or later \(the '
-        r'"LGPL"\), in which case the provisions of the GPL or the LGPL are '
-        r'applicable instead of those above\. If you wish to allow use of your '
-        r'version of this file only under the terms of either the GPL or the LGPL, '
-        r'and not to allow others to use your version of this file under the terms '
-        r'of the MPL, indicate your decision by deleting the provisions above and '
-        r'replace them with the notice and other provisions required by the GPL or '
-        r'the LGPL\. If you do not delete the provisions above, a recipient may use '
-        r'your version of this file under the terms of any one of the MPL, the GPL or '
-        r'the LGPL\.'
+        r'Part of the LLVM Project, under the Apache License v2\.0 with LLVM Exceptions\. '
+        r'See (https://llvm\.org/LICENSE\.txt) for license information\.'
         .replaceAll(' ', _linebreak)
       ),
       multiLine: true,
-      caseSensitive: false,
-    )
-  ),
-
-  // LGPL/MPL/GPL
-  // engine
-  MultipleVersionedLicenseReferencePattern(
-    firstPrefixIndex: 1,
-    indentPrefixIndex: 2,
-    licenseIndices: const <int>[4],
-    versionIndices: const <int, int>{ 4:3 },
-    pattern: RegExp(
-      kIndent +
-      r'This library is free software; you can redistribute it and/or *\n'
-      r'^\1\2modify it under the terms of the GNU Lesser General Public *\n'
-      r'^\1\2License as published by the Free Software Foundation; either *\n'
-      r'^\1\2version (2\.1) of the License, or \(at your option\) any later version\. *\n'
-      r'^(?:(?:\1\2? *)? *\n)*'
-      r'^\1\2This library is distributed in the hope that it will be useful, *\n'
-      r'^\1\2but WITHOUT ANY WARRANTY; without even the implied warranty of *\n'
-      r'^\1\2MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE\. +See the GNU *\n'
-      r'^\1\2Lesser General Public License for more details\. *\n'
-      r'^(?:(?:\1\2? *)? *\n)*'
-      r'^\1\2You should have received a copy of the (GNU Lesser) General Public *\n'
-      r'^\1\2License along with this library; if not, write to the Free Software *\n'
-      r'^\1\2Foundation, Inc\., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 +USA *\n'
-      r'^(?:(?:\1\2? *)? *\n)*'
-      r'^\1\2Alternatively, the contents of this file may be used under the terms *\n'
-      r'^\1\2of either the Mozilla Public License Version 1\.1, found at *\n'
-      r'^\1\2http://www\.mozilla\.org/MPL/ \(the "MPL"\) or the GNU General Public *\n'
-      r'^\1\2License Version 2\.0, found at http://www\.fsf\.org/copyleft/gpl\.html *\n'
-      r'^\1\2\(the "GPL"\), in which case the provisions of the MPL or the GPL are *\n'
-      r'^\1\2applicable instead of those above\. +If you wish to allow use of your *\n'
-      r'^\1\2version of this file only under the terms of one of those two *\n'
-      r'^\1\2licenses \(the MPL or the GPL\) and not to allow others to use your *\n'
-      r'^\1\2version of this file under the LGPL, indicate your decision by *\n'
-      r'^\1\2deletingthe provisions above and replace them with the notice and *\n'
-      r'^\1\2other provisions required by the MPL or the GPL, as the case may be\. *\n'
-      r'^\1\2If you do not delete the provisions above, a recipient may use your *\n'
-      r'^\1\2version of this file under any of the LGPL, the MPL or the GPL\.',
-      multiLine: true,
-      caseSensitive: false,
-    )
-  ),
-
-  // ICU (Unicode)
-  MultipleVersionedLicenseReferencePattern(
-    firstPrefixIndex: 1,
-    indentPrefixIndex: 2,
-    licenseIndices: const <int>[4],
-    checkLocalFirst: false,
-    pattern: RegExp(
-      kIndent +
-      r'(?:©|Copyright (©|\(C\))) 20.. and later: Unicode, Inc. and others.[ *]*\n'
-      r'^\1\2License & terms of use: (https?://www.unicode.org/copyright.html)',
-      multiLine: true,
-      caseSensitive: false,
-    )
-  ),
-
-  // ICU (Unicode)
-  MultipleVersionedLicenseReferencePattern(
-    firstPrefixIndex: 1,
-    indentPrefixIndex: 2,
-    licenseIndices: const <int>[3],
-    checkLocalFirst: false,
-    pattern: RegExp(
-      kIndent +
-      r'(?:Copyright ©) 20..-20.. Unicode, Inc. and others. All rights reserved. '
-      r'Distributed under the Terms of Use in (http://www.unicode.org/copyright.html)',
-      multiLine: true,
-      caseSensitive: false,
-    )
-  ),
-
-  // ICU (Unicode)
-  MultipleVersionedLicenseReferencePattern(
-    firstPrefixIndex: 1,
-    indentPrefixIndex: 2,
-    licenseIndices: const <int>[3],
-    checkLocalFirst: false,
-    pattern: RegExp(
-      kIndent +
-      r'Copyright \(C\) 2016 and later: Unicode, Inc. and others. License & terms of use: (http://www.unicode.org/copyright.html) *\n',
-      multiLine: true,
-      caseSensitive: false,
     )
   ),
 
-  // ICU (Unicode)
-  MultipleVersionedLicenseReferencePattern(
-    firstPrefixIndex: 1,
-    indentPrefixIndex: 2,
-    licenseIndices: const <int>[3],
+  // Seen in RFC-derived files in ICU
+  LicenseReferencePattern(
     checkLocalFirst: false,
     pattern: RegExp(
       kIndent +
-      r'© 2016 and later: Unicode, Inc. and others. *\n'
-      r'^ *License & terms of use: (http://www.unicode.org/copyright.html)#License *\n'
-      r'^ *\n'
-      r'^ *Copyright \(c\) 2000 IBM, Inc. and Others. *\n',
+      r'This file was generated from RFC 3454 \((http://www.ietf.org/rfc/rfc3454.txt)\) '
+      r'Copyright \(C\) The Internet Society \(2002\)\. All Rights Reserved\.'
+      .replaceAll(' ', _linebreak),
       multiLine: true,
-      caseSensitive: false,
-    )
-  ),
-
-  // Unicode terms of use
-  MultipleVersionedLicenseReferencePattern(
-    firstPrefixIndex: 1,
-    indentPrefixIndex: 2,
-    licenseIndices: const <int>[3],
-    checkLocalFirst: false,
-    pattern: RegExp(
-      kIndent +
-      r'\n// For terms of use, see (https://www.unicode.org/copyright.html)\n',
-      caseSensitive: false,
-    )
+    ),
   ),
 ];
 
 
 // INLINE LICENSES
 
-final List<RegExp> csLicenses = <RegExp>[
+final List<RegExp> csTemplateLicenses = <RegExp>[
 
   // used with _tryInline, with needsCopyright: true (will only match if preceded by a copyright notice)
   // should have two groups, prefixes 1 and 2
@@ -1293,7 +802,7 @@ final List<RegExp> csLicenses = <RegExp>[
     r'^\1\2ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED *\n'
     r'^\1\2OF THE POSSIBILITY OF SUCH DAMAGE\.',
     multiLine: true,
-    caseSensitive: false
+    caseSensitive: false,
   ),
 
   RegExp(
@@ -1351,29 +860,6 @@ final List<RegExp> csLicenses = <RegExp>[
     r'^\1\2copied and put under another distribution licence *\n'
     r'^\1\2\[including the GNU Public Licence\.\]',
     multiLine: true,
-    caseSensitive: false
-  ),
-
-  RegExp(
-    kIndent +
-    (
-      r'License to copy and use this software is granted provided that it '
-      r'is identified as the "RSA Data Security, Inc\. MD5 Message-Digest '
-      r'Algorithm" in all material mentioning or referencing this software '
-      r'or this function\. '
-      r'License is also granted to make and use derivative works provided '
-      r'that such works are identified as "derived from the RSA Data '
-      r'Security, Inc\. MD5 Message-Digest Algorithm" in all material '
-      r'mentioning or referencing the derived work\. '
-      r'RSA Data Security, Inc\. makes no representations concerning either '
-      r'the merchantability of this software or the suitability of this '
-      r'software for any particular purpose\. It is provided "as is" '
-      r'without express or implied warranty of any kind\. '
-      r'These notices must be retained in any copies of any part of this '
-      r'documentation and/or software\.'
-      .replaceAll(' ', _linebreak)
-    ),
-    multiLine: true,
     caseSensitive: false,
   ),
 
@@ -1383,7 +869,7 @@ final List<RegExp> csLicenses = <RegExp>[
     kIndent +
 
     // Some files in ANGLE prefix the license with a description of the license.
-    r'(?:BSD 2-Clause License \(http://www.opensource.org/licenses/bsd-license.php\))?' +
+    r'(?:BSD 2-Clause License \(https?://www.opensource.org/licenses/bsd-license.php\))?' +
     _linebreak +
 
     (
@@ -1400,7 +886,7 @@ final List<RegExp> csLicenses = <RegExp>[
     _linebreak +
 
     // truly blank lines
-    r'|[\r\n]+' +
+    r'|\n+' +
 
     // ad clause - ucb
     r'|(?:[-*1-9.)/ ]*)' +
@@ -1516,59 +1002,6 @@ final List<RegExp> csLicenses = <RegExp>[
   ),
 
 
-  // THREE-CLAUSE LICENSES
-  // licenses in this section are sorted first by the length of the last line, in words,
-  // and then by the length of the bulletted clauses, in total lines.
-
-  // Seen in libjpeg-turbo
-  // TODO(ianh): Mark License as not needing to be shown
-  RegExp(
-    kIndent +
-    r"This software is provided 'as-is', without any express or implied *\n"
-    r'^\1\2warranty\. +In no event will the authors be held liable for any damages *\n'
-    r'^\1\2arising from the use of this software\. *\n'
-    r'^(?:(?:\1\2? *)? *\n)*'
-    r'^\1\2Permission is granted to anyone to use this software for any purpose, *\n'
-    r'^\1\2including commercial applications, and to alter it and redistribute it *\n'
-    r'^\1\2freely, subject to the following restrictions: *\n'
-    r'^(?:(?:\1\2? *)? *\n)*'
-    r'^\1\2(?:[-*1-9.)/ ]+)The origin of this software must not be misrepresented; you must not *\n'
-    r'^\1\2 *claim that you wrote the original software\. +If you use this software *\n'
-    r'^\1\2 *in a product, an acknowledgment in the product documentation would be *\n'
-    r'^\1\2 *appreciated but is not required\. *\n'
-    r'^\1\2(?:[-*1-9.)/ ]+)Altered source versions must be plainly marked as such, and must not be *\n'
-    r'^\1\2 *misrepresented as being the original software\. *\n'
-    r'^\1\2(?:[-*1-9.)/ ]+)This notice may not be removed or altered from any source distribution\.',
-    multiLine: true,
-    caseSensitive: false
-  ),
-
-  // seen in GLFW
-  RegExp(
-    kIndent +
-    r"This software is provided 'as-is', without any express or implied *\n"
-    r'^\1\2warranty\. +In no event will the authors be held liable for any damages *\n'
-    r'^\1\2arising from the use of this software\. *\n'
-    r'^(?:(?:\1\2? *)? *\n)*'
-    r'^\1\2Permission is granted to anyone to use this software for any purpose, *\n'
-    r'^\1\2including commercial applications, and to alter it and redistribute it *\n'
-    r'^\1\2freely, subject to the following restrictions: *\n'
-    r'^(?:(?:\1\2? *)? *\n)*'
-    r'^\1\2(?:[-*1-9.)/ ]+)The origin of this software must not be misrepresented; you must not *\n'
-    r'^\1\2 *claim that you wrote the original software\. +If you use this software *\n'
-    r'^\1\2 *in a product, an acknowledgment in the product documentation would *\n'
-    r'^\1\2 *be appreciated but is not required\. *\n'
-    r'^(?:(?:\1\2? *)? *\n)*'
-    r'^\1\2(?:[-*1-9.)/ ]+)Altered source versions must be plainly marked as such, and must not *\n'
-    r'^\1\2 *be misrepresented as being the original software\. *\n'
-    r'^(?:(?:\1\2? *)? *\n)*'
-    r'^\1\2(?:[-*1-9.)/ ]+)This notice may not be removed or altered from any source *\n'
-    r'^\1\2 *distribution\.',
-    multiLine: true,
-    caseSensitive: false
-  ),
-
-
   // MIT-DERIVED LICENSES
 
   // Seen in Mesa, among others.
@@ -1576,8 +1009,8 @@ final List<RegExp> csLicenses = <RegExp>[
     kIndent +
     (
       r'(?:' // this bit is optional
-      r'Licensed under the MIT license:\r?\n' // seen in expat
-      r'\1\2? *\r?\n' // blank line
+      r'Licensed under the MIT license:\n' // seen in expat
+      r'\1\2? *\n' // blank line
       r'\1\2' // this is the prefix for the next block (handled by kIndent if this optional bit is skipped)
       r')?' // end of optional bit
     )
@@ -1595,7 +1028,7 @@ final List<RegExp> csLicenses = <RegExp>[
     r'(?:'
     +
     (
-      r'(?:(?:\1\2?(?: *| -*))? *\r?\n)*' // A version with "// -------" between sections was seen in ffx_spd, hence the -*.
+      r'(?:(?:\1\2?(?: *| -*))? *\n)*' // A version with "// -------" between sections was seen in ffx_spd, hence the -*.
 
       +
 
@@ -1626,12 +1059,19 @@ final List<RegExp> csLicenses = <RegExp>[
 
       r'|'
 
+      r'\1\2 '
+      r'MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS '
+      r'STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND '
+      r'HEADER INFORMATION ARE LOCATED AT https://www\.khronos\.org/registry/'
+
+      r'|'
+
       r'\1\2 '
       r'THE (?:SOFTWARE|MATERIALS) (?:IS|ARE) PROVIDED "AS -? IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS '
       r'OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, '
       r'FITNESS FOR A PARTICULAR PURPOSE AND NON-?INFRINGEMENT\. IN NO EVENT SHALL '
       r'.+(?: .+)? BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER '
-      r'IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN '
+      r'IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,(?: )?OUT OF OR IN '
       r'CONNECTION WITH THE (?:SOFTWARE|MATERIALS) OR THE USE OR OTHER DEALINGS IN THE (?:SOFTWARE|MATERIALS)\.'
 
       r'|'
@@ -1661,7 +1101,45 @@ final List<RegExp> csLicenses = <RegExp>[
     +
     r')*',
     multiLine: true,
-    caseSensitive: false
+    caseSensitive: false,
+  ),
+
+  RegExp(
+    kIndent + r'Boost Software License - Version 1\.0 - August 17th, 2003\n' +
+    r'\n' +
+    (
+      r'\1\2Permission is hereby granted, free of charge, to any person or '
+      r'organization obtaining a copy of the software and accompanying '
+      r'documentation covered by this license \(the "Software"\) to use, '
+      r'reproduce, display, distribute, execute, and transmit the Software, and '
+      r'to prepare derivative works of the Software, and to permit third-parties '
+      r'to whom the Software is furnished to do so, all subject to the following:\n'
+      .replaceAll(' ', _linebreak)
+    ) +
+    r'\n' +
+    (
+      r'\1\2The copyright notices in the Software and this entire statement, '
+      r'including the above license grant, this restriction and the following '
+      r'disclaimer, must be included in all copies of the Software, in whole or '
+      r'in part, and all derivative works of the Software, unless such copies or '
+      r'derivative works are solely in the form of machine-executable object '
+      r'code generated by a source language processor\.\n'
+      .replaceAll(' ', _linebreak)
+    ) +
+    r'\n' +
+    (
+      r'\1\2THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, '
+      r'EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF '
+      r'MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND '
+      r'NON-INFRINGEMENT\. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR ANYONE '
+      r'DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY DAMAGES OR OTHER LIABILITY, '
+      r'WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN '
+      r'CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE '
+      r'SOFTWARE\.'
+      .replaceAll(' ', _linebreak)
+    ),
+    multiLine: true,
+    caseSensitive: false,
   ),
 
   // BISON LICENSE
@@ -1695,32 +1173,55 @@ final List<RegExp> csLicenses = <RegExp>[
     r'^(?:\1\2)?This special exception was added by the Free Software Foundation in\n'
     r'^(?:\1\2)?version 2.2 of Bison.  \*/\n',
     multiLine: true,
-    caseSensitive: false
+    caseSensitive: false,
   ),
 
-  // OTHER BRIEF LICENSES
-
+  // NVIDIA license found in glslang
   RegExp(
-    kIndent +
-    r'Permission to use, copy, modify, and distribute this software for any *\n'
-    r'^(?:\1\2)?purpose with or without fee is hereby granted, provided that the above *\n'
-    r'^(?:\1\2)?copyright notice and this permission notice appear in all copies(?:, and that *\n'
-    r'^(?:\1\2)?the name of .+ not be used in advertising or *\n'
-    r'^(?:\1\2)?publicity pertaining to distribution of the document or software without *\n'
-    r'^(?:\1\2)?specific, written prior permission)?\. *\n'
-    r'^(?:(?:\1\2? *)? *\n)*'
-    r'^(?:\1\2)?THE SOFTWARE IS PROVIDED "AS IS" AND .+ DISCLAIMS ALL(?: WARRANTIES)? *\n'
-    r'^(?:\1\2)?(?:WARRANTIES )?WITH REGARD TO THIS SOFTWARE,? INCLUDING ALL IMPLIED WARRANTIES(?: OF)? *\n'
-    r'^(?:\1\2)?(?:OF )?MERCHANTABILITY AND FITNESS\. +IN NO EVENT SHALL .+(?: BE LIABLE FOR)? *\n'
-    r'^(?:\1\2)?(?:.+ BE LIABLE FOR )?ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL(?: DAMAGES OR ANY DAMAGES)? *\n'
-    r'^(?:\1\2)?(?:DAMAGES OR ANY DAMAGES )?WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR(?: PROFITS, WHETHER IN AN)? *\n'
-    r'^(?:\1\2)?(?:PROFITS, WHETHER IN AN )?ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS(?: ACTION, ARISING OUT OF)? *\n'
-    r'^(?:\1\2)?(?:ACTION, ARISING OUT OF )?OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS(?: SOFTWARE)?(?: *\n'
-    r'^(?:\1\2)?SOFTWARE)?\.',
+    kIndent + r'NVIDIA Corporation\("NVIDIA"\) supplies this software to you in\n'
+    r'\1\2consideration of your agreement to the following terms, and your use,\n'
+    r'\1\2installation, modification or redistribution of this NVIDIA software\n'
+    r'\1\2constitutes acceptance of these terms\.  If you do not agree with these\n'
+    r'\1\2terms, please do not use, install, modify or redistribute this NVIDIA\n'
+    r'\1\2software\.\n'
+    r'\1(?:\2)?\n'
+    r'\1\2In consideration of your agreement to abide by the following terms, and\n'
+    r'\1\2subject to these terms, NVIDIA grants you a personal, non-exclusive\n'
+    r"\1\2license, under NVIDIA's copyrights in this original NVIDIA software \(the\n"
+    r'\1\2"NVIDIA Software"\), to use, reproduce, modify and redistribute the\n'
+    r'\1\2NVIDIA Software, with or without modifications, in source and/or binary\n'
+    r'\1\2forms; provided that if you redistribute the NVIDIA Software, you must\n'
+    r'\1\2retain the copyright notice of NVIDIA, this notice and the following\n'
+    r'\1\2text and disclaimers in all such redistributions of the NVIDIA Software\.\n'
+    r'\1\2Neither the name, trademarks, service marks nor logos of NVIDIA\n'
+    r'\1\2Corporation may be used to endorse or promote products derived from the\n'
+    r'\1\2NVIDIA Software without specific prior written permission from NVIDIA\.\n'
+    r'\1\2Except as expressly stated in this notice, no other rights or licenses\n'
+    r'\1\2express or implied, are granted by NVIDIA herein, including but not\n'
+    r'\1\2limited to any patent rights that may be infringed by your derivative\n'
+    r'\1\2works or by other works in which the NVIDIA Software may be\n'
+    r'\1\2incorporated\. No hardware is licensed hereunder\.\n'
+    r'\1(?:\2)?\n'
+    r'\1\2THE NVIDIA SOFTWARE IS BEING PROVIDED ON AN "AS IS" BASIS, WITHOUT\n'
+    r'\1\2WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED,\n'
+    r'\1\2INCLUDING WITHOUT LIMITATION, WARRANTIES OR CONDITIONS OF TITLE,\n'
+    r'\1\2NON-INFRINGEMENT, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR\n'
+    r'\1\2ITS USE AND OPERATION EITHER ALONE OR IN COMBINATION WITH OTHER\n'
+    r'\1\2PRODUCTS\.\n'
+    r'\1(?:\2)?\n'
+    r'\1\2IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT,\n'
+    r'\1\2INCIDENTAL, EXEMPLARY, CONSEQUENTIAL DAMAGES \(INCLUDING, BUT NOT LIMITED\n'
+    r'\1\2TO, LOST PROFITS; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF\n'
+    r'\1\2USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION\) OR ARISING IN ANY WAY\n'
+    r'\1\2OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE\n'
+    r'\1\2NVIDIA SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT,\n'
+    r'\1\2TORT \(INCLUDING NEGLIGENCE\), STRICT LIABILITY OR OTHERWISE, EVEN IF\n'
+    r'\1\2NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE\.\n',
     multiLine: true,
-    caseSensitive: false
   ),
 
+  // OTHER BRIEF LICENSES
+
   // Seen in the NDK
   RegExp(
     kIndent +
@@ -1736,39 +1237,6 @@ final List<RegExp> csLicenses = <RegExp>[
     r'^\1\2(?:(?:ACTION )?OF CONTRACT, NEGLIGENCE )?OR OTHER TORTIOUS ACTION, ARISING OUT OF(?: OR IN(?: CONNECTION WITH THE USE OR)?)? *\n'
     r'^\1\2(?:(?:OR IN )?CONNECTION WITH THE USE OR )?PERFORMANCE OF THIS SOFTWARE\.',
     multiLine: true,
-    caseSensitive: false
-  ),
-
-  // seen in GLFW
-  RegExp(
-    kIndent +
-    r'Permission to use, copy, modify, and distribute this software for any *\n'
-    r'^\1\2purpose with or without fee is hereby granted, provided that the above *\n'
-    r'^\1\2copyright notice and this permission notice appear in all copies\. *\n'
-    r'^(?:(?:\1\2? *)? *\n)*'
-    r"^\1\2THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED *\n"
-    r'^\1\2WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF *\n'
-    r'^\1\2MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE\. +THE AUTHORS AND *\n'
-    r'^\1\2CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER\.',
-    multiLine: true,
-    caseSensitive: false
-  ),
-
-  // seen in GLFW, base
-  RegExp(
-    kIndent +
-    r'Permission to use, copy, modify, and distribute this software for any *\n'
-    r'^\1\2purpose without fee is hereby granted, provided that this entire notice *\n'
-    r'^\1\2is included in all copies of any software which is or includes a copy *\n'
-    r'^\1\2or modification of this software and in all copies of the supporting *\n'
-    r'^\1\2documentation for such software\. *\n'
-    r'^(?:(?:\1\2? *)? *\n)*'
-    r'^\1\2THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED *\n'
-    r'^\1\2WARRANTY\. +IN PARTICULAR, NEITHER THE AUTHOR NOR .+ MAKES ANY *\n'
-    r'^\1\2REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY *\n'
-    r'^\1\2OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE\.',
-    multiLine: true,
-    caseSensitive: false
   ),
 
   // harfbuzz
@@ -1792,339 +1260,362 @@ final List<RegExp> csLicenses = <RegExp>[
     r'^\1\2ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO *\n'
     r'^\1\2PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS\. *\n',
     multiLine: true,
-    caseSensitive: false
   ),
 
-  // NDK
+  // freetype2.
   RegExp(
     kIndent +
-    r'Permission to use, copy, modify and distribute this software and *\n'
-    r'^\1\2its documentation is hereby granted, provided that both the copyright *\n'
-    r'^\1\2notice and this permission notice appear in all copies of the *\n'
-    r'^\1\2software, derivative works or modified versions, and any portions *\n'
-    r'^\1\2thereof, and that both notices appear in supporting documentation. *\n'
-    r'^(?:(?:\1\2? *)? *\n)*'
-    r'^\1\2CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" *\n'
-    r'^\1\2CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND *\n'
-    r'^\1\2FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. *\n'
-    r'^(?:(?:\1\2? *)? *\n)*'
-    r'^\1\2Carnegie Mellon requests users of this software to return to *\n'
-    r'^(?:(?:\1\2? *)? *\n)*'
-    r'^\1\2 Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU *\n'
-    r'^\1\2 School of Computer Science *\n'
-    r'^\1\2 Carnegie Mellon University *\n'
-    r'^\1\2 Pittsburgh PA 15213-3890 *\n'
-    r'^(?:(?:\1\2? *)? *\n)*'
-    r'^\1\2any improvements or extensions that they make and grant Carnegie the *\n'
-    r'^\1\2rights to redistribute these changes. *\n',
+    (
+      r'Permission to use, copy, modify, distribute, and sell this software and its '
+      r'documentation for any purpose is hereby granted without fee, provided that '
+      r'the above copyright notice appear in all copies and that both that '
+      r'copyright notice and this permission notice appear in supporting '
+      r'documentation\. '
+      r'The above copyright notice and this permission notice shall be included in '
+      r'all copies or substantial portions of the Software\. '
+      r'THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR '
+      r'IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, '
+      r'FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT\.  IN NO EVENT SHALL THE '
+      r'OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN '
+      r'AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN '
+      r'CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE\. '
+      r'Except as contained in this notice, the name of The Open Group shall not be '
+      r'used in advertising or otherwise to promote the sale, use or other dealings '
+      r'in this Software without prior written authorization from The Open Group\. '
+      .replaceAll(' ', _linebreak)
+    ),
     multiLine: true,
-    caseSensitive: false
   ),
 
-  // seen in Android NDK gnu-libstdc++
+  // libjpeg-turbo
   RegExp(
     kIndent +
     (
-      r'Permission to use, copy, modify, (?:distribute and sell|sell, and distribute) this software '
-      r'(?:and its documentation for any purpose )?is hereby granted without fee, '
-      r'provided that the above copyright notice appears? in all copies,? and '
-      r'that both that copyright notice and this permission notice appear '
-      r'in supporting documentation\. '
-      r'(?:.+'
-        r'|Hewlett-Packard Company'
-        r'|Silicon Graphics'
-        r'|None of the above authors, nor IBM Haifa Research Laboratories,'
-      r') makes? (?:no|any) '
-      r'representations? about the suitability of this software for any '
-      r'(?:purpose\. It is provi)?ded "as is" without express or implied warranty\.'
+      r'Permission to use, copy, modify, and distribute this software and its '
+      r'documentation for any purpose and without fee is hereby granted, provided '
+      r'that the above copyright notice appear in all copies and that both that '
+      r'copyright notice and this permission notice appear in supporting '
+      r'documentation\. This software is provided "as is" without express or '
+      r'implied warranty\.'
       .replaceAll(' ', _linebreak)
     ),
     multiLine: true,
-    caseSensitive: false
+  ),
+];
+
+
+// LICENSES WE JUST DISPLAY VERBATIM
+
+final List<RegExp> csNoticeLicenses = <RegExp>[
+
+  // used with _tryInline, with needsCopyright: false
+  // should have two groups, prefixes 1 and 2
+
+  RegExp(
+    kIndent +
+    r'COPYRIGHT NOTICE, DISCLAIMER, and LICENSE\n'
+    r'(?:\1.*\n)+?'
+    r'(?=\1\2END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE\.)',
+    multiLine: true,
   ),
 
-  // Seen in Android NDK
+  // ideally this would be template-expanded against the referenced license, but
+  // there's two licenses in the file in question and it's not exactly obvious
+  // how to programmatically select the right one... for now just including the
+  // text verbatim should be enough.
   RegExp(
     kIndent +
-    r'Developed at (?:SunPro|SunSoft), a Sun Microsystems, Inc. business. *\n'
-    r'^\1\2Permission to use, copy, modify, and distribute this *\n'
-    r'^\1\2software is freely granted, provided that this notice *\n'
-    r'^\1\2is preserved.',
+    r'Portions of the attached software \("Contribution"\) are developed by '
+    r'SUN MICROSYSTEMS, INC\., and are contributed to the OpenSSL project\. '
+    r'\n '
+    r'The Contribution is licensed pursuant to the Eric Young open source '
+    r'license provided above\.'
+    .replaceAll(' ', _linebreak),
     multiLine: true,
-    caseSensitive: false
   ),
 
-  // Seen in Android NDK (stlport)
+  // ideally this would be template-expanded against the referenced license, but
+  // there's two licenses in the file in question and it's not exactly obvious
+  // how to programmatically select the right one... for now just including the
+  // text verbatim should be enough.
   RegExp(
     kIndent +
-    r'This material is provided "as is", with absolutely no warranty expressed *\n'
-    r'^\1\2or implied\. +Any use is at your own risk\. *\n'
-    r'^(?:(?:\1\2? *)? *\n)*'
-    r'^\1\2Permission to use or copy this software for any purpose is hereby granted *\n'
-    r'^\1\2without fee, provided the above notices are retained on all copies\. *\n'
-    r'^\1\2Permission to modify the code and to distribute modified code is granted, *\n'
-    r'^\1\2provided the above notices are retained, and a notice that the code was *\n'
-    r'^\1\2modified is included with the above copyright notice\.',
+    r'Portions of the attached software \("Contribution"\) are developed by '
+    r'SUN MICROSYSTEMS, INC\., and are contributed to the OpenSSL project\. '
+    r'\n '
+    r'The Contribution is licensed pursuant to the OpenSSL open source '
+    r'license provided above\.'
+    .replaceAll(' ', _linebreak),
     multiLine: true,
-    caseSensitive: false
   ),
 
-  // freetype2.
+  // Freetype
   RegExp(
     kIndent +
     (
-      r'Permission to use, copy, modify, distribute, and sell this software and its '
-      r'documentation for any purpose is hereby granted without fee, provided that '
-      r'the above copyright notice appear in all copies and that both that '
-      r'copyright notice and this permission notice appear in supporting '
-      r'documentation\. '
-      r'The above copyright notice and this permission notice shall be included in '
-      r'all copies or substantial portions of the Software\. '
-      r'THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR '
-      r'IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, '
-      r'FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT\.  IN NO EVENT SHALL THE '
-      r'OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN '
-      r'AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN '
-      r'CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE\. '
-      r'Except as contained in this notice, the name of The Open Group shall not be '
-      r'used in advertising or otherwise to promote the sale, use or other dealings '
-      r'in this Software without prior written authorization from The Open Group\. '
+      r'This software was written by Alexander Peslyak in 2001\. No copyright is '
+      r'claimed, and the software is hereby placed in the public domain\. In case '
+      r'this attempt to disclaim copyright and place the software in the public '
+      r'domain is deemed null and void, then the software is Copyright \(c\) 2001 '
+      r'Alexander Peslyak and it is hereby released to the general public under the '
+      r'following terms: Redistribution and use in source and binary forms, with or '
+      r"without modification, are permitted\. There\'s ABSOLUTELY NO WARRANTY, "
+      r'express or implied\.(?: \(This is a heavily cut-down "BSD license"\.\))?'
       .replaceAll(' ', _linebreak)
     ),
     multiLine: true,
-    caseSensitive: false
   ),
 
-  // TODO(ianh): File a bug on what happens if you replace the // with a #
-  // ICU
+  // Ahem font non-copyright
+  RegExp(
+    r'(//)( )License for the Ahem font embedded below is from:\n'
+    r'\1\2https://www\.w3\.org/Style/CSS/Test/Fonts/Ahem/COPYING\n'
+    r'\1\n'
+    r'\1\2The Ahem font in this directory belongs to the public domain\. In\n'
+    r'\1\2jurisdictions that do not recognize public domain ownership of these\n'
+    r'\1\2files, the following Creative Commons Zero declaration applies:\n'
+    r'\1\n'
+    r'\1\2<http://labs\.creativecommons\.org/licenses/zero-waive/1\.0/us/legalcode>\n'
+    r'\1\n'
+    r'\1\2which is quoted below:\n'
+    r'\1\n'
+    r'\1\2  The person who has associated a work with this document \(the "Work"\)\n'
+    r'\1\2  affirms that he or she \(the "Affirmer"\) is the/an author or owner of\n'
+    r'\1\2  the Work\. The Work may be any work of authorship, including a\n'
+    r'\1\2  database\.\n'
+    r'\1\n'
+    r'\1\2  The Affirmer hereby fully, permanently and irrevocably waives and\n'
+    r'\1\2  relinquishes all of her or his copyright and related or neighboring\n'
+    r'\1\2  legal rights in the Work available under any federal or state law,\n'
+    r'\1\2  treaty or contract, including but not limited to moral rights,\n'
+    r'\1\2  publicity and privacy rights, rights protecting against unfair\n'
+    r'\1\2  competition and any rights protecting the extraction, dissemination\n'
+    r'\1\2  and reuse of data, whether such rights are present or future, vested\n'
+    r'\1\2  or contingent \(the "Waiver"\)\. The Affirmer makes the Waiver for the\n'
+    r"\1\2  benefit of the public at large and to the detriment of the Affirmer's\n"
+    r'\1\2  heirs or successors\.\n'
+    r'\1\n'
+    r'\1\2  The Affirmer understands and intends that the Waiver has the effect\n'
+    r"\1\2  of eliminating and entirely removing from the Affirmer's control all\n"
+    r'\1\2  the copyright and related or neighboring legal rights previously held\n'
+    r'\1\2  by the Affirmer in the Work, to that extent making the Work freely\n'
+    r'\1\2  available to the public for any and all uses and purposes without\n'
+    r'\1\2  restriction of any kind, including commercial use and uses in media\n'
+    r'\1\2  and formats or by methods that have not yet been invented or\n'
+    r'\1\2  conceived\. Should the Waiver for any reason be judged legally\n'
+    r'\1\2  ineffective in any jurisdiction, the Affirmer hereby grants a free,\n'
+    r'\1\2  full, permanent, irrevocable, nonexclusive and worldwide license for\n'
+    r'\1\2  all her or his copyright and related or neighboring legal rights in\n'
+    r'\1\2  the Work\.',
+    multiLine: true,
+  ),
+
+  RegExp(
+    r'()()punycode\.c 0\.4\.0 \(2001-Nov-17-Sat\)\n'
+    r'\1\2http://www\.cs\.berkeley\.edu/~amc/idn/\n'
+    r'\1\2Adam M\. Costello\n'
+    r'\1\2http://www\.nicemice\.net/amc/\n'
+    r'\1\2\n'
+    r'\1\2Disclaimer and license\n'
+    r'\1\2\n'
+    r'\1\2    Regarding this entire document or any portion of it \(including\n'
+    r'\1\2    the pseudocode and C code\), the author makes no guarantees and\n'
+    r'\1\2    is not responsible for any damage resulting from its use\.  The\n'
+    r'\1\2    author grants irrevocable permission to anyone to use, modify,\n'
+    r'\1\2    and distribute it in any way that does not diminish the rights\n'
+    r'\1\2    of anyone else to use, modify, and distribute it, provided that\n'
+    r'\1\2    redistributed derivative works do not contain misleading author or\n'
+    r'\1\2    version information\.  Derivative works need not be licensed under\n'
+    r'\1\2    similar terms\.\n',
+    multiLine: true,
+  ),
+
   RegExp(
     kIndent +
     r'This file is provided as-is by Unicode, Inc\. \(The Unicode Consortium\)\. '
-    r'No claims are made as to fitness for any particular purpose\. No '
-    r'warranties of any kind are expressed or implied\. The recipient '
-    r'agrees to determine applicability of information provided\. If this '
+    r'No claims are made as to fitness for any particular purpose\.  No '
+    r'warranties of any kind are expressed or implied\.  The recipient '
+    r'agrees to determine applicability of information provided\.  If this '
     r'file has been provided on optical media by Unicode, Inc\., the sole '
     r'remedy for any claim will be exchange of defective media within 90 '
-    r'days of receipt\. '
-    r'Unicode, Inc\. hereby grants the right to freely use the information '
+    r'days of receipt\.\n'
+    r'\1\n'
+    r'\1\2Unicode, Inc\. hereby grants the right to freely use the information '
     r'supplied in this file in the creation of products supporting the '
     r'Unicode Standard, and to make copies of this file in any form for '
     r'internal or external distribution as long as this notice remains '
-    r'attached\.'
+    r'attached\. '
     .replaceAll(' ', _linebreak),
     multiLine: true,
-    caseSensitive: false
   ),
 
-  // OpenSSL
   RegExp(
     kIndent +
-    r'The portions of the attached software \("Contribution"\) is developed by *\n'
-    r'^\1\2Nokia Corporation and is licensed pursuant to the OpenSSL open source *\n'
-    r'^\1\2license\. *\n'
-    r'^(?:(?:\1\2? *)? *\n)*'
-    r'^\1\2The Contribution, originally written by Mika Kousa and Pasi Eronen of *\n'
-    r'^\1\2Nokia Corporation, consists of the "PSK" \(Pre-Shared Key\) ciphersuites *\n'
-    r'^\1\2support \(see RFC 4279\) to OpenSSL\. *\n'
-    r'^(?:(?:\1\2? *)? *\n)*'
-    r'^\1\2No patent licenses or other rights except those expressly stated in *\n'
-    r'^\1\2the OpenSSL open source license shall be deemed granted or received *\n'
-    r'^\1\2expressly, by implication, estoppel, or otherwise\. *\n'
-    r'^(?:(?:\1\2? *)? *\n)*'
-    r'^\1\2No assurances are provided by Nokia that the Contribution does not *\n'
-    r'^\1\2infringe the patent or other intellectual property rights of any third *\n'
-    r'^\1\2party or that the license provides you with all the necessary rights *\n'
-    r'^\1\2to make use of the Contribution\. *\n'
-    r'^(?:(?:\1\2? *)? *\n)*'
-    r'^\1\2THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND\. IN *\n'
-    r'^\1\2ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA *\n'
-    r'^\1\2SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY *\n'
-    r'^\1\2OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR *\n'
-    r'^\1\2OTHERWISE\.',
+    r'We are also required to state that "The Graphics Interchange Format\(c\) '
+    r'is the Copyright property of CompuServe Incorporated. GIF\(sm\) is a '
+    r'Service Mark property of CompuServe Incorporated."'
+    .replaceAll(' ', _linebreak),
     multiLine: true,
-    caseSensitive: false
   ),
 
-];
 
-final List<RegExp> csNotices = <RegExp>[
-
-  // used with _tryInline, with needsCopyright: false
-  // should have two groups, prefixes 1 and 2
+  // ZLIB-LIKE LICENSES
 
+  // Seen in libjpeg-turbo (with a copyright), zlib.h
   RegExp(
     kIndent +
-    r'The Graphics Interchange Format\(c\) is the copyright property of CompuServe *\n'
-    r'^\1\2Incorporated\. +Only CompuServe Incorporated is authorized to define, redefine, *\n'
-    r'^\1\2enhance, alter, modify or change in any way the definition of the format\. *\n'
-    r'^(?:(?:\1\2? *)? *\n)*'
-    r'^\1\2CompuServe Incorporated hereby grants a limited, non-exclusive, royalty-free *\n'
-    r'^\1\2license for the use of the Graphics Interchange Format\(sm\) in computer *\n'
-    r'^\1\2software; computer software utilizing GIF\(sm\) must acknowledge ownership of the *\n'
-    r'^\1\2Graphics Interchange Format and its Service Mark by CompuServe Incorporated, in *\n'
-    r'^\1\2User and Technical Documentation\. +Computer software utilizing GIF, which is *\n'
-    r'^\1\2distributed or may be distributed without User or Technical Documentation must *\n'
-    r'^\1\2display to the screen or printer a message acknowledging ownership of the *\n'
-    r'^\1\2Graphics Interchange Format and the Service Mark by CompuServe Incorporated; in *\n'
-    r'^\1\2this case, the acknowledgement may be displayed in an opening screen or leading *\n'
-    r'^\1\2banner, or a closing screen or trailing banner\. +A message such as the following *\n'
-    r'^\1\2may be used: *\n'
-    r'^(?:(?:\1\2? *)? *\n)*'
-    r'^\1\2 *"The Graphics Interchange Format\(c\) is the Copyright property of *\n'
-    r'^\1\2 *CompuServe Incorporated\. +GIF\(sm\) is a Service Mark property of *\n'
-    r'^\1\2 *CompuServe Incorporated\." *\n',
+    (
+      r" This software is provided 'as-is', without any express or implied "
+      r'warranty\. In no event will the authors be held liable for any damages '
+      r'arising from the use of this software\.'
+      .replaceAll(' ', _linebreak)
+    )
+    +
+    (
+      r' Permission is granted to anyone to use this software for any purpose, '
+      r'including commercial applications, and to alter it and redistribute it '
+      r'freely, subject to the following restrictions:'
+      .replaceAll(' ', _linebreak)
+    )
+    +
+    r'(?:' +
+    _linebreak +
+    r'(?:' +
+    r'|\n+' +
+    r'|(?:[-*1-9.)/ ]*)' +
+    (
+      r'The origin of this software must not be misrepresented; you must not '
+      r'claim that you wrote the original software\. If you use this software '
+      r'in a product, an acknowledgment in the product documentation would be '
+      r'appreciated but is not required\.'
+      .replaceAll(' ', _linebreak)
+    )
+    +
+    r'|(?:[-*1-9.)/ ]*)' +
+    (
+      r'Altered source versions must be plainly marked as such, and must not be '
+      r'misrepresented as being the original software\. '
+      .replaceAll(' ', _linebreak)
+    )
+    +
+    r'|(?:[-*1-9.)/ ]*)' +
+    (
+      r"If you meet \(any of\) the author\(s\), you're encouraged to buy them a beer, "
+      r'a drink or whatever is suited to the situation, given that you like the '
+      r'software\. '
+      .replaceAll(' ', _linebreak)
+    )
+    +
+    r'|(?:[-*1-9.)/ ]*)' +
+    (
+      r'This notice may not be removed or altered from any source distribution\.'
+      .replaceAll(' ', _linebreak)
+    )
+    +
+    r'))+',
     multiLine: true,
-    caseSensitive: false
+    caseSensitive: false,
   ),
+];
 
-  // NSPR
-  // (Showing the entire block instead of the LGPL for this file is based
-  // on advice specifically regarding the prtime.cc file.)
-  RegExp(
-    r'()()/\* Portions are Copyright \(C\) 2011 Google Inc \*/\n'
-    r'/\* \*\*\*\*\* BEGIN LICENSE BLOCK \*\*\*\*\*\n'
-    r' \* Version: MPL 1\.1/GPL 2\.0/LGPL 2\.1\n'
-    r' \*\n'
-    r' \* The contents of this file are subject to the Mozilla Public License Version\n'
-    r' \* 1\.1 \(the "License"\); you may not use this file except in compliance with\n'
-    r' \* the License\. +You may obtain a copy of the License at\n'
-    r' \* http://www\.mozilla\.org/MPL/\n'
-    r' \*\n'
-    r' \* Software distributed under the License is distributed on an "AS IS" basis,\n'
-    r' \* WITHOUT WARRANTY OF ANY KIND, either express or implied\. +See the License\n'
-    r' \* for the specific language governing rights and limitations under the\n'
-    r' \* License\.\n'
-    r' \*\n'
-    r' \* The Original Code is the Netscape Portable Runtime \(NSPR\)\.\n'
-    r' \*\n'
-    r' \* The Initial Developer of the Original Code is\n'
-    r' \* Netscape Communications Corporation\.\n'
-    r' \* Portions created by the Initial Developer are Copyright \(C\) 1998-2000\n'
-    r' \* the Initial Developer\. +All Rights Reserved\.\n'
-    r' \*\n'
-    r' \* Contributor\(s\):\n'
-    r' \*\n'
-    r' \* Alternatively, the contents of this file may be used under the terms of\n'
-    r' \* either the GNU General Public License Version 2 or later \(the "GPL"\), or\n'
-    r' \* the GNU Lesser General Public License Version 2\.1 or later \(the "LGPL"\),\n'
-    r' \* in which case the provisions of the GPL or the LGPL are applicable instead\n'
-    r' \* of those above\. +If you wish to allow use of your version of this file only\n'
-    r' \* under the terms of either the GPL or the LGPL, and not to allow others to\n'
-    r' \* use your version of this file under the terms of the MPL, indicate your\n'
-    r' \* decision by deleting the provisions above and replace them with the notice\n'
-    r' \* and other provisions required by the GPL or the LGPL\. +If you do not delete\n'
-    r' \* the provisions above, a recipient may use your version of this file under\n'
-    r' \* the terms of any one of the MPL, the GPL or the LGPL\.\n'
-    r' \*\n'
-    r' \* \*\*\*\*\* END LICENSE BLOCK \*\*\*\*\* \*/\n'
-  ),
-
-  // Advice for this was "text verbatim".
+final List<RegExp> csStrayCopyrights = <RegExp>[
+  // a file in BoringSSL
   RegExp(
     kIndent +
-    r'Copyright \(c\) 2015-2016 Khronos Group\. This work is licensed under a\n'
-    r'\1\2Creative Commons Attribution 4\.0 International License; see\n'
-    r'\1\2http://creativecommons\.org/licenses/by/4\.0/',
+    r'DTLS code by Eric Rescorla <ekr@rtfm\.com> '
+    r'\n '
+    r'Copyright \(C\) 2006, Network Resonance, Inc\. '
+    r'Copyright \(C\) 2011, RTFM, Inc\.'
+    .replaceAll(' ', _linebreak),
     multiLine: true,
-    caseSensitive: false,
   ),
 
-  // by analogy to the above one
-  // seen in jsr305
+  // thaidict.txt has a weird indenting thing going on
   RegExp(
-    kIndent +
-    r'Copyright .+\n'
-    r'\1\2Released under the Creative Commons Attribution License\n'
-    r'\1\2 *\(?http://creativecommons\.org/licenses/by/2\.5/?\)?\n'
-    r'\1\2Official home: .+',
+    r'^ *# *Copyright \(c\) [-0-9]+ International Business Machines Corporation,\n'
+    r' *# *Apple Inc\., and others\. All Rights Reserved\.',
     multiLine: true,
-    caseSensitive: false,
   ),
 
-  // Advice for this was "Just display its text as a politeness. Nothing else required".
+  // Found in a lot of ICU files
   RegExp(
-    r'()()/\* mdXhl\.c \* ----------------------------------------------------------------------------\n'
-    r' \* "THE BEER-WARE LICENSE" \(Revision 42\):\n'
-    r' \* <phk@FreeBSD\.org> wrote this file\. +As long as you retain this notice you\n'
-    r' \* can do whatever you want with this stuff\. If we meet some day, and you think\n'
-    r' \* this stuff is worth it, you can buy me a beer in return\. +Poul-Henning Kamp\n'
-    r' \* ----------------------------------------------------------------------------\n'
-    r' \* libjpeg-turbo Modifications:\n'
-    r' \* Copyright \(C\) 2016, D\. R\. Commander\.?\n'
-    r' \* Modifications are under the same license as the original code \(see above\)\n'
-    r' \* ----------------------------------------------------------------------------'
+    kIndent +
+    r'Copyright \([Cc]\) [-, 0-9{}]+ ' + '(?:Google, )?International Business Machines '
+    r'Corporation(?:(?:, Google,?)? and others)?\. All [Rr]ights [Rr]eserved\.'
+    .replaceAll(' ', _linebreak),
+    multiLine: true,
   ),
-];
 
+  // Found in ICU files
+  RegExp(
+    kIndent + r'Copyright \([Cc]\) [-0-9,]+ IBM(?: Corp(?:oration)?)?(?:, Inc\.)?(?: and [Oo]thers)?\.(?: All rights reserved\.)?',
+    multiLine: true,
+  ),
 
-// FALLBACK PATTERNS
-
-final List<RegExp> csFallbacks = <RegExp>[
+  // Found in ICU files
+  RegExp(
+    kIndent + r'Copyright \(C\) [0-9]+ and later: Unicode, Inc\. and others\.',
+    multiLine: true,
+  ),
 
-  // used with _tryNone
-  // groups are ignored
+  // Found in ICU files
+  RegExp(
+    kIndent + r'Copyright \(c\) [-0-9 ]+ Unicode, Inc\.  All Rights reserved\.',
+    multiLine: true,
+  ),
 
-];
+  // Found in ICU files
+  RegExp(
+    kIndent + r'Copyright \(C\) [-,0-9]+ ,? Yahoo! Inc\.',
+    multiLine: true,
+  ),
 
+  // Found in some ICU files
+  RegExp(
+    kIndent + r'Copyright [0-9]+ and onwards Google Inc.',
+    multiLine: true,
+  ),
 
-// FORWARD REFERENCE
+  // Found in some ICU files
+  RegExp(
+    kIndent + r'Copyright [0-9]+ Google Inc. All Rights Reserved.',
+    multiLine: true,
+  ),
 
-class ForwardReferencePattern {
-  ForwardReferencePattern({ this.firstPrefixIndex, this.indentPrefixIndex, this.pattern, this.targetPattern });
-  final int? firstPrefixIndex;
-  final int? indentPrefixIndex;
-  final RegExp? pattern;
-  final RegExp? targetPattern;
-}
+  // Found in some ICU files
+  RegExp(
+    kIndent + r'Copyright \(C\) [-0-9]+, Apple Inc\.(?:; Unicode, Inc\.;)? and others\. All Rights Reserved\.',
+    multiLine: true,
+  ),
 
-final List<ForwardReferencePattern> csForwardReferenceLicenses = <ForwardReferencePattern>[
+  // rapidjson
+  RegExp(
+    kIndent + r'The above software in this distribution may have been modified by THL A29 Limited '
+    r'\("Tencent Modifications"\)\. All Tencent Modifications are Copyright \(C\) 2015 THL A29 Limited\.'
+    .replaceAll(' ', _linebreak),
+    multiLine: true,
+  ),
 
-  // used with _tryForwardReferencePattern
+  // minizip
+  RegExp(
+    kIndent + r'Copyright \(C\) [-0-9]+ Gilles Vollant',
+    multiLine: true,
+  ),
 
-  // OpenSSL (in Dart third_party)
-  ForwardReferencePattern(
-    firstPrefixIndex: 1,
-    indentPrefixIndex: 2,
-    pattern: RegExp(
-      kIndent + r'(?:'
-      +
-      (
-        r'Portions of the attached software \("Contribution"\) are developed by .+ and are contributed to the OpenSSL project\.'
-        .replaceAll(' ', _linebreak)
-      )
-      +
-      r'|'
-      +
-      (
-        r'The .+ included herein is developed by .+, and is contributed to the OpenSSL project\.'
-        .replaceAll(' ', _linebreak)
-      )
-      +
-      r'|'
-      r'(?:\1? *\n)+'
-      r')*'
-      r'\1\2 *'
-      +
-      (
-        r'The .+ is licensed pursuant to the OpenSSL open source license provided (?:below|above)\.'
-        .replaceAll(' ', _linebreak)
-      ),
-      multiLine: true,
-      caseSensitive: false,
-    ),
-    targetPattern: RegExp('Redistribution and use in source and binary forms(?:.|\n)+OpenSSL')
+  // Skia
+  RegExp(
+    kIndent + r'Copyright [-0-9]+ Google LLC\.',
+    multiLine: true,
   ),
 
-  // libevent
-  ForwardReferencePattern(
-    firstPrefixIndex: 1,
-    indentPrefixIndex: 2,
-    pattern: RegExp(
-      kIndent + r'Use is subject to license terms\.$',
-      multiLine: true,
-      caseSensitive: false,
-    ),
-    targetPattern: RegExp('Redistribution and use in source and binary forms(?:.|\n)+SUN MICROSYSTEMS')
+  // flutter/third_party/inja/third_party/include/hayai/hayai_clock.hpp
+  // Advice was to just ignore these copyright notices given the LICENSE.md file
+  // in the same directory.
+  RegExp(
+    kIndent + r'Copyright \(C\) 2011 Nick Bruun <nick@bruun\.co>\n'
+          r'\1\2Copyright \(C\) 2013 Vlad Lazarenko <vlad@lazarenko\.me>\n'
+          r'\1\2Copyright \(C\) 2014 Nicolas Pauss <nicolas\.pauss@gmail\.com>',
+    multiLine: true,
   ),
 
 ];
diff --git a/tools/licenses/lib/regexp_debug.dart b/tools/licenses/lib/regexp_debug.dart
new file mode 100644
index 0000000000000000000000000000000000000000..4ef019faf01ed8a6788a1bbd4fc883b429c955db
--- /dev/null
+++ b/tools/licenses/lib/regexp_debug.dart
@@ -0,0 +1,150 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:core' as core show RegExp;
+import 'dart:core' hide RegExp;
+import 'dart:io';
+
+class RegExp implements core.RegExp {
+  RegExp(
+    String source, {
+    bool multiLine = false,
+    bool caseSensitive = true,
+    bool unicode = false,
+    bool dotAll = false,
+    this.expectNoMatch = false,
+  }) : _pattern = core.RegExp(source, multiLine: multiLine, caseSensitive: caseSensitive, unicode: unicode, dotAll: dotAll),
+       source = _stripFrameNumber(StackTrace.current.toString().split('\n').skip(1).take(1).single) {
+    _allPatterns.add(this);
+  }
+
+  static String _stripFrameNumber(String frame) {
+    return frame.substring(frame.indexOf(' ')).trim();
+  }
+
+  final core.RegExp _pattern;
+  final String source;
+
+  static final List<RegExp> _allPatterns = <RegExp>[];
+
+  final bool expectNoMatch;
+
+  int _matchCount = 0;
+  int get matchCount => _matchCount;
+
+  int _testCount = 0;
+  int get testCount => _testCount;
+
+  final Stopwatch _stopwatch = Stopwatch();
+
+  static void printDiagnostics() {
+    final List<RegExp> patterns = _allPatterns.toList();
+    stderr.writeln('Top ten patterns:');
+    patterns.sort((RegExp a, RegExp b) => b._stopwatch.elapsed.compareTo(a._stopwatch.elapsed));
+    for (final RegExp pattern in patterns.take(10)) {
+      stderr.writeln('${pattern._stopwatch.elapsedMicroseconds.toString().padLeft(10)}μs tests -- /${pattern.pattern}/ (${pattern.testCount} tests, ${pattern.matchCount} matches, ${pattern.source})');
+    }
+    stderr.writeln();
+    stderr.writeln('Unmatched patterns:');
+    patterns.sort((RegExp a, RegExp b) => a.pattern.compareTo(b.pattern));
+    for (final RegExp pattern in patterns) {
+      if (pattern.matchCount == 0 && !pattern.expectNoMatch && pattern.testCount > 0) {
+        stderr.writeln('/${pattern.pattern}/ (${pattern.testCount} tests, ${pattern.matchCount} matches, ${pattern.source})');
+      }
+    }
+    stderr.writeln();
+    stderr.writeln('Unexpectedly matched patterns:');
+    for (final RegExp pattern in patterns) {
+      if (pattern.matchCount > 0 && pattern.expectNoMatch) {
+        stderr.writeln('/${pattern.pattern}/ (${pattern.testCount} tests, ${pattern.matchCount} matches, ${pattern.source})');
+      }
+    }
+    stderr.writeln();
+    stderr.writeln('Unused patterns:');
+    for (final RegExp pattern in patterns) {
+      if (pattern.testCount == 0) {
+        stderr.writeln('/${pattern.pattern}/ (${pattern.testCount} tests, ${pattern.matchCount} matches, ${pattern.source})');
+      }
+    }
+  }
+
+  @override
+  bool get isCaseSensitive => _pattern.isCaseSensitive;
+
+  @override
+  bool get isDotAll => _pattern.isDotAll;
+
+  @override
+  bool get isMultiLine => _pattern.isMultiLine;
+
+  @override
+  bool get isUnicode => _pattern.isUnicode;
+
+  @override
+  String get pattern => _pattern.pattern;
+
+  @override
+  Iterable<RegExpMatch> allMatches(String input, [int start = 0]) {
+    _stopwatch.start();
+    final List<RegExpMatch> result = _pattern.allMatches(input, start).toList();
+    _stopwatch.stop();
+    _testCount += 1;
+    if (result.isNotEmpty) {
+      _matchCount += 1;
+    }
+    return result;
+  }
+
+  @override
+  RegExpMatch? firstMatch(String input) {
+    _stopwatch.start();
+    final RegExpMatch? result = _pattern.firstMatch(input);
+    _stopwatch.stop();
+    _testCount += 1;
+    if (result != null) {
+      _matchCount += 1;
+    }
+    return result;
+  }
+
+  @override
+  bool hasMatch(String input) {
+    _stopwatch.start();
+    final bool result = _pattern.hasMatch(input);
+    _stopwatch.stop();
+    _stopwatch.stop();
+    _testCount += 1;
+    if (result) {
+      _matchCount += 1;
+    }
+    return result;
+  }
+
+  @override
+  Match? matchAsPrefix(String string, [int start = 0]) {
+    _stopwatch.start();
+    final Match? result = _pattern.matchAsPrefix(string, start);
+    _stopwatch.stop();
+    _testCount += 1;
+    if (result != null) {
+      _matchCount += 1;
+    }
+    return result;
+  }
+
+  @override
+  String? stringMatch(String input) {
+    _stopwatch.start();
+    final String? result = _pattern.stringMatch(input);
+    _stopwatch.stop();
+    _testCount += 1;
+    if (result != null) {
+      _matchCount += 1;
+    }
+    return result;
+  }
+
+  @override
+  String toString() => _pattern.toString();
+}
diff --git a/tools/licenses/pubspec.yaml b/tools/licenses/pubspec.yaml
index 0a6be05dbe8765973673bd7a67899084dff8fea2..3ae7b745a974ac48d5a2ceef002bba459d528765 100644
--- a/tools/licenses/pubspec.yaml
+++ b/tools/licenses/pubspec.yaml
@@ -5,37 +5,49 @@
 name: licenses
 publish_to: none
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=3.2.0-0 <4.0.0'
 
-# Do not add any dependencies that require more than what is provided in
-# //third_party.pkg, //third_party/dart/pkg, or
-# //third_party/dart/third_party/pkg. In particular, package:test is not usable
-# here.
+# Do not add any dependencies that require more than what is provided
+# in //third_party.pkg, //third_party/dart/pkg, or
+# //third_party/dart/third_party/pkg.
 
-# If you do add packages here, make sure you can run `pub get --offline`, and
-# check the .packages and .package_config to make sure all the paths are
-# relative to this directory into //third_party/dart
+# In particular, package:test is not usable here.
+
+# If you do add packages here, make sure you can run `pub get
+# --offline`, and check the .packages and .package_config to make sure
+# all the paths are relative to this directory into //third_party/dart
 
 dependencies:
   archive: any
   args: any
+  collection: any
   crypto: any
   meta: any
   path: any
-  collection: ^1.16.0
+
+dev_dependencies:
+  litetest: any
 
 dependency_overrides:
   archive:
-    path: ../../../third_party/pkg/archive
+    path: ../../third_party/pkg/archive
   args:
     path: ../../../third_party/dart/third_party/pkg/args
+  async_helper:
+    path: ../../../third_party/dart/pkg/async_helper
   collection:
     path: ../../../third_party/dart/third_party/pkg/collection
   crypto:
     path: ../../../third_party/dart/third_party/pkg/crypto
+  expect:
+    path: ../../../third_party/dart/pkg/expect
+  litetest:
+    path: ../../testing/litetest
   meta:
     path: ../../../third_party/dart/pkg/meta
   path:
     path: ../../../third_party/dart/third_party/pkg/path
+  smith:
+    path: ../../../third_party/dart/pkg/smith
   typed_data:
     path: ../../../third_party/dart/third_party/pkg/typed_data
diff --git a/tools/licenses/test/formatter_test.dart b/tools/licenses/test/formatter_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..39c4d86fb85d45cf27ca318d707da20eb40db66f
--- /dev/null
+++ b/tools/licenses/test/formatter_test.dart
@@ -0,0 +1,87 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:licenses/formatter.dart';
+import 'package:litetest/litetest.dart';
+
+void main() {
+  test('Block comments', () {
+    expect(reformat('/* test */'), 'test');
+    expect(reformat('/*\ntest\n*/'), 'test');
+    expect(reformat('/*\ntest\n */'), 'test');
+    expect(reformat('/*\n * test\n*/'), 'test');
+    expect(reformat('/*\n * test\n */'), 'test');
+    expect(reformat('/*\n * test\n * test\n */'), 'test\ntest');
+    expect(reformat('/*\n * test\n + test\n */'), '* test\n+ test');
+    expect(reformat('test */'), 'test');
+  });
+  test('Indenting blocks', () {
+    expect(reformat('  a\nb\n  c'), 'a\nb\n  c'); // strips leading indents
+    expect(reformat('  a\n b\n  c'), 'a\nb\nc'); // strips common one-space indent, then strips stray one-space indents
+    expect(reformat('  a\n  b\n  c'), 'a\nb\nc'); // strips common two-space indent
+    expect(reformat('  a\n   b\n  c'), 'a\nb\nc'); // strips common two-space indent, then strips stray one-space indent
+    expect(reformat('  a\n    b\n  c'), 'a\n  b\nc'); // streps common two-space indent
+    expect(reformat('  a\n     b\n  c'), 'a\n   b\nc'); // streps common two-space indent
+  });
+  test('Leading blocks', () {
+    expect(reformat('#; a\n#; b\n#; c'), 'a\nb\nc');
+    expect(reformat('#; a\nb\nc'), '#; a\nb\nc');
+    expect(reformat('#; a\n  b\n  c'), '#; a\n  b\n  c');
+  });
+  test('Leading indented lines', () {
+    expect(reformat('  a\nb\nc'), 'a\nb\nc');
+    expect(reformat('  a\n b\nc'), 'a\nb\nc');
+    expect(reformat('  a\n  b\nc'), 'a\nb\nc');
+    expect(reformat('  a\n   b\nc'), 'a\nb\nc');
+    expect(reformat('  a\n    b\nc'), 'a\n  b\nc');
+    expect(reformat('  a\n     b\nc'), 'a\n   b\nc');
+  });
+  test('Leading indented blocks', () {
+    expect(reformat('  a\n  a\nb\nc'), 'a\na\nb\nc');
+    expect(reformat('  a\n  a\n b\nc'), 'a\na\nb\nc');
+    expect(reformat('  a\n  a\n  b\nc'), 'a\na\nb\nc');
+    expect(reformat('  a\n  a\n   b\nc'), 'a\na\nb\nc');
+    expect(reformat('  a\n  a\n    b\nc'), 'a\na\n  b\nc');
+    expect(reformat('  a\n  a\n     b\nc'), 'a\na\n   b\nc');
+  });
+  test('Specific cases', () {
+    expect(reformat('         Apache\n      Version\n   Bla bla\n\nBla bla bla'), 'Apache\nVersion\nBla bla\n\nBla bla bla');
+    expect(
+      reformat(
+        '/* Copyright (c) IBM Corporation, 2000-2012.  All rights reserved.    */\n'
+        '/*                                                                    */\n'
+        '/* This software is made available under the terms of the             */\n'
+        '/* ICU License -- ICU 1.8.1 and later.                                */\n'
+      ),
+      'Copyright (c) IBM Corporation, 2000-2012.  All rights reserved.\n'
+      '\n'
+      'This software is made available under the terms of the\n'
+      'ICU License -- ICU 1.8.1 and later.'
+    );
+    expect(
+      reformat(
+        '/* Copyright (c) IBM Corporation, 2000-2012.  All rights reserved.    */\n'
+        '/*                                                                    */\n'
+        '/* This software is made available under the terms of the             */\n'
+        '/* ICU License -- ICU 1.8.1 and later.                                */'
+      ),
+      'Copyright (c) IBM Corporation, 2000-2012.  All rights reserved.\n'
+      '\n'
+      'This software is made available under the terms of the\n'
+      'ICU License -- ICU 1.8.1 and later.'
+    );
+    expect(
+      reformat(
+        '/* Copyright (c) IBM Corporation, 2000-2012.  All rights reserved.    */\n'
+        '/*                                                                    */\n'
+        '/* This software is made available under the terms of the             */\n'
+        '/* ICU License -- ICU 1.8.1 and later.'
+      ),
+      'Copyright (c) IBM Corporation, 2000-2012.  All rights reserved.\n'
+      '\n'
+      'This software is made available under the terms of the\n'
+      'ICU License -- ICU 1.8.1 and later.'
+    );
+  });
+}
diff --git a/tools/luci/build.py b/tools/luci/build.py
index 1cfcd5cab4d6f88e7880cae5f5c6f1eb894a25a3..d4671a5cf58368071307f1eb1cc48e51b86d820d 100755
--- a/tools/luci/build.py
+++ b/tools/luci/build.py
@@ -55,17 +55,11 @@ def Main():
       default=False,
       help='Force artifact upload, overwriting existing artifacts.'
   )
-  parser.add_argument(
-      '--all', action='store_true', default=False, help='Re-run all builds.'
-  )
+  parser.add_argument('--all', action='store_true', default=False, help='Re-run all builds.')
   parser.add_argument('--builder', type=str, help='The builer to rerun.')
+  parser.add_argument('--commit', type=str, required=True, help='The commit to rerun.')
   parser.add_argument(
-      '--commit', type=str, required=True, help='The commit to rerun.'
-  )
-  parser.add_argument(
-      '--dry-run',
-      action='store_true',
-      help='Print what would be done, but do nothing.'
+      '--dry-run', action='store_true', help='Print what would be done, but do nothing.'
   )
   args = parser.parse_args()
 
@@ -92,10 +86,7 @@ def Main():
       capture_output=True,
   )
   if auth_result.returncode != 0:
-    print(
-        'Auth failed:\nstdout:\n%s\nstderr:\n%s' %
-        (auth_result.stdout, auth_result.stderr)
-    )
+    print('Auth failed:\nstdout:\n%s\nstderr:\n%s' % (auth_result.stdout, auth_result.stderr))
     return 1
   auth_token = auth_result.stdout.rstrip()
 
@@ -106,9 +97,7 @@ def Main():
           % (args.commit, builder)
       )
     else:
-      params = '{"Commit": "%s", "Builder": "%s", "Repo": "engine"}' % (
-          args.commit, builder
-      )
+      params = '{"Commit": "%s", "Builder": "%s", "Repo": "engine"}' % (args.commit, builder)
     curl_command = [
         'curl',
         'http://flutter-dashboard.appspot.com/api/reset-prod-task',
diff --git a/tools/path_ops/BUILD.gn b/tools/path_ops/BUILD.gn
index d89c2e76c0744b720989df6cc0abd091c8753a14..cc74e2c4279a5c3b3a8ab3d9402b086f438c3910 100644
--- a/tools/path_ops/BUILD.gn
+++ b/tools/path_ops/BUILD.gn
@@ -4,36 +4,16 @@
 
 import("//flutter/shell/version/version.gni")
 
-generated_file("path_ops_license") {
-  source_path = rebase_path(".", "//flutter")
-  git_url = "https://github.com/flutter/engine/tree/$engine_version"
-  outputs = [ "$target_gen_dir/LICENSE.path_ops.md" ]
-  contents = [
-    "# path_ops",
-    "",
-    "This tool is used by the vector_graphics library to calculate path intersections.",
-    "",
-    "Source code for this tool: [flutter/engine/$source_path]($git_url/$source_path).",
-    "",
-    "## Licenses",
-    "",
-    read_file("//flutter/sky/packages/sky_engine/LICENSE", "string"),
-    "",
-    "## Additional open source licenses",
-    "",
-    "### Skia",
-    "",
-    read_file("//third_party/skia/LICENSE", "string"),
-  ]
-}
-
 shared_library("path_ops") {
+  public_configs = [ "//flutter:config" ]
+
   sources = [
     "path_ops.cc",
     "path_ops.h",
   ]
-  deps = [
-    ":path_ops_license",
-    "//third_party/skia",
-  ]
+  deps = [ "//flutter/skia" ]
+
+  metadata = {
+    entitlement_file_path = [ "libpath_ops.dylib" ]
+  }
 }
diff --git a/tools/path_ops/dart/lib/path_ops.dart b/tools/path_ops/dart/lib/path_ops.dart
index 5fa84818e064f66636329ca07ed396a50da8baf1..fad2edd59433a5ef20fa092fb62e3ec8c80418b4 100644
--- a/tools/path_ops/dart/lib/path_ops.dart
+++ b/tools/path_ops/dart/lib/path_ops.dart
@@ -12,7 +12,7 @@ import 'dart:typed_data';
 /// calculated.
 ///
 /// This enum is used by the [Path] constructor
-// must match ordering in //third_party/skia/include/core/SkPathTypes.h
+// must match ordering in //flutter/third_party/skia/include/core/SkPathTypes.h
 enum FillType {
   /// The interior is defined by a non-zero sum of signed edge crossings.
   nonZero,
@@ -22,7 +22,7 @@ enum FillType {
 }
 
 /// A set of operations applied to two paths.
-// Sync with //third_party/skia/include/pathops/SkPathOps.h
+// Sync with //flutter/third_party/skia/include/pathops/SkPathOps.h
 enum PathOp {
   /// Subtracts the second path from the first.
   difference,
@@ -44,7 +44,7 @@ enum PathOp {
 /// The commands used in a [Path] object.
 ///
 /// This enumeration is a subset of the commands that SkPath supports.
-// Sync with //third_party/skia/include/core/SkPathTypes.h
+// Sync with //flutter/third_party/skia/include/core/SkPathTypes.h
 enum PathVerb {
   /// Picks up the pen and moves it without drawing. Uses two point values.
   moveTo,
@@ -171,16 +171,12 @@ class Path implements PathProxy {
       switch (verb) {
         case PathVerb.moveTo:
           proxy.moveTo(points[index++], points[index++]);
-          break;
         case PathVerb.lineTo:
           proxy.lineTo(points[index++], points[index++]);
-          break;
         case PathVerb._quadTo:
           assert(false);
-          break;
         case PathVerb._conicTo:
           assert(false);
-          break;
         case PathVerb.cubicTo:
           proxy.cubicTo(
             points[index++],
@@ -190,10 +186,8 @@ class Path implements PathProxy {
             points[index++],
             points[index++],
           );
-          break;
         case PathVerb.close:
           proxy.close();
-          break;
       }
     }
     assert(index == points.length);
@@ -209,7 +203,7 @@ class Path implements PathProxy {
     _updatePathData();
     final int count = _pathData!.ref.verb_count;
     return List<PathVerb>.generate(count, (int index) {
-      return PathVerb.values[_pathData!.ref.verbs.elementAt(index).value];
+      return PathVerb.values[_pathData!.ref.verbs[index]];
     }, growable: false);
   }
 
@@ -303,15 +297,15 @@ final ffi.DynamicLibrary _dylib = () {
     return ffi.DynamicLibrary.open('path_ops.dll');
   } else if (Platform.isIOS || Platform.isMacOS) {
     return ffi.DynamicLibrary.open('libpath_ops.dylib');
-  } else if (Platform.isAndroid || Platform.isLinux) {
+  } else if (Platform.isAndroid || Platform.isLinux || Platform.isOhos) {
     return ffi.DynamicLibrary.open('libpath_ops.so');
   }
   throw UnsupportedError('Unknown platform: ${Platform.operatingSystem}');
 }();
 
-class _SkPath extends ffi.Opaque {}
+final class _SkPath extends ffi.Opaque {}
 
-class _PathData extends ffi.Struct {
+final class _PathData extends ffi.Struct {
   external ffi.Pointer<ffi.Uint8> verbs;
 
   @ffi.Size()
diff --git a/tools/path_ops/dart/pubspec.yaml b/tools/path_ops/dart/pubspec.yaml
index 1dca18515b9c2da899b8407b2eb0adbdfb001cc5..d53bbbfe14ab53750a15193d99055fb071acdc57 100644
--- a/tools/path_ops/dart/pubspec.yaml
+++ b/tools/path_ops/dart/pubspec.yaml
@@ -8,7 +8,7 @@ publish_to: none
 homepage: https://github.com/flutter/engine/tree/main/tools/path_ops
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=3.2.0-0 <4.0.0'
 
 dev_dependencies:
   litetest: any
diff --git a/tools/path_ops/path_ops.h b/tools/path_ops/path_ops.h
index 2565055a36248dc5d9e0c3ec776e04f6e821d8dd..5384305b1fe7e2de96f97202510ec4e50b1f71d0 100644
--- a/tools/path_ops/path_ops.h
+++ b/tools/path_ops/path_ops.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_TOOLS_PATH_OPS_PATH_OPS_H_
+#define FLUTTER_TOOLS_PATH_OPS_PATH_OPS_H_
 
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkPathBuilder.h"
@@ -58,3 +59,5 @@ API void DestroyData(PathData* data);
 
 }  // namespace flutter
 }
+
+#endif  // FLUTTER_TOOLS_PATH_OPS_PATH_OPS_H_
diff --git a/tools/pkg/engine_build_configs/README.md b/tools/pkg/engine_build_configs/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..74298c6e098cf1b5bfe54a89b014619124fafe72
--- /dev/null
+++ b/tools/pkg/engine_build_configs/README.md
@@ -0,0 +1,47 @@
+## Overview
+
+This package contains libraries and example code for working with the engine_v2
+build config json files that live under `flutter/ci/builders`.
+
+* `lib/src/build_config.dart`: Contains the Dart object representations of the
+  build config json files.
+* `lib/src/build_config_loader.dart`: Contains a helper class for loading all
+  of the build configuration json files in a directory tree into the Dart
+  objects.
+* `lib/src/build_config_runner.dart`: Contains classes that run a loaded build
+  config on the local machine.
+
+There is some example code using these APIs under the `bin/` directory.
+
+* `bin/check.dart`: Checks the validity of the build config json files. This
+  runs on CI in pre and post submit in `ci/check_build_configs.sh` through
+  `ci/builders/linux_unopt.json`.
+* `bin/run.dart`: Runs one build from a build configuration on the local
+  machine. It doesn't run generators or tests, and it isn't run on CI.
+
+## Usage
+
+### `run.dart` usage:
+
+
+```
+$ dart bin/run.dart [build config name] [build name]
+```
+
+For example:
+
+```
+$ dart bin/run.dart mac_unopt host_debug_unopt
+```
+
+The build config names are the names of the json files under ci/builders.
+The build names are the "name" fields of the maps in the list of "builds".
+
+### `check.dart` usage:
+
+```
+$ dart bin/check.dart [/path/to/engine/src]
+```
+
+The path to the engine source is optional when the current working directory is
+inside of an engine checkout.
diff --git a/tools/pkg/engine_build_configs/analysis_options.yaml b/tools/pkg/engine_build_configs/analysis_options.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..79335970f853f52353b286fd63cb2137d03cc092
--- /dev/null
+++ b/tools/pkg/engine_build_configs/analysis_options.yaml
@@ -0,0 +1,5 @@
+include: ../../../analysis_options.yaml
+
+linter:
+  rules:
+    public_member_api_docs: false
diff --git a/tools/pkg/engine_build_configs/bin/check.dart b/tools/pkg/engine_build_configs/bin/check.dart
new file mode 100644
index 0000000000000000000000000000000000000000..7c3e759311a7173ff4352e4c4ba984b3413c5538
--- /dev/null
+++ b/tools/pkg/engine_build_configs/bin/check.dart
@@ -0,0 +1,84 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io' as io;
+
+import 'package:engine_build_configs/engine_build_configs.dart';
+import 'package:engine_repo_tools/engine_repo_tools.dart';
+import 'package:path/path.dart' as p;
+
+// Usage:
+// $ dart bin/check.dart [/path/to/engine/src]
+
+void main(List<String> args) {
+  final String? engineSrcPath;
+  if (args.isNotEmpty) {
+    engineSrcPath = args[0];
+  } else {
+    engineSrcPath = null;
+  }
+
+  // Find the engine repo.
+  final Engine engine;
+  try {
+    engine = Engine.findWithin(engineSrcPath);
+  } catch (e) {
+    io.stderr.writeln(e);
+    io.exitCode = 1;
+    return;
+  }
+
+  // Find and parse the engine build configs.
+  final io.Directory buildConfigsDir = io.Directory(p.join(
+    engine.flutterDir.path,
+    'ci',
+    'builders',
+  ));
+  final BuildConfigLoader loader = BuildConfigLoader(
+    buildConfigsDir: buildConfigsDir,
+  );
+
+  // Treat it as an error if no build configs were found. The caller likely
+  // expected to find some.
+  final Map<String, BuilderConfig> configs = loader.configs;
+  if (configs.isEmpty) {
+    io.stderr.writeln(
+      'Error: No build configs found under ${buildConfigsDir.path}',
+    );
+    io.exitCode = 1;
+    return;
+  }
+  if (loader.errors.isNotEmpty) {
+    loader.errors.forEach(io.stderr.writeln);
+    io.exitCode = 1;
+  }
+
+  // Check the parsed build configs for validity.
+  for (final String name in configs.keys) {
+    final BuilderConfig buildConfig = configs[name]!;
+    final List<String> buildConfigErrors = buildConfig.check(name);
+    if (buildConfigErrors.isNotEmpty) {
+      io.stderr.writeln('Errors in ${buildConfig.path}:');
+      io.exitCode = 1;
+    }
+    for (final String error in buildConfigErrors) {
+      io.stderr.writeln('    $error');
+      io.exitCode = 1;
+    }
+  }
+
+  // We require all builds within a builder config to be uniquely named.
+  final Map<String, Set<String>> builderBuildSet = <String, Set<String>>{};
+  for (final String builderName in configs.keys) {
+    final BuilderConfig builderConfig = configs[builderName]!;
+    final Set<String> builds =
+        builderBuildSet.putIfAbsent(builderName, () => <String>{});
+    for (final Build build in builderConfig.builds) {
+      if (builds.contains(build.name)) {
+        io.stderr.writeln('${build.name} is duplicated in $builderName\n');
+        io.exitCode = 1;
+      }
+    }
+  }
+}
diff --git a/tools/pkg/engine_build_configs/bin/run.dart b/tools/pkg/engine_build_configs/bin/run.dart
new file mode 100644
index 0000000000000000000000000000000000000000..6f9b6adffe56e2ac5946d513ca92319bd7484eeb
--- /dev/null
+++ b/tools/pkg/engine_build_configs/bin/run.dart
@@ -0,0 +1,165 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:ffi' as ffi;
+import 'dart:io' as io;
+
+import 'package:engine_build_configs/engine_build_configs.dart';
+import 'package:engine_repo_tools/engine_repo_tools.dart';
+import 'package:path/path.dart' as p;
+import 'package:platform/platform.dart';
+import 'package:process_runner/process_runner.dart';
+
+// This is an example of how to use the APIs of this library to parse and
+// execute the build configurations json files under ci/builders.
+//
+// Usage:
+// $ dart bin/run.dart [build config name] [build name]
+// For example:
+// $ dart bin/run.dart mac_unopt host_debug_unopt
+//
+// The build config names are the names of the json files under ci/builders
+// The build names are the "name" fields of the maps in the list of "builds".
+
+void main(List<String> args) async {
+  final String? configName;
+  final String? buildName;
+  if (args.length >= 2) {
+    configName = args[0];
+    buildName = args[1];
+  } else {
+    io.stderr.writeln(r'''
+Usage:
+$ dart bin/run.dart [build config name] [build name]
+
+For example:
+
+$ dart bin/run.dart mac_unopt host_debug_unopt
+
+The build config names are the names of the json files under ci/builders.
+The build names are the "name" fields of the maps in the list of "builds".
+''');
+    io.exitCode = 1;
+    return;
+  }
+
+  // Find the engine repo.
+  final Engine engine;
+  try {
+    engine = Engine.findWithin();
+  } catch (e) {
+    io.stderr.writeln(e);
+    io.exitCode = 1;
+    return;
+  }
+
+  // Find and parse the engine build configs.
+  final io.Directory buildConfigsDir = io.Directory(p.join(
+    engine.flutterDir.path,
+    'ci',
+    'builders',
+  ));
+  final BuildConfigLoader loader = BuildConfigLoader(
+    buildConfigsDir: buildConfigsDir,
+  );
+
+  // Treat it as an error if no build configs were found. The caller likely
+  // expected to find some.
+  final Map<String, BuilderConfig> configs = loader.configs;
+  if (configs.isEmpty) {
+    io.stderr.writeln(
+      'Error: No build configs found under ${buildConfigsDir.path}',
+    );
+    io.exitCode = 1;
+    return;
+  }
+  if (loader.errors.isNotEmpty) {
+    loader.errors.forEach(io.stderr.writeln);
+    io.exitCode = 1;
+  }
+
+  // Check the parsed build configs for validity.
+  final BuilderConfig? targetConfig = configs[configName];
+  if (targetConfig == null) {
+    io.stderr.writeln('Build config "$configName" not found.');
+    io.exitCode = 1;
+    return;
+  }
+  final List<String> buildConfigErrors = targetConfig.check(configName);
+  if (buildConfigErrors.isNotEmpty) {
+    io.stderr.writeln('Errors in "$configName":');
+    for (final String error in buildConfigErrors) {
+      io.stderr.writeln('    $error');
+    }
+    io.exitCode = 1;
+    return;
+  }
+
+  Build? targetBuild;
+  for (int i = 0; i < targetConfig.builds.length; i++) {
+    final Build build = targetConfig.builds[i];
+    if (build.name == buildName) {
+      targetBuild = build;
+    }
+  }
+  if (targetBuild == null) {
+    io.stderr.writeln(
+      'Target build not found. No build called $buildName in $configName',
+    );
+    io.exitCode = 1;
+    return;
+  }
+
+  // If RBE config files aren't in the tree, then disable RBE.
+  final String rbeConfigPath = p.join(
+    engine.srcDir.path,
+    'flutter',
+    'build',
+    'rbe',
+  );
+  final List<String> extraGnArgs = <String>[
+    if (!io.Directory(rbeConfigPath).existsSync()) '--no-rbe',
+  ];
+
+  final BuildRunner buildRunner = BuildRunner(
+    platform: const LocalPlatform(),
+    processRunner: ProcessRunner(),
+    abi: ffi.Abi.current(),
+    engineSrcDir: engine.srcDir,
+    build: targetBuild,
+    extraGnArgs: extraGnArgs,
+    runGenerators: false,
+    runTests: false,
+  );
+  void handler(RunnerEvent event) {
+    switch (event) {
+      case RunnerStart():
+        io.stdout.writeln('$event: ${event.command.join(' ')}');
+      case RunnerProgress(done: true):
+        io.stdout.writeln(event);
+      case RunnerProgress(done: false):
+        {
+          final int width = io.stdout.terminalColumns;
+          final String percent = '${event.percent.toStringAsFixed(1)}%';
+          final String fraction = '(${event.completed}/${event.total})';
+          final String prefix = '[${event.name}] $percent $fraction ';
+          final int remainingSpace = width - prefix.length;
+          final String what;
+          if (remainingSpace >= event.what.length) {
+            what = event.what;
+          } else {
+            what = event.what.substring(event.what.length - remainingSpace + 1);
+          }
+          final String spaces = ' ' * width;
+          io.stdout.write('$spaces\r'); // Erase the old line.
+          io.stdout.write('$prefix$what\r'); // Print the new line.
+        }
+      default:
+        io.stdout.writeln(event);
+    }
+  }
+
+  final bool buildResult = await buildRunner.run(handler);
+  io.exitCode = buildResult ? 0 : 1;
+}
diff --git a/tools/pkg/engine_build_configs/lib/engine_build_configs.dart b/tools/pkg/engine_build_configs/lib/engine_build_configs.dart
new file mode 100644
index 0000000000000000000000000000000000000000..c6e4f8feb9b72e01f1eb66d5b043b471bf9fff90
--- /dev/null
+++ b/tools/pkg/engine_build_configs/lib/engine_build_configs.dart
@@ -0,0 +1,25 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+/// This is a library for parsing the Engine CI configurations that live under
+/// flutter/ci/builders. They describe how CI builds, tests, archives, and
+/// uploads the engine to cloud storage. The documentation and spec for the
+/// format is at:
+///
+///    https://github.com/flutter/engine/blob/main/ci/builders/README.md
+///
+/// The code in this library is *not* used by CI to run these configurations.
+/// Rather, that code executes these configs on CI is part of the "engine_v2"
+/// recipes at:
+///
+///   https://cs.opensource.google/flutter/recipes/+/main:recipes/engine_v2
+///
+/// This library exposes two main classes, [BuildConfigLoader], which reads and
+/// loads all build configurations under a directory, and [BuildConfig], which
+/// is the Dart representation of a single build configuration.
+library;
+
+export 'src/build_config.dart';
+export 'src/build_config_loader.dart';
+export 'src/build_config_runner.dart';
diff --git a/tools/pkg/engine_build_configs/lib/src/build_config.dart b/tools/pkg/engine_build_configs/lib/src/build_config.dart
new file mode 100644
index 0000000000000000000000000000000000000000..6718f639fc4a8141501b3c614a52839abca154fa
--- /dev/null
+++ b/tools/pkg/engine_build_configs/lib/src/build_config.dart
@@ -0,0 +1,915 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:meta/meta.dart';
+import 'package:platform/platform.dart';
+
+// This library parses Engine builder config data out of the "Engine v2" build
+// config JSON files with the format described at:
+//   https://github.com/flutter/engine/blob/main/ci/builders/README.md
+
+/// Base class for all nodes in the build config.
+sealed class BuildConfigBase {
+  BuildConfigBase(this.errors);
+
+  /// Accumulated errors. Non-null and non-empty when a node is invalid.
+  final List<String>? errors;
+
+  /// Whether there were errors when loading the data for this node.
+  late final bool valid = errors == null;
+
+  /// Returns an empty list when the object is valid, and errors when it is not.
+  /// Subclasses with more data to check for validity should override this
+  /// method and add `super.check(path)` to the returned list.
+  @mustCallSuper
+  List<String> check(String path) {
+    if (valid) {
+      return <String>[];
+    }
+    return errors!.map((String s) => '$path: $s').toList();
+  }
+}
+
+/// The builder configuration is a json file containing a list of builds, tests,
+/// generators and archives.
+///
+/// Each builder config file contains a top-level json map with the following
+/// fields:
+/// {
+///    "builds": [],
+///    "tests": [],
+///    "generators": {
+///      "tasks": []
+///    },
+///    "archives": []
+/// }
+final class BuilderConfig extends BuildConfigBase {
+  /// Load build configuration data into an instance of this class.
+  ///
+  /// [path] should be the file system path to the file that the JSON data comes
+  /// from. [map] must be the JSON data returned by e.g. `JsonDecoder.convert`.
+  factory BuilderConfig.fromJson({
+    required String path,
+    required Map<String, Object?> map,
+  }) {
+    final List<String> errors = <String>[];
+
+    // Parse the "builds" field.
+    final List<Build>? builds = objListOfJson<Build>(
+      map,
+      'builds',
+      errors,
+      Build.fromJson,
+    );
+
+    // Parse the "tests" field.
+    final List<GlobalTest>? tests = objListOfJson<GlobalTest>(
+      map,
+      'tests',
+      errors,
+      GlobalTest.fromJson,
+    );
+
+    // Parse the "generators" field.
+    final List<TestTask>? generators;
+    if (map['generators'] == null) {
+      generators = <TestTask>[];
+    } else if (map['generators'] is! Map<String, Object?>) {
+      appendTypeError(map, 'generators', 'map', errors);
+      generators = null;
+    } else {
+      generators = objListOfJson(
+        map['generators']! as Map<String, Object?>,
+        'tasks',
+        errors,
+        TestTask.fromJson,
+      );
+    }
+
+    // Parse the "archives" field.
+    final List<GlobalArchive>? archives = objListOfJson<GlobalArchive>(
+      map,
+      'archives',
+      errors,
+      GlobalArchive.fromJson,
+    );
+
+    if (builds == null ||
+        tests == null ||
+        generators == null ||
+        archives == null) {
+      return BuilderConfig._invalid(path, errors);
+    }
+    return BuilderConfig._(path, builds, tests, generators, archives);
+  }
+
+  BuilderConfig._(
+    this.path,
+    this.builds,
+    this.tests,
+    this.generators,
+    this.archives,
+  ) : super(null);
+
+  BuilderConfig._invalid(this.path, super.errors)
+      : builds = <Build>[],
+        tests = <GlobalTest>[],
+        generators = <TestTask>[],
+        archives = <GlobalArchive>[];
+
+  /// The path to the JSON file.
+  final String path;
+
+  /// A list of independent builds that have no dependencies among them. They
+  /// can run in parallel if need be.
+  final List<Build> builds;
+
+  /// A list of tests. The tests may have dependencies on one or more of the
+  /// builds.
+  final List<GlobalTest> tests;
+
+  /// A list of generator tasks that produce additional artifacts, which may
+  /// depend on the output of one or more builds.
+  final List<TestTask> generators;
+
+  /// A description of the upload instructions for the artifacts produced by
+  /// the global generators.
+  final List<GlobalArchive> archives;
+
+  @override
+  List<String> check(String path) {
+    final List<String> errors = <String>[];
+    errors.addAll(super.check(path));
+    for (int i = 0; i < builds.length; i++) {
+      final Build build = builds[i];
+      errors.addAll(build.check('$path/builds[$i]'));
+    }
+    for (int i = 0; i < tests.length; i++) {
+      final GlobalTest test = tests[i];
+      errors.addAll(test.check('$path/tests[$i]'));
+    }
+    for (int i = 0; i < generators.length; i++) {
+      final TestTask task = generators[i];
+      errors.addAll(task.check('$path/generators/tasks[$i]'));
+    }
+    for (int i = 0; i < archives.length; i++) {
+      final GlobalArchive archive = archives[i];
+      errors.addAll(archive.check('$path/archives[$i]'));
+    }
+    return errors;
+  }
+
+  /// Returns true if any of the [Build]s it contains can run on
+  /// `platform`, and false otherwise.
+  bool canRunOn(Platform platform) {
+    return builds.any((Build b) => b.canRunOn(platform));
+  }
+}
+
+/// A "build" is a dictionary with a gn command, a ninja command, zero or more
+/// generator commands, zero or more local tests, zero or more local generators
+/// and zero or more output artifacts.
+///
+/// "builds" contains a list of maps with fields like:
+/// {
+///   "name": "",
+///   "gn": [""],
+///   "ninja": {},
+///   "tests": [],
+///   "generators": {
+///     "tasks": []
+///   }, (optional)
+///   "archives": [],
+///   "drone_dimensions": [""],
+///   "gclient_variables": {}
+/// }
+final class Build extends BuildConfigBase {
+  factory Build.fromJson(Map<String, Object?> map) {
+    final List<String> errors = <String>[];
+    final String? name = stringOfJson(map, 'name', errors);
+    final List<String>? gn = stringListOfJson(map, 'gn', errors);
+    final List<BuildTest>? tests = objListOfJson(
+      map,
+      'tests',
+      errors,
+      BuildTest.fromJson,
+    );
+    final List<BuildArchive>? archives = objListOfJson(
+      map,
+      'archives',
+      errors,
+      BuildArchive.fromJson,
+    );
+    final List<String>? droneDimensions = stringListOfJson(
+      map,
+      'drone_dimensions',
+      errors,
+    );
+
+    final BuildNinja? ninja;
+    if (map['ninja'] == null) {
+      ninja = BuildNinja.nop();
+    } else if (map['ninja'] is! Map<String, Object?>) {
+      ninja = null;
+    } else {
+      ninja = BuildNinja.fromJson(map['ninja']! as Map<String, Object?>);
+    }
+    if (ninja == null) {
+      appendTypeError(map, 'ninja', 'map', errors);
+    }
+
+    final List<BuildTask>? generators;
+    if (map['generators'] == null) {
+      generators = <BuildTask>[];
+    } else if (map['generators'] is! Map<String, Object?>) {
+      appendTypeError(map, 'generators', 'map', errors);
+      generators = null;
+    } else {
+      generators = objListOfJson(
+        map['generators']! as Map<String, Object?>,
+        'tasks',
+        errors,
+        BuildTask.fromJson,
+      );
+    }
+
+    final Map<String, Object?>? gclientVariables;
+    if (map['gclient_variables'] == null) {
+      gclientVariables = <String, Object?>{};
+    } else if (map['gclient_variables'] is! Map<String, Object?>) {
+      gclientVariables = null;
+    } else {
+      gclientVariables = map['gclient_variables']! as Map<String, Object?>;
+    }
+    if (gclientVariables == null) {
+      appendTypeError(map, 'gclient_variables', 'map', errors);
+    }
+
+    if (name == null ||
+        gn == null ||
+        ninja == null ||
+        archives == null ||
+        tests == null ||
+        generators == null ||
+        droneDimensions == null ||
+        gclientVariables == null) {
+      return Build._invalid(errors);
+    }
+    return Build._(
+      name,
+      gn,
+      ninja,
+      tests,
+      generators,
+      archives,
+      droneDimensions,
+      gclientVariables,
+    );
+  }
+
+  Build._(
+    this.name,
+    this.gn,
+    this.ninja,
+    this.tests,
+    this.generators,
+    this.archives,
+    this.droneDimensions,
+    this.gclientVariables,
+  ) : super(null);
+
+  Build._invalid(super.errors)
+      : name = '',
+        gn = <String>[],
+        ninja = BuildNinja.nop(),
+        tests = <BuildTest>[],
+        generators = <BuildTask>[],
+        archives = <BuildArchive>[],
+        droneDimensions = <String>[],
+        gclientVariables = <String, Object?>{};
+
+  /// The name of the build which may also be used to reference it as a
+  /// depdendency of a global test.
+  final String name;
+
+  /// The parameters to pass to `flutter/tools/gn` to configure the build.
+  final List<String> gn;
+
+  /// The data to form the ninja command to perform the build.
+  final BuildNinja ninja;
+
+  /// The list of tests that can be run after the ninja build is finished.
+  final List<BuildTest> tests;
+
+  /// A list of other tasks that may generate new artifacts after the ninja
+  /// build is finished.
+  final List<BuildTask> generators;
+
+  /// Upload instructions for the artifacts produced by the build.
+  final List<BuildArchive> archives;
+
+  /// A list 'key=value' strings that are used to select the bot where this
+  /// build will be running.
+  final List<String> droneDimensions;
+
+  /// A dictionary with variables included in the `custom_vars` section of the
+  /// .gclient file before `gclient sync` is run.
+  final Map<String, Object?> gclientVariables;
+
+  /// Returns true if platform is capable of executing this build and false
+  /// otherwise.
+  bool canRunOn(Platform platform) => _canRunOn(droneDimensions, platform);
+
+  @override
+  List<String> check(String path) {
+    final List<String> errors = <String>[];
+    errors.addAll(super.check(path));
+    errors.addAll(ninja.check('$path/ninja'));
+    for (int i = 0; i < tests.length; i++) {
+      final BuildTest test = tests[i];
+      errors.addAll(test.check('$path/tests[$i]'));
+    }
+    for (int i = 0; i < generators.length; i++) {
+      final BuildTask task = generators[i];
+      errors.addAll(task.check('$path/generators/tasks[$i]'));
+    }
+    for (int i = 0; i < archives.length; i++) {
+      final BuildArchive archive = archives[i];
+      errors.addAll(archive.check('$path/archives[$i]'));
+    }
+    return errors;
+  }
+}
+
+/// "builds" -> "ninja" contains a map with fields like:
+/// {
+///   "config": "",
+///   "targets": [""]
+/// },
+final class BuildNinja extends BuildConfigBase {
+  factory BuildNinja.fromJson(Map<String, Object?> map) {
+    final List<String> errors = <String>[];
+    final String? config = stringOfJson(map, 'config', errors);
+    final List<String>? targets = stringListOfJson(map, 'targets', errors);
+    if (config == null || targets == null) {
+      return BuildNinja._invalid(errors);
+    }
+    return BuildNinja._(config, targets);
+  }
+
+  BuildNinja._(this.config, this.targets) : super(null);
+
+  BuildNinja._invalid(super.errors)
+      : config = '',
+        targets = <String>[];
+
+  BuildNinja.nop()
+      : config = '',
+        targets = <String>[],
+        super(null);
+
+  /// The name of the configuration created by gn.
+  ///
+  /// This is also the subdirectory of the `out/` directory where the build
+  /// output will go.
+  final String config;
+
+  /// The ninja targets to build.
+  final List<String> targets;
+}
+
+/// "builds" -> "tests" contains a list of maps with fields like:
+/// {
+///  "language": "",
+///  "name": "",
+///  "parameters": [""],
+///  "script": "",
+///  "contexts": [""]
+/// }
+final class BuildTest extends BuildConfigBase {
+  factory BuildTest.fromJson(Map<String, Object?> map) {
+    final List<String> errors = <String>[];
+    final String? name = stringOfJson(map, 'name', errors);
+    final String? language = stringOfJson(map, 'language', errors);
+    final String? script = stringOfJson(map, 'script', errors);
+    final List<String>? parameters = stringListOfJson(
+      map,
+      'parameters',
+      errors,
+    );
+    final List<String>? contexts = stringListOfJson(
+      map,
+      'contexts',
+      errors,
+    );
+    if (name == null ||
+        language == null ||
+        script == null ||
+        parameters == null ||
+        contexts == null) {
+      return BuildTest._invalid(errors);
+    }
+    return BuildTest._(name, language, script, parameters, contexts);
+  }
+
+  BuildTest._(
+    this.name,
+    this.language,
+    this.script,
+    this.parameters,
+    this.contexts,
+  ) : super(null);
+
+  BuildTest._invalid(super.errors)
+      : name = '',
+        language = '',
+        script = '',
+        parameters = <String>[],
+        contexts = <String>[];
+
+  /// The human readable description of the test.
+  final String name;
+
+  /// The executable used to run the script.
+  final String language;
+
+  /// The path to the script to execute relative to the checkout directory.
+  final String script;
+
+  /// Flags or parameters passed to the script.
+  ///
+  /// Parameters accept magic environment variables (placeholders replaced
+  /// before executing the test). Magic environment variables have the following
+  /// limitations: only ${FLUTTER_LOGS_DIR} is currently supported and it needs
+  /// to be used alone within the parameter string(e.g. ["${FLUTTER_LOGS_DIR}"]
+  /// is OK but ["path=${FLUTTER_LOGS_DIR}"] is not).
+  final List<String> parameters;
+
+  /// A list of available contexts to add to the text execution step.
+  ///
+  /// Two contexts are supported: "android_virtual_device" and
+  /// "metric_center_token".
+  final List<String> contexts;
+}
+
+/// "builds" -> "generators" is a map containing a single property "tasks",
+/// which is a list of maps with fields like:
+/// {
+///   "name": "",
+///   "parameters": [""],
+///   "scripts": [""],
+///   "language": ""
+/// }
+///
+/// The semantics of this task are that each script in the list of scripts is
+/// run in sequence by appending the same parameter list to each one.
+final class BuildTask extends BuildConfigBase {
+  factory BuildTask.fromJson(Map<String, Object?> map) {
+    final List<String> errors = <String>[];
+    final String? name = stringOfJson(map, 'name', errors);
+    final String? language = stringOfJson(map, 'language', errors);
+    final List<String>? scripts = stringListOfJson(map, 'scripts', errors);
+    final List<String>? parameters = stringListOfJson(
+      map,
+      'parameters',
+      errors,
+    );
+    if (name == null ||
+        language == null ||
+        scripts == null ||
+        parameters == null) {
+      return BuildTask._invalid(errors);
+    }
+    return BuildTask._(name, language, scripts, parameters);
+  }
+
+  BuildTask._invalid(super.errors)
+      : name = '',
+        language = '',
+        scripts = <String>[],
+        parameters = <String>[];
+
+  BuildTask._(this.name, this.language, this.scripts, this.parameters)
+      : super(null);
+
+  /// The human readable name of the step running the script.
+  final String name;
+
+  /// The script language executable to run the script. If empty it is assumed
+  /// to be bash.
+  final String language;
+
+  /// A list of paths of scripts relative to the checkout directory. Each
+  /// script is run in turn by appending the list of parameters to it.
+  final List<String> scripts;
+
+  /// The flags passed to the script. Paths referenced in the list are relative
+  /// to the checkout directory.
+  final List<String> parameters;
+}
+
+/// "builds" -> "archives" contains a list of maps with fields like:
+/// {
+///   "name": "",
+///   "base_path": "",
+///   "type": "",
+///   "include_paths": [""],
+///   "realm": ""
+/// }
+final class BuildArchive extends BuildConfigBase {
+  factory BuildArchive.fromJson(Map<String, Object?> map) {
+    final List<String> errors = <String>[];
+    final String? name = stringOfJson(map, 'name', errors);
+    final String? type = stringOfJson(map, 'type', errors);
+    final String? basePath = stringOfJson(map, 'base_path', errors);
+    final String? realm = stringOfJson(map, 'realm', errors);
+    final List<String>? includePaths = stringListOfJson(
+      map,
+      'include_paths',
+      errors,
+    );
+    if (name == null ||
+        type == null ||
+        basePath == null ||
+        realm == null ||
+        includePaths == null) {
+      return BuildArchive._invalid(errors);
+    }
+    return BuildArchive._(name, type, basePath, realm, includePaths);
+  }
+
+  BuildArchive._invalid(super.error)
+      : name = '',
+        type = '',
+        basePath = '',
+        realm = '',
+        includePaths = <String>[];
+
+  BuildArchive._(
+    this.name,
+    this.type,
+    this.basePath,
+    this.realm,
+    this.includePaths,
+  ) : super(null);
+
+  /// The name which may be referenced later as a dependency of global tests.
+  final String name;
+
+  /// The type of storage to use. Currently only “gcs” and “cas” are supported.
+  final String type;
+
+  /// The portion of the path to remove from the full path before uploading
+  final String basePath;
+
+  /// Either "production" or "experimental".
+  final String realm;
+
+  /// A list of strings with the paths to be uploaded to a given destination.
+  final List<String> includePaths;
+}
+
+/// Global "tests" is a list of maps containing fields like:
+/// {
+///   "name": "",
+///   "recipe": "",
+///   "drone_dimensions": [""],
+///   "dependencies": [""],
+///   "tasks": [] (same format as above)
+/// }
+final class GlobalTest extends BuildConfigBase {
+  factory GlobalTest.fromJson(Map<String, Object?> map) {
+    final List<String> errors = <String>[];
+    final String? name = stringOfJson(map, 'name', errors);
+    final String? recipe = stringOfJson(map, 'recipe', errors);
+    final List<String>? droneDimensions = stringListOfJson(
+      map,
+      'drone_dimensions',
+      errors,
+    );
+    final List<String>? dependencies = stringListOfJson(
+      map,
+      'dependencies',
+      errors,
+    );
+    final List<TestDependency>? testDependencies = objListOfJson(
+      map,
+      'test_dependencies',
+      errors,
+      TestDependency.fromJson,
+    );
+    final List<TestTask>? tasks = objListOfJson(
+      map,
+      'tasks',
+      errors,
+      TestTask.fromJson,
+    );
+    if (name == null ||
+        recipe == null ||
+        droneDimensions == null ||
+        dependencies == null ||
+        testDependencies == null ||
+        tasks == null) {
+      return GlobalTest._invalid(errors);
+    }
+    return GlobalTest._(
+        name, recipe, droneDimensions, dependencies, testDependencies, tasks);
+  }
+
+  GlobalTest._invalid(super.errors)
+      : name = '',
+        recipe = '',
+        droneDimensions = <String>[],
+        dependencies = <String>[],
+        testDependencies = <TestDependency>[],
+        tasks = <TestTask>[];
+
+  GlobalTest._(
+    this.name,
+    this.recipe,
+    this.droneDimensions,
+    this.dependencies,
+    this.testDependencies,
+    this.tasks,
+  ) : super(null);
+
+  /// The name that will be assigned to the sub-build.
+  final String name;
+
+  /// The recipe name to use if different than tester.
+  final String recipe;
+
+  /// A list of strings with key values to select the bot where the test will
+  /// run.
+  final List<String> droneDimensions;
+
+  /// A list of build outputs required by the test.
+  final List<String> dependencies;
+
+  /// A list of dependencies required for the test to run.
+  final List<TestDependency> testDependencies;
+
+  /// A list of dictionaries representing scripts and parameters to run them
+  final List<TestTask> tasks;
+
+  /// Returns true if platform is capable of executing this build and false
+  /// otherwise.
+  bool canRunOn(Platform platform) => _canRunOn(droneDimensions, platform);
+
+  @override
+  List<String> check(String path) {
+    final List<String> errors = <String>[];
+    errors.addAll(super.check(path));
+    for (int i = 0; i < testDependencies.length; i++) {
+      final TestDependency testDependency = testDependencies[i];
+      errors.addAll(testDependency.check('$path/test_dependencies[$i]'));
+    }
+    for (int i = 0; i < tasks.length; i++) {
+      final TestTask task = tasks[i];
+      errors.addAll(task.check('$path/tasks[$i]'));
+    }
+    return errors;
+  }
+}
+
+/// A test dependency for a global test has fields like:
+/// {
+///   "dependency": "",
+///   "version": ""
+/// }
+final class TestDependency extends BuildConfigBase {
+  factory TestDependency.fromJson(Map<String, Object?> map) {
+    final List<String> errors = <String>[];
+    final String? dependency = stringOfJson(map, 'dependency', errors);
+    final String? version = stringOfJson(map, 'version', errors);
+    if (dependency == null || version == null) {
+      return TestDependency._invalid(errors);
+    }
+    return TestDependency._(dependency, version);
+  }
+
+  TestDependency._invalid(super.error)
+      : dependency = '',
+        version = '';
+
+  TestDependency._(this.dependency, this.version) : super(null);
+
+  /// A dependency from the list at:
+  /// https://flutter.googlesource.com/recipes/+/refs/heads/main/recipe_modules/flutter_deps/api.py#75
+  final String dependency;
+
+  /// The CIPD version string of the dependency.
+  final String version;
+}
+
+/// Task for a global generator and a global test.
+/// {
+///   "name": "",
+///   "parameters": [""],
+///   "script": "",
+///   "language": ""
+/// }
+final class TestTask extends BuildConfigBase {
+  factory TestTask.fromJson(Map<String, Object?> map) {
+    final List<String> errors = <String>[];
+    final String? name = stringOfJson(map, 'name', errors);
+    final String? language = stringOfJson(map, 'language', errors);
+    final String? script = stringOfJson(map, 'script', errors);
+    final int? maxAttempts =
+        intOfJson(map, 'max_attempts', fallback: 1, errors);
+    final List<String>? parameters = stringListOfJson(
+      map,
+      'parameters',
+      errors,
+    );
+    if (name == null ||
+        language == null ||
+        script == null ||
+        maxAttempts == null ||
+        parameters == null) {
+      return TestTask._invalid(errors);
+    }
+    return TestTask._(name, language, script, maxAttempts, parameters);
+  }
+
+  TestTask._invalid(super.error)
+      : name = '',
+        language = '',
+        script = '',
+        maxAttempts = 0,
+        parameters = <String>[];
+
+  TestTask._(
+    this.name,
+    this.language,
+    this.script,
+    this.maxAttempts,
+    this.parameters,
+  ) : super(null);
+
+  /// The human readable name of the step running the script.
+  final String name;
+
+  /// The script language executable to run the script. If empty it is assumed
+  /// to be bash.
+  final String language;
+
+  /// The script path relative to the checkout repository.
+  final String script;
+
+  /// The maximum number of failures to tolerate. The default is 1.
+  final int maxAttempts;
+
+  /// The flags passed to the script. Paths referenced in the list are relative
+  /// to the checkout directory.
+  final List<String> parameters;
+}
+
+/// The objects that populate the list of global archives have fields like:
+/// {
+///     "source": "out/debug/artifacts.zip",
+///     "destination": "ios/artifacts.zip",
+///     "realm": "production"
+/// },
+final class GlobalArchive extends BuildConfigBase {
+  factory GlobalArchive.fromJson(Map<String, Object?> map) {
+    final List<String> errors = <String>[];
+    final String? source = stringOfJson(map, 'source', errors);
+    final String? destination = stringOfJson(map, 'destination', errors);
+    final String? realm = stringOfJson(map, 'realm', errors);
+    if (source == null || destination == null || realm == null) {
+      return GlobalArchive._invalid(errors);
+    }
+    return GlobalArchive._(source, destination, realm);
+  }
+
+  GlobalArchive._invalid(super.error)
+      : source = '',
+        destination = '',
+        realm = '';
+
+  GlobalArchive._(this.source, this.destination, this.realm) : super(null);
+
+  /// The path of the artifact relative to the engine checkout.
+  final String source;
+
+  /// The destination folder in the storage bucket.
+  final String destination;
+
+  /// Which storage bucket the destination path is relative to.
+  /// Either "production" or "experimental".
+  final String realm;
+}
+
+bool _canRunOn(List<String> droneDimensions, Platform platform) {
+  String? os;
+  for (final String dimension in droneDimensions) {
+    os ??= switch (dimension.split('=')) {
+      ['os', 'Linux'] => Platform.linux,
+      ['os', final String win] when win.startsWith('Windows') =>
+        Platform.windows,
+      ['os', final String mac] when mac.startsWith('Mac') => Platform.macOS,
+      _ => null,
+    };
+  }
+  return os == platform.operatingSystem;
+}
+
+void appendTypeError(
+  Map<String, Object?> map,
+  String field,
+  String expected,
+  List<String> errors, {
+  Object? element,
+}) {
+  if (element == null) {
+    final Type actual = map[field]!.runtimeType;
+    errors.add(
+      'For field "$field", expected type: $expected, actual type: $actual.',
+    );
+  } else {
+    final Type actual = element.runtimeType;
+    errors.add(
+      'For element "$element" of "$field", '
+      'expected type: $expected, actual type: $actual',
+    );
+  }
+}
+
+List<T>? objListOfJson<T>(
+  Map<String, Object?> map,
+  String field,
+  List<String> errors,
+  T Function(Map<String, Object?>) fn,
+) {
+  if (map[field] == null) {
+    return <T>[];
+  }
+  if (map[field]! is! List<Object?>) {
+    appendTypeError(map, field, 'list', errors);
+    return null;
+  }
+  for (final Object? obj in map[field]! as List<Object?>) {
+    if (obj is! Map<String, Object?>) {
+      appendTypeError(map, field, 'map', errors);
+      return null;
+    }
+  }
+  return (map[field]! as List<Object?>)
+      .cast<Map<String, Object?>>()
+      .map<T>(fn)
+      .toList();
+}
+
+List<String>? stringListOfJson(
+  Map<String, Object?> map,
+  String field,
+  List<String> errors,
+) {
+  if (map[field] == null) {
+    return <String>[];
+  }
+  if (map[field]! is! List<Object?>) {
+    appendTypeError(map, field, 'list', errors);
+    return null;
+  }
+  for (final Object? obj in map[field]! as List<Object?>) {
+    if (obj is! String) {
+      appendTypeError(map, field, element: obj, 'string', errors);
+      return null;
+    }
+  }
+  return (map[field]! as List<Object?>).cast<String>();
+}
+
+String? stringOfJson(
+  Map<String, Object?> map,
+  String field,
+  List<String> errors,
+) {
+  if (map[field] == null) {
+    return '<undef>';
+  }
+  if (map[field]! is! String) {
+    appendTypeError(map, field, 'string', errors);
+    return null;
+  }
+  return map[field]! as String;
+}
+
+int? intOfJson(
+  Map<String, Object?> map,
+  String field,
+  List<String> errors, {
+  int fallback = 0,
+}) {
+  if (map[field] == null) {
+    return fallback;
+  }
+  if (map[field]! is! int) {
+    appendTypeError(map, field, 'int', errors);
+    return null;
+  }
+  return map[field]! as int;
+}
diff --git a/tools/pkg/engine_build_configs/lib/src/build_config_loader.dart b/tools/pkg/engine_build_configs/lib/src/build_config_loader.dart
new file mode 100644
index 0000000000000000000000000000000000000000..ed522694d3dc315dadad8a35fc52f65707f3a315
--- /dev/null
+++ b/tools/pkg/engine_build_configs/lib/src/build_config_loader.dart
@@ -0,0 +1,72 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:convert' as convert;
+import 'dart:io' as io show Directory, File;
+
+import 'package:path/path.dart' as p;
+
+import 'build_config.dart';
+
+/// This is a utility class for reading all of the build configurations from
+/// a subdirectory of the engine repo. After building an instance of this class,
+/// the build configurations can be accessed on the [configs] getter.
+class BuildConfigLoader {
+  BuildConfigLoader({required this.buildConfigsDir});
+
+  /// Any errors encountered while parsing and loading the build config files
+  /// are accumulated in this list as strings. It should be checked for errors
+  /// after the first access to the [configs] getter.
+  final List<String> errors = <String>[];
+
+  /// The directory where the engine's build config .json files exist.
+  final io.Directory buildConfigsDir;
+
+  /// Walks [buildConfigsDir] looking for .json files, which it attempts to
+  /// parse as engine build configs. JSON parsing errors during this process
+  /// are added as strings to the [errors] list. That last should be checked
+  /// for errors after accessing this getter.
+  ///
+  /// The [BuilderConfig]s given by this getter should be further checked for
+  /// validity by calling `BuildConfig.check()` on each one. See
+  /// `bin/check.dart` for an example.
+  late final Map<String, BuilderConfig> configs = () {
+    return _parseAllBuildConfigs(buildConfigsDir);
+  }();
+
+  Map<String, BuilderConfig> _parseAllBuildConfigs(io.Directory dir) {
+    final Map<String, BuilderConfig> result = <String, BuilderConfig>{};
+    if (!dir.existsSync()) {
+      errors.add('${buildConfigsDir.path} does not exist.');
+      return result;
+    }
+    final List<io.File> jsonFiles = dir
+        .listSync(recursive: true)
+        .whereType<io.File>()
+        .where((io.File f) => f.path.endsWith('.json'))
+        .toList();
+    for (final io.File jsonFile in jsonFiles) {
+      final String basename = p.basename(jsonFile.path);
+      final String name = basename.substring(
+        0,
+        basename.length - 5,
+      );
+      final String jsonData = jsonFile.readAsStringSync();
+      final dynamic maybeJson;
+      try {
+        maybeJson = convert.jsonDecode(jsonData);
+      } on FormatException catch (e) {
+        errors.add('While parsing ${jsonFile.path}:\n$e');
+        continue;
+      }
+      if (maybeJson is! Map<String, Object?>) {
+        errors.add('${jsonFile.path} did not contain a json map.');
+        continue;
+      }
+      result[name] =
+          BuilderConfig.fromJson(path: jsonFile.path, map: maybeJson);
+    }
+    return result;
+  }
+}
diff --git a/tools/pkg/engine_build_configs/lib/src/build_config_runner.dart b/tools/pkg/engine_build_configs/lib/src/build_config_runner.dart
new file mode 100644
index 0000000000000000000000000000000000000000..d7760ff3180b9ee828c9c2b869c08bdba203034f
--- /dev/null
+++ b/tools/pkg/engine_build_configs/lib/src/build_config_runner.dart
@@ -0,0 +1,704 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'dart:convert';
+import 'dart:ffi' as ffi;
+import 'dart:io' as io show Directory, Process;
+
+import 'package:path/path.dart' as p;
+import 'package:platform/platform.dart';
+import 'package:process_runner/process_runner.dart';
+
+import 'build_config.dart';
+
+/// The base clase for events generated by a command.
+sealed class RunnerEvent {
+  RunnerEvent(this.name, this.command, this.timestamp);
+
+  /// The name of the task or command.
+  final String name;
+
+  /// The command and its arguments.
+  final List<String> command;
+
+  /// When the event happened.
+  final DateTime timestamp;
+}
+
+/// A [RunnerEvent] representing the start of a command.
+final class RunnerStart extends RunnerEvent {
+  RunnerStart(super.name, super.command, super.timestamp);
+
+  @override
+  String toString() {
+    return '[${_timestamp(timestamp)}][$name]: STARTING';
+  }
+}
+
+/// A [RunnerEvent] representing the progress of a started command.
+final class RunnerProgress extends RunnerEvent {
+  RunnerProgress(
+    super.name,
+    super.command,
+    super.timestamp,
+    this.what,
+    this.completed,
+    this.total,
+    this.done,
+  ) : percent = (completed * 100) / total;
+
+  /// What a command is currently working on, for example a build target or
+  /// the name of a test.
+  final String what;
+
+  /// The number of steps completed.
+  final int completed;
+
+  /// The total number of steps in the task.
+  final int total;
+
+  /// How close is the task to being completed, for example the proportion of
+  /// build targets that have finished building.
+  final double percent;
+
+  /// Whether the command is finished and this is the final progress event.
+  final bool done;
+
+  @override
+  String toString() {
+    final String ts = '[${_timestamp(timestamp)}]';
+    final String pct = '${percent.toStringAsFixed(1)}%';
+    return '$ts[$name]: $pct ($completed/$total) $what';
+  }
+}
+
+/// A [RunnerEvent] representing the result of a command.
+final class RunnerResult extends RunnerEvent {
+  RunnerResult(super.name, super.command, super.timestamp, this.result);
+
+  /// The resuilt of running the command.
+  final ProcessRunnerResult result;
+
+  /// Whether the command was successful.
+  late final bool ok = result.exitCode == 0;
+
+  @override
+  String toString() {
+    if (ok) {
+      return '[${_timestamp(timestamp)}][$name]: OK';
+    }
+    final StringBuffer buffer = StringBuffer();
+    buffer.writeln('[$timestamp][$name]: FAILED');
+    buffer.writeln('COMMAND:\n${command.join(' ')}');
+    buffer.writeln('STDOUT:\n${result.stdout}');
+    buffer.writeln('STDERR:\n${result.stderr}');
+    return buffer.toString();
+  }
+}
+
+final class RunnerError extends RunnerEvent {
+  RunnerError(super.name, super.command, super.timestamp, this.error);
+
+  /// An error message.
+  final String error;
+
+  @override
+  String toString() {
+    return '[${_timestamp(timestamp)}][$name]: ERROR: $error';
+  }
+}
+
+/// The type of a callback that handles [RunnerEvent]s while a [Runner]
+/// is executing its `run()` method.
+typedef RunnerEventHandler = void Function(RunnerEvent);
+
+/// An abstract base clase for running the various tasks that a build config
+/// specifies. Derived classes implement the `run()` method.
+sealed class Runner {
+  Runner(
+    this.platform,
+    this.processRunner,
+    this.abi,
+    this.engineSrcDir,
+    this.dryRun,
+  );
+
+  /// Information about the platform that hosts the runner.
+  final Platform platform;
+
+  /// Runs the subprocesses required to run the element of the build config.
+  final ProcessRunner processRunner;
+
+  /// The [Abi] of the host platform.
+  final ffi.Abi abi;
+
+  /// The src/ directory of the engine checkout.
+  final io.Directory engineSrcDir;
+
+  /// Whether only a dry run is required. Subprocesses will not be spawned.
+  final bool dryRun;
+
+  /// Uses the [processRunner] to run the commands specified by the build
+  /// config.
+  Future<bool> run(RunnerEventHandler eventHandler);
+
+  String _interpreter(String language) {
+    // Force python to be python3.
+    if (language.startsWith('python')) {
+      return 'python3';
+    }
+
+    // If the language is 'dart', return the Dart binary that is running this
+    // program.
+    if (language == 'dart') {
+      return platform.executable;
+    }
+
+    // Otherwise use the language verbatim as the interpreter.
+    return language;
+  }
+}
+
+final ProcessRunnerResult _dryRunResult = ProcessRunnerResult(
+  0, // exit code.
+  <int>[], // stdout.
+  <int>[], // stderr.
+  <int>[], // combined,
+  pid: 0, // pid,
+);
+
+/// The [Runner] for a [Build].
+///
+/// Runs the specified `gn` and `ninja` commands, followed by generator tasks,
+/// and finally tests.
+final class BuildRunner extends Runner {
+  BuildRunner({
+    Platform? platform,
+    ProcessRunner? processRunner,
+    ffi.Abi? abi,
+    required io.Directory engineSrcDir,
+    required this.build,
+    this.extraGnArgs = const <String>[],
+    this.extraNinjaArgs = const <String>[],
+    this.extraTestArgs = const <String>[],
+    this.runGn = true,
+    this.runNinja = true,
+    this.runGenerators = true,
+    this.runTests = true,
+    bool dryRun = false,
+  }) : super(
+          platform ?? const LocalPlatform(),
+          processRunner ?? ProcessRunner(),
+          abi ?? ffi.Abi.current(),
+          engineSrcDir,
+          dryRun,
+        );
+
+  /// The [Build] to run.
+  final Build build;
+
+  /// Extra arguments to append to the `gn` command.
+  final List<String> extraGnArgs;
+
+  /// Extra arguments to append to the `ninja` command.
+  final List<String> extraNinjaArgs;
+
+  /// Extra arguments to append to *all* test commands.
+  final List<String> extraTestArgs;
+
+  /// Whether to run the GN step. Defaults to true.
+  final bool runGn;
+
+  /// Whether to run the ninja step. Defaults to true.
+  final bool runNinja;
+
+  /// Whether to run the generators. Defaults to true.
+  final bool runGenerators;
+
+  /// Whether to run the test step. Defaults to true.
+  final bool runTests;
+
+  @override
+  Future<bool> run(RunnerEventHandler eventHandler) async {
+    if (!build.canRunOn(platform)) {
+      eventHandler(RunnerError(
+        build.name,
+        <String>[],
+        DateTime.now(),
+        'Build with drone_dimensions "{${build.droneDimensions.join(',')}}" '
+        'cannot run on platform ${platform.operatingSystem}',
+      ));
+      return false;
+    }
+
+    if (runGn) {
+      if (!await _runGn(eventHandler)) {
+        return false;
+      }
+    }
+
+    if (runNinja) {
+      if (!await _runNinja(eventHandler)) {
+        return false;
+      }
+    }
+
+    if (runGenerators) {
+      if (!await _runGenerators(eventHandler)) {
+        return false;
+      }
+    }
+
+    if (runTests) {
+      if (!await _runTests(eventHandler)) {
+        return false;
+      }
+    }
+
+    return true;
+  }
+
+  // GN arguments from the build config that can be overridden by extraGnArgs.
+  static const List<(String, String)> _overridableArgs = <(String, String)>[
+    ('--lto', '--no-lto'),
+    ('--rbe', '--no-rbe'),
+    ('--goma', '--no-goma'),
+  ];
+
+  // extraGnArgs overrides the build config args.
+  late final Set<String> _mergedGnArgs = () {
+    // Put the union of the build config args and extraGnArgs in gnArgs.
+    final Set<String> gnArgs = Set<String>.of(build.gn);
+    gnArgs.addAll(extraGnArgs);
+
+    // If extraGnArgs contains an arg, remove its opposite from gnArgs.
+    for (final (String, String) arg in _overridableArgs) {
+      if (extraGnArgs.contains(arg.$1)) {
+        gnArgs.remove(arg.$2);
+      }
+      if (extraGnArgs.contains(arg.$2)) {
+        gnArgs.remove(arg.$1);
+      }
+    }
+    return gnArgs;
+  }();
+
+  Future<bool> _runGn(RunnerEventHandler eventHandler) async {
+    final String gnPath = p.join(engineSrcDir.path, 'flutter', 'tools', 'gn');
+    final Set<String> gnArgs = _mergedGnArgs;
+    final List<String> command = <String>[gnPath, ...gnArgs];
+    eventHandler(RunnerStart('${build.name}: GN', command, DateTime.now()));
+    final ProcessRunnerResult processResult;
+    if (dryRun) {
+      processResult = _dryRunResult;
+    } else {
+      processResult = await processRunner.runProcess(
+        command,
+        workingDirectory: engineSrcDir,
+        failOk: true,
+      );
+    }
+    final RunnerResult result = RunnerResult(
+      '${build.name}: GN',
+      command,
+      DateTime.now(),
+      processResult,
+    );
+    eventHandler(result);
+    return result.ok;
+  }
+
+  late final String _hostCpu = () {
+    return switch (abi) {
+      ffi.Abi.linuxArm64 ||
+      ffi.Abi.macosArm64 ||
+      ffi.Abi.windowsArm64 =>
+        'arm64',
+      ffi.Abi.linuxX64 || ffi.Abi.macosX64 || ffi.Abi.windowsX64 => 'x64',
+      _ => throw StateError('This host platform "$abi" is not supported.'),
+    };
+  }();
+
+  late final String _buildtoolsPath = () {
+    final String os = platform.operatingSystem;
+    final String platformDir = switch (os) {
+      Platform.linux => 'linux-$_hostCpu',
+      Platform.macOS => 'mac-$_hostCpu',
+      Platform.windows => 'windows-$_hostCpu',
+      _ => throw StateError('This host OS "$os" is not supported.'),
+    };
+    return p.join(engineSrcDir.path, 'flutter', 'buildtools', platformDir);
+  }();
+
+  Future<bool> _bootstrapRbe(
+    RunnerEventHandler eventHandler, {
+    bool shutdown = false,
+  }) async {
+    final String reclientPath = p.join(_buildtoolsPath, 'reclient');
+    final String exe = platform.isWindows ? '.exe' : '';
+    final String bootstrapPath = p.join(reclientPath, 'bootstrap$exe');
+    final String reproxyPath = p.join(reclientPath, 'reproxy$exe');
+    final String os = platform.operatingSystem;
+    final String reclientConfigFile = switch (os) {
+      Platform.linux => 'reclient-linux.cfg',
+      Platform.macOS => 'reclient-mac.cfg',
+      Platform.windows => 'reclient-win.cfg',
+      _ => throw StateError('This host OS "$os" is not supported.'),
+    };
+    final String reclientConfigPath = p.join(
+      engineSrcDir.path,
+      'flutter',
+      'build',
+      'rbe',
+      reclientConfigFile,
+    );
+    final List<String> bootstrapCommand = <String>[
+      bootstrapPath,
+      '--re_proxy=$reproxyPath',
+      '--automatic_auth=true',
+      if (shutdown) '--shutdown' else ...<String>['--cfg=$reclientConfigPath'],
+    ];
+    if (!processRunner.processManager.canRun(bootstrapPath)) {
+      eventHandler(RunnerError(
+        build.name,
+        <String>[],
+        DateTime.now(),
+        '"$bootstrapPath" not found.',
+      ));
+      return false;
+    }
+    eventHandler(RunnerStart(
+      '${build.name}: RBE ${shutdown ? 'shutdown' : 'startup'}',
+      bootstrapCommand,
+      DateTime.now(),
+    ));
+    final ProcessRunnerResult bootstrapResult;
+    if (dryRun) {
+      bootstrapResult = _dryRunResult;
+    } else {
+      bootstrapResult = await processRunner.runProcess(
+        bootstrapCommand,
+        failOk: true,
+      );
+    }
+    eventHandler(RunnerResult(
+      '${build.name}: RBE ${shutdown ? 'shutdown' : 'startup'}',
+      bootstrapCommand,
+      DateTime.now(),
+      bootstrapResult,
+    ));
+    return bootstrapResult.exitCode == 0;
+  }
+
+  Future<bool> _runNinja(RunnerEventHandler eventHandler) async {
+    if (_isRbe) {
+      if (!await _bootstrapRbe(eventHandler)) {
+        return false;
+      }
+    }
+    bool success = false;
+    try {
+      final String ninjaPath = p.join(
+        engineSrcDir.path,
+        'flutter',
+        'third_party',
+        'ninja',
+        'ninja',
+      );
+      final String outDir = p.join(
+        engineSrcDir.path,
+        'out',
+        build.ninja.config,
+      );
+      final List<String> command = <String>[
+        ninjaPath,
+        '-C',
+        outDir,
+        if (_isGomaOrRbe) ...<String>['-j', '200'],
+        ...extraNinjaArgs,
+        ...build.ninja.targets,
+      ];
+      eventHandler(
+        RunnerStart('${build.name}: ninja', command, DateTime.now()),
+      );
+      final ProcessRunnerResult processResult;
+      if (dryRun) {
+        processResult = _dryRunResult;
+      } else {
+        final io.Process process = await processRunner.processManager.start(
+          command,
+          workingDirectory: engineSrcDir.path,
+        );
+        final List<int> stderrOutput = <int>[];
+        final List<int> stdoutOutput = <int>[];
+        final Completer<void> stdoutComplete = Completer<void>();
+        final Completer<void> stderrComplete = Completer<void>();
+
+        process.stdout
+            .transform<String>(const Utf8Decoder())
+            .transform(const LineSplitter())
+            .listen(
+          (String line) {
+            if (_ninjaProgress(eventHandler, command, line)) {
+              return;
+            }
+            final List<int> bytes = utf8.encode('$line\n');
+            stdoutOutput.addAll(bytes);
+          },
+          onDone: () async => stdoutComplete.complete(),
+        );
+
+        process.stderr.listen(
+          stderrOutput.addAll,
+          onDone: () async => stderrComplete.complete(),
+        );
+
+        await Future.wait<void>(<Future<void>>[
+          stdoutComplete.future,
+          stderrComplete.future,
+        ]);
+        final int exitCode = await process.exitCode;
+
+        processResult = ProcessRunnerResult(
+          exitCode,
+          stdoutOutput, // stdout.
+          stderrOutput, // stderr.
+          <int>[], // combined,
+          pid: process.pid, // pid,
+        );
+      }
+      eventHandler(RunnerResult(
+        '${build.name}: ninja',
+        command,
+        DateTime.now(),
+        processResult,
+      ));
+      success = processResult.exitCode == 0;
+    } finally {
+      if (_isRbe) {
+        // Ignore failures to shutdown.
+        await _bootstrapRbe(eventHandler, shutdown: true);
+      }
+    }
+    return success;
+  }
+
+  // Parse lines of the form '[6232/6269] LINK ./accessibility_unittests'.
+  // Returns false if the line is not a ninja progress line.
+  bool _ninjaProgress(
+    RunnerEventHandler eventHandler,
+    List<String> command,
+    String line,
+  ) {
+    // Grab the '[6232/6269]' part.
+    final String maybeProgress = line.split(' ')[0];
+    if (maybeProgress.length < 3 ||
+        maybeProgress[0] != '[' ||
+        maybeProgress[maybeProgress.length - 1] != ']') {
+      return false;
+    }
+    // Extract the two numbers by stripping the '[' and ']' and splitting on
+    // the '/'.
+    final List<String> progress =
+        maybeProgress.substring(1, maybeProgress.length - 1).split('/');
+    if (progress.length < 2) {
+      return false;
+    }
+    final int? completed = int.tryParse(progress[0]);
+    final int? total = int.tryParse(progress[1]);
+    if (completed == null || total == null) {
+      return false;
+    }
+    eventHandler(RunnerProgress(
+      '${build.name}: ninja',
+      command,
+      DateTime.now(),
+      line.replaceFirst(maybeProgress, '').trim(),
+      completed,
+      total,
+      completed == total, // True when done.
+    ));
+    return true;
+  }
+
+  late final bool _isGoma = _mergedGnArgs.contains('--goma');
+  late final bool _isRbe = _mergedGnArgs.contains('--rbe');
+  late final bool _isGomaOrRbe = _isGoma || _isRbe;
+
+  Future<bool> _runGenerators(RunnerEventHandler eventHandler) async {
+    for (final BuildTask task in build.generators) {
+      final BuildTaskRunner runner = BuildTaskRunner(
+        processRunner: processRunner,
+        platform: platform,
+        abi: abi,
+        engineSrcDir: engineSrcDir,
+        task: task,
+        dryRun: dryRun,
+      );
+      if (!await runner.run(eventHandler)) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  Future<bool> _runTests(RunnerEventHandler eventHandler) async {
+    for (final BuildTest test in build.tests) {
+      final BuildTestRunner runner = BuildTestRunner(
+        processRunner: processRunner,
+        platform: platform,
+        abi: abi,
+        engineSrcDir: engineSrcDir,
+        test: test,
+        extraTestArgs: extraTestArgs,
+        dryRun: dryRun,
+      );
+      if (!await runner.run(eventHandler)) {
+        return false;
+      }
+    }
+    return true;
+  }
+}
+
+/// The [Runner] for a [BuildTask] of a generator of a [Build].
+final class BuildTaskRunner extends Runner {
+  BuildTaskRunner({
+    Platform? platform,
+    ProcessRunner? processRunner,
+    ffi.Abi? abi,
+    required io.Directory engineSrcDir,
+    required this.task,
+    bool dryRun = false,
+  }) : super(
+          platform ?? const LocalPlatform(),
+          processRunner ?? ProcessRunner(),
+          abi ?? ffi.Abi.current(),
+          engineSrcDir,
+          dryRun,
+        );
+
+  /// The task to run.
+  final BuildTask task;
+
+  @override
+  Future<bool> run(RunnerEventHandler eventHandler) async {
+    final String interpreter = _interpreter(task.language);
+    for (final String script in task.scripts) {
+      final List<String> command = <String>[
+        if (interpreter.isNotEmpty) interpreter,
+        script,
+        ...task.parameters,
+      ];
+      eventHandler(RunnerStart(task.name, command, DateTime.now()));
+      final ProcessRunnerResult processResult;
+      if (dryRun) {
+        processResult = _dryRunResult;
+      } else {
+        processResult = await processRunner.runProcess(
+          command,
+          workingDirectory: engineSrcDir,
+          failOk: true,
+        );
+      }
+      final RunnerResult result = RunnerResult(
+        task.name,
+        command,
+        DateTime.now(),
+        processResult,
+      );
+      eventHandler(result);
+      if (!result.ok) {
+        return false;
+      }
+    }
+    return true;
+  }
+}
+
+/// The [Runner] for a [BuildTest] of a [Build].
+final class BuildTestRunner extends Runner {
+  BuildTestRunner({
+    Platform? platform,
+    ProcessRunner? processRunner,
+    ffi.Abi? abi,
+    required io.Directory engineSrcDir,
+    required this.test,
+    this.extraTestArgs = const <String>[],
+    bool dryRun = false,
+  }) : super(
+          platform ?? const LocalPlatform(),
+          processRunner ?? ProcessRunner(),
+          abi ?? ffi.Abi.current(),
+          engineSrcDir,
+          dryRun,
+        );
+
+  /// The test to run.
+  final BuildTest test;
+
+  /// Extra arguments to append to the test command.
+  final List<String> extraTestArgs;
+
+  @override
+  Future<bool> run(RunnerEventHandler eventHandler) async {
+    final String interpreter = _interpreter(test.language);
+    final List<String> command = <String>[
+      if (interpreter.isNotEmpty) interpreter,
+      test.script,
+      ...test.parameters,
+      ...extraTestArgs,
+    ];
+    eventHandler(RunnerStart(test.name, command, DateTime.now()));
+    final ProcessRunnerResult processResult;
+    if (dryRun) {
+      processResult = _dryRunResult;
+    } else {
+      // TODO(zanderso): We could detect here that we're running e.g. C++ unit
+      // tests via run_tests.py, and parse the stdout to generate RunnerProgress
+      // events.
+      processResult = await processRunner.runProcess(
+        command,
+        workingDirectory: engineSrcDir,
+        failOk: true,
+        printOutput: true,
+      );
+    }
+    final RunnerResult result = RunnerResult(
+      test.name,
+      command,
+      DateTime.now(),
+      processResult,
+    );
+    eventHandler(result);
+    return result.ok;
+  }
+}
+
+String _timestamp(DateTime time) {
+  String threeDigits(int n) {
+    return switch (n) {
+      >= 100 => '$n',
+      >= 10 => '0$n',
+      _ => '00$n',
+    };
+  }
+
+  String twoDigits(int n) {
+    return switch (n) {
+      >= 10 => '$n',
+      _ => '0$n',
+    };
+  }
+
+  final String y = time.year.toString();
+  final String m = twoDigits(time.month);
+  final String d = twoDigits(time.day);
+  final String hh = twoDigits(time.hour);
+  final String mm = twoDigits(time.minute);
+  final String ss = twoDigits(time.second);
+  final String ms = threeDigits(time.millisecond);
+  return '$y-$m-${d}T$hh:$mm:$ss.$ms${time.isUtc ? 'Z' : ''}';
+}
diff --git a/tools/pkg/engine_build_configs/lib/src/ci_yaml.dart b/tools/pkg/engine_build_configs/lib/src/ci_yaml.dart
new file mode 100644
index 0000000000000000000000000000000000000000..94a2e36ee055ef3c1d6e3f1e876813e8c9482367
--- /dev/null
+++ b/tools/pkg/engine_build_configs/lib/src/ci_yaml.dart
@@ -0,0 +1,221 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:yaml/yaml.dart' as y;
+
+// This file contains classes for parsing information about CI configuration
+// from the .ci.yaml file at the root of the flutter/engine repository.
+// The meanings of the sections and fields are documented at:
+//
+// https://github.com/flutter/cocoon/blob/main/CI_YAML.md
+//
+// The classes here don't parse every possible field, but rather only those that
+// are useful for working locally in the engine repo.
+
+const String _targetsField = 'targets';
+const String _nameField = 'name';
+const String _recipeField = 'recipe';
+const String _propertiesField = 'properties';
+const String _configNameField = 'config_name';
+
+/// A class containing the information deserialized from the .ci.yaml file.
+///
+/// The file contains three sections. "enabled_branches", "platform_properties",
+/// and "targets". The "enabled_branches" section is not meaningful when working
+/// locally. The configurations listed in the "targets" section inherit
+/// properties listed in the "platform_properties" section depending on their
+/// names. The configurations listed in the "targets" section are the names,
+/// recipes, build configs, etc. of the builders in CI.
+class CiConfig {
+  /// Builds a [CiConfig] instance from parsed yaml data.
+  ///
+  /// If the yaml was malformed, then `CiConfig.valid` will be false, and
+  /// `CiConfig.error` will be populated with an informative error message.
+  /// Otherwise, `CiConfig.ciTargets` will contain a mapping from target name
+  /// to [CiTarget] instance.
+  factory CiConfig.fromYaml(y.YamlNode yaml) {
+    if (yaml is! y.YamlMap) {
+      final String error = yaml.span.message('Expected a map');
+      return CiConfig._error(error);
+    }
+    final y.YamlMap ymap = yaml;
+    final y.YamlNode? targetsNode = ymap.nodes[_targetsField];
+    if (targetsNode == null) {
+      final String error = ymap.span.message('Expected a "$_targetsField" key');
+      return CiConfig._error(error);
+    }
+    if (targetsNode is! y.YamlList) {
+      final String error = targetsNode.span.message(
+        'Expected "$_targetsField" to be a list.',
+      );
+      return CiConfig._error(error);
+    }
+    final y.YamlList targetsList = targetsNode;
+
+    final Map<String, CiTarget> result = <String, CiTarget>{};
+    for (final y.YamlNode yamlTarget in targetsList.nodes) {
+      final CiTarget target = CiTarget.fromYaml(yamlTarget);
+      if (!target.valid) {
+        return CiConfig._error(target.error);
+      }
+      result[target.name] = target;
+    }
+
+    return CiConfig._(ciTargets: result);
+  }
+
+  CiConfig._({
+    required this.ciTargets,
+  }) : error = null;
+
+  CiConfig._error(
+    this.error,
+  ) : ciTargets = <String, CiTarget>{};
+
+  /// Information about CI builder configurations, which .ci.yaml calls
+  /// "targets".
+  final Map<String, CiTarget> ciTargets;
+
+  /// An error message when this instance is invalid.
+  final String? error;
+
+  /// Whether this is a valid instance.
+  late final bool valid = error == null;
+}
+
+/// Information about the configuration of a builder on CI, which .ci.yaml
+/// calls a "target".
+class CiTarget {
+  /// Builds a [CiTarget] from parsed yaml data.
+  ///
+  /// If the yaml was malformed then `CiTarget.valid` is false and
+  /// `CiTarget.error` contains a useful error message. Otherwise, the other
+  /// fields contain information about the target.
+  factory CiTarget.fromYaml(y.YamlNode yaml) {
+    if (yaml is! y.YamlMap) {
+      final String error = yaml.span.message('Expected a map.');
+      return CiTarget._error(error);
+    }
+    final y.YamlMap targetMap = yaml;
+    final String? name = _stringOfNode(targetMap.nodes[_nameField]);
+    if (name == null) {
+      final String error = targetMap.span.message(
+        'Expected map to contain a string value for key "$_nameField".',
+      );
+      return CiTarget._error(error);
+    }
+
+    final String? recipe = _stringOfNode(targetMap.nodes[_recipeField]);
+    if (recipe == null) {
+      final String error = targetMap.span.message(
+        'Expected map to contain a string value for key "$_recipeField".',
+      );
+      return CiTarget._error(error);
+    }
+
+    final y.YamlNode? propertiesNode = targetMap.nodes[_propertiesField];
+    if (propertiesNode == null) {
+      final String error = targetMap.span.message(
+        'Expected map to contain a string value for key "$_propertiesField".',
+      );
+      return CiTarget._error(error);
+    }
+    final CiTargetProperties properties = CiTargetProperties.fromYaml(
+      propertiesNode,
+    );
+    if (!properties.valid) {
+      return CiTarget._error(properties.error);
+    }
+
+    return CiTarget._(
+      name: name,
+      recipe: recipe,
+      properties: properties,
+    );
+  }
+
+  CiTarget._({
+    required this.name,
+    required this.recipe,
+    required this.properties,
+  }) : error = null;
+
+  CiTarget._error(
+    this.error,
+  ) : name = '',
+      recipe = '',
+      properties = CiTargetProperties._error('Invalid');
+
+  /// The name of the builder in CI.
+  final String name;
+
+  /// The CI recipe used to run the build.
+  final String recipe;
+
+  /// The properties of the build or builder.
+  final CiTargetProperties properties;
+
+  /// An error message when this instance is invalid.
+  final String? error;
+
+  /// Whether this is a valid instance.
+  late final bool valid = error == null;
+}
+
+/// Various properties of a [CiTarget].
+class CiTargetProperties {
+  /// Builds a [CiTargetProperties] instance from parsed yaml data.
+  ///
+  /// If the yaml was malformed then `CiTargetProperties.valid` is false and
+  /// `CiTargetProperties.error` contains a useful error message. Otherwise, the
+  /// other fields contain information about the target properties.
+  factory CiTargetProperties.fromYaml(y.YamlNode yaml) {
+    if (yaml is! y.YamlMap) {
+      final String error = yaml.span.message(
+        'Expected "$_propertiesField" to be a map.',
+      );
+      return CiTargetProperties._error(error);
+    }
+    final y.YamlMap propertiesMap = yaml;
+    final String? configName = _stringOfNode(
+      propertiesMap.nodes[_configNameField],
+    );
+    return CiTargetProperties._(
+      configName: configName ?? '',
+    );
+  }
+
+  CiTargetProperties._({
+    required this.configName,
+  }) : error = null;
+
+  CiTargetProperties._error(
+    this.error,
+  ) : configName = '';
+
+  /// The name of the build configuration. If the containing [CiTarget] instance
+  /// is using the engine_v2 recipes, then this name is the same as the name
+  /// of the build config json file under ci/builders.
+  final String configName;
+
+  /// An error message when this instance is invalid.
+  final String? error;
+
+  /// Whether this is a valid instance.
+  late final bool valid = error == null;
+}
+
+String? _stringOfNode(y.YamlNode? stringNode) {
+  if (stringNode == null) {
+    return null;
+  }
+  if (stringNode is! y.YamlScalar) {
+    return null;
+  }
+  final y.YamlScalar stringScalar = stringNode;
+  if (stringScalar.value is! String) {
+    return null;
+  }
+  return stringScalar.value as String;
+}
diff --git a/tools/pkg/engine_build_configs/pubspec.yaml b/tools/pkg/engine_build_configs/pubspec.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..07297d29dd9e93a282f273db782b41a46d42a588
--- /dev/null
+++ b/tools/pkg/engine_build_configs/pubspec.yaml
@@ -0,0 +1,73 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+name: engine_build_configs
+publish_to: none
+environment:
+  sdk: '>=3.2.0-0 <4.0.0'
+
+# Do not add any dependencies that require more than what is provided in
+# //third_party/pkg, //third_party/dart/pkg, or
+# //third_party/dart/third_party/pkg. In particular, package:test is not usable
+# here.
+
+# If you do add packages here, make sure you can run `pub get --offline`, and
+# check the .packages and .package_config to make sure all the paths are
+# relative to this directory into //third_party/dart
+
+dependencies:
+  args: any
+  engine_repo_tools:
+    path: ../engine_repo_tools
+  file: any
+  meta: any
+  path: any
+  platform: any
+  process_runner: any
+  yaml: any
+
+dev_dependencies:
+  async_helper: any
+  expect: any
+  litetest: any
+  process_fakes:
+    path: ../process_fakes
+  smith: any
+  source_span: any
+
+dependency_overrides:
+  args:
+    path: ../../../../third_party/dart/third_party/pkg/args
+  async:
+    path: ../../../../third_party/dart/third_party/pkg/async
+  async_helper:
+    path: ../../../../third_party/dart/pkg/async_helper
+  collection:
+    path: ../../../../third_party/dart/third_party/pkg/collection
+  expect:
+    path: ../../../../third_party/dart/pkg/expect
+  file:
+    path: ../../../../third_party/dart/third_party/pkg/file/packages/file
+  litetest:
+    path: ../../../testing/litetest
+  meta:
+    path: ../../../../third_party/dart/pkg/meta
+  path:
+    path: ../../../../third_party/dart/third_party/pkg/path
+  platform:
+    path: ../../../third_party/pkg/platform
+  process:
+    path: ../../../third_party/pkg/process
+  process_runner:
+    path: ../../../third_party/pkg/process_runner
+  smith:
+    path: ../../../../third_party/dart/pkg/smith
+  source_span:
+    path: ../../../../third_party/dart/third_party/pkg/source_span
+  string_scanner:
+    path: ../../../../third_party/dart/third_party/pkg/string_scanner
+  term_glyph:
+    path: ../../../../third_party/dart/third_party/pkg/term_glyph
+  yaml:
+    path: ../../../../third_party/dart/third_party/pkg/yaml
diff --git a/tools/pkg/engine_build_configs/test/build_config_loader_test.dart b/tools/pkg/engine_build_configs/test/build_config_loader_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..d0ba235ea214a2caccc0f2f7affd3b5e6c04e94a
--- /dev/null
+++ b/tools/pkg/engine_build_configs/test/build_config_loader_test.dart
@@ -0,0 +1,55 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:engine_build_configs/src/build_config.dart';
+import 'package:engine_build_configs/src/build_config_loader.dart';
+import 'package:file/file.dart';
+import 'package:file/memory.dart';
+import 'package:litetest/litetest.dart';
+
+import 'fixtures.dart' as fixtures;
+
+int main() {
+  test('BuildConfigLoader can load a build config', () {
+    final FileSystem fs = MemoryFileSystem();
+    final String buildConfigPath = fs.path.join('flutter', 'ci', 'builders');
+    final Directory buildConfigsDir = fs.directory(buildConfigPath);
+    final File buildConfigFile = buildConfigsDir.childFile(
+      'linux_test_build.json',
+    );
+    buildConfigFile.create(recursive: true);
+    buildConfigFile.writeAsStringSync(fixtures.buildConfigJson);
+
+    final BuildConfigLoader loader = BuildConfigLoader(
+      buildConfigsDir: buildConfigsDir,
+    );
+
+    expect(loader.configs, isNotNull);
+    expect(loader.errors, isEmpty);
+    expect(loader.configs['linux_test_build'], isNotNull);
+  });
+
+  test('BuildConfigLoader gives an empty config when no configs found', () {
+    final FileSystem fs = MemoryFileSystem();
+    final String buildConfigPath = fs.path.join(
+      'flutter',
+      'ci',
+      'builders',
+      'linux_test_build.json',
+    );
+    final Directory buildConfigsDir = fs.directory(buildConfigPath);
+    final BuildConfigLoader loader = BuildConfigLoader(
+      buildConfigsDir: buildConfigsDir,
+    );
+
+    expect(loader.configs, isNotNull);
+    expect(
+        loader.errors[0],
+        equals(
+          'flutter/ci/builders/linux_test_build.json does not exist.',
+        ));
+    expect(loader.configs, equals(<String, BuilderConfig>{}));
+  });
+  return 0;
+}
diff --git a/tools/pkg/engine_build_configs/test/build_config_runner_test.dart b/tools/pkg/engine_build_configs/test/build_config_runner_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..b6dce147f0219a606b731e8f7324933d06a4353e
--- /dev/null
+++ b/tools/pkg/engine_build_configs/test/build_config_runner_test.dart
@@ -0,0 +1,639 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:convert' as convert;
+import 'dart:ffi' as ffi;
+import 'dart:io' as io;
+
+import 'package:engine_build_configs/src/build_config.dart';
+import 'package:engine_build_configs/src/build_config_runner.dart';
+import 'package:engine_repo_tools/engine_repo_tools.dart';
+import 'package:litetest/litetest.dart';
+import 'package:platform/platform.dart';
+import 'package:process_fakes/process_fakes.dart';
+import 'package:process_runner/process_runner.dart';
+
+import 'fixtures.dart' as fixtures;
+
+void main() {
+  // Find the engine repo.
+  final Engine engine;
+  try {
+    engine = Engine.findWithin();
+  } catch (e) {
+    io.stderr.writeln(e);
+    io.exitCode = 1;
+    return;
+  }
+
+  final BuilderConfig buildConfig = BuilderConfig.fromJson(
+    path: 'linux_test_config',
+    map: convert.jsonDecode(fixtures.buildConfigJson) as Map<String, Object?>,
+  );
+
+  test('BuildTaskRunner runs the right commands', () async {
+    final BuildTask generator = buildConfig.builds[0].generators[0];
+    final BuildTaskRunner taskRunner = BuildTaskRunner(
+      platform: FakePlatform(operatingSystem: Platform.linux),
+      processRunner: ProcessRunner(
+        // dryRun should not try to spawn any processes.
+        processManager: _fakeProcessManager(),
+      ),
+      abi: ffi.Abi.linuxX64,
+      engineSrcDir: engine.srcDir,
+      task: generator,
+      dryRun: true,
+    );
+    final List<RunnerEvent> events = <RunnerEvent>[];
+    void handler(RunnerEvent event) => events.add(event);
+    final bool runResult = await taskRunner.run(handler);
+
+    expect(runResult, isTrue);
+    expect(events[0] is RunnerStart, isTrue);
+    expect(events[0].name, equals('generator_task'));
+    expect(events[0].command[0], contains('python3'));
+    expect(events[0].command[1], contains('gen/script.py'));
+    expect(events[0].command[2], contains('--gen-param'));
+    expect(events[1] is RunnerResult, isTrue);
+    expect(events[1].name, equals('generator_task'));
+  });
+
+  test('BuildTestRunner runs the right commands', () async {
+    final BuildTest test = buildConfig.builds[0].tests[0];
+    final BuildTestRunner testRunner = BuildTestRunner(
+      platform: FakePlatform(operatingSystem: Platform.linux),
+      processRunner: ProcessRunner(
+        // dryRun should not try to spawn any processes.
+        processManager: _fakeProcessManager(),
+      ),
+      abi: ffi.Abi.linuxX64,
+      engineSrcDir: engine.srcDir,
+      test: test,
+      dryRun: true,
+    );
+    final List<RunnerEvent> events = <RunnerEvent>[];
+    void handler(RunnerEvent event) => events.add(event);
+    final bool runResult = await testRunner.run(handler);
+
+    expect(runResult, isTrue);
+
+    // Check that the events for the tests are correct.
+    expect(events[0] is RunnerStart, isTrue);
+    expect(events[0].name, equals('build_name tests'));
+    expect(events[0].command[0], contains('python3'));
+    expect(events[0].command[1], contains('test/script.py'));
+    expect(events[0].command[2], contains('--test-params'));
+    expect(events[1] is RunnerResult, isTrue);
+    expect(events[1].name, equals('build_name tests'));
+  });
+
+  test('GlobalBuildRunner runs the right commands', () async {
+    final Build targetBuild = buildConfig.builds[0];
+    final BuildRunner buildRunner = BuildRunner(
+      platform: FakePlatform(operatingSystem: Platform.linux),
+      processRunner: ProcessRunner(
+        // dryRun should not try to spawn any processes.
+        processManager: _fakeProcessManager(),
+      ),
+      abi: ffi.Abi.linuxX64,
+      engineSrcDir: engine.srcDir,
+      build: targetBuild,
+      dryRun: true,
+    );
+    final List<RunnerEvent> events = <RunnerEvent>[];
+    void handler(RunnerEvent event) => events.add(event);
+    final bool runResult = await buildRunner.run(handler);
+
+    final String buildName = targetBuild.name;
+
+    expect(runResult, isTrue);
+
+    // Check that the events for the GN command are correct.
+    expect(events[0] is RunnerStart, isTrue);
+    expect(events[0].name, equals('$buildName: GN'));
+    expect(events[0].command[0], contains('flutter/tools/gn'));
+    for (final String gnArg in targetBuild.gn) {
+      expect(events[0].command.contains(gnArg), isTrue);
+    }
+    expect(events[1] is RunnerResult, isTrue);
+    expect(events[1].name, equals('$buildName: GN'));
+
+    // Check that the events for the Ninja command are correct.
+    expect(events[2] is RunnerStart, isTrue);
+    expect(events[2].name, equals('$buildName: ninja'));
+    expect(events[2].command[0], contains('ninja'));
+    final String configPath =
+        '${engine.srcDir.path}/out/${targetBuild.ninja.config}';
+    expect(events[2].command.contains(configPath), isTrue);
+    for (final String target in targetBuild.ninja.targets) {
+      expect(events[2].command.contains(target), isTrue);
+    }
+    expect(events[3] is RunnerResult, isTrue);
+    expect(events[3].name, equals('$buildName: ninja'));
+
+    // Check that the events for generators are correct.
+    expect(events[4] is RunnerStart, isTrue);
+    expect(events[4].name, equals('generator_task'));
+    expect(events[4].command[0], contains('python3'));
+    expect(events[4].command[1], contains('gen/script.py'));
+    expect(events[4].command[2], contains('--gen-param'));
+    expect(events[5] is RunnerResult, isTrue);
+    expect(events[5].name, equals('generator_task'));
+
+    // Check that the events for the tests are correct.
+    expect(events[6] is RunnerStart, isTrue);
+    expect(events[6].name, equals('$buildName tests'));
+    expect(events[6].command[0], contains('python3'));
+    expect(events[6].command[1], contains('test/script.py'));
+    expect(events[6].command[2], contains('--test-params'));
+    expect(events[7] is RunnerResult, isTrue);
+    expect(events[7].name, equals('$buildName tests'));
+  });
+
+  test('GlobalBuildRunner extra args are propagated correctly', () async {
+    final Build targetBuild = buildConfig.builds[0];
+    final BuildRunner buildRunner = BuildRunner(
+      platform: FakePlatform(operatingSystem: Platform.linux),
+      processRunner: ProcessRunner(
+        // dryRun should not try to spawn any processes.
+        processManager: _fakeProcessManager(),
+      ),
+      abi: ffi.Abi.linuxX64,
+      engineSrcDir: engine.srcDir,
+      build: targetBuild,
+      extraGnArgs: <String>['--extra-gn-arg'],
+      extraNinjaArgs: <String>['--extra-ninja-arg'],
+      extraTestArgs: <String>['--extra-test-arg'],
+      dryRun: true,
+    );
+    final List<RunnerEvent> events = <RunnerEvent>[];
+    void handler(RunnerEvent event) => events.add(event);
+    final bool runResult = await buildRunner.run(handler);
+
+    final String buildName = targetBuild.name;
+
+    expect(runResult, isTrue);
+
+    // Check that the events for the GN command are correct.
+    expect(events[0] is RunnerStart, isTrue);
+    expect(events[0].name, equals('$buildName: GN'));
+    expect(events[0].command.contains('--extra-gn-arg'), isTrue);
+
+    // Check that the events for the Ninja command are correct.
+    expect(events[2] is RunnerStart, isTrue);
+    expect(events[2].name, equals('$buildName: ninja'));
+    expect(events[2].command.contains('--extra-ninja-arg'), isTrue);
+
+    // Check that the events for the tests are correct.
+    expect(events[6] is RunnerStart, isTrue);
+    expect(events[6].name, equals('$buildName tests'));
+    expect(events[6].command.contains('--extra-test-arg'), isTrue);
+  });
+
+  test('GlobalBuildRunner passes large -j for a goma build', () async {
+    final Build targetBuild = buildConfig.builds[0];
+    final BuildRunner buildRunner = BuildRunner(
+      platform: FakePlatform(operatingSystem: Platform.linux),
+      processRunner: ProcessRunner(
+        // dryRun should not try to spawn any processes.
+        processManager: _fakeProcessManager(),
+      ),
+      abi: ffi.Abi.linuxX64,
+      engineSrcDir: engine.srcDir,
+      build: targetBuild,
+      extraGnArgs: <String>['--goma'],
+      dryRun: true,
+    );
+    final List<RunnerEvent> events = <RunnerEvent>[];
+    void handler(RunnerEvent event) => events.add(event);
+    final bool runResult = await buildRunner.run(handler);
+
+    final String buildName = targetBuild.name;
+
+    expect(runResult, isTrue);
+
+    // Check that the events for the Ninja command are correct.
+    expect(events[2] is RunnerStart, isTrue);
+    expect(events[2].name, equals('$buildName: ninja'));
+    expect(events[2].command.contains('-j'), isTrue);
+    expect(events[2].command.contains('200'), isTrue);
+  });
+
+  test('GlobalBuildRunner passes large -j for an rbe build', () async {
+    final Build targetBuild = buildConfig.builds[0];
+    final BuildRunner buildRunner = BuildRunner(
+      platform: FakePlatform(operatingSystem: Platform.linux),
+      processRunner: ProcessRunner(
+        processManager: _fakeProcessManager(),
+      ),
+      abi: ffi.Abi.linuxX64,
+      engineSrcDir: engine.srcDir,
+      build: targetBuild,
+      extraGnArgs: <String>['--rbe'],
+      dryRun: true,
+    );
+    final List<RunnerEvent> events = <RunnerEvent>[];
+    void handler(RunnerEvent event) => events.add(event);
+    final bool runResult = await buildRunner.run(handler);
+
+    final String buildName = targetBuild.name;
+
+    expect(runResult, isTrue);
+
+    // Check that the events for the RBE bootstrap command are correct.
+    expect(events[2] is RunnerStart, isTrue);
+    expect(events[2].name, equals('$buildName: RBE startup'));
+    expect(events[3] is RunnerResult, isTrue);
+    expect(events[3].name, equals('$buildName: RBE startup'));
+
+    // Check that the events for the Ninja command are correct.
+    expect(events[4] is RunnerStart, isTrue);
+    expect(events[4].name, equals('$buildName: ninja'));
+    expect(events[4].command.contains('-j'), isTrue);
+    expect(events[4].command.contains('200'), isTrue);
+    expect(events[5] is RunnerResult, isTrue);
+    expect(events[5].name, equals('$buildName: ninja'));
+
+    expect(events[6] is RunnerStart, isTrue);
+    expect(events[6].name, equals('$buildName: RBE shutdown'));
+    expect(events[7] is RunnerResult, isTrue);
+    expect(events[7].name, equals('$buildName: RBE shutdown'));
+  });
+
+  test('GlobalBuildRunner skips GN when runGn is false', () async {
+    final Build targetBuild = buildConfig.builds[0];
+    final BuildRunner buildRunner = BuildRunner(
+      platform: FakePlatform(operatingSystem: Platform.linux),
+      processRunner: ProcessRunner(
+        // dryRun should not try to spawn any processes.
+        processManager: _fakeProcessManager(),
+      ),
+      abi: ffi.Abi.linuxX64,
+      engineSrcDir: engine.srcDir,
+      build: targetBuild,
+      runGn: false,
+      dryRun: true,
+    );
+    final List<RunnerEvent> events = <RunnerEvent>[];
+    void handler(RunnerEvent event) => events.add(event);
+    final bool runResult = await buildRunner.run(handler);
+
+    final String buildName = targetBuild.name;
+
+    expect(runResult, isTrue);
+
+    // Check that the events for the Ninja command are correct.
+    expect(events[0] is RunnerStart, isTrue);
+    expect(events[0].name, equals('$buildName: ninja'));
+    expect(events[0].command[0], contains('ninja'));
+    final String configPath =
+        '${engine.srcDir.path}/out/${targetBuild.ninja.config}';
+    expect(events[0].command.contains(configPath), isTrue);
+    for (final String target in targetBuild.ninja.targets) {
+      expect(events[0].command.contains(target), isTrue);
+    }
+    expect(events[1] is RunnerResult, isTrue);
+    expect(events[1].name, equals('$buildName: ninja'));
+  });
+
+  test('GlobalBuildRunner skips Ninja when runNinja is false', () async {
+    final Build targetBuild = buildConfig.builds[0];
+    final BuildRunner buildRunner = BuildRunner(
+      platform: FakePlatform(operatingSystem: Platform.linux),
+      processRunner: ProcessRunner(
+        // dryRun should not try to spawn any processes.
+        processManager: _fakeProcessManager(),
+      ),
+      abi: ffi.Abi.linuxX64,
+      engineSrcDir: engine.srcDir,
+      build: targetBuild,
+      runNinja: false,
+      dryRun: true,
+    );
+    final List<RunnerEvent> events = <RunnerEvent>[];
+    void handler(RunnerEvent event) => events.add(event);
+    final bool runResult = await buildRunner.run(handler);
+
+    final String buildName = targetBuild.name;
+
+    expect(runResult, isTrue);
+
+    // Check that the events for the GN command are correct.
+    expect(events[0] is RunnerStart, isTrue);
+    expect(events[0].name, equals('$buildName: GN'));
+    expect(events[0].command[0], contains('flutter/tools/gn'));
+    for (final String gnArg in targetBuild.gn) {
+      expect(events[0].command.contains(gnArg), isTrue);
+    }
+    expect(events[1] is RunnerResult, isTrue);
+    expect(events[1].name, equals('$buildName: GN'));
+
+    // Check that the events for generators are correct.
+    expect(events[2] is RunnerStart, isTrue);
+    expect(events[2].name, equals('generator_task'));
+    expect(events[2].command[0], contains('python3'));
+    expect(events[2].command[1], contains('gen/script.py'));
+    expect(events[2].command[2], contains('--gen-param'));
+    expect(events[3] is RunnerResult, isTrue);
+    expect(events[3].name, equals('generator_task'));
+  });
+
+  test('GlobalBuildRunner skips generators when runGenerators is false',
+      () async {
+    final Build targetBuild = buildConfig.builds[0];
+    final BuildRunner buildRunner = BuildRunner(
+      platform: FakePlatform(operatingSystem: Platform.linux),
+      processRunner: ProcessRunner(
+        // dryRun should not try to spawn any processes.
+        processManager: _fakeProcessManager(),
+      ),
+      abi: ffi.Abi.linuxX64,
+      engineSrcDir: engine.srcDir,
+      build: targetBuild,
+      runGenerators: false,
+      dryRun: true,
+    );
+    final List<RunnerEvent> events = <RunnerEvent>[];
+    void handler(RunnerEvent event) => events.add(event);
+    final bool runResult = await buildRunner.run(handler);
+
+    final String buildName = targetBuild.name;
+
+    expect(runResult, isTrue);
+
+    // Check that the events for the Ninja command are correct.
+    expect(events[2] is RunnerStart, isTrue);
+    expect(events[2].name, equals('$buildName: ninja'));
+    expect(events[2].command[0], contains('ninja'));
+    final String configPath =
+        '${engine.srcDir.path}/out/${targetBuild.ninja.config}';
+    expect(events[2].command.contains(configPath), isTrue);
+    for (final String target in targetBuild.ninja.targets) {
+      expect(events[2].command.contains(target), isTrue);
+    }
+    expect(events[3] is RunnerResult, isTrue);
+    expect(events[3].name, equals('$buildName: ninja'));
+
+    // Check that the events for the tests are correct.
+    expect(events[4] is RunnerStart, isTrue);
+    expect(events[4].name, equals('$buildName tests'));
+    expect(events[4].command[0], contains('python3'));
+    expect(events[4].command[1], contains('test/script.py'));
+    expect(events[4].command[2], contains('--test-params'));
+    expect(events[5] is RunnerResult, isTrue);
+    expect(events[5].name, equals('$buildName tests'));
+  });
+
+  test('GlobalBuildRunner skips tests when runTests is false', () async {
+    final Build targetBuild = buildConfig.builds[0];
+    final BuildRunner buildRunner = BuildRunner(
+      platform: FakePlatform(operatingSystem: Platform.linux),
+      processRunner: ProcessRunner(
+        // dryRun should not try to spawn any processes.
+        processManager: _fakeProcessManager(),
+      ),
+      abi: ffi.Abi.linuxX64,
+      engineSrcDir: engine.srcDir,
+      build: targetBuild,
+      runTests: false,
+      dryRun: true,
+    );
+    final List<RunnerEvent> events = <RunnerEvent>[];
+    void handler(RunnerEvent event) => events.add(event);
+    final bool runResult = await buildRunner.run(handler);
+
+    expect(runResult, isTrue);
+
+    // Check that the events for generators are correct.
+    expect(events[4] is RunnerStart, isTrue);
+    expect(events[4].name, equals('generator_task'));
+    expect(events[4].command[0], contains('python3'));
+    expect(events[4].command[1], contains('gen/script.py'));
+    expect(events[4].command[2], contains('--gen-param'));
+    expect(events[5] is RunnerResult, isTrue);
+    expect(events[5].name, equals('generator_task'));
+
+    expect(events.length, equals(6));
+  });
+
+  test('GlobalBuildRunner extraGnArgs overrides build config args', () async {
+    final Build targetBuild = buildConfig.builds[0];
+    final BuildRunner buildRunner = BuildRunner(
+      platform: FakePlatform(operatingSystem: Platform.linux),
+      processRunner: ProcessRunner(
+        processManager: _fakeProcessManager(),
+      ),
+      abi: ffi.Abi.linuxX64,
+      engineSrcDir: engine.srcDir,
+      build: targetBuild,
+      extraGnArgs: <String>['--no-lto', '--no-goma', '--rbe'],
+      dryRun: true,
+    );
+    final List<RunnerEvent> events = <RunnerEvent>[];
+    void handler(RunnerEvent event) => events.add(event);
+    final bool runResult = await buildRunner.run(handler);
+
+    final String buildName = targetBuild.name;
+
+    expect(runResult, isTrue);
+
+    // Check that the events for the GN command are correct.
+    expect(events[0] is RunnerStart, isTrue);
+    expect(events[0].name, equals('$buildName: GN'));
+    expect(events[0].command[0], contains('flutter/tools/gn'));
+    expect(events[0].command.contains('--no-lto'), isTrue);
+    expect(events[0].command.contains('--no-goma'), isTrue);
+    expect(events[0].command.contains('--rbe'), isTrue);
+    expect(events[0].command.contains('--lto'), isFalse);
+    expect(events[0].command.contains('--goma'), isFalse);
+    expect(events[0].command.contains('--no-rbe'), isFalse);
+    expect(events[1] is RunnerResult, isTrue);
+    expect(events[1].name, equals('$buildName: GN'));
+  });
+
+  test('GlobalBuildRunner canRun returns false on OS mismatch', () async {
+    final Build targetBuild = buildConfig.builds[0];
+    final BuildRunner buildRunner = BuildRunner(
+      platform: FakePlatform(operatingSystem: Platform.macOS),
+      processRunner: ProcessRunner(
+        // dryRun should not try to spawn any processes.
+        processManager: _fakeProcessManager(),
+      ),
+      abi: ffi.Abi.linuxX64,
+      engineSrcDir: engine.srcDir,
+      build: targetBuild,
+      dryRun: true,
+    );
+    final List<RunnerEvent> events = <RunnerEvent>[];
+    void handler(RunnerEvent event) => events.add(event);
+    final bool runResult = await buildRunner.run(handler);
+
+    expect(runResult, isFalse);
+    expect(events[0] is RunnerError, isTrue);
+  });
+
+  test('GlobalBuildRunner fails when gn fails', () async {
+    final Build targetBuild = buildConfig.builds[0];
+    final BuildRunner buildRunner = BuildRunner(
+      platform: FakePlatform(operatingSystem: Platform.linux),
+      processRunner: ProcessRunner(
+        processManager: _fakeProcessManager(
+          gnResult: io.ProcessResult(1, 1, '', ''),
+        ),
+      ),
+      abi: ffi.Abi.linuxX64,
+      engineSrcDir: engine.srcDir,
+      build: targetBuild,
+    );
+    final List<RunnerEvent> events = <RunnerEvent>[];
+    void handler(RunnerEvent event) => events.add(event);
+    final bool runResult = await buildRunner.run(handler);
+
+    final String buildName = targetBuild.name;
+
+    expect(runResult, isFalse);
+
+    expect(events[0] is RunnerStart, isTrue);
+    expect(events[0].name, equals('$buildName: GN'));
+    expect(events[1] is RunnerResult, isTrue);
+    expect((events[1] as RunnerResult).ok, isFalse);
+  });
+
+  test('GlobalBuildRunner fails when ninja fails', () async {
+    final Build targetBuild = buildConfig.builds[0];
+    final BuildRunner buildRunner = BuildRunner(
+      platform: FakePlatform(operatingSystem: Platform.linux),
+      processRunner: ProcessRunner(
+        processManager: _fakeProcessManager(
+          ninjaResult: io.ProcessResult(1, 1, '', ''),
+        ),
+      ),
+      abi: ffi.Abi.linuxX64,
+      engineSrcDir: engine.srcDir,
+      build: targetBuild,
+    );
+    final List<RunnerEvent> events = <RunnerEvent>[];
+    void handler(RunnerEvent event) => events.add(event);
+    final bool runResult = await buildRunner.run(handler);
+
+    final String buildName = targetBuild.name;
+
+    expect(runResult, isFalse);
+
+    expect(events[2] is RunnerStart, isTrue);
+    expect(events[2].name, equals('$buildName: ninja'));
+    expect(events[3] is RunnerResult, isTrue);
+    expect((events[3] as RunnerResult).ok, isFalse);
+  });
+
+  test('GlobalBuildRunner fails an RBE build when bootstrap fails', () async {
+    final Build targetBuild = buildConfig.builds[0];
+    final BuildRunner buildRunner = BuildRunner(
+      platform: FakePlatform(operatingSystem: Platform.linux),
+      processRunner: ProcessRunner(
+        processManager: _fakeProcessManager(
+          bootstrapResult: io.ProcessResult(1, 1, '', ''),
+        ),
+      ),
+      abi: ffi.Abi.linuxX64,
+      engineSrcDir: engine.srcDir,
+      build: targetBuild,
+      extraGnArgs: <String>['--rbe'],
+    );
+    final List<RunnerEvent> events = <RunnerEvent>[];
+    void handler(RunnerEvent event) => events.add(event);
+    final bool runResult = await buildRunner.run(handler);
+
+    final String buildName = targetBuild.name;
+
+    expect(runResult, isFalse);
+
+    expect(events[2] is RunnerStart, isTrue);
+    expect(events[2].name, equals('$buildName: RBE startup'));
+    expect(events[3] is RunnerResult, isTrue);
+    expect(events[3].name, equals('$buildName: RBE startup'));
+    expect((events[3] as RunnerResult).ok, isFalse);
+  });
+
+  test('GlobalBuildRunner fails an RBE build when bootstrap does not exist',
+      () async {
+    final Build targetBuild = buildConfig.builds[0];
+    final BuildRunner buildRunner = BuildRunner(
+      platform: FakePlatform(operatingSystem: Platform.linux),
+      processRunner: ProcessRunner(
+        processManager: _fakeProcessManager(
+          canRun: (Object? exe, {String? workingDirectory}) {
+            if (exe is String? && exe != null && exe.endsWith('bootstrap')) {
+              return false;
+            }
+            return true;
+          },
+        ),
+      ),
+      abi: ffi.Abi.linuxX64,
+      engineSrcDir: engine.srcDir,
+      build: targetBuild,
+      extraGnArgs: <String>['--rbe'],
+    );
+    final List<RunnerEvent> events = <RunnerEvent>[];
+    void handler(RunnerEvent event) => events.add(event);
+    final bool runResult = await buildRunner.run(handler);
+
+    expect(runResult, isFalse);
+
+    expect(events[2] is RunnerError, isTrue);
+  });
+
+  test('GlobalBuildRunner throws a StateError on an unsupported host cpu',
+      () async {
+    final Build targetBuild = buildConfig.builds[0];
+    final BuildRunner buildRunner = BuildRunner(
+      platform: FakePlatform(operatingSystem: Platform.linux),
+      processRunner: ProcessRunner(
+        processManager: _fakeProcessManager(),
+      ),
+      abi: ffi.Abi.linuxRiscv32,
+      engineSrcDir: engine.srcDir,
+      build: targetBuild,
+      extraGnArgs: <String>['--rbe'],
+    );
+
+    bool caughtError = false;
+    try {
+      await buildRunner.run((RunnerEvent event) {});
+    } on StateError catch (_) {
+      caughtError = true;
+    }
+    expect(caughtError, isTrue);
+  });
+}
+
+FakeProcessManager _fakeProcessManager({
+  io.ProcessResult? bootstrapResult,
+  io.ProcessResult? gnResult,
+  io.ProcessResult? ninjaResult,
+  bool Function(Object?, {String? workingDirectory})? canRun,
+  bool failUnknown = true,
+}) {
+  final io.ProcessResult success = io.ProcessResult(1, 0, '', '');
+  FakeProcess fakeProcess(io.ProcessResult? result) => FakeProcess(
+        exitCode: result?.exitCode ?? 0,
+        stdout: result?.stdout as String? ?? '',
+        stderr: result?.stderr as String? ?? '',
+      );
+  return FakeProcessManager(
+    canRun: canRun ?? (Object? exe, {String? workingDirectory}) => true,
+    onRun: (List<String> cmd) => switch (cmd) {
+      _ => failUnknown ? io.ProcessResult(1, 1, '', '') : success,
+    },
+    onStart: (List<String> cmd) => switch (cmd) {
+      [final String exe, ...] when exe.endsWith('gn') => fakeProcess(gnResult),
+      [final String exe, ...] when exe.endsWith('bootstrap') =>
+        fakeProcess(bootstrapResult),
+      [final String exe, ...] when exe.endsWith('ninja') =>
+        fakeProcess(ninjaResult),
+      _ => failUnknown ? FakeProcess(exitCode: 1) : FakeProcess(),
+    },
+  );
+}
diff --git a/tools/pkg/engine_build_configs/test/build_config_test.dart b/tools/pkg/engine_build_configs/test/build_config_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..d1685f04e0f5af7494a5b681d6eb49f29dbd4b34
--- /dev/null
+++ b/tools/pkg/engine_build_configs/test/build_config_test.dart
@@ -0,0 +1,323 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:convert' as convert;
+
+import 'package:engine_build_configs/src/build_config.dart';
+import 'package:litetest/litetest.dart';
+import 'package:platform/platform.dart';
+
+import 'fixtures.dart' as fixtures;
+
+int main() {
+  test('BuildConfig parser works', () {
+    final BuilderConfig buildConfig = BuilderConfig.fromJson(
+      path: 'linux_test_config',
+      map: convert.jsonDecode(fixtures.buildConfigJson) as Map<String, Object?>,
+    );
+    expect(buildConfig.valid, isTrue);
+    expect(buildConfig.errors, isNull);
+    expect(buildConfig.builds.length, equals(1));
+
+    final Build globalBuild = buildConfig.builds[0];
+    expect(globalBuild.name, equals('build_name'));
+    expect(globalBuild.gn.length, equals(4));
+    expect(globalBuild.gn[0], equals('--gn-arg'));
+    expect(globalBuild.droneDimensions.length, equals(1));
+    expect(globalBuild.droneDimensions[0], equals('os=Linux'));
+    expect(
+      globalBuild.canRunOn(FakePlatform(operatingSystem: Platform.linux)),
+      isTrue,
+    );
+    expect(
+      globalBuild.canRunOn(FakePlatform(operatingSystem: Platform.macOS)),
+      isFalse,
+    );
+
+    final BuildNinja ninja = globalBuild.ninja;
+    expect(ninja.config, equals('build_name'));
+    expect(ninja.targets.length, equals(1));
+    expect(ninja.targets[0], equals('ninja_target'));
+
+    expect(globalBuild.archives.length, equals(1));
+    final BuildArchive buildArchive = globalBuild.archives[0];
+    expect(buildArchive.name, equals('build_name'));
+    expect(buildArchive.basePath, equals('base/path'));
+    expect(buildArchive.type, equals('gcs'));
+    expect(buildArchive.includePaths.length, equals(1));
+    expect(buildArchive.includePaths[0], equals('include/path'));
+
+    expect(globalBuild.tests.length, equals(1));
+    final BuildTest tst = globalBuild.tests[0];
+    expect(tst.name, equals('build_name tests'));
+    expect(tst.language, equals('python3'));
+    expect(tst.script, equals('test/script.py'));
+    expect(tst.parameters.length, equals(1));
+    expect(tst.parameters[0], equals('--test-params'));
+    expect(tst.contexts.length, equals(1));
+    expect(tst.contexts[0], equals('context'));
+
+    expect(globalBuild.generators.length, equals(1));
+    final BuildTask buildTask = globalBuild.generators[0];
+    expect(buildTask.name, equals('generator_task'));
+    expect(buildTask.scripts.length, equals(1));
+    expect(buildTask.scripts[0], equals('gen/script.py'));
+    expect(buildTask.parameters.length, equals(1));
+    expect(buildTask.parameters[0], equals('--gen-param'));
+
+    expect(buildConfig.generators.length, equals(1));
+    final TestTask testTask = buildConfig.generators[0];
+    expect(testTask.name, equals('global generator task'));
+    expect(testTask.language, equals('dart'));
+    expect(testTask.script, equals('global/gen_script.dart'));
+    expect(testTask.parameters.length, equals(1));
+    expect(testTask.parameters[0], equals('--global-gen-param'));
+
+    expect(buildConfig.tests.length, equals(1));
+    final GlobalTest globalTest = buildConfig.tests[0];
+    expect(globalTest.name, equals('global test'));
+    expect(globalTest.recipe, equals('engine_v2/tester_engine'));
+    expect(globalTest.droneDimensions.length, equals(1));
+    expect(globalTest.droneDimensions[0], equals('os=Linux'));
+    expect(
+      globalTest.canRunOn(FakePlatform(operatingSystem: Platform.linux)),
+      isTrue,
+    );
+    expect(
+      globalTest.canRunOn(FakePlatform(operatingSystem: Platform.macOS)),
+      isFalse,
+    );
+    expect(globalTest.dependencies.length, equals(1));
+    expect(globalTest.dependencies[0], equals('dependency'));
+
+    expect(globalTest.tasks.length, equals(1));
+    final TestTask globalTestTask = globalTest.tasks[0];
+    expect(globalTestTask.name, equals('global test task'));
+    expect(globalTestTask.script, equals('global/test/script.py'));
+    expect(globalTestTask.language, equals('<undef>'));
+  });
+
+  test('BuildConfig flags invalid input', () {
+    const String invalidInput = '''
+{
+  "builds": 5,
+  "generators": {},
+  "tests": []
+}
+''';
+    final BuilderConfig buildConfig = BuilderConfig.fromJson(
+      path: 'linux_test_config',
+      map: convert.jsonDecode(invalidInput) as Map<String, Object?>,
+    );
+    expect(buildConfig.valid, isFalse);
+    expect(
+        buildConfig.errors![0],
+        equals(
+          'For field "builds", expected type: list, actual type: int.',
+        ));
+  });
+
+  test('GlobalBuild flags invalid input', () {
+    const String invalidInput = '''
+{
+  "builds": [
+    {
+      "name": 5
+    }
+  ],
+  "generators": {},
+  "tests": []
+}
+''';
+    final BuilderConfig buildConfig = BuilderConfig.fromJson(
+      path: 'linux_test_config',
+      map: convert.jsonDecode(invalidInput) as Map<String, Object?>,
+    );
+    expect(buildConfig.valid, isTrue);
+    expect(buildConfig.builds.length, equals(1));
+    expect(buildConfig.builds[0].valid, isFalse);
+    expect(
+        buildConfig.builds[0].errors![0],
+        equals(
+          'For field "name", expected type: string, actual type: int.',
+        ));
+  });
+
+  test('BuildNinja flags invalid input', () {
+    const String invalidInput = '''
+{
+  "builds": [
+    {
+      "ninja": {
+        "config": 5
+      }
+    }
+  ],
+  "generators": {},
+  "tests": []
+}
+''';
+    final BuilderConfig buildConfig = BuilderConfig.fromJson(
+      path: 'linux_test_config',
+      map: convert.jsonDecode(invalidInput) as Map<String, Object?>,
+    );
+    expect(buildConfig.valid, isTrue);
+    expect(buildConfig.builds.length, equals(1));
+    expect(buildConfig.builds[0].valid, isTrue);
+    expect(buildConfig.builds[0].ninja.valid, isFalse);
+    expect(
+        buildConfig.builds[0].ninja.errors![0],
+        equals(
+          'For field "config", expected type: string, actual type: int.',
+        ));
+  });
+
+  test('BuildTest flags invalid input', () {
+    const String invalidInput = '''
+{
+  "builds": [
+    {
+      "tests": [
+        {
+          "language": 5
+        }
+      ]
+    }
+  ],
+  "generators": {},
+  "tests": []
+}
+''';
+    final BuilderConfig buildConfig = BuilderConfig.fromJson(
+      path: 'linux_test_config',
+      map: convert.jsonDecode(invalidInput) as Map<String, Object?>,
+    );
+    expect(buildConfig.valid, isTrue);
+    expect(buildConfig.builds.length, equals(1));
+    expect(buildConfig.builds[0].valid, isTrue);
+    expect(buildConfig.builds[0].tests[0].valid, isFalse);
+    expect(
+        buildConfig.builds[0].tests[0].errors![0],
+        equals(
+          'For field "language", expected type: string, actual type: int.',
+        ));
+  });
+
+  test('BuildTask flags invalid input', () {
+    const String invalidInput = '''
+{
+  "builds": [
+    {
+      "generators": {
+        "tasks": [
+          {
+            "name": 5
+          }
+        ]
+      }
+    }
+  ],
+  "generators": {},
+  "tests": []
+}
+''';
+    final BuilderConfig buildConfig = BuilderConfig.fromJson(
+      path: 'linux_test_config',
+      map: convert.jsonDecode(invalidInput) as Map<String, Object?>,
+    );
+    expect(buildConfig.valid, isTrue);
+    expect(buildConfig.builds.length, equals(1));
+    expect(buildConfig.builds[0].valid, isTrue);
+    expect(buildConfig.builds[0].generators[0].valid, isFalse);
+    expect(
+        buildConfig.builds[0].generators[0].errors![0],
+        equals(
+          'For field "name", expected type: string, actual type: int.',
+        ));
+  });
+
+  test('BuildArchive flags invalid input', () {
+    const String invalidInput = '''
+{
+  "builds": [
+    {
+      "archives": [
+        {
+          "name": 5
+        }
+      ]
+    }
+  ],
+  "generators": {},
+  "tests": []
+}
+''';
+    final BuilderConfig buildConfig = BuilderConfig.fromJson(
+      path: 'linux_test_config',
+      map: convert.jsonDecode(invalidInput) as Map<String, Object?>,
+    );
+    expect(buildConfig.valid, isTrue);
+    expect(buildConfig.builds.length, equals(1));
+    expect(buildConfig.builds[0].valid, isTrue);
+    expect(buildConfig.builds[0].archives[0].valid, isFalse);
+    expect(
+        buildConfig.builds[0].archives[0].errors![0],
+        equals(
+          'For field "name", expected type: string, actual type: int.',
+        ));
+  });
+
+  test('GlobalTest flags invalid input', () {
+    const String invalidInput = '''
+{
+  "tests": [
+    {
+      "name": 5
+    }
+  ]
+}
+''';
+    final BuilderConfig buildConfig = BuilderConfig.fromJson(
+      path: 'linux_test_config',
+      map: convert.jsonDecode(invalidInput) as Map<String, Object?>,
+    );
+    expect(buildConfig.valid, isTrue);
+    expect(buildConfig.tests.length, equals(1));
+    expect(buildConfig.tests[0].valid, isFalse);
+    expect(
+        buildConfig.tests[0].errors![0],
+        equals(
+          'For field "name", expected type: string, actual type: int.',
+        ));
+  });
+
+  test('TestTask flags invalid input', () {
+    const String invalidInput = '''
+{
+  "tests": [
+    {
+      "tasks": [
+        {
+          "name": 5
+        }
+      ]
+    }
+  ]
+}
+''';
+    final BuilderConfig buildConfig = BuilderConfig.fromJson(
+      path: 'linux_test_config',
+      map: convert.jsonDecode(invalidInput) as Map<String, Object?>,
+    );
+    expect(buildConfig.valid, isTrue);
+    expect(buildConfig.tests.length, equals(1));
+    expect(buildConfig.tests[0].tasks[0].valid, isFalse);
+    expect(
+        buildConfig.tests[0].tasks[0].errors![0],
+        contains(
+          'For field "name", expected type: string, actual type: int.',
+        ));
+  });
+  return 0;
+}
diff --git a/tools/pkg/engine_build_configs/test/ci_yaml_test.dart b/tools/pkg/engine_build_configs/test/ci_yaml_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..df5e4489ca2d30a5bb5c19529c6b231fd08295c2
--- /dev/null
+++ b/tools/pkg/engine_build_configs/test/ci_yaml_test.dart
@@ -0,0 +1,160 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io' as io;
+
+import 'package:engine_build_configs/src/ci_yaml.dart';
+import 'package:engine_repo_tools/engine_repo_tools.dart';
+import 'package:litetest/litetest.dart';
+import 'package:path/path.dart' as path;
+import 'package:source_span/source_span.dart';
+import 'package:yaml/yaml.dart' as y;
+
+void main() {
+  y.yamlWarningCallback = (String message, [SourceSpan? span]) {};
+
+  // Find the engine repo.
+  final Engine engine;
+  try {
+    engine = Engine.findWithin();
+  } catch (e) {
+    io.stderr.writeln(e);
+    io.exitCode = 1;
+    return;
+  }
+
+  final String ciYamlPath = path.join(engine.flutterDir.path, '.ci.yaml');
+  final String realCiYaml = io.File(ciYamlPath).readAsStringSync();
+
+  test('Can load the real .ci.yaml file', () {
+    final y.YamlNode yamlNode = y.loadYamlNode(
+      realCiYaml, sourceUrl: Uri.file(ciYamlPath),
+    );
+    final CiConfig config = CiConfig.fromYaml(yamlNode);
+    if (!config.valid) {
+      io.stderr.writeln(config.error);
+    }
+    expect(config.valid, isTrue);
+  });
+
+  test('Parses all supported fields', () {
+    const String yamlData = '''
+targets:
+  - name: Linux linux_build
+    recipe: engine_v2/engine_v2
+    properties:
+      config_name: linux_build
+''';
+    final y.YamlNode yamlNode = y.loadYamlNode(
+      yamlData, sourceUrl: Uri.file(ciYamlPath),
+    );
+    final CiConfig config = CiConfig.fromYaml(yamlNode);
+    if (!config.valid) {
+      io.stderr.writeln(config.error);
+    }
+    expect(config.valid, isTrue);
+    expect(config.ciTargets.entries.isNotEmpty, isTrue);
+    expect(config.ciTargets['Linux linux_build'], isNotNull);
+    expect(config.ciTargets['Linux linux_build']!.valid, isTrue);
+    expect(config.ciTargets['Linux linux_build']!.name, equals('Linux linux_build'));
+    expect(config.ciTargets['Linux linux_build']!.recipe, equals('engine_v2/engine_v2'));
+    expect(config.ciTargets['Linux linux_build']!.properties.valid, isTrue);
+    expect(config.ciTargets['Linux linux_build']!.properties.configName, equals('linux_build'));
+  });
+
+  test('Invalid when targets is malformed', () {
+    const String yamlData = '''
+targets: 4
+''';
+    final y.YamlNode yamlNode = y.loadYamlNode(
+      yamlData, sourceUrl: Uri.file(ciYamlPath),
+    );
+    final CiConfig config = CiConfig.fromYaml(yamlNode);
+    expect(config.valid, isFalse);
+    expect(config.error, contains('Expected "targets" to be a list.'));
+  });
+
+  test('Invalid when a target is malformed', () {
+    const String yamlData = '''
+targets:
+  - name: 4
+    recipe: engine_v2/engine_v2
+    properties:
+      config_name: linux_build
+''';
+    final y.YamlNode yamlNode = y.loadYamlNode(
+      yamlData, sourceUrl: Uri.file(ciYamlPath),
+    );
+    final CiConfig config = CiConfig.fromYaml(yamlNode);
+    expect(config.valid, isFalse);
+    expect(config.error, contains('Expected map to contain a string value for key "name".'));
+  });
+
+  test('Invalid when a recipe is malformed', () {
+    const String yamlData = '''
+targets:
+  - name: Linux linux_build
+    recipe: 4
+    properties:
+      config_name: linux_build
+''';
+    final y.YamlNode yamlNode = y.loadYamlNode(
+      yamlData, sourceUrl: Uri.file(ciYamlPath),
+    );
+    final CiConfig config = CiConfig.fromYaml(yamlNode);
+    expect(config.valid, isFalse);
+    expect(config.error, contains('Expected map to contain a string value for key "recipe".'));
+  });
+
+  test('Invalid when a properties list is malformed', () {
+    const String yamlData = '''
+targets:
+  - name: Linux linux_build
+    recipe: engine_v2/engine_v2
+    properties: 4
+''';
+    final y.YamlNode yamlNode = y.loadYamlNode(
+      yamlData, sourceUrl: Uri.file(ciYamlPath),
+    );
+    final CiConfig config = CiConfig.fromYaml(yamlNode);
+    expect(config.valid, isFalse);
+    expect(config.error, contains('Expected "properties" to be a map.'));
+  });
+
+  test('Still valid when a config_name is not present', () {
+    const String yamlData = '''
+targets:
+  - name: Linux linux_build
+    recipe: engine_v2/engine_v2
+    properties:
+      field: value
+''';
+    final y.YamlNode yamlNode = y.loadYamlNode(
+      yamlData, sourceUrl: Uri.file(ciYamlPath),
+    );
+    final CiConfig config = CiConfig.fromYaml(yamlNode);
+    expect(config.valid, isTrue);
+  });
+
+  test('Invalid when any target is malformed', () {
+    const String yamlData = '''
+targets:
+  - name: Linux linux_build
+    recipe: engine_v2/engine_v2
+    properties:
+      config_name: linux_build
+
+  - name: 4
+    recipe: engine_v2/engine_v2
+    properties:
+      config_name: linux_build
+''';
+    final y.YamlNode yamlNode = y.loadYamlNode(
+      yamlData, sourceUrl: Uri.file(ciYamlPath),
+    );
+    final CiConfig config = CiConfig.fromYaml(yamlNode);
+    expect(config.valid, isFalse);
+    expect(config.error, contains('Expected map to contain a string value for key "name".'));
+  });
+}
diff --git a/tools/pkg/engine_build_configs/test/fixtures.dart b/tools/pkg/engine_build_configs/test/fixtures.dart
new file mode 100644
index 0000000000000000000000000000000000000000..f168a401e0282fc4a2227569e6f7853ef55610d0
--- /dev/null
+++ b/tools/pkg/engine_build_configs/test/fixtures.dart
@@ -0,0 +1,88 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+const String buildConfigJson = '''
+{
+  "builds": [
+    {
+      "archives": [
+        {
+          "name": "build_name",
+          "base_path": "base/path",
+          "type": "gcs",
+          "include_paths": ["include/path"],
+          "realm": "archive_realm"
+        }
+      ],
+      "drone_dimensions": [
+        "os=Linux"
+      ],
+      "gclient_variables": {
+        "variable": false
+      },
+      "gn": ["--gn-arg", "--lto", "--goma", "--no-rbe"],
+      "name": "build_name",
+      "ninja": {
+        "config": "build_name",
+        "targets": ["ninja_target"]
+      },
+      "tests": [
+        {
+          "language": "python3",
+          "name": "build_name tests",
+          "parameters": ["--test-params"],
+          "script": "test/script.py",
+          "contexts": ["context"]
+        }
+      ],
+      "generators": {
+        "tasks": [
+          {
+            "name": "generator_task",
+            "language": "python",
+            "parameters": ["--gen-param"],
+            "scripts": ["gen/script.py"]
+          }
+        ]
+      }
+    }
+  ],
+  "generators": {
+    "tasks": [
+      {
+        "name": "global generator task",
+        "parameters": ["--global-gen-param"],
+        "script": "global/gen_script.dart",
+        "language": "dart"
+      }
+    ]
+  },
+  "tests": [
+    {
+      "name": "global test",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "os=Linux"
+      ],
+      "gclient_variables": {
+        "variable": false
+      },
+      "dependencies": ["dependency"],
+      "test_dependencies": [
+        {
+          "dependency": "test_dependency",
+          "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "global test task",
+          "parameters": ["--test-parameter"],
+          "script": "global/test/script.py"
+        }
+      ]
+    }
+  ]
+}
+''';
diff --git a/tools/pkg/engine_repo_tools/README.md b/tools/pkg/engine_repo_tools/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..f84d0a9212ac9a14c65c3922cec1cdc4252303bb
--- /dev/null
+++ b/tools/pkg/engine_repo_tools/README.md
@@ -0,0 +1,17 @@
+# engine_repo_tools
+
+This is a repo-internal library for `flutter/engine`, that contains shared code
+for writing tools that operate on the engine repository. For example, finding
+the latest compiled engine artifacts in the `out/` directory:
+
+```dart
+import 'package:engine_repo_tools/engine_repo_tools.dart';
+
+void main() {
+  final engine = Engine.findWithin();
+  final latest = engine.latestOutput();
+  if (latest != null) {
+    print('Latest compile_commands.json: ${latest.compileCommandsJson?.path}');
+  }
+}
+```
diff --git a/tools/pkg/engine_repo_tools/lib/engine_repo_tools.dart b/tools/pkg/engine_repo_tools/lib/engine_repo_tools.dart
new file mode 100644
index 0000000000000000000000000000000000000000..f52cf8a6c4329da1168a39cee5f2de64eaa0f954
--- /dev/null
+++ b/tools/pkg/engine_repo_tools/lib/engine_repo_tools.dart
@@ -0,0 +1,317 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+/// A minimal library for discovering and probing a local engine repository.
+///
+/// This library is intended to be used by tools that need to interact with a
+/// local engine repository, such as `clang_tidy` or `githooks`. For example,
+/// finding the `compile_commands.json` file for the most recently built output:
+///
+/// ```dart
+/// final Engine engine = Engine.findWithin();
+/// final Output? output = engine.latestOutput();
+/// if (output == null) {
+///   print('No output targets found.');
+/// } else {
+///   final io.File? compileCommandsJson = output.compileCommandsJson;
+///   if (compileCommandsJson == null) {
+///     print('No compile_commands.json file found.');
+///   } else {
+///     print('Found compile_commands.json file at ${compileCommandsJson.path}');
+///   }
+/// }
+/// ```
+library;
+
+import 'dart:io' as io;
+
+import 'package:path/path.dart' as p;
+
+/// Represents the `$ENGINE` directory (i.e. a checked-out Flutter engine).
+///
+/// If you have a path to the `$ENGINE/src` directory, use [Engine.fromSrcPath].
+///
+/// If you have a path to a directory within the `$ENGINE/src` directory, or
+/// want to use the current working directory, use [Engine.findWithin].
+final class Engine {
+  const Engine._({
+    required this.srcDir,
+    required this.flutterDir,
+    required this.outDir,
+  });
+
+  /// Creates an [Engine] from a path such as `/Users/.../flutter/engine/src`.
+  ///
+  /// ```dart
+  /// final Engine engine = Engine.findWithin('/Users/.../engine/src');
+  /// print(engine.srcDir.path); // /Users/.../engine/src
+  /// ```
+  ///
+  /// Throws a [InvalidEngineException] if the path is not a valid engine root.
+  factory Engine.fromSrcPath(String srcPath) {
+    // If the path does not end in `/src`, fail.
+    if (p.basename(srcPath) != 'src') {
+      throw InvalidEngineException.doesNotEndWithSrc(srcPath);
+    }
+
+    // If the directory does not exist, or is not a directory, fail.
+    final io.Directory srcDir = io.Directory(srcPath);
+    if (!srcDir.existsSync()) {
+      throw InvalidEngineException.notADirectory(srcPath);
+    }
+
+    // Check for the existence of a `flutter` directory within `src`.
+    final io.Directory flutterDir = io.Directory(p.join(srcPath, 'flutter'));
+    if (!flutterDir.existsSync()) {
+      throw InvalidEngineException.missingFlutterDirectory(srcPath);
+    }
+
+    // We do **NOT** check for the existence of a `out` directory within `src`,
+    // it's not required to exist (i.e. a new checkout of the engine), and we
+    // don't want to fail if it doesn't exist.
+    final io.Directory outDir = io.Directory(p.join(srcPath, 'out'));
+
+    return Engine._(
+      srcDir: srcDir,
+      flutterDir: flutterDir,
+      outDir: outDir,
+    );
+  }
+
+  /// Creates an [Engine] by looking for a `src/` directory in the given path.
+  ///
+  /// Similar to [tryFindWithin], but throws a [StateError] if the path is not
+  /// within a valid engine. This is useful for tools that require an engine
+  /// and do not have a reasonable fallback or recovery path.
+  factory Engine.findWithin([String? path]) {
+    final Engine? engine = tryFindWithin(path);
+    if (engine == null) {
+      throw StateError('The path "$path" is not within a valid engine.');
+    }
+    return engine;
+  }
+
+  /// Creates an [Engine] by looking for a `src/` directory in the given [path].
+  ///
+  /// ```dart
+  /// // Use the current working directory.
+  /// final Engine engine = Engine.findWithin();
+  /// print(engine.srcDir.path); // /Users/.../engine/src
+  ///
+  /// // Use a specific directory.
+  /// final Engine engine = Engine.findWithin('/Users/.../engine/src/foo/bar');
+  /// print(engine.srcDir.path); // /Users/.../engine/src
+  /// ```
+  ///
+  /// If a [path] is not provided, the current working directory is used.
+  ///
+  /// If path does not exist, or is not a directory, an error is thrown.
+  ///
+  /// Returns `null` if the path is not within a valid engine.
+  static Engine? tryFindWithin([String? path]) {
+    path ??= p.current;
+
+    // Search parent directories for a `src` directory.
+    io.Directory maybeSrcDir = io.Directory(path);
+
+    if (!maybeSrcDir.existsSync()) {
+      throw StateError(
+        'The path "$path" does not exist or is not a directory.'
+      );
+    }
+
+    do {
+      try {
+        return Engine.fromSrcPath(maybeSrcDir.path);
+      } on InvalidEngineException {
+        // Ignore, we'll keep searching.
+      }
+      maybeSrcDir = maybeSrcDir.parent;
+    } while (maybeSrcDir.parent.path != maybeSrcDir.path /* at root */);
+
+    return null;
+  }
+
+  /// The path to the `$ENGINE/src` directory.
+  final io.Directory srcDir;
+
+  /// The path to the `$ENGINE/src/flutter` directory.
+  final io.Directory flutterDir;
+
+  /// The path to the `$ENGINE/src/out` directory.
+  ///
+  /// **NOTE**: This directory may not exist.
+  final io.Directory outDir;
+
+  /// Returns a list of all output targets in [outDir].
+  List<Output> outputs() {
+    return outDir
+      .listSync()
+      .whereType<io.Directory>()
+      .map<Output>(Output._)
+      .toList();
+  }
+
+  /// Returns the most recently modified output target in [outDir].
+  ///
+  /// If there are no output targets, returns `null`.
+  Output? latestOutput() {
+    final List<Output> outputs = this.outputs();
+    if (outputs.isEmpty) {
+      return null;
+    }
+    outputs.sort((Output a, Output b) {
+      return b.path.statSync().modified.compareTo(a.path.statSync().modified);
+    });
+    return outputs.first;
+  }
+}
+
+/// An implementation of [Engine] that has pre-defined outputs for testing.
+final class TestEngine extends Engine {
+  /// Creates a [TestEngine] with pre-defined paths.
+  ///
+  /// The [srcDir] and [flutterDir] must exist, but the [outDir] is optional.
+  ///
+  /// Optionally, provide a list of [outputs] to use, otherwise it is empty.
+  TestEngine.withPaths({
+    required super.srcDir,
+    required super.flutterDir,
+    required super.outDir,
+    List<TestOutput> outputs = const <TestOutput>[],
+  }) : _outputs = outputs, super._() {
+    if (!srcDir.existsSync()) {
+      throw ArgumentError.value(srcDir, 'srcDir', 'does not exist');
+    }
+    if (!flutterDir.existsSync()) {
+      throw ArgumentError.value(flutterDir, 'flutterDir', 'does not exist');
+    }
+  }
+
+  /// Creates a [TestEngine] within a temporary directory.
+  ///
+  /// The [rootDir] is the temporary directory that will contain the engine.
+  ///
+  /// Optionally, provide a list of [outputs] to use, otherwise it is empty.
+  factory TestEngine.createTemp({
+    required io.Directory rootDir,
+    List<TestOutput> outputs = const <TestOutput>[],
+  }) {
+    final io.Directory srcDir = io.Directory(p.join(rootDir.path, 'src'));
+    final io.Directory flutterDir = io.Directory(p.join(srcDir.path, 'flutter'));
+    final io.Directory outDir = io.Directory(p.join(srcDir.path, 'out'));
+    srcDir.createSync(recursive: true);
+    flutterDir.createSync(recursive: true);
+    outDir.createSync(recursive: true);
+    return TestEngine.withPaths(
+      srcDir: srcDir,
+      flutterDir: flutterDir,
+      outDir: outDir,
+      outputs: outputs,
+    );
+  }
+
+  final List<TestOutput> _outputs;
+
+  @override
+  List<Output> outputs() => List<Output>.unmodifiable(_outputs);
+
+  @override
+  Output? latestOutput() {
+    if (_outputs.isEmpty) {
+      return null;
+    }
+    _outputs.sort((TestOutput a, TestOutput b) {
+      return b.lastModified.compareTo(a.lastModified);
+    });
+    return _outputs.first;
+  }
+}
+
+/// An implementation of [Output] that has a pre-defined path for testing.
+final class TestOutput extends Output {
+  /// Creates a [TestOutput] with a pre-defined path.
+  ///
+  /// Optionally, provide a [lastModified] date.
+  TestOutput(super.path, {DateTime? lastModified})
+    : lastModified = lastModified ?? _defaultLastModified,
+      super._();
+
+  static final DateTime _defaultLastModified = DateTime.now();
+
+  /// The last modified date of the output target.
+  final DateTime lastModified;
+}
+
+/// Thrown when an [Engine] could not be created from a path.
+sealed class InvalidEngineException implements Exception {
+  /// Thrown when an [Engine] was created from a path not ending in `src`.
+  factory InvalidEngineException.doesNotEndWithSrc(String path) {
+    return InvalidEngineSrcPathException._(path);
+  }
+
+  /// Thrown when an [Engine] was created from a directory that does not exist.
+  factory InvalidEngineException.notADirectory(String path) {
+    return InvalidEngineNotADirectoryException._(path);
+  }
+
+  /// Thrown when an [Engine] was created from a path not containing `flutter/`.
+  factory InvalidEngineException.missingFlutterDirectory(String path) {
+    return InvalidEngineMissingFlutterDirectoryException._(path);
+  }
+}
+
+/// Thrown when an [Engine] was created from a path not ending in `src`.
+final class InvalidEngineSrcPathException implements InvalidEngineException {
+  InvalidEngineSrcPathException._(this.path);
+
+  /// The path that was used to create the [Engine].
+  final String path;
+
+  @override
+  String toString() {
+    return 'The path $path does not end in `${p.separator}src`.';
+  }
+}
+
+/// Thrown when an [Engine] was created from a path that is not a directory.
+final class InvalidEngineNotADirectoryException implements InvalidEngineException {
+  InvalidEngineNotADirectoryException._(this.path);
+
+  /// The path that was used to create the [Engine].
+  final String path;
+
+  @override
+  String toString() {
+    return 'The path "$path" does not exist or is not a directory.';
+  }
+}
+
+/// Thrown when an [Engine] was created from a path not containing `flutter/`.
+final class InvalidEngineMissingFlutterDirectoryException implements InvalidEngineException {
+  InvalidEngineMissingFlutterDirectoryException._(this.path);
+
+  /// The path that was used to create the [Engine].
+  final String path;
+
+  @override
+  String toString() {
+    return 'The path "$path" does not contain a "flutter" directory.';
+  }
+}
+
+/// Represents a single output target in the `$ENGINE/src/out` directory.
+final class Output {
+  const Output._(this.path);
+
+  /// The directory containing the output target.
+  final io.Directory path;
+
+  /// The `compile_commands.json` file that should exist for this output target.
+  ///
+  /// The file may not exist.
+  io.File get compileCommandsJson {
+    return io.File(p.join(path.path, 'compile_commands.json'));
+  }
+}
diff --git a/tools/pkg/engine_repo_tools/pubspec.yaml b/tools/pkg/engine_repo_tools/pubspec.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..08f4a18186979359f88d29e713762a75a0e5d466
--- /dev/null
+++ b/tools/pkg/engine_repo_tools/pubspec.yaml
@@ -0,0 +1,41 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+name: engine_repo_tools
+publish_to: none
+environment:
+  sdk: '>=3.2.0-0 <4.0.0'
+
+# Do not add any dependencies that require more than what is provided in
+# //third_party/pkg, //third_party/dart/pkg, or
+# //third_party/dart/third_party/pkg. In particular, package:test is not usable
+# here.
+
+# If you do add packages here, make sure you can run `pub get --offline`, and
+# check the .packages and .package_config to make sure all the paths are
+# relative to this directory into //third_party/dart
+
+dependencies:
+  meta: any
+  path: any
+
+dev_dependencies:
+  async_helper: any
+  expect: any
+  litetest: any
+  smith: any
+
+dependency_overrides:
+  async_helper:
+    path: ../../../../third_party/dart/pkg/async_helper
+  expect:
+    path: ../../../../third_party/dart/pkg/expect
+  litetest:
+    path: ../../../testing/litetest
+  meta:
+    path: ../../../../third_party/dart/pkg/meta
+  path:
+    path: ../../../../third_party/dart/third_party/pkg/path
+  smith:
+    path: ../../../../third_party/dart/pkg/smith
diff --git a/tools/pkg/engine_repo_tools/test/engine_repo_tools_test.dart b/tools/pkg/engine_repo_tools/test/engine_repo_tools_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..4b6a05becbb1c25f1184f2b60b28e44be2fd2464
--- /dev/null
+++ b/tools/pkg/engine_repo_tools/test/engine_repo_tools_test.dart
@@ -0,0 +1,273 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io' as io;
+import 'package:async_helper/async_helper.dart';
+import 'package:engine_repo_tools/engine_repo_tools.dart';
+import 'package:litetest/litetest.dart';
+import 'package:path/path.dart' as p;
+
+void main() {
+  late io.Directory emptyDir;
+
+  void setUp() {
+    emptyDir = io.Directory.systemTemp.createTempSync('engine_repo_tools.test');
+  }
+
+  void tearDown() {
+    emptyDir.deleteSync(recursive: true);
+  }
+
+  group('Engine.fromSrcPath', () {
+    group('should fail when', () {
+      test('the path does not end in `${p.separator}src`', () {
+        setUp();
+        try {
+          expect(
+          () => Engine.fromSrcPath(emptyDir.path),
+          _throwsInvalidEngineException,
+        );
+        } finally {
+          tearDown();
+        }
+      });
+
+      test('the path does not exist', () {
+        setUp();
+        try {
+          expect(
+            () => Engine.fromSrcPath(p.join(emptyDir.path, 'src')),
+            _throwsInvalidEngineException,
+          );
+        } finally {
+          tearDown();
+        }
+      });
+
+      test('the path does not contain a "flutter" directory', () {
+        setUp();
+        try {
+          final io.Directory srcDir = io.Directory(p.join(emptyDir.path, 'src'))..createSync();
+          expect(
+            () => Engine.fromSrcPath(srcDir.path),
+            _throwsInvalidEngineException,
+          );
+        } finally {
+          tearDown();
+        }
+      });
+
+      test('returns an Engine', () {
+        setUp();
+        try {
+          final io.Directory srcDir = io.Directory(p.join(emptyDir.path, 'src'))..createSync();
+          io.Directory(p.join(srcDir.path, 'flutter')).createSync();
+          io.Directory(p.join(srcDir.path, 'out')).createSync();
+
+          final Engine engine = Engine.fromSrcPath(srcDir.path);
+
+          expect(engine.srcDir.path, srcDir.path);
+          expect(engine.flutterDir.path, p.join(srcDir.path, 'flutter'));
+          expect(engine.outDir.path, p.join(srcDir.path, 'out'));
+        } finally {
+          tearDown();
+        }
+      });
+    });
+  });
+
+  group('Engine.findWithin', () {
+    late io.Directory emptyDir;
+
+    void setUp() {
+      emptyDir = io.Directory.systemTemp.createTempSync('engine_repo_tools.test');
+    }
+
+    void tearDown() {
+      emptyDir.deleteSync(recursive: true);
+    }
+
+    group('should fail when', () {
+      test('the path does not contain a "src" directory', () {
+        setUp();
+        try {
+          expect(
+            () => Engine.findWithin(emptyDir.path),
+            throwsStateError,
+          );
+        } finally {
+          tearDown();
+        }
+      });
+
+      test('the path contains a "src" directory but it is not an engine root', () {
+        setUp();
+        try {
+          final io.Directory srcDir = io.Directory(p.join(emptyDir.path, 'src'))..createSync();
+          expect(
+            () => Engine.findWithin(srcDir.path),
+            throwsStateError,
+          );
+        } finally {
+          tearDown();
+        }
+      });
+
+      test('returns an Engine', () {
+        setUp();
+        try {
+          final io.Directory srcDir = io.Directory(p.join(emptyDir.path, 'src'))..createSync();
+          io.Directory(p.join(srcDir.path, 'flutter')).createSync();
+          io.Directory(p.join(srcDir.path, 'out')).createSync();
+
+          final Engine engine = Engine.findWithin(srcDir.path);
+
+          expect(engine.srcDir.path, srcDir.path);
+          expect(engine.flutterDir.path, p.join(srcDir.path, 'flutter'));
+          expect(engine.outDir.path, p.join(srcDir.path, 'out'));
+        } finally {
+          tearDown();
+        }
+      });
+
+      test('returns an Engine even if a "src" directory exists deeper in the tree', () {
+        // It's common to have "src" directories, so if we have something like:
+        //  /Users/.../engine/src/foo/bar/src/baz
+        //
+        // And we use `Engine.findWithin('/Users/.../engine/src/flutter/bar/src/baz')`,
+        // we should still find the engine (in this case, the engine root is
+        // `/Users/.../engine/src`).
+        setUp();
+        try {
+          final io.Directory srcDir = io.Directory(p.join(emptyDir.path, 'src'))..createSync();
+          io.Directory(p.join(srcDir.path, 'flutter')).createSync();
+          io.Directory(p.join(srcDir.path, 'out')).createSync();
+
+          final io.Directory nestedSrcDir = io.Directory(p.join(srcDir.path, 'flutter', 'bar', 'src', 'baz'))..createSync(recursive: true);
+
+          final Engine engine = Engine.findWithin(nestedSrcDir.path);
+
+          expect(engine.srcDir.path, srcDir.path);
+          expect(engine.flutterDir.path, p.join(srcDir.path, 'flutter'));
+          expect(engine.outDir.path, p.join(srcDir.path, 'out'));
+        } finally {
+          tearDown();
+        }
+      });
+    });
+  });
+
+  test('outputs an empty list of targets', () {
+    setUp();
+
+    try {
+      // Create a valid engine.
+      io.Directory(p.join(emptyDir.path, 'src', 'flutter')).createSync(recursive: true);
+      io.Directory(p.join(emptyDir.path, 'src', 'out')).createSync(recursive: true);
+
+      final Engine engine = Engine.fromSrcPath(p.join(emptyDir.path, 'src'));
+      expect(engine.outputs(), <Output>[]);
+      expect(engine.latestOutput(), isNull);
+    } finally {
+      tearDown();
+    }
+  });
+
+  test('outputs a list of targets', () {
+    setUp();
+
+    try {
+      // Create a valid engine.
+      io.Directory(p.join(emptyDir.path, 'src', 'flutter')).createSync(recursive: true);
+      io.Directory(p.join(emptyDir.path, 'src', 'out')).createSync(recursive: true);
+
+      // Create two targets in out: host_debug and host_debug_unopt_arm64.
+      io.Directory(p.join(emptyDir.path, 'src', 'out', 'host_debug')).createSync(recursive: true);
+      io.Directory(p.join(emptyDir.path, 'src', 'out', 'host_debug_unopt_arm64')).createSync(recursive: true);
+
+      final Engine engine = Engine.fromSrcPath(p.join(emptyDir.path, 'src'));
+      final List<String> outputs = engine.outputs().map((Output o) => p.basename(o.path.path)).toList()..sort();
+      expect(outputs, <String>[
+        'host_debug',
+        'host_debug_unopt_arm64',
+      ]);
+    } finally {
+      tearDown();
+    }
+  });
+
+  test('outputs the latest target and compile_commands.json', () {
+    setUp();
+
+    try {
+      // Create a valid engine.
+      final io.Directory srcDir = io.Directory(p.join(emptyDir.path, 'src'))
+        ..createSync(recursive: true);
+      final io.Directory flutterDir = io.Directory(p.join(srcDir.path, 'flutter'))
+        ..createSync(recursive: true);
+      final io.Directory outDir = io.Directory(p.join(srcDir.path, 'out'))
+        ..createSync(recursive: true);
+
+      // Create two targets in out: host_debug and host_debug_unopt_arm64.
+      final io.Directory hostDebug = io.Directory(p.join(outDir.path, 'host_debug'))
+        ..createSync(recursive: true);
+      final io.Directory hostDebugUnoptArm64 = io.Directory(
+        p.join(outDir.path, 'host_debug_unopt_arm64'),
+      )..createSync(recursive: true);
+
+      final Engine engine = TestEngine.withPaths(
+        srcDir: srcDir,
+        flutterDir: flutterDir,
+        outDir: outDir,
+        outputs: <TestOutput>[
+          TestOutput(
+            hostDebug,
+            lastModified: DateTime.utc(2023, 9, 23, 21, 16),
+          ),
+          TestOutput(
+            hostDebugUnoptArm64,
+            lastModified: DateTime.utc(2023, 9, 23, 22, 16),
+          ),
+        ],
+      );
+
+      final Output? latestOutput = engine.latestOutput();
+      expect(latestOutput, isNotNull);
+      expect(p.basename(latestOutput!.path.path), 'host_debug_unopt_arm64');
+      expect(latestOutput.compileCommandsJson, isNotNull);
+    } finally {
+      tearDown();
+    }
+  });
+}
+
+// This is needed because async_minitest and friends is not a proper testing
+// library and is missing a lot of functionality that was exclusively added
+// to pkg/test.
+void _throwsInvalidEngineException(Object? o) {
+  _checkThrow<InvalidEngineException>(o, (_){});
+}
+
+// Mostly copied from async_minitest.
+void _checkThrow<T extends Object>(dynamic v, void Function(dynamic error) onError) {
+  if (v is Future) {
+    asyncStart();
+    v.then((_) {
+      Expect.fail('Did not throw');
+    }, onError: (Object e, StackTrace s) {
+      if (e is! T) {
+        // ignore: only_throw_errors
+        throw e;
+      }
+      onError(e);
+      asyncEnd();
+    });
+    return;
+  }
+  v as void Function();
+  Expect.throws<T>(v, (T e) {
+    onError(e);
+    return true;
+  });
+}
diff --git a/tools/pkg/git_repo_tools/README.md b/tools/pkg/git_repo_tools/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..e308c8104b911d3ed2a2eadaf4d75428ca1fff3e
--- /dev/null
+++ b/tools/pkg/git_repo_tools/README.md
@@ -0,0 +1,23 @@
+# `git_repo_tools`
+
+This is a repo-internal library for `flutter/engine`, that contains shared code
+for writing tools that want to interact with the `git` repository. For example,
+finding all changed files in the current branch:
+
+```dart
+import 'dart:io' as io show File, Platform;
+
+import 'package:engine_repo_tools/engine_repo_tools.dart';
+import 'package:git_repo_tools/git_repo_tools.dart';
+import 'package:path/path.dart' as path;
+
+void main() async {
+  // Finds the root of the engine repository from the current script.
+  final Engine engine = Engine.findWithin(path.dirname(path.fromUri(io.Platform.script)));
+  final GitRepo gitRepo = GitRepo(engine.flutterDir);
+
+  for (final io.File file in gitRepo.changedFiles) {
+    print('Changed file: ${file.path}');
+  }
+}
+```
diff --git a/tools/clang_tidy/lib/src/git_repo.dart b/tools/pkg/git_repo_tools/lib/git_repo_tools.dart
similarity index 57%
rename from tools/clang_tidy/lib/src/git_repo.dart
rename to tools/pkg/git_repo_tools/lib/git_repo_tools.dart
index 49d55a442efc16d3261200f7ca9d13872735bbaf..db28e6df70ab65fea99b46bd7db03ddbc77cfd7e 100644
--- a/tools/clang_tidy/lib/src/git_repo.dart
+++ b/tools/pkg/git_repo_tools/lib/git_repo_tools.dart
@@ -2,25 +2,38 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:io' as io show Directory, File;
+import 'dart:io' as io show Directory, File, stdout;
 
 import 'package:path/path.dart' as path;
+import 'package:process/process.dart';
 import 'package:process_runner/process_runner.dart';
 
-/// Utility methods for working with a git repo.
-class GitRepo {
+/// Utility methods for working with a git repository.
+final class GitRepo {
   /// The git repository rooted at `root`.
-  GitRepo(this.root, {
+  GitRepo.fromRoot(this.root, {
     this.verbose = false,
-  });
+    StringSink? logSink,
+    ProcessManager processManager = const LocalProcessManager(),
+  }) :
+      _processManager = processManager,
+      logSink = logSink ?? io.stdout;
 
   /// Whether to produce verbose log output.
+  ///
+  /// If true, output of git commands will be printed to [logSink].
   final bool verbose;
 
+  /// Where to send verbose log output.
+  ///
+  /// Defaults to [io.stdout].
+  final StringSink logSink;
+
   /// The root of the git repo.
   final io.Directory root;
 
-  List<io.File>? _changedFiles;
+  /// The delegate to use for running processes.
+  final ProcessManager _processManager;
 
   /// Returns a list of all non-deleted files which differ from the nearest
   /// merge-base with `main`. If it can't find a fork point, uses the default
@@ -28,26 +41,38 @@ class GitRepo {
   ///
   /// This is only computed once and cached. Subsequent invocations of the
   /// getter will return the same result.
-  Future<List<io.File>> get changedFiles async =>
-    _changedFiles ??= await _getChangedFiles();
-
-  List<io.File>? _changedFilesAtHead;
+  late final Future<List<io.File>> changedFiles = _changedFiles();
 
-  /// Returns a list of non-deleted files which differ between the HEAD
-  /// commit and its parent.
-  Future<List<io.File>> get changedFilesAtHead async =>
-    _changedFilesAtHead ??= await _getChangedFilesAtHead();
+  /// Returns the SHA of the current HEAD commit.
+  Future<String> headSha({bool short = false}) async {
+    final ProcessRunnerResult result = await ProcessRunner(
+      defaultWorkingDirectory: root,
+      processManager: _processManager,
+    ).runProcess(
+      <String>['git', 'rev-parse', if (short) '--short' ,'HEAD'],
+    );
+    return result.stdout.trim();
+  }
 
-  Future<List<io.File>> _getChangedFiles() async {
+  Future<List<io.File>> _changedFiles() async {
     final ProcessRunner processRunner = ProcessRunner(
       defaultWorkingDirectory: root,
+      processManager: _processManager,
     );
     await _fetch(processRunner);
+    // Find the merge base between the current branch and the branch that was
+    // checked out at the time of the last fetch. The merge base is the common
+    // ancestor of the two branches, and the output is the hash of the merge
+    // base.
     ProcessRunnerResult mergeBaseResult = await processRunner.runProcess(
       <String>['git', 'merge-base', '--fork-point', 'FETCH_HEAD', 'HEAD'],
       failOk: true,
     );
     if (mergeBaseResult.exitCode != 0) {
+      if (verbose) {
+        logSink.writeln('git merge-base --fork-point failed, using default merge-base');
+        logSink.writeln('Output:\n${mergeBaseResult.stdout}');
+      }
       mergeBaseResult = await processRunner.runProcess(<String>[
         'git',
         'merge-base',
@@ -56,8 +81,7 @@ class GitRepo {
       ]);
     }
     final String mergeBase = mergeBaseResult.stdout.trim();
-    final ProcessRunnerResult masterResult = await processRunner
-        .runProcess(<String>[
+    final ProcessRunnerResult masterResult = await processRunner.runProcess(<String>[
       'git',
       'diff',
       '--name-only',
@@ -67,9 +91,17 @@ class GitRepo {
     return _gitOutputToList(masterResult);
   }
 
-  Future<List<io.File>> _getChangedFilesAtHead() async {
+  /// Returns a list of non-deleted files which differ between the HEAD
+  /// commit and its parent.
+  ///
+  /// This is only computed once and cached. Subsequent invocations of the
+  /// getter will return the same result.
+  late final Future<List<io.File>> changedFilesAtHead = _changedFilesAtHead();
+
+  Future<List<io.File>> _changedFilesAtHead() async {
     final ProcessRunner processRunner = ProcessRunner(
       defaultWorkingDirectory: root,
+      processManager: _processManager,
     );
     await _fetch(processRunner);
     final ProcessRunnerResult diffTreeResult = await processRunner.runProcess(
@@ -92,6 +124,10 @@ class GitRepo {
       failOk: true,
     );
     if (fetchResult.exitCode != 0) {
+      if (verbose) {
+        logSink.writeln('git fetch upstream main failed, using origin main');
+        logSink.writeln('Output:\n${fetchResult.stdout}');
+      }
       await processRunner.runProcess(<String>[
         'git',
         'fetch',
@@ -104,7 +140,7 @@ class GitRepo {
   List<io.File> _gitOutputToList(ProcessRunnerResult result) {
     final String diffOutput = result.stdout.trim();
     if (verbose) {
-      print('git diff output:\n$diffOutput');
+      logSink.writeln('git diff output:\n$diffOutput');
     }
     final Set<String> resultMap = <String>{};
     resultMap.addAll(diffOutput.split('\n').where(
diff --git a/tools/pkg/git_repo_tools/pubspec.yaml b/tools/pkg/git_repo_tools/pubspec.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..04147bf005fc6a6ce32100effb2238226d940ed2
--- /dev/null
+++ b/tools/pkg/git_repo_tools/pubspec.yaml
@@ -0,0 +1,60 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+name: git_repo_tools
+publish_to: none
+environment:
+  sdk: '>=3.2.0-0 <4.0.0'
+
+# Do not add any dependencies that require more than what is provided in
+# //third_party/pkg, //third_party/dart/pkg, or
+# //third_party/dart/third_party/pkg. In particular, package:test is not usable
+# here.
+
+# If you do add packages here, make sure you can run `pub get --offline`, and
+# check the .packages and .package_config to make sure all the paths are
+# relative to this directory into //third_party/dart
+
+dependencies:
+  meta: any
+  path: any
+  process: any
+  process_runner: any
+
+dev_dependencies:
+  async_helper: any
+  expect: any
+  litetest: any
+  process_fakes: any
+  smith: any
+
+dependency_overrides:
+  args:
+    path: ../../../../third_party/dart/third_party/pkg/args
+  async:
+    path: ../../../../third_party/dart/third_party/pkg/async
+  async_helper:
+    path: ../../../../third_party/dart/pkg/async_helper
+  collection:
+    path: ../../../../third_party/dart/third_party/pkg/collection
+  expect:
+    path: ../../../../third_party/dart/pkg/expect
+  file:
+    path: ../../../../third_party/dart/third_party/pkg/file/packages/file
+  litetest:
+    path: ../../../testing/litetest
+  meta:
+    path: ../../../../third_party/dart/pkg/meta
+  path:
+    path: ../../../../third_party/dart/third_party/pkg/path
+  platform:
+    path: ../../../third_party/pkg/platform
+  process:
+    path: ../../../third_party/pkg/process
+  process_fakes:
+    path: ../process_fakes
+  process_runner:
+    path: ../../../third_party/pkg/process_runner
+  smith:
+    path: ../../../../third_party/dart/pkg/smith
diff --git a/tools/pkg/git_repo_tools/test/git_repo_tools_test.dart b/tools/pkg/git_repo_tools/test/git_repo_tools_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..c4048174458b6e4d4738ad5661982bb3eabbefda
--- /dev/null
+++ b/tools/pkg/git_repo_tools/test/git_repo_tools_test.dart
@@ -0,0 +1,212 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io' as io;
+
+import 'package:git_repo_tools/git_repo_tools.dart';
+import 'package:litetest/litetest.dart';
+import 'package:process_fakes/process_fakes.dart';
+
+void main() {
+  const String fakeShaHash = 'fake-sha-hash';
+
+
+  test('returns non-deleted files which differ from merge-base with main', () async {
+    final Fixture fixture = Fixture(
+      processManager: FakeProcessManager(
+        onStart: (List<String> command) {
+          // Succeed calling "git merge-base --fork-point FETCH_HEAD HEAD".
+          if (command.join(' ').startsWith('git merge-base --fork-point')) {
+            return FakeProcess(stdout: fakeShaHash);
+          }
+
+          // Succeed calling "git fetch upstream main".
+          if (command.join(' ') == 'git fetch upstream main') {
+            return FakeProcess();
+          }
+
+          // Succeed calling "git diff --name-only --diff-filter=ACMRT fake-sha-hash".
+          if (command.join(' ') == 'git diff --name-only --diff-filter=ACMRT $fakeShaHash') {
+            return FakeProcess(stdout: 'file1\nfile2');
+          }
+
+          // Otherwise, fail.
+          return FakeProcessManager.unhandledStart(command);
+        },
+      ),
+    );
+
+    try {
+      final List<io.File> changedFiles = await fixture.gitRepo.changedFiles;
+      expect(changedFiles, hasLength(2));
+      expect(changedFiles[0].path, endsWith('file1'));
+      expect(changedFiles[1].path, endsWith('file2'));
+    } finally {
+      fixture.gitRepo.root.deleteSync(recursive: true);
+    }
+  });
+
+  test('returns non-deleted files which differ from default merge-base', () async {
+    final Fixture fixture = Fixture(
+      processManager: FakeProcessManager(
+        onStart: (List<String> command) {
+          if (command.join(' ').startsWith('git merge-base --fork-point')) {
+            return FakeProcess(exitCode: 1);
+          }
+
+          if (command.join(' ').startsWith('git merge-base')) {
+            return FakeProcess(stdout: fakeShaHash);
+          }
+
+          if (command.join(' ') == 'git fetch upstream main') {
+            return FakeProcess();
+          }
+
+          if (command.join(' ') == 'git diff --name-only --diff-filter=ACMRT $fakeShaHash') {
+            return FakeProcess(stdout: 'file1\nfile2');
+          }
+
+          // Otherwise, fail.
+          return FakeProcessManager.unhandledStart(command);
+        },
+      ),
+    );
+
+    try {
+      final List<io.File> changedFiles = await fixture.gitRepo.changedFiles;
+      expect(changedFiles, hasLength(2));
+      expect(changedFiles[0].path, endsWith('file1'));
+      expect(changedFiles[1].path, endsWith('file2'));
+    } finally {
+      fixture.gitRepo.root.deleteSync(recursive: true);
+    }
+  });
+
+  test('returns non-deleted files which differ from HEAD', () async {
+    final Fixture fixture = Fixture(
+      processManager: FakeProcessManager(
+        onStart: (List<String> command) {
+          if (command.join(' ') == 'git fetch upstream main') {
+            return FakeProcess();
+          }
+
+          if (command.join(' ') == 'git diff-tree --no-commit-id --name-only --diff-filter=ACMRT -r HEAD') {
+            return FakeProcess(stdout: 'file1\nfile2');
+          }
+
+          // Otherwise, fail.
+          return FakeProcessManager.unhandledStart(command);
+        },
+      ),
+    );
+
+    try {
+      final List<io.File> changedFiles = await fixture.gitRepo.changedFilesAtHead;
+      expect(changedFiles, hasLength(2));
+      expect(changedFiles[0].path, endsWith('file1'));
+      expect(changedFiles[1].path, endsWith('file2'));
+    } finally {
+      fixture.gitRepo.root.deleteSync(recursive: true);
+    }
+  });
+
+  test('returns non-deleted files which differ from HEAD when merge-base fails', () async {
+    final Fixture fixture = Fixture(
+      processManager: FakeProcessManager(
+        onStart: (List<String> command) {
+          if (command.join(' ') == 'git fetch upstream main') {
+            return FakeProcess();
+          }
+
+          if (command.join(' ') == 'git diff-tree --no-commit-id --name-only --diff-filter=ACMRT -r HEAD') {
+            return FakeProcess(stdout: 'file1\nfile2');
+          }
+
+          if (command.join(' ').startsWith('git merge-base --fork-point')) {
+            return FakeProcess(exitCode: 1);
+          }
+
+          if (command.join(' ').startsWith('git merge-base')) {
+            return FakeProcess(stdout: fakeShaHash);
+          }
+
+          // Otherwise, fail.
+          return FakeProcessManager.unhandledStart(command);
+        },
+      ),
+    );
+
+    try {
+      final List<io.File> changedFiles = await fixture.gitRepo.changedFilesAtHead;
+      expect(changedFiles, hasLength(2));
+      expect(changedFiles[0].path, endsWith('file1'));
+      expect(changedFiles[1].path, endsWith('file2'));
+    } finally {
+      fixture.gitRepo.root.deleteSync(recursive: true);
+    }
+  });
+
+  test('verbose output is captured', () async {
+    final Fixture fixture = Fixture(
+      processManager: FakeProcessManager(
+        onStart: (List<String> command) {
+          if (command.join(' ').startsWith('git merge-base --fork-point')) {
+            return FakeProcess(exitCode: 1);
+          }
+
+          if (command.join(' ').startsWith('git merge-base')) {
+            return FakeProcess(stdout: fakeShaHash);
+          }
+
+          if (command.join(' ') == 'git fetch upstream main') {
+            return FakeProcess();
+          }
+
+          if (command.join(' ') == 'git diff --name-only --diff-filter=ACMRT $fakeShaHash') {
+            return FakeProcess(stdout: 'file1\nfile2');
+          }
+
+          // Otherwise, fail.
+          return FakeProcessManager.unhandledStart(command);
+        },
+      ),
+      verbose: true,
+    );
+
+    try {
+      await fixture.gitRepo.changedFiles;
+      expect(fixture.logSink.toString(), contains('git merge-base --fork-point failed, using default merge-base'));
+      expect(fixture.logSink.toString(), contains('git diff output:\nfile1\nfile2'));
+    } finally {
+      fixture.gitRepo.root.deleteSync(recursive: true);
+    }
+  });
+}
+
+final class Fixture {
+  factory Fixture({
+    FakeProcessManager? processManager,
+    bool verbose = false,
+  }) {
+    final io.Directory root = io.Directory.systemTemp.createTempSync('git_repo_tools.test');
+    final StringBuffer logSink = StringBuffer();
+    processManager ??= FakeProcessManager();
+    return Fixture._(
+      gitRepo: GitRepo.fromRoot(root,
+        logSink: logSink,
+        processManager: processManager,
+        verbose: verbose,
+      ),
+      logSink: logSink,
+    );
+  }
+
+  const Fixture._({
+    required this.gitRepo,
+    required this.logSink,
+  });
+
+  final GitRepo gitRepo;
+  final StringBuffer logSink;
+}
diff --git a/tools/pkg/process_fakes/README.md b/tools/pkg/process_fakes/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..33da210aea5b09afb8e813aad7289dc212eecfcc
--- /dev/null
+++ b/tools/pkg/process_fakes/README.md
@@ -0,0 +1,7 @@
+# `process_fakes`
+
+Fake implementations of `Process` and `ProcessManager` for testing.
+
+This is not a great package, and is the bare minimum needed for fairly basic
+tooling that uses `ProcessManager`. If we ever need a more complete solution
+we should look at upstreaming [`flutter_tools/.../fake_proecss_manager.dart`](https://github.com/flutter/flutter/blob/a9183f696c8e12617d05a26b0b5e80035e515f2a/packages/flutter_tools/test/src/fake_process_manager.dart#L223)
diff --git a/tools/pkg/process_fakes/lib/process_fakes.dart b/tools/pkg/process_fakes/lib/process_fakes.dart
new file mode 100644
index 0000000000000000000000000000000000000000..bab281110be55abba21402b92d6cc955323bda94
--- /dev/null
+++ b/tools/pkg/process_fakes/lib/process_fakes.dart
@@ -0,0 +1,131 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:convert';
+import 'dart:io' as io;
+
+import 'package:process/process.dart';
+
+/// A fake implementation of [ProcessManager] that allows control for testing.
+final class FakeProcessManager implements ProcessManager {
+  /// Creates a fake process manager delegates to [onRun] and [onStart].
+  ///
+  /// If either is not provided, it throws an [UnsupportedError] when called.
+  FakeProcessManager({
+    io.ProcessResult Function(List<String> command) onRun = unhandledRun,
+    io.Process Function(List<String> command) onStart = unhandledStart,
+    bool Function(Object?, {String? workingDirectory}) canRun = unhandledCanRun,
+  }) : _onRun = onRun, _onStart = onStart, _canRun = canRun;
+
+  /// A default implementation of [onRun] that throws an [UnsupportedError].
+  static io.ProcessResult unhandledRun(List<String> command) {
+    throw UnsupportedError('Unhandled run: ${command.join(' ')}');
+  }
+
+  /// A default implementation of [onStart] that throws an [UnsupportedError].
+  static io.Process unhandledStart(List<String> command) {
+    throw UnsupportedError('Unhandled start: ${command.join(' ')}');
+  }
+
+  /// A default implementation of [canRun] that returns `true`.
+  static bool unhandledCanRun(Object? executable, {String? workingDirectory}) {
+    return true;
+  }
+
+  final io.ProcessResult Function(List<String> command) _onRun;
+  final io.Process Function(List<String> command) _onStart;
+  final bool Function(Object?, {String? workingDirectory}) _canRun;
+
+  @override
+  bool canRun(Object? executable, {String? workingDirectory}) {
+    return _canRun(executable, workingDirectory: workingDirectory);
+  }
+
+  @override
+  bool killPid(int pid, [io.ProcessSignal signal = io.ProcessSignal.sigterm]) => true;
+
+  @override
+  Future<io.ProcessResult> run(
+    List<Object> command, {
+    String? workingDirectory,
+    Map<String, String>? environment,
+    bool includeParentEnvironment = true,
+    bool runInShell = false,
+    Encoding stdoutEncoding = io.systemEncoding,
+    Encoding stderrEncoding = io.systemEncoding,
+  }) async {
+    return runSync(
+      command,
+      workingDirectory: workingDirectory,
+      environment: environment,
+      includeParentEnvironment: includeParentEnvironment,
+      runInShell: runInShell,
+      stdoutEncoding: stdoutEncoding,
+      stderrEncoding: stderrEncoding,
+    );
+  }
+
+  @override
+  io.ProcessResult runSync(
+    List<Object> command, {
+    String? workingDirectory,
+    Map<String, String>? environment,
+    bool includeParentEnvironment = true,
+    bool runInShell = false,
+    Encoding stdoutEncoding = io.systemEncoding,
+    Encoding stderrEncoding = io.systemEncoding,
+  }) {
+    return _onRun(command.map((Object o) => '$o').toList());
+  }
+
+  @override
+  Future<io.Process> start(
+    List<Object> command, {
+    String? workingDirectory,
+    Map<String, String>? environment,
+    bool includeParentEnvironment = true,
+    bool runInShell = false,
+    io.ProcessStartMode mode = io.ProcessStartMode.normal,
+  }) async {
+    return _onStart(command.map((Object o) => '$o').toList());
+  }
+}
+
+/// An incomplete fake of [io.Process] that allows control for testing.
+final class FakeProcess implements io.Process {
+  /// Creates a fake process that returns the given [exitCode] and out/err.
+  FakeProcess({
+    int exitCode = 0,
+    String stdout = '',
+    String stderr = '',
+  })  : _exitCode = exitCode,
+        _stdout = stdout,
+        _stderr = stderr;
+
+  final int _exitCode;
+  final String _stdout;
+  final String _stderr;
+
+  @override
+  Future<int> get exitCode async => _exitCode;
+
+  @override
+  bool kill([io.ProcessSignal signal = io.ProcessSignal.sigterm]) => true;
+
+  @override
+  int get pid => 0;
+
+  @override
+  Stream<List<int>> get stderr {
+    return Stream<List<int>>.fromIterable(<List<int>>[io.systemEncoding.encoder.convert(_stderr)]);
+  }
+
+  @override
+  io.IOSink get stdin => throw UnimplementedError();
+
+  @override
+  Stream<List<int>> get stdout {
+    return Stream<List<int>>.fromIterable(<List<int>>[io.systemEncoding.encoder.convert(_stdout)]);
+  }
+}
diff --git a/tools/pkg/process_fakes/pubspec.yaml b/tools/pkg/process_fakes/pubspec.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..1df02f727432862feb2525cc3d720ee7a1f1fbc0
--- /dev/null
+++ b/tools/pkg/process_fakes/pubspec.yaml
@@ -0,0 +1,36 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+name: process_fakes
+publish_to: none
+environment:
+  sdk: '>=3.2.0-0 <4.0.0'
+
+# Do not add any dependencies that require more than what is provided in
+# //third_party/pkg, //third_party/dart/pkg, or
+# //third_party/dart/third_party/pkg. In particular, package:test is not usable
+# here.
+
+# If you do add packages here, make sure you can run `pub get --offline`, and
+# check the .packages and .package_config to make sure all the paths are
+# relative to this directory into //third_party/dart
+
+dependencies:
+  file: any
+  meta: any
+  path: any
+  platform: any
+  process: any
+
+dependency_overrides:
+  file:
+    path: ../../../../third_party/dart/third_party/pkg/file/packages/file
+  meta:
+    path: ../../../../third_party/dart/pkg/meta
+  path:
+    path: ../../../../third_party/dart/third_party/pkg/path
+  platform:
+    path: ../../../third_party/pkg/platform
+  process:
+    path: ../../../third_party/pkg/process
diff --git a/tools/pub_get_offline.py b/tools/pub_get_offline.py
index e1807ebb0cc1ae11db1eb9c0b519a6e471f655ce..5f603b3a6f62a4f6e876b025dbc85fd4a8c24121 100644
--- a/tools/pub_get_offline.py
+++ b/tools/pub_get_offline.py
@@ -14,82 +14,128 @@ import os
 import subprocess
 import sys
 
-SRC_ROOT = os.path.dirname(
-    os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-)
+SRC_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 ENGINE_DIR = os.path.join(SRC_ROOT, 'flutter')
 
 ALL_PACKAGES = [
-    os.path.join(ENGINE_DIR, "ci"),
-    os.path.join(ENGINE_DIR, "flutter_frontend_server"),
-    os.path.join(ENGINE_DIR, "shell", "vmservice"),
-    os.path.join(ENGINE_DIR, "testing", "benchmark"),
-    os.path.join(ENGINE_DIR, "testing", "dart"),
-    os.path.join(ENGINE_DIR, "testing", "litetest"),
-    os.path.join(ENGINE_DIR, "testing", "android_background_image"),
-    os.path.join(ENGINE_DIR, "testing", "scenario_app"),
-    os.path.join(ENGINE_DIR, "testing", "smoke_test_failure"),
-    os.path.join(ENGINE_DIR, "testing", "symbols"),
-    os.path.join(ENGINE_DIR, "tools", "api_check"),
-    os.path.join(ENGINE_DIR, "tools", "android_lint"),
-    os.path.join(ENGINE_DIR, "tools", "clang_tidy"),
-    os.path.join(ENGINE_DIR, "tools", "const_finder"),
-    os.path.join(ENGINE_DIR, "tools", "githooks"),
-    os.path.join(ENGINE_DIR, "tools", "licenses"),
-    os.path.join(ENGINE_DIR, "tools", "path_ops", "dart")
+    os.path.join(ENGINE_DIR, 'ci'),
+    os.path.join(ENGINE_DIR, 'flutter_frontend_server'),
+    os.path.join(ENGINE_DIR, 'impeller', 'tessellator', 'dart'),
+    os.path.join(ENGINE_DIR, 'shell', 'vmservice'),
+    os.path.join(ENGINE_DIR, 'testing', 'android_background_image'),
+    os.path.join(ENGINE_DIR, 'testing', 'benchmark'),
+    os.path.join(ENGINE_DIR, 'testing', 'dart'),
+    os.path.join(ENGINE_DIR, 'testing', 'litetest'),
+    os.path.join(ENGINE_DIR, 'testing', 'scenario_app'),
+    os.path.join(ENGINE_DIR, 'testing', 'skia_gold_client'),
+    os.path.join(ENGINE_DIR, 'testing', 'smoke_test_failure'),
+    os.path.join(ENGINE_DIR, 'testing', 'symbols'),
+    os.path.join(ENGINE_DIR, 'tools', 'android_lint'),
+    os.path.join(ENGINE_DIR, 'tools', 'api_check'),
+    os.path.join(ENGINE_DIR, 'tools', 'build_bucket_golden_scraper'),
+    os.path.join(ENGINE_DIR, 'tools', 'clang_tidy'),
+    os.path.join(ENGINE_DIR, 'tools', 'compare_goldens'),
+    os.path.join(ENGINE_DIR, 'tools', 'const_finder'),
+    os.path.join(ENGINE_DIR, 'tools', 'dir_contents_diff'),
+    os.path.join(ENGINE_DIR, 'tools', 'engine_tool'),
+    os.path.join(ENGINE_DIR, 'tools', 'gen_web_locale_keymap'),
+    os.path.join(ENGINE_DIR, 'tools', 'githooks'),
+    os.path.join(ENGINE_DIR, 'tools', 'golden_tests_harvester'),
+    os.path.join(ENGINE_DIR, 'tools', 'header_guard_check'),
+    os.path.join(ENGINE_DIR, 'tools', 'licenses'),
+    os.path.join(ENGINE_DIR, 'tools', 'path_ops', 'dart'),
+    os.path.join(ENGINE_DIR, 'tools', 'pkg', 'engine_build_configs'),
+    os.path.join(ENGINE_DIR, 'tools', 'pkg', 'engine_repo_tools'),
+    os.path.join(ENGINE_DIR, 'tools', 'pkg', 'git_repo_tools'),
+    os.path.join(ENGINE_DIR, 'tools', 'pkg', 'process_fakes'),
 ]
 
 
-def FetchPackage(pub, package):
+def fetch_package(pub, package):
   try:
     subprocess.check_output(pub, cwd=package, stderr=subprocess.STDOUT)
   except subprocess.CalledProcessError as err:
     print(
-        "'%s' failed in '%s' with status %d:\n%s" %
+        '"%s" failed in "%s" with status %d:\n%s' %
         (' '.join(pub), package, err.returncode, err.output)
     )
     return 1
   return 0
 
 
-def CheckPackage(package):
-  package_config = os.path.join(package, ".dart_tool", "package_config.json")
+def check_package(package):
+  package_config = os.path.join(package, '.dart_tool', 'package_config.json')
   pub_count = 0
-  with open(package_config) as f:
-    data_dict = json.load(f)
-    packages_data = data_dict["packages"]
+  with open(package_config) as config_file:
+    data_dict = json.load(config_file)
+    packages_data = data_dict['packages']
     for package_data in packages_data:
-      package_uri = package_data["rootUri"]
-      package_name = package_data["name"]
-      if ".pub-cache" in package_uri and "pub.dartlang.org" in package_uri:
-        print("Error: package '%s' was fetched from pub" % package_name)
+      package_uri = package_data['rootUri']
+      package_name = package_data['name']
+      if '.pub-cache' in package_uri and ('pub.dartlang.org' in package_uri or
+                                          'pub.dev' in package_uri):
+        print('Error: package "%s" was fetched from pub' % package_name)
         pub_count = pub_count + 1
   if pub_count > 0:
+    print('Error: %d packages were fetched from pub for %s' % (pub_count, package))
     print(
-        "Error: %d packages were fetched from pub for %s" %
-        (pub_count, package)
-    )
-    print(
-        "Please fix the pubspec.yaml for %s "
-        "so that all dependencies are path dependencies" % package
+        'Please fix the pubspec.yaml for %s '
+        'so that all dependencies are path dependencies' % package
     )
   return pub_count
 
 
-def Main():
-  dart_sdk_bin = os.path.join(
-      SRC_ROOT, "third_party", "dart", "tools", "sdks", "dart-sdk", "bin"
-  )
-  dart = "dart"
-  if os.name == "nt":
-    dart = "dart.exe"
-  pubcmd = [os.path.join(dart_sdk_bin, dart), "pub", "get", "--offline"]
+EXCLUDED_DIRS = [
+    os.path.join(ENGINE_DIR, 'lib'),
+    os.path.join(ENGINE_DIR, 'prebuilts'),
+    os.path.join(ENGINE_DIR, 'shell', 'platform', 'fuchsia'),
+    os.path.join(ENGINE_DIR, 'shell', 'vmservice'),
+    os.path.join(ENGINE_DIR, 'sky', 'packages'),
+    os.path.join(ENGINE_DIR, 'third_party'),
+    os.path.join(ENGINE_DIR, 'web_sdk'),
+]
+
+
+# Returns a list of paths to directories containing pubspec.yaml files that
+# are not listed in ALL_PACKAGES. Directory trees under the paths in
+# EXCLUDED_DIRS are skipped.
+def find_unlisted_packages():
+  unlisted = []
+  for root, dirs, files in os.walk(ENGINE_DIR):
+    excluded = []
+    for dirname in dirs:
+      full_dirname = os.path.join(root, dirname)
+      if full_dirname in EXCLUDED_DIRS:
+        excluded.append(dirname)
+    for exclude in excluded:
+      dirs.remove(exclude)
+    for filename in files:
+      if filename == 'pubspec.yaml':
+        if root not in ALL_PACKAGES:
+          unlisted.append(root)
+  return unlisted
+
+
+def main():
+  dart_sdk_bin = os.path.join(SRC_ROOT, 'third_party', 'dart', 'tools', 'sdks', 'dart-sdk', 'bin')
+
+  # Ensure all relevant packages are listed in ALL_PACKAGES.
+  unlisted = find_unlisted_packages()
+  if len(unlisted) > 0:
+    for pkg in unlisted:
+      print('The Dart package "%s" must be checked in flutter/tools/pub_get_offline.py' % pkg)
+    return 1
+
+  dart = 'dart'
+  if os.name == 'nt':
+    dart = 'dart.exe'
+  pubcmd = [os.path.join(dart_sdk_bin, dart), 'pub', '--suppress-analytics', 'get', '--offline']
 
   pub_count = 0
   for package in ALL_PACKAGES:
-    if FetchPackage(pubcmd, package) != 0:
+    if fetch_package(pubcmd, package) != 0:
       return 1
-    pub_count = pub_count + CheckPackage(package)
+    pub_count = pub_count + check_package(package)
 
   if pub_count > 0:
     return 1
@@ -98,4 +144,4 @@ def Main():
 
 
 if __name__ == '__main__':
-  sys.exit(Main())
+  sys.exit(main())
diff --git a/tools/templater/BUILD.gn b/tools/templater/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..78bab468318f2149143bf065cc7af6102cd46751
--- /dev/null
+++ b/tools/templater/BUILD.gn
@@ -0,0 +1,11 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+executable("templater") {
+  sources = [ "templater_main.cc" ]
+  deps = [
+    "//flutter/fml",
+    "//third_party/inja",
+  ]
+}
diff --git a/tools/templater/templater.gni b/tools/templater/templater.gni
new file mode 100644
index 0000000000000000000000000000000000000000..fc4b47cb97df8c570f44d9837ed47342650f4e73
--- /dev/null
+++ b/tools/templater/templater.gni
@@ -0,0 +1,31 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/compiled_action.gni")
+
+# Inflate the input template file using Inja and the specified values.
+template("templater") {
+  assert(defined(invoker.input), "The input template must be specified.")
+  assert(defined(invoker.output), "The output location must be defined.")
+  assert(
+      defined(invoker.values),
+      "The values referenced in the template must be specified. Use the --key=value format for each value.")
+
+  compiled_action(target_name) {
+    tool = "//flutter/tools/templater"
+
+    inputs = [ invoker.input ]
+    outputs = [ invoker.output ]
+
+    templater_input_path = rebase_path(invoker.input, root_build_dir)
+    templater_input_flag = "--templater-input=$templater_input_path"
+    templater_output_path = rebase_path(invoker.output, root_build_dir)
+    templater_output_flag = "--templater-output=$templater_output_path"
+
+    args = [
+             templater_input_flag,
+             templater_output_flag,
+           ] + invoker.values
+  }
+}
diff --git a/tools/templater/templater_main.cc b/tools/templater/templater_main.cc
new file mode 100644
index 0000000000000000000000000000000000000000..4cd0f230d8857e4bfdd4741ef14c22e0b432ba5e
--- /dev/null
+++ b/tools/templater/templater_main.cc
@@ -0,0 +1,73 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// FLUTTER_NOLINT: https://github.com/flutter/flutter/issues/105732
+
+#include <filesystem>
+#include <string>
+#include <string_view>
+
+#include "flutter/fml/command_line.h"
+#include "flutter/fml/file.h"
+#include "flutter/fml/logging.h"
+#include "flutter/fml/mapping.h"
+#include "inja/inja.hpp"
+
+namespace flutter {
+
+bool TemplaterMain(const fml::CommandLine& command_line) {
+  std::string input_path;
+  std::string output_path;
+
+  if (!command_line.GetOptionValue("templater-input", &input_path)) {
+    FML_LOG(ERROR)
+        << "Input template path not specified. Use --templater-input.";
+    return false;
+  }
+  if (!command_line.GetOptionValue("templater-output", &output_path)) {
+    FML_LOG(ERROR)
+        << "Input template path not specified. Use --templater-output.";
+    return false;
+  }
+
+  auto input = fml::FileMapping::CreateReadOnly(input_path);
+  if (!input) {
+    FML_LOG(ERROR) << "Could not open input file: " << input_path;
+    return false;
+  }
+
+  nlohmann::json arguments;
+  for (const auto& option : command_line.options()) {
+    arguments[option.name] = option.value;
+  }
+  inja::Environment env;
+  auto rendered_template = env.render(
+      std::string_view{reinterpret_cast<const char*>(input->GetMapping()),
+                       input->GetSize()},
+      arguments);
+  auto output = fml::NonOwnedMapping{
+      reinterpret_cast<const uint8_t*>(rendered_template.data()),
+      rendered_template.size()};
+
+  auto current_dir =
+      fml::OpenDirectory(std::filesystem::current_path().u8string().c_str(),
+                         false, fml::FilePermission::kReadWrite);
+  if (!current_dir.is_valid()) {
+    FML_LOG(ERROR) << "Could not open current directory.";
+    return false;
+  }
+  if (!fml::WriteAtomically(current_dir, output_path.c_str(), output)) {
+    FML_LOG(ERROR) << "Could not write output to path: " << output_path;
+    return false;
+  }
+  return true;
+}
+
+}  // namespace flutter
+
+int main(int argc, char const* argv[]) {
+  return flutter::TemplaterMain(fml::CommandLineFromArgcArgv(argc, argv))
+             ? EXIT_SUCCESS
+             : EXIT_FAILURE;
+}
diff --git a/tools/yapf.bat b/tools/yapf.bat
new file mode 100644
index 0000000000000000000000000000000000000000..e75ae51364a32db82683b34b9f6f322bb2f3a6ec
--- /dev/null
+++ b/tools/yapf.bat
@@ -0,0 +1,16 @@
+@ECHO off
+REM Copyright 2013 The Flutter Authors. All rights reserved.
+REM Use of this source code is governed by a BSD-style license that can be
+REM found in the LICENSE file.
+
+REM ---------------------------------- NOTE ----------------------------------
+REM
+REM Please keep the logic in this file consistent with the logic in the
+REM `yapf.sh` script in the same directory to ensure that it continues to
+REM work across all platforms!
+REM
+REM --------------------------------------------------------------------------
+
+SET yapf_path=%~dp0\..\..\flutter\third_party\yapf
+
+cmd /V /C "SET PYTHONPATH=%yapf_path%&& vpython3 %yapf_path%\yapf %*"
diff --git a/tools/yapf.sh b/tools/yapf.sh
index af6e7021ddcc1b77b1e00fac37e59612c6f48abd..48d0974a0102a282b9e085a57ffd5aaabbea892c 100755
--- a/tools/yapf.sh
+++ b/tools/yapf.sh
@@ -3,6 +3,14 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+# ---------------------------------- NOTE ----------------------------------
+#
+# Please keep the logic in this file consistent with the logic in the
+# `yapf.bat` script in the same directory to ensure that it continues to
+# work across all platforms!
+#
+# --------------------------------------------------------------------------
+
 # Generates objc docs for Flutter iOS libraries.
 
 set -e
@@ -27,6 +35,6 @@ function follow_links() (
 
 SCRIPT_DIR=$(follow_links "$(dirname -- "${BASH_SOURCE[0]}")")
 SRC_DIR="$(cd "$SCRIPT_DIR/../.."; pwd -P)"
-YAPF_DIR="$(cd "$SRC_DIR/third_party/yapf"; pwd -P)"
+YAPF_DIR="$(cd "$SRC_DIR/flutter/third_party/yapf"; pwd -P)"
 
 PYTHONPATH="$YAPF_DIR" python3 "$YAPF_DIR/yapf" "$@"
diff --git a/vulkan/BUILD.gn b/vulkan/BUILD.gn
index 015996e55d1d716174e728aea2f0fc00dfbb0160..cf2518a0ecf41e2d00d7b398cf97fdc33770dd27 100644
--- a/vulkan/BUILD.gn
+++ b/vulkan/BUILD.gn
@@ -2,17 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/fuchsia/sdk.gni")
-
-config("vulkan_config") {
-  include_dirs = [ "//third_party/vulkan_memory_allocator/include" ]
-  defines = [ "VULKAN_HPP_NO_EXCEPTIONS=1" ]
-  if (is_fuchsia) {
-    include_dirs += [ "//third_party/fuchsia-vulkan/include" ]
-    defines += [ "VK_USE_PLATFORM_FUCHSIA=1" ]
-  } else {
-    include_dirs += [ "//third_party/vulkan-deps/vulkan-headers/src/include" ]
-  }
+if (is_fuchsia) {
+  import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
 }
 
 source_set("vulkan") {
@@ -56,14 +47,14 @@ source_set("vulkan") {
     "procs",
     "//flutter/flutter_vma:flutter_skia_vma",
     "//flutter/fml",
-    "//third_party/skia",
+    "//flutter/skia",
   ]
 
-  public_configs = [
-    ":vulkan_config",
-    "//flutter:config",
-  ]
+  public_configs = [ "//flutter:config" ]
 
-  public_deps =
-      [ "//third_party/vulkan-deps/vulkan-headers/src:vulkan_headers" ]
+  if (!is_ohos) {
+    public_deps = [
+      "//flutter/third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
+    ]
+  }
 }
diff --git a/vulkan/config.gni b/vulkan/config.gni
index 08ccbab7206471bf3f739ccc1e83d745a9b87e5a..bbddfb1dfa491e8af8721e37f1a43ded20f8f344 100644
--- a/vulkan/config.gni
+++ b/vulkan/config.gni
@@ -3,10 +3,6 @@
 # found in the LICENSE file.
 
 declare_args() {
-  # Whether to include vulkan validation layers, if available.
-  #
-  # Currently these are only supported on Fuchsia, where by default they are
-  # disabled, to enable them pass `--enable-vulkan-validation-layers` to your
-  # gn args.
+  # Whether to include vulkan validation layers.
   enable_vulkan_validation_layers = false
 }
diff --git a/vulkan/procs/BUILD.gn b/vulkan/procs/BUILD.gn
index 0362e58f87d8e20fc1b55e3c0b344cf4fad2f6df..337a4c356a43a12b5a04dbce66a843cbed71432a 100644
--- a/vulkan/procs/BUILD.gn
+++ b/vulkan/procs/BUILD.gn
@@ -12,10 +12,10 @@ source_set("procs") {
     "vulkan_proc_table.h",
   ]
 
-  deps = [ "//flutter/fml" ]
+  public_configs = [ "//flutter:config" ]
 
-  public_configs = [
-    "//flutter/vulkan:vulkan_config",
-    "//flutter:config",
+  public_deps = [
+    "//flutter/fml",
+    "//flutter/third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
   ]
 }
diff --git a/vulkan/procs/vulkan_handle.h b/vulkan/procs/vulkan_handle.h
index cf33394b491f22f560b808d18ca005376f106469..df7f064fcbe0ae7a03eceffbad93ecf631c9b7f1 100644
--- a/vulkan/procs/vulkan_handle.h
+++ b/vulkan/procs/vulkan_handle.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_VULKAN_PROCS_VULKAN_HANDLE_H_
+#define FLUTTER_VULKAN_PROCS_VULKAN_HANDLE_H_
 
 #include <functional>
 
@@ -24,7 +25,7 @@ class VulkanHandle {
       : handle_(handle), disposer_(disposer) {}
 
   VulkanHandle(VulkanHandle&& other)
-      : handle_(other.handle_), disposer_(other.disposer_) {
+      : handle_(other.handle_), disposer_(std::move(other.disposer_)) {
     other.handle_ = VK_NULL_HANDLE;
     other.disposer_ = nullptr;
   }
@@ -76,3 +77,5 @@ class VulkanHandle {
 };
 
 }  // namespace vulkan
+
+#endif  // FLUTTER_VULKAN_PROCS_VULKAN_HANDLE_H_
diff --git a/vulkan/procs/vulkan_interface.h b/vulkan/procs/vulkan_interface.h
index 2d01ed72b714395dfb33382bdb46c3352a69614b..6343af80885b612b62a456feea6326eb5809f535 100644
--- a/vulkan/procs/vulkan_interface.h
+++ b/vulkan/procs/vulkan_interface.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_VULKAN_PROCS_VULKAN_INTERFACE_H_
+#define FLUTTER_VULKAN_PROCS_VULKAN_INTERFACE_H_
 
 #include <string>
 
@@ -26,15 +27,19 @@
 
 #include <vulkan/vulkan.h>
 
-#define VK_CALL_LOG_ERROR(expression)                     \
-  ({                                                      \
-    __typeof__(expression) _rc = (expression);            \
-    if (_rc != VK_SUCCESS) {                              \
-      FML_LOG(INFO) << "Vulkan call '" << #expression     \
-                    << "' failed with error "             \
-                    << vulkan::VulkanResultToString(_rc); \
-    }                                                     \
-    _rc;                                                  \
+#define VK_CALL_LOG_ERROR(expression) VK_CALL_LOG(expression, ERROR)
+
+#define VK_CALL_LOG_FATAL(expression) VK_CALL_LOG(expression, FATAL)
+
+#define VK_CALL_LOG(expression, severity)                     \
+  ({                                                          \
+    __typeof__(expression) _rc = (expression);                \
+    if (_rc != VK_SUCCESS) {                                  \
+      FML_LOG(severity) << "Vulkan call '" << #expression     \
+                        << "' failed with error "             \
+                        << vulkan::VulkanResultToString(_rc); \
+    }                                                         \
+    _rc;                                                      \
   })
 
 namespace vulkan {
@@ -42,3 +47,5 @@ namespace vulkan {
 std::string VulkanResultToString(VkResult result);
 
 }  // namespace vulkan
+
+#endif  // FLUTTER_VULKAN_PROCS_VULKAN_INTERFACE_H_
diff --git a/vulkan/procs/vulkan_proc_table.cc b/vulkan/procs/vulkan_proc_table.cc
index b4eb57032e33d51687dc39acc1c1cfc6e56bf75b..75a0c00b3984b8fe5decf0c9da25fb67a0a8fbc7 100644
--- a/vulkan/procs/vulkan_proc_table.cc
+++ b/vulkan/procs/vulkan_proc_table.cc
@@ -8,18 +8,15 @@
 
 #include "flutter/fml/logging.h"
 
-#define ACQUIRE_PROC(name, context)                          \
-  if (!(name = AcquireProc("vk" #name, context))) {          \
-    FML_DLOG(INFO) << "Could not acquire proc: vk" << #name; \
-    return false;                                            \
+#define ACQUIRE_PROC(name, context)                 \
+  if (!(name = AcquireProc("vk" #name, context))) { \
+    return false;                                   \
   }
 
-#define ACQUIRE_PROC_EITHER(name, name2, context)                              \
-  if (!(name = AcquireProc("vk" #name, context)) &&                            \
-      !(name2 = AcquireProc("vk" #name2, context))) {                          \
-    FML_DLOG(INFO) << "Could not acquire proc: vk" << #name << ", or proc: vk" \
-                   << #name2;                                                  \
-    return false;                                                              \
+#define ACQUIRE_PROC_EITHER(name, name2, context)     \
+  if (!(name = AcquireProc("vk" #name, context)) &&   \
+      !(name2 = AcquireProc("vk" #name2, context))) { \
+    return false;                                     \
   }
 
 namespace vulkan {
@@ -79,13 +76,9 @@ PFN_vkGetInstanceProcAddr VulkanProcTable::NativeGetInstanceProcAddr() const {
     return GetInstanceProcAddr;
   }
 
-#if VULKAN_LINK_STATICALLY
-  return &vkGetInstanceProcAddr;
-#else   // VULKAN_LINK_STATICALLY
   auto instance_proc =
       const_cast<uint8_t*>(handle_->ResolveSymbol("vkGetInstanceProcAddr"));
   return reinterpret_cast<PFN_vkGetInstanceProcAddr>(instance_proc);
-#endif  // VULKAN_LINK_STATICALLY
 }
 
 bool VulkanProcTable::SetupLoaderProcAddresses() {
@@ -203,11 +196,7 @@ bool VulkanProcTable::SetupDeviceProcAddresses(
 }
 
 bool VulkanProcTable::OpenLibraryHandle(const char* path) {
-#if VULKAN_LINK_STATICALLY
-  handle_ = fml::NativeLibrary::CreateForCurrentProcess();
-#else   // VULKAN_LINK_STATICALLY
   handle_ = fml::NativeLibrary::Create(path);
-#endif  // VULKAN_LINK_STATICALLY
   if (!handle_) {
     FML_DLOG(ERROR) << "Could not open Vulkan library handle: " << path;
     return false;
diff --git a/vulkan/procs/vulkan_proc_table.h b/vulkan/procs/vulkan_proc_table.h
index 3092bed159a5dbf48ba23935d96a16a2bad16b25..9e3d3a0ed2f6758bf05838c018bb2fa3f551664f 100644
--- a/vulkan/procs/vulkan_proc_table.h
+++ b/vulkan/procs/vulkan_proc_table.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_VULKAN_PROCS_VULKAN_PROC_TABLE_H_
+#define FLUTTER_VULKAN_PROCS_VULKAN_PROC_TABLE_H_
 
 #include "flutter/fml/macros.h"
 #include "flutter/fml/memory/ref_counted.h"
@@ -178,3 +179,5 @@ class VulkanProcTable : public fml::RefCountedThreadSafe<VulkanProcTable> {
 };
 
 }  // namespace vulkan
+
+#endif  // FLUTTER_VULKAN_PROCS_VULKAN_PROC_TABLE_H_
diff --git a/vulkan/swiftshader_path.h b/vulkan/swiftshader_path.h
new file mode 100644
index 0000000000000000000000000000000000000000..424116a7efec7182b2c11b5a6549830b1dd5f8d8
--- /dev/null
+++ b/vulkan/swiftshader_path.h
@@ -0,0 +1,18 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_VULKAN_SWIFTSHADER_PATH_H_
+#define FLUTTER_VULKAN_SWIFTSHADER_PATH_H_
+
+#ifndef VULKAN_SO_PATH
+#if FML_OS_MACOSX
+#define VULKAN_SO_PATH "libvk_swiftshader.dylib"
+#elif FML_OS_WIN
+#define VULKAN_SO_PATH "vk_swiftshader.dll"
+#else
+#define VULKAN_SO_PATH "libvk_swiftshader.so"
+#endif  // !FML_OS_MACOSX && !FML_OS_WIN
+#endif  // VULKAN_SO_PATH
+
+#endif  // FLUTTER_VULKAN_SWIFTSHADER_PATH_H_
diff --git a/vulkan/vulkan_application.cc b/vulkan/vulkan_application.cc
index 47cbf3ec29eca0177ebfb4afa9ebd0c3e4bbe4f2..6b618b178a8a6dc1d32d4c6c1a87d3f099d0b56b 100644
--- a/vulkan/vulkan_application.cc
+++ b/vulkan/vulkan_application.cc
@@ -20,13 +20,13 @@ VulkanApplication::VulkanApplication(
     uint32_t application_version,
     uint32_t api_version,
     bool enable_validation_layers)
-    : vk(p_vk),
+    : vk_(p_vk),
       api_version_(api_version),
       valid_(false),
       enable_validation_layers_(enable_validation_layers) {
   // Check if we want to enable debugging.
   std::vector<VkExtensionProperties> supported_extensions =
-      GetSupportedInstanceExtensions(vk);
+      GetSupportedInstanceExtensions(vk_);
   bool enable_instance_debugging =
       enable_validation_layers_ &&
       ExtensionSupported(supported_extensions,
@@ -50,21 +50,21 @@ VulkanApplication::VulkanApplication(
   }
 #endif
 
-  const char* extensions[enabled_extensions.size()];
+  std::vector<const char*> extensions;
 
   for (size_t i = 0; i < enabled_extensions.size(); i++) {
-    extensions[i] = enabled_extensions[i].c_str();
+    extensions.push_back(enabled_extensions[i].c_str());
   }
 
   // Configure layers.
 
   const std::vector<std::string> enabled_layers =
-      InstanceLayersToEnable(vk, enable_validation_layers_);
+      InstanceLayersToEnable(vk_, enable_validation_layers_);
 
-  const char* layers[enabled_layers.size()];
+  std::vector<const char*> layers;
 
   for (size_t i = 0; i < enabled_layers.size(); i++) {
-    layers[i] = enabled_layers[i].c_str();
+    layers.push_back(enabled_layers[i].c_str());
   }
 
   // Configure init structs.
@@ -84,24 +84,24 @@ VulkanApplication::VulkanApplication(
       .pNext = nullptr,
       .flags = 0,
       .pApplicationInfo = &info,
-      .enabledLayerCount = static_cast<uint32_t>(enabled_layers.size()),
-      .ppEnabledLayerNames = layers,
-      .enabledExtensionCount = static_cast<uint32_t>(enabled_extensions.size()),
-      .ppEnabledExtensionNames = extensions,
+      .enabledLayerCount = static_cast<uint32_t>(layers.size()),
+      .ppEnabledLayerNames = layers.data(),
+      .enabledExtensionCount = static_cast<uint32_t>(extensions.size()),
+      .ppEnabledExtensionNames = extensions.data(),
   };
 
   // Perform initialization.
 
   VkInstance instance = VK_NULL_HANDLE;
 
-  if (VK_CALL_LOG_ERROR(vk.CreateInstance(&create_info, nullptr, &instance)) !=
+  if (VK_CALL_LOG_ERROR(vk_.CreateInstance(&create_info, nullptr, &instance)) !=
       VK_SUCCESS) {
     FML_DLOG(INFO) << "Could not create application instance.";
     return;
   }
 
   // Now that we have an instance, set up instance proc table entries.
-  if (!vk.SetupInstanceProcAddresses(VulkanHandle<VkInstance>(instance))) {
+  if (!vk_.SetupInstanceProcAddresses(VulkanHandle<VkInstance>(instance))) {
     FML_DLOG(INFO) << "Could not set up instance proc addresses.";
     return;
   }
@@ -109,11 +109,11 @@ VulkanApplication::VulkanApplication(
   instance_ = VulkanHandle<VkInstance>{instance, [this](VkInstance i) {
                                          FML_DLOG(INFO)
                                              << "Destroying Vulkan instance";
-                                         vk.DestroyInstance(i, nullptr);
+                                         vk_.DestroyInstance(i, nullptr);
                                        }};
 
   if (enable_instance_debugging) {
-    auto debug_report = std::make_unique<VulkanDebugReport>(vk, instance_);
+    auto debug_report = std::make_unique<VulkanDebugReport>(vk_, instance_);
     if (!debug_report->IsValid()) {
       FML_DLOG(INFO) << "Vulkan debugging was enabled but could not be set up "
                         "for this instance.";
@@ -150,8 +150,8 @@ std::vector<VkPhysicalDevice> VulkanApplication::GetPhysicalDevices() const {
   }
 
   uint32_t device_count = 0;
-  if (VK_CALL_LOG_ERROR(vk.EnumeratePhysicalDevices(instance_, &device_count,
-                                                    nullptr)) != VK_SUCCESS) {
+  if (VK_CALL_LOG_ERROR(vk_.EnumeratePhysicalDevices(instance_, &device_count,
+                                                     nullptr)) != VK_SUCCESS) {
     FML_DLOG(INFO) << "Could not enumerate physical device.";
     return {};
   }
@@ -166,7 +166,7 @@ std::vector<VkPhysicalDevice> VulkanApplication::GetPhysicalDevices() const {
 
   physical_devices.resize(device_count);
 
-  if (VK_CALL_LOG_ERROR(vk.EnumeratePhysicalDevices(
+  if (VK_CALL_LOG_ERROR(vk_.EnumeratePhysicalDevices(
           instance_, &device_count, physical_devices.data())) != VK_SUCCESS) {
     FML_DLOG(INFO) << "Could not enumerate physical device.";
     return {};
@@ -179,7 +179,7 @@ std::unique_ptr<VulkanDevice>
 VulkanApplication::AcquireFirstCompatibleLogicalDevice() const {
   for (auto device_handle : GetPhysicalDevices()) {
     auto logical_device = std::make_unique<VulkanDevice>(
-        vk, VulkanHandle<VkPhysicalDevice>(device_handle),
+        vk_, VulkanHandle<VkPhysicalDevice>(device_handle),
         enable_validation_layers_);
     if (logical_device->IsValid()) {
       return logical_device;
diff --git a/vulkan/vulkan_application.h b/vulkan/vulkan_application.h
index 06c437caffe0ea8a43ef4e0136f23fae79d649ab..b30e49c0b24637b9ac3ce07a9428789716a08042 100644
--- a/vulkan/vulkan_application.h
+++ b/vulkan/vulkan_application.h
@@ -44,7 +44,7 @@ class VulkanApplication {
   std::unique_ptr<VulkanDevice> AcquireFirstCompatibleLogicalDevice() const;
 
  private:
-  VulkanProcTable& vk;
+  VulkanProcTable& vk_;
   VulkanHandle<VkInstance> instance_;
   uint32_t api_version_;
   std::unique_ptr<VulkanDebugReport> debug_report_;
diff --git a/vulkan/vulkan_backbuffer.cc b/vulkan/vulkan_backbuffer.cc
index 5baf465b539dc665c8c09969f6594be0a0349020..dc404d4d293cbda99776b21160b58cac07d3c399 100644
--- a/vulkan/vulkan_backbuffer.cc
+++ b/vulkan/vulkan_backbuffer.cc
@@ -15,7 +15,7 @@ namespace vulkan {
 VulkanBackbuffer::VulkanBackbuffer(const VulkanProcTable& p_vk,
                                    const VulkanHandle<VkDevice>& device,
                                    const VulkanHandle<VkCommandPool>& pool)
-    : vk(p_vk),
+    : vk_(p_vk),
       device_(device),
       usage_command_buffer_(p_vk, device, pool),
       render_command_buffer_(p_vk, device, pool),
@@ -54,14 +54,14 @@ bool VulkanBackbuffer::CreateSemaphores() {
   };
 
   auto semaphore_collect = [this](VkSemaphore semaphore) {
-    vk.DestroySemaphore(device_, semaphore, nullptr);
+    vk_.DestroySemaphore(device_, semaphore, nullptr);
   };
 
   for (size_t i = 0; i < semaphores_.size(); i++) {
     VkSemaphore semaphore = VK_NULL_HANDLE;
 
-    if (VK_CALL_LOG_ERROR(vk.CreateSemaphore(device_, &create_info, nullptr,
-                                             &semaphore)) != VK_SUCCESS) {
+    if (VK_CALL_LOG_ERROR(vk_.CreateSemaphore(device_, &create_info, nullptr,
+                                              &semaphore)) != VK_SUCCESS) {
       return false;
     }
 
@@ -79,14 +79,14 @@ bool VulkanBackbuffer::CreateFences() {
   };
 
   auto fence_collect = [this](VkFence fence) {
-    vk.DestroyFence(device_, fence, nullptr);
+    vk_.DestroyFence(device_, fence, nullptr);
   };
 
   for (size_t i = 0; i < use_fences_.size(); i++) {
     VkFence fence = VK_NULL_HANDLE;
 
-    if (VK_CALL_LOG_ERROR(vk.CreateFence(device_, &create_info, nullptr,
-                                         &fence)) != VK_SUCCESS) {
+    if (VK_CALL_LOG_ERROR(vk_.CreateFence(device_, &create_info, nullptr,
+                                          &fence)) != VK_SUCCESS) {
       return false;
     }
 
@@ -97,25 +97,25 @@ bool VulkanBackbuffer::CreateFences() {
 }
 
 bool VulkanBackbuffer::WaitFences() {
-  VkFence fences[use_fences_.size()];
+  VkFence fences[std::tuple_size_v<decltype(use_fences_)>];
 
   for (size_t i = 0; i < use_fences_.size(); i++) {
     fences[i] = use_fences_[i];
   }
 
-  return VK_CALL_LOG_ERROR(vk.WaitForFences(
+  return VK_CALL_LOG_ERROR(vk_.WaitForFences(
              device_, static_cast<uint32_t>(use_fences_.size()), fences, true,
              std::numeric_limits<uint64_t>::max())) == VK_SUCCESS;
 }
 
 bool VulkanBackbuffer::ResetFences() {
-  VkFence fences[use_fences_.size()];
+  VkFence fences[std::tuple_size_v<decltype(use_fences_)>];
 
   for (size_t i = 0; i < use_fences_.size(); i++) {
     fences[i] = use_fences_[i];
   }
 
-  return VK_CALL_LOG_ERROR(vk.ResetFences(
+  return VK_CALL_LOG_ERROR(vk_.ResetFences(
              device_, static_cast<uint32_t>(use_fences_.size()), fences)) ==
          VK_SUCCESS;
 }
diff --git a/vulkan/vulkan_backbuffer.h b/vulkan/vulkan_backbuffer.h
index c485be6d2d1e5d545eeb34f5a385acfd13d0a27b..e1585623cfd95219be37f7b7171152faf3a74c0d 100644
--- a/vulkan/vulkan_backbuffer.h
+++ b/vulkan/vulkan_backbuffer.h
@@ -43,7 +43,7 @@ class VulkanBackbuffer {
   VulkanCommandBuffer& GetRenderCommandBuffer();
 
  private:
-  const VulkanProcTable& vk;
+  const VulkanProcTable& vk_;
   const VulkanHandle<VkDevice>& device_;
   std::array<VulkanHandle<VkSemaphore>, 2> semaphores_;
   std::array<VulkanHandle<VkFence>, 2> use_fences_;
diff --git a/vulkan/vulkan_command_buffer.cc b/vulkan/vulkan_command_buffer.cc
index d8412d6c931e83607f83b53f5fab2a9e6c580553..db35ab18dfc182dc44bebd58201f119a26080de7 100644
--- a/vulkan/vulkan_command_buffer.cc
+++ b/vulkan/vulkan_command_buffer.cc
@@ -12,7 +12,7 @@ VulkanCommandBuffer::VulkanCommandBuffer(
     const VulkanProcTable& p_vk,
     const VulkanHandle<VkDevice>& device,
     const VulkanHandle<VkCommandPool>& pool)
-    : vk(p_vk), device_(device), pool_(pool), valid_(false) {
+    : vk_(p_vk), device_(device), pool_(pool), valid_(false) {
   const VkCommandBufferAllocateInfo allocate_info = {
       .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO,
       .pNext = nullptr,
@@ -23,14 +23,14 @@ VulkanCommandBuffer::VulkanCommandBuffer(
 
   VkCommandBuffer buffer = VK_NULL_HANDLE;
 
-  if (VK_CALL_LOG_ERROR(vk.AllocateCommandBuffers(device_, &allocate_info,
-                                                  &buffer)) != VK_SUCCESS) {
+  if (VK_CALL_LOG_ERROR(vk_.AllocateCommandBuffers(device_, &allocate_info,
+                                                   &buffer)) != VK_SUCCESS) {
     FML_DLOG(INFO) << "Could not allocate command buffers.";
     return;
   }
 
   auto buffer_collect = [this](VkCommandBuffer buffer) {
-    vk.FreeCommandBuffers(device_, pool_, 1, &buffer);
+    vk_.FreeCommandBuffers(device_, pool_, 1, &buffer);
   };
 
   handle_ = VulkanHandle<VkCommandBuffer>{buffer, buffer_collect};
@@ -56,11 +56,12 @@ bool VulkanCommandBuffer::Begin() const {
       .pInheritanceInfo = nullptr,
   };
 
-  return VK_CALL_LOG_ERROR(vk.BeginCommandBuffer(handle_, &info)) == VK_SUCCESS;
+  return VK_CALL_LOG_ERROR(vk_.BeginCommandBuffer(handle_, &info)) ==
+         VK_SUCCESS;
 }
 
 bool VulkanCommandBuffer::End() const {
-  return VK_CALL_LOG_ERROR(vk.EndCommandBuffer(handle_)) == VK_SUCCESS;
+  return VK_CALL_LOG_ERROR(vk_.EndCommandBuffer(handle_)) == VK_SUCCESS;
 }
 
 bool VulkanCommandBuffer::InsertPipelineBarrier(
@@ -73,10 +74,11 @@ bool VulkanCommandBuffer::InsertPipelineBarrier(
     const VkBufferMemoryBarrier* buffer_memory_barriers,
     uint32_t image_memory_barrier_count,
     const VkImageMemoryBarrier* image_memory_barriers) const {
-  vk.CmdPipelineBarrier(handle_, src_stage_flags, dest_stage_flags,
-                        dependency_flags, memory_barrier_count, memory_barriers,
-                        buffer_memory_barrier_count, buffer_memory_barriers,
-                        image_memory_barrier_count, image_memory_barriers);
+  vk_.CmdPipelineBarrier(handle_, src_stage_flags, dest_stage_flags,
+                         dependency_flags, memory_barrier_count,
+                         memory_barriers, buffer_memory_barrier_count,
+                         buffer_memory_barriers, image_memory_barrier_count,
+                         image_memory_barriers);
   return true;
 }
 
diff --git a/vulkan/vulkan_command_buffer.h b/vulkan/vulkan_command_buffer.h
index fe037543e3051c05cd70d842bde1f4b66ed2e8d2..b19f485b900d1fa3874c0afb747dc9c76b8aaefb 100644
--- a/vulkan/vulkan_command_buffer.h
+++ b/vulkan/vulkan_command_buffer.h
@@ -41,7 +41,7 @@ class VulkanCommandBuffer {
       const VkImageMemoryBarrier* image_memory_barriers) const;
 
  private:
-  const VulkanProcTable& vk;
+  const VulkanProcTable& vk_;
   const VulkanHandle<VkDevice>& device_;
   const VulkanHandle<VkCommandPool>& pool_;
   VulkanHandle<VkCommandBuffer> handle_;
diff --git a/vulkan/vulkan_debug_report.cc b/vulkan/vulkan_debug_report.cc
index c951b26e798746751ed319bc157b72b8838837b9..4f18f4a19a53ac9f44c822c257db0cc50105f62d 100644
--- a/vulkan/vulkan_debug_report.cc
+++ b/vulkan/vulkan_debug_report.cc
@@ -185,8 +185,8 @@ static VKAPI_ATTR VkBool32
 VulkanDebugReport::VulkanDebugReport(
     const VulkanProcTable& p_vk,
     const VulkanHandle<VkInstance>& application)
-    : vk(p_vk), application_(application), valid_(false) {
-  if (!vk.CreateDebugReportCallbackEXT || !vk.DestroyDebugReportCallbackEXT) {
+    : vk_(p_vk), application_(application), valid_(false) {
+  if (!vk_.CreateDebugReportCallbackEXT || !vk_.DestroyDebugReportCallbackEXT) {
     return;
   }
 
@@ -207,14 +207,14 @@ VulkanDebugReport::VulkanDebugReport(
   };
 
   VkDebugReportCallbackEXT handle = VK_NULL_HANDLE;
-  if (VK_CALL_LOG_ERROR(vk.CreateDebugReportCallbackEXT(
+  if (VK_CALL_LOG_ERROR(vk_.CreateDebugReportCallbackEXT(
           application_, &create_info, nullptr, &handle)) != VK_SUCCESS) {
     return;
   }
 
   handle_ = VulkanHandle<VkDebugReportCallbackEXT>{
       handle, [this](VkDebugReportCallbackEXT handle) {
-        vk.DestroyDebugReportCallbackEXT(application_, handle, nullptr);
+        vk_.DestroyDebugReportCallbackEXT(application_, handle, nullptr);
       }};
 
   valid_ = true;
diff --git a/vulkan/vulkan_debug_report.h b/vulkan/vulkan_debug_report.h
index ba7e7e48d24839728401494b19682ce87bacdd77..de8e1bf02f9e89188e6c5428e9bfe41ab32b08a1 100644
--- a/vulkan/vulkan_debug_report.h
+++ b/vulkan/vulkan_debug_report.h
@@ -24,7 +24,7 @@ class VulkanDebugReport {
   bool IsValid() const;
 
  private:
-  const VulkanProcTable& vk;
+  const VulkanProcTable& vk_;
   const VulkanHandle<VkInstance>& application_;
   VulkanHandle<VkDebugReportCallbackEXT> handle_;
   bool valid_;
diff --git a/vulkan/vulkan_device.cc b/vulkan/vulkan_device.cc
index 5325d6d52418c48de9e6137828be9a65a677a550..e5b0fea59ede78b406373f71fa06ff5295854c1c 100644
--- a/vulkan/vulkan_device.cc
+++ b/vulkan/vulkan_device.cc
@@ -32,11 +32,11 @@ static uint32_t FindGraphicsQueueIndex(
 VulkanDevice::VulkanDevice(VulkanProcTable& p_vk,
                            VulkanHandle<VkPhysicalDevice> physical_device,
                            bool enable_validation_layers)
-    : vk(p_vk),
+    : vk_(p_vk),
       physical_device_(std::move(physical_device)),
       graphics_queue_index_(std::numeric_limits<uint32_t>::max()),
       valid_(false) {
-  if (!physical_device_ || !vk.AreInstanceProcsSetup()) {
+  if (!physical_device_ || !vk_.AreInstanceProcsSetup()) {
     return;
   }
 
@@ -60,25 +60,25 @@ VulkanDevice::VulkanDevice(VulkanProcTable& p_vk,
 
   const char* extensions[] = {
 #if FML_OS_ANDROID
-    VK_KHR_SWAPCHAIN_EXTENSION_NAME,
+      VK_KHR_SWAPCHAIN_EXTENSION_NAME,
 #endif
 #if OS_FUCHSIA
-    VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME,
-    VK_KHR_EXTERNAL_SEMAPHORE_EXTENSION_NAME,
-    VK_KHR_GET_MEMORY_REQUIREMENTS_2_EXTENSION_NAME,
-    VK_FUCHSIA_EXTERNAL_MEMORY_EXTENSION_NAME,
-    VK_FUCHSIA_EXTERNAL_SEMAPHORE_EXTENSION_NAME,
-    VK_FUCHSIA_BUFFER_COLLECTION_EXTENSION_NAME,
+      VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME,
+      VK_KHR_EXTERNAL_SEMAPHORE_EXTENSION_NAME,
+      VK_KHR_GET_MEMORY_REQUIREMENTS_2_EXTENSION_NAME,
+      VK_FUCHSIA_EXTERNAL_MEMORY_EXTENSION_NAME,
+      VK_FUCHSIA_EXTERNAL_SEMAPHORE_EXTENSION_NAME,
+      VK_FUCHSIA_BUFFER_COLLECTION_EXTENSION_NAME,
 #endif
   };
 
   auto enabled_layers =
-      DeviceLayersToEnable(vk, physical_device_, enable_validation_layers);
+      DeviceLayersToEnable(vk_, physical_device_, enable_validation_layers);
 
-  const char* layers[enabled_layers.size()];
+  std::vector<const char*> layers;
 
   for (size_t i = 0; i < enabled_layers.size(); i++) {
-    layers[i] = enabled_layers[i].c_str();
+    layers.push_back(enabled_layers[i].c_str());
   }
 
   const VkDeviceCreateInfo create_info = {
@@ -87,8 +87,8 @@ VulkanDevice::VulkanDevice(VulkanProcTable& p_vk,
       .flags = 0,
       .queueCreateInfoCount = 1,
       .pQueueCreateInfos = &queue_create,
-      .enabledLayerCount = static_cast<uint32_t>(enabled_layers.size()),
-      .ppEnabledLayerNames = layers,
+      .enabledLayerCount = static_cast<uint32_t>(layers.size()),
+      .ppEnabledLayerNames = layers.data(),
       .enabledExtensionCount = sizeof(extensions) / sizeof(const char*),
       .ppEnabledExtensionNames = extensions,
       .pEnabledFeatures = nullptr,
@@ -96,23 +96,23 @@ VulkanDevice::VulkanDevice(VulkanProcTable& p_vk,
 
   VkDevice device = VK_NULL_HANDLE;
 
-  if (VK_CALL_LOG_ERROR(vk.CreateDevice(physical_device_, &create_info, nullptr,
-                                        &device)) != VK_SUCCESS) {
+  if (VK_CALL_LOG_ERROR(vk_.CreateDevice(physical_device_, &create_info,
+                                         nullptr, &device)) != VK_SUCCESS) {
     FML_DLOG(INFO) << "Could not create device.";
     return;
   }
 
   device_ = VulkanHandle<VkDevice>{
-      device, [this](VkDevice device) { vk.DestroyDevice(device, nullptr); }};
+      device, [this](VkDevice device) { vk_.DestroyDevice(device, nullptr); }};
 
-  if (!vk.SetupDeviceProcAddresses(device_)) {
+  if (!vk_.SetupDeviceProcAddresses(device_)) {
     FML_DLOG(INFO) << "Could not set up device proc addresses.";
     return;
   }
 
   VkQueue queue = VK_NULL_HANDLE;
 
-  vk.GetDeviceQueue(device_, graphics_queue_index_, 0, &queue);
+  vk_.GetDeviceQueue(device_, graphics_queue_index_, 0, &queue);
 
   if (queue == VK_NULL_HANDLE) {
     FML_DLOG(INFO) << "Could not get the device queue handle.";
@@ -133,13 +133,13 @@ VulkanDevice::VulkanDevice(VulkanProcTable& p_vk,
                            VulkanHandle<VkDevice> device,
                            uint32_t queue_family_index,
                            VulkanHandle<VkQueue> queue)
-    : vk(p_vk),
+    : vk_(p_vk),
       physical_device_(std::move(physical_device)),
       device_(std::move(device)),
       queue_(std::move(queue)),
       graphics_queue_index_(queue_family_index),
       valid_(false) {
-  if (!physical_device_ || !vk.AreInstanceProcsSetup()) {
+  if (!physical_device_ || !vk_.AreInstanceProcsSetup()) {
     return;
   }
 
@@ -159,8 +159,8 @@ bool VulkanDevice::InitializeCommandPool() {
   };
 
   VkCommandPool command_pool = VK_NULL_HANDLE;
-  if (VK_CALL_LOG_ERROR(vk.CreateCommandPool(device_, &command_pool_create_info,
-                                             nullptr, &command_pool)) !=
+  if (VK_CALL_LOG_ERROR(vk_.CreateCommandPool(
+          device_, &command_pool_create_info, nullptr, &command_pool)) !=
       VK_SUCCESS) {
     FML_DLOG(INFO) << "Could not create the command pool.";
     return false;
@@ -168,7 +168,7 @@ bool VulkanDevice::InitializeCommandPool() {
 
   command_pool_ = VulkanHandle<VkCommandPool>{
       command_pool, [this](VkCommandPool pool) {
-        vk.DestroyCommandPool(device_, pool, nullptr);
+        vk_.DestroyCommandPool(device_, pool, nullptr);
       }};
 
   return true;
@@ -183,7 +183,7 @@ bool VulkanDevice::IsValid() const {
 }
 
 bool VulkanDevice::WaitIdle() const {
-  return VK_CALL_LOG_ERROR(vk.DeviceWaitIdle(device_)) == VK_SUCCESS;
+  return VK_CALL_LOG_ERROR(vk_.DeviceWaitIdle(device_)) == VK_SUCCESS;
 }
 
 const VulkanHandle<VkDevice>& VulkanDevice::GetHandle() const {
@@ -220,7 +220,7 @@ bool VulkanDevice::GetSurfaceCapabilities(
   }
 
   bool success =
-      VK_CALL_LOG_ERROR(vk.GetPhysicalDeviceSurfaceCapabilitiesKHR(
+      VK_CALL_LOG_ERROR(vk_.GetPhysicalDeviceSurfaceCapabilitiesKHR(
           physical_device_, surface.Handle(), capabilities)) == VK_SUCCESS;
 
   if (!success) {
@@ -254,7 +254,7 @@ bool VulkanDevice::GetPhysicalDeviceFeatures(
   if (features == nullptr || !physical_device_) {
     return false;
   }
-  vk.GetPhysicalDeviceFeatures(physical_device_, features);
+  vk_.GetPhysicalDeviceFeatures(physical_device_, features);
   return true;
 }
 
@@ -289,13 +289,13 @@ std::vector<VkQueueFamilyProperties> VulkanDevice::GetQueueFamilyProperties()
     const {
   uint32_t count = 0;
 
-  vk.GetPhysicalDeviceQueueFamilyProperties(physical_device_, &count, nullptr);
+  vk_.GetPhysicalDeviceQueueFamilyProperties(physical_device_, &count, nullptr);
 
   std::vector<VkQueueFamilyProperties> properties;
   properties.resize(count, {});
 
-  vk.GetPhysicalDeviceQueueFamilyProperties(physical_device_, &count,
-                                            properties.data());
+  vk_.GetPhysicalDeviceQueueFamilyProperties(physical_device_, &count,
+                                             properties.data());
 
   return properties;
 }
@@ -310,7 +310,7 @@ int VulkanDevice::ChooseSurfaceFormat(
   }
 
   uint32_t format_count = 0;
-  if (VK_CALL_LOG_ERROR(vk.GetPhysicalDeviceSurfaceFormatsKHR(
+  if (VK_CALL_LOG_ERROR(vk_.GetPhysicalDeviceSurfaceFormatsKHR(
           physical_device_, surface.Handle(), &format_count, nullptr)) !=
       VK_SUCCESS) {
     return -1;
@@ -323,7 +323,7 @@ int VulkanDevice::ChooseSurfaceFormat(
   std::vector<VkSurfaceFormatKHR> formats;
   formats.resize(format_count);
 
-  if (VK_CALL_LOG_ERROR(vk.GetPhysicalDeviceSurfaceFormatsKHR(
+  if (VK_CALL_LOG_ERROR(vk_.GetPhysicalDeviceSurfaceFormatsKHR(
           physical_device_, surface.Handle(), &format_count, formats.data())) !=
       VK_SUCCESS) {
     return -1;
@@ -388,7 +388,7 @@ bool VulkanDevice::QueueSubmit(
       .pSignalSemaphores = signal_semaphores.data(),
   };
 
-  if (VK_CALL_LOG_ERROR(vk.QueueSubmit(queue_, 1, &submit_info, fence)) !=
+  if (VK_CALL_LOG_ERROR(vk_.QueueSubmit(queue_, 1, &submit_info, fence)) !=
       VK_SUCCESS) {
     return false;
   }
diff --git a/vulkan/vulkan_device.h b/vulkan/vulkan_device.h
index 559c4fab9d5702032938d350fc24276c9add1e0e..275a462e339456a36d8b0f372e9b20f7c91bfa02 100644
--- a/vulkan/vulkan_device.h
+++ b/vulkan/vulkan_device.h
@@ -76,7 +76,7 @@ class VulkanDevice {
   [[nodiscard]] bool WaitIdle() const;
 
  private:
-  VulkanProcTable& vk;
+  VulkanProcTable& vk_;
   VulkanHandle<VkPhysicalDevice> physical_device_;
   VulkanHandle<VkDevice> device_;
   VulkanHandle<VkQueue> queue_;
diff --git a/vulkan/vulkan_skia_proc_table.h b/vulkan/vulkan_skia_proc_table.h
index 9ed988ea5159846823275663d4f66c35e18dcac8..ca7a8e3314240ea467dfb6c9e5129274b0d309fd 100644
--- a/vulkan/vulkan_skia_proc_table.h
+++ b/vulkan/vulkan_skia_proc_table.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_VULKAN_VULKAN_SKIA_PROC_TABLE_H_
+#define FLUTTER_VULKAN_VULKAN_SKIA_PROC_TABLE_H_
 
 #include "flutter/vulkan/procs/vulkan_proc_table.h"
 
@@ -13,3 +14,5 @@ namespace vulkan {
 GrVkGetProc CreateSkiaGetProc(const fml::RefPtr<vulkan::VulkanProcTable>& vk);
 
 }  // namespace vulkan
+
+#endif  // FLUTTER_VULKAN_VULKAN_SKIA_PROC_TABLE_H_
diff --git a/vulkan/vulkan_swapchain.cc b/vulkan/vulkan_swapchain.cc
index cb8a28fa6b656c50c61f418513af91596d53face..20e32121c31c925c4931b6106e5b0a4d5b73e837 100644
--- a/vulkan/vulkan_swapchain.cc
+++ b/vulkan/vulkan_swapchain.cc
@@ -7,8 +7,11 @@
 #include "flutter/vulkan/procs/vulkan_proc_table.h"
 
 #include "third_party/skia/include/core/SkColorSpace.h"
+#include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/gpu/GrBackendSurface.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
+#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
+#include "third_party/skia/include/gpu/ganesh/vk/GrVkBackendSurface.h"
 #include "third_party/skia/include/gpu/vk/GrVkTypes.h"
 
 #include "vulkan_backbuffer.h"
@@ -240,11 +243,11 @@ sk_sp<SkSurface> VulkanSwapchain::CreateSkiaSurface(
   image_info.fLevelCount = 1;
 
   // TODO(chinmaygarde): Setup the stencil buffer and the sampleCnt.
-  GrBackendRenderTarget backend_render_target(size.fWidth, size.fHeight, 0,
-                                              image_info);
+  auto backend_render_target =
+      GrBackendRenderTargets::MakeVk(size.fWidth, size.fHeight, image_info);
   SkSurfaceProps props(0, kUnknown_SkPixelGeometry);
 
-  return SkSurface::MakeFromBackendRenderTarget(
+  return SkSurfaces::WrapBackendRenderTarget(
       gr_context,                // context
       backend_render_target,     // backend render target
       kTopLeft_GrSurfaceOrigin,  // origin
@@ -475,13 +478,14 @@ VulkanSwapchain::AcquireResult VulkanSwapchain::AcquireSurface() {
     return error;
   }
 
-  GrBackendRenderTarget backendRT = surface->getBackendRenderTarget(
-      SkSurface::kFlushRead_BackendHandleAccess);
+  GrBackendRenderTarget backendRT = SkSurfaces::GetBackendRenderTarget(
+      surface.get(), SkSurfaces::BackendHandleAccess::kFlushRead);
   if (!backendRT.isValid()) {
     FML_DLOG(INFO) << "Could not get backend render target.";
     return error;
   }
-  backendRT.setVkImageLayout(destination_image_layout);
+  GrBackendRenderTargets::SetVkImageLayout(&backendRT,
+                                           destination_image_layout);
 
   current_image_index_ = next_image_index;
 
@@ -502,7 +506,7 @@ bool VulkanSwapchain::Submit() {
   // Step 0:
   // Make sure Skia has flushed all work for the surface to the gpu.
   // ---------------------------------------------------------------------------
-  surface->flushAndSubmit();
+  skgpu::ganesh::FlushAndSubmit(surface);
 
   // ---------------------------------------------------------------------------
   // Step 1:
diff --git a/vulkan/vulkan_window.cc b/vulkan/vulkan_window.cc
index a7067fff3f907a68bd8ac570e6fe2328fe79c0bc..c0ab63eb00743b5a51856df74d62c12ea0698dd3 100644
--- a/vulkan/vulkan_window.cc
+++ b/vulkan/vulkan_window.cc
@@ -8,29 +8,33 @@
 
 #include <memory>
 #include <string>
+#include <utility>
 
 #include "flutter/flutter_vma/flutter_skia_vma.h"
 #include "flutter/vulkan/vulkan_skia_proc_table.h"
-#include "third_party/skia/include/gpu/GrDirectContext.h"
 #include "vulkan_application.h"
 #include "vulkan_device.h"
 #include "vulkan_native_surface.h"
 #include "vulkan_surface.h"
 #include "vulkan_swapchain.h"
 
+#include "third_party/skia/include/core/SkSurface.h"
+#include "third_party/skia/include/gpu/GrDirectContext.h"
+#include "third_party/skia/include/gpu/ganesh/vk/GrVkDirectContext.h"
+
 namespace vulkan {
 
 VulkanWindow::VulkanWindow(fml::RefPtr<VulkanProcTable> proc_table,
                            std::unique_ptr<VulkanNativeSurface> native_surface)
     : VulkanWindow(/*context/*/ nullptr,
-                   proc_table,
+                   std::move(proc_table),
                    std::move(native_surface)) {}
 
 VulkanWindow::VulkanWindow(const sk_sp<GrDirectContext>& context,
                            fml::RefPtr<VulkanProcTable> proc_table,
                            std::unique_ptr<VulkanNativeSurface> native_surface)
-    : valid_(false), vk(std::move(proc_table)), skia_gr_context_(context) {
-  if (!vk || !vk->HasAcquiredMandatoryProcAddresses()) {
+    : valid_(false), vk_(std::move(proc_table)), skia_gr_context_(context) {
+  if (!vk_ || !vk_->HasAcquiredMandatoryProcAddresses()) {
     FML_DLOG(INFO) << "Proc table has not acquired mandatory proc addresses.";
     return;
   }
@@ -47,10 +51,10 @@ VulkanWindow::VulkanWindow(const sk_sp<GrDirectContext>& context,
       native_surface->GetExtensionName()  // child extension
   };
 
-  application_ = std::make_unique<VulkanApplication>(*vk, "Flutter",
+  application_ = std::make_unique<VulkanApplication>(*vk_, "Flutter",
                                                      std::move(extensions));
 
-  if (!application_->IsValid() || !vk->AreInstanceProcsSetup()) {
+  if (!application_->IsValid() || !vk_->AreInstanceProcsSetup()) {
     // Make certain the application instance was created and it set up the
     // instance proc table entries.
     FML_DLOG(INFO) << "Instance proc addresses have not been set up.";
@@ -62,7 +66,7 @@ VulkanWindow::VulkanWindow(const sk_sp<GrDirectContext>& context,
   logical_device_ = application_->AcquireFirstCompatibleLogicalDevice();
 
   if (logical_device_ == nullptr || !logical_device_->IsValid() ||
-      !vk->AreDeviceProcsSetup()) {
+      !vk_->AreDeviceProcsSetup()) {
     // Make certain the device was created and it set up the device proc table
     // entries.
     FML_DLOG(INFO) << "Device proc addresses have not been set up.";
@@ -74,7 +78,7 @@ VulkanWindow::VulkanWindow(const sk_sp<GrDirectContext>& context,
   }
 
   // Create the logical surface from the native platform surface.
-  surface_ = std::make_unique<VulkanSurface>(*vk, *application_,
+  surface_ = std::make_unique<VulkanSurface>(*vk_, *application_,
                                              std::move(native_surface));
 
   if (!surface_->IsValid()) {
@@ -86,7 +90,7 @@ VulkanWindow::VulkanWindow(const sk_sp<GrDirectContext>& context,
   memory_allocator_ = flutter::FlutterSkiaVulkanMemoryAllocator::Make(
       application_->GetAPIVersion(), application_->GetInstance(),
       logical_device_->GetPhysicalDeviceHandle(), logical_device_->GetHandle(),
-      vk, true);
+      vk_, true);
 
   // Create the Skia GrDirectContext.
 
@@ -116,6 +120,7 @@ GrDirectContext* VulkanWindow::GetSkiaGrContext() {
 }
 
 bool VulkanWindow::CreateSkiaGrContext() {
+#ifdef SK_VUKLAN
   GrVkBackendContext backend_context;
 
   if (!CreateSkiaBackendContext(&backend_context)) {
@@ -125,7 +130,7 @@ bool VulkanWindow::CreateSkiaGrContext() {
   GrContextOptions options;
   options.fReduceOpsTaskSplitting = GrContextOptions::Enable::kNo;
   sk_sp<GrDirectContext> context =
-      GrDirectContext::MakeVulkan(backend_context, options);
+      GrDirectContexts::MakeVulkan(backend_context, options);
 
   if (context == nullptr) {
     return false;
@@ -136,10 +141,13 @@ bool VulkanWindow::CreateSkiaGrContext() {
   skia_gr_context_ = context;
 
   return true;
+#else
+  return false;
+#endif  // SK_VULKAN
 }
 
 bool VulkanWindow::CreateSkiaBackendContext(GrVkBackendContext* context) {
-  auto getProc = CreateSkiaGetProc(vk);
+  auto getProc = CreateSkiaGetProc(vk_);
 
   if (getProc == nullptr) {
     return false;
@@ -245,7 +253,7 @@ bool VulkanWindow::RecreateSwapchain() {
   // cannot create a new one to replace it.
   auto old_swapchain = std::move(swapchain_);
 
-  if (!vk->IsValid()) {
+  if (!vk_->IsValid()) {
     return false;
   }
 
@@ -262,7 +270,7 @@ bool VulkanWindow::RecreateSwapchain() {
   }
 
   auto swapchain = std::make_unique<VulkanSwapchain>(
-      *vk, *logical_device_, *surface_, skia_gr_context_.get(),
+      *vk_, *logical_device_, *surface_, skia_gr_context_.get(),
       std::move(old_swapchain), logical_device_->GetGraphicsQueueIndex());
 
   if (!swapchain->IsValid()) {
diff --git a/vulkan/vulkan_window.h b/vulkan/vulkan_window.h
index 1a0509025481e28bfbaaaa5aba7096048674ebbf..55d885d15d0ce200f6110caab2d6e8965e79c73d 100644
--- a/vulkan/vulkan_window.h
+++ b/vulkan/vulkan_window.h
@@ -10,7 +10,6 @@
 #include <utility>
 #include <vector>
 
-#include "flutter/flutter_vma/flutter_skia_vma.h"
 #include "flutter/fml/compiler_specific.h"
 #include "flutter/fml/macros.h"
 #include "flutter/vulkan/procs/vulkan_proc_table.h"
@@ -59,7 +58,7 @@ class VulkanWindow {
 
  private:
   bool valid_;
-  fml::RefPtr<VulkanProcTable> vk;
+  fml::RefPtr<VulkanProcTable> vk_;
   std::unique_ptr<VulkanApplication> application_;
   std::unique_ptr<VulkanDevice> logical_device_;
   std::unique_ptr<VulkanSurface> surface_;
diff --git a/wasm/BUILD.gn b/wasm/BUILD.gn
index f4d6a54ee5e766b358518a7e73c3da589b2f8cdf..ccd1ef8450b7fdcca4e6b1f94590907445e4db5b 100644
--- a/wasm/BUILD.gn
+++ b/wasm/BUILD.gn
@@ -10,7 +10,5 @@ import("//flutter/common/config.gni")
 
 # This is the default target when building when the target CPU is WASM.
 group("wasm") {
-  if (flutter_build_web_sdk) {
-    deps = [ "//flutter/web_sdk" ]
-  }
+  deps = [ "//flutter/web_sdk:flutter_web_sdk_archive" ]
 }
diff --git a/web_sdk/BUILD.gn b/web_sdk/BUILD.gn
index 42ac8a5dece7956d30ce6fc7b6bafd0010997c65..da541632d17c4b83cdb53e215875d37fb27caee1 100644
--- a/web_sdk/BUILD.gn
+++ b/web_sdk/BUILD.gn
@@ -4,16 +4,11 @@
 
 import("//flutter/build/zip_bundle.gni")
 import("//flutter/common/config.gni")
-import("//third_party/dart/build/dart/dart_action.gni")
+import("//flutter/lib/web_ui/flutter_js/sources.gni")
+import("//flutter/web_sdk/web_sdk.gni")
+import("$dart_src/build/dart/dart_action.gni")
 
-declare_args() {
-  build_canvaskit = false
-  archive_flutter_web_sdk = true
-}
-
-dart_sdk_package_config = "//third_party/dart/.dart_tool/package_config.json"
-
-web_ui_sources = exec_script("//third_party/dart/tools/list_dart_files.py",
+web_ui_sources = exec_script("$dart_src/tools/list_dart_files.py",
                              [
                                "absolute",
                                rebase_path("//flutter/lib/web_ui/lib"),
@@ -25,8 +20,10 @@ web_engine_libraries = [
   ":skwasm_stub_library",
   ":web_engine_library",
   ":web_ui_library",
+  ":web_ui_ui_web",
   ":web_ui_library_sources",
   ":web_unicode_library",
+  ":web_test_fonts_library",
   ":web_locale_keymap_library",
 ]
 
@@ -34,73 +31,8 @@ group("web_sdk") {
   deps = [
     ":flutter_ddc_modules",
     ":flutter_platform_dills",
+    "//flutter/lib/web_ui/flutter_js",
   ]
-
-  if (archive_flutter_web_sdk && !is_fuchsia) {
-    deps += [ ":flutter_web_sdk_archive" ]
-  }
-}
-
-template("sdk_rewriter") {
-  ui = defined(invoker.ui) && invoker.ui
-  if (!ui) {
-    assert(defined(invoker.library_name), "Must pass 'library_name'")
-    assert(defined(invoker.api_file), "Must pass 'api_file'")
-  }
-  assert(defined(invoker.input_dir), "Must pass 'input_dir'")
-  assert(defined(invoker.output_dir), "Must pass 'output_dir'")
-
-  source_dart_files = exec_script("//third_party/dart/tools/list_dart_files.py",
-                                  [
-                                    "absolute",
-                                    rebase_path(invoker.input_dir),
-                                  ],
-                                  "list lines")
-
-  if (defined(invoker.exclude_patterns)) {
-    filtered_files = filter_exclude(source_dart_files, invoker.exclude_patterns)
-    source_dart_files = []
-    source_dart_files = filtered_files
-  }
-
-  prebuilt_dart_action(target_name) {
-    packages = dart_sdk_package_config
-    pool = "//flutter/build/dart:dart_pool"
-
-    script = "sdk_rewriter.dart"
-    inputs = source_dart_files + [ "sdk_rewriter.dart" ]
-
-    stamp_location = "$target_gen_dir/$target_name.stamp"
-    outputs = [
-      stamp_location,
-      invoker.output_dir,
-    ]
-
-    input_dir = rebase_path(invoker.input_dir)
-    output_dir = rebase_path(invoker.output_dir)
-
-    args = [
-      "--output-dir=$output_dir",
-      "--input-dir=$input_dir",
-      "--stamp",
-      rebase_path(stamp_location, root_build_dir),
-    ]
-    if (ui) {
-      args += [ "--ui" ]
-    } else {
-      library_name = invoker.library_name
-      api_file = rebase_path(invoker.api_file)
-      args += [
-        "--library-name=$library_name",
-        "--api-file=$api_file",
-      ]
-    }
-
-    foreach(source_file, source_dart_files) {
-      path = rebase_path(source_file)
-      args += [ "--source-file=$path" ]
-    }
-  }
 }
 
 sdk_rewriter("web_ui_library_sources") {
@@ -109,7 +41,11 @@ sdk_rewriter("web_ui_library_sources") {
   output_dir = "$root_out_dir/flutter_web_sdk/lib/ui/"
 
   # exclude everything in the engine directory, it will be a separate internal library
-  exclude_patterns = [ rebase_path("//flutter/lib/web_ui/lib/src/*") ]
+  exclude_pattern = rebase_path("//flutter/lib/web_ui/lib/src")
+}
+
+web_ui_ui_web_with_output("web_ui_ui_web") {
+  output_dir = "$root_out_dir/flutter_web_sdk/lib/ui_web/"
 }
 
 sdk_rewriter("web_engine_library") {
@@ -119,8 +55,7 @@ sdk_rewriter("web_engine_library") {
   output_dir = "$root_out_dir/flutter_web_sdk/lib/_engine/"
 
   # exclude skwasm, it will be a separate internal library
-  exclude_patterns =
-      [ rebase_path("//flutter/lib/web_ui/lib/src/engine/skwasm/*") ]
+  exclude_pattern = rebase_path("//flutter/lib/web_ui/lib/src/engine/skwasm")
 }
 
 sdk_rewriter("skwasm_stub_library") {
@@ -144,6 +79,13 @@ sdk_rewriter("web_unicode_library") {
   output_dir = "$root_out_dir/flutter_web_sdk/lib/_web_unicode/"
 }
 
+sdk_rewriter("web_test_fonts_library") {
+  library_name = "web_test_fonts"
+  api_file = "//flutter/third_party/web_test_fonts/lib/web_test_fonts.dart"
+  input_dir = "//flutter/third_party/web_test_fonts/lib/web_test_fonts/"
+  output_dir = "$root_out_dir/flutter_web_sdk/lib/_web_test_fonts/"
+}
+
 sdk_rewriter("web_locale_keymap_library") {
   library_name = "web_locale_keymap"
   api_file =
@@ -196,13 +138,13 @@ template("_dartdevc") {
       forward_variables_from(invoker, "*")
 
       deps = web_engine_libraries + [
-               "//third_party/dart:create_sdk",
-               "//third_party/dart/pkg:pkg_files_stamp",
-               "//third_party/dart/utils/dartdevc:dartdevc_files_stamp",
-               "//third_party/dart/utils/dartdevc:dartdevc_sdk_patch_stamp",
+               "$dart_src:create_sdk",
+               "$dart_src/pkg:pkg_files_stamp",
+               "$dart_src/utils/ddc:ddc_files_stamp",
+               "$dart_src/utils/ddc:ddc_sdk_patch_stamp",
              ]
 
-      script = "//third_party/dart/pkg/dev_compiler/bin/dartdevc.dart"
+      script = "$dart_src/pkg/dev_compiler/bin/dartdevc.dart"
 
       pool = "//flutter/build/dart:dart_pool"
     }
@@ -247,13 +189,13 @@ template("_kernel_worker") {
       forward_variables_from(invoker, "*")
 
       deps = web_engine_libraries + [
-               "//third_party/dart:create_sdk",
-               "//third_party/dart/pkg:pkg_files_stamp",
-               "//third_party/dart/utils/dartdevc:dartdevc_files_stamp",
-               "//third_party/dart/utils/dartdevc:dartdevc_sdk_patch_stamp",
+               "$dart_src:create_sdk",
+               "$dart_src/pkg:pkg_files_stamp",
+               "$dart_src/utils/ddc:ddc_files_stamp",
+               "$dart_src/utils/ddc:ddc_sdk_patch_stamp",
              ]
 
-      script = "//third_party/dart/utils/bazel/kernel_worker.dart"
+      script = "$dart_src/utils/bazel/kernel_worker.dart"
 
       pool = "//flutter/build/dart:dart_pool"
     }
@@ -288,6 +230,11 @@ template("_compile_platform") {
     if (defined(invoker.null_environment) && invoker.null_environment) {
       args += [ "--null-environment" ]
     }
+    skwasm_library = "dart:_skwasm_stub"
+    if (invoker.kernel_target == "dart2wasm") {
+      skwasm_library = "dart:_skwasm_impl"
+    }
+
     args += [
       "--target",
       "${invoker.kernel_target}",
@@ -308,9 +255,11 @@ template("_compile_platform") {
       "--source",
       "dart:ui",
       "--source",
+      "dart:ui_web",
+      "--source",
       "dart:_engine",
       "--source",
-      "dart:_skwasm_stub",
+      skwasm_library,
       "--source",
       "dart:_web_unicode",
       "--source",
@@ -363,28 +312,19 @@ _compile_platform("flutter_dart2js_kernel_sdk_full_sound") {
   null_environment = true
 }
 
-# TODO(jacksongardner): remove these once they are no longer used by the flutter tool
-copy("flutter_dartdevc_kernel_sdk_outline_unsound_legacy") {
-  sources = get_target_outputs(":flutter_dartdevc_kernel_sdk_outline_unsound")
-
-  outputs = [ "$root_out_dir/flutter_web_sdk/kernel/flutter_ddc_sdk.dill" ]
-
-  deps = [ ":flutter_dartdevc_kernel_sdk_outline_unsound" ]
-}
-
-copy("flutter_dartdevc_kernel_sdk_outline_sound_legacy") {
-  sources = get_target_outputs(":flutter_dartdevc_kernel_sdk_outline_sound")
-
-  outputs =
-      [ "$root_out_dir/flutter_web_sdk/kernel/flutter_ddc_sdk_sound.dill" ]
-
-  deps = [ ":flutter_dartdevc_kernel_sdk_outline_sound" ]
+_compile_platform("flutter_dart2wasm_kernel_sdk_full_sound") {
+  sound_null_safety = true
+  kernel_target = "dart2wasm"
+  summary_only = false
+  output_dill = "$root_out_dir/flutter_web_sdk/kernel/dart2wasm_platform.dill"
+  null_environment = true
 }
 
 group("flutter_platform_dills") {
   public_deps = [
     ":flutter_dart2js_kernel_sdk_full_sound",
     ":flutter_dart2js_kernel_sdk_full_unsound",
+    ":flutter_dart2wasm_kernel_sdk_full_sound",
     ":flutter_dartdevc_kernel_sdk_outline_sound",
     ":flutter_dartdevc_kernel_sdk_outline_unsound",
 
@@ -421,14 +361,15 @@ template("_compile_ddc_modules") {
 
     amd_js_path =
         "$root_out_dir/flutter_web_sdk/kernel/amd${name_suffix}/dart_sdk.js"
-    legacy_js_path =
-        "$root_out_dir/flutter_web_sdk/kernel/legacy${name_suffix}/dart_sdk.js"
+
+    ddc_js_path =
+        "$root_out_dir/flutter_web_sdk/kernel/ddc${name_suffix}/dart_sdk.js"
 
     outputs = [
       amd_js_path,
       amd_js_path + ".map",
-      legacy_js_path,
-      legacy_js_path + ".map",
+      ddc_js_path,
+      ddc_js_path + ".map",
     ]
 
     if (invoker.sound_null_safety) {
@@ -443,6 +384,7 @@ template("_compile_ddc_modules") {
 
       # Additional Flutter web dart libraries
       "dart:ui",
+      "dart:ui_web",
       "dart:_engine",
       "dart:_skwasm_stub",
       "dart:_web_unicode",
@@ -466,9 +408,9 @@ template("_compile_ddc_modules") {
       "-o",
       rebase_path(amd_js_path),
       "--modules",
-      "legacy",
+      "ddc",
       "-o",
-      rebase_path(legacy_js_path),
+      rebase_path(ddc_js_path),
     ]
     if (flutter_prebuilt_dart_sdk) {
       args += [
@@ -534,33 +476,26 @@ group("flutter_ddc_modules") {
     ":flutter_dartdevc_canvaskit_kernel_sdk_sound",
     ":flutter_dartdevc_kernel_sdk",
     ":flutter_dartdevc_kernel_sdk_sound",
-
-    # TODO(jacksongardner): remove these once they are no longer used by the flutter tool
-    # https://github.com/flutter/flutter/issues/113303
-    ":flutter_dartdevc_kernel_sdk_outline_sound_legacy",
-    ":flutter_dartdevc_kernel_sdk_outline_unsound_legacy",
   ]
 }
 
 # Archives Flutter Web SDK
 if (!is_fuchsia) {
   zip_bundle_from_file("flutter_web_sdk_archive") {
-    if (target_os == "wasm") {
-      output = "flutter-web-sdk.zip"
-    } else {
-      # TODO(jacksongardner): remove this once we stop making platform-specific
-      # flutter_web_sdk archives.
-      # https://github.com/flutter/flutter/issues/113303
-      output = "flutter-web-sdk-${full_platform_name}.zip"
-    }
+    output = "flutter-web-sdk.zip"
     deps = [
              ":flutter_ddc_modules",
              ":flutter_platform_dills",
            ] + web_engine_libraries
 
-    if (build_canvaskit) {
-      deps += [ "//third_party/skia/modules/canvaskit" ]
+    if (is_wasm) {
+      deps += [
+        "//flutter/third_party/canvaskit:canvaskit_chromium_group",
+        "//flutter/third_party/canvaskit:canvaskit_group",
+        "//flutter/third_party/canvaskit:skwasm_group",
+      ]
     }
+    deps += [ "//flutter/lib/web_ui/flutter_js" ]
 
     # flutter_ddc_modules
     sources = get_target_outputs(":flutter_dartdevc_kernel_sdk")
@@ -578,36 +513,45 @@ if (!is_fuchsia) {
     sources += get_target_outputs(":flutter_dartdevc_kernel_sdk_outline_sound")
     sources += get_target_outputs(":flutter_dart2js_kernel_sdk_full_unsound")
     sources += get_target_outputs(":flutter_dart2js_kernel_sdk_full_sound")
+    sources += get_target_outputs(":flutter_dart2wasm_kernel_sdk_full_sound")
+    if (is_wasm) {
+      sources += [
+        "$root_out_dir/flutter_web_sdk/canvaskit/canvaskit.js",
+        "$root_out_dir/flutter_web_sdk/canvaskit/canvaskit.js.symbols",
+        "$root_out_dir/flutter_web_sdk/canvaskit/canvaskit.wasm",
+        "$root_out_dir/flutter_web_sdk/canvaskit/chromium/canvaskit.js",
+        "$root_out_dir/flutter_web_sdk/canvaskit/chromium/canvaskit.js.symbols",
+        "$root_out_dir/flutter_web_sdk/canvaskit/chromium/canvaskit.wasm",
+        "$root_out_dir/flutter_web_sdk/canvaskit/skwasm.js",
+        "$root_out_dir/flutter_web_sdk/canvaskit/skwasm.js.symbols",
+        "$root_out_dir/flutter_web_sdk/canvaskit/skwasm.wasm",
+        "$root_out_dir/flutter_web_sdk/canvaskit/skwasm.worker.js",
+      ]
+    }
 
-    # TODO(jacksongardner): remove these once they are no longer used by the flutter tool
-    # https://github.com/flutter/flutter/issues/113303
-    sources += get_target_outputs(
-            ":flutter_dartdevc_kernel_sdk_outline_unsound_legacy")
-    sources +=
-        get_target_outputs(":flutter_dartdevc_kernel_sdk_outline_sound_legacy")
+    # flutter.js full sources
+    foreach(source, flutter_js_source_list) {
+      sources += [ "$root_out_dir/flutter_web_sdk/flutter_js/$source" ]
+    }
+
+    # flutter.js bundled source and sourcemap
+    sources += [
+      "$root_out_dir/flutter_web_sdk/flutter_js/flutter.js",
+      "$root_out_dir/flutter_web_sdk/flutter_js/flutter.js.map",
+    ]
 
     foreach(web_engine_library, web_engine_libraries) {
       sources += get_target_outputs(web_engine_library)
     }
 
     tmp_files = []
-    foreach(source, sources) {
+    web_sdk_files =
+        filter_include(sources, [ "$root_build_dir/flutter_web_sdk/**" ])
+    foreach(source, web_sdk_files) {
       tmp_files += [
         {
           source = rebase_path(source)
-          destination = rebase_path(source, "$root_build_dir")
-        },
-      ]
-    }
-    if (build_canvaskit) {
-      tmp_files += [
-        {
-          source = rebase_path("$root_out_dir/canvaskit.js")
-          destination = "canvaskit/canvaskit.js"
-        },
-        {
-          source = rebase_path("$root_out_dir/canvaskit.wasm")
-          destination = "canvaskit/canvaskit.wasm"
+          destination = rebase_path(source, "$root_build_dir/flutter_web_sdk")
         },
       ]
     }
diff --git a/web_sdk/libraries.json b/web_sdk/libraries.json
index c4dd531171eeee9d2dd6e020088c714ae01cef7b..044a1ec05a1f539307d9798d3075690e560343a6 100644
--- a/web_sdk/libraries.json
+++ b/web_sdk/libraries.json
@@ -12,6 +12,9 @@
       "ui": {
         "uri": "lib/ui/ui.dart"
       },
+      "ui_web": {
+        "uri": "lib/ui_web/ui_web.dart"
+      },
       "_engine": {
         "uri": "lib/_engine/engine.dart"
       },
@@ -23,6 +26,9 @@
       },
       "_web_locale_keymap": {
         "uri": "lib/_web_locale_keymap/web_locale_keymap.dart"
+      },
+      "_web_test_fonts": {
+        "uri": "lib/_web_test_fonts/web_test_fonts.dart"
       }
     }
   },
@@ -37,6 +43,9 @@
       "ui": {
         "uri": "lib/ui/ui.dart"
       },
+      "ui_web": {
+        "uri": "lib/ui_web/ui_web.dart"
+      },
       "_engine": {
         "uri": "lib/_engine/engine.dart"
       },
@@ -48,6 +57,9 @@
       },
       "_web_locale_keymap": {
         "uri": "lib/_web_locale_keymap/web_locale_keymap.dart"
+      },
+      "_web_test_fonts": {
+        "uri": "lib/_web_test_fonts/web_test_fonts.dart"
       }
     }
   },
@@ -62,6 +74,9 @@
       "ui": {
         "uri": "lib/ui/ui.dart"
       },
+      "ui_web": {
+        "uri": "lib/ui_web/ui_web.dart"
+      },
       "_engine": {
         "uri": "lib/_engine/engine.dart"
       },
@@ -73,7 +88,10 @@
       },
       "_web_locale_keymap": {
         "uri": "lib/_web_locale_keymap/web_locale_keymap.dart"
+      },
+      "_web_test_fonts": {
+        "uri": "lib/_web_test_fonts/web_test_fonts.dart"
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/web_sdk/libraries.yaml b/web_sdk/libraries.yaml
index c55ddfbafc84d81a04ebe1408c310bd9a2e37b3b..46ab52b18de2c7b9330b647edf064ca4d722e6f7 100644
--- a/web_sdk/libraries.yaml
+++ b/web_sdk/libraries.yaml
@@ -21,6 +21,9 @@ dartdevc:
     ui:
       uri: "lib/ui/ui.dart"
 
+    ui_web:
+      uri: "lib/ui_web/ui_web.dart"
+
     _engine:
       uri: "lib/_engine/engine.dart"
 
@@ -33,6 +36,9 @@ dartdevc:
     _web_locale_keymap:
       uri: "lib/_web_locale_keymap/web_locale_keymap.dart"
 
+    _web_test_fonts:
+      uri: "lib/_web_test_fonts/web_test_fonts.dart"
+
 dart2js:
   include:
     - {path: "../dart-sdk/lib/libraries.json", target: dart2js}
@@ -41,6 +47,9 @@ dart2js:
     ui:
       uri: "lib/ui/ui.dart"
 
+    ui_web:
+      uri: "lib/ui_web/ui_web.dart"
+
     _engine:
       uri: "lib/_engine/engine.dart"
 
@@ -53,6 +62,9 @@ dart2js:
     _web_locale_keymap:
       uri: "lib/_web_locale_keymap/web_locale_keymap.dart"
 
+    _web_test_fonts:
+      uri: "lib/_web_test_fonts/web_test_fonts.dart"
+
 wasm:
   include:
     - {path: "../dart-sdk/lib/libraries.json", target: wasm}
@@ -61,6 +73,9 @@ wasm:
     ui:
       uri: "lib/ui/ui.dart"
 
+    ui_web:
+      uri: "lib/ui_web/ui_web.dart"
+
     _engine:
       uri: "lib/_engine/engine.dart"
 
@@ -72,3 +87,6 @@ wasm:
 
     _web_locale_keymap:
       uri: "lib/_web_locale_keymap/web_locale_keymap.dart"
+
+    _web_test_fonts:
+      uri: "lib/_web_test_fonts/web_test_fonts.dart"
diff --git a/web_sdk/pubspec.yaml b/web_sdk/pubspec.yaml
index 7ffa0caef09fa485694a2bb2210e40cc24601dc2..3c08d03847087a9288eedec36a941c6dba76fed9 100644
--- a/web_sdk/pubspec.yaml
+++ b/web_sdk/pubspec.yaml
@@ -2,12 +2,59 @@ name: web_sdk_tests
 
 # Keep the SDK version range in sync with lib/web_ui/pubspec.yaml
 environment:
-  sdk: ">=2.12.0-0 <3.0.0"
+  sdk: '>=3.2.0-0 <4.0.0'
 
 dependencies:
   args: 2.3.1
-  path: 1.8.2
+  path: any # see dependency_overrides
 
 dev_dependencies:
-  analyzer: 4.3.1
-  test: 1.22.0
+  # Using the bundled analyzer (see dependency_overrides) to always be
+  # up-to-date instead of a version from pub, which may not have the latest
+  # language features enabled.
+  analyzer: any
+  test: 1.24.8
+
+dependency_overrides: # Must include all transitive dependencies from the "any" packages above.
+  _fe_analyzer_shared:
+    path: ../../third_party/dart/pkg/_fe_analyzer_shared
+  _macros:
+    path: ../../third_party/dart/pkg/_macros
+  analyzer:
+    path: ../../third_party/dart/pkg/analyzer
+  async:
+    path: ../../third_party/dart/third_party/pkg/async
+  collection:
+    path: ../../third_party/dart/third_party/pkg/collection
+  convert:
+    path: ../../third_party/dart/third_party/pkg/convert
+  crypto:
+    path: ../../third_party/dart/third_party/pkg/crypto
+  dart_internal:
+    path: ../../third_party/dart/pkg/dart_internal
+  file:
+    path: ../../third_party/dart/third_party/pkg/file/packages/file
+  glob:
+    path: ../../third_party/dart/third_party/pkg/glob
+  macros:
+    path: ../../third_party/dart/pkg/macros
+  meta:
+    path: ../../third_party/dart/pkg/meta
+  package_config:
+    path: ../../third_party/dart/third_party/pkg/package_config
+  path:
+    path: ../../third_party/dart/third_party/pkg/path
+  pub_semver:
+    path: ../../third_party/dart/third_party/pkg/pub_semver
+  source_span:
+    path: ../../third_party/dart/third_party/pkg/source_span
+  string_scanner:
+    path: ../../third_party/dart/third_party/pkg/string_scanner
+  term_glyph:
+    path: ../../third_party/dart/third_party/pkg/term_glyph
+  typed_data:
+    path: ../../third_party/dart/third_party/pkg/typed_data
+  watcher:
+    path: ../../third_party/dart/third_party/pkg/watcher
+  yaml:
+    path: ../../third_party/dart/third_party/pkg/yaml
diff --git a/web_sdk/sdk_rewriter.dart b/web_sdk/sdk_rewriter.dart
index e1b1e0402482755b05287c274be07965b23b902f..119f38239ca977243cb747c4d9265f8c25e32a81 100644
--- a/web_sdk/sdk_rewriter.dart
+++ b/web_sdk/sdk_rewriter.dart
@@ -11,34 +11,40 @@ final ArgParser argParser = ArgParser()
   ..addOption('output-dir')
   ..addOption('input-dir')
   ..addFlag('ui')
+  ..addFlag('public')
   ..addOption('library-name')
   ..addOption('api-file')
   ..addMultiOption('source-file')
-  ..addOption('stamp');
+  ..addOption('stamp')
+  ..addOption('depfile')
+  ..addOption('exclude-pattern')
+  ..addOption('build-dir');
 
 final List<Replacer> uiPatterns = <Replacer>[
   AllReplacer(RegExp(r'library\s+ui;'), 'library dart.ui;'),
   AllReplacer(RegExp(r'part\s+of\s+ui;'), 'part of dart.ui;'),
+
+  // import 'src/engine.dart' as engine;
   AllReplacer(RegExp(r'''
 import\s*'src/engine.dart'\s*as\s+engine;
 '''), r'''
 import 'dart:_engine' as engine;
 '''),
-  AllReplacer(RegExp(
-    r'''
-export\s*'src/engine.dart'
+
+  // import 'ui_web/src/ui_web.dart' as ui_web;
+  AllReplacer(RegExp(r'''
+import\s*'ui_web/src/ui_web.dart'\s*as\s+ui_web;
+'''), r'''
+import 'dart:ui_web' as ui_web;
 '''),
-    r'''
-export 'dart:_engine'
-''',
-  ),
 ];
 
-List<Replacer> generateApiFilePatterns(String libraryName, List<String> extraImports) {
+List<Replacer> generateApiFilePatterns(String libraryName, bool isPublic, List<String> extraImports) {
+  final String libraryPrefix = isPublic ? '' : '_';
   return <Replacer>[
     AllReplacer(RegExp('library\\s+$libraryName;'), '''
 @JS()
-library dart._$libraryName;
+library dart.$libraryPrefix$libraryName;
 
 import 'dart:async';
 import 'dart:collection';
@@ -46,6 +52,8 @@ import 'dart:convert' hide Codec;
 import 'dart:developer' as developer;
 import 'dart:js_util' as js_util;
 import 'dart:_js_annotations';
+import 'dart:js_interop' hide JS;
+import 'dart:js_interop_unsafe';
 import 'dart:math' as math;
 import 'dart:typed_data';
 import 'dart:ui' as ui;
@@ -62,9 +70,10 @@ part '$libraryName/${match.group(1)}';
   ];
 }
 
-List<Replacer> generatePartsPatterns(String libraryName) {
+List<Replacer> generatePartsPatterns(String libraryName, bool isPublic) {
+  final String libraryPrefix = isPublic ? '' : '_';
   return <Replacer>[
-    AllReplacer(RegExp('part\\s+of\\s+$libraryName;'), 'part of dart._$libraryName;'),
+    AllReplacer(RegExp('part\\s+of\\s+$libraryName;'), 'part of dart.$libraryPrefix$libraryName;'),
     // Remove library-level JS annotations.
     AllReplacer(RegExp(r'\n@JS(.*)\nlibrary .+;'), ''),
     // Remove library directives.
@@ -72,6 +81,7 @@ List<Replacer> generatePartsPatterns(String libraryName) {
     // Remove imports/exports from all part files.
     AllReplacer(RegExp(r'\nimport\s*.*'), ''),
     AllReplacer(RegExp(r'\nexport\s*.*'), ''),
+    AllReplacer(RegExp(r'\n@DefaultAsset(.*)'), ''),
   ];
 }
 
@@ -85,6 +95,7 @@ final List<Replacer> stripMetaPatterns = <Replacer>[
 ];
 
 const Set<String> rootLibraryNames = <String>{
+  'ui_web',
   'engine',
   'skwasm_stub',
   'skwasm_impl',
@@ -92,8 +103,10 @@ const Set<String> rootLibraryNames = <String>{
 
 final Map<Pattern, String> extraImportsMap = <Pattern, String>{
   RegExp('skwasm_(stub|impl)'): "import 'dart:_skwasm_stub' if (dart.library.ffi) 'dart:_skwasm_impl';",
+  'ui_web': "import 'dart:ui_web' as ui_web;",
   'engine': "import 'dart:_engine';",
   'web_unicode': "import 'dart:_web_unicode';",
+  'web_test_fonts': "import 'dart:_web_test_fonts';",
   'web_locale_keymap': "import 'dart:_web_locale_keymap' as locale_keymap;",
 };
 
@@ -103,28 +116,46 @@ void main(List<String> arguments) {
   final ArgResults results = argParser.parse(arguments);
   final Directory directory = Directory(results['output-dir'] as String);
   final String inputDirectoryPath = results['input-dir'] as String;
+  final String? excludePattern = results['exclude-pattern'] as String?;
+  final String stampfilePath = results['stamp'] as String;
+  final String depfilePath = results['depfile'] as String;
+  final String buildDirPath = results['build-dir'] as String;
 
   String Function(String source)? preprocessor;
   List<Replacer> replacementPatterns;
   String? libraryName;
 
+  final bool isPublic = results['public'] as bool;
+
   if (results['ui'] as bool) {
     replacementPatterns = uiPatterns;
   } else {
-    libraryName = results['library-name'] as String;
+    libraryName = results['library-name'] as String?;
     if (libraryName == null) {
       throw Exception('library-name must be specified if not rewriting ui');
     }
     preprocessor = (String source) => preprocessPartFile(source, libraryName!);
-    replacementPatterns = generatePartsPatterns(libraryName);
+    replacementPatterns = generatePartsPatterns(libraryName, isPublic);
   }
-  for (final String inputFilePath in results['source-file'] as Iterable<String>) {
-    String pathSuffix = inputFilePath.substring(inputDirectoryPath.length);
+
+  final List<String> inputFiles = <String>[];
+  final List<FileSystemEntity> entries = Directory(inputDirectoryPath).listSync(
+    recursive: true, followLinks: false,
+  );
+  for (final File inputFile in entries.whereType<File>()) {
+    if (excludePattern != null && inputFile.path.startsWith(excludePattern)) {
+      continue;
+    }
+    if (!inputFile.path.endsWith('.dart') || inputFile.path.endsWith('_test.dart')) {
+      continue;
+    }
+    inputFiles.add(path.relative(inputFile.path, from: buildDirPath));
+    String pathSuffix = inputFile.path.substring(inputDirectoryPath.length);
     if (libraryName != null) {
       pathSuffix = path.join(libraryName, pathSuffix);
     }
     final String outputFilePath = path.join(directory.path, pathSuffix);
-    processFile(inputFilePath, outputFilePath, preprocessor, replacementPatterns);
+    processFile(inputFile.path, outputFilePath, preprocessor, replacementPatterns);
   }
 
   if (results['api-file'] != null) {
@@ -137,7 +168,7 @@ void main(List<String> arguments) {
         directory.path, path.basename(inputFilePath));
 
     final List<String> extraImports = getExtraImportsForLibrary(libraryName);
-    replacementPatterns = generateApiFilePatterns(libraryName, extraImports);
+    replacementPatterns = generateApiFilePatterns(libraryName, isPublic, extraImports);
 
     processFile(
       inputFilePath,
@@ -147,10 +178,15 @@ void main(List<String> arguments) {
     );
   }
 
+  File(stampfilePath).writeAsStringSync('stamp');
+  writeDepfile(depfilePath, stampfilePath, inputFiles);
+}
 
-  if (results['stamp'] != null) {
-    File(results['stamp'] as String).writeAsStringSync('stamp');
-  }
+void writeDepfile(String depfilePath, String stampfilePath, List<String> inputFiles) {
+  final StringBuffer outBuf = StringBuffer();
+  outBuf.write('$stampfilePath: ');
+  outBuf.write(inputFiles.join(' '));
+  File(depfilePath).writeAsStringSync(outBuf.toString());
 }
 
 List<String> getExtraImportsForLibrary(String libraryName) {
@@ -166,6 +202,9 @@ List<String> getExtraImportsForLibrary(String libraryName) {
       extraImports.add(entry.value);
     }
   }
+  if (libraryName == 'skwasm_impl') {
+    extraImports.add("import 'dart:_wasm';");
+  }
   return extraImports;
 }
 
@@ -227,6 +266,17 @@ String validateApiFile(String apiFilePath, String apiFileCode, String libraryNam
       continue;
     }
 
+    if (line.startsWith('@DefaultAsset')) {
+      // Default asset annotations are OK
+      continue;
+    }
+
+    if (line.startsWith("import 'dart:ffi';")) {
+      // dart:ffi import is an exception to the import rule, since the
+      // @DefaultAsset annotation comes from dart:ffi.
+      continue;
+    }
+
     throw Exception(
       'on line $lineNumber: unexpected code in $apiFilePath. This file '
       'may only contain comments and exports. Found:\n'
diff --git a/web_sdk/test/api_conform_test.dart b/web_sdk/test/api_conform_test.dart
index db5ffb8587ed794cdd03fc7b5e418072e1faf36b..b3368b0215983653515c820758a5b4a054d0133e 100644
--- a/web_sdk/test/api_conform_test.dart
+++ b/web_sdk/test/api_conform_test.dart
@@ -120,20 +120,20 @@ void main() {
               uiConstructor.parameters.parameters[i];
           final FormalParameter webParam =
               webConstructor.parameters.parameters[i];
-          if (webParam.identifier!.name != uiParam.identifier!.name) {
+          if (webParam.name!.lexeme != uiParam.name!.lexeme) {
             failed = true;
             print('Warning: lib/ui/ui.dart $className.$name parameter $i'
-                ' ${uiParam.identifier!.name} has a different name in lib/web_ui/ui.dart.');
+                ' ${uiParam.name!.lexeme} has a different name in lib/web_ui/ui.dart.');
           }
           if (uiParam.isPositional != webParam.isPositional) {
             failed = true;
             print('Warning: lib/ui/ui.dart $className.$name parameter $i'
-                '${uiParam.identifier!.name} is positional, but not in lib/web_ui/ui.dart.');
+                '${uiParam.name!.lexeme} is positional, but not in lib/web_ui/ui.dart.');
           }
           if (uiParam.isNamed != webParam.isNamed) {
             failed = true;
             print('Warning: lib/ui/ui.dart $className.$name parameter $i'
-                '${uiParam.identifier!.name} is named, but not in lib/web_ui/ui.dart.');
+                '${uiParam.name!.lexeme} is named, but not in lib/web_ui/ui.dart.');
           }
         }
       }
@@ -170,20 +170,20 @@ void main() {
           i++) {
         final FormalParameter uiParam = uiMethod.parameters!.parameters[i];
         final FormalParameter webParam = webMethod.parameters!.parameters[i];
-        if (webParam.identifier!.name != uiParam.identifier!.name) {
+        if (webParam.name!.lexeme != uiParam.name!.lexeme) {
           failed = true;
           print('Warning: lib/ui/ui.dart $className.$methodName parameter $i'
-              ' ${uiParam.identifier!.name} has a different name in lib/web_ui/ui.dart.');
+              ' ${uiParam.name!.lexeme} has a different name in lib/web_ui/ui.dart.');
         }
         if (uiParam.isPositional != webParam.isPositional) {
           failed = true;
           print('Warning: lib/ui/ui.dart $className.$methodName parameter $i'
-              '${uiParam.identifier!.name} is positional, but not in lib/web_ui/ui.dart.');
+              '${uiParam.name!.lexeme} is positional, but not in lib/web_ui/ui.dart.');
         }
         if (uiParam.isNamed != webParam.isNamed) {
           failed = true;
           print('Warning: lib/ui/ui.dart $className.$methodName parameter $i'
-              '${uiParam.identifier!.name} is named, but not in lib/web_ui/ui.dart.');
+              '${uiParam.name!.lexeme} is named, but not in lib/web_ui/ui.dart.');
         }
         // check nullability
         if (uiParam is SimpleFormalParameter &&
@@ -193,7 +193,7 @@ void main() {
           if (isUiNullable != isWebNullable) {
             failed = true;
             print('Warning: lib/ui/ui.dart $className.$methodName parameter $i '
-                '${uiParam.identifier} has a different nullability than in lib/web_ui/ui.dart.');
+                '${uiParam.name} has a different nullability than in lib/web_ui/ui.dart.');
           }
         }
       }
@@ -247,28 +247,28 @@ void main() {
       final SimpleFormalParameter webParam =
           (webTypeDef.type as GenericFunctionType).parameters.parameters[i]
               as SimpleFormalParameter;
-      if (webParam.identifier == null) {
+      if (webParam.name == null) {
         failed = true;
         print('Warning: lib/web_ui/ui.dart $typeDefName parameter $i should have name.');
       }
-      if (uiParam.identifier == null) {
+      if (uiParam.name == null) {
         failed = true;
         print('Warning: lib/ui/ui.dart $typeDefName parameter $i should have name.');
       }
-      if (webParam.identifier?.name != uiParam.identifier?.name) {
+      if (webParam.name?.lexeme != uiParam.name?.lexeme) {
         failed = true;
         print('Warning: lib/ui/ui.dart $typeDefName parameter $i '
-            '${uiParam.identifier!.name} has a different name in lib/web_ui/ui.dart.');
+            '${uiParam.name!.lexeme} has a different name in lib/web_ui/ui.dart.');
       }
       if (uiParam.isPositional != webParam.isPositional) {
         failed = true;
         print('Warning: lib/ui/ui.dart $typeDefName parameter $i '
-            '${uiParam.identifier!.name} is positional, but not in lib/web_ui/ui.dart.');
+            '${uiParam.name!.lexeme} is positional, but not in lib/web_ui/ui.dart.');
       }
       if (uiParam.isNamed != webParam.isNamed) {
         failed = true;
         print('Warning: lib/ui/ui.dart $typeDefName parameter $i '
-            '${uiParam.identifier!.name} is named, but not in lib/web_ui/ui.dart.');
+            '${uiParam.name!.lexeme}} is named, but not in lib/web_ui/ui.dart.');
       }
 
       final bool isUiNullable = uiParam.type?.question != null;
@@ -276,7 +276,7 @@ void main() {
       if (isUiNullable != isWebNullable) {
         failed = true;
         print('Warning: lib/ui/ui.dart $typeDefName parameter $i '
-            '${uiParam.identifier} has a different nullability than in lib/web_ui/ui.dart.');
+            '${uiParam.name} has a different nullability than in lib/web_ui/ui.dart.');
       }
     }
 
@@ -315,10 +315,10 @@ void _collectPublicClasses(CompilationUnit unit,
         continue;
       }
       final ClassDeclaration classDeclaration = member;
-      if (classDeclaration.name.name.startsWith('_')) {
+      if (classDeclaration.name.lexeme.startsWith('_')) {
         continue;
       }
-      destination[classDeclaration.name.name] = classDeclaration;
+      destination[classDeclaration.name.lexeme] = classDeclaration;
     }
   }
 }
@@ -329,7 +329,7 @@ void _collectPublicConstructors(ClassDeclaration classDeclaration,
     if (member is! ConstructorDeclaration) {
       continue;
     }
-    final String? methodName = member.name?.name;
+    final String? methodName = member.name?.lexeme;
     if (methodName == null) {
       destination['Unnamed Constructor'] = member;
       continue;
@@ -347,10 +347,10 @@ void _collectPublicMethods(ClassDeclaration classDeclaration,
     if (member is! MethodDeclaration) {
       continue;
     }
-    if (member.name.name.startsWith('_')) {
+    if (member.name.lexeme.startsWith('_')) {
       continue;
     }
-    destination[member.name.name] = member;
+    destination[member.name.lexeme] = member;
   }
 }
 
@@ -369,10 +369,10 @@ void _collectPublicTypeDefs(CompilationUnit unit,
         continue;
       }
       final GenericTypeAlias typeDeclaration = member;
-      if (typeDeclaration.name.name.startsWith('_')) {
+      if (typeDeclaration.name.lexeme.startsWith('_')) {
         continue;
       }
-      destination[typeDeclaration.name.name] = typeDeclaration;
+      destination[typeDeclaration.name.lexeme] = typeDeclaration;
     }
   }
 }
diff --git a/web_sdk/test/js_access_test.dart b/web_sdk/test/js_access_test.dart
index 985ab28e3180d128ae0dae0614b21c290d36b282..0500284dcca775b0bbea9e7b4455c77ab71540c0 100644
--- a/web_sdk/test/js_access_test.dart
+++ b/web_sdk/test/js_access_test.dart
@@ -4,13 +4,13 @@
 
 // ignore_for_file: avoid_print
 
-/// Checks that JavaScript API is accessed properly.
-///
-/// JavaScript access needs to be audited to make sure it follows security best
-/// practices. To do that, all JavaScript access is consolidated into a small
-/// number of libraries that change infrequently. These libraries are manually
-/// audited on every change. All other code accesses JavaScript through these
-/// libraries and does not require audit.
+// Checks that JavaScript API is accessed properly.
+//
+// JavaScript access needs to be audited to make sure it follows security best
+// practices. To do that, all JavaScript access is consolidated into a small
+// number of libraries that change infrequently. These libraries are manually
+// audited on every change. All other code accesses JavaScript through these
+// libraries and does not require audit.
 
 import 'dart:io';
 
@@ -31,13 +31,13 @@ const List<String> _auditedLibraries = <String>[
 ];
 
 Future<void> main(List<String> args) async {
-  bool areAssertionsEnabled = false;
+  bool shouldThrow = true;
   assert(() {
-    areAssertionsEnabled = true;
+    shouldThrow = false;
     return true;
   }());
 
-  if (!areAssertionsEnabled) {
+  if (shouldThrow) {
     throw ArgumentError(
       'This test must run with --enable-asserts',
     );
diff --git a/web_sdk/test/sdk_rewriter_test.dart b/web_sdk/test/sdk_rewriter_test.dart
index 54902cfc14e1ed640b0a59705eabcbde50c72428..95cfe8256f9cdcd1ccfee4f8afb7948fba638452 100644
--- a/web_sdk/test/sdk_rewriter_test.dart
+++ b/web_sdk/test/sdk_rewriter_test.dart
@@ -32,6 +32,8 @@ import 'dart:convert' hide Codec;
 import 'dart:developer' as developer;
 import 'dart:js_util' as js_util;
 import 'dart:_js_annotations';
+import 'dart:js_interop' hide JS;
+import 'dart:js_interop_unsafe';
 import 'dart:math' as math;
 import 'dart:typed_data';
 import 'dart:ui' as ui;
@@ -51,7 +53,42 @@ part 'engine/file3.dart';
         '/path/to/lib/web_ui/lib/src/engine.dart',
         source,
         'engine'),
-      generateApiFilePatterns('engine', <String>["import 'dart:extra';"]),
+      generateApiFilePatterns('engine', false, <String>["import 'dart:extra';"]),
+    );
+    expect(result, expected);
+  });
+
+  test('underscore is not added to library name for public library in API file', () {
+    const String source = '''
+library engine;
+''';
+
+    const String expected = '''
+@JS()
+library dart.engine;
+
+import 'dart:async';
+import 'dart:collection';
+import 'dart:convert' hide Codec;
+import 'dart:developer' as developer;
+import 'dart:js_util' as js_util;
+import 'dart:_js_annotations';
+import 'dart:js_interop' hide JS;
+import 'dart:js_interop_unsafe';
+import 'dart:math' as math;
+import 'dart:typed_data';
+import 'dart:ui' as ui;
+import 'dart:extra';
+
+''';
+
+    final String result = processSource(
+      source,
+      (String source) => validateApiFile(
+        '/path/to/lib/web_ui/lib/src/engine.dart',
+        source,
+        'engine'),
+      generateApiFilePatterns('engine', true, <String>["import 'dart:extra';"]),
     );
     expect(result, expected);
   });
@@ -73,7 +110,7 @@ export 'engine/file3.dart';
           '/path/to/lib/web_ui/lib/src/engine.dart',
           source,
           'engine'),
-        generateApiFilePatterns('engine', <String>[]),
+        generateApiFilePatterns('engine', false, <String>[]),
       );
     } catch(error) {
       caught = error;
@@ -120,7 +157,7 @@ void printSomething() {
     final String result = processSource(
       source,
       (String source) => preprocessPartFile(source, 'engine'),
-      generatePartsPatterns('engine'),
+      generatePartsPatterns('engine', false),
     );
     expect(result, expected);
   });
@@ -129,22 +166,30 @@ void printSomething() {
     // Root libraries.
     expect(getExtraImportsForLibrary('engine'), <String>[
       "import 'dart:_skwasm_stub' if (dart.library.ffi) 'dart:_skwasm_impl';",
+      "import 'dart:ui_web' as ui_web;",
       "import 'dart:_web_unicode';",
+      "import 'dart:_web_test_fonts';",
       "import 'dart:_web_locale_keymap' as locale_keymap;",
     ]);
     expect(getExtraImportsForLibrary('skwasm_stub'), <String>[
+      "import 'dart:ui_web' as ui_web;",
       "import 'dart:_engine';",
       "import 'dart:_web_unicode';",
+      "import 'dart:_web_test_fonts';",
       "import 'dart:_web_locale_keymap' as locale_keymap;",
     ]);
     expect(getExtraImportsForLibrary('skwasm_impl'), <String>[
+      "import 'dart:ui_web' as ui_web;",
       "import 'dart:_engine';",
       "import 'dart:_web_unicode';",
+      "import 'dart:_web_test_fonts';",
       "import 'dart:_web_locale_keymap' as locale_keymap;",
+      "import 'dart:_wasm';",
     ]);
 
     // Other libraries (should not have extra imports).
     expect(getExtraImportsForLibrary('web_unicode'), isEmpty);
+    expect(getExtraImportsForLibrary('web_test_fonts'), isEmpty);
     expect(getExtraImportsForLibrary('web_locale_keymap'), isEmpty);
   });
 }
diff --git a/web_sdk/web_engine_tester/lib/golden_tester.dart b/web_sdk/web_engine_tester/lib/golden_tester.dart
index a03c64b15d209f845b6971c407cc314132fbe133..5e743b4ab7fc64a74eae0120f03e126effc273e5 100644
--- a/web_sdk/web_engine_tester/lib/golden_tester.dart
+++ b/web_sdk/web_engine_tester/lib/golden_tester.dart
@@ -4,6 +4,7 @@
 
 import 'dart:async';
 import 'dart:convert';
+import 'dart:js_interop';
 
 import 'package:test/test.dart';
 // ignore: implementation_imports
@@ -13,13 +14,14 @@ import 'package:ui/src/engine/dom.dart';
 import 'package:ui/ui.dart';
 
 Future<dynamic> _callScreenshotServer(dynamic requestData) async {
-  final DomXMLHttpRequest request = await domHttpRequest(
+  // This is test code, but because the file name doesn't end with "_test.dart"
+  // the analyzer doesn't know it, so have to ignore the lint explicitly.
+  // ignore: invalid_use_of_visible_for_testing_member
+  final HttpFetchResponse response = await testOnlyHttpPost(
     'screenshot',
-    method: 'POST',
-    sendData: json.encode(requestData),
+    json.encode(requestData),
   );
-
-  return json.decode(request.responseText!);
+  return json.decode(await response.text());
 }
 
 /// How to compare pixels within the image.
@@ -48,6 +50,17 @@ enum PixelComparison {
 /// [pixelComparison] determines the algorithm used to compare pixels. Uses
 /// fuzzy comparison by default.
 Future<void> matchGoldenFile(String filename, {Rect? region}) async {
+  // It is difficult to deterministically tell when rendered content is actually
+  // visible to the user, so we pump 15 frames to make sure that the content is
+  // has reached the screen. This is at the recommendation of the Chrome team,
+  // and they use this same thing in their screenshot unit tests.
+  for (int i = 0; i < 15; i++) {
+    await awaitNextFrame();
+  }
+
+  if (!filename.endsWith('.png')) {
+    throw ArgumentError('Filename must end in .png or SkiaGold will ignore it.');
+  }
   final Map<String, dynamic> serverParams = <String, dynamic>{
     'filename': filename,
     'region': region == null
@@ -72,3 +85,10 @@ Future<void> matchGoldenFile(String filename, {Rect? region}) async {
   }
   fail(response);
 }
+
+/// Waits for one frame to complete rendering
+Future<void> awaitNextFrame() {
+  final Completer<void> completer = Completer<void>();
+  domWindow.requestAnimationFrame((JSNumber time) => completer.complete());
+  return completer.future;
+}
diff --git a/web_sdk/web_engine_tester/lib/static/host.dart b/web_sdk/web_engine_tester/lib/static/host.dart
index 87362d4e5050b5f83b1d2be0255c1fb67205cf26..9c8f0d8106b409b79319da8eda0e57d23216fb8d 100644
--- a/web_sdk/web_engine_tester/lib/static/host.dart
+++ b/web_sdk/web_engine_tester/lib/static/host.dart
@@ -9,8 +9,8 @@ library test.host;
 
 import 'dart:async';
 import 'dart:convert';
+import 'dart:js_interop';
 
-import 'package:js/js.dart';
 import 'package:stack_trace/stack_trace.dart';
 import 'package:stream_channel/stream_channel.dart';
 // ignore: implementation_imports
@@ -22,7 +22,7 @@ import 'package:ui/src/engine/dom.dart';
 class _TestRunner {}
 
 extension _TestRunnerExtension on _TestRunner {
-  external void waitUntilDone();
+  external JSVoid waitUntilDone();
 }
 
 /// Returns the current content shell runner, or `null` if none exists.
@@ -37,19 +37,19 @@ external _TestRunner? get testRunner; // ignore: library_private_types_in_public
 @anonymous
 @staticInterop
 class _JSApi {
-  external factory _JSApi({void Function() resume, void Function() restartCurrent});
+  external factory _JSApi({JSFunction resume, JSFunction restartCurrent});
 }
 
 extension _JSApiExtension on _JSApi {
   /// Causes the test runner to resume running, as though the user had clicked
   /// the "play" button.
   // ignore: unused_element
-  external Function get resume;
+  external JSFunction get resume;
 
   /// Causes the test runner to restart the current test once it finishes
   /// running.
   // ignore: unused_element
-  external Function get restartCurrent;
+  external JSFunction get restartCurrent;
 }
 
 /// Sets the top-level `dartTest` object so that it's visible to JS.
@@ -159,15 +159,15 @@ void main() {
       Timer.periodic(const Duration(seconds: 1),
           (_) => serverChannel.sink.add(<String, String>{'command': 'ping'}));
 
-      _jsApi = _JSApi(resume: allowInterop(() {
+      _jsApi = _JSApi(resume: () {
         if (!domDocument.body!.classList.contains('paused')) {
           return;
         }
         domDocument.body!.classList.remove('paused');
         serverChannel.sink.add(<String, String>{'command': 'resume'});
-      }), restartCurrent: allowInterop(() {
+      }.toJS, restartCurrent: () {
         serverChannel.sink.add(<String, String>{'command': 'restart'});
-      }));
+      }.toJS);
     },
     (dynamic error, StackTrace stackTrace) {
       print('$error\n${Trace.from(stackTrace).terse}'); // ignore: avoid_print
@@ -183,7 +183,7 @@ MultiChannel<dynamic> _connectToServer() {
   final DomWebSocket webSocket = createDomWebSocket(_currentUrl.queryParameters['managerUrl']!);
 
   final StreamChannelController<dynamic> controller = StreamChannelController<dynamic>(sync: true);
-  webSocket.addEventListener('message', allowInterop((DomEvent message) {
+  webSocket.addEventListener('message', createDomEventListener((DomEvent message) {
     final String data = (message as DomMessageEvent).data as String;
     controller.local.sink.add(jsonDecode(data));
   }));
@@ -207,20 +207,14 @@ StreamChannel<dynamic> _connectToIframe(String url, int id) {
     ..height = '1000';
   domDocument.body!.appendChild(iframe);
 
-  // Use this to communicate securely with the iframe.
-  final DomMessageChannel channel = createDomMessageChannel();
   final StreamChannelController<dynamic> controller = StreamChannelController<dynamic>(sync: true);
 
-  // Use this to avoid sending a message to the iframe before it's sent a
-  // message to us. This ensures that no messages get dropped on the floor.
-  final Completer<dynamic> readyCompleter = Completer<dynamic>();
-
   final List<DomSubscription> domSubscriptions = <DomSubscription>[];
   final List<StreamSubscription<dynamic>> streamSubscriptions = <StreamSubscription<dynamic>>[];
   _domSubscriptions[id] = domSubscriptions;
   _streamSubscriptions[id] = streamSubscriptions;
   domSubscriptions.add(DomSubscription(domWindow, 'message',
-          allowInterop((DomEvent event) {
+          (DomEvent event) {
     final DomMessageEvent message = event as DomMessageEvent;
     // A message on the Window can theoretically come from any website. It's
     // very unlikely that a malicious site would care about hacking someone's
@@ -229,37 +223,42 @@ StreamChannel<dynamic> _connectToIframe(String url, int id) {
     if (message.origin != domWindow.location.origin) {
       return;
     }
-
-    if (message.data['href'] != iframe.src) {
+    if (message.source.location?.href != iframe.src) {
       return;
     }
 
     message.stopPropagation();
 
-    if (message.data['ready'] == true) {
+    if (message.data == 'port') {
+      final DomMessagePort port = message.ports.first;
+      domSubscriptions.add(
+          DomSubscription(port, 'message',(DomEvent event) {
+        controller.local.sink.add((event as DomMessageEvent).data);
+      }));
+      port.start();
+      streamSubscriptions.add(controller.local.stream.listen(port.postMessage));
+    } else if (message.data['ready'] == true) {
       // This message indicates that the iframe is actively listening for
       // events, so the message channel's second port can now be transferred.
+      final DomMessageChannel channel = createDomMessageChannel();
+      channel.port1.start();
       channel.port2.start();
-      iframe.contentWindow.postMessage('port', domWindow.location.origin,
-          <DomMessagePort>[channel.port2]);
-      readyCompleter.complete();
+      iframe.contentWindow.postMessage(
+          'port', domWindow.location.origin, <DomMessagePort>[channel.port2]);
+      domSubscriptions
+          .add(DomSubscription(channel.port1, 'message', (DomEvent message) {
+        controller.local.sink.add((message as DomMessageEvent).data['data']);
+      }));
+
+      streamSubscriptions
+          .add(controller.local.stream.listen(channel.port1.postMessage));
     } else if (message.data['exception'] == true) {
       // This message from `dart.js` indicates that an exception occurred
       // loading the test.
       controller.local.sink.add(message.data['data']);
     }
-  })));
-
-  channel.port1.start();
-  domSubscriptions.add(DomSubscription(channel.port1, 'message',
-          allowInterop((DomEvent message) {
-    controller.local.sink.add((message as DomMessageEvent).data['data']);
-  })));
-
-  streamSubscriptions.add(controller.local.stream.listen((dynamic message) async {
-    await readyCompleter.future;
-    channel.port1.postMessage(message);
   }));
 
+
   return controller.foreign;
 }
diff --git a/web_sdk/web_engine_tester/pubspec.yaml b/web_sdk/web_engine_tester/pubspec.yaml
index d52b952f30511b4c977fd6e59e5ffab2bae6bee3..dadc9948addb80411edfff886cac9c023478b316 100644
--- a/web_sdk/web_engine_tester/pubspec.yaml
+++ b/web_sdk/web_engine_tester/pubspec.yaml
@@ -2,12 +2,12 @@ name: web_engine_tester
 
 # Keep the SDK version range in sync with lib/web_ui/pubspec.yaml
 environment:
-  sdk: ">=2.12.0-0 <3.0.0"
+  sdk: '>=3.2.0-0 <4.0.0'
 
 dependencies:
   js: 0.6.4
   stream_channel: 2.1.1
-  test: 1.22.0
+  test: 1.24.8
   webkit_inspection_protocol: 1.0.0
   stack_trace: 1.10.0
   ui:
diff --git a/web_sdk/web_sdk.gni b/web_sdk/web_sdk.gni
new file mode 100644
index 0000000000000000000000000000000000000000..2cbf17b07f2fbae74fac85ed04ea01fad52a288c
--- /dev/null
+++ b/web_sdk/web_sdk.gni
@@ -0,0 +1,81 @@
+# Copyright 2019 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//flutter/build/dart/dart.gni")
+import("//flutter/common/config.gni")
+
+import("$dart_src/build/dart/dart_action.gni")
+
+dart_sdk_package_config = "$dart_src/.dart_tool/package_config.json"
+
+template("sdk_rewriter") {
+  ui = defined(invoker.ui) && invoker.ui
+  if (!ui) {
+    assert(defined(invoker.library_name), "Must pass 'library_name'")
+    assert(defined(invoker.api_file), "Must pass 'api_file'")
+  }
+  assert(defined(invoker.input_dir), "Must pass 'input_dir'")
+  assert(defined(invoker.output_dir), "Must pass 'output_dir'")
+
+  prebuilt_dart_action(target_name) {
+    packages = dart_sdk_package_config
+    pool = "//flutter/build/dart:dart_pool"
+
+    script = "//flutter/web_sdk/sdk_rewriter.dart"
+
+    depfile = "$target_gen_dir/$target_name.d"
+
+    stamp_location = "$target_gen_dir/$target_name.stamp"
+    outputs = [
+      stamp_location,
+      invoker.output_dir,
+    ]
+
+    build_dir = rebase_path(root_out_dir)
+    input_dir = rebase_path(invoker.input_dir)
+    output_dir = rebase_path(invoker.output_dir)
+
+    args = [
+      "--build-dir=$build_dir",
+      "--output-dir=$output_dir",
+      "--input-dir=$input_dir",
+      "--depfile",
+      rebase_path(depfile),
+      "--stamp",
+      rebase_path(stamp_location, root_build_dir),
+    ]
+
+    if (defined(invoker.exclude_pattern)) {
+      args += [
+        "--exclude-pattern",
+        invoker.exclude_pattern,
+      ]
+    }
+
+    if (defined(invoker.is_public) && invoker.is_public) {
+      args += [ "--public" ]
+    }
+
+    if (ui) {
+      args += [ "--ui" ]
+    } else {
+      library_name = invoker.library_name
+      api_file = rebase_path(invoker.api_file)
+      args += [
+        "--library-name=$library_name",
+        "--api-file=$api_file",
+      ]
+    }
+  }
+}
+
+template("web_ui_ui_web_with_output") {
+  sdk_rewriter(target_name) {
+    library_name = "ui_web"
+    is_public = true
+    api_file = "//flutter/lib/web_ui/lib/ui_web/src/ui_web.dart"
+    input_dir = "//flutter/lib/web_ui/lib/ui_web/src/ui_web/"
+    output_dir = invoker.output_dir
+  }
+}
diff --git a/web_sdk/web_test_utils/lib/environment.dart b/web_sdk/web_test_utils/lib/environment.dart
index 96702b210acba8d72bfe50cd09858404c4d273f7..9b7b337e02e07b0ef3e1e0b2b19bc41dfd92e4f4 100644
--- a/web_sdk/web_test_utils/lib/environment.dart
+++ b/web_sdk/web_test_utils/lib/environment.dart
@@ -99,8 +99,9 @@ class Environment {
   ///
   /// This is where compiled output goes.
   io.Directory get webUiBuildDir => io.Directory(pathlib.join(
-        webUiRootDir.path,
-        'build',
+        engineSrcDir.path,
+        'out',
+        'web_tests',
       ));
 
   /// Path to the ".dart_tool" directory, generated by various Dart tools.
@@ -157,22 +158,4 @@ class Environment {
         webUiDartToolDir.path,
         'ios_screenshots',
       ));
-
-  /// Path to the script that clones the Flutter repo.
-  io.File get cloneFlutterScript => io.File(pathlib.join(
-        engineToolsDir.path,
-        'clone_flutter.sh',
-      ));
-
-  /// Path to flutter.
-  ///
-  /// For example, this can be used to run `flutter pub get`.
-  ///
-  /// Only use [cloneFlutterScript] to clone flutter to the engine build.
-  io.File get flutterCommand => io.File(pathlib.join(
-        engineDartToolDir.path,
-        'flutter',
-        'bin',
-        'flutter',
-      ));
 }
diff --git a/web_sdk/web_test_utils/lib/image_compare.dart b/web_sdk/web_test_utils/lib/image_compare.dart
index c2ac523552db811d812ff4217fc992dc1c1d7e35..4fca24189500c6147d711e4109a657b65ca7b17a 100644
--- a/web_sdk/web_test_utils/lib/image_compare.dart
+++ b/web_sdk/web_test_utils/lib/image_compare.dart
@@ -8,8 +8,6 @@ import 'package:image/image.dart';
 import 'package:path/path.dart' as p;
 import 'package:skia_gold_client/skia_gold_client.dart';
 
-import 'environment.dart';
-
 /// Compares a screenshot taken through a test with its golden.
 ///
 /// Used by Flutter Web Engine unit tests and the integration tests.
@@ -22,37 +20,46 @@ Future<String> compareImage(
   Image screenshot,
   bool doUpdateScreenshotGoldens,
   String filename,
+  Directory suiteGoldenDirectory,
   SkiaGoldClient? skiaClient, {
   required bool isCanvaskitTest,
+  required bool verbose,
 }) async {
   if (skiaClient == null) {
     return 'OK';
   }
 
-  final String screenshotPath = _getFullScreenshotPath(filename);
+  final String screenshotPath = p.join(suiteGoldenDirectory.path, filename);
   final File screenshotFile = File(screenshotPath);
   await screenshotFile.create(recursive: true);
   await screenshotFile.writeAsBytes(encodePng(screenshot), flush: true);
 
-  if (isLuciEnv) {
+  if (SkiaGoldClient.isLuciEnv()) {
     // This is temporary to get started by uploading existing screenshots to
     // Skia Gold. The next step would be to actually use Skia Gold for
     // comparison.
     final int screenshotSize = screenshot.width * screenshot.height;
 
-    late int pixelColorDelta;
+    final int pixelColorDeltaPerChannel;
+    final double differentPixelsRate;
+
     if (isCanvaskitTest) {
-      pixelColorDelta = 21;
+      differentPixelsRate = 0.1;
+      pixelColorDeltaPerChannel = 7;
     } else if (skiaClient.dimensions != null && skiaClient.dimensions!['Browser'] == 'ios-safari') {
-      pixelColorDelta = 15;
+      differentPixelsRate = 0.15;
+      pixelColorDeltaPerChannel = 16;
     } else {
-      pixelColorDelta = 3;
+      differentPixelsRate = 0.1;
+      pixelColorDeltaPerChannel = 1;
     }
+
     skiaClient.addImg(
       filename,
       screenshotFile,
       screenshotSize: screenshotSize,
-      pixelColorDelta: pixelColorDelta,
+      differentPixelsRate: differentPixelsRate,
+      pixelColorDelta: pixelColorDeltaPerChannel * 3,
     );
     return 'OK';
   }
@@ -69,12 +76,13 @@ Future<String> compareImage(
     // At the moment, we don't support local screenshot testing because we use
     // Skia Gold to handle our screenshots and diffing. In the future, we might
     // implement local screenshot testing if there's a need.
-    print('Screenshot generated: file://$screenshotPath'); // ignore: avoid_print
+    if (verbose) {
+      print('Screenshot generated: file://$screenshotPath'); // ignore: avoid_print
+    }
     return 'OK';
   }
 
   // TODO(mdebbar): Use the Gold tool to locally diff the golden.
-
   return 'OK';
 }
 
@@ -82,7 +90,3 @@ Future<Image?> _getGolden(String filename) {
   // TODO(mdebbar): Fetch the golden from Skia Gold.
   return Future<Image?>.value();
 }
-
-String _getFullScreenshotPath(String filename) {
-  return p.join(environment.webUiSkiaGoldDirectory.path, filename);
-}
diff --git a/web_sdk/web_test_utils/pubspec.yaml b/web_sdk/web_test_utils/pubspec.yaml
index 03aac1e7e629aa01e1b7749f81edbb4f29cd8db0..fbdd1be557741cbcb3a0a055dbe888e82134a7a7 100644
--- a/web_sdk/web_test_utils/pubspec.yaml
+++ b/web_sdk/web_test_utils/pubspec.yaml
@@ -2,10 +2,10 @@ name: web_test_utils
 
 # Keep the SDK version range in sync with lib/web_ui/pubspec.yaml
 environment:
-  sdk: ">=2.12.0-0 <3.0.0"
+  sdk: '>=3.2.0-0 <4.0.0'
 
 dependencies:
-  collection: 1.15.0
+  collection: 1.17.0
   crypto: 3.0.1
   image: 3.0.1
   js: 0.6.4
@@ -16,3 +16,7 @@ dependencies:
     path: ../../testing/skia_gold_client
   typed_data: 1.3.0
   yaml: 3.0.0
+
+dependency_overrides:
+  engine_repo_tools:
+    path: ../../tools/pkg/engine_repo_tools